From 582771ab48fbefb2253920a4522f9cbbc633a9cf Mon Sep 17 00:00:00 2001
From: Ralphie Morell <stratomaster64@gmail.com>
Date: Wed, 18 Oct 2023 01:30:49 -0400
Subject: [PATCH 001/230] insert witty commit message here

---
 soh/soh/Enhancements/mods.cpp                 |  49 +++++++++
 .../Enhancements/randomizer/3drando/fill.cpp  |   3 +-
 .../3drando/hint_list/hint_list_item.cpp      | 101 ++++++++++++++++++
 .../randomizer/3drando/item_list.cpp          |  11 ++
 .../randomizer/3drando/item_pool.cpp          |  13 +++
 .../Enhancements/randomizer/3drando/keys.hpp  |  11 ++
 .../location_access/locacc_deku_tree.cpp      |   4 +-
 .../locacc_dodongos_cavern.cpp                |   4 +-
 .../location_access/locacc_fire_temple.cpp    |   2 +-
 .../location_access/locacc_forest_temple.cpp  |   4 +-
 .../locacc_jabujabus_belly.cpp                |   2 +-
 .../location_access/locacc_shadow_temple.cpp  |   4 +-
 .../location_access/locacc_spirit_temple.cpp  |   4 +-
 .../location_access/locacc_water_temple.cpp   |   6 +-
 .../Enhancements/randomizer/3drando/logic.cpp |  47 ++++++++
 .../Enhancements/randomizer/3drando/logic.hpp |  10 ++
 .../randomizer/3drando/settings.cpp           |   3 +
 .../randomizer/3drando/settings.hpp           |   8 ++
 .../Enhancements/randomizer/3drando/shops.cpp |  38 ++++++-
 soh/soh/Enhancements/randomizer/draw.cpp      |  27 +++++
 .../Enhancements/randomizer/randomizer.cpp    |  44 +++++++-
 .../Enhancements/randomizer/randomizerTypes.h |  16 +++
 .../Enhancements/randomizer/randomizer_inf.h  |  10 ++
 soh/src/code/z_parameter.c                    |   7 ++
 .../overlays/actors/ovl_Boss_Va/z_boss_va.c   |   4 +
 25 files changed, 413 insertions(+), 19 deletions(-)

diff --git a/soh/soh/Enhancements/mods.cpp b/soh/soh/Enhancements/mods.cpp
index 73d6c4634..7424b8b86 100644
--- a/soh/soh/Enhancements/mods.cpp
+++ b/soh/soh/Enhancements/mods.cpp
@@ -1015,6 +1015,54 @@ void RegisterRandomizerSheikSpawn() {
     });
 }
 
+//Boss souls require an additional item (represented by a RAND_INF) to spawn a boss in a particular lair
+void RegisterBossSouls() {
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorInit>([](void* actor) {
+        if (!gPlayState) return;
+        if (!IS_RANDO || !(OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_BOSS_SOULS))) return;
+        RandomizerInf rand_inf = RAND_INF_MAX;
+        Actor* actual = (Actor*)actor;
+        switch (gPlayState->sceneNum){
+            case SCENE_DEKU_TREE_BOSS:
+                rand_inf = RAND_INF_GOHMA_SOUL;
+                break;
+            case SCENE_DODONGOS_CAVERN_BOSS:
+                rand_inf = RAND_INF_KING_DODONGO_SOUL;
+                break;
+            case SCENE_JABU_JABU_BOSS:
+                rand_inf = RAND_INF_BARINADE_SOUL;
+                break;
+            case SCENE_FOREST_TEMPLE_BOSS:
+                rand_inf = RAND_INF_PHANTOM_GANON_SOUL;
+                break;
+            case SCENE_FIRE_TEMPLE_BOSS:
+                rand_inf = RAND_INF_VOLVAGIA_SOUL;
+                break;
+            case SCENE_WATER_TEMPLE_BOSS:
+                rand_inf = RAND_INF_MORPHA_SOUL;
+                break;
+            case SCENE_SHADOW_TEMPLE_BOSS:
+                rand_inf = RAND_INF_BONGO_BONGO_SOUL;
+                break;
+            case SCENE_SPIRIT_TEMPLE_BOSS:
+                rand_inf = RAND_INF_TWINROVA_SOUL;
+                break;
+            case SCENE_GANONDORF_BOSS:
+                rand_inf = RAND_INF_GANON_SOUL;
+                break;
+            case SCENE_GANON_BOSS:
+                rand_inf = RAND_INF_GANON_SOUL;
+                break;
+            default: break;
+        }
+
+    if (!Flags_GetRandomizerInf(rand_inf) && actual->category == ACTORCAT_BOSS) {
+        Actor_Delete(&gPlayState->actorCtx, actual, gPlayState);
+    }
+    });
+
+}
+
 void InitMods() {
     RegisterTTS();
     RegisterInfiniteMoney();
@@ -1041,5 +1089,6 @@ void InitMods() {
     RegisterEnemyDefeatCounts();
     RegisterAltTrapTypes();
     RegisterRandomizerSheikSpawn();
+    RegisterBossSouls();
     NameTag_RegisterHooks();
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/fill.cpp b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
index f9d3a9592..a1f11049c 100644
--- a/soh/soh/Enhancements/randomizer/3drando/fill.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
@@ -716,7 +716,8 @@ static void RandomizeDungeonRewards() {
     }
 
     for (size_t i = 0; i < dungeonRewardLocations.size(); i++) {
-      const auto index = Location(dungeonRewardLocations[i])->GetPlacedItem().GetItemID() - baseOffset;
+      const auto itemID = Location(dungeonRewardLocations[i])->GetPlacedItem().GetItemID();
+      const auto index = itemID - baseOffset;
       rDungeonRewardOverrides[i] = index;
 
       //set the player's dungeon reward on file creation instead of pushing it to them at the start.
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp
index 9b9913c8c..f2b836bf5 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp
@@ -1939,6 +1939,107 @@ void HintTable_Init_Item() {
                        Text{"a Piece of the Triforce", /*french*/"un fragment de la Triforce", /*spanish*/"un fragmento de la Trifuerza"}
     );
 
+    hintTable[GOHMA_BOSS_SOUL] = HintText::Item({
+                      //obscure text
+                      Text{"a regal soul", "", ""},
+                      Text("some spider essence", "", ""),
+                    }, {
+                      //ambiguous text
+                      Text("something webbed", "", "")
+                    }, {
+                      //clear text
+                      Text("the soul of Gohma", "", "")}
+    );
+
+    hintTable[KING_DODONGO_BOSS_SOUL] = HintText::Item({
+      //obscure text
+      Text{"a royal soul", "", ""},
+      Text("some reptile essence", "", ""),
+    }, {
+      //ambiguous text
+      Text("something spectral", "", "")
+    }, {
+      //clear text
+      Text("the soul of King Dodongo", "", "")
+    });
+     hintTable[BARINADE_BOSS_SOUL] = HintText::Item({
+      //obscure text
+      Text{"an infectuous soul", "", ""},
+      Text("some parasitic essence", "", ""),
+    }, {
+      //ambiguous text
+      Text("something fishy", "", "")
+    }, {
+      //clear text
+      Text("the soul of Barinade", "", "")
+    });
+    hintTable[PHANTOM_GANON_BOSS_SOUL] = HintText::Item({
+      //obscure text
+      Text{"a duplicate soul", "", ""},
+      Text("some illusionary essence", "", ""),
+    }, {
+      //ambiguous text
+      Text("something spectral", "", "")
+    }, {
+      //clear text
+      Text("the soul of Phantom Ganon", "", "")
+    });
+hintTable[VOLVAGIA_BOSS_SOUL] = HintText::Item({
+      //obscure text
+      Text{"a draconic soul", "", ""},
+      Text("some magmatic essence", "", ""),
+    }, {
+      //ambiguous text
+      Text("something hot", "", "")
+    }, {
+      //clear text
+      Text("the soul of Volvagia", "", "")
+    });
+hintTable[MORPHA_BOSS_SOUL] = HintText::Item({
+      //obscure text
+      Text{"an aquatic soul", "", ""},
+      Text("some liquid essence", "", ""),
+    }, {
+      //ambiguous text
+      Text("something wet", "", "")
+    }, {
+      //clear text
+      Text("the soul of Barinade", "", "")
+    });
+hintTable[BONGO_BONGO_BOSS_SOUL] = HintText::Item({
+      //obscure text
+      Text{"a shadowy soul", "", ""},
+      Text("some handy essence", "", ""),
+    }, {
+      //ambiguous text
+      Text("something dark", "", "")
+    }, {
+      //clear text
+      Text("the soul of Bongo Bongo", "", "")
+    });
+hintTable[TWINROVA_BOSS_SOUL] = HintText::Item({
+      //obscure text
+      Text{"old souls", "", ""},
+      Text("twin essences", "", ""),
+    }, {
+      //ambiguous text
+      Text("something spiritual", "", "")
+    }, {
+      //clear text
+      Text("the soul of Twinrova", "", "")
+    });
+hintTable[GANON_BOSS_SOUL] = HintText::Item({
+      //obscure text
+      Text{"an evil soul", "", ""},
+      Text("some powerful essence", "", ""),
+    }, {
+      //ambiguous text
+      Text("something strong", "", "")
+    }, {
+      //clear text
+      Text("the soul of Ganon", "", "")
+    });
+
     hintTable[EPONA] = HintText::Item({
                        //obscure text
                        Text{"a horse",              /*french*/"un fidèle destrier", /*spanish*/"una yegua"},
diff --git a/soh/soh/Enhancements/randomizer/3drando/item_list.cpp b/soh/soh/Enhancements/randomizer/3drando/item_list.cpp
index 417203a5b..4b3cdab07 100644
--- a/soh/soh/Enhancements/randomizer/3drando/item_list.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/item_list.cpp
@@ -246,6 +246,17 @@ void ItemTable_Init() {                              // RandomizerGet
     itemTable[TRIFORCE]                          = Item(RG_TRIFORCE,                          Text{"Triforce",                        "Triforce",                         "Trifuerza"},                               ITEMTYPE_EVENT, GI_RUPEE_RED_LOSE,  false, &noVariable, NONE);
     itemTable[HINT]                              = Item(RG_HINT,                              Text{"Hint",                            "Indice",                           "Pista"},                                   ITEMTYPE_EVENT, GI_RUPEE_BLUE_LOSE, false, &noVariable, NONE);
 
+    //Boss Souls
+    itemTable[GOHMA_BOSS_SOUL]                   = Item(RG_GOHMA_SOUL,                        Text{"Gohma's Soul",                    "Ame de Gohma",                     "Alma de Gohma"},                      ITEMTYPE_ITEM, 0xE1, true,  &CanSummonGohma, NONE);
+    itemTable[KING_DODONGO_BOSS_SOUL]            = Item(RG_KING_DODONGO_SOUL,                 Text{"King Dodongo's Soul",             "Ame de ",                          "Alma de "},                           ITEMTYPE_ITEM, 0xE2, true,  &CanSummonKingDodongo, NONE);
+    itemTable[BARINADE_BOSS_SOUL]                = Item(RG_BARINADE_SOUL,                     Text{"Barinade's Soul",                 "Ame de ",                          "Alma de "},                           ITEMTYPE_ITEM, 0xE3, true,  &CanSummonBarinade, NONE);
+    itemTable[PHANTOM_GANON_BOSS_SOUL]           = Item(RG_GOHMA_SOUL,                        Text{"Phantom Ganon's Soul",            "Ame de ",                          "Alma de "},                           ITEMTYPE_ITEM, 0xE4, true,  &CanSummonPhantomGanon, NONE);
+    itemTable[VOLVAGIA_BOSS_SOUL]                = Item(RG_GOHMA_SOUL,                        Text{"Volvagia's Soul",                 "Ame de ",                          "Alma de "},                           ITEMTYPE_ITEM, 0xE5, true,  &CanSummonVolvagia, NONE);
+    itemTable[MORPHA_BOSS_SOUL]                  = Item(RG_GOHMA_SOUL,                        Text{"Morpha's Soul",                   "Ame de ",                          "Alma de "},                           ITEMTYPE_ITEM, 0xE6, true,  &CanSummonMorpha, NONE);
+    itemTable[BONGO_BONGO_BOSS_SOUL]             = Item(RG_GOHMA_SOUL,                        Text{"Bongo Bongo's Soul",              "Ame de ",                          "Alma de "},                           ITEMTYPE_ITEM, 0xE7, true,  &CanSummonBongoBongo, NONE);
+    itemTable[TWINROVA_BOSS_SOUL]                = Item(RG_GOHMA_SOUL,                        Text{"Twinrova's Soul",                 "Ame de ",                          "Alma de "},                           ITEMTYPE_ITEM, 0xE8, true,  &CanSummonTwinrova, NONE);
+    itemTable[GANON_BOSS_SOUL]                   = Item(RG_GOHMA_SOUL,                        Text{"Ganon's Soul",                    "Ame de ",                          "Alma de "},                           ITEMTYPE_ITEM, 0xE9, true,  &CanSummonGanon, NONE);
+
 //  itemTable[HOOKSHOT]                          = Item(RG_HOOKSHOT,                          Text{"Hookshot",                        "Grappin",                          "Gancho"},                                  ITEMTYPE_ITEM, 0x80, true,  &ProgressiveHookshot, HOOKSHOT);
 //  itemTable[LONGSHOT]                          = Item(RG_LONGSHOT,                          Text{"Longshot",                        "Super-Grappin",                    "Supergancho"},                             ITEMTYPE_ITEM, 0x80, true,  &ProgressiveHookshot, LONGSHOT);
 //  itemTable[FAIRY_OCARINA]                     = Item(RG_FAIRY_OCARINA,                     Text{"Fairy Ocarina",                   "Ocarina des fées",                 "Ocarina de las Hadas"},                    ITEMTYPE_ITEM, 0x8B, true,  &ProgressiveOcarina, FAIRY_OCARINA);
diff --git a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
index 485fc4154..22cc5d759 100644
--- a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
@@ -816,6 +816,19 @@ void GenerateItemPool() {
     PlaceItemInLocation(KAK_100_GOLD_SKULLTULA_REWARD, HUGE_RUPEE, false, true);
   }
 
+  if (ShuffleBossSouls.IsNot(BOSSSOULS_OFF)) {
+    AddItemToMainPool(GOHMA_BOSS_SOUL);
+    AddItemToMainPool(KING_DODONGO_BOSS_SOUL);
+    AddItemToMainPool(BARINADE_BOSS_SOUL);
+    AddItemToMainPool(PHANTOM_GANON_BOSS_SOUL);
+    AddItemToMainPool(VOLVAGIA_BOSS_SOUL);
+    AddItemToMainPool(BONGO_BONGO_BOSS_SOUL);
+    AddItemToMainPool(TWINROVA_BOSS_SOUL);
+    if (ShuffleBossSouls.Is(BOSSSOULS_ON_PLUS_GANON)) {
+      AddItemToMainPool(GANON_BOSS_SOUL);
+    }
+  }
+
   if (BombchusInLogic) {
     AddItemToMainPool(PROGRESSIVE_BOMBCHUS, 5);
   } else {
diff --git a/soh/soh/Enhancements/randomizer/3drando/keys.hpp b/soh/soh/Enhancements/randomizer/3drando/keys.hpp
index 6e9e87f4e..764aae54a 100644
--- a/soh/soh/Enhancements/randomizer/3drando/keys.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/keys.hpp
@@ -203,6 +203,17 @@ typedef enum {
   TRIFORCE,
   TRIFORCE_PIECE,
   TRIFORCE_COMPLETED,
+
+  GOHMA_BOSS_SOUL,
+  KING_DODONGO_BOSS_SOUL,
+  BARINADE_BOSS_SOUL,
+  PHANTOM_GANON_BOSS_SOUL,
+  VOLVAGIA_BOSS_SOUL,
+  MORPHA_BOSS_SOUL,
+  BONGO_BONGO_BOSS_SOUL,
+  TWINROVA_BOSS_SOUL,
+  GANON_BOSS_SOUL,
+
   EPONA,
   HINT,
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp
index c39676a82..8a4b35772 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp
@@ -253,9 +253,9 @@ void AreaTable_Init_DekuTree() {
              {
                  // Events
                  EventAccess(&DekuTreeClear, { [] {
-                                                  return DekuTreeClear ||
+                                                  return DekuTreeClear || (CanSummonGohma && 
                                                          (CanJumpslash && (Nuts || CanUse(SLINGSHOT) || CanUse(BOW) ||
-                                                                           HookshotOrBoomerang));
+                                                                           HookshotOrBoomerang)));
                                               }}),
              },
              {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp
index 133cdc340..784514188 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp
@@ -290,10 +290,10 @@ void AreaTable_Init_DodongosCavern() {
                  // Events
                  EventAccess(&DodongosCavernClear,
                              { [] {
-                                  return DodongosCavernClear ||
+                                  return DodongosCavernClear || (CanSummonKingDodongo &&
                                          (Here(DODONGOS_CAVERN_BOSS_ROOM,
                                                [] { return HasExplosives || (CanUse(MEGATON_HAMMER) && LogicDCHammerFloor); }) &&
-                                          (Bombs || GoronBracelet) && CanJumpslash); /*todo add chu kill to tricks*/
+                                          (Bombs || GoronBracelet) && CanJumpslash)); /*todo add chu kill to tricks*/
                               }}),
              },
              {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp
index 887766fe5..31c59094d 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp
@@ -407,7 +407,7 @@ void AreaTable_Init_FireTemple() {
              {
                  // Events
                  EventAccess(&FireTempleClear,
-                             { [] { return FireTempleClear || (FireTimer >= 64 && CanUse(MEGATON_HAMMER)); }}),
+                             { [] { return FireTempleClear || (CanSummonVolvagia && (FireTimer >= 64 && CanUse(MEGATON_HAMMER))); }}),
              },
              {
                  // Locations
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp
index d4e95e15c..dc675849b 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp
@@ -421,8 +421,8 @@ void AreaTable_Init_ForestTemple() {
         {
             // Events
             EventAccess(&ForestTempleClear, { [] {
-                return ForestTempleClear || ((CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD)) &&
-                                             (CanUse(HOOKSHOT) || CanUse(BOW) || CanUse(SLINGSHOT)));
+                return ForestTempleClear || (CanSummonPhantomGanon && ((CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD)) &&
+                                             (CanUse(HOOKSHOT) || CanUse(BOW) || CanUse(SLINGSHOT))));
             } }),
         },
         {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp
index d7b48d7f1..0a14e9257 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp
@@ -235,7 +235,7 @@ void AreaTable_Init_JabuJabusBelly() {
              {
                  // Events //todo: add pot kill trick
                  EventAccess(&JabuJabusBellyClear,
-                             { [] { return JabuJabusBellyClear || (CanUse(BOOMERANG) && CanJumpslash); } }),
+                             { [] { return JabuJabusBellyClear || (CanSummonBarinade && (CanUse(BOOMERANG) && CanJumpslash)); } }),
              },
              {
                  // Locations
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp
index 5296a6398..4b3786ec1 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp
@@ -194,10 +194,10 @@ void AreaTable_Init_ShadowTemple() {
              {
                  // Events
                  EventAccess(&ShadowTempleClear, { [] {
-                     return ShadowTempleClear ||
+                     return ShadowTempleClear || (CanSummonBongoBongo &&
                             ((CanUse(LENS_OF_TRUTH) || LogicLensBongo) &&
                              (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD)) &&
-                             (CanUse(HOOKSHOT) || CanUse(BOW) || CanUse(SLINGSHOT) || LogicShadowBongo));
+                             (CanUse(HOOKSHOT) || CanUse(BOW) || CanUse(SLINGSHOT) || LogicShadowBongo)));
                  } }),
              },
              {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp
index ec01cdbfd..c44ece42d 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp
@@ -259,8 +259,8 @@ void AreaTable_Init_SpiritTemple() {
         {
             // Events
             EventAccess(&SpiritTempleClear, { [] {
-                return SpiritTempleClear || (CanUse(MIRROR_SHIELD) &&
-                                             (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD)));
+                return SpiritTempleClear || (CanSummonTwinrova && (CanUse(MIRROR_SHIELD) &&
+                                             (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD))));
             } }),
         },
         {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp
index 79d9dff7c..c8905b78e 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp
@@ -318,14 +318,14 @@ void AreaTable_Init_WaterTemple() {
         {
             // Events
             EventAccess(&WaterTempleClear, { [] {
-                return WaterTempleClear ||
-                       (CanUse(HOOKSHOT) && (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD)));
+                return WaterTempleClear || (CanSummonMorpha &&
+                       (CanUse(HOOKSHOT) && (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD))));
             } }),
         },
         {
             // Locations
             LocationAccess(WATER_TEMPLE_MORPHA_HEART, { [] { return WaterTempleClear; } }),
-            LocationAccess(MORPHA, { [] { return WaterTempleClear; } }),
+            LocationAccess(MORPHA, { [] { return CanSummonMorpha && WaterTempleClear; } }),
         },
         {
             // Exits
diff --git a/soh/soh/Enhancements/randomizer/3drando/logic.cpp b/soh/soh/Enhancements/randomizer/3drando/logic.cpp
index ddf53824e..fe79cae67 100644
--- a/soh/soh/Enhancements/randomizer/3drando/logic.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/logic.cpp
@@ -314,6 +314,16 @@ namespace Logic {
   uint8_t Age             = 0;
   bool CanCompleteTriforce = false;
 
+  bool CanSummonGohma        = false;
+  bool CanSummonKingDodongo  = false;
+  bool CanSummonBarinade     = false;
+  bool CanSummonPhantomGanon = false;
+  bool CanSummonVolvagia     = false;
+  bool CanSummonMorpha       = false;
+  bool CanSummonBongoBongo   = false;
+  bool CanSummonTwinrova     = false;
+  bool CanSummonGanon        = false;
+
   //Events
   bool ShowedMidoSwordAndShield  = false;
   bool CarpenterRescue           = false;
@@ -464,6 +474,22 @@ namespace Logic {
            (age == HasProjectileAge::Either && (Slingshot || Boomerang   ||  Hookshot || Bow));
   }
 
+  bool HasBossSoul(uint32_t itemName) {
+    if (ShuffleBossSouls.Is(BOSSSOULS_OFF)) {
+      return true;
+    }
+    return (itemName == GOHMA_BOSS_SOUL && CanSummonGohma)         ||
+    (itemName == KING_DODONGO_BOSS_SOUL && CanSummonKingDodongo)   ||
+    (itemName == BARINADE_BOSS_SOUL && CanSummonBarinade)          ||
+    (itemName == PHANTOM_GANON_BOSS_SOUL && CanSummonPhantomGanon) ||
+    (itemName == VOLVAGIA_BOSS_SOUL && CanSummonVolvagia)          ||
+    (itemName == MORPHA_BOSS_SOUL && CanSummonMorpha)              ||
+    (itemName == BONGO_BONGO_BOSS_SOUL && CanSummonBongoBongo)     ||
+    (itemName == TWINROVA_BOSS_SOUL && CanSummonTwinrova)          ||
+    (ShuffleBossSouls.Is(BOSSSOULS_ON_PLUS_GANON) && (itemName == GANON_BOSS_SOUL && CanSummonGanon));
+
+  }
+
   uint8_t GetDifficultyValueFromString(Option& glitchOption) {
     return 0;
   }
@@ -625,6 +651,16 @@ namespace Logic {
                      (LACSCondition == LACSCONDITION_DUNGEONS   && DungeonCount + (Greg && GregInLogic ? 1 : 0) >= LACSDungeonCount.Value<uint8_t>())                ||
                      (LACSCondition == LACSCONDITION_TOKENS     && GoldSkulltulaTokens >= LACSTokenCount.Value<uint8_t>());
     CanCompleteTriforce = TriforcePieces >= TriforceHuntRequired.Value<uint8_t>();
+    CanSummonGohma = HasBossSoul(GOHMA_BOSS_SOUL);
+    CanSummonKingDodongo = HasBossSoul(KING_DODONGO_BOSS_SOUL);
+    CanSummonBarinade = HasBossSoul(BARINADE_BOSS_SOUL);
+    CanSummonPhantomGanon = HasBossSoul(PHANTOM_GANON_BOSS_SOUL);
+    CanSummonVolvagia = HasBossSoul(VOLVAGIA_BOSS_SOUL);
+    CanSummonMorpha = HasBossSoul(MORPHA_BOSS_SOUL);
+    CanSummonBongoBongo = HasBossSoul(BONGO_BONGO_BOSS_SOUL);
+    CanSummonTwinrova = HasBossSoul(TWINROVA_BOSS_SOUL);
+    CanSummonGanon = HasBossSoul(GANON_BOSS_SOUL);
+
   }
 
   bool SmallKeys(Key dungeon, uint8_t requiredAmount) {
@@ -880,6 +916,17 @@ namespace Logic {
      //Triforce Pieces
      TriforcePieces = 0;
 
+     //Boss Souls
+     CanSummonGohma        = false;
+     CanSummonKingDodongo  = false;
+     CanSummonBarinade     = false;
+     CanSummonPhantomGanon = false;
+     CanSummonVolvagia     = false;
+     CanSummonMorpha       = false;
+     CanSummonBongoBongo   = false;
+     CanSummonTwinrova     = false;
+     CanSummonGanon        = false;
+
      //Drops and Bottle Contents Access
      DekuNutDrop      = false;
      NutPot           = false;
diff --git a/soh/soh/Enhancements/randomizer/3drando/logic.hpp b/soh/soh/Enhancements/randomizer/3drando/logic.hpp
index 4d24fd3ff..a58338899 100644
--- a/soh/soh/Enhancements/randomizer/3drando/logic.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/logic.hpp
@@ -303,6 +303,16 @@ extern bool LinksCow;
 extern uint8_t Age;
 extern bool CanCompleteTriforce;
 
+extern bool CanSummonGohma;
+extern bool CanSummonKingDodongo;
+extern bool CanSummonBarinade;
+extern bool CanSummonPhantomGanon;
+extern bool CanSummonVolvagia;
+extern bool CanSummonMorpha;
+extern bool CanSummonBongoBongo;
+extern bool CanSummonTwinrova;
+extern bool CanSummonGanon;
+
 // Events
 extern bool ShowedMidoSwordAndShield;
 extern bool CarpenterRescue;
diff --git a/soh/soh/Enhancements/randomizer/3drando/settings.cpp b/soh/soh/Enhancements/randomizer/3drando/settings.cpp
index 2cd894ffd..6eb360bb2 100644
--- a/soh/soh/Enhancements/randomizer/3drando/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/settings.cpp
@@ -196,6 +196,7 @@ namespace Settings {
   Option ShuffleAdultTradeQuest = Option::Bool("Shuffle Adult Trade",    {"Off", "On"});
   Option ShuffleChestMinigame   = Option::U8  ("Shuffle Chest Minigame", {"Off", "On (Separate)", "On (Pack)"});
   Option Shuffle100GSReward     = Option::Bool("Shuffle 100 GS Reward",  {"Off", "On"});
+  Option ShuffleBossSouls       = Option::U8  ("Shuffle Boss Souls",     {"Off", "On", "On + Ganon"});
   std::vector<Option *> shuffleOptions = {
     &RandomizeShuffle,
     &ShuffleRewards,
@@ -217,6 +218,7 @@ namespace Settings {
     &ShuffleAdultTradeQuest,
     &ShuffleChestMinigame,
     &Shuffle100GSReward,
+    &ShuffleBossSouls,
   };
 
   //Shuffle Dungeon Items
@@ -2276,6 +2278,7 @@ namespace Settings {
     ShopsanityPricesAffordable.SetSelectedIndex(cvarSettings[RSK_SHOPSANITY_PRICES_AFFORDABLE]);
     Scrubsanity.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_SCRUBS]);
     ShuffleCows.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_COWS]);
+    ShuffleBossSouls.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_BOSS_SOULS]);
     ShuffleKokiriSword.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_KOKIRI_SWORD]);
     ShuffleOcarinas.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_OCARINA]);
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/settings.hpp b/soh/soh/Enhancements/randomizer/3drando/settings.hpp
index 0d3d3c898..a0295342a 100644
--- a/soh/soh/Enhancements/randomizer/3drando/settings.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/settings.hpp
@@ -199,6 +199,12 @@ typedef enum {
     SHUFFLECHESTMINIGAME_PACK,
 } ShuffleChestMinigameSetting;
 
+typedef enum {
+    BOSSSOULS_OFF,
+    BOSSSOULS_ON,
+    BOSSSOULS_ON_PLUS_GANON,
+} ShuffleBossSoulsSetting;
+
 typedef enum {
     MAPSANDCOMPASSES_START_WITH,
     MAPSANDCOMPASSES_VANILLA,
@@ -421,6 +427,7 @@ typedef struct {
     uint8_t shuffleAdultTradeQuest;
     uint8_t shuffleChestMinigame;
     uint8_t shuffle100GsReward;
+    uint8_t shuffleBossSouls;
 
     uint8_t mapsAndCompasses;
     uint8_t keysanity;
@@ -811,6 +818,7 @@ void UpdateSettings(std::unordered_map<RandomizerSettingKey, uint8_t> cvarSettin
   extern Option ShuffleAdultTradeQuest;
   extern Option ShuffleChestMinigame;
   extern Option Shuffle100GSReward;
+  extern Option ShuffleBossSouls;
 
   extern Option MapsAndCompasses;
   extern Option Keysanity;
diff --git a/soh/soh/Enhancements/randomizer/3drando/shops.cpp b/soh/soh/Enhancements/randomizer/3drando/shops.cpp
index 8c47ac976..02ea2d021 100644
--- a/soh/soh/Enhancements/randomizer/3drando/shops.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/shops.cpp
@@ -13,7 +13,7 @@ using namespace Settings;
 
 std::vector<ItemAndPrice> NonShopItems = {};
 
-static std::array<std::vector<Text>, 0xE0> trickNameTable; // Table of trick names for ice traps
+static std::array<std::vector<Text>, 0xF0> trickNameTable; // Table of trick names for ice traps
 bool initTrickNames = false; //Indicates if trick ice trap names have been initialized yet
 
 //Set vanilla shop item locations before potentially shuffling
@@ -702,6 +702,42 @@ void InitTrickNames() {
      Text{"Piece of Cheese", "Morceau de Fromage", "Piece of Cheese"},
      Text{"Triforce Shard", "Éclat de Triforce", "Triforce Shard"},
      Text{"Shiny Rock", "Caiiloux Brillant", "Shiny Rock"}};
+  trickNameTable[0xE1] = {
+     Text{"Spider Sense", "", ""},
+     Text{"Deku Spirit", "", ""},
+     Text("Ghost of Ghoma", "", "")};
+  trickNameTable[0xE2] = {
+     Text{"Lizard Soul", "", ""},
+     Text{"Regal Remains", "", ""},
+     Text{"Dodongo's Core", "", ""}};
+  trickNameTable[0xE3] = {
+     Text{"Parasitic Poltergeist", "", ""},
+     Text{"Jabu Insides", "", ""},
+     Text{"Barinade Bacteria", "", ""}};
+  trickNameTable[0xE4] = {
+     Text{"Bigger Poe", "", ""},
+     Text{"Sacred Forest Pine Tree", "", ""},
+     Text{"Ganon's Phantom", "", ""}};
+  trickNameTable[0xE5] = {
+     Text{"Dragon Roast", "", ""},
+     Text{"Hot n' Ready", "", ""},
+     Text{"Volvagia's Vitality", "", ""}};
+  trickNameTable[0xE6] = {
+     Text{"Dihydrogen Monoxide", "", ""},
+     Text{"Morpha Molecules", "", ""},
+     Text{"Wet Stuff", "", ""}};
+  trickNameTable[0xE7] = {
+     Text{"Shadow Soul", "", ""},
+     Text{"Dark Essence", "", ""},
+     Text{"Bongo Bongo's Bongo", "", ""}};
+  trickNameTable[0xE8] = {
+     Text{"Sandy Ashes", "", ""},
+     Text{"Spiritual Spirit", "", ""},
+     Text{"Twin Rovers", "", ""}};
+  trickNameTable[0xE9] = {
+     Text{"Pure Evil", "", ""},
+     Text{"Ganon's Ghost", "", ""},
+     Text{"Pork", "", ""}};
 
 /*
   //Names for individual upgrades, in case progressive names are replaced
diff --git a/soh/soh/Enhancements/randomizer/draw.cpp b/soh/soh/Enhancements/randomizer/draw.cpp
index c2895dd62..12e271e28 100644
--- a/soh/soh/Enhancements/randomizer/draw.cpp
+++ b/soh/soh/Enhancements/randomizer/draw.cpp
@@ -10,6 +10,7 @@
 #include "objects/object_gi_key/object_gi_key.h"
 #include "objects/object_gi_bosskey/object_gi_bosskey.h"
 #include "objects/object_gi_hearts/object_gi_hearts.h"
+#include "objects/object_gi_sutaru/object_gi_sutaru.h"
 #include "objects/gameplay_field_keep/gameplay_field_keep.h"
 #include "soh_assets.h"
 
@@ -256,3 +257,29 @@ extern "C" void Randomizer_DrawTriforcePieceGI(PlayState* play, GetItemEntry get
 
     CLOSE_DISPS(play->state.gfxCtx);
 }
+// TODO get custom model for boss souls
+// extern "C" void Randomizer_DrawBossSoul(PlayState* play, GetItemEntry getItemEntry) {
+//     OPEN_DISPS(play->state.gfxCtx);
+
+//     Gfx_SetupDL_25Opa(play->state.gfxCtx);
+    
+//     gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
+//       G_MTX_MODELVIEW | G_MTX_LOAD);
+//     gDPSetGrayscaleColor(POLY_OPA_DISP++, 255, 0, 0, 255);
+//     gSPGrayscale(POLY_OPA_DISP++, true);
+    
+//     gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gGiSkulltulaTokenDL);
+
+//     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
+//     gSPSegment(POLY_XLU_DISP++, 8, Gfx_TwoTexScroll(
+//         play->state.gfxCtx, 0, 0 * (play->state.frames * 0),
+//         1 * -(play->state.frames * 5), 32, 32, 1, 0 * (play->state.frames * 0),
+//         0 * (play->state.frames * 0), 32, 64
+//     ));
+//     gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
+//               G_MTX_MODELVIEW | G_MTX_LOAD);
+//     gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gGiSkulltulaTokenFlameDL);
+
+//     CLOSE_DISPS(play->state.gfxCtx);
+
+// }
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index 578532a33..5489b1c45 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -257,6 +257,7 @@ std::unordered_map<std::string, RandomizerSettingKey> SpoilerfileSettingNameToEn
     { "Shuffle Settings:Shuffle Frog Song Rupees", RSK_SHUFFLE_FROG_SONG_RUPEES },
     { "Shuffle Settings:Shuffle Merchants", RSK_SHUFFLE_MERCHANTS },
     { "Shuffle Settings:Shuffle 100 GS Reward", RSK_SHUFFLE_100_GS_REWARD },
+    { "Shuffle Settings:Shuffle Boss Souls", RSK_SHUFFLE_BOSS_SOULS },
     { "Start with Deku Shield", RSK_STARTING_DEKU_SHIELD },
     { "Start with Kokiri Sword", RSK_STARTING_KOKIRI_SWORD },
     { "Start with Fairy Ocarina", RSK_STARTING_OCARINA },
@@ -942,6 +943,14 @@ void Randomizer::ParseRandomizerSettingsFile(const char* spoilerFileName) {
                             gSaveContext.randoSettings[index].value = RO_AMMO_DROPS_OFF;
                         }
                         break;
+                    case RSK_SHUFFLE_BOSS_SOULS:
+                        if (it.value() == "Off") {
+                            gSaveContext.randoSettings[index].value = RO_BOSS_SOULS_OFF;
+                        } else if (it.value() == "On") {
+                            gSaveContext.randoSettings[index].value = RO_BOSS_SOULS_ON;
+                        } else if (it.value() == "On + Ganon") {
+                            gSaveContext.randoSettings[index].value = RO_BOSS_SOULS_ON_PLUS_GANON;
+                        }
                     case RSK_STARTING_OCARINA:
                         if(it.value() == "Off") {
                             gSaveContext.randoSettings[index].value = RO_STARTING_OCARINA_OFF;
@@ -2900,6 +2909,7 @@ void GenerateRandomizerImgui(std::string seed = "") {
     cvarSettings[RSK_SHUFFLE_MAGIC_BEANS] = CVarGetInteger("gRandomizeShuffleBeans", 0);
     cvarSettings[RSK_SHUFFLE_MERCHANTS] = CVarGetInteger("gRandomizeShuffleMerchants", RO_SHUFFLE_MERCHANTS_OFF);
     cvarSettings[RSK_SHUFFLE_100_GS_REWARD] = CVarGetInteger("gRandomizeShuffle100GSReward", RO_GENERIC_OFF);
+    cvarSettings[RSK_SHUFFLE_BOSS_SOULS] = CVarGetInteger("gRandomizeShuffleBossSouls", RO_BOSS_SOULS_OFF);
     cvarSettings[RSK_ENABLE_BOMBCHU_DROPS] = CVarGetInteger("gRandomizeEnableBombchuDrops", 0);
     cvarSettings[RSK_BOMBCHUS_IN_LOGIC] = CVarGetInteger("gRandomizeBombchusInLogic", 0);
     cvarSettings[RSK_SKIP_CHILD_ZELDA] = CVarGetInteger("gRandomizeSkipChildZelda", 0);
@@ -3124,6 +3134,7 @@ void RandomizerSettingsWindow::DrawElement() {
     static const char* randoTokensanity[4] = { "Off", "Dungeons", "Overworld", "All Tokens" };
     static const char* randoShuffleScrubs[4] = { "Off", "Affordable", "Expensive", "Random Prices" };
     static const char* randoShuffleMerchants[3] = { "Off", "On (no hints)", "On (with hints)" };
+    static const char* randoShuffleBossSouls[3] = { "Off", "On", "On + Ganon"};
 
     // Shuffle Dungeon Items Settings
     static const char* randoShuffleMapsAndCompasses[6] = { "Start With",  "Vanilla",   "Own Dungeon",
@@ -4012,6 +4023,15 @@ void RandomizerSettingsWindow::DrawElement() {
 
                 UIWidgets::PaddedSeparator();
 
+                // Shuffle Boss Souls
+                // Forces players to find a boss's soul before defeating them in their lair.
+                ImGui::Text("%s", Settings::ShuffleBossSouls.GetName().c_str());
+                UIWidgets::InsertHelpHoverText("Shuffles 8 boss souls (one for each blue warp dungeon). A boss will not appear until you collect its respective soul."
+                "\n\"On + Ganon\" will also hide Ganon and Ganondorf behind a boss soul.");
+                UIWidgets::EnhancementCombobox("gRandomizeShuffleBossSouls", randoShuffleBossSouls, RO_BOSS_SOULS_OFF);
+
+                UIWidgets::PaddedSeparator();
+
                 ImGui::PopItemWidth();
                 ImGui::EndChild();
 
@@ -5866,7 +5886,7 @@ CustomMessage Randomizer::GetGoronMessage(u16 index) {
 void Randomizer::CreateCustomMessages() {
     // RANDTODO: Translate into french and german and replace GIMESSAGE_UNTRANSLATED
     // with GIMESSAGE(getItemID, itemID, english, german, french).
-    const std::array<GetItemMessage, 56> getItemMessages = {{
+    const std::array<GetItemMessage, 65> getItemMessages = {{
         GIMESSAGE(RG_GREG_RUPEE, ITEM_MASK_GORON, 
 			"You found %gGreg%w!",
 			"%gGreg%w! Du hast ihn wirklich gefunden!",
@@ -6096,7 +6116,18 @@ void Randomizer::CreateCustomMessages() {
         GIMESSAGE(RG_TYCOON_WALLET, ITEM_WALLET_GIANT,
 			"You got a %rTycoon's Wallet%w!&It's gigantic! Now you can carry&up to %y999 rupees%w!",
 			"Du erhältst die %rGoldene&Geldbörse%w! Die größte aller&Geldbörsen! Jetzt kannst Du bis&zu %y999 Rubine%w mit dir führen!",
-			"Vous obtenez la %rBourse de Magnat%w!&Elle peut contenir jusqu'à %y999 rubis%w!&C'est gigantesque!")
+			"Vous obtenez la %rBourse de Magnat%w!&Elle peut contenir jusqu'à %y999 rubis%w!&C'est gigantesque!"),
+
+        GIMESSAGE_UNTRANSLATED(RG_GOHMA_SOUL, ITEM_BIG_POE, "You found the soul for %gGohma%w!"),
+        GIMESSAGE_UNTRANSLATED(RG_KING_DODONGO_SOUL, ITEM_BIG_POE, "You found the soul for %rKing Dodongo%w!"),
+        GIMESSAGE_UNTRANSLATED(RG_BARINADE_SOUL, ITEM_BIG_POE, "You found the soul for %bBarindade%w!"),
+        GIMESSAGE_UNTRANSLATED(RG_PHANTOM_GANON_SOUL, ITEM_BIG_POE, "You found the soul for %gPhantom Ganon%w!"),
+        GIMESSAGE_UNTRANSLATED(RG_VOLVAGIA_SOUL, ITEM_BIG_POE, "You found the soul for %rVolvagia%w!"),
+        GIMESSAGE_UNTRANSLATED(RG_MORPHA_SOUL, ITEM_BIG_POE, "You found the soul for %bMorpha%w!"),
+        GIMESSAGE_UNTRANSLATED(RG_BONGO_BONGO_SOUL, ITEM_BIG_POE, "You found the soul for %pBongo Bongo%w!"),
+        GIMESSAGE_UNTRANSLATED(RG_TWINROVA_SOUL, ITEM_BIG_POE, "You found the soul for %yTwinrova%w!"),
+        GIMESSAGE_UNTRANSLATED(RG_GANON_SOUL, ITEM_BIG_POE, "You found the soul for %cGanon%w!"),
+        
     }};
     CreateGetItemMessages(&getItemMessages);
     CreateRupeeMessages();
@@ -6212,6 +6243,15 @@ void InitRandoItemTable() {
         GET_ITEM(RG_TYCOON_WALLET,                     OBJECT_GI_PURSE,    GID_WALLET_GIANT,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_TYCOON_WALLET),
         GET_ITEM(RG_PROGRESSIVE_BOMBCHUS,              OBJECT_GI_BOMB_2,   GID_BOMBCHU,          0x33,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_PROGRESSIVE_BOMBCHUS),
         GET_ITEM(RG_TRIFORCE_PIECE,                    OBJECT_GI_BOMB_2,   GID_TRIFORCE_PIECE,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_TRIFORCE_PIECE),
+        GET_ITEM(RG_GOHMA_SOUL,                        OBJECT_GI_SUTARU,   GID_SKULL_TOKEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_GOHMA_SOUL),
+        GET_ITEM(RG_KING_DODONGO_SOUL,                 OBJECT_GI_SUTARU,   GID_SKULL_TOKEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_KING_DODONGO_SOUL),
+        GET_ITEM(RG_BARINADE_SOUL,                     OBJECT_GI_SUTARU,   GID_SKULL_TOKEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_BARINADE_SOUL),
+        GET_ITEM(RG_PHANTOM_GANON_SOUL,                OBJECT_GI_SUTARU,   GID_SKULL_TOKEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_PHANTOM_GANON_SOUL),
+        GET_ITEM(RG_VOLVAGIA_SOUL,                     OBJECT_GI_SUTARU,   GID_SKULL_TOKEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_VOLVAGIA_SOUL),
+        GET_ITEM(RG_MORPHA_SOUL,                       OBJECT_GI_SUTARU,   GID_SKULL_TOKEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_MORPHA_SOUL),
+        GET_ITEM(RG_BONGO_BONGO_SOUL,                  OBJECT_GI_SUTARU,   GID_SKULL_TOKEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_BONGO_BONGO_SOUL),
+        GET_ITEM(RG_TWINROVA_SOUL,                     OBJECT_GI_SUTARU,   GID_SKULL_TOKEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_TWINROVA_SOUL),
+        GET_ITEM(RG_GANON_SOUL,                        OBJECT_GI_SUTARU,   GID_SKULL_TOKEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_GANON_SOUL),
     };
     ItemTableManager::Instance->AddItemTable(MOD_RANDOMIZER);
     for (int i = 0; i < ARRAY_COUNT(extendedVanillaGetItemTable); i++) {
diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h
index b1e843497..352c29662 100644
--- a/soh/soh/Enhancements/randomizer/randomizerTypes.h
+++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@@ -1314,6 +1314,15 @@ typedef enum {
     RG_BUY_RED_POTION_50,
     RG_TRIFORCE,
     RG_TRIFORCE_PIECE,
+    RG_GOHMA_SOUL,
+    RG_KING_DODONGO_SOUL,
+    RG_BARINADE_SOUL,
+    RG_PHANTOM_GANON_SOUL,
+    RG_VOLVAGIA_SOUL,
+    RG_MORPHA_SOUL,
+    RG_BONGO_BONGO_SOUL,
+    RG_TWINROVA_SOUL,
+    RG_GANON_SOUL,
     RG_HINT,
     RG_TYCOON_WALLET,
     RG_MAX
@@ -1468,6 +1477,7 @@ typedef enum {
     RSK_TRIFORCE_HUNT,
     RSK_TRIFORCE_HUNT_PIECES_TOTAL,
     RSK_TRIFORCE_HUNT_PIECES_REQUIRED,
+    RSK_SHUFFLE_BOSS_SOULS,
     RSK_MAX
 } RandomizerSettingKey;
 
@@ -1592,6 +1602,12 @@ typedef enum {
     RO_AMMO_DROPS_OFF,
 } RandoOptionAmmoDrops;
 
+typedef enum {
+    RO_BOSS_SOULS_OFF,
+    RO_BOSS_SOULS_ON,
+    RO_BOSS_SOULS_ON_PLUS_GANON,
+} RandoOptionBossSouls;
+
 //Any Dungeon Item (start with, vanilla, own dungeon, any dungeon,
 //overworld, anywhere)
 typedef enum {
diff --git a/soh/soh/Enhancements/randomizer/randomizer_inf.h b/soh/soh/Enhancements/randomizer/randomizer_inf.h
index c5b75eef0..81b4c0403 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_inf.h
+++ b/soh/soh/Enhancements/randomizer/randomizer_inf.h
@@ -159,6 +159,16 @@ typedef enum {
 
     RAND_INF_10_BIG_POES,
 
+    RAND_INF_GOHMA_SOUL,
+    RAND_INF_KING_DODONGO_SOUL,
+    RAND_INF_BARINADE_SOUL,
+    RAND_INF_PHANTOM_GANON_SOUL,
+    RAND_INF_VOLVAGIA_SOUL,
+    RAND_INF_MORPHA_SOUL,
+    RAND_INF_BONGO_BONGO_SOUL,
+    RAND_INF_TWINROVA_SOUL,
+    RAND_INF_GANON_SOUL,
+
     // If you add anything to this list, you need to update the size of randomizerInf in z64save.h to be ceil(RAND_INF_MAX / 16)
 
     RAND_INF_MAX,
diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c
index 75c85e3e4..3447fa5d4 100644
--- a/soh/src/code/z_parameter.c
+++ b/soh/src/code/z_parameter.c
@@ -2543,6 +2543,13 @@ u16 Randomizer_Item_Give(PlayState* play, GetItemEntry giEntry) {
         return Return_Item_Entry(giEntry, RG_NONE);
     }
 
+    if (item >= RG_GOHMA_SOUL && item <= RG_GANON_SOUL) {
+        u8 index = item - RG_GOHMA_SOUL;
+        Flags_SetRandomizerInf(RAND_INF_GOHMA_SOUL + index);
+
+        return Return_Item_Entry(giEntry, RG_NONE);
+    }
+
     if (item == RG_PROGRESSIVE_BOMBCHUS) {
         if (INV_CONTENT(ITEM_BOMBCHU) == ITEM_NONE) {
             INV_CONTENT(ITEM_BOMBCHU) = ITEM_BOMBCHU;
diff --git a/soh/src/overlays/actors/ovl_Boss_Va/z_boss_va.c b/soh/src/overlays/actors/ovl_Boss_Va/z_boss_va.c
index ee62b141e..ca0d5d948 100644
--- a/soh/src/overlays/actors/ovl_Boss_Va/z_boss_va.c
+++ b/soh/src/overlays/actors/ovl_Boss_Va/z_boss_va.c
@@ -652,6 +652,9 @@ void BossVa_Init(Actor* thisx, PlayState* play2) {
                 this->actor.colChkInfo.damageTable = sDamageTable;
                 sPhase2Timer = 0xFFFF;
                 if (Flags_GetEventChkInf(EVENTCHKINF_BEGAN_BARINA_BATTLE)) {
+                    if (Randomizer_GetSettingValue(RSK_SHUFFLE_BOSS_SOULS) && !Flags_GetRandomizerInf(RAND_INF_BARINADE_SOUL)) {
+                        sCsState = BOSSVA_BATTLE;
+                    } else {
                     sCsState = INTRO_CALL_BARI;
                     sDoorState = 100;
                     func_8002DF54(play, &this->actor, 1);
@@ -682,6 +685,7 @@ void BossVa_Init(Actor* thisx, PlayState* play2) {
                     }
 
                     sCameraAtMaxVel = sCameraEyeMaxVel = sZeroVec;
+                    }
 
                 } else {
                     sCsState = INTRO_START;

From 51e965cf7e79ff17689fd76b96b5c4fef3ebbf95 Mon Sep 17 00:00:00 2001
From: Ralphie Morell <stratomaster64@gmail.com>
Date: Wed, 18 Oct 2023 20:58:09 -0400
Subject: [PATCH 002/230] Cleaned up soul helpers; added check for ganon soul

---
 .../Enhancements/randomizer/3drando/item_pool.cpp    |  1 +
 .../3drando/location_access/locacc_deku_tree.cpp     |  2 +-
 .../location_access/locacc_dodongos_cavern.cpp       |  2 +-
 .../3drando/location_access/locacc_fire_temple.cpp   |  2 +-
 .../3drando/location_access/locacc_forest_temple.cpp |  2 +-
 .../3drando/location_access/locacc_ganons_castle.cpp |  2 +-
 .../location_access/locacc_jabujabus_belly.cpp       |  2 +-
 .../3drando/location_access/locacc_shadow_temple.cpp |  2 +-
 .../3drando/location_access/locacc_spirit_temple.cpp |  2 +-
 .../3drando/location_access/locacc_water_temple.cpp  |  4 ++--
 soh/soh/Enhancements/randomizer/3drando/logic.cpp    | 12 +++---------
 soh/soh/Enhancements/randomizer/3drando/logic.hpp    |  1 +
 12 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
index 22cc5d759..b758b7792 100644
--- a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
@@ -822,6 +822,7 @@ void GenerateItemPool() {
     AddItemToMainPool(BARINADE_BOSS_SOUL);
     AddItemToMainPool(PHANTOM_GANON_BOSS_SOUL);
     AddItemToMainPool(VOLVAGIA_BOSS_SOUL);
+    AddItemToMainPool(MORPHA_BOSS_SOUL);
     AddItemToMainPool(BONGO_BONGO_BOSS_SOUL);
     AddItemToMainPool(TWINROVA_BOSS_SOUL);
     if (ShuffleBossSouls.Is(BOSSSOULS_ON_PLUS_GANON)) {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp
index 8a4b35772..127de3608 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp
@@ -253,7 +253,7 @@ void AreaTable_Init_DekuTree() {
              {
                  // Events
                  EventAccess(&DekuTreeClear, { [] {
-                                                  return DekuTreeClear || (CanSummonGohma && 
+                                                  return DekuTreeClear || (HasBossSoul(GOHMA_BOSS_SOUL) && 
                                                          (CanJumpslash && (Nuts || CanUse(SLINGSHOT) || CanUse(BOW) ||
                                                                            HookshotOrBoomerang)));
                                               }}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp
index 784514188..ca2ea13d5 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp
@@ -290,7 +290,7 @@ void AreaTable_Init_DodongosCavern() {
                  // Events
                  EventAccess(&DodongosCavernClear,
                              { [] {
-                                  return DodongosCavernClear || (CanSummonKingDodongo &&
+                                  return DodongosCavernClear || (HasBossSoul(KING_DODONGO_BOSS_SOUL) &&
                                          (Here(DODONGOS_CAVERN_BOSS_ROOM,
                                                [] { return HasExplosives || (CanUse(MEGATON_HAMMER) && LogicDCHammerFloor); }) &&
                                           (Bombs || GoronBracelet) && CanJumpslash)); /*todo add chu kill to tricks*/
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp
index 31c59094d..74ac34395 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp
@@ -407,7 +407,7 @@ void AreaTable_Init_FireTemple() {
              {
                  // Events
                  EventAccess(&FireTempleClear,
-                             { [] { return FireTempleClear || (CanSummonVolvagia && (FireTimer >= 64 && CanUse(MEGATON_HAMMER))); }}),
+                             { [] { return FireTempleClear || (HasBossSoul(VOLVAGIA_BOSS_SOUL) && (FireTimer >= 64 && CanUse(MEGATON_HAMMER))); }}),
              },
              {
                  // Locations
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp
index dc675849b..7ed3dbdce 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp
@@ -421,7 +421,7 @@ void AreaTable_Init_ForestTemple() {
         {
             // Events
             EventAccess(&ForestTempleClear, { [] {
-                return ForestTempleClear || (CanSummonPhantomGanon && ((CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD)) &&
+                return ForestTempleClear || (HasBossSoul(PHANTOM_GANON_BOSS_SOUL) && ((CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD)) &&
                                              (CanUse(HOOKSHOT) || CanUse(BOW) || CanUse(SLINGSHOT))));
             } }),
         },
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
index ebb8625ec..2a95e8f9e 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
@@ -114,7 +114,7 @@ void AreaTable_Init_GanonsCastle() {
                   //Locations
                   LocationAccess(GANONS_TOWER_BOSS_KEY_CHEST, {[]{return true;}}),
                   LocationAccess(GANONDORF_HINT,              {[]{return BossKeyGanonsCastle;}}),
-                  LocationAccess(GANON,                       {[]{return BossKeyGanonsCastle && CanUse(LIGHT_ARROWS);}}),
+                  LocationAccess(GANON,                       {[]{return HasBossSoul(GANON_BOSS_SOUL) && BossKeyGanonsCastle && CanUse(LIGHT_ARROWS);}}),
   }, {});
 
   /*---------------------------
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp
index 0a14e9257..66b6b35d5 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp
@@ -235,7 +235,7 @@ void AreaTable_Init_JabuJabusBelly() {
              {
                  // Events //todo: add pot kill trick
                  EventAccess(&JabuJabusBellyClear,
-                             { [] { return JabuJabusBellyClear || (CanSummonBarinade && (CanUse(BOOMERANG) && CanJumpslash)); } }),
+                             { [] { return JabuJabusBellyClear || (HasBossSoul(BARINADE_BOSS_SOUL) && (CanUse(BOOMERANG) && CanJumpslash)); } }),
              },
              {
                  // Locations
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp
index 4b3786ec1..bd16b93a4 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp
@@ -194,7 +194,7 @@ void AreaTable_Init_ShadowTemple() {
              {
                  // Events
                  EventAccess(&ShadowTempleClear, { [] {
-                     return ShadowTempleClear || (CanSummonBongoBongo &&
+                     return ShadowTempleClear || (HasBossSoul(BONGO_BONGO_BOSS_SOUL) &&
                             ((CanUse(LENS_OF_TRUTH) || LogicLensBongo) &&
                              (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD)) &&
                              (CanUse(HOOKSHOT) || CanUse(BOW) || CanUse(SLINGSHOT) || LogicShadowBongo)));
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp
index c44ece42d..3c70fdf0b 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp
@@ -259,7 +259,7 @@ void AreaTable_Init_SpiritTemple() {
         {
             // Events
             EventAccess(&SpiritTempleClear, { [] {
-                return SpiritTempleClear || (CanSummonTwinrova && (CanUse(MIRROR_SHIELD) &&
+                return SpiritTempleClear || (HasBossSoul(TWINROVA_BOSS_SOUL) && (CanUse(MIRROR_SHIELD) &&
                                              (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD))));
             } }),
         },
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp
index c8905b78e..3dad7cdf1 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp
@@ -318,14 +318,14 @@ void AreaTable_Init_WaterTemple() {
         {
             // Events
             EventAccess(&WaterTempleClear, { [] {
-                return WaterTempleClear || (CanSummonMorpha &&
+                return WaterTempleClear || (HasBossSoul(MORPHA_BOSS_SOUL) &&
                        (CanUse(HOOKSHOT) && (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD))));
             } }),
         },
         {
             // Locations
             LocationAccess(WATER_TEMPLE_MORPHA_HEART, { [] { return WaterTempleClear; } }),
-            LocationAccess(MORPHA, { [] { return CanSummonMorpha && WaterTempleClear; } }),
+            LocationAccess(MORPHA, { [] { return WaterTempleClear; } }),
         },
         {
             // Exits
diff --git a/soh/soh/Enhancements/randomizer/3drando/logic.cpp b/soh/soh/Enhancements/randomizer/3drando/logic.cpp
index fe79cae67..e163b6c69 100644
--- a/soh/soh/Enhancements/randomizer/3drando/logic.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/logic.cpp
@@ -478,6 +478,9 @@ namespace Logic {
     if (ShuffleBossSouls.Is(BOSSSOULS_OFF)) {
       return true;
     }
+    if (ShuffleBossSouls.IsNot(BOSSSOULS_ON_PLUS_GANON) && itemName == GANON_BOSS_SOUL) {
+      return true;
+    }
     return (itemName == GOHMA_BOSS_SOUL && CanSummonGohma)         ||
     (itemName == KING_DODONGO_BOSS_SOUL && CanSummonKingDodongo)   ||
     (itemName == BARINADE_BOSS_SOUL && CanSummonBarinade)          ||
@@ -651,15 +654,6 @@ namespace Logic {
                      (LACSCondition == LACSCONDITION_DUNGEONS   && DungeonCount + (Greg && GregInLogic ? 1 : 0) >= LACSDungeonCount.Value<uint8_t>())                ||
                      (LACSCondition == LACSCONDITION_TOKENS     && GoldSkulltulaTokens >= LACSTokenCount.Value<uint8_t>());
     CanCompleteTriforce = TriforcePieces >= TriforceHuntRequired.Value<uint8_t>();
-    CanSummonGohma = HasBossSoul(GOHMA_BOSS_SOUL);
-    CanSummonKingDodongo = HasBossSoul(KING_DODONGO_BOSS_SOUL);
-    CanSummonBarinade = HasBossSoul(BARINADE_BOSS_SOUL);
-    CanSummonPhantomGanon = HasBossSoul(PHANTOM_GANON_BOSS_SOUL);
-    CanSummonVolvagia = HasBossSoul(VOLVAGIA_BOSS_SOUL);
-    CanSummonMorpha = HasBossSoul(MORPHA_BOSS_SOUL);
-    CanSummonBongoBongo = HasBossSoul(BONGO_BONGO_BOSS_SOUL);
-    CanSummonTwinrova = HasBossSoul(TWINROVA_BOSS_SOUL);
-    CanSummonGanon = HasBossSoul(GANON_BOSS_SOUL);
 
   }
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/logic.hpp b/soh/soh/Enhancements/randomizer/3drando/logic.hpp
index a58338899..37b56858a 100644
--- a/soh/soh/Enhancements/randomizer/3drando/logic.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/logic.hpp
@@ -377,6 +377,7 @@ void UpdateHelpers();
 bool CanPlay(bool song);
 bool CanUse(uint32_t itemName);
 bool HasProjectile(HasProjectileAge age);
+bool HasBossSoul(uint32_t itemName);
 bool SmallKeys(Key dungeon, uint8_t requiredAmount);
 bool SmallKeys(Key dungeon, uint8_t requiredAmountGlitchless, uint8_t requiredAmountGlitched);
 bool CanDoGlitch(GlitchType glitch);

From db4a30a7ffa434d1c89be6ad0aab30309363c5f9 Mon Sep 17 00:00:00 2001
From: Ralphie Morell <stratomaster64@gmail.com>
Date: Wed, 18 Oct 2023 23:58:14 -0400
Subject: [PATCH 003/230] don't commit at fucking 2am

---
 .../3drando/hint_list/hint_list_item.cpp      | 187 +++++++++---------
 .../randomizer/3drando/item_list.cpp          |  18 +-
 .../Enhancements/randomizer/randomizer.cpp    |   8 +-
 3 files changed, 110 insertions(+), 103 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp
index f2b836bf5..70c701535 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp
@@ -1941,104 +1941,111 @@ void HintTable_Init_Item() {
 
     hintTable[GOHMA_BOSS_SOUL] = HintText::Item({
                       //obscure text
-                      Text{"a regal soul", "", ""},
-                      Text("some spider essence", "", ""),
+                      Text{"an invasive soul", "", ""},
+                      Text{"some spider essence", "", ""},
                     }, {
                       //ambiguous text
-                      Text("something webbed", "", "")
+                      Text{"something webbed", "", ""}
                     }, {
                       //clear text
-                      Text("the soul of Gohma", "", "")}
+                      Text{"the soul of Gohma", "", ""}}
     );
 
     hintTable[KING_DODONGO_BOSS_SOUL] = HintText::Item({
-      //obscure text
-      Text{"a royal soul", "", ""},
-      Text("some reptile essence", "", ""),
-    }, {
-      //ambiguous text
-      Text("something spectral", "", "")
-    }, {
-      //clear text
-      Text("the soul of King Dodongo", "", "")
-    });
-     hintTable[BARINADE_BOSS_SOUL] = HintText::Item({
-      //obscure text
-      Text{"an infectuous soul", "", ""},
-      Text("some parasitic essence", "", ""),
-    }, {
-      //ambiguous text
-      Text("something fishy", "", "")
-    }, {
-      //clear text
-      Text("the soul of Barinade", "", "")
-    });
+                      //obscure text
+                      Text{"a royal soul", "", ""},
+                      Text{"some reptile essence", "", ""},
+                    }, {
+                      //ambiguous text
+                      Text{"something explosive", "", ""}
+                    }, {
+                      //clear text
+                      Text{"the soul of King Dodongo", "", ""}}
+      );
+
+    hintTable[BARINADE_BOSS_SOUL] = HintText::Item({
+                      //obscure text
+                      Text{"an infectuous soul", "", ""},
+                      Text{"some parasitic essence", "", ""},
+                    }, {
+                      //ambiguous text
+                      Text{"something fishy", "", ""}
+                    }, {
+                      //clear text
+                      Text("the soul of Barinade", "", "")}
+      );
+
     hintTable[PHANTOM_GANON_BOSS_SOUL] = HintText::Item({
-      //obscure text
-      Text{"a duplicate soul", "", ""},
-      Text("some illusionary essence", "", ""),
-    }, {
-      //ambiguous text
-      Text("something spectral", "", "")
-    }, {
-      //clear text
-      Text("the soul of Phantom Ganon", "", "")
-    });
-hintTable[VOLVAGIA_BOSS_SOUL] = HintText::Item({
-      //obscure text
-      Text{"a draconic soul", "", ""},
-      Text("some magmatic essence", "", ""),
-    }, {
-      //ambiguous text
-      Text("something hot", "", "")
-    }, {
-      //clear text
-      Text("the soul of Volvagia", "", "")
-    });
-hintTable[MORPHA_BOSS_SOUL] = HintText::Item({
-      //obscure text
-      Text{"an aquatic soul", "", ""},
-      Text("some liquid essence", "", ""),
-    }, {
-      //ambiguous text
-      Text("something wet", "", "")
-    }, {
-      //clear text
-      Text("the soul of Barinade", "", "")
-    });
-hintTable[BONGO_BONGO_BOSS_SOUL] = HintText::Item({
-      //obscure text
-      Text{"a shadowy soul", "", ""},
-      Text("some handy essence", "", ""),
-    }, {
-      //ambiguous text
-      Text("something dark", "", "")
-    }, {
-      //clear text
-      Text("the soul of Bongo Bongo", "", "")
-    });
-hintTable[TWINROVA_BOSS_SOUL] = HintText::Item({
-      //obscure text
-      Text{"old souls", "", ""},
-      Text("twin essences", "", ""),
-    }, {
-      //ambiguous text
-      Text("something spiritual", "", "")
-    }, {
-      //clear text
-      Text("the soul of Twinrova", "", "")
-    });
-hintTable[GANON_BOSS_SOUL] = HintText::Item({
-      //obscure text
-      Text{"an evil soul", "", ""},
-      Text("some powerful essence", "", ""),
-    }, {
-      //ambiguous text
-      Text("something strong", "", "")
-    }, {
-      //clear text
-      Text("the soul of Ganon", "", "")
-    });
+                      //obscure text
+                      Text{"a duplicate soul", "", ""},
+                      Text{"some illusionary essence", "", ""},
+                    }, {
+                      //ambiguous text
+                      Text{"something spectral", "", ""}
+                    }, {
+                      //clear text
+                      Text{"the soul of Phantom Ganon", "", ""}}
+      );
+
+    hintTable[VOLVAGIA_BOSS_SOUL] = HintText::Item({
+                      //obscure text
+                      Text{"a draconic soul", "", ""},
+                      Text{"some magmatic essence", "", ""},
+                    }, {
+                      //ambiguous text
+                      Text{"something hot", "", ""}
+                    }, {
+                      //clear text
+                      Text{"the soul of Volvagia", "", ""}}
+     );
+
+    hintTable[MORPHA_BOSS_SOUL] = HintText::Item({
+                      //obscure text
+                      Text{"an aquatic soul", "", ""},
+                      Text{"some liquid essence", "", ""},
+                    }, {
+                      //ambiguous text
+                      Text{"something wet", "", ""}
+                    }, {
+                      //clear text
+                      Text{"the soul of Barinade", "", ""}}
+     );
+
+    hintTable[BONGO_BONGO_BOSS_SOUL] = HintText::Item({
+                      //obscure text
+                      Text{"a shadowy soul", "", ""},
+                      Text{"some handy essence", "", ""},
+                    }, {
+                      //ambiguous text
+                      Text{"something dark", "", ""}
+                    }, {
+                      //clear text
+                      Text{"the soul of Bongo Bongo", "", ""}}
+     );
+
+    hintTable[TWINROVA_BOSS_SOUL] = HintText::Item({
+                      //obscure text
+                      Text{"old souls", "", ""},
+                      Text{"twin essences", "", ""},
+                    }, {
+                      //ambiguous text
+                      Text{"something spiritual", "", ""}
+                    }, {
+                      //clear text
+                      Text{"the soul of Twinrova", "", ""}}
+     );
+
+    hintTable[GANON_BOSS_SOUL] = HintText::Item({
+                      //obscure text
+                      Text{"an evil soul", "", ""},
+                      Text{"some powerful essence", "", ""},
+                    }, {
+                      //ambiguous text
+                      Text{"something strong", "", ""}
+                    }, {
+                      //clear text
+                      Text{"the soul of Ganon", "", ""}}
+     );
 
     hintTable[EPONA] = HintText::Item({
                        //obscure text
diff --git a/soh/soh/Enhancements/randomizer/3drando/item_list.cpp b/soh/soh/Enhancements/randomizer/3drando/item_list.cpp
index 4b3cdab07..68c3f5fa7 100644
--- a/soh/soh/Enhancements/randomizer/3drando/item_list.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/item_list.cpp
@@ -247,15 +247,15 @@ void ItemTable_Init() {                              // RandomizerGet
     itemTable[HINT]                              = Item(RG_HINT,                              Text{"Hint",                            "Indice",                           "Pista"},                                   ITEMTYPE_EVENT, GI_RUPEE_BLUE_LOSE, false, &noVariable, NONE);
 
     //Boss Souls
-    itemTable[GOHMA_BOSS_SOUL]                   = Item(RG_GOHMA_SOUL,                        Text{"Gohma's Soul",                    "Ame de Gohma",                     "Alma de Gohma"},                      ITEMTYPE_ITEM, 0xE1, true,  &CanSummonGohma, NONE);
-    itemTable[KING_DODONGO_BOSS_SOUL]            = Item(RG_KING_DODONGO_SOUL,                 Text{"King Dodongo's Soul",             "Ame de ",                          "Alma de "},                           ITEMTYPE_ITEM, 0xE2, true,  &CanSummonKingDodongo, NONE);
-    itemTable[BARINADE_BOSS_SOUL]                = Item(RG_BARINADE_SOUL,                     Text{"Barinade's Soul",                 "Ame de ",                          "Alma de "},                           ITEMTYPE_ITEM, 0xE3, true,  &CanSummonBarinade, NONE);
-    itemTable[PHANTOM_GANON_BOSS_SOUL]           = Item(RG_GOHMA_SOUL,                        Text{"Phantom Ganon's Soul",            "Ame de ",                          "Alma de "},                           ITEMTYPE_ITEM, 0xE4, true,  &CanSummonPhantomGanon, NONE);
-    itemTable[VOLVAGIA_BOSS_SOUL]                = Item(RG_GOHMA_SOUL,                        Text{"Volvagia's Soul",                 "Ame de ",                          "Alma de "},                           ITEMTYPE_ITEM, 0xE5, true,  &CanSummonVolvagia, NONE);
-    itemTable[MORPHA_BOSS_SOUL]                  = Item(RG_GOHMA_SOUL,                        Text{"Morpha's Soul",                   "Ame de ",                          "Alma de "},                           ITEMTYPE_ITEM, 0xE6, true,  &CanSummonMorpha, NONE);
-    itemTable[BONGO_BONGO_BOSS_SOUL]             = Item(RG_GOHMA_SOUL,                        Text{"Bongo Bongo's Soul",              "Ame de ",                          "Alma de "},                           ITEMTYPE_ITEM, 0xE7, true,  &CanSummonBongoBongo, NONE);
-    itemTable[TWINROVA_BOSS_SOUL]                = Item(RG_GOHMA_SOUL,                        Text{"Twinrova's Soul",                 "Ame de ",                          "Alma de "},                           ITEMTYPE_ITEM, 0xE8, true,  &CanSummonTwinrova, NONE);
-    itemTable[GANON_BOSS_SOUL]                   = Item(RG_GOHMA_SOUL,                        Text{"Ganon's Soul",                    "Ame de ",                          "Alma de "},                           ITEMTYPE_ITEM, 0xE9, true,  &CanSummonGanon, NONE);
+    itemTable[GOHMA_BOSS_SOUL]                   = Item(RG_GOHMA_SOUL,                        Text{"Gohma's Soul",                    "Ame de Gohma",                     "Alma de Gohma"},                           ITEMTYPE_ITEM, 0xE1, true,  &CanSummonGohma, NONE);
+    itemTable[KING_DODONGO_BOSS_SOUL]            = Item(RG_KING_DODONGO_SOUL,                 Text{"King Dodongo's Soul",             "Ame de ",                          "Alma de "},                                ITEMTYPE_ITEM, 0xE2, true,  &CanSummonKingDodongo, NONE);
+    itemTable[BARINADE_BOSS_SOUL]                = Item(RG_BARINADE_SOUL,                     Text{"Barinade's Soul",                 "Ame de ",                          "Alma de "},                                ITEMTYPE_ITEM, 0xE3, true,  &CanSummonBarinade, NONE);
+    itemTable[PHANTOM_GANON_BOSS_SOUL]           = Item(RG_PHANTOM_GANON_SOUL,                Text{"Phantom Ganon's Soul",            "Ame de ",                          "Alma de "},                                ITEMTYPE_ITEM, 0xE4, true,  &CanSummonPhantomGanon, NONE);
+    itemTable[VOLVAGIA_BOSS_SOUL]                = Item(RG_VOLVAGIA_SOUL,                     Text{"Volvagia's Soul",                 "Ame de ",                          "Alma de "},                                ITEMTYPE_ITEM, 0xE5, true,  &CanSummonVolvagia, NONE);
+    itemTable[MORPHA_BOSS_SOUL]                  = Item(RG_MORPHA_SOUL,                       Text{"Morpha's Soul",                   "Ame de ",                          "Alma de "},                                ITEMTYPE_ITEM, 0xE6, true,  &CanSummonMorpha, NONE);
+    itemTable[BONGO_BONGO_BOSS_SOUL]             = Item(RG_BONGO_BONGO_SOUL,                  Text{"Bongo Bongo's Soul",              "Ame de ",                          "Alma de "},                                ITEMTYPE_ITEM, 0xE7, true,  &CanSummonBongoBongo, NONE);
+    itemTable[TWINROVA_BOSS_SOUL]                = Item(RG_TWINROVA_SOUL,                     Text{"Twinrova's Soul",                 "Ame de ",                          "Alma de "},                                ITEMTYPE_ITEM, 0xE8, true,  &CanSummonTwinrova, NONE);
+    itemTable[GANON_BOSS_SOUL]                   = Item(RG_GANON_SOUL,                        Text{"Ganon's Soul",                    "Ame de ",                          "Alma de "},                                ITEMTYPE_ITEM, 0xE9, true,  &CanSummonGanon, NONE);
 
 //  itemTable[HOOKSHOT]                          = Item(RG_HOOKSHOT,                          Text{"Hookshot",                        "Grappin",                          "Gancho"},                                  ITEMTYPE_ITEM, 0x80, true,  &ProgressiveHookshot, HOOKSHOT);
 //  itemTable[LONGSHOT]                          = Item(RG_LONGSHOT,                          Text{"Longshot",                        "Super-Grappin",                    "Supergancho"},                             ITEMTYPE_ITEM, 0x80, true,  &ProgressiveHookshot, LONGSHOT);
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index 5489b1c45..d8f2bc5f3 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -6119,12 +6119,12 @@ void Randomizer::CreateCustomMessages() {
 			"Vous obtenez la %rBourse de Magnat%w!&Elle peut contenir jusqu'à %y999 rubis%w!&C'est gigantesque!"),
 
         GIMESSAGE_UNTRANSLATED(RG_GOHMA_SOUL, ITEM_BIG_POE, "You found the soul for %gGohma%w!"),
-        GIMESSAGE_UNTRANSLATED(RG_KING_DODONGO_SOUL, ITEM_BIG_POE, "You found the soul for %rKing Dodongo%w!"),
-        GIMESSAGE_UNTRANSLATED(RG_BARINADE_SOUL, ITEM_BIG_POE, "You found the soul for %bBarindade%w!"),
-        GIMESSAGE_UNTRANSLATED(RG_PHANTOM_GANON_SOUL, ITEM_BIG_POE, "You found the soul for %gPhantom Ganon%w!"),
+        GIMESSAGE_UNTRANSLATED(RG_KING_DODONGO_SOUL, ITEM_BIG_POE, "You found the soul for %rKing&Dodongo%w!"),
+        GIMESSAGE_UNTRANSLATED(RG_BARINADE_SOUL, ITEM_BIG_POE, "You found the soul for %bBarinade%w!"),
+        GIMESSAGE_UNTRANSLATED(RG_PHANTOM_GANON_SOUL, ITEM_BIG_POE, "You found the soul for %gPhantom&Ganon%w!"),
         GIMESSAGE_UNTRANSLATED(RG_VOLVAGIA_SOUL, ITEM_BIG_POE, "You found the soul for %rVolvagia%w!"),
         GIMESSAGE_UNTRANSLATED(RG_MORPHA_SOUL, ITEM_BIG_POE, "You found the soul for %bMorpha%w!"),
-        GIMESSAGE_UNTRANSLATED(RG_BONGO_BONGO_SOUL, ITEM_BIG_POE, "You found the soul for %pBongo Bongo%w!"),
+        GIMESSAGE_UNTRANSLATED(RG_BONGO_BONGO_SOUL, ITEM_BIG_POE, "You found the soul for %pBongo&Bongo%w!"),
         GIMESSAGE_UNTRANSLATED(RG_TWINROVA_SOUL, ITEM_BIG_POE, "You found the soul for %yTwinrova%w!"),
         GIMESSAGE_UNTRANSLATED(RG_GANON_SOUL, ITEM_BIG_POE, "You found the soul for %cGanon%w!"),
         

From 0751c59530098598046510ebddd059d5e946e236 Mon Sep 17 00:00:00 2001
From: Ralphie Morell <stratomaster64@gmail.com>
Date: Thu, 19 Oct 2023 00:23:05 -0400
Subject: [PATCH 004/230] also remove phantom ganon's horses if he's not there

---
 soh/soh/Enhancements/mods.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/soh/soh/Enhancements/mods.cpp b/soh/soh/Enhancements/mods.cpp
index 7424b8b86..9415b0c67 100644
--- a/soh/soh/Enhancements/mods.cpp
+++ b/soh/soh/Enhancements/mods.cpp
@@ -1034,6 +1034,10 @@ void RegisterBossSouls() {
                 break;
             case SCENE_FOREST_TEMPLE_BOSS:
                 rand_inf = RAND_INF_PHANTOM_GANON_SOUL;
+                //Special case for Phantom Ganon's horse (and fake), as they're considered "background actors."
+                if (actual->id == ACTOR_EN_FHG) {
+                    Actor_Delete(&gPlayState->actorCtx, actual, gPlayState);
+                }
                 break;
             case SCENE_FIRE_TEMPLE_BOSS:
                 rand_inf = RAND_INF_VOLVAGIA_SOUL;

From e005985559c67331fdfee35127889e4da437d3e6 Mon Sep 17 00:00:00 2001
From: Ralphie Morell <stratomaster64@gmail.com>
Date: Thu, 19 Oct 2023 17:17:45 -0400
Subject: [PATCH 005/230] Added tracker support

---
 .../randomizer/randomizer_item_tracker.cpp    | 107 ++++++++++++++++++
 1 file changed, 107 insertions(+)

diff --git a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
index f24ab818b..e3eb8fded 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
@@ -84,6 +84,24 @@ std::vector<ItemTrackerItem> triforcePieces = {
     ITEM_TRACKER_ITEM(RG_TRIFORCE_PIECE, 0, DrawItem),
 };
 
+std::vector<ItemTrackerItem> bossSoulItems = {
+    //Hack for right now, just gonna draw souls as bottles/big poes.
+    ItemTrackerItem(RG_GOHMA_SOUL, "ITEM_BIG_POE", "ITEM_BOTTLE_Faded", 0, DrawItem ),
+    ItemTrackerItem(RG_KING_DODONGO_SOUL, "ITEM_BIG_POE", "ITEM_BOTTLE_Faded", 0, DrawItem ),
+    ItemTrackerItem(RG_BARINADE_SOUL, "ITEM_BIG_POE", "ITEM_BOTTLE_Faded", 0, DrawItem ),
+    ItemTrackerItem(RG_PHANTOM_GANON_SOUL, "ITEM_BIG_POE", "ITEM_BOTTLE_Faded", 0, DrawItem ),
+    ItemTrackerItem(RG_VOLVAGIA_SOUL, "ITEM_BIG_POE", "ITEM_BOTTLE_Faded", 0, DrawItem ),
+    ItemTrackerItem(RG_MORPHA_SOUL, "ITEM_BIG_POE", "ITEM_BOTTLE_Faded", 0, DrawItem ),
+    ItemTrackerItem(RG_BONGO_BONGO_SOUL, "ITEM_BIG_POE", "ITEM_BOTTLE_Faded", 0, DrawItem ),
+    ItemTrackerItem(RG_TWINROVA_SOUL, "ITEM_BIG_POE", "ITEM_BOTTLE_Faded", 0, DrawItem ),
+    ItemTrackerItem(RG_GANON_SOUL, "ITEM_BIG_POE", "ITEM_BOTTLE_Faded", 0, DrawItem ),
+    
+    //For when these actually have textures, maybe?
+    // ITEM_TRACKER_ITEM(RG_GOHMA_SOUL, 0, DrawItem),         ITEM_TRACKER_ITEM(RG_KING_DODONGO_SOUL, 0, DrawItem), ITEM_TRACKER_ITEM(RG_BARINADE_SOUL, 0, DrawItem),
+    // ITEM_TRACKER_ITEM(RG_PHANTOM_GANON_SOUL, 0, DrawItem), ITEM_TRACKER_ITEM(RG_VOLVAGIA_SOUL, 0, DrawItem),     ITEM_TRACKER_ITEM(RG_MORPHA_SOUL, 0, DrawItem),
+    // ITEM_TRACKER_ITEM(RG_BONGO_BONGO_SOUL, 0, DrawItem),   ITEM_TRACKER_ITEM(RG_TWINROVA_SOUL, 0, DrawItem),     ITEM_TRACKER_ITEM(RG_GANON_SOUL, 0, DrawItem),
+};
+
 std::vector<ItemTrackerDungeon> itemTrackerDungeonsWithMapsHorizontal = {
     { SCENE_DEKU_TREE, { ITEM_DUNGEON_MAP, ITEM_COMPASS } },
     { SCENE_DODONGOS_CAVERN, { ITEM_DUNGEON_MAP, ITEM_COMPASS } },
@@ -154,6 +172,18 @@ std::map<uint16_t, std::string> itemTrackerDungeonShortNames = {
     { SCENE_THIEVES_HIDEOUT, "HIDE" },
 };
 
+std::map<uint16_t, std::string> itemTrackerBossShortNames = {
+    { RG_GOHMA_SOUL, "GOHMA" },
+    { RG_KING_DODONGO_SOUL, "KD" },
+    { RG_BARINADE_SOUL, "BARI" },
+    { RG_PHANTOM_GANON_SOUL, "PG"},
+    { RG_VOLVAGIA_SOUL, "VOLV"},
+    { RG_MORPHA_SOUL, "MORPH"},
+    { RG_BONGO_BONGO_SOUL, "BONGO"},
+    { RG_TWINROVA_SOUL, "TWIN"},
+    { RG_GANON_SOUL, "GANON"},
+};
+
 std::vector<ItemTrackerItem> dungeonItems = {};
 
 std::unordered_map<uint32_t, ItemTrackerItem> actualItemTrackerItemMap = {
@@ -609,6 +639,52 @@ void DrawItem(ItemTrackerItem item) {
             hasItem = IS_RANDO && OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIFORCE_HUNT);
             itemName = "Triforce Piece";
             break;
+        case RG_GOHMA_SOUL:
+            actualItemId = item.id;
+            hasItem = Flags_GetRandomizerInf(RAND_INF_GOHMA_SOUL);
+            itemName = "Gohma's Soul";
+            break;
+        case RG_KING_DODONGO_SOUL:
+            actualItemId = item.id;
+            hasItem = Flags_GetRandomizerInf(RAND_INF_KING_DODONGO_SOUL);
+            itemName = "King Dodongo's Soul";
+            break;
+        case RG_BARINADE_SOUL:
+            actualItemId = item.id;
+            hasItem = Flags_GetRandomizerInf(RAND_INF_BARINADE_SOUL);
+            itemName = "Barinade's Soul";
+            break;
+        case RG_PHANTOM_GANON_SOUL:
+            actualItemId = item.id;
+            hasItem = Flags_GetRandomizerInf(RAND_INF_PHANTOM_GANON_SOUL);
+            itemName = "Phantom Ganon's Soul";
+            break;
+        case RG_VOLVAGIA_SOUL:
+            actualItemId = item.id;
+            hasItem = Flags_GetRandomizerInf(RAND_INF_VOLVAGIA_SOUL);
+            itemName = "Volvagia's Soul";
+            break;
+        case RG_MORPHA_SOUL:
+            actualItemId = item.id;
+            hasItem = Flags_GetRandomizerInf(RAND_INF_MORPHA_SOUL);
+            itemName = "Morpha's Soul";
+            break;
+        case RG_BONGO_BONGO_SOUL:
+            actualItemId = item.id;
+            hasItem = Flags_GetRandomizerInf(RAND_INF_BONGO_BONGO_SOUL);
+            itemName = "Bongo Bongo's Soul";
+            break;
+        case RG_TWINROVA_SOUL:
+            actualItemId = item.id;
+            hasItem = Flags_GetRandomizerInf(RAND_INF_TWINROVA_SOUL);
+            itemName = "Twinrova's Soul";
+            break;
+        case RG_GANON_SOUL:
+            actualItemId = item.id;
+            hasItem = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_BOSS_SOULS) == RO_BOSS_SOULS_ON_PLUS_GANON ? true :
+                Flags_GetRandomizerInf(RAND_INF_GANON_SOUL);
+            itemName = "Ganon's Soul";
+            break;
     }
 
     if (GameInteractor::IsSaveLoaded() && (hasItem && item.id != actualItemId && actualItemTrackerItemMap.find(actualItemId) != actualItemTrackerItemMap.end())) {
@@ -621,6 +697,16 @@ void DrawItem(ItemTrackerItem item) {
                  ImVec2(iconSize, iconSize), ImVec2(0, 0), ImVec2(1, 1));
     
     DrawItemCount(item);
+
+    if (item.id >= RG_GOHMA_SOUL && item.id <= RG_GANON_SOUL) {
+        ImVec2 p = ImGui::GetCursorScreenPos();
+        std::string bossName = itemTrackerBossShortNames[item.id];
+        ImGui::SetCursorScreenPos(ImVec2(p.x + (iconSize / 2) - (ImGui::CalcTextSize(bossName.c_str()).x / 2), p.y - (iconSize + 13)));
+        ImGui::PushStyleColor(ImGuiCol_Text, IM_COL_WHITE);
+        ImGui::Text("%s", bossName.c_str());
+        ImGui::PopStyleColor();
+    }
+
     ImGui::EndGroup();
 
     if (itemName == "") {
@@ -956,6 +1042,17 @@ void UpdateVectors() {
         mainWindowItems.insert(mainWindowItems.end(), triforcePieces.begin(), triforcePieces.end());
     }
 
+    //If we're adding boss souls to the main window...
+    if (CVarGetInteger("gItemTrackerBossSoulsDisplayType", SECTION_DISPLAY_HIDDEN) == SECTION_DISPLAY_MAIN_WINDOW) {
+        //...add empty items on the main window to get the souls on their own row. (Too many to sit with Greg/Triforce pieces)
+        while (mainWindowItems.size() % 6) {
+            mainWindowItems.push_back(ITEM_TRACKER_ITEM(ITEM_NONE, 0, DrawItem));
+        }
+
+        //Add boss souls
+        mainWindowItems.insert(mainWindowItems.end(), bossSoulItems.begin(), bossSoulItems.end());
+    }
+
     shouldUpdateVectors = false;
 }
 
@@ -1056,6 +1153,12 @@ void ItemTrackerWindow::DrawElement() {
             EndFloatingWindows();
         }
 
+        if (CVarGetInteger("gItemTrackerBossSoulsDisplayType", SECTION_DISPLAY_HIDDEN) == SECTION_DISPLAY_SEPARATE) {
+            BeginFloatingWindows("Boss Soul Tracker");
+            DrawItemsInRows(bossSoulItems);
+            EndFloatingWindows();
+        }
+
         if (CVarGetInteger("gItemTrackerNotesDisplayType", SECTION_DISPLAY_HIDDEN) == SECTION_DISPLAY_SEPARATE && CVarGetInteger("gItemTrackerDisplayType", TRACKER_DISPLAY_ALWAYS) == TRACKER_DISPLAY_ALWAYS) {
             ImGui::SetNextWindowSize(ImVec2(400,300), ImGuiCond_FirstUseEver);
             BeginFloatingWindows("Personal Notes", ImGuiWindowFlags_NoFocusOnAppearing);
@@ -1195,6 +1298,10 @@ void ItemTrackerSettingsWindow::DrawElement() {
         shouldUpdateVectors = true;
     }
 
+    if (UIWidgets::LabeledRightAlignedEnhancementCombobox("Boss Souls", "gItemTrackerBossSoulsDisplayType", displayTypes, SECTION_DISPLAY_HIDDEN)) {
+        shouldUpdateVectors = true;
+    }
+
     if (CVarGetInteger("gItemTrackerDisplayType", TRACKER_DISPLAY_ALWAYS) == TRACKER_DISPLAY_ALWAYS) {
         if (UIWidgets::LabeledRightAlignedEnhancementCombobox("Personal notes", "gItemTrackerNotesDisplayType", displayTypes, SECTION_DISPLAY_HIDDEN)) {
             shouldUpdateVectors = true;

From 92028aa8d835763449cec573c1a11c21704cd60e Mon Sep 17 00:00:00 2001
From: Christopher Leggett <chris@leggett.dev>
Date: Thu, 19 Oct 2023 19:48:25 -0400
Subject: [PATCH 006/230] Rando Definition Deduplication (#3284)

* Initial StaticData and RandoItem class definitions

* Initial implementation of RandoItem class.

* Rerranges RandoItem Constructor parameters

The parameters were rearranged for easy copy-paste from the GET_ITEM macro calls later on.

* Switches static data from map to static array.

Array is all that is needed, since the item list will be contiguous and indexed by the RandomizerGet Enum values.

* Defines part of the randomizer item list.

* Adds more item class instances to item_list.cpp

Up through bottles, many more items still to go.

* Adds song items

* Adds Maps and Compasses to the item_list

* Added Key Items to item_list

* Added Key Rings to item_list

* Added Dungeon Rewards to item_list

* Adds generic items and refills to item_list

* Adds shop items, triforce, and hints

Also added constructors that put the GET_ITEM_NONE data in for these items, since there is no corresponding GetItemEntry for them.

* Adds in the stages of progressive items

These are present for GetItemEntry purposes, and aren't really meant to be used in seed generation (unless we find a need for it later on.)

* Remove GetItemEntry data from progressive items

* Moves/adds function definitions to item/item_list

* Refactors GetItemEntry data

It's now a pointer to memory instantiated on the heap in the constructor. These are shared pointers so the memory is freed if any of the item instances get deconstructed (which they shouldn't but just in case.)

* Adds item class member for if item is progressive

* Removes unneeded stuff from initializer list macro

* Replaces relevant `uint32_t`s w/ `RandomizerGet`s

Also replaces calls to the ItemTable method with StaticData::RetrieveItem

* Switches our runtime code to use the new itemList.

* Changes just enough hint gen code to compile

* Initial Definition of Location Class

* Initial Implementation of Location

* Fixes some names and definitions.

* Extracts ActorID and SceneID enums to separate files.

This allows importing them without causing weird conflicts in cpp files when importing the z64scene.h and z64actor.h files directly. Now you can just import z64scene_enum.h and z64actor_enum.h instead. The two old files also import these new files so that existing setups still work as expected.

* Replaces the forward definitions with the new imports.

* Adds missing data for RandomizerCheckObjects.

* Definition and first entry of locationTable

* Added Mido's House Locations

* Added locations up through lost woods.

* Adds in Hyrule Field locations.

* Adds Lake Hylia locations

* Adds location name comments

* Adds Gerudo Valley Locations

* Adds Gerudo Fortress locations.

* Adds the Wasteland and Collosus locations

* Adds Market locations

* Adds Hyrule Castle locations.

* Adds Kakariko and Graveyard locations.

* Adds Death Mountain checks.

* Adds Goron City locations

* Adds Death Mountain Crater locations

* Adds Zora's River locations

* Added Zora's Domain Locations.

* Added Zora's Fountain locations

* Adds Lon Lon Ranch locations.

* Adds Deku Tree locations

* Adds Dodongo's Cavern Locations.

* Adds Jabu Jabu's Belly Locations

* Adds Forest Temple Locations

* Adds Fire Temple Locations

* Adds Water Temple Locations

* Added Spirit Temple Locations

* Some of shadow temple locations.

* Adds remaining Shadow Temple locations

* Fixes a leftover merge conflict

* Adds Bottom of the Well locations.

* Adds Ice Cavern locations

* Adds GTG locations.

* Adds Ganon's Castle and Tower locations

* Adds dungeon Gold Skulltula locations.

* Adds Overworld Gold Skulltula locations

* Adds dungeon reward locations

* Adds Heart Container Locations

* Adds Cutscene and Song locations

* Adds Cow locations

* Adds Shop locations.

* Adds hint locations

* Adds function for retrieving the Location data.

* Initial definition of ItemLocation structure for tracking runtime data

* First push on converting code to use new location definitions

* Changes hints to use the new tables

* Further conversion of hints to new definitions.

* Adds new Hint and Location IDs to area tables

* Moves areaTable to use new RandomizerRegion keys

* Removal of 3drando/item_location files.

* Uses new RandomizerRegion keys in entrance.cpp

* Final push for removal of massive keys.hpp enum

* Uses new SceneID Enum Values

* Remove RandomizerCheckObject structs in favor of new location list.

* Fix a few stragglers to successfully build

* Rename of RandoItem to just Item, but in the Rando namespace

* Adds static hints (Light Arrows, Altar text, etc) to the new Hint table.

* More hint related fixes/edits

* small fix for #include path

* Fix various miscellaneous issues related to seed gen and spoiler parsing.

* Handle progressive items correctly.

* Fixes some hint generation logic

* Fix a few GetItemEntry niche bugs.

* Adds missing shop GI Entries

* Formatting fixes

* small formatting fix

* Namespace StaticData under Rando

* Added a note about a potential use-after-free.

I confirmed the actual pointer in question isn't currently being used, but I added the note as a reminder to fix it later and/or as a warning to anyone who changes how the return value is used.

* Fixes missing location table entries

* Fixes LUS submodule and removes now-unused code

* Resolves weird duplicate definition issue

* Fix missing include

It was missed because not being included wasn't an issue on Windows.

* Fixes error present on Linux builds

* Fixes some issues with excluding locations

* Updates the Resolve Exclusion conflicts function

not sure if actually used, will look into that more later

* Removes some duplicate RGs

* More fixes of duplicate RG values.

* Fix a few duplication issues in the check tracker.

* Fix progressive bombchus.

* Minor typo fix, shouldn't really be affecting anything though

* Should fix some of the remaining check tracker issues.

* oops wrong boolean operator

* Fix skulltulas in the check tracker.

* oops, missing comma

* re-formatting of HintStone locations

* Fixes issue when picking up second Progressive Bullet Bag

* Hide bombchu bowling bombchus

* Fixes missed skullScene in location_list

* Reformats shop items

* Re-formats cow checks

* reformat song locations

* reformat "cutscene" checks

* reformat heart container locaitons

* reformat Boss/Dungeon reward checks

* Hide Triforce Completed if not playing Triforce Hunt

* Fixes incorrect chest param

* reformat GS Tokens locations and cuts down on duplicate data

* reformat Ganons Castle checks

* reformat GTG check locations

* Prevents Gift from Raoru from appearing in the check tracker

* more reformatting (botw, ice cavern, shadow temple)

* Should fix a couple more check tracker checks

* reformat spirit temple checks

* reformat water and fire temple checks

* fix RC_ZR_GS_ABOVE_BRIDGE flag typo

* reformat Forest Temple checks

* Fix RC_LW_TRADE_ODD_POTION in check tracker

* reformat child dungeon locations

* reformat overworld locations

* reformat item entries
---
 soh/include/z64actor.h                        |   17 +-
 soh/include/z64actor_enum.h                   |   19 +
 soh/include/z64scene.h                        |    2 +
 soh/include/z64scene_enum.h                   |   17 +
 .../custom-message/CustomMessageTypes.h       |    2 +-
 .../Enhancements/item-tables/ItemTableTypes.h |   10 +-
 .../randomizer/3drando/dungeon.cpp            | 1213 ++++++-----
 .../randomizer/3drando/dungeon.hpp            |   49 +-
 .../randomizer/3drando/entrance.cpp           |  652 +++---
 .../randomizer/3drando/entrance.hpp           |   29 +-
 .../Enhancements/randomizer/3drando/fill.cpp  |  526 ++---
 .../Enhancements/randomizer/3drando/fill.hpp  |    4 +-
 .../randomizer/3drando/hint_list.cpp          |  945 ++++-----
 .../randomizer/3drando/hint_list.hpp          |    5 +-
 .../hint_list/hint_list_exclude_dungeon.cpp   |  728 +++----
 .../hint_list/hint_list_exclude_overworld.cpp |  470 ++---
 .../3drando/hint_list/hint_list_item.cpp      |  324 +--
 .../Enhancements/randomizer/3drando/hints.cpp |  513 +++--
 .../Enhancements/randomizer/3drando/hints.hpp |    6 +-
 .../Enhancements/randomizer/3drando/item.cpp  |   86 -
 .../Enhancements/randomizer/3drando/item.hpp  |  156 --
 .../randomizer/3drando/item_list.cpp          |  311 ---
 .../randomizer/3drando/item_list.hpp          |   10 -
 .../randomizer/3drando/item_location.cpp      | 1658 ---------------
 .../randomizer/3drando/item_location.hpp      |  529 -----
 .../randomizer/3drando/item_pool.cpp          | 1243 +++++------
 .../randomizer/3drando/item_pool.hpp          |   11 +-
 .../Enhancements/randomizer/3drando/keys.hpp  | 1831 ----------------
 .../randomizer/3drando/location_access.cpp    |  174 +-
 .../randomizer/3drando/location_access.hpp    |   37 +-
 .../locacc_bottom_of_the_well.cpp             |   72 +-
 .../location_access/locacc_castle_town.cpp    |  266 +--
 .../location_access/locacc_death_mountain.cpp |  264 +--
 .../location_access/locacc_deku_tree.cpp      |  244 +--
 .../locacc_dodongos_cavern.cpp                |  276 +--
 .../location_access/locacc_fire_temple.cpp    |  398 ++--
 .../location_access/locacc_forest_temple.cpp  |  388 ++--
 .../location_access/locacc_ganons_castle.cpp  |  194 +-
 .../locacc_gerudo_training_grounds.cpp        |  174 +-
 .../location_access/locacc_gerudo_valley.cpp  |  188 +-
 .../location_access/locacc_hyrule_field.cpp   |  228 +-
 .../location_access/locacc_ice_cavern.cpp     |   66 +-
 .../locacc_jabujabus_belly.cpp                |  212 +-
 .../location_access/locacc_kakariko.cpp       |  318 +--
 .../location_access/locacc_lost_woods.cpp     |  246 +--
 .../location_access/locacc_shadow_temple.cpp  |  190 +-
 .../location_access/locacc_spirit_temple.cpp  |  276 +--
 .../location_access/locacc_water_temple.cpp   |  282 +--
 .../location_access/locacc_zoras_domain.cpp   |  168 +-
 .../Enhancements/randomizer/3drando/logic.cpp |  192 +-
 .../Enhancements/randomizer/3drando/logic.hpp |    8 +-
 .../Enhancements/randomizer/3drando/menu.hpp  |   20 +-
 .../randomizer/3drando/playthrough.cpp        |   13 +-
 .../randomizer/3drando/playthrough.hpp        |    2 +-
 .../randomizer/3drando/rando_main.cpp         |   14 +-
 .../randomizer/3drando/rando_main.hpp         |    5 +-
 .../randomizer/3drando/settings.cpp           |  386 ++--
 .../randomizer/3drando/settings.hpp           |    2 +-
 .../Enhancements/randomizer/3drando/shops.cpp |  145 +-
 .../Enhancements/randomizer/3drando/shops.hpp |    7 +-
 .../randomizer/3drando/spoiler_log.cpp        |  210 +-
 .../randomizer/3drando/spoiler_log.hpp        |    2 +-
 .../randomizer/3drando/starting_inventory.cpp |  178 +-
 .../randomizer/3drando/starting_inventory.hpp |    4 +-
 soh/soh/Enhancements/randomizer/context.cpp   |  188 ++
 soh/soh/Enhancements/randomizer/context.h     |   56 +
 soh/soh/Enhancements/randomizer/draw.cpp      |    2 +-
 soh/soh/Enhancements/randomizer/draw.h        |    2 +-
 soh/soh/Enhancements/randomizer/hint.cpp      |   43 +
 soh/soh/Enhancements/randomizer/hint.h        |   30 +
 soh/soh/Enhancements/randomizer/item.cpp      |  379 ++++
 soh/soh/Enhancements/randomizer/item.h        |   88 +
 soh/soh/Enhancements/randomizer/item_list.cpp |  295 +++
 .../Enhancements/randomizer/item_location.cpp |  189 ++
 .../Enhancements/randomizer/item_location.h   |  105 +
 soh/soh/Enhancements/randomizer/location.cpp  |  252 +++
 soh/soh/Enhancements/randomizer/location.h    |  285 +++
 .../Enhancements/randomizer/location_list.cpp | 1417 +++++++++++++
 .../Enhancements/randomizer/randomizer.cpp    |  250 +--
 soh/soh/Enhancements/randomizer/randomizer.h  |    3 +-
 .../Enhancements/randomizer/randomizerTypes.h | 1880 ++++++++++++++++-
 .../randomizer/randomizer_check_objects.cpp   | 1073 ++--------
 .../randomizer/randomizer_check_objects.h     |   28 +-
 .../randomizer/randomizer_check_tracker.cpp   |  275 +--
 .../randomizer/randomizer_check_tracker.h     |    2 +-
 soh/soh/Enhancements/randomizer/static_data.h |   37 +
 soh/soh/OTRGlobals.cpp                        |    2 +
 soh/soh/OTRGlobals.h                          |    2 +
 88 files changed, 12038 insertions(+), 12060 deletions(-)
 create mode 100644 soh/include/z64actor_enum.h
 create mode 100644 soh/include/z64scene_enum.h
 delete mode 100644 soh/soh/Enhancements/randomizer/3drando/item.cpp
 delete mode 100644 soh/soh/Enhancements/randomizer/3drando/item.hpp
 delete mode 100644 soh/soh/Enhancements/randomizer/3drando/item_list.cpp
 delete mode 100644 soh/soh/Enhancements/randomizer/3drando/item_list.hpp
 delete mode 100644 soh/soh/Enhancements/randomizer/3drando/item_location.cpp
 delete mode 100644 soh/soh/Enhancements/randomizer/3drando/item_location.hpp
 delete mode 100644 soh/soh/Enhancements/randomizer/3drando/keys.hpp
 create mode 100644 soh/soh/Enhancements/randomizer/context.cpp
 create mode 100644 soh/soh/Enhancements/randomizer/context.h
 create mode 100644 soh/soh/Enhancements/randomizer/hint.cpp
 create mode 100644 soh/soh/Enhancements/randomizer/hint.h
 create mode 100644 soh/soh/Enhancements/randomizer/item.cpp
 create mode 100644 soh/soh/Enhancements/randomizer/item.h
 create mode 100644 soh/soh/Enhancements/randomizer/item_list.cpp
 create mode 100644 soh/soh/Enhancements/randomizer/item_location.cpp
 create mode 100644 soh/soh/Enhancements/randomizer/item_location.h
 create mode 100644 soh/soh/Enhancements/randomizer/location.cpp
 create mode 100644 soh/soh/Enhancements/randomizer/location.h
 create mode 100644 soh/soh/Enhancements/randomizer/location_list.cpp
 create mode 100644 soh/soh/Enhancements/randomizer/static_data.h

diff --git a/soh/include/z64actor.h b/soh/include/z64actor.h
index 82c8611d1..7d4e313e7 100644
--- a/soh/include/z64actor.h
+++ b/soh/include/z64actor.h
@@ -7,6 +7,7 @@
 #include "z64collision_check.h"
 #include "z64bgcheck.h"
 #include "soh/Enhancements/item-tables/ItemTableTypes.h"
+#include "z64actor_enum.h"
 
 #define ACTOR_NUMBER_MAX 2000
 #define INVISIBLE_ACTOR_MAX 20
@@ -337,22 +338,6 @@ typedef enum {
 } ActorCategory;
 
 //#define DEFINE_ACTOR(_0, enum, _2) enum,
-#define DEFINE_ACTOR_INTERNAL(_0, enum, _2) enum,
-#define DEFINE_ACTOR_UNSET(enum) enum,
-#define DEFINE_ACTOR(_0, enum, _2) DEFINE_ACTOR_INTERNAL(_0, enum, _2)
-
-#ifdef __cplusplus
-enum ActorID : int {
-#else
-enum ActorID {
-#endif
-    #include "tables/actor_table.h"
-    /* 0x0192 */ ACTOR_ID_MAX // originally "ACTOR_DLF_MAX"
-};
-
-#undef DEFINE_ACTOR
-#undef DEFINE_ACTOR_INTERNAL
-#undef DEFINE_ACTOR_UNSET
 
 typedef enum {
     DOORLOCK_NORMAL,
diff --git a/soh/include/z64actor_enum.h b/soh/include/z64actor_enum.h
new file mode 100644
index 000000000..1b0a6b986
--- /dev/null
+++ b/soh/include/z64actor_enum.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#ifndef Z64ACTOR_ENUM_H
+#define Z64ACTOR_ENUM_H
+
+#define DEFINE_ACTOR_INTERNAL(_0, enum, _2) enum,
+#define DEFINE_ACTOR_UNSET(enum) enum,
+#define DEFINE_ACTOR(_0, enum, _2) DEFINE_ACTOR_INTERNAL(_0, enum, _2)
+
+enum ActorID {
+#include "tables/actor_table.h"
+    /* 0x0192 */ ACTOR_ID_MAX // originally "ACTOR_DLF_MAX"
+};
+
+#undef DEFINE_ACTOR
+#undef DEFINE_ACTOR_INTERNAL
+#undef DEFINE_ACTOR_UNSET
+
+#endif
\ No newline at end of file
diff --git a/soh/include/z64scene.h b/soh/include/z64scene.h
index 361e5f3c8..f14af0c4f 100644
--- a/soh/include/z64scene.h
+++ b/soh/include/z64scene.h
@@ -2,6 +2,8 @@
 #define Z64SCENE_H
 
 #include "command_macros_base.h"
+#include "libultraship/libultra.h"
+#include "z64math.h"
 
 typedef struct {
     /* 0x00 */ uintptr_t vromStart;
diff --git a/soh/include/z64scene_enum.h b/soh/include/z64scene_enum.h
new file mode 100644
index 000000000..068d1c42f
--- /dev/null
+++ b/soh/include/z64scene_enum.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#ifndef Z64SCENE_ENUM_H
+#define Z64SCENE_ENUM_H
+#define DEFINE_SCENE(_0, _1, enum, _3, _4, _5) enum,
+
+#ifdef __cplusplus
+enum SceneID : int {
+#else
+enum SceneID {
+#endif
+#include "tables/scene_table.h"
+    /* 0x6E */ SCENE_ID_MAX
+};
+
+#undef DEFINE_SCENE
+#endif
\ No newline at end of file
diff --git a/soh/soh/Enhancements/custom-message/CustomMessageTypes.h b/soh/soh/Enhancements/custom-message/CustomMessageTypes.h
index 4ce0db90a..1f043211e 100644
--- a/soh/soh/Enhancements/custom-message/CustomMessageTypes.h
+++ b/soh/soh/Enhancements/custom-message/CustomMessageTypes.h
@@ -58,7 +58,7 @@ typedef enum {
 #ifdef __cplusplus
 
 typedef struct {
-    u16 giid;
+    uint16_t giid;
     ItemID iid;
     std::string english;
     std::string german;
diff --git a/soh/soh/Enhancements/item-tables/ItemTableTypes.h b/soh/soh/Enhancements/item-tables/ItemTableTypes.h
index f16762db9..d3a1a6cf2 100644
--- a/soh/soh/Enhancements/item-tables/ItemTableTypes.h
+++ b/soh/soh/Enhancements/item-tables/ItemTableTypes.h
@@ -3,8 +3,8 @@
 #include <stdint.h>
 #endif
 
-#define CHEST_ANIM_SHORT 0
-#define CHEST_ANIM_LONG 1
+#define CHEST_ANIM_SHORT (int16_t)0
+#define CHEST_ANIM_LONG (int16_t)1
 
 /**
  * Flag to indicate which type of Actor has given the player an item. ITEM_FROM_NPC by default,
@@ -30,7 +30,7 @@ typedef enum GetItemCategory {
 } GetItemCategory;
 
 #define GET_ITEM(itemId, objectId, drawId, textId, field, chestAnim, itemCategory, modIndex, getItemId) \
-    { itemId, field, (chestAnim != CHEST_ANIM_SHORT ? 1 : -1) * (drawId + 1), textId, objectId, modIndex, getItemId, drawId, true, ITEM_FROM_NPC, itemCategory, NULL }
+    { itemId, field, (int16_t)((chestAnim != CHEST_ANIM_SHORT ? 1 : -1) * (drawId + 1)), textId, objectId, modIndex, getItemId, drawId, true, ITEM_FROM_NPC, itemCategory, NULL }
 
 #define GET_ITEM_NONE \
     { ITEM_NONE, 0, 0, 0, 0, 0, 0, 0, false, ITEM_FROM_NPC, ITEM_CATEGORY_JUNK, NULL }
@@ -38,7 +38,7 @@ typedef enum GetItemCategory {
 typedef struct PlayState PlayState;
 typedef struct GetItemEntry GetItemEntry;
 
-typedef void (*CustomDrawFunc)(PlayState* play, GetItemEntry* getItemEntry);
+typedef void (*CustomDrawFunc)(PlayState*, GetItemEntry*);
 
 typedef struct GetItemEntry {
     /* 0x00 */ uint16_t itemId;
@@ -55,4 +55,4 @@ typedef struct GetItemEntry {
     /* 0x10 */ uint16_t drawItemId; // Will be a copy of itemId unless the item is an ice trap. Needed for particles to function on ice traps.
     /* 0x11 */ uint16_t drawModIndex; // Will be a copy of modIndex unless the item is an ice trap. Needed for particles to function on ice traps.
     CustomDrawFunc drawFunc;
-}; // size = 0x11
+} GetItemEntry; // size = 0x11
diff --git a/soh/soh/Enhancements/randomizer/3drando/dungeon.cpp b/soh/soh/Enhancements/randomizer/3drando/dungeon.cpp
index dd7ba681d..511217036 100644
--- a/soh/soh/Enhancements/randomizer/3drando/dungeon.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/dungeon.cpp
@@ -1,641 +1,682 @@
 #include "dungeon.hpp"
 
 #include "category.hpp"
-#include "item_location.hpp"
 #include "pool_functions.hpp"
-#include "keys.hpp"
+#include "../context.h"
+#include "../static_data.h"
 
 namespace Dungeon {
 
-DungeonInfo::DungeonInfo(std::string name_, uint32_t hintKey_, uint32_t map_, uint32_t compass_, uint32_t smallKey_,
-                         uint32_t keyRing_, uint32_t bossKey_, uint8_t vanillaKeyCount_, uint8_t mqKeyCount_,
-                         std::vector<uint32_t> vanillaLocations_,
-                         std::vector<uint32_t> mqLocations_,
-                         std::vector<uint32_t> sharedLocations_,
-                         std::vector<uint32_t> bossRoomLocations_)
-  : name(std::move(name_)),
-    hintKey(hintKey_),
-    map(map_),
-    compass(compass_),
-    smallKey(smallKey_),
-    keyRing(keyRing_),
-    bossKey(bossKey_),
-    vanillaKeyCount(vanillaKeyCount_),
-    mqKeyCount(mqKeyCount_),
-    vanillaLocations(std::move(vanillaLocations_)),
-    mqLocations(std::move(mqLocations_)),
-    sharedLocations(std::move(sharedLocations_)),
-    bossRoomLocations(std::move(bossRoomLocations_)) {}
+DungeonInfo::DungeonInfo(std::string name_, RandomizerHintTextKey hintKey_, RandomizerGet map_, RandomizerGet compass_,
+                         RandomizerGet smallKey_, RandomizerGet keyRing_, RandomizerGet bossKey_,
+                         uint8_t vanillaKeyCount_, uint8_t mqKeyCount_, std::vector<RandomizerCheck> vanillaLocations_,
+                         std::vector<RandomizerCheck> mqLocations_, std::vector<RandomizerCheck> sharedLocations_,
+                         std::vector<RandomizerCheck> bossRoomLocations_)
+    : name(std::move(name_)), hintKey(hintKey_), map(map_), compass(compass_), smallKey(smallKey_), keyRing(keyRing_),
+      bossKey(bossKey_), vanillaKeyCount(vanillaKeyCount_), mqKeyCount(mqKeyCount_),
+      vanillaLocations(std::move(vanillaLocations_)), mqLocations(std::move(mqLocations_)),
+      sharedLocations(std::move(sharedLocations_)), bossRoomLocations(std::move(bossRoomLocations_)) {
+}
 
 DungeonInfo::~DungeonInfo() = default;
 
-uint32_t DungeonInfo::GetHintKey() const {
-  return hintKey;
+RandomizerHintTextKey DungeonInfo::GetHintKey() const {
+    return hintKey;
 }
 
-uint32_t DungeonInfo::GetSmallKey() const {
-  return smallKey;
+RandomizerGet DungeonInfo::GetSmallKey() const {
+    return smallKey;
 }
 
-uint32_t DungeonInfo::GetKeyRing() const {
-  return keyRing;
+RandomizerGet DungeonInfo::GetKeyRing() const {
+    return keyRing;
 }
 
-uint32_t DungeonInfo::GetMap() const {
-  return map;
+RandomizerGet DungeonInfo::GetMap() const {
+    return map;
 }
 
-uint32_t DungeonInfo::GetCompass() const {
-  return compass;
+RandomizerGet DungeonInfo::GetCompass() const {
+    return compass;
 }
 
-uint32_t DungeonInfo::GetBossKey() const {
-  return bossKey;
+RandomizerGet DungeonInfo::GetBossKey() const {
+    return bossKey;
 }
 
 void DungeonInfo::PlaceVanillaMap() {
-  if (map == NONE) {
-    return;
-  }
+    if (map == RG_NONE) {
+        return;
+    }
 
-  auto dungeonLocations = GetDungeonLocations();
-  auto mapLocation = FilterFromPool(dungeonLocations, [](const uint32_t loc){ return Location(loc)->IsCategory(Category::cVanillaMap); })[0];
-  PlaceItemInLocation(mapLocation, map);
+    auto dungeonLocations = GetDungeonLocations();
+    auto mapLocation = FilterFromPool(dungeonLocations, [](const RandomizerCheck loc) {
+        return Rando::StaticData::GetLocation(loc)->IsCategory(Category::cVanillaMap);
+    })[0];
+    Rando::Context::GetInstance()->PlaceItemInLocation(mapLocation, map);
 }
 
 void DungeonInfo::PlaceVanillaCompass() {
-  if (compass == NONE) {
-    return;
-  }
+    if (compass == RG_NONE) {
+        return;
+    }
 
-  auto dungeonLocations = GetDungeonLocations();
-  auto compassLocation = FilterFromPool(dungeonLocations, [](const uint32_t loc){ return Location(loc)->IsCategory(Category::cVanillaCompass); })[0];
-  PlaceItemInLocation(compassLocation, compass);
+    auto dungeonLocations = GetDungeonLocations();
+    auto compassLocation = FilterFromPool(dungeonLocations, [](const RandomizerCheck loc) {
+        return Rando::StaticData::GetLocation(loc)->IsCategory(Category::cVanillaCompass);
+    })[0];
+    Rando::Context::GetInstance()->PlaceItemInLocation(compassLocation, compass);
 }
 
 void DungeonInfo::PlaceVanillaBossKey() {
-  if (bossKey == NONE || bossKey == GANONS_CASTLE_BOSS_KEY) {
-    return;
-  }
+    if (bossKey == RG_NONE || bossKey == RG_GANONS_CASTLE_BOSS_KEY) {
+        return;
+    }
 
-  auto dungeonLocations = GetDungeonLocations();
-  auto bossKeyLocation = FilterFromPool(dungeonLocations, [](const uint32_t loc){ return Location(loc)->IsCategory(Category::cVanillaBossKey); })[0];
-  PlaceItemInLocation(bossKeyLocation, bossKey);
+    auto dungeonLocations = GetDungeonLocations();
+    auto bossKeyLocation = FilterFromPool(dungeonLocations, [](const RandomizerCheck loc) {
+        return Rando::StaticData::GetLocation(loc)->IsCategory(Category::cVanillaBossKey);
+    })[0];
+    Rando::Context::GetInstance()->PlaceItemInLocation(bossKeyLocation, bossKey);
 }
 
 void DungeonInfo::PlaceVanillaSmallKeys() {
-  if (smallKey == NONE) {
-    return;
-  }
+    if (smallKey == RG_NONE) {
+        return;
+    }
 
-  auto dungeonLocations = GetDungeonLocations();
-  auto smallKeyLocations = FilterFromPool(dungeonLocations, [](const uint32_t loc){ return Location(loc)->IsCategory(Category::cVanillaSmallKey); });
-  for (auto location : smallKeyLocations) {
-      PlaceItemInLocation(location, smallKey);
-  }
+    auto dungeonLocations = GetDungeonLocations();
+    auto smallKeyLocations = FilterFromPool(dungeonLocations, [](const RandomizerCheck loc) {
+        return Rando::StaticData::GetLocation(loc)->IsCategory(Category::cVanillaSmallKey);
+    });
+    for (auto location : smallKeyLocations) {
+        Rando::Context::GetInstance()->PlaceItemInLocation(location, smallKey);
+    }
 }
 
-//Gets the chosen dungeon locations for a playthrough (so either MQ or Vanilla)
-std::vector<uint32_t> DungeonInfo::GetDungeonLocations() const {
-  auto locations = masterQuest ? mqLocations : vanillaLocations;
-  AddElementsToPool(locations, sharedLocations);
-  AddElementsToPool(locations, bossRoomLocations);
-  return locations;
+// Gets the chosen dungeon locations for a playthrough (so either MQ or Vanilla)
+std::vector<RandomizerCheck> DungeonInfo::GetDungeonLocations() const {
+    auto locations = masterQuest ? mqLocations : vanillaLocations;
+    AddElementsToPool(locations, sharedLocations);
+    AddElementsToPool(locations, bossRoomLocations);
+    return locations;
 }
 
-//Gets all dungeon locations (MQ + Vanilla)
-std::vector<uint32_t> DungeonInfo::GetEveryLocation() const {
-  auto locations = vanillaLocations;
-  AddElementsToPool(locations, mqLocations);
-  AddElementsToPool(locations, sharedLocations);
-  AddElementsToPool(locations, bossRoomLocations);
-  return locations;
+// Gets all dungeon locations (MQ + Vanilla)
+std::vector<RandomizerCheck> DungeonInfo::GetEveryLocation() const {
+    auto locations = vanillaLocations;
+    AddElementsToPool(locations, mqLocations);
+    AddElementsToPool(locations, sharedLocations);
+    AddElementsToPool(locations, bossRoomLocations);
+    return locations;
 }
 
-  DungeonInfo DekuTree = DungeonInfo("Deku Tree", DEKU_TREE, DEKU_TREE_MAP, DEKU_TREE_COMPASS, NONE, NONE, NONE, 0, 0, {
-                            //Vanilla Locations
-                            DEKU_TREE_MAP_CHEST,
-                            DEKU_TREE_COMPASS_CHEST,
-                            DEKU_TREE_COMPASS_ROOM_SIDE_CHEST,
-                            DEKU_TREE_BASEMENT_CHEST,
-                            DEKU_TREE_SLINGSHOT_CHEST,
-                            DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST,
-                            DEKU_TREE_GS_BASEMENT_BACK_ROOM,
-                            DEKU_TREE_GS_BASEMENT_GATE,
-                            DEKU_TREE_GS_BASEMENT_VINES,
-                            DEKU_TREE_GS_COMPASS_ROOM,
-                          }, {
-                            //MQ Locations
-                            DEKU_TREE_MQ_MAP_CHEST,
-                            DEKU_TREE_MQ_COMPASS_CHEST,
-                            DEKU_TREE_MQ_SLINGSHOT_CHEST,
-                            DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST,
-                            DEKU_TREE_MQ_BASEMENT_CHEST,
-                            DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST,
-                            DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST,
-                            DEKU_TREE_MQ_DEKU_SCRUB,
-                            DEKU_TREE_MQ_GS_LOBBY,
-                            DEKU_TREE_MQ_GS_COMPASS_ROOM,
-                            DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM,
-                            DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM,
-                          },
-                          {},
-                          {
-                            // Boss Room Locations
-                            DEKU_TREE_QUEEN_GOHMA_HEART,
-                            QUEEN_GOHMA,
-                          });
+DungeonInfo DekuTree =
+    DungeonInfo("Deku Tree", RHT_DEKU_TREE, RG_DEKU_TREE_MAP, RG_DEKU_TREE_COMPASS, RG_NONE, RG_NONE, RG_NONE, 0, 0,
+                {
+                    // Vanilla Locations
+                    RC_DEKU_TREE_MAP_CHEST,
+                    RC_DEKU_TREE_COMPASS_CHEST,
+                    RC_DEKU_TREE_COMPASS_ROOM_SIDE_CHEST,
+                    RC_DEKU_TREE_BASEMENT_CHEST,
+                    RC_DEKU_TREE_SLINGSHOT_CHEST,
+                    RC_DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST,
+                    RC_DEKU_TREE_GS_BASEMENT_BACK_ROOM,
+                    RC_DEKU_TREE_GS_BASEMENT_GATE,
+                    RC_DEKU_TREE_GS_BASEMENT_VINES,
+                    RC_DEKU_TREE_GS_COMPASS_ROOM,
+                },
+                {
+                    // MQ Locations
+                    RC_DEKU_TREE_MQ_MAP_CHEST,
+                    RC_DEKU_TREE_MQ_COMPASS_CHEST,
+                    RC_DEKU_TREE_MQ_SLINGSHOT_CHEST,
+                    RC_DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST,
+                    RC_DEKU_TREE_MQ_BASEMENT_CHEST,
+                    RC_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST,
+                    RC_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST,
+                    RC_DEKU_TREE_MQ_DEKU_SCRUB,
+                    RC_DEKU_TREE_MQ_GS_LOBBY,
+                    RC_DEKU_TREE_MQ_GS_COMPASS_ROOM,
+                    RC_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM,
+                    RC_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM,
+                },
+                {},
+                {
+                    // Boss Room Locations
+                    RC_DEKU_TREE_QUEEN_GOHMA_HEART,
+                    RC_QUEEN_GOHMA,
+                });
 
-  DungeonInfo DodongosCavern = DungeonInfo("Dodongo's Cavern", DODONGOS_CAVERN, DODONGOS_CAVERN_MAP, DODONGOS_CAVERN_COMPASS, NONE, NONE, NONE, 0, 0, {
-                            //Vanilla Locations
-                            DODONGOS_CAVERN_MAP_CHEST,
-                            DODONGOS_CAVERN_COMPASS_CHEST,
-                            DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST,
-                            DODONGOS_CAVERN_BOMB_BAG_CHEST,
-                            DODONGOS_CAVERN_END_OF_BRIDGE_CHEST,
-                            DODONGOS_CAVERN_DEKU_SCRUB_LOBBY,
-                            DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS,
-                            DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,
-                            DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT,
-                            DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS,
-                            DODONGOS_CAVERN_GS_SCARECROW,
-                            DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS,
-                            DODONGOS_CAVERN_GS_BACK_ROOM,
-                            DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS,
-                          }, {
-                            //MQ Locations
-                            DODONGOS_CAVERN_MQ_MAP_CHEST,
-                            DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST,
-                            DODONGOS_CAVERN_MQ_COMPASS_CHEST,
-                            DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST,
-                            DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST,
-                            DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST,
-                            DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,
-                            DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT,
-                            DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,
-                            DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS,
-                            DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM,
-                            DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM,
-                            DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM,
-                            DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM,
-                            DODONGOS_CAVERN_MQ_GS_BACK_AREA,
-                          },
-                          {},
-                          {
-                            // Boss Room Locations
-                            DODONGOS_CAVERN_BOSS_ROOM_CHEST,
-                            DODONGOS_CAVERN_KING_DODONGO_HEART,
-                            KING_DODONGO,
-                          });
+DungeonInfo DodongosCavern = DungeonInfo("Dodongo's Cavern", RHT_DODONGOS_CAVERN, RG_DODONGOS_CAVERN_MAP,
+                                         RG_DODONGOS_CAVERN_COMPASS, RG_NONE, RG_NONE, RG_NONE, 0, 0,
+                                         {
+                                             // Vanilla Locations
+                                             RC_DODONGOS_CAVERN_MAP_CHEST,
+                                             RC_DODONGOS_CAVERN_COMPASS_CHEST,
+                                             RC_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST,
+                                             RC_DODONGOS_CAVERN_BOMB_BAG_CHEST,
+                                             RC_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST,
+                                             RC_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY,
+                                             RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS,
+                                             RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,
+                                             RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT,
+                                             RC_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS,
+                                             RC_DODONGOS_CAVERN_GS_SCARECROW,
+                                             RC_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS,
+                                             RC_DODONGOS_CAVERN_GS_BACK_ROOM,
+                                             RC_DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS,
+                                         },
+                                         {
+                                             // MQ Locations
+                                             RC_DODONGOS_CAVERN_MQ_MAP_CHEST,
+                                             RC_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST,
+                                             RC_DODONGOS_CAVERN_MQ_COMPASS_CHEST,
+                                             RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST,
+                                             RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST,
+                                             RC_DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST,
+                                             RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,
+                                             RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT,
+                                             RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,
+                                             RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS,
+                                             RC_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM,
+                                             RC_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM,
+                                             RC_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM,
+                                             RC_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM,
+                                             RC_DODONGOS_CAVERN_MQ_GS_BACK_AREA,
+                                         },
+                                         {},
+                                         {
+                                             // Boss Room Locations
+                                             RC_DODONGOS_CAVERN_BOSS_ROOM_CHEST,
+                                             RC_DODONGOS_CAVERN_KING_DODONGO_HEART,
+                                             RC_KING_DODONGO,
+                                         });
 
-  DungeonInfo JabuJabusBelly = DungeonInfo("Jabu Jabu's Belly", JABU_JABUS_BELLY, JABU_JABUS_BELLY_MAP, JABU_JABUS_BELLY_COMPASS, NONE, NONE, NONE, 0, 0, {
-                            //Vanilla Locations
-                            JABU_JABUS_BELLY_MAP_CHEST,
-                            JABU_JABUS_BELLY_COMPASS_CHEST,
-                            JABU_JABUS_BELLY_BOOMERANG_CHEST,
-                            JABU_JABUS_BELLY_DEKU_SCRUB,
-                            JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER,
-                            JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER,
-                            JABU_JABUS_BELLY_GS_NEAR_BOSS,
-                            JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM,
-                          }, {
-                            //MQ Locations
-                            JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST,
-                            JABU_JABUS_BELLY_MQ_MAP_CHEST,
-                            JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST,
-                            JABU_JABUS_BELLY_MQ_COMPASS_CHEST,
-                            JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST,
-                            JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST,
-                            JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST,
-                            JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST,
-                            JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST,
-                            JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST,
-                            JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST,
-                            JABU_JABUS_BELLY_MQ_COW,
-                            JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM,
-                            JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM,
-                            JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM,
-                            JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS,
-                          },
-                          {},
-                          {
-                            // Boss Room Locations
-                            JABU_JABUS_BELLY_BARINADE_HEART,
-                            BARINADE,
-                          });
+DungeonInfo JabuJabusBelly = DungeonInfo("Jabu Jabu's Belly", RHT_JABU_JABUS_BELLY, RG_JABU_JABUS_BELLY_MAP,
+                                         RG_JABU_JABUS_BELLY_COMPASS, RG_NONE, RG_NONE, RG_NONE, 0, 0,
+                                         {
+                                             // Vanilla Locations
+                                             RC_JABU_JABUS_BELLY_MAP_CHEST,
+                                             RC_JABU_JABUS_BELLY_COMPASS_CHEST,
+                                             RC_JABU_JABUS_BELLY_BOOMERANG_CHEST,
+                                             RC_JABU_JABUS_BELLY_DEKU_SCRUB,
+                                             RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER,
+                                             RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER,
+                                             RC_JABU_JABUS_BELLY_GS_NEAR_BOSS,
+                                             RC_JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM,
+                                         },
+                                         {
+                                             // MQ Locations
+                                             RC_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST,
+                                             RC_JABU_JABUS_BELLY_MQ_MAP_CHEST,
+                                             RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST,
+                                             RC_JABU_JABUS_BELLY_MQ_COMPASS_CHEST,
+                                             RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST,
+                                             RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST,
+                                             RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST,
+                                             RC_JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST,
+                                             RC_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST,
+                                             RC_JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST,
+                                             RC_JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST,
+                                             RC_JABU_JABUS_BELLY_MQ_COW,
+                                             RC_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM,
+                                             RC_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM,
+                                             RC_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM,
+                                             RC_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS,
+                                         },
+                                         {},
+                                         {
+                                             // Boss Room Locations
+                                             RC_JABU_JABUS_BELLY_BARINADE_HEART,
+                                             RC_BARINADE,
+                                         });
 
-  DungeonInfo ForestTemple = DungeonInfo("Forest Temple", FOREST_TEMPLE, FOREST_TEMPLE_MAP, FOREST_TEMPLE_COMPASS, FOREST_TEMPLE_SMALL_KEY, FOREST_TEMPLE_KEY_RING, FOREST_TEMPLE_BOSS_KEY, 5, 6, {
-                            //Vanilla Locations
-                            FOREST_TEMPLE_FIRST_ROOM_CHEST,
-                            FOREST_TEMPLE_FIRST_STALFOS_CHEST,
-                            FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST,
-                            FOREST_TEMPLE_MAP_CHEST,
-                            FOREST_TEMPLE_WELL_CHEST,
-                            FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST,
-                            FOREST_TEMPLE_EYE_SWITCH_CHEST,
-                            FOREST_TEMPLE_BOSS_KEY_CHEST,
-                            FOREST_TEMPLE_FLOORMASTER_CHEST,
-                            FOREST_TEMPLE_BOW_CHEST,
-                            FOREST_TEMPLE_RED_POE_CHEST,
-                            FOREST_TEMPLE_BLUE_POE_CHEST,
-                            FOREST_TEMPLE_BASEMENT_CHEST,
-                            FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD,
-                            FOREST_TEMPLE_GS_FIRST_ROOM,
-                            FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD,
-                            FOREST_TEMPLE_GS_LOBBY,
-                            FOREST_TEMPLE_GS_BASEMENT,
-                          }, {
-                            //MQ Locations
-                            FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST,
-                            FOREST_TEMPLE_MQ_WOLFOS_CHEST,
-                            FOREST_TEMPLE_MQ_BOW_CHEST,
-                            FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST,
-                            FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST,
-                            FOREST_TEMPLE_MQ_WELL_CHEST,
-                            FOREST_TEMPLE_MQ_MAP_CHEST,
-                            FOREST_TEMPLE_MQ_COMPASS_CHEST,
-                            FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST,
-                            FOREST_TEMPLE_MQ_BASEMENT_CHEST,
-                            FOREST_TEMPLE_MQ_REDEAD_CHEST,
-                            FOREST_TEMPLE_MQ_BOSS_KEY_CHEST,
-                            FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY,
-                            FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM,
-                            FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD,
-                            FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD,
-                            FOREST_TEMPLE_MQ_GS_WELL,
-                          },
-                          {},
-                          {
-                            // Boss Room Locations
-                            FOREST_TEMPLE_PHANTOM_GANON_HEART,
-                            PHANTOM_GANON,
-                          });
+DungeonInfo ForestTemple =
+    DungeonInfo("Forest Temple", RHT_FOREST_TEMPLE, RG_FOREST_TEMPLE_MAP, RG_FOREST_TEMPLE_COMPASS,
+                RG_FOREST_TEMPLE_SMALL_KEY, RG_FOREST_TEMPLE_KEY_RING, RG_FOREST_TEMPLE_BOSS_KEY, 5, 6,
+                {
+                    // Vanilla Locations
+                    RC_FOREST_TEMPLE_FIRST_ROOM_CHEST,
+                    RC_FOREST_TEMPLE_FIRST_STALFOS_CHEST,
+                    RC_FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST,
+                    RC_FOREST_TEMPLE_MAP_CHEST,
+                    RC_FOREST_TEMPLE_WELL_CHEST,
+                    RC_FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST,
+                    RC_FOREST_TEMPLE_EYE_SWITCH_CHEST,
+                    RC_FOREST_TEMPLE_BOSS_KEY_CHEST,
+                    RC_FOREST_TEMPLE_FLOORMASTER_CHEST,
+                    RC_FOREST_TEMPLE_BOW_CHEST,
+                    RC_FOREST_TEMPLE_RED_POE_CHEST,
+                    RC_FOREST_TEMPLE_BLUE_POE_CHEST,
+                    RC_FOREST_TEMPLE_BASEMENT_CHEST,
+                    RC_FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD,
+                    RC_FOREST_TEMPLE_GS_FIRST_ROOM,
+                    RC_FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD,
+                    RC_FOREST_TEMPLE_GS_LOBBY,
+                    RC_FOREST_TEMPLE_GS_BASEMENT,
+                },
+                {
+                    // MQ Locations
+                    RC_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST,
+                    RC_FOREST_TEMPLE_MQ_WOLFOS_CHEST,
+                    RC_FOREST_TEMPLE_MQ_BOW_CHEST,
+                    RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST,
+                    RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST,
+                    RC_FOREST_TEMPLE_MQ_WELL_CHEST,
+                    RC_FOREST_TEMPLE_MQ_MAP_CHEST,
+                    RC_FOREST_TEMPLE_MQ_COMPASS_CHEST,
+                    RC_FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST,
+                    RC_FOREST_TEMPLE_MQ_BASEMENT_CHEST,
+                    RC_FOREST_TEMPLE_MQ_REDEAD_CHEST,
+                    RC_FOREST_TEMPLE_MQ_BOSS_KEY_CHEST,
+                    RC_FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY,
+                    RC_FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM,
+                    RC_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD,
+                    RC_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD,
+                    RC_FOREST_TEMPLE_MQ_GS_WELL,
+                },
+                {},
+                {
+                    // Boss Room Locations
+                    RC_FOREST_TEMPLE_PHANTOM_GANON_HEART,
+                    RC_PHANTOM_GANON,
+                });
 
-  DungeonInfo FireTemple = DungeonInfo("Fire Temple", FIRE_TEMPLE, FIRE_TEMPLE_MAP, FIRE_TEMPLE_COMPASS, FIRE_TEMPLE_SMALL_KEY, FIRE_TEMPLE_KEY_RING, FIRE_TEMPLE_BOSS_KEY, 8, 5, {
-                            //Vanilla Locations
-                            FIRE_TEMPLE_NEAR_BOSS_CHEST,
-                            FIRE_TEMPLE_FLARE_DANCER_CHEST,
-                            FIRE_TEMPLE_BOSS_KEY_CHEST,
-                            FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST,
-                            FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST,
-                            FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST,
-                            FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST,
-                            FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST,
-                            FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST,
-                            FIRE_TEMPLE_SCARECROW_CHEST,
-                            FIRE_TEMPLE_MAP_CHEST,
-                            FIRE_TEMPLE_COMPASS_CHEST,
-                            FIRE_TEMPLE_HIGHEST_GORON_CHEST,
-                            FIRE_TEMPLE_MEGATON_HAMMER_CHEST,
-                            FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM,
-                            FIRE_TEMPLE_GS_BOSS_KEY_LOOP,
-                            FIRE_TEMPLE_GS_BOULDER_MAZE,
-                            FIRE_TEMPLE_GS_SCARECROW_TOP,
-                            FIRE_TEMPLE_GS_SCARECROW_CLIMB,
-                          }, {
-                            //MQ Locations
-                            FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST,
-                            FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST,
-                            FIRE_TEMPLE_MQ_COMPASS_CHEST,
-                            FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST,
-                            FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST,
-                            FIRE_TEMPLE_MQ_CHEST_ON_FIRE,
-                            FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST,
-                            FIRE_TEMPLE_MQ_MAP_CHEST,
-                            FIRE_TEMPLE_MQ_BOSS_KEY_CHEST,
-                            FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST,
-                            FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST,
-                            FIRE_TEMPLE_MQ_FREESTANDING_KEY,
-                            FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE,
-                            FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER,
-                            FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR,
-                            FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM,
-                            FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE,
-                          },
-                          {},
-                          {
-                            // Boos Room Locations
-                            FIRE_TEMPLE_VOLVAGIA_HEART,
-                            VOLVAGIA,
-                          });
+DungeonInfo FireTemple = DungeonInfo("Fire Temple", RHT_FIRE_TEMPLE, RG_FIRE_TEMPLE_MAP, RG_FIRE_TEMPLE_COMPASS,
+                                     RG_FIRE_TEMPLE_SMALL_KEY, RG_FIRE_TEMPLE_KEY_RING, RG_FIRE_TEMPLE_BOSS_KEY, 8, 5,
+                                     {
+                                         // Vanilla Locations
+                                         RC_FIRE_TEMPLE_NEAR_BOSS_CHEST,
+                                         RC_FIRE_TEMPLE_FLARE_DANCER_CHEST,
+                                         RC_FIRE_TEMPLE_BOSS_KEY_CHEST,
+                                         RC_FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST,
+                                         RC_FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST,
+                                         RC_FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST,
+                                         RC_FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST,
+                                         RC_FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST,
+                                         RC_FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST,
+                                         RC_FIRE_TEMPLE_SCARECROW_CHEST,
+                                         RC_FIRE_TEMPLE_MAP_CHEST,
+                                         RC_FIRE_TEMPLE_COMPASS_CHEST,
+                                         RC_FIRE_TEMPLE_HIGHEST_GORON_CHEST,
+                                         RC_FIRE_TEMPLE_MEGATON_HAMMER_CHEST,
+                                         RC_FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM,
+                                         RC_FIRE_TEMPLE_GS_BOSS_KEY_LOOP,
+                                         RC_FIRE_TEMPLE_GS_BOULDER_MAZE,
+                                         RC_FIRE_TEMPLE_GS_SCARECROW_TOP,
+                                         RC_FIRE_TEMPLE_GS_SCARECROW_CLIMB,
+                                     },
+                                     {
+                                         // MQ Locations
+                                         RC_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST,
+                                         RC_FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST,
+                                         RC_FIRE_TEMPLE_MQ_COMPASS_CHEST,
+                                         RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST,
+                                         RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST,
+                                         RC_FIRE_TEMPLE_MQ_CHEST_ON_FIRE,
+                                         RC_FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST,
+                                         RC_FIRE_TEMPLE_MQ_MAP_CHEST,
+                                         RC_FIRE_TEMPLE_MQ_BOSS_KEY_CHEST,
+                                         RC_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST,
+                                         RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST,
+                                         RC_FIRE_TEMPLE_MQ_FREESTANDING_KEY,
+                                         RC_FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE,
+                                         RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER,
+                                         RC_FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR,
+                                         RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM,
+                                         RC_FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE,
+                                     },
+                                     {},
+                                     {
+                                         // Boos Room Locations
+                                         RC_FIRE_TEMPLE_VOLVAGIA_HEART,
+                                         RC_VOLVAGIA,
+                                     });
 
-  DungeonInfo WaterTemple = DungeonInfo("Water Temple", WATER_TEMPLE, WATER_TEMPLE_MAP, WATER_TEMPLE_COMPASS, WATER_TEMPLE_SMALL_KEY, WATER_TEMPLE_KEY_RING, WATER_TEMPLE_BOSS_KEY, 6, 2, {
-                            //Vanilla Locations
-                            WATER_TEMPLE_MAP_CHEST,
-                            WATER_TEMPLE_COMPASS_CHEST,
-                            WATER_TEMPLE_TORCHES_CHEST,
-                            WATER_TEMPLE_DRAGON_CHEST,
-                            WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST,
-                            WATER_TEMPLE_CENTRAL_PILLAR_CHEST,
-                            WATER_TEMPLE_CRACKED_WALL_CHEST,
-                            WATER_TEMPLE_BOSS_KEY_CHEST,
-                            WATER_TEMPLE_LONGSHOT_CHEST,
-                            WATER_TEMPLE_RIVER_CHEST,
-                            WATER_TEMPLE_GS_BEHIND_GATE,
-                            WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM,
-                            WATER_TEMPLE_GS_CENTRAL_PILLAR,
-                            WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST,
-                            WATER_TEMPLE_GS_RIVER,
-                          }, {
-                            //MQ Locations
-                            WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST,
-                            WATER_TEMPLE_MQ_BOSS_KEY_CHEST,
-                            WATER_TEMPLE_MQ_LONGSHOT_CHEST,
-                            WATER_TEMPLE_MQ_COMPASS_CHEST,
-                            WATER_TEMPLE_MQ_MAP_CHEST,
-                            WATER_TEMPLE_MQ_FREESTANDING_KEY,
-                            WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH,
-                            WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA,
-                            WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY,
-                            WATER_TEMPLE_MQ_GS_RIVER,
-                            WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH,
-                          },
-                          {},
-                          {
-                            // Boss Room Locations
-                            WATER_TEMPLE_MORPHA_HEART,
-                            MORPHA,
-                          });
+DungeonInfo WaterTemple =
+    DungeonInfo("Water Temple", RHT_WATER_TEMPLE, RG_WATER_TEMPLE_MAP, RG_WATER_TEMPLE_COMPASS,
+                RG_WATER_TEMPLE_SMALL_KEY, RG_WATER_TEMPLE_KEY_RING, RG_WATER_TEMPLE_BOSS_KEY, 6, 2,
+                {
+                    // Vanilla Locations
+                    RC_WATER_TEMPLE_MAP_CHEST,
+                    RC_WATER_TEMPLE_COMPASS_CHEST,
+                    RC_WATER_TEMPLE_TORCHES_CHEST,
+                    RC_WATER_TEMPLE_DRAGON_CHEST,
+                    RC_WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST,
+                    RC_WATER_TEMPLE_CENTRAL_PILLAR_CHEST,
+                    RC_WATER_TEMPLE_CRACKED_WALL_CHEST,
+                    RC_WATER_TEMPLE_BOSS_KEY_CHEST,
+                    RC_WATER_TEMPLE_LONGSHOT_CHEST,
+                    RC_WATER_TEMPLE_RIVER_CHEST,
+                    RC_WATER_TEMPLE_GS_BEHIND_GATE,
+                    RC_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM,
+                    RC_WATER_TEMPLE_GS_CENTRAL_PILLAR,
+                    RC_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST,
+                    RC_WATER_TEMPLE_GS_RIVER,
+                },
+                {
+                    // MQ Locations
+                    RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST,
+                    RC_WATER_TEMPLE_MQ_BOSS_KEY_CHEST,
+                    RC_WATER_TEMPLE_MQ_LONGSHOT_CHEST,
+                    RC_WATER_TEMPLE_MQ_COMPASS_CHEST,
+                    RC_WATER_TEMPLE_MQ_MAP_CHEST,
+                    RC_WATER_TEMPLE_MQ_FREESTANDING_KEY,
+                    RC_WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH,
+                    RC_WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA,
+                    RC_WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY,
+                    RC_WATER_TEMPLE_MQ_GS_RIVER,
+                    RC_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH,
+                },
+                {},
+                {
+                    // Boss Room Locations
+                    RC_WATER_TEMPLE_MORPHA_HEART,
+                    RC_MORPHA,
+                });
 
-  DungeonInfo SpiritTemple = DungeonInfo("Spirit Temple", SPIRIT_TEMPLE, SPIRIT_TEMPLE_MAP, SPIRIT_TEMPLE_COMPASS, SPIRIT_TEMPLE_SMALL_KEY, SPIRIT_TEMPLE_KEY_RING, SPIRIT_TEMPLE_BOSS_KEY, 5, 7, {
-                            //Vanilla Locations
-                            SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST,
-                            SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST,
-                            SPIRIT_TEMPLE_COMPASS_CHEST,
-                            SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST,
-                            SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST,
-                            SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST,
-                            SPIRIT_TEMPLE_MAP_CHEST,
-                            SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST,
-                            SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST,
-                            SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST,
-                            SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST,
-                            SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST,
-                            SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST,
-                            SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST,
-                            SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST,
-                            SPIRIT_TEMPLE_BOSS_KEY_CHEST,
-                            SPIRIT_TEMPLE_TOPMOST_CHEST,
-                            SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM,
-                            SPIRIT_TEMPLE_GS_BOULDER_ROOM,
-                            SPIRIT_TEMPLE_GS_LOBBY,
-                            SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM,
-                            SPIRIT_TEMPLE_GS_METAL_FENCE,
-                          }, {
-                            //MQ Locations
-                            SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST,
-                            SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST,
-                            SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST,
-                            SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST,
-                            SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST,
-                            SPIRIT_TEMPLE_MQ_MAP_CHEST,
-                            SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST,
-                            SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST,
-                            SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST,
-                            SPIRIT_TEMPLE_MQ_COMPASS_CHEST,
-                            SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST,
-                            SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST,
-                            SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST,
-                            SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST,
-                            SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST,
-                            SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST,
-                            SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST,
-                            SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST,
-                            SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST,
-                            SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST,
-                            SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM,
-                            SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM,
-                            SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST,
-                            SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH,
-                            SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM,
-                          }, {
-                            //Shared Locations
-                            SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST,
-                            SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST,
-                          }, {
-                            // Boss Room Locations
-                            SPIRIT_TEMPLE_TWINROVA_HEART,
-                            TWINROVA,
-                          });
+DungeonInfo SpiritTemple =
+    DungeonInfo("Spirit Temple", RHT_SPIRIT_TEMPLE, RG_SPIRIT_TEMPLE_MAP, RG_SPIRIT_TEMPLE_COMPASS,
+                RG_SPIRIT_TEMPLE_SMALL_KEY, RG_SPIRIT_TEMPLE_KEY_RING, RG_SPIRIT_TEMPLE_BOSS_KEY, 5, 7,
+                {
+                    // Vanilla Locations
+                    RC_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST,
+                    RC_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST,
+                    RC_SPIRIT_TEMPLE_COMPASS_CHEST,
+                    RC_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST,
+                    RC_SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST,
+                    RC_SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST,
+                    RC_SPIRIT_TEMPLE_MAP_CHEST,
+                    RC_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST,
+                    RC_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST,
+                    RC_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST,
+                    RC_SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST,
+                    RC_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST,
+                    RC_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST,
+                    RC_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST,
+                    RC_SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST,
+                    RC_SPIRIT_TEMPLE_BOSS_KEY_CHEST,
+                    RC_SPIRIT_TEMPLE_TOPMOST_CHEST,
+                    RC_SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM,
+                    RC_SPIRIT_TEMPLE_GS_BOULDER_ROOM,
+                    RC_SPIRIT_TEMPLE_GS_LOBBY,
+                    RC_SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM,
+                    RC_SPIRIT_TEMPLE_GS_METAL_FENCE,
+                },
+                {
+                    // MQ Locations
+                    RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST,
+                    RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST,
+                    RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST,
+                    RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST,
+                    RC_SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST,
+                    RC_SPIRIT_TEMPLE_MQ_MAP_CHEST,
+                    RC_SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST,
+                    RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST,
+                    RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST,
+                    RC_SPIRIT_TEMPLE_MQ_COMPASS_CHEST,
+                    RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST,
+                    RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST,
+                    RC_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST,
+                    RC_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST,
+                    RC_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST,
+                    RC_SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST,
+                    RC_SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST,
+                    RC_SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST,
+                    RC_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST,
+                    RC_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST,
+                    RC_SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM,
+                    RC_SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM,
+                    RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST,
+                    RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH,
+                    RC_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM,
+                },
+                {
+                    // Shared Locations
+                    RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST,
+                    RC_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST,
+                },
+                {
+                    // Boss Room Locations
+                    RC_SPIRIT_TEMPLE_TWINROVA_HEART,
+                    RC_TWINROVA,
+                });
 
-  DungeonInfo ShadowTemple = DungeonInfo("Shadow Temple", SHADOW_TEMPLE, SHADOW_TEMPLE_MAP, SHADOW_TEMPLE_COMPASS, SHADOW_TEMPLE_SMALL_KEY, SHADOW_TEMPLE_KEY_RING, SHADOW_TEMPLE_BOSS_KEY, 5, 6, {
-                            //Vanilla Locations
-                            SHADOW_TEMPLE_MAP_CHEST,
-                            SHADOW_TEMPLE_HOVER_BOOTS_CHEST,
-                            SHADOW_TEMPLE_COMPASS_CHEST,
-                            SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST,
-                            SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST,
-                            SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST,
-                            SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST,
-                            SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST,
-                            SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST,
-                            SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST,
-                            SHADOW_TEMPLE_WIND_HINT_CHEST,
-                            SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST,
-                            SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST,
-                            SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST,
-                            SHADOW_TEMPLE_BOSS_KEY_CHEST,
-                            SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST,
-                            SHADOW_TEMPLE_FREESTANDING_KEY,
-                            SHADOW_TEMPLE_GS_SINGLE_GIANT_POT,
-                            SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM,
-                            SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT,
-                            SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM,
-                            SHADOW_TEMPLE_GS_NEAR_SHIP,
-                          }, {
-                            //MQ Locations
-                            SHADOW_TEMPLE_MQ_COMPASS_CHEST,
-                            SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST,
-                            SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST,
-                            SHADOW_TEMPLE_MQ_MAP_CHEST,
-                            SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST,
-                            SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST,
-                            SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST,
-                            SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST,
-                            SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST,
-                            SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST,
-                            SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST,
-                            SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST,
-                            SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST,
-                            SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST,
-                            SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST,
-                            SHADOW_TEMPLE_MQ_WIND_HINT_CHEST,
-                            SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST,
-                            SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST,
-                            SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST,
-                            SHADOW_TEMPLE_MQ_FREESTANDING_KEY,
-                            SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM,
-                            SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM,
-                            SHADOW_TEMPLE_MQ_GS_AFTER_WIND,
-                            SHADOW_TEMPLE_MQ_GS_AFTER_SHIP,
-                            SHADOW_TEMPLE_MQ_GS_NEAR_BOSS,
-                          },
-                          {},
-                          {
-                            // Boss Room Locations
-                            SHADOW_TEMPLE_BONGO_BONGO_HEART,
-                            BONGO_BONGO,
-                          });
+DungeonInfo ShadowTemple =
+    DungeonInfo("Shadow Temple", RHT_SHADOW_TEMPLE, RG_SHADOW_TEMPLE_MAP, RG_SHADOW_TEMPLE_COMPASS,
+                RG_SHADOW_TEMPLE_SMALL_KEY, RG_SHADOW_TEMPLE_KEY_RING, RG_SHADOW_TEMPLE_BOSS_KEY, 5, 6,
+                {
+                    // Vanilla Locations
+                    RC_SHADOW_TEMPLE_MAP_CHEST,
+                    RC_SHADOW_TEMPLE_HOVER_BOOTS_CHEST,
+                    RC_SHADOW_TEMPLE_COMPASS_CHEST,
+                    RC_SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST,
+                    RC_SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST,
+                    RC_SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST,
+                    RC_SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST,
+                    RC_SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST,
+                    RC_SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST,
+                    RC_SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST,
+                    RC_SHADOW_TEMPLE_WIND_HINT_CHEST,
+                    RC_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST,
+                    RC_SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST,
+                    RC_SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST,
+                    RC_SHADOW_TEMPLE_BOSS_KEY_CHEST,
+                    RC_SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST,
+                    RC_SHADOW_TEMPLE_FREESTANDING_KEY,
+                    RC_SHADOW_TEMPLE_GS_SINGLE_GIANT_POT,
+                    RC_SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM,
+                    RC_SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT,
+                    RC_SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM,
+                    RC_SHADOW_TEMPLE_GS_NEAR_SHIP,
+                },
+                {
+                    // MQ Locations
+                    RC_SHADOW_TEMPLE_MQ_COMPASS_CHEST,
+                    RC_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST,
+                    RC_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST,
+                    RC_SHADOW_TEMPLE_MQ_MAP_CHEST,
+                    RC_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST,
+                    RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST,
+                    RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST,
+                    RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST,
+                    RC_SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST,
+                    RC_SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST,
+                    RC_SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST,
+                    RC_SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST,
+                    RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST,
+                    RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST,
+                    RC_SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST,
+                    RC_SHADOW_TEMPLE_MQ_WIND_HINT_CHEST,
+                    RC_SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST,
+                    RC_SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST,
+                    RC_SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST,
+                    RC_SHADOW_TEMPLE_MQ_FREESTANDING_KEY,
+                    RC_SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM,
+                    RC_SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM,
+                    RC_SHADOW_TEMPLE_MQ_GS_AFTER_WIND,
+                    RC_SHADOW_TEMPLE_MQ_GS_AFTER_SHIP,
+                    RC_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS,
+                },
+                {},
+                {
+                    // Boss Room Locations
+                    RC_SHADOW_TEMPLE_BONGO_BONGO_HEART,
+                    RC_BONGO_BONGO,
+                });
 
-  DungeonInfo BottomOfTheWell = DungeonInfo("Bottom of the Well", BOTTOM_OF_THE_WELL, BOTTOM_OF_THE_WELL_MAP, BOTTOM_OF_THE_WELL_COMPASS, BOTTOM_OF_THE_WELL_SMALL_KEY, BOTTOM_OF_THE_WELL_KEY_RING, NONE, 3, 2, {
-                            //Vanilla Locations
-                            BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST,
-                            BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST,
-                            BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST,
-                            BOTTOM_OF_THE_WELL_COMPASS_CHEST,
-                            BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST,
-                            BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST,
-                            BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST,
-                            BOTTOM_OF_THE_WELL_INVISIBLE_CHEST,
-                            BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST,
-                            BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST,
-                            BOTTOM_OF_THE_WELL_MAP_CHEST,
-                            BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST,
-                            BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST,
-                            BOTTOM_OF_THE_WELL_FREESTANDING_KEY,
-                            BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE,
-                            BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM,
-                            BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM,
-                          }, {
-                            //MQ Locations
-                            BOTTOM_OF_THE_WELL_MQ_MAP_CHEST,
-                            BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST,
-                            BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST,
-                            BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY,
-                            BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY,
-                            BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT,
-                            BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM,
-                            BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM,
-                          }, {}, {});
+DungeonInfo BottomOfTheWell =
+    DungeonInfo("Bottom of the Well", RHT_BOTTOM_OF_THE_WELL, RG_BOTTOM_OF_THE_WELL_MAP, RG_BOTTOM_OF_THE_WELL_COMPASS,
+                RG_BOTTOM_OF_THE_WELL_SMALL_KEY, RG_BOTTOM_OF_THE_WELL_KEY_RING, RG_NONE, 3, 2,
+                {
+                    // Vanilla Locations
+                    RC_BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST,
+                    RC_BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST,
+                    RC_BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST,
+                    RC_BOTTOM_OF_THE_WELL_COMPASS_CHEST,
+                    RC_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST,
+                    RC_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST,
+                    RC_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST,
+                    RC_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST,
+                    RC_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST,
+                    RC_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST,
+                    RC_BOTTOM_OF_THE_WELL_MAP_CHEST,
+                    RC_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST,
+                    RC_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST,
+                    RC_BOTTOM_OF_THE_WELL_FREESTANDING_KEY,
+                    RC_BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE,
+                    RC_BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM,
+                    RC_BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM,
+                },
+                {
+                    // MQ Locations
+                    RC_BOTTOM_OF_THE_WELL_MQ_MAP_CHEST,
+                    RC_BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST,
+                    RC_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST,
+                    RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY,
+                    RC_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY,
+                    RC_BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT,
+                    RC_BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM,
+                    RC_BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM,
+                },
+                {}, {});
 
-  DungeonInfo IceCavern = DungeonInfo("Ice Cavern", ICE_CAVERN, ICE_CAVERN_MAP, ICE_CAVERN_COMPASS, NONE, NONE, NONE, 0, 0, {
-                            //Vanilla Locations
-                            ICE_CAVERN_MAP_CHEST,
-                            ICE_CAVERN_COMPASS_CHEST,
-                            ICE_CAVERN_IRON_BOOTS_CHEST,
-                            ICE_CAVERN_FREESTANDING_POH,
-                            ICE_CAVERN_GS_PUSH_BLOCK_ROOM,
-                            ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM,
-                            ICE_CAVERN_GS_HEART_PIECE_ROOM,
-                          }, {
-                            //MQ Locations
-                            ICE_CAVERN_MQ_IRON_BOOTS_CHEST,
-                            ICE_CAVERN_MQ_COMPASS_CHEST,
-                            ICE_CAVERN_MQ_MAP_CHEST,
-                            ICE_CAVERN_MQ_FREESTANDING_POH,
-                            ICE_CAVERN_MQ_GS_SCARECROW,
-                            ICE_CAVERN_MQ_GS_ICE_BLOCK,
-                            ICE_CAVERN_MQ_GS_RED_ICE,
-                          }, {
-                            //Shared Locations
-                            SHEIK_IN_ICE_CAVERN,
-                          }, {});
+DungeonInfo IceCavern =
+    DungeonInfo("Ice Cavern", RHT_ICE_CAVERN, RG_ICE_CAVERN_MAP, RG_ICE_CAVERN_COMPASS, RG_NONE, RG_NONE, RG_NONE, 0, 0,
+                {
+                    // Vanilla Locations
+                    RC_ICE_CAVERN_MAP_CHEST,
+                    RC_ICE_CAVERN_COMPASS_CHEST,
+                    RC_ICE_CAVERN_IRON_BOOTS_CHEST,
+                    RC_ICE_CAVERN_FREESTANDING_POH,
+                    RC_ICE_CAVERN_GS_PUSH_BLOCK_ROOM,
+                    RC_ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM,
+                    RC_ICE_CAVERN_GS_HEART_PIECE_ROOM,
+                },
+                {
+                    // MQ Locations
+                    RC_ICE_CAVERN_MQ_IRON_BOOTS_CHEST,
+                    RC_ICE_CAVERN_MQ_COMPASS_CHEST,
+                    RC_ICE_CAVERN_MQ_MAP_CHEST,
+                    RC_ICE_CAVERN_MQ_FREESTANDING_POH,
+                    RC_ICE_CAVERN_MQ_GS_SCARECROW,
+                    RC_ICE_CAVERN_MQ_GS_ICE_BLOCK,
+                    RC_ICE_CAVERN_MQ_GS_RED_ICE,
+                },
+                {
+                    // Shared Locations
+                    RC_SHEIK_IN_ICE_CAVERN,
+                },
+                {});
 
-  DungeonInfo GerudoTrainingGrounds = DungeonInfo("Gerudo Training Grounds", GERUDO_TRAINING_GROUNDS, NONE, NONE, GERUDO_TRAINING_GROUNDS_SMALL_KEY, GERUDO_TRAINING_GROUNDS_KEY_RING, NONE, 9, 3, {
-                            //Vanilla Locations
-                            GERUDO_TRAINING_GROUNDS_LOBBY_LEFT_CHEST,
-                            GERUDO_TRAINING_GROUNDS_LOBBY_RIGHT_CHEST,
-                            GERUDO_TRAINING_GROUNDS_STALFOS_CHEST,
-                            GERUDO_TRAINING_GROUNDS_BEAMOS_CHEST,
-                            GERUDO_TRAINING_GROUNDS_HIDDEN_CEILING_CHEST,
-                            GERUDO_TRAINING_GROUNDS_MAZE_PATH_FIRST_CHEST,
-                            GERUDO_TRAINING_GROUNDS_MAZE_PATH_SECOND_CHEST,
-                            GERUDO_TRAINING_GROUNDS_MAZE_PATH_THIRD_CHEST,
-                            GERUDO_TRAINING_GROUNDS_MAZE_PATH_FINAL_CHEST,
-                            GERUDO_TRAINING_GROUNDS_MAZE_RIGHT_CENTRAL_CHEST,
-                            GERUDO_TRAINING_GROUNDS_MAZE_RIGHT_SIDE_CHEST,
-                            GERUDO_TRAINING_GROUNDS_UNDERWATER_SILVER_RUPEE_CHEST,
-                            GERUDO_TRAINING_GROUNDS_HAMMER_ROOM_CLEAR_CHEST,
-                            GERUDO_TRAINING_GROUNDS_HAMMER_ROOM_SWITCH_CHEST,
-                            GERUDO_TRAINING_GROUNDS_EYE_STATUE_CHEST,
-                            GERUDO_TRAINING_GROUNDS_NEAR_SCARECROW_CHEST,
-                            GERUDO_TRAINING_GROUNDS_BEFORE_HEAVY_BLOCK_CHEST,
-                            GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_FIRST_CHEST,
-                            GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_SECOND_CHEST,
-                            GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_THIRD_CHEST,
-                            GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_FOURTH_CHEST,
-                            GERUDO_TRAINING_GROUNDS_FREESTANDING_KEY,
-                          }, {
-                            //MQ Locations
-                            GERUDO_TRAINING_GROUNDS_MQ_LOBBY_RIGHT_CHEST,
-                            GERUDO_TRAINING_GROUNDS_MQ_LOBBY_LEFT_CHEST,
-                            GERUDO_TRAINING_GROUNDS_MQ_FIRST_IRON_KNUCKLE_CHEST,
-                            GERUDO_TRAINING_GROUNDS_MQ_BEFORE_HEAVY_BLOCK_CHEST,
-                            GERUDO_TRAINING_GROUNDS_MQ_EYE_STATUE_CHEST,
-                            GERUDO_TRAINING_GROUNDS_MQ_FLAME_CIRCLE_CHEST,
-                            GERUDO_TRAINING_GROUNDS_MQ_SECOND_IRON_KNUCKLE_CHEST,
-                            GERUDO_TRAINING_GROUNDS_MQ_DINOLFOS_CHEST,
-                            GERUDO_TRAINING_GROUNDS_MQ_ICE_ARROWS_CHEST,
-                            GERUDO_TRAINING_GROUNDS_MQ_MAZE_RIGHT_CENTRAL_CHEST,
-                            GERUDO_TRAINING_GROUNDS_MQ_MAZE_PATH_FIRST_CHEST,
-                            GERUDO_TRAINING_GROUNDS_MQ_MAZE_RIGHT_SIDE_CHEST,
-                            GERUDO_TRAINING_GROUNDS_MQ_MAZE_PATH_THIRD_CHEST,
-                            GERUDO_TRAINING_GROUNDS_MQ_MAZE_PATH_SECOND_CHEST,
-                            GERUDO_TRAINING_GROUNDS_MQ_HIDDEN_CEILING_CHEST,
-                            GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER_SILVER_RUPEE_CHEST,
-                            GERUDO_TRAINING_GROUNDS_MQ_HEAVY_BLOCK_CHEST,
-                          }, {}, {});
+DungeonInfo GerudoTrainingGrounds =
+    DungeonInfo("Gerudo Training Grounds", RHT_GERUDO_TRAINING_GROUND, RG_NONE, RG_NONE,
+                RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, RG_GERUDO_TRAINING_GROUNDS_KEY_RING, RG_NONE, 9, 3,
+                {
+                    // Vanilla Locations
+                    RC_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST,
+                    RC_GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST,
+                    RC_GERUDO_TRAINING_GROUND_STALFOS_CHEST,
+                    RC_GERUDO_TRAINING_GROUND_BEAMOS_CHEST,
+                    RC_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST,
+                    RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST,
+                    RC_GERUDO_TRAINING_GROUND_MAZE_PATH_SECOND_CHEST,
+                    RC_GERUDO_TRAINING_GROUND_MAZE_PATH_THIRD_CHEST,
+                    RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FINAL_CHEST,
+                    RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_CENTRAL_CHEST,
+                    RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_SIDE_CHEST,
+                    RC_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST,
+                    RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST,
+                    RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST,
+                    RC_GERUDO_TRAINING_GROUND_EYE_STATUE_CHEST,
+                    RC_GERUDO_TRAINING_GROUND_NEAR_SCARECROW_CHEST,
+                    RC_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST,
+                    RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST,
+                    RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST,
+                    RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_THIRD_CHEST,
+                    RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FOURTH_CHEST,
+                    RC_GERUDO_TRAINING_GROUND_FREESTANDING_KEY,
+                },
+                {
+                    // MQ Locations
+                    RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST,
+                    RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST,
+                    RC_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST,
+                    RC_GERUDO_TRAINING_GROUND_MQ_BEFORE_HEAVY_BLOCK_CHEST,
+                    RC_GERUDO_TRAINING_GROUND_MQ_EYE_STATUE_CHEST,
+                    RC_GERUDO_TRAINING_GROUND_MQ_FLAME_CIRCLE_CHEST,
+                    RC_GERUDO_TRAINING_GROUND_MQ_SECOND_IRON_KNUCKLE_CHEST,
+                    RC_GERUDO_TRAINING_GROUND_MQ_DINOLFOS_CHEST,
+                    RC_GERUDO_TRAINING_GROUND_MQ_ICE_ARROWS_CHEST,
+                    RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_CENTRAL_CHEST,
+                    RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_FIRST_CHEST,
+                    RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_SIDE_CHEST,
+                    RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_THIRD_CHEST,
+                    RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_SECOND_CHEST,
+                    RC_GERUDO_TRAINING_GROUND_MQ_HIDDEN_CEILING_CHEST,
+                    RC_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST,
+                    RC_GERUDO_TRAINING_GROUND_MQ_HEAVY_BLOCK_CHEST,
+                },
+                {}, {});
 
-  DungeonInfo GanonsCastle = DungeonInfo("Ganon's Castle", GANONS_CASTLE, NONE, NONE, GANONS_CASTLE_SMALL_KEY, GANONS_CASTLE_KEY_RING, GANONS_CASTLE_BOSS_KEY, 2, 3, {
-                            //Vanilla Locations
-                            GANONS_CASTLE_FOREST_TRIAL_CHEST,
-                            GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST,
-                            GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST,
-                            GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST,
-                            GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST,
-                            GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST,
-                            GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST,
-                            GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST,
-                            GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST,
-                            GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST,
-                            GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST,
-                            GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST,
-                            GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST,
-                            GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST,
-                            GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST,
-                            GANONS_CASTLE_DEKU_SCRUB_LEFT,
-                            GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,
-                            GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT,
-                            GANONS_CASTLE_DEKU_SCRUB_RIGHT,
-                          }, {
-                            //MQ Locations
-                            GANONS_CASTLE_MQ_WATER_TRIAL_CHEST,
-                            GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST,
-                            GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST,
-                            GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST,
-                            GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST,
-                            GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST,
-                            GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST,
-                            GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST,
-                            GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST,
-                            GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST,
-                            GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST,
-                            GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST,
-                            GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY,
-                            GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,
-                            GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,
-                            GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,
-                            GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT,
-                            GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,
-                          }, {
-                            //Shared Locations
-                            GANONS_TOWER_BOSS_KEY_CHEST,
-                            GANON,
-                          }, {});
+DungeonInfo GanonsCastle =
+    DungeonInfo("Ganon's Castle", RHT_GANONS_CASTLE, RG_NONE, RG_NONE, RG_GANONS_CASTLE_SMALL_KEY,
+                RG_GANONS_CASTLE_KEY_RING, RG_GANONS_CASTLE_BOSS_KEY, 2, 3,
+                {
+                    // Vanilla Locations
+                    RC_GANONS_CASTLE_FOREST_TRIAL_CHEST,
+                    RC_GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST,
+                    RC_GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST,
+                    RC_GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST,
+                    RC_GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST,
+                    RC_GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST,
+                    RC_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST,
+                    RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST,
+                    RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST,
+                    RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST,
+                    RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST,
+                    RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST,
+                    RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST,
+                    RC_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST,
+                    RC_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST,
+                    RC_GANONS_CASTLE_DEKU_SCRUB_LEFT,
+                    RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,
+                    RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT,
+                    RC_GANONS_CASTLE_DEKU_SCRUB_RIGHT,
+                },
+                {
+                    // MQ Locations
+                    RC_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST,
+                    RC_GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST,
+                    RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST,
+                    RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST,
+                    RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST,
+                    RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST,
+                    RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST,
+                    RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST,
+                    RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST,
+                    RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST,
+                    RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST,
+                    RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST,
+                    RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY,
+                    RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,
+                    RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,
+                    RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,
+                    RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT,
+                    RC_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,
+                },
+                {
+                    // Shared Locations
+                    RC_GANONS_TOWER_BOSS_KEY_CHEST,
+                    RC_GANON,
+                },
+                {});
 
-  const DungeonArray dungeonList = {
-    &DekuTree,
-    &DodongosCavern,
-    &JabuJabusBelly,
-    &ForestTemple,
-    &FireTemple,
-    &WaterTemple,
-    &SpiritTemple,
-    &ShadowTemple,
-    &BottomOfTheWell,
-    &IceCavern,
-    &GerudoTrainingGrounds,
-    &GanonsCastle,
-  };
+const DungeonArray dungeonList = {
+    &DekuTree,        &DodongosCavern, &JabuJabusBelly,        &ForestTemple,
+    &FireTemple,      &WaterTemple,    &SpiritTemple,          &ShadowTemple,
+    &BottomOfTheWell, &IceCavern,      &GerudoTrainingGrounds, &GanonsCastle,
+};
 
-} //namespace Dungeon
+} // namespace Dungeon
diff --git a/soh/soh/Enhancements/randomizer/3drando/dungeon.hpp b/soh/soh/Enhancements/randomizer/3drando/dungeon.hpp
index 91644e128..93f3017d6 100644
--- a/soh/soh/Enhancements/randomizer/3drando/dungeon.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/dungeon.hpp
@@ -4,17 +4,18 @@
 #include <string>
 #include <vector>
 
-#include "keys.hpp"
+#include "../randomizerTypes.h"
 
 namespace Dungeon {
 class DungeonInfo {
 public:
-    DungeonInfo(std::string name_, uint32_t hintKey_, uint32_t map_, uint32_t compass_, uint32_t smallKey_, uint32_t keyRing_, uint32_t bossKey_,
+  DungeonInfo(std::string name_, RandomizerHintTextKey hintKey_, RandomizerGet map_, RandomizerGet compass_, RandomizerGet smallKey_,
+              RandomizerGet keyRing_, RandomizerGet bossKey_,
               uint8_t vanillaKeyCount_, uint8_t mqKeyCount_,
-                std::vector<uint32_t> vanillaLocations_,
-                std::vector<uint32_t> mqLocations_,
-                std::vector<uint32_t> sharedLocations_,
-                std::vector<uint32_t> bossRoomLocations_);
+                std::vector<RandomizerCheck> vanillaLocations_,
+                std::vector<RandomizerCheck> mqLocations_,
+                std::vector<RandomizerCheck> sharedLocations_,
+                std::vector<RandomizerCheck> bossRoomLocations_);
     ~DungeonInfo();
 
     const std::string& GetName() const {
@@ -53,12 +54,12 @@ public:
         return (masterQuest) ? mqKeyCount : vanillaKeyCount;
     }
 
-    uint32_t GetHintKey() const;
-    uint32_t GetSmallKey() const;
-    uint32_t GetKeyRing() const;
-    uint32_t GetMap() const;
-    uint32_t GetCompass() const;
-    uint32_t GetBossKey() const;
+    RandomizerHintTextKey GetHintKey() const;
+    RandomizerGet GetSmallKey() const;
+    RandomizerGet GetKeyRing() const;
+    RandomizerGet GetMap() const;
+    RandomizerGet GetCompass() const;
+    RandomizerGet GetBossKey() const;
 
     void PlaceVanillaMap();
     void PlaceVanillaCompass();
@@ -66,27 +67,27 @@ public:
     void PlaceVanillaSmallKeys();
 
     // Gets the chosen dungeon locations for a playthrough (so either MQ or Vanilla)
-    std::vector<uint32_t> GetDungeonLocations() const;
+    std::vector<RandomizerCheck> GetDungeonLocations() const;
 
     // Gets all dungeon locations (MQ + Vanilla)
-    std::vector<uint32_t> GetEveryLocation() const;
+    std::vector<RandomizerCheck> GetEveryLocation() const;
 
 private:
     std::string name;
-    uint32_t hintKey;
-    uint32_t map;
-    uint32_t compass;
-    uint32_t smallKey;
-    uint32_t keyRing;
-    uint32_t bossKey;
+    RandomizerHintTextKey hintKey;
+    RandomizerGet map;
+    RandomizerGet compass;
+    RandomizerGet smallKey;
+    RandomizerGet keyRing;
+    RandomizerGet bossKey;
     uint8_t vanillaKeyCount;
     uint8_t mqKeyCount;
     bool masterQuest = false;
     bool hasKeyRing = false;
-    std::vector<uint32_t> vanillaLocations;
-    std::vector<uint32_t> mqLocations;
-    std::vector<uint32_t> sharedLocations;
-    std::vector<uint32_t> bossRoomLocations;
+    std::vector<RandomizerCheck> vanillaLocations;
+    std::vector<RandomizerCheck> mqLocations;
+    std::vector<RandomizerCheck> sharedLocations;
+    std::vector<RandomizerCheck> bossRoomLocations;
 };
 
 extern DungeonInfo DekuTree;
diff --git a/soh/soh/Enhancements/randomizer/3drando/entrance.cpp b/soh/soh/Enhancements/randomizer/3drando/entrance.cpp
index bd308596e..ccdf516f9 100644
--- a/soh/soh/Enhancements/randomizer/3drando/entrance.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/entrance.cpp
@@ -2,12 +2,12 @@
 
 #include "fill.hpp"
 #include "settings.hpp"
-#include "item_list.hpp"
 #include "item_pool.hpp"
-#include "item_location.hpp"
+#include "../context.h"
 #include "spoiler_log.hpp"
 #include "hints.hpp"
 #include "location_access.hpp"
+#include "soh/Enhancements/randomizer/static_data.h"
 
 #include <vector>
 #include <utility>
@@ -23,16 +23,16 @@ static int curNumRandomizedEntrances = 0;
 
 typedef struct {
     EntranceType type;
-    AreaKey parentRegion;
-    AreaKey connectedRegion;
+    RandomizerRegion parentRegion;
+    RandomizerRegion connectedRegion;
     int16_t index;
     int16_t blueWarp;
 } EntranceLinkInfo;
 
-EntranceLinkInfo NO_RETURN_ENTRANCE = {EntranceType::None, NONE, NONE, -1};
+EntranceLinkInfo NO_RETURN_ENTRANCE = {EntranceType::None, RR_NONE, RR_NONE, -1};
 
 typedef struct {
-    std::list<AreaKey> targetRegions;
+    std::list<RandomizerRegion> targetRegions;
     std::list<EntranceType> allowedTypes;
 } PriorityEntrance;
                                  //primary,          secondary
@@ -87,7 +87,7 @@ void SetAllEntrancesData(std::vector<EntranceInfoPair>& entranceShuffleTable) {
       forwardEntrance->SetDecoupled();
     }
 
-    if (returnEntry.parentRegion != NONE) {
+    if (returnEntry.parentRegion != RR_NONE) {
       Entrance* returnEntrance = AreaTable(returnEntry.parentRegion)->GetExit(returnEntry.connectedRegion);
       returnEntrance->SetIndex(returnEntry.index);
       returnEntrance->SetBlueWarp(returnEntry.blueWarp);
@@ -125,7 +125,7 @@ static std::vector<Entrance*> AssumeEntrancePool(std::vector<Entrance*>& entranc
   return assumedPool;
 }
 
-static std::vector<Entrance*> BuildOneWayTargets(std::vector<EntranceType> typesToInclude, std::vector<std::pair<AreaKey, AreaKey>> exclude = {}/*, target_region_names*/) {
+static std::vector<Entrance*> BuildOneWayTargets(std::vector<EntranceType> typesToInclude, std::vector<std::pair<RandomizerRegion, RandomizerRegion>> exclude = {}/*, target_region_names*/) {
   std::vector<Entrance*> oneWayEntrances = {};
   // Get all entrances of the specified type
   for (EntranceType poolType : typesToInclude) {
@@ -133,7 +133,7 @@ static std::vector<Entrance*> BuildOneWayTargets(std::vector<EntranceType> types
   }
   // Filter out any that are passed in the exclusion list
   FilterAndEraseFromPool(oneWayEntrances, [&exclude](Entrance* entrance){
-    std::pair<AreaKey, AreaKey> entranceBeingChecked (entrance->GetParentRegionKey(), entrance->GetConnectedRegionKey());
+    std::pair<RandomizerRegion, RandomizerRegion> entranceBeingChecked (entrance->GetParentRegionKey(), entrance->GetConnectedRegionKey());
     return ElementInContainer(entranceBeingChecked, exclude);
   });
 
@@ -152,7 +152,7 @@ static std::vector<Entrance*> BuildOneWayTargets(std::vector<EntranceType> types
 //returns restrictive entrances and soft entrances in an array of size 2 (restrictive vector is index 0, soft is index 1)
 static std::array<std::vector<Entrance*>, 2> SplitEntrancesByRequirements(std::vector<Entrance*>& entrancesToSplit, std::vector<Entrance*>& assumedEntrances) {
   //First, disconnect all root assumed entrances and save which regions they were originally connected to, so we can reconnect them later
-  std::map<Entrance*, AreaKey> originalConnectedRegions = {};
+  std::map<Entrance*, RandomizerRegion> originalConnectedRegions = {};
   std::set<Entrance*> entrancesToDisconnect = {};
   for (Entrance* entrance : assumedEntrances) {
     entrancesToDisconnect.insert(entrance);
@@ -165,7 +165,7 @@ static std::array<std::vector<Entrance*>, 2> SplitEntrancesByRequirements(std::v
   //soft entrances are ones that can be accessed by both ages (child/adult) at both times of day (day/night)
   //restrictive entrances are ones that do not meet this criteria
   for (Entrance* entrance : entrancesToDisconnect) {
-    if (entrance->GetConnectedRegionKey() != NONE) {
+    if (entrance->GetConnectedRegionKey() != RR_NONE) {
       originalConnectedRegions[entrance] = entrance->Disconnect();
     }
   }
@@ -175,9 +175,10 @@ static std::array<std::vector<Entrance*>, 2> SplitEntrancesByRequirements(std::v
 
   Logic::LogicReset();
   // Apply the effects of all advancement items to search for entrance accessibility
-  std::vector<ItemKey> items = FilterFromPool(ItemPool, [](const ItemKey i){ return ItemTable(i).IsAdvancement();});
-  for (ItemKey unplacedItem : items) {
-    ItemTable(unplacedItem).ApplyEffect();
+  std::vector<RandomizerGet> items = 
+    FilterFromPool(ItemPool, [](const RandomizerGet i){ return Rando::StaticData::RetrieveItem(i).IsAdvancement();});
+  for (RandomizerGet unplacedItem : items) {
+    Rando::StaticData::RetrieveItem(unplacedItem).ApplyEffect();
   }
   // run a search to see what's accessible
   GetAccessibleLocations({});
@@ -248,12 +249,12 @@ static void RestoreConnections(Entrance* entrance, Entrance* targetEntrance) {
 }
 
 static void DeleteTargetEntrance(Entrance* targetEntrance) {
-  if (targetEntrance->GetConnectedRegionKey() != NONE) {
+  if (targetEntrance->GetConnectedRegionKey() != RR_NONE) {
     targetEntrance->Disconnect();
   }
-  if (targetEntrance->GetParentRegionKey() != NONE) {
+  if (targetEntrance->GetParentRegionKey() != RR_NONE) {
     targetEntrance->GetParentRegion()->RemoveExit(targetEntrance);
-    targetEntrance->SetParentRegion(NONE);
+    targetEntrance->SetParentRegion(RR_NONE);
   }
 }
 
@@ -282,9 +283,9 @@ static bool EntranceUnreachableAs(Entrance* entrance, uint8_t age, std::vector<E
     return false;
   } else if (type == EntranceType::OwlDrop) {
     return age == AGE_ADULT;
-  } else if (type == EntranceType::Spawn && entrance->GetConnectedRegionKey() == KF_LINKS_HOUSE) {
+  } else if (type == EntranceType::Spawn && entrance->GetConnectedRegionKey() == RR_KF_LINKS_HOUSE) {
     return age == AGE_ADULT;
-  } else if (type == EntranceType::Spawn && entrance->GetConnectedRegionKey() == TEMPLE_OF_TIME) {
+  } else if (type == EntranceType::Spawn && entrance->GetConnectedRegionKey() == RR_TEMPLE_OF_TIME) {
     return age == AGE_CHILD;
   }
 
@@ -377,9 +378,9 @@ static bool ValidateWorld(Entrance* entrancePlaced) {
   (entrancePlaced == nullptr || type == EntranceType::Interior || type == EntranceType::SpecialInterior)) {
     //When cows are shuffled, ensure both Impa's House entrances are in the same hint area because the cow is reachable from both sides
     if (Settings::ShuffleCows) {
-      auto impasHouseFrontHintRegion = GetHintRegionHintKey(KAK_IMPAS_HOUSE);
-      auto impasHouseBackHintRegion = GetHintRegionHintKey(KAK_IMPAS_HOUSE_BACK);
-      if (impasHouseFrontHintRegion != NONE && impasHouseBackHintRegion != NONE && impasHouseBackHintRegion != LINKS_POCKET && impasHouseFrontHintRegion != LINKS_POCKET && impasHouseBackHintRegion != impasHouseFrontHintRegion) {
+      auto impasHouseFrontHintRegion = GetHintRegionHintKey(RR_KAK_IMPAS_HOUSE);
+      auto impasHouseBackHintRegion = GetHintRegionHintKey(RR_KAK_IMPAS_HOUSE_BACK);
+      if (impasHouseFrontHintRegion != RHT_NONE && impasHouseBackHintRegion != RHT_NONE && impasHouseBackHintRegion != RHT_LINKS_POCKET && impasHouseFrontHintRegion != RHT_LINKS_POCKET && impasHouseBackHintRegion != impasHouseFrontHintRegion) {
         auto message = "Kak Impas House entrances are not in the same hint area\n";
         SPDLOG_DEBUG(message);
         return false;
@@ -388,10 +389,10 @@ static bool ValidateWorld(Entrance* entrancePlaced) {
   }
 
   // If all locations aren't reachable, that means that one of the conditions failed when searching
-  if (!allLocationsReachable) {
+  if (!Rando::Context::GetInstance()->allLocationsReachable) {
     if (checkOtherEntranceAccess) {
       // At least one valid starting region with all basic refills should be reachable without using any items at the beginning of the seed
-      if (!AreaTable(KOKIRI_FOREST)->HasAccess() && !AreaTable(KAKARIKO_VILLAGE)->HasAccess()) {
+      if (!AreaTable(RR_KOKIRI_FOREST)->HasAccess() && !AreaTable(RR_KAKARIKO_VILLAGE)->HasAccess()) {
         SPDLOG_DEBUG("Invalid starting area\n");
         return false;
       }
@@ -404,10 +405,10 @@ static bool ValidateWorld(Entrance* entrancePlaced) {
 
       // The player should be able to get back to ToT after going through time, without having collected any items
       // This is important to ensure that the player never loses access to the pedestal after going through time
-      if (Settings::ResolvedStartingAge == AGE_CHILD && !AreaTable(TEMPLE_OF_TIME)->Adult()) {
+      if (Settings::ResolvedStartingAge == AGE_CHILD && !AreaTable(RR_TEMPLE_OF_TIME)->Adult()) {
         SPDLOG_DEBUG("Path to Temple of Time as adult is not guaranteed\n");
         return false;
-      } else if (Settings::ResolvedStartingAge == AGE_ADULT && !AreaTable(TEMPLE_OF_TIME)->Child()) {
+      } else if (Settings::ResolvedStartingAge == AGE_ADULT && !AreaTable(RR_TEMPLE_OF_TIME)->Child()) {
         SPDLOG_DEBUG("Path to Temple of Time as child is not guaranteed\n");
         return false;
       }
@@ -416,7 +417,7 @@ static bool ValidateWorld(Entrance* entrancePlaced) {
     // The Big Poe shop should always be accessible as adult without the need to use any bottles
     // This is important to ensure that players can never lock their only bottles by filling them with Big Poes they can't sell
     if (checkPoeCollectorAccess) {
-      if (!AreaTable(MARKET_GUARD_HOUSE)->Adult()) {
+      if (!AreaTable(RR_MARKET_GUARD_HOUSE)->Adult()) {
         SPDLOG_DEBUG("Big Poe Shop access is not guarenteed as adult\n");
         return false;
       }
@@ -451,7 +452,7 @@ static bool ReplaceEntrance(Entrance* entrance, Entrance* target, std::vector<En
       //SPDLOG_DEBUG(message);
       //Areas::DumpWorldGraph(ticks);
     #endif
-    if (entrance->GetConnectedRegionKey() != NONE) {
+    if (entrance->GetConnectedRegionKey() != RR_NONE) {
       RestoreConnections(entrance, target);
     }
   }
@@ -462,7 +463,7 @@ static bool ReplaceEntrance(Entrance* entrance, Entrance* target, std::vector<En
 // Connect one random entrance from entrance pools to one random target in the respective target pool.
 // Entrance chosen will have one of the allowed types.
 // Target chosen will lead to one of the allowed regions.
-static bool PlaceOneWayPriorityEntrance(std::string priorityName, std::list<AreaKey>& allowedRegions, std::list<EntranceType>& allowedTypes, std::vector<EntrancePair>& rollbacks, EntrancePools oneWayEntrancePools, EntrancePools oneWayTargetEntrancePools) {
+static bool PlaceOneWayPriorityEntrance(std::string priorityName, std::list<RandomizerRegion>& allowedRegions, std::list<EntranceType>& allowedTypes, std::vector<EntrancePair>& rollbacks, EntrancePools oneWayEntrancePools, EntrancePools oneWayTargetEntrancePools) {
   // Combine the entrances for allowed types in one list.
   // Shuffle this list.
   // Pick the first one not already set, not adult spawn, that has a valid target entrance.
@@ -482,20 +483,20 @@ static bool PlaceOneWayPriorityEntrance(std::string priorityName, std::list<Area
     }
     // Only allow Adult Spawn as sole Nocturne access if hints != mask.
     // Otherwise, child access is required here (adult access assumed or guaranteed later).
-    if (entrance->GetParentRegionKey() == ADULT_SPAWN) {
+    if (entrance->GetParentRegionKey() == RR_ADULT_SPAWN) {
       if (priorityName != "Nocturne" || Settings::GossipStoneHints.Is(HINTS_MASK_OF_TRUTH)) {
         continue;
       }
     }
     // If not shuffling dungeons, Nocturne requires adult access
     if (!Settings::ShuffleDungeonEntrances && priorityName == "Nocturne") {
-      if (entrance->GetType() != EntranceType::WarpSong && entrance->GetParentRegionKey() != ADULT_SPAWN) {
+      if (entrance->GetType() != EntranceType::WarpSong && entrance->GetParentRegionKey() != RR_ADULT_SPAWN) {
         continue;
       }
     }
     for (Entrance* target : oneWayTargetEntrancePools[entrance->GetType()]) {
-      AreaKey targetRegionKey = target->GetConnectedRegionKey();
-      if (targetRegionKey != NONE && ElementInContainer(targetRegionKey, allowedRegions)) {
+      RandomizerRegion targetRegionKey = target->GetConnectedRegionKey();
+      if (targetRegionKey != RR_NONE && ElementInContainer(targetRegionKey, allowedRegions)) {
         if (ReplaceEntrance(entrance, target, rollbacks)) {
           // Return once the entrance has been replaced
           return true;
@@ -514,7 +515,10 @@ static bool PlaceOneWayPriorityEntrance(std::string priorityName, std::list<Area
 // Once the first entrance to Impas House has been placed, try to place the next one immediately to reduce chances of failure.
 static bool PlaceOtherImpasHouseEntrance(std::vector<Entrance*> entrances, std::vector<Entrance*> targetEntrances, std::vector<EntrancePair>& rollbacks) {
   // Get the other impas house entrance
-  auto otherImpaTargets = FilterFromPool(targetEntrances, [](const Entrance* target){return (target->GetConnectedRegionKey() == KAK_IMPAS_HOUSE || target->GetConnectedRegionKey() == KAK_IMPAS_HOUSE_BACK);});
+  auto otherImpaTargets = FilterFromPool(targetEntrances, [](const Entrance* target) {
+      return (target->GetConnectedRegionKey() == RR_KAK_IMPAS_HOUSE ||
+              target->GetConnectedRegionKey() == RR_KAK_IMPAS_HOUSE_BACK);
+  });
   if (otherImpaTargets.empty()) {
     return true;
   }
@@ -522,11 +526,14 @@ static bool PlaceOtherImpasHouseEntrance(std::vector<Entrance*> entrances, std::
   Entrance* otherImpaTarget = otherImpaTargets[0];
   auto m = "Now Placing Other Impa Target: " + otherImpaTarget->GetName() + "\n";
   SPDLOG_DEBUG(m);
-  AreaKey otherImpaRegion = otherImpaTarget->GetConnectedRegionKey() != KAK_IMPAS_HOUSE_BACK ? KAK_IMPAS_HOUSE_BACK : KAK_IMPAS_HOUSE;
+  RandomizerRegion otherImpaRegion = otherImpaTarget->GetConnectedRegionKey() != RR_KAK_IMPAS_HOUSE_BACK
+                                         ? RR_KAK_IMPAS_HOUSE_BACK
+                                         : RR_KAK_IMPAS_HOUSE;
   for (Entrance* entrance : entrances) {
     // If the entrance is already connected or it doesn't have the same hint region as the already placed impas house entrance, then don't try to use it
-    if (entrance->GetConnectedRegionKey() != NONE || (GetHintRegionHintKey(otherImpaRegion) != GetHintRegionHintKey(entrance->GetParentRegionKey()))) {
-      continue;
+    if (entrance->GetConnectedRegionKey() != RR_NONE ||
+        (GetHintRegionHintKey(otherImpaRegion) != GetHintRegionHintKey(entrance->GetParentRegionKey()))) {
+        continue;
     }
     // If the placement succeeds, we return true
     if (ReplaceEntrance(entrance, otherImpaTarget, rollbacks)) {
@@ -544,18 +551,18 @@ static bool ShuffleEntrances(std::vector<Entrance*>& entrances, std::vector<Entr
 
   //place all entrances in the pool, validating after every placement
   for (Entrance* entrance : entrances) {
-    if (entrance->GetConnectedRegionKey() != NONE) {
+    if (entrance->GetConnectedRegionKey() != RR_NONE) {
       continue;
     }
 
     Shuffle(targetEntrances);
     for (Entrance* target : targetEntrances) {
-      if (target->GetConnectedRegionKey() == NONE) {
+      if (target->GetConnectedRegionKey() == RR_NONE) {
         continue;
       }
 
       // Store whether or not we're about to attempt placing an entrance to Impas House
-      bool attemptedImpasHousePlacement = (target->GetConnectedRegionKey() == KAK_IMPAS_HOUSE || target->GetConnectedRegionKey() == KAK_IMPAS_HOUSE_BACK);
+      bool attemptedImpasHousePlacement = (target->GetConnectedRegionKey() == RR_KAK_IMPAS_HOUSE || target->GetConnectedRegionKey() == RR_KAK_IMPAS_HOUSE_BACK);
 
       if (ReplaceEntrance(entrance, target, rollbacks)) {
         // If shuffle cows is enabled and the last entrance was one to Impas House,
@@ -569,7 +576,7 @@ static bool ShuffleEntrances(std::vector<Entrance*>& entrances, std::vector<Entr
       }
     }
 
-    if (entrance->GetConnectedRegionKey() == NONE) {
+    if (entrance->GetConnectedRegionKey() == RR_NONE) {
       return false;
     }
   }
@@ -687,287 +694,294 @@ int ShuffleAllEntrances() {
   curNumRandomizedEntrances = 0;
 
   std::vector<EntranceInfoPair> entranceShuffleTable = {
-                                   //Parent Region                     Connected Region                      index   blue warp
-    {{EntranceType::Dungeon,         KF_OUTSIDE_DEKU_TREE,             DEKU_TREE_ENTRYWAY,                   0x0000},
-     {EntranceType::Dungeon,         DEKU_TREE_ENTRYWAY,               KF_OUTSIDE_DEKU_TREE,                 0x0209, 0x0457}},
-    {{EntranceType::Dungeon,         DEATH_MOUNTAIN_TRAIL,             DODONGOS_CAVERN_ENTRYWAY,             0x0004},
-     {EntranceType::Dungeon,         DODONGOS_CAVERN_ENTRYWAY,         DEATH_MOUNTAIN_TRAIL,                 0x0242, 0x047A}},
-    {{EntranceType::Dungeon,         ZORAS_FOUNTAIN,                   JABU_JABUS_BELLY_ENTRYWAY,            0x0028},
-     {EntranceType::Dungeon,         JABU_JABUS_BELLY_ENTRYWAY,        ZORAS_FOUNTAIN,                       0x0221, 0x010E}},
-    {{EntranceType::Dungeon,         SACRED_FOREST_MEADOW,             FOREST_TEMPLE_ENTRYWAY,               0x0169},
-     {EntranceType::Dungeon,         FOREST_TEMPLE_ENTRYWAY,           SACRED_FOREST_MEADOW,                 0x0215, 0x0608}},
-    {{EntranceType::Dungeon,         DMC_CENTRAL_LOCAL,                FIRE_TEMPLE_ENTRYWAY,                 0x0165},
-     {EntranceType::Dungeon,         FIRE_TEMPLE_ENTRYWAY,             DMC_CENTRAL_LOCAL,                    0x024A, 0x0564}},
-    {{EntranceType::Dungeon,         LAKE_HYLIA,                       WATER_TEMPLE_ENTRYWAY,                0x0010},
-     {EntranceType::Dungeon,         WATER_TEMPLE_ENTRYWAY,            LAKE_HYLIA,                           0x021D, 0x060C}},
-    {{EntranceType::Dungeon,         DESERT_COLOSSUS,                  SPIRIT_TEMPLE_ENTRYWAY,               0x0082},
-     {EntranceType::Dungeon,         SPIRIT_TEMPLE_ENTRYWAY,           DESERT_COLOSSUS_FROM_SPIRIT_ENTRYWAY, 0x01E1, 0x0610}},
-    {{EntranceType::Dungeon,         GRAVEYARD_WARP_PAD_REGION,        SHADOW_TEMPLE_ENTRYWAY,               0x0037},
-     {EntranceType::Dungeon,         SHADOW_TEMPLE_ENTRYWAY,           GRAVEYARD_WARP_PAD_REGION,            0x0205, 0x0580}},
-    {{EntranceType::Dungeon,         KAKARIKO_VILLAGE,                 BOTTOM_OF_THE_WELL_ENTRYWAY,          0x0098},
-     {EntranceType::Dungeon,         BOTTOM_OF_THE_WELL_ENTRYWAY,      KAKARIKO_VILLAGE,                     0x02A6}},
-    {{EntranceType::Dungeon,         ZORAS_FOUNTAIN,                   ICE_CAVERN_ENTRYWAY,                  0x0088},
-     {EntranceType::Dungeon,         ICE_CAVERN_ENTRYWAY,              ZORAS_FOUNTAIN,                       0x03D4}},
-    {{EntranceType::Dungeon,         GERUDO_FORTRESS,                  GERUDO_TRAINING_GROUNDS_ENTRYWAY,     0x0008},
-     {EntranceType::Dungeon,         GERUDO_TRAINING_GROUNDS_ENTRYWAY, GERUDO_FORTRESS,                      0x03A8}},
-    {{EntranceType::GanonDungeon,    GANONS_CASTLE_LEDGE,            GANONS_CASTLE_ENTRYWAY,               0x0467},
-     {EntranceType::GanonDungeon,    GANONS_CASTLE_ENTRYWAY,     CASTLE_GROUNDS_FROM_GANONS_CASTLE,        0x023D}},
+      // Parent Region                     Connected Region                      index   blue warp
+      { { EntranceType::Dungeon, RR_KF_OUTSIDE_DEKU_TREE, RR_DEKU_TREE_ENTRYWAY, 0x0000 },
+        { EntranceType::Dungeon, RR_DEKU_TREE_ENTRYWAY, RR_KF_OUTSIDE_DEKU_TREE, 0x0209, 0x0457 } },
+      { { EntranceType::Dungeon, RR_DEATH_MOUNTAIN_TRAIL, RR_DODONGOS_CAVERN_ENTRYWAY, 0x0004 },
+        { EntranceType::Dungeon, RR_DODONGOS_CAVERN_ENTRYWAY, RR_DEATH_MOUNTAIN_TRAIL, 0x0242, 0x047A } },
+      { { EntranceType::Dungeon, RR_ZORAS_FOUNTAIN, RR_JABU_JABUS_BELLY_ENTRYWAY, 0x0028 },
+        { EntranceType::Dungeon, RR_JABU_JABUS_BELLY_ENTRYWAY, RR_ZORAS_FOUNTAIN, 0x0221, 0x010E } },
+      { { EntranceType::Dungeon, RR_SACRED_FOREST_MEADOW, RR_FOREST_TEMPLE_ENTRYWAY, 0x0169 },
+        { EntranceType::Dungeon, RR_FOREST_TEMPLE_ENTRYWAY, RR_SACRED_FOREST_MEADOW, 0x0215, 0x0608 } },
+      { { EntranceType::Dungeon, RR_DMC_CENTRAL_LOCAL, RR_FIRE_TEMPLE_ENTRYWAY, 0x0165 },
+        { EntranceType::Dungeon, RR_FIRE_TEMPLE_ENTRYWAY, RR_DMC_CENTRAL_LOCAL, 0x024A, 0x0564 } },
+      { { EntranceType::Dungeon, RR_LAKE_HYLIA, RR_WATER_TEMPLE_ENTRYWAY, 0x0010 },
+        { EntranceType::Dungeon, RR_WATER_TEMPLE_ENTRYWAY, RR_LAKE_HYLIA, 0x021D, 0x060C } },
+      { { EntranceType::Dungeon, RR_DESERT_COLOSSUS, RR_SPIRIT_TEMPLE_ENTRYWAY, 0x0082 },
+        { EntranceType::Dungeon, RR_SPIRIT_TEMPLE_ENTRYWAY, RR_DESERT_COLOSSUS_FROM_SPIRIT_ENTRYWAY, 0x01E1, 0x0610 } },
+      { { EntranceType::Dungeon, RR_GRAVEYARD_WARP_PAD_REGION, RR_SHADOW_TEMPLE_ENTRYWAY, 0x0037 },
+        { EntranceType::Dungeon, RR_SHADOW_TEMPLE_ENTRYWAY, RR_GRAVEYARD_WARP_PAD_REGION, 0x0205, 0x0580 } },
+      { { EntranceType::Dungeon, RR_KAKARIKO_VILLAGE, RR_BOTTOM_OF_THE_WELL_ENTRYWAY, 0x0098 },
+        { EntranceType::Dungeon, RR_BOTTOM_OF_THE_WELL_ENTRYWAY, RR_KAKARIKO_VILLAGE, 0x02A6 } },
+      { { EntranceType::Dungeon, RR_ZORAS_FOUNTAIN, RR_ICE_CAVERN_ENTRYWAY, 0x0088 },
+        { EntranceType::Dungeon, RR_ICE_CAVERN_ENTRYWAY, RR_ZORAS_FOUNTAIN, 0x03D4 } },
+      { { EntranceType::Dungeon, RR_GERUDO_FORTRESS, RR_GERUDO_TRAINING_GROUNDS_ENTRYWAY, 0x0008 },
+        { EntranceType::Dungeon, RR_GERUDO_TRAINING_GROUNDS_ENTRYWAY, RR_GERUDO_FORTRESS, 0x03A8 } },
+      { { EntranceType::GanonDungeon, RR_GANONS_CASTLE_LEDGE, RR_GANONS_CASTLE_ENTRYWAY, 0x0467 },
+        { EntranceType::GanonDungeon, RR_GANONS_CASTLE_ENTRYWAY, RR_CASTLE_GROUNDS_FROM_GANONS_CASTLE, 0x023D } },
 
-    {{EntranceType::Interior,        KOKIRI_FOREST,                    KF_MIDOS_HOUSE,                       0x0433},
-     {EntranceType::Interior,        KF_MIDOS_HOUSE,                   KOKIRI_FOREST,                        0x0443}},
-    {{EntranceType::Interior,        KOKIRI_FOREST,                    KF_SARIAS_HOUSE,                      0x0437},
-     {EntranceType::Interior,        KF_SARIAS_HOUSE,                  KOKIRI_FOREST,                        0x0447}},
-    {{EntranceType::Interior,        KOKIRI_FOREST,                    KF_HOUSE_OF_TWINS,                    0x009C},
-     {EntranceType::Interior,        KF_HOUSE_OF_TWINS,                KOKIRI_FOREST,                        0x033C}},
-    {{EntranceType::Interior,        KOKIRI_FOREST,                    KF_KNOW_IT_ALL_HOUSE,                 0x00C9},
-     {EntranceType::Interior,        KF_KNOW_IT_ALL_HOUSE,             KOKIRI_FOREST,                        0x026A}},
-    {{EntranceType::Interior,        KOKIRI_FOREST,                    KF_KOKIRI_SHOP,                       0x00C1},
-     {EntranceType::Interior,        KF_KOKIRI_SHOP,                   KOKIRI_FOREST,                        0x0266}},
-    {{EntranceType::Interior,        LAKE_HYLIA,                       LH_LAB,                               0x0043},
-     {EntranceType::Interior,        LH_LAB,                           LAKE_HYLIA,                           0x03CC}},
-    {{EntranceType::Interior,        LH_FISHING_ISLAND,                LH_FISHING_HOLE,                      0x045F},
-     {EntranceType::Interior,        LH_FISHING_HOLE,                  LH_FISHING_ISLAND,                    0x0309}},
-    {{EntranceType::Interior,        GV_FORTRESS_SIDE,                 GV_CARPENTER_TENT,                    0x03A0},
-     {EntranceType::Interior,        GV_CARPENTER_TENT,                GV_FORTRESS_SIDE,                     0x03D0}},
-    {{EntranceType::Interior,        MARKET_ENTRANCE,                  MARKET_GUARD_HOUSE,                   0x007E},
-     {EntranceType::Interior,        MARKET_GUARD_HOUSE,               MARKET_ENTRANCE,                      0x026E}},
-    {{EntranceType::Interior,        THE_MARKET,                       MARKET_MASK_SHOP,                     0x0530},
-     {EntranceType::Interior,        MARKET_MASK_SHOP,                 THE_MARKET,                           0x01D1}},
-    {{EntranceType::Interior,        THE_MARKET,                       MARKET_BOMBCHU_BOWLING,               0x0507},
-     {EntranceType::Interior,        MARKET_BOMBCHU_BOWLING,           THE_MARKET,                           0x03BC}},
-    {{EntranceType::Interior,        THE_MARKET,                       MARKET_POTION_SHOP,                   0x0388},
-     {EntranceType::Interior,        MARKET_POTION_SHOP,               THE_MARKET,                           0x02A2}},
-    {{EntranceType::Interior,        THE_MARKET,                       MARKET_TREASURE_CHEST_GAME,           0x0063},
-     {EntranceType::Interior,        MARKET_TREASURE_CHEST_GAME,       THE_MARKET,                           0x01D5}},
-    {{EntranceType::Interior,        MARKET_BACK_ALLEY,                MARKET_BOMBCHU_SHOP,                  0x0528},
-     {EntranceType::Interior,        MARKET_BOMBCHU_SHOP,              MARKET_BACK_ALLEY,                    0x03C0}},
-    {{EntranceType::Interior,        MARKET_BACK_ALLEY,                MARKET_MAN_IN_GREEN_HOUSE,            0x043B},
-     {EntranceType::Interior,        MARKET_MAN_IN_GREEN_HOUSE,        MARKET_BACK_ALLEY,                    0x0067}},
-    {{EntranceType::Interior,        KAKARIKO_VILLAGE,                 KAK_CARPENTER_BOSS_HOUSE,             0x02FD},
-     {EntranceType::Interior,        KAK_CARPENTER_BOSS_HOUSE,         KAKARIKO_VILLAGE,                     0x0349}},
-    {{EntranceType::Interior,        KAKARIKO_VILLAGE,                 KAK_HOUSE_OF_SKULLTULA,               0x0550},
-     {EntranceType::Interior,        KAK_HOUSE_OF_SKULLTULA,           KAKARIKO_VILLAGE,                     0x04EE}},
-    {{EntranceType::Interior,        KAKARIKO_VILLAGE,                 KAK_IMPAS_HOUSE,                      0x039C},
-     {EntranceType::Interior,        KAK_IMPAS_HOUSE,                  KAKARIKO_VILLAGE,                     0x0345}},
-    {{EntranceType::Interior,        KAK_IMPAS_LEDGE,                  KAK_IMPAS_HOUSE_BACK,                 0x05C8},
-     {EntranceType::Interior,        KAK_IMPAS_HOUSE_BACK,             KAK_IMPAS_LEDGE,                      0x05DC}},
-    {{EntranceType::Interior,        KAK_BACKYARD,                     KAK_ODD_POTION_BUILDING,              0x0072},
-     {EntranceType::Interior,        KAK_ODD_POTION_BUILDING,          KAK_BACKYARD,                         0x034D}},
-    {{EntranceType::Interior,        THE_GRAVEYARD,                    GRAVEYARD_DAMPES_HOUSE,               0x030D},
-     {EntranceType::Interior,        GRAVEYARD_DAMPES_HOUSE,           THE_GRAVEYARD,                        0x0355}},
-    {{EntranceType::Interior,        GORON_CITY,                       GC_SHOP,                              0x037C},
-     {EntranceType::Interior,        GC_SHOP,                          GORON_CITY,                           0x03FC}},
-    {{EntranceType::Interior,        ZORAS_DOMAIN,                     ZD_SHOP,                              0x0380},
-     {EntranceType::Interior,        ZD_SHOP,                          ZORAS_DOMAIN,                         0x03C4}},
-    {{EntranceType::Interior,        LON_LON_RANCH,                    LLR_TALONS_HOUSE,                     0x004F},
-     {EntranceType::Interior,        LLR_TALONS_HOUSE,                 LON_LON_RANCH,                        0x0378}},
-    {{EntranceType::Interior,        LON_LON_RANCH,                    LLR_STABLES,                          0x02F9},
-     {EntranceType::Interior,        LLR_STABLES,                      LON_LON_RANCH,                        0x042F}},
-    {{EntranceType::Interior,        LON_LON_RANCH,                    LLR_TOWER,                            0x05D0},
-     {EntranceType::Interior,        LLR_TOWER,                        LON_LON_RANCH,                        0x05D4}},
-    {{EntranceType::Interior,        THE_MARKET,                       MARKET_BAZAAR,                        0x052C},
-     {EntranceType::Interior,        MARKET_BAZAAR,                    THE_MARKET,                           0x03B8}},
-    {{EntranceType::Interior,        THE_MARKET,                       MARKET_SHOOTING_GALLERY,              0x016D},
-     {EntranceType::Interior,        MARKET_SHOOTING_GALLERY,          THE_MARKET,                           0x01CD}},
-    {{EntranceType::Interior,        KAKARIKO_VILLAGE,                 KAK_BAZAAR,                           0x00B7},
-     {EntranceType::Interior,        KAK_BAZAAR,                       KAKARIKO_VILLAGE,                     0x0201}},
-    {{EntranceType::Interior,        KAKARIKO_VILLAGE,                 KAK_SHOOTING_GALLERY,                 0x003B},
-     {EntranceType::Interior,        KAK_SHOOTING_GALLERY,             KAKARIKO_VILLAGE,                     0x0463}},
-    {{EntranceType::Interior,        DESERT_COLOSSUS,                  COLOSSUS_GREAT_FAIRY_FOUNTAIN,        0x0588},
-     {EntranceType::Interior,        COLOSSUS_GREAT_FAIRY_FOUNTAIN,    DESERT_COLOSSUS,                      0x057C}},
-    {{EntranceType::Interior,        HYRULE_CASTLE_GROUNDS,            HC_GREAT_FAIRY_FOUNTAIN,              0x0578},
-     {EntranceType::Interior,        HC_GREAT_FAIRY_FOUNTAIN,          CASTLE_GROUNDS,                       0x0340}},
-    {{EntranceType::Interior,        GANONS_CASTLE_GROUNDS,            OGC_GREAT_FAIRY_FOUNTAIN,             0x04C2},
-     {EntranceType::Interior,        OGC_GREAT_FAIRY_FOUNTAIN,         CASTLE_GROUNDS,                       0x03E8}}, //0x3E8 is an unused entrance index repruposed to differentiate between the HC and OGC fairy fountain exits (normally they both use 0x340)
-    {{EntranceType::Interior,        DMC_LOWER_NEARBY,                 DMC_GREAT_FAIRY_FOUNTAIN,             0x04BE},
-     {EntranceType::Interior,        DMC_GREAT_FAIRY_FOUNTAIN,         DMC_LOWER_LOCAL,                      0x0482}},
-    {{EntranceType::Interior,        DEATH_MOUNTAIN_SUMMIT,            DMT_GREAT_FAIRY_FOUNTAIN,             0x0315},
-     {EntranceType::Interior,        DMT_GREAT_FAIRY_FOUNTAIN,         DEATH_MOUNTAIN_SUMMIT,                0x045B}},
-    {{EntranceType::Interior,        ZORAS_FOUNTAIN,                   ZF_GREAT_FAIRY_FOUNTAIN,              0x0371},
-     {EntranceType::Interior,        ZF_GREAT_FAIRY_FOUNTAIN,          ZORAS_FOUNTAIN,                       0x0394}},
+      { { EntranceType::Interior, RR_KOKIRI_FOREST, RR_KF_MIDOS_HOUSE, 0x0433 },
+        { EntranceType::Interior, RR_KF_MIDOS_HOUSE, RR_KOKIRI_FOREST, 0x0443 } },
+      { { EntranceType::Interior, RR_KOKIRI_FOREST, RR_KF_SARIAS_HOUSE, 0x0437 },
+        { EntranceType::Interior, RR_KF_SARIAS_HOUSE, RR_KOKIRI_FOREST, 0x0447 } },
+      { { EntranceType::Interior, RR_KOKIRI_FOREST, RR_KF_HOUSE_OF_TWINS, 0x009C },
+        { EntranceType::Interior, RR_KF_HOUSE_OF_TWINS, RR_KOKIRI_FOREST, 0x033C } },
+      { { EntranceType::Interior, RR_KOKIRI_FOREST, RR_KF_KNOW_IT_ALL_HOUSE, 0x00C9 },
+        { EntranceType::Interior, RR_KF_KNOW_IT_ALL_HOUSE, RR_KOKIRI_FOREST, 0x026A } },
+      { { EntranceType::Interior, RR_KOKIRI_FOREST, RR_KF_KOKIRI_SHOP, 0x00C1 },
+        { EntranceType::Interior, RR_KF_KOKIRI_SHOP, RR_KOKIRI_FOREST, 0x0266 } },
+      { { EntranceType::Interior, RR_LAKE_HYLIA, RR_LH_LAB, 0x0043 },
+        { EntranceType::Interior, RR_LH_LAB, RR_LAKE_HYLIA, 0x03CC } },
+      { { EntranceType::Interior, RR_LH_FISHING_ISLAND, RR_LH_FISHING_HOLE, 0x045F },
+        { EntranceType::Interior, RR_LH_FISHING_HOLE, RR_LH_FISHING_ISLAND, 0x0309 } },
+      { { EntranceType::Interior, RR_GV_FORTRESS_SIDE, RR_GV_CARPENTER_TENT, 0x03A0 },
+        { EntranceType::Interior, RR_GV_CARPENTER_TENT, RR_GV_FORTRESS_SIDE, 0x03D0 } },
+      { { EntranceType::Interior, RR_MARKET_ENTRANCE, RR_MARKET_GUARD_HOUSE, 0x007E },
+        { EntranceType::Interior, RR_MARKET_GUARD_HOUSE, RR_MARKET_ENTRANCE, 0x026E } },
+      { { EntranceType::Interior, RR_THE_MARKET, RR_MARKET_MASK_SHOP, 0x0530 },
+        { EntranceType::Interior, RR_MARKET_MASK_SHOP, RR_THE_MARKET, 0x01D1 } },
+      { { EntranceType::Interior, RR_THE_MARKET, RR_MARKET_BOMBCHU_BOWLING, 0x0507 },
+        { EntranceType::Interior, RR_MARKET_BOMBCHU_BOWLING, RR_THE_MARKET, 0x03BC } },
+      { { EntranceType::Interior, RR_THE_MARKET, RR_MARKET_POTION_SHOP, 0x0388 },
+        { EntranceType::Interior, RR_MARKET_POTION_SHOP, RR_THE_MARKET, 0x02A2 } },
+      { { EntranceType::Interior, RR_THE_MARKET, RR_MARKET_TREASURE_CHEST_GAME, 0x0063 },
+        { EntranceType::Interior, RR_MARKET_TREASURE_CHEST_GAME, RR_THE_MARKET, 0x01D5 } },
+      { { EntranceType::Interior, RR_MARKET_BACK_ALLEY, RR_MARKET_BOMBCHU_SHOP, 0x0528 },
+        { EntranceType::Interior, RR_MARKET_BOMBCHU_SHOP, RR_MARKET_BACK_ALLEY, 0x03C0 } },
+      { { EntranceType::Interior, RR_MARKET_BACK_ALLEY, RR_MARKET_MAN_IN_GREEN_HOUSE, 0x043B },
+        { EntranceType::Interior, RR_MARKET_MAN_IN_GREEN_HOUSE, RR_MARKET_BACK_ALLEY, 0x0067 } },
+      { { EntranceType::Interior, RR_KAKARIKO_VILLAGE, RR_KAK_CARPENTER_BOSS_HOUSE, 0x02FD },
+        { EntranceType::Interior, RR_KAK_CARPENTER_BOSS_HOUSE, RR_KAKARIKO_VILLAGE, 0x0349 } },
+      { { EntranceType::Interior, RR_KAKARIKO_VILLAGE, RR_KAK_HOUSE_OF_SKULLTULA, 0x0550 },
+        { EntranceType::Interior, RR_KAK_HOUSE_OF_SKULLTULA, RR_KAKARIKO_VILLAGE, 0x04EE } },
+      { { EntranceType::Interior, RR_KAKARIKO_VILLAGE, RR_KAK_IMPAS_HOUSE, 0x039C },
+        { EntranceType::Interior, RR_KAK_IMPAS_HOUSE, RR_KAKARIKO_VILLAGE, 0x0345 } },
+      { { EntranceType::Interior, RR_KAK_IMPAS_LEDGE, RR_KAK_IMPAS_HOUSE_BACK, 0x05C8 },
+        { EntranceType::Interior, RR_KAK_IMPAS_HOUSE_BACK, RR_KAK_IMPAS_LEDGE, 0x05DC } },
+      { { EntranceType::Interior, RR_KAK_BACKYARD, RR_KAK_ODD_POTION_BUILDING, 0x0072 },
+        { EntranceType::Interior, RR_KAK_ODD_POTION_BUILDING, RR_KAK_BACKYARD, 0x034D } },
+      { { EntranceType::Interior, RR_THE_GRAVEYARD, RR_GRAVEYARD_DAMPES_HOUSE, 0x030D },
+        { EntranceType::Interior, RR_GRAVEYARD_DAMPES_HOUSE, RR_THE_GRAVEYARD, 0x0355 } },
+      { { EntranceType::Interior, RR_GORON_CITY, RR_GC_SHOP, 0x037C },
+        { EntranceType::Interior, RR_GC_SHOP, RR_GORON_CITY, 0x03FC } },
+      { { EntranceType::Interior, RR_ZORAS_DOMAIN, RR_ZD_SHOP, 0x0380 },
+        { EntranceType::Interior, RR_ZD_SHOP, RR_ZORAS_DOMAIN, 0x03C4 } },
+      { { EntranceType::Interior, RR_LON_LON_RANCH, RR_LLR_TALONS_HOUSE, 0x004F },
+        { EntranceType::Interior, RR_LLR_TALONS_HOUSE, RR_LON_LON_RANCH, 0x0378 } },
+      { { EntranceType::Interior, RR_LON_LON_RANCH, RR_LLR_STABLES, 0x02F9 },
+        { EntranceType::Interior, RR_LLR_STABLES, RR_LON_LON_RANCH, 0x042F } },
+      { { EntranceType::Interior, RR_LON_LON_RANCH, RR_LLR_TOWER, 0x05D0 },
+        { EntranceType::Interior, RR_LLR_TOWER, RR_LON_LON_RANCH, 0x05D4 } },
+      { { EntranceType::Interior, RR_THE_MARKET, RR_MARKET_BAZAAR, 0x052C },
+        { EntranceType::Interior, RR_MARKET_BAZAAR, RR_THE_MARKET, 0x03B8 } },
+      { { EntranceType::Interior, RR_THE_MARKET, RR_MARKET_SHOOTING_GALLERY, 0x016D },
+        { EntranceType::Interior, RR_MARKET_SHOOTING_GALLERY, RR_THE_MARKET, 0x01CD } },
+      { { EntranceType::Interior, RR_KAKARIKO_VILLAGE, RR_KAK_BAZAAR, 0x00B7 },
+        { EntranceType::Interior, RR_KAK_BAZAAR, RR_KAKARIKO_VILLAGE, 0x0201 } },
+      { { EntranceType::Interior, RR_KAKARIKO_VILLAGE, RR_KAK_SHOOTING_GALLERY, 0x003B },
+        { EntranceType::Interior, RR_KAK_SHOOTING_GALLERY, RR_KAKARIKO_VILLAGE, 0x0463 } },
+      { { EntranceType::Interior, RR_DESERT_COLOSSUS, RR_COLOSSUS_GREAT_FAIRY_FOUNTAIN, 0x0588 },
+        { EntranceType::Interior, RR_COLOSSUS_GREAT_FAIRY_FOUNTAIN, RR_DESERT_COLOSSUS, 0x057C } },
+      { { EntranceType::Interior, RR_HYRULE_CASTLE_GROUNDS, RR_HC_GREAT_FAIRY_FOUNTAIN, 0x0578 },
+        { EntranceType::Interior, RR_HC_GREAT_FAIRY_FOUNTAIN, RR_CASTLE_GROUNDS, 0x0340 } },
+      { { EntranceType::Interior, RR_GANONS_CASTLE_GROUNDS, RR_OGC_GREAT_FAIRY_FOUNTAIN, 0x04C2 },
+        { EntranceType::Interior, RR_OGC_GREAT_FAIRY_FOUNTAIN, RR_CASTLE_GROUNDS,
+          0x03E8 } }, // 0x3E8 is an unused entrance index repruposed to differentiate between the HC and OGC fairy
+                      // fountain exits (normally they both use 0x340)
+      { { EntranceType::Interior, RR_DMC_LOWER_NEARBY, RR_DMC_GREAT_FAIRY_FOUNTAIN, 0x04BE },
+        { EntranceType::Interior, RR_DMC_GREAT_FAIRY_FOUNTAIN, RR_DMC_LOWER_LOCAL, 0x0482 } },
+      { { EntranceType::Interior, RR_DEATH_MOUNTAIN_SUMMIT, RR_DMT_GREAT_FAIRY_FOUNTAIN, 0x0315 },
+        { EntranceType::Interior, RR_DMT_GREAT_FAIRY_FOUNTAIN, RR_DEATH_MOUNTAIN_SUMMIT, 0x045B } },
+      { { EntranceType::Interior, RR_ZORAS_FOUNTAIN, RR_ZF_GREAT_FAIRY_FOUNTAIN, 0x0371 },
+        { EntranceType::Interior, RR_ZF_GREAT_FAIRY_FOUNTAIN, RR_ZORAS_FOUNTAIN, 0x0394 } },
 
-    {{EntranceType::SpecialInterior, KOKIRI_FOREST,                    KF_LINKS_HOUSE,                       0x0272},
-     {EntranceType::SpecialInterior, KF_LINKS_HOUSE,                   KOKIRI_FOREST,                        0x0211}},
-    {{EntranceType::SpecialInterior, TOT_ENTRANCE,                     TEMPLE_OF_TIME,                       0x0053},
-     {EntranceType::SpecialInterior, TEMPLE_OF_TIME,                   TOT_ENTRANCE,                         0x0472}},
-    {{EntranceType::SpecialInterior, KAKARIKO_VILLAGE,                 KAK_WINDMILL,                         0x0453},
-     {EntranceType::SpecialInterior, KAK_WINDMILL,                     KAKARIKO_VILLAGE,                     0x0351}},
-    {{EntranceType::SpecialInterior, KAKARIKO_VILLAGE,                 KAK_POTION_SHOP_FRONT,                0x0384},
-     {EntranceType::SpecialInterior, KAK_POTION_SHOP_FRONT,            KAKARIKO_VILLAGE,                     0x044B}},
-    {{EntranceType::SpecialInterior, KAK_BACKYARD,                     KAK_POTION_SHOP_BACK,                 0x03EC},
-     {EntranceType::SpecialInterior, KAK_POTION_SHOP_BACK,             KAK_BACKYARD,                         0x04FF}},
+      { { EntranceType::SpecialInterior, RR_KOKIRI_FOREST, RR_KF_LINKS_HOUSE, 0x0272 },
+        { EntranceType::SpecialInterior, RR_KF_LINKS_HOUSE, RR_KOKIRI_FOREST, 0x0211 } },
+      { { EntranceType::SpecialInterior, RR_TOT_ENTRANCE, RR_TEMPLE_OF_TIME, 0x0053 },
+        { EntranceType::SpecialInterior, RR_TEMPLE_OF_TIME, RR_TOT_ENTRANCE, 0x0472 } },
+      { { EntranceType::SpecialInterior, RR_KAKARIKO_VILLAGE, RR_KAK_WINDMILL, 0x0453 },
+        { EntranceType::SpecialInterior, RR_KAK_WINDMILL, RR_KAKARIKO_VILLAGE, 0x0351 } },
+      { { EntranceType::SpecialInterior, RR_KAKARIKO_VILLAGE, RR_KAK_POTION_SHOP_FRONT, 0x0384 },
+        { EntranceType::SpecialInterior, RR_KAK_POTION_SHOP_FRONT, RR_KAKARIKO_VILLAGE, 0x044B } },
+      { { EntranceType::SpecialInterior, RR_KAK_BACKYARD, RR_KAK_POTION_SHOP_BACK, 0x03EC },
+        { EntranceType::SpecialInterior, RR_KAK_POTION_SHOP_BACK, RR_KAK_BACKYARD, 0x04FF } },
 
-     // Grotto Loads use an entrance index of 0x0700 + their grotto id. The id is used as index for the
-     // grottoLoadTable in soh/soh/Enhancements/randomizer/randomizer_grotto.c
-     // Grotto Returns use an entrance index of 0x0800 + their grotto id. The id is used as index for the
-     // grottoReturnTable in soh/soh/Enhancements/randomizer/randomizer_grotto.c
-    {{EntranceType::GrottoGrave,     DESERT_COLOSSUS,                  COLOSSUS_GROTTO,                      0x0700},
-     {EntranceType::GrottoGrave,     COLOSSUS_GROTTO,                  DESERT_COLOSSUS,                      0x0800}},
-    {{EntranceType::GrottoGrave,     LAKE_HYLIA,                       LH_GROTTO,                            0x0701},
-     {EntranceType::GrottoGrave,     LH_GROTTO,                        LAKE_HYLIA,                           0x0801}},
-    {{EntranceType::GrottoGrave,     ZORAS_RIVER,                      ZR_STORMS_GROTTO,                     0x0702},
-     {EntranceType::GrottoGrave,     ZR_STORMS_GROTTO,                 ZORAS_RIVER,                          0x0802}},
-    {{EntranceType::GrottoGrave,     ZORAS_RIVER,                      ZR_FAIRY_GROTTO,                      0x0703},
-     {EntranceType::GrottoGrave,     ZR_FAIRY_GROTTO,                  ZORAS_RIVER,                          0x0803}},
-    {{EntranceType::GrottoGrave,     ZORAS_RIVER,                      ZR_OPEN_GROTTO,                       0x0704},
-     {EntranceType::GrottoGrave,     ZR_OPEN_GROTTO,                   ZORAS_RIVER,                          0x0804}},
-    {{EntranceType::GrottoGrave,     DMC_LOWER_NEARBY,                 DMC_HAMMER_GROTTO,                    0x0705},
-     {EntranceType::GrottoGrave,     DMC_HAMMER_GROTTO,                DMC_LOWER_LOCAL,                      0x0805}},
-    {{EntranceType::GrottoGrave,     DMC_UPPER_NEARBY,                 DMC_UPPER_GROTTO,                     0x0706},
-     {EntranceType::GrottoGrave,     DMC_UPPER_GROTTO,                 DMC_UPPER_LOCAL,                      0x0806}},
-    {{EntranceType::GrottoGrave,     GC_GROTTO_PLATFORM,               GC_GROTTO,                            0x0707},
-     {EntranceType::GrottoGrave,     GC_GROTTO,                        GC_GROTTO_PLATFORM,                   0x0807}},
-    {{EntranceType::GrottoGrave,     DEATH_MOUNTAIN_TRAIL,             DMT_STORMS_GROTTO,                    0x0708},
-     {EntranceType::GrottoGrave,     DMT_STORMS_GROTTO,                DEATH_MOUNTAIN_TRAIL,                 0x0808}},
-    {{EntranceType::GrottoGrave,     DEATH_MOUNTAIN_SUMMIT,            DMT_COW_GROTTO,                       0x0709},
-     {EntranceType::GrottoGrave,     DMT_COW_GROTTO,                   DEATH_MOUNTAIN_SUMMIT,                0x0809}},
-    {{EntranceType::GrottoGrave,     KAK_BACKYARD,                     KAK_OPEN_GROTTO,                      0x070A},
-     {EntranceType::GrottoGrave,     KAK_OPEN_GROTTO,                  KAK_BACKYARD,                         0x080A}},
-    {{EntranceType::GrottoGrave,     KAKARIKO_VILLAGE,                 KAK_REDEAD_GROTTO,                    0x070B},
-     {EntranceType::GrottoGrave,     KAK_REDEAD_GROTTO,                KAKARIKO_VILLAGE,                     0x080B}},
-    {{EntranceType::GrottoGrave,     HYRULE_CASTLE_GROUNDS,            HC_STORMS_GROTTO,                     0x070C},
-     {EntranceType::GrottoGrave,     HC_STORMS_GROTTO,                 CASTLE_GROUNDS,                       0x080C}},
-    {{EntranceType::GrottoGrave,     HYRULE_FIELD,                     HF_TEKTITE_GROTTO,                    0x070D},
-     {EntranceType::GrottoGrave,     HF_TEKTITE_GROTTO,                HYRULE_FIELD,                         0x080D}},
-    {{EntranceType::GrottoGrave,     HYRULE_FIELD,                     HF_NEAR_KAK_GROTTO,                   0x070E},
-     {EntranceType::GrottoGrave,     HF_NEAR_KAK_GROTTO,               HYRULE_FIELD,                         0x080E}},
-    {{EntranceType::GrottoGrave,     HYRULE_FIELD,                     HF_FAIRY_GROTTO,                      0x070F},
-     {EntranceType::GrottoGrave,     HF_FAIRY_GROTTO,                  HYRULE_FIELD,                         0x080F}},
-    {{EntranceType::GrottoGrave,     HYRULE_FIELD,                     HF_NEAR_MARKET_GROTTO,                0x0710},
-     {EntranceType::GrottoGrave,     HF_NEAR_MARKET_GROTTO,            HYRULE_FIELD,                         0x0810}},
-    {{EntranceType::GrottoGrave,     HYRULE_FIELD,                     HF_COW_GROTTO,                        0x0711},
-     {EntranceType::GrottoGrave,     HF_COW_GROTTO,                    HYRULE_FIELD,                         0x0811}},
-    {{EntranceType::GrottoGrave,     HYRULE_FIELD,                     HF_INSIDE_FENCE_GROTTO,               0x0712},
-     {EntranceType::GrottoGrave,     HF_INSIDE_FENCE_GROTTO,           HYRULE_FIELD,                         0x0812}},
-    {{EntranceType::GrottoGrave,     HYRULE_FIELD,                     HF_OPEN_GROTTO,                       0x0713},
-     {EntranceType::GrottoGrave,     HF_OPEN_GROTTO,                   HYRULE_FIELD,                         0x0813}},
-    {{EntranceType::GrottoGrave,     HYRULE_FIELD,                     HF_SOUTHEAST_GROTTO,                  0x0714},
-     {EntranceType::GrottoGrave,     HF_SOUTHEAST_GROTTO,              HYRULE_FIELD,                         0x0814}},
-    {{EntranceType::GrottoGrave,     LON_LON_RANCH,                    LLR_GROTTO,                           0x0715},
-     {EntranceType::GrottoGrave,     LLR_GROTTO,                       LON_LON_RANCH,                        0x0815}},
-    {{EntranceType::GrottoGrave,     SFM_ENTRYWAY,                     SFM_WOLFOS_GROTTO,                    0x0716},
-     {EntranceType::GrottoGrave,     SFM_WOLFOS_GROTTO,                SFM_ENTRYWAY,                         0x0816}},
-    {{EntranceType::GrottoGrave,     SACRED_FOREST_MEADOW,             SFM_STORMS_GROTTO,                    0x0717},
-     {EntranceType::GrottoGrave,     SFM_STORMS_GROTTO,                SACRED_FOREST_MEADOW,                 0x0817}},
-    {{EntranceType::GrottoGrave,     SACRED_FOREST_MEADOW,             SFM_FAIRY_GROTTO,                     0x0718},
-     {EntranceType::GrottoGrave,     SFM_FAIRY_GROTTO,                 SACRED_FOREST_MEADOW,                 0x0818}},
-    {{EntranceType::GrottoGrave,     LW_BEYOND_MIDO,                   LW_SCRUBS_GROTTO,                     0x0719},
-     {EntranceType::GrottoGrave,     LW_SCRUBS_GROTTO,                 LW_BEYOND_MIDO,                       0x0819}},
-    {{EntranceType::GrottoGrave,     THE_LOST_WOODS,                   LW_NEAR_SHORTCUTS_GROTTO,             0x071A},
-     {EntranceType::GrottoGrave,     LW_NEAR_SHORTCUTS_GROTTO,         THE_LOST_WOODS,                       0x081A}},
-    {{EntranceType::GrottoGrave,     KOKIRI_FOREST,                    KF_STORMS_GROTTO,                     0x071B},
-     {EntranceType::GrottoGrave,     KF_STORMS_GROTTO,                 KOKIRI_FOREST,                        0x081B}},
-    {{EntranceType::GrottoGrave,     ZORAS_DOMAIN,                     ZD_STORMS_GROTTO,                     0x071C},
-     {EntranceType::GrottoGrave,     ZD_STORMS_GROTTO,                 ZORAS_DOMAIN,                         0x081C}},
-    {{EntranceType::GrottoGrave,     GERUDO_FORTRESS,                  GF_STORMS_GROTTO,                     0x071D},
-     {EntranceType::GrottoGrave,     GF_STORMS_GROTTO,                 GERUDO_FORTRESS,                      0x081D}},
-    {{EntranceType::GrottoGrave,     GV_FORTRESS_SIDE,                 GV_STORMS_GROTTO,                     0x071E},
-     {EntranceType::GrottoGrave,     GV_STORMS_GROTTO,                 GV_FORTRESS_SIDE,                     0x081E}},
-    {{EntranceType::GrottoGrave,     GV_GROTTO_LEDGE,                  GV_OCTOROK_GROTTO,                    0x071F},
-     {EntranceType::GrottoGrave,     GV_OCTOROK_GROTTO,                GV_GROTTO_LEDGE,                      0x081F}},
-    {{EntranceType::GrottoGrave,     LW_BEYOND_MIDO,                   DEKU_THEATER,                         0x0720},
-     {EntranceType::GrottoGrave,     DEKU_THEATER,                     LW_BEYOND_MIDO,                       0x0820}},
+      // Grotto Loads use an entrance index of 0x0700 + their grotto id. The id is used as index for the
+      // grottoLoadTable in soh/soh/Enhancements/randomizer/randomizer_grotto.c
+      // Grotto Returns use an entrance index of 0x0800 + their grotto id. The id is used as index for the
+      // grottoReturnTable in soh/soh/Enhancements/randomizer/randomizer_grotto.c
+      { { EntranceType::GrottoGrave, RR_DESERT_COLOSSUS, RR_COLOSSUS_GROTTO, 0x0700 },
+        { EntranceType::GrottoGrave, RR_COLOSSUS_GROTTO, RR_DESERT_COLOSSUS, 0x0800 } },
+      { { EntranceType::GrottoGrave, RR_LAKE_HYLIA, RR_LH_GROTTO, 0x0701 },
+        { EntranceType::GrottoGrave, RR_LH_GROTTO, RR_LAKE_HYLIA, 0x0801 } },
+      { { EntranceType::GrottoGrave, RR_ZORAS_RIVER, RR_ZR_STORMS_GROTTO, 0x0702 },
+        { EntranceType::GrottoGrave, RR_ZR_STORMS_GROTTO, RR_ZORAS_RIVER, 0x0802 } },
+      { { EntranceType::GrottoGrave, RR_ZORAS_RIVER, RR_ZR_FAIRY_GROTTO, 0x0703 },
+        { EntranceType::GrottoGrave, RR_ZR_FAIRY_GROTTO, RR_ZORAS_RIVER, 0x0803 } },
+      { { EntranceType::GrottoGrave, RR_ZORAS_RIVER, RR_ZR_OPEN_GROTTO, 0x0704 },
+        { EntranceType::GrottoGrave, RR_ZR_OPEN_GROTTO, RR_ZORAS_RIVER, 0x0804 } },
+      { { EntranceType::GrottoGrave, RR_DMC_LOWER_NEARBY, RR_DMC_HAMMER_GROTTO, 0x0705 },
+        { EntranceType::GrottoGrave, RR_DMC_HAMMER_GROTTO, RR_DMC_LOWER_LOCAL, 0x0805 } },
+      { { EntranceType::GrottoGrave, RR_DMC_UPPER_NEARBY, RR_DMC_UPPER_GROTTO, 0x0706 },
+        { EntranceType::GrottoGrave, RR_DMC_UPPER_GROTTO, RR_DMC_UPPER_LOCAL, 0x0806 } },
+      { { EntranceType::GrottoGrave, RR_GC_GROTTO_PLATFORM, RR_GC_GROTTO, 0x0707 },
+        { EntranceType::GrottoGrave, RR_GC_GROTTO, RR_GC_GROTTO_PLATFORM, 0x0807 } },
+      { { EntranceType::GrottoGrave, RR_DEATH_MOUNTAIN_TRAIL, RR_DMT_STORMS_GROTTO, 0x0708 },
+        { EntranceType::GrottoGrave, RR_DMT_STORMS_GROTTO, RR_DEATH_MOUNTAIN_TRAIL, 0x0808 } },
+      { { EntranceType::GrottoGrave, RR_DEATH_MOUNTAIN_SUMMIT, RR_DMT_COW_GROTTO, 0x0709 },
+        { EntranceType::GrottoGrave, RR_DMT_COW_GROTTO, RR_DEATH_MOUNTAIN_SUMMIT, 0x0809 } },
+      { { EntranceType::GrottoGrave, RR_KAK_BACKYARD, RR_KAK_OPEN_GROTTO, 0x070A },
+        { EntranceType::GrottoGrave, RR_KAK_OPEN_GROTTO, RR_KAK_BACKYARD, 0x080A } },
+      { { EntranceType::GrottoGrave, RR_KAKARIKO_VILLAGE, RR_KAK_REDEAD_GROTTO, 0x070B },
+        { EntranceType::GrottoGrave, RR_KAK_REDEAD_GROTTO, RR_KAKARIKO_VILLAGE, 0x080B } },
+      { { EntranceType::GrottoGrave, RR_HYRULE_CASTLE_GROUNDS, RR_HC_STORMS_GROTTO, 0x070C },
+        { EntranceType::GrottoGrave, RR_HC_STORMS_GROTTO, RR_CASTLE_GROUNDS, 0x080C } },
+      { { EntranceType::GrottoGrave, RR_HYRULE_FIELD, RR_HF_TEKTITE_GROTTO, 0x070D },
+        { EntranceType::GrottoGrave, RR_HF_TEKTITE_GROTTO, RR_HYRULE_FIELD, 0x080D } },
+      { { EntranceType::GrottoGrave, RR_HYRULE_FIELD, RR_HF_NEAR_KAK_GROTTO, 0x070E },
+        { EntranceType::GrottoGrave, RR_HF_NEAR_KAK_GROTTO, RR_HYRULE_FIELD, 0x080E } },
+      { { EntranceType::GrottoGrave, RR_HYRULE_FIELD, RR_HF_FAIRY_GROTTO, 0x070F },
+        { EntranceType::GrottoGrave, RR_HF_FAIRY_GROTTO, RR_HYRULE_FIELD, 0x080F } },
+      { { EntranceType::GrottoGrave, RR_HYRULE_FIELD, RR_HF_NEAR_MARKET_GROTTO, 0x0710 },
+        { EntranceType::GrottoGrave, RR_HF_NEAR_MARKET_GROTTO, RR_HYRULE_FIELD, 0x0810 } },
+      { { EntranceType::GrottoGrave, RR_HYRULE_FIELD, RR_HF_COW_GROTTO, 0x0711 },
+        { EntranceType::GrottoGrave, RR_HF_COW_GROTTO, RR_HYRULE_FIELD, 0x0811 } },
+      { { EntranceType::GrottoGrave, RR_HYRULE_FIELD, RR_HF_INSIDE_FENCE_GROTTO, 0x0712 },
+        { EntranceType::GrottoGrave, RR_HF_INSIDE_FENCE_GROTTO, RR_HYRULE_FIELD, 0x0812 } },
+      { { EntranceType::GrottoGrave, RR_HYRULE_FIELD, RR_HF_OPEN_GROTTO, 0x0713 },
+        { EntranceType::GrottoGrave, RR_HF_OPEN_GROTTO, RR_HYRULE_FIELD, 0x0813 } },
+      { { EntranceType::GrottoGrave, RR_HYRULE_FIELD, RR_HF_SOUTHEAST_GROTTO, 0x0714 },
+        { EntranceType::GrottoGrave, RR_HF_SOUTHEAST_GROTTO, RR_HYRULE_FIELD, 0x0814 } },
+      { { EntranceType::GrottoGrave, RR_LON_LON_RANCH, RR_LLR_GROTTO, 0x0715 },
+        { EntranceType::GrottoGrave, RR_LLR_GROTTO, RR_LON_LON_RANCH, 0x0815 } },
+      { { EntranceType::GrottoGrave, RR_SFM_ENTRYWAY, RR_SFM_WOLFOS_GROTTO, 0x0716 },
+        { EntranceType::GrottoGrave, RR_SFM_WOLFOS_GROTTO, RR_SFM_ENTRYWAY, 0x0816 } },
+      { { EntranceType::GrottoGrave, RR_SACRED_FOREST_MEADOW, RR_SFM_STORMS_GROTTO, 0x0717 },
+        { EntranceType::GrottoGrave, RR_SFM_STORMS_GROTTO, RR_SACRED_FOREST_MEADOW, 0x0817 } },
+      { { EntranceType::GrottoGrave, RR_SACRED_FOREST_MEADOW, RR_SFM_FAIRY_GROTTO, 0x0718 },
+        { EntranceType::GrottoGrave, RR_SFM_FAIRY_GROTTO, RR_SACRED_FOREST_MEADOW, 0x0818 } },
+      { { EntranceType::GrottoGrave, RR_LW_BEYOND_MIDO, RR_LW_SCRUBS_GROTTO, 0x0719 },
+        { EntranceType::GrottoGrave, RR_LW_SCRUBS_GROTTO, RR_LW_BEYOND_MIDO, 0x0819 } },
+      { { EntranceType::GrottoGrave, RR_THE_LOST_WOODS, RR_LW_NEAR_SHORTCUTS_GROTTO, 0x071A },
+        { EntranceType::GrottoGrave, RR_LW_NEAR_SHORTCUTS_GROTTO, RR_THE_LOST_WOODS, 0x081A } },
+      { { EntranceType::GrottoGrave, RR_KOKIRI_FOREST, RR_KF_STORMS_GROTTO, 0x071B },
+        { EntranceType::GrottoGrave, RR_KF_STORMS_GROTTO, RR_KOKIRI_FOREST, 0x081B } },
+      { { EntranceType::GrottoGrave, RR_ZORAS_DOMAIN, RR_ZD_STORMS_GROTTO, 0x071C },
+        { EntranceType::GrottoGrave, RR_ZD_STORMS_GROTTO, RR_ZORAS_DOMAIN, 0x081C } },
+      { { EntranceType::GrottoGrave, RR_GERUDO_FORTRESS, RR_GF_STORMS_GROTTO, 0x071D },
+        { EntranceType::GrottoGrave, RR_GF_STORMS_GROTTO, RR_GERUDO_FORTRESS, 0x081D } },
+      { { EntranceType::GrottoGrave, RR_GV_FORTRESS_SIDE, RR_GV_STORMS_GROTTO, 0x071E },
+        { EntranceType::GrottoGrave, RR_GV_STORMS_GROTTO, RR_GV_FORTRESS_SIDE, 0x081E } },
+      { { EntranceType::GrottoGrave, RR_GV_GROTTO_LEDGE, RR_GV_OCTOROK_GROTTO, 0x071F },
+        { EntranceType::GrottoGrave, RR_GV_OCTOROK_GROTTO, RR_GV_GROTTO_LEDGE, 0x081F } },
+      { { EntranceType::GrottoGrave, RR_LW_BEYOND_MIDO, RR_DEKU_THEATER, 0x0720 },
+        { EntranceType::GrottoGrave, RR_DEKU_THEATER, RR_LW_BEYOND_MIDO, 0x0820 } },
 
-    // Graves have their own specified entrance indices
-    {{EntranceType::GrottoGrave,     THE_GRAVEYARD,                    GRAVEYARD_SHIELD_GRAVE,               0x004B},
-     {EntranceType::GrottoGrave,     GRAVEYARD_SHIELD_GRAVE,           THE_GRAVEYARD,                        0x035D}},
-    {{EntranceType::GrottoGrave,     THE_GRAVEYARD,                    GRAVEYARD_HEART_PIECE_GRAVE,          0x031C},
-     {EntranceType::GrottoGrave,     GRAVEYARD_HEART_PIECE_GRAVE,      THE_GRAVEYARD,                        0x0361}},
-    {{EntranceType::GrottoGrave,     THE_GRAVEYARD,                    GRAVEYARD_COMPOSERS_GRAVE,            0x002D},
-     {EntranceType::GrottoGrave,     GRAVEYARD_COMPOSERS_GRAVE,        THE_GRAVEYARD,                        0x050B}},
-    {{EntranceType::GrottoGrave,     THE_GRAVEYARD,                    GRAVEYARD_DAMPES_GRAVE,               0x044F},
-     {EntranceType::GrottoGrave,     GRAVEYARD_DAMPES_GRAVE,           THE_GRAVEYARD,                        0x0359}},
+      // Graves have their own specified entrance indices
+      { { EntranceType::GrottoGrave, RR_THE_GRAVEYARD, RR_GRAVEYARD_SHIELD_GRAVE, 0x004B },
+        { EntranceType::GrottoGrave, RR_GRAVEYARD_SHIELD_GRAVE, RR_THE_GRAVEYARD, 0x035D } },
+      { { EntranceType::GrottoGrave, RR_THE_GRAVEYARD, RR_GRAVEYARD_HEART_PIECE_GRAVE, 0x031C },
+        { EntranceType::GrottoGrave, RR_GRAVEYARD_HEART_PIECE_GRAVE, RR_THE_GRAVEYARD, 0x0361 } },
+      { { EntranceType::GrottoGrave, RR_THE_GRAVEYARD, RR_GRAVEYARD_COMPOSERS_GRAVE, 0x002D },
+        { EntranceType::GrottoGrave, RR_GRAVEYARD_COMPOSERS_GRAVE, RR_THE_GRAVEYARD, 0x050B } },
+      { { EntranceType::GrottoGrave, RR_THE_GRAVEYARD, RR_GRAVEYARD_DAMPES_GRAVE, 0x044F },
+        { EntranceType::GrottoGrave, RR_GRAVEYARD_DAMPES_GRAVE, RR_THE_GRAVEYARD, 0x0359 } },
 
-    {{EntranceType::Overworld,       KOKIRI_FOREST,                    LW_BRIDGE_FROM_FOREST,                0x05E0},
-     {EntranceType::Overworld,       LW_BRIDGE,                        KOKIRI_FOREST,                        0x020D}},
-    {{EntranceType::Overworld,       KOKIRI_FOREST,                    THE_LOST_WOODS,                       0x011E},
-     {EntranceType::Overworld,       LW_FOREST_EXIT,                   KOKIRI_FOREST,                        0x0286}},
-    {{EntranceType::Overworld,       THE_LOST_WOODS,                   GC_WOODS_WARP,                        0x04E2},
-     {EntranceType::Overworld,       GC_WOODS_WARP,                    THE_LOST_WOODS,                       0x04D6}},
-    {{EntranceType::Overworld,       THE_LOST_WOODS,                   ZORAS_RIVER,                          0x01DD},
-     {EntranceType::Overworld,       ZORAS_RIVER,                      THE_LOST_WOODS,                       0x04DA}},
-    {{EntranceType::Overworld,       LW_BEYOND_MIDO,                   SFM_ENTRYWAY,                         0x00FC},
-     {EntranceType::Overworld,       SFM_ENTRYWAY,                     LW_BEYOND_MIDO,                       0x01A9}},
-    {{EntranceType::Overworld,       LW_BRIDGE,                        HYRULE_FIELD,                         0x0185},
-     {EntranceType::Overworld,       HYRULE_FIELD,                     LW_BRIDGE,                            0x04DE}},
-    {{EntranceType::Overworld,       HYRULE_FIELD,                     LAKE_HYLIA,                           0x0102},
-     {EntranceType::Overworld,       LAKE_HYLIA,                       HYRULE_FIELD,                         0x0189}},
-    {{EntranceType::Overworld,       HYRULE_FIELD,                     GERUDO_VALLEY,                        0x0117},
-     {EntranceType::Overworld,       GERUDO_VALLEY,                    HYRULE_FIELD,                         0x018D}},
-    {{EntranceType::Overworld,       HYRULE_FIELD,                     MARKET_ENTRANCE,                      0x0276},
-     {EntranceType::Overworld,       MARKET_ENTRANCE,                  HYRULE_FIELD,                         0x01FD}},
-    {{EntranceType::Overworld,       HYRULE_FIELD,                     KAKARIKO_VILLAGE,                     0x00DB},
-     {EntranceType::Overworld,       KAKARIKO_VILLAGE,                 HYRULE_FIELD,                         0x017D}},
-    {{EntranceType::Overworld,       HYRULE_FIELD,                     ZR_FRONT,                             0x00EA},
-     {EntranceType::Overworld,       ZR_FRONT,                         HYRULE_FIELD,                         0x0181}},
-    {{EntranceType::Overworld,       HYRULE_FIELD,                     LON_LON_RANCH,                        0x0157},
-     {EntranceType::Overworld,       LON_LON_RANCH,                    HYRULE_FIELD,                         0x01F9}},
-    {{EntranceType::Overworld,       LAKE_HYLIA,                       ZORAS_DOMAIN,                         0x0328},
-     {EntranceType::Overworld,       ZORAS_DOMAIN,                     LAKE_HYLIA,                           0x0560}},
-    {{EntranceType::Overworld,       GV_FORTRESS_SIDE,                 GERUDO_FORTRESS,                      0x0129},
-     {EntranceType::Overworld,       GERUDO_FORTRESS,                  GV_FORTRESS_SIDE,                     0x022D}},
-    {{EntranceType::Overworld,       GF_OUTSIDE_GATE,                  WASTELAND_NEAR_FORTRESS,              0x0130},
-     {EntranceType::Overworld,       WASTELAND_NEAR_FORTRESS,          GF_OUTSIDE_GATE,                      0x03AC}},
-    {{EntranceType::Overworld,       WASTELAND_NEAR_COLOSSUS,          DESERT_COLOSSUS,                      0x0123},
-     {EntranceType::Overworld,       DESERT_COLOSSUS,                  WASTELAND_NEAR_COLOSSUS,              0x0365}},
-    {{EntranceType::Overworld,       MARKET_ENTRANCE,                  THE_MARKET,                           0x00B1},
-     {EntranceType::Overworld,       THE_MARKET,                       MARKET_ENTRANCE,                      0x0033}},
-    {{EntranceType::Overworld,       THE_MARKET,                       CASTLE_GROUNDS,                       0x0138},
-     {EntranceType::Overworld,       CASTLE_GROUNDS,                   THE_MARKET,                           0x025A}},
-    {{EntranceType::Overworld,       THE_MARKET,                       TOT_ENTRANCE,                         0x0171},
-     {EntranceType::Overworld,       TOT_ENTRANCE,                     THE_MARKET,                           0x025E}},
-    {{EntranceType::Overworld,       KAKARIKO_VILLAGE,                 THE_GRAVEYARD,                        0x00E4},
-     {EntranceType::Overworld,       THE_GRAVEYARD,                    KAKARIKO_VILLAGE,                     0x0195}},
-    {{EntranceType::Overworld,       KAK_BEHIND_GATE,                  DEATH_MOUNTAIN_TRAIL,                 0x013D},
-     {EntranceType::Overworld,       DEATH_MOUNTAIN_TRAIL,             KAK_BEHIND_GATE,                      0x0191}},
-    {{EntranceType::Overworld,       DEATH_MOUNTAIN_TRAIL,             GORON_CITY,                           0x014D},
-     {EntranceType::Overworld,       GORON_CITY,                       DEATH_MOUNTAIN_TRAIL,                 0x01B9}},
-    {{EntranceType::Overworld,       GC_DARUNIAS_CHAMBER,              DMC_LOWER_LOCAL,                      0x0246},
-     {EntranceType::Overworld,       DMC_LOWER_NEARBY,                 GC_DARUNIAS_CHAMBER,                  0x01C1}},
-    {{EntranceType::Overworld,       DEATH_MOUNTAIN_SUMMIT,            DMC_UPPER_LOCAL,                      0x0147},
-     {EntranceType::Overworld,       DMC_UPPER_NEARBY,                 DEATH_MOUNTAIN_SUMMIT,                0x01BD}},
-    {{EntranceType::Overworld,       ZR_BEHIND_WATERFALL,              ZORAS_DOMAIN,                         0x0108},
-     {EntranceType::Overworld,       ZORAS_DOMAIN,                     ZR_BEHIND_WATERFALL,                  0x019D}},
-    {{EntranceType::Overworld,       ZD_BEHIND_KING_ZORA,              ZORAS_FOUNTAIN,                       0x0225},
-     {EntranceType::Overworld,       ZORAS_FOUNTAIN,                   ZD_BEHIND_KING_ZORA,                  0x01A1}},
+      { { EntranceType::Overworld, RR_KOKIRI_FOREST, RR_LW_BRIDGE_FROM_FOREST, 0x05E0 },
+        { EntranceType::Overworld, RR_LW_BRIDGE, RR_KOKIRI_FOREST, 0x020D } },
+      { { EntranceType::Overworld, RR_KOKIRI_FOREST, RR_THE_LOST_WOODS, 0x011E },
+        { EntranceType::Overworld, RR_LW_FOREST_EXIT, RR_KOKIRI_FOREST, 0x0286 } },
+      { { EntranceType::Overworld, RR_THE_LOST_WOODS, RR_GC_WOODS_WARP, 0x04E2 },
+        { EntranceType::Overworld, RR_GC_WOODS_WARP, RR_THE_LOST_WOODS, 0x04D6 } },
+      { { EntranceType::Overworld, RR_THE_LOST_WOODS, RR_ZORAS_RIVER, 0x01DD },
+        { EntranceType::Overworld, RR_ZORAS_RIVER, RR_THE_LOST_WOODS, 0x04DA } },
+      { { EntranceType::Overworld, RR_LW_BEYOND_MIDO, RR_SFM_ENTRYWAY, 0x00FC },
+        { EntranceType::Overworld, RR_SFM_ENTRYWAY, RR_LW_BEYOND_MIDO, 0x01A9 } },
+      { { EntranceType::Overworld, RR_LW_BRIDGE, RR_HYRULE_FIELD, 0x0185 },
+        { EntranceType::Overworld, RR_HYRULE_FIELD, RR_LW_BRIDGE, 0x04DE } },
+      { { EntranceType::Overworld, RR_HYRULE_FIELD, RR_LAKE_HYLIA, 0x0102 },
+        { EntranceType::Overworld, RR_LAKE_HYLIA, RR_HYRULE_FIELD, 0x0189 } },
+      { { EntranceType::Overworld, RR_HYRULE_FIELD, RR_GERUDO_VALLEY, 0x0117 },
+        { EntranceType::Overworld, RR_GERUDO_VALLEY, RR_HYRULE_FIELD, 0x018D } },
+      { { EntranceType::Overworld, RR_HYRULE_FIELD, RR_MARKET_ENTRANCE, 0x0276 },
+        { EntranceType::Overworld, RR_MARKET_ENTRANCE, RR_HYRULE_FIELD, 0x01FD } },
+      { { EntranceType::Overworld, RR_HYRULE_FIELD, RR_KAKARIKO_VILLAGE, 0x00DB },
+        { EntranceType::Overworld, RR_KAKARIKO_VILLAGE, RR_HYRULE_FIELD, 0x017D } },
+      { { EntranceType::Overworld, RR_HYRULE_FIELD, RR_ZR_FRONT, 0x00EA },
+        { EntranceType::Overworld, RR_ZR_FRONT, RR_HYRULE_FIELD, 0x0181 } },
+      { { EntranceType::Overworld, RR_HYRULE_FIELD, RR_LON_LON_RANCH, 0x0157 },
+        { EntranceType::Overworld, RR_LON_LON_RANCH, RR_HYRULE_FIELD, 0x01F9 } },
+      { { EntranceType::Overworld, RR_LAKE_HYLIA, RR_ZORAS_DOMAIN, 0x0328 },
+        { EntranceType::Overworld, RR_ZORAS_DOMAIN, RR_LAKE_HYLIA, 0x0560 } },
+      { { EntranceType::Overworld, RR_GV_FORTRESS_SIDE, RR_GERUDO_FORTRESS, 0x0129 },
+        { EntranceType::Overworld, RR_GERUDO_FORTRESS, RR_GV_FORTRESS_SIDE, 0x022D } },
+      { { EntranceType::Overworld, RR_GF_OUTSIDE_GATE, RR_WASTELAND_NEAR_FORTRESS, 0x0130 },
+        { EntranceType::Overworld, RR_WASTELAND_NEAR_FORTRESS, RR_GF_OUTSIDE_GATE, 0x03AC } },
+      { { EntranceType::Overworld, RR_WASTELAND_NEAR_COLOSSUS, RR_DESERT_COLOSSUS, 0x0123 },
+        { EntranceType::Overworld, RR_DESERT_COLOSSUS, RR_WASTELAND_NEAR_COLOSSUS, 0x0365 } },
+      { { EntranceType::Overworld, RR_MARKET_ENTRANCE, RR_THE_MARKET, 0x00B1 },
+        { EntranceType::Overworld, RR_THE_MARKET, RR_MARKET_ENTRANCE, 0x0033 } },
+      { { EntranceType::Overworld, RR_THE_MARKET, RR_CASTLE_GROUNDS, 0x0138 },
+        { EntranceType::Overworld, RR_CASTLE_GROUNDS, RR_THE_MARKET, 0x025A } },
+      { { EntranceType::Overworld, RR_THE_MARKET, RR_TOT_ENTRANCE, 0x0171 },
+        { EntranceType::Overworld, RR_TOT_ENTRANCE, RR_THE_MARKET, 0x025E } },
+      { { EntranceType::Overworld, RR_KAKARIKO_VILLAGE, RR_THE_GRAVEYARD, 0x00E4 },
+        { EntranceType::Overworld, RR_THE_GRAVEYARD, RR_KAKARIKO_VILLAGE, 0x0195 } },
+      { { EntranceType::Overworld, RR_KAK_BEHIND_GATE, RR_DEATH_MOUNTAIN_TRAIL, 0x013D },
+        { EntranceType::Overworld, RR_DEATH_MOUNTAIN_TRAIL, RR_KAK_BEHIND_GATE, 0x0191 } },
+      { { EntranceType::Overworld, RR_DEATH_MOUNTAIN_TRAIL, RR_GORON_CITY, 0x014D },
+        { EntranceType::Overworld, RR_GORON_CITY, RR_DEATH_MOUNTAIN_TRAIL, 0x01B9 } },
+      { { EntranceType::Overworld, RR_GC_DARUNIAS_CHAMBER, RR_DMC_LOWER_LOCAL, 0x0246 },
+        { EntranceType::Overworld, RR_DMC_LOWER_NEARBY, RR_GC_DARUNIAS_CHAMBER, 0x01C1 } },
+      { { EntranceType::Overworld, RR_DEATH_MOUNTAIN_SUMMIT, RR_DMC_UPPER_LOCAL, 0x0147 },
+        { EntranceType::Overworld, RR_DMC_UPPER_NEARBY, RR_DEATH_MOUNTAIN_SUMMIT, 0x01BD } },
+      { { EntranceType::Overworld, RR_ZR_BEHIND_WATERFALL, RR_ZORAS_DOMAIN, 0x0108 },
+        { EntranceType::Overworld, RR_ZORAS_DOMAIN, RR_ZR_BEHIND_WATERFALL, 0x019D } },
+      { { EntranceType::Overworld, RR_ZD_BEHIND_KING_ZORA, RR_ZORAS_FOUNTAIN, 0x0225 },
+        { EntranceType::Overworld, RR_ZORAS_FOUNTAIN, RR_ZD_BEHIND_KING_ZORA, 0x01A1 } },
 
-    {{EntranceType::Overworld,       GV_LOWER_STREAM,                  LAKE_HYLIA,                           0x0219}, NO_RETURN_ENTRANCE},
+      { { EntranceType::Overworld, RR_GV_LOWER_STREAM, RR_LAKE_HYLIA, 0x0219 }, NO_RETURN_ENTRANCE },
 
-    {{EntranceType::OwlDrop,         LH_OWL_FLIGHT,                    HYRULE_FIELD,                         0x027E}, NO_RETURN_ENTRANCE},
-    {{EntranceType::OwlDrop,         DMT_OWL_FLIGHT,                   KAK_IMPAS_ROOFTOP,                    0x0554}, NO_RETURN_ENTRANCE},
+      { { EntranceType::OwlDrop, RR_LH_OWL_FLIGHT, RR_HYRULE_FIELD, 0x027E }, NO_RETURN_ENTRANCE },
+      { { EntranceType::OwlDrop, RR_DMT_OWL_FLIGHT, RR_KAK_IMPAS_ROOFTOP, 0x0554 }, NO_RETURN_ENTRANCE },
 
-    {{EntranceType::Spawn,           CHILD_SPAWN,                      KF_LINKS_HOUSE,                       0x00BB}, NO_RETURN_ENTRANCE},
-    {{EntranceType::Spawn,           ADULT_SPAWN,                      TEMPLE_OF_TIME,                       0x0282}, NO_RETURN_ENTRANCE}, // 0x282 is an unused entrance index repurposed to differentiate between
-                                                                                                                                           // Adult Spawn and prelude of light (normally they both use 0x5F4)
-    {{EntranceType::WarpSong,        MINUET_OF_FOREST_WARP,            SACRED_FOREST_MEADOW,                 0x0600}, NO_RETURN_ENTRANCE},
-    {{EntranceType::WarpSong,        BOLERO_OF_FIRE_WARP,              DMC_CENTRAL_LOCAL,                    0x04F6}, NO_RETURN_ENTRANCE},
-    {{EntranceType::WarpSong,        SERENADE_OF_WATER_WARP,           LAKE_HYLIA,                           0x0604}, NO_RETURN_ENTRANCE},
-    {{EntranceType::WarpSong,        REQUIEM_OF_SPIRIT_WARP,           DESERT_COLOSSUS,                      0x01F1}, NO_RETURN_ENTRANCE},
-    {{EntranceType::WarpSong,        NOCTURNE_OF_SHADOW_WARP,          GRAVEYARD_WARP_PAD_REGION,            0x0568}, NO_RETURN_ENTRANCE},
-    {{EntranceType::WarpSong,        PRELUDE_OF_LIGHT_WARP,            TEMPLE_OF_TIME,                       0x05F4}, NO_RETURN_ENTRANCE},
+      { { EntranceType::Spawn, RR_CHILD_SPAWN, RR_KF_LINKS_HOUSE, 0x00BB }, NO_RETURN_ENTRANCE },
+      { { EntranceType::Spawn, RR_ADULT_SPAWN, RR_TEMPLE_OF_TIME, 0x0282 },
+        NO_RETURN_ENTRANCE }, // 0x282 is an unused entrance index repurposed to differentiate between
+                              // Adult Spawn and prelude of light (normally they both use 0x5F4)
+      { { EntranceType::WarpSong, RR_MINUET_OF_FOREST_WARP, RR_SACRED_FOREST_MEADOW, 0x0600 }, NO_RETURN_ENTRANCE },
+      { { EntranceType::WarpSong, RR_BOLERO_OF_FIRE_WARP, RR_DMC_CENTRAL_LOCAL, 0x04F6 }, NO_RETURN_ENTRANCE },
+      { { EntranceType::WarpSong, RR_SERENADE_OF_WATER_WARP, RR_LAKE_HYLIA, 0x0604 }, NO_RETURN_ENTRANCE },
+      { { EntranceType::WarpSong, RR_REQUIEM_OF_SPIRIT_WARP, RR_DESERT_COLOSSUS, 0x01F1 }, NO_RETURN_ENTRANCE },
+      { { EntranceType::WarpSong, RR_NOCTURNE_OF_SHADOW_WARP, RR_GRAVEYARD_WARP_PAD_REGION, 0x0568 },
+        NO_RETURN_ENTRANCE },
+      { { EntranceType::WarpSong, RR_PRELUDE_OF_LIGHT_WARP, RR_TEMPLE_OF_TIME, 0x05F4 }, NO_RETURN_ENTRANCE },
 
-    {{EntranceType::ChildBoss, DEKU_TREE_BOSS_ENTRYWAY,        DEKU_TREE_BOSS_ROOM,            0x040F},
-     {EntranceType::ChildBoss, DEKU_TREE_BOSS_ROOM,            DEKU_TREE_BOSS_ENTRYWAY,        0x0252, 0x0457}},
-    {{EntranceType::ChildBoss, DODONGOS_CAVERN_BOSS_ENTRYWAY,  DODONGOS_CAVERN_BOSS_ROOM,      0x040B},
-     {EntranceType::ChildBoss, DODONGOS_CAVERN_BOSS_ROOM,      DODONGOS_CAVERN_BOSS_ENTRYWAY,  0x00C5, 0x047A}},
-    {{EntranceType::ChildBoss, JABU_JABUS_BELLY_BOSS_ENTRYWAY, JABU_JABUS_BELLY_BOSS_ROOM,     0x0301},
-     {EntranceType::ChildBoss, JABU_JABUS_BELLY_BOSS_ROOM,     JABU_JABUS_BELLY_BOSS_ENTRYWAY, 0x0407, 0x010E}},
-    {{EntranceType::AdultBoss, FOREST_TEMPLE_BOSS_ENTRYWAY,    FOREST_TEMPLE_BOSS_ROOM,        0x000C},
-     {EntranceType::AdultBoss, FOREST_TEMPLE_BOSS_ROOM,        FOREST_TEMPLE_BOSS_ENTRYWAY,    0x024E, 0x0608}},
-    {{EntranceType::AdultBoss, FIRE_TEMPLE_BOSS_ENTRYWAY,      FIRE_TEMPLE_BOSS_ROOM,          0x0305},
-     {EntranceType::AdultBoss, FIRE_TEMPLE_BOSS_ROOM,          FIRE_TEMPLE_BOSS_ENTRYWAY,      0x0175, 0x0564}},
-    {{EntranceType::AdultBoss, WATER_TEMPLE_BOSS_ENTRYWAY,     WATER_TEMPLE_BOSS_ROOM,         0x0417},
-     {EntranceType::AdultBoss, WATER_TEMPLE_BOSS_ROOM,         WATER_TEMPLE_BOSS_ENTRYWAY,     0x0423, 0x060C}},
-    {{EntranceType::AdultBoss, SPIRIT_TEMPLE_BOSS_ENTRYWAY,    SPIRIT_TEMPLE_BOSS_ROOM,        0x008D},
-     {EntranceType::AdultBoss, SPIRIT_TEMPLE_BOSS_ROOM,        SPIRIT_TEMPLE_BOSS_ENTRYWAY,    0x02F5, 0x0610}},
-    {{EntranceType::AdultBoss, SHADOW_TEMPLE_BOSS_ENTRYWAY,    SHADOW_TEMPLE_BOSS_ROOM,        0x0413},
-     {EntranceType::AdultBoss, SHADOW_TEMPLE_BOSS_ROOM,        SHADOW_TEMPLE_BOSS_ENTRYWAY,    0x02B2, 0x0580}},
+      { { EntranceType::ChildBoss, RR_DEKU_TREE_BOSS_ENTRYWAY, RR_DEKU_TREE_BOSS_ROOM, 0x040F },
+        { EntranceType::ChildBoss, RR_DEKU_TREE_BOSS_ROOM, RR_DEKU_TREE_BOSS_ENTRYWAY, 0x0252, 0x0457 } },
+      { { EntranceType::ChildBoss, RR_DODONGOS_CAVERN_BOSS_ENTRYWAY, RR_DODONGOS_CAVERN_BOSS_ROOM, 0x040B },
+        { EntranceType::ChildBoss, RR_DODONGOS_CAVERN_BOSS_ROOM, RR_DODONGOS_CAVERN_BOSS_ENTRYWAY, 0x00C5, 0x047A } },
+      { { EntranceType::ChildBoss, RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY, RR_JABU_JABUS_BELLY_BOSS_ROOM, 0x0301 },
+        { EntranceType::ChildBoss, RR_JABU_JABUS_BELLY_BOSS_ROOM, RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY, 0x0407, 0x010E } },
+      { { EntranceType::AdultBoss, RR_FOREST_TEMPLE_BOSS_ENTRYWAY, RR_FOREST_TEMPLE_BOSS_ROOM, 0x000C },
+        { EntranceType::AdultBoss, RR_FOREST_TEMPLE_BOSS_ROOM, RR_FOREST_TEMPLE_BOSS_ENTRYWAY, 0x024E, 0x0608 } },
+      { { EntranceType::AdultBoss, RR_FIRE_TEMPLE_BOSS_ENTRYWAY, RR_FIRE_TEMPLE_BOSS_ROOM, 0x0305 },
+        { EntranceType::AdultBoss, RR_FIRE_TEMPLE_BOSS_ROOM, RR_FIRE_TEMPLE_BOSS_ENTRYWAY, 0x0175, 0x0564 } },
+      { { EntranceType::AdultBoss, RR_WATER_TEMPLE_BOSS_ENTRYWAY, RR_WATER_TEMPLE_BOSS_ROOM, 0x0417 },
+        { EntranceType::AdultBoss, RR_WATER_TEMPLE_BOSS_ROOM, RR_WATER_TEMPLE_BOSS_ENTRYWAY, 0x0423, 0x060C } },
+      { { EntranceType::AdultBoss, RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY, RR_SPIRIT_TEMPLE_BOSS_ROOM, 0x008D },
+        { EntranceType::AdultBoss, RR_SPIRIT_TEMPLE_BOSS_ROOM, RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY, 0x02F5, 0x0610 } },
+      { { EntranceType::AdultBoss, RR_SHADOW_TEMPLE_BOSS_ENTRYWAY, RR_SHADOW_TEMPLE_BOSS_ROOM, 0x0413 },
+        { EntranceType::AdultBoss, RR_SHADOW_TEMPLE_BOSS_ROOM, RR_SHADOW_TEMPLE_BOSS_ENTRYWAY, 0x02B2, 0x0580 } },
   };
 
   std::map<std::string, PriorityEntrance> priorityEntranceTable = {
-    {"Bolero",   {{DMC_CENTRAL_LOCAL},                                     {EntranceType::OwlDrop, EntranceType::WarpSong}}},
-    {"Nocturne", {{GRAVEYARD_WARP_PAD_REGION},                             {EntranceType::OwlDrop, EntranceType::Spawn, EntranceType::WarpSong}}},
-    {"Requiem",  {{DESERT_COLOSSUS, DESERT_COLOSSUS_FROM_SPIRIT_ENTRYWAY}, {EntranceType::OwlDrop, EntranceType::Spawn, EntranceType::WarpSong}}},
+      { "Bolero", { { RR_DMC_CENTRAL_LOCAL }, { EntranceType::OwlDrop, EntranceType::WarpSong } } },
+      { "Nocturne",
+        { { RR_GRAVEYARD_WARP_PAD_REGION }, { EntranceType::OwlDrop, EntranceType::Spawn, EntranceType::WarpSong } } },
+      { "Requiem",
+        { { RR_DESERT_COLOSSUS, RR_DESERT_COLOSSUS_FROM_SPIRIT_ENTRYWAY },
+          { EntranceType::OwlDrop, EntranceType::Spawn, EntranceType::WarpSong } } },
   };
 
   entranceShuffleFailure = false;
@@ -1008,16 +1022,16 @@ int ShuffleAllEntrances() {
       // If forest is closed, ensure Ghoma is inside the Deku tree
       // Deku tree being in its vanilla location is handled below
       if (Settings::OpenForest.Is(OPENFOREST_CLOSED) && !(Settings::ShuffleOverworldEntrances || Settings::ShuffleInteriorEntrances)) {
-        FilterAndEraseFromPool(entrancePools[EntranceType::Boss], [](const Entrance* entrance){return entrance->GetParentRegionKey()    == DEKU_TREE_BOSS_ENTRYWAY &&
-                                                                                                      entrance->GetConnectedRegionKey() == DEKU_TREE_BOSS_ROOM;});
+        FilterAndEraseFromPool(entrancePools[EntranceType::Boss], [](const Entrance* entrance){return entrance->GetParentRegionKey()    == RR_DEKU_TREE_BOSS_ENTRYWAY &&
+                                                                                                      entrance->GetConnectedRegionKey() == RR_DEKU_TREE_BOSS_ROOM;});
       }
     } else {
       entrancePools[EntranceType::ChildBoss] = GetShuffleableEntrances(EntranceType::ChildBoss);
       entrancePools[EntranceType::AdultBoss] = GetShuffleableEntrances(EntranceType::AdultBoss);
       // If forest is closed, ensure Ghoma is inside the Deku tree
       if (Settings::OpenForest.Is(OPENFOREST_CLOSED) && !(Settings::ShuffleOverworldEntrances || Settings::ShuffleInteriorEntrances)) {
-        FilterAndEraseFromPool(entrancePools[EntranceType::ChildBoss], [](const Entrance* entrance){return entrance->GetParentRegionKey()    == DEKU_TREE_BOSS_ENTRYWAY &&
-                                                                                                           entrance->GetConnectedRegionKey() == DEKU_TREE_BOSS_ROOM;});
+        FilterAndEraseFromPool(entrancePools[EntranceType::ChildBoss], [](const Entrance* entrance){return entrance->GetParentRegionKey()    == RR_DEKU_TREE_BOSS_ENTRYWAY &&
+                                                                                                           entrance->GetConnectedRegionKey() == RR_DEKU_TREE_BOSS_ROOM;});
       }
     }
   }
@@ -1031,8 +1045,8 @@ int ShuffleAllEntrances() {
     }
     //If forest is closed don't allow a forest escape via spirit temple hands
     if (Settings::OpenForest.Is(OPENFOREST_CLOSED) && !(Settings::ShuffleOverworldEntrances || Settings::ShuffleInteriorEntrances)) {
-      FilterAndEraseFromPool(entrancePools[EntranceType::Dungeon], [](const Entrance* entrance){return entrance->GetParentRegionKey()    == KF_OUTSIDE_DEKU_TREE &&
-                                                                                                       entrance->GetConnectedRegionKey() == DEKU_TREE_ENTRYWAY;});
+      FilterAndEraseFromPool(entrancePools[EntranceType::Dungeon], [](const Entrance* entrance){return entrance->GetParentRegionKey()    == RR_KF_OUTSIDE_DEKU_TREE &&
+                                                                                                       entrance->GetConnectedRegionKey() == RR_DEKU_TREE_ENTRYWAY;});
     }
     if (Settings::DecoupleEntrances) {
       for (Entrance* entrance : entrancePools[EntranceType::Dungeon]) {
@@ -1072,8 +1086,8 @@ int ShuffleAllEntrances() {
     entrancePools[EntranceType::Overworld] = GetShuffleableEntrances(EntranceType::Overworld, excludeOverworldReverse);
     // Only shuffle GV Lower Stream -> Lake Hylia if decoupled entrances are on
     if (!Settings::DecoupleEntrances) {
-      FilterAndEraseFromPool(entrancePools[EntranceType::Overworld], [](const Entrance* entrance){return entrance->GetParentRegionKey()    == GV_LOWER_STREAM &&
-                                                                                                         entrance->GetConnectedRegionKey() == LAKE_HYLIA;});
+      FilterAndEraseFromPool(entrancePools[EntranceType::Overworld], [](const Entrance* entrance){return entrance->GetParentRegionKey()    == RR_GV_LOWER_STREAM &&
+                                                                                                         entrance->GetConnectedRegionKey() == RR_LAKE_HYLIA;});
     }
   }
 
@@ -1135,7 +1149,7 @@ int ShuffleAllEntrances() {
 
     if (poolType == EntranceType::OwlDrop) {
       validTargetTypes = {EntranceType::WarpSong, EntranceType::OwlDrop, EntranceType::Overworld, EntranceType::Extra};
-      oneWayTargetEntrancePools[poolType] = BuildOneWayTargets(validTargetTypes, {std::make_pair(PRELUDE_OF_LIGHT_WARP, TEMPLE_OF_TIME)});
+      oneWayTargetEntrancePools[poolType] = BuildOneWayTargets(validTargetTypes, {std::make_pair(RR_PRELUDE_OF_LIGHT_WARP, RR_TEMPLE_OF_TIME)});
       // Owl Drops are only accessible as child, so targets should reflect that
       for (Entrance* target : oneWayTargetEntrancePools[poolType]) {
         target->SetCondition([]{return Logic::IsChild;});
diff --git a/soh/soh/Enhancements/randomizer/3drando/entrance.hpp b/soh/soh/Enhancements/randomizer/3drando/entrance.hpp
index b6a5cb432..d9c62a5fb 100644
--- a/soh/soh/Enhancements/randomizer/3drando/entrance.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/entrance.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "keys.hpp"
 #include "location_access.hpp"
 
 #include <string>
@@ -38,7 +37,7 @@ enum class EntranceType {
 class Entrance {
 public:
 
-    Entrance(uint32_t connectedRegion_, std::vector<ConditionFn> conditions_met_)
+    Entrance(RandomizerRegion connectedRegion_, std::vector<ConditionFn> conditions_met_)
         : connectedRegion(connectedRegion_) {
         conditions_met.resize(2);
         for (size_t i = 0; i < conditions_met_.size(); i++) {
@@ -127,10 +126,10 @@ public:
         age = true;
 
         Logic::UpdateHelpers();
-        return GetConditionsMet() && (connectedRegion != NONE || passAnyway);
+        return GetConditionsMet() && (connectedRegion != RR_NONE || passAnyway);
     }
 
-    uint32_t GetConnectedRegionKey() const {
+    RandomizerRegion GetConnectedRegionKey() const {
         return connectedRegion;
     }
 
@@ -138,11 +137,11 @@ public:
         return AreaTable(connectedRegion);
     }
 
-    void SetParentRegion(uint32_t newParent) {
+    void SetParentRegion(RandomizerRegion newParent) {
         parentRegion = newParent;
     }
 
-    uint32_t GetParentRegionKey() const {
+    RandomizerRegion GetParentRegionKey() const {
         return parentRegion;
     }
 
@@ -150,7 +149,7 @@ public:
         return AreaTable(parentRegion);
     }
 
-    void SetNewEntrance(uint32_t newRegion) {
+    void SetNewEntrance(RandomizerRegion newRegion) {
         connectedRegion = newRegion;
     }
 
@@ -230,15 +229,15 @@ public:
         return reverse;
     }
 
-    void Connect(uint32_t newConnectedRegion) {
+    void Connect(RandomizerRegion newConnectedRegion) {
         connectedRegion = newConnectedRegion;
         AreaTable(newConnectedRegion)->entrances.push_front(this);
     }
 
-    uint32_t Disconnect() {
+    RandomizerRegion Disconnect() {
         AreaTable(connectedRegion)->entrances.remove_if([this](const auto entrance){return this == entrance;});
-        uint32_t previouslyConnected = connectedRegion;
-        connectedRegion = NONE;
+        RandomizerRegion previouslyConnected = connectedRegion;
+        connectedRegion = RR_NONE;
         return previouslyConnected;
     }
 
@@ -248,8 +247,8 @@ public:
     }
 
     Entrance* GetNewTarget() {
-        AreaTable(ROOT)->AddExit(ROOT, connectedRegion, []{return true;});
-        Entrance* targetEntrance = AreaTable(ROOT)->GetExit(connectedRegion);
+        AreaTable(RR_ROOT)->AddExit(RR_ROOT, connectedRegion, []{return true;});
+        Entrance* targetEntrance = AreaTable(RR_ROOT)->GetExit(connectedRegion);
         targetEntrance->SetReplacement(this);
         targetEntrance->SetName(GetParentRegion()->regionName + " -> " + GetConnectedRegion()->regionName);
         return targetEntrance;
@@ -264,8 +263,8 @@ public:
     }
 
 private:
-    uint32_t parentRegion;
-    uint32_t connectedRegion;
+    RandomizerRegion parentRegion;
+    RandomizerRegion connectedRegion;
     std::vector<ConditionFn> conditions_met;
 
     //Entrance Randomizer stuff
diff --git a/soh/soh/Enhancements/randomizer/3drando/fill.cpp b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
index f9d3a9592..b0a99d85d 100644
--- a/soh/soh/Enhancements/randomizer/3drando/fill.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
@@ -2,7 +2,7 @@
 
 #include "custom_messages.hpp"
 #include "dungeon.hpp"
-#include "item_location.hpp"
+#include "../context.h"
 #include "item_pool.hpp"
 #include "location_access.hpp"
 #include "logic.hpp"
@@ -13,6 +13,8 @@
 #include "hint_list.hpp"
 #include "entrance.hpp"
 #include "shops.hpp"
+//#include "debug.hpp"
+#include "soh/Enhancements/randomizer/static_data.h"
 
 #include <vector>
 #include <list>
@@ -25,16 +27,18 @@ using namespace Settings;
 static bool placementFailure = false;
 
 static void RemoveStartingItemsFromPool() {
-  for (uint32_t startingItem : StartingInventory) {
+  for (RandomizerGet startingItem : StartingInventory) {
     for (size_t i = 0; i < ItemPool.size(); i++) {
-      if (startingItem == BIGGORON_SWORD) {
-        if (ItemPool[i] == GIANTS_KNIFE || ItemPool[i] == BIGGORON_SWORD) {
+      if (startingItem == RG_BIGGORON_SWORD) {
+        if (ItemPool[i] == RG_GIANTS_KNIFE || ItemPool[i] == RG_BIGGORON_SWORD) {
           ItemPool[i] = GetJunkItem();
         }
         continue;
-      } else if (startingItem == ItemPool[i] || (ItemTable(startingItem).IsBottleItem() && ItemTable(ItemPool[i]).IsBottleItem())) {
-        if (AdditionalHeartContainers > 0 && (startingItem == PIECE_OF_HEART || startingItem == TREASURE_GAME_HEART)) {
-          ItemPool[i] = HEART_CONTAINER;
+      } else if (startingItem == ItemPool[i] || (Rando::StaticData::RetrieveItem(startingItem).IsBottleItem() &&
+                                                 Rando::StaticData::RetrieveItem(ItemPool[i]).IsBottleItem())) {
+        if (AdditionalHeartContainers > 0 && 
+          (startingItem == RG_PIECE_OF_HEART || startingItem == RG_TREASURE_GAME_HEART)) {
+          ItemPool[i] = RG_HEART_CONTAINER;
           AdditionalHeartContainers--;
         } else {
           ItemPool[i] = GetJunkItem();
@@ -73,30 +77,30 @@ static bool UpdateToDAccess(Entrance* entrance, SearchMode mode) {
 
   //special check for temple of time
   bool propogateTimeTravel = mode != SearchMode::TimePassAccess && mode != SearchMode::TempleOfTimeAccess;
-  if (!AreaTable(ROOT)->Adult() && AreaTable(TOT_BEYOND_DOOR_OF_TIME)->Child() && propogateTimeTravel) {
-    AreaTable(ROOT)->adultDay   = AreaTable(TOT_BEYOND_DOOR_OF_TIME)->childDay;
-    AreaTable(ROOT)->adultNight = AreaTable(TOT_BEYOND_DOOR_OF_TIME)->childNight;
-  } else if (!AreaTable(ROOT)->Child() && AreaTable(TOT_BEYOND_DOOR_OF_TIME)->Adult() && propogateTimeTravel){
-    AreaTable(ROOT)->childDay   = AreaTable(TOT_BEYOND_DOOR_OF_TIME)->adultDay;
-    AreaTable(ROOT)->childNight = AreaTable(TOT_BEYOND_DOOR_OF_TIME)->adultNight;
+  if (!AreaTable(RR_ROOT)->Adult() && AreaTable(RR_TOT_BEYOND_DOOR_OF_TIME)->Child() && propogateTimeTravel) {
+    AreaTable(RR_ROOT)->adultDay   = AreaTable(RR_TOT_BEYOND_DOOR_OF_TIME)->childDay;
+    AreaTable(RR_ROOT)->adultNight = AreaTable(RR_TOT_BEYOND_DOOR_OF_TIME)->childNight;
+  } else if (!AreaTable(RR_ROOT)->Child() && AreaTable(RR_TOT_BEYOND_DOOR_OF_TIME)->Adult() && propogateTimeTravel){
+    AreaTable(RR_ROOT)->childDay   = AreaTable(RR_TOT_BEYOND_DOOR_OF_TIME)->adultDay;
+    AreaTable(RR_ROOT)->childNight = AreaTable(RR_TOT_BEYOND_DOOR_OF_TIME)->adultNight;
   }
 
   return ageTimePropogated;
 }
 
 // Various checks that need to pass for the world to be validated as completable
-static void ValidateWorldChecks(SearchMode& mode, bool checkPoeCollectorAccess, bool checkOtherEntranceAccess, std::vector<uint32_t>& areaPool) {
+static void ValidateWorldChecks(SearchMode& mode, bool checkPoeCollectorAccess, bool checkOtherEntranceAccess, std::vector<RandomizerRegion>& areaPool) {
   // Condition for validating Temple of Time Access
-  if (mode == SearchMode::TempleOfTimeAccess && ((Settings::ResolvedStartingAge == AGE_CHILD && AreaTable(TEMPLE_OF_TIME)->Adult()) || (Settings::ResolvedStartingAge == AGE_ADULT && AreaTable(TEMPLE_OF_TIME)->Child()) || !checkOtherEntranceAccess)) {
+  if (mode == SearchMode::TempleOfTimeAccess && ((Settings::ResolvedStartingAge == AGE_CHILD && AreaTable(RR_TEMPLE_OF_TIME)->Adult()) || (Settings::ResolvedStartingAge == AGE_ADULT && AreaTable(RR_TEMPLE_OF_TIME)->Child()) || !checkOtherEntranceAccess)) {
     mode = SearchMode::ValidStartingRegion;
   }
   // Condition for validating a valid starting region
   if (mode == SearchMode::ValidStartingRegion) {
-    bool childAccess = Settings::ResolvedStartingAge == AGE_CHILD || AreaTable(TOT_BEYOND_DOOR_OF_TIME)->Child();
-    bool adultAccess = Settings::ResolvedStartingAge == AGE_ADULT || AreaTable(TOT_BEYOND_DOOR_OF_TIME)->Adult();
+    bool childAccess = Settings::ResolvedStartingAge == AGE_CHILD || AreaTable(RR_TOT_BEYOND_DOOR_OF_TIME)->Child();
+    bool adultAccess = Settings::ResolvedStartingAge == AGE_ADULT || AreaTable(RR_TOT_BEYOND_DOOR_OF_TIME)->Adult();
 
-    Area* kokiri = AreaTable(KOKIRI_FOREST);
-    Area* kakariko = AreaTable(KAKARIKO_VILLAGE);
+    Area* kokiri = AreaTable(RR_KOKIRI_FOREST);
+    Area* kakariko = AreaTable(RR_KAKARIKO_VILLAGE);
 
     if ((childAccess && (kokiri->Child() || kakariko->Child())) ||
         (adultAccess && (kokiri->Adult() || kakariko->Adult())) ||
@@ -107,21 +111,21 @@ static void ValidateWorldChecks(SearchMode& mode, bool checkPoeCollectorAccess,
     }
   }
   // Condition for validating Poe Collector Access
-  if (mode == SearchMode::PoeCollectorAccess && (AreaTable(MARKET_GUARD_HOUSE)->Adult() || !checkPoeCollectorAccess)) {
+  if (mode == SearchMode::PoeCollectorAccess && (AreaTable(RR_MARKET_GUARD_HOUSE)->Adult() || !checkPoeCollectorAccess)) {
     // Apply all items that are necessary for checking all location access
-      std::vector<uint32_t> itemsToPlace =
-          FilterFromPool(ItemPool, [](const auto i) { return ItemTable(i).IsAdvancement(); });
-    for (uint32_t unplacedItem : itemsToPlace) {
-      ItemTable(unplacedItem).ApplyEffect();
+      std::vector<RandomizerGet> itemsToPlace =
+          FilterFromPool(ItemPool, [](const auto i) { return Rando::StaticData::RetrieveItem(i).IsAdvancement(); });
+    for (RandomizerGet unplacedItem : itemsToPlace) {
+      Rando::StaticData::RetrieveItem(unplacedItem).ApplyEffect();
     }
     // Reset access as the non-starting age
     if (Settings::ResolvedStartingAge == AGE_CHILD) {
-      for (uint32_t areaKey : areaPool) {
+      for (RandomizerRegion areaKey : areaPool) {
         AreaTable(areaKey)->adultDay = false;
         AreaTable(areaKey)->adultNight = false;
       }
     } else {
-      for (uint32_t areaKey : areaPool) {
+      for (RandomizerRegion areaKey : areaPool) {
         AreaTable(areaKey)->childDay = false;
         AreaTable(areaKey)->childNight = false;
       }
@@ -134,6 +138,7 @@ static void ValidateWorldChecks(SearchMode& mode, bool checkPoeCollectorAccess,
 
 //Get the max number of tokens that can possibly be useful
 static int GetMaxGSCount() {
+  auto ctx = Rando::Context::GetInstance();
   //If bridge or LACS is set to tokens, get how many are required
   int maxBridge = 0;
   int maxLACS = 0;
@@ -147,23 +152,23 @@ static int GetMaxGSCount() {
   //Get the max amount of GS which could be useful from token reward locations
   int maxUseful = 0;
   //If the highest advancement item is a token, we know it is useless since it won't lead to an otherwise useful item
-  if (Location(KAK_100_GOLD_SKULLTULA_REWARD)->GetPlacedItem().IsAdvancement() && Location(KAK_100_GOLD_SKULLTULA_REWARD)->GetPlacedItem().GetItemType() != ITEMTYPE_TOKEN) {
+  if (ctx->GetItemLocation(RC_KAK_100_GOLD_SKULLTULA_REWARD)->GetPlacedItem().IsAdvancement() && ctx->GetItemLocation(RC_KAK_100_GOLD_SKULLTULA_REWARD)->GetPlacedItem().GetItemType() != ITEMTYPE_TOKEN) {
     maxUseful = 100;
-  }
-  else if (Location(KAK_50_GOLD_SKULLTULA_REWARD)->GetPlacedItem().IsAdvancement() && Location(KAK_50_GOLD_SKULLTULA_REWARD)->GetPlacedItem().GetItemType() != ITEMTYPE_TOKEN) {
-    maxUseful = 50;
-  }
-  else if (Location(KAK_40_GOLD_SKULLTULA_REWARD)->GetPlacedItem().IsAdvancement() && Location(KAK_40_GOLD_SKULLTULA_REWARD)->GetPlacedItem().GetItemType() != ITEMTYPE_TOKEN) {
-    maxUseful = 40;
-  }
-  else if (Location(KAK_30_GOLD_SKULLTULA_REWARD)->GetPlacedItem().IsAdvancement() && Location(KAK_30_GOLD_SKULLTULA_REWARD)->GetPlacedItem().GetItemType() != ITEMTYPE_TOKEN) {
-    maxUseful = 30;
-  }
-  else if (Location(KAK_20_GOLD_SKULLTULA_REWARD)->GetPlacedItem().IsAdvancement() && Location(KAK_20_GOLD_SKULLTULA_REWARD)->GetPlacedItem().GetItemType() != ITEMTYPE_TOKEN) {
-    maxUseful = 20;
-  }
-  else if (Location(KAK_10_GOLD_SKULLTULA_REWARD)->GetPlacedItem().IsAdvancement() && Location(KAK_10_GOLD_SKULLTULA_REWARD)->GetPlacedItem().GetItemType() != ITEMTYPE_TOKEN) {
-    maxUseful = 10;
+  } else if (ctx->GetItemLocation(RC_KAK_50_GOLD_SKULLTULA_REWARD)->GetPlacedItem().IsAdvancement() &&
+             ctx->GetItemLocation(RC_KAK_50_GOLD_SKULLTULA_REWARD)->GetPlacedItem().GetItemType() != ITEMTYPE_TOKEN) {
+      maxUseful = 50;
+  } else if (ctx->GetItemLocation(RC_KAK_40_GOLD_SKULLTULA_REWARD)->GetPlacedItem().IsAdvancement() &&
+             ctx->GetItemLocation(RC_KAK_40_GOLD_SKULLTULA_REWARD)->GetPlacedItem().GetItemType() != ITEMTYPE_TOKEN) {
+      maxUseful = 40;
+  } else if (ctx->GetItemLocation(RC_KAK_30_GOLD_SKULLTULA_REWARD)->GetPlacedItem().IsAdvancement() &&
+             ctx->GetItemLocation(RC_KAK_30_GOLD_SKULLTULA_REWARD)->GetPlacedItem().GetItemType() != ITEMTYPE_TOKEN) {
+      maxUseful = 30;
+  } else if (ctx->GetItemLocation(RC_KAK_20_GOLD_SKULLTULA_REWARD)->GetPlacedItem().IsAdvancement() &&
+             ctx->GetItemLocation(RC_KAK_20_GOLD_SKULLTULA_REWARD)->GetPlacedItem().GetItemType() != ITEMTYPE_TOKEN) {
+      maxUseful = 20;
+  } else if (ctx->GetItemLocation(RC_KAK_10_GOLD_SKULLTULA_REWARD)->GetPlacedItem().IsAdvancement() &&
+             ctx->GetItemLocation(RC_KAK_10_GOLD_SKULLTULA_REWARD)->GetPlacedItem().GetItemType() != ITEMTYPE_TOKEN) {
+      maxUseful = 10;
   }
   //Return max of the two possible reasons tokens could be important, minus the tokens in the starting inventory
   return std::max(maxUseful, maxBridge) - StartingSkulltulaToken.Value<uint8_t>();
@@ -182,34 +187,41 @@ std::string GetShopItemBaseName(std::string itemName) {
   return baseName;
 }
 
-std::vector<uint32_t> GetEmptyLocations(std::vector<uint32_t> allowedLocations) {
-  return FilterFromPool(allowedLocations, [](const auto loc){ return Location(loc)->GetPlaceduint32_t() == NONE;});
+std::vector<RandomizerCheck> GetEmptyLocations(std::vector<RandomizerCheck> allowedLocations) {
+    auto ctx = Rando::Context::GetInstance();
+    return FilterFromPool(allowedLocations, [ctx](const auto loc) {
+        return ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == RG_NONE;
+    });
 }
 
-std::vector<uint32_t> GetAllEmptyLocations() {
-    return FilterFromPool(allLocations, [](const auto loc) { return Location(loc)->GetPlaceduint32_t() == NONE; });
+std::vector<RandomizerCheck> GetAllEmptyLocations() {
+    auto ctx = Rando::Context::GetInstance();
+    return FilterFromPool(ctx->allLocations, [ctx](const auto loc) {
+        return ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == RG_NONE;
+    });
 }
 
 //This function will return a vector of ItemLocations that are accessible with
 //where items have been placed so far within the world. The allowedLocations argument
 //specifies the pool of locations that we're trying to search for an accessible location in
-std::vector<uint32_t> GetAccessibleLocations(const std::vector<uint32_t>& allowedLocations, SearchMode mode /* = SearchMode::ReachabilitySearch*/, std::string ignore /*= ""*/, bool checkPoeCollectorAccess /*= false*/, bool checkOtherEntranceAccess /*= false*/) {
-  std::vector<uint32_t> accessibleLocations;
-  // Reset all access to begin a new search
-  if (mode < SearchMode::ValidateWorld) {
-    ApplyStartingInventory();
+std::vector<RandomizerCheck> GetAccessibleLocations(const std::vector<RandomizerCheck>& allowedLocations, SearchMode mode /* = SearchMode::ReachabilitySearch*/, std::string ignore /*= ""*/, bool checkPoeCollectorAccess /*= false*/, bool checkOtherEntranceAccess /*= false*/) {
+    auto ctx = Rando::Context::GetInstance();
+    std::vector<RandomizerCheck> accessibleLocations;
+    // Reset all access to begin a new search
+    if (mode < SearchMode::ValidateWorld) {
+        ApplyStartingInventory();
   }
   Areas::AccessReset();
-  LocationReset();
-  std::vector<uint32_t> areaPool = {ROOT};
+  ctx->LocationReset();
+  std::vector<RandomizerRegion> areaPool = {RR_ROOT};
 
   if (mode == SearchMode::ValidateWorld) {
     mode = SearchMode::TimePassAccess;
-    AreaTable(ROOT)->childNight = true;
-    AreaTable(ROOT)->adultNight = true;
-    AreaTable(ROOT)->childDay = true;
-    AreaTable(ROOT)->adultDay = true;
-    allLocationsReachable = false;
+    AreaTable(RR_ROOT)->childNight = true;
+    AreaTable(RR_ROOT)->adultNight = true;
+    AreaTable(RR_ROOT)->childDay = true;
+    AreaTable(RR_ROOT)->adultDay = true;
+    ctx->allLocationsReachable = false;
   }
 
   //Variables for playthrough
@@ -219,7 +231,7 @@ std::vector<uint32_t> GetAccessibleLocations(const std::vector<uint32_t>& allowe
   std::vector<std::string> buyIgnores;
 
   //Variables for search
-  std::vector<ItemLocation*> newItemLocations;
+  std::vector<Rando::ItemLocation*> newItemLocations;
   bool updatedEvents = false;
   bool ageTimePropogated = false;
   bool firstIteration = true;
@@ -236,12 +248,12 @@ std::vector<uint32_t> GetAccessibleLocations(const std::vector<uint32_t>& allowe
     ageTimePropogated = false;
     updatedEvents = false;
 
-    for (ItemLocation* location : newItemLocations) {
+    for (Rando::ItemLocation* location : newItemLocations) {
       location->ApplyPlacedItemEffect();
     }
     newItemLocations.clear();
 
-    std::vector<uint32_t> itemSphere;
+    std::vector<RandomizerCheck> itemSphere;
     std::list<Entrance*> entranceSphere;
 
     for (size_t i = 0; i < areaPool.size(); i++) {
@@ -290,7 +302,7 @@ std::vector<uint32_t> GetAccessibleLocations(const std::vector<uint32_t>& allowe
         Area* exitArea = exit.GetConnectedRegion();
         if (!exitArea->addedToPool && exit.ConditionsMet()) {
           exitArea->addedToPool = true;
-          areaPool.push_back(exit.Getuint32_t());
+          areaPool.push_back(exit.GetConnectedRegionKey());
         }
 
         // Add shuffled entrances to the entrance playthrough
@@ -308,14 +320,14 @@ std::vector<uint32_t> GetAccessibleLocations(const std::vector<uint32_t>& allowe
       if (mode < SearchMode::ValidateWorld) {
         for (size_t k = 0; k < area->locations.size(); k++) {
           LocationAccess& locPair = area->locations[k];
-          uint32_t loc = locPair.GetLocation();
-          ItemLocation* location = Location(loc);
+          RandomizerCheck loc = locPair.GetLocation();
+          Rando::ItemLocation* location = ctx->GetItemLocation(loc);
 
           if (!location->IsAddedToPool() && locPair.ConditionsMet()) {
 
             location->AddToPool();
 
-            if (location->GetPlaceduint32_t() == NONE) {
+            if (location->GetPlacedRandomizerGet() == RG_NONE) {
               accessibleLocations.push_back(loc); //Empty location, consider for placement
             } else {
               //If ignore has a value, we want to check if the item location should be considered or not
@@ -348,7 +360,7 @@ std::vector<uint32_t> GetAccessibleLocations(const std::vector<uint32_t>& allowe
             //Generate the playthrough, so we want to add advancement items, unless we know to ignore them
             if (mode == SearchMode::GeneratePlaythrough) {
               //Item is an advancement item, figure out if it should be added to this sphere
-              if (!playthroughBeatable && location->GetPlacedItem().IsAdvancement()) {
+              if (!ctx->playthroughBeatable && location->GetPlacedItem().IsAdvancement()) {
                 ItemType type = location->GetPlacedItem().GetItemType();
                 std::string itemName(location->GetPlacedItemName().GetEnglish());
                 bool bombchus = itemName.find("Bombchu") != std::string::npos; //Is a bombchu location
@@ -391,15 +403,15 @@ std::vector<uint32_t> GetAccessibleLocations(const std::vector<uint32_t>& allowe
                 }
               }
               //Triforce has been found, seed is beatable, nothing else in this or future spheres matters
-              else if (location->GetPlaceduint32_t() == TRIFORCE) {
+              else if (location->GetPlacedRandomizerGet() == RG_TRIFORCE) {
                 itemSphere.clear();
                 itemSphere.push_back(loc);
-                playthroughBeatable = true;
+                ctx->playthroughBeatable = true;
               }
             }
             //All we care about is if the game is beatable, used to pare down playthrough
-            else if (location->GetPlaceduint32_t() == TRIFORCE && mode == SearchMode::CheckBeatable) {
-              playthroughBeatable = true;
+            else if (location->GetPlacedRandomizerGet() == RG_TRIFORCE && mode == SearchMode::CheckBeatable) {
+              ctx->playthroughBeatable = true;
               return {}; //Return early for efficiency
             }
           }
@@ -408,7 +420,7 @@ std::vector<uint32_t> GetAccessibleLocations(const std::vector<uint32_t>& allowe
     }
 
     if (mode == SearchMode::GeneratePlaythrough && itemSphere.size() > 0) {
-      playthroughLocations.push_back(itemSphere);
+      ctx->playthroughLocations.push_back(itemSphere);
     }
     if (mode == SearchMode::GeneratePlaythrough && entranceSphere.size() > 0 && !noRandomEntrances) {
       playthroughEntrances.push_back(entranceSphere);
@@ -417,12 +429,14 @@ std::vector<uint32_t> GetAccessibleLocations(const std::vector<uint32_t>& allowe
 
   //Check to see if all locations were reached
   if (mode == SearchMode::AllLocationsReachable) {
-    allLocationsReachable = true;
-    for (const uint32_t loc : allLocations) {
-      if (!Location(loc)->IsAddedToPool()) {
-        allLocationsReachable = false;
-        auto message = "Location " + Location(loc)->GetName() + " not reachable\n";
-        SPDLOG_DEBUG(message);
+    ctx->allLocationsReachable = true;
+    for (const RandomizerCheck loc : ctx->allLocations) {
+      if (!ctx->GetItemLocation(loc)->IsAddedToPool()) {
+          ctx->allLocationsReachable = false;
+          auto message = "Location " +
+                         Rando::StaticData::GetLocation(ctx->GetItemLocation(loc)->GetRandomizerCheck())->GetName() +
+                         " not reachable\n";
+          SPDLOG_DEBUG(message);
         #ifndef ENABLE_DEBUG
           break;
         #endif
@@ -431,9 +445,9 @@ std::vector<uint32_t> GetAccessibleLocations(const std::vector<uint32_t>& allowe
     return {};
   }
 
-  erase_if(accessibleLocations, [&allowedLocations](uint32_t loc){
-    for (uint32_t allowedLocation : allowedLocations) {
-      if (loc == allowedLocation || Location(loc)->GetPlaceduint32_t() != NONE) {
+  erase_if(accessibleLocations, [&allowedLocations, ctx](RandomizerCheck loc){
+    for (RandomizerCheck allowedLocation : allowedLocations) {
+      if (loc == allowedLocation || ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() != RG_NONE) {
         return false;
       }
     }
@@ -443,67 +457,69 @@ std::vector<uint32_t> GetAccessibleLocations(const std::vector<uint32_t>& allowe
 }
 
 static void GeneratePlaythrough() {
-  playthroughBeatable = false;
-  LogicReset();
-  GetAccessibleLocations(allLocations, SearchMode::GeneratePlaythrough);
+    auto ctx = Rando::Context::GetInstance();
+    ctx->playthroughBeatable = false;
+    LogicReset();
+    GetAccessibleLocations(ctx->allLocations, SearchMode::GeneratePlaythrough);
 }
 
 //Remove unnecessary items from playthrough by removing their location, and checking if game is still beatable
 //To reduce searches, some preprocessing is done in playthrough generation to avoid adding obviously unnecessary items
 static void PareDownPlaythrough() {
-  std::vector<uint32_t> toAddBackItem;
+  auto ctx = Rando::Context::GetInstance();
+  std::vector<RandomizerCheck> toAddBackItem;
   //Start at sphere before Ganon's and count down
-  for (int i = playthroughLocations.size() - 2; i >= 0; i--) {
+  for (int i = ctx->playthroughLocations.size() - 2; i >= 0; i--) {
     //Check each item location in sphere
     std::vector<int> erasableIndices;
-    std::vector<uint32_t> sphere = playthroughLocations.at(i);
+    std::vector<RandomizerCheck> sphere = ctx->playthroughLocations.at(i);
     for (int j = sphere.size() - 1; j >= 0; j--) {
-      uint32_t loc = sphere.at(j);
-      uint32_t copy = Location(loc)->GetPlaceduint32_t(); //Copy out item
-      Location(loc)->SetPlacedItem(NONE); //Write in empty item
-      playthroughBeatable = false;
+      RandomizerCheck loc = sphere.at(j);
+      RandomizerGet copy = ctx->GetItemLocation(loc)->GetPlacedRandomizerGet(); //Copy out item
+      ctx->GetItemLocation(loc)->SetPlacedItem(RG_NONE); //Write in empty item
+      ctx->playthroughBeatable = false;
       LogicReset();
 
       std::string ignore = "";
-      if (ItemTable(copy).GetItemType() == ITEMTYPE_TOKEN) {
+      if (Rando::StaticData::RetrieveItem(copy).GetItemType() == ITEMTYPE_TOKEN) {
         ignore = "Tokens";
       }
-      else if (ItemTable(copy).GetName().GetEnglish().find("Bombchu") != std::string::npos) {
+      else if (Rando::StaticData::RetrieveItem(copy).GetName().GetEnglish().find("Bombchu") != std::string::npos) {
         ignore = "Bombchus";
       }
-      else if (ItemTable(copy).GetItemType() == ITEMTYPE_SHOP) {
-        ignore = GetShopItemBaseName(ItemTable(copy).GetName().GetEnglish());
+      else if (Rando::StaticData::RetrieveItem(copy).GetItemType() == ITEMTYPE_SHOP) {
+        ignore = GetShopItemBaseName(Rando::StaticData::RetrieveItem(copy).GetName().GetEnglish());
       }
 
-      GetAccessibleLocations(allLocations, SearchMode::CheckBeatable, ignore); //Check if game is still beatable
+      GetAccessibleLocations(ctx->allLocations, SearchMode::CheckBeatable, ignore); //Check if game is still beatable
 
       //Playthrough is still beatable without this item, therefore it can be removed from playthrough section.
-      if (playthroughBeatable) {
-        //Uncomment to print playthrough deletion log in citra
-        // std::string itemname(ItemTable(copy).GetName().GetEnglish());
-        // std::string locationname(Location(loc)->GetName());
-        // std::string removallog = itemname + " at " + locationname + " removed from playthrough";
-        // CitraPrint(removallog);
-        playthroughLocations[i].erase(playthroughLocations[i].begin() + j);
-        Location(loc)->SetDelayedItem(copy); //Game is still beatable, don't add back until later
+      if (ctx->playthroughBeatable) {
+        // Uncomment to print playthrough deletion log in citra
+        //  std::string itemname(Rando::StaticData::RetrieveItem(copy).GetName().GetEnglish());
+        //  std::string locationname(GetLocation(loc)->GetName());
+        //  std::string removallog = itemname + " at " + locationname + " removed from playthrough";
+        //  CitraPrint(removallog);
+        ctx->playthroughLocations[i].erase(ctx->playthroughLocations[i].begin() + j);
+        ctx->GetItemLocation(loc)->SetDelayedItem(copy); //Game is still beatable, don't add back until later
         toAddBackItem.push_back(loc);
       }
       else {
-        Location(loc)->SetPlacedItem(copy); //Immediately put item back so game is beatable again
+        ctx->GetItemLocation(loc)->SetPlacedItem(copy); //Immediately put item back so game is beatable again
       }
     }
   }
 
   //Some spheres may now be empty, remove these
-  for (int i = playthroughLocations.size() - 2; i >= 0; i--) {
-    if (playthroughLocations.at(i).size() == 0) {
-      playthroughLocations.erase(playthroughLocations.begin() + i);
+  for (int i = ctx->playthroughLocations.size() - 2; i >= 0; i--) {
+    if (ctx->playthroughLocations.at(i).size() == 0) {
+      ctx->playthroughLocations.erase(ctx->playthroughLocations.begin() + i);
     }
   }
 
   //Now we can add back items which were removed previously
-  for (uint32_t loc : toAddBackItem) {
-    Location(loc)->SaveDelayedItem();
+  for (RandomizerCheck loc : toAddBackItem) {
+    ctx->GetItemLocation(loc)->SaveDelayedItem();
   }
 }
 
@@ -512,48 +528,50 @@ static void PareDownPlaythrough() {
 // be obtained to logically be able to complete the seed, rather than playthrough items which
 // are just possible items you *can* collect to complete the seed.
 static void CalculateWotH() {
+  auto ctx = Rando::Context::GetInstance();
   //First copy locations from the 2-dimensional playthroughLocations into the 1-dimensional wothLocations
   //size - 1 so Triforce is not counted
-  for (size_t i = 0; i < playthroughLocations.size() - 1; i++) {
-    for (size_t j = 0; j < playthroughLocations[i].size(); j++) {
-      if (Location(playthroughLocations[i][j])->IsHintable()) {
-        wothLocations.push_back(playthroughLocations[i][j]);
+  for (size_t i = 0; i < ctx->playthroughLocations.size() - 1; i++) {
+    for (size_t j = 0; j < ctx->playthroughLocations[i].size(); j++) {
+      if (ctx->GetItemLocation(ctx->playthroughLocations[i][j])->IsHintable()) {
+        ctx->wothLocations.push_back(ctx->playthroughLocations[i][j]);
       }
     }
   }
 
   //Now go through and check each location, seeing if it is strictly necessary for game completion
-  for (int i = wothLocations.size() - 1; i >= 0; i--) {
-    uint32_t loc = wothLocations[i];
-    uint32_t copy = Location(loc)->GetPlaceduint32_t(); //Copy out item
-    Location(loc)->SetPlacedItem(NONE); //Write in empty item
-    playthroughBeatable = false;
+  for (int i = ctx->wothLocations.size() - 1; i >= 0; i--) {
+    RandomizerCheck loc = ctx->wothLocations[i];
+    RandomizerGet copy = ctx->GetItemLocation(loc)->GetPlacedRandomizerGet(); //Copy out item
+    ctx->GetItemLocation(loc)->SetPlacedItem(RG_NONE); //Write in empty item
+    ctx->playthroughBeatable = false;
     LogicReset();
-    GetAccessibleLocations(allLocations, SearchMode::CheckBeatable); //Check if game is still beatable
-    Location(loc)->SetPlacedItem(copy); //Immediately put item back
+    GetAccessibleLocations(ctx->allLocations, SearchMode::CheckBeatable); //Check if game is still beatable
+    ctx->GetItemLocation(loc)->SetPlacedItem(copy); //Immediately put item back
     //If removing this item and no other item caused the game to become unbeatable, then it is strictly necessary, so keep it
     //Else, delete from wothLocations
-    if (playthroughBeatable) {
-      wothLocations.erase(wothLocations.begin() + i);
+    if (ctx->playthroughBeatable) {
+      ctx->wothLocations.erase(ctx->wothLocations.begin() + i);
     }
   }
 
-  playthroughBeatable = true;
+  ctx->playthroughBeatable = true;
   LogicReset();
-  GetAccessibleLocations(allLocations);
+  GetAccessibleLocations(ctx->allLocations);
 }
 
 //Will place things completely randomly, no logic checks are performed
-static void FastFill(std::vector<uint32_t> items, std::vector<uint32_t> locations, bool endOnItemsEmpty = false) {
+static void FastFill(std::vector<RandomizerGet> items, std::vector<RandomizerCheck> locations, bool endOnItemsEmpty = false) {
+  auto ctx = Rando::Context::GetInstance();
   //Loop until locations are empty, or also end if items are empty and the parameters specify to end then
   while (!locations.empty() && (!endOnItemsEmpty || !items.empty())) {
     if (items.empty() && !endOnItemsEmpty) {
       items.push_back(GetJunkItem());
     }
 
-    uint32_t loc = RandomElement(locations, true);
-    Location(loc)->SetAsHintable();
-    PlaceItemInLocation(loc, RandomElement(items, true));
+    RandomizerCheck loc = RandomElement(locations, true);
+    ctx->GetItemLocation(loc)->SetAsHintable();
+    ctx->PlaceItemInLocation(loc, RandomElement(items, true));
   }
 }
 
@@ -564,21 +582,23 @@ static void FastFill(std::vector<uint32_t> items, std::vector<uint32_t> location
 | This method helps distribution of items locked behind many requirements.
 | - OoT Randomizer
 */
-static void AssumedFill(const std::vector<uint32_t>& items, const std::vector<uint32_t>& allowedLocations,
+static void AssumedFill(const std::vector<RandomizerGet>& items, const std::vector<RandomizerCheck>& allowedLocations,
                         bool setLocationsAsHintable = false) {
-
+    auto ctx = Rando::Context::GetInstance();
     if (items.size() > allowedLocations.size()) {
         printf("\x1b[2;2HERROR: MORE ITEMS THAN LOCATIONS IN GIVEN LISTS");
         SPDLOG_DEBUG("Items:\n");
-        for (const uint32_t item : items) {
+        // NOLINTNEXTLINE(clang-diagnostic-unused-variable)
+        for (const RandomizerGet item : items) {
             SPDLOG_DEBUG("\t");
-            SPDLOG_DEBUG(ItemTable(item).GetName().GetEnglish());
+            SPDLOG_DEBUG(Rando::StaticData::RetrieveItem(item).GetName().GetEnglish());
             SPDLOG_DEBUG("\n");
         }
         SPDLOG_DEBUG("\nAllowed Locations:\n");
-        for (const uint32_t loc : allowedLocations) {
+        // NOLINTNEXTLINE(clang-diagnostic-unused-variable)
+        for (const RandomizerCheck loc : allowedLocations) {
             SPDLOG_DEBUG("\t");
-            SPDLOG_DEBUG(Location(loc)->GetName());
+            SPDLOG_DEBUG(Rando::StaticData::GetLocation(loc)->GetName());
             SPDLOG_DEBUG("\n");
         }
         placementFailure = true;
@@ -593,7 +613,7 @@ static void AssumedFill(const std::vector<uint32_t>& items, const std::vector<ui
     // keep retrying to place everything until it works or takes too long
     int retries = 10;
     bool unsuccessfulPlacement = false;
-    std::vector<uint32_t> attemptedLocations;
+    std::vector<RandomizerCheck> attemptedLocations;
     do {
         retries--;
         if (retries <= 0) {
@@ -601,47 +621,47 @@ static void AssumedFill(const std::vector<uint32_t>& items, const std::vector<ui
             return;
         }
         unsuccessfulPlacement = false;
-        std::vector<uint32_t> itemsToPlace = items;
+        std::vector<RandomizerGet> itemsToPlace = items;
 
         // copy all not yet placed advancement items so that we can apply their effects for the fill algorithm
-        std::vector<uint32_t> itemsToNotPlace =
-            FilterFromPool(ItemPool, [](const auto i) { return ItemTable(i).IsAdvancement(); });
+        std::vector<RandomizerGet> itemsToNotPlace =
+            FilterFromPool(ItemPool, [](const auto i) { return Rando::StaticData::RetrieveItem(i).IsAdvancement(); });
 
         // shuffle the order of items to place
         Shuffle(itemsToPlace);
         while (!itemsToPlace.empty()) {
-            uint32_t item = std::move(itemsToPlace.back());
-            ItemTable(item).SetAsPlaythrough();
+            RandomizerGet item = std::move(itemsToPlace.back());
+            Rando::StaticData::RetrieveItem(item).SetAsPlaythrough();
             itemsToPlace.pop_back();
 
             // assume we have all unplaced items
             LogicReset();
-            for (uint32_t unplacedItem : itemsToPlace) {
-                ItemTable(unplacedItem).ApplyEffect();
+            for (RandomizerGet unplacedItem : itemsToPlace) {
+                Rando::StaticData::RetrieveItem(unplacedItem).ApplyEffect();
             }
-            for (uint32_t unplacedItem : itemsToNotPlace) {
-                ItemTable(unplacedItem).ApplyEffect();
+            for (RandomizerGet unplacedItem : itemsToNotPlace) {
+                Rando::StaticData::RetrieveItem(unplacedItem).ApplyEffect();
             }
 
             // get all accessible locations that are allowed
-            const std::vector<uint32_t> accessibleLocations = GetAccessibleLocations(allowedLocations);
+            const std::vector<RandomizerCheck> accessibleLocations = GetAccessibleLocations(allowedLocations);
 
             // retry if there are no more locations to place items
             if (accessibleLocations.empty()) {
 
                 SPDLOG_DEBUG("\nCANNOT PLACE ");
-                SPDLOG_DEBUG(ItemTable(item).GetName().GetEnglish());
+                SPDLOG_DEBUG(Rando::StaticData::RetrieveItem(item).GetName().GetEnglish());
                 SPDLOG_DEBUG(". TRYING AGAIN...\n");
 
 #ifdef ENABLE_DEBUG
-                Areas::DumpWorldGraph(ItemTable(item).GetName().GetEnglish());
+                Areas::DumpWorldGraph(Rando::StaticData::RetrieveItem(item).GetName().GetEnglish());
                 PlacementLog_Write();
 #endif
 
                 // reset any locations that got an item
-                for (uint32_t loc : attemptedLocations) {
-                    Location(loc)->SetPlacedItem(NONE);
-                    itemsPlaced--;
+                for (RandomizerCheck loc : attemptedLocations) {
+                    ctx->GetItemLocation(loc)->SetPlacedItem(RG_NONE);
+                    //itemsPlaced--;
                 }
                 attemptedLocations.clear();
 
@@ -650,24 +670,24 @@ static void AssumedFill(const std::vector<uint32_t>& items, const std::vector<ui
             }
 
             // place the item within one of the allowed locations
-            uint32_t selectedLocation = RandomElement(accessibleLocations);
-            PlaceItemInLocation(selectedLocation, item);
+            RandomizerCheck selectedLocation = RandomElement(accessibleLocations);
+            ctx->PlaceItemInLocation(selectedLocation, item);
             attemptedLocations.push_back(selectedLocation);
 
             // This tells us the location went through the randomization algorithm
             // to distinguish it from locations which did not or that the player already
             // knows
             if (setLocationsAsHintable) {
-                Location(selectedLocation)->SetAsHintable();
+                ctx->GetItemLocation(selectedLocation)->SetAsHintable();
             }
 
             // If ALR is off, then we check beatability after placing the item.
             // If the game is beatable, then we can stop placing items with logic.
             if (!LocationsReachable) {
-                playthroughBeatable = false;
+                ctx->playthroughBeatable = false;
                 LogicReset();
-                GetAccessibleLocations(allLocations, SearchMode::CheckBeatable);
-                if (playthroughBeatable) {
+                GetAccessibleLocations(ctx->allLocations, SearchMode::CheckBeatable);
+                if (ctx->playthroughBeatable) {
                     SPDLOG_DEBUG("Game beatable, now placing items randomly. " + std::to_string(itemsToPlace.size()) +
                                 " major items remaining.\n\n");
                     FastFill(itemsToPlace, GetEmptyLocations(allowedLocations), true);
@@ -681,7 +701,7 @@ static void AssumedFill(const std::vector<uint32_t>& items, const std::vector<ui
 //This function will specifically randomize dungeon rewards for the End of Dungeons
 //setting, or randomize one dungeon reward to Link's Pocket if that setting is on
 static void RandomizeDungeonRewards() {
-
+  auto ctx = Rando::Context::GetInstance();
   //quest item bit mask of each stone/medallion for the savefile
   static constexpr std::array<uint32_t, 9> bitMaskTable = {
     0x00040000, //Kokiri Emerald
@@ -694,99 +714,102 @@ static void RandomizeDungeonRewards() {
     0x00000010, //Shadow Medallion
     0x00000020, //Light Medallion
   };
-  int baseOffset = ItemTable(KOKIRI_EMERALD).GetItemID();
+  int baseOffset = Rando::StaticData::RetrieveItem(RG_KOKIRI_EMERALD).GetItemID();
 
   //End of Dungeons includes Link's Pocket
   if (ShuffleRewards.Is(REWARDSHUFFLE_END_OF_DUNGEON)) {
     //get stones and medallions
-    std::vector<uint32_t> rewards = FilterAndEraseFromPool(ItemPool, [](const auto i) {return ItemTable(i).GetItemType() == ITEMTYPE_DUNGEONREWARD;});
+    std::vector<RandomizerGet> rewards = FilterAndEraseFromPool(ItemPool, [](const auto i) {return Rando::StaticData::RetrieveItem(i).GetItemType() == ITEMTYPE_DUNGEONREWARD;});
 
     // If there are less than 9 dungeon rewards, prioritize the actual dungeons
     // for placement instead of Link's Pocket
     if (rewards.size() < 9) {
-      PlaceItemInLocation(LINKS_POCKET, GREEN_RUPEE);
+      ctx->PlaceItemInLocation(RC_LINKS_POCKET, RG_GREEN_RUPEE);
     }
 
     if (Settings::Logic.Is(LOGIC_VANILLA)) { //Place dungeon rewards in vanilla locations
-      for (uint32_t loc : dungeonRewardLocations) {
-        Location(loc)->PlaceVanillaItem();
+      for (RandomizerCheck loc : Rando::StaticData::dungeonRewardLocations) {
+        ctx->GetItemLocation(loc)->PlaceVanillaItem();
       }
     } else { //Randomize dungeon rewards with assumed fill
-      AssumedFill(rewards, dungeonRewardLocations);
+      AssumedFill(rewards, Rando::StaticData::dungeonRewardLocations);
     }
 
-    for (size_t i = 0; i < dungeonRewardLocations.size(); i++) {
-      const auto index = Location(dungeonRewardLocations[i])->GetPlacedItem().GetItemID() - baseOffset;
+    for (size_t i = 0; i < Rando::StaticData::dungeonRewardLocations.size(); i++) {
+      const auto index = ctx->GetItemLocation(Rando::StaticData::dungeonRewardLocations[i])->GetPlacedItem().GetItemID() - baseOffset;
       rDungeonRewardOverrides[i] = index;
 
       //set the player's dungeon reward on file creation instead of pushing it to them at the start.
       //This is done mainly because players are already familiar with seeing their dungeon reward
       //before opening up their file
-      if (i == dungeonRewardLocations.size()-1) {
+      if (i == Rando::StaticData::dungeonRewardLocations.size()-1) {
         LinksPocketRewardBitMask = bitMaskTable[index];
       }
     }
   } else if (LinksPocketItem.Is(LINKSPOCKETITEM_DUNGEON_REWARD)) {
     //get 1 stone/medallion
-    std::vector<uint32_t> rewards = FilterFromPool(ItemPool, [](const auto i) {return ItemTable(i).GetItemType() == ITEMTYPE_DUNGEONREWARD;});
+    std::vector<RandomizerGet> rewards = FilterFromPool(
+        ItemPool, [](const auto i) { return Rando::StaticData::RetrieveItem(i).GetItemType() == ITEMTYPE_DUNGEONREWARD; });
     // If there are no remaining stones/medallions, then Link's pocket won't get one
     if (rewards.empty()) {
-      PlaceItemInLocation(LINKS_POCKET, GREEN_RUPEE);
+      ctx->PlaceItemInLocation(RC_LINKS_POCKET, RG_GREEN_RUPEE);
       return;
     }
-    uint32_t startingReward = RandomElement(rewards, true);
+    RandomizerGet startingReward = RandomElement(rewards, true);
 
-    LinksPocketRewardBitMask = bitMaskTable[ItemTable(startingReward).GetItemID() - baseOffset];
-    PlaceItemInLocation(LINKS_POCKET, startingReward);
+    LinksPocketRewardBitMask = bitMaskTable[Rando::StaticData::RetrieveItem(startingReward).GetItemID() - baseOffset];
+    ctx->PlaceItemInLocation(RC_LINKS_POCKET, startingReward);
     //erase the stone/medallion from the Item Pool
-    FilterAndEraseFromPool(ItemPool, [startingReward](const uint32_t i) {return i == startingReward;});
+    FilterAndEraseFromPool(ItemPool, [startingReward](const RandomizerGet i) {return i == startingReward;});
   }
 }
 
 //Fills any locations excluded by the player with junk items so that advancement items
 //can't be placed there.
 static void FillExcludedLocations() {
+  auto ctx = Rando::Context::GetInstance();
   //Only fill in excluded locations that don't already have something and are forbidden
-  std::vector<uint32_t> excludedLocations = FilterFromPool(allLocations, [](const auto loc){
-    return Location(loc)->IsExcluded();
+  std::vector<RandomizerCheck> excludedLocations = FilterFromPool(ctx->allLocations, [ctx](const auto loc){
+    return ctx->GetItemLocation(loc)->IsExcluded();
   });
 
-  for (uint32_t loc : excludedLocations) {
+  for (RandomizerCheck loc : excludedLocations) {
     PlaceJunkInExcludedLocation(loc);
   }
 }
 
 //Function to handle the Own Dungeon setting
 static void RandomizeOwnDungeon(const Dungeon::DungeonInfo* dungeon) {
-  std::vector<uint32_t> dungeonItems;
+  auto ctx = Rando::Context::GetInstance();
+  std::vector<RandomizerGet> dungeonItems;
 
   // Search and filter for locations that match the hint region of the dungeon
   // This accounts for boss room shuffle so that own dungeon items can be placed
   // in the shuffled boss room
-  std::vector<LocationKey> dungeonLocations = FilterFromPool(allLocations, [dungeon](const auto loc) {
-    return GetHintRegionHintKey(Location(loc)->GetParentRegionKey()) == dungeon->GetHintKey();
+  std::vector<RandomizerCheck> dungeonLocations = FilterFromPool(ctx->allLocations, [dungeon, ctx](const auto loc) {
+    return GetHintRegionHintKey(ctx->GetItemLocation(loc)->GetParentRegionKey()) == dungeon->GetHintKey();
   });
 
   //filter out locations that may be required to have songs placed at them
   dungeonLocations = FilterFromPool(dungeonLocations, [](const auto loc){
     if (ShuffleSongs.Is(SONGSHUFFLE_SONG_LOCATIONS)) {
-      return !(Location(loc)->IsCategory(Category::cSong));
+      return !(Rando::StaticData::GetLocation(loc)->IsCategory(Category::cSong));
     }
     if (ShuffleSongs.Is(SONGSHUFFLE_DUNGEON_REWARDS)) {
-      return !(Location(loc)->IsCategory(Category::cSongDungeonReward));
+      return !(Rando::StaticData::GetLocation(loc)->IsCategory(Category::cSongDungeonReward));
     }
     return true;
   });
 
   //Add specific items that need be randomized within this dungeon
-  if (Keysanity.Is(KEYSANITY_OWN_DUNGEON) && dungeon->GetSmallKey() != NONE) {
-    std::vector<uint32_t> dungeonSmallKeys = FilterAndEraseFromPool(ItemPool, [dungeon](const uint32_t i){ return (i == dungeon->GetSmallKey()) || (i == dungeon->GetKeyRing());});
+  if (Keysanity.Is(KEYSANITY_OWN_DUNGEON) && dungeon->GetSmallKey() != RG_NONE) {
+    std::vector<RandomizerGet> dungeonSmallKeys = FilterAndEraseFromPool(ItemPool, [dungeon](const RandomizerGet i){ return (i == dungeon->GetSmallKey()) || (i == dungeon->GetKeyRing());});
     AddElementsToPool(dungeonItems, dungeonSmallKeys);
   }
 
-  if ((BossKeysanity.Is(BOSSKEYSANITY_OWN_DUNGEON) && dungeon->GetBossKey() != GANONS_CASTLE_BOSS_KEY) ||
-      (GanonsBossKey.Is(GANONSBOSSKEY_OWN_DUNGEON) && dungeon->GetBossKey() == GANONS_CASTLE_BOSS_KEY)) {
-        auto dungeonBossKey = FilterAndEraseFromPool(ItemPool, [dungeon](const uint32_t i){ return i == dungeon->GetBossKey();});
+  if ((BossKeysanity.Is(BOSSKEYSANITY_OWN_DUNGEON) && dungeon->GetBossKey() != RG_GANONS_CASTLE_BOSS_KEY) ||
+      (GanonsBossKey.Is(GANONSBOSSKEY_OWN_DUNGEON) && dungeon->GetBossKey() == RG_GANONS_CASTLE_BOSS_KEY)) {
+        auto dungeonBossKey = FilterAndEraseFromPool(ItemPool, [dungeon](const RandomizerGet i){ return i == dungeon->GetBossKey();});
         AddElementsToPool(dungeonItems, dungeonBossKey);
   }
 
@@ -794,8 +817,8 @@ static void RandomizeOwnDungeon(const Dungeon::DungeonInfo* dungeon) {
   AssumedFill(dungeonItems, dungeonLocations);
 
   //randomize map and compass separately since they're not progressive
-  if (MapsAndCompasses.Is(MAPSANDCOMPASSES_OWN_DUNGEON) && dungeon->GetMap() != NONE && dungeon->GetCompass() != NONE) {
-    auto dungeonMapAndCompass = FilterAndEraseFromPool(ItemPool, [dungeon](const uint32_t i){ return i == dungeon->GetMap() || i == dungeon->GetCompass();});
+  if (MapsAndCompasses.Is(MAPSANDCOMPASSES_OWN_DUNGEON) && dungeon->GetMap() != RG_NONE && dungeon->GetCompass() != RG_NONE) {
+    auto dungeonMapAndCompass = FilterAndEraseFromPool(ItemPool, [dungeon](const RandomizerGet i){ return i == dungeon->GetMap() || i == dungeon->GetCompass();});
     AssumedFill(dungeonMapAndCompass, dungeonLocations);
   }
 }
@@ -809,103 +832,106 @@ static void RandomizeOwnDungeon(const Dungeon::DungeonInfo* dungeon) {
   will be randomized together if they have the same setting. Maps and Compasses
   are randomized separately once the dungeon advancement items have all been placed.*/
 static void RandomizeDungeonItems() {
+  auto ctx = Rando::Context::GetInstance();
   using namespace Dungeon;
 
   //Get Any Dungeon and Overworld group locations
-  std::vector<uint32_t> anyDungeonLocations = FilterFromPool(allLocations, [](const auto loc){return Location(loc)->IsDungeon();});
+  std::vector<RandomizerCheck> anyDungeonLocations = FilterFromPool(ctx->allLocations, [](const auto loc){return Rando::StaticData::GetLocation(loc)->IsDungeon();});
   //overworldLocations defined in item_location.cpp
 
   //Create Any Dungeon and Overworld item pools
-  std::vector<uint32_t> anyDungeonItems;
-  std::vector<uint32_t> overworldItems;
+  std::vector<RandomizerGet> anyDungeonItems;
+  std::vector<RandomizerGet> overworldItems;
 
   for (auto dungeon : dungeonList) {
     if (Keysanity.Is(KEYSANITY_ANY_DUNGEON)) {
-      auto dungeonKeys = FilterAndEraseFromPool(ItemPool, [dungeon](const uint32_t i){return (i == dungeon->GetSmallKey()) || (i == dungeon->GetKeyRing());});
+      auto dungeonKeys = FilterAndEraseFromPool(ItemPool, [dungeon](const RandomizerGet i){return (i == dungeon->GetSmallKey()) || (i == dungeon->GetKeyRing());});
       AddElementsToPool(anyDungeonItems, dungeonKeys);
     } else if (Keysanity.Is(KEYSANITY_OVERWORLD)) {
-      auto dungeonKeys = FilterAndEraseFromPool(ItemPool, [dungeon](const uint32_t i){return (i == dungeon->GetSmallKey()) || (i == dungeon->GetKeyRing());});
+      auto dungeonKeys = FilterAndEraseFromPool(ItemPool, [dungeon](const RandomizerGet i){return (i == dungeon->GetSmallKey()) || (i == dungeon->GetKeyRing());});
       AddElementsToPool(overworldItems, dungeonKeys);
     }
 
-    if (BossKeysanity.Is(BOSSKEYSANITY_ANY_DUNGEON) && dungeon->GetBossKey() != GANONS_CASTLE_BOSS_KEY) {
-      auto bossKey = FilterAndEraseFromPool(ItemPool, [dungeon](const uint32_t i){return i == dungeon->GetBossKey();});
+    if (BossKeysanity.Is(BOSSKEYSANITY_ANY_DUNGEON) && dungeon->GetBossKey() != RG_GANONS_CASTLE_BOSS_KEY) {
+      auto bossKey = FilterAndEraseFromPool(ItemPool, [dungeon](const RandomizerGet i){return i == dungeon->GetBossKey();});
       AddElementsToPool(anyDungeonItems, bossKey);
-    } else if (BossKeysanity.Is(BOSSKEYSANITY_OVERWORLD) && dungeon->GetBossKey() != GANONS_CASTLE_BOSS_KEY) {
-      auto bossKey = FilterAndEraseFromPool(ItemPool, [dungeon](const uint32_t i){return i == dungeon->GetBossKey();});
+    } else if (BossKeysanity.Is(BOSSKEYSANITY_OVERWORLD) && dungeon->GetBossKey() != RG_GANONS_CASTLE_BOSS_KEY) {
+      auto bossKey = FilterAndEraseFromPool(ItemPool, [dungeon](const RandomizerGet i){return i == dungeon->GetBossKey();});
       AddElementsToPool(overworldItems, bossKey);
     }
 
     if (GanonsBossKey.Is(GANONSBOSSKEY_ANY_DUNGEON)) {
-      auto ganonBossKey = FilterAndEraseFromPool(ItemPool, [](const auto i){return i == GANONS_CASTLE_BOSS_KEY;});
+      auto ganonBossKey = FilterAndEraseFromPool(ItemPool, [](const auto i){return i == RG_GANONS_CASTLE_BOSS_KEY;});
       AddElementsToPool(anyDungeonItems, ganonBossKey);
     } else if (GanonsBossKey.Is(GANONSBOSSKEY_OVERWORLD)) {
-        auto ganonBossKey = FilterAndEraseFromPool(ItemPool, [](const auto i) { return i == GANONS_CASTLE_BOSS_KEY; });
+        auto ganonBossKey = FilterAndEraseFromPool(ItemPool, [](const auto i) { return i == RG_GANONS_CASTLE_BOSS_KEY; });
       AddElementsToPool(overworldItems, ganonBossKey);
     }
   }
 
   if (GerudoKeys.Is(GERUDOKEYS_ANY_DUNGEON)) {
-      auto gerudoKeys = FilterAndEraseFromPool(ItemPool, [](const auto i) { return i == GERUDO_FORTRESS_SMALL_KEY; });
+      auto gerudoKeys = FilterAndEraseFromPool(ItemPool, [](const auto i) { return i == RG_GERUDO_FORTRESS_SMALL_KEY; });
     AddElementsToPool(anyDungeonItems, gerudoKeys);
   } else if (GerudoKeys.Is(GERUDOKEYS_OVERWORLD)) {
-      auto gerudoKeys = FilterAndEraseFromPool(ItemPool, [](const auto i) { return i == GERUDO_FORTRESS_SMALL_KEY; });
+      auto gerudoKeys = FilterAndEraseFromPool(ItemPool, [](const auto i) { return i == RG_GERUDO_FORTRESS_SMALL_KEY; });
     AddElementsToPool(overworldItems, gerudoKeys);
   }
 
   if (ShuffleRewards.Is(REWARDSHUFFLE_ANY_DUNGEON)) {
       auto rewards = FilterAndEraseFromPool(
-          ItemPool, [](const auto i) { return ItemTable(i).GetItemType() == ITEMTYPE_DUNGEONREWARD; });
+          ItemPool, [](const auto i) { return Rando::StaticData::RetrieveItem(i).GetItemType() == ITEMTYPE_DUNGEONREWARD; });
     AddElementsToPool(anyDungeonItems, rewards);
   } else if (ShuffleRewards.Is(REWARDSHUFFLE_OVERWORLD)) {
       auto rewards = FilterAndEraseFromPool(
-          ItemPool, [](const auto i) { return ItemTable(i).GetItemType() == ITEMTYPE_DUNGEONREWARD; });
+          ItemPool, [](const auto i) { return Rando::StaticData::RetrieveItem(i).GetItemType() == ITEMTYPE_DUNGEONREWARD; });
     AddElementsToPool(overworldItems, rewards);
   }
 
   //Randomize Any Dungeon and Overworld pools
   AssumedFill(anyDungeonItems, anyDungeonLocations, true);
-  AssumedFill(overworldItems, overworldLocations, true);
+  AssumedFill(overworldItems, Rando::StaticData::overworldLocations, true);
 
   //Randomize maps and compasses after since they're not advancement items
   for (auto dungeon : dungeonList) {
     if (MapsAndCompasses.Is(MAPSANDCOMPASSES_ANY_DUNGEON)) {
-      auto mapAndCompassItems = FilterAndEraseFromPool(ItemPool, [dungeon](const uint32_t i){return i == dungeon->GetMap() || i == dungeon->GetCompass();});
+      auto mapAndCompassItems = FilterAndEraseFromPool(ItemPool, [dungeon](const RandomizerGet i){return i == dungeon->GetMap() || i == dungeon->GetCompass();});
       AssumedFill(mapAndCompassItems, anyDungeonLocations, true);
     } else if (MapsAndCompasses.Is(MAPSANDCOMPASSES_OVERWORLD)) {
-      auto mapAndCompassItems = FilterAndEraseFromPool(ItemPool, [dungeon](const uint32_t i){return i == dungeon->GetMap() || i == dungeon->GetCompass();});
-      AssumedFill(mapAndCompassItems, overworldLocations, true);
+      auto mapAndCompassItems = FilterAndEraseFromPool(ItemPool, [dungeon](const RandomizerGet i){return i == dungeon->GetMap() || i == dungeon->GetCompass();});
+      AssumedFill(mapAndCompassItems, Rando::StaticData::overworldLocations, true);
     }
   }
 }
 
 static void RandomizeLinksPocket() {
+  auto ctx = Rando::Context::GetInstance();
   if (LinksPocketItem.Is(LINKSPOCKETITEM_ADVANCEMENT)) {
    //Get all the advancement items                                                                                                     don't include tokens
-      std::vector<uint32_t> advancementItems = FilterAndEraseFromPool(ItemPool, [](const auto i) {
-          return ItemTable(i).IsAdvancement() && ItemTable(i).GetItemType() != ITEMTYPE_TOKEN;
+      std::vector<RandomizerGet> advancementItems = FilterAndEraseFromPool(ItemPool, [](const auto i) {
+          return Rando::StaticData::RetrieveItem(i).IsAdvancement() && Rando::StaticData::RetrieveItem(i).GetItemType() != ITEMTYPE_TOKEN;
       });
    //select a random one
-   uint32_t startingItem = RandomElement(advancementItems, true);
+   RandomizerGet startingItem = RandomElement(advancementItems, true);
    //add the others back
    AddElementsToPool(ItemPool, advancementItems);
 
-   PlaceItemInLocation(LINKS_POCKET, startingItem);
+   ctx->PlaceItemInLocation(RC_LINKS_POCKET, startingItem);
  } else if (LinksPocketItem.Is(LINKSPOCKETITEM_NOTHING)) {
-   PlaceItemInLocation(LINKS_POCKET, GREEN_RUPEE);
+   ctx->PlaceItemInLocation(RC_LINKS_POCKET, RG_GREEN_RUPEE);
  }
 }
 
 void VanillaFill() {
+  auto ctx = Rando::Context::GetInstance();
   //Perform minimum needed initialization
   AreaTable_Init();
-  GenerateLocationPool();
+  ctx->GenerateLocationPool();
   GenerateItemPool();
   GenerateStartingInventory();
   //Place vanilla item in each location
   RandomizeDungeonRewards();
-  for (uint32_t loc : allLocations) {
-    Location(loc)->PlaceVanillaItem();
+  for (RandomizerCheck loc : ctx->allLocations) {
+    ctx->GetItemLocation(loc)->PlaceVanillaItem();
   }
   //If necessary, handle ER stuff
   if (ShuffleEntrances) {
@@ -914,7 +940,7 @@ void VanillaFill() {
     printf("\x1b[7;32HDone");
   }
   //Finish up
-  CreateItemOverrides();
+  ctx->CreateItemOverrides();
   CreateEntranceOverrides();
   CreateWarpSongTexts();
 }
@@ -928,17 +954,17 @@ void ClearProgress() {
 }
 
 int Fill() {
-
+  auto ctx = Rando::Context::GetInstance();
   int retries = 0;
   while(retries < 5) {
     placementFailure = false;
-    showItemProgress = false;
-    playthroughLocations.clear();
+    //showItemProgress = false;
+    ctx->playthroughLocations.clear();
     playthroughEntrances.clear();
-    wothLocations.clear();
+    ctx->wothLocations.clear();
     AreaTable_Init(); //Reset the world graph to intialize the proper locations
-    ItemReset(); //Reset shops incase of shopsanity random
-    GenerateLocationPool();
+    ctx->ItemReset(); //Reset shops incase of shopsanity random
+    ctx->GenerateLocationPool();
     GenerateItemPool();
     GenerateStartingInventory();
     RemoveStartingItemsFromPool();
@@ -957,9 +983,9 @@ int Fill() {
       printf("\x1b[7;32HDone");
     }
     //erase temporary shop items
-    FilterAndEraseFromPool(ItemPool, [](const auto item) { return ItemTable(item).GetItemType() == ITEMTYPE_SHOP; });
+    FilterAndEraseFromPool(ItemPool, [](const auto item) { return Rando::StaticData::RetrieveItem(item).GetItemType() == ITEMTYPE_SHOP; });
 
-    showItemProgress = true;
+    //ctx->showItemProgress = true;
     //Place shop items first, since a buy shield is needed to place a dungeon reward on Gohma due to access
     NonShopItems = {};
     if (Shopsanity.Is(SHOPSANITY_OFF)) {
@@ -976,27 +1002,28 @@ int Fill() {
         //Indices from OoTR. So shopsanity one will overwrite 7, three will overwrite 7, 5, 8, etc.
         const std::array<int, 4> indices = {7, 5, 8, 6};
         //Overwrite appropriate number of shop items
-        for (size_t i = 0; i < ShopLocationLists.size(); i++) {
+        for (size_t i = 0; i < Rando::StaticData::shopLocationLists.size(); i++) {
           int num_to_replace = GetShopsanityReplaceAmount(); //1-4 shop items will be overwritten, depending on settings
           total_replaced += num_to_replace;
           for (int j = 0; j < num_to_replace; j++) {
             int itemindex = indices[j];
             int shopsanityPrice = GetRandomShopPrice();
-            NonShopItems[TransformShopIndex(i*8+itemindex-1)].Price = shopsanityPrice; //Set price to be retrieved by the patch and textboxes
-            Location(ShopLocationLists[i][itemindex - 1])->SetShopsanityPrice(shopsanityPrice);
+            NonShopItems[TransformShopIndex(i * 8 + itemindex - 1)].Price =
+                shopsanityPrice; // Set price to be retrieved by the patch and textboxes
+            ctx->GetItemLocation(Rando::StaticData::shopLocationLists[i][itemindex - 1])->SetShopsanityPrice(shopsanityPrice);
           }
         }
       }
       //Get all locations and items that don't have a shopsanity price attached
-      std::vector<uint32_t> shopLocations = {};
+      std::vector<RandomizerCheck> shopLocations = {};
       //Get as many vanilla shop items as the total number of shop items minus the number of replaced items
       //So shopsanity 0 will get all 64 vanilla items, shopsanity 4 will get 32, etc.
-      std::vector<uint32_t> shopItems = GetMinVanillaShopItems(total_replaced);
+      std::vector<RandomizerGet> shopItems = GetMinVanillaShopItems(total_replaced);
 
-      for (size_t i = 0; i < ShopLocationLists.size(); i++) {
-        for (size_t j = 0; j < ShopLocationLists[i].size(); j++) {
-          uint32_t loc = ShopLocationLists[i][j];
-          if (!(Location(loc)->HasShopsanityPrice())) {
+      for (size_t i = 0; i < Rando::StaticData::shopLocationLists.size(); i++) {
+        for (size_t j = 0; j < Rando::StaticData::shopLocationLists[i].size(); j++) {
+          RandomizerCheck loc = Rando::StaticData::shopLocationLists[i][j];
+          if (!(ctx->GetItemLocation(loc)->HasShopsanityPrice())) {
             shopLocations.push_back(loc);
           }
         }
@@ -1017,18 +1044,19 @@ int Fill() {
     if (ShuffleSongs.IsNot(SONGSHUFFLE_ANYWHERE)) {
 
       //Get each song
-        std::vector<uint32_t> songs =
-            FilterAndEraseFromPool(ItemPool, [](const auto i) { return ItemTable(i).GetItemType() == ITEMTYPE_SONG; });
+      std::vector<RandomizerGet> songs = FilterAndEraseFromPool(
+          ItemPool, [](const auto i) { return Rando::StaticData::RetrieveItem(i).GetItemType() == ITEMTYPE_SONG; });
 
       //Get each song location
-      std::vector<uint32_t> songLocations;
+      std::vector<RandomizerCheck> songLocations;
       if (ShuffleSongs.Is(SONGSHUFFLE_SONG_LOCATIONS)) {
-          songLocations =
-              FilterFromPool(allLocations, [](const auto loc) { return Location(loc)->IsCategory(Category::cSong); });
+          songLocations = FilterFromPool(
+              ctx->allLocations, [](const auto loc) { return Rando::StaticData::GetLocation(loc)->IsCategory(Category::cSong); });
 
       } else if (ShuffleSongs.Is(SONGSHUFFLE_DUNGEON_REWARDS)) {
-          songLocations = FilterFromPool(
-              allLocations, [](const auto loc) { return Location(loc)->IsCategory(Category::cSongDungeonReward); });
+          songLocations = FilterFromPool(ctx->allLocations, [](const auto loc) {
+              return Rando::StaticData::GetLocation(loc)->IsCategory(Category::cSongDungeonReward);
+          });
       }
 
       AssumedFill(songs, songLocations, true);
@@ -1040,35 +1068,35 @@ int Fill() {
     //Then place Link's Pocket Item if it has to be an advancement item
     RandomizeLinksPocket();
     //Then place the rest of the advancement items
-    std::vector<uint32_t> remainingAdvancementItems =
-        FilterAndEraseFromPool(ItemPool, [](const auto i) { return ItemTable(i).IsAdvancement(); });
-    AssumedFill(remainingAdvancementItems, allLocations, true);
+    std::vector<RandomizerGet> remainingAdvancementItems =
+        FilterAndEraseFromPool(ItemPool, [](const auto i) { return Rando::StaticData::RetrieveItem(i).IsAdvancement(); });
+    AssumedFill(remainingAdvancementItems, ctx->allLocations, true);
 
     //Fast fill for the rest of the pool
-    std::vector<uint32_t> remainingPool = FilterAndEraseFromPool(ItemPool, [](const auto i) { return true; });
+    std::vector<RandomizerGet> remainingPool = FilterAndEraseFromPool(ItemPool, [](const auto i) { return true; });
     FastFill(remainingPool, GetAllEmptyLocations(), false);
 
     //Add prices for scrubsanity, this is unique to SoH because we write/read scrub prices to/from the spoilerfile.
     if (Scrubsanity.Is(SCRUBSANITY_AFFORDABLE)) {
-      for (size_t i = 0; i < ScrubLocations.size(); i++) {
-        Location(ScrubLocations[i])->SetScrubsanityPrice(10);
+      for (size_t i = 0; i < Rando::StaticData::scrubLocations.size(); i++) {
+        ctx->GetItemLocation(Rando::StaticData::scrubLocations[i])->SetScrubsanityPrice(10);
       }
     } else if (Scrubsanity.Is(SCRUBSANITY_RANDOM_PRICES)) {
-      for (size_t i = 0; i < ScrubLocations.size(); i++) {
+      for (size_t i = 0; i < Rando::StaticData::scrubLocations.size(); i++) {
         int randomPrice = GetRandomScrubPrice();
-        Location(ScrubLocations[i])->SetScrubsanityPrice(randomPrice);
+        ctx->GetItemLocation(Rando::StaticData::scrubLocations[i])->SetScrubsanityPrice(randomPrice);
       }
     }
 
     GeneratePlaythrough();
     //Successful placement, produced beatable result
-    if(playthroughBeatable && !placementFailure) {
+    if(ctx->playthroughBeatable && !placementFailure) {
       printf("Done");
       printf("\x1b[9;10HCalculating Playthrough...");
       PareDownPlaythrough();
       CalculateWotH();
       printf("Done");
-      CreateItemOverrides();
+      ctx->CreateItemOverrides();
       CreateEntranceOverrides();
       if (GossipStoneHints.IsNot(HINTS_NO_HINTS)) {
         printf("\x1b[10;10HCreating Hints...");
diff --git a/soh/soh/Enhancements/randomizer/3drando/fill.hpp b/soh/soh/Enhancements/randomizer/3drando/fill.hpp
index 427668985..0b0ab59d8 100644
--- a/soh/soh/Enhancements/randomizer/3drando/fill.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/fill.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "keys.hpp"
+#include "../randomizerTypes.h"
 
 #include <vector>
 #include <string>
@@ -21,7 +21,7 @@ void ClearProgress();
 void VanillaFill();
 int Fill();
 
-std::vector<uint32_t> GetAccessibleLocations(const std::vector<uint32_t>& allowedLocations,
+std::vector<RandomizerCheck> GetAccessibleLocations(const std::vector<RandomizerCheck>& allowedLocations,
                                              SearchMode mode = SearchMode::ReachabilitySearch, std::string ignore = "",
                                              bool checkPoeCollectorAccess = false,
                                              bool checkOtherEntranceAccess = false);
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
index b830efb60..fc47069fe 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
@@ -1,6 +1,8 @@
 #include "hint_list.hpp"
 #include "custom_messages.hpp"
 
+#include "../randomizerTypes.h"
+
 #include <array>
 
 using namespace CustomMessages;
@@ -18,25 +20,25 @@ using namespace CustomMessages;
 
 // '%d' indicates a number will be placed there.
 
-std::array<HintText, KEY_ENUM_MAX> hintTable;
+std::array<HintText, RHT_MAX> hintTable;
 
 void HintTable_Init() {
     /*--------------------------
     |       GENERAL TEXT       |
     ---------------------------*/
-    hintTable[NONE] = HintText::Exclude({ Text{ "No Hint", "Pas d'Indice", "" } });
-    hintTable[PREFIX] =
+    hintTable[RHT_NONE] = HintText::Exclude({ Text{ "No Hint", "Pas d'Indice", "" } });
+    hintTable[RHT_PREFIX] =
         HintText::Exclude({ Text{ "They say that ", /*french*/ "Selon moi, ", /*spanish*/ "Según dicen, " } });
-    hintTable[WAY_OF_THE_HERO] =
+    hintTable[RHT_WAY_OF_THE_HERO] =
         HintText::Exclude({ Text{ " is on %cthe way of the hero%w.", /*french*/ " est sur %cla voie du héros%w.",
                                   /*spanish*/ " conduce a la senda del héroe." } });
-    hintTable[PLUNDERING] =
+    hintTable[RHT_PLUNDERING] =
         HintText::Exclude({ Text{ "plundering ", /*french*/ "explorer ", /*spanish*/ "inspeccionar " } });
-    hintTable[FOOLISH] = HintText::Exclude(
+    hintTable[RHT_FOOLISH] = HintText::Exclude(
         { Text{ " is %pa foolish choice%w.", /*french*/ " est %pfutile%w.", /*spanish*/ " no es una sabia decisión." } });
-    hintTable[CAN_BE_FOUND_AT] =
+    hintTable[RHT_CAN_BE_FOUND_AT] =
         HintText::Exclude({ Text{ "can be found at", /*french*/ "se trouve dans", /*spanish*/ "aguarda en" } });
-    hintTable[HOARDS] = HintText::Exclude({ Text{ "hoards", /*french*/ "recèle", /*spanish*/ "acapara" } });
+    hintTable[RHT_HOARDS] = HintText::Exclude({ Text{ "hoards", /*french*/ "recèle", /*spanish*/ "acapara" } });
 
     HintTable_Init_Item();
     HintTable_Init_Exclude_Overworld();
@@ -46,7 +48,7 @@ void HintTable_Init() {
     |     ALWAYS HINT TEXT     |
     ---------------------------*/
 
-    hintTable[ZR_FROGS_OCARINA_GAME] = HintText::Always(
+    hintTable[RHT_ZR_FROGS_OCARINA_GAME] = HintText::Always(
         {
             // obscure text
             Text{ "an #amphibian feast# yields", /*french*/ "un #festin d'amphibiens# donne",
@@ -62,7 +64,7 @@ void HintTable_Init() {
               /*french*/ "la dernière récompense des #grenouilles de la Rivière Zora# est",
               /*spanish*/ "la recompensa final de las #ranas del Río Zora# premia" });
 
-    hintTable[KF_LINKS_HOUSE_COW] = HintText::Always(
+    hintTable[RHT_KF_LINKS_HOUSE_COW] = HintText::Always(
         {
             // obscure text
             Text{ "the #bovine bounty of a horseback hustle# gifts",
@@ -74,7 +76,7 @@ void HintTable_Init() {
         Text{ "#Malon's obstacle course# leads to", /*french*/ "la #course à obstacle de Malon# amène à",
               /*spanish*/ "la #carrera de obstáculos de Malon# brinda" });
 
-    hintTable[KAK_100_GOLD_SKULLTULA_REWARD] = HintText::Always(
+    hintTable[RHT_KAK_100_GOLD_SKULLTULA_REWARD] = HintText::Always(
         {
             // obscure text
             Text{ "#100 bug badges# rewards",
@@ -96,14 +98,13 @@ void HintTable_Init() {
     /*--------------------------
     |    SOMETIMES HINT TEXT   |
     ---------------------------*/
-
-    hintTable[SONG_FROM_OCARINA_OF_TIME] = HintText::Sometimes({
+    hintTable[RHT_SONG_FROM_OCARINA_OF_TIME] = HintText::Sometimes({
         // obscure text
         Text{ "the #Ocarina of Time# teaches", /*french*/ "l'#Ocarina du Temps# est accompagné par",
               /*spanish*/ "la #Ocarina del Tiempo# enseña" },
     });
 
-    hintTable[SONG_FROM_COMPOSERS_GRAVE] = HintText::Sometimes({
+    hintTable[RHT_SONG_FROM_ROYAL_FAMILYS_TOMB] = HintText::Sometimes({
         // obscure text
         Text{ "#ReDead in the Composers' Grave# guard",
               /*french*/ "les #Éffrois du tombeau des compositeurs# protègent",
@@ -112,45 +113,45 @@ void HintTable_Init() {
               /*spanish*/ "los #hermanos compositores escribieron#" },
     });
 
-    hintTable[SHEIK_IN_FOREST] = HintText::Sometimes({
+    hintTable[RHT_SHEIK_IN_FOREST] = HintText::Sometimes({
         // obscure text
         Text{ "#in a meadow# Sheik teaches", /*french*/ "Sheik confiera, #dans un bosquet#,",
               /*spanish*/ "#en la pradera sagrada# Sheik enseña" },
     });
 
-    hintTable[SHEIK_AT_TEMPLE] = HintText::Sometimes({
+    hintTable[RHT_SHEIK_AT_TEMPLE] = HintText::Sometimes({
         // obscure text
         Text{ "Sheik waits at a #monument to time# to teach",
               /*french*/ "Sheik confiera, #au pied de l'épée légendaire#,",
               /*spanish*/ "Sheik espera en el #momumento del tiempo# para enseñar" },
     });
 
-    hintTable[SHEIK_IN_CRATER] = HintText::Sometimes({
+    hintTable[RHT_SHEIK_IN_CRATER] = HintText::Sometimes({
         // obscure text
         Text{ "the #crater's melody# is", /*french*/ "Sheik confiera, #entouré de lave#,",
               /*spanish*/ "la #melodía del cráter# otorga" },
     });
 
-    hintTable[SHEIK_IN_ICE_CAVERN] = HintText::Sometimes({
+    hintTable[RHT_SHEIK_IN_ICE_CAVERN] = HintText::Sometimes({
         // obscure text
         Text{ "the #frozen cavern# echoes with", /*french*/ "Sheik confiera, #dans une caverne enneigée#,",
               /*spanish*/ "en la #caverna de hielo# retumban los ecos de" },
     });
 
-    hintTable[SHEIK_IN_KAKARIKO] = HintText::Sometimes({
+    hintTable[RHT_SHEIK_IN_KAKARIKO] = HintText::Sometimes({
         // obscure text
         Text{ "a #ravaged village# mourns with", /*french*/ "Sheik confirera, #au coeur d'un village ravagé#,",
               /*spanish*/ "un #arrasado pueblo# llora" },
     });
 
-    hintTable[SHEIK_AT_COLOSSUS] = HintText::Sometimes({
+    hintTable[RHT_SHEIK_AT_COLOSSUS] = HintText::Sometimes({
         // obscure text
         Text{ "a hero ventures #beyond the wasteland# to learn",
               /*french*/ "Sheik confiera, #au bout d'un chemin sableux#,",
               /*spanish*/ "el héroe que se adentre #más allá del desierto# aprenderá" },
     });
 
-    hintTable[MARKET_10_BIG_POES] = HintText::Sometimes(
+    hintTable[RHT_MARKET_10_BIG_POES] = HintText::Sometimes(
         {
             // obscure text
             Text{ "#ghost hunters# will be rewarded with",
@@ -162,13 +163,13 @@ void HintTable_Init() {
         Text{ "catching #Big Poes# leads to", /*french*/ "#d'attraper des Àmes# donne",
               /*spanish*/ "hacerte con #Grandes Poes# conduce a" });
 
-    hintTable[DEKU_THEATER_SKULL_MASK] = HintText::Sometimes({
+    hintTable[RHT_DEKU_THEATER_SKULL_MASK] = HintText::Sometimes({
         // obscure text
         Text{ "the #Skull Mask# yields", /*french*/ "le #Masque de Mort# donne",
               /*spanish*/ "la #máscara de calavera# otorga" },
     });
 
-    hintTable[DEKU_THEATER_MASK_OF_TRUTH] = HintText::Sometimes(
+    hintTable[RHT_DEKU_THEATER_MASK_OF_TRUTH] = HintText::Sometimes(
         {
             // obscure text
             Text{ "showing a #truthful eye to the crowd# rewards",
@@ -180,30 +181,30 @@ void HintTable_Init() {
         Text{ "the #Mask of Truth# yields", /*french*/ "le #Masque de Vérité# donne",
               /*spanish*/ "la #máscara de la verdad# premia" });
 
-    hintTable[HF_OCARINA_OF_TIME_ITEM] = HintText::Sometimes({
+    hintTable[RHT_HF_OCARINA_OF_TIME_ITEM] = HintText::Sometimes({
         // obscure text
         Text{ "the #treasure thrown by Princess Zelda# is", /*french*/ "le trésor #laissé par la princesse# est",
               /*spanish*/ "el #tesoro arrojado por la Princesa Zelda# se trata de" },
     });
 
-    hintTable[DMT_TRADE_BROKEN_SWORD] = HintText::Sometimes({
+    hintTable[RHT_DMT_TRADE_BROKEN_SWORD] = HintText::Sometimes({
         // obscure text
         Text{ "a #blinded Biggoron# entrusts", /*french*/ "un #Grogoron aveuglé# confie",
               /*spanish*/ "un #miope Biggoron# otorga" },
     });
 
-    hintTable[DMT_TRADE_EYEDROPS] = HintText::Sometimes({
+    hintTable[RHT_DMT_TRADE_EYEDROPS] = HintText::Sometimes({
         // obscure text
         Text{ "while you wait, #Biggoron# gives", /*french*/ "pendant que tu attends, #Biggoron# donne",
               /*spanish*/ "#Biggoron# está a la espera de otorgar" },
     });
 
-    hintTable[DMT_TRADE_CLAIM_CHECK] = HintText::Sometimes({
+    hintTable[RHT_DMT_TRADE_CLAIM_CHECK] = HintText::Sometimes({
         // obscure text
         Text{ "#Biggoron# crafts", /*french*/ "#Biggoron# fabrique", /*spanish*/ "#Biggoron# forja" },
     });
 
-    hintTable[KAK_50_GOLD_SKULLTULA_REWARD] = HintText::Sometimes(
+    hintTable[RHT_KAK_50_GOLD_SKULLTULA_REWARD] = HintText::Sometimes(
         {
             // obscure text
             Text{ "#50 bug badges# rewards", /*french*/ "#50 écussons# donnent",
@@ -218,7 +219,7 @@ void HintTable_Init() {
         Text{ "slaying #50 Gold Skulltulas# reveals", /*french*/ "détruire #50 Skulltulas d'or# donne",
               /*spanish*/ "exterminar #50 skulltulas doradas# revela" });
 
-    hintTable[KAK_40_GOLD_SKULLTULA_REWARD] = HintText::Sometimes(
+    hintTable[RHT_KAK_40_GOLD_SKULLTULA_REWARD] = HintText::Sometimes(
         {
             // obscure text
             Text{ "#40 bug badges# rewards", /*french*/ "#40 écussons# donnent",
@@ -233,7 +234,7 @@ void HintTable_Init() {
         Text{ "slaying #40 Gold Skulltulas# reveals", /*french*/ "détruire #40 Skulltulas d'or# donne",
               /*spanish*/ "exterminar #40 skulltulas doradas# revela" });
 
-    hintTable[KAK_30_GOLD_SKULLTULA_REWARD] = HintText::Sometimes(
+    hintTable[RHT_KAK_30_GOLD_SKULLTULA_REWARD] = HintText::Sometimes(
         {
             // obscure text
             Text{ "#30 bug badges# rewards", /*french*/ "#30 écussons# donnent",
@@ -248,7 +249,7 @@ void HintTable_Init() {
         Text{ "slaying #30 Gold Skulltulas# reveals", /*french*/ "détruire #30 Skulltulas d'or# donne",
               /*spanish*/ "exterminar #30 skulltulas doradas# revela" });
 
-    hintTable[KAK_20_GOLD_SKULLTULA_REWARD] = HintText::Sometimes(
+    hintTable[RHT_KAK_20_GOLD_SKULLTULA_REWARD] = HintText::Sometimes(
         {
             // obscure text
             Text{ "#20 bug badges# rewards", /*french*/ "#20 écussons# donnent",
@@ -263,7 +264,7 @@ void HintTable_Init() {
         Text{ "slaying #20 Gold Skulltulas# reveals", /*french*/ "détruire #20 Skulltulas d'or# donne",
               /*spanish*/ "exterminar #20 skulltulas doradas# revela" });
 
-    hintTable[KAK_ANJU_AS_CHILD] = HintText::Sometimes(
+    hintTable[RHT_KAK_ANJU_AS_CHILD] = HintText::Sometimes(
         {
             // obscure text
             Text{ "#wrangling roosters# rewards", /*french*/ "#plumer des poulets# donne",
@@ -276,19 +277,19 @@ void HintTable_Init() {
         Text{ "#collecting cuccos# rewards", /*french*/ "#rapporter les Cocottes# donne",
               /*spanish*/ "#hacerte con todos los cucos# premia" });
 
-    hintTable[KAK_TRADE_POCKET_CUCCO] = HintText::Sometimes({
+    hintTable[RHT_KAK_TRADE_POCKET_CUCCO] = HintText::Sometimes({
         // obscure text
         Text{ "an adult's #happy Cucco# awards", /*french*/ "un adulte avec une #poulette joyeuse# obtient",
               /*spanish*/ "un #alegre cuco# en la madurez otorga" },
     });
 
-    hintTable[KAK_TRADE_ODD_MUSHROOM] = HintText::Sometimes({
+    hintTable[RHT_KAK_TRADE_ODD_MUSHROOM] = HintText::Sometimes({
         // obscure text
         Text{ "the #potion shop lady# entrusts", /*french*/ "la #gribiche du magasin de potion# confie",
               /*spanish*/ "la #señora de la tienda de pociones# otorga" },
     });
 
-    hintTable[GC_DARUNIAS_JOY] = HintText::Sometimes(
+    hintTable[RHT_GC_DARUNIAS_JOY] = HintText::Sometimes(
         {
             // obscure text
             Text{ "a #groovin' goron# gifts", /*french*/ "#le Goron joyeux# donne",
@@ -299,24 +300,24 @@ void HintTable_Init() {
         Text{ "#Darunia's dance# leads to", /*french*/ "#la dance de Darunia# donne",
               /*spanish*/ "#el baile de Darunia# conduce a" });
 
-    hintTable[LW_SKULL_KID] = HintText::Sometimes({
+    hintTable[RHT_LW_SKULL_KID] = HintText::Sometimes({
         // obscure text
         Text{ "the #Skull Kid# grants", /*french*/ "le #Skull Kid# donne", /*spanish*/ "#Skull Kid# otorga" },
     });
 
-    hintTable[LW_TRADE_COJIRO] = HintText::Sometimes({
+    hintTable[RHT_LW_TRADE_COJIRO] = HintText::Sometimes({
         // obscure text
         Text{ "returning a #special Cucco# awards", /*french*/ "ramener une #poulette précieuse# donne",
               /*spanish*/ "quien devuelva un #cuco especial# encontrará" },
     });
 
-    hintTable[LW_TRADE_ODD_POTION] = HintText::Sometimes({
+    hintTable[RHT_LW_TRADE_ODD_POTION] = HintText::Sometimes({
         // obscure text
         Text{ "a #Kokiri girl in the woods# leaves", /*french*/ "la #fillette Kokiri dans les bois# laisse",
               /*spanish*/ "una #chica kokiri del bosque# otorga" },
     });
 
-    hintTable[LH_SUN] = HintText::Sometimes(
+    hintTable[RHT_LH_SUN] = HintText::Sometimes(
         {
             // obscure text
             Text{ "staring into #the sun# grants", /*french*/ "regarder #le soleil# donne",
@@ -327,13 +328,13 @@ void HintTable_Init() {
         Text{ "shooting #the sun# grants", /*french*/ "tirer une flèche dans #sur le soleil# donne",
               /*spanish*/ "#disparar al sol# revela" });
 
-    hintTable[LH_TRADE_FROG] = HintText::Sometimes({
+    hintTable[RHT_LH_TRADE_FROG] = HintText::Sometimes({
         // obscure text
         Text{ "#Lake Hylia's scientist# hurriedly entrusts", /*french*/ "le #scientifique du lac# confie rapidement",
               /*spanish*/ "el #científico del Lago Hylia# otorga con prisa" },
     });
 
-    hintTable[MARKET_TREASURE_CHEST_GAME_REWARD] = HintText::Sometimes(
+    hintTable[RHT_MARKET_TREASURE_CHEST_GAME_REWARD] = HintText::Sometimes(
         {
             // obscure text
             Text{ "#gambling# grants", /*french*/ "#parier# donne", /*spanish*/ "#los juegos de azar# revelan" },
@@ -345,7 +346,7 @@ void HintTable_Init() {
         Text{ "the #treasure chest game# grants", /*french*/ "la #Chasse-aux-Trésors# donne",
               /*spanish*/ "#el Cofre del Tesoro# premia" });
 
-    hintTable[MARKET_TREASURE_CHEST_GAME_ITEM_1] = HintText::Sometimes(
+    hintTable[RHT_MARKET_TREASURE_CHEST_GAME_ITEM_1] = HintText::Sometimes(
         {
             // obscure text
             Text{ "#gambling once# grants", /*french*/ "#parier une fois# donne",
@@ -360,7 +361,7 @@ void HintTable_Init() {
               /*french*/ "la #première salle# de la Chasse-aux-Trésors contient",
               /*spanish*/ "#en la primera sala del Cofre del Tesoro# aguarda" });
 
-    hintTable[MARKET_TREASURE_CHEST_GAME_ITEM_2] = HintText::Sometimes(
+    hintTable[RHT_MARKET_TREASURE_CHEST_GAME_ITEM_2] = HintText::Sometimes(
         {
             // obscure text
             Text{ "#gambling twice# grants", /*french*/ "#parier deux fois# donne",
@@ -375,7 +376,7 @@ void HintTable_Init() {
               /*french*/ "la #deuxième salle# de la Chasse-aux-Trésors contient",
               /*spanish*/ "#en la segunda sala del Cofre del Tesoro# aguarda" });
 
-    hintTable[MARKET_TREASURE_CHEST_GAME_ITEM_3] = HintText::Sometimes(
+    hintTable[RHT_MARKET_TREASURE_CHEST_GAME_ITEM_3] = HintText::Sometimes(
         {
             // obscure text
             Text{ "#gambling 3 times# grants", /*french*/ "#parier trois fois# donne",
@@ -390,7 +391,7 @@ void HintTable_Init() {
               /*french*/ "la #troisième salle# de la Chasse-aux-Trésors contient",
               /*spanish*/ "#en la tercera sala del Cofre del Tesoro# aguarda" });
 
-    hintTable[MARKET_TREASURE_CHEST_GAME_ITEM_4] = HintText::Sometimes(
+    hintTable[RHT_MARKET_TREASURE_CHEST_GAME_ITEM_4] = HintText::Sometimes(
         {
             // obscure text
             Text{ "#gambling 4 times# grants", /*french*/ "#parier quatre fois# donne",
@@ -405,7 +406,7 @@ void HintTable_Init() {
               /*french*/ "la #quatrième salle# de la Chasse-aux-Trésors contient",
               /*spanish*/ "#en la cuarta sala del Cofre del Tesoro# aguarda" });
 
-    hintTable[MARKET_TREASURE_CHEST_GAME_ITEM_5] = HintText::Sometimes(
+    hintTable[RHT_MARKET_TREASURE_CHEST_GAME_ITEM_5] = HintText::Sometimes(
         {
             // obscure text
             Text{ "#gambling 5 times# grants", /*french*/ "#parier cinq fois# donne",
@@ -420,7 +421,7 @@ void HintTable_Init() {
               /*french*/ "la #cinquième salle# de la Chasse-aux-Trésors contient",
               /*spanish*/ "#en la quinta sala del Cofre del Tesoro# aguarda" });
 
-    hintTable[GF_HBA_1500_POINTS] = HintText::Sometimes(
+    hintTable[RHT_GF_HBA_1500_POINTS] = HintText::Sometimes(
         {
             // obscure text
             Text{ "mastery of #horseback archery# grants", /*french*/ "maîtriser l'#archerie équestre# donne",
@@ -432,51 +433,51 @@ void HintTable_Init() {
               /*french*/ "obtenir 1500 points dans l'#archerie équestre# donne",
               /*spanish*/ "conseguir 1500 puntos en el #tiro con arco a caballo# premia" });
 
-    hintTable[GRAVEYARD_HEART_PIECE_GRAVE_CHEST] = HintText::Sometimes({
+    hintTable[RHT_GRAVEYARD_HEART_PIECE_GRAVE_CHEST] = HintText::Sometimes({
         // obscure text
         Text{ "playing #Sun's Song# in a grave spawns", /*french*/ "jouer le #chant du soleil# dans un tombeau donne",
               /*spanish*/ "#tocar la Canción del Sol# en una cripta conduce a" },
     });
 
-    hintTable[GC_MAZE_LEFT_CHEST] = HintText::Sometimes({
+    hintTable[RHT_GC_MAZE_LEFT_CHEST] = HintText::Sometimes({
         // obscure text
         Text{ "in #Goron City# the hammer unlocks", /*french*/ "dans le #village Goron#, le marteau donne accès à",
               /*spanish*/ "en la #Ciudad Goron# el martillo desbloquea" },
     });
 
-    hintTable[GV_CHEST] = HintText::Sometimes({
+    hintTable[RHT_GV_CHEST] = HintText::Sometimes({
         // obscure text
         Text{ "in #Gerudo Valley# the hammer unlocks", /*french*/ "dans la #Vallée Gerudo#, le marteau donne accès à",
               /*spanish*/ "en el #Valle Gerudo# el martillo desbloquea" },
     });
 
-    hintTable[GV_TRADE_SAW] = HintText::Sometimes({
+    hintTable[RHT_GV_TRADE_SAW] = HintText::Sometimes({
         // obscure text
         Text{ "the #boss of the carpenters# leaves", /*french*/ "le #patron des ouvriers# laisse",
               /*spanish*/ "el #capataz de los carpinteros# otorga" },
     });
 
-    hintTable[GV_COW] = HintText::Sometimes({
+    hintTable[RHT_GV_COW] = HintText::Sometimes({
         // obscure text
         Text{ "a #cow in Gerudo Valley# gifts", /*french*/ "la #vache de la Vallée Gerudo# donne",
               /*spanish*/ "una #vaca del Valle Gerudo# brinda" },
     });
 
-    hintTable[HC_GS_STORMS_GROTTO] = HintText::Sometimes({
+    hintTable[RHT_HC_GS_STORMS_GROTTO] = HintText::Sometimes({
         // obscure text
         Text{ "a #spider behind a muddy wall# in a grotto holds",
               /*french*/ "l'#araignée derrière un mur de boue# dans une grotte donne",
               /*spanish*/ "una #Skulltula tras la agrietada pared# de una cueva otorga" },
     });
 
-    hintTable[HF_GS_COW_GROTTO] = HintText::Sometimes({
+    hintTable[RHT_HF_GS_COW_GROTTO] = HintText::Sometimes({
         // obscure text
         Text{ "a #spider behind webs# in a grotto holds",
               /*french*/ "l'#araignée derrière une toile# dans une grotte donne",
               /*spanish*/ "una #Skulltula tras la telaraña# de una cueva otorga" },
     });
 
-    hintTable[HF_COW_GROTTO_COW] = HintText::Sometimes(
+    hintTable[RHT_HF_COW_GROTTO_COW] = HintText::Sometimes(
         {
             // obscure text
             Text{ "the #cobwebbed cow# gifts", /*french*/ "la #vache prisonnière d'araignées# donne",
@@ -487,13 +488,13 @@ void HintTable_Init() {
         Text{ "a #cow behind webs# in a grotto gifts", /*french*/ "la #vache derrière les toiles# d'une grotte donne",
               /*spanish*/ "una #vaca tras la telaraña# de una cueva brinda" });
 
-    hintTable[ZF_GS_HIDDEN_CAVE] = HintText::Sometimes({
+    hintTable[RHT_ZF_GS_HIDDEN_CAVE] = HintText::Sometimes({
         // obscure text
         Text{ "a spider high #above the icy waters# holds", /*french*/ "l'araignée #en haut des eaux glacées# donne",
               /*spanish*/ "una Skulltula en lo #alto de las congeladas aguas# otorga" },
     });
 
-    hintTable[WASTELAND_CHEST] = HintText::Sometimes({
+    hintTable[RHT_WASTELAND_CHEST] = HintText::Sometimes({
         // obscure text
         Text{ "#deep in the wasteland# is", /*french*/ "#loin dans le désert# gît",
               /*spanish*/ "en lo #profundo del desierto encantado# yace" },
@@ -501,13 +502,13 @@ void HintTable_Init() {
               /*spanish*/ "tras las #arenas# unas llamas revelan" },
     });
 
-    hintTable[WASTELAND_GS] = HintText::Sometimes({
+    hintTable[RHT_WASTELAND_GS] = HintText::Sometimes({
         // obscure text
         Text{ "a #spider in the wasteland# holds", /*french*/ "#l'araignée dans le désert# donne",
               /*spanish*/ "una #Skulltula del desierto encantado# otorga" },
     });
 
-    hintTable[GRAVEYARD_COMPOSERS_GRAVE_CHEST] = HintText::Sometimes({
+    hintTable[RHT_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST] = HintText::Sometimes({
         // obscure text
         Text{ "#flames in the Composers' Grave# reveal",
               /*french*/ "#les flammes dans le tombeau des compositeurs# cachent",
@@ -516,19 +517,19 @@ void HintTable_Init() {
               /*spanish*/ "los #hermanos compositores esconden#" },
     });
 
-    hintTable[ZF_BOTTOM_FREESTANDING_POH] = HintText::Sometimes({
+    hintTable[RHT_ZF_BOTTOM_FREESTANDING_POH] = HintText::Sometimes({
         // obscure text
         Text{ "#under the icy waters# lies", /*french*/ "#sous les eaux glacées# se cache",
               /*spanish*/ "#bajo las congeladas aguas# yace" },
     });
 
-    hintTable[GC_POT_FREESTANDING_POH] = HintText::Sometimes({
+    hintTable[RHT_GC_POT_FREESTANDING_POH] = HintText::Sometimes({
         // obscure text
         Text{ "spinning #Goron pottery# contains", /*french*/ "la #potterie Goron# contient",
               /*spanish*/ "una #cerámica goron# contiene" },
     });
 
-    hintTable[ZD_KING_ZORA_THAWED] = HintText::Sometimes(
+    hintTable[RHT_ZD_KING_ZORA_THAWED] = HintText::Sometimes(
         {
             // obscure text
             Text{ "a #defrosted dignitary# gifts", /*french*/ "le #monarque libéré# donne",
@@ -539,25 +540,25 @@ void HintTable_Init() {
         Text{ "unfreezing #King Zora# grants", /*french*/ "dégeler # le Roi Zora# donne",
               /*spanish*/ "#descongelar al Rey Zora# conduce a" });
 
-    hintTable[ZD_TRADE_PRESCRIPTION] = HintText::Sometimes({
+    hintTable[RHT_ZD_TRADE_PRESCRIPTION] = HintText::Sometimes({
         // obscure text
         Text{ "#King Zora# hurriedly entrusts", /*french*/ "le #roi Zora# confie rapidement",
               /*spanish*/ "el #Rey Zora# otorga con prisa" },
     });
 
-    hintTable[DMC_DEKU_SCRUB] = HintText::Sometimes({
+    hintTable[RHT_DMC_DEKU_SCRUB] = HintText::Sometimes({
         // obscure text
         Text{ "a single #scrub in the crater# sells", /*french*/ "la #peste Mojo dans le cratère# vend",
               /*spanish*/ "un solitario #deku del cráter# vende" },
     });
 
-    hintTable[DMC_GS_CRATE] = HintText::Sometimes({
+    hintTable[RHT_DMC_GS_CRATE] = HintText::Sometimes({
         // obscure text
         Text{ "a spider under a #crate in the crater# holds", /*french*/ "la Skulltula dans une #boîte volcanique# a",
               /*spanish*/ "una Skulltula bajo una #caja del cráter# otorga" },
     });
 
-    hintTable[DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST] = HintText::Sometimes(
+    hintTable[RHT_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST] = HintText::Sometimes(
         {
             // obscure text
             Text{ "a #temporal stone within a tree# contains", /*french*/ "la #pierre bleue dans un arbre# mène à",
@@ -569,7 +570,7 @@ void HintTable_Init() {
               /*french*/ "la #pierre temporelle dans l'Arbre Mojo# cache",
               /*spanish*/ "un #bloque temporal del Gran Árbol Deku# contiene" });
 
-    hintTable[DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM] = HintText::Sometimes(
+    hintTable[RHT_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM] = HintText::Sometimes(
         {
             // obscure text
             Text{ "a #spider on a ceiling in a tree# holds", /*french*/ "l'#araignée haut-perchée dans un arbre# a",
@@ -581,7 +582,7 @@ void HintTable_Init() {
               /*french*/ "la#Skulltula dans le Cimetière de l'Arbre Mojo# a",
               /*spanish*/ "una #Skulltula en el techo del Gran Árbol Deku# otorga" });
 
-    hintTable[DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM] = HintText::Sometimes(
+    hintTable[RHT_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM] = HintText::Sometimes(
         {
             // obscure text
             Text{ "a spider under #temporal stones in a cavern# holds",
@@ -594,7 +595,7 @@ void HintTable_Init() {
               /*french*/ "la Skulltula sous #la pierre temporelle dans la Caverne Dodongo# a",
               /*spanish*/ "una Skulltula bajo #bloques temporales de la Cueva de los Dodongos# otorga" });
 
-    hintTable[JABU_JABUS_BELLY_BOOMERANG_CHEST] = HintText::Sometimes(
+    hintTable[RHT_JABU_JABUS_BELLY_BOOMERANG_CHEST] = HintText::Sometimes(
         {
             // obscure text
             Text{ "a school of #stingers swallowed by a deity# guard",
@@ -606,7 +607,7 @@ void HintTable_Init() {
         Text{ "a school of #stingers swallowed by Jabu-Jabu# guard", /*french*/ "les #raies dans Jabu-Jabu# protègent",
               /*spanish*/ "unos #stingers engullidos por Jabu-Jabu# guardan" });
 
-    hintTable[JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM] = HintText::Sometimes(
+    hintTable[RHT_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM] = HintText::Sometimes(
         {
             // obscure text
             Text{ "a spider surrounded by #shadows in the belly of a deity# holds",
@@ -619,7 +620,7 @@ void HintTable_Init() {
               /*french*/ "la Skulltula entourée d'#ombres dans Jabu-Jabu# possède",
               /*spanish*/ "una Skulltula rodeada de #sombras en la Tripa de Jabu-Jabu# otorga" });
 
-    hintTable[JABU_JABUS_BELLY_MQ_COW] = HintText::Sometimes(
+    hintTable[RHT_JABU_JABUS_BELLY_MQ_COW] = HintText::Sometimes(
         {
             // obscure text
             Text{ "a #cow swallowed by a deity# gifts", /*french*/ "la #vache dans le gardien# donne",
@@ -630,7 +631,7 @@ void HintTable_Init() {
         Text{ "a #cow swallowed by Jabu-Jabu# gifts", /*french*/ "la #vache avallée par Jabu-Jabu# donne",
               /*spanish*/ "una #vaca engullida por Jabu-Jabu# brinda" });
 
-    hintTable[FIRE_TEMPLE_SCARECROW_CHEST] = HintText::Sometimes(
+    hintTable[RHT_FIRE_TEMPLE_SCARECROW_CHEST] = HintText::Sometimes(
         {
             // obscure text
             Text{ "a #scarecrow atop the volcano# hides", /*french*/ "l'#épouvantail au sommet d'un volcan# donne",
@@ -641,7 +642,7 @@ void HintTable_Init() {
         Text{ "#Pierre atop the Fire Temple# hides", /*french*/ "#Pierre au sommet du Temple du Feu# donne",
               /*spanish*/ "#Pierre en lo alto del Templo del Fuego# esconde" });
 
-    hintTable[FIRE_TEMPLE_MEGATON_HAMMER_CHEST] = HintText::Sometimes(
+    hintTable[RHT_FIRE_TEMPLE_MEGATON_HAMMER_CHEST] = HintText::Sometimes(
         {
             // obscure text
             Text{ "the #Flare Dancer atop the volcano# guards a chest containing",
@@ -654,7 +655,7 @@ void HintTable_Init() {
               /*french*/ "le #Danse-Flamme au sommet du Temple du Feu# protège",
               /*spanish*/ "el #Bailaguego en lo alto del Templo del Fuego# otorga" });
 
-    hintTable[FIRE_TEMPLE_MQ_CHEST_ON_FIRE] = HintText::Sometimes(
+    hintTable[RHT_FIRE_TEMPLE_MQ_CHEST_ON_FIRE] = HintText::Sometimes(
         {
             // obscure text
             Text{ "the #Flare Dancer atop the volcano# guards a chest containing",
@@ -667,7 +668,7 @@ void HintTable_Init() {
               /*french*/ "le #Danse-Flamme au sommet du Temple du Feu# protège",
               /*spanish*/ "el #Bailafuego en lo alto del Templo del Fuego# otorga" });
 
-    hintTable[FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE] = HintText::Sometimes(
+    hintTable[RHT_FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE] = HintText::Sometimes(
         {
             // obscure text
             Text{ "a #spider under a block in the volcano# holds",
@@ -680,7 +681,7 @@ void HintTable_Init() {
               /*french*/ "une #Skulltula sous un bloc dans le Temple du Feu# a",
               /*spanish*/ "una #Skulltula bajo un bloque del Templo del Fuego# otorga" });
 
-    hintTable[WATER_TEMPLE_RIVER_CHEST] = HintText::Sometimes(
+    hintTable[RHT_WATER_TEMPLE_RIVER_CHEST] = HintText::Sometimes(
         {
             // obscure text
             Text{ "beyond the #river under the lake# waits", /*french*/ "au delà de #la rivière sous le lac# se cache",
@@ -692,7 +693,7 @@ void HintTable_Init() {
               /*french*/ "au delà de #la rivière dans le Temple de l'Eau# se cache",
               /*spanish*/ "tras el #río del Templo del Agua# yace" });
 
-    hintTable[WATER_TEMPLE_BOSS_KEY_CHEST] = HintText::Sometimes(
+    hintTable[RHT_WATER_TEMPLE_BOSS_KEY_CHEST] = HintText::Sometimes(
         {
             // obscure text
             Text{ "dodging #rolling boulders under the lake# leads to",
@@ -705,7 +706,7 @@ void HintTable_Init() {
               /*french*/ "éviter des #rochers roulants dans le Temple de l'Eau# mène à",
               /*spanish*/ "esquivar #rocas rondantes del Templo del Agua# conduce a" });
 
-    hintTable[WATER_TEMPLE_GS_BEHIND_GATE] = HintText::Sometimes(
+    hintTable[RHT_WATER_TEMPLE_GS_BEHIND_GATE] = HintText::Sometimes(
         {
             // obscure text
             Text{ "a spider behind a #gate under the lake# holds",
@@ -718,7 +719,7 @@ void HintTable_Init() {
               /*french*/ "la Skulltula derrière une #barrière dans le Temple de l'Eau# a",
               /*spanish*/ "una Skulltula tras #una valla del Templo del Agua# otorga" });
 
-    hintTable[WATER_TEMPLE_MQ_FREESTANDING_KEY] = HintText::Sometimes(
+    hintTable[RHT_WATER_TEMPLE_MQ_FREESTANDING_KEY] = HintText::Sometimes(
         {
             // obscure text
             Text{ "hidden in a #box under the lake# lies", /*french*/ "dans une #boîte sous le lac# gît",
@@ -729,7 +730,7 @@ void HintTable_Init() {
         Text{ "hidden in a #box in the Water Temple# lies", /*french*/ "dans une #boîte dans le Temple de l'Eau# gît",
               /*spanish*/ "en una #caja del Templo del Agua# yace" });
 
-    hintTable[WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA] = HintText::Sometimes(
+    hintTable[RHT_WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA] = HintText::Sometimes(
         {
             // obscure text
             Text{ "the #locked spider under the lake# holds", /*french*/ "l'#araignée emprisonnée sous le lac# a",
@@ -741,7 +742,7 @@ void HintTable_Init() {
               /*french*/ "une #Skulltula emprisonnée dans le Temple de l'Eau# a",
               /*spanish*/ "la #Skulltula enjaulada del Templo del Agua# otorga" });
 
-    hintTable[WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH] = HintText::Sometimes(
+    hintTable[RHT_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH] = HintText::Sometimes(
         {
             // obscure text
             Text{ "a spider behind a #gate under the lake# holds",
@@ -754,7 +755,7 @@ void HintTable_Init() {
               /*french*/ "une #Skulltula derrière une barrière dans le Temple de l'Eau# a",
               /*spanish*/ "una Skulltula tras una #valla del Templo del Agua#" });
 
-    hintTable[GERUDO_TRAINING_GROUNDS_UNDERWATER_SILVER_RUPEE_CHEST] = HintText::Sometimes({
+    hintTable[RHT_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST] = HintText::Sometimes({
         // obscure text
         Text{ "those who seek #sunken silver rupees# will find",
               /*french*/ "ceux qui pêchent les #joyaux argentés# trouveront",
@@ -763,7 +764,7 @@ void HintTable_Init() {
               /*spanish*/ "la #instrucción submarina de las bandidas# premia" },
     });
 
-    hintTable[GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER_SILVER_RUPEE_CHEST] = HintText::Sometimes({
+    hintTable[RHT_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST] = HintText::Sometimes({
         // obscure text
         Text{ "those who seek #sunken silver rupees# will find",
               /*french*/ "ceux qui pêchent les #joyaux argentés# trouveront",
@@ -772,21 +773,21 @@ void HintTable_Init() {
               /*spanish*/ "la #instrucción submarina de las bandidas# premia" },
     });
 
-    hintTable[GERUDO_TRAINING_GROUNDS_MAZE_PATH_FINAL_CHEST] = HintText::Sometimes({
+    hintTable[RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_FINAL_CHEST] = HintText::Sometimes({
         // obscure text
         Text{ "the final prize of #the thieves' training# is",
               /*french*/ "la récompense ultime de #l'épreuve des voleurs# est",
               /*spanish*/ "la recompensa final de la #instrucción de las bandida# brinda" },
     });
 
-    hintTable[GERUDO_TRAINING_GROUNDS_MQ_ICE_ARROWS_CHEST] = HintText::Sometimes({
+    hintTable[RHT_GERUDO_TRAINING_GROUND_MQ_ICE_ARROWS_CHEST] = HintText::Sometimes({
         // obscure text
         Text{ "the final prize of #the thieves' training# is",
               /*french*/ "la récompense ultime de #l'épreuve des voleurs# est",
               /*spanish*/ "el premio final de la #instrucción de las bandidas# brinda" },
     });
 
-    hintTable[BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST] = HintText::Sometimes(
+    hintTable[RHT_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST] = HintText::Sometimes(
         {
             // obscure text
             Text{ "the well's #grasping ghoul# hides", /*french*/ "la #terreur du Puits# cache",
@@ -799,7 +800,7 @@ void HintTable_Init() {
         Text{ "#Dead Hand in the well# holds", /*french*/ "le #Poigneur dans le Puits# cache",
               /*spanish*/ "la #Mano Muerta del pozo# concede" });
 
-    hintTable[BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST] = HintText::Sometimes(
+    hintTable[RHT_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST] = HintText::Sometimes(
         {
             // obscure text
             Text{ "the well's #grasping ghoul# hides", /*french*/ "la #terreur du Puits# cache",
@@ -812,7 +813,7 @@ void HintTable_Init() {
         Text{ "#Dead Hand in the well# holds", /*french*/ "le #Poigneur dans le Puits# cache",
               /*spanish*/ "la #Mano Muerta del pozo# concede" });
 
-    hintTable[SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST] = HintText::Sometimes(
+    hintTable[RHT_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST] = HintText::Sometimes(
         {
             // obscure text
             Text{ "the treasure #sought by Nabooru# is", /*french*/ "le trésor que #recherche Nabooru# est",
@@ -823,13 +824,13 @@ void HintTable_Init() {
         Text{ "upon the #Colossus's right hand# is", /*french*/ "sur la #main droite du colosse# repose",
               /*spanish*/ "en la #mano derecha del Coloso# yace" });
 
-    hintTable[SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST] = HintText::Sometimes({
+    hintTable[RHT_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST] = HintText::Sometimes({
         // obscure text
         Text{ "upon the #Colossus's left hand# is", /*french*/ "sur la #main gauche du colosse# repose",
               /*spanish*/ "en la #mano izquierda del Coloso# yace" },
     });
 
-    hintTable[SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST] = HintText::Sometimes(
+    hintTable[RHT_SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST] = HintText::Sometimes(
         {
             // obscure text
             Text{ "a #temporal paradox in the Colossus# yields",
@@ -842,7 +843,7 @@ void HintTable_Init() {
               /*french*/ "le #paradoxe temporel dans le Temple de l'Esprit# révèle",
               /*spanish*/ "una #paradoja temporal del Coloso# conduce a" });
 
-    hintTable[SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST] = HintText::Sometimes(
+    hintTable[RHT_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST] = HintText::Sometimes(
         {
             // obscure text
             Text{ "a #symphony in the Colossus# yields", /*french*/ "la #symphonie du colosse# révèle",
@@ -854,7 +855,7 @@ void HintTable_Init() {
               /*french*/ "les #cinq chansons du Temple de l'Esprit# révèlent",
               /*spanish*/ "una #sinfonía del Coloso# conduce a" });
 
-    hintTable[SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM] = HintText::Sometimes(
+    hintTable[RHT_SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM] = HintText::Sometimes(
         {
             // obscure text
             Text{ "a #spider's symphony in the Colossus# yields",
@@ -867,13 +868,13 @@ void HintTable_Init() {
               /*french*/ "la #mélodie de la Skulltula du Temple de l'Esprit# révèle",
               /*spanish*/ "la #Skulltula de la sinfonía del Coloso# otorga" });
 
-    hintTable[SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST] = HintText::Sometimes({
+    hintTable[RHT_SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST] = HintText::Sometimes({
         // obscure text
         Text{ "shadows in an #invisible maze# guard", /*french*/ "les ombres dans le #labyrinthe invisible# protègent",
               /*spanish*/ "las sombras del #laberinto misterioso# esconden" },
     });
 
-    hintTable[SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST] = HintText::Sometimes({
+    hintTable[RHT_SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST] = HintText::Sometimes({
         // obscure text
         Text{ "shadows in an #invisible maze# guard", /*french*/ "les ombres dans le #labyrinthe invisible# protègent",
               /*spanish*/ "las sombras del #laberinto invisible# esconden" },
@@ -883,99 +884,99 @@ void HintTable_Init() {
     |    ENTRANCE HINT TEXT    |
     ---------------------------*/
 
-    hintTable[DESERT_COLOSSUS_TO_COLOSSUS_GROTTO] = HintText::Entrance({
+    hintTable[RHT_DESERT_COLOSSUS_TO_COLOSSUS_GROTTO] = HintText::Entrance({
         // obscure text
         Text{ "lifting a #rock in the desert# reveals", /*french*/ "soulever une #roche dans le désert# révèle",
               /*spanish*/ "levantar una #roca del desierto# revela" },
     });
 
-    hintTable[GV_GROTTO_LEDGE_TO_GV_OCTOROK_GROTTO] = HintText::Entrance({
+    hintTable[RHT_GV_GROTTO_LEDGE_TO_GV_OCTOROK_GROTTO] = HintText::Entrance({
         // obscure text
         Text{ "a rock on #a ledge in the valley# hides", /*french*/ "soulever une #roche dans la vallée# révèle",
               /*spanish*/ "levantar una #roca al borde del valle# esconde" },
     });
 
-    hintTable[GC_GROTTO_PLATFORM_TO_GC_GROTTO] = HintText::Entrance({
+    hintTable[RHT_GC_GROTTO_PLATFORM_TO_GC_GROTTO] = HintText::Entrance({
         // obscure text
         Text{ "a #pool of lava# in Goron City blocks the way to",
               /*french*/ "l'#étang de lave# dans le village Goron renferme",
               /*spanish*/ "un #estanque de lava# en la Ciudad Goron bloquea el paso a" },
     });
 
-    hintTable[GERUDO_FORTRESS_TO_GF_STORMS_GROTTO] = HintText::Entrance({
+    hintTable[RHT_GERUDO_FORTRESS_TO_GF_STORMS_GROTTO] = HintText::Entrance({
         // obscure text
         Text{ "a #storm within Gerudo's Fortress# reveals", /*french*/ "la #tempête dans la forteresse# révèle",
               /*spanish*/ "una #tormenta en la Fortaleza Gerudo# revela" },
     });
 
-    hintTable[ZORAS_DOMAIN_TO_ZD_STORMS_GROTTO] = HintText::Entrance({
+    hintTable[RHT_ZORAS_DOMAIN_TO_ZD_STORMS_GROTTO] = HintText::Entrance({
         // obscure text
         Text{ "a #storm within Zora's Domain# reveals", /*french*/ "la #tempête dans le Domaine Zora# révèle",
               /*spanish*/ "una #tormenta en la Región de los Zora# revela" },
     });
 
-    hintTable[HYRULE_CASTLE_GROUNDS_TO_HC_STORMS_GROTTO] = HintText::Entrance({
+    hintTable[RHT_HYRULE_CASTLE_GROUNDS_TO_HC_STORMS_GROTTO] = HintText::Entrance({
         // obscure text
         Text{ "a #storm near the castle# reveals", /*french*/ "la #tempête près du château# révèle",
               /*spanish*/ "una #tormenta junto al castillo# revela" },
     });
 
-    hintTable[GV_FORTRESS_SIDE_TO_GV_STORMS_GROTTO] = HintText::Entrance({
+    hintTable[RHT_GV_FORTRESS_SIDE_TO_GV_STORMS_GROTTO] = HintText::Entrance({
         // obscure text
         Text{ "a #storm in the valley# reveals", /*french*/ "la #tempête dans la vallée# révèle",
               /*spanish*/ "una #tormenta en el valle# revela" },
     });
 
-    hintTable[DESERT_COLOSSUS_TO_COLOSSUS_GREAT_FAIRY_FOUNTAIN] = HintText::Entrance({
+    hintTable[RHT_DESERT_COLOSSUS_TO_COLOSSUS_GREAT_FAIRY_FOUNTAIN] = HintText::Entrance({
         // obscure text
         Text{ "a #fractured desert wall# hides", /*french*/ "le #mur fragile du désert# cache",
               /*spanish*/ "una #agrietada pared del desierto# esconde" },
     });
 
-    hintTable[GANONS_CASTLE_GROUNDS_TO_OGC_GREAT_FAIRY_FOUNTAIN] = HintText::Entrance({
+    hintTable[RHT_GANONS_CASTLE_GROUNDS_TO_OGC_GREAT_FAIRY_FOUNTAIN] = HintText::Entrance({
         // obscure text
         Text{ "a #heavy pillar# outside the castle obstructs", /*french*/ "le #rocher fragile près du château# cache",
               /*spanish*/ "una #pesada columna# fuera del castillo obstruye" },
     });
 
-    hintTable[ZORAS_FOUNTAIN_TO_ZF_GREAT_FAIRY_FOUNTAIN] = HintText::Entrance({
+    hintTable[RHT_ZORAS_FOUNTAIN_TO_ZF_GREAT_FAIRY_FOUNTAIN] = HintText::Entrance({
         // obscure text
         Text{ "a #fountain wall# hides", /*french*/ "le #mur fragile du réservoir# cache",
               /*spanish*/ "una #pared de la fuente# esconde" },
     });
 
-    hintTable[GV_FORTRESS_SIDE_TO_GV_CARPENTER_TENT] = HintText::Entrance({
+    hintTable[RHT_GV_FORTRESS_SIDE_TO_GV_CARPENTER_TENT] = HintText::Entrance({
         // obscure text
         Text{ "a #tent in the valley# covers", /*french*/ "la #tente dans la vallée# recouvre",
               /*spanish*/ "una #tienda de campaña del valle# cubre" },
     });
 
-    hintTable[GRAVEYARD_WARP_PAD_REGION_TO_SHADOW_TEMPLE_ENTRYWAY] = HintText::Entrance({
+    hintTable[RHT_GRAVEYARD_WARP_PAD_REGION_TO_SHADOW_TEMPLE_ENTRYWAY] = HintText::Entrance({
         // obscure text
         Text{ "at the #back of the Graveyard#, there is", /*french*/ "#derrière le Cimetière# gît",
               /*spanish*/ "en la #parte trasera del cementerio# se halla" },
     });
 
-    hintTable[LAKE_HYLIA_TO_WATER_TEMPLE_LOBBY] = HintText::Entrance({
+    hintTable[RHT_LAKE_HYLIA_TO_WATER_TEMPLE_LOBBY] = HintText::Entrance({
         // obscure text
         Text{ "deep #under a vast lake#, one can find", /*french*/ "#sous le lac# gît",
               /*spanish*/ "en las #profundidades de un lago inmenso# se halla" },
     });
 
-    hintTable[GERUDO_FORTRESS_TO_GERUDO_TRAINING_GROUNDS_LOBBY] = HintText::Entrance({
+    hintTable[RHT_GERUDO_FORTRESS_TO_GERUDO_TRAINING_GROUNDS_LOBBY] = HintText::Entrance({
         // obscure text
         Text{ "paying a #fee to the Gerudos# grants access to",
               /*french*/ "l'#entrée payante des Gerudo# donne accès à",
               /*spanish*/ "pagarle una #tasa a las gerudo# da acceso a" },
     });
 
-    hintTable[ZORAS_FOUNTAIN_TO_JABU_JABUS_BELLY_BEGINNING] = HintText::Entrance({
+    hintTable[RHT_ZORAS_FOUNTAIN_TO_JABU_JABUS_BELLY_BEGINNING] = HintText::Entrance({
         // obscure text
         Text{ "inside #Jabu-Jabu#, one can find", /*french*/ "#dans Jabu-Jabu# se trouve",
               /*spanish*/ "dentro de #Jabu-Jabu# se halla" },
     });
 
-    hintTable[KAKARIKO_VILLAGE_TO_BOTTOM_OF_THE_WELL] = HintText::Entrance({
+    hintTable[RHT_KAKARIKO_VILLAGE_TO_BOTTOM_OF_THE_WELL] = HintText::Entrance({
         // obscure text
         Text{ "a #village well# leads to", /*french*/ "dans le fond du #Puits du village# gît",
               /*spanish*/ "el #pozo de un pueblo# conduce a" },
@@ -986,120 +987,120 @@ void HintTable_Init() {
     ---------------------------*/
     // maybe make a new type for this? I'm not sure if it really matters
 
-    hintTable[LINKS_POCKET] = HintText::Exclude({
+    hintTable[RHT_LINKS_POCKET] = HintText::Exclude({
         // obscure text
         Text{ "Link's Pocket", /*french*/ "les Poches de @", /*spanish*/ "el bolsillo de @" },
     });
 
-    hintTable[KOKIRI_FOREST] = HintText::Exclude({
+    hintTable[RHT_KOKIRI_FOREST] = HintText::Exclude({
         // obscure text
         Text{ "Kokiri Forest", /*french*/ "la Forêt Kokiri", /*spanish*/ "el Bosque Kokiri" },
     });
 
-    hintTable[THE_LOST_WOODS] = HintText::Exclude({
+    hintTable[RHT_THE_LOST_WOODS] = HintText::Exclude({
         // obscure text
         Text{ "the Lost Woods", /*french*/ "les Bois Perdus", /*spanish*/ "el Bosque Perdido" },
     });
 
-    hintTable[SACRED_FOREST_MEADOW] = HintText::Exclude({
+    hintTable[RHT_SACRED_FOREST_MEADOW] = HintText::Exclude({
         // obscure text
         Text{ "Sacred Forest Meadow", /*french*/ "le Bosquet Sacré", /*spanish*/ "la pradera sagrada del bosque" },
     });
 
-    hintTable[HYRULE_FIELD] = HintText::Exclude({
+    hintTable[RHT_HYRULE_FIELD] = HintText::Exclude({
         // obscure text
         Text{ "Hyrule Field", /*french*/ "la Plaine d'Hyrule", /*spanish*/ "la Llanura de Hyrule" },
     });
 
-    hintTable[LAKE_HYLIA] = HintText::Exclude({
+    hintTable[RHT_LAKE_HYLIA] = HintText::Exclude({
         // obscure text
         Text{ "Lake Hylia", /*french*/ "le Lac Hylia", /*spanish*/ "el Lago Hylia" },
     });
 
-    hintTable[GERUDO_VALLEY] = HintText::Exclude({
+    hintTable[RHT_GERUDO_VALLEY] = HintText::Exclude({
         // obscure text
         Text{ "Gerudo Valley", /*french*/ "la Vallée Gerudo", /*spanish*/ "el Valle Gerudo" },
     });
 
-    hintTable[GERUDO_FORTRESS] = HintText::Exclude({
+    hintTable[RHT_GERUDO_FORTRESS] = HintText::Exclude({
         // obscure text
         Text{ "Gerudo's Fortress", /*french*/ "le Repaire des Voleurs", /*spanish*/ "la Fortaleza Gerudo" },
     });
 
-    hintTable[HAUNTED_WASTELAND] = HintText::Exclude({
+    hintTable[RHT_HAUNTED_WASTELAND] = HintText::Exclude({
         // obscure text
         Text{ "Haunted Wasteland", /*french*/ "le Désert Hanté", /*spanish*/ "el desierto encantado" },
     });
 
-    hintTable[DESERT_COLOSSUS] = HintText::Exclude({
+    hintTable[RHT_DESERT_COLOSSUS] = HintText::Exclude({
         // obscure text
         Text{ "Desert Colossus", /*french*/ "le Colosse du Désert", /*spanish*/ "el Coloso del Desierto" },
     });
 
-    hintTable[THE_MARKET] = HintText::Exclude({
+    hintTable[RHT_THE_MARKET] = HintText::Exclude({
         // obscure text
         Text{ "the Market", /*french*/ "la Place du Marché", /*spanish*/ "la plaza del mercado" },
     });
 
-    hintTable[TEMPLE_OF_TIME] = HintText::Exclude({
+    hintTable[RHT_TEMPLE_OF_TIME] = HintText::Exclude({
         // obscure text
         Text{ "Temple of Time", /*french*/ "le Temple du Temps", /*spanish*/ "el Templo del Tiempo" },
     });
 
-    hintTable[HYRULE_CASTLE] = HintText::Exclude({
+    hintTable[RHT_HYRULE_CASTLE] = HintText::Exclude({
         // obscure text
         Text{ "Hyrule Castle", /*french*/ "le Château d'Hyrule", /*spanish*/ "el Castillo de Hyrule" },
     });
 
-    hintTable[OUTSIDE_GANONS_CASTLE] = HintText::Exclude({
+    hintTable[RHT_OUTSIDE_GANONS_CASTLE] = HintText::Exclude({
         // obscure text
         Text{ "outside Ganon's Castle", /*french*/ "les alentours du Château&de Ganon",
               /*spanish*/ "el exterior del Castillo de Ganon" },
     });
 
-    hintTable[KAKARIKO_VILLAGE] = HintText::Exclude({
+    hintTable[RHT_KAKARIKO_VILLAGE] = HintText::Exclude({
         // obscure text
         Text{ "Kakariko Village", /*french*/ "le Village Cocorico", /*spanish*/ "Kakariko" },
     });
 
-    hintTable[THE_GRAVEYARD] = HintText::Exclude({
+    hintTable[RHT_THE_GRAVEYARD] = HintText::Exclude({
         // obscure text
         Text{ "the Graveyard", /*french*/ "le Cimetière", /*spanish*/ "el cementerio" },
     });
 
-    hintTable[DEATH_MOUNTAIN_TRAIL] = HintText::Exclude({
+    hintTable[RHT_DEATH_MOUNTAIN_TRAIL] = HintText::Exclude({
         // obscure text
         Text{ "Death Mountain Trail", /*french*/ "le Chemin du Péril",
               /*spanish*/ "el sendero de la Montaña de la Muerte" },
     });
 
-    hintTable[GORON_CITY] = HintText::Exclude({
+    hintTable[RHT_GORON_CITY] = HintText::Exclude({
         // obscure text
         Text{ "Goron City", /*french*/ "le Village Goron", /*spanish*/ "la Ciudad Goron" },
     });
 
-    hintTable[DEATH_MOUNTAIN_CRATER] = HintText::Exclude({
+    hintTable[RHT_DEATH_MOUNTAIN_CRATER] = HintText::Exclude({
         // obscure text
         Text{ "Death Mountain Crater", /*french*/ "le Cratère du Péril",
               /*spanish*/ "el cráter de la Montaña de la Muerte" },
     });
 
-    hintTable[ZORAS_RIVER] = HintText::Exclude({
+    hintTable[RHT_ZORAS_RIVER] = HintText::Exclude({
         // obscure text
         Text{ "Zora's River", /*french*/ "la Rivière Zora", /*spanish*/ "el Río Zora" },
     });
 
-    hintTable[ZORAS_DOMAIN] = HintText::Exclude({
+    hintTable[RHT_ZORAS_DOMAIN] = HintText::Exclude({
         // obscure text
         Text{ "Zora's Domain", /*french*/ "le Domaine Zora", /*spanish*/ "la Región de los Zora" },
     });
 
-    hintTable[ZORAS_FOUNTAIN] = HintText::Exclude({
+    hintTable[RHT_ZORAS_FOUNTAIN] = HintText::Exclude({
         // obscure text
         Text{ "Zora's Fountain", /*french*/ "la Fontaine Zora", /*spanish*/ "la Fuente Zora" },
     });
 
-    hintTable[LON_LON_RANCH] = HintText::Exclude({
+    hintTable[RHT_LON_LON_RANCH] = HintText::Exclude({
         // obscure text
         Text{ "Lon Lon Ranch", /*french*/ "le Ranch Lon Lon", /*spanish*/ "el Rancho Lon Lon" },
     });
@@ -1108,437 +1109,437 @@ void HintTable_Init() {
     |     REGION HINT TEXT     |
     ---------------------------*/
 
-    hintTable[KF_LINKS_HOUSE] = HintText::Region({
+    hintTable[RHT_KF_LINKS_HOUSE] = HintText::Region({
         // obscure text
         Text{ "Link's House", /*french*/ "la #maison de @#", /*spanish*/ "la casa de @" },
     });
 
-    //   hintTable[TOT_MAIN] = HintText::Region({
+    //   hintTable[RHT_TOT_MAIN] = HintText::Region({
     //                    //obscure text
     //                    Text{"the #Temple of Time#", /*french*/"le #Temple du Temps#", /*spanish*/"el Templo del
     //                    Tiempo"},
     // });
 
-    hintTable[KF_MIDOS_HOUSE] = HintText::Region({
+    hintTable[RHT_KF_MIDOS_HOUSE] = HintText::Region({
         // obscure text
         Text{ "Mido's house", /*french*/ "la Cabane du Grand Mido", /*spanish*/ "la casa de Mido" },
     });
 
-    hintTable[KF_SARIAS_HOUSE] = HintText::Region({
+    hintTable[RHT_KF_SARIAS_HOUSE] = HintText::Region({
         // obscure text
         Text{ "Saria's House", /*french*/ "la Cabane de Saria", /*spanish*/ "la casa de Saria" },
     });
 
-    hintTable[KF_HOUSE_OF_TWINS] = HintText::Region({
+    hintTable[RHT_KF_HOUSE_OF_TWINS] = HintText::Region({
         // obscure text
         Text{ "the #House of Twins#", /*french*/ "la Cabane des Jumelles", /*spanish*/ "la casa de las gemelas" },
     });
 
-    hintTable[KF_KNOW_IT_ALL_HOUSE] = HintText::Region({
+    hintTable[RHT_KF_KNOW_IT_ALL_HOUSE] = HintText::Region({
         // obscure text
         Text{ "Know-It-All Brothers' House", /*french*/ "la Cabane des frères Je-Sais-Tout",
               /*spanish*/ "la casa de los hermanos Sabelotodo" },
     });
 
-    hintTable[KF_KOKIRI_SHOP] = HintText::Region({
+    hintTable[RHT_KF_KOKIRI_SHOP] = HintText::Region({
         // obscure text
         Text{ "the #Kokiri Shop#", /*french*/ "le #Magasin Kokiri#", /*spanish*/ "la tienda kokiri" },
     });
 
-    hintTable[LH_LAB] = HintText::Region({
+    hintTable[RHT_LH_LAB] = HintText::Region({
         // obscure text
         Text{ "the #Lakeside Laboratory#", /*french*/ "le #Laboratoire du Lac#",
               /*spanish*/ "el laboratorio del lago" },
     });
 
-    hintTable[LH_FISHING_HOLE] = HintText::Region({
+    hintTable[RHT_LH_FISHING_HOLE] = HintText::Region({
         // obscure text
         Text{ "the #Fishing Pond#", /*french*/ "l'#Étang#", /*spanish*/ "el estanque" },
     });
 
-    hintTable[GV_CARPENTER_TENT] = HintText::Region({
+    hintTable[RHT_GV_CARPENTER_TENT] = HintText::Region({
         // obscure text
         Text{ "the #Carpenters' tent#", /*french*/ "la #Tente des charpentiers#",
               /*spanish*/ "la #tienda de campaña de los carpinteros#" },
     });
 
-    hintTable[MARKET_GUARD_HOUSE] = HintText::Region({
+    hintTable[RHT_MARKET_GUARD_HOUSE] = HintText::Region({
         // obscure text
         Text{ "the #Guard House#", /*french*/ "le #poste de garde#", /*spanish*/ "la caseta de guardia" },
     });
 
-    hintTable[MARKET_MASK_SHOP] = HintText::Region({
+    hintTable[RHT_MARKET_MASK_SHOP] = HintText::Region({
         // obscure text
         Text{ "the #Happy Mask Shop#", /*french*/ "la #Foire Aux Masques#",
               /*spanish*/ "la tienda de La Máscara Feliz" },
     });
 
-    hintTable[MARKET_BOMBCHU_BOWLING] = HintText::Region({
+    hintTable[RHT_MARKET_BOMBCHU_BOWLING] = HintText::Region({
         // obscure text
         Text{ "the #Bombchu Bowling Alley#", /*french*/ "le #Bowling Teigneux#", /*spanish*/ "la Bolera Bombchu" },
     });
 
-    hintTable[MARKET_POTION_SHOP] = HintText::Region({
+    hintTable[RHT_MARKET_POTION_SHOP] = HintText::Region({
         // obscure text
         Text{ "the #Market Potion Shop#", /*french*/ "l'#apothicaire de la Place du Marché#",
               /*spanish*/ "la tienda de pociones de la plaza del mercado" },
     });
 
-    hintTable[MARKET_TREASURE_CHEST_GAME] = HintText::Region({
+    hintTable[RHT_MARKET_TREASURE_CHEST_GAME] = HintText::Region({
         // obscure text
         Text{ "the #Treasure Chest Shop#", /*french*/ "la #Chasse-aux-Trésors#", /*spanish*/ "el Cofre del Tesoro" },
     });
 
-    hintTable[MARKET_BOMBCHU_SHOP] = HintText::Region({
+    hintTable[RHT_MARKET_BOMBCHU_SHOP] = HintText::Region({
         // obscure text
         Text{ "the #Bombchu Shop#", /*french*/ "le #Magasin de Missiles#", /*spanish*/ "la Tienda Bombchu" },
     });
 
-    hintTable[MARKET_MAN_IN_GREEN_HOUSE] = HintText::Region({
+    hintTable[RHT_MARKET_MAN_IN_GREEN_HOUSE] = HintText::Region({
         // obscure text
         Text{ "Man in Green's House", /*french*/ "la #Maison de l'Homme en Vert#",
               /*spanish*/ "la casa del hombre de verde" },
     });
 
-    hintTable[KAK_WINDMILL] = HintText::Region({
+    hintTable[RHT_KAK_WINDMILL] = HintText::Region({
         // obscure text
         Text{ "the #Windmill#", /*french*/ "le #Moulin#", /*spanish*/ "el #molino#" },
     });
 
-    hintTable[KAK_CARPENTER_BOSS_HOUSE] = HintText::Region({
+    hintTable[RHT_KAK_CARPENTER_BOSS_HOUSE] = HintText::Region({
         // obscure text
         Text{ "the #Carpenters' Boss House#", /*french*/ "la #Maison du Chef des ouvriers#",
               /*spanish*/ "la casa del capataz de los carpinteros" },
     });
 
-    hintTable[KAK_HOUSE_OF_SKULLTULA] = HintText::Region({
+    hintTable[RHT_KAK_HOUSE_OF_SKULLTULA] = HintText::Region({
         // obscure text
         Text{ "the #House of Skulltula#", /*french*/ "la #Maison des Skulltulas#",
               /*spanish*/ "la casa de las Skulltulas" },
     });
 
-    hintTable[KAK_IMPAS_HOUSE] = HintText::Region({
+    hintTable[RHT_KAK_IMPAS_HOUSE] = HintText::Region({
         // obscure text
         Text{ "Impa's House", /*french*/ "la #Maison d'Impa#", /*spanish*/ "la casa de Impa" },
     });
 
-    hintTable[KAK_IMPAS_HOUSE_BACK] = HintText::Region({
+    hintTable[RHT_KAK_IMPAS_HOUSE_BACK] = HintText::Region({
         // obscure text
         Text{ "Impa's cow cage", /*french*/ "la #cage à vache d'Impa#", /*spanish*/ "la jaula de la vaca de Impa" },
     });
 
-    hintTable[KAK_ODD_POTION_BUILDING] = HintText::Region({
+    hintTable[RHT_KAK_ODD_POTION_BUILDING] = HintText::Region({
         // obscure text
         Text{ "Granny's Potion Shop", /*french*/ "la #maison bleue de Cocorico#",
               /*spanish*/ "la tienda de pociones de la abuela" },
     });
 
-    hintTable[GRAVEYARD_DAMPES_HOUSE] = HintText::Region({
+    hintTable[RHT_GRAVEYARD_DAMPES_HOUSE] = HintText::Region({
         // obscure text
         Text{ "Dampé's Hut", /*french*/ "la #Cabane du Fossoyeur#", /*spanish*/ "la cabaña de Dampé" },
     });
 
-    hintTable[GC_SHOP] = HintText::Region({
+    hintTable[RHT_GC_SHOP] = HintText::Region({
         // obscure text
         Text{ "the #Goron Shop#", /*french*/ "la #Boutique Goron#", /*spanish*/ "la #tienda goron#" },
     });
 
-    hintTable[ZD_SHOP] = HintText::Region({
+    hintTable[RHT_ZD_SHOP] = HintText::Region({
         // obscure text
         Text{ "the #Zora Shop#", /*french*/ "la #Boutique Zora#", /*spanish*/ "la #tienda zora#" },
     });
 
-    hintTable[LLR_TALONS_HOUSE] = HintText::Region({
+    hintTable[RHT_LLR_TALONS_HOUSE] = HintText::Region({
         // obscure text
         Text{ "Talon's House", /*french*/ "la #Maison de Talon#", /*spanish*/ "la casa de Talon" },
     });
 
-    hintTable[LLR_STABLES] = HintText::Region({
+    hintTable[RHT_LLR_STABLES] = HintText::Region({
         // obscure text
         Text{ "a #stable#", /*french*/ "l'#Étable#", /*spanish*/ "el establo" },
     });
 
-    hintTable[LLR_TOWER] = HintText::Region({
+    hintTable[RHT_LLR_TOWER] = HintText::Region({
         // obscure text
         Text{ "the #Lon Lon Tower#", /*french*/ "le #silo du Ranch Lon Lon#", /*spanish*/ "la torre Lon Lon" },
     });
 
-    hintTable[MARKET_BAZAAR] = HintText::Region({
+    hintTable[RHT_MARKET_BAZAAR] = HintText::Region({
         // obscure text
         Text{ "the #Market Bazaar#", /*french*/ "le #Bazar de la Place du Marché#",
               /*spanish*/ "el bazar de la plaza del mercado" },
     });
 
-    hintTable[MARKET_SHOOTING_GALLERY] = HintText::Region({
+    hintTable[RHT_MARKET_SHOOTING_GALLERY] = HintText::Region({
         // obscure text
         Text{ "a #Slingshot Shooting Gallery#", /*french*/ "le #Jeu d'Adresse de la Place du Marché#",
               /*spanish*/ "el Tiro al Blanco con tirachinas" },
     });
 
-    hintTable[KAK_BAZAAR] = HintText::Region({
+    hintTable[RHT_KAK_BAZAAR] = HintText::Region({
         // obscure text
         Text{ "the #Kakariko Bazaar#", /*french*/ "le #Bazar de Cocorico#", /*spanish*/ "el bazar de Kakariko" },
     });
 
-    hintTable[KAK_POTION_SHOP_FRONT] = HintText::Region({
+    hintTable[RHT_KAK_POTION_SHOP_FRONT] = HintText::Region({
         // obscure text
         Text{ "the #Kakariko Potion Shop#", /*french*/ "l'#apothicaire de Cocorico#",
               /*spanish*/ "la tienda de pociones de Kakariko" },
     });
 
-    hintTable[KAK_POTION_SHOP_BACK] = HintText::Region({
+    hintTable[RHT_KAK_POTION_SHOP_BACK] = HintText::Region({
         // obscure text
         Text{ "the #Kakariko Potion Shop#", /*french*/ "l'#apothicaire de Cocorico#",
               /*spanish*/ "la tienda de pociones de Kakariko" },
     });
 
-    hintTable[KAK_SHOOTING_GALLERY] = HintText::Region({
+    hintTable[RHT_KAK_SHOOTING_GALLERY] = HintText::Region({
         // obscure text
         Text{ "a #Bow Shooting Gallery#", /*french*/ "le #jeu d'adresse de Cocorico#",
               /*spanish*/ "el Tiro al Blanco con arco" },
     });
 
-    hintTable[COLOSSUS_GREAT_FAIRY_FOUNTAIN] = HintText::Region({
+    hintTable[RHT_COLOSSUS_GREAT_FAIRY_FOUNTAIN] = HintText::Region({
         // obscure text
         Text{ "a #Great Fairy Fountain#", /*french*/ "une #Fontaine Royale des Fées#",
               /*spanish*/ "una fuente de la Gran Hada" },
     });
 
-    hintTable[HC_GREAT_FAIRY_FOUNTAIN] = HintText::Region({
+    hintTable[RHT_HC_GREAT_FAIRY_FOUNTAIN] = HintText::Region({
         // obscure text
         Text{ "a #Great Fairy Fountain#", /*french*/ "une #Fontaine Royale des Fées#",
               /*spanish*/ "una fuente de la Gran Hada" },
     });
 
-    hintTable[OGC_GREAT_FAIRY_FOUNTAIN] = HintText::Region({
+    hintTable[RHT_OGC_GREAT_FAIRY_FOUNTAIN] = HintText::Region({
         // obscure text
         Text{ "a #Great Fairy Fountain#", /*french*/ "une #Fontaine Royale des Fées#",
               /*spanish*/ "una fuente de la Gran Hada" },
     });
 
-    hintTable[DMC_GREAT_FAIRY_FOUNTAIN] = HintText::Region({
+    hintTable[RHT_DMC_GREAT_FAIRY_FOUNTAIN] = HintText::Region({
         // obscure text
         Text{ "a #Great Fairy Fountain#", /*french*/ "une #Fontaine Royale des Fées#",
               /*spanish*/ "una fuente de la Gran Hada" },
     });
 
-    hintTable[DMT_GREAT_FAIRY_FOUNTAIN] = HintText::Region({
+    hintTable[RHT_DMT_GREAT_FAIRY_FOUNTAIN] = HintText::Region({
         // obscure text
         Text{ "a #Great Fairy Fountain#", /*french*/ "une #Fontaine Royale des Fées#",
               /*spanish*/ "una fuente de la Gran Hada" },
     });
 
-    hintTable[ZF_GREAT_FAIRY_FOUNTAIN] = HintText::Region({
+    hintTable[RHT_ZF_GREAT_FAIRY_FOUNTAIN] = HintText::Region({
         // obscure text
         Text{ "a #Great Fairy Fountain#", /*french*/ "une #Fontaine Royale des Fées#",
               /*spanish*/ "una fuente de la Gran Hada" },
     });
 
-    hintTable[GRAVEYARD_SHIELD_GRAVE] = HintText::Region({
+    hintTable[RHT_GRAVEYARD_SHIELD_GRAVE] = HintText::Region({
         // obscure text
         Text{ "a #grave with a free chest#", /*french*/ "le #tombeau avec un trésor#",
               /*spanish*/ "la #tumba con un cofre#" },
     });
 
-    hintTable[GRAVEYARD_HEART_PIECE_GRAVE] = HintText::Region({
+    hintTable[RHT_GRAVEYARD_HEART_PIECE_GRAVE] = HintText::Region({
         // obscure text
         Text{ "a chest spawned by #Sun's Song#", /*french*/ "un #coffre apparaît avec le Chant du Soleil#",
               /*spanish*/ "la #tumba de la Canción del Sol#" },
     });
 
-    hintTable[GRAVEYARD_COMPOSERS_GRAVE] = HintText::Region({
+    hintTable[RHT_GRAVEYARD_COMPOSERS_GRAVE] = HintText::Region({
         // obscure text
         Text{ "the #Composers' Grave#", /*french*/ "la #Tombe royale#", /*spanish*/ "el #Panteón Real#" },
     });
 
-    hintTable[GRAVEYARD_DAMPES_GRAVE] = HintText::Region({
+    hintTable[RHT_GRAVEYARD_DAMPES_GRAVE] = HintText::Region({
         // obscure text
         Text{ "Dampé's Grave", /*french*/ "la #Tombe d'Igor#", /*spanish*/ "la #tumba de Dampé#" },
     });
 
-    hintTable[DMT_COW_GROTTO] = HintText::Region({
+    hintTable[RHT_DMT_COW_GROTTO] = HintText::Region({
         // obscure text
         Text{ "a solitary #Cow#", /*french*/ "la #grotte avec une vache#", /*spanish*/ "una #vaca# solitaria" },
     });
 
-    hintTable[HC_STORMS_GROTTO] = HintText::Region({
+    hintTable[RHT_HC_STORMS_GROTTO] = HintText::Region({
         // obscure text
         Text{ "a sandy grotto with #fragile walls#", /*french*/ "la #grotte avec des murs fragiles#",
               /*spanish*/ "la arenosa gruta de #frágiles paredes#" },
     });
 
-    hintTable[HF_TEKTITE_GROTTO] = HintText::Region({
+    hintTable[RHT_HF_TEKTITE_GROTTO] = HintText::Region({
         // obscure text
         Text{ "a pool guarded by a #Tektite#", /*french*/ "l'#étang sous-terrain avec un Araknon#",
               /*spanish*/ "un charco custodiado por un #Tektite#" },
     });
 
-    hintTable[HF_NEAR_KAK_GROTTO] = HintText::Region({
+    hintTable[RHT_HF_NEAR_KAK_GROTTO] = HintText::Region({
         // obscure text
         Text{ "a #Big Skulltula# guarding a Gold one", /*french*/ "la #grotte d'araignées#",
               /*spanish*/ "una #gran Skulltula# custodiando una dorada" },
     });
 
-    hintTable[HF_COW_GROTTO] = HintText::Region({
+    hintTable[RHT_HF_COW_GROTTO] = HintText::Region({
         // obscure text
         Text{ "a grotto full of #spider webs#", /*french*/ "la #grotte couverte de toiles d'araignées#",
               /*spanish*/ "una gruta llena de #telarañas#" },
     });
 
-    hintTable[KAK_REDEAD_GROTTO] = HintText::Region({
+    hintTable[RHT_KAK_REDEAD_GROTTO] = HintText::Region({
         // obscure text
         Text{ "#ReDeads# guarding a chest", /*french*/ "le tombeau de #deux morts#",
               /*spanish*/ "los #ReDeads# que custodian un cofre" },
     });
 
-    hintTable[SFM_WOLFOS_GROTTO] = HintText::Region({
+    hintTable[RHT_SFM_WOLFOS_GROTTO] = HintText::Region({
         // obscure text
         Text{ "#Wolfos# guarding a chest", /*french*/ "la #grotte iridescente#",
               /*spanish*/ "los #Wolfos# que custodian un cofre" },
     });
 
-    hintTable[GV_OCTOROK_GROTTO] = HintText::Region({
+    hintTable[RHT_GV_OCTOROK_GROTTO] = HintText::Region({
         // obscure text
         Text{ "an #Octorok# guarding a rich pool", /*french*/ "un #étang sous-terrain avec un Octorok#",
               /*spanish*/ "un #Octorok# que custodia un lujoso charco" },
     });
 
-    hintTable[DEKU_THEATER] = HintText::Region({
+    hintTable[RHT_DEKU_THEATER] = HintText::Region({
         // obscure text
         Text{ "the #Lost Woods Stage#", /*french*/ "le #théâtre sylvestre#",
               /*spanish*/ "el #escenario del Bosque Perdido#" },
     });
 
-    hintTable[ZR_OPEN_GROTTO] = HintText::Region({
+    hintTable[RHT_ZR_OPEN_GROTTO] = HintText::Region({
         // obscure text
         Text{ "a #generic grotto#", /*french*/ "une #grotte avec un trésor#", /*spanish*/ "una #cueva genérica#" },
     });
 
-    hintTable[DMC_UPPER_GROTTO] = HintText::Region({
+    hintTable[RHT_DMC_UPPER_GROTTO] = HintText::Region({
         // obscure text
         Text{ "a #generic grotto#", /*french*/ "une #grotte avec un trésor#", /*spanish*/ "una #cueva genérica#" },
     });
 
-    hintTable[DMT_STORMS_GROTTO] = HintText::Region({
+    hintTable[RHT_DMT_STORMS_GROTTO] = HintText::Region({
         // obscure text
         Text{ "a #generic grotto#", /*french*/ "une #grotte avec un trésor#", /*spanish*/ "una #cueva genérica#" },
     });
 
-    hintTable[KAK_OPEN_GROTTO] = HintText::Region({
+    hintTable[RHT_KAK_OPEN_GROTTO] = HintText::Region({
         // obscure text
         Text{ "a #generic grotto#", /*french*/ "une #grotte avec un trésor#", /*spanish*/ "una #cueva genérica#" },
     });
 
-    hintTable[HF_NEAR_MARKET_GROTTO] = HintText::Region({
+    hintTable[RHT_HF_NEAR_MARKET_GROTTO] = HintText::Region({
         // obscure text
         Text{ "a #generic grotto#", /*french*/ "une #grotte avec un trésor#", /*spanish*/ "una #cueva genérica#" },
     });
 
-    hintTable[HF_OPEN_GROTTO] = HintText::Region({
+    hintTable[RHT_HF_OPEN_GROTTO] = HintText::Region({
         // obscure text
         Text{ "a #generic grotto#", /*french*/ "une #grotte avec un trésor#", /*spanish*/ "una #cueva genérica#" },
     });
 
-    hintTable[HF_SOUTHEAST_GROTTO] = HintText::Region({
+    hintTable[RHT_HF_SOUTHEAST_GROTTO] = HintText::Region({
         // obscure text
         Text{ "a #generic grotto#", /*french*/ "une #grotte avec un trésor#", /*spanish*/ "una #cueva genérica#" },
     });
 
-    hintTable[KF_STORMS_GROTTO] = HintText::Region({
+    hintTable[RHT_KF_STORMS_GROTTO] = HintText::Region({
         // obscure text
         Text{ "a #generic grotto#", /*french*/ "une #grotte avec un trésor#", /*spanish*/ "una #cueva genérica#" },
     });
 
-    hintTable[LW_NEAR_SHORTCUTS_GROTTO] = HintText::Region({
+    hintTable[RHT_LW_NEAR_SHORTCUTS_GROTTO] = HintText::Region({
         // obscure text
         Text{ "a #generic grotto#", /*french*/ "une #grotte avec un trésor#", /*spanish*/ "una #cueva genérica#" },
     });
 
-    hintTable[HF_INSIDE_FENCE_GROTTO] = HintText::Region({
+    hintTable[RHT_HF_INSIDE_FENCE_GROTTO] = HintText::Region({
         // obscure text
         Text{ "a #single Upgrade Deku Scrub#", /*french*/ "une #grotte avec une peste Mojo#",
               /*spanish*/ "una cueva con un #solitario mercader deku#" },
     });
 
-    hintTable[LW_SCRUBS_GROTTO] = HintText::Region({
+    hintTable[RHT_LW_SCRUBS_GROTTO] = HintText::Region({
         // obscure text
         Text{ "#2 Deku Scrubs# including an Upgrade one", /*french*/ "une #grotte avec deux pestes Mojo#",
               /*spanish*/ "una cueva con #dos mercaderes deku#" },
     });
 
-    hintTable[COLOSSUS_GROTTO] = HintText::Region({
+    hintTable[RHT_COLOSSUS_GROTTO] = HintText::Region({
         // obscure text
         Text{ "2 Deku Scrubs", /*french*/ "une #grotte avec deux pestes Mojo#",
               /*spanish*/ "una cueva con #dos mercaderes deku#" },
     });
 
-    hintTable[ZR_STORMS_GROTTO] = HintText::Region({
+    hintTable[RHT_ZR_STORMS_GROTTO] = HintText::Region({
         // obscure text
         Text{ "2 Deku Scrubs", /*french*/ "une #grotte avec deux pestes Mojo#",
               /*spanish*/ "una cueva con #dos mercaderes deku#" },
     });
 
-    hintTable[SFM_STORMS_GROTTO] = HintText::Region({
+    hintTable[RHT_SFM_STORMS_GROTTO] = HintText::Region({
         // obscure text
         Text{ "2 Deku Scrubs", /*french*/ "une #grotte avec deux pestes Mojo#",
               /*spanish*/ "una cueva con #dos mercaderes deku#" },
     });
 
-    hintTable[GV_STORMS_GROTTO] = HintText::Region({
+    hintTable[RHT_GV_STORMS_GROTTO] = HintText::Region({
         // obscure text
         Text{ "2 Deku Scrubs", /*french*/ "une #grotte avec deux pestes Mojo#",
               /*spanish*/ "una cueva con #dos mercaderes deku#" },
     });
 
-    hintTable[LH_GROTTO] = HintText::Region({
+    hintTable[RHT_LH_GROTTO] = HintText::Region({
         // obscure text
         Text{ "3 Deku Scrubs", /*french*/ "une #grotte avec trois pestes Mojo#",
               /*spanish*/ "una cueva con #tres mercaderes deku#" },
     });
 
-    hintTable[DMC_HAMMER_GROTTO] = HintText::Region({
+    hintTable[RHT_DMC_HAMMER_GROTTO] = HintText::Region({
         // obscure text
         Text{ "3 Deku Scrubs", /*french*/ "une #grotte avec trois pestes Mojo#",
               /*spanish*/ "una cueva con #tres mercaderes deku#" },
     });
 
-    hintTable[GC_GROTTO] = HintText::Region({
+    hintTable[RHT_GC_GROTTO] = HintText::Region({
         // obscure text
         Text{ "3 Deku Scrubs", /*french*/ "une #grotte avec trois pestes Mojo#",
               /*spanish*/ "una cueva con #tres mercaderes deku#" },
     });
 
-    hintTable[LLR_GROTTO] = HintText::Region({
+    hintTable[RHT_LLR_GROTTO] = HintText::Region({
         // obscure text
         Text{ "3 Deku Scrubs", /*french*/ "une #grotte avec trois pestes Mojo#",
               /*spanish*/ "una cueva con #tres mercaderes deku#" },
     });
 
-    hintTable[ZR_FAIRY_GROTTO] = HintText::Region({
+    hintTable[RHT_ZR_FAIRY_GROTTO] = HintText::Region({
         // obscure text
         Text{ "a small #Fairy Fountain#", /*french*/ "une #fontaine de fées#",
               /*spanish*/ "una pequeña #fuente de hadas#" },
     });
 
-    hintTable[HF_FAIRY_GROTTO] = HintText::Region({
+    hintTable[RHT_HF_FAIRY_GROTTO] = HintText::Region({
         // obscure text
         Text{ "a small #Fairy Fountain#", /*french*/ "une #fontaine de fées#",
               /*spanish*/ "una pequeña #fuente de hadas#" },
     });
 
-    hintTable[SFM_FAIRY_GROTTO] = HintText::Region({
+    hintTable[RHT_SFM_FAIRY_GROTTO] = HintText::Region({
         // obscure text
         Text{ "a small #Fairy Fountain#", /*french*/ "une #fontaine de fées#",
               /*spanish*/ "una pequeña #fuente de hadas#" },
     });
 
-    hintTable[ZD_STORMS_GROTTO] = HintText::Region({
+    hintTable[RHT_ZD_STORMS_GROTTO] = HintText::Region({
         // obscure text
         Text{ "a small #Fairy Fountain#", /*french*/ "une #fontaine de fées#",
               /*spanish*/ "una pequeña #fuente de hadas#" },
     });
 
-    hintTable[GF_STORMS_GROTTO] = HintText::Region({
+    hintTable[RHT_GF_STORMS_GROTTO] = HintText::Region({
         // obscure text
         Text{ "a small #Fairy Fountain#", /*french*/ "une #fontaine de fées#",
               /*spanish*/ "una pequeña #fuente de hadas#" },
@@ -1548,48 +1549,48 @@ void HintTable_Init() {
     |      JUNK HINT TEXT      |
     ---------------------------*/
 
-    hintTable[JUNK02] = HintText::Junk({
+    hintTable[RHT_JUNK02] = HintText::Junk({
         // obscure text
         Text{ "They say you must read the names of \"Special Deal\" shop items carefully.",
               /*french*/ "Selon moi, les \"Offres spéciales\" sont parfois trompeuses... Lisez les attentivement!",
               /*spanish*/ "Según dicen, se debería prestar atención a los nombres de las ofertas especiales." },
     });
 
-    hintTable[JUNK03] = HintText::Junk({
+    hintTable[RHT_JUNK03] = HintText::Junk({
         // obscure text
         Text{ "They say that Zelda is a poor leader.", /*french*/ "Selon moi, Zelda ne ferait pas un bon monarque.",
               /*spanish*/ "Según dicen, Zelda es mala líder." },
     });
 
-    hintTable[JUNK04] = HintText::Junk({
+    hintTable[RHT_JUNK04] = HintText::Junk({
         // obscure text
         Text{ "These hints can be quite useful. This is an exception.",
               /*french*/ "Ces indices sont très utiles, à l'exception de celui-ci.",
               /*spanish*/ "Las pistas suelen servir de ayuda. En cambio, esta no." },
     });
 
-    hintTable[JUNK05] = HintText::Junk({
+    hintTable[RHT_JUNK05] = HintText::Junk({
         // obscure text
         Text{ "They say that the Lizalfos in Dodongo's Cavern like to play in lava.",
               /*french*/ "Selon moi, les Lézalfos de la Caverne Dodongo aiment patauger dans la lave.",
               /*spanish*/ "Según dicen, a los Lizalfos de la Cueva de los Dodongos les gusta jugar en la lava." },
     });
 
-    hintTable[JUNK06] = HintText::Junk({
+    hintTable[RHT_JUNK06] = HintText::Junk({
         // obscure text
         Text{ "They say that all the Zora drowned in Wind Waker.",
               /*french*/ "Selon moi, les Zoras se sont noyés dans Wind Waker.",
               /*spanish*/ "Según dicen, en Wind Waker todos los zora se ahogaron." },
     });
 
-    hintTable[JUNK07] = HintText::Junk({
+    hintTable[RHT_JUNK07] = HintText::Junk({
         // obscure text
         Text{ "If Gorons eat rocks, does that mean I'm in danger?",
               /*french*/ "Ne dis pas au Gorons que je suis ici. Ils mangent des roches, tu sais!",
               /*spanish*/ "Si los Goron se tragan las piedras, ¿no me hace ser una especia vulnarable o algo así" },
     });
 
-    hintTable[JUNK08] = HintText::Junk({
+    hintTable[RHT_JUNK08] = HintText::Junk({
         // obscure text
         Text{
             "'Member when Ganon was a blue pig?^I 'member.",
@@ -1597,20 +1598,20 @@ void HintTable_Init() {
             /*spanish*/ "¿T'acuerdas cuando Ganon era un cerdo azul?^Qué tiempos, chico." },
     });
 
-    hintTable[JUNK09] = HintText::Junk({
+    hintTable[RHT_JUNK09] = HintText::Junk({
         // obscure text
         Text{ "One who does not have Triforce can't go in.", /*french*/ "Ceux sans Triforce doivent rebrousser chemin.",
               /*spanish*/ "Aquel que no porte la Trifuerza no podrá pasar." },
     });
 
-    hintTable[JUNK10] = HintText::Junk({
+    hintTable[RHT_JUNK10] = HintText::Junk({
         // obscure text
         Text{ "Save your future, end the Happy Mask Salesman.",
               /*french*/ "Selon moi, tu t'éviteras des jours de malheur si tu vaincs le vendeur de masques...",
               /*spanish*/ "Salva tu futuro, acaba con el dueño de La Máscara Feliz." },
     });
 
-    hintTable[JUNK11] = HintText::Junk({
+    hintTable[RHT_JUNK11] = HintText::Junk({
         // obscure text
         Text{ "Glitches are a pathway to many abilities some consider to be... Unnatural.", /*french*/
               "Les glitchs sont un moyen d'acquérir de nombreuses facultés considérées par certains comme... contraire "
@@ -1618,75 +1619,75 @@ void HintTable_Init() {
               /*spanish*/ "Los glitches son el camino a muchas habilidades que varios consideran... nada natural." },
     });
 
-    hintTable[JUNK12] = HintText::Junk({
+    hintTable[RHT_JUNK12] = HintText::Junk({
         // obscure text
         Text{ "I'm stoned. Get it?", /*french*/ "Allez, roche, papier, ciseau...&Roche.",
               /*spanish*/ "Me he quedado de piedra. ¿Lo pillas?" },
     });
 
-    hintTable[JUNK13] = HintText::Junk({
+    hintTable[RHT_JUNK13] = HintText::Junk({
         // obscure text
         Text{ "Hoot! Hoot! Would you like me to repeat that?", /*french*/ "Hou hou! Veux-tu que je répète tout ça?",
               /*spanish*/ "¡Buuu, buuu! ¿Te lo vuelvo a repetir?" },
     });
 
-    hintTable[JUNK14] = HintText::Junk({
+    hintTable[RHT_JUNK14] = HintText::Junk({
         // obscure text
         Text{ "Gorons are stupid. They eat rocks.", /*french*/ "Les Gorons sont des vraies têtes dures.",
               /*spanish*/ "Los Goron son tontos. Se comen las piedras." },
     });
 
-    hintTable[JUNK15] = HintText::Junk({
+    hintTable[RHT_JUNK15] = HintText::Junk({
         // obscure text
         Text{ "They say that Lon Lon Ranch prospered under Ingo.",
               /*french*/ "Selon moi, le Ranch Lon Lon était plus prospère sous Ingo.",
               /*spanish*/ "Según dicen, el Rancho Lon Lon prosperó gracias a Ingo." },
     });
 
-    hintTable[JUNK16] = HintText::Junk({
+    hintTable[RHT_JUNK16] = HintText::Junk({
         // obscure text
         Text{ "The single rupee is a unique item.", /*french*/ "Nul objet n'est plus unique que le rubis vert.",
               /*spanish*/ "La rupia de uno es un objeto singular." },
     });
 
-    hintTable[JUNK17] = HintText::Junk({
+    hintTable[RHT_JUNK17] = HintText::Junk({
         // obscure text
         Text{ "Without the Lens of Truth, the Treasure Chest Mini-Game is a 1 out of 32 chance.^Good luck!",
               /*french*/ "Gagner la Chasse-aux-Trésors est 1 chance sur 32.^Bonne chance!", /*spanish*/
               "Sin la Lupa de la Verdad, ganarías 1/32 veces en el Cofre del Tesoro.^¡Buena suerte con ello!" },
     });
 
-    hintTable[JUNK18] = HintText::Junk({
+    hintTable[RHT_JUNK18] = HintText::Junk({
         // obscure text
         Text{ "Use bombs wisely.", /*french*/ "Utilise les bombes avec précaution.",
               /*spanish*/ "No desperdicies las bombas." },
     });
 
-    hintTable[JUNK19] = HintText::Junk({
+    hintTable[RHT_JUNK19] = HintText::Junk({
         // obscure text
         Text{ "They say that Volvagia hates splinters", /*french*/ "Selon moi, Volvagia déteste les échardes.",
               /*spanish*/ "Según dicen, Volvagia le teme a las astillas." },
     });
 
-    hintTable[JUNK20] = HintText::Junk({
+    hintTable[RHT_JUNK20] = HintText::Junk({
         // obscure text
         Text{ "They say that funky monkeys can be spotted on Friday.",
               /*french*/ "Selon moi, des capucins coquins sortent le vendredi.",
               /*spanish*/ "Según dicen, en los viernes puedes hallar monos marchosos." },
     });
 
-    hintTable[JUNK21] = HintText::Junk({
+    hintTable[RHT_JUNK21] = HintText::Junk({
         // obscure text
         Text{ "I found you, faker!", /*french*/ "Ah-ha! Je t'ai trouvé!", /*spanish*/ "¡Ahí estás, impostor!" },
     });
 
-    hintTable[JUNK22] = HintText::Junk({
+    hintTable[RHT_JUNK22] = HintText::Junk({
         // obscure text
         Text{ "They say the Groose is loose.", /*french*/ "Selon moi, Hergo est le vrai héros.",
               /*spanish*/ "Según dicen, Malton es un espanto." },
     });
 
-    hintTable[JUNK23] = HintText::Junk({
+    hintTable[RHT_JUNK23] = HintText::Junk({
         // obscure text
         Text{
             "They say that players who select the \"ON\" option for \"MOTION CONTROL\" are the real \"Zelda players!\"",
@@ -1695,129 +1696,129 @@ void HintTable_Init() {
             "Zelda." },
     });
 
-    hintTable[JUNK24] = HintText::Junk({
+    hintTable[RHT_JUNK24] = HintText::Junk({
         // obscure text
         Text{ "What happened to Sheik?", /*french*/ "Donc... Qu'est-ce qui arrive avec Sheik?",
               /*spanish*/ "¿Qué la habrá pasado a Sheik?" },
     });
 
-    hintTable[JUNK25] = HintText::Junk({
+    hintTable[RHT_JUNK25] = HintText::Junk({
         // obscure text
         Text{ "L2P @.", /*french*/ "Arrête de lire les indices et joue comme un grand, @.",
               /*spanish*/ "Mira que eres novato, @." },
     });
 
-    hintTable[JUNK26] = HintText::Junk({
+    hintTable[RHT_JUNK26] = HintText::Junk({
         // obscure text
         Text{ "I've heard you can cheat at Sploosh Kaboom.",
               /*french*/ "Selon moi, il y a une carte aux trésors à Mercantîle... Duh!",
               /*spanish*/ "He oído por ahí que puedes hacer trampa en el Sploosh Kaboom." },
     });
 
-    hintTable[JUNK27] = HintText::Junk({
+    hintTable[RHT_JUNK27] = HintText::Junk({
         // obscure text
         Text{ "I'm Lonk from Pennsylvania.", /*french*/ "Je suis Lonk, le héros de Pennsylvanie!",
               /*spanish*/ "Soy Lonk, de Pensilvania." },
     });
 
-    hintTable[JUNK28] = HintText::Junk({
+    hintTable[RHT_JUNK28] = HintText::Junk({
         // obscure text
         Text{ "I bet you'd like to have more bombs.", /*french*/ "Je parie que tu veux plus de bombes.",
               /*spanish*/ "Me apuesto a que quisieras tener más bombas." },
     });
 
-    hintTable[JUNK29] = HintText::Junk({
+    hintTable[RHT_JUNK29] = HintText::Junk({
         // obscure text
         Text{ "When all else fails, use Fire.", /*french*/ "Quand rien ne marche, utilise le feu.",
               /*spanish*/ "Cuando nada funcione, usa el fuego." },
     });
 
-    hintTable[JUNK30] = HintText::Junk({
+    hintTable[RHT_JUNK30] = HintText::Junk({
         // obscure text
         Text{ "Here's a hint, @. Don't be bad.", /*french*/ "Selon moi, la #Triforce# n'est pas dans le jeu... Duh!",
               /*spanish*/ "Aquí tienes una pista, @: deja de ser manco." },
     });
 
-    hintTable[JUNK31] = HintText::Junk({
+    hintTable[RHT_JUNK31] = HintText::Junk({
         // obscure text
         Text{ "Game Over. Return of Ganon.", /*french*/ "Partie terminée. RETour de Ganon.",
               /*spanish*/ "Fin de la partida. El regreso de Ganon." },
     });
 
-    hintTable[JUNK32] = HintText::Junk({
+    hintTable[RHT_JUNK32] = HintText::Junk({
         // obscure text
         Text{ "May the way of the Hero lead to the Triforce.",
               /*french*/ "Que le chemin du héros te mène à la Triforce.",
               /*spanish*/ "Puede que la senda del héroe te lleve hacia la Trifuerza." },
     });
 
-    hintTable[JUNK33] = HintText::Junk({
+    hintTable[RHT_JUNK33] = HintText::Junk({
         // obscure text
         Text{ "Can't find an item? Scan an Amiibo.", /*french*/ "Tu cherches de quoi? Utilise un Amiibo!",
               /*spanish*/ "¿No encuentras algo? Escanea un amiibo." },
     });
 
-    hintTable[JUNK34] = HintText::Junk({
+    hintTable[RHT_JUNK34] = HintText::Junk({
         // obscure text
         Text{ "They say this game has just a few glitches.",
               /*french*/ "Selon moi, ce jeu est complètement exempt de glitchs.",
               /*spanish*/ "Dicen que este juego apenas tiene glitches." },
     });
 
-    hintTable[JUNK35] = HintText::Junk({
+    hintTable[RHT_JUNK35] = HintText::Junk({
         // obscure text
         Text{ "BRRING BRRING This is Ulrira. Wrong number?",
               /*french*/ "DRING DRING!! Pépé le Ramollo à l'appareil... Quoi? Faux numéro?",
               /*spanish*/ "¡Ring! ¡Ring! Al habla Ulrira. ¿Me he equivocado de número?" },
     });
 
-    hintTable[JUNK36] = HintText::Junk({
+    hintTable[RHT_JUNK36] = HintText::Junk({
         // obscure text
         Text{ "Tingle Tingle Kooloo Limpah!", /*french*/ "Tingle! Tingle! Kooloolin... Pah!",
               /*spanish*/ "Tingle, Tingle, Kurulín... ¡PA!" },
     });
 
-    hintTable[JUNK37] = HintText::Junk({
+    hintTable[RHT_JUNK37] = HintText::Junk({
         // obscure text
         Text{ "L is real 2401", /*french*/ "L is real 2401", /*spanish*/ "L es real 2401." },
     });
 
-    hintTable[JUNK38] = HintText::Junk({
+    hintTable[RHT_JUNK38] = HintText::Junk({
         // obscure text
         Text{ "They say that Ganondorf will appear in the next Mario Tennis.",
               /*french*/ "Selon moi, Ganondorf sera la nouvelle recrue dans Mario Tennis.",
               /*spanish*/ "Según dicen, Ganondorf estará en el próximo Mario Tennis." },
     });
 
-    hintTable[JUNK39] = HintText::Junk({
+    hintTable[RHT_JUNK39] = HintText::Junk({
         // obscure text
         Text{ "Medigoron sells the earliest Breath of the Wild demo.",
               /*french*/ "Selon moi, Medigoron vend une démo de #Breath of the Wild#.",
               /*spanish*/ "Medigoron vende la primera demo del Breath of the Wild." },
     });
 
-    hintTable[JUNK40] = HintText::Junk({
+    hintTable[RHT_JUNK40] = HintText::Junk({
         // obscure text
         Text{ "Can you move me? I don't get great service here.",
               /*french*/ "Peux-tu me déplacer? J'ai pas une bonne réception ici.",
               /*spanish*/ "¿Puedes llevarme a otro lado? Aquí nadie me presta atención." },
     });
 
-    hintTable[JUNK41] = HintText::Junk({
+    hintTable[RHT_JUNK41] = HintText::Junk({
         // obscure text
         Text{ "They say if you use Strength on the truck, you can find Mew.",
               /*french*/ "Selon moi, #Mew# se trouve dessous le camion... Duh!",
               /*spanish*/ "Según dicen, puedes hallar un Mew usando Fuerza contra el camión de Ciudad Carmín." },
     });
 
-    hintTable[JUNK42] = HintText::Junk({
+    hintTable[RHT_JUNK42] = HintText::Junk({
         // obscure text
         Text{ "I'm a helpful hint Gossip Stone!^See, I'm helping.",
               /*french*/ "Salut! Je suis une pierre de bons conseils!^Tiens, tu vois? J'aide bien, hein?",
               /*spanish*/ "Soy una Piedra Sheikah muy útil.^¡Mira cómo te ayudo!" },
     });
 
-    hintTable[JUNK43] = HintText::Junk({
+    hintTable[RHT_JUNK43] = HintText::Junk({
         // obscure text
         Text{
             "Dear @, please come to the castle. I've baked a cake for you.&Yours truly, Princess Zelda.", /*french*/
@@ -1826,103 +1827,103 @@ void HintTable_Init() {
             "Querido @: Por favor, ven al castillo. He hecho una tarta para ti.&Sinceramente tuya: Princesa Zelda." },
     });
 
-    hintTable[JUNK44] = HintText::Junk({
+    hintTable[RHT_JUNK44] = HintText::Junk({
         // obscure text
         Text{ "They say all toasters toast toast.", /*french*/ "Selon moi, les grille-pains grillent du pain.",
               /*spanish*/ "Según dicen, todas las tostadoras tostan tostadas tostadas." },
     });
 
-    hintTable[JUNK45] = HintText::Junk({
+    hintTable[RHT_JUNK45] = HintText::Junk({
         // obscure text
         Text{ "You thought it would be a useful hint, but it was me, junk hint!",
               /*french*/ "Tu t'attendais à un bon indice... Mais c'était moi, un mauvais indice!", /*spanish*/
               "Je... Creeías que iba a ser una piedra de utilidad, ¡pero no, era yo, la piedra de la agonía!" },
     });
 
-    hintTable[JUNK46] = HintText::Junk({
+    hintTable[RHT_JUNK46] = HintText::Junk({
         // obscure text
         Text{ "They say that quest guidance can be found at a talking rock.",
               /*french*/ "Selon moi, des #indices# se trouvent auprès d'une pierre parlante... Duh!",
               /*spanish*/ "Según dicen, puedes consultarle ayuda a rocas parlanchinas." },
     });
 
-    hintTable[JUNK47] = HintText::Junk({
+    hintTable[RHT_JUNK47] = HintText::Junk({
         // obscure text
         Text{ "They say that the final item you're looking for can be found somewhere in Hyrule.",
               /*french*/ "Selon moi, le #dernier objet# se trouve quelque part dans Hyrule... Duh!",
               /*spanish*/ "Según dicen, el último objeto que te falte puede estar en cualquier rincón de Hyrule." },
     });
 
-    hintTable[JUNK48] = HintText::Junk({
+    hintTable[RHT_JUNK48] = HintText::Junk({
         // obscure text
         Text{ "Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.",
               /*french*/ "Mwip.^Mwip.^Mwip.^Mwip.^Mwip.^Mwip.^Mwip.^Mwip.^Mwip.^Mwip.^Mwip.^Mwip.",
               /*spanish*/ "Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep." },
     });
 
-    hintTable[JUNK49] = HintText::Junk({
+    hintTable[RHT_JUNK49] = HintText::Junk({
         // obscure text
         Text{ "They say that Barinade fears Deku Nuts.", /*french*/ "Selon moi, Barinade a la frousse des noix Mojo.",
               /*spanish*/ "Según dicen, lo que más teme a Barinade son las nueces deku." },
     });
 
-    hintTable[JUNK50] = HintText::Junk({
+    hintTable[RHT_JUNK50] = HintText::Junk({
         // obscure text
         Text{ "They say that Flare Dancers do not fear Goron-crafted blades.",
               /*french*/ "Selon moi, le danse-flamme n'a pas peur des armes de Goron.",
               /*spanish*/ "Según dicen, los Bailafuegos no le temen a las armas forjadas por Gorons." },
     });
 
-    hintTable[JUNK51] = HintText::Junk({
+    hintTable[RHT_JUNK51] = HintText::Junk({
         // obscure text
         Text{ "They say that Morpha is easily trapped in a corner.",
               /*french*/ "Selon moi, Morpha est facilement coincé.",
               /*spanish*/ "Según dicen, puedes atrapar a Morpha con facilidad en una esquina." },
     });
 
-    hintTable[JUNK52] = HintText::Junk({
+    hintTable[RHT_JUNK52] = HintText::Junk({
         // obscure text
         Text{ "They say that Bongo Bongo really hates the cold.",
               /*french*/ "Selon moi, Bongo Bongo a facilement froid aux doigts.",
               /*spanish*/ "Según dicen, Bongo Bongo odia a muerte el frío." },
     });
 
-    hintTable[JUNK53] = HintText::Junk({
+    hintTable[RHT_JUNK53] = HintText::Junk({
         // obscure text
         Text{ "They say that your sword is most powerful when you put it away.",
               /*french*/ "Selon moi, ton épée est à pleine puissance quand tu la rengaines.",
               /*spanish*/ "Según dicen, tu espada se vuelve más poderosa si la guardas." },
     });
 
-    hintTable[JUNK54] = HintText::Junk({
+    hintTable[RHT_JUNK54] = HintText::Junk({
         // obscure text
         Text{ "They say that bombing the hole Volvagia last flew into can be rewarding.",
               /*french*/ "Selon moi, le trou où se creuse Volvagia est vulnérable aux bombes.", /*spanish*/
               "Según dicen, trae buena suerte colocar una bomba en el último agujero de donde salió Volvagia." },
     });
 
-    hintTable[JUNK55] = HintText::Junk({
+    hintTable[RHT_JUNK55] = HintText::Junk({
         // obscure text
         Text{ "They say that invisible ghosts can be exposed with Deku Nuts.",
               /*french*/ "Selon moi, des fantômes invisibles apparaissent avec des noix Mojo.",
               /*spanish*/ "Según dicen, puedes exponer a los espectros invisibles con nueces deku." },
     });
 
-    hintTable[JUNK56] = HintText::Junk({
+    hintTable[RHT_JUNK56] = HintText::Junk({
         // obscure text
         Text{ "They say that the real Phantom Ganon is bright and loud.",
               /*french*/ "Selon moi, le vrai spectre de Ganon est clair et bruyant.",
               /*spanish*/ "Según dicen, el verdadero Ganon Fantasma es brillante y ruidoso." },
     });
 
-    hintTable[JUNK57] = HintText::Junk({
+    hintTable[RHT_JUNK57] = HintText::Junk({
         // obscure text
         Text{ "They say that walking backwards is very fast.",
               /*french*/ "Selon moi, tu fais marche arrière très rapidement pour un héros.",
               /*spanish*/ "Según dicen, es más rápido caminar hacia atrás." },
     });
 
-    hintTable[JUNK58] = HintText::Junk({
+    hintTable[RHT_JUNK58] = HintText::Junk({
         // obscure text
         Text{
             "They say that leaping above the Market entrance enriches most children.",
@@ -1930,56 +1931,56 @@ void HintTable_Init() {
             /*spanish*/ "Según dicen, saltar por las cadenas a la entrada de la plaza enriquece a muchos chiquillos." },
     });
 
-    hintTable[JUNK59] = HintText::Junk({
+    hintTable[RHT_JUNK59] = HintText::Junk({
         // obscure text
         Text{ "They say Ingo is not very good at planning ahead.",
               /*french*/ "Selon moi, Ingo ne fait pas un très bon geôlier.",
               /*spanish*/ "Según dicen, a Ingo no se le da especialmente bien planificar con antelación." },
     });
 
-    hintTable[JUNK60] = HintText::Junk({
+    hintTable[RHT_JUNK60] = HintText::Junk({
         // obscure text
         Text{ "You found a spiritual Stone! By which I mean, I worship Nayru.",
               /*french*/ "Vous avez trouvé une Pierre Ancestrale! En effet, je vénère la déesse Hylia.",
               /*spanish*/ "¡Has encontrado una piedra espiritual! Es que le rindo culto a Nayru..." },
     });
 
-    hintTable[JUNK61] = HintText::Junk({
+    hintTable[RHT_JUNK61] = HintText::Junk({
         // obscure text
         Text{ "They say that a flying strike with a Deku Stick is no stronger than a grounded one.",
               /*french*/ "Selon moi, un coup de bâton sauté n'est pas meilleur qu'au sol.",
               /*spanish*/ "Según dicen, los golpes aéreos con palos deku son tan fuertes como los normales." },
     });
 
-    hintTable[JUNK62] = HintText::Junk({
+    hintTable[RHT_JUNK62] = HintText::Junk({
         // obscure text
         Text{ "Open your eyes.^Open your eyes.^Wake up, @.",
               /*french*/ "Réveille-toi...^Réveille-toi.^Ouvre les yeux, @.",
               /*spanish*/ "Abre los ojos...^Abre los ojos...^Despierta, @..." },
     });
 
-    hintTable[JUNK63] = HintText::Junk({
+    hintTable[RHT_JUNK63] = HintText::Junk({
         // obscure text
         Text{ "They say that the Nocturne of Shadow can bring you very close to Ganon.",
               /*french*/ "Selon moi, le nocturne de l'ombre peut t'amener très près de Ganon.",
               /*spanish*/ "Según dicen, el Nocturno de la sombra te puede acercar mucho a Ganon." },
     });
 
-    hintTable[JUNK64] = HintText::Junk({
+    hintTable[RHT_JUNK64] = HintText::Junk({
         // obscure text
         Text{ "They say that Twinrova always casts the same spell the first three times.",
               /*french*/ "Selon moi, Twinrova lance toujours les mêmes trois premiers sorts.",
               /*spanish*/ "Según dicen, Birova siempre lanza el mismo hechizo las tres primeras veces." },
     });
 
-    hintTable[JUNK65] = HintText::Junk({
+    hintTable[RHT_JUNK65] = HintText::Junk({
         // obscure text
         Text{ "They say that the nightly builds may be unstable.",
               /*french*/ "Selon moi, les \"nightly builds\" peuvent être instables.",
               /*spanish*/ "Según dicen, las últimas nightlies pueden llegar a ser algo inestables." },
     });
 
-    hintTable[JUNK66] = HintText::Junk({
+    hintTable[RHT_JUNK66] = HintText::Junk({
         // obscure text
         Text{ "You're playing a Randomizer. I'm randomized!^Here's a random number:  #4#.&Enjoy your Randomizer!",
               /*french*/ "Tu joues à un randomizer. Je suis aléatoire!^Voici un nombre aléatoire: #4#.&Bonne partie!",
@@ -1988,14 +1989,14 @@ void HintTable_Init() {
               "#8#.&¡Diviértete!" },
     });
 
-    hintTable[JUNK67] = HintText::Junk({
+    hintTable[RHT_JUNK67] = HintText::Junk({
         // obscure text
         Text{ "They say Ganondorf's bolts can be reflected with glass or steel.",
               /*french*/ "Selon moi, les éclairs de Ganon se reflètent sur l'acier et le verre.",
               /*spanish*/ "Según dicen, puedes reflejar las esferas de energía de Ganondorf con cristal y acero." },
     });
 
-    hintTable[JUNK68] = HintText::Junk({
+    hintTable[RHT_JUNK68] = HintText::Junk({
         // obscure text
         Text{ "They say Ganon's tail is vulnerable to nuts, arrows, swords, explosives, hammers...^...sticks, seeds, "
               "boomerangs...^...rods, shovels, iron balls, angry bees...",
@@ -2007,7 +2008,7 @@ void HintTable_Init() {
               "martillos...^...palos, semillas, bumeráns...^...cetros, palas, bolas de hierro, abejas..." },
     });
 
-    hintTable[JUNK69] = HintText::Junk({
+    hintTable[RHT_JUNK69] = HintText::Junk({
         // obscure text
         Text{
             "They say that you're wasting time reading this hint, but I disagree. Talk to me again!",
@@ -2015,20 +2016,20 @@ void HintTable_Init() {
             "Según dicen, pierdes el tiempo en leer esta pista, pero no pienso igual. ¡Vuelve a hablarme, ya verás!" },
     });
 
-    hintTable[JUNK70] = HintText::Junk({
+    hintTable[RHT_JUNK70] = HintText::Junk({
         // obscure text
         Text{ "They say Ganondorf knows where to find the instrument of his doom.",
               /*french*/ "Selon moi, Ganondorf sait où il a caché son point faible.",
               /*spanish*/ "Según dicen, Ganondorf sabe dónde hallar el instrumento de su perdición." },
     });
 
-    hintTable[JUNK71] = HintText::Junk({
+    hintTable[RHT_JUNK71] = HintText::Junk({
         // obscure text
         Text{ "I heard @ is pretty good at Zelda.", /*french*/ "Apparemment, @ est super bon à Zelda.",
               /*spanish*/ "He oído que a @ se le dan muy bien los Zelda." },
     });
 
-    hintTable[JUNK72] = HintText::Junk({
+    hintTable[RHT_JUNK72] = HintText::Junk({
         // obscure text
         Text{ "Hi @, we've been trying to reach you about your car's extended warranty. ",
               /*french*/ "Bonjour, @. Vous avez une voiture? Vous savez, nous offrons des assurances abordables...",
@@ -2037,28 +2038,28 @@ void HintTable_Init() {
               "intereses ni comisiones." },
     });
 
-    hintTable[JUNK73] = HintText::Junk({
+    hintTable[RHT_JUNK73] = HintText::Junk({
         // obscure text
         Text{ "They say that the best weapon against Iron Knuckles is item 176.",
               /*french*/ "Selon moi, les hache-viandes sont vulnérables contre l'objet 176.",
               /*spanish*/ "Según dicen, la mejor arma para enfrentarse a los Nudillos de hierro es el objeto 176." },
     });
 
-    hintTable[JUNK74] = HintText::Junk({
+    hintTable[RHT_JUNK74] = HintText::Junk({
         // obscure text
         Text{ "They say that it's actually possible to beat the running man.",
               /*french*/ "Selon moi, il est possible de battre le coureur.&Donc, tu prends ton arc, et...",
               /*spanish*/ "Según dicen, con mucha perseverancia puedes ganarle al corredor con la capucha de conejo." },
     });
 
-    hintTable[JUNK75] = HintText::Junk({
+    hintTable[RHT_JUNK75] = HintText::Junk({
         // obscure text
         Text{ "They say that the stone-cold guardian of the Well is only present during work hours.",
               /*french*/ "Selon moi, le gardien de pierre du Puits quitte le soir pour aller se coucher.",
               /*spanish*/ "Según dicen, la inmensa roca que bloquea el pozo solo trabaja en horas laborales." },
     });
 
-    hintTable[JUNK76] = HintText::Junk({
+    hintTable[RHT_JUNK76] = HintText::Junk({
         // obscure text
         Text{
             "They say this hint makes more sense in other languages.",
@@ -2066,7 +2067,7 @@ void HintTable_Init() {
             /*spanish*/ "Según dicen, esta pista revela algo de vital importancia si cambias el idioma del juego..." },
     });
 
-    hintTable[JUNK77] = HintText::Junk({
+    hintTable[RHT_JUNK77] = HintText::Junk({
         // obscure text
         Text{ "BOK? No way.", /*french*/ "BD'accord? Hors de question.", /*spanish*/ "¿BVale? Ni hablar." },
     });
@@ -2077,391 +2078,391 @@ void HintTable_Init() {
 #define HINT_TEXT_NEEDS_TRANSLATION_FR \
     "Erreur 0x69a504:&Traduction manquante^C'est de la faute à Purple Hato!&J'vous jure!"
 
-    hintTable[JUNK78] = HintText::Junk({
+    hintTable[RHT_JUNK78] = HintText::Junk({
         //obscure text
         Text{"They say blarg...^...or at least briaguya does.", /*french*/"Tout ce que j'ai à dire, c'est blarg...^... 'fin c'est plutôt ce que briaguya dirait.", /*spanish*/"blarg"},
     });
 
-    hintTable[JUNK79] = HintText::Junk({
+    hintTable[RHT_JUNK79] = HintText::Junk({
         //obscure text
         Text{"They say this peace is what all true warriors strive for.", /*french*/"Selon moi, cette paix est ce pour quoi luttent tous les vrais guerriers.", /*spanish*/"blarg"},
     });
 
-    hintTable[JUNK80] = HintText::Junk({
+    hintTable[RHT_JUNK80] = HintText::Junk({
         //obscure text
         Text{"They say this ship is what all true gamers strive for.", /*french*/"Selon moi, cette version du port est ce pour quoi luttent tous les vrais gamers.", /*spanish*/"blarg"},
     });
 
-    hintTable[JUNK81] = HintText::Junk({
+    hintTable[RHT_JUNK81] = HintText::Junk({
         //obscure text
         Text{"They say that Glowsticks can be found in the Raveyard.", /*french*/"On peut trouver des Bâtons Lumineux sur le dancefloor du cimetière.", /*spanish*/"blarg"},
     });
 
-    hintTable[JUNK_WTC_1] = HintText::Junk({
+    hintTable[RHT_JUNK_WTC_1] = HintText::Junk({
         Text{ "They say %rthere are no more than 18&people on this island.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_WTC_2] = HintText::Junk({
+    hintTable[RHT_JUNK_WTC_2] = HintText::Junk({
         Text{ "They say I am one yet many", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_WTC_3] = HintText::Junk({
+    hintTable[RHT_JUNK_WTC_3] = HintText::Junk({
         Text{ "They say its all in the name of guiding&humanity down the right path.", HINT_TEXT_NEEDS_TRANSLATION_FR,
               "blarg" },
     });
 
-    hintTable[JUNK_WTC_4] = HintText::Junk({
+    hintTable[RHT_JUNK_WTC_4] = HintText::Junk({
         Text{ "They say \"Repetition requested\"", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_WTC_5] = HintText::Junk({
+    hintTable[RHT_JUNK_WTC_5] = HintText::Junk({
         Text{ "They say %rThe red tells only the truth!", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_WTC_6] = HintText::Junk({
+    hintTable[RHT_JUNK_WTC_6] = HintText::Junk({
         Text{ "They say good tidings to you^my traitorous @", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_WTC_7] = HintText::Junk({
+    hintTable[RHT_JUNK_WTC_7] = HintText::Junk({
         Text{ "They say when the seagulls cried,&none were left alive.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_WTC_7] = HintText::Junk({
+    hintTable[RHT_JUNK_WTC_7] = HintText::Junk({
         Text{ "They say when the seagulls cried,&none were left alive.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_WTC_8] = HintText::Junk({
+    hintTable[RHT_JUNK_WTC_8] = HintText::Junk({
         Text{ "They say she is lying with the red letters!", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_WTC_9] = HintText::Junk({
+    hintTable[RHT_JUNK_WTC_9] = HintText::Junk({
         Text{ "They say we'll meet again,&when something else cries.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_WTC_10] = HintText::Junk({
+    hintTable[RHT_JUNK_WTC_10] = HintText::Junk({
         Text{ "They say \"Forgive me, but-^Your script will not be used.&....After all...^The one writing the rest of "
               "the script...&will be me.\"",
               HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_WTC_11] = HintText::Junk({
+    hintTable[RHT_JUNK_WTC_11] = HintText::Junk({
         Text{ "They say tea is best enjoyed...^\"\"With your fellow monsters.\"\"", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_WTC_12] = HintText::Junk({
+    hintTable[RHT_JUNK_WTC_12] = HintText::Junk({
         Text{ "They say I shall make you some black tea. With my own hands, not magic.", HINT_TEXT_NEEDS_TRANSLATION_FR,
               "blarg" },
     });
 
-    hintTable[JUNK_SEI_1] = HintText::Junk({
+    hintTable[RHT_JUNK_SEI_1] = HintText::Junk({
         Text{ "They say you know I've kiboshed before...^and I will kibosh again.", HINT_TEXT_NEEDS_TRANSLATION_FR,
               "blarg" },
     });
 
-    hintTable[JUNK_SEI_2] = HintText::Junk({
+    hintTable[RHT_JUNK_SEI_2] = HintText::Junk({
         Text{ "They say if relationship @ walks through that door,^they will KILL independent @.",
               HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_SEI_3] = HintText::Junk({
+    hintTable[RHT_JUNK_SEI_3] = HintText::Junk({
         Text{ "They say you gotta have the BIG Salad.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_SEI_4] = HintText::Junk({
+    hintTable[RHT_JUNK_SEI_4] = HintText::Junk({
         Text{ "They say it's a festivus miracle", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_SEI_5] = HintText::Junk({
+    hintTable[RHT_JUNK_SEI_5] = HintText::Junk({
         Text{ "They say there are no houses in Tuscany to rent.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_SEI_6] = HintText::Junk({
+    hintTable[RHT_JUNK_SEI_6] = HintText::Junk({
         Text{ "They say my last boyfriend had a real&Kroner comprehension problem.", HINT_TEXT_NEEDS_TRANSLATION_FR,
               "blarg" },
     });
 
-    hintTable[JUNK_SEI_7] = HintText::Junk({
+    hintTable[RHT_JUNK_SEI_7] = HintText::Junk({
         Text{ "They say it's a festivus miracle.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_SEI_8] = HintText::Junk({
+    hintTable[RHT_JUNK_SEI_8] = HintText::Junk({
         Text{ "They say Louis quit the importing&to focus on the exporting.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_SEI_9] = HintText::Junk({
+    hintTable[RHT_JUNK_SEI_9] = HintText::Junk({
         Text{ "They say no thanks, I can't drink coffee&late at night, it keeps me up.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
     
-    hintTable[JUNK_SEI_10] = HintText::Junk({
+    hintTable[RHT_JUNK_SEI_10] = HintText::Junk({
         Text{ "They say it's not a lie if you believe it.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_SEI_11] = HintText::Junk({
+    hintTable[RHT_JUNK_SEI_11] = HintText::Junk({
         Text{ "They say there was a second spitter.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_SEI_12] = HintText::Junk({
+    hintTable[RHT_JUNK_SEI_12] = HintText::Junk({
         Text{ "They say there was a second spitter.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_SEI_13] = HintText::Junk({
+    hintTable[RHT_JUNK_SEI_13] = HintText::Junk({
         Text{ "They say the jerk store called,^they're running out of YOU.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
     
-    hintTable[JUNK_SEI_14] = HintText::Junk({
+    hintTable[RHT_JUNK_SEI_14] = HintText::Junk({
         Text{ "They say when you look annoyed all the time,&people thing you are busy.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_SEI_15] = HintText::Junk({
+    hintTable[RHT_JUNK_SEI_15] = HintText::Junk({
         Text{ "They say when you look annoyed all the time,&people think you are busy.", HINT_TEXT_NEEDS_TRANSLATION_FR,
               "blarg" },
     });
 
-    hintTable[JUNK_SEI_16] = HintText::Junk({
+    hintTable[RHT_JUNK_SEI_16] = HintText::Junk({
         Text{ "They say he fires people like its a bodily function.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_SEI_17] = HintText::Junk({
+    hintTable[RHT_JUNK_SEI_17] = HintText::Junk({
         Text{ "They say he threatened to move the ship to New Jersey&just to upset people.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_SEI_18] = HintText::Junk({
+    hintTable[RHT_JUNK_SEI_18] = HintText::Junk({
         Text{ "They say there was significant shrinkage.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_SEI_19] = HintText::Junk({
+    hintTable[RHT_JUNK_SEI_19] = HintText::Junk({
         Text{ "They say if it wasn't for the toilet there'd be no books.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_SEI_20] = HintText::Junk({
+    hintTable[RHT_JUNK_SEI_20] = HintText::Junk({
         Text{ "They say if it wasn't for the toilet there'd be no books.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_SEI_21] = HintText::Junk({
+    hintTable[RHT_JUNK_SEI_21] = HintText::Junk({
         Text{ "They say don't trust men in capes.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
     
-    hintTable[JUNK_SEI_22] = HintText::Junk({
+    hintTable[RHT_JUNK_SEI_22] = HintText::Junk({
         Text{ "They say @'s uncle works for Nintendo.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_SEI_23] = HintText::Junk({
+    hintTable[RHT_JUNK_SEI_23] = HintText::Junk({
         Text{ "They say @'s stole the marble rye.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_SEI_24] = HintText::Junk({
+    hintTable[RHT_JUNK_SEI_24] = HintText::Junk({
         Text{ "They say there is no better harmony&than the black and white cookie.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_SEI_25] = HintText::Junk({
+    hintTable[RHT_JUNK_SEI_25] = HintText::Junk({
         Text{ "They say @ hasn't vomited since 1983.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_SEI_26] = HintText::Junk({
+    hintTable[RHT_JUNK_SEI_26] = HintText::Junk({
         Text{ "They say you gotta have the early bird special.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_SEI_27] = HintText::Junk({
+    hintTable[RHT_JUNK_SEI_27] = HintText::Junk({
         Text{ "They say a donation has been made in your name&to the human fund.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_SEI_28] = HintText::Junk({
+    hintTable[RHT_JUNK_SEI_28] = HintText::Junk({
         Text{ "They say you want to be my latex salesman.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_SEI_29] = HintText::Junk({
+    hintTable[RHT_JUNK_SEI_29] = HintText::Junk({
         Text{ "They say if every instinct you have is wrong...^... then the opposite would have to be right.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_OTR_MEANS_1] = HintText::Junk({
+    hintTable[RHT_JUNK_OTR_MEANS_1] = HintText::Junk({
         Text{ "They say OTR stands for&Over the Rainbow", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
-    hintTable[JUNK_OTR_MEANS_2] = HintText::Junk({
+    hintTable[RHT_JUNK_OTR_MEANS_2] = HintText::Junk({
         Text{ "They say that OTR stands for&Onions, Tomatoes, and Radishes", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
-    hintTable[JUNK_OTR_MEANS_3] = HintText::Junk({
+    hintTable[RHT_JUNK_OTR_MEANS_3] = HintText::Junk({
         Text{ "They say that OTR stands for&Ocarina of Time Resources", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
-    hintTable[JUNK_OTR_MEANS_4] = HintText::Junk({
+    hintTable[RHT_JUNK_OTR_MEANS_4] = HintText::Junk({
         Text{ "They say that OTR stands for&Over the Road", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
-    hintTable[JUNK_OTR_MEANS_5] = HintText::Junk({
+    hintTable[RHT_JUNK_OTR_MEANS_5] = HintText::Junk({
         Text{ "They say that OTR stands for&Off the Record", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
-    hintTable[JUNK_OTR_MEANS_6] = HintText::Junk({
+    hintTable[RHT_JUNK_OTR_MEANS_6] = HintText::Junk({
         Text{ "They say that OTR stands for&Office of Tax and Revenue", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
-    hintTable[JUNK_OTR_MEANS_7] = HintText::Junk({
+    hintTable[RHT_JUNK_OTR_MEANS_7] = HintText::Junk({
         Text{ "They say OTR stands for&Over the Rainbow", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
-    hintTable[JUNK_OTR_MEANS_8] = HintText::Junk({
+    hintTable[RHT_JUNK_OTR_MEANS_8] = HintText::Junk({
         Text{ "They say that OTR stands for&Office of Trade Relations", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
-    hintTable[JUNK_OTR_MEANS_9] = HintText::Junk({
+    hintTable[RHT_JUNK_OTR_MEANS_9] = HintText::Junk({
         Text{ "They say that OTR stands for&Original Theatrical Release", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
-    hintTable[JUNK_OTR_MEANS_10] = HintText::Junk({
+    hintTable[RHT_JUNK_OTR_MEANS_10] = HintText::Junk({
         Text{ "They say that OTR stands for&Operational Test Requirement", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
-    hintTable[JUNK_OTR_MEANS_11] = HintText::Junk({
+    hintTable[RHT_JUNK_OTR_MEANS_11] = HintText::Junk({
         Text{ "They say that OTR stands for&Operational Trouble Report", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
-    hintTable[JUNK_OTR_MEANS_12] = HintText::Junk({
+    hintTable[RHT_JUNK_OTR_MEANS_12] = HintText::Junk({
         Text{ "They say that OTR stands for&Oxygen Transmission Rate", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
-    hintTable[JUNK_OTR_MEANS_13] = HintText::Junk({
+    hintTable[RHT_JUNK_OTR_MEANS_13] = HintText::Junk({
         Text{ "They say that OTR stands for&One Touch Recording", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
-    hintTable[JUNK_OTR_MEANS_14] = HintText::Junk({
+    hintTable[RHT_JUNK_OTR_MEANS_14] = HintText::Junk({
         Text{ "They say that OTR stands for&Olympic Torch Relay", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
-    hintTable[JUNK_OTR_MEANS_15] = HintText::Junk({
+    hintTable[RHT_JUNK_OTR_MEANS_15] = HintText::Junk({
         Text{ "They say that OTR stands for&Off the Rack", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
-    hintTable[JUNK_OTR_MEANS_16] = HintText::Junk({
+    hintTable[RHT_JUNK_OTR_MEANS_16] = HintText::Junk({
         Text{ "They say that OTR stands for&Overhead Transfer Rate", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
-    hintTable[JUNK_OTR_MEANS_17] = HintText::Junk({
+    hintTable[RHT_JUNK_OTR_MEANS_17] = HintText::Junk({
         Text{ "They say that OTR stands for&Operational TurnaRound", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
-    hintTable[JUNK_OTR_MEANS_18] = HintText::Junk({
+    hintTable[RHT_JUNK_OTR_MEANS_18] = HintText::Junk({
         Text{ "They say that OTR stands for&Opportunity to Recall", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
-    hintTable[JUNK_OTR_MEANS_19] = HintText::Junk({
+    hintTable[RHT_JUNK_OTR_MEANS_19] = HintText::Junk({
         Text{ "They say that OTR stands for&Operability Test Report", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
-    hintTable[JUNK_OTR_MEANS_20] = HintText::Junk({
+    hintTable[RHT_JUNK_OTR_MEANS_20] = HintText::Junk({
         Text{ "They say that OTR stands for&Overall Tuning Range", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
-    hintTable[JUNK_OTR_MEANS_21] = HintText::Junk({
+    hintTable[RHT_JUNK_OTR_MEANS_21] = HintText::Junk({
         Text{ "They say that OTR stands for&One Time Requisition", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
-    hintTable[JUNK_OTR_MEANS_22] = HintText::Junk({
+    hintTable[RHT_JUNK_OTR_MEANS_22] = HintText::Junk({
         Text{ "They say that OTR stands for&Oblivious to Reality", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
-    hintTable[JUNK_OTR_MEANS_23] = HintText::Junk({
+    hintTable[RHT_JUNK_OTR_MEANS_23] = HintText::Junk({
         Text{ "They say that OTR stands for&On the Run", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
-    hintTable[JUNK_OTR_MEANS_24] = HintText::Junk({
+    hintTable[RHT_JUNK_OTR_MEANS_24] = HintText::Junk({
         Text{ "They say that OTR stands for&On Time Reporting", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
-    hintTable[JUNK_OTR_MEANS_25] = HintText::Junk({
+    hintTable[RHT_JUNK_OTR_MEANS_25] = HintText::Junk({
         Text{ "They say that OTR stands for&Order to Receipt", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
-    hintTable[JUNK_OTR_MEANS_26] = HintText::Junk({
+    hintTable[RHT_JUNK_OTR_MEANS_26] = HintText::Junk({
         Text{ "They say that OTR stands for&Other Terrestrial Radio", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
-    hintTable[JUNK_OTR_MEANS_27] = HintText::Junk({
+    hintTable[RHT_JUNK_OTR_MEANS_27] = HintText::Junk({
         Text{ "They say that OTR stands for&On Target Reports", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
-    hintTable[JUNK_OTR_MEANS_28] = HintText::Junk({
+    hintTable[RHT_JUNK_OTR_MEANS_28] = HintText::Junk({
         Text{ "They say that OTR stands for&One Time Repair", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
-    hintTable[JUNK_OTR_MEANS_29] = HintText::Junk({
+    hintTable[RHT_JUNK_OTR_MEANS_29] = HintText::Junk({
         Text{ "They say that OTR stands for&Own the Room", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
-    hintTable[JUNK_OTR_MEANS_30] = HintText::Junk({
+    hintTable[RHT_JUNK_OTR_MEANS_30] = HintText::Junk({
         Text{ "They say that OTR stands for&Online Text Repository", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_MISC_1] = HintText::Junk({
+    hintTable[RHT_JUNK_MISC_1] = HintText::Junk({
         Text{ "They say %gKenix%w isn't a developer...^...Just a PR guy", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_MISC_2] = HintText::Junk({
+    hintTable[RHT_JUNK_MISC_2] = HintText::Junk({
         Text {"They say... No", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg"},
      });
 
-    hintTable[JUNK_MISC_3] = HintText::Junk({ 
+    hintTable[RHT_JUNK_MISC_3] = HintText::Junk({ 
         Text{ "They say BIG RIGS: OTR", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" } 
     });
 
-    hintTable[JUNK_MISC_4] = HintText::Junk({
+    hintTable[RHT_JUNK_MISC_4] = HintText::Junk({
         Text{ "They say you wanted to see me %pMr. Kenix%w?", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_MISC_5] = HintText::Junk({
+    hintTable[RHT_JUNK_MISC_5] = HintText::Junk({
         Text{ "They say Louis once saw an&equals not get set equals", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_MISC_6] = HintText::Junk({
+    hintTable[RHT_JUNK_MISC_6] = HintText::Junk({
         Text{ "They say only you can find your rom.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_MISC_7] = HintText::Junk({
+    hintTable[RHT_JUNK_MISC_7] = HintText::Junk({
         Text{ "They say ZAPD is good software.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_MISC_8] = HintText::Junk({
+    hintTable[RHT_JUNK_MISC_8] = HintText::Junk({
         Text{ "They say you can encounter&a parascode in tall grass.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_MISC_9] = HintText::Junk({
+    hintTable[RHT_JUNK_MISC_9] = HintText::Junk({
         Text{ "They say the ship sails on March 32nd.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_MISC_10] = HintText::Junk({
+    hintTable[RHT_JUNK_MISC_10] = HintText::Junk({
         Text{ "They say bombing dodongos is fun.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_MISC_11] = HintText::Junk({
+    hintTable[RHT_JUNK_MISC_11] = HintText::Junk({
         Text{ "They say shopkeepers don't give credits.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_MISC_12] = HintText::Junk({
+    hintTable[RHT_JUNK_MISC_12] = HintText::Junk({
         Text{ "They say shopkeepers don't give credits.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_MISC_13] = HintText::Junk({
+    hintTable[RHT_JUNK_MISC_13] = HintText::Junk({
         Text{ "They say Malon is glitched.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_MISC_14] = HintText::Junk({
+    hintTable[RHT_JUNK_MISC_14] = HintText::Junk({
         Text{ "They say do I look like I know&what a DList is?", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_MISC_15] = HintText::Junk({
+    hintTable[RHT_JUNK_MISC_15] = HintText::Junk({
         Text{ "They say do I look like I know&what an AList is?", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_MISC_16] = HintText::Junk({
+    hintTable[RHT_JUNK_MISC_16] = HintText::Junk({
         Text{ "They say the king drinks enthusiastically", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_MISC_17] = HintText::Junk({
+    hintTable[RHT_JUNK_MISC_17] = HintText::Junk({
         Text{ "They say Rubies are on the path to&Lamp Oil, Rope, and Bombs", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_SG_1] = HintText::Junk({
+    hintTable[RHT_JUNK_SG_1] = HintText::Junk({
         Text{ "They say %rError. Human is dead, mismatch.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_SG_2] = HintText::Junk({
+    hintTable[RHT_JUNK_SG_2] = HintText::Junk({
         Text{ "They say this is the choice of the&steins gate.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_SG_3] = HintText::Junk({
+    hintTable[RHT_JUNK_SG_3] = HintText::Junk({
         Text{ "They say el psy kongroo.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_SG_4] = HintText::Junk({
+    hintTable[RHT_JUNK_SG_4] = HintText::Junk({
         Text{ "They say tutturu~.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
 
-    hintTable[JUNK_SG_5] = HintText::Junk({
+    hintTable[RHT_JUNK_SG_5] = HintText::Junk({
         Text{ "They say im not Christina!.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_SG_6] = HintText::Junk({
+    hintTable[RHT_JUNK_SG_6] = HintText::Junk({
         Text{ "They say you know where to find an IBN5100.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_SG_7] = HintText::Junk({
+    hintTable[RHT_JUNK_SG_7] = HintText::Junk({
         Text{ "They say when you're on a chicken bender&grab a box of chicken tenders.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
     });
 
-    hintTable[JUNK_SG_8] = HintText::Junk({
+    hintTable[RHT_JUNK_SG_8] = HintText::Junk({
         Text{ "Juicy Chicken #1! Wow!.", HINT_TEXT_NEEDS_TRANSLATION_FR,
               "blarg" },
     });
@@ -2470,7 +2471,7 @@ void HintTable_Init() {
     |     DUNGEON HINT TEXT    |
     ---------------------------*/
 
-    hintTable[DEKU_TREE] = HintText::DungeonName(
+    hintTable[RHT_DEKU_TREE] = HintText::DungeonName(
         {
             // obscure text
             Text{ "an ancient tree", /*french*/ "le vieil arbre", /*spanish*/ "un ancestral árbol" },
@@ -2479,7 +2480,7 @@ void HintTable_Init() {
         // clear text
         Text{ "Deku Tree", /*french*/ "l'Arbre Mojo", /*spanish*/ "el Gran Árbol Deku" });
 
-    hintTable[DODONGOS_CAVERN] = HintText::DungeonName(
+    hintTable[RHT_DODONGOS_CAVERN] = HintText::DungeonName(
         {
             // obscure text
             Text{ "an immense cavern", /*french*/ "l'immense caverne", /*spanish*/ "una descomunal cueva" },
@@ -2488,7 +2489,7 @@ void HintTable_Init() {
         // clear text
         Text{ "Dodongo's Cavern", /*french*/ "la Caverne Dodongo", /*spanish*/ "la Cueva de los Dodongos" });
 
-    hintTable[JABU_JABUS_BELLY] = HintText::DungeonName(
+    hintTable[RHT_JABU_JABUS_BELLY] = HintText::DungeonName(
         {
             // obscure text
             Text{ "the belly of a deity", /*french*/ "le ventre d'un gardien",
@@ -2498,7 +2499,7 @@ void HintTable_Init() {
         // clear text
         Text{ "Jabu-Jabu's Belly", /*french*/ "le Ventre de Jabu-Jabu", /*spanish*/ "tripa de Jabu-Jabu" });
 
-    hintTable[FOREST_TEMPLE] = HintText::DungeonName(
+    hintTable[RHT_FOREST_TEMPLE] = HintText::DungeonName(
         {
             // obscure text
             Text{ "a deep forest", /*french*/ "la profonde forêt", /*spanish*/ "las profundidades del bosque" },
@@ -2507,7 +2508,7 @@ void HintTable_Init() {
         // clear text
         Text{ "Forest Temple", /*french*/ "le Temple de la Forêt", /*spanish*/ "el Templo del Bosque" });
 
-    hintTable[FIRE_TEMPLE] = HintText::DungeonName(
+    hintTable[RHT_FIRE_TEMPLE] = HintText::DungeonName(
         {
             // obscure text
             Text{ "a high mountain", /*french*/ "la grande montagne", /*spanish*/ "una alta montaña" },
@@ -2516,7 +2517,7 @@ void HintTable_Init() {
         // clear text
         Text{ "Fire Temple", /*french*/ "le Temple du Feu", /*spanish*/ "el Templo del Fuego" });
 
-    hintTable[WATER_TEMPLE] = HintText::DungeonName(
+    hintTable[RHT_WATER_TEMPLE] = HintText::DungeonName(
         {
             // obscure text
             Text{ "a vast lake", /*french*/ "le vaste lac", /*spanish*/ "un lago inmenso" },
@@ -2525,7 +2526,7 @@ void HintTable_Init() {
         // clear text
         Text{ "Water Temple", /*french*/ "le Temple de l'Eau", /*spanish*/ "el Templo del Agua" });
 
-    hintTable[SPIRIT_TEMPLE] = HintText::DungeonName(
+    hintTable[RHT_SPIRIT_TEMPLE] = HintText::DungeonName(
         {
             // obscure text
             Text{ "the goddess of the sand", /*french*/ "la déesse des sables", /*spanish*/ "la diosa de las arenas" },
@@ -2536,7 +2537,7 @@ void HintTable_Init() {
 
     );
 
-    hintTable[SHADOW_TEMPLE] = HintText::DungeonName(
+    hintTable[RHT_SHADOW_TEMPLE] = HintText::DungeonName(
         {
             // obscure text
             Text{ "the house of the dead", /*french*/ "la maison des morts", /*spanish*/ "la casa de la muerte" },
@@ -2545,7 +2546,7 @@ void HintTable_Init() {
         // clear text
         Text{ "Shadow Temple", /*french*/ "le Temple de l'Ombre", /*spanish*/ "el Templo de las Sombras" });
 
-    hintTable[ICE_CAVERN] = HintText::DungeonName(
+    hintTable[RHT_ICE_CAVERN] = HintText::DungeonName(
         {
             // obscure text
             Text{ "a frozen maze", /*french*/ "le dédale glacé", /*spanish*/ "un gélido laberinto" },
@@ -2554,7 +2555,7 @@ void HintTable_Init() {
         // clear text
         Text{ "Ice Cavern", /*french*/ "la caverne de glace", /*spanish*/ "la caverna de hielo" });
 
-    hintTable[BOTTOM_OF_THE_WELL] = HintText::DungeonName(
+    hintTable[RHT_BOTTOM_OF_THE_WELL] = HintText::DungeonName(
         {
             // obscure text
             Text{ "a shadow\'s prison", /*french*/ "la prison d'une ombre", /*spanish*/ "la prisión de las sombras" },
@@ -2563,7 +2564,7 @@ void HintTable_Init() {
         // clear text
         Text{ "Bottom of the Well", /*french*/ "le fonds du Puits", /*spanish*/ "el fondo del pozo" });
 
-    hintTable[GERUDO_TRAINING_GROUNDS] = HintText::DungeonName(
+    hintTable[RHT_GERUDO_TRAINING_GROUND] = HintText::DungeonName(
         {
             // obscure text
             Text{ "the test of thieves", /*french*/ "l'épreuve des voleurs", /*spanish*/ "la prueba de las bandidas" },
@@ -2573,7 +2574,7 @@ void HintTable_Init() {
         Text{ "Gerudo Training Grounds", /*french*/ "le Gymnase Gerudo",
               /*spanish*/ "el Centro de Instrucción Gerudo" });
 
-    hintTable[GANONS_CASTLE] = HintText::DungeonName(
+    hintTable[RHT_GANONS_CASTLE] = HintText::DungeonName(
         {
             // obscure text
             Text{ "a conquered citadel", /*french*/ "la citadelle assiégée", /*spanish*/ "una conquistada ciudadela" },
@@ -2587,63 +2588,63 @@ void HintTable_Init() {
     |      BOSS HINT TEXT      |
     ---------------------------*/
 
-    hintTable[QUEEN_GOHMA] = HintText::Boss({
+    hintTable[RHT_QUEEN_GOHMA] = HintText::Boss({
                        // obscure text
                        Text{"the #Parasitic Armored Arachnid# holds", /*french*/"le #monstre insectoïde géant# possède", /*spanish*/"el #arácnido parasitario acorazado# porta"},
                      }, {},
                        //clear text
                        Text{"#Queen Gohma# holds", /*french*/"la #Reine Gohma# possède", /*spanish*/"la #Reina Goma# porta"});
 
-    hintTable[KING_DODONGO] = HintText::Boss({
+    hintTable[RHT_KING_DODONGO] = HintText::Boss({
                        //obscure text
                        Text{"the #Infernal Dinosaur# holds", /*french*/"le #dinosaure infernal# possède", /*spanish*/"el #dinosaurio infernal# porta"},
                      }, {},
                        //clear text
                        Text{"#King Dodongo# holds", /*french*/"le #Roi Dodongo# possède", /*spanish*/"el #Rey Dodongo# porta"});
 
-    hintTable[BARINADE] = HintText::Boss({
+    hintTable[RHT_BARINADE] = HintText::Boss({
                        //obscure text
                        Text{"the #Bio-Electric Anemone# holds", /*french*/"l'#anémone bioélectrique# possède", /*spanish*/"la #anémona bioeléctrica# porta"},
                      }, {},
                        //clear text
                        Text{"#Barinade# holds", /*french*/"#Barinade# possède", /*spanish*/"#Barinade# porta"});
 
-    hintTable[PHANTOM_GANON] = HintText::Boss({
+    hintTable[RHT_PHANTOM_GANON] = HintText::Boss({
                        //obscure text
                        Text{"the #Evil Spirit from Beyond# holds", /*french*/"l'#esprit maléfique de l'au-delà# possède", /*spanish*/"el #espíritu maligno de ultratumba# porta"},
                      }, {},
                        //clear text
                        Text{"#Phantom Ganon# holds", /*french*/"#Ganon Spectral# possède", /*spanish*/"#Ganon Fantasma# porta"});
 
-    hintTable[VOLVAGIA] = HintText::Boss({
+    hintTable[RHT_VOLVAGIA] = HintText::Boss({
                        //obscure text
                        Text{"the #Subterranean Lava Dragon# holds", /*french*/"le #dragon des profondeurs# possède", /*spanish*/"el #dragón de lava subterráneo# porta"},
                      }, {},
                        //clear text
                        Text{"#Volvagia# holds", /*french*/"#Volvagia# possède", /*spanish*/"#Volvagia# porta"});
 
-    hintTable[MORPHA] = HintText::Boss({
+    hintTable[RHT_MORPHA] = HintText::Boss({
                        //obscure text
                        Text{"the #Giant Aquatic Amoeba# holds", /*french*/"l'#amibe aquatique géante# possède", /*spanish*/"la #ameba acuática gigante# porta"},
                      }, {},
                        //clear text
                        Text{"#Morpha# holds", /*french*/"#Morpha# possède", /*spanish*/"#Morpha# porta"});
 
-    hintTable[BONGO_BONGO] = HintText::Boss({
+    hintTable[RHT_BONGO_BONGO] = HintText::Boss({
                        //obscure text
                        Text{"the #Phantom Shadow Beast# holds", /*french*/"le #monstre de l'ombre# possède", /*spanish*/"la #alimaña oscura espectral# porta"},
                      }, {},
                        //clear text
                        Text{"#Bongo Bongo# holds", /*french*/"#Bongo Bongo# possède", /*spanish*/"#Bongo Bongo# porta"});
 
-    hintTable[TWINROVA] = HintText::Boss({
+    hintTable[RHT_TWINROVA] = HintText::Boss({
                        //obscure text
                        Text{"the #Sorceress Sisters# hold", /*french*/"#les sorcières jumelles# possède", /*spanish*/"las #hermanas hechiceras# portan"},
                      }, {},
                        //clear text
                        Text{"#Twinrova# holds", /*french*/"#Twinrova# possède", /*spanish*/"#Birova# porta"});
     //
-    // [LINKS_POCKET_BOSS] = HintText::Boss({
+    // [RHT_LINKS_POCKET_BOSS] = HintText::Boss({
     //                    //obscure text
     //                    Text{"#@'s pocket# rewards", /*french*/"#@ débute avec#", /*spanish*/"el #bolsillo de @#
     //                    premia con"},
@@ -2657,14 +2658,14 @@ void HintTable_Init() {
     |     BRIDGE HINT TEXT     |
     ---------------------------*/
 
-    hintTable[BRIDGE_OPEN_HINT] = HintText::Bridge({
+    hintTable[RHT_BRIDGE_OPEN_HINT] = HintText::Bridge({
         // obscure text
         Text{ "The awakened ones have already&created a bridge to the castle&where the evil dwells.",
               /*french*/ "Les êtres de sagesse ont&déjà créé un pont vers&le repaire du mal.",
               /*spanish*/ "Los sabios #ya habrán creado un puente#&al castillo, de donde emana el mal." },
     });
 
-    hintTable[BRIDGE_VANILLA_HINT] = HintText::Bridge({
+    hintTable[RHT_BRIDGE_VANILLA_HINT] = HintText::Bridge({
         // obscure text
         Text{ "The awakened ones require&the Shadow and Spirit Medallions&as well as the Light Arrows.",
               /*french*/
@@ -2674,7 +2675,7 @@ void HintTable_Init() {
               "a la #flecha de luz#." },
     });
 
-    hintTable[BRIDGE_STONES_HINT] = HintText::Bridge({
+    hintTable[RHT_BRIDGE_STONES_HINT] = HintText::Bridge({
         // obscure text                                                  singular        plural
         Text{
             "The awakened ones will&await for the Hero to collect&%d |Spiritual Stone|Spiritual Stones|.",
@@ -2682,14 +2683,14 @@ void HintTable_Init() {
             /*spanish*/ "Los sabios aguardarán a que el héroe&obtenga #%d |piedra espiritual|piedras espirituales|#." },
     });
 
-    hintTable[BRIDGE_MEDALLIONS_HINT] = HintText::Bridge({
+    hintTable[RHT_BRIDGE_MEDALLIONS_HINT] = HintText::Bridge({
         // obscure text                                                  singular  plural
         Text{ "The awakened ones will await&for the Hero to collect&%d |Medallion|Medallions|.",
               /*french*/ "Les êtres de sagesse attendront&le héros muni de %r#%d |Médaillon|Médaillons|%w.",
               /*spanish*/ "Los sabios aguardarán a que el héroe&obtenga #%d |medallón|medallones|#." },
     });
 
-    hintTable[BRIDGE_REWARDS_HINT] = HintText::Bridge({
+    hintTable[RHT_BRIDGE_REWARDS_HINT] = HintText::Bridge({
         // obscure text                                                  singular                     plural
         Text{ "The awakened ones will await&for the Hero to collect&%d |Spiritual Stone or Medallion|Spiritual Stones "
               "and Medallions|.",
@@ -2700,21 +2701,21 @@ void HintTable_Init() {
               "medallones|#." },
     });
 
-    hintTable[BRIDGE_DUNGEONS_HINT] = HintText::Bridge({
+    hintTable[RHT_BRIDGE_DUNGEONS_HINT] = HintText::Bridge({
         // obscure text                                                  singular plural
         Text{ "The awakened ones will await&for the Hero to conquer&%d |Dungeon|Dungeons|.",
               /*french*/ "Les êtres de sagesse attendront&la conquête de %r%d |Donjon|Donjons|%w.",
               /*spanish*/ "Los sabios aguardarán a que el héroe& complete #%d |mazmorra|mazmorras|#." },
     });
 
-    hintTable[BRIDGE_TOKENS_HINT] = HintText::Bridge({
+    hintTable[RHT_BRIDGE_TOKENS_HINT] = HintText::Bridge({
         // obscure text
         Text{ "The awakened ones will await&for the Hero to collect&%d |Gold Skulltula Token|Gold Skulltula Tokens|.",
               /*french*/ "Les êtres de sagesse attendront&le héros muni de %r%d |Symbole|Symboles| &de Skulltula d'or%w.",
               /*spanish*/ "Los sabios aguardarán a que el héroe&obtenga #%d |símbolo|símbolos| de&skulltula dorada#." },
     });
 
-    hintTable[BRIDGE_GREG_HINT] = HintText::Bridge({
+    hintTable[RHT_BRIDGE_GREG_HINT] = HintText::Bridge({
         // obscure text
         Text{ "The awakened ones will await&for the Hero to find %gGreg%w.",
               /*french*/ "The awakened ones will await&for the Hero to find %gGreg%w.",
@@ -2725,56 +2726,56 @@ void HintTable_Init() {
     | GANON BOSS KEY HINT TEXT |
     ---------------------------*/
 
-    hintTable[GANON_BK_START_WITH_HINT] = HintText::GanonsBossKey({
+    hintTable[RHT_GANON_BK_START_WITH_HINT] = HintText::GanonsBossKey({
         // obscure text
         Text{ "And the %revil one%w's key will&be given %rfrom the start%w.",
               /*french*/ "Aussi, la %rclé du Malin%w sera&possession %rmême du héros%w.",
               /*spanish*/ "Y obtendrás la llave del #señor del mal# desde el #inicio#." },
     });
 
-    hintTable[GANON_BK_VANILLA_HINT] = HintText::GanonsBossKey({
+    hintTable[RHT_GANON_BK_VANILLA_HINT] = HintText::GanonsBossKey({
         // obscure text
         Text{ "And the %revil one%w's key will&be kept in a big chest&%rinside its tower%w.",
               /*french*/ "Aussi, la %rclé du Malin%w sera&encoffrée %rdans sa tour%w.",
               /*spanish*/ "Y la llave del #señor del mal# aguardará en un gran cofre de #su torre#." },
     });
 
-    hintTable[GANON_BK_OWN_DUNGEON_HINT] = HintText::GanonsBossKey({
+    hintTable[RHT_GANON_BK_OWN_DUNGEON_HINT] = HintText::GanonsBossKey({
         // obscure text
         Text{ "And the %revil one%w's key will&be hidden somewhere %rinside&its castle%w.",
               /*french*/ "Aussi, la %rclé du Malin%w sera&cachée %rdans son vaste château%w.",
               /*spanish*/ "Y la llave del #señor del mal# aguardará en #algún lugar de su castillo#." },
     });
 
-    hintTable[GANON_BK_OVERWORLD_HINT] = HintText::GanonsBossKey({
+    hintTable[RHT_GANON_BK_OVERWORLD_HINT] = HintText::GanonsBossKey({
         // obscure text
         Text{ "And the %revil one%w's key will&be hidden %routside of&dungeons%w in Hyrule.",
               /*french*/ "Aussi, la %rclé du Malin%w se&trouve %rhors des donjons%w d'Hyrule.",
               /*spanish*/ "Y la llave del #señor del mal# aguardará #fuera de las mazmorras# de Hyrule." },
     });
 
-    hintTable[GANON_BK_ANY_DUNGEON_HINT] = HintText::GanonsBossKey({
+    hintTable[RHT_GANON_BK_ANY_DUNGEON_HINT] = HintText::GanonsBossKey({
         // obscure text
         Text{ "And the %revil one%w's key will&be hidden %rinside a&dungeon%w in Hyrule.",
               /*french*/ "Aussi, la %rclé du Malin%w se&trouve %rdans un donjon%w d'Hyrule.",
               /*spanish*/ "Y la llave del #señor del mal# aguardará #en una mazmorra# de Hyrule." },
     });
 
-    hintTable[GANON_BK_ANYWHERE_HINT] = HintText::GanonsBossKey({
+    hintTable[RHT_GANON_BK_ANYWHERE_HINT] = HintText::GanonsBossKey({
         // obscure text
         Text{ "And the %revil one%w's key will&be hidden somewhere&%rin Hyrule%w.",
               /*french*/ "Aussi, la %rclé du Malin%w se&trouve quelque part %rdans Hyrule%w.",
               /*spanish*/ "Y la llave del #señor del mal# aguardará en #cualquier lugar de Hyrule#." },
     });
 
-    hintTable[GANON_BK_TRIFORCE_HINT] = HintText::GanonsBossKey({
+    hintTable[RHT_GANON_BK_TRIFORCE_HINT] = HintText::GanonsBossKey({
         // obscure text
         Text{ "And the %revil one%w's key will&be given to the Hero once&the %rTriforce%w is completed.",
               /*french*/ "Aussi, la %rclé du Malin%w se&révèlera une fois la %rTriforce%w&assemblée.",
               /*spanish*/ "Y el héroe recibirá la llave del #señor del mal# cuando haya completado la #Trifuerza#." },
     });
 
-    hintTable[GANON_BK_SKULLTULA_HINT] = HintText::GanonsBossKey({
+    hintTable[RHT_GANON_BK_SKULLTULA_HINT] = HintText::GanonsBossKey({
         // obscure text
         Text { "And the %revil one%w's key will be&provided by the cursed rich man&once %r100 Gold Skulltula Tokens%w&are retrieved.",
               /*french*/ "Aussi, la %rclé du Malin%w sera&donnée par l'homme maudit une&fois que %r100 Symboles de&Skulltula d'or%w auront été trouvés.",
@@ -2785,7 +2786,7 @@ void HintTable_Init() {
     |      LACS HINT TEXT      |
     ---------------------------*/
 
-    hintTable[LACS_VANILLA_HINT] = HintText::LACS({
+    hintTable[RHT_LACS_VANILLA_HINT] = HintText::LACS({
         // obscure text
         Text{
             "And the %revil one%w's key will be&provided by Zelda once the&%rShadow and Spirit Medallions%w&are retrieved.",
@@ -2795,14 +2796,14 @@ void HintTable_Init() {
             "espíritu#." },
     });
 
-    hintTable[LACS_MEDALLIONS_HINT] = HintText::LACS({
+    hintTable[RHT_LACS_MEDALLIONS_HINT] = HintText::LACS({
         // obscure text                                                     singular      plural
         Text{ "And the %revil one%w's key will be&provided by Zelda once %r%d&|Medallion%w is|Medallions%w are| retrieved.",
               /*french*/ "Aussi, la %rclé du Malin%w sera&fournie par Zelda une fois |qu'&%r%d Médaillon%w aura été&récupéré|que&%r%d Médaillons%w auront été&récupérés|.",
               /*spanish*/ "Y Zelda entregará la llave&del #señor del mal# tras obtener&#%d |medallón|medallones|#." },
     });
 
-    hintTable[LACS_STONES_HINT] = HintText::LACS({
+    hintTable[RHT_LACS_STONES_HINT] = HintText::LACS({
         // obscure text                                                     singular            plural
         Text{
             "And the %revil one%w's key will be&provided by Zelda once %r%d&|Spiritual Stone%w is|Spiritual Stones%w are| "
@@ -2813,7 +2814,7 @@ void HintTable_Init() {
             "espirituales|#." },
     });
 
-    hintTable[LACS_REWARDS_HINT] = HintText::LACS({
+    hintTable[RHT_LACS_REWARDS_HINT] = HintText::LACS({
         // obscure text                                                     singular                         plural
         Text{ "And the %revil one%w's key will be&provided by Zelda once %r%d&|Spiritual Stone or Medallion%w&"
               "is|Spiritual Stones and Medallions%w&are| retrieved.",
@@ -2824,14 +2825,14 @@ void HintTable_Init() {
               "espirituales o medallones|#." },
     });
 
-    hintTable[LACS_DUNGEONS_HINT] = HintText::LACS({
+    hintTable[RHT_LACS_DUNGEONS_HINT] = HintText::LACS({
         // obscure text                                                     singular    plural
         Text{ "And the %revil one%w's key will be&provided by Zelda once %r%d&|Dungeon%w is|Dungeons%w are| conquered.",
               /*french*/ "Aussi, la %rclé du Malin%w sera&fournie par Zelda une fois |qu'&%r%d donjon %wsera conquis|que&%r%d donjons%w seront conquis|.",
               /*spanish*/ "Y Zelda entregará la llave&del #señor del mal# tras completar&#%d |mazmorra|mazmorras|#." },
     });
 
-    hintTable[LACS_TOKENS_HINT] = HintText::LACS({
+    hintTable[RHT_LACS_TOKENS_HINT] = HintText::LACS({
         // obscure text                                                     singular                 plural
         Text{ "And the %revil one%w's key will be&provided by Zelda once %r%d |Gold&Skulltula Token%w is|Gold&Skulltula "
               "Tokens%w are| retrieved.",
@@ -2844,27 +2845,27 @@ void HintTable_Init() {
     |     TRIAL HINT TEXT      |
     ---------------------------*/
 
-    hintTable[SIX_TRIALS] = HintText::Exclude({
+    hintTable[RHT_SIX_TRIALS] = HintText::Exclude({
         // obscure text
         Text{ "#Ganon's Tower# is protected by a powerful barrier.",
               /*french*/ "#la Tour de Ganon# est protégée par une puissante barrière",
               /*spanish*/ "la #torre de Ganon# está protegida por una poderosa barrera" },
     });
 
-    hintTable[ZERO_TRIALS] = HintText::Exclude({
+    hintTable[RHT_ZERO_TRIALS] = HintText::Exclude({
         // obscure text
         Text{ "Sheik dispelled the barrier around #Ganon's Tower#.",
               /*french*/ "Sheik a dissipé la barrière autour de #la Tour de Ganon#",
               /*spanish*/ "Sheik disipó la barrera alrededor de la #torre de Ganon#." },
     });
 
-    hintTable[FOUR_TO_FIVE_TRIALS] = HintText::Exclude({
+    hintTable[RHT_FOUR_TO_FIVE_TRIALS] = HintText::Exclude({
         // obscure text
         Text{ " was dispelled by Sheik.", /*french*/ " a été dissipée par Sheik.",
               /*spanish*/ " se disipó gracias a Sheik." },
     });
 
-    hintTable[ONE_TO_THREE_TRIALS] = HintText::Exclude({
+    hintTable[RHT_ONE_TO_THREE_TRIALS] = HintText::Exclude({
         // obscure text
         Text{ " protects Ganons Tower.", /*french*/ " protège la Tour de Ganon.",
               /*spanish*/ " protege la torre de Ganon" },
@@ -2874,21 +2875,21 @@ void HintTable_Init() {
     |        ALTAR TEXT        |
     ---------------------------*/
 
-    hintTable[SPIRITUAL_STONE_TEXT_START] = HintText::Altar({
+    hintTable[RHT_SPIRITUAL_STONE_TEXT_START] = HintText::Altar({
         // obscure text
         Text{ "3 Spiritual Stones found in Hyrule...",
               /*french*/ "Les trois Pierres Ancestrales cachées&dans Hyrule...",
               /*spanish*/ "Tres piedras espirituales halladas por Hyrule..." },
     });
 
-    hintTable[CHILD_ALTAR_TEXT_END_DOTOPEN] = HintText::Altar({
+    hintTable[RHT_CHILD_ALTAR_TEXT_END_DOTOPEN] = HintText::Altar({
         // obscure text
         Text{ "Ye who may become a Hero...&The path to the future is open...",
               /*french*/ "À celui qui a quête de devenir&héros...&Le futur vous accueille béant...",
               /*spanish*/ "Para aquel que se convierta en el héroe...&La puerta al futuro está a su disposición..." },
     });
 
-    hintTable[CHILD_ALTAR_TEXT_END_DOTSONGONLY] = HintText::Altar({
+    hintTable[RHT_CHILD_ALTAR_TEXT_END_DOTSONGONLY] = HintText::Altar({
         // obscure text
         Text{
             "Ye who may become a Hero...&Stand with the Ocarina and&play the Song of Time.",
@@ -2896,7 +2897,7 @@ void HintTable_Init() {
             /*spanish*/ "Para aquel que se convierta en el héroe...&Tome la ocarina y&entone la Canción del Tiempo." },
     });
 
-    hintTable[CHILD_ALTAR_TEXT_END_DOTCLOSED] = HintText::Altar({
+    hintTable[RHT_CHILD_ALTAR_TEXT_END_DOTCLOSED] = HintText::Altar({
         // obscure text
         Text{ "Ye who may become a Hero...&Offer the spiritual stones and&play the Song of Time.",
               /*french*/
@@ -2906,7 +2907,7 @@ void HintTable_Init() {
               "Tiempo." },
     });
 
-    hintTable[ADULT_ALTAR_TEXT_START] = HintText::Altar({
+    hintTable[RHT_ADULT_ALTAR_TEXT_START] = HintText::Altar({
         // obscure text
         Text{ "An awakening voice from the Sacred&Realm will call those destined to be&Sages, who dwell in the five "
               "temples.",
@@ -2918,7 +2919,7 @@ void HintTable_Init() {
               "que moran en los #cinco templos#." },
     });
 
-    hintTable[ADULT_ALTAR_TEXT_END] = HintText::Altar({
+    hintTable[RHT_ADULT_ALTAR_TEXT_END] = HintText::Altar({
         // obscure text
         Text{
             "$kTogether with the Hero of Time,&the awakened ones will return&the light of peace to the world...",
@@ -2933,7 +2934,7 @@ void HintTable_Init() {
     |   VALIDATION LINE TEXT   |
     ---------------------------*/
 
-    hintTable[VALIDATION_LINE] = HintText::Validation({
+    hintTable[RHT_VALIDATION_LINE] = HintText::Validation({
         // obscure text
         Text{ "Hmph... Since you made it this far, I'll let you know what glorious prize of Ganon's you likely missed "
               "out on in my tower.^Behold...^",
@@ -2948,7 +2949,7 @@ void HintTable_Init() {
     | LIGHT ARROW LOCATION TEXT|
     ---------------------------*/
 
-    hintTable[LIGHT_ARROW_LOCATION_HINT] = HintText::LightArrow({
+    hintTable[RHT_LIGHT_ARROW_LOCATION_HINT] = HintText::LightArrow({
         // obscure text
         Text{
             "Ha ha ha... You'll never beat me by reflecting my lightning bolts and unleashing the arrows from ",
@@ -2958,7 +2959,7 @@ void HintTable_Init() {
             "Ja, ja, ja... Nunca me derrotarás reflejando mis esferas de energía y desplegando la flecha de luz de " },
     });
 
-    hintTable[YOUR_POCKET] = HintText::Exclude({
+    hintTable[RHT_YOUR_POCKET] = HintText::Exclude({
         // obscure text
         Text{ "your pocket", /*french*/ "tes poches", /*spanish*/ "tu bolsillo" },
     });
@@ -2967,7 +2968,7 @@ void HintTable_Init() {
     |      GANON LINE TEXT     |
     ---------------------------*/
 
-    hintTable[GANON_LINE01] = HintText::GanonLine({
+    hintTable[RHT_GANON_LINE01] = HintText::GanonLine({
         // obscure text
         Text{ "Oh! It's @.&I was expecting someone called Sheik.&Do you know what happened to them?",
               /*french*/ "Ah, c'est @.&J'attendais un certain Sheik.&Tu sais ce qui lui est arrivé?",
@@ -2975,21 +2976,21 @@ void HintTable_Init() {
               "¡Oh! Pero si es @.&Estaba esperando a alguien llamado Sheik. ¿Sabes qué puede haberle pasado?" },
     });
 
-    hintTable[GANON_LINE02] = HintText::GanonLine({
+    hintTable[RHT_GANON_LINE02] = HintText::GanonLine({
         // obscure text
         Text{ "I knew I shouldn't have put the key on the other side of my door.",
               /*french*/ "J'aurais dû garder la clé ici. Hélas...",
               /*spanish*/ "Sabía que no tendría que haber dejado la llave al otro lado de la puerta." },
     });
 
-    hintTable[GANON_LINE03] = HintText::GanonLine({
+    hintTable[RHT_GANON_LINE03] = HintText::GanonLine({
         // obscure text
         Text{ "Looks like it's time for a round of tennis.",
               /*french*/ "C'est l'heure de jouer au tennis.",
               /*spanish*/ "Parece que es hora de una pachanga de tenis." },
     });
 
-    hintTable[GANON_LINE04] = HintText::GanonLine({
+    hintTable[RHT_GANON_LINE04] = HintText::GanonLine({
         // obscure text
         Text{ "You'll never deflect my bolts of energy with your sword, then shoot me with those Light Arrows you "
               "happen to have.",
@@ -3001,14 +3002,14 @@ void HintTable_Init() {
               "que tendrás." },
     });
 
-    hintTable[GANON_LINE05] = HintText::GanonLine({
+    hintTable[RHT_GANON_LINE05] = HintText::GanonLine({
         // obscure text
         Text{ "Why did I leave my trident back in the desert?",
               /*french*/ "Sale bêtise... Et j'ai oublié mon trident dans le désert!",
               /*spanish*/ "Santa Hylia... ¿Por qué me habré dejado el tridente en el desierto?" },
     });
 
-    hintTable[GANON_LINE06] = HintText::GanonLine({
+    hintTable[RHT_GANON_LINE06] = HintText::GanonLine({
         // obscure text
         Text{ "Zelda is probably going to do something stupid, like send you back to your own timeline.^So this is "
               "quite meaningless. Do you really want to save this moron?",
@@ -3020,7 +3021,7 @@ void HintTable_Init() {
               "ningún sentido alguno. ¿De verdad quieres salvar a esa tonta?" },
     });
 
-    hintTable[GANON_LINE07] = HintText::GanonLine({
+    hintTable[RHT_GANON_LINE07] = HintText::GanonLine({
         // obscure text
         Text{ "What about Zelda makes you think&she'd be a better ruler than I?^I saved Lon Lon Ranch,&fed the "
               "hungry,&and my castle floats.",
@@ -3032,7 +3033,7 @@ void HintTable_Init() {
               "los hambrientos&y hasta hago que mi castillo flote." },
     });
 
-    hintTable[GANON_LINE08] = HintText::GanonLine({
+    hintTable[RHT_GANON_LINE08] = HintText::GanonLine({
         // obscure text
         Text{ "I've learned this spell,&it's really neat,&I'll keep it later&for your treat!",
               /*french*/
@@ -3043,21 +3044,21 @@ void HintTable_Init() {
               "afrontar la verdad?" },
     });
 
-    hintTable[GANON_LINE09] = HintText::GanonLine({
+    hintTable[RHT_GANON_LINE09] = HintText::GanonLine({
         // obscure text
         Text{ "Many tricks are up my sleeve,&to save yourself&you'd better leave!",
               /*french*/ "Sale petit garnement,&tu fais erreur!&C'est maintenant que marque&ta dernière heure!",
               /*spanish*/ "¿No osarás a mí enfrentarte?&Rimas aparte,&¡voy a matarte!" },
     });
 
-    hintTable[GANON_LINE10] = HintText::GanonLine({
+    hintTable[RHT_GANON_LINE10] = HintText::GanonLine({
         // obscure text
         Text{ "After what you did to Koholint Island, how can you call me the bad guy?",
               /*french*/ "J'admire ce que tu as fait à l'Île Koholint... Toi et moi, nous devrions faire équipe!",
               /*spanish*/ "Después de lo que le hiciste a la Isla Koholint, ¿cómo te atreves a llamarme malvado?" },
     });
 
-    hintTable[GANON_LINE11] = HintText::GanonLine({
+    hintTable[RHT_GANON_LINE11] = HintText::GanonLine({
         // obscure text
         Text{ "Today, let's begin down&'The Hero is Defeated' timeline.",
               /*french*/
@@ -3071,21 +3072,21 @@ void HintTable_Init() {
     |      MERCHANTS' ITEMS     |
     ---------------------------*/
 
-    hintTable[MEDIGORON_DIALOG_FIRST] = HintText::MerchantsDialogs({
+    hintTable[RHT_MEDIGORON_DIALOG_FIRST] = HintText::MerchantsDialogs({
         // obscure text
         Text{ "How about buying ",
               /*french*/ "Veux-tu acheter ",
               /*spanish*/ "¿Me compras " },
     });
 
-    hintTable[MEDIGORON_DIALOG_SECOND] = HintText::MerchantsDialogs({
+    hintTable[RHT_MEDIGORON_DIALOG_SECOND] = HintText::MerchantsDialogs({
         // obscure text
         Text{ " for #200 Rupees#?&" + TWO_WAY_CHOICE() + "#Buy&Don't buy#",
               /*french*/ " pour #200 rubis#?&" + TWO_WAY_CHOICE() + "#Acheter&Ne pas acheter#",
               /*spanish*/ " por #200 rupias#?&" + TWO_WAY_CHOICE() + "#Comprar&No comprar#" },
     });
 
-    hintTable[CARPET_SALESMAN_DIALOG_FIRST] = HintText::MerchantsDialogs({
+    hintTable[RHT_CARPET_SALESMAN_DIALOG_FIRST] = HintText::MerchantsDialogs({
         // obscure text
         Text{ "Welcome!^I am selling stuff, strange and rare, from&all over the world to everybody. Today's&special "
               "is...^",
@@ -3096,7 +3097,7 @@ void HintTable_Init() {
               "oferta de hoy es...^¡" },
     });
 
-    hintTable[CARPET_SALESMAN_DIALOG_SECOND] = HintText::MerchantsDialogs({
+    hintTable[RHT_CARPET_SALESMAN_DIALOG_SECOND] = HintText::MerchantsDialogs({
         // obscure text
         Text{
             "! Terrifying!&I won't tell you what it is until I see the&money...^How about #200 Rupees#?&&" +
@@ -3110,14 +3111,14 @@ void HintTable_Init() {
                 TWO_WAY_CHOICE() + "#Comprar&No comprar#" },
     });
 
-    hintTable[CARPET_SALESMAN_DIALOG_THIRD] = HintText::MerchantsDialogs({
+    hintTable[RHT_CARPET_SALESMAN_DIALOG_THIRD] = HintText::MerchantsDialogs({
         // obscure text
         Text{ "Thank you very much!^What I'm selling is... #",
               /*french*/ "Merci beaucoup!^Cet objet extraordinaire est... #",
               /*spanish*/ "¡Muchas gracias!^Lo que vendo es... #¡" },
     });
 
-    hintTable[CARPET_SALESMAN_DIALOG_FOURTH] = HintText::MerchantsDialogs({
+    hintTable[RHT_CARPET_SALESMAN_DIALOG_FOURTH] = HintText::MerchantsDialogs({
         // obscure text
         Text{ "!#^The mark that will lead you to the #Spirit&Temple# is the #flag on the " + IF_NOT_MQ() + "left" +
                   MQ_ELSE() + "right" + MQ_END() + "# outside the shop. Be seeing you!",
@@ -3127,7 +3128,7 @@ void HintTable_Init() {
                   IF_NOT_MQ() + "izquierda" + MQ_ELSE() + "derecha" + MQ_END() + "# al salir de aquí. ¡Nos vemos!" },
     });
 
-    hintTable[GRANNY_DIALOG] = HintText::MerchantsDialogs({
+    hintTable[RHT_GRANNY_DIALOG] = HintText::MerchantsDialogs({
         // obscure text
         Text{ "! How about #100 Rupees#?&" + TWO_WAY_CHOICE() + "#Buy&Don't buy#",
               /*french*/ "! Que dis-tu de #100 rubis#?&" + TWO_WAY_CHOICE() + "#Acheter&Ne pas acheter#",
@@ -3193,21 +3194,21 @@ int32_t TokensRequiredBySettings() {
 }
 
 std::array<ConditionalAlwaysHint, 9> conditionalAlwaysHints = {
-    std::make_pair(MARKET_10_BIG_POES,
+    std::make_pair(RC_MARKET_10_BIG_POES,
                    []() {
                        return Settings::BigPoeTargetCount.Value<uint8_t>() >= 3;
                    }), // Remember, the option's value being 3 means 4 are required
-    std::make_pair(DEKU_THEATER_MASK_OF_TRUTH, []() { return !Settings::CompleteMaskQuest; }),
-    std::make_pair(SONG_FROM_OCARINA_OF_TIME, []() { return StonesRequiredBySettings() < 2; }),
-    std::make_pair(HF_OCARINA_OF_TIME_ITEM, []() { return StonesRequiredBySettings() < 2; }),
-    std::make_pair(SHEIK_IN_KAKARIKO, []() { return MedallionsRequiredBySettings() < 5; }),
-    std::make_pair(DMT_TRADE_CLAIM_CHECK, []() { return false; }),
-    std::make_pair(KAK_30_GOLD_SKULLTULA_REWARD, []() { return TokensRequiredBySettings() < 30; }),
-    std::make_pair(KAK_40_GOLD_SKULLTULA_REWARD, []() { return TokensRequiredBySettings() < 40; }),
-    std::make_pair(KAK_50_GOLD_SKULLTULA_REWARD, []() { return TokensRequiredBySettings() < 50; })
+    std::make_pair(RC_DEKU_THEATER_MASK_OF_TRUTH, []() { return !Settings::CompleteMaskQuest; }),
+    std::make_pair(RC_SONG_FROM_OCARINA_OF_TIME, []() { return StonesRequiredBySettings() < 2; }),
+    std::make_pair(RC_HF_OCARINA_OF_TIME_ITEM, []() { return StonesRequiredBySettings() < 2; }),
+    std::make_pair(RC_SHEIK_IN_KAKARIKO, []() { return MedallionsRequiredBySettings() < 5; }),
+    std::make_pair(RC_DMT_TRADE_CLAIM_CHECK, []() { return false; }),
+    std::make_pair(RC_KAK_30_GOLD_SKULLTULA_REWARD, []() { return TokensRequiredBySettings() < 30; }),
+    std::make_pair(RC_KAK_40_GOLD_SKULLTULA_REWARD, []() { return TokensRequiredBySettings() < 40; }),
+    std::make_pair(RC_KAK_50_GOLD_SKULLTULA_REWARD, []() { return TokensRequiredBySettings() < 50; })
 };
 
-const HintText& Hint(const uint32_t hintKey) {
+const HintText& Hint(const RandomizerHintTextKey hintKey) {
     return hintTable[hintKey];
 }
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list.hpp b/soh/soh/Enhancements/randomizer/3drando/hint_list.hpp
index f60297179..1850c1990 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list.hpp
@@ -1,14 +1,13 @@
 #pragma once
 
 #include "hints.hpp"
-#include "keys.hpp"
 
 #include <vector>
 
-extern std::array<HintText, KEY_ENUM_MAX> hintTable;
+extern std::array<HintText, RHT_MAX> hintTable;
 
 void HintTable_Init();
-const HintText& Hint(uint32_t hintKey);
+const HintText& Hint(const RandomizerHintTextKey hintKey);
 std::vector<HintText> GetHintCategory(HintCategory category);
 
 void HintTable_Init_Item();
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_dungeon.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_dungeon.cpp
index ed54508ca..934a8f56c 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_dungeon.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_dungeon.cpp
@@ -4,68 +4,68 @@ void HintTable_Init_Exclude_Dungeon() {
   /*--------------------------
   |        DEKU TREE         |
   ---------------------------*/
-    hintTable[DEKU_TREE_MAP_CHEST] = HintText::Exclude({
+    hintTable[RHT_DEKU_TREE_MAP_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"in the #center of the Deku Tree# lies", /*french*/"#le coeur de l'Arbre Mojo# recèle", /*spanish*/"al #centro del Gran Árbol Deku# yace"},
   });
 
-    hintTable[DEKU_TREE_SLINGSHOT_CHEST] = HintText::Exclude({
+    hintTable[RHT_DEKU_TREE_SLINGSHOT_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the #treasure guarded by a scrub# in the Deku Tree is", /*french*/"le #trésor protégé par une peste# dans l'Arbre Mojo est", /*spanish*/"un #deku del Gran Árbol Deku# esconde"},
   });
 
-    hintTable[DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST] = HintText::Exclude({
+    hintTable[RHT_DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the #treasure guarded by a scrub# in the Deku Tree is", /*french*/"le #trésor protégé par une peste# dans l'Arbre Mojo est", /*spanish*/"un #deku del Gran Árbol Deku# esconde"},
   });
 
-    hintTable[DEKU_TREE_COMPASS_CHEST] = HintText::Exclude({
+    hintTable[RHT_DEKU_TREE_COMPASS_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#pillars of wood# in the Deku Tree lead to", /*french*/"les #piliers de bois# dans l'Arbre Mojo indiquent", /*spanish*/"los #salientes del Gran Árbol Deku# conducen a"},
   });
 
-    hintTable[DEKU_TREE_COMPASS_ROOM_SIDE_CHEST] = HintText::Exclude({
+    hintTable[RHT_DEKU_TREE_COMPASS_ROOM_SIDE_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#pillars of wood# in the Deku Tree lead to", /*french*/"les #piliers de bois# dans l'Arbre Mojo indiquent", /*spanish*/"los #salientes del Gran Árbol Deku# conducen a"},
   });
 
-    hintTable[DEKU_TREE_BASEMENT_CHEST] = HintText::Exclude({
+    hintTable[RHT_DEKU_TREE_BASEMENT_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#webs in the Deku Tree# hide", /*french*/"les #toiles dans l'Arbre Mojo# cachent", /*spanish*/"entre #telarañas del Gran Árbol Deku# yace"},
   });
 
 
-    hintTable[DEKU_TREE_MQ_MAP_CHEST] = HintText::Exclude({
+    hintTable[RHT_DEKU_TREE_MQ_MAP_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"in the #center of the Deku Tree# lies", /*french*/"#le coeur de l'Arbre Mojo# recèle", /*spanish*/"al #centro del Gran Árbol Deku# yace"},
   });
 
-    hintTable[DEKU_TREE_MQ_COMPASS_CHEST] = HintText::Exclude({
+    hintTable[RHT_DEKU_TREE_MQ_COMPASS_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #treasure guarded by a large spider# in the Deku Tree is", /*french*/"le #trésor protégé par une grosse araignée# dans l'Arbre Mojo est", /*spanish*/"una #gran araña del Gran Árbol Deku# esconde"},
   });
 
-    hintTable[DEKU_TREE_MQ_SLINGSHOT_CHEST] = HintText::Exclude({
+    hintTable[RHT_DEKU_TREE_MQ_SLINGSHOT_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#pillars of wood# in the Deku Tree lead to", /*french*/"les #piliers de bois# dans l'Arbre Mojo indiquent", /*spanish*/"los #salientes del Gran Árbol Deku# conducen a"},
   });
 
-    hintTable[DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST] = HintText::Exclude({
+    hintTable[RHT_DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#pillars of wood# in the Deku Tree lead to", /*french*/"les #piliers de bois# dans l'Arbre Mojo indiquent", /*spanish*/"los #salientes del Gran Árbol Deku# conducen a"},
   });
 
-    hintTable[DEKU_TREE_MQ_BASEMENT_CHEST] = HintText::Exclude({
+    hintTable[RHT_DEKU_TREE_MQ_BASEMENT_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#webs in the Deku Tree# hide", /*french*/"les #toiles dans l'Arbre Mojo# cachent", /*spanish*/"entre #telarañas del Gran Árbol Deku# yace"},
   });
 
-    hintTable[DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST] = HintText::Exclude({
+    hintTable[RHT_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#magical fire in the Deku Tree# leads to", /*french*/"le #feu magique dans l'Arbre Mojo# éclaire", /*spanish*/"el #fuego mágico en el Gran Árbol Deku# conduce a"},
   });
 
-    hintTable[DEKU_TREE_QUEEN_GOHMA_HEART] = HintText::Exclude({
+    hintTable[RHT_DEKU_TREE_QUEEN_GOHMA_HEART] = HintText::Exclude({
                        //obscure text
                        Text{"the #Parasitic Armored Arachnid# holds", /*french*/"le #monstre insectoïde géant# possède", /*spanish*/"el #arácnido parasitario acorazado# porta"},
                      }, {},
@@ -73,43 +73,43 @@ void HintTable_Init_Exclude_Dungeon() {
                        Text{"#Queen Gohma# holds", /*french*/"la #Reine Gohma# possède", /*spanish*/"la #Reina Goma# porta"}
   );
 
-    hintTable[DEKU_TREE_GS_BASEMENT_BACK_ROOM] = HintText::Exclude({
+    hintTable[RHT_DEKU_TREE_GS_BASEMENT_BACK_ROOM] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider deep within the Deku Tree# hides", /*french*/"une #Skulltula au coeur de l'Arbre Mojo# a", /*spanish*/"una #Skulltula en las profundidades del Árbol Deku# otorga"},
   });
 
-    hintTable[DEKU_TREE_GS_BASEMENT_GATE] = HintText::Exclude({
+    hintTable[RHT_DEKU_TREE_GS_BASEMENT_GATE] = HintText::Exclude({
                        //obscure text
                        Text{"a #web protects a spider# within the Deku Tree holding", /*french*/"une #Skulltula derrière une toile dans l'Arbre Mojo# a", /*spanish*/"una #Skulltula protegida por su tela# del Árbol Deku otorga"},
   });
 
-    hintTable[DEKU_TREE_GS_BASEMENT_VINES] = HintText::Exclude({
+    hintTable[RHT_DEKU_TREE_GS_BASEMENT_VINES] = HintText::Exclude({
                        //obscure text
                        Text{"a #web protects a spider# within the Deku Tree holding", /*french*/"une #Skulltula derrière une toile dans l'Arbre Mojo# a", /*spanish*/"una #Skulltula protegida por su tela# del Árbol Deku otorga"},
   });
 
-    hintTable[DEKU_TREE_GS_COMPASS_ROOM] = HintText::Exclude({
+    hintTable[RHT_DEKU_TREE_GS_COMPASS_ROOM] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider atop the Deku Tree# holds", /*french*/"une #Skulltula au sommet de l'Arbre Mojo# a", /*spanish*/"una #Skulltula en lo alto del Árbol Deku# otorga"},
   });
 
 
-    hintTable[DEKU_TREE_MQ_GS_LOBBY] = HintText::Exclude({
+    hintTable[RHT_DEKU_TREE_MQ_GS_LOBBY] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider in a crate# within the Deku Tree hides", /*french*/"une #Skulltula dans une boîte dans l'Arbre Mojo# a", /*spanish*/"una #Skulltula bajo una caja# del Árbol Deku otorga"},
   });
 
-    hintTable[DEKU_TREE_MQ_GS_COMPASS_ROOM] = HintText::Exclude({
+    hintTable[RHT_DEKU_TREE_MQ_GS_COMPASS_ROOM] = HintText::Exclude({
                        //obscure text
                        Text{"a #wall of rock protects a spider# within the Deku Tree holding", /*french*/"une #Skulltula derrière des rochers dans l'Arbre Mojo# a", /*spanish*/"una #Skulltula protegida por una pared rocosa# del Árbol Deku otorga"},
   });
 
-    hintTable[DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM] = HintText::Exclude({
+    hintTable[RHT_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider deep within the Deku Tree# hides", /*french*/"une #Skulltula au coeur de l'Arbre Mojo# a", /*spanish*/"una #Skulltula en las profundidades del Árbol Deku# otorga"},
   });
 
-    hintTable[DEKU_TREE_MQ_DEKU_SCRUB] = HintText::Exclude({
+    hintTable[RHT_DEKU_TREE_MQ_DEKU_SCRUB] = HintText::Exclude({
                        //obscure text
                        Text{"a #scrub in the Deku Tree# sells", /*french*/"la #peste Mojo dans l'Arbre Mojo# vend", /*spanish*/"un #deku del Gran Árbol Deku# vende"},
   });
@@ -117,68 +117,68 @@ void HintTable_Init_Exclude_Dungeon() {
   /*--------------------------
   |     DODONGOS CAVERN      |
   ---------------------------*/
-    hintTable[DODONGOS_CAVERN_BOSS_ROOM_CHEST] = HintText::Exclude({
+    hintTable[RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#above King Dodongo# lies", /*french*/"#par dessus le Roi Dodongo# gît", /*spanish*/"#sobre el Rey Dodongo# yace"},
   });
 
-    hintTable[DODONGOS_CAVERN_MAP_CHEST] = HintText::Exclude({
+    hintTable[RHT_DODONGOS_CAVERN_MAP_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #muddy wall in Dodongo's Cavern# hides", /*french*/"le #mur fragile dans la Caverne Dodongo# recèle", /*spanish*/"tras una #agrietada pared en la Cueva de los Dodongos# yace"},
   });
 
-    hintTable[DODONGOS_CAVERN_COMPASS_CHEST] = HintText::Exclude({
+    hintTable[RHT_DODONGOS_CAVERN_COMPASS_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #statue in Dodongo's Cavern# guards", /*french*/"la #statue dans la Caverne Dodongo# protège", /*spanish*/"una #estatua de la Cueva de los Dodongos# esconde"},
   });
 
-    hintTable[DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST] = HintText::Exclude({
+    hintTable[RHT_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"above a #maze of stone# in Dodongo's Cavern lies", /*french*/"sur #un labyrinthe de pierre# dans la Caverne Dodongo gît", /*spanish*/"entre un #laberinto de piedra# en la Cueva de los Dodongos yace"},
   });
 
-    hintTable[DODONGOS_CAVERN_BOMB_BAG_CHEST] = HintText::Exclude({
+    hintTable[RHT_DODONGOS_CAVERN_BOMB_BAG_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the #second lizard cavern battle# yields", /*french*/"le #deuxième duel de lézards de caverne# octroie", /*spanish*/"#luchar dos veces contra reptiles en una cueva# conduce a"},
   });
 
-    hintTable[DODONGOS_CAVERN_END_OF_BRIDGE_CHEST] = HintText::Exclude({
+    hintTable[RHT_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #chest at the end of a bridge# yields", /*french*/"le #trésor à l'extrémité d'un pont# contient", /*spanish*/"un #cofre al final de un quebrado puente# contiene"},
   });
 
 
-    hintTable[DODONGOS_CAVERN_MQ_MAP_CHEST] = HintText::Exclude({
+    hintTable[RHT_DODONGOS_CAVERN_MQ_MAP_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #muddy wall in Dodongo's Cavern# hides", /*french*/"le #mur fragile dans la Caverne Dodongo# recèle", /*spanish*/"una #agrietada pared en la Cueva de los Dodongos# esconde"},
   });
 
-    hintTable[DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST] = HintText::Exclude({
+    hintTable[RHT_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"an #elevated alcove# in Dodongo's Cavern holds", /*french*/"l'#alcove haut perchée# dans la Caverne Dodongo cache", /*spanish*/"una #elevada alcoba# en la Cueva de los Dodongos brinda"},
   });
 
-    hintTable[DODONGOS_CAVERN_MQ_COMPASS_CHEST] = HintText::Exclude({
+    hintTable[RHT_DODONGOS_CAVERN_MQ_COMPASS_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#fire-breathing lizards# in Dodongo's Cavern guard", /*french*/"les #lézards cracheurs de feu# dans la Caverne Dodongo protègent", /*spanish*/"unos #flamígeros reptiles# en la Cueva de los Dodongos esconden"},
   });
 
-    hintTable[DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST] = HintText::Exclude({
+    hintTable[RHT_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#baby spiders# in Dodongo's Cavern guard", /*french*/"les #petites araignées dans la Caverne Dodongo# protègent", /*spanish*/"unas #pequeñas larvas# en la Cueva de los Dodongos esconden"},
   });
 
-    hintTable[DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST] = HintText::Exclude({
+    hintTable[RHT_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"above a #maze of stone# in Dodongo's Cavern lies", /*french*/"sur #un labyrinthe de pierre# dans la Caverne Dodongo gît", /*spanish*/"sobre un #laberinto de piedra# en la Cueva de los Dodongos yace"},
   });
 
-    hintTable[DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST] = HintText::Exclude({
+    hintTable[RHT_DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#beneath a headstone# in Dodongo's Cavern lies", /*french*/"#sous une pierre tombale# dans la Caverne Dodongo gît", /*spanish*/"#bajo una lápida# en la Cueva de los Dodongos yace"},
   });
 
-    hintTable[DODONGOS_CAVERN_KING_DODONGO_HEART] = HintText::Exclude({
+    hintTable[RHT_DODONGOS_CAVERN_KING_DODONGO_HEART] = HintText::Exclude({
                        //obscure text
                        Text{"the #Infernal Dinosaur# holds", /*french*/"le #dinosaure infernal# possède", /*spanish*/"el #dinosaurio infernal# porta"},
                      }, {},
@@ -186,89 +186,89 @@ void HintTable_Init_Exclude_Dungeon() {
                        Text{"#King Dodongo# holds", /*french*/"le #Roi Dodongo# possède", /*spanish*/"el #Rey Dodongo# porta"}
   );
 
-    hintTable[DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS] = HintText::Exclude({
+    hintTable[RHT_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider entangled in vines# in Dodongo's Cavern guards", /*french*/"une #Skulltula sur les vignes dans la Caverne Dodongo# a", /*spanish*/"una #Skulltula sobre unas cepas# de la Cueva de los Dodongos otorga"},
   });
 
-    hintTable[DODONGOS_CAVERN_GS_SCARECROW] = HintText::Exclude({
+    hintTable[RHT_DODONGOS_CAVERN_GS_SCARECROW] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider among explosive slugs# hides", /*french*/"une #Skulltula dans l'alcove du couloir dans la Caverne Dodongo# a", /*spanish*/"una #Skulltula rodeada de explosivos gusanos# otorga"},
   });
 
-    hintTable[DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS] = HintText::Exclude({
+    hintTable[RHT_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider just out of reach# in Dodongo's Cavern holds", /*french*/"une #Skulltula au haut des escaliers de la Caverne Dodongo# a", /*spanish*/"una #Skulltula fuera del alcance# de la Cueva de los Dodongos otorga"},
   });
 
-    hintTable[DODONGOS_CAVERN_GS_BACK_ROOM] = HintText::Exclude({
+    hintTable[RHT_DODONGOS_CAVERN_GS_BACK_ROOM] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider behind a statue# in Dodongo's Cavern holds", /*french*/"une #Skulltula au coeur de la Caverne Dodongo# a", /*spanish*/"una #Skulltula tras una estatua# de la Cueva de los Dodongos otorga"},
   });
 
-    hintTable[DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS] = HintText::Exclude({
+    hintTable[RHT_DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider among bats# in Dodongo's Cavern holds", /*french*/"une #Skulltula entourée de Saigneurs dans la Caverne Dodongo# a", /*spanish*/"una #Skulltula rodeada de murciélagos# de la Cueva de los Dodongos otorga"},
   });
 
 
-    hintTable[DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM] = HintText::Exclude({
+    hintTable[RHT_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider high on a wall# in Dodongo's Cavern holds", /*french*/"une #Skulltula haut perchée dans la Caverne Dodongo# a", /*spanish*/"una #Skulltula en lo alto de una pared# de la Cueva de los Dodongos otorga"},
   });
 
-    hintTable[DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM] = HintText::Exclude({
+    hintTable[RHT_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider on top of a pillar of rock# in Dodongo's Cavern holds", /*french*/"une #Skulltula sur l'énorme pilier de roc de la Caverne Dodongo# a", /*spanish*/"una #Skulltula en lo alto de un pilar# de la Cueva de los Dodongos otorga"},
   });
 
-    hintTable[DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM] = HintText::Exclude({
+    hintTable[RHT_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider in a crate# in Dodongo's Cavern holds", /*french*/"une #Skulltula dans une boîte de la Caverne Dodongo# a", /*spanish*/"una #Skulltula bajo una caja# de la Cueva de los Dodongos otorga"},
   });
 
-    hintTable[DODONGOS_CAVERN_MQ_GS_BACK_AREA] = HintText::Exclude({
+    hintTable[RHT_DODONGOS_CAVERN_MQ_GS_BACK_AREA] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider among graves# in Dodongo's Cavern holds", /*french*/"une #Skulltula parmi les tombes de la Caverne Dodongo# a", /*spanish*/"una #Skulltula entre lápidas# en la Cueva de los Dodongos otorga"},
   });
 
-    hintTable[DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT] = HintText::Exclude({
+    hintTable[RHT_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT] = HintText::Exclude({
                        //obscure text
                        Text{"a pair of #scrubs in Dodongo's Cavern# sells", /*french*/"le #duo de peste Mojo dans la Caverne Dodongo# vend", /*spanish*/"un #par de dekus en la Cueva de los Dodongos# venden"},
   });
 
-    hintTable[DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS] = HintText::Exclude({
+    hintTable[RHT_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS] = HintText::Exclude({
                        //obscure text
                        Text{"a #scrub guarded by Lizalfos# sells", /*french*/"la #peste Mojo au coeur de la Caverne Dodongo# vend", /*spanish*/"un #deku custodiado por Lizalfos# vende"},
   });
 
-    hintTable[DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT] = HintText::Exclude({
+    hintTable[RHT_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT] = HintText::Exclude({
                        //obscure text
                        Text{"a pair of #scrubs in Dodongo's Cavern# sells", /*french*/"le #duo de peste Mojo dans la Caverne Dodongo# vend", /*spanish*/"un #par de dekus en la Cueva de los Dodongos# venden"},
   });
 
-    hintTable[DODONGOS_CAVERN_DEKU_SCRUB_LOBBY] = HintText::Exclude({
+    hintTable[RHT_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY] = HintText::Exclude({
                        //obscure text
                        Text{"a #scrub in Dodongo's Cavern# sells", /*french*/"la #peste Mojo dans l'entrée de la Caverne Dodongo# vend", /*spanish*/"un #deku en la Cueva de los Dodongos# vende"},
   });
 
 
-    hintTable[DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR] = HintText::Exclude({
+    hintTable[RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR] = HintText::Exclude({
                        //obscure text
                        Text{"a pair of #scrubs in Dodongo's Cavern# sells", /*french*/"le #duo de peste Mojo dans l'entrée de la Caverne Dodongo# vend", /*spanish*/"un #par de dekus en la Cueva de los Dodongos# venden"},
   });
 
-    hintTable[DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT] = HintText::Exclude({
+    hintTable[RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT] = HintText::Exclude({
                        //obscure text
                        Text{"a pair of #scrubs in Dodongo's Cavern# sells", /*french*/"le #duo de peste Mojo dans l'entrée de la Caverne Dodongo# vend", /*spanish*/"un #par de dekus en la Cueva de los Dodongos# venden"},
   });
 
-    hintTable[DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE] = HintText::Exclude({
+    hintTable[RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE] = HintText::Exclude({
                        //obscure text
                        Text{"a #scrub in Dodongo's Cavern# sells", /*french*/"la #peste Mojo au sommet des escaliers dans la Caverne Dodongo# vend", /*spanish*/"un #deku en la Cueva de los Dodongos# vende"},
   });
 
-    hintTable[DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS] = HintText::Exclude({
+    hintTable[RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS] = HintText::Exclude({
                        //obscure text
                        Text{"a #scrub guarded by Lizalfos# sells", /*french*/"la #peste Mojo au coeur de la Caverne Dodongo# vend", /*spanish*/"un #deku custodiado por Lizalfos# vende"},
   });
@@ -276,7 +276,7 @@ void HintTable_Init_Exclude_Dungeon() {
   /*--------------------------
   |     JABU JABUS BELLY     |
   ---------------------------*/
-    hintTable[JABU_JABUS_BELLY_MAP_CHEST] = HintText::Exclude({
+    hintTable[RHT_JABU_JABUS_BELLY_MAP_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#tentacle trouble# in a deity's belly guards", /*french*/"la #membrane# dans le ventre du gardien protège", /*spanish*/"un #problema tentaculoso# en la tripa de cierta deidad esconde"},
                      }, {},
@@ -284,7 +284,7 @@ void HintTable_Init_Exclude_Dungeon() {
                        Text{"a #slimy thing# guards", /*french*/"la #chose gluante# gardien protège", /*spanish*/"un #tentáculo parasitario# protege"}
   );
 
-    hintTable[JABU_JABUS_BELLY_COMPASS_CHEST] = HintText::Exclude({
+    hintTable[RHT_JABU_JABUS_BELLY_COMPASS_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#bubble trouble# in a deity's belly guards", /*french*/"un #horde de bulles# dans le ventre du gardien protègent", /*spanish*/"un #problema burbujesco# en la tripa de cierta deidad esconde"},
                      }, {},
@@ -293,12 +293,12 @@ void HintTable_Init_Exclude_Dungeon() {
   );
 
 
-    hintTable[JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST] = HintText::Exclude({
+    hintTable[RHT_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"shooting a #mouth cow# reveals", /*french*/"tirer sur une #vache# révèle", /*spanish*/"#dispararle a una vaca# revela"},
   });
 
-    hintTable[JABU_JABUS_BELLY_MQ_MAP_CHEST] = HintText::Exclude({
+    hintTable[RHT_JABU_JABUS_BELLY_MQ_MAP_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#pop rocks# hide",            /*french*/"des #pierres aux reins# cachent",     /*spanish*/"#cepillarse los dientes con explosivos# revela"},
                        Text{"an #explosive palate# holds", /*french*/"des #gargouillis explosifs# cachent", /*spanish*/"un #paladar explosivo# esconde"},
@@ -307,42 +307,42 @@ void HintTable_Init_Exclude_Dungeon() {
                        Text{"a #boulder before cows# hides", /*french*/"des #rochers près des vaches# cachent", /*spanish*/"cierta #roca rodeada de vacas# esconde"}
   );
 
-    hintTable[JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST] = HintText::Exclude({
+    hintTable[RHT_JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"near a #spiked elevator# lies", /*french*/"près d'un #ascenseur visqueux# gît", /*spanish*/"cerca de un #ascensor puntiagudo# yace"},
   });
 
-    hintTable[JABU_JABUS_BELLY_MQ_COMPASS_CHEST] = HintText::Exclude({
+    hintTable[RHT_JABU_JABUS_BELLY_MQ_COMPASS_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #drowning cow# unveils", /*french*/"une #vache à l'eau# a", /*spanish*/"una #vaca sumergida# revela"},
   });
 
-    hintTable[JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST] = HintText::Exclude({
+    hintTable[RHT_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#moving anatomy# creates a path to", /*french*/"un #organe descendant# mène à", /*spanish*/"un #ser movedizo entre paredes# conduce a"},
   });
 
-    hintTable[JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST] = HintText::Exclude({
+    hintTable[RHT_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #pair of digested cows# hold", /*french*/"#deux boeufs digérés# détiennent", /*spanish*/"un #par de digeridas vacas# otorgan"},
   });
 
-    hintTable[JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST] = HintText::Exclude({
+    hintTable[RHT_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #pair of digested cows# hold", /*french*/"#deux boeufs digérés# détiennent", /*spanish*/"un #par de digeridas vacas# otorgan"},
   });
 
-    hintTable[JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST] = HintText::Exclude({
+    hintTable[RHT_JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the #final cows' reward# in a deity's belly is", /*french*/"le #cadeau des dernières vaches# estomacales est", /*spanish*/"las #vacas al final# de la tripa de cierta deidad otorgan"},
   });
 
-    hintTable[JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST] = HintText::Exclude({
+    hintTable[RHT_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#cows protected by falling monsters# in a deity's belly guard", /*french*/"des #vaches protégées par des monstres tombants# cachent", /*spanish*/"unas #vacas custodiadas por monstruos del techo# de la tripa de cierta deidad otorgan"},
   });
 
-    hintTable[JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST] = HintText::Exclude({
+    hintTable[RHT_JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a school of #stingers swallowed by a deity# guard", /*french*/"les #raies avallées par le gardien# protègent", /*spanish*/"unos #stingers engullidos por cierta deidad# guardan"},
                      }, {},
@@ -350,7 +350,7 @@ void HintTable_Init_Exclude_Dungeon() {
                        Text{"a school of #stingers swallowed by Jabu-Jabu# guard", /*french*/"les #raies avallées par Jabu-Jabu# protègent", /*spanish*/"unos #stingers engullidos por Jabu-Jabu# guardan"}
   );
 
-    hintTable[JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST] = HintText::Exclude({
+    hintTable[RHT_JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a school of #stingers swallowed by a deity# guard", /*french*/"les #raies avallées par le gardien# protègent", /*spanish*/"unos #stingers engullidos por cierta deidad# guardan"},
                      }, {},
@@ -358,7 +358,7 @@ void HintTable_Init_Exclude_Dungeon() {
                        Text{"a school of #stingers swallowed by Jabu-Jabu# guard", /*french*/"les #raies avallées par Jabu-Jabu# protègent", /*spanish*/"unos #stingers engullidos por Jabu-Jabu# guardan"}
   );
 
-    hintTable[JABU_JABUS_BELLY_BARINADE_HEART] = HintText::Exclude({
+    hintTable[RHT_JABU_JABUS_BELLY_BARINADE_HEART] = HintText::Exclude({
                        //obscure text
                        Text{"the #Bio-Electric Anemone# holds", /*french*/"l'#anémone bioélectrique# possède", /*spanish*/"la #anémona bioeléctrica# porta"},
                      }, {},
@@ -366,43 +366,43 @@ void HintTable_Init_Exclude_Dungeon() {
                        Text{"#Barinade# holds", /*french*/"#Barinade# possède", /*spanish*/"#Barinade# porta"}
   );
 
-    hintTable[JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER] = HintText::Exclude({
+    hintTable[RHT_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider resting near a princess# in Jabu-Jabu's Belly holds", /*french*/"une #Skulltula près de la princesse dans le Ventre de Jabu-Jabu# a", /*spanish*/"una #Skulltula junto a una princesa# en la Tripa de Jabu-Jabu otorga"},
   });
 
-    hintTable[JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER] = HintText::Exclude({
+    hintTable[RHT_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider resting near a princess# in Jabu-Jabu's Belly holds", /*french*/"une #Skulltula près de la princesse dans le Ventre de Jabu-Jabu# a", /*spanish*/"una #Skulltula junto a una princesa# en la Tripa de Jabu-Jabu otorga"},
   });
 
-    hintTable[JABU_JABUS_BELLY_GS_NEAR_BOSS] = HintText::Exclude({
+    hintTable[RHT_JABU_JABUS_BELLY_GS_NEAR_BOSS] = HintText::Exclude({
                        //obscure text
                        Text{"#jellyfish surround a spider# holding", /*french*/"une #Skulltula entourée de méduses dans le Ventre de Jabu-Jabu# a", /*spanish*/"una #Skulltula rodeada de medusas# otorga"},
   });
 
-    hintTable[JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM] = HintText::Exclude({
+    hintTable[RHT_JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider guarded by a school of stingers# in Jabu-Jabu's Belly holds", /*french*/"une #Skulltula protégée par des raies dans le Ventre de Jabu-Jabu# a", /*spanish*/"una #Skulltula rodeada por unos stingers# en la Tripa de Jabu-Jabu otorga"},
   });
 
 
-    hintTable[JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM] = HintText::Exclude({
+    hintTable[RHT_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider surrounded by electricity# in Jabu-Jabu's Belly holds", /*french*/"une #Skulltula entourée d'électricité dans le Ventre de Jabu-Jabu# a", /*spanish*/"una #Skulltula rodeada de electricidad# en la Tripa de Jabu-Jabu otorga"},
   });
 
-    hintTable[JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM] = HintText::Exclude({
+    hintTable[RHT_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider guarded by a school of stingers# in Jabu-Jabu's Belly holds", /*french*/"une #Skulltula protégée par des raies dans le Ventre de Jabu-Jabu# a", /*spanish*/"una #Skulltula protegida por unos stingers# en la Tripa de Jabu-Jabu otorga"},
   });
 
-    hintTable[JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS] = HintText::Exclude({
+    hintTable[RHT_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider in a web within Jabu-Jabu's Belly# holds", /*french*/"une #Skulltula sur une toile dans le Ventre de Jabu-Jabu# a", /*spanish*/"una #Skulltula sobre una red# en la Tripa de Jabu-Jabu otorga"},
   });
 
-    hintTable[JABU_JABUS_BELLY_DEKU_SCRUB] = HintText::Exclude({
+    hintTable[RHT_JABU_JABUS_BELLY_DEKU_SCRUB] = HintText::Exclude({
                        //obscure text
                        Text{"a #scrub in a deity# sells", /*french*/"la #peste Mojo dans le ventre du gardien# vend", /*spanish*/"un #deku dentro de cierta deidad# vende"},
   });
@@ -410,37 +410,37 @@ void HintTable_Init_Exclude_Dungeon() {
   /*--------------------------
   |      FOREST TEMPLE       |
   ---------------------------*/
-    hintTable[FOREST_TEMPLE_FIRST_ROOM_CHEST] = HintText::Exclude({
+    hintTable[RHT_FOREST_TEMPLE_FIRST_ROOM_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #tree in the Forest Temple# supports", /*french*/"sur l'#arbre dans le Temple de la Forêt# gît", /*spanish*/"sobre un #árbol del Templo del Bosque# yace"},
   });
 
-    hintTable[FOREST_TEMPLE_FIRST_STALFOS_CHEST] = HintText::Exclude({
+    hintTable[RHT_FOREST_TEMPLE_FIRST_STALFOS_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#defeating enemies beneath a falling ceiling# in Forest Temple yields", /*french*/"#deux squelettes# dans le Temple de la Forêt protègent", /*spanish*/"#derrotar enemigos caídos de lo alto# del Templo del Bosque revela"},
   });
 
-    hintTable[FOREST_TEMPLE_WELL_CHEST] = HintText::Exclude({
+    hintTable[RHT_FOREST_TEMPLE_WELL_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #sunken chest deep in the woods# contains", /*french*/"le #coffre submergé dans la forêt# contient", /*spanish*/"un #sumergido cofre en lo profundo del bosque# contiene"},
   });
 
-    hintTable[FOREST_TEMPLE_MAP_CHEST] = HintText::Exclude({
+    hintTable[RHT_FOREST_TEMPLE_MAP_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #fiery skull# in Forest Temple guards", /*french*/"le #crâne enflammé# dans le Temple de la Forêt protège", /*spanish*/"una #ardiente calavera# del Templo del Bosque esconde"},
   });
 
-    hintTable[FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST] = HintText::Exclude({
+    hintTable[RHT_FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #chest on a small island# in the Forest Temple holds", /*french*/"le #coffre sur l'îlot# du Temple de la Forêt contient", /*spanish*/"un #cofre sobre una isla# del Templo del Bosque contiene"},
   });
 
-    hintTable[FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST] = HintText::Exclude({
+    hintTable[RHT_FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"beneath a #checkerboard falling ceiling# lies", /*french*/"sous #l'échiquier tombant# gît", /*spanish*/"tras un #techo de ajedrez# yace"},
   });
 
-    hintTable[FOREST_TEMPLE_EYE_SWITCH_CHEST] = HintText::Exclude({
+    hintTable[RHT_FOREST_TEMPLE_EYE_SWITCH_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #sharp eye# will spot", /*french*/"l'#oeil perçant# dans la forêt verra", /*spanish*/"un #afilado ojo# revela"},
                      }, {},
@@ -448,17 +448,17 @@ void HintTable_Init_Exclude_Dungeon() {
                        Text{"#blocks of stone# in the Forest Temple surround", /*french*/"les #blocs dans le Temple de la Forêt# entourent", /*spanish*/"cerca de unos #bloques de piedra# del Templo del Bosque yace"}
   );
 
-    hintTable[FOREST_TEMPLE_BOSS_KEY_CHEST] = HintText::Exclude({
+    hintTable[RHT_FOREST_TEMPLE_BOSS_KEY_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #turned trunk# contains", /*french*/"le #coffre pivoté# contient", /*spanish*/"en una #sala con otro punto de vista# se esconde"},
   });
 
-    hintTable[FOREST_TEMPLE_FLOORMASTER_CHEST] = HintText::Exclude({
+    hintTable[RHT_FOREST_TEMPLE_FLOORMASTER_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"deep in the forest #shadows guard a chest# containing", /*french*/"l'#ombre de la forêt# protège un coffre contenant", /*spanish*/"en lo profundo del bosque #unas sombras# esconden"},
   });
 
-    hintTable[FOREST_TEMPLE_BOW_CHEST] = HintText::Exclude({
+    hintTable[RHT_FOREST_TEMPLE_BOW_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"an #army of the dead# guards", /*french*/"des #squelettes sylvestres# protègent", /*spanish*/"un #ejército de soldados caídos# guarda"},
                      }, {},
@@ -466,7 +466,7 @@ void HintTable_Init_Exclude_Dungeon() {
                        Text{"#Stalfos deep in the Forest Temple# guard", /*french*/"#trois squelettes dans le Temple de la Forêt# protègent", /*spanish*/"los #Stalfos en lo profundo del Templo del Bosque# guardan"}
   );
 
-    hintTable[FOREST_TEMPLE_RED_POE_CHEST] = HintText::Exclude({
+    hintTable[RHT_FOREST_TEMPLE_RED_POE_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#Joelle# guards", /*french*/"#Joelle# protège", /*spanish*/"#Joelle# guarda"},
                      }, {},
@@ -474,7 +474,7 @@ void HintTable_Init_Exclude_Dungeon() {
                        Text{"a #red ghost# guards", /*french*/"le #fantôme rouge# protège", /*spanish*/"un #espectro rojo# guarda"}
   );
 
-    hintTable[FOREST_TEMPLE_BLUE_POE_CHEST] = HintText::Exclude({
+    hintTable[RHT_FOREST_TEMPLE_BLUE_POE_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#Beth# guards", /*french*/"#Beth# protège", /*spanish*/"#Beth# guarda"},
                      }, {},
@@ -482,23 +482,23 @@ void HintTable_Init_Exclude_Dungeon() {
                        Text{"a #blue ghost# guards", /*french*/"le #fantôme bleu# protège", /*spanish*/"un #espectro azul# guarda"}
   );
 
-    hintTable[FOREST_TEMPLE_BASEMENT_CHEST] = HintText::Exclude({
+    hintTable[RHT_FOREST_TEMPLE_BASEMENT_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#revolving walls# in the Forest Temple conceal", /*french*/"des #murs rotatifs dans la forêt# recèlent", /*spanish*/"las #paredes giratorias# del Templo del Bosque conceden"},
   });
 
 
-    hintTable[FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST] = HintText::Exclude({
+    hintTable[RHT_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #tree in the Forest Temple# supports", /*french*/"sur l'#arbre dans le Temple de la Forêt# gît", /*spanish*/"sobre un #árbol del Templo del Bosque# yace"},
   });
 
-    hintTable[FOREST_TEMPLE_MQ_WOLFOS_CHEST] = HintText::Exclude({
+    hintTable[RHT_FOREST_TEMPLE_MQ_WOLFOS_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#defeating enemies beneath a falling ceiling# in Forest Temple yields", /*french*/"#deux squelettes# dans le Temple de la Forêt protègent", /*spanish*/"#derrotar enemigos caídos de lo alto# del Templo del Bosque revela"},
   });
 
-    hintTable[FOREST_TEMPLE_MQ_BOW_CHEST] = HintText::Exclude({
+    hintTable[RHT_FOREST_TEMPLE_MQ_BOW_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"an #army of the dead# guards", /*french*/"des #squelettes sylvestres# protègent", /*spanish*/"un #ejército de soldados caídos# guarda"},
                      }, {},
@@ -506,22 +506,22 @@ void HintTable_Init_Exclude_Dungeon() {
                        Text{"#Stalfos deep in the Forest Temple# guard", /*french*/"#trois squelettes dans le Temple de la Forêt# protègent", /*spanish*/"los #Stalfos en lo profundo del Templo del Bosque# guardan"}
   );
 
-    hintTable[FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST] = HintText::Exclude({
+    hintTable[RHT_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #chest on a small island# in the Forest Temple holds", /*french*/"le #coffre sur l'îlot# du Temple de la Forêt contient", /*spanish*/"un #cofre sobre una isla# del Templo del Bosque contiene"},
   });
 
-    hintTable[FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST] = HintText::Exclude({
+    hintTable[RHT_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#high in a courtyard# within the Forest Temple is", /*french*/"#haut perché dans le jardin# du Temple de la Forêt gît", /*spanish*/"un #cofre en lo alto de un patio# del Templo del Bosque contiene"},
   });
 
-    hintTable[FOREST_TEMPLE_MQ_WELL_CHEST] = HintText::Exclude({
+    hintTable[RHT_FOREST_TEMPLE_MQ_WELL_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #sunken chest deep in the woods# contains", /*french*/"le #coffre submergé dans la forêt# contient", /*spanish*/"un #sumergido cofre en lo profundo del bosque# contiene"},
   });
 
-    hintTable[FOREST_TEMPLE_MQ_MAP_CHEST] = HintText::Exclude({
+    hintTable[RHT_FOREST_TEMPLE_MQ_MAP_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#Joelle# guards", /*french*/"#Joelle# protège", /*spanish*/"#Joelle# guarda"},
                      }, {},
@@ -529,7 +529,7 @@ void HintTable_Init_Exclude_Dungeon() {
                        Text{"a #red ghost# guards", /*french*/"le #fantôme rouge# protège", /*spanish*/"un #fantasma rojo# guarda"}
   );
 
-    hintTable[FOREST_TEMPLE_MQ_COMPASS_CHEST] = HintText::Exclude({
+    hintTable[RHT_FOREST_TEMPLE_MQ_COMPASS_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#Beth# guards", /*french*/"#Beth# protège", /*spanish*/"#Beth# guarda"},
                      }, {},
@@ -537,27 +537,27 @@ void HintTable_Init_Exclude_Dungeon() {
                        Text{"a #blue ghost# guards", /*french*/"le #fantôme bleu# protège", /*spanish*/"un #fantasma azul# guarda"}
   );
 
-    hintTable[FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST] = HintText::Exclude({
+    hintTable[RHT_FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"beneath a #checkerboard falling ceiling# lies", /*french*/"sous #l'échiquier tombant# gît", /*spanish*/"tras un #techo de ajedrez# yace"},
   });
 
-    hintTable[FOREST_TEMPLE_MQ_BASEMENT_CHEST] = HintText::Exclude({
+    hintTable[RHT_FOREST_TEMPLE_MQ_BASEMENT_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#revolving walls# in the Forest Temple conceal", /*french*/"des #murs rotatifs dans la forêt# recèlent", /*spanish*/"las #paredes giratorias# del Templo del Bosque conceden"},
   });
 
-    hintTable[FOREST_TEMPLE_MQ_REDEAD_CHEST] = HintText::Exclude({
+    hintTable[RHT_FOREST_TEMPLE_MQ_REDEAD_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"deep in the forest #undead guard a chest# containing", /*french*/"des #revenants dans le Temple de la Forêt# protègent", /*spanish*/"en lo profundo del bosque #guardias del más allá# guardan"},
   });
 
-    hintTable[FOREST_TEMPLE_MQ_BOSS_KEY_CHEST] = HintText::Exclude({
+    hintTable[RHT_FOREST_TEMPLE_MQ_BOSS_KEY_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #turned trunk# contains", /*french*/"le #coffre pivoté# contient", /*spanish*/"en una #sala con otro punto de vista# se esconde"},
   });
 
-    hintTable[FOREST_TEMPLE_PHANTOM_GANON_HEART] = HintText::Exclude({
+    hintTable[RHT_FOREST_TEMPLE_PHANTOM_GANON_HEART] = HintText::Exclude({
                        //obscure text
                        Text{"the #Evil Spirit from Beyond# holds", /*french*/"l'#esprit maléfique de l'au-delà# possède", /*spanish*/"el #espíritu maligno de ultratumba# porta"},
                      }, {},
@@ -565,53 +565,53 @@ void HintTable_Init_Exclude_Dungeon() {
                        Text{"#Phantom Ganon# holds", /*french*/"#Ganon Spectral# possède", /*spanish*/"#Ganon Fantasma# porta"}
   );
 
-    hintTable[FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD] = HintText::Exclude({
+    hintTable[RHT_FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider on a small island# in the Forest Temple holds", /*french*/"une #Skulltula sur l'îlot du Temple de la Forêt# a", /*spanish*/"una #Skulltula sobre una pequeña isla# del Templo del Bosque otorga"},
   });
 
-    hintTable[FOREST_TEMPLE_GS_FIRST_ROOM] = HintText::Exclude({
+    hintTable[RHT_FOREST_TEMPLE_GS_FIRST_ROOM] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider high on a wall of vines# in the Forest Temple holds", /*french*/"une #Skulltula sur un mur de vignes du Temple de la Forêt# a", /*spanish*/"una #Skulltula en lo alto de una pared de cepas# del Templo del Bosque otorga"},
   });
 
-    hintTable[FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD] = HintText::Exclude({
+    hintTable[RHT_FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD] = HintText::Exclude({
                        //obscure text
                        Text{"#stone columns# lead to a spider in the Forest Temple hiding", /*french*/"une #Skulltula haut perchée dans le jardin du Temple de la Forêt# a", /*spanish*/"unas #columnas del Templo del Bosque# conducen a una Skulltula que otorga"},
   });
 
-    hintTable[FOREST_TEMPLE_GS_LOBBY] = HintText::Exclude({
+    hintTable[RHT_FOREST_TEMPLE_GS_LOBBY] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider among ghosts# in the Forest Temple guards", /*french*/"une #Skulltula dans la grande salle du Temple de la Forêt# a", /*spanish*/"una #Skulltula rodeada de fantasmas# del Templo del Bosque otorga"},
   });
 
-    hintTable[FOREST_TEMPLE_GS_BASEMENT] = HintText::Exclude({
+    hintTable[RHT_FOREST_TEMPLE_GS_BASEMENT] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider within revolving walls# in the Forest Temple holds", /*french*/"une #Skulltula derrière les murs pivotants du Temple de la Forêt# a", /*spanish*/"una #Skulltula entre paredes giratorias# del Templo del Bosque otorga"},
   });
 
 
-    hintTable[FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY] = HintText::Exclude({
+    hintTable[RHT_FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY] = HintText::Exclude({
                        //obscure text
                        Text{"an #ivy-hidden spider# in the Forest Temple hoards", /*french*/"une #Skulltula près de l'entrée du Temple de la Forêt# a", /*spanish*/"una #Skulltula escondida entre cepas# del Templo del Bosque otorga"},
   });
 
-    hintTable[FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM] = HintText::Exclude({
+    hintTable[RHT_FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider in a hidden nook# within the Forest Temple holds", /*french*/"une #Skulltula dans un recoin caché du Temple de la Forêt# a", /*spanish*/"una #Skulltula en una esquina oculta# del Templo del Bosque otorga"},
   });
 
-    hintTable[FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD] = HintText::Exclude({
+    hintTable[RHT_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider on an arch# in the Forest Temple holds", /*french*/"une #Skulltula sur une arche du Temple de la Forêt# a", /*spanish*/"una #Skulltula sobre un arco# del Templo del Bosque otorga"},
   });
 
-    hintTable[FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD] = HintText::Exclude({
+    hintTable[RHT_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider on a ledge# in the Forest Temple holds", /*french*/"une #Skulltula dans le jardin du Temple de la Forêt# a", /*spanish*/"una #Skulltula en un borde# del Templo del Bosque otorga"},
   });
 
-    hintTable[FOREST_TEMPLE_MQ_GS_WELL] = HintText::Exclude({
+    hintTable[RHT_FOREST_TEMPLE_MQ_GS_WELL] = HintText::Exclude({
                        //obscure text
                        Text{"#draining a well# in Forest Temple uncovers a spider with", /*french*/"une #Skulltula au fond du Puits du Temple de la Forêt# a", /*spanish*/"#vaciar el pozo# del Templo del Bosque desvela una Skulltula que otorga"},
   });
@@ -619,73 +619,73 @@ void HintTable_Init_Exclude_Dungeon() {
   /*--------------------------
   |       FIRE TEMPLE        |
   ---------------------------*/
-    hintTable[FIRE_TEMPLE_NEAR_BOSS_CHEST] = HintText::Exclude({
+    hintTable[RHT_FIRE_TEMPLE_NEAR_BOSS_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#near a dragon# is", /*french*/"#près d'un dragon# gît", /*spanish*/"#cerca de un dragón# yace"},
   });
 
-    hintTable[FIRE_TEMPLE_FLARE_DANCER_CHEST] = HintText::Exclude({
+    hintTable[RHT_FIRE_TEMPLE_FLARE_DANCER_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the #Flare Dancer behind a totem# guards", /*french*/"le #Danse-Flamme derrière un totem# protège", /*spanish*/"el #Bailafuego tras unos tótems# esconde"},
   });
 
-    hintTable[FIRE_TEMPLE_BOSS_KEY_CHEST] = HintText::Exclude({
+    hintTable[RHT_FIRE_TEMPLE_BOSS_KEY_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #prison beyond a totem# holds", /*french*/"la #prison derrière un totem# contient", /*spanish*/"en una #prisión tras unos tótems# yace"},
   });
 
-    hintTable[FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST] = HintText::Exclude({
+    hintTable[RHT_FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#explosives over a lava pit# unveil", /*french*/"des #explosifs dans un lac de lave# révèlent", /*spanish*/"los #explosivos en un mar de llamas# revelan"},
   });
 
-    hintTable[FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST] = HintText::Exclude({
+    hintTable[RHT_FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #Goron trapped near lava# holds", /*french*/"le #Goron emprisonné près de la lave# a", /*spanish*/"un #goron atrapado cerca de un mar de llamas# guarda"},
   });
 
-    hintTable[FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST] = HintText::Exclude({
+    hintTable[RHT_FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #Goron at the end of a maze# holds", /*french*/"le #Goron dans le labyrinthe# a", /*spanish*/"un #goron al final de un laberinto# guarda"},
   });
 
-    hintTable[FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST] = HintText::Exclude({
+    hintTable[RHT_FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #Goron above a maze# holds", /*french*/"le #Goron au dessus du labyrinthe# a", /*spanish*/"un #goron sobre un laberinto# guarda"},
   });
 
-    hintTable[FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST] = HintText::Exclude({
+    hintTable[RHT_FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #Goron hidden near a maze# holds", /*french*/"le #Goron caché près du labyrinthe# a", /*spanish*/"un #goron escondido tras un laberinto# guarda"},
   });
 
-    hintTable[FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST] = HintText::Exclude({
+    hintTable[RHT_FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #blocked path# in Fire Temple holds", /*french*/"un #sol fragile dans le Temple du Feu# contient", /*spanish*/"en un #camino bloqueado# del Templo del Fuego yace"},
   });
 
-    hintTable[FIRE_TEMPLE_MAP_CHEST] = HintText::Exclude({
+    hintTable[RHT_FIRE_TEMPLE_MAP_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #caged chest# in the Fire Temple hoards", /*french*/"un #coffre emprisonné# dans le Temple du Feu contient", /*spanish*/"un #cofre entre rejas# del Templo del Fuego contiene"},
   });
 
-    hintTable[FIRE_TEMPLE_COMPASS_CHEST] = HintText::Exclude({
+    hintTable[RHT_FIRE_TEMPLE_COMPASS_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #chest in a fiery maze# contains", /*french*/"un #coffre dans un labyrinthe enflammé# contient", /*spanish*/"un #cofre de un ardiente laberinto# contiene"},
   });
 
-    hintTable[FIRE_TEMPLE_HIGHEST_GORON_CHEST] = HintText::Exclude({
+    hintTable[RHT_FIRE_TEMPLE_HIGHEST_GORON_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #Goron atop the Fire Temple# holds", /*french*/"le #Goron au sommet du Temple du Feu# a", /*spanish*/"un #goron en lo alto del Templo del Fuego# guarda"},
   });
 
 
-    hintTable[FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST] = HintText::Exclude({
+    hintTable[RHT_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#near a dragon# is", /*french*/"#près d'un dragon# gît", /*spanish*/"#cerca de un dragón# yace"},
   });
 
-    hintTable[FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST] = HintText::Exclude({
+    hintTable[RHT_FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the #Flare Dancer in the depths of a volcano# guards", /*french*/"le #Danse-Flamme au coeur du volcan# a", /*spanish*/"el #Bailafuego en lo profundo del volcán# esconde"},
                      }, {},
@@ -693,52 +693,52 @@ void HintTable_Init_Exclude_Dungeon() {
                        Text{"the #Flare Dancer in the depths of the Fire Temple# guards", /*french*/"le #Danse-Flamme au coeur du volcan# a", /*spanish*/"el #Bailafuego en lo profundo del Templo del Fuego# esconde"}
   );
 
-    hintTable[FIRE_TEMPLE_MQ_COMPASS_CHEST] = HintText::Exclude({
+    hintTable[RHT_FIRE_TEMPLE_MQ_COMPASS_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #blocked path# in Fire Temple holds", /*french*/"le #chemin scellé# dans le Temple du Feu contient", /*spanish*/"en un #camino bloqueado# del Templo del Fuego yace"},
   });
 
-    hintTable[FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST] = HintText::Exclude({
+    hintTable[RHT_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#crates in a maze# contain", /*french*/"des #boîtes dans le labyrinthe# contiennent", /*spanish*/"las #cajas de un laberinto# contienen"},
   });
 
-    hintTable[FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST] = HintText::Exclude({
+    hintTable[RHT_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#crates in a maze# contain", /*french*/"des #boîtes dans le labyrinthe# contiennent", /*spanish*/"las #cajas de un laberinto# contienen"},
   });
 
-    hintTable[FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST] = HintText::Exclude({
+    hintTable[RHT_FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #falling slug# in the Fire Temple guards", /*french*/"la #limace tombante# dans le Temple du Feu protège", /*spanish*/"una #babosa del techo# del Templo del Fuego guarda"},
   });
 
-    hintTable[FIRE_TEMPLE_MQ_MAP_CHEST] = HintText::Exclude({
+    hintTable[RHT_FIRE_TEMPLE_MQ_MAP_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"using a #hammer in the depths of the Fire Temple# reveals", "frapper du #marteau au coeur du volcan# révèle", /*spanish*/"usar el #martillo en lo profundo del Templo del Fuego# revela"},
   });
 
-    hintTable[FIRE_TEMPLE_MQ_BOSS_KEY_CHEST] = HintText::Exclude({
+    hintTable[RHT_FIRE_TEMPLE_MQ_BOSS_KEY_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#illuminating a lava pit# reveals the path to", /*french*/"#éclairer le lac de lave# révèle", /*spanish*/"#iluminar un mar de llamas# revela"},
   });
 
-    hintTable[FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST] = HintText::Exclude({
+    hintTable[RHT_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#explosives over a lava pit# unveil", /*french*/"des #explosifs dans un lac de lave# révèlent", /*spanish*/"los #explosivos en un mar de llamas# revelan"},
   });
 
-    hintTable[FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST] = HintText::Exclude({
+    hintTable[RHT_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #Goron hidden near a maze# holds", /*french*/"le #Goron caché près du labyrinthe# a", /*spanish*/"un #goron cerca de un laberinto# guarda"},
   });
 
-    hintTable[FIRE_TEMPLE_MQ_FREESTANDING_KEY] = HintText::Exclude({
+    hintTable[RHT_FIRE_TEMPLE_MQ_FREESTANDING_KEY] = HintText::Exclude({
                        //obscure text
                        Text{"hidden #beneath a block of stone# lies", /*french*/"caché #derrière un bloc de pierre# gît", /*spanish*/"#bajo unos bloques de piedra# yace"},
   });
 
-    hintTable[FIRE_TEMPLE_VOLVAGIA_HEART] = HintText::Exclude({
+    hintTable[RHT_FIRE_TEMPLE_VOLVAGIA_HEART] = HintText::Exclude({
                        //obscure text
                        Text{"the #Subterranean Lava Dragon# holds", /*french*/"le #dragon des profondeurs# possède", /*spanish*/"el #dragón de lava subterráneo# porta"},
                      }, {},
@@ -746,22 +746,22 @@ void HintTable_Init_Exclude_Dungeon() {
                        Text{"#Volvagia# holds", /*french*/"#Volvagia# possède", /*spanish*/"#Volvagia# porta"}
   );
 
-    hintTable[FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM] = HintText::Exclude({
+    hintTable[RHT_FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM] = HintText::Exclude({
                        //obscure text
                        Text{"#eight tiles of malice# guard a spider holding", /*french*/"une #Skulltula protégée par huit tuiles dans le Temple du Feu# a", /*spanish*/"#ocho baldosas de maldad# custodian una Skulltula que otorga"},
   });
 
-    hintTable[FIRE_TEMPLE_GS_BOSS_KEY_LOOP] = HintText::Exclude({
+    hintTable[RHT_FIRE_TEMPLE_GS_BOSS_KEY_LOOP] = HintText::Exclude({
                        //obscure text
                        Text{"#five tiles of malice# guard a spider holding", /*french*/"une #Skulltula protégée par cinq tuiles dans le Temple du Feu# a", /*spanish*/"#cinco baldosas de maldad# custodian una Skulltula que otorga"},
   });
 
-    hintTable[FIRE_TEMPLE_GS_BOULDER_MAZE] = HintText::Exclude({
+    hintTable[RHT_FIRE_TEMPLE_GS_BOULDER_MAZE] = HintText::Exclude({
                        //obscure text
                        Text{"#explosives in a maze# unveil a spider hiding", /*french*/"une #Skulltula derrière un mur fragile du Temple du Feu# a", /*spanish*/"los #explosivos en un laberinto# desvelan una Skulltula que otorga"},
   });
 
-    hintTable[FIRE_TEMPLE_GS_SCARECROW_TOP] = HintText::Exclude({
+    hintTable[RHT_FIRE_TEMPLE_GS_SCARECROW_TOP] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider-friendly scarecrow# atop a volcano hides", /*french*/"une #Skulltula repérée par l'épouvantail du volcan# a", /*spanish*/"un #espantapájaros en lo alto de un volcán# custodia una Skulltula que otorga"},
                      }, {},
@@ -769,7 +769,7 @@ void HintTable_Init_Exclude_Dungeon() {
                        Text{"a #spider-friendly scarecrow# atop the Fire Temple hides", /*french*/"une #Skulltula repérée par l'épouvantail du Temple du Feu# a", /*spanish*/"un #espantapájaros del Templo del Fuego# custodia una Skulltula que otorga"}
   );
 
-    hintTable[FIRE_TEMPLE_GS_SCARECROW_CLIMB] = HintText::Exclude({
+    hintTable[RHT_FIRE_TEMPLE_GS_SCARECROW_CLIMB] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider-friendly scarecrow# atop a volcano hides", /*french*/"une #Skulltula repérée par l'épouvantail du volcan# a", /*spanish*/"un #espantapájaros en lo alto de un volcán# custodia una Skulltula que otorga"},
                      }, {},
@@ -778,22 +778,22 @@ void HintTable_Init_Exclude_Dungeon() {
   );
 
 
-    hintTable[FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE] = HintText::Exclude({
+    hintTable[RHT_FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider above a fiery maze# holds", /*french*/"une #Skulltula au dessus du labyrinthe enflammé du Temple du Feu# a", /*spanish*/"una #Skulltula sobre un ardiente laberinto# otorga"},
   });
 
-    hintTable[FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER] = HintText::Exclude({
+    hintTable[RHT_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider within a fiery maze# holds", /*french*/"une #Skulltula dans le labyrinthe enflammé du Temple du Feu# a", /*spanish*/"una #Skulltula en el interior de un ardiente laberinto# otorga"},
   });
 
-    hintTable[FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR] = HintText::Exclude({
+    hintTable[RHT_FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR] = HintText::Exclude({
                        //obscure text
                        Text{"a #Goron trapped near lava# befriended a spider with", /*french*/"une #Skulltula emprisonnée près du lac de lave du Temple du Feu# a", /*spanish*/"una #Skulltula amiga de un Goron atrapado junto a la lava# otorga"},
   });
 
-    hintTable[FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM] = HintText::Exclude({
+    hintTable[RHT_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider beside a fiery maze# holds", /*french*/"une #Skulltula près du labyrinthe enflammé du Temple du Feu# a", /*spanish*/"una #Skulltula junto a un ardiente laberinto# otorga"},
   });
@@ -801,42 +801,42 @@ void HintTable_Init_Exclude_Dungeon() {
   /*--------------------------
   |       WATER TEMPLE       |
   ---------------------------*/
-    hintTable[WATER_TEMPLE_MAP_CHEST] = HintText::Exclude({
+    hintTable[RHT_WATER_TEMPLE_MAP_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#rolling spikes# in the Water Temple surround", /*french*/"des #Spikes# dans le Temple de l'Eau entourent", /*spanish*/"unas #rodantes púas# del Templo del Agua guardan"},
   });
 
-    hintTable[WATER_TEMPLE_COMPASS_CHEST] = HintText::Exclude({
+    hintTable[RHT_WATER_TEMPLE_COMPASS_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#roaming stingers in the Water Temple# guard", /*french*/"des #raies dans le Temple de l'Eau# protègent", /*spanish*/"unos #errantes stingers# del Templo del Agua guardan"},
   });
 
-    hintTable[WATER_TEMPLE_TORCHES_CHEST] = HintText::Exclude({
+    hintTable[RHT_WATER_TEMPLE_TORCHES_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#fire in the Water Temple# reveals", /*french*/"des #flammes dans le Temple de l'Eau# révèlent", /*spanish*/"el #fuego en el Templo del Agua# revela"},
   });
 
-    hintTable[WATER_TEMPLE_DRAGON_CHEST] = HintText::Exclude({
+    hintTable[RHT_WATER_TEMPLE_DRAGON_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #serpent's prize# in the Water Temple is", /*french*/"la #récompense du dragon submergé# est", /*spanish*/"el #escamado premio# del Templo del Agua se trata de"},
   });
 
-    hintTable[WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST] = HintText::Exclude({
+    hintTable[RHT_WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#blinding an eye# in the Water Temple leads to", /*french*/"#l'oeil# du Temple de l'Eau voit", /*spanish*/"#cegar un ojo# del Templo del Agua conduce a"},
   });
 
-    hintTable[WATER_TEMPLE_CENTRAL_PILLAR_CHEST] = HintText::Exclude({
+    hintTable[RHT_WATER_TEMPLE_CENTRAL_PILLAR_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"in the #depths of the Water Temple# lies", /*french*/"le #coeur du Temple de l'Eau# cache", /*spanish*/"en las #profundidades del Templo del Agua# yace"},
   });
 
-    hintTable[WATER_TEMPLE_CRACKED_WALL_CHEST] = HintText::Exclude({
+    hintTable[RHT_WATER_TEMPLE_CRACKED_WALL_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#through a crack# in the Water Temple is", /*french*/"le #mur fragile# du Temple de l'Eau cache", /*spanish*/"tras una #agrietada pared# del Templo del Agua yace"},
   });
 
-    hintTable[WATER_TEMPLE_LONGSHOT_CHEST] = HintText::Exclude({
+    hintTable[RHT_WATER_TEMPLE_LONGSHOT_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#facing yourself# reveals",              /*french*/"se #vaincre soi-même# révèle", /*spanish*/"#luchar contra ti mismo# revela"},
                        Text{"a #dark reflection# of yourself guards", /*french*/"son #propre reflet# cache",    /*spanish*/"el #oscuro reflejo de ti mismo# guarda"},
@@ -846,32 +846,32 @@ void HintTable_Init_Exclude_Dungeon() {
   );
 
 
-    hintTable[WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST] = HintText::Exclude({
+    hintTable[RHT_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"in the #depths of the Water Temple# lies", /*french*/"le #coeur du Temple de l'Eau# cache", /*spanish*/"en las #profundidades del Templo del Agua# yace"},
   });
 
-    hintTable[WATER_TEMPLE_MQ_BOSS_KEY_CHEST] = HintText::Exclude({
+    hintTable[RHT_WATER_TEMPLE_MQ_BOSS_KEY_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"fire in the Water Temple unlocks a #vast gate# revealing a chest with", /*french*/"des #flammes au coeur du Temple de l'Eau# révèlent", /*spanish*/"el fuego en el Templo del Agua alza una #gran valla# con"},
   });
 
-    hintTable[WATER_TEMPLE_MQ_LONGSHOT_CHEST] = HintText::Exclude({
+    hintTable[RHT_WATER_TEMPLE_MQ_LONGSHOT_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#through a crack# in the Water Temple is", /*french*/"le #mur fragile# du Temple de l'Eau cache", /*spanish*/"tras una #agrietada pared# del Templo del Agua yace"},
   });
 
-    hintTable[WATER_TEMPLE_MQ_COMPASS_CHEST] = HintText::Exclude({
+    hintTable[RHT_WATER_TEMPLE_MQ_COMPASS_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#fire in the Water Temple# reveals", /*french*/"des #flammes dans le Temple de l'Eau# révèlent", /*spanish*/"el #fuego en el Templo del Agua# revela"},
   });
 
-    hintTable[WATER_TEMPLE_MQ_MAP_CHEST] = HintText::Exclude({
+    hintTable[RHT_WATER_TEMPLE_MQ_MAP_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#sparring soldiers# in the Water Temple guard", /*french*/"les #soldats du Temple de l'Eau# protègent", /*spanish*/"#acabar con unos soldados# del Templo del Agua revela"},
   });
 
-    hintTable[WATER_TEMPLE_MORPHA_HEART] = HintText::Exclude({
+    hintTable[RHT_WATER_TEMPLE_MORPHA_HEART] = HintText::Exclude({
                        //obscure text
                        Text{"the #Giant Aquatic Amoeba# holds", /*french*/"l'#amibe aquatique géante# possède", /*spanish*/"la #ameba acuática gigante# porta"},
                      }, {},
@@ -879,17 +879,17 @@ void HintTable_Init_Exclude_Dungeon() {
                        Text{"#Morpha# holds", /*french*/"#Morpha# possède", /*spanish*/"#Morpha# porta"}
   );
 
-    hintTable[WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM] = HintText::Exclude({
+    hintTable[RHT_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider over a waterfall# in the Water Temple holds", /*french*/"une #Skulltula au dessus d'une cascade du Temple de l'Eau# a", /*spanish*/"una #Skulltula tras una cascada# del Templo del Agua otorga"},
   });
 
-    hintTable[WATER_TEMPLE_GS_CENTRAL_PILLAR] = HintText::Exclude({
+    hintTable[RHT_WATER_TEMPLE_GS_CENTRAL_PILLAR] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider in the center of the Water Temple# holds", /*french*/"une #Skulltula au centre du Temple de l'Eau# a", /*spanish*/"una #Skulltula en el centro del Templo del Agua# otorga"},
   });
 
-    hintTable[WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST] = HintText::Exclude({
+    hintTable[RHT_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a spider protected by #rolling boulders under the lake# hides", /*french*/"une #Skulltula derrière les rochers roulants sous le lac# a", /*spanish*/"una #Skulltula protegida por rocas rodantes# bajo el lago otorga"},
                      }, {},
@@ -897,23 +897,23 @@ void HintTable_Init_Exclude_Dungeon() {
                        Text{"a spider protected by #rolling boulders in the Water Temple# hides", /*french*/"une #Skulltula derrière les rochers roulants du Temple de l'Eau# a", /*spanish*/"una #Skulltula protegida por rocas rodantes# del Templo del Agua otorga"}
   );
 
-    hintTable[WATER_TEMPLE_GS_RIVER] = HintText::Exclude({
+    hintTable[RHT_WATER_TEMPLE_GS_RIVER] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider over a river# in the Water Temple holds", /*french*/"une #Skulltula au dessus de la rivière du Temple de l'Eau# a", /*spanish*/"una #Skulltula sobre un río# del Templo del Agua otorga"},
   });
 
 
-    hintTable[WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH] = HintText::Exclude({
+    hintTable[RHT_WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH] = HintText::Exclude({
                        //obscure text
                        Text{"#beyond a pit of lizards# is a spider holding", /*french*/"une #Skulltula près des lézards du Temple de l'Eau# a", /*spanish*/"#más allá de un pozo de reptiles# una Skulltula otorga"},
   });
 
-    hintTable[WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY] = HintText::Exclude({
+    hintTable[RHT_WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY] = HintText::Exclude({
                        //obscure text
                        Text{"#lizards guard a spider# in the Water Temple with", /*french*/"une #Skulltula dans les couloirs croisés du Temple de l'Eau# a", /*spanish*/"unos #reptiles custodian una Skulltula# del Templo del Agua que otorga"},
   });
 
-    hintTable[WATER_TEMPLE_MQ_GS_RIVER] = HintText::Exclude({
+    hintTable[RHT_WATER_TEMPLE_MQ_GS_RIVER] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider over a river# in the Water Temple holds", /*french*/"une #Skulltula au dessus de la rivière du Temple de l'Eau# a", /*spanish*/"una #Skulltula sobre un río# del Templo del Agua otorga"},
   });
@@ -921,183 +921,183 @@ void HintTable_Init_Exclude_Dungeon() {
   /*--------------------------
   |      SPIRIT TEMPLE       |
   ---------------------------*/
-    hintTable[SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST] = HintText::Exclude({
+    hintTable[RHT_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a child conquers a #skull in green fire# in the Spirit Temple to reach", /*french*/"le #crâne au halo vert dans le colosse# cache", /*spanish*/"el joven que #baje el puente# del Templo del Espíritu encontrará"},
   });
 
-    hintTable[SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST] = HintText::Exclude({
+    hintTable[RHT_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a child can find a #caged chest# in the Spirit Temple with", /*french*/"le #coffre embarré dans le colosse# contient", /*spanish*/"un joven puede encontrar un #cofre entre rejas# del Templo del Espíritu con"},
   });
 
-    hintTable[SPIRIT_TEMPLE_COMPASS_CHEST] = HintText::Exclude({
+    hintTable[RHT_SPIRIT_TEMPLE_COMPASS_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#across a pit of sand# in the Spirit Temple lies", /*french*/"le #trou sableux dans le colosse# a", /*spanish*/"tras un #pozo de arena# del Templo del Espíritu yace"},
   });
 
-    hintTable[SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST] = HintText::Exclude({
+    hintTable[RHT_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#dodging boulders to collect silver rupees# in the Spirit Temple yields", /*french*/"les #pièces argentées entourées de rochers dans le colosse# révèlent", /*spanish*/"#esquivar rocas y conseguir plateadas rupias# en el Templo del Espíritu conduce a"},
   });
 
-    hintTable[SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST] = HintText::Exclude({
+    hintTable[RHT_SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #shadow circling reflected light# in the Spirit Temple guards", /*french*/"l'#ombre près d'un miroir# protège", /*spanish*/"un #círculo de reflectante luz# del Templo del Espíritu guarda"},
   });
 
-    hintTable[SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST] = HintText::Exclude({
+    hintTable[RHT_SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #shadow circling reflected light# in the Spirit Temple guards", /*french*/"l'#ombre près d'un miroir# protège", /*spanish*/"un #círculo de reflectante luz# del Templo del Espíritu guarda"},
   });
 
-    hintTable[SPIRIT_TEMPLE_MAP_CHEST] = HintText::Exclude({
+    hintTable[RHT_SPIRIT_TEMPLE_MAP_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#before a giant statue# in the Spirit Temple lies", /*french*/"#devant la statue# dans le colosse gît", /*spanish*/"#ante una gran estatua# del Templo del Espíritu aguarda"},
   });
 
-    hintTable[SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST] = HintText::Exclude({
+    hintTable[RHT_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#lizards in the Spirit Temple# guard", /*french*/"les #lézards dans le colosse# protègent", /*spanish*/"los #reptiles del Templo del Espíritu# guardan"},
   });
 
-    hintTable[SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST] = HintText::Exclude({
+    hintTable[RHT_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#lizards in the Spirit Temple# guard", /*french*/"les #lézards dans le colosse# protègent", /*spanish*/"los #reptiles del Templo del Espíritu# guardan"},
   });
 
-    hintTable[SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST] = HintText::Exclude({
+    hintTable[RHT_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#torchlight among Beamos# in the Spirit Temple reveals", /*french*/"les #torches autour des Sentinelles# éclairent", /*spanish*/"las #antorchas junto a Beamos# del Templo del Espíritu revelan"},
   });
 
-    hintTable[SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST] = HintText::Exclude({
+    hintTable[RHT_SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #statue in the Spirit Temple# holds", /*french*/"la #statue dans le colosse# tient", /*spanish*/"una #estatua del Templo del Espíritu# esconde"},
   });
 
-    hintTable[SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST] = HintText::Exclude({
+    hintTable[RHT_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"on a #ledge by a statue# in the Spirit Temple rests", /*french*/"#haut perché près de la statue# dans le colosse gît", /*spanish*/"al #borde de una estatua# del Templo del Espíritu yace"},
   });
 
-    hintTable[SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST] = HintText::Exclude({
+    hintTable[RHT_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"those who #show the light among statues# in the Spirit Temple find", /*french*/"le #soleil près des statues# cache", /*spanish*/"aquellos que #iluminen ante las estatuas# del Templo del Espíritu encontrarán"},
   });
 
-    hintTable[SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST] = HintText::Exclude({
+    hintTable[RHT_SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the #Eye of Truth in the Spirit Temple# reveals", /*french*/"le #trésor invisible près du Hache-Viande# contient", /*spanish*/"el #Ojo de la Verdad# en el Templo del Espíritu revela"},
   });
 
-    hintTable[SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST] = HintText::Exclude({
+    hintTable[RHT_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the #Eye of Truth in the Spirit Temple# reveals", /*french*/"le #trésor invisible près du Hache-Viande# contient", /*spanish*/"el #Ojo de la Verdad# en el Templo del Espíritu revela"},
   });
 
-    hintTable[SPIRIT_TEMPLE_BOSS_KEY_CHEST] = HintText::Exclude({
+    hintTable[RHT_SPIRIT_TEMPLE_BOSS_KEY_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #chest engulfed in flame# in the Spirit Temple holds", /*french*/"le #coffre enflammé dans le colosse# contient", /*spanish*/"un #cofre rodeado de llamas# del Templo del Espíritu contiene"},
   });
 
-    hintTable[SPIRIT_TEMPLE_TOPMOST_CHEST] = HintText::Exclude({
+    hintTable[RHT_SPIRIT_TEMPLE_TOPMOST_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"those who #show the light above the Colossus# find", /*french*/"le #soleil au sommet du colosse# révèle", /*spanish*/"aquellos que #iluminen en lo alto del Coloso# encontrarán"},
   });
 
 
-    hintTable[SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST] = HintText::Exclude({
+    hintTable[RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#lying unguarded# in the Spirit Temple is", /*french*/"dans #l'entrée du colosse# se trouve", /*spanish*/"en la #entrada del Templo del Espíritu# yace"},
   });
 
-    hintTable[SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST] = HintText::Exclude({
+    hintTable[RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #switch in a pillar# within the Spirit Temple drops", /*french*/"l'#interrupteur dans un pilier# du colosse cache", /*spanish*/"el #interruptor de un pilar# del Templo del Espíritu revela"},
   });
 
-    hintTable[SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST] = HintText::Exclude({
+    hintTable[RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#collecting rupees through a water jet# reveals", /*french*/"les #pièces argentées dans le jet d'eau# du colosse révèlent", /*spanish*/"#hacerte con rupias tras un géiser# revela"},
   });
 
-    hintTable[SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST] = HintText::Exclude({
+    hintTable[RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"an #eye blinded by stone# within the Spirit Temple conceals", /*french*/"#l'oeil derrière le rocher# dans le colosse voit", /*spanish*/"#cegar a un ojo# del Templo del Espíritu revela"},
   });
 
-    hintTable[SPIRIT_TEMPLE_MQ_MAP_CHEST] = HintText::Exclude({
+    hintTable[RHT_SPIRIT_TEMPLE_MQ_MAP_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"surrounded by #fire and wrappings# lies", /*french*/"près des #pierres tombales dans le colosse# gît", /*spanish*/"rodeado de #fuego y vendas# yace"},
   });
 
-    hintTable[SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST] = HintText::Exclude({
+    hintTable[RHT_SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a child defeats a #gauntlet of monsters# within the Spirit Temple to find", /*french*/"l'enfant qui vainc #plusieurs monstres# dans le colosse trouvera", /*spanish*/"el joven que derrote #unos monstruos# del Templo del Espíritu encontrará"},
   });
 
-    hintTable[SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST] = HintText::Exclude({
+    hintTable[RHT_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#explosive sunlight# within the Spirit Temple uncovers", /*french*/"le #rayon de lumière explosif dans le colosse# révèle", /*spanish*/"una #explosiva luz solar# del Templo del Espíritu revela"},
   });
 
-    hintTable[SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST] = HintText::Exclude({
+    hintTable[RHT_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#trapped by falling enemies# within the Spirit Temple is", /*french*/"des #ennemis tombants# dans le colosse protègent", /*spanish*/"#rodeado de enemigos del cielo# del Templo del Espíritu yace"},
   });
 
-    hintTable[SPIRIT_TEMPLE_MQ_COMPASS_CHEST] = HintText::Exclude({
+    hintTable[RHT_SPIRIT_TEMPLE_MQ_COMPASS_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#blinding the colossus# unveils", /*french*/"#l'oeil dans le colosse# voit", /*spanish*/"#cegar al coloso# revela"},
   });
 
-    hintTable[SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST] = HintText::Exclude({
+    hintTable[RHT_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #royal melody awakens the colossus# to reveal", /*french*/"la #mélodie royale éveille le colosse# et révèle", /*spanish*/"la #melodía real que despierte al coloso# revelará"},
   });
 
-    hintTable[SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST] = HintText::Exclude({
+    hintTable[RHT_SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the #Eye of Truth# finds the colossus's hidden", /*french*/"#l'oeil de vérité# verra dans le colosse", /*spanish*/"el #Ojo de la Verdad# en el Templo del Espíritu encontrará"},
   });
 
-    hintTable[SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST] = HintText::Exclude({
+    hintTable[RHT_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#the old hide what the young find# to reveal", /*french*/"l'#oeil dans le trou du bloc argent# dans le colosse voit", /*spanish*/"el #adulto esconde lo que el joven anhela#, revelando"},
   });
 
-    hintTable[SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST] = HintText::Exclude({
+    hintTable[RHT_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#sunlight in a maze of fire# hides", /*french*/"#la lumière dans le labyrinthe de feu# du colosse révèle", /*spanish*/"la #luz solar de un ígneo laberinto# esconde"},
   });
 
-    hintTable[SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST] = HintText::Exclude({
+    hintTable[RHT_SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#across a pit of sand# in the Spirit Temple lies", /*french*/"le #trou sableux# dans le colosse a", /*spanish*/"#a través del pozo de arena# del Templo del Espíritu yace"},
   });
 
-    hintTable[SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST] = HintText::Exclude({
+    hintTable[RHT_SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"where #temporal stone blocks the path# within the Spirit Temple lies", /*french*/"les #pierres temporelles# dans le colosse cachent", /*spanish*/"donde los #bloques temporales bloquean# en el Templo del Espíritu yace"},
   });
 
-    hintTable[SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST] = HintText::Exclude({
+    hintTable[RHT_SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #chest of double purpose# holds", /*french*/"le #coffre à usage double# du colosse contient", /*spanish*/"un #cofre de doble uso# contiene"},
   });
 
-    hintTable[SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST] = HintText::Exclude({
+    hintTable[RHT_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #temporal stone blocks the light# leading to", /*french*/"la #pierre temporelle# le colosse fait ombre sur", /*spanish*/"un #bloque temporal bloquea la luz# que conduce a"},
   });
 
-    hintTable[SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST] = HintText::Exclude({
+    hintTable[RHT_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"those who #show the light above the Colossus# find", /*french*/"le trésor invisible #au sommet du colosse# contient", /*spanish*/"aquellos que #revelen la luz sobre el Coloso# encontrarán"},
   });
 
-    hintTable[SPIRIT_TEMPLE_TWINROVA_HEART] = HintText::Exclude({
+    hintTable[RHT_SPIRIT_TEMPLE_TWINROVA_HEART] = HintText::Exclude({
                        //obscure text
                        Text{"the #Sorceress Sisters# hold", /*french*/"#les sorcières jumelles# possède", /*spanish*/"las #hermanas hechiceras# portan"},
                      }, {},
@@ -1105,48 +1105,48 @@ void HintTable_Init_Exclude_Dungeon() {
                        Text{"#Twinrova# holds", /*french*/"#Twinrova# possède", /*spanish*/"#Birova# porta"}
     );
 
-    hintTable[SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM] = HintText::Exclude({
+    hintTable[RHT_SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM] = HintText::Exclude({
                        //obscure text
                        Text{"a spider in the #hall of a knight# guards", /*french*/"une #Skulltula au dessus d'un escalier du Temple de l'Esprit# a", /*spanish*/"una #Skulltula en el salón de un guerrero# otorga"},
   });
 
-    hintTable[SPIRIT_TEMPLE_GS_BOULDER_ROOM] = HintText::Exclude({
+    hintTable[RHT_SPIRIT_TEMPLE_GS_BOULDER_ROOM] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider behind a temporal stone# in the Spirit Temple yields", /*french*/"une #Skulltula derrière une pierre temporelle du Temple de l'Esprit# a", /*spanish*/"una #Skulltula tras un bloque temporal# del Templo del Espíritu otorga"},
   });
 
-    hintTable[SPIRIT_TEMPLE_GS_LOBBY] = HintText::Exclude({
+    hintTable[RHT_SPIRIT_TEMPLE_GS_LOBBY] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider beside a statue# holds", /*french*/"une #Skulltula dans la grande salle du Temple de l'Esprit# a", /*spanish*/"una #Skulltula junto a una estatua# del Templo del Espíritu otorga"},
   });
 
-    hintTable[SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM] = HintText::Exclude({
+    hintTable[RHT_SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider at the top of a deep shaft# in the Spirit Temple holds", /*french*/"une #Skulltula près d'un mur d'escalade du Temple de l'Esprit# a", /*spanish*/"una #Skulltula en lo alto de un gran hueco# del Templo del Espíritu otorga"},
   });
 
-    hintTable[SPIRIT_TEMPLE_GS_METAL_FENCE] = HintText::Exclude({
+    hintTable[RHT_SPIRIT_TEMPLE_GS_METAL_FENCE] = HintText::Exclude({
                        //obscure text
                        Text{"a child defeats a #spider among bats# in the Spirit Temple to gain", /*french*/"une #Skulltula sur le grillage du Temple de l'Esprit# a", /*spanish*/"el joven que derrote la #Skulltula entre murciélagos# del Templo del Espíritu hallará"},
   });
 
 
-    hintTable[SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM] = HintText::Exclude({
+    hintTable[RHT_SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM] = HintText::Exclude({
                        //obscure text
                        Text{"#above a pit of sand# in the Spirit Temple hides", /*french*/"une #Skulltula au dessus du trou sableux du Temple de l'Esprit# a", /*spanish*/"una #Skulltula sobre un pozo de arena# del Templo del Espíritu otorga"},
   });
 
-    hintTable[SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST] = HintText::Exclude({
+    hintTable[RHT_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST] = HintText::Exclude({
                        //obscure text
                        Text{"a spider in the #hall of a knight# guards", /*french*/"une #Skulltula dans la salle aux neuf trônes du Temple de l'Esprit# a", /*spanish*/"una #Skulltula en el salón de un guerrero# otorga"},
   });
 
-    hintTable[SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH] = HintText::Exclude({
+    hintTable[RHT_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH] = HintText::Exclude({
                        //obscure text
                        Text{"a spider in the #hall of a knight# guards", /*french*/"une #Skulltula dans la salle aux neuf trônes du Temple de l'Esprit# a", /*spanish*/"una #Skulltula en el salón de un guerrero# otorga"},
   });
 
-    hintTable[SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM] = HintText::Exclude({
+    hintTable[RHT_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM] = HintText::Exclude({
                        //obscure text
                        Text{"#upon a web of glass# in the Spirit Temple sits a spider holding", /*french*/"une #Skulltula sur une paroi de verre du Temple de l'Esprit# a", /*spanish*/"#sobre una plataforma de cristal# yace una Skulltula que otorga"},
   });
@@ -1154,12 +1154,12 @@ void HintTable_Init_Exclude_Dungeon() {
   /*--------------------------
   |      SHADOW TEMPLE       |
   ---------------------------*/
-    hintTable[SHADOW_TEMPLE_MAP_CHEST] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_MAP_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the #Eye of Truth# pierces a hall of faces to reveal", /*french*/"l'#oeil de vérité# voit dans les couloirs du Temple de l'Ombre", /*spanish*/"el #Ojo de la Verdad# descubrirá un pasillo de facetas con"},
   });
 
-    hintTable[SHADOW_TEMPLE_HOVER_BOOTS_CHEST] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_HOVER_BOOTS_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #nether dweller in the Shadow Temple# holds", /*french*/"le #spectre du Temple de l'Ombre# a", /*spanish*/"un #temido morador del Templo de las Sombras# guarda"},
                      }, {},
@@ -1167,173 +1167,173 @@ void HintTable_Init_Exclude_Dungeon() {
                        Text{"#Dead Hand in the Shadow Temple# holds", /*french*/"le #Poigneur dans le Temple de l'Ombre# cache", /*spanish*/"la #Mano Muerta del Templo de las Sombras# guarda"}
   );
 
-    hintTable[SHADOW_TEMPLE_COMPASS_CHEST] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_COMPASS_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#mummies revealed by the Eye of Truth# guard", /*french*/"les #Gibdos dans les couloirs# du Temple de l'Ombre protègent", /*spanish*/"las #momias reveladas por el Ojo de la Verdad# guardan"},
   });
 
-    hintTable[SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#spinning scythes# protect", /*french*/"les #faucheurs danseurs# du Temple de l'Ombre protègent", /*spanish*/"las #giratorias guadañas# protegen"},
   });
 
-    hintTable[SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#invisible blades# guard", /*french*/"les #faucheurs invisibles# du Temple de l'Ombre protègent", /*spanish*/"las #hojas invisibles# guardan"},
   });
 
-    hintTable[SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#invisible blades# guard", /*french*/"les #faucheurs invisibles# du Temple de l'Ombre protègent", /*spanish*/"las #hojas invisibles# guardan"},
   });
 
-    hintTable[SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#falling spikes# block the path to", /*french*/"la #pluie de clous# surplombe", /*spanish*/"los #pinchos de un techo# conducen a"},
   });
 
-    hintTable[SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#falling spikes# block the path to", /*french*/"la #pluie de clous# surplombe", /*spanish*/"los #pinchos de un techo# conducen a"},
   });
 
-    hintTable[SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#falling spikes# block the path to", /*french*/"la #pluie de clous# surplombe", /*spanish*/"los #pinchos de un techo# conducen a"},
   });
 
-    hintTable[SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the #dead roam among invisible spikes# guarding", /*french*/"#parmi les clous invisibles# du Temple de l'Ombre se cache", /*spanish*/"los #muertos que vagan por pinchos invisibles# protegen"},
   });
 
-    hintTable[SHADOW_TEMPLE_WIND_HINT_CHEST] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_WIND_HINT_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"an #invisible chest guarded by the dead# holds", /*french*/"le #trésor invisible du cul-de-sac# du Temple de l'Ombre contient", /*spanish*/"un #cofre invisible custodiado por los del más allá# contiene"},
   });
 
-    hintTable[SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#mummies guarding a ferry# hide", /*french*/"les #Gibdos qui bloquent le traversier# cachent", /*spanish*/"las #momias que protegen un navío# esconden"},
   });
 
-    hintTable[SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#mummies guarding a ferry# hide", /*french*/"les #Gibdos qui bloquent le traversier# cachent", /*spanish*/"las #momias que protegen un navío# esconden"},
   });
 
-    hintTable[SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#walls consumed by a ball of fire# reveal", /*french*/"le #piège de bois# du Temple de l'Ombre cache", /*spanish*/"las #paredes consumidas por una esfera ígnea# revelan"},
   });
 
-    hintTable[SHADOW_TEMPLE_BOSS_KEY_CHEST] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_BOSS_KEY_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#walls consumed by a ball of fire# reveal", /*french*/"le #piège de bois# du Temple de l'Ombre cache", /*spanish*/"las #paredes consumidas por una esfera ígnea# revelan"},
   });
 
-    hintTable[SHADOW_TEMPLE_FREESTANDING_KEY] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_FREESTANDING_KEY] = HintText::Exclude({
                        //obscure text
                        Text{"#inside a burning skull# lies", /*french*/"#dans un crâne enflammé# gît", /*spanish*/"en el #interior de una calavera en llamas# aguarda"},
   });
 
 
-    hintTable[SHADOW_TEMPLE_MQ_COMPASS_CHEST] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_MQ_COMPASS_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the #Eye of Truth# pierces a hall of faces to reveal", /*french*/"l'#oeil de vérité# voit dans les couloirs du Temple de l'Ombre", /*spanish*/"el #Ojo de la Verdad# descubre un pasillo de facetas con"},
   });
 
-    hintTable[SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#Dead Hand in the Shadow Temple# holds", /*french*/"le #Poigneur dans le Temple de l'Ombre# cache", /*spanish*/"la #Mano Muerta del Templo de las Sombras# guarda"},
   });
 
-    hintTable[SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#mummies revealed by the Eye of Truth# guard", /*french*/"les #Gibdos dans les couloirs# du Temple de l'Ombre protègent", /*spanish*/"las #momias reveladas por el Ojo de la Verdad# guardan"},
   });
 
-    hintTable[SHADOW_TEMPLE_MQ_MAP_CHEST] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_MQ_MAP_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#spinning scythes# protect", /*french*/"les #faucheurs danseurs# du Temple de l'Ombre protègent", /*spanish*/"las #giratorias guadañas# protegen"},
   });
 
-    hintTable[SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#collecting rupees in a vast cavern# with the Shadow Temple unveils", /*french*/"les #pièces argentées dans le Temple de l'Ombre# révèlent", /*spanish*/"hacerte con las #rupias en una gran caverna# del Templo de las Sombras revela"},
   });
 
-    hintTable[SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#falling spikes# block the path to", /*french*/"la #pluie de clous# surplombe", /*spanish*/"los #pinchos de un techo# conducen a"},
   });
 
-    hintTable[SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#falling spikes# block the path to", /*french*/"la #pluie de clous# surplombe", /*spanish*/"los #pinchos de un techo# conducen a"},
   });
 
-    hintTable[SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#falling spikes# block the path to", /*french*/"la #pluie de clous# surplombe", /*spanish*/"los #pinchos de un techo# conducen a"},
   });
 
-    hintTable[SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the #dead roam among invisible spikes# guarding", /*french*/"#parmi les clous invisibles# du Temple de l'Ombre se cache", /*spanish*/"los #muertos que vagan por pinchos invisibles# protegen"},
   });
 
-    hintTable[SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#walls consumed by a ball of fire# reveal", /*french*/"le #piège de bois# du Temple de l'Ombre cache", /*spanish*/"las #paredes consumidas por una esfera ígnea# revelan"},
   });
 
-    hintTable[SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#walls consumed by a ball of fire# reveal", /*french*/"le #piège de bois# du Temple de l'Ombre cache", /*spanish*/"las #paredes consumidas por una esfera ígnea# revelan"},
   });
 
-    hintTable[SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"near an #empty pedestal# within the Shadow Temple lies", /*french*/"#près d'un pédestal vide du Temple de l'Ombre# gît", /*spanish*/"cerca de un #vacío pedestal# del Templo de las Sombras yace"},
   });
 
-    hintTable[SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#invisible blades# guard", /*french*/"les #faucheurs invisibles# du Temple de l'Ombre protègent", /*spanish*/"unas #hojas invisibles# guardan"},
   });
 
-    hintTable[SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#invisible blades# guard", /*french*/"les #faucheurs invisibles# du Temple de l'Ombre protègent", /*spanish*/"unas #hojas invisibles# guardan"},
   });
 
-    hintTable[SHADOW_TEMPLE_MQ_WIND_HINT_CHEST] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_MQ_WIND_HINT_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"an #invisible chest guarded by the dead# holds", /*french*/"le #trésor invisible du cul-de-sac# du Temple de l'Ombre contient", /*spanish*/"un #cofre invisible custodiado por los del más allá# contiene"},
   });
 
-    hintTable[SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#mummies guarding a ferry# hide", /*french*/"les #Gibdos qui bloquent le traversier# cachent", /*spanish*/"las #momias que protegen un navío# esconden"},
   });
 
-    hintTable[SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#mummies guarding a ferry# hide", /*french*/"les #Gibdos qui bloquent le traversier# cachent", /*spanish*/"las #momias que protegen un navío# esconden"},
   });
 
-    hintTable[SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#caged near a ship# lies", /*french*/"#dans une cage près du traversier# gît", /*spanish*/"#entre rejas al lado de un navío# yace"},
   });
 
-    hintTable[SHADOW_TEMPLE_MQ_FREESTANDING_KEY] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_MQ_FREESTANDING_KEY] = HintText::Exclude({
                        //obscure text
                        Text{"#behind three burning skulls# lies", /*french*/"#derrière trois crânes enflammés# gît", /*spanish*/"tras #tres ardientes calaveras# yace"},
   });
 
-    hintTable[SHADOW_TEMPLE_BONGO_BONGO_HEART] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_BONGO_BONGO_HEART] = HintText::Exclude({
                        //obscure text
                        Text{"the #Phantom Shadow Beast# holds", /*french*/"le #monstre de l'ombre# possède", /*spanish*/"la #alimaña oscura espectral# porta"},
                      }, {},
@@ -1341,53 +1341,53 @@ void HintTable_Init_Exclude_Dungeon() {
                        Text{"#Bongo Bongo# holds", /*french*/"#Bongo Bongo# possède", /*spanish*/"#Bongo Bongo# porta"}
     );
 
-    hintTable[SHADOW_TEMPLE_GS_SINGLE_GIANT_POT] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_GS_SINGLE_GIANT_POT] = HintText::Exclude({
                        //obscure text
                        Text{"#beyond a burning skull# lies a spider with", /*french*/"une #Skulltula derrière un crâne enflammé du Temple de l'Ombre# a", /*spanish*/"#tras una ardiente calavera# yace una Skulltula que otorga"},
   });
 
-    hintTable[SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider beyond falling spikes# holds", /*french*/"une #Skulltula au delà de la pluie de clous du Temple de l'Ombre# a", /*spanish*/"una #Skulltula tras los pinchos del techo# otorga"},
   });
 
-    hintTable[SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT] = HintText::Exclude({
                        //obscure text
                        Text{"#beyond three burning skulls# lies a spider with", /*french*/"une #Skulltula derrière trois crânes enflammés du Temple de l'Ombre# a", /*spanish*/"#tras tres ardientes calaveras# yace una Skulltula que otorga"},
   });
 
-    hintTable[SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM] = HintText::Exclude({
                        //obscure text
                        Text{"a spider guarded by #invisible blades# holds", /*french*/"une #Skulltula protégée par les faucheurs invisibles du Temple de l'Ombre# a", /*spanish*/"una #Skulltula custodiada por hojas invisibles# otorga"},
   });
 
-    hintTable[SHADOW_TEMPLE_GS_NEAR_SHIP] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_GS_NEAR_SHIP] = HintText::Exclude({
                        //obscure text
                        Text{"a spider near a #docked ship# hoards", /*french*/"une #Skulltula près du traversier du Temple de l'Ombre# a", /*spanish*/"una #Skulltula cercana a un navío# otorga"},
   });
 
 
-    hintTable[SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider beyond falling spikes# holds", /*french*/"une #Skulltula au delà de la pluie de clous du Temple de l'Ombre# a", /*spanish*/"una #Skulltula tras los pinchos del techo# otorga"},
   });
 
-    hintTable[SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider amidst roaring winds# in the Shadow Temple holds", /*french*/"une #Skulltula près des vents du Temple de l'Ombre# a", /*spanish*/"una #Skulltula entre ventarrones# del Templo de las Sombras otorga"},
   });
 
-    hintTable[SHADOW_TEMPLE_MQ_GS_AFTER_WIND] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_MQ_GS_AFTER_WIND] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider beneath gruesome debris# in the Shadow Temple hides", /*french*/"une #Skulltula sous des débris du Temple de l'Ombre# a", /*spanish*/"una #Skulltula bajo unos horripilantes escombros# del Templo de las Sombras otorga"},
   });
 
-    hintTable[SHADOW_TEMPLE_MQ_GS_AFTER_SHIP] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_MQ_GS_AFTER_SHIP] = HintText::Exclude({
                        //obscure text
                        Text{"a #fallen statue# reveals a spider with", /*french*/"une #Skulltula près de la statue écroulée du Temple de l'Ombre# a", /*spanish*/"una #estatua caída# revelará una Skulltula que otorgue"},
   });
 
-    hintTable[SHADOW_TEMPLE_MQ_GS_NEAR_BOSS] = HintText::Exclude({
+    hintTable[RHT_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS] = HintText::Exclude({
                        //obscure text
                        Text{"a #suspended spider# guards", /*french*/"une #Skulltula près du repère du Temple de l'Ombre# a", /*spanish*/"una #Skulltula flotante# del Templo de las Sombras otorga"},
   });
@@ -1395,119 +1395,119 @@ void HintTable_Init_Exclude_Dungeon() {
   /*--------------------------
   |    BOTTOM OF THE WELL    |
   ---------------------------*/
-    hintTable[BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST] = HintText::Exclude({
+    hintTable[RHT_BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the #Eye of Truth in the well# reveals", /*french*/"l'#oeil de vérité dans le Puits# révèle", /*spanish*/"el #Ojo de la Verdad en el pozo# revela"},
   });
 
-    hintTable[BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST] = HintText::Exclude({
+    hintTable[RHT_BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#gruesome debris# in the well hides", /*french*/"des #débris dans le Puits# cachent", /*spanish*/"unos #horripilantes escombros# del pozo esconden"},
   });
 
-    hintTable[BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST] = HintText::Exclude({
+    hintTable[RHT_BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the #Eye of Truth in the well# reveals", /*french*/"l'#oeil de vérité dans le Puits# révèle", /*spanish*/"el #Ojo de la Verdad en el pozo# revela"},
   });
 
-    hintTable[BOTTOM_OF_THE_WELL_COMPASS_CHEST] = HintText::Exclude({
+    hintTable[RHT_BOTTOM_OF_THE_WELL_COMPASS_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #hidden entrance to a cage# in the well leads to", /*french*/"dans un #chemin caché dans le Puits# gît", /*spanish*/"la #entrada oculta de una celda# del pozo conduce a"},
   });
 
-    hintTable[BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST] = HintText::Exclude({
+    hintTable[RHT_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider guarding a cage# in the well protects", /*french*/"l'#araignée dans la cage du Puits# protège", /*spanish*/"una #araña protegiendo una celda# del pozo guarda"},
   });
 
-    hintTable[BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST] = HintText::Exclude({
+    hintTable[RHT_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#gruesome debris# in the well hides", /*french*/"des #débris dans le Puits# cachent", /*spanish*/"unos #horripilantes escombros# del pozo esconden"},
   });
 
-    hintTable[BOTTOM_OF_THE_WELL_INVISIBLE_CHEST] = HintText::Exclude({
+    hintTable[RHT_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#Dead Hand's invisible secret# is", /*french*/"le #trésor invisible du Poigneur# est", /*spanish*/"el #secreto invisible de la Mano Muerta# esconde"},
   });
 
-    hintTable[BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST] = HintText::Exclude({
+    hintTable[RHT_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #royal melody in the well# uncovers", /*french*/"la #mélodie royale révèle dans le Puits#", /*spanish*/"una #melodía real en el pozo# revela"},
   });
 
-    hintTable[BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST] = HintText::Exclude({
+    hintTable[RHT_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #royal melody in the well# uncovers", /*french*/"la #mélodie royale révèle dans le Puits#", /*spanish*/"una #melodía real en el pozo# revela"},
   });
 
-    hintTable[BOTTOM_OF_THE_WELL_MAP_CHEST] = HintText::Exclude({
+    hintTable[RHT_BOTTOM_OF_THE_WELL_MAP_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"in the #depths of the well# lies", /*french*/"#dans le coeur du Puits# gît", /*spanish*/"en las #profundidades del pozo# yace"},
   });
 
-    hintTable[BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST] = HintText::Exclude({
+    hintTable[RHT_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#perilous pits# in the well guard the path to", /*french*/"#trois trous# dans le Puits protègent", /*spanish*/"#peligrosos fosos# del pozo conducen a"},
   });
 
-    hintTable[BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST] = HintText::Exclude({
+    hintTable[RHT_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#locked in a cage# in the well lies", /*french*/"#dans une cage# du Puits gît", /*spanish*/"#entre rejas# en el pozo yace"},
   });
 
-    hintTable[BOTTOM_OF_THE_WELL_FREESTANDING_KEY] = HintText::Exclude({
+    hintTable[RHT_BOTTOM_OF_THE_WELL_FREESTANDING_KEY] = HintText::Exclude({
                        //obscure text
                        Text{"#inside a coffin# hides", /*french*/"dans #un cercueil# gît", /*spanish*/"en el #interior de un ataúd# yace"},
   });
 
 
-    hintTable[BOTTOM_OF_THE_WELL_MQ_MAP_CHEST] = HintText::Exclude({
+    hintTable[RHT_BOTTOM_OF_THE_WELL_MQ_MAP_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #royal melody in the well# uncovers", /*french*/"la #mélodie royale révèle dans le Puits#", /*spanish*/"una #melodía real en el pozo# revela"},
   });
 
-    hintTable[BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST] = HintText::Exclude({
+    hintTable[RHT_BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"an #army of the dead# in the well guards", /*french*/"l'#armée des morts# dans le Puits protège", /*spanish*/"un #ejército del más allá# del pozo guarda"},
   });
 
-    hintTable[BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY] = HintText::Exclude({
+    hintTable[RHT_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY] = HintText::Exclude({
                        //obscure text
                        Text{"#Dead Hand's explosive secret# is", /*french*/"le #secret explosif du Poigneur# est", /*spanish*/"el #explosivo secreto de la Mano Muerta# esconde"},
   });
 
-    hintTable[BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY] = HintText::Exclude({
+    hintTable[RHT_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY] = HintText::Exclude({
                        //obscure text
                        Text{"an #invisible path in the well# leads to", /*french*/"dans un #chemin caché dans le Puits# gît", /*spanish*/"un #camino invisible del pozo# conduce a"},
   });
 
-    hintTable[BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE] = HintText::Exclude({
+    hintTable[RHT_BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider locked in a cage# in the well holds", /*french*/"une #Skulltula dans une cage au fonds du Puits# a", /*spanish*/"una #Skulltula enjaulada# del pozo otorga"},
   });
 
-    hintTable[BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM] = HintText::Exclude({
+    hintTable[RHT_BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM] = HintText::Exclude({
                        //obscure text
                        Text{"an #invisible path in the well# leads to", /*french*/"une #Skulltula dans le chemin invisible au fonds du Puits# a", /*spanish*/"un #camino invisible del pozo# conduce a una Skulltula que otorga"},
   });
 
-    hintTable[BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM] = HintText::Exclude({
+    hintTable[RHT_BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider locked in a crypt# within the well guards", /*french*/"une #Skulltula embarrée dans la crypte au fonds du Puits# a", /*spanish*/"una #Skulltula encerrada en una cripta# del pozo otorga"},
   });
 
 
-    hintTable[BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT] = HintText::Exclude({
+    hintTable[RHT_BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT] = HintText::Exclude({
                        //obscure text
                        Text{"a #gauntlet of invisible spiders# protects", /*french*/"une #Skulltula protégée par les araignées invisibles au fonds du Puits# a", /*spanish*/"unas #arañas invisibles# custodian una Skulltula que otorga"},
   });
 
-    hintTable[BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM] = HintText::Exclude({
+    hintTable[RHT_BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider crawling near the dead# in the well holds", /*french*/"une #Skulltula près des cercueils au fonds du Puits# a", /*spanish*/"una #Skulltula junto a los muertos# del pozo otorga"},
   });
 
-    hintTable[BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM] = HintText::Exclude({
+    hintTable[RHT_BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider locked in a crypt# within the well guards", /*french*/"une #Skulltula embarrée dans la crypte au fonds du Puits# a", /*spanish*/"una #Skulltula encerrada en una cripta# del pozo otorga"},
   });
@@ -1515,74 +1515,74 @@ void HintTable_Init_Exclude_Dungeon() {
   /*--------------------------
   |        ICE CAVERN        |
   ---------------------------*/
-    hintTable[ICE_CAVERN_MAP_CHEST] = HintText::Exclude({
+    hintTable[RHT_ICE_CAVERN_MAP_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#winds of ice# surround", /*french*/"#figé dans la glace rouge# gît", /*spanish*/"#heladas borrascas# rodean"},
   });
 
-    hintTable[ICE_CAVERN_COMPASS_CHEST] = HintText::Exclude({
+    hintTable[RHT_ICE_CAVERN_COMPASS_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #wall of ice# protects", /*french*/"#un mur de glace rouge# cache", /*spanish*/"una #gélida pared# protege"},
   });
 
-    hintTable[ICE_CAVERN_IRON_BOOTS_CHEST] = HintText::Exclude({
+    hintTable[RHT_ICE_CAVERN_IRON_BOOTS_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #monster in a frozen cavern# guards", /*french*/"le #monstre de la caverne de glace# protège", /*spanish*/"un #monstruo de una helada caverna# guarda"},
   });
 
-    hintTable[ICE_CAVERN_FREESTANDING_POH] = HintText::Exclude({
+    hintTable[RHT_ICE_CAVERN_FREESTANDING_POH] = HintText::Exclude({
                        //obscure text
                        Text{"a #wall of ice# protects", /*french*/"un #mur de glace rouge# cache", /*spanish*/"una #gélida pared# protege"},
   });
 
 
-    hintTable[ICE_CAVERN_MQ_IRON_BOOTS_CHEST] = HintText::Exclude({
+    hintTable[RHT_ICE_CAVERN_MQ_IRON_BOOTS_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #monster in a frozen cavern# guards", /*french*/"le #monstre de la caverne de glace# protège", /*spanish*/"un #monstruo de una helada caverna# guarda"},
   });
 
-    hintTable[ICE_CAVERN_MQ_COMPASS_CHEST] = HintText::Exclude({
+    hintTable[RHT_ICE_CAVERN_MQ_COMPASS_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#winds of ice# surround", /*french*/"#entouré de vent glacial# gît", /*spanish*/"#heladas borrascas# rodean"},
   });
 
-    hintTable[ICE_CAVERN_MQ_MAP_CHEST] = HintText::Exclude({
+    hintTable[RHT_ICE_CAVERN_MQ_MAP_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #wall of ice# protects", /*french*/"#un mur de glace rouge# cache", /*spanish*/"una #gélida pared# protege"},
   });
 
-    hintTable[ICE_CAVERN_MQ_FREESTANDING_POH] = HintText::Exclude({
+    hintTable[RHT_ICE_CAVERN_MQ_FREESTANDING_POH] = HintText::Exclude({
                        //obscure text
                        Text{"#winds of ice# surround", /*french*/"#entouré de vent glacial# gît", /*spanish*/"#heladas borrascas# rodean"},
   });
 
-    hintTable[ICE_CAVERN_GS_PUSH_BLOCK_ROOM] = HintText::Exclude({
+    hintTable[RHT_ICE_CAVERN_GS_PUSH_BLOCK_ROOM] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider above icy pits# holds", /*french*/"une #Skulltula au dessus d'un goufre glacial# a", /*spanish*/"una #Skulltula sobre gélidos vacíos# otorga"},
   });
 
-    hintTable[ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM] = HintText::Exclude({
+    hintTable[RHT_ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM] = HintText::Exclude({
                        //obscure text
                        Text{"#spinning ice# guards a spider holding", /*french*/"une #Skulltula près de deux lames de glace# a", /*spanish*/"unos #témpanos giratorios# custodian una Skulltula que otorga"},
   });
 
-    hintTable[ICE_CAVERN_GS_HEART_PIECE_ROOM] = HintText::Exclude({
+    hintTable[RHT_ICE_CAVERN_GS_HEART_PIECE_ROOM] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider behind a wall of ice# hides", /*french*/"une #Skulltula derrière un mur de glace# a", /*spanish*/"una #Skulltula tras una gélida pared# otorga"},
   });
 
 
-    hintTable[ICE_CAVERN_MQ_GS_SCARECROW] = HintText::Exclude({
+    hintTable[RHT_ICE_CAVERN_MQ_GS_SCARECROW] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider above icy pits# holds", /*french*/"une #Skulltula au dessus d'un goufre glacial# a", /*spanish*/"una #Skulltula sobre gélidos vacíos# otorga"},
   });
 
-    hintTable[ICE_CAVERN_MQ_GS_ICE_BLOCK] = HintText::Exclude({
+    hintTable[RHT_ICE_CAVERN_MQ_GS_ICE_BLOCK] = HintText::Exclude({
                        //obscure text
                        Text{"a #web of ice# surrounds a spider with", /*french*/"une #Skulltula protégée d'une toile glacée# a", /*spanish*/"una #gélida red# rodea a una Skulltula que otorga"},
   });
 
-    hintTable[ICE_CAVERN_MQ_GS_RED_ICE] = HintText::Exclude({
+    hintTable[RHT_ICE_CAVERN_MQ_GS_RED_ICE] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider in fiery ice# hoards", /*french*/"une #Skulltula figée dans la glace rouge# a", /*spanish*/"una #Skulltula tras un ardiente hielo# otorga"},
   });
@@ -1590,178 +1590,178 @@ void HintTable_Init_Exclude_Dungeon() {
   /*--------------------------
   | GERUDO TRAINING GROUNDS  |
   ---------------------------*/
-    hintTable[GERUDO_TRAINING_GROUNDS_LOBBY_LEFT_CHEST] = HintText::Exclude({
+    hintTable[RHT_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #blinded eye in the Gerudo Training Grounds# drops", /*french*/"l'#Oeil dans le Gymnase Gerudo# voit", /*spanish*/"#cegar un ojo en el Centro de Instrucción Gerudo# revela"},
   });
 
-    hintTable[GERUDO_TRAINING_GROUNDS_LOBBY_RIGHT_CHEST] = HintText::Exclude({
+    hintTable[RHT_GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #blinded eye in the Gerudo Training Grounds# drops", /*french*/"l'#Oeil dans le Gymnase Gerudo# voit", /*spanish*/"#cegar un ojo en el Centro de Instrucción Gerudo# revela"},
   });
 
-    hintTable[GERUDO_TRAINING_GROUNDS_STALFOS_CHEST] = HintText::Exclude({
+    hintTable[RHT_GERUDO_TRAINING_GROUND_STALFOS_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#soldiers walking on shifting sands# in the Gerudo Training Grounds guard", /*french*/"les #squelettes# du Gymnase Gerudo protègent", /*spanish*/"#soldados en resbaladizas arenas# del Centro de Instrucción Gerudo protegen"},
   });
 
-    hintTable[GERUDO_TRAINING_GROUNDS_BEAMOS_CHEST] = HintText::Exclude({
+    hintTable[RHT_GERUDO_TRAINING_GROUND_BEAMOS_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#reptilian warriors# in the Gerudo Training Grounds protect", /*french*/"les #lézards# dans le Gymnase Gerudo protègent", /*spanish*/"#unos escamosos guerreros# del Centro de Instrucción Gerudo protegen"},
   });
 
-    hintTable[GERUDO_TRAINING_GROUNDS_HIDDEN_CEILING_CHEST] = HintText::Exclude({
+    hintTable[RHT_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the #Eye of Truth# in the Gerudo Training Grounds reveals", /*french*/"#bien caché# dans le Gymnase Gerudo gît", /*spanish*/"el #Ojo de la Verdad# en el Centro de Instrucción Gerudo revela"},
   });
 
-    hintTable[GERUDO_TRAINING_GROUNDS_MAZE_PATH_FIRST_CHEST] = HintText::Exclude({
+    hintTable[RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the first prize of #the thieves' training# is", /*french*/"le #premier trésor du Gymnase Gerudo# est", /*spanish*/"el primer premio de la #instrucción bandida# se trata de"},
   });
 
-    hintTable[GERUDO_TRAINING_GROUNDS_MAZE_PATH_SECOND_CHEST] = HintText::Exclude({
+    hintTable[RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_SECOND_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the second prize of #the thieves' training# is", /*french*/"le #deuxième trésor du Gymnase Gerudo# est", /*spanish*/"el segundo premio de la #instrucción bandida# se trata de"},
   });
 
-    hintTable[GERUDO_TRAINING_GROUNDS_MAZE_PATH_THIRD_CHEST] = HintText::Exclude({
+    hintTable[RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_THIRD_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the third prize of #the thieves' training# is", /*french*/"le #troisième trésor du Gymnase Gerudo# est", /*spanish*/"el tercer premio de la #instrucción bandida# se trata de"},
   });
 
-    hintTable[GERUDO_TRAINING_GROUNDS_MAZE_RIGHT_CENTRAL_CHEST] = HintText::Exclude({
+    hintTable[RHT_GERUDO_TRAINING_GROUND_MAZE_RIGHT_CENTRAL_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the #Song of Time# in the Gerudo Training Grounds leads to", /*french*/"le #chant du temps# révèle dans le Gymnase Gerudo", /*spanish*/"la #Canción del Tiempo# en el Centro de Instrucción Gerudo conduce a"},
   });
 
-    hintTable[GERUDO_TRAINING_GROUNDS_MAZE_RIGHT_SIDE_CHEST] = HintText::Exclude({
+    hintTable[RHT_GERUDO_TRAINING_GROUND_MAZE_RIGHT_SIDE_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the #Song of Time# in the Gerudo Training Grounds leads to", /*french*/"le #chant du temps# révèle dans le Gymnase Gerudo", /*spanish*/"la #Canción del Tiempo# en el Centro de Instrucción Gerudo conduce a"},
   });
 
-    hintTable[GERUDO_TRAINING_GROUNDS_HAMMER_ROOM_CLEAR_CHEST] = HintText::Exclude({
+    hintTable[RHT_GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#fiery foes# in the Gerudo Training Grounds guard", /*french*/"les #limaces de feu# du Gymnase Gerudo protègent", /*spanish*/"unos #flamígeros enemigos# del Centro de Instrucción Gerudo guardan"},
   });
 
-    hintTable[GERUDO_TRAINING_GROUNDS_HAMMER_ROOM_SWITCH_CHEST] = HintText::Exclude({
+    hintTable[RHT_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#engulfed in flame# where thieves train lies", /*french*/"le #trésor enflammé# du Gymnase Gerudo est", /*spanish*/"donde entrenan las bandidas #entre llamas# yace"},
   });
 
-    hintTable[GERUDO_TRAINING_GROUNDS_EYE_STATUE_CHEST] = HintText::Exclude({
+    hintTable[RHT_GERUDO_TRAINING_GROUND_EYE_STATUE_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"thieves #blind four faces# to find", /*french*/"l'#épreuve d'archerie# du Gymnase Gerudo donne", /*spanish*/"las bandidas #ciegan cuatro bustos# para hallar"},
   });
 
-    hintTable[GERUDO_TRAINING_GROUNDS_NEAR_SCARECROW_CHEST] = HintText::Exclude({
+    hintTable[RHT_GERUDO_TRAINING_GROUND_NEAR_SCARECROW_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"thieves #blind four faces# to find", /*french*/"l'#épreuve d'archerie# du Gymnase Gerudo donne", /*spanish*/"las bandidas #ciegan cuatro bustos# para hallar"},
   });
 
-    hintTable[GERUDO_TRAINING_GROUNDS_BEFORE_HEAVY_BLOCK_CHEST] = HintText::Exclude({
+    hintTable[RHT_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#before a block of silver# thieves can find", /*french*/"#près d'un bloc argent# dans le Gymnase Gerudo gît", /*spanish*/"#ante un plateado bloque# las bandidas hallan"},
   });
 
-    hintTable[GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_FIRST_CHEST] = HintText::Exclude({
+    hintTable[RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #feat of strength# rewards thieves with", /*french*/"#derrière un bloc argent# dans le Gymnase Gerudo gît", /*spanish*/"una #hazaña de fuerza# premia a las bandidas con"},
   });
 
-    hintTable[GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_SECOND_CHEST] = HintText::Exclude({
+    hintTable[RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #feat of strength# rewards thieves with", /*french*/"#derrière un bloc argent# dans le Gymnase Gerudo gît", /*spanish*/"una #hazaña de fuerza# premia a las bandidas con"},
   });
 
-    hintTable[GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_THIRD_CHEST] = HintText::Exclude({
+    hintTable[RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_THIRD_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #feat of strength# rewards thieves with", /*french*/"#derrière un bloc argent# dans le Gymnase Gerudo gît", /*spanish*/"una #hazaña de fuerza# premia a las bandidas con"},
   });
 
-    hintTable[GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_FOURTH_CHEST] = HintText::Exclude({
+    hintTable[RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FOURTH_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #feat of strength# rewards thieves with", /*french*/"#derrière un bloc argent# dans le Gymnase Gerudo gît", /*spanish*/"una #hazaña de fuerza# premia a las bandidas con"},
   });
 
-    hintTable[GERUDO_TRAINING_GROUNDS_FREESTANDING_KEY] = HintText::Exclude({
+    hintTable[RHT_GERUDO_TRAINING_GROUND_FREESTANDING_KEY] = HintText::Exclude({
                        //obscure text
                        Text{"the #Song of Time# in the Gerudo Training Grounds leads to", /*french*/"le #chant du temps# révèle dans le Gymnase Gerudo", /*spanish*/"la #Canción del Tiempo# en el Centro de Instrucción Gerudo conduce a"},
   });
 
 
-    hintTable[GERUDO_TRAINING_GROUNDS_MQ_LOBBY_RIGHT_CHEST] = HintText::Exclude({
+    hintTable[RHT_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#thieves prepare for training# with", /*french*/"dans #l'entrée du Gymnase Gerudo# gît", /*spanish*/"las #bandidas se instruyen# con"},
   });
 
-    hintTable[GERUDO_TRAINING_GROUNDS_MQ_LOBBY_LEFT_CHEST] = HintText::Exclude({
+    hintTable[RHT_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#thieves prepare for training# with", /*french*/"dans #l'entrée du Gymnase Gerudo# gît", /*spanish*/"las #bandidas se instruyen# con"},
   });
 
-    hintTable[GERUDO_TRAINING_GROUNDS_MQ_FIRST_IRON_KNUCKLE_CHEST] = HintText::Exclude({
+    hintTable[RHT_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#soldiers walking on shifting sands# in the Gerudo Training Grounds guard", /*french*/"les #squelettes# du Gymnase Gerudo protègent", /*spanish*/"#soldados en resbaladizas arenas# del Centro de Instrucción Gerudo protegen"},
   });
 
-    hintTable[GERUDO_TRAINING_GROUNDS_MQ_BEFORE_HEAVY_BLOCK_CHEST] = HintText::Exclude({
+    hintTable[RHT_GERUDO_TRAINING_GROUND_MQ_BEFORE_HEAVY_BLOCK_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#before a block of silver# thieves can find", /*french*/"#près d'un bloc argent# dans le Gymnase Gerudo gît", /*spanish*/"#ante un plateado bloque# las bandidas hallan"},
   });
 
-    hintTable[GERUDO_TRAINING_GROUNDS_MQ_EYE_STATUE_CHEST] = HintText::Exclude({
+    hintTable[RHT_GERUDO_TRAINING_GROUND_MQ_EYE_STATUE_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"thieves #blind four faces# to find", /*french*/"l'#épreuve d'archerie# du Gymnase Gerudo donne", /*spanish*/"las bandidas #ciegan cuatro bustos# para hallar"},
   });
 
-    hintTable[GERUDO_TRAINING_GROUNDS_MQ_FLAME_CIRCLE_CHEST] = HintText::Exclude({
+    hintTable[RHT_GERUDO_TRAINING_GROUND_MQ_FLAME_CIRCLE_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#engulfed in flame# where thieves train lies", /*french*/"le #trésor enflammé# du Gymnase Gerudo est", /*spanish*/"donde entrenan las bandidas #entre llamas# yace"},
   });
 
-    hintTable[GERUDO_TRAINING_GROUNDS_MQ_SECOND_IRON_KNUCKLE_CHEST] = HintText::Exclude({
+    hintTable[RHT_GERUDO_TRAINING_GROUND_MQ_SECOND_IRON_KNUCKLE_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#fiery foes# in the Gerudo Training Grounds guard", /*french*/"les #ennemis de feu# du Gymnase Gerudo protègent", /*spanish*/"unos #flamígeros enemigos# del Centro de Instrucción Gerudo guardan"},
   });
 
-    hintTable[GERUDO_TRAINING_GROUNDS_MQ_DINOLFOS_CHEST] = HintText::Exclude({
+    hintTable[RHT_GERUDO_TRAINING_GROUND_MQ_DINOLFOS_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#reptilian warriors# in the Gerudo Training Grounds protect", /*french*/"les #lézards# dans le Gymnase Gerudo protègent", /*spanish*/"#unos escamosos guerreros# del Centro de Instrucción Gerudo protegen"},
   });
 
-    hintTable[GERUDO_TRAINING_GROUNDS_MQ_MAZE_RIGHT_CENTRAL_CHEST] = HintText::Exclude({
+    hintTable[RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_CENTRAL_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #path of fire# leads thieves to", /*french*/"dans le #chemin enflammé# dans le Gymnase Gerudo gît", /*spanish*/"un #camino de fuego# conduce a las bandidas a"},
   });
 
-    hintTable[GERUDO_TRAINING_GROUNDS_MQ_MAZE_PATH_FIRST_CHEST] = HintText::Exclude({
+    hintTable[RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_FIRST_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the first prize of #the thieves' training# is", /*french*/"le #premier trésor du Gymnase Gerudo# est", /*spanish*/"el primer premio de la #instrucción bandida# se trata de"},
   });
 
-    hintTable[GERUDO_TRAINING_GROUNDS_MQ_MAZE_RIGHT_SIDE_CHEST] = HintText::Exclude({
+    hintTable[RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_SIDE_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #path of fire# leads thieves to", /*french*/"dans le #chemin enflammé# dans le Gymnase Gerudo gît", /*spanish*/"un #camino de fuego# conduce a las bandidas a"},
   });
 
-    hintTable[GERUDO_TRAINING_GROUNDS_MQ_MAZE_PATH_THIRD_CHEST] = HintText::Exclude({
+    hintTable[RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_THIRD_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the third prize of #the thieves' training# is", /*french*/"le #troisième trésor du Gymnase Gerudo# est", /*spanish*/"el tercer premio de la #instrucción bandida# se trata de"},
   });
 
-    hintTable[GERUDO_TRAINING_GROUNDS_MQ_MAZE_PATH_SECOND_CHEST] = HintText::Exclude({
+    hintTable[RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_SECOND_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the second prize of #the thieves' training# is", /*french*/"le #deuxième trésor du Gymnase Gerudo# est", /*spanish*/"el segundo premio de la #instrucción bandida# se trata de"},
   });
 
-    hintTable[GERUDO_TRAINING_GROUNDS_MQ_HIDDEN_CEILING_CHEST] = HintText::Exclude({
+    hintTable[RHT_GERUDO_TRAINING_GROUND_MQ_HIDDEN_CEILING_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the #Eye of Truth# in the Gerudo Training Grounds reveals", /*french*/"#bien caché# dans le Gymnase Gerudo gît", /*spanish*/"el #Ojo de la Verdad# en el Centro de Instrucción Gerudo revela"},
   });
 
-    hintTable[GERUDO_TRAINING_GROUNDS_MQ_HEAVY_BLOCK_CHEST] = HintText::Exclude({
+    hintTable[RHT_GERUDO_TRAINING_GROUND_MQ_HEAVY_BLOCK_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #feat of strength# rewards thieves with", /*french*/"#derrière un bloc argent# dans le Gymnase Gerudo gît", /*spanish*/"una #hazaña de fuerza# premia a las bandidas con"},
   });
@@ -1769,195 +1769,195 @@ void HintTable_Init_Exclude_Dungeon() {
   /*--------------------------
   |      GANONS CASTLE       |
   ---------------------------*/
-    hintTable[GANONS_TOWER_BOSS_KEY_CHEST] = HintText::Exclude({
+    hintTable[RHT_GANONS_TOWER_BOSS_KEY_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the #Evil King# hoards", /*french*/"le #Roi du Mal# possède", /*spanish*/"el #Rey del Mal# acapara"},
   });
 
 
-    hintTable[GANONS_CASTLE_FOREST_TRIAL_CHEST] = HintText::Exclude({
+    hintTable[RHT_GANONS_CASTLE_FOREST_TRIAL_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the #test of the wilds# holds", /*french*/"l'#épreuve des bois# contient", /*spanish*/"la #prueba de la naturaleza# brinda"},
   });
 
-    hintTable[GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST] = HintText::Exclude({
+    hintTable[RHT_GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the #test of the seas# holds", /*french*/"l'#épreuve des mers# contient", /*spanish*/"la #prueba del mar# brinda"},
   });
 
-    hintTable[GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST] = HintText::Exclude({
+    hintTable[RHT_GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the #test of the seas# holds", /*french*/"l'#épreuve des mers# contient", /*spanish*/"la #prueba del mar# brinda"},
   });
 
-    hintTable[GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST] = HintText::Exclude({
+    hintTable[RHT_GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#music in the test of darkness# unveils", /*french*/"la #musique dans l'épreuve des ténèbres# révèle", /*spanish*/"la #música en la prueba de la oscuridad# revela"},
   });
 
-    hintTable[GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST] = HintText::Exclude({
+    hintTable[RHT_GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#light in the test of darkness# unveils", /*french*/"la #lumière dans l'épreuve des ténèbres# révèle", /*spanish*/"la #luz en la prueba de la oscuridad# revela"},
   });
 
-    hintTable[GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST] = HintText::Exclude({
+    hintTable[RHT_GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the #test of the sands# holds", /*french*/"l'#épreuve des sables# contient", /*spanish*/"la #prueba de las arenas# brinda"},
   });
 
-    hintTable[GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST] = HintText::Exclude({
+    hintTable[RHT_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the #test of the sands# holds", /*french*/"l'#épreuve des sables# contient", /*spanish*/"la #prueba de las arenas# brinda"},
   });
 
-    hintTable[GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST] = HintText::Exclude({
+    hintTable[RHT_GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the #test of radiance# holds", /*french*/"l'#épreuve du ciel# contient", /*spanish*/"la #prueba del resplandor# brinda"},
   });
 
-    hintTable[GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST] = HintText::Exclude({
+    hintTable[RHT_GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the #test of radiance# holds", /*french*/"l'#épreuve du ciel# contient", /*spanish*/"la #prueba del resplandor# brinda"},
   });
 
-    hintTable[GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST] = HintText::Exclude({
+    hintTable[RHT_GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the #test of radiance# holds", /*french*/"l'#épreuve du ciel# contient", /*spanish*/"la #prueba del resplandor# brinda"},
   });
 
-    hintTable[GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST] = HintText::Exclude({
+    hintTable[RHT_GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the #test of radiance# holds", /*french*/"l'#épreuve du ciel# contient", /*spanish*/"la #prueba del resplandor# brinda"},
   });
 
-    hintTable[GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST] = HintText::Exclude({
+    hintTable[RHT_GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the #test of radiance# holds", /*french*/"l'#épreuve du ciel# contient", /*spanish*/"la #prueba del resplandor# brinda"},
   });
 
-    hintTable[GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST] = HintText::Exclude({
+    hintTable[RHT_GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the #test of radiance# holds", /*french*/"l'#épreuve du ciel# contient", /*spanish*/"la #prueba del resplandor# brinda"},
   });
 
-    hintTable[GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST] = HintText::Exclude({
+    hintTable[RHT_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the #test of radiance# holds", /*french*/"l'#épreuve du ciel# contient", /*spanish*/"la #prueba del resplandor# brinda"},
   });
 
-    hintTable[GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST] = HintText::Exclude({
+    hintTable[RHT_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#music in the test of radiance# reveals", /*french*/"la #musique dans l'épreuve du ciel# révèle", /*spanish*/"la #música en la prueba del resplandor# revela"},
   });
 
 
-    hintTable[GANONS_CASTLE_MQ_WATER_TRIAL_CHEST] = HintText::Exclude({
+    hintTable[RHT_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the #test of the seas# holds", /*french*/"l'#épreuve des mers# contient", /*spanish*/"la #prueba del mar# brinda"},
   });
 
-    hintTable[GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST] = HintText::Exclude({
+    hintTable[RHT_GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the #test of the wilds# holds", /*french*/"l'#épreuve des bois# contient", /*spanish*/"la #prueba de la naturaleza# brinda"},
   });
 
-    hintTable[GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST] = HintText::Exclude({
+    hintTable[RHT_GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the #test of the wilds# holds", /*french*/"l'#épreuve des bois# contient", /*spanish*/"la #prueba de la naturaleza# brinda"},
   });
 
-    hintTable[GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST] = HintText::Exclude({
+    hintTable[RHT_GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#music in the test of radiance# reveals", /*french*/"la #musique dans l'épreuve du ciel# révèle", /*spanish*/"la #música en la prueba del resplandor# revela"},
   });
 
-    hintTable[GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST] = HintText::Exclude({
+    hintTable[RHT_GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the #test of darkness# holds", /*french*/"l'#épreuve des ténèbres# contient", /*spanish*/"la #prueba de la oscuridad# brinda"},
   });
 
-    hintTable[GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST] = HintText::Exclude({
+    hintTable[RHT_GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the #test of darkness# holds", /*french*/"l'#épreuve des ténèbres# contient", /*spanish*/"la #prueba de la oscuridad# brinda"},
   });
 
-    hintTable[GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST] = HintText::Exclude({
+    hintTable[RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#reflected light in the test of the sands# reveals", /*french*/"le #soleil dans l'épreuve des sables# révèle", /*spanish*/"#reflejar la luz en la prueba de las arenas# revela"},
   });
 
-    hintTable[GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST] = HintText::Exclude({
+    hintTable[RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#reflected light in the test of the sands# reveals", /*french*/"le #soleil dans l'épreuve des sables# révèle", /*spanish*/"#reflejar la luz en la prueba de las arenas# revela"},
   });
 
-    hintTable[GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST] = HintText::Exclude({
+    hintTable[RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#reflected light in the test of the sands# reveals", /*french*/"le #soleil dans l'épreuve des sables# révèle", /*spanish*/"#reflejar la luz en la prueba de las arenas# revela"},
   });
 
-    hintTable[GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST] = HintText::Exclude({
+    hintTable[RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#reflected light in the test of the sands# reveals", /*french*/"le #soleil dans l'épreuve des sables# révèle", /*spanish*/"#reflejar la luz en la prueba de las arenas# revela"},
   });
 
-    hintTable[GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST] = HintText::Exclude({
+    hintTable[RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#reflected light in the test of the sands# reveals", /*french*/"le #soleil dans l'épreuve des sables# révèle", /*spanish*/"#reflejar la luz en la prueba de las arenas# revela"},
   });
 
-    hintTable[GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST] = HintText::Exclude({
+    hintTable[RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#reflected light in the test of the sands# reveals", /*french*/"le #soleil dans l'épreuve des sables# révèle", /*spanish*/"#reflejar la luz en la prueba de las arenas# revela"},
   });
 
-    hintTable[GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY] = HintText::Exclude({
+    hintTable[RHT_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY] = HintText::Exclude({
                        //obscure text
                        Text{"the #test of the wilds# holds", /*french*/"l'#épreuve des bois# révèle", /*spanish*/"la #prueba de la naturaleza# brinda"},
   });
 
-    hintTable[GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT] = HintText::Exclude({
+    hintTable[RHT_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT] = HintText::Exclude({
                        //obscure text
                        Text{"#scrubs in Ganon's Castle# sell", /*french*/"les #pestes Mojo dans le Château de Ganon# vendent", /*spanish*/"los #dekus del Castillo de Ganon# venden"},
   });
 
-    hintTable[GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT] = HintText::Exclude({
+    hintTable[RHT_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT] = HintText::Exclude({
                        //obscure text
                        Text{"#scrubs in Ganon's Castle# sell", /*french*/"les #pestes Mojo dans le Château de Ganon# vendent", /*spanish*/"los #dekus del Castillo de Ganon# venden"},
   });
 
-    hintTable[GANONS_CASTLE_DEKU_SCRUB_RIGHT] = HintText::Exclude({
+    hintTable[RHT_GANONS_CASTLE_DEKU_SCRUB_RIGHT] = HintText::Exclude({
                        //obscure text
                        Text{"#scrubs in Ganon's Castle# sell", /*french*/"les #pestes Mojo dans le Château de Ganon# vendent", /*spanish*/"los #dekus del Castillo de Ganon# venden"},
   });
 
-    hintTable[GANONS_CASTLE_DEKU_SCRUB_LEFT] = HintText::Exclude({
+    hintTable[RHT_GANONS_CASTLE_DEKU_SCRUB_LEFT] = HintText::Exclude({
                        //obscure text
                        Text{"#scrubs in Ganon's Castle# sell", /*french*/"les #pestes Mojo dans le Château de Ganon# vendent", /*spanish*/"los #dekus del Castillo de Ganon# venden"},
   });
 
 
-    hintTable[GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT] = HintText::Exclude({
+    hintTable[RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT] = HintText::Exclude({
                        //obscure text
                        Text{"#scrubs in Ganon's Castle# sell", /*french*/"les #pestes Mojo dans le Château de Ganon# vendent", /*spanish*/"los #dekus del Castillo de Ganon# venden"},
   });
 
-    hintTable[GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT] = HintText::Exclude({
+    hintTable[RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT] = HintText::Exclude({
                        //obscure text
                        Text{"#scrubs in Ganon's Castle# sell", /*french*/"les #pestes Mojo dans le Château de Ganon# vendent", /*spanish*/"los #dekus del Castillo de Ganon# venden"},
   });
 
-    hintTable[GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER] = HintText::Exclude({
+    hintTable[RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER] = HintText::Exclude({
                        //obscure text
                        Text{"#scrubs in Ganon's Castle# sell", /*french*/"les #pestes Mojo dans le Château de Ganon# vendent", /*spanish*/"los #dekus del Castillo de Ganon# venden"},
   });
 
-    hintTable[GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT] = HintText::Exclude({
+    hintTable[RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT] = HintText::Exclude({
                        //obscure text
                        Text{"#scrubs in Ganon's Castle# sell", /*french*/"les #pestes Mojo dans le Château de Ganon# vendent", /*spanish*/"los #dekus del Castillo de Ganon# venden"},
   });
 
-    hintTable[GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT] = HintText::Exclude({
+    hintTable[RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT] = HintText::Exclude({
                        //obscure text
                        Text{"#scrubs in Ganon's Castle# sell", /*french*/"les #pestes Mojo dans le Château de Ganon# vendent", /*spanish*/"los #dekus del Castillo de Ganon# venden"},
   });
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_overworld.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_overworld.cpp
index 8b9f37f9e..6e46c522a 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_overworld.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_overworld.cpp
@@ -1,12 +1,12 @@
 #include "../hint_list.hpp"
 
 void HintTable_Init_Exclude_Overworld() {
-    hintTable[KF_KOKIRI_SWORD_CHEST] = HintText::Exclude({
+    hintTable[RHT_KF_KOKIRI_SWORD_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the #hidden treasure of the Kokiri# is", /*french*/"le #trésor des Kokiri# est", /*spanish*/"el #tesoro oculto de los Kokiri# esconde"},
   });
 
-    hintTable[KF_MIDOS_TOP_LEFT_CHEST] = HintText::Exclude({
+    hintTable[RHT_KF_MIDOS_TOP_LEFT_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the #leader of the Kokiri# hides", /*french*/"le #chef des Kokiri# possède", /*spanish*/"el #líder de los Kokiri# esconde"},
                      }, {},
@@ -14,7 +14,7 @@ void HintTable_Init_Exclude_Overworld() {
                        Text{"#inside Mido's house# is", /*french*/"#dans la maison de Mido# gît", /*spanish*/"en la #casa de Mido# yace"}
   );
 
-    hintTable[KF_MIDOS_TOP_RIGHT_CHEST] = HintText::Exclude({
+    hintTable[RHT_KF_MIDOS_TOP_RIGHT_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the #leader of the Kokiri# hides", /*french*/"le #chef des Kokiri# possède", /*spanish*/"el #líder de los Kokiri# esconde"},
                      }, {},
@@ -22,7 +22,7 @@ void HintTable_Init_Exclude_Overworld() {
                        Text{"#inside Mido's house# is", /*french*/"#dans la maison de Mido# gît", /*spanish*/"en la #casa de Mido# yace"}
   );
 
-    hintTable[KF_MIDOS_BOTTOM_LEFT_CHEST] = HintText::Exclude({
+    hintTable[RHT_KF_MIDOS_BOTTOM_LEFT_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the #leader of the Kokiri# hides", /*french*/"le #chef des Kokiri# possède", /*spanish*/"el #líder de los Kokiri# esconde"},
                      }, {},
@@ -30,7 +30,7 @@ void HintTable_Init_Exclude_Overworld() {
                        Text{"#inside Mido's house# is", /*french*/"#dans la maison de Mido# gît", /*spanish*/"en la #casa de Mido# yace"}
   );
 
-    hintTable[KF_MIDOS_BOTTOM_RIGHT_CHEST] = HintText::Exclude({
+    hintTable[RHT_KF_MIDOS_BOTTOM_RIGHT_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the #leader of the Kokiri# hides", /*french*/"le #chef des Kokiri# possède", /*spanish*/"el #líder de los Kokiri# esconde"},
                      }, {},
@@ -38,32 +38,32 @@ void HintTable_Init_Exclude_Overworld() {
                        Text{"#inside Mido's house# is", /*french*/"#dans la maison de Mido# gît", /*spanish*/"en la #casa de Mido# yace"}
   );
 
-    hintTable[GRAVEYARD_SHIELD_GRAVE_CHEST] = HintText::Exclude({
+    hintTable[RHT_GRAVEYARD_SHIELD_GRAVE_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"the #treasure of a fallen soldier# is", /*french*/"le #trésor du soldat mort# est", /*spanish*/"el #tesoro de un soldado caído# esconde"},
   });
 
-    hintTable[DMT_CHEST] = HintText::Exclude({
+    hintTable[RHT_DMT_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"hidden behind a wall on a #mountain trail# is", /*french*/"derrière une façade du #chemin montagneux# est", /*spanish*/"tras una pared del #sendero de la montaña# yace"},
   });
 
-    hintTable[GC_MAZE_RIGHT_CHEST] = HintText::Exclude({
+    hintTable[RHT_GC_MAZE_RIGHT_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"in #Goron City# explosives unlock", /*french*/"des explosions dans le #village Goron# révèlent", /*spanish*/"en la #Ciudad Goron# unos explosivos desbloquean"},
   });
 
-    hintTable[GC_MAZE_CENTER_CHEST] = HintText::Exclude({
+    hintTable[RHT_GC_MAZE_CENTER_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"in #Goron City# explosives unlock", /*french*/"des explosions dans le #village Goron# révèlent", /*spanish*/"en la #Ciudad Goron# unos explosivos desbloquean"},
   });
 
-    hintTable[ZD_CHEST] = HintText::Exclude({
+    hintTable[RHT_ZD_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"fire #beyond a waterfall# reveals", /*french*/"du feu #derrière la cascade# éclaire", /*spanish*/"las #llamas tras una una cascada# revelan"},
   });
 
-    hintTable[GRAVEYARD_HOOKSHOT_CHEST] = HintText::Exclude({
+    hintTable[RHT_GRAVEYARD_HOOKSHOT_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a chest hidden by a #speedy spectre# holds", /*french*/"le #coffre du rapide revenant# contient", /*spanish*/"un cofre custodiado por un #espectro veloz# contiene"},
                      }, {},
@@ -71,73 +71,73 @@ void HintTable_Init_Exclude_Overworld() {
                        Text{"#dead Dampé's first prize# is", /*french*/"la #première course d'Igor# donne", /*spanish*/"el primer premio de #la carrera de Dampé# se trata de"}
   );
 
-    hintTable[GF_CHEST] = HintText::Exclude({
+    hintTable[RHT_GF_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"on a #rooftop in the desert# lies", /*french*/"sur un #toit du désert# gît", /*spanish*/"en una #azotea del desierto# yace"},
   });
 
-    hintTable[KAK_REDEAD_GROTTO_CHEST] = HintText::Exclude({
+    hintTable[RHT_KAK_REDEAD_GROTTO_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#zombies beneath the earth# guard", /*french*/"les #revenants sous terre# protègent", /*spanish*/"unos #zombis subterráneos# esconden"},
   });
 
-    hintTable[SFM_WOLFOS_GROTTO_CHEST] = HintText::Exclude({
+    hintTable[RHT_SFM_WOLFOS_GROTTO_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#wolves beneath the earth# guard", /*french*/"les #loups sous terre# protègent", /*spanish*/"unos #lobos subterráneos# esconden"},
   });
 
-    hintTable[HF_NEAR_MARKET_GROTTO_CHEST] = HintText::Exclude({
+    hintTable[RHT_HF_NEAR_MARKET_GROTTO_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #hole in a field near a drawbridge# holds", /*french*/"la #grotte près d'un pont# contient", /*spanish*/"bajo el #hoyo de una llanura cercano a un puente# yace"},
   });
 
-    hintTable[HF_SOUTHEAST_GROTTO_CHEST] = HintText::Exclude({
+    hintTable[RHT_HF_SOUTHEAST_GROTTO_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #hole amongst trees in a field# holds", /*french*/"la #grotte près des arbres# contient", /*spanish*/"bajo el #hoyo de una llanura rodeado de árboles# yace"},
   });
 
-    hintTable[HF_OPEN_GROTTO_CHEST] = HintText::Exclude({
+    hintTable[RHT_HF_OPEN_GROTTO_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"an #open hole in a field# holds", /*french*/"la #grotte dans les plaines# contient", /*spanish*/"bajo el #hoyo descubierto de una llanura# yace"},
   });
 
-    hintTable[KAK_OPEN_GROTTO_CHEST] = HintText::Exclude({
+    hintTable[RHT_KAK_OPEN_GROTTO_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"an #open hole in a town# holds", /*french*/"la #grotte dans le village# contient", /*spanish*/"bajo el #hoyo descubierto de un pueblo# yace"},
   });
 
-    hintTable[ZR_OPEN_GROTTO_CHEST] = HintText::Exclude({
+    hintTable[RHT_ZR_OPEN_GROTTO_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #hole along a river# holds", /*french*/"la #grotte près du fleuve# contient", /*spanish*/"bajo un #hoyo junto a un río# yace"},
   });
 
-    hintTable[KF_STORMS_GROTTO_CHEST] = HintText::Exclude({
+    hintTable[RHT_KF_STORMS_GROTTO_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #hole in a forest village# holds", /*french*/"la #grotte inondée de pluie dans le Village Kokiri# révèle", /*spanish*/"bajo el #hoyo de una tribu del bosque# yace"},
   });
 
-    hintTable[LW_NEAR_SHORTCUTS_GROTTO_CHEST] = HintText::Exclude({
+    hintTable[RHT_LW_NEAR_SHORTCUTS_GROTTO_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #hole in a wooded maze# holds", /*french*/"la #grotte dans le labyrinthe sylvestre# contient", /*spanish*/"bajo un #hoyo de un laberinto forestal# yace"},
   });
 
-    hintTable[DMT_STORMS_GROTTO_CHEST] = HintText::Exclude({
+    hintTable[RHT_DMT_STORMS_GROTTO_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#hole flooded with rain on a mountain# holds", /*french*/"la #grotte inondée de pluie sur la montagne# contient", /*spanish*/"bajo un #hoyo de una montaña inundado de lluvia# yace"},
   });
 
-    hintTable[DMC_UPPER_GROTTO_CHEST] = HintText::Exclude({
+    hintTable[RHT_DMC_UPPER_GROTTO_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #hole in a volcano# holds", /*french*/"la #grotte dans le volcan# contient", /*spanish*/"bajo el #hoyo de un volcán# yace"},
   });
 
 
-    hintTable[TOT_LIGHT_ARROWS_CUTSCENE] = HintText::Exclude({
+    hintTable[RHT_TOT_LIGHT_ARROWS_CUTSCENE] = HintText::Exclude({
                        //obscure text
                        Text{"the #final gift of a princess# is", /*french*/"le #cadeau d'adieu de la princesse# est", /*spanish*/"el #obsequio final de la princesa# se trata de"},
   });
 
-    hintTable[LW_GIFT_FROM_SARIA] = HintText::Exclude({
+    hintTable[RHT_LW_GIFT_FROM_SARIA] = HintText::Exclude({
                        //obscure text
                        Text{"a #potato hoarder# holds",           /*french*/"le #panini mélodieux# est en fait", /*spanish*/"cierta #jovencita verde# concede"},
                        Text{"a rooty tooty #flutey cutey# gifts", /*french*/"la #patate musicale# est en fait",  /*spanish*/"una #gran amiga# concede"},
@@ -146,69 +146,69 @@ void HintTable_Init_Exclude_Overworld() {
                        Text{"#Saria's Gift# is", /*french*/"le #cadeau de Saria# est", /*spanish*/"el #regalo de Saria# se trata de"}
   );
 
-    hintTable[ZF_GREAT_FAIRY_REWARD] = HintText::Exclude({
+    hintTable[RHT_ZF_GREAT_FAIRY_REWARD] = HintText::Exclude({
                        //obscure text
                        Text{"the #fairy of winds# holds", /*french*/"la #fée du vent# a", /*spanish*/"el #hada del viento# brinda"},
   });
 
-    hintTable[HC_GREAT_FAIRY_REWARD] = HintText::Exclude({
+    hintTable[RHT_HC_GREAT_FAIRY_REWARD] = HintText::Exclude({
                        //obscure text
                        Text{"the #fairy of fire# holds", /*french*/"la #fée du feu# a", /*spanish*/"el #hada del fuego# brinda"},
   });
 
-    hintTable[COLOSSUS_GREAT_FAIRY_REWARD] = HintText::Exclude({
+    hintTable[RHT_COLOSSUS_GREAT_FAIRY_REWARD] = HintText::Exclude({
                        //obscure text
                        Text{"the #fairy of love# holds", /*french*/"la #fée de l'amour# a", /*spanish*/"el #hada del amor# brinda"},
   });
 
-    hintTable[DMT_GREAT_FAIRY_REWARD] = HintText::Exclude({
+    hintTable[RHT_DMT_GREAT_FAIRY_REWARD] = HintText::Exclude({
                        //obscure text
                        Text{"a #magical fairy# gifts", /*french*/"la #fée de la magie# a", /*spanish*/"un #hada mágica# brinda"},
   });
 
-    hintTable[DMC_GREAT_FAIRY_REWARD] = HintText::Exclude({
+    hintTable[RHT_DMC_GREAT_FAIRY_REWARD] = HintText::Exclude({
                        //obscure text
                        Text{"a #magical fairy# gifts", /*french*/"la #fée de la magie# a", /*spanish*/"un #hada mágica# brinda"},
   });
 
-    hintTable[OGC_GREAT_FAIRY_REWARD] = HintText::Exclude({
+    hintTable[RHT_OGC_GREAT_FAIRY_REWARD] = HintText::Exclude({
                        //obscure text
                        Text{"the #fairy of strength# holds", /*french*/"la #fée de la force# a", /*spanish*/"el #hada de la fuerza# brinda"},
   });
 
 
-    hintTable[SONG_FROM_IMPA] = HintText::Exclude({
+    hintTable[RHT_SONG_FROM_IMPA] = HintText::Exclude({
                        //obscure text
                        Text{"#deep in a castle#, Impa teaches", /*french*/"#la gardienne de la princesse# donne", /*spanish*/"en el #jardín del castillo Impa enseña#"},
   });
 
-    hintTable[SONG_FROM_MALON] = HintText::Exclude({
+    hintTable[RHT_SONG_FROM_MALON] = HintText::Exclude({
                        //obscure text
                        Text{"#a farm girl# sings", /*french*/"la #fillette de la ferme# donne", /*spanish*/"una #chica rupestre# canta"},
   });
 
-    hintTable[SONG_FROM_SARIA] = HintText::Exclude({
+    hintTable[RHT_SONG_FROM_SARIA] = HintText::Exclude({
                        //obscure text
                        Text{"#deep in the forest#, Saria teaches", /*french*/"la #fille de la forêt# donne", /*spanish*/"al #fondo del bosque# Saria enseña"},
   });
 
-    hintTable[SONG_FROM_WINDMILL] = HintText::Exclude({
+    hintTable[RHT_SONG_FROM_WINDMILL] = HintText::Exclude({
                        //obscure text
                        Text{"a man #in a windmill# is obsessed with", /*french*/"l'#homme du moulin# donne", /*spanish*/"el #hombre del molino# está obsesionado con"},
   });
 
 
-    hintTable[HC_MALON_EGG] = HintText::Exclude({
+    hintTable[RHT_HC_MALON_EGG] = HintText::Exclude({
                        //obscure text
                        Text{"a #girl looking for her father# gives", /*french*/"la #fillette qui cherche son père# donne", /*spanish*/"una #chica en busca de su padre# otorga"},
   });
 
-    hintTable[HC_ZELDAS_LETTER] = HintText::Exclude({
+    hintTable[RHT_HC_ZELDAS_LETTER] = HintText::Exclude({
                        //obscure text
                        Text{"a #princess in a castle# gifts", /*french*/"la #princesse dans le château# donne", /*spanish*/"la #princesa de un castillo# otorga"},
   });
 
-    hintTable[ZD_DIVING_MINIGAME] = HintText::Exclude({
+    hintTable[RHT_ZD_DIVING_MINIGAME] = HintText::Exclude({
                        //obscure text
                        Text{"an #unsustainable business model# gifts", /*french*/"le #mauvais modèle d'affaires# donne", /*spanish*/"un #mal modelo de negocio# premia con"},
                      }, {},
@@ -216,22 +216,22 @@ void HintTable_Init_Exclude_Overworld() {
                        Text{"those who #dive for Zora rupees# will find", /*french*/"ceux qui #plongent pour des rubis Zora# trouveront", /*spanish*/"aquellos que se #sumergan por las rupias zora# encontrarán"}
   );
 
-    hintTable[LH_CHILD_FISHING] = HintText::Exclude({
+    hintTable[RHT_LH_CHILD_FISHING] = HintText::Exclude({
                        //obscure text
                        Text{"#fishing in youth# bestows", /*french*/"#pêcher dans sa jeunesse# promet", /*spanish*/"#pescar en la juventud# conduce a"},
   });
 
-    hintTable[LH_ADULT_FISHING] = HintText::Exclude({
+    hintTable[RHT_LH_ADULT_FISHING] = HintText::Exclude({
                        //obscure text
                        Text{"#fishing in maturity# bestows", /*french*/"#pêcher dans sa maturité# promet", /*spanish*/"#pescar en la madurez# conduce a"},
   });
 
-    hintTable[LH_LAB_DIVE] = HintText::Exclude({
+    hintTable[RHT_LH_LAB_DIVE] = HintText::Exclude({
                        //obscure text
                        Text{"a #diving experiment# is rewarded with", /*french*/"l'#expérience de plongée# donne", /*spanish*/"#bucear para un experimento# se premia con"},
   });
 
-    hintTable[GC_ROLLING_GORON_AS_ADULT] = HintText::Exclude({
+    hintTable[RHT_GC_ROLLING_GORON_AS_ADULT] = HintText::Exclude({
                        //obscure text
                        Text{"#comforting yourself# provides", /*french*/"se #réconforter soi-même# donne", /*spanish*/"#confrontarte a ti mismo# otorga"},
                      }, {},
@@ -239,17 +239,17 @@ void HintTable_Init_Exclude_Overworld() {
                        Text{"#reassuring a young Goron# is rewarded with", /*french*/"#rassurer un jeune Goron# donne", /*spanish*/"#calmar a un joven Goron# otorga"}
   );
 
-    hintTable[MARKET_BOMBCHU_BOWLING_FIRST_PRIZE] = HintText::Exclude({
+    hintTable[RHT_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE] = HintText::Exclude({
                        //obscure text
                        Text{"the #first explosive prize# is", /*french*/"le #premier prix explosif# est", /*spanish*/"el #primer premio explosivo# se trata de"},
   });
 
-    hintTable[MARKET_BOMBCHU_BOWLING_SECOND_PRIZE] = HintText::Exclude({
+    hintTable[RHT_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE] = HintText::Exclude({
                        //obscure text
                        Text{"the #second explosive prize# is", /*french*/"le #deuxième prix explosif# est", /*spanish*/"el #segundo premio explosivo# se trata de"},
   });
 
-    hintTable[MARKET_LOST_DOG] = HintText::Exclude({
+    hintTable[RHT_MARKET_LOST_DOG] = HintText::Exclude({
                        //obscure text
                        Text{"#puppy lovers# will find", /*french*/"les #amoureux canins# trouveront", /*spanish*/"los #amantes caninos# encontrarán"},
                      }, {},
@@ -257,7 +257,7 @@ void HintTable_Init_Exclude_Overworld() {
                        Text{"#rescuing Richard the Dog# is rewarded with", /*french*/"#retrouver Kiki le chien# promet", /*spanish*/"#rescatar al perrito Ricardo# conduce a"}
   );
 
-    hintTable[LW_OCARINA_MEMORY_GAME] = HintText::Exclude({
+    hintTable[RHT_LW_OCARINA_MEMORY_GAME] = HintText::Exclude({
                        //obscure text
                        Text{"the prize for a #game of Simon Says# is", /*french*/"la #récompense de Jean Dit# est", /*spanish*/"#repetir ciertas melodías# otorga"},
                        Text{"a #child sing-a-long# holds",             /*french*/"les #jeunes flûtistes# donnent",  /*spanish*/"#tocar junto a otros# otorga"},
@@ -266,7 +266,7 @@ void HintTable_Init_Exclude_Overworld() {
                        Text{"#playing an Ocarina in Lost Woods# is rewarded with", /*french*/"#jouer l'ocarina dans les Bois Perdus# donne", /*spanish*/"#tocar la ocarina en el Bosque Perdido# otorga"}
   );
 
-    hintTable[KAK_10_GOLD_SKULLTULA_REWARD] = HintText::Exclude({
+    hintTable[RHT_KAK_10_GOLD_SKULLTULA_REWARD] = HintText::Exclude({
                        //obscure text
                        Text{"#10 bug badges# rewards",           /*french*/"#10 écussons# donnent",             /*spanish*/"#10 medallas de insectos# otorgan"},
                        Text{"#10 spider souls# yields",          /*french*/"#10 âmes# donnent",                 /*spanish*/"#10 almas de araña# otorgan"},
@@ -276,12 +276,12 @@ void HintTable_Init_Exclude_Overworld() {
                        Text{"slaying #10 Gold Skulltulas# reveals", /*french*/"détruire #10 Skulltulas d'or# donne", /*spanish*/"#exterminar 10 skulltulas doradas# revela"}
   );
 
-    hintTable[KAK_MAN_ON_ROOF] = HintText::Exclude({
+    hintTable[RHT_KAK_MAN_ON_ROOF] = HintText::Exclude({
                        //obscure text
                        Text{"a #rooftop wanderer# holds", /*french*/"une #rencontre sur un toit# donne", /*spanish*/"#alguien sobre un tejado# otorga"},
   });
 
-    hintTable[ZR_MAGIC_BEAN_SALESMAN] = HintText::Exclude({
+    hintTable[RHT_ZR_MAGIC_BEAN_SALESMAN] = HintText::Exclude({
                        //obscure text
                        Text{"a seller of #colorful crops# has", /*french*/"le #marchand de légumes# vend", /*spanish*/"el vendedor de un #colorido cultivo# ofrece"},
                      }, {},
@@ -289,11 +289,11 @@ void HintTable_Init_Exclude_Overworld() {
                        Text{"a #bean seller# offers", /*french*/"le #marchand de haricots magiques# vend en fait", /*spanish*/"el #vendedor de judías# ofrece"}
   );
 
-    hintTable[ZR_FROGS_IN_THE_RAIN] = HintText::Exclude({
+    hintTable[RHT_ZR_FROGS_IN_THE_RAIN] = HintText::Exclude({
                        //obscure text
                        Text{"#frogs in a storm# gift", /*french*/"#des grenouilles mouillées# donnent", /*spanish*/"las #ancas bajo la tormenta# otorgan"},
   });
-    hintTable[ZR_FROGS_ZELDAS_LULLABY] = HintText::Exclude(
+    hintTable[RHT_ZR_FROGS_ZELDAS_LULLABY] = HintText::Exclude(
         {
             // obscure text
             Text{ "#sleepy frogs# gift", /*french*/ "#les grenouilles somnolentes# donnent",
@@ -308,7 +308,7 @@ void HintTable_Init_Exclude_Overworld() {
               /*french*/ "à l'écoute de #la berceuse de Zelda, les grenouilles# donnent",
               /*spanish*/ "después de escuchar #la Nana de Zelda, las ranas# regalan" });
 
-    hintTable[ZR_FROGS_EPONAS_SONG] = HintText::Exclude(
+    hintTable[RHT_ZR_FROGS_EPONAS_SONG] = HintText::Exclude(
         {
             // obscure text
             Text{ "#equine frogs# gift", /*french*/ "#les grenouilles équestres# donnent",
@@ -323,7 +323,7 @@ void HintTable_Init_Exclude_Overworld() {
               /*french*/ "à l'écoute du #chant d'Epona, les grenouilles# donnent",
               /*spanish*/ "después de escuchar #la Canción de Epona, las ranas# regalan" });
 
-    hintTable[ZR_FROGS_SARIAS_SONG] = HintText::Exclude(
+    hintTable[RHT_ZR_FROGS_SARIAS_SONG] = HintText::Exclude(
         {
             // obscure text
             Text{ "#sylvan frogs# gift", /*french*/ "#les grenouilles sylvestres# donnent",
@@ -338,7 +338,7 @@ void HintTable_Init_Exclude_Overworld() {
               /*french*/ "à l'écoute du #chant de Saria, les grenouilles# donnent",
               /*spanish*/ "después de escuchar #la Canción de Saria, las ranas# regalan" });
 
-    hintTable[ZR_FROGS_SUNS_SONG] = HintText::Exclude(
+    hintTable[RHT_ZR_FROGS_SUNS_SONG] = HintText::Exclude(
         {
             // obscure text
             Text{ "#enlightened frogs# gift", /*french*/ "#les grenouilles éclairées# donnent",
@@ -353,7 +353,7 @@ void HintTable_Init_Exclude_Overworld() {
               /*french*/ "à l'écoute du #chant du soleil, les grenouilles# donnent",
               /*spanish*/ "después de escuchar #la Canción del Sol, las ranas# regalan" });
 
-    hintTable[ZR_FROGS_SONG_OF_TIME] = HintText::Exclude(
+    hintTable[RHT_ZR_FROGS_SONG_OF_TIME] = HintText::Exclude(
         {
             // obscure text
             Text{ "#time-traveling frogs# gift", /*french*/ "#les grenouilles voyageuses dans le temps# donnent",
@@ -368,82 +368,82 @@ void HintTable_Init_Exclude_Overworld() {
               /*french*/ "à l'écoute du #chant du temps, les grenouilles# donnent",
               /*spanish*/ "después de escuchar #la Canción del tiempo, las ranas# regalan" });
 
-    hintTable[GF_HBA_1000_POINTS] = HintText::Exclude({
+    hintTable[RHT_GF_HBA_1000_POINTS] = HintText::Exclude({
                        //obscure text
                        Text{"scoring 1000 in #horseback archery# grants", /*french*/"obtenir 1000 points dans l'#archerie équestre# donne", /*spanish*/"conseguir 1000 puntos en el #tiro con arco a caballo# premia"},
   });
 
-    hintTable[MARKET_SHOOTING_GALLERY_REWARD] = HintText::Exclude({
+    hintTable[RHT_MARKET_SHOOTING_GALLERY_REWARD] = HintText::Exclude({
                        //obscure text
                        Text{"#shooting in youth# grants", /*french*/"#faire du tir dans sa jeunesse# donne", /*spanish*/"#disparar en la juventud# otorga"},
   });
 
-    hintTable[KAK_SHOOTING_GALLERY_REWARD] = HintText::Exclude({
+    hintTable[RHT_KAK_SHOOTING_GALLERY_REWARD] = HintText::Exclude({
                        //obscure text
                        Text{"#shooting in maturity# grants", /*french*/"#faire du tir dans sa maturité# donne", /*spanish*/"#disparar en la madurez# otorga"},
   });
 
-    hintTable[LW_TARGET_IN_WOODS] = HintText::Exclude({
+    hintTable[RHT_LW_TARGET_IN_WOODS] = HintText::Exclude({
                        //obscure text
                        Text{"shooting a #target in the woods# grants", /*french*/"#tirer une cible dans les bois# donne", /*spanish*/"disparar a un #blanco forestal# brinda"},
   });
 
-    hintTable[KAK_ANJU_AS_ADULT] = HintText::Exclude({
+    hintTable[RHT_KAK_ANJU_AS_ADULT] = HintText::Exclude({
                        //obscure text
                        Text{"a #chicken caretaker# offers adults", /*french*/"devenir un #éleveur de Cocottes# donne", /*spanish*/"una #cuidadora de emplumados# le ofrece a los mayores"},
   });
 
-    hintTable[LLR_TALONS_CHICKENS] = HintText::Exclude({
+    hintTable[RHT_LLR_TALONS_CHICKENS] = HintText::Exclude({
                        //obscure text
                        Text{"#finding Super Cuccos# is rewarded with", /*french*/"#trouver des Super Cocottes# donne", /*spanish*/"#hallar los supercucos# conduce a"},
   });
 
-    hintTable[GC_ROLLING_GORON_AS_CHILD] = HintText::Exclude({
+    hintTable[RHT_GC_ROLLING_GORON_AS_CHILD] = HintText::Exclude({
                        //obscure text
                        Text{"the prize offered by a #large rolling Goron# is", /*french*/"la récompense d'un #gros Goron roulant# est", /*spanish*/"un #gran Goron rodante# otorga"},
   });
 
-    hintTable[LH_UNDERWATER_ITEM] = HintText::Exclude({
+    hintTable[RHT_LH_UNDERWATER_ITEM] = HintText::Exclude({
                        //obscure text
                        Text{"the #sunken treasure in a lake# is", /*french*/"le #trésor au fond du lac# est", /*spanish*/"el #tesoro hundido del lago# se trata de"},
   });
 
-    hintTable[GF_GERUDO_MEMBERSHIP_CARD] = HintText::Exclude({
+    hintTable[RHT_GF_GERUDO_MEMBERSHIP_CARD] = HintText::Exclude({
                        //obscure text
                        Text{"#rescuing captured carpenters# is rewarded with", /*french*/"#secourir les charpentiers capturés# assure", /*spanish*/"#rescatar los apresados carpinteros# se premia con"},
   });
 
-    hintTable[WASTELAND_BOMBCHU_SALESMAN] = HintText::Exclude({
+    hintTable[RHT_WASTELAND_BOMBCHU_SALESMAN] = HintText::Exclude({
                        //obscure text
                        Text{"a #carpet guru# sells", /*french*/"#un marchand du désert# vend", /*spanish*/"el #genio de una alfombra# vende"},
   });
 
-    hintTable[GC_MEDIGORON] = HintText::Exclude({
+    hintTable[RHT_GC_MEDIGORON] = HintText::Exclude({
                        //obscure text
                        Text{"#Medigoron# sells", /*french*/"#Medigoron# vend", /*spanish*/"#Medigoron# vende"},
   });
 
-  hintTable[KAK_GRANNYS_SHOP] = HintText::Exclude({
+  hintTable[RHT_KAK_GRANNYS_SHOP] = HintText::Exclude({
                        // obscure text
                        Text{"the #potion shop lady# sells", /*french*/"la #dame du magasin de potion# vend", /*spanish*/"la #señora de la tienda de pociones# vende" },
   });
 
-    hintTable[KAK_IMPAS_HOUSE_FREESTANDING_POH] = HintText::Exclude({
+    hintTable[RHT_KAK_IMPAS_HOUSE_FREESTANDING_POH] = HintText::Exclude({
                        //obscure text
                        Text{"#imprisoned in a house# lies", /*french*/"#encagé dans une maison# gît", /*spanish*/"#en una casa entre rejas# yace"},
   });
 
-    hintTable[HF_TEKTITE_GROTTO_FREESTANDING_POH] = HintText::Exclude({
+    hintTable[RHT_HF_TEKTITE_GROTTO_FREESTANDING_POH] = HintText::Exclude({
                        //obscure text
                        Text{"#deep underwater in a hole# is", /*french*/"#dans les profondeurs d'une grotte# gît", /*spanish*/"#en lo hondo bajo un hoyo# yace"},
   });
 
-    hintTable[KAK_WINDMILL_FREESTANDING_POH] = HintText::Exclude({
+    hintTable[RHT_KAK_WINDMILL_FREESTANDING_POH] = HintText::Exclude({
                        //obscure text
                        Text{"on a #windmill ledge# lies", /*french*/"#haut perché dans le moulin# gît", /*spanish*/"al #borde de un molino# yace"},
   });
 
-    hintTable[GRAVEYARD_DAMPE_RACE_FREESTANDING_POH] = HintText::Exclude({
+    hintTable[RHT_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH] = HintText::Exclude({
                        //obscure text
                        Text{"#racing a ghost# leads to", /*french*/"le défi du #revenant rapide# donne", /*spanish*/"#perseguir a un fantasma# conduce a"},
                      }, {},
@@ -451,405 +451,405 @@ void HintTable_Init_Exclude_Overworld() {
                        Text{"#dead Dampe's second# prize is", /*french*/"la #deuxième course d'Igor# donne", /*spanish*/"el segundo premio de #la carrera de Dampé# se trata de"}
   );
 
-    hintTable[LLR_FREESTANDING_POH] = HintText::Exclude({
+    hintTable[RHT_LLR_FREESTANDING_POH] = HintText::Exclude({
                        //obscure text
                        Text{"in a #ranch silo# lies", /*french*/"#dans l'entrepôt de la ferme# gît", /*spanish*/"en un #granero rupestre# yace"},
   });
 
-    hintTable[GRAVEYARD_FREESTANDING_POH] = HintText::Exclude({
+    hintTable[RHT_GRAVEYARD_FREESTANDING_POH] = HintText::Exclude({
                        //obscure text
                        Text{"a #crate in a graveyard# hides", /*french*/"#la boîte dans le Cimetière# contient", /*spanish*/"bajo la #caja de un cementerio# yace"},
   });
 
-    hintTable[GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR] = HintText::Exclude({
+    hintTable[RHT_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR] = HintText::Exclude({
                        //obscure text
                        Text{"a #gravekeeper digs up#", /*french*/"#le jeu du fossoyeur# cache", /*spanish*/"cierto #sepultero desentierra#"},
   });
 
-    hintTable[ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH] = HintText::Exclude({
+    hintTable[RHT_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH] = HintText::Exclude({
                        //obscure text
                        Text{"on top of a #pillar in a river# lies", /*french*/"#sur un pilier au dessus du fleuve# gît", /*spanish*/"en lo alto del #pilar de un río# yace"},
   });
 
-    hintTable[ZR_NEAR_DOMAIN_FREESTANDING_POH] = HintText::Exclude({
+    hintTable[RHT_ZR_NEAR_DOMAIN_FREESTANDING_POH] = HintText::Exclude({
                        //obscure text
                        Text{"on a #river ledge by a waterfall# lies", /*french*/"#sur la falaise au dessus du fleuve# gît", /*spanish*/"al borde de #la entrada a una cascada# yace"},
   });
 
-    hintTable[LH_FREESTANDING_POH] = HintText::Exclude({
+    hintTable[RHT_LH_FREESTANDING_POH] = HintText::Exclude({
                        //obscure text
                        Text{"high on a #lab rooftop# one can find", /*french*/"#la tour d'observation du lac# cache", /*spanish*/"en lo #alto de un laboratorio# yace"},
   });
 
-    hintTable[ZF_ICEBERG_FREESTANDING_POH] = HintText::Exclude({
+    hintTable[RHT_ZF_ICEBERG_FREESTANDING_POH] = HintText::Exclude({
                        //obscure text
                        Text{"#floating on ice# is", /*french*/"#gisant sur la glace# gît", /*spanish*/"#flotando sobre hielo# yace"},
   });
 
-    hintTable[GV_WATERFALL_FREESTANDING_POH] = HintText::Exclude({
+    hintTable[RHT_GV_WATERFALL_FREESTANDING_POH] = HintText::Exclude({
                        //obscure text
                        Text{"behind a #valley waterfall# is", /*french*/"#derrière la cascade du désert# se cache", /*spanish*/"tras una #desierta cascada# yace"},
   });
 
-    hintTable[GV_CRATE_FREESTANDING_POH] = HintText::Exclude({
+    hintTable[RHT_GV_CRATE_FREESTANDING_POH] = HintText::Exclude({
                        //obscure text
                        Text{"a #crate in a valley# hides", /*french*/"la #boîte dans la vallée# contient", /*spanish*/"bajo la #caja de un valle# yace"},
   });
 
-    hintTable[COLOSSUS_FREESTANDING_POH] = HintText::Exclude({
+    hintTable[RHT_COLOSSUS_FREESTANDING_POH] = HintText::Exclude({
                        //obscure text
                        Text{"on top of an #arch of stone# lies", /*french*/"#gisant sur une arche de pierre# gît", /*spanish*/"en lo alto de un #arco de piedra# yace"},
   });
 
-    hintTable[DMT_FREESTANDING_POH] = HintText::Exclude({
+    hintTable[RHT_DMT_FREESTANDING_POH] = HintText::Exclude({
                        //obscure text
                        Text{"above a #mountain cavern entrance# is", /*french*/"gisant #au dessus de la caverne montagneuse# gît", /*spanish*/"en lo alto de la #entrada de una cueva en la montaña# yace"},
   });
 
-    hintTable[DMC_WALL_FREESTANDING_POH] = HintText::Exclude({
+    hintTable[RHT_DMC_WALL_FREESTANDING_POH] = HintText::Exclude({
                        //obscure text
                        Text{"nestled in a #volcanic wall# is", /*french*/"dans une #alcove volcanique# gît", /*spanish*/"entre unas #murallas volcánicas# yace"},
   });
 
-    hintTable[DMC_VOLCANO_FREESTANDING_POH] = HintText::Exclude({
+    hintTable[RHT_DMC_VOLCANO_FREESTANDING_POH] = HintText::Exclude({
                        //obscure text
                        Text{"obscured by #volcanic ash# is", /*french*/"#recouvert de cendres volcaniques# gît", /*spanish*/"bajo la #ceniza volcánica# yace"},
   });
 
-    hintTable[GF_NORTH_F1_CARPENTER] = HintText::Exclude({
+    hintTable[RHT_GF_NORTH_F1_CARPENTER] = HintText::Exclude({
                        //obscure text
                        Text{"#defeating Gerudo guards# reveals", /*french*/"les #geôliers Gerudo# détiennent", /*spanish*/"#derrotar a las guardas Gerudo# revela"},
   });
 
-    hintTable[GF_NORTH_F2_CARPENTER] = HintText::Exclude({
+    hintTable[RHT_GF_NORTH_F2_CARPENTER] = HintText::Exclude({
                        //obscure text
                        Text{"#defeating Gerudo guards# reveals", /*french*/"les #geôliers Gerudo# détiennent", /*spanish*/"#derrotar a las guardas Gerudo# revela"},
   });
 
-    hintTable[GF_SOUTH_F1_CARPENTER] = HintText::Exclude({
+    hintTable[RHT_GF_SOUTH_F1_CARPENTER] = HintText::Exclude({
                        //obscure text
                        Text{"#defeating Gerudo guards# reveals", /*french*/"les #geôliers Gerudo# détiennent", /*spanish*/"#derrotar a las guardas Gerudo# revela"},
   });
 
-    hintTable[GF_SOUTH_F2_CARPENTER] = HintText::Exclude({
+    hintTable[RHT_GF_SOUTH_F2_CARPENTER] = HintText::Exclude({
                        //obscure text
                        Text{"#defeating Gerudo guards# reveals", /*french*/"les #geôliers Gerudo# détiennent", /*spanish*/"#derrotar a las guardas Gerudo# revela"},
   });
 
 
-    hintTable[HF_GS_NEAR_KAK_GROTTO] = HintText::Exclude({
+    hintTable[RHT_HF_GS_NEAR_KAK_GROTTO] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider-guarded spider in a hole# hoards", /*french*/"une #Skulltula dans un trou d'arachnides# a", /*spanish*/"una #Skulltula custodiada por otra# de un hoyo otorga"},
   });
 
 
-    hintTable[LLR_GS_BACK_WALL] = HintText::Exclude({
+    hintTable[RHT_LLR_GS_BACK_WALL] = HintText::Exclude({
                        //obscure text
                        Text{"night reveals a #spider in a ranch# holding", /*french*/"une #Skulltula sur la façade de la ferme# a", /*spanish*/"la noche revela una #Skulltula del rancho# que otorga"},
   });
 
-    hintTable[LLR_GS_RAIN_SHED] = HintText::Exclude({
+    hintTable[RHT_LLR_GS_RAIN_SHED] = HintText::Exclude({
                        //obscure text
                        Text{"night reveals a #spider in a ranch# holding", /*french*/"une #Skulltula sur le mur de l'enclos# a", /*spanish*/"la noche revela una #Skulltula del rancho# que otorga"},
   });
 
-    hintTable[LLR_GS_HOUSE_WINDOW] = HintText::Exclude({
+    hintTable[RHT_LLR_GS_HOUSE_WINDOW] = HintText::Exclude({
                        //obscure text
                        Text{"night reveals a #spider in a ranch# holding", /*french*/"une #Skulltula sur la maison de ferme# a", /*spanish*/"la noche revela una #Skulltula del rancho# que otorga"},
   });
 
-    hintTable[LLR_GS_TREE] = HintText::Exclude({
+    hintTable[RHT_LLR_GS_TREE] = HintText::Exclude({
                        //obscure text
                        Text{"a spider hiding in a #ranch tree# holds", /*french*/"une #Skulltula dans l'arbre de la ferme# a", /*spanish*/"una Skulltula escondida en el #árbol de un rancho# otorga"},
   });
 
 
-    hintTable[KF_GS_BEAN_PATCH] = HintText::Exclude({
+    hintTable[RHT_KF_GS_BEAN_PATCH] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider buried in a forest# holds", /*french*/"une #Skulltula enterrée dans la forêt# a", /*spanish*/"una #Skulltula enterrada en un bosque# otorga"},
   });
 
-    hintTable[KF_GS_KNOW_IT_ALL_HOUSE] = HintText::Exclude({
+    hintTable[RHT_KF_GS_KNOW_IT_ALL_HOUSE] = HintText::Exclude({
                        //obscure text
                        Text{"night in the past reveals a #spider in a forest# holding", /*french*/"une #Skulltula derrière une cabane de la forêt# a", /*spanish*/"la noche revela en el pasado una #Skulltula del bosque# que otorga"},
   });
 
-    hintTable[KF_GS_HOUSE_OF_TWINS] = HintText::Exclude({
+    hintTable[RHT_KF_GS_HOUSE_OF_TWINS] = HintText::Exclude({
                        //obscure text
                        Text{"night in the future reveals a #spider in a forest# holding", /*french*/"une #Skulltula sur une cabane de la forêt# a", /*spanish*/"la noche revela en el futuro una #Skulltula del rancho# que otorga"},
   });
 
 
-    hintTable[LW_GS_BEAN_PATCH_NEAR_BRIDGE] = HintText::Exclude({
+    hintTable[RHT_LW_GS_BEAN_PATCH_NEAR_BRIDGE] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider buried deep in a forest maze# holds", /*french*/"une #Skulltula enterrée dans les bois# a", /*spanish*/"una #Skulltula enterrada en un laberinto forestal# otorga"},
   });
 
-    hintTable[LW_GS_BEAN_PATCH_NEAR_THEATER] = HintText::Exclude({
+    hintTable[RHT_LW_GS_BEAN_PATCH_NEAR_THEATER] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider buried deep in a forest maze# holds", /*french*/"une #Skulltula enterrée dans les bois# a", /*spanish*/"una #Skulltula enterrada en un laberinto forestal# otorga"},
   });
 
-    hintTable[LW_GS_ABOVE_THEATER] = HintText::Exclude({
+    hintTable[RHT_LW_GS_ABOVE_THEATER] = HintText::Exclude({
                        //obscure text
                        Text{"night reveals a #spider deep in a forest maze# holding", /*french*/"une #Skulltula haut perchée dans les bois# a", /*spanish*/"la noche revela una #Skulltula del laberinto forestal# que otorga"},
   });
 
-    hintTable[SFM_GS] = HintText::Exclude({
+    hintTable[RHT_SFM_GS] = HintText::Exclude({
                        //obscure text
                        Text{"night reveals a #spider in a forest meadow# holding", /*french*/"une #Skulltula dans le sanctuaire des bois# a", /*spanish*/"la noche revela una #Skulltula de la pradera del bosque# que otorga"},
   });
 
 
-    hintTable[OGC_GS] = HintText::Exclude({
+    hintTable[RHT_OGC_GS] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider outside a tyrant's tower# holds", /*french*/"une #Skulltula parmi les ruines du château# a", /*spanish*/"una #Skulltula a las afueras de la torre de un tirano# otorga"},
   });
 
-    hintTable[HC_GS_TREE] = HintText::Exclude({
+    hintTable[RHT_HC_GS_TREE] = HintText::Exclude({
                        //obscure text
                        Text{"a spider hiding in a #tree outside of a castle# holds", /*french*/"une #Skulltula dans l'arbre près du château# a", /*spanish*/"una Skulltula escondida en el #árbol de las afueras de un castillo# otorga"},
   });
 
-    hintTable[MARKET_GS_GUARD_HOUSE] = HintText::Exclude({
+    hintTable[RHT_MARKET_GS_GUARD_HOUSE] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider in a guarded crate# holds", /*french*/"une #Skulltula dans une boîte en ville# a", /*spanish*/"una #Skulltula bajo una custodiada caja# otorga"},
   });
 
 
-    hintTable[DMC_GS_BEAN_PATCH] = HintText::Exclude({
+    hintTable[RHT_DMC_GS_BEAN_PATCH] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider buried in a volcano# holds", /*french*/"une #Skulltula enterrée dans un volcan# a", /*spanish*/"una #Skulltula enterrada en un volcán# otorga"},
   });
 
 
-    hintTable[DMT_GS_BEAN_PATCH] = HintText::Exclude({
+    hintTable[RHT_DMT_GS_BEAN_PATCH] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider buried outside a cavern# holds", /*french*/"une #Skulltula enterrée près d'une caverne# a", /*spanish*/"una #Skulltula enterrada a la entrada de una cueva# otorga"},
   });
 
-    hintTable[DMT_GS_NEAR_KAK] = HintText::Exclude({
+    hintTable[RHT_DMT_GS_NEAR_KAK] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider hidden in a mountain nook# holds", /*french*/"une #Skulltula cachée dans le flanc d'une montagne# a", /*spanish*/"una #Skulltula oculta en el rincón de la montaña# otorga"},
   });
 
-    hintTable[DMT_GS_ABOVE_DODONGOS_CAVERN] = HintText::Exclude({
+    hintTable[RHT_DMT_GS_ABOVE_DODONGOS_CAVERN] = HintText::Exclude({
                        //obscure text
                        Text{"the hammer reveals a #spider on a mountain# holding", /*french*/"une #Skulltula derrière un rocher massif près d'une caverne# a", /*spanish*/"el martillo revela #una Skulltula de la montaña# que otorga"},
   });
 
-    hintTable[DMT_GS_FALLING_ROCKS_PATH] = HintText::Exclude({
+    hintTable[RHT_DMT_GS_FALLING_ROCKS_PATH] = HintText::Exclude({
                        //obscure text
                        Text{"the hammer reveals a #spider on a mountain# holding", /*french*/"une #Skulltula derrière un rocher massif près du sommet d'un volcan# a", /*spanish*/"el martillo revela #una Skulltula de la montaña# que otorga"},
   });
 
 
-    hintTable[GC_GS_CENTER_PLATFORM] = HintText::Exclude({
+    hintTable[RHT_GC_GS_CENTER_PLATFORM] = HintText::Exclude({
                        //obscure text
                        Text{"a #suspended spider# in Goron City holds", /*french*/"une #Skulltula perchée dans le village Goron# a", /*spanish*/"una #Skulltula suspendida# en la Ciudad Goron otorga"},
   });
 
-    hintTable[GC_GS_BOULDER_MAZE] = HintText::Exclude({
+    hintTable[RHT_GC_GS_BOULDER_MAZE] = HintText::Exclude({
                        //obscure text
                        Text{"a spider in a #Goron City crate# holds", /*french*/"une #Skulltula dans une boîte du village Goron# a", /*spanish*/"una #Skulltula bajo una caja# de la Ciudad Goron otorga"},
   });
 
 
-    hintTable[KAK_GS_HOUSE_UNDER_CONSTRUCTION] = HintText::Exclude({
+    hintTable[RHT_KAK_GS_HOUSE_UNDER_CONSTRUCTION] = HintText::Exclude({
                        //obscure text
                        Text{"night in the past reveals a #spider in a town# holding", /*french*/"une #Skulltula dans le chantier de construction# a", /*spanish*/"la noche del pasado revela una #Skulltula del pueblo# que otorga"},
   });
 
-    hintTable[KAK_GS_SKULLTULA_HOUSE] = HintText::Exclude({
+    hintTable[RHT_KAK_GS_SKULLTULA_HOUSE] = HintText::Exclude({
                        //obscure text
                        Text{"night in the past reveals a #spider in a town# holding", /*french*/"une #Skulltula sur une maison maudite# a", /*spanish*/"la noche del pasado revela una #Skulltula del pueblo# que otorga"},
   });
 
-    hintTable[KAK_GS_GUARDS_HOUSE] = HintText::Exclude({
+    hintTable[RHT_KAK_GS_GUARDS_HOUSE] = HintText::Exclude({
                        //obscure text
                        Text{"night in the past reveals a #spider in a town# holding", /*french*/"une #Skulltula sur une maison de village# a", /*spanish*/"la noche del pasado revela una #Skulltula del pueblo# que otorga"},
   });
 
-    hintTable[KAK_GS_TREE] = HintText::Exclude({
+    hintTable[RHT_KAK_GS_TREE] = HintText::Exclude({
                        //obscure text
                        Text{"night in the past reveals a #spider in a town# holding", /*french*/"une #Skulltula dans un arbre de village# a", /*spanish*/"la noche del pasado revela una #Skulltula del pueblo# que otorga"},
   });
 
-    hintTable[KAK_GS_WATCHTOWER] = HintText::Exclude({
+    hintTable[RHT_KAK_GS_WATCHTOWER] = HintText::Exclude({
                        //obscure text
                        Text{"night in the past reveals a #spider in a town# holding", /*french*/"une #Skulltula sur une échelle dans un village# a", /*spanish*/"la noche del pasado revela una #Skulltula del pueblo# que otorga"},
   });
 
-    hintTable[KAK_GS_ABOVE_IMPAS_HOUSE] = HintText::Exclude({
+    hintTable[RHT_KAK_GS_ABOVE_IMPAS_HOUSE] = HintText::Exclude({
                        //obscure text
                        Text{"night in the future reveals a #spider in a town# holding", /*french*/"une #Skulltula au dessus d'une grande maison# a", /*spanish*/"la noche del futuro revela una #Skulltula del pueblo# que otorga"},
   });
 
 
-    hintTable[GRAVEYARD_GS_WALL] = HintText::Exclude({
+    hintTable[RHT_GRAVEYARD_GS_WALL] = HintText::Exclude({
                        //obscure text
                        Text{"night reveals a #spider in a graveyard# holding", /*french*/"une #Skulltula sur une façade du Cimetière# a", /*spanish*/"la noche revela una #Skulltula del cementerio# que otorga"},
   });
 
-    hintTable[GRAVEYARD_GS_BEAN_PATCH] = HintText::Exclude({
+    hintTable[RHT_GRAVEYARD_GS_BEAN_PATCH] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider buried in a graveyard# holds", /*french*/"une #Skulltula enterrée dans le Cimetière# a", /*spanish*/"una #Skulltula enterrada en el cementerio# otorga"},
   });
 
 
-    hintTable[ZR_GS_LADDER] = HintText::Exclude({
+    hintTable[RHT_ZR_GS_LADDER] = HintText::Exclude({
                        //obscure text
                        Text{"night in the past reveals a #spider in a river# holding", /*french*/"une #Skulltula sur une échelle près d'une cascade# a", /*spanish*/"la noche del pasado revela una #Skulltula del río# que otorga"},
   });
 
-    hintTable[ZR_GS_TREE] = HintText::Exclude({
+    hintTable[RHT_ZR_GS_TREE] = HintText::Exclude({
                        //obscure text
                        Text{"a spider hiding in a #tree by a river# holds", /*french*/"une #Skulltula dans un arbre près du fleuve# a", /*spanish*/"una Skulltula escondida en el #árbol de un río# otorga"},
   });
 
-    hintTable[ZR_GS_ABOVE_BRIDGE] = HintText::Exclude({
+    hintTable[RHT_ZR_GS_ABOVE_BRIDGE] = HintText::Exclude({
                        //obscure text
                        Text{"night in the future reveals a #spider in a river# holding", /*french*/"une #Skulltula sur une façade près d'une cascade# a", /*spanish*/"la noche del futuro revela una #Skulltula del río# que otorga"},
   });
 
-    hintTable[ZR_GS_NEAR_RAISED_GROTTOS] = HintText::Exclude({
+    hintTable[RHT_ZR_GS_NEAR_RAISED_GROTTOS] = HintText::Exclude({
                        //obscure text
                        Text{"night in the future reveals a #spider in a river# holding", /*french*/"une #Skulltula sur une façade près d'une grotte du fleuve# a", /*spanish*/"la noche del futuro revela una #Skulltula del río# que otorga"},
   });
 
 
-    hintTable[ZD_GS_FROZEN_WATERFALL] = HintText::Exclude({
+    hintTable[RHT_ZD_GS_FROZEN_WATERFALL] = HintText::Exclude({
                        //obscure text
                        Text{"night reveals a #spider by a frozen waterfall# holding", /*french*/"une #Skulltula près d'une cascade gelée# a", /*spanish*/"la noche revela una #Skulltula junto a una congelada cascada# que otorga"},
   });
 
-    hintTable[ZF_GS_ABOVE_THE_LOG] = HintText::Exclude({
+    hintTable[RHT_ZF_GS_ABOVE_THE_LOG] = HintText::Exclude({
                        //obscure text
                        Text{"night reveals a #spider near a deity# holding", /*french*/"une #Skulltula près du gardien aquatique# a", /*spanish*/"la noche revela una #Skulltula junto a cierta deidad# que otorga"},
   });
 
-    hintTable[ZF_GS_TREE] = HintText::Exclude({
+    hintTable[RHT_ZF_GS_TREE] = HintText::Exclude({
                        //obscure text
                        Text{"a spider hiding in a #tree near a deity# holds", /*french*/"une #Skulltula dans un arbre dans un réservoir# a", /*spanish*/"una Skulltula escondida en el #árbol junto a cierta deidad# otorga"},
   });
 
 
-    hintTable[LH_GS_BEAN_PATCH] = HintText::Exclude({
+    hintTable[RHT_LH_GS_BEAN_PATCH] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider buried by a lake# holds", /*french*/"une #Skulltula enterrée près d'un lac# a", /*spanish*/"una #Skulltula enterrada junto a un lago# otorga"},
   });
 
-    hintTable[LH_GS_SMALL_ISLAND] = HintText::Exclude({
+    hintTable[RHT_LH_GS_SMALL_ISLAND] = HintText::Exclude({
                        //obscure text
                        Text{"night reveals a #spider by a lake# holding", /*french*/"une #Skulltula sur un îlot du lac# a", /*spanish*/"la noche revela una #Skulltula junto a un lago# que otorga"},
   });
 
-    hintTable[LH_GS_LAB_WALL] = HintText::Exclude({
+    hintTable[RHT_LH_GS_LAB_WALL] = HintText::Exclude({
                        //obscure text
                        Text{"night reveals a #spider by a lake# holding", /*french*/"une #Skulltula sur le mur d'un centre de recherche# a", /*spanish*/"la noche revela una #Skulltula junto a un lago# que otorga"},
   });
 
-    hintTable[LH_GS_LAB_CRATE] = HintText::Exclude({
+    hintTable[RHT_LH_GS_LAB_CRATE] = HintText::Exclude({
                        //obscure text
                        Text{"a spider deed underwater in a #lab crate# holds", /*french*/"une #Skulltula dans une boîte au fond d'une cuve d'eau# a", /*spanish*/"una #Skulltula bajo la sumergida caja de un laboratorio# otorga"},
   });
 
-    hintTable[LH_GS_TREE] = HintText::Exclude({
+    hintTable[RHT_LH_GS_TREE] = HintText::Exclude({
                        //obscure text
                        Text{"night reveals a #spider by a lake high in a tree# holding", /*french*/"une #Skulltula dans un grand arbre du lac# a", /*spanish*/"la noche revela #una Skulltula del lago sobre un árbol# que otorga"},
   });
 
 
-    hintTable[GV_GS_BEAN_PATCH] = HintText::Exclude({
+    hintTable[RHT_GV_GS_BEAN_PATCH] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider buried in a valley# holds", /*french*/"une #Skulltula enterré dans une vallée# a", /*spanish*/"una #Skulltula enterrada en un valle# otorga"},
   });
 
-    hintTable[GV_GS_SMALL_BRIDGE] = HintText::Exclude({
+    hintTable[RHT_GV_GS_SMALL_BRIDGE] = HintText::Exclude({
                        //obscure text
                        Text{"night in the past reveals a #spider in a valley# holding", /*french*/"une #Skulltula au dessus d'une petite cascade# a", /*spanish*/"la noche del pasado revela una #Skulltula del valle# que otorga"},
   });
 
-    hintTable[GV_GS_PILLAR] = HintText::Exclude({
+    hintTable[RHT_GV_GS_PILLAR] = HintText::Exclude({
                        //obscure text
                        Text{"night in the future reveals a #spider in a valley# holding", /*french*/"une #Skulltula sur une arche de pierre dans une vallée# a", /*spanish*/"la noche del futuro revela una #Skulltula del valle# que otorga"},
   });
 
-    hintTable[GV_GS_BEHIND_TENT] = HintText::Exclude({
+    hintTable[RHT_GV_GS_BEHIND_TENT] = HintText::Exclude({
                        //obscure text
                        Text{"night in the future reveals a #spider in a valley# holding", /*french*/"une #Skulltula derrière une tente# a", /*spanish*/"la noche del futuro revela una #Skulltula del valle# que otorga"},
   });
 
 
-    hintTable[GF_GS_ARCHERY_RANGE] = HintText::Exclude({
+    hintTable[RHT_GF_GS_ARCHERY_RANGE] = HintText::Exclude({
                        //obscure text
                        Text{"night reveals a #spider in a fortress# holding", /*french*/"une #Skulltula sur une cible de tir# a", /*spanish*/"la noche revela una #Skulltula de una fortaleza# que otorga"},
   });
 
-    hintTable[GF_GS_TOP_FLOOR] = HintText::Exclude({
+    hintTable[RHT_GF_GS_TOP_FLOOR] = HintText::Exclude({
                        //obscure text
                        Text{"night reveals a #spider in a fortress# holding", /*french*/"une #Skulltula au sommet d'une forteresse# a", /*spanish*/"la noche revela una #Skulltula de una fortaleza# que otorga"},
   });
 
 
-    hintTable[COLOSSUS_GS_BEAN_PATCH] = HintText::Exclude({
+    hintTable[RHT_COLOSSUS_GS_BEAN_PATCH] = HintText::Exclude({
                        //obscure text
                        Text{"a #spider buried in the desert# holds", /*french*/"une #Skulltula enterrée au pied du colosse# a", /*spanish*/"una #Skulltula enterrada en el desierto# otorga"},
   });
 
-    hintTable[COLOSSUS_GS_HILL] = HintText::Exclude({
+    hintTable[RHT_COLOSSUS_GS_HILL] = HintText::Exclude({
                        //obscure text
                        Text{"night reveals a #spider deep in the desert# holding", /*french*/"une #Skulltula sur une colline dans le désert# a", /*spanish*/"la noche revela una #Skulltula en las profundidades del desierto# que otorga"},
   });
 
-    hintTable[COLOSSUS_GS_TREE] = HintText::Exclude({
+    hintTable[RHT_COLOSSUS_GS_TREE] = HintText::Exclude({
                        //obscure text
                        Text{"night reveals a #spider deep in the desert# holding", /*french*/"une #Skulltula dans un arbre du désert# a", /*spanish*/"la noche revela una #Skulltula en las profundidades del desierto# que otorga"},
   });
 
 
-    hintTable[KF_SHOP_ITEM_1] = HintText::Exclude({
+    hintTable[RHT_KF_SHOP_ITEM_1] = HintText::Exclude({
                        //obscure text
                        Text{"a #child shopkeeper# sells", /*french*/"la #boutique Kokiri# vend", /*spanish*/"un #joven dependiente# vende"},
   });
 
-    hintTable[KF_SHOP_ITEM_2] = HintText::Exclude({
+    hintTable[RHT_KF_SHOP_ITEM_2] = HintText::Exclude({
                        //obscure text
                        Text{"a #child shopkeeper# sells", /*french*/"la #boutique Kokiri# vend", /*spanish*/"un #joven dependiente# vende"},
   });
 
-    hintTable[KF_SHOP_ITEM_3] = HintText::Exclude({
+    hintTable[RHT_KF_SHOP_ITEM_3] = HintText::Exclude({
                        //obscure text
                        Text{"a #child shopkeeper# sells", /*french*/"la #boutique Kokiri# vend", /*spanish*/"un #joven dependiente# vende"},
   });
 
-    hintTable[KF_SHOP_ITEM_4] = HintText::Exclude({
+    hintTable[RHT_KF_SHOP_ITEM_4] = HintText::Exclude({
                        //obscure text
                        Text{"a #child shopkeeper# sells", /*french*/"la #boutique Kokiri# vend", /*spanish*/"un #joven dependiente# vende"},
   });
 
-    hintTable[KF_SHOP_ITEM_5] = HintText::Exclude({
+    hintTable[RHT_KF_SHOP_ITEM_5] = HintText::Exclude({
                        //obscure text
                        Text{"a #child shopkeeper# sells", /*french*/"la #boutique Kokiri# vend", /*spanish*/"un #joven dependiente# vende"},
   });
 
-    hintTable[KF_SHOP_ITEM_6] = HintText::Exclude({
+    hintTable[RHT_KF_SHOP_ITEM_6] = HintText::Exclude({
                        //obscure text
                        Text{"a #child shopkeeper# sells", /*french*/"la #boutique Kokiri# vend", /*spanish*/"un #joven dependiente# vende"},
   });
 
-    hintTable[KF_SHOP_ITEM_7] = HintText::Exclude({
+    hintTable[RHT_KF_SHOP_ITEM_7] = HintText::Exclude({
                        //obscure text
                        Text{"a #child shopkeeper# sells", /*french*/"la #boutique Kokiri# vend", /*spanish*/"un #joven dependiente# vende"},
   });
 
-    hintTable[KF_SHOP_ITEM_8] = HintText::Exclude({
+    hintTable[RHT_KF_SHOP_ITEM_8] = HintText::Exclude({
                        //obscure text
                        Text{"a #child shopkeeper# sells", /*french*/"la #boutique Kokiri# vend", /*spanish*/"un #joven dependiente# vende"},
   });
 
 
-    hintTable[KAK_POTION_SHOP_ITEM_1] = HintText::Exclude({
+    hintTable[RHT_KAK_POTION_SHOP_ITEM_1] = HintText::Exclude({
                        //obscure text
                        Text{"a #potion seller# offers", /*french*/"l'#apothicaire# vend", /*spanish*/"un #vendedor de pociones# ofrece"},
                      }, {},
@@ -857,7 +857,7 @@ void HintTable_Init_Exclude_Overworld() {
                        Text{"the #Kakariko Potion Shop# offers", /*french*/"l'#apothicaire de Kakariko# vend", /*spanish*/"la #tienda de pociones de Kakariko# ofrece"}
   );
 
-    hintTable[KAK_POTION_SHOP_ITEM_2] = HintText::Exclude({
+    hintTable[RHT_KAK_POTION_SHOP_ITEM_2] = HintText::Exclude({
                        //obscure text
                        Text{"a #potion seller# offers", /*french*/"l'#apothicaire# vend", /*spanish*/"un #vendedor de pociones# ofrece"},
                      }, {},
@@ -865,7 +865,7 @@ void HintTable_Init_Exclude_Overworld() {
                        Text{"the #Kakariko Potion Shop# offers", /*french*/"l'#apothicaire de Kakariko# vend", /*spanish*/"la #tienda de pociones de Kakariko# ofrece"}
   );
 
-    hintTable[KAK_POTION_SHOP_ITEM_3] = HintText::Exclude({
+    hintTable[RHT_KAK_POTION_SHOP_ITEM_3] = HintText::Exclude({
                        //obscure text
                        Text{"a #potion seller# offers", /*french*/"l'#apothicaire# vend", /*spanish*/"un #vendedor de pociones# ofrece"},
                      }, {},
@@ -873,7 +873,7 @@ void HintTable_Init_Exclude_Overworld() {
                        Text{"the #Kakariko Potion Shop# offers", /*french*/"l'#apothicaire de Kakariko# vend", /*spanish*/"la #tienda de pociones de Kakariko# ofrece"}
   );
 
-    hintTable[KAK_POTION_SHOP_ITEM_4] = HintText::Exclude({
+    hintTable[RHT_KAK_POTION_SHOP_ITEM_4] = HintText::Exclude({
                        //obscure text
                        Text{"a #potion seller# offers", /*french*/"l'#apothicaire# vend", /*spanish*/"un #vendedor de pociones# ofrece"},
                      }, {},
@@ -881,7 +881,7 @@ void HintTable_Init_Exclude_Overworld() {
                        Text{"the #Kakariko Potion Shop# offers", /*french*/"l'#apothicaire de Kakariko# vend", /*spanish*/"la #tienda de pociones de Kakariko# ofrece"}
   );
 
-    hintTable[KAK_POTION_SHOP_ITEM_5] = HintText::Exclude({
+    hintTable[RHT_KAK_POTION_SHOP_ITEM_5] = HintText::Exclude({
                        //obscure text
                        Text{"a #potion seller# offers", /*french*/"l'#apothicaire# vend", /*spanish*/"un #vendedor de pociones# ofrece"},
                      }, {},
@@ -889,7 +889,7 @@ void HintTable_Init_Exclude_Overworld() {
                        Text{"the #Kakariko Potion Shop# offers", /*french*/"l'#apothicaire de Kakariko# vend", /*spanish*/"la #tienda de pociones de Kakariko# ofrece"}
   );
 
-    hintTable[KAK_POTION_SHOP_ITEM_6] = HintText::Exclude({
+    hintTable[RHT_KAK_POTION_SHOP_ITEM_6] = HintText::Exclude({
                        //obscure text
                        Text{"a #potion seller# offers", /*french*/"l'#apothicaire# vend", /*spanish*/"un #vendedor de pociones# ofrece"},
                      }, {},
@@ -897,7 +897,7 @@ void HintTable_Init_Exclude_Overworld() {
                        Text{"the #Kakariko Potion Shop# offers", /*french*/"l'#apothicaire de Kakariko# vend", /*spanish*/"la #tienda de pociones de Kakariko# ofrece"}
   );
 
-    hintTable[KAK_POTION_SHOP_ITEM_7] = HintText::Exclude({
+    hintTable[RHT_KAK_POTION_SHOP_ITEM_7] = HintText::Exclude({
                        //obscure text
                        Text{"a #potion seller# offers", /*french*/"l'#apothicaire# vend", /*spanish*/"un #vendedor de pociones# ofrece"},
                      }, {},
@@ -905,7 +905,7 @@ void HintTable_Init_Exclude_Overworld() {
                        Text{"the #Kakariko Potion Shop# offers", /*french*/"l'#apothicaire de Kakariko# vend", /*spanish*/"la #tienda de pociones de Kakariko# ofrece"}
   );
 
-    hintTable[KAK_POTION_SHOP_ITEM_8] = HintText::Exclude({
+    hintTable[RHT_KAK_POTION_SHOP_ITEM_8] = HintText::Exclude({
                        //obscure text
                        Text{"a #potion seller# offers", /*french*/"l'#apothicaire# vend", /*spanish*/"un #vendedor de pociones# ofrece"},
                      }, {},
@@ -914,48 +914,48 @@ void HintTable_Init_Exclude_Overworld() {
   );
 
 
-    hintTable[MARKET_BOMBCHU_SHOP_ITEM_1] = HintText::Exclude({
+    hintTable[RHT_MARKET_BOMBCHU_SHOP_ITEM_1] = HintText::Exclude({
                        //obscure text
                        Text{"a #Bombchu merchant# sells", /*french*/"le #marchand de Missiles# vend", /*spanish*/"un #mercader de bombchus# vende"},
   });
 
-    hintTable[MARKET_BOMBCHU_SHOP_ITEM_2] = HintText::Exclude({
+    hintTable[RHT_MARKET_BOMBCHU_SHOP_ITEM_2] = HintText::Exclude({
                        //obscure text
                        Text{"a #Bombchu merchant# sells", /*french*/"le #marchand de Missiles# vend", /*spanish*/"un #mercader de bombchus# vende"},
   });
 
-    hintTable[MARKET_BOMBCHU_SHOP_ITEM_3] = HintText::Exclude({
+    hintTable[RHT_MARKET_BOMBCHU_SHOP_ITEM_3] = HintText::Exclude({
                        //obscure text
                        Text{"a #Bombchu merchant# sells", /*french*/"le #marchand de Missiles# vend", /*spanish*/"un #mercader de bombchus# vende"},
   });
 
-    hintTable[MARKET_BOMBCHU_SHOP_ITEM_4] = HintText::Exclude({
+    hintTable[RHT_MARKET_BOMBCHU_SHOP_ITEM_4] = HintText::Exclude({
                        //obscure text
                        Text{"a #Bombchu merchant# sells", /*french*/"le #marchand de Missiles# vend", /*spanish*/"un #mercader de bombchus# vende"},
   });
 
-    hintTable[MARKET_BOMBCHU_SHOP_ITEM_5] = HintText::Exclude({
+    hintTable[RHT_MARKET_BOMBCHU_SHOP_ITEM_5] = HintText::Exclude({
                        //obscure text
                        Text{"a #Bombchu merchant# sells", /*french*/"le #marchand de Missiles# vend", /*spanish*/"un #mercader de bombchus# vende"},
   });
 
-    hintTable[MARKET_BOMBCHU_SHOP_ITEM_6] = HintText::Exclude({
+    hintTable[RHT_MARKET_BOMBCHU_SHOP_ITEM_6] = HintText::Exclude({
                        //obscure text
                        Text{"a #Bombchu merchant# sells", /*french*/"le #marchand de Missiles# vend", /*spanish*/"un #mercader de bombchus# vende"},
   });
 
-    hintTable[MARKET_BOMBCHU_SHOP_ITEM_7] = HintText::Exclude({
+    hintTable[RHT_MARKET_BOMBCHU_SHOP_ITEM_7] = HintText::Exclude({
                        //obscure text
                        Text{"a #Bombchu merchant# sells", /*french*/"le #marchand de Missiles# vend", /*spanish*/"un #mercader de bombchus# vende"},
   });
 
-    hintTable[MARKET_BOMBCHU_SHOP_ITEM_8] = HintText::Exclude({
+    hintTable[RHT_MARKET_BOMBCHU_SHOP_ITEM_8] = HintText::Exclude({
                        //obscure text
                        Text{"a #Bombchu merchant# sells", /*french*/"le #marchand de Missiles# vend", /*spanish*/"un #mercader de bombchus# vende"},
   });
 
 
-    hintTable[MARKET_POTION_SHOP_ITEM_1] = HintText::Exclude({
+    hintTable[RHT_MARKET_POTION_SHOP_ITEM_1] = HintText::Exclude({
                        //obscure text
                        Text{"a #potion seller# offers", /*french*/"l'#apothicaire# vend", /*spanish*/"un #vendedor de pociones# ofrece"},
                      }, {},
@@ -963,7 +963,7 @@ void HintTable_Init_Exclude_Overworld() {
                        Text{"the #Market Potion Shop# offers", /*french*/"l'#apothicaire dans la Place du Marché# vend", /*spanish*/"la #tienda de pociones del mercado# ofrece"}
   );
 
-    hintTable[MARKET_POTION_SHOP_ITEM_2] = HintText::Exclude({
+    hintTable[RHT_MARKET_POTION_SHOP_ITEM_2] = HintText::Exclude({
                        //obscure text
                        Text{"a #potion seller# offers", /*french*/"l'#apothicaire# vend", /*spanish*/"un #vendedor de pociones# ofrece"},
                      }, {},
@@ -971,7 +971,7 @@ void HintTable_Init_Exclude_Overworld() {
                        Text{"the #Market Potion Shop# offers", /*french*/"l'#apothicaire dans la Place du Marché# vend", /*spanish*/"la #tienda de pociones del mercado# ofrece"}
   );
 
-    hintTable[MARKET_POTION_SHOP_ITEM_3] = HintText::Exclude({
+    hintTable[RHT_MARKET_POTION_SHOP_ITEM_3] = HintText::Exclude({
                        //obscure text
                        Text{"a #potion seller# offers", /*french*/"l'#apothicaire# vend", /*spanish*/"un #vendedor de pociones# ofrece"},
                      }, {},
@@ -979,7 +979,7 @@ void HintTable_Init_Exclude_Overworld() {
                        Text{"the #Market Potion Shop# offers", /*french*/"l'#apothicaire dans la Place du Marché# vend", /*spanish*/"la #tienda de pociones del mercado# ofrece"}
   );
 
-    hintTable[MARKET_POTION_SHOP_ITEM_4] = HintText::Exclude({
+    hintTable[RHT_MARKET_POTION_SHOP_ITEM_4] = HintText::Exclude({
                        //obscure text
                        Text{"a #potion seller# offers", /*french*/"l'#apothicaire# vend", /*spanish*/"un #vendedor de pociones# ofrece"},
                      }, {},
@@ -987,7 +987,7 @@ void HintTable_Init_Exclude_Overworld() {
                        Text{"the #Market Potion Shop# offers", /*french*/"l'#apothicaire dans la Place du Marché# vend", /*spanish*/"la #tienda de pociones del mercado# ofrece"}
   );
 
-    hintTable[MARKET_POTION_SHOP_ITEM_5] = HintText::Exclude({
+    hintTable[RHT_MARKET_POTION_SHOP_ITEM_5] = HintText::Exclude({
                        //obscure text
                        Text{"a #potion seller# offers", /*french*/"l'#apothicaire# vend", /*spanish*/"un #vendedor de pociones# ofrece"},
                      }, {},
@@ -995,7 +995,7 @@ void HintTable_Init_Exclude_Overworld() {
                        Text{"the #Market Potion Shop# offers", /*french*/"l'#apothicaire dans la Place du Marché# vend", /*spanish*/"la #tienda de pociones del mercado# ofrece"}
   );
 
-    hintTable[MARKET_POTION_SHOP_ITEM_6] = HintText::Exclude({
+    hintTable[RHT_MARKET_POTION_SHOP_ITEM_6] = HintText::Exclude({
                        //obscure text
                        Text{"a #potion seller# offers", /*french*/"l'#apothicaire# vend", /*spanish*/"un #vendedor de pociones# ofrece"},
                      }, {},
@@ -1003,7 +1003,7 @@ void HintTable_Init_Exclude_Overworld() {
                        Text{"the #Market Potion Shop# offers", /*french*/"l'#apothicaire dans la Place du Marché# vend", /*spanish*/"la #tienda de pociones del mercado# ofrece"}
   );
 
-    hintTable[MARKET_POTION_SHOP_ITEM_7] = HintText::Exclude({
+    hintTable[RHT_MARKET_POTION_SHOP_ITEM_7] = HintText::Exclude({
                        //obscure text
                        Text{"a #potion seller# offers", /*french*/"l'#apothicaire# vend", /*spanish*/"un #vendedor de pociones# ofrece"},
                      }, {},
@@ -1011,7 +1011,7 @@ void HintTable_Init_Exclude_Overworld() {
                        Text{"the #Market Potion Shop# offers", /*french*/"l'#apothicaire dans la Place du Marché# vend", /*spanish*/"la #tienda de pociones del mercado# ofrece"}
   );
 
-    hintTable[MARKET_POTION_SHOP_ITEM_8] = HintText::Exclude({
+    hintTable[RHT_MARKET_POTION_SHOP_ITEM_8] = HintText::Exclude({
                        //obscure text
                        Text{"a #potion seller# offers", /*french*/"l'#apothicaire# vend", /*spanish*/"un #vendedor de pociones# ofrece"},
                      }, {},
@@ -1020,335 +1020,335 @@ void HintTable_Init_Exclude_Overworld() {
   );
 
 
-    hintTable[MARKET_BAZAAR_ITEM_1] = HintText::Exclude({
+    hintTable[RHT_MARKET_BAZAAR_ITEM_1] = HintText::Exclude({
                        //obscure text
                        Text{"the #Market Bazaar# offers", /*french*/"le #bazar de la Place du Marché# vend", /*spanish*/"el #bazar del mercado# ofrece"},
   });
 
-    hintTable[MARKET_BAZAAR_ITEM_2] = HintText::Exclude({
+    hintTable[RHT_MARKET_BAZAAR_ITEM_2] = HintText::Exclude({
                        //obscure text
                        Text{"the #Market Bazaar# offers", /*french*/"le #bazar de la Place du Marché# vend", /*spanish*/"el #bazar del mercado# ofrece"},
   });
 
-    hintTable[MARKET_BAZAAR_ITEM_3] = HintText::Exclude({
+    hintTable[RHT_MARKET_BAZAAR_ITEM_3] = HintText::Exclude({
                        //obscure text
                        Text{"the #Market Bazaar# offers", /*french*/"le #bazar de la Place du Marché# vend", /*spanish*/"el #bazar del mercado# ofrece"},
   });
 
-    hintTable[MARKET_BAZAAR_ITEM_4] = HintText::Exclude({
+    hintTable[RHT_MARKET_BAZAAR_ITEM_4] = HintText::Exclude({
                        //obscure text
                        Text{"the #Market Bazaar# offers", /*french*/"le #bazar de la Place du Marché# vend", /*spanish*/"el #bazar del mercado# ofrece"},
   });
 
-    hintTable[MARKET_BAZAAR_ITEM_5] = HintText::Exclude({
+    hintTable[RHT_MARKET_BAZAAR_ITEM_5] = HintText::Exclude({
                        //obscure text
                        Text{"the #Market Bazaar# offers", /*french*/"le #bazar de la Place du Marché# vend", /*spanish*/"el #bazar del mercado# ofrece"},
   });
 
-    hintTable[MARKET_BAZAAR_ITEM_6] = HintText::Exclude({
+    hintTable[RHT_MARKET_BAZAAR_ITEM_6] = HintText::Exclude({
                        //obscure text
                        Text{"the #Market Bazaar# offers", /*french*/"le #bazar de la Place du Marché# vend", /*spanish*/"el #bazar del mercado# ofrece"},
   });
 
-    hintTable[MARKET_BAZAAR_ITEM_7] = HintText::Exclude({
+    hintTable[RHT_MARKET_BAZAAR_ITEM_7] = HintText::Exclude({
                        //obscure text
                        Text{"the #Market Bazaar# offers", /*french*/"le #bazar de la Place du Marché# vend", /*spanish*/"el #bazar del mercado# ofrece"},
   });
 
-    hintTable[MARKET_BAZAAR_ITEM_8] = HintText::Exclude({
+    hintTable[RHT_MARKET_BAZAAR_ITEM_8] = HintText::Exclude({
                        //obscure text
                        Text{"the #Market Bazaar# offers", /*french*/"le #bazar de la Place du Marché# vend", /*spanish*/"el #bazar del mercado# ofrece"},
   });
 
 
-    hintTable[KAK_BAZAAR_ITEM_1] = HintText::Exclude({
+    hintTable[RHT_KAK_BAZAAR_ITEM_1] = HintText::Exclude({
                        //obscure text
                        Text{"the #Kakariko Bazaar# offers", /*french*/"le #bazar de Kakariko# vend", /*spanish*/"el #bazar de Kakariko# ofrece"},
   });
 
-    hintTable[KAK_BAZAAR_ITEM_2] = HintText::Exclude({
+    hintTable[RHT_KAK_BAZAAR_ITEM_2] = HintText::Exclude({
                        //obscure text
                        Text{"the #Kakariko Bazaar# offers", /*french*/"le #bazar de Kakariko# vend", /*spanish*/"el #bazar de Kakariko# ofrece"},
   });
 
-    hintTable[KAK_BAZAAR_ITEM_3] = HintText::Exclude({
+    hintTable[RHT_KAK_BAZAAR_ITEM_3] = HintText::Exclude({
                        //obscure text
                        Text{"the #Kakariko Bazaar# offers", /*french*/"le #bazar de Kakariko# vend", /*spanish*/"el #bazar de Kakariko# ofrece"},
   });
 
-    hintTable[KAK_BAZAAR_ITEM_4] = HintText::Exclude({
+    hintTable[RHT_KAK_BAZAAR_ITEM_4] = HintText::Exclude({
                        //obscure text
                        Text{"the #Kakariko Bazaar# offers", /*french*/"le #bazar de Kakariko# vend", /*spanish*/"el #bazar de Kakariko# ofrece"},
   });
 
-    hintTable[KAK_BAZAAR_ITEM_5] = HintText::Exclude({
+    hintTable[RHT_KAK_BAZAAR_ITEM_5] = HintText::Exclude({
                        //obscure text
                        Text{"the #Kakariko Bazaar# offers", /*french*/"le #bazar de Kakariko# vend", /*spanish*/"el #bazar de Kakariko# ofrece"},
   });
 
-    hintTable[KAK_BAZAAR_ITEM_6] = HintText::Exclude({
+    hintTable[RHT_KAK_BAZAAR_ITEM_6] = HintText::Exclude({
                        //obscure text
                        Text{"the #Kakariko Bazaar# offers", /*french*/"le #bazar de Kakariko# vend", /*spanish*/"el #bazar de Kakariko# ofrece"},
   });
 
-    hintTable[KAK_BAZAAR_ITEM_7] = HintText::Exclude({
+    hintTable[RHT_KAK_BAZAAR_ITEM_7] = HintText::Exclude({
                        //obscure text
                        Text{"the #Kakariko Bazaar# offers", /*french*/"le #bazar de Kakariko# vend", /*spanish*/"el #bazar de Kakariko# ofrece"},
   });
 
-    hintTable[KAK_BAZAAR_ITEM_8] = HintText::Exclude({
+    hintTable[RHT_KAK_BAZAAR_ITEM_8] = HintText::Exclude({
                        //obscure text
                        Text{"the #Kakariko Bazaar# offers", /*french*/"le #bazar de Kakariko# vend", /*spanish*/"el #bazar de Kakariko# ofrece"},
   });
 
 
-    hintTable[ZD_SHOP_ITEM_1] = HintText::Exclude({
+    hintTable[RHT_ZD_SHOP_ITEM_1] = HintText::Exclude({
                        //obscure text
                        Text{"a #Zora shopkeeper# sells", /*french*/"la #boutique Zora# vend", /*spanish*/"el #dependiente Zora# vende"},
   });
 
-    hintTable[ZD_SHOP_ITEM_2] = HintText::Exclude({
+    hintTable[RHT_ZD_SHOP_ITEM_2] = HintText::Exclude({
                        //obscure text
                        Text{"a #Zora shopkeeper# sells", /*french*/"la #boutique Zora# vend", /*spanish*/"el #dependiente Zora# vende"},
   });
 
-    hintTable[ZD_SHOP_ITEM_3] = HintText::Exclude({
+    hintTable[RHT_ZD_SHOP_ITEM_3] = HintText::Exclude({
                        //obscure text
                        Text{"a #Zora shopkeeper# sells", /*french*/"la #boutique Zora# vend", /*spanish*/"el #dependiente Zora# vende"},
   });
 
-    hintTable[ZD_SHOP_ITEM_4] = HintText::Exclude({
+    hintTable[RHT_ZD_SHOP_ITEM_4] = HintText::Exclude({
                        //obscure text
                        Text{"a #Zora shopkeeper# sells", /*french*/"la #boutique Zora# vend", /*spanish*/"el #dependiente Zora# vende"},
   });
 
-    hintTable[ZD_SHOP_ITEM_5] = HintText::Exclude({
+    hintTable[RHT_ZD_SHOP_ITEM_5] = HintText::Exclude({
                        //obscure text
                        Text{"a #Zora shopkeeper# sells", /*french*/"la #boutique Zora# vend", /*spanish*/"el #dependiente Zora# vende"},
   });
 
-    hintTable[ZD_SHOP_ITEM_6] = HintText::Exclude({
+    hintTable[RHT_ZD_SHOP_ITEM_6] = HintText::Exclude({
                        //obscure text
                        Text{"a #Zora shopkeeper# sells", /*french*/"la #boutique Zora# vend", /*spanish*/"el #dependiente Zora# vende"},
   });
 
-    hintTable[ZD_SHOP_ITEM_7] = HintText::Exclude({
+    hintTable[RHT_ZD_SHOP_ITEM_7] = HintText::Exclude({
                        //obscure text
                        Text{"a #Zora shopkeeper# sells", /*french*/"la #boutique Zora# vend", /*spanish*/"el #dependiente Zora# vende"},
   });
 
-    hintTable[ZD_SHOP_ITEM_8] = HintText::Exclude({
+    hintTable[RHT_ZD_SHOP_ITEM_8] = HintText::Exclude({
                        //obscure text
                        Text{"a #Zora shopkeeper# sells", /*french*/"la #boutique Zora# vend", /*spanish*/"el #dependiente Zora# vende"},
   });
 
 
-    hintTable[GC_SHOP_ITEM_1] = HintText::Exclude({
+    hintTable[RHT_GC_SHOP_ITEM_1] = HintText::Exclude({
                        //obscure text
                        Text{"a #Goron shopkeeper# sells", /*french*/"la #boutique Goron# vend", /*spanish*/"el #dependiente Goron# vende"},
   });
 
-    hintTable[GC_SHOP_ITEM_2] = HintText::Exclude({
+    hintTable[RHT_GC_SHOP_ITEM_2] = HintText::Exclude({
                        //obscure text
                        Text{"a #Goron shopkeeper# sells", /*french*/"la #boutique Goron# vend", /*spanish*/"el #dependiente Goron# vende"},
   });
 
-    hintTable[GC_SHOP_ITEM_3] = HintText::Exclude({
+    hintTable[RHT_GC_SHOP_ITEM_3] = HintText::Exclude({
                        //obscure text
                        Text{"a #Goron shopkeeper# sells", /*french*/"la #boutique Goron# vend", /*spanish*/"el #dependiente Goron# vende"},
   });
 
-    hintTable[GC_SHOP_ITEM_4] = HintText::Exclude({
+    hintTable[RHT_GC_SHOP_ITEM_4] = HintText::Exclude({
                        //obscure text
                        Text{"a #Goron shopkeeper# sells", /*french*/"la #boutique Goron# vend", /*spanish*/"el #dependiente Goron# vende"},
   });
 
-    hintTable[GC_SHOP_ITEM_5] = HintText::Exclude({
+    hintTable[RHT_GC_SHOP_ITEM_5] = HintText::Exclude({
                        //obscure text
                        Text{"a #Goron shopkeeper# sells", /*french*/"la #boutique Goron# vend", /*spanish*/"el #dependiente Goron# vende"},
   });
 
-    hintTable[GC_SHOP_ITEM_6] = HintText::Exclude({
+    hintTable[RHT_GC_SHOP_ITEM_6] = HintText::Exclude({
                        //obscure text
                        Text{"a #Goron shopkeeper# sells", /*french*/"la #boutique Goron# vend", /*spanish*/"el #dependiente Goron# vende"},
   });
 
-    hintTable[GC_SHOP_ITEM_7] = HintText::Exclude({
+    hintTable[RHT_GC_SHOP_ITEM_7] = HintText::Exclude({
                        //obscure text
                        Text{"a #Goron shopkeeper# sells", /*french*/"la #boutique Goron# vend", /*spanish*/"el #dependiente Goron# vende"},
   });
 
-    hintTable[GC_SHOP_ITEM_8] = HintText::Exclude({
+    hintTable[RHT_GC_SHOP_ITEM_8] = HintText::Exclude({
                        //obscure text
                        Text{"a #Goron shopkeeper# sells", /*french*/"la #boutique Goron# vend", /*spanish*/"el #dependiente Goron# vende"},
   });
 
 
-    hintTable[HF_DEKU_SCRUB_GROTTO] = HintText::Exclude({
+    hintTable[RHT_HF_DEKU_SCRUB_GROTTO] = HintText::Exclude({
                        //obscure text
                        Text{"a lonely #scrub in a hole# sells", /*french*/"la #peste Mojo dans une grotte de la plaine# vend", /*spanish*/"un #singular deku bajo un hoyo# de la llanura vende"},
   });
 
-    hintTable[LLR_DEKU_SCRUB_GROTTO_LEFT] = HintText::Exclude({
+    hintTable[RHT_LLR_DEKU_SCRUB_GROTTO_LEFT] = HintText::Exclude({
                        //obscure text
                        Text{"a #trio of scrubs# sells", /*french*/"le #trio de peste Mojo à la ferme# vend", /*spanish*/"un #trío de dekus# de una granja venden"},
   });
 
-    hintTable[LLR_DEKU_SCRUB_GROTTO_RIGHT] = HintText::Exclude({
+    hintTable[RHT_LLR_DEKU_SCRUB_GROTTO_RIGHT] = HintText::Exclude({
                        //obscure text
                        Text{"a #trio of scrubs# sells", /*french*/"le #trio de peste Mojo à la ferme# vend", /*spanish*/"un #trío de dekus# de una granja venden"},
   });
 
-    hintTable[LLR_DEKU_SCRUB_GROTTO_CENTER] = HintText::Exclude({
+    hintTable[RHT_LLR_DEKU_SCRUB_GROTTO_CENTER] = HintText::Exclude({
                        //obscure text
                        Text{"a #trio of scrubs# sells", /*french*/"le #trio de peste Mojo à la ferme# vend", /*spanish*/"un #trío de dekus# de una granja venden"},
   });
 
 
-    hintTable[LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT] = HintText::Exclude({
+    hintTable[RHT_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT] = HintText::Exclude({
                        //obscure text
                        Text{"a pair of #scrubs in the woods# sells", /*french*/"le #duo de peste Mojo près du théâtre# vend", /*spanish*/"un par de #dekus del bosque# venden"},
   });
 
-    hintTable[LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT] = HintText::Exclude({
+    hintTable[RHT_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT] = HintText::Exclude({
                        //obscure text
                        Text{"a pair of #scrubs in the woods# sells", /*french*/"le #duo de peste Mojo près du théâtre# vend", /*spanish*/"un par de #dekus del bosque# venden"},
   });
 
-    hintTable[LW_DEKU_SCRUB_NEAR_BRIDGE] = HintText::Exclude({
+    hintTable[RHT_LW_DEKU_SCRUB_NEAR_BRIDGE] = HintText::Exclude({
                        //obscure text
                        Text{"a #scrub by a bridge# sells", /*french*/"la #peste Mojo près du pont dans les bois# vend", /*spanish*/"un #deku bajo un puente# del bosque venden"},
   });
 
-    hintTable[LW_DEKU_SCRUB_GROTTO_REAR] = HintText::Exclude({
+    hintTable[RHT_LW_DEKU_SCRUB_GROTTO_REAR] = HintText::Exclude({
                        //obscure text
                        Text{"a #scrub underground duo# sells", /*french*/"le #duo de peste Mojo dans les sous-bois# vend", /*spanish*/"un #par de dekus subterráneos# del bosque venden"},
   });
 
-    hintTable[LW_DEKU_SCRUB_GROTTO_FRONT] = HintText::Exclude({
+    hintTable[RHT_LW_DEKU_SCRUB_GROTTO_FRONT] = HintText::Exclude({
                        //obscure text
                        Text{"a #scrub underground duo# sells", /*french*/"le #duo de peste Mojo dans les sous-bois# vend", /*spanish*/"un #par de dekus subterráneos# del bosque venden"},
   });
 
 
-    hintTable[SFM_DEKU_SCRUB_GROTTO_REAR] = HintText::Exclude({
+    hintTable[RHT_SFM_DEKU_SCRUB_GROTTO_REAR] = HintText::Exclude({
                        //obscure text
                        Text{"a #scrub underground duo# sells", /*french*/"le #duo de peste Mojo au cœur du sanctuaire sylvestre# vend", /*spanish*/"un #par de dekus subterráneos# de la pradera sagrada venden"},
   });
 
-    hintTable[SFM_DEKU_SCRUB_GROTTO_FRONT] = HintText::Exclude({
+    hintTable[RHT_SFM_DEKU_SCRUB_GROTTO_FRONT] = HintText::Exclude({
                        //obscure text
                        Text{"a #scrub underground duo# sells", /*french*/"le #duo de peste Mojo au cœur du sanctuaire sylvestre# vend", /*spanish*/"un #par de dekus subterráneos# de la pradera sagrada venden"},
   });
 
 
-    hintTable[GC_DEKU_SCRUB_GROTTO_LEFT] = HintText::Exclude({
+    hintTable[RHT_GC_DEKU_SCRUB_GROTTO_LEFT] = HintText::Exclude({
                        //obscure text
                        Text{"a #trio of scrubs# sells", /*french*/"le #trio de peste Mojo dans le village Goron# vend", /*spanish*/"un #trío de dekus# de la Ciudad Goron venden"},
   });
 
-    hintTable[GC_DEKU_SCRUB_GROTTO_RIGHT] = HintText::Exclude({
+    hintTable[RHT_GC_DEKU_SCRUB_GROTTO_RIGHT] = HintText::Exclude({
                        //obscure text
                        Text{"a #trio of scrubs# sells", /*french*/"le #trio de peste Mojo dans le village Goron# vend", /*spanish*/"un #trío de dekus# de la Ciudad Goron venden"},
   });
 
-    hintTable[GC_DEKU_SCRUB_GROTTO_CENTER] = HintText::Exclude({
+    hintTable[RHT_GC_DEKU_SCRUB_GROTTO_CENTER] = HintText::Exclude({
                        //obscure text
                        Text{"a #trio of scrubs# sells", /*french*/"le #trio de peste Mojo dans le village Goron# vend", /*spanish*/"un #trío de dekus# de la Ciudad Goron venden"},
   });
 
 
-    hintTable[DMC_DEKU_SCRUB_GROTTO_LEFT] = HintText::Exclude({
+    hintTable[RHT_DMC_DEKU_SCRUB_GROTTO_LEFT] = HintText::Exclude({
                        //obscure text
                        Text{"a #trio of scrubs# sells", /*french*/"le #trio de peste Mojo dans le volcan# vend", /*spanish*/"un #trío de dekus# del volcán venden"},
   });
 
-    hintTable[DMC_DEKU_SCRUB_GROTTO_RIGHT] = HintText::Exclude({
+    hintTable[RHT_DMC_DEKU_SCRUB_GROTTO_RIGHT] = HintText::Exclude({
                        //obscure text
                        Text{"a #trio of scrubs# sells", /*french*/"le #trio de peste Mojo dans le volcan# vend", /*spanish*/"un #trío de dekus# del volcán venden"},
   });
 
-    hintTable[DMC_DEKU_SCRUB_GROTTO_CENTER] = HintText::Exclude({
+    hintTable[RHT_DMC_DEKU_SCRUB_GROTTO_CENTER] = HintText::Exclude({
                        //obscure text
                        Text{"a #trio of scrubs# sells", /*french*/"le #trio de peste Mojo dans le volcan# vend", /*spanish*/"un #trío de dekus# del volcán venden"},
   });
 
 
-    hintTable[ZR_DEKU_SCRUB_GROTTO_REAR] = HintText::Exclude({
+    hintTable[RHT_ZR_DEKU_SCRUB_GROTTO_REAR] = HintText::Exclude({
                        //obscure text
                        Text{"a #scrub underground duo# sells", /*french*/"le #duo de peste Mojo près du fleuve# vend", /*spanish*/"un #par de dekus subterráneos# del río venden"},
   });
 
-    hintTable[ZR_DEKU_SCRUB_GROTTO_FRONT] = HintText::Exclude({
+    hintTable[RHT_ZR_DEKU_SCRUB_GROTTO_FRONT] = HintText::Exclude({
                        //obscure text
                        Text{"a #scrub underground duo# sells", /*french*/"le #duo de peste Mojo près du fleuve# vend", /*spanish*/"un #par de dekus subterráneos# del río venden"},
   });
 
 
-    hintTable[LH_DEKU_SCRUB_GROTTO_LEFT] = HintText::Exclude({
+    hintTable[RHT_LH_DEKU_SCRUB_GROTTO_LEFT] = HintText::Exclude({
                        //obscure text
                        Text{"a #trio of scrubs# sells", /*french*/"le #trio de peste Mojo près du lac# vend", /*spanish*/"un #trío de dekus# del lago venden"},
   });
 
-    hintTable[LH_DEKU_SCRUB_GROTTO_RIGHT] = HintText::Exclude({
+    hintTable[RHT_LH_DEKU_SCRUB_GROTTO_RIGHT] = HintText::Exclude({
                        //obscure text
                        Text{"a #trio of scrubs# sells", /*french*/"le #trio de peste Mojo près du lac# vend", /*spanish*/"un #trío de dekus# del lago venden"},
   });
 
-    hintTable[LH_DEKU_SCRUB_GROTTO_CENTER] = HintText::Exclude({
+    hintTable[RHT_LH_DEKU_SCRUB_GROTTO_CENTER] = HintText::Exclude({
                        //obscure text
                        Text{"a #trio of scrubs# sells", /*french*/"le #trio de peste Mojo près du lac# vend", /*spanish*/"un #trío de dekus# del lago venden"},
   });
 
 
-    hintTable[GV_DEKU_SCRUB_GROTTO_REAR] = HintText::Exclude({
+    hintTable[RHT_GV_DEKU_SCRUB_GROTTO_REAR] = HintText::Exclude({
                        //obscure text
                        Text{"a #scrub underground duo# sells", /*french*/"le #duo de peste Mojo près de la vallée# vend", /*spanish*/"un #par de dekus subterráneos# del valle venden"},
   });
 
-    hintTable[GV_DEKU_SCRUB_GROTTO_FRONT] = HintText::Exclude({
+    hintTable[RHT_GV_DEKU_SCRUB_GROTTO_FRONT] = HintText::Exclude({
                        //obscure text
                        Text{"a #scrub underground duo# sells", /*french*/"le #duo de peste Mojo près de la vallée# vend", /*spanish*/"un #par de dekus subterráneos# del valle venden"},
   });
 
 
-    hintTable[COLOSSUS_DEKU_SCRUB_GROTTO_FRONT] = HintText::Exclude({
+    hintTable[RHT_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT] = HintText::Exclude({
                        //obscure text
                        Text{"a #scrub underground duo# sells", /*french*/"le #duo de peste Mojo dans le désert# vend", /*spanish*/"un #par de dekus subterráneos# del desierto venden"},
   });
 
-    hintTable[COLOSSUS_DEKU_SCRUB_GROTTO_REAR] = HintText::Exclude({
+    hintTable[RHT_COLOSSUS_DEKU_SCRUB_GROTTO_REAR] = HintText::Exclude({
                        //obscure text
                        Text{"a #scrub underground duo# sells", /*french*/"le #duo de peste Mojo dans le désert# vend", /*spanish*/"un #par de dekus subterráneos# del desierto venden"},
   });
 
 
-    hintTable[LLR_STABLES_LEFT_COW] = HintText::Exclude({
+    hintTable[RHT_LLR_STABLES_LEFT_COW] = HintText::Exclude({
                        //obscure text
                        Text{"a #cow in a stable# gifts", /*french*/"la #vache dans l'étable# donne", /*spanish*/"una #vaca del establo# brinda"},
   });
 
-    hintTable[LLR_STABLES_RIGHT_COW] = HintText::Exclude({
+    hintTable[RHT_LLR_STABLES_RIGHT_COW] = HintText::Exclude({
                        //obscure text
                        Text{"a #cow in a stable# gifts", /*french*/"la #vache dans l'étable# donne", /*spanish*/"una #vaca del establo# brinda"},
   });
 
-    hintTable[LLR_TOWER_RIGHT_COW] = HintText::Exclude({
+    hintTable[RHT_LLR_TOWER_RIGHT_COW] = HintText::Exclude({
                        //obscure text
                        Text{"a #cow in a ranch silo# gifts", /*french*/"la #vache dans le silo de la ferme# donne", /*spanish*/"una #vaca del granero# brinda"},
   });
 
-    hintTable[LLR_TOWER_LEFT_COW] = HintText::Exclude({
+    hintTable[RHT_LLR_TOWER_LEFT_COW] = HintText::Exclude({
                        //obscure text
                        Text{"a #cow in a ranch silo# gifts", /*french*/"la #vache dans le silo de la ferme# donne", /*spanish*/"una #vaca del granero# brinda"},
   });
 
-    hintTable[KAK_IMPAS_HOUSE_COW] = HintText::Exclude({
+    hintTable[RHT_KAK_IMPAS_HOUSE_COW] = HintText::Exclude({
                        //obscure text
                        Text{"a #cow imprisoned in a house# protects", /*french*/"la #vache en cage# donne", /*spanish*/"una #vaca enjaulada de una casa# brinda"},
   });
 
-    hintTable[DMT_COW_GROTTO_COW] = HintText::Exclude({
+    hintTable[RHT_DMT_COW_GROTTO_COW] = HintText::Exclude({
                        //obscure text
                        Text{"a #cow in a luxurious hole# offers", /*french*/"la #vache dans une grotte luxueuse# donne", /*spanish*/"una #vaca de un lujoso hoyo# brinda"},
   });
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp
index 9b9913c8c..efe4a9424 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp
@@ -1,7 +1,7 @@
 #include "../hint_list.hpp"
 
 void HintTable_Init_Item() {
-    hintTable[KOKIRI_SWORD] = HintText::Item({
+    hintTable[RHT_KOKIRI_SWORD] = HintText::Item({
                        //obscure text
                        Text{"a butter knife",    /*french*/"un couteau à beurre",  /*spanish*/"un ágil puñal"},
                        Text{"a starter slasher", /*french*/"une arme de débutant", /*spanish*/"una hoja de principiantes"},
@@ -14,7 +14,7 @@ void HintTable_Init_Item() {
                        Text{"the Kokiri Sword", /*french*/"l'Épée Kokiri", /*spanish*/"la Espada Kokiri"}
     );
 
-    hintTable[MASTER_SWORD] = HintText::Item({
+    hintTable[RHT_MASTER_SWORD] = HintText::Item({
                        //obscure text
                        Text{"evil's bane",        /*french*/"le fléau du mal",       /*spanish*/"la destructora del mal"},
                        Text{"a seven year limbo", /*french*/"une stase de sept ans",  /*spanish*/"unos siete años de espera"},
@@ -26,7 +26,7 @@ void HintTable_Init_Item() {
                        Text{"the Master Sword", /*french*/"l'Épée de Légende", /*spanish*/"la Espada Maestra"}
     );
 
-    hintTable[GIANTS_KNIFE] = HintText::Item({
+    hintTable[RHT_GIANTS_KNIFE] = HintText::Item({
                        //obscure text
                        Text{"a fragile blade",     /*french*/"une lame fragile",    /*spanish*/"una frágil hoja"},
                        Text{"a breakable cleaver", /*french*/"un espadon de verre", /*spanish*/"un rompible acero"},
@@ -38,7 +38,7 @@ void HintTable_Init_Item() {
                        Text{"the Giant's Knife", /*french*/"la Lame des Géants", /*spanish*/"la daga gigante"}
     );
 
-    hintTable[BIGGORON_SWORD] = HintText::Item({
+    hintTable[RHT_BIGGORON_SWORD] = HintText::Item({
                        //obscure text
                        Text{"the biggest blade",  /*french*/"une lame gigantesque", /*spanish*/"el mayor mandoble"},
                        Text{"a colossal cleaver", /*french*/"un espadon colossal",  /*spanish*/"un estoque colosal"},
@@ -50,7 +50,7 @@ void HintTable_Init_Item() {
                        Text{"the Biggoron Sword", /*french*/"l'Épée de Biggoron", /*spanish*/"la Espada de Biggoron"}
     );
 
-    hintTable[DEKU_SHIELD] = HintText::Item({
+    hintTable[RHT_DEKU_SHIELD] = HintText::Item({
                        //obscure text
                        Text{"a wooden ward",      /*french*/"un écu d'écorce",            /*spanish*/"una protección del bosque"},
                        Text{"a burnable barrier", /*french*/"une protection inflammable", /*spanish*/"una barrera quemable"},
@@ -62,7 +62,7 @@ void HintTable_Init_Item() {
                        Text{"a Deku Shield", /*french*/"un Bouclier Mojo", /*spanish*/"un escudo deku"}
     );
 
-    hintTable[HYLIAN_SHIELD] = HintText::Item({
+    hintTable[RHT_HYLIAN_SHIELD] = HintText::Item({
                        //obscure text
                        Text{"a steel safeguard",      /*french*/"une carapace d'acier",       /*spanish*/"una protección de acero"},
                        Text{"Like Like's metal meal", /*french*/"un amuse-gueule de Pudding", /*spanish*/"un alimento de Like Like"},
@@ -74,7 +74,7 @@ void HintTable_Init_Item() {
                        Text{"a Hylian Shield", /*french*/"un Bouclier Hylien", /*spanish*/"un escudo hyliano"}
     );
 
-    hintTable[MIRROR_SHIELD] = HintText::Item({
+    hintTable[RHT_MIRROR_SHIELD] = HintText::Item({
                        //obscure text
                        Text{"a reflective rampart", /*french*/"un capteur de lumière",   /*spanish*/"una muralla reflectora"},
                        Text{"Medusa's weakness",    /*french*/"la faiblesse de Méduse", /*spanish*/"la debilidad de Medusa"},
@@ -87,7 +87,7 @@ void HintTable_Init_Item() {
                        Text{"the Mirror Shield", /*french*/"le Bouclier Miroir", /*spanish*/"el escudo espejo"}
     );
 
-    hintTable[GORON_TUNIC] = HintText::Item({
+    hintTable[RHT_GORON_TUNIC] = HintText::Item({
                        //obscure text
                        Text{"ruby robes",       /*french*/"un pigment rouge",      /*spanish*/"una vestimenta rubí"},
                        Text{"fireproof fabric", /*french*/"un trésor anti-flamme", /*spanish*/"una ignífuga prenda"},
@@ -100,7 +100,7 @@ void HintTable_Init_Item() {
                        Text{"a Goron Tunic", /*french*/"une Tunique Goron", /*spanish*/"un sayo goron"}
     );
 
-    hintTable[ZORA_TUNIC] = HintText::Item({
+    hintTable[RHT_ZORA_TUNIC] = HintText::Item({
                        //obscure text
                        Text{"a sapphire suit", /*french*/"un pigment bleuté",      /*spanish*/"una vestidura zafiro"},
                        Text{"scuba gear",      /*french*/"un habit de plongée",    /*spanish*/"un traje impermeable"},
@@ -114,7 +114,7 @@ void HintTable_Init_Item() {
                        Text{"a Zora Tunic", /*french*/"une Tunique Zora", /*spanish*/"un sayo zora"}
     );
 
-    hintTable[IRON_BOOTS] = HintText::Item({
+    hintTable[RHT_IRON_BOOTS] = HintText::Item({
                        //obscure text
                        Text{"sink shoes",   /*french*/"un boulet de fer", /*spanish*/"un calzado de las profundidades"},
                        Text{"clank cleats", /*french*/"une paire de talons bruyants", /*spanish*/"unas suelas férreas"},
@@ -128,7 +128,7 @@ void HintTable_Init_Item() {
                        Text{"the Iron Boots", /*french*/"une paire de Bottes de plomb", /*spanish*/"las botas de hierro"}
     );
 
-    hintTable[HOVER_BOOTS] = HintText::Item({
+    hintTable[RHT_HOVER_BOOTS] = HintText::Item({
                        //obscure text
                        Text{"butter boots",    /*french*/"une paire de patins de beurre",   /*spanish*/"unas suelas resvaladizas"},
                        Text{"sacred slippers", /*french*/"une paire de pantoufles sacrées", /*spanish*/"unos escurridizos botines"},
@@ -142,7 +142,7 @@ void HintTable_Init_Item() {
     );
 
 
-    hintTable[ZELDAS_LETTER] = HintText::Item({
+    hintTable[RHT_ZELDAS_LETTER] = HintText::Item({
                        //obscure text
                        Text{"an autograph",     /*french*/"un autographe",        /*spanish*/"un autógrafo"},
                        Text{"royal stationery", /*french*/"du papier royal",      /*spanish*/"un escrito real"},
@@ -152,7 +152,7 @@ void HintTable_Init_Item() {
                        Text{"Zelda's Letter", /*french*/"la Lettre de Zelda", /*spanish*/"la carta de Zelda"}
     );
 
-    hintTable[WEIRD_EGG] = HintText::Item({
+    hintTable[RHT_WEIRD_EGG] = HintText::Item({
                        //obscure text
                        Text{"a chicken dilemma", /*french*/"un drôle d'ovale", /*spanish*/"el dilema de la gallina"},
                      }, {
@@ -163,7 +163,7 @@ void HintTable_Init_Item() {
                        Text{"the Weird Egg", /*french*/"l'Oeuf Curieux", /*spanish*/"el huevo extraño"}
     );
 
-    hintTable[BOOMERANG] = HintText::Item({
+    hintTable[RHT_BOOMERANG] = HintText::Item({
                        //obscure text
                        Text{"a banana",       /*french*/"une banane",            /*spanish*/"un plátano"},
                        Text{"a stun stick",   /*french*/"un bâton étourdissant", /*spanish*/"un palo aturdidor"},
@@ -177,7 +177,7 @@ void HintTable_Init_Item() {
                        Text{"the Boomerang", /*french*/"le Boomerang", /*spanish*/"el bumerán"}
     );
 
-    hintTable[LENS_OF_TRUTH] = HintText::Item({
+    hintTable[RHT_LENS_OF_TRUTH] = HintText::Item({
                        //obscure text
                        Text{"a lie detector",     /*french*/"un détecteur de mensonges", /*spanish*/"el detector de ilusiones"},
                        Text{"a ghost tracker",    /*french*/"un trouve-fantôme",         /*spanish*/"el rastreador paranormal"},
@@ -191,7 +191,7 @@ void HintTable_Init_Item() {
                        Text{"the Lens of Truth", /*french*/"le Monocle de Vérité", /*spanish*/"la Lupa de la Verdad"}
     );
 
-    hintTable[MEGATON_HAMMER] = HintText::Item({
+    hintTable[RHT_MEGATON_HAMMER] = HintText::Item({
                        //obscure text
                        Text{"the dragon smasher", /*french*/"le tueur de dragons",     /*spanish*/"un destructor de dragones"},
                        Text{"the metal mallet",   /*french*/"un outil de construction", /*spanish*/"un mazo de metal"},
@@ -204,7 +204,7 @@ void HintTable_Init_Item() {
                        Text{"the Megaton Hammer", /*french*/"la Masse des Titans", /*spanish*/"el martillo Megatón"}
     );
 
-    hintTable[STONE_OF_AGONY] = HintText::Item({
+    hintTable[RHT_STONE_OF_AGONY] = HintText::Item({
                        //obscure text
                        Text{"the shake stone", /*french*/"le fragment vibrant", /*spanish*/"el fragmento tintineante"},
                        Text{"a gray alarm",    /*french*/"une alerte bleue",    /*spanish*/"una azul alarma"},
@@ -217,7 +217,7 @@ void HintTable_Init_Item() {
                        Text{"the Stone of Agony", /*french*/"la Pierre de Souffrance", /*spanish*/"la Piedra de la Agonía"}
     );
 
-    hintTable[DINS_FIRE] = HintText::Item({
+    hintTable[RHT_DINS_FIRE] = HintText::Item({
                        //obscure text
                        Text{"an inferno",  /*french*/"un brasier",               /*spanish*/"un incendio"},
                        Text{"a heat wave", /*french*/"une vague de chaleur",     /*spanish*/"una onda de calor"},
@@ -230,7 +230,7 @@ void HintTable_Init_Item() {
                        Text{"Din's Fire", /*french*/"le Feu de Din", /*spanish*/"el Fuego de Din"}
     );
 
-    hintTable[FARORES_WIND] = HintText::Item({
+    hintTable[RHT_FARORES_WIND] = HintText::Item({
                        //obscure text
                        Text{"teleportation",     /*french*/"la téléportation",      /*spanish*/"un teletransportador"},
                        Text{"a relocation rune", /*french*/"une rune de relocation", /*spanish*/"una runa de transporte"},
@@ -243,7 +243,7 @@ void HintTable_Init_Item() {
                        Text{"Farore's Wind", /*french*/"le Vent de Farore", /*spanish*/"el Viento de Farore"}
     );
 
-    hintTable[NAYRUS_LOVE] = HintText::Item({
+    hintTable[RHT_NAYRUS_LOVE] = HintText::Item({
                        //obscure text
                        Text{"a safe space",        /*french*/"une bulle de cristal", /*spanish*/"una seguridad temporal"},
                        Text{"an impregnable aura", /*french*/"un aura impénétrable", /*spanish*/"un aura impenetrable"},
@@ -256,7 +256,7 @@ void HintTable_Init_Item() {
                        Text{"Nayru's Love", /*french*/"l'Amour de Nayru", /*spanish*/"el Amor de Nayru"}
     );
 
-    hintTable[FIRE_ARROWS] = HintText::Item({
+    hintTable[RHT_FIRE_ARROWS] = HintText::Item({
                        //obscure text
                        Text{"the furnace firearm" , /*french*/"une fusée solaire",     /*spanish*/"el ardiente aguijón"},
                        Text{"the burning bolts",    /*french*/"un obus enflammé",      /*spanish*/"las puntas ígneas"},
@@ -269,7 +269,7 @@ void HintTable_Init_Item() {
                        Text{"the Fire Arrows", /*french*/"les Flèches de Feu", /*spanish*/"la flecha de fuego"}
     );
 
-    hintTable[ICE_ARROWS] = HintText::Item({
+    hintTable[RHT_ICE_ARROWS] = HintText::Item({
                        //obscure text
                        Text{"the refrigerator rocket", /*french*/"un missile pétrifiant", /*spanish*/"el misil congelador"},
                        Text{"the frostbite bolts",     /*french*/"un froid mordant",      /*spanish*/"las puntas gélidas"},
@@ -283,7 +283,7 @@ void HintTable_Init_Item() {
                        Text{"the Ice Arrows", /*french*/"les Flèches de Glace", /*spanish*/"la flecha de hielo"}
     );
 
-    hintTable[LIGHT_ARROWS] = HintText::Item({
+    hintTable[RHT_LIGHT_ARROWS] = HintText::Item({
                        //obscure text
                        Text{"the shining shot",      /*french*/"l'arme brillante",      /*spanish*/"el haz de luz"},
                        Text{"the luminous launcher", /*french*/"un jet de lumière",      /*spanish*/"el disparo luminoso"},
@@ -297,7 +297,7 @@ void HintTable_Init_Item() {
                        Text{"the Light Arrows", /*french*/"les Flèches de Lumière", /*spanish*/"la flecha de luz"}
     );
 
-    hintTable[GERUDO_MEMBERSHIP_CARD] = HintText::Item({
+    hintTable[RHT_GERUDO_MEMBERSHIP_CARD] = HintText::Item({
                        //obscure text
                        Text{"a girl club membership", /*french*/"une carte de membre", /*spanish*/"una fémina membresía"},
                        Text{"a desert tribe's pass",  /*french*/"un laissez-passer",   /*spanish*/"el vale del desierto"},
@@ -308,7 +308,7 @@ void HintTable_Init_Item() {
                        Text{"the Gerudo Membership Card", /*french*/"la Carte Gerudo", /*spanish*/"el pase de socio gerudo"}
     );
 
-    hintTable[MAGIC_BEAN] = HintText::Item({
+    hintTable[RHT_MAGIC_BEAN] = HintText::Item({
                        //obscure text
                        Text{"a wizardly legume", /*french*/"un légume ensorcelé", /*spanish*/"una legumbre hechizada"},
                      }, {
@@ -319,7 +319,7 @@ void HintTable_Init_Item() {
                        Text{"a Magic Bean", /*french*/"un Haricot Magique", /*spanish*/"una judía mágica"}
     );
 
-    hintTable[MAGIC_BEAN_PACK] = HintText::Item({
+    hintTable[RHT_MAGIC_BEAN_PACK] = HintText::Item({
                        //obscure text
                        Text{"wizardly legumes", /*french*/"un paquet de légumes ensorcelés", /*spanish*/"unas legumbres hechizadas"},
                      }, {
@@ -330,7 +330,7 @@ void HintTable_Init_Item() {
                        Text{"Magic Beans", /*french*/"un Paquet de Haricots Magiques", /*spanish*/"unas judías mágicas"}
     );
 
-    hintTable[DOUBLE_DEFENSE] = HintText::Item({
+    hintTable[RHT_DOUBLE_DEFENSE] = HintText::Item({
                        //obscure text
                        Text{"a white outline",   /*french*/"un rebord blanc",               /*spanish*/"un contorno blanco"},
                        Text{"damage decrease",   /*french*/"une protection supplémentaire", /*spanish*/"una reducción de daño"},
@@ -344,7 +344,7 @@ void HintTable_Init_Item() {
                        Text{"Double Defense", /*french*/"la Double Défence", /*spanish*/"la doble defensa"}
     );
 
-    hintTable[GOLD_SKULLTULA_TOKEN] = HintText::Item({
+    hintTable[RHT_GOLD_SKULLTULA_TOKEN] = HintText::Item({
                        //obscure text
                        Text{"proof of destruction",   /*french*/"un certificat d'élimination", /*spanish*/"una prueba de la destrucción"},
                        Text{"an arachnid chip",       /*french*/"un symbole cranien",            /*spanish*/"una figura arácnida"},
@@ -359,7 +359,7 @@ void HintTable_Init_Item() {
                        Text{"a Gold Skulltula Token", /*french*/"un Symbole de Skulltula d'or", /*spanish*/"un símbolo de skulltula dorada"}
     );
 
-    hintTable[POCKET_EGG] = HintText::Item({
+    hintTable[RHT_POCKET_EGG] = HintText::Item({
                        //obscure text
                        Text{"a Cucco container",   /*french*/"un réservoir à Cocotte", /*spanish*/"cuco contenido"},
                        Text{"a Cucco, eventually", /*french*/"un poussin éventuel",    /*spanish*/"un futuro cuco"},
@@ -373,7 +373,7 @@ void HintTable_Init_Item() {
                        Text{"the Pocket Egg", /*french*/"l'Oeuf de Poche", /*spanish*/"el huevo de bolsillo"}
     );
 
-    hintTable[POCKET_CUCCO] = HintText::Item({
+    hintTable[RHT_POCKET_CUCCO] = HintText::Item({
                        //obscure text
                        Text{"a little clucker", /*french*/"un petit glousseur", /*spanish*/"un pollito chiquito"},
                      }, {
@@ -384,7 +384,7 @@ void HintTable_Init_Item() {
                        Text{"the Pocket Cucco", /*french*/"la Cocotte de Poche", /*spanish*/"el cuco de bolsillo"}
     );
 
-    hintTable[COJIRO] = HintText::Item({
+    hintTable[RHT_COJIRO] = HintText::Item({
                        //obscure text
                        Text{"a cerulean capon", /*french*/"un paon azur", /*spanish*/"un cerúleo capón"},
                      }, {
@@ -395,7 +395,7 @@ void HintTable_Init_Item() {
                        Text{"Cojiro", /*french*/"le p'tit poulet", /*spanish*/"a Cojiro"}
     );
 
-    hintTable[ODD_MUSHROOM] = HintText::Item({
+    hintTable[RHT_ODD_MUSHROOM] = HintText::Item({
                        //obscure text
                        Text{"a powder ingredient", /*french*/"un ingrédient à poudre", /*spanish*/"un oloroso ingrediente"},
                      }, {
@@ -406,7 +406,7 @@ void HintTable_Init_Item() {
                        Text{"an Odd Mushroom", /*french*/"un Champignon Suspect", /*spanish*/"un champiñón extraño"}
     );
 
-    hintTable[ODD_POTION] = HintText::Item({
+    hintTable[RHT_ODD_POTION] = HintText::Item({
                        //obscure text
                        Text{"Granny's goodies", /*french*/"la confiserie de mamie", /*spanish*/"la especialidad de la abuela"},
                      }, {
@@ -419,7 +419,7 @@ void HintTable_Init_Item() {
                        Text{"an Odd Potion", /*french*/"une Mixture Suspecte", /*spanish*/"una medicina rara"}
     );
 
-    hintTable[POACHERS_SAW] = HintText::Item({
+    hintTable[RHT_POACHERS_SAW] = HintText::Item({
                        //obscure text
                        Text{"a tree killer", /*french*/"un coupeur d'arbres", /*spanish*/"un destructor de árboles"},
                      }, {
@@ -430,7 +430,7 @@ void HintTable_Init_Item() {
                        Text{"the Poacher's Saw", /*french*/"la Scie du Chasseur", /*spanish*/"la sierra del furtivo"}
     );
 
-    hintTable[BROKEN_SWORD] = HintText::Item({
+    hintTable[RHT_BROKEN_SWORD] = HintText::Item({
                        //obscure text
                        Text{"a shattered slicer", /*french*/"une arme cassée", /*spanish*/"una rebanadora rota"},
                      }, {
@@ -442,7 +442,7 @@ void HintTable_Init_Item() {
                        Text{"the Broken Goron's Sword", /*french*/"l'Épée Brisée de Goron", /*spanish*/"la espada goron rota"}
     );
 
-    hintTable[PRESCRIPTION] = HintText::Item({
+    hintTable[RHT_PRESCRIPTION] = HintText::Item({
                        //obscure text
                        Text{"a pill pamphlet", /*french*/"un document urgent", /*spanish*/"un instructivo medicinal"},
                        Text{"a doctor's note", /*french*/"un papier médical",  /*spanish*/"unas notas del doctor"},
@@ -454,7 +454,7 @@ void HintTable_Init_Item() {
                        Text{"the Prescription", /*french*/"une Ordonnance", /*spanish*/"la receta"}
     );
 
-    hintTable[EYEBALL_FROG] = HintText::Item({
+    hintTable[RHT_EYEBALL_FROG] = HintText::Item({
                        //obscure text
                        Text{"a perceiving polliwog", /*french*/"un amphibien", /*spanish*/"un variopinto batracio"},
                      }, {
@@ -465,7 +465,7 @@ void HintTable_Init_Item() {
                        Text{"the Eyeball Frog", /*french*/"le Crapaud-qui-louche", /*spanish*/"la rana de ojos saltones"}
     );
 
-    hintTable[EYEDROPS] = HintText::Item({
+    hintTable[RHT_EYEDROPS] = HintText::Item({
                        //obscure text
                        Text{"a vision vial", /*french*/"une solution oculaire", /*spanish*/"un remedio para la vista"},
                      }, {
@@ -476,7 +476,7 @@ void HintTable_Init_Item() {
                        Text{"the Eyedrops", /*french*/"une phiole de Super-Gouttes", /*spanish*/"las supergotas oculares"}
     );
 
-    hintTable[CLAIM_CHECK] = HintText::Item({
+    hintTable[RHT_CLAIM_CHECK] = HintText::Item({
                        //obscure text
                        Text{"a three day wait", /*french*/"un rendez-vous dans trois jours", /*spanish*/"unos tres días de espera"},
                      }, {
@@ -487,11 +487,11 @@ void HintTable_Init_Item() {
                        Text{"the Claim Check", /*french*/"un Certificat", /*spanish*/"el recibo"}
     );
 
-    hintTable[PROGRESSIVE_HOOKSHOT] = HintText::Item({
+    hintTable[RHT_PROGRESSIVE_HOOKSHOT] = HintText::Item({
                        //obscure text
                        Text{"Dampé's keepsake", /*french*/"l'héritage d'Igor",   /*spanish*/"un recuerdo de Dampé"},
                        Text{"the Grapple Beam", /*french*/"le rayon grippeur",   /*spanish*/"una garra metálica"},
-                       Text{"the BOING! chain", /*french*/"la chaîne de BOING!", /*spanish*/"una cadena retráctil"},
+                       Text{"the RHT_BOING! chain", /*french*/"la chaîne de RHT_BOING!", /*spanish*/"una cadena retráctil"},
                      }, {
                        //ambiguous text
                        Text{"something that can grab things", /*french*/"une chose qui peut attraper", /*spanish*/"algo que pueda agarrar cosas"},
@@ -501,7 +501,7 @@ void HintTable_Init_Item() {
                        Text{"a Hookshot", /*french*/"un Grappin", /*spanish*/"un gancho"}
     );
 
-    hintTable[PROGRESSIVE_STRENGTH] = HintText::Item({
+    hintTable[RHT_PROGRESSIVE_STRENGTH] = HintText::Item({
                        //obscure text
                        Text{"power gloves",    /*french*/"une paire de gants de travail",       /*spanish*/"unos poderosos guanteletes"},
                        Text{"metal mittens",   /*french*/"une paire de mitaines",               /*spanish*/"unas manoplas metálicas"},
@@ -514,7 +514,7 @@ void HintTable_Init_Item() {
                        Text{"a Strength Upgrade", /*french*/"une Amélioration de Force", /*spanish*/"un aumento de fuerza"}
     );
 
-    hintTable[PROGRESSIVE_BOMB_BAG] = HintText::Item({
+    hintTable[RHT_PROGRESSIVE_BOMB_BAG] = HintText::Item({
                        //obscure text
                        Text{"an explosive container", /*french*/"un porte-grenade",      /*spanish*/"un recipiente explosivo"},
                        Text{"a blast bag",            /*french*/"un estomac de Dodongo", /*spanish*/"un zurrón de estallidos"},
@@ -527,7 +527,7 @@ void HintTable_Init_Item() {
                        Text{"a Bomb Bag", /*french*/"un Sac de Bombes", /*spanish*/"un saco de bombas"}
     );
 
-    hintTable[PROGRESSIVE_BOW] = HintText::Item({
+    hintTable[RHT_PROGRESSIVE_BOW] = HintText::Item({
                        //obscure text
                        Text{"an archery enabler",     /*french*/"un facilitateur de tir", /*spanish*/"un tiro al blanco"},
                        Text{"a danger dart launcher", /*french*/"un tire-fléchette",      /*spanish*/"un peligroso lanzadardos"},
@@ -539,7 +539,7 @@ void HintTable_Init_Item() {
                        Text{"a Bow", /*french*/"l'Arc des Fées", /*spanish*/"un arco de las hadas"}
     );
 
-    hintTable[PROGRESSIVE_SLINGSHOT] = HintText::Item({
+    hintTable[RHT_PROGRESSIVE_SLINGSHOT] = HintText::Item({
                        //obscure text
                        Text{"a seed shooter",     /*french*/"un lance-noix",     /*spanish*/"un lanzasemillas"},
                        Text{"a rubberband",       /*french*/"un élastique",      /*spanish*/"un tirachinas"},
@@ -552,7 +552,7 @@ void HintTable_Init_Item() {
                        Text{"a Slingshot", /*french*/"un Lance-Pierre", /*spanish*/"una resortera de las hadas"}
     );
 
-    hintTable[PROGRESSIVE_WALLET] = HintText::Item({
+    hintTable[RHT_PROGRESSIVE_WALLET] = HintText::Item({
                        //obscure text
                        Text{"a mo' money holder", /*french*/"un sac à sous",     /*spanish*/"una cartera de dinero"},
                        Text{"a gem purse",        /*french*/"une sacoche",       /*spanish*/"un zurrón de gemas"},
@@ -565,7 +565,7 @@ void HintTable_Init_Item() {
                        Text{"a Wallet", /*french*/"une Bourse", /*spanish*/"una bolsa de rupias"}
     );
 
-    hintTable[PROGRESSIVE_SCALE] = HintText::Item({
+    hintTable[RHT_PROGRESSIVE_SCALE] = HintText::Item({
                        //obscure text
                        Text{"a deeper dive",   /*french*/"une bulle de plongée", /*spanish*/"un profundo buceo"},
                        Text{"a piece of Zora", /*french*/"un morceau de Zora",   /*spanish*/"un fragmento de Zora"},
@@ -577,7 +577,7 @@ void HintTable_Init_Item() {
                        Text{"a Zora Scale", /*french*/"une Écaille Zora", /*spanish*/"una escama Zora"}
     );
 
-    hintTable[PROGRESSIVE_NUT_UPGRADE] = HintText::Item({
+    hintTable[RHT_PROGRESSIVE_NUT_UPGRADE] = HintText::Item({
                        //obscure text
                        Text{"more nuts",         /*french*/"ecnore plus de noix", /*spanish*/"más semillas de nogal"},
                        Text{"flashbang storage", /*french*/"un sac à noix",       /*spanish*/"más frutos aturdidores"},
@@ -590,7 +590,7 @@ void HintTable_Init_Item() {
                        Text{"Deku Nut Capacity", /*french*/"une Augmentation de Noix Mojo", /*spanish*/"un aumento de nueces deku"}
     );
 
-    hintTable[PROGRESSIVE_STICK_UPGRADE] = HintText::Item({
+    hintTable[RHT_PROGRESSIVE_STICK_UPGRADE] = HintText::Item({
                        //obscure text
                        Text{"a lumber rack",        /*french*/"un paquet de bois",    /*spanish*/"más bastones"},
                        Text{"more flammable twigs", /*french*/"beaucoup de branches", /*spanish*/"más varas"},
@@ -602,7 +602,7 @@ void HintTable_Init_Item() {
                        Text{"Deku Stick Capacity", /*french*/"une augmentation de bâtons Mojo", /*spanish*/"un aumento de palos deku"}
     );
 
-    hintTable[PROGRESSIVE_MAGIC_METER] = HintText::Item({
+    hintTable[RHT_PROGRESSIVE_MAGIC_METER] = HintText::Item({
                        //obscure text
                        Text{"mystic training",    /*french*/"un potentiel magique", /*spanish*/"una maestría mística"},
                        Text{"pixie dust",         /*french*/"de la poudre de fée", /*spanish*/"un polvo de hada"},
@@ -615,7 +615,7 @@ void HintTable_Init_Item() {
                        Text{"a Magic Meter", /*french*/"une Jauge de Magie", /*spanish*/"un aumento de poder mágico"}
     );
 
-    hintTable[PROGRESSIVE_OCARINA] = HintText::Item({
+    hintTable[RHT_PROGRESSIVE_OCARINA] = HintText::Item({
                        //obscure text
                        Text{"a flute",       /*french*/"un bec musical",         /*spanish*/"un utensilio musical"},
                        Text{"a music maker", /*french*/"un porteur de chansons", /*spanish*/"un instrumento"},
@@ -628,7 +628,7 @@ void HintTable_Init_Item() {
                        Text{"an Ocarina", /*french*/"un ocarina", /*spanish*/"una ocarina"}
     );
 
-    hintTable[PROGRESSIVE_BOMBCHUS] = HintText::Item({
+    hintTable[RHT_PROGRESSIVE_BOMBCHUS] = HintText::Item({
                        //obscure text
                        Text{"mice bombs",     /*french*/"un adorable explosif",  /*spanish*/"unas bombas roedoras"},
                        Text{"proximity mice", /*french*/"une mine anti-rongeur",    /*spanish*/"unos explosivos ratoncitos"},
@@ -643,7 +643,7 @@ void HintTable_Init_Item() {
                        Text{"Bombchus", /*french*/"un paquet de Missiles", /*spanish*/"unos bombchus"}
     );
 
-    hintTable[PROGRESSIVE_GORONSWORD] = HintText::Item({
+    hintTable[RHT_PROGRESSIVE_GORONSWORD] = HintText::Item({
                        //obscure text
                        Text{"a long blade",   /*french*/"une longue lame", /*spanish*/"una gran hoja"},
                        Text{"a Goron weapon", /*french*/"une arme Goron",  /*spanish*/"un arma goron"},
@@ -655,7 +655,7 @@ void HintTable_Init_Item() {
                        Text{"a Goron Sword", /*french*/"une épée Goron", /*spanish*/"una espada goron"}
     );
 
-    hintTable[EMPTY_BOTTLE] = HintText::Item({
+    hintTable[RHT_EMPTY_BOTTLE] = HintText::Item({
                        //obscure text
                        Text{"a glass container", /*french*/"un cylindre de cristal", /*spanish*/"un recipiente de cristal"},
                        Text{"an empty jar",      /*french*/"une jarre incassable",   /*spanish*/"un frasco vacío"},
@@ -668,7 +668,7 @@ void HintTable_Init_Item() {
                        Text{"a Bottle", /*french*/"un flacon vide", /*spanish*/"una botella"}
     );
 
-    hintTable[BOTTLE_WITH_MILK] = HintText::Item({
+    hintTable[RHT_BOTTLE_WITH_MILK] = HintText::Item({
                        //obscure text
                        Text{"cow juice",          /*french*/"une source de calcium", /*spanish*/"una fuente de calcio"},
                        Text{"a white liquid",     /*french*/"un liquide blanc",      /*spanish*/"una bebida nutritiva"},
@@ -681,7 +681,7 @@ void HintTable_Init_Item() {
                        Text{"a Milk Bottle", /*french*/"un flacon de lait", /*spanish*/"una botella de leche"}
     );
 
-    hintTable[BOTTLE_WITH_RED_POTION] = HintText::Item({
+    hintTable[RHT_BOTTLE_WITH_RED_POTION] = HintText::Item({
                        //obscure text
                        Text{"a vitality vial", /*french*/"un mélange de vitalité", /*spanish*/"una pócima vitalicia"},
                        Text{"a red liquid",    /*french*/"un liquide rouge",       /*spanish*/"un remedio rojizo"},
@@ -693,7 +693,7 @@ void HintTable_Init_Item() {
                        Text{"a Red Potion Bottle", /*french*/"un flacon de potion rouge", /*spanish*/"una botella de poción roja"}
     );
 
-    hintTable[BOTTLE_WITH_GREEN_POTION] = HintText::Item({
+    hintTable[RHT_BOTTLE_WITH_GREEN_POTION] = HintText::Item({
                        //obscure text
                        Text{"a magic mixture", /*french*/"une réserve magique", /*spanish*/"un potingue mágico"},
                        Text{"a green liquid",  /*french*/"un liquide vert",     /*spanish*/"un remedio verduzco"},
@@ -705,7 +705,7 @@ void HintTable_Init_Item() {
                        Text{"a Green Potion Bottle", /*french*/"un flacon de potion verte", /*spanish*/"una botella de poción verde"}
     );
 
-    hintTable[BOTTLE_WITH_BLUE_POTION] = HintText::Item({
+    hintTable[RHT_BOTTLE_WITH_BLUE_POTION] = HintText::Item({
                        //obscure text
                        Text{"an ailment antidote", /*french*/"l'élixir ultime", /*spanish*/"un antídoto para el dolor"},
                        Text{"a blue liquid",       /*french*/"un liquide bleu", /*spanish*/"un remedio índigo"},
@@ -717,7 +717,7 @@ void HintTable_Init_Item() {
                        Text{"a Blue Potion Bottle", /*french*/"un flacon de potion bleue", /*spanish*/"una botella de poción azul"}
     );
 
-    hintTable[BOTTLE_WITH_FAIRY] = HintText::Item({
+    hintTable[RHT_BOTTLE_WITH_FAIRY] = HintText::Item({
                        //obscure text
                        Text{"an imprisoned fairy", /*french*/"une fée emprisonnée", /*spanish*/"un hada atrapada"},
                        Text{"an extra life",       /*french*/"une vie de rechange", /*spanish*/"una oportunidad más"},
@@ -730,7 +730,7 @@ void HintTable_Init_Item() {
                        Text{"a Fairy Bottle", /*french*/"une fée en flacon", /*spanish*/"un hada en una botella"}
     );
 
-    hintTable[BOTTLE_WITH_FISH] = HintText::Item({
+    hintTable[RHT_BOTTLE_WITH_FISH] = HintText::Item({
                        //obscure text
                        Text{"an aquarium",     /*french*/"un aquarium",               /*spanish*/"un escamado ser"},
                        Text{"a deity's snack", /*french*/"le repas d'un dieu marin", /*spanish*/"un tentempié de cierta deidad"},
@@ -742,7 +742,7 @@ void HintTable_Init_Item() {
                        Text{"a Fish Bottle", /*french*/"un poisson en flacon", /*spanish*/"un pez en una botella"}
     );
 
-    hintTable[BOTTLE_WITH_BLUE_FIRE] = HintText::Item({
+    hintTable[RHT_BOTTLE_WITH_BLUE_FIRE] = HintText::Item({
                        //obscure text
                        Text{"a conflagration canteen", /*french*/"une mystérieuse flamme", /*spanish*/"un incendio retenido"},
                        Text{"an icemelt jar",          /*french*/"un brasier glacial",     /*spanish*/"unas brasas enfrascadas"},
@@ -754,7 +754,7 @@ void HintTable_Init_Item() {
                        Text{"a Blue Fire Bottle", /*french*/"une flamme bleue en flacon", /*spanish*/"una botella de fuego azul"}
     );
 
-    hintTable[BOTTLE_WITH_BUGS] = HintText::Item({
+    hintTable[RHT_BOTTLE_WITH_BUGS] = HintText::Item({
                        //obscure text
                        Text{"an insectarium",    /*french*/"un insectarium",       /*spanish*/"unos invertebrados seres"},
                        Text{"Skulltula finders", /*french*/"une poignée de trouve-Skulltula", /*spanish*/"unos rastreadores de skulltulas"},
@@ -766,7 +766,7 @@ void HintTable_Init_Item() {
                        Text{"a Bug Bottle", /*french*/"un insecte en flacon", /*spanish*/"unos insectos en una botella"}
     );
 
-    hintTable[BOTTLE_WITH_POE] = HintText::Item({
+    hintTable[RHT_BOTTLE_WITH_POE] = HintText::Item({
                        //obscure text
                        Text{"a spooky ghost",    /*french*/"un effroyable fantôme",   /*spanish*/"un espantoso espectro"},
                        Text{"a face in the jar", /*french*/"un visage dans un bocal", /*spanish*/"una expresión enfrascada"},
@@ -778,7 +778,7 @@ void HintTable_Init_Item() {
                        Text{"a Poe Bottle", /*french*/"un Esprit en flacon", /*spanish*/"un Poe en una botella"}
     );
 
-    hintTable[BOTTLE_WITH_BIG_POE] = HintText::Item({
+    hintTable[RHT_BOTTLE_WITH_BIG_POE] = HintText::Item({
                        //obscure text
                        Text{"the spookiest ghost", /*french*/"un épouvantable spectre", /*spanish*/"el espectro más espeluznante"},
                        Text{"a sidequest spirit",  /*french*/"un précieux esprit",      /*spanish*/"un buen valorado espíritu"},
@@ -790,11 +790,11 @@ void HintTable_Init_Item() {
                        Text{"a Big Poe Bottle", /*french*/"une Ame en flacon", /*spanish*/"un Gran Poe en una botella"}
     );
 
-    hintTable[RUTOS_LETTER] = HintText::Item({
+    hintTable[RHT_RUTOS_LETTER] = HintText::Item({
                        //obscure text
                        Text{"a call for help",      /*french*/"un appel au secours", /*spanish*/"una llamada de auxilio"},
                        Text{"the note that Mweeps", /*french*/"un message qui fait mwip",          /*spanish*/"un escrito mweep"},
-                       Text{"an SOS call",          /*french*/"un signal SOS",       /*spanish*/"una nota de socorro"},
+                       Text{"an RHT_SOS call",          /*french*/"un signal RHT_SOS",       /*spanish*/"una nota de socorro"},
                        Text{"a fishy stationery",   /*french*/"un papier mouillé",  /*spanish*/"un mensaje de ayuda"},
                      }, {
                        //ambiguous text
@@ -804,7 +804,7 @@ void HintTable_Init_Item() {
                        Text{"Ruto's Letter", /*french*/"la lettre de Ruto", /*spanish*/"la carta de Ruto"}
     );
 
-    hintTable[ZELDAS_LULLABY] = HintText::Item({
+    hintTable[RHT_ZELDAS_LULLABY] = HintText::Item({
                        //obscure text
                        Text{"a song of royal slumber", /*french*/"une chanson royale", /*spanish*/"la canción real"},
                        Text{"a triforce tune",         /*french*/"la musique sacrée", /*spanish*/"la melodía de la trifuerza"},
@@ -817,7 +817,7 @@ void HintTable_Init_Item() {
                        Text{"Zelda's Lullaby", /*french*/"la berceuse de Zelda", /*spanish*/"la Nana de Zelda"}
     );
 
-    hintTable[EPONAS_SONG] = HintText::Item({
+    hintTable[RHT_EPONAS_SONG] = HintText::Item({
                        //obscure text
                        Text{"an equestrian etude", /*french*/"une hymne équestre",     /*spanish*/"una copla ecuestre"},
                        Text{"Malon's melody",      /*french*/"la mélodie des vaches", /*spanish*/"la sonata de Malon"},
@@ -830,7 +830,7 @@ void HintTable_Init_Item() {
                        Text{"Epona's Song", /*french*/"le chant d'Epona", /*spanish*/"la Canción de Epona"}
     );
 
-    hintTable[SARIAS_SONG] = HintText::Item({
+    hintTable[RHT_SARIAS_SONG] = HintText::Item({
                        //obscure text
                        Text{"a song of dancing Gorons", /*french*/"une chanson danceuse",     /*spanish*/"un pegadizo tono goron"},
                        Text{"Saria's phone number",     /*french*/"le téléphone d'une amie", /*spanish*/"una consulta de asistencia"},
@@ -843,7 +843,7 @@ void HintTable_Init_Item() {
                        Text{"Saria's Song", /*french*/"le chant de Saria", /*spanish*/"la Canción de Saria"}
     );
 
-    hintTable[SUNS_SONG] = HintText::Item({
+    hintTable[RHT_SUNS_SONG] = HintText::Item({
                        //obscure text
                        Text{"Sunny Day",         /*french*/"Zénith",               /*spanish*/"un día soleado"},
                        Text{"the ReDead's bane", /*french*/"le fléau des Éffrois", /*spanish*/"la destructora de Redeads"},
@@ -857,7 +857,7 @@ void HintTable_Init_Item() {
                        Text{"the Sun's Song", /*french*/"le chant du soleil", /*spanish*/"la Canción del Sol"}
     );
 
-    hintTable[SONG_OF_TIME] = HintText::Item({
+    hintTable[RHT_SONG_OF_TIME] = HintText::Item({
                        //obscure text
                        Text{"a song 7 years long", /*french*/"le flot du temps", /*spanish*/"la setenada canción"},
                        Text{"the tune of ages",    /*french*/"le Chant des Âges",  /*spanish*/"la melodía eónica"},
@@ -869,7 +869,7 @@ void HintTable_Init_Item() {
                        Text{"the Song of Time", /*french*/"le chant du temps", /*spanish*/"la Canción del tiempo"}
     );
 
-    hintTable[SONG_OF_STORMS] = HintText::Item({
+    hintTable[RHT_SONG_OF_STORMS] = HintText::Item({
                        //obscure text
                        Text{"Rain Dance",            /*french*/"Danse Pluie",               /*spanish*/"la danza de la lluvia"},
                        Text{"a thunderstorm tune",   /*french*/"une hymne foudroyante",      /*spanish*/"una sonata tormentosa"},
@@ -882,7 +882,7 @@ void HintTable_Init_Item() {
                        Text{"the Song of Storms", /*french*/"le chant des tempêtes", /*spanish*/"la Canción de la Tormenta"}
     );
 
-    hintTable[MINUET_OF_FOREST] = HintText::Item({
+    hintTable[RHT_MINUET_OF_FOREST] = HintText::Item({
                        //obscure text
                        Text{"the song of tall trees", /*french*/"le bruit des arbres", /*spanish*/"la canción de las copas"},
                        Text{"an arboreal anthem",     /*french*/"l'hymne sylvestre",   /*spanish*/"el himno forestal"},
@@ -895,7 +895,7 @@ void HintTable_Init_Item() {
                        Text{"the Minuet of Forest", /*french*/"le menuet de la forêt", /*spanish*/"el Minueto del bosque"}
     );
 
-    hintTable[BOLERO_OF_FIRE] = HintText::Item({
+    hintTable[RHT_BOLERO_OF_FIRE] = HintText::Item({
                        //obscure text
                        Text{"a song of lethal lava", /*french*/"une musique enflammée",          /*spanish*/"la canción de la lava"},
                        Text{"a red spark trail",     /*french*/"une comète rouge",      /*spanish*/"el sendero rubí"},
@@ -908,7 +908,7 @@ void HintTable_Init_Item() {
                        Text{"the Bolero of Fire", /*french*/"le boléro du feu", /*spanish*/"el Bolero del fuego"}
     );
 
-    hintTable[SERENADE_OF_WATER] = HintText::Item({
+    hintTable[RHT_SERENADE_OF_WATER] = HintText::Item({
                        //obscure text
                        Text{"a song of a damp ditch", /*french*/"le calme de l'eau", /*spanish*/"la canción del estanque"},
                        Text{"a blue spark trail",     /*french*/"une comète bleue",   /*spanish*/"el sendero zafiro"},
@@ -921,7 +921,7 @@ void HintTable_Init_Item() {
                        Text{"the Serenade of Water", /*french*/"la sérénade de l'eau", /*spanish*/"la Serenata del agua"}
     );
 
-    hintTable[REQUIEM_OF_SPIRIT] = HintText::Item({
+    hintTable[RHT_REQUIEM_OF_SPIRIT] = HintText::Item({
                        //obscure text
                        Text{"a song of sandy statues", /*french*/"la mélodie d'une grande statue", /*spanish*/"la canción de la gran estatua"},
                        Text{"an orange spark trail",   /*french*/"une comète orange",               /*spanish*/"el sendero ámbar"},
@@ -934,7 +934,7 @@ void HintTable_Init_Item() {
                        Text{"the Requiem of Spirit", /*french*/"le requiem des esprits", /*spanish*/"el Réquiem del espíritu"}
     );
 
-    hintTable[NOCTURNE_OF_SHADOW] = HintText::Item({
+    hintTable[RHT_NOCTURNE_OF_SHADOW] = HintText::Item({
                        //obscure text
                        Text{"a song of spooky spirits", /*french*/"une hymne de chair de poule", /*spanish*/"la canción de los espectros"},
                        Text{"a graveyard boogie",       /*french*/"un boogie de fantômes",       /*spanish*/"una honra fúnebre"},
@@ -948,7 +948,7 @@ void HintTable_Init_Item() {
                        Text{"the Nocturne of Shadow", /*french*/"le nocturne de l'ombre", /*spanish*/"el Nocturno de la sombra"}
     );
 
-    hintTable[PRELUDE_OF_LIGHT] = HintText::Item({
+    hintTable[RHT_PRELUDE_OF_LIGHT] = HintText::Item({
                        //obscure text
                        Text{"a luminous prologue melody", /*french*/"une matine illuminée", /*spanish*/"la melodía refulgente"},
                        Text{"a yellow spark trail",       /*french*/"une comète jaune",        /*spanish*/"el sendero resplandeciente"},
@@ -960,7 +960,7 @@ void HintTable_Init_Item() {
                        //clear text
                        Text{"the Prelude of Light", /*french*/"le prélude de la lumière", /*spanish*/"el Preludio de la luz"}
     );
-    hintTable[DEKU_TREE_MAP] = HintText::Item({
+    hintTable[RHT_DEKU_TREE_MAP] = HintText::Item({
                         //obscure text
                         Text{"a mossy atlas", /*french*/"un atlas boisé",  /*spanish*/"un atlas musgoso"},
                         Text{"some mossy blueprints",      /*french*/"un plan boisé",             /*spanish*/"unos planos musgosos"},
@@ -971,7 +971,7 @@ void HintTable_Init_Item() {
                         //clear text
                         Text{"the Deku Tree Map", /*french*/"la carte de l'Arbre Mojo", /*spanish*/"el mapa del Gran Árbol Deku"}
      );
-    hintTable[DODONGOS_CAVERN_MAP] = HintText::Item({
+    hintTable[RHT_DODONGOS_CAVERN_MAP] = HintText::Item({
                         //obscure text
                         Text{"a rocky atlas", /*french*/"un atlas rocheux",  /*spanish*/"un atlas rocoso"},
                         Text{"some rocky blueprints",      /*french*/"un plan rocheux",             /*spanish*/"unos planos rocosos"},
@@ -982,7 +982,7 @@ void HintTable_Init_Item() {
                         //clear text
                         Text{"the Dodongo's Cavern Map", /*french*/"la carte de la Caverne Dodongo", /*spanish*/"el mapa de la Cueva de los Dodongos"}
      );
-    hintTable[JABU_JABUS_BELLY_MAP] = HintText::Item({
+    hintTable[RHT_JABU_JABUS_BELLY_MAP] = HintText::Item({
                         //obscure text
                         Text{"a fishy atlas", /*french*/"un atlas digéré",  /*spanish*/"un atlas digesto"},
                         Text{"some fishy blueprints",      /*french*/"un plan digéré",             /*spanish*/"unos planos digestos"},
@@ -993,7 +993,7 @@ void HintTable_Init_Item() {
                         //clear text
                         Text{"the Jabu-Jabu's Belly Map", /*french*/"la carte de Jabu-Jabu", /*spanish*/"el mapa de la Tripa de Jabu-Jabu"}
      );
-    hintTable[FOREST_TEMPLE_MAP] = HintText::Item({
+    hintTable[RHT_FOREST_TEMPLE_MAP] = HintText::Item({
                         //obscure text
                         Text{"a sylvan atlas", /*french*/"un atlas sylvestre",  /*spanish*/"un atlas enselvado"},
                         Text{"some sylvan blueprints",      /*french*/"un plan sylvestre",             /*spanish*/"unos planos enselvados"},
@@ -1004,7 +1004,7 @@ void HintTable_Init_Item() {
                         //clear text
                         Text{"the Forest Temple Map", /*french*/"la carte du Temple de la Forêt", /*spanish*/"el mapa del Templo del Bosque"}
      );
-    hintTable[FIRE_TEMPLE_MAP] = HintText::Item({
+    hintTable[RHT_FIRE_TEMPLE_MAP] = HintText::Item({
                         //obscure text
                         Text{"a molten atlas", /*french*/"un atlas fondu",  /*spanish*/"un atlas fundido"},
                         Text{"some molten blueprints",      /*french*/"un plan fondu",             /*spanish*/"unos planos fundidos"},
@@ -1015,7 +1015,7 @@ void HintTable_Init_Item() {
                         //clear text
                         Text{"the Fire Temple Map", /*french*/"la carte du Temple du Feu", /*spanish*/"el mapa del Templo del Fuego"}
      );
-    hintTable[WATER_TEMPLE_MAP] = HintText::Item({
+    hintTable[RHT_WATER_TEMPLE_MAP] = HintText::Item({
                         //obscure text
                         Text{"a wet atlas", /*french*/"un atlas humide",  /*spanish*/"un atlas mojado"},
                         Text{"some wet blueprints",      /*french*/"un plan humide",             /*spanish*/"unos planos mojados"},
@@ -1026,7 +1026,7 @@ void HintTable_Init_Item() {
                         //clear text
                         Text{"the Water Temple Map", /*french*/"la carte du Temple de l'Eau", /*spanish*/"el mapa del Templo del Agua"}
      );
-    hintTable[SPIRIT_TEMPLE_MAP] = HintText::Item({
+    hintTable[RHT_SPIRIT_TEMPLE_MAP] = HintText::Item({
                         //obscure text
                         Text{"a sandy atlas", /*french*/"un atlas sableux",  /*spanish*/"un atlas arenoso"},
                         Text{"some sandy blueprints",      /*french*/"un plan sableux",             /*spanish*/"unos planos arenosos"},
@@ -1037,7 +1037,7 @@ void HintTable_Init_Item() {
                         //clear text
                         Text{"the Spirit Temple Map", /*french*/"la carte du Temple de l'Esprit", /*spanish*/"el mapa del Templo del Espíritu"}
      );
-    hintTable[SHADOW_TEMPLE_MAP] = HintText::Item({
+    hintTable[RHT_SHADOW_TEMPLE_MAP] = HintText::Item({
                         //obscure text
                         Text{"a creepy atlas", /*french*/"un atlas sinistre",  /*spanish*/"un atlas siniestra"},
                         Text{"some creepy blueprints",      /*french*/"un plan sinistre",             /*spanish*/"unos planos siniestras"},
@@ -1048,7 +1048,7 @@ void HintTable_Init_Item() {
                         //clear text
                         Text{"the Shadow Temple Map", /*french*/"la carte du Temple de l'Ombre", /*spanish*/"el mapa del Templo de las Sombras"}
      );
-    hintTable[BOTTOM_OF_THE_WELL_MAP] = HintText::Item({
+    hintTable[RHT_BOTTOM_OF_THE_WELL_MAP] = HintText::Item({
                         //obscure text
                         Text{"a moldy atlas", /*french*/"un atlas moisi",  /*spanish*/"un atlas mohoso"},
                         Text{"some moldy blueprints",      /*french*/"un plan moisi",             /*spanish*/"unos planos mohosos"},
@@ -1059,7 +1059,7 @@ void HintTable_Init_Item() {
                         //clear text
                         Text{"the Bottom of the Well Map", /*french*/"la carte du fond du Puits", /*spanish*/"el mapa del Fondo del pozo"}
      );
-    hintTable[ICE_CAVERN_MAP] = HintText::Item({
+    hintTable[RHT_ICE_CAVERN_MAP] = HintText::Item({
                         //obscure text
                         Text{"a polar atlas", /*french*/"un atlas polaire",  /*spanish*/"un atlas polar"},
                         Text{"some polar blueprints",      /*french*/"un plan polaire",             /*spanish*/"unos planos polars"},
@@ -1070,7 +1070,7 @@ void HintTable_Init_Item() {
                         //clear text
                         Text{"the Ice Cavern Map", /*french*/"la carte de la Caverne Polaire", /*spanish*/"el mapa de la Caverna de hielo"}
      );
-    hintTable[DEKU_TREE_COMPASS] = HintText::Item({
+    hintTable[RHT_DEKU_TREE_COMPASS] = HintText::Item({
                         //obscure text
                         Text{"a mossy treasure tracker", /*french*/"un cherche-trésor boisé",  /*spanish*/"un zahorí musgoso"},
                         Text{"a mossy magnetic needle",      /*french*/"une aimant boisée",             /*spanish*/"un imán musgoso"},
@@ -1081,7 +1081,7 @@ void HintTable_Init_Item() {
                         //clear text
                         Text{"the Deku Tree Compass", /*french*/"la boussole de l'Arbre Mojo", /*spanish*/"la brújula del Gran Árbol Deku"}
      );
-    hintTable[DODONGOS_CAVERN_COMPASS] = HintText::Item({
+    hintTable[RHT_DODONGOS_CAVERN_COMPASS] = HintText::Item({
                         //obscure text
                         Text{"a rocky treasure tracker", /*french*/"un cherche-trésor rocheux",  /*spanish*/"un zahorí rocoso"},
                         Text{"a rocky magnetic needle",      /*french*/"une aimant rocheux",             /*spanish*/"un imán rocoso"},
@@ -1092,7 +1092,7 @@ void HintTable_Init_Item() {
                         //clear text
                         Text{"the Dodongo's Cavern Compass", /*french*/"la boussole de la Caverne Dodongo", /*spanish*/"la brújula de la Cueva de los Dodongos"}
      );
-    hintTable[JABU_JABUS_BELLY_COMPASS] = HintText::Item({
+    hintTable[RHT_JABU_JABUS_BELLY_COMPASS] = HintText::Item({
                         //obscure text
                         Text{"a fishy treasure tracker", /*french*/"un cherche-trésor digéré",  /*spanish*/"un zahorí digesto"},
                         Text{"a fishy magnetic needle",      /*french*/"une aimant digéré",             /*spanish*/"un imán digesto"},
@@ -1103,7 +1103,7 @@ void HintTable_Init_Item() {
                         //clear text
                         Text{"the Jabu-Jabu's Belly Compass", /*french*/"la boussole de Jabu-Jabu", /*spanish*/"la brújula de la Tripa de Jabu-Jabu"}
      );
-    hintTable[FOREST_TEMPLE_COMPASS] = HintText::Item({
+    hintTable[RHT_FOREST_TEMPLE_COMPASS] = HintText::Item({
                         //obscure text
                         Text{"a sylvan treasure tracker", /*french*/"un cherche-trésor sylvestre",  /*spanish*/"un zahorí enselvado"},
                         Text{"a sylvan magnetic needle",      /*french*/"une aimant sylvestre",             /*spanish*/"un imán enselvado"},
@@ -1114,7 +1114,7 @@ void HintTable_Init_Item() {
                         //clear text
                         Text{"the Forest Temple Compass", /*french*/"la boussole du Temple de la Forêt", /*spanish*/"la brújula del Templo del Bosque"}
      );
-    hintTable[FIRE_TEMPLE_COMPASS] = HintText::Item({
+    hintTable[RHT_FIRE_TEMPLE_COMPASS] = HintText::Item({
                         //obscure text
                         Text{"a molten treasure tracker", /*french*/"un cherche-trésor fondu",  /*spanish*/"un zahorí fundido"},
                         Text{"a molten magnetic needle",      /*french*/"une aimant fondu",             /*spanish*/"un imán fundido"},
@@ -1125,7 +1125,7 @@ void HintTable_Init_Item() {
                         //clear text
                         Text{"the Fire Temple Compass", /*french*/"la boussole du Temple du Feu", /*spanish*/"la brújula del Templo del Fuego"}
      );
-    hintTable[WATER_TEMPLE_COMPASS] = HintText::Item({
+    hintTable[RHT_WATER_TEMPLE_COMPASS] = HintText::Item({
                         //obscure text
                         Text{"a wet treasure tracker", /*french*/"un cherche-trésor humide",  /*spanish*/"un zahorí mojado"},
                         Text{"a wet magnetic needle",      /*french*/"une aimant humide",             /*spanish*/"un imán mojado"},
@@ -1136,7 +1136,7 @@ void HintTable_Init_Item() {
                         //clear text
                         Text{"the Water Temple Compass", /*french*/"la boussole du Temple de l'Eau", /*spanish*/"la brújula del Templo del Agua"}
      );
-    hintTable[SPIRIT_TEMPLE_COMPASS] = HintText::Item({
+    hintTable[RHT_SPIRIT_TEMPLE_COMPASS] = HintText::Item({
                         //obscure text
                         Text{"a sandy treasure tracker", /*french*/"un cherche-trésor sableux",  /*spanish*/"un zahorí arenoso"},
                         Text{"a sandy magnetic needle",      /*french*/"une aimant sableux",             /*spanish*/"un imán arenoso"},
@@ -1147,7 +1147,7 @@ void HintTable_Init_Item() {
                         //clear text
                         Text{"the Spirit Temple Compass", /*french*/"la boussole du Temple de l'Esprit", /*spanish*/"la brújula del Templo del Espíritu"}
      );
-    hintTable[SHADOW_TEMPLE_COMPASS] = HintText::Item({
+    hintTable[RHT_SHADOW_TEMPLE_COMPASS] = HintText::Item({
                         //obscure text
                         Text{"a creepy treasure tracker", /*french*/"un cherche-trésor sinistre",  /*spanish*/"un zahorí siniestra"},
                         Text{"a creepy magnetic needle",      /*french*/"une aimant sinistre",             /*spanish*/"un imán siniestra"},
@@ -1158,7 +1158,7 @@ void HintTable_Init_Item() {
                         //clear text
                         Text{"the Shadow Temple Compass", /*french*/"la boussole du Temple de l'Ombre", /*spanish*/"la brújula del Templo de las Sombras"}
      );
-    hintTable[BOTTOM_OF_THE_WELL_COMPASS] = HintText::Item({
+    hintTable[RHT_BOTTOM_OF_THE_WELL_COMPASS] = HintText::Item({
                         //obscure text
                         Text{"a dank treasure tracker", /*french*/"un cherche-trésor moisi",  /*spanish*/"un zahorí mohoso"},
                         Text{"a dank magnetic needle",      /*french*/"une aimant moisi",             /*spanish*/"un imán mohoso"},
@@ -1169,7 +1169,7 @@ void HintTable_Init_Item() {
                         //clear text
                         Text{"the Bottom of the Well Compass", /*french*/"la boussole du fond du Puits", /*spanish*/"la brújula del Fondo del pozo"}
      );
-    hintTable[ICE_CAVERN_COMPASS] = HintText::Item({
+    hintTable[RHT_ICE_CAVERN_COMPASS] = HintText::Item({
                         //obscure text
                         Text{"a polar treasure tracker", /*french*/"un cherche-trésor polaire",  /*spanish*/"un zahorí polar"},
                         Text{"a polar magnetic needle",      /*french*/"une aimant polaire",             /*spanish*/"un imán polar"},
@@ -1180,7 +1180,7 @@ void HintTable_Init_Item() {
                         //clear text
                         Text{"the Ice Cavern Compass", /*french*/"la Boussole de la Caverne Polaire", /*spanish*/"la brújula de la Caverna de hielo"}
      );
-    hintTable[FOREST_TEMPLE_BOSS_KEY] = HintText::Item({
+    hintTable[RHT_FOREST_TEMPLE_BOSS_KEY] = HintText::Item({
                         //obscure text
                         Text{"a sylvan master of unlocking", /*french*/"un anti-grosse porte sylvestre",  /*spanish*/"la clave enselvada de un jefe"},
                         Text{"a sylvan dungeon's master pass",      /*french*/"une clé maléfique sylvestree",             /*spanish*/"el pase maestro enselvado"},
@@ -1191,7 +1191,7 @@ void HintTable_Init_Item() {
                         //clear text
                         Text{"the Forest Temple Boss Key", /*french*/"la Clé d'Or du Temple de la Forêt", /*spanish*/"la gran llave del Templo del Bosque"}
      );
-    hintTable[FIRE_TEMPLE_BOSS_KEY] = HintText::Item({
+    hintTable[RHT_FIRE_TEMPLE_BOSS_KEY] = HintText::Item({
                         //obscure text
                         Text{"a molten master of unlocking", /*french*/"un anti-grosse porte fondu",  /*spanish*/"la clave fundido de un jefe"},
                         Text{"a molten dungeon's master pass",      /*french*/"une clé maléfique fondu",             /*spanish*/"el pase maestro fundido"},
@@ -1202,7 +1202,7 @@ void HintTable_Init_Item() {
                         //clear text
                         Text{"the Fire Temple Boss Key", /*french*/"la Clé d'Or du Temple du Feu", /*spanish*/"la gran llave del Templo del Fuego"}
      );
-    hintTable[WATER_TEMPLE_BOSS_KEY] = HintText::Item({
+    hintTable[RHT_WATER_TEMPLE_BOSS_KEY] = HintText::Item({
                         //obscure text
                         Text{"a wet master of unlocking", /*french*/"un anti-grosse porte humide",  /*spanish*/"la clave mojado de un jefe"},
                         Text{"a wet dungeon's master pass",      /*french*/"une clé maléfique humide",             /*spanish*/"el pase maestro mojado"},
@@ -1213,7 +1213,7 @@ void HintTable_Init_Item() {
                         //clear text
                         Text{"the Water Temple Boss Key", /*french*/"la Clé d'Or du Temple de l'Eau", /*spanish*/"la gran llave del Templo del Agua"}
      );
-    hintTable[SPIRIT_TEMPLE_BOSS_KEY] = HintText::Item({
+    hintTable[RHT_SPIRIT_TEMPLE_BOSS_KEY] = HintText::Item({
                         //obscure text
                         Text{"a sandy master of unlocking", /*french*/"un anti-grosse porte sableux",  /*spanish*/"la clave arenoso de un jefe"},
                         Text{"a sandy dungeon's master pass",      /*french*/"une clé maléfique sableux",             /*spanish*/"el pase maestro arenoso"},
@@ -1224,7 +1224,7 @@ void HintTable_Init_Item() {
                         //clear text
                         Text{"the Spirit Temple Boss Key", /*french*/"la Clé d'Or du Temple de l'Esprit", /*spanish*/"la gran llave del Templo del Espíritu"}
      );
-    hintTable[SHADOW_TEMPLE_BOSS_KEY] = HintText::Item({
+    hintTable[RHT_SHADOW_TEMPLE_BOSS_KEY] = HintText::Item({
                         //obscure text
                         Text{"a creepy master of unlocking", /*french*/"un anti-grosse porte sinistre",  /*spanish*/"la clave siniestra de un jefe"},
                         Text{"a creepy dungeon's master pass",      /*french*/"une clé maléfique sinistre",             /*spanish*/"el pase maestro siniestra"},
@@ -1235,7 +1235,7 @@ void HintTable_Init_Item() {
                         //clear text
                         Text{"the Shadow Temple Boss Key", /*french*/"la Clé d'Or du Temple de l'Ombre", /*spanish*/"la gran llave del Templo de las Sombras"}
      );
-    hintTable[GANONS_CASTLE_BOSS_KEY] = HintText::Item({
+    hintTable[RHT_GANONS_CASTLE_BOSS_KEY] = HintText::Item({
                         //obscure text
                         Text{"a final master of unlocking", /*french*/"un anti-grosse porte final",  /*spanish*/"la clave final de un jefe"},
                         Text{"a final dungeon's master pass",      /*french*/"une clé maléfique final",             /*spanish*/"el pase maestro final"},
@@ -1246,7 +1246,7 @@ void HintTable_Init_Item() {
                         //clear text
                         Text{"the Ganon's Castle Boss Key", /*french*/"la Clé d'Or du Château de Ganon", /*spanish*/"la gran llave del Castillo de Ganon"}
      );
-    hintTable[FOREST_TEMPLE_SMALL_KEY] = HintText::Item({
+    hintTable[RHT_FOREST_TEMPLE_SMALL_KEY] = HintText::Item({
                         //obscure text
                         Text{"a sylvan tool for unlocking", /*french*/"un anti-porte sylvestre",            /*spanish*/"una clave de una entrada enselvada"},
                         Text{"a sylvan dungeon pass",       /*french*/"le rêve sylvestre d'un prisonnier",  /*spanish*/"un pase de una mazmorra enselvada"},
@@ -1259,7 +1259,7 @@ void HintTable_Init_Item() {
                         //clear text
                         Text{"a Forest Temple Small Key", /*french*/"une petite clé du Temple de la Forêt", /*spanish*/"una llave pequeña del Templo del Bosque"}
      );
-    hintTable[FIRE_TEMPLE_SMALL_KEY] = HintText::Item({
+    hintTable[RHT_FIRE_TEMPLE_SMALL_KEY] = HintText::Item({
                         //obscure text
                         Text{"a molten tool for unlocking", /*french*/"un anti-porte fondu",            /*spanish*/"una clave de una entrada fundida"},
                         Text{"a molten dungeon pass",       /*french*/"le rêve fondu d'un prisonnier",  /*spanish*/"un pase de una mazmorra fundida"},
@@ -1272,7 +1272,7 @@ void HintTable_Init_Item() {
                         //clear text
                         Text{"a Fire Temple Small Key", /*french*/"une petite clé du Temple du Feu", /*spanish*/"una llave pequeña del Templo del Fuego"}
      );
-    hintTable[WATER_TEMPLE_SMALL_KEY] = HintText::Item({
+    hintTable[RHT_WATER_TEMPLE_SMALL_KEY] = HintText::Item({
                         //obscure text
                         Text{"a wet tool for unlocking", /*french*/"un anti-porte humide",            /*spanish*/"una clave de una entrada mojada"},
                         Text{"a wet dungeon pass",       /*french*/"le rêve humide d'un prisonnier",  /*spanish*/"un pase de una mazmorra mojada"},
@@ -1285,7 +1285,7 @@ void HintTable_Init_Item() {
                         //clear text
                         Text{"a Water Temple Small Key", /*french*/"une petite clé du Temple de l'Eau", /*spanish*/"una llave pequeña del Templo del Agua"}
      );
-    hintTable[SPIRIT_TEMPLE_SMALL_KEY] = HintText::Item({
+    hintTable[RHT_SPIRIT_TEMPLE_SMALL_KEY] = HintText::Item({
                         //obscure text
                         Text{"a sandy tool for unlocking", /*french*/"un anti-porte sableux",            /*spanish*/"una clave de una entrada arenosa"},
                         Text{"a sandy dungeon pass",       /*french*/"le rêve sableux d'un prisonnier",  /*spanish*/"un pase de una mazmorra arenosa"},
@@ -1298,7 +1298,7 @@ void HintTable_Init_Item() {
                         //clear text
                         Text{"a Spirit Temple Small Key", /*french*/"une petite clé du Temple de l'Esprit", /*spanish*/"una llave pequeña del Templo del Espíritu"}
      );
-    hintTable[SHADOW_TEMPLE_SMALL_KEY] = HintText::Item({
+    hintTable[RHT_SHADOW_TEMPLE_SMALL_KEY] = HintText::Item({
                         //obscure text
                         Text{"a creepy tool for unlocking", /*french*/"un anti-porte sinistre",            /*spanish*/"una clave de una entrada siniestra:a"},
                         Text{"a creepy dungeon pass",       /*french*/"le rêve sinistre d'un prisonnier",  /*spanish*/"un pase de una mazmorra siniestra:a"},
@@ -1311,7 +1311,7 @@ void HintTable_Init_Item() {
                         //clear text
                         Text{"a Shadow Temple Small Key", /*french*/"une petite clé du Temple de l'Ombre", /*spanish*/"una llave pequeña del Templo de las Sombras"}
      );
-    hintTable[GERUDO_TRAINING_GROUNDS_SMALL_KEY] = HintText::Item({
+    hintTable[RHT_GERUDO_TRAINING_GROUNDS_SMALL_KEY] = HintText::Item({
                         //obscure text
                         Text{"a labyrinthian tool for unlocking", /*french*/"un anti-porte labyrinthique",            /*spanish*/"una clave de una entrada laberíntica"},
                         Text{"a labyrinthian dungeon pass",       /*french*/"le rêve labyrinthique d'un prisonnier",  /*spanish*/"un pase de una mazmorra laberíntica"},
@@ -1324,7 +1324,7 @@ void HintTable_Init_Item() {
                         //clear text
                         Text{"a Gerudo Training Ground Small Key", /*french*/"une petite clé du Gymnase Gerudo", /*spanish*/"una llave pequeña del Centro de Instrucción Gerudo"}
      );
-    hintTable[GERUDO_FORTRESS_SMALL_KEY] = HintText::Item({
+    hintTable[RHT_GERUDO_FORTRESS_SMALL_KEY] = HintText::Item({
                         //obscure text
                         Text{"an imprisoned tool for unlocking", /*french*/"un anti-porte emprisonné",            /*spanish*/"una clave de una entrada encarcelada"},
                         Text{"an imprisoned dungeon pass",       /*french*/"le rêve emprisonné d'un prisonnier",  /*spanish*/"un pase de una mazmorra encarcelada"},
@@ -1337,7 +1337,7 @@ void HintTable_Init_Item() {
                         //clear text
                         Text{"a Gerudo Fortress Small Key", /*french*/"une petite clé de la Repaire des Voleurs", /*spanish*/"una llave pequeña de la Fortaleza Gerudo"}
      );
-    hintTable[BOTTOM_OF_THE_WELL_SMALL_KEY] = HintText::Item({
+    hintTable[RHT_BOTTOM_OF_THE_WELL_SMALL_KEY] = HintText::Item({
                         //obscure text
                         Text{"a moldy tool for unlocking", /*french*/"un anti-porte moisi",            /*spanish*/"una clave de una entrada mohosa"},
                         Text{"a moldy dungeon pass",       /*french*/"le rêve moisi d'un prisonnier",  /*spanish*/"un pase de una mazmorra mohosa"},
@@ -1350,7 +1350,7 @@ void HintTable_Init_Item() {
                         //clear text
                         Text{"a Bottom of the Well Small Key", /*french*/"une petite clé du fond du Puits", /*spanish*/"una llave pequeña del Fondo del pozo"}
      );
-    hintTable[GANONS_CASTLE_SMALL_KEY] = HintText::Item({
+    hintTable[RHT_GANONS_CASTLE_SMALL_KEY] = HintText::Item({
                         //obscure text
                         Text{"a final tool for unlocking", /*french*/"un anti-porte final",            /*spanish*/"una clave de una entrada final"},
                         Text{"a final dungeon pass",       /*french*/"le rêve final d'un prisonnier",  /*spanish*/"un pase de una mazmorra final"},
@@ -1363,7 +1363,7 @@ void HintTable_Init_Item() {
                         //clear text
                         Text{"a Ganon's Castle Small Key", /*french*/"une petite clé du Château de Ganon", /*spanish*/"una llave pequeña del Castillo de Ganon"}
      );
-     hintTable[FOREST_TEMPLE_KEY_RING] = HintText::Item({
+     hintTable[RHT_FOREST_TEMPLE_KEY_RING] = HintText::Item({
                         //obscure text
                         Text{"a sylvan toolbox for unlocking", /*french*/"des anti-portes sylvestres",            /*spanish*/"un conjunto silvestre de cerrajero"},
                         Text{"a sylvan dungeon season pass",   /*french*/"les rêves sylvestres d'un prisonnier",  /*spanish*/"un pase vip de mazmorras silvestre"},
@@ -1376,7 +1376,7 @@ void HintTable_Init_Item() {
                         //clear text
                         Text{"a Forest Temple Key Ring", /*french*/"un trousseau de clés du Temple de la Forêt", /*spanish*/"un llavero del Templo del Bosque"}
      );
-    hintTable[FIRE_TEMPLE_KEY_RING] = HintText::Item({
+    hintTable[RHT_FIRE_TEMPLE_KEY_RING] = HintText::Item({
                         //obscure text
                         Text{"a molten toolbox for unlocking", /*french*/"des anti-portes fondus",            /*spanish*/"un conjunto fundido de cerrajero"},
                         Text{"a molten dungeon season pass",   /*french*/"les rêves fondus d'un prisonnier",  /*spanish*/"un pase vip de mazmorras fundido"},
@@ -1389,7 +1389,7 @@ void HintTable_Init_Item() {
                         //clear text
                         Text{"a Fire Temple Key Ring", /*french*/"un trousseau de clés du Temple du Feu", /*spanish*/"un llavero del Templo del Fuego"}
      );
-    hintTable[WATER_TEMPLE_KEY_RING] = HintText::Item({
+    hintTable[RHT_WATER_TEMPLE_KEY_RING] = HintText::Item({
                         //obscure text
                         Text{"a wet toolbox for unlocking", /*french*/"des anti-portes humides",            /*spanish*/"un conjunto abisal de cerrajero"},
                         Text{"a wet dungeon season pass",   /*french*/"les rêves humides d'un prisonnier",  /*spanish*/"un pase vip de mazmorras abisal"},
@@ -1402,7 +1402,7 @@ void HintTable_Init_Item() {
                         //clear text
                         Text{"a Water Temple Key Ring", /*french*/"un trousseau de clés du Temple de l'Eau", /*spanish*/"un llavero del Templo del Agua"}
      );
-    hintTable[SPIRIT_TEMPLE_KEY_RING] = HintText::Item({
+    hintTable[RHT_SPIRIT_TEMPLE_KEY_RING] = HintText::Item({
                         //obscure text
                         Text{"a sandy toolbox for unlocking", /*french*/"des anti-portes sableux",            /*spanish*/"un conjunto arenoso de cerrajero"},
                         Text{"a sandy dungeon season pass",   /*french*/"les rêves sableux d'un prisonnier",  /*spanish*/"un pase vip de mazmorras arenoso"},
@@ -1415,7 +1415,7 @@ void HintTable_Init_Item() {
                         //clear text
                         Text{"a Spirit Temple Key Ring", /*french*/"un trousseau de clés du Temple de l'Esprit", /*spanish*/"un llavero del Templo del Espíritu"}
      );
-    hintTable[SHADOW_TEMPLE_KEY_RING] = HintText::Item({
+    hintTable[RHT_SHADOW_TEMPLE_KEY_RING] = HintText::Item({
                         //obscure text
                         Text{"a creepy toolbox for unlocking", /*french*/"des anti-portes sinistres",            /*spanish*/"un conjunto tenebroso de cerrajero"},
                         Text{"a creepy dungeon season pass",   /*french*/"les rêves sinistres d'un prisonnier",  /*spanish*/"un pase vip de mazmorras tenebroso"},
@@ -1428,7 +1428,7 @@ void HintTable_Init_Item() {
                         //clear text
                         Text{"a Shadow Temple Key Ring", /*french*/"un trousseau de clés du Temple de l'Ombre", /*spanish*/"un llavero del Templo de las Sombras"}
      );
-    hintTable[GERUDO_TRAINING_GROUNDS_KEY_RING] = HintText::Item({
+    hintTable[RHT_GERUDO_TRAINING_GROUNDS_KEY_RING] = HintText::Item({
                         //obscure text
                         Text{"a labyrinthian toolbox for unlocking", /*french*/"des anti-portes labyrinthiques",            /*spanish*/"un conjunto laberíntico de cerrajero"},
                         Text{"a labyrinthian dungeon season pass",   /*french*/"les rêves labyrinthiques d'un prisonnier",  /*spanish*/"un pase vip de mazmorras laberíntico"},
@@ -1441,7 +1441,7 @@ void HintTable_Init_Item() {
                         //clear text
                         Text{"a Gerudo Training Ground Key Ring", /*french*/"un trousseau de clés du Gymnase Gerudo", /*spanish*/"un llavero del Centro de Instrucción Gerudo"}
      );
-    hintTable[GERUDO_FORTRESS_KEY_RING] = HintText::Item({
+    hintTable[RHT_GERUDO_FORTRESS_KEY_RING] = HintText::Item({
                         //obscure text
                         Text{"an imprisoned toolbox for unlocking", /*french*/"des anti-portes emprisonnés",            /*spanish*/"un conjunto enjaulado de cerrajero"},
                         Text{"an imprisoned dungeon season pass",   /*french*/"les rêves emprisonnés d'un prisonnier",  /*spanish*/"un pase vip de una mazmorra enjaulado"},
@@ -1454,7 +1454,7 @@ void HintTable_Init_Item() {
                         //clear text
                         Text{"a Gerudo Fortress Key Ring", /*french*/"un trousseau de clés de la Repaire des Voleurs", /*spanish*/"un llavero de la Fortaleza Gerudo"}
      );
-    hintTable[BOTTOM_OF_THE_WELL_KEY_RING] = HintText::Item({
+    hintTable[RHT_BOTTOM_OF_THE_WELL_KEY_RING] = HintText::Item({
                         //obscure text
                         Text{"a moldy toolbox for unlocking", /*french*/"des anti-portes moisis",            /*spanish*/"un conjunto subterráneo de cerrajero"},
                         Text{"a moldy dungeon season pass",   /*french*/"les rêves moisis d'un prisonnier",  /*spanish*/"un pase vip de una mazmorra subterráneo"},
@@ -1467,7 +1467,7 @@ void HintTable_Init_Item() {
                         //clear text
                         Text{"a Bottom of the Well Key Ring", /*french*/"un trousseau de clés du fond du Puits", /*spanish*/"un llavero del Fondo del pozo"}
      );
-    hintTable[GANONS_CASTLE_KEY_RING] = HintText::Item({
+    hintTable[RHT_GANONS_CASTLE_KEY_RING] = HintText::Item({
                         //obscure text
                         Text{"a final toolbox for unlocking", /*french*/"des anti-portes finaux",            /*spanish*/"un conjunto decisivo de cerrajero"},
                         Text{"a final dungeon season pass",   /*french*/"les rêves finaux d'un prisonnier",  /*spanish*/"un pase vip de una mazmorra decisivo"},
@@ -1481,7 +1481,7 @@ void HintTable_Init_Item() {
                         Text{"a Ganon's Castle Key Ring", /*french*/"un trousseau de clés du Château de Ganon", /*spanish*/"un llavero del Castillo de Ganon"}
      );
 
-    hintTable[TREASURE_GAME_SMALL_KEY] = HintText::Item({
+    hintTable[RHT_TREASURE_GAME_SMALL_KEY] = HintText::Item({
                         //obscure text
                         Text{"a gambler's tool for unlocking", /*french*/"un anti-porte de parieur",        /*spanish*/"una clave de un juego de azar"},
                         Text{"a gambler's dungeon pass",       /*french*/"le rêve d'un prisonnier parieur", /*spanish*/"un pase de un juego de azar"},
@@ -1495,7 +1495,7 @@ void HintTable_Init_Item() {
                         Text{"a Treasure Chest Shop Small Key", /*french*/"une petite clé de la chasse aux trésors", /*spanish*/"una llave pequeña del Cofre del Tesoro"}
     );
 
-    hintTable[KOKIRI_EMERALD] = HintText::Item({
+    hintTable[RHT_KOKIRI_EMERALD] = HintText::Item({
                        //obscure text
                        Text{"a green stone",       /*french*/"une pierre verte",               /*spanish*/"una piedra verde"},
                        Text{"a gift before death", /*french*/"le dernier souffle d'un arbre", /*spanish*/"un obsequio testamentario"},
@@ -1507,7 +1507,7 @@ void HintTable_Init_Item() {
                        Text{"the Kokiri Emerald", /*french*/"l'Émeraude Kokiri", /*spanish*/"la Esmeralda de los Kokiri"}
     );
 
-    hintTable[GORON_RUBY] = HintText::Item({
+    hintTable[RHT_GORON_RUBY] = HintText::Item({
                        //obscure text
                        Text{"a red stone",       /*french*/"une pierre rouge",         /*spanish*/"una piedra carmín"},
                        Text{"sworn brotherhood", /*french*/"un serment de fraternité", /*spanish*/"el juramento de hermanos de sangre"},
@@ -1519,7 +1519,7 @@ void HintTable_Init_Item() {
                        Text{"the Goron Ruby", /*french*/"le Rubis Goron", /*spanish*/"el Rubí de los Goron"}
     );
 
-    hintTable[ZORA_SAPPHIRE] = HintText::Item({
+    hintTable[RHT_ZORA_SAPPHIRE] = HintText::Item({
                        //obscure text
                        Text{"a blue stone",       /*french*/"une pierre bleue",     /*spanish*/"una piedra celeste"},
                        Text{"an engagement gift", /*french*/"un cadeau de mariage", /*spanish*/"un regalo de compromiso"},
@@ -1531,7 +1531,7 @@ void HintTable_Init_Item() {
                        Text{"the Zora Sapphire", /*french*/"le Saphir Zora", /*spanish*/"el Zafiro de los Zora"}
     );
 
-    hintTable[FOREST_MEDALLION] = HintText::Item({
+    hintTable[RHT_FOREST_MEDALLION] = HintText::Item({
                        //obscure text
                        Text{"a green coin",       /*french*/"une pièce verte",    /*spanish*/"una moneda esmeralda"},
                        Text{"Saria's friendship", /*french*/"l'amitié de Saria", /*spanish*/"la amistad de Saria"},
@@ -1543,7 +1543,7 @@ void HintTable_Init_Item() {
                        Text{"the Forest Medallion", /*french*/"le Médaillon de la Forêt", /*spanish*/"el Medallón del Bosque"}
     );
 
-    hintTable[FIRE_MEDALLION] = HintText::Item({
+    hintTable[RHT_FIRE_MEDALLION] = HintText::Item({
                        //obscure text
                        Text{"a red coin",      /*french*/"une pièce rouge",           /*spanish*/"una moneda rubí"},
                        Text{"Darunia's power", /*french*/"la fraternité de Darunia", /*spanish*/"la fraternidad de Darunia"},
@@ -1555,7 +1555,7 @@ void HintTable_Init_Item() {
                        Text{"the Fire Medallion", /*french*/"le Médaillon du Feu", /*spanish*/"el Medallón del Fuego"}
     );
 
-    hintTable[WATER_MEDALLION] = HintText::Item({
+    hintTable[RHT_WATER_MEDALLION] = HintText::Item({
                        //obscure text
                        Text{"a blue coin",  /*french*/"une pièce bleue",  /*spanish*/"una moneda zafiro"},
                        Text{"Ruto's power", /*french*/"l'amour de Ruto", /*spanish*/"el amor de Ruto"},
@@ -1567,7 +1567,7 @@ void HintTable_Init_Item() {
                        Text{"the Water Medallion", /*french*/"le Médaillon de l'Eau", /*spanish*/"el Medallón del Agua"}
     );
 
-    hintTable[SPIRIT_MEDALLION] = HintText::Item({
+    hintTable[RHT_SPIRIT_MEDALLION] = HintText::Item({
                        //obscure text
                        Text{"an orange coin",  /*french*/"une pièce orange",       /*spanish*/"una moneda ámbar"},
                        Text{"Nabooru's power", /*french*/"le respect de Nabooru", /*spanish*/"el respeto de Nabooru"},
@@ -1579,7 +1579,7 @@ void HintTable_Init_Item() {
                        Text{"the Spirit Medallion", /*french*/"le Médaillon de l'Esprit", /*spanish*/"el Medallón del Espíritu"}
     );
 
-    hintTable[SHADOW_MEDALLION] = HintText::Item({
+    hintTable[RHT_SHADOW_MEDALLION] = HintText::Item({
                        //obscure text
                        Text{"a purple coin", /*french*/"une pièce pourpre",    /*spanish*/"una moneda malva"},
                        Text{"Impa's power",  /*french*/"la confiance d'Impa", /*spanish*/"la confianza de Impa"},
@@ -1591,7 +1591,7 @@ void HintTable_Init_Item() {
                        Text{"the Shadow Medallion", /*french*/"le Médaillon de l'Ombre", /*spanish*/"el Medallón de la Sombra"}
     );
 
-    hintTable[LIGHT_MEDALLION] = HintText::Item({
+    hintTable[RHT_LIGHT_MEDALLION] = HintText::Item({
                        //obscure text
                        Text{"a yellow coin", /*french*/"une pièce jaune",  /*spanish*/"una moneda resplandeciente"},
                        Text{"Rauru's power", /*french*/"la foi de Rauru", /*spanish*/"la fe de Rauru"},
@@ -1603,7 +1603,7 @@ void HintTable_Init_Item() {
                        Text{"the Light Medallion", /*french*/"le Médaillon de la Lumière", /*spanish*/"el Medallón de la Luz"}
     );
 
-    hintTable[RECOVERY_HEART] = HintText::Item({
+    hintTable[RHT_RECOVERY_HEART] = HintText::Item({
                        //obscure text
                        Text{"a free heal",   /*french*/"un bec-au-bobo", /*spanish*/"una cura de regalo"},
                        Text{"a hearty meal", /*french*/"un petit amour",   /*spanish*/"una sanación romántica"},
@@ -1616,7 +1616,7 @@ void HintTable_Init_Item() {
                        Text{"a Recovery Heart", /*french*/"un coeur de vie", /*spanish*/"un corazón"}
     );
 
-    hintTable[GREEN_RUPEE] = HintText::Item({
+    hintTable[RHT_GREEN_RUPEE] = HintText::Item({
                        //obscure text
                        Text{"a unique coin", /*french*/"un rubis bien mérité", /*spanish*/"una singular moneda"},
                        Text{"a penny",       /*french*/"un sou",               /*spanish*/"un peso hyliano"},
@@ -1629,7 +1629,7 @@ void HintTable_Init_Item() {
                        Text{"a Green Rupee", /*french*/"un rubis vert", /*spanish*/"una rupia verde"}
     );
 
-    hintTable[GREG_RUPEE] = HintText::Item({
+    hintTable[RHT_GREG_RUPEE] = HintText::Item({
                        //obscure text
                        Text{"an old friend",  /*french*/"Greg", /*spanish*/"Greg"},
                        Text{"a glorious gem", /*french*/"Greg", /*spanish*/"Greg"},
@@ -1641,7 +1641,7 @@ void HintTable_Init_Item() {
                        Text{"Greg", /*french*/"Greg", /*spanish*/"Greg"}
     );
 
-    hintTable[BLUE_RUPEE] = HintText::Item({
+    hintTable[RHT_BLUE_RUPEE] = HintText::Item({
                        //obscure text
                        Text{"a common coin", /*french*/"quelques sous", /*spanish*/"una moneda usual"},
                        Text{"a blue gem",    /*french*/"un joyau bleu",  /*spanish*/"una gema azul"},
@@ -1653,7 +1653,7 @@ void HintTable_Init_Item() {
                        Text{"a Blue Rupee", /*french*/"un rubis bleu", /*spanish*/"una rupia azul"}
     );
 
-    hintTable[RED_RUPEE] = HintText::Item({
+    hintTable[RHT_RED_RUPEE] = HintText::Item({
                        //obscure text
                        Text{"couch cash", /*french*/"un peu de fric", /*spanish*/"una buena moneda"},
                        Text{"a red gem",  /*french*/"un joyau rouge", /*spanish*/"una gema roja"},
@@ -1665,7 +1665,7 @@ void HintTable_Init_Item() {
                        Text{"a Red Rupee", /*french*/"un rubis rouge", /*spanish*/"una rupia roja"}
     );
 
-    hintTable[PURPLE_RUPEE] = HintText::Item({
+    hintTable[RHT_PURPLE_RUPEE] = HintText::Item({
                        //obscure text
                        Text{"big bucks",    /*french*/"plein de fric",  /*spanish*/"plata de calidad"},
                        Text{"a purple gem", /*french*/"un joyau mauve", /*spanish*/"una gema morada"},
@@ -1678,7 +1678,7 @@ void HintTable_Init_Item() {
                        Text{"a Purple Rupee", /*french*/"un rubis pourpre", /*spanish*/"una rupia morada"}
     );
 
-    hintTable[HUGE_RUPEE] = HintText::Item({
+    hintTable[RHT_HUGE_RUPEE] = HintText::Item({
                        //obscure text
                        Text{"a juicy jackpot", /*french*/"le jackpot",           /*spanish*/"el premio gordo"},
                        Text{"a yellow gem",    /*french*/"un joyau doré",         /*spanish*/"una gema amarilla"},
@@ -1692,7 +1692,7 @@ void HintTable_Init_Item() {
                        Text{"a Huge Rupee", /*french*/"un énorme rubis", /*spanish*/"una rupia gigante"}
     );
 
-    hintTable[PIECE_OF_HEART] = HintText::Item({
+    hintTable[RHT_PIECE_OF_HEART] = HintText::Item({
                        //obscure text
                        Text{"a little love",  /*french*/"un peu plus d'amour", /*spanish*/"un cuarto de amor"},
                        Text{"a broken heart", /*french*/"un coeur brisé",       /*spanish*/"un corazón roto"},
@@ -1704,7 +1704,7 @@ void HintTable_Init_Item() {
                        Text{"a Piece of Heart", /*french*/"un Quart de Coeur", /*spanish*/"una pieza de corazón"}
     );
 
-    hintTable[HEART_CONTAINER] = HintText::Item({
+    hintTable[RHT_HEART_CONTAINER] = HintText::Item({
                        //obscure text
                        Text{"a lot of love",      /*french*/"le grand amour",             /*spanish*/"amor por doquier"},
                        Text{"a Valentine's gift", /*french*/"un cadeau de Saint-Valentin", /*spanish*/"un contenedor de afección"},
@@ -1717,7 +1717,7 @@ void HintTable_Init_Item() {
                        Text{"a Heart Container", /*french*/"un Réceptacle de Coeur", /*spanish*/"un contenedor de corazón"}
     );
 
-    hintTable[ICE_TRAP] = HintText::Item({
+    hintTable[RHT_ICE_TRAP] = HintText::Item({
                        //obscure text
                        Text{"a gift from Ganon",    /*french*/"un cadeau de Ganon",         /*spanish*/"un regalo de Ganon"},
                        Text{"a chilling discovery", /*french*/"une frissonante découverte", /*spanish*/"un escalofriante hallazgo"},
@@ -1734,9 +1734,9 @@ void HintTable_Init_Item() {
                        Text{"an Ice Trap", /*french*/"un Piège de Glace", /*spanish*/"una trampa de hielo"}
     );
 
-  //MILK
+  //RHT_MILK
 
-    hintTable[BOMBS_5] = HintText::Item({
+    hintTable[RHT_BOMBS_5] = HintText::Item({
                        //obscure text
                        Text{"a few explosives",  /*french*/"une poignée de pétards",       /*spanish*/"un par de explosivos"},
                        Text{"a few blast balls", /*french*/"une poignée de boules bleues", /*spanish*/"un par de estallidos"},
@@ -1748,7 +1748,7 @@ void HintTable_Init_Item() {
                        Text{"Bombs (5 pieces)", /*french*/"une demi-dizaine de bombes", /*spanish*/"unas (5) bombas"}
     );
 
-    hintTable[BOMBS_10] = HintText::Item({
+    hintTable[RHT_BOMBS_10] = HintText::Item({
                        //obscure text
                        Text{"some explosives",  /*french*/"un paquet de pétards",       /*spanish*/"unos cuantos explosivos"},
                        Text{"some blast balls", /*french*/"un paquet de boules bleues", /*spanish*/"unos cuantos estallidos"},
@@ -1760,7 +1760,7 @@ void HintTable_Init_Item() {
                        Text{"Bombs (10 pieces)", /*french*/"une dizaine de bombes", /*spanish*/"unas (10) bombas"}
     );
 
-    hintTable[BOMBS_20] = HintText::Item({
+    hintTable[RHT_BOMBS_20] = HintText::Item({
                        //obscure text
                        Text{"lots-o-explosives",     /*french*/"une abondance de pétards",       /*spanish*/"un puñado de explosivos"},
                        Text{"plenty of blast balls", /*french*/"une abondance de boules bleues", /*spanish*/"bastantes estallidos"},
@@ -1772,7 +1772,7 @@ void HintTable_Init_Item() {
                        Text{"Bombs (20 pieces)", /*french*/"une vingtaine de bombes", /*spanish*/"unas (20) bombas"}
     );
 
-    hintTable[BOMBCHU_5] = HintText::Item({
+    hintTable[RHT_BOMBCHU_5] = HintText::Item({
                        //obscure text
                        Text{"a few mice bombs",     /*french*/"une poignée de mignons explosifs", /*spanish*/"un par de bombas roedoras"},
                        Text{"a few proximity mice", /*french*/"une poignée de jouets à remonter", /*spanish*/"un par de explosivos ratoncitos"},
@@ -1787,7 +1787,7 @@ void HintTable_Init_Item() {
                        Text{"Bombchus (5 pieces)", /*french*/"une demi-dizaine de Missiles", /*spanish*/"unos (5) bombchus"}
     );
 
-    hintTable[BOMBCHU_10] = HintText::Item({
+    hintTable[RHT_BOMBCHU_10] = HintText::Item({
                        //obscure text
                        Text{"some mice bombs",     /*french*/"un paquet de mignons explosifs", /*spanish*/"unas cuantas bombas roedoras"},
                        Text{"some proximity mice", /*french*/"un paquet de jouets à remonter", /*spanish*/"unos cuantos explosivos ratoncitos"},
@@ -1802,7 +1802,7 @@ void HintTable_Init_Item() {
                        Text{"Bombchus (10 pieces)", /*french*/"une dizaine de Missiles", /*spanish*/"unos (10) bombchus"}
     );
 
-    hintTable[BOMBCHU_20] = HintText::Item({
+    hintTable[RHT_BOMBCHU_20] = HintText::Item({
                        //obscure text
                        Text{"plenty of mice bombs",     /*french*/"une abondance de mignons explosifs", /*spanish*/"bastantes bombas roedoras"},
                        Text{"plenty of proximity mice", /*french*/"une abondance de jouets à remonter", /*spanish*/"bastantes explosivos ratoncitos"},
@@ -1817,9 +1817,9 @@ void HintTable_Init_Item() {
                        Text{"Bombchus (20 pieces)", /*french*/"une vingtaine de Missiles", /*spanish*/"unos (20) bombchus"}
     );
 
-  //BOMBCHU_DROP
+  //RHT_BOMBCHU_DROP
 
-    hintTable[ARROWS_5] = HintText::Item({
+    hintTable[RHT_ARROWS_5] = HintText::Item({
                        //obscure text
                        Text{"a few danger darts", /*french*/"une poignée d'obus",    /*spanish*/"un par de peligrosos dardos"},
                        Text{"a few sharp shafts", /*french*/"une poignée de piquets", /*spanish*/"un par de puntas afiladas"},
@@ -1831,7 +1831,7 @@ void HintTable_Init_Item() {
                        Text{"Arrows (5 pieces)", /*french*/"une demi-dizaine de flèches", /*spanish*/"unas (5) flechas"}
     );
 
-    hintTable[ARROWS_10] = HintText::Item({
+    hintTable[RHT_ARROWS_10] = HintText::Item({
                        //obscure text
                        Text{"some danger darts", /*french*/"un paquet d'obus",     /*spanish*/"unos cuantos peligrosos dardos"},
                        Text{"some sharp shafts", /*french*/"un paquet de piquets", /*spanish*/"unas cuantas puntas afiladas"},
@@ -1843,7 +1843,7 @@ void HintTable_Init_Item() {
                        Text{"Arrows (10 pieces)", /*french*/"une dizaine de flèches", /*spanish*/"unas (10) flechas"}
     );
 
-    hintTable[ARROWS_30] = HintText::Item({
+    hintTable[RHT_ARROWS_30] = HintText::Item({
                        //obscure text
                        Text{"plenty of danger darts", /*french*/"une abondance d'obus",     /*spanish*/"bastantes peligrosos dardos"},
                        Text{"plenty of sharp shafts", /*french*/"une abondance de piquets", /*spanish*/"bastantes puntas afiladas"},
@@ -1855,7 +1855,7 @@ void HintTable_Init_Item() {
                        Text{"Arrows (30 pieces)", /*french*/"une trentaine de flèches", /*spanish*/"unas (30) flechas"}
     );
 
-    hintTable[DEKU_NUTS_5] = HintText::Item({
+    hintTable[RHT_DEKU_NUTS_5] = HintText::Item({
                        //obscure text
                        Text{"some nuts",       /*french*/"une poignée de noisettes",     /*spanish*/"un par de nueces"},
                        Text{"some flashbangs", /*french*/"une poignée d'éclats",        /*spanish*/"un par de semillas aturdidoras"},
@@ -1869,7 +1869,7 @@ void HintTable_Init_Item() {
                        Text{"Deku Nuts (5 pieces)", /*french*/"une demi-dizaine de noix Mojo", /*spanish*/"unas (5) nueces deku"}
     );
 
-    hintTable[DEKU_NUTS_10] = HintText::Item({
+    hintTable[RHT_DEKU_NUTS_10] = HintText::Item({
                        //obscure text
                        Text{"lots-o-nuts",          /*french*/"un paquet de noisettes",     /*spanish*/"un puñado de nueces"},
                        Text{"plenty of flashbangs", /*french*/"un paquet d'éclats",         /*spanish*/"unas cuantas semillas aturdidoras"},
@@ -1883,7 +1883,7 @@ void HintTable_Init_Item() {
                        Text{"Deku Nuts (10 pieces)", /*french*/"une dizaine de noix Mojo", /*spanish*/"unas (10) nueces deku"}
     );
 
-    hintTable[DEKU_SEEDS_30] = HintText::Item({
+    hintTable[RHT_DEKU_SEEDS_30] = HintText::Item({
                        //obscure text
                        Text{"catapult ammo", /*french*/"un paquet de délicieuses munitions", /*spanish*/"un par de munición infantil"},
                        Text{"lots-o-seeds",  /*french*/"un paquet de germes séchés",   /*spanish*/"un puñado de semillas"},
@@ -1896,7 +1896,7 @@ void HintTable_Init_Item() {
                        Text{"Deku Seeds (30 pieces)", /*french*/"une trentaine de graines Mojo", /*spanish*/"unas (30) semillas deku"}
     );
 
-    hintTable[DEKU_STICK_1] = HintText::Item({
+    hintTable[RHT_DEKU_STICK_1] = HintText::Item({
                        //obscure text
                        Text{"a breakable branch", /*french*/"un bout de bois", /*spanish*/"un pequeño báculo"},
                      }, {
@@ -1907,7 +1907,7 @@ void HintTable_Init_Item() {
                        Text{"a Deku Stick", /*french*/"un bâton Mojo", /*spanish*/"un palo deku"}
     );
 
-    hintTable[TREASURE_GAME_HEART] = HintText::Item({
+    hintTable[RHT_TREASURE_GAME_HEART] = HintText::Item({
                        //obscure text
                        Text{"a victory valentine", /*french*/"un amour gagnant", /*spanish*/"el amor victorioso"},
                      }, {
@@ -1918,7 +1918,7 @@ void HintTable_Init_Item() {
                        Text{"a Piece of Heart", /*french*/"un Quart de Coeur", /*spanish*/"el amor de la victoria"}
     );
 
-    hintTable[TREASURE_GAME_GREEN_RUPEE] = HintText::Item({
+    hintTable[RHT_TREASURE_GAME_GREEN_RUPEE] = HintText::Item({
                        //obscure text
                        Text{"the dollar of defeat", /*french*/"le rubis de la défaite", /*spanish*/"el peso de la derrota"},
                      }, {
@@ -1929,7 +1929,7 @@ void HintTable_Init_Item() {
                        Text{"a Green Rupee", /*french*/"un rubis vert", /*spanish*/"una rupia verde"}
     );
 
-    hintTable[TRIFORCE_PIECE] = HintText::Item({
+    hintTable[RHT_TRIFORCE_PIECE] = HintText::Item({
                        //obscure text
                        Text{"a triumph fork",  /*french*/"la Tribosse",     /*spanish*/"un trígono del triunfo"},
                        Text{"cheese",          /*french*/"du fromage",      /*spanish*/"un porción de queso"},
@@ -1939,7 +1939,7 @@ void HintTable_Init_Item() {
                        Text{"a Piece of the Triforce", /*french*/"un fragment de la Triforce", /*spanish*/"un fragmento de la Trifuerza"}
     );
 
-    hintTable[EPONA] = HintText::Item({
+    hintTable[RHT_EPONA] = HintText::Item({
                        //obscure text
                        Text{"a horse",              /*french*/"un fidèle destrier", /*spanish*/"una yegua"},
                        Text{"a four legged friend", /*french*/"un puissant animal", /*spanish*/"una amiga cuadrúpeda"},
@@ -1953,7 +1953,7 @@ void HintTable_Init_Item() {
                        Text{"Epona", /*french*/"Epona", /*spanish*/"a Epona"}
     );
 
-    // [HINT_ERROR] = HintText::Item({
+    // [RHT_HINT_ERROR] = HintText::Item({
     //                      //obscure text
     //                      Text{"something mysterious", /*french*/"un sacré mystère", /*spanish*/"algo misterioso"},
     //                      Text{"an unknown treasure",  /*french*/"un trésor inconnu", /*spanish*/"un desconocido tesoro"},
diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.cpp b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
index dea7833fc..e0ae47dd0 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hints.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
@@ -2,7 +2,6 @@
 
 #include "custom_messages.hpp"
 #include "dungeon.hpp"
-#include "item_location.hpp"
 #include "item_pool.hpp"
 #include "logic.hpp"
 #include "random.hpp"
@@ -14,6 +13,7 @@
 #include "z64item.h"
 #include <spdlog/spdlog.h>
 #include "../randomizerTypes.h"
+#include "../context.h"
 
 using namespace CustomMessages;
 using namespace Logic;
@@ -215,24 +215,24 @@ std::string GetSariaHintLoc() {
   return sariaHintLoc;
 }
 
-Area* GetHintRegion(const uint32_t area) {
+Area* GetHintRegion(const RandomizerRegion area) {
 
-  std::vector<uint32_t> alreadyChecked = {};
-  std::vector<uint32_t> spotQueue = {area};
+  std::vector<RandomizerRegion> alreadyChecked = {};
+  std::vector<RandomizerRegion> spotQueue = {area};
 
   while (!spotQueue.empty()) {
-    uint32_t region = spotQueue.back();
+    RandomizerRegion region = spotQueue.back();
     alreadyChecked.push_back(region);
     spotQueue.pop_back();
 
-    if (AreaTable(region)->hintKey != NONE) {
+    if (AreaTable(region)->hintKey != RHT_NONE) {
       return AreaTable(region);
     }
 
     //add unchecked entrances to spot queue
     bool checked = false;
     for (auto& entrance : AreaTable(region)->entrances) {
-      for (uint32_t checkedEntrance : alreadyChecked) {
+      for (RandomizerRegion checkedEntrance : alreadyChecked) {
         if (entrance->GetParentRegionKey() == checkedEntrance) {
           checked = true;
           break;
@@ -245,60 +245,63 @@ Area* GetHintRegion(const uint32_t area) {
     }
   }
 
-  return AreaTable(NONE);
+  return AreaTable(RR_NONE);
 }
 
-uint32_t GetHintRegionHintKey(const uint32_t area) {
+RandomizerHintTextKey GetHintRegionHintKey(const RandomizerRegion area) {
     return GetHintRegion(area)->hintKey;
 }
 
-uint32_t GetHintRegionuint32_t(const uint32_t area) {
+uint32_t GetHintRegionuint32_t(const RandomizerRegion area) {
   return GetHintRegion(area)->hintKey;
 }
 
-uint32_t GetLocationRegionuint32_t(const uint32_t location) {
-  return GetHintRegion(Location(location)->GetParentRegionKey())->hintKey;
+uint32_t GetLocationRegionuint32_t(const RandomizerCheck location) {
+  return GetHintRegion(Rando::Context::GetInstance()->GetItemLocation(location)->GetParentRegionKey())->hintKey;
 }
 
-static std::vector<uint32_t> GetAccessibleGossipStones(const uint32_t hintedLocation = GANON) {
+static std::vector<RandomizerCheck> GetAccessibleGossipStones(const RandomizerCheck hintedLocation = RC_GANON) {
+  auto ctx = Rando::Context::GetInstance();
   //temporarily remove the hinted location's item, and then perform a
   //reachability search for gossip stone locations.
-  uint32_t originalItem = Location(hintedLocation)->GetPlaceduint32_t();
-  Location(hintedLocation)->SetPlacedItem(NONE);
+  RandomizerGet originalItem = ctx->GetItemLocation(hintedLocation)->GetPlacedRandomizerGet();
+  ctx->GetItemLocation(hintedLocation)->SetPlacedItem(RG_NONE);
 
   LogicReset();
-  auto accessibleGossipStones = GetAccessibleLocations(gossipStoneLocations);
+  auto accessibleGossipStones = GetAccessibleLocations(Rando::StaticData::gossipStoneLocations);
   //Give the item back to the location
-  Location(hintedLocation)->SetPlacedItem(originalItem);
+  ctx->GetItemLocation(hintedLocation)->SetPlacedItem(originalItem);
 
   return accessibleGossipStones;
 }
 
-static void AddHint(Text hint, const uint32_t gossipStone, const std::vector<uint8_t>& colors = {}, HintType hintType = HINT_TYPE_ITEM, const uint32_t hintedLocation = NONE) {
+static void AddHint(Text hint, const RandomizerCheck gossipStone, const std::vector<uint8_t>& colors = {}, HintType hintType = HINT_TYPE_ITEM, const RandomizerCheck hintedLocation = RC_UNKNOWN_CHECK) {
   //save hints as dummy items for writing to the spoiler log
-  NewItem(gossipStone, Item{RG_HINT, hint, ITEMTYPE_EVENT, GI_RUPEE_BLUE_LOSE, false, &noVariable, NONE});
-  Location(gossipStone)->SetPlacedItem(gossipStone);
-  Location(gossipStone)->SetHintedLocation(hintedLocation);
-  Location(gossipStone)->SetHintType(hintType);
-  Location(gossipStone)->SetHintedRegion(GetHintRegion(Location(hintedLocation)->GetParentRegionKey())->GetHint().GetText().GetEnglish());
+  //NewItem(gossipStone, Item{RG_HINT, hint, ITEMTYPE_EVENT, GI_RUPEE_BLUE_LOSE, false, &noVariable, NONE});
+  //GetLocation(gossipStone)->SetPlacedItem(gossipStone);
+
+  auto ctx = Rando::Context::GetInstance();
+  ctx->AddHint((RandomizerHintKey)((gossipStone - RC_DMC_GOSSIP_STONE) + 1), hint, hintedLocation, hintType, GetHintRegion(ctx->GetItemLocation(hintedLocation)->GetParentRegionKey())->GetHint().GetText());
+  ctx->GetItemLocation(gossipStone)->SetPlacedItem(RG_HINT);
 }
 
-static void CreateLocationHint(const std::vector<uint32_t>& possibleHintLocations) {
+static void CreateLocationHint(const std::vector<RandomizerCheck>& possibleHintLocations) {
+  auto ctx = Rando::Context::GetInstance();
   //return if there aren't any hintable locations or gossip stones available
   if (possibleHintLocations.empty()) {
       SPDLOG_DEBUG("\tNO LOCATIONS TO HINT\n\n");
     return;
   }
 
-  uint32_t hintedLocation = RandomElement(possibleHintLocations);
-  const std::vector<uint32_t> accessibleGossipStones = GetAccessibleGossipStones(hintedLocation);
+  RandomizerCheck hintedLocation = RandomElement(possibleHintLocations);
+  const std::vector<RandomizerCheck> accessibleGossipStones = GetAccessibleGossipStones(hintedLocation);
 
   SPDLOG_DEBUG("\tLocation: ");
-  SPDLOG_DEBUG(Location(hintedLocation)->GetName());
+  SPDLOG_DEBUG(Rando::StaticData::GetLocation(hintedLocation)->GetName());
   SPDLOG_DEBUG("\n");
 
   SPDLOG_DEBUG("\tItem: ");
-  SPDLOG_DEBUG(Location(hintedLocation)->GetPlacedItemName().GetEnglish());
+  SPDLOG_DEBUG(ctx->GetItemLocation(hintedLocation)->GetPlacedItemName().GetEnglish());
   SPDLOG_DEBUG("\n");
 
   if (accessibleGossipStones.empty()) {
@@ -306,13 +309,13 @@ static void CreateLocationHint(const std::vector<uint32_t>& possibleHintLocation
     return;
   }
 
-  uint32_t gossipStone = RandomElement(accessibleGossipStones);
-  Location(hintedLocation)->SetAsHinted();
+  RandomizerCheck gossipStone = RandomElement(accessibleGossipStones);
+  ctx->GetItemLocation(hintedLocation)->SetAsHinted();
 
   //make hint text
-  Text locationHintText = Location(hintedLocation)->GetHint().GetText();
-  Text itemHintText = Location(hintedLocation)->GetPlacedItem().GetHint().GetText();
-  Text prefix = Hint(PREFIX).GetText();
+  Text locationHintText = Rando::StaticData::GetLocation(hintedLocation)->GetHint()->GetText();
+  Text itemHintText = ctx->GetItemLocation(hintedLocation)->GetPlacedItem().GetHint().GetText();
+  Text prefix = Hint(RHT_PREFIX).GetText();
   
   Text finalHint = prefix + "%r" + locationHintText + " #%g" + itemHintText + "#%w.";
   SPDLOG_DEBUG("\tMessage: ");
@@ -323,15 +326,16 @@ static void CreateLocationHint(const std::vector<uint32_t>& possibleHintLocation
 }
 
 static void CreateWothHint(uint8_t* remainingDungeonWothHints) {
+    auto ctx = Rando::Context::GetInstance();
     // get locations that are in the current playthrough
-    std::vector<uint32_t> possibleHintLocations = {};
+    std::vector<RandomizerCheck> possibleHintLocations = {};
     // iterate through playthrough locations by sphere
-    std::vector<uint32_t> wothHintLocations =
-        FilterFromPool(wothLocations, [remainingDungeonWothHints](uint32_t loc) {
-            return Location(loc)->IsHintable() &&    // only filter hintable locations
-                   !(Location(loc)->IsHintedAt()) && // only filter locations that haven't been hinted at
-                   (Location(loc)->IsOverworld() ||
-                    (Location(loc)->IsDungeon() &&
+    std::vector<RandomizerCheck> wothHintLocations =
+        FilterFromPool(ctx->wothLocations, [remainingDungeonWothHints, ctx](RandomizerCheck loc) {
+            return ctx->GetItemLocation(loc)->IsHintable() &&    // only filter hintable locations
+                   !(ctx->GetItemLocation(loc)->IsHintedAt()) && // only filter locations that haven't been hinted at
+                   (Rando::StaticData::GetLocation(loc)->IsOverworld() ||
+                    (Rando::StaticData::GetLocation(loc)->IsDungeon() &&
                      (*remainingDungeonWothHints) > 0)); // make sure we haven't surpassed the woth dungeon limit
         });
     AddElementsToPool(possibleHintLocations, wothHintLocations);
@@ -341,129 +345,133 @@ static void CreateWothHint(uint8_t* remainingDungeonWothHints) {
         SPDLOG_DEBUG("\tNO LOCATIONS TO HINT\n\n");
         return;
     }
-    uint32_t hintedLocation = RandomElement(possibleHintLocations);
+    RandomizerCheck hintedLocation = RandomElement(possibleHintLocations);
 
     SPDLOG_DEBUG("\tLocation: ");
-    SPDLOG_DEBUG(Location(hintedLocation)->GetName());
+    SPDLOG_DEBUG(Rando::StaticData::GetLocation(hintedLocation)->GetName());
     SPDLOG_DEBUG("\n");
 
     SPDLOG_DEBUG("\tItem: ");
-    SPDLOG_DEBUG(Location(hintedLocation)->GetPlacedItemName().GetEnglish());
+    SPDLOG_DEBUG(ctx->GetItemLocation(hintedLocation)->GetPlacedItemName().GetEnglish());
     SPDLOG_DEBUG("\n");
 
     // get an accessible gossip stone
-    const std::vector<uint32_t> gossipStoneLocations = GetAccessibleGossipStones(hintedLocation);
+    const std::vector<RandomizerCheck> gossipStoneLocations = GetAccessibleGossipStones(hintedLocation);
 
     if (gossipStoneLocations.empty()) {
         SPDLOG_DEBUG("\tNO GOSSIP STONES TO PLACE HINT\n\n");
         return;
     }
-    Location(hintedLocation)->SetAsHinted();
-    uint32_t gossipStone = RandomElement(gossipStoneLocations);
+    ctx->GetItemLocation(hintedLocation)->SetAsHinted();
+    RandomizerCheck gossipStone = RandomElement(gossipStoneLocations);
 
-    if (Location(hintedLocation)->IsDungeon()) {
+    if (Rando::StaticData::GetLocation(hintedLocation)->IsDungeon()) {
         *remainingDungeonWothHints -= 1;
     }
 
     // form hint text
-    Text locationText = GetHintRegion(Location(hintedLocation)->GetParentRegionKey())->GetHint().GetText();
-    Text finalWothHint = Hint(PREFIX).GetText() + "%r#" + locationText + "#%w" + Hint(WAY_OF_THE_HERO).GetText();
+    Text locationText = GetHintRegion(ctx->GetItemLocation(hintedLocation)->GetParentRegionKey())->GetHint().GetText();
+    Text finalWothHint = Hint(RHT_PREFIX).GetText() + "%r#" + locationText + "#%w" + Hint(RHT_WAY_OF_THE_HERO).GetText();
     SPDLOG_DEBUG("\tMessage: ");
     SPDLOG_DEBUG(finalWothHint.english);
     SPDLOG_DEBUG("\n\n");
     AddHint(finalWothHint, gossipStone, { QM_LBLUE }, HINT_TYPE_WOTH, hintedLocation);
 }
 
-static void CreateBarrenHint(uint8_t* remainingDungeonBarrenHints, std::vector<uint32_t>& barrenLocations) {
+static void CreateBarrenHint(uint8_t* remainingDungeonBarrenHints, std::vector<RandomizerCheck>& barrenLocations) {
+    auto ctx = Rando::Context::GetInstance();
     // remove dungeon locations if necessary
     if (*remainingDungeonBarrenHints < 1) {
         barrenLocations =
-            FilterFromPool(barrenLocations, [](const uint32_t loc) { return !(Location(loc)->IsDungeon()); });
+            FilterFromPool(barrenLocations, [](const RandomizerCheck loc) { 
+              return !(Rando::StaticData::GetLocation(loc)->IsDungeon()); 
+            });
     }
 
     if (barrenLocations.empty()) {
         return;
     }
 
-    uint32_t hintedLocation = RandomElement(barrenLocations, true);
+    RandomizerCheck hintedLocation = RandomElement(barrenLocations, true);
 
     SPDLOG_DEBUG("\tLocation: ");
-    SPDLOG_DEBUG(Location(hintedLocation)->GetName());
+    SPDLOG_DEBUG(Rando::StaticData::GetLocation(hintedLocation)->GetName());
     SPDLOG_DEBUG("\n");
 
     SPDLOG_DEBUG("\tItem: ");
-    SPDLOG_DEBUG(Location(hintedLocation)->GetPlacedItemName().GetEnglish());
+    SPDLOG_DEBUG(ctx->GetItemLocation(hintedLocation)->GetPlacedItemName().GetEnglish());
     SPDLOG_DEBUG("\n");
 
     // get an accessible gossip stone
-    const std::vector<uint32_t> gossipStoneLocations = GetAccessibleGossipStones(hintedLocation);
+    const std::vector<RandomizerCheck> gossipStoneLocations = GetAccessibleGossipStones(hintedLocation);
     if (gossipStoneLocations.empty()) {
         SPDLOG_DEBUG("\tNO GOSSIP STONES TO PLACE HINT\n\n");
         return;
     }
-    Location(hintedLocation)->SetAsHinted();
-    uint32_t gossipStone = RandomElement(gossipStoneLocations);
+    ctx->GetItemLocation(hintedLocation)->SetAsHinted();
+    RandomizerCheck gossipStone = RandomElement(gossipStoneLocations);
 
-    if (Location(hintedLocation)->IsDungeon()) {
+    if (Rando::StaticData::GetLocation(hintedLocation)->IsDungeon()) {
         *remainingDungeonBarrenHints -= 1;
     }
 
     // form hint text
-    Text locationText = GetHintRegion(Location(hintedLocation)->GetParentRegionKey())->GetHint().GetText();
+    Text locationText = GetHintRegion(ctx->GetItemLocation(hintedLocation)->GetParentRegionKey())->GetHint().GetText();
     Text finalBarrenHint =
-        Hint(PREFIX).GetText() + Hint(PLUNDERING).GetText() + "%r#" + locationText + "#%w" + Hint(FOOLISH).GetText();
+        Hint(RHT_PREFIX).GetText() + Hint(RHT_PLUNDERING).GetText() + "%r#" + locationText + "#%w" + Hint(RHT_FOOLISH).GetText();
     SPDLOG_DEBUG("\tMessage: ");
     SPDLOG_DEBUG(finalBarrenHint.english);
     SPDLOG_DEBUG("\n\n");
     AddHint(finalBarrenHint, gossipStone, { QM_PINK }, HINT_TYPE_BARREN, hintedLocation);
 
     // get rid of all other locations in this same barren region
-    barrenLocations = FilterFromPool(barrenLocations, [hintedLocation](uint32_t loc) {
-        return GetHintRegion(Location(loc)->GetParentRegionKey())->hintKey !=
-               GetHintRegion(Location(hintedLocation)->GetParentRegionKey())->hintKey;
+    barrenLocations = FilterFromPool(barrenLocations, [hintedLocation, ctx](RandomizerCheck loc) {
+        return GetHintRegion(ctx->GetItemLocation(loc)->GetParentRegionKey())->hintKey !=
+               GetHintRegion(ctx->GetItemLocation(hintedLocation)->GetParentRegionKey())->hintKey;
     });
 }
 
 static void CreateRandomLocationHint(const bool goodItem = false) {
-  const std::vector<uint32_t> possibleHintLocations = FilterFromPool(allLocations, [goodItem](const uint32_t loc) {
-    return Location(loc)->IsHintable() && !(Location(loc)->IsHintedAt()) && (!goodItem || Location(loc)->GetPlacedItem().IsMajorItem());
+  auto ctx = Rando::Context::GetInstance();
+  const std::vector<RandomizerCheck> possibleHintLocations = FilterFromPool(ctx->allLocations, [goodItem, ctx](const RandomizerCheck loc) {
+    return ctx->GetItemLocation(loc)->IsHintable() && !(ctx->GetItemLocation(loc)->IsHintedAt()) && (!goodItem || ctx->GetItemLocation(loc)->GetPlacedItem().IsMajorItem());
   });
   //If no more locations can be hinted at, then just try to get another hint
   if (possibleHintLocations.empty()) {
     SPDLOG_DEBUG("\tNO LOCATIONS TO HINT\n\n");
     return;
   }
-  uint32_t hintedLocation = RandomElement(possibleHintLocations);
+  RandomizerCheck hintedLocation = RandomElement(possibleHintLocations);
 
   SPDLOG_DEBUG("\tLocation: ");
-  SPDLOG_DEBUG(Location(hintedLocation)->GetName());
+  SPDLOG_DEBUG(Rando::StaticData::GetLocation(hintedLocation)->GetName());
   SPDLOG_DEBUG("\n");
 
   SPDLOG_DEBUG("\tItem: ");
-  SPDLOG_DEBUG(Location(hintedLocation)->GetPlacedItemName().GetEnglish());
+  SPDLOG_DEBUG(ctx->GetItemLocation(hintedLocation)->GetPlacedItemName().GetEnglish());
   SPDLOG_DEBUG("\n");
 
   //get an acessible gossip stone
-  const std::vector<uint32_t> gossipStoneLocations = GetAccessibleGossipStones(hintedLocation);
+  const std::vector<RandomizerCheck> gossipStoneLocations = GetAccessibleGossipStones(hintedLocation);
   if (gossipStoneLocations.empty()) {
       SPDLOG_DEBUG("\tNO GOSSIP STONES TO PLACE HINT\n\n");
     return;
   }
-  Location(hintedLocation)->SetAsHinted();
-  uint32_t gossipStone = RandomElement(gossipStoneLocations);
+  ctx->GetItemLocation(hintedLocation)->SetAsHinted();
+  RandomizerCheck gossipStone = RandomElement(gossipStoneLocations);
 
   //form hint text
-  Text itemText = Location(hintedLocation)->GetPlacedItem().GetHint().GetText();
-  Text locationText = GetHintRegion(Location(hintedLocation)->GetParentRegionKey())->GetHint().GetText();
+  Text itemText = ctx->GetItemLocation(hintedLocation)->GetPlacedItem().GetHint().GetText();
+  Text locationText = GetHintRegion(ctx->GetItemLocation(hintedLocation)->GetParentRegionKey())->GetHint().GetText();
   // RANDOTODO: reconsider dungeon vs non-dungeon item location hints when boss shuffle mixed pools happens
-  if (Location(hintedLocation)->IsDungeon()) {
-    Text finalHint = Hint(PREFIX).GetText()+"%r#"+locationText+"#%w "+Hint(HOARDS).GetText()+" %g#"+itemText+"#%w.";
+  if (Rando::StaticData::GetLocation(hintedLocation)->IsDungeon()) {
+    Text finalHint = Hint(RHT_PREFIX).GetText()+"%r#"+locationText+"#%w "+Hint(RHT_HOARDS).GetText()+" %g#"+itemText+"#%w.";
     SPDLOG_DEBUG("\tMessage: ");
     SPDLOG_DEBUG(finalHint.english);
     SPDLOG_DEBUG("\n\n");
     AddHint(finalHint, gossipStone, {QM_GREEN, QM_RED}, HINT_TYPE_NAMED_ITEM, hintedLocation);
   } else {
-    Text finalHint = Hint(PREFIX).GetText()+"%r#"+itemText+"#%w "+Hint(CAN_BE_FOUND_AT).GetText()+" %g#"+locationText+"#%w.";
+    Text finalHint = Hint(RHT_PREFIX).GetText()+"%r#"+itemText+"#%w "+Hint(RHT_CAN_BE_FOUND_AT).GetText()+" %g#"+locationText+"#%w.";
     SPDLOG_DEBUG("\tMessage: ");
     SPDLOG_DEBUG(finalHint.english);
     SPDLOG_DEBUG("\n\n");
@@ -479,12 +487,12 @@ static void CreateJunkHint() {
   //duplicate junk hints are possible for now
   const HintText junkHint = RandomElement(GetHintCategory(HintCategory::Junk));
   LogicReset();
-  const std::vector<uint32_t> gossipStones = GetAccessibleLocations(gossipStoneLocations);
+  const std::vector<RandomizerCheck> gossipStones = GetAccessibleLocations(Rando::StaticData::gossipStoneLocations);
   if (gossipStones.empty()) {
       SPDLOG_DEBUG("\tNO GOSSIP STONES TO PLACE HINT\n\n");
     return;
   }
-  uint32_t gossipStone = RandomElement(gossipStones);
+  RandomizerCheck gossipStone = RandomElement(gossipStones);
   Text hint = junkHint.GetText();
 
   SPDLOG_DEBUG("\tMessage: ");
@@ -494,26 +502,27 @@ static void CreateJunkHint() {
   AddHint(hint, gossipStone, { QM_PINK }, HINT_TYPE_JUNK);
 }
 
-static std::vector<uint32_t> CalculateBarrenRegions() {
-  std::vector<uint32_t> barrenLocations = {};
-  std::vector<uint32_t> potentiallyUsefulLocations = {};
+static std::vector<RandomizerCheck> CalculateBarrenRegions() {
+  auto ctx = Rando::Context::GetInstance();
+  std::vector<RandomizerCheck> barrenLocations = {};
+  std::vector<RandomizerCheck> potentiallyUsefulLocations = {};
 
-  for (uint32_t loc : allLocations) {
+  for (RandomizerCheck loc : ctx->allLocations) {
     // If a location has a major item or is a way of the hero location, it is not barren
-    if (Location(loc)->GetPlacedItem().IsMajorItem() || ElementInContainer(loc, wothLocations)) {
+    if (ctx->GetItemLocation(loc)->GetPlacedItem().IsMajorItem() || ElementInContainer(loc, ctx->wothLocations)) {
       AddElementsToPool(potentiallyUsefulLocations, std::vector{loc});
     } else {
       // Link's Pocket & Triforce Hunt "reward" shouldn't be considered for barren areas because it's clear what
       // they have to a player.
-      if (loc != LINKS_POCKET && loc != TRIFORCE_COMPLETED) { 
+      if (loc != RC_LINKS_POCKET && loc != RC_TRIFORCE_COMPLETED) { 
         AddElementsToPool(barrenLocations, std::vector{loc});
       }
     }
   }
 
   // Leave only locations at barren regions in the list
-  auto finalBarrenLocations = FilterFromPool(barrenLocations, [&potentiallyUsefulLocations](uint32_t loc){
-    for (uint32_t usefulLoc : potentiallyUsefulLocations) {
+  auto finalBarrenLocations = FilterFromPool(barrenLocations, [&potentiallyUsefulLocations](RandomizerCheck loc){
+    for (RandomizerCheck usefulLoc : potentiallyUsefulLocations) {
       uint32_t barrenKey = GetLocationRegionuint32_t(loc);
       uint32_t usefulKey = GetLocationRegionuint32_t(usefulLoc);
       if (barrenKey == usefulKey) {
@@ -535,7 +544,7 @@ static void CreateTrialHints() {
     auto gossipStone = RandomElement(gossipStones, false);
 
     //make hint
-    auto hint = Hint(PREFIX).GetText() + Hint(SIX_TRIALS).GetText();
+    auto hint = Hint(RHT_PREFIX).GetText() + Hint(RHT_SIX_TRIALS).GetText();
     AddHint(hint, gossipStone, { QM_PINK }, HINT_TYPE_TRIAL);
 
     //zero trials
@@ -546,7 +555,7 @@ static void CreateTrialHints() {
     auto gossipStone = RandomElement(gossipStones, false);
 
     //make hint
-    auto hint = Hint(PREFIX).GetText() + Hint(ZERO_TRIALS).GetText();
+    auto hint = Hint(RHT_PREFIX).GetText() + Hint(RHT_ZERO_TRIALS).GetText();
     AddHint(hint, gossipStone, { QM_YELLOW }, HINT_TYPE_TRIAL);
 
     //4 or 5 required trials
@@ -564,7 +573,7 @@ static void CreateTrialHints() {
       auto gossipStone = RandomElement(gossipStones, false);
 
       //make hint
-      auto hint = Hint(PREFIX).GetText()+"#"+trial->GetName()+"#"+Hint(FOUR_TO_FIVE_TRIALS).GetText();
+      auto hint = Hint(RHT_PREFIX).GetText()+"#"+trial->GetName()+"#"+Hint(RHT_FOUR_TO_FIVE_TRIALS).GetText();
       AddHint(hint, gossipStone, { QM_YELLOW }, HINT_TYPE_TRIAL);
     }
     //1 to 3 trials
@@ -581,44 +590,54 @@ static void CreateTrialHints() {
       auto gossipStone = RandomElement(gossipStones, false);
 
       //make hint
-      auto hint = Hint(PREFIX).GetText()+"#"+trial->GetName()+"#"+Hint(ONE_TO_THREE_TRIALS).GetText();
+      auto hint = Hint(RHT_PREFIX).GetText()+"#"+trial->GetName()+"#"+Hint(RHT_ONE_TO_THREE_TRIALS).GetText();
       AddHint(hint, gossipStone, { QM_PINK }, HINT_TYPE_TRIAL);
     }
   }
 }
 
 void CreateGanonText() {
-
+  auto ctx = Rando::Context::GetInstance();
   //funny ganon line
   ganonText = RandomElement(GetHintCategory(HintCategory::GanonLine)).GetText();
   CreateMessageFromTextObject(0x70CB, 0, 2, 3, AddColorsAndFormat(ganonText));
 
   //Get the location of the light arrows
-  auto lightArrowLocation = FilterFromPool(allLocations, [](const uint32_t loc){return Location(loc)->GetPlaceduint32_t() == LIGHT_ARROWS;});
+  auto lightArrowLocation = FilterFromPool(ctx->allLocations, [ctx](const RandomizerCheck loc) {
+      return ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == RG_LIGHT_ARROWS;
+  });
 
   //If there is no light arrow location, it was in the player's inventory at the start
-  auto hint = Hint(LIGHT_ARROW_LOCATION_HINT);
+  auto hint = Hint(RHT_LIGHT_ARROW_LOCATION_HINT);
   if (lightArrowLocation.empty()) {
-    ganonHintText = hint.GetText()+Hint(YOUR_POCKET).GetText();
+    ganonHintText = hint.GetText()+Hint(RHT_YOUR_POCKET).GetText();
     lightArrowHintLoc = "Link's Pocket";
   } else {
-    ganonHintText = hint.GetText() + "%r" + GetHintRegion(Location(lightArrowLocation[0])->GetParentRegionKey())->GetHint().GetText();
-    lightArrowHintLoc = Location(lightArrowLocation[0])->GetName();
+      ganonHintText =
+          hint.GetText() + "%r" +
+          GetHintRegion(ctx->GetItemLocation(lightArrowLocation[0])->GetParentRegionKey())->GetHint().GetText();
+      lightArrowHintLoc = Rando::StaticData::GetLocation(lightArrowLocation[0])->GetName();
   }
   ganonHintText = ganonHintText + "!";
 
   CreateMessageFromTextObject(0x70CC, 0, 2, 3, AddColorsAndFormat(ganonHintText));
+  ctx->AddHint(RH_GANONDORF_HINT, ganonHintText, lightArrowLocation[0], HINT_TYPE_STATIC, GetHintRegion(ctx->GetItemLocation(lightArrowLocation[0])->GetParentRegionKey())->GetHint().GetText());
 }
 
 //Find the location which has the given itemKey and create the generic altar text for the reward
-static Text BuildDungeonRewardText(const uint32_t itemKey) {
-  uint32_t location = FilterFromPool(allLocations, [itemKey](const uint32_t loc){return Location(loc)->GetPlaceduint32_t() == itemKey;})[0];
-  Location(location)->SetAsHinted();
+static Text BuildDungeonRewardText(const RandomizerGet itemKey) {
+    auto ctx = Rando::Context::GetInstance();
+    RandomizerCheck location = FilterFromPool(ctx->allLocations, [itemKey, ctx](const RandomizerCheck loc) {
+        return ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == itemKey;
+    })[0];
+    ctx->GetItemLocation(location)->SetAsHinted();
 
-  std::string rewardString = "$" + std::to_string(itemKey - KOKIRI_EMERALD);
+    std::string rewardString = "$" + std::to_string(itemKey - RG_KOKIRI_EMERALD);
 
-  // RANDOTODO implement colors for locations
-  return Text()+rewardString+GetHintRegion(Location(location)->GetParentRegionKey())->GetHint().GetText().Capitalize()+"...^";
+    // RANDOTODO implement colors for locations
+    return Text() + rewardString +
+           GetHintRegion(ctx->GetItemLocation(location)->GetParentRegionKey())->GetHint().GetText().Capitalize() +
+           "...^";
 }
 
 static Text BuildDoorOfTimeText() {
@@ -627,22 +646,22 @@ static Text BuildDoorOfTimeText() {
 
   if (OpenDoorOfTime.Is(OPENDOOROFTIME_OPEN)) {
     itemObtained = "$o";
-    doorOfTimeText = Hint(CHILD_ALTAR_TEXT_END_DOTOPEN).GetText();
+    doorOfTimeText = Hint(RHT_CHILD_ALTAR_TEXT_END_DOTOPEN).GetText();
 
   } else if (OpenDoorOfTime.Is(OPENDOOROFTIME_SONGONLY)) {
     itemObtained = "$c";
-    doorOfTimeText = Hint(CHILD_ALTAR_TEXT_END_DOTSONGONLY).GetText();
+    doorOfTimeText = Hint(RHT_CHILD_ALTAR_TEXT_END_DOTSONGONLY).GetText();
 
   } else if (OpenDoorOfTime.Is(OPENDOOROFTIME_CLOSED)) {
     itemObtained = "$i";
-    doorOfTimeText = Hint(CHILD_ALTAR_TEXT_END_DOTCLOSED).GetText();
+    doorOfTimeText = Hint(RHT_CHILD_ALTAR_TEXT_END_DOTCLOSED).GetText();
   }
 
   return Text()+itemObtained+doorOfTimeText;
 }
 
 //insert the required number into the hint and set the singular/plural form
-static Text BuildCountReq(const uint32_t req, const Option& count) {
+static Text BuildCountReq(const RandomizerHintTextKey req, const Option& count) {
   Text requirement = Hint(req).GetTextCopy();
     if (count.Value<uint8_t>() == 1) {
     requirement.SetForm(SINGULAR);
@@ -657,28 +676,28 @@ static Text BuildBridgeReqsText() {
   Text bridgeText;
 
   if (Bridge.Is(RAINBOWBRIDGE_OPEN)) {
-    bridgeText = Hint(BRIDGE_OPEN_HINT).GetText();
+    bridgeText = Hint(RHT_BRIDGE_OPEN_HINT).GetText();
 
   } else if (Bridge.Is(RAINBOWBRIDGE_VANILLA)) {
-    bridgeText = Hint(BRIDGE_VANILLA_HINT).GetText();
+    bridgeText = Hint(RHT_BRIDGE_VANILLA_HINT).GetText();
 
   } else if (Bridge.Is(RAINBOWBRIDGE_STONES)) {
-    bridgeText = BuildCountReq(BRIDGE_STONES_HINT, BridgeStoneCount);
+    bridgeText = BuildCountReq(RHT_BRIDGE_STONES_HINT, BridgeStoneCount);
 
   } else if (Bridge.Is(RAINBOWBRIDGE_MEDALLIONS)) {
-    bridgeText = BuildCountReq(BRIDGE_MEDALLIONS_HINT, BridgeMedallionCount);
+    bridgeText = BuildCountReq(RHT_BRIDGE_MEDALLIONS_HINT, BridgeMedallionCount);
 
   } else if (Bridge.Is(RAINBOWBRIDGE_REWARDS)) {
-    bridgeText = BuildCountReq(BRIDGE_REWARDS_HINT, BridgeRewardCount);
+    bridgeText = BuildCountReq(RHT_BRIDGE_REWARDS_HINT, BridgeRewardCount);
 
   } else if (Bridge.Is(RAINBOWBRIDGE_DUNGEONS)) {
-    bridgeText = BuildCountReq(BRIDGE_DUNGEONS_HINT, BridgeDungeonCount);
+    bridgeText = BuildCountReq(RHT_BRIDGE_DUNGEONS_HINT, BridgeDungeonCount);
 
   } else if (Bridge.Is(RAINBOWBRIDGE_TOKENS)) {
-    bridgeText = BuildCountReq(BRIDGE_TOKENS_HINT, BridgeTokenCount);
+    bridgeText = BuildCountReq(RHT_BRIDGE_TOKENS_HINT, BridgeTokenCount);
   
   } else if (Bridge.Is(RAINBOWBRIDGE_GREG)) {
-    bridgeText = Hint(BRIDGE_GREG_HINT).GetText();
+    bridgeText = Hint(RHT_BRIDGE_GREG_HINT).GetText();
   }
 
   return Text()+"$l"+bridgeText+"^";
@@ -688,88 +707,90 @@ static Text BuildGanonBossKeyText() {
   Text ganonBossKeyText;
 
   if (GanonsBossKey.Is(GANONSBOSSKEY_START_WITH)) {
-    ganonBossKeyText = Hint(GANON_BK_START_WITH_HINT).GetText();
+    ganonBossKeyText = Hint(RHT_GANON_BK_START_WITH_HINT).GetText();
 
   } else if (GanonsBossKey.Is(GANONSBOSSKEY_VANILLA)) {
-    ganonBossKeyText = Hint(GANON_BK_VANILLA_HINT).GetText();
+    ganonBossKeyText = Hint(RHT_GANON_BK_VANILLA_HINT).GetText();
 
   } else if (GanonsBossKey.Is(GANONSBOSSKEY_OWN_DUNGEON)) {
-    ganonBossKeyText = Hint(GANON_BK_OWN_DUNGEON_HINT).GetText();
+    ganonBossKeyText = Hint(RHT_GANON_BK_OWN_DUNGEON_HINT).GetText();
 
   } else if (GanonsBossKey.Is(GANONSBOSSKEY_ANY_DUNGEON)) {
-    ganonBossKeyText = Hint(GANON_BK_ANY_DUNGEON_HINT).GetText();
+    ganonBossKeyText = Hint(RHT_GANON_BK_ANY_DUNGEON_HINT).GetText();
 
   } else if (GanonsBossKey.Is(GANONSBOSSKEY_OVERWORLD)) {
-    ganonBossKeyText = Hint(GANON_BK_OVERWORLD_HINT).GetText();
+    ganonBossKeyText = Hint(RHT_GANON_BK_OVERWORLD_HINT).GetText();
 
   } else if (GanonsBossKey.Is(GANONSBOSSKEY_ANYWHERE)) {
-    ganonBossKeyText = Hint(GANON_BK_ANYWHERE_HINT).GetText();
+    ganonBossKeyText = Hint(RHT_GANON_BK_ANYWHERE_HINT).GetText();
 
   } else if (GanonsBossKey.Is(GANONSBOSSKEY_FINAL_GS_REWARD)) {
-    ganonBossKeyText = Hint(GANON_BK_SKULLTULA_HINT).GetText();
+    ganonBossKeyText = Hint(RHT_GANON_BK_SKULLTULA_HINT).GetText();
 
   } else if (GanonsBossKey.Is(GANONSBOSSKEY_LACS_VANILLA)) {
-    ganonBossKeyText = Hint(LACS_VANILLA_HINT).GetText();
+    ganonBossKeyText = Hint(RHT_LACS_VANILLA_HINT).GetText();
 
   } else if (GanonsBossKey.Is(GANONSBOSSKEY_LACS_STONES)) {
-    ganonBossKeyText = BuildCountReq(LACS_STONES_HINT, LACSStoneCount);
+    ganonBossKeyText = BuildCountReq(RHT_LACS_STONES_HINT, LACSStoneCount);
 
   } else if (GanonsBossKey.Is(GANONSBOSSKEY_LACS_MEDALLIONS)) {
-    ganonBossKeyText = BuildCountReq(LACS_MEDALLIONS_HINT, LACSMedallionCount);
+    ganonBossKeyText = BuildCountReq(RHT_LACS_MEDALLIONS_HINT, LACSMedallionCount);
 
   } else if (GanonsBossKey.Is(GANONSBOSSKEY_LACS_REWARDS)) {
-    ganonBossKeyText = BuildCountReq(LACS_REWARDS_HINT, LACSRewardCount);
+    ganonBossKeyText = BuildCountReq(RHT_LACS_REWARDS_HINT, LACSRewardCount);
 
   } else if (GanonsBossKey.Is(GANONSBOSSKEY_LACS_DUNGEONS)) {
-    ganonBossKeyText = BuildCountReq(LACS_DUNGEONS_HINT, LACSDungeonCount);
+    ganonBossKeyText = BuildCountReq(RHT_LACS_DUNGEONS_HINT, LACSDungeonCount);
 
   } else if (GanonsBossKey.Is(GANONSBOSSKEY_LACS_TOKENS)) {
-    ganonBossKeyText = BuildCountReq(LACS_TOKENS_HINT, LACSTokenCount);
+    ganonBossKeyText = BuildCountReq(RHT_LACS_TOKENS_HINT, LACSTokenCount);
 
   } else if (GanonsBossKey.Is(GANONSBOSSKEY_TRIFORCE_HUNT)) {
-    ganonBossKeyText = Hint(GANON_BK_TRIFORCE_HINT).GetText();
+    ganonBossKeyText = Hint(RHT_GANON_BK_TRIFORCE_HINT).GetText();
   }
 
   return Text()+"$b"+ganonBossKeyText+"^";
 }
 
 void CreateAltarText() {
+  auto ctx = Rando::Context::GetInstance();
 
   //Child Altar Text
   if (AltarHintText) {
-    childAltarText = Hint(SPIRITUAL_STONE_TEXT_START).GetText()+"^"+
+    childAltarText = Hint(RHT_SPIRITUAL_STONE_TEXT_START).GetText()+"^"+
     //Spiritual Stones
         (StartingKokiriEmerald.Value<uint8_t>() ? Text{ "##", "##", "##" }
-                                                : BuildDungeonRewardText(KOKIRI_EMERALD)) +
+                                                : BuildDungeonRewardText(RG_KOKIRI_EMERALD)) +
         (StartingGoronRuby.Value<uint8_t>() ? Text{ "##", "##", "##" }
-                                            : BuildDungeonRewardText(GORON_RUBY)) +
+                                            : BuildDungeonRewardText(RG_GORON_RUBY)) +
         (StartingZoraSapphire.Value<uint8_t>() ? Text{ "##", "##", "##" }
-                                              : BuildDungeonRewardText(ZORA_SAPPHIRE)) +
+                                              : BuildDungeonRewardText(RG_ZORA_SAPPHIRE)) +
     //How to open Door of Time, the event trigger is necessary to read the altar multiple times
     BuildDoorOfTimeText();
   } else {
     childAltarText = BuildDoorOfTimeText();
   }
+  ctx->AddHint(RH_ALTAR_CHILD, childAltarText, RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text());
 
   CreateMessageFromTextObject(0x7040, 0, 2, 3, AddColorsAndFormat(childAltarText, {QM_GREEN, QM_RED, QM_BLUE}));
 
   //Adult Altar Text
-  adultAltarText = Hint(ADULT_ALTAR_TEXT_START).GetText() + "^";
+  adultAltarText = Hint(RHT_ADULT_ALTAR_TEXT_START).GetText() + "^";
   if (AltarHintText) {
     adultAltarText = adultAltarText +
     //Medallion Areas
         (StartingLightMedallion.Value<uint8_t>() ? Text{ "##", "##", "##" }
-                                                : BuildDungeonRewardText(LIGHT_MEDALLION)) +
+                                                : BuildDungeonRewardText(RG_LIGHT_MEDALLION)) +
         (StartingForestMedallion.Value<uint8_t>() ? Text{ "##", "##", "##" }
-                                                  : BuildDungeonRewardText(FOREST_MEDALLION)) +
+                                                  : BuildDungeonRewardText(RG_FOREST_MEDALLION)) +
         (StartingFireMedallion.Value<uint8_t>() ? Text{ "##", "##", "##" }
-                                                : BuildDungeonRewardText(FIRE_MEDALLION)) +
+                                                : BuildDungeonRewardText(RG_FIRE_MEDALLION)) +
         (StartingWaterMedallion.Value<uint8_t>() ? Text{ "##", "##", "##" }
-                                                : BuildDungeonRewardText(WATER_MEDALLION)) +
+                                                : BuildDungeonRewardText(RG_WATER_MEDALLION)) +
         (StartingSpiritMedallion.Value<uint8_t>() ? Text{ "##", "##", "##" }
-                                                  : BuildDungeonRewardText(SPIRIT_MEDALLION)) +
+                                                  : BuildDungeonRewardText(RG_SPIRIT_MEDALLION)) +
         (StartingShadowMedallion.Value<uint8_t>() ? Text{ "##", "##", "##" }
-                                                  : BuildDungeonRewardText(SHADOW_MEDALLION));
+                                                  : BuildDungeonRewardText(RG_SHADOW_MEDALLION));
   }
   adultAltarText = adultAltarText + 
   //Bridge requirement
@@ -779,40 +800,53 @@ void CreateAltarText() {
   BuildGanonBossKeyText()+
 
   //End
-  Hint(ADULT_ALTAR_TEXT_END).GetText();
+  Hint(RHT_ADULT_ALTAR_TEXT_END).GetText();
   CreateMessageFromTextObject(0x7088, 0, 2, 3, AddColorsAndFormat(adultAltarText, {QM_RED, QM_YELLOW, QM_GREEN, QM_RED, QM_BLUE, QM_YELLOW, QM_PINK, QM_RED, QM_RED, QM_RED, QM_RED}));
+  ctx->AddHint(RH_ALTAR_ADULT, adultAltarText, RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text());
 }
 
 void CreateMerchantsHints() {
+    auto ctx = Rando::Context::GetInstance();
+    Text medigoronItemText = ctx->GetItemLocation(RC_GC_MEDIGORON)->GetPlacedItem().GetHint().GetText();
+    Text grannyItemText = ctx->GetItemLocation(RC_KAK_GRANNYS_SHOP)->GetPlacedItem().GetHint().GetText();
+    Text carpetSalesmanItemText =
+        ctx->GetItemLocation(RC_WASTELAND_BOMBCHU_SALESMAN)->GetPlacedItem().GetHint().GetText();
+    Text carpetSalesmanItemClearText =
+        ctx->GetItemLocation(RC_WASTELAND_BOMBCHU_SALESMAN)->GetPlacedItem().GetHint().GetClear();
 
-  Text medigoronItemText = Location(GC_MEDIGORON)->GetPlacedItem().GetHint().GetText();
-  Text grannyItemText = Location(KAK_GRANNYS_SHOP)->GetPlacedItem().GetHint().GetText();
-  Text carpetSalesmanItemText = Location(WASTELAND_BOMBCHU_SALESMAN)->GetPlacedItem().GetHint().GetText();
-  Text carpetSalesmanItemClearText = Location(WASTELAND_BOMBCHU_SALESMAN)->GetPlacedItem().GetHint().GetClear();
+    Text grannyCapitalItemText = grannyItemText.Capitalize();
 
-  Text grannyCapitalItemText = grannyItemText.Capitalize();
+    Text medigoronText =
+        Hint(RHT_MEDIGORON_DIALOG_FIRST).GetText() + medigoronItemText + Hint(RHT_MEDIGORON_DIALOG_SECOND).GetText();
+    Text grannyText = grannyCapitalItemText + Hint(RHT_GRANNY_DIALOG).GetText();
+    Text carpetSalesmanTextOne = Hint(RHT_CARPET_SALESMAN_DIALOG_FIRST).GetText() + carpetSalesmanItemText +
+                                 Hint(RHT_CARPET_SALESMAN_DIALOG_SECOND).GetText();
+    Text carpetSalesmanTextTwo = Hint(RHT_CARPET_SALESMAN_DIALOG_THIRD).GetText() + carpetSalesmanItemClearText +
+                                 Hint(RHT_CARPET_SALESMAN_DIALOG_FOURTH).GetText();
 
-  Text medigoronText = Hint(MEDIGORON_DIALOG_FIRST).GetText()+medigoronItemText+Hint(MEDIGORON_DIALOG_SECOND).GetText();
-  Text grannyText = grannyCapitalItemText+Hint(GRANNY_DIALOG).GetText();
-  Text carpetSalesmanTextOne = Hint(CARPET_SALESMAN_DIALOG_FIRST).GetText()+carpetSalesmanItemText+Hint(CARPET_SALESMAN_DIALOG_SECOND).GetText();
-  Text carpetSalesmanTextTwo = Hint(CARPET_SALESMAN_DIALOG_THIRD).GetText()+carpetSalesmanItemClearText+Hint(CARPET_SALESMAN_DIALOG_FOURTH).GetText();
-
-  CreateMessageFromTextObject(0x9120, 0, 2, 3, AddColorsAndFormat(medigoronText, {QM_RED, QM_GREEN}));
-  CreateMessageFromTextObject(0x9121, 0, 2, 3, AddColorsAndFormat(grannyText, {QM_RED, QM_GREEN}));
-  CreateMessageFromTextObject(0x6077, 0, 2, 3, AddColorsAndFormat(carpetSalesmanTextOne, {QM_RED, QM_GREEN}));
-  CreateMessageFromTextObject(0x6078, 0, 2, 3, AddColorsAndFormat(carpetSalesmanTextTwo, {QM_RED, QM_YELLOW, QM_RED}));
+    CreateMessageFromTextObject(0x9120, 0, 2, 3, AddColorsAndFormat(medigoronText, { QM_RED, QM_GREEN }));
+    CreateMessageFromTextObject(0x9121, 0, 2, 3, AddColorsAndFormat(grannyText, { QM_RED, QM_GREEN }));
+    CreateMessageFromTextObject(0x6077, 0, 2, 3, AddColorsAndFormat(carpetSalesmanTextOne, { QM_RED, QM_GREEN }));
+    CreateMessageFromTextObject(0x6078, 0, 2, 3,
+                                AddColorsAndFormat(carpetSalesmanTextTwo, { QM_RED, QM_YELLOW, QM_RED }));
+    ctx->AddHint(RH_MEDIGORON, medigoronText, RC_GC_MEDIGORON, HINT_TYPE_STATIC, GetHintRegion(RR_GORON_CITY)->GetHint().GetText());
+    ctx->AddHint(RH_GRANNYS_SHOP, grannyText, RC_KAK_GRANNYS_SHOP, HINT_TYPE_STATIC, GetHintRegion(RR_KAKARIKO_VILLAGE)->GetHint().GetText());
+    ctx->AddHint(RH_WASTELAND_BOMBCHU_SALESMAN, carpetSalesmanTextOne, RC_WASTELAND_BOMBCHU_SALESMAN, HINT_TYPE_STATIC, GetHintRegion(RR_HAUNTED_WASTELAND)->GetHint().GetText());
 }
 
 void CreateDampesDiaryText() {
+  auto ctx = Rando::Context::GetInstance();
   if (!DampeHintText) {
     dampesText = Text();
     dampeHintLoc = "";
     return;
   }
 
-  uint32_t item = PROGRESSIVE_HOOKSHOT;
-  uint32_t location = FilterFromPool(allLocations, [item](const uint32_t loc){return Location(loc)->GetPlaceduint32_t() == item;})[0];
-  Text area = GetHintRegion(Location(location)->GetParentRegionKey())->GetHint().GetText();
+  RandomizerGet item = RG_PROGRESSIVE_HOOKSHOT;
+  RandomizerCheck location = FilterFromPool(ctx->allLocations, [item, ctx](const RandomizerCheck loc) {
+      return ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == item;
+  })[0];
+  Text area = GetHintRegion(ctx->GetItemLocation(location)->GetParentRegionKey())->GetHint().GetText();
   Text temp1 = Text{
     "Whoever reads this, please enter %r", 
     "Toi qui lit ce journal, rends-toi dans %r",
@@ -826,17 +860,21 @@ void CreateDampesDiaryText() {
   };
   
   dampesText = temp1 + area + temp2;
-  dampeHintLoc = Location(location)->GetName();
+  dampeHintLoc = Rando::StaticData::GetLocation(location)->GetName();
+  ctx->AddHint(RH_DAMPES_DIARY, dampesText, location, HINT_TYPE_STATIC, area);
 }
 
 void CreateGregRupeeHint() {
+  auto ctx = Rando::Context::GetInstance();
   if (!GregHintText) {
     gregText = Text();
     return;
   }
 
-  uint32_t location = FilterFromPool(allLocations, [](const uint32_t loc){return Location(loc)->GetPlacedItemKey() == GREG_RUPEE;})[0];
-  Text area = GetHintRegion(Location(location)->GetParentRegionKey())->GetHint().GetText();
+  RandomizerCheck location = FilterFromPool(ctx->allLocations, [ctx](const RandomizerCheck loc) {
+      return ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == RG_GREG_RUPEE;
+  })[0];
+  Text area = GetHintRegion(ctx->GetItemLocation(location)->GetParentRegionKey())->GetHint().GetText();
 
   Text temp1 = Text{
     "By the way, if you're interested, I saw the shiniest %gGreen Rupee%w somewhere in%r ",
@@ -851,13 +889,15 @@ void CreateGregRupeeHint() {
   };
 
     gregText = temp1 + area + temp2;
+    ctx->AddHint(RH_GREG_RUPEE, gregText, location, HINT_TYPE_STATIC, area);
 }
 
 void CreateSheikText() {
+  auto ctx = Rando::Context::GetInstance();
   //Get the location of the light arrows
-  auto lightArrowLocation = FilterFromPool(allLocations, [](const uint32_t loc){return Location(loc)->GetPlaceduint32_t() == LIGHT_ARROWS;});
-  lightArrowHintLoc = Location(lightArrowLocation[0])->GetName();
-  Text area = GetHintRegion(Location(lightArrowLocation[0])->GetParentRegionKey())->GetHint().GetText();
+  auto lightArrowLocation = FilterFromPool(ctx->allLocations, [ctx](const RandomizerCheck loc){return ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == RG_LIGHT_ARROWS;});
+  lightArrowHintLoc = Rando::StaticData::GetLocation(lightArrowLocation[0])->GetName();
+  Text area = GetHintRegion(ctx->GetItemLocation(lightArrowLocation[0])->GetParentRegionKey())->GetHint().GetText();
   Text temp1 = Text{
     "I overheard Ganondorf say that he misplaced the %yLight Arrows%w in&%r",
     "J'ai entendu dire que Ganondorf aurait caché les %yFlèches de Lumière%w dans %r",
@@ -868,10 +908,11 @@ void CreateSheikText() {
 }
 
 void CreateSariaText() {
-  //Get the location of the light arrows
-  auto magicLocation = FilterFromPool(allLocations, [](const uint32_t loc){return Location(loc)->GetPlaceduint32_t() == PROGRESSIVE_MAGIC_METER;});
-  sariaHintLoc = Location(magicLocation[0])->GetName();
-  Text area = GetHintRegion(Location(magicLocation[0])->GetParentRegionKey())->GetHint().GetText();
+  auto ctx = Rando::Context::GetInstance();
+  //Get the location of a magic upgrade
+  auto magicLocation = FilterFromPool(ctx->allLocations, [ctx](const RandomizerCheck loc){return ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == RG_PROGRESSIVE_MAGIC_METER;});
+  sariaHintLoc = Rando::StaticData::GetLocation(magicLocation[0])->GetName();
+  Text area = GetHintRegion(ctx->GetItemLocation(magicLocation[0])->GetParentRegionKey())->GetHint().GetText();
   Text temp1 = Text{
     "Did you feel the %gsurge of magic%w recently? A mysterious bird told me it came from %r",
     "As-tu récemment ressenti une vague de %gpuissance magique%w? Un mystérieux hibou m'a dit  qu'elle provenait du %r",
@@ -935,7 +976,7 @@ void CreateWarpSongTexts() {
 }
 
 void CreateAllHints() {
-
+  auto ctx = Rando::Context::GetInstance();
   SPDLOG_DEBUG("\nNOW CREATING HINTS\n");
   const HintSetting& hintSetting = hintSettingTable[Settings::HintDistribution.Value<uint8_t>()];
 
@@ -944,24 +985,26 @@ void CreateAllHints() {
 
   // Add 'always' location hints
   if (hintSetting.distTable[static_cast<int>(HINT_TYPE_ALWAYS)].copies > 0) {
-    // Only filter locations that had a random item placed at them (e.g. don't get cow locations if shuffle cows is off)
-    auto alwaysHintLocations = FilterFromPool(allLocations, [](const uint32_t loc){
-        return ((Location(loc)->GetHint().GetType() == HintCategory::Always) ||
-                // If we have Rainbow Bridge set to Greg, add a hint for where Greg is
-                (Bridge.Is(RAINBOWBRIDGE_GREG) && !GregHintText && Location(loc)->GetPlacedItemKey() == GREG_RUPEE)) &&
-               Location(loc)->IsHintable()        && !(Location(loc)->IsHintedAt());
-    });
+      // Only filter locations that had a random item placed at them (e.g. don't get cow locations if shuffle cows is
+      // off)
+      auto alwaysHintLocations = FilterFromPool(ctx->allLocations, [ctx](const RandomizerCheck loc) {
+          return ((Rando::StaticData::GetLocation(loc)->GetHint()->GetType() == HintCategory::Always) ||
+                  // If we have Rainbow Bridge set to Greg, add a hint for where Greg is
+                  (Bridge.Is(RAINBOWBRIDGE_GREG) && !GregHintText &&
+                   ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == RG_GREG_RUPEE)) &&
+                 ctx->GetItemLocation(loc)->IsHintable() && !(ctx->GetItemLocation(loc)->IsHintedAt());
+      });
 
-    for (auto& hint : conditionalAlwaysHints) {
-        uint32_t loc = hint.first;
-        if (hint.second() && Location(loc)->IsHintable() && !Location(loc)->IsHintedAt()) {
-            alwaysHintLocations.push_back(loc);
-        }
-    }
+      for (auto& hint : conditionalAlwaysHints) {
+          RandomizerCheck loc = hint.first;
+          if (hint.second() && ctx->GetItemLocation(loc)->IsHintable() && !ctx->GetItemLocation(loc)->IsHintedAt()) {
+              alwaysHintLocations.push_back(loc);
+          }
+      }
 
-    for (uint32_t location : alwaysHintLocations) {
-      CreateLocationHint({location});
-    }
+      for (RandomizerCheck location : alwaysHintLocations) {
+          CreateLocationHint({ location });
+      }
   }
 
   //Add 'trial' location hints
@@ -987,8 +1030,8 @@ void CreateAllHints() {
                                            "Water Temple", "Spirit Temple", "Shadow Temple", "Bottom of the Well", "Ice Cavern"};
   //Get list of all barren dungeons
   std::vector<std::string> barrenDungeons;
-  for (uint32_t barrenLocation : barrenLocations) {
-    std::string barrenRegion = GetHintRegion(Location(barrenLocation)->GetParentRegionKey())->scene;
+  for (RandomizerCheck barrenLocation : barrenLocations) {
+    std::string barrenRegion = GetHintRegion(ctx->GetItemLocation(barrenLocation)->GetParentRegionKey())->scene;
     bool isDungeon = std::find(dungeonNames.begin(), dungeonNames.end(), barrenRegion) != dungeonNames.end();
     //If it hasn't already been added to the list and is a dungeon, add to list
     if (isDungeon && std::find(barrenDungeons.begin(), barrenDungeons.end(), barrenRegion) == barrenDungeons.end()) {
@@ -1002,8 +1045,8 @@ void CreateAllHints() {
 
   //Get list of all woth dungeons
   std::vector<std::string> wothDungeons;
-  for (uint32_t wothLocation : wothLocations) {
-    std::string wothRegion = GetHintRegion(Location(wothLocation)->GetParentRegionKey())->scene;
+  for (RandomizerCheck wothLocation : ctx->wothLocations) {
+    std::string wothRegion = GetHintRegion(ctx->GetItemLocation(wothLocation)->GetParentRegionKey())->scene;
     bool isDungeon = std::find(dungeonNames.begin(), dungeonNames.end(), wothRegion) != dungeonNames.end();
     //If it hasn't already been added to the list and is a dungeon, add to list
     if (isDungeon && std::find(wothDungeons.begin(), wothDungeons.end(), wothRegion) == wothDungeons.end()) {
@@ -1028,58 +1071,78 @@ void CreateAllHints() {
   }
 
   //while there are still gossip stones remaining
-  while (FilterFromPool(gossipStoneLocations, [](const uint32_t loc){return Location(loc)->GetPlaceduint32_t() == NONE;}).size() != 0) {
-    //TODO: fixed hint types
+  while (FilterFromPool(Rando::StaticData::gossipStoneLocations, [ctx](const RandomizerCheck loc) {
+             return ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == RG_NONE;
+         }).size() != 0) {
+      // TODO: fixed hint types
 
-    if (remainingHintTypes.empty()) {
-      break;
-    }
+      if (remainingHintTypes.empty()) {
+          break;
+      }
 
-    //get a random hint type from the remaining hints
-    HintType type = RandomElement(remainingHintTypes, true);
+      // get a random hint type from the remaining hints
+      HintType type = RandomElement(remainingHintTypes, true);
 
-    SPDLOG_DEBUG("Attempting to make hint of type: ");
-    SPDLOG_DEBUG(hintTypeNames.find(type)->second);
-    SPDLOG_DEBUG("\n");
+      SPDLOG_DEBUG("Attempting to make hint of type: ");
+      SPDLOG_DEBUG(hintTypeNames.find(type)->second);
+      SPDLOG_DEBUG("\n");
 
-    //create the appropriate hint for the type
-    if (type == HINT_TYPE_WOTH) {
-      CreateWothHint(&remainingDungeonWothHints);
+      // create the appropriate hint for the type
+      if (type == HINT_TYPE_WOTH) {
+          CreateWothHint(&remainingDungeonWothHints);
 
-    } else if (type == HINT_TYPE_BARREN) {
-      CreateBarrenHint(&remainingDungeonBarrenHints, barrenLocations);
+      } else if (type == HINT_TYPE_BARREN) {
+          CreateBarrenHint(&remainingDungeonBarrenHints, barrenLocations);
 
-    } else if (type == HINT_TYPE_SOMETIMES){
-      std::vector<uint32_t> sometimesHintLocations = FilterFromPool(allLocations, [](const uint32_t loc){return Location(loc)->GetHint().GetType() == HintCategory::Sometimes && Location(loc)->IsHintable() && !(Location(loc)->IsHintedAt());});
-      CreateLocationHint(sometimesHintLocations);
+      } else if (type == HINT_TYPE_SOMETIMES) {
+          std::vector<RandomizerCheck> sometimesHintLocations =
+              FilterFromPool(ctx->allLocations, [ctx](const RandomizerCheck loc) {
+                  return ctx->GetHint(ctx->GetItemLocation(loc)->GetHintKey())->GetHintType() == HINT_TYPE_SOMETIMES &&
+                         ctx->GetItemLocation(loc)->IsHintable() && !(ctx->GetItemLocation(loc)->IsHintedAt());
+              });
+          CreateLocationHint(sometimesHintLocations);
 
-    } else if (type == HINT_TYPE_RANDOM) {
-      CreateRandomLocationHint();
+      } else if (type == HINT_TYPE_RANDOM) {
+          CreateRandomLocationHint();
 
-    } else if (type == HINT_TYPE_ITEM) {
-      CreateGoodItemHint();
+      } else if (type == HINT_TYPE_ITEM) {
+          CreateGoodItemHint();
 
-    } else if (type == HINT_TYPE_SONG){
-      std::vector<uint32_t> songHintLocations = FilterFromPool(allLocations, [](const uint32_t loc){return Location(loc)->IsCategory(Category::cSong) && Location(loc)->IsHintable() && !(Location(loc)->IsHintedAt());});
-      CreateLocationHint(songHintLocations);
+      } else if (type == HINT_TYPE_SONG) {
+          std::vector<RandomizerCheck> songHintLocations =
+              FilterFromPool(ctx->allLocations, [ctx](const RandomizerCheck loc) {
+                  return Rando::StaticData::GetLocation(loc)->IsCategory(Category::cSong) &&
+                         ctx->GetItemLocation(loc)->IsHintable() && !(ctx->GetItemLocation(loc)->IsHintedAt());
+              });
+          CreateLocationHint(songHintLocations);
 
-    } else if (type == HINT_TYPE_OVERWORLD){
-      std::vector<uint32_t> overworldHintLocations = FilterFromPool(allLocations, [](const uint32_t loc){return Location(loc)->IsOverworld() && Location(loc)->IsHintable() && !(Location(loc)->IsHintedAt());});
-      CreateLocationHint(overworldHintLocations);
+      } else if (type == HINT_TYPE_OVERWORLD) {
+          std::vector<RandomizerCheck> overworldHintLocations =
+              FilterFromPool(ctx->allLocations, [ctx](const RandomizerCheck loc) {
+                  return Rando::StaticData::GetLocation(loc)->IsOverworld() && ctx->GetItemLocation(loc)->IsHintable() &&
+                         !(ctx->GetItemLocation(loc)->IsHintedAt());
+              });
+          CreateLocationHint(overworldHintLocations);
 
-    } else if (type == HINT_TYPE_DUNGEON){
-      std::vector<uint32_t> dungeonHintLocations = FilterFromPool(allLocations, [](const uint32_t loc){return Location(loc)->IsDungeon() && Location(loc)->IsHintable() && !(Location(loc)->IsHintedAt());});
-      CreateLocationHint(dungeonHintLocations);
+      } else if (type == HINT_TYPE_DUNGEON) {
+          std::vector<RandomizerCheck> dungeonHintLocations =
+              FilterFromPool(ctx->allLocations, [ctx](const RandomizerCheck loc) {
+                  return Rando::StaticData::GetLocation(loc)->IsDungeon() && ctx->GetItemLocation(loc)->IsHintable() &&
+                         !(ctx->GetItemLocation(loc)->IsHintedAt());
+              });
+          CreateLocationHint(dungeonHintLocations);
 
-    } else if (type == HINT_TYPE_JUNK) {
-      CreateJunkHint();
-    }
+      } else if (type == HINT_TYPE_JUNK) {
+          CreateJunkHint();
+      }
   }
 
   //If any gossip stones failed to have a hint placed on them for some reason, place a junk hint as a failsafe.
-  for (uint32_t gossipStone : FilterFromPool(gossipStoneLocations, [](const uint32_t loc){return Location(loc)->GetPlaceduint32_t() == NONE;})) {
-    const HintText junkHint = RandomElement(GetHintCategory(HintCategory::Junk));
-    AddHint(junkHint.GetText(), gossipStone, {QM_PINK});
+  for (RandomizerCheck gossipStone : FilterFromPool(Rando::StaticData::gossipStoneLocations, [ctx](const RandomizerCheck loc) {
+           return ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == RG_NONE;
+       })) {
+      const HintText junkHint = RandomElement(GetHintCategory(HintCategory::Junk));
+      AddHint(junkHint.GetText(), gossipStone, { QM_PINK });
   }
 
   //Getting gossip stone locations temporarily sets one location to not be reachable.
diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.hpp b/soh/soh/Enhancements/randomizer/3drando/hints.hpp
index 83985c0da..ea942909c 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hints.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hints.hpp
@@ -4,10 +4,10 @@
 #include <string>
 #include <vector>
 
-#include "keys.hpp"
 #include "text.hpp"
 #include "random.hpp"
 #include "settings.hpp"
+#include "dungeon.hpp"
 #include <functional>
 
 struct HintDistributionSetting {
@@ -193,14 +193,14 @@ private:
     HintCategory type;
 };
 
-using ConditionalAlwaysHint = std::pair<uint32_t, std::function<bool()>>;
+using ConditionalAlwaysHint = std::pair<RandomizerCheck, std::function<bool()>>;
 
 //10 dungeons as GTG and GC are excluded
 extern std::array<DungeonInfo, 10> dungeonInfoData;
 
 extern std::array<ConditionalAlwaysHint, 9> conditionalAlwaysHints;
 
-extern uint32_t GetHintRegionHintKey(const uint32_t area);
+extern RandomizerHintTextKey GetHintRegionHintKey(const RandomizerRegion area);
 extern void CreateAllHints();
 extern void CreateMerchantsHints();
 extern void CreateWarpSongTexts();
diff --git a/soh/soh/Enhancements/randomizer/3drando/item.cpp b/soh/soh/Enhancements/randomizer/3drando/item.cpp
deleted file mode 100644
index 3e10a165c..000000000
--- a/soh/soh/Enhancements/randomizer/3drando/item.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-#include "item.hpp"
-
-#include <array>
-
-#include "item_location.hpp"
-#include "logic.hpp"
-#include "random.hpp"
-#include "item_pool.hpp"
-#include "settings.hpp"
-#include "z64item.h"
-
-Item::Item(RandomizerGet randomizerGet_, Text name_, ItemType type_, int getItemId_, bool advancement_, bool* logicVar_, uint32_t hintKey_,
-           uint16_t price_)
-    : randomizerGet(randomizerGet_),
-      name(std::move(name_)),
-      type(type_),
-      getItemId(getItemId_),
-      advancement(advancement_),
-      logicVar(logicVar_),
-      hintKey(hintKey_),
-      price(price_) {}
-
-Item::Item(RandomizerGet randomizerGet_, Text name_, ItemType type_, int getItemId_, bool advancement_, uint8_t* logicVar_, uint32_t hintKey_,
-           uint16_t price_)
-    : randomizerGet(randomizerGet_),
-      name(std::move(name_)),
-      type(type_),
-      getItemId(getItemId_),
-      advancement(advancement_),
-      logicVar(logicVar_),
-      hintKey(hintKey_),
-      price(price_) {}
-
-Item::~Item() = default;
-
-void Item::ApplyEffect() {
-    //If this is a key ring, logically add as many keys as we could need
-    if (FOREST_TEMPLE_KEY_RING <= hintKey && hintKey <= GANONS_CASTLE_KEY_RING) {
-        *std::get<uint8_t*>(logicVar) += 10;
-    }
-    else {
-        if (std::holds_alternative<bool*>(logicVar)) {
-            *std::get<bool*>(logicVar) = true;
-        } else {
-            *std::get<uint8_t*>(logicVar) += 1;
-        }
-    }
-    Logic::UpdateHelpers();
-}
-
-void Item::UndoEffect() {
-    if (FOREST_TEMPLE_KEY_RING <= hintKey && hintKey <= GANONS_CASTLE_KEY_RING) {
-        *std::get<uint8_t*>(logicVar) -= 10;
-    }
-    else {
-        if (std::holds_alternative<bool*>(logicVar)) {
-            *std::get<bool*>(logicVar) = false;
-        } else {
-            *std::get<uint8_t*>(logicVar) -= 1;
-        }
-    }
-    Logic::UpdateHelpers();
-}
-
-ItemOverride_Value Item::Value() const {
-    ItemOverride_Value val;
-
-    val.all = 0;
-    val.itemId = getItemId;
-    if (getItemId == GI_ICE_TRAP) {
-        val.looksLikeItemId = RandomElement(IceTrapModels);
-    }
-    if (getItemId >= 0x95 && getItemId <= 0x9A) { //Boss keys
-        val.looksLikeItemId = GI_KEY_BOSS;
-    }
-    if (getItemId >= 0xAF && getItemId <= 0xB7) { //Small keys
-        val.looksLikeItemId = GI_KEY_SMALL;
-    }
-    if (type == ITEMTYPE_SHOP) {
-        // With the current shopsanity implementation, we need a way to detect
-        // regular shop items. This method should have no unintended side effects
-        // unless there was a multiworld with 256 players... so, it should be fine.
-        val.player = 0xFF;
-    }
-    return val;
-}
diff --git a/soh/soh/Enhancements/randomizer/3drando/item.hpp b/soh/soh/Enhancements/randomizer/3drando/item.hpp
deleted file mode 100644
index ee7bfc783..000000000
--- a/soh/soh/Enhancements/randomizer/3drando/item.hpp
+++ /dev/null
@@ -1,156 +0,0 @@
-#pragma once
-
-#include <string>
-#include <variant>
-
-#include "keys.hpp"
-#include "hint_list.hpp"
-#include "settings.hpp"
-#include "../randomizerTypes.h"
-
-union ItemOverride_Value;
-
-enum ItemType {
-    ITEMTYPE_ITEM,
-    ITEMTYPE_MAP,
-    ITEMTYPE_COMPASS,
-    ITEMTYPE_BOSSKEY,
-    ITEMTYPE_SMALLKEY,
-    ITEMTYPE_TOKEN,
-    ITEMTYPE_FORTRESS_SMALLKEY,
-    ITEMTYPE_EVENT,
-    ITEMTYPE_DROP,
-    ITEMTYPE_REFILL,
-    ITEMTYPE_SONG,
-    ITEMTYPE_SHOP,
-    ITEMTYPE_DUNGEONREWARD
-};
-
-class Item {
-public:
-    Item() = default;
-  Item(RandomizerGet randomizerGet_, Text name_, ItemType type_, int getItemId_, bool advancement_, bool* logicVar_, uint32_t hintKey_,
-       uint16_t price_ = 0);
-    Item(RandomizerGet randomizerGet_, Text name_, ItemType type_, int getItemId_, bool advancement_, uint8_t* logicVar_, uint32_t hintKey_,
-         uint16_t price_ = 0);
-    ~Item();
-
-    void ApplyEffect();
-    void UndoEffect();
-
-    ItemOverride_Value Value() const;
-
-    const Text& GetName() const {
-        return name;
-    }
-
-    bool IsAdvancement() const {
-        return advancement;
-    }
-
-    int GetItemID() const {
-        return getItemId;
-    }
-
-    ItemType GetItemType() const {
-        return type;
-    }
-
-    RandomizerGet GetRandomizerGet() {
-        return randomizerGet;
-    }
-
-    uint16_t GetPrice() const {
-        return price;
-    }
-
-    void SetPrice(uint16_t price_) {
-        price = price_;
-    }
-
-    void SetAsPlaythrough() {
-        playthrough = true;
-    }
-
-    bool IsPlaythrough() const {
-        return playthrough;
-    }
-
-    bool IsBottleItem() const {
-        return getItemId == 0x0F || //Empty Bottle
-               getItemId == 0X14 || //Bottle with Milk
-              (getItemId >= 0x8C && getItemId <= 0x94); //Rest of bottled contents
-    }
-
-    bool IsMajorItem() const {
-        using namespace Settings;
-        if (type == ITEMTYPE_TOKEN) {
-            return Bridge.Is(RAINBOWBRIDGE_TOKENS) || LACSCondition == LACSCONDITION_TOKENS;
-        }
-
-        if (type == ITEMTYPE_DROP || type == ITEMTYPE_EVENT || type == ITEMTYPE_SHOP || type == ITEMTYPE_MAP || type == ITEMTYPE_COMPASS) {
-            return false;
-        }
-
-        if (type == ITEMTYPE_DUNGEONREWARD && (ShuffleRewards.Is(REWARDSHUFFLE_END_OF_DUNGEON))) {
-            return false;
-        }
-
-        if ((randomizerGet == RG_BOMBCHU_5 || randomizerGet == RG_BOMBCHU_10 || randomizerGet == RG_BOMBCHU_20) && !BombchusInLogic) {
-            return false;
-        }
-
-        if (hintKey == HEART_CONTAINER || hintKey == PIECE_OF_HEART || hintKey == TREASURE_GAME_HEART) {
-            return false;
-        }
-
-        if (type == ITEMTYPE_SMALLKEY && (Keysanity.Is(KEYSANITY_VANILLA) || Keysanity.Is(KEYSANITY_OWN_DUNGEON))) {
-            return false;
-        }
-
-        if (type == ITEMTYPE_FORTRESS_SMALLKEY && GerudoKeys.Is(GERUDOKEYS_VANILLA)) {
-            return false;
-        }
-
-        if ((type == ITEMTYPE_BOSSKEY && getItemId != 0xAD) && (BossKeysanity.Is(BOSSKEYSANITY_VANILLA) || BossKeysanity.Is(BOSSKEYSANITY_OWN_DUNGEON))) {
-            return false;
-        }
-            //Ganons Castle Boss Key
-        if (getItemId == 0xAD && (GanonsBossKey.Is(GANONSBOSSKEY_VANILLA) || GanonsBossKey.Is(GANONSBOSSKEY_OWN_DUNGEON))) {
-            return false;
-        }
-
-        if (randomizerGet == RG_GREG_RUPEE) {
-            return Bridge.Is(RAINBOWBRIDGE_GREG);
-        }
-
-        return IsAdvancement();
-    }
-
-    uint32_t GetHintKey() const {
-        return hintKey;
-    }
-
-    const HintText& GetHint() const {
-        return Hint(hintKey);
-    }
-
-    bool operator== (const Item& right) const {
-        return type == right.GetItemType() && getItemId == right.GetItemID();
-    }
-
-    bool operator!= (const Item& right) const {
-        return !operator==(right);
-    }
-
-private:
-    RandomizerGet randomizerGet;
-    Text name;
-    ItemType type;
-    int  getItemId;
-    bool advancement;
-    std::variant<bool*, uint8_t*> logicVar;
-    uint32_t hintKey;
-    uint16_t price;
-    bool playthrough = false;
-};
diff --git a/soh/soh/Enhancements/randomizer/3drando/item_list.cpp b/soh/soh/Enhancements/randomizer/3drando/item_list.cpp
deleted file mode 100644
index 417203a5b..000000000
--- a/soh/soh/Enhancements/randomizer/3drando/item_list.cpp
+++ /dev/null
@@ -1,311 +0,0 @@
-#include "item_list.hpp"
-
-#include "logic.hpp"
-#include <array>
-#include "z64item.h"
-#include "../randomizerTypes.h"
-
-using namespace Logic;
-
-static std::array<Item, KEY_ENUM_MAX> itemTable;
-
-void ItemTable_Init() {                              // RandomizerGet                              English name                       French                              Spanish                                     Item Type       getItemID       advancement    logic           hint key
-    itemTable[NONE]                              = Item(RG_NONE,                              Text{"No Item",                         "Rien",                             "Sin Objeto"},                              ITEMTYPE_EVENT, GI_RUPEE_GREEN,    false,      &noVariable,    NONE);
-    itemTable[KOKIRI_SWORD]                      = Item(RG_KOKIRI_SWORD,                      Text{"Kokiri Sword",                    "Épée Kokiri",                      "Espada Kokiri"},                           ITEMTYPE_ITEM,  GI_SWORD_KOKIRI,   true,       &KokiriSword,   KOKIRI_SWORD);
-  //[MASTER_SWORD]
-    itemTable[GIANTS_KNIFE]                      = Item(RG_GIANTS_KNIFE,                      Text{"Giant's Knife",                   "Lame des Géants",                  "Espada de Biggoron"},                      ITEMTYPE_ITEM,  GI_SWORD_KNIFE,    false,      &noVariable,    GIANTS_KNIFE);
-    itemTable[BIGGORON_SWORD]                    = Item(RG_BIGGORON_SWORD,                    Text{"Biggoron's Sword",                "Épée de Biggoron",                 "Espada de Biggoron"},                      ITEMTYPE_ITEM,  GI_SWORD_BGS,      true,       &BiggoronSword, BIGGORON_SWORD);
-    itemTable[DEKU_SHIELD]                       = Item(RG_DEKU_SHIELD,                       Text{"Deku Shield",                     "Bouclier Mojo",                    "Escudo deku"},                             ITEMTYPE_ITEM,  GI_SHIELD_DEKU,    false,      &noVariable,    DEKU_SHIELD);
-    itemTable[HYLIAN_SHIELD]                     = Item(RG_HYLIAN_SHIELD,                     Text{"Hylian Shield",                   "Bouclier Hylien",                  "Escudo hyliano"},                          ITEMTYPE_ITEM,  GI_SHIELD_HYLIAN,  false,      &noVariable,    HYLIAN_SHIELD);
-    itemTable[MIRROR_SHIELD]                     = Item(RG_MIRROR_SHIELD,                     Text{"Mirror Shield",                   "Bouclier Miroir",                  "Escudo espejo"},                           ITEMTYPE_ITEM,  GI_SHIELD_MIRROR,  true,       &MirrorShield,  MIRROR_SHIELD);
-    itemTable[GORON_TUNIC]                       = Item(RG_GORON_TUNIC,                       Text{"Goron Tunic",                     "Tunique Goron",                    "Sayo goron"},                              ITEMTYPE_ITEM,  GI_TUNIC_GORON,    true,       &GoronTunic,    GORON_TUNIC);
-    itemTable[ZORA_TUNIC]                        = Item(RG_ZORA_TUNIC,                        Text{"Zora Tunic",                      "Tunique Zora",                     "Sayo zora"},                               ITEMTYPE_ITEM,  GI_TUNIC_ZORA,     true,       &ZoraTunic,     ZORA_TUNIC);
-    itemTable[IRON_BOOTS]                        = Item(RG_IRON_BOOTS,                        Text{"Iron Boots",                      "Bottes de plomb",                  "Botas de hierro"},                         ITEMTYPE_ITEM,  GI_BOOTS_IRON,     true,       &IronBoots,     IRON_BOOTS);
-    itemTable[HOVER_BOOTS]                       = Item(RG_HOVER_BOOTS,                       Text{"Hover Boots",                     "Bottes des airs",                  "Botas voladoras"},                         ITEMTYPE_ITEM,  GI_BOOTS_HOVER,    true,       &HoverBoots,    HOVER_BOOTS);
-
-
-    itemTable[BOOMERANG]                         = Item(RG_BOOMERANG,                         Text{"Boomerang",                       "Boomerang",                        "Búmeran"},                                 ITEMTYPE_ITEM,  GI_BOOMERANG,      true,       &Boomerang,     BOOMERANG);
-    itemTable[LENS_OF_TRUTH]                     = Item(RG_LENS_OF_TRUTH,                     Text{"Lens of Truth",                   "Monocle de Vérité",                "Lupa de la Verdad"},                       ITEMTYPE_ITEM,  GI_LENS,           true,       &LensOfTruth,   LENS_OF_TRUTH);
-    itemTable[MEGATON_HAMMER]                    = Item(RG_MEGATON_HAMMER,                    Text{"Megaton Hammer",                  "Masse des Titans",                 "Martillo Megatón"},                        ITEMTYPE_ITEM,  GI_HAMMER,         true,       &Hammer,        MEGATON_HAMMER);
-    itemTable[STONE_OF_AGONY]                    = Item(RG_STONE_OF_AGONY,                    Text{"Stone of Agony",                  "Pierre de Souffrance",             "Piedra de la Agonía"},                     ITEMTYPE_ITEM,  GI_STONE_OF_AGONY, true,       &ShardOfAgony,  STONE_OF_AGONY);
-    itemTable[DINS_FIRE]                         = Item(RG_DINS_FIRE,                         Text{"Din's Fire",                      "Feu de Din",                       "Fuego de Din"},                            ITEMTYPE_ITEM,  GI_DINS_FIRE,      true,       &DinsFire,      DINS_FIRE);
-    itemTable[FARORES_WIND]                      = Item(RG_FARORES_WIND,                      Text{"Farore's Wind",                   "Vent de Farore",                   "Viento de Farore"},                        ITEMTYPE_ITEM,  GI_FARORES_WIND,   true,       &FaroresWind,   FARORES_WIND);
-    itemTable[NAYRUS_LOVE]                       = Item(RG_NAYRUS_LOVE,                       Text{"Nayru's Love",                    "Amour de Nayru",                   "Amor de Nayru"},                           ITEMTYPE_ITEM,  GI_NAYRUS_LOVE,    true,       &NayrusLove,    NAYRUS_LOVE);
-    itemTable[FIRE_ARROWS]                       = Item(RG_FIRE_ARROWS,                       Text{"Fire Arrow",                      "Flèche de Feu",                    "Flecha de fuego"},                         ITEMTYPE_ITEM,  GI_ARROW_FIRE,     true,       &FireArrows,    FIRE_ARROWS);
-    itemTable[ICE_ARROWS]                        = Item(RG_ICE_ARROWS,                        Text{"Ice Arrow",                       "Flèche de Glace",                  "Flecha de hielo"},                         ITEMTYPE_ITEM,  GI_ARROW_ICE,      true,       &IceArrows,     ICE_ARROWS);
-    itemTable[LIGHT_ARROWS]                      = Item(RG_LIGHT_ARROWS,                      Text{"Light Arrow",                     "Flèche de Lumière",                "Flecha de luz"},                           ITEMTYPE_ITEM,  GI_ARROW_LIGHT,    true,       &LightArrows,   LIGHT_ARROWS);
-    itemTable[GERUDO_MEMBERSHIP_CARD]            = Item(RG_GERUDO_MEMBERSHIP_CARD,            Text{"Gerudo Membership Card",          "Carte Gerudo",                     "Pase de socio gerudo"},                    ITEMTYPE_ITEM,  GI_GERUDO_CARD,    true,       &GerudoToken,   GERUDO_MEMBERSHIP_CARD);
-    itemTable[MAGIC_BEAN]                        = Item(RG_MAGIC_BEAN,                        Text{"Magic Bean",                      "Haricots Magiques",                "Habichuelas mágicas"},                     ITEMTYPE_ITEM,  GI_BEAN,           true,       &MagicBean,     MAGIC_BEAN);
-    itemTable[MAGIC_BEAN_PACK]                   = Item(RG_MAGIC_BEAN_PACK,                   Text{"Magic Bean Pack",                 "Paquet de Haricots Magiques",      "Lote de habichuelas mágicas"},             ITEMTYPE_ITEM,  0xC9,              true,       &MagicBeanPack, MAGIC_BEAN_PACK);
-    itemTable[DOUBLE_DEFENSE]                    = Item(RG_DOUBLE_DEFENSE,                    Text{"Double Defense",                  "Double Défence",                   "Doble poder defensivo"},                   ITEMTYPE_ITEM,  0xB8,              true,       &DoubleDefense, DOUBLE_DEFENSE);
-
-    itemTable[WEIRD_EGG]                         = Item(RG_WEIRD_EGG,                         Text{"Weird Egg",                       "Oeuf Curieux",                     "Huevo extraño"},                           ITEMTYPE_ITEM,  GI_WEIRD_EGG,      true,       &WeirdEgg,      WEIRD_EGG);
-//  itemTable[CUCCO]                             = Item(RG_CUCCO,                             Text{"Cucco",                           "Cocotte",                          "Cuco"},                                    ITEMTYPE_ITEM,  GI_CUCCO,          true,       &Cucco,         CUCCO);
-    itemTable[ZELDAS_LETTER]                     = Item(RG_ZELDAS_LETTER,                     Text{"Zelda's Letter",                  "Lettre de Zelda",                  "Carta de Zelda"},                          ITEMTYPE_ITEM,  GI_LETTER_ZELDA,   true,       &ZeldasLetter,  ZELDAS_LETTER);
-//  itemTable[KEATON_MASK]                       = Item(RG_KEATON_MASK,                       Text{"Keaton Mask",                     "Masque du Renard",                 "Careta de Keaton"},                        ITEMTYPE_ITEM,  GI_MASK_KEATON,    true,       &KeatonMask,    KEATON_MASK);
-//  itemTable[SKULL_MASK]                        = Item(RG_SKULL_MASK,                        Text{"Skull Mask",                      "Masque de Mort",                   "Máscara de calavera"},                     ITEMTYPE_ITEM,  GI_MASK_SKULL,     true,       &SkullMask,     SKULL_MASK);
-//  itemTable[SPOOKY_MASK]                       = Item(RG_SPOOKY_MASK,                       Text{"Spooky Mask",                     "Masque d'Effroi",                  "Máscara tenebrosa"},                       ITEMTYPE_ITEM,  GI_MASK_SPOOKY,    true,       &SpookyMask,    SPOOKY_MASK);
-//  itemTable[BUNNY_HOOD]                        = Item(RG_BUNNY_HOOD,                        Text{"Bunny Hood",                      "Masque du Lapin",                  "Capucha de conejo"},                       ITEMTYPE_ITEM,  GI_MASK_BUNNY,     true,       &BunnyHood,     BUNNY_HOOD);
-//  itemTable[GORON_MASK]                        = Item(RG_GORON_MASK,                        Text{"Goron Mask",                      "Masque de Goron",                  "Máscara Goron"},                           ITEMTYPE_ITEM,  GI_MASK_GORON,     true,       &GoronMask,     GORON_MASK);
-//  itemTable[ZORA_MASK]                         = Item(RG_ZORA_MASK,                         Text{"Zora Mask",                       "Masque de Zora",                   "Máscara Zora"},                            ITEMTYPE_ITEM,  GI_MASK_ZORA,      true,       &ZoraMask,      ZORA_MASK);
-//  itemTable[GERUDO_MASK]                       = Item(RG_GERUDO_MASK,                       Text{"Gerudo Mask",                     "Masque de Gerudo",                 "Máscara Gerudo"},                          ITEMTYPE_ITEM,  GI_MASK_GERUDO,    true,       &GerudoMask,    GERUDO_MASK);
-//  itemTable[MASK_OF_TRUTH]                     = Item(RG_MASK_OF_TRUTH,                     Text{"Mask of Truth",                   "Masque de Vérité",                 "Máscara de la Verdad"},                    ITEMTYPE_ITEM,  GI_MASK_MASK,      true,       &MaskofTruth,   MASK_OF_TRUTH);
-    itemTable[POCKET_EGG]                        = Item(RG_POCKET_EGG,                        Text{"Pocket Egg",                      "Oeuf de poche",                    "Huevo de bolsillo"},                       ITEMTYPE_ITEM,  GI_POCKET_EGG,     true,       &PocketEgg,     POCKET_EGG);
-//  itemTable[POCKET_CUCCO]                      = Item(RG_POCKET_CUCCO,                      Text{"Pocket Cucco",                    "Cocotte de poche",                 "Cuco de bolsillo"},                        ITEMTYPE_ITEM,  GI_POCKET_CUCCO,   true,       &PocketCucco,   POCKET_CUCCO);
-    itemTable[COJIRO]                            = Item(RG_COJIRO,                            Text{"Cojiro",                          "P'tit Poulet",                     "Cojiro"},                                  ITEMTYPE_ITEM,  GI_COJIRO,         true,       &Cojiro,        COJIRO);
-    itemTable[ODD_MUSHROOM]                      = Item(RG_ODD_MUSHROOM,                      Text{"Odd Mushroom",                    "Champignon Suspect",               "Champiñón extraño"},                       ITEMTYPE_ITEM,  GI_ODD_MUSHROOM,   true,       &OddMushroom,   ODD_MUSHROOM);
-    itemTable[ODD_POTION]                        = Item(RG_ODD_POTION,                        Text{"Odd Potion",                      "Mixture Suspecte",                 "Medicina rara"},                           ITEMTYPE_ITEM,  GI_ODD_POTION,     true,       &OddPoultice,   ODD_POTION);
-    itemTable[POACHERS_SAW]                      = Item(RG_POACHERS_SAW,                      Text{"Poacher's Saw",                   "Scie du Chasseur",                 "Sierra del furtivo"},                      ITEMTYPE_ITEM,  GI_SAW,            true,       &PoachersSaw,   POACHERS_SAW);
-    itemTable[BROKEN_SWORD]                      = Item(RG_BROKEN_SWORD,                      Text{"Broken Goron's Sword",            "Épée Brisée de Goron",             "Espada goron rota"},                       ITEMTYPE_ITEM,  GI_SWORD_BROKEN,   true,       &BrokenSword,   BROKEN_SWORD);
-    itemTable[PRESCRIPTION]                      = Item(RG_PRESCRIPTION,                      Text{"Prescription",                    "Ordonnance",                       "Receta"},                                  ITEMTYPE_ITEM,  GI_PRESCRIPTION,   true,       &Prescription,  PRESCRIPTION);
-    itemTable[EYEBALL_FROG]                      = Item(RG_EYEBALL_FROG,                      Text{"Eyeball Frog",                    "Crapaud-qui-louche",               "Rana de ojos saltones"},                   ITEMTYPE_ITEM,  GI_FROG,           true,       &EyeballFrog,   EYEBALL_FROG);
-    itemTable[EYEDROPS]                          = Item(RG_EYEDROPS,                          Text{"World's Finest Eyedrops",         "Super Gouttes",                    "Supergotas oculares"},                     ITEMTYPE_ITEM,  GI_EYEDROPS,       true,       &Eyedrops,      EYEDROPS);
-    itemTable[CLAIM_CHECK]                       = Item(RG_CLAIM_CHECK,                       Text{"Claim Check",                     "Certificat",                       "Recibo"},                                  ITEMTYPE_ITEM,  GI_CLAIM_CHECK,    true,       &ClaimCheck,    CLAIM_CHECK);
-
-    itemTable[GOLD_SKULLTULA_TOKEN]              = Item(RG_GOLD_SKULLTULA_TOKEN,              Text{"Gold Skulltula Token",            "Symbole de Skulltula d'Or",        "Símbolo de skulltula dorada"},             ITEMTYPE_TOKEN, GI_SKULL_TOKEN,    true,       &GoldSkulltulaTokens, GOLD_SKULLTULA_TOKEN);
-
-    //Progression Items
-    itemTable[PROGRESSIVE_HOOKSHOT]              = Item(RG_PROGRESSIVE_HOOKSHOT,              Text{"Progressive Hookshot",            "Grappin (prog.)",                  "Gancho progresivo"},                       ITEMTYPE_ITEM,     0x80, true,  &ProgressiveHookshot,   PROGRESSIVE_HOOKSHOT);
-    itemTable[PROGRESSIVE_STRENGTH]              = Item(RG_PROGRESSIVE_STRENGTH,              Text{"Strength Upgrade",                "Amélioration de Force (prog.)",    "Fuerza progresiva"},                       ITEMTYPE_ITEM,     0x81, true,  &ProgressiveStrength,   PROGRESSIVE_STRENGTH);
-    itemTable[PROGRESSIVE_BOMB_BAG]              = Item(RG_PROGRESSIVE_BOMB_BAG,              Text{"Progressive Bomb Bag",            "Sac de Bombes (prog.)",            "Saco de bombas progresivo"},               ITEMTYPE_ITEM,     0x82, true,  &ProgressiveBombBag,    PROGRESSIVE_BOMB_BAG);
-    itemTable[PROGRESSIVE_BOW]                   = Item(RG_PROGRESSIVE_BOW,                   Text{"Progressive Bow",                 "Arc (prog.)",                      "Arco progresivo"},                         ITEMTYPE_ITEM,     0x83, true,  &ProgressiveBow,        PROGRESSIVE_BOW);
-    itemTable[PROGRESSIVE_SLINGSHOT]             = Item(RG_PROGRESSIVE_SLINGSHOT,             Text{"Progressive Slingshot",           "Lance-Pierre (prog.)",             "Resortera progresiva"},                    ITEMTYPE_ITEM,     0x84, true,  &ProgressiveBulletBag,  PROGRESSIVE_SLINGSHOT);
-    itemTable[PROGRESSIVE_WALLET]                = Item(RG_PROGRESSIVE_WALLET,                Text{"Progressive Wallet",              "Bourse (prog.)",                   "Bolsa de rupias progresiva"},              ITEMTYPE_ITEM,     0x85, true,  &ProgressiveWallet,     PROGRESSIVE_WALLET);
-    itemTable[PROGRESSIVE_SCALE]                 = Item(RG_PROGRESSIVE_SCALE,                 Text{"Progressive Scale",               "Écaille (prog.)",                  "Escama progresiva"},                       ITEMTYPE_ITEM,     0x86, true,  &ProgressiveScale,      PROGRESSIVE_SCALE);
-    itemTable[PROGRESSIVE_NUT_UPGRADE]           = Item(RG_PROGRESSIVE_NUT_UPGRADE,           Text{"Progressive Nut Capacity",        "Capacité de Noix (prog.)",         "Capacidad de nueces deku progresiva"},     ITEMTYPE_ITEM,     0x87, false, &noVariable,            PROGRESSIVE_NUT_UPGRADE);
-    itemTable[PROGRESSIVE_STICK_UPGRADE]         = Item(RG_PROGRESSIVE_STICK_UPGRADE,         Text{"Progressive Stick Capacity",      "Capacité de Bâtons (prog.)",       "Capacidad de palos deku progresiva"},      ITEMTYPE_ITEM,     0x88, false, &noVariable,            PROGRESSIVE_STICK_UPGRADE);
-    itemTable[PROGRESSIVE_BOMBCHUS]              = Item(RG_PROGRESSIVE_BOMBCHUS,              Text{"Progressive Bombchu",             "Missiles (prog.)",                 "Bombchus progresivos"},                    ITEMTYPE_ITEM,     0x89, true,  &Bombchus,              PROGRESSIVE_BOMBCHUS);
-    itemTable[PROGRESSIVE_MAGIC_METER]           = Item(RG_PROGRESSIVE_MAGIC_METER,           Text{"Progressive Magic Meter",         "Jauge de Magie (prog.)",           "Poder mágico progresivo"},                 ITEMTYPE_ITEM,     0x8A, true,  &ProgressiveMagic,      PROGRESSIVE_MAGIC_METER);
-    itemTable[PROGRESSIVE_OCARINA]               = Item(RG_PROGRESSIVE_OCARINA,               Text{"Progressive Ocarina",             "Ocarina (prog.)",                  "Ocarina progresiva"},                      ITEMTYPE_ITEM,     0x8B, true,  &ProgressiveOcarina,    PROGRESSIVE_OCARINA);
-    itemTable[PROGRESSIVE_GORONSWORD]            = Item(RG_PROGRESSIVE_GORONSWORD,            Text{"Progressive Goron Sword",         "Épée Goron (prog.)",               "Espada Goron progresiva"},                 ITEMTYPE_ITEM,     0xD4, true,  &ProgressiveGiantKnife, PROGRESSIVE_GORONSWORD);
-
-    //Bottles
-    itemTable[EMPTY_BOTTLE]                      = Item(RG_EMPTY_BOTTLE,                      Text{"Empty Bottle",                    "Bouteille Vide",                   "Botella vacía"},                           ITEMTYPE_ITEM,     0x0F, true, &Bottles, EMPTY_BOTTLE);
-    itemTable[BOTTLE_WITH_MILK]                  = Item(RG_BOTTLE_WITH_MILK,                  Text{"Bottle with Milk",                "Bouteille avec du Lait",           "Botella de leche Lon Lon"},                ITEMTYPE_ITEM,     0x14, true, &Bottles, BOTTLE_WITH_MILK);
-    itemTable[BOTTLE_WITH_RED_POTION]            = Item(RG_BOTTLE_WITH_RED_POTION,            Text{"Bottle with Red Potion",          "Bouteille avec une Potion Rouge",  "Botella de poción roja"},                  ITEMTYPE_ITEM,     0x8C, true, &Bottles, BOTTLE_WITH_RED_POTION);
-    itemTable[BOTTLE_WITH_GREEN_POTION]          = Item(RG_BOTTLE_WITH_GREEN_POTION,          Text{"Bottle with Green Potion",        "Bouteille avec une Potion Verte",  "Botella de poción verde"},                 ITEMTYPE_ITEM,     0x8D, true, &Bottles, BOTTLE_WITH_GREEN_POTION);
-    itemTable[BOTTLE_WITH_BLUE_POTION]           = Item(RG_BOTTLE_WITH_BLUE_POTION,           Text{"Bottle with Blue Potion",         "Bouteille avec une Potion Bleue",  "Botella de poción azul"},                  ITEMTYPE_ITEM,     0x8E, true, &Bottles, BOTTLE_WITH_BLUE_POTION);
-    itemTable[BOTTLE_WITH_FAIRY]                 = Item(RG_BOTTLE_WITH_FAIRY,                 Text{"Bottle with Fairy",               "Bouteille avec une Fée",           "Hada en una botella"},                     ITEMTYPE_ITEM,     0x8F, true, &Bottles, BOTTLE_WITH_FAIRY);
-    itemTable[BOTTLE_WITH_FISH]                  = Item(RG_BOTTLE_WITH_FISH,                  Text{"Bottle with Fish",                "Bouteille avec un Poisson",        "Pez en una botella"},                      ITEMTYPE_ITEM,     0x90, true, &Bottles, BOTTLE_WITH_FISH);
-    itemTable[BOTTLE_WITH_BLUE_FIRE]             = Item(RG_BOTTLE_WITH_BLUE_FIRE,             Text{"Bottle with Blue Fire",           "Bouteille avec une Flamme Bleue",  "Botella de fuego azul"},                   ITEMTYPE_ITEM,     0x91, true, &Bottles, BOTTLE_WITH_BLUE_FIRE);
-    itemTable[BOTTLE_WITH_BUGS]                  = Item(RG_BOTTLE_WITH_BUGS,                  Text{"Bottle with Bugs",                "Bouteille avec des Insectes",      "Insecto en una botella"},                  ITEMTYPE_ITEM,     0x92, true, &Bottles, BOTTLE_WITH_BUGS);
-    itemTable[BOTTLE_WITH_POE]                   = Item(RG_BOTTLE_WITH_POE,                   Text{"Bottle with Poe",                 "Bouteille avec un Esprit",         "Poe en una botella"},                      ITEMTYPE_ITEM,     0x94, true, &Bottles, BOTTLE_WITH_POE);
-
-    //Special bottles that can't immediately dump contents
-    itemTable[RUTOS_LETTER]                      = Item(RG_RUTOS_LETTER,                      Text{"Bottle with Ruto's Letter",       "Bouteille avec la Lettre de Ruto", "Carta de Ruto"},                           ITEMTYPE_ITEM,     0x15, true, &RutosLetter,      RUTOS_LETTER);
-    itemTable[BOTTLE_WITH_BIG_POE]               = Item(RG_BOTTLE_WITH_BIG_POE,               Text{"Bottle with Big Poe",             "Bouteille avec une Âme",           "Gran Poe en una botella"},                 ITEMTYPE_ITEM,     0x93, true, &BottleWithBigPoe, BOTTLE_WITH_BIG_POE);
-
-    //Songs
-    itemTable[ZELDAS_LULLABY]                    = Item(RG_ZELDAS_LULLABY,                    Text{"Zelda's Lullaby",                 "Berceuse de Zelda",                "Nana de Zelda"},                           ITEMTYPE_SONG,     0xC1, true, &ZeldasLullaby,    ZELDAS_LULLABY);
-    itemTable[EPONAS_SONG]                       = Item(RG_EPONAS_SONG,                       Text{"Epona's Song",                    "Chant d'Épona",                    "Canción de Epona"},                        ITEMTYPE_SONG,     0xC2, true, &EponasSong,       EPONAS_SONG);
-    itemTable[SARIAS_SONG]                       = Item(RG_SARIAS_SONG,                       Text{"Saria's Song",                    "Chant de Saria",                   "Canción de Saria"},                        ITEMTYPE_SONG,     0xC3, true, &SariasSong,       SARIAS_SONG);
-    itemTable[SUNS_SONG]                         = Item(RG_SUNS_SONG,                         Text{"Sun's Song",                      "Chant du Soleil",                  "Canción del Sol"},                         ITEMTYPE_SONG,     0xC4, true, &SunsSong,         SUNS_SONG);
-    itemTable[SONG_OF_TIME]                      = Item(RG_SONG_OF_TIME,                      Text{"Song of Time",                    "Chant du Temps",                   "Canción del tiempo"},                      ITEMTYPE_SONG,     0xC5, true, &SongOfTime,       SONG_OF_TIME);
-    itemTable[SONG_OF_STORMS]                    = Item(RG_SONG_OF_STORMS,                    Text{"Song of Storms",                  "Chant des Tempêtes",               "Canción de la tormenta"},                  ITEMTYPE_SONG,     0xC6, true, &SongOfStorms,     SONG_OF_STORMS);
-    itemTable[MINUET_OF_FOREST]                  = Item(RG_MINUET_OF_FOREST,                  Text{"Minuet of Forest",                "Menuet des Bois",                  "Minueto del bosque"},                      ITEMTYPE_SONG,     0xBB, true, &MinuetOfForest,   MINUET_OF_FOREST);
-    itemTable[BOLERO_OF_FIRE]                    = Item(RG_BOLERO_OF_FIRE,                    Text{"Bolero of Fire",                  "Boléro du Feu",                    "Bolero del fuego"},                        ITEMTYPE_SONG,     0xBC, true, &BoleroOfFire,     BOLERO_OF_FIRE);
-    itemTable[SERENADE_OF_WATER]                 = Item(RG_SERENADE_OF_WATER,                 Text{"Serenade of Water",               "Sérénade de l'Eau",                "Serenata del agua"},                       ITEMTYPE_SONG,     0xBD, true, &SerenadeOfWater,  SERENADE_OF_WATER);
-    itemTable[REQUIEM_OF_SPIRIT]                 = Item(RG_REQUIEM_OF_SPIRIT,                 Text{"Requiem of Spirit",               "Requiem des Esprits",              "Réquiem del espíritu"},                    ITEMTYPE_SONG,     0xBE, true, &RequiemOfSpirit,  REQUIEM_OF_SPIRIT);
-    itemTable[NOCTURNE_OF_SHADOW]                = Item(RG_NOCTURNE_OF_SHADOW,                Text{"Nocturne of Shadow",              "Nocturne de l'Ombre",              "Nocturno de la sombra"},                   ITEMTYPE_SONG,     0xBF, true, &NocturneOfShadow, NOCTURNE_OF_SHADOW);
-    itemTable[PRELUDE_OF_LIGHT]                  = Item(RG_PRELUDE_OF_LIGHT,                  Text{"Prelude of Light",                "Prélude de la Lumière",            "Preludio de la luz"},                      ITEMTYPE_SONG,     0xC0, true, &PreludeOfLight,   PRELUDE_OF_LIGHT);
-
-    //Maps and Compasses
-    itemTable[DEKU_TREE_MAP]                     = Item(RG_DEKU_TREE_MAP,                     Text{"Great Deku Tree Map",             "Carte de l'Arbre Mojo",            "Mapa del Gran Árbol Deku"},                ITEMTYPE_MAP,      0xA5, false, &noVariable, DEKU_TREE_MAP);
-    itemTable[DODONGOS_CAVERN_MAP]               = Item(RG_DODONGOS_CAVERN_MAP,               Text{"Dodongo's Cavern Map",            "Carte de la Caverne Dodongo",      "Mapa de la Cueva de los Dodongos"},        ITEMTYPE_MAP,      0xA6, false, &noVariable, DODONGOS_CAVERN_MAP);
-    itemTable[JABU_JABUS_BELLY_MAP]              = Item(RG_JABU_JABUS_BELLY_MAP,              Text{"Jabu-Jabu's Belly Map",           "Carte du Ventre de Jabu-Jabu",     "Mapa de la tripa de Jabu-Jabu"},           ITEMTYPE_MAP,      0xA7, false, &noVariable, JABU_JABUS_BELLY_MAP);
-    itemTable[FOREST_TEMPLE_MAP]                 = Item(RG_FOREST_TEMPLE_MAP,                 Text{"Forest Temple Map",               "Carte du Temple de la Forêt",      "Mapa del Templo del Bosque"},              ITEMTYPE_MAP,      0xA8, false, &noVariable, FOREST_TEMPLE_MAP);
-    itemTable[FIRE_TEMPLE_MAP]                   = Item(RG_FIRE_TEMPLE_MAP,                   Text{"Fire Temple Map",                 "Carte du Temple du Feu",           "Mapa del Templo del Fuego"},               ITEMTYPE_MAP,      0xA9, false, &noVariable, FIRE_TEMPLE_MAP);
-    itemTable[WATER_TEMPLE_MAP]                  = Item(RG_WATER_TEMPLE_MAP,                  Text{"Water Temple Map",                "Carte du Temple de l'Eau",         "Mapa del Templo del Agua"},                ITEMTYPE_MAP,      0xAA, false, &noVariable, WATER_TEMPLE_MAP);
-    itemTable[SPIRIT_TEMPLE_MAP]                 = Item(RG_SPIRIT_TEMPLE_MAP,                 Text{"Spirit Temple Map",               "Carte du Temple de l'Esprit",      "Mapa del Templo del Espíritu"},            ITEMTYPE_MAP,      0xAB, false, &noVariable, SPIRIT_TEMPLE_MAP);
-    itemTable[SHADOW_TEMPLE_MAP]                 = Item(RG_SHADOW_TEMPLE_MAP,                 Text{"Shadow Temple Map",               "Carte du Temple de l'Ombre",       "Mapa del Templo de la Sombra"},            ITEMTYPE_MAP,      0xAC, false, &noVariable, SHADOW_TEMPLE_MAP);
-    itemTable[BOTTOM_OF_THE_WELL_MAP]            = Item(RG_BOTTOM_OF_THE_WELL_MAP,            Text{"Bottom of the Well Map",          "Carte du Puits",                   "Mapa del fondo del pozo"},                 ITEMTYPE_MAP,      0xAD, false, &noVariable, BOTTOM_OF_THE_WELL_MAP);
-    itemTable[ICE_CAVERN_MAP]                    = Item(RG_ICE_CAVERN_MAP,                    Text{"Ice Cavern Map",                  "Carte de la Caverne Polaire",      "Mapa de la caverna de hielo"},             ITEMTYPE_MAP,      0xAE, false, &noVariable, ICE_CAVERN_MAP);
-
-    itemTable[DEKU_TREE_COMPASS]                 = Item(RG_DEKU_TREE_COMPASS,                 Text{"Great Deku Tree Compass",         "Boussole de l'Arbre Mojo",         "Brújula del Gran Árbol Deku"},             ITEMTYPE_COMPASS,  0x9B, false, &noVariable, DEKU_TREE_COMPASS);
-    itemTable[DODONGOS_CAVERN_COMPASS]           = Item(RG_DODONGOS_CAVERN_COMPASS,           Text{"Dodongo's Cavern Compass",        "Boussole de la Caverne Dodongo",   "Brújula de la Cueva de los Dodongos"},     ITEMTYPE_COMPASS,  0x9C, false, &noVariable, DODONGOS_CAVERN_COMPASS);
-    itemTable[JABU_JABUS_BELLY_COMPASS]          = Item(RG_JABU_JABUS_BELLY_COMPASS,          Text{"Jabu-Jabu's Belly Compass",       "Boussole du Ventre de Jabu-Jabu",  "Brújula de la tripa de Jabu-Jabu"},        ITEMTYPE_COMPASS,  0x9D, false, &noVariable, JABU_JABUS_BELLY_COMPASS);
-    itemTable[FOREST_TEMPLE_COMPASS]             = Item(RG_FOREST_TEMPLE_COMPASS,             Text{"Forest Temple Compass",           "Boussole du Temple de la Forêt",   "Brújula del Templo del Bosque"},           ITEMTYPE_COMPASS,  0x9E, false, &noVariable, FOREST_TEMPLE_COMPASS);
-    itemTable[FIRE_TEMPLE_COMPASS]               = Item(RG_FIRE_TEMPLE_COMPASS,               Text{"Fire Temple Compass",             "Boussole du Temple du Feu",        "Brújula del Templo del Fuego"},            ITEMTYPE_COMPASS,  0x9F, false, &noVariable, FIRE_TEMPLE_COMPASS);
-    itemTable[WATER_TEMPLE_COMPASS]              = Item(RG_WATER_TEMPLE_COMPASS,              Text{"Water Temple Compass",            "Boussole du Temple de l'Eau",      "Brújula del Templo del Agua"},             ITEMTYPE_COMPASS,  0xA0, false, &noVariable, WATER_TEMPLE_COMPASS);
-    itemTable[SPIRIT_TEMPLE_COMPASS]             = Item(RG_SPIRIT_TEMPLE_COMPASS,             Text{"Spirit Temple Compass",           "Boussole du Temple de l'Esprit",   "Brújula del Templo del Espíritu"},         ITEMTYPE_COMPASS,  0xA1, false, &noVariable, SPIRIT_TEMPLE_COMPASS);
-    itemTable[SHADOW_TEMPLE_COMPASS]             = Item(RG_SHADOW_TEMPLE_COMPASS,             Text{"Shadow Temple Compass",           "Boussole du Temple de l'Ombre",    "Brújula del Templo de las Sombras"},       ITEMTYPE_COMPASS,  0xA2, false, &noVariable, SHADOW_TEMPLE_COMPASS);
-    itemTable[BOTTOM_OF_THE_WELL_COMPASS]        = Item(RG_BOTTOM_OF_THE_WELL_COMPASS,        Text{"Bottom of the Well Compass",      "Boussole du Puits",                "Brújula del fondo del pozo"},              ITEMTYPE_COMPASS,  0xA3, false, &noVariable, BOTTOM_OF_THE_WELL_COMPASS);
-    itemTable[ICE_CAVERN_COMPASS]                = Item(RG_ICE_CAVERN_COMPASS,                Text{"Ice Cavern Compass",              "Boussole de la Caverne Polaire",   "Brújula de la caverna de hielo"},          ITEMTYPE_COMPASS,  0xA4, false, &noVariable, ICE_CAVERN_COMPASS);
-
-    //Boss Keys
-    itemTable[FOREST_TEMPLE_BOSS_KEY]            = Item(RG_FOREST_TEMPLE_BOSS_KEY,            Text{"Forest Temple Boss Key",          "Clé d'Or du Temple de la Forêt",   "Gran llave del Templo del Bosque"},        ITEMTYPE_BOSSKEY,  0x95, true, &BossKeyForestTemple, FOREST_TEMPLE_BOSS_KEY);
-    itemTable[FIRE_TEMPLE_BOSS_KEY]              = Item(RG_FIRE_TEMPLE_BOSS_KEY,              Text{"Fire Temple Boss Key",            "Clé d'Or du Temple du Feu",        "Gran llave del Templo del Fuego"},         ITEMTYPE_BOSSKEY,  0x96, true, &BossKeyFireTemple,   FIRE_TEMPLE_BOSS_KEY);
-    itemTable[WATER_TEMPLE_BOSS_KEY]             = Item(RG_WATER_TEMPLE_BOSS_KEY,             Text{"Water Temple Boss Key",           "Clé d'Or du Temple de l'Eau",      "Gran llave del Templo del Agua"},          ITEMTYPE_BOSSKEY,  0x97, true, &BossKeyWaterTemple,  WATER_TEMPLE_BOSS_KEY);
-    itemTable[SPIRIT_TEMPLE_BOSS_KEY]            = Item(RG_SPIRIT_TEMPLE_BOSS_KEY,            Text{"Spirit Temple Boss Key",          "Clé d'Or du Temple de l'Esprit",   "Gran llave del Templo del Espíritu"},      ITEMTYPE_BOSSKEY,  0x98, true, &BossKeySpiritTemple, SPIRIT_TEMPLE_BOSS_KEY);
-    itemTable[SHADOW_TEMPLE_BOSS_KEY]            = Item(RG_SHADOW_TEMPLE_BOSS_KEY,            Text{"Shadow Temple Boss Key",          "Clé d'Or du Temple de l'Ombre",    "Gran llave del Templo de las Sombras"},    ITEMTYPE_BOSSKEY,  0x99, true, &BossKeyShadowTemple, SHADOW_TEMPLE_BOSS_KEY);
-    itemTable[GANONS_CASTLE_BOSS_KEY]            = Item(RG_GANONS_CASTLE_BOSS_KEY,            Text{"Ganon's Castle Boss Key",         "Clé d'Or du Château de Ganon",     "Gran llave del Castillo de Ganon"},        ITEMTYPE_BOSSKEY,  0x9A, true, &BossKeyGanonsCastle, GANONS_CASTLE_BOSS_KEY);
-
-    //Small Keys
-    itemTable[FOREST_TEMPLE_SMALL_KEY]           = Item(RG_FOREST_TEMPLE_SMALL_KEY,           Text{"Forest Temple Small Key",         "Petite Clé du Temple de la Forêt", "Llave del Templo del Bosque"},             ITEMTYPE_SMALLKEY,          0xAF, true, &ForestTempleKeys,          FOREST_TEMPLE_SMALL_KEY);
-    itemTable[FIRE_TEMPLE_SMALL_KEY]             = Item(RG_FIRE_TEMPLE_SMALL_KEY,             Text{"Fire Temple Small Key",           "Petite Clé du Temple du Feu",      "Llave del Templo del Fuego"},              ITEMTYPE_SMALLKEY,          0xB0, true, &FireTempleKeys,            FIRE_TEMPLE_SMALL_KEY);
-    itemTable[WATER_TEMPLE_SMALL_KEY]            = Item(RG_WATER_TEMPLE_SMALL_KEY,            Text{"Water Temple Small Key",          "Petite Clé du Temple de l'Eau",    "Llave del Templo del Agua"},               ITEMTYPE_SMALLKEY,          0xB1, true, &WaterTempleKeys,           WATER_TEMPLE_SMALL_KEY);
-    itemTable[SPIRIT_TEMPLE_SMALL_KEY]           = Item(RG_SPIRIT_TEMPLE_SMALL_KEY,           Text{"Spirit Temple Small Key",         "Petite Clé du Temple de l'Esprit", "Llave del Templo del Espíritu"},           ITEMTYPE_SMALLKEY,          0xB2, true, &SpiritTempleKeys,          SPIRIT_TEMPLE_SMALL_KEY);
-    itemTable[SHADOW_TEMPLE_SMALL_KEY]           = Item(RG_SHADOW_TEMPLE_SMALL_KEY,           Text{"Shadow Temple Small Key",         "Petite Clé du Temple de l'Ombre",  "Llave del Templo de las Sombras"},         ITEMTYPE_SMALLKEY,          0xB3, true, &ShadowTempleKeys,          SHADOW_TEMPLE_SMALL_KEY);
-    itemTable[BOTTOM_OF_THE_WELL_SMALL_KEY]      = Item(RG_BOTTOM_OF_THE_WELL_SMALL_KEY,      Text{"Bottom of the Well Small Key",    "Petite Clé du Puits",              "Llave del fondo del pozo"},                ITEMTYPE_SMALLKEY,          0xB4, true, &BottomOfTheWellKeys,       BOTTOM_OF_THE_WELL_SMALL_KEY);
-    itemTable[GERUDO_TRAINING_GROUNDS_SMALL_KEY] = Item(RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, Text{"Training Grounds Small Key",      "Petite Clé du Gymnase Gerudo",     "Llave del Centro de Instrucción"},         ITEMTYPE_SMALLKEY,          0xB5, true, &GerudoTrainingGroundsKeys, GERUDO_TRAINING_GROUNDS_SMALL_KEY);
-    itemTable[GERUDO_FORTRESS_SMALL_KEY]         = Item(RG_GERUDO_FORTRESS_SMALL_KEY,         Text{"Gerudo Fortress Small Key",       "Petite Clé du Repaire des Voleurs","Llave de la Fortaleza Gerudo"},            ITEMTYPE_FORTRESS_SMALLKEY, 0xB6, true, &GerudoFortressKeys,        GERUDO_FORTRESS_SMALL_KEY);
-    itemTable[GANONS_CASTLE_SMALL_KEY]           = Item(RG_GANONS_CASTLE_SMALL_KEY,           Text{"Ganon's Castle Small Key",        "Petite Clé du Château de Ganon",   "Llave del Castillo de Ganon"},             ITEMTYPE_SMALLKEY,          0xB7, true, &GanonsCastleKeys,          GANONS_CASTLE_SMALL_KEY);
-    itemTable[TREASURE_GAME_SMALL_KEY]           = Item(RG_TREASURE_GAME_SMALL_KEY,           Text{"Chest Game Small Key",            "Petite Clé du jeu la Chasse-aux-Trésors","Llave del Cofre del Tesoro"},        ITEMTYPE_ITEM,              0xDE, true, &TreasureGameKeys,          TREASURE_GAME_SMALL_KEY);
-
-    // Key Rings
-    itemTable[FOREST_TEMPLE_KEY_RING]            = Item(RG_FOREST_TEMPLE_KEY_RING,            Text{"Forest Temple Key Ring",          "Trousseau du Temple de la Forêt",  "Llavero del Templo del Bosque"},           ITEMTYPE_SMALLKEY,          0xD5, true, &ForestTempleKeys,          FOREST_TEMPLE_KEY_RING);
-    itemTable[FIRE_TEMPLE_KEY_RING]              = Item(RG_FIRE_TEMPLE_KEY_RING,              Text{"Fire Temple Key Ring",            "Trousseau du Temple du Feu",       "Llavero del Templo del Fuego"},            ITEMTYPE_SMALLKEY,          0xD6, true, &FireTempleKeys,            FIRE_TEMPLE_KEY_RING);
-    itemTable[WATER_TEMPLE_KEY_RING]             = Item(RG_WATER_TEMPLE_KEY_RING,             Text{"Water Temple Key Ring",           "Trousseau du Temple de l'Eau",     "Llavero del Templo del Agua"},             ITEMTYPE_SMALLKEY,          0xD7, true, &WaterTempleKeys,           WATER_TEMPLE_KEY_RING);
-    itemTable[SPIRIT_TEMPLE_KEY_RING]            = Item(RG_SPIRIT_TEMPLE_KEY_RING,            Text{"Spirit Temple Key Ring",          "Trousseau du Temple de l'Esprit",  "Llavero del Templo del Espíritu"},         ITEMTYPE_SMALLKEY,          0xD8, true, &SpiritTempleKeys,          SPIRIT_TEMPLE_KEY_RING);
-    itemTable[SHADOW_TEMPLE_KEY_RING]            = Item(RG_SHADOW_TEMPLE_KEY_RING,            Text{"Shadow Temple Key Ring",          "Trousseau du Temple de l'Ombre",   "Llavero del Templo de las Sombras"},       ITEMTYPE_SMALLKEY,          0xD9, true, &ShadowTempleKeys,          SHADOW_TEMPLE_KEY_RING);
-    itemTable[BOTTOM_OF_THE_WELL_KEY_RING]       = Item(RG_BOTTOM_OF_THE_WELL_KEY_RING,       Text{"Bottom of the Well Key Ring",     "Trousseau du Puits",               "Llavero del fondo del pozo"},              ITEMTYPE_SMALLKEY,          0xDA, true, &BottomOfTheWellKeys,       BOTTOM_OF_THE_WELL_KEY_RING);
-    itemTable[GERUDO_TRAINING_GROUNDS_KEY_RING]  = Item(RG_GERUDO_TRAINING_GROUNDS_KEY_RING,  Text{"Training Grounds Key Ring",       "Trousseau du Gymnase Gerudo",      "Llavero del Centro de Instrucción"},       ITEMTYPE_SMALLKEY,          0xDB, true, &GerudoTrainingGroundsKeys, GERUDO_TRAINING_GROUNDS_KEY_RING);
-    itemTable[GERUDO_FORTRESS_KEY_RING]          = Item(RG_GERUDO_FORTRESS_KEY_RING,          Text{"Gerudo Fortress Key Ring",        "Trousseau du Repaire des Voleurs", "Llavero de la Fortaleza Gerudo"},          ITEMTYPE_FORTRESS_SMALLKEY, 0xDC, true, &GerudoFortressKeys,        GERUDO_FORTRESS_KEY_RING);
-    itemTable[GANONS_CASTLE_KEY_RING]            = Item(RG_GANONS_CASTLE_KEY_RING,            Text{"Ganon's Castle Key Ring",         "Trousseau du Château de Ganon",    "Llavero del Castillo de Ganon"},           ITEMTYPE_SMALLKEY,          0xDD, true, &GanonsCastleKeys,          GANONS_CASTLE_KEY_RING);
-
-    //Stones and Medallions
-    itemTable[KOKIRI_EMERALD]                    = Item(RG_KOKIRI_EMERALD,                    Text{"Kokiri's Emerald",                "Émeraude Kokiri",                  "Esmeralda de los Kokiri"},                 ITEMTYPE_DUNGEONREWARD, 0xCB,  true, &KokiriEmerald,   KOKIRI_EMERALD);
-    itemTable[GORON_RUBY]                        = Item(RG_GORON_RUBY,                        Text{"Goron's Ruby",                    "Rubis Goron",                      "Rubí de los Goron"},                       ITEMTYPE_DUNGEONREWARD, 0xCC,  true, &GoronRuby,       GORON_RUBY);
-    itemTable[ZORA_SAPPHIRE]                     = Item(RG_ZORA_SAPPHIRE,                     Text{"Zora's Sapphire",                 "Saphir Zora",                      "Zafiro de los Zora"},                      ITEMTYPE_DUNGEONREWARD, 0xCD,  true, &ZoraSapphire,    ZORA_SAPPHIRE);
-    itemTable[FOREST_MEDALLION]                  = Item(RG_FOREST_MEDALLION,                  Text{"Forest Medallion",                "Médaillon de la Forêt",            "Medallón del Bosque"},                     ITEMTYPE_DUNGEONREWARD, 0xCE,  true, &ForestMedallion, FOREST_MEDALLION);
-    itemTable[FIRE_MEDALLION]                    = Item(RG_FIRE_MEDALLION,                    Text{"Fire Medallion",                  "Médaillon du Feu",                 "Medallón del Fuego"},                      ITEMTYPE_DUNGEONREWARD, 0xCF,  true, &FireMedallion,   FIRE_MEDALLION);
-    itemTable[WATER_MEDALLION]                   = Item(RG_WATER_MEDALLION,                   Text{"Water Medallion",                 "Médaillon de l'Eau",               "Medallón del Agua"},                       ITEMTYPE_DUNGEONREWARD, 0xD0,  true, &WaterMedallion,  WATER_MEDALLION);
-    itemTable[SPIRIT_MEDALLION]                  = Item(RG_SPIRIT_MEDALLION,                  Text{"Spirit Medallion",                "Médaillon de l'Esprit",            "Medallón del Espíritu"},                   ITEMTYPE_DUNGEONREWARD, 0xD1,  true, &SpiritMedallion, SPIRIT_MEDALLION);
-    itemTable[SHADOW_MEDALLION]                  = Item(RG_SHADOW_MEDALLION,                  Text{"Shadow Medallion",                "Médaillon de l'Ombre",             "Medallón de la Sombra"},                   ITEMTYPE_DUNGEONREWARD, 0xD2,  true, &ShadowMedallion, SHADOW_MEDALLION);
-    itemTable[LIGHT_MEDALLION]                   = Item(RG_LIGHT_MEDALLION,                   Text{"Light Medallion",                 "Médaillon de la Lumière",          "Medallón de la Luz"},                      ITEMTYPE_DUNGEONREWARD, 0xD3,  true, &LightMedallion,  LIGHT_MEDALLION);
-
-    //Generic Items
-    itemTable[RECOVERY_HEART]                    = Item(RG_RECOVERY_HEART,                    Text{"Recovery Heart",                  "Coeur de Vie",                     "Corazón"},                                 ITEMTYPE_ITEM, GI_HEART,             false, &noVariable,     RECOVERY_HEART);
-    itemTable[GREEN_RUPEE]                       = Item(RG_GREEN_RUPEE,                       Text{"Green Rupee",                     "Rubis Vert",                       "Rupia verde"},                             ITEMTYPE_ITEM, GI_RUPEE_GREEN,       false, &noVariable,     GREEN_RUPEE);
-    itemTable[GREG_RUPEE]                        = Item(RG_GREG_RUPEE,                        Text{"Greg the Green Rupee",            "Rubis Greg",                       "Rupia Greg"},                              ITEMTYPE_ITEM, GI_RUPEE_GREEN,       true,  &Greg,           GREG_RUPEE);
-    itemTable[BLUE_RUPEE]                        = Item(RG_BLUE_RUPEE,                        Text{"Blue Rupee",                      "Rubis Bleu",                       "Rupia azul"},                              ITEMTYPE_ITEM, GI_RUPEE_BLUE,        false, &noVariable,     BLUE_RUPEE);
-    itemTable[RED_RUPEE]                         = Item(RG_RED_RUPEE,                         Text{"Red Rupee",                       "Rubis Rouge",                      "Rupia roja"},                              ITEMTYPE_ITEM, GI_RUPEE_RED,         false, &noVariable,     RED_RUPEE);
-    itemTable[PURPLE_RUPEE]                      = Item(RG_PURPLE_RUPEE,                      Text{"Purple Rupee",                    "Rubis Pourpre",                    "Rupia morada"},                            ITEMTYPE_ITEM, GI_RUPEE_PURPLE,      false, &noVariable,     PURPLE_RUPEE);
-    itemTable[HUGE_RUPEE]                        = Item(RG_HUGE_RUPEE,                        Text{"Huge Rupee",                      "Énorme Rubis",                     "Rupia gigante"},                           ITEMTYPE_ITEM, GI_RUPEE_GOLD,        false, &noVariable,     HUGE_RUPEE);
-    itemTable[PIECE_OF_HEART]                    = Item(RG_PIECE_OF_HEART,                    Text{"Piece of Heart",                  "Quart de Coeur",                   "Pieza de corazón"},                        ITEMTYPE_ITEM, GI_HEART_PIECE,       true,  &PieceOfHeart,   PIECE_OF_HEART);
-    itemTable[HEART_CONTAINER]                   = Item(RG_HEART_CONTAINER,                   Text{"Heart Container",                 "Réceptacle de Coeur",              "Contenedor de corazón"},                   ITEMTYPE_ITEM, GI_HEART_CONTAINER_2, true,  &HeartContainer, HEART_CONTAINER);
-    itemTable[ICE_TRAP]                          = Item(RG_ICE_TRAP,                          Text{"Ice Trap",                        "Piège de Glace",                   "Trampa de hielo"},                         ITEMTYPE_ITEM, GI_ICE_TRAP,          false, &noVariable,     ICE_TRAP);
-    itemTable[MILK]                              = Item(RG_MILK,                              Text{"Milk",                            "Lait",                             "Leche Lon Lon"},                           ITEMTYPE_ITEM, GI_MILK,              false, &noVariable,     NONE);
-
-    //Refills
-    itemTable[BOMBS_5]                           = Item(RG_BOMBS_5,                           Text{"Bombs (5)",                       "Bombes (5)",                       "Bombas (5)"},                              ITEMTYPE_REFILL, GI_BOMBS_5,        false, &noVariable,  BOMBS_5);
-    itemTable[BOMBS_10]                          = Item(RG_BOMBS_10,                          Text{"Bombs (10)",                      "Bombes (10)",                      "Bombas (10)"},                             ITEMTYPE_REFILL, GI_BOMBS_10,       false, &noVariable,  BOMBS_10);
-    itemTable[BOMBS_20]                          = Item(RG_BOMBS_20,                          Text{"Bombs (20)",                      "Bombes (20)",                      "Bombas (20)"},                             ITEMTYPE_REFILL, GI_BOMBS_20,       false, &noVariable,  BOMBS_20);
-    itemTable[BOMBCHU_5]                         = Item(RG_BOMBCHU_5,                         Text{"Bombchus (5)",                    "Missiles (5)",                     "Bombchus (5)"},                            ITEMTYPE_REFILL, GI_BOMBCHUS_5,     true,  &Bombchus5,   BOMBCHU_5);
-    itemTable[BOMBCHU_10]                        = Item(RG_BOMBCHU_10,                        Text{"Bombchus (10)",                   "Missiles (10)",                    "Bombchus (10)"},                           ITEMTYPE_REFILL, GI_BOMBCHUS_10,    true,  &Bombchus10,  BOMBCHU_10);
-    itemTable[BOMBCHU_20]                        = Item(RG_BOMBCHU_20,                        Text{"Bombchus (20)",                   "Missiles (20)",                    "Bombchus (20)"},                           ITEMTYPE_REFILL, GI_BOMBCHUS_20,    true,  &Bombchus20,  BOMBCHU_20);
-    itemTable[BOMBCHU_DROP]                      = Item(RG_BOMBCHU_DROP,                      Text{"Bombchu Drop",                    "Drop Missiles",                    "Bombchus"},                                ITEMTYPE_DROP,   GI_BOMBCHUS_10,    true,  &BombchuDrop, NONE);
-    itemTable[ARROWS_5]                          = Item(RG_ARROWS_5,                          Text{"Arrows (5)",                      "Flèches (5)",                      "Flechas (5)"},                             ITEMTYPE_REFILL, GI_ARROWS_SMALL,   false, &noVariable,  ARROWS_5);
-    itemTable[ARROWS_10]                         = Item(RG_ARROWS_10,                         Text{"Arrows (10)",                     "Flèches (10)",                     "Flechas (10)"},                            ITEMTYPE_REFILL, GI_ARROWS_MEDIUM,  false, &noVariable,  ARROWS_10);
-    itemTable[ARROWS_30]                         = Item(RG_ARROWS_30,                         Text{"Arrows (30)",                     "Flèches (30)",                     "Flechas (30)"},                            ITEMTYPE_REFILL, GI_ARROWS_LARGE,   false, &noVariable,  ARROWS_30);
-    itemTable[DEKU_NUTS_5]                       = Item(RG_DEKU_NUTS_5,                       Text{"Deku Nuts (5)",                   "Noix Mojo (5)",                    "Nueces deku (5)"},                         ITEMTYPE_REFILL, GI_NUTS_5,         false, &noVariable,  DEKU_NUTS_5);
-    itemTable[DEKU_NUTS_10]                      = Item(RG_DEKU_NUTS_10,                      Text{"Deku Nuts (10)",                  "Noix Mojo (10)",                   "Nueces deku (10)"},                        ITEMTYPE_REFILL, GI_NUTS_10,        false, &noVariable,  DEKU_NUTS_10);
-    itemTable[DEKU_SEEDS_30]                     = Item(RG_DEKU_SEEDS_30,                     Text{"Deku Seeds (30)",                 "Graines Mojo (30)",                "Semillas deku (30)"},                      ITEMTYPE_REFILL, GI_SEEDS_30,       false, &noVariable,  DEKU_SEEDS_30);
-    itemTable[DEKU_STICK_1]                      = Item(RG_DEKU_STICK_1,                      Text{"Deku Stick (1)",                  "Bâton Mojo (1)",                   "Palo deku (1)"},                           ITEMTYPE_REFILL, GI_STICKS_1,       false, &noVariable,  DEKU_STICK_1);
-    itemTable[RED_POTION_REFILL]                 = Item(RG_RED_POTION_REFILL,                 Text{"Red Potion Refill",               "Recharge de Potion Rouge",         "Recarga de poción roja"},                  ITEMTYPE_REFILL, GI_POTION_RED,     false, &noVariable,  NONE);
-    itemTable[GREEN_POTION_REFILL]               = Item(RG_GREEN_POTION_REFILL,               Text{"Green Potion Refill",             "Recharge de Potion Verte",         "Recarga de poción verde"},                 ITEMTYPE_REFILL, GI_POTION_GREEN,   false, &noVariable,  NONE);
-    itemTable[BLUE_POTION_REFILL]                = Item(RG_BLUE_POTION_REFILL,                Text{"Blue Potion Refill",              "Recharge de Potion Bleue",         "Recarga de poción azul"},                  ITEMTYPE_REFILL, GI_POTION_BLUE,    false, &noVariable,  NONE);
-
-    //Treasure Game
-    itemTable[TREASURE_GAME_HEART]               = Item(RG_TREASURE_GAME_HEART,               Text{"Piece of Heart (WINNER)",    "Quart de Coeur (Chasse-aux-Trésors)",   "Pieza de corazón (Cofre del Tesoro)"}, ITEMTYPE_ITEM, GI_HEART_PIECE_WIN,  true,  &PieceOfHeart, TREASURE_GAME_HEART);
-    itemTable[TREASURE_GAME_GREEN_RUPEE]         = Item(RG_TREASURE_GAME_GREEN_RUPEE,         Text{"Green Rupee (LOSER)",       "Rubis Vert (Chasse-aux-Trésors)",      "Rupia Verde (Cofre del Tesoro)"},       ITEMTYPE_ITEM, GI_RUPEE_GREEN_LOSE, false, &noVariable,   TREASURE_GAME_GREEN_RUPEE);
-
-    //Shop Items                                                                                                                                                                                                                                                                            price
-    itemTable[BUY_DEKU_NUT_5]                    = Item(RG_BUY_DEKU_NUT_5,                    Text{"Buy Deku Nut (5)",                "Acheter: Noix Mojo (5)",           "Comprar nueces deku (5)"},                 ITEMTYPE_SHOP, 0x00, true,  &Nuts,           DEKU_NUTS_5,               15);
-    itemTable[BUY_ARROWS_30]                     = Item(RG_BUY_ARROWS_30,                     Text{"Buy Arrows (30)",                 "Acheter: Flèches (30)",            "Comprar flechas (30)"},                    ITEMTYPE_SHOP, 0x01, true,  &BuyArrow,       ARROWS_30,                 60);
-    itemTable[BUY_ARROWS_50]                     = Item(RG_BUY_ARROWS_50,                     Text{"Buy Arrows (50)",                 "Acheter: Flèches (50)",            "Comprar flechas (50)"},                    ITEMTYPE_SHOP, 0x02, true,  &BuyArrow,       ARROWS_30,                 90);
-    itemTable[BUY_BOMBS_525]                     = Item(RG_BUY_BOMBS_525,                     Text{"Buy Bombs (5) [25]",              "Acheter: Bombes (5) [25]",         "Comprar bombas (5) [25]"},                 ITEMTYPE_SHOP, 0x03, true,  &BuyBomb,        BOMBS_5,                   25);
-    itemTable[BUY_DEKU_NUT_10]                   = Item(RG_BUY_DEKU_NUT_10,                   Text{"Buy Deku Nut (10)",               "Acheter: Noix Mojo (10)",          "Comprar Nueces deku (10)"},                ITEMTYPE_SHOP, 0x04, true,  &Nuts,           DEKU_NUTS_10,              30);
-    itemTable[BUY_DEKU_STICK_1]                  = Item(RG_BUY_DEKU_STICK_1,                  Text{"Buy Deku Stick (1)",              "Acheter: Bâton Mojo (1)",          "Comprar palos deku (1)"},                  ITEMTYPE_SHOP, 0x05, true,  &Sticks,         DEKU_STICK_1,              10);
-    itemTable[BUY_BOMBS_10]                      = Item(RG_BUY_BOMBS_10,                      Text{"Buy Bombs (10)",                  "Acheter: Bombes (10)",             "Comprar Bombas (10)"},                     ITEMTYPE_SHOP, 0x06, true,  &BuyBomb,        BOMBS_10,                  50);
-    itemTable[BUY_FISH]                          = Item(RG_BUY_FISH,                          Text{"Buy Fish",                        "Acheter: Poisson",                 "Comprar pez"},                             ITEMTYPE_SHOP, 0x07, true,  &FishAccess,     BOTTLE_WITH_FISH,         200);
-    itemTable[BUY_RED_POTION_30]                 = Item(RG_BUY_RED_POTION_30,                 Text{"Buy Red Potion [30]",             "Acheter: Potion Rouge [30]",       "Comprar poción roja [30]"},                ITEMTYPE_SHOP, 0x08, false, &noVariable,     BOTTLE_WITH_RED_POTION,    30);
-    itemTable[BUY_GREEN_POTION]                  = Item(RG_BUY_GREEN_POTION,                  Text{"Buy Green Potion",                "Acheter: Potion Verte",            "Comprar poción verde"},                    ITEMTYPE_SHOP, 0x09, true,  &BuyGPotion,     BOTTLE_WITH_GREEN_POTION,  30);
-    itemTable[BUY_BLUE_POTION]                   = Item(RG_BUY_BLUE_POTION,                   Text{"Buy Blue Potion",                 "Acheter: Potion Bleue",            "Comprar poción azul"},                     ITEMTYPE_SHOP, 0x0A, true,  &BuyBPotion,     BOTTLE_WITH_BLUE_POTION,  100);
-    itemTable[BUY_HYLIAN_SHIELD]                 = Item(RG_BUY_HYLIAN_SHIELD,                 Text{"Buy Hylian Shield",               "Acheter: Bouclier Hylien",         "Comprar escudo hyliano"},                  ITEMTYPE_SHOP, 0x0C, true,  &HylianShield,   HYLIAN_SHIELD,             80);
-    itemTable[BUY_DEKU_SHIELD]                   = Item(RG_BUY_DEKU_SHIELD,                   Text{"Buy Deku Shield",                 "Acheter: Bouclier Mojo",           "Comprar escudo deku"},                     ITEMTYPE_SHOP, 0x0D, true,  &DekuShield,     DEKU_SHIELD,               40);
-    itemTable[BUY_GORON_TUNIC]                   = Item(RG_BUY_GORON_TUNIC,                   Text{"Buy Goron Tunic",                 "Acheter: Tunique Goron",           "Comprar sayo goron"},                      ITEMTYPE_SHOP, 0x0E, true,  &GoronTunic,     GORON_TUNIC,              200);
-    itemTable[BUY_ZORA_TUNIC]                    = Item(RG_BUY_ZORA_TUNIC,                    Text{"Buy Zora Tunic",                  "Acheter: Tunique Zora",            "Comprar sayo zora"},                       ITEMTYPE_SHOP, 0x0F, true,  &ZoraTunic,      ZORA_TUNIC,               300);
-    itemTable[BUY_HEART]                         = Item(RG_BUY_HEART,                         Text{"Buy Heart",                       "Acheter: Coeur de Vie",            "Comprar corazón"},                         ITEMTYPE_SHOP, 0x10, false, &noVariable,     RECOVERY_HEART,            10);
-    itemTable[BUY_BOMBCHU_10]                    = Item(RG_BUY_BOMBCHU_10,                    Text{"Buy Bombchu (10)",                "Acheter: Missiles (10)",           "Comprar bombchus (10)"},                   ITEMTYPE_SHOP, 0x15, true,  &BuyBombchus10,  BOMBCHU_10,                99);
-    itemTable[BUY_BOMBCHU_20]                    = Item(RG_BUY_BOMBCHU_20,                    Text{"Buy Bombchu (20)",                "Acheter: Missiles (20)",           "Comprar bombchus (20)"},                   ITEMTYPE_SHOP, 0x16, true,  &BuyBombchus20,  BOMBCHU_20,               180);
-    itemTable[BUY_DEKU_SEEDS_30]                 = Item(RG_BUY_DEKU_SEEDS_30,                 Text{"Buy Deku Seeds (30)",             "Acheter: Graines Mojo (30)",       "Comprar semillas deku (30)"},              ITEMTYPE_SHOP, 0x1D, true,  &BuySeed,        DEKU_SEEDS_30,             30);
-    itemTable[SOLD_OUT]                          = Item(RG_SOLD_OUT,                          Text{"Sold Out",                        "Rupture de stock",                 "Vendido"},                                 ITEMTYPE_SHOP, 0x26, false, &noVariable,     NONE,                       0);
-    itemTable[BUY_BLUE_FIRE]                     = Item(RG_BUY_BLUE_FIRE,                     Text{"Buy Blue Fire",                   "Acheter: Flamme Bleue",            "Comprar fuego azul"},                      ITEMTYPE_SHOP, 0x27, true,  &BlueFireAccess, BOTTLE_WITH_BLUE_FIRE,    300);
-    itemTable[BUY_BOTTLE_BUG]                    = Item(RG_BUY_BOTTLE_BUG,                    Text{"Buy Bottle Bug",                  "Acheter: Insecte en bouteille",    "Comprar bichos"},                          ITEMTYPE_SHOP, 0x28, true,  &BugsAccess,     BOTTLE_WITH_BUGS,          50);
-    itemTable[BUY_POE]                           = Item(RG_BUY_POE,                           Text{"Buy Poe",                         "Acheter: Esprit",                  "Comprar Poe"},                             ITEMTYPE_SHOP, 0x2A, false, &noVariable,     BOTTLE_WITH_BIG_POE,       30);
-    itemTable[BUY_FAIRYS_SPIRIT]                 = Item(RG_BUY_FAIRYS_SPIRIT,                 Text{"Buy Fairy's Spirit",              "Acheter: Esprit de Fée",           "Comprar hada"},                            ITEMTYPE_SHOP, 0x2B, true,  &FairyAccess,    BOTTLE_WITH_FAIRY,         50);
-    itemTable[BUY_ARROWS_10]                     = Item(RG_BUY_ARROWS_10,                     Text{"Buy Arrows (10)",                 "Acheter: Flèches (10)",            "Comprar flechas (10)"},                    ITEMTYPE_SHOP, 0x2C, true,  &BuyArrow,       ARROWS_10,                 20);
-    itemTable[BUY_BOMBS_20]                      = Item(RG_BUY_BOMBS_20,                      Text{"Buy Bombs (20)",                  "Acheter: Bombes (20)",             "Comprar bombas (20)"},                     ITEMTYPE_SHOP, 0x2D, true,  &BuyBomb,        BOMBS_20,                  80);
-    itemTable[BUY_BOMBS_30]                      = Item(RG_BUY_BOMBS_30,                      Text{"Buy Bombs (30)",                  "Acheter: Bombes (30)",             "Comprar bombas (30)"},                     ITEMTYPE_SHOP, 0x2E, true,  &BuyBomb,        BOMBS_20,                 120);
-    itemTable[BUY_BOMBS_535]                     = Item(RG_BUY_BOMBS_535,                     Text{"Buy Bombs (5) [35]",              "Acheter: Bombes (5) [35]",         "Comprar bombas (5) [35]"},                 ITEMTYPE_SHOP, 0x2F, true,  &BuyBomb,        BOMBS_5,                   35);
-    itemTable[BUY_RED_POTION_40]                 = Item(RG_BUY_RED_POTION_40,                 Text{"Buy Red Potion [40]",             "Acheter: Potion Rouge [40]",       "Comprar poción roja [40]"},                ITEMTYPE_SHOP, 0x30, false, &noVariable,     BOTTLE_WITH_RED_POTION,    40);
-    itemTable[BUY_RED_POTION_50]                 = Item(RG_BUY_RED_POTION_50,                 Text{"Buy Red Potion [50]",             "Acheter: Potion Rouge [50]",       "Comprar poción roja [50]"},                ITEMTYPE_SHOP, 0x31, false, &noVariable,     BOTTLE_WITH_RED_POTION,    50);
-
-    itemTable[TRIFORCE_PIECE]                    = Item(RG_TRIFORCE_PIECE,                    Text{"Triforce Piece",                  "Triforce Piece",                   "Triforce Piece"},                          ITEMTYPE_ITEM, 0xDF, true,  &TriforcePieces, TRIFORCE_PIECE);
-    itemTable[TRIFORCE]                          = Item(RG_TRIFORCE,                          Text{"Triforce",                        "Triforce",                         "Trifuerza"},                               ITEMTYPE_EVENT, GI_RUPEE_RED_LOSE,  false, &noVariable, NONE);
-    itemTable[HINT]                              = Item(RG_HINT,                              Text{"Hint",                            "Indice",                           "Pista"},                                   ITEMTYPE_EVENT, GI_RUPEE_BLUE_LOSE, false, &noVariable, NONE);
-
-//  itemTable[HOOKSHOT]                          = Item(RG_HOOKSHOT,                          Text{"Hookshot",                        "Grappin",                          "Gancho"},                                  ITEMTYPE_ITEM, 0x80, true,  &ProgressiveHookshot, HOOKSHOT);
-//  itemTable[LONGSHOT]                          = Item(RG_LONGSHOT,                          Text{"Longshot",                        "Super-Grappin",                    "Supergancho"},                             ITEMTYPE_ITEM, 0x80, true,  &ProgressiveHookshot, LONGSHOT);
-//  itemTable[FAIRY_OCARINA]                     = Item(RG_FAIRY_OCARINA,                     Text{"Fairy Ocarina",                   "Ocarina des fées",                 "Ocarina de las Hadas"},                    ITEMTYPE_ITEM, 0x8B, true,  &ProgressiveOcarina, FAIRY_OCARINA);
-//  itemTable[OCARINA_OF_TIME]                   = Item(RG_OCARINA_OF_TIME,                   Text{"Ocarina of Time",                 "Ocarina du Temps",                 "Ocarina del Tiempo"},                      ITEMTYPE_ITEM, 0x8B, true,  &ProgressiveOcarina, OCARINA_OF_TIME);
-//  itemTable[BOMB_BAG]                          = Item(RG_BOMB_BAG,                          Text{"Bomb Bag",                        "Sac de Bombes",                    "Saco de bombas"},                          ITEMTYPE_ITEM, 0x82, true,  &ProgressiveBombBag, BOMB_BAG);
-//  itemTable[BIG_BOMB_BAG]                      = Item(RG_BIG_BOMB_BAG,                      Text{"Big Bomb Bag",                    "Grand Sac de Bombes",              "Saco de bombas grande"},                   ITEMTYPE_ITEM, 0x82, true,  &ProgressiveBombBag, BIG_BOMB_BAG);
-//  itemTable[BIGGEST_BOMB_BAG]                  = Item(RG_BIGGEST_BOMB_BAG,                  Text{"Biggest Bomb Bag",                "Énorme Sac de Bombes",             "Saco de bombas gigante"},                  ITEMTYPE_ITEM, 0x82, true,  &ProgressiveBombBag, BIGGEST_BOMB_BAG);
-//  itemTable[FAIRY_BOW]                         = Item(RG_FAIRY_BOW,                         Text{"Fairy Bow",                       "Arc des Fées",                     "Arco de las Hadas"},                       ITEMTYPE_ITEM, 0x83, true,  &ProgressiveBow, FAIRY_BOW);
-//  itemTable[BIG_QUIVER]                        = Item(RG_BIG_QUIVER,                        Text{"Big Quiver",                      "Grand carquois",                   "Carcaj grande"},                           ITEMTYPE_ITEM, 0x83, true,  &ProgressiveBow, BIG_QUIVER);
-//  itemTable[BIGGEST_QUIVER]                    = Item(RG_BIGGEST_QUIVER,                    Text{"Biggest Quiver",                  "Énorme carquois",                  "Carcaj gigante"},                          ITEMTYPE_ITEM, 0x83, true,  &ProgressiveBow, BIGGEST_QUIVER);
-//  itemTable[FAIRY_SLINGSHOT]                   = Item(RG_FAIRY_SLINGSHOT,                   Text{"Fairy Slingshot",                 "Lance-Pierre des Fées",            "Resortera de las hadas"},                  ITEMTYPE_ITEM, 0x84, true,  &ProgressiveBulletBag, FAIRY_SLINGSHOT);
-//  itemTable[BIG_BULLET_BAG]                    = Item(RG_BIG_BULLET_BAG,                    Text{"Big Deku Seed Bullet Bag",        "Grand sac de graines mojo",        "Bolsa de semillas deku grande"},           ITEMTYPE_ITEM, 0x84, true,  &ProgressiveBulletBag, BIG_BULLET_BAG);
-//  itemTable[BIGGEST_BULLET_BAD]                = Item(RG_BIGGEST_BULLET_BAD,                Text{"Biggest Deku Seed Bullet Bag",    "Énorme sac de graines mojo",       "Bolsa de semillas deku gigante"},          ITEMTYPE_ITEM, 0x84, true,  &ProgressiveBulletBag, BIGGEST_BULLET_BAD);
-//  itemTable[GORONS_BRACELET]                   = Item(RG_GORONS_BRACELET,                   Text{"Goron's Bracelet",                "Bracelet Goron",                   "Brazalete de los Goron"},                  ITEMTYPE_ITEM, 0x81, true,  &ProgressiveStrength, GORONS_BRACELET);
-//  itemTable[SILVER_GAUNTLETS]                  = Item(RG_SILVER_GAUNTLETS,                  Text{"Silver Gauntlets",                "Gantelets d'argent",               "Guantes de plata"},                        ITEMTYPE_ITEM, 0x81, true,  &ProgressiveStrength, SILVER_GAUNTLETS);
-//  itemTable[GOLDEN_GAUNTLETS]                  = Item(RG_GOLDEN_GAUNTLETS,                  Text{"Golden Gauntlets",                "Gantelets d'or",                   "Guantes de oro"},                          ITEMTYPE_ITEM, 0x81, true,  &ProgressiveStrength, GOLDEN_GAUNTLETS);
-//  itemTable[SILVER_SCALE]                      = Item(RG_SILVER_SCALE,                      Text{"Silver Scale",                    "Écaille d'argent",                 "Escama de Plata"},                         ITEMTYPE_ITEM, 0x86, true,  &ProgressiveScale, SILVER_SCALE);
-//  itemTable[GOLDEN_SCALE]                      = Item(RG_GOLDEN_SCALE,                      Text{"Golden Scale",                    "Écaille d'or",                     "Escama de Oro"},                           ITEMTYPE_ITEM, 0x86, true,  &ProgressiveScale, GOLDEN_SCALE);
-//  itemTable[ADULT_WALLET]                      = Item(RG_ADULT_WALLET,                      Text{"Adult Wallet",                    "Grande Bourse",                  "Bolsa de adulto"},                         ITEMTYPE_ITEM, 0x85, true,  &ProgressiveWallet, ADULT_WALLET);
-//  itemTable[GIANT_WALLET]                      = Item(RG_GIANT_WALLET,                      Text{"Giant Wallet",                    "Bourse de Géant",                  "Bolsa gigante"},                           ITEMTYPE_ITEM, 0x85, true,  &ProgressiveWallet, GIANT_WALLET);
-//  itemTable[TYCOON_WALLET]                     = Item(RG_TYCOON_WALLET,                     Text{"Tycoon Wallet",                   "Bourse de Magnat",                   "Bolsa de ricachón"},                       ITEMTYPE_ITEM, 0x85, true,  &ProgressiveWallet, TYCOON_WALLET);
-//  itemTable[DEKU_NUT_CAPACITY_30]              = Item(RG_DEKU_NUT_CAPACITY_30,              Text{"Deku Nut Capacity (30)",          "Capacité de noix Mojo (20)",       "Capacidad de nueces deku (40)"},           ITEMTYPE_ITEM, 0x87, false, &noVariable, DEKU_NUT_CAPACITY_30);
-//  itemTable[DEKU_NUT_CAPACITY_40]              = Item(RG_DEKU_NUT_CAPACITY_40,              Text{"Deku Nut Capacity (40)",          "Capacité de noix Mojo (30)",       "Capacidad de nueces deku (50)"},           ITEMTYPE_ITEM, 0x87, false, &noVariable, DEKU_NUT_CAPACITY_40);
-//  itemTable[DEKU_NUT_CAPACITY_20]              = Item(RG_DEKU_NUT_CAPACITY_20,              Text{"Deku Stick Capacity (20)",        "Capacité de Bâtons Mojo (20)",     "Capacidad de palos deku (20)"},            ITEMTYPE_ITEM, 0x88, false, &noVariable, DEKU_NUT_CAPACITY_20);
-//  itemTable[DEKU_NUT_CAPACITY_30]              = Item(RG_DEKU_NUT_CAPACITY_30,              Text{"Deku Nut Capacity (30)",          "Capacité de noix Mojo (20)",       "Capacidad de nueces deku (40)"},           ITEMTYPE_ITEM, 0x88, false, &noVariable, DEKU_NUT_CAPACITY_30);
-//  itemTable[MAGIC_METER]                       = Item(RG_MAGIC_METER,                       Text{"Magic Meter",                     "Jauge de Magie",                   "Poder mágico"},                            ITEMTYPE_ITEM, 0x8A, true,  &ProgressiveMagic, MAGIC_METER);
-//  itemTable[ENHANCED_MAGIC_METER]              = Item(RG_ENHANCED_MAGIC_METER,              Text{"Enhanced Magic Meter",            "Jauge de Magie améliorée",         "Poder mágico mejorado"},                   ITEMTYPE_ITEM, 0x8A, true,  &ProgressiveMagic, ENHANCED_MAGIC_METER);
-
-}
-
-Item& ItemTable(const uint32_t itemKey) {
-    return itemTable[itemKey];
-}
-
-Item& ItemFromGIID(const int giid) {
-    uint32_t index = 0;
-    while (index < KEY_ENUM_MAX) {
-        if (itemTable[index].GetItemID() == giid) {
-            return itemTable[index];
-        }
-        index++;
-    }
-
-    // there are vanilla items that don't exist in the item table we're reading from here
-    // if we made it this far, it means we didn't find an item in the table
-    // if we don't return anything, the game will crash, so, as a workaround, return greg
-    return itemTable[GREEN_RUPEE];
-}
-
-//This function should only be used to place items containing hint text
-//at gossip stone locations.
-void NewItem(const uint32_t itemKey, const Item item) {
-    if (itemKey <= BUY_RED_POTION_50) {
-      printf("\x1b[25;0HWARNING: ATTEMPTED TO OVERWRITE ITEM %lu\n", itemKey);
-      return;
-    }
-
-    itemTable[itemKey] = item;
-}
-
-std::array<Item, KEY_ENUM_MAX>* GetFullItemTable_() {
-    return &itemTable;
-}
diff --git a/soh/soh/Enhancements/randomizer/3drando/item_list.hpp b/soh/soh/Enhancements/randomizer/3drando/item_list.hpp
deleted file mode 100644
index 2bcea700a..000000000
--- a/soh/soh/Enhancements/randomizer/3drando/item_list.hpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-#include "item.hpp"
-#include "keys.hpp"
-
-void ItemTable_Init();
-Item& ItemTable(uint32_t itemKey);
-Item& ItemFromGIID(int giid);
-void NewItem(uint32_t itemKey, Item item);
-std::array<Item, KEY_ENUM_MAX>* GetFullItemTable_();
diff --git a/soh/soh/Enhancements/randomizer/3drando/item_location.cpp b/soh/soh/Enhancements/randomizer/3drando/item_location.cpp
deleted file mode 100644
index 1c085021c..000000000
--- a/soh/soh/Enhancements/randomizer/3drando/item_location.cpp
+++ /dev/null
@@ -1,1658 +0,0 @@
-#include "item_location.hpp"
-
-#include "dungeon.hpp"
-#include "settings.hpp"
-#include "spoiler_log.hpp"
-#include "shops.hpp"
-#include "keys.hpp"
-#include <spdlog/spdlog.h>
-#include "../randomizerTypes.h"
-
-//Location definitions
-static std::array<ItemLocation, KEY_ENUM_MAX> locationTable;
-static std::unordered_map<RandomizerCheck, Key> locationLookupTable;
-
-void LocationTable_Init() {
-    locationTable[NONE]                                  = ItemLocation::Base       (RC_UNKNOWN_CHECK,                              0xFF,       "Invalid Location",                     NONE,                                  NONE,                      {},                                                   SpoilerCollectionCheck::None());
-    //Kokiri Forest                                                                                                                 scene flag  name                                    hint key (hint_list.cpp)               vanilla item               categories                                            collection check (if needed)                     collection check group
-    locationTable[KF_KOKIRI_SWORD_CHEST]                 = ItemLocation::Chest      (RC_KF_KOKIRI_SWORD_CHEST,                      0x55, 0x00, "KF Kokiri Sword Chest",                KF_KOKIRI_SWORD_CHEST,                 KOKIRI_SWORD,              {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[KF_MIDOS_TOP_LEFT_CHEST]               = ItemLocation::Chest      (RC_KF_MIDOS_TOP_LEFT_CHEST,                    0x28, 0x00, "KF Mido Top Left Chest",               KF_MIDOS_TOP_LEFT_CHEST,               BLUE_RUPEE,                {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[KF_MIDOS_TOP_RIGHT_CHEST]              = ItemLocation::Chest      (RC_KF_MIDOS_TOP_RIGHT_CHEST,                   0x28, 0x01, "KF Mido Top Right Chest",              KF_MIDOS_TOP_RIGHT_CHEST,              BLUE_RUPEE,                {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[KF_MIDOS_BOTTOM_LEFT_CHEST]            = ItemLocation::Chest      (RC_KF_MIDOS_BOTTOM_LEFT_CHEST,                 0x28, 0x02, "KF Mido Bottom Left Chest",            KF_MIDOS_BOTTOM_LEFT_CHEST,            GREG_RUPEE,                {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[KF_MIDOS_BOTTOM_RIGHT_CHEST]           = ItemLocation::Chest      (RC_KF_MIDOS_BOTTOM_RIGHT_CHEST,                0x28, 0x03, "KF Mido Bottom Right Chest",           KF_MIDOS_BOTTOM_RIGHT_CHEST,           RECOVERY_HEART,            {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[KF_STORMS_GROTTO_CHEST]                = ItemLocation::Chest      (RC_KF_STORMS_GROTTO_CHEST,                     0x3E, 0x0C, "KF Storms Grotto Chest",               KF_STORMS_GROTTO_CHEST,                RED_RUPEE,                 {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-
-    //Lost Woods
-    locationTable[LW_NEAR_SHORTCUTS_GROTTO_CHEST]        = ItemLocation::Chest      (RC_LW_NEAR_SHORTCUTS_GROTTO_CHEST,             0x3E, 0x14, "LW Near Shortcuts Grotto Chest",       LW_NEAR_SHORTCUTS_GROTTO_CHEST,        BLUE_RUPEE,                {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[LW_SKULL_KID]                          = ItemLocation::Base       (RC_LW_SKULL_KID,                               0x5B,       "LW Skull Kid",                         LW_SKULL_KID,                          PIECE_OF_HEART,            {},                                                   SpoilerCollectionCheck::ItemGetInf(30),          SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[LW_TRADE_COJIRO]                       = ItemLocation::Base       (RC_LW_TRADE_COJIRO,                            0x5B,       "LW Trade Cojiro",                      LW_TRADE_COJIRO,                       ODD_MUSHROOM,              {Category::cAdultTrade},                              SpoilerCollectionCheck::RandomizerInf(),         SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[LW_TRADE_ODD_POTION]                   = ItemLocation::Base       (RC_LW_TRADE_ODD_POTION,                        0x5B,       "LW Trade Odd Potion",                  LW_TRADE_ODD_POTION,                   ODD_POTION,                {Category::cAdultTrade},                              SpoilerCollectionCheck::ItemGetInf(57),          SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[LW_OCARINA_MEMORY_GAME]                = ItemLocation::Base       (RC_LW_OCARINA_MEMORY_GAME,                     0x5B,       "LW Ocarina Memory Game",               LW_OCARINA_MEMORY_GAME,                PIECE_OF_HEART,            {},                                                   SpoilerCollectionCheck::ItemGetInf(31),          SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[LW_TARGET_IN_WOODS]                    = ItemLocation::Base       (RC_LW_TARGET_IN_WOODS,                         0x5B,       "LW Target in Woods",                   LW_TARGET_IN_WOODS,                    PROGRESSIVE_SLINGSHOT,     {},                                                   SpoilerCollectionCheck::ItemGetInf(21),          SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT] = ItemLocation::Base       (RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT,      0x5B,       "LW Deku Scrub Near Deku Theater Right",LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT, BUY_DEKU_NUT_5,            {Category::cDekuScrub},                               SpoilerCollectionCheck::Scrub(),                 SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT]  = ItemLocation::Base       (RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT,       0x5B,       "LW Deku Scrub Near Deku Theater Left", LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT,  BUY_DEKU_STICK_1,          {Category::cDekuScrub},                               SpoilerCollectionCheck::Scrub(),                 SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[LW_DEKU_SCRUB_NEAR_BRIDGE]             = ItemLocation::Base       (RC_LW_DEKU_SCRUB_NEAR_BRIDGE,                  0x5B,       "LW Deku Scrub Near Bridge",            LW_DEKU_SCRUB_NEAR_BRIDGE,             PROGRESSIVE_STICK_UPGRADE, {Category::cDekuScrub, Category::cDekuScrubUpgrades}, SpoilerCollectionCheck::Scrub(),                 SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[LW_DEKU_SCRUB_GROTTO_REAR]             = ItemLocation::GrottoScrub(RC_LW_DEKU_SCRUB_GROTTO_REAR,                  0xF5,       "LW Deku Scrub Grotto Rear",            LW_DEKU_SCRUB_GROTTO_REAR,             BUY_DEKU_SEEDS_30,         {Category::cDekuScrub},                               SpoilerCollectionCheck::Scrub(),                 SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[LW_DEKU_SCRUB_GROTTO_FRONT]            = ItemLocation::GrottoScrub(RC_LW_DEKU_SCRUB_GROTTO_FRONT,                 0xF5,       "LW Deku Scrub Grotto Front",           LW_DEKU_SCRUB_GROTTO_FRONT,            PROGRESSIVE_NUT_UPGRADE,   {Category::cDekuScrub, Category::cDekuScrubUpgrades}, SpoilerCollectionCheck::Scrub(),                 SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[DEKU_THEATER_SKULL_MASK]               = ItemLocation::Base       (RC_DEKU_THEATER_SKULL_MASK,                    0x3E,       "Deku Theater Skull Mask",              DEKU_THEATER_SKULL_MASK,               PROGRESSIVE_STICK_UPGRADE, {},                                                   SpoilerCollectionCheck::Chest(0x3E, 0x1F),       SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[DEKU_THEATER_MASK_OF_TRUTH]            = ItemLocation::Base       (RC_DEKU_THEATER_MASK_OF_TRUTH,                 0x3E,       "Deku Theater Mask of Truth",           DEKU_THEATER_MASK_OF_TRUTH,            PROGRESSIVE_NUT_UPGRADE,   {},                                                   SpoilerCollectionCheck::Chest(0x3E, 0x1E),       SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-
-    //Sacred Forest Meadow
-    locationTable[SFM_WOLFOS_GROTTO_CHEST]               = ItemLocation::Chest      (RC_SFM_WOLFOS_GROTTO_CHEST,                    0x3E, 0x11, "SFM Wolfos Grotto Chest",              SFM_WOLFOS_GROTTO_CHEST,               PURPLE_RUPEE,              {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[SFM_DEKU_SCRUB_GROTTO_REAR]            = ItemLocation::GrottoScrub(RC_SFM_DEKU_SCRUB_GROTTO_REAR,                 0xEE,       "SFM Deku Scrub Grotto Rear",           SFM_DEKU_SCRUB_GROTTO_REAR,            BUY_RED_POTION_30,         {Category::cDekuScrub},                               SpoilerCollectionCheck::Scrub(),                 SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[SFM_DEKU_SCRUB_GROTTO_FRONT]           = ItemLocation::GrottoScrub(RC_SFM_DEKU_SCRUB_GROTTO_FRONT,                0xEE,       "SFM Deku Scrub Grotto Front",          SFM_DEKU_SCRUB_GROTTO_FRONT,           BUY_GREEN_POTION,          {Category::cDekuScrub},                               SpoilerCollectionCheck::Scrub(),                 SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-
-    //Hyrule Field
-    locationTable[HF_SOUTHEAST_GROTTO_CHEST]             = ItemLocation::Chest      (RC_HF_SOUTHEAST_GROTTO_CHEST,                  0x3E, 0x02, "HF Southeast Grotto Chest",            HF_SOUTHEAST_GROTTO_CHEST,             RED_RUPEE,                 {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[HF_OPEN_GROTTO_CHEST]                  = ItemLocation::Chest      (RC_HF_OPEN_GROTTO_CHEST,                       0x3E, 0x03, "HF Open Grotto Chest",                 HF_OPEN_GROTTO_CHEST,                  BLUE_RUPEE,                {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[HF_NEAR_MARKET_GROTTO_CHEST]           = ItemLocation::Chest      (RC_HF_NEAR_MARKET_GROTTO_CHEST,                0x3E, 0x00, "HF Near Market Grotto Chest",          HF_NEAR_MARKET_GROTTO_CHEST,           BLUE_RUPEE,                {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[HF_OCARINA_OF_TIME_ITEM]               = ItemLocation::Base       (RC_HF_OCARINA_OF_TIME_ITEM,                    0x51,       "HF Ocarina of Time Item",              HF_OCARINA_OF_TIME_ITEM,               PROGRESSIVE_OCARINA,       {},                                                   SpoilerCollectionCheck::EventChkInf(0x43),       SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[HF_TEKTITE_GROTTO_FREESTANDING_POH]    = ItemLocation::Collectable(RC_HF_TEKTITE_GROTTO_FREESTANDING_POH,         0x3E, 0x01, "HF Tektite Grotto Freestanding PoH",   HF_TEKTITE_GROTTO_FREESTANDING_POH,    PIECE_OF_HEART,            {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[HF_DEKU_SCRUB_GROTTO]                  = ItemLocation::GrottoScrub(RC_HF_DEKU_SCRUB_GROTTO,                       0xE6,       "HF Deku Scrub Grotto",                 HF_DEKU_SCRUB_GROTTO,                  PIECE_OF_HEART,            {Category::cDekuScrub, Category::cDekuScrubUpgrades}, SpoilerCollectionCheck::Scrub(),                 SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-
-    //Lake Hylia
-    locationTable[LH_CHILD_FISHING]                      = ItemLocation::Base       (RC_LH_CHILD_FISHING,                           0x49,       "LH Child Fishing",                     LH_CHILD_FISHING,                      PIECE_OF_HEART,            {},                                                   SpoilerCollectionCheck::RandomizerInf(),         SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[LH_ADULT_FISHING]                      = ItemLocation::Base       (RC_LH_ADULT_FISHING,                           0x49,       "LH Adult Fishing",                     LH_ADULT_FISHING,                      PROGRESSIVE_SCALE,         {},                                                   SpoilerCollectionCheck::RandomizerInf(),         SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[LH_LAB_DIVE]                           = ItemLocation::Base       (RC_LH_LAB_DIVE,                                0x38,       "LH Lab Dive",                          LH_LAB_DIVE,                           PIECE_OF_HEART,            {},                                                   SpoilerCollectionCheck::ItemGetInf(24),          SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[LH_TRADE_FROG]                         = ItemLocation::Base       (RC_LH_TRADE_FROG,                              0x38,       "LH Lab Trade Eyeball Frog",            LH_TRADE_FROG,                         EYEDROPS,                  {Category::cAdultTrade},                              SpoilerCollectionCheck::RandomizerInf(),         SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[LH_UNDERWATER_ITEM]                    = ItemLocation::Base       (RC_LH_UNDERWATER_ITEM,                         0x57,       "LH Underwater Item",                   LH_UNDERWATER_ITEM,                    RUTOS_LETTER,              {},                                                   SpoilerCollectionCheck::EventChkInf(0x31),       SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[LH_SUN]                                = ItemLocation::Base       (RC_LH_SUN,                                     0x57,       "LH Sun",                               LH_SUN,                                FIRE_ARROWS,               {},                                                   SpoilerCollectionCheck::Chest(0x57, 0x1F),       SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[LH_FREESTANDING_POH]                   = ItemLocation::Collectable(RC_LH_FREESTANDING_POH,                        0x57, 0x1E, "LH Freestanding PoH",                  LH_FREESTANDING_POH,                   PIECE_OF_HEART,            {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[LH_DEKU_SCRUB_GROTTO_LEFT]             = ItemLocation::GrottoScrub(RC_LH_DEKU_SCRUB_GROTTO_LEFT,                  0xEF,       "LH Deku Scrub Grotto Left",            LH_DEKU_SCRUB_GROTTO_LEFT,             BUY_DEKU_NUT_5,            {Category::cDekuScrub},                               SpoilerCollectionCheck::Scrub(),                 SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[LH_DEKU_SCRUB_GROTTO_RIGHT]            = ItemLocation::GrottoScrub(RC_LH_DEKU_SCRUB_GROTTO_RIGHT,                 0xEF,       "LH Deku Scrub Grotto Right",           LH_DEKU_SCRUB_GROTTO_RIGHT,            BUY_BOMBS_535,             {Category::cDekuScrub},                               SpoilerCollectionCheck::Scrub(),                 SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[LH_DEKU_SCRUB_GROTTO_CENTER]           = ItemLocation::GrottoScrub(RC_LH_DEKU_SCRUB_GROTTO_CENTER,                0xEF,       "LH Deku Scrub Grotto Center",          LH_DEKU_SCRUB_GROTTO_CENTER,           BUY_DEKU_SEEDS_30,         {Category::cDekuScrub},                               SpoilerCollectionCheck::Scrub(),                 SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-
-    //Gerudo Valley
-    locationTable[GV_CHEST]                              = ItemLocation::Chest      (RC_GV_CHEST,                                   0x5A, 0x00, "GV Chest",                             GV_CHEST,                              PURPLE_RUPEE,              {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[GV_TRADE_SAW]                          = ItemLocation::Base       (RC_GV_TRADE_SAW,                               0x5A,       "GV Trade Saw",                         GV_TRADE_SAW,                          BROKEN_SWORD,              {Category::cAdultTrade},                              SpoilerCollectionCheck::RandomizerInf(),         SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[GV_WATERFALL_FREESTANDING_POH]         = ItemLocation::Collectable(RC_GV_WATERFALL_FREESTANDING_POH,              0x5A, 0x01, "GV Waterfall Freestanding PoH",        GV_WATERFALL_FREESTANDING_POH,         PIECE_OF_HEART,            {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[GV_CRATE_FREESTANDING_POH]             = ItemLocation::Collectable(RC_GV_CRATE_FREESTANDING_POH,                  0x5A, 0x02, "GV Crate Freestanding PoH",            GV_CRATE_FREESTANDING_POH,             PIECE_OF_HEART,            {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[GV_DEKU_SCRUB_GROTTO_REAR]             = ItemLocation::GrottoScrub(RC_GV_DEKU_SCRUB_GROTTO_REAR,                  0xF0,       "GV Deku Scrub Grotto Rear",            GV_DEKU_SCRUB_GROTTO_REAR,             BUY_RED_POTION_30,         {Category::cDekuScrub},                               SpoilerCollectionCheck::Scrub(),                 SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[GV_DEKU_SCRUB_GROTTO_FRONT]            = ItemLocation::GrottoScrub(RC_GV_DEKU_SCRUB_GROTTO_FRONT,                 0xF0,       "GV Deku Scrub Grotto Front",           GV_DEKU_SCRUB_GROTTO_FRONT,            BUY_GREEN_POTION,          {Category::cDekuScrub},                               SpoilerCollectionCheck::Scrub(),                 SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-
-    //Gerudo Fortress
-    locationTable[GF_CHEST]                              = ItemLocation::Chest      (RC_GF_CHEST,                                   0x5D, 0x00, "GF Chest",                             GF_CHEST,                              PIECE_OF_HEART,            {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[GF_HBA_1000_POINTS]                    = ItemLocation::Base       (RC_GF_HBA_1000_POINTS,                         0x5D,       "GF HBA 1000 Points",                   GF_HBA_1000_POINTS,                    PIECE_OF_HEART,            {},                                                   SpoilerCollectionCheck::InfTable(0x19, 0x08),    SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[GF_HBA_1500_POINTS]                    = ItemLocation::Base       (RC_GF_HBA_1500_POINTS,                         0x5D,       "GF HBA 1500 Points",                   GF_HBA_1500_POINTS,                    PROGRESSIVE_BOW,           {},                                                   SpoilerCollectionCheck::ItemGetInf(7),           SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[GF_GERUDO_MEMBERSHIP_CARD]             = ItemLocation::Base       (RC_GF_GERUDO_MEMBERSHIP_CARD,                  0x0C,       "GF Gerudo Membership Card",            GF_GERUDO_MEMBERSHIP_CARD,             GERUDO_MEMBERSHIP_CARD,    {},                                                   SpoilerCollectionCheck::GerudoToken(),           SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[GF_NORTH_F1_CARPENTER]                 = ItemLocation::Collectable(RC_GF_NORTH_F1_CARPENTER,                      0x0C, 0x0C, "GF North F1 Carpenter",                GF_NORTH_F1_CARPENTER,                 GERUDO_FORTRESS_SMALL_KEY, {Category::cVanillaGFSmallKey},                                                                        SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[GF_NORTH_F2_CARPENTER]                 = ItemLocation::Collectable(RC_GF_NORTH_F2_CARPENTER,                      0x0C, 0x0A, "GF North F2 Carpenter",                GF_NORTH_F2_CARPENTER,                 GERUDO_FORTRESS_SMALL_KEY, {Category::cVanillaGFSmallKey},                                                                        SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[GF_SOUTH_F1_CARPENTER]                 = ItemLocation::Collectable(RC_GF_SOUTH_F1_CARPENTER,                      0x0C, 0x0E, "GF South F1 Carpenter",                GF_SOUTH_F1_CARPENTER,                 GERUDO_FORTRESS_SMALL_KEY, {Category::cVanillaGFSmallKey},                                                                        SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[GF_SOUTH_F2_CARPENTER]                 = ItemLocation::Collectable(RC_GF_SOUTH_F2_CARPENTER,                      0x0C, 0x0F, "GF South F2 Carpenter",                GF_SOUTH_F2_CARPENTER,                 GERUDO_FORTRESS_SMALL_KEY, {Category::cVanillaGFSmallKey},                                                                        SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-
-    //Haunted Wasteland
-    locationTable[WASTELAND_CHEST]                       = ItemLocation::Chest      (RC_WASTELAND_CHEST,                            0x5E, 0x00, "Wasteland Chest",                      WASTELAND_CHEST,                       PURPLE_RUPEE,              {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[WASTELAND_BOMBCHU_SALESMAN]            = ItemLocation::Base       (RC_WASTELAND_BOMBCHU_SALESMAN,                 0x5E,       "Wasteland Carpet Salesman",            WASTELAND_BOMBCHU_SALESMAN,            BOMBCHU_10,                {Category::cMerchant},                                SpoilerCollectionCheck::Merchant(),              SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-
-    //Desert Colossus
-    locationTable[COLOSSUS_FREESTANDING_POH]             = ItemLocation::Collectable(RC_COLOSSUS_FREESTANDING_POH,                  0x5C, 0x0D, "Colossus Freestanding PoH",            COLOSSUS_FREESTANDING_POH,             PIECE_OF_HEART,            {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[COLOSSUS_DEKU_SCRUB_GROTTO_REAR]       = ItemLocation::GrottoScrub(RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,            0xFD,       "Colossus Deku Scrub Grotto Rear",      COLOSSUS_DEKU_SCRUB_GROTTO_REAR,       BUY_RED_POTION_30,         {Category::cDekuScrub},                               SpoilerCollectionCheck::Scrub(),                 SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[COLOSSUS_DEKU_SCRUB_GROTTO_FRONT]      = ItemLocation::GrottoScrub(RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT,           0xFD,       "Colossus Deku Scrub Grotto Front",     COLOSSUS_DEKU_SCRUB_GROTTO_FRONT,      BUY_GREEN_POTION,          {Category::cDekuScrub},                               SpoilerCollectionCheck::Scrub(),                 SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-
-    //Market
-    locationTable[MARKET_TREASURE_CHEST_GAME_REWARD]     = ItemLocation::Chest      (RC_MARKET_TREASURE_CHEST_GAME_REWARD,          0x10,       "MK Treasure Chest Game Reward",        MARKET_TREASURE_CHEST_GAME_REWARD,     TREASURE_GAME_HEART,       {},                                                   SpoilerCollectionCheck::ItemGetInf(19),          SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[MARKET_BOMBCHU_BOWLING_FIRST_PRIZE]    = ItemLocation::Base       (RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,         0x4B,       "MK Bombchu Bowling First Prize",       MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,    PROGRESSIVE_BOMB_BAG,      {},                                                   SpoilerCollectionCheck::ItemGetInf(25),          SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[MARKET_BOMBCHU_BOWLING_SECOND_PRIZE]   = ItemLocation::Base       (RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE,        0x4B,       "MK Bombchu Bowling Second Prize",      MARKET_BOMBCHU_BOWLING_SECOND_PRIZE,   PIECE_OF_HEART,            {},                                                   SpoilerCollectionCheck::ItemGetInf(26),          SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[MARKET_BOMBCHU_BOWLING_BOMBCHUS]       = ItemLocation::Base       (RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS,            0x4B,       "MK Bombchu Bowling Bombchus",          NONE,                                  BOMBCHU_DROP,              {},                                                   SpoilerCollectionCheck::None(),                  SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[MARKET_LOST_DOG]                       = ItemLocation::Base       (RC_MARKET_LOST_DOG,                            0x35,       "MK Lost Dog",                          MARKET_LOST_DOG,                       PIECE_OF_HEART,            {},                                                   SpoilerCollectionCheck::InfTable(0x19, 0x09),    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[MARKET_SHOOTING_GALLERY_REWARD]        = ItemLocation::Base       (RC_MARKET_SHOOTING_GALLERY_REWARD,             0x42,       "MK Shooting Gallery",                  MARKET_SHOOTING_GALLERY_REWARD,        PROGRESSIVE_SLINGSHOT,     {},                                                   SpoilerCollectionCheck::ItemGetInf(5),           SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[MARKET_10_BIG_POES]                    = ItemLocation::Base       (RC_MARKET_10_BIG_POES,                         0x4D,       "MK 10 Big Poes",                       MARKET_10_BIG_POES,                    EMPTY_BOTTLE,              {},                                                   SpoilerCollectionCheck::RandomizerInf(),         SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[MARKET_TREASURE_CHEST_GAME_ITEM_1]     = ItemLocation::Chest      (RC_MARKET_TREASURE_CHEST_GAME_ITEM_1,          0x10, 0x01, "MK Chest Game First Room Chest",       MARKET_TREASURE_CHEST_GAME_ITEM_1,     TREASURE_GAME_SMALL_KEY,   {Category::cChestMinigame},                                                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[MARKET_TREASURE_CHEST_GAME_ITEM_2]     = ItemLocation::Chest      (RC_MARKET_TREASURE_CHEST_GAME_ITEM_2,          0x10, 0x03, "MK Chest Game Second Room Chest",      MARKET_TREASURE_CHEST_GAME_ITEM_2,     TREASURE_GAME_SMALL_KEY,   {Category::cChestMinigame},                                                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[MARKET_TREASURE_CHEST_GAME_ITEM_3]     = ItemLocation::Chest      (RC_MARKET_TREASURE_CHEST_GAME_ITEM_3,          0x10, 0x05, "MK Chest Game Third Room Chest",       MARKET_TREASURE_CHEST_GAME_ITEM_3,     TREASURE_GAME_SMALL_KEY,   {Category::cChestMinigame},                                                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[MARKET_TREASURE_CHEST_GAME_ITEM_4]     = ItemLocation::Chest      (RC_MARKET_TREASURE_CHEST_GAME_ITEM_4,          0x10, 0x07, "MK Chest Game Fourth Room Chest",      MARKET_TREASURE_CHEST_GAME_ITEM_4,     TREASURE_GAME_SMALL_KEY,   {Category::cChestMinigame},                                                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[MARKET_TREASURE_CHEST_GAME_ITEM_5]     = ItemLocation::Chest      (RC_MARKET_TREASURE_CHEST_GAME_ITEM_5,          0x10, 0x09, "MK Chest Game Fifth Room Chest",       MARKET_TREASURE_CHEST_GAME_ITEM_5,     TREASURE_GAME_SMALL_KEY,   {Category::cChestMinigame},                                                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-
-    //Hyrule Castle
-    locationTable[HC_MALON_EGG]                          = ItemLocation::Base       (RC_HC_MALON_EGG,                               0x5F,       "HC Malon Egg",                         HC_MALON_EGG,                          WEIRD_EGG,                 {},                                                   SpoilerCollectionCheck::EventChkInf(0x12),       SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[HC_ZELDAS_LETTER]                      = ItemLocation::Base       (RC_HC_ZELDAS_LETTER,                           0x4A,       "HC Zeldas Letter",                     HC_ZELDAS_LETTER,                      ZELDAS_LETTER,             {},                                                   SpoilerCollectionCheck::EventChkInf(0x40),       SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-
-    //Kakariko
-    locationTable[KAK_REDEAD_GROTTO_CHEST]               = ItemLocation::Chest      (RC_KAK_REDEAD_GROTTO_CHEST,                    0x3E, 0x0A, "Kak Redead Grotto Chest",              KAK_REDEAD_GROTTO_CHEST,               HUGE_RUPEE,                {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[KAK_OPEN_GROTTO_CHEST]                 = ItemLocation::Chest      (RC_KAK_OPEN_GROTTO_CHEST,                      0x3E, 0x08, "Kak Open Grotto Chest",                KAK_OPEN_GROTTO_CHEST,                 RED_RUPEE,                 {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[KAK_10_GOLD_SKULLTULA_REWARD]          = ItemLocation::Base       (RC_KAK_10_GOLD_SKULLTULA_REWARD,               0x50,       "Kak 10 Gold Skulltula Reward",         KAK_10_GOLD_SKULLTULA_REWARD,          PROGRESSIVE_WALLET,        {},                                                   SpoilerCollectionCheck::EventChkInf(0xDA),       SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[KAK_20_GOLD_SKULLTULA_REWARD]          = ItemLocation::Base       (RC_KAK_20_GOLD_SKULLTULA_REWARD,               0x50,       "Kak 20 Gold Skulltula Reward",         KAK_20_GOLD_SKULLTULA_REWARD,          STONE_OF_AGONY,            {},                                                   SpoilerCollectionCheck::EventChkInf(0xDB),       SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[KAK_30_GOLD_SKULLTULA_REWARD]          = ItemLocation::Base       (RC_KAK_30_GOLD_SKULLTULA_REWARD,               0x50,       "Kak 30 Gold Skulltula Reward",         KAK_30_GOLD_SKULLTULA_REWARD,          PROGRESSIVE_WALLET,        {},                                                   SpoilerCollectionCheck::EventChkInf(0xDC),       SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[KAK_40_GOLD_SKULLTULA_REWARD]          = ItemLocation::Base       (RC_KAK_40_GOLD_SKULLTULA_REWARD,               0x50,       "Kak 40 Gold Skulltula Reward",         KAK_40_GOLD_SKULLTULA_REWARD,          BOMBCHU_10,                {},                                                   SpoilerCollectionCheck::EventChkInf(0xDD),       SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[KAK_50_GOLD_SKULLTULA_REWARD]          = ItemLocation::Base       (RC_KAK_50_GOLD_SKULLTULA_REWARD,               0x50,       "Kak 50 Gold Skulltula Reward",         KAK_50_GOLD_SKULLTULA_REWARD,          PIECE_OF_HEART,            {},                                                   SpoilerCollectionCheck::EventChkInf(0xDE),       SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[KAK_100_GOLD_SKULLTULA_REWARD]         = ItemLocation::Base       (RC_KAK_100_GOLD_SKULLTULA_REWARD,              0x50,       "Kak 100 Gold Skulltula Reward",        KAK_100_GOLD_SKULLTULA_REWARD,         HUGE_RUPEE,                {},                                                   SpoilerCollectionCheck::EventChkInf(0xDF),       SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[KAK_MAN_ON_ROOF]                       = ItemLocation::Base       (RC_KAK_MAN_ON_ROOF,                            0x52,       "Kak Man on Roof",                      KAK_MAN_ON_ROOF,                       PIECE_OF_HEART,            {},                                                   SpoilerCollectionCheck::ItemGetInf(29),          SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[KAK_SHOOTING_GALLERY_REWARD]           = ItemLocation::Base       (RC_KAK_SHOOTING_GALLERY_REWARD,                0x42,       "Kak Shooting Gallery Reward",          KAK_SHOOTING_GALLERY_REWARD,           PROGRESSIVE_BOW,           {},                                                   SpoilerCollectionCheck::Chest(0x42, 0x1F),       SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[KAK_TRADE_ODD_MUSHROOM]                = ItemLocation::Base       (RC_KAK_TRADE_ODD_MUSHROOM,                     0x4E,       "Kak Trade Odd Mushroom",               KAK_TRADE_ODD_MUSHROOM,                ODD_POTION,                {Category::cAdultTrade},                              SpoilerCollectionCheck::ItemGetInf(56),          SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[KAK_GRANNYS_SHOP]                      = ItemLocation::Base       (RC_KAK_GRANNYS_SHOP,                           0x4E,       "Kak Granny's Shop",                    KAK_GRANNYS_SHOP,                      BLUE_POTION_REFILL,        {Category::cMerchant},                                SpoilerCollectionCheck::RandomizerInf(),         SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[KAK_ANJU_AS_ADULT]                     = ItemLocation::Base       (RC_KAK_ANJU_AS_ADULT,                          0x52,       "Kak Anju as Adult",                    KAK_ANJU_AS_ADULT,                     CLAIM_CHECK,               {},                                                   SpoilerCollectionCheck::ItemGetInf(36),          SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[KAK_ANJU_AS_CHILD]                     = ItemLocation::Base       (RC_KAK_ANJU_AS_CHILD,                          0x52,       "Kak Anju as Child",                    KAK_ANJU_AS_CHILD,                     EMPTY_BOTTLE,              {},                                                   SpoilerCollectionCheck::ItemGetInf(4),           SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[KAK_TRADE_POCKET_CUCCO]                = ItemLocation::Base       (RC_KAK_TRADE_POCKET_CUCCO,                     0x52,       "Kak Trade Pocket Cucco",               KAK_TRADE_POCKET_CUCCO,                COJIRO,                    {Category::cAdultTrade},                              SpoilerCollectionCheck::ItemGetInf(38),          SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[KAK_IMPAS_HOUSE_FREESTANDING_POH]      = ItemLocation::Collectable(RC_KAK_IMPAS_HOUSE_FREESTANDING_POH,           0x37, 0x01, "Kak Impas House Freestanding PoH",     KAK_IMPAS_HOUSE_FREESTANDING_POH,      PIECE_OF_HEART,            {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[KAK_WINDMILL_FREESTANDING_POH]         = ItemLocation::Collectable(RC_KAK_WINDMILL_FREESTANDING_POH,              0x48, 0x01, "Kak Windmill Freestanding PoH",        KAK_WINDMILL_FREESTANDING_POH,         PIECE_OF_HEART,            {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-
-    //Graveyard
-    locationTable[GRAVEYARD_SHIELD_GRAVE_CHEST]          = ItemLocation::Chest      (RC_GRAVEYARD_SHIELD_GRAVE_CHEST,               0x40, 0x00, "GY Shield Grave Chest",                GRAVEYARD_SHIELD_GRAVE_CHEST,          HYLIAN_SHIELD,             {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[GRAVEYARD_HEART_PIECE_GRAVE_CHEST]     = ItemLocation::Chest      (RC_GRAVEYARD_HEART_PIECE_GRAVE_CHEST,          0x3F, 0x00, "GY Heart Piece Grave Chest",           GRAVEYARD_HEART_PIECE_GRAVE_CHEST,     PIECE_OF_HEART,            {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[GRAVEYARD_COMPOSERS_GRAVE_CHEST]       = ItemLocation::Chest      (RC_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST,         0x41, 0x00, "GY Composers Grave Chest",             GRAVEYARD_COMPOSERS_GRAVE_CHEST,       BOMBS_5,                   {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[GRAVEYARD_HOOKSHOT_CHEST]              = ItemLocation::Chest      (RC_GRAVEYARD_HOOKSHOT_CHEST,                   0x48, 0x00, "GY Hookshot Chest",                    GRAVEYARD_HOOKSHOT_CHEST,              PROGRESSIVE_HOOKSHOT,      {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[GRAVEYARD_DAMPE_RACE_FREESTANDING_POH] = ItemLocation::Collectable(RC_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH,      0x48, 0x07, "GY Dampe Race Freestanding PoH",       GRAVEYARD_DAMPE_RACE_FREESTANDING_POH, PIECE_OF_HEART,            {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[GRAVEYARD_FREESTANDING_POH]            = ItemLocation::Collectable(RC_GRAVEYARD_FREESTANDING_POH,                 0x53, 0x04, "GY Freestanding PoH",                  GRAVEYARD_FREESTANDING_POH,            PIECE_OF_HEART,            {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR]     = ItemLocation::Collectable(RC_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR,          0x53,       "GY Dampe Gravedigging Tour",           GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR,     PIECE_OF_HEART,            {},                                                   SpoilerCollectionCheck::Gravedigger(0x53, 0x1F), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-
-    //Death Mountain
-    locationTable[DMT_CHEST]                             = ItemLocation::Chest      (RC_DMT_CHEST,                                  0x60, 0x01, "DMT Chest",                            DMT_CHEST,                             PURPLE_RUPEE,              {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[DMT_STORMS_GROTTO_CHEST]               = ItemLocation::Chest      (RC_DMT_STORMS_GROTTO_CHEST,                    0x3E, 0x17, "DMT Storms Grotto Chest",              DMT_STORMS_GROTTO_CHEST,               HUGE_RUPEE,                {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[DMT_TRADE_BROKEN_SWORD]                = ItemLocation::Base       (RC_DMT_TRADE_BROKEN_SWORD,                     0x60,       "DMT Trade Broken Sword",               DMT_TRADE_BROKEN_SWORD,                PRESCRIPTION,              {Category::cAdultTrade},                              SpoilerCollectionCheck::RandomizerInf(),         SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[DMT_TRADE_EYEDROPS]                    = ItemLocation::Base       (RC_DMT_TRADE_EYEDROPS,                         0x60,       "DMT Trade Eyedrops",                   DMT_TRADE_EYEDROPS,                    CLAIM_CHECK,               {Category::cAdultTrade},                              SpoilerCollectionCheck::RandomizerInf(),         SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[DMT_TRADE_CLAIM_CHECK]                 = ItemLocation::Base       (RC_DMT_TRADE_CLAIM_CHECK,                      0x60,       "DMT Trade Claim Check",                DMT_TRADE_CLAIM_CHECK,                 BIGGORON_SWORD,            {},                                                   SpoilerCollectionCheck::Chest(0x60, 0x1F),       SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[DMT_FREESTANDING_POH]                  = ItemLocation::Collectable(RC_DMT_FREESTANDING_POH,                       0x60, 0x1E, "DMT Freestanding PoH",                 DMT_FREESTANDING_POH,                  PIECE_OF_HEART,            {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-
-    //Goron City
-    locationTable[GC_MAZE_LEFT_CHEST]                    = ItemLocation::Chest      (RC_GC_MAZE_LEFT_CHEST,                         0x62, 0x00, "GC Maze Left Chest",                   GC_MAZE_LEFT_CHEST,                    HUGE_RUPEE,                {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[GC_MAZE_RIGHT_CHEST]                   = ItemLocation::Chest      (RC_GC_MAZE_RIGHT_CHEST,                        0x62, 0x01, "GC Maze Right Chest",                  GC_MAZE_RIGHT_CHEST,                   PURPLE_RUPEE,              {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[GC_MAZE_CENTER_CHEST]                  = ItemLocation::Chest      (RC_GC_MAZE_CENTER_CHEST,                       0x62, 0x02, "GC Maze Center Chest",                 GC_MAZE_CENTER_CHEST,                  PURPLE_RUPEE,              {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[GC_ROLLING_GORON_AS_CHILD]             = ItemLocation::Base       (RC_GC_ROLLING_GORON_AS_CHILD,                  0x62,       "GC Rolling Goron as Child",            GC_ROLLING_GORON_AS_CHILD,             PROGRESSIVE_BOMB_BAG,      {},                                                   SpoilerCollectionCheck::InfTable(0x11, 0x06),    SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[GC_ROLLING_GORON_AS_ADULT]             = ItemLocation::Base       (RC_GC_ROLLING_GORON_AS_ADULT,                  0x62,       "GC Rolling Goron as Adult",            GC_ROLLING_GORON_AS_ADULT,             GORON_TUNIC,               {},                                                   SpoilerCollectionCheck::InfTable(0x10, 0x01),    SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[GC_DARUNIAS_JOY]                       = ItemLocation::Base       (RC_GC_DARUNIAS_JOY,                            0x62,       "GC Darunias Joy",                      GC_DARUNIAS_JOY,                       PROGRESSIVE_STRENGTH,      {},                                                   SpoilerCollectionCheck::Chest(0x62, 0x1E),       SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[GC_POT_FREESTANDING_POH]               = ItemLocation::Collectable(RC_GC_POT_FREESTANDING_POH,                    0x62, 0x1F, "GC Pot Freestanding PoH",              GC_POT_FREESTANDING_POH,               PIECE_OF_HEART,            {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[GC_DEKU_SCRUB_GROTTO_LEFT]             = ItemLocation::GrottoScrub(RC_GC_DEKU_SCRUB_GROTTO_LEFT,                  0xFB,       "GC Deku Scrub Grotto Left",            GC_DEKU_SCRUB_GROTTO_LEFT,             BUY_DEKU_NUT_5,            {Category::cDekuScrub},                               SpoilerCollectionCheck::Scrub(),                 SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[GC_DEKU_SCRUB_GROTTO_RIGHT]            = ItemLocation::GrottoScrub(RC_GC_DEKU_SCRUB_GROTTO_RIGHT,                 0xFB,       "GC Deku Scrub Grotto Right",           GC_DEKU_SCRUB_GROTTO_RIGHT,            BUY_BOMBS_535,             {Category::cDekuScrub},                               SpoilerCollectionCheck::Scrub(),                 SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[GC_DEKU_SCRUB_GROTTO_CENTER]           = ItemLocation::GrottoScrub(RC_GC_DEKU_SCRUB_GROTTO_CENTER,                0xFB,       "GC Deku Scrub Grotto Center",          GC_DEKU_SCRUB_GROTTO_CENTER,           BUY_ARROWS_30,             {Category::cDekuScrub},                               SpoilerCollectionCheck::Scrub(),                 SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[GC_MEDIGORON]                          = ItemLocation::Base       (RC_GC_MEDIGORON,                               0x62,       "GC Medigoron",                         GC_MEDIGORON,                          GIANTS_KNIFE,              {Category::cMerchant},                                SpoilerCollectionCheck::Merchant(),              SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-
-    //Death Mountain Crater
-    locationTable[DMC_UPPER_GROTTO_CHEST]                = ItemLocation::Chest      (RC_DMC_UPPER_GROTTO_CHEST,                     0x3E, 0x1A, "DMC Upper Grotto Chest",               DMC_UPPER_GROTTO_CHEST,                BOMBS_20,                  {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[DMC_WALL_FREESTANDING_POH]             = ItemLocation::Collectable(RC_DMC_WALL_FREESTANDING_POH,                  0x61, 0x02, "DMC Wall Freestanding PoH",            DMC_WALL_FREESTANDING_POH,             PIECE_OF_HEART,            {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[DMC_VOLCANO_FREESTANDING_POH]          = ItemLocation::Collectable(RC_DMC_VOLCANO_FREESTANDING_POH,               0x61, 0x08, "DMC Volcano Freestanding PoH",         DMC_VOLCANO_FREESTANDING_POH,          PIECE_OF_HEART,            {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[DMC_DEKU_SCRUB]                        = ItemLocation::Base       (RC_DMC_DEKU_SCRUB,                             0x61,       "DMC Deku Scrub",                       DMC_DEKU_SCRUB,                        BUY_BOMBS_535,             {Category::cDekuScrub},                               SpoilerCollectionCheck::Scrub(),                 SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[DMC_DEKU_SCRUB_GROTTO_LEFT]            = ItemLocation::GrottoScrub(RC_DMC_DEKU_SCRUB_GROTTO_LEFT,                 0xF9,       "DMC Deku Scrub Grotto Left",           DMC_DEKU_SCRUB_GROTTO_LEFT,            BUY_DEKU_NUT_5,            {Category::cDekuScrub},                               SpoilerCollectionCheck::Scrub(),                 SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[DMC_DEKU_SCRUB_GROTTO_RIGHT]           = ItemLocation::GrottoScrub(RC_DMC_DEKU_SCRUB_GROTTO_RIGHT,                0xF9,       "DMC Deku Scrub Grotto Right",          DMC_DEKU_SCRUB_GROTTO_RIGHT,           BUY_BOMBS_535,             {Category::cDekuScrub},                               SpoilerCollectionCheck::Scrub(),                 SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[DMC_DEKU_SCRUB_GROTTO_CENTER]          = ItemLocation::GrottoScrub(RC_DMC_DEKU_SCRUB_GROTTO_CENTER,               0xF9,       "DMC Deku Scrub Grotto Center",         DMC_DEKU_SCRUB_GROTTO_CENTER,          BUY_ARROWS_30,             {Category::cDekuScrub},                               SpoilerCollectionCheck::Scrub(),                 SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-
-    //Zoras River
-    locationTable[ZR_OPEN_GROTTO_CHEST]                  = ItemLocation::Chest      (RC_ZR_OPEN_GROTTO_CHEST,                       0x3E, 0x09, "ZR Open Grotto Chest",                 ZR_OPEN_GROTTO_CHEST,                  RED_RUPEE,                 {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[ZR_MAGIC_BEAN_SALESMAN]                = ItemLocation::Base       (RC_ZR_MAGIC_BEAN_SALESMAN,                     0x54,       "ZR Magic Bean Salesman",               ZR_MAGIC_BEAN_SALESMAN,                MAGIC_BEAN,                {},                                                   SpoilerCollectionCheck::MagicBeans(),            SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[ZR_FROGS_ZELDAS_LULLABY]               = ItemLocation::Base       (RC_ZR_FROGS_ZELDAS_LULLABY,                    0x54,       "ZR Frogs Zelda's Lullaby",             ZR_FROGS_ZELDAS_LULLABY,               PURPLE_RUPEE,              {},                                                   SpoilerCollectionCheck::EventChkInf(0xD1),       SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[ZR_FROGS_EPONAS_SONG]                  = ItemLocation::Base       (RC_ZR_FROGS_EPONAS_SONG,                       0x54,       "ZR Frogs Epona's Song",                ZR_FROGS_EPONAS_SONG,                  PURPLE_RUPEE,              {},                                                   SpoilerCollectionCheck::EventChkInf(0xD2),       SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[ZR_FROGS_SARIAS_SONG]                  = ItemLocation::Base       (RC_ZR_FROGS_SARIAS_SONG,                       0x54,       "ZR Frogs Saria's Song",                ZR_FROGS_SARIAS_SONG,                  PURPLE_RUPEE,              {},                                                   SpoilerCollectionCheck::EventChkInf(0xD4),       SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[ZR_FROGS_SUNS_SONG]                    = ItemLocation::Base       (RC_ZR_FROGS_SUNS_SONG,                         0x54,       "ZR Frogs Sun's Song",                  ZR_FROGS_SUNS_SONG,                    PURPLE_RUPEE,              {},                                                   SpoilerCollectionCheck::EventChkInf(0xD3),       SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[ZR_FROGS_SONG_OF_TIME]                 = ItemLocation::Base       (RC_ZR_FROGS_SONG_OF_TIME,                      0x54,       "ZR Frogs Song of Time",                ZR_FROGS_SONG_OF_TIME,                 PURPLE_RUPEE,              {},                                                   SpoilerCollectionCheck::EventChkInf(0xD5),       SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[ZR_FROGS_IN_THE_RAIN]                  = ItemLocation::Base       (RC_ZR_FROGS_IN_THE_RAIN,                       0x54,       "ZR Frogs in the Rain",                 ZR_FROGS_IN_THE_RAIN,                  PIECE_OF_HEART,            {},                                                   SpoilerCollectionCheck::EventChkInf(0xD6),       SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[ZR_FROGS_OCARINA_GAME]                 = ItemLocation::Base       (RC_ZR_FROGS_OCARINA_GAME,                      0x54,       "ZR Frogs Ocarina Game",                ZR_FROGS_OCARINA_GAME,                 PIECE_OF_HEART,            {},                                                   SpoilerCollectionCheck::EventChkInf(0xD0),       SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH]  = ItemLocation::Collectable(RC_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH,       0x54, 0x04, "ZR Near Open Grotto Freestanding PoH", ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH,  PIECE_OF_HEART,            {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[ZR_NEAR_DOMAIN_FREESTANDING_POH]       = ItemLocation::Collectable(RC_ZR_NEAR_DOMAIN_FREESTANDING_POH,            0x54, 0x0B, "ZR Near Domain Freestanding PoH",      ZR_NEAR_DOMAIN_FREESTANDING_POH,       PIECE_OF_HEART,            {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[ZR_DEKU_SCRUB_GROTTO_REAR]             = ItemLocation::GrottoScrub(RC_ZR_DEKU_SCRUB_GROTTO_REAR,                  0xEB,       "ZR Deku Scrub Grotto Rear",            ZR_DEKU_SCRUB_GROTTO_REAR,             BUY_RED_POTION_30,         {Category::cDekuScrub},                               SpoilerCollectionCheck::Scrub(),                 SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[ZR_DEKU_SCRUB_GROTTO_FRONT]            = ItemLocation::GrottoScrub(RC_ZR_DEKU_SCRUB_GROTTO_FRONT,                 0xEB,       "ZR Deku Scrub Grotto Front",           ZR_DEKU_SCRUB_GROTTO_FRONT,            BUY_GREEN_POTION,          {Category::cDekuScrub},                               SpoilerCollectionCheck::Scrub(),                 SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-
-    //Zoras Domain
-    locationTable[ZD_CHEST]                              = ItemLocation::Chest      (RC_ZD_CHEST,                                   0x58, 0x00, "ZD Chest",                             ZD_CHEST,                              PIECE_OF_HEART,            {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[ZD_DIVING_MINIGAME]                    = ItemLocation::Base       (RC_ZD_DIVING_MINIGAME,                         0x58,       "ZD Diving Minigame",                   ZD_DIVING_MINIGAME,                    PROGRESSIVE_SCALE,         {},                                                   SpoilerCollectionCheck::EventChkInf(0x38),       SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[ZD_KING_ZORA_THAWED]                   = ItemLocation::Base       (RC_ZD_KING_ZORA_THAWED,                        0x58,       "ZD King Zora Thawed",                  ZD_KING_ZORA_THAWED,                   ZORA_TUNIC,                {},                                                   SpoilerCollectionCheck::InfTable(0x13, 0x01),    SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[ZD_TRADE_PRESCRIPTION]                 = ItemLocation::Base       (RC_ZD_TRADE_PRESCRIPTION,                      0x58,       "ZD Trade Prescription",                ZD_TRADE_PRESCRIPTION,                 EYEBALL_FROG,              {Category::cAdultTrade},                              SpoilerCollectionCheck::Chest(0x58, 0x1F),       SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-
-    //Zoras Fountain
-    locationTable[ZF_ICEBERG_FREESTANDING_POH]           = ItemLocation::Collectable(RC_ZF_ICEBERC_FREESTANDING_POH,                0x59, 0x01, "ZF Iceberg Freestanding PoH",          ZF_ICEBERG_FREESTANDING_POH,           PIECE_OF_HEART,            {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[ZF_BOTTOM_FREESTANDING_POH]            = ItemLocation::Collectable(RC_ZF_BOTTOM_FREESTANDING_POH,                 0x59, 0x14, "ZF Bottom Freestanding PoH",           ZF_BOTTOM_FREESTANDING_POH,            PIECE_OF_HEART,            {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-
-    //Lon Lon Ranch
-    locationTable[LLR_TALONS_CHICKENS]                   = ItemLocation::Base       (RC_LLR_TALONS_CHICKENS,                        0x4C,       "LLR Talons Chickens",                  LLR_TALONS_CHICKENS,                   BOTTLE_WITH_MILK,          {},                                                   SpoilerCollectionCheck::ItemGetInf(10),          SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
-    locationTable[LLR_FREESTANDING_POH]                  = ItemLocation::Collectable(RC_LLR_FREESTANDING_POH,                       0x4C, 0x01, "LLR Freestanding PoH",                 LLR_FREESTANDING_POH,                  PIECE_OF_HEART,            {},                                                                                                    SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
-    locationTable[LLR_DEKU_SCRUB_GROTTO_LEFT]            = ItemLocation::GrottoScrub(RC_LLR_DEKU_SCRUB_GROTTO_LEFT,                 0xFC,       "LLR Deku Scrub Grotto Left",           LLR_DEKU_SCRUB_GROTTO_LEFT,            BUY_DEKU_NUT_5,            {Category::cDekuScrub},                               SpoilerCollectionCheck::Scrub(),                 SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
-    locationTable[LLR_DEKU_SCRUB_GROTTO_RIGHT]           = ItemLocation::GrottoScrub(RC_LLR_DEKU_SCRUB_GROTTO_RIGHT,                0xFC,       "LLR Deku Scrub Grotto Right",          LLR_DEKU_SCRUB_GROTTO_RIGHT,           BUY_BOMBS_535,             {Category::cDekuScrub},                               SpoilerCollectionCheck::Scrub(),                 SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
-    locationTable[LLR_DEKU_SCRUB_GROTTO_CENTER]          = ItemLocation::GrottoScrub(RC_LLR_DEKU_SCRUB_GROTTO_CENTER,               0xFC,       "LLR Deku Scrub Grotto Center",         LLR_DEKU_SCRUB_GROTTO_CENTER,          BUY_DEKU_SEEDS_30,         {Category::cDekuScrub},                               SpoilerCollectionCheck::Scrub(),                 SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
-
-    /*-------------------
-       --- DUNGEONS ---
-      -------------------*/
-
-    //Deku Tree Vanilla
-    locationTable[DEKU_TREE_MAP_CHEST]                                         = ItemLocation::Chest      (RC_DEKU_TREE_MAP_CHEST,                                          0x00, 0x03, "Deku Tree Map Chest",                                DEKU_TREE_MAP_CHEST,                 DEKU_TREE_MAP,            {Category::cVanillaMap},                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[DEKU_TREE_COMPASS_CHEST]                                     = ItemLocation::Chest      (RC_DEKU_TREE_COMPASS_CHEST,                                      0x00, 0x02, "Deku Tree Compass Chest",                            DEKU_TREE_COMPASS_CHEST,             DEKU_TREE_COMPASS,        {Category::cVanillaCompass},                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[DEKU_TREE_COMPASS_ROOM_SIDE_CHEST]                           = ItemLocation::Chest      (RC_DEKU_TREE_COMPASS_ROOM_SIDE_CHEST,                            0x00, 0x06, "Deku Tree Compass Room Side Chest",                  DEKU_TREE_COMPASS_ROOM_SIDE_CHEST,   RECOVERY_HEART,           {},                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[DEKU_TREE_BASEMENT_CHEST]                                    = ItemLocation::Chest      (RC_DEKU_TREE_BASEMENT_CHEST,                                     0x00, 0x04, "Deku Tree Basement Chest",                           DEKU_TREE_BASEMENT_CHEST,            RECOVERY_HEART,           {},                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[DEKU_TREE_SLINGSHOT_CHEST]                                   = ItemLocation::Chest      (RC_DEKU_TREE_SLINGSHOT_CHEST,                                    0x00, 0x01, "Deku Tree Slingshot Chest",                          DEKU_TREE_SLINGSHOT_CHEST,           PROGRESSIVE_SLINGSHOT,    {},                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST]                         = ItemLocation::Chest      (RC_DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST,                          0x00, 0x05, "Deku Tree Slingshot Room Side Chest",                DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST, RECOVERY_HEART,           {},                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    //Deku Tree MQ
-    locationTable[DEKU_TREE_MQ_MAP_CHEST]                                      = ItemLocation::Chest      (RC_DEKU_TREE_MQ_MAP_CHEST,                                       0x00, 0x03, "Deku Tree MQ Map Chest",                             DEKU_TREE_MQ_MAP_CHEST,                 DEKU_TREE_MAP,         {Category::cVanillaMap},                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[DEKU_TREE_MQ_COMPASS_CHEST]                                  = ItemLocation::Chest      (RC_DEKU_TREE_MQ_COMPASS_CHEST,                                   0x00, 0x01, "Deku Tree MQ Compass Chest",                         DEKU_TREE_MQ_COMPASS_CHEST,             DEKU_TREE_COMPASS,     {Category::cVanillaCompass},                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[DEKU_TREE_MQ_SLINGSHOT_CHEST]                                = ItemLocation::Chest      (RC_DEKU_TREE_MQ_SLINGSHOT_CHEST,                                 0x00, 0x06, "Deku Tree MQ Slingshot Chest",                       DEKU_TREE_MQ_SLINGSHOT_CHEST,           PROGRESSIVE_SLINGSHOT, {},                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST]                      = ItemLocation::Chest      (RC_DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST,                       0x00, 0x02, "Deku Tree MQ Slingshot Room Back Chest",             DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST, DEKU_SHIELD,           {},                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[DEKU_TREE_MQ_BASEMENT_CHEST]                                 = ItemLocation::Chest      (RC_DEKU_TREE_MQ_BASEMENT_CHEST,                                  0x00, 0x04, "Deku Tree MQ Basement Chest",                        DEKU_TREE_MQ_BASEMENT_CHEST,            DEKU_SHIELD,           {},                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST]                      = ItemLocation::Chest      (RC_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST,                       0x00, 0x05, "Deku Tree MQ Before Spinning Log Chest",             DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST, RECOVERY_HEART,        {},                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST]                       = ItemLocation::Chest      (RC_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST,                        0x00, 0x00, "Deku Tree MQ After Spinning Log Chest",              DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST,  PURPLE_RUPEE,          {},                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[DEKU_TREE_MQ_DEKU_SCRUB]                                     = ItemLocation::Base       (RC_DEKU_TREE_MQ_DEKU_SCRUB,                                      0x00,       "Deku Tree MQ Deku Scrub",                            DEKU_TREE_MQ_DEKU_SCRUB,                BUY_DEKU_SHIELD,       {Category::cDekuScrub},                                  SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-
-    //Dodongos Cavern Shared
-    locationTable[DODONGOS_CAVERN_BOSS_ROOM_CHEST]                             = ItemLocation::Chest      (RC_DODONGOS_CAVERN_BOSS_ROOM_CHEST,                              0x12, 0x00, "Dodongos Cavern Boss Room Chest",                    DODONGOS_CAVERN_BOSS_ROOM_CHEST,                                  BOMBS_5,                 {},                                                           SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    //Dodongos Cavern Vanilla
-    locationTable[DODONGOS_CAVERN_MAP_CHEST]                                   = ItemLocation::Chest      (RC_DODONGOS_CAVERN_MAP_CHEST,                                    0x01, 0x08, "Dodongos Cavern Map Chest",                          DODONGOS_CAVERN_MAP_CHEST,                                        DODONGOS_CAVERN_MAP,     {Category::cVanillaMap},                                      SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[DODONGOS_CAVERN_COMPASS_CHEST]                               = ItemLocation::Chest      (RC_DODONGOS_CAVERN_COMPASS_CHEST,                                0x01, 0x05, "Dodongos Cavern Compass Chest",                      DODONGOS_CAVERN_COMPASS_CHEST,                                    DODONGOS_CAVERN_COMPASS, {Category::cVanillaCompass},                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST]                  = ItemLocation::Chest      (RC_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST,                   0x01, 0x06, "Dodongos Cavern Bomb Flower Platform Chest",         DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST,                       RED_RUPEE,               {},                                                           SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[DODONGOS_CAVERN_BOMB_BAG_CHEST]                              = ItemLocation::Chest      (RC_DODONGOS_CAVERN_BOMB_BAG_CHEST,                               0x01, 0x04, "Dodongos Cavern Bomb Bag Chest",                     DODONGOS_CAVERN_BOMB_BAG_CHEST,                                   PROGRESSIVE_BOMB_BAG,    {},                                                           SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[DODONGOS_CAVERN_END_OF_BRIDGE_CHEST]                         = ItemLocation::Chest      (RC_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST,                          0x01, 0x0A, "Dodongos Cavern End Of Bridge Chest",                DODONGOS_CAVERN_END_OF_BRIDGE_CHEST,                              DEKU_SHIELD,             {},                                                           SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT]               = ItemLocation::Base       (RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,                0x01,       "Dodongos Cavern Deku Scrub Near Bomb Bag Left",      DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,                    BUY_DEKU_NUT_5,          {Category::cDekuScrub},      SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS]          = ItemLocation::Base       (RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS,           0x01,       "Dodongos Cavern Deku Scrub Side Room Near Dodongos", DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS,               BUY_DEKU_STICK_1,        {Category::cDekuScrub},      SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT]              = ItemLocation::Base       (RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT,               0x01,       "Dodongos Cavern Deku Scrub Near Bomb Bag Right",     DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT,                   BUY_DEKU_SEEDS_30,       {Category::cDekuScrub},      SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[DODONGOS_CAVERN_DEKU_SCRUB_LOBBY]                            = ItemLocation::Base       (RC_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY,                             0x01,       "Dodongos Cavern Deku Scrub Lobby",                   DODONGOS_CAVERN_DEKU_SCRUB_LOBBY,                                 BUY_DEKU_SHIELD,         {Category::cDekuScrub},      SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    //Dodongos Cavern MQ
-    locationTable[DODONGOS_CAVERN_MQ_MAP_CHEST]                                = ItemLocation::Chest      (RC_DODONGOS_CAVERN_MQ_MAP_CHEST,                                 0x01, 0x00, "Dodongos Cavern MQ Map Chest",                       DODONGOS_CAVERN_MQ_MAP_CHEST,                                     DODONGOS_CAVERN_MAP,     {Category::cVanillaMap},                                      SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST]                           = ItemLocation::Chest      (RC_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST,                            0x01, 0x04, "Dodongos Cavern MQ Bomb Bag Chest",                  DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST,                                PROGRESSIVE_BOMB_BAG,    {},                                                           SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[DODONGOS_CAVERN_MQ_COMPASS_CHEST]                            = ItemLocation::Chest      (RC_DODONGOS_CAVERN_MQ_COMPASS_CHEST,                             0x01, 0x05, "Dodongos Cavern MQ Compass Chest",                   DODONGOS_CAVERN_MQ_COMPASS_CHEST,                                 DODONGOS_CAVERN_COMPASS, {Category::cVanillaCompass},                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST]                        = ItemLocation::Chest      (RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST,                         0x01, 0x02, "Dodongos Cavern MQ Larvae Room Chest",               DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST,                             DEKU_SHIELD,             {},                                                           SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST]                  = ItemLocation::Chest      (RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST,                   0x01, 0x03, "Dodongos Cavern MQ Torch Puzzle Room Chest",         DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST,                       BLUE_RUPEE,              {},                                                           SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST]                        = ItemLocation::Chest      (RC_DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST,                         0x01, 0x01, "Dodongos Cavern MQ Under Grave Chest",               DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST,                             HYLIAN_SHIELD,           {},                                                           SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR]                    = ItemLocation::Base       (RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,                     0x01,       "Dodongos Cavern Deku Scrub Lobby Rear",              DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,                         BUY_DEKU_STICK_1,        {Category::cDekuScrub},      SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT]                   = ItemLocation::Base       (RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT,                    0x01,       "Dodongos Cavern Deku Scrub Lobby Front",             DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT,                        BUY_DEKU_SEEDS_30,       {Category::cDekuScrub},      SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE]                     = ItemLocation::Base       (RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,                      0x01,       "Dodongos Cavern Deku Scrub Staircase",               DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,                          BUY_DEKU_SHIELD,         {Category::cDekuScrub},      SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS] = ItemLocation::Base       (RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS,  0x01,       "Dodongos Cavern Deku Scrub Side Room Near Lower Lizalfos",DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS, BUY_RED_POTION_30,       {Category::cDekuScrub},      SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-
-    //Jabu Jabus Belly Vanilla
-    locationTable[JABU_JABUS_BELLY_MAP_CHEST]                                  = ItemLocation::Chest      (RC_JABU_JABUS_BELLY_MAP_CHEST,                                   0x02, 0x02, "Jabu Jabus Belly Map Chest",                         JABU_JABUS_BELLY_MAP_CHEST,                       JABU_JABUS_BELLY_MAP,     {Category::cVanillaMap},                                                     SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[JABU_JABUS_BELLY_COMPASS_CHEST]                              = ItemLocation::Chest      (RC_JABU_JABUS_BELLY_COMPASS_CHEST,                               0x02, 0x04, "Jabu Jabus Belly Compass Chest",                     JABU_JABUS_BELLY_COMPASS_CHEST,                   JABU_JABUS_BELLY_COMPASS, {Category::cVanillaCompass},                                                 SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[JABU_JABUS_BELLY_BOOMERANG_CHEST]                            = ItemLocation::Chest      (RC_JABU_JABUS_BELLY_BOOMERANG_CHEST,                             0x02, 0x01, "Jabu Jabus Belly Boomerang Chest",                   JABU_JABUS_BELLY_BOOMERANG_CHEST,                 BOOMERANG,                {},                                                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[JABU_JABUS_BELLY_DEKU_SCRUB]                                 = ItemLocation::Base       (RC_JABU_JABUS_BELLY_DEKU_SCRUB,                                  0x02,       "Jabu Jabus Belly Deku Scrub",                        JABU_JABUS_BELLY_DEKU_SCRUB,                      BUY_DEKU_NUT_5,           {Category::cDekuScrub},                     SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    //Jabu Jabus Belly MQ
-    locationTable[JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST]                   = ItemLocation::Chest      (RC_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST,                    0x02, 0x05, "Jabu Jabus Belly MQ First Room Side Chest",          JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST,        DEKU_NUTS_5,              {},                                                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[JABU_JABUS_BELLY_MQ_MAP_CHEST]                               = ItemLocation::Chest      (RC_JABU_JABUS_BELLY_MQ_MAP_CHEST,                                0x02, 0x03, "Jabu Jabus Belly MQ Map Chest",                      JABU_JABUS_BELLY_MQ_MAP_CHEST,                    JABU_JABUS_BELLY_MAP,     {Category::cVanillaMap},                                                     SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST]                 = ItemLocation::Chest      (RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST,                  0x02, 0x02, "Jabu Jabus Belly MQ Second Room Lower Chest",        JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST,      DEKU_NUTS_5,              {},                                                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[JABU_JABUS_BELLY_MQ_COMPASS_CHEST]                           = ItemLocation::Chest      (RC_JABU_JABUS_BELLY_MQ_COMPASS_CHEST,                            0x02, 0x00, "Jabu Jabus Belly MQ Compass Chest",                  JABU_JABUS_BELLY_MQ_COMPASS_CHEST,                JABU_JABUS_BELLY_COMPASS, {Category::cVanillaCompass},                                                 SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST]                 = ItemLocation::Chest      (RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST,                  0x02, 0x07, "Jabu Jabus Belly MQ Second Room Upper Chest",        JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST,      RECOVERY_HEART,           {},                                                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST]            = ItemLocation::Chest      (RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST,             0x02, 0x08, "Jabu Jabus Belly MQ Basement Near Switches Chest",   JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST, DEKU_NUTS_5,              {},                                                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST]               = ItemLocation::Chest      (RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST,                0x02, 0x04, "Jabu Jabus Belly MQ Basement Near Vines Chest",      JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST,    BOMBCHU_10,               {},                                                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST]                         = ItemLocation::Chest      (RC_JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST,                          0x02, 0x0A, "Jabu Jabus Belly MQ Near Boss Chest",                JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST,              DEKU_SHIELD,              {},                                                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST]            = ItemLocation::Chest      (RC_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST,             0x02, 0x09, "Jabu Jabus Belly MQ Falling Like Like Room Chest",   JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST, DEKU_STICK_1,             {},                                                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST]              = ItemLocation::Chest      (RC_JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST,               0x02, 0x01, "Jabu Jabus Belly MQ Boomerang Room Small Chest",     JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST,   DEKU_NUTS_5,              {},                                                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST]                         = ItemLocation::Chest      (RC_JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST,                          0x02, 0x06, "Jabu Jabus Belly MQ Boomerang Chest",                JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST,              BOOMERANG,                {},                                                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    //COW
-
-    //Forest Temple Vanilla
-    locationTable[FOREST_TEMPLE_FIRST_ROOM_CHEST]                              = ItemLocation::Chest      (RC_FOREST_TEMPLE_FIRST_ROOM_CHEST,                               0x03, 0x03, "Forest Temple First Room Chest",                       FOREST_TEMPLE_FIRST_ROOM_CHEST,                        FOREST_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[FOREST_TEMPLE_FIRST_STALFOS_CHEST]                           = ItemLocation::Chest      (RC_FOREST_TEMPLE_FIRST_STALFOS_CHEST,                            0x03, 0x00, "Forest Temple First Stalfos Chest",                    FOREST_TEMPLE_FIRST_STALFOS_CHEST,                     FOREST_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST]                 = ItemLocation::Chest      (RC_FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST,                  0x03, 0x05, "Forest Temple Raised Island Courtyard Chest",          FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST,           RECOVERY_HEART,          {},                                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[FOREST_TEMPLE_MAP_CHEST]                                     = ItemLocation::Chest      (RC_FOREST_TEMPLE_MAP_CHEST,                                      0x03, 0x01, "Forest Temple Map Chest",                              FOREST_TEMPLE_MAP_CHEST,                               FOREST_TEMPLE_MAP,       {Category::cVanillaMap},                                               SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[FOREST_TEMPLE_WELL_CHEST]                                    = ItemLocation::Chest      (RC_FOREST_TEMPLE_WELL_CHEST,                                     0x03, 0x09, "Forest Temple Well Chest",                             FOREST_TEMPLE_WELL_CHEST,                              FOREST_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST]                    = ItemLocation::Chest      (RC_FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST,                     0x03, 0x07, "Forest Temple Falling Ceiling Room Chest",             FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST,              ARROWS_10,               {},                                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[FOREST_TEMPLE_EYE_SWITCH_CHEST]                              = ItemLocation::Chest      (RC_FOREST_TEMPLE_EYE_SWITCH_CHEST,                               0x03, 0x04, "Forest Temple Eye Switch Chest",                       FOREST_TEMPLE_EYE_SWITCH_CHEST,                        ARROWS_30,               {},                                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[FOREST_TEMPLE_BOSS_KEY_CHEST]                                = ItemLocation::Chest      (RC_FOREST_TEMPLE_BOSS_KEY_CHEST,                                 0x03, 0x0E, "Forest Temple Boss Key Chest",                         FOREST_TEMPLE_BOSS_KEY_CHEST,                          FOREST_TEMPLE_BOSS_KEY,  {Category::cVanillaBossKey},                                           SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[FOREST_TEMPLE_FLOORMASTER_CHEST]                             = ItemLocation::Chest      (RC_FOREST_TEMPLE_FLOORMASTER_CHEST,                              0x03, 0x02, "Forest Temple Floormaster Chest",                      FOREST_TEMPLE_FLOORMASTER_CHEST,                       FOREST_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[FOREST_TEMPLE_BOW_CHEST]                                     = ItemLocation::Chest      (RC_FOREST_TEMPLE_BOW_CHEST,                                      0x03, 0x0C, "Forest Temple Bow Chest",                              FOREST_TEMPLE_BOW_CHEST,                               PROGRESSIVE_BOW,         {},                                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[FOREST_TEMPLE_RED_POE_CHEST]                                 = ItemLocation::Chest      (RC_FOREST_TEMPLE_RED_POE_CHEST,                                  0x03, 0x0D, "Forest Temple Red Poe Chest",                          FOREST_TEMPLE_RED_POE_CHEST,                           FOREST_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[FOREST_TEMPLE_BLUE_POE_CHEST]                                = ItemLocation::Chest      (RC_FOREST_TEMPLE_BLUE_POE_CHEST,                                 0x03, 0x0F, "Forest Temple Blue Poe Chest",                         FOREST_TEMPLE_BLUE_POE_CHEST,                          FOREST_TEMPLE_COMPASS,   {Category::cVanillaCompass},                                           SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[FOREST_TEMPLE_BASEMENT_CHEST]                                = ItemLocation::Chest      (RC_FOREST_TEMPLE_BASEMENT_CHEST,                                 0x03, 0x0B, "Forest Temple Basement Chest",                         FOREST_TEMPLE_BASEMENT_CHEST,                          ARROWS_5,                {},                                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    //Forest Temple MQ
-    locationTable[FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST]                           = ItemLocation::Chest      (RC_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST,                            0x03, 0x03, "Forest Temple MQ First Room Chest",                    FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST,                     FOREST_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[FOREST_TEMPLE_MQ_WOLFOS_CHEST]                               = ItemLocation::Chest      (RC_FOREST_TEMPLE_MQ_WOLFOS_CHEST,                                0x03, 0x00, "Forest Temple MQ Wolfos Chest",                        FOREST_TEMPLE_MQ_WOLFOS_CHEST,                         FOREST_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[FOREST_TEMPLE_MQ_BOW_CHEST]                                  = ItemLocation::Chest      (RC_FOREST_TEMPLE_MQ_BOW_CHEST,                                   0x03, 0x0C, "Forest Temple MQ Bow Chest",                           FOREST_TEMPLE_MQ_BOW_CHEST,                            PROGRESSIVE_BOW,         {},                                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST]        = ItemLocation::Chest      (RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST,         0x03, 0x01, "Forest Temple MQ Raised Island Courtyard Lower Chest", FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST,  FOREST_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST]        = ItemLocation::Chest      (RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST,         0x03, 0x05, "Forest Temple MQ Raised Island Courtyard Upper Chest", FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST,  FOREST_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[FOREST_TEMPLE_MQ_WELL_CHEST]                                 = ItemLocation::Chest      (RC_FOREST_TEMPLE_MQ_WELL_CHEST,                                  0x03, 0x09, "Forest Temple MQ Well Chest",                          FOREST_TEMPLE_MQ_WELL_CHEST,                           FOREST_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[FOREST_TEMPLE_MQ_MAP_CHEST]                                  = ItemLocation::Chest      (RC_FOREST_TEMPLE_MQ_MAP_CHEST,                                   0x03, 0x0D, "Forest Temple MQ Map Chest",                           FOREST_TEMPLE_MQ_MAP_CHEST,                            FOREST_TEMPLE_MAP,       {Category::cVanillaMap},                                               SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[FOREST_TEMPLE_MQ_COMPASS_CHEST]                              = ItemLocation::Chest      (RC_FOREST_TEMPLE_MQ_COMPASS_CHEST,                               0x03, 0x0F, "Forest Temple MQ Compass Chest",                       FOREST_TEMPLE_MQ_COMPASS_CHEST,                        FOREST_TEMPLE_COMPASS,   {Category::cVanillaCompass},                                           SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST]                 = ItemLocation::Chest      (RC_FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST,                  0x03, 0x06, "Forest Temple MQ Falling Ceiling Room Chest",          FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST,           ARROWS_5,                {},                                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[FOREST_TEMPLE_MQ_BASEMENT_CHEST]                             = ItemLocation::Chest      (RC_FOREST_TEMPLE_MQ_BASEMENT_CHEST,                              0x03, 0x0B, "Forest Temple MQ Basement Chest",                      FOREST_TEMPLE_MQ_BASEMENT_CHEST,                       ARROWS_5,                {},                                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[FOREST_TEMPLE_MQ_REDEAD_CHEST]                               = ItemLocation::Chest      (RC_FOREST_TEMPLE_MQ_REDEAD_CHEST,                                0x03, 0x02, "Forest Temple MQ Redead Chest",                        FOREST_TEMPLE_MQ_REDEAD_CHEST,                         FOREST_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[FOREST_TEMPLE_MQ_BOSS_KEY_CHEST]                             = ItemLocation::Chest      (RC_FOREST_TEMPLE_MQ_BOSS_KEY_CHEST,                              0x03, 0x0E, "Forest Temple MQ Boss Key Chest",                      FOREST_TEMPLE_MQ_BOSS_KEY_CHEST,                       FOREST_TEMPLE_BOSS_KEY,  {Category::cVanillaBossKey},                                           SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-
-    //Fire Temple Vanilla
-    locationTable[FIRE_TEMPLE_NEAR_BOSS_CHEST]                                 = ItemLocation::Chest      (RC_FIRE_TEMPLE_NEAR_BOSS_CHEST,                                  0x04, 0x01, "Fire Temple Near Boss Chest",                        FIRE_TEMPLE_NEAR_BOSS_CHEST,                     FIRE_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[FIRE_TEMPLE_FLARE_DANCER_CHEST]                              = ItemLocation::Chest      (RC_FIRE_TEMPLE_FLARE_DANCER_CHEST,                               0x04, 0x00, "Fire Temple Flare Dancer Chest",                     FIRE_TEMPLE_FLARE_DANCER_CHEST,                  BOMBS_10,              {},                                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[FIRE_TEMPLE_BOSS_KEY_CHEST]                                  = ItemLocation::Chest      (RC_FIRE_TEMPLE_BOSS_KEY_CHEST,                                   0x04, 0x0C, "Fire Temple Boss Key Chest",                         FIRE_TEMPLE_BOSS_KEY_CHEST,                      FIRE_TEMPLE_BOSS_KEY,  {Category::cVanillaBossKey},                                                     SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST]                = ItemLocation::Chest      (RC_FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST,                 0x04, 0x02, "Fire Temple Big Lava Room Blocked Door Chest",       FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST,    FIRE_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST]             = ItemLocation::Chest      (RC_FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST,              0x04, 0x04, "Fire Temple Big Lava Room Lower Open Door Chest",    FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST, FIRE_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST]                        = ItemLocation::Chest      (RC_FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST,                         0x04, 0x03, "Fire Temple Boulder Maze Lower Chest",               FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST,            FIRE_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST]                        = ItemLocation::Chest      (RC_FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST,                         0x04, 0x06, "Fire Temple Boulder Maze Upper Chest",               FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST,            FIRE_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST]                    = ItemLocation::Chest      (RC_FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST,                     0x04, 0x08, "Fire Temple Boulder Maze Side Room Chest",           FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST,        FIRE_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST]                     = ItemLocation::Chest      (RC_FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST,                      0x04, 0x0B, "Fire Temple Boulder Maze Shortcut Chest",            FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST,         FIRE_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[FIRE_TEMPLE_SCARECROW_CHEST]                                 = ItemLocation::Chest      (RC_FIRE_TEMPLE_SCARECROW_CHEST,                                  0x04, 0x0D, "Fire Temple Scarecrow Chest",                        FIRE_TEMPLE_SCARECROW_CHEST,                     HUGE_RUPEE,            {},                                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[FIRE_TEMPLE_MAP_CHEST]                                       = ItemLocation::Chest      (RC_FIRE_TEMPLE_MAP_CHEST,                                        0x04, 0x0A, "Fire Temple Map Chest",                              FIRE_TEMPLE_MAP_CHEST,                           FIRE_TEMPLE_MAP,       {Category::cVanillaMap},                                                         SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[FIRE_TEMPLE_COMPASS_CHEST]                                   = ItemLocation::Chest      (RC_FIRE_TEMPLE_COMPASS_CHEST,                                    0x04, 0x07, "Fire Temple Compass Chest",                          FIRE_TEMPLE_COMPASS_CHEST,                       FIRE_TEMPLE_COMPASS,   {Category::cVanillaCompass},                                                     SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[FIRE_TEMPLE_HIGHEST_GORON_CHEST]                             = ItemLocation::Chest      (RC_FIRE_TEMPLE_HIGHEST_GORON_CHEST,                              0x04, 0x09, "Fire Temple Highest Goron Chest",                    FIRE_TEMPLE_HIGHEST_GORON_CHEST,                 FIRE_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[FIRE_TEMPLE_MEGATON_HAMMER_CHEST]                            = ItemLocation::Chest      (RC_FIRE_TEMPLE_MEGATON_HAMMER_CHEST,                             0x04, 0x05, "Fire Temple Megaton Hammer Chest",                   FIRE_TEMPLE_MEGATON_HAMMER_CHEST,                MEGATON_HAMMER,        {},                                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    //Fire Temple MQ
-    locationTable[FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST]                              = ItemLocation::Chest      (RC_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST,                               0x04, 0x07, "Fire Temple MQ Near Boss Chest",                     FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST,                  FIRE_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST]                         = ItemLocation::Chest      (RC_FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST,                          0x04, 0x00, "Fire Temple MQ Megaton Hammer Chest",                FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST,             MEGATON_HAMMER,        {},                                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[FIRE_TEMPLE_MQ_COMPASS_CHEST]                                = ItemLocation::Chest      (RC_FIRE_TEMPLE_MQ_COMPASS_CHEST,                                 0x04, 0x0B, "Fire Temple MQ Compass Chest",                       FIRE_TEMPLE_MQ_COMPASS_CHEST,                    FIRE_TEMPLE_COMPASS,   {Category::cVanillaCompass},                                                     SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST]                    = ItemLocation::Chest      (RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST,                     0x04, 0x03, "Fire Temple MQ Lizalfos Maze Lower Chest",           FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST,        BOMBS_10,              {},                                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST]                    = ItemLocation::Chest      (RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST,                     0x04, 0x06, "Fire Temple MQ Lizalfos Maze Upper Chest",           FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST,        BOMBS_10,              {},                                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[FIRE_TEMPLE_MQ_CHEST_ON_FIRE]                                = ItemLocation::Chest      (RC_FIRE_TEMPLE_MQ_CHEST_ON_FIRE,                                 0x04, 0x05, "Fire Temple MQ Chest on Fire",                       FIRE_TEMPLE_MQ_CHEST_ON_FIRE,                    FIRE_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST]                          = ItemLocation::Chest      (RC_FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST,                           0x04, 0x02, "Fire Temple MQ Map Room Side Chest",                 FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST,              HYLIAN_SHIELD,         {},                                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[FIRE_TEMPLE_MQ_MAP_CHEST]                                    = ItemLocation::Chest      (RC_FIRE_TEMPLE_MQ_MAP_CHEST,                                     0x04, 0x0C, "Fire Temple MQ Map Chest",                           FIRE_TEMPLE_MQ_MAP_CHEST,                        FIRE_TEMPLE_MAP,       {Category::cVanillaMap},                                                         SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[FIRE_TEMPLE_MQ_BOSS_KEY_CHEST]                               = ItemLocation::Chest      (RC_FIRE_TEMPLE_MQ_BOSS_KEY_CHEST,                                0x04, 0x04, "Fire Temple MQ Boss Key Chest",                      FIRE_TEMPLE_MQ_BOSS_KEY_CHEST,                   FIRE_TEMPLE_BOSS_KEY,  {Category::cVanillaBossKey},                                                     SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST]             = ItemLocation::Chest      (RC_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST,              0x04, 0x01, "Fire Temple MQ Big Lava Room Blocked Door Chest",    FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST, FIRE_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST]                = ItemLocation::Chest      (RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST,                 0x04, 0x08, "Fire Temple MQ Lizalfos Maze Side Room Chest",       FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST,    FIRE_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[FIRE_TEMPLE_MQ_FREESTANDING_KEY]                             = ItemLocation::Collectable(RC_FIRE_TEMPLE_MQ_FREESTANDING_KEY,                              0x04, 0x1C, "Fire Temple MQ Freestanding Key",                    FIRE_TEMPLE_MQ_FREESTANDING_KEY,                 FIRE_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-
-    //Water Temple Vanilla
-    locationTable[WATER_TEMPLE_MAP_CHEST]                                      = ItemLocation::Chest      (RC_WATER_TEMPLE_MAP_CHEST,                                       0x05, 0x02, "Water Temple Map Chest",                             WATER_TEMPLE_MAP_CHEST,                          WATER_TEMPLE_MAP,       {Category::cVanillaMap},                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[WATER_TEMPLE_COMPASS_CHEST]                                  = ItemLocation::Chest      (RC_WATER_TEMPLE_COMPASS_CHEST,                                   0x05, 0x09, "Water Temple Compass Chest",                         WATER_TEMPLE_COMPASS_CHEST,                      WATER_TEMPLE_COMPASS,   {Category::cVanillaCompass},                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[WATER_TEMPLE_TORCHES_CHEST]                                  = ItemLocation::Chest      (RC_WATER_TEMPLE_TORCHES_CHEST,                                   0x05, 0x01, "Water Temple Torches Chest",                         WATER_TEMPLE_TORCHES_CHEST,                      WATER_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[WATER_TEMPLE_DRAGON_CHEST]                                   = ItemLocation::Chest      (RC_WATER_TEMPLE_DRAGON_CHEST,                                    0x05, 0x0A, "Water Temple Dragon Chest",                          WATER_TEMPLE_DRAGON_CHEST,                       WATER_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST]                       = ItemLocation::Chest      (RC_WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST,                        0x05, 0x08, "Water Temple Central Bow Target Chest",              WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST,           WATER_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[WATER_TEMPLE_CENTRAL_PILLAR_CHEST]                           = ItemLocation::Chest      (RC_WATER_TEMPLE_CENTRAL_PILLAR_CHEST,                            0x05, 0x06, "Water Temple Central Pillar Chest",                  WATER_TEMPLE_CENTRAL_PILLAR_CHEST,               WATER_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[WATER_TEMPLE_CRACKED_WALL_CHEST]                             = ItemLocation::Chest      (RC_WATER_TEMPLE_CRACKED_WALL_CHEST,                              0x05, 0x00, "Water Temple Cracked Wall Chest",                    WATER_TEMPLE_CRACKED_WALL_CHEST,                 WATER_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[WATER_TEMPLE_BOSS_KEY_CHEST]                                 = ItemLocation::Chest      (RC_WATER_TEMPLE_BOSS_KEY_CHEST,                                  0x05, 0x05, "Water Temple Boss Key Chest",                        WATER_TEMPLE_BOSS_KEY_CHEST,                     WATER_TEMPLE_BOSS_KEY,  {Category::cVanillaBossKey},                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[WATER_TEMPLE_LONGSHOT_CHEST]                                 = ItemLocation::Chest      (RC_WATER_TEMPLE_LONGSHOT_CHEST,                                  0x05, 0x07, "Water Temple Longshot Chest",                        WATER_TEMPLE_LONGSHOT_CHEST,                     PROGRESSIVE_HOOKSHOT,   {},                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[WATER_TEMPLE_RIVER_CHEST]                                    = ItemLocation::Chest      (RC_WATER_TEMPLE_RIVER_CHEST,                                     0x05, 0x03, "Water Temple River Chest",                           WATER_TEMPLE_RIVER_CHEST,                        WATER_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    //Water Temple MQ
-    locationTable[WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST]                        = ItemLocation::Chest      (RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST,                         0x05, 0x06, "Water Temple MQ Central Pillar Chest",               WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST,            WATER_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[WATER_TEMPLE_MQ_BOSS_KEY_CHEST]                              = ItemLocation::Chest      (RC_WATER_TEMPLE_MQ_BOSS_KEY_CHEST,                               0x05, 0x05, "Water Temple MQ Boss Key Chest",                     WATER_TEMPLE_MQ_BOSS_KEY_CHEST,                  WATER_TEMPLE_BOSS_KEY,  {Category::cVanillaBossKey},                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[WATER_TEMPLE_MQ_LONGSHOT_CHEST]                              = ItemLocation::Chest      (RC_WATER_TEMPLE_MQ_LONGSHOT_CHEST,                               0x05, 0x00, "Water Temple MQ Longshot Chest",                     WATER_TEMPLE_MQ_LONGSHOT_CHEST,                  PROGRESSIVE_HOOKSHOT,   {},                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[WATER_TEMPLE_MQ_COMPASS_CHEST]                               = ItemLocation::Chest      (RC_WATER_TEMPLE_MQ_COMPASS_CHEST,                                0x05, 0x01, "Water Temple MQ Compass Chest",                      WATER_TEMPLE_MQ_COMPASS_CHEST,                   WATER_TEMPLE_COMPASS,   {Category::cVanillaCompass},                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[WATER_TEMPLE_MQ_MAP_CHEST]                                   = ItemLocation::Chest      (RC_WATER_TEMPLE_MQ_MAP_CHEST,                                    0x05, 0x02, "Water Temple MQ Map Chest",                          WATER_TEMPLE_MQ_MAP_CHEST,                       WATER_TEMPLE_MAP,       {Category::cVanillaMap},                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[WATER_TEMPLE_MQ_FREESTANDING_KEY]                            = ItemLocation::Collectable(RC_WATER_TEMPLE_MQ_FREESTANDING_KEY,                             0x05, 0x01, "Water Temple MQ Freestanding Key",                   WATER_TEMPLE_MQ_FREESTANDING_KEY,                WATER_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-
-    //Spirit Temple Shared
-    locationTable[SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST]                        = ItemLocation::Chest      (RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST,                         0x5C, 0x0B, "Spirit Temple Silver Gauntlets Chest",               SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST,           PROGRESSIVE_STRENGTH,    {},                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST]                           = ItemLocation::Chest      (RC_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST,                            0x5C, 0x09, "Spirit Temple Mirror Shield Chest",                  SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST,              MIRROR_SHIELD,           {},                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    //Spirit Temple Vanilla
-    locationTable[SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST]                            = ItemLocation::Chest      (RC_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST,                             0x06, 0x08, "Spirit Temple Child Bridge Chest",                   SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST,               DEKU_SHIELD,             {},                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST]                     = ItemLocation::Chest      (RC_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST,                      0x06, 0x00, "Spirit Temple Child Early Torches Chest",            SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST,        SPIRIT_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[SPIRIT_TEMPLE_COMPASS_CHEST]                                 = ItemLocation::Chest      (RC_SPIRIT_TEMPLE_COMPASS_CHEST,                                  0x06, 0x04, "Spirit Temple Compass Chest",                        SPIRIT_TEMPLE_COMPASS_CHEST,                    SPIRIT_TEMPLE_COMPASS,   {Category::cVanillaCompass},                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST]                       = ItemLocation::Chest      (RC_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST,                        0x06, 0x07, "Spirit Temple Early Adult Right Chest",              SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST,          SPIRIT_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST]                       = ItemLocation::Chest      (RC_SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST,                        0x06, 0x0D, "Spirit Temple First Mirror Left Chest",              SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST,          ICE_TRAP,                {},                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST]                      = ItemLocation::Chest      (RC_SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST,                       0x06, 0x0E, "Spirit Temple First Mirror Right Chest",             SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST,         RECOVERY_HEART,          {},                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[SPIRIT_TEMPLE_MAP_CHEST]                                     = ItemLocation::Chest      (RC_SPIRIT_TEMPLE_MAP_CHEST,                                      0x06, 0x03, "Spirit Temple Map Chest",                            SPIRIT_TEMPLE_MAP_CHEST,                        SPIRIT_TEMPLE_MAP,       {Category::cVanillaMap},                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST]                       = ItemLocation::Chest      (RC_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST,                        0x06, 0x06, "Spirit Temple Child Climb North Chest",              SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST,          BOMBCHU_10,              {},                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST]                        = ItemLocation::Chest      (RC_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST,                         0x06, 0x0C, "Spirit Temple Child Climb East Chest",               SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST,           DEKU_SHIELD,             {},                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST]                          = ItemLocation::Chest      (RC_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST,                           0x06, 0x01, "Spirit Temple Sun Block Room Chest",                 SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST,             SPIRIT_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST]                        = ItemLocation::Chest      (RC_SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST,                         0x06, 0x02, "Spirit Temple Statue Room Hand Chest",               SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST,           SPIRIT_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST]                   = ItemLocation::Chest      (RC_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST,                    0x06, 0x0F, "Spirit Temple Statue Room Northeast Chest",          SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST,      BLUE_RUPEE,              {},                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST]                         = ItemLocation::Chest      (RC_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST,                          0x06, 0x05, "Spirit Temple Near Four Armos Chest",                SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST,            SPIRIT_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST]                 = ItemLocation::Chest      (RC_SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST,                  0x06, 0x14, "Spirit Temple Hallway Right Invisible Chest",        SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST,    RECOVERY_HEART,          {},                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST]                  = ItemLocation::Chest      (RC_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST,                   0x06, 0x15, "Spirit Temple Hallway Left Invisible Chest",         SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST,     RECOVERY_HEART,          {},                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[SPIRIT_TEMPLE_BOSS_KEY_CHEST]                                = ItemLocation::Chest      (RC_SPIRIT_TEMPLE_BOSS_KEY_CHEST,                                 0x06, 0x0A, "Spirit Temple Boss Key Chest",                       SPIRIT_TEMPLE_BOSS_KEY_CHEST,                   SPIRIT_TEMPLE_BOSS_KEY,  {Category::cVanillaBossKey},                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[SPIRIT_TEMPLE_TOPMOST_CHEST]                                 = ItemLocation::Chest      (RC_SPIRIT_TEMPLE_TOPMOST_CHEST,                                  0x06, 0x12, "Spirit Temple Topmost Chest",                        SPIRIT_TEMPLE_TOPMOST_CHEST,                    BOMBS_20,                {},                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    //Spirit Temple MQ
-    locationTable[SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST]                  = ItemLocation::Chest      (RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST,                   0x06, 0x1A, "Spirit Temple MQ Entrance Front Left Chest",         SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST,     BOMBCHU_10,              {},                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST]                  = ItemLocation::Chest      (RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST,                   0x06, 0x1F, "Spirit Temple MQ Entrance Back Right Chest",         SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST,     BOMBCHU_10,              {},                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST]                 = ItemLocation::Chest      (RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST,                  0x06, 0x1B, "Spirit Temple MQ Entrance Front Right Chest",        SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST,    SPIRIT_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST]                   = ItemLocation::Chest      (RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST,                    0x06, 0x1E, "Spirit Temple MQ Entrance Back Left Chest",          SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST,      SPIRIT_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST]                  = ItemLocation::Chest      (RC_SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST,                   0x06, 0x1D, "Spirit Temple MQ Child Hammer Switch Chest",         SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST,     SPIRIT_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[SPIRIT_TEMPLE_MQ_MAP_CHEST]                                  = ItemLocation::Chest      (RC_SPIRIT_TEMPLE_MQ_MAP_CHEST,                                   0x06, 0x00, "Spirit Temple MQ Map Chest",                         SPIRIT_TEMPLE_MQ_MAP_CHEST,                     SPIRIT_TEMPLE_MAP,       {Category::cVanillaMap},                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST]                       = ItemLocation::Chest      (RC_SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST,                        0x06, 0x08, "Spirit Temple MQ Map Room Enemy Chest",              SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST,          SPIRIT_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST]                    = ItemLocation::Chest      (RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST,                     0x06, 0x06, "Spirit Temple MQ Child Climb North Chest",           SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST,       BOMBCHU_10,              {},                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST]                    = ItemLocation::Chest      (RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST,                     0x06, 0x0C, "Spirit Temple MQ Child Climb South Chest",           SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST,       SPIRIT_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[SPIRIT_TEMPLE_MQ_COMPASS_CHEST]                              = ItemLocation::Chest      (RC_SPIRIT_TEMPLE_MQ_COMPASS_CHEST,                               0x06, 0x03, "Spirit Temple MQ Compass Chest",                     SPIRIT_TEMPLE_MQ_COMPASS_CHEST,                 SPIRIT_TEMPLE_COMPASS,   {Category::cVanillaCompass},                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST]                  = ItemLocation::Chest      (RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST,                   0x06, 0x0F, "Spirit Temple MQ Statue Room Lullaby Chest",         SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST,     BLUE_RUPEE,              {},                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST]                = ItemLocation::Chest      (RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST,                 0x06, 0x02, "Spirit Temple MQ Statue Room Invisible Chest",       SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST,   RECOVERY_HEART,          {},                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST]                 = ItemLocation::Chest      (RC_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST,                  0x06, 0x1C, "Spirit Temple MQ Silver Block Hallway Chest",        SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST,    SPIRIT_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST]                       = ItemLocation::Chest      (RC_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST,                        0x06, 0x01, "Spirit Temple MQ Sun Block Room Chest",              SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST,          RECOVERY_HEART,          {},                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST]                        = ItemLocation::Chest      (RC_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST,                         0x06, 0x07, "Spirit Temple MQ Symphony Room Chest",               SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST,           PURPLE_RUPEE,            {},                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST]                          = ItemLocation::Chest      (RC_SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST,                           0x06, 0x04, "Spirit Temple MQ Leever Room Chest",                 SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST,             PURPLE_RUPEE,            {},                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST]                          = ItemLocation::Chest      (RC_SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST,                           0x06, 0x19, "Spirit Temple MQ Beamos Room Chest",                 SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST,             RECOVERY_HEART,          {},                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST]                         = ItemLocation::Chest      (RC_SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST,                          0x06, 0x18, "Spirit Temple MQ Chest Switch Chest",                SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST,            ICE_TRAP,                {},                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST]                             = ItemLocation::Chest      (RC_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST,                              0x06, 0x05, "Spirit Temple MQ Boss Key Chest",                    SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST,                SPIRIT_TEMPLE_BOSS_KEY,  {Category::cVanillaBossKey},                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST]              = ItemLocation::Chest      (RC_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST,               0x06, 0x12, "Spirit Temple MQ Mirror Puzzle Invisible Chest",     SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST, SPIRIT_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-
-    //Shadow Temple Vanilla
-    locationTable[SHADOW_TEMPLE_MAP_CHEST]                                     = ItemLocation::Chest      (RC_SHADOW_TEMPLE_MAP_CHEST,                                      0x07, 0x01, "Shadow Temple Map Chest",                            SHADOW_TEMPLE_MAP_CHEST,                           SHADOW_TEMPLE_MAP,       {Category::cVanillaMap},                                                     SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[SHADOW_TEMPLE_HOVER_BOOTS_CHEST]                             = ItemLocation::Chest      (RC_SHADOW_TEMPLE_HOVER_BOOTS_CHEST,                              0x07, 0x07, "Shadow Temple Hover Boots Chest",                    SHADOW_TEMPLE_HOVER_BOOTS_CHEST,                   HOVER_BOOTS,             {},                                                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[SHADOW_TEMPLE_COMPASS_CHEST]                                 = ItemLocation::Chest      (RC_SHADOW_TEMPLE_COMPASS_CHEST,                                  0x07, 0x03, "Shadow Temple Compass Chest",                        SHADOW_TEMPLE_COMPASS_CHEST,                       SHADOW_TEMPLE_COMPASS,   {Category::cVanillaCompass},                                                 SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST]                      = ItemLocation::Chest      (RC_SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST,                       0x07, 0x02, "Shadow Temple Early Silver Rupee Chest",             SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST,            SHADOW_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                                SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST]                = ItemLocation::Chest      (RC_SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST,                 0x07, 0x0C, "Shadow Temple Invisible Blades Visible Chest",       SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST,      BLUE_RUPEE,              {},                                                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST]              = ItemLocation::Chest      (RC_SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST,               0x07, 0x16, "Shadow Temple Invisible Blades Invisible Chest",     SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST,    ARROWS_30,               {},                                                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST]                    = ItemLocation::Chest      (RC_SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST,                     0x07, 0x05, "Shadow Temple Falling Spikes Lower Chest",           SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST,          ARROWS_10,               {},                                                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST]                    = ItemLocation::Chest      (RC_SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST,                     0x07, 0x06, "Shadow Temple Falling Spikes Upper Chest",           SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST,          BLUE_RUPEE,              {},                                                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST]                   = ItemLocation::Chest      (RC_SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST,                    0x07, 0x04, "Shadow Temple Falling Spikes Switch Chest",          SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST,         SHADOW_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                                SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST]                        = ItemLocation::Chest      (RC_SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST,                         0x07, 0x09, "Shadow Temple Invisible Spikes Chest",               SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST,              BLUE_RUPEE,              {},                                                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[SHADOW_TEMPLE_WIND_HINT_CHEST]                               = ItemLocation::Chest      (RC_SHADOW_TEMPLE_WIND_HINT_CHEST,                                0x07, 0x15, "Shadow Temple Wind Hint Chest",                      SHADOW_TEMPLE_WIND_HINT_CHEST,                     ARROWS_10,               {},                                                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST]                        = ItemLocation::Chest      (RC_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST,                         0x07, 0x08, "Shadow Temple After Wind Enemy Chest",               SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST,              BLUE_RUPEE,              {},                                                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST]                       = ItemLocation::Chest      (RC_SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST,                        0x07, 0x14, "Shadow Temple After Wind Hidden Chest",              SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST,             SHADOW_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                                SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST]                        = ItemLocation::Chest      (RC_SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST,                         0x07, 0x0A, "Shadow Temple Spike Walls Left Chest",               SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST,              BLUE_RUPEE,              {},                                                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[SHADOW_TEMPLE_BOSS_KEY_CHEST]                                = ItemLocation::Chest      (RC_SHADOW_TEMPLE_BOSS_KEY_CHEST,                                 0x07, 0x0B, "Shadow Temple Boss Key Chest",                       SHADOW_TEMPLE_BOSS_KEY_CHEST,                      SHADOW_TEMPLE_BOSS_KEY,  {Category::cVanillaBossKey},                                                 SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST]                   = ItemLocation::Chest      (RC_SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST,                    0x07, 0x0D, "Shadow Temple Invisible Floormaster Chest",          SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST,         SHADOW_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                                SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[SHADOW_TEMPLE_FREESTANDING_KEY]                              = ItemLocation::Collectable(RC_SHADOW_TEMPLE_FREESTANDING_KEY,                               0x07, 0x01, "Shadow Temple Freestanding Key",                     SHADOW_TEMPLE_FREESTANDING_KEY,                    SHADOW_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                                SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    //Shadow Temple MQ
-    locationTable[SHADOW_TEMPLE_MQ_COMPASS_CHEST]                              = ItemLocation::Chest      (RC_SHADOW_TEMPLE_MQ_COMPASS_CHEST,                               0x07, 0x01, "Shadow Temple MQ Compass Chest",                     SHADOW_TEMPLE_MQ_COMPASS_CHEST,                    SHADOW_TEMPLE_COMPASS,   {Category::cVanillaCompass},                                                 SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST]                          = ItemLocation::Chest      (RC_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST,                           0x07, 0x07, "Shadow Temple MQ Hover Boots Chest",                 SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST,                HOVER_BOOTS,             {},                                                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST]                         = ItemLocation::Chest      (RC_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST,                          0x07, 0x03, "Shadow Temple MQ Early Gibdos Chest",                SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST,               SHADOW_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                                SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[SHADOW_TEMPLE_MQ_MAP_CHEST]                                  = ItemLocation::Chest      (RC_SHADOW_TEMPLE_MQ_MAP_CHEST,                                   0x07, 0x02, "Shadow Temple MQ Map Chest",                         SHADOW_TEMPLE_MQ_MAP_CHEST,                        SHADOW_TEMPLE_MAP,       {Category::cVanillaMap},                                                     SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST]                 = ItemLocation::Chest      (RC_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST,                  0x07, 0x0F, "Shadow Temple MQ Beamos Silver Rupees Chest",        SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST,       ARROWS_5,                {},                                                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST]                = ItemLocation::Chest      (RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST,                 0x07, 0x04, "Shadow Temple MQ Falling Spikes Switch Chest",       SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST,      SHADOW_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                                SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST]                 = ItemLocation::Chest      (RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST,                  0x07, 0x05, "Shadow Temple MQ Falling Spikes Lower Chest",        SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST,       ARROWS_10,               {},                                                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST]                 = ItemLocation::Chest      (RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST,                  0x07, 0x06, "Shadow Temple MQ Falling Spikes Upper Chest",        SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST,       ARROWS_5,                {},                                                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST]                     = ItemLocation::Chest      (RC_SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST,                      0x07, 0x09, "Shadow Temple MQ Invisible Spikes Chest",            SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST,           BLUE_RUPEE,              {},                                                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST]                             = ItemLocation::Chest      (RC_SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST,                              0x07, 0x0B, "Shadow Temple MQ Boss Key Chest",                    SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST,                   SHADOW_TEMPLE_BOSS_KEY,  {Category::cVanillaBossKey},                                                 SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST]                     = ItemLocation::Chest      (RC_SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST,                      0x07, 0x0A, "Shadow Temple MQ Spike Walls Left Chest",            SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST,           BLUE_RUPEE,              {},                                                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST]                         = ItemLocation::Chest      (RC_SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST,                          0x07, 0x10, "Shadow Temple MQ Stalfos Room Chest",                SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST,               RED_RUPEE,               {},                                                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST]           = ItemLocation::Chest      (RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST,            0x07, 0x16, "Shadow Temple MQ Invisible Blades Invisible Chest",  SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST, SHADOW_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                                SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST]             = ItemLocation::Chest      (RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST,              0x07, 0x0C, "Shadow Temple MQ Invisible Blades Visible Chest",    SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST,   BLUE_RUPEE,              {},                                                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST]                          = ItemLocation::Chest      (RC_SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST,                           0x07, 0x0D, "Shadow Temple MQ Bomb Flower Chest",                 SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST,                ARROWS_10,               {},                                                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[SHADOW_TEMPLE_MQ_WIND_HINT_CHEST]                            = ItemLocation::Chest      (RC_SHADOW_TEMPLE_MQ_WIND_HINT_CHEST,                             0x07, 0x15, "Shadow Temple MQ Wind Hint Chest",                   SHADOW_TEMPLE_MQ_WIND_HINT_CHEST,                  SHADOW_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                                SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST]                    = ItemLocation::Chest      (RC_SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST,                     0x07, 0x14, "Shadow Temple MQ After Wind Hidden Chest",           SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST,          ARROWS_5,                {},                                                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST]                     = ItemLocation::Chest      (RC_SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST,                      0x07, 0x08, "Shadow Temple MQ After Wind Enemy Chest",            SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST,           BLUE_RUPEE,              {},                                                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST]                  = ItemLocation::Chest      (RC_SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST,                   0x07, 0x0E, "Shadow Temple MQ Near Ship Invisible Chest",         SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST,        SHADOW_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                                SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[SHADOW_TEMPLE_MQ_FREESTANDING_KEY]                           = ItemLocation::Collectable(RC_SHADOW_TEMPLE_MQ_FREESTANDING_KEY,                            0x07, 0x06, "Shadow Temple MQ Freestanding Key",                  SHADOW_TEMPLE_MQ_FREESTANDING_KEY,                 SHADOW_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey},                                                SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-
-    //Bottom of the Well Vanilla
-    locationTable[BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST]               = ItemLocation::Chest      (RC_BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST,                0x08, 0x08, "Bottom of the Well Front Left Fake Wall Chest",         BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST,          BOTTOM_OF_THE_WELL_SMALL_KEY, {Category::cVanillaSmallKey},                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST]              = ItemLocation::Chest      (RC_BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST,               0x08, 0x02, "Bottom of the Well Front Center Bombable Chest",        BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST,         BOMBCHU_10,                   {},                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST]             = ItemLocation::Chest      (RC_BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST,              0x08, 0x05, "Bottom of the Well Right Bottom Fake Wall Chest",       BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST,        BOTTOM_OF_THE_WELL_SMALL_KEY, {Category::cVanillaSmallKey},                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[BOTTOM_OF_THE_WELL_COMPASS_CHEST]                            = ItemLocation::Chest      (RC_BOTTOM_OF_THE_WELL_COMPASS_CHEST,                             0x08, 0x01, "Bottom of the Well Compass Chest",                      BOTTOM_OF_THE_WELL_COMPASS_CHEST,                       BOTTOM_OF_THE_WELL_COMPASS,   {Category::cVanillaCompass},                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST]                   = ItemLocation::Chest      (RC_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST,                    0x08, 0x0E, "Bottom of the Well Center Skulltula Chest",             BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST,              DEKU_NUTS_5,                  {},                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST]                 = ItemLocation::Chest      (RC_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST,                  0x08, 0x04, "Bottom of the Well Back Left Bombable Chest",           BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST,            DEKU_NUTS_10,                 {},                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST]                      = ItemLocation::Chest      (RC_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST,                       0x08, 0x03, "Bottom of the Well Lens of Truth Chest",                BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST,                 LENS_OF_TRUTH,                {Category::cSongDungeonReward},                                 SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[BOTTOM_OF_THE_WELL_INVISIBLE_CHEST]                          = ItemLocation::Chest      (RC_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST,                           0x08, 0x14, "Bottom of the Well Invisible Chest",                    BOTTOM_OF_THE_WELL_INVISIBLE_CHEST,                     HUGE_RUPEE,                   {},                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST]                   = ItemLocation::Chest      (RC_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST,                    0x08, 0x10, "Bottom of the Well Underwater Front Chest",             BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST,              BOMBS_10,                     {},                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST]                    = ItemLocation::Chest      (RC_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST,                     0x08, 0x09, "Bottom of the Well Underwater Left Chest",              BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST,               RECOVERY_HEART,               {},                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[BOTTOM_OF_THE_WELL_MAP_CHEST]                                = ItemLocation::Chest      (RC_BOTTOM_OF_THE_WELL_MAP_CHEST,                                 0x08, 0x07, "Bottom of the Well Map Chest",                          BOTTOM_OF_THE_WELL_MAP_CHEST,                           BOTTOM_OF_THE_WELL_MAP,       {Category::cVanillaMap},                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST]                         = ItemLocation::Chest      (RC_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST,                          0x08, 0x0A, "Bottom of the Well Fire Keese Chest",                   BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST,                    DEKU_SHIELD,                  {},                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST]                          = ItemLocation::Chest      (RC_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST,                           0x08, 0x0C, "Bottom of the Well Like Like Chest",                    BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST,                     HYLIAN_SHIELD,                {},                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[BOTTOM_OF_THE_WELL_FREESTANDING_KEY]                         = ItemLocation::Collectable(RC_BOTTOM_OF_THE_WELL_FREESTANDING_KEY,                          0x08, 0x01, "Bottom of the Well Freestanding Key",                   BOTTOM_OF_THE_WELL_FREESTANDING_KEY,                    BOTTOM_OF_THE_WELL_SMALL_KEY, {Category::cVanillaSmallKey},                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    //Bottom of the Well MQBottomOfTheWell]
-    locationTable[BOTTOM_OF_THE_WELL_MQ_MAP_CHEST]                             = ItemLocation::Chest      (RC_BOTTOM_OF_THE_WELL_MQ_MAP_CHEST,                              0x08, 0x03, "Bottom of the Well MQ Map Chest",                       BOTTOM_OF_THE_WELL_MQ_MAP_CHEST,                        BOTTOM_OF_THE_WELL_MAP,       {Category::cVanillaMap},                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST]                   = ItemLocation::Chest      (RC_BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST,                    0x08, 0x01, "Bottom of the Well MQ Lens of Truth Chest",             BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST,              LENS_OF_TRUTH,                {Category::cSongDungeonReward},                                 SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST]                         = ItemLocation::Chest      (RC_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST,                          0x08, 0x02, "Bottom of the Well MQ Compass Chest",                   BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST,                    BOTTOM_OF_THE_WELL_COMPASS,   {Category::cVanillaCompass},                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY]            = ItemLocation::Collectable(RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY,             0x08, 0x02, "Bottom of the Well MQ Dead Hand Freestanding Key",      BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY,       BOTTOM_OF_THE_WELL_SMALL_KEY, {Category::cVanillaSmallKey},                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY]      = ItemLocation::Collectable(RC_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY,       0x08, 0x01, "Bottom of the Well MQ East Inner Room Freestanding Key",BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY, BOTTOM_OF_THE_WELL_SMALL_KEY, {Category::cVanillaSmallKey},                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-
-    //Ice Cavern Vanilla
-    locationTable[ICE_CAVERN_MAP_CHEST]                                        = ItemLocation::Chest      (RC_ICE_CAVERN_MAP_CHEST,                                         0x09, 0x00, "Ice Cavern Map Chest",                                  ICE_CAVERN_MAP_CHEST,            ICE_CAVERN_MAP,     {Category::cVanillaMap},                                                                         SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
-    locationTable[ICE_CAVERN_COMPASS_CHEST]                                    = ItemLocation::Chest      (RC_ICE_CAVERN_COMPASS_CHEST,                                     0x09, 0x01, "Ice Cavern Compass Chest",                              ICE_CAVERN_COMPASS_CHEST,        ICE_CAVERN_COMPASS, {Category::cVanillaCompass},                                                                     SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
-    locationTable[ICE_CAVERN_IRON_BOOTS_CHEST]                                 = ItemLocation::Chest      (RC_ICE_CAVERN_IRON_BOOTS_CHEST,                                  0x09, 0x02, "Ice Cavern Iron Boots Chest",                           ICE_CAVERN_IRON_BOOTS_CHEST,     IRON_BOOTS,         {},                                                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
-    locationTable[ICE_CAVERN_FREESTANDING_POH]                                 = ItemLocation::Collectable(RC_ICE_CAVERN_FREESTANDING_POH,                                  0x09, 0x01, "Ice Cavern Freestanding PoH",                           ICE_CAVERN_FREESTANDING_POH,     PIECE_OF_HEART,     {},                                                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
-    //Ice Cavern MQIceCavern]
-    locationTable[ICE_CAVERN_MQ_IRON_BOOTS_CHEST]                              = ItemLocation::Chest      (RC_ICE_CAVERN_MQ_IRON_BOOTS_CHEST,                               0x09, 0x02, "Ice Cavern MQ Iron Boots Chest",                        ICE_CAVERN_MQ_IRON_BOOTS_CHEST,  IRON_BOOTS,         {},                                                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
-    locationTable[ICE_CAVERN_MQ_COMPASS_CHEST]                                 = ItemLocation::Chest      (RC_ICE_CAVERN_MQ_COMPASS_CHEST,                                  0x09, 0x00, "Ice Cavern MQ Compass Chest",                           ICE_CAVERN_MQ_COMPASS_CHEST,     ICE_CAVERN_COMPASS, {Category::cVanillaCompass},                                                                     SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
-    locationTable[ICE_CAVERN_MQ_MAP_CHEST]                                     = ItemLocation::Chest      (RC_ICE_CAVERN_MQ_MAP_CHEST,                                      0x09, 0x01, "Ice Cavern MQ Map Chest",                               ICE_CAVERN_MQ_MAP_CHEST,         ICE_CAVERN_MAP,     {Category::cVanillaMap},                                                                         SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
-    locationTable[ICE_CAVERN_MQ_FREESTANDING_POH]                              = ItemLocation::Collectable(RC_ICE_CAVERN_MQ_FREESTANDING_POH,                               0x09, 0x01, "Ice Cavern MQ Freestanding PoH",                        ICE_CAVERN_MQ_FREESTANDING_POH,  PIECE_OF_HEART,     {},                                                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
-
-    //Gerudo Training Ground Vanilla
-    locationTable[GERUDO_TRAINING_GROUNDS_LOBBY_LEFT_CHEST]                    = ItemLocation::Chest      (RC_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST,                      0x0B, 0x13, "Gerudo Training Grounds Lobby Left Chest",              GERUDO_TRAINING_GROUNDS_LOBBY_LEFT_CHEST,                   BLUE_RUPEE,                        {},                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[GERUDO_TRAINING_GROUNDS_LOBBY_RIGHT_CHEST]                   = ItemLocation::Chest      (RC_GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST,                     0x0B, 0x07, "Gerudo Training Grounds Lobby Right Chest",             GERUDO_TRAINING_GROUNDS_LOBBY_RIGHT_CHEST,                  ARROWS_10,                         {},                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[GERUDO_TRAINING_GROUNDS_STALFOS_CHEST]                       = ItemLocation::Chest      (RC_GERUDO_TRAINING_GROUND_STALFOS_CHEST,                         0x0B, 0x00, "Gerudo Training Grounds Stalfos Chest",                 GERUDO_TRAINING_GROUNDS_STALFOS_CHEST,                      GERUDO_TRAINING_GROUNDS_SMALL_KEY, {Category::cVanillaSmallKey},                          SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[GERUDO_TRAINING_GROUNDS_BEAMOS_CHEST]                        = ItemLocation::Chest      (RC_GERUDO_TRAINING_GROUND_BEAMOS_CHEST,                          0x0B, 0x01, "Gerudo Training Grounds Beamos Chest",                  GERUDO_TRAINING_GROUNDS_BEAMOS_CHEST,                       GERUDO_TRAINING_GROUNDS_SMALL_KEY, {Category::cVanillaSmallKey},                          SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[GERUDO_TRAINING_GROUNDS_HIDDEN_CEILING_CHEST]                = ItemLocation::Chest      (RC_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST,                  0x0B, 0x0B, "Gerudo Training Grounds Hidden Ceiling Chest",          GERUDO_TRAINING_GROUNDS_HIDDEN_CEILING_CHEST,               GERUDO_TRAINING_GROUNDS_SMALL_KEY, {Category::cVanillaSmallKey},                          SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[GERUDO_TRAINING_GROUNDS_MAZE_PATH_FIRST_CHEST]               = ItemLocation::Chest      (RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST,                 0x0B, 0x06, "Gerudo Training Grounds Maze Path First Chest",         GERUDO_TRAINING_GROUNDS_MAZE_PATH_FIRST_CHEST,              PURPLE_RUPEE,                      {},                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[GERUDO_TRAINING_GROUNDS_MAZE_PATH_SECOND_CHEST]              = ItemLocation::Chest      (RC_GERUDO_TRAINING_GROUND_MAZE_PATH_SECOND_CHEST,                0x0B, 0x0A, "Gerudo Training Grounds Maze Path Second Chest",        GERUDO_TRAINING_GROUNDS_MAZE_PATH_SECOND_CHEST,             RED_RUPEE,                         {},                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[GERUDO_TRAINING_GROUNDS_MAZE_PATH_THIRD_CHEST]               = ItemLocation::Chest      (RC_GERUDO_TRAINING_GROUND_MAZE_PATH_THIRD_CHEST,                 0x0B, 0x09, "Gerudo Training Grounds Maze Path Third Chest",         GERUDO_TRAINING_GROUNDS_MAZE_PATH_THIRD_CHEST,              ARROWS_30,                         {},                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[GERUDO_TRAINING_GROUNDS_MAZE_PATH_FINAL_CHEST]               = ItemLocation::Chest      (RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FINAL_CHEST,                 0x0B, 0x0C, "Gerudo Training Grounds Maze Path Final Chest",         GERUDO_TRAINING_GROUNDS_MAZE_PATH_FINAL_CHEST,              ICE_ARROWS,                        {Category::cSongDungeonReward},                        SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[GERUDO_TRAINING_GROUNDS_MAZE_RIGHT_CENTRAL_CHEST]            = ItemLocation::Chest      (RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_CENTRAL_CHEST,              0x0B, 0x05, "Gerudo Training Grounds Maze Right Central Chest",      GERUDO_TRAINING_GROUNDS_MAZE_RIGHT_CENTRAL_CHEST,           BOMBCHU_5,                         {},                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[GERUDO_TRAINING_GROUNDS_MAZE_RIGHT_SIDE_CHEST]               = ItemLocation::Chest      (RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_SIDE_CHEST,                 0x0B, 0x08, "Gerudo Training Grounds Maze Right Side Chest",         GERUDO_TRAINING_GROUNDS_MAZE_RIGHT_SIDE_CHEST,              ARROWS_30,                         {},                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[GERUDO_TRAINING_GROUNDS_UNDERWATER_SILVER_RUPEE_CHEST]       = ItemLocation::Chest      (RC_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST,         0x0B, 0x0D, "Gerudo Training Grounds Underwater Silver Rupee Chest", GERUDO_TRAINING_GROUNDS_UNDERWATER_SILVER_RUPEE_CHEST,      GERUDO_TRAINING_GROUNDS_SMALL_KEY, {Category::cVanillaSmallKey},                          SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[GERUDO_TRAINING_GROUNDS_HAMMER_ROOM_CLEAR_CHEST]             = ItemLocation::Chest      (RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST,               0x0B, 0x12, "Gerudo Training Grounds Hammer Room Clear Chest",       GERUDO_TRAINING_GROUNDS_HAMMER_ROOM_CLEAR_CHEST,            ARROWS_10,                         {},                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[GERUDO_TRAINING_GROUNDS_HAMMER_ROOM_SWITCH_CHEST]            = ItemLocation::Chest      (RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST,              0x0B, 0x10, "Gerudo Training Grounds Hammer Room Switch Chest",      GERUDO_TRAINING_GROUNDS_HAMMER_ROOM_SWITCH_CHEST,           GERUDO_TRAINING_GROUNDS_SMALL_KEY, {Category::cVanillaSmallKey},                          SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[GERUDO_TRAINING_GROUNDS_EYE_STATUE_CHEST]                    = ItemLocation::Chest      (RC_GERUDO_TRAINING_GROUND_EYE_STATUE_CHEST,                      0x0B, 0x03, "Gerudo Training Grounds Eye Statue Chest",              GERUDO_TRAINING_GROUNDS_EYE_STATUE_CHEST,                   GERUDO_TRAINING_GROUNDS_SMALL_KEY, {Category::cVanillaSmallKey},                          SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[GERUDO_TRAINING_GROUNDS_NEAR_SCARECROW_CHEST]                = ItemLocation::Chest      (RC_GERUDO_TRAINING_GROUND_NEAR_SCARECROW_CHEST,                  0x0B, 0x04, "Gerudo Training Grounds Near Scarecrow Chest",          GERUDO_TRAINING_GROUNDS_NEAR_SCARECROW_CHEST,               GERUDO_TRAINING_GROUNDS_SMALL_KEY, {Category::cVanillaSmallKey},                          SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[GERUDO_TRAINING_GROUNDS_BEFORE_HEAVY_BLOCK_CHEST]            = ItemLocation::Chest      (RC_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST,              0x0B, 0x11, "Gerudo Training Grounds Before Heavy Block Chest",      GERUDO_TRAINING_GROUNDS_BEFORE_HEAVY_BLOCK_CHEST,           ARROWS_30,                         {},                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_FIRST_CHEST]             = ItemLocation::Chest      (RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST,               0x0B, 0x0F, "Gerudo Training Grounds Heavy Block First Chest",       GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_FIRST_CHEST,            HUGE_RUPEE,                        {},                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_SECOND_CHEST]            = ItemLocation::Chest      (RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST,              0x0B, 0x0E, "Gerudo Training Grounds Heavy Block Second Chest",      GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_SECOND_CHEST,           BLUE_RUPEE,                        {},                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_THIRD_CHEST]             = ItemLocation::Chest      (RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_THIRD_CHEST,               0x0B, 0x14, "Gerudo Training Grounds Heavy Block Third Chest",       GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_THIRD_CHEST,            GERUDO_TRAINING_GROUNDS_SMALL_KEY, {Category::cVanillaSmallKey},                          SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_FOURTH_CHEST]            = ItemLocation::Chest      (RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FOURTH_CHEST,              0x0B, 0x02, "Gerudo Training Grounds Heavy Block Fourth Chest",      GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_FOURTH_CHEST,           ICE_TRAP,                          {},                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[GERUDO_TRAINING_GROUNDS_FREESTANDING_KEY]                    = ItemLocation::Collectable(RC_GERUDO_TRAINING_GROUND_FREESTANDING_KEY,                      0x0B, 0x01, "Gerudo Training Grounds Freestanding Key",              GERUDO_TRAINING_GROUNDS_FREESTANDING_KEY,                   GERUDO_TRAINING_GROUNDS_SMALL_KEY, {Category::cVanillaSmallKey},                          SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    //Gerudo Training Grounds MQ
-    locationTable[GERUDO_TRAINING_GROUNDS_MQ_LOBBY_RIGHT_CHEST]                = ItemLocation::Chest      (RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST,                  0x0B, 0x07, "Gerudo Training Grounds MQ Lobby Right Chest",          GERUDO_TRAINING_GROUNDS_MQ_LOBBY_RIGHT_CHEST,               BOMBCHU_5,                         {},                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[GERUDO_TRAINING_GROUNDS_MQ_LOBBY_LEFT_CHEST]                 = ItemLocation::Chest      (RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST,                   0x0B, 0x13, "Gerudo Training Grounds MQ Lobby Left Chest",           GERUDO_TRAINING_GROUNDS_MQ_LOBBY_LEFT_CHEST,                ARROWS_10,                         {},                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[GERUDO_TRAINING_GROUNDS_MQ_FIRST_IRON_KNUCKLE_CHEST]         = ItemLocation::Chest      (RC_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST,           0x0B, 0x00, "Gerudo Training Grounds MQ First Iron Knuckle Chest",   GERUDO_TRAINING_GROUNDS_MQ_FIRST_IRON_KNUCKLE_CHEST,        BLUE_RUPEE,                        {},                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[GERUDO_TRAINING_GROUNDS_MQ_BEFORE_HEAVY_BLOCK_CHEST]         = ItemLocation::Chest      (RC_GERUDO_TRAINING_GROUND_MQ_BEFORE_HEAVY_BLOCK_CHEST,           0x0B, 0x11, "Gerudo Training Grounds MQ Before Heavy Block Chest",   GERUDO_TRAINING_GROUNDS_MQ_BEFORE_HEAVY_BLOCK_CHEST,        ARROWS_10,                         {},                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[GERUDO_TRAINING_GROUNDS_MQ_EYE_STATUE_CHEST]                 = ItemLocation::Chest      (RC_GERUDO_TRAINING_GROUND_MQ_EYE_STATUE_CHEST,                   0x0B, 0x03, "Gerudo Training Grounds MQ Eye Statue Chest",           GERUDO_TRAINING_GROUNDS_MQ_EYE_STATUE_CHEST,                BOMBCHU_10,                        {},                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[GERUDO_TRAINING_GROUNDS_MQ_FLAME_CIRCLE_CHEST]               = ItemLocation::Chest      (RC_GERUDO_TRAINING_GROUND_MQ_FLAME_CIRCLE_CHEST,                 0x0B, 0x0E, "Gerudo Training Grounds MQ Flame Circle Chest",         GERUDO_TRAINING_GROUNDS_MQ_FLAME_CIRCLE_CHEST,              GERUDO_TRAINING_GROUNDS_SMALL_KEY, {Category::cVanillaSmallKey},                          SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[GERUDO_TRAINING_GROUNDS_MQ_SECOND_IRON_KNUCKLE_CHEST]        = ItemLocation::Chest      (RC_GERUDO_TRAINING_GROUND_MQ_SECOND_IRON_KNUCKLE_CHEST,          0x0B, 0x12, "Gerudo Training Grounds MQ Second Iron Knuckle Chest",  GERUDO_TRAINING_GROUNDS_MQ_SECOND_IRON_KNUCKLE_CHEST,       ARROWS_10,                         {},                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[GERUDO_TRAINING_GROUNDS_MQ_DINOLFOS_CHEST]                   = ItemLocation::Chest      (RC_GERUDO_TRAINING_GROUND_MQ_DINOLFOS_CHEST,                     0x0B, 0x01, "Gerudo Training Grounds MQ Dinolfos Chest",             GERUDO_TRAINING_GROUNDS_MQ_DINOLFOS_CHEST,                  GERUDO_TRAINING_GROUNDS_SMALL_KEY, {Category::cVanillaSmallKey},                          SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[GERUDO_TRAINING_GROUNDS_MQ_ICE_ARROWS_CHEST]                 = ItemLocation::Chest      (RC_GERUDO_TRAINING_GROUND_MQ_ICE_ARROWS_CHEST,                   0x0B, 0x04, "Gerudo Training Grounds MQ Ice Arrows Chest",           GERUDO_TRAINING_GROUNDS_MQ_ICE_ARROWS_CHEST,                ICE_ARROWS,                        {Category::cSongDungeonReward},                        SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[GERUDO_TRAINING_GROUNDS_MQ_MAZE_RIGHT_CENTRAL_CHEST]         = ItemLocation::Chest      (RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_CENTRAL_CHEST,           0x0B, 0x05, "Gerudo Training Grounds MQ Maze Right Central Chest",   GERUDO_TRAINING_GROUNDS_MQ_MAZE_RIGHT_CENTRAL_CHEST,        BLUE_RUPEE,                        {},                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[GERUDO_TRAINING_GROUNDS_MQ_MAZE_PATH_FIRST_CHEST]            = ItemLocation::Chest      (RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_FIRST_CHEST,              0x0B, 0x06, "Gerudo Training Grounds MQ Maze Path First Chest",      GERUDO_TRAINING_GROUNDS_MQ_MAZE_PATH_FIRST_CHEST,           GREEN_RUPEE,                       {},                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[GERUDO_TRAINING_GROUNDS_MQ_MAZE_RIGHT_SIDE_CHEST]            = ItemLocation::Chest      (RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_SIDE_CHEST,              0x0B, 0x08, "Gerudo Training Grounds MQ Maze Right Side Chest",      GERUDO_TRAINING_GROUNDS_MQ_MAZE_RIGHT_SIDE_CHEST,           TREASURE_GAME_GREEN_RUPEE,         {},                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[GERUDO_TRAINING_GROUNDS_MQ_MAZE_PATH_THIRD_CHEST]            = ItemLocation::Chest      (RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_THIRD_CHEST,              0x0B, 0x09, "Gerudo Training Grounds MQ Maze Path Third Chest",      GERUDO_TRAINING_GROUNDS_MQ_MAZE_PATH_THIRD_CHEST,           TREASURE_GAME_GREEN_RUPEE,         {},                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[GERUDO_TRAINING_GROUNDS_MQ_MAZE_PATH_SECOND_CHEST]           = ItemLocation::Chest      (RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_SECOND_CHEST,             0x0B, 0x0A, "Gerudo Training Grounds MQ Maze Path Second Chest",     GERUDO_TRAINING_GROUNDS_MQ_MAZE_PATH_SECOND_CHEST,          RED_RUPEE,                         {},                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[GERUDO_TRAINING_GROUNDS_MQ_HIDDEN_CEILING_CHEST]             = ItemLocation::Chest      (RC_GERUDO_TRAINING_GROUND_MQ_HIDDEN_CEILING_CHEST,               0x0B, 0x0B, "Gerudo Training Grounds MQ Hidden Ceiling Chest",       GERUDO_TRAINING_GROUNDS_MQ_HIDDEN_CEILING_CHEST,            PURPLE_RUPEE,                      {},                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER_SILVER_RUPEE_CHEST]    = ItemLocation::Chest      (RC_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST,      0x0B, 0x0D, "Gerudo Training Grounds MQ Underwater Silver Rupee Chest",GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER_SILVER_RUPEE_CHEST, TREASURE_GAME_GREEN_RUPEE,         {Category::cVanillaSmallKey},                          SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[GERUDO_TRAINING_GROUNDS_MQ_HEAVY_BLOCK_CHEST]                = ItemLocation::Chest      (RC_GERUDO_TRAINING_GROUND_MQ_HEAVY_BLOCK_CHEST,                  0x0B, 0x02, "Gerudo Training Grounds MQ Heavy Block Chest",          GERUDO_TRAINING_GROUNDS_MQ_HEAVY_BLOCK_CHEST,               PURPLE_RUPEE,                      {},                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-
-    //Ganons Castle Shared
-    locationTable[GANONS_TOWER_BOSS_KEY_CHEST]                                 = ItemLocation::Chest      (RC_GANONS_TOWER_BOSS_KEY_CHEST,                                  0x0A, 0x0B, "Ganon's Tower Boss Key Chest",                          GANONS_TOWER_BOSS_KEY_CHEST,                           GANONS_CASTLE_BOSS_KEY,  {},                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    //Ganons Castle Vanilla
-    locationTable[GANONS_CASTLE_FOREST_TRIAL_CHEST]                            = ItemLocation::Chest      (RC_GANONS_CASTLE_FOREST_TRIAL_CHEST,                             0x0D, 0x09, "Ganon's Castle Forest Trial Chest",                     GANONS_CASTLE_FOREST_TRIAL_CHEST,                      BLUE_RUPEE,              {},                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST]                        = ItemLocation::Chest      (RC_GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST,                         0x0D, 0x07, "Ganon's Castle Water Trial Left Chest",                 GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST,                  ICE_TRAP,                {},                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST]                       = ItemLocation::Chest      (RC_GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST,                        0x0D, 0x06, "Ganon's Castle Water Trial Right Chest",                GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST,                 RECOVERY_HEART,          {},                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST]                      = ItemLocation::Chest      (RC_GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST,                       0x0D, 0x08, "Ganon's Castle Shadow Trial Front Chest",               GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST,                BLUE_RUPEE,              {},                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST]           = ItemLocation::Chest      (RC_GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST,            0x0D, 0x05, "Ganon's Castle Shadow Trial Golden Gauntlets Chest",    GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST,     PROGRESSIVE_STRENGTH,    {},                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST]             = ItemLocation::Chest      (RC_GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST,              0x0D, 0x12, "Ganon's Castle Spirit Trial Crystal Switch Chest",      GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST,       BOMBCHU_20,              {},                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST]                  = ItemLocation::Chest      (RC_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST,                   0x0D, 0x14, "Ganon's Castle Spirit Trial Invisible Chest",           GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST,            ARROWS_10,               {},                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST]                  = ItemLocation::Chest      (RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST,                   0x0D, 0x0C, "Ganon's Castle Light Trial First Left Chest",           GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST,            BLUE_RUPEE,              {},                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST]                 = ItemLocation::Chest      (RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST,                  0x0D, 0x0B, "Ganon's Castle Light Trial Second Left Chest",          GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST,           ICE_TRAP,                {},                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST]                  = ItemLocation::Chest      (RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST,                   0x0D, 0x0D, "Ganon's Castle Light Trial Third Left Chest",           GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST,            RECOVERY_HEART,          {},                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST]                 = ItemLocation::Chest      (RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST,                  0x0D, 0x0E, "Ganon's Castle Light Trial First Right Chest",          GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST,           ICE_TRAP,                {},                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST]                = ItemLocation::Chest      (RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST,                 0x0D, 0x0A, "Ganon's Castle Light Trial Second Right Chest",         GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST,          ARROWS_30,               {},                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST]                 = ItemLocation::Chest      (RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST,                  0x0D, 0x0F, "Ganon's Castle Light Trial Third Right Chest",          GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST,           ICE_TRAP,                {},                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST]           = ItemLocation::Chest      (RC_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST,            0x0D, 0x10, "Ganon's Castle Light Trial Invisible Enemies Chest",    GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST,     GANONS_CASTLE_SMALL_KEY, {Category::cVanillaSmallKey},                                         SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST]                     = ItemLocation::Chest      (RC_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST,                      0x0D, 0x11, "Ganon's Castle Light Trial Lullaby Chest",              GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST,               GANONS_CASTLE_SMALL_KEY, {Category::cVanillaSmallKey},                                         SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT]                        = ItemLocation::Base       (RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,                         0x0D,       "Ganon's Castle Deku Scrub Center-Left",                 GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,                  BUY_BOMBS_535,           {Category::cDekuScrub},              SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT]                       = ItemLocation::Base       (RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT,                        0x0D,       "Ganon's Castle Deku Scrub Center-Right",                GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT,                 BUY_ARROWS_30,           {Category::cDekuScrub},              SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[GANONS_CASTLE_DEKU_SCRUB_RIGHT]                              = ItemLocation::Base       (RC_GANONS_CASTLE_DEKU_SCRUB_RIGHT,                               0x0D,       "Ganon's Castle Deku Scrub Right",                       GANONS_CASTLE_DEKU_SCRUB_RIGHT,                        BUY_RED_POTION_30,       {Category::cDekuScrub},              SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[GANONS_CASTLE_DEKU_SCRUB_LEFT]                               = ItemLocation::Base       (RC_GANONS_CASTLE_DEKU_SCRUB_LEFT,                                0x0D,       "Ganon's Castle Deku Scrub Left",                        GANONS_CASTLE_DEKU_SCRUB_LEFT,                         BUY_GREEN_POTION,        {Category::cDekuScrub},              SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    //Ganons Castle MQ
-    locationTable[GANONS_CASTLE_MQ_WATER_TRIAL_CHEST]                          = ItemLocation::Chest      (RC_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST,                           0x0D, 0x01, "Ganon's Castle MQ Water Trial Chest",                   GANONS_CASTLE_MQ_WATER_TRIAL_CHEST,                    RED_RUPEE,               {},                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST]              = ItemLocation::Chest      (RC_GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST,               0x0D, 0x02, "Ganon's Castle MQ Forest Trial Eye Switch Chest",       GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST,        ARROWS_10,               {},                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST]       = ItemLocation::Chest      (RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST,        0x0D, 0x03, "Ganon's Castle MQ Forest Trial Frozen Eye Switch Chest",GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST, BOMBS_5,                 {},                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST]                  = ItemLocation::Chest      (RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST,                   0x0D, 0x04, "Ganon's Castle MQ Light Trial Lullaby Chest",           GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST,            RECOVERY_HEART,          {},                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST]             = ItemLocation::Chest      (RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST,              0x0D, 0x00, "Ganon's Castle MQ Shadow Trial Bomb Flower Chest",      GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST,       ARROWS_10,               {},                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST]              = ItemLocation::Chest      (RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST,               0x0D, 0x05, "Ganon's Castle MQ Shadow Trial Eye Switch Chest",       GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST,        GANONS_CASTLE_SMALL_KEY, {Category::cVanillaSmallKey},                                         SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST]        = ItemLocation::Chest      (RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST,         0x0D, 0x06, "Ganon's Castle MQ Spirit Trial Golden Gauntlets Chest", GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST,  PROGRESSIVE_STRENGTH,    {},                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST]          = ItemLocation::Chest      (RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST,           0x0D, 0x07, "Ganon's Castle MQ Spirit Trial Sun Back Right Chest",   GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST,    RECOVERY_HEART,          {},                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST]           = ItemLocation::Chest      (RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST,            0x0D, 0x08, "Ganon's Castle MQ Spirit Trial Sun Back Left Chest",    GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST,     GANONS_CASTLE_SMALL_KEY, {Category::cVanillaSmallKey},                                         SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST]          = ItemLocation::Chest      (RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST,           0x0D, 0x09, "Ganon's Castle MQ Spirit Trial Sun Front Left Chest",   GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST,    RECOVERY_HEART,          {},                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST]                   = ItemLocation::Chest      (RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST,                    0x0D, 0x0A, "Ganon's Castle MQ Spirit Trial First Chest",            GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST,             BOMBCHU_10,              {},                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST]               = ItemLocation::Chest      (RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST,                0x0D, 0x14, "Ganon's Castle MQ Spirit Trial Invisible Chest",        GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST,         ARROWS_10,               {},                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY]              = ItemLocation::Collectable(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY,               0x0D, 0x01, "Ganon's Castle MQ Forest Trial Freestanding Key",       GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY,        GANONS_CASTLE_SMALL_KEY, {Category::cVanillaSmallKey},                                         SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT]                           = ItemLocation::Base       (RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,                            0x0D,       "Ganon's Castle MQ Deku Scrub Right",                    GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,                     BUY_DEKU_NUT_5,          {Category::cDekuScrub},              SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT]                     = ItemLocation::Base       (RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,                      0x0D,       "Ganon's Castle MQ Deku Scrub Center-Left",              GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,               BUY_BOMBS_535,           {Category::cDekuScrub},              SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER]                          = ItemLocation::Base       (RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,                           0x0D,       "Ganon's Castle MQ Deku Scrub Center",                   GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,                    BUY_ARROWS_30,           {Category::cDekuScrub},              SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT]                    = ItemLocation::Base       (RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT,                     0x0D,       "Ganon's Castle MQ Deku Scrub Center-Right",             GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT,              BUY_RED_POTION_30,       {Category::cDekuScrub},              SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT]                            = ItemLocation::Base       (RC_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,                             0x0D,       "Ganon's Castle MQ Deku Scrub Left",                     GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,                      BUY_GREEN_POTION,        {Category::cDekuScrub},              SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-
-    /*-------------------------------
-       --- GOLD SKULLTULA TOKENS ---
-      -------------------------------*/
-
-    //Dungeons
-    locationTable[DEKU_TREE_GS_BASEMENT_BACK_ROOM]                   = ItemLocation::GSToken(RC_DEKU_TREE_GS_BASEMENT_BACK_ROOM,                                            0x00, 0x01, "Deku Tree GS Basement Back Room",                  DEKU_TREE_GS_BASEMENT_BACK_ROOM,                  {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[DEKU_TREE_GS_BASEMENT_GATE]                        = ItemLocation::GSToken(RC_DEKU_TREE_GS_BASEMENT_GATE,                                                 0x00, 0x02, "Deku Tree GS Basement Gate",                       DEKU_TREE_GS_BASEMENT_GATE,                       {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[DEKU_TREE_GS_BASEMENT_VINES]                       = ItemLocation::GSToken(RC_DEKU_TREE_GS_BASEMENT_VINES,                                                0x00, 0x04, "Deku Tree GS Basement Vines",                      DEKU_TREE_GS_BASEMENT_VINES,                      {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[DEKU_TREE_GS_COMPASS_ROOM]                         = ItemLocation::GSToken(RC_DEKU_TREE_GS_COMPASS_ROOM,                                                  0x00, 0x08, "Deku Tree GS Compass Room",                        DEKU_TREE_GS_COMPASS_ROOM,                        {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-                                                                                                                                                                                                                                                                                                                                                                                                                                                           
-    locationTable[DEKU_TREE_MQ_GS_LOBBY]                             = ItemLocation::GSToken(RC_DEKU_TREE_MQ_GS_LOBBY,                                                      0x00, 0x02, "Deku Tree MQ GS Lobby",                            DEKU_TREE_MQ_GS_LOBBY,                            {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[DEKU_TREE_MQ_GS_COMPASS_ROOM]                      = ItemLocation::GSToken(RC_DEKU_TREE_MQ_GS_COMPASS_ROOM,                                               0x00, 0x08, "Deku Tree MQ GS Compass Room",                     DEKU_TREE_MQ_GS_COMPASS_ROOM,                     {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM]              = ItemLocation::GSToken(RC_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM,                                       0x00, 0x04, "Deku Tree MQ GS Basement Graves Room",             DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM,             {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM]                = ItemLocation::GSToken(RC_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM,                                         0x00, 0x01, "Deku Tree MQ GS Basement Back Room",               DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM,               {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-                                                                                                                                                                                                                                                                                                                                                                                                                                                           
-    locationTable[DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS]             = ItemLocation::GSToken(RC_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS,                                      0x01, 0x01, "Dodongos Cavern GS Vines Above Stairs",            DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS,            {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[DODONGOS_CAVERN_GS_SCARECROW]                      = ItemLocation::GSToken(RC_DODONGOS_CAVERN_GS_SCARECROW,                                               0x01, 0x02, "Dodongos Cavern GS Scarecrow",                     DODONGOS_CAVERN_GS_SCARECROW,                     {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS]            = ItemLocation::GSToken(RC_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS,                                     0x01, 0x04, "Dodongos Cavern GS Alcove Above Stairs",           DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS,           {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[DODONGOS_CAVERN_GS_BACK_ROOM]                      = ItemLocation::GSToken(RC_DODONGOS_CAVERN_GS_BACK_ROOM,                                               0x01, 0x08, "Dodongos Cavern GS Back Room",                     DODONGOS_CAVERN_GS_BACK_ROOM,                     {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS]  = ItemLocation::GSToken(RC_DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS,                           0x01, 0x10, "Dodongos Cavern GS Side Room Near Lower Lizalfos", DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS, {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-                                                                                                                                                                                                                                                                                                                                                                                                                                                           
-    locationTable[DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM]                  = ItemLocation::GSToken(RC_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM,                                           0x01, 0x02, "Dodongos Cavern MQ GS Scrub Room",                 DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM,                 {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM]     = ItemLocation::GSToken(RC_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM,                              0x01, 0x08, "Dodongos Cavern MQ GS Song of Time Block Room",    DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM,    {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM]               = ItemLocation::GSToken(RC_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM,                                        0x01, 0x04, "Dodongos Cavern MQ GS Lizalfos Room",              DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM,              {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM]                 = ItemLocation::GSToken(RC_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM,                                          0x01, 0x10, "Dodongos Cavern MQ GS Larvae Room",                DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM,                {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[DODONGOS_CAVERN_MQ_GS_BACK_AREA]                   = ItemLocation::GSToken(RC_DODONGOS_CAVERN_MQ_GS_BACK_AREA,                                            0x01, 0x01, "Dodongos Cavern MQ GS Back Room",                  DODONGOS_CAVERN_MQ_GS_BACK_AREA,                  {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-                                                                                                                                                                                                                                                                                                                                                                                                                                                           
-    locationTable[JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER]          = ItemLocation::GSToken(RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER,                                   0x02, 0x01, "Jabu Jabus Belly GS Lobby Basement Lower",         JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER,         {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER]          = ItemLocation::GSToken(RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER,                                   0x02, 0x02, "Jabu Jabus Belly GS Lobby Basement Upper",         JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER,         {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[JABU_JABUS_BELLY_GS_NEAR_BOSS]                     = ItemLocation::GSToken(RC_JABU_JABUS_BELLY_GS_NEAR_BOSS,                                              0x02, 0x04, "Jabu Jabus Belly GS Near Boss",                    JABU_JABUS_BELLY_GS_NEAR_BOSS,                    {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM]             = ItemLocation::GSToken(RC_JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM,                                      0x02, 0x08, "Jabu Jabus Belly GS Water Switch Room",            JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM,            {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-                                                                                                                                                                                                                                                                                                                                                                                                                                                           
-    locationTable[JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM]           = ItemLocation::GSToken(RC_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM,                                    0x02, 0x04, "Jabu Jabus Belly MQ GS Tail Parasan Room",         JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM,          {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM]     = ItemLocation::GSToken(RC_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM,                              0x02, 0x08, "Jabu Jabus Belly MQ GS Invisible Enemies Room",    JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM,    {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM]       = ItemLocation::GSToken(RC_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM,                                0x02, 0x01, "Jabu Jabus Belly MQ GS Boomerang Chest Room",      JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM,      {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS]                  = ItemLocation::GSToken(RC_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS,                                           0x02, 0x02, "Jabu Jabus Belly MQ GS Near Boss",                 JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS,                 {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-                                                                                                                                                                                                                                                                                                                                                                                                                                                           
-    locationTable[FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD]          = ItemLocation::GSToken(RC_FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD,                                   0x03, 0x01, "Forest Temple GS Raised Island Courtyard",         FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD,         {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[FOREST_TEMPLE_GS_FIRST_ROOM]                       = ItemLocation::GSToken(RC_FOREST_TEMPLE_GS_FIRST_ROOM,                                                0x03, 0x02, "Forest Temple GS First Room",                      FOREST_TEMPLE_GS_FIRST_ROOM,                      {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD]           = ItemLocation::GSToken(RC_FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD,                                    0x03, 0x04, "Forest Temple GS Level Island Courtyard",          FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD,          {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[FOREST_TEMPLE_GS_LOBBY]                            = ItemLocation::GSToken(RC_FOREST_TEMPLE_GS_LOBBY,                                                     0x03, 0x08, "Forest Temple GS Lobby",                           FOREST_TEMPLE_GS_LOBBY,                           {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[FOREST_TEMPLE_GS_BASEMENT]                         = ItemLocation::GSToken(RC_FOREST_TEMPLE_GS_BASEMENT,                                                  0x03, 0x10, "Forest Temple GS Basement",                        FOREST_TEMPLE_GS_BASEMENT,                        {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-                                                                                                                                                                                                                                                                                                                                                                                                                                                           
-    locationTable[FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY]                 = ItemLocation::GSToken(RC_FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY,                                          0x03, 0x02, "Forest Temple MQ GS First Hallway",                FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY,                {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM]               = ItemLocation::GSToken(RC_FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM,                                        0x03, 0x10, "Forest Temple MQ GS Block Push Room",              FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM,              {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD]       = ItemLocation::GSToken(RC_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD,                                0x03, 0x01, "Forest Temple MQ GS Raised Island Courtyard",      FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD,      {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD]        = ItemLocation::GSToken(RC_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD,                                 0x03, 0x04, "Forest Temple MQ GS Level Island Courtyard",       FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD,       {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[FOREST_TEMPLE_MQ_GS_WELL]                          = ItemLocation::GSToken(RC_FOREST_TEMPLE_MQ_GS_WELL,                                                   0x03, 0x08, "Forest Temple MQ GS Well",                         FOREST_TEMPLE_MQ_GS_WELL,                         {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-                                                                                                                                                                                                                                                                                                                                                                                                                                                           
-    locationTable[FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM]                  = ItemLocation::GSToken(RC_FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM,                                           0x04, 0x01, "Fire Temple GS Song of Time Room",                 FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM,                 {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[FIRE_TEMPLE_GS_BOSS_KEY_LOOP]                      = ItemLocation::GSToken(RC_FIRE_TEMPLE_GS_BOSS_KEY_LOOP,                                               0x04, 0x02, "Fire Temple GS Boss Key Loop",                     FIRE_TEMPLE_GS_BOSS_KEY_LOOP,                     {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[FIRE_TEMPLE_GS_BOULDER_MAZE]                       = ItemLocation::GSToken(RC_FIRE_TEMPLE_GS_BOULDER_MAZE,                                                0x04, 0x04, "Fire Temple GS Boulder Maze",                      FIRE_TEMPLE_GS_BOULDER_MAZE,                      {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[FIRE_TEMPLE_GS_SCARECROW_TOP]                      = ItemLocation::GSToken(RC_FIRE_TEMPLE_GS_SCARECROW_TOP,                                               0x04, 0x08, "Fire Temple GS Scarecrow Top",                     FIRE_TEMPLE_GS_SCARECROW_TOP,                     {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[FIRE_TEMPLE_GS_SCARECROW_CLIMB]                    = ItemLocation::GSToken(RC_FIRE_TEMPLE_GS_SCARECROW_CLIMB,                                             0x04, 0x10, "Fire Temple GS Scarecrow Climb",                   FIRE_TEMPLE_GS_SCARECROW_CLIMB,                   {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-                                                                                                                                                                                                                                                                                                                                                                                                                                                           
-    locationTable[FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE]            = ItemLocation::GSToken(RC_FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE,                                     0x04, 0x02, "Fire Temple MQ GS Above Fire Wall Maze",           FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE,           {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER]           = ItemLocation::GSToken(RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER,                                    0x04, 0x08, "Fire Temple MQ GS Fire Wall Maze Center",          FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER,          {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR]         = ItemLocation::GSToken(RC_FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR,                                  0x04, 0x01, "Fire Temple MQ GS Big Lava Room Open Door",        FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR,        {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM]        = ItemLocation::GSToken(RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM,                                 0x04, 0x10, "Fire Temple MQ GS Fire Wall Maze Side Room",       FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM,       {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE]                   = ItemLocation::GSToken(RC_FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE,                                            0x04, 0x04, "Fire Temple MQ GS Skull on Fire",                  FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE,                  {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-                                                                                                                                                                                                                                                                                                                                                                                                                                                           
-    locationTable[WATER_TEMPLE_GS_BEHIND_GATE]                       = ItemLocation::GSToken(RC_WATER_TEMPLE_GS_BEHIND_GATE,                                                0x05, 0x01, "Water Temple GS Behind Gate",                      WATER_TEMPLE_GS_BEHIND_GATE,                      {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM]             = ItemLocation::GSToken(RC_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM,                                      0x05, 0x02, "Water Temple GS Falling Platform Room",            WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM,            {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[WATER_TEMPLE_GS_CENTRAL_PILLAR]                    = ItemLocation::GSToken(RC_WATER_TEMPLE_GS_CENTRAL_PILLAR,                                             0x05, 0x04, "Water Temple GS Central Pillar",                   WATER_TEMPLE_GS_CENTRAL_PILLAR,                   {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST]               = ItemLocation::GSToken(RC_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST,                                        0x05, 0x08, "Water Temple GS Near Boss Key Chest",              WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST,              {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[WATER_TEMPLE_GS_RIVER]                             = ItemLocation::GSToken(RC_WATER_TEMPLE_GS_RIVER,                                                      0x05, 0x10, "Water Temple GS River",                            WATER_TEMPLE_GS_RIVER,                            {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-                                                                                                                                                                                                                                                                                                                                                                                                                                                           
-    locationTable[WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH]      = ItemLocation::GSToken(RC_WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH,                               0x05, 0x04, "Water Temple MQ GS Before Upper Water Switch",     WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH,     {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA]          = ItemLocation::GSToken(RC_WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA,                                   0x05, 0x08, "Water Temple MQ GS Freestanding Key Area",         WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA,         {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY]               = ItemLocation::GSToken(RC_WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY,                                        0x05, 0x01, "Water Temple MQ GS Lizalfos Hallway",              WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY,              {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[WATER_TEMPLE_MQ_GS_RIVER]                          = ItemLocation::GSToken(RC_WATER_TEMPLE_MQ_GS_RIVER,                                                   0x05, 0x02, "Water Temple MQ GS River",                         WATER_TEMPLE_MQ_GS_RIVER,                         {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH]              = ItemLocation::GSToken(RC_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH,                                       0x05, 0x10, "Water Temple MQ GS Triple Wall Torch",             WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH,             {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-                                                                                                                                                                                                                                                                                                                                                                                                                                                           
-    locationTable[SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM]        = ItemLocation::GSToken(RC_SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM,                                 0x06, 0x01, "Spirit Temple GS Hall After Sun Block Room",       SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM,       {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[SPIRIT_TEMPLE_GS_BOULDER_ROOM]                     = ItemLocation::GSToken(RC_SPIRIT_TEMPLE_GS_BOULDER_ROOM,                                              0x06, 0x02, "Spirit Temple GS Boulder Room",                    SPIRIT_TEMPLE_GS_BOULDER_ROOM,                    {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[SPIRIT_TEMPLE_GS_LOBBY]                            = ItemLocation::GSToken(RC_SPIRIT_TEMPLE_GS_LOBBY,                                                     0x06, 0x04, "Spirit Temple GS Lobby",                           SPIRIT_TEMPLE_GS_LOBBY,                           {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM]                = ItemLocation::GSToken(RC_SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM,                                         0x06, 0x08, "Spirit Temple GS Sun on Floor Room",               SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM,               {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[SPIRIT_TEMPLE_GS_METAL_FENCE]                      = ItemLocation::GSToken(RC_SPIRIT_TEMPLE_GS_METAL_FENCE,                                               0x06, 0x10, "Spirit Temple GS Metal Fence",                     SPIRIT_TEMPLE_GS_METAL_FENCE,                     {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-                                                                                                                                                                                                                                                                                                                                                                                                                                                           
-    locationTable[SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM]                 = ItemLocation::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM,                                          0x06, 0x08, "Spirit Temple MQ GS Symphony Room",                SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM,                {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM]                   = ItemLocation::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM,                                            0x06, 0x02, "Spirit Temple MQ GS Leever Room",                  SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM,                  {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST]        = ItemLocation::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST,                                 0x06, 0x04, "Spirit Temple MQ GS Nine Thrones Room West",       SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST,       {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH]       = ItemLocation::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH,                                0x06, 0x10, "Spirit Temple MQ GS Nine Thrones Room North",      SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH,      {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM]                = ItemLocation::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM,                                         0x06, 0x01, "Spirit Temple MQ GS Sun Block Room",               SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM,               {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-                                                                                                                                                                                                                                                                                                                                                                                                                                                           
-    locationTable[SHADOW_TEMPLE_GS_SINGLE_GIANT_POT]                 = ItemLocation::GSToken(RC_SHADOW_TEMPLE_GS_SINGLE_GIANT_POT,                                          0x07, 0x01, "Shadow Temple GS Single Giant Pot",                SHADOW_TEMPLE_GS_SINGLE_GIANT_POT,                {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM]              = ItemLocation::GSToken(RC_SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM,                                       0x07, 0x02, "Shadow Temple GS Falling Spikes Room",             SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM,             {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT]                 = ItemLocation::GSToken(RC_SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT,                                          0x07, 0x04, "Shadow Temple GS Triple Giant Pot",                SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT,                {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM]                   = ItemLocation::GSToken(RC_SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM,                                            0x07, 0x08, "Shadow Temple GS Like Like Room",                  SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM,                  {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[SHADOW_TEMPLE_GS_NEAR_SHIP]                        = ItemLocation::GSToken(RC_SHADOW_TEMPLE_GS_NEAR_SHIP,                                                 0x07, 0x10, "Shadow Temple GS Near Ship",                       SHADOW_TEMPLE_GS_NEAR_SHIP,                       {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-                                                                                                                                                                                                                                                                                                                                                                                                                                                           
-    locationTable[SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM]           = ItemLocation::GSToken(RC_SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM,                                    0x07, 0x02, "Shadow Temple MQ GS Falling Spikes Room",          SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM,          {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM]                = ItemLocation::GSToken(RC_SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM,                                         0x07, 0x01, "Shadow Temple MQ GS Wind Hint Room",               SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM,               {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[SHADOW_TEMPLE_MQ_GS_AFTER_WIND]                    = ItemLocation::GSToken(RC_SHADOW_TEMPLE_MQ_GS_AFTER_WIND,                                             0x07, 0x08, "Shadow Temple MQ GS After Wind",                   SHADOW_TEMPLE_MQ_GS_AFTER_WIND,                   {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[SHADOW_TEMPLE_MQ_GS_AFTER_SHIP]                    = ItemLocation::GSToken(RC_SHADOW_TEMPLE_MQ_GS_AFTER_SHIP,                                             0x07, 0x10, "Shadow Temple MQ GS After Ship",                   SHADOW_TEMPLE_MQ_GS_AFTER_SHIP,                   {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[SHADOW_TEMPLE_MQ_GS_NEAR_BOSS]                     = ItemLocation::GSToken(RC_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS,                                              0x07, 0x04, "Shadow Temple MQ GS Near Boss",                    SHADOW_TEMPLE_MQ_GS_NEAR_BOSS,                    {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-                                                                                                                                                                                                                                                                                                                                                                                                                                                           
-    locationTable[BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE]              = ItemLocation::GSToken(RC_BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE,                                       0x08, 0x01, "Bottom of the Well GS Like Like Cage",             BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE,             {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM]             = ItemLocation::GSToken(RC_BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM,                                      0x08, 0x02, "Bottom of the Well GS East Inner Room",            BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM,            {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM]             = ItemLocation::GSToken(RC_BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM,                                      0x08, 0x04, "Bottom of the Well GS West Inner Room",            BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM,            {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-                                                                                                                                                                                                                                                                                                                                                                                                                                                           
-    locationTable[BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT]                 = ItemLocation::GSToken(RC_BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT,                                          0x08, 0x01, "Bottom of the Well MQ GS Basement",                BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT,                {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM]              = ItemLocation::GSToken(RC_BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM,                                       0x08, 0x04, "Bottom of the Well MQ GS Coffin Room",             BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM,             {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM]          = ItemLocation::GSToken(RC_BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM,                                   0x08, 0x02, "Bottom of the Well MQ GS West Inner Room",         BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM,         {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-                                                                                                                                                                                                                                                                                                                                                                                                                                                           
-    locationTable[ICE_CAVERN_GS_PUSH_BLOCK_ROOM]                     = ItemLocation::GSToken(RC_ICE_CAVERN_GS_PUSH_BLOCK_ROOM,                                              0x09, 0x01, "Ice Cavern GS Push Block Room",                    ICE_CAVERN_GS_PUSH_BLOCK_ROOM,                    {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
-    locationTable[ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM]                = ItemLocation::GSToken(RC_ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM,                                         0x09, 0x02, "Ice Cavern GS Spinning Scythe Room",               ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM,               {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
-    locationTable[ICE_CAVERN_GS_HEART_PIECE_ROOM]                    = ItemLocation::GSToken(RC_ICE_CAVERN_GS_HEART_PIECE_ROOM,                                             0x09, 0x04, "Ice Cavern GS Heart Piece Room",                   ICE_CAVERN_GS_HEART_PIECE_ROOM,                   {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
-                                                                                                                                                                                                                                                                                                                                                                                                                                                           
-    locationTable[ICE_CAVERN_MQ_GS_SCARECROW]                        = ItemLocation::GSToken(RC_ICE_CAVERN_MQ_GS_SCARECROW,                                                 0x09, 0x01, "Ice Cavern MQ GS Scarecrow",                       ICE_CAVERN_MQ_GS_SCARECROW,                       {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
-    locationTable[ICE_CAVERN_MQ_GS_ICE_BLOCK]                        = ItemLocation::GSToken(RC_ICE_CAVERN_MQ_GS_ICE_BLOCK,                                                 0x09, 0x04, "Ice Cavern MQ GS Ice Block",                       ICE_CAVERN_MQ_GS_ICE_BLOCK,                       {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
-    locationTable[ICE_CAVERN_MQ_GS_RED_ICE]                          = ItemLocation::GSToken(RC_ICE_CAVERN_MQ_GS_RED_ICE,                                                   0x09, 0x02, "Ice Cavern MQ GS Red Ice",                         ICE_CAVERN_MQ_GS_RED_ICE,                         {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
-                                                                                                                                                                                                                                                                                                                                                                                                                                                           
-    //Overworld
-    locationTable[KF_GS_BEAN_PATCH]                                  = ItemLocation::GSToken(RC_KF_GS_BEAN_PATCH,                                                           0x0C, 0x01, "KF GS Bean Patch",                                 KF_GS_BEAN_PATCH,                                 {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[KF_GS_KNOW_IT_ALL_HOUSE]                           = ItemLocation::GSToken(RC_KF_GS_KNOW_IT_ALL_HOUSE,                                                    0x0C, 0x02, "KF GS Know It All House",                          KF_GS_KNOW_IT_ALL_HOUSE,                          {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[KF_GS_HOUSE_OF_TWINS]                              = ItemLocation::GSToken(RC_KF_GS_HOUSE_OF_TWINS,                                                       0x0C, 0x04, "KF GS House of Twins",                             KF_GS_HOUSE_OF_TWINS,                             {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-                                                                                                                                                                                                                                                                                                                                                                                                                                                           
-    locationTable[LW_GS_BEAN_PATCH_NEAR_BRIDGE]                      = ItemLocation::GSToken(RC_LW_GS_BEAN_PATCH_NEAR_BRIDGE,                                               0x0D, 0x01, "LW GS Bean Patch Near Bridge",                     LW_GS_BEAN_PATCH_NEAR_BRIDGE,                     {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[LW_GS_BEAN_PATCH_NEAR_THEATER]                     = ItemLocation::GSToken(RC_LW_GS_BEAN_PATCH_NEAR_THEATER,                                              0x0D, 0x02, "LW GS Bean Patch Near Theater",                    LW_GS_BEAN_PATCH_NEAR_THEATER,                    {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[LW_GS_ABOVE_THEATER]                               = ItemLocation::GSToken(RC_LW_GS_ABOVE_THEATER,                                                        0x0D, 0x04, "LW GS Above Theater",                              LW_GS_ABOVE_THEATER,                              {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[SFM_GS]                                            = ItemLocation::GSToken(RC_SFM_GS,                                                                     0x0D, 0x08, "SFM GS",                                           SFM_GS,                                           {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-                                                                                                                                                                                                                                                                                                                                                                                                                                                           
-    locationTable[HF_GS_COW_GROTTO]                                  = ItemLocation::GSToken(RC_HF_GS_COW_GROTTO,                                                           0x0A, 0x01, "HF GS Cow Grotto",                                 HF_GS_COW_GROTTO,                                 {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[HF_GS_NEAR_KAK_GROTTO]                             = ItemLocation::GSToken(RC_HF_GS_NEAR_KAK_GROTTO,                                                      0x0A, 0x02, "HF GS Near Kak Grotto",                            HF_GS_NEAR_KAK_GROTTO,                            {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-                                                                                                                                                                                                                                                                                                                                                                                                                                                           
-    locationTable[LH_GS_BEAN_PATCH]                                  = ItemLocation::GSToken(RC_LH_GS_BEAN_PATCH,                                                           0x12, 0x01, "LH GS Bean Patch",                                 LH_GS_BEAN_PATCH,                                 {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[LH_GS_SMALL_ISLAND]                                = ItemLocation::GSToken(RC_LH_GS_SMALL_ISLAND,                                                         0x12, 0x02, "LH GS Small Island",                               LH_GS_SMALL_ISLAND,                               {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[LH_GS_LAB_WALL]                                    = ItemLocation::GSToken(RC_LH_GS_LAB_WALL,                                                             0x12, 0x04, "LH GS Lab Wall",                                   LH_GS_LAB_WALL,                                   {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[LH_GS_LAB_CRATE]                                   = ItemLocation::GSToken(RC_LH_GS_LAB_CRATE,                                                            0x12, 0x08, "LH GS Lab Crate",                                  LH_GS_LAB_CRATE,                                  {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[LH_GS_TREE]                                        = ItemLocation::GSToken(RC_LH_GS_TREE,                                                                 0x12, 0x10, "LH GS Tree",                                       LH_GS_TREE,                                       {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-                                                                                                                                                                                                                                                                                                                                                                                                                                                           
-    locationTable[GV_GS_BEAN_PATCH]                                  = ItemLocation::GSToken(RC_GV_GS_BEAN_PATCH,                                                           0x13, 0x01, "GV GS Bean Patch",                                 GV_GS_BEAN_PATCH,                                 {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[GV_GS_SMALL_BRIDGE]                                = ItemLocation::GSToken(RC_GV_GS_SMALL_BRIDGE,                                                         0x13, 0x02, "GV GS Small Bridge",                               GV_GS_SMALL_BRIDGE,                               {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[GV_GS_PILLAR]                                      = ItemLocation::GSToken(RC_GV_GS_PILLAR,                                                               0x13, 0x04, "GV GS Pillar",                                     GV_GS_PILLAR,                                     {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[GV_GS_BEHIND_TENT]                                 = ItemLocation::GSToken(RC_GV_GS_BEHIND_TENT,                                                          0x13, 0x08, "GV GS Behind Tent",                                GV_GS_BEHIND_TENT,                                {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-                                                                                                                                                                                                                                                                                                                                                                                                                                                           
-    locationTable[GF_GS_ARCHERY_RANGE]                               = ItemLocation::GSToken(RC_GF_GS_ARCHERY_RANGE,                                                        0x14, 0x01, "GF GS Archery Range",                              GF_GS_ARCHERY_RANGE,                              {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[GF_GS_TOP_FLOOR]                                   = ItemLocation::GSToken(RC_GF_GS_TOP_FLOOR,                                                            0x14, 0x02, "GF GS Top Floor",                                  GF_GS_TOP_FLOOR,                                  {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-                                                                                                                                                                                                                                                                                                                                                                                                                                                           
-    locationTable[WASTELAND_GS]                                      = ItemLocation::GSToken(RC_WASTELAND_GS,                                                               0x15, 0x02, "Wasteland GS",                                     WASTELAND_GS,                                     {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[COLOSSUS_GS_BEAN_PATCH]                            = ItemLocation::GSToken(RC_COLOSSUS_GS_BEAN_PATCH,                                                     0x15, 0x01, "Colossus GS Bean Patch",                           COLOSSUS_GS_BEAN_PATCH,                           {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[COLOSSUS_GS_HILL]                                  = ItemLocation::GSToken(RC_COLOSSUS_GS_HILL,                                                           0x15, 0x04, "Colossus GS Hill",                                 COLOSSUS_GS_HILL,                                 {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[COLOSSUS_GS_TREE]                                  = ItemLocation::GSToken(RC_COLOSSUS_GS_TREE,                                                           0x15, 0x08, "Colossus GS Tree",                                 COLOSSUS_GS_TREE,                                 {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-                                                                                                                                                                                                                                                                                                                                                                                                                                                           
-    locationTable[OGC_GS]                                            = ItemLocation::GSToken(RC_OGC_GS,                                                                     0x0E, 0x01, "OGC GS",                                           OGC_GS,                                           {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[HC_GS_STORMS_GROTTO]                               = ItemLocation::GSToken(RC_HC_GS_STORMS_GROTTO,                                                        0x0E, 0x02, "HC GS Storms Grotto",                              HC_GS_STORMS_GROTTO,                              {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[HC_GS_TREE]                                        = ItemLocation::GSToken(RC_HC_GS_TREE,                                                                 0x0E, 0x04, "HC GS Tree",                                       HC_GS_TREE,                                       {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[MARKET_GS_GUARD_HOUSE]                             = ItemLocation::GSToken(RC_MARKET_GS_GUARD_HOUSE,                                                      0x0E, 0x08, "Market GS Guard House",                            MARKET_GS_GUARD_HOUSE,                            {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-                                                                                                                                                                                                                                                                                                                                                                                                                                                           
-    locationTable[KAK_GS_HOUSE_UNDER_CONSTRUCTION]                   = ItemLocation::GSToken(RC_KAK_GS_HOUSE_UNDER_CONSTRUCTION,                                            0x10, 0x08, "Kak GS House Under Construction",                  KAK_GS_HOUSE_UNDER_CONSTRUCTION,                  {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[KAK_GS_SKULLTULA_HOUSE]                            = ItemLocation::GSToken(RC_KAK_GS_SKULLTULA_HOUSE,                                                     0x10, 0x10, "Kak GS Skulltula House",                           KAK_GS_SKULLTULA_HOUSE,                           {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[KAK_GS_GUARDS_HOUSE]                               = ItemLocation::GSToken(RC_KAK_GS_GUARDS_HOUSE,                                                        0x10, 0x02, "Kak GS Guards House",                              KAK_GS_GUARDS_HOUSE,                              {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[KAK_GS_TREE]                                       = ItemLocation::GSToken(RC_KAK_GS_TREE,                                                                0x10, 0x20, "Kak GS Tree",                                      KAK_GS_TREE,                                      {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[KAK_GS_WATCHTOWER]                                 = ItemLocation::GSToken(RC_KAK_GS_WATCHTOWER,                                                          0x10, 0x04, "Kak GS Watchtower",                                KAK_GS_WATCHTOWER,                                {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[KAK_GS_ABOVE_IMPAS_HOUSE]                          = ItemLocation::GSToken(RC_KAK_GS_ABOVE_IMPAS_HOUSE,                                                   0x10, 0x40, "Kak GS Above Impas House",                         KAK_GS_ABOVE_IMPAS_HOUSE,                         {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-                                                                                                                                                                                                                                                                                                                                                                                                                                                           
-    locationTable[GRAVEYARD_GS_WALL]                                 = ItemLocation::GSToken(RC_GRAVEYARD_GS_WALL,                                                          0x10, 0x80, "Graveyard GS Wall",                                GRAVEYARD_GS_WALL,                                {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[GRAVEYARD_GS_BEAN_PATCH]                           = ItemLocation::GSToken(RC_GRAVEYARD_GS_BEAN_PATCH,                                                    0x10, 0x01, "Graveyard GS Bean Patch",                          GRAVEYARD_GS_BEAN_PATCH,                          {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-                                                                                                                                                                                                                                                                                                                                                                                                                                                           
-    locationTable[DMC_GS_BEAN_PATCH]                                 = ItemLocation::GSToken(RC_DMC_GS_BEAN_PATCH,                                                          0x0F, 0x01, "DMC GS Bean Patch",                                DMC_GS_BEAN_PATCH,                                {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[DMC_GS_CRATE]                                      = ItemLocation::GSToken(RC_DMC_GS_CRATE,                                                               0x0F, 0x80, "DMC GS Crate",                                     DMC_GS_CRATE,                                     {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-                                                                                                                                                                                                                                                                                                                                                                                                                                                           
-    locationTable[DMT_GS_BEAN_PATCH]                                 = ItemLocation::GSToken(RC_DMT_GS_BEAN_PATCH,                                                          0x0F, 0x02, "DMT GS Bean Patch",                                DMT_GS_BEAN_PATCH,                                {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[DMT_GS_NEAR_KAK]                                   = ItemLocation::GSToken(RC_DMT_GS_NEAR_KAK,                                                            0x0F, 0x04, "DMT GS Near Kak",                                  DMT_GS_NEAR_KAK,                                  {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[DMT_GS_ABOVE_DODONGOS_CAVERN]                      = ItemLocation::GSToken(RC_DMT_GS_ABOVE_DODONGOS_CAVERN,                                               0x0F, 0x08, "DMT GS Above Dodongos Cavern",                     DMT_GS_ABOVE_DODONGOS_CAVERN,                     {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[DMT_GS_FALLING_ROCKS_PATH]                         = ItemLocation::GSToken(RC_DMT_GS_FALLING_ROCKS_PATH,                                                  0x0F, 0x10, "DMT GS Falling Rocks Path",                        DMT_GS_FALLING_ROCKS_PATH,                        {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-                                                                                                                                                                                                                                                                                                                                                                                                                                                           
-    locationTable[GC_GS_CENTER_PLATFORM]                             = ItemLocation::GSToken(RC_GC_GS_CENTER_PLATFORM,                                                      0x0F, 0x20, "GC GS Center Platform",                            GC_GS_CENTER_PLATFORM,                            {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[GC_GS_BOULDER_MAZE]                                = ItemLocation::GSToken(RC_GC_GS_BOULDER_MAZE,                                                         0x0F, 0x40, "GC GS Boulder Maze",                               GC_GS_BOULDER_MAZE,                               {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-                                                                                                                                                                                                                                                                                                                                                                                                                                                           
-    locationTable[ZR_GS_LADDER]                                      = ItemLocation::GSToken(RC_ZR_GS_LADDER,                                                               0x11, 0x01, "ZR GS Ladder",                                     ZR_GS_LADDER,                                     {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[ZR_GS_TREE]                                        = ItemLocation::GSToken(RC_ZR_GS_TREE,                                                                 0x11, 0x02, "ZR GS Tree",                                       ZR_GS_TREE,                                       {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[ZR_GS_ABOVE_BRIDGE]                                = ItemLocation::GSToken(RC_ZR_GS_ABOVE_BRIDGE,                                                         0x11, 0x08, "ZR GS Above Bridge",                               ZR_GS_ABOVE_BRIDGE,                               {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[ZR_GS_NEAR_RAISED_GROTTOS]                         = ItemLocation::GSToken(RC_ZR_GS_NEAR_RAISED_GROTTOS,                                                  0x11, 0x10, "ZR GS Near Raised Grottos",                        ZR_GS_NEAR_RAISED_GROTTOS,                        {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-                                                                                                                                                                                                                                                                                                                                                                                                                                                           
-    locationTable[ZD_GS_FROZEN_WATERFALL]                            = ItemLocation::GSToken(RC_ZD_GS_FROZEN_WATERFALL,                                                     0x11, 0x40, "ZD GS Frozen Waterfall",                           ZD_GS_FROZEN_WATERFALL,                           {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[ZF_GS_ABOVE_THE_LOG]                               = ItemLocation::GSToken(RC_ZF_GS_ABOVE_THE_LOG,                                                        0x11, 0x04, "ZF GS Above The Log",                              ZF_GS_ABOVE_THE_LOG,                              {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[ZF_GS_HIDDEN_CAVE]                                 = ItemLocation::GSToken(RC_ZF_GS_HIDDEN_CAVE,                                                          0x11, 0x20, "ZF GS Hidden Cave",                                ZF_GS_HIDDEN_CAVE,                                {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[ZF_GS_TREE]                                        = ItemLocation::GSToken(RC_ZF_GS_TREE,                                                                 0x11, 0x80, "ZF GS Tree",                                       ZF_GS_TREE,                                       {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-                                                                                                                                                                                                                                                                                                                                                                                                                                                           
-    locationTable[LLR_GS_BACK_WALL]                                  = ItemLocation::GSToken(RC_LLR_GS_BACK_WALL,                                                           0x0B, 0x01, "LLR GS Back Wall",                                 LLR_GS_BACK_WALL,                                 {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
-    locationTable[LLR_GS_RAIN_SHED]                                  = ItemLocation::GSToken(RC_LLR_GS_RAIN_SHED,                                                           0x0B, 0x02, "LLR GS Rain Shed",                                 LLR_GS_RAIN_SHED,                                 {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
-    locationTable[LLR_GS_HOUSE_WINDOW]                               = ItemLocation::GSToken(RC_LLR_GS_HOUSE_WINDOW,                                                        0x0B, 0x04, "LLR GS House Window",                              LLR_GS_HOUSE_WINDOW,                              {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
-    locationTable[LLR_GS_TREE]                                       = ItemLocation::GSToken(RC_LLR_GS_TREE,                                                                0x0B, 0x08, "LLR GS Tree",                                      LLR_GS_TREE,                                      {Category::cSkulltula},                                                                                  SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
-
-    /*-------------------------------
-              --- BOSSES ---
-      -------------------------------*/
-
-    locationTable[LINKS_POCKET]                                  = ItemLocation::Reward (RC_LINKS_POCKET,   0xFF, "Link's Pocket", LINKS_POCKET,  LIGHT_MEDALLION,   {}, SpoilerCollectionCheck::AlwaysCollected(), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[QUEEN_GOHMA]                                   = ItemLocation::Reward (RC_QUEEN_GOHMA,    0xFF, "Queen Gohma",   QUEEN_GOHMA,   KOKIRI_EMERALD,    {}, SpoilerCollectionCheck::Chest(0x11, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[KING_DODONGO]                                  = ItemLocation::Reward (RC_KING_DODONGO,   0xFF, "King Dodongo",  KING_DODONGO,  GORON_RUBY,        {}, SpoilerCollectionCheck::Chest(0x12, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[BARINADE]                                      = ItemLocation::Reward (RC_BARINADE,       0xFF, "Barinade",      BARINADE,      ZORA_SAPPHIRE,     {}, SpoilerCollectionCheck::Chest(0x13, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[PHANTOM_GANON]                                 = ItemLocation::Reward (RC_PHANTOM_GANON,  0xFF, "Phantom Ganon", PHANTOM_GANON, FOREST_MEDALLION,  {}, SpoilerCollectionCheck::Chest(0x14, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[VOLVAGIA]                                      = ItemLocation::Reward (RC_VOLVAGIA,       0xFF, "Volvagia",      VOLVAGIA,      FIRE_MEDALLION,    {}, SpoilerCollectionCheck::Chest(0x15, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[MORPHA]                                        = ItemLocation::Reward (RC_MORPHA,         0xFF, "Morpha",        MORPHA,        WATER_MEDALLION,   {}, SpoilerCollectionCheck::Chest(0x16, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[TWINROVA]                                      = ItemLocation::Reward (RC_TWINROVA,       0xFF, "Twinrova",      TWINROVA,      SPIRIT_MEDALLION,  {}, SpoilerCollectionCheck::Chest(0x17, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[BONGO_BONGO]                                   = ItemLocation::Reward (RC_BONGO_BONGO,    0xFF, "Bongo Bongo",   BONGO_BONGO,   SHADOW_MEDALLION,  {}, SpoilerCollectionCheck::Chest(0x18, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[GANON]                                         = ItemLocation::Reward (RC_GANON,          0xFF, "Ganon",         NONE,          TRIFORCE,          {}, SpoilerCollectionCheck::None(),            SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-
-    /*-------------------------------
-          ---HEART CONTAINERS ---
-      -------------------------------*/
-
-    locationTable[DEKU_TREE_QUEEN_GOHMA_HEART]                   = ItemLocation::Base   (RC_DEKU_TREE_QUEEN_GOHMA_HEART,        0x11, "Deku Tree Queen Gohma Heart Container",          DEKU_TREE_QUEEN_GOHMA_HEART,        HEART_CONTAINER,    {Category::cSongDungeonReward}, SpoilerCollectionCheck::Collectable(0x11, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[DODONGOS_CAVERN_KING_DODONGO_HEART]            = ItemLocation::Base   (RC_DODONGOS_CAVERN_KING_DODONGO_HEART, 0x12, "Dodongos Cavern King Dodongo Heart Container",   DODONGOS_CAVERN_KING_DODONGO_HEART, HEART_CONTAINER,    {Category::cSongDungeonReward}, SpoilerCollectionCheck::Collectable(0x12, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[JABU_JABUS_BELLY_BARINADE_HEART]               = ItemLocation::Base   (RC_JABU_JABUS_BELLY_BARINADE_HEART,    0x13, "Jabu Jabus Belly Barinade Heart Container",      JABU_JABUS_BELLY_BARINADE_HEART,    HEART_CONTAINER,    {Category::cSongDungeonReward}, SpoilerCollectionCheck::Collectable(0x13, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[FOREST_TEMPLE_PHANTOM_GANON_HEART]             = ItemLocation::Base   (RC_FOREST_TEMPLE_PHANTOM_GANON_HEART,  0x14, "Forest Temple Phantom Ganon Heart Container",    FOREST_TEMPLE_PHANTOM_GANON_HEART,  HEART_CONTAINER,    {Category::cSongDungeonReward}, SpoilerCollectionCheck::Collectable(0x14, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[FIRE_TEMPLE_VOLVAGIA_HEART]                    = ItemLocation::Base   (RC_FIRE_TEMPLE_VOLVAGIA_HEART,         0x15, "Fire Temple Volvagia Heart Container",           FIRE_TEMPLE_VOLVAGIA_HEART,         HEART_CONTAINER,    {Category::cSongDungeonReward}, SpoilerCollectionCheck::Collectable(0x15, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[WATER_TEMPLE_MORPHA_HEART]                     = ItemLocation::Base   (RC_WATER_TEMPLE_MORPHA_HEART,          0x16, "Water Temple Morpha Heart Container",            WATER_TEMPLE_MORPHA_HEART,          HEART_CONTAINER,    {Category::cSongDungeonReward}, SpoilerCollectionCheck::Collectable(0x16, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[SPIRIT_TEMPLE_TWINROVA_HEART]                  = ItemLocation::Base   (RC_SPIRIT_TEMPLE_TWINROVA_HEART,       0x17, "Spirit Temple Twinrova Heart Container",         SPIRIT_TEMPLE_TWINROVA_HEART,       HEART_CONTAINER,    {Category::cSongDungeonReward}, SpoilerCollectionCheck::Collectable(0x17, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[SHADOW_TEMPLE_BONGO_BONGO_HEART]               = ItemLocation::Base   (RC_SHADOW_TEMPLE_BONGO_BONGO_HEART,    0x18, "Shadow Temple Bongo Bongo Heart Container",      SHADOW_TEMPLE_BONGO_BONGO_HEART,    HEART_CONTAINER,    {Category::cSongDungeonReward}, SpoilerCollectionCheck::Collectable(0x18, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-
-    /*-------------------------------
-            --- CUTSCENES ---
-      -------------------------------*/
-
-    locationTable[TOT_LIGHT_ARROWS_CUTSCENE]                     = ItemLocation::Delayed(RC_TOT_LIGHT_ARROWS_CUTSCENE,          0xFF, "ToT Light Arrow Cutscene",                       TOT_LIGHT_ARROWS_CUTSCENE,   LIGHT_ARROWS,              {}, SpoilerCollectionCheck::Chest(0x43, 0x1E), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[LW_GIFT_FROM_SARIA]                            = ItemLocation::Delayed(RC_LW_GIFT_FROM_SARIA,                 0xFF, "LW Gift From Saria",                             LW_GIFT_FROM_SARIA,          PROGRESSIVE_OCARINA,       {}, SpoilerCollectionCheck::EventChkInf(0xC1), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[ZF_GREAT_FAIRY_REWARD]                         = ItemLocation::Delayed(RC_ZF_GREAT_FAIRY_REWARD,              0xFF, "ZF Great Fairy Reward",                          ZF_GREAT_FAIRY_REWARD,       FARORES_WIND,              {}, SpoilerCollectionCheck::Chest(0x3D, 0x01), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[HC_GREAT_FAIRY_REWARD]                         = ItemLocation::Delayed(RC_HC_GREAT_FAIRY_REWARD,              0xFF, "HC Great Fairy Reward",                          HC_GREAT_FAIRY_REWARD,       DINS_FIRE,                 {}, SpoilerCollectionCheck::Chest(0x3D, 0x02), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[COLOSSUS_GREAT_FAIRY_REWARD]                   = ItemLocation::Delayed(RC_COLOSSUS_GREAT_FAIRY_REWARD,        0xFF, "Colossus Great Fairy Reward",                    COLOSSUS_GREAT_FAIRY_REWARD, NAYRUS_LOVE,               {}, SpoilerCollectionCheck::Chest(0x3D, 0x03), SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[DMT_GREAT_FAIRY_REWARD]                        = ItemLocation::Delayed(RC_DMT_GREAT_FAIRY_REWARD,             0xFF, "DMT Great Fairy Reward",                         DMT_GREAT_FAIRY_REWARD,      PROGRESSIVE_MAGIC_METER,   {}, SpoilerCollectionCheck::Chest(0x3B, 0x01), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[DMC_GREAT_FAIRY_REWARD]                        = ItemLocation::Delayed(RC_DMC_GREAT_FAIRY_REWARD,             0xFF, "DMC Great Fairy Reward",                         DMC_GREAT_FAIRY_REWARD,      PROGRESSIVE_MAGIC_METER,   {}, SpoilerCollectionCheck::Chest(0x3B, 0x02), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[OGC_GREAT_FAIRY_REWARD]                        = ItemLocation::Delayed(RC_OGC_GREAT_FAIRY_REWARD,             0xFF, "OGC Great Fairy Reward",                         OGC_GREAT_FAIRY_REWARD,      DOUBLE_DEFENSE,            {}, SpoilerCollectionCheck::Chest(0x3B, 0x03), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-
-    locationTable[SHEIK_IN_FOREST]                               = ItemLocation::Delayed(RC_SHEIK_IN_FOREST,                    0xFF, "Sheik in Forest",                                SHEIK_IN_FOREST,             MINUET_OF_FOREST,          {Category::cSong},                               SpoilerCollectionCheck::EventChkInf(0x50), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[SHEIK_IN_CRATER]                               = ItemLocation::Delayed(RC_SHEIK_IN_CRATER,                    0xFF, "Sheik in Crater",                                SHEIK_IN_CRATER,             BOLERO_OF_FIRE,            {Category::cSong},                               SpoilerCollectionCheck::EventChkInf(0x51), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[SHEIK_IN_ICE_CAVERN]                           = ItemLocation::Delayed(RC_SHEIK_IN_ICE_CAVERN,                0xFF, "Sheik in Ice Cavern",                            SHEIK_IN_ICE_CAVERN,         SERENADE_OF_WATER,         {Category::cSong, Category::cSongDungeonReward}, SpoilerCollectionCheck::EventChkInf(0x52), SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
-    locationTable[SHEIK_AT_COLOSSUS]                             = ItemLocation::Delayed(RC_SHEIK_AT_COLOSSUS,                  0xFF, "Sheik at Colossus",                              SHEIK_AT_COLOSSUS,           REQUIEM_OF_SPIRIT,         {Category::cSong},                               SpoilerCollectionCheck::EventChkInf(0xAC), SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[SHEIK_IN_KAKARIKO]                             = ItemLocation::Delayed(RC_SHEIK_IN_KAKARIKO,                  0xFF, "Sheik in Kakariko",                              SHEIK_IN_KAKARIKO,           NOCTURNE_OF_SHADOW,        {Category::cSong},                               SpoilerCollectionCheck::EventChkInf(0xAA), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[SHEIK_AT_TEMPLE]                               = ItemLocation::Delayed(RC_SHEIK_AT_TEMPLE,                    0xFF, "Sheik at Temple",                                SHEIK_AT_TEMPLE,             PRELUDE_OF_LIGHT,          {Category::cSong},                               SpoilerCollectionCheck::Chest(0x43, 0x1F), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[SONG_FROM_IMPA]                                = ItemLocation::Delayed(RC_SONG_FROM_IMPA,                     0xFF, "Song from Impa",                                 SONG_FROM_IMPA,              ZELDAS_LULLABY,            {Category::cSong, Category::cSongDungeonReward}, SpoilerCollectionCheck::EventChkInf(0x59), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[SONG_FROM_MALON]                               = ItemLocation::Delayed(RC_SONG_FROM_MALON,                    0xFF, "Song from Malon",                                SONG_FROM_MALON,             EPONAS_SONG,               {Category::cSong},                               SpoilerCollectionCheck::Chest(0x63, 0x1F), SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
-    locationTable[SONG_FROM_SARIA]                               = ItemLocation::Delayed(RC_SONG_FROM_SARIA,                    0xFF, "Song from Saria",                                SONG_FROM_SARIA,             SARIAS_SONG,               {Category::cSong},                               SpoilerCollectionCheck::Chest(0x56, 0x1F), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[SONG_FROM_COMPOSERS_GRAVE]                     = ItemLocation::Delayed(RC_SONG_FROM_ROYAL_FAMILYS_TOMB,       0xFF, "Song from Composers Grave",                      SONG_FROM_COMPOSERS_GRAVE,   SUNS_SONG,                 {Category::cSong},                               SpoilerCollectionCheck::Chest(0x41, 0x1F), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[SONG_FROM_OCARINA_OF_TIME]                     = ItemLocation::Delayed(RC_SONG_FROM_OCARINA_OF_TIME,          0xFF, "Song from Ocarina of Time",                      SONG_FROM_OCARINA_OF_TIME,   SONG_OF_TIME,              {Category::cSong},                               SpoilerCollectionCheck::Chest(0x51, 0x1F), SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[SONG_FROM_WINDMILL]                            = ItemLocation::Delayed(RC_SONG_FROM_WINDMILL,                 0xFF, "Song from Windmill",                             SONG_FROM_WINDMILL,          SONG_OF_STORMS,            {Category::cSong},                               SpoilerCollectionCheck::EventChkInf(0x5B), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-
-    /*-------------------------------
-               --- COWS ---
-      -------------------------------*/
-
-    locationTable[KF_LINKS_HOUSE_COW]                            = ItemLocation::Base   (RC_KF_LINKS_HOUSE_COW,                 0x34, "KF Links House Cow",                             KF_LINKS_HOUSE_COW,          MILK,                      {Category::cCow}, SpoilerCollectionCheck::Cow(), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[HF_COW_GROTTO_COW]                             = ItemLocation::Base   (RC_HF_COW_GROTTO_COW,                  0x3E, "HF Cow Grotto Cow",                              HF_COW_GROTTO_COW,           MILK,                      {Category::cCow}, SpoilerCollectionCheck::Cow(), SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[LLR_STABLES_LEFT_COW]                          = ItemLocation::Base   (RC_LLR_STABLES_LEFT_COW,               0x36, "LLR Stables Left Cow",                           LLR_STABLES_LEFT_COW,        MILK,                      {Category::cCow}, SpoilerCollectionCheck::Cow(), SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
-    locationTable[LLR_STABLES_RIGHT_COW]                         = ItemLocation::Base   (RC_LLR_STABLES_RIGHT_COW,              0x36, "LLR Stables Right Cow",                          LLR_STABLES_RIGHT_COW,       MILK,                      {Category::cCow}, SpoilerCollectionCheck::Cow(), SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
-    locationTable[LLR_TOWER_LEFT_COW]                            = ItemLocation::Base   (RC_LLR_TOWER_LEFT_COW,                 0x4C, "LLR Tower Left Cow",                             LLR_TOWER_LEFT_COW,          MILK,                      {Category::cCow}, SpoilerCollectionCheck::Cow(), SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
-    locationTable[LLR_TOWER_RIGHT_COW]                           = ItemLocation::Base   (RC_LLR_TOWER_RIGHT_COW,                0x4C, "LLR Tower Right Cow",                            LLR_TOWER_RIGHT_COW,         MILK,                      {Category::cCow}, SpoilerCollectionCheck::Cow(), SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
-    locationTable[KAK_IMPAS_HOUSE_COW]                           = ItemLocation::Base   (RC_KAK_IMPAS_HOUSE_COW,                0x37, "Kak Impas House Cow",                            KAK_IMPAS_HOUSE_COW,         MILK,                      {Category::cCow}, SpoilerCollectionCheck::Cow(), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[DMT_COW_GROTTO_COW]                            = ItemLocation::Base   (RC_DMT_COW_GROTTO_COW,                 0x3E, "DMT Cow Grotto Cow",                             DMT_COW_GROTTO_COW,          MILK,                      {Category::cCow}, SpoilerCollectionCheck::Cow(), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[GV_COW]                                        = ItemLocation::Base   (RC_GV_COW,                             0x5A, "GV Cow",                                         GV_COW,                      MILK,                      {Category::cCow}, SpoilerCollectionCheck::Cow(), SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[JABU_JABUS_BELLY_MQ_COW]                       = ItemLocation::Base   (RC_JABU_JABUS_BELLY_MQ_COW,            0x02, "Jabu Jabus Belly MQ Cow",                        JABU_JABUS_BELLY_MQ_COW,     MILK,                      {Category::cCow}, SpoilerCollectionCheck::Cow(), SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-
-    /*-------------------------------
-              --- SHOPS ---
-      8     6               2     4
-
-      7     5               1     3
-      -------------------------------*/
-
-    locationTable[KF_SHOP_ITEM_1]             = ItemLocation::Base(RC_KF_SHOP_ITEM_1,             0x2D, "KF Shop Item 1",         KF_SHOP_ITEM_1,             BUY_DEKU_SHIELD,   {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[KF_SHOP_ITEM_2]             = ItemLocation::Base(RC_KF_SHOP_ITEM_2,             0x2D, "KF Shop Item 2",         KF_SHOP_ITEM_2,             BUY_DEKU_NUT_5,    {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[KF_SHOP_ITEM_3]             = ItemLocation::Base(RC_KF_SHOP_ITEM_3,             0x2D, "KF Shop Item 3",         KF_SHOP_ITEM_3,             BUY_DEKU_NUT_10,   {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[KF_SHOP_ITEM_4]             = ItemLocation::Base(RC_KF_SHOP_ITEM_4,             0x2D, "KF Shop Item 4",         KF_SHOP_ITEM_4,             BUY_DEKU_STICK_1,  {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[KF_SHOP_ITEM_5]             = ItemLocation::Base(RC_KF_SHOP_ITEM_5,             0x2D, "KF Shop Item 5",         KF_SHOP_ITEM_5,             BUY_DEKU_SEEDS_30, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[KF_SHOP_ITEM_6]             = ItemLocation::Base(RC_KF_SHOP_ITEM_6,             0x2D, "KF Shop Item 6",         KF_SHOP_ITEM_6,             BUY_ARROWS_10,     {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[KF_SHOP_ITEM_7]             = ItemLocation::Base(RC_KF_SHOP_ITEM_7,             0x2D, "KF Shop Item 7",         KF_SHOP_ITEM_7,             BUY_ARROWS_30,     {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[KF_SHOP_ITEM_8]             = ItemLocation::Base(RC_KF_SHOP_ITEM_8,             0x2D, "KF Shop Item 8",         KF_SHOP_ITEM_8,             BUY_HEART,         {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-
-    locationTable[KAK_POTION_SHOP_ITEM_1]     = ItemLocation::Base(RC_KAK_POTION_SHOP_ITEM_1,     0x30, "Kak Potion Shop Item 1", KAK_POTION_SHOP_ITEM_1,     BUY_GREEN_POTION,  {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[KAK_POTION_SHOP_ITEM_2]     = ItemLocation::Base(RC_KAK_POTION_SHOP_ITEM_2,     0x30, "Kak Potion Shop Item 2", KAK_POTION_SHOP_ITEM_2,     BUY_BLUE_FIRE,     {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[KAK_POTION_SHOP_ITEM_3]     = ItemLocation::Base(RC_KAK_POTION_SHOP_ITEM_3,     0x30, "Kak Potion Shop Item 3", KAK_POTION_SHOP_ITEM_3,     BUY_RED_POTION_30, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[KAK_POTION_SHOP_ITEM_4]     = ItemLocation::Base(RC_KAK_POTION_SHOP_ITEM_4,     0x30, "Kak Potion Shop Item 4", KAK_POTION_SHOP_ITEM_4,     BUY_FAIRYS_SPIRIT, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[KAK_POTION_SHOP_ITEM_5]     = ItemLocation::Base(RC_KAK_POTION_SHOP_ITEM_5,     0x30, "Kak Potion Shop Item 5", KAK_POTION_SHOP_ITEM_5,     BUY_DEKU_NUT_5,    {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[KAK_POTION_SHOP_ITEM_6]     = ItemLocation::Base(RC_KAK_POTION_SHOP_ITEM_6,     0x30, "Kak Potion Shop Item 6", KAK_POTION_SHOP_ITEM_6,     BUY_BOTTLE_BUG,    {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[KAK_POTION_SHOP_ITEM_7]     = ItemLocation::Base(RC_KAK_POTION_SHOP_ITEM_7,     0x30, "Kak Potion Shop Item 7", KAK_POTION_SHOP_ITEM_7,     BUY_POE,           {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[KAK_POTION_SHOP_ITEM_8]     = ItemLocation::Base(RC_KAK_POTION_SHOP_ITEM_8,     0x30, "Kak Potion Shop Item 8", KAK_POTION_SHOP_ITEM_8,     BUY_FISH,          {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-
-    locationTable[MARKET_BOMBCHU_SHOP_ITEM_1] = ItemLocation::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_1, 0x32, "MK Bombchu Shop Item 1", MARKET_BOMBCHU_SHOP_ITEM_1, BUY_BOMBCHU_10,    {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[MARKET_BOMBCHU_SHOP_ITEM_2] = ItemLocation::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_2, 0x32, "MK Bombchu Shop Item 2", MARKET_BOMBCHU_SHOP_ITEM_2, BUY_BOMBCHU_10,    {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[MARKET_BOMBCHU_SHOP_ITEM_3] = ItemLocation::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_3, 0x32, "MK Bombchu Shop Item 3", MARKET_BOMBCHU_SHOP_ITEM_3, BUY_BOMBCHU_10,    {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[MARKET_BOMBCHU_SHOP_ITEM_4] = ItemLocation::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_4, 0x32, "MK Bombchu Shop Item 4", MARKET_BOMBCHU_SHOP_ITEM_4, BUY_BOMBCHU_10,    {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[MARKET_BOMBCHU_SHOP_ITEM_5] = ItemLocation::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_5, 0x32, "MK Bombchu Shop Item 5", MARKET_BOMBCHU_SHOP_ITEM_5, BUY_BOMBCHU_20,    {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[MARKET_BOMBCHU_SHOP_ITEM_6] = ItemLocation::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_6, 0x32, "MK Bombchu Shop Item 6", MARKET_BOMBCHU_SHOP_ITEM_6, BUY_BOMBCHU_20,    {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[MARKET_BOMBCHU_SHOP_ITEM_7] = ItemLocation::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_7, 0x32, "MK Bombchu Shop Item 7", MARKET_BOMBCHU_SHOP_ITEM_7, BUY_BOMBCHU_20,    {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[MARKET_BOMBCHU_SHOP_ITEM_8] = ItemLocation::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_8, 0x32, "MK Bombchu Shop Item 8", MARKET_BOMBCHU_SHOP_ITEM_8, BUY_BOMBCHU_20,    {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-
-    locationTable[MARKET_POTION_SHOP_ITEM_1]  = ItemLocation::Base(RC_MARKET_POTION_SHOP_ITEM_1,  0x31, "MK Potion Shop Item 1",  MARKET_POTION_SHOP_ITEM_1,  BUY_GREEN_POTION,  {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[MARKET_POTION_SHOP_ITEM_2]  = ItemLocation::Base(RC_MARKET_POTION_SHOP_ITEM_2,  0x31, "MK Potion Shop Item 2",  MARKET_POTION_SHOP_ITEM_2,  BUY_BLUE_FIRE,     {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[MARKET_POTION_SHOP_ITEM_3]  = ItemLocation::Base(RC_MARKET_POTION_SHOP_ITEM_3,  0x31, "MK Potion Shop Item 3",  MARKET_POTION_SHOP_ITEM_3,  BUY_RED_POTION_30, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[MARKET_POTION_SHOP_ITEM_4]  = ItemLocation::Base(RC_MARKET_POTION_SHOP_ITEM_4,  0x31, "MK Potion Shop Item 4",  MARKET_POTION_SHOP_ITEM_4,  BUY_FAIRYS_SPIRIT, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[MARKET_POTION_SHOP_ITEM_5]  = ItemLocation::Base(RC_MARKET_POTION_SHOP_ITEM_5,  0x31, "MK Potion Shop Item 5",  MARKET_POTION_SHOP_ITEM_5,  BUY_DEKU_NUT_5,    {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[MARKET_POTION_SHOP_ITEM_6]  = ItemLocation::Base(RC_MARKET_POTION_SHOP_ITEM_6,  0x31, "MK Potion Shop Item 6",  MARKET_POTION_SHOP_ITEM_6,  BUY_BOTTLE_BUG,    {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[MARKET_POTION_SHOP_ITEM_7]  = ItemLocation::Base(RC_MARKET_POTION_SHOP_ITEM_7,  0x31, "MK Potion Shop Item 7",  MARKET_POTION_SHOP_ITEM_7,  BUY_POE,           {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[MARKET_POTION_SHOP_ITEM_8]  = ItemLocation::Base(RC_MARKET_POTION_SHOP_ITEM_8,  0x31, "MK Potion Shop Item 8",  MARKET_POTION_SHOP_ITEM_8,  BUY_FISH,          {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-
-    locationTable[MARKET_BAZAAR_ITEM_1]       = ItemLocation::Base(RC_MARKET_BAZAAR_ITEM_1,       0x2C, "MK Bazaar Item 1",       MARKET_BAZAAR_ITEM_1,       BUY_HYLIAN_SHIELD, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[MARKET_BAZAAR_ITEM_2]       = ItemLocation::Base(RC_MARKET_BAZAAR_ITEM_2,       0x2C, "MK Bazaar Item 2",       MARKET_BAZAAR_ITEM_2,       BUY_BOMBS_535,     {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[MARKET_BAZAAR_ITEM_3]       = ItemLocation::Base(RC_MARKET_BAZAAR_ITEM_3,       0x2C, "MK Bazaar Item 3",       MARKET_BAZAAR_ITEM_3,       BUY_DEKU_NUT_5,    {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[MARKET_BAZAAR_ITEM_4]       = ItemLocation::Base(RC_MARKET_BAZAAR_ITEM_4,       0x2C, "MK Bazaar Item 4",       MARKET_BAZAAR_ITEM_4,       BUY_HEART,         {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[MARKET_BAZAAR_ITEM_5]       = ItemLocation::Base(RC_MARKET_BAZAAR_ITEM_5,       0x2C, "MK Bazaar Item 5",       MARKET_BAZAAR_ITEM_5,       BUY_ARROWS_10,     {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[MARKET_BAZAAR_ITEM_6]       = ItemLocation::Base(RC_MARKET_BAZAAR_ITEM_6,       0x2C, "MK Bazaar Item 6",       MARKET_BAZAAR_ITEM_6,       BUY_ARROWS_50,     {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[MARKET_BAZAAR_ITEM_7]       = ItemLocation::Base(RC_MARKET_BAZAAR_ITEM_7,       0x2C, "MK Bazaar Item 7",       MARKET_BAZAAR_ITEM_7,       BUY_DEKU_STICK_1,  {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[MARKET_BAZAAR_ITEM_8]       = ItemLocation::Base(RC_MARKET_BAZAAR_ITEM_8,       0x2C, "MK Bazaar Item 8",       MARKET_BAZAAR_ITEM_8,       BUY_ARROWS_30,     {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-
-    locationTable[KAK_BAZAAR_ITEM_1]          = ItemLocation::Base(RC_KAK_BAZAAR_ITEM_1,          0x2C, "Kak Bazaar Item 1",      KAK_BAZAAR_ITEM_1,          BUY_HYLIAN_SHIELD, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[KAK_BAZAAR_ITEM_2]          = ItemLocation::Base(RC_KAK_BAZAAR_ITEM_2,          0x2C, "Kak Bazaar Item 2",      KAK_BAZAAR_ITEM_2,          BUY_BOMBS_535,     {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[KAK_BAZAAR_ITEM_3]          = ItemLocation::Base(RC_KAK_BAZAAR_ITEM_3,          0x2C, "Kak Bazaar Item 3",      KAK_BAZAAR_ITEM_3,          BUY_DEKU_NUT_5,    {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[KAK_BAZAAR_ITEM_4]          = ItemLocation::Base(RC_KAK_BAZAAR_ITEM_4,          0x2C, "Kak Bazaar Item 4",      KAK_BAZAAR_ITEM_4,          BUY_HEART,         {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[KAK_BAZAAR_ITEM_5]          = ItemLocation::Base(RC_KAK_BAZAAR_ITEM_5,          0x2C, "Kak Bazaar Item 5",      KAK_BAZAAR_ITEM_5,          BUY_ARROWS_10,     {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[KAK_BAZAAR_ITEM_6]          = ItemLocation::Base(RC_KAK_BAZAAR_ITEM_6,          0x2C, "Kak Bazaar Item 6",      KAK_BAZAAR_ITEM_6,          BUY_ARROWS_50,     {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[KAK_BAZAAR_ITEM_7]          = ItemLocation::Base(RC_KAK_BAZAAR_ITEM_7,          0x2C, "Kak Bazaar Item 7",      KAK_BAZAAR_ITEM_7,          BUY_DEKU_STICK_1,  {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[KAK_BAZAAR_ITEM_8]          = ItemLocation::Base(RC_KAK_BAZAAR_ITEM_8,          0x2C, "Kak Bazaar Item 8",      KAK_BAZAAR_ITEM_8,          BUY_ARROWS_30,     {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-
-    locationTable[ZD_SHOP_ITEM_1]             = ItemLocation::Base(RC_ZD_SHOP_ITEM_1,             0x2F, "ZD Shop Item 1",         ZD_SHOP_ITEM_1,             BUY_ZORA_TUNIC,    {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[ZD_SHOP_ITEM_2]             = ItemLocation::Base(RC_ZD_SHOP_ITEM_2,             0x2F, "ZD Shop Item 2",         ZD_SHOP_ITEM_2,             BUY_ARROWS_10,     {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[ZD_SHOP_ITEM_3]             = ItemLocation::Base(RC_ZD_SHOP_ITEM_3,             0x2F, "ZD Shop Item 3",         ZD_SHOP_ITEM_3,             BUY_HEART,         {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[ZD_SHOP_ITEM_4]             = ItemLocation::Base(RC_ZD_SHOP_ITEM_4,             0x2F, "ZD Shop Item 4",         ZD_SHOP_ITEM_4,             BUY_ARROWS_30,     {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[ZD_SHOP_ITEM_5]             = ItemLocation::Base(RC_ZD_SHOP_ITEM_5,             0x2F, "ZD Shop Item 5",         ZD_SHOP_ITEM_5,             BUY_DEKU_NUT_5,    {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[ZD_SHOP_ITEM_6]             = ItemLocation::Base(RC_ZD_SHOP_ITEM_6,             0x2F, "ZD Shop Item 6",         ZD_SHOP_ITEM_6,             BUY_ARROWS_50,     {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[ZD_SHOP_ITEM_7]             = ItemLocation::Base(RC_ZD_SHOP_ITEM_7,             0x2F, "ZD Shop Item 7",         ZD_SHOP_ITEM_7,             BUY_FISH,          {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[ZD_SHOP_ITEM_8]             = ItemLocation::Base(RC_ZD_SHOP_ITEM_8,             0x2F, "ZD Shop Item 8",         ZD_SHOP_ITEM_8,             BUY_RED_POTION_50, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-
-    locationTable[GC_SHOP_ITEM_1]             = ItemLocation::Base(RC_GC_SHOP_ITEM_1,             0x2E, "GC Shop Item 1",         GC_SHOP_ITEM_1,             BUY_BOMBS_525,     {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[GC_SHOP_ITEM_2]             = ItemLocation::Base(RC_GC_SHOP_ITEM_2,             0x2E, "GC Shop Item 2",         GC_SHOP_ITEM_2,             BUY_BOMBS_10,      {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[GC_SHOP_ITEM_3]             = ItemLocation::Base(RC_GC_SHOP_ITEM_3,             0x2E, "GC Shop Item 3",         GC_SHOP_ITEM_3,             BUY_BOMBS_20,      {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[GC_SHOP_ITEM_4]             = ItemLocation::Base(RC_GC_SHOP_ITEM_4,             0x2E, "GC Shop Item 4",         GC_SHOP_ITEM_4,             BUY_BOMBS_30,      {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[GC_SHOP_ITEM_5]             = ItemLocation::Base(RC_GC_SHOP_ITEM_5,             0x2E, "GC Shop Item 5",         GC_SHOP_ITEM_5,             BUY_GORON_TUNIC,   {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[GC_SHOP_ITEM_6]             = ItemLocation::Base(RC_GC_SHOP_ITEM_6,             0x2E, "GC Shop Item 6",         GC_SHOP_ITEM_6,             BUY_HEART,         {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[GC_SHOP_ITEM_7]             = ItemLocation::Base(RC_GC_SHOP_ITEM_7,             0x2E, "GC Shop Item 7",         GC_SHOP_ITEM_7,             BUY_RED_POTION_40, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[GC_SHOP_ITEM_8]             = ItemLocation::Base(RC_GC_SHOP_ITEM_8,             0x2E, "GC Shop Item 8",         GC_SHOP_ITEM_8,             BUY_HEART,         {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-
-    /*-------------------------------
-          --- GOSSIP STONES ---
-      -------------------------------*/
-    // These are not actual locations, but are filler spots used for hint reachability. - OoT Randomizer
-    locationTable[DMC_GOSSIP_STONE]                      = ItemLocation::HintStone(RC_DMC_GOSSIP_STONE,                "DMC Gossip Stone");
-    locationTable[DMT_GOSSIP_STONE]                      = ItemLocation::HintStone(RC_DMT_GOSSIP_STONE,                "DMT Gossip Stone");
-    locationTable[COLOSSUS_GOSSIP_STONE]                 = ItemLocation::HintStone(RC_COLOSSUS_GOSSIP_STONE,           "Colossus Gossip Stone");
-    locationTable[DODONGOS_CAVERN_GOSSIP_STONE]          = ItemLocation::HintStone(RC_DODONGOS_CAVERN_GOSSIP_STONE,    "Dodongo's Cavern Gossip Stone");
-    locationTable[GV_GOSSIP_STONE]                       = ItemLocation::HintStone(RC_GV_GOSSIP_STONE,                 "GV Gossip Stone");
-    locationTable[GC_MAZE_GOSSIP_STONE]                  = ItemLocation::HintStone(RC_GC_MAZE_GOSSIP_STONE,            "GC Maze Gossip Stone");
-    locationTable[GC_MEDIGORON_GOSSIP_STONE]             = ItemLocation::HintStone(RC_GC_MEDIGORON_GOSSIP_STONE,       "GC Medigoron Gossip Stone");
-    locationTable[GRAVEYARD_GOSSIP_STONE]                = ItemLocation::HintStone(RC_GY_GOSSIP_STONE,                 "GY Gossip Stone");
-    locationTable[HC_MALON_GOSSIP_STONE]                 = ItemLocation::HintStone(RC_HC_MALON_GOSSIP_STONE,           "HC Malon Gossip Stone");
-    locationTable[HC_ROCK_WALL_GOSSIP_STONE]             = ItemLocation::HintStone(RC_HC_ROCK_WALL_GOSSIP_STONE,       "HC Rock Wall Gossip Stone");
-    locationTable[HC_STORMS_GROTTO_GOSSIP_STONE]         = ItemLocation::HintStone(RC_HC_STORMS_GROTTO_GOSSIP_STONE,   "HC Storms Grotto Gossip Stone");
-    locationTable[KF_DEKU_TREE_GOSSIP_STONE_LEFT]        = ItemLocation::HintStone(RC_KF_DEKU_TREE_LEFT_GOSSIP_STONE,  "KF Deku Tree Left Gossip Stone");
-    locationTable[KF_DEKU_TREE_GOSSIP_STONE_RIGHT]       = ItemLocation::HintStone(RC_KF_DEKU_TREE_RIGHT_GOSSIP_STONE, "KF Deku Tree Right Gossip Stone");
-    locationTable[KF_GOSSIP_STONE]                       = ItemLocation::HintStone(RC_KF_GOSSIP_STONE,                 "KF Gossip Stone");
-    locationTable[LH_LAB_GOSSIP_STONE]                   = ItemLocation::HintStone(RC_LH_LAB_GOSSIP_STONE,             "LH Lab Gossip Stone");
-    locationTable[LH_GOSSIP_STONE_SOUTHEAST]             = ItemLocation::HintStone(RC_LH_SOUTHEAST_GOSSIP_STONE,       "LH Southeast Gossip Stone");
-    locationTable[LH_GOSSIP_STONE_SOUTHWEST]             = ItemLocation::HintStone(RC_LH_SOUTHWEST_GOSSIP_STONE,       "LH Southwest Gossip Stone");
-    locationTable[LW_GOSSIP_STONE]                       = ItemLocation::HintStone(RC_LW_GOSSIP_STONE,                 "LW Gossip Stone");
-    locationTable[SFM_MAZE_GOSSIP_STONE_LOWER]           = ItemLocation::HintStone(RC_SFM_MAZE_LOWER_GOSSIP_STONE,     "SFM Maze Lower Gossip Stone");
-    locationTable[SFM_MAZE_GOSSIP_STONE_UPPER]           = ItemLocation::HintStone(RC_SFM_MAZE_UPPER_GOSSIP_STONE,     "SFM Maze Upper Gossip Stone");
-    locationTable[SFM_SARIA_GOSSIP_STONE]                = ItemLocation::HintStone(RC_SFM_SARIA_GOSSIP_STONE,          "SFM Saria Gossip Stone");
-    locationTable[TOT_GOSSIP_STONE_LEFT]                 = ItemLocation::HintStone(RC_TOT_LEFT_GOSSIP_STONE,           "ToT Left Gossip Stone");
-    locationTable[TOT_GOSSIP_STONE_RIGHT]                = ItemLocation::HintStone(RC_TOT_RIGHT_GOSSIP_STONE,          "ToT Left Center Gossip Stone");
-    locationTable[TOT_GOSSIP_STONE_RIGHT_CENTER]         = ItemLocation::HintStone(RC_TOT_RIGHT_CENTER_GOSSIP_STONE,   "ToT Right Center Gossip Stone");
-    locationTable[TOT_GOSSIP_STONE_LEFT_CENTER]          = ItemLocation::HintStone(RC_TOT_LEFT_CENTER_GOSSIP_STONE,    "ToT Right Gossip Stone");
-    locationTable[ZD_GOSSIP_STONE]                       = ItemLocation::HintStone(RC_ZD_GOSSIP_STONE,                 "ZD Gossip Stone");
-    locationTable[ZF_FAIRY_GOSSIP_STONE]                 = ItemLocation::HintStone(RC_FAIRY_GOSSIP_STONE,              "Fairy Gossip Stone");
-    locationTable[ZF_JABU_GOSSIP_STONE]                  = ItemLocation::HintStone(RC_JABU_GOSSIP_STONE,               "Jabu Gossip Stone");
-    locationTable[ZR_NEAR_GROTTOS_GOSSIP_STONE]          = ItemLocation::HintStone(RC_ZR_NEAR_GROTTOS_GOSSIP_STONE,    "ZR Near Grottos Gossip Stone");
-    locationTable[ZR_NEAR_DOMAIN_GOSSIP_STONE]           = ItemLocation::HintStone(RC_ZR_NEAR_DOMAIN_GOSSIP_STONE,     "ZR Near Domain Gossip Stone");
-    locationTable[HF_COW_GROTTO_GOSSIP_STONE]            = ItemLocation::HintStone(RC_HF_COW_GROTTO_GOSSIP_STONE,      "HF Cow Grotto Gossip Stone");
-
-    locationTable[HF_NEAR_MARKET_GROTTO_GOSSIP_STONE]    = ItemLocation::HintStone(RC_HF_NEAR_MARKET_GOSSIP_STONE,     "HF Near Market Gossip Stone");
-    locationTable[HF_SOUTHEAST_GROTTO_GOSSIP_STONE]      = ItemLocation::HintStone(RC_HF_SOUTHEAST_GOSSIP_STONE,       "HF Southeast Gossip Stone");
-    locationTable[HF_OPEN_GROTTO_GOSSIP_STONE]           = ItemLocation::HintStone(RC_HF_OPEN_GROTTO_GOSSIP_STONE,     "HF Open Grotto Gossip Stone");
-    locationTable[KAK_OPEN_GROTTO_GOSSIP_STONE]          = ItemLocation::HintStone(RC_KAK_OPEN_GROTTO_GOSSIP_STONE,    "Kak Open Grotto Gossip Stone");
-    locationTable[ZR_OPEN_GROTTO_GOSSIP_STONE]           = ItemLocation::HintStone(RC_ZR_OPEN_GROTTO_GOSSIP_STONE,     "ZR Open Grotto Gossip Stone");
-    locationTable[KF_STORMS_GROTTO_GOSSIP_STONE]         = ItemLocation::HintStone(RC_KF_STORMS_GOSSIP_STONE,          "KF Storms Gossip Stone");
-    locationTable[LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE] = ItemLocation::HintStone(RC_LW_NEAR_SHORTCUTS_GOSSIP_STONE,  "LW Near Shortcuts Gossip Stone");
-    locationTable[DMT_STORMS_GROTTO_GOSSIP_STONE]        = ItemLocation::HintStone(RC_DMT_STORMS_GROTTO_GOSSIP_STONE,  "DMT Storms Grotto Gossip Stone");
-    locationTable[DMC_UPPER_GROTTO_GOSSIP_STONE]         = ItemLocation::HintStone(RC_DMC_UPPER_GROTTO_GOSSIP_STONE,   "DMC Upper Grotto Gossip Stone");
-
-    locationTable[GANONDORF_HINT]                        = ItemLocation::OtherHint(RC_GANONDORF_HINT,                  "Ganondorf Hint");
-    locationTable[TRIFORCE_COMPLETED]                    = ItemLocation::Reward (RC_TRIFORCE_COMPLETED, 0xFF, "Completed Triforce", NONE, TRIFORCE_COMPLETED, {}, SpoilerCollectionCheck::None(), SpoilerCollectionCheckGroup::GROUP_NO_GROUP);
-
-    for (int i = NONE; i != KEY_ENUM_MAX; i++)
-        locationLookupTable.insert(std::make_pair(locationTable[i].GetRandomizerCheck(), static_cast<Key>(i)));
-}
-
-std::vector<uint32_t> KF_ShopLocations = {
-  KF_SHOP_ITEM_1,
-  KF_SHOP_ITEM_2,
-  KF_SHOP_ITEM_3,
-  KF_SHOP_ITEM_4,
-  KF_SHOP_ITEM_5,
-  KF_SHOP_ITEM_6,
-  KF_SHOP_ITEM_7,
-  KF_SHOP_ITEM_8,
-};
-std::vector<uint32_t> Kak_PotionShopLocations = {
-  KAK_POTION_SHOP_ITEM_1,
-  KAK_POTION_SHOP_ITEM_2,
-  KAK_POTION_SHOP_ITEM_3,
-  KAK_POTION_SHOP_ITEM_4,
-  KAK_POTION_SHOP_ITEM_5,
-  KAK_POTION_SHOP_ITEM_6,
-  KAK_POTION_SHOP_ITEM_7,
-  KAK_POTION_SHOP_ITEM_8,
-};
-std::vector<uint32_t> MK_BombchuShopLocations = {
-  MARKET_BOMBCHU_SHOP_ITEM_1,
-  MARKET_BOMBCHU_SHOP_ITEM_2,
-  MARKET_BOMBCHU_SHOP_ITEM_3,
-  MARKET_BOMBCHU_SHOP_ITEM_4,
-  MARKET_BOMBCHU_SHOP_ITEM_5,
-  MARKET_BOMBCHU_SHOP_ITEM_6,
-  MARKET_BOMBCHU_SHOP_ITEM_7,
-  MARKET_BOMBCHU_SHOP_ITEM_8,
-};
-std::vector<uint32_t> MK_PotionShopLocations = {
-  MARKET_POTION_SHOP_ITEM_1,
-  MARKET_POTION_SHOP_ITEM_2,
-  MARKET_POTION_SHOP_ITEM_3,
-  MARKET_POTION_SHOP_ITEM_4,
-  MARKET_POTION_SHOP_ITEM_5,
-  MARKET_POTION_SHOP_ITEM_6,
-  MARKET_POTION_SHOP_ITEM_7,
-  MARKET_POTION_SHOP_ITEM_8,
-};
-std::vector<uint32_t> MK_BazaarLocations = {
-  MARKET_BAZAAR_ITEM_1,
-  MARKET_BAZAAR_ITEM_2,
-  MARKET_BAZAAR_ITEM_3,
-  MARKET_BAZAAR_ITEM_4,
-  MARKET_BAZAAR_ITEM_5,
-  MARKET_BAZAAR_ITEM_6,
-  MARKET_BAZAAR_ITEM_7,
-  MARKET_BAZAAR_ITEM_8,
-};
-std::vector<uint32_t> Kak_BazaarLocations = {
-  KAK_BAZAAR_ITEM_1,
-  KAK_BAZAAR_ITEM_2,
-  KAK_BAZAAR_ITEM_3,
-  KAK_BAZAAR_ITEM_4,
-  KAK_BAZAAR_ITEM_5,
-  KAK_BAZAAR_ITEM_6,
-  KAK_BAZAAR_ITEM_7,
-  KAK_BAZAAR_ITEM_8,
-};
-std::vector<uint32_t> ZD_ShopLocations = {
-  ZD_SHOP_ITEM_1,
-  ZD_SHOP_ITEM_2,
-  ZD_SHOP_ITEM_3,
-  ZD_SHOP_ITEM_4,
-  ZD_SHOP_ITEM_5,
-  ZD_SHOP_ITEM_6,
-  ZD_SHOP_ITEM_7,
-  ZD_SHOP_ITEM_8,
-};
-std::vector<uint32_t> GC_ShopLocations = {
-  GC_SHOP_ITEM_1,
-  GC_SHOP_ITEM_2,
-  GC_SHOP_ITEM_3,
-  GC_SHOP_ITEM_4,
-  GC_SHOP_ITEM_5,
-  GC_SHOP_ITEM_6,
-  GC_SHOP_ITEM_7,
-  GC_SHOP_ITEM_8,
-};
-//List of shop location lists, used for shop shuffle
-std::vector<std::vector<uint32_t>> ShopLocationLists = {
-  KF_ShopLocations,
-  Kak_PotionShopLocations,
-  MK_BombchuShopLocations,
-  MK_PotionShopLocations,
-  MK_BazaarLocations,
-  Kak_BazaarLocations,
-  ZD_ShopLocations,
-  GC_ShopLocations,
-};
-
-//List of scrubs, used for pricing the scrubs
-std::vector<uint32_t> ScrubLocations = {
-  LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT,
-  LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT,
-  LW_DEKU_SCRUB_NEAR_BRIDGE,
-  LW_DEKU_SCRUB_GROTTO_REAR,
-  LW_DEKU_SCRUB_GROTTO_FRONT,
-  SFM_DEKU_SCRUB_GROTTO_REAR,
-  SFM_DEKU_SCRUB_GROTTO_FRONT,
-  HF_DEKU_SCRUB_GROTTO,
-  LH_DEKU_SCRUB_GROTTO_LEFT,
-  LH_DEKU_SCRUB_GROTTO_RIGHT,
-  LH_DEKU_SCRUB_GROTTO_CENTER,
-  GV_DEKU_SCRUB_GROTTO_REAR,
-  GV_DEKU_SCRUB_GROTTO_FRONT,
-  COLOSSUS_DEKU_SCRUB_GROTTO_REAR,
-  COLOSSUS_DEKU_SCRUB_GROTTO_FRONT,
-  GC_DEKU_SCRUB_GROTTO_LEFT,
-  GC_DEKU_SCRUB_GROTTO_RIGHT,
-  GC_DEKU_SCRUB_GROTTO_CENTER,
-  DMC_DEKU_SCRUB,
-  DMC_DEKU_SCRUB_GROTTO_LEFT,
-  DMC_DEKU_SCRUB_GROTTO_RIGHT,
-  DMC_DEKU_SCRUB_GROTTO_CENTER,
-  ZR_DEKU_SCRUB_GROTTO_REAR,
-  ZR_DEKU_SCRUB_GROTTO_FRONT,
-  LLR_DEKU_SCRUB_GROTTO_LEFT,
-  LLR_DEKU_SCRUB_GROTTO_RIGHT,
-  LLR_DEKU_SCRUB_GROTTO_CENTER,
-  DEKU_TREE_MQ_DEKU_SCRUB,
-  DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,
-  DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS,
-  DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT,
-  DODONGOS_CAVERN_DEKU_SCRUB_LOBBY,
-  DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,
-  DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT,
-  DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,
-  DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS,
-  JABU_JABUS_BELLY_DEKU_SCRUB,
-  GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,
-  GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT,
-  GANONS_CASTLE_DEKU_SCRUB_RIGHT,
-  GANONS_CASTLE_DEKU_SCRUB_LEFT,
-  GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,
-  GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,
-  GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,
-  GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT,
-  GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,
-};
-
-//List of gossip stone locations for hints
-std::vector<uint32_t> gossipStoneLocations = {
-  DMC_GOSSIP_STONE,
-  DMT_GOSSIP_STONE,
-  COLOSSUS_GOSSIP_STONE,
-  DODONGOS_CAVERN_GOSSIP_STONE,
-  GV_GOSSIP_STONE,
-  GC_MAZE_GOSSIP_STONE,
-  GC_MEDIGORON_GOSSIP_STONE,
-  GRAVEYARD_GOSSIP_STONE,
-  HC_MALON_GOSSIP_STONE,
-  HC_ROCK_WALL_GOSSIP_STONE,
-  HC_STORMS_GROTTO_GOSSIP_STONE,
-  KF_DEKU_TREE_GOSSIP_STONE_LEFT,
-  KF_DEKU_TREE_GOSSIP_STONE_RIGHT,
-  KF_GOSSIP_STONE,
-  LH_LAB_GOSSIP_STONE,
-  LH_GOSSIP_STONE_SOUTHEAST,
-  LH_GOSSIP_STONE_SOUTHWEST,
-  LW_GOSSIP_STONE,
-  SFM_MAZE_GOSSIP_STONE_LOWER,
-  SFM_MAZE_GOSSIP_STONE_UPPER,
-  SFM_SARIA_GOSSIP_STONE,
-  TOT_GOSSIP_STONE_LEFT,
-  TOT_GOSSIP_STONE_RIGHT,
-  TOT_GOSSIP_STONE_RIGHT_CENTER,
-  TOT_GOSSIP_STONE_LEFT_CENTER,
-  ZD_GOSSIP_STONE,
-  ZF_FAIRY_GOSSIP_STONE,
-  ZF_JABU_GOSSIP_STONE,
-  ZR_NEAR_GROTTOS_GOSSIP_STONE,
-  ZR_NEAR_DOMAIN_GOSSIP_STONE,
-  HF_COW_GROTTO_GOSSIP_STONE,
-  HF_NEAR_MARKET_GROTTO_GOSSIP_STONE,
-  HF_SOUTHEAST_GROTTO_GOSSIP_STONE,
-  HF_OPEN_GROTTO_GOSSIP_STONE,
-  KAK_OPEN_GROTTO_GOSSIP_STONE,
-  ZR_OPEN_GROTTO_GOSSIP_STONE,
-  KF_STORMS_GROTTO_GOSSIP_STONE,
-  LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE,
-  DMT_STORMS_GROTTO_GOSSIP_STONE,
-  DMC_UPPER_GROTTO_GOSSIP_STONE,
-};
-
-std::vector<uint32_t> dungeonRewardLocations = {
-  //Bosses
-  QUEEN_GOHMA,
-  KING_DODONGO,
-  BARINADE,
-  PHANTOM_GANON,
-  VOLVAGIA,
-  MORPHA,
-  TWINROVA,
-  BONGO_BONGO,
-  LINKS_POCKET,
-};
-std::vector<uint32_t> overworldLocations = {
-  //Kokiri Forest
-  KF_KOKIRI_SWORD_CHEST,
-  KF_MIDOS_TOP_LEFT_CHEST,
-  KF_MIDOS_TOP_RIGHT_CHEST,
-  KF_MIDOS_BOTTOM_LEFT_CHEST,
-  KF_MIDOS_BOTTOM_RIGHT_CHEST,
-  KF_STORMS_GROTTO_CHEST,
-  KF_LINKS_HOUSE_COW,
-
-  //Shop
-  KF_SHOP_ITEM_1,
-  KF_SHOP_ITEM_2,
-  KF_SHOP_ITEM_3,
-  KF_SHOP_ITEM_4,
-  KF_SHOP_ITEM_5,
-  KF_SHOP_ITEM_6,
-  KF_SHOP_ITEM_7,
-  KF_SHOP_ITEM_8,
-
-  //Lost Woods
-  LW_GIFT_FROM_SARIA,
-  LW_SKULL_KID,
-  LW_TRADE_COJIRO,
-  LW_TRADE_ODD_POTION,
-  LW_OCARINA_MEMORY_GAME,
-  LW_TARGET_IN_WOODS,
-  LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT,
-  LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT,
-  LW_DEKU_SCRUB_NEAR_BRIDGE,
-  LW_NEAR_SHORTCUTS_GROTTO_CHEST,
-  LW_DEKU_SCRUB_GROTTO_REAR,
-  LW_DEKU_SCRUB_GROTTO_FRONT,
-  DEKU_THEATER_SKULL_MASK,
-  DEKU_THEATER_MASK_OF_TRUTH,
-
-  //Sacred Forest Meadow
-  SONG_FROM_SARIA,
-  SHEIK_IN_FOREST,
-  SFM_WOLFOS_GROTTO_CHEST,
-  SFM_DEKU_SCRUB_GROTTO_REAR,
-  SFM_DEKU_SCRUB_GROTTO_FRONT,
-
-  //Hyrule Field
-  HF_SOUTHEAST_GROTTO_CHEST,
-  HF_OPEN_GROTTO_CHEST,
-  HF_NEAR_MARKET_GROTTO_CHEST,
-  HF_OCARINA_OF_TIME_ITEM,
-  SONG_FROM_OCARINA_OF_TIME,
-  HF_TEKTITE_GROTTO_FREESTANDING_POH,
-  HF_DEKU_SCRUB_GROTTO,
-  HF_COW_GROTTO_COW,
-
-  //Lake Hylia
-  LH_CHILD_FISHING,
-  LH_ADULT_FISHING,
-  LH_LAB_DIVE,
-  LH_TRADE_FROG,
-  LH_UNDERWATER_ITEM,
-  LH_SUN,
-  LH_FREESTANDING_POH,
-  LH_DEKU_SCRUB_GROTTO_LEFT,
-  LH_DEKU_SCRUB_GROTTO_RIGHT,
-  LH_DEKU_SCRUB_GROTTO_CENTER,
-
-  //Gerudo Valley
-  GV_CHEST,
-  GV_TRADE_SAW,
-  GV_WATERFALL_FREESTANDING_POH,
-  GV_CRATE_FREESTANDING_POH,
-  GV_DEKU_SCRUB_GROTTO_REAR,
-  GV_DEKU_SCRUB_GROTTO_FRONT,
-  GV_COW,
-
-  //Gerudo Fortress
-  GF_CHEST,
-  GF_HBA_1000_POINTS,
-  GF_HBA_1500_POINTS,
-  GF_NORTH_F1_CARPENTER,
-  GF_NORTH_F2_CARPENTER,
-  GF_SOUTH_F1_CARPENTER,
-  GF_SOUTH_F2_CARPENTER,
-  GF_GERUDO_MEMBERSHIP_CARD,
-
-  //Haunted Wasteland
-  WASTELAND_CHEST,
-  WASTELAND_BOMBCHU_SALESMAN,
-
-  //Desert Colossus
-  SHEIK_AT_COLOSSUS,
-  COLOSSUS_FREESTANDING_POH,
-  COLOSSUS_GREAT_FAIRY_REWARD,
-  COLOSSUS_DEKU_SCRUB_GROTTO_REAR,
-  COLOSSUS_DEKU_SCRUB_GROTTO_FRONT,
-
-  //Market
-  MARKET_TREASURE_CHEST_GAME_REWARD,
-  MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,
-  MARKET_BOMBCHU_BOWLING_SECOND_PRIZE,
-  MARKET_BOMBCHU_BOWLING_BOMBCHUS,
-  MARKET_LOST_DOG,
-  MARKET_SHOOTING_GALLERY_REWARD,
-  MARKET_10_BIG_POES,
-  MARKET_TREASURE_CHEST_GAME_ITEM_1,
-  MARKET_TREASURE_CHEST_GAME_ITEM_2,
-  MARKET_TREASURE_CHEST_GAME_ITEM_3,
-  MARKET_TREASURE_CHEST_GAME_ITEM_4,
-  MARKET_TREASURE_CHEST_GAME_ITEM_5,
-
-  //Market Shops
-  MARKET_BOMBCHU_SHOP_ITEM_1,
-  MARKET_BOMBCHU_SHOP_ITEM_2,
-  MARKET_BOMBCHU_SHOP_ITEM_3,
-  MARKET_BOMBCHU_SHOP_ITEM_4,
-  MARKET_BOMBCHU_SHOP_ITEM_5,
-  MARKET_BOMBCHU_SHOP_ITEM_6,
-  MARKET_BOMBCHU_SHOP_ITEM_7,
-  MARKET_BOMBCHU_SHOP_ITEM_8,
-  MARKET_POTION_SHOP_ITEM_1,
-  MARKET_POTION_SHOP_ITEM_2,
-  MARKET_POTION_SHOP_ITEM_3,
-  MARKET_POTION_SHOP_ITEM_4,
-  MARKET_POTION_SHOP_ITEM_5,
-  MARKET_POTION_SHOP_ITEM_6,
-  MARKET_POTION_SHOP_ITEM_7,
-  MARKET_POTION_SHOP_ITEM_8,
-  MARKET_BAZAAR_ITEM_1,
-  MARKET_BAZAAR_ITEM_2,
-  MARKET_BAZAAR_ITEM_3,
-  MARKET_BAZAAR_ITEM_4,
-  MARKET_BAZAAR_ITEM_5,
-  MARKET_BAZAAR_ITEM_6,
-  MARKET_BAZAAR_ITEM_7,
-  MARKET_BAZAAR_ITEM_8,
-
-  //Hyrule Castle
-  HC_MALON_EGG,
-  HC_ZELDAS_LETTER,
-  SONG_FROM_IMPA,
-  HC_GREAT_FAIRY_REWARD,
-  OGC_GREAT_FAIRY_REWARD,
-
-  //Temple of Time
-  SHEIK_AT_TEMPLE,
-  TOT_LIGHT_ARROWS_CUTSCENE,
-
-  //Kakariko
-  SHEIK_IN_KAKARIKO,
-  KAK_REDEAD_GROTTO_CHEST,
-  KAK_OPEN_GROTTO_CHEST,
-  KAK_10_GOLD_SKULLTULA_REWARD,
-  KAK_20_GOLD_SKULLTULA_REWARD,
-  KAK_30_GOLD_SKULLTULA_REWARD,
-  KAK_40_GOLD_SKULLTULA_REWARD,
-  KAK_50_GOLD_SKULLTULA_REWARD,
-  KAK_100_GOLD_SKULLTULA_REWARD,
-  KAK_MAN_ON_ROOF,
-  KAK_SHOOTING_GALLERY_REWARD,
-  KAK_TRADE_ODD_MUSHROOM,
-  KAK_GRANNYS_SHOP,
-  KAK_ANJU_AS_CHILD,
-  KAK_ANJU_AS_ADULT,
-  KAK_TRADE_POCKET_CUCCO,
-  KAK_IMPAS_HOUSE_FREESTANDING_POH,
-  KAK_WINDMILL_FREESTANDING_POH,
-  SONG_FROM_WINDMILL,
-  KAK_IMPAS_HOUSE_COW,
-
-  //Kakariko Shops
-  KAK_POTION_SHOP_ITEM_1,
-  KAK_POTION_SHOP_ITEM_2,
-  KAK_POTION_SHOP_ITEM_3,
-  KAK_POTION_SHOP_ITEM_4,
-  KAK_POTION_SHOP_ITEM_5,
-  KAK_POTION_SHOP_ITEM_6,
-  KAK_POTION_SHOP_ITEM_7,
-  KAK_POTION_SHOP_ITEM_8,
-  KAK_BAZAAR_ITEM_1,
-  KAK_BAZAAR_ITEM_2,
-  KAK_BAZAAR_ITEM_3,
-  KAK_BAZAAR_ITEM_4,
-  KAK_BAZAAR_ITEM_5,
-  KAK_BAZAAR_ITEM_6,
-  KAK_BAZAAR_ITEM_7,
-  KAK_BAZAAR_ITEM_8,
-
-  //Graveyard
-  GRAVEYARD_HOOKSHOT_CHEST,
-  GRAVEYARD_SHIELD_GRAVE_CHEST,
-  GRAVEYARD_HEART_PIECE_GRAVE_CHEST,
-  GRAVEYARD_COMPOSERS_GRAVE_CHEST,
-  SONG_FROM_COMPOSERS_GRAVE,
-  GRAVEYARD_FREESTANDING_POH,
-  GRAVEYARD_DAMPE_RACE_FREESTANDING_POH,
-  GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR,
-
-  //Death Mountain Trail
-  DMT_CHEST,
-  DMT_STORMS_GROTTO_CHEST,
-  DMT_TRADE_BROKEN_SWORD,
-  DMT_TRADE_EYEDROPS,
-  DMT_TRADE_CLAIM_CHECK,
-  DMT_GREAT_FAIRY_REWARD,
-  DMT_FREESTANDING_POH,
-  DMT_COW_GROTTO_COW,
-
-  //Goron City
-  GC_MAZE_LEFT_CHEST,
-  GC_MAZE_CENTER_CHEST,
-  GC_MAZE_RIGHT_CHEST,
-  GC_ROLLING_GORON_AS_CHILD,
-  GC_ROLLING_GORON_AS_ADULT,
-  GC_DARUNIAS_JOY,
-  GC_POT_FREESTANDING_POH,
-  GC_DEKU_SCRUB_GROTTO_LEFT,
-  GC_DEKU_SCRUB_GROTTO_RIGHT,
-  GC_DEKU_SCRUB_GROTTO_CENTER,
-  GC_MEDIGORON,
-
-  //Goron City Shop
-  GC_SHOP_ITEM_1,
-  GC_SHOP_ITEM_2,
-  GC_SHOP_ITEM_3,
-  GC_SHOP_ITEM_4,
-  GC_SHOP_ITEM_5,
-  GC_SHOP_ITEM_6,
-  GC_SHOP_ITEM_7,
-  GC_SHOP_ITEM_8,
-
-  //Death Mountain
-  DMC_UPPER_GROTTO_CHEST,
-  DMC_WALL_FREESTANDING_POH,
-  DMC_VOLCANO_FREESTANDING_POH,
-  SHEIK_IN_CRATER,
-  DMC_DEKU_SCRUB,
-  DMC_GREAT_FAIRY_REWARD,
-  DMC_DEKU_SCRUB_GROTTO_LEFT,
-  DMC_DEKU_SCRUB_GROTTO_RIGHT,
-  DMC_DEKU_SCRUB_GROTTO_CENTER,
-
-  //Zoras River
-  ZR_OPEN_GROTTO_CHEST,
-  ZR_MAGIC_BEAN_SALESMAN,
-  ZR_FROGS_ZELDAS_LULLABY,
-  ZR_FROGS_EPONAS_SONG,
-  ZR_FROGS_SARIAS_SONG,
-  ZR_FROGS_SUNS_SONG,
-  ZR_FROGS_SONG_OF_TIME,
-  ZR_FROGS_IN_THE_RAIN,
-  ZR_FROGS_OCARINA_GAME,
-  ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH,
-  ZR_NEAR_DOMAIN_FREESTANDING_POH,
-  ZR_DEKU_SCRUB_GROTTO_REAR,
-  ZR_DEKU_SCRUB_GROTTO_FRONT,
-
-  //Zoras Domain
-  ZD_CHEST,
-  ZD_DIVING_MINIGAME,
-  ZD_KING_ZORA_THAWED,
-  ZD_TRADE_PRESCRIPTION,
-
-  //Zora's Domain Shop
-  ZD_SHOP_ITEM_1,
-  ZD_SHOP_ITEM_2,
-  ZD_SHOP_ITEM_3,
-  ZD_SHOP_ITEM_4,
-  ZD_SHOP_ITEM_5,
-  ZD_SHOP_ITEM_6,
-  ZD_SHOP_ITEM_7,
-  ZD_SHOP_ITEM_8,
-
-  //Zoras Fountain
-  ZF_ICEBERG_FREESTANDING_POH,
-  ZF_BOTTOM_FREESTANDING_POH,
-  ZF_GREAT_FAIRY_REWARD,
-
-  //Lon Lon Ranch
-  SONG_FROM_MALON,
-  LLR_TALONS_CHICKENS,
-  LLR_FREESTANDING_POH,
-  LLR_DEKU_SCRUB_GROTTO_LEFT,
-  LLR_DEKU_SCRUB_GROTTO_RIGHT,
-  LLR_DEKU_SCRUB_GROTTO_CENTER,
-  LLR_STABLES_LEFT_COW,
-  LLR_STABLES_RIGHT_COW,
-  LLR_TOWER_LEFT_COW,
-  LLR_TOWER_RIGHT_COW,
-
-  /*-------------------------------
-     --- GOLD SKULLTULA TOKENS ---
-    -------------------------------*/
-
-  //Overworld
-  KF_GS_BEAN_PATCH,
-  KF_GS_KNOW_IT_ALL_HOUSE,
-  KF_GS_HOUSE_OF_TWINS,
-
-  LW_GS_BEAN_PATCH_NEAR_BRIDGE,
-  LW_GS_BEAN_PATCH_NEAR_THEATER,
-  LW_GS_ABOVE_THEATER,
-  SFM_GS,
-
-  HF_GS_COW_GROTTO,
-  HF_GS_NEAR_KAK_GROTTO,
-
-  LH_GS_BEAN_PATCH,
-  LH_GS_SMALL_ISLAND,
-  LH_GS_LAB_WALL,
-  LH_GS_LAB_CRATE,
-  LH_GS_TREE,
-
-  GV_GS_BEAN_PATCH,
-  GV_GS_SMALL_BRIDGE,
-  GV_GS_PILLAR,
-  GV_GS_BEHIND_TENT,
-
-  GF_GS_ARCHERY_RANGE,
-  GF_GS_TOP_FLOOR,
-
-  WASTELAND_GS,
-  COLOSSUS_GS_BEAN_PATCH,
-  COLOSSUS_GS_HILL,
-  COLOSSUS_GS_TREE,
-
-  OGC_GS,
-  HC_GS_STORMS_GROTTO,
-  HC_GS_TREE,
-  MARKET_GS_GUARD_HOUSE,
-
-  KAK_GS_HOUSE_UNDER_CONSTRUCTION,
-  KAK_GS_SKULLTULA_HOUSE,
-  KAK_GS_GUARDS_HOUSE,
-  KAK_GS_TREE,
-  KAK_GS_WATCHTOWER,
-  KAK_GS_ABOVE_IMPAS_HOUSE,
-
-  DMC_GS_BEAN_PATCH,
-  DMC_GS_CRATE,
-
-  DMT_GS_BEAN_PATCH,
-  DMT_GS_NEAR_KAK,
-  DMT_GS_ABOVE_DODONGOS_CAVERN,
-  DMT_GS_FALLING_ROCKS_PATH,
-
-  GC_GS_CENTER_PLATFORM,
-  GC_GS_BOULDER_MAZE,
-  GRAVEYARD_GS_WALL,
-  GRAVEYARD_GS_BEAN_PATCH,
-
-  ZR_GS_LADDER,
-  ZR_GS_TREE,
-  ZR_GS_ABOVE_BRIDGE,
-  ZR_GS_NEAR_RAISED_GROTTOS,
-
-  ZD_GS_FROZEN_WATERFALL,
-  ZF_GS_ABOVE_THE_LOG,
-  ZF_GS_HIDDEN_CAVE,
-  ZF_GS_TREE,
-
-  LLR_GS_BACK_WALL,
-  LLR_GS_RAIN_SHED,
-  LLR_GS_HOUSE_WINDOW,
-  LLR_GS_TREE,
-};
-
-ItemLocation* Location(uint32_t locKey) {
-    return &(locationTable[locKey]);
-}
-
-ItemLocation* Location(RandomizerCheck rc) {
-    return &(locationTable[locationLookupTable[rc]]);
-}
-
-std::vector<uint32_t> allLocations = {};
-std::vector<uint32_t> everyPossibleLocation = {};
-
-//set of overrides to write to the patch
-std::set<ItemOverride, ItemOverride_Compare> overrides = {};
-std::unordered_map<RandomizerCheck, uint8_t> iceTrapModels = {};
-
-std::vector<std::vector<uint32_t>> playthroughLocations;
-std::vector<uint32_t> wothLocations;
-bool playthroughBeatable = false;
-bool allLocationsReachable = false;
-bool showItemProgress = false;
-
-uint16_t itemsPlaced = 0;
-
-void AddLocation(uint32_t loc, std::vector<uint32_t>* destination = &allLocations) {
-  destination->push_back(loc);
-}
-
-template <typename Container>
-void AddLocations(const Container& locations, std::vector<uint32_t>* destination = &allLocations) {
-  destination->insert(destination->end(), std::cbegin(locations), std::cend(locations));
-}
-
-//sort through Vanilla and MQ dungeon locations
-void GenerateLocationPool() {
-
-  allLocations.clear();
-  AddLocation(LINKS_POCKET);
-  if (Settings::TriforceHunt.Is(TRIFORCE_HUNT_ON)) {
-    AddLocation(TRIFORCE_COMPLETED);
-  }
-  AddLocations(overworldLocations);
-
-  for (auto dungeon : Dungeon::dungeonList) {
-    AddLocations(dungeon->GetDungeonLocations());
-  }
-}
-
-void PlaceItemInLocation(uint32_t locKey, uint32_t item, bool applyEffectImmediately /*= false*/, bool setHidden /*= false*/) {
-  auto loc = Location(locKey);
-  SPDLOG_DEBUG("\n");
-  SPDLOG_DEBUG(ItemTable(item).GetName().GetEnglish());
-  SPDLOG_DEBUG(" placed at ");
-  SPDLOG_DEBUG(loc->GetName());
-  SPDLOG_DEBUG("\n\n");
-
-  if (applyEffectImmediately || Settings::Logic.Is(LOGIC_NONE) || Settings::Logic.Is(LOGIC_VANILLA)) {
-    ItemTable(item).ApplyEffect();
-  }
-
-  itemsPlaced++;
-  if (showItemProgress) {
-    double completion = (double) itemsPlaced / (double)(allLocations.size() + dungeonRewardLocations.size());
-    std::string message = "\x1b[8;10HPlacing Items.";
-    message += completion > 0.25 ? "." : " ";
-    message += completion > 0.50 ? "." : " ";
-    printf("%s", message.c_str());
-  }
-
-  //If we're placing a non-shop item in a shop location, we want to record it for custom messages
-  if (ItemTable(item).GetItemType() != ITEMTYPE_SHOP && loc->IsCategory(Category::cShop)) {
-    int index = TransformShopIndex(GetShopIndex(locKey));
-    NonShopItems[index].Name = ItemTable(item).GetName();
-    NonShopItems[index].Repurchaseable = ItemTable(item).GetItemType() == ITEMTYPE_REFILL || ItemTable(item).GetHintKey() == PROGRESSIVE_BOMBCHUS;
-  }
-
-  loc->SetPlacedItem(item);
-  if (setHidden) {
-    loc->SetHidden(true);
-  }
-}
-
-std::vector<uint32_t> GetLocations(const std::vector<uint32_t>& locationPool, Category categoryInclude, Category categoryExclude /*= Category::cNull*/) {
-  std::vector<uint32_t> locationsInCategory;
-  for (uint32_t locKey : locationPool) {
-    if (Location(locKey)->IsCategory(categoryInclude) && !Location(locKey)->IsCategory(categoryExclude)) {
-      locationsInCategory.push_back(locKey);
-    }
-  }
-  return locationsInCategory;
-}
-
-void LocationReset() {
-  for (uint32_t il : allLocations) {
-    Location(il)->RemoveFromPool();
-  }
-
-  for (uint32_t il : dungeonRewardLocations) {
-    Location(il)->RemoveFromPool();
-  }
-
-  for (uint32_t il : gossipStoneLocations) {
-    Location(il)->RemoveFromPool();
-  }
-
-  Location(GANONDORF_HINT)->RemoveFromPool();
-}
-
-void ItemReset() {
-  for (uint32_t il : allLocations) {
-    Location(il)->ResetVariables();
-  }
-
-  for (uint32_t il : dungeonRewardLocations) {
-    Location(il)->ResetVariables();
-  }
-
-  itemsPlaced = 0;
-}
-
-void HintReset() {
-  for (uint32_t il : gossipStoneLocations) {
-    Location(il)->ResetVariables();
-  }
-}
-
-//Fills everyPossibleLocation and creates an exclusion option for each location.
-//everyPossibleLocation is used in the menu to lock/hide excluding locations
-void AddExcludedOptions() {
-  AddLocations(overworldLocations, &everyPossibleLocation);
-
-  for (auto dungeon : Dungeon::dungeonList) {
-    AddLocations(dungeon->GetEveryLocation(), &everyPossibleLocation);
-  }
-
-  for (uint32_t il: everyPossibleLocation) {
-    Location(il)->AddExcludeOption();
-  }
-}
-
-void CreateItemOverrides() {
-    SPDLOG_DEBUG("NOW CREATING OVERRIDES\n\n");
-    for (uint32_t locKey : allLocations) {
-        auto loc = Location(locKey);
-        ItemOverride_Value val = ItemTable(loc->GetPlaceduint32_t()).Value();
-        // If this is an ice trap, store the disguise model in iceTrapModels
-        if (loc->GetPlaceduint32_t() == ICE_TRAP) {
-            iceTrapModels[loc->GetRandomizerCheck()] = val.looksLikeItemId;
-            // If this is ice trap is in a shop, change the name based on what the model will look like
-            if (loc->IsCategory(Category::cShop)) {
-                NonShopItems[TransformShopIndex(GetShopIndex(locKey))].Name = GetIceTrapName(val.looksLikeItemId);
-            }
-        }
-        overrides.insert({
-            .key = loc->Key(),
-            .value = val,
-        });
-        SPDLOG_DEBUG("\tScene: ");
-        SPDLOG_DEBUG(std::to_string(loc->Key().scene));
-        SPDLOG_DEBUG("\tType: ");
-        SPDLOG_DEBUG(std::to_string(loc->Key().type));
-        SPDLOG_DEBUG("\t");
-        SPDLOG_DEBUG(loc->GetName());
-        SPDLOG_DEBUG(": ");
-        SPDLOG_DEBUG(loc->GetPlacedItemName().GetEnglish());
-        SPDLOG_DEBUG("\n");
-    }
-    SPDLOG_DEBUG("Overrides Created: ");
-    SPDLOG_DEBUG(std::to_string(overrides.size()));
-}
diff --git a/soh/soh/Enhancements/randomizer/3drando/item_location.hpp b/soh/soh/Enhancements/randomizer/3drando/item_location.hpp
deleted file mode 100644
index e900ab941..000000000
--- a/soh/soh/Enhancements/randomizer/3drando/item_location.hpp
+++ /dev/null
@@ -1,529 +0,0 @@
-#pragma once
-
-#include <algorithm>
-#include <array>
-#include <cstdio>
-#include <functional>
-#include <set>
-#include <string>
-#include <vector>
-#include "spoiler_log.hpp"
-#include "item_list.hpp"
-#include "../randomizerTypes.h"
-
-enum ItemOverride_Type {
-    OVR_BASE_ITEM = 0,
-    OVR_CHEST = 1,
-    OVR_COLLECTABLE = 2,
-    OVR_SKULL = 3,
-    OVR_GROTTO_SCRUB = 4,
-    OVR_DELAYED = 5,
-    OVR_TEMPLE = 6,
-};
-
-typedef enum {
-    DUNGEON_DEKU_TREE = 0,
-    DUNGEON_DODONGOS_CAVERN,
-    DUNGEON_JABUJABUS_BELLY,
-    DUNGEON_FOREST_TEMPLE,
-    DUNGEON_FIRE_TEMPLE,
-    DUNGEON_WATER_TEMPLE,
-    DUNGEON_SPIRIT_TEMPLE,
-    DUNGEON_SHADOW_TEMPLE,
-    DUNGEON_BOTTOM_OF_THE_WELL,
-    DUNGEON_ICE_CAVERN,
-    DUNGEON_GANONS_CASTLE_SECOND_PART,
-    DUNGEON_GERUDO_TRAINING_GROUNDS,
-    DUNGEON_GERUDO_FORTRESS,
-    DUNGEON_GANONS_CASTLE_FIRST_PART,
-    DUNGEON_GANONS_CASTLE_FLOOR_BENEATH_BOSS_CHAMBER,
-    DUNGEON_GANONS_CASTLE_CRUMBLING,
-    DUNGEON_TREASURE_CHEST_SHOP,
-    DUNGEON_DEKU_TREE_BOSS_ROOM,
-    DUNGEON_DODONGOS_CAVERN_BOSS_ROOM,
-    DUNGEON_JABUJABUS_BELLY_BOSS_ROOM,
-} DungeonId;
-
-typedef union ItemOverride_Key {
-    uint32_t all;
-    struct {
-        char pad_;
-        uint8_t scene;
-        uint8_t type;
-    };
-} ItemOverride_Key;
-
-typedef union ItemOverride_Value {
-    uint32_t all;
-    struct {
-        uint16_t itemId;
-        uint8_t player;
-        uint8_t looksLikeItemId;
-    };
-} ItemOverride_Value;
-
-typedef struct ItemOverride {
-    ItemOverride_Key key;
-    ItemOverride_Value value;
-} ItemOverride;
-
-class Entrance;
-
-enum class ItemLocationType {
-    Base,
-    Chest,
-    Collectable,
-    GSToken,
-    GrottoScrub,
-    Delayed,
-    TempleReward,
-    HintStone,
-    OtherHint,
-};
-
-class SpoilerCollectionCheck {
-  public:
-    SpoilerCollectionCheckType type = SpoilerCollectionCheckType::SPOILER_CHK_NONE;
-    uint8_t scene = 0;
-    uint8_t flag = 0;
-
-    SpoilerCollectionCheck() {}
-    SpoilerCollectionCheck(SpoilerCollectionCheckType type_, uint8_t scene_, uint8_t flag_) : type(type_), scene(scene_), flag(flag_) {}
-
-    static auto None() {
-        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_NONE, 0x00, 0x00);
-    }
-
-    static auto AlwaysCollected() {
-        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_ALWAYS_COLLECTED, 0x00, 0x00);
-    }
-
-    static auto ItemGetInf(uint8_t slot) {
-        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_ITEM_GET_INF, 0x00, slot);
-    }
-
-    static auto EventChkInf(uint8_t flag) {
-        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_EVENT_CHK_INF, 0xFF, flag);
-    }
-
-    static auto InfTable(uint8_t offset, uint8_t bit) {
-        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_INF_TABLE, offset, bit);
-    }
-
-    static auto Collectable(uint8_t scene, uint8_t flag) {
-        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_COLLECTABLE, scene, flag);
-    }
-
-    static auto Chest(uint8_t scene, uint8_t flag) {
-        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_CHEST, scene, flag);
-    }
-
-    static auto Cow() {
-        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_COW, 0x00, 0x00);
-    }
-
-    static auto Fishing() {
-        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_MINIGAME, 0x00, 0x00);
-    }
-
-    static auto Scrub() {
-        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_SCRUB, 0x00, 0x00);
-    }
-
-    static auto GerudoToken() {
-        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_GERUDO_MEMBERSHIP_CARD, 0x00, 0x00);
-    }
-
-    static auto BigPoePoints() {
-        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_POE_POINTS, 0x00, 0x00);
-    }
-    
-    static auto Gravedigger(uint8_t scene, uint8_t flag) {
-        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_GRAVEDIGGER, scene, flag);
-    }
-
-    static auto ShopItem() {
-        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_SHOP_ITEM, 0x00, 0x00);
-    }
-
-    static auto MagicBeans() {
-        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_MAGIC_BEANS, 0x00, 0x00);
-    }
-
-    static auto Merchant() {
-        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_MERCHANT, 0x00, 0x00);
-    }
-
-    static auto RandomizerInf() {
-        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_RANDOMIZER_INF, 0x00, 0x00);
-    }
-};
-
-class ItemLocation {
-public:
-    ItemLocation() = default;
-    ItemLocation(RandomizerCheck rc_, uint8_t scene_, ItemLocationType type_, std::string name_, uint32_t hintKey_, uint32_t vanillaItem_, std::vector<Category> categories_, uint16_t price_ = 0, SpoilerCollectionCheck collectionCheck_ = SpoilerCollectionCheck(), SpoilerCollectionCheckGroup collectionCheckGroup_ = SpoilerCollectionCheckGroup::GROUP_NO_GROUP)
-        : rc(rc_), scene(scene_), type(type_), name(std::move(name_)), hintKey(hintKey_), vanillaItem(vanillaItem_), categories(std::move(categories_)), price(price_), collectionCheck(collectionCheck_), collectionCheckGroup(collectionCheckGroup_) {}
-
-    ItemOverride_Key Key() const {
-        ItemOverride_Key key;
-        key.all = 0;
-
-        key.scene = scene;
-        key.type = static_cast<uint8_t>(type); //TODO make sure these match up
-        return key;
-    }
-
-    RandomizerCheck GetRandomizerCheck() const {
-      return rc;
-    }
-
-    SpoilerCollectionCheck GetCollectionCheck() const {
-      return collectionCheck;
-    }
-
-    SpoilerCollectionCheckGroup GetCollectionCheckGroup() const {
-      return collectionCheckGroup;
-    }
-
-    uint8_t GetScene() const {
-      return scene;
-    }
-
-    bool IsAddedToPool() const {
-      return addedToPool;
-    }
-
-    void AddToPool() {
-      addedToPool = true;
-    }
-
-    uint32_t GetHintKey() const {
-        return hintKey;
-    }
-
-    void RemoveFromPool() {
-      addedToPool = false;
-    }
-
-    const std::string& GetName() const {
-      return name;
-    }
-
-    const Text& GetPlacedItemName() const {
-      return ItemTable(placedItem).GetName();
-    }
-
-    const Item& GetPlacedItem() const {
-      return ItemTable(placedItem);
-    }
-
-    uint32_t GetPlacedItemKey() const {
-        return placedItem;
-    }
-
-    uint32_t GetPlaceduint32_t() const {
-      return placedItem;
-    }
-
-    void SetPlacedItem(const uint32_t item) {
-      placedItem = item;
-      SetPrice(ItemTable(placedItem).GetPrice());
-    }
-
-    //Saves an item to be set as placedItem later
-    void SetDelayedItem(const uint32_t item) {
-      delayedItem = item;
-    }
-
-    //Place the vanilla item in this location
-    void PlaceVanillaItem() {
-      placedItem = vanillaItem;
-    }
-
-    void ApplyPlacedItemEffect() {
-      ItemTable(placedItem).ApplyEffect();
-    }
-
-    //Set placedItem as item saved in SetDelayedItem
-    void SaveDelayedItem() {
-      placedItem = delayedItem;
-      delayedItem = NONE;
-    }
-
-    uint16_t GetPrice() const {
-      if (ItemTable(placedItem).GetItemType() == ITEMTYPE_SHOP) {
-        return ItemTable(placedItem).GetPrice();
-      }
-      return price;
-    }
-
-    void SetPrice(uint16_t price_) {
-      //don't override price if the price was set for shopsanity/scrubsanity
-      if (hasShopsanityPrice || hasScrubsanityPrice) {
-        return;
-      }
-      price = price_;
-    }
-
-    void SetShopsanityPrice(uint16_t price_) {
-      price = price_;
-      hasShopsanityPrice = true;
-    }
-
-    void SetScrubsanityPrice(uint16_t price_) {
-      price = price_;
-      hasScrubsanityPrice = true;
-    }
-
-    bool HasShopsanityPrice() const {
-      return hasShopsanityPrice;
-    }
-
-    bool HasScrubsanityPrice() const {
-      return hasScrubsanityPrice;
-    }
-
-    bool IsExcluded() const {
-      return excludedOption.Value<bool>();
-    }
-
-    bool IsCategory(Category category) const {
-      return std::any_of(categories.begin(), categories.end(),
-                         [category](auto entry) { return entry == category; });
-    }
-
-    bool IsDungeon() const {
-      return (type != ItemLocationType::GSToken && (scene < 0x0E || (scene > 0x10 && scene < 0x1A))) || (type == ItemLocationType::GSToken && scene < 0x0A);
-    }
-
-    bool IsOverworld() const {
-      return !IsDungeon();
-    }
-
-    bool IsShop() const {
-        return (scene >= 0x2C && scene <= 0x32);
-    }
-
-    Option * GetExcludedOption() {
-      return &excludedOption;
-    }
-
-    uint32_t Getuint32_t() const {
-      return hintKey;
-    }
-
-    const HintText& GetHint() const {
-      return Hint(hintKey);
-    }
-
-    bool IsHintedAt() const {
-      return hintedAt;
-    }
-
-    void SetAsHinted() {
-      hintedAt = true;
-    }
-
-    bool IsHidden() const {
-      return hidden;
-    }
-
-    void SetHidden(const bool hidden_) {
-      hidden = hidden_;
-    }
-
-    bool IsHintable() const {
-      return isHintable;
-    }
-
-    void SetHintedLocation(uint32_t location) {
-      hintedLocation = location;
-    }
-
-    uint32_t GetHintedLocation() {
-      return hintedLocation;
-    }
-
-    void SetHintType(HintType type) {
-      hintType = type;
-    }
-
-    HintType GetHintType() {
-      return hintType;
-    }
-
-    void SetHintedRegion (std::string region) {
-      hintedRegion = region;
-    }
-
-    std::string GetHintedRegion() {
-      return hintedRegion;
-    }
-
-    void SetAsHintable() {
-      isHintable = true;
-    }
-
-    void SetParentRegion(uint32_t region) {
-      parentRegion = region;
-    }
-
-    uint32_t GetParentRegionKey() const {
-      return parentRegion;
-    }
-
-    void AddExcludeOption() {
-      //add option to forbid any location from progress items
-      if (name.length() < 23) {
-        excludedOption = Option::Bool(name, {"Include", "Exclude"});
-      } else {
-        //insert a newline character if the text is too long for one row
-        size_t lastSpace = name.rfind(' ', 23);
-        std::string settingText = name;
-        settingText.replace(lastSpace, 1, "\n ");
-
-        excludedOption = Option::Bool(settingText, {"Include", "Exclude"});
-      }
-      
-      // RANDOTODO: this without string compares and loops
-      bool alreadyAdded = false;
-      for(const Option* location : Settings::excludeLocationsOptionsVector[collectionCheckGroup]) {
-        if (location->GetName() == excludedOption.GetName()) {
-          alreadyAdded = true;
-        }
-      }
-      if (!alreadyAdded) {
-        Settings::excludeLocationsOptionsVector[collectionCheckGroup].push_back(&excludedOption);
-      }
-    }
-
-    static auto Base(RandomizerCheck rc, uint8_t scene, std::string&& name, const uint32_t hintKey, const uint32_t vanillaItem, std::vector<Category>&& categories, SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(), SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP) {
-        return ItemLocation{rc, scene, ItemLocationType::Base, std::move(name), hintKey, vanillaItem, std::move(categories), 0, collectionCheck, collectionCheckGroup};
-    }
-
-    static auto Chest(RandomizerCheck rc, uint8_t scene, uint8_t flag, std::string&& name, const uint32_t hintKey, const uint32_t vanillaItem, std::vector<Category>&& categories, SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP) {
-        return ItemLocation{rc, scene, ItemLocationType::Chest, std::move(name), hintKey, vanillaItem, std::move(categories), 0, SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_CHEST, scene, flag), collectionCheckGroup};
-    }
-
-    static auto Chest(RandomizerCheck rc, uint8_t scene, std::string&& name, const uint32_t hintKey, const uint32_t vanillaItem, std::vector<Category>&& categories, SpoilerCollectionCheck collectionCheck, SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP) {
-        return ItemLocation{rc, scene, ItemLocationType::Chest, std::move(name), hintKey, vanillaItem, std::move(categories), 0, collectionCheck, collectionCheckGroup};
-    }
-
-    static auto Collectable(RandomizerCheck rc, uint8_t scene, uint8_t flag, std::string&& name, const uint32_t hintKey, const uint32_t vanillaItem, std::vector<Category>&& categories, SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP) {
-        return ItemLocation{rc, scene, ItemLocationType::Collectable, std::move(name), hintKey, vanillaItem, std::move(categories), 0, SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_COLLECTABLE, scene, flag), collectionCheckGroup};
-    }
-
-    static auto Collectable(RandomizerCheck rc, uint8_t scene, std::string&& name, const uint32_t hintKey, const uint32_t vanillaItem, std::vector<Category>&& categories, SpoilerCollectionCheck collectionCheck, SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP) {
-        return ItemLocation{rc, scene, ItemLocationType::Collectable, std::move(name), hintKey, vanillaItem, std::move(categories), 0, collectionCheck, collectionCheckGroup};
-    }
-
-    static auto GSToken(RandomizerCheck rc, uint8_t scene, uint8_t flag, std::string&& name, const uint32_t hintKey, std::vector<Category>&& categories, SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP) {
-        return ItemLocation{rc, scene, ItemLocationType::GSToken, std::move(name), hintKey, GOLD_SKULLTULA_TOKEN, std::move(categories), 0, SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_GOLD_SKULLTULA, scene, flag), collectionCheckGroup};
-    }
-
-    static auto GrottoScrub(RandomizerCheck rc, uint8_t scene, std::string&& name, const uint32_t hintKey, const uint32_t vanillaItem, std::vector<Category>&& categories, SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(), SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP) {
-        return ItemLocation{rc, scene, ItemLocationType::GrottoScrub, std::move(name), hintKey, vanillaItem, std::move(categories), 0, collectionCheck, collectionCheckGroup};
-    }
-
-    static auto Delayed(RandomizerCheck rc, uint8_t scene, std::string&& name, const uint32_t hintKey, const uint32_t vanillaItem, std::vector<Category>&& categories, SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(), SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP) {
-        return ItemLocation{rc, scene, ItemLocationType::Delayed, std::move(name), hintKey, vanillaItem, std::move(categories), 0, collectionCheck, collectionCheckGroup};
-    }
-
-    static auto Reward(RandomizerCheck rc, uint8_t scene, std::string&& name, const uint32_t hintKey, const uint32_t vanillaItem, std::vector<Category>&& categories, SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(), SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP) {
-        return ItemLocation{rc, scene, ItemLocationType::TempleReward, std::move(name), hintKey, vanillaItem, std::move(categories), 0, collectionCheck, collectionCheckGroup};
-    }
-
-    static auto OtherHint(RandomizerCheck rc, std::string&& name) {
-        return ItemLocation{rc, 0, ItemLocationType::OtherHint, std::move(name), NONE, NONE, {}};
-    }
-
-    static auto HintStone(RandomizerCheck rc, std::string&& name) {
-        return ItemLocation{rc, 0, ItemLocationType::HintStone, std::move(name), NONE, NONE, {}};
-    }
-
-    void ResetVariables() {
-      checked = false;
-      addedToPool = false;
-      placedItem = NONE;
-      delayedItem = NONE;
-      hintedAt = false;
-      isHintable = false;
-      price = 0;
-      hasShopsanityPrice =  false;
-      hasScrubsanityPrice =  false;
-      hidden = false;
-    }
-
-private:
-    RandomizerCheck rc;
-    uint8_t scene;
-    ItemLocationType type;
-    bool checked = false;
-
-    std::string name;
-    uint32_t hintKey = NONE;
-    uint32_t vanillaItem = NONE;
-    bool hintedAt = false;
-    std::vector<Category> categories;
-    bool addedToPool = false;
-    uint32_t placedItem = NONE;
-    uint32_t hintedLocation = NONE;
-    HintType hintType;
-    std::string hintedRegion;
-    uint32_t delayedItem = NONE;
-    Option excludedOption = Option::Bool(name, {"Include", "Exclude"});
-    uint16_t price = 0;
-    SpoilerCollectionCheck collectionCheck;
-    SpoilerCollectionCheckGroup collectionCheckGroup;
-    bool isHintable = false;
-    uint32_t parentRegion = NONE;
-    bool hasShopsanityPrice = false;
-    bool hasScrubsanityPrice = false;
-    bool hidden = false;
-};
-
-class ItemOverride_Compare {
-public:
-    bool operator()(ItemOverride lhs, ItemOverride rhs) const {
-        return lhs.key.all < rhs.key.all;
-    }
-};
-
-void LocationTable_Init();
-
-ItemLocation* Location(uint32_t locKey);
-ItemLocation* Location(RandomizerCheck rc);
-
-extern std::vector<std::vector<uint32_t>> ShopLocationLists;
-
-extern std::vector<uint32_t> ScrubLocations;
-
-extern std::vector<uint32_t> gossipStoneLocations;
-
-extern std::vector<uint32_t> dungeonRewardLocations;
-extern std::vector<uint32_t> overworldLocations;
-extern std::vector<uint32_t> allLocations;
-extern std::vector<uint32_t> everyPossibleLocation;
-
-//set of overrides to write to the patch
-extern std::set<ItemOverride, ItemOverride_Compare> overrides;
-extern std::unordered_map<RandomizerCheck, uint8_t> iceTrapModels;
-
-extern std::vector<std::vector<uint32_t>> playthroughLocations;
-extern std::vector<uint32_t> wothLocations;
-extern bool playthroughBeatable;
-extern bool allLocationsReachable;
-extern bool showItemProgress;
-
-extern uint16_t itemsPlaced;
-
-void GenerateLocationPool();
-void PlaceItemInLocation(uint32_t loc, uint32_t item, bool applyEffectImmediately = false, bool setHidden = false);
-std::vector<uint32_t> GetLocations(const std::vector<uint32_t>& locationPool, Category categoryInclude,
-                                   Category categoryExclude = Category::cNull);
-void LocationReset();
-void ItemReset();
-void HintReset();
-void AddExcludedOptions();
-void CreateItemOverrides();
diff --git a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
index 485fc4154..eb3e9246d 100644
--- a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
@@ -2,8 +2,8 @@
 
 #include "dungeon.hpp"
 #include "fill.hpp"
-#include "item_list.hpp"
-#include "item_location.hpp"
+#include "../static_data.h"
+#include "../context.h"
 #include "pool_functions.hpp"
 #include "random.hpp"
 #include "settings.hpp"
@@ -15,424 +15,424 @@
 using namespace Settings;
 using namespace Dungeon;
 
-std::vector<uint32_t> ItemPool = {};
-std::vector<uint32_t> PendingJunkPool = {};
+std::vector<RandomizerGet> ItemPool = {};
+std::vector<RandomizerGet> PendingJunkPool = {};
 std::vector<uint8_t> IceTrapModels = {};
-const std::array<uint32_t, 9> dungeonRewards = {
-  KOKIRI_EMERALD,
-  GORON_RUBY,
-  ZORA_SAPPHIRE,
-  FOREST_MEDALLION,
-  FIRE_MEDALLION,
-  WATER_MEDALLION,
-  SPIRIT_MEDALLION,
-  SHADOW_MEDALLION,
-  LIGHT_MEDALLION,
+const std::array<RandomizerGet, 9> dungeonRewards = {
+  RG_KOKIRI_EMERALD,
+  RG_GORON_RUBY,
+  RG_ZORA_SAPPHIRE,
+  RG_FOREST_MEDALLION,
+  RG_FIRE_MEDALLION,
+  RG_WATER_MEDALLION,
+  RG_SPIRIT_MEDALLION,
+  RG_SHADOW_MEDALLION,
+  RG_LIGHT_MEDALLION,
 };
-const std::array<uint32_t, 16> JunkPoolItems = {
-  BOMBS_5,
-  BOMBS_10,
-  BOMBS_20,
-  DEKU_NUTS_5,
-  DEKU_STICK_1,
-  DEKU_SEEDS_30,
-  RECOVERY_HEART,
-  ARROWS_5,
-  ARROWS_10,
-  ARROWS_30,
-  BLUE_RUPEE,
-  RED_RUPEE,
-  PURPLE_RUPEE,
-  HUGE_RUPEE,
-  DEKU_NUTS_10,
-  ICE_TRAP,
+const std::array<RandomizerGet, 16> JunkPoolItems = {
+  RG_BOMBS_5,
+  RG_BOMBS_10,
+  RG_BOMBS_20,
+  RG_DEKU_NUTS_5,
+  RG_DEKU_STICK_1,
+  RG_DEKU_SEEDS_30,
+  RG_RECOVERY_HEART,
+  RG_ARROWS_5,
+  RG_ARROWS_10,
+  RG_ARROWS_30,
+  RG_BLUE_RUPEE,
+  RG_RED_RUPEE,
+  RG_PURPLE_RUPEE,
+  RG_HUGE_RUPEE,
+  RG_DEKU_NUTS_10,
+  RG_ICE_TRAP,
 };
-const std::array<uint32_t, 59> alwaysItems = {
-  BIGGORON_SWORD,
-  BOOMERANG,
-  LENS_OF_TRUTH,
-  MEGATON_HAMMER,
-  IRON_BOOTS,
-  GORON_TUNIC,
-  ZORA_TUNIC,
-  HOVER_BOOTS,
-  MIRROR_SHIELD,
-  STONE_OF_AGONY,
-  FIRE_ARROWS,
-  ICE_ARROWS,
-  LIGHT_ARROWS,
-  DINS_FIRE,
-  FARORES_WIND,
-  NAYRUS_LOVE,
-  GREG_RUPEE,
-  PROGRESSIVE_HOOKSHOT,  //2 progressive hookshots
-  PROGRESSIVE_HOOKSHOT,
-  DEKU_SHIELD,
-  HYLIAN_SHIELD,
-  PROGRESSIVE_STRENGTH,  //3 progressive strength upgrades
-  PROGRESSIVE_STRENGTH,
-  PROGRESSIVE_STRENGTH,
-  PROGRESSIVE_SCALE,     //2 progressive scales
-  PROGRESSIVE_SCALE,
-  PROGRESSIVE_BOW,       //3 progressive Bows
-  PROGRESSIVE_BOW,
-  PROGRESSIVE_BOW,
-  PROGRESSIVE_SLINGSHOT, //3 progressive bullet bags
-  PROGRESSIVE_SLINGSHOT,
-  PROGRESSIVE_SLINGSHOT,
-  PROGRESSIVE_BOMB_BAG,   //3 progressive bomb bags
-  PROGRESSIVE_BOMB_BAG,
-  PROGRESSIVE_BOMB_BAG,
-  PROGRESSIVE_WALLET, //2 progressive wallets
-  PROGRESSIVE_WALLET,
-  PROGRESSIVE_MAGIC_METER,  //2 progressive magic meters
-  PROGRESSIVE_MAGIC_METER,
-  DOUBLE_DEFENSE,
-  PROGRESSIVE_STICK_UPGRADE, //2 stick upgrades
-  PROGRESSIVE_STICK_UPGRADE,
-  PROGRESSIVE_NUT_UPGRADE,   //2 nut upgrades
-  PROGRESSIVE_NUT_UPGRADE,
-  RECOVERY_HEART,  //6 recovery hearts
-  RECOVERY_HEART,
-  RECOVERY_HEART,
-  RECOVERY_HEART,
-  RECOVERY_HEART,
-  RECOVERY_HEART,
-  BOMBS_5, //2
-  BOMBS_5,
-  BOMBS_10,
-  BOMBS_20,
-  ARROWS_5,
-  ARROWS_10, //5
-  ARROWS_10,
-  ARROWS_10,
-  TREASURE_GAME_HEART,
+const std::array<RandomizerGet, 59> alwaysItems = {
+  RG_BIGGORON_SWORD,
+  RG_BOOMERANG,
+  RG_LENS_OF_TRUTH,
+  RG_MEGATON_HAMMER,
+  RG_IRON_BOOTS,
+  RG_GORON_TUNIC,
+  RG_ZORA_TUNIC,
+  RG_HOVER_BOOTS,
+  RG_MIRROR_SHIELD,
+  RG_STONE_OF_AGONY,
+  RG_FIRE_ARROWS,
+  RG_ICE_ARROWS,
+  RG_LIGHT_ARROWS,
+  RG_DINS_FIRE,
+  RG_FARORES_WIND,
+  RG_NAYRUS_LOVE,
+  RG_GREG_RUPEE,
+  RG_PROGRESSIVE_HOOKSHOT,  //2 progressive hookshots
+  RG_PROGRESSIVE_HOOKSHOT,
+  RG_DEKU_SHIELD,
+  RG_HYLIAN_SHIELD,
+  RG_PROGRESSIVE_STRENGTH,  //3 progressive strength upgrades
+  RG_PROGRESSIVE_STRENGTH,
+  RG_PROGRESSIVE_STRENGTH,
+  RG_PROGRESSIVE_SCALE,     //2 progressive scales
+  RG_PROGRESSIVE_SCALE,
+  RG_PROGRESSIVE_BOW,       //3 progressive Bows
+  RG_PROGRESSIVE_BOW,
+  RG_PROGRESSIVE_BOW,
+  RG_PROGRESSIVE_SLINGSHOT, //3 progressive bullet bags
+  RG_PROGRESSIVE_SLINGSHOT,
+  RG_PROGRESSIVE_SLINGSHOT,
+  RG_PROGRESSIVE_BOMB_BAG,   //3 progressive bomb bags
+  RG_PROGRESSIVE_BOMB_BAG,
+  RG_PROGRESSIVE_BOMB_BAG,
+  RG_PROGRESSIVE_WALLET, //2 progressive wallets
+  RG_PROGRESSIVE_WALLET,
+  RG_PROGRESSIVE_MAGIC_METER,  //2 progressive magic meters
+  RG_PROGRESSIVE_MAGIC_METER,
+  RG_DOUBLE_DEFENSE,
+  RG_PROGRESSIVE_STICK_UPGRADE, //2 stick upgrades
+  RG_PROGRESSIVE_STICK_UPGRADE,
+  RG_PROGRESSIVE_NUT_UPGRADE,   //2 nut upgrades
+  RG_PROGRESSIVE_NUT_UPGRADE,
+  RG_RECOVERY_HEART,  //6 recovery hearts
+  RG_RECOVERY_HEART,
+  RG_RECOVERY_HEART,
+  RG_RECOVERY_HEART,
+  RG_RECOVERY_HEART,
+  RG_RECOVERY_HEART,
+  RG_BOMBS_5, //2
+  RG_BOMBS_5,
+  RG_BOMBS_10,
+  RG_BOMBS_20,
+  RG_ARROWS_5,
+  RG_ARROWS_10, //5
+  RG_ARROWS_10,
+  RG_ARROWS_10,
+  RG_TREASURE_GAME_HEART,
 };
-const std::array<uint32_t, 43> easyItems = {
-  BIGGORON_SWORD,
-  KOKIRI_SWORD,
-  BOOMERANG,
-  LENS_OF_TRUTH,
-  MEGATON_HAMMER,
-  IRON_BOOTS,
-  GORON_TUNIC,
-  ZORA_TUNIC,
-  HOVER_BOOTS,
-  MIRROR_SHIELD,
-  FIRE_ARROWS,
-  LIGHT_ARROWS,
-  DINS_FIRE,
-  PROGRESSIVE_HOOKSHOT,
-  PROGRESSIVE_STRENGTH,
-  PROGRESSIVE_SCALE,
-  PROGRESSIVE_WALLET,
-  PROGRESSIVE_MAGIC_METER,
-  PROGRESSIVE_STICK_UPGRADE,
-  PROGRESSIVE_NUT_UPGRADE,
-  PROGRESSIVE_BOW,
-  PROGRESSIVE_SLINGSHOT,
-  PROGRESSIVE_BOMB_BAG,
-  DOUBLE_DEFENSE,
-  HEART_CONTAINER, //16 Heart Containers
-  HEART_CONTAINER,
-  HEART_CONTAINER,
-  HEART_CONTAINER,
-  HEART_CONTAINER,
-  HEART_CONTAINER,
-  HEART_CONTAINER,
-  HEART_CONTAINER,
-  HEART_CONTAINER,
-  HEART_CONTAINER,
-  HEART_CONTAINER,
-  HEART_CONTAINER,
-  HEART_CONTAINER,
-  HEART_CONTAINER,
-  HEART_CONTAINER,
-  HEART_CONTAINER,
-  PIECE_OF_HEART,   //3 heart pieces
-  PIECE_OF_HEART,
-  PIECE_OF_HEART,
+const std::array<RandomizerGet, 43> easyItems = {
+  RG_BIGGORON_SWORD,
+  RG_KOKIRI_SWORD,
+  RG_BOOMERANG,
+  RG_LENS_OF_TRUTH,
+  RG_MEGATON_HAMMER,
+  RG_IRON_BOOTS,
+  RG_GORON_TUNIC,
+  RG_ZORA_TUNIC,
+  RG_HOVER_BOOTS,
+  RG_MIRROR_SHIELD,
+  RG_FIRE_ARROWS,
+  RG_LIGHT_ARROWS,
+  RG_DINS_FIRE,
+  RG_PROGRESSIVE_HOOKSHOT,
+  RG_PROGRESSIVE_STRENGTH,
+  RG_PROGRESSIVE_SCALE,
+  RG_PROGRESSIVE_WALLET,
+  RG_PROGRESSIVE_MAGIC_METER,
+  RG_PROGRESSIVE_STICK_UPGRADE,
+  RG_PROGRESSIVE_NUT_UPGRADE,
+  RG_PROGRESSIVE_BOW,
+  RG_PROGRESSIVE_SLINGSHOT,
+  RG_PROGRESSIVE_BOMB_BAG,
+  RG_DOUBLE_DEFENSE,
+  RG_HEART_CONTAINER, //16 Heart Containers
+  RG_HEART_CONTAINER,
+  RG_HEART_CONTAINER,
+  RG_HEART_CONTAINER,
+  RG_HEART_CONTAINER,
+  RG_HEART_CONTAINER,
+  RG_HEART_CONTAINER,
+  RG_HEART_CONTAINER,
+  RG_HEART_CONTAINER,
+  RG_HEART_CONTAINER,
+  RG_HEART_CONTAINER,
+  RG_HEART_CONTAINER,
+  RG_HEART_CONTAINER,
+  RG_HEART_CONTAINER,
+  RG_HEART_CONTAINER,
+  RG_HEART_CONTAINER,
+  RG_PIECE_OF_HEART,   //3 heart pieces
+  RG_PIECE_OF_HEART,
+  RG_PIECE_OF_HEART,
 };
-const std::array<uint32_t, 43> normalItems = {
-  PIECE_OF_HEART,   //35 pieces of heart
-  PIECE_OF_HEART,
-  PIECE_OF_HEART,
-  PIECE_OF_HEART,
-  PIECE_OF_HEART,
-  PIECE_OF_HEART,
-  PIECE_OF_HEART,
-  PIECE_OF_HEART,
-  PIECE_OF_HEART,
-  PIECE_OF_HEART,
-  PIECE_OF_HEART,
-  PIECE_OF_HEART,
-  PIECE_OF_HEART,
-  PIECE_OF_HEART,
-  PIECE_OF_HEART,
-  PIECE_OF_HEART,
-  PIECE_OF_HEART,
-  PIECE_OF_HEART,
-  PIECE_OF_HEART,
-  PIECE_OF_HEART,
-  PIECE_OF_HEART,
-  PIECE_OF_HEART,
-  PIECE_OF_HEART,
-  PIECE_OF_HEART,
-  PIECE_OF_HEART,
-  PIECE_OF_HEART,
-  PIECE_OF_HEART,
-  PIECE_OF_HEART,
-  PIECE_OF_HEART,
-  PIECE_OF_HEART,
-  PIECE_OF_HEART,
-  PIECE_OF_HEART,
-  PIECE_OF_HEART,
-  PIECE_OF_HEART,
-  PIECE_OF_HEART,
-  HEART_CONTAINER, //8 heart containers
-  HEART_CONTAINER,
-  HEART_CONTAINER,
-  HEART_CONTAINER,
-  HEART_CONTAINER,
-  HEART_CONTAINER,
-  HEART_CONTAINER,
-  HEART_CONTAINER,
+const std::array<RandomizerGet, 43> normalItems = {
+  RG_PIECE_OF_HEART,   //35 pieces of heart
+  RG_PIECE_OF_HEART,
+  RG_PIECE_OF_HEART,
+  RG_PIECE_OF_HEART,
+  RG_PIECE_OF_HEART,
+  RG_PIECE_OF_HEART,
+  RG_PIECE_OF_HEART,
+  RG_PIECE_OF_HEART,
+  RG_PIECE_OF_HEART,
+  RG_PIECE_OF_HEART,
+  RG_PIECE_OF_HEART,
+  RG_PIECE_OF_HEART,
+  RG_PIECE_OF_HEART,
+  RG_PIECE_OF_HEART,
+  RG_PIECE_OF_HEART,
+  RG_PIECE_OF_HEART,
+  RG_PIECE_OF_HEART,
+  RG_PIECE_OF_HEART,
+  RG_PIECE_OF_HEART,
+  RG_PIECE_OF_HEART,
+  RG_PIECE_OF_HEART,
+  RG_PIECE_OF_HEART,
+  RG_PIECE_OF_HEART,
+  RG_PIECE_OF_HEART,
+  RG_PIECE_OF_HEART,
+  RG_PIECE_OF_HEART,
+  RG_PIECE_OF_HEART,
+  RG_PIECE_OF_HEART,
+  RG_PIECE_OF_HEART,
+  RG_PIECE_OF_HEART,
+  RG_PIECE_OF_HEART,
+  RG_PIECE_OF_HEART,
+  RG_PIECE_OF_HEART,
+  RG_PIECE_OF_HEART,
+  RG_PIECE_OF_HEART,
+  RG_HEART_CONTAINER, //8 heart containers
+  RG_HEART_CONTAINER,
+  RG_HEART_CONTAINER,
+  RG_HEART_CONTAINER,
+  RG_HEART_CONTAINER,
+  RG_HEART_CONTAINER,
+  RG_HEART_CONTAINER,
+  RG_HEART_CONTAINER,
 };
-const std::array<uint32_t, 2> DT_Vanilla = {
-  RECOVERY_HEART,
-  RECOVERY_HEART,
+const std::array<RandomizerGet, 2> DT_Vanilla = {
+  RG_RECOVERY_HEART,
+  RG_RECOVERY_HEART,
 };
-const std::array<uint32_t, 3> DT_MQ = {
-  DEKU_SHIELD,
-  DEKU_SHIELD,
-  PURPLE_RUPEE,
+const std::array<RandomizerGet, 3> DT_MQ = {
+  RG_DEKU_SHIELD,
+  RG_DEKU_SHIELD,
+  RG_PURPLE_RUPEE,
 };
-const std::array<uint32_t, 1> DC_Vanilla = {
-  RED_RUPEE,
+const std::array<RandomizerGet, 1> DC_Vanilla = {
+  RG_RED_RUPEE,
 };
-const std::array<uint32_t, 2> DC_MQ = {
-  HYLIAN_SHIELD,
-  BLUE_RUPEE,
+const std::array<RandomizerGet, 2> DC_MQ = {
+  RG_HYLIAN_SHIELD,
+  RG_BLUE_RUPEE,
 };
-const std::array<uint32_t, 7> JB_MQ = {
-  DEKU_NUTS_5,
-  DEKU_NUTS_5,
-  DEKU_NUTS_5,
-  DEKU_NUTS_5,
-  RECOVERY_HEART,
-  DEKU_SHIELD,
-  DEKU_STICK_1,
+const std::array<RandomizerGet, 7> JB_MQ = {
+  RG_DEKU_NUTS_5,
+  RG_DEKU_NUTS_5,
+  RG_DEKU_NUTS_5,
+  RG_DEKU_NUTS_5,
+  RG_RECOVERY_HEART,
+  RG_DEKU_SHIELD,
+  RG_DEKU_STICK_1,
 };
-const std::array<uint32_t, 3> FoT_Vanilla = {
-  RECOVERY_HEART,
-  ARROWS_10,
-  ARROWS_30,
+const std::array<RandomizerGet, 3> FoT_Vanilla = {
+  RG_RECOVERY_HEART,
+  RG_ARROWS_10,
+  RG_ARROWS_30,
 };
-const std::array<uint32_t, 1> FoT_MQ = {
-  ARROWS_5,
+const std::array<RandomizerGet, 1> FoT_MQ = {
+  RG_ARROWS_5,
 };
-const std::array<uint32_t, 1> FiT_Vanilla = {
-  HUGE_RUPEE,
+const std::array<RandomizerGet, 1> FiT_Vanilla = {
+  RG_HUGE_RUPEE,
 };
-const std::array<uint32_t, 2> FiT_MQ = {
-  BOMBS_20,
-  HYLIAN_SHIELD,
+const std::array<RandomizerGet, 2> FiT_MQ = {
+  RG_BOMBS_20,
+  RG_HYLIAN_SHIELD,
 };
-const std::array<uint32_t, 4> SpT_Vanilla = {
-  DEKU_SHIELD,
-  DEKU_SHIELD,
-  RECOVERY_HEART,
-  BOMBS_20,
+const std::array<RandomizerGet, 4> SpT_Vanilla = {
+  RG_DEKU_SHIELD,
+  RG_DEKU_SHIELD,
+  RG_RECOVERY_HEART,
+  RG_BOMBS_20,
 };
-const std::array<uint32_t, 3> SpT_MQ = {
-  PURPLE_RUPEE,
-  PURPLE_RUPEE,
-  ARROWS_30,
+const std::array<RandomizerGet, 3> SpT_MQ = {
+  RG_PURPLE_RUPEE,
+  RG_PURPLE_RUPEE,
+  RG_ARROWS_30,
 };
-const std::array<uint32_t, 1> ShT_Vanilla = {
-  ARROWS_30,
+const std::array<RandomizerGet, 1> ShT_Vanilla = {
+  RG_ARROWS_30,
 };
-const std::array<uint32_t, 3> ShT_MQ = {
-  ARROWS_5,
-  ARROWS_5,
-  RED_RUPEE,
+const std::array<RandomizerGet, 3> ShT_MQ = {
+  RG_ARROWS_5,
+  RG_ARROWS_5,
+  RG_RED_RUPEE,
 };
-const std::array<uint32_t, 7> BW_Vanilla = {
-  RECOVERY_HEART,
-  BOMBS_10,
-  HUGE_RUPEE,
-  DEKU_NUTS_5,
-  DEKU_NUTS_10,
-  DEKU_SHIELD,
-  HYLIAN_SHIELD,
+const std::array<RandomizerGet, 7> BW_Vanilla = {
+  RG_RECOVERY_HEART,
+  RG_BOMBS_10,
+  RG_HUGE_RUPEE,
+  RG_DEKU_NUTS_5,
+  RG_DEKU_NUTS_10,
+  RG_DEKU_SHIELD,
+  RG_HYLIAN_SHIELD,
 };
-const std::array<uint32_t, 4> GTG_Vanilla = {
-  ARROWS_30,
-  ARROWS_30,
-  ARROWS_30,
-  HUGE_RUPEE,
+const std::array<RandomizerGet, 4> GTG_Vanilla = {
+  RG_ARROWS_30,
+  RG_ARROWS_30,
+  RG_ARROWS_30,
+  RG_HUGE_RUPEE,
 };
-const std::array<uint32_t, 5> GTG_MQ = {
-  TREASURE_GAME_GREEN_RUPEE,
-  TREASURE_GAME_GREEN_RUPEE,
-  ARROWS_10,
-  GREEN_RUPEE,
-  PURPLE_RUPEE,
+const std::array<RandomizerGet, 5> GTG_MQ = {
+  RG_TREASURE_GAME_GREEN_RUPEE,
+  RG_TREASURE_GAME_GREEN_RUPEE,
+  RG_ARROWS_10,
+  RG_GREEN_RUPEE,
+  RG_PURPLE_RUPEE,
 };
-const std::array<uint32_t, 4> GC_Vanilla = {
-  BLUE_RUPEE,
-  BLUE_RUPEE,
-  BLUE_RUPEE,
-  ARROWS_30,
+const std::array<RandomizerGet, 4> GC_Vanilla = {
+  RG_BLUE_RUPEE,
+  RG_BLUE_RUPEE,
+  RG_BLUE_RUPEE,
+  RG_ARROWS_30,
 };
-const std::array<uint32_t, 5> GC_MQ = {
-  ARROWS_10,
-  ARROWS_10,
-  BOMBS_5,
-  RED_RUPEE,
-  RECOVERY_HEART,
+const std::array<RandomizerGet, 5> GC_MQ = {
+  RG_ARROWS_10,
+  RG_ARROWS_10,
+  RG_BOMBS_5,
+  RG_RED_RUPEE,
+  RG_RECOVERY_HEART,
 };
-const std::array<uint32_t, 11> normalBottles = {
-  EMPTY_BOTTLE,
-  BOTTLE_WITH_MILK,
-  BOTTLE_WITH_RED_POTION,
-  BOTTLE_WITH_GREEN_POTION,
-  BOTTLE_WITH_BLUE_POTION,
-  BOTTLE_WITH_FAIRY,
-  BOTTLE_WITH_FISH,
-  BOTTLE_WITH_BUGS,
-  BOTTLE_WITH_POE,
-  BOTTLE_WITH_BIG_POE,
-  BOTTLE_WITH_BLUE_FIRE,
+const std::array<RandomizerGet, 11> normalBottles = {
+  RG_EMPTY_BOTTLE,
+  RG_BOTTLE_WITH_MILK,
+  RG_BOTTLE_WITH_RED_POTION,
+  RG_BOTTLE_WITH_GREEN_POTION,
+  RG_BOTTLE_WITH_BLUE_POTION,
+  RG_BOTTLE_WITH_FAIRY,
+  RG_BOTTLE_WITH_FISH,
+  RG_BOTTLE_WITH_BUGS,
+  RG_BOTTLE_WITH_POE,
+  RG_BOTTLE_WITH_BIG_POE,
+  RG_BOTTLE_WITH_BLUE_FIRE,
 };
-const std::array<uint32_t, 28> normalRupees = {
-  BLUE_RUPEE,
-  BLUE_RUPEE,
-  BLUE_RUPEE,
-  BLUE_RUPEE,
-  BLUE_RUPEE,
-  BLUE_RUPEE,
-  BLUE_RUPEE,
-  BLUE_RUPEE,
-  BLUE_RUPEE,
-  BLUE_RUPEE,
-  BLUE_RUPEE,
-  BLUE_RUPEE,
-  BLUE_RUPEE,
-  RED_RUPEE,
-  RED_RUPEE,
-  RED_RUPEE,
-  RED_RUPEE,
-  RED_RUPEE,
-  PURPLE_RUPEE,
-  PURPLE_RUPEE,
-  PURPLE_RUPEE,
-  PURPLE_RUPEE,
-  PURPLE_RUPEE,
-  PURPLE_RUPEE,
-  PURPLE_RUPEE,
-  HUGE_RUPEE,
-  HUGE_RUPEE,
-  HUGE_RUPEE,
+const std::array<RandomizerGet, 28> normalRupees = {
+  RG_BLUE_RUPEE,
+  RG_BLUE_RUPEE,
+  RG_BLUE_RUPEE,
+  RG_BLUE_RUPEE,
+  RG_BLUE_RUPEE,
+  RG_BLUE_RUPEE,
+  RG_BLUE_RUPEE,
+  RG_BLUE_RUPEE,
+  RG_BLUE_RUPEE,
+  RG_BLUE_RUPEE,
+  RG_BLUE_RUPEE,
+  RG_BLUE_RUPEE,
+  RG_BLUE_RUPEE,
+  RG_RED_RUPEE,
+  RG_RED_RUPEE,
+  RG_RED_RUPEE,
+  RG_RED_RUPEE,
+  RG_RED_RUPEE,
+  RG_PURPLE_RUPEE,
+  RG_PURPLE_RUPEE,
+  RG_PURPLE_RUPEE,
+  RG_PURPLE_RUPEE,
+  RG_PURPLE_RUPEE,
+  RG_PURPLE_RUPEE,
+  RG_PURPLE_RUPEE,
+  RG_HUGE_RUPEE,
+  RG_HUGE_RUPEE,
+  RG_HUGE_RUPEE,
 };
-const std::array<uint32_t, 28> shopsanityRupees = {
-  BLUE_RUPEE,
-  BLUE_RUPEE,
-  RED_RUPEE,
-  RED_RUPEE,
-  RED_RUPEE,
-  RED_RUPEE,
-  RED_RUPEE,
-  RED_RUPEE,
-  RED_RUPEE,
-  RED_RUPEE,
-  RED_RUPEE,
-  RED_RUPEE,
-  PURPLE_RUPEE,
-  PURPLE_RUPEE,
-  PURPLE_RUPEE,
-  PURPLE_RUPEE,
-  PURPLE_RUPEE,
-  PURPLE_RUPEE,
-  PURPLE_RUPEE,
-  PURPLE_RUPEE,
-  PURPLE_RUPEE,
-  PURPLE_RUPEE,
-  HUGE_RUPEE,
-  HUGE_RUPEE,
-  HUGE_RUPEE,
-  HUGE_RUPEE,
-  HUGE_RUPEE,
-  PROGRESSIVE_WALLET,
+const std::array<RandomizerGet, 28> shopsanityRupees = {
+  RG_BLUE_RUPEE,
+  RG_BLUE_RUPEE,
+  RG_RED_RUPEE,
+  RG_RED_RUPEE,
+  RG_RED_RUPEE,
+  RG_RED_RUPEE,
+  RG_RED_RUPEE,
+  RG_RED_RUPEE,
+  RG_RED_RUPEE,
+  RG_RED_RUPEE,
+  RG_RED_RUPEE,
+  RG_RED_RUPEE,
+  RG_PURPLE_RUPEE,
+  RG_PURPLE_RUPEE,
+  RG_PURPLE_RUPEE,
+  RG_PURPLE_RUPEE,
+  RG_PURPLE_RUPEE,
+  RG_PURPLE_RUPEE,
+  RG_PURPLE_RUPEE,
+  RG_PURPLE_RUPEE,
+  RG_PURPLE_RUPEE,
+  RG_PURPLE_RUPEE,
+  RG_HUGE_RUPEE,
+  RG_HUGE_RUPEE,
+  RG_HUGE_RUPEE,
+  RG_HUGE_RUPEE,
+  RG_HUGE_RUPEE,
+  RG_PROGRESSIVE_WALLET,
 };
-const std::array<uint32_t, 19> dekuScrubItems = {
-  DEKU_NUTS_5,
-  DEKU_NUTS_5,
-  DEKU_NUTS_5,
-  DEKU_NUTS_5,
-  DEKU_NUTS_5,
-  DEKU_STICK_1,
-  BOMBS_5,
-  BOMBS_5,
-  BOMBS_5,
-  BOMBS_5,
-  BOMBS_5,
-  RECOVERY_HEART,
-  RECOVERY_HEART,
-  RECOVERY_HEART,
-  RECOVERY_HEART,
-  BLUE_RUPEE,
-  BLUE_RUPEE,
-  BLUE_RUPEE,
-  BLUE_RUPEE,
+const std::array<RandomizerGet, 19> dekuScrubItems = {
+  RG_DEKU_NUTS_5,
+  RG_DEKU_NUTS_5,
+  RG_DEKU_NUTS_5,
+  RG_DEKU_NUTS_5,
+  RG_DEKU_NUTS_5,
+  RG_DEKU_STICK_1,
+  RG_BOMBS_5,
+  RG_BOMBS_5,
+  RG_BOMBS_5,
+  RG_BOMBS_5,
+  RG_BOMBS_5,
+  RG_RECOVERY_HEART,
+  RG_RECOVERY_HEART,
+  RG_RECOVERY_HEART,
+  RG_RECOVERY_HEART,
+  RG_BLUE_RUPEE,
+  RG_BLUE_RUPEE,
+  RG_BLUE_RUPEE,
+  RG_BLUE_RUPEE,
 };
-const std::array<uint32_t, 12> songList = {
-  ZELDAS_LULLABY,
-  EPONAS_SONG,
-  SUNS_SONG,
-  SARIAS_SONG,
-  SONG_OF_TIME,
-  SONG_OF_STORMS,
-  MINUET_OF_FOREST,
-  PRELUDE_OF_LIGHT,
-  BOLERO_OF_FIRE,
-  SERENADE_OF_WATER,
-  NOCTURNE_OF_SHADOW,
-  REQUIEM_OF_SPIRIT,
+const std::array<RandomizerGet, 12> songList = {
+  RG_ZELDAS_LULLABY,
+  RG_EPONAS_SONG,
+  RG_SUNS_SONG,
+  RG_SARIAS_SONG,
+  RG_SONG_OF_TIME,
+  RG_SONG_OF_STORMS,
+  RG_MINUET_OF_FOREST,
+  RG_PRELUDE_OF_LIGHT,
+  RG_BOLERO_OF_FIRE,
+  RG_SERENADE_OF_WATER,
+  RG_NOCTURNE_OF_SHADOW,
+  RG_REQUIEM_OF_SPIRIT,
 };
-const std::array<uint32_t, 10> tradeItems = {
-  POCKET_EGG,
-  //POCKET_CUCCO,
-  COJIRO,
-  ODD_MUSHROOM,
-  POACHERS_SAW,
-  BROKEN_SWORD,
-  PRESCRIPTION,
-  EYEBALL_FROG,
-  EYEDROPS,
-  CLAIM_CHECK,
+const std::array<RandomizerGet, 10> tradeItems = {
+  RG_POCKET_EGG,
+  //RG_POCKET_CUCCO,
+  RG_COJIRO,
+  RG_ODD_MUSHROOM,
+  RG_POACHERS_SAW,
+  RG_BROKEN_SWORD,
+  RG_PRESCRIPTION,
+  RG_EYEBALL_FROG,
+  RG_EYEDROPS,
+  RG_CLAIM_CHECK,
 };
 
-void AddItemToPool(std::vector<uint32_t>& pool, uint32_t item, size_t count /*= 1*/) {
+void AddItemToPool(std::vector<RandomizerGet>& pool, RandomizerGet item, size_t count /*= 1*/) {
   pool.insert(pool.end(), count, item);
 }
 
 template <typename FromPool>
-static void AddItemsToPool(std::vector<uint32_t>& toPool, const FromPool& fromPool) {
+static void AddItemsToPool(std::vector<RandomizerGet>& toPool, const FromPool& fromPool) {
   AddElementsToPool(toPool, fromPool);
 }
 
-static void AddItemToMainPool(const uint32_t item, size_t count = 1) {
+static void AddItemToMainPool(const RandomizerGet item, size_t count = 1) {
   ItemPool.insert(ItemPool.end(), count, item);
 }
 
-static void AddRandomBottle(std::vector<uint32_t>& bottlePool) {
+static void AddRandomBottle(std::vector<RandomizerGet>& bottlePool) {
   AddItemToMainPool(RandomElement(bottlePool, true));
 }
 
-uint32_t GetJunkItem() {
+RandomizerGet GetJunkItem() {
   if (IceTrapValue.Is(ICETRAPS_MAYHEM) || IceTrapValue.Is(ICETRAPS_ONSLAUGHT)) {
-    return ICE_TRAP;
+      return RG_ICE_TRAP;
   } else if (IceTrapValue.Is(ICETRAPS_EXTRA)) {
       return RandomElement(JunkPoolItems);
   }
@@ -441,7 +441,7 @@ uint32_t GetJunkItem() {
   return JunkPoolItems[idx];
 }
 
-static uint32_t GetPendingJunkItem() {
+static RandomizerGet GetPendingJunkItem() {
   if (PendingJunkPool.empty()) {
     return GetJunkItem();
   }
@@ -450,7 +450,7 @@ static uint32_t GetPendingJunkItem() {
 }
 
 //Replace junk items in the pool with pending junk
-static void ReplaceMaxItem(const uint32_t itemToReplace, int max) {
+static void ReplaceMaxItem(const RandomizerGet itemToReplace, int max) {
   int itemCount = 0;
   for (size_t i = 0; i < ItemPool.size(); i++) {
     if (ItemPool[i] == itemToReplace) {
@@ -462,11 +462,12 @@ static void ReplaceMaxItem(const uint32_t itemToReplace, int max) {
   }
 }
 
-void PlaceJunkInExcludedLocation(const uint32_t il) {
+void PlaceJunkInExcludedLocation(const RandomizerCheck il) {
   //place a non-advancement item in this location
+  auto ctx = Rando::Context::GetInstance();
   for (size_t i = 0; i < ItemPool.size(); i++) {
-    if (!ItemTable(ItemPool[i]).IsAdvancement()) {
-      PlaceItemInLocation(il, ItemPool[i]);
+    if (!Rando::StaticData::RetrieveItem(ItemPool[i]).IsAdvancement()) {
+      ctx->PlaceItemInLocation(il, ItemPool[i]);
       ItemPool.erase(ItemPool.begin() + i);
       return;
     }
@@ -475,60 +476,62 @@ void PlaceJunkInExcludedLocation(const uint32_t il) {
 }
 
 static void PlaceVanillaDekuScrubItems() {
-    PlaceItemInLocation(ZR_DEKU_SCRUB_GROTTO_REAR,             RED_POTION_REFILL, false, true);
-    PlaceItemInLocation(ZR_DEKU_SCRUB_GROTTO_FRONT,            GREEN_POTION_REFILL, false, true);
-    PlaceItemInLocation(SFM_DEKU_SCRUB_GROTTO_REAR,            RED_POTION_REFILL, false, true);
-    PlaceItemInLocation(SFM_DEKU_SCRUB_GROTTO_FRONT,           GREEN_POTION_REFILL, false, true);
-    PlaceItemInLocation(LH_DEKU_SCRUB_GROTTO_LEFT,             DEKU_NUTS_5, false, true);
-    PlaceItemInLocation(LH_DEKU_SCRUB_GROTTO_RIGHT,            BOMBS_5, false, true);
-    PlaceItemInLocation(LH_DEKU_SCRUB_GROTTO_CENTER,           DEKU_SEEDS_30, false, true);
-    PlaceItemInLocation(GV_DEKU_SCRUB_GROTTO_REAR,             RED_POTION_REFILL, false, true);
-    PlaceItemInLocation(GV_DEKU_SCRUB_GROTTO_FRONT,            GREEN_POTION_REFILL, false, true);
-    PlaceItemInLocation(LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT, DEKU_NUTS_5, false, true);
-    PlaceItemInLocation(LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT,  DEKU_STICK_1, false, true);
-    PlaceItemInLocation(LW_DEKU_SCRUB_GROTTO_REAR,             DEKU_SEEDS_30, false, true);
-    PlaceItemInLocation(COLOSSUS_DEKU_SCRUB_GROTTO_REAR,       RED_POTION_REFILL, false, true);
-    PlaceItemInLocation(COLOSSUS_DEKU_SCRUB_GROTTO_FRONT,      GREEN_POTION_REFILL, false, true);
-    PlaceItemInLocation(DMC_DEKU_SCRUB,                        BOMBS_5, false, true);
-    PlaceItemInLocation(DMC_DEKU_SCRUB_GROTTO_LEFT,            DEKU_NUTS_5, false, true);
-    PlaceItemInLocation(DMC_DEKU_SCRUB_GROTTO_RIGHT,           BOMBS_5, false, true);
-    PlaceItemInLocation(DMC_DEKU_SCRUB_GROTTO_CENTER,          DEKU_SEEDS_30, false, true);
-    PlaceItemInLocation(GC_DEKU_SCRUB_GROTTO_LEFT,             DEKU_NUTS_5, false, true);
-    PlaceItemInLocation(GC_DEKU_SCRUB_GROTTO_RIGHT,            BOMBS_5, false, true);
-    PlaceItemInLocation(GC_DEKU_SCRUB_GROTTO_CENTER,           DEKU_SEEDS_30, false, true);
-    PlaceItemInLocation(LLR_DEKU_SCRUB_GROTTO_LEFT,            DEKU_NUTS_5, false, true);
-    PlaceItemInLocation(LLR_DEKU_SCRUB_GROTTO_RIGHT,           BOMBS_5, false, true);
-    PlaceItemInLocation(LLR_DEKU_SCRUB_GROTTO_CENTER,          DEKU_SEEDS_30, false, true);
+    auto ctx = Rando::Context::GetInstance();
+    ctx->PlaceItemInLocation(RC_ZR_DEKU_SCRUB_GROTTO_REAR,             RG_RED_POTION_REFILL, false, true);
+    ctx->PlaceItemInLocation(RC_ZR_DEKU_SCRUB_GROTTO_FRONT,            RG_GREEN_POTION_REFILL, false, true);
+    ctx->PlaceItemInLocation(RC_SFM_DEKU_SCRUB_GROTTO_REAR,            RG_RED_POTION_REFILL, false, true);
+    ctx->PlaceItemInLocation(RC_SFM_DEKU_SCRUB_GROTTO_FRONT,           RG_GREEN_POTION_REFILL, false, true);
+    ctx->PlaceItemInLocation(RC_LH_DEKU_SCRUB_GROTTO_LEFT,             RG_DEKU_NUTS_5, false, true);
+    ctx->PlaceItemInLocation(RC_LH_DEKU_SCRUB_GROTTO_RIGHT,            RG_BOMBS_5, false, true);
+    ctx->PlaceItemInLocation(RC_LH_DEKU_SCRUB_GROTTO_CENTER,           RG_DEKU_SEEDS_30, false, true);
+    ctx->PlaceItemInLocation(RC_GV_DEKU_SCRUB_GROTTO_REAR,             RG_RED_POTION_REFILL, false, true);
+    ctx->PlaceItemInLocation(RC_GV_DEKU_SCRUB_GROTTO_FRONT,            RG_GREEN_POTION_REFILL, false, true);
+    ctx->PlaceItemInLocation(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT, RG_DEKU_NUTS_5, false, true);
+    ctx->PlaceItemInLocation(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT,  RG_DEKU_STICK_1, false, true);
+    ctx->PlaceItemInLocation(RC_LW_DEKU_SCRUB_GROTTO_REAR,             RG_DEKU_SEEDS_30, false, true);
+    ctx->PlaceItemInLocation(RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,       RG_RED_POTION_REFILL, false, true);
+    ctx->PlaceItemInLocation(RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT,      RG_GREEN_POTION_REFILL, false, true);
+    ctx->PlaceItemInLocation(RC_DMC_DEKU_SCRUB,                        RG_BOMBS_5, false, true);
+    ctx->PlaceItemInLocation(RC_DMC_DEKU_SCRUB_GROTTO_LEFT,            RG_DEKU_NUTS_5, false, true);
+    ctx->PlaceItemInLocation(RC_DMC_DEKU_SCRUB_GROTTO_RIGHT,           RG_BOMBS_5, false, true);
+    ctx->PlaceItemInLocation(RC_DMC_DEKU_SCRUB_GROTTO_CENTER,          RG_DEKU_SEEDS_30, false, true);
+    ctx->PlaceItemInLocation(RC_GC_DEKU_SCRUB_GROTTO_LEFT,             RG_DEKU_NUTS_5, false, true);
+    ctx->PlaceItemInLocation(RC_GC_DEKU_SCRUB_GROTTO_RIGHT,            RG_BOMBS_5, false, true);
+    ctx->PlaceItemInLocation(RC_GC_DEKU_SCRUB_GROTTO_CENTER,           RG_DEKU_SEEDS_30, false, true);
+    ctx->PlaceItemInLocation(RC_LLR_DEKU_SCRUB_GROTTO_LEFT,            RG_DEKU_NUTS_5, false, true);
+    ctx->PlaceItemInLocation(RC_LLR_DEKU_SCRUB_GROTTO_RIGHT,           RG_BOMBS_5, false, true);
+    ctx->PlaceItemInLocation(RC_LLR_DEKU_SCRUB_GROTTO_CENTER,          RG_DEKU_SEEDS_30, false, true);
 
     //Dungeon Scrubs
     if (DekuTree.IsMQ()) {
-      PlaceItemInLocation(DEKU_TREE_MQ_DEKU_SCRUB, DEKU_SHIELD, false, true);
+        ctx->PlaceItemInLocation(RC_DEKU_TREE_MQ_DEKU_SCRUB, RG_DEKU_SHIELD, false, true);
     }
     if (DodongosCavern.IsMQ()) {
-      PlaceItemInLocation(DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,                    DEKU_STICK_1, false, true);
-      PlaceItemInLocation(DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT,                   DEKU_SEEDS_30, false, true);
-      PlaceItemInLocation(DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,                     DEKU_SHIELD, false, true);
-      PlaceItemInLocation(DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS, RED_POTION_REFILL, false, true);
+        ctx->PlaceItemInLocation(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR, RG_DEKU_STICK_1, false, true);
+        ctx->PlaceItemInLocation(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT, RG_DEKU_SEEDS_30, false, true);
+        ctx->PlaceItemInLocation(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE, RG_DEKU_SHIELD, false, true);
+        ctx->PlaceItemInLocation(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS, RG_RED_POTION_REFILL,
+                                 false, true);
     } else {
-      PlaceItemInLocation(DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,      DEKU_NUTS_5, false, true);
-      PlaceItemInLocation(DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS, DEKU_STICK_1, false, true);
-      PlaceItemInLocation(DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT,     DEKU_SEEDS_30, false, true);
-      PlaceItemInLocation(DODONGOS_CAVERN_DEKU_SCRUB_LOBBY,                   DEKU_SHIELD, false, true);
+      ctx->PlaceItemInLocation(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,      RG_DEKU_NUTS_5, false, true);
+      ctx->PlaceItemInLocation(RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS, RG_DEKU_STICK_1, false, true);
+      ctx->PlaceItemInLocation(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT,     RG_DEKU_SEEDS_30, false, true);
+      ctx->PlaceItemInLocation(RC_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY,                   RG_DEKU_SHIELD, false, true);
     }
     if (JabuJabusBelly.IsVanilla()) {
-      PlaceItemInLocation(JABU_JABUS_BELLY_DEKU_SCRUB, DEKU_NUTS_5);
+        ctx->PlaceItemInLocation(RC_JABU_JABUS_BELLY_DEKU_SCRUB, RG_DEKU_NUTS_5, false, true);
     }
     if (GanonsCastle.IsMQ()) {
-      PlaceItemInLocation(GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,         GREEN_POTION_REFILL, false, true);
-      PlaceItemInLocation(GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,  BOMBS_5, false, true);
-      PlaceItemInLocation(GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,       ARROWS_30, false, true);
-      PlaceItemInLocation(GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT, RED_POTION_REFILL, false, true);
-      PlaceItemInLocation(GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,        DEKU_NUTS_5, false, true);
+      ctx->PlaceItemInLocation(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,         RG_GREEN_POTION_REFILL, false, true);
+      ctx->PlaceItemInLocation(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,  RG_BOMBS_5, false, true);
+      ctx->PlaceItemInLocation(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,       RG_ARROWS_30, false, true);
+      ctx->PlaceItemInLocation(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT, RG_RED_POTION_REFILL, false, true);
+      ctx->PlaceItemInLocation(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,        RG_DEKU_NUTS_5, false, true);
     } else {
-      PlaceItemInLocation(GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,  BOMBS_5, false, true);
-      PlaceItemInLocation(GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT, DEKU_SEEDS_30, false, true);
-      PlaceItemInLocation(GANONS_CASTLE_DEKU_SCRUB_RIGHT,        RED_POTION_REFILL, false, true);
-      PlaceItemInLocation(GANONS_CASTLE_DEKU_SCRUB_LEFT,         GREEN_POTION_REFILL, false, true);
+      ctx->PlaceItemInLocation(RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,  RG_BOMBS_5, false, true);
+      ctx->PlaceItemInLocation(RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT, RG_DEKU_SEEDS_30, false, true);
+      ctx->PlaceItemInLocation(RC_GANONS_CASTLE_DEKU_SCRUB_RIGHT,        RG_RED_POTION_REFILL, false, true);
+      ctx->PlaceItemInLocation(RC_GANONS_CASTLE_DEKU_SCRUB_LEFT,         RG_GREEN_POTION_REFILL, false, true);
     }
 
 
@@ -554,56 +557,57 @@ static void PlaceVanillaBossKeys() {
 }
 
 static void PlaceVanillaCowMilk() {
-  PlaceItemInLocation(KF_LINKS_HOUSE_COW,    MILK, false, true);
-  PlaceItemInLocation(HF_COW_GROTTO_COW,     MILK, false, true);
-  PlaceItemInLocation(GV_COW,                MILK, false, true);
-  PlaceItemInLocation(KAK_IMPAS_HOUSE_COW,   MILK, false, true);
-  PlaceItemInLocation(DMT_COW_GROTTO_COW,    MILK, false, true);
-  PlaceItemInLocation(LLR_STABLES_LEFT_COW,  MILK, false, true);
-  PlaceItemInLocation(LLR_STABLES_RIGHT_COW, MILK, false, true);
-  PlaceItemInLocation(LLR_TOWER_LEFT_COW,    MILK, false, true);
-  PlaceItemInLocation(LLR_TOWER_RIGHT_COW,   MILK, false, true);
+  auto ctx = Rando::Context::GetInstance();
+  ctx->PlaceItemInLocation(RC_KF_LINKS_HOUSE_COW,    RG_MILK, false, true);
+  ctx->PlaceItemInLocation(RC_HF_COW_GROTTO_COW,     RG_MILK, false, true);
+  ctx->PlaceItemInLocation(RC_GV_COW,                RG_MILK, false, true);
+  ctx->PlaceItemInLocation(RC_KAK_IMPAS_HOUSE_COW,   RG_MILK, false, true);
+  ctx->PlaceItemInLocation(RC_DMT_COW_GROTTO_COW,    RG_MILK, false, true);
+  ctx->PlaceItemInLocation(RC_LLR_STABLES_LEFT_COW,  RG_MILK, false, true);
+  ctx->PlaceItemInLocation(RC_LLR_STABLES_RIGHT_COW, RG_MILK, false, true);
+  ctx->PlaceItemInLocation(RC_LLR_TOWER_LEFT_COW,    RG_MILK, false, true);
+  ctx->PlaceItemInLocation(RC_LLR_TOWER_RIGHT_COW,   RG_MILK, false, true);
 
   if (JabuJabusBelly.IsMQ()) {
-    PlaceItemInLocation(JABU_JABUS_BELLY_MQ_COW, MILK, false, true);
+    ctx->PlaceItemInLocation(RC_JABU_JABUS_BELLY_MQ_COW, RG_MILK, false, true);
   }
 }
 
 static void SetScarceItemPool() {
-  ReplaceMaxItem(PROGRESSIVE_BOMBCHUS, 3);
-  ReplaceMaxItem(BOMBCHU_5, 1);
-  ReplaceMaxItem(BOMBCHU_10, 2);
-  ReplaceMaxItem(BOMBCHU_20, 0);
-  ReplaceMaxItem(PROGRESSIVE_MAGIC_METER, 1);
-  ReplaceMaxItem(DOUBLE_DEFENSE, 0);
-  ReplaceMaxItem(PROGRESSIVE_STICK_UPGRADE, 1);
-  ReplaceMaxItem(PROGRESSIVE_NUT_UPGRADE, 1);
-  ReplaceMaxItem(PROGRESSIVE_BOW, 2);
-  ReplaceMaxItem(PROGRESSIVE_SLINGSHOT, 2);
-  ReplaceMaxItem(PROGRESSIVE_BOMB_BAG, 2);
-  ReplaceMaxItem(HEART_CONTAINER, 0);
+  ReplaceMaxItem(RG_PROGRESSIVE_BOMBCHUS, 3);
+  ReplaceMaxItem(RG_BOMBCHU_5, 1);
+  ReplaceMaxItem(RG_BOMBCHU_10, 2);
+  ReplaceMaxItem(RG_BOMBCHU_20, 0);
+  ReplaceMaxItem(RG_PROGRESSIVE_MAGIC_METER, 1);
+  ReplaceMaxItem(RG_DOUBLE_DEFENSE, 0);
+  ReplaceMaxItem(RG_PROGRESSIVE_STICK_UPGRADE, 1);
+  ReplaceMaxItem(RG_PROGRESSIVE_NUT_UPGRADE, 1);
+  ReplaceMaxItem(RG_PROGRESSIVE_BOW, 2);
+  ReplaceMaxItem(RG_PROGRESSIVE_SLINGSHOT, 2);
+  ReplaceMaxItem(RG_PROGRESSIVE_BOMB_BAG, 2);
+  ReplaceMaxItem(RG_HEART_CONTAINER, 0);
 }
 
 static void SetMinimalItemPool() {
-  ReplaceMaxItem(PROGRESSIVE_BOMBCHUS, 1);
-  ReplaceMaxItem(BOMBCHU_5, 1);
-  ReplaceMaxItem(BOMBCHU_10, 0);
-  ReplaceMaxItem(BOMBCHU_20, 0);
-  ReplaceMaxItem(NAYRUS_LOVE, 0);
-  ReplaceMaxItem(PROGRESSIVE_MAGIC_METER, 1);
-  ReplaceMaxItem(DOUBLE_DEFENSE, 0);
-  ReplaceMaxItem(PROGRESSIVE_STICK_UPGRADE, 0);
-  ReplaceMaxItem(PROGRESSIVE_NUT_UPGRADE, 0);
-  ReplaceMaxItem(PROGRESSIVE_BOW, 1);
-  ReplaceMaxItem(PROGRESSIVE_SLINGSHOT, 1);
-  ReplaceMaxItem(PROGRESSIVE_BOMB_BAG, 1);
-  ReplaceMaxItem(PIECE_OF_HEART, 0);
+  ReplaceMaxItem(RG_PROGRESSIVE_BOMBCHUS, 1);
+  ReplaceMaxItem(RG_BOMBCHU_5, 1);
+  ReplaceMaxItem(RG_BOMBCHU_10, 0);
+  ReplaceMaxItem(RG_BOMBCHU_20, 0);
+  ReplaceMaxItem(RG_NAYRUS_LOVE, 0);
+  ReplaceMaxItem(RG_PROGRESSIVE_MAGIC_METER, 1);
+  ReplaceMaxItem(RG_DOUBLE_DEFENSE, 0);
+  ReplaceMaxItem(RG_PROGRESSIVE_STICK_UPGRADE, 0);
+  ReplaceMaxItem(RG_PROGRESSIVE_NUT_UPGRADE, 0);
+  ReplaceMaxItem(RG_PROGRESSIVE_BOW, 1);
+  ReplaceMaxItem(RG_PROGRESSIVE_SLINGSHOT, 1);
+  ReplaceMaxItem(RG_PROGRESSIVE_BOMB_BAG, 1);
+  ReplaceMaxItem(RG_PIECE_OF_HEART, 0);
   // Need an extra heart container when starting with 1 heart to be able to reach 3 hearts
-  ReplaceMaxItem(HEART_CONTAINER, (StartingHearts.Value<uint8_t>() == 18)? 1 : 0);
+  ReplaceMaxItem(RG_HEART_CONTAINER, (StartingHearts.Value<uint8_t>() == 18)? 1 : 0);
 }
 
 void GenerateItemPool() {
-
+  auto ctx = Rando::Context::GetInstance();
   ItemPool.clear();
   PendingJunkPool.clear();
 
@@ -664,40 +668,40 @@ void GenerateItemPool() {
 
   if (TriforceHunt.Is(TRIFORCE_HUNT_ON)) {
     IceTrapModels.push_back(0xDF);
-    AddItemToMainPool(TRIFORCE_PIECE, Settings::TriforceHuntTotal.Value<uint8_t>());
-    PlaceItemInLocation(TRIFORCE_COMPLETED, TRIFORCE); // Win condition
-    PlaceItemInLocation(GANON, GetJunkItem(), false, true);
+    AddItemToMainPool(RG_TRIFORCE_PIECE, Settings::TriforceHuntTotal.Value<uint8_t>());
+    ctx->PlaceItemInLocation(RC_TRIFORCE_COMPLETED, RG_TRIFORCE); // Win condition
+    ctx->PlaceItemInLocation(RC_GANON, GetJunkItem(), false, true);
   } else {
-    PlaceItemInLocation(GANON, TRIFORCE); // Win condition
+    ctx->PlaceItemInLocation(RC_GANON, RG_TRIFORCE); // Win condition
   }
 
   //Fixed item locations
-  PlaceItemInLocation(HC_ZELDAS_LETTER, ZELDAS_LETTER);
-  PlaceItemInLocation(MARKET_BOMBCHU_BOWLING_BOMBCHUS, BOMBCHU_DROP);
+  ctx->PlaceItemInLocation(RC_HC_ZELDAS_LETTER, RG_ZELDAS_LETTER);
+  ctx->PlaceItemInLocation(RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS, RG_BOMBCHU_DROP);
 
   if (ShuffleKokiriSword) {
-    AddItemToMainPool(KOKIRI_SWORD);
+    AddItemToMainPool(RG_KOKIRI_SWORD);
     IceTrapModels.push_back(GI_SWORD_KOKIRI);
   } else {
-    PlaceItemInLocation(KF_KOKIRI_SWORD_CHEST, KOKIRI_SWORD, false, true);
+    ctx->PlaceItemInLocation(RC_KF_KOKIRI_SWORD_CHEST, RG_KOKIRI_SWORD, false, true);
   }
 
   if (ShuffleWeirdEgg) {
-    AddItemToMainPool(WEIRD_EGG);
+    AddItemToMainPool(RG_WEIRD_EGG);
     IceTrapModels.push_back(GI_WEIRD_EGG);
   } else {
-    PlaceItemInLocation(HC_MALON_EGG, WEIRD_EGG, false, true);
+    ctx->PlaceItemInLocation(RC_HC_MALON_EGG, RG_WEIRD_EGG, false, true);
   }
 
   if (ShuffleOcarinas) {
-    AddItemToMainPool(PROGRESSIVE_OCARINA, 2);
+    AddItemToMainPool(RG_PROGRESSIVE_OCARINA, 2);
     if (ItemPoolValue.Is(ITEMPOOL_PLENTIFUL)) {
-      AddItemToPool(PendingJunkPool, PROGRESSIVE_OCARINA);
+      AddItemToPool(PendingJunkPool, RG_PROGRESSIVE_OCARINA);
     }
     IceTrapModels.push_back(0x8B); //Progressive ocarina
   } else {
-    PlaceItemInLocation(LW_GIFT_FROM_SARIA, PROGRESSIVE_OCARINA, false, true);
-    PlaceItemInLocation(HF_OCARINA_OF_TIME_ITEM, PROGRESSIVE_OCARINA, false, true);
+    ctx->PlaceItemInLocation(RC_LW_GIFT_FROM_SARIA, RG_PROGRESSIVE_OCARINA, false, true);
+    ctx->PlaceItemInLocation(RC_HF_OCARINA_OF_TIME_ITEM, RG_PROGRESSIVE_OCARINA, false, true);
   }
 
   if (ShuffleCows) {
@@ -714,179 +718,179 @@ void GenerateItemPool() {
   }
 
   if (ShuffleMagicBeans) {
-    AddItemToMainPool(MAGIC_BEAN_PACK);
+    AddItemToMainPool(RG_MAGIC_BEAN_PACK);
     if (ItemPoolValue.Is(ITEMPOOL_PLENTIFUL)) {
-      AddItemToPool(PendingJunkPool, MAGIC_BEAN_PACK);
+      AddItemToPool(PendingJunkPool, RG_MAGIC_BEAN_PACK);
     }
     IceTrapModels.push_back(0xC9); //Magic bean pack
   } else {
-    PlaceItemInLocation(ZR_MAGIC_BEAN_SALESMAN, MAGIC_BEAN, false, true);
+    ctx->PlaceItemInLocation(RC_ZR_MAGIC_BEAN_SALESMAN, RG_MAGIC_BEAN, false, true);
   }
 
   if (ShuffleMerchants.IsNot(SHUFFLEMERCHANTS_OFF)) {
     if (!ProgressiveGoronSword) {
-      AddItemToMainPool(GIANTS_KNIFE);
+      AddItemToMainPool(RG_GIANTS_KNIFE);
     }
     if (BombchusInLogic) {
-      AddItemToMainPool(PROGRESSIVE_BOMBCHUS);
+      AddItemToMainPool(RG_PROGRESSIVE_BOMBCHUS);
     } else {
-      AddItemToMainPool(BOMBCHU_10);
+      AddItemToMainPool(RG_BOMBCHU_10);
     }
   } else {
-    PlaceItemInLocation(KAK_GRANNYS_SHOP, BLUE_POTION_REFILL, false, true);
-    PlaceItemInLocation(GC_MEDIGORON, GIANTS_KNIFE, false, true);
-    PlaceItemInLocation(WASTELAND_BOMBCHU_SALESMAN, BOMBCHU_10, false, true);
+    ctx->PlaceItemInLocation(RC_KAK_GRANNYS_SHOP, RG_BLUE_POTION_REFILL, false, true);
+    ctx->PlaceItemInLocation(RC_GC_MEDIGORON, RG_GIANTS_KNIFE, false, true);
+    ctx->PlaceItemInLocation(RC_WASTELAND_BOMBCHU_SALESMAN, RG_BOMBCHU_10, false, true);
   }
 
   if (ShuffleFrogSongRupees) {
-    AddItemToMainPool(PURPLE_RUPEE, 5);
+    AddItemToMainPool(RG_PURPLE_RUPEE, 5);
   } else {
-    PlaceItemInLocation(ZR_FROGS_ZELDAS_LULLABY, PURPLE_RUPEE, false, true);
-    PlaceItemInLocation(ZR_FROGS_EPONAS_SONG, PURPLE_RUPEE, false, true);
-    PlaceItemInLocation(ZR_FROGS_SARIAS_SONG, PURPLE_RUPEE, false, true);
-    PlaceItemInLocation(ZR_FROGS_SUNS_SONG, PURPLE_RUPEE, false, true);
-    PlaceItemInLocation(ZR_FROGS_SONG_OF_TIME, PURPLE_RUPEE, false, true);
+    ctx->PlaceItemInLocation(RC_ZR_FROGS_ZELDAS_LULLABY, RG_PURPLE_RUPEE, false, true);
+    ctx->PlaceItemInLocation(RC_ZR_FROGS_EPONAS_SONG, RG_PURPLE_RUPEE, false, true);
+    ctx->PlaceItemInLocation(RC_ZR_FROGS_SARIAS_SONG, RG_PURPLE_RUPEE, false, true);
+    ctx->PlaceItemInLocation(RC_ZR_FROGS_SUNS_SONG, RG_PURPLE_RUPEE, false, true);
+    ctx->PlaceItemInLocation(RC_ZR_FROGS_SONG_OF_TIME, RG_PURPLE_RUPEE, false, true);
   }
 
   if (ShuffleAdultTradeQuest) {
-    AddItemToMainPool(POCKET_EGG);
-    AddItemToMainPool(COJIRO);
-    AddItemToMainPool(ODD_MUSHROOM);
-    AddItemToMainPool(ODD_POTION);
-    AddItemToMainPool(POACHERS_SAW);
-    AddItemToMainPool(BROKEN_SWORD);
-    AddItemToMainPool(PRESCRIPTION);
-    AddItemToMainPool(EYEBALL_FROG);
-    AddItemToMainPool(EYEDROPS);
+    AddItemToMainPool(RG_POCKET_EGG);
+    AddItemToMainPool(RG_COJIRO);
+    AddItemToMainPool(RG_ODD_MUSHROOM);
+    AddItemToMainPool(RG_ODD_POTION);
+    AddItemToMainPool(RG_POACHERS_SAW);
+    AddItemToMainPool(RG_BROKEN_SWORD);
+    AddItemToMainPool(RG_PRESCRIPTION);
+    AddItemToMainPool(RG_EYEBALL_FROG);
+    AddItemToMainPool(RG_EYEDROPS);
   } else {
-    PlaceItemInLocation(KAK_TRADE_POCKET_CUCCO, COJIRO, false, true);
-    PlaceItemInLocation(LW_TRADE_COJIRO, ODD_MUSHROOM, false, true);
-    PlaceItemInLocation(KAK_TRADE_ODD_MUSHROOM, ODD_POTION, false, true);
-    PlaceItemInLocation(LW_TRADE_ODD_POTION, POACHERS_SAW, false, true);
-    PlaceItemInLocation(GV_TRADE_SAW, BROKEN_SWORD, false, true);
-    PlaceItemInLocation(DMT_TRADE_BROKEN_SWORD, PRESCRIPTION, false, true);
-    PlaceItemInLocation(ZD_TRADE_PRESCRIPTION, EYEBALL_FROG, false, true);
-    PlaceItemInLocation(LH_TRADE_FROG, EYEDROPS, false, true);
-    PlaceItemInLocation(DMT_TRADE_EYEDROPS, CLAIM_CHECK, false, true);
+    ctx->PlaceItemInLocation(RC_KAK_TRADE_POCKET_CUCCO, RG_COJIRO, false, true);
+    ctx->PlaceItemInLocation(RC_LW_TRADE_COJIRO, RG_ODD_MUSHROOM, false, true);
+    ctx->PlaceItemInLocation(RC_KAK_TRADE_ODD_MUSHROOM, RG_ODD_POTION, false, true);
+    ctx->PlaceItemInLocation(RC_LW_TRADE_ODD_POTION, RG_POACHERS_SAW, false, true);
+    ctx->PlaceItemInLocation(RC_GV_TRADE_SAW, RG_BROKEN_SWORD, false, true);
+    ctx->PlaceItemInLocation(RC_DMT_TRADE_BROKEN_SWORD, RG_PRESCRIPTION, false, true);
+    ctx->PlaceItemInLocation(RC_ZD_TRADE_PRESCRIPTION, RG_EYEBALL_FROG, false, true);
+    ctx->PlaceItemInLocation(RC_LH_TRADE_FROG, RG_EYEDROPS, false, true);
+    ctx->PlaceItemInLocation(RC_DMT_TRADE_EYEDROPS, RG_CLAIM_CHECK, false, true);
   }
-  AddItemToMainPool(CLAIM_CHECK);
+  AddItemToMainPool(RG_CLAIM_CHECK);
 
   if (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_SINGLE_KEYS)) {
-    AddItemToMainPool(TREASURE_GAME_SMALL_KEY, 6); // 6 individual keys
+    AddItemToMainPool(RG_TREASURE_GAME_SMALL_KEY, 6); // 6 individual keys
   } else if (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_PACK)) {
-    AddItemToMainPool(TREASURE_GAME_SMALL_KEY); // 1 key which will behave as a pack of 6
+    AddItemToMainPool(RG_TREASURE_GAME_SMALL_KEY); // 1 key which will behave as a pack of 6
   } else {
-    PlaceItemInLocation(MARKET_TREASURE_CHEST_GAME_ITEM_1, TREASURE_GAME_SMALL_KEY, false, true);
-    PlaceItemInLocation(MARKET_TREASURE_CHEST_GAME_ITEM_2, TREASURE_GAME_SMALL_KEY, false, true);
-    PlaceItemInLocation(MARKET_TREASURE_CHEST_GAME_ITEM_3, TREASURE_GAME_SMALL_KEY, false, true);
-    PlaceItemInLocation(MARKET_TREASURE_CHEST_GAME_ITEM_4, TREASURE_GAME_SMALL_KEY, false, true);
-    PlaceItemInLocation(MARKET_TREASURE_CHEST_GAME_ITEM_5, TREASURE_GAME_SMALL_KEY, false, true);
+    ctx->PlaceItemInLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_1, RG_TREASURE_GAME_SMALL_KEY, false, true);
+    ctx->PlaceItemInLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_2, RG_TREASURE_GAME_SMALL_KEY, false, true);
+    ctx->PlaceItemInLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_3, RG_TREASURE_GAME_SMALL_KEY, false, true);
+    ctx->PlaceItemInLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_4, RG_TREASURE_GAME_SMALL_KEY, false, true);
+    ctx->PlaceItemInLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_5, RG_TREASURE_GAME_SMALL_KEY, false, true);
   };
 
   if (Tokensanity.Is(TOKENSANITY_OFF)) {
-    for (uint32_t loc : GetLocations(allLocations, Category::cSkulltula)) {
-      PlaceItemInLocation(loc, GOLD_SKULLTULA_TOKEN, false, true);
+    for (RandomizerCheck loc : ctx->GetLocations(ctx->allLocations, Category::cSkulltula)) {
+      ctx->PlaceItemInLocation(loc, RG_GOLD_SKULLTULA_TOKEN, false, true);
     }
   } else if (Tokensanity.Is(TOKENSANITY_DUNGEONS)) {
-    for (uint32_t loc : GetLocations(allLocations, Category::cSkulltula)) {
-      if (Location(loc)->IsOverworld()) {
-        PlaceItemInLocation(loc, GOLD_SKULLTULA_TOKEN, false, true);
+    for (RandomizerCheck loc : ctx->GetLocations(ctx->allLocations, Category::cSkulltula)) {
+      if (Rando::StaticData::GetLocation(loc)->IsOverworld()) {
+          ctx->PlaceItemInLocation((RandomizerCheck)loc, RG_GOLD_SKULLTULA_TOKEN, false, true);
       } else {
-        AddItemToMainPool(GOLD_SKULLTULA_TOKEN);
+        AddItemToMainPool(RG_GOLD_SKULLTULA_TOKEN);
       }
     }
   } else if (Tokensanity.Is(TOKENSANITY_OVERWORLD)) {
-    for (uint32_t loc : GetLocations(allLocations, Category::cSkulltula)) {
-      if (Location(loc)->IsDungeon()) {
-        PlaceItemInLocation(loc, GOLD_SKULLTULA_TOKEN, false, true);
+    for (RandomizerCheck loc : ctx->GetLocations(ctx->allLocations, Category::cSkulltula)) {
+      if (Rando::StaticData::GetLocation(loc)->IsDungeon()) {
+          ctx->PlaceItemInLocation((RandomizerCheck)loc, RG_GOLD_SKULLTULA_TOKEN, false, true);
       } else {
-        AddItemToMainPool(GOLD_SKULLTULA_TOKEN);
+        AddItemToMainPool(RG_GOLD_SKULLTULA_TOKEN);
       }
     }
   } else {
-    AddItemToMainPool(GOLD_SKULLTULA_TOKEN, 100);
+    AddItemToMainPool(RG_GOLD_SKULLTULA_TOKEN, 100);
   }
 
   if (Shuffle100GSReward) {
     if (Tokensanity.IsNot(TOKENSANITY_OFF) && ItemPoolValue.Is(ITEMPOOL_PLENTIFUL)) {
-      AddItemToPool(PendingJunkPool, GOLD_SKULLTULA_TOKEN, 10);
+      AddItemToPool(PendingJunkPool, RG_GOLD_SKULLTULA_TOKEN, 10);
     }
-    AddItemToMainPool(HUGE_RUPEE);
+    AddItemToMainPool(RG_HUGE_RUPEE);
   } else {
-    PlaceItemInLocation(KAK_100_GOLD_SKULLTULA_REWARD, HUGE_RUPEE, false, true);
+    ctx->PlaceItemInLocation(RC_KAK_100_GOLD_SKULLTULA_REWARD, RG_HUGE_RUPEE, false, true);
   }
 
   if (BombchusInLogic) {
-    AddItemToMainPool(PROGRESSIVE_BOMBCHUS, 5);
+    AddItemToMainPool(RG_PROGRESSIVE_BOMBCHUS, 5);
   } else {
-    AddItemToMainPool(BOMBCHU_5);
-    AddItemToMainPool(BOMBCHU_10, 3);
-    AddItemToMainPool(BOMBCHU_20);
+    AddItemToMainPool(RG_BOMBCHU_5);
+    AddItemToMainPool(RG_BOMBCHU_10, 3);
+    AddItemToMainPool(RG_BOMBCHU_20);
   }
 
   //Ice Traps
-  AddItemToMainPool(ICE_TRAP);
+  AddItemToMainPool(RG_ICE_TRAP);
   if (GerudoTrainingGrounds.IsVanilla()) {
-    AddItemToMainPool(ICE_TRAP);
+    AddItemToMainPool(RG_ICE_TRAP);
   }
   if (GanonsCastle.IsVanilla()) {
-    AddItemToMainPool(ICE_TRAP, 4);
+    AddItemToMainPool(RG_ICE_TRAP, 4);
   }
 
   //Gerudo Fortress
   if (GerudoFortress.Is(GERUDOFORTRESS_OPEN)) {
-    PlaceItemInLocation(GF_NORTH_F1_CARPENTER, RECOVERY_HEART, false, true);
-    PlaceItemInLocation(GF_NORTH_F2_CARPENTER, RECOVERY_HEART, false, true);
-    PlaceItemInLocation(GF_SOUTH_F1_CARPENTER, RECOVERY_HEART, false, true);
-    PlaceItemInLocation(GF_SOUTH_F2_CARPENTER, RECOVERY_HEART, false, true);
+    ctx->PlaceItemInLocation(RC_GF_NORTH_F1_CARPENTER, RG_RECOVERY_HEART, false, true);
+    ctx->PlaceItemInLocation(RC_GF_NORTH_F2_CARPENTER, RG_RECOVERY_HEART, false, true);
+    ctx->PlaceItemInLocation(RC_GF_SOUTH_F1_CARPENTER, RG_RECOVERY_HEART, false, true);
+    ctx->PlaceItemInLocation(RC_GF_SOUTH_F2_CARPENTER, RG_RECOVERY_HEART, false, true);
   } else if (GerudoKeys.IsNot(GERUDOKEYS_VANILLA)) {
     if (GerudoFortress.Is(GERUDOFORTRESS_FAST)) {
-      AddItemToMainPool(GERUDO_FORTRESS_SMALL_KEY);
-      PlaceItemInLocation(GF_NORTH_F2_CARPENTER, RECOVERY_HEART, false, true);
-      PlaceItemInLocation(GF_SOUTH_F1_CARPENTER, RECOVERY_HEART, false, true);
-      PlaceItemInLocation(GF_SOUTH_F2_CARPENTER, RECOVERY_HEART, false, true);
+      AddItemToMainPool(RG_GERUDO_FORTRESS_SMALL_KEY);
+      ctx->PlaceItemInLocation(RC_GF_NORTH_F2_CARPENTER, RG_RECOVERY_HEART, false, true);
+      ctx->PlaceItemInLocation(RC_GF_SOUTH_F1_CARPENTER, RG_RECOVERY_HEART, false, true);
+      ctx->PlaceItemInLocation(RC_GF_SOUTH_F2_CARPENTER, RG_RECOVERY_HEART, false, true);
     } else {
       //Only add key ring if 4 Fortress keys necessary
       if (RingFortress) {
-        AddItemToMainPool(GERUDO_FORTRESS_KEY_RING);
+        AddItemToMainPool(RG_GERUDO_FORTRESS_KEY_RING);
         //Add junk to make up for missing keys
         for (uint8_t i = 0; i < 3; i++) {
           AddItemToMainPool(GetJunkItem());
         }
       } else {
-        AddItemToMainPool(GERUDO_FORTRESS_SMALL_KEY, 4);
+        AddItemToMainPool(RG_GERUDO_FORTRESS_SMALL_KEY, 4);
       }
     }
     if (ItemPoolValue.Is(ITEMPOOL_PLENTIFUL)) {
       if (RingFortress && GerudoFortress.Is(GERUDOFORTRESS_NORMAL)) {
-        AddItemToPool(PendingJunkPool, GERUDO_FORTRESS_KEY_RING);
+        AddItemToPool(PendingJunkPool, RG_GERUDO_FORTRESS_KEY_RING);
       } else {
-        AddItemToPool(PendingJunkPool, GERUDO_FORTRESS_SMALL_KEY);
+        AddItemToPool(PendingJunkPool, RG_GERUDO_FORTRESS_SMALL_KEY);
       }
     }
   } else {
     if (GerudoFortress.Is(GERUDOFORTRESS_FAST)) {
-      PlaceItemInLocation(GF_NORTH_F1_CARPENTER, GERUDO_FORTRESS_SMALL_KEY, false, true);
-      PlaceItemInLocation(GF_NORTH_F2_CARPENTER, RECOVERY_HEART, false, true);
-      PlaceItemInLocation(GF_SOUTH_F1_CARPENTER, RECOVERY_HEART, false, true);
-      PlaceItemInLocation(GF_SOUTH_F2_CARPENTER, RECOVERY_HEART, false, true);
+      ctx->PlaceItemInLocation(RC_GF_NORTH_F1_CARPENTER, RG_GERUDO_FORTRESS_SMALL_KEY, false, true);
+      ctx->PlaceItemInLocation(RC_GF_NORTH_F2_CARPENTER, RG_RECOVERY_HEART, false, true);
+      ctx->PlaceItemInLocation(RC_GF_SOUTH_F1_CARPENTER, RG_RECOVERY_HEART, false, true);
+      ctx->PlaceItemInLocation(RC_GF_SOUTH_F2_CARPENTER, RG_RECOVERY_HEART, false, true);
     } else {
-      PlaceItemInLocation(GF_NORTH_F1_CARPENTER, GERUDO_FORTRESS_SMALL_KEY, false, true);
-      PlaceItemInLocation(GF_NORTH_F2_CARPENTER, GERUDO_FORTRESS_SMALL_KEY, false, true);
-      PlaceItemInLocation(GF_SOUTH_F1_CARPENTER, GERUDO_FORTRESS_SMALL_KEY, false, true);
-      PlaceItemInLocation(GF_SOUTH_F2_CARPENTER, GERUDO_FORTRESS_SMALL_KEY, false, true);
+      ctx->PlaceItemInLocation(RC_GF_NORTH_F1_CARPENTER, RG_GERUDO_FORTRESS_SMALL_KEY, false, true);
+      ctx->PlaceItemInLocation(RC_GF_NORTH_F2_CARPENTER, RG_GERUDO_FORTRESS_SMALL_KEY, false, true);
+      ctx->PlaceItemInLocation(RC_GF_SOUTH_F1_CARPENTER, RG_GERUDO_FORTRESS_SMALL_KEY, false, true);
+      ctx->PlaceItemInLocation(RC_GF_SOUTH_F2_CARPENTER, RG_GERUDO_FORTRESS_SMALL_KEY, false, true);
     }
   }
 
   //Gerudo Membership Card
   if (ShuffleGerudoToken && GerudoFortress.IsNot(GERUDOFORTRESS_OPEN)) {
-    AddItemToMainPool(GERUDO_MEMBERSHIP_CARD);
+    AddItemToMainPool(RG_GERUDO_MEMBERSHIP_CARD);
     IceTrapModels.push_back(GI_GERUDO_CARD);
   } else if (ShuffleGerudoToken) {
-    AddItemToPool(PendingJunkPool, GERUDO_MEMBERSHIP_CARD);
-    PlaceItemInLocation(GF_GERUDO_MEMBERSHIP_CARD, ICE_TRAP, false, true);
+    AddItemToPool(PendingJunkPool, RG_GERUDO_MEMBERSHIP_CARD);
+    ctx->PlaceItemInLocation(RC_GF_GERUDO_MEMBERSHIP_CARD, RG_ICE_TRAP, false, true);
   } else {
-    PlaceItemInLocation(GF_GERUDO_MEMBERSHIP_CARD, GERUDO_MEMBERSHIP_CARD, false, true);
+    ctx->PlaceItemInLocation(RC_GF_GERUDO_MEMBERSHIP_CARD, RG_GERUDO_MEMBERSHIP_CARD, false, true);
   }
 
   //Keys
@@ -906,63 +910,63 @@ void GenerateItemPool() {
 
   if (ItemPoolValue.Is(ITEMPOOL_PLENTIFUL)) {
     if (ShuffleGerudoToken) {
-      AddItemToPool(PendingJunkPool, GERUDO_MEMBERSHIP_CARD);
+      AddItemToPool(PendingJunkPool, RG_GERUDO_MEMBERSHIP_CARD);
     }
 
     //Plentiful small keys
     if (Keysanity.Is(KEYSANITY_ANYWHERE) || Keysanity.Is(KEYSANITY_ANY_DUNGEON) || Keysanity.Is(KEYSANITY_OVERWORLD)) {
       if (BottomOfTheWell.HasKeyRing()) {
-        AddItemToPool(PendingJunkPool, BOTTOM_OF_THE_WELL_KEY_RING);
+        AddItemToPool(PendingJunkPool, RG_BOTTOM_OF_THE_WELL_KEY_RING);
       } else {
-        AddItemToPool(PendingJunkPool, BOTTOM_OF_THE_WELL_SMALL_KEY);
+        AddItemToPool(PendingJunkPool, RG_BOTTOM_OF_THE_WELL_SMALL_KEY);
       }
       if (ForestTemple.HasKeyRing()) {
-        AddItemToPool(PendingJunkPool, FOREST_TEMPLE_KEY_RING);
+        AddItemToPool(PendingJunkPool, RG_FOREST_TEMPLE_KEY_RING);
       } else {
-        AddItemToPool(PendingJunkPool, FOREST_TEMPLE_SMALL_KEY);
+        AddItemToPool(PendingJunkPool, RG_FOREST_TEMPLE_SMALL_KEY);
       }
       if (FireTemple.HasKeyRing()) {
-        AddItemToPool(PendingJunkPool, FIRE_TEMPLE_KEY_RING);
+        AddItemToPool(PendingJunkPool, RG_FIRE_TEMPLE_KEY_RING);
       } else {
-        AddItemToPool(PendingJunkPool, FIRE_TEMPLE_SMALL_KEY);
+        AddItemToPool(PendingJunkPool, RG_FIRE_TEMPLE_SMALL_KEY);
       }
       if (WaterTemple.HasKeyRing()) {
-        AddItemToPool(PendingJunkPool, WATER_TEMPLE_KEY_RING);
+        AddItemToPool(PendingJunkPool, RG_WATER_TEMPLE_KEY_RING);
       } else {
-        AddItemToPool(PendingJunkPool, WATER_TEMPLE_SMALL_KEY);
+        AddItemToPool(PendingJunkPool, RG_WATER_TEMPLE_SMALL_KEY);
       }
       if (SpiritTemple.HasKeyRing()) {
-        AddItemToPool(PendingJunkPool, SPIRIT_TEMPLE_KEY_RING);
+        AddItemToPool(PendingJunkPool, RG_SPIRIT_TEMPLE_KEY_RING);
       } else {
-        AddItemToPool(PendingJunkPool, SPIRIT_TEMPLE_SMALL_KEY);
+        AddItemToPool(PendingJunkPool, RG_SPIRIT_TEMPLE_SMALL_KEY);
       }
       if (ShadowTemple.HasKeyRing()) {
-        AddItemToPool(PendingJunkPool, SHADOW_TEMPLE_KEY_RING);
+        AddItemToPool(PendingJunkPool, RG_SHADOW_TEMPLE_KEY_RING);
       } else {
-        AddItemToPool(PendingJunkPool, SHADOW_TEMPLE_SMALL_KEY);
+        AddItemToPool(PendingJunkPool, RG_SHADOW_TEMPLE_SMALL_KEY);
       }
       if (GerudoTrainingGrounds.HasKeyRing()) {
-        AddItemToPool(PendingJunkPool, GERUDO_TRAINING_GROUNDS_KEY_RING);
+        AddItemToPool(PendingJunkPool, RG_GERUDO_TRAINING_GROUNDS_KEY_RING);
       } else {
-        AddItemToPool(PendingJunkPool, GERUDO_TRAINING_GROUNDS_SMALL_KEY);
+        AddItemToPool(PendingJunkPool, RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY);
       }
       if (GanonsCastle.HasKeyRing()) {
-        AddItemToPool(PendingJunkPool, GANONS_CASTLE_KEY_RING);
+        AddItemToPool(PendingJunkPool, RG_GANONS_CASTLE_KEY_RING);
       } else {
-        AddItemToPool(PendingJunkPool, GANONS_CASTLE_SMALL_KEY);
+        AddItemToPool(PendingJunkPool, RG_GANONS_CASTLE_SMALL_KEY);
       } 
     }
 
     if (BossKeysanity.Is(BOSSKEYSANITY_ANYWHERE) || BossKeysanity.Is(BOSSKEYSANITY_ANY_DUNGEON) || BossKeysanity.Is(BOSSKEYSANITY_OVERWORLD)) {
-      AddItemToPool(PendingJunkPool, FOREST_TEMPLE_BOSS_KEY);
-      AddItemToPool(PendingJunkPool, FIRE_TEMPLE_BOSS_KEY);
-      AddItemToPool(PendingJunkPool, WATER_TEMPLE_BOSS_KEY);
-      AddItemToPool(PendingJunkPool, SPIRIT_TEMPLE_BOSS_KEY);
-      AddItemToPool(PendingJunkPool, SHADOW_TEMPLE_BOSS_KEY);
+      AddItemToPool(PendingJunkPool, RG_FOREST_TEMPLE_BOSS_KEY);
+      AddItemToPool(PendingJunkPool, RG_FIRE_TEMPLE_BOSS_KEY);
+      AddItemToPool(PendingJunkPool, RG_WATER_TEMPLE_BOSS_KEY);
+      AddItemToPool(PendingJunkPool, RG_SPIRIT_TEMPLE_BOSS_KEY);
+      AddItemToPool(PendingJunkPool, RG_SHADOW_TEMPLE_BOSS_KEY);
     }
 
     if (GanonsBossKey.Is(GANONSBOSSKEY_ANYWHERE) || GanonsBossKey.Is(GANONSBOSSKEY_ANY_DUNGEON) || GanonsBossKey.Is(GANONSBOSSKEY_OVERWORLD)) {
-      AddItemToPool(PendingJunkPool, GANONS_CASTLE_BOSS_KEY);
+      AddItemToPool(PendingJunkPool, RG_GANONS_CASTLE_BOSS_KEY);
     }
   }
 
@@ -977,29 +981,29 @@ void GenerateItemPool() {
   if (Settings::Scrubsanity.IsNot(SCRUBSANITY_OFF)) {
     //Deku Tree
     if (DekuTree.IsMQ()) {
-      AddItemToMainPool(DEKU_SHIELD);
+      AddItemToMainPool(RG_DEKU_SHIELD);
     }
 
     //Dodongos Cavern
-    AddItemToMainPool(DEKU_STICK_1);
-    AddItemToMainPool(DEKU_SHIELD);
+    AddItemToMainPool(RG_DEKU_STICK_1);
+    AddItemToMainPool(RG_DEKU_SHIELD);
     if (DodongosCavern.IsMQ()) {
-      AddItemToMainPool(RECOVERY_HEART);
+      AddItemToMainPool(RG_RECOVERY_HEART);
     } else {
-      AddItemToMainPool(DEKU_NUTS_5);
+      AddItemToMainPool(RG_DEKU_NUTS_5);
     }
 
     //Jabu Jabus Belly
     if (JabuJabusBelly.IsVanilla()) {
-      AddItemToMainPool(DEKU_NUTS_5);
+      AddItemToMainPool(RG_DEKU_NUTS_5);
     }
 
     //Ganons Castle
-    AddItemToMainPool(BOMBS_5);
-    AddItemToMainPool(RECOVERY_HEART);
-    AddItemToMainPool(BLUE_RUPEE);
+    AddItemToMainPool(RG_BOMBS_5);
+    AddItemToMainPool(RG_RECOVERY_HEART);
+    AddItemToMainPool(RG_BLUE_RUPEE);
     if (GanonsCastle.IsMQ()) {
-      AddItemToMainPool(DEKU_NUTS_5);
+      AddItemToMainPool(RG_DEKU_NUTS_5);
     }
 
     //Overworld Scrubs
@@ -1008,9 +1012,9 @@ void GenerateItemPool() {
     //I'm not sure what this is for, but it was in ootr so I copied it
     for (uint8_t i = 0; i < 7; i++) {
       if (Random(0, 3)) {
-        AddItemToMainPool(ARROWS_30);
+        AddItemToMainPool(RG_ARROWS_30);
       } else {
-        AddItemToMainPool(DEKU_SEEDS_30);
+        AddItemToMainPool(RG_DEKU_SEEDS_30);
       }
     }
   } else {
@@ -1075,18 +1079,19 @@ void GenerateItemPool() {
 
   //Add 4 total bottles
   uint8_t bottleCount = 4;
-  std::vector<uint32_t> bottles;
+  std::vector<RandomizerGet> bottles;
   bottles.assign(normalBottles.begin(), normalBottles.end());
-  IceTrapModels.push_back(ItemTable(RandomElement(bottles)).GetItemID()); //Get one random bottle type for ice traps
+  IceTrapModels.push_back(
+      Rando::StaticData::RetrieveItem(RandomElement(bottles)).GetItemID()); // Get one random bottle type for ice traps
   for (uint8_t i = 0; i < bottleCount; i++) {
     if (i >= rutoBottles) {
       if ((i == bottleCount - 1) && ShuffleMerchants.IsNot(SHUFFLEMERCHANTS_OFF)) {
-        AddItemToMainPool(BOTTLE_WITH_BLUE_POTION);
+        AddItemToMainPool(RG_BOTTLE_WITH_BLUE_POTION);
       } else {
         AddRandomBottle(bottles);
       }
     } else {
-      AddItemToMainPool(RUTOS_LETTER);
+      AddItemToMainPool(RG_RUTOS_LETTER);
     }
   }
 
@@ -1107,11 +1112,11 @@ void GenerateItemPool() {
     PlaceVanillaMapsAndCompasses();
   } else  {
     for (auto dungeon : dungeonList) {
-      if (dungeon->GetMap() != NONE) {
+      if (dungeon->GetMap() != RG_NONE) {
         AddItemToMainPool(dungeon->GetMap());
       }
 
-      if (dungeon->GetCompass() != NONE) {
+      if (dungeon->GetCompass() != RG_NONE) {
         AddItemToMainPool(dungeon->GetCompass());
       }
     }
@@ -1134,21 +1139,21 @@ void GenerateItemPool() {
   if (BossKeysanity.Is(BOSSKEYSANITY_VANILLA)) {
     PlaceVanillaBossKeys();
   } else {
-    AddItemToMainPool(FOREST_TEMPLE_BOSS_KEY);
-    AddItemToMainPool(FIRE_TEMPLE_BOSS_KEY);
-    AddItemToMainPool(WATER_TEMPLE_BOSS_KEY);
-    AddItemToMainPool(SPIRIT_TEMPLE_BOSS_KEY);
-    AddItemToMainPool(SHADOW_TEMPLE_BOSS_KEY);
+    AddItemToMainPool(RG_FOREST_TEMPLE_BOSS_KEY);
+    AddItemToMainPool(RG_FIRE_TEMPLE_BOSS_KEY);
+    AddItemToMainPool(RG_WATER_TEMPLE_BOSS_KEY);
+    AddItemToMainPool(RG_SPIRIT_TEMPLE_BOSS_KEY);
+    AddItemToMainPool(RG_SHADOW_TEMPLE_BOSS_KEY);
   }
 
   if (GanonsBossKey.Is(GANONSBOSSKEY_FINAL_GS_REWARD)) {
-    PlaceItemInLocation(KAK_100_GOLD_SKULLTULA_REWARD, GANONS_CASTLE_BOSS_KEY);
+    ctx->PlaceItemInLocation(RC_KAK_100_GOLD_SKULLTULA_REWARD, RG_GANONS_CASTLE_BOSS_KEY);
   } else if (GanonsBossKey.Value<uint8_t>() >= GANONSBOSSKEY_LACS_VANILLA && GanonsBossKey.IsNot(GANONSBOSSKEY_TRIFORCE_HUNT)) {
-    PlaceItemInLocation(TOT_LIGHT_ARROWS_CUTSCENE, GANONS_CASTLE_BOSS_KEY);
+    ctx->PlaceItemInLocation(RC_TOT_LIGHT_ARROWS_CUTSCENE, RG_GANONS_CASTLE_BOSS_KEY);
   } else if (GanonsBossKey.Is(GANONSBOSSKEY_VANILLA)) {
-    PlaceItemInLocation(GANONS_TOWER_BOSS_KEY_CHEST, GANONS_CASTLE_BOSS_KEY);
+    ctx->PlaceItemInLocation(RC_GANONS_TOWER_BOSS_KEY_CHEST, RG_GANONS_CASTLE_BOSS_KEY);
   } else {
-    AddItemToMainPool(GANONS_CASTLE_BOSS_KEY);
+    AddItemToMainPool(RG_GANONS_CASTLE_BOSS_KEY);
   }
 
   if (ItemPoolValue.Is(ITEMPOOL_PLENTIFUL)) {
@@ -1158,12 +1163,12 @@ void GenerateItemPool() {
   }
 
   if (!ShuffleKokiriSword) {
-    ReplaceMaxItem(KOKIRI_SWORD, 0);
+    ReplaceMaxItem(RG_KOKIRI_SWORD, 0);
   }
 
   if (ProgressiveGoronSword) {
-    ReplaceMaxItem(BIGGORON_SWORD, 0);
-    AddItemToMainPool(PROGRESSIVE_GORONSWORD, 2);
+    ReplaceMaxItem(RG_BIGGORON_SWORD, 0);
+    AddItemToMainPool(RG_PROGRESSIVE_GORONSWORD, 2);
     IceTrapModels.push_back(0xD4); // Progressive Goron Sword
   } else {
     IceTrapModels.push_back(GI_SWORD_BGS);
@@ -1171,7 +1176,7 @@ void GenerateItemPool() {
 
   //Replace ice traps with junk from the pending junk pool if necessary
   if (IceTrapValue.Is(ICETRAPS_OFF)) {
-    ReplaceMaxItem(ICE_TRAP, 0);
+    ReplaceMaxItem(RG_ICE_TRAP, 0);
   }
   //Replace all junk items with ice traps for onslaught mode
   else if (IceTrapValue.Is(ICETRAPS_ONSLAUGHT)) {
@@ -1185,17 +1190,17 @@ void GenerateItemPool() {
   } else if (ItemPoolValue.Is(ITEMPOOL_MINIMAL)) {
     SetMinimalItemPool();
   } else if (RemoveDoubleDefense) {
-    ReplaceMaxItem(DOUBLE_DEFENSE, 0);
+    ReplaceMaxItem(RG_DOUBLE_DEFENSE, 0);
   }
 
   //this feels ugly and there's probably a better way, but
   //it replaces random junk with pending junk.
   bool junkSet;
-  for (uint32_t pendingJunk : PendingJunkPool) {
+  for (RandomizerGet pendingJunk : PendingJunkPool) {
     junkSet = false;
-    for (uint32_t& item : ItemPool) {
-      for (uint32_t junk : JunkPoolItems) {
-        if (item == junk && item != HUGE_RUPEE && item != DEKU_NUTS_10) {
+    for (RandomizerGet& item : ItemPool) {
+      for (RandomizerGet junk : JunkPoolItems) {
+        if (item == junk && item != RG_HUGE_RUPEE && item != RG_DEKU_NUTS_10) {
           item = pendingJunk;
           junkSet = true;
           break;
diff --git a/soh/soh/Enhancements/randomizer/3drando/item_pool.hpp b/soh/soh/Enhancements/randomizer/3drando/item_pool.hpp
index d71e4cb2f..749a2a46d 100644
--- a/soh/soh/Enhancements/randomizer/3drando/item_pool.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/item_pool.hpp
@@ -1,18 +1,17 @@
 #pragma once
 
-#include "keys.hpp"
-
 #include <cstddef>
 #include <vector>
 #include <stdint.h>
+#include "../randomizerTypes.h"
 
 class ItemLocation;
 
-void AddItemToPool(std::vector<uint32_t>& pool, const uint32_t item, size_t count = 1);
-uint32_t GetJunkItem();
-void PlaceJunkInExcludedLocation(const uint32_t il);
+void AddItemToPool(std::vector<RandomizerGet>& pool, const RandomizerGet item, size_t count = 1);
+RandomizerGet GetJunkItem();
+void PlaceJunkInExcludedLocation(const RandomizerCheck il);
 void GenerateItemPool();
 void AddJunk();
 
-extern std::vector<uint32_t> ItemPool;
+extern std::vector<RandomizerGet> ItemPool;
 extern std::vector<uint8_t> IceTrapModels;
diff --git a/soh/soh/Enhancements/randomizer/3drando/keys.hpp b/soh/soh/Enhancements/randomizer/3drando/keys.hpp
deleted file mode 100644
index 6e9e87f4e..000000000
--- a/soh/soh/Enhancements/randomizer/3drando/keys.hpp
+++ /dev/null
@@ -1,1831 +0,0 @@
-#pragma once
-
-#include <cstdint>
-
-using HintKey     = uint32_t;
-using ItemKey     = uint32_t;
-using LocationKey = uint32_t;
-using AreaKey     = uint32_t;
-
-typedef enum {
-  NONE,
-  KOKIRI_SWORD,
-  MASTER_SWORD,
-  GIANTS_KNIFE,
-  BIGGORON_SWORD,
-  DEKU_SHIELD,
-  HYLIAN_SHIELD,
-  MIRROR_SHIELD,
-  GORON_TUNIC,
-  ZORA_TUNIC,
-  IRON_BOOTS,
-  HOVER_BOOTS,
-  WEIRD_EGG,
-  ZELDAS_LETTER,
-  BOOMERANG,
-  LENS_OF_TRUTH,
-  MEGATON_HAMMER,
-  STONE_OF_AGONY,
-  DINS_FIRE,
-  FARORES_WIND,
-  NAYRUS_LOVE,
-  FIRE_ARROWS,
-  ICE_ARROWS,
-  LIGHT_ARROWS,
-  GERUDO_MEMBERSHIP_CARD,
-  MAGIC_BEAN,
-  MAGIC_BEAN_PACK,
-  DOUBLE_DEFENSE,
-  GOLD_SKULLTULA_TOKEN,
-
-  POCKET_EGG,
-  POCKET_CUCCO,
-  COJIRO,
-  ODD_MUSHROOM,
-  ODD_POTION,
-  POACHERS_SAW,
-  BROKEN_SWORD,
-  PRESCRIPTION,
-  EYEBALL_FROG,
-  EYEDROPS,
-  CLAIM_CHECK,
-
-  PROGRESSIVE_HOOKSHOT,
-  PROGRESSIVE_STRENGTH,
-  PROGRESSIVE_BOMB_BAG,
-  PROGRESSIVE_BOW,
-  PROGRESSIVE_SLINGSHOT,
-  PROGRESSIVE_WALLET,
-  PROGRESSIVE_SCALE,
-  PROGRESSIVE_NUT_UPGRADE,
-  PROGRESSIVE_STICK_UPGRADE,
-  PROGRESSIVE_MAGIC_METER,
-  PROGRESSIVE_OCARINA,
-  PROGRESSIVE_BOMBCHUS,
-  PROGRESSIVE_GORONSWORD,
-
-  //Keys just used for logic
-  BOW,
-  SLINGSHOT,
-  HOOKSHOT,
-  LONGSHOT,
-  SILVER_GAUNTLETS,
-  GOLDEN_GAUNTLETS,
-  SILVER_SCALE,
-  GOLD_SCALE,
-  SCARECROW,
-  DISTANT_SCARECROW,
-  STICKS,
-
-  EMPTY_BOTTLE,
-  BOTTLE_WITH_MILK,
-  BOTTLE_WITH_RED_POTION,
-  BOTTLE_WITH_GREEN_POTION,
-  BOTTLE_WITH_BLUE_POTION,
-  BOTTLE_WITH_FAIRY,
-  BOTTLE_WITH_FISH,
-  BOTTLE_WITH_BLUE_FIRE,
-  BOTTLE_WITH_BUGS,
-  BOTTLE_WITH_POE,
-  BOTTLE_WITH_BIG_POE,
-  RUTOS_LETTER,
-
-  ZELDAS_LULLABY,
-  EPONAS_SONG,
-  SARIAS_SONG,
-  SUNS_SONG,
-  SONG_OF_TIME,
-  SONG_OF_STORMS,
-  MINUET_OF_FOREST,
-  BOLERO_OF_FIRE,
-  SERENADE_OF_WATER,
-  REQUIEM_OF_SPIRIT,
-  NOCTURNE_OF_SHADOW,
-  PRELUDE_OF_LIGHT,
-
-  MAP,
-  DEKU_TREE_MAP,
-  DODONGOS_CAVERN_MAP,
-  JABU_JABUS_BELLY_MAP,
-  FOREST_TEMPLE_MAP,
-  FIRE_TEMPLE_MAP,
-  WATER_TEMPLE_MAP,
-  SPIRIT_TEMPLE_MAP,
-  SHADOW_TEMPLE_MAP,
-  BOTTOM_OF_THE_WELL_MAP,
-  ICE_CAVERN_MAP,
-
-  COMPASS,
-  DEKU_TREE_COMPASS,
-  DODONGOS_CAVERN_COMPASS,
-  JABU_JABUS_BELLY_COMPASS,
-  FOREST_TEMPLE_COMPASS,
-  FIRE_TEMPLE_COMPASS,
-  WATER_TEMPLE_COMPASS,
-  SPIRIT_TEMPLE_COMPASS,
-  SHADOW_TEMPLE_COMPASS,
-  BOTTOM_OF_THE_WELL_COMPASS,
-  ICE_CAVERN_COMPASS,
-
-  BOSS_KEY,
-  FOREST_TEMPLE_BOSS_KEY,
-  FIRE_TEMPLE_BOSS_KEY,
-  WATER_TEMPLE_BOSS_KEY,
-  SPIRIT_TEMPLE_BOSS_KEY,
-  SHADOW_TEMPLE_BOSS_KEY,
-  GANONS_CASTLE_BOSS_KEY,
-
-  SMALL_KEY,
-  FOREST_TEMPLE_SMALL_KEY,
-  FIRE_TEMPLE_SMALL_KEY,
-  WATER_TEMPLE_SMALL_KEY,
-  SPIRIT_TEMPLE_SMALL_KEY,
-  SHADOW_TEMPLE_SMALL_KEY,
-  BOTTOM_OF_THE_WELL_SMALL_KEY,
-  GERUDO_TRAINING_GROUNDS_SMALL_KEY,
-  GERUDO_FORTRESS_SMALL_KEY,
-  GANONS_CASTLE_SMALL_KEY,
-  TREASURE_GAME_SMALL_KEY,
-
-  FOREST_TEMPLE_KEY_RING,
-  FIRE_TEMPLE_KEY_RING,
-  WATER_TEMPLE_KEY_RING,
-  SPIRIT_TEMPLE_KEY_RING,
-  SHADOW_TEMPLE_KEY_RING,
-  BOTTOM_OF_THE_WELL_KEY_RING,
-  GERUDO_TRAINING_GROUNDS_KEY_RING,
-  GERUDO_FORTRESS_KEY_RING,
-  GANONS_CASTLE_KEY_RING,
-
-  KOKIRI_EMERALD,
-  GORON_RUBY,
-  ZORA_SAPPHIRE,
-  FOREST_MEDALLION,
-  FIRE_MEDALLION,
-  WATER_MEDALLION,
-  SPIRIT_MEDALLION,
-  SHADOW_MEDALLION,
-  LIGHT_MEDALLION,
-
-  RECOVERY_HEART,
-  GREEN_RUPEE,
-  GREG_RUPEE,
-  BLUE_RUPEE,
-  RED_RUPEE,
-  PURPLE_RUPEE,
-  HUGE_RUPEE,
-  PIECE_OF_HEART,
-  HEART_CONTAINER,
-  ICE_TRAP,
-  MILK,
-
-  BOMBS_5,
-  BOMBS_10,
-  BOMBS_20,
-  BOMBCHU_5,
-  BOMBCHU_10,
-  BOMBCHU_20,
-  BOMBCHU_DROP,
-  ARROWS_5,
-  ARROWS_10,
-  ARROWS_30,
-  DEKU_NUTS_5,
-  DEKU_NUTS_10,
-  DEKU_SEEDS_30,
-  DEKU_STICK_1,
-  RED_POTION_REFILL,
-  GREEN_POTION_REFILL,
-  BLUE_POTION_REFILL,
-
-  TREASURE_GAME_HEART,
-  TREASURE_GAME_GREEN_RUPEE,
-
-  TRIFORCE,
-  TRIFORCE_PIECE,
-  TRIFORCE_COMPLETED,
-  EPONA,
-  HINT,
-
-  //SHOP ITEMS
-  BUY_DEKU_NUT_5,
-  BUY_ARROWS_30,
-  BUY_ARROWS_50,
-  BUY_BOMBS_525,
-  BUY_DEKU_NUT_10,
-  BUY_DEKU_STICK_1,
-  BUY_BOMBS_10,
-  BUY_FISH,
-  BUY_RED_POTION_30,
-  BUY_GREEN_POTION,
-  BUY_BLUE_POTION,
-  BUY_HYLIAN_SHIELD,
-  BUY_DEKU_SHIELD,
-  BUY_GORON_TUNIC,
-  BUY_ZORA_TUNIC,
-  BUY_HEART,
-  BUY_BOMBCHU_10,
-  BUY_BOMBCHU_20,
-  BUY_DEKU_SEEDS_30,
-  SOLD_OUT,
-  BUY_BLUE_FIRE,
-  BUY_BOTTLE_BUG,
-  BUY_POE,
-  BUY_FAIRYS_SPIRIT,
-  BUY_ARROWS_10,
-  BUY_BOMBS_20,
-  BUY_BOMBS_30,
-  BUY_BOMBS_535,
-  BUY_RED_POTION_40,
-  BUY_RED_POTION_50,
-
-  //ITEMLOCATIONS
-
-  //DUNGEON REWARDS
-  LINKS_POCKET,
-  QUEEN_GOHMA,
-  KING_DODONGO,
-  BARINADE,
-  PHANTOM_GANON,
-  VOLVAGIA,
-  MORPHA,
-  BONGO_BONGO,
-  TWINROVA,
-  GANON,
-
-  //SONGS
-  SONG_FROM_IMPA,
-  SONG_FROM_MALON,
-  SONG_FROM_SARIA,
-  SONG_FROM_COMPOSERS_GRAVE,
-  SONG_FROM_OCARINA_OF_TIME,
-  SONG_FROM_WINDMILL,
-  SHEIK_IN_FOREST,
-  SHEIK_IN_CRATER,
-  SHEIK_IN_ICE_CAVERN,
-  SHEIK_AT_COLOSSUS,
-  SHEIK_IN_KAKARIKO,
-  SHEIK_AT_TEMPLE,
-
-//// Overworld
-// Kokiri Forest
-  KF_MIDOS_TOP_LEFT_CHEST,
-  KF_MIDOS_TOP_RIGHT_CHEST,
-  KF_MIDOS_BOTTOM_LEFT_CHEST,
-  KF_MIDOS_BOTTOM_RIGHT_CHEST,
-  KF_KOKIRI_SWORD_CHEST,
-  KF_STORMS_GROTTO_CHEST,
-  KF_LINKS_HOUSE_COW,
-  KF_GS_KNOW_IT_ALL_HOUSE,
-  KF_GS_BEAN_PATCH,
-  KF_GS_HOUSE_OF_TWINS,
-  KF_SHOP_ITEM_1,
-  KF_SHOP_ITEM_2,
-  KF_SHOP_ITEM_3,
-  KF_SHOP_ITEM_4,
-  KF_SHOP_ITEM_5,
-  KF_SHOP_ITEM_6,
-  KF_SHOP_ITEM_7,
-  KF_SHOP_ITEM_8,
-//LOST_WOODS
-  LW_GIFT_FROM_SARIA,
-  LW_OCARINA_MEMORY_GAME,
-  LW_TARGET_IN_WOODS,
-  LW_NEAR_SHORTCUTS_GROTTO_CHEST,
-  DEKU_THEATER_SKULL_MASK,
-  DEKU_THEATER_MASK_OF_TRUTH,
-  LW_SKULL_KID,
-  LW_TRADE_COJIRO,
-  LW_TRADE_ODD_POTION,
-  LW_DEKU_SCRUB_NEAR_BRIDGE,
-  LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT,
-  LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT,
-  LW_DEKU_SCRUB_GROTTO_FRONT,
-  LW_DEKU_SCRUB_GROTTO_REAR,
-  LW_GS_BEAN_PATCH_NEAR_BRIDGE,
-  LW_GS_BEAN_PATCH_NEAR_THEATER,
-  LW_GS_ABOVE_THEATER,
-//SACRED_FOREST_MEADOW
-  SFM_WOLFOS_GROTTO_CHEST,
-  SFM_DEKU_SCRUB_GROTTO_FRONT,
-  SFM_DEKU_SCRUB_GROTTO_REAR,
-  SFM_GS,
-//HYRULE_FIELD
-  HF_OCARINA_OF_TIME_ITEM,
-  HF_NEAR_MARKET_GROTTO_CHEST,
-  HF_TEKTITE_GROTTO_FREESTANDING_POH,
-  HF_SOUTHEAST_GROTTO_CHEST,
-  HF_OPEN_GROTTO_CHEST,
-  HF_DEKU_SCRUB_GROTTO,
-  HF_COW_GROTTO_COW,
-  HF_GS_COW_GROTTO,
-  HF_GS_NEAR_KAK_GROTTO,
-//MARKET
-  MARKET_SHOOTING_GALLERY_REWARD,
-  MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,
-  MARKET_BOMBCHU_BOWLING_SECOND_PRIZE,
-  MARKET_BOMBCHU_BOWLING_BOMBCHUS,
-  MARKET_LOST_DOG,
-  MARKET_TREASURE_CHEST_GAME_REWARD,
-  MARKET_TREASURE_CHEST_GAME_ITEM_1,
-  MARKET_TREASURE_CHEST_GAME_ITEM_2,
-  MARKET_TREASURE_CHEST_GAME_ITEM_3,
-  MARKET_TREASURE_CHEST_GAME_ITEM_4,
-  MARKET_TREASURE_CHEST_GAME_ITEM_5,
-  MARKET_10_BIG_POES,
-  MARKET_GS_GUARD_HOUSE,
-  MARKET_BAZAAR_ITEM_1,
-  MARKET_BAZAAR_ITEM_2,
-  MARKET_BAZAAR_ITEM_3,
-  MARKET_BAZAAR_ITEM_4,
-  MARKET_BAZAAR_ITEM_5,
-  MARKET_BAZAAR_ITEM_6,
-  MARKET_BAZAAR_ITEM_7,
-  MARKET_BAZAAR_ITEM_8,
-  MARKET_POTION_SHOP_ITEM_1,
-  MARKET_POTION_SHOP_ITEM_2,
-  MARKET_POTION_SHOP_ITEM_3,
-  MARKET_POTION_SHOP_ITEM_4,
-  MARKET_POTION_SHOP_ITEM_5,
-  MARKET_POTION_SHOP_ITEM_6,
-  MARKET_POTION_SHOP_ITEM_7,
-  MARKET_POTION_SHOP_ITEM_8,
-  MARKET_BOMBCHU_SHOP_ITEM_1,
-  MARKET_BOMBCHU_SHOP_ITEM_2,
-  MARKET_BOMBCHU_SHOP_ITEM_3,
-  MARKET_BOMBCHU_SHOP_ITEM_4,
-  MARKET_BOMBCHU_SHOP_ITEM_5,
-  MARKET_BOMBCHU_SHOP_ITEM_6,
-  MARKET_BOMBCHU_SHOP_ITEM_7,
-  MARKET_BOMBCHU_SHOP_ITEM_8,
-  TOT_LIGHT_ARROWS_CUTSCENE,
-//HYRULE_CASTLE
-  HC_MALON_EGG,
-  HC_ZELDAS_LETTER,
-  HC_GREAT_FAIRY_REWARD,
-  HC_GS_TREE,
-  HC_GS_STORMS_GROTTO,
-//LON_LON_RANCH
-  LLR_TALONS_CHICKENS,
-  LLR_FREESTANDING_POH,
-  LLR_DEKU_SCRUB_GROTTO_LEFT,
-  LLR_DEKU_SCRUB_GROTTO_CENTER,
-  LLR_DEKU_SCRUB_GROTTO_RIGHT,
-  LLR_STABLES_LEFT_COW,
-  LLR_STABLES_RIGHT_COW,
-  LLR_TOWER_LEFT_COW,
-  LLR_TOWER_RIGHT_COW,
-  LLR_GS_HOUSE_WINDOW,
-  LLR_GS_TREE,
-  LLR_GS_RAIN_SHED,
-  LLR_GS_BACK_WALL,
-//KAKARIKO
-  KAK_ANJU_AS_CHILD,
-  KAK_ANJU_AS_ADULT,
-  KAK_TRADE_POCKET_CUCCO,
-  KAK_IMPAS_HOUSE_FREESTANDING_POH,
-  KAK_WINDMILL_FREESTANDING_POH,
-  KAK_MAN_ON_ROOF,
-  KAK_OPEN_GROTTO_CHEST,
-  KAK_REDEAD_GROTTO_CHEST,
-  KAK_SHOOTING_GALLERY_REWARD,
-  KAK_TRADE_ODD_MUSHROOM,
-  KAK_GRANNYS_SHOP,
-  KAK_10_GOLD_SKULLTULA_REWARD,
-  KAK_20_GOLD_SKULLTULA_REWARD,
-  KAK_30_GOLD_SKULLTULA_REWARD,
-  KAK_40_GOLD_SKULLTULA_REWARD,
-  KAK_50_GOLD_SKULLTULA_REWARD,
-  KAK_100_GOLD_SKULLTULA_REWARD,
-  KAK_IMPAS_HOUSE_COW,
-  KAK_GS_TREE,
-  KAK_GS_GUARDS_HOUSE,
-  KAK_GS_WATCHTOWER,
-  KAK_GS_SKULLTULA_HOUSE,
-  KAK_GS_HOUSE_UNDER_CONSTRUCTION,
-  KAK_GS_ABOVE_IMPAS_HOUSE,
-  KAK_BAZAAR_ITEM_1,
-  KAK_BAZAAR_ITEM_2,
-  KAK_BAZAAR_ITEM_3,
-  KAK_BAZAAR_ITEM_4,
-  KAK_BAZAAR_ITEM_5,
-  KAK_BAZAAR_ITEM_6,
-  KAK_BAZAAR_ITEM_7,
-  KAK_BAZAAR_ITEM_8,
-  KAK_POTION_SHOP_ITEM_1,
-  KAK_POTION_SHOP_ITEM_2,
-  KAK_POTION_SHOP_ITEM_3,
-  KAK_POTION_SHOP_ITEM_4,
-  KAK_POTION_SHOP_ITEM_5,
-  KAK_POTION_SHOP_ITEM_6,
-  KAK_POTION_SHOP_ITEM_7,
-  KAK_POTION_SHOP_ITEM_8,
-//GRAVEYARD
-  GRAVEYARD_SHIELD_GRAVE_CHEST,
-  GRAVEYARD_HEART_PIECE_GRAVE_CHEST,
-  GRAVEYARD_COMPOSERS_GRAVE_CHEST,
-  GRAVEYARD_FREESTANDING_POH,
-  GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR,
-  GRAVEYARD_HOOKSHOT_CHEST,
-  GRAVEYARD_DAMPE_RACE_FREESTANDING_POH,
-  GRAVEYARD_GS_BEAN_PATCH,
-  GRAVEYARD_GS_WALL,
-//DEATH_MOUNTAIN_TRAIL
-  DMT_FREESTANDING_POH,
-  DMT_CHEST,
-  DMT_STORMS_GROTTO_CHEST,
-  DMT_GREAT_FAIRY_REWARD,
-  DMT_TRADE_BROKEN_SWORD,
-  DMT_TRADE_EYEDROPS,
-  DMT_TRADE_CLAIM_CHECK,
-  DMT_COW_GROTTO_COW,
-  DMT_GS_NEAR_KAK,
-  DMT_GS_BEAN_PATCH,
-  DMT_GS_ABOVE_DODONGOS_CAVERN,
-  DMT_GS_FALLING_ROCKS_PATH,
-//GORON_CITY
-  GC_DARUNIAS_JOY,
-  GC_POT_FREESTANDING_POH,
-  GC_ROLLING_GORON_AS_CHILD,
-  GC_ROLLING_GORON_AS_ADULT,
-  GC_MEDIGORON,
-  GC_MAZE_LEFT_CHEST,
-  GC_MAZE_RIGHT_CHEST,
-  GC_MAZE_CENTER_CHEST,
-  GC_DEKU_SCRUB_GROTTO_LEFT,
-  GC_DEKU_SCRUB_GROTTO_CENTER,
-  GC_DEKU_SCRUB_GROTTO_RIGHT,
-  GC_GS_CENTER_PLATFORM,
-  GC_GS_BOULDER_MAZE,
-  GC_SHOP_ITEM_1,
-  GC_SHOP_ITEM_2,
-  GC_SHOP_ITEM_3,
-  GC_SHOP_ITEM_4,
-  GC_SHOP_ITEM_5,
-  GC_SHOP_ITEM_6,
-  GC_SHOP_ITEM_7,
-  GC_SHOP_ITEM_8,
-//DEATH_MOUNTAIN_CRATER
-  DMC_VOLCANO_FREESTANDING_POH,
-  DMC_WALL_FREESTANDING_POH,
-  DMC_UPPER_GROTTO_CHEST,
-  DMC_GREAT_FAIRY_REWARD,
-  DMC_DEKU_SCRUB,
-  DMC_DEKU_SCRUB_GROTTO_LEFT,
-  DMC_DEKU_SCRUB_GROTTO_CENTER,
-  DMC_DEKU_SCRUB_GROTTO_RIGHT,
-  DMC_GS_CRATE,
-  DMC_GS_BEAN_PATCH,
-//ZORA'S_RIVER
-  ZR_MAGIC_BEAN_SALESMAN,
-  ZR_OPEN_GROTTO_CHEST,
-  ZR_FROGS_ZELDAS_LULLABY,
-  ZR_FROGS_EPONAS_SONG,
-  ZR_FROGS_SARIAS_SONG,
-  ZR_FROGS_SUNS_SONG,
-  ZR_FROGS_SONG_OF_TIME,
-  ZR_FROGS_IN_THE_RAIN,
-  ZR_FROGS_OCARINA_GAME,
-  ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH,
-  ZR_NEAR_DOMAIN_FREESTANDING_POH,
-  ZR_DEKU_SCRUB_GROTTO_FRONT,
-  ZR_DEKU_SCRUB_GROTTO_REAR,
-  ZR_GS_TREE,
-  ZR_GS_LADDER,
-  ZR_GS_NEAR_RAISED_GROTTOS,
-  ZR_GS_ABOVE_BRIDGE,
-//ZORA'S_DOMAIN
-  ZD_DIVING_MINIGAME,
-  ZD_CHEST,
-  ZD_KING_ZORA_THAWED,
-  ZD_TRADE_PRESCRIPTION,
-  ZD_GS_FROZEN_WATERFALL,
-  ZD_SHOP_ITEM_1,
-  ZD_SHOP_ITEM_2,
-  ZD_SHOP_ITEM_3,
-  ZD_SHOP_ITEM_4,
-  ZD_SHOP_ITEM_5,
-  ZD_SHOP_ITEM_6,
-  ZD_SHOP_ITEM_7,
-  ZD_SHOP_ITEM_8,
-//ZORA'S_FOUNTAIN
-  ZF_GREAT_FAIRY_REWARD,
-  ZF_ICEBERG_FREESTANDING_POH,
-  ZF_BOTTOM_FREESTANDING_POH,
-  ZF_GS_ABOVE_THE_LOG,
-  ZF_GS_TREE,
-  ZF_GS_HIDDEN_CAVE,
-//LAKE_HYLIA
-  LH_UNDERWATER_ITEM,
-  LH_CHILD_FISHING,
-  LH_ADULT_FISHING,
-  LH_LAB_DIVE,
-  LH_TRADE_FROG,
-  LH_FREESTANDING_POH,
-  LH_SUN,
-  LH_DEKU_SCRUB_GROTTO_LEFT,
-  LH_DEKU_SCRUB_GROTTO_CENTER,
-  LH_DEKU_SCRUB_GROTTO_RIGHT,
-  LH_GS_BEAN_PATCH,
-  LH_GS_LAB_WALL,
-  LH_GS_SMALL_ISLAND,
-  LH_GS_LAB_CRATE,
-  LH_GS_TREE,
-//GERUDO_VALLEY
-  GV_CRATE_FREESTANDING_POH,
-  GV_WATERFALL_FREESTANDING_POH,
-  GV_CHEST,
-  GV_TRADE_SAW,
-  GV_DEKU_SCRUB_GROTTO_FRONT,
-  GV_DEKU_SCRUB_GROTTO_REAR,
-  GV_COW,
-  GV_GS_SMALL_BRIDGE,
-  GV_GS_BEAN_PATCH,
-  GV_GS_BEHIND_TENT,
-  GV_GS_PILLAR,
-//GERUDO'S_FORTRESS
-  GF_NORTH_F1_CARPENTER,
-  GF_NORTH_F2_CARPENTER,
-  GF_SOUTH_F1_CARPENTER,
-  GF_SOUTH_F2_CARPENTER,
-  GF_GERUDO_MEMBERSHIP_CARD,
-  GF_CHEST,
-  GF_HBA_1000_POINTS,
-  GF_HBA_1500_POINTS,
-  GF_GS_TOP_FLOOR,
-  GF_GS_ARCHERY_RANGE,
-//WASTELAND
-  WASTELAND_BOMBCHU_SALESMAN,
-  WASTELAND_CHEST,
-  WASTELAND_GS,
-//COLOSSUS
-  COLOSSUS_GREAT_FAIRY_REWARD,
-  COLOSSUS_FREESTANDING_POH,
-  COLOSSUS_DEKU_SCRUB_GROTTO_FRONT,
-  COLOSSUS_DEKU_SCRUB_GROTTO_REAR,
-  COLOSSUS_GS_BEAN_PATCH,
-  COLOSSUS_GS_TREE,
-  COLOSSUS_GS_HILL,
-//OUTSIDE_GANON'S_CASTLE
-  OGC_GREAT_FAIRY_REWARD,
-  OGC_GS,
-
-////DUNGEONS
-//DEKU_TREE_VANILLA
-  DEKU_TREE_MAP_CHEST,
-  DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST,
-  DEKU_TREE_SLINGSHOT_CHEST,
-  DEKU_TREE_COMPASS_CHEST,
-  DEKU_TREE_COMPASS_ROOM_SIDE_CHEST,
-  DEKU_TREE_BASEMENT_CHEST,
-  DEKU_TREE_GS_COMPASS_ROOM,
-  DEKU_TREE_GS_BASEMENT_VINES,
-  DEKU_TREE_GS_BASEMENT_GATE,
-  DEKU_TREE_GS_BASEMENT_BACK_ROOM,
-//DEKU_TREE_MQ
-  DEKU_TREE_MQ_MAP_CHEST,
-  DEKU_TREE_MQ_SLINGSHOT_CHEST,
-  DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST,
-  DEKU_TREE_MQ_COMPASS_CHEST,
-  DEKU_TREE_MQ_BASEMENT_CHEST,
-  DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST,
-  DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST,
-  DEKU_TREE_MQ_DEKU_SCRUB,
-  DEKU_TREE_MQ_GS_LOBBY,
-  DEKU_TREE_MQ_GS_COMPASS_ROOM,
-  DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM,
-  DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM,
-//DEKU_TREE_SHARED
-  DEKU_TREE_QUEEN_GOHMA_HEART,
-//DODONGO'S_CAVERN_VANILLA
-  DODONGOS_CAVERN_MAP_CHEST,
-  DODONGOS_CAVERN_COMPASS_CHEST,
-  DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST,
-  DODONGOS_CAVERN_BOMB_BAG_CHEST,
-  DODONGOS_CAVERN_END_OF_BRIDGE_CHEST,
-  DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS,
-  DODONGOS_CAVERN_DEKU_SCRUB_LOBBY,
-  DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,
-  DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT,
-  DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS,
-  DODONGOS_CAVERN_GS_SCARECROW,
-  DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS,
-  DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS,
-  DODONGOS_CAVERN_GS_BACK_ROOM,
-//DODONGO'S_CAVERN_MQ
-  DODONGOS_CAVERN_MQ_MAP_CHEST,
-  DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST,
-  DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST,
-  DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST,
-  DODONGOS_CAVERN_MQ_COMPASS_CHEST,
-  DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST,
-  DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT,
-  DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,
-  DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS,
-  DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,
-  DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM,
-  DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM,
-  DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM,
-  DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM,
-  DODONGOS_CAVERN_MQ_GS_BACK_AREA,
-//DODONGO'S_CAVERN_SHARED
-  DODONGOS_CAVERN_BOSS_ROOM_CHEST,
-  DODONGOS_CAVERN_KING_DODONGO_HEART,
-//JABU_JABU'S_BELLY_VANILLA
-  JABU_JABUS_BELLY_BOOMERANG_CHEST,
-  JABU_JABUS_BELLY_MAP_CHEST,
-  JABU_JABUS_BELLY_COMPASS_CHEST,
-  JABU_JABUS_BELLY_DEKU_SCRUB,
-  JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM,
-  JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER,
-  JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER,
-  JABU_JABUS_BELLY_GS_NEAR_BOSS,
-//JABU_JABU'S_BELLY_MQ
-  JABU_JABUS_BELLY_MQ_MAP_CHEST,
-  JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST,
-  JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST,
-  JABU_JABUS_BELLY_MQ_COMPASS_CHEST,
-  JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST,
-  JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST,
-  JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST,
-  JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST,
-  JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST,
-  JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST,
-  JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST,
-  JABU_JABUS_BELLY_MQ_COW,
-  JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM,
-  JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM,
-  JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM,
-  JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS,
-//JABU_JABU'S_BELLY_SHARED
-  JABU_JABUS_BELLY_BARINADE_HEART,
-//BOTTOM_OF_THE_WELL_VANILLA
-  BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST,
-  BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST,
-  BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST,
-  BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST,
-  BOTTOM_OF_THE_WELL_FREESTANDING_KEY,
-  BOTTOM_OF_THE_WELL_COMPASS_CHEST,
-  BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST,
-  BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST,
-  BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST,
-  BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST,
-  BOTTOM_OF_THE_WELL_MAP_CHEST,
-  BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST,
-  BOTTOM_OF_THE_WELL_INVISIBLE_CHEST,
-  BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST,
-  BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM,
-  BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM,
-  BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE,
-//BOTTOM_OF_THE_WELL_MQ
-  BOTTOM_OF_THE_WELL_MQ_MAP_CHEST,
-  BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY,
-  BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST,
-  BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY,
-  BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST,
-  BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM,
-  BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM,
-  BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT,
-//FOREST_TEMPLE_VANILLA
-  FOREST_TEMPLE_FIRST_ROOM_CHEST,
-  FOREST_TEMPLE_FIRST_STALFOS_CHEST,
-  FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST,
-  FOREST_TEMPLE_MAP_CHEST,
-  FOREST_TEMPLE_WELL_CHEST,
-  FOREST_TEMPLE_EYE_SWITCH_CHEST,
-  FOREST_TEMPLE_BOSS_KEY_CHEST,
-  FOREST_TEMPLE_FLOORMASTER_CHEST,
-  FOREST_TEMPLE_RED_POE_CHEST,
-  FOREST_TEMPLE_BOW_CHEST,
-  FOREST_TEMPLE_BLUE_POE_CHEST,
-  FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST,
-  FOREST_TEMPLE_BASEMENT_CHEST,
-  FOREST_TEMPLE_GS_FIRST_ROOM,
-  FOREST_TEMPLE_GS_LOBBY,
-  FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD,
-  FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD,
-  FOREST_TEMPLE_GS_BASEMENT,
-//FOREST_TEMPLE_MQ
-  FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST,
-  FOREST_TEMPLE_MQ_WOLFOS_CHEST,
-  FOREST_TEMPLE_MQ_WELL_CHEST,
-  FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST,
-  FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST,
-  FOREST_TEMPLE_MQ_BOSS_KEY_CHEST,
-  FOREST_TEMPLE_MQ_REDEAD_CHEST,
-  FOREST_TEMPLE_MQ_MAP_CHEST,
-  FOREST_TEMPLE_MQ_BOW_CHEST,
-  FOREST_TEMPLE_MQ_COMPASS_CHEST,
-  FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST,
-  FOREST_TEMPLE_MQ_BASEMENT_CHEST,
-  FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY,
-  FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD,
-  FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD,
-  FOREST_TEMPLE_MQ_GS_WELL,
-  FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM,
-//FOREST_TEMPLE_SHARED
-  FOREST_TEMPLE_PHANTOM_GANON_HEART,
-//FIRE_TEMPLE_VANILLA
-  FIRE_TEMPLE_NEAR_BOSS_CHEST,
-  FIRE_TEMPLE_FLARE_DANCER_CHEST,
-  FIRE_TEMPLE_BOSS_KEY_CHEST,
-  FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST,
-  FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST,
-  FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST,
-  FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST,
-  FIRE_TEMPLE_MAP_CHEST,
-  FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST,
-  FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST,
-  FIRE_TEMPLE_SCARECROW_CHEST,
-  FIRE_TEMPLE_COMPASS_CHEST,
-  FIRE_TEMPLE_MEGATON_HAMMER_CHEST,
-  FIRE_TEMPLE_HIGHEST_GORON_CHEST,
-  FIRE_TEMPLE_GS_BOSS_KEY_LOOP,
-  FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM,
-  FIRE_TEMPLE_GS_BOULDER_MAZE,
-  FIRE_TEMPLE_GS_SCARECROW_CLIMB,
-  FIRE_TEMPLE_GS_SCARECROW_TOP,
-//FIRE_TEMPLE_MQ
-  FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST,
-  FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST,
-  FIRE_TEMPLE_MQ_MAP_CHEST,
-  FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST,
-  FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST,
-  FIRE_TEMPLE_MQ_BOSS_KEY_CHEST,
-  FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST,
-  FIRE_TEMPLE_MQ_COMPASS_CHEST,
-  FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST,
-  FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST,
-  FIRE_TEMPLE_MQ_FREESTANDING_KEY,
-  FIRE_TEMPLE_MQ_CHEST_ON_FIRE,
-  FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR,
-  FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE,
-  FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER,
-  FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM,
-  FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE,
-//FIRE_TEMPLE_SHARED
-  FIRE_TEMPLE_VOLVAGIA_HEART,
-//WATER_TEMPLE_VANILLA
-  WATER_TEMPLE_COMPASS_CHEST,
-  WATER_TEMPLE_MAP_CHEST,
-  WATER_TEMPLE_CRACKED_WALL_CHEST,
-  WATER_TEMPLE_TORCHES_CHEST,
-  WATER_TEMPLE_BOSS_KEY_CHEST,
-  WATER_TEMPLE_CENTRAL_PILLAR_CHEST,
-  WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST,
-  WATER_TEMPLE_LONGSHOT_CHEST,
-  WATER_TEMPLE_RIVER_CHEST,
-  WATER_TEMPLE_DRAGON_CHEST,
-  WATER_TEMPLE_GS_BEHIND_GATE,
-  WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST,
-  WATER_TEMPLE_GS_CENTRAL_PILLAR,
-  WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM,
-  WATER_TEMPLE_GS_RIVER,
-//WATER_TEMPLE_MQ
-  WATER_TEMPLE_MQ_LONGSHOT_CHEST,
-  WATER_TEMPLE_MQ_MAP_CHEST,
-  WATER_TEMPLE_MQ_COMPASS_CHEST,
-  WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST,
-  WATER_TEMPLE_MQ_BOSS_KEY_CHEST,
-  WATER_TEMPLE_MQ_FREESTANDING_KEY,
-  WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY,
-  WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH,
-  WATER_TEMPLE_MQ_GS_RIVER,
-  WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA,
-  WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH,
-//WATER_TEMPLE_SHARED
-  WATER_TEMPLE_MORPHA_HEART,
-//SHADOW_TEMPLE_VANILLA
-  SHADOW_TEMPLE_MAP_CHEST,
-  SHADOW_TEMPLE_HOVER_BOOTS_CHEST,
-  SHADOW_TEMPLE_COMPASS_CHEST,
-  SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST,
-  SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST,
-  SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST,
-  SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST,
-  SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST,
-  SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST,
-  SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST,
-  SHADOW_TEMPLE_FREESTANDING_KEY,
-  SHADOW_TEMPLE_WIND_HINT_CHEST,
-  SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST,
-  SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST,
-  SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST,
-  SHADOW_TEMPLE_BOSS_KEY_CHEST,
-  SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST,
-  SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM,
-  SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM,
-  SHADOW_TEMPLE_GS_SINGLE_GIANT_POT,
-  SHADOW_TEMPLE_GS_NEAR_SHIP,
-  SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT,
-//SHADOW_TEMPLE_MQ
-  SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST,
-  SHADOW_TEMPLE_MQ_MAP_CHEST,
-  SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST,
-  SHADOW_TEMPLE_MQ_COMPASS_CHEST,
-  SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST,
-  SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST,
-  SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST,
-  SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST,
-  SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST,
-  SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST,
-  SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST,
-  SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST,
-  SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST,
-  SHADOW_TEMPLE_MQ_WIND_HINT_CHEST,
-  SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST,
-  SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST,
-  SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST,
-  SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST,
-  SHADOW_TEMPLE_MQ_FREESTANDING_KEY,
-  SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST,
-  SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM,
-  SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM,
-  SHADOW_TEMPLE_MQ_GS_AFTER_WIND,
-  SHADOW_TEMPLE_MQ_GS_AFTER_SHIP,
-  SHADOW_TEMPLE_MQ_GS_NEAR_BOSS,
-//SHADOW_TEMPLE_SHARED
-  SHADOW_TEMPLE_BONGO_BONGO_HEART,
-//SPIRIT_TEMPLE_SHARED
-//VANILLA_AND_MQ_LOCATIONS_ARE_MIXED_TO_ENSURE_THE_POSITIONS_OF_S
-  SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST,
-  SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST,
-  SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST,
-  SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST,
-  SPIRIT_TEMPLE_MAP_CHEST,
-  SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST,
-  SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST,
-  SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST,
-  SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST,
-  SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST,
-  SPIRIT_TEMPLE_MQ_MAP_CHEST,
-  SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST,
-  SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST,
-  SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST,
-  SPIRIT_TEMPLE_MQ_COMPASS_CHEST,
-  SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST,
-  SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST,
-  SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST,
-  SPIRIT_TEMPLE_COMPASS_CHEST,
-  SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST,
-  SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST,
-  SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST,
-  SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST,
-  SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST,
-  SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST,
-  SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST,
-  SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST,
-  SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST,
-  SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST,
-  SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST,
-  SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST,
-  SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST,
-  SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST,
-  SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST,
-  SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST,
-  SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST,
-  SPIRIT_TEMPLE_BOSS_KEY_CHEST,
-  SPIRIT_TEMPLE_TOPMOST_CHEST,
-  SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST,
-  SPIRIT_TEMPLE_GS_METAL_FENCE,
-  SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM,
-  SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM,
-  SPIRIT_TEMPLE_GS_LOBBY,
-  SPIRIT_TEMPLE_GS_BOULDER_ROOM,
-  SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM,
-  SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM,
-  SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM,
-  SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST,
-  SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH,
-  SPIRIT_TEMPLE_TWINROVA_HEART,
-//ICE_CAVERN_VANILLA
-  ICE_CAVERN_MAP_CHEST,
-  ICE_CAVERN_COMPASS_CHEST,
-  ICE_CAVERN_FREESTANDING_POH,
-  ICE_CAVERN_IRON_BOOTS_CHEST,
-  ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM,
-  ICE_CAVERN_GS_HEART_PIECE_ROOM,
-  ICE_CAVERN_GS_PUSH_BLOCK_ROOM,
-//ICE_CAVERN_MQ
-  ICE_CAVERN_MQ_MAP_CHEST,
-  ICE_CAVERN_MQ_COMPASS_CHEST,
-  ICE_CAVERN_MQ_FREESTANDING_POH,
-  ICE_CAVERN_MQ_IRON_BOOTS_CHEST,
-  ICE_CAVERN_MQ_GS_RED_ICE,
-  ICE_CAVERN_MQ_GS_ICE_BLOCK,
-  ICE_CAVERN_MQ_GS_SCARECROW,
-//GERUDO_TRAINING_GROUNDS_VANILLA
-  GERUDO_TRAINING_GROUNDS_LOBBY_LEFT_CHEST,
-  GERUDO_TRAINING_GROUNDS_LOBBY_RIGHT_CHEST,
-  GERUDO_TRAINING_GROUNDS_STALFOS_CHEST,
-  GERUDO_TRAINING_GROUNDS_BEFORE_HEAVY_BLOCK_CHEST,
-  GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_FIRST_CHEST,
-  GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_SECOND_CHEST,
-  GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_THIRD_CHEST,
-  GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_FOURTH_CHEST,
-  GERUDO_TRAINING_GROUNDS_EYE_STATUE_CHEST,
-  GERUDO_TRAINING_GROUNDS_NEAR_SCARECROW_CHEST,
-  GERUDO_TRAINING_GROUNDS_HAMMER_ROOM_CLEAR_CHEST,
-  GERUDO_TRAINING_GROUNDS_HAMMER_ROOM_SWITCH_CHEST,
-  GERUDO_TRAINING_GROUNDS_FREESTANDING_KEY,
-  GERUDO_TRAINING_GROUNDS_MAZE_RIGHT_CENTRAL_CHEST,
-  GERUDO_TRAINING_GROUNDS_MAZE_RIGHT_SIDE_CHEST,
-  GERUDO_TRAINING_GROUNDS_UNDERWATER_SILVER_RUPEE_CHEST,
-  GERUDO_TRAINING_GROUNDS_BEAMOS_CHEST,
-  GERUDO_TRAINING_GROUNDS_HIDDEN_CEILING_CHEST,
-  GERUDO_TRAINING_GROUNDS_MAZE_PATH_FIRST_CHEST,
-  GERUDO_TRAINING_GROUNDS_MAZE_PATH_SECOND_CHEST,
-  GERUDO_TRAINING_GROUNDS_MAZE_PATH_THIRD_CHEST,
-  GERUDO_TRAINING_GROUNDS_MAZE_PATH_FINAL_CHEST,
-//GERUDO_TRAINING_GROUNDS_MQ
-  GERUDO_TRAINING_GROUNDS_MQ_LOBBY_LEFT_CHEST,
-  GERUDO_TRAINING_GROUNDS_MQ_LOBBY_RIGHT_CHEST,
-  GERUDO_TRAINING_GROUNDS_MQ_FIRST_IRON_KNUCKLE_CHEST,
-  GERUDO_TRAINING_GROUNDS_MQ_BEFORE_HEAVY_BLOCK_CHEST,
-  GERUDO_TRAINING_GROUNDS_MQ_HEAVY_BLOCK_CHEST,
-  GERUDO_TRAINING_GROUNDS_MQ_EYE_STATUE_CHEST,
-  GERUDO_TRAINING_GROUNDS_MQ_ICE_ARROWS_CHEST,
-  GERUDO_TRAINING_GROUNDS_MQ_SECOND_IRON_KNUCKLE_CHEST,
-  GERUDO_TRAINING_GROUNDS_MQ_FLAME_CIRCLE_CHEST,
-  GERUDO_TRAINING_GROUNDS_MQ_MAZE_RIGHT_CENTRAL_CHEST,
-  GERUDO_TRAINING_GROUNDS_MQ_MAZE_RIGHT_SIDE_CHEST,
-  GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER_SILVER_RUPEE_CHEST,
-  GERUDO_TRAINING_GROUNDS_MQ_DINOLFOS_CHEST,
-  GERUDO_TRAINING_GROUNDS_MQ_HIDDEN_CEILING_CHEST,
-  GERUDO_TRAINING_GROUNDS_MQ_MAZE_PATH_FIRST_CHEST,
-  GERUDO_TRAINING_GROUNDS_MQ_MAZE_PATH_THIRD_CHEST,
-  GERUDO_TRAINING_GROUNDS_MQ_MAZE_PATH_SECOND_CHEST,
-//GANON'S_CASTLE_VANILLA
-  GANONS_CASTLE_FOREST_TRIAL_CHEST,
-  GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST,
-  GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST,
-  GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST,
-  GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST,
-  GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST,
-  GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST,
-  GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST,
-  GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST,
-  GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST,
-  GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST,
-  GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST,
-  GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST,
-  GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST,
-  GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST,
-  GANONS_CASTLE_DEKU_SCRUB_LEFT,
-  GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,
-  GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT,
-  GANONS_CASTLE_DEKU_SCRUB_RIGHT,
-//GANON'S_CASTLE_MQ
-  GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY,
-  GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST,
-  GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST,
-  GANONS_CASTLE_MQ_WATER_TRIAL_CHEST,
-  GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST,
-  GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST,
-  GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST,
-  GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST,
-  GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST,
-  GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST,
-  GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST,
-  GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST,
-  GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST,
-  GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,
-  GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,
-  GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,
-  GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT,
-  GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,
-//GANON'S_CASTLE_SHARED
-  GANONS_TOWER_BOSS_KEY_CHEST,
-
-////EVENTS_AND_DROPS
-  PIERRE,
-  DELIVER_RUTOS_LETTER,
-  MASTER_SWORD_PEDESTAL,
-  DEKU_BABA_STICKS,
-  DEKU_BABA_NUTS,
-  STICK_POT,
-  NUT_POT,
-  NUT_CRATE,
-  BLUE_FIRE,
-  LONE_FISH,
-  FISH_GROUP,
-  BUG_ROCK,
-  BUG_SHRUB,
-  WANDERING_BUGS,
-  FAIRY_POT,
-  FREE_FAIRIES,
-  WALL_FAIRY,
-  BUTTERFLY_FAIRY,
-  GOSSIP_STONE_FAIRY,
-  BEAN_PLANT_FAIRY,
-  FAIRY_POND,
-  BIG_POE_KILL,
-
-  //HINT LOACTIONS
-  DMC_GOSSIP_STONE,
-  DMT_GOSSIP_STONE,
-  COLOSSUS_GOSSIP_STONE,
-  DODONGOS_CAVERN_GOSSIP_STONE,
-  GV_GOSSIP_STONE,
-  GC_MAZE_GOSSIP_STONE,
-  GC_MEDIGORON_GOSSIP_STONE,
-  GRAVEYARD_GOSSIP_STONE,
-  HC_MALON_GOSSIP_STONE,
-  HC_ROCK_WALL_GOSSIP_STONE,
-  HC_STORMS_GROTTO_GOSSIP_STONE,
-  HF_COW_GROTTO_GOSSIP_STONE,
-  KF_DEKU_TREE_GOSSIP_STONE_LEFT,
-  KF_DEKU_TREE_GOSSIP_STONE_RIGHT,
-  KF_GOSSIP_STONE,
-  LH_LAB_GOSSIP_STONE,
-  LH_GOSSIP_STONE_SOUTHEAST,
-  LH_GOSSIP_STONE_SOUTHWEST,
-  LW_GOSSIP_STONE,
-  SFM_MAZE_GOSSIP_STONE_LOWER,
-  SFM_MAZE_GOSSIP_STONE_UPPER,
-  SFM_SARIA_GOSSIP_STONE,
-  TOT_GOSSIP_STONE_LEFT,
-  TOT_GOSSIP_STONE_LEFT_CENTER,
-  TOT_GOSSIP_STONE_RIGHT,
-  TOT_GOSSIP_STONE_RIGHT_CENTER,
-  ZD_GOSSIP_STONE,
-  ZF_FAIRY_GOSSIP_STONE,
-  ZF_JABU_GOSSIP_STONE,
-  ZR_NEAR_GROTTOS_GOSSIP_STONE,
-  ZR_NEAR_DOMAIN_GOSSIP_STONE,
-  HF_NEAR_MARKET_GROTTO_GOSSIP_STONE,
-  HF_SOUTHEAST_GROTTO_GOSSIP_STONE,
-  HF_OPEN_GROTTO_GOSSIP_STONE,
-  KAK_OPEN_GROTTO_GOSSIP_STONE,
-  ZR_OPEN_GROTTO_GOSSIP_STONE,
-  KF_STORMS_GROTTO_GOSSIP_STONE,
-  LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE,
-  DMT_STORMS_GROTTO_GOSSIP_STONE,
-  DMC_UPPER_GROTTO_GOSSIP_STONE,
-  GANONDORF_HINT,
-
-  //ENTRANCES
-  DESERT_COLOSSUS_TO_COLOSSUS_GROTTO,
-  GV_GROTTO_LEDGE_TO_GV_OCTOROK_GROTTO,
-  GC_GROTTO_PLATFORM_TO_GC_GROTTO,
-  GERUDO_FORTRESS_TO_GF_STORMS_GROTTO,
-  ZORAS_DOMAIN_TO_ZD_STORMS_GROTTO,
-  HYRULE_CASTLE_GROUNDS_TO_HC_STORMS_GROTTO,
-  GV_FORTRESS_SIDE_TO_GV_STORMS_GROTTO,
-  DESERT_COLOSSUS_TO_COLOSSUS_GREAT_FAIRY_FOUNTAIN,
-  GANONS_CASTLE_GROUNDS_TO_OGC_GREAT_FAIRY_FOUNTAIN,
-  ZORAS_FOUNTAIN_TO_ZF_GREAT_FAIRY_FOUNTAIN,
-  GV_FORTRESS_SIDE_TO_GV_CARPENTER_TENT,
-  GRAVEYARD_WARP_PAD_REGION_TO_SHADOW_TEMPLE_ENTRYWAY,
-  LAKE_HYLIA_TO_WATER_TEMPLE_LOBBY,
-  GERUDO_FORTRESS_TO_GERUDO_TRAINING_GROUNDS_LOBBY,
-  ZORAS_FOUNTAIN_TO_JABU_JABUS_BELLY_BEGINNING,
-  KAKARIKO_VILLAGE_TO_BOTTOM_OF_THE_WELL,
-
-  //EXITS
-  HYRULE_CASTLE,
-  OUTSIDE_GANONS_CASTLE,
-  DEATH_MOUNTAIN_CRATER,
-
-  //AREAS
-  MARKER_AREAS_START, // Used for area key count
-
-  ROOT,
-  ROOT_EXITS,
-  CHILD_SPAWN,
-  ADULT_SPAWN,
-  MINUET_OF_FOREST_WARP,
-  BOLERO_OF_FIRE_WARP,
-  SERENADE_OF_WATER_WARP,
-  REQUIEM_OF_SPIRIT_WARP,
-  NOCTURNE_OF_SHADOW_WARP,
-  PRELUDE_OF_LIGHT_WARP,
-  KOKIRI_FOREST,
-  KF_LINKS_HOUSE,
-  KF_MIDOS_HOUSE,
-  KF_SARIAS_HOUSE,
-  KF_HOUSE_OF_TWINS,
-  KF_KNOW_IT_ALL_HOUSE,
-  KF_KOKIRI_SHOP,
-  KF_OUTSIDE_DEKU_TREE,
-  KF_STORMS_GROTTO,
-  THE_LOST_WOODS,
-  LW_BRIDGE_FROM_FOREST,
-  LW_BRIDGE,
-  LW_FOREST_EXIT,
-  LW_BEYOND_MIDO,
-  LW_NEAR_SHORTCUTS_GROTTO,
-  DEKU_THEATER,
-  LW_SCRUBS_GROTTO,
-  SFM_ENTRYWAY,
-  SACRED_FOREST_MEADOW,
-  SFM_WOLFOS_GROTTO,
-  SFM_FAIRY_GROTTO,
-  SFM_STORMS_GROTTO,
-  HYRULE_FIELD,
-  HF_SOUTHEAST_GROTTO,
-  HF_OPEN_GROTTO,
-  HF_INSIDE_FENCE_GROTTO,
-  HF_COW_GROTTO,
-  HF_NEAR_MARKET_GROTTO,
-  HF_FAIRY_GROTTO,
-  HF_NEAR_KAK_GROTTO,
-  HF_TEKTITE_GROTTO,
-  LAKE_HYLIA,
-  LH_FISHING_ISLAND,
-  LH_OWL_FLIGHT,
-  LH_LAB,
-  LH_FISHING_HOLE,
-  LH_GROTTO,
-  GERUDO_VALLEY,
-  GV_UPPER_STREAM,
-  GV_LOWER_STREAM,
-  GV_GROTTO_LEDGE,
-  GV_CRATE_LEDGE,
-  GV_OCTOROK_GROTTO,
-  GV_FORTRESS_SIDE,
-  GV_CARPENTER_TENT,
-  GV_STORMS_GROTTO,
-  GERUDO_FORTRESS,
-  GF_OUTSIDE_GATE,
-  GF_STORMS_GROTTO,
-  WASTELAND_NEAR_FORTRESS,
-  HAUNTED_WASTELAND,
-  WASTELAND_NEAR_COLOSSUS,
-  DESERT_COLOSSUS,
-  DESERT_COLOSSUS_FROM_SPIRIT_ENTRYWAY,
-  COLOSSUS_GREAT_FAIRY_FOUNTAIN,
-  COLOSSUS_GROTTO,
-  MARKET_ENTRANCE,
-  THE_MARKET,
-  MARKET_GUARD_HOUSE,
-  MARKET_BAZAAR,
-  MARKET_MASK_SHOP,
-  MARKET_SHOOTING_GALLERY,
-  MARKET_BOMBCHU_BOWLING,
-  MARKET_TREASURE_CHEST_GAME,
-  MARKET_POTION_SHOP,
-  MARKET_BACK_ALLEY,
-  MARKET_BOMBCHU_SHOP,
-  MARKET_DOG_LADY_HOUSE,
-  MARKET_MAN_IN_GREEN_HOUSE,
-  TOT_ENTRANCE,
-  TEMPLE_OF_TIME,
-  TOT_BEYOND_DOOR_OF_TIME,
-  CASTLE_GROUNDS,
-  CASTLE_GROUNDS_FROM_GANONS_CASTLE,
-  HYRULE_CASTLE_GROUNDS,
-  HC_GARDEN,
-  HC_GREAT_FAIRY_FOUNTAIN,
-  HC_STORMS_GROTTO,
-  GANONS_CASTLE_GROUNDS,
-  OGC_GREAT_FAIRY_FOUNTAIN,
-  GANONS_CASTLE_LEDGE,
-  KAKARIKO_VILLAGE,
-  KAK_CARPENTER_BOSS_HOUSE,
-  KAK_HOUSE_OF_SKULLTULA,
-  KAK_IMPAS_HOUSE,
-  KAK_IMPAS_LEDGE,
-  KAK_IMPAS_HOUSE_BACK,
-  KAK_IMPAS_HOUSE_NEAR_COW,
-  KAK_WINDMILL,
-  KAK_BAZAAR,
-  KAK_SHOOTING_GALLERY,
-  KAK_POTION_SHOP_FRONT,
-  KAK_POTION_SHOP_BACK,
-  KAK_ROOFTOP,
-  KAK_IMPAS_ROOFTOP,
-  KAK_BEHIND_GATE,
-  KAK_BACKYARD,
-  KAK_ODD_POTION_BUILDING,
-  KAK_REDEAD_GROTTO,
-  KAK_OPEN_GROTTO,
-  THE_GRAVEYARD,
-  GRAVEYARD_DAMPES_GRAVE,
-  GRAVEYARD_DAMPES_HOUSE,
-  GRAVEYARD_SHIELD_GRAVE,
-  GRAVEYARD_COMPOSERS_GRAVE,
-  GRAVEYARD_HEART_PIECE_GRAVE,
-  GRAVEYARD_WARP_PAD_REGION,
-  DEATH_MOUNTAIN_TRAIL,
-  DEATH_MOUNTAIN_SUMMIT,
-  DMT_OWL_FLIGHT,
-  DMT_GREAT_FAIRY_FOUNTAIN,
-  DMT_COW_GROTTO,
-  DMT_STORMS_GROTTO,
-  GORON_CITY,
-  GC_WOODS_WARP,
-  GC_DARUNIAS_CHAMBER,
-  GC_GROTTO_PLATFORM,
-  GC_SHOP,
-  GC_GROTTO,
-  DMC_UPPER_LOCAL,
-  DMC_CENTRAL_LOCAL,
-  DMC_LOWER_LOCAL,
-  DMC_LOWER_NEARBY,
-  DMC_UPPER_NEARBY,
-  DMC_CENTRAL_NEARBY,
-  DMC_LADDER_AREA_NEARBY,
-  DMC_UPPER_GROTTO,
-  DMC_HAMMER_GROTTO,
-  DMC_GREAT_FAIRY_FOUNTAIN,
-  ZR_FRONT,
-  ZORAS_RIVER,
-  ZR_BEHIND_WATERFALL,
-  ZR_OPEN_GROTTO,
-  ZR_FAIRY_GROTTO,
-  ZR_STORMS_GROTTO,
-  ZORAS_DOMAIN,
-  ZD_BEHIND_KING_ZORA,
-  ZD_SHOP,
-  ZD_STORMS_GROTTO,
-  ZORAS_FOUNTAIN,
-  ZF_GREAT_FAIRY_FOUNTAIN,
-  LON_LON_RANCH,
-  LLR_TALONS_HOUSE,
-  LLR_STABLES,
-  LLR_TOWER,
-  LLR_GROTTO,
-
-  DEKU_TREE_ENTRYWAY,
-  DODONGOS_CAVERN_ENTRYWAY,
-  JABU_JABUS_BELLY_ENTRYWAY,
-  FOREST_TEMPLE_ENTRYWAY,
-  FIRE_TEMPLE_ENTRYWAY,
-  WATER_TEMPLE_ENTRYWAY,
-  SPIRIT_TEMPLE_ENTRYWAY,
-  SHADOW_TEMPLE_ENTRYWAY,
-  BOTTOM_OF_THE_WELL_ENTRYWAY,
-  ICE_CAVERN_ENTRYWAY,
-  GERUDO_TRAINING_GROUNDS_ENTRYWAY,
-  GANONS_CASTLE_ENTRYWAY,
-
-  DEKU_TREE_LOBBY,
-  DEKU_TREE_2F_MIDDLE_ROOM,
-  DEKU_TREE_SLINGSHOT_ROOM,
-  DEKU_TREE_COMPASS_ROOM,
-  DEKU_TREE_BASEMENT_LOWER,
-  DEKU_TREE_BASEMENT_SCRUB_ROOM,
-  DEKU_TREE_BASEMENT_WATER_ROOM,
-  DEKU_TREE_BASEMENT_TORCH_ROOM,
-  DEKU_TREE_BASEMENT_BACK_LOBBY,
-  DEKU_TREE_BASEMENT_BACK_ROOM,
-  DEKU_TREE_BASEMENT_UPPER,
-  DEKU_TREE_OUTSIDE_BOSS_ROOM,
-
-  DEKU_TREE_MQ_LOBBY,
-  DEKU_TREE_MQ_COMPASS_ROOM,
-  DEKU_TREE_MQ_BASEMENT_WATER_ROOM_FRONT,
-  DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK,
-  DEKU_TREE_MQ_BASEMENT_BACK_ROOM,
-  DEKU_TREE_MQ_BASEMENT_LEDGE,
-  DEKU_TREE_MQ_OUTSIDE_BOSS_ROOM,
-
-  DEKU_TREE_BOSS_ENTRYWAY,
-  DEKU_TREE_BOSS_ROOM,
-
-  DODONGOS_CAVERN_BEGINNING,
-  DODONGOS_CAVERN_LOBBY,
-  DODONGOS_CAVERN_LOBBY_SWITCH,
-  DODONGOS_CAVERN_SE_CORRIDOR,
-  DODONGOS_CAVERN_SE_ROOM,
-  DODONGOS_CAVERN_NEAR_LOWER_LIZALFOS,
-  DODONGOS_CAVERN_LOWER_LIZALFOS,
-  DODONGOS_CAVERN_DODONGO_ROOM,
-  DODONGOS_CAVERN_NEAR_DODONGO_ROOM,
-  DODONGOS_CAVERN_STAIRS_LOWER,
-  DODONGOS_CAVERN_STAIRS_UPPER,
-  DODONGOS_CAVERN_COMPASS_ROOM,
-  DODONGOS_CAVERN_ARMOS_ROOM,
-  DODONGOS_CAVERN_BOMB_ROOM_LOWER,
-  DODONGOS_CAVERN_2F_SIDE_ROOM,
-  DODONGOS_CAVERN_FIRST_SLINGSHOT_ROOM,
-  DODONGOS_CAVERN_UPPER_LIZALFOS,
-  DODONGOS_CAVERN_SECOND_SLINGSHOT_ROOM,
-  DODONGOS_CAVERN_BOMB_ROOM_UPPER,
-  DODONGOS_CAVERN_FAR_BRIDGE,
-  DODONGOS_CAVERN_BOSS_AREA,
-  DODONGOS_CAVERN_BACK_ROOM,
-
-  DODONGOS_CAVERN_MQ_BEGINNING,
-  DODONGOS_CAVERN_MQ_LOBBY,
-  DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE,
-  DODONGOS_CAVERN_MQ_BOMB_BAG_AREA,
-  DODONGOS_CAVERN_MQ_BOSS_AREA,
-
-  DODONGOS_CAVERN_BOSS_ENTRYWAY,
-  DODONGOS_CAVERN_BOSS_ROOM,
-
-  JABU_JABUS_BELLY_BEGINNING,
-  JABU_JABUS_BELLY_LIFT_MIDDLE,
-  JABU_JABUS_BELLY_MAIN_UPPER,
-  JABU_JABUS_BELLY_MAIN_LOWER,
-  JABU_JABUS_BELLY_SHABOMB_CORRIDOR,
-  JABU_JABUS_BELLY_LOWER_SIDE_ROOM,
-  JABU_JABUS_BELLY_LIFT_LOWER,
-  JABU_JABUS_BELLY_FORKED_CORRIDOR,
-  JABU_JABUS_BELLY_BOOMERANG_ROOM,
-  JABU_JABUS_BELLY_MAP_ROOM,
-  JABU_JABUS_BELLY_COMPASS_ROOM,
-  JABU_JABUS_BELLY_BLUE_TENTACLE,
-  JABU_JABUS_BELLY_GREEN_TENTACLE,
-  JABU_JABUS_BELLY_BIGOCTO_ROOM,
-  JABU_JABUS_BELLY_ABOVE_BIGOCTO,
-  JABU_JABUS_BELLY_LIFT_UPPER,
-  JABU_JABUS_BELLY_NEAR_BOSS_ROOM,
-
-  JABU_JABUS_BELLY_MQ_BEGINNING,
-  JABU_JABUS_BELLY_MQ_MAIN,
-  JABU_JABUS_BELLY_MQ_DEPTHS,
-  JABU_JABUS_BELLY_MQ_BOSS_AREA,
-
-  JABU_JABUS_BELLY_BOSS_ENTRYWAY,
-  JABU_JABUS_BELLY_BOSS_ROOM,
-
-  FOREST_TEMPLE_FIRST_ROOM,
-  FOREST_TEMPLE_SOUTH_CORRIDOR,
-  FOREST_TEMPLE_LOBBY,
-  FOREST_TEMPLE_NORTH_CORRIDOR,
-  FOREST_TEMPLE_LOWER_STALFOS,
-  FOREST_TEMPLE_NW_OUTDOORS_LOWER,
-  FOREST_TEMPLE_NW_OUTDOORS_UPPER,
-  FOREST_TEMPLE_NE_OUTDOORS_LOWER,
-  FOREST_TEMPLE_NE_OUTDOORS_UPPER,
-  FOREST_TEMPLE_MAP_ROOM,
-  FOREST_TEMPLE_SEWER,
-  FOREST_TEMPLE_BELOW_BOSS_KEY_CHEST,
-  FOREST_TEMPLE_FLOORMASTER_ROOM,
-  FOREST_TEMPLE_WEST_CORRIDOR,
-  FOREST_TEMPLE_BLOCK_PUSH_ROOM,
-  FOREST_TEMPLE_NW_CORRIDOR_TWISTED,
-  FOREST_TEMPLE_NW_CORRIDOR_STRAIGHTENED,
-  FOREST_TEMPLE_RED_POE_ROOM,
-  FOREST_TEMPLE_UPPER_STALFOS,
-  FOREST_TEMPLE_BLUE_POE_ROOM,
-  FOREST_TEMPLE_NE_CORRIDOR_STRAIGHTENED,
-  FOREST_TEMPLE_NE_CORRIDOR_TWISTED,
-  FOREST_TEMPLE_FROZEN_EYE_ROOM,
-  FOREST_TEMPLE_FALLING_ROOM,
-  FOREST_TEMPLE_GREEN_POE_ROOM,
-  FOREST_TEMPLE_EAST_CORRIDOR,
-  FOREST_TEMPLE_BOSS_REGION,
-
-  FOREST_TEMPLE_MQ_LOBBY,
-  FOREST_TEMPLE_MQ_CENTRAL_AREA,
-  FOREST_TEMPLE_MQ_AFTER_BLOCK_PUZZLE,
-  FOREST_TEMPLE_MQ_OUTDOOR_LEDGE,
-  FOREST_TEMPLE_MQ_NW_OUTDOORS,
-  FOREST_TEMPLE_MQ_NE_OUTDOORS,
-  FOREST_TEMPLE_MQ_OUTDOORS_TOP_LEDGES,
-  FOREST_TEMPLE_MQ_NE_OUTDOORS_LEDGE,
-  FOREST_TEMPLE_MQ_BOW_REGION,
-  FOREST_TEMPLE_MQ_FALLING_ROOM,
-  FOREST_TEMPLE_MQ_BOSS_REGION,
-
-  FOREST_TEMPLE_BOSS_ENTRYWAY,
-  FOREST_TEMPLE_BOSS_ROOM,
-
-  FIRE_TEMPLE_FIRST_ROOM,
-  FIRE_TEMPLE_NEAR_BOSS_ROOM,
-  FIRE_TEMPLE_LOOP_ENEMIES,
-  FIRE_TEMPLE_LOOP_TILES,
-  FIRE_TEMPLE_LOOP_FLARE_DANCER,
-  FIRE_TEMPLE_LOOP_HAMMER_SWITCH,
-  FIRE_TEMPLE_LOOP_GORON_ROOM,
-  FIRE_TEMPLE_LOOP_EXIT,
-  FIRE_TEMPLE_BIG_LAVA_ROOM,
-  FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_GORON,
-  FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_TILES,
-  FIRE_TEMPLE_BIG_LAVA_ROOM_SOUTH_GORON,
-  FIRE_TEMPLE_FIRE_PILLAR_ROOM,
-  FIRE_TEMPLE_SHORTCUT_ROOM,
-  FIRE_TEMPLE_SHORTCUT_CLIMB,
-  FIRE_TEMPLE_BOULDER_MAZE_LOWER,
-  FIRE_TEMPLE_BOULDER_MAZE_LOWER_SIDE_ROOM,
-  FIRE_TEMPLE_EAST_CENTRAL_ROOM,
-  FIRE_TEMPLE_FIRE_WALL_CHASE,
-  FIRE_TEMPLE_MAP_AREA,
-  FIRE_TEMPLE_BOULDER_MAZE_UPPER,
-  FIRE_TEMPLE_SCARECROW_ROOM,
-  FIRE_TEMPLE_EAST_PEAK,
-  FIRE_TEMPLE_CORRIDOR,
-  FIRE_TEMPLE_FIRE_MAZE_ROOM,
-  FIRE_TEMPLE_FIRE_MAZE_UPPER,
-  FIRE_TEMPLE_FIRE_MAZE_SIDE_ROOM,
-  FIRE_TEMPLE_WEST_CENTRAL_LOWER,
-  FIRE_TEMPLE_WEST_CENTRAL_UPPER,
-  FIRE_TEMPLE_LATE_FIRE_MAZE,
-  FIRE_TEMPLE_UPPER_FLARE_DANCER,
-  FIRE_TEMPLE_WEST_CLIMB,
-  FIRE_TEMPLE_WEST_PEAK,
-  FIRE_TEMPLE_HAMMER_RETURN_PATH,
-  FIRE_TEMPLE_ABOVE_FIRE_MAZE,
-
-  FIRE_TEMPLE_MQ_LOWER,
-  FIRE_TEMPLE_MQ_LOWER_LOCKED_DOOR,
-  FIRE_TEMPLE_MQ_BIG_LAVA_ROOM,
-  FIRE_TEMPLE_MQ_LOWER_MAZE,
-  FIRE_TEMPLE_MQ_UPPER_MAZE,
-  FIRE_TEMPLE_MQ_UPPER,
-
-  FIRE_TEMPLE_BOSS_ENTRYWAY,
-  FIRE_TEMPLE_BOSS_ROOM,
-
-  WATER_TEMPLE_LOBBY,
-  WATER_TEMPLE_EAST_LOWER,
-  WATER_TEMPLE_MAP_ROOM,
-  WATER_TEMPLE_CRACKED_WALL,
-  WATER_TEMPLE_TORCH_ROOM,
-  WATER_TEMPLE_NORTH_LOWER,
-  WATER_TEMPLE_BOULDERS_LOWER,
-  WATER_TEMPLE_BLOCK_ROOM,
-  WATER_TEMPLE_JETS_ROOM,
-  WATER_TEMPLE_BOULDERS_UPPER,
-  WATER_TEMPLE_BOSS_KEY_ROOM,
-  WATER_TEMPLE_SOUTH_LOWER,
-  WATER_TEMPLE_WEST_LOWER,
-  WATER_TEMPLE_DRAGON_ROOM,
-  WATER_TEMPLE_CENTRAL_PILLAR_LOWER,
-  WATER_TEMPLE_CENTRAL_PILLAR_UPPER,
-  WATER_TEMPLE_CENTRAL_PILLAR_BASEMENT,
-  WATER_TEMPLE_EAST_MIDDLE,
-  WATER_TEMPLE_WEST_MIDDLE,
-  WATER_TEMPLE_HIGH_WATER,
-  WATER_TEMPLE_BLOCK_CORRIDOR,
-  WATER_TEMPLE_FALLING_PLATFORM_ROOM,
-  WATER_TEMPLE_DRAGON_PILLARS_ROOM,
-  WATER_TEMPLE_DARK_LINK_ROOM,
-  WATER_TEMPLE_LONGSHOT_ROOM,
-  WATER_TEMPLE_RIVER,
-  WATER_TEMPLE_PRE_BOSS_ROOM,
-
-  WATER_TEMPLE_MQ_LOBBY,
-  WATER_TEMPLE_MQ_DIVE,
-  WATER_TEMPLE_MQ_LOWERED_WATER_LEVELS,
-  WATER_TEMPLE_MQ_DARK_LINK_REGION,
-  WATER_TEMPLE_MQ_BASEMENT_GATED_AREAS,
-
-  WATER_TEMPLE_BOSS_ENTRYWAY,
-  WATER_TEMPLE_BOSS_ROOM,
-
-  SPIRIT_TEMPLE_LOBBY,
-  SPIRIT_TEMPLE_CHILD,
-  SPIRIT_TEMPLE_CHILD_CLIMB,
-  SPIRIT_TEMPLE_EARLY_ADULT,
-  SPIRIT_TEMPLE_CENTRAL_CHAMBER,
-  SPIRIT_TEMPLE_OUTDOOR_HANDS,
-  SPIRIT_TEMPLE_BEYOND_CENTRAL_LOCKED_DOOR,
-  SPIRIT_TEMPLE_BEYOND_FINAL_LOCKED_DOOR,
-  SPIRIT_TEMPLE_INSIDE_STATUE_HEAD,
-
-  SPIRIT_TEMPLE_MQ_LOBBY,
-  SPIRIT_TEMPLE_MQ_CHILD,
-  SPIRIT_TEMPLE_MQ_ADULT,
-  SPIRIT_TEMPLE_MQ_SHARED,
-  SPIRIT_TEMPLE_MQ_LOWER_ADULT,
-  SPIRIT_TEMPLE_MQ_BOSS_AREA,
-  SPIRIT_TEMPLE_MQ_MIRROR_SHIELD_HAND,
-  SPIRIT_TEMPLE_MQ_SILVER_GAUNTLETS_HAND,
-  SPIRIT_TEMPLE_MQ_INSIDE_STATUE_HEAD,
-
-  SPIRIT_TEMPLE_BOSS_ENTRYWAY,
-  SPIRIT_TEMPLE_BOSS_ROOM,
-
-  SHADOW_TEMPLE_BEGINNING,
-  SHADOW_TEMPLE_FIRST_BEAMOS,
-  SHADOW_TEMPLE_HUGE_PIT,
-  SHADOW_TEMPLE_WIND_TUNNEL,
-  SHADOW_TEMPLE_BEYOND_BOAT,
-
-  SHADOW_TEMPLE_MQ_ENTRYWAY,
-  SHADOW_TEMPLE_MQ_BEGINNING,
-  SHADOW_TEMPLE_MQ_DEAD_HAND_AREA,
-  SHADOW_TEMPLE_MQ_FIRST_BEAMOS,
-  SHADOW_TEMPLE_MQ_UPPER_HUGE_PIT,
-  SHADOW_TEMPLE_MQ_LOWER_HUGE_PIT,
-  SHADOW_TEMPLE_MQ_WIND_TUNNEL,
-  SHADOW_TEMPLE_MQ_BEYOND_BOAT,
-  SHADOW_TEMPLE_MQ_INVISIBLE_MAZE,
-
-  SHADOW_TEMPLE_BOSS_ENTRYWAY,
-  SHADOW_TEMPLE_BOSS_ROOM,
-
-  BOTTOM_OF_THE_WELL_MAIN_AREA,
-
-  BOTTOM_OF_THE_WELL_MQ_PERIMETER,
-  BOTTOM_OF_THE_WELL_MQ_MIDDLE,
-
-  ICE_CAVERN_BEGINNING,
-  ICE_CAVERN_MAIN,
-
-  ICE_CAVERN_MQ_BEGINNING,
-  ICE_CAVERN_MQ_MAP_ROOM,
-  ICE_CAVERN_MQ_IRON_BOOTS_REGION,
-  ICE_CAVERN_MQ_COMPASS_ROOM,
-
-  GERUDO_TRAINING_GROUNDS_LOBBY,
-  GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE,
-  GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE_RIGHT,
-  GERUDO_TRAINING_GROUNDS_LAVA_ROOM,
-  GERUDO_TRAINING_GROUNDS_HAMMER_ROOM,
-  GERUDO_TRAINING_GROUNDS_EYE_STATUE_LOWER,
-  GERUDO_TRAINING_GROUNDS_EYE_STATUE_UPPER,
-  GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_ROOM,
-  GERUDO_TRAINING_GROUNDS_LIKE_LIKE_ROOM,
-
-  GERUDO_TRAINING_GROUNDS_MQ_LOBBY,
-  GERUDO_TRAINING_GROUNDS_MQ_RIGHT_SIDE,
-  GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER,
-  GERUDO_TRAINING_GROUNDS_MQ_LEFT_SIDE,
-  GERUDO_TRAINING_GROUNDS_MQ_STALFOS_ROOM,
-  GERUDO_TRAINING_GROUNDS_MQ_BACK_AREAS,
-  GERUDO_TRAINING_GROUNDS_MQ_CENTRAL_MAZE_RIGHT,
-
-  GANONS_CASTLE_LOBBY,
-  GANONS_CASTLE_DEKU_SCRUBS,
-  GANONS_CASTLE_FOREST_TRIAL,
-  GANONS_CASTLE_FIRE_TRIAL,
-  GANONS_CASTLE_WATER_TRIAL,
-  GANONS_CASTLE_SHADOW_TRIAL,
-  GANONS_CASTLE_SPIRIT_TRIAL,
-  GANONS_CASTLE_LIGHT_TRIAL,
-  GANONS_CASTLE_TOWER,
-
-  GANONS_CASTLE_MQ_LOBBY,
-  GANONS_CASTLE_MQ_DEKU_SCRUBS,
-  GANONS_CASTLE_MQ_FOREST_TRIAL,
-  GANONS_CASTLE_MQ_FIRE_TRIAL,
-  GANONS_CASTLE_MQ_WATER_TRIAL,
-  GANONS_CASTLE_MQ_SHADOW_TRIAL,
-  GANONS_CASTLE_MQ_SPIRIT_TRIAL,
-  GANONS_CASTLE_MQ_LIGHT_TRIAL,
-
-  MARKER_AREAS_END, // Used for area key count
-
-  //DUNGEONS
-  DEKU_TREE,
-  DODONGOS_CAVERN,
-  JABU_JABUS_BELLY,
-  FOREST_TEMPLE,
-  FIRE_TEMPLE,
-  WATER_TEMPLE,
-  SPIRIT_TEMPLE,
-  SHADOW_TEMPLE,
-  BOTTOM_OF_THE_WELL,
-  ICE_CAVERN,
-  GERUDO_TRAINING_GROUNDS,
-  GANONS_CASTLE,
-
-  //HINTS
-  PREFIX,
-  WAY_OF_THE_HERO,
-  PLUNDERING,
-  FOOLISH,
-  CAN_BE_FOUND_AT,
-  HOARDS,
-
-  JUNK02,
-  JUNK03,
-  JUNK04,
-  JUNK05,
-  JUNK06,
-  JUNK07,
-  JUNK08,
-  JUNK09,
-  JUNK10,
-  JUNK11,
-  JUNK12,
-  JUNK13,
-  JUNK14,
-  JUNK15,
-  JUNK16,
-  JUNK17,
-  JUNK18,
-  JUNK19,
-  JUNK20,
-  JUNK21,
-  JUNK22,
-  JUNK23,
-  JUNK24,
-  JUNK25,
-  JUNK26,
-  JUNK27,
-  JUNK28,
-  JUNK29,
-  JUNK30,
-  JUNK31,
-  JUNK32,
-  JUNK33,
-  JUNK34,
-  JUNK35,
-  JUNK36,
-  JUNK37,
-  JUNK38,
-  JUNK39,
-  JUNK40,
-  JUNK41,
-  JUNK42,
-  JUNK43,
-  JUNK44,
-  JUNK45,
-  JUNK46,
-  JUNK47,
-  JUNK48,
-  JUNK49,
-  JUNK50,
-  JUNK51,
-  JUNK52,
-  JUNK53,
-  JUNK54,
-  JUNK55,
-  JUNK56,
-  JUNK57,
-  JUNK58,
-  JUNK59,
-  JUNK60,
-  JUNK61,
-  JUNK62,
-  JUNK63,
-  JUNK64,
-  JUNK65,
-  JUNK66,
-  JUNK67,
-  JUNK68,
-  JUNK69,
-  JUNK70,
-  JUNK71,
-  JUNK72,
-  JUNK73,
-  JUNK74,
-  JUNK75,
-  JUNK76,
-  JUNK77,
-  JUNK78,
-  JUNK79,
-  JUNK80,
-  JUNK81,
-
-  JUNK_WTC_1,
-  JUNK_WTC_2,
-  JUNK_WTC_3,
-  JUNK_WTC_4,
-  JUNK_WTC_5,
-  JUNK_WTC_6,
-  JUNK_WTC_7,
-  JUNK_WTC_8,
-  JUNK_WTC_9,
-  JUNK_WTC_10,
-  JUNK_WTC_11,
-  JUNK_WTC_12,
-
-  JUNK_SEI_1,
-  JUNK_SEI_2,
-  JUNK_SEI_3,
-  JUNK_SEI_4,
-  JUNK_SEI_5,
-  JUNK_SEI_6,
-  JUNK_SEI_7,
-  JUNK_SEI_8,
-  JUNK_SEI_9,
-  JUNK_SEI_10,
-  JUNK_SEI_11,
-  JUNK_SEI_12,
-  JUNK_SEI_13,
-  JUNK_SEI_14,
-  JUNK_SEI_15,
-  JUNK_SEI_16,
-  JUNK_SEI_17,
-  JUNK_SEI_18,
-  JUNK_SEI_19,
-  JUNK_SEI_20,
-  JUNK_SEI_21,
-  JUNK_SEI_22,
-  JUNK_SEI_23,
-  JUNK_SEI_24,
-  JUNK_SEI_25,
-  JUNK_SEI_26,
-  JUNK_SEI_27,
-  JUNK_SEI_28,
-  JUNK_SEI_29,
-
-  JUNK_OTR_MEANS_1,
-  JUNK_OTR_MEANS_2,
-  JUNK_OTR_MEANS_3,
-  JUNK_OTR_MEANS_4,
-  JUNK_OTR_MEANS_5,
-  JUNK_OTR_MEANS_6,
-  JUNK_OTR_MEANS_7,
-  JUNK_OTR_MEANS_8,
-  JUNK_OTR_MEANS_9,
-  JUNK_OTR_MEANS_10,
-  JUNK_OTR_MEANS_11,
-  JUNK_OTR_MEANS_12,
-  JUNK_OTR_MEANS_13,
-  JUNK_OTR_MEANS_14,
-  JUNK_OTR_MEANS_15,
-  JUNK_OTR_MEANS_16,
-  JUNK_OTR_MEANS_17,
-  JUNK_OTR_MEANS_18,
-  JUNK_OTR_MEANS_19,
-  JUNK_OTR_MEANS_20,
-  JUNK_OTR_MEANS_21,
-  JUNK_OTR_MEANS_22,
-  JUNK_OTR_MEANS_23,
-  JUNK_OTR_MEANS_24,
-  JUNK_OTR_MEANS_25,
-  JUNK_OTR_MEANS_26,
-  JUNK_OTR_MEANS_27,
-  JUNK_OTR_MEANS_28,
-  JUNK_OTR_MEANS_29,
-  JUNK_OTR_MEANS_30,
-
-  JUNK_MISC_1,
-  JUNK_MISC_2,
-  JUNK_MISC_3,
-  JUNK_MISC_4,
-  JUNK_MISC_5,
-  JUNK_MISC_6,
-  JUNK_MISC_7,
-  JUNK_MISC_8,
-  JUNK_MISC_9,
-  JUNK_MISC_10,
-  JUNK_MISC_11,
-  JUNK_MISC_12,
-  JUNK_MISC_13,
-  JUNK_MISC_14,
-  JUNK_MISC_15,
-  JUNK_MISC_16,
-  JUNK_MISC_17,
-
-  JUNK_SG_1,
-  JUNK_SG_2,
-  JUNK_SG_3,
-  JUNK_SG_4,
-  JUNK_SG_5,
-  JUNK_SG_6,
-  JUNK_SG_7,
-  JUNK_SG_8,
-
-  BRIDGE_OPEN_HINT,
-  BRIDGE_VANILLA_HINT,
-  BRIDGE_STONES_HINT,
-  BRIDGE_MEDALLIONS_HINT,
-  BRIDGE_REWARDS_HINT,
-  BRIDGE_DUNGEONS_HINT,
-  BRIDGE_TOKENS_HINT,
-  BRIDGE_GREG_HINT,
-
-  GANON_BK_START_WITH_HINT,
-  GANON_BK_VANILLA_HINT,
-  GANON_BK_OWN_DUNGEON_HINT,
-  GANON_BK_OVERWORLD_HINT,
-  GANON_BK_ANY_DUNGEON_HINT,
-  GANON_BK_ANYWHERE_HINT,
-  GANON_BK_TRIFORCE_HINT,
-  GANON_BK_SKULLTULA_HINT,
-
-  LACS_VANILLA_HINT,
-  LACS_STONES_HINT,
-  LACS_MEDALLIONS_HINT,
-  LACS_REWARDS_HINT,
-  LACS_DUNGEONS_HINT,
-  LACS_TOKENS_HINT,
-
-  SIX_TRIALS,
-  ZERO_TRIALS,
-  FOUR_TO_FIVE_TRIALS,
-  ONE_TO_THREE_TRIALS,
-
-  SPIRITUAL_STONE_TEXT_START,
-  CHILD_ALTAR_TEXT_END_DOTOPEN,
-  CHILD_ALTAR_TEXT_END_DOTSONGONLY,
-  CHILD_ALTAR_TEXT_END_DOTCLOSED,
-  ADULT_ALTAR_TEXT_START,
-  ADULT_ALTAR_TEXT_END,
-
-  VALIDATION_LINE,
-  LIGHT_ARROW_LOCATION_HINT,
-  DAMPE_DIARY,
-  YOUR_POCKET,
-
-  GANON_LINE01,
-  GANON_LINE02,
-  GANON_LINE03,
-  GANON_LINE04,
-  GANON_LINE05,
-  GANON_LINE06,
-  GANON_LINE07,
-  GANON_LINE08,
-  GANON_LINE09,
-  GANON_LINE10,
-  GANON_LINE11,
-
-  MEDIGORON_DIALOG_FIRST,
-  MEDIGORON_DIALOG_SECOND,
-  CARPET_SALESMAN_DIALOG_FIRST,
-  CARPET_SALESMAN_DIALOG_SECOND,
-  CARPET_SALESMAN_DIALOG_THIRD,
-  CARPET_SALESMAN_DIALOG_FOURTH,
-  GRANNY_DIALOG,
-
-  KEY_ENUM_MAX,
-} Key;
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
index 6be67ea84..b04bf8207 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
@@ -1,8 +1,8 @@
 #include "location_access.hpp"
 
 #include "dungeon.hpp"
-#include "item_list.hpp"
-#include "item_location.hpp"
+#include "../static_data.h"
+#include "../context.h"
 #include "item_pool.hpp"
 #include "logic.hpp"
 #include "settings.hpp"
@@ -19,7 +19,7 @@ using namespace Settings;
 //generic grotto event list
 std::vector<EventAccess> grottoEvents = {
   EventAccess(&GossipStoneFairy, {[]{return GossipStoneFairy || CanSummonGossipFairy;}}),
-  EventAccess(&ButterflyFairy,   {[]{return ButterflyFairy   || (CanUse(STICKS));}}),
+  EventAccess(&ButterflyFairy,   {[]{return ButterflyFairy   || (CanUse(RG_STICKS));}}),
   EventAccess(&BugShrub,         {[]{return CanCutShrubs;}}),
   EventAccess(&LoneFish,         {[]{return true;}}),
 };
@@ -41,7 +41,7 @@ bool LocationAccess::CheckConditionAtAgeTime(bool& age, bool& time) const {
 
 bool LocationAccess::ConditionsMet() const {
 
-  Area* parentRegion = AreaTable(Location(location)->GetParentRegionKey());
+  Area* parentRegion = AreaTable(Rando::Context::GetInstance()->GetItemLocation(location)->GetParentRegionKey());
   bool conditionsMet = false;
 
   if ((parentRegion->childDay   && CheckConditionAtAgeTime(IsChild, AtDay))   ||
@@ -55,37 +55,39 @@ bool LocationAccess::ConditionsMet() const {
 }
 
 bool LocationAccess::CanBuy() const {
+  auto ctx = Rando::Context::GetInstance();
   //Not a shop location, don't need to check if buyable
-  if (!(Location(location)->IsCategory(Category::cShop))) {
+  if (!(Rando::StaticData::GetLocation(location)->IsCategory(Category::cShop))) {
     return true;
   }
 
   //Check if wallet is large enough to buy item
   bool SufficientWallet = true;
-  if (Location(location)->GetPrice() > 500) {
+  if (ctx->GetItemLocation(location)->GetPrice() > 500) {
     SufficientWallet = ProgressiveWallet >= 3;
-  } else if (Location(location)->GetPrice() > 200) {
+  } else if (ctx->GetItemLocation(location)->GetPrice() > 200) {
     SufficientWallet = ProgressiveWallet >= 2;
-  } else if (Location(location)->GetPrice() > 99) {
+  } else if (ctx->GetItemLocation(location)->GetPrice() > 99) {
     SufficientWallet = ProgressiveWallet >= 1;
   }
 
   bool OtherCondition = true;
-  uint32_t placed = Location(location)->GetPlacedItemKey();
+  RandomizerGet placed = ctx->GetItemLocation(location)->GetPlacedRandomizerGet();
   //Need bottle to buy bottle items, only logically relevant bottle items included here
-  if (placed == BUY_BLUE_FIRE || placed == BUY_BOTTLE_BUG || placed == BUY_FISH || placed == BUY_FAIRYS_SPIRIT) {
-    OtherCondition = HasBottle;
+  if (placed == RG_BUY_BLUE_FIRE || placed == RG_BUY_BOTTLE_BUG || placed == RG_BUY_FISH ||
+      placed == RG_BUY_FAIRYS_SPIRIT) {
+      OtherCondition = HasBottle;
   }
-  //If bombchus in logic, need to have found chus to buy; if not just need bomb bag
-  else if (placed == BUY_BOMBCHU_10 || placed == BUY_BOMBCHU_20) {
-    OtherCondition = (!BombchusInLogic && Bombs) || (BombchusInLogic && FoundBombchus);
+  // If bombchus in logic, need to have found chus to buy; if not just need bomb bag
+  else if (placed == RG_BUY_BOMBCHU_10 || placed == RG_BUY_BOMBCHU_20) {
+      OtherCondition = (!BombchusInLogic && Bombs) || (BombchusInLogic && FoundBombchus);
   }
 
   return SufficientWallet && OtherCondition;
 }
 
 Area::Area() = default;
-Area::Area(std::string regionName_, std::string scene_, uint32_t hintKey_,
+Area::Area(std::string regionName_, std::string scene_, RandomizerHintTextKey hintKey_,
          bool timePass_,
          std::vector<EventAccess> events_,
          std::vector<LocationAccess> locations_,
@@ -106,14 +108,14 @@ bool Area::UpdateEvents(SearchMode mode) {
     if (Child()) {
       childDay = true;
       childNight = true;
-      AreaTable(ROOT)->childDay = true;
-      AreaTable(ROOT)->childNight = true;
+      AreaTable(RR_ROOT)->childDay = true;
+      AreaTable(RR_ROOT)->childNight = true;
     }
     if (Adult()) {
       adultDay = true;
       adultNight = true;
-      AreaTable(ROOT)->adultDay = true;
-      AreaTable(ROOT)->adultNight = true;
+      AreaTable(RR_ROOT)->adultDay = true;
+      AreaTable(RR_ROOT)->adultNight = true;
     }
   }
 
@@ -136,7 +138,7 @@ bool Area::UpdateEvents(SearchMode mode) {
   return eventsUpdated;
 }
 
-void Area::AddExit(uint32_t parentKey, uint32_t newExitKey, ConditionFn condition) {
+void Area::AddExit(RandomizerRegion parentKey, RandomizerRegion newExitKey, ConditionFn condition) {
   Entrance newExit = Entrance(newExitKey, {condition});
   newExit.SetParentRegion(parentKey);
   exits.push_front(newExit);
@@ -147,7 +149,7 @@ void Area::RemoveExit(Entrance* exitToRemove) {
   exits.remove_if([exitToRemove](const auto exit){return &exit == exitToRemove;});
 }
 
-void Area::SetAsPrimary(uint32_t exitToBePrimary) {
+void Area::SetAsPrimary(RandomizerRegion exitToBePrimary) {
   for (auto& exit : exits) {
     if (exit.Getuint32_t() == exitToBePrimary) {
       exit.SetAsPrimary();
@@ -156,7 +158,7 @@ void Area::SetAsPrimary(uint32_t exitToBePrimary) {
   }
 }
 
-Entrance* Area::GetExit(uint32_t exitToReturn) {
+Entrance* Area::GetExit(RandomizerRegion exitToReturn) {
   for (auto& exit : exits) {
     if (exit.Getuint32_t() == exitToReturn) {
       return &exit;
@@ -179,7 +181,7 @@ bool Area::AllAccountedFor() const {
   }
 
   for (const LocationAccess& loc : locations) {
-    if (!(Location(loc.GetLocation())->IsAddedToPool())) {
+    if (!(Rando::Context::GetInstance()->GetItemLocation(loc.GetLocation())->IsAddedToPool())) {
       return false;
     }
   }
@@ -193,13 +195,13 @@ bool Area::AllAccountedFor() const {
   return AllAccess();
 }
 
-bool Area::CheckAllAccess(const uint32_t exitKey) {
+bool Area::CheckAllAccess(const RandomizerRegion exitKey) {
   if (!AllAccess()) {
     return false;
   }
 
   for (Entrance& exit : exits) {
-    if (exit.Getuint32_t() == exitKey) {
+    if (exit.GetConnectedRegionKey() == exitKey) {
       return exit.CheckConditionAtAgeTime(Logic::IsChild, Logic::AtDay)   &&
              exit.CheckConditionAtAgeTime(Logic::IsChild, Logic::AtNight) &&
              exit.CheckConditionAtAgeTime(Logic::IsAdult, Logic::AtDay)   &&
@@ -220,29 +222,29 @@ void Area::ResetVariables() {
   }
 }
 
-std::array<Area, KEY_ENUM_MAX> areaTable;
+std::array<Area, RR_MAX> areaTable;
 
-bool Here(const uint32_t area, ConditionFn condition) {
+bool Here(const RandomizerRegion area, ConditionFn condition) {
   return areaTable[area].HereCheck(condition);
 }
 
-bool CanPlantBean(const uint32_t area) {
+bool CanPlantBean(const RandomizerRegion area) {
   return areaTable[area].CanPlantBeanCheck();
 }
 
-bool BothAges(const uint32_t area) {
+bool BothAges(const RandomizerRegion area) {
   return areaTable[area].BothAgesCheck();
 }
 
-bool ChildCanAccess(const uint32_t area) {
+bool ChildCanAccess(const RandomizerRegion area) {
   return areaTable[area].Child();
 }
 
-bool AdultCanAccess(const uint32_t area) {
+bool AdultCanAccess(const RandomizerRegion area) {
   return areaTable[area].Adult();
 }
 
-bool HasAccessTo(const uint32_t area) {
+bool HasAccessTo(const RandomizerRegion area) {
   return areaTable[area].HasAccess();
 }
 
@@ -251,68 +253,68 @@ bool HasAccessTo(const uint32_t area) {
 void AreaTable_Init() {
   //Clear the array from any previous playthrough attempts. This is important so that
   //locations which appear in both MQ and Vanilla dungeons don't get set in both areas.
-  areaTable.fill(Area("Invalid Area", "Invalid Area", NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {}));
+  areaTable.fill(Area("Invalid Area", "Invalid Area", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {}));
 
                        //name, scene, hint text,                       events, locations, exits
-  areaTable[ROOT] = Area("Root", "", LINKS_POCKET, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_ROOT] = Area("Root", "", RHT_LINKS_POCKET, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(LINKS_POCKET, {[]{return true;}}),
-                  LocationAccess(TRIFORCE_COMPLETED, { [] { return CanCompleteTriforce;}}),
+                  LocationAccess(RC_LINKS_POCKET, {[]{return true;}}),
+                  LocationAccess(RC_TRIFORCE_COMPLETED, { [] { return CanCompleteTriforce;}}),
                 }, {
                   //Exits
-                  Entrance(ROOT_EXITS, {[]{return true;}})
+                  Entrance(RR_ROOT_EXITS, {[]{return true;}})
   });
 
-  areaTable[ROOT_EXITS] = Area("Root Exits", "", NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_ROOT_EXITS] = Area("Root Exits", "", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(CHILD_SPAWN,             {[]{return IsChild;}}),
-                  Entrance(ADULT_SPAWN,             {[]{return IsAdult;}}),
-                  Entrance(MINUET_OF_FOREST_WARP,   {[]{return CanPlay(MinuetOfForest);}}),
-                  Entrance(BOLERO_OF_FIRE_WARP,     {[]{return CanPlay(BoleroOfFire)     && CanLeaveForest;}}),
-                  Entrance(SERENADE_OF_WATER_WARP,  {[]{return CanPlay(SerenadeOfWater)  && CanLeaveForest;}}),
-                  Entrance(NOCTURNE_OF_SHADOW_WARP, {[]{return CanPlay(NocturneOfShadow) && CanLeaveForest;}}),
-                  Entrance(REQUIEM_OF_SPIRIT_WARP,  {[]{return CanPlay(RequiemOfSpirit)  && CanLeaveForest;}}),
-                  Entrance(PRELUDE_OF_LIGHT_WARP,   {[]{return CanPlay(PreludeOfLight)   && CanLeaveForest;}}),
+                  Entrance(RR_CHILD_SPAWN,             {[]{return IsChild;}}),
+                  Entrance(RR_ADULT_SPAWN,             {[]{return IsAdult;}}),
+                  Entrance(RR_MINUET_OF_FOREST_WARP,   {[]{return CanPlay(MinuetOfForest);}}),
+                  Entrance(RR_BOLERO_OF_FIRE_WARP,     {[]{return CanPlay(BoleroOfFire)     && CanLeaveForest;}}),
+                  Entrance(RR_SERENADE_OF_WATER_WARP,  {[]{return CanPlay(SerenadeOfWater)  && CanLeaveForest;}}),
+                  Entrance(RR_NOCTURNE_OF_SHADOW_WARP, {[]{return CanPlay(NocturneOfShadow) && CanLeaveForest;}}),
+                  Entrance(RR_REQUIEM_OF_SPIRIT_WARP,  {[]{return CanPlay(RequiemOfSpirit)  && CanLeaveForest;}}),
+                  Entrance(RR_PRELUDE_OF_LIGHT_WARP,   {[]{return CanPlay(PreludeOfLight)   && CanLeaveForest;}}),
   });
 
-  areaTable[CHILD_SPAWN] = Area("Child Spawn", "", NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_CHILD_SPAWN] = Area("Child Spawn", "", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(KF_LINKS_HOUSE, {[]{return true;}}),
+                  Entrance(RR_KF_LINKS_HOUSE, {[]{return true;}}),
   });
 
-  areaTable[ADULT_SPAWN] = Area("Adult Spawn", "", NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_ADULT_SPAWN] = Area("Adult Spawn", "", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(TEMPLE_OF_TIME, {[]{return true;}}),
+                  Entrance(RR_TEMPLE_OF_TIME, {[]{return true;}}),
   });
 
-  areaTable[MINUET_OF_FOREST_WARP] = Area("Minuet of Forest Warp", "", NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_MINUET_OF_FOREST_WARP] = Area("Minuet of Forest Warp", "", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(SACRED_FOREST_MEADOW, {[]{return true;}}),
+                  Entrance(RR_SACRED_FOREST_MEADOW, {[]{return true;}}),
   });
 
-  areaTable[BOLERO_OF_FIRE_WARP] = Area("Bolero of Fire Warp", "", NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_BOLERO_OF_FIRE_WARP] = Area("Bolero of Fire Warp", "", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(DMC_CENTRAL_LOCAL, {[]{return true;}}),
+                  Entrance(RR_DMC_CENTRAL_LOCAL, {[]{return true;}}),
   });
 
-  areaTable[SERENADE_OF_WATER_WARP] = Area("Serenade of Water Warp", "", NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_SERENADE_OF_WATER_WARP] = Area("Serenade of Water Warp", "", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(LAKE_HYLIA, {[]{return true;}}),
+                  Entrance(RR_LAKE_HYLIA, {[]{return true;}}),
   });
 
-  areaTable[REQUIEM_OF_SPIRIT_WARP] = Area("Requiem of Spirit Warp", "", NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_REQUIEM_OF_SPIRIT_WARP] = Area("Requiem of Spirit Warp", "", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(DESERT_COLOSSUS, {[]{return true;}}),
+                  Entrance(RR_DESERT_COLOSSUS, {[]{return true;}}),
   });
 
-  areaTable[NOCTURNE_OF_SHADOW_WARP] = Area("Nocturne of Shadow Warp", "", NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_NOCTURNE_OF_SHADOW_WARP] = Area("Nocturne of Shadow Warp", "", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(GRAVEYARD_WARP_PAD_REGION, {[]{return true;}}),
+                  Entrance(RR_GRAVEYARD_WARP_PAD_REGION, {[]{return true;}}),
   });
 
-  areaTable[PRELUDE_OF_LIGHT_WARP] = Area("Prelude of Light Warp", "", NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_PRELUDE_OF_LIGHT_WARP] = Area("Prelude of Light Warp", "", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(TEMPLE_OF_TIME, {[]{return true;}}),
+                  Entrance(RR_TEMPLE_OF_TIME, {[]{return true;}}),
   });
 
   // Overworld
@@ -338,13 +340,13 @@ void AreaTable_Init() {
   AreaTable_Init_GanonsCastle();
 
   //Set parent regions
-  for (uint32_t i = ROOT; i <= GANONS_CASTLE; i++) {
+  for (uint32_t i = RR_ROOT; i <= RR_GANONS_CASTLE; i++) {
     for (LocationAccess& locPair : areaTable[i].locations) {
-      uint32_t location = locPair.GetLocation();
-      Location(location)->SetParentRegion(i);
+      RandomizerCheck location = locPair.GetLocation();
+      Rando::Context::GetInstance()->GetItemLocation(location)->SetParentRegion((RandomizerRegion)i);
     }
     for (Entrance& exit : areaTable[i].exits) {
-      exit.SetParentRegion(i);
+      exit.SetParentRegion((RandomizerRegion)i);
       exit.SetName();
       exit.GetConnectedRegion()->entrances.push_front(&exit);
     }
@@ -361,14 +363,14 @@ void AreaTable_Init() {
 namespace Areas {
 
   const auto GetAllAreas() {
-    static const size_t areaCount = MARKER_AREAS_END - (MARKER_AREAS_START + 1);
+    static const size_t areaCount = RR_MAX - (RR_NONE + 1);
 
-    static std::array<uint32_t, areaCount> allAreas = {};
+    static std::array<RandomizerRegion, areaCount> allAreas = {};
 
     static bool intialized = false;
     if (!intialized) {
       for (size_t i = 0; i < areaCount; i++) {
-        allAreas[i] = (MARKER_AREAS_START + 1) + i;
+        allAreas[i] = (RandomizerRegion)((RR_NONE + 1) + i);
       }
       intialized = true;
     }
@@ -377,53 +379,53 @@ namespace Areas {
   }
 
   void AccessReset() {
-      for (const uint32_t area : GetAllAreas()) {
+      for (const RandomizerRegion area : GetAllAreas()) {
       AreaTable(area)->ResetVariables();
     }
 
     if(Settings::HasNightStart) {
         if(Settings::ResolvedStartingAge == AGE_CHILD) {
-          AreaTable(ROOT)->childNight = true;
+          AreaTable(RR_ROOT)->childNight = true;
         } else {
-          AreaTable(ROOT)->adultNight = true;
+          AreaTable(RR_ROOT)->adultNight = true;
         }
       } else {
         if(Settings::ResolvedStartingAge == AGE_CHILD) {
-          AreaTable(ROOT)->childDay = true;
+          AreaTable(RR_ROOT)->childDay = true;
         } else {
-          AreaTable(ROOT)->adultDay = true;
+          AreaTable(RR_ROOT)->adultDay = true;
         }
     }
   }
 
   //Reset exits and clear items from locations
   void ResetAllLocations() {
-      for (const uint32_t area : GetAllAreas()) {
+      for (const RandomizerRegion area : GetAllAreas()) {
       AreaTable(area)->ResetVariables();
       //Erase item from every location in this exit
       for (LocationAccess& locPair : AreaTable(area)->locations) {
-          uint32_t location = locPair.GetLocation();
-          Location(location)->ResetVariables();
+          RandomizerCheck location = locPair.GetLocation();
+          Rando::Context::GetInstance()->GetItemLocation(location)->ResetVariables();
       }
     }
 
     if(Settings::HasNightStart) {
         if(Settings::ResolvedStartingAge == AGE_CHILD) {
-          AreaTable(ROOT)->childNight = true;
+          AreaTable(RR_ROOT)->childNight = true;
         } else {
-          AreaTable(ROOT)->adultNight = true;
+          AreaTable(RR_ROOT)->adultNight = true;
         }
       } else {
         if(Settings::ResolvedStartingAge == AGE_CHILD) {
-          AreaTable(ROOT)->childDay = true;
+          AreaTable(RR_ROOT)->childDay = true;
         } else {
-          AreaTable(ROOT)->adultDay = true;
+          AreaTable(RR_ROOT)->adultDay = true;
         }
     }
   }
 
   bool HasTimePassAccess(uint8_t age) {
-      for (const uint32_t areaKey : GetAllAreas()) {
+      for (const RandomizerRegion areaKey : GetAllAreas()) {
       auto area = AreaTable(areaKey);
       if (area->timePass && ((age == AGE_CHILD && area->Child()) || (age == AGE_ADULT && area->Adult()))) {
         return true;
@@ -441,7 +443,7 @@ namespace Areas {
     worldGraph.open (str + ".dot");
     worldGraph << "digraph {\n\tcenter=true;\n";
 
-    for (const uint32_t areaKey : GetAllAreas()) {
+    for (const RandomizerRegion areaKey : GetAllAreas()) {
       auto area = AreaTable(areaKey);
       for (auto exit : area->exits) {
         if (exit.GetConnectedRegion()->regionName != "Invalid Area") {
@@ -484,8 +486,8 @@ namespace Areas {
 
 } //namespace Areas
 
-Area* AreaTable(const uint32_t areaKey) {
-  if (areaKey > KEY_ENUM_MAX) {
+Area* AreaTable(const RandomizerRegion areaKey) {
+  if (areaKey > RR_MAX) {
     printf("\x1b[1;1HERROR: AREAKEY TOO BIG");
   }
   return &(areaTable[areaKey]);
@@ -494,7 +496,7 @@ Area* AreaTable(const uint32_t areaKey) {
 //Retrieve all the shuffable entrances of a specific type
 std::vector<Entrance*> GetShuffleableEntrances(EntranceType type, bool onlyPrimary /*= true*/) {
   std::vector<Entrance*> entrancesToShuffle = {};
-    for (uint32_t area : Areas::GetAllAreas()) {
+    for (RandomizerRegion area : Areas::GetAllAreas()) {
     for (auto& exit: AreaTable(area)->exits) {
       if ((exit.GetType() == type || type == EntranceType::All) && (exit.IsPrimary() || !onlyPrimary) && exit.GetType() != EntranceType::None) {
         entrancesToShuffle.push_back(&exit);
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access.hpp b/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
index 60529a2f6..54bb39f50 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
@@ -6,7 +6,6 @@
 
 #include "logic.hpp"
 #include "hint_list.hpp"
-#include "keys.hpp"
 #include "fill.hpp"
 
 typedef bool (*ConditionFn)();
@@ -69,7 +68,7 @@ private:
 class LocationAccess {
 public:
 
-    explicit LocationAccess(uint32_t location_, std::vector<ConditionFn> conditions_met_)
+    explicit LocationAccess(RandomizerCheck location_, std::vector<ConditionFn> conditions_met_)
         : location(location_) {
         conditions_met.resize(2);
         for (size_t i = 0; i < conditions_met_.size(); i++) {
@@ -96,12 +95,12 @@ public:
 
     bool ConditionsMet() const;
 
-    uint32_t GetLocation() const {
+    RandomizerCheck GetLocation() const {
         return location;
     }
 
-private:
-    uint32_t location;
+protected:
+    RandomizerCheck location;
     std::vector<ConditionFn> conditions_met;
 
     //Makes sure shop locations are buyable
@@ -114,7 +113,7 @@ enum class EntranceType;
 class Area {
 public:
     Area();
-    Area(std::string regionName_, std::string scene_, uint32_t hintKey_,
+    Area(std::string regionName_, std::string scene_, RandomizerHintTextKey hintKey_,
          bool timePass_,
          std::vector<EventAccess> events_,
          std::vector<LocationAccess> locations_,
@@ -123,7 +122,7 @@ public:
 
     std::string regionName;
     std::string scene;
-    uint32_t     hintKey;
+    RandomizerHintTextKey     hintKey;
     bool        timePass;
     std::vector<EventAccess> events;
     std::vector<LocationAccess> locations;
@@ -143,13 +142,13 @@ public:
 
     bool UpdateEvents(SearchMode mode);
 
-    void AddExit(uint32_t parentKey, uint32_t newExitKey, ConditionFn condition);
+    void AddExit(RandomizerRegion parentKey, RandomizerRegion newExitKey, ConditionFn condition);
 
     void RemoveExit(Entrance* exitToRemove);
 
-    void SetAsPrimary(uint32_t exitToBePrimary);
+    void SetAsPrimary(RandomizerRegion exitToBePrimary);
 
-    Entrance* GetExit(uint32_t exit);
+    Entrance* GetExit(RandomizerRegion exit);
 
     bool Child() const {
       return childDay || childNight;
@@ -172,7 +171,7 @@ public:
     }
 
     //Check to see if an exit can be access as both ages at both times of day
-    bool CheckAllAccess(uint32_t exitKey);
+    bool CheckAllAccess(RandomizerRegion exitKey);
 
     const HintText& GetHint() const {
       return Hint(hintKey);
@@ -218,15 +217,15 @@ public:
     }
 };
 
-extern std::array<Area, KEY_ENUM_MAX> areaTable;
+extern std::array<Area, RR_MAX> areaTable;
 extern std::vector<EventAccess> grottoEvents;
 
-bool Here(const AreaKey area, ConditionFn condition);
-bool CanPlantBean(const AreaKey area);
-bool BothAges(const AreaKey area);
-bool ChildCanAccess(const AreaKey area);
-bool AdultCanAccess(const AreaKey area);
-bool HasAccessTo(const AreaKey area);
+bool Here(const RandomizerRegion area, ConditionFn condition);
+bool CanPlantBean(const RandomizerRegion area);
+bool BothAges(const RandomizerRegion area);
+bool ChildCanAccess(const RandomizerRegion area);
+bool AdultCanAccess(const RandomizerRegion area);
+bool HasAccessTo(const RandomizerRegion area);
 
 #define DAY_NIGHT_CYCLE true
 #define NO_DAY_NIGHT_CYCLE false
@@ -240,7 +239,7 @@ namespace Areas {
 } //namespace Exits
 
 void  AreaTable_Init();
-Area* AreaTable(const uint32_t areaKey);
+Area* AreaTable(const RandomizerRegion areaKey);
 std::vector<Entrance*> GetShuffleableEntrances(EntranceType type, bool onlyPrimary = true);
 
 // Overworld
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_bottom_of_the_well.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_bottom_of_the_well.cpp
index 6dce03ee1..31cbf7c44 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_bottom_of_the_well.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_bottom_of_the_well.cpp
@@ -10,43 +10,43 @@ void AreaTable_Init_BottomOfTheWell() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[BOTTOM_OF_THE_WELL_ENTRYWAY] = Area("Bottom of the Well Entryway", "Bottom of the Well", BOTTOM_OF_THE_WELL, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_BOTTOM_OF_THE_WELL_ENTRYWAY] = Area("Bottom of the Well Entryway", "Bottom of the Well", RHT_BOTTOM_OF_THE_WELL, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(BOTTOM_OF_THE_WELL_MAIN_AREA,    {[]{return Dungeon::BottomOfTheWell.IsVanilla() && IsChild && (CanChildAttack || Nuts);}}),
-                  Entrance(BOTTOM_OF_THE_WELL_MQ_PERIMETER, {[]{return Dungeon::BottomOfTheWell.IsMQ()      && IsChild;}}),
-                  Entrance(KAKARIKO_VILLAGE,                {[]{return true;}}),
+                  Entrance(RR_BOTTOM_OF_THE_WELL_MAIN_AREA,    {[]{return Dungeon::BottomOfTheWell.IsVanilla() && IsChild && (CanChildAttack || Nuts);}}),
+                  Entrance(RR_BOTTOM_OF_THE_WELL_MQ_PERIMETER, {[]{return Dungeon::BottomOfTheWell.IsMQ()      && IsChild;}}),
+                  Entrance(RR_KAKARIKO_VILLAGE,                {[]{return true;}}),
   });
 
   /*--------------------------
   |     VANILLA DUNGEON      |
   ---------------------------*/
   if (Dungeon::BottomOfTheWell.IsVanilla()) {
-  areaTable[BOTTOM_OF_THE_WELL_MAIN_AREA] = Area("Bottom of the Well Main Area", "Bottom of the Well", BOTTOM_OF_THE_WELL, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_BOTTOM_OF_THE_WELL_MAIN_AREA] = Area("Bottom of the Well Main Area", "Bottom of the Well", RHT_BOTTOM_OF_THE_WELL, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&StickPot, {[]{return true;}}),
                   EventAccess(&NutPot,   {[]{return true;}}),
                 }, {
                   //Locations
-                  LocationAccess(BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST,   {[]{return LogicLensBotw || CanUse(LENS_OF_TRUTH);}}),
-                  LocationAccess(BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST,  {[]{return HasExplosives;}}),
-                  LocationAccess(BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST, {[]{return LogicLensBotw || CanUse(LENS_OF_TRUTH);}}),
-                  LocationAccess(BOTTOM_OF_THE_WELL_COMPASS_CHEST,                {[]{return LogicLensBotw || CanUse(LENS_OF_TRUTH);}}),
-                  LocationAccess(BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST,       {[]{return LogicLensBotw || CanUse(LENS_OF_TRUTH);}}),
-                  LocationAccess(BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST,     {[]{return (LogicLensBotw || CanUse(LENS_OF_TRUTH)) && HasExplosives;}}),
-                  LocationAccess(BOTTOM_OF_THE_WELL_FREESTANDING_KEY,             {[]{return Sticks || CanUse(DINS_FIRE);}}),
-                  LocationAccess(BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST,          {[]{return CanPlay(ZeldasLullaby) && (KokiriSword || (Sticks && LogicChildDeadhand));}}),
-                  LocationAccess(BOTTOM_OF_THE_WELL_INVISIBLE_CHEST,              {[]{return CanPlay(ZeldasLullaby) && (LogicLensBotw || CanUse(LENS_OF_TRUTH));}}),
-                  LocationAccess(BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST,       {[]{return CanPlay(ZeldasLullaby);}}),
-                  LocationAccess(BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST,        {[]{return CanPlay(ZeldasLullaby);}}),
-                  LocationAccess(BOTTOM_OF_THE_WELL_MAP_CHEST,                    {[]{return HasExplosives || (((SmallKeys(BOTTOM_OF_THE_WELL, 3) && (LogicLensBotw || CanUse(LENS_OF_TRUTH))) || CanUse(DINS_FIRE) || (Sticks && LogicBotwBasement)) && GoronBracelet);}}),
-                  LocationAccess(BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST,             {[]{return SmallKeys(BOTTOM_OF_THE_WELL, 3) && (LogicLensBotw || CanUse(LENS_OF_TRUTH));}}),
-                  LocationAccess(BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST,              {[]{return SmallKeys(BOTTOM_OF_THE_WELL, 3) && (LogicLensBotw || CanUse(LENS_OF_TRUTH));}}),
-                  LocationAccess(BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM,           {[]{return Boomerang && (LogicLensBotw || CanUse(LENS_OF_TRUTH)) && SmallKeys(BOTTOM_OF_THE_WELL, 3);}}),
-                  LocationAccess(BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM,           {[]{return Boomerang && (LogicLensBotw || CanUse(LENS_OF_TRUTH)) && SmallKeys(BOTTOM_OF_THE_WELL, 3);}}),
-                  LocationAccess(BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE,            {[]{return SmallKeys(BOTTOM_OF_THE_WELL, 3) && (LogicLensBotw || CanUse(LENS_OF_TRUTH)) && Boomerang;}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST,   {[]{return LogicLensBotw || CanUse(RG_LENS_OF_TRUTH);}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST,  {[]{return HasExplosives;}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST, {[]{return LogicLensBotw || CanUse(RG_LENS_OF_TRUTH);}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_COMPASS_CHEST,                {[]{return LogicLensBotw || CanUse(RG_LENS_OF_TRUTH);}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST,       {[]{return LogicLensBotw || CanUse(RG_LENS_OF_TRUTH);}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST,     {[]{return (LogicLensBotw || CanUse(RG_LENS_OF_TRUTH)) && HasExplosives;}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_FREESTANDING_KEY,             {[]{return Sticks || CanUse(RG_DINS_FIRE);}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST,          {[]{return CanPlay(ZeldasLullaby) && (KokiriSword || (Sticks && LogicChildDeadhand));}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST,              {[]{return CanPlay(ZeldasLullaby) && (LogicLensBotw || CanUse(RG_LENS_OF_TRUTH));}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST,       {[]{return CanPlay(ZeldasLullaby);}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST,        {[]{return CanPlay(ZeldasLullaby);}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_MAP_CHEST,                    {[]{return HasExplosives || (((SmallKeys(RR_BOTTOM_OF_THE_WELL, 3) && (LogicLensBotw || CanUse(RG_LENS_OF_TRUTH))) || CanUse(RG_DINS_FIRE) || (Sticks && LogicBotwBasement)) && GoronBracelet);}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST,             {[]{return SmallKeys(RR_BOTTOM_OF_THE_WELL, 3) && (LogicLensBotw || CanUse(RG_LENS_OF_TRUTH));}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST,              {[]{return SmallKeys(RR_BOTTOM_OF_THE_WELL, 3) && (LogicLensBotw || CanUse(RG_LENS_OF_TRUTH));}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM,           {[]{return Boomerang && (LogicLensBotw || CanUse(RG_LENS_OF_TRUTH)) && SmallKeys(RR_BOTTOM_OF_THE_WELL, 3);}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM,           {[]{return Boomerang && (LogicLensBotw || CanUse(RG_LENS_OF_TRUTH)) && SmallKeys(RR_BOTTOM_OF_THE_WELL, 3);}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE,            {[]{return SmallKeys(RR_BOTTOM_OF_THE_WELL, 3) && (LogicLensBotw || CanUse(RG_LENS_OF_TRUTH)) && Boomerang;}}),
                 }, {
                   //Exits
-                  Entrance(BOTTOM_OF_THE_WELL_ENTRYWAY, {[]{return true;}}),
+                  Entrance(RR_BOTTOM_OF_THE_WELL_ENTRYWAY, {[]{return true;}}),
   });
   }
 
@@ -54,33 +54,33 @@ void AreaTable_Init_BottomOfTheWell() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (Dungeon::BottomOfTheWell.IsMQ()) {
-  areaTable[BOTTOM_OF_THE_WELL_MQ_PERIMETER] = Area("Bottom of the Well MQ Perimeter", "Bottom of the Well", BOTTOM_OF_THE_WELL, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_BOTTOM_OF_THE_WELL_MQ_PERIMETER] = Area("Bottom of the Well MQ Perimeter", "Bottom of the Well", RHT_BOTTOM_OF_THE_WELL, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   //EventAccess(&WallFairy, {[]{return WallFairy || Slingshot;}}),
   }, {
                   //Locations
-                  LocationAccess(BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST,              {[]{return KokiriSword || (Sticks && LogicChildDeadhand);}}),
-                  LocationAccess(BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY, {[]{return HasExplosives || (LogicBotwMQDeadHandKey && Boomerang);}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST,              {[]{return KokiriSword || (Sticks && LogicChildDeadhand);}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY, {[]{return HasExplosives || (LogicBotwMQDeadHandKey && Boomerang);}}),
                     //Trick: HasExplosives || (LogicBotWMQDeadHandKey && Boomerang)
-                  LocationAccess(BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT,                {[]{return CanChildAttack;}}),
-                  LocationAccess(BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM,             {[]{return CanChildAttack && SmallKeys(BOTTOM_OF_THE_WELL, 2);}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT,                {[]{return CanChildAttack;}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM,             {[]{return CanChildAttack && SmallKeys(RR_BOTTOM_OF_THE_WELL, 2);}}),
   }, {
                   //Exits
-                  Entrance(BOTTOM_OF_THE_WELL_ENTRYWAY,  {[]{return true;}}),
-                  Entrance(BOTTOM_OF_THE_WELL_MQ_MIDDLE, {[]{return CanPlay(ZeldasLullaby) || (LogicBotwMQPits && HasExplosives);}}),
+                  Entrance(RR_BOTTOM_OF_THE_WELL_ENTRYWAY,  {[]{return true;}}),
+                  Entrance(RR_BOTTOM_OF_THE_WELL_MQ_MIDDLE, {[]{return CanPlay(ZeldasLullaby) || (LogicBotwMQPits && HasExplosives);}}),
                     //Trick: CanPlay(ZeldasLullaby) || (LogicBotWMQPits && HasExplosives)
   });
 
-  areaTable[BOTTOM_OF_THE_WELL_MQ_MIDDLE] = Area("Bottom of the Well MQ Middle", "Bottom of the Well", BOTTOM_OF_THE_WELL, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_BOTTOM_OF_THE_WELL_MQ_MIDDLE] = Area("Bottom of the Well MQ Middle", "Bottom of the Well", RHT_BOTTOM_OF_THE_WELL, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(BOTTOM_OF_THE_WELL_MQ_MAP_CHEST,                        {[]{return true;}}),
-                  LocationAccess(BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST,              {[]{return HasExplosives && SmallKeys(BOTTOM_OF_THE_WELL, 2);}}),
-                  LocationAccess(BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY, {[]{return true;}}),
-                  LocationAccess(BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM,               {[]{return CanChildAttack && (LogicBotwMQPits || HasExplosives);}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_MQ_MAP_CHEST,                        {[]{return true;}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST,              {[]{return HasExplosives && SmallKeys(RR_BOTTOM_OF_THE_WELL, 2);}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY, {[]{return true;}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM,               {[]{return CanChildAttack && (LogicBotwMQPits || HasExplosives);}}),
                     //Trick: CanChildAttack && (LogicBotWMQPits || HasExplosives)
   }, {
                   //Exits
-                  Entrance(BOTTOM_OF_THE_WELL_MQ_PERIMETER, {[]{return true;}}),
+                  Entrance(RR_BOTTOM_OF_THE_WELL_MQ_PERIMETER, {[]{return true;}}),
   });
   }
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
index 6691ac2f2..b69787769 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
@@ -6,267 +6,267 @@ using namespace Logic;
 using namespace Settings;
 
 void AreaTable_Init_CastleTown() {
-  areaTable[MARKET_ENTRANCE] = Area("Market Entrance", "Market Entrance", THE_MARKET, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_MARKET_ENTRANCE] = Area("Market Entrance", "Market Entrance", RHT_THE_MARKET, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(HYRULE_FIELD,       {[]{return IsAdult || AtDay;}}),
-                  Entrance(THE_MARKET,         {[]{return true;}}),
-                  Entrance(MARKET_GUARD_HOUSE, {[]{return true;}}),
+                  Entrance(RR_HYRULE_FIELD,       {[]{return IsAdult || AtDay;}}),
+                  Entrance(RR_THE_MARKET,         {[]{return true;}}),
+                  Entrance(RR_MARKET_GUARD_HOUSE, {[]{return true;}}),
   });
 
-  areaTable[THE_MARKET] = Area("Market", "Market", THE_MARKET, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_THE_MARKET] = Area("Market", "Market", RHT_THE_MARKET, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(MARKET_ENTRANCE,            {[]{return true;}}),
-                  Entrance(TOT_ENTRANCE,               {[]{return true;}}),
-                  Entrance(CASTLE_GROUNDS,             {[]{return true;}}),
-                  Entrance(MARKET_BAZAAR,              {[]{return IsChild && AtDay;}}),
-                  Entrance(MARKET_MASK_SHOP,           {[]{return IsChild && AtDay;}}),
-                  Entrance(MARKET_SHOOTING_GALLERY,    {[]{return IsChild && AtDay;}}),
-                  Entrance(MARKET_BOMBCHU_BOWLING,     {[]{return IsChild;}}),
-                  Entrance(MARKET_TREASURE_CHEST_GAME, {[]{return IsChild && AtNight;}}),
-                  Entrance(MARKET_POTION_SHOP,         {[]{return IsChild && AtDay;}}),
-                  Entrance(MARKET_BACK_ALLEY,          {[]{return IsChild;}}),
+                  Entrance(RR_MARKET_ENTRANCE,            {[]{return true;}}),
+                  Entrance(RR_TOT_ENTRANCE,               {[]{return true;}}),
+                  Entrance(RR_CASTLE_GROUNDS,             {[]{return true;}}),
+                  Entrance(RR_MARKET_BAZAAR,              {[]{return IsChild && AtDay;}}),
+                  Entrance(RR_MARKET_MASK_SHOP,           {[]{return IsChild && AtDay;}}),
+                  Entrance(RR_MARKET_SHOOTING_GALLERY,    {[]{return IsChild && AtDay;}}),
+                  Entrance(RR_MARKET_BOMBCHU_BOWLING,     {[]{return IsChild;}}),
+                  Entrance(RR_MARKET_TREASURE_CHEST_GAME, {[]{return IsChild && AtNight;}}),
+                  Entrance(RR_MARKET_POTION_SHOP,         {[]{return IsChild && AtDay;}}),
+                  Entrance(RR_MARKET_BACK_ALLEY,          {[]{return IsChild;}}),
   });
 
-  areaTable[MARKET_BACK_ALLEY] = Area("Market Back Alley", "Market", THE_MARKET, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_MARKET_BACK_ALLEY] = Area("Market Back Alley", "Market", RHT_THE_MARKET, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(THE_MARKET,                 {[]{return true;}}),
-                  Entrance(MARKET_BOMBCHU_SHOP,        {[]{return AtNight;}}),
-                  Entrance(MARKET_DOG_LADY_HOUSE,      {[]{return true;}}),
-                  Entrance(MARKET_MAN_IN_GREEN_HOUSE,  {[]{return AtNight;}}),
+                  Entrance(RR_THE_MARKET,                 {[]{return true;}}),
+                  Entrance(RR_MARKET_BOMBCHU_SHOP,        {[]{return AtNight;}}),
+                  Entrance(RR_MARKET_DOG_LADY_HOUSE,      {[]{return true;}}),
+                  Entrance(RR_MARKET_MAN_IN_GREEN_HOUSE,  {[]{return AtNight;}}),
   });
 
-  areaTable[TOT_ENTRANCE] = Area("ToT Entrance", "ToT Entrance", THE_MARKET, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_TOT_ENTRANCE] = Area("ToT Entrance", "ToT Entrance", RHT_THE_MARKET, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&GossipStoneFairy, {[]{return GossipStoneFairy || CanSummonGossipFairyWithoutSuns;}}),
                 }, {
                   //Locations
-                  LocationAccess(TOT_GOSSIP_STONE_LEFT,         {[]{return true;}}),
-                  LocationAccess(TOT_GOSSIP_STONE_LEFT_CENTER,  {[]{return true;}}),
-                  LocationAccess(TOT_GOSSIP_STONE_RIGHT_CENTER, {[]{return true;}}),
-                  LocationAccess(TOT_GOSSIP_STONE_RIGHT,        {[]{return true;}}),
+                  LocationAccess(RC_TOT_LEFT_GOSSIP_STONE,         {[]{return true;}}),
+                  LocationAccess(RC_TOT_LEFT_CENTER_GOSSIP_STONE,  {[]{return true;}}),
+                  LocationAccess(RC_TOT_RIGHT_CENTER_GOSSIP_STONE, {[]{return true;}}),
+                  LocationAccess(RC_TOT_RIGHT_GOSSIP_STONE,        {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(THE_MARKET,  {[]{return true;}}),
-                  Entrance(TEMPLE_OF_TIME, {[]{return true;}}),
+                  Entrance(RR_THE_MARKET,  {[]{return true;}}),
+                  Entrance(RR_TEMPLE_OF_TIME, {[]{return true;}}),
   });
 
-  areaTable[TEMPLE_OF_TIME] = Area("Temple of Time", "Temple of Time", TEMPLE_OF_TIME, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_TEMPLE_OF_TIME] = Area("Temple of Time", "Temple of Time", RHT_TEMPLE_OF_TIME, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(TOT_LIGHT_ARROWS_CUTSCENE, {[]{return IsAdult && CanTriggerLACS;}}),
+                  LocationAccess(RC_TOT_LIGHT_ARROWS_CUTSCENE, {[]{return IsAdult && CanTriggerLACS;}}),
                 }, {
                   //Exits
-                  Entrance(TOT_ENTRANCE,            {[]{return true;}}),
-                  Entrance(TOT_BEYOND_DOOR_OF_TIME, {[]{return OpenDoorOfTime.Is(OPENDOOROFTIME_OPEN) || (CanPlay(SongOfTime) && (OpenDoorOfTime.Is(OPENDOOROFTIME_SONGONLY) || (HasAllStones && OcarinaOfTime)));}}),
+                  Entrance(RR_TOT_ENTRANCE,            {[]{return true;}}),
+                  Entrance(RR_TOT_BEYOND_DOOR_OF_TIME, {[]{return OpenDoorOfTime.Is(OPENDOOROFTIME_OPEN) || (CanPlay(SongOfTime) && (OpenDoorOfTime.Is(OPENDOOROFTIME_SONGONLY) || (HasAllStones && OcarinaOfTime)));}}),
   });
 
-  areaTable[TOT_BEYOND_DOOR_OF_TIME] = Area("Beyond Door of Time", "Beyond Door of Time", TEMPLE_OF_TIME, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_TOT_BEYOND_DOOR_OF_TIME] = Area("Beyond Door of Time", "Beyond Door of Time", RHT_TEMPLE_OF_TIME, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   //EventAccess(&TimeTravel, {[]{return true;}}),
                 }, {
                   //Locations
-                  LocationAccess(SHEIK_AT_TEMPLE, {[]{return ForestMedallion && IsAdult;}}),
+                  LocationAccess(RC_SHEIK_AT_TEMPLE, {[]{return ForestMedallion && IsAdult;}}),
                 }, {
                   //Exits
-                  Entrance(TEMPLE_OF_TIME, {[]{return true;}}),
+                  Entrance(RR_TEMPLE_OF_TIME, {[]{return true;}}),
   });
 
-  areaTable[CASTLE_GROUNDS] = Area("Castle Grounds", "Castle Grounds", NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_CASTLE_GROUNDS] = Area("Castle Grounds", "Castle Grounds", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(THE_MARKET,            {[]{return true;}}),
-                  Entrance(HYRULE_CASTLE_GROUNDS, {[]{return IsChild;}}),
-                  Entrance(GANONS_CASTLE_GROUNDS, {[]{return IsAdult;}}),
+                  Entrance(RR_THE_MARKET,            {[]{return true;}}),
+                  Entrance(RR_HYRULE_CASTLE_GROUNDS, {[]{return IsChild;}}),
+                  Entrance(RR_GANONS_CASTLE_GROUNDS, {[]{return IsAdult;}}),
   });
 
-  areaTable[HYRULE_CASTLE_GROUNDS] = Area("Hyrule Castle Grounds", "Castle Grounds", HYRULE_CASTLE, DAY_NIGHT_CYCLE, {
+  areaTable[RR_HYRULE_CASTLE_GROUNDS] = Area("Hyrule Castle Grounds", "Castle Grounds", RHT_HYRULE_CASTLE, DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&GossipStoneFairy, {[]{return GossipStoneFairy || CanSummonGossipFairy;}}),
-                  EventAccess(&ButterflyFairy,   {[]{return ButterflyFairy   || CanUse(STICKS);}}),
+                  EventAccess(&ButterflyFairy,   {[]{return ButterflyFairy   || CanUse(RG_STICKS);}}),
                   EventAccess(&BugRock,          {[]{return true;}}),
                 }, {
                   //Locations
-                  LocationAccess(HC_MALON_EGG,              {[]{return true;}}),
-                  LocationAccess(HC_GS_TREE,                {[]{return CanChildAttack;}}),
-                  LocationAccess(HC_MALON_GOSSIP_STONE,     {[]{return true;}}),
-                  LocationAccess(HC_ROCK_WALL_GOSSIP_STONE, {[]{return true;}}),
+                  LocationAccess(RC_HC_MALON_EGG,              {[]{return true;}}),
+                  LocationAccess(RC_HC_GS_TREE,                {[]{return CanChildAttack;}}),
+                  LocationAccess(RC_HC_MALON_GOSSIP_STONE,     {[]{return true;}}),
+                  LocationAccess(RC_HC_ROCK_WALL_GOSSIP_STONE, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(CASTLE_GROUNDS,          {[]{return true;}}),
-                  Entrance(HC_GARDEN,               {[]{return WeirdEgg || !ShuffleWeirdEgg;}}),
-                  Entrance(HC_GREAT_FAIRY_FOUNTAIN, {[]{return CanBlastOrSmash;}}),
-                  Entrance(HC_STORMS_GROTTO,        {[]{return CanOpenStormGrotto;}}),
+                  Entrance(RR_CASTLE_GROUNDS,          {[]{return true;}}),
+                  Entrance(RR_HC_GARDEN,               {[]{return WeirdEgg || !ShuffleWeirdEgg;}}),
+                  Entrance(RR_HC_GREAT_FAIRY_FOUNTAIN, {[]{return CanBlastOrSmash;}}),
+                  Entrance(RR_HC_STORMS_GROTTO,        {[]{return CanOpenStormGrotto;}}),
   });
 
-  areaTable[HC_GARDEN] = Area("HC Garden", "Castle Grounds", HYRULE_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_HC_GARDEN] = Area("HC Garden", "Castle Grounds", RHT_HYRULE_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                 }, {
                   //Locations
-                  LocationAccess(HC_ZELDAS_LETTER, {[]{return true;}}),
-                  LocationAccess(SONG_FROM_IMPA,   {[]{return true;}}),
+                  LocationAccess(RC_HC_ZELDAS_LETTER, {[]{return true;}}),
+                  LocationAccess(RC_SONG_FROM_IMPA,   {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(HYRULE_CASTLE_GROUNDS, {[]{return true;}}),
+                  Entrance(RR_HYRULE_CASTLE_GROUNDS, {[]{return true;}}),
   });
 
-  areaTable[HC_GREAT_FAIRY_FOUNTAIN] = Area("HC Great Fairy Fountain", "HC Great Fairy Fountain", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_HC_GREAT_FAIRY_FOUNTAIN] = Area("HC Great Fairy Fountain", "HC Great Fairy Fountain", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(HC_GREAT_FAIRY_REWARD, {[]{return CanPlay(ZeldasLullaby);}}),
+                  LocationAccess(RC_HC_GREAT_FAIRY_REWARD, {[]{return CanPlay(ZeldasLullaby);}}),
                 }, {
                   //Exits
-                  Entrance(CASTLE_GROUNDS, {[]{return true;}}),
+                  Entrance(RR_CASTLE_GROUNDS, {[]{return true;}}),
   });
 
-  areaTable[HC_STORMS_GROTTO] = Area("HC Storms Grotto", "HC Storms Grotto", NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_HC_STORMS_GROTTO] = Area("HC Storms Grotto", "HC Storms Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&NutPot,           {[]{return NutPot           || CanBlastOrSmash;}}),
                   EventAccess(&GossipStoneFairy, {[]{return GossipStoneFairy || (CanBlastOrSmash && CanSummonGossipFairy);}}),
                   EventAccess(&WanderingBugs,    {[]{return WanderingBugs    || CanBlastOrSmash;}}),
                 }, {
                   //Locations
-                  LocationAccess(HC_GS_STORMS_GROTTO,           {[]{return (CanBlastOrSmash && HookshotOrBoomerang) || (Boomerang && LogicCastleStormsGS);}}),
-                  LocationAccess(HC_STORMS_GROTTO_GOSSIP_STONE, {[]{return CanBlastOrSmash;}}),
+                  LocationAccess(RC_HC_GS_STORMS_GROTTO,           {[]{return (CanBlastOrSmash && HookshotOrBoomerang) || (Boomerang && LogicCastleStormsGS);}}),
+                  LocationAccess(RC_HC_STORMS_GROTTO_GOSSIP_STONE, {[]{return CanBlastOrSmash;}}),
                 }, {
                   //Exits
-                  Entrance(CASTLE_GROUNDS, {[]{return true;}}),
+                  Entrance(RR_CASTLE_GROUNDS, {[]{return true;}}),
   });
 
-  areaTable[GANONS_CASTLE_GROUNDS] = Area("Ganon's Castle Grounds", "Castle Grounds", OUTSIDE_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_GROUNDS] = Area("Ganon's Castle Grounds", "Castle Grounds", RHT_OUTSIDE_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   EventAccess(&BuiltRainbowBridge, {[]{return CanBuildRainbowBridge;}}),
                 }, {
                   //Locations                                   //the terrain was lowered such that you can't get this GS with a simple sword slash
-                  LocationAccess(OGC_GS, {[]{return CanJumpslash || CanUseProjectile
-                  || (CanShield && CanUse(MEGATON_HAMMER)) || CanUse(DINS_FIRE);}}),
+                  LocationAccess(RC_OGC_GS, {[]{return CanJumpslash || CanUseProjectile
+                  || (CanShield && CanUse(RG_MEGATON_HAMMER)) || CanUse(RG_DINS_FIRE);}}),
                 }, {
                   //Exits
-                  Entrance(CASTLE_GROUNDS,           {[]{return AtNight;}}),
-                  Entrance(OGC_GREAT_FAIRY_FOUNTAIN, {[]{return CanUse(GOLDEN_GAUNTLETS) && AtNight;}}),
-                  Entrance(GANONS_CASTLE_LEDGE,      {[]{return BuiltRainbowBridge;}}),
+                  Entrance(RR_CASTLE_GROUNDS,           {[]{return AtNight;}}),
+                  Entrance(RR_OGC_GREAT_FAIRY_FOUNTAIN, {[]{return CanUse(RG_GOLDEN_GAUNTLETS) && AtNight;}}),
+                  Entrance(RR_GANONS_CASTLE_LEDGE,      {[]{return BuiltRainbowBridge;}}),
   });
 
-  areaTable[OGC_GREAT_FAIRY_FOUNTAIN] = Area("OGC Great Fairy Fountain", "OGC Great Fairy Fountain", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_OGC_GREAT_FAIRY_FOUNTAIN] = Area("OGC Great Fairy Fountain", "OGC Great Fairy Fountain", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(OGC_GREAT_FAIRY_REWARD, {[]{return CanPlay(ZeldasLullaby);}}),
+                  LocationAccess(RC_OGC_GREAT_FAIRY_REWARD, {[]{return CanPlay(ZeldasLullaby);}}),
                 }, {
                   //Exits
-                  Entrance(CASTLE_GROUNDS, {[]{return true;}}),
+                  Entrance(RR_CASTLE_GROUNDS, {[]{return true;}}),
   });
 
-  areaTable[CASTLE_GROUNDS_FROM_GANONS_CASTLE] = Area("Castle Grounds From Ganon's Castle", "Castle Grounds From Ganon's Castle", NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_CASTLE_GROUNDS_FROM_GANONS_CASTLE] = Area("Castle Grounds From Ganon's Castle", "Castle Grounds From Ganon's Castle", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
     // Exits
-    Entrance(HYRULE_CASTLE_GROUNDS, { [] { return IsChild; }}),
-    Entrance(GANONS_CASTLE_LEDGE, { [] { return IsAdult; }}),
+    Entrance(RR_HYRULE_CASTLE_GROUNDS, { [] { return IsChild; }}),
+    Entrance(RR_GANONS_CASTLE_LEDGE, { [] { return IsAdult; }}),
   });
 
-  areaTable[GANONS_CASTLE_LEDGE] = Area("Ganon's Castle Ledge", "OGC Ganon's Castle Ledge", NONE, NO_DAY_NIGHT_CYCLE,
+  areaTable[RR_GANONS_CASTLE_LEDGE] = Area("Ganon's Castle Ledge", "OGC Ganon's Castle Ledge", RHT_NONE, NO_DAY_NIGHT_CYCLE,
   {}, {}, {
     // Exits
-    Entrance(GANONS_CASTLE_GROUNDS, {[]{return BuiltRainbowBridge;}}),
-    Entrance(GANONS_CASTLE_ENTRYWAY, {[]{return IsAdult;}}),
+    Entrance(RR_GANONS_CASTLE_GROUNDS, {[]{return BuiltRainbowBridge;}}),
+    Entrance(RR_GANONS_CASTLE_ENTRYWAY, {[]{return IsAdult;}}),
   });
 
-  areaTable[MARKET_GUARD_HOUSE] = Area("Market Guard House", "Market Guard House", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_MARKET_GUARD_HOUSE] = Area("Market Guard House", "Market Guard House", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(MARKET_10_BIG_POES,    {[]{return IsAdult && BigPoeKill;}}),
-                  LocationAccess(MARKET_GS_GUARD_HOUSE, {[]{return IsChild;}}),
+                  LocationAccess(RC_MARKET_10_BIG_POES,    {[]{return IsAdult && BigPoeKill;}}),
+                  LocationAccess(RC_MARKET_GS_GUARD_HOUSE, {[]{return IsChild;}}),
                 }, {
                   //Exits
-                  Entrance(MARKET_ENTRANCE, {[]{return true;}}),
+                  Entrance(RR_MARKET_ENTRANCE, {[]{return true;}}),
   });
 
-  areaTable[MARKET_BAZAAR] = Area("Market Bazaar", "Market Bazaar", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_MARKET_BAZAAR] = Area("Market Bazaar", "Market Bazaar", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(MARKET_BAZAAR_ITEM_1, {[]{return true;}}),
-                  LocationAccess(MARKET_BAZAAR_ITEM_2, {[]{return true;}}),
-                  LocationAccess(MARKET_BAZAAR_ITEM_3, {[]{return true;}}),
-                  LocationAccess(MARKET_BAZAAR_ITEM_4, {[]{return true;}}),
-                  LocationAccess(MARKET_BAZAAR_ITEM_5, {[]{return true;}}),
-                  LocationAccess(MARKET_BAZAAR_ITEM_6, {[]{return true;}}),
-                  LocationAccess(MARKET_BAZAAR_ITEM_7, {[]{return true;}}),
-                  LocationAccess(MARKET_BAZAAR_ITEM_8, {[]{return true;}}),
+                  LocationAccess(RC_MARKET_BAZAAR_ITEM_1, {[]{return true;}}),
+                  LocationAccess(RC_MARKET_BAZAAR_ITEM_2, {[]{return true;}}),
+                  LocationAccess(RC_MARKET_BAZAAR_ITEM_3, {[]{return true;}}),
+                  LocationAccess(RC_MARKET_BAZAAR_ITEM_4, {[]{return true;}}),
+                  LocationAccess(RC_MARKET_BAZAAR_ITEM_5, {[]{return true;}}),
+                  LocationAccess(RC_MARKET_BAZAAR_ITEM_6, {[]{return true;}}),
+                  LocationAccess(RC_MARKET_BAZAAR_ITEM_7, {[]{return true;}}),
+                  LocationAccess(RC_MARKET_BAZAAR_ITEM_8, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(THE_MARKET, {[]{return true;}}),
+                  Entrance(RR_THE_MARKET, {[]{return true;}}),
   });
 
-  areaTable[MARKET_MASK_SHOP] = Area("Market Mask Shop", "Market Mask Shop", NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_MARKET_MASK_SHOP] = Area("Market Mask Shop", "Market Mask Shop", RHT_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&SkullMask,   {[]{return SkullMask   || (ZeldasLetter && (CompleteMaskQuest ||  ChildCanAccess(KAKARIKO_VILLAGE)));}}),
-                  EventAccess(&MaskOfTruth, {[]{return MaskOfTruth || (SkullMask && (CompleteMaskQuest || (ChildCanAccess(THE_LOST_WOODS) && CanPlay(SariasSong) && AreaTable(THE_GRAVEYARD)->childDay && ChildCanAccess(HYRULE_FIELD) && HasAllStones)));}}),
+                  EventAccess(&SkullMask,   {[]{return SkullMask   || (ZeldasLetter && (CompleteMaskQuest ||  ChildCanAccess(RR_KAKARIKO_VILLAGE)));}}),
+                  EventAccess(&MaskOfTruth, {[]{return MaskOfTruth || (SkullMask && (CompleteMaskQuest || (ChildCanAccess(RR_THE_LOST_WOODS) && CanPlay(SariasSong) && AreaTable(RR_THE_GRAVEYARD)->childDay && ChildCanAccess(RR_HYRULE_FIELD) && HasAllStones)));}}),
                 }, {}, {
                   //Exits
-                  Entrance(THE_MARKET, {[]{return true;}}),
+                  Entrance(RR_THE_MARKET, {[]{return true;}}),
   });
 
-  areaTable[MARKET_SHOOTING_GALLERY] = Area("Market Shooting Gallery", "Market Shooting Gallery", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_MARKET_SHOOTING_GALLERY] = Area("Market Shooting Gallery", "Market Shooting Gallery", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(MARKET_SHOOTING_GALLERY_REWARD, {[]{return IsChild;}}),
+                  LocationAccess(RC_MARKET_SHOOTING_GALLERY_REWARD, {[]{return IsChild;}}),
                 }, {
                   //Exits
-                  Entrance(THE_MARKET, {[]{return true;}}),
+                  Entrance(RR_THE_MARKET, {[]{return true;}}),
   });
 
-  areaTable[MARKET_BOMBCHU_BOWLING] = Area("Market Bombchu Bowling", "Market Bombchu Bowling", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_MARKET_BOMBCHU_BOWLING] = Area("Market Bombchu Bowling", "Market Bombchu Bowling", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,  {[]{return CanPlayBowling;}}),
-                  LocationAccess(MARKET_BOMBCHU_BOWLING_SECOND_PRIZE, {[]{return CanPlayBowling;}}),
-                  LocationAccess(MARKET_BOMBCHU_BOWLING_BOMBCHUS,     {[]{return CanPlayBowling;}}),
+                  LocationAccess(RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,  {[]{return CanPlayBowling;}}),
+                  LocationAccess(RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE, {[]{return CanPlayBowling;}}),
+                  LocationAccess(RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS,     {[]{return CanPlayBowling;}}),
                 }, {
                   //Exits
-                  Entrance(THE_MARKET, {[]{return true;}}),
+                  Entrance(RR_THE_MARKET, {[]{return true;}}),
   });
 
-  areaTable[MARKET_POTION_SHOP] = Area("Market Potion Shop", "Market Potion Shop", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_MARKET_POTION_SHOP] = Area("Market Potion Shop", "Market Potion Shop", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(MARKET_POTION_SHOP_ITEM_1, {[]{return true;}}),
-                  LocationAccess(MARKET_POTION_SHOP_ITEM_2, {[]{return true;}}),
-                  LocationAccess(MARKET_POTION_SHOP_ITEM_3, {[]{return true;}}),
-                  LocationAccess(MARKET_POTION_SHOP_ITEM_4, {[]{return true;}}),
-                  LocationAccess(MARKET_POTION_SHOP_ITEM_5, {[]{return true;}}),
-                  LocationAccess(MARKET_POTION_SHOP_ITEM_6, {[]{return true;}}),
-                  LocationAccess(MARKET_POTION_SHOP_ITEM_7, {[]{return true;}}),
-                  LocationAccess(MARKET_POTION_SHOP_ITEM_8, {[]{return true;}}),
+                  LocationAccess(RC_MARKET_POTION_SHOP_ITEM_1, {[]{return true;}}),
+                  LocationAccess(RC_MARKET_POTION_SHOP_ITEM_2, {[]{return true;}}),
+                  LocationAccess(RC_MARKET_POTION_SHOP_ITEM_3, {[]{return true;}}),
+                  LocationAccess(RC_MARKET_POTION_SHOP_ITEM_4, {[]{return true;}}),
+                  LocationAccess(RC_MARKET_POTION_SHOP_ITEM_5, {[]{return true;}}),
+                  LocationAccess(RC_MARKET_POTION_SHOP_ITEM_6, {[]{return true;}}),
+                  LocationAccess(RC_MARKET_POTION_SHOP_ITEM_7, {[]{return true;}}),
+                  LocationAccess(RC_MARKET_POTION_SHOP_ITEM_8, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(THE_MARKET, {[]{return true;}}),
+                  Entrance(RR_THE_MARKET, {[]{return true;}}),
   });
 
-  areaTable[MARKET_TREASURE_CHEST_GAME] = Area("Market Treasure Chest Game", "Market Treasure Chest Game", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_MARKET_TREASURE_CHEST_GAME] = Area("Market Treasure Chest Game", "Market Treasure Chest Game", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(MARKET_TREASURE_CHEST_GAME_REWARD, {[]{return (CanUse(LENS_OF_TRUTH) && !ShuffleChestMinigame) || (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_SINGLE_KEYS) && SmallKeys(MARKET_TREASURE_CHEST_GAME, 6)) || (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_PACK) && SmallKeys(MARKET_TREASURE_CHEST_GAME, 1));}}),
-                  LocationAccess(MARKET_TREASURE_CHEST_GAME_ITEM_1, {[]{return (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_SINGLE_KEYS) && SmallKeys(MARKET_TREASURE_CHEST_GAME, 1)) || (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_PACK) && SmallKeys(MARKET_TREASURE_CHEST_GAME, 1)) || (CanUse(LENS_OF_TRUTH) && !ShuffleChestMinigame);}}),
-                  LocationAccess(MARKET_TREASURE_CHEST_GAME_ITEM_2, {[]{return (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_SINGLE_KEYS) && SmallKeys(MARKET_TREASURE_CHEST_GAME, 2)) || (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_PACK) && SmallKeys(MARKET_TREASURE_CHEST_GAME, 1)) || (CanUse(LENS_OF_TRUTH) && !ShuffleChestMinigame);}}),
-                  LocationAccess(MARKET_TREASURE_CHEST_GAME_ITEM_3, {[]{return (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_SINGLE_KEYS) && SmallKeys(MARKET_TREASURE_CHEST_GAME, 3)) || (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_PACK) && SmallKeys(MARKET_TREASURE_CHEST_GAME, 1)) || (CanUse(LENS_OF_TRUTH) && !ShuffleChestMinigame);}}),
-                  LocationAccess(MARKET_TREASURE_CHEST_GAME_ITEM_4, {[]{return (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_SINGLE_KEYS) && SmallKeys(MARKET_TREASURE_CHEST_GAME, 4)) || (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_PACK) && SmallKeys(MARKET_TREASURE_CHEST_GAME, 1)) || (CanUse(LENS_OF_TRUTH) && !ShuffleChestMinigame);}}),
-                  LocationAccess(MARKET_TREASURE_CHEST_GAME_ITEM_5, {[]{return (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_SINGLE_KEYS) && SmallKeys(MARKET_TREASURE_CHEST_GAME, 5)) || (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_PACK) && SmallKeys(MARKET_TREASURE_CHEST_GAME, 1)) || (CanUse(LENS_OF_TRUTH) && !ShuffleChestMinigame);}}),
+                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_REWARD, {[]{return (CanUse(RG_LENS_OF_TRUTH) && !ShuffleChestMinigame) || (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_SINGLE_KEYS) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 6)) || (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_PACK) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1));}}),
+                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_1, {[]{return (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_SINGLE_KEYS) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_PACK) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (CanUse(RG_LENS_OF_TRUTH) && !ShuffleChestMinigame);}}),
+                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_2, {[]{return (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_SINGLE_KEYS) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 2)) || (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_PACK) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (CanUse(RG_LENS_OF_TRUTH) && !ShuffleChestMinigame);}}),
+                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_3, {[]{return (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_SINGLE_KEYS) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 3)) || (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_PACK) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (CanUse(RG_LENS_OF_TRUTH) && !ShuffleChestMinigame);}}),
+                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_4, {[]{return (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_SINGLE_KEYS) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 4)) || (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_PACK) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (CanUse(RG_LENS_OF_TRUTH) && !ShuffleChestMinigame);}}),
+                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_5, {[]{return (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_SINGLE_KEYS) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 5)) || (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_PACK) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (CanUse(RG_LENS_OF_TRUTH) && !ShuffleChestMinigame);}}),
                 }, {
                   //Exits
-                  Entrance(THE_MARKET, {[]{return true;}}),
+                  Entrance(RR_THE_MARKET, {[]{return true;}}),
   });
 
-  areaTable[MARKET_BOMBCHU_SHOP] = Area("Market Bombchu Shop", "Market Bombchu Shop", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_MARKET_BOMBCHU_SHOP] = Area("Market Bombchu Shop", "Market Bombchu Shop", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(MARKET_BOMBCHU_SHOP_ITEM_1, {[]{return true;}}),
-                  LocationAccess(MARKET_BOMBCHU_SHOP_ITEM_2, {[]{return true;}}),
-                  LocationAccess(MARKET_BOMBCHU_SHOP_ITEM_3, {[]{return true;}}),
-                  LocationAccess(MARKET_BOMBCHU_SHOP_ITEM_4, {[]{return true;}}),
-                  LocationAccess(MARKET_BOMBCHU_SHOP_ITEM_5, {[]{return true;}}),
-                  LocationAccess(MARKET_BOMBCHU_SHOP_ITEM_6, {[]{return true;}}),
-                  LocationAccess(MARKET_BOMBCHU_SHOP_ITEM_7, {[]{return true;}}),
-                  LocationAccess(MARKET_BOMBCHU_SHOP_ITEM_8, {[]{return true;}}),
+                  LocationAccess(RC_MARKET_BOMBCHU_SHOP_ITEM_1, {[]{return true;}}),
+                  LocationAccess(RC_MARKET_BOMBCHU_SHOP_ITEM_2, {[]{return true;}}),
+                  LocationAccess(RC_MARKET_BOMBCHU_SHOP_ITEM_3, {[]{return true;}}),
+                  LocationAccess(RC_MARKET_BOMBCHU_SHOP_ITEM_4, {[]{return true;}}),
+                  LocationAccess(RC_MARKET_BOMBCHU_SHOP_ITEM_5, {[]{return true;}}),
+                  LocationAccess(RC_MARKET_BOMBCHU_SHOP_ITEM_6, {[]{return true;}}),
+                  LocationAccess(RC_MARKET_BOMBCHU_SHOP_ITEM_7, {[]{return true;}}),
+                  LocationAccess(RC_MARKET_BOMBCHU_SHOP_ITEM_8, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(MARKET_BACK_ALLEY, {[]{return true;}}),
+                  Entrance(RR_MARKET_BACK_ALLEY, {[]{return true;}}),
   });
 
-  areaTable[MARKET_DOG_LADY_HOUSE] = Area("Market Dog Lady House", "Market Dog Lady House", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_MARKET_DOG_LADY_HOUSE] = Area("Market Dog Lady House", "Market Dog Lady House", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(MARKET_LOST_DOG, {[]{return IsChild && AtNight;}}),
+                  LocationAccess(RC_MARKET_LOST_DOG, {[]{return IsChild && AtNight;}}),
                 }, {
                   //Exits
-                  Entrance(MARKET_BACK_ALLEY, {[]{return true;}}),
+                  Entrance(RR_MARKET_BACK_ALLEY, {[]{return true;}}),
   });
 
-  areaTable[MARKET_MAN_IN_GREEN_HOUSE] = Area("Market Man in Green House", "Market Man in Green House", NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_MARKET_MAN_IN_GREEN_HOUSE] = Area("Market Man in Green House", "Market Man in Green House", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(MARKET_BACK_ALLEY, {[]{return true;}}),
+                  Entrance(RR_MARKET_BACK_ALLEY, {[]{return true;}}),
   });
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
index b52be650e..19556e07b 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
@@ -6,255 +6,255 @@ using namespace Logic;
 using namespace Settings;
 
 void AreaTable_Init_DeathMountain() {
-  areaTable[DEATH_MOUNTAIN_TRAIL] = Area("Death Mountain", "Death Mountain", DEATH_MOUNTAIN_TRAIL, DAY_NIGHT_CYCLE, {
+  areaTable[RR_DEATH_MOUNTAIN_TRAIL] = Area("Death Mountain", "Death Mountain", RHT_DEATH_MOUNTAIN_TRAIL, DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&BeanPlantFairy, {[]{return BeanPlantFairy || (CanPlantBean(DEATH_MOUNTAIN_TRAIL) && CanPlay(SongOfStorms) && (HasExplosives || GoronBracelet));}}),
+                  EventAccess(&BeanPlantFairy, {[]{return BeanPlantFairy || (CanPlantBean(RR_DEATH_MOUNTAIN_TRAIL) && CanPlay(SongOfStorms) && (HasExplosives || GoronBracelet));}}),
                 }, {
                   //Locations
-                  LocationAccess(DMT_CHEST,                    {[]{return CanBlastOrSmash || (LogicDMTBombable && IsChild && GoronBracelet);}}),
-                  LocationAccess(DMT_FREESTANDING_POH,         {[]{return CanTakeDamage || CanUse(HOVER_BOOTS) || (IsAdult && CanPlantBean(DEATH_MOUNTAIN_TRAIL) && (HasExplosives || GoronBracelet));}}),
-                  LocationAccess(DMT_GS_BEAN_PATCH,            {[]{return CanPlantBugs && (HasExplosives || GoronBracelet || (LogicDMTSoilGS && (CanTakeDamage || CanUse(HOVER_BOOTS)) && CanUse(BOOMERANG)));}}),
-                  LocationAccess(DMT_GS_NEAR_KAK,              {[]{return CanBlastOrSmash;}}),
-                  LocationAccess(DMT_GS_ABOVE_DODONGOS_CAVERN, {[]{return IsAdult && AtNight && (CanUse(MEGATON_HAMMER) || (LogicDMTGSLowerHookshot && CanUse(HOOKSHOT)) || (LogicDMTGSLowerBean && CanPlantBean(DEATH_MOUNTAIN_TRAIL)) || (LogicDMTGSLowerHovers && CanUse(HOVER_BOOTS)) || LogicDMTGSLowerJS) && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_DMT_CHEST,                    {[]{return CanBlastOrSmash || (LogicDMTBombable && IsChild && GoronBracelet);}}),
+                  LocationAccess(RC_DMT_FREESTANDING_POH,         {[]{return CanTakeDamage || CanUse(RG_HOVER_BOOTS) || (IsAdult && CanPlantBean(RR_DEATH_MOUNTAIN_TRAIL) && (HasExplosives || GoronBracelet));}}),
+                  LocationAccess(RC_DMT_GS_BEAN_PATCH,            {[]{return CanPlantBugs && (HasExplosives || GoronBracelet || (LogicDMTSoilGS && (CanTakeDamage || CanUse(RG_HOVER_BOOTS)) && CanUse(RG_BOOMERANG)));}}),
+                  LocationAccess(RC_DMT_GS_NEAR_KAK,              {[]{return CanBlastOrSmash;}}),
+                  LocationAccess(RC_DMT_GS_ABOVE_DODONGOS_CAVERN, {[]{return IsAdult && AtNight && (CanUse(RG_MEGATON_HAMMER) || (LogicDMTGSLowerHookshot && CanUse(RG_HOOKSHOT)) || (LogicDMTGSLowerBean && CanPlantBean(RR_DEATH_MOUNTAIN_TRAIL)) || (LogicDMTGSLowerHovers && CanUse(RG_HOVER_BOOTS)) || LogicDMTGSLowerJS) && CanGetNightTimeGS;}}),
                 }, {
                   //Exits
-                  Entrance(KAK_BEHIND_GATE,          {[]{return true;}}),
-                  Entrance(GORON_CITY,               {[]{return true;}}),
-                  Entrance(DEATH_MOUNTAIN_SUMMIT,    {[]{return Here(DEATH_MOUNTAIN_TRAIL, []{return CanBlastOrSmash;}) || (IsAdult && ((CanPlantBean(DEATH_MOUNTAIN_TRAIL) && GoronBracelet) || (HoverBoots && LogicDMTClimbHovers)));}}),
-                  Entrance(DODONGOS_CAVERN_ENTRYWAY, {[]{return HasExplosives || GoronBracelet || IsAdult;}}),
-                  Entrance(DMT_STORMS_GROTTO,        {[]{return CanOpenStormGrotto;}}),
+                  Entrance(RR_KAK_BEHIND_GATE,          {[]{return true;}}),
+                  Entrance(RR_GORON_CITY,               {[]{return true;}}),
+                  Entrance(RR_DEATH_MOUNTAIN_SUMMIT,    {[]{return Here(RR_DEATH_MOUNTAIN_TRAIL, []{return CanBlastOrSmash;}) || (IsAdult && ((CanPlantBean(RR_DEATH_MOUNTAIN_TRAIL) && GoronBracelet) || (HoverBoots && LogicDMTClimbHovers)));}}),
+                  Entrance(RR_DODONGOS_CAVERN_ENTRYWAY, {[]{return HasExplosives || GoronBracelet || IsAdult;}}),
+                  Entrance(RR_DMT_STORMS_GROTTO,        {[]{return CanOpenStormGrotto;}}),
   });
 
-  areaTable[DEATH_MOUNTAIN_SUMMIT] = Area("Death Mountain Summit", "Death Mountain", DEATH_MOUNTAIN_TRAIL, DAY_NIGHT_CYCLE, {
+  areaTable[RR_DEATH_MOUNTAIN_SUMMIT] = Area("Death Mountain Summit", "Death Mountain", RHT_DEATH_MOUNTAIN_TRAIL, DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&PrescriptionAccess, {[]{return PrescriptionAccess || (IsAdult && (BrokenSwordAccess || BrokenSword));}}),
                   EventAccess(&GossipStoneFairy,   {[]{return GossipStoneFairy   || CanSummonGossipFairy;}}),
                   EventAccess(&BugRock,            {[]{return BugRock            || IsChild;}}),
                 }, {
                   //Locations
-                  LocationAccess(DMT_TRADE_BROKEN_SWORD,    {[]{return IsAdult && BrokenSword;}}),
-                  LocationAccess(DMT_TRADE_EYEDROPS,        {[]{return IsAdult && Eyedrops;}}),
-                  LocationAccess(DMT_TRADE_CLAIM_CHECK,     {[]{return IsAdult && ClaimCheck;}}),
-                  LocationAccess(DMT_GS_FALLING_ROCKS_PATH, {[]{return IsAdult && AtNight && (CanUse(MEGATON_HAMMER) || LogicDMTGSUpper) && CanGetNightTimeGS;}}),
-                  LocationAccess(DMT_GOSSIP_STONE,          {[]{return true;}}),
+                  LocationAccess(RC_DMT_TRADE_BROKEN_SWORD,    {[]{return IsAdult && BrokenSword;}}),
+                  LocationAccess(RC_DMT_TRADE_EYEDROPS,        {[]{return IsAdult && Eyedrops;}}),
+                  LocationAccess(RC_DMT_TRADE_CLAIM_CHECK,     {[]{return IsAdult && ClaimCheck;}}),
+                  LocationAccess(RC_DMT_GS_FALLING_ROCKS_PATH, {[]{return IsAdult && AtNight && (CanUse(RG_MEGATON_HAMMER) || LogicDMTGSUpper) && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_DMT_GOSSIP_STONE,          {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(DEATH_MOUNTAIN_TRAIL,     {[]{return true;}}),
-                  Entrance(DMC_UPPER_LOCAL,          {[]{return true;}}),
-                  Entrance(DMT_OWL_FLIGHT,           {[]{return IsChild;}}),
-                  Entrance(DMT_COW_GROTTO,           {[]{return Here(DEATH_MOUNTAIN_SUMMIT, []{return CanBlastOrSmash;});}}),
-                  Entrance(DMT_GREAT_FAIRY_FOUNTAIN, {[]{return Here(DEATH_MOUNTAIN_SUMMIT, []{return CanBlastOrSmash;});}}),
+                  Entrance(RR_DEATH_MOUNTAIN_TRAIL,     {[]{return true;}}),
+                  Entrance(RR_DMC_UPPER_LOCAL,          {[]{return true;}}),
+                  Entrance(RR_DMT_OWL_FLIGHT,           {[]{return IsChild;}}),
+                  Entrance(RR_DMT_COW_GROTTO,           {[]{return Here(RR_DEATH_MOUNTAIN_SUMMIT, []{return CanBlastOrSmash;});}}),
+                  Entrance(RR_DMT_GREAT_FAIRY_FOUNTAIN, {[]{return Here(RR_DEATH_MOUNTAIN_SUMMIT, []{return CanBlastOrSmash;});}}),
   });
 
-  areaTable[DMT_OWL_FLIGHT] = Area("DMT Owl Flight", "Death Mountain", NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DMT_OWL_FLIGHT] = Area("DMT Owl Flight", "Death Mountain", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(KAK_IMPAS_ROOFTOP, {[]{return true;}}),
+                  Entrance(RR_KAK_IMPAS_ROOFTOP, {[]{return true;}}),
   });
 
-  areaTable[DMT_COW_GROTTO] = Area("DMT Cow Grotto", "DMT Cow Grotto", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DMT_COW_GROTTO] = Area("DMT Cow Grotto", "DMT Cow Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(DMT_COW_GROTTO_COW, {[]{return CanPlay(EponasSong);}}),
+                  LocationAccess(RC_DMT_COW_GROTTO_COW, {[]{return CanPlay(EponasSong);}}),
                 }, {
                   //Exits
-                  Entrance(DEATH_MOUNTAIN_SUMMIT, {[]{return true;}}),
+                  Entrance(RR_DEATH_MOUNTAIN_SUMMIT, {[]{return true;}}),
 
   });
 
-  areaTable[DMT_STORMS_GROTTO] = Area("DMT Storms Grotto", "DMT Storms Grotto", NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+  areaTable[RR_DMT_STORMS_GROTTO] = Area("DMT Storms Grotto", "DMT Storms Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
-                  LocationAccess(DMT_STORMS_GROTTO_CHEST,        {[]{return true;}}),
-                  LocationAccess(DMT_STORMS_GROTTO_GOSSIP_STONE, {[]{return true;}}),
+                  LocationAccess(RC_DMT_STORMS_GROTTO_CHEST,        {[]{return true;}}),
+                  LocationAccess(RC_DMT_STORMS_GROTTO_GOSSIP_STONE, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(DEATH_MOUNTAIN_TRAIL, {[]{return true;}}),
+                  Entrance(RR_DEATH_MOUNTAIN_TRAIL, {[]{return true;}}),
   });
 
-  areaTable[DMT_GREAT_FAIRY_FOUNTAIN] = Area("DMT Great Fairy Fountain", "DMT Great Fairy Fountain", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DMT_GREAT_FAIRY_FOUNTAIN] = Area("DMT Great Fairy Fountain", "DMT Great Fairy Fountain", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(DMT_GREAT_FAIRY_REWARD, {[]{return CanPlay(ZeldasLullaby);}}),
+                  LocationAccess(RC_DMT_GREAT_FAIRY_REWARD, {[]{return CanPlay(ZeldasLullaby);}}),
                 }, {
                   //Exits
-                  Entrance(DEATH_MOUNTAIN_SUMMIT, {[]{return true;}}),
+                  Entrance(RR_DEATH_MOUNTAIN_SUMMIT, {[]{return true;}}),
   });
 
-  areaTable[GORON_CITY] = Area("Goron City", "Goron City", GORON_CITY, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GORON_CITY] = Area("Goron City", "Goron City", RHT_GORON_CITY, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&GossipStoneFairy,          {[]{return GossipStoneFairy          || CanSummonGossipFairyWithoutSuns;}}),
                   EventAccess(&StickPot,                  {[]{return StickPot                  || IsChild;}}),
-                  EventAccess(&BugRock,                   {[]{return BugRock                   || (CanBlastOrSmash || CanUse(SILVER_GAUNTLETS));}}),
-                  EventAccess(&GoronCityChildFire,        {[]{return GoronCityChildFire        || (IsChild && CanUse(DINS_FIRE));}}),
-                  EventAccess(&GCWoodsWarpOpen,           {[]{return GCWoodsWarpOpen           || (CanBlastOrSmash || CanUse(DINS_FIRE) || CanUse(BOW) || GoronBracelet || GoronCityChildFire);}}),
+                  EventAccess(&BugRock,                   {[]{return BugRock                   || (CanBlastOrSmash || CanUse(RG_SILVER_GAUNTLETS));}}),
+                  EventAccess(&GoronCityChildFire,        {[]{return GoronCityChildFire        || (IsChild && CanUse(RG_DINS_FIRE));}}),
+                  EventAccess(&GCWoodsWarpOpen,           {[]{return GCWoodsWarpOpen           || (CanBlastOrSmash || CanUse(RG_DINS_FIRE) || CanUse(RG_FAIRY_BOW) || GoronBracelet || GoronCityChildFire);}}),
                   EventAccess(&GCDaruniasDoorOpenChild,   {[]{return GCDaruniasDoorOpenChild   || (IsChild && CanPlay(ZeldasLullaby));}}),
-                  EventAccess(&StopGCRollingGoronAsAdult, {[]{return StopGCRollingGoronAsAdult || (IsAdult && (GoronBracelet || HasExplosives || Bow || (LogicGoronCityLinkGoronDins && CanUse(DINS_FIRE))));}}),
+                  EventAccess(&StopGCRollingGoronAsAdult, {[]{return StopGCRollingGoronAsAdult || (IsAdult && (GoronBracelet || HasExplosives || Bow || (LogicGoronCityLinkGoronDins && CanUse(RG_DINS_FIRE))));}}),
                 }, {
                   //Locations
-                  LocationAccess(GC_MAZE_LEFT_CHEST,        {[]{return CanUse(MEGATON_HAMMER) || CanUse(SILVER_GAUNTLETS) || (LogicGoronCityLeftMost && HasExplosives && CanUse(HOVER_BOOTS));}}),
-                  LocationAccess(GC_MAZE_CENTER_CHEST,      {[]{return CanBlastOrSmash  || CanUse(SILVER_GAUNTLETS);}}),
-                  LocationAccess(GC_MAZE_RIGHT_CHEST,       {[]{return CanBlastOrSmash  || CanUse(SILVER_GAUNTLETS);}}),
-                  LocationAccess(GC_POT_FREESTANDING_POH,   {[]{return IsChild && GoronCityChildFire && (Bombs || (GoronBracelet && LogicGoronCityPotWithStrength) || (HasBombchus && LogicGoronCityPot));}}),
-                  LocationAccess(GC_ROLLING_GORON_AS_CHILD, {[]{return IsChild && (HasExplosives || (GoronBracelet && LogicChildRollingWithStrength));}}),
-                  LocationAccess(GC_ROLLING_GORON_AS_ADULT, {[]{return StopGCRollingGoronAsAdult;}}),
-                  LocationAccess(GC_GS_BOULDER_MAZE,        {[]{return IsChild && CanBlastOrSmash;}}),
-                  LocationAccess(GC_GS_CENTER_PLATFORM,     {[]{return IsAdult;}}),
-                  LocationAccess(GC_MEDIGORON,              {[]{return IsAdult && AdultsWallet && (CanBlastOrSmash || GoronBracelet);}}),
-                  LocationAccess(GC_MAZE_GOSSIP_STONE,      {[]{return CanBlastOrSmash || CanUse(SILVER_GAUNTLETS);}}),
-                  LocationAccess(GC_MEDIGORON_GOSSIP_STONE, {[]{return CanBlastOrSmash || GoronBracelet;}}),
+                  LocationAccess(RC_GC_MAZE_LEFT_CHEST,        {[]{return CanUse(RG_MEGATON_HAMMER) || CanUse(RG_SILVER_GAUNTLETS) || (LogicGoronCityLeftMost && HasExplosives && CanUse(RG_HOVER_BOOTS));}}),
+                  LocationAccess(RC_GC_MAZE_CENTER_CHEST,      {[]{return CanBlastOrSmash  || CanUse(RG_SILVER_GAUNTLETS);}}),
+                  LocationAccess(RC_GC_MAZE_RIGHT_CHEST,       {[]{return CanBlastOrSmash  || CanUse(RG_SILVER_GAUNTLETS);}}),
+                  LocationAccess(RC_GC_POT_FREESTANDING_POH,   {[]{return IsChild && GoronCityChildFire && (Bombs || (GoronBracelet && LogicGoronCityPotWithStrength) || (HasBombchus && LogicGoronCityPot));}}),
+                  LocationAccess(RC_GC_ROLLING_GORON_AS_CHILD, {[]{return IsChild && (HasExplosives || (GoronBracelet && LogicChildRollingWithStrength));}}),
+                  LocationAccess(RC_GC_ROLLING_GORON_AS_ADULT, {[]{return StopGCRollingGoronAsAdult;}}),
+                  LocationAccess(RC_GC_GS_BOULDER_MAZE,        {[]{return IsChild && CanBlastOrSmash;}}),
+                  LocationAccess(RC_GC_GS_CENTER_PLATFORM,     {[]{return IsAdult;}}),
+                  LocationAccess(RC_GC_MEDIGORON,              {[]{return IsAdult && AdultsWallet && (CanBlastOrSmash || GoronBracelet);}}),
+                  LocationAccess(RC_GC_MAZE_GOSSIP_STONE,      {[]{return CanBlastOrSmash || CanUse(RG_SILVER_GAUNTLETS);}}),
+                  LocationAccess(RC_GC_MEDIGORON_GOSSIP_STONE, {[]{return CanBlastOrSmash || GoronBracelet;}}),
                 }, {
                   //Exits
-                  Entrance(DEATH_MOUNTAIN_TRAIL, {[]{return true;}}),
-                  Entrance(GC_WOODS_WARP,        {[]{return GCWoodsWarpOpen;}}),
-                  Entrance(GC_SHOP,              {[]{return (IsAdult && StopGCRollingGoronAsAdult) || (IsChild && (CanBlastOrSmash || GoronBracelet || GoronCityChildFire || CanUse(BOW)));}}),
-                  Entrance(GC_DARUNIAS_CHAMBER,  {[]{return (IsAdult && StopGCRollingGoronAsAdult) || GCDaruniasDoorOpenChild;}}),
-                  Entrance(GC_GROTTO_PLATFORM,   {[]{return IsAdult && ((CanPlay(SongOfTime) && ((EffectiveHealth > 2) || CanUse(GORON_TUNIC) || CanUse(LONGSHOT) || CanUse(NAYRUS_LOVE))) || (EffectiveHealth > 1 && CanUse(GORON_TUNIC) && CanUse(HOOKSHOT)) || (CanUse(NAYRUS_LOVE) && CanUse(HOOKSHOT)) || (EffectiveHealth > 2 && CanUse(HOOKSHOT) && LogicGoronCityGrotto));}}),
+                  Entrance(RR_DEATH_MOUNTAIN_TRAIL, {[]{return true;}}),
+                  Entrance(RR_GC_WOODS_WARP,        {[]{return GCWoodsWarpOpen;}}),
+                  Entrance(RR_GC_SHOP,              {[]{return (IsAdult && StopGCRollingGoronAsAdult) || (IsChild && (CanBlastOrSmash || GoronBracelet || GoronCityChildFire || CanUse(RG_FAIRY_BOW)));}}),
+                  Entrance(RR_GC_DARUNIAS_CHAMBER,  {[]{return (IsAdult && StopGCRollingGoronAsAdult) || GCDaruniasDoorOpenChild;}}),
+                  Entrance(RR_GC_GROTTO_PLATFORM,   {[]{return IsAdult && ((CanPlay(SongOfTime) && ((EffectiveHealth > 2) || CanUse(RG_GORON_TUNIC) || CanUse(RG_LONGSHOT) || CanUse(RG_NAYRUS_LOVE))) || (EffectiveHealth > 1 && CanUse(RG_GORON_TUNIC) && CanUse(RG_HOOKSHOT)) || (CanUse(RG_NAYRUS_LOVE) && CanUse(RG_HOOKSHOT)) || (EffectiveHealth > 2 && CanUse(RG_HOOKSHOT) && LogicGoronCityGrotto));}}),
   });
 
-  areaTable[GC_WOODS_WARP] = Area("GC Woods Warp", "Goron City", NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GC_WOODS_WARP] = Area("GC Woods Warp", "Goron City", RHT_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&GCWoodsWarpOpen, {[]{return GCWoodsWarpOpen || (CanBlastOrSmash || CanUse(DINS_FIRE));}}),
+                  EventAccess(&GCWoodsWarpOpen, {[]{return GCWoodsWarpOpen || (CanBlastOrSmash || CanUse(RG_DINS_FIRE));}}),
                 }, {}, {
                   //Exits
-                  Entrance(GORON_CITY,     {[]{return CanLeaveForest && GCWoodsWarpOpen;}}),
-                  Entrance(THE_LOST_WOODS, {[]{return true;}}),
+                  Entrance(RR_GORON_CITY,     {[]{return CanLeaveForest && GCWoodsWarpOpen;}}),
+                  Entrance(RR_THE_LOST_WOODS, {[]{return true;}}),
   });
 
-  areaTable[GC_DARUNIAS_CHAMBER] = Area("GC Darunias Chamber", "Goron City", GORON_CITY, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GC_DARUNIAS_CHAMBER] = Area("GC Darunias Chamber", "Goron City", RHT_GORON_CITY, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&GoronCityChildFire, {[]{return GoronCityChildFire || (IsChild && CanUse(STICKS));}}),
+                  EventAccess(&GoronCityChildFire, {[]{return GoronCityChildFire || (IsChild && CanUse(RG_STICKS));}}),
                 }, {
                   //Locations
-                  LocationAccess(GC_DARUNIAS_JOY, {[]{return IsChild && CanPlay(SariasSong);}}),
+                  LocationAccess(RC_GC_DARUNIAS_JOY, {[]{return IsChild && CanPlay(SariasSong);}}),
                 }, {
                   //Exits
-                  Entrance(GORON_CITY,      {[]{return true;}}),
-                  Entrance(DMC_LOWER_LOCAL, {[]{return IsAdult;}}),
+                  Entrance(RR_GORON_CITY,      {[]{return true;}}),
+                  Entrance(RR_DMC_LOWER_LOCAL, {[]{return IsAdult;}}),
   });
 
-  areaTable[GC_GROTTO_PLATFORM] = Area("GC Grotto Platform", "Goron City", GORON_CITY, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_GC_GROTTO_PLATFORM] = Area("GC Grotto Platform", "Goron City", RHT_GORON_CITY, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(GC_GROTTO,  {[]{return true;}}),
-                  Entrance(GORON_CITY, {[]{return EffectiveHealth > 2 || CanUse(GORON_TUNIC) || CanUse(NAYRUS_LOVE) || ((IsChild || CanPlay(SongOfTime)) && CanUse(LONGSHOT));}}),
+                  Entrance(RR_GC_GROTTO,  {[]{return true;}}),
+                  Entrance(RR_GORON_CITY, {[]{return EffectiveHealth > 2 || CanUse(RG_GORON_TUNIC) || CanUse(RG_NAYRUS_LOVE) || ((IsChild || CanPlay(SongOfTime)) && CanUse(RG_LONGSHOT));}}),
   });
 
-  areaTable[GC_SHOP] = Area("GC Shop", "GC Shop", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GC_SHOP] = Area("GC Shop", "GC Shop", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(GC_SHOP_ITEM_1, {[]{return true;}}),
-                  LocationAccess(GC_SHOP_ITEM_2, {[]{return true;}}),
-                  LocationAccess(GC_SHOP_ITEM_3, {[]{return true;}}),
-                  LocationAccess(GC_SHOP_ITEM_4, {[]{return true;}}),
-                  LocationAccess(GC_SHOP_ITEM_5, {[]{return true;}}),
-                  LocationAccess(GC_SHOP_ITEM_6, {[]{return true;}}),
-                  LocationAccess(GC_SHOP_ITEM_7, {[]{return true;}}),
-                  LocationAccess(GC_SHOP_ITEM_8, {[]{return true;}}),
+                  LocationAccess(RC_GC_SHOP_ITEM_1, {[]{return true;}}),
+                  LocationAccess(RC_GC_SHOP_ITEM_2, {[]{return true;}}),
+                  LocationAccess(RC_GC_SHOP_ITEM_3, {[]{return true;}}),
+                  LocationAccess(RC_GC_SHOP_ITEM_4, {[]{return true;}}),
+                  LocationAccess(RC_GC_SHOP_ITEM_5, {[]{return true;}}),
+                  LocationAccess(RC_GC_SHOP_ITEM_6, {[]{return true;}}),
+                  LocationAccess(RC_GC_SHOP_ITEM_7, {[]{return true;}}),
+                  LocationAccess(RC_GC_SHOP_ITEM_8, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(GORON_CITY, {[]{return true;}}),
+                  Entrance(RR_GORON_CITY, {[]{return true;}}),
   });
 
-  areaTable[GC_GROTTO] = Area("GC Grotto", "GC Grotto", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GC_GROTTO] = Area("GC Grotto", "GC Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(GC_DEKU_SCRUB_GROTTO_LEFT,   {[]{return CanStunDeku;}}),
-                  LocationAccess(GC_DEKU_SCRUB_GROTTO_RIGHT,  {[]{return CanStunDeku;}}),
-                  LocationAccess(GC_DEKU_SCRUB_GROTTO_CENTER, {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_GC_DEKU_SCRUB_GROTTO_LEFT,   {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_GC_DEKU_SCRUB_GROTTO_RIGHT,  {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_GC_DEKU_SCRUB_GROTTO_CENTER, {[]{return CanStunDeku;}}),
                 }, {
                   //Exits
-                  Entrance(GC_GROTTO_PLATFORM, {[]{return true;}}),
+                  Entrance(RR_GC_GROTTO_PLATFORM, {[]{return true;}}),
   });
 
-  areaTable[DMC_UPPER_NEARBY] = Area("DMC Upper Nearby", "Death Mountain Crater", DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DMC_UPPER_NEARBY] = Area("DMC Upper Nearby", "Death Mountain Crater", RHT_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(DMC_UPPER_LOCAL,       {[]{return FireTimer >= 48;}}),
-                  Entrance(DEATH_MOUNTAIN_SUMMIT, {[]{return true;}}),
-                  Entrance(DMC_UPPER_GROTTO,      {[]{return Here(DMC_UPPER_NEARBY, []{return CanBlastOrSmash && (FireTimer >= 8 || Hearts >= 3);});}})
+                  Entrance(RR_DMC_UPPER_LOCAL,       {[]{return FireTimer >= 48;}}),
+                  Entrance(RR_DEATH_MOUNTAIN_SUMMIT, {[]{return true;}}),
+                  Entrance(RR_DMC_UPPER_GROTTO,      {[]{return Here(RR_DMC_UPPER_NEARBY, []{return CanBlastOrSmash && (FireTimer >= 8 || Hearts >= 3);});}})
   });
 
-  areaTable[DMC_UPPER_LOCAL] = Area("DMC Upper Local", "Death Mountain Crater", DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DMC_UPPER_LOCAL] = Area("DMC Upper Local", "Death Mountain Crater", RHT_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&GossipStoneFairy, {[]{return GossipStoneFairy || (HasExplosives && CanSummonGossipFairyWithoutSuns && (FireTimer >= 16 || Hearts >= 3));}}),
                 }, {
                   //Locations
-                  LocationAccess(DMC_WALL_FREESTANDING_POH, {[]{return FireTimer >= 16 || Hearts >= 3;}}),
-                  LocationAccess(DMC_GS_CRATE,              {[]{return (FireTimer >= 8 || Hearts >= 3) && IsChild && CanChildAttack;}}),
-                  LocationAccess(DMC_GOSSIP_STONE,          {[]{return HasExplosives && (FireTimer >= 16 || Hearts >= 3);}}),
+                  LocationAccess(RC_DMC_WALL_FREESTANDING_POH, {[]{return FireTimer >= 16 || Hearts >= 3;}}),
+                  LocationAccess(RC_DMC_GS_CRATE,              {[]{return (FireTimer >= 8 || Hearts >= 3) && IsChild && CanChildAttack;}}),
+                  LocationAccess(RC_DMC_GOSSIP_STONE,          {[]{return HasExplosives && (FireTimer >= 16 || Hearts >= 3);}}),
                 }, {
                   //Exits
-                  Entrance(DMC_UPPER_NEARBY,         {[]{return true;}}),
-                  Entrance(DMC_LADDER_AREA_NEARBY,   {[]{return FireTimer >= 16 || Hearts >= 3;}}),
-                  Entrance(DMC_CENTRAL_NEARBY,       {[]{return IsAdult && CanUse(GORON_TUNIC) && CanUse(DISTANT_SCARECROW) && ((EffectiveHealth > 2) || (Fairy && ShuffleDungeonEntrances.IsNot(SHUFFLEDUNGEONS_OFF)) || CanUse(NAYRUS_LOVE));}}),
-                  Entrance(DMC_LOWER_NEARBY,         {[]{return false;}}),
+                  Entrance(RR_DMC_UPPER_NEARBY,         {[]{return true;}}),
+                  Entrance(RR_DMC_LADDER_AREA_NEARBY,   {[]{return FireTimer >= 16 || Hearts >= 3;}}),
+                  Entrance(RR_DMC_CENTRAL_NEARBY,       {[]{return IsAdult && CanUse(RG_GORON_TUNIC) && CanUse(RG_DISTANT_SCARECROW) && ((EffectiveHealth > 2) || (Fairy && ShuffleDungeonEntrances.IsNot(SHUFFLEDUNGEONS_OFF)) || CanUse(RG_NAYRUS_LOVE));}}),
+                  Entrance(RR_DMC_LOWER_NEARBY,         {[]{return false;}}),
   });
 
-  areaTable[DMC_LADDER_AREA_NEARBY] = Area("DMC Ladder Area Nearby", "Death Mountain Crater", DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DMC_LADDER_AREA_NEARBY] = Area("DMC Ladder Area Nearby", "Death Mountain Crater", RHT_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(DMC_DEKU_SCRUB, {[]{return IsChild && CanStunDeku;}}),
+                  LocationAccess(RC_DMC_DEKU_SCRUB, {[]{return IsChild && CanStunDeku;}}),
                 }, {
                   //Exits
-                  Entrance(DMC_UPPER_NEARBY, {[]{return Hearts >= 3;}}),
-                  Entrance(DMC_LOWER_NEARBY, {[]{return Hearts >= 3 && (CanUse(HOVER_BOOTS) || (LogicCraterBoulderJS && IsAdult && CanUse(MEGATON_HAMMER)) || (LogicCraterBoulderSkip && IsAdult));}}),
+                  Entrance(RR_DMC_UPPER_NEARBY, {[]{return Hearts >= 3;}}),
+                  Entrance(RR_DMC_LOWER_NEARBY, {[]{return Hearts >= 3 && (CanUse(RG_HOVER_BOOTS) || (LogicCraterBoulderJS && IsAdult && CanUse(RG_MEGATON_HAMMER)) || (LogicCraterBoulderSkip && IsAdult));}}),
   });
 
-  areaTable[DMC_LOWER_NEARBY] = Area("DMC Lower Nearby", "Death Mountain Crater", DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DMC_LOWER_NEARBY] = Area("DMC Lower Nearby", "Death Mountain Crater", RHT_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(DMC_LOWER_LOCAL,          {[]{return FireTimer >= 48;}}),
-                  Entrance(GC_DARUNIAS_CHAMBER,      {[]{return true;}}),
-                  Entrance(DMC_GREAT_FAIRY_FOUNTAIN, {[]{return CanUse(MEGATON_HAMMER);}}),
-                  Entrance(DMC_HAMMER_GROTTO,        {[]{return IsAdult && CanUse(MEGATON_HAMMER);}}),
+                  Entrance(RR_DMC_LOWER_LOCAL,          {[]{return FireTimer >= 48;}}),
+                  Entrance(RR_GC_DARUNIAS_CHAMBER,      {[]{return true;}}),
+                  Entrance(RR_DMC_GREAT_FAIRY_FOUNTAIN, {[]{return CanUse(RG_MEGATON_HAMMER);}}),
+                  Entrance(RR_DMC_HAMMER_GROTTO,        {[]{return IsAdult && CanUse(RG_MEGATON_HAMMER);}}),
   });
 
-  areaTable[DMC_LOWER_LOCAL] = Area("DMC Lower Local", "Death Mountain Crater", DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DMC_LOWER_LOCAL] = Area("DMC Lower Local", "Death Mountain Crater", RHT_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(DMC_LOWER_NEARBY,       {[]{return true;}}),
-                  Entrance(DMC_LADDER_AREA_NEARBY, {[]{return FireTimer >= 8 || Hearts >= 3;}}),
-                  Entrance(DMC_CENTRAL_NEARBY,     {[]{return (CanUse(HOVER_BOOTS) || CanUse(HOOKSHOT)) && (FireTimer >= 8 || Hearts >= 3);}}),
-                  Entrance(DMC_CENTRAL_LOCAL,      {[]{return (CanUse(HOVER_BOOTS) || CanUse(HOOKSHOT) || (IsAdult && CanShield && LogicCraterBoleroJump)) && FireTimer >= 24;}}),
+                  Entrance(RR_DMC_LOWER_NEARBY,       {[]{return true;}}),
+                  Entrance(RR_DMC_LADDER_AREA_NEARBY, {[]{return FireTimer >= 8 || Hearts >= 3;}}),
+                  Entrance(RR_DMC_CENTRAL_NEARBY,     {[]{return (CanUse(RG_HOVER_BOOTS) || CanUse(RG_HOOKSHOT)) && (FireTimer >= 8 || Hearts >= 3);}}),
+                  Entrance(RR_DMC_CENTRAL_LOCAL,      {[]{return (CanUse(RG_HOVER_BOOTS) || CanUse(RG_HOOKSHOT) || (IsAdult && CanShield && LogicCraterBoleroJump)) && FireTimer >= 24;}}),
   });
 
-  areaTable[DMC_CENTRAL_NEARBY] = Area("DMC Central Nearby", "Death Mountain Crater", DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DMC_CENTRAL_NEARBY] = Area("DMC Central Nearby", "Death Mountain Crater", RHT_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(DMC_VOLCANO_FREESTANDING_POH, {[]{return IsAdult && Hearts >= 3 && (CanPlantBean(DMC_CENTRAL_LOCAL) || (LogicCraterBeanPoHWithHovers && HoverBoots));}}),
-                  LocationAccess(SHEIK_IN_CRATER,              {[]{return IsAdult && (FireTimer >= 8 || Hearts >= 3);}}),
+                  LocationAccess(RC_DMC_VOLCANO_FREESTANDING_POH, {[]{return IsAdult && Hearts >= 3 && (CanPlantBean(RR_DMC_CENTRAL_LOCAL) || (LogicCraterBeanPoHWithHovers && HoverBoots));}}),
+                  LocationAccess(RC_SHEIK_IN_CRATER,              {[]{return IsAdult && (FireTimer >= 8 || Hearts >= 3);}}),
                 }, {
                   //Exits
-                  Entrance(DMC_CENTRAL_LOCAL, {[]{return FireTimer >= 48;}}),
+                  Entrance(RR_DMC_CENTRAL_LOCAL, {[]{return FireTimer >= 48;}}),
   });
 
-  areaTable[DMC_CENTRAL_LOCAL] = Area("DMC Central Local", "Death Mountain Crater", DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DMC_CENTRAL_LOCAL] = Area("DMC Central Local", "Death Mountain Crater", RHT_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&BeanPlantFairy, {[]{return BeanPlantFairy || (CanPlantBean(DMC_CENTRAL_LOCAL) && CanPlay(SongOfStorms));}}),
+                  EventAccess(&BeanPlantFairy, {[]{return BeanPlantFairy || (CanPlantBean(RR_DMC_CENTRAL_LOCAL) && CanPlay(SongOfStorms));}}),
                 }, {
                   //Locations
-                  LocationAccess(DMC_GS_BEAN_PATCH, {[]{return (FireTimer >= 8 || Hearts >= 3) && CanPlantBugs && CanChildAttack;}}),
+                  LocationAccess(RC_DMC_GS_BEAN_PATCH, {[]{return (FireTimer >= 8 || Hearts >= 3) && CanPlantBugs && CanChildAttack;}}),
                 }, {
                   //Exits
-                  Entrance(DMC_CENTRAL_NEARBY,   {[]{return true;}}),
-                  Entrance(DMC_LOWER_NEARBY,     {[]{return (IsAdult && CanPlantBean(DMC_CENTRAL_LOCAL)) || CanUse(HOVER_BOOTS) || CanUse(HOOKSHOT);}}),
-                  Entrance(DMC_UPPER_NEARBY,     {[]{return IsAdult && CanPlantBean(DMC_CENTRAL_LOCAL);}}),
-                  Entrance(FIRE_TEMPLE_ENTRYWAY, {[]{return (IsChild && Hearts >= 3 && ShuffleDungeonEntrances.IsNot(SHUFFLEDUNGEONS_OFF)) || (IsAdult && FireTimer >= 24);}}),
+                  Entrance(RR_DMC_CENTRAL_NEARBY,   {[]{return true;}}),
+                  Entrance(RR_DMC_LOWER_NEARBY,     {[]{return (IsAdult && CanPlantBean(RR_DMC_CENTRAL_LOCAL)) || CanUse(RG_HOVER_BOOTS) || CanUse(RG_HOOKSHOT);}}),
+                  Entrance(RR_DMC_UPPER_NEARBY,     {[]{return IsAdult && CanPlantBean(RR_DMC_CENTRAL_LOCAL);}}),
+                  Entrance(RR_FIRE_TEMPLE_ENTRYWAY, {[]{return (IsChild && Hearts >= 3 && ShuffleDungeonEntrances.IsNot(SHUFFLEDUNGEONS_OFF)) || (IsAdult && FireTimer >= 24);}}),
   });
 
-  areaTable[DMC_GREAT_FAIRY_FOUNTAIN] = Area("DMC Great Fairy Fountain", "DMC Great Fairy Fountain", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DMC_GREAT_FAIRY_FOUNTAIN] = Area("DMC Great Fairy Fountain", "DMC Great Fairy Fountain", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(DMC_GREAT_FAIRY_REWARD, {[]{return CanPlay(ZeldasLullaby);}}),
+                  LocationAccess(RC_DMC_GREAT_FAIRY_REWARD, {[]{return CanPlay(ZeldasLullaby);}}),
                 }, {
                   //Exits
-                  Entrance(DMC_LOWER_LOCAL, {[]{return true;}}),
+                  Entrance(RR_DMC_LOWER_LOCAL, {[]{return true;}}),
   });
 
-  areaTable[DMC_UPPER_GROTTO] = Area("DMC Upper Grotto", "DMC Upper Grotto", NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+  areaTable[RR_DMC_UPPER_GROTTO] = Area("DMC Upper Grotto", "DMC Upper Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
-                  LocationAccess(DMC_UPPER_GROTTO_CHEST,        {[]{return true;}}),
-                  LocationAccess(DMC_UPPER_GROTTO_GOSSIP_STONE, {[]{return true;}}),
+                  LocationAccess(RC_DMC_UPPER_GROTTO_CHEST,        {[]{return true;}}),
+                  LocationAccess(RC_DMC_UPPER_GROTTO_GOSSIP_STONE, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(DMC_UPPER_LOCAL, {[]{return true;}}),
+                  Entrance(RR_DMC_UPPER_LOCAL, {[]{return true;}}),
   });
 
-  areaTable[DMC_HAMMER_GROTTO] = Area("DMC Hammer Grotto", "DMC Hammer Grotto", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DMC_HAMMER_GROTTO] = Area("DMC Hammer Grotto", "DMC Hammer Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(DMC_DEKU_SCRUB_GROTTO_LEFT,   {[]{return CanStunDeku;}}),
-                  LocationAccess(DMC_DEKU_SCRUB_GROTTO_RIGHT,  {[]{return CanStunDeku;}}),
-                  LocationAccess(DMC_DEKU_SCRUB_GROTTO_CENTER, {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_DMC_DEKU_SCRUB_GROTTO_LEFT,   {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_DMC_DEKU_SCRUB_GROTTO_RIGHT,  {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_DMC_DEKU_SCRUB_GROTTO_CENTER, {[]{return CanStunDeku;}}),
                 }, {
                   //Exits
-                  Entrance(DMC_LOWER_LOCAL, {[]{return true;}}),
+                  Entrance(RR_DMC_LOWER_LOCAL, {[]{return true;}}),
   });
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp
index c39676a82..63ae09e3f 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp
@@ -10,140 +10,140 @@ void AreaTable_Init_DekuTree() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[DEKU_TREE_ENTRYWAY] = Area("Deku Tree Entryway", "Deku Tree", DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DEKU_TREE_ENTRYWAY] = Area("Deku Tree Entryway", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(DEKU_TREE_LOBBY,      {[]{return Dungeon::DekuTree.IsVanilla();}}),
-                  Entrance(DEKU_TREE_MQ_LOBBY,   {[]{return Dungeon::DekuTree.IsMQ();}}),
-                  Entrance(KF_OUTSIDE_DEKU_TREE, {[]{return true;}}),
+                  Entrance(RR_DEKU_TREE_LOBBY,      {[]{return Dungeon::DekuTree.IsVanilla();}}),
+                  Entrance(RR_DEKU_TREE_MQ_LOBBY,   {[]{return Dungeon::DekuTree.IsMQ();}}),
+                  Entrance(RR_KF_OUTSIDE_DEKU_TREE, {[]{return true;}}),
   });
 
   /*--------------------------
   |     VANILLA DUNGEON      |
   ---------------------------*/
   if (Dungeon::DekuTree.IsVanilla()) {
-  areaTable[DEKU_TREE_LOBBY] = Area("Deku Tree Lobby", "Deku Tree", DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DEKU_TREE_LOBBY] = Area("Deku Tree Lobby", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (IsAdult || KokiriSword || Boomerang);}}),
-                  EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(DINS_FIRE));}}),
+                  EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(RG_DINS_FIRE));}}),
                 }, {
                   //Locations
-                  LocationAccess(DEKU_TREE_MAP_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_DEKU_TREE_MAP_CHEST, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(DEKU_TREE_ENTRYWAY,          {[]{return true;}}),
-                  Entrance(DEKU_TREE_2F_MIDDLE_ROOM,    {[]{return true;}}),
-                  Entrance(DEKU_TREE_COMPASS_ROOM,      {[]{return true;}}),
-                  Entrance(DEKU_TREE_BASEMENT_LOWER,    {[]{return Here(DEKU_TREE_LOBBY, []{return IsAdult || CanChildAttack || Nuts;});}}),
-                  Entrance(DEKU_TREE_OUTSIDE_BOSS_ROOM, {[]{return false;}}),
-                  Entrance(DEKU_TREE_BOSS_ENTRYWAY,     {[]{return false;}}),
+                  Entrance(RR_DEKU_TREE_ENTRYWAY,          {[]{return true;}}),
+                  Entrance(RR_DEKU_TREE_2F_MIDDLE_ROOM,    {[]{return true;}}),
+                  Entrance(RR_DEKU_TREE_COMPASS_ROOM,      {[]{return true;}}),
+                  Entrance(RR_DEKU_TREE_BASEMENT_LOWER,    {[]{return Here(RR_DEKU_TREE_LOBBY, []{return IsAdult || CanChildAttack || Nuts;});}}),
+                  Entrance(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM, {[]{return false;}}),
+                  Entrance(RR_DEKU_TREE_BOSS_ENTRYWAY,     {[]{return false;}}),
   });
 
-  areaTable[DEKU_TREE_2F_MIDDLE_ROOM] = Area("Deku Tree 2F Middle Room", "Deku Tree", DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DEKU_TREE_2F_MIDDLE_ROOM] = Area("Deku Tree 2F Middle Room", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(DEKU_TREE_LOBBY,         {[]{return Here(DEKU_TREE_2F_MIDDLE_ROOM, []{return HasShield || CanUse(MEGATON_HAMMER);});}}),
-                  Entrance(DEKU_TREE_SLINGSHOT_ROOM,{[]{return Here(DEKU_TREE_2F_MIDDLE_ROOM, []{return HasShield || CanUse(MEGATON_HAMMER);});}}),
+                  Entrance(RR_DEKU_TREE_LOBBY,         {[]{return Here(RR_DEKU_TREE_2F_MIDDLE_ROOM, []{return HasShield || CanUse(RG_MEGATON_HAMMER);});}}),
+                  Entrance(RR_DEKU_TREE_SLINGSHOT_ROOM,{[]{return Here(RR_DEKU_TREE_2F_MIDDLE_ROOM, []{return HasShield || CanUse(RG_MEGATON_HAMMER);});}}),
   });
 
-  areaTable[DEKU_TREE_SLINGSHOT_ROOM] = Area("Deku Tree Slingshot Room", "Deku Tree", DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DEKU_TREE_SLINGSHOT_ROOM] = Area("Deku Tree Slingshot Room", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(DEKU_TREE_SLINGSHOT_CHEST,           {[]{return true;}}),
-                  LocationAccess(DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_DEKU_TREE_SLINGSHOT_CHEST,           {[]{return true;}}),
+                  LocationAccess(RC_DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(DEKU_TREE_2F_MIDDLE_ROOM, {[]{return CanUse(SLINGSHOT) || CanUse(HOVER_BOOTS);}}),
+                  Entrance(RR_DEKU_TREE_2F_MIDDLE_ROOM, {[]{return CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_HOVER_BOOTS);}}),
   });
 
-  areaTable[DEKU_TREE_COMPASS_ROOM] = Area("Deku Tree Compass Room", "Deku Tree", DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DEKU_TREE_COMPASS_ROOM] = Area("Deku Tree Compass Room", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (IsAdult || KokiriSword || Boomerang);}}),
-                  EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(DINS_FIRE));}}),
+                  EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(RG_DINS_FIRE));}}),
                 }, {
                   //Locations
-                  LocationAccess(DEKU_TREE_COMPASS_CHEST,           {[]{return true;}}),
-                  LocationAccess(DEKU_TREE_COMPASS_ROOM_SIDE_CHEST, {[]{return true;}}),
-                  LocationAccess(DEKU_TREE_GS_COMPASS_ROOM,         {[]{return IsAdult || CanChildAttack;}}),
+                  LocationAccess(RC_DEKU_TREE_COMPASS_CHEST,           {[]{return true;}}),
+                  LocationAccess(RC_DEKU_TREE_COMPASS_ROOM_SIDE_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_DEKU_TREE_GS_COMPASS_ROOM,         {[]{return IsAdult || CanChildAttack;}}),
                 }, {
                   //Exits
-                  Entrance(DEKU_TREE_LOBBY,     {[]{return HasFireSourceWithTorch || CanUse(BOW);}}),
-                  Entrance(DEKU_TREE_BOSS_ENTRYWAY, {[]{return false;}}),
+                  Entrance(RR_DEKU_TREE_LOBBY,     {[]{return HasFireSourceWithTorch || CanUse(RG_FAIRY_BOW);}}),
+                  Entrance(RR_DEKU_TREE_BOSS_ENTRYWAY, {[]{return false;}}),
   });
 
-  areaTable[DEKU_TREE_BASEMENT_LOWER] = Area("Deku Tree Basement Lower", "Deku Tree", DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DEKU_TREE_BASEMENT_LOWER] = Area("Deku Tree Basement Lower", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (IsAdult || KokiriSword || Boomerang);}}),
-                  EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(DINS_FIRE));},
-                                    /*Glitched*/[]{return CanUse(MEGATON_HAMMER);}}),
+                  EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(RG_DINS_FIRE));},
+                                    /*Glitched*/[]{return CanUse(RG_MEGATON_HAMMER);}}),
                 }, {
                   //Locations
-                  LocationAccess(DEKU_TREE_BASEMENT_CHEST,    {[]{return true;}}),
-                  LocationAccess(DEKU_TREE_GS_BASEMENT_GATE,  {[]{return IsAdult || CanChildAttack;}}),
-                  LocationAccess(DEKU_TREE_GS_BASEMENT_VINES, {[]{return CanUseProjectile || CanUse(DINS_FIRE) || (LogicDekuBasementGS && (IsAdult || Sticks || KokiriSword));}}),
+                  LocationAccess(RC_DEKU_TREE_BASEMENT_CHEST,    {[]{return true;}}),
+                  LocationAccess(RC_DEKU_TREE_GS_BASEMENT_GATE,  {[]{return IsAdult || CanChildAttack;}}),
+                  LocationAccess(RC_DEKU_TREE_GS_BASEMENT_VINES, {[]{return CanUseProjectile || CanUse(RG_DINS_FIRE) || (LogicDekuBasementGS && (IsAdult || Sticks || KokiriSword));}}),
                 }, {
                   //Exits
-                  Entrance(DEKU_TREE_LOBBY,               {[]{return true;}}),
-                  Entrance(DEKU_TREE_BASEMENT_SCRUB_ROOM, {[]{return Here(DEKU_TREE_BASEMENT_LOWER, []{return HasFireSourceWithTorch || CanUse(BOW);});}}),
-                  Entrance(DEKU_TREE_BASEMENT_UPPER,      {[]{return IsAdult || LogicDekuB1Skip || HasAccessTo(DEKU_TREE_BASEMENT_UPPER);}}),
-                  Entrance(DEKU_TREE_OUTSIDE_BOSS_ROOM,   {[]{return false;}}),
+                  Entrance(RR_DEKU_TREE_LOBBY,               {[]{return true;}}),
+                  Entrance(RR_DEKU_TREE_BASEMENT_SCRUB_ROOM, {[]{return Here(RR_DEKU_TREE_BASEMENT_LOWER, []{return HasFireSourceWithTorch || CanUse(RG_FAIRY_BOW);});}}),
+                  Entrance(RR_DEKU_TREE_BASEMENT_UPPER,      {[]{return IsAdult || LogicDekuB1Skip || HasAccessTo(RR_DEKU_TREE_BASEMENT_UPPER);}}),
+                  Entrance(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM,   {[]{return false;}}),
   });
 
-  areaTable[DEKU_TREE_BASEMENT_SCRUB_ROOM] = Area("Deku Tree Basement Scrub Room", "Deku Tree", DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DEKU_TREE_BASEMENT_SCRUB_ROOM] = Area("Deku Tree Basement Scrub Room", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(DEKU_TREE_BASEMENT_LOWER,      {[]{return true;}}),
-                  Entrance(DEKU_TREE_BASEMENT_WATER_ROOM, {[]{return Here(DEKU_TREE_BASEMENT_SCRUB_ROOM, []{return CanUse(SLINGSHOT) || CanUse(BOW);});}}),
+                  Entrance(RR_DEKU_TREE_BASEMENT_LOWER,      {[]{return true;}}),
+                  Entrance(RR_DEKU_TREE_BASEMENT_WATER_ROOM, {[]{return Here(RR_DEKU_TREE_BASEMENT_SCRUB_ROOM, []{return CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW);});}}),
   });
 
-  areaTable[DEKU_TREE_BASEMENT_WATER_ROOM] = Area("Deku Tree Basement Water Room", "Deku Tree", DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DEKU_TREE_BASEMENT_WATER_ROOM] = Area("Deku Tree Basement Water Room", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(DEKU_TREE_BASEMENT_SCRUB_ROOM, {[]{return true;}}),
-                  Entrance(DEKU_TREE_BASEMENT_TORCH_ROOM, {[]{return true;}}),
+                  Entrance(RR_DEKU_TREE_BASEMENT_SCRUB_ROOM, {[]{return true;}}),
+                  Entrance(RR_DEKU_TREE_BASEMENT_TORCH_ROOM, {[]{return true;}}),
   });
 
-  areaTable[DEKU_TREE_BASEMENT_TORCH_ROOM] = Area("Deku Tree Basement Torch Room", "Deku Tree", DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DEKU_TREE_BASEMENT_TORCH_ROOM] = Area("Deku Tree Basement Torch Room", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (IsAdult || KokiriSword || Boomerang);}}),
-                  EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(DINS_FIRE));}}),
+                  EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(RG_DINS_FIRE));}}),
                 }, {}, {
                   //Exits
-                  Entrance(DEKU_TREE_BASEMENT_WATER_ROOM, {[]{return true;}}),
-                  Entrance(DEKU_TREE_BASEMENT_BACK_LOBBY, {[]{return Here(DEKU_TREE_BASEMENT_TORCH_ROOM, []{return HasFireSourceWithTorch || CanUse(BOW);});}}),
+                  Entrance(RR_DEKU_TREE_BASEMENT_WATER_ROOM, {[]{return true;}}),
+                  Entrance(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, {[]{return Here(RR_DEKU_TREE_BASEMENT_TORCH_ROOM, []{return HasFireSourceWithTorch || CanUse(RG_FAIRY_BOW);});}}),
   });
 
-  areaTable[DEKU_TREE_BASEMENT_BACK_LOBBY] = Area("Deku Tree Basement Back Lobby", "Deku Tree", DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DEKU_TREE_BASEMENT_BACK_LOBBY] = Area("Deku Tree Basement Back Lobby", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (IsAdult || KokiriSword || Boomerang);}}),
-                  EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (Here(DEKU_TREE_BASEMENT_BACK_LOBBY, []{return HasFireSourceWithTorch || CanUse(BOW);}) &&
-                                                                            (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(DINS_FIRE)));}}),
+                  EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (Here(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, []{return HasFireSourceWithTorch || CanUse(RG_FAIRY_BOW);}) &&
+                                                                            (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(RG_DINS_FIRE)));}}),
                 }, {}, {
                   //Exits
-                  Entrance(DEKU_TREE_BASEMENT_TORCH_ROOM, {[]{return true;}}),
-                  Entrance(DEKU_TREE_BASEMENT_BACK_ROOM,  {[]{return Here(DEKU_TREE_BASEMENT_BACK_LOBBY, []{return HasFireSourceWithTorch || CanUse(Bow);}) &&
-                                                                     Here(DEKU_TREE_BASEMENT_BACK_LOBBY, []{return CanBlastOrSmash;});}}),
-                  Entrance(DEKU_TREE_BASEMENT_UPPER,      {[]{return Here(DEKU_TREE_BASEMENT_BACK_LOBBY, []{return HasFireSourceWithTorch || CanUse(Bow);}) && IsChild;}}),
+                  Entrance(RR_DEKU_TREE_BASEMENT_TORCH_ROOM, {[]{return true;}}),
+                  Entrance(RR_DEKU_TREE_BASEMENT_BACK_ROOM,  {[]{return Here(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, []{return HasFireSourceWithTorch || CanUse(RG_FAIRY_BOW);}) &&
+                                                                     Here(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, []{return CanBlastOrSmash;});}}),
+                  Entrance(RR_DEKU_TREE_BASEMENT_UPPER,      {[]{return Here(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, []{return HasFireSourceWithTorch || CanUse(RG_FAIRY_BOW);}) && IsChild;}}),
   });
 
-  areaTable[DEKU_TREE_BASEMENT_BACK_ROOM] = Area("Deku Tree Basement Back Room", "Deku Tree", DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DEKU_TREE_BASEMENT_BACK_ROOM] = Area("Deku Tree Basement Back Room", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(DEKU_TREE_GS_BASEMENT_BACK_ROOM, {[]{return HookshotOrBoomerang;}}),
+                  LocationAccess(RC_DEKU_TREE_GS_BASEMENT_BACK_ROOM, {[]{return HookshotOrBoomerang;}}),
                 }, {
                   //Exits
-                  Entrance(DEKU_TREE_BASEMENT_BACK_LOBBY, {[]{return true;}}),
+                  Entrance(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, {[]{return true;}}),
   });
 
-  areaTable[DEKU_TREE_BASEMENT_UPPER] = Area("Deku Tree Basement Upper", "Deku Tree", DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DEKU_TREE_BASEMENT_UPPER] = Area("Deku Tree Basement Upper", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (IsAdult || KokiriSword || Boomerang);}}),
-                  EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(DINS_FIRE));}}),
+                  EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(RG_DINS_FIRE));}}),
                 }, {}, {
                   //Exits
-                  Entrance(DEKU_TREE_BASEMENT_LOWER,      {[]{return true;}}),
-                  Entrance(DEKU_TREE_BASEMENT_BACK_LOBBY, {[]{return IsChild;}}),
-                  Entrance(DEKU_TREE_OUTSIDE_BOSS_ROOM,   {[]{return Here(DEKU_TREE_BASEMENT_UPPER, []{return HasFireSourceWithTorch || (LogicDekuB1WebsWithBow && IsAdult && CanUse(BOW));});}}),
+                  Entrance(RR_DEKU_TREE_BASEMENT_LOWER,      {[]{return true;}}),
+                  Entrance(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, {[]{return IsChild;}}),
+                  Entrance(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM,   {[]{return Here(RR_DEKU_TREE_BASEMENT_UPPER, []{return HasFireSourceWithTorch || (LogicDekuB1WebsWithBow && IsAdult && CanUse(RG_FAIRY_BOW));});}}),
   });
 
-  areaTable[DEKU_TREE_OUTSIDE_BOSS_ROOM] = Area("Deku Tree Outside Boss Room", "Deku Tree", DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DEKU_TREE_OUTSIDE_BOSS_ROOM] = Area("Deku Tree Outside Boss Room", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(DEKU_TREE_BASEMENT_UPPER, {[]{return true;}}),
-                  Entrance(DEKU_TREE_BOSS_ENTRYWAY,  {[]{return Here(DEKU_TREE_OUTSIDE_BOSS_ROOM, []{return HasShield;});}}),
+                  Entrance(RR_DEKU_TREE_BASEMENT_UPPER, {[]{return true;}}),
+                  Entrance(RR_DEKU_TREE_BOSS_ENTRYWAY,  {[]{return Here(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM, []{return HasShield;});}}),
   });
   }
 
@@ -151,120 +151,120 @@ void AreaTable_Init_DekuTree() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (Dungeon::DekuTree.IsMQ()) {
-  areaTable[DEKU_TREE_MQ_LOBBY] = Area("Deku Tree MQ Lobby", "Deku Tree", DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DEKU_TREE_MQ_LOBBY] = Area("Deku Tree MQ Lobby", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (IsAdult || KokiriSword || Boomerang);}}),
-                  EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(DINS_FIRE));}}),
+                  EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(RG_DINS_FIRE));}}),
   }, {
                   //Locations
-                  LocationAccess(DEKU_TREE_MQ_MAP_CHEST,                 {[]{return true;}}),
-                  LocationAccess(DEKU_TREE_MQ_SLINGSHOT_CHEST,           {[]{return IsAdult || CanChildAttack;}}),
-                  LocationAccess(DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST, {[]{return HasFireSourceWithTorch || (IsAdult && CanUse(BOW));}}),
-                  LocationAccess(DEKU_TREE_MQ_BASEMENT_CHEST,            {[]{return HasFireSourceWithTorch || (IsAdult && CanUse(BOW));}}),
-                  LocationAccess(DEKU_TREE_MQ_GS_LOBBY,                  {[]{return IsAdult || CanChildAttack;}}),
+                  LocationAccess(RC_DEKU_TREE_MQ_MAP_CHEST,                 {[]{return true;}}),
+                  LocationAccess(RC_DEKU_TREE_MQ_SLINGSHOT_CHEST,           {[]{return IsAdult || CanChildAttack;}}),
+                  LocationAccess(RC_DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST, {[]{return HasFireSourceWithTorch || (IsAdult && CanUse(RG_FAIRY_BOW));}}),
+                  LocationAccess(RC_DEKU_TREE_MQ_BASEMENT_CHEST,            {[]{return HasFireSourceWithTorch || (IsAdult && CanUse(RG_FAIRY_BOW));}}),
+                  LocationAccess(RC_DEKU_TREE_MQ_GS_LOBBY,                  {[]{return IsAdult || CanChildAttack;}}),
   }, {
                   //Exits
-                  Entrance(DEKU_TREE_ENTRYWAY,                     {[]{return true;}}),
-                  Entrance(DEKU_TREE_MQ_COMPASS_ROOM,              {[]{return Here(DEKU_TREE_MQ_LOBBY, []{return (IsChild && CanUse(SLINGSHOT)) || (IsAdult && CanUse(BOW));}) &&
-                                                                               Here(DEKU_TREE_MQ_LOBBY, []{return HasFireSourceWithTorch || (IsAdult && CanUse(BOW));});}}),
-                  Entrance(DEKU_TREE_MQ_BASEMENT_WATER_ROOM_FRONT, {[]{return Here(DEKU_TREE_MQ_LOBBY, []{return (IsChild && CanUse(SLINGSHOT)) || (IsAdult && CanUse(BOW));}) &&
-                                                                               Here(DEKU_TREE_MQ_LOBBY, []{return HasFireSourceWithTorch;});}}),
-                  Entrance(DEKU_TREE_MQ_BASEMENT_LEDGE,            {[]{return LogicDekuB1Skip || Here(DEKU_TREE_MQ_LOBBY, []{return IsAdult;});}}),
+                  Entrance(RR_DEKU_TREE_ENTRYWAY,                     {[]{return true;}}),
+                  Entrance(RR_DEKU_TREE_MQ_COMPASS_ROOM,              {[]{return Here(RR_DEKU_TREE_MQ_LOBBY, []{return (IsChild && CanUse(RG_FAIRY_SLINGSHOT)) || (IsAdult && CanUse(RG_FAIRY_BOW));}) &&
+                                                                               Here(RR_DEKU_TREE_MQ_LOBBY, []{return HasFireSourceWithTorch || (IsAdult && CanUse(RG_FAIRY_BOW));});}}),
+                  Entrance(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_FRONT, {[]{return Here(RR_DEKU_TREE_MQ_LOBBY, []{return (IsChild && CanUse(RG_FAIRY_SLINGSHOT)) || (IsAdult && CanUse(RG_FAIRY_BOW));}) &&
+                                                                               Here(RR_DEKU_TREE_MQ_LOBBY, []{return HasFireSourceWithTorch;});}}),
+                  Entrance(RR_DEKU_TREE_MQ_BASEMENT_LEDGE,            {[]{return LogicDekuB1Skip || Here(RR_DEKU_TREE_MQ_LOBBY, []{return IsAdult;});}}),
   });
 
-  areaTable[DEKU_TREE_MQ_COMPASS_ROOM] = Area("Deku Tree MQ Compass Room", "Deku Tree", DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DEKU_TREE_MQ_COMPASS_ROOM] = Area("Deku Tree MQ Compass Room", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(DEKU_TREE_MQ_COMPASS_CHEST,   {[]{return true;}}),
-                  LocationAccess(DEKU_TREE_MQ_GS_COMPASS_ROOM, {[]{return HookshotOrBoomerang &&
-                                                                               Here(DEKU_TREE_MQ_COMPASS_ROOM, []{return HasBombchus ||
+                  LocationAccess(RC_DEKU_TREE_MQ_COMPASS_CHEST,   {[]{return true;}}),
+                  LocationAccess(RC_DEKU_TREE_MQ_GS_COMPASS_ROOM, {[]{return HookshotOrBoomerang &&
+                                                                               Here(RR_DEKU_TREE_MQ_COMPASS_ROOM, []{return HasBombchus ||
                                                                                (Bombs && (CanPlay(SongOfTime) || IsAdult)) ||
-                                                                               (IsAdult && CanUse(MEGATON_HAMMER) && (CanPlay(SongOfTime) || LogicDekuMQCompassGS));});}}),
+                                                                               (IsAdult && CanUse(RG_MEGATON_HAMMER) && (CanPlay(SongOfTime) || LogicDekuMQCompassGS));});}}),
   }, {
                   //Exits
-                  Entrance(DEKU_TREE_MQ_LOBBY, {[]{return true;}}),
+                  Entrance(RR_DEKU_TREE_MQ_LOBBY, {[]{return true;}}),
   });
 
-  areaTable[DEKU_TREE_MQ_BASEMENT_WATER_ROOM_FRONT] = Area("Deku Tree MQ Basement Water Room Front", "Deku Tree", DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_FRONT] = Area("Deku Tree MQ Basement Water Room Front", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST, {[]{return true;}}),
   }, {
                   //Exits
-                  Entrance(DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK, {[]{return LogicDekuMQLog ||  (IsChild && (DekuShield || HylianShield)) ||
-                                                                             (IsAdult && (CanUse(LONGSHOT) || (CanUse(HOOKSHOT) && CanUse(IRON_BOOTS))));}}),
-                  Entrance(DEKU_TREE_MQ_LOBBY,                    {[]{return true;}}),
+                  Entrance(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK, {[]{return LogicDekuMQLog ||  (IsChild && (DekuShield || HylianShield)) ||
+                                                                             (IsAdult && (CanUse(RG_LONGSHOT) || (CanUse(RG_HOOKSHOT) && CanUse(RG_IRON_BOOTS))));}}),
+                  Entrance(RR_DEKU_TREE_MQ_LOBBY,                    {[]{return true;}}),
   });
 
-  areaTable[DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK] = Area("Deku Tree MQ Basement Water Room Front", "Deku Tree", DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK] = Area("Deku Tree MQ Basement Water Room Front", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST, {[]{return CanPlay(SongOfTime);}}),
+                  LocationAccess(RC_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST, {[]{return CanPlay(SongOfTime);}}),
   }, {
                   //Exits
-                  Entrance(DEKU_TREE_MQ_BASEMENT_BACK_ROOM,        {[]{return Here(DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK, []{return (IsChild && CanUse(STICKS)) || CanUse(DINS_FIRE) ||
-                                                                               Here(DEKU_TREE_MQ_BASEMENT_WATER_ROOM_FRONT, []{return IsAdult && CanUse(FIRE_ARROWS);});}) &&
-                                                                                 Here(DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK, []{return IsAdult || KokiriSword || CanUseProjectile || (Nuts && Sticks);});}}),
-                  Entrance(DEKU_TREE_MQ_BASEMENT_WATER_ROOM_FRONT, {[]{return true;}}),
+                  Entrance(RR_DEKU_TREE_MQ_BASEMENT_BACK_ROOM,        {[]{return Here(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK, []{return (IsChild && CanUse(RG_STICKS)) || CanUse(RG_DINS_FIRE) ||
+                                                                               Here(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_FRONT, []{return IsAdult && CanUse(RG_FIRE_ARROWS);});}) &&
+                                                                                 Here(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK, []{return IsAdult || KokiriSword || CanUseProjectile || (Nuts && Sticks);});}}),
+                  Entrance(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_FRONT, {[]{return true;}}),
   });
 
-  areaTable[DEKU_TREE_MQ_BASEMENT_BACK_ROOM] = Area("Deku Tree MQ Basement Back Room", "Deku Tree", DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DEKU_TREE_MQ_BASEMENT_BACK_ROOM] = Area("Deku Tree MQ Basement Back Room", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM, {[]{return (IsAdult && CanUse(LONGSHOT)) || (CanPlay(SongOfTime) && HookshotOrBoomerang);}}),
-                  LocationAccess(DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM,   {[]{return HasFireSourceWithTorch && HookshotOrBoomerang;}}),
+                  LocationAccess(RC_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM, {[]{return (IsAdult && CanUse(RG_LONGSHOT)) || (CanPlay(SongOfTime) && HookshotOrBoomerang);}}),
+                  LocationAccess(RC_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM,   {[]{return HasFireSourceWithTorch && HookshotOrBoomerang;}}),
   }, {
                   //Exits
-                  Entrance(DEKU_TREE_MQ_BASEMENT_LEDGE,           {[]{return IsChild;}}),
-                  Entrance(DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK, {[]{return (IsChild && CanUse(KOKIRI_SWORD)) || CanUseProjectile || (Nuts && (IsChild && CanUse(STICKS)));}}),
+                  Entrance(RR_DEKU_TREE_MQ_BASEMENT_LEDGE,           {[]{return IsChild;}}),
+                  Entrance(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK, {[]{return (IsChild && CanUse(RG_KOKIRI_SWORD)) || CanUseProjectile || (Nuts && (IsChild && CanUse(RG_STICKS)));}}),
   });
 
-  areaTable[DEKU_TREE_MQ_BASEMENT_LEDGE] = Area("Deku Tree MQ Basement Ledge", "Deku Tree", DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DEKU_TREE_MQ_BASEMENT_LEDGE] = Area("Deku Tree MQ Basement Ledge", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(DEKU_TREE_MQ_DEKU_SCRUB, {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_DEKU_TREE_MQ_DEKU_SCRUB, {[]{return CanStunDeku;}}),
   }, {
                   //Exits
-                  Entrance(DEKU_TREE_MQ_BASEMENT_BACK_ROOM, {[]{return IsChild;}}),
-                  Entrance(DEKU_TREE_MQ_LOBBY,              {[]{return true;}}),
-                  Entrance(DEKU_TREE_MQ_OUTSIDE_BOSS_ROOM,
-                         { [] { return Here(DEKU_TREE_MQ_BASEMENT_LEDGE, [] { return HasFireSourceWithTorch; }); } }),
+                  Entrance(RR_DEKU_TREE_MQ_BASEMENT_BACK_ROOM, {[]{return IsChild;}}),
+                  Entrance(RR_DEKU_TREE_MQ_LOBBY,              {[]{return true;}}),
+                  Entrance(RR_DEKU_TREE_MQ_OUTSIDE_BOSS_ROOM,
+                         { [] { return Here(RR_DEKU_TREE_MQ_BASEMENT_LEDGE, [] { return HasFireSourceWithTorch; }); } }),
   });
 
-    areaTable[DEKU_TREE_MQ_OUTSIDE_BOSS_ROOM] =
-            Area("Deku Tree MQ Outside Boss Room", "Deku Tree", DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {},
+    areaTable[RR_DEKU_TREE_MQ_OUTSIDE_BOSS_ROOM] =
+            Area("Deku Tree MQ Outside Boss Room", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {},
                  {
                      // Exits
-                     Entrance(DEKU_TREE_MQ_BASEMENT_LEDGE, { [] { return true; } }),
-                     Entrance(DEKU_TREE_BOSS_ENTRYWAY,
-                              { [] { return Here(DEKU_TREE_MQ_BASEMENT_LEDGE, [] { return HasShield; }); } }),
+                     Entrance(RR_DEKU_TREE_MQ_BASEMENT_LEDGE, { [] { return true; } }),
+                     Entrance(RR_DEKU_TREE_BOSS_ENTRYWAY,
+                              { [] { return Here(RR_DEKU_TREE_MQ_BASEMENT_LEDGE, [] { return HasShield; }); } }),
                  });
   }
 
     /*---------------------------
     |         BOSS ROOM         |
     ---------------------------*/
-    areaTable[DEKU_TREE_BOSS_ENTRYWAY] =
-        Area("Deku Tree Boss Entryway", "Deku Tree", DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {},
+    areaTable[RR_DEKU_TREE_BOSS_ENTRYWAY] =
+        Area("Deku Tree Boss Entryway", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {},
              {
                  // Exits
-                 Entrance(DEKU_TREE_OUTSIDE_BOSS_ROOM, { [] { return Dungeon::DekuTree.IsVanilla(); } }),
-                 Entrance(DEKU_TREE_MQ_OUTSIDE_BOSS_ROOM, { [] { return Dungeon::DekuTree.IsMQ(); } }),
-                 Entrance(DEKU_TREE_BOSS_ROOM, { [] { return true; } }),
+                 Entrance(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM, { [] { return Dungeon::DekuTree.IsVanilla(); } }),
+                 Entrance(RR_DEKU_TREE_MQ_OUTSIDE_BOSS_ROOM, { [] { return Dungeon::DekuTree.IsMQ(); } }),
+                 Entrance(RR_DEKU_TREE_BOSS_ROOM, { [] { return true; } }),
              });
 
-    areaTable[DEKU_TREE_BOSS_ROOM] =
-        Area("Deku Tree Boss Room", "Deku Tree", NONE, NO_DAY_NIGHT_CYCLE,
+    areaTable[RR_DEKU_TREE_BOSS_ROOM] =
+        Area("Deku Tree Boss Room", "Deku Tree", RHT_NONE, NO_DAY_NIGHT_CYCLE,
              {
                  // Events
                  EventAccess(&DekuTreeClear, { [] {
                                                   return DekuTreeClear ||
-                                                         (CanJumpslash && (Nuts || CanUse(SLINGSHOT) || CanUse(BOW) ||
+                                                         (CanJumpslash && (Nuts || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) ||
                                                                            HookshotOrBoomerang));
                                               }}),
              },
              {
                  // Locations
-                 LocationAccess(QUEEN_GOHMA, { [] { return DekuTreeClear; } }),
-                 LocationAccess(DEKU_TREE_QUEEN_GOHMA_HEART, { [] { return DekuTreeClear; } }),
+                 LocationAccess(RC_QUEEN_GOHMA, { [] { return DekuTreeClear; } }),
+                 LocationAccess(RC_DEKU_TREE_QUEEN_GOHMA_HEART, { [] { return DekuTreeClear; } }),
              },
              {
                  // Exits
-                 Entrance(DEKU_TREE_BOSS_ENTRYWAY, { [] { return true; } }),
+                 Entrance(RR_DEKU_TREE_BOSS_ENTRYWAY, { [] { return true; } }),
              });
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp
index 133cdc340..ea591e7c1 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp
@@ -10,197 +10,197 @@ void AreaTable_Init_DodongosCavern() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[DODONGOS_CAVERN_ENTRYWAY] = Area("Dodongos Cavern Entryway", "Dodongos Cavern", DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_ENTRYWAY] = Area("Dodongos Cavern Entryway", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(DODONGOS_CAVERN_BEGINNING,    {[]{return Dungeon::DodongosCavern.IsVanilla();}}),
-                  Entrance(DODONGOS_CAVERN_MQ_BEGINNING, {[]{return Dungeon::DodongosCavern.IsMQ();}}),
-                  Entrance(DEATH_MOUNTAIN_TRAIL,         {[]{return true;}}),
+                  Entrance(RR_DODONGOS_CAVERN_BEGINNING,    {[]{return Dungeon::DodongosCavern.IsVanilla();}}),
+                  Entrance(RR_DODONGOS_CAVERN_MQ_BEGINNING, {[]{return Dungeon::DodongosCavern.IsMQ();}}),
+                  Entrance(RR_DEATH_MOUNTAIN_TRAIL,         {[]{return true;}}),
   });
 
   /*--------------------------
   |     VANILLA DUNGEON      |
   ---------------------------*/
   if (Dungeon::DodongosCavern.IsVanilla()) {
-  areaTable[DODONGOS_CAVERN_BEGINNING] = Area("Dodongos Cavern Beginning", "Dodongos Cavern", DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_BEGINNING] = Area("Dodongos Cavern Beginning", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(DODONGOS_CAVERN_ENTRYWAY, {[]{return true;}}),
-                  Entrance(DODONGOS_CAVERN_LOBBY,    {[]{return Here(DODONGOS_CAVERN_BEGINNING, []{return CanBlastOrSmash || GoronBracelet;});}}),
+                  Entrance(RR_DODONGOS_CAVERN_ENTRYWAY, {[]{return true;}}),
+                  Entrance(RR_DODONGOS_CAVERN_LOBBY,    {[]{return Here(RR_DODONGOS_CAVERN_BEGINNING, []{return CanBlastOrSmash || GoronBracelet;});}}),
   });
 
-  areaTable[DODONGOS_CAVERN_LOBBY] = Area("Dodongos Cavern Lobby", "Dodongos Cavern", DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DODONGOS_CAVERN_LOBBY] = Area("Dodongos Cavern Lobby", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&GossipStoneFairy, {[]{return GossipStoneFairy || (CanSummonGossipFairy && Here(DODONGOS_CAVERN_LOBBY, []{return CanBlastOrSmash || GoronBracelet;}));}}),
+                  EventAccess(&GossipStoneFairy, {[]{return GossipStoneFairy || (CanSummonGossipFairy && Here(RR_DODONGOS_CAVERN_LOBBY, []{return CanBlastOrSmash || GoronBracelet;}));}}),
                 }, {
                   //Locations
-                  LocationAccess(DODONGOS_CAVERN_MAP_CHEST,        {[]{return Here(DODONGOS_CAVERN_LOBBY, []{return CanBlastOrSmash || GoronBracelet;});}}),
-                  LocationAccess(DODONGOS_CAVERN_DEKU_SCRUB_LOBBY, {[]{return CanStunDeku || GoronBracelet;}}),
-                  LocationAccess(DODONGOS_CAVERN_GOSSIP_STONE,     {[]{return Here(DODONGOS_CAVERN_LOBBY, []{return CanBlastOrSmash || GoronBracelet;});}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_MAP_CHEST,        {[]{return Here(RR_DODONGOS_CAVERN_LOBBY, []{return CanBlastOrSmash || GoronBracelet;});}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY, {[]{return CanStunDeku || GoronBracelet;}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_GOSSIP_STONE,     {[]{return Here(RR_DODONGOS_CAVERN_LOBBY, []{return CanBlastOrSmash || GoronBracelet;});}}),
                 }, {
                   //Exits
-                  Entrance(DODONGOS_CAVERN_BEGINNING,    {[]{return true;}}),
-                  Entrance(DODONGOS_CAVERN_LOBBY_SWITCH, {[]{return IsAdult;}}),
-                  Entrance(DODONGOS_CAVERN_SE_CORRIDOR,  {[]{return Here(DODONGOS_CAVERN_LOBBY, []{return CanBlastOrSmash || GoronBracelet;});}}),
-                  Entrance(DODONGOS_CAVERN_STAIRS_LOWER, {[]{return HasAccessTo(DODONGOS_CAVERN_LOBBY_SWITCH);}}),
-                  Entrance(DODONGOS_CAVERN_FAR_BRIDGE,   {[]{return HasAccessTo(DODONGOS_CAVERN_FAR_BRIDGE);}}),
-                  Entrance(DODONGOS_CAVERN_BOSS_AREA,    {[]{return Here(DODONGOS_CAVERN_FAR_BRIDGE, []{return HasExplosives;});}}),
-                  Entrance(DODONGOS_CAVERN_BOSS_ENTRYWAY,{[]{return false;}}),
+                  Entrance(RR_DODONGOS_CAVERN_BEGINNING,    {[]{return true;}}),
+                  Entrance(RR_DODONGOS_CAVERN_LOBBY_SWITCH, {[]{return IsAdult;}}),
+                  Entrance(RR_DODONGOS_CAVERN_SE_CORRIDOR,  {[]{return Here(RR_DODONGOS_CAVERN_LOBBY, []{return CanBlastOrSmash || GoronBracelet;});}}),
+                  Entrance(RR_DODONGOS_CAVERN_STAIRS_LOWER, {[]{return HasAccessTo(RR_DODONGOS_CAVERN_LOBBY_SWITCH);}}),
+                  Entrance(RR_DODONGOS_CAVERN_FAR_BRIDGE,   {[]{return HasAccessTo(RR_DODONGOS_CAVERN_FAR_BRIDGE);}}),
+                  Entrance(RR_DODONGOS_CAVERN_BOSS_AREA,    {[]{return Here(RR_DODONGOS_CAVERN_FAR_BRIDGE, []{return HasExplosives;});}}),
+                  Entrance(RR_DODONGOS_CAVERN_BOSS_ENTRYWAY,{[]{return false;}}),
   });
 
-  areaTable[DODONGOS_CAVERN_LOBBY_SWITCH] = Area("Dodongos Cavern Lobby Switch", "Dodongos Cavern", DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_LOBBY_SWITCH] = Area("Dodongos Cavern Lobby Switch", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(DODONGOS_CAVERN_LOBBY,        {[]{return true;}}),
-                  Entrance(DODONGOS_CAVERN_DODONGO_ROOM, {[]{return true;}}),
+                  Entrance(RR_DODONGOS_CAVERN_LOBBY,        {[]{return true;}}),
+                  Entrance(RR_DODONGOS_CAVERN_DODONGO_ROOM, {[]{return true;}}),
   });
 
-  areaTable[DODONGOS_CAVERN_SE_CORRIDOR] = Area("Dodongos Cavern SE Corridor", "Dodongos Cavern", DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_SE_CORRIDOR] = Area("Dodongos Cavern SE Corridor", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(DODONGOS_CAVERN_GS_SCARECROW, {[]{return CanUse(SCARECROW) || (IsAdult && CanUse(LONGSHOT)) || (LogicDCScarecrowGS && (IsAdult || CanChildAttack));}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_GS_SCARECROW, {[]{return CanUse(RG_SCARECROW) || (IsAdult && CanUse(RG_LONGSHOT)) || (LogicDCScarecrowGS && (IsAdult || CanChildAttack));}}),
                 }, {
                   //Exits
-                  Entrance(DODONGOS_CAVERN_LOBBY,               {[]{return true;}}),
-                  Entrance(DODONGOS_CAVERN_SE_ROOM,             {[]{return Here(DODONGOS_CAVERN_SE_CORRIDOR, []{return CanBlastOrSmash || IsAdult || CanChildAttack || (CanTakeDamage && CanShield);});}}),
-                  Entrance(DODONGOS_CAVERN_NEAR_LOWER_LIZALFOS, {[]{return true;}}),
+                  Entrance(RR_DODONGOS_CAVERN_LOBBY,               {[]{return true;}}),
+                  Entrance(RR_DODONGOS_CAVERN_SE_ROOM,             {[]{return Here(RR_DODONGOS_CAVERN_SE_CORRIDOR, []{return CanBlastOrSmash || IsAdult || CanChildAttack || (CanTakeDamage && CanShield);});}}),
+                  Entrance(RR_DODONGOS_CAVERN_NEAR_LOWER_LIZALFOS, {[]{return true;}}),
   });
 
-  areaTable[DODONGOS_CAVERN_SE_ROOM] = Area("Dodongos Cavern SE Room", "Dodongos Cavern", DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_SE_ROOM] = Area("Dodongos Cavern SE Room", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS, {[]{return IsAdult || CanChildAttack;}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS, {[]{return IsAdult || CanChildAttack;}}),
                 }, {
                   //Exits
-                  Entrance(DODONGOS_CAVERN_SE_CORRIDOR, {[]{return true;}}),
+                  Entrance(RR_DODONGOS_CAVERN_SE_CORRIDOR, {[]{return true;}}),
   });
 
-  areaTable[DODONGOS_CAVERN_NEAR_LOWER_LIZALFOS] = Area("Dodongos Cavern Near Lower Lizalfos", "Dodongos Cavern", DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_NEAR_LOWER_LIZALFOS] = Area("Dodongos Cavern Near Lower Lizalfos", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(DODONGOS_CAVERN_SE_CORRIDOR,    {[]{return true;}}),
-                  Entrance(DODONGOS_CAVERN_LOWER_LIZALFOS, {[]{return true;}}),
+                  Entrance(RR_DODONGOS_CAVERN_SE_CORRIDOR,    {[]{return true;}}),
+                  Entrance(RR_DODONGOS_CAVERN_LOWER_LIZALFOS, {[]{return true;}}),
   });
 
-  areaTable[DODONGOS_CAVERN_LOWER_LIZALFOS] = Area("Dodongos Cavern Lower Lizalfos", "Dodongos Cavern", DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_LOWER_LIZALFOS] = Area("Dodongos Cavern Lower Lizalfos", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(DODONGOS_CAVERN_NEAR_LOWER_LIZALFOS, {[]{return Here(DODONGOS_CAVERN_LOWER_LIZALFOS, []{return IsAdult || Slingshot || Sticks || KokiriSword || HasExplosives;});}}),
-                  Entrance(DODONGOS_CAVERN_DODONGO_ROOM,        {[]{return Here(DODONGOS_CAVERN_LOWER_LIZALFOS, []{return IsAdult || Slingshot || Sticks || KokiriSword || HasExplosives;});}}),
+                  Entrance(RR_DODONGOS_CAVERN_NEAR_LOWER_LIZALFOS, {[]{return Here(RR_DODONGOS_CAVERN_LOWER_LIZALFOS, []{return IsAdult || Slingshot || Sticks || KokiriSword || HasExplosives;});}}),
+                  Entrance(RR_DODONGOS_CAVERN_DODONGO_ROOM,        {[]{return Here(RR_DODONGOS_CAVERN_LOWER_LIZALFOS, []{return IsAdult || Slingshot || Sticks || KokiriSword || HasExplosives;});}}),
   });
 
-  areaTable[DODONGOS_CAVERN_DODONGO_ROOM] = Area("Dodongos Cavern Dodongo Room", "Dodongos Cavern", DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_DODONGO_ROOM] = Area("Dodongos Cavern Dodongo Room", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(DODONGOS_CAVERN_LOBBY_SWITCH,      {[]{return HasFireSourceWithTorch;}}),
-                  Entrance(DODONGOS_CAVERN_LOWER_LIZALFOS,    {[]{return true;}}),
-                  Entrance(DODONGOS_CAVERN_NEAR_DODONGO_ROOM, {[]{return Here(DODONGOS_CAVERN_DODONGO_ROOM, []{return CanBlastOrSmash || GoronBracelet;});}}),
+                  Entrance(RR_DODONGOS_CAVERN_LOBBY_SWITCH,      {[]{return HasFireSourceWithTorch;}}),
+                  Entrance(RR_DODONGOS_CAVERN_LOWER_LIZALFOS,    {[]{return true;}}),
+                  Entrance(RR_DODONGOS_CAVERN_NEAR_DODONGO_ROOM, {[]{return Here(RR_DODONGOS_CAVERN_DODONGO_ROOM, []{return CanBlastOrSmash || GoronBracelet;});}}),
   });
 
-  areaTable[DODONGOS_CAVERN_NEAR_DODONGO_ROOM] = Area("Dodongos Cavern Near Dodongo Room", "Dodongos Cavern", DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_NEAR_DODONGO_ROOM] = Area("Dodongos Cavern Near Dodongo Room", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS, {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS, {[]{return CanStunDeku;}}),
                 }, {
                   //Exits
-                  Entrance(DODONGOS_CAVERN_DODONGO_ROOM, {[]{return true;}}),
+                  Entrance(RR_DODONGOS_CAVERN_DODONGO_ROOM, {[]{return true;}}),
   });
 
-  areaTable[DODONGOS_CAVERN_STAIRS_LOWER] = Area("Dodongos Cavern Stairs Lower", "Dodongos Cavern", DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_STAIRS_LOWER] = Area("Dodongos Cavern Stairs Lower", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(DODONGOS_CAVERN_LOBBY,        {[]{return true;}}),
-                  Entrance(DODONGOS_CAVERN_STAIRS_UPPER, {[]{return HasExplosives || GoronBracelet || CanUse(DINS_FIRE) || (LogicDCStaircase && CanUse(BOW));}}),
-                  Entrance(DODONGOS_CAVERN_COMPASS_ROOM, {[]{return Here(DODONGOS_CAVERN_STAIRS_LOWER, []{return CanBlastOrSmash || GoronBracelet;});}}),
+                  Entrance(RR_DODONGOS_CAVERN_LOBBY,        {[]{return true;}}),
+                  Entrance(RR_DODONGOS_CAVERN_STAIRS_UPPER, {[]{return HasExplosives || GoronBracelet || CanUse(RG_DINS_FIRE) || (LogicDCStaircase && CanUse(RG_FAIRY_BOW));}}),
+                  Entrance(RR_DODONGOS_CAVERN_COMPASS_ROOM, {[]{return Here(RR_DODONGOS_CAVERN_STAIRS_LOWER, []{return CanBlastOrSmash || GoronBracelet;});}}),
   });
 
-  areaTable[DODONGOS_CAVERN_STAIRS_UPPER] = Area("Dodongos Cavern Stairs Upper", "Dodongos Cavern", DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_STAIRS_UPPER] = Area("Dodongos Cavern Stairs Upper", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS, {[]{return Here(DODONGOS_CAVERN_FAR_BRIDGE, []{return HookshotOrBoomerang;}) || CanUse(LONGSHOT);}}),
-                  LocationAccess(DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS,  {[]{return IsAdult || CanChildAttack || (HasAccessTo(DODONGOS_CAVERN_STAIRS_LOWER) && CanUse(LONGSHOT) && LogicDCVinesGS);}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS, {[]{return Here(RR_DODONGOS_CAVERN_FAR_BRIDGE, []{return HookshotOrBoomerang;}) || CanUse(RG_LONGSHOT);}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS,  {[]{return IsAdult || CanChildAttack || (HasAccessTo(RR_DODONGOS_CAVERN_STAIRS_LOWER) && CanUse(RG_LONGSHOT) && LogicDCVinesGS);}}),
                 }, {
                   //Exits
-                  Entrance(DODONGOS_CAVERN_STAIRS_LOWER, {[]{return true;}}),
-                  Entrance(DODONGOS_CAVERN_ARMOS_ROOM,   {[]{return true;}}),
+                  Entrance(RR_DODONGOS_CAVERN_STAIRS_LOWER, {[]{return true;}}),
+                  Entrance(RR_DODONGOS_CAVERN_ARMOS_ROOM,   {[]{return true;}}),
   });
 
-  areaTable[DODONGOS_CAVERN_COMPASS_ROOM] = Area("Dodongos Cavern Compass Room", "Dodongos Cavern", DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_COMPASS_ROOM] = Area("Dodongos Cavern Compass Room", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(DODONGOS_CAVERN_COMPASS_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_COMPASS_CHEST, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(DODONGOS_CAVERN_STAIRS_LOWER, {[]{return IsAdult || HasExplosives || GoronBracelet;}}),
+                  Entrance(RR_DODONGOS_CAVERN_STAIRS_LOWER, {[]{return IsAdult || HasExplosives || GoronBracelet;}}),
   });
 
-  areaTable[DODONGOS_CAVERN_ARMOS_ROOM] = Area("Dodongos Cavern Armos Room", "Dodongos Cavern", DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_ARMOS_ROOM] = Area("Dodongos Cavern Armos Room", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(DODONGOS_CAVERN_STAIRS_UPPER,    {[]{return true;}}),
-                  Entrance(DODONGOS_CAVERN_BOMB_ROOM_LOWER, {[]{return true;}}),
+                  Entrance(RR_DODONGOS_CAVERN_STAIRS_UPPER,    {[]{return true;}}),
+                  Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER, {[]{return true;}}),
   });
 
-  areaTable[DODONGOS_CAVERN_BOMB_ROOM_LOWER] = Area("Dodongos Cavern Bomb Room Lower", "Dodongos Cavern", DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER] = Area("Dodongos Cavern Bomb Room Lower", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(DODONGOS_CAVERN_2F_SIDE_ROOM,         {[]{return Here(DODONGOS_CAVERN_BOMB_ROOM_LOWER, []{return CanBlastOrSmash || (LogicDCScrubRoom && GoronBracelet);});}}),
-                  Entrance(DODONGOS_CAVERN_FIRST_SLINGSHOT_ROOM, {[]{return Here(DODONGOS_CAVERN_BOMB_ROOM_LOWER, []{return CanBlastOrSmash || GoronBracelet;});}}),
-                  Entrance(DODONGOS_CAVERN_BOMB_ROOM_UPPER,      {[]{return (IsAdult && LogicDCJump) || CanUse(HOVER_BOOTS) || (IsAdult && CanUse(LONGSHOT));}}),
+                  Entrance(RR_DODONGOS_CAVERN_2F_SIDE_ROOM,         {[]{return Here(RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER, []{return CanBlastOrSmash || (LogicDCScrubRoom && GoronBracelet);});}}),
+                  Entrance(RR_DODONGOS_CAVERN_FIRST_SLINGSHOT_ROOM, {[]{return Here(RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER, []{return CanBlastOrSmash || GoronBracelet;});}}),
+                  Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_UPPER,      {[]{return (IsAdult && LogicDCJump) || CanUse(RG_HOVER_BOOTS) || (IsAdult && CanUse(RG_LONGSHOT));}}),
   });
 
-  areaTable[DODONGOS_CAVERN_2F_SIDE_ROOM] = Area("Dodongos Cavern 2F Side Room", "Dodongos Cavern", DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_2F_SIDE_ROOM] = Area("Dodongos Cavern 2F Side Room", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,  {[]{return CanStunDeku;}}),
-                  LocationAccess(DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT, {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,  {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT, {[]{return CanStunDeku;}}),
                 }, {
                   //Exits
-                  Entrance(DODONGOS_CAVERN_BOMB_ROOM_LOWER, {[]{return true;}}),
+                  Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER, {[]{return true;}}),
   });
 
-  areaTable[DODONGOS_CAVERN_FIRST_SLINGSHOT_ROOM] = Area("Dodongos Cavern First Slingshot Room", "Dodongos Cavern", DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_FIRST_SLINGSHOT_ROOM] = Area("Dodongos Cavern First Slingshot Room", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(DODONGOS_CAVERN_BOMB_ROOM_LOWER, {[]{return true;}}),
-                  Entrance(DODONGOS_CAVERN_UPPER_LIZALFOS,  {[]{return CanUse(SLINGSHOT) || CanUse(BOW) || LogicDCSlingshotSkip;}}),
+                  Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER, {[]{return true;}}),
+                  Entrance(RR_DODONGOS_CAVERN_UPPER_LIZALFOS,  {[]{return CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || LogicDCSlingshotSkip;}}),
   });
 
-  areaTable[DODONGOS_CAVERN_UPPER_LIZALFOS] = Area("Dodongos Cavern Upper Lizalfos", "Dodongos Cavern", DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_UPPER_LIZALFOS] = Area("Dodongos Cavern Upper Lizalfos", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(DODONGOS_CAVERN_LOWER_LIZALFOS,        {[]{return true;}}),
-                  Entrance(DODONGOS_CAVERN_FIRST_SLINGSHOT_ROOM,  {[]{return Here(DODONGOS_CAVERN_LOWER_LIZALFOS, []{return IsAdult || Slingshot || Sticks || KokiriSword || HasExplosives;});}}),
-                  Entrance(DODONGOS_CAVERN_SECOND_SLINGSHOT_ROOM, {[]{return Here(DODONGOS_CAVERN_LOWER_LIZALFOS, []{return IsAdult || Slingshot || Sticks || KokiriSword || HasExplosives;});}}),
+                  Entrance(RR_DODONGOS_CAVERN_LOWER_LIZALFOS,        {[]{return true;}}),
+                  Entrance(RR_DODONGOS_CAVERN_FIRST_SLINGSHOT_ROOM,  {[]{return Here(RR_DODONGOS_CAVERN_LOWER_LIZALFOS, []{return IsAdult || Slingshot || Sticks || KokiriSword || HasExplosives;});}}),
+                  Entrance(RR_DODONGOS_CAVERN_SECOND_SLINGSHOT_ROOM, {[]{return Here(RR_DODONGOS_CAVERN_LOWER_LIZALFOS, []{return IsAdult || Slingshot || Sticks || KokiriSword || HasExplosives;});}}),
   });
 
-  areaTable[DODONGOS_CAVERN_SECOND_SLINGSHOT_ROOM] = Area("Dodongos Cavern Second Slingshot Room", "Dodongos Cavern", DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_SECOND_SLINGSHOT_ROOM] = Area("Dodongos Cavern Second Slingshot Room", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(DODONGOS_CAVERN_UPPER_LIZALFOS,  {[]{return true;}}),
-                  Entrance(DODONGOS_CAVERN_BOMB_ROOM_UPPER, {[]{return CanUse(SLINGSHOT) || CanUse(BOW) || LogicDCSlingshotSkip;}}),
+                  Entrance(RR_DODONGOS_CAVERN_UPPER_LIZALFOS,  {[]{return true;}}),
+                  Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_UPPER, {[]{return CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || LogicDCSlingshotSkip;}}),
   });
 
-  areaTable[DODONGOS_CAVERN_BOMB_ROOM_UPPER] = Area("Dodongos Cavern Bomb Room Upper", "Dodongos Cavern", DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_BOMB_ROOM_UPPER] = Area("Dodongos Cavern Bomb Room Upper", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(DODONGOS_CAVERN_BOMB_BAG_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_BOMB_BAG_CHEST, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(DODONGOS_CAVERN_BOMB_ROOM_LOWER,       {[]{return true;}}),
-                  Entrance(DODONGOS_CAVERN_SECOND_SLINGSHOT_ROOM, {[]{return true;}}),
-                  Entrance(DODONGOS_CAVERN_FAR_BRIDGE,            {[]{return true;}}),
+                  Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER,       {[]{return true;}}),
+                  Entrance(RR_DODONGOS_CAVERN_SECOND_SLINGSHOT_ROOM, {[]{return true;}}),
+                  Entrance(RR_DODONGOS_CAVERN_FAR_BRIDGE,            {[]{return true;}}),
   });
 
-  areaTable[DODONGOS_CAVERN_FAR_BRIDGE] = Area("Dodongos Cavern Far Bridge", "Dodongos Cavern", DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_FAR_BRIDGE] = Area("Dodongos Cavern Far Bridge", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(DODONGOS_CAVERN_END_OF_BRIDGE_CHEST, {[]{return Here(DODONGOS_CAVERN_FAR_BRIDGE, []{return CanBlastOrSmash;});}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST, {[]{return Here(RR_DODONGOS_CAVERN_FAR_BRIDGE, []{return CanBlastOrSmash;});}}),
                 }, {
                   //Exits
-                  Entrance(DODONGOS_CAVERN_LOBBY,           {[]{return true;}}),
-                  Entrance(DODONGOS_CAVERN_BOMB_ROOM_UPPER, {[]{return true;}}),
+                  Entrance(RR_DODONGOS_CAVERN_LOBBY,           {[]{return true;}}),
+                  Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_UPPER, {[]{return true;}}),
   });
 
-  areaTable[DODONGOS_CAVERN_BOSS_AREA] = Area("Dodongos Cavern Boss Area", "Dodongos Cavern", DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DODONGOS_CAVERN_BOSS_AREA] = Area("Dodongos Cavern Boss Area", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FairyPot, {[]{return true;}}),
                 }, {}, {
                   //Exits
-                  Entrance(DODONGOS_CAVERN_LOBBY, {[]{return true;}}),
-                  Entrance(DODONGOS_CAVERN_BACK_ROOM, {[]{return Here(DODONGOS_CAVERN_BOSS_AREA, []{return CanBlastOrSmash;});}}),
-                  Entrance(DODONGOS_CAVERN_BOSS_ENTRYWAY, {[]{return true;}}),
+                  Entrance(RR_DODONGOS_CAVERN_LOBBY, {[]{return true;}}),
+                  Entrance(RR_DODONGOS_CAVERN_BACK_ROOM, {[]{return Here(RR_DODONGOS_CAVERN_BOSS_AREA, []{return CanBlastOrSmash;});}}),
+                  Entrance(RR_DODONGOS_CAVERN_BOSS_ENTRYWAY, {[]{return true;}}),
   });
 
-  areaTable[DODONGOS_CAVERN_BACK_ROOM] = Area("Dodongos Cavern Back Room", "Dodongos Cavern", DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_BACK_ROOM] = Area("Dodongos Cavern Back Room", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(DODONGOS_CAVERN_GS_BACK_ROOM, {[]{return IsAdult || CanChildAttack;}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_GS_BACK_ROOM, {[]{return IsAdult || CanChildAttack;}}),
                 }, {
                   //Exits
-                  Entrance(DODONGOS_CAVERN_BOSS_AREA, {[]{return true;}}),
+                  Entrance(RR_DODONGOS_CAVERN_BOSS_AREA, {[]{return true;}}),
   });
   }
 
@@ -208,102 +208,102 @@ void AreaTable_Init_DodongosCavern() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (Dungeon::DodongosCavern.IsMQ()) {
-  areaTable[DODONGOS_CAVERN_MQ_BEGINNING] = Area("Dodongos Cavern MQ Beginning", "Dodongos Cavern", DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_MQ_BEGINNING] = Area("Dodongos Cavern MQ Beginning", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(DODONGOS_CAVERN_ENTRYWAY, {[]{return true;}}),
-                  Entrance(DODONGOS_CAVERN_MQ_LOBBY, {[]{return Here(DODONGOS_CAVERN_MQ_BEGINNING, []{return CanBlastOrSmash || GoronBracelet;});}}),
+                  Entrance(RR_DODONGOS_CAVERN_ENTRYWAY, {[]{return true;}}),
+                  Entrance(RR_DODONGOS_CAVERN_MQ_LOBBY, {[]{return Here(RR_DODONGOS_CAVERN_MQ_BEGINNING, []{return CanBlastOrSmash || GoronBracelet;});}}),
   });
 
-  areaTable[DODONGOS_CAVERN_MQ_LOBBY] = Area("Dodongos Cavern MQ Lobby", "Dodongos Cavern", DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DODONGOS_CAVERN_MQ_LOBBY] = Area("Dodongos Cavern MQ Lobby", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&DekuBabaSticks,   {[]{return DekuBabaSticks || (IsAdult || KokiriSword || Boomerang);}}),
                   EventAccess(&GossipStoneFairy, {[]{return GossipStoneFairy || CanSummonGossipFairy;}}),
   }, {
                   //Locations
-                  LocationAccess(DODONGOS_CAVERN_MQ_MAP_CHEST,                  {[]{return true;}}),
-                  LocationAccess(DODONGOS_CAVERN_MQ_COMPASS_CHEST,              {[]{return IsAdult || CanChildAttack || Nuts;}}),
-                  LocationAccess(DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST,          {[]{return (IsChild && CanUse(STICKS)) || HasFireSource;}}),
-                  LocationAccess(DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST,    {[]{return CanBlastOrSmash || (IsChild && CanUse(STICKS)) || CanUse(DINS_FIRE) || (IsAdult && (LogicDCJump || HoverBoots || Hookshot));}}),
-                  LocationAccess(DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM, {[]{return CanPlay(SongOfTime) && (CanChildAttack || IsAdult);}}),
-                  LocationAccess(DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM,             {[]{return (IsChild && CanUse(STICKS)) || HasFireSource;}}),
-                  LocationAccess(DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM,           {[]{return CanBlastOrSmash;}}),
-                  LocationAccess(DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,      {[]{return CanStunDeku;}}),
-                  LocationAccess(DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT,     {[]{return CanStunDeku;}}),
-                  LocationAccess(DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,       {[]{return CanStunDeku;}}),
-                  LocationAccess(DODONGOS_CAVERN_GOSSIP_STONE,                  {[]{return true;}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_MQ_MAP_CHEST,                  {[]{return true;}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_MQ_COMPASS_CHEST,              {[]{return IsAdult || CanChildAttack || Nuts;}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST,          {[]{return (IsChild && CanUse(RG_STICKS)) || HasFireSource;}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST,    {[]{return CanBlastOrSmash || (IsChild && CanUse(RG_STICKS)) || CanUse(RG_DINS_FIRE) || (IsAdult && (LogicDCJump || HoverBoots || Hookshot));}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM, {[]{return CanPlay(SongOfTime) && (CanChildAttack || IsAdult);}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM,             {[]{return (IsChild && CanUse(RG_STICKS)) || HasFireSource;}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM,           {[]{return CanBlastOrSmash;}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,      {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT,     {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,       {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_GOSSIP_STONE,                  {[]{return true;}}),
   }, {
                   //Exits
-                  Entrance(DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE,  {[]{return Here(DODONGOS_CAVERN_MQ_LOBBY, []{return CanBlastOrSmash || (((IsChild && CanUse(STICKS)) || CanUse(DINS_FIRE)) && CanTakeDamage);});}}),
-                  Entrance(DODONGOS_CAVERN_MQ_BOMB_BAG_AREA,     {[]{return IsAdult || (Here(DODONGOS_CAVERN_MQ_LOBBY, []{return IsAdult;}) && HasExplosives) || (LogicDCMQChildBombs && CanJumpslash && CanTakeDamage);}}),
+                  Entrance(RR_DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE,  {[]{return Here(RR_DODONGOS_CAVERN_MQ_LOBBY, []{return CanBlastOrSmash || (((IsChild && CanUse(RG_STICKS)) || CanUse(RG_DINS_FIRE)) && CanTakeDamage);});}}),
+                  Entrance(RR_DODONGOS_CAVERN_MQ_BOMB_BAG_AREA,     {[]{return IsAdult || (Here(RR_DODONGOS_CAVERN_MQ_LOBBY, []{return IsAdult;}) && HasExplosives) || (LogicDCMQChildBombs && CanJumpslash && CanTakeDamage);}}),
                     //Trick: IsAdult || HasExplosives || (LogicDCMQChildBombs && (KokiriSword || Sticks) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO))
-                  Entrance(DODONGOS_CAVERN_MQ_BOSS_AREA,         {[]{return HasExplosives || (GoronBracelet && ((IsAdult && LogicDCMQEyesAdult) || (IsChild && LogicDCMQEyesChild)) && ((IsChild && (CanUse(STICKS))) || CanUse(DINS_FIRE) || (IsAdult && (LogicDCJump || Hammer || HoverBoots || Hookshot))));}}), 
-                    //Trick: HasExplosives || (LogicDCMQEyes && GoronBracelet && (IsAdult || LogicDCMQChildBack) && ((IsChild && CanUse(STICKS)) || CanUse(DINS_FIRE) || (IsAdult && (LogicDCJump || Hammer || HoverBoots || Hookshot))))
+                  Entrance(RR_DODONGOS_CAVERN_MQ_BOSS_AREA,         {[]{return HasExplosives || (GoronBracelet && ((IsAdult && LogicDCMQEyesAdult) || (IsChild && LogicDCMQEyesChild)) && ((IsChild && (CanUse(RG_STICKS))) || CanUse(RG_DINS_FIRE) || (IsAdult && (LogicDCJump || Hammer || HoverBoots || Hookshot))));}}), 
+                    //Trick: HasExplosives || (LogicDCMQEyes && GoronBracelet && (IsAdult || LogicDCMQChildBack) && ((IsChild && CanUse(RG_STICKS)) || CanUse(RG_DINS_FIRE) || (IsAdult && (LogicDCJump || Hammer || HoverBoots || Hookshot))))
   });
 
-  areaTable[DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE] = Area("Dodongos Cavern MQ Lower Right Side", "Dodongos Cavern", DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE] = Area("Dodongos Cavern MQ Lower Right Side", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS, {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS, {[]{return CanStunDeku;}}),
   }, {
                   //Exits
-                  Entrance(DODONGOS_CAVERN_MQ_BOMB_BAG_AREA, {[]{return (Here(DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE, []{return IsAdult && CanUse(BOW);}) || GoronBracelet ||
-                                                                                CanUse(DINS_FIRE) || HasExplosives) &&
-                                                                                IsChild && CanUse(SLINGSHOT);}}),
+                  Entrance(RR_DODONGOS_CAVERN_MQ_BOMB_BAG_AREA, {[]{return (Here(RR_DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE, []{return IsAdult && CanUse(RG_FAIRY_BOW);}) || GoronBracelet ||
+                                                                                CanUse(RG_DINS_FIRE) || HasExplosives) &&
+                                                                                IsChild && CanUse(RG_FAIRY_SLINGSHOT);}}),
   });
 
-  areaTable[DODONGOS_CAVERN_MQ_BOMB_BAG_AREA] = Area("Dodongos Cavern MQ Bomb Bag Area", "Dodongos Cavern", DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_MQ_BOMB_BAG_AREA] = Area("Dodongos Cavern MQ Bomb Bag Area", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST, {[]{return true;}}),
-                  LocationAccess(DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM,  {[]{return (Here(DODONGOS_CAVERN_MQ_BOMB_BAG_AREA, []{return IsAdult && CanUse(BOW);}) ||  GoronBracelet || CanUse(DINS_FIRE) || HasExplosives) && HookshotOrBoomerang;}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM,  {[]{return (Here(RR_DODONGOS_CAVERN_MQ_BOMB_BAG_AREA, []{return IsAdult && CanUse(RG_FAIRY_BOW);}) ||  GoronBracelet || CanUse(RG_DINS_FIRE) || HasExplosives) && HookshotOrBoomerang;}}),
   }, {
                   //Exits
-                  Entrance(DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE, {[]{return true;}}),
+                  Entrance(RR_DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE, {[]{return true;}}),
   });
 
-  areaTable[DODONGOS_CAVERN_MQ_BOSS_AREA] = Area("Dodongos Cavern MQ BossArea", "Dodongos Cavern", DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DODONGOS_CAVERN_MQ_BOSS_AREA] = Area("Dodongos Cavern MQ BossArea", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FairyPot,            {[]{return true;}}),
   }, {
                   //Locations
-                  LocationAccess(DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST, {[]{return true;}}),
-                  LocationAccess(DODONGOS_CAVERN_MQ_GS_BACK_AREA,      {[]{return true;}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_MQ_GS_BACK_AREA,      {[]{return true;}}),
   }, {
                   //Exits
-                  Entrance(DODONGOS_CAVERN_BOSS_ENTRYWAY, {[]{return true;}}),
+                  Entrance(RR_DODONGOS_CAVERN_BOSS_ENTRYWAY, {[]{return true;}}),
   });
   }
 
     /*---------------------------
     |         BOSS ROOM         |
     ---------------------------*/
-    areaTable[DODONGOS_CAVERN_BOSS_ENTRYWAY] =
-        Area("Dodongos Cavern Boss Entryway", "Dodongos Cavern", DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {},
+    areaTable[RR_DODONGOS_CAVERN_BOSS_ENTRYWAY] =
+        Area("Dodongos Cavern Boss Entryway", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {},
              {
                  // Exits
-                 Entrance(DODONGOS_CAVERN_BOSS_AREA, { [] { return Dungeon::DodongosCavern.IsVanilla(); } }),
-                 Entrance(DODONGOS_CAVERN_MQ_BOSS_AREA, { [] { return Dungeon::DodongosCavern.IsMQ(); } }),
-                 Entrance(DODONGOS_CAVERN_BOSS_ROOM, { [] { return true; } }),
+                 Entrance(RR_DODONGOS_CAVERN_BOSS_AREA, { [] { return Dungeon::DodongosCavern.IsVanilla(); } }),
+                 Entrance(RR_DODONGOS_CAVERN_MQ_BOSS_AREA, { [] { return Dungeon::DodongosCavern.IsMQ(); } }),
+                 Entrance(RR_DODONGOS_CAVERN_BOSS_ROOM, { [] { return true; } }),
              });
 
-    areaTable[DODONGOS_CAVERN_BOSS_ROOM] =
-        Area("Dodongos Cavern Boss Room", "Dodongos Cavern", NONE, NO_DAY_NIGHT_CYCLE,
+    areaTable[RR_DODONGOS_CAVERN_BOSS_ROOM] =
+        Area("Dodongos Cavern Boss Room", "Dodongos Cavern", RHT_NONE, NO_DAY_NIGHT_CYCLE,
              {
                  // Events
                  EventAccess(&DodongosCavernClear,
                              { [] {
                                   return DodongosCavernClear ||
-                                         (Here(DODONGOS_CAVERN_BOSS_ROOM,
-                                               [] { return HasExplosives || (CanUse(MEGATON_HAMMER) && LogicDCHammerFloor); }) &&
+                                         (Here(RR_DODONGOS_CAVERN_BOSS_ROOM,
+                                               [] { return HasExplosives || (CanUse(RG_MEGATON_HAMMER) && LogicDCHammerFloor); }) &&
                                           (Bombs || GoronBracelet) && CanJumpslash); /*todo add chu kill to tricks*/
                               }}),
              },
              {
                  // Locations
-                 LocationAccess(DODONGOS_CAVERN_BOSS_ROOM_CHEST, { [] { return true; } }),
-                 LocationAccess(DODONGOS_CAVERN_KING_DODONGO_HEART, { [] { return DodongosCavernClear; } }),
-                 LocationAccess(KING_DODONGO, { [] { return DodongosCavernClear; } }),
+                 LocationAccess(RC_DODONGOS_CAVERN_BOSS_ROOM_CHEST, { [] { return true; } }),
+                 LocationAccess(RC_DODONGOS_CAVERN_KING_DODONGO_HEART, { [] { return DodongosCavernClear; } }),
+                 LocationAccess(RC_KING_DODONGO, { [] { return DodongosCavernClear; } }),
              },
              {
                  // Exits
-                 Entrance(DODONGOS_CAVERN_BOSS_ENTRYWAY, { [] { return true; } }),
+                 Entrance(RR_DODONGOS_CAVERN_BOSS_ENTRYWAY, { [] { return true; } }),
              });
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp
index 887766fe5..36a19e172 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp
@@ -10,301 +10,301 @@ void AreaTable_Init_FireTemple() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[FIRE_TEMPLE_ENTRYWAY] = Area("Fire Temple Entryway", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_ENTRYWAY] = Area("Fire Temple Entryway", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(FIRE_TEMPLE_FIRST_ROOM, {[]{return Dungeon::FireTemple.IsVanilla();}}),
-                  Entrance(FIRE_TEMPLE_MQ_LOWER,   {[]{return Dungeon::FireTemple.IsMQ();}}),
-                  Entrance(DMC_CENTRAL_LOCAL,      {[]{return true;}}),
+                  Entrance(RR_FIRE_TEMPLE_FIRST_ROOM, {[]{return Dungeon::FireTemple.IsVanilla();}}),
+                  Entrance(RR_FIRE_TEMPLE_MQ_LOWER,   {[]{return Dungeon::FireTemple.IsMQ();}}),
+                  Entrance(RR_DMC_CENTRAL_LOCAL,      {[]{return true;}}),
   });
 
   /*--------------------------
   |     VANILLA DUNGEON      |
   ---------------------------*/
   if (Dungeon::FireTemple.IsVanilla()) {
-  areaTable[FIRE_TEMPLE_FIRST_ROOM] = Area("Fire Temple First Room", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_FIRST_ROOM] = Area("Fire Temple First Room", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                 }, {
                   //Exits
-                  Entrance(FIRE_TEMPLE_ENTRYWAY,       {[]{return true;}}),
-                  Entrance(FIRE_TEMPLE_NEAR_BOSS_ROOM, {[]{return FireTimer >= 24;}}),
-                  Entrance(FIRE_TEMPLE_LOOP_ENEMIES,   {[]{return Here(FIRE_TEMPLE_FIRST_ROOM, []{return CanUse(MEGATON_HAMMER);}) && (SmallKeys(FIRE_TEMPLE, 8) || !IsKeysanity);}}),
-                  Entrance(FIRE_TEMPLE_LOOP_EXIT,      {[]{return true;}}),
-                  Entrance(FIRE_TEMPLE_BIG_LAVA_ROOM,  {[]{return SmallKeys(FIRE_TEMPLE, 2) && FireTimer >= 24;}}),
+                  Entrance(RR_FIRE_TEMPLE_ENTRYWAY,       {[]{return true;}}),
+                  Entrance(RR_FIRE_TEMPLE_NEAR_BOSS_ROOM, {[]{return FireTimer >= 24;}}),
+                  Entrance(RR_FIRE_TEMPLE_LOOP_ENEMIES,   {[]{return Here(RR_FIRE_TEMPLE_FIRST_ROOM, []{return CanUse(RG_MEGATON_HAMMER);}) && (SmallKeys(RR_FIRE_TEMPLE, 8) || !IsKeysanity);}}),
+                  Entrance(RR_FIRE_TEMPLE_LOOP_EXIT,      {[]{return true;}}),
+                  Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM,  {[]{return SmallKeys(RR_FIRE_TEMPLE, 2) && FireTimer >= 24;}}),
   });
 
-  areaTable[FIRE_TEMPLE_NEAR_BOSS_ROOM] = Area("Fire Temple Near Boss Room", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FIRE_TEMPLE_NEAR_BOSS_ROOM] = Area("Fire Temple Near Boss Room", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&FairyPot, {[]{return FairyPot || (CanUse(HOVER_BOOTS) || CanUse(HOOKSHOT));}}),
+                  EventAccess(&FairyPot, {[]{return FairyPot || (CanUse(RG_HOVER_BOOTS) || CanUse(RG_HOOKSHOT));}}),
                 }, {
                   //Locations
-                  LocationAccess(FIRE_TEMPLE_NEAR_BOSS_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_FIRE_TEMPLE_NEAR_BOSS_CHEST, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(FIRE_TEMPLE_FIRST_ROOM, {[]{return true;}}),
-                  Entrance(FIRE_TEMPLE_BOSS_ENTRYWAY, {[]{return BossKeyFireTemple && ((IsAdult && LogicFireBossDoorJump) || CanUse(HOVER_BOOTS) || Here(FIRE_TEMPLE_FIRE_MAZE_UPPER, []{return CanUse(MEGATON_HAMMER);}));}}),
+                  Entrance(RR_FIRE_TEMPLE_FIRST_ROOM, {[]{return true;}}),
+                  Entrance(RR_FIRE_TEMPLE_BOSS_ENTRYWAY, {[]{return BossKeyFireTemple && ((IsAdult && LogicFireBossDoorJump) || CanUse(RG_HOVER_BOOTS) || Here(RR_FIRE_TEMPLE_FIRE_MAZE_UPPER, []{return CanUse(RG_MEGATON_HAMMER);}));}}),
   });
 
-  areaTable[FIRE_TEMPLE_LOOP_ENEMIES] = Area("Fire Temple Loop Enemies", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_LOOP_ENEMIES] = Area("Fire Temple Loop Enemies", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(FIRE_TEMPLE_FIRST_ROOM, {[]{return SmallKeys(FIRE_TEMPLE, 8) || !IsKeysanity;}}),
-                  Entrance(FIRE_TEMPLE_LOOP_TILES, {[]{return Here(FIRE_TEMPLE_LOOP_ENEMIES, []{return IsAdult || KokiriSword;});}}),
+                  Entrance(RR_FIRE_TEMPLE_FIRST_ROOM, {[]{return SmallKeys(RR_FIRE_TEMPLE, 8) || !IsKeysanity;}}),
+                  Entrance(RR_FIRE_TEMPLE_LOOP_TILES, {[]{return Here(RR_FIRE_TEMPLE_LOOP_ENEMIES, []{return IsAdult || KokiriSword;});}}),
   });
 
-  areaTable[FIRE_TEMPLE_LOOP_TILES] = Area("Fire Temple Loop Tiles", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_LOOP_TILES] = Area("Fire Temple Loop Tiles", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(FIRE_TEMPLE_GS_BOSS_KEY_LOOP, {[]{return IsAdult || CanChildAttack;}}),
+                  LocationAccess(RC_FIRE_TEMPLE_GS_BOSS_KEY_LOOP, {[]{return IsAdult || CanChildAttack;}}),
                 }, {
                   //Exits
-                  Entrance(FIRE_TEMPLE_LOOP_ENEMIES,      {[]{return true;}}),
-                  Entrance(FIRE_TEMPLE_LOOP_FLARE_DANCER, {[]{return true;}}),
+                  Entrance(RR_FIRE_TEMPLE_LOOP_ENEMIES,      {[]{return true;}}),
+                  Entrance(RR_FIRE_TEMPLE_LOOP_FLARE_DANCER, {[]{return true;}}),
   });
 
-  areaTable[FIRE_TEMPLE_LOOP_FLARE_DANCER] = Area("Fire Temple Loop Flare Dancer", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_LOOP_FLARE_DANCER] = Area("Fire Temple Loop Flare Dancer", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(FIRE_TEMPLE_FLARE_DANCER_CHEST, {[]{return (HasExplosives || CanUse(MEGATON_HAMMER)) && IsAdult;}}),
+                  LocationAccess(RC_FIRE_TEMPLE_FLARE_DANCER_CHEST, {[]{return (HasExplosives || CanUse(RG_MEGATON_HAMMER)) && IsAdult;}}),
                 }, {
                   //Exits
-                  Entrance(FIRE_TEMPLE_LOOP_TILES,         {[]{return true;}}),
-                  Entrance(FIRE_TEMPLE_LOOP_HAMMER_SWITCH, {[]{return Here(FIRE_TEMPLE_LOOP_FLARE_DANCER, []{return (HasExplosives || CanUse(MEGATON_HAMMER) || CanUse(HOOKSHOT)) && (IsAdult || KokiriSword || Slingshot || Boomerang);});}}),
+                  Entrance(RR_FIRE_TEMPLE_LOOP_TILES,         {[]{return true;}}),
+                  Entrance(RR_FIRE_TEMPLE_LOOP_HAMMER_SWITCH, {[]{return Here(RR_FIRE_TEMPLE_LOOP_FLARE_DANCER, []{return (HasExplosives || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_HOOKSHOT)) && (IsAdult || KokiriSword || Slingshot || Boomerang);});}}),
   });
 
-  areaTable[FIRE_TEMPLE_LOOP_HAMMER_SWITCH] = Area("Fire Temple Loop Hammer Switch", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FIRE_TEMPLE_LOOP_HAMMER_SWITCH] = Area("Fire Temple Loop Hammer Switch", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&FireLoopSwitch, {[]{return FireLoopSwitch || CanUse(MEGATON_HAMMER);}}),
+                  EventAccess(&FireLoopSwitch, {[]{return FireLoopSwitch || CanUse(RG_MEGATON_HAMMER);}}),
                 }, {}, {
                   //Exits
-                  Entrance(FIRE_TEMPLE_LOOP_FLARE_DANCER, {[]{return true;}}),
-                  Entrance(FIRE_TEMPLE_LOOP_GORON_ROOM,   {[]{return FireLoopSwitch;}}),
+                  Entrance(RR_FIRE_TEMPLE_LOOP_FLARE_DANCER, {[]{return true;}}),
+                  Entrance(RR_FIRE_TEMPLE_LOOP_GORON_ROOM,   {[]{return FireLoopSwitch;}}),
   });
 
-  areaTable[FIRE_TEMPLE_LOOP_GORON_ROOM] = Area("Fire Temple Loop Goron Room", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_LOOP_GORON_ROOM] = Area("Fire Temple Loop Goron Room", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(FIRE_TEMPLE_BOSS_KEY_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_FIRE_TEMPLE_BOSS_KEY_CHEST, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(FIRE_TEMPLE_LOOP_HAMMER_SWITCH, {[]{return FireLoopSwitch;}}),
-                  Entrance(FIRE_TEMPLE_LOOP_EXIT,          {[]{return FireLoopSwitch;}}),
+                  Entrance(RR_FIRE_TEMPLE_LOOP_HAMMER_SWITCH, {[]{return FireLoopSwitch;}}),
+                  Entrance(RR_FIRE_TEMPLE_LOOP_EXIT,          {[]{return FireLoopSwitch;}}),
   });
 
-  areaTable[FIRE_TEMPLE_LOOP_EXIT] = Area("Fire Temple Loop Exit", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_LOOP_EXIT] = Area("Fire Temple Loop Exit", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(FIRE_TEMPLE_FIRST_ROOM,      {[]{return true;}}),
-                  Entrance(FIRE_TEMPLE_LOOP_GORON_ROOM, {[]{return FireLoopSwitch;}}),
+                  Entrance(RR_FIRE_TEMPLE_FIRST_ROOM,      {[]{return true;}}),
+                  Entrance(RR_FIRE_TEMPLE_LOOP_GORON_ROOM, {[]{return FireLoopSwitch;}}),
   });
 
-  areaTable[FIRE_TEMPLE_BIG_LAVA_ROOM] = Area("Fire Temple Big Lava Room", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_BIG_LAVA_ROOM] = Area("Fire Temple Big Lava Room", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(FIRE_TEMPLE_FIRST_ROOM,                {[]{return SmallKeys(FIRE_TEMPLE, 2);}}),
-                  Entrance(FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_GORON, {[]{return true;}}),
-                  Entrance(FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_TILES, {[]{return IsAdult && (CanPlay(SongOfTime) || LogicFireSongOfTime);}}),
-                  Entrance(FIRE_TEMPLE_BIG_LAVA_ROOM_SOUTH_GORON, {[]{return IsAdult && HasExplosives;}}),
-                  Entrance(FIRE_TEMPLE_FIRE_PILLAR_ROOM,          {[]{return SmallKeys(FIRE_TEMPLE, 3);}}),
+                  Entrance(RR_FIRE_TEMPLE_FIRST_ROOM,                {[]{return SmallKeys(RR_FIRE_TEMPLE, 2);}}),
+                  Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_GORON, {[]{return true;}}),
+                  Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_TILES, {[]{return IsAdult && (CanPlay(SongOfTime) || LogicFireSongOfTime);}}),
+                  Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM_SOUTH_GORON, {[]{return IsAdult && HasExplosives;}}),
+                  Entrance(RR_FIRE_TEMPLE_FIRE_PILLAR_ROOM,          {[]{return SmallKeys(RR_FIRE_TEMPLE, 3);}}),
   });
 
-  areaTable[FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_GORON] = Area("Fire Temple Big Lava Room North Goron", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_GORON] = Area("Fire Temple Big Lava Room North Goron", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(FIRE_TEMPLE_BIG_LAVA_ROOM, {[]{return true;}}),
+                  Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM, {[]{return true;}}),
   });
 
-  areaTable[FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_TILES] = Area("Fire Temple Big Lava Room North Tiles", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_TILES] = Area("Fire Temple Big Lava Room North Tiles", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM, {[]{return IsAdult;}}),
+                  LocationAccess(RC_FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM, {[]{return IsAdult;}}),
                 }, {
                   //Exits
-                  Entrance(FIRE_TEMPLE_BIG_LAVA_ROOM, {[]{return true;}}),
+                  Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM, {[]{return true;}}),
   });
 
-  areaTable[FIRE_TEMPLE_BIG_LAVA_ROOM_SOUTH_GORON] = Area("Fire Temple Big Lava Room South Goron", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_BIG_LAVA_ROOM_SOUTH_GORON] = Area("Fire Temple Big Lava Room South Goron", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(FIRE_TEMPLE_BIG_LAVA_ROOM, {[]{return true;}}),
+                  Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM, {[]{return true;}}),
   });
 
-  areaTable[FIRE_TEMPLE_FIRE_PILLAR_ROOM] = Area("Fire Temple Fire Pillar Room", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_FIRE_PILLAR_ROOM] = Area("Fire Temple Fire Pillar Room", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(FIRE_TEMPLE_BIG_LAVA_ROOM, {[]{return SmallKeys(FIRE_TEMPLE, 3);}}),
-                  Entrance(FIRE_TEMPLE_SHORTCUT_ROOM, {[]{return FireTimer >= 56 && SmallKeys(FIRE_TEMPLE, 4);}}),
+                  Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM, {[]{return SmallKeys(RR_FIRE_TEMPLE, 3);}}),
+                  Entrance(RR_FIRE_TEMPLE_SHORTCUT_ROOM, {[]{return FireTimer >= 56 && SmallKeys(RR_FIRE_TEMPLE, 4);}}),
   });
 
-  areaTable[FIRE_TEMPLE_SHORTCUT_ROOM] = Area("Fire Temple Shortcut Room", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_SHORTCUT_ROOM] = Area("Fire Temple Shortcut Room", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST, {[]{return Here(FIRE_TEMPLE_SHORTCUT_CLIMB, []{return true;});}}),
+                  LocationAccess(RC_FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST, {[]{return Here(RR_FIRE_TEMPLE_SHORTCUT_CLIMB, []{return true;});}}),
                 }, {
                   //Exits
-                  Entrance(FIRE_TEMPLE_FIRE_PILLAR_ROOM,   {[]{return SmallKeys(FIRE_TEMPLE, 4);}}),
-                  Entrance(FIRE_TEMPLE_SHORTCUT_CLIMB,     {[]{return Here(FIRE_TEMPLE_SHORTCUT_CLIMB, []{return true;});}}),
-                  Entrance(FIRE_TEMPLE_BOULDER_MAZE_LOWER, {[]{return (GoronBracelet || (IsAdult && LogicFireStrength)) && (HasExplosives || (IsAdult && (CanUse(BOW) || CanUse(HOOKSHOT) || CanUse(SLINGSHOT))));}}),
+                  Entrance(RR_FIRE_TEMPLE_FIRE_PILLAR_ROOM,   {[]{return SmallKeys(RR_FIRE_TEMPLE, 4);}}),
+                  Entrance(RR_FIRE_TEMPLE_SHORTCUT_CLIMB,     {[]{return Here(RR_FIRE_TEMPLE_SHORTCUT_CLIMB, []{return true;});}}),
+                  Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER, {[]{return (GoronBracelet || (IsAdult && LogicFireStrength)) && (HasExplosives || (IsAdult && (CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_SLINGSHOT))));}}),
   });
 
-  areaTable[FIRE_TEMPLE_SHORTCUT_CLIMB] = Area("Fire Temple Shortcut Climb", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_SHORTCUT_CLIMB] = Area("Fire Temple Shortcut Climb", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(FIRE_TEMPLE_SHORTCUT_ROOM,      {[]{return true;}}),
-                  Entrance(FIRE_TEMPLE_BOULDER_MAZE_UPPER, {[]{return true;}}),
+                  Entrance(RR_FIRE_TEMPLE_SHORTCUT_ROOM,      {[]{return true;}}),
+                  Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_UPPER, {[]{return true;}}),
   });
 
-  areaTable[FIRE_TEMPLE_BOULDER_MAZE_LOWER] = Area("Fire Temple Boulder Maze Lower", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER] = Area("Fire Temple Boulder Maze Lower", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST, {[]{return true;}}),
-                  LocationAccess(FIRE_TEMPLE_GS_BOULDER_MAZE,          {[]{return HasExplosives && (IsAdult || Boomerang || CanUse(HOOKSHOT));}}),
+                  LocationAccess(RC_FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_FIRE_TEMPLE_GS_BOULDER_MAZE,          {[]{return HasExplosives && (IsAdult || Boomerang || CanUse(RG_HOOKSHOT));}}),
                 }, {
                   //Exits
-                  Entrance(FIRE_TEMPLE_SHORTCUT_ROOM,                {[]{return true;}}),
-                  Entrance(FIRE_TEMPLE_BOULDER_MAZE_LOWER_SIDE_ROOM, {[]{return true;}}),
-                  Entrance(FIRE_TEMPLE_EAST_CENTRAL_ROOM,            {[]{return SmallKeys(FIRE_TEMPLE, 5, 7);}}),
-                  Entrance(FIRE_TEMPLE_BOULDER_MAZE_UPPER,           {[]{return false;}}),
+                  Entrance(RR_FIRE_TEMPLE_SHORTCUT_ROOM,                {[]{return true;}}),
+                  Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER_SIDE_ROOM, {[]{return true;}}),
+                  Entrance(RR_FIRE_TEMPLE_EAST_CENTRAL_ROOM,            {[]{return SmallKeys(RR_FIRE_TEMPLE, 5, 7);}}),
+                  Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_UPPER,           {[]{return false;}}),
   });
 
-  areaTable[FIRE_TEMPLE_BOULDER_MAZE_LOWER_SIDE_ROOM] = Area("Fire Temple Boulder Maze Lower Side Room", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER_SIDE_ROOM] = Area("Fire Temple Boulder Maze Lower Side Room", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(FIRE_TEMPLE_BOULDER_MAZE_LOWER, {[]{return true;}}),
+                  Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER, {[]{return true;}}),
   });
 
-  areaTable[FIRE_TEMPLE_EAST_CENTRAL_ROOM] = Area("Fire Temple East Central Room", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_EAST_CENTRAL_ROOM] = Area("Fire Temple East Central Room", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(FIRE_TEMPLE_BIG_LAVA_ROOM,      {[]{return CanTakeDamage;}}),
-                  Entrance(FIRE_TEMPLE_BOULDER_MAZE_LOWER, {[]{return SmallKeys(FIRE_TEMPLE, 5, 8);}}),
-                  Entrance(FIRE_TEMPLE_FIRE_WALL_CHASE,    {[]{return SmallKeys(FIRE_TEMPLE, 6, 8);}}),
-                  Entrance(FIRE_TEMPLE_MAP_AREA,           {[]{return CanUse(SLINGSHOT) || CanUse(BOW);}}),
+                  Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM,      {[]{return CanTakeDamage;}}),
+                  Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER, {[]{return SmallKeys(RR_FIRE_TEMPLE, 5, 8);}}),
+                  Entrance(RR_FIRE_TEMPLE_FIRE_WALL_CHASE,    {[]{return SmallKeys(RR_FIRE_TEMPLE, 6, 8);}}),
+                  Entrance(RR_FIRE_TEMPLE_MAP_AREA,           {[]{return CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW);}}),
   });
 
-  areaTable[FIRE_TEMPLE_FIRE_WALL_CHASE] = Area("Fire Temple Fire Wall Chase", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_FIRE_WALL_CHASE] = Area("Fire Temple Fire Wall Chase", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(FIRE_TEMPLE_EAST_CENTRAL_ROOM,  {[]{return FireTimer >= 24 && SmallKeys(FIRE_TEMPLE, 6, 8);}}),
-                  Entrance(FIRE_TEMPLE_MAP_AREA,           {[]{return IsAdult;}}),
-                  Entrance(FIRE_TEMPLE_BOULDER_MAZE_UPPER, {[]{return FireTimer >= 24 && IsAdult;}}),
-                  Entrance(FIRE_TEMPLE_CORRIDOR,           {[]{return FireTimer >= 24 && IsAdult && SmallKeys(FIRE_TEMPLE, 7);}}),
+                  Entrance(RR_FIRE_TEMPLE_EAST_CENTRAL_ROOM,  {[]{return FireTimer >= 24 && SmallKeys(RR_FIRE_TEMPLE, 6, 8);}}),
+                  Entrance(RR_FIRE_TEMPLE_MAP_AREA,           {[]{return IsAdult;}}),
+                  Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_UPPER, {[]{return FireTimer >= 24 && IsAdult;}}),
+                  Entrance(RR_FIRE_TEMPLE_CORRIDOR,           {[]{return FireTimer >= 24 && IsAdult && SmallKeys(RR_FIRE_TEMPLE, 7);}}),
   });
 
-  areaTable[FIRE_TEMPLE_MAP_AREA] = Area("Fire Temple Map Area", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_MAP_AREA] = Area("Fire Temple Map Area", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(FIRE_TEMPLE_MAP_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_FIRE_TEMPLE_MAP_CHEST, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(FIRE_TEMPLE_EAST_CENTRAL_ROOM, {[]{return true;}}),
+                  Entrance(RR_FIRE_TEMPLE_EAST_CENTRAL_ROOM, {[]{return true;}}),
   });
 
-  areaTable[FIRE_TEMPLE_BOULDER_MAZE_UPPER] = Area("Fire Temple Boulder Maze Upper", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_BOULDER_MAZE_UPPER] = Area("Fire Temple Boulder Maze Upper", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(FIRE_TEMPLE_SHORTCUT_CLIMB,     {[]{return HasExplosives;}}),
-                  Entrance(FIRE_TEMPLE_BOULDER_MAZE_LOWER, {[]{return true;}}),
-                  Entrance(FIRE_TEMPLE_FIRE_WALL_CHASE,    {[]{return true;}}),
-                  Entrance(FIRE_TEMPLE_SCARECROW_ROOM,     {[]{return CanUse(SCARECROW) || (LogicFireScarecrow && IsAdult && CanUse(LONGSHOT));}}),
+                  Entrance(RR_FIRE_TEMPLE_SHORTCUT_CLIMB,     {[]{return HasExplosives;}}),
+                  Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER, {[]{return true;}}),
+                  Entrance(RR_FIRE_TEMPLE_FIRE_WALL_CHASE,    {[]{return true;}}),
+                  Entrance(RR_FIRE_TEMPLE_SCARECROW_ROOM,     {[]{return CanUse(RG_SCARECROW) || (LogicFireScarecrow && IsAdult && CanUse(RG_LONGSHOT));}}),
   });
 
-  areaTable[FIRE_TEMPLE_SCARECROW_ROOM] = Area("Fire Temple Scarecrow Room", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_SCARECROW_ROOM] = Area("Fire Temple Scarecrow Room", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(FIRE_TEMPLE_GS_SCARECROW_CLIMB, {[]{return IsAdult || CanChildAttack;}}),
+                  LocationAccess(RC_FIRE_TEMPLE_GS_SCARECROW_CLIMB, {[]{return IsAdult || CanChildAttack;}}),
                 }, {
                   //Exits
-                  Entrance(FIRE_TEMPLE_BOULDER_MAZE_UPPER, {[]{return true;}}),
-                  Entrance(FIRE_TEMPLE_EAST_PEAK,          {[]{return true;}}),
+                  Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_UPPER, {[]{return true;}}),
+                  Entrance(RR_FIRE_TEMPLE_EAST_PEAK,          {[]{return true;}}),
   });
 
-  areaTable[FIRE_TEMPLE_EAST_PEAK] = Area("Fire Temple East Peak", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_EAST_PEAK] = Area("Fire Temple East Peak", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(FIRE_TEMPLE_SCARECROW_CHEST,  {[]{return true;}}),
-                  LocationAccess(FIRE_TEMPLE_GS_SCARECROW_TOP, {[]{return CanUseProjectile;}}),
+                  LocationAccess(RC_FIRE_TEMPLE_SCARECROW_CHEST,  {[]{return true;}}),
+                  LocationAccess(RC_FIRE_TEMPLE_GS_SCARECROW_TOP, {[]{return CanUseProjectile;}}),
                 }, {
                   //Exits
-                  Entrance(FIRE_TEMPLE_SCARECROW_ROOM,    {[]{return true;}}),
-                  Entrance(FIRE_TEMPLE_EAST_CENTRAL_ROOM, {[]{return CanTakeDamage;}}),
+                  Entrance(RR_FIRE_TEMPLE_SCARECROW_ROOM,    {[]{return true;}}),
+                  Entrance(RR_FIRE_TEMPLE_EAST_CENTRAL_ROOM, {[]{return CanTakeDamage;}}),
   });
 
-  areaTable[FIRE_TEMPLE_CORRIDOR] = Area("Fire Temple Corridor", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_CORRIDOR] = Area("Fire Temple Corridor", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(FIRE_TEMPLE_FIRE_WALL_CHASE, {[]{return SmallKeys(FIRE_TEMPLE, 7);}}),
-                  Entrance(FIRE_TEMPLE_FIRE_MAZE_ROOM,  {[]{return true;}}),
+                  Entrance(RR_FIRE_TEMPLE_FIRE_WALL_CHASE, {[]{return SmallKeys(RR_FIRE_TEMPLE, 7);}}),
+                  Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_ROOM,  {[]{return true;}}),
   });
 
-  areaTable[FIRE_TEMPLE_FIRE_MAZE_ROOM] = Area("Fire Temple Fire Maze Room", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_FIRE_MAZE_ROOM] = Area("Fire Temple Fire Maze Room", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(FIRE_TEMPLE_CORRIDOR,            {[]{return true;}}),
-                  Entrance(FIRE_TEMPLE_FIRE_MAZE_UPPER,     {[]{return CanUse(HOVER_BOOTS);}}),
-                  Entrance(FIRE_TEMPLE_FIRE_MAZE_SIDE_ROOM, {[]{return true;}}),
-                  Entrance(FIRE_TEMPLE_WEST_CENTRAL_LOWER,  {[]{return SmallKeys(FIRE_TEMPLE, 8);}}),
-                  Entrance(FIRE_TEMPLE_LATE_FIRE_MAZE,      {[]{return LogicFireFlameMaze || false;}}),
+                  Entrance(RR_FIRE_TEMPLE_CORRIDOR,            {[]{return true;}}),
+                  Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_UPPER,     {[]{return CanUse(RG_HOVER_BOOTS);}}),
+                  Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_SIDE_ROOM, {[]{return true;}}),
+                  Entrance(RR_FIRE_TEMPLE_WEST_CENTRAL_LOWER,  {[]{return SmallKeys(RR_FIRE_TEMPLE, 8);}}),
+                  Entrance(RR_FIRE_TEMPLE_LATE_FIRE_MAZE,      {[]{return LogicFireFlameMaze || false;}}),
   });
 
-  areaTable[FIRE_TEMPLE_FIRE_MAZE_UPPER] = Area("Fire Temple Fire Maze Upper", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_FIRE_MAZE_UPPER] = Area("Fire Temple Fire Maze Upper", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(FIRE_TEMPLE_NEAR_BOSS_ROOM,     {[]{return CanUse(MEGATON_HAMMER);}}),
-                  Entrance(FIRE_TEMPLE_FIRE_MAZE_ROOM,     {[]{return true;}}),
-                  Entrance(FIRE_TEMPLE_WEST_CENTRAL_UPPER, {[]{return CanUse(MEGATON_HAMMER);}}),
+                  Entrance(RR_FIRE_TEMPLE_NEAR_BOSS_ROOM,     {[]{return CanUse(RG_MEGATON_HAMMER);}}),
+                  Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_ROOM,     {[]{return true;}}),
+                  Entrance(RR_FIRE_TEMPLE_WEST_CENTRAL_UPPER, {[]{return CanUse(RG_MEGATON_HAMMER);}}),
   });
 
-  areaTable[FIRE_TEMPLE_FIRE_MAZE_SIDE_ROOM] = Area("Fire Temple Fire Maze Side Room", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_FIRE_MAZE_SIDE_ROOM] = Area("Fire Temple Fire Maze Side Room", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(FIRE_TEMPLE_COMPASS_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_FIRE_TEMPLE_COMPASS_CHEST, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(FIRE_TEMPLE_FIRE_MAZE_ROOM, {[]{return true;}}),
+                  Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_ROOM, {[]{return true;}}),
   });
 
-  areaTable[FIRE_TEMPLE_WEST_CENTRAL_LOWER] = Area("Fire Temple West Central Lower", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_WEST_CENTRAL_LOWER] = Area("Fire Temple West Central Lower", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(FIRE_TEMPLE_HIGHEST_GORON_CHEST, {[]{return Here(FIRE_TEMPLE_WEST_CENTRAL_UPPER, []{return (CanPlay(SongOfTime) || LogicRustedSwitches) && CanUse(MEGATON_HAMMER);});}}),
+                  LocationAccess(RC_FIRE_TEMPLE_HIGHEST_GORON_CHEST, {[]{return Here(RR_FIRE_TEMPLE_WEST_CENTRAL_UPPER, []{return (CanPlay(SongOfTime) || LogicRustedSwitches) && CanUse(RG_MEGATON_HAMMER);});}}),
                 }, {
                   //Exits
-                  Entrance(FIRE_TEMPLE_FIRE_MAZE_ROOM,     {[]{return SmallKeys(FIRE_TEMPLE, 8);}}),
-                  Entrance(FIRE_TEMPLE_WEST_CENTRAL_UPPER, {[]{return IsAdult && CanPlay(SongOfTime);}}),
-                  Entrance(FIRE_TEMPLE_LATE_FIRE_MAZE,     {[]{return true;}}),
+                  Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_ROOM,     {[]{return SmallKeys(RR_FIRE_TEMPLE, 8);}}),
+                  Entrance(RR_FIRE_TEMPLE_WEST_CENTRAL_UPPER, {[]{return IsAdult && CanPlay(SongOfTime);}}),
+                  Entrance(RR_FIRE_TEMPLE_LATE_FIRE_MAZE,     {[]{return true;}}),
   });
 
-  areaTable[FIRE_TEMPLE_WEST_CENTRAL_UPPER] = Area("Fire Temple West Central Upper", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_WEST_CENTRAL_UPPER] = Area("Fire Temple West Central Upper", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(FIRE_TEMPLE_BOSS_ENTRYWAY,      {[]{return false;}}),
-                  Entrance(FIRE_TEMPLE_FIRE_MAZE_UPPER,    {[]{return true;}}),
-                  Entrance(FIRE_TEMPLE_WEST_CENTRAL_LOWER, {[]{return true;}}),
+                  Entrance(RR_FIRE_TEMPLE_BOSS_ENTRYWAY,      {[]{return false;}}),
+                  Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_UPPER,    {[]{return true;}}),
+                  Entrance(RR_FIRE_TEMPLE_WEST_CENTRAL_LOWER, {[]{return true;}}),
   });
 
-  areaTable[FIRE_TEMPLE_LATE_FIRE_MAZE] = Area("Fire Temple Late Fire Maze", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_LATE_FIRE_MAZE] = Area("Fire Temple Late Fire Maze", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(FIRE_TEMPLE_FIRE_MAZE_ROOM,     {[]{return false;}}),
-                  Entrance(FIRE_TEMPLE_WEST_CENTRAL_LOWER, {[]{return true;}}),
-                  Entrance(FIRE_TEMPLE_UPPER_FLARE_DANCER, {[]{return HasExplosives;}}),
+                  Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_ROOM,     {[]{return false;}}),
+                  Entrance(RR_FIRE_TEMPLE_WEST_CENTRAL_LOWER, {[]{return true;}}),
+                  Entrance(RR_FIRE_TEMPLE_UPPER_FLARE_DANCER, {[]{return HasExplosives;}}),
   });
 
-  areaTable[FIRE_TEMPLE_UPPER_FLARE_DANCER] = Area("Fire Temple Upper Flare Dancer", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_UPPER_FLARE_DANCER] = Area("Fire Temple Upper Flare Dancer", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(FIRE_TEMPLE_LATE_FIRE_MAZE, {[]{return Here(FIRE_TEMPLE_UPPER_FLARE_DANCER, []{return (HasExplosives || CanUse(MEGATON_HAMMER) || CanUse(HOOKSHOT)) && (IsAdult || KokiriSword || Slingshot || Boomerang);});}}),
-                  Entrance(FIRE_TEMPLE_WEST_CLIMB,     {[]{return Here(FIRE_TEMPLE_UPPER_FLARE_DANCER, []{return (HasExplosives || CanUse(MEGATON_HAMMER) || CanUse(HOOKSHOT)) && (IsAdult || KokiriSword || Slingshot || Boomerang);});}}),
+                  Entrance(RR_FIRE_TEMPLE_LATE_FIRE_MAZE, {[]{return Here(RR_FIRE_TEMPLE_UPPER_FLARE_DANCER, []{return (HasExplosives || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_HOOKSHOT)) && (IsAdult || KokiriSword || Slingshot || Boomerang);});}}),
+                  Entrance(RR_FIRE_TEMPLE_WEST_CLIMB,     {[]{return Here(RR_FIRE_TEMPLE_UPPER_FLARE_DANCER, []{return (HasExplosives || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_HOOKSHOT)) && (IsAdult || KokiriSword || Slingshot || Boomerang);});}}),
   });
 
-  areaTable[FIRE_TEMPLE_WEST_CLIMB] = Area("Fire Temple West Climb", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_WEST_CLIMB] = Area("Fire Temple West Climb", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(FIRE_TEMPLE_UPPER_FLARE_DANCER, {[]{return true;}}),
-                  Entrance(FIRE_TEMPLE_WEST_PEAK,          {[]{return CanUseProjectile;}}),
+                  Entrance(RR_FIRE_TEMPLE_UPPER_FLARE_DANCER, {[]{return true;}}),
+                  Entrance(RR_FIRE_TEMPLE_WEST_PEAK,          {[]{return CanUseProjectile;}}),
   });
 
-  areaTable[FIRE_TEMPLE_WEST_PEAK] = Area("Fire Temple West Peak", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_WEST_PEAK] = Area("Fire Temple West Peak", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(FIRE_TEMPLE_MEGATON_HAMMER_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_FIRE_TEMPLE_MEGATON_HAMMER_CHEST, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(FIRE_TEMPLE_WEST_CENTRAL_UPPER, {[]{return CanTakeDamage;}}),
-                  Entrance(FIRE_TEMPLE_WEST_CLIMB,         {[]{return true;}}),
-                  Entrance(FIRE_TEMPLE_HAMMER_RETURN_PATH, {[]{return CanUse(MEGATON_HAMMER);}}),
+                  Entrance(RR_FIRE_TEMPLE_WEST_CENTRAL_UPPER, {[]{return CanTakeDamage;}}),
+                  Entrance(RR_FIRE_TEMPLE_WEST_CLIMB,         {[]{return true;}}),
+                  Entrance(RR_FIRE_TEMPLE_HAMMER_RETURN_PATH, {[]{return CanUse(RG_MEGATON_HAMMER);}}),
   });
 
-  areaTable[FIRE_TEMPLE_HAMMER_RETURN_PATH] = Area("Fire Temple Hammer Return Path", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_HAMMER_RETURN_PATH] = Area("Fire Temple Hammer Return Path", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(FIRE_TEMPLE_ABOVE_FIRE_MAZE, {[]{return CanUse(MEGATON_HAMMER);}}),
+                  Entrance(RR_FIRE_TEMPLE_ABOVE_FIRE_MAZE, {[]{return CanUse(RG_MEGATON_HAMMER);}}),
   });
 
-  areaTable[FIRE_TEMPLE_ABOVE_FIRE_MAZE] = Area("Fire Temple Above Fire Maze", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_ABOVE_FIRE_MAZE] = Area("Fire Temple Above Fire Maze", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(FIRE_TEMPLE_HAMMER_RETURN_PATH, {[]{return true;}}),
-                  Entrance(FIRE_TEMPLE_FIRE_MAZE_UPPER,    {[]{return CanUse(MEGATON_HAMMER);}}),
+                  Entrance(RR_FIRE_TEMPLE_HAMMER_RETURN_PATH, {[]{return true;}}),
+                  Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_UPPER,    {[]{return CanUse(RG_MEGATON_HAMMER);}}),
   });
   }
 
@@ -312,110 +312,110 @@ void AreaTable_Init_FireTemple() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (Dungeon::FireTemple.IsMQ()) {
-  areaTable[FIRE_TEMPLE_MQ_LOWER] = Area("Fire Temple MQ Lower", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_MQ_LOWER] = Area("Fire Temple MQ Lower", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST, {[]{return IsAdult || KokiriSword || Sticks || Slingshot || Bombs || CanUse(DINS_FIRE);}}),
-                  LocationAccess(FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST,     {[]{return IsAdult && (LogicFewerTunicRequirements || CanUse(GORON_TUNIC)) && (((CanUse(HOVER_BOOTS) || (LogicFireMQNearBoss && CanUse(BOW))) && HasFireSource) || (CanUse(HOOKSHOT) && CanUse(FIRE_ARROWS) || (CanUse(DINS_FIRE) && ((DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_QUADRUPLE) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OCTUPLE) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_SEXDECUPLE)) || CanUse(GORON_TUNIC) || CanUse(BOW) || CanUse(LONGSHOT)))));}}),
-                    //Trick: IsAdult && (LogicFewerTunicRequirements || CanUse(GORON_TUNIC)) && (((CanUse(HOVER_BOOTS) || (LogicFireMQNearBoss && CanUse(BOW))) && HasFireSource) || (CanUse(HOOKSHOT) && CanUse(FIRE_ARROWS) || (CanUse(DINS_FIRE) && ((DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_QUADRUPLE) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OCTUPLE) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_SEXDECUPLE)) || CanUse(GORON_TUNIC) || CanUse(BOW) || CanUse(LONGSHOT)))))
+                  LocationAccess(RC_FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST, {[]{return IsAdult || KokiriSword || Sticks || Slingshot || Bombs || CanUse(RG_DINS_FIRE);}}),
+                  LocationAccess(RC_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST,     {[]{return IsAdult && (LogicFewerTunicRequirements || CanUse(RG_GORON_TUNIC)) && (((CanUse(RG_HOVER_BOOTS) || (LogicFireMQNearBoss && CanUse(RG_FAIRY_BOW))) && HasFireSource) || (CanUse(RG_HOOKSHOT) && CanUse(RG_FIRE_ARROWS) || (CanUse(RG_DINS_FIRE) && ((DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_QUADRUPLE) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OCTUPLE) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_SEXDECUPLE)) || CanUse(RG_GORON_TUNIC) || CanUse(RG_FAIRY_BOW) || CanUse(RG_LONGSHOT)))));}}),
+                    //Trick: IsAdult && (LogicFewerTunicRequirements || CanUse(RG_GORON_TUNIC)) && (((CanUse(RG_HOVER_BOOTS) || (LogicFireMQNearBoss && CanUse(RG_FAIRY_BOW))) && HasFireSource) || (CanUse(RG_HOOKSHOT) && CanUse(RG_FIRE_ARROWS) || (CanUse(RG_DINS_FIRE) && ((DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_QUADRUPLE) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OCTUPLE) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_SEXDECUPLE)) || CanUse(RG_GORON_TUNIC) || CanUse(RG_FAIRY_BOW) || CanUse(RG_LONGSHOT)))))
   }, {
                   //Exits
-                  Entrance(FIRE_TEMPLE_ENTRYWAY,             {[]{return true;}}),
-                  Entrance(FIRE_TEMPLE_BOSS_ENTRYWAY,        {[]{return IsAdult && CanUse(GORON_TUNIC) && CanUse(MEGATON_HAMMER) && BossKeyFireTemple && ((HasFireSource && (LogicFireBossDoorJump || HoverBoots)) || HasAccessTo(FIRE_TEMPLE_MQ_UPPER));}}),
-                  Entrance(FIRE_TEMPLE_MQ_LOWER_LOCKED_DOOR, {[]{return SmallKeys(FIRE_TEMPLE, 5) && (IsAdult || KokiriSword);}}),
-                  Entrance(FIRE_TEMPLE_MQ_BIG_LAVA_ROOM,     {[]{return IsAdult && FireTimer >= 24 && CanUse(MEGATON_HAMMER);}}),
+                  Entrance(RR_FIRE_TEMPLE_ENTRYWAY,             {[]{return true;}}),
+                  Entrance(RR_FIRE_TEMPLE_BOSS_ENTRYWAY,        {[]{return IsAdult && CanUse(RG_GORON_TUNIC) && CanUse(RG_MEGATON_HAMMER) && BossKeyFireTemple && ((HasFireSource && (LogicFireBossDoorJump || HoverBoots)) || HasAccessTo(RR_FIRE_TEMPLE_MQ_UPPER));}}),
+                  Entrance(RR_FIRE_TEMPLE_MQ_LOWER_LOCKED_DOOR, {[]{return SmallKeys(RR_FIRE_TEMPLE, 5) && (IsAdult || KokiriSword);}}),
+                  Entrance(RR_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM,     {[]{return IsAdult && FireTimer >= 24 && CanUse(RG_MEGATON_HAMMER);}}),
   });
 
-  areaTable[FIRE_TEMPLE_MQ_LOWER_LOCKED_DOOR] = Area("Fire Temple MQ Lower Locked Door", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FIRE_TEMPLE_MQ_LOWER_LOCKED_DOOR] = Area("Fire Temple MQ Lower Locked Door", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FairyPot, {[]{return true;}}),
   }, {
                   //Locations
-                  LocationAccess(FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST, {[]{return IsAdult && (HasExplosives || Hammer || Hookshot);}}),
-                  LocationAccess(FIRE_TEMPLE_MQ_MAP_CHEST,            {[]{return IsAdult && CanUse(MEGATON_HAMMER);}}),
+                  LocationAccess(RC_FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST, {[]{return IsAdult && (HasExplosives || Hammer || Hookshot);}}),
+                  LocationAccess(RC_FIRE_TEMPLE_MQ_MAP_CHEST,            {[]{return IsAdult && CanUse(RG_MEGATON_HAMMER);}}),
   }, {});
 
-  areaTable[FIRE_TEMPLE_MQ_BIG_LAVA_ROOM] = Area("Fire Temple MQ Big Lava Room", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM] = Area("Fire Temple MQ Big Lava Room", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&FairyPot, {[]{return FairyPot || (HasFireSource && (Bow || LogicFireMQBKChest) && IsAdult && (CanUse(HOOKSHOT) || LogicFireSongOfTime));}}),
-                    //Trick: HasFireSource && (Bow || LogicFireMQBKChest) && IsAdult && (CanUse(HOOKSHOT) || LogicFireSongOfTime)
+                  EventAccess(&FairyPot, {[]{return FairyPot || (HasFireSource && (Bow || LogicFireMQBKChest) && IsAdult && (CanUse(RG_HOOKSHOT) || LogicFireSongOfTime));}}),
+                    //Trick: HasFireSource && (Bow || LogicFireMQBKChest) && IsAdult && (CanUse(RG_HOOKSHOT) || LogicFireSongOfTime)
   }, {
                   //Locations
-                  LocationAccess(FIRE_TEMPLE_MQ_BOSS_KEY_CHEST,                   {[]{return HasFireSource && (Bow || LogicFireMQBKChest) && IsAdult && CanUse(HOOKSHOT);}}),
-                    //Trick: HasFireSource && (Bow || LogicFireMQBKChest) && IsAdult && CanUse(HOOKSHOT)
-                  LocationAccess(FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST, {[]{return HasFireSource && HasExplosives && IsAdult && (CanUse(HOOKSHOT) || LogicFireMQBlockedChest);}}),
-                    //Trick: HasFireSource && HasExplosives && IsAdult && (CanUse(HOOKSHOT) || LogicFireMQBlockedChest)
-                  LocationAccess(FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR,       {[]{return true;}}),
+                  LocationAccess(RC_FIRE_TEMPLE_MQ_BOSS_KEY_CHEST,                   {[]{return HasFireSource && (Bow || LogicFireMQBKChest) && IsAdult && CanUse(RG_HOOKSHOT);}}),
+                    //Trick: HasFireSource && (Bow || LogicFireMQBKChest) && IsAdult && CanUse(RG_HOOKSHOT)
+                  LocationAccess(RC_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST, {[]{return HasFireSource && HasExplosives && IsAdult && (CanUse(RG_HOOKSHOT) || LogicFireMQBlockedChest);}}),
+                    //Trick: HasFireSource && HasExplosives && IsAdult && (CanUse(RG_HOOKSHOT) || LogicFireMQBlockedChest)
+                  LocationAccess(RC_FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR,       {[]{return true;}}),
   }, {
                   //Exits
-                  Entrance(FIRE_TEMPLE_MQ_LOWER_MAZE, {[]{return IsAdult && CanUse(GORON_TUNIC) && SmallKeys(FIRE_TEMPLE, 2) && (HasFireSource || (LogicFireMQClimb && HoverBoots));}}),
-                    //Trick: IsAdult && CanUse(GORON_TUNIC) && SmallKeys(FIRE_TEMPLE, 2) && (HasFireSource || (LogicFireMQClimb && HoverBoots))
+                  Entrance(RR_FIRE_TEMPLE_MQ_LOWER_MAZE, {[]{return IsAdult && CanUse(RG_GORON_TUNIC) && SmallKeys(RR_FIRE_TEMPLE, 2) && (HasFireSource || (LogicFireMQClimb && HoverBoots));}}),
+                    //Trick: IsAdult && CanUse(RG_GORON_TUNIC) && SmallKeys(RR_FIRE_TEMPLE, 2) && (HasFireSource || (LogicFireMQClimb && HoverBoots))
   });
 
-  areaTable[FIRE_TEMPLE_MQ_LOWER_MAZE] = Area("Fire Temple MQ Lower Maze", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_MQ_LOWER_MAZE] = Area("Fire Temple MQ Lower Maze", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST,     {[]{return true;}}),
-                  LocationAccess(FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST, {[]{return HasExplosives && (LogicFireMQMazeSideRoom || HasAccessTo(FIRE_TEMPLE_MQ_UPPER_MAZE));}}),
+                  LocationAccess(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST,     {[]{return true;}}),
+                  LocationAccess(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST, {[]{return HasExplosives && (LogicFireMQMazeSideRoom || HasAccessTo(RR_FIRE_TEMPLE_MQ_UPPER_MAZE));}}),
                     //Trick: HasExplosives && (LogicFireMQMazeSideRoom || FIRE_TEMPLE_MQ_UPPER_MAZE.Adult())
    }, {
                   //Exits
-                  Entrance(FIRE_TEMPLE_MQ_UPPER_MAZE, {[]{return (IsAdult && ((HasExplosives && CanUse(HOOKSHOT)) || (LogicFireMQMazeHovers && CanUse(HOVER_BOOTS)))) || LogicFireMQMazeJump;}}),
-                    //Trick: (IsAdult && ((HasExplosives && CanUse(HOOKSHOT)) || (LogicFireMQMazeHovers && CanUse(HOVER_BOOTS)))) || LogicFireMQMazeJump
+                  Entrance(RR_FIRE_TEMPLE_MQ_UPPER_MAZE, {[]{return (IsAdult && ((HasExplosives && CanUse(RG_HOOKSHOT)) || (LogicFireMQMazeHovers && CanUse(RG_HOVER_BOOTS)))) || LogicFireMQMazeJump;}}),
+                    //Trick: (IsAdult && ((HasExplosives && CanUse(RG_HOOKSHOT)) || (LogicFireMQMazeHovers && CanUse(RG_HOVER_BOOTS)))) || LogicFireMQMazeJump
   });
 
-  areaTable[FIRE_TEMPLE_MQ_UPPER_MAZE] = Area("Fire Temple MQ Upper Maze", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FIRE_TEMPLE_MQ_UPPER_MAZE] = Area("Fire Temple MQ Upper Maze", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  //EventAccess(&WallFairy, {[]{return WallFairy || (IsAdult && (((CanPlay(SongOfTime) && CanUse(HOOKSHOT) && HasExplosives) || CanUse(LONGSHOT))));}}),
-                  EventAccess(&FairyPot,  {[]{return SmallKeys(FIRE_TEMPLE, 3);}}),
+                  //EventAccess(&WallFairy, {[]{return WallFairy || (IsAdult && (((CanPlay(SongOfTime) && CanUse(RG_HOOKSHOT) && HasExplosives) || CanUse(RG_LONGSHOT))));}}),
+                  EventAccess(&FairyPot,  {[]{return SmallKeys(RR_FIRE_TEMPLE, 3);}}),
   }, {
                   //Locations
-                  LocationAccess(FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST, {[]{return true;}}),
-                  LocationAccess(FIRE_TEMPLE_MQ_COMPASS_CHEST,             {[]{return HasExplosives;}}),
-                  LocationAccess(FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE,          {[]{return IsAdult && ((CanPlay(SongOfTime) && CanUse(HOOKSHOT) && HasExplosives) || CanUse(LONGSHOT));}}),
+                  LocationAccess(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_FIRE_TEMPLE_MQ_COMPASS_CHEST,             {[]{return HasExplosives;}}),
+                  LocationAccess(RC_FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE,          {[]{return IsAdult && ((CanPlay(SongOfTime) && CanUse(RG_HOOKSHOT) && HasExplosives) || CanUse(RG_LONGSHOT));}}),
   }, {
                   //Exits
-                  Entrance(FIRE_TEMPLE_MQ_UPPER, {[]{return SmallKeys(FIRE_TEMPLE, 3) && IsAdult && ((CanUse(BOW) && CanUse(HOOKSHOT)) || CanUse(FIRE_ARROWS));}}),
+                  Entrance(RR_FIRE_TEMPLE_MQ_UPPER, {[]{return SmallKeys(RR_FIRE_TEMPLE, 3) && IsAdult && ((CanUse(RG_FAIRY_BOW) && CanUse(RG_HOOKSHOT)) || CanUse(RG_FIRE_ARROWS));}}),
   });
 
-  areaTable[FIRE_TEMPLE_MQ_UPPER] = Area("Fire Temple MQ Upper", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_MQ_UPPER] = Area("Fire Temple MQ Upper", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(FIRE_TEMPLE_MQ_FREESTANDING_KEY,            {[]{return (IsAdult && CanUse(HOOKSHOT)) || LogicFireMQFlameMaze;}}),
-                    //Trick: (IsAdult && CanUse(HOOKSHOT)) || LogicFireMQFlameMaze
-                  LocationAccess(FIRE_TEMPLE_MQ_CHEST_ON_FIRE,               {[]{return ((IsAdult && CanUse(HOOKSHOT)) || LogicFireMQFlameMaze) && SmallKeys(FIRE_TEMPLE, 4);}}),
-                    //Trick: ((IsAdult && CanUse(HOOKSHOT)) || LogicFireMQFlameMaze) && SmallKeys(FIRE_TEMPLE, 4)
-                  LocationAccess(FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM, {[]{return CanPlay(SongOfTime) || HoverBoots || LogicFireMQFlameMaze;}}),
+                  LocationAccess(RC_FIRE_TEMPLE_MQ_FREESTANDING_KEY,            {[]{return (IsAdult && CanUse(RG_HOOKSHOT)) || LogicFireMQFlameMaze;}}),
+                    //Trick: (IsAdult && CanUse(RG_HOOKSHOT)) || LogicFireMQFlameMaze
+                  LocationAccess(RC_FIRE_TEMPLE_MQ_CHEST_ON_FIRE,               {[]{return ((IsAdult && CanUse(RG_HOOKSHOT)) || LogicFireMQFlameMaze) && SmallKeys(RR_FIRE_TEMPLE, 4);}}),
+                    //Trick: ((IsAdult && CanUse(RG_HOOKSHOT)) || LogicFireMQFlameMaze) && SmallKeys(RR_FIRE_TEMPLE, 4)
+                  LocationAccess(RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM, {[]{return CanPlay(SongOfTime) || HoverBoots || LogicFireMQFlameMaze;}}),
                     //Trick: CanPlay(SongOfTime) || HoverBoots || LogicFireMQFlameMaze
-                  LocationAccess(FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER,    {[]{return HasExplosives;}}),
-                  LocationAccess(FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE,     {[]{return (IsAdult && CanUse(HOOKSHOT) && SmallKeys(FIRE_TEMPLE, 5)) || (LogicFireMQAboveMazeGS && IsAdult && CanUse(LONGSHOT));}}),
-                    //Trick: (IsAdult && CanUse(HOOKSHOT) && SmallKeys(FIRE_TEMPLE, 5)) || (LogicFireMQAboveMazeGS && IsAdult && CanUse(LONGSHOT))
+                  LocationAccess(RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER,    {[]{return HasExplosives;}}),
+                  LocationAccess(RC_FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE,     {[]{return (IsAdult && CanUse(RG_HOOKSHOT) && SmallKeys(RR_FIRE_TEMPLE, 5)) || (LogicFireMQAboveMazeGS && IsAdult && CanUse(RG_LONGSHOT));}}),
+                    //Trick: (IsAdult && CanUse(RG_HOOKSHOT) && SmallKeys(RR_FIRE_TEMPLE, 5)) || (LogicFireMQAboveMazeGS && IsAdult && CanUse(RG_LONGSHOT))
   }, {});
   }
 
     /*---------------------------
     |         BOSS ROOM         |
     ---------------------------*/
-    areaTable[FIRE_TEMPLE_BOSS_ENTRYWAY] =
-        Area("Fire Temple Boss Entryway", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
+    areaTable[RR_FIRE_TEMPLE_BOSS_ENTRYWAY] =
+        Area("Fire Temple Boss Entryway", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
              {
                  // Exits
-                 Entrance(FIRE_TEMPLE_NEAR_BOSS_ROOM, { [] { return Dungeon::FireTemple.IsVanilla() && false; } }),
-                 Entrance(FIRE_TEMPLE_MQ_LOWER, { [] { return Dungeon::FireTemple.IsMQ() && false; } }),
-                 Entrance(FIRE_TEMPLE_BOSS_ROOM, { [] { return true; } }),
+                 Entrance(RR_FIRE_TEMPLE_NEAR_BOSS_ROOM, { [] { return Dungeon::FireTemple.IsVanilla() && false; } }),
+                 Entrance(RR_FIRE_TEMPLE_MQ_LOWER, { [] { return Dungeon::FireTemple.IsMQ() && false; } }),
+                 Entrance(RR_FIRE_TEMPLE_BOSS_ROOM, { [] { return true; } }),
              });
 
-    areaTable[FIRE_TEMPLE_BOSS_ROOM] =
-        Area("Fire Temple Boss Room", "Fire Temple", NONE, NO_DAY_NIGHT_CYCLE,
+    areaTable[RR_FIRE_TEMPLE_BOSS_ROOM] =
+        Area("Fire Temple Boss Room", "Fire Temple", RHT_NONE, NO_DAY_NIGHT_CYCLE,
              {
                  // Events
                  EventAccess(&FireTempleClear,
-                             { [] { return FireTempleClear || (FireTimer >= 64 && CanUse(MEGATON_HAMMER)); }}),
+                             { [] { return FireTempleClear || (FireTimer >= 64 && CanUse(RG_MEGATON_HAMMER)); }}),
              },
              {
                  // Locations
-                 LocationAccess(FIRE_TEMPLE_VOLVAGIA_HEART, { [] { return FireTempleClear; } }),
-                 LocationAccess(VOLVAGIA, { [] { return FireTempleClear; } }),
+                 LocationAccess(RC_FIRE_TEMPLE_VOLVAGIA_HEART, { [] { return FireTempleClear; } }),
+                 LocationAccess(RC_VOLVAGIA, { [] { return FireTempleClear; } }),
              },
              {
                  // Exits
-                 Entrance(FIRE_TEMPLE_BOSS_ENTRYWAY, { [] { return false; } }),
+                 Entrance(RR_FIRE_TEMPLE_BOSS_ENTRYWAY, { [] { return false; } }),
              });
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp
index d4e95e15c..d6c21d704 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp
@@ -10,269 +10,269 @@ void AreaTable_Init_ForestTemple() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[FOREST_TEMPLE_ENTRYWAY] = Area("Forest Temple Entryway", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FOREST_TEMPLE_ENTRYWAY] = Area("Forest Temple Entryway", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(FOREST_TEMPLE_FIRST_ROOM, {[]{return Dungeon::ForestTemple.IsVanilla();}}),
-                  Entrance(FOREST_TEMPLE_MQ_LOBBY,   {[]{return Dungeon::ForestTemple.IsMQ();}}),
-                  Entrance(SACRED_FOREST_MEADOW,     {[]{return true;}}),
+                  Entrance(RR_FOREST_TEMPLE_FIRST_ROOM, {[]{return Dungeon::ForestTemple.IsVanilla();}}),
+                  Entrance(RR_FOREST_TEMPLE_MQ_LOBBY,   {[]{return Dungeon::ForestTemple.IsMQ();}}),
+                  Entrance(RR_SACRED_FOREST_MEADOW,     {[]{return true;}}),
   });
 
   /*--------------------------
   |     VANILLA DUNGEON      |
   ---------------------------*/
   if (Dungeon::ForestTemple.IsVanilla()) {
-  areaTable[FOREST_TEMPLE_FIRST_ROOM] = Area("Forest Temple First Room", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_FIRST_ROOM] = Area("Forest Temple First Room", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(FOREST_TEMPLE_FIRST_ROOM_CHEST, {[]{return true;}}),
-                  LocationAccess(FOREST_TEMPLE_GS_FIRST_ROOM,    {[]{return (IsAdult && Bombs) || CanUse(BOW) || CanUse(HOOKSHOT) || CanUse(BOOMERANG) || CanUse(SLINGSHOT) || HasBombchus || CanUse(DINS_FIRE) || (LogicForestFirstGS && (CanJumpslash || (IsChild && Bombs)));}}),
+                  LocationAccess(RC_FOREST_TEMPLE_FIRST_ROOM_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_FOREST_TEMPLE_GS_FIRST_ROOM,    {[]{return (IsAdult && Bombs) || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_BOOMERANG) || CanUse(RG_FAIRY_SLINGSHOT) || HasBombchus || CanUse(RG_DINS_FIRE) || (LogicForestFirstGS && (CanJumpslash || (IsChild && Bombs)));}}),
                 }, {
                   //Exits
-                  Entrance(FOREST_TEMPLE_ENTRYWAY,       {[]{return true;}}),
-                  Entrance(FOREST_TEMPLE_SOUTH_CORRIDOR, {[]{return true;}}),
+                  Entrance(RR_FOREST_TEMPLE_ENTRYWAY,       {[]{return true;}}),
+                  Entrance(RR_FOREST_TEMPLE_SOUTH_CORRIDOR, {[]{return true;}}),
   });
 
-  areaTable[FOREST_TEMPLE_SOUTH_CORRIDOR] = Area("Forest Temple South Corridor", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FOREST_TEMPLE_SOUTH_CORRIDOR] = Area("Forest Temple South Corridor", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(FOREST_TEMPLE_FIRST_ROOM, {[]{return true;}}),
-                  Entrance(FOREST_TEMPLE_LOBBY,      {[]{return IsAdult || CanChildAttack || Nuts;}}),
+                  Entrance(RR_FOREST_TEMPLE_FIRST_ROOM, {[]{return true;}}),
+                  Entrance(RR_FOREST_TEMPLE_LOBBY,      {[]{return IsAdult || CanChildAttack || Nuts;}}),
   });
 
-  areaTable[FOREST_TEMPLE_LOBBY] = Area("Forest Temple Lobby", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_LOBBY] = Area("Forest Temple Lobby", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&ForestTempleMeg, {[]{return ForestTempleMeg || (ForestTempleJoelle && ForestTempleBeth && ForestTempleAmy && CanUse(BOW));}}),
+                  EventAccess(&ForestTempleMeg, {[]{return ForestTempleMeg || (ForestTempleJoelle && ForestTempleBeth && ForestTempleAmy && CanUse(RG_FAIRY_BOW));}}),
                 }, {
                   //Locations
-                  LocationAccess(FOREST_TEMPLE_GS_LOBBY, {[]{return HookshotOrBoomerang;}}),
+                  LocationAccess(RC_FOREST_TEMPLE_GS_LOBBY, {[]{return HookshotOrBoomerang;}}),
                 }, {
                   //Exits
-                  Entrance(FOREST_TEMPLE_SOUTH_CORRIDOR,    {[]{return true;}}),
-                  Entrance(FOREST_TEMPLE_NORTH_CORRIDOR,    {[]{return true;}}),
-                  Entrance(FOREST_TEMPLE_NW_OUTDOORS_LOWER, {[]{return CanPlay(SongOfTime) || IsChild;}}),
-                  Entrance(FOREST_TEMPLE_NE_OUTDOORS_LOWER, {[]{return CanUse(BOW) || CanUse(SLINGSHOT);}}),
-                  Entrance(FOREST_TEMPLE_WEST_CORRIDOR,     {[]{return SmallKeys(FOREST_TEMPLE, 1, 5);}}),
-                  Entrance(FOREST_TEMPLE_EAST_CORRIDOR,     {[]{return false;}}),
-                  Entrance(FOREST_TEMPLE_BOSS_REGION,       {[]{return ForestTempleMeg;}}),
-                  Entrance(FOREST_TEMPLE_BOSS_ENTRYWAY,     {[]{return false;}}),
+                  Entrance(RR_FOREST_TEMPLE_SOUTH_CORRIDOR,    {[]{return true;}}),
+                  Entrance(RR_FOREST_TEMPLE_NORTH_CORRIDOR,    {[]{return true;}}),
+                  Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_LOWER, {[]{return CanPlay(SongOfTime) || IsChild;}}),
+                  Entrance(RR_FOREST_TEMPLE_NE_OUTDOORS_LOWER, {[]{return CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT);}}),
+                  Entrance(RR_FOREST_TEMPLE_WEST_CORRIDOR,     {[]{return SmallKeys(RR_FOREST_TEMPLE, 1, 5);}}),
+                  Entrance(RR_FOREST_TEMPLE_EAST_CORRIDOR,     {[]{return false;}}),
+                  Entrance(RR_FOREST_TEMPLE_BOSS_REGION,       {[]{return ForestTempleMeg;}}),
+                  Entrance(RR_FOREST_TEMPLE_BOSS_ENTRYWAY,     {[]{return false;}}),
   });
 
-  areaTable[FOREST_TEMPLE_NORTH_CORRIDOR] = Area("Forest Temple North Corridor", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FOREST_TEMPLE_NORTH_CORRIDOR] = Area("Forest Temple North Corridor", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(FOREST_TEMPLE_LOBBY,         {[]{return true;}}),
-                  Entrance(FOREST_TEMPLE_LOWER_STALFOS, {[]{return true;}}),
+                  Entrance(RR_FOREST_TEMPLE_LOBBY,         {[]{return true;}}),
+                  Entrance(RR_FOREST_TEMPLE_LOWER_STALFOS, {[]{return true;}}),
   });
 
-  areaTable[FOREST_TEMPLE_LOWER_STALFOS] = Area("Forest Temple Lower Stalfos", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_LOWER_STALFOS] = Area("Forest Temple Lower Stalfos", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FairyPot, {[]{return true;}}),
                 }, {
                   //Locations
-                  LocationAccess(FOREST_TEMPLE_FIRST_STALFOS_CHEST, {[]{return IsAdult || KokiriSword;}}),
+                  LocationAccess(RC_FOREST_TEMPLE_FIRST_STALFOS_CHEST, {[]{return IsAdult || KokiriSword;}}),
                 }, {
                   //Exits
-                  Entrance(FOREST_TEMPLE_NORTH_CORRIDOR, {[]{return true;}}),
+                  Entrance(RR_FOREST_TEMPLE_NORTH_CORRIDOR, {[]{return true;}}),
   });
 
-  areaTable[FOREST_TEMPLE_NW_OUTDOORS_LOWER] = Area("Forest Temple NW Outdoors Lower", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_NW_OUTDOORS_LOWER] = Area("Forest Temple NW Outdoors Lower", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (IsAdult || KokiriSword || Boomerang);}}),
-                  EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(DINS_FIRE));}}),
+                  EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(RG_DINS_FIRE));}}),
                 }, {
                   //Locations
-                  LocationAccess(FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD, {[]{return CanUse(LONGSHOT) || Here(FOREST_TEMPLE_NW_OUTDOORS_UPPER, []{return HookshotOrBoomerang;});}}),
+                  LocationAccess(RC_FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD, {[]{return CanUse(RG_LONGSHOT) || Here(RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER, []{return HookshotOrBoomerang;});}}),
                 }, {
                   //Exits
-                  Entrance(FOREST_TEMPLE_LOBBY,             {[]{return CanPlay(SongOfTime);}}),
-                  Entrance(FOREST_TEMPLE_NW_OUTDOORS_UPPER, {[]{return false;}}),
-                  Entrance(FOREST_TEMPLE_MAP_ROOM,          {[]{return true;}}),
-                  Entrance(FOREST_TEMPLE_SEWER,             {[]{return GoldScale || CanUse(IRON_BOOTS) || HasAccessTo(FOREST_TEMPLE_NE_OUTDOORS_UPPER);}}),
-                  Entrance(FOREST_TEMPLE_BOSS_ENTRYWAY,     {[]{return false;}}),
+                  Entrance(RR_FOREST_TEMPLE_LOBBY,             {[]{return CanPlay(SongOfTime);}}),
+                  Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER, {[]{return false;}}),
+                  Entrance(RR_FOREST_TEMPLE_MAP_ROOM,          {[]{return true;}}),
+                  Entrance(RR_FOREST_TEMPLE_SEWER,             {[]{return GoldScale || CanUse(RG_IRON_BOOTS) || HasAccessTo(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER);}}),
+                  Entrance(RR_FOREST_TEMPLE_BOSS_ENTRYWAY,     {[]{return false;}}),
   });
 
-  areaTable[FOREST_TEMPLE_NW_OUTDOORS_UPPER] = Area("Forest Temple NW Outdoors Upper", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER] = Area("Forest Temple NW Outdoors Upper", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (IsAdult || KokiriSword || Boomerang);}}),
-                  EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(DINS_FIRE));}}),
+                  EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(RG_DINS_FIRE));}}),
                 }, {}, {
                   //Exits
-                  Entrance(FOREST_TEMPLE_NW_OUTDOORS_LOWER,    {[]{return true;}}),
-                  Entrance(FOREST_TEMPLE_BELOW_BOSS_KEY_CHEST, {[]{return true;}}),
-                  Entrance(FOREST_TEMPLE_FLOORMASTER_ROOM,     {[]{return true;}}),
-                  Entrance(FOREST_TEMPLE_BLOCK_PUSH_ROOM,      {[]{return true;}}),
+                  Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_LOWER,    {[]{return true;}}),
+                  Entrance(RR_FOREST_TEMPLE_BELOW_BOSS_KEY_CHEST, {[]{return true;}}),
+                  Entrance(RR_FOREST_TEMPLE_FLOORMASTER_ROOM,     {[]{return true;}}),
+                  Entrance(RR_FOREST_TEMPLE_BLOCK_PUSH_ROOM,      {[]{return true;}}),
   });
 
-  areaTable[FOREST_TEMPLE_NE_OUTDOORS_LOWER] = Area("Forest Temple NE Outdoors Lower", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_NE_OUTDOORS_LOWER] = Area("Forest Temple NE Outdoors Lower", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (IsAdult || KokiriSword || Boomerang);}}),
-                  EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(DINS_FIRE));}}),
+                  EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(RG_DINS_FIRE));}}),
                 }, {
                   //Locations
-                  LocationAccess(FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST, {[]{return CanUse(HOOKSHOT) || HasAccessTo(FOREST_TEMPLE_FALLING_ROOM) || (HasAccessTo(FOREST_TEMPLE_NE_OUTDOORS_UPPER) && IsAdult && LogicForestOutdoorsLedge && HoverBoots);}}),
-                  LocationAccess(FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD,    {[]{return CanUse(HOOKSHOT) || (LogicForestOutdoorEastGS && CanUse(BOOMERANG)) || Here(FOREST_TEMPLE_FALLING_ROOM, []{return CanUse(BOW) || CanUse(SLINGSHOT) || CanUse(DINS_FIRE) || HasExplosives;});}}),
+                  LocationAccess(RC_FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST, {[]{return CanUse(RG_HOOKSHOT) || HasAccessTo(RR_FOREST_TEMPLE_FALLING_ROOM) || (HasAccessTo(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER) && IsAdult && LogicForestOutdoorsLedge && HoverBoots);}}),
+                  LocationAccess(RC_FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD,    {[]{return CanUse(RG_HOOKSHOT) || (LogicForestOutdoorEastGS && CanUse(RG_BOOMERANG)) || Here(RR_FOREST_TEMPLE_FALLING_ROOM, []{return CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_DINS_FIRE) || HasExplosives;});}}),
                 }, {
                   //Exits
-                  Entrance(FOREST_TEMPLE_LOBBY,             {[]{return true;}}),
-                  Entrance(FOREST_TEMPLE_NE_OUTDOORS_UPPER, {[]{return CanUse(LONGSHOT) || (LogicForestVines && CanUse(HOOKSHOT));}}),
-                  Entrance(FOREST_TEMPLE_SEWER,             {[]{return GoldScale || CanUse(IRON_BOOTS) || HasAccessTo(FOREST_TEMPLE_NE_OUTDOORS_UPPER);}}),
-                  Entrance(FOREST_TEMPLE_FALLING_ROOM,      {[]{return false;}}),
+                  Entrance(RR_FOREST_TEMPLE_LOBBY,             {[]{return true;}}),
+                  Entrance(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER, {[]{return CanUse(RG_LONGSHOT) || (LogicForestVines && CanUse(RG_HOOKSHOT));}}),
+                  Entrance(RR_FOREST_TEMPLE_SEWER,             {[]{return GoldScale || CanUse(RG_IRON_BOOTS) || HasAccessTo(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER);}}),
+                  Entrance(RR_FOREST_TEMPLE_FALLING_ROOM,      {[]{return false;}}),
   });
 
-  areaTable[FOREST_TEMPLE_NE_OUTDOORS_UPPER] = Area("Forest Temple NE Outdoors Upper", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER] = Area("Forest Temple NE Outdoors Upper", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (IsAdult || KokiriSword || Boomerang);}}),
-                  EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(DINS_FIRE));}}),
+                  EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(RG_DINS_FIRE));}}),
                 }, {}, {
                   //Exits
-                  Entrance(FOREST_TEMPLE_NE_OUTDOORS_LOWER, {[]{return true;}}),
-                  Entrance(FOREST_TEMPLE_MAP_ROOM,          {[]{return true;}}),
-                  Entrance(FOREST_TEMPLE_FALLING_ROOM,      {[]{return LogicForestDoorFrame && CanUse(HOVER_BOOTS) && CanUse(SCARECROW);}}),
+                  Entrance(RR_FOREST_TEMPLE_NE_OUTDOORS_LOWER, {[]{return true;}}),
+                  Entrance(RR_FOREST_TEMPLE_MAP_ROOM,          {[]{return true;}}),
+                  Entrance(RR_FOREST_TEMPLE_FALLING_ROOM,      {[]{return LogicForestDoorFrame && CanUse(RG_HOVER_BOOTS) && CanUse(RG_SCARECROW);}}),
   });
 
-  areaTable[FOREST_TEMPLE_MAP_ROOM] = Area("Forest Temple Map Room", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_MAP_ROOM] = Area("Forest Temple Map Room", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(FOREST_TEMPLE_MAP_CHEST, {[]{return Here(FOREST_TEMPLE_MAP_ROOM, []{return HasExplosives || CanUse(MEGATON_HAMMER) || CanUse(BOW) || ((IsAdult || Sticks || KokiriSword || Slingshot) && (Nuts || HookshotOrBoomerang || CanShield));});}}),
+                  LocationAccess(RC_FOREST_TEMPLE_MAP_CHEST, {[]{return Here(RR_FOREST_TEMPLE_MAP_ROOM, []{return HasExplosives || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_FAIRY_BOW) || ((IsAdult || Sticks || KokiriSword || Slingshot) && (Nuts || HookshotOrBoomerang || CanShield));});}}),
                 }, {
                   //Exits
-                  Entrance(FOREST_TEMPLE_NW_OUTDOORS_LOWER, {[]{return Here(FOREST_TEMPLE_MAP_ROOM, []{return HasExplosives || CanUse(MEGATON_HAMMER) || CanUse(BOW) || ((IsAdult || Sticks || KokiriSword || Slingshot) && (Nuts || HookshotOrBoomerang || CanShield));});}}),
-                  Entrance(FOREST_TEMPLE_NE_OUTDOORS_UPPER, {[]{return Here(FOREST_TEMPLE_MAP_ROOM, []{return HasExplosives || CanUse(MEGATON_HAMMER) || CanUse(BOW) || ((IsAdult || Sticks || KokiriSword || Slingshot) && (Nuts || HookshotOrBoomerang || CanShield));});}}),
+                  Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_LOWER, {[]{return Here(RR_FOREST_TEMPLE_MAP_ROOM, []{return HasExplosives || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_FAIRY_BOW) || ((IsAdult || Sticks || KokiriSword || Slingshot) && (Nuts || HookshotOrBoomerang || CanShield));});}}),
+                  Entrance(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER, {[]{return Here(RR_FOREST_TEMPLE_MAP_ROOM, []{return HasExplosives || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_FAIRY_BOW) || ((IsAdult || Sticks || KokiriSword || Slingshot) && (Nuts || HookshotOrBoomerang || CanShield));});}}),
   });
 
-  areaTable[FOREST_TEMPLE_SEWER] = Area("Forest Temple Sewer", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_SEWER] = Area("Forest Temple Sewer", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(FOREST_TEMPLE_WELL_CHEST, {[]{return HasAccessTo(FOREST_TEMPLE_NE_OUTDOORS_UPPER);}}),
+                  LocationAccess(RC_FOREST_TEMPLE_WELL_CHEST, {[]{return HasAccessTo(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER);}}),
                 }, {
                   //Exits
-                  Entrance(FOREST_TEMPLE_NW_OUTDOORS_LOWER, {[]{return true;}}),
-                  Entrance(FOREST_TEMPLE_NE_OUTDOORS_LOWER, {[]{return true;}}),
+                  Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_LOWER, {[]{return true;}}),
+                  Entrance(RR_FOREST_TEMPLE_NE_OUTDOORS_LOWER, {[]{return true;}}),
   });
 
-  areaTable[FOREST_TEMPLE_BELOW_BOSS_KEY_CHEST] = Area("Forest Temple Below Boss Key Chest", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FOREST_TEMPLE_BELOW_BOSS_KEY_CHEST] = Area("Forest Temple Below Boss Key Chest", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(FOREST_TEMPLE_NW_OUTDOORS_UPPER, {[]{return Here(FOREST_TEMPLE_BELOW_BOSS_KEY_CHEST, []{return HasExplosives || CanUse(MEGATON_HAMMER) || CanUse(BOW) || ((IsAdult || Sticks || KokiriSword || Slingshot) && (Nuts || HookshotOrBoomerang || CanShield));});}}),
+                  Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER, {[]{return Here(RR_FOREST_TEMPLE_BELOW_BOSS_KEY_CHEST, []{return HasExplosives || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_FAIRY_BOW) || ((IsAdult || Sticks || KokiriSword || Slingshot) && (Nuts || HookshotOrBoomerang || CanShield));});}}),
   });
 
-  areaTable[FOREST_TEMPLE_FLOORMASTER_ROOM] = Area("Forest Temple Floormaster Room", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_FLOORMASTER_ROOM] = Area("Forest Temple Floormaster Room", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(FOREST_TEMPLE_FLOORMASTER_CHEST, {[]{return IsAdult || CanChildDamage;}}),
+                  LocationAccess(RC_FOREST_TEMPLE_FLOORMASTER_CHEST, {[]{return IsAdult || CanChildDamage;}}),
                 }, {
                   //Exits
-                  Entrance(FOREST_TEMPLE_NW_OUTDOORS_UPPER, {[]{return true;}}),
+                  Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER, {[]{return true;}}),
   });
 
-  areaTable[FOREST_TEMPLE_WEST_CORRIDOR] = Area("Forest Temple West Corridor", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FOREST_TEMPLE_WEST_CORRIDOR] = Area("Forest Temple West Corridor", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(FOREST_TEMPLE_LOBBY,           {[]{return SmallKeys(FOREST_TEMPLE, 1, 5);}}),
-                  Entrance(FOREST_TEMPLE_BLOCK_PUSH_ROOM, {[]{return IsAdult || CanChildAttack || Nuts;}}),
+                  Entrance(RR_FOREST_TEMPLE_LOBBY,           {[]{return SmallKeys(RR_FOREST_TEMPLE, 1, 5);}}),
+                  Entrance(RR_FOREST_TEMPLE_BLOCK_PUSH_ROOM, {[]{return IsAdult || CanChildAttack || Nuts;}}),
   });
 
-  areaTable[FOREST_TEMPLE_BLOCK_PUSH_ROOM] = Area("Forest Temple Block Push Room", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_BLOCK_PUSH_ROOM] = Area("Forest Temple Block Push Room", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(FOREST_TEMPLE_EYE_SWITCH_CHEST, {[]{return GoronBracelet && (CanUse(BOW) || CanUse(SLINGSHOT));}}),
+                  LocationAccess(RC_FOREST_TEMPLE_EYE_SWITCH_CHEST, {[]{return GoronBracelet && (CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT));}}),
                 }, {
                   //Exits
-                  Entrance(FOREST_TEMPLE_WEST_CORRIDOR,            {[]{return true;}}),
-                  Entrance(FOREST_TEMPLE_NW_OUTDOORS_UPPER,        {[]{return CanUse(HOVER_BOOTS) || (LogicForestOutsideBackdoor && CanJumpslash && GoronBracelet);}}),
-                  Entrance(FOREST_TEMPLE_NW_CORRIDOR_TWISTED,      {[]{return IsAdult && GoronBracelet && SmallKeys(FOREST_TEMPLE, 2);}}),
-                  Entrance(FOREST_TEMPLE_NW_CORRIDOR_STRAIGHTENED, {[]{return CanUse(BOW) && GoronBracelet && SmallKeys(FOREST_TEMPLE, 2);}}),
+                  Entrance(RR_FOREST_TEMPLE_WEST_CORRIDOR,            {[]{return true;}}),
+                  Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER,        {[]{return CanUse(RG_HOVER_BOOTS) || (LogicForestOutsideBackdoor && CanJumpslash && GoronBracelet);}}),
+                  Entrance(RR_FOREST_TEMPLE_NW_CORRIDOR_TWISTED,      {[]{return IsAdult && GoronBracelet && SmallKeys(RR_FOREST_TEMPLE, 2);}}),
+                  Entrance(RR_FOREST_TEMPLE_NW_CORRIDOR_STRAIGHTENED, {[]{return CanUse(RG_FAIRY_BOW) && GoronBracelet && SmallKeys(RR_FOREST_TEMPLE, 2);}}),
   });
 
-  areaTable[FOREST_TEMPLE_NW_CORRIDOR_TWISTED] = Area("Forest Temple NW Corridor Twisted", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FOREST_TEMPLE_NW_CORRIDOR_TWISTED] = Area("Forest Temple NW Corridor Twisted", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(FOREST_TEMPLE_BLOCK_PUSH_ROOM, {[]{return SmallKeys(FOREST_TEMPLE, 2);}}),
-                  Entrance(FOREST_TEMPLE_RED_POE_ROOM,    {[]{return SmallKeys(FOREST_TEMPLE, 3);}}),
+                  Entrance(RR_FOREST_TEMPLE_BLOCK_PUSH_ROOM, {[]{return SmallKeys(RR_FOREST_TEMPLE, 2);}}),
+                  Entrance(RR_FOREST_TEMPLE_RED_POE_ROOM,    {[]{return SmallKeys(RR_FOREST_TEMPLE, 3);}}),
   });
 
-  areaTable[FOREST_TEMPLE_NW_CORRIDOR_STRAIGHTENED] = Area("Forest Temple NW Corridor Straightened", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_NW_CORRIDOR_STRAIGHTENED] = Area("Forest Temple NW Corridor Straightened", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(FOREST_TEMPLE_BOSS_KEY_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_FOREST_TEMPLE_BOSS_KEY_CHEST, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(FOREST_TEMPLE_BELOW_BOSS_KEY_CHEST, {[]{return true;}}),
-                  Entrance(FOREST_TEMPLE_BLOCK_PUSH_ROOM,      {[]{return SmallKeys(FOREST_TEMPLE, 2);}}),
+                  Entrance(RR_FOREST_TEMPLE_BELOW_BOSS_KEY_CHEST, {[]{return true;}}),
+                  Entrance(RR_FOREST_TEMPLE_BLOCK_PUSH_ROOM,      {[]{return SmallKeys(RR_FOREST_TEMPLE, 2);}}),
   });
 
-  areaTable[FOREST_TEMPLE_RED_POE_ROOM] = Area("Forest Temple Red Poe Room", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_RED_POE_ROOM] = Area("Forest Temple Red Poe Room", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&ForestTempleJoelle, {[]{return ForestTempleJoelle || CanUse(BOW);}}),
+                  EventAccess(&ForestTempleJoelle, {[]{return ForestTempleJoelle || CanUse(RG_FAIRY_BOW);}}),
                 }, {
                   //Locations
-                  LocationAccess(FOREST_TEMPLE_RED_POE_CHEST, {[]{return ForestTempleJoelle;}}),
+                  LocationAccess(RC_FOREST_TEMPLE_RED_POE_CHEST, {[]{return ForestTempleJoelle;}}),
                 }, {
                   //Exits
-                  Entrance(FOREST_TEMPLE_NW_CORRIDOR_TWISTED, {[]{return SmallKeys(FOREST_TEMPLE, 3);}}),
-                  Entrance(FOREST_TEMPLE_UPPER_STALFOS,       {[]{return true;}}),
+                  Entrance(RR_FOREST_TEMPLE_NW_CORRIDOR_TWISTED, {[]{return SmallKeys(RR_FOREST_TEMPLE, 3);}}),
+                  Entrance(RR_FOREST_TEMPLE_UPPER_STALFOS,       {[]{return true;}}),
   });
 
-  areaTable[FOREST_TEMPLE_UPPER_STALFOS] = Area("Forest Temple Upper Stalfos", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_UPPER_STALFOS] = Area("Forest Temple Upper Stalfos", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(FOREST_TEMPLE_BOW_CHEST, {[]{return IsAdult || KokiriSword;}}),
+                  LocationAccess(RC_FOREST_TEMPLE_BOW_CHEST, {[]{return IsAdult || KokiriSword;}}),
                 }, {
                   //Exits
-                  Entrance(FOREST_TEMPLE_RED_POE_ROOM,  {[]{return IsAdult || KokiriSword;}}),
-                  Entrance(FOREST_TEMPLE_BLUE_POE_ROOM, {[]{return IsAdult || KokiriSword;}}),
+                  Entrance(RR_FOREST_TEMPLE_RED_POE_ROOM,  {[]{return IsAdult || KokiriSword;}}),
+                  Entrance(RR_FOREST_TEMPLE_BLUE_POE_ROOM, {[]{return IsAdult || KokiriSword;}}),
   });
 
-  areaTable[FOREST_TEMPLE_BLUE_POE_ROOM] = Area("Forest Temple Blue Poe Room", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_BLUE_POE_ROOM] = Area("Forest Temple Blue Poe Room", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&ForestTempleBeth, {[]{return ForestTempleBeth || CanUse(BOW);}}),
+                  EventAccess(&ForestTempleBeth, {[]{return ForestTempleBeth || CanUse(RG_FAIRY_BOW);}}),
                 }, {
                   //Locations
-                  LocationAccess(FOREST_TEMPLE_BLUE_POE_CHEST, {[]{return ForestTempleBeth;}}),
+                  LocationAccess(RC_FOREST_TEMPLE_BLUE_POE_CHEST, {[]{return ForestTempleBeth;}}),
                 }, {
                   //Exits
-                  Entrance(FOREST_TEMPLE_UPPER_STALFOS,            {[]{return true;}}),
-                  Entrance(FOREST_TEMPLE_NE_CORRIDOR_STRAIGHTENED, {[]{return SmallKeys(FOREST_TEMPLE, 4);}}),
+                  Entrance(RR_FOREST_TEMPLE_UPPER_STALFOS,            {[]{return true;}}),
+                  Entrance(RR_FOREST_TEMPLE_NE_CORRIDOR_STRAIGHTENED, {[]{return SmallKeys(RR_FOREST_TEMPLE, 4);}}),
   });
 
-  areaTable[FOREST_TEMPLE_NE_CORRIDOR_STRAIGHTENED] = Area("Forest Temple NE Corridor Straightened", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FOREST_TEMPLE_NE_CORRIDOR_STRAIGHTENED] = Area("Forest Temple NE Corridor Straightened", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(FOREST_TEMPLE_BLUE_POE_ROOM,   {[]{return SmallKeys(FOREST_TEMPLE, 4);}}),
-                  Entrance(FOREST_TEMPLE_FROZEN_EYE_ROOM, {[]{return SmallKeys(FOREST_TEMPLE, 5);}}),
+                  Entrance(RR_FOREST_TEMPLE_BLUE_POE_ROOM,   {[]{return SmallKeys(RR_FOREST_TEMPLE, 4);}}),
+                  Entrance(RR_FOREST_TEMPLE_FROZEN_EYE_ROOM, {[]{return SmallKeys(RR_FOREST_TEMPLE, 5);}}),
   });
 
-  areaTable[FOREST_TEMPLE_NE_CORRIDOR_TWISTED] = Area("Forest Temple NE Corridor Twisted", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FOREST_TEMPLE_NE_CORRIDOR_TWISTED] = Area("Forest Temple NE Corridor Twisted", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(FOREST_TEMPLE_FROZEN_EYE_ROOM, {[]{return SmallKeys(FOREST_TEMPLE, 5);}}),
-                  Entrance(FOREST_TEMPLE_FALLING_ROOM,    {[]{return true;}}),
+                  Entrance(RR_FOREST_TEMPLE_FROZEN_EYE_ROOM, {[]{return SmallKeys(RR_FOREST_TEMPLE, 5);}}),
+                  Entrance(RR_FOREST_TEMPLE_FALLING_ROOM,    {[]{return true;}}),
   });
 
-  areaTable[FOREST_TEMPLE_FROZEN_EYE_ROOM] = Area("Forest Temple Frozen Eye Room", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FOREST_TEMPLE_FROZEN_EYE_ROOM] = Area("Forest Temple Frozen Eye Room", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(FOREST_TEMPLE_NE_CORRIDOR_STRAIGHTENED, {[]{return SmallKeys(FOREST_TEMPLE, 5);}}),
-                  Entrance(FOREST_TEMPLE_NE_CORRIDOR_TWISTED,      {[]{return SmallKeys(FOREST_TEMPLE, 5) && (CanUse(BOW) || CanUse(DINS_FIRE));}}),
+                  Entrance(RR_FOREST_TEMPLE_NE_CORRIDOR_STRAIGHTENED, {[]{return SmallKeys(RR_FOREST_TEMPLE, 5);}}),
+                  Entrance(RR_FOREST_TEMPLE_NE_CORRIDOR_TWISTED,      {[]{return SmallKeys(RR_FOREST_TEMPLE, 5) && (CanUse(RG_FAIRY_BOW) || CanUse(RG_DINS_FIRE));}}),
   });
 
-  areaTable[FOREST_TEMPLE_FALLING_ROOM] = Area("Forest Temple Falling Room", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_FALLING_ROOM] = Area("Forest Temple Falling Room", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(FOREST_TEMPLE_NE_OUTDOORS_LOWER, {[]{return true;}}),
-                  Entrance(FOREST_TEMPLE_GREEN_POE_ROOM,    {[]{return true;}}),
+                  Entrance(RR_FOREST_TEMPLE_NE_OUTDOORS_LOWER, {[]{return true;}}),
+                  Entrance(RR_FOREST_TEMPLE_GREEN_POE_ROOM,    {[]{return true;}}),
   });
 
-  areaTable[FOREST_TEMPLE_GREEN_POE_ROOM] = Area("Forest Temple Green Poe Room", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_GREEN_POE_ROOM] = Area("Forest Temple Green Poe Room", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&ForestTempleAmy, {[]{return ForestTempleAmy || CanUse(BOW);}}),
+                  EventAccess(&ForestTempleAmy, {[]{return ForestTempleAmy || CanUse(RG_FAIRY_BOW);}}),
                 }, {}, {
                   //Exits
-                  Entrance(FOREST_TEMPLE_FALLING_ROOM,  {[]{return true;}}),
-                  Entrance(FOREST_TEMPLE_EAST_CORRIDOR, {[]{return ForestTempleAmy;}}),
+                  Entrance(RR_FOREST_TEMPLE_FALLING_ROOM,  {[]{return true;}}),
+                  Entrance(RR_FOREST_TEMPLE_EAST_CORRIDOR, {[]{return ForestTempleAmy;}}),
   });
 
-  areaTable[FOREST_TEMPLE_EAST_CORRIDOR] = Area("Forest Temple East Corridor", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FOREST_TEMPLE_EAST_CORRIDOR] = Area("Forest Temple East Corridor", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(FOREST_TEMPLE_LOBBY,          {[]{return IsAdult || CanChildAttack || Nuts;}}),
-                  Entrance(FOREST_TEMPLE_GREEN_POE_ROOM, {[]{return IsAdult || CanChildAttack || Nuts;}}),
+                  Entrance(RR_FOREST_TEMPLE_LOBBY,          {[]{return IsAdult || CanChildAttack || Nuts;}}),
+                  Entrance(RR_FOREST_TEMPLE_GREEN_POE_ROOM, {[]{return IsAdult || CanChildAttack || Nuts;}}),
   });
 
-  areaTable[FOREST_TEMPLE_BOSS_REGION] = Area("Forest Temple Boss Region", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_BOSS_REGION] = Area("Forest Temple Boss Region", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(FOREST_TEMPLE_BASEMENT_CHEST, {[]{return true;}}),
-                  LocationAccess(FOREST_TEMPLE_GS_BASEMENT,    {[]{return HookshotOrBoomerang;}}),
+                  LocationAccess(RC_FOREST_TEMPLE_BASEMENT_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_FOREST_TEMPLE_GS_BASEMENT,    {[]{return HookshotOrBoomerang;}}),
                 }, {
                   //Exits
-                  Entrance(FOREST_TEMPLE_LOBBY,     {[]{return true;}}),
-                  Entrance(FOREST_TEMPLE_BOSS_ENTRYWAY, {[]{return BossKeyForestTemple;}}),
+                  Entrance(RR_FOREST_TEMPLE_LOBBY,     {[]{return true;}}),
+                  Entrance(RR_FOREST_TEMPLE_BOSS_ENTRYWAY, {[]{return BossKeyForestTemple;}}),
   });
   }
 
@@ -280,158 +280,158 @@ void AreaTable_Init_ForestTemple() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (Dungeon::ForestTemple.IsMQ()) {
-  areaTable[FOREST_TEMPLE_MQ_LOBBY] = Area("Forest Temple MQ Lobby", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_MQ_LOBBY] = Area("Forest Temple MQ Lobby", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST, {[]{return IsAdult || Bombs || CanUse(STICKS) || Nuts || CanUse(BOOMERANG) || CanUse(DINS_FIRE) || KokiriSword || CanUse(SLINGSHOT);}}),
-                  LocationAccess(FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY, {[]{return HookshotOrBoomerang;}}),
+                  LocationAccess(RC_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST, {[]{return IsAdult || Bombs || CanUse(RG_STICKS) || Nuts || CanUse(RG_BOOMERANG) || CanUse(RG_DINS_FIRE) || KokiriSword || CanUse(RG_FAIRY_SLINGSHOT);}}),
+                  LocationAccess(RC_FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY, {[]{return HookshotOrBoomerang;}}),
   }, {
                   //Exits
-                  Entrance(FOREST_TEMPLE_ENTRYWAY,        {[]{return true;}}),
-                  Entrance(FOREST_TEMPLE_MQ_CENTRAL_AREA, {[]{return SmallKeys(FOREST_TEMPLE, 1) && (IsAdult || CanChildAttack || Nuts);}}),
+                  Entrance(RR_FOREST_TEMPLE_ENTRYWAY,        {[]{return true;}}),
+                  Entrance(RR_FOREST_TEMPLE_MQ_CENTRAL_AREA, {[]{return SmallKeys(RR_FOREST_TEMPLE, 1) && (IsAdult || CanChildAttack || Nuts);}}),
   });
 
-  areaTable[FOREST_TEMPLE_MQ_CENTRAL_AREA] = Area("Forest Temple MQ Central Area", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_MQ_CENTRAL_AREA] = Area("Forest Temple MQ Central Area", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FairyPot, {[]{return true;}}),
   }, {
                   //Locations
-                  LocationAccess(FOREST_TEMPLE_MQ_WOLFOS_CHEST,       {[]{return (CanPlay(SongOfTime) || IsChild) && (IsAdult || CanUse(DINS_FIRE) || CanUse(STICKS) || CanUse(SLINGSHOT) || KokiriSword);}}),
-                  LocationAccess(FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM, {[]{return IsAdult || KokiriSword;}}),
+                  LocationAccess(RC_FOREST_TEMPLE_MQ_WOLFOS_CHEST,       {[]{return (CanPlay(SongOfTime) || IsChild) && (IsAdult || CanUse(RG_DINS_FIRE) || CanUse(RG_STICKS) || CanUse(RG_FAIRY_SLINGSHOT) || KokiriSword);}}),
+                  LocationAccess(RC_FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM, {[]{return IsAdult || KokiriSword;}}),
   }, {
                   //Exits
-                  Entrance(FOREST_TEMPLE_MQ_NW_OUTDOORS,        {[]{return (IsAdult && CanUse(BOW)) || (IsChild && CanUse(SLINGSHOT));}}),
-                  Entrance(FOREST_TEMPLE_MQ_NE_OUTDOORS,        {[]{return (IsAdult && CanUse(BOW)) || (IsChild && CanUse(SLINGSHOT));}}), //This is as far as child can get
-                  Entrance(FOREST_TEMPLE_MQ_AFTER_BLOCK_PUZZLE, {[]{return IsAdult && (GoronBracelet || (LogicForestMQBlockPuzzle && HasBombchus && IsAdult && CanUse(HOOKSHOT)));}}),
-                    //Trick: IsAdult && (GoronBracelet || (LogicForestMQBlockPuzzle && HasBombchus && IsAdult && CanUse(HOOKSHOT)))
-                  Entrance(FOREST_TEMPLE_MQ_OUTDOOR_LEDGE,      {[]{return (LogicForestMQHallwaySwitchJS && IsAdult && CanUse(HOVER_BOOTS)) || (LogicForestMQHallwaySwitchBoomerang && CanUse(BOOMERANG)) || (LogicForestMQHallwaySwitchHookshot && IsAdult && CanUse(HOOKSHOT));}}),
-                    //Trick (Hookshot trick not added to either n64 or oot3d rando as of yet, to enable in SoH needs uncommenting in randomizer_tricks.cpp): (LogicForestMQHallwaySwitchJS && IsAdult && CanUse(HOVER_BOOTS)) || (LogicForestMQHallwaySwitchHookshot && IsAdult && CanUse(HOOKSHOT)) 
-                  Entrance(FOREST_TEMPLE_MQ_BOSS_REGION,        {[]{return ForestTempleJoAndBeth && ForestTempleAmyAndMeg;}}),
+                  Entrance(RR_FOREST_TEMPLE_MQ_NW_OUTDOORS,        {[]{return (IsAdult && CanUse(RG_FAIRY_BOW)) || (IsChild && CanUse(RG_FAIRY_SLINGSHOT));}}),
+                  Entrance(RR_FOREST_TEMPLE_MQ_NE_OUTDOORS,        {[]{return (IsAdult && CanUse(RG_FAIRY_BOW)) || (IsChild && CanUse(RG_FAIRY_SLINGSHOT));}}), //This is as far as child can get
+                  Entrance(RR_FOREST_TEMPLE_MQ_AFTER_BLOCK_PUZZLE, {[]{return IsAdult && (GoronBracelet || (LogicForestMQBlockPuzzle && HasBombchus && IsAdult && CanUse(RG_HOOKSHOT)));}}),
+                    //Trick: IsAdult && (GoronBracelet || (LogicForestMQBlockPuzzle && HasBombchus && IsAdult && CanUse(RG_HOOKSHOT)))
+                  Entrance(RR_FOREST_TEMPLE_MQ_OUTDOOR_LEDGE,      {[]{return (LogicForestMQHallwaySwitchJS && IsAdult && CanUse(RG_HOVER_BOOTS)) || (LogicForestMQHallwaySwitchBoomerang && CanUse(RG_BOOMERANG)) || (LogicForestMQHallwaySwitchHookshot && IsAdult && CanUse(RG_HOOKSHOT));}}),
+                    //Trick (Hookshot trick not added to either n64 or oot3d rando as of yet, to enable in SoH needs uncommenting in randomizer_tricks.cpp): (LogicForestMQHallwaySwitchJS && IsAdult && CanUse(RG_HOVER_BOOTS)) || (LogicForestMQHallwaySwitchHookshot && IsAdult && CanUse(RG_HOOKSHOT)) 
+                  Entrance(RR_FOREST_TEMPLE_MQ_BOSS_REGION,        {[]{return ForestTempleJoAndBeth && ForestTempleAmyAndMeg;}}),
   });
 
-  areaTable[FOREST_TEMPLE_MQ_AFTER_BLOCK_PUZZLE] = Area("Forest Temple MQ After Block Puzzle", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_MQ_AFTER_BLOCK_PUZZLE] = Area("Forest Temple MQ After Block Puzzle", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(FOREST_TEMPLE_MQ_BOSS_KEY_CHEST, {[]{return SmallKeys(FOREST_TEMPLE, 3);}}),
+                  LocationAccess(RC_FOREST_TEMPLE_MQ_BOSS_KEY_CHEST, {[]{return SmallKeys(RR_FOREST_TEMPLE, 3);}}),
   }, {
                   //Exits
-                  Entrance(FOREST_TEMPLE_MQ_BOW_REGION,    {[]{return SmallKeys(FOREST_TEMPLE, 4);}}),
-                  Entrance(FOREST_TEMPLE_MQ_OUTDOOR_LEDGE, {[]{return  SmallKeys(FOREST_TEMPLE, 3) || (LogicForestMQHallwaySwitchJS && ((IsAdult && CanUse(HOOKSHOT)) || (LogicForestOutsideBackdoor && (IsAdult || (IsChild && CanUse(STICKS))))));}}),
-                    //Trick (Doing the hallway switch jumpslash as child requires sticks and has been added above): SmallKeys(FOREST_TEMPLE, 3) || (LogicForestMQHallwaySwitchJS && ((IsAdult && CanUse(HOOKSHOT)) || LogicForestOutsideBackdoor))
-                  Entrance(FOREST_TEMPLE_MQ_NW_OUTDOORS,   {[]{return SmallKeys(FOREST_TEMPLE, 2);}}),
+                  Entrance(RR_FOREST_TEMPLE_MQ_BOW_REGION,    {[]{return SmallKeys(RR_FOREST_TEMPLE, 4);}}),
+                  Entrance(RR_FOREST_TEMPLE_MQ_OUTDOOR_LEDGE, {[]{return  SmallKeys(RR_FOREST_TEMPLE, 3) || (LogicForestMQHallwaySwitchJS && ((IsAdult && CanUse(RG_HOOKSHOT)) || (LogicForestOutsideBackdoor && (IsAdult || (IsChild && CanUse(RG_STICKS))))));}}),
+                    //Trick (Doing the hallway switch jumpslash as child requires sticks and has been added above): SmallKeys(RR_FOREST_TEMPLE, 3) || (LogicForestMQHallwaySwitchJS && ((IsAdult && CanUse(RG_HOOKSHOT)) || LogicForestOutsideBackdoor))
+                  Entrance(RR_FOREST_TEMPLE_MQ_NW_OUTDOORS,   {[]{return SmallKeys(RR_FOREST_TEMPLE, 2);}}),
   });
 
-  areaTable[FOREST_TEMPLE_MQ_OUTDOOR_LEDGE] = Area("Forest Temple MQ Outdoor Ledge", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_MQ_OUTDOOR_LEDGE] = Area("Forest Temple MQ Outdoor Ledge", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(FOREST_TEMPLE_MQ_REDEAD_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_FOREST_TEMPLE_MQ_REDEAD_CHEST, {[]{return true;}}),
   }, {
                   //Exits
-                  Entrance(FOREST_TEMPLE_MQ_NW_OUTDOORS, {[]{return true;}}),
+                  Entrance(RR_FOREST_TEMPLE_MQ_NW_OUTDOORS, {[]{return true;}}),
   });
 
-  areaTable[FOREST_TEMPLE_MQ_NW_OUTDOORS] = Area("Forest Temple MQ NW Outdoors", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_MQ_NW_OUTDOORS] = Area("Forest Temple MQ NW Outdoors", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD, {[]{return true;}}),
+                  LocationAccess(RC_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD, {[]{return true;}}),
   }, {
                   //Exits
-                  Entrance(FOREST_TEMPLE_MQ_NE_OUTDOORS,         {[]{return (IsAdult && (CanUse(IRON_BOOTS) || CanUse(LONGSHOT) || (LogicForestMQWellSwim && CanUse(HOOKSHOT)))) || ProgressiveScale >= 2;}}),
-                    //Trick: (IsAdult && (CanUse(IRON_BOOTS) || CanUse(LONGSHOT) || (LogicForestMQWellSwim && CanUse(HOOKSHOT)))) || ProgressiveScale >= 2
-                  Entrance(FOREST_TEMPLE_MQ_OUTDOORS_TOP_LEDGES, {[]{return IsAdult && CanUse(FIRE_ARROWS);}}),
+                  Entrance(RR_FOREST_TEMPLE_MQ_NE_OUTDOORS,         {[]{return (IsAdult && (CanUse(RG_IRON_BOOTS) || CanUse(RG_LONGSHOT) || (LogicForestMQWellSwim && CanUse(RG_HOOKSHOT)))) || ProgressiveScale >= 2;}}),
+                    //Trick: (IsAdult && (CanUse(RG_IRON_BOOTS) || CanUse(RG_LONGSHOT) || (LogicForestMQWellSwim && CanUse(RG_HOOKSHOT)))) || ProgressiveScale >= 2
+                  Entrance(RR_FOREST_TEMPLE_MQ_OUTDOORS_TOP_LEDGES, {[]{return IsAdult && CanUse(RG_FIRE_ARROWS);}}),
   });
 
-  areaTable[FOREST_TEMPLE_MQ_NE_OUTDOORS] = Area("Forest Temple MQ NE Outdoors", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_MQ_NE_OUTDOORS] = Area("Forest Temple MQ NE Outdoors", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (IsAdult || KokiriSword || Boomerang);}}),
-                  EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(DINS_FIRE));}}),
+                  EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(RG_DINS_FIRE));}}),
   }, {
                   //Locations
-                  LocationAccess(FOREST_TEMPLE_MQ_WELL_CHEST,                 {[]{return (IsAdult && CanUse(BOW)) || (IsChild && CanUse(SLINGSHOT));}}),
-                  LocationAccess(FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD, {[]{return HookshotOrBoomerang || (IsAdult && CanUse(FIRE_ARROWS) && (CanPlay(SongOfTime) || (CanUse(HOVER_BOOTS) && LogicForestDoorFrame)));}}),
-                  LocationAccess(FOREST_TEMPLE_MQ_GS_WELL,                    {[]{return (IsAdult && ((CanUse(IRON_BOOTS) && CanUse(HOOKSHOT)) || CanUse(BOW))) || (IsChild && CanUse(SLINGSHOT));}}),
+                  LocationAccess(RC_FOREST_TEMPLE_MQ_WELL_CHEST,                 {[]{return (IsAdult && CanUse(RG_FAIRY_BOW)) || (IsChild && CanUse(RG_FAIRY_SLINGSHOT));}}),
+                  LocationAccess(RC_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD, {[]{return HookshotOrBoomerang || (IsAdult && CanUse(RG_FIRE_ARROWS) && (CanPlay(SongOfTime) || (CanUse(RG_HOVER_BOOTS) && LogicForestDoorFrame)));}}),
+                  LocationAccess(RC_FOREST_TEMPLE_MQ_GS_WELL,                    {[]{return (IsAdult && ((CanUse(RG_IRON_BOOTS) && CanUse(RG_HOOKSHOT)) || CanUse(RG_FAIRY_BOW))) || (IsChild && CanUse(RG_FAIRY_SLINGSHOT));}}),
   }, {
                   //Exits
-                  Entrance(FOREST_TEMPLE_MQ_OUTDOORS_TOP_LEDGES, {[]{return IsAdult && CanUse(HOOKSHOT) && (CanUse(LONGSHOT) || CanUse(HOVER_BOOTS) || CanPlay(SongOfTime));}}),
-                  Entrance(FOREST_TEMPLE_MQ_NE_OUTDOORS_LEDGE,   {[]{return IsAdult && CanUse(LONGSHOT);}}),
+                  Entrance(RR_FOREST_TEMPLE_MQ_OUTDOORS_TOP_LEDGES, {[]{return IsAdult && CanUse(RG_HOOKSHOT) && (CanUse(RG_LONGSHOT) || CanUse(RG_HOVER_BOOTS) || CanPlay(SongOfTime));}}),
+                  Entrance(RR_FOREST_TEMPLE_MQ_NE_OUTDOORS_LEDGE,   {[]{return IsAdult && CanUse(RG_LONGSHOT);}}),
   });
 
-  areaTable[FOREST_TEMPLE_MQ_OUTDOORS_TOP_LEDGES] = Area("Forest Temple MQ Outdoors Top Ledges", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_MQ_OUTDOORS_TOP_LEDGES] = Area("Forest Temple MQ Outdoors Top Ledges", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST, {[]{return true;}}),
   }, {
                   //Exits
-                  Entrance(FOREST_TEMPLE_MQ_NE_OUTDOORS,       {[]{return true;}}),
-                  Entrance(FOREST_TEMPLE_MQ_NE_OUTDOORS_LEDGE, {[]{return LogicForestOutdoorsLedge && IsAdult && CanUse(HOVER_BOOTS);}}),
-                    //Trick: LogicForestOutdoorsLedge && IsAdult && CanUse(HOVER_BOOTS)
+                  Entrance(RR_FOREST_TEMPLE_MQ_NE_OUTDOORS,       {[]{return true;}}),
+                  Entrance(RR_FOREST_TEMPLE_MQ_NE_OUTDOORS_LEDGE, {[]{return LogicForestOutdoorsLedge && IsAdult && CanUse(RG_HOVER_BOOTS);}}),
+                    //Trick: LogicForestOutdoorsLedge && IsAdult && CanUse(RG_HOVER_BOOTS)
   });
 
-  areaTable[FOREST_TEMPLE_MQ_NE_OUTDOORS_LEDGE] = Area("Forest Temple MQ NE Outdoors Ledge", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_MQ_NE_OUTDOORS_LEDGE] = Area("Forest Temple MQ NE Outdoors Ledge", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST, {[]{return true;}}),
   }, {
                   //Exits
-                  Entrance(FOREST_TEMPLE_MQ_NE_OUTDOORS,  {[]{return true;}}),
-                  Entrance(FOREST_TEMPLE_MQ_FALLING_ROOM, {[]{return CanPlay(SongOfTime);}}),
+                  Entrance(RR_FOREST_TEMPLE_MQ_NE_OUTDOORS,  {[]{return true;}}),
+                  Entrance(RR_FOREST_TEMPLE_MQ_FALLING_ROOM, {[]{return CanPlay(SongOfTime);}}),
   });
 
-  areaTable[FOREST_TEMPLE_MQ_BOW_REGION] = Area("Forest Temple MQ Bow Region", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_MQ_BOW_REGION] = Area("Forest Temple MQ Bow Region", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&ForestTempleJoAndBeth, {[]{return ForestTempleJoAndBeth || (IsAdult && CanUse(BOW));}}),
+                  EventAccess(&ForestTempleJoAndBeth, {[]{return ForestTempleJoAndBeth || (IsAdult && CanUse(RG_FAIRY_BOW));}}),
   }, {
                   //Locations
-                  LocationAccess(FOREST_TEMPLE_MQ_BOW_CHEST,     {[]{return true;}}),
-                  LocationAccess(FOREST_TEMPLE_MQ_MAP_CHEST,     {[]{return IsAdult && CanUse(BOW);}}),
-                  LocationAccess(FOREST_TEMPLE_MQ_COMPASS_CHEST, {[]{return IsAdult && CanUse(BOW);}}),
+                  LocationAccess(RC_FOREST_TEMPLE_MQ_BOW_CHEST,     {[]{return true;}}),
+                  LocationAccess(RC_FOREST_TEMPLE_MQ_MAP_CHEST,     {[]{return IsAdult && CanUse(RG_FAIRY_BOW);}}),
+                  LocationAccess(RC_FOREST_TEMPLE_MQ_COMPASS_CHEST, {[]{return IsAdult && CanUse(RG_FAIRY_BOW);}}),
   }, {
                   //Exits
-                  Entrance(FOREST_TEMPLE_MQ_FALLING_ROOM, {[]{return SmallKeys(FOREST_TEMPLE, 5) && ((IsAdult && CanUse(BOW)) || CanUse(DINS_FIRE));}}),
+                  Entrance(RR_FOREST_TEMPLE_MQ_FALLING_ROOM, {[]{return SmallKeys(RR_FOREST_TEMPLE, 5) && ((IsAdult && CanUse(RG_FAIRY_BOW)) || CanUse(RG_DINS_FIRE));}}),
   });
 
-  areaTable[FOREST_TEMPLE_MQ_FALLING_ROOM] = Area("Forest Temple MQ Falling Room", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_MQ_FALLING_ROOM] = Area("Forest Temple MQ Falling Room", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&ForestTempleAmyAndMeg, {[]{return ForestTempleAmyAndMeg || (IsAdult && CanUse(BOW) && SmallKeys(FOREST_TEMPLE, 6));}}),
+                  EventAccess(&ForestTempleAmyAndMeg, {[]{return ForestTempleAmyAndMeg || (IsAdult && CanUse(RG_FAIRY_BOW) && SmallKeys(RR_FOREST_TEMPLE, 6));}}),
   }, {
                   //Locations
-                  LocationAccess(FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST, {[]{return true;}}),
   }, {
                   //Exits
-                  Entrance(FOREST_TEMPLE_MQ_NE_OUTDOORS_LEDGE, {[]{return true;}}),
+                  Entrance(RR_FOREST_TEMPLE_MQ_NE_OUTDOORS_LEDGE, {[]{return true;}}),
   });
 
-  areaTable[FOREST_TEMPLE_MQ_BOSS_REGION] = Area("Forest Temple MQ Boss Region", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_MQ_BOSS_REGION] = Area("Forest Temple MQ Boss Region", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(FOREST_TEMPLE_MQ_BASEMENT_CHEST,   {[]{return true;}}),
+                  LocationAccess(RC_FOREST_TEMPLE_MQ_BASEMENT_CHEST,   {[]{return true;}}),
   }, {
                   //Exits
-                  Entrance(FOREST_TEMPLE_BOSS_ENTRYWAY, {[]{return BossKeyForestTemple;}}),
+                  Entrance(RR_FOREST_TEMPLE_BOSS_ENTRYWAY, {[]{return BossKeyForestTemple;}}),
   });
   }
 
     /*---------------------------
     |         BOSS ROOM         |
     ---------------------------*/
-    areaTable[FOREST_TEMPLE_BOSS_ENTRYWAY] =
-        Area("Forest Temple Boss Entryway", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
+    areaTable[RR_FOREST_TEMPLE_BOSS_ENTRYWAY] =
+        Area("Forest Temple Boss Entryway", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
              {
                  // Exits
-                 Entrance(FOREST_TEMPLE_BOSS_REGION, { [] { return Dungeon::ForestTemple.IsVanilla() && false; } }),
-                 Entrance(FOREST_TEMPLE_MQ_BOSS_REGION, { [] { return Dungeon::ForestTemple.IsMQ() && false; } }),
-                 Entrance(FOREST_TEMPLE_BOSS_ROOM, { [] { return true; } }),
+                 Entrance(RR_FOREST_TEMPLE_BOSS_REGION, { [] { return Dungeon::ForestTemple.IsVanilla() && false; } }),
+                 Entrance(RR_FOREST_TEMPLE_MQ_BOSS_REGION, { [] { return Dungeon::ForestTemple.IsMQ() && false; } }),
+                 Entrance(RR_FOREST_TEMPLE_BOSS_ROOM, { [] { return true; } }),
              });
 
-    areaTable[FOREST_TEMPLE_BOSS_ROOM] = Area(
-        "Forest Temple Boss Room", "Forest Temple", NONE, NO_DAY_NIGHT_CYCLE,
+    areaTable[RR_FOREST_TEMPLE_BOSS_ROOM] = Area(
+        "Forest Temple Boss Room", "Forest Temple", RHT_NONE, NO_DAY_NIGHT_CYCLE,
         {
             // Events
             EventAccess(&ForestTempleClear, { [] {
-                return ForestTempleClear || ((CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD)) &&
-                                             (CanUse(HOOKSHOT) || CanUse(BOW) || CanUse(SLINGSHOT)));
+                return ForestTempleClear || ((CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) &&
+                                             (CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT)));
             } }),
         },
         {
             // Locations
-            LocationAccess(FOREST_TEMPLE_PHANTOM_GANON_HEART, { [] { return ForestTempleClear; } }),
-            LocationAccess(PHANTOM_GANON, { [] { return ForestTempleClear; } }),
+            LocationAccess(RC_FOREST_TEMPLE_PHANTOM_GANON_HEART, { [] { return ForestTempleClear; } }),
+            LocationAccess(RC_PHANTOM_GANON, { [] { return ForestTempleClear; } }),
         },
         {
             // Exits
-            Entrance(FOREST_TEMPLE_BOSS_ENTRYWAY, { [] { return false; } }),
+            Entrance(RR_FOREST_TEMPLE_BOSS_ENTRYWAY, { [] { return false; } }),
         });
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
index ebb8625ec..3aa73962f 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
@@ -11,203 +11,203 @@ void AreaTable_Init_GanonsCastle() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[GANONS_CASTLE_ENTRYWAY] = Area("Ganon's Castle Entryway", "Ganon's Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_GANONS_CASTLE_ENTRYWAY] = Area("Ganon's Castle Entryway", "Ganon's Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(GANONS_CASTLE_LOBBY,    {[]{return Dungeon::GanonsCastle.IsVanilla();}}),
-                  Entrance(GANONS_CASTLE_MQ_LOBBY, {[]{return Dungeon::GanonsCastle.IsMQ();}}),
-                  Entrance(CASTLE_GROUNDS_FROM_GANONS_CASTLE,    {[]{return true;}}),
+                  Entrance(RR_GANONS_CASTLE_LOBBY,    {[]{return Dungeon::GanonsCastle.IsVanilla();}}),
+                  Entrance(RR_GANONS_CASTLE_MQ_LOBBY, {[]{return Dungeon::GanonsCastle.IsMQ();}}),
+                  Entrance(RR_CASTLE_GROUNDS_FROM_GANONS_CASTLE,    {[]{return true;}}),
   });
 
   /*--------------------------
   |     VANILLA DUNGEON      |
   ---------------------------*/
   if (Dungeon::GanonsCastle.IsVanilla()) {
-  areaTable[GANONS_CASTLE_LOBBY] = Area("Ganon's Castle Lobby", "Ganon's Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_GANONS_CASTLE_LOBBY] = Area("Ganon's Castle Lobby", "Ganon's Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(GANONS_CASTLE_ENTRYWAY,     {[]{return true;}}),
-                  Entrance(GANONS_CASTLE_FOREST_TRIAL, {[]{return true;}}),
-                  Entrance(GANONS_CASTLE_FIRE_TRIAL,   {[]{return true;}}),
-                  Entrance(GANONS_CASTLE_WATER_TRIAL,  {[]{return true;}}),
-                  Entrance(GANONS_CASTLE_SHADOW_TRIAL, {[]{return true;}}),
-                  Entrance(GANONS_CASTLE_SPIRIT_TRIAL, {[]{return true;}}),
-                  Entrance(GANONS_CASTLE_LIGHT_TRIAL,  {[]{return CanUse(GOLDEN_GAUNTLETS);}}),
-                  Entrance(GANONS_CASTLE_TOWER,        {[]{return (ForestTrialClear || Trial::ForestTrial.IsSkipped()) &&
+                  Entrance(RR_GANONS_CASTLE_ENTRYWAY,     {[]{return true;}}),
+                  Entrance(RR_GANONS_CASTLE_FOREST_TRIAL, {[]{return true;}}),
+                  Entrance(RR_GANONS_CASTLE_FIRE_TRIAL,   {[]{return true;}}),
+                  Entrance(RR_GANONS_CASTLE_WATER_TRIAL,  {[]{return true;}}),
+                  Entrance(RR_GANONS_CASTLE_SHADOW_TRIAL, {[]{return true;}}),
+                  Entrance(RR_GANONS_CASTLE_SPIRIT_TRIAL, {[]{return true;}}),
+                  Entrance(RR_GANONS_CASTLE_LIGHT_TRIAL,  {[]{return CanUse(RG_GOLDEN_GAUNTLETS);}}),
+                  Entrance(RR_GANONS_CASTLE_TOWER,        {[]{return (ForestTrialClear || Trial::ForestTrial.IsSkipped()) &&
                                                                          (FireTrialClear   || Trial::FireTrial.IsSkipped())   &&
                                                                          (WaterTrialClear  || Trial::WaterTrial.IsSkipped())  &&
                                                                          (ShadowTrialClear || Trial::ShadowTrial.IsSkipped()) &&
                                                                          (SpiritTrialClear || Trial::SpiritTrial.IsSkipped()) &&
                                                                          (LightTrialClear  || Trial::LightTrial.IsSkipped());}}),
-                  Entrance(GANONS_CASTLE_DEKU_SCRUBS,  {[]{return LogicLensCastle || CanUse(LENS_OF_TRUTH);}}),
+                  Entrance(RR_GANONS_CASTLE_DEKU_SCRUBS,  {[]{return LogicLensCastle || CanUse(RG_LENS_OF_TRUTH);}}),
   });
 
-  areaTable[GANONS_CASTLE_DEKU_SCRUBS] = Area("Ganon's Castle Deku Scrubs", "Ganon's Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_DEKU_SCRUBS] = Area("Ganon's Castle Deku Scrubs", "Ganon's Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FreeFairies, {[]{return true;}}),
                 }, {
                   //Locations
-                  LocationAccess(GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,  {[]{return CanStunDeku;}}),
-                  LocationAccess(GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT, {[]{return CanStunDeku;}}),
-                  LocationAccess(GANONS_CASTLE_DEKU_SCRUB_RIGHT,        {[]{return CanStunDeku;}}),
-                  LocationAccess(GANONS_CASTLE_DEKU_SCRUB_LEFT,         {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,  {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT, {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_GANONS_CASTLE_DEKU_SCRUB_RIGHT,        {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_GANONS_CASTLE_DEKU_SCRUB_LEFT,         {[]{return CanStunDeku;}}),
   }, {});
 
-  areaTable[GANONS_CASTLE_FOREST_TRIAL] = Area("Ganon's Castle Forest Trial", "Ganon's Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_FOREST_TRIAL] = Area("Ganon's Castle Forest Trial", "Ganon's Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&ForestTrialClear, {[]{return CanUse(LIGHT_ARROWS) && (FireArrows || DinsFire);}}),
+                  EventAccess(&ForestTrialClear, {[]{return CanUse(RG_LIGHT_ARROWS) && (FireArrows || DinsFire);}}),
                 }, {
                   //Locations
-                  LocationAccess(GANONS_CASTLE_FOREST_TRIAL_CHEST, {[]{return IsAdult || CanChildDamage;}}),
+                  LocationAccess(RC_GANONS_CASTLE_FOREST_TRIAL_CHEST, {[]{return IsAdult || CanChildDamage;}}),
   }, {});
 
-  areaTable[GANONS_CASTLE_FIRE_TRIAL] = Area("Ganon's Castle Fire Trial", "Ganon's Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_FIRE_TRIAL] = Area("Ganon's Castle Fire Trial", "Ganon's Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&FireTrialClear, {[]{return CanUse(GORON_TUNIC) && CanUse(GOLDEN_GAUNTLETS) && CanUse(LIGHT_ARROWS) && CanUse(LONGSHOT);}}),
+                  EventAccess(&FireTrialClear, {[]{return CanUse(RG_GORON_TUNIC) && CanUse(RG_GOLDEN_GAUNTLETS) && CanUse(RG_LIGHT_ARROWS) && CanUse(RG_LONGSHOT);}}),
   }, {}, {});
 
-  areaTable[GANONS_CASTLE_WATER_TRIAL] = Area("Ganon's Castle Water Trial", "Ganon's Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_WATER_TRIAL] = Area("Ganon's Castle Water Trial", "Ganon's Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&BlueFireAccess,  {[]{return BlueFireAccess || HasBottle;}}),
                   EventAccess(&FairyPot,        {[]{return FairyPot || BlueFire;}}),
-                  EventAccess(&WaterTrialClear, {[]{return BlueFire && Hammer && CanUse(LIGHT_ARROWS);}}),
+                  EventAccess(&WaterTrialClear, {[]{return BlueFire && Hammer && CanUse(RG_LIGHT_ARROWS);}}),
                 }, {
                   //Locations
-                  LocationAccess(GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST,  {[]{return true;}}),
-                  LocationAccess(GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST,  {[]{return true;}}),
+                  LocationAccess(RC_GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST, {[]{return true;}}),
   }, {});
 
-  areaTable[GANONS_CASTLE_SHADOW_TRIAL] = Area("Ganon's Castle Shadow Trial", "Ganon's Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_SHADOW_TRIAL] = Area("Ganon's Castle Shadow Trial", "Ganon's Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&ShadowTrialClear, {[]{return CanUse(LIGHT_ARROWS) && Hammer && ((FireArrows && (LogicLensCastle || CanUse(LENS_OF_TRUTH))) || (CanUse(LONGSHOT) && (CanUse(HOVER_BOOTS) || (DinsFire && (LogicLensCastle || CanUse(LENS_OF_TRUTH))))));}}),
+                  EventAccess(&ShadowTrialClear, {[]{return CanUse(RG_LIGHT_ARROWS) && Hammer && ((FireArrows && (LogicLensCastle || CanUse(RG_LENS_OF_TRUTH))) || (CanUse(RG_LONGSHOT) && (CanUse(RG_HOVER_BOOTS) || (DinsFire && (LogicLensCastle || CanUse(RG_LENS_OF_TRUTH))))));}}),
                 }, {
                   //Locations
-                  LocationAccess(GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST,            {[]{return CanUse(FIRE_ARROWS) || CanUse(HOOKSHOT) || CanUse(HOVER_BOOTS) || CanPlay(SongOfTime) || IsChild;}}),
-                  LocationAccess(GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST, {[]{return CanUse(FIRE_ARROWS) || (CanUse(LONGSHOT) && (CanUse(HOVER_BOOTS) || CanUse(DINS_FIRE)));}}),
+                  LocationAccess(RC_GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST,            {[]{return CanUse(RG_FIRE_ARROWS) || CanUse(RG_HOOKSHOT) || CanUse(RG_HOVER_BOOTS) || CanPlay(SongOfTime) || IsChild;}}),
+                  LocationAccess(RC_GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST, {[]{return CanUse(RG_FIRE_ARROWS) || (CanUse(RG_LONGSHOT) && (CanUse(RG_HOVER_BOOTS) || CanUse(RG_DINS_FIRE)));}}),
   }, {});
 
-  areaTable[GANONS_CASTLE_SPIRIT_TRIAL] = Area("Ganon's Castle Spirit Trial", "Ganon's Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_SPIRIT_TRIAL] = Area("Ganon's Castle Spirit Trial", "Ganon's Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&NutPot,           {[]{return NutPot || ((LogicSpiritTrialHookshot || CanUse(HOOKSHOT)) && HasBombchus && Bow && (MirrorShield || (SunlightArrows && CanUse(LIGHT_ARROWS))) && IsAdult);}}),
-                  EventAccess(&SpiritTrialClear, {[]{return CanUse(LIGHT_ARROWS)  && (MirrorShield || SunlightArrows) && HasBombchus && (LogicSpiritTrialHookshot || CanUse(HOOKSHOT));}}),
+                  EventAccess(&NutPot,           {[]{return NutPot || ((LogicSpiritTrialHookshot || CanUse(RG_HOOKSHOT)) && HasBombchus && Bow && (MirrorShield || (SunlightArrows && CanUse(RG_LIGHT_ARROWS))) && IsAdult);}}),
+                  EventAccess(&SpiritTrialClear, {[]{return CanUse(RG_LIGHT_ARROWS)  && (MirrorShield || SunlightArrows) && HasBombchus && (LogicSpiritTrialHookshot || CanUse(RG_HOOKSHOT));}}),
                 }, {
                   //Locations
-                  LocationAccess(GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST, {[]{return LogicSpiritTrialHookshot || CanUse(HOOKSHOT);}}),
-                  LocationAccess(GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST,      {[]{return (LogicSpiritTrialHookshot || CanUse(HOOKSHOT)) && HasBombchus && (LogicLensCastle || CanUse(LENS_OF_TRUTH));}}),
+                  LocationAccess(RC_GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST, {[]{return LogicSpiritTrialHookshot || CanUse(RG_HOOKSHOT);}}),
+                  LocationAccess(RC_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST,      {[]{return (LogicSpiritTrialHookshot || CanUse(RG_HOOKSHOT)) && HasBombchus && (LogicLensCastle || CanUse(RG_LENS_OF_TRUTH));}}),
   }, {});
 
-  areaTable[GANONS_CASTLE_LIGHT_TRIAL] = Area("Ganon's Castle Light Trial", "Ganon's Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_LIGHT_TRIAL] = Area("Ganon's Castle Light Trial", "Ganon's Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&LightTrialClear, {[]{return CanUse(LIGHT_ARROWS) && CanUse(HOOKSHOT) && SmallKeys(GANONS_CASTLE, 2) && (LogicLensCastle || CanUse(LENS_OF_TRUTH));}}),
+                  EventAccess(&LightTrialClear, {[]{return CanUse(RG_LIGHT_ARROWS) && CanUse(RG_HOOKSHOT) && SmallKeys(RR_GANONS_CASTLE, 2) && (LogicLensCastle || CanUse(RG_LENS_OF_TRUTH));}}),
                 }, {
                   //Locations
-                  LocationAccess(GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST,        {[]{return true;}}),
-                  LocationAccess(GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST,       {[]{return true;}}),
-                  LocationAccess(GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST,        {[]{return true;}}),
-                  LocationAccess(GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST,       {[]{return true;}}),
-                  LocationAccess(GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST,      {[]{return true;}}),
-                  LocationAccess(GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST,       {[]{return true;}}),
-                  LocationAccess(GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST, {[]{return LogicLensCastle || CanUse(LENS_OF_TRUTH);}}),
-                  LocationAccess(GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST,           {[]{return CanPlay(ZeldasLullaby) && SmallKeys(GANONS_CASTLE, 1);}}),
+                  LocationAccess(RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST,        {[]{return true;}}),
+                  LocationAccess(RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST,       {[]{return true;}}),
+                  LocationAccess(RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST,        {[]{return true;}}),
+                  LocationAccess(RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST,       {[]{return true;}}),
+                  LocationAccess(RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST,      {[]{return true;}}),
+                  LocationAccess(RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST,       {[]{return true;}}),
+                  LocationAccess(RC_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST, {[]{return LogicLensCastle || CanUse(RG_LENS_OF_TRUTH);}}),
+                  LocationAccess(RC_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST,           {[]{return CanPlay(ZeldasLullaby) && SmallKeys(RR_GANONS_CASTLE, 1);}}),
   }, {});
   }
 
-  areaTable[GANONS_CASTLE_TOWER] = Area("Ganon's Castle Tower", "Ganons Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GANONS_CASTLE_TOWER] = Area("Ganon's Castle Tower", "Ganons Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(GANONS_TOWER_BOSS_KEY_CHEST, {[]{return true;}}),
-                  LocationAccess(GANONDORF_HINT,              {[]{return BossKeyGanonsCastle;}}),
-                  LocationAccess(GANON,                       {[]{return BossKeyGanonsCastle && CanUse(LIGHT_ARROWS);}}),
+                  LocationAccess(RC_GANONS_TOWER_BOSS_KEY_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_GANONDORF_HINT,              {[]{return BossKeyGanonsCastle;}}),
+                  LocationAccess(RC_GANON,                       {[]{return BossKeyGanonsCastle && CanUse(RG_LIGHT_ARROWS);}}),
   }, {});
 
   /*---------------------------
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (Dungeon::GanonsCastle.IsMQ()) {
-  areaTable[GANONS_CASTLE_MQ_LOBBY] = Area("Ganon's Castle MQ Lobby", "Ganons Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_GANONS_CASTLE_MQ_LOBBY] = Area("Ganon's Castle MQ Lobby", "Ganons Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(GANONS_CASTLE_ENTRYWAY,        {[]{return (IsAdult || (HasExplosives || ((Nuts || Boomerang) && (Sticks || KokiriSword))));}}),
-                  Entrance(GANONS_CASTLE_MQ_FOREST_TRIAL, {[]{return true;}}),
-                  Entrance(GANONS_CASTLE_MQ_FIRE_TRIAL,   {[]{return true;}}),
-                  Entrance(GANONS_CASTLE_MQ_WATER_TRIAL,  {[]{return true;}}),
-                  Entrance(GANONS_CASTLE_MQ_SHADOW_TRIAL, {[]{return true;}}),
-                  Entrance(GANONS_CASTLE_MQ_SPIRIT_TRIAL, {[]{return true;}}),
-                  Entrance(GANONS_CASTLE_MQ_LIGHT_TRIAL,  {[]{return CanUse(GOLDEN_GAUNTLETS);}}),
-                  Entrance(GANONS_CASTLE_TOWER,           {[]{return (ForestTrialClear || Trial::ForestTrial.IsSkipped()) &&
+                  Entrance(RR_GANONS_CASTLE_ENTRYWAY,        {[]{return (IsAdult || (HasExplosives || ((Nuts || Boomerang) && (Sticks || KokiriSword))));}}),
+                  Entrance(RR_GANONS_CASTLE_MQ_FOREST_TRIAL, {[]{return true;}}),
+                  Entrance(RR_GANONS_CASTLE_MQ_FIRE_TRIAL,   {[]{return true;}}),
+                  Entrance(RR_GANONS_CASTLE_MQ_WATER_TRIAL,  {[]{return true;}}),
+                  Entrance(RR_GANONS_CASTLE_MQ_SHADOW_TRIAL, {[]{return true;}}),
+                  Entrance(RR_GANONS_CASTLE_MQ_SPIRIT_TRIAL, {[]{return true;}}),
+                  Entrance(RR_GANONS_CASTLE_MQ_LIGHT_TRIAL,  {[]{return CanUse(RG_GOLDEN_GAUNTLETS);}}),
+                  Entrance(RR_GANONS_CASTLE_TOWER,           {[]{return (ForestTrialClear || Trial::ForestTrial.IsSkipped()) &&
                                                                             (FireTrialClear   || Trial::FireTrial.IsSkipped())   &&
                                                                             (WaterTrialClear  || Trial::WaterTrial.IsSkipped())  &&
                                                                             (ShadowTrialClear || Trial::ShadowTrial.IsSkipped()) &&
                                                                             (SpiritTrialClear || Trial::SpiritTrial.IsSkipped()) &&
                                                                             (LightTrialClear  || Trial::LightTrial.IsSkipped());}}),
-                  Entrance(GANONS_CASTLE_MQ_DEKU_SCRUBS,  {[]{return LogicLensCastleMQ || CanUse(LENS_OF_TRUTH);}}),
+                  Entrance(RR_GANONS_CASTLE_MQ_DEKU_SCRUBS,  {[]{return LogicLensCastleMQ || CanUse(RG_LENS_OF_TRUTH);}}),
   });
 
-  areaTable[GANONS_CASTLE_MQ_DEKU_SCRUBS] = Area("Ganon's Castle MQ Deku Scrubs", "Ganon's Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_MQ_DEKU_SCRUBS] = Area("Ganon's Castle MQ Deku Scrubs", "Ganon's Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FreeFairies, {[]{return true;}}),
   }, {
                   //Locations
-                  LocationAccess(GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,  {[]{return CanStunDeku;}}),
-                  LocationAccess(GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,       {[]{return CanStunDeku;}}),
-                  LocationAccess(GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT, {[]{return CanStunDeku;}}),
-                  LocationAccess(GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,         {[]{return CanStunDeku;}}),
-                  LocationAccess(GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,        {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,  {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,       {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT, {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,         {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,        {[]{return CanStunDeku;}}),
   }, {});
 
-  areaTable[GANONS_CASTLE_MQ_FOREST_TRIAL] = Area("Ganon's Castle MQ Forest Trial", "Ganons Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_MQ_FOREST_TRIAL] = Area("Ganon's Castle MQ Forest Trial", "Ganons Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&ForestTrialClear, {[]{return IsAdult && CanUse(LIGHT_ARROWS) && CanPlay(SongOfTime);}}),
+                  EventAccess(&ForestTrialClear, {[]{return IsAdult && CanUse(RG_LIGHT_ARROWS) && CanPlay(SongOfTime);}}),
   }, {
                   //Locations
-                  LocationAccess(GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST,        {[]{return (IsAdult && CanUse(BOW)) || (IsChild && CanUse(SLINGSHOT));}}),
-                  LocationAccess(GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST, {[]{return HasFireSource;}}),
-                  LocationAccess(GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY,        {[]{return HookshotOrBoomerang;}}),
+                  LocationAccess(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST,        {[]{return (IsAdult && CanUse(RG_FAIRY_BOW)) || (IsChild && CanUse(RG_FAIRY_SLINGSHOT));}}),
+                  LocationAccess(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST, {[]{return HasFireSource;}}),
+                  LocationAccess(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY,        {[]{return HookshotOrBoomerang;}}),
   }, {});
 
-  areaTable[GANONS_CASTLE_MQ_FIRE_TRIAL] = Area("Ganon's Castle MQ Fire Trial", "Ganons Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_MQ_FIRE_TRIAL] = Area("Ganon's Castle MQ Fire Trial", "Ganons Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&FireTrialClear, {[]{return CanUse(GORON_TUNIC) && CanUse(GOLDEN_GAUNTLETS) && CanUse(LIGHT_ARROWS) && (CanUse(LONGSHOT) || HoverBoots || (LogicFireTrialMQ && CanUse(HOOKSHOT)));}}),
-                    //Trick: CanUse(GORON_TUNIC) && CanUse(GOLDEN_GAUNTLETS) && CanUse(LIGHT_ARROWS) && (CanUse(LONGSHOT) || HoverBoots || (LogicFireTrialMQ && CanUse(HOOKSHOT)))
+                  EventAccess(&FireTrialClear, {[]{return CanUse(RG_GORON_TUNIC) && CanUse(RG_GOLDEN_GAUNTLETS) && CanUse(RG_LIGHT_ARROWS) && (CanUse(RG_LONGSHOT) || HoverBoots || (LogicFireTrialMQ && CanUse(RG_HOOKSHOT)));}}),
+                    //Trick: CanUse(RG_GORON_TUNIC) && CanUse(RG_GOLDEN_GAUNTLETS) && CanUse(RG_LIGHT_ARROWS) && (CanUse(RG_LONGSHOT) || HoverBoots || (LogicFireTrialMQ && CanUse(RG_HOOKSHOT)))
   }, {}, {});
 
-  areaTable[GANONS_CASTLE_MQ_WATER_TRIAL] = Area("Ganon's Castle MQ Water Trial", "Ganons Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_MQ_WATER_TRIAL] = Area("Ganon's Castle MQ Water Trial", "Ganons Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&WaterTrialClear, {[]{return BlueFire && IsAdult && CanUse(LIGHT_ARROWS) && SmallKeys(GANONS_CASTLE, 3);}}),
+                  EventAccess(&WaterTrialClear, {[]{return BlueFire && IsAdult && CanUse(RG_LIGHT_ARROWS) && SmallKeys(RR_GANONS_CASTLE, 3);}}),
                   EventAccess(&BlueFireAccess,  {[]{return BlueFireAccess || HasBottle;}}),
   }, {
                   //Locations
-                  LocationAccess(GANONS_CASTLE_MQ_WATER_TRIAL_CHEST, {[]{return BlueFire && (IsAdult || CanUse(STICKS) || KokiriSword || CanUseProjectile);}}),
+                  LocationAccess(RC_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST, {[]{return BlueFire && (IsAdult || CanUse(RG_STICKS) || KokiriSword || CanUseProjectile);}}),
   }, {});
 
-  areaTable[GANONS_CASTLE_MQ_SHADOW_TRIAL] = Area("Ganon's Castle MQ Shadow Trial", "Ganons Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_MQ_SHADOW_TRIAL] = Area("Ganon's Castle MQ Shadow Trial", "Ganons Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&ShadowTrialClear, {[]{return IsAdult && CanUse(LIGHT_ARROWS) && (LogicLensCastleMQ || CanUse(LENS_OF_TRUTH)) && (HoverBoots || (Hookshot && (HasFireSource || LogicShadowTrialMQ)));}}),
-                    //Trick: IsAdult && CanUse(LIGHT_ARROWS) && (LogicLensCastleMQ || CanUse(LENS_OF_TRUTH)) && (HoverBoots || (Hookshot && (HasFireSource || LogicShadowTrialMQ)))
+                  EventAccess(&ShadowTrialClear, {[]{return IsAdult && CanUse(RG_LIGHT_ARROWS) && (LogicLensCastleMQ || CanUse(RG_LENS_OF_TRUTH)) && (HoverBoots || (Hookshot && (HasFireSource || LogicShadowTrialMQ)));}}),
+                    //Trick: IsAdult && CanUse(RG_LIGHT_ARROWS) && (LogicLensCastleMQ || CanUse(RG_LENS_OF_TRUTH)) && (HoverBoots || (Hookshot && (HasFireSource || LogicShadowTrialMQ)))
   }, {
                   //Locations
-                  LocationAccess(GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST, {[]{return IsAdult && ((Bow && (CanUse(HOOKSHOT) || CanUse(HOVER_BOOTS))) || (CanUse(HOVER_BOOTS) && (LogicLensCastleMQ || CanUse(LENS_OF_TRUTH)) && (HasExplosives || GoronBracelet || CanUse(DINS_FIRE))));}}),
-                  LocationAccess(GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST,  {[]{return IsAdult && Bow && (LogicLensCastleMQ || CanUse(LENS_OF_TRUTH)) && (HoverBoots || (Hookshot && (HasFireSource || LogicShadowTrialMQ)));}}),
-                    //Trick: IsAdult && Bow && (LogicLensCastleMQ || CanUse(LENS_OF_TRUTH)) && (HoverBoots || (Hookshot && (HasFireSource || LogicShadowTrialMQ)))
+                  LocationAccess(RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST, {[]{return IsAdult && ((Bow && (CanUse(RG_HOOKSHOT) || CanUse(RG_HOVER_BOOTS))) || (CanUse(RG_HOVER_BOOTS) && (LogicLensCastleMQ || CanUse(RG_LENS_OF_TRUTH)) && (HasExplosives || GoronBracelet || CanUse(RG_DINS_FIRE))));}}),
+                  LocationAccess(RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST,  {[]{return IsAdult && Bow && (LogicLensCastleMQ || CanUse(RG_LENS_OF_TRUTH)) && (HoverBoots || (Hookshot && (HasFireSource || LogicShadowTrialMQ)));}}),
+                    //Trick: IsAdult && Bow && (LogicLensCastleMQ || CanUse(RG_LENS_OF_TRUTH)) && (HoverBoots || (Hookshot && (HasFireSource || LogicShadowTrialMQ)))
   }, {});
 
-  areaTable[GANONS_CASTLE_MQ_SPIRIT_TRIAL] = Area("Ganon's Castle MQ Spirit Castle", "Ganons Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_MQ_SPIRIT_TRIAL] = Area("Ganon's Castle MQ Spirit Castle", "Ganons Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&SpiritTrialClear, {[]{return IsAdult && CanUse(LIGHT_ARROWS) && Hammer && HasBombchus && ((FireArrows && MirrorShield) || SunlightArrows);}}),
-                  EventAccess(&NutPot,           {[]{return NutPot || (Hammer && HasBombchus && IsAdult && ((CanUse(FIRE_ARROWS) && MirrorShield) || (SunlightArrows && CanUse(LIGHT_ARROWS))));}}),
+                  EventAccess(&SpiritTrialClear, {[]{return IsAdult && CanUse(RG_LIGHT_ARROWS) && Hammer && HasBombchus && ((FireArrows && MirrorShield) || SunlightArrows);}}),
+                  EventAccess(&NutPot,           {[]{return NutPot || (Hammer && HasBombchus && IsAdult && ((CanUse(RG_FIRE_ARROWS) && MirrorShield) || (SunlightArrows && CanUse(RG_LIGHT_ARROWS))));}}),
   }, {
                   //Locations
-                  LocationAccess(GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST,             {[]{return IsAdult && (Bow || LogicRustedSwitches) && Hammer;}}),
-                  LocationAccess(GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST,         {[]{return IsAdult && (Bow || LogicRustedSwitches) && Hammer && HasBombchus && (LogicLensCastleMQ || CanUse(LENS_OF_TRUTH));}}),
-                  LocationAccess(GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST,    {[]{return IsAdult && Hammer && HasBombchus && ((CanUse(FIRE_ARROWS) && CanUse(MIRROR_SHIELD)) || (SunlightArrows && CanUse(LIGHT_ARROWS)));}}),
-                  LocationAccess(GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST,     {[]{return IsAdult && Hammer && HasBombchus && ((CanUse(FIRE_ARROWS) && CanUse(MIRROR_SHIELD)) || (SunlightArrows && CanUse(LIGHT_ARROWS)));}}),
-                  LocationAccess(GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST,  {[]{return IsAdult && Hammer && HasBombchus && ((CanUse(FIRE_ARROWS) && CanUse(MIRROR_SHIELD)) || (SunlightArrows && CanUse(LIGHT_ARROWS)));}}),
-                  LocationAccess(GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST,    {[]{return IsAdult && Hammer && HasBombchus && ((CanUse(FIRE_ARROWS) && CanUse(MIRROR_SHIELD)) || (SunlightArrows && CanUse(LIGHT_ARROWS)));}}),
+                  LocationAccess(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST,             {[]{return IsAdult && (Bow || LogicRustedSwitches) && Hammer;}}),
+                  LocationAccess(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST,         {[]{return IsAdult && (Bow || LogicRustedSwitches) && Hammer && HasBombchus && (LogicLensCastleMQ || CanUse(RG_LENS_OF_TRUTH));}}),
+                  LocationAccess(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST,    {[]{return IsAdult && Hammer && HasBombchus && ((CanUse(RG_FIRE_ARROWS) && CanUse(RG_MIRROR_SHIELD)) || (SunlightArrows && CanUse(RG_LIGHT_ARROWS)));}}),
+                  LocationAccess(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST,     {[]{return IsAdult && Hammer && HasBombchus && ((CanUse(RG_FIRE_ARROWS) && CanUse(RG_MIRROR_SHIELD)) || (SunlightArrows && CanUse(RG_LIGHT_ARROWS)));}}),
+                  LocationAccess(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST,  {[]{return IsAdult && Hammer && HasBombchus && ((CanUse(RG_FIRE_ARROWS) && CanUse(RG_MIRROR_SHIELD)) || (SunlightArrows && CanUse(RG_LIGHT_ARROWS)));}}),
+                  LocationAccess(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST,    {[]{return IsAdult && Hammer && HasBombchus && ((CanUse(RG_FIRE_ARROWS) && CanUse(RG_MIRROR_SHIELD)) || (SunlightArrows && CanUse(RG_LIGHT_ARROWS)));}}),
   }, {});
 
-  areaTable[GANONS_CASTLE_MQ_LIGHT_TRIAL] = Area("Ganon's Castle MQ Light Trial", "Ganons Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_MQ_LIGHT_TRIAL] = Area("Ganon's Castle MQ Light Trial", "Ganons Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&LightTrialClear, {[]{return IsAdult && CanUse(LIGHT_ARROWS) && SmallKeys(GANONS_CASTLE, 3) && (LogicLensCastleMQ || CanUse(LENS_OF_TRUTH)) && (Hookshot || LogicLightTrialMQ);}}),
-                    //Trick: IsAdult && CanUse(LIGHT_ARROWS) && SmallKeys(GANONS_CASTLE, 3) && (LogicLensCastleMQ || CanUse(LENS_OF_TRUTH)) && (Hookshot || LogicLightTrialMQ)
+                  EventAccess(&LightTrialClear, {[]{return IsAdult && CanUse(RG_LIGHT_ARROWS) && SmallKeys(RR_GANONS_CASTLE, 3) && (LogicLensCastleMQ || CanUse(RG_LENS_OF_TRUTH)) && (Hookshot || LogicLightTrialMQ);}}),
+                    //Trick: IsAdult && CanUse(RG_LIGHT_ARROWS) && SmallKeys(RR_GANONS_CASTLE, 3) && (LogicLensCastleMQ || CanUse(RG_LENS_OF_TRUTH)) && (Hookshot || LogicLightTrialMQ)
   }, {
                   //Locations
-                  LocationAccess(GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST, {[]{return CanPlay(ZeldasLullaby);}}),
+                  LocationAccess(RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST, {[]{return CanPlay(ZeldasLullaby);}}),
   }, {});
   }
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp
index 77cf0a4e2..8dc601b5c 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp
@@ -10,104 +10,104 @@ void AreaTable_Init_GerudoTrainingGrounds() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[GERUDO_TRAINING_GROUNDS_ENTRYWAY] = Area("Gerudo Training Grounds Entryway", "Gerudo Training Grounds", GERUDO_TRAINING_GROUNDS, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_ENTRYWAY] = Area("Gerudo Training Grounds Entryway", "Gerudo Training Grounds", RHT_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(GERUDO_TRAINING_GROUNDS_LOBBY,    {[]{return Dungeon::GerudoTrainingGrounds.IsVanilla();}}),
-                  Entrance(GERUDO_TRAINING_GROUNDS_MQ_LOBBY, {[]{return Dungeon::GerudoTrainingGrounds.IsMQ();}}),
-                  Entrance(GERUDO_FORTRESS,                  {[]{return true;}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_LOBBY,    {[]{return Dungeon::GerudoTrainingGrounds.IsVanilla();}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_LOBBY, {[]{return Dungeon::GerudoTrainingGrounds.IsMQ();}}),
+                  Entrance(RR_GERUDO_FORTRESS,                  {[]{return true;}}),
   });
 
   /*--------------------------
   |     VANILLA DUNGEON      |
   ---------------------------*/
   if (Dungeon::GerudoTrainingGrounds.IsVanilla()) {
-  areaTable[GERUDO_TRAINING_GROUNDS_LOBBY] = Area("Gerudo Training Grounds Lobby", "Gerudo Training Grounds", GERUDO_TRAINING_GROUNDS, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_LOBBY] = Area("Gerudo Training Grounds Lobby", "Gerudo Training Grounds", RHT_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(GERUDO_TRAINING_GROUNDS_LOBBY_LEFT_CHEST,  {[]{return CanUse(BOW) || CanUse(SLINGSHOT);}}),
-                  LocationAccess(GERUDO_TRAINING_GROUNDS_LOBBY_RIGHT_CHEST, {[]{return CanUse(BOW) || CanUse(SLINGSHOT);}}),
-                  LocationAccess(GERUDO_TRAINING_GROUNDS_STALFOS_CHEST,     {[]{return IsAdult || KokiriSword;}}),
-                  LocationAccess(GERUDO_TRAINING_GROUNDS_BEAMOS_CHEST,      {[]{return HasExplosives && (IsAdult || KokiriSword);}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST,  {[]{return CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT);}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST, {[]{return CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT);}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_STALFOS_CHEST,     {[]{return IsAdult || KokiriSword;}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_BEAMOS_CHEST,      {[]{return HasExplosives && (IsAdult || KokiriSword);}}),
                 }, {
                   //Exits
-                  Entrance(GERUDO_TRAINING_GROUNDS_ENTRYWAY,         {[]{return true;}}),
-                  Entrance(GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_ROOM, {[]{return (IsAdult || KokiriSword) && (CanUse(HOOKSHOT) || LogicGtgWithoutHookshot);}}),
-                  Entrance(GERUDO_TRAINING_GROUNDS_LAVA_ROOM,        {[]{return Here(GERUDO_TRAINING_GROUNDS_LOBBY, []{return (IsAdult || KokiriSword) && HasExplosives;});}}),
-                  Entrance(GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE,     {[]{return true;}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_ENTRYWAY,         {[]{return true;}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_ROOM, {[]{return (IsAdult || KokiriSword) && (CanUse(RG_HOOKSHOT) || LogicGtgWithoutHookshot);}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_LAVA_ROOM,        {[]{return Here(RR_GERUDO_TRAINING_GROUNDS_LOBBY, []{return (IsAdult || KokiriSword) && HasExplosives;});}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE,     {[]{return true;}}),
   });
 
-  areaTable[GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE] = Area("Gerudo Training Grounds Central Maze", "Gerudo Training Grounds", GERUDO_TRAINING_GROUNDS, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE] = Area("Gerudo Training Grounds Central Maze", "Gerudo Training Grounds", RHT_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(GERUDO_TRAINING_GROUNDS_HIDDEN_CEILING_CHEST,   {[]{return SmallKeys(GERUDO_TRAINING_GROUNDS, 3) && (LogicLensGtg || CanUse(LENS_OF_TRUTH));}}),
-                  LocationAccess(GERUDO_TRAINING_GROUNDS_MAZE_PATH_FIRST_CHEST,  {[]{return SmallKeys(GERUDO_TRAINING_GROUNDS, 4);}}),
-                  LocationAccess(GERUDO_TRAINING_GROUNDS_MAZE_PATH_SECOND_CHEST, {[]{return SmallKeys(GERUDO_TRAINING_GROUNDS, 6);}}),
-                  LocationAccess(GERUDO_TRAINING_GROUNDS_MAZE_PATH_THIRD_CHEST,  {[]{return SmallKeys(GERUDO_TRAINING_GROUNDS, 7);}}),
-                  LocationAccess(GERUDO_TRAINING_GROUNDS_MAZE_PATH_FINAL_CHEST,  {[]{return SmallKeys(GERUDO_TRAINING_GROUNDS, 9);}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST,   {[]{return SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 3) && (LogicLensGtg || CanUse(RG_LENS_OF_TRUTH));}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST,  {[]{return SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 4);}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_SECOND_CHEST, {[]{return SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 6);}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_THIRD_CHEST,  {[]{return SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 7);}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FINAL_CHEST,  {[]{return SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 9);}}),
                 }, {
                   //Exits
-                  Entrance(GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE_RIGHT, {[]{return SmallKeys(GERUDO_TRAINING_GROUNDS, 9);}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE_RIGHT, {[]{return SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 9);}}),
   });
 
-  areaTable[GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE_RIGHT] = Area("Gerudo Training Grounds Central Maze Right", "Gerudo Training Grounds", GERUDO_TRAINING_GROUNDS, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE_RIGHT] = Area("Gerudo Training Grounds Central Maze Right", "Gerudo Training Grounds", RHT_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(GERUDO_TRAINING_GROUNDS_MAZE_RIGHT_CENTRAL_CHEST, {[]{return true;}}),
-                  LocationAccess(GERUDO_TRAINING_GROUNDS_MAZE_RIGHT_SIDE_CHEST,    {[]{return true;}}),
-                  LocationAccess(GERUDO_TRAINING_GROUNDS_FREESTANDING_KEY,         {[]{return true;}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_CENTRAL_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_SIDE_CHEST,    {[]{return true;}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_FREESTANDING_KEY,         {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(GERUDO_TRAINING_GROUNDS_HAMMER_ROOM, {[]{return CanUse(HOOKSHOT);}}),
-                  Entrance(GERUDO_TRAINING_GROUNDS_LAVA_ROOM,   {[]{return true;}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_HAMMER_ROOM, {[]{return CanUse(RG_HOOKSHOT);}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_LAVA_ROOM,   {[]{return true;}}),
   });
 
-  areaTable[GERUDO_TRAINING_GROUNDS_LAVA_ROOM] = Area("Gerudo Training Grounds Lava Room", "Gerudo Training Grounds", GERUDO_TRAINING_GROUNDS, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_LAVA_ROOM] = Area("Gerudo Training Grounds Lava Room", "Gerudo Training Grounds", RHT_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(GERUDO_TRAINING_GROUNDS_UNDERWATER_SILVER_RUPEE_CHEST, {[]{return CanUse(HOOKSHOT) && CanPlay(SongOfTime) && IronBoots && WaterTimer >= 24;}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST, {[]{return CanUse(RG_HOOKSHOT) && CanPlay(SongOfTime) && IronBoots && WaterTimer >= 24;}}),
                 }, {
                   //Exits
-                  Entrance(GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE_RIGHT, {[]{return CanPlay(SongOfTime) || IsChild;}}),
-                  Entrance(GERUDO_TRAINING_GROUNDS_HAMMER_ROOM,        {[]{return CanUse(LONGSHOT)  || (CanUse(HOVER_BOOTS) && CanUse(HOOKSHOT));}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE_RIGHT, {[]{return CanPlay(SongOfTime) || IsChild;}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_HAMMER_ROOM,        {[]{return CanUse(RG_LONGSHOT)  || (CanUse(RG_HOVER_BOOTS) && CanUse(RG_HOOKSHOT));}}),
   });
 
-  areaTable[GERUDO_TRAINING_GROUNDS_HAMMER_ROOM] = Area("Gerudo Training Grounds Hammer Room", "Gerudo Training Grounds", GERUDO_TRAINING_GROUNDS, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_HAMMER_ROOM] = Area("Gerudo Training Grounds Hammer Room", "Gerudo Training Grounds", RHT_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(GERUDO_TRAINING_GROUNDS_HAMMER_ROOM_CLEAR_CHEST,  {[]{return true;}}),
-                  LocationAccess(GERUDO_TRAINING_GROUNDS_HAMMER_ROOM_SWITCH_CHEST, {[]{return CanUse(MEGATON_HAMMER) || (CanTakeDamage && LogicFlamingChests);}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST,  {[]{return true;}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST, {[]{return CanUse(RG_MEGATON_HAMMER) || (CanTakeDamage && LogicFlamingChests);}}),
                 }, {
                   //Exits
-                  Entrance(GERUDO_TRAINING_GROUNDS_EYE_STATUE_LOWER, {[]{return CanUse(MEGATON_HAMMER) && Bow;}}),
-                  Entrance(GERUDO_TRAINING_GROUNDS_LAVA_ROOM,        {[]{return true;}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_EYE_STATUE_LOWER, {[]{return CanUse(RG_MEGATON_HAMMER) && Bow;}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_LAVA_ROOM,        {[]{return true;}}),
   });
 
-  areaTable[GERUDO_TRAINING_GROUNDS_EYE_STATUE_LOWER] = Area("Gerudo Training Grounds Eye Statue Lower", "Gerudo Training Grounds", GERUDO_TRAINING_GROUNDS, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_EYE_STATUE_LOWER] = Area("Gerudo Training Grounds Eye Statue Lower", "Gerudo Training Grounds", RHT_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(GERUDO_TRAINING_GROUNDS_EYE_STATUE_CHEST, {[]{return CanUse(BOW);}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_EYE_STATUE_CHEST, {[]{return CanUse(RG_FAIRY_BOW);}}),
                 }, {
                   //Exits
-                  Entrance(GERUDO_TRAINING_GROUNDS_HAMMER_ROOM, {[]{return true;}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_HAMMER_ROOM, {[]{return true;}}),
   });
 
-  areaTable[GERUDO_TRAINING_GROUNDS_EYE_STATUE_UPPER] = Area("Gerudo Training Grounds Eye Statue Upper", "Gerudo Training Grounds", GERUDO_TRAINING_GROUNDS, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_EYE_STATUE_UPPER] = Area("Gerudo Training Grounds Eye Statue Upper", "Gerudo Training Grounds", RHT_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(GERUDO_TRAINING_GROUNDS_NEAR_SCARECROW_CHEST, {[]{return CanUse(BOW);}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_NEAR_SCARECROW_CHEST, {[]{return CanUse(RG_FAIRY_BOW);}}),
                 }, {
                   //Exits
-                  Entrance(GERUDO_TRAINING_GROUNDS_EYE_STATUE_LOWER, {[]{return true;}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_EYE_STATUE_LOWER, {[]{return true;}}),
   });
 
-  areaTable[GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_ROOM] = Area("Gerudo Training Grounds Heavy Block Room", "Gerudo Training Grounds", GERUDO_TRAINING_GROUNDS, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_ROOM] = Area("Gerudo Training Grounds Heavy Block Room", "Gerudo Training Grounds", RHT_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(GERUDO_TRAINING_GROUNDS_BEFORE_HEAVY_BLOCK_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(GERUDO_TRAINING_GROUNDS_EYE_STATUE_UPPER, {[]{return (LogicLensGtg || CanUse(LENS_OF_TRUTH)) && (CanUse(HOOKSHOT) || (LogicGtgFakeWall && CanUse(HOVER_BOOTS)));}}),
-                  Entrance(GERUDO_TRAINING_GROUNDS_LIKE_LIKE_ROOM,   {[]{return (LogicLensGtg || CanUse(LENS_OF_TRUTH)) && (CanUse(HOOKSHOT) || (LogicGtgFakeWall && CanUse(HOVER_BOOTS))) && CanUse(SILVER_GAUNTLETS);}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_EYE_STATUE_UPPER, {[]{return (LogicLensGtg || CanUse(RG_LENS_OF_TRUTH)) && (CanUse(RG_HOOKSHOT) || (LogicGtgFakeWall && CanUse(RG_HOVER_BOOTS)));}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_LIKE_LIKE_ROOM,   {[]{return (LogicLensGtg || CanUse(RG_LENS_OF_TRUTH)) && (CanUse(RG_HOOKSHOT) || (LogicGtgFakeWall && CanUse(RG_HOVER_BOOTS))) && CanUse(RG_SILVER_GAUNTLETS);}}),
   });
 
-  areaTable[GERUDO_TRAINING_GROUNDS_LIKE_LIKE_ROOM] = Area("Gerudo Training Grounds Like Like Room", "Gerudo Training Grounds", GERUDO_TRAINING_GROUNDS, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_LIKE_LIKE_ROOM] = Area("Gerudo Training Grounds Like Like Room", "Gerudo Training Grounds", RHT_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_FIRST_CHEST,  {[]{return true;}}),
-                  LocationAccess(GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_SECOND_CHEST, {[]{return true;}}),
-                  LocationAccess(GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_THIRD_CHEST,  {[]{return true;}}),
-                  LocationAccess(GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_FOURTH_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST,  {[]{return true;}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_THIRD_CHEST,  {[]{return true;}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FOURTH_CHEST, {[]{return true;}}),
   }, {});
   }
 
@@ -115,79 +115,79 @@ void AreaTable_Init_GerudoTrainingGrounds() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (Dungeon::GerudoTrainingGrounds.IsMQ()) {
-  areaTable[GERUDO_TRAINING_GROUNDS_MQ_LOBBY] = Area("Gerudo Training Grounds MQ Lobby", "Gerudo Training Grounds", GERUDO_TRAINING_GROUNDS, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_LOBBY] = Area("Gerudo Training Grounds MQ Lobby", "Gerudo Training Grounds", RHT_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(GERUDO_TRAINING_GROUNDS_MQ_LOBBY_LEFT_CHEST,       {[]{return true;}}),
-                  LocationAccess(GERUDO_TRAINING_GROUNDS_MQ_LOBBY_RIGHT_CHEST,      {[]{return true;}}),
-                  LocationAccess(GERUDO_TRAINING_GROUNDS_MQ_HIDDEN_CEILING_CHEST,   {[]{return LogicLensGtgMQ || CanUse(LENS_OF_TRUTH);}}),
-                  LocationAccess(GERUDO_TRAINING_GROUNDS_MQ_MAZE_PATH_FIRST_CHEST,  {[]{return true;}}),
-                  LocationAccess(GERUDO_TRAINING_GROUNDS_MQ_MAZE_PATH_SECOND_CHEST, {[]{return true;}}),
-                  LocationAccess(GERUDO_TRAINING_GROUNDS_MQ_MAZE_PATH_THIRD_CHEST,  {[]{return SmallKeys(GERUDO_TRAINING_GROUNDS, 1);}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST,       {[]{return true;}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST,      {[]{return true;}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_HIDDEN_CEILING_CHEST,   {[]{return LogicLensGtgMQ || CanUse(RG_LENS_OF_TRUTH);}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_FIRST_CHEST,  {[]{return true;}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_SECOND_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_THIRD_CHEST,  {[]{return SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 1);}}),
   }, {
                   //Exits
-                  Entrance(GERUDO_TRAINING_GROUNDS_ENTRYWAY,      {[]{return true;}}),
-                  Entrance(GERUDO_TRAINING_GROUNDS_MQ_LEFT_SIDE,  {[]{return Here(GERUDO_TRAINING_GROUNDS_MQ_LOBBY, []{return HasFireSource;});}}),
-                  Entrance(GERUDO_TRAINING_GROUNDS_MQ_RIGHT_SIDE, {[]{return Here(GERUDO_TRAINING_GROUNDS_MQ_LOBBY, []{return (IsAdult && CanUse(BOW)) || (IsChild && CanUse(SLINGSHOT));});}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_ENTRYWAY,      {[]{return true;}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_LEFT_SIDE,  {[]{return Here(RR_GERUDO_TRAINING_GROUNDS_MQ_LOBBY, []{return HasFireSource;});}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_RIGHT_SIDE, {[]{return Here(RR_GERUDO_TRAINING_GROUNDS_MQ_LOBBY, []{return (IsAdult && CanUse(RG_FAIRY_BOW)) || (IsChild && CanUse(RG_FAIRY_SLINGSHOT));});}}),
   });
 
-  areaTable[GERUDO_TRAINING_GROUNDS_MQ_RIGHT_SIDE] = Area("Gerudo Training Grounds MQ Right Side", "Gerudo Training Grounds", GERUDO_TRAINING_GROUNDS, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_RIGHT_SIDE] = Area("Gerudo Training Grounds MQ Right Side", "Gerudo Training Grounds", RHT_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  //EventAccess(&WallFairy, {[]{return WallFairy || (IsAdult && CanUse(BOW));}}),
+                  //EventAccess(&WallFairy, {[]{return WallFairy || (IsAdult && CanUse(RG_FAIRY_BOW));}}),
   }, {
                   //Locations
-                  LocationAccess(GERUDO_TRAINING_GROUNDS_MQ_DINOLFOS_CHEST, {[]{return IsAdult;}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_DINOLFOS_CHEST, {[]{return IsAdult;}}),
   }, {
                   //Exits
-                  Entrance(GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER, {[]{return (Bow || CanUse(LONGSHOT)) && CanUse(HOVER_BOOTS) && IsAdult;}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER, {[]{return (Bow || CanUse(RG_LONGSHOT)) && CanUse(RG_HOVER_BOOTS) && IsAdult;}}),
   });
 
-  areaTable[GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER] = Area("Gerudo Training Grounds MQ Underwater", "Gerudo Training Grounds", GERUDO_TRAINING_GROUNDS, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER] = Area("Gerudo Training Grounds MQ Underwater", "Gerudo Training Grounds", RHT_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER_SILVER_RUPEE_CHEST, {[]{return HasFireSource && IsAdult && CanUse(IRON_BOOTS) && WaterTimer >= 24 && CanTakeDamage;}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST, {[]{return HasFireSource && IsAdult && CanUse(RG_IRON_BOOTS) && WaterTimer >= 24 && CanTakeDamage;}}),
   }, {});
 
-  areaTable[GERUDO_TRAINING_GROUNDS_MQ_LEFT_SIDE] = Area("Gerudo Training Grounds MQ Left Side", "Gerudo Training Grounds", GERUDO_TRAINING_GROUNDS, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_LEFT_SIDE] = Area("Gerudo Training Grounds MQ Left Side", "Gerudo Training Grounds", RHT_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(GERUDO_TRAINING_GROUNDS_MQ_FIRST_IRON_KNUCKLE_CHEST, {[]{return IsAdult || KokiriSword || HasExplosives;}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST, {[]{return IsAdult || KokiriSword || HasExplosives;}}),
   }, {
                   //Exits
-                  Entrance(GERUDO_TRAINING_GROUNDS_MQ_STALFOS_ROOM, {[]{return (IsAdult && CanUse(LONGSHOT)) || LogicGtgMQWithoutHookshot || (LogicGtgMQWithHookshot && IsAdult && CanUse(HOOKSHOT));}}),
-                    //Trick: (IsAdult && CanUse(LONGSHOT)) || LogicGtgMQWithoutHookshot || (LogicGtgMQWithHookshot && IsAdult && CanUse(HOOKSHOT))
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_STALFOS_ROOM, {[]{return (IsAdult && CanUse(RG_LONGSHOT)) || LogicGtgMQWithoutHookshot || (LogicGtgMQWithHookshot && IsAdult && CanUse(RG_HOOKSHOT));}}),
+                    //Trick: (IsAdult && CanUse(RG_LONGSHOT)) || LogicGtgMQWithoutHookshot || (LogicGtgMQWithHookshot && IsAdult && CanUse(RG_HOOKSHOT))
   });
 
-  areaTable[GERUDO_TRAINING_GROUNDS_MQ_STALFOS_ROOM] = Area("Gerudo Training Grounds MQ Stalfos Room", "Gerudo Training Grounds", GERUDO_TRAINING_GROUNDS, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_STALFOS_ROOM] = Area("Gerudo Training Grounds MQ Stalfos Room", "Gerudo Training Grounds", RHT_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&BlueFireAccess,  {[]{return BlueFireAccess || HasBottle;}}),
   }, {
                   //Locations
-                  LocationAccess(GERUDO_TRAINING_GROUNDS_MQ_BEFORE_HEAVY_BLOCK_CHEST, {[]{return IsAdult;}}),
-                  LocationAccess(GERUDO_TRAINING_GROUNDS_MQ_HEAVY_BLOCK_CHEST,        {[]{return CanUse(SILVER_GAUNTLETS);}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_BEFORE_HEAVY_BLOCK_CHEST, {[]{return IsAdult;}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_HEAVY_BLOCK_CHEST,        {[]{return CanUse(RG_SILVER_GAUNTLETS);}}),
   }, {
                   //Exits
-                  Entrance(GERUDO_TRAINING_GROUNDS_MQ_BACK_AREAS, {[]{return IsAdult && (LogicLensGtgMQ || CanUse(LENS_OF_TRUTH)) && BlueFire && (CanPlay(SongOfTime) || (LogicGtgFakeWall && IsAdult && CanUse(HOVER_BOOTS)));}}),
-                    //Trick: IsAdult && (LogicLensGtgMQ || CanUse(LENS_OF_TRUTH)) && BlueFire && (CanPlay(SongOfTime) || (LogicGtgFakeWall && IsAdult && CanUse(HOVER_BOOTS)))
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_BACK_AREAS, {[]{return IsAdult && (LogicLensGtgMQ || CanUse(RG_LENS_OF_TRUTH)) && BlueFire && (CanPlay(SongOfTime) || (LogicGtgFakeWall && IsAdult && CanUse(RG_HOVER_BOOTS)));}}),
+                    //Trick: IsAdult && (LogicLensGtgMQ || CanUse(RG_LENS_OF_TRUTH)) && BlueFire && (CanPlay(SongOfTime) || (LogicGtgFakeWall && IsAdult && CanUse(RG_HOVER_BOOTS)))
   });
 
-  areaTable[GERUDO_TRAINING_GROUNDS_MQ_BACK_AREAS] = Area("Gerudo Training Grounds MQ Back Areas", "Gerudo Training Grounds", GERUDO_TRAINING_GROUNDS, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_BACK_AREAS] = Area("Gerudo Training Grounds MQ Back Areas", "Gerudo Training Grounds", RHT_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(GERUDO_TRAINING_GROUNDS_MQ_EYE_STATUE_CHEST,          {[]{return Bow;}}),
-                  LocationAccess(GERUDO_TRAINING_GROUNDS_MQ_SECOND_IRON_KNUCKLE_CHEST, {[]{return true;}}),
-                  LocationAccess(GERUDO_TRAINING_GROUNDS_MQ_FLAME_CIRCLE_CHEST,        {[]{return CanUse(HOOKSHOT) || Bow || HasExplosives;}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_EYE_STATUE_CHEST,          {[]{return Bow;}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_SECOND_IRON_KNUCKLE_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_FLAME_CIRCLE_CHEST,        {[]{return CanUse(RG_HOOKSHOT) || Bow || HasExplosives;}}),
   }, {
                   //Exits
-                  Entrance(GERUDO_TRAINING_GROUNDS_MQ_CENTRAL_MAZE_RIGHT, {[]{return Hammer;}}),
-                  Entrance(GERUDO_TRAINING_GROUNDS_MQ_RIGHT_SIDE,         {[]{return CanUse(LONGSHOT);}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_CENTRAL_MAZE_RIGHT, {[]{return Hammer;}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_RIGHT_SIDE,         {[]{return CanUse(RG_LONGSHOT);}}),
   });
 
-  areaTable[GERUDO_TRAINING_GROUNDS_MQ_CENTRAL_MAZE_RIGHT] = Area("Gerudo Training Grounds MQ Central Maze Right", "Gerudo Training Grounds", GERUDO_TRAINING_GROUNDS, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_CENTRAL_MAZE_RIGHT] = Area("Gerudo Training Grounds MQ Central Maze Right", "Gerudo Training Grounds", RHT_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(GERUDO_TRAINING_GROUNDS_MQ_MAZE_RIGHT_CENTRAL_CHEST, {[]{return true;}}),
-                  LocationAccess(GERUDO_TRAINING_GROUNDS_MQ_MAZE_RIGHT_SIDE_CHEST,    {[]{return true;}}),
-                  LocationAccess(GERUDO_TRAINING_GROUNDS_MQ_ICE_ARROWS_CHEST,         {[]{return SmallKeys(GERUDO_TRAINING_GROUNDS, 3);}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_CENTRAL_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_SIDE_CHEST,    {[]{return true;}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_ICE_ARROWS_CHEST,         {[]{return SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 3);}}),
   }, {
                   //Exits
-                  Entrance(GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER,  {[]{return IsAdult && (CanUse(LONGSHOT) || (CanUse(HOOKSHOT) && Bow));}}),
-                  Entrance(GERUDO_TRAINING_GROUNDS_MQ_RIGHT_SIDE,  {[]{return IsAdult && CanUse(HOOKSHOT);}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER,  {[]{return IsAdult && (CanUse(RG_LONGSHOT) || (CanUse(RG_HOOKSHOT) && Bow));}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_RIGHT_SIDE,  {[]{return IsAdult && CanUse(RG_HOOKSHOT);}}),
   });
   }
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
index 70fd1f22b..7dbf7ad15 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
@@ -6,204 +6,204 @@ using namespace Logic;
 using namespace Settings;
 
 void AreaTable_Init_GerudoValley() {
-  areaTable[GERUDO_VALLEY] = Area("Gerudo Valley", "Gerudo Valley", GERUDO_VALLEY, DAY_NIGHT_CYCLE, {
+  areaTable[RR_GERUDO_VALLEY] = Area("Gerudo Valley", "Gerudo Valley", RHT_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&BugRock, {[]{return BugRock || IsChild;}}),
                 }, {
                   //Locations
-                  LocationAccess(GV_GS_SMALL_BRIDGE, {[]{return IsChild && HookshotOrBoomerang && AtNight && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_GV_GS_SMALL_BRIDGE, {[]{return IsChild && HookshotOrBoomerang && AtNight && CanGetNightTimeGS;}}),
                 }, {
                   //Exits
-                  Entrance(HYRULE_FIELD,      {[]{return true;}}),
-                  Entrance(GV_UPPER_STREAM,   {[]{return true;}}),
-                  Entrance(GV_CRATE_LEDGE,    {[]{return IsChild || CanUse(LONGSHOT);}}),
-                  Entrance(GV_GROTTO_LEDGE,   {[]{return true;}}),
-                  Entrance(GV_FORTRESS_SIDE,  {[]{return (IsAdult && (CanRideEpona || CanUse(LONGSHOT) || GerudoFortress.Is(GERUDOFORTRESS_OPEN) || CarpenterRescue)) || (IsChild && CanUse(HOOKSHOT));}}),
+                  Entrance(RR_HYRULE_FIELD,      {[]{return true;}}),
+                  Entrance(RR_GV_UPPER_STREAM,   {[]{return true;}}),
+                  Entrance(RR_GV_CRATE_LEDGE,    {[]{return IsChild || CanUse(RG_LONGSHOT);}}),
+                  Entrance(RR_GV_GROTTO_LEDGE,   {[]{return true;}}),
+                  Entrance(RR_GV_FORTRESS_SIDE,  {[]{return (IsAdult && (CanRideEpona || CanUse(RG_LONGSHOT) || GerudoFortress.Is(GERUDOFORTRESS_OPEN) || CarpenterRescue)) || (IsChild && CanUse(RG_HOOKSHOT));}}),
   });
 
-  areaTable[GV_UPPER_STREAM] = Area("GV Upper Stream", "Gerudo Valley", GERUDO_VALLEY, DAY_NIGHT_CYCLE, {
+  areaTable[RR_GV_UPPER_STREAM] = Area("GV Upper Stream", "Gerudo Valley", RHT_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&GossipStoneFairy, {[]{return GossipStoneFairy || CanSummonGossipFairy;}}),
-                  EventAccess(&BeanPlantFairy,   {[]{return BeanPlantFairy   || (CanPlantBean(GV_UPPER_STREAM) && CanPlay(SongOfStorms));}}),
+                  EventAccess(&BeanPlantFairy,   {[]{return BeanPlantFairy   || (CanPlantBean(RR_GV_UPPER_STREAM) && CanPlay(SongOfStorms));}}),
                 }, {
                   //Locations
-                  LocationAccess(GV_WATERFALL_FREESTANDING_POH, {[]{return true;}}),
-                  LocationAccess(GV_GS_BEAN_PATCH,              {[]{return CanPlantBugs && CanChildAttack;}}),
-                  LocationAccess(GV_COW,                        {[]{return IsChild && CanPlay(EponasSong);}}),
-                  LocationAccess(GV_GOSSIP_STONE,               {[]{return true;}}),
+                  LocationAccess(RC_GV_WATERFALL_FREESTANDING_POH, {[]{return true;}}),
+                  LocationAccess(RC_GV_GS_BEAN_PATCH,              {[]{return CanPlantBugs && CanChildAttack;}}),
+                  LocationAccess(RC_GV_COW,                        {[]{return IsChild && CanPlay(EponasSong);}}),
+                  LocationAccess(RC_GV_GOSSIP_STONE,               {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(GV_LOWER_STREAM, {[]{return true;}}),
+                  Entrance(RR_GV_LOWER_STREAM, {[]{return true;}}),
   });
 
-  areaTable[GV_LOWER_STREAM] = Area("GV Lower Stream", "Gerudo Valley", GERUDO_VALLEY, DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_GV_LOWER_STREAM] = Area("GV Lower Stream", "Gerudo Valley", RHT_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(LAKE_HYLIA, {[]{return true;}}),
+                  Entrance(RR_LAKE_HYLIA, {[]{return true;}}),
   });
 
-  areaTable[GV_GROTTO_LEDGE] = Area("GV Grotto Ledge", "Gerudo Valley", GERUDO_VALLEY, DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_GV_GROTTO_LEDGE] = Area("GV Grotto Ledge", "Gerudo Valley", RHT_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(GV_LOWER_STREAM,   {[]{return true;}}),
-                  Entrance(GV_OCTOROK_GROTTO, {[]{return CanUse(SILVER_GAUNTLETS);}}),
-                  Entrance(GV_CRATE_LEDGE,    {[]{return CanUse(LONGSHOT);}}),
+                  Entrance(RR_GV_LOWER_STREAM,   {[]{return true;}}),
+                  Entrance(RR_GV_OCTOROK_GROTTO, {[]{return CanUse(RG_SILVER_GAUNTLETS);}}),
+                  Entrance(RR_GV_CRATE_LEDGE,    {[]{return CanUse(RG_LONGSHOT);}}),
   });
 
-  areaTable[GV_CRATE_LEDGE] = Area("GV Crate Ledge", "Gerudo Valley", GERUDO_VALLEY, DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GV_CRATE_LEDGE] = Area("GV Crate Ledge", "Gerudo Valley", RHT_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(GV_CRATE_FREESTANDING_POH, {[]{return true;}}),
+                  LocationAccess(RC_GV_CRATE_FREESTANDING_POH, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(GV_LOWER_STREAM, {[]{return true;}}),
+                  Entrance(RR_GV_LOWER_STREAM, {[]{return true;}}),
   });
 
-  areaTable[GV_FORTRESS_SIDE] = Area("GV Fortress Side", "Gerudo Valley", GERUDO_VALLEY, DAY_NIGHT_CYCLE, {
+  areaTable[RR_GV_FORTRESS_SIDE] = Area("GV Fortress Side", "Gerudo Valley", RHT_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&BrokenSwordAccess, {[]{return IsAdult && (PoachersSawAccess || PoachersSaw);}}),
                 }, {
                   //Locations                                       
-                  LocationAccess(GV_CHEST,          {[]{return IsAdult && CanUse(MEGATON_HAMMER);}}),
-                  LocationAccess(GV_TRADE_SAW,      {[]{return IsAdult && PoachersSaw;}}),
-                  LocationAccess(GV_GS_BEHIND_TENT, {[]{return IsAdult && HookshotOrBoomerang && AtNight && CanGetNightTimeGS;}}),
-                  LocationAccess(GV_GS_PILLAR,      {[]{return IsAdult && HookshotOrBoomerang && AtNight && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_GV_CHEST,          {[]{return IsAdult && CanUse(RG_MEGATON_HAMMER);}}),
+                  LocationAccess(RC_GV_TRADE_SAW,      {[]{return IsAdult && PoachersSaw;}}),
+                  LocationAccess(RC_GV_GS_BEHIND_TENT, {[]{return IsAdult && HookshotOrBoomerang && AtNight && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_GV_GS_PILLAR,      {[]{return IsAdult && HookshotOrBoomerang && AtNight && CanGetNightTimeGS;}}),
                 }, {
                   //Exits
-                  Entrance(GERUDO_FORTRESS,   {[]{return true;}}),
-                  Entrance(GV_UPPER_STREAM,   {[]{return true;}}),
-                  Entrance(GERUDO_VALLEY,     {[]{return IsChild || CanRideEpona || CanUse(LONGSHOT) || GerudoFortress.Is(GERUDOFORTRESS_OPEN) || CarpenterRescue;}}),
-                  Entrance(GV_CARPENTER_TENT, {[]{return IsAdult;}}),
-                  Entrance(GV_STORMS_GROTTO,  {[]{return IsAdult && CanOpenStormGrotto;}}),
-                  Entrance(GV_CRATE_LEDGE, {[]{return false;}}),
+                  Entrance(RR_GERUDO_FORTRESS,   {[]{return true;}}),
+                  Entrance(RR_GV_UPPER_STREAM,   {[]{return true;}}),
+                  Entrance(RR_GERUDO_VALLEY,     {[]{return IsChild || CanRideEpona || CanUse(RG_LONGSHOT) || GerudoFortress.Is(GERUDOFORTRESS_OPEN) || CarpenterRescue;}}),
+                  Entrance(RR_GV_CARPENTER_TENT, {[]{return IsAdult;}}),
+                  Entrance(RR_GV_STORMS_GROTTO,  {[]{return IsAdult && CanOpenStormGrotto;}}),
+                  Entrance(RR_GV_CRATE_LEDGE, {[]{return false;}}),
   });
 
-  areaTable[GV_CARPENTER_TENT] = Area("GV Carpenter Tent", "GV Carpenter Tent", NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_GV_CARPENTER_TENT] = Area("GV Carpenter Tent", "GV Carpenter Tent", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(GV_FORTRESS_SIDE, {[]{return true;}}),
+                  Entrance(RR_GV_FORTRESS_SIDE, {[]{return true;}}),
   });
 
-  areaTable[GV_OCTOROK_GROTTO] = Area("GV Octorok Grotto", "GV Octorok Grotto", NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_GV_OCTOROK_GROTTO] = Area("GV Octorok Grotto", "GV Octorok Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(GV_GROTTO_LEDGE, {[]{return true;}}),
+                  Entrance(RR_GV_GROTTO_LEDGE, {[]{return true;}}),
   });
 
-  areaTable[GV_STORMS_GROTTO] = Area("GV Storms Grotto", "GV Storms Grotto", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GV_STORMS_GROTTO] = Area("GV Storms Grotto", "GV Storms Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(GV_DEKU_SCRUB_GROTTO_REAR,  {[]{return CanStunDeku;}}),
-                  LocationAccess(GV_DEKU_SCRUB_GROTTO_FRONT, {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_GV_DEKU_SCRUB_GROTTO_REAR,  {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_GV_DEKU_SCRUB_GROTTO_FRONT, {[]{return CanStunDeku;}}),
                 }, {
                   //Exits
-                  Entrance(GV_FORTRESS_SIDE, {[]{return true;}}),
+                  Entrance(RR_GV_FORTRESS_SIDE, {[]{return true;}}),
   });
 
-  areaTable[GERUDO_FORTRESS] = Area("Gerudo Fortress", "Gerudo Fortress", GERUDO_FORTRESS, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GERUDO_FORTRESS] = Area("Gerudo Fortress", "Gerudo Fortress", RHT_GERUDO_FORTRESS, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&CarpenterRescue, {[]{return CanFinishGerudoFortress;}}),
                   EventAccess(&GF_GateOpen,     {[]{return IsAdult && GerudoToken;}}),
                   EventAccess(&GtG_GateOpen,    {[]{return GtG_GateOpen || (IsAdult && GerudoToken);}}),
                 }, {
                   //Locations
-                  LocationAccess(GF_CHEST,              {[]{return CanUse(HOVER_BOOTS) || (IsAdult && CanUse(SCARECROW)) || CanUse(LONGSHOT);}}),
-                  LocationAccess(GF_HBA_1000_POINTS,    {[]{return GerudoToken && CanRideEpona && Bow && AtDay;}}),
-                  LocationAccess(GF_HBA_1500_POINTS,    {[]{return GerudoToken && CanRideEpona && Bow && AtDay;}}),
-                  LocationAccess(GF_NORTH_F1_CARPENTER, {[]{return  IsAdult || KokiriSword || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD);}}),
-                  LocationAccess(GF_NORTH_F2_CARPENTER, {[]{return (IsAdult || KokiriSword || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD)) && (GerudoToken || CanUse(BOW) || CanUse(HOOKSHOT) || CanUse(HOVER_BOOTS) || LogicGerudoKitchen);}}),
-                  LocationAccess(GF_SOUTH_F1_CARPENTER, {[]{return  IsAdult || KokiriSword || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD);}}),
-                  LocationAccess(GF_SOUTH_F2_CARPENTER, {[]{return  IsAdult || KokiriSword || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD);}}),
-                  LocationAccess(GF_GERUDO_MEMBERSHIP_CARD,       {[]{return CanFinishGerudoFortress;}}),
-                  LocationAccess(GF_GS_ARCHERY_RANGE,   {[]{return IsAdult && HookshotOrBoomerang && GerudoToken && AtNight && CanGetNightTimeGS;}}),
-                  LocationAccess(GF_GS_TOP_FLOOR,       {[]{return IsAdult && AtNight && (GerudoToken || CanUse(BOW) || CanUse(HOOKSHOT) || CanUse(HOVER_BOOTS) || LogicGerudoKitchen || LogicGFJump) && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_GF_CHEST,              {[]{return CanUse(RG_HOVER_BOOTS) || (IsAdult && CanUse(RG_SCARECROW)) || CanUse(RG_LONGSHOT);}}),
+                  LocationAccess(RC_GF_HBA_1000_POINTS,    {[]{return GerudoToken && CanRideEpona && Bow && AtDay;}}),
+                  LocationAccess(RC_GF_HBA_1500_POINTS,    {[]{return GerudoToken && CanRideEpona && Bow && AtDay;}}),
+                  LocationAccess(RC_GF_NORTH_F1_CARPENTER, {[]{return  IsAdult || KokiriSword || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD);}}),
+                  LocationAccess(RC_GF_NORTH_F2_CARPENTER, {[]{return (IsAdult || KokiriSword || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) && (GerudoToken || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_HOVER_BOOTS) || LogicGerudoKitchen);}}),
+                  LocationAccess(RC_GF_SOUTH_F1_CARPENTER, {[]{return  IsAdult || KokiriSword || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD);}}),
+                  LocationAccess(RC_GF_SOUTH_F2_CARPENTER, {[]{return  IsAdult || KokiriSword || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD);}}),
+                  LocationAccess(RC_GF_GERUDO_MEMBERSHIP_CARD,       {[]{return CanFinishGerudoFortress;}}),
+                  LocationAccess(RC_GF_GS_ARCHERY_RANGE,   {[]{return IsAdult && HookshotOrBoomerang && GerudoToken && AtNight && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_GF_GS_TOP_FLOOR,       {[]{return IsAdult && AtNight && (GerudoToken || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_HOVER_BOOTS) || LogicGerudoKitchen || LogicGFJump) && CanGetNightTimeGS;}}),
                 }, {
                   //Exits
-                  Entrance(GV_FORTRESS_SIDE,                 {[]{return true;}}),
-                  Entrance(GF_OUTSIDE_GATE,                  {[]{return GF_GateOpen;}}),
-                  Entrance(GERUDO_TRAINING_GROUNDS_ENTRYWAY, {[]{return GtG_GateOpen && (IsAdult || ShuffleDungeonEntrances);}}),
-                  Entrance(GF_STORMS_GROTTO,                 {[]{return IsAdult && CanOpenStormGrotto;}}),
+                  Entrance(RR_GV_FORTRESS_SIDE,                 {[]{return true;}}),
+                  Entrance(RR_GF_OUTSIDE_GATE,                  {[]{return GF_GateOpen;}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_ENTRYWAY, {[]{return GtG_GateOpen && (IsAdult || ShuffleDungeonEntrances);}}),
+                  Entrance(RR_GF_STORMS_GROTTO,                 {[]{return IsAdult && CanOpenStormGrotto;}}),
   });
 
-  areaTable[GF_OUTSIDE_GATE] = Area("GF Outside Gate", "Gerudo Fortress", NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GF_OUTSIDE_GATE] = Area("GF Outside Gate", "Gerudo Fortress", RHT_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&GF_GateOpen, {[]{return IsAdult && GerudoToken && (ShuffleGerudoToken || ShuffleOverworldEntrances /*|| ShuffleSpecialIndoorEntrances*/);}}),
                 }, {}, {
                   //Exits
-                  Entrance(GERUDO_FORTRESS,         {[]{return (IsAdult && (Hookshot || !ShuffleOverworldEntrances)) || GF_GateOpen;}}),
-                  Entrance(WASTELAND_NEAR_FORTRESS, {[]{return true;}}),
+                  Entrance(RR_GERUDO_FORTRESS,         {[]{return (IsAdult && (Hookshot || !ShuffleOverworldEntrances)) || GF_GateOpen;}}),
+                  Entrance(RR_WASTELAND_NEAR_FORTRESS, {[]{return true;}}),
   });
 
-  areaTable[GF_STORMS_GROTTO] = Area("GF Storms Grotto", "GF Storms Grotto", NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GF_STORMS_GROTTO] = Area("GF Storms Grotto", "GF Storms Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FreeFairies, {[]{return true;}}),
                 }, {}, {
                   //Exits
-                  Entrance(GERUDO_FORTRESS, {[]{return true;}}),
+                  Entrance(RR_GERUDO_FORTRESS, {[]{return true;}}),
   });
 
-  areaTable[WASTELAND_NEAR_FORTRESS] = Area("Wasteland Near Fortress", "Haunted Wasteland", HAUNTED_WASTELAND, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WASTELAND_NEAR_FORTRESS] = Area("Wasteland Near Fortress", "Haunted Wasteland", RHT_HAUNTED_WASTELAND, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(GF_OUTSIDE_GATE,   {[]{return true;}}),
-                  Entrance(HAUNTED_WASTELAND, {[]{return CanUse(HOVER_BOOTS) || CanUse(LONGSHOT) || LogicWastelandCrossing;}}),
+                  Entrance(RR_GF_OUTSIDE_GATE,   {[]{return true;}}),
+                  Entrance(RR_HAUNTED_WASTELAND, {[]{return CanUse(RG_HOVER_BOOTS) || CanUse(RG_LONGSHOT) || LogicWastelandCrossing;}}),
   });
 
-  areaTable[HAUNTED_WASTELAND] = Area("Haunted Wasteland", "Haunted Wasteland", HAUNTED_WASTELAND, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_HAUNTED_WASTELAND] = Area("Haunted Wasteland", "Haunted Wasteland", RHT_HAUNTED_WASTELAND, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FairyPot, {[]{return true;}}),
                   EventAccess(&NutPot,   {[]{return true;}}),
                 }, {
                   //Locations
-                  LocationAccess(WASTELAND_CHEST,            {[]{return HasFireSource;}}),
-                  LocationAccess(WASTELAND_BOMBCHU_SALESMAN, {[]{return AdultsWallet && (IsAdult || Sticks || KokiriSword);}}),
-                  LocationAccess(WASTELAND_GS,               {[]{return HookshotOrBoomerang;}}),
+                  LocationAccess(RC_WASTELAND_CHEST,            {[]{return HasFireSource;}}),
+                  LocationAccess(RC_WASTELAND_BOMBCHU_SALESMAN, {[]{return AdultsWallet && (IsAdult || Sticks || KokiriSword);}}),
+                  LocationAccess(RC_WASTELAND_GS,               {[]{return HookshotOrBoomerang;}}),
                 }, {
                   //Exits
-                  Entrance(WASTELAND_NEAR_COLOSSUS, {[]{return LogicLensWasteland || CanUse(LENS_OF_TRUTH);}}),
-                  Entrance(WASTELAND_NEAR_FORTRESS, {[]{return CanUse(HOVER_BOOTS) || CanUse(LONGSHOT) || LogicWastelandCrossing;}}),
+                  Entrance(RR_WASTELAND_NEAR_COLOSSUS, {[]{return LogicLensWasteland || CanUse(RG_LENS_OF_TRUTH);}}),
+                  Entrance(RR_WASTELAND_NEAR_FORTRESS, {[]{return CanUse(RG_HOVER_BOOTS) || CanUse(RG_LONGSHOT) || LogicWastelandCrossing;}}),
   });
 
-  areaTable[WASTELAND_NEAR_COLOSSUS] = Area("Wasteland Near Colossus", "Haunted Wasteland", NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WASTELAND_NEAR_COLOSSUS] = Area("Wasteland Near Colossus", "Haunted Wasteland", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(DESERT_COLOSSUS,   {[]{return true;}}),
-                  Entrance(HAUNTED_WASTELAND, {[]{return LogicReverseWasteland || false;}}),
+                  Entrance(RR_DESERT_COLOSSUS,   {[]{return true;}}),
+                  Entrance(RR_HAUNTED_WASTELAND, {[]{return LogicReverseWasteland || false;}}),
   });
 
-  areaTable[DESERT_COLOSSUS] = Area("Desert Colossus", "Desert Colossus", DESERT_COLOSSUS, DAY_NIGHT_CYCLE, {
+  areaTable[RR_DESERT_COLOSSUS] = Area("Desert Colossus", "Desert Colossus", RHT_DESERT_COLOSSUS, DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FairyPond, {[]{return FairyPond || CanPlay(SongOfStorms);}}),
                   EventAccess(&BugRock,   {[]{return true;}}),
                 }, {
                   //Locations
-                  LocationAccess(COLOSSUS_FREESTANDING_POH, {[]{return IsAdult && CanPlantBean(DESERT_COLOSSUS);}}),
-                  LocationAccess(COLOSSUS_GS_BEAN_PATCH,    {[]{return CanPlantBugs && CanChildAttack;}}),
-                  LocationAccess(COLOSSUS_GS_TREE,          {[]{return IsAdult && HookshotOrBoomerang && AtNight && CanGetNightTimeGS;}}),
-                  LocationAccess(COLOSSUS_GS_HILL,          {[]{return IsAdult && AtNight && (CanPlantBean(DESERT_COLOSSUS) || CanUse(LONGSHOT) || (LogicColossusGS && CanUse(HOOKSHOT))) && CanGetNightTimeGS;}}),
-                  LocationAccess(COLOSSUS_GOSSIP_STONE,     {[]{return true;}}),
+                  LocationAccess(RC_COLOSSUS_FREESTANDING_POH, {[]{return IsAdult && CanPlantBean(RR_DESERT_COLOSSUS);}}),
+                  LocationAccess(RC_COLOSSUS_GS_BEAN_PATCH,    {[]{return CanPlantBugs && CanChildAttack;}}),
+                  LocationAccess(RC_COLOSSUS_GS_TREE,          {[]{return IsAdult && HookshotOrBoomerang && AtNight && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_COLOSSUS_GS_HILL,          {[]{return IsAdult && AtNight && (CanPlantBean(RR_DESERT_COLOSSUS) || CanUse(RG_LONGSHOT) || (LogicColossusGS && CanUse(RG_HOOKSHOT))) && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_COLOSSUS_GOSSIP_STONE,     {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(COLOSSUS_GREAT_FAIRY_FOUNTAIN, {[]{return HasExplosives;}}),
-                  Entrance(SPIRIT_TEMPLE_ENTRYWAY,        {[]{return true;}}),
-                  Entrance(WASTELAND_NEAR_COLOSSUS,       {[]{return true;}}),
-                  Entrance(COLOSSUS_GROTTO,               {[]{return CanUse(SILVER_GAUNTLETS);}}),
+                  Entrance(RR_COLOSSUS_GREAT_FAIRY_FOUNTAIN, {[]{return HasExplosives;}}),
+                  Entrance(RR_SPIRIT_TEMPLE_ENTRYWAY,        {[]{return true;}}),
+                  Entrance(RR_WASTELAND_NEAR_COLOSSUS,       {[]{return true;}}),
+                  Entrance(RR_COLOSSUS_GROTTO,               {[]{return CanUse(RG_SILVER_GAUNTLETS);}}),
   });
 
-  areaTable[DESERT_COLOSSUS_FROM_SPIRIT_ENTRYWAY] = Area("Desert Colossus From Spirit Entryway", "Desert Colossus", DESERT_COLOSSUS, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DESERT_COLOSSUS_FROM_SPIRIT_ENTRYWAY] = Area("Desert Colossus From Spirit Entryway", "Desert Colossus", RHT_DESERT_COLOSSUS, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(SHEIK_AT_COLOSSUS, {[]{return true;}}),
+                  LocationAccess(RC_SHEIK_AT_COLOSSUS, {[]{return true;}}),
                 }, {
                   //Exist
-                  Entrance(DESERT_COLOSSUS, {[]{return true;}}),
+                  Entrance(RR_DESERT_COLOSSUS, {[]{return true;}}),
   });
 
-  areaTable[COLOSSUS_GREAT_FAIRY_FOUNTAIN] = Area("Colossus Great Fairy Fountain", "Colossus Great Fairy Fountain", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_COLOSSUS_GREAT_FAIRY_FOUNTAIN] = Area("Colossus Great Fairy Fountain", "Colossus Great Fairy Fountain", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(COLOSSUS_GREAT_FAIRY_REWARD, {[]{return CanPlay(ZeldasLullaby);}}),
+                  LocationAccess(RC_COLOSSUS_GREAT_FAIRY_REWARD, {[]{return CanPlay(ZeldasLullaby);}}),
                 }, {
                   //Exits
-                  Entrance(DESERT_COLOSSUS, {[]{return true;}}),
+                  Entrance(RR_DESERT_COLOSSUS, {[]{return true;}}),
   });
 
-  areaTable[COLOSSUS_GROTTO] = Area("Colossus Grotto", "Colossus Grotto", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_COLOSSUS_GROTTO] = Area("Colossus Grotto", "Colossus Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(COLOSSUS_DEKU_SCRUB_GROTTO_REAR,  {[]{return CanStunDeku;}}),
-                  LocationAccess(COLOSSUS_DEKU_SCRUB_GROTTO_FRONT, {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,  {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT, {[]{return CanStunDeku;}}),
                 }, {
                   //Exits
-                  Entrance(DESERT_COLOSSUS, {[]{return true;}}),
+                  Entrance(RR_DESERT_COLOSSUS, {[]{return true;}}),
   });
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
index 7b247049d..d807c9570 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
@@ -6,229 +6,229 @@ using namespace Logic;
 using namespace Settings;
 
 void AreaTable_Init_HyruleField() {
-  areaTable[HYRULE_FIELD] = Area("Hyrule Field", "Hyrule Field", HYRULE_FIELD, DAY_NIGHT_CYCLE, {
+  areaTable[RR_HYRULE_FIELD] = Area("Hyrule Field", "Hyrule Field", RHT_HYRULE_FIELD, DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&BigPoeKill, {[]{return CanUse(BOW) && CanRideEpona && HasBottle;}}),
+                  EventAccess(&BigPoeKill, {[]{return CanUse(RG_FAIRY_BOW) && CanRideEpona && HasBottle;}}),
                 }, {
                   //Locations
-                  LocationAccess(HF_OCARINA_OF_TIME_ITEM,   {[]{return IsChild && HasAllStones;}}),
-                  LocationAccess(SONG_FROM_OCARINA_OF_TIME, {[]{return IsChild && HasAllStones;}}),
+                  LocationAccess(RC_HF_OCARINA_OF_TIME_ITEM,   {[]{return IsChild && HasAllStones;}}),
+                  LocationAccess(RC_SONG_FROM_OCARINA_OF_TIME, {[]{return IsChild && HasAllStones;}}),
                 }, {
                   //Exits
-                  Entrance(LW_BRIDGE,              {[]{return true;}}),
-                  Entrance(LAKE_HYLIA,             {[]{return true;}}),
-                  Entrance(GERUDO_VALLEY,          {[]{return true;}}),
-                  Entrance(MARKET_ENTRANCE,        {[]{return true;}}),
-                  Entrance(KAKARIKO_VILLAGE,       {[]{return true;}}),
-                  Entrance(ZR_FRONT,               {[]{return true;}}),
-                  Entrance(LON_LON_RANCH,          {[]{return true;}}),
-                  Entrance(HF_SOUTHEAST_GROTTO,    {[]{return Here(HYRULE_FIELD, []{return CanBlastOrSmash;});}}),
-                  Entrance(HF_OPEN_GROTTO,         {[]{return true;}}),
-                  Entrance(HF_INSIDE_FENCE_GROTTO, {[]{return CanOpenBombGrotto;}}),
-                  Entrance(HF_COW_GROTTO,          {[]{return (CanUse(MEGATON_HAMMER) || IsChild) && CanOpenBombGrotto;}}),
-                  Entrance(HF_NEAR_MARKET_GROTTO,  {[]{return Here(HYRULE_FIELD, []{return CanBlastOrSmash;});}}),
-                  Entrance(HF_FAIRY_GROTTO,        {[]{return Here(HYRULE_FIELD, []{return CanBlastOrSmash;});}}),
-                  Entrance(HF_NEAR_KAK_GROTTO,     {[]{return CanOpenBombGrotto;}}),
-                  Entrance(HF_TEKTITE_GROTTO,      {[]{return CanOpenBombGrotto;}}),
+                  Entrance(RR_LW_BRIDGE,              {[]{return true;}}),
+                  Entrance(RR_LAKE_HYLIA,             {[]{return true;}}),
+                  Entrance(RR_GERUDO_VALLEY,          {[]{return true;}}),
+                  Entrance(RR_MARKET_ENTRANCE,        {[]{return true;}}),
+                  Entrance(RR_KAKARIKO_VILLAGE,       {[]{return true;}}),
+                  Entrance(RR_ZR_FRONT,               {[]{return true;}}),
+                  Entrance(RR_LON_LON_RANCH,          {[]{return true;}}),
+                  Entrance(RR_HF_SOUTHEAST_GROTTO,    {[]{return Here(RR_HYRULE_FIELD, []{return CanBlastOrSmash;});}}),
+                  Entrance(RR_HF_OPEN_GROTTO,         {[]{return true;}}),
+                  Entrance(RR_HF_INSIDE_FENCE_GROTTO, {[]{return CanOpenBombGrotto;}}),
+                  Entrance(RR_HF_COW_GROTTO,          {[]{return (CanUse(RG_MEGATON_HAMMER) || IsChild) && CanOpenBombGrotto;}}),
+                  Entrance(RR_HF_NEAR_MARKET_GROTTO,  {[]{return Here(RR_HYRULE_FIELD, []{return CanBlastOrSmash;});}}),
+                  Entrance(RR_HF_FAIRY_GROTTO,        {[]{return Here(RR_HYRULE_FIELD, []{return CanBlastOrSmash;});}}),
+                  Entrance(RR_HF_NEAR_KAK_GROTTO,     {[]{return CanOpenBombGrotto;}}),
+                  Entrance(RR_HF_TEKTITE_GROTTO,      {[]{return CanOpenBombGrotto;}}),
   });
 
-  areaTable[HF_SOUTHEAST_GROTTO] = Area("HF Southeast Grotto", "HF Southeast Grotto", NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+  areaTable[RR_HF_SOUTHEAST_GROTTO] = Area("HF Southeast Grotto", "HF Southeast Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
-                  LocationAccess(HF_SOUTHEAST_GROTTO_CHEST,        {[]{return true;}}),
-                  LocationAccess(HF_SOUTHEAST_GROTTO_GOSSIP_STONE, {[]{return true;}}),
+                  LocationAccess(RC_HF_SOUTHEAST_GROTTO_CHEST,        {[]{return true;}}),
+                  LocationAccess(RC_HF_SOUTHEAST_GOSSIP_STONE, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(HYRULE_FIELD, {[]{return true;}}),
+                  Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
   });
 
-  areaTable[HF_OPEN_GROTTO] = Area("HF Open Grotto", "HF Open Grotto", NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+  areaTable[RR_HF_OPEN_GROTTO] = Area("HF Open Grotto", "HF Open Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
-                  LocationAccess(HF_OPEN_GROTTO_CHEST,        {[]{return true;}}),
-                  LocationAccess(HF_OPEN_GROTTO_GOSSIP_STONE, {[]{return true;}}),
+                  LocationAccess(RC_HF_OPEN_GROTTO_CHEST,        {[]{return true;}}),
+                  LocationAccess(RC_HF_OPEN_GROTTO_GOSSIP_STONE, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(HYRULE_FIELD, {[]{return true;}}),
+                  Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
   });
 
-  areaTable[HF_INSIDE_FENCE_GROTTO] = Area("HF Inside Fence Grotto", "HF Inside Fence Grotto", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_HF_INSIDE_FENCE_GROTTO] = Area("HF Inside Fence Grotto", "HF Inside Fence Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(HF_DEKU_SCRUB_GROTTO, {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_HF_DEKU_SCRUB_GROTTO, {[]{return CanStunDeku;}}),
                 }, {
                   //Exits
-                  Entrance(HYRULE_FIELD, {[]{return true;}}),
+                  Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
   });
 
-  areaTable[HF_COW_GROTTO] = Area("HF Cow Grotto", "HF Cow Grotto", NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+  areaTable[RR_HF_COW_GROTTO] = Area("HF Cow Grotto", "HF Cow Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
-                  LocationAccess(HF_GS_COW_GROTTO,           {[]{return HasFireSource && HookshotOrBoomerang;}}),
-                  LocationAccess(HF_COW_GROTTO_COW,          {[]{return HasFireSource && CanPlay(EponasSong);}}),
-                  LocationAccess(HF_COW_GROTTO_GOSSIP_STONE, {[]{return HasFireSource;}}),
+                  LocationAccess(RC_HF_GS_COW_GROTTO,           {[]{return HasFireSource && HookshotOrBoomerang;}}),
+                  LocationAccess(RC_HF_COW_GROTTO_COW,          {[]{return HasFireSource && CanPlay(EponasSong);}}),
+                  LocationAccess(RC_HF_COW_GROTTO_GOSSIP_STONE, {[]{return HasFireSource;}}),
                 }, {
                   //Exits
-                  Entrance(HYRULE_FIELD, {[]{return true;}}),
+                  Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
   });
 
-  areaTable[HF_NEAR_MARKET_GROTTO] = Area("HF Near Market Grotto", "HF Near Market Grotto", NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+  areaTable[RR_HF_NEAR_MARKET_GROTTO] = Area("HF Near Market Grotto", "HF Near Market Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
-                  LocationAccess(HF_NEAR_MARKET_GROTTO_CHEST,        {[]{return true;}}),
-                  LocationAccess(HF_NEAR_MARKET_GROTTO_GOSSIP_STONE, {[]{return true;}}),
+                  LocationAccess(RC_HF_NEAR_MARKET_GROTTO_CHEST,        {[]{return true;}}),
+                  LocationAccess(RC_HF_NEAR_MARKET_GOSSIP_STONE, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(HYRULE_FIELD, {[]{return true;}}),
+                  Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
   });
 
-  areaTable[HF_FAIRY_GROTTO] = Area("HF Fairy Grotto", "HF Fairy Grotto", NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_HF_FAIRY_GROTTO] = Area("HF Fairy Grotto", "HF Fairy Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FreeFairies, {[]{return true;}}),
                 }, {}, {
                   //Exits
-                  Entrance(HYRULE_FIELD, {[]{return true;}}),
+                  Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
   });
 
-  areaTable[HF_NEAR_KAK_GROTTO] = Area("HF Near Kak Grotto", "HF Near Kak Grotto", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_HF_NEAR_KAK_GROTTO] = Area("HF Near Kak Grotto", "HF Near Kak Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(HF_GS_NEAR_KAK_GROTTO, {[]{return HookshotOrBoomerang;}}),
+                  LocationAccess(RC_HF_GS_NEAR_KAK_GROTTO, {[]{return HookshotOrBoomerang;}}),
                 }, {
                   //Exits
-                  Entrance(HYRULE_FIELD, {[]{return true;}}),
+                  Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
   });
 
-  areaTable[HF_TEKTITE_GROTTO] = Area("HF Tektite Grotto", "HF Tektite Grotto", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_HF_TEKTITE_GROTTO] = Area("HF Tektite Grotto", "HF Tektite Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(HF_TEKTITE_GROTTO_FREESTANDING_POH, {[]{return ProgressiveScale >= 2 || CanUse(IRON_BOOTS);}}),
+                  LocationAccess(RC_HF_TEKTITE_GROTTO_FREESTANDING_POH, {[]{return ProgressiveScale >= 2 || CanUse(RG_IRON_BOOTS);}}),
                 }, {
                   //Exits
-                  Entrance(HYRULE_FIELD, {[]{return true;}}),
+                  Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
   });
 
-  areaTable[LAKE_HYLIA] = Area("Lake Hylia", "Lake Hylia", LAKE_HYLIA, DAY_NIGHT_CYCLE, {
+  areaTable[RR_LAKE_HYLIA] = Area("Lake Hylia", "Lake Hylia", RHT_LAKE_HYLIA, DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&GossipStoneFairy, {[]{return GossipStoneFairy || CanSummonGossipFairy;}}),
-                  EventAccess(&BeanPlantFairy,   {[]{return BeanPlantFairy   || (CanPlantBean(LAKE_HYLIA) && CanPlay(SongOfStorms));}}),
-                  EventAccess(&ButterflyFairy,   {[]{return ButterflyFairy   || CanUse(STICKS);}}),
+                  EventAccess(&BeanPlantFairy,   {[]{return BeanPlantFairy   || (CanPlantBean(RR_LAKE_HYLIA) && CanPlay(SongOfStorms));}}),
+                  EventAccess(&ButterflyFairy,   {[]{return ButterflyFairy   || CanUse(RG_STICKS);}}),
                   EventAccess(&BugShrub,         {[]{return BugShrub         || (IsChild && CanCutShrubs);}}),
                   EventAccess(&ChildScarecrow,   {[]{return ChildScarecrow   || (IsChild && Ocarina);}}),
                   EventAccess(&AdultScarecrow,   {[]{return AdultScarecrow   || (IsAdult && Ocarina);}}),
                 }, {
                   //Locations
-                  LocationAccess(LH_UNDERWATER_ITEM,        {[]{return IsChild && CanDive;}}),
-                  LocationAccess(LH_SUN,                    {[]{return IsAdult && WaterTempleClear && CanUse(BOW);}}),
-                  LocationAccess(LH_FREESTANDING_POH,       {[]{return IsAdult && (CanUse(SCARECROW) || CanPlantBean(LAKE_HYLIA));}}),
-                  LocationAccess(LH_GS_BEAN_PATCH,          {[]{return CanPlantBugs && CanChildAttack;}}),
-                  LocationAccess(LH_GS_LAB_WALL,            {[]{return IsChild && (HookshotOrBoomerang || (LogicLabWallGS && (Sticks || KokiriSword || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD)))) && AtNight && CanGetNightTimeGS;}}),
-                  LocationAccess(LH_GS_SMALL_ISLAND,        {[]{return IsChild && CanChildAttack && AtNight && CanGetNightTimeGS;}}),
-                  LocationAccess(LH_GS_TREE,                {[]{return IsAdult && CanUse(LONGSHOT) && AtNight && CanGetNightTimeGS;}}),
-                  LocationAccess(LH_LAB_GOSSIP_STONE,       {[]{return true;}}),
-                  LocationAccess(LH_GOSSIP_STONE_SOUTHEAST, {[]{return true;}}),
-                  LocationAccess(LH_GOSSIP_STONE_SOUTHWEST, {[]{return true;}}),
+                  LocationAccess(RC_LH_UNDERWATER_ITEM,        {[]{return IsChild && CanDive;}}),
+                  LocationAccess(RC_LH_SUN,                    {[]{return IsAdult && WaterTempleClear && CanUse(RG_FAIRY_BOW);}}),
+                  LocationAccess(RC_LH_FREESTANDING_POH,       {[]{return IsAdult && (CanUse(RG_SCARECROW) || CanPlantBean(RR_LAKE_HYLIA));}}),
+                  LocationAccess(RC_LH_GS_BEAN_PATCH,          {[]{return CanPlantBugs && CanChildAttack;}}),
+                  LocationAccess(RC_LH_GS_LAB_WALL,            {[]{return IsChild && (HookshotOrBoomerang || (LogicLabWallGS && (Sticks || KokiriSword || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)))) && AtNight && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_LH_GS_SMALL_ISLAND,        {[]{return IsChild && CanChildAttack && AtNight && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_LH_GS_TREE,                {[]{return IsAdult && CanUse(RG_LONGSHOT) && AtNight && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_LH_LAB_GOSSIP_STONE,       {[]{return true;}}),
+                  LocationAccess(RC_LH_SOUTHEAST_GOSSIP_STONE, {[]{return true;}}),
+                  LocationAccess(RC_LH_SOUTHWEST_GOSSIP_STONE, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(HYRULE_FIELD,          {[]{return true;}}),
-                  Entrance(ZORAS_DOMAIN,          {[]{return IsChild && (CanDive || CanUse(IRON_BOOTS));}}),
-                  Entrance(LH_OWL_FLIGHT,         {[]{return IsChild;}}),
-                  Entrance(LH_FISHING_ISLAND,     {[]{return IsChild || CanUse(SCARECROW) || CanPlantBean(LAKE_HYLIA) || WaterTempleClear;}}),
-                  Entrance(LH_LAB,                {[]{return true;}}),
-                  Entrance(WATER_TEMPLE_ENTRYWAY, {[]{return CanUse(HOOKSHOT) && ((CanUse(IRON_BOOTS) || (LogicWaterHookshotEntry && ProgressiveScale >= 2)) || (IsAdult && CanUse(LONGSHOT) && ProgressiveScale >= 2));}}),
-                  Entrance(LH_GROTTO,             {[]{return true;}}),
+                  Entrance(RR_HYRULE_FIELD,          {[]{return true;}}),
+                  Entrance(RR_ZORAS_DOMAIN,          {[]{return IsChild && (CanDive || CanUse(RG_IRON_BOOTS));}}),
+                  Entrance(RR_LH_OWL_FLIGHT,         {[]{return IsChild;}}),
+                  Entrance(RR_LH_FISHING_ISLAND,     {[]{return IsChild || CanUse(RG_SCARECROW) || CanPlantBean(RR_LAKE_HYLIA) || WaterTempleClear;}}),
+                  Entrance(RR_LH_LAB,                {[]{return true;}}),
+                  Entrance(RR_WATER_TEMPLE_ENTRYWAY, {[]{return CanUse(RG_HOOKSHOT) && ((CanUse(RG_IRON_BOOTS) || (LogicWaterHookshotEntry && ProgressiveScale >= 2)) || (IsAdult && CanUse(RG_LONGSHOT) && ProgressiveScale >= 2));}}),
+                  Entrance(RR_LH_GROTTO,             {[]{return true;}}),
   });
 
-  areaTable[LH_FISHING_ISLAND] = Area("LH Fishing Island", "Lake Hylia", LAKE_HYLIA, DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_LH_FISHING_ISLAND] = Area("LH Fishing Island", "Lake Hylia", RHT_LAKE_HYLIA, DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(LAKE_HYLIA,      {[]{return true;}}),
-                  Entrance(LH_FISHING_HOLE, {[]{return true;}}),
+                  Entrance(RR_LAKE_HYLIA,      {[]{return true;}}),
+                  Entrance(RR_LH_FISHING_HOLE, {[]{return true;}}),
   });
 
-  areaTable[LH_OWL_FLIGHT] = Area("LH Owl Flight", "Lake Hylia", NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_LH_OWL_FLIGHT] = Area("LH Owl Flight", "Lake Hylia", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(HYRULE_FIELD, {[]{return true;}}),
+                  Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
   });
 
-  areaTable[LH_LAB] = Area("LH Lab", "LH Lab", NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_LH_LAB] = Area("LH Lab", "LH Lab", RHT_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&EyedropsAccess, {[]{return EyedropsAccess || (IsAdult && (EyeballFrogAccess || (EyeballFrog && DisableTradeRevert)));}}),
                 }, {
                   //Locations
-                  LocationAccess(LH_LAB_DIVE,     {[]{return ProgressiveScale >= 2 || (LogicLabDiving && CanUse(IRON_BOOTS) && CanUse(HOOKSHOT));}}),
-                  LocationAccess(LH_TRADE_FROG,   {[]{return IsAdult && EyeballFrog;}}),
-                  LocationAccess(LH_GS_LAB_CRATE, {[]{return CanUse(IRON_BOOTS) && CanUse(HOOKSHOT);}}),
+                  LocationAccess(RC_LH_LAB_DIVE,     {[]{return ProgressiveScale >= 2 || (LogicLabDiving && CanUse(RG_IRON_BOOTS) && CanUse(RG_HOOKSHOT));}}),
+                  LocationAccess(RC_LH_TRADE_FROG,   {[]{return IsAdult && EyeballFrog;}}),
+                  LocationAccess(RC_LH_GS_LAB_CRATE, {[]{return CanUse(RG_IRON_BOOTS) && CanUse(RG_HOOKSHOT);}}),
                 }, {
                   //Exits
-                  Entrance(LAKE_HYLIA, {[]{return true;}}),
+                  Entrance(RR_LAKE_HYLIA, {[]{return true;}}),
   });
 
-  areaTable[LH_FISHING_HOLE] = Area("LH Fishing Hole", "LH Fishing Hole", NONE, DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_LH_FISHING_HOLE] = Area("LH Fishing Hole", "LH Fishing Hole", RHT_NONE, DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(LH_CHILD_FISHING, {[]{return IsChild;}}),
-                  LocationAccess(LH_ADULT_FISHING, {[]{return IsAdult;}}),
+                  LocationAccess(RC_LH_CHILD_FISHING, {[]{return IsChild;}}),
+                  LocationAccess(RC_LH_ADULT_FISHING, {[]{return IsAdult;}}),
                 }, {
                   //Exits
-                  Entrance(LH_FISHING_ISLAND, {[]{return true;}}),
+                  Entrance(RR_LH_FISHING_ISLAND, {[]{return true;}}),
   });
 
-  areaTable[LH_GROTTO] = Area("LH Grotto", "LH Grotto", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_LH_GROTTO] = Area("LH Grotto", "LH Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(LH_DEKU_SCRUB_GROTTO_LEFT,   {[]{return CanStunDeku;}}),
-                  LocationAccess(LH_DEKU_SCRUB_GROTTO_RIGHT,  {[]{return CanStunDeku;}}),
-                  LocationAccess(LH_DEKU_SCRUB_GROTTO_CENTER, {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_LH_DEKU_SCRUB_GROTTO_LEFT,   {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_LH_DEKU_SCRUB_GROTTO_RIGHT,  {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_LH_DEKU_SCRUB_GROTTO_CENTER, {[]{return CanStunDeku;}}),
                 }, {
                   //Exits
-                  Entrance(LAKE_HYLIA, {[]{return true;}}),
+                  Entrance(RR_LAKE_HYLIA, {[]{return true;}}),
   });
 
-  areaTable[LON_LON_RANCH] = Area("Lon Lon Ranch", "Lon Lon Ranch", LON_LON_RANCH, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_LON_LON_RANCH] = Area("Lon Lon Ranch", "Lon Lon Ranch", RHT_LON_LON_RANCH, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&Epona,    {[]{return Epona    || (CanPlay(EponasSong) && IsAdult && AtDay);}}),
                   EventAccess(&LinksCow, {[]{return LinksCow || (CanPlay(EponasSong) && IsAdult && AtDay);}}),
                 }, {
                   //Locations
-                  LocationAccess(SONG_FROM_MALON,     {[]{return IsChild && ZeldasLetter && Ocarina && AtDay;}}),
-                  LocationAccess(LLR_GS_TREE,         {[]{return IsChild;}}),
-                  LocationAccess(LLR_GS_RAIN_SHED,    {[]{return IsChild && AtNight && CanGetNightTimeGS;}}),
-                  LocationAccess(LLR_GS_HOUSE_WINDOW, {[]{return IsChild && HookshotOrBoomerang && AtNight && CanGetNightTimeGS;}}),
-                  LocationAccess(LLR_GS_BACK_WALL,    {[]{return IsChild && HookshotOrBoomerang && AtNight && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_SONG_FROM_MALON,     {[]{return IsChild && ZeldasLetter && Ocarina && AtDay;}}),
+                  LocationAccess(RC_LLR_GS_TREE,         {[]{return IsChild;}}),
+                  LocationAccess(RC_LLR_GS_RAIN_SHED,    {[]{return IsChild && AtNight && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_LLR_GS_HOUSE_WINDOW, {[]{return IsChild && HookshotOrBoomerang && AtNight && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_LLR_GS_BACK_WALL,    {[]{return IsChild && HookshotOrBoomerang && AtNight && CanGetNightTimeGS;}}),
                 }, {
                   //Exits
-                  Entrance(HYRULE_FIELD,     {[]{return true;}}),
-                  Entrance(LLR_TALONS_HOUSE, {[]{return true;}}),
-                  Entrance(LLR_STABLES,      {[]{return true;}}),
-                  Entrance(LLR_TOWER,        {[]{return true;}}),
-                  Entrance(LLR_GROTTO,       {[]{return IsChild;}}),
+                  Entrance(RR_HYRULE_FIELD,     {[]{return true;}}),
+                  Entrance(RR_LLR_TALONS_HOUSE, {[]{return true;}}),
+                  Entrance(RR_LLR_STABLES,      {[]{return true;}}),
+                  Entrance(RR_LLR_TOWER,        {[]{return true;}}),
+                  Entrance(RR_LLR_GROTTO,       {[]{return IsChild;}}),
   });
 
-  areaTable[LLR_TALONS_HOUSE] = Area("LLR Talons House", "LLR Talons House", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_LLR_TALONS_HOUSE] = Area("LLR Talons House", "LLR Talons House", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(LLR_TALONS_CHICKENS, {[]{return IsChild && AtDay && ZeldasLetter;}}),
+                  LocationAccess(RC_LLR_TALONS_CHICKENS, {[]{return IsChild && AtDay && ZeldasLetter;}}),
                 }, {
                   //Exits
-                  Entrance(LON_LON_RANCH, {[]{return true;}}),
+                  Entrance(RR_LON_LON_RANCH, {[]{return true;}}),
   });
 
-  areaTable[LLR_STABLES] = Area("LLR Stables", "LLR Stables", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_LLR_STABLES] = Area("LLR Stables", "LLR Stables", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(LLR_STABLES_LEFT_COW,  {[]{return CanPlay(EponasSong);}}),
-                  LocationAccess(LLR_STABLES_RIGHT_COW, {[]{return CanPlay(EponasSong);}}),
+                  LocationAccess(RC_LLR_STABLES_LEFT_COW,  {[]{return CanPlay(EponasSong);}}),
+                  LocationAccess(RC_LLR_STABLES_RIGHT_COW, {[]{return CanPlay(EponasSong);}}),
                 }, {
                   //Exits
-                  Entrance(LON_LON_RANCH, {[]{return true;}}),
+                  Entrance(RR_LON_LON_RANCH, {[]{return true;}}),
   });
 
-  areaTable[LLR_TOWER] = Area("LLR Tower", "LLR Tower", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_LLR_TOWER] = Area("LLR Tower", "LLR Tower", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(LLR_FREESTANDING_POH, {[]{return IsChild;}}),
-                  LocationAccess(LLR_TOWER_LEFT_COW,   {[]{return CanPlay(EponasSong);}}),
-                  LocationAccess(LLR_TOWER_RIGHT_COW,  {[]{return CanPlay(EponasSong);}}),
+                  LocationAccess(RC_LLR_FREESTANDING_POH, {[]{return IsChild;}}),
+                  LocationAccess(RC_LLR_TOWER_LEFT_COW,   {[]{return CanPlay(EponasSong);}}),
+                  LocationAccess(RC_LLR_TOWER_RIGHT_COW,  {[]{return CanPlay(EponasSong);}}),
                 }, {
                   //Exits
-                  Entrance(LON_LON_RANCH, {[]{return true;}}),
+                  Entrance(RR_LON_LON_RANCH, {[]{return true;}}),
   });
 
-  areaTable[LLR_GROTTO] = Area("LLR Grotto", "LLR Grotto", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_LLR_GROTTO] = Area("LLR Grotto", "LLR Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(LLR_DEKU_SCRUB_GROTTO_LEFT,   {[]{return CanStunDeku;}}),
-                  LocationAccess(LLR_DEKU_SCRUB_GROTTO_RIGHT,  {[]{return CanStunDeku;}}),
-                  LocationAccess(LLR_DEKU_SCRUB_GROTTO_CENTER, {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_LLR_DEKU_SCRUB_GROTTO_LEFT,   {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_LLR_DEKU_SCRUB_GROTTO_RIGHT,  {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_LLR_DEKU_SCRUB_GROTTO_CENTER, {[]{return CanStunDeku;}}),
                 }, {
                   //Exits
-                  Entrance(LON_LON_RANCH, {[]{return true;}}),
+                  Entrance(RR_LON_LON_RANCH, {[]{return true;}}),
   });
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp
index f5efcc3c8..5d561043a 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp
@@ -10,36 +10,36 @@ void AreaTable_Init_IceCavern() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[ICE_CAVERN_ENTRYWAY] = Area("Ice Cavern Entryway", "Ice Cavern", ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_ICE_CAVERN_ENTRYWAY] = Area("Ice Cavern Entryway", "Ice Cavern", RHT_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(ICE_CAVERN_BEGINNING,    {[]{return Dungeon::IceCavern.IsVanilla();}}),
-                  Entrance(ICE_CAVERN_MQ_BEGINNING, {[]{return Dungeon::IceCavern.IsMQ();}}),
-                  Entrance(ZORAS_FOUNTAIN,          {[]{return true;}}),
+                  Entrance(RR_ICE_CAVERN_BEGINNING,    {[]{return Dungeon::IceCavern.IsVanilla();}}),
+                  Entrance(RR_ICE_CAVERN_MQ_BEGINNING, {[]{return Dungeon::IceCavern.IsMQ();}}),
+                  Entrance(RR_ZORAS_FOUNTAIN,          {[]{return true;}}),
   });
 
   /*--------------------------
   |     VANILLA DUNGEON      |
   ---------------------------*/
   if (Dungeon::IceCavern.IsVanilla()) {
-  areaTable[ICE_CAVERN_BEGINNING] = Area("Ice Cavern Beginning", "Ice Cavern", ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_ICE_CAVERN_BEGINNING] = Area("Ice Cavern Beginning", "Ice Cavern", RHT_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(ICE_CAVERN_ENTRYWAY, {[]{return true;}}),
-                  Entrance(ICE_CAVERN_MAIN,     {[]{return Here(ICE_CAVERN_BEGINNING, []{return IsAdult || HasExplosives || CanUse(DINS_FIRE);});}}),
+                  Entrance(RR_ICE_CAVERN_ENTRYWAY, {[]{return true;}}),
+                  Entrance(RR_ICE_CAVERN_MAIN,     {[]{return Here(RR_ICE_CAVERN_BEGINNING, []{return IsAdult || HasExplosives || CanUse(RG_DINS_FIRE);});}}),
   });
 
-  areaTable[ICE_CAVERN_MAIN] = Area("Ice Cavern", "Ice Cavern", ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_ICE_CAVERN_MAIN] = Area("Ice Cavern", "Ice Cavern", RHT_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&BlueFireAccess, {[]{return BlueFireAccess || (IsAdult && HasBottle);}}),
                 }, {
                   //Locations
-                  LocationAccess(ICE_CAVERN_MAP_CHEST,               {[]{return BlueFire && IsAdult;}}),
-                  LocationAccess(ICE_CAVERN_COMPASS_CHEST,           {[]{return BlueFire;}}),
-                  LocationAccess(ICE_CAVERN_IRON_BOOTS_CHEST,        {[]{return BlueFire && (IsAdult || Slingshot || Sticks || KokiriSword || CanUse(DINS_FIRE));}}),
-                  LocationAccess(SHEIK_IN_ICE_CAVERN,                {[]{return BlueFire && IsAdult;}}),
-                  LocationAccess(ICE_CAVERN_FREESTANDING_POH,        {[]{return BlueFire;}}),
-                  LocationAccess(ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM, {[]{return HookshotOrBoomerang;}}),
-                  LocationAccess(ICE_CAVERN_GS_HEART_PIECE_ROOM,     {[]{return BlueFire && HookshotOrBoomerang;}}),
-                  LocationAccess(ICE_CAVERN_GS_PUSH_BLOCK_ROOM,      {[]{return BlueFire && (HookshotOrBoomerang || (LogicIceBlockGS && IsAdult && CanUse(HOVER_BOOTS)));}}),
+                  LocationAccess(RC_ICE_CAVERN_MAP_CHEST,               {[]{return BlueFire && IsAdult;}}),
+                  LocationAccess(RC_ICE_CAVERN_COMPASS_CHEST,           {[]{return BlueFire;}}),
+                  LocationAccess(RC_ICE_CAVERN_IRON_BOOTS_CHEST,        {[]{return BlueFire && (IsAdult || Slingshot || Sticks || KokiriSword || CanUse(RG_DINS_FIRE));}}),
+                  LocationAccess(RC_SHEIK_IN_ICE_CAVERN,                {[]{return BlueFire && IsAdult;}}),
+                  LocationAccess(RC_ICE_CAVERN_FREESTANDING_POH,        {[]{return BlueFire;}}),
+                  LocationAccess(RC_ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM, {[]{return HookshotOrBoomerang;}}),
+                  LocationAccess(RC_ICE_CAVERN_GS_HEART_PIECE_ROOM,     {[]{return BlueFire && HookshotOrBoomerang;}}),
+                  LocationAccess(RC_ICE_CAVERN_GS_PUSH_BLOCK_ROOM,      {[]{return BlueFire && (HookshotOrBoomerang || (LogicIceBlockGS && IsAdult && CanUse(RG_HOVER_BOOTS)));}}),
   }, {});
   }
 
@@ -47,39 +47,39 @@ void AreaTable_Init_IceCavern() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (Dungeon::IceCavern.IsMQ()) {
-  areaTable[ICE_CAVERN_MQ_BEGINNING] = Area("Ice Cavern MQ Beginning", "Ice Cavern", ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_ICE_CAVERN_MQ_BEGINNING] = Area("Ice Cavern MQ Beginning", "Ice Cavern", RHT_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FairyPot, {[]{return true;}}),
   }, {}, {
                   //Exits
-                  Entrance(ICE_CAVERN_ENTRYWAY,             {[]{return true;}}),
-                  Entrance(ICE_CAVERN_MQ_MAP_ROOM,          {[]{return IsAdult || CanUse(DINS_FIRE) || (HasExplosives && (CanUse(STICKS) || CanUse(SLINGSHOT) || KokiriSword));}}),
-                  Entrance(ICE_CAVERN_MQ_COMPASS_ROOM,      {[]{return IsAdult && BlueFire;}}),
-                  Entrance(ICE_CAVERN_MQ_IRON_BOOTS_REGION, {[]{return BlueFire;}}),
+                  Entrance(RR_ICE_CAVERN_ENTRYWAY,             {[]{return true;}}),
+                  Entrance(RR_ICE_CAVERN_MQ_MAP_ROOM,          {[]{return IsAdult || CanUse(RG_DINS_FIRE) || (HasExplosives && (CanUse(RG_STICKS) || CanUse(RG_FAIRY_SLINGSHOT) || KokiriSword));}}),
+                  Entrance(RR_ICE_CAVERN_MQ_COMPASS_ROOM,      {[]{return IsAdult && BlueFire;}}),
+                  Entrance(RR_ICE_CAVERN_MQ_IRON_BOOTS_REGION, {[]{return BlueFire;}}),
   });
 
-  areaTable[ICE_CAVERN_MQ_MAP_ROOM] = Area("Ice Cavern MQ Map Room", "Ice Cavern", ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_ICE_CAVERN_MQ_MAP_ROOM] = Area("Ice Cavern MQ Map Room", "Ice Cavern", RHT_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&BlueFireAccess,  {[]{return BlueFireAccess || HasBottle;}}),
   }, {
                   //Locations
-                  LocationAccess(ICE_CAVERN_MQ_MAP_CHEST, {[]{return BlueFire && (IsAdult || CanUse(STICKS) || KokiriSword || CanUseProjectile);}}),
+                  LocationAccess(RC_ICE_CAVERN_MQ_MAP_CHEST, {[]{return BlueFire && (IsAdult || CanUse(RG_STICKS) || KokiriSword || CanUseProjectile);}}),
   }, {});
 
-  areaTable[ICE_CAVERN_MQ_IRON_BOOTS_REGION] = Area("Ice Cavern MQ Iron Boots Region", "Ice Cavern", ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_ICE_CAVERN_MQ_IRON_BOOTS_REGION] = Area("Ice Cavern MQ Iron Boots Region", "Ice Cavern", RHT_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(ICE_CAVERN_MQ_IRON_BOOTS_CHEST, {[]{return IsAdult;}}),
-                  LocationAccess(SHEIK_IN_ICE_CAVERN,            {[]{return IsAdult;}}),
-                  LocationAccess(ICE_CAVERN_MQ_GS_ICE_BLOCK,     {[]{return IsAdult || CanUseProjectile;}}),
-                  LocationAccess(ICE_CAVERN_MQ_GS_SCARECROW,     {[]{return (CanUse(SCARECROW) || (HoverBoots && CanUse(LONGSHOT)) || LogicIceMQScarecrow) && IsAdult;}}),
-                    //Tricks: (CanUse(SCARECROW) || (HoverBoots && CanUse(LONGSHOT)) || LogicIceMQScarecrow) && IsAdult
+                  LocationAccess(RC_ICE_CAVERN_MQ_IRON_BOOTS_CHEST, {[]{return IsAdult;}}),
+                  LocationAccess(RC_SHEIK_IN_ICE_CAVERN,            {[]{return IsAdult;}}),
+                  LocationAccess(RC_ICE_CAVERN_MQ_GS_ICE_BLOCK,     {[]{return IsAdult || CanUseProjectile;}}),
+                  LocationAccess(RC_ICE_CAVERN_MQ_GS_SCARECROW,     {[]{return (CanUse(RG_SCARECROW) || (HoverBoots && CanUse(RG_LONGSHOT)) || LogicIceMQScarecrow) && IsAdult;}}),
+                    //Tricks: (CanUse(RG_SCARECROW) || (HoverBoots && CanUse(RG_LONGSHOT)) || LogicIceMQScarecrow) && IsAdult
   }, {});
 
-  areaTable[ICE_CAVERN_MQ_COMPASS_ROOM] = Area("Ice Cavern MQ Compass Room", "Ice Cavern", ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_ICE_CAVERN_MQ_COMPASS_ROOM] = Area("Ice Cavern MQ Compass Room", "Ice Cavern", RHT_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(ICE_CAVERN_MQ_COMPASS_CHEST,    {[]{return true;}}),
-                  LocationAccess(ICE_CAVERN_MQ_FREESTANDING_POH, {[]{return HasExplosives;}}),
-                  LocationAccess(ICE_CAVERN_MQ_GS_RED_ICE,       {[]{return CanPlay(SongOfTime) || LogicIceMQRedIceGS;}}),
+                  LocationAccess(RC_ICE_CAVERN_MQ_COMPASS_CHEST,    {[]{return true;}}),
+                  LocationAccess(RC_ICE_CAVERN_MQ_FREESTANDING_POH, {[]{return HasExplosives;}}),
+                  LocationAccess(RC_ICE_CAVERN_MQ_GS_RED_ICE,       {[]{return CanPlay(SongOfTime) || LogicIceMQRedIceGS;}}),
                     //Trick: CanPlay(SongOfTime) || LogicIceMQRedIceGS
   }, {});
   }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp
index d7b48d7f1..ed956f20c 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp
@@ -10,151 +10,151 @@ void AreaTable_Init_JabuJabusBelly() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[JABU_JABUS_BELLY_ENTRYWAY] = Area("Jabu Jabus Belly Entryway", "Jabu Jabus Belly", JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_ENTRYWAY] = Area("Jabu Jabus Belly Entryway", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(JABU_JABUS_BELLY_BEGINNING,    {[]{return Dungeon::JabuJabusBelly.IsVanilla();}}),
-                  Entrance(JABU_JABUS_BELLY_MQ_BEGINNING, {[]{return Dungeon::JabuJabusBelly.IsMQ();}}),
-                  Entrance(ZORAS_FOUNTAIN,                {[]{return true;}}),
+                  Entrance(RR_JABU_JABUS_BELLY_BEGINNING,    {[]{return Dungeon::JabuJabusBelly.IsVanilla();}}),
+                  Entrance(RR_JABU_JABUS_BELLY_MQ_BEGINNING, {[]{return Dungeon::JabuJabusBelly.IsMQ();}}),
+                  Entrance(RR_ZORAS_FOUNTAIN,                {[]{return true;}}),
   });
 
   /*--------------------------
   |     VANILLA DUNGEON      |
   ---------------------------*/
   if (Dungeon::JabuJabusBelly.IsVanilla()) {
-  areaTable[JABU_JABUS_BELLY_BEGINNING] = Area("Jabu Jabus Belly Beginning", "Jabu Jabus Belly", JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_BEGINNING] = Area("Jabu Jabus Belly Beginning", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(JABU_JABUS_BELLY_ENTRYWAY,    {[]{return true;}}),
-                  Entrance(JABU_JABUS_BELLY_LIFT_MIDDLE, {[]{return CanUseProjectile;}}),
+                  Entrance(RR_JABU_JABUS_BELLY_ENTRYWAY,    {[]{return true;}}),
+                  Entrance(RR_JABU_JABUS_BELLY_LIFT_MIDDLE, {[]{return CanUseProjectile;}}),
   });
 
-  areaTable[JABU_JABUS_BELLY_LIFT_MIDDLE] = Area("Jabu Jabus Belly Lift Middle", "Jabu Jabus Belly", JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_LIFT_MIDDLE] = Area("Jabu Jabus Belly Lift Middle", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(JABU_JABUS_BELLY_BEGINNING,      {[]{return true;}}),
-                  Entrance(JABU_JABUS_BELLY_MAIN_UPPER,     {[]{return true;}}),
-                  Entrance(JABU_JABUS_BELLY_LIFT_LOWER,     {[]{return true;}}),
-                  Entrance(JABU_JABUS_BELLY_NEAR_BOSS_ROOM, {[]{return HasAccessTo(JABU_JABUS_BELLY_LIFT_UPPER) || (LogicJabuBossHover && IsAdult && CanUse(HOVER_BOOTS));}}),
+                  Entrance(RR_JABU_JABUS_BELLY_BEGINNING,      {[]{return true;}}),
+                  Entrance(RR_JABU_JABUS_BELLY_MAIN_UPPER,     {[]{return true;}}),
+                  Entrance(RR_JABU_JABUS_BELLY_LIFT_LOWER,     {[]{return true;}}),
+                  Entrance(RR_JABU_JABUS_BELLY_NEAR_BOSS_ROOM, {[]{return HasAccessTo(RR_JABU_JABUS_BELLY_LIFT_UPPER) || (LogicJabuBossHover && IsAdult && CanUse(RG_HOVER_BOOTS));}}),
   });
 
-  areaTable[JABU_JABUS_BELLY_MAIN_UPPER] = Area("Jabu Jabus Belly Main Upper", "Jabu Jabus Belly", JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_MAIN_UPPER] = Area("Jabu Jabus Belly Main Upper", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(JABU_JABUS_BELLY_LIFT_MIDDLE,     {[]{return true;}}),
-                  Entrance(JABU_JABUS_BELLY_MAIN_LOWER,      {[]{return true;}}),
-                  Entrance(JABU_JABUS_BELLY_FORKED_CORRIDOR, {[]{return true;}}),
-                  Entrance(JABU_JABUS_BELLY_BIGOCTO_ROOM,    {[]{return Here(JABU_JABUS_BELLY_GREEN_TENTACLE, []{return CanUse(BOOMERANG);});}}),
+                  Entrance(RR_JABU_JABUS_BELLY_LIFT_MIDDLE,     {[]{return true;}}),
+                  Entrance(RR_JABU_JABUS_BELLY_MAIN_LOWER,      {[]{return true;}}),
+                  Entrance(RR_JABU_JABUS_BELLY_FORKED_CORRIDOR, {[]{return true;}}),
+                  Entrance(RR_JABU_JABUS_BELLY_BIGOCTO_ROOM,    {[]{return Here(RR_JABU_JABUS_BELLY_GREEN_TENTACLE, []{return CanUse(RG_BOOMERANG);});}}),
   });
 
-  areaTable[JABU_JABUS_BELLY_MAIN_LOWER] = Area("Jabu Jabus Belly Main Lower", "Jabu Jabus Belly", JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_MAIN_LOWER] = Area("Jabu Jabus Belly Main Lower", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER, {[]{return HookshotOrBoomerang;}}),
-                  LocationAccess(JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER, {[]{return HookshotOrBoomerang;}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER, {[]{return HookshotOrBoomerang;}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER, {[]{return HookshotOrBoomerang;}}),
                 }, {
                   //Exits
-                  Entrance(JABU_JABUS_BELLY_MAIN_UPPER,       {[]{return true;}}),
-                  Entrance(JABU_JABUS_BELLY_SHABOMB_CORRIDOR, {[]{return true;}}),
-                  Entrance(JABU_JABUS_BELLY_LOWER_SIDE_ROOM,  {[]{return true;}}),
+                  Entrance(RR_JABU_JABUS_BELLY_MAIN_UPPER,       {[]{return true;}}),
+                  Entrance(RR_JABU_JABUS_BELLY_SHABOMB_CORRIDOR, {[]{return true;}}),
+                  Entrance(RR_JABU_JABUS_BELLY_LOWER_SIDE_ROOM,  {[]{return true;}}),
   });
 
-  areaTable[JABU_JABUS_BELLY_SHABOMB_CORRIDOR] = Area("Jabu Jabus Belly Shabomb Corridor", "Jabu Jabus Belly", JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_JABU_JABUS_BELLY_SHABOMB_CORRIDOR] = Area("Jabu Jabus Belly Shabomb Corridor", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FairyPot, {[]{return true;}}),
                 }, {
                   //Locations
-                  LocationAccess(JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM, {[]{return true;}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(JABU_JABUS_BELLY_MAIN_LOWER, {[]{return true;}}),
-                  Entrance(JABU_JABUS_BELLY_LIFT_LOWER, {[]{return CanUseProjectile;}}),
+                  Entrance(RR_JABU_JABUS_BELLY_MAIN_LOWER, {[]{return true;}}),
+                  Entrance(RR_JABU_JABUS_BELLY_LIFT_LOWER, {[]{return CanUseProjectile;}}),
   });
 
-  areaTable[JABU_JABUS_BELLY_LOWER_SIDE_ROOM] = Area("Jabu Jabus Belly Lower Side Room", "Jabu Jabus Belly", JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_JABU_JABUS_BELLY_LOWER_SIDE_ROOM] = Area("Jabu Jabus Belly Lower Side Room", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&FairyPot, {[]{return FairyPot || (CanUse(BOOMERANG) || CanUse(HOVER_BOOTS));}}),
+                  EventAccess(&FairyPot, {[]{return FairyPot || (CanUse(RG_BOOMERANG) || CanUse(RG_HOVER_BOOTS));}}),
                 }, {}, {
                   //Exits
-                  Entrance(JABU_JABUS_BELLY_MAIN_LOWER, {[]{return true;}}),
+                  Entrance(RR_JABU_JABUS_BELLY_MAIN_LOWER, {[]{return true;}}),
   });
 
-  areaTable[JABU_JABUS_BELLY_LIFT_LOWER] = Area("Jabu Jabus Belly Lift Lower", "Jabu Jabus Belly", JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_LIFT_LOWER] = Area("Jabu Jabus Belly Lift Lower", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(JABU_JABUS_BELLY_DEKU_SCRUB, {[]{return (IsChild || CanDive || LogicJabuAlcoveJumpDive || CanUse(IRON_BOOTS)) && CanStunDeku;}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_DEKU_SCRUB, {[]{return (IsChild || CanDive || LogicJabuAlcoveJumpDive || CanUse(RG_IRON_BOOTS)) && CanStunDeku;}}),
                 }, {
                   //Exits
-                  Entrance(JABU_JABUS_BELLY_SHABOMB_CORRIDOR, {[]{return true;}}),
-                  Entrance(JABU_JABUS_BELLY_LIFT_MIDDLE,      {[]{return true;}}),
+                  Entrance(RR_JABU_JABUS_BELLY_SHABOMB_CORRIDOR, {[]{return true;}}),
+                  Entrance(RR_JABU_JABUS_BELLY_LIFT_MIDDLE,      {[]{return true;}}),
   });
 
-  areaTable[JABU_JABUS_BELLY_FORKED_CORRIDOR] = Area("Jabu Jabus Belly Forked Corridor", "Jabu Jabus Belly", JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_FORKED_CORRIDOR] = Area("Jabu Jabus Belly Forked Corridor", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(JABU_JABUS_BELLY_MAIN_UPPER,     {[]{return true;}}),
-                  Entrance(JABU_JABUS_BELLY_BOOMERANG_ROOM, {[]{return true;}}),
-                  Entrance(JABU_JABUS_BELLY_MAP_ROOM,       {[]{return true;}}),
-                  Entrance(JABU_JABUS_BELLY_COMPASS_ROOM,   {[]{return Here(JABU_JABUS_BELLY_MAP_ROOM,      []{return CanUse(BOOMERANG);});}}),
-                  Entrance(JABU_JABUS_BELLY_BLUE_TENTACLE,  {[]{return Here(JABU_JABUS_BELLY_MAP_ROOM,      []{return CanUse(BOOMERANG);});}}),
-                  Entrance(JABU_JABUS_BELLY_GREEN_TENTACLE, {[]{return Here(JABU_JABUS_BELLY_BLUE_TENTACLE, []{return CanUse(BOOMERANG);});}}),
+                  Entrance(RR_JABU_JABUS_BELLY_MAIN_UPPER,     {[]{return true;}}),
+                  Entrance(RR_JABU_JABUS_BELLY_BOOMERANG_ROOM, {[]{return true;}}),
+                  Entrance(RR_JABU_JABUS_BELLY_MAP_ROOM,       {[]{return true;}}),
+                  Entrance(RR_JABU_JABUS_BELLY_COMPASS_ROOM,   {[]{return Here(RR_JABU_JABUS_BELLY_MAP_ROOM,      []{return CanUse(RG_BOOMERANG);});}}),
+                  Entrance(RR_JABU_JABUS_BELLY_BLUE_TENTACLE,  {[]{return Here(RR_JABU_JABUS_BELLY_MAP_ROOM,      []{return CanUse(RG_BOOMERANG);});}}),
+                  Entrance(RR_JABU_JABUS_BELLY_GREEN_TENTACLE, {[]{return Here(RR_JABU_JABUS_BELLY_BLUE_TENTACLE, []{return CanUse(RG_BOOMERANG);});}}),
   });
 
-  areaTable[JABU_JABUS_BELLY_BOOMERANG_ROOM] = Area("Jabu Jabus Belly Boomerang Room", "Jabu Jabus Belly", JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_BOOMERANG_ROOM] = Area("Jabu Jabus Belly Boomerang Room", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(JABU_JABUS_BELLY_BOOMERANG_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_BOOMERANG_CHEST, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(JABU_JABUS_BELLY_FORKED_CORRIDOR, {[]{return true;}}),
+                  Entrance(RR_JABU_JABUS_BELLY_FORKED_CORRIDOR, {[]{return true;}}),
   });
 
-  areaTable[JABU_JABUS_BELLY_MAP_ROOM] = Area("Jabu Jabus Belly Map Room", "Jabu Jabus Belly", JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_MAP_ROOM] = Area("Jabu Jabus Belly Map Room", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(JABU_JABUS_BELLY_MAP_CHEST, {[]{return CanUse(BOOMERANG);}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_MAP_CHEST, {[]{return CanUse(RG_BOOMERANG);}}),
                 }, {
                   //Exits
-                  Entrance(JABU_JABUS_BELLY_FORKED_CORRIDOR, {[]{return true;}}),
+                  Entrance(RR_JABU_JABUS_BELLY_FORKED_CORRIDOR, {[]{return true;}}),
   });
 
-  areaTable[JABU_JABUS_BELLY_COMPASS_ROOM] = Area("Jabu Jabus Belly Compass Room", "Jabu Jabus Belly", JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_COMPASS_ROOM] = Area("Jabu Jabus Belly Compass Room", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(JABU_JABUS_BELLY_COMPASS_CHEST, {[]{return IsAdult || CanChildAttack;}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_COMPASS_CHEST, {[]{return IsAdult || CanChildAttack;}}),
                 }, {
                   //Exits
-                  Entrance(JABU_JABUS_BELLY_FORKED_CORRIDOR, {[]{return true;}}),
+                  Entrance(RR_JABU_JABUS_BELLY_FORKED_CORRIDOR, {[]{return true;}}),
   });
 
-  areaTable[JABU_JABUS_BELLY_BLUE_TENTACLE] = Area("Jabu Jabus Belly Blue Tentacle", "Jabu Jabus Belly", JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_BLUE_TENTACLE] = Area("Jabu Jabus Belly Blue Tentacle", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(JABU_JABUS_BELLY_FORKED_CORRIDOR, {[]{return Here(JABU_JABUS_BELLY_BLUE_TENTACLE, []{return CanUse(BOOMERANG);});}}),
+                  Entrance(RR_JABU_JABUS_BELLY_FORKED_CORRIDOR, {[]{return Here(RR_JABU_JABUS_BELLY_BLUE_TENTACLE, []{return CanUse(RG_BOOMERANG);});}}),
   });
 
-  areaTable[JABU_JABUS_BELLY_GREEN_TENTACLE] = Area("Jabu Jabus Belly Green Tentacle", "Jabu Jabus Belly", JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_GREEN_TENTACLE] = Area("Jabu Jabus Belly Green Tentacle", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(JABU_JABUS_BELLY_FORKED_CORRIDOR, {[]{return Here(JABU_JABUS_BELLY_GREEN_TENTACLE, []{return CanUse(BOOMERANG);});}}),
+                  Entrance(RR_JABU_JABUS_BELLY_FORKED_CORRIDOR, {[]{return Here(RR_JABU_JABUS_BELLY_GREEN_TENTACLE, []{return CanUse(RG_BOOMERANG);});}}),
   });
 
-  areaTable[JABU_JABUS_BELLY_BIGOCTO_ROOM] = Area("Jabu Jabus Belly Bigocto Room", "Jabu Jabus Belly", JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_BIGOCTO_ROOM] = Area("Jabu Jabus Belly Bigocto Room", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(JABU_JABUS_BELLY_MAIN_LOWER,    {[]{return true;}}),
-                  Entrance(JABU_JABUS_BELLY_ABOVE_BIGOCTO, {[]{return Here(JABU_JABUS_BELLY_BIGOCTO_ROOM, []{return (CanUse(BOOMERANG) || Nuts) && (CanUse(KOKIRI_SWORD) || CanUse(STICKS));});}}),
+                  Entrance(RR_JABU_JABUS_BELLY_MAIN_LOWER,    {[]{return true;}}),
+                  Entrance(RR_JABU_JABUS_BELLY_ABOVE_BIGOCTO, {[]{return Here(RR_JABU_JABUS_BELLY_BIGOCTO_ROOM, []{return (CanUse(RG_BOOMERANG) || Nuts) && (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_STICKS));});}}),
   });
 
-  areaTable[JABU_JABUS_BELLY_ABOVE_BIGOCTO] = Area("Jabu Jabus Belly Above Bigocto", "Jabu Jabus Belly", JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_JABU_JABUS_BELLY_ABOVE_BIGOCTO] = Area("Jabu Jabus Belly Above Bigocto", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FairyPot, {[]{return true;}}),
                   EventAccess(&NutPot,   {[]{return true;}}),
                 }, {}, {
                   //Exits
-                  Entrance(JABU_JABUS_BELLY_LIFT_UPPER, {[]{return CanUse(BOOMERANG);}}),
+                  Entrance(RR_JABU_JABUS_BELLY_LIFT_UPPER, {[]{return CanUse(RG_BOOMERANG);}}),
   });
 
-  areaTable[JABU_JABUS_BELLY_LIFT_UPPER] = Area("Jabu Jabus Belly Lift Upper", "Jabu Jabus Belly", JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_LIFT_UPPER] = Area("Jabu Jabus Belly Lift Upper", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(JABU_JABUS_BELLY_LIFT_MIDDLE, {[]{return true;}}),
-                  Entrance(JABU_JABUS_BELLY_LIFT_LOWER,  {[]{return true;}}),
+                  Entrance(RR_JABU_JABUS_BELLY_LIFT_MIDDLE, {[]{return true;}}),
+                  Entrance(RR_JABU_JABUS_BELLY_LIFT_LOWER,  {[]{return true;}}),
   });
 
-  areaTable[JABU_JABUS_BELLY_NEAR_BOSS_ROOM] = Area("Jabu Jabus Belly Near Boss Room", "Jabu Jabus Belly", JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_NEAR_BOSS_ROOM] = Area("Jabu Jabus Belly Near Boss Room", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(JABU_JABUS_BELLY_GS_NEAR_BOSS, {[]{return IsAdult || CanChildAttack;}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_GS_NEAR_BOSS, {[]{return IsAdult || CanChildAttack;}}),
                 }, {
                   //Exits
-                  Entrance(JABU_JABUS_BELLY_LIFT_MIDDLE, {[]{return true;}}),
-                  Entrance(JABU_JABUS_BELLY_BOSS_ENTRYWAY, {[]{return CanUse(BOOMERANG) || (LogicJabuNearBossRanged && ((IsAdult && (CanUse(HOOKSHOT) || CanUse(BOW))) || (IsChild && CanUse(SLINGSHOT)))) || (LogicJabuNearBossExplosives && (HasBombchus || (IsAdult && CanUse(HOVER_BOOTS) && Bombs)));}}),
+                  Entrance(RR_JABU_JABUS_BELLY_LIFT_MIDDLE, {[]{return true;}}),
+                  Entrance(RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY, {[]{return CanUse(RG_BOOMERANG) || (LogicJabuNearBossRanged && ((IsAdult && (CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_BOW))) || (IsChild && CanUse(RG_FAIRY_SLINGSHOT)))) || (LogicJabuNearBossExplosives && (HasBombchus || (IsAdult && CanUse(RG_HOVER_BOOTS) && Bombs)));}}),
   });
   }
 
@@ -162,88 +162,88 @@ void AreaTable_Init_JabuJabusBelly() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (Dungeon::JabuJabusBelly.IsMQ()) {
-  areaTable[JABU_JABUS_BELLY_MQ_BEGINNING] = Area("Jabu Jabus Belly MQ Beginning", "Jabu Jabus Belly", JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_JABU_JABUS_BELLY_MQ_BEGINNING] = Area("Jabu Jabus Belly MQ Beginning", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&NutPot, {[]{return true;}}),
   }, {
                   //Locations
-                  LocationAccess(JABU_JABUS_BELLY_MQ_MAP_CHEST,             {[]{return CanBlastOrSmash;}}),
-                  LocationAccess(JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST, {[]{return IsChild && CanUse(SLINGSHOT);}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_MAP_CHEST,             {[]{return CanBlastOrSmash;}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST, {[]{return IsChild && CanUse(RG_FAIRY_SLINGSHOT);}}),
   }, {
                   //Exits
-                  Entrance(JABU_JABUS_BELLY_ENTRYWAY, {[]{return true;}}),
-                  Entrance(JABU_JABUS_BELLY_MQ_MAIN,  {[]{return Here(JABU_JABUS_BELLY_MQ_BEGINNING, []{return IsChild && CanUse(SLINGSHOT);});}}),
+                  Entrance(RR_JABU_JABUS_BELLY_ENTRYWAY, {[]{return true;}}),
+                  Entrance(RR_JABU_JABUS_BELLY_MQ_MAIN,  {[]{return Here(RR_JABU_JABUS_BELLY_MQ_BEGINNING, []{return IsChild && CanUse(RG_FAIRY_SLINGSHOT);});}}),
   });
 
-  areaTable[JABU_JABUS_BELLY_MQ_MAIN] = Area("Jabu Jabus Belly MQ Main", "Jabu Jabus Belly", JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_MQ_MAIN] = Area("Jabu Jabus Belly MQ Main", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST,      {[]{return true;}}),
-                  LocationAccess(JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST,      {[]{return (IsAdult && (CanUse(HOVER_BOOTS) || CanUse(HOOKSHOT))) || ChildCanAccess(JABU_JABUS_BELLY_MQ_BOSS_AREA);}}),
-                  LocationAccess(JABU_JABUS_BELLY_MQ_COMPASS_CHEST,                {[]{return true;}}),
-                  LocationAccess(JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST,    {[]{return true;}}),
-                  LocationAccess(JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST, {[]{return true;}}),
-                  LocationAccess(JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST,   {[]{return true;}}),
-                  LocationAccess(JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST,              {[]{return true;}}),
-                  LocationAccess(JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM,      {[]{return CanPlay(SongOfTime) || (LogicJabuMQSoTGS && IsChild && CanUse(BOOMERANG));}}),
-                    //Trick: CanPlay(SongOfTime) || (LogicJabuMQSoTGS && IsChild && CanUse(BOOMERANG))
+                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST,      {[]{return true;}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST,      {[]{return (IsAdult && (CanUse(RG_HOVER_BOOTS) || CanUse(RG_HOOKSHOT))) || ChildCanAccess(RR_JABU_JABUS_BELLY_MQ_BOSS_AREA);}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_COMPASS_CHEST,                {[]{return true;}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST,    {[]{return true;}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST,   {[]{return true;}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST,              {[]{return true;}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM,      {[]{return CanPlay(SongOfTime) || (LogicJabuMQSoTGS && IsChild && CanUse(RG_BOOMERANG));}}),
+                    //Trick: CanPlay(SongOfTime) || (LogicJabuMQSoTGS && IsChild && CanUse(RG_BOOMERANG))
   }, {
                   //Exits
-                  Entrance(JABU_JABUS_BELLY_MQ_BEGINNING, {[]{return true;}}),
-                  Entrance(JABU_JABUS_BELLY_MQ_DEPTHS,    {[]{return HasExplosives && IsChild && CanUse(BOOMERANG);}}),
+                  Entrance(RR_JABU_JABUS_BELLY_MQ_BEGINNING, {[]{return true;}}),
+                  Entrance(RR_JABU_JABUS_BELLY_MQ_DEPTHS,    {[]{return HasExplosives && IsChild && CanUse(RG_BOOMERANG);}}),
   });
 
-  areaTable[JABU_JABUS_BELLY_MQ_DEPTHS] = Area("Jabu Jabus Belly MQ Depths", "Jabu Jabus Belly", JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_MQ_DEPTHS] = Area("Jabu Jabus Belly MQ Depths", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST, {[]{return true;}}),
-                  LocationAccess(JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM,          {[]{return Sticks || CanUse(DINS_FIRE);}}),
-                  LocationAccess(JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM,    {[]{return (LogicLensJabuMQ || CanUse(LENS_OF_TRUTH)) || Here(JABU_JABUS_BELLY_MQ_MAIN, []{return IsAdult && CanUse(HOVER_BOOTS) && CanUse(HOOKSHOT);});}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM,          {[]{return Sticks || CanUse(RG_DINS_FIRE);}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM,    {[]{return (LogicLensJabuMQ || CanUse(RG_LENS_OF_TRUTH)) || Here(RR_JABU_JABUS_BELLY_MQ_MAIN, []{return IsAdult && CanUse(RG_HOVER_BOOTS) && CanUse(RG_HOOKSHOT);});}}),
   }, {
                   //Exits
-                  Entrance(JABU_JABUS_BELLY_MQ_MAIN,      {[]{return true;}}),
-                  Entrance(JABU_JABUS_BELLY_MQ_BOSS_AREA, {[]{return Sticks || (CanUse(DINS_FIRE) && KokiriSword);}}),
+                  Entrance(RR_JABU_JABUS_BELLY_MQ_MAIN,      {[]{return true;}}),
+                  Entrance(RR_JABU_JABUS_BELLY_MQ_BOSS_AREA, {[]{return Sticks || (CanUse(RG_DINS_FIRE) && KokiriSword);}}),
   });
 
-  areaTable[JABU_JABUS_BELLY_MQ_BOSS_AREA] = Area("Jabu Jabus Belly MQ Boss Area", "Jabu Jabus Belly", JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_JABU_JABUS_BELLY_MQ_BOSS_AREA] = Area("Jabu Jabus Belly MQ Boss Area", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FairyPot, {[]{return true;}}),
   }, {
                   //Locations
-                  LocationAccess(JABU_JABUS_BELLY_MQ_COW,             {[]{return CanPlay(EponasSong);}}),
-                  LocationAccess(JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST, {[]{return true;}}),
-                  LocationAccess(JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS,    {[]{return true;}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_COW,             {[]{return CanPlay(EponasSong);}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS,    {[]{return true;}}),
   }, {
                   //Exits
-                  Entrance(JABU_JABUS_BELLY_MQ_MAIN, {[]{return true;}}),
-                  Entrance(JABU_JABUS_BELLY_BOSS_ENTRYWAY, {[]{return CanUse(SLINGSHOT);}}),
+                  Entrance(RR_JABU_JABUS_BELLY_MQ_MAIN, {[]{return true;}}),
+                  Entrance(RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY, {[]{return CanUse(RG_FAIRY_SLINGSHOT);}}),
   });
   }
 
     /*---------------------------
     |         BOSS ROOM         |
     ---------------------------*/
-    areaTable[JABU_JABUS_BELLY_BOSS_ENTRYWAY] =
-        Area("Jabu Jabus Belly Boss Entryway", "Jabu Jabus Belly", JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {},
+    areaTable[RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY] =
+        Area("Jabu Jabus Belly Boss Entryway", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {},
              {
                  // Exits
-                 Entrance(JABU_JABUS_BELLY_NEAR_BOSS_ROOM, { [] { return Dungeon::JabuJabusBelly.IsVanilla(); } }),
-                 Entrance(JABU_JABUS_BELLY_MQ_BOSS_AREA, { [] { return Dungeon::JabuJabusBelly.IsMQ(); } }),
-                 Entrance(JABU_JABUS_BELLY_BOSS_ROOM, { [] { return true; } }),
+                 Entrance(RR_JABU_JABUS_BELLY_NEAR_BOSS_ROOM, { [] { return Dungeon::JabuJabusBelly.IsVanilla(); } }),
+                 Entrance(RR_JABU_JABUS_BELLY_MQ_BOSS_AREA, { [] { return Dungeon::JabuJabusBelly.IsMQ(); } }),
+                 Entrance(RR_JABU_JABUS_BELLY_BOSS_ROOM, { [] { return true; } }),
              });
 
-    areaTable[JABU_JABUS_BELLY_BOSS_ROOM] =
-        Area("Jabu Jabus Belly Boss Room", "Jabu Jabus Belly", NONE, NO_DAY_NIGHT_CYCLE,
+    areaTable[RR_JABU_JABUS_BELLY_BOSS_ROOM] =
+        Area("Jabu Jabus Belly Boss Room", "Jabu Jabus Belly", RHT_NONE, NO_DAY_NIGHT_CYCLE,
              {
                  // Events //todo: add pot kill trick
                  EventAccess(&JabuJabusBellyClear,
-                             { [] { return JabuJabusBellyClear || (CanUse(BOOMERANG) && CanJumpslash); } }),
+                             { [] { return JabuJabusBellyClear || (CanUse(RG_BOOMERANG) && CanJumpslash); } }),
              },
              {
                  // Locations
-                 LocationAccess(JABU_JABUS_BELLY_BARINADE_HEART, { [] { return JabuJabusBellyClear; } }),
-                 LocationAccess(BARINADE, { [] { return JabuJabusBellyClear; } }),
+                 LocationAccess(RC_JABU_JABUS_BELLY_BARINADE_HEART, { [] { return JabuJabusBellyClear; } }),
+                 LocationAccess(RC_BARINADE, { [] { return JabuJabusBellyClear; } }),
              },
              {
                  // Exits
-                 Entrance(JABU_JABUS_BELLY_BOSS_ENTRYWAY, { [] { return false; } }),
+                 Entrance(RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY, { [] { return false; } }),
              });
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
index db9bb69dc..0c4dd31fc 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
@@ -6,281 +6,287 @@ using namespace Logic;
 using namespace Settings;
 
 void AreaTable_Init_Kakariko() {
-  areaTable[KAKARIKO_VILLAGE] = Area("Kakariko Village", "Kakariko Village", KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_KAKARIKO_VILLAGE] = Area("Kakariko Village", "Kakariko Village", RHT_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&CojiroAccess,            {[]{return CojiroAccess || (IsAdult && WakeUpAdultTalon);}}),
                   EventAccess(&BugRock,                 {[]{return true;}}),
                   EventAccess(&KakarikoVillageGateOpen, {[]{return KakarikoVillageGateOpen || (IsChild && (ZeldasLetter || OpenKakariko.Is(OPENKAKARIKO_OPEN)));}}),
                 }, {
                   //Locations
-                  LocationAccess(SHEIK_IN_KAKARIKO,               {[]{return IsAdult && ForestMedallion && FireMedallion && WaterMedallion;}}),
-                  LocationAccess(KAK_ANJU_AS_CHILD,               {[]{return IsChild && AtDay;}}),
-                  LocationAccess(KAK_ANJU_AS_ADULT,               {[]{return IsAdult && AtDay;}}),
-                  LocationAccess(KAK_TRADE_POCKET_CUCCO,          {[]{return IsAdult && AtDay && PocketEgg && WakeUpAdultTalon;}}),
-                  LocationAccess(KAK_GS_HOUSE_UNDER_CONSTRUCTION, {[]{return IsChild && AtNight && CanGetNightTimeGS;}}),
-                  LocationAccess(KAK_GS_SKULLTULA_HOUSE,          {[]{return IsChild && AtNight && CanGetNightTimeGS;}}),
-                  LocationAccess(KAK_GS_GUARDS_HOUSE,             {[]{return IsChild && AtNight && CanGetNightTimeGS;}}),
-                  LocationAccess(KAK_GS_TREE,                     {[]{return IsChild && AtNight && CanGetNightTimeGS;}}),
-                  LocationAccess(KAK_GS_WATCHTOWER,               {[]{return IsChild && (Slingshot || HasBombchus || CanUse(BOW) || CanUse(LONGSHOT) || (LogicKakarikoTowerGS && CanJumpslash)) && AtNight && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_SHEIK_IN_KAKARIKO,               {[]{return IsAdult && ForestMedallion && FireMedallion && WaterMedallion;}}),
+                  LocationAccess(RC_KAK_ANJU_AS_CHILD,               {[]{return IsChild && AtDay;}}),
+                  LocationAccess(RC_KAK_ANJU_AS_ADULT,               {[]{return IsAdult && AtDay;}}),
+                  LocationAccess(RC_KAK_TRADE_POCKET_CUCCO,          {[]{return IsAdult && AtDay && PocketEgg && WakeUpAdultTalon;}}),
+                  LocationAccess(RC_KAK_GS_HOUSE_UNDER_CONSTRUCTION, {[]{return IsChild && AtNight && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_KAK_GS_SKULLTULA_HOUSE,          {[]{return IsChild && AtNight && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_KAK_GS_GUARDS_HOUSE,             {[]{return IsChild && AtNight && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_KAK_GS_TREE,                     {[]{return IsChild && AtNight && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_KAK_GS_WATCHTOWER,               {[]{return IsChild && (Slingshot || HasBombchus || CanUse(RG_FAIRY_BOW) || CanUse(RG_LONGSHOT) || (LogicKakarikoTowerGS && CanJumpslash)) && AtNight && CanGetNightTimeGS;}}),
                 }, {
                   //Exits
-                  Entrance(HYRULE_FIELD,                {[]{return true;}}),
-                  Entrance(KAK_CARPENTER_BOSS_HOUSE,    {[]{return true;}}),
-                  Entrance(KAK_HOUSE_OF_SKULLTULA,      {[]{return true;}}),
-                  Entrance(KAK_IMPAS_HOUSE,             {[]{return true;}}),
-                  Entrance(KAK_WINDMILL,                {[]{return true;}}),
-                  Entrance(KAK_BAZAAR,                  {[]{return IsAdult && AtDay;}}),
-                  Entrance(KAK_SHOOTING_GALLERY,        {[]{return IsAdult && AtDay;}}),
-                  Entrance(BOTTOM_OF_THE_WELL_ENTRYWAY, {[]{return DrainWell && (IsChild || ShuffleDungeonEntrances.IsNot(SHUFFLEDUNGEONS_OFF));}}),
-                  Entrance(KAK_POTION_SHOP_FRONT,       {[]{return AtDay || IsChild;}}),
-                  Entrance(KAK_REDEAD_GROTTO,           {[]{return CanOpenBombGrotto;}}),
-                  Entrance(KAK_IMPAS_LEDGE,             {[]{return (IsChild && AtDay) || CanUse(HOOKSHOT) || (IsAdult && LogicVisibleCollision);}}),
-                  Entrance(KAK_ROOFTOP,                 {[]{return CanUse(HOOKSHOT) || (LogicManOnRoof && (IsAdult || AtDay || Slingshot || HasBombchus || CanUse(BOW) || CanUse(LONGSHOT)));}}),
-                  Entrance(KAK_IMPAS_ROOFTOP,           {[]{return CanUse(HOOKSHOT) || (LogicKakarikoRooftopGS && CanUse(HOVER_BOOTS));}}),
-                  Entrance(THE_GRAVEYARD,               {[]{return true;}}),
-                  Entrance(KAK_BEHIND_GATE,             {[]{return IsAdult || (KakarikoVillageGateOpen);}}),
+                  Entrance(RR_HYRULE_FIELD,                {[]{return true;}}),
+                  Entrance(RR_KAK_CARPENTER_BOSS_HOUSE,    {[]{return true;}}),
+                  Entrance(RR_KAK_HOUSE_OF_SKULLTULA,      {[]{return true;}}),
+                  Entrance(RR_KAK_IMPAS_HOUSE,             {[]{return true;}}),
+                  Entrance(RR_KAK_WINDMILL,                {[]{return true;}}),
+                  Entrance(RR_KAK_BAZAAR,                  {[]{return IsAdult && AtDay;}}),
+                  Entrance(RR_KAK_SHOOTING_GALLERY,        {[]{return IsAdult && AtDay;}}),
+                  Entrance(RR_BOTTOM_OF_THE_WELL_ENTRYWAY, {[]{return DrainWell && (IsChild || ShuffleDungeonEntrances.IsNot(SHUFFLEDUNGEONS_OFF));}}),
+                  Entrance(RR_KAK_POTION_SHOP_FRONT,       {[]{return AtDay || IsChild;}}),
+                  Entrance(RR_KAK_REDEAD_GROTTO,           {[]{return CanOpenBombGrotto;}}),
+                  Entrance(RR_KAK_IMPAS_LEDGE,             {[]{return (IsChild && AtDay) || CanUse(RG_HOOKSHOT) || (IsAdult && LogicVisibleCollision);}}),
+                  Entrance(RR_KAK_ROOFTOP,                 {[]{return CanUse(RG_HOOKSHOT) || (LogicManOnRoof && (IsAdult || AtDay || Slingshot || HasBombchus || CanUse(RG_FAIRY_BOW) || CanUse(RG_LONGSHOT)));}}),
+                  Entrance(RR_KAK_IMPAS_ROOFTOP,           {[]{return CanUse(RG_HOOKSHOT) || (LogicKakarikoRooftopGS && CanUse(RG_HOVER_BOOTS));}}),
+                  Entrance(RR_THE_GRAVEYARD,               {[]{return true;}}),
+                  Entrance(RR_KAK_BEHIND_GATE,             {[]{return IsAdult || (KakarikoVillageGateOpen);}}),
   });
 
-  areaTable[KAK_IMPAS_LEDGE] = Area("Kak Impas Ledge", "Kakariko Village", KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_KAK_IMPAS_LEDGE] = Area("Kak Impas Ledge", "Kakariko Village", RHT_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(KAK_IMPAS_HOUSE_BACK, {[]{return true;}}),
-                  Entrance(KAKARIKO_VILLAGE,     {[]{return true;}}),
+                  Entrance(RR_KAK_IMPAS_HOUSE_BACK, {[]{return true;}}),
+                  Entrance(RR_KAKARIKO_VILLAGE,     {[]{return true;}}),
   });
 
-  areaTable[KAK_IMPAS_ROOFTOP] = Area("Kak Impas Rooftop", "Kakariko Village", KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KAK_IMPAS_ROOFTOP] = Area("Kak Impas Rooftop", "Kakariko Village", RHT_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(KAK_GS_ABOVE_IMPAS_HOUSE, {[]{return IsAdult && AtNight && CanGetNightTimeGS && (CanJumpslash || CanUseProjectile);}}),
+                  LocationAccess(RC_KAK_GS_ABOVE_IMPAS_HOUSE, {[]{return IsAdult && AtNight && CanGetNightTimeGS && (CanJumpslash || CanUseProjectile);}}),
                 }, {
                   //Exits
-                  Entrance(KAK_IMPAS_LEDGE,  {[]{return true;}}),
-                  Entrance(KAKARIKO_VILLAGE, {[]{return true;}}),
+                  Entrance(RR_KAK_IMPAS_LEDGE,  {[]{return true;}}),
+                  Entrance(RR_KAKARIKO_VILLAGE, {[]{return true;}}),
   });
 
-  areaTable[KAK_ROOFTOP] = Area("Kak Rooftop", "Kakariko Village", KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KAK_ROOFTOP] = Area("Kak Rooftop", "Kakariko Village", RHT_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(KAK_MAN_ON_ROOF, {[]{return true;}}),
+                  LocationAccess(RC_KAK_MAN_ON_ROOF, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(KAK_BACKYARD, {[]{return true;}}),
+                  Entrance(RR_KAK_BACKYARD, {[]{return true;}}),
   });
 
-  areaTable[KAK_BACKYARD] = Area("Kak Backyard", "Kakariko Village", KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_KAK_BACKYARD] = Area("Kak Backyard", "Kakariko Village", RHT_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(KAKARIKO_VILLAGE,          {[]{return true;}}),
-                  Entrance(KAK_OPEN_GROTTO,           {[]{return true;}}),
-                  Entrance(KAK_ODD_POTION_BUILDING, {[]{return IsAdult;}}),
-                  Entrance(KAK_POTION_SHOP_BACK,      {[]{return IsAdult && AtDay;}}),
+                  Entrance(RR_KAKARIKO_VILLAGE,          {[]{return true;}}),
+                  Entrance(RR_KAK_OPEN_GROTTO,           {[]{return true;}}),
+                  Entrance(RR_KAK_ODD_POTION_BUILDING, {[]{return IsAdult;}}),
+                  Entrance(RR_KAK_POTION_SHOP_BACK,      {[]{return IsAdult && AtDay;}}),
   });
 
-  areaTable[KAK_CARPENTER_BOSS_HOUSE] = Area("Kak Carpenter Boss House", "Kak Carpenter Boss House", NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_KAK_CARPENTER_BOSS_HOUSE] = Area("Kak Carpenter Boss House", "Kak Carpenter Boss House", RHT_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&WakeUpAdultTalon, {[]{return WakeUpAdultTalon || (IsAdult && PocketEgg);}}),
                 }, {}, {
                   //Exits
-                  Entrance(KAKARIKO_VILLAGE, {[]{return true;}}),
+                  Entrance(RR_KAKARIKO_VILLAGE, {[]{return true;}}),
   });
 
-  areaTable[KAK_HOUSE_OF_SKULLTULA] = Area("Kak House of Skulltula", "Kak House of Skulltula", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KAK_HOUSE_OF_SKULLTULA] = Area("Kak House of Skulltula", "Kak House of Skulltula", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(KAK_10_GOLD_SKULLTULA_REWARD, {[]{return GoldSkulltulaTokens >= 10;}}),
-                  LocationAccess(KAK_20_GOLD_SKULLTULA_REWARD, {[]{return GoldSkulltulaTokens >= 20;}}),
-                  LocationAccess(KAK_30_GOLD_SKULLTULA_REWARD, {[]{return GoldSkulltulaTokens >= 30;}}),
-                  LocationAccess(KAK_40_GOLD_SKULLTULA_REWARD, {[]{return GoldSkulltulaTokens >= 40;}}),
-                  LocationAccess(KAK_50_GOLD_SKULLTULA_REWARD, {[]{return GoldSkulltulaTokens >= 50;}}),
-                  LocationAccess(KAK_100_GOLD_SKULLTULA_REWARD, {[]{return GoldSkulltulaTokens >= 100;}})
+                  LocationAccess(RC_KAK_10_GOLD_SKULLTULA_REWARD, {[]{return GoldSkulltulaTokens >= 10;}}),
+                  LocationAccess(RC_KAK_20_GOLD_SKULLTULA_REWARD, {[]{return GoldSkulltulaTokens >= 20;}}),
+                  LocationAccess(RC_KAK_30_GOLD_SKULLTULA_REWARD, {[]{return GoldSkulltulaTokens >= 30;}}),
+                  LocationAccess(RC_KAK_40_GOLD_SKULLTULA_REWARD, {[]{return GoldSkulltulaTokens >= 40;}}),
+                  LocationAccess(RC_KAK_50_GOLD_SKULLTULA_REWARD, {[]{return GoldSkulltulaTokens >= 50;}}),
+                  LocationAccess(RC_KAK_100_GOLD_SKULLTULA_REWARD, {[]{return GoldSkulltulaTokens >= 100;}})
                 }, {
                   //Exits
-                  Entrance(KAKARIKO_VILLAGE, {[]{return true;}}),
+                  Entrance(RR_KAKARIKO_VILLAGE, {[]{return true;}}),
   });
 
-  areaTable[KAK_IMPAS_HOUSE] = Area("Kak Impas House", "Kak Impas House", NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_KAK_IMPAS_HOUSE] = Area("Kak Impas House", "Kak Impas House", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(KAK_IMPAS_HOUSE_NEAR_COW, {[]{return true;}}),
-                  Entrance(KAKARIKO_VILLAGE,         {[]{return true;}}),
+                  Entrance(RR_KAK_IMPAS_HOUSE_NEAR_COW, {[]{return true;}}),
+                  Entrance(RR_KAKARIKO_VILLAGE,         {[]{return true;}}),
   });
 
-  areaTable[KAK_IMPAS_HOUSE_BACK] = Area("Kak Impas House Back", "Kak Impas House", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KAK_IMPAS_HOUSE_BACK] = Area("Kak Impas House Back", "Kak Impas House", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(KAK_IMPAS_HOUSE_FREESTANDING_POH, {[]{return true;}}),
+                  LocationAccess(RC_KAK_IMPAS_HOUSE_FREESTANDING_POH, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(KAK_IMPAS_LEDGE,          {[]{return true;}}),
-                  Entrance(KAK_IMPAS_HOUSE_NEAR_COW, {[]{return true;}}),
+                  Entrance(RR_KAK_IMPAS_LEDGE,          {[]{return true;}}),
+                  Entrance(RR_KAK_IMPAS_HOUSE_NEAR_COW, {[]{return true;}}),
   });
 
-  areaTable[KAK_IMPAS_HOUSE_NEAR_COW] = Area("Kak Impas House Near Cow", "Kak Impas House", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KAK_IMPAS_HOUSE_NEAR_COW] = Area("Kak Impas House Near Cow", "Kak Impas House", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(KAK_IMPAS_HOUSE_COW, {[]{return CanPlay(EponasSong);}}),
+                  LocationAccess(RC_KAK_IMPAS_HOUSE_COW, {[]{return CanPlay(EponasSong);}}),
   }, {});
 
-  areaTable[KAK_WINDMILL] = Area("Kak Windmill", "Windmill and Dampes Grave", NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_KAK_WINDMILL] = Area("Kak Windmill", "Windmill and Dampes Grave", RHT_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&DrainWell, {[]{return DrainWell || (IsChild && CanPlay(SongOfStorms));}}),
                 }, {
                   //Locations
-                  LocationAccess(KAK_WINDMILL_FREESTANDING_POH, {[]{return CanUse(BOOMERANG) || DampesWindmillAccess || (IsAdult && LogicAdultWindmillPoH) || (IsChild && CanJumpslash && LogicChildWindmillPoH);}}),
+                  LocationAccess(RC_KAK_WINDMILL_FREESTANDING_POH, {[]{return CanUse(RG_BOOMERANG) || DampesWindmillAccess || (IsAdult && LogicAdultWindmillPoH) || (IsChild && CanJumpslash && LogicChildWindmillPoH);}}),
                     //PoH as child not added to trick options yet (needs uncommenting in randomizer_tricks.cpp)
-                  LocationAccess(SONG_FROM_WINDMILL,            {[]{return IsAdult && Ocarina;}}),
+                  LocationAccess(RC_SONG_FROM_WINDMILL,            {[]{return IsAdult && Ocarina;}}),
                 }, {
                   //Exits
-                  Entrance(KAKARIKO_VILLAGE, {[]{return true;}}),
+                  Entrance(RR_KAKARIKO_VILLAGE, {[]{return true;}}),
   });
 
-  areaTable[KAK_BAZAAR] = Area("Kak Bazaar", "Kak Bazaar", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KAK_BAZAAR] = Area("Kak Bazaar", "Kak Bazaar", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(KAK_BAZAAR_ITEM_1, {[]{return true;}}),
-                  LocationAccess(KAK_BAZAAR_ITEM_2, {[]{return true;}}),
-                  LocationAccess(KAK_BAZAAR_ITEM_3, {[]{return true;}}),
-                  LocationAccess(KAK_BAZAAR_ITEM_4, {[]{return true;}}),
-                  LocationAccess(KAK_BAZAAR_ITEM_5, {[]{return true;}}),
-                  LocationAccess(KAK_BAZAAR_ITEM_6, {[]{return true;}}),
-                  LocationAccess(KAK_BAZAAR_ITEM_7, {[]{return true;}}),
-                  LocationAccess(KAK_BAZAAR_ITEM_8, {[]{return true;}}),
+                  LocationAccess(RC_KAK_BAZAAR_ITEM_1, {[]{return true;}}),
+                  LocationAccess(RC_KAK_BAZAAR_ITEM_2, {[]{return true;}}),
+                  LocationAccess(RC_KAK_BAZAAR_ITEM_3, {[]{return true;}}),
+                  LocationAccess(RC_KAK_BAZAAR_ITEM_4, {[]{return true;}}),
+                  LocationAccess(RC_KAK_BAZAAR_ITEM_5, {[]{return true;}}),
+                  LocationAccess(RC_KAK_BAZAAR_ITEM_6, {[]{return true;}}),
+                  LocationAccess(RC_KAK_BAZAAR_ITEM_7, {[]{return true;}}),
+                  LocationAccess(RC_KAK_BAZAAR_ITEM_8, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(KAKARIKO_VILLAGE, {[]{return true;}}),
+                  Entrance(RR_KAKARIKO_VILLAGE, {[]{return true;}}),
   });
 
-  areaTable[KAK_SHOOTING_GALLERY] = Area("Kak Shooting Gallery", "Kak Shooting Gallery", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KAK_SHOOTING_GALLERY] = Area("Kak Shooting Gallery", "Kak Shooting Gallery", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(KAK_SHOOTING_GALLERY_REWARD, {[]{return IsAdult && Bow;}}),
+                  LocationAccess(RC_KAK_SHOOTING_GALLERY_REWARD, {[]{return IsAdult && Bow;}}),
                 }, {
                   //Exits
-                  Entrance(KAKARIKO_VILLAGE, {[]{return true;}}),
+                  Entrance(RR_KAKARIKO_VILLAGE, {[]{return true;}}),
   });
 
-  areaTable[KAK_POTION_SHOP_FRONT] = Area("Kak Potion Shop Front", "Kak Potion Shop", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KAK_POTION_SHOP_FRONT] = Area("Kak Potion Shop Front", "Kak Potion Shop", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(KAK_POTION_SHOP_ITEM_1, {[]{return IsAdult;}}),
-                  LocationAccess(KAK_POTION_SHOP_ITEM_2, {[]{return IsAdult;}}),
-                  LocationAccess(KAK_POTION_SHOP_ITEM_3, {[]{return IsAdult;}}),
-                  LocationAccess(KAK_POTION_SHOP_ITEM_4, {[]{return IsAdult;}}),
-                  LocationAccess(KAK_POTION_SHOP_ITEM_5, {[]{return IsAdult;}}),
-                  LocationAccess(KAK_POTION_SHOP_ITEM_6, {[]{return IsAdult;}}),
-                  LocationAccess(KAK_POTION_SHOP_ITEM_7, {[]{return IsAdult;}}),
-                  LocationAccess(KAK_POTION_SHOP_ITEM_8, {[]{return IsAdult;}}),
+                  LocationAccess(RC_KAK_POTION_SHOP_ITEM_1, {[]{return IsAdult;}}),
+                  LocationAccess(RC_KAK_POTION_SHOP_ITEM_2, {[]{return IsAdult;}}),
+                  LocationAccess(RC_KAK_POTION_SHOP_ITEM_3, {[]{return IsAdult;}}),
+                  LocationAccess(RC_KAK_POTION_SHOP_ITEM_4, {[]{return IsAdult;}}),
+                  LocationAccess(RC_KAK_POTION_SHOP_ITEM_5, {[]{return IsAdult;}}),
+                  LocationAccess(RC_KAK_POTION_SHOP_ITEM_6, {[]{return IsAdult;}}),
+                  LocationAccess(RC_KAK_POTION_SHOP_ITEM_7, {[]{return IsAdult;}}),
+                  LocationAccess(RC_KAK_POTION_SHOP_ITEM_8, {[]{return IsAdult;}}),
                 }, {
                   //Exits
-                  Entrance(KAKARIKO_VILLAGE,     {[]{return true;}}),
-                  Entrance(KAK_POTION_SHOP_BACK, {[]{return IsAdult;}}),
+                  Entrance(RR_KAKARIKO_VILLAGE,     {[]{return true;}}),
+                  Entrance(RR_KAK_POTION_SHOP_BACK, {[]{return IsAdult;}}),
   });
 
-  areaTable[KAK_POTION_SHOP_BACK] = Area("Kak Potion Shop Back", "Kak Potion Shop", NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_KAK_POTION_SHOP_BACK] = Area("Kak Potion Shop Back", "Kak Potion Shop", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(KAK_BACKYARD,          {[]{return IsAdult;}}),
-                  Entrance(KAK_POTION_SHOP_FRONT, {[]{return true;}}),
+                  Entrance(RR_KAK_BACKYARD,          {[]{return IsAdult;}}),
+                  Entrance(RR_KAK_POTION_SHOP_FRONT, {[]{return true;}}),
   });
 
-  areaTable[KAK_ODD_POTION_BUILDING] = Area("Kak Granny's Potion Shop", "Kak Granny's Potion Shop", NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_KAK_ODD_POTION_BUILDING] =
+      Area("Kak Granny's Potion Shop", "Kak Granny's Potion Shop", RHT_NONE, NO_DAY_NIGHT_CYCLE, {
+          
+               // Events
+               EventAccess(&OddPoulticeAccess, { [] {
+                   return OddPoulticeAccess || (IsAdult && (OddMushroomAccess || (OddMushroom && DisableTradeRevert)));
+               } }),
+           },
+           {
+               LocationAccess(RC_KAK_TRADE_ODD_MUSHROOM, { [] { return IsAdult && OddMushroom; } }),
+               LocationAccess(RC_KAK_GRANNYS_SHOP, { [] { return IsAdult && OddMushroom && AdultsWallet; } }),
+           },
+           {
+               // Exits
+               Entrance(RR_KAK_BACKYARD, { [] { return true; } }),
+           });
+
+  areaTable[RR_KAK_REDEAD_GROTTO] = Area("Kak Redead Grotto", "Kak Redead Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+                  //Locations
+                  LocationAccess(RC_KAK_REDEAD_GROTTO_CHEST, {[]{return IsAdult || (Sticks || KokiriSword || CanUse(RG_DINS_FIRE) || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD));}}),
+                }, {
+                  //Exits
+                  Entrance(RR_KAKARIKO_VILLAGE, {[]{return true;}}),
+  });
+
+  areaTable[RR_KAK_OPEN_GROTTO] = Area("Kak Open Grotto", "Kak Open Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+                  //Locations
+                  LocationAccess(RC_KAK_OPEN_GROTTO_CHEST,        {[]{return true;}}),
+                  LocationAccess(RC_KAK_OPEN_GROTTO_GOSSIP_STONE, {[]{return true;}}),
+                }, {
+                  //Exits
+                  Entrance(RR_KAK_BACKYARD, {[]{return true;}}),
+  });
+
+  areaTable[RR_THE_GRAVEYARD] = Area("The Graveyard", "The Graveyard", RHT_THE_GRAVEYARD, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&OddPoulticeAccess, {[]{return OddPoulticeAccess || (IsAdult && (OddMushroomAccess || (OddMushroom && DisableTradeRevert)));}}),
-                }, {
-                  LocationAccess(KAK_TRADE_ODD_MUSHROOM, {[]{return IsAdult && OddMushroom;}}),
-                  LocationAccess(KAK_GRANNYS_SHOP, {[]{return IsAdult && OddMushroom && AdultsWallet;}}),
-                }, {
-                  //Exits
-                  Entrance(KAK_BACKYARD, {[]{return true;}}),
-  });
-
-  areaTable[KAK_REDEAD_GROTTO] = Area("Kak Redead Grotto", "Kak Redead Grotto", NONE, NO_DAY_NIGHT_CYCLE, {}, {
-                  //Locations
-                  LocationAccess(KAK_REDEAD_GROTTO_CHEST, {[]{return IsAdult || (Sticks || KokiriSword || CanUse(DINS_FIRE) || CanUse(MEGATON_HAMMER) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD));}}),
-                }, {
-                  //Exits
-                  Entrance(KAKARIKO_VILLAGE, {[]{return true;}}),
-  });
-
-  areaTable[KAK_OPEN_GROTTO] = Area("Kak Open Grotto", "Kak Open Grotto", NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
-                  //Locations
-                  LocationAccess(KAK_OPEN_GROTTO_CHEST,        {[]{return true;}}),
-                  LocationAccess(KAK_OPEN_GROTTO_GOSSIP_STONE, {[]{return true;}}),
-                }, {
-                  //Exits
-                  Entrance(KAK_BACKYARD, {[]{return true;}}),
-  });
-
-  areaTable[THE_GRAVEYARD] = Area("The Graveyard", "The Graveyard", THE_GRAVEYARD, NO_DAY_NIGHT_CYCLE, {
-                  //Events
-                  EventAccess(&ButterflyFairy, {[]{return ButterflyFairy || (CanUse(STICKS) && AtDay);}}),
-                  EventAccess(&BeanPlantFairy, {[]{return BeanPlantFairy || (CanPlantBean(THE_GRAVEYARD) && CanPlay(SongOfStorms));}}),
+                  EventAccess(&ButterflyFairy, {[]{return ButterflyFairy || (CanUse(RG_STICKS) && AtDay);}}),
+                  EventAccess(&BeanPlantFairy, {[]{return BeanPlantFairy || (CanPlantBean(RR_THE_GRAVEYARD) && CanPlay(SongOfStorms));}}),
                   EventAccess(&BugRock,        {[]{return true;}}),
                 }, {
                   //Locations
-                  LocationAccess(GRAVEYARD_FREESTANDING_POH,        {[]{return (IsAdult && CanPlantBean(THE_GRAVEYARD)) || CanUse(LONGSHOT) || (LogicGraveyardPoH && CanUse(BOOMERANG));}}),
-                  LocationAccess(GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR, {[]{return IsChild && AtNight;}}), //TODO: This needs to change
-                  LocationAccess(GRAVEYARD_GS_WALL,                 {[]{return IsChild && HookshotOrBoomerang && AtNight && CanGetNightTimeGS;}}),
-                  LocationAccess(GRAVEYARD_GS_BEAN_PATCH,           {[]{return CanPlantBugs && CanChildAttack;}}),
+                  LocationAccess(RC_GRAVEYARD_FREESTANDING_POH,        {[]{return (IsAdult && CanPlantBean(RR_THE_GRAVEYARD)) || CanUse(RG_LONGSHOT) || (LogicGraveyardPoH && CanUse(RG_BOOMERANG));}}),
+                  LocationAccess(RC_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR, {[]{return IsChild && AtNight;}}), //TODO: This needs to change
+                  LocationAccess(RC_GRAVEYARD_GS_WALL,                 {[]{return IsChild && HookshotOrBoomerang && AtNight && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_GRAVEYARD_GS_BEAN_PATCH,           {[]{return CanPlantBugs && CanChildAttack;}}),
                 }, {
                   //Exits
-                  Entrance(GRAVEYARD_SHIELD_GRAVE,       {[]{return IsAdult || AtNight;}}),
-                  Entrance(GRAVEYARD_COMPOSERS_GRAVE,    {[]{return CanPlay(ZeldasLullaby);}}),
-                  Entrance(GRAVEYARD_HEART_PIECE_GRAVE,  {[]{return IsAdult || AtNight;}}),
-                  Entrance(GRAVEYARD_DAMPES_GRAVE,       {[]{return IsAdult;}}),
-                  Entrance(GRAVEYARD_DAMPES_HOUSE,       {[]{return IsAdult || AtDampeTime;}}), //TODO: This needs to be handled
-                  Entrance(KAKARIKO_VILLAGE,             {[]{return true;}}),
-                  Entrance(GRAVEYARD_WARP_PAD_REGION,    {[]{return false;}}),
+                  Entrance(RR_GRAVEYARD_SHIELD_GRAVE,       {[]{return IsAdult || AtNight;}}),
+                  Entrance(RR_GRAVEYARD_COMPOSERS_GRAVE,    {[]{return CanPlay(ZeldasLullaby);}}),
+                  Entrance(RR_GRAVEYARD_HEART_PIECE_GRAVE,  {[]{return IsAdult || AtNight;}}),
+                  Entrance(RR_GRAVEYARD_DAMPES_GRAVE,       {[]{return IsAdult;}}),
+                  Entrance(RR_GRAVEYARD_DAMPES_HOUSE,       {[]{return IsAdult || AtDampeTime;}}), //TODO: This needs to be handled
+                  Entrance(RR_KAKARIKO_VILLAGE,             {[]{return true;}}),
+                  Entrance(RR_GRAVEYARD_WARP_PAD_REGION,    {[]{return false;}}),
   });
 
-  areaTable[GRAVEYARD_SHIELD_GRAVE] = Area("Graveyard Shield Grave", "Graveyard Shield Grave", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GRAVEYARD_SHIELD_GRAVE] = Area("Graveyard Shield Grave", "Graveyard Shield Grave", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(GRAVEYARD_SHIELD_GRAVE_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_GRAVEYARD_SHIELD_GRAVE_CHEST, {[]{return true;}}),
                   //Free Fairies
                 }, {
                   //Exits
-                  Entrance(THE_GRAVEYARD, {[]{return true;}}),
+                  Entrance(RR_THE_GRAVEYARD, {[]{return true;}}),
   });
 
-  areaTable[GRAVEYARD_HEART_PIECE_GRAVE] = Area("Graveyard Heart Piece Grave", "Graveyard Heart Piece Grave", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GRAVEYARD_HEART_PIECE_GRAVE] = Area("Graveyard Heart Piece Grave", "Graveyard Heart Piece Grave", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(GRAVEYARD_HEART_PIECE_GRAVE_CHEST, {[]{return CanPlay(SunsSong);}}),
+                  LocationAccess(RC_GRAVEYARD_HEART_PIECE_GRAVE_CHEST, {[]{return CanPlay(SunsSong);}}),
                 }, {
                   //Exits
-                  Entrance(THE_GRAVEYARD, {[]{return true;}}),
+                  Entrance(RR_THE_GRAVEYARD, {[]{return true;}}),
   });
 
-  areaTable[GRAVEYARD_COMPOSERS_GRAVE] = Area("Graveyard Composers Grave", "Graveyard Composers Grave", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GRAVEYARD_COMPOSERS_GRAVE] = Area("Graveyard Composers Grave", "Graveyard Composers Grave", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(GRAVEYARD_COMPOSERS_GRAVE_CHEST, {[]{return HasFireSource;}}),
-                  LocationAccess(SONG_FROM_COMPOSERS_GRAVE,       {[]{return IsAdult || (Slingshot || Boomerang || Sticks || HasExplosives || KokiriSword || CanUse(MEGATON_HAMMER) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(BOW) || CanUse(HOOKSHOT));}}),
+                  LocationAccess(RC_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST, {[]{return HasFireSource;}}),
+                  LocationAccess(RC_SONG_FROM_ROYAL_FAMILYS_TOMB,       {[]{return IsAdult || (Slingshot || Boomerang || Sticks || HasExplosives || KokiriSword || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT));}}),
                 }, {
                   //Exits
-                  Entrance(THE_GRAVEYARD, {[]{return true;}}),
+                  Entrance(RR_THE_GRAVEYARD, {[]{return true;}}),
   });
 
-  areaTable[GRAVEYARD_DAMPES_GRAVE] = Area("Graveyard Dampes Grave", "Windmill and Dampes Grave", NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GRAVEYARD_DAMPES_GRAVE] = Area("Graveyard Dampes Grave", "Windmill and Dampes Grave", RHT_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&NutPot,               {[]{return true;}}),
                   EventAccess(&DampesWindmillAccess, {[]{return DampesWindmillAccess || (IsAdult && CanPlay(SongOfTime));}}),
                 }, {
                   //Locations
-                  LocationAccess(GRAVEYARD_HOOKSHOT_CHEST,              {[]{return true;}}),
-                  LocationAccess(GRAVEYARD_DAMPE_RACE_FREESTANDING_POH, {[]{return IsAdult || LogicChildDampeRacePoH;}}),
+                  LocationAccess(RC_GRAVEYARD_HOOKSHOT_CHEST,              {[]{return true;}}),
+                  LocationAccess(RC_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH, {[]{return IsAdult || LogicChildDampeRacePoH;}}),
                 }, {
                   //Exits
-                  Entrance(THE_GRAVEYARD, {[]{return true;}}),
-                  Entrance(KAK_WINDMILL,  {[]{return IsAdult && CanPlay(SongOfTime);}}),
+                  Entrance(RR_THE_GRAVEYARD, {[]{return true;}}),
+                  Entrance(RR_KAK_WINDMILL,  {[]{return IsAdult && CanPlay(SongOfTime);}}),
   });
 
-  areaTable[GRAVEYARD_DAMPES_HOUSE] = Area("Graveyard Dampes House", "Graveyard Dampes House", NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_GRAVEYARD_DAMPES_HOUSE] = Area("Graveyard Dampes House", "Graveyard Dampes House", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(THE_GRAVEYARD, {[]{return true;}}),
+                  Entrance(RR_THE_GRAVEYARD, {[]{return true;}}),
   });
 
-  areaTable[GRAVEYARD_WARP_PAD_REGION] = Area("Graveyard Warp Pad Region", "Graveyard", THE_GRAVEYARD, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GRAVEYARD_WARP_PAD_REGION] = Area("Graveyard Warp Pad Region", "Graveyard", RHT_THE_GRAVEYARD, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&GossipStoneFairy, {[]{return GossipStoneFairy || CanSummonGossipFairyWithoutSuns;}}),
                 }, {
                   //Locations
-                  LocationAccess(GRAVEYARD_GOSSIP_STONE, {[]{return true;}}),
+                  LocationAccess(RC_GY_GOSSIP_STONE, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(THE_GRAVEYARD,             {[]{return true;}}),
-                  Entrance(SHADOW_TEMPLE_ENTRYWAY,    {[]{return CanUse(DINS_FIRE) || (LogicShadowFireArrowEntry && IsAdult && CanUse(FIRE_ARROWS));}}),
+                  Entrance(RR_THE_GRAVEYARD,             {[]{return true;}}),
+                  Entrance(RR_SHADOW_TEMPLE_ENTRYWAY,    {[]{return CanUse(RG_DINS_FIRE) || (LogicShadowFireArrowEntry && IsAdult && CanUse(RG_FIRE_ARROWS));}}),
   });
 
-  areaTable[KAK_BEHIND_GATE] = Area("Kak Behind Gate", "Kakariko Village", NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_KAK_BEHIND_GATE] = Area("Kak Behind Gate", "Kakariko Village", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(KAKARIKO_VILLAGE,     {[]{return IsAdult || LogicVisibleCollision || KakarikoVillageGateOpen || OpenKakariko.Is(OPENKAKARIKO_OPEN);}}),
-                  Entrance(DEATH_MOUNTAIN_TRAIL, {[]{return true;}}),
+                  Entrance(RR_KAKARIKO_VILLAGE,     {[]{return IsAdult || LogicVisibleCollision || KakarikoVillageGateOpen || OpenKakariko.Is(OPENKAKARIKO_OPEN);}}),
+                  Entrance(RR_DEATH_MOUNTAIN_TRAIL, {[]{return true;}}),
   });
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
index 1ba2048a0..e3b073ba4 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
@@ -6,111 +6,111 @@ using namespace Logic;
 using namespace Settings;
 
 void AreaTable_Init_LostWoods() {
-  areaTable[KOKIRI_FOREST] = Area("Kokiri Forest", "Kokiri Forest", KOKIRI_FOREST, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_KOKIRI_FOREST] = Area("Kokiri Forest", "Kokiri Forest", RHT_KOKIRI_FOREST, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&BeanPlantFairy,           {[]{return BeanPlantFairy   || (CanPlantBean(KOKIRI_FOREST) && CanPlay(SongOfStorms));}}),
+                  EventAccess(&BeanPlantFairy,           {[]{return BeanPlantFairy   || (CanPlantBean(RR_KOKIRI_FOREST) && CanPlay(SongOfStorms));}}),
                   EventAccess(&GossipStoneFairy,         {[]{return GossipStoneFairy || CanSummonGossipFairyWithoutSuns;}}),
                   EventAccess(&ShowedMidoSwordAndShield, {[]{return ShowedMidoSwordAndShield || (IsChild && KokiriSword && DekuShield);}}),
                 }, {
                   //Locations
-                  LocationAccess(KF_KOKIRI_SWORD_CHEST,   {[]{return IsChild;}}),
-                  LocationAccess(KF_GS_KNOW_IT_ALL_HOUSE, {[]{return IsChild && CanChildAttack && AtNight && (HasNightStart || CanLeaveForest || CanPlay(SunsSong)) && CanGetNightTimeGS;}}),
-                  LocationAccess(KF_GS_BEAN_PATCH,        {[]{return CanPlantBugs && CanChildAttack;}}),
-                  LocationAccess(KF_GS_HOUSE_OF_TWINS,    {[]{return IsAdult && AtNight && (HookshotOrBoomerang || (LogicAdultKokiriGS && CanUse(HOVER_BOOTS))) && CanGetNightTimeGS;}}),
-                  LocationAccess(KF_GOSSIP_STONE,         {[]{return true;}}),
+                  LocationAccess(RC_KF_KOKIRI_SWORD_CHEST,   {[]{return IsChild;}}),
+                  LocationAccess(RC_KF_GS_KNOW_IT_ALL_HOUSE, {[]{return IsChild && CanChildAttack && AtNight && (HasNightStart || CanLeaveForest || CanPlay(SunsSong)) && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_KF_GS_BEAN_PATCH,        {[]{return CanPlantBugs && CanChildAttack;}}),
+                  LocationAccess(RC_KF_GS_HOUSE_OF_TWINS,    {[]{return IsAdult && AtNight && (HookshotOrBoomerang || (LogicAdultKokiriGS && CanUse(RG_HOVER_BOOTS))) && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_KF_GOSSIP_STONE,         {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(KF_LINKS_HOUSE,        {[]{return true;}}),
-                  Entrance(KF_MIDOS_HOUSE,        {[]{return true;}}),
-                  Entrance(KF_SARIAS_HOUSE,       {[]{return true;}}),
-                  Entrance(KF_HOUSE_OF_TWINS,     {[]{return true;}}),
-                  Entrance(KF_KNOW_IT_ALL_HOUSE,  {[]{return true;}}),
-                  Entrance(KF_KOKIRI_SHOP,        {[]{return true;}}),
-                  Entrance(KF_OUTSIDE_DEKU_TREE,  {[]{return IsAdult || OpenForest.Is(OPENFOREST_OPEN) || ShowedMidoSwordAndShield;}}),
-                  Entrance(THE_LOST_WOODS,        {[]{return true;}}),
-                  Entrance(LW_BRIDGE_FROM_FOREST, {[]{return IsAdult || OpenForest.IsNot(OPENFOREST_CLOSED) || DekuTreeClear;}}),
-                  Entrance(KF_STORMS_GROTTO,      {[]{return CanOpenStormGrotto;}}),
+                  Entrance(RR_KF_LINKS_HOUSE,        {[]{return true;}}),
+                  Entrance(RR_KF_MIDOS_HOUSE,        {[]{return true;}}),
+                  Entrance(RR_KF_SARIAS_HOUSE,       {[]{return true;}}),
+                  Entrance(RR_KF_HOUSE_OF_TWINS,     {[]{return true;}}),
+                  Entrance(RR_KF_KNOW_IT_ALL_HOUSE,  {[]{return true;}}),
+                  Entrance(RR_KF_KOKIRI_SHOP,        {[]{return true;}}),
+                  Entrance(RR_KF_OUTSIDE_DEKU_TREE,  {[]{return IsAdult || OpenForest.Is(OPENFOREST_OPEN) || ShowedMidoSwordAndShield;}}),
+                  Entrance(RR_THE_LOST_WOODS,        {[]{return true;}}),
+                  Entrance(RR_LW_BRIDGE_FROM_FOREST, {[]{return IsAdult || OpenForest.IsNot(OPENFOREST_CLOSED) || DekuTreeClear;}}),
+                  Entrance(RR_KF_STORMS_GROTTO,      {[]{return CanOpenStormGrotto;}}),
   });
 
-  areaTable[KF_OUTSIDE_DEKU_TREE] = Area("KF Outside Deku Tree", "Kokiri Forest", KOKIRI_FOREST, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_KF_OUTSIDE_DEKU_TREE] = Area("KF Outside Deku Tree", "Kokiri Forest", RHT_KOKIRI_FOREST, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&DekuBabaSticks,           {[]{return DekuBabaSticks || ((IsAdult && ShuffleDungeonEntrances.Is(SHUFFLEDUNGEONS_OFF)) || KokiriSword || Boomerang);}}),
-                  EventAccess(&DekuBabaNuts,             {[]{return DekuBabaNuts   || ((IsAdult && ShuffleDungeonEntrances.Is(SHUFFLEDUNGEONS_OFF)) || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(DINS_FIRE));}}),
+                  EventAccess(&DekuBabaNuts,             {[]{return DekuBabaNuts   || ((IsAdult && ShuffleDungeonEntrances.Is(SHUFFLEDUNGEONS_OFF)) || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(RG_DINS_FIRE));}}),
                   EventAccess(&ShowedMidoSwordAndShield, {[]{return ShowedMidoSwordAndShield || (IsChild && KokiriSword && DekuShield);}}),
                 }, {
                   //Locations
-                  LocationAccess(KF_DEKU_TREE_GOSSIP_STONE_LEFT,  {[]{return true;}}),
-                  LocationAccess(KF_DEKU_TREE_GOSSIP_STONE_RIGHT, {[]{return true;}}),
+                  LocationAccess(RC_KF_DEKU_TREE_LEFT_GOSSIP_STONE,  {[]{return true;}}),
+                  LocationAccess(RC_KF_DEKU_TREE_RIGHT_GOSSIP_STONE, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(DEKU_TREE_ENTRYWAY, {[]{return IsChild || (ShuffleDungeonEntrances.IsNot(SHUFFLEDUNGEONS_OFF) && (OpenForest.Is(OPENFOREST_OPEN) || ShowedMidoSwordAndShield));}}),
-                  Entrance(KOKIRI_FOREST,      {[]{return IsAdult || OpenForest.Is(OPENFOREST_OPEN) || ShowedMidoSwordAndShield;}}),
+                  Entrance(RR_DEKU_TREE_ENTRYWAY, {[]{return IsChild || (ShuffleDungeonEntrances.IsNot(SHUFFLEDUNGEONS_OFF) && (OpenForest.Is(OPENFOREST_OPEN) || ShowedMidoSwordAndShield));}}),
+                  Entrance(RR_KOKIRI_FOREST,      {[]{return IsAdult || OpenForest.Is(OPENFOREST_OPEN) || ShowedMidoSwordAndShield;}}),
   });
 
-  areaTable[KF_LINKS_HOUSE] = Area("KF Link's House", "KF Link's House", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KF_LINKS_HOUSE] = Area("KF Link's House", "KF Link's House", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(KF_LINKS_HOUSE_COW, {[]{return IsAdult && CanPlay(EponasSong) && LinksCow;}}),
+                  LocationAccess(RC_KF_LINKS_HOUSE_COW, {[]{return IsAdult && CanPlay(EponasSong) && LinksCow;}}),
                 }, {
                   //Exits
-                  Entrance(KOKIRI_FOREST, {[]{return true;}})
+                  Entrance(RR_KOKIRI_FOREST, {[]{return true;}})
   });
 
-  areaTable[KF_MIDOS_HOUSE] = Area("KF Mido's House", "KF Mido's House", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KF_MIDOS_HOUSE] = Area("KF Mido's House", "KF Mido's House", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(KF_MIDOS_TOP_LEFT_CHEST,     {[]{return true;}}),
-                  LocationAccess(KF_MIDOS_TOP_RIGHT_CHEST,    {[]{return true;}}),
-                  LocationAccess(KF_MIDOS_BOTTOM_LEFT_CHEST,  {[]{return true;}}),
-                  LocationAccess(KF_MIDOS_BOTTOM_RIGHT_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_KF_MIDOS_TOP_LEFT_CHEST,     {[]{return true;}}),
+                  LocationAccess(RC_KF_MIDOS_TOP_RIGHT_CHEST,    {[]{return true;}}),
+                  LocationAccess(RC_KF_MIDOS_BOTTOM_LEFT_CHEST,  {[]{return true;}}),
+                  LocationAccess(RC_KF_MIDOS_BOTTOM_RIGHT_CHEST, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(KOKIRI_FOREST, {[]{return true;}}),
+                  Entrance(RR_KOKIRI_FOREST, {[]{return true;}}),
   });
 
-  areaTable[KF_SARIAS_HOUSE] = Area("KF Saria's House", "KF Saria's House", NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_KF_SARIAS_HOUSE] = Area("KF Saria's House", "KF Saria's House", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(KOKIRI_FOREST, {[]{return true;}}),
+                  Entrance(RR_KOKIRI_FOREST, {[]{return true;}}),
   });
 
-  areaTable[KF_HOUSE_OF_TWINS] = Area("KF House of Twins", "KF House of Twins", NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_KF_HOUSE_OF_TWINS] = Area("KF House of Twins", "KF House of Twins", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(KOKIRI_FOREST, {[]{return true;}}),
+                  Entrance(RR_KOKIRI_FOREST, {[]{return true;}}),
   });
 
-  areaTable[KF_KNOW_IT_ALL_HOUSE] = Area("KF Know It All House", "KF Know It All House", NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_KF_KNOW_IT_ALL_HOUSE] = Area("KF Know It All House", "KF Know It All House", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(KOKIRI_FOREST, {[]{return true;}}),
+                  Entrance(RR_KOKIRI_FOREST, {[]{return true;}}),
   });
 
-  areaTable[KF_KOKIRI_SHOP] = Area("KF Kokiri Shop", "KF Kokiri Shop", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KF_KOKIRI_SHOP] = Area("KF Kokiri Shop", "KF Kokiri Shop", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(KF_SHOP_ITEM_1, {[]{return true;}}),
-                  LocationAccess(KF_SHOP_ITEM_2, {[]{return true;}}),
-                  LocationAccess(KF_SHOP_ITEM_3, {[]{return true;}}),
-                  LocationAccess(KF_SHOP_ITEM_4, {[]{return true;}}),
-                  LocationAccess(KF_SHOP_ITEM_5, {[]{return true;}}),
-                  LocationAccess(KF_SHOP_ITEM_6, {[]{return true;}}),
-                  LocationAccess(KF_SHOP_ITEM_7, {[]{return true;}}),
-                  LocationAccess(KF_SHOP_ITEM_8, {[]{return true;}}),
+                  LocationAccess(RC_KF_SHOP_ITEM_1, {[]{return true;}}),
+                  LocationAccess(RC_KF_SHOP_ITEM_2, {[]{return true;}}),
+                  LocationAccess(RC_KF_SHOP_ITEM_3, {[]{return true;}}),
+                  LocationAccess(RC_KF_SHOP_ITEM_4, {[]{return true;}}),
+                  LocationAccess(RC_KF_SHOP_ITEM_5, {[]{return true;}}),
+                  LocationAccess(RC_KF_SHOP_ITEM_6, {[]{return true;}}),
+                  LocationAccess(RC_KF_SHOP_ITEM_7, {[]{return true;}}),
+                  LocationAccess(RC_KF_SHOP_ITEM_8, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(KOKIRI_FOREST, {[]{return true;}}),
+                  Entrance(RR_KOKIRI_FOREST, {[]{return true;}}),
   });
 
-  areaTable[KF_STORMS_GROTTO] = Area("KF Storms Grotto", "KF Storms Grotto", NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+  areaTable[RR_KF_STORMS_GROTTO] = Area("KF Storms Grotto", "KF Storms Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
-                  LocationAccess(KF_STORMS_GROTTO_CHEST,        {[]{return true;}}),
-                  LocationAccess(KF_STORMS_GROTTO_GOSSIP_STONE, {[]{return true;}}),
+                  LocationAccess(RC_KF_STORMS_GROTTO_CHEST,        {[]{return true;}}),
+                  LocationAccess(RC_KF_STORMS_GOSSIP_STONE, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(KOKIRI_FOREST, {[]{return true;}})
+                  Entrance(RR_KOKIRI_FOREST, {[]{return true;}})
   });
 
-  areaTable[LW_FOREST_EXIT] = Area("LW Forest Exit", "Lost Woods", NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_LW_FOREST_EXIT] = Area("LW Forest Exit", "Lost Woods", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(KOKIRI_FOREST, {[]{return true;}})
+                  Entrance(RR_KOKIRI_FOREST, {[]{return true;}})
   });
 
-  areaTable[THE_LOST_WOODS] = Area("Lost Woods", "Lost Woods", THE_LOST_WOODS, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_THE_LOST_WOODS] = Area("Lost Woods", "Lost Woods", RHT_THE_LOST_WOODS, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&OddMushroomAccess, {[]{return OddMushroomAccess || (IsAdult && (CojiroAccess || Cojiro));}}),
                   EventAccess(&PoachersSawAccess, {[]{return PoachersSawAccess || (IsAdult && OddPoulticeAccess);}}),
@@ -119,132 +119,132 @@ void AreaTable_Init_LostWoods() {
                   EventAccess(&BugShrub,          {[]{return IsChild && CanCutShrubs;}}),
                 }, {
                   //Locations
-                  LocationAccess(LW_SKULL_KID,                 {[]{return IsChild && CanPlay(SariasSong);}}),
-                  LocationAccess(LW_TRADE_COJIRO,              {[]{return IsAdult && Cojiro;}}),
-                  LocationAccess(LW_TRADE_ODD_POTION,        {[]{return IsAdult && OddPoultice && Cojiro;}}),
-                  LocationAccess(LW_OCARINA_MEMORY_GAME,       {[]{return IsChild && Ocarina;}}),
-                  LocationAccess(LW_TARGET_IN_WOODS,           {[]{return IsChild && CanUse(SLINGSHOT);}}),
-                  LocationAccess(LW_DEKU_SCRUB_NEAR_BRIDGE,    {[]{return IsChild && CanStunDeku;}}),
-                  LocationAccess(LW_GS_BEAN_PATCH_NEAR_BRIDGE, {[]{return CanPlantBugs && CanChildAttack;}}),
-                  LocationAccess(LW_GOSSIP_STONE,              {[]{return true;}}),
+                  LocationAccess(RC_LW_SKULL_KID,                 {[]{return IsChild && CanPlay(SariasSong);}}),
+                  LocationAccess(RC_LW_TRADE_COJIRO,              {[]{return IsAdult && Cojiro;}}),
+                  LocationAccess(RC_LW_TRADE_ODD_POTION,        {[]{return IsAdult && OddPoultice && Cojiro;}}),
+                  LocationAccess(RC_LW_OCARINA_MEMORY_GAME,       {[]{return IsChild && Ocarina;}}),
+                  LocationAccess(RC_LW_TARGET_IN_WOODS,           {[]{return IsChild && CanUse(RG_FAIRY_SLINGSHOT);}}),
+                  LocationAccess(RC_LW_DEKU_SCRUB_NEAR_BRIDGE,    {[]{return IsChild && CanStunDeku;}}),
+                  LocationAccess(RC_LW_GS_BEAN_PATCH_NEAR_BRIDGE, {[]{return CanPlantBugs && CanChildAttack;}}),
+                  LocationAccess(RC_LW_GOSSIP_STONE,              {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(LW_FOREST_EXIT,           {[]{return true;}}),
-                  Entrance(GC_WOODS_WARP,            {[]{return true;}}),
-                  Entrance(LW_BRIDGE,                {[]{return CanLeaveForest && ((IsAdult && (CanPlantBean(THE_LOST_WOODS) || LogicLostWoodsBridge)) || CanUse(HOVER_BOOTS) || CanUse(LONGSHOT));}}),
-                  Entrance(ZORAS_RIVER,              {[]{return CanLeaveForest && (CanDive || CanUse(IRON_BOOTS));}}),
-                  Entrance(LW_BEYOND_MIDO,           {[]{return IsChild || CanPlay(SariasSong) || LogicMidoBackflip;}}),
-                  Entrance(LW_NEAR_SHORTCUTS_GROTTO, {[]{return Here(THE_LOST_WOODS, []{return CanBlastOrSmash;});}}),
+                  Entrance(RR_LW_FOREST_EXIT,           {[]{return true;}}),
+                  Entrance(RR_GC_WOODS_WARP,            {[]{return true;}}),
+                  Entrance(RR_LW_BRIDGE,                {[]{return CanLeaveForest && ((IsAdult && (CanPlantBean(RR_THE_LOST_WOODS) || LogicLostWoodsBridge)) || CanUse(RG_HOVER_BOOTS) || CanUse(RG_LONGSHOT));}}),
+                  Entrance(RR_ZORAS_RIVER,              {[]{return CanLeaveForest && (CanDive || CanUse(RG_IRON_BOOTS));}}),
+                  Entrance(RR_LW_BEYOND_MIDO,           {[]{return IsChild || CanPlay(SariasSong) || LogicMidoBackflip;}}),
+                  Entrance(RR_LW_NEAR_SHORTCUTS_GROTTO, {[]{return Here(RR_THE_LOST_WOODS, []{return CanBlastOrSmash;});}}),
   });
 
-  areaTable[LW_BEYOND_MIDO] = Area("LW Beyond Mido", "Lost Woods", THE_LOST_WOODS, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_LW_BEYOND_MIDO] = Area("LW Beyond Mido", "Lost Woods", RHT_THE_LOST_WOODS, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&ButterflyFairy, {[]{return ButterflyFairy || CanUse(STICKS);}}),
+                  EventAccess(&ButterflyFairy, {[]{return ButterflyFairy || CanUse(RG_STICKS);}}),
                 }, {
                   //Locations
-                  LocationAccess(LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT, {[]{return IsChild && CanStunDeku;}}),
-                  LocationAccess(LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT,  {[]{return IsChild && CanStunDeku;}}),
-                  LocationAccess(LW_GS_ABOVE_THEATER,                   {[]{return IsAdult && AtNight && (CanPlantBean(LW_BEYOND_MIDO) || (LogicLostWoodsGSBean && CanUse(HOOKSHOT) && (CanUse(LONGSHOT) || CanUse(BOW) || CanUse(SLINGSHOT) || HasBombchus || CanUse(DINS_FIRE)))) && CanGetNightTimeGS;}}),
-                  LocationAccess(LW_GS_BEAN_PATCH_NEAR_THEATER,         {[]{return CanPlantBugs && (CanChildAttack || (Scrubsanity.Is(SCRUBSANITY_OFF) && DekuShield));}}),
+                  LocationAccess(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT, {[]{return IsChild && CanStunDeku;}}),
+                  LocationAccess(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT,  {[]{return IsChild && CanStunDeku;}}),
+                  LocationAccess(RC_LW_GS_ABOVE_THEATER,                   {[]{return IsAdult && AtNight && (CanPlantBean(RR_LW_BEYOND_MIDO) || (LogicLostWoodsGSBean && CanUse(RG_HOOKSHOT) && (CanUse(RG_LONGSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT) || HasBombchus || CanUse(RG_DINS_FIRE)))) && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_LW_GS_BEAN_PATCH_NEAR_THEATER,         {[]{return CanPlantBugs && (CanChildAttack || (Scrubsanity.Is(SCRUBSANITY_OFF) && DekuShield));}}),
                 }, {
                   //Exits
-                  Entrance(LW_FOREST_EXIT,   {[]{return true;}}),
-                  Entrance(THE_LOST_WOODS,   {[]{return IsChild || CanPlay(SariasSong);}}),
-                  Entrance(SFM_ENTRYWAY,     {[]{return true;}}),
-                  Entrance(DEKU_THEATER,     {[]{return true;}}),
-                  Entrance(LW_SCRUBS_GROTTO, {[]{return Here(LW_BEYOND_MIDO, []{return CanBlastOrSmash;});}}),
+                  Entrance(RR_LW_FOREST_EXIT,   {[]{return true;}}),
+                  Entrance(RR_THE_LOST_WOODS,   {[]{return IsChild || CanPlay(SariasSong);}}),
+                  Entrance(RR_SFM_ENTRYWAY,     {[]{return true;}}),
+                  Entrance(RR_DEKU_THEATER,     {[]{return true;}}),
+                  Entrance(RR_LW_SCRUBS_GROTTO, {[]{return Here(RR_LW_BEYOND_MIDO, []{return CanBlastOrSmash;});}}),
   });
 
-  areaTable[LW_NEAR_SHORTCUTS_GROTTO] = Area("LW Near Shortcuts Grotto", "LW Near Shortcuts Grotto", NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+  areaTable[RR_LW_NEAR_SHORTCUTS_GROTTO] = Area("LW Near Shortcuts Grotto", "LW Near Shortcuts Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
-                  LocationAccess(LW_NEAR_SHORTCUTS_GROTTO_CHEST,        {[]{return true;}}),
-                  LocationAccess(LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE, {[]{return true;}}),
+                  LocationAccess(RC_LW_NEAR_SHORTCUTS_GROTTO_CHEST,        {[]{return true;}}),
+                  LocationAccess(RC_LW_NEAR_SHORTCUTS_GOSSIP_STONE, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(THE_LOST_WOODS, {[]{return true;}}),
+                  Entrance(RR_THE_LOST_WOODS, {[]{return true;}}),
   });
 
-  areaTable[DEKU_THEATER] = Area("Deku Theater", "Deku Theater", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DEKU_THEATER] = Area("Deku Theater", "Deku Theater", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(DEKU_THEATER_SKULL_MASK,    {[]{return IsChild && SkullMask;}}),
-                  LocationAccess(DEKU_THEATER_MASK_OF_TRUTH, {[]{return IsChild && MaskOfTruth;}}),
+                  LocationAccess(RC_DEKU_THEATER_SKULL_MASK,    {[]{return IsChild && SkullMask;}}),
+                  LocationAccess(RC_DEKU_THEATER_MASK_OF_TRUTH, {[]{return IsChild && MaskOfTruth;}}),
                 }, {
                   //Exits
-                  Entrance(LW_BEYOND_MIDO, {[]{return true;}}),
+                  Entrance(RR_LW_BEYOND_MIDO, {[]{return true;}}),
   });
 
-  areaTable[LW_SCRUBS_GROTTO] = Area("LW Scrubs Grotto", "LW Scrubs Grotto", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_LW_SCRUBS_GROTTO] = Area("LW Scrubs Grotto", "LW Scrubs Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(LW_DEKU_SCRUB_GROTTO_REAR,  {[]{return CanStunDeku;}}),
-                  LocationAccess(LW_DEKU_SCRUB_GROTTO_FRONT, {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_LW_DEKU_SCRUB_GROTTO_REAR,  {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_LW_DEKU_SCRUB_GROTTO_FRONT, {[]{return CanStunDeku;}}),
                 }, {
                   //Exits
-                  Entrance(LW_BEYOND_MIDO, {[]{return true;}}),
+                  Entrance(RR_LW_BEYOND_MIDO, {[]{return true;}}),
   });
 
-  areaTable[SFM_ENTRYWAY] = Area("SFM Entryway", "Sacred Forest Meadow", SACRED_FOREST_MEADOW, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_SFM_ENTRYWAY] = Area("SFM Entryway", "Sacred Forest Meadow", RHT_SACRED_FOREST_MEADOW, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(LW_BEYOND_MIDO,       {[]{return true;}}),
-                  Entrance(SACRED_FOREST_MEADOW, {[]{return IsAdult || Slingshot || Sticks || KokiriSword || CanUse(DINS_FIRE) || CanUse(MEGATON_HAMMER) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD);}}),
-                  Entrance(SFM_WOLFOS_GROTTO,    {[]{return CanOpenBombGrotto;}}),
+                  Entrance(RR_LW_BEYOND_MIDO,       {[]{return true;}}),
+                  Entrance(RR_SACRED_FOREST_MEADOW, {[]{return IsAdult || Slingshot || Sticks || KokiriSword || CanUse(RG_DINS_FIRE) || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD);}}),
+                  Entrance(RR_SFM_WOLFOS_GROTTO,    {[]{return CanOpenBombGrotto;}}),
   });
 
-  areaTable[SACRED_FOREST_MEADOW] = Area("Sacred Forest Meadow", "Sacred Forest Meadow", SACRED_FOREST_MEADOW, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_SACRED_FOREST_MEADOW] = Area("Sacred Forest Meadow", "Sacred Forest Meadow", RHT_SACRED_FOREST_MEADOW, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&GossipStoneFairy, {[]{return GossipStoneFairy || CanSummonGossipFairyWithoutSuns;}}),
                 }, {
                   //Locations
-                  LocationAccess(SONG_FROM_SARIA,             {[]{return IsChild && ZeldasLetter;}}),
-                  LocationAccess(SHEIK_IN_FOREST,             {[]{return IsAdult;}}),
-                  LocationAccess(SFM_GS,                      {[]{return IsAdult && HookshotOrBoomerang && AtNight && CanGetNightTimeGS;}}),
-                  LocationAccess(SFM_MAZE_GOSSIP_STONE_LOWER, {[]{return true;}}),
-                  LocationAccess(SFM_MAZE_GOSSIP_STONE_UPPER, {[]{return true;}}),
-                  LocationAccess(SFM_SARIA_GOSSIP_STONE,      {[]{return true;}}),
+                  LocationAccess(RC_SONG_FROM_SARIA,             {[]{return IsChild && ZeldasLetter;}}),
+                  LocationAccess(RC_SHEIK_IN_FOREST,             {[]{return IsAdult;}}),
+                  LocationAccess(RC_SFM_GS,                      {[]{return IsAdult && HookshotOrBoomerang && AtNight && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_SFM_MAZE_LOWER_GOSSIP_STONE, {[]{return true;}}),
+                  LocationAccess(RC_SFM_MAZE_UPPER_GOSSIP_STONE, {[]{return true;}}),
+                  LocationAccess(RC_SFM_SARIA_GOSSIP_STONE,      {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(SFM_ENTRYWAY,           {[]{return true;}}),
-                  Entrance(FOREST_TEMPLE_ENTRYWAY, {[]{return CanUse(HOOKSHOT);}}),
-                  Entrance(SFM_FAIRY_GROTTO,       {[]{return true;}}),
-                  Entrance(SFM_STORMS_GROTTO,      {[]{return CanOpenStormGrotto;}}),
+                  Entrance(RR_SFM_ENTRYWAY,           {[]{return true;}}),
+                  Entrance(RR_FOREST_TEMPLE_ENTRYWAY, {[]{return CanUse(RG_HOOKSHOT);}}),
+                  Entrance(RR_SFM_FAIRY_GROTTO,       {[]{return true;}}),
+                  Entrance(RR_SFM_STORMS_GROTTO,      {[]{return CanOpenStormGrotto;}}),
   });
 
-  areaTable[SFM_FAIRY_GROTTO] = Area("SFM Fairy Grotto", "SFM Fairy Grotto", NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_SFM_FAIRY_GROTTO] = Area("SFM Fairy Grotto", "SFM Fairy Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FreeFairies, {[]{return true;}}),
                 }, {}, {
                   //Exits
-                  Entrance(SACRED_FOREST_MEADOW, {[]{return true;}}),
+                  Entrance(RR_SACRED_FOREST_MEADOW, {[]{return true;}}),
   });
 
-  areaTable[SFM_WOLFOS_GROTTO] = Area("SFM Wolfos Grotto", "SFM Wolfos Grotto", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SFM_WOLFOS_GROTTO] = Area("SFM Wolfos Grotto", "SFM Wolfos Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(SFM_WOLFOS_GROTTO_CHEST, {[]{return IsAdult || Slingshot || Sticks || KokiriSword || CanUse(DINS_FIRE) || CanUse(MEGATON_HAMMER) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD);}}),
+                  LocationAccess(RC_SFM_WOLFOS_GROTTO_CHEST, {[]{return IsAdult || Slingshot || Sticks || KokiriSword || CanUse(RG_DINS_FIRE) || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD);}}),
                 }, {
                   //Exits
-                  Entrance(SFM_ENTRYWAY, {[]{return true;}}),
+                  Entrance(RR_SFM_ENTRYWAY, {[]{return true;}}),
   });
 
-  areaTable[SFM_STORMS_GROTTO] = Area("SFM Storms Grotto", "SFM Storms Grotto", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SFM_STORMS_GROTTO] = Area("SFM Storms Grotto", "SFM Storms Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(SFM_DEKU_SCRUB_GROTTO_REAR,  {[]{return CanStunDeku;}}),
-                  LocationAccess(SFM_DEKU_SCRUB_GROTTO_FRONT, {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_SFM_DEKU_SCRUB_GROTTO_REAR,  {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_SFM_DEKU_SCRUB_GROTTO_FRONT, {[]{return CanStunDeku;}}),
                 }, {
                   //Exits
-                  Entrance(SACRED_FOREST_MEADOW, {[]{return true;}}),
+                  Entrance(RR_SACRED_FOREST_MEADOW, {[]{return true;}}),
   });
 
-  areaTable[LW_BRIDGE_FROM_FOREST] = Area("LW Bridge From Forest", "Lost Woods", THE_LOST_WOODS, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_LW_BRIDGE_FROM_FOREST] = Area("LW Bridge From Forest", "Lost Woods", RHT_THE_LOST_WOODS, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(LW_GIFT_FROM_SARIA, {[]{return true;}}),
+                  LocationAccess(RC_LW_GIFT_FROM_SARIA, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(LW_BRIDGE, {[]{return true;}}),
+                  Entrance(RR_LW_BRIDGE, {[]{return true;}}),
   });
 
-  areaTable[LW_BRIDGE] = Area("LW Bridge", "Lost Woods", THE_LOST_WOODS, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_LW_BRIDGE] = Area("LW Bridge", "Lost Woods", RHT_THE_LOST_WOODS, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(KOKIRI_FOREST,  {[]{return true;}}),
-                  Entrance(HYRULE_FIELD,   {[]{return true;}}),
-                  Entrance(THE_LOST_WOODS, {[]{return CanUse(LONGSHOT);}}),
+                  Entrance(RR_KOKIRI_FOREST,  {[]{return true;}}),
+                  Entrance(RR_HYRULE_FIELD,   {[]{return true;}}),
+                  Entrance(RR_THE_LOST_WOODS, {[]{return CanUse(RG_LONGSHOT);}}),
   });
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp
index 5296a6398..707b2048b 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp
@@ -10,81 +10,81 @@ void AreaTable_Init_ShadowTemple() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[SHADOW_TEMPLE_ENTRYWAY] = Area("Shadow Temple Entryway", "Shadow Temple", SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_SHADOW_TEMPLE_ENTRYWAY] = Area("Shadow Temple Entryway", "Shadow Temple", RHT_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(SHADOW_TEMPLE_BEGINNING,    {[]{return Dungeon::ShadowTemple.IsVanilla() && (LogicLensShadow || CanUse(LENS_OF_TRUTH)) && (CanUse(HOVER_BOOTS) || CanUse(HOOKSHOT));}}),
-                  Entrance(SHADOW_TEMPLE_MQ_BEGINNING, {[]{return Dungeon::ShadowTemple.IsMQ()    && (LogicLensShadowMQ || CanUse(LENS_OF_TRUTH)) && (CanUse(HOVER_BOOTS) || CanUse(HOOKSHOT));}}),
-                  Entrance(GRAVEYARD_WARP_PAD_REGION,  {[]{return true;}}),
+                  Entrance(RR_SHADOW_TEMPLE_BEGINNING,    {[]{return Dungeon::ShadowTemple.IsVanilla() && (LogicLensShadow || CanUse(RG_LENS_OF_TRUTH)) && (CanUse(RG_HOVER_BOOTS) || CanUse(RG_HOOKSHOT));}}),
+                  Entrance(RR_SHADOW_TEMPLE_MQ_BEGINNING, {[]{return Dungeon::ShadowTemple.IsMQ()    && (LogicLensShadowMQ || CanUse(RG_LENS_OF_TRUTH)) && (CanUse(RG_HOVER_BOOTS) || CanUse(RG_HOOKSHOT));}}),
+                  Entrance(RR_GRAVEYARD_WARP_PAD_REGION,  {[]{return true;}}),
   });
 
   /*--------------------------
   |     VANILLA DUNGEON      |
   ---------------------------*/
   if (Dungeon::ShadowTemple.IsVanilla()) {
-  areaTable[SHADOW_TEMPLE_BEGINNING] = Area("Shadow Temple Beginning", "Shadow Temple", SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_SHADOW_TEMPLE_BEGINNING] = Area("Shadow Temple Beginning", "Shadow Temple", RHT_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&NutPot, {[]{return true;}}),
                 }, {
                   //Locations
-                  LocationAccess(SHADOW_TEMPLE_MAP_CHEST,         {[]{return true;}}),
-                  LocationAccess(SHADOW_TEMPLE_HOVER_BOOTS_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MAP_CHEST,         {[]{return true;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_HOVER_BOOTS_CHEST, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(SHADOW_TEMPLE_ENTRYWAY,     {[]{return true;}}),
-                  Entrance(SHADOW_TEMPLE_FIRST_BEAMOS, {[]{return HoverBoots;}}),
+                  Entrance(RR_SHADOW_TEMPLE_ENTRYWAY,     {[]{return true;}}),
+                  Entrance(RR_SHADOW_TEMPLE_FIRST_BEAMOS, {[]{return HoverBoots;}}),
   });
 
-  areaTable[SHADOW_TEMPLE_FIRST_BEAMOS] = Area("Shadow Temple First Beamos", "Shadow Temple", SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_SHADOW_TEMPLE_FIRST_BEAMOS] = Area("Shadow Temple First Beamos", "Shadow Temple", RHT_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FairyPot, {[]{return true;}}), //This fairy pot is only on 3DS
                 }, {
                   //Locations
-                  LocationAccess(SHADOW_TEMPLE_COMPASS_CHEST,            {[]{return IsAdult || KokiriSword || Sticks;}}),
-                  LocationAccess(SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST, {[]{return CanUse(HOVER_BOOTS) || CanUse(HOOKSHOT);}}),
-                  LocationAccess(SHADOW_TEMPLE_GS_NEAR_SHIP,             {[]{return false;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_COMPASS_CHEST,            {[]{return IsAdult || KokiriSword || Sticks;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST, {[]{return CanUse(RG_HOVER_BOOTS) || CanUse(RG_HOOKSHOT);}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_GS_NEAR_SHIP,             {[]{return false;}}),
                 }, {
                   //Exits
-                  Entrance(SHADOW_TEMPLE_HUGE_PIT,    {[]{return HasExplosives && IsAdult && SmallKeys(SHADOW_TEMPLE, 1, 2);}}),
-                  Entrance(SHADOW_TEMPLE_BEYOND_BOAT, {[]{return false;}}),
+                  Entrance(RR_SHADOW_TEMPLE_HUGE_PIT,    {[]{return HasExplosives && IsAdult && SmallKeys(RR_SHADOW_TEMPLE, 1, 2);}}),
+                  Entrance(RR_SHADOW_TEMPLE_BEYOND_BOAT, {[]{return false;}}),
   });
 
-  areaTable[SHADOW_TEMPLE_HUGE_PIT] = Area("Shadow Temple Huge Pit", "Shadow Temple", SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SHADOW_TEMPLE_HUGE_PIT] = Area("Shadow Temple Huge Pit", "Shadow Temple", RHT_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST,   {[]{return true;}}),
-                  LocationAccess(SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST, {[]{return true;}}),
-                  LocationAccess(SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST,       {[]{return true;}}),
-                  LocationAccess(SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST,       {[]{return (LogicShadowUmbrella && HoverBoots) || GoronBracelet;}}),
-                  LocationAccess(SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST,      {[]{return (LogicShadowUmbrella && HoverBoots) || GoronBracelet;}}),
-                  LocationAccess(SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST,           {[]{return SmallKeys(SHADOW_TEMPLE, 2, 3) && ((LogicLensShadowPlatform && LogicLensShadow) || CanUse(LENS_OF_TRUTH));}}),
-                  LocationAccess(SHADOW_TEMPLE_FREESTANDING_KEY,                 {[]{return SmallKeys(SHADOW_TEMPLE, 2, 3) && ((LogicLensShadowPlatform && LogicLensShadow) || CanUse(LENS_OF_TRUTH)) && Hookshot && (Bombs || GoronBracelet || (LogicShadowFreestandingKey && HasBombchus));}}),
-                  LocationAccess(SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM,                {[]{return true;}}),
-                  LocationAccess(SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM,           {[]{return Hookshot || (LogicShadowUmbrellaGS && HoverBoots);}}),
-                  LocationAccess(SHADOW_TEMPLE_GS_SINGLE_GIANT_POT,              {[]{return SmallKeys(SHADOW_TEMPLE, 2, 3) && ((LogicLensShadowPlatform && LogicLensShadow) || CanUse(LENS_OF_TRUTH)) && Hookshot;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST,   {[]{return true;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST,       {[]{return true;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST,       {[]{return (LogicShadowUmbrella && HoverBoots) || GoronBracelet;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST,      {[]{return (LogicShadowUmbrella && HoverBoots) || GoronBracelet;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST,           {[]{return SmallKeys(RR_SHADOW_TEMPLE, 2, 3) && ((LogicLensShadowPlatform && LogicLensShadow) || CanUse(RG_LENS_OF_TRUTH));}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_FREESTANDING_KEY,                 {[]{return SmallKeys(RR_SHADOW_TEMPLE, 2, 3) && ((LogicLensShadowPlatform && LogicLensShadow) || CanUse(RG_LENS_OF_TRUTH)) && Hookshot && (Bombs || GoronBracelet || (LogicShadowFreestandingKey && HasBombchus));}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM,                {[]{return true;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM,           {[]{return Hookshot || (LogicShadowUmbrellaGS && HoverBoots);}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_GS_SINGLE_GIANT_POT,              {[]{return SmallKeys(RR_SHADOW_TEMPLE, 2, 3) && ((LogicLensShadowPlatform && LogicLensShadow) || CanUse(RG_LENS_OF_TRUTH)) && Hookshot;}}),
                 }, {
                   //Exits
-                  Entrance(SHADOW_TEMPLE_WIND_TUNNEL, {[]{return ((LogicLensShadowPlatform && LogicLensShadow) || CanUse(LENS_OF_TRUTH)) && Hookshot && SmallKeys(SHADOW_TEMPLE, 3, 4);}}),
+                  Entrance(RR_SHADOW_TEMPLE_WIND_TUNNEL, {[]{return ((LogicLensShadowPlatform && LogicLensShadow) || CanUse(RG_LENS_OF_TRUTH)) && Hookshot && SmallKeys(RR_SHADOW_TEMPLE, 3, 4);}}),
   });
 
-  areaTable[SHADOW_TEMPLE_WIND_TUNNEL] = Area("Shadow Temple Wind Tunnel", "Shadow Temple", SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SHADOW_TEMPLE_WIND_TUNNEL] = Area("Shadow Temple Wind Tunnel", "Shadow Temple", RHT_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(SHADOW_TEMPLE_WIND_HINT_CHEST,         {[]{return true;}}),
-                  LocationAccess(SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST,  {[]{return true;}}),
-                  LocationAccess(SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST, {[]{return true;}}),
-                  LocationAccess(SHADOW_TEMPLE_GS_NEAR_SHIP,            {[]{return CanUse(LONGSHOT) && SmallKeys(SHADOW_TEMPLE, 4, 5);}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_WIND_HINT_CHEST,         {[]{return true;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST,  {[]{return true;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_GS_NEAR_SHIP,            {[]{return CanUse(RG_LONGSHOT) && SmallKeys(RR_SHADOW_TEMPLE, 4, 5);}}),
                 }, {
                   //Exits
-                  Entrance(SHADOW_TEMPLE_BEYOND_BOAT, {[]{return CanPlay(ZeldasLullaby) && SmallKeys(SHADOW_TEMPLE, 4, 5);}}),
+                  Entrance(RR_SHADOW_TEMPLE_BEYOND_BOAT, {[]{return CanPlay(ZeldasLullaby) && SmallKeys(RR_SHADOW_TEMPLE, 4, 5);}}),
   });
 
-  areaTable[SHADOW_TEMPLE_BEYOND_BOAT] = Area("Shadow Temple Beyond Boat", "Shadow Temple", SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SHADOW_TEMPLE_BEYOND_BOAT] = Area("Shadow Temple Beyond Boat", "Shadow Temple", RHT_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST,      {[]{return CanUse(DINS_FIRE);}}),
-                  LocationAccess(SHADOW_TEMPLE_BOSS_KEY_CHEST,              {[]{return CanUse(DINS_FIRE);}}),
-                  LocationAccess(SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST, {[]{return true;}}),
-                  LocationAccess(SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT,         {[]{return true;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST,      {[]{return CanUse(RG_DINS_FIRE);}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_BOSS_KEY_CHEST,              {[]{return CanUse(RG_DINS_FIRE);}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT,         {[]{return true;}}),
   }, {
                   //Exits
-                  Entrance(SHADOW_TEMPLE_BOSS_ENTRYWAY, {[]{return (CanUse(BOW) || CanUse(DISTANT_SCARECROW) || (LogicShadowStatue && HasBombchus)) && SmallKeys(SHADOW_TEMPLE, 5) && CanUse(HOVER_BOOTS) && BossKeyShadowTemple;}})
+                  Entrance(RR_SHADOW_TEMPLE_BOSS_ENTRYWAY, {[]{return (CanUse(RG_FAIRY_BOW) || CanUse(RG_DISTANT_SCARECROW) || (LogicShadowStatue && HasBombchus)) && SmallKeys(RR_SHADOW_TEMPLE, 5) && CanUse(RG_HOVER_BOOTS) && BossKeyShadowTemple;}})
   });
   }
 
@@ -92,121 +92,121 @@ void AreaTable_Init_ShadowTemple() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (Dungeon::ShadowTemple.IsMQ()) {
-  areaTable[SHADOW_TEMPLE_MQ_BEGINNING] = Area("Shadow Temple MQ Beginning", "Shadow Temple", SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_SHADOW_TEMPLE_MQ_BEGINNING] = Area("Shadow Temple MQ Beginning", "Shadow Temple", RHT_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(SHADOW_TEMPLE_ENTRYWAY,          {[]{return true;}}),
-                  Entrance(SHADOW_TEMPLE_MQ_FIRST_BEAMOS,   {[]{return IsAdult && (CanUse(FIRE_ARROWS) || HoverBoots || (LogicShadowMQGap && CanUse(LONGSHOT)));}}),
-                    //Trick: IsAdult && (CanUse(FIRE_ARROWS) || HoverBoots || (LogicShadowMQGap && CanUse(LONGSHOT)))
-                  Entrance(SHADOW_TEMPLE_MQ_DEAD_HAND_AREA, {[]{return HasExplosives && SmallKeys(SHADOW_TEMPLE, 6);}}),
+                  Entrance(RR_SHADOW_TEMPLE_ENTRYWAY,          {[]{return true;}}),
+                  Entrance(RR_SHADOW_TEMPLE_MQ_FIRST_BEAMOS,   {[]{return IsAdult && (CanUse(RG_FIRE_ARROWS) || HoverBoots || (LogicShadowMQGap && CanUse(RG_LONGSHOT)));}}),
+                    //Trick: IsAdult && (CanUse(RG_FIRE_ARROWS) || HoverBoots || (LogicShadowMQGap && CanUse(RG_LONGSHOT)))
+                  Entrance(RR_SHADOW_TEMPLE_MQ_DEAD_HAND_AREA, {[]{return HasExplosives && SmallKeys(RR_SHADOW_TEMPLE, 6);}}),
   });
 
-  areaTable[SHADOW_TEMPLE_MQ_DEAD_HAND_AREA] = Area("Shadow Temple MQ Dead Hand Area", "Shadow Temple", SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SHADOW_TEMPLE_MQ_DEAD_HAND_AREA] = Area("Shadow Temple MQ Dead Hand Area", "Shadow Temple", RHT_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(SHADOW_TEMPLE_MQ_COMPASS_CHEST,     {[]{return true;}}),
-                  LocationAccess(SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST, {[]{return CanPlay(SongOfTime) && IsAdult && CanUse(BOW);}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_COMPASS_CHEST,     {[]{return true;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST, {[]{return CanPlay(SongOfTime) && IsAdult && CanUse(RG_FAIRY_BOW);}}),
   }, {});
 
-  areaTable[SHADOW_TEMPLE_MQ_FIRST_BEAMOS] = Area("Shadow Temple MQ First Beamos", "Shadow Temple", SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SHADOW_TEMPLE_MQ_FIRST_BEAMOS] = Area("Shadow Temple MQ First Beamos", "Shadow Temple", RHT_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(SHADOW_TEMPLE_MQ_MAP_CHEST,                 {[]{return true;}}),
-                  LocationAccess(SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST,        {[]{return true;}}),
-                  LocationAccess(SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_MAP_CHEST,                 {[]{return true;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST,        {[]{return true;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST, {[]{return true;}}),
   }, {
                   //Exits
-                  Entrance(SHADOW_TEMPLE_MQ_UPPER_HUGE_PIT, {[]{return HasExplosives && SmallKeys(SHADOW_TEMPLE, 2);}}),
+                  Entrance(RR_SHADOW_TEMPLE_MQ_UPPER_HUGE_PIT, {[]{return HasExplosives && SmallKeys(RR_SHADOW_TEMPLE, 2);}}),
   });
 
-  areaTable[SHADOW_TEMPLE_MQ_UPPER_HUGE_PIT] = Area("Shadow Temple MQ Upper Huge Pit", "Shadow Temple", SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SHADOW_TEMPLE_MQ_UPPER_HUGE_PIT] = Area("Shadow Temple MQ Upper Huge Pit", "Shadow Temple", RHT_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST,   {[]{return CanPlay(SongOfTime) || (LogicShadowMQInvisibleBlades && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO));}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST,   {[]{return CanPlay(SongOfTime) || (LogicShadowMQInvisibleBlades && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO));}}),
                     //Trick: CanPlay(SongOfTime) || (LogicShadowMQInvisibleBlades && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO))
-                  LocationAccess(SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST, {[]{return CanPlay(SongOfTime) || (LogicShadowMQInvisibleBlades && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO));}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST, {[]{return CanPlay(SongOfTime) || (LogicShadowMQInvisibleBlades && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO));}}),
                     //Trick: CanPlay(SongOfTime) || (LogicShadowMQInvisibleBlades && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO))
   }, {
                   //Exits
-                  Entrance(SHADOW_TEMPLE_MQ_LOWER_HUGE_PIT, {[]{return HasFireSource || LogicShadowMQHugePit;}}),
+                  Entrance(RR_SHADOW_TEMPLE_MQ_LOWER_HUGE_PIT, {[]{return HasFireSource || LogicShadowMQHugePit;}}),
                     //Trick: HasFireSource || LogicShadowMQHugePit
   });
 
-  areaTable[SHADOW_TEMPLE_MQ_LOWER_HUGE_PIT] = Area("Shadow Temple MQ Lower Huge Pit", "Shadow Temple", SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SHADOW_TEMPLE_MQ_LOWER_HUGE_PIT] = Area("Shadow Temple MQ Lower Huge Pit", "Shadow Temple", RHT_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST,  {[]{return IsAdult && CanUse(LONGSHOT);}}),
-                  LocationAccess(SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST,  {[]{return true;}}),
-                  LocationAccess(SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST,  {[]{return (LogicShadowUmbrella && HoverBoots) || GoronBracelet;}}),
-                  LocationAccess(SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST, {[]{return (LogicShadowUmbrella && HoverBoots) || GoronBracelet;}}),
-                  LocationAccess(SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST,      {[]{return HoverBoots && SmallKeys(SHADOW_TEMPLE, 3) && ((LogicLensShadowMQ && LogicLensShadowMQPlatform) || CanUse(LENS_OF_TRUTH));}}),
-                  LocationAccess(SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST,          {[]{return HoverBoots && SmallKeys(SHADOW_TEMPLE, 3) && Hookshot && ((LogicLensShadowMQ && LogicLensShadowMQInvisibleBlades && LogicLensShadowMQPlatform) || CanUse(LENS_OF_TRUTH));}}),
-                  LocationAccess(SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM,      {[]{return Hookshot || (LogicShadowUmbrellaGS && HoverBoots);}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST,  {[]{return IsAdult && CanUse(RG_LONGSHOT);}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST,  {[]{return true;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST,  {[]{return (LogicShadowUmbrella && HoverBoots) || GoronBracelet;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST, {[]{return (LogicShadowUmbrella && HoverBoots) || GoronBracelet;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST,      {[]{return HoverBoots && SmallKeys(RR_SHADOW_TEMPLE, 3) && ((LogicLensShadowMQ && LogicLensShadowMQPlatform) || CanUse(RG_LENS_OF_TRUTH));}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST,          {[]{return HoverBoots && SmallKeys(RR_SHADOW_TEMPLE, 3) && Hookshot && ((LogicLensShadowMQ && LogicLensShadowMQInvisibleBlades && LogicLensShadowMQPlatform) || CanUse(RG_LENS_OF_TRUTH));}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM,      {[]{return Hookshot || (LogicShadowUmbrellaGS && HoverBoots);}}),
   }, {
                   //Exits
-                  Entrance(SHADOW_TEMPLE_MQ_WIND_TUNNEL, {[]{return HoverBoots && ((LogicLensShadowMQ && LogicLensShadowMQPlatform) || CanUse(LENS_OF_TRUTH)) && Hookshot && SmallKeys(SHADOW_TEMPLE, 4);}}),
+                  Entrance(RR_SHADOW_TEMPLE_MQ_WIND_TUNNEL, {[]{return HoverBoots && ((LogicLensShadowMQ && LogicLensShadowMQPlatform) || CanUse(RG_LENS_OF_TRUTH)) && Hookshot && SmallKeys(RR_SHADOW_TEMPLE, 4);}}),
   });
 
-  areaTable[SHADOW_TEMPLE_MQ_WIND_TUNNEL] = Area("Shadow Temple MQ Wind Tunnel", "Shadow Temple", SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_SHADOW_TEMPLE_MQ_WIND_TUNNEL] = Area("Shadow Temple MQ Wind Tunnel", "Shadow Temple", RHT_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&NutPot, {[]{return true;}}),
   }, {
                   //Locations
-                  LocationAccess(SHADOW_TEMPLE_MQ_WIND_HINT_CHEST,         {[]{return true;}}),
-                  LocationAccess(SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST,  {[]{return true;}}),
-                  LocationAccess(SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST, {[]{return true;}}),
-                  LocationAccess(SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM,       {[]{return true;}}),
-                  LocationAccess(SHADOW_TEMPLE_MQ_GS_AFTER_WIND,           {[]{return true;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_WIND_HINT_CHEST,         {[]{return true;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST,  {[]{return true;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM,       {[]{return true;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_GS_AFTER_WIND,           {[]{return true;}}),
   }, {
                   //Exits
-                  Entrance(SHADOW_TEMPLE_MQ_BEYOND_BOAT, {[]{return CanPlay(ZeldasLullaby) && SmallKeys(SHADOW_TEMPLE, 5);}}),
+                  Entrance(RR_SHADOW_TEMPLE_MQ_BEYOND_BOAT, {[]{return CanPlay(ZeldasLullaby) && SmallKeys(RR_SHADOW_TEMPLE, 5);}}),
   });
 
-  areaTable[SHADOW_TEMPLE_MQ_BEYOND_BOAT] = Area("Shadow Temple MQ Beyond Boat", "Shadow Temple", SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SHADOW_TEMPLE_MQ_BEYOND_BOAT] = Area("Shadow Temple MQ Beyond Boat", "Shadow Temple", RHT_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(SHADOW_TEMPLE_MQ_GS_AFTER_SHIP,  {[]{return true;}}),
-                  LocationAccess(SHADOW_TEMPLE_MQ_GS_NEAR_BOSS,   {[]{return Bow || (LogicShadowStatue && HasBombchus);}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_GS_AFTER_SHIP,  {[]{return true;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS,   {[]{return Bow || (LogicShadowStatue && HasBombchus);}}),
   }, {
                   //Exits
-                  Entrance(SHADOW_TEMPLE_MQ_INVISIBLE_MAZE, {[]{return Bow && CanPlay(SongOfTime) && IsAdult && CanUse(LONGSHOT);}}),
-                  Entrance(SHADOW_TEMPLE_BOSS_ENTRYWAY,     {[]{return (CanUse(BOW) || (LogicShadowStatue && HasBombchus)) && CanUse(HOVER_BOOTS) && BossKeyShadowTemple;}}),
+                  Entrance(RR_SHADOW_TEMPLE_MQ_INVISIBLE_MAZE, {[]{return Bow && CanPlay(SongOfTime) && IsAdult && CanUse(RG_LONGSHOT);}}),
+                  Entrance(RR_SHADOW_TEMPLE_BOSS_ENTRYWAY,     {[]{return (CanUse(RG_FAIRY_BOW) || (LogicShadowStatue && HasBombchus)) && CanUse(RG_HOVER_BOOTS) && BossKeyShadowTemple;}}),
   });
 
-  areaTable[SHADOW_TEMPLE_MQ_INVISIBLE_MAZE] = Area("Shadow Temple MQ Invisible Maze", "Shadow Temple", SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SHADOW_TEMPLE_MQ_INVISIBLE_MAZE] = Area("Shadow Temple MQ Invisible Maze", "Shadow Temple", RHT_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST, {[]{return CanUse(DINS_FIRE) && SmallKeys(SHADOW_TEMPLE, 6);}}),
-                  LocationAccess(SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST,         {[]{return CanUse(DINS_FIRE) && SmallKeys(SHADOW_TEMPLE, 6);}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST, {[]{return CanUse(RG_DINS_FIRE) && SmallKeys(RR_SHADOW_TEMPLE, 6);}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST,         {[]{return CanUse(RG_DINS_FIRE) && SmallKeys(RR_SHADOW_TEMPLE, 6);}}),
                   //below previously returned true
-                  LocationAccess(SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST,      {[]{return CanUse(LENS_OF_TRUTH) || LogicLensShadowMQDeadHand;}}),
-                  LocationAccess(SHADOW_TEMPLE_MQ_FREESTANDING_KEY,       {[]{return true;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST,      {[]{return CanUse(RG_LENS_OF_TRUTH) || LogicLensShadowMQDeadHand;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_FREESTANDING_KEY,       {[]{return true;}}),
   }, {});
   }
 
     /*---------------------------
     |         BOSS ROOM         |
     ---------------------------*/
-    areaTable[SHADOW_TEMPLE_BOSS_ENTRYWAY] =
-        Area("Shadow Temple Boss Entryway", "Shadow Temple", SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
+    areaTable[RR_SHADOW_TEMPLE_BOSS_ENTRYWAY] =
+        Area("Shadow Temple Boss Entryway", "Shadow Temple", RHT_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
              {
                  // Exits
-                 Entrance(SHADOW_TEMPLE_BEYOND_BOAT, { [] { return Dungeon::ShadowTemple.IsVanilla() && false; } }),
-                 Entrance(SHADOW_TEMPLE_MQ_BEYOND_BOAT, { [] { return Dungeon::ShadowTemple.IsMQ() && false; } }),
-                 Entrance(SHADOW_TEMPLE_BOSS_ROOM, { [] { return true; } }),
+                 Entrance(RR_SHADOW_TEMPLE_BEYOND_BOAT, { [] { return Dungeon::ShadowTemple.IsVanilla() && false; } }),
+                 Entrance(RR_SHADOW_TEMPLE_MQ_BEYOND_BOAT, { [] { return Dungeon::ShadowTemple.IsMQ() && false; } }),
+                 Entrance(RR_SHADOW_TEMPLE_BOSS_ROOM, { [] { return true; } }),
              });
 
-    areaTable[SHADOW_TEMPLE_BOSS_ROOM] =
-        Area("Shadow Temple Boss Room", "Shadow Temple", NONE, NO_DAY_NIGHT_CYCLE,
+    areaTable[RR_SHADOW_TEMPLE_BOSS_ROOM] =
+        Area("Shadow Temple Boss Room", "Shadow Temple", RHT_NONE, NO_DAY_NIGHT_CYCLE,
              {
                  // Events
                  EventAccess(&ShadowTempleClear, { [] {
                      return ShadowTempleClear ||
-                            ((CanUse(LENS_OF_TRUTH) || LogicLensBongo) &&
-                             (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD)) &&
-                             (CanUse(HOOKSHOT) || CanUse(BOW) || CanUse(SLINGSHOT) || LogicShadowBongo));
+                            ((CanUse(RG_LENS_OF_TRUTH) || LogicLensBongo) &&
+                             (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) &&
+                             (CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT) || LogicShadowBongo));
                  } }),
              },
              {
                  // Locations
-                 LocationAccess(SHADOW_TEMPLE_BONGO_BONGO_HEART, { [] { return ShadowTempleClear; } }),
-                 LocationAccess(BONGO_BONGO, { [] { return ShadowTempleClear; } }),
+                 LocationAccess(RC_SHADOW_TEMPLE_BONGO_BONGO_HEART, { [] { return ShadowTempleClear; } }),
+                 LocationAccess(RC_BONGO_BONGO, { [] { return ShadowTempleClear; } }),
              },
              {
                  // Exits
-                 Entrance(SHADOW_TEMPLE_BOSS_ENTRYWAY, { [] { return false; } }),
+                 Entrance(RR_SHADOW_TEMPLE_BOSS_ENTRYWAY, { [] { return false; } }),
              });
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp
index ec01cdbfd..68f063cf6 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp
@@ -10,133 +10,133 @@ void AreaTable_Init_SpiritTemple() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[SPIRIT_TEMPLE_ENTRYWAY] = Area("Spirit Temple Entryway", "Spirit Temple", SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_ENTRYWAY] = Area("Spirit Temple Entryway", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(SPIRIT_TEMPLE_LOBBY,                  {[]{return Dungeon::SpiritTemple.IsVanilla();}}),
-                  Entrance(SPIRIT_TEMPLE_MQ_LOBBY,               {[]{return Dungeon::SpiritTemple.IsMQ();}}),
-                  Entrance(DESERT_COLOSSUS_FROM_SPIRIT_ENTRYWAY, {[]{return true;}}),
+                  Entrance(RR_SPIRIT_TEMPLE_LOBBY,                  {[]{return Dungeon::SpiritTemple.IsVanilla();}}),
+                  Entrance(RR_SPIRIT_TEMPLE_MQ_LOBBY,               {[]{return Dungeon::SpiritTemple.IsMQ();}}),
+                  Entrance(RR_DESERT_COLOSSUS_FROM_SPIRIT_ENTRYWAY, {[]{return true;}}),
   });
 
   /*--------------------------
   |     VANILLA DUNGEON      |
   ---------------------------*/
   if (Dungeon::SpiritTemple.IsVanilla()) {
-  areaTable[SPIRIT_TEMPLE_LOBBY] = Area("Spirit Temple Lobby", "Spirit Temple", SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_LOBBY] = Area("Spirit Temple Lobby", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(SPIRIT_TEMPLE_ENTRYWAY,    {[]{return true;}}),
-                  Entrance(SPIRIT_TEMPLE_CHILD,       {[]{return IsChild;}}),
-                  Entrance(SPIRIT_TEMPLE_EARLY_ADULT, {[]{return CanUse(SILVER_GAUNTLETS);}}),
+                  Entrance(RR_SPIRIT_TEMPLE_ENTRYWAY,    {[]{return true;}}),
+                  Entrance(RR_SPIRIT_TEMPLE_CHILD,       {[]{return IsChild;}}),
+                  Entrance(RR_SPIRIT_TEMPLE_EARLY_ADULT, {[]{return CanUse(RG_SILVER_GAUNTLETS);}}),
   });
 
-  areaTable[SPIRIT_TEMPLE_CHILD] = Area("Child Spirit Temple", "Spirit Temple", SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_SPIRIT_TEMPLE_CHILD] = Area("Child Spirit Temple", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&NutCrate, {[]{return true;}}),
                 }, {
                   //Locations
-                  LocationAccess(SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST,        {[]{return (Boomerang || Slingshot || (HasBombchus && LogicSpiritChildBombchu)) && (HasExplosives || ((Nuts || Boomerang) && (Sticks || KokiriSword || Slingshot)));}}),
-                  LocationAccess(SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST, {[]{return (Boomerang || Slingshot || (HasBombchus && LogicSpiritChildBombchu)) && (HasExplosives || ((Nuts || Boomerang) && (Sticks || KokiriSword || Slingshot))) && (Sticks || CanUse(DINS_FIRE));}}),
-                  LocationAccess(SPIRIT_TEMPLE_GS_METAL_FENCE,            {[]{return (Boomerang || Slingshot || (HasBombchus && LogicSpiritChildBombchu)) && (HasExplosives || ((Nuts || Boomerang) && (Sticks || KokiriSword || Slingshot)));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST,        {[]{return (Boomerang || Slingshot || (HasBombchus && LogicSpiritChildBombchu)) && (HasExplosives || ((Nuts || Boomerang) && (Sticks || KokiriSword || Slingshot)));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST, {[]{return (Boomerang || Slingshot || (HasBombchus && LogicSpiritChildBombchu)) && (HasExplosives || ((Nuts || Boomerang) && (Sticks || KokiriSword || Slingshot))) && (Sticks || CanUse(RG_DINS_FIRE));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_GS_METAL_FENCE,            {[]{return (Boomerang || Slingshot || (HasBombchus && LogicSpiritChildBombchu)) && (HasExplosives || ((Nuts || Boomerang) && (Sticks || KokiriSword || Slingshot)));}}),
                 }, {
                   //Exits
-                  Entrance(SPIRIT_TEMPLE_CHILD_CLIMB, {[]{return SmallKeys(SPIRIT_TEMPLE, 1);}}),
+                  Entrance(RR_SPIRIT_TEMPLE_CHILD_CLIMB, {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 1);}}),
   });
 
-  areaTable[SPIRIT_TEMPLE_CHILD_CLIMB] = Area("Child Spirit Temple Climb", "Spirit Temple", SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_CHILD_CLIMB] = Area("Child Spirit Temple Climb", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST, {[]{return HasProjectile(HasProjectileAge::Both) || ((SmallKeys(SPIRIT_TEMPLE, 3) || (SmallKeys(SPIRIT_TEMPLE, 2) && BombchusInLogic && ShuffleDungeonEntrances.Is(SHUFFLEDUNGEONS_OFF))) && CanUse(SILVER_GAUNTLETS) && HasProjectile(HasProjectileAge::Adult)) || (SmallKeys(SPIRIT_TEMPLE, 5) && IsChild && HasProjectile(HasProjectileAge::Child));}}),
-                  LocationAccess(SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST,  {[]{return HasProjectile(HasProjectileAge::Both) || ((SmallKeys(SPIRIT_TEMPLE, 3) || (SmallKeys(SPIRIT_TEMPLE, 2) && BombchusInLogic && ShuffleDungeonEntrances.Is(SHUFFLEDUNGEONS_OFF))) && CanUse(SILVER_GAUNTLETS) && HasProjectile(HasProjectileAge::Adult)) || (SmallKeys(SPIRIT_TEMPLE, 5) && IsChild && HasProjectile(HasProjectileAge::Child));}}),
-                  LocationAccess(SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM,    {[]{return HasProjectile(HasProjectileAge::Both) || CanUse(DINS_FIRE) ||
+                  LocationAccess(RC_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST, {[]{return HasProjectile(HasProjectileAge::Both) || ((SmallKeys(RR_SPIRIT_TEMPLE, 3) || (SmallKeys(RR_SPIRIT_TEMPLE, 2) && BombchusInLogic && ShuffleDungeonEntrances.Is(SHUFFLEDUNGEONS_OFF))) && CanUse(RG_SILVER_GAUNTLETS) && HasProjectile(HasProjectileAge::Adult)) || (SmallKeys(RR_SPIRIT_TEMPLE, 5) && IsChild && HasProjectile(HasProjectileAge::Child));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST,  {[]{return HasProjectile(HasProjectileAge::Both) || ((SmallKeys(RR_SPIRIT_TEMPLE, 3) || (SmallKeys(RR_SPIRIT_TEMPLE, 2) && BombchusInLogic && ShuffleDungeonEntrances.Is(SHUFFLEDUNGEONS_OFF))) && CanUse(RG_SILVER_GAUNTLETS) && HasProjectile(HasProjectileAge::Adult)) || (SmallKeys(RR_SPIRIT_TEMPLE, 5) && IsChild && HasProjectile(HasProjectileAge::Child));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM,    {[]{return HasProjectile(HasProjectileAge::Both) || CanUse(RG_DINS_FIRE) ||
                                                                                       (CanTakeDamage && (Sticks || KokiriSword || HasProjectile(HasProjectileAge::Child))) ||
-                                                                                        (IsChild && SmallKeys(SPIRIT_TEMPLE, 5) && HasProjectile(HasProjectileAge::Child)) ||
-                                                                                          ((SmallKeys(SPIRIT_TEMPLE, 3) || (SmallKeys(SPIRIT_TEMPLE, 2) && BombchusInLogic && ShuffleDungeonEntrances.Is(SHUFFLEDUNGEONS_OFF))) && CanUse(SILVER_GAUNTLETS) && (HasProjectile(HasProjectileAge::Adult) || CanTakeDamage));}}),
+                                                                                        (IsChild && SmallKeys(RR_SPIRIT_TEMPLE, 5) && HasProjectile(HasProjectileAge::Child)) ||
+                                                                                          ((SmallKeys(RR_SPIRIT_TEMPLE, 3) || (SmallKeys(RR_SPIRIT_TEMPLE, 2) && BombchusInLogic && ShuffleDungeonEntrances.Is(SHUFFLEDUNGEONS_OFF))) && CanUse(RG_SILVER_GAUNTLETS) && (HasProjectile(HasProjectileAge::Adult) || CanTakeDamage));}}),
                 }, {
                   //Exits
-                  Entrance(SPIRIT_TEMPLE_CENTRAL_CHAMBER, {[]{return HasExplosives || (SunlightArrows && CanUse(LIGHT_ARROWS));}}),
+                  Entrance(RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER, {[]{return HasExplosives || (SunlightArrows && CanUse(RG_LIGHT_ARROWS));}}),
   });
 
-  areaTable[SPIRIT_TEMPLE_EARLY_ADULT] = Area("Early Adult Spirit Temple", "Spirit Temple", SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_EARLY_ADULT] = Area("Early Adult Spirit Temple", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(SPIRIT_TEMPLE_COMPASS_CHEST,            {[]{return CanUse(HOOKSHOT) && CanPlay(ZeldasLullaby);}}),
-                  LocationAccess(SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST,  {[]{return Bow || Hookshot || HasBombchus || (Bombs && LogicSpiritLowerAdultSwitch);}}),
-                  LocationAccess(SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST,  {[]{return SmallKeys(SPIRIT_TEMPLE, 3);}}),
-                  LocationAccess(SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST, {[]{return SmallKeys(SPIRIT_TEMPLE, 3);}}),
-                  LocationAccess(SPIRIT_TEMPLE_GS_BOULDER_ROOM,          {[]{return CanPlay(SongOfTime) && (Bow || Hookshot || HasBombchus || (Bombs && LogicSpiritLowerAdultSwitch));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_COMPASS_CHEST,            {[]{return CanUse(RG_HOOKSHOT) && CanPlay(ZeldasLullaby);}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST,  {[]{return Bow || Hookshot || HasBombchus || (Bombs && LogicSpiritLowerAdultSwitch);}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST,  {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 3);}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST, {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 3);}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_GS_BOULDER_ROOM,          {[]{return CanPlay(SongOfTime) && (Bow || Hookshot || HasBombchus || (Bombs && LogicSpiritLowerAdultSwitch));}}),
                 }, {
                   //Exits
-                  Entrance(SPIRIT_TEMPLE_CENTRAL_CHAMBER, {[]{return SmallKeys(SPIRIT_TEMPLE, 1);}}),
+                  Entrance(RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER, {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 1);}}),
   });
 
-  areaTable[SPIRIT_TEMPLE_CENTRAL_CHAMBER] = Area("Spirit Temple Central Chamber", "Spirit Temple", SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER] = Area("Spirit Temple Central Chamber", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(SPIRIT_TEMPLE_MAP_CHEST,                    {[]{return ((HasExplosives || SmallKeys(SPIRIT_TEMPLE, 3) || (SmallKeys(SPIRIT_TEMPLE, 2) && BombchusInLogic && ShuffleDungeonEntrances.Is(SHUFFLEDUNGEONS_OFF))) &&
+                  LocationAccess(RC_SPIRIT_TEMPLE_MAP_CHEST,                    {[]{return ((HasExplosives || SmallKeys(RR_SPIRIT_TEMPLE, 3) || (SmallKeys(RR_SPIRIT_TEMPLE, 2) && BombchusInLogic && ShuffleDungeonEntrances.Is(SHUFFLEDUNGEONS_OFF))) &&
 
-                                                                                                (CanUse(DINS_FIRE) ||
+                                                                                                (CanUse(RG_DINS_FIRE) ||
                                                                                                     (((MagicMeter && FireArrows) || LogicSpiritMapChest) && Bow && Sticks))) ||
-                                                                                            (SmallKeys(SPIRIT_TEMPLE, 5) && HasExplosives &&
-                                                                                                CanUse(STICKS)) ||
-                                                                                            (SmallKeys(SPIRIT_TEMPLE, 3) &&
-                                                                                                (CanUse(FIRE_ARROWS) || (LogicSpiritMapChest && Bow)) &&
-                                                                                                CanUse(SILVER_GAUNTLETS));}}),
-                  LocationAccess(SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST,         {[]{return ((HasExplosives || SmallKeys(SPIRIT_TEMPLE, 3) || (SmallKeys(SPIRIT_TEMPLE, 2) && BombchusInLogic && ShuffleDungeonEntrances.Is(SHUFFLEDUNGEONS_OFF))) &&
-                                                                                                (CanUse(DINS_FIRE) ||
+                                                                                            (SmallKeys(RR_SPIRIT_TEMPLE, 5) && HasExplosives &&
+                                                                                                CanUse(RG_STICKS)) ||
+                                                                                            (SmallKeys(RR_SPIRIT_TEMPLE, 3) &&
+                                                                                                (CanUse(RG_FIRE_ARROWS) || (LogicSpiritMapChest && Bow)) &&
+                                                                                                CanUse(RG_SILVER_GAUNTLETS));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST,         {[]{return ((HasExplosives || SmallKeys(RR_SPIRIT_TEMPLE, 3) || (SmallKeys(RR_SPIRIT_TEMPLE, 2) && BombchusInLogic && ShuffleDungeonEntrances.Is(SHUFFLEDUNGEONS_OFF))) &&
+                                                                                                (CanUse(RG_DINS_FIRE) ||
                                                                                                     (((MagicMeter && FireArrows) || LogicSpiritSunChest) && Bow && Sticks))) ||
-                                                                                            (SmallKeys(SPIRIT_TEMPLE, 5) && HasExplosives &&
-                                                                                                CanUse(STICKS)) ||
-                                                                                            (SmallKeys(SPIRIT_TEMPLE, 3) &&
-                                                                                                (CanUse(FIRE_ARROWS) || (LogicSpiritSunChest && Bow)) &&
-                                                                                                CanUse(SILVER_GAUNTLETS));}}),
-                  LocationAccess(SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST,       {[]{return SmallKeys(SPIRIT_TEMPLE, 3) && CanUse(SILVER_GAUNTLETS) && CanPlay(ZeldasLullaby);}}),
-                  LocationAccess(SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST,  {[]{return SmallKeys(SPIRIT_TEMPLE, 3) && CanUse(SILVER_GAUNTLETS) && CanPlay(ZeldasLullaby) && (Hookshot || HoverBoots || LogicSpiritLobbyJump);}}),
-                  LocationAccess(SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM, {[]{return (HasExplosives && Boomerang && Hookshot) ||
-                                                                                            (CanUse(BOOMERANG) && SmallKeys(SPIRIT_TEMPLE, 5) && HasExplosives) ||
-                                                                                            (Hookshot && CanUse(SILVER_GAUNTLETS) &&
-                                                                                                (SmallKeys(SPIRIT_TEMPLE, 3) ||
-                                                                                                    (SmallKeys(SPIRIT_TEMPLE, 2) && Boomerang && BombchusInLogic && ShuffleDungeonEntrances.Is(SHUFFLEDUNGEONS_OFF))));}}),
-                  LocationAccess(SPIRIT_TEMPLE_GS_LOBBY,                     {[]{return ((HasExplosives || SmallKeys(SPIRIT_TEMPLE, 3) || (SmallKeys(SPIRIT_TEMPLE, 2) && BombchusInLogic && ShuffleDungeonEntrances.Is(SHUFFLEDUNGEONS_OFF))) &&
+                                                                                            (SmallKeys(RR_SPIRIT_TEMPLE, 5) && HasExplosives &&
+                                                                                                CanUse(RG_STICKS)) ||
+                                                                                            (SmallKeys(RR_SPIRIT_TEMPLE, 3) &&
+                                                                                                (CanUse(RG_FIRE_ARROWS) || (LogicSpiritSunChest && Bow)) &&
+                                                                                                CanUse(RG_SILVER_GAUNTLETS));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST,       {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 3) && CanUse(RG_SILVER_GAUNTLETS) && CanPlay(ZeldasLullaby);}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST,  {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 3) && CanUse(RG_SILVER_GAUNTLETS) && CanPlay(ZeldasLullaby) && (Hookshot || HoverBoots || LogicSpiritLobbyJump);}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM, {[]{return (HasExplosives && Boomerang && Hookshot) ||
+                                                                                            (CanUse(RG_BOOMERANG) && SmallKeys(RR_SPIRIT_TEMPLE, 5) && HasExplosives) ||
+                                                                                            (Hookshot && CanUse(RG_SILVER_GAUNTLETS) &&
+                                                                                                (SmallKeys(RR_SPIRIT_TEMPLE, 3) ||
+                                                                                                    (SmallKeys(RR_SPIRIT_TEMPLE, 2) && Boomerang && BombchusInLogic && ShuffleDungeonEntrances.Is(SHUFFLEDUNGEONS_OFF))));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_GS_LOBBY,                     {[]{return ((HasExplosives || SmallKeys(RR_SPIRIT_TEMPLE, 3) || (SmallKeys(RR_SPIRIT_TEMPLE, 2) && BombchusInLogic && ShuffleDungeonEntrances.Is(SHUFFLEDUNGEONS_OFF))) &&
                                                                                                 LogicSpiritLobbyGS && Boomerang && (Hookshot || HoverBoots || LogicSpiritLobbyJump)) ||
-                                                                                            (LogicSpiritLobbyGS && SmallKeys(SPIRIT_TEMPLE, 5) && HasExplosives && CanUse(BOOMERANG)) ||
-                                                                                            (SmallKeys(SPIRIT_TEMPLE, 3) && CanUse(SILVER_GAUNTLETS) && (Hookshot || HoverBoots || LogicSpiritLobbyJump));}}),
+                                                                                            (LogicSpiritLobbyGS && SmallKeys(RR_SPIRIT_TEMPLE, 5) && HasExplosives && CanUse(RG_BOOMERANG)) ||
+                                                                                            (SmallKeys(RR_SPIRIT_TEMPLE, 3) && CanUse(RG_SILVER_GAUNTLETS) && (Hookshot || HoverBoots || LogicSpiritLobbyJump));}}),
                 }, {
                   //Exits
-                  Entrance(SPIRIT_TEMPLE_OUTDOOR_HANDS,              {[]{return true;}}),
-                  Entrance(SPIRIT_TEMPLE_BEYOND_CENTRAL_LOCKED_DOOR, {[]{return SmallKeys(SPIRIT_TEMPLE, 4) && CanUse(SILVER_GAUNTLETS);}}),
-                  Entrance(SPIRIT_TEMPLE_CHILD_CLIMB,                {[]{return true;}}),
+                  Entrance(RR_SPIRIT_TEMPLE_OUTDOOR_HANDS,              {[]{return true;}}),
+                  Entrance(RR_SPIRIT_TEMPLE_BEYOND_CENTRAL_LOCKED_DOOR, {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 4) && CanUse(RG_SILVER_GAUNTLETS);}}),
+                  Entrance(RR_SPIRIT_TEMPLE_CHILD_CLIMB,                {[]{return true;}}),
   });
 
-  areaTable[SPIRIT_TEMPLE_OUTDOOR_HANDS] = Area("Spirit Temple Outdoor Hands", "Spirit Temple", SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_OUTDOOR_HANDS] = Area("Spirit Temple Outdoor Hands", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST, {[]{return (SmallKeys(SPIRIT_TEMPLE, 3) && Longshot && HasExplosives) || SmallKeys(SPIRIT_TEMPLE, 5);}}),
-                  LocationAccess(SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST,    {[]{return SmallKeys(SPIRIT_TEMPLE, 4) && CanUse(SILVER_GAUNTLETS) && HasExplosives;}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST, {[]{return (SmallKeys(RR_SPIRIT_TEMPLE, 3) && Longshot && HasExplosives) || SmallKeys(RR_SPIRIT_TEMPLE, 5);}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST,    {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 4) && CanUse(RG_SILVER_GAUNTLETS) && HasExplosives;}}),
                 }, {
                   //Exits
-                  Entrance(DESERT_COLOSSUS, {[]{return (IsChild && SmallKeys(SPIRIT_TEMPLE, 5)) || (CanUse(SILVER_GAUNTLETS) && ((SmallKeys(SPIRIT_TEMPLE, 3) && HasExplosives) || SmallKeys(SPIRIT_TEMPLE, 5)));}}),
+                  Entrance(RR_DESERT_COLOSSUS, {[]{return (IsChild && SmallKeys(RR_SPIRIT_TEMPLE, 5)) || (CanUse(RG_SILVER_GAUNTLETS) && ((SmallKeys(RR_SPIRIT_TEMPLE, 3) && HasExplosives) || SmallKeys(RR_SPIRIT_TEMPLE, 5)));}}),
   });
 
-  areaTable[SPIRIT_TEMPLE_BEYOND_CENTRAL_LOCKED_DOOR] = Area("Spirit Temple Beyond Central Locked Door", "Spirit Temple", SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_BEYOND_CENTRAL_LOCKED_DOOR] = Area("Spirit Temple Beyond Central Locked Door", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST,         {[]{return (MirrorShield || (SunlightArrows && CanUse(LIGHT_ARROWS))) && HasExplosives;}}),
-                  LocationAccess(SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST,  {[]{return (LogicLensSpirit || CanUse(LENS_OF_TRUTH)) && HasExplosives;}}),
-                  LocationAccess(SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST, {[]{return (LogicLensSpirit || CanUse(LENS_OF_TRUTH)) && HasExplosives;}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST,         {[]{return (MirrorShield || (SunlightArrows && CanUse(RG_LIGHT_ARROWS))) && HasExplosives;}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST,  {[]{return (LogicLensSpirit || CanUse(RG_LENS_OF_TRUTH)) && HasExplosives;}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST, {[]{return (LogicLensSpirit || CanUse(RG_LENS_OF_TRUTH)) && HasExplosives;}}),
                 }, {
                   //Exits
-                  Entrance(SPIRIT_TEMPLE_BEYOND_FINAL_LOCKED_DOOR, {[]{return SmallKeys(SPIRIT_TEMPLE, 5) && (LogicSpiritWall || CanUse(LONGSHOT) || HasBombchus || ((Bombs || Nuts || CanUse(DINS_FIRE)) && (Bow || CanUse(HOOKSHOT) || Hammer)));}}),
+                  Entrance(RR_SPIRIT_TEMPLE_BEYOND_FINAL_LOCKED_DOOR, {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 5) && (LogicSpiritWall || CanUse(RG_LONGSHOT) || HasBombchus || ((Bombs || Nuts || CanUse(RG_DINS_FIRE)) && (Bow || CanUse(RG_HOOKSHOT) || Hammer)));}}),
   });
 
-  areaTable[SPIRIT_TEMPLE_BEYOND_FINAL_LOCKED_DOOR] = Area("Spirit Temple Beyond Final Locked Door", "Spirit Temple", SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_BEYOND_FINAL_LOCKED_DOOR] = Area("Spirit Temple Beyond Final Locked Door", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(SPIRIT_TEMPLE_BOSS_KEY_CHEST, {[]{return CanPlay(ZeldasLullaby) && ((CanTakeDamage && LogicFlamingChests) || (Bow && Hookshot));}}),
-                  LocationAccess(SPIRIT_TEMPLE_TOPMOST_CHEST,  {[]{return MirrorShield || (SunlightArrows && CanUse(LIGHT_ARROWS));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_BOSS_KEY_CHEST, {[]{return CanPlay(ZeldasLullaby) && ((CanTakeDamage && LogicFlamingChests) || (Bow && Hookshot));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_TOPMOST_CHEST,  {[]{return MirrorShield || (SunlightArrows && CanUse(RG_LIGHT_ARROWS));}}),
   }, {
                   //Exits
-                  Entrance(SPIRIT_TEMPLE_INSIDE_STATUE_HEAD, {[]{return MirrorShield && HasExplosives && Hookshot;}}),
+                  Entrance(RR_SPIRIT_TEMPLE_INSIDE_STATUE_HEAD, {[]{return MirrorShield && HasExplosives && Hookshot;}}),
   });
 
-  areaTable[SPIRIT_TEMPLE_INSIDE_STATUE_HEAD] =
-            Area("Spirit Temple Inside Statue Head", "Spirit Temple", SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
+  areaTable[RR_SPIRIT_TEMPLE_INSIDE_STATUE_HEAD] =
+            Area("Spirit Temple Inside Statue Head", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
                  {
                      // Exits
-                     Entrance(SPIRIT_TEMPLE_CENTRAL_CHAMBER, { [] { return true; } }),
-                     Entrance(SPIRIT_TEMPLE_BOSS_ENTRYWAY, { [] { return BossKeySpiritTemple; } }),
+                     Entrance(RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER, { [] { return true; } }),
+                     Entrance(RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY, { [] { return BossKeySpiritTemple; } }),
                  });
   }
 
@@ -144,132 +144,132 @@ void AreaTable_Init_SpiritTemple() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (Dungeon::SpiritTemple.IsMQ()) {
-  areaTable[SPIRIT_TEMPLE_MQ_LOBBY] = Area("Spirit Temple MQ Lobby", "Spirit Temple", SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_MQ_LOBBY] = Area("Spirit Temple MQ Lobby", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST, {[]{return true;}}),
-                  LocationAccess(SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST,  {[]{return Here(SPIRIT_TEMPLE_MQ_LOBBY, []{return CanBlastOrSmash;}) && ((IsChild && CanUse(SLINGSHOT)) || (IsAdult && CanUse(BOW)));}}),
-                  LocationAccess(SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST, {[]{return HasBombchus || (IsAdult && (CanUse(BOW) || CanUse(HOOKSHOT))) || (IsChild && (CanUse(SLINGSHOT) || CanUse(BOOMERANG)));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST,  {[]{return Here(RR_SPIRIT_TEMPLE_MQ_LOBBY, []{return CanBlastOrSmash;}) && ((IsChild && CanUse(RG_FAIRY_SLINGSHOT)) || (IsAdult && CanUse(RG_FAIRY_BOW)));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST, {[]{return HasBombchus || (IsAdult && (CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT))) || (IsChild && (CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOOMERANG)));}}),
   }, {
                   //Exits
-                  Entrance(SPIRIT_TEMPLE_ENTRYWAY, {[]{return true;}}),
-                  Entrance(SPIRIT_TEMPLE_MQ_CHILD, {[]{return IsChild;}}),
-                  Entrance(SPIRIT_TEMPLE_MQ_ADULT, {[]{return HasBombchus && IsAdult && CanUse(LONGSHOT) && CanUse(SILVER_GAUNTLETS);}}),
+                  Entrance(RR_SPIRIT_TEMPLE_ENTRYWAY, {[]{return true;}}),
+                  Entrance(RR_SPIRIT_TEMPLE_MQ_CHILD, {[]{return IsChild;}}),
+                  Entrance(RR_SPIRIT_TEMPLE_MQ_ADULT, {[]{return HasBombchus && IsAdult && CanUse(RG_LONGSHOT) && CanUse(RG_SILVER_GAUNTLETS);}}),
   });
 
-  areaTable[SPIRIT_TEMPLE_MQ_CHILD] = Area("Spirit Temple MQ Child", "Spirit Temple", SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_SPIRIT_TEMPLE_MQ_CHILD] = Area("Spirit Temple MQ Child", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FairyPot, {[]{return FairyPot || (KokiriSword && HasBombchus && Slingshot);}}),
   }, {
                   //Locations
-                  LocationAccess(SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST,  {[]{return Here(SPIRIT_TEMPLE_MQ_ADULT, []{return SmallKeys(SPIRIT_TEMPLE, 7) && Hammer;});}}),
-                  LocationAccess(SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST,       {[]{return KokiriSword && HasBombchus && Slingshot && CanUse(DINS_FIRE);}}),
-                  LocationAccess(SPIRIT_TEMPLE_MQ_MAP_CHEST,                  {[]{return KokiriSword || Bombs;}}),
-                  LocationAccess(SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST, {[]{return HasBombchus && SmallKeys(SPIRIT_TEMPLE, 7) && Slingshot && (CanUse(DINS_FIRE) || (Here(SPIRIT_TEMPLE_MQ_ADULT, []{return IsAdult && (CanUse(FIRE_ARROWS) || (LogicSpiritMQFrozenEye && CanUse(BOW) && CanPlay(SongOfTime)));})));}}),
-                    //Trick: HasBombchus && SmallKeys(SPIRIT_TEMPLE, 7) && Slingshot && (CanUse(DINS_FIRE) || (SPIRIT_TEMPLE_MQ_ADULT.Adult() && IsAdult && (CanUse(FIRE_ARROWS) || (LogicSpiritMQFrozenEye && CanUse(BOW) && CanPlay(SongOfTime)))))
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST,  {[]{return Here(RR_SPIRIT_TEMPLE_MQ_ADULT, []{return SmallKeys(RR_SPIRIT_TEMPLE, 7) && Hammer;});}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST,       {[]{return KokiriSword && HasBombchus && Slingshot && CanUse(RG_DINS_FIRE);}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_MAP_CHEST,                  {[]{return KokiriSword || Bombs;}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST, {[]{return HasBombchus && SmallKeys(RR_SPIRIT_TEMPLE, 7) && Slingshot && (CanUse(RG_DINS_FIRE) || (Here(RR_SPIRIT_TEMPLE_MQ_ADULT, []{return IsAdult && (CanUse(RG_FIRE_ARROWS) || (LogicSpiritMQFrozenEye && CanUse(RG_FAIRY_BOW) && CanPlay(SongOfTime)));})));}}),
+                    //Trick: HasBombchus && SmallKeys(RR_SPIRIT_TEMPLE, 7) && Slingshot && (CanUse(RG_DINS_FIRE) || (SPIRIT_TEMPLE_MQ_ADULT.Adult() && IsAdult && (CanUse(RG_FIRE_ARROWS) || (LogicSpiritMQFrozenEye && CanUse(RG_FAIRY_BOW) && CanPlay(SongOfTime)))))
   }, {
                   //Exits
-                  Entrance(SPIRIT_TEMPLE_MQ_SHARED, {[]{return HasBombchus && SmallKeys(SPIRIT_TEMPLE, 2);}}),
+                  Entrance(RR_SPIRIT_TEMPLE_MQ_SHARED, {[]{return HasBombchus && SmallKeys(RR_SPIRIT_TEMPLE, 2);}}),
   });
 
-  areaTable[SPIRIT_TEMPLE_MQ_ADULT] = Area("Spirit Temple MQ Adult", "Spirit Temple", SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_MQ_ADULT] = Area("Spirit Temple MQ Adult", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST,     {[]{return SmallKeys(SPIRIT_TEMPLE, 7);}}),
-                  LocationAccess(SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST,   {[]{return CanPlay(ZeldasLullaby);}}),
-                  LocationAccess(SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST, {[]{return (LogicLensSpiritMQ || CanUse(LENS_OF_TRUTH));}}),
-                  LocationAccess(SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST,           {[]{return SmallKeys(SPIRIT_TEMPLE, 5);}}),
-                  LocationAccess(SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST,          {[]{return SmallKeys(SPIRIT_TEMPLE, 5) && CanPlay(SongOfTime);}}),
-                  LocationAccess(SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST,              {[]{return SmallKeys(SPIRIT_TEMPLE, 5) && CanPlay(SongOfTime) && (MirrorShield || (SunlightArrows && CanUse(LIGHT_ARROWS)));}}),
-                  LocationAccess(SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST,   {[]{return SmallKeys(SPIRIT_TEMPLE, 7);}}),
-                  LocationAccess(SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH,  {[]{return SmallKeys(SPIRIT_TEMPLE, 7);}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST,     {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 7);}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST,   {[]{return CanPlay(ZeldasLullaby);}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST, {[]{return (LogicLensSpiritMQ || CanUse(RG_LENS_OF_TRUTH));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST,           {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 5);}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST,          {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 5) && CanPlay(SongOfTime);}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST,              {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 5) && CanPlay(SongOfTime) && (MirrorShield || (SunlightArrows && CanUse(RG_LIGHT_ARROWS)));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST,   {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 7);}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH,  {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 7);}}),
   }, {
                   //Exits
-                  Entrance(SPIRIT_TEMPLE_MQ_LOWER_ADULT,        {[]{return MirrorShield && IsAdult && (CanUse(FIRE_ARROWS) || (LogicSpiritMQLowerAdult && CanUse(DINS_FIRE) && Bow));}}),
-                    //Trick: MirrorShield && IsAdult && (CanUse(FIRE_ARROWS) || (LogicSpiritMQLowerAdult && CanUse(DINS_FIRE) && Bow))
-                  Entrance(SPIRIT_TEMPLE_MQ_SHARED,             {[]{return true;}}),
-                  Entrance(SPIRIT_TEMPLE_MQ_BOSS_AREA,          {[]{return SmallKeys(SPIRIT_TEMPLE, 6) && CanPlay(ZeldasLullaby) && Hammer;}}),
-                  Entrance(SPIRIT_TEMPLE_MQ_MIRROR_SHIELD_HAND, {[]{return SmallKeys(SPIRIT_TEMPLE, 5) && CanPlay(SongOfTime) && (LogicLensSpiritMQ || CanUse(LENS_OF_TRUTH));}}),
+                  Entrance(RR_SPIRIT_TEMPLE_MQ_LOWER_ADULT,        {[]{return MirrorShield && IsAdult && (CanUse(RG_FIRE_ARROWS) || (LogicSpiritMQLowerAdult && CanUse(RG_DINS_FIRE) && Bow));}}),
+                    //Trick: MirrorShield && IsAdult && (CanUse(RG_FIRE_ARROWS) || (LogicSpiritMQLowerAdult && CanUse(RG_DINS_FIRE) && Bow))
+                  Entrance(RR_SPIRIT_TEMPLE_MQ_SHARED,             {[]{return true;}}),
+                  Entrance(RR_SPIRIT_TEMPLE_MQ_BOSS_AREA,          {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 6) && CanPlay(ZeldasLullaby) && Hammer;}}),
+                  Entrance(RR_SPIRIT_TEMPLE_MQ_MIRROR_SHIELD_HAND, {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 5) && CanPlay(SongOfTime) && (LogicLensSpiritMQ || CanUse(RG_LENS_OF_TRUTH));}}),
   });
 
-  areaTable[SPIRIT_TEMPLE_MQ_SHARED] = Area("Spirit Temple MQ Shared", "Spirit Temple", SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_MQ_SHARED] = Area("Spirit Temple MQ Shared", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST, {[]{return SmallKeys(SPIRIT_TEMPLE, 6);}}),
-                  LocationAccess(SPIRIT_TEMPLE_MQ_COMPASS_CHEST,           {[]{return (IsChild && CanUse(SLINGSHOT) && SmallKeys(SPIRIT_TEMPLE, 7)) || (IsAdult && CanUse(BOW)) || (Bow && Slingshot);}}),
-                  LocationAccess(SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST,    {[]{return CanPlay(SongOfTime) || LogicSpiritMQSunBlockSoT || IsAdult;}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST, {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 6);}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_COMPASS_CHEST,           {[]{return (IsChild && CanUse(RG_FAIRY_SLINGSHOT) && SmallKeys(RR_SPIRIT_TEMPLE, 7)) || (IsAdult && CanUse(RG_FAIRY_BOW)) || (Bow && Slingshot);}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST,    {[]{return CanPlay(SongOfTime) || LogicSpiritMQSunBlockSoT || IsAdult;}}),
                     //Trick: CanPlay(SongOfTime) || LogicSpiritMQSunBlockSoT || IsAdult
-                  LocationAccess(SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM,       {[]{return (LogicSpiritMQSunBlockGS && Boomerang && (CanPlay(SongOfTime) || LogicSpiritMQSunBlockSoT)) || IsAdult;}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM,       {[]{return (LogicSpiritMQSunBlockGS && Boomerang && (CanPlay(SongOfTime) || LogicSpiritMQSunBlockSoT)) || IsAdult;}}),
                     //Trick: (LogicSpiritMQSunBlockGS && Boomerang && (CanPlay(SongOfTime) || LogicSpiritMQSunBlockSoT)) || IsAdult
    }, {
                   //Exits
-                  Entrance(SPIRIT_TEMPLE_MQ_SILVER_GAUNTLETS_HAND, {[]{return (SmallKeys(SPIRIT_TEMPLE, 7) && (CanPlay(SongOfTime) || LogicSpiritMQSunBlockSoT || IsAdult)) || (SmallKeys(SPIRIT_TEMPLE, 4) && CanPlay(SongOfTime) && (LogicLensSpiritMQ || CanUse(LENS_OF_TRUTH)));}}),
-                    //Trick: (SmallKeys(SPIRIT_TEMPLE, 7) && (CanPlay(SongOfTime) || LogicSpiritMQSunBlockSoT || IsAdult)) || (SmallKeys(SPIRIT_TEMPLE, 4) && CanPlay(SongOfTime) && (LogicLensSpiritMQ || CanUse(LENS_OF_TRUTH)))
-                  Entrance(DESERT_COLOSSUS,                        {[]{return (SmallKeys(SPIRIT_TEMPLE, 7) && (CanPlay(SongOfTime) || LogicSpiritMQSunBlockSoT || IsAdult)) || (SmallKeys(SPIRIT_TEMPLE, 4) && CanPlay(SongOfTime) && (LogicLensSpiritMQ || CanUse(LENS_OF_TRUTH)) && IsAdult);}}),
-                    //Trick: (SmallKeys(SPIRIT_TEMPLE, 7) && (CanPlay(SongOfTime) || LogicSpiritMQSunBlockSoT || IsAdult)) || (SmallKeys(SPIRIT_TEMPLE, 4) && CanPlay(SongOfTime) && (LogicLensSpiritMQ || CanUse(LENS_OF_TRUTH)) && IsAdult)
+                  Entrance(RR_SPIRIT_TEMPLE_MQ_SILVER_GAUNTLETS_HAND, {[]{return (SmallKeys(RR_SPIRIT_TEMPLE, 7) && (CanPlay(SongOfTime) || LogicSpiritMQSunBlockSoT || IsAdult)) || (SmallKeys(RR_SPIRIT_TEMPLE, 4) && CanPlay(SongOfTime) && (LogicLensSpiritMQ || CanUse(RG_LENS_OF_TRUTH)));}}),
+                    //Trick: (SmallKeys(RR_SPIRIT_TEMPLE, 7) && (CanPlay(SongOfTime) || LogicSpiritMQSunBlockSoT || IsAdult)) || (SmallKeys(RR_SPIRIT_TEMPLE, 4) && CanPlay(SongOfTime) && (LogicLensSpiritMQ || CanUse(RG_LENS_OF_TRUTH)))
+                  Entrance(RR_DESERT_COLOSSUS,                        {[]{return (SmallKeys(RR_SPIRIT_TEMPLE, 7) && (CanPlay(SongOfTime) || LogicSpiritMQSunBlockSoT || IsAdult)) || (SmallKeys(RR_SPIRIT_TEMPLE, 4) && CanPlay(SongOfTime) && (LogicLensSpiritMQ || CanUse(RG_LENS_OF_TRUTH)) && IsAdult);}}),
+                    //Trick: (SmallKeys(RR_SPIRIT_TEMPLE, 7) && (CanPlay(SongOfTime) || LogicSpiritMQSunBlockSoT || IsAdult)) || (SmallKeys(RR_SPIRIT_TEMPLE, 4) && CanPlay(SongOfTime) && (LogicLensSpiritMQ || CanUse(RG_LENS_OF_TRUTH)) && IsAdult)
   });
 
-  areaTable[SPIRIT_TEMPLE_MQ_LOWER_ADULT] = Area("Spirit Temple MQ Lower Adult", "Spirit Temple", SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_MQ_LOWER_ADULT] = Area("Spirit Temple MQ Lower Adult", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST,          {[]{return true;}}),
-                  LocationAccess(SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST,        {[]{return SmallKeys(SPIRIT_TEMPLE, 7) && Hammer && Ocarina && SongOfTime && EponasSong && SunsSong && SongOfStorms && ZeldasLullaby;}}),
-                  LocationAccess(SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST, {[]{return Hammer;}}),
-                  LocationAccess(SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM,             {[]{return true;}}),
-                  LocationAccess(SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM,           {[]{return SmallKeys(SPIRIT_TEMPLE, 7) && Hammer && Ocarina && SongOfTime && EponasSong && SunsSong && SongOfStorms && ZeldasLullaby;}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST,          {[]{return true;}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST,        {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 7) && Hammer && Ocarina && SongOfTime && EponasSong && SunsSong && SongOfStorms && ZeldasLullaby;}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST, {[]{return Hammer;}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM,             {[]{return true;}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM,           {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 7) && Hammer && Ocarina && SongOfTime && EponasSong && SunsSong && SongOfStorms && ZeldasLullaby;}}),
   }, {});
 
-  areaTable[SPIRIT_TEMPLE_MQ_BOSS_AREA] = Area("Spirit Temple MQ Boss Area", "Spirit Temple", SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_MQ_BOSS_AREA] = Area("Spirit Temple MQ Boss Area", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST, {[]{return LogicLensSpiritMQ || CanUse(LENS_OF_TRUTH);}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST, {[]{return LogicLensSpiritMQ || CanUse(RG_LENS_OF_TRUTH);}}),
   }, {
                   //Exits
-                  Entrance(SPIRIT_TEMPLE_MQ_INSIDE_STATUE_HEAD, {[]{return MirrorShield && Hookshot;}}),
+                  Entrance(RR_SPIRIT_TEMPLE_MQ_INSIDE_STATUE_HEAD, {[]{return MirrorShield && Hookshot;}}),
   });
 
-  areaTable[SPIRIT_TEMPLE_MQ_INSIDE_STATUE_HEAD] =
-            Area("Spirit Temple MQ Inside Statue Head", "Spirit Temple", SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
+  areaTable[RR_SPIRIT_TEMPLE_MQ_INSIDE_STATUE_HEAD] =
+            Area("Spirit Temple MQ Inside Statue Head", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
                  {
                      // Exits
-                     Entrance(SPIRIT_TEMPLE_MQ_SHARED, { [] { return true; } }),
-                     Entrance(SPIRIT_TEMPLE_BOSS_ENTRYWAY, { [] { return BossKeySpiritTemple; } }),
+                     Entrance(RR_SPIRIT_TEMPLE_MQ_SHARED, { [] { return true; } }),
+                     Entrance(RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY, { [] { return BossKeySpiritTemple; } }),
                  });
 
-  areaTable[SPIRIT_TEMPLE_MQ_MIRROR_SHIELD_HAND] = Area("Spirit Temple MQ Mirror Shield Hand", "Spirit Temple", SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_MQ_MIRROR_SHIELD_HAND] = Area("Spirit Temple MQ Mirror Shield Hand", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST, {[]{return true;}}),
   }, {});
 
-  areaTable[SPIRIT_TEMPLE_MQ_SILVER_GAUNTLETS_HAND] = Area("Spirit Temple MQ Silver Gauntlets Hand", "Spirit Temple", SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_MQ_SILVER_GAUNTLETS_HAND] = Area("Spirit Temple MQ Silver Gauntlets Hand", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST, {[]{return true;}}),
   }, {});
   }
 
     /*---------------------------
     |         BOSS ROOM         |
     ---------------------------*/
-    areaTable[SPIRIT_TEMPLE_BOSS_ENTRYWAY] = Area(
-        "Spirit Temple Boss Entryway", "Spirit Temple", SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
+    areaTable[RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY] = Area(
+        "Spirit Temple Boss Entryway", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
         {
             // Exits
-            Entrance(SPIRIT_TEMPLE_INSIDE_STATUE_HEAD, { [] { return Dungeon::SpiritTemple.IsVanilla() && false; } }),
-            Entrance(SPIRIT_TEMPLE_MQ_INSIDE_STATUE_HEAD, { [] { return Dungeon::SpiritTemple.IsMQ() && false; } }),
-            Entrance(SPIRIT_TEMPLE_BOSS_ROOM, { [] { return true; } }),
+            Entrance(RR_SPIRIT_TEMPLE_INSIDE_STATUE_HEAD, { [] { return Dungeon::SpiritTemple.IsVanilla() && false; } }),
+            Entrance(RR_SPIRIT_TEMPLE_MQ_INSIDE_STATUE_HEAD, { [] { return Dungeon::SpiritTemple.IsMQ() && false; } }),
+            Entrance(RR_SPIRIT_TEMPLE_BOSS_ROOM, { [] { return true; } }),
         });
 
-    areaTable[SPIRIT_TEMPLE_BOSS_ROOM] = Area(
-        "Spirit Temple Boss Room", "Spirit Temple", NONE, NO_DAY_NIGHT_CYCLE,
+    areaTable[RR_SPIRIT_TEMPLE_BOSS_ROOM] = Area(
+        "Spirit Temple Boss Room", "Spirit Temple", RHT_NONE, NO_DAY_NIGHT_CYCLE,
         {
             // Events
             EventAccess(&SpiritTempleClear, { [] {
-                return SpiritTempleClear || (CanUse(MIRROR_SHIELD) &&
-                                             (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD)));
+                return SpiritTempleClear || (CanUse(RG_MIRROR_SHIELD) &&
+                                             (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)));
             } }),
         },
         {
             // Locations
-            LocationAccess(SPIRIT_TEMPLE_TWINROVA_HEART, { [] { return SpiritTempleClear; } }),
-            LocationAccess(TWINROVA, { [] { return SpiritTempleClear; } }),
+            LocationAccess(RC_SPIRIT_TEMPLE_TWINROVA_HEART, { [] { return SpiritTempleClear; } }),
+            LocationAccess(RC_TWINROVA, { [] { return SpiritTempleClear; } }),
         },
         {
             // Exits
-            Entrance(SPIRIT_TEMPLE_BOSS_ENTRYWAY, { [] { return false; } }),
+            Entrance(RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY, { [] { return false; } }),
         });
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp
index 79d9dff7c..3b8ea8356 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp
@@ -10,11 +10,11 @@ void AreaTable_Init_WaterTemple() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[WATER_TEMPLE_ENTRYWAY] = Area("Water Temple Entryway", "Water Temple", WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_ENTRYWAY] = Area("Water Temple Entryway", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(WATER_TEMPLE_LOBBY,    {[]{return Dungeon::WaterTemple.IsVanilla();}}),
-                  Entrance(WATER_TEMPLE_MQ_LOBBY, {[]{return Dungeon::WaterTemple.IsMQ();}}),
-                  Entrance(LAKE_HYLIA,            {[]{return true;}}),
+                  Entrance(RR_WATER_TEMPLE_LOBBY,    {[]{return Dungeon::WaterTemple.IsVanilla();}}),
+                  Entrance(RR_WATER_TEMPLE_MQ_LOBBY, {[]{return Dungeon::WaterTemple.IsMQ();}}),
+                  Entrance(RR_LAKE_HYLIA,            {[]{return true;}}),
   });
 
   /*--------------------------
@@ -22,230 +22,230 @@ void AreaTable_Init_WaterTemple() {
   ---------------------------*/
   if (Dungeon::WaterTemple.IsVanilla()) {
   //Water Temple logic currently assumes that the locked door leading to the upper water raising location is unlocked from the start
-  areaTable[WATER_TEMPLE_LOBBY] = Area("Water Temple Lobby", "Water Temple", WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_LOBBY] = Area("Water Temple Lobby", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(WATER_TEMPLE_ENTRYWAY,              {[]{return true;}}),
-                  Entrance(WATER_TEMPLE_EAST_LOWER,            {[]{return WaterTempleLow || ((LogicFewerTunicRequirements || CanUse(ZORA_TUNIC)) && (CanUse(IRON_BOOTS) || (CanUse(LONGSHOT) && LogicWaterTempleTorchLongshot)));}}),
-                  Entrance(WATER_TEMPLE_NORTH_LOWER,           {[]{return WaterTempleLow || ((LogicFewerTunicRequirements || CanUse(ZORA_TUNIC)) && CanUse(IRON_BOOTS));}}),
-                  Entrance(WATER_TEMPLE_SOUTH_LOWER,           {[]{return WaterTempleLow && HasExplosives && (CanDive || CanUse(IRON_BOOTS)) && (LogicFewerTunicRequirements || CanUse(ZORA_TUNIC));}}),
-                  Entrance(WATER_TEMPLE_WEST_LOWER,            {[]{return WaterTempleLow && GoronBracelet && (IsChild || CanDive || CanUse(IRON_BOOTS)) && (LogicFewerTunicRequirements || CanUse(ZORA_TUNIC));}}),
-                  Entrance(WATER_TEMPLE_CENTRAL_PILLAR_LOWER,  {[]{return WaterTempleLow && SmallKeys(WATER_TEMPLE, 5);}}),
-                  Entrance(WATER_TEMPLE_CENTRAL_PILLAR_UPPER,  {[]{return (WaterTempleLow || WaterTempleMiddle) && (HasFireSourceWithTorch || CanUse(BOW));}}),
-                  Entrance(WATER_TEMPLE_EAST_MIDDLE,           {[]{return (WaterTempleLow || WaterTempleMiddle || (CanUse(IRON_BOOTS) && WaterTimer >= 16)) && CanUse(HOOKSHOT);}}),
-                  Entrance(WATER_TEMPLE_WEST_MIDDLE,           {[]{return WaterTempleMiddle;}}),
-                  Entrance(WATER_TEMPLE_HIGH_WATER,            {[]{return IsAdult && (CanUse(HOVER_BOOTS) || (LogicDamageBoost && Bombs && CanTakeDamage));}}),
-                  Entrance(WATER_TEMPLE_BLOCK_CORRIDOR,        {[]{return (WaterTempleLow || WaterTempleMiddle) && (CanUse(SLINGSHOT) || CanUse(BOW)) && (CanUse(LONGSHOT) || CanUse(HOVER_BOOTS) || (LogicWaterCentralBow && (IsAdult || WaterTempleMiddle)));}}),
-                  Entrance(WATER_TEMPLE_FALLING_PLATFORM_ROOM, {[]{return WaterTempleHigh && SmallKeys(WATER_TEMPLE, 4);}}),
-                  Entrance(WATER_TEMPLE_PRE_BOSS_ROOM,         {[]{return WaterTempleHigh && CanUse(LONGSHOT);}}),
+                  Entrance(RR_WATER_TEMPLE_ENTRYWAY,              {[]{return true;}}),
+                  Entrance(RR_WATER_TEMPLE_EAST_LOWER,            {[]{return WaterTempleLow || ((LogicFewerTunicRequirements || CanUse(RG_ZORA_TUNIC)) && (CanUse(RG_IRON_BOOTS) || (CanUse(RG_LONGSHOT) && LogicWaterTempleTorchLongshot)));}}),
+                  Entrance(RR_WATER_TEMPLE_NORTH_LOWER,           {[]{return WaterTempleLow || ((LogicFewerTunicRequirements || CanUse(RG_ZORA_TUNIC)) && CanUse(RG_IRON_BOOTS));}}),
+                  Entrance(RR_WATER_TEMPLE_SOUTH_LOWER,           {[]{return WaterTempleLow && HasExplosives && (CanDive || CanUse(RG_IRON_BOOTS)) && (LogicFewerTunicRequirements || CanUse(RG_ZORA_TUNIC));}}),
+                  Entrance(RR_WATER_TEMPLE_WEST_LOWER,            {[]{return WaterTempleLow && GoronBracelet && (IsChild || CanDive || CanUse(RG_IRON_BOOTS)) && (LogicFewerTunicRequirements || CanUse(RG_ZORA_TUNIC));}}),
+                  Entrance(RR_WATER_TEMPLE_CENTRAL_PILLAR_LOWER,  {[]{return WaterTempleLow && SmallKeys(RR_WATER_TEMPLE, 5);}}),
+                  Entrance(RR_WATER_TEMPLE_CENTRAL_PILLAR_UPPER,  {[]{return (WaterTempleLow || WaterTempleMiddle) && (HasFireSourceWithTorch || CanUse(RG_FAIRY_BOW));}}),
+                  Entrance(RR_WATER_TEMPLE_EAST_MIDDLE,           {[]{return (WaterTempleLow || WaterTempleMiddle || (CanUse(RG_IRON_BOOTS) && WaterTimer >= 16)) && CanUse(RG_HOOKSHOT);}}),
+                  Entrance(RR_WATER_TEMPLE_WEST_MIDDLE,           {[]{return WaterTempleMiddle;}}),
+                  Entrance(RR_WATER_TEMPLE_HIGH_WATER,            {[]{return IsAdult && (CanUse(RG_HOVER_BOOTS) || (LogicDamageBoost && Bombs && CanTakeDamage));}}),
+                  Entrance(RR_WATER_TEMPLE_BLOCK_CORRIDOR,        {[]{return (WaterTempleLow || WaterTempleMiddle) && (CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW)) && (CanUse(RG_LONGSHOT) || CanUse(RG_HOVER_BOOTS) || (LogicWaterCentralBow && (IsAdult || WaterTempleMiddle)));}}),
+                  Entrance(RR_WATER_TEMPLE_FALLING_PLATFORM_ROOM, {[]{return WaterTempleHigh && SmallKeys(RR_WATER_TEMPLE, 4);}}),
+                  Entrance(RR_WATER_TEMPLE_PRE_BOSS_ROOM,         {[]{return WaterTempleHigh && CanUse(RG_LONGSHOT);}}),
   });
 
-  areaTable[WATER_TEMPLE_EAST_LOWER] = Area("Water Temple East Lower", "Water Temple", WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_WATER_TEMPLE_EAST_LOWER] = Area("Water Temple East Lower", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&WaterTempleLow, {[]{return WaterTempleLow || CanPlay(ZeldasLullaby);}}),
                 }, {}, {
                   //Exits
-                  Entrance(WATER_TEMPLE_LOBBY,        {[]{return WaterTempleLow || ((LogicFewerTunicRequirements || CanUse(ZORA_TUNIC)) && CanUse(IRON_BOOTS));}}),
-                  Entrance(WATER_TEMPLE_MAP_ROOM,     {[]{return WaterTempleHigh;}}),
-                  Entrance(WATER_TEMPLE_CRACKED_WALL, {[]{return WaterTempleMiddle || (WaterTempleHigh && WaterTempleLow && ((CanUse(HOVER_BOOTS) && LogicWaterCrackedWallHovers) || LogicWaterCrackedWallNothing));}}),
-                  Entrance(WATER_TEMPLE_TORCH_ROOM,   {[]{return WaterTempleLow && (HasFireSourceWithTorch || CanUse(BOW));}}),
+                  Entrance(RR_WATER_TEMPLE_LOBBY,        {[]{return WaterTempleLow || ((LogicFewerTunicRequirements || CanUse(RG_ZORA_TUNIC)) && CanUse(RG_IRON_BOOTS));}}),
+                  Entrance(RR_WATER_TEMPLE_MAP_ROOM,     {[]{return WaterTempleHigh;}}),
+                  Entrance(RR_WATER_TEMPLE_CRACKED_WALL, {[]{return WaterTempleMiddle || (WaterTempleHigh && WaterTempleLow && ((CanUse(RG_HOVER_BOOTS) && LogicWaterCrackedWallHovers) || LogicWaterCrackedWallNothing));}}),
+                  Entrance(RR_WATER_TEMPLE_TORCH_ROOM,   {[]{return WaterTempleLow && (HasFireSourceWithTorch || CanUse(RG_FAIRY_BOW));}}),
   });
 
-  areaTable[WATER_TEMPLE_MAP_ROOM] = Area("Water Temple Map Room", "Water Temple", WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_MAP_ROOM] = Area("Water Temple Map Room", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(WATER_TEMPLE_MAP_CHEST, {[]{return (MagicMeter && CanUse(KOKIRI_SWORD)) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(HOOKSHOT);}}),
+                  LocationAccess(RC_WATER_TEMPLE_MAP_CHEST, {[]{return (MagicMeter && CanUse(RG_KOKIRI_SWORD)) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_HOOKSHOT);}}),
                 }, {
                   //Exits
-                  Entrance(WATER_TEMPLE_EAST_LOWER, {[]{return (MagicMeter && CanUse(KOKIRI_SWORD)) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(HOOKSHOT);}}),
+                  Entrance(RR_WATER_TEMPLE_EAST_LOWER, {[]{return (MagicMeter && CanUse(RG_KOKIRI_SWORD)) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_HOOKSHOT);}}),
   });
 
-  areaTable[WATER_TEMPLE_CRACKED_WALL] = Area("Water Temple Cracked Wall", "Water Temple", WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_CRACKED_WALL] = Area("Water Temple Cracked Wall", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(WATER_TEMPLE_CRACKED_WALL_CHEST, {[]{return HasExplosives;}}),
+                  LocationAccess(RC_WATER_TEMPLE_CRACKED_WALL_CHEST, {[]{return HasExplosives;}}),
                 }, {
                   //Exits
-                  Entrance(WATER_TEMPLE_EAST_LOWER, {[]{return true;}}),
+                  Entrance(RR_WATER_TEMPLE_EAST_LOWER, {[]{return true;}}),
   });
 
-  areaTable[WATER_TEMPLE_TORCH_ROOM] = Area("Water Temple Torch Room", "Water Temple", WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_TORCH_ROOM] = Area("Water Temple Torch Room", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(WATER_TEMPLE_TORCHES_CHEST, {[]{return (MagicMeter && CanUse(KOKIRI_SWORD)) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(HOOKSHOT);}}),
+                  LocationAccess(RC_WATER_TEMPLE_TORCHES_CHEST, {[]{return (MagicMeter && CanUse(RG_KOKIRI_SWORD)) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_HOOKSHOT);}}),
                 }, {
                   //Exits
-                  Entrance(WATER_TEMPLE_EAST_LOWER, {[]{return (MagicMeter && CanUse(KOKIRI_SWORD)) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(HOOKSHOT);}}),
+                  Entrance(RR_WATER_TEMPLE_EAST_LOWER, {[]{return (MagicMeter && CanUse(RG_KOKIRI_SWORD)) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_HOOKSHOT);}}),
   });
 
-  areaTable[WATER_TEMPLE_NORTH_LOWER] = Area("Water Temple North Lower", "Water Temple", WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_NORTH_LOWER] = Area("Water Temple North Lower", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(WATER_TEMPLE_LOBBY,          {[]{return true;}}),
-                  Entrance(WATER_TEMPLE_BOULDERS_LOWER, {[]{return (CanUse(LONGSHOT) || (LogicWaterBossKeyRegion && CanUse(HOVER_BOOTS))) && SmallKeys(WATER_TEMPLE, 4);}}),
+                  Entrance(RR_WATER_TEMPLE_LOBBY,          {[]{return true;}}),
+                  Entrance(RR_WATER_TEMPLE_BOULDERS_LOWER, {[]{return (CanUse(RG_LONGSHOT) || (LogicWaterBossKeyRegion && CanUse(RG_HOVER_BOOTS))) && SmallKeys(RR_WATER_TEMPLE, 4);}}),
   });
 
-  areaTable[WATER_TEMPLE_BOULDERS_LOWER] = Area("Water Temple Boulders Lower", "Water Temple", WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_BOULDERS_LOWER] = Area("Water Temple Boulders Lower", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST, {[]{return CanUse(LONGSHOT) || Here(WATER_TEMPLE_BOULDERS_UPPER, []{return (IsAdult && HookshotOrBoomerang) || (CanUse(IRON_BOOTS) && CanUse(HOOKSHOT));});}}),
+                  LocationAccess(RC_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST, {[]{return CanUse(RG_LONGSHOT) || Here(RR_WATER_TEMPLE_BOULDERS_UPPER, []{return (IsAdult && HookshotOrBoomerang) || (CanUse(RG_IRON_BOOTS) && CanUse(RG_HOOKSHOT));});}}),
                 }, {
                   //Exits
-                  Entrance(WATER_TEMPLE_NORTH_LOWER,    {[]{return SmallKeys(WATER_TEMPLE, 4);}}),
-                  Entrance(WATER_TEMPLE_BLOCK_ROOM,     {[]{return true;}}),
-                  Entrance(WATER_TEMPLE_BOULDERS_UPPER, {[]{return (IsAdult && (CanUse(HOVER_BOOTS) || LogicWaterNorthBasementLedgeJump)) || (CanUse(HOVER_BOOTS) && CanUse(IRON_BOOTS));}}),
+                  Entrance(RR_WATER_TEMPLE_NORTH_LOWER,    {[]{return SmallKeys(RR_WATER_TEMPLE, 4);}}),
+                  Entrance(RR_WATER_TEMPLE_BLOCK_ROOM,     {[]{return true;}}),
+                  Entrance(RR_WATER_TEMPLE_BOULDERS_UPPER, {[]{return (IsAdult && (CanUse(RG_HOVER_BOOTS) || LogicWaterNorthBasementLedgeJump)) || (CanUse(RG_HOVER_BOOTS) && CanUse(RG_IRON_BOOTS));}}),
   });
 
-  areaTable[WATER_TEMPLE_BLOCK_ROOM] = Area("Water Temple Block Room", "Water Temple", WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_BLOCK_ROOM] = Area("Water Temple Block Room", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(WATER_TEMPLE_BOULDERS_LOWER, {[]{return (GoronBracelet && HasExplosives) || CanUse(HOOKSHOT);}}),
-                  Entrance(WATER_TEMPLE_JETS_ROOM,      {[]{return (GoronBracelet && HasExplosives) || (CanUse(HOOKSHOT) && CanUse(HOVER_BOOTS));}}),
+                  Entrance(RR_WATER_TEMPLE_BOULDERS_LOWER, {[]{return (GoronBracelet && HasExplosives) || CanUse(RG_HOOKSHOT);}}),
+                  Entrance(RR_WATER_TEMPLE_JETS_ROOM,      {[]{return (GoronBracelet && HasExplosives) || (CanUse(RG_HOOKSHOT) && CanUse(RG_HOVER_BOOTS));}}),
   });
 
-  areaTable[WATER_TEMPLE_JETS_ROOM] = Area("Water Temple Jets Room", "Water Temple", WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_JETS_ROOM] = Area("Water Temple Jets Room", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(WATER_TEMPLE_BLOCK_ROOM,     {[]{return CanUse(HOOKSHOT);}}),
-                  Entrance(WATER_TEMPLE_BOULDERS_UPPER, {[]{return true;}}),
+                  Entrance(RR_WATER_TEMPLE_BLOCK_ROOM,     {[]{return CanUse(RG_HOOKSHOT);}}),
+                  Entrance(RR_WATER_TEMPLE_BOULDERS_UPPER, {[]{return true;}}),
   });
 
-  areaTable[WATER_TEMPLE_BOULDERS_UPPER] = Area("Water Temple Boulders Upper", "Water Temple", WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_BOULDERS_UPPER] = Area("Water Temple Boulders Upper", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(WATER_TEMPLE_BOULDERS_LOWER, {[]{return true;}}),
-                  Entrance(WATER_TEMPLE_JETS_ROOM,      {[]{return IsAdult;}}),
-                  Entrance(WATER_TEMPLE_BOSS_KEY_ROOM,  {[]{return (CanUse(IRON_BOOTS) || (IsAdult && LogicWaterBKJumpDive)) && SmallKeys(WATER_TEMPLE, 5);}}),
+                  Entrance(RR_WATER_TEMPLE_BOULDERS_LOWER, {[]{return true;}}),
+                  Entrance(RR_WATER_TEMPLE_JETS_ROOM,      {[]{return IsAdult;}}),
+                  Entrance(RR_WATER_TEMPLE_BOSS_KEY_ROOM,  {[]{return (CanUse(RG_IRON_BOOTS) || (IsAdult && LogicWaterBKJumpDive)) && SmallKeys(RR_WATER_TEMPLE, 5);}}),
   });
 
-  areaTable[WATER_TEMPLE_BOSS_KEY_ROOM] = Area("Water Temple Boss Key Room", "Water Temple", WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_WATER_TEMPLE_BOSS_KEY_ROOM] = Area("Water Temple Boss Key Room", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FairyPot, {[]{return true;}}),
                 }, {
                   //Locations
-                  LocationAccess(WATER_TEMPLE_BOSS_KEY_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_WATER_TEMPLE_BOSS_KEY_CHEST, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(WATER_TEMPLE_BOULDERS_UPPER, {[]{return (CanUse(IRON_BOOTS) || (IsAdult && LogicWaterBKJumpDive) || IsChild || CanDive) && SmallKeys(WATER_TEMPLE, 5);}}),
+                  Entrance(RR_WATER_TEMPLE_BOULDERS_UPPER, {[]{return (CanUse(RG_IRON_BOOTS) || (IsAdult && LogicWaterBKJumpDive) || IsChild || CanDive) && SmallKeys(RR_WATER_TEMPLE, 5);}}),
   });
 
-  areaTable[WATER_TEMPLE_SOUTH_LOWER] = Area("Water Temple South Lower", "Water Temple", WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_SOUTH_LOWER] = Area("Water Temple South Lower", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(WATER_TEMPLE_GS_BEHIND_GATE, {[]{return CanUse(HOOKSHOT) || (IsAdult && CanUse(HOVER_BOOTS));}}),
+                  LocationAccess(RC_WATER_TEMPLE_GS_BEHIND_GATE, {[]{return CanUse(RG_HOOKSHOT) || (IsAdult && CanUse(RG_HOVER_BOOTS));}}),
                 }, {
                   //Exits
-                  Entrance(WATER_TEMPLE_LOBBY, {[]{return CanUse(IRON_BOOTS);}}),
+                  Entrance(RR_WATER_TEMPLE_LOBBY, {[]{return CanUse(RG_IRON_BOOTS);}}),
   });
 
-  areaTable[WATER_TEMPLE_WEST_LOWER] = Area("Water Temple West Lower", "Water Temple", WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_WEST_LOWER] = Area("Water Temple West Lower", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(WATER_TEMPLE_LOBBY,       {[]{return CanUse(HOOKSHOT) && CanUse(IRON_BOOTS) && GoronBracelet;}}),
-                  Entrance(WATER_TEMPLE_DRAGON_ROOM, {[]{return IsAdult || CanChildAttack;}}),
+                  Entrance(RR_WATER_TEMPLE_LOBBY,       {[]{return CanUse(RG_HOOKSHOT) && CanUse(RG_IRON_BOOTS) && GoronBracelet;}}),
+                  Entrance(RR_WATER_TEMPLE_DRAGON_ROOM, {[]{return IsAdult || CanChildAttack;}}),
   });
 
-  areaTable[WATER_TEMPLE_DRAGON_ROOM] = Area("Water Temple Dragon Room", "Water Temple", WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_DRAGON_ROOM] = Area("Water Temple Dragon Room", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(WATER_TEMPLE_DRAGON_CHEST, {[]{return (CanUse(HOOKSHOT) && CanUse(IRON_BOOTS)) || (((IsAdult && LogicWaterDragonAdult && (CanUse(HOOKSHOT) || CanUse(BOW) || HasBombchus)) || (IsChild && LogicWaterDragonChild && (CanUse(SLINGSHOT) || CanUse(BOOMERANG) || HasBombchus))) && (CanDive || CanUse(IRON_BOOTS))) ||
-                                                                       Here(WATER_TEMPLE_RIVER, []{return IsAdult && CanUse(BOW) && ((LogicWaterDragonAdult && (CanDive || CanUse(IRON_BOOTS))) || LogicWaterDragonJumpDive);});}}),
+                  LocationAccess(RC_WATER_TEMPLE_DRAGON_CHEST, {[]{return (CanUse(RG_HOOKSHOT) && CanUse(RG_IRON_BOOTS)) || (((IsAdult && LogicWaterDragonAdult && (CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_BOW) || HasBombchus)) || (IsChild && LogicWaterDragonChild && (CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOOMERANG) || HasBombchus))) && (CanDive || CanUse(RG_IRON_BOOTS))) ||
+                                                                       Here(RR_WATER_TEMPLE_RIVER, []{return IsAdult && CanUse(RG_FAIRY_BOW) && ((LogicWaterDragonAdult && (CanDive || CanUse(RG_IRON_BOOTS))) || LogicWaterDragonJumpDive);});}}),
                 }, {
                   //Exits
-                  Entrance(WATER_TEMPLE_WEST_LOWER, {[]{return true;}}),
+                  Entrance(RR_WATER_TEMPLE_WEST_LOWER, {[]{return true;}}),
   });
 
-  areaTable[WATER_TEMPLE_CENTRAL_PILLAR_LOWER] = Area("Water Temple Central Pillar Lower", "Water Temple", WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_CENTRAL_PILLAR_LOWER] = Area("Water Temple Central Pillar Lower", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(WATER_TEMPLE_LOBBY,                   {[]{return SmallKeys(WATER_TEMPLE, 5);}}),
-                  Entrance(WATER_TEMPLE_CENTRAL_PILLAR_UPPER,    {[]{return CanUse(HOOKSHOT);}}),
-                  Entrance(WATER_TEMPLE_CENTRAL_PILLAR_BASEMENT, {[]{return WaterTempleMiddle && CanUse(IRON_BOOTS) && WaterTimer >= 40;}}),
+                  Entrance(RR_WATER_TEMPLE_LOBBY,                   {[]{return SmallKeys(RR_WATER_TEMPLE, 5);}}),
+                  Entrance(RR_WATER_TEMPLE_CENTRAL_PILLAR_UPPER,    {[]{return CanUse(RG_HOOKSHOT);}}),
+                  Entrance(RR_WATER_TEMPLE_CENTRAL_PILLAR_BASEMENT, {[]{return WaterTempleMiddle && CanUse(RG_IRON_BOOTS) && WaterTimer >= 40;}}),
   });
 
-  areaTable[WATER_TEMPLE_CENTRAL_PILLAR_UPPER] = Area("Water Temple Central Pillar Upper", "Water Temple", WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_WATER_TEMPLE_CENTRAL_PILLAR_UPPER] = Area("Water Temple Central Pillar Upper", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&WaterTempleMiddle, {[]{return WaterTempleMiddle || CanPlay(ZeldasLullaby);}}),
                 }, {
                   //Locations
-                  LocationAccess(WATER_TEMPLE_GS_CENTRAL_PILLAR, {[]{return CanUse(LONGSHOT) || (((LogicWaterCentralGSFW && CanUse(FARORES_WIND) && (CanUse(BOW) || CanUse(DINS_FIRE) || SmallKeys(WATER_TEMPLE, 5))) || (LogicWaterCentralGSIrons && CanUse(IRON_BOOTS) && ((CanUse(HOOKSHOT) && CanUse(BOW)) || (CanUse(DINS_FIRE))))) && WaterTempleHigh && HookshotOrBoomerang);}}),
+                  LocationAccess(RC_WATER_TEMPLE_GS_CENTRAL_PILLAR, {[]{return CanUse(RG_LONGSHOT) || (((LogicWaterCentralGSFW && CanUse(RG_FARORES_WIND) && (CanUse(RG_FAIRY_BOW) || CanUse(RG_DINS_FIRE) || SmallKeys(RR_WATER_TEMPLE, 5))) || (LogicWaterCentralGSIrons && CanUse(RG_IRON_BOOTS) && ((CanUse(RG_HOOKSHOT) && CanUse(RG_FAIRY_BOW)) || (CanUse(RG_DINS_FIRE))))) && WaterTempleHigh && HookshotOrBoomerang);}}),
                 }, {
                   //Exits
-                  Entrance(WATER_TEMPLE_LOBBY,                {[]{return true;}}),
-                  Entrance(WATER_TEMPLE_CENTRAL_PILLAR_LOWER, {[]{return true;}}),
+                  Entrance(RR_WATER_TEMPLE_LOBBY,                {[]{return true;}}),
+                  Entrance(RR_WATER_TEMPLE_CENTRAL_PILLAR_LOWER, {[]{return true;}}),
   });
 
-  areaTable[WATER_TEMPLE_CENTRAL_PILLAR_BASEMENT] = Area("Water Temple Central Pillar Basement", "Water Temple", WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_CENTRAL_PILLAR_BASEMENT] = Area("Water Temple Central Pillar Basement", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(WATER_TEMPLE_CENTRAL_PILLAR_CHEST, {[]{return CanUse(HOOKSHOT) && CanUse(IRON_BOOTS) && WaterTimer >= 40;}}),
+                  LocationAccess(RC_WATER_TEMPLE_CENTRAL_PILLAR_CHEST, {[]{return CanUse(RG_HOOKSHOT) && CanUse(RG_IRON_BOOTS) && WaterTimer >= 40;}}),
                 }, {
                   //Exits
-                  Entrance(WATER_TEMPLE_CENTRAL_PILLAR_LOWER, {[]{return CanUse(IRON_BOOTS) && WaterTimer >= 16;}}),
+                  Entrance(RR_WATER_TEMPLE_CENTRAL_PILLAR_LOWER, {[]{return CanUse(RG_IRON_BOOTS) && WaterTimer >= 16;}}),
   });
 
-  areaTable[WATER_TEMPLE_EAST_MIDDLE] = Area("Water Temple East Middle", "Water Temple", WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_EAST_MIDDLE] = Area("Water Temple East Middle", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(WATER_TEMPLE_COMPASS_CHEST, {[]{return CanUseProjectile;}}),
+                  LocationAccess(RC_WATER_TEMPLE_COMPASS_CHEST, {[]{return CanUseProjectile;}}),
                 }, {
                   //Exits
-                  Entrance(WATER_TEMPLE_LOBBY, {[]{return CanUse(IRON_BOOTS);}}),
+                  Entrance(RR_WATER_TEMPLE_LOBBY, {[]{return CanUse(RG_IRON_BOOTS);}}),
   });
 
-  areaTable[WATER_TEMPLE_WEST_MIDDLE] = Area("Water Temple West Middle", "Water Temple", WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_WEST_MIDDLE] = Area("Water Temple West Middle", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(WATER_TEMPLE_LOBBY,      {[]{return true;}}),
-                  Entrance(WATER_TEMPLE_HIGH_WATER, {[]{return CanUseProjectile;}}),
+                  Entrance(RR_WATER_TEMPLE_LOBBY,      {[]{return true;}}),
+                  Entrance(RR_WATER_TEMPLE_HIGH_WATER, {[]{return CanUseProjectile;}}),
   });
 
-  areaTable[WATER_TEMPLE_HIGH_WATER] = Area("Water Temple High Water", "Water Temple", WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_WATER_TEMPLE_HIGH_WATER] = Area("Water Temple High Water", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&WaterTempleHigh, {[]{return WaterTempleHigh || CanPlay(ZeldasLullaby);}}),
                 }, {}, {
                   //Exits
-                  Entrance(WATER_TEMPLE_LOBBY, {[]{return true;}}),
+                  Entrance(RR_WATER_TEMPLE_LOBBY, {[]{return true;}}),
   });
 
-  areaTable[WATER_TEMPLE_BLOCK_CORRIDOR] = Area("Water Temple Block Corridor", "Water Temple", WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_BLOCK_CORRIDOR] = Area("Water Temple Block Corridor", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST, {[]{return GoronBracelet && (WaterTempleLow || WaterTempleMiddle);}}),
+                  LocationAccess(RC_WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST, {[]{return GoronBracelet && (WaterTempleLow || WaterTempleMiddle);}}),
                 }, {
                   //Exits
-                  Entrance(WATER_TEMPLE_LOBBY, {[]{return CanUse(HOOKSHOT);}}),
+                  Entrance(RR_WATER_TEMPLE_LOBBY, {[]{return CanUse(RG_HOOKSHOT);}}),
   });
 
-  areaTable[WATER_TEMPLE_FALLING_PLATFORM_ROOM] = Area("Water Temple Falling Platform Room", "Water Temple", WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_FALLING_PLATFORM_ROOM] = Area("Water Temple Falling Platform Room", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM, {[]{return CanUse(LONGSHOT) || (LogicWaterFallingPlatformGSBoomerang && IsChild && CanUse(BOOMERANG)) || (LogicWaterFallingPlatformGSHookshot && IsAdult && CanUse(HOOKSHOT));}}),
+                  LocationAccess(RC_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM, {[]{return CanUse(RG_LONGSHOT) || (LogicWaterFallingPlatformGSBoomerang && IsChild && CanUse(RG_BOOMERANG)) || (LogicWaterFallingPlatformGSHookshot && IsAdult && CanUse(RG_HOOKSHOT));}}),
                 }, {
                   //Exits
-                  Entrance(WATER_TEMPLE_LOBBY,               {[]{return CanUse(HOOKSHOT) && SmallKeys(WATER_TEMPLE, 4);}}),
-                  Entrance(WATER_TEMPLE_DRAGON_PILLARS_ROOM, {[]{return CanUse(HOOKSHOT) && SmallKeys(WATER_TEMPLE, 5);}}),
+                  Entrance(RR_WATER_TEMPLE_LOBBY,               {[]{return CanUse(RG_HOOKSHOT) && SmallKeys(RR_WATER_TEMPLE, 4);}}),
+                  Entrance(RR_WATER_TEMPLE_DRAGON_PILLARS_ROOM, {[]{return CanUse(RG_HOOKSHOT) && SmallKeys(RR_WATER_TEMPLE, 5);}}),
   });
 
-  areaTable[WATER_TEMPLE_DRAGON_PILLARS_ROOM] = Area("Water Temple Dragon Pillars Room", "Water Temple", WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_DRAGON_PILLARS_ROOM] = Area("Water Temple Dragon Pillars Room", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(WATER_TEMPLE_FALLING_PLATFORM_ROOM, {[]{return CanUseProjectile;}}),
-                  Entrance(WATER_TEMPLE_DARK_LINK_ROOM,        {[]{return CanUse(HOOKSHOT);}}),
+                  Entrance(RR_WATER_TEMPLE_FALLING_PLATFORM_ROOM, {[]{return CanUseProjectile;}}),
+                  Entrance(RR_WATER_TEMPLE_DARK_LINK_ROOM,        {[]{return CanUse(RG_HOOKSHOT);}}),
   });
 
-  areaTable[WATER_TEMPLE_DARK_LINK_ROOM] = Area("Water Temple Dark Link Room", "Water Temple", WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_DARK_LINK_ROOM] = Area("Water Temple Dark Link Room", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(WATER_TEMPLE_DRAGON_PILLARS_ROOM, {[]{return CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD);}}),
-                  Entrance(WATER_TEMPLE_LONGSHOT_ROOM,       {[]{return CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD);}}),
+                  Entrance(RR_WATER_TEMPLE_DRAGON_PILLARS_ROOM, {[]{return CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD);}}),
+                  Entrance(RR_WATER_TEMPLE_LONGSHOT_ROOM,       {[]{return CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD);}}),
   });
 
-  areaTable[WATER_TEMPLE_LONGSHOT_ROOM] = Area("Water Temple Longshot Room", "Water Temple", WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_LONGSHOT_ROOM] = Area("Water Temple Longshot Room", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(WATER_TEMPLE_LONGSHOT_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_WATER_TEMPLE_LONGSHOT_CHEST, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(WATER_TEMPLE_DARK_LINK_ROOM, {[]{return true;}}),
-                  Entrance(WATER_TEMPLE_RIVER,          {[]{return IsChild || CanPlay(SongOfTime);}}),
+                  Entrance(RR_WATER_TEMPLE_DARK_LINK_ROOM, {[]{return true;}}),
+                  Entrance(RR_WATER_TEMPLE_RIVER,          {[]{return IsChild || CanPlay(SongOfTime);}}),
   });
 
-  areaTable[WATER_TEMPLE_RIVER] = Area("Water Temple River", "Water Temple", WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_RIVER] = Area("Water Temple River", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(WATER_TEMPLE_RIVER_CHEST, {[]{return (CanUse(SLINGSHOT) || CanUse(BOW)) && (IsAdult || CanUse(HOVER_BOOTS) || CanUse(HOOKSHOT));}}),
-                  LocationAccess(WATER_TEMPLE_GS_RIVER,    {[]{return (CanUse(IRON_BOOTS) && CanUse(HOOKSHOT)) || (LogicWaterRiverGS && CanUse(LONGSHOT));}}),
+                  LocationAccess(RC_WATER_TEMPLE_RIVER_CHEST, {[]{return (CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW)) && (IsAdult || CanUse(RG_HOVER_BOOTS) || CanUse(RG_HOOKSHOT));}}),
+                  LocationAccess(RC_WATER_TEMPLE_GS_RIVER,    {[]{return (CanUse(RG_IRON_BOOTS) && CanUse(RG_HOOKSHOT)) || (LogicWaterRiverGS && CanUse(RG_LONGSHOT));}}),
                 }, {
                   //Exits
-                  Entrance(WATER_TEMPLE_DRAGON_ROOM, {[]{return (CanUse(SLINGSHOT) || CanUse(BOW)) && (IsAdult || CanUse(HOVER_BOOTS) || CanUse(HOOKSHOT));}}),
+                  Entrance(RR_WATER_TEMPLE_DRAGON_ROOM, {[]{return (CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW)) && (IsAdult || CanUse(RG_HOVER_BOOTS) || CanUse(RG_HOOKSHOT));}}),
   });
 
-  areaTable[WATER_TEMPLE_PRE_BOSS_ROOM] = Area("Water Temple Pre Boss Room", "Water Temple", WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_WATER_TEMPLE_PRE_BOSS_ROOM] = Area("Water Temple Pre Boss Room", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FairyPot, {[]{return true;}}),
                 }, {}, {
                   //Exits
-                  Entrance(WATER_TEMPLE_LOBBY,     {[]{return true;}}),
-                  Entrance(WATER_TEMPLE_BOSS_ENTRYWAY, {[]{return BossKeyWaterTemple;}}),
+                  Entrance(RR_WATER_TEMPLE_LOBBY,     {[]{return true;}}),
+                  Entrance(RR_WATER_TEMPLE_BOSS_ENTRYWAY, {[]{return BossKeyWaterTemple;}}),
   });
   }
 
@@ -253,82 +253,82 @@ void AreaTable_Init_WaterTemple() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (Dungeon::WaterTemple.IsMQ()) {
-  areaTable[WATER_TEMPLE_MQ_LOBBY] = Area("Water Temple MQ Lobby", "Water Temple", WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_MQ_LOBBY] = Area("Water Temple MQ Lobby", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(WATER_TEMPLE_ENTRYWAY,            {[]{return true;}}),
-                  Entrance(WATER_TEMPLE_MQ_DIVE,             {[]{return IsAdult && WaterTimer >= 24 && CanUse(IRON_BOOTS);}}),
-                  Entrance(WATER_TEMPLE_MQ_DARK_LINK_REGION, {[]{return SmallKeys(WATER_TEMPLE, 1) && IsAdult && CanUse(LONGSHOT);}}),
-                  Entrance(WATER_TEMPLE_BOSS_ENTRYWAY,       {[]{return BossKeyWaterTemple && IsAdult && CanUse(LONGSHOT);}}),
+                  Entrance(RR_WATER_TEMPLE_ENTRYWAY,            {[]{return true;}}),
+                  Entrance(RR_WATER_TEMPLE_MQ_DIVE,             {[]{return IsAdult && WaterTimer >= 24 && CanUse(RG_IRON_BOOTS);}}),
+                  Entrance(RR_WATER_TEMPLE_MQ_DARK_LINK_REGION, {[]{return SmallKeys(RR_WATER_TEMPLE, 1) && IsAdult && CanUse(RG_LONGSHOT);}}),
+                  Entrance(RR_WATER_TEMPLE_BOSS_ENTRYWAY,       {[]{return BossKeyWaterTemple && IsAdult && CanUse(RG_LONGSHOT);}}),
   });
 
-  areaTable[WATER_TEMPLE_MQ_DIVE] = Area("Water Temple MQ Dive", "Water Temple", WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_MQ_DIVE] = Area("Water Temple MQ Dive", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(WATER_TEMPLE_MQ_MAP_CHEST,            {[]{return HasFireSource && IsAdult && CanUse(HOOKSHOT);}}),
-                  LocationAccess(WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST, {[]{return IsAdult && CanUse(ZORA_TUNIC) && CanUse(HOOKSHOT) && ((LogicWaterMQCentralPillar && CanUse(FIRE_ARROWS)) || (CanUse(DINS_FIRE) && CanPlay(SongOfTime)));}}),
-                    //Trick: IsAdult && CanUse(ZORA_TUNIC) && CanUse(HOOKSHOT) && ((LogicWaterMQCentralPillar && CanUse(FIRE_ARROWS)) || (CanUse(DINS_FIRE) && CanPlay(SongOfTime)))
+                  LocationAccess(RC_WATER_TEMPLE_MQ_MAP_CHEST,            {[]{return HasFireSource && IsAdult && CanUse(RG_HOOKSHOT);}}),
+                  LocationAccess(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST, {[]{return IsAdult && CanUse(RG_ZORA_TUNIC) && CanUse(RG_HOOKSHOT) && ((LogicWaterMQCentralPillar && CanUse(RG_FIRE_ARROWS)) || (CanUse(RG_DINS_FIRE) && CanPlay(SongOfTime)));}}),
+                    //Trick: IsAdult && CanUse(RG_ZORA_TUNIC) && CanUse(RG_HOOKSHOT) && ((LogicWaterMQCentralPillar && CanUse(RG_FIRE_ARROWS)) || (CanUse(RG_DINS_FIRE) && CanPlay(SongOfTime)))
   }, {
                   //Exits
-                  Entrance(WATER_TEMPLE_MQ_LOWERED_WATER_LEVELS, {[]{return CanPlay(ZeldasLullaby);}}),
+                  Entrance(RR_WATER_TEMPLE_MQ_LOWERED_WATER_LEVELS, {[]{return CanPlay(ZeldasLullaby);}}),
   });
 
-  areaTable[WATER_TEMPLE_MQ_LOWERED_WATER_LEVELS] = Area("Water Temple MQ Lowered Water Levels", "Water Temple", WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_MQ_LOWERED_WATER_LEVELS] = Area("Water Temple MQ Lowered Water Levels", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(WATER_TEMPLE_MQ_COMPASS_CHEST,                {[]{return (IsAdult && CanUse(BOW)) || CanUse(DINS_FIRE) || Here(WATER_TEMPLE_MQ_LOBBY, []{return IsChild && CanUse(STICKS) && HasExplosives;});}}),
-                  LocationAccess(WATER_TEMPLE_MQ_LONGSHOT_CHEST,               {[]{return IsAdult && CanUse(HOOKSHOT);}}),
-                  LocationAccess(WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY,          {[]{return CanUse(DINS_FIRE);}}),
-                  LocationAccess(WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH, {[]{return IsAdult && CanUse(LONGSHOT);}}),
+                  LocationAccess(RC_WATER_TEMPLE_MQ_COMPASS_CHEST,                {[]{return (IsAdult && CanUse(RG_FAIRY_BOW)) || CanUse(RG_DINS_FIRE) || Here(RR_WATER_TEMPLE_MQ_LOBBY, []{return IsChild && CanUse(RG_STICKS) && HasExplosives;});}}),
+                  LocationAccess(RC_WATER_TEMPLE_MQ_LONGSHOT_CHEST,               {[]{return IsAdult && CanUse(RG_HOOKSHOT);}}),
+                  LocationAccess(RC_WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY,          {[]{return CanUse(RG_DINS_FIRE);}}),
+                  LocationAccess(RC_WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH, {[]{return IsAdult && CanUse(RG_LONGSHOT);}}),
   }, {});
 
-  areaTable[WATER_TEMPLE_MQ_DARK_LINK_REGION] = Area("Water Temple MQ Dark Link Region", "Water Temple", WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_WATER_TEMPLE_MQ_DARK_LINK_REGION] = Area("Water Temple MQ Dark Link Region", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FairyPot, {[]{return true;}}),
                   EventAccess(&NutPot,   {[]{return true;}}),
   }, {
                   //Locations
-                  LocationAccess(WATER_TEMPLE_MQ_BOSS_KEY_CHEST, {[]{return IsAdult && WaterTimer >= 24 && CanUse(DINS_FIRE) && (LogicWaterDragonJumpDive || CanDive || CanUse(IRON_BOOTS));}}),
-                  LocationAccess(WATER_TEMPLE_MQ_GS_RIVER,       {[]{return true;}}),
+                  LocationAccess(RC_WATER_TEMPLE_MQ_BOSS_KEY_CHEST, {[]{return IsAdult && WaterTimer >= 24 && CanUse(RG_DINS_FIRE) && (LogicWaterDragonJumpDive || CanDive || CanUse(RG_IRON_BOOTS));}}),
+                  LocationAccess(RC_WATER_TEMPLE_MQ_GS_RIVER,       {[]{return true;}}),
   }, {
                   //Exits
-                  Entrance(WATER_TEMPLE_MQ_BASEMENT_GATED_AREAS, {[]{return IsAdult && WaterTimer >= 24 && CanUse(DINS_FIRE) && CanUse(IRON_BOOTS);}}),
+                  Entrance(RR_WATER_TEMPLE_MQ_BASEMENT_GATED_AREAS, {[]{return IsAdult && WaterTimer >= 24 && CanUse(RG_DINS_FIRE) && CanUse(RG_IRON_BOOTS);}}),
   });
 
-  areaTable[WATER_TEMPLE_MQ_BASEMENT_GATED_AREAS] = Area("Water Temple MQ Basement Gated Areas", "Water Temple", WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_MQ_BASEMENT_GATED_AREAS] = Area("Water Temple MQ Basement Gated Areas", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(WATER_TEMPLE_MQ_FREESTANDING_KEY,         {[]{return HoverBoots || CanUse(SCARECROW) || LogicWaterNorthBasementLedgeJump;}}),
-                  LocationAccess(WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH,     {[]{return CanUse(FIRE_ARROWS) && (HoverBoots || CanUse(SCARECROW));}}),
-                  LocationAccess(WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA, {[]{return LogicWaterMQLockedGS || (SmallKeys(WATER_TEMPLE, 2) && (HoverBoots || CanUse(SCARECROW) || LogicWaterNorthBasementLedgeJump));}}),
-                    //Trick: LogicWaterMQLockedGS || (SmallKeys(WATER_TEMPLE, 2) && (HoverBoots || CanUse(SCARECROW) || LogicWaterNorthBasementLedgeJump))
+                  LocationAccess(RC_WATER_TEMPLE_MQ_FREESTANDING_KEY,         {[]{return HoverBoots || CanUse(RG_SCARECROW) || LogicWaterNorthBasementLedgeJump;}}),
+                  LocationAccess(RC_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH,     {[]{return CanUse(RG_FIRE_ARROWS) && (HoverBoots || CanUse(RG_SCARECROW));}}),
+                  LocationAccess(RC_WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA, {[]{return LogicWaterMQLockedGS || (SmallKeys(RR_WATER_TEMPLE, 2) && (HoverBoots || CanUse(RG_SCARECROW) || LogicWaterNorthBasementLedgeJump));}}),
+                    //Trick: LogicWaterMQLockedGS || (SmallKeys(RR_WATER_TEMPLE, 2) && (HoverBoots || CanUse(RG_SCARECROW) || LogicWaterNorthBasementLedgeJump))
   }, {});
   }
 
     /*---------------------------
     |         BOSS ROOM         |
     ---------------------------*/
-    areaTable[WATER_TEMPLE_BOSS_ENTRYWAY] =
-        Area("Water Temple Boss Entryway", "Water Temple", WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
+    areaTable[RR_WATER_TEMPLE_BOSS_ENTRYWAY] =
+        Area("Water Temple Boss Entryway", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
              {
                  // Exits
-                 Entrance(WATER_TEMPLE_PRE_BOSS_ROOM, { [] { return Dungeon::WaterTemple.IsVanilla() && false; } }),
-                 Entrance(WATER_TEMPLE_MQ_LOBBY, { [] { return Dungeon::WaterTemple.IsMQ() && false; } }),
-                 Entrance(WATER_TEMPLE_BOSS_ROOM, { [] { return true; } }),
+                 Entrance(RR_WATER_TEMPLE_PRE_BOSS_ROOM, { [] { return Dungeon::WaterTemple.IsVanilla() && false; } }),
+                 Entrance(RR_WATER_TEMPLE_MQ_LOBBY, { [] { return Dungeon::WaterTemple.IsMQ() && false; } }),
+                 Entrance(RR_WATER_TEMPLE_BOSS_ROOM, { [] { return true; } }),
              });
 
-    areaTable[WATER_TEMPLE_BOSS_ROOM] = Area(
-        "Water Temple Boss Room", "Water Temple", NONE, NO_DAY_NIGHT_CYCLE,
+    areaTable[RR_WATER_TEMPLE_BOSS_ROOM] = Area(
+        "Water Temple Boss Room", "Water Temple", RHT_NONE, NO_DAY_NIGHT_CYCLE,
         {
             // Events
             EventAccess(&WaterTempleClear, { [] {
                 return WaterTempleClear ||
-                       (CanUse(HOOKSHOT) && (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD)));
+                       (CanUse(RG_HOOKSHOT) && (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)));
             } }),
         },
         {
             // Locations
-            LocationAccess(WATER_TEMPLE_MORPHA_HEART, { [] { return WaterTempleClear; } }),
-            LocationAccess(MORPHA, { [] { return WaterTempleClear; } }),
+            LocationAccess(RC_WATER_TEMPLE_MORPHA_HEART, { [] { return WaterTempleClear; } }),
+            LocationAccess(RC_MORPHA, { [] { return WaterTempleClear; } }),
         },
         {
             // Exits
-            Entrance(WATER_TEMPLE_BOSS_ENTRYWAY, { [] { return false; } }),
+            Entrance(RR_WATER_TEMPLE_BOSS_ENTRYWAY, { [] { return false; } }),
         });
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
index 6d46e783e..4fcb7bcef 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
@@ -6,81 +6,81 @@ using namespace Logic;
 using namespace Settings;
 
 void AreaTable_Init_ZorasDomain() {
-  areaTable[ZR_FRONT] = Area("ZR Front", "Zora River", ZORAS_RIVER, DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_ZR_FRONT] = Area("ZR Front", "Zora River", RHT_ZORAS_RIVER, DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(ZR_GS_TREE, {[]{return IsChild && CanChildAttack;}}),
+                  LocationAccess(RC_ZR_GS_TREE, {[]{return IsChild && CanChildAttack;}}),
                 }, {
                   //Exits
-                  Entrance(ZORAS_RIVER,  {[]{return IsAdult || CanBlastOrSmash;}}),
-                  Entrance(HYRULE_FIELD, {[]{return true;}}),
+                  Entrance(RR_ZORAS_RIVER,  {[]{return IsAdult || CanBlastOrSmash;}}),
+                  Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
   });
 
-  areaTable[ZORAS_RIVER] = Area("Zora River", "Zora River", ZORAS_RIVER, DAY_NIGHT_CYCLE, {
+  areaTable[RR_ZORAS_RIVER] = Area("Zora River", "Zora River", RHT_ZORAS_RIVER, DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&GossipStoneFairy, {[]{return GossipStoneFairy || CanSummonGossipFairy;}}),
-                  EventAccess(&BeanPlantFairy,   {[]{return BeanPlantFairy   || (CanPlantBean(ZORAS_RIVER) && CanPlay(SongOfStorms));}}),
-                  EventAccess(&ButterflyFairy,   {[]{return ButterflyFairy   || CanUse(STICKS);}}),
+                  EventAccess(&BeanPlantFairy,   {[]{return BeanPlantFairy   || (CanPlantBean(RR_ZORAS_RIVER) && CanPlay(SongOfStorms));}}),
+                  EventAccess(&ButterflyFairy,   {[]{return ButterflyFairy   || CanUse(RG_STICKS);}}),
                   EventAccess(&BugShrub,         {[]{return BugShrub         || CanCutShrubs;}}),
                 }, {
                   //Locations
-                  LocationAccess(ZR_MAGIC_BEAN_SALESMAN,               {[]{return IsChild;}}),
-                  LocationAccess(ZR_FROGS_OCARINA_GAME,                {[]{return IsChild && CanPlay(ZeldasLullaby) && CanPlay(SariasSong) && CanPlay(SunsSong) && CanPlay(EponasSong) && CanPlay(SongOfTime) && CanPlay(SongOfStorms);}}),
-                  LocationAccess(ZR_FROGS_IN_THE_RAIN,                 {[]{return IsChild && CanPlay(SongOfStorms);}}),
-                  LocationAccess(ZR_FROGS_ZELDAS_LULLABY,              {[]{return IsChild && CanPlay(ZeldasLullaby);}}),
-                  LocationAccess(ZR_FROGS_EPONAS_SONG,                 {[]{return IsChild && CanPlay(EponasSong);}}),
-                  LocationAccess(ZR_FROGS_SARIAS_SONG,                 {[]{return IsChild && CanPlay(SariasSong);}}),
-                  LocationAccess(ZR_FROGS_SUNS_SONG,                   {[]{return IsChild && CanPlay(SunsSong);}}),
-                  LocationAccess(ZR_FROGS_SONG_OF_TIME,                {[]{return IsChild && CanPlay(SongOfTime);}}),
-                  LocationAccess(ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH, {[]{return IsChild || CanUse(HOVER_BOOTS) || (IsAdult && LogicZoraRiverLower);}}),
-                  LocationAccess(ZR_NEAR_DOMAIN_FREESTANDING_POH,      {[]{return IsChild || CanUse(HOVER_BOOTS) || (IsAdult && LogicZoraRiverUpper);}}),
-                  LocationAccess(ZR_GS_LADDER,                         {[]{return IsChild && AtNight && CanChildAttack && CanGetNightTimeGS;}}),
-                  LocationAccess(ZR_GS_NEAR_RAISED_GROTTOS,            {[]{return IsAdult && HookshotOrBoomerang && AtNight && CanGetNightTimeGS;}}),
-                  LocationAccess(ZR_GS_ABOVE_BRIDGE,                   {[]{return IsAdult && CanUse(HOOKSHOT) && AtNight && CanGetNightTimeGS;}}),
-                  LocationAccess(ZR_NEAR_GROTTOS_GOSSIP_STONE,         {[]{return true;}}),
-                  LocationAccess(ZR_NEAR_DOMAIN_GOSSIP_STONE,          {[]{return true;}}),
+                  LocationAccess(RC_ZR_MAGIC_BEAN_SALESMAN,               {[]{return IsChild;}}),
+                  LocationAccess(RC_ZR_FROGS_OCARINA_GAME,                {[]{return IsChild && CanPlay(ZeldasLullaby) && CanPlay(SariasSong) && CanPlay(SunsSong) && CanPlay(EponasSong) && CanPlay(SongOfTime) && CanPlay(SongOfStorms);}}),
+                  LocationAccess(RC_ZR_FROGS_IN_THE_RAIN,                 {[]{return IsChild && CanPlay(SongOfStorms);}}),
+                  LocationAccess(RC_ZR_FROGS_ZELDAS_LULLABY,              {[]{return IsChild && CanPlay(ZeldasLullaby);}}),
+                  LocationAccess(RC_ZR_FROGS_EPONAS_SONG,                 {[]{return IsChild && CanPlay(EponasSong);}}),
+                  LocationAccess(RC_ZR_FROGS_SARIAS_SONG,                 {[]{return IsChild && CanPlay(SariasSong);}}),
+                  LocationAccess(RC_ZR_FROGS_SUNS_SONG,                   {[]{return IsChild && CanPlay(SunsSong);}}),
+                  LocationAccess(RC_ZR_FROGS_SONG_OF_TIME,                {[]{return IsChild && CanPlay(SongOfTime);}}),
+                  LocationAccess(RC_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH, {[]{return IsChild || CanUse(RG_HOVER_BOOTS) || (IsAdult && LogicZoraRiverLower);}}),
+                  LocationAccess(RC_ZR_NEAR_DOMAIN_FREESTANDING_POH,      {[]{return IsChild || CanUse(RG_HOVER_BOOTS) || (IsAdult && LogicZoraRiverUpper);}}),
+                  LocationAccess(RC_ZR_GS_LADDER,                         {[]{return IsChild && AtNight && CanChildAttack && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_ZR_GS_NEAR_RAISED_GROTTOS,            {[]{return IsAdult && HookshotOrBoomerang && AtNight && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_ZR_GS_ABOVE_BRIDGE,                   {[]{return IsAdult && CanUse(RG_HOOKSHOT) && AtNight && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_ZR_NEAR_GROTTOS_GOSSIP_STONE,         {[]{return true;}}),
+                  LocationAccess(RC_ZR_NEAR_DOMAIN_GOSSIP_STONE,          {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(ZR_FRONT,            {[]{return true;}}),
-                  Entrance(ZR_OPEN_GROTTO,      {[]{return true;}}),
-                  Entrance(ZR_FAIRY_GROTTO,     {[]{return Here(ZORAS_RIVER, []{return CanBlastOrSmash;});}}),
-                  Entrance(THE_LOST_WOODS,      {[]{return CanDive || CanUse(IRON_BOOTS);}}),
-                  Entrance(ZR_STORMS_GROTTO,    {[]{return CanOpenStormGrotto;}}),
-                  Entrance(ZR_BEHIND_WATERFALL, {[]{return CanPlay(ZeldasLullaby) || (IsChild && LogicZoraWithCucco) || (IsAdult && CanUse(HOVER_BOOTS) && LogicZoraWithHovers);}}),
+                  Entrance(RR_ZR_FRONT,            {[]{return true;}}),
+                  Entrance(RR_ZR_OPEN_GROTTO,      {[]{return true;}}),
+                  Entrance(RR_ZR_FAIRY_GROTTO,     {[]{return Here(RR_ZORAS_RIVER, []{return CanBlastOrSmash;});}}),
+                  Entrance(RR_THE_LOST_WOODS,      {[]{return CanDive || CanUse(RG_IRON_BOOTS);}}),
+                  Entrance(RR_ZR_STORMS_GROTTO,    {[]{return CanOpenStormGrotto;}}),
+                  Entrance(RR_ZR_BEHIND_WATERFALL, {[]{return CanPlay(ZeldasLullaby) || (IsChild && LogicZoraWithCucco) || (IsAdult && CanUse(RG_HOVER_BOOTS) && LogicZoraWithHovers);}}),
   });
 
-  areaTable[ZR_BEHIND_WATERFALL] = Area("ZR Behind Waterfall", "Zora River", NONE, DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_ZR_BEHIND_WATERFALL] = Area("ZR Behind Waterfall", "Zora River", RHT_NONE, DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(ZORAS_RIVER,  {[]{return true;}}),
-                  Entrance(ZORAS_DOMAIN, {[]{return true;}}),
+                  Entrance(RR_ZORAS_RIVER,  {[]{return true;}}),
+                  Entrance(RR_ZORAS_DOMAIN, {[]{return true;}}),
   });
 
-  areaTable[ZR_OPEN_GROTTO] = Area("ZR Open Grotto", "ZR Open Grotto", NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+  areaTable[RR_ZR_OPEN_GROTTO] = Area("ZR Open Grotto", "ZR Open Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
-                  LocationAccess(ZR_OPEN_GROTTO_CHEST,        {[]{return true;}}),
-                  LocationAccess(ZR_OPEN_GROTTO_GOSSIP_STONE, {[]{return true;}}),
+                  LocationAccess(RC_ZR_OPEN_GROTTO_CHEST,        {[]{return true;}}),
+                  LocationAccess(RC_ZR_OPEN_GROTTO_GOSSIP_STONE, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(ZORAS_RIVER, {[]{return true;}}),
+                  Entrance(RR_ZORAS_RIVER, {[]{return true;}}),
   });
 
-  areaTable[ZR_FAIRY_GROTTO] = Area("ZR Fairy Grotto", "ZR Fairy Grotto", NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_ZR_FAIRY_GROTTO] = Area("ZR Fairy Grotto", "ZR Fairy Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Event
                   EventAccess(&FreeFairies, {[]{return true;}}),
                 }, {}, {
                   //Exits
-                  Entrance(ZORAS_RIVER, {[]{return true;}}),
+                  Entrance(RR_ZORAS_RIVER, {[]{return true;}}),
   });
 
-  areaTable[ZR_STORMS_GROTTO] = Area("ZR Storms Grotto", "ZR Storms Grotto", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_ZR_STORMS_GROTTO] = Area("ZR Storms Grotto", "ZR Storms Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(ZR_DEKU_SCRUB_GROTTO_REAR,  {[]{return CanStunDeku;}}),
-                  LocationAccess(ZR_DEKU_SCRUB_GROTTO_FRONT, {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_ZR_DEKU_SCRUB_GROTTO_REAR,  {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_ZR_DEKU_SCRUB_GROTTO_FRONT, {[]{return CanStunDeku;}}),
                 }, {
                   //Exits
-                  Entrance(ZORAS_RIVER, {[]{return true;}}),
+                  Entrance(RR_ZORAS_RIVER, {[]{return true;}}),
   });
 
-  areaTable[ZORAS_DOMAIN] = Area("Zoras Domain", "Zoras Domain", ZORAS_DOMAIN, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_ZORAS_DOMAIN] = Area("Zoras Domain", "Zoras Domain", RHT_ZORAS_DOMAIN, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&EyeballFrogAccess, {[]{return EyeballFrogAccess || (IsAdult && KingZoraThawed && (Eyedrops || EyeballFrog || Prescription || PrescriptionAccess));}}),
                   EventAccess(&GossipStoneFairy,  {[]{return GossipStoneFairy  || CanSummonGossipFairyWithoutSuns;}}),
@@ -91,76 +91,76 @@ void AreaTable_Init_ZorasDomain() {
                   EventAccess(&DeliverLetter,     {[]{return DeliverLetter     || (RutosLetter && IsChild && ZorasFountain.IsNot(ZORASFOUNTAIN_OPEN));}}),
                 }, {
                   //Locations
-                  LocationAccess(ZD_DIVING_MINIGAME,     {[]{return IsChild;}}),
-                  LocationAccess(ZD_CHEST,               {[]{return IsChild && CanUse(STICKS);}}),
-                  LocationAccess(ZD_KING_ZORA_THAWED,    {[]{return KingZoraThawed;}}),
-                  LocationAccess(ZD_TRADE_PRESCRIPTION,  {[]{return KingZoraThawed && Prescription;}}),
-                  LocationAccess(ZD_GS_FROZEN_WATERFALL, {[]{return IsAdult && AtNight && (HookshotOrBoomerang || CanUse(SLINGSHOT) || Bow || MagicMeter || LogicDomainGS) && CanGetNightTimeGS;}}),
-                  LocationAccess(ZD_GOSSIP_STONE,        {[]{return true;}}),
+                  LocationAccess(RC_ZD_DIVING_MINIGAME,     {[]{return IsChild;}}),
+                  LocationAccess(RC_ZD_CHEST,               {[]{return IsChild && CanUse(RG_STICKS);}}),
+                  LocationAccess(RC_ZD_KING_ZORA_THAWED,    {[]{return KingZoraThawed;}}),
+                  LocationAccess(RC_ZD_TRADE_PRESCRIPTION,  {[]{return KingZoraThawed && Prescription;}}),
+                  LocationAccess(RC_ZD_GS_FROZEN_WATERFALL, {[]{return IsAdult && AtNight && (HookshotOrBoomerang || CanUse(RG_FAIRY_SLINGSHOT) || Bow || MagicMeter || LogicDomainGS) && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_ZD_GOSSIP_STONE,        {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(ZR_BEHIND_WATERFALL, {[]{return true;}}),
-                  Entrance(LAKE_HYLIA,          {[]{return IsChild && (CanDive || CanUse(IRON_BOOTS));}}),
-                  Entrance(ZD_BEHIND_KING_ZORA, {[]{return DeliverLetter || ZorasFountain.Is(ZORASFOUNTAIN_OPEN) || (ZorasFountain.Is(ZORASFOUNTAIN_ADULT) && IsAdult) || (LogicKingZoraSkip && IsAdult);}}),
-                  Entrance(ZD_SHOP,             {[]{return IsChild || BlueFire;}}),
-                  Entrance(ZD_STORMS_GROTTO,    {[]{return CanOpenStormGrotto;}}),
+                  Entrance(RR_ZR_BEHIND_WATERFALL, {[]{return true;}}),
+                  Entrance(RR_LAKE_HYLIA,          {[]{return IsChild && (CanDive || CanUse(RG_IRON_BOOTS));}}),
+                  Entrance(RR_ZD_BEHIND_KING_ZORA, {[]{return DeliverLetter || ZorasFountain.Is(ZORASFOUNTAIN_OPEN) || (ZorasFountain.Is(ZORASFOUNTAIN_ADULT) && IsAdult) || (LogicKingZoraSkip && IsAdult);}}),
+                  Entrance(RR_ZD_SHOP,             {[]{return IsChild || BlueFire;}}),
+                  Entrance(RR_ZD_STORMS_GROTTO,    {[]{return CanOpenStormGrotto;}}),
   });
 
-  areaTable[ZD_BEHIND_KING_ZORA] = Area("ZD Behind King Zora", "Zoras Domain", NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_ZD_BEHIND_KING_ZORA] = Area("ZD Behind King Zora", "Zoras Domain", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(ZORAS_DOMAIN,   {[]{return DeliverLetter || ZorasFountain.Is(ZORASFOUNTAIN_OPEN) || (ZorasFountain.Is(ZORASFOUNTAIN_ADULT) && IsAdult);}}),
-                  Entrance(ZORAS_FOUNTAIN, {[]{return true;}}),
+                  Entrance(RR_ZORAS_DOMAIN,   {[]{return DeliverLetter || ZorasFountain.Is(ZORASFOUNTAIN_OPEN) || (ZorasFountain.Is(ZORASFOUNTAIN_ADULT) && IsAdult);}}),
+                  Entrance(RR_ZORAS_FOUNTAIN, {[]{return true;}}),
   });
 
-  areaTable[ZD_SHOP] = Area("ZD Shop", "ZD Shop", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_ZD_SHOP] = Area("ZD Shop", "ZD Shop", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(ZD_SHOP_ITEM_1, {[]{return true;}}),
-                  LocationAccess(ZD_SHOP_ITEM_2, {[]{return true;}}),
-                  LocationAccess(ZD_SHOP_ITEM_3, {[]{return true;}}),
-                  LocationAccess(ZD_SHOP_ITEM_4, {[]{return true;}}),
-                  LocationAccess(ZD_SHOP_ITEM_5, {[]{return true;}}),
-                  LocationAccess(ZD_SHOP_ITEM_6, {[]{return true;}}),
-                  LocationAccess(ZD_SHOP_ITEM_7, {[]{return true;}}),
-                  LocationAccess(ZD_SHOP_ITEM_8, {[]{return true;}}),
+                  LocationAccess(RC_ZD_SHOP_ITEM_1, {[]{return true;}}),
+                  LocationAccess(RC_ZD_SHOP_ITEM_2, {[]{return true;}}),
+                  LocationAccess(RC_ZD_SHOP_ITEM_3, {[]{return true;}}),
+                  LocationAccess(RC_ZD_SHOP_ITEM_4, {[]{return true;}}),
+                  LocationAccess(RC_ZD_SHOP_ITEM_5, {[]{return true;}}),
+                  LocationAccess(RC_ZD_SHOP_ITEM_6, {[]{return true;}}),
+                  LocationAccess(RC_ZD_SHOP_ITEM_7, {[]{return true;}}),
+                  LocationAccess(RC_ZD_SHOP_ITEM_8, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(ZORAS_DOMAIN, {[]{return true;}}),
+                  Entrance(RR_ZORAS_DOMAIN, {[]{return true;}}),
   });
 
-  areaTable[ZD_STORMS_GROTTO] = Area("ZD Storms Grotto", "ZD Storms Grotto", NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_ZD_STORMS_GROTTO] = Area("ZD Storms Grotto", "ZD Storms Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FreeFairies, {[]{return true;}}),
                 }, {}, {
                   //Exits
-                  Entrance(ZORAS_DOMAIN, {[]{return true;}}),
+                  Entrance(RR_ZORAS_DOMAIN, {[]{return true;}}),
   });
 
-  areaTable[ZORAS_FOUNTAIN] = Area("Zoras Fountain", "Zoras Fountain", ZORAS_FOUNTAIN, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_ZORAS_FOUNTAIN] = Area("Zoras Fountain", "Zoras Fountain", RHT_ZORAS_FOUNTAIN, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&GossipStoneFairy, {[]{return GossipStoneFairy || CanSummonGossipFairyWithoutSuns;}}),
-                  EventAccess(&ButterflyFairy,   {[]{return ButterflyFairy   || (CanUse(STICKS) && AtDay);}}),
+                  EventAccess(&ButterflyFairy,   {[]{return ButterflyFairy   || (CanUse(RG_STICKS) && AtDay);}}),
                 }, {
                   //Locations
-                  LocationAccess(ZF_ICEBERG_FREESTANDING_POH, {[]{return IsAdult;}}),
-                  LocationAccess(ZF_BOTTOM_FREESTANDING_POH,  {[]{return IsAdult && IronBoots && WaterTimer >= 24;}}),
-                  LocationAccess(ZF_GS_TREE,                  {[]{return IsChild;}}),
-                  LocationAccess(ZF_GS_ABOVE_THE_LOG,         {[]{return IsChild && HookshotOrBoomerang && AtNight && CanGetNightTimeGS;}}),
-                  LocationAccess(ZF_GS_HIDDEN_CAVE,           {[]{return CanUse(SILVER_GAUNTLETS) && CanBlastOrSmash && HookshotOrBoomerang && IsAdult && AtNight && CanGetNightTimeGS;}}),
-                  LocationAccess(ZF_FAIRY_GOSSIP_STONE,       {[]{return true;}}),
-                  LocationAccess(ZF_JABU_GOSSIP_STONE,        {[]{return true;}}),
+                  LocationAccess(RC_ZF_ICEBERC_FREESTANDING_POH, {[]{return IsAdult;}}),
+                  LocationAccess(RC_ZF_BOTTOM_FREESTANDING_POH,  {[]{return IsAdult && IronBoots && WaterTimer >= 24;}}),
+                  LocationAccess(RC_ZF_GS_TREE,                  {[]{return IsChild;}}),
+                  LocationAccess(RC_ZF_GS_ABOVE_THE_LOG,         {[]{return IsChild && HookshotOrBoomerang && AtNight && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_ZF_GS_HIDDEN_CAVE,           {[]{return CanUse(RG_SILVER_GAUNTLETS) && CanBlastOrSmash && HookshotOrBoomerang && IsAdult && AtNight && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_FAIRY_GOSSIP_STONE,       {[]{return true;}}),
+                  LocationAccess(RC_JABU_GOSSIP_STONE,        {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(ZD_BEHIND_KING_ZORA,       {[]{return true;}}),
-                  Entrance(JABU_JABUS_BELLY_ENTRYWAY, {[]{return (IsChild && Fish);}}),
-                  Entrance(ICE_CAVERN_ENTRYWAY,       {[]{return IsAdult;}}),
-                  Entrance(ZF_GREAT_FAIRY_FOUNTAIN,   {[]{return HasExplosives;}}),
+                  Entrance(RR_ZD_BEHIND_KING_ZORA,       {[]{return true;}}),
+                  Entrance(RR_JABU_JABUS_BELLY_ENTRYWAY, {[]{return (IsChild && Fish);}}),
+                  Entrance(RR_ICE_CAVERN_ENTRYWAY,       {[]{return IsAdult;}}),
+                  Entrance(RR_ZF_GREAT_FAIRY_FOUNTAIN,   {[]{return HasExplosives;}}),
   });
 
-  areaTable[ZF_GREAT_FAIRY_FOUNTAIN] = Area("ZF Great Fairy Fountain", "ZF Great Fairy Fountain", NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_ZF_GREAT_FAIRY_FOUNTAIN] = Area("ZF Great Fairy Fountain", "ZF Great Fairy Fountain", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(ZF_GREAT_FAIRY_REWARD, {[]{return CanPlay(ZeldasLullaby);}}),
+                  LocationAccess(RC_ZF_GREAT_FAIRY_REWARD, {[]{return CanPlay(ZeldasLullaby);}}),
                 }, {
                   //Exits
-                  Entrance(ZORAS_FOUNTAIN, {[]{return true;}}),
+                  Entrance(RR_ZORAS_FOUNTAIN, {[]{return true;}}),
   });
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/logic.cpp b/soh/soh/Enhancements/randomizer/3drando/logic.cpp
index ddf53824e..b556434c5 100644
--- a/soh/soh/Enhancements/randomizer/3drando/logic.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/logic.cpp
@@ -375,84 +375,84 @@ namespace Logic {
     return Ocarina && song;
   }
 
-  static bool IsMagicItem(uint32_t item) {
-    return item == DINS_FIRE    ||
-           item == FARORES_WIND ||
-           item == NAYRUS_LOVE  ||
-           item == LENS_OF_TRUTH;
+  static bool IsMagicItem(RandomizerGet item) {
+    return item == RG_DINS_FIRE    ||
+           item == RG_FARORES_WIND ||
+           item == RG_NAYRUS_LOVE  ||
+           item == RG_LENS_OF_TRUTH;
   }
 
-  static bool IsMagicArrow(uint32_t item) {
-    return item == FIRE_ARROWS ||
-           item == ICE_ARROWS  ||
-           item == LIGHT_ARROWS;
+  static bool IsMagicArrow(RandomizerGet item) {
+    return item == RG_FIRE_ARROWS ||
+           item == RG_ICE_ARROWS  ||
+           item == RG_LIGHT_ARROWS;
   }
 
-  bool HasItem(uint32_t itemName) {
-    return (itemName == DINS_FIRE         && DinsFire)        ||
-           (itemName == FARORES_WIND      && FaroresWind)     ||
-           (itemName == NAYRUS_LOVE       && NayrusLove)      ||
-           (itemName == LENS_OF_TRUTH     && LensOfTruth)     ||
-           (itemName == BOW               && Bow)             ||
-           (itemName == MEGATON_HAMMER    && Hammer)          ||
-           (itemName == IRON_BOOTS        && IronBoots)       ||
-           (itemName == HOVER_BOOTS       && HoverBoots)      ||
-           (itemName == HOOKSHOT          && Hookshot)        ||
-           (itemName == LONGSHOT          && Longshot)        ||
-           (itemName == SILVER_GAUNTLETS  && SilverGauntlets) ||
-           (itemName == GOLDEN_GAUNTLETS  && GoldenGauntlets) ||
-           (itemName == GORON_TUNIC       && GoronTunic)      ||
-           (itemName == ZORA_TUNIC        && ZoraTunic)       ||
-           (itemName == SCARECROW         && Scarecrow)       ||
-           (itemName == DISTANT_SCARECROW && DistantScarecrow)||
-           (itemName == HYLIAN_SHIELD     && HylianShield)    ||
-           (itemName == MIRROR_SHIELD     && MirrorShield)    ||
-           (itemName == MASTER_SWORD      && MasterSword)     ||
-           (itemName == BIGGORON_SWORD    && BiggoronSword)   ||
-           (itemName == SLINGSHOT         && Slingshot)       ||
-           (itemName == BOOMERANG         && Boomerang)       ||
-           (itemName == KOKIRI_SWORD      && KokiriSword)     ||
-           (itemName == STICKS            && Sticks)          ||
-           (itemName == DEKU_SHIELD       && DekuShield)      ||
-           (itemName == FIRE_ARROWS       && FireArrows)      ||
-           (itemName == ICE_ARROWS        && IceArrows)       ||
-           (itemName == LIGHT_ARROWS      && LightArrows);
+  bool HasItem(RandomizerGet itemName) {
+    return (itemName == RG_DINS_FIRE         && DinsFire)        ||
+           (itemName == RG_FARORES_WIND      && FaroresWind)     ||
+           (itemName == RG_NAYRUS_LOVE       && NayrusLove)      ||
+           (itemName == RG_LENS_OF_TRUTH     && LensOfTruth)     ||
+           (itemName == RG_FAIRY_BOW               && Bow)             ||
+           (itemName == RG_MEGATON_HAMMER    && Hammer)          ||
+           (itemName == RG_IRON_BOOTS        && IronBoots)       ||
+           (itemName == RG_HOVER_BOOTS       && HoverBoots)      ||
+           (itemName == RG_HOOKSHOT          && Hookshot)        ||
+           (itemName == RG_LONGSHOT          && Longshot)        ||
+           (itemName == RG_SILVER_GAUNTLETS  && SilverGauntlets) ||
+           (itemName == RG_GOLDEN_GAUNTLETS  && GoldenGauntlets) ||
+           (itemName == RG_GORON_TUNIC       && GoronTunic)      ||
+           (itemName == RG_ZORA_TUNIC        && ZoraTunic)       ||
+           (itemName == RG_SCARECROW         && Scarecrow)       ||
+           (itemName == RG_DISTANT_SCARECROW && DistantScarecrow)||
+           (itemName == RG_HYLIAN_SHIELD     && HylianShield)    ||
+           (itemName == RG_MIRROR_SHIELD     && MirrorShield)    ||
+           (itemName == RG_MASTER_SWORD      && MasterSword)     ||
+           (itemName == RG_BIGGORON_SWORD    && BiggoronSword)   ||
+           (itemName == RG_FAIRY_SLINGSHOT         && Slingshot)       ||
+           (itemName == RG_BOOMERANG         && Boomerang)       ||
+           (itemName == RG_KOKIRI_SWORD      && KokiriSword)     ||
+           (itemName == RG_STICKS            && Sticks)          ||
+           (itemName == RG_DEKU_SHIELD       && DekuShield)      ||
+           (itemName == RG_FIRE_ARROWS       && FireArrows)      ||
+           (itemName == RG_ICE_ARROWS        && IceArrows)       ||
+           (itemName == RG_LIGHT_ARROWS      && LightArrows);
 
   }
 
   //Can the passed in item be used?
-  bool CanUse(uint32_t itemName) {
+  bool CanUse(RandomizerGet itemName) {
     if (!HasItem(itemName))
       return false;
 
     switch (itemName) {
       // Adult items
-      case BOW:               return IsAdult || BowAsChild;
-      case MEGATON_HAMMER:    return IsAdult || HammerAsChild;
-      case IRON_BOOTS:        return IsAdult || IronBootsAsChild;
-      case HOVER_BOOTS:       return IsAdult || HoverBootsAsChild;
-      case HOOKSHOT:          return IsAdult || HookshotAsChild;
-      case LONGSHOT:          return IsAdult || HookshotAsChild;
-      case SILVER_GAUNTLETS:  return IsAdult;
-      case GOLDEN_GAUNTLETS:  return IsAdult;
-      case GORON_TUNIC:       return IsAdult || GoronTunicAsChild;
-      case ZORA_TUNIC:        return IsAdult || ZoraTunicAsChild;
-      case SCARECROW:         return IsAdult || HookshotAsChild;
-      case DISTANT_SCARECROW: return IsAdult || HookshotAsChild;
-      case HYLIAN_SHIELD:     return IsAdult;
-      case MIRROR_SHIELD:     return IsAdult || MirrorShieldAsChild;
-      case MASTER_SWORD:      return IsAdult || MasterSwordAsChild;
-      case BIGGORON_SWORD:    return IsAdult || BiggoronSwordAsChild;
+      case RG_FAIRY_BOW:               return IsAdult || BowAsChild;
+      case RG_MEGATON_HAMMER:    return IsAdult || HammerAsChild;
+      case RG_IRON_BOOTS:        return IsAdult || IronBootsAsChild;
+      case RG_HOVER_BOOTS:       return IsAdult || HoverBootsAsChild;
+      case RG_HOOKSHOT:          return IsAdult || HookshotAsChild;
+      case RG_LONGSHOT:          return IsAdult || HookshotAsChild;
+      case RG_SILVER_GAUNTLETS:  return IsAdult;
+      case RG_GOLDEN_GAUNTLETS:  return IsAdult;
+      case RG_GORON_TUNIC:       return IsAdult || GoronTunicAsChild;
+      case RG_ZORA_TUNIC:        return IsAdult || ZoraTunicAsChild;
+      case RG_SCARECROW:         return IsAdult || HookshotAsChild;
+      case RG_DISTANT_SCARECROW: return IsAdult || HookshotAsChild;
+      case RG_HYLIAN_SHIELD:     return IsAdult;
+      case RG_MIRROR_SHIELD:     return IsAdult || MirrorShieldAsChild;
+      case RG_MASTER_SWORD:      return IsAdult || MasterSwordAsChild;
+      case RG_BIGGORON_SWORD:    return IsAdult || BiggoronSwordAsChild;
 
       // Child items
-      case SLINGSHOT:         return IsChild || SlingshotAsAdult;
-      case BOOMERANG:         return IsChild || BoomerangAsAdult;
-      case KOKIRI_SWORD:      return IsChild || KokiriSwordAsAdult;
-      case STICKS:            return IsChild || StickAsAdult;
-      case DEKU_SHIELD:       return IsChild || DekuShieldAsAdult;
+      case RG_FAIRY_SLINGSHOT:         return IsChild || SlingshotAsAdult;
+      case RG_BOOMERANG:         return IsChild || BoomerangAsAdult;
+      case RG_KOKIRI_SWORD:      return IsChild || KokiriSwordAsAdult;
+      case RG_STICKS:            return IsChild || StickAsAdult;
+      case RG_DEKU_SHIELD:       return IsChild || DekuShieldAsAdult;
 
       // Magic items
-      default: return MagicMeter && (IsMagicItem(itemName) || (IsMagicArrow(itemName) && CanUse(BOW)));
+      default: return MagicMeter && (IsMagicItem(itemName) || (IsMagicArrow(itemName) && CanUse(RG_FAIRY_BOW)));
     }
   }
 
@@ -470,7 +470,7 @@ namespace Logic {
 
 //todo rewrite glitch section
 
-  bool CanEquipSwap(uint32_t itemName) {
+  bool CanEquipSwap(RandomizerGet itemName) {
     if (!HasItem(itemName))
       return false;
     
@@ -483,9 +483,9 @@ namespace Logic {
   bool CanDoGlitch(GlitchType glitch) {
     switch(glitch) {
       case GlitchType::EquipSwapDins:
-        return ((IsAdult && HasItem(DINS_FIRE)) || (IsChild && (HasItem(STICKS) || HasItem(DINS_FIRE)))) && GlitchEquipSwapDins;
+        return ((IsAdult && HasItem(RG_DINS_FIRE)) || (IsChild && (HasItem(RG_STICKS) || HasItem(RG_DINS_FIRE)))) && GlitchEquipSwapDins;
       case GlitchType::EquipSwap: // todo: add bunny hood to adult item equippable list and child trade item to child item equippable list
-        return ((IsAdult && (HasItem(DINS_FIRE) || HasItem(FARORES_WIND) || HasItem(NAYRUS_LOVE))) || (IsChild && (HasItem(STICKS) || HasItem(SLINGSHOT) || HasItem(BOOMERANG) || HasBottle || Nuts || Ocarina || HasItem(LENS_OF_TRUTH) || HasExplosives || (MagicBean || MagicBeanPack) || HasItem(DINS_FIRE) || HasItem(FARORES_WIND) || HasItem(NAYRUS_LOVE)))) && GlitchEquipSwap;
+        return ((IsAdult && (HasItem(RG_DINS_FIRE) || HasItem(RG_FARORES_WIND) || HasItem(RG_NAYRUS_LOVE))) || (IsChild && (HasItem(RG_STICKS) || HasItem(RG_FAIRY_SLINGSHOT) || HasItem(RG_BOOMERANG) || HasBottle || Nuts || Ocarina || HasItem(RG_LENS_OF_TRUTH) || HasExplosives || (MagicBean || MagicBeanPack) || HasItem(RG_DINS_FIRE) || HasItem(RG_FARORES_WIND) || HasItem(RG_NAYRUS_LOVE)))) && GlitchEquipSwap;
     }
 
     //Shouldn't be reached
@@ -530,7 +530,7 @@ namespace Logic {
     Nuts         = DekuNutDrop || Nuts;
     Sticks       = DekuStickDrop || Sticks;
     Bugs         = HasBottle && BugsAccess;
-    BlueFire     = (HasBottle && BlueFireAccess) || (BlueFireArrows && CanUse(ICE_ARROWS));
+    BlueFire     = (HasBottle && BlueFireAccess) || (BlueFireArrows && CanUse(RG_ICE_ARROWS));
     Fish         = HasBottle && FishAccess;
     Fairy        = HasBottle && FairyAccess;
 
@@ -556,11 +556,11 @@ namespace Logic {
     // IsChild = Age == AGE_CHILD;
     // IsAdult = Age == AGE_ADULT;
 
-    CanBlastOrSmash = HasExplosives || CanUse(MEGATON_HAMMER);
-    CanChildAttack  = IsChild && (Slingshot || Boomerang || Sticks || KokiriSword || HasExplosives || CanUse(DINS_FIRE) || CanUse(MASTER_SWORD) || CanUse(MEGATON_HAMMER) || CanUse(BIGGORON_SWORD));
-    CanChildDamage  = IsChild && (Slingshot ||              Sticks || KokiriSword || HasExplosives || CanUse(DINS_FIRE) || CanUse(MASTER_SWORD) || CanUse(MEGATON_HAMMER) || CanUse(BIGGORON_SWORD));
+    CanBlastOrSmash = HasExplosives || CanUse(RG_MEGATON_HAMMER);
+    CanChildAttack  = IsChild && (Slingshot || Boomerang || Sticks || KokiriSword || HasExplosives || CanUse(RG_DINS_FIRE) || CanUse(RG_MASTER_SWORD) || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_BIGGORON_SWORD));
+    CanChildDamage  = IsChild && (Slingshot ||              Sticks || KokiriSword || HasExplosives || CanUse(RG_DINS_FIRE) || CanUse(RG_MASTER_SWORD) || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_BIGGORON_SWORD));
     CanStunDeku     = IsAdult || CanChildAttack || Nuts || HasShield;
-    CanCutShrubs    = IsAdult /*|| Sticks*/ || KokiriSword || Boomerang || HasExplosives || CanUse(MASTER_SWORD) || CanUse(MEGATON_HAMMER) || CanUse(BIGGORON_SWORD);
+    CanCutShrubs    = IsAdult /*|| Sticks*/ || KokiriSword || Boomerang || HasExplosives || CanUse(RG_MASTER_SWORD) || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_BIGGORON_SWORD);
     CanDive         = ProgressiveScale >= 1;
     CanLeaveForest  = OpenForest.IsNot(OPENFOREST_CLOSED) || IsAdult || DekuTreeClear || ShuffleInteriorEntrances || ShuffleOverworldEntrances;
     CanPlantBugs    = IsChild && Bugs;
@@ -569,37 +569,37 @@ namespace Logic {
     CanSummonGossipFairyWithoutSuns = Ocarina && (ZeldasLullaby || EponasSong || SongOfTime);
     Hearts          = BaseHearts + HeartContainer + (PieceOfHeart >> 2);
     EffectiveHealth = ((Hearts << (2 + DoubleDefense)) >> Multiplier) + ((Hearts << (2 + DoubleDefense)) % (1 << Multiplier) > 0); //Number of half heart hits to die, ranges from 1 to 160
-    FireTimer       = CanUse(GORON_TUNIC) ? 255 : (LogicFewerTunicRequirements) ? (Hearts * 8) : 0;
-    WaterTimer      = CanUse( ZORA_TUNIC) ? 255 : (LogicFewerTunicRequirements) ? (Hearts * 8) : 0;
+    FireTimer       = CanUse(RG_GORON_TUNIC) ? 255 : (LogicFewerTunicRequirements) ? (Hearts * 8) : 0;
+    WaterTimer      = CanUse(RG_ZORA_TUNIC) ? 255 : (LogicFewerTunicRequirements) ? (Hearts * 8) : 0;
     NeedNayrusLove      = (EffectiveHealth == 1);
-    CanSurviveDamage    = !NeedNayrusLove || CanUse(NAYRUS_LOVE);
+    CanSurviveDamage    = !NeedNayrusLove || CanUse(RG_NAYRUS_LOVE);
     CanTakeDamage       = Fairy || CanSurviveDamage;
-    CanTakeDamageTwice  = (Fairy && NumBottles >= 2) || ((EffectiveHealth == 2) && (CanUse(NAYRUS_LOVE) || Fairy)) || (EffectiveHealth > 2);
+    CanTakeDamageTwice  = (Fairy && NumBottles >= 2) || ((EffectiveHealth == 2) && (CanUse(RG_NAYRUS_LOVE) || Fairy)) || (EffectiveHealth > 2);
     //CanPlantBean        = IsChild && (MagicBean || MagicBeanPack);
     CanOpenBombGrotto   = CanBlastOrSmash       && (ShardOfAgony || LogicGrottosWithoutAgony);
     CanOpenStormGrotto  = CanPlay(SongOfStorms) && (ShardOfAgony || LogicGrottosWithoutAgony);
-    HookshotOrBoomerang = CanUse(HOOKSHOT) || CanUse(BOOMERANG);
+    HookshotOrBoomerang = CanUse(RG_HOOKSHOT) || CanUse(RG_BOOMERANG);
     CanGetNightTimeGS   = (CanPlay(SunsSong) || !NightGSExpectSuns);
 
     GuaranteeTradePath     = ShuffleInteriorEntrances || ShuffleOverworldEntrances || LogicBiggoronBolero || CanBlastOrSmash || StopGCRollingGoronAsAdult;
   //GuaranteeHint          = (hints == "Mask" && MaskofTruth) || (hints == "Agony") || (hints != "Mask" && hints != "Agony");
-    HasFireSource          = CanUse(DINS_FIRE) || CanUse(FIRE_ARROWS);
-    HasFireSourceWithTorch = HasFireSource || CanUse(STICKS);
+    HasFireSource          = CanUse(RG_DINS_FIRE) || CanUse(RG_FIRE_ARROWS);
+    HasFireSourceWithTorch = HasFireSource || CanUse(RG_STICKS);
 
     //Gerudo Fortress
-    CanFinishGerudoFortress = (GerudoFortress.Is(GERUDOFORTRESS_NORMAL)    && GerudoFortressKeys >= 4 && (IsAdult || KokiriSword || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD)) && (GerudoToken || CanUse(BOW) || CanUse(HOOKSHOT) || CanUse(HOVER_BOOTS) || LogicGerudoKitchen)) ||
-                              (GerudoFortress.Is(GERUDOFORTRESS_FAST)      && GerudoFortressKeys >= 1 && (IsAdult || KokiriSword || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD))) ||
+    CanFinishGerudoFortress = (GerudoFortress.Is(GERUDOFORTRESS_NORMAL)    && GerudoFortressKeys >= 4 && (IsAdult || KokiriSword || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) && (GerudoToken || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_HOVER_BOOTS) || LogicGerudoKitchen)) ||
+                              (GerudoFortress.Is(GERUDOFORTRESS_FAST)      && GerudoFortressKeys >= 1 && (IsAdult || KokiriSword || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD))) ||
                               (GerudoFortress.IsNot(GERUDOFORTRESS_NORMAL) && GerudoFortress.IsNot(GERUDOFORTRESS_FAST));
 
-    HasShield          = CanUse(HYLIAN_SHIELD) || CanUse(DEKU_SHIELD); //Mirror shield can't reflect attacks
-    CanShield          = CanUse(MIRROR_SHIELD) || HasShield;
-    ChildShield        = IsChild && CanUse(DEKU_SHIELD); //hylian shield is not helpful for child
-    AdultReflectShield = IsAdult && CanUse(HYLIAN_SHIELD); //Mirror shield can't reflect attacks
-    AdultShield        = IsAdult && (CanUse(HYLIAN_SHIELD) || CanUse(MIRROR_SHIELD));
+    HasShield          = CanUse(RG_HYLIAN_SHIELD) || CanUse(RG_DEKU_SHIELD); //Mirror shield can't reflect attacks
+    CanShield          = CanUse(RG_MIRROR_SHIELD) || HasShield;
+    ChildShield        = IsChild && CanUse(RG_DEKU_SHIELD); //hylian shield is not helpful for child
+    AdultReflectShield = IsAdult && CanUse(RG_HYLIAN_SHIELD); //Mirror shield can't reflect attacks
+    AdultShield        = IsAdult && (CanUse(RG_HYLIAN_SHIELD) || CanUse(RG_MIRROR_SHIELD));
     CanShieldFlick     = ChildShield || AdultShield;
     CanJumpslash       = IsAdult || Sticks || KokiriSword;
-    CanUseProjectile   = HasExplosives || CanUse(BOW) || CanUse(HOOKSHOT) || CanUse(SLINGSHOT) || CanUse(BOOMERANG);
-    CanUseMagicArrow   = CanUse(FIRE_ARROWS) || CanUse(ICE_ARROWS) || CanUse(LIGHT_ARROWS);
+    CanUseProjectile   = HasExplosives || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOOMERANG);
+    CanUseMagicArrow   = CanUse(RG_FIRE_ARROWS) || CanUse(RG_ICE_ARROWS) || CanUse(RG_LIGHT_ARROWS);
 
     //Bridge and LACS Requirements
     MedallionCount        = (ForestMedallion ? 1:0) + (FireMedallion ? 1:0) + (WaterMedallion ? 1:0) + (SpiritMedallion ? 1:0) + (ShadowMedallion ? 1:0) + (LightMedallion ? 1:0);
@@ -627,62 +627,62 @@ namespace Logic {
     CanCompleteTriforce = TriforcePieces >= TriforceHuntRequired.Value<uint8_t>();
   }
 
-  bool SmallKeys(Key dungeon, uint8_t requiredAmount) {
+  bool SmallKeys(RandomizerRegion dungeon, uint8_t requiredAmount) {
     return SmallKeys(dungeon, requiredAmount, requiredAmount);
   }
 
-  bool SmallKeys(Key dungeon, uint8_t requiredAmountGlitchless, uint8_t requiredAmountGlitched) {
+  bool SmallKeys(RandomizerRegion dungeon, uint8_t requiredAmountGlitchless, uint8_t requiredAmountGlitched) {
     switch (dungeon) {
-      case FOREST_TEMPLE:
+      case RR_FOREST_TEMPLE:
         /*if (IsGlitched && (GetDifficultyValueFromString(GlitchHookshotJump_Boots) >= static_cast<uint8_t>(GlitchDifficulty::INTERMEDIATE) || GetDifficultyValueFromString(GlitchHoverBoost) >= static_cast<uint8_t>(GlitchDifficulty::NOVICE) ||
                           (GetDifficultyValueFromString(GlitchHover) >= static_cast<uint8_t>(GlitchDifficulty::NOVICE) && GetDifficultyValueFromString(GlitchISG) >= static_cast<uint8_t>(GlitchDifficulty::INTERMEDIATE)))) {
           return ForestTempleKeys >= requiredAmountGlitched;
         }*/
         return ForestTempleKeys >= requiredAmountGlitchless;
 
-      case FIRE_TEMPLE:
+      case RR_FIRE_TEMPLE:
         /*if (IsGlitched && (GetDifficultyValueFromString(GlitchLedgeClip) >= static_cast<uint8_t>(GlitchDifficulty::INTERMEDIATE) || GetDifficultyValueFromString(GlitchHover) >= static_cast<uint8_t>(GlitchDifficulty::INTERMEDIATE))) {
           return FireTempleKeys >= requiredAmountGlitched;
         }*/
         return FireTempleKeys >= requiredAmountGlitchless;
 
-      case WATER_TEMPLE:
+      case RR_WATER_TEMPLE:
         /*if (IsGlitched && (false)) {
           return WaterTempleKeys >= requiredAmountGlitched;
         }*/
         return WaterTempleKeys >= requiredAmountGlitchless;
 
-      case SPIRIT_TEMPLE:
+      case RR_SPIRIT_TEMPLE:
         /*if (IsGlitched && (false)) {
           return SpiritTempleKeys >= requiredAmountGlitched;
         }*/
         return SpiritTempleKeys >= requiredAmountGlitchless;
 
-      case SHADOW_TEMPLE:
+      case RR_SHADOW_TEMPLE:
         /*if (IsGlitched && (GetDifficultyValueFromString(GlitchHookshotClip) >= static_cast<uint8_t>(GlitchDifficulty::NOVICE))) {
           return ShadowTempleKeys >= requiredAmountGlitched;
         }*/
         return ShadowTempleKeys >= requiredAmountGlitchless;
 
-      case BOTTOM_OF_THE_WELL:
+      case RR_BOTTOM_OF_THE_WELL:
         /*if (IsGlitched && (false)) {
           return BottomOfTheWellKeys >= requiredAmountGlitched;
         }*/
         return BottomOfTheWellKeys >= requiredAmountGlitchless;
 
-      case GERUDO_TRAINING_GROUNDS:
+      case RR_GERUDO_TRAINING_GROUNDS:
         /*if (IsGlitched && (false)) {
           return GerudoTrainingGroundsKeys >= requiredAmountGlitched;
         }*/
         return GerudoTrainingGroundsKeys >= requiredAmountGlitchless;
 
-      case GANONS_CASTLE:
+      case RR_GANONS_CASTLE:
         /*if (IsGlitched && (false)) {
           return GanonsCastleKeys >= requiredAmountGlitched;
         }*/
         return GanonsCastleKeys >= requiredAmountGlitchless;
 
-      case MARKET_TREASURE_CHEST_GAME:
+      case RR_MARKET_TREASURE_CHEST_GAME:
         /*if (IsGlitched && (false)) {
           return TreasureGameKeys >= requiredAmountGlitched;
         }*/
diff --git a/soh/soh/Enhancements/randomizer/3drando/logic.hpp b/soh/soh/Enhancements/randomizer/3drando/logic.hpp
index 4d24fd3ff..0262ad005 100644
--- a/soh/soh/Enhancements/randomizer/3drando/logic.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/logic.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "keys.hpp"
+#include "../randomizerTypes.h"
 #include <cstdint>
 
 namespace Logic {
@@ -365,10 +365,10 @@ enum class GlitchDifficulty {
 
 void UpdateHelpers();
 bool CanPlay(bool song);
-bool CanUse(uint32_t itemName);
+bool CanUse(RandomizerGet itemName);
 bool HasProjectile(HasProjectileAge age);
-bool SmallKeys(Key dungeon, uint8_t requiredAmount);
-bool SmallKeys(Key dungeon, uint8_t requiredAmountGlitchless, uint8_t requiredAmountGlitched);
+bool SmallKeys(RandomizerRegion dungeon, uint8_t requiredAmount);
+bool SmallKeys(RandomizerRegion dungeon, uint8_t requiredAmountGlitchless, uint8_t requiredAmountGlitched);
 bool CanDoGlitch(GlitchType glitch);
 bool EventsUpdated();
 void LogicReset();
diff --git a/soh/soh/Enhancements/randomizer/3drando/menu.hpp b/soh/soh/Enhancements/randomizer/3drando/menu.hpp
index 333fcbb2b..8079ab2e9 100644
--- a/soh/soh/Enhancements/randomizer/3drando/menu.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/menu.hpp
@@ -13,16 +13,16 @@
 #define DELETE_PRESET 6
 #define RESET_TO_DEFAULTS 8
 
-#define RESET   "\x1b[0m"
-#define DIM     "\x1b[2m"
+// #define RESET   "\x1b[0m"
+// #define DIM     "\x1b[2m"
 
-#define BLACK   "\x1b[30m"
-#define RED     "\x1b[31m"
-#define GREEN   "\x1b[32m"
-#define YELLOW  "\x1b[33m"
-#define BLUE    "\x1b[34m"
-#define MEGANTA "\x1b[35m"
-#define CYAN    "\x1b[36m"
-#define WHITE   "\x1b[37m"
+// #define BLACK   "\x1b[30m"
+// #define RED     "\x1b[31m"
+// #define GREEN   "\x1b[32m"
+// #define YELLOW  "\x1b[33m"
+// #define BLUE    "\x1b[34m"
+// #define MEGANTA "\x1b[35m"
+// #define CYAN    "\x1b[36m"
+// #define WHITE   "\x1b[37m"
 
 std::string GenerateRandomizer(std::unordered_map<RandomizerSettingKey, uint8_t> cvarSetting, std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks, std::string seedInput);
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp b/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
index 088ba5067..4ae1c3b67 100644
--- a/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
@@ -16,10 +16,11 @@ int Playthrough_Init(uint32_t seed, std::unordered_map<RandomizerSettingKey, uin
     // resolved to something random
     Random_Init(seed);
 
-    overrides.clear();
+    auto ctx = Rando::Context::GetInstance();
+    ctx->overrides.clear();
     CustomMessages::ClearMessages();
-    ItemReset();
-    HintReset();
+    ctx->ItemReset();
+    ctx->HintReset();
     Areas::AccessReset();
 
     Settings::UpdateSettings(cvarSettings, excludedLocations, enabledTricks);
@@ -75,9 +76,9 @@ int Playthrough_Init(uint32_t seed, std::unordered_map<RandomizerSettingKey, uin
 #endif
     }
 
-    playthroughLocations.clear();
-    wothLocations.clear();
-    playthroughBeatable = false;
+    ctx->playthroughLocations.clear();
+    ctx->wothLocations.clear();
+    ctx->playthroughBeatable = false;
 
     return 1;
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/playthrough.hpp b/soh/soh/Enhancements/randomizer/3drando/playthrough.hpp
index 90e5988b9..9b59b8f5e 100644
--- a/soh/soh/Enhancements/randomizer/3drando/playthrough.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/playthrough.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include <string>
 #include <set>
-#include "item_location.hpp"
+#include "../context.h"
 
 namespace Playthrough {
     int Playthrough_Init(uint32_t seed, std::unordered_map<RandomizerSettingKey, uint8_t> cvarSettings, std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks);
diff --git a/soh/soh/Enhancements/randomizer/3drando/rando_main.cpp b/soh/soh/Enhancements/randomizer/3drando/rando_main.cpp
index 167e12667..5b35a85ab 100644
--- a/soh/soh/Enhancements/randomizer/3drando/rando_main.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/rando_main.cpp
@@ -1,7 +1,7 @@
 #include "menu.hpp"
 #include "hint_list.hpp"
-#include "item_list.hpp"
-#include "item_location.hpp"
+#include "../static_data.h"
+#include "../item_location.h"
 #include "location_access.hpp"
 #include "rando_main.hpp"
 // #include <soh/Enhancements/randomizer.h>
@@ -12,8 +12,6 @@
 void RandoMain::GenerateRando(std::unordered_map<RandomizerSettingKey, u8> cvarSettings, std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks,
     std::string seedString) {
     HintTable_Init();
-    ItemTable_Init();
-    LocationTable_Init();
 
     // std::string settingsFileName = "./randomizer/latest_settings.json";
     // CVarSetString("gLoadedPreset", settingsFileName.c_str());
@@ -24,10 +22,4 @@ void RandoMain::GenerateRando(std::unordered_map<RandomizerSettingKey, u8> cvarS
     CVarSave();
     CVarLoad();
     CVarSetInteger("gNewSeedGenerated", 1);
-}
-
-std::array<Item, KEY_ENUM_MAX>* RandoMain::GetFullItemTable() {
-    ItemTable_Init();
-
-    return GetFullItemTable_();
-}
+}
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/3drando/rando_main.hpp b/soh/soh/Enhancements/randomizer/3drando/rando_main.hpp
index 159afb0cb..54ebdf6f8 100644
--- a/soh/soh/Enhancements/randomizer/3drando/rando_main.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/rando_main.hpp
@@ -1,8 +1,5 @@
 #pragma once
-
-#include "item.hpp"
-
+#include "soh/Enhancements/randomizer/item.h"
 namespace RandoMain {
 void GenerateRando(std::unordered_map<RandomizerSettingKey, uint8_t> cvarSettings, std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks, std::string seedInput);
-std::array<Item, KEY_ENUM_MAX>* GetFullItemTable();
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/settings.cpp b/soh/soh/Enhancements/randomizer/3drando/settings.cpp
index 2cd894ffd..ed84480cf 100644
--- a/soh/soh/Enhancements/randomizer/3drando/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/settings.cpp
@@ -2,11 +2,11 @@
 
 #include "dungeon.hpp"
 #include "fill.hpp"
-#include "item_location.hpp"
+#include "../context.h"
+#include "../item_location.h"
 #include "random.hpp"
 #include "randomizer.hpp"
 #include "trial.hpp"
-#include "keys.hpp"
 
 using namespace Dungeon;
 using namespace Trial;
@@ -1508,17 +1508,19 @@ namespace Settings {
   }
 
   //Include and Lock the desired locations
-  static void IncludeAndHide(std::vector<uint32_t> locations) {
-    for (uint32_t loc : locations) {
-      Location(loc)->GetExcludedOption()->SetSelectedIndex(INCLUDE);
-      Location(loc)->GetExcludedOption()->Hide();
+  static void IncludeAndHide(std::vector<RandomizerCheck> locations) {
+    auto ctx = Rando::Context::GetInstance();
+    for (RandomizerCheck loc : locations) {
+      ctx->GetItemLocation(loc)->GetExcludedOption()->SetSelectedIndex(INCLUDE);
+      ctx->GetItemLocation(loc)->GetExcludedOption()->Hide();
     }
   }
 
   //Unlock the desired locations
-  static void Unhide(std::vector<uint32_t> locations) {
-    for (uint32_t loc : locations) {
-      Location(loc)->GetExcludedOption()->Unhide();
+  static void Unhide(std::vector<RandomizerCheck> locations) {
+    auto ctx = Rando::Context::GetInstance();
+    for (RandomizerCheck loc : locations) {
+      ctx->GetItemLocation(loc)->GetExcludedOption()->Unhide();
     }
   }
 
@@ -1552,200 +1554,216 @@ namespace Settings {
   //menu if the player's current settings would require non-junk to be placed
   //at those locations. Excluded locations will have junk placed at them.
   void ResolveExcludedLocationConflicts() {
+      auto ctx = Rando::Context::GetInstance();
+      std::vector<RandomizerCheck> shopLocations = ctx->GetLocations(ctx->everyPossibleLocation, Category::cShop);
+      // For now, just always hide shop locations, as not sure how to handle hiding them-
+      // 1-4 should always be hidden, while the others should be settings dependent, but random shopsanity makes that
+      // more complicated... Excluded shop locations are also wonky
+      IncludeAndHide(shopLocations);
 
-    std::vector<uint32_t> shopLocations = GetLocations(everyPossibleLocation, Category::cShop);
-    //For now, just always hide shop locations, as not sure how to handle hiding them-
-    //1-4 should always be hidden, while the others should be settings dependent, but random shopsanity makes that more complicated...
-    //Excluded shop locations are also wonky
-    IncludeAndHide(shopLocations);
+      // Force include song locations
+      std::vector<RandomizerCheck> songLocations = ctx->GetLocations(ctx->everyPossibleLocation, Category::cSong);
+      std::vector<RandomizerCheck> songDungeonRewards =
+          ctx->GetLocations(ctx->everyPossibleLocation, Category::cSongDungeonReward);
 
-    //Force include song locations
-    std::vector<uint32_t> songLocations = GetLocations(everyPossibleLocation, Category::cSong);
-    std::vector<uint32_t> songDungeonRewards = GetLocations(everyPossibleLocation, Category::cSongDungeonReward);
+      // Unhide all song locations, then lock necessary ones
+      Unhide(songLocations);
+      Unhide(songDungeonRewards);
 
-    //Unhide all song locations, then lock necessary ones
-    Unhide(songLocations);
-    Unhide(songDungeonRewards);
-
-    if (ShuffleSongs.Is(SONGSHUFFLE_SONG_LOCATIONS)) {
-      IncludeAndHide(songLocations);
-    } else if (ShuffleSongs.Is(SONGSHUFFLE_DUNGEON_REWARDS)) {
-      IncludeAndHide(songDungeonRewards);
-    }
-
-    //Force Include Vanilla Skulltula locations
-    std::vector<uint32_t> skulltulaLocations = GetLocations(everyPossibleLocation, Category::cSkulltula);
-    Unhide(skulltulaLocations);
-    if (Tokensanity.IsNot(TOKENSANITY_ALL_TOKENS)) {
-      if (Tokensanity.Is(TOKENSANITY_OVERWORLD)) {
-        //filter overworld skulls so we're just left with dungeons
-        FilterAndEraseFromPool(skulltulaLocations, [](const uint32_t loc){return Location(loc)->GetScene() >= 0x0A;});
-      } else if (Tokensanity.Is(TOKENSANITY_DUNGEONS)) {
-        //filter dungeon skulls so we're just left with overworld
-        FilterAndEraseFromPool(skulltulaLocations, [](const uint32_t loc){return Location(loc)->GetScene() < 0x0A;});
+      if (ShuffleSongs.Is(SONGSHUFFLE_SONG_LOCATIONS)) {
+          IncludeAndHide(songLocations);
+      } else if (ShuffleSongs.Is(SONGSHUFFLE_DUNGEON_REWARDS)) {
+          IncludeAndHide(songDungeonRewards);
       }
-      IncludeAndHide(skulltulaLocations);
-    }
 
-    //Force Include scrubs if Scrubsanity is Off
-    std::vector<uint32_t> scrubLocations = GetLocations(everyPossibleLocation, Category::cDekuScrub, Category::cDekuScrubUpgrades);
-    if (Scrubsanity.Is(OFF)) {
-      IncludeAndHide(scrubLocations);
-    } else {
-      Unhide(scrubLocations);
-    }
+      // Force Include Vanilla Skulltula locations
+      std::vector<RandomizerCheck> skulltulaLocations =
+          ctx->GetLocations(ctx->everyPossibleLocation, Category::cSkulltula);
+      Unhide(skulltulaLocations);
+      if (Tokensanity.IsNot(TOKENSANITY_ALL_TOKENS)) {
+          if (Tokensanity.Is(TOKENSANITY_OVERWORLD)) {
+              // filter overworld skulls so we're just left with dungeons
+              FilterAndEraseFromPool(skulltulaLocations, [](const RandomizerCheck loc) {
+                  return Rando::StaticData::GetLocation(loc)->GetScene() >= 0x0A;
+              });
+          } else if (Tokensanity.Is(TOKENSANITY_DUNGEONS)) {
+              // filter dungeon skulls so we're just left with overworld
+              FilterAndEraseFromPool(skulltulaLocations, [](const RandomizerCheck loc) {
+                  return Rando::StaticData::GetLocation(loc)->GetScene() < 0x0A;
+              });
+          }
+          IncludeAndHide(skulltulaLocations);
+      }
 
-    //Force include Cows if Shuffle Cows is Off
-    std::vector<uint32_t> cowLocations = GetLocations(everyPossibleLocation, Category::cCow);
-    if (ShuffleCows) {
-      Unhide(cowLocations);
-    } else {
-      IncludeAndHide(cowLocations);
-    }
+      // Force Include scrubs if Scrubsanity is Off
+      std::vector<RandomizerCheck> scrubLocations =
+          ctx->GetLocations(ctx->everyPossibleLocation, Category::cDekuScrub, Category::cDekuScrubUpgrades);
+      if (Scrubsanity.Is(OFF)) {
+          IncludeAndHide(scrubLocations);
+      } else {
+          Unhide(scrubLocations);
+      }
 
-    //Force include the Kokiri Sword Chest if Shuffle Kokiri Sword is Off
-    if (ShuffleKokiriSword) {
-      Unhide({KF_KOKIRI_SWORD_CHEST});
-    } else {
-      IncludeAndHide({KF_KOKIRI_SWORD_CHEST});
-    }
+      // Force include Cows if Shuffle Cows is Off
+      std::vector<RandomizerCheck> cowLocations = ctx->GetLocations(ctx->everyPossibleLocation, Category::cCow);
+      if (ShuffleCows) {
+          Unhide(cowLocations);
+      } else {
+          IncludeAndHide(cowLocations);
+      }
 
-    //Force include the ocarina locations if Shuffle Ocarinas is Off
-    std::vector<uint32_t> ocarinaLocations = {LW_GIFT_FROM_SARIA, HF_OCARINA_OF_TIME_ITEM};
-    if (ShuffleOcarinas) {
-      Unhide(ocarinaLocations);
-    } else {
-      IncludeAndHide(ocarinaLocations);
-    }
+      // Force include the Kokiri Sword Chest if Shuffle Kokiri Sword is Off
+      if (ShuffleKokiriSword) {
+          Unhide({ RC_KF_KOKIRI_SWORD_CHEST });
+      } else {
+          IncludeAndHide({ RC_KF_KOKIRI_SWORD_CHEST });
+      }
 
-    //Force include Malon if Shuffle Weird Egg is Off
-    if (ShuffleWeirdEgg) {
-      Unhide({HC_MALON_EGG});
-    } else {
-      IncludeAndHide({HC_MALON_EGG});
-    }
+      // Force include the ocarina locations if Shuffle Ocarinas is Off
+      std::vector<RandomizerCheck> ocarinaLocations = { RC_LW_GIFT_FROM_SARIA, RC_HF_OCARINA_OF_TIME_ITEM };
+      if (ShuffleOcarinas) {
+          Unhide(ocarinaLocations);
+      } else {
+          IncludeAndHide(ocarinaLocations);
+      }
 
-    //Force include Gerudo Membership Card Location if it's not shuffled
-    if (ShuffleGerudoToken) {
-      Unhide({GF_GERUDO_MEMBERSHIP_CARD});
-    } else {
-      IncludeAndHide({GF_GERUDO_MEMBERSHIP_CARD});
-    }
+      // Force include Malon if Shuffle Weird Egg is Off
+      if (ShuffleWeirdEgg) {
+          Unhide({ RC_HC_MALON_EGG });
+      } else {
+          IncludeAndHide({ RC_HC_MALON_EGG });
+      }
 
-    //Force include Magic Bean salesman if Shuffle Magic Beans is off
-    if (ShuffleMagicBeans) {
-      Unhide({ZR_MAGIC_BEAN_SALESMAN});
-    } else {
-      IncludeAndHide({ZR_MAGIC_BEAN_SALESMAN});
-    }
+      // Force include Gerudo Membership Card GetLocation if it's not shuffled
+      if (ShuffleGerudoToken) {
+          Unhide({ RC_GF_GERUDO_MEMBERSHIP_CARD });
+      } else {
+          IncludeAndHide({ RC_GF_GERUDO_MEMBERSHIP_CARD });
+      }
 
-    //Force include Medigoron, Granny and Carpet salesman if Shuffle Merchants is off
-    if (ShuffleMerchants.IsNot(SHUFFLEMERCHANTS_OFF)) {
-      Unhide({GC_MEDIGORON});
-      Unhide({KAK_GRANNYS_SHOP});
-      Unhide({WASTELAND_BOMBCHU_SALESMAN});
-    } else {
-      IncludeAndHide({GC_MEDIGORON});
-      IncludeAndHide({KAK_GRANNYS_SHOP});
-      IncludeAndHide({WASTELAND_BOMBCHU_SALESMAN});
-    }
+      // Force include Magic Bean salesman if Shuffle Magic Beans is off
+      if (ShuffleMagicBeans) {
+          Unhide({ RC_ZR_MAGIC_BEAN_SALESMAN });
+      } else {
+          IncludeAndHide({ RC_ZR_MAGIC_BEAN_SALESMAN });
+      }
 
-    //Force include frog song rupees if they're not shuffled
-    if (ShuffleFrogSongRupees) {
-      Unhide({ZR_FROGS_ZELDAS_LULLABY});
-      Unhide({ZR_FROGS_EPONAS_SONG});
-      Unhide({ZR_FROGS_SARIAS_SONG});
-      Unhide({ZR_FROGS_SUNS_SONG});
-      Unhide({ZR_FROGS_SONG_OF_TIME});
-    } else {
-      IncludeAndHide({ZR_FROGS_ZELDAS_LULLABY});
-      IncludeAndHide({ZR_FROGS_EPONAS_SONG});
-      IncludeAndHide({ZR_FROGS_SARIAS_SONG});
-      IncludeAndHide({ZR_FROGS_SUNS_SONG});
-      IncludeAndHide({ZR_FROGS_SONG_OF_TIME});
-    }
+      // Force include Medigoron, Granny and Carpet salesman if Shuffle Merchants is off
+      if (ShuffleMerchants.IsNot(SHUFFLEMERCHANTS_OFF)) {
+          Unhide({ RC_GC_MEDIGORON });
+          Unhide({ RC_KAK_GRANNYS_SHOP });
+          Unhide({ RC_WASTELAND_BOMBCHU_SALESMAN });
+      } else {
+          IncludeAndHide({ RC_GC_MEDIGORON });
+          IncludeAndHide({ RC_KAK_GRANNYS_SHOP });
+          IncludeAndHide({ RC_WASTELAND_BOMBCHU_SALESMAN });
+      }
 
-    //Force include adult trade quest if Shuffle Adult Trade Quest is off
-    std::vector<uint32_t> adultTradeLocations = {KAK_TRADE_POCKET_CUCCO, LW_TRADE_COJIRO, KAK_TRADE_ODD_MUSHROOM, LW_TRADE_ODD_POTION, GV_TRADE_SAW, DMT_TRADE_BROKEN_SWORD, ZD_TRADE_PRESCRIPTION, LH_TRADE_FROG, DMT_TRADE_EYEDROPS};
-    if (ShuffleAdultTradeQuest) {
-      Unhide(adultTradeLocations);
-    } else {
-      IncludeAndHide(adultTradeLocations);
-    }
+      // Force include frog song rupees if they're not shuffled
+      if (ShuffleFrogSongRupees) {
+          Unhide({ RC_ZR_FROGS_ZELDAS_LULLABY });
+          Unhide({ RC_ZR_FROGS_EPONAS_SONG });
+          Unhide({ RC_ZR_FROGS_SARIAS_SONG });
+          Unhide({ RC_ZR_FROGS_SUNS_SONG });
+          Unhide({ RC_ZR_FROGS_SONG_OF_TIME });
+      } else {
+          IncludeAndHide({ RC_ZR_FROGS_ZELDAS_LULLABY });
+          IncludeAndHide({ RC_ZR_FROGS_EPONAS_SONG });
+          IncludeAndHide({ RC_ZR_FROGS_SARIAS_SONG });
+          IncludeAndHide({ RC_ZR_FROGS_SUNS_SONG });
+          IncludeAndHide({ RC_ZR_FROGS_SONG_OF_TIME });
+      }
 
-    //Force include Chest Game keys if Shuffle Chest Minigame is off
-    std::vector<uint32_t> ChestMinigameLocations = {
-        MARKET_TREASURE_CHEST_GAME_ITEM_1, MARKET_TREASURE_CHEST_GAME_ITEM_2, MARKET_TREASURE_CHEST_GAME_ITEM_3,
-        MARKET_TREASURE_CHEST_GAME_ITEM_4, MARKET_TREASURE_CHEST_GAME_ITEM_5
-    };
-    if (ShuffleChestMinigame) {
-      Unhide(ChestMinigameLocations);
-    } else {
-      IncludeAndHide(ChestMinigameLocations);
-    }
+      // Force include adult trade quest if Shuffle Adult Trade Quest is off
+      std::vector<RandomizerCheck> adultTradeLocations = { RC_KAK_TRADE_POCKET_CUCCO, RC_LW_TRADE_COJIRO,
+                                                           RC_KAK_TRADE_ODD_MUSHROOM, RC_LW_TRADE_ODD_POTION,
+                                                           RC_GV_TRADE_SAW,           RC_DMT_TRADE_BROKEN_SWORD,
+                                                           RC_ZD_TRADE_PRESCRIPTION,  RC_LH_TRADE_FROG,
+                                                           RC_DMT_TRADE_EYEDROPS };
+      if (ShuffleAdultTradeQuest) {
+          Unhide(adultTradeLocations);
+      } else {
+          IncludeAndHide(adultTradeLocations);
+      }
 
-    //Force include 100 GS reward if it isn't shuffled
-    if (Shuffle100GSReward) {
-      Unhide({KAK_100_GOLD_SKULLTULA_REWARD});
-    } else {
-      IncludeAndHide({KAK_100_GOLD_SKULLTULA_REWARD});
-    }
+      // Force include Chest Game keys if Shuffle Chest Minigame is off
+      std::vector<RandomizerCheck> ChestMinigameLocations = { RC_MARKET_TREASURE_CHEST_GAME_ITEM_1,
+                                                              RC_MARKET_TREASURE_CHEST_GAME_ITEM_2,
+                                                              RC_MARKET_TREASURE_CHEST_GAME_ITEM_3,
+                                                              RC_MARKET_TREASURE_CHEST_GAME_ITEM_4,
+                                                              RC_MARKET_TREASURE_CHEST_GAME_ITEM_5 };
+      if (ShuffleChestMinigame) {
+          Unhide(ChestMinigameLocations);
+      } else {
+          IncludeAndHide(ChestMinigameLocations);
+      }
 
-    //Force include Triforce Hunt if it's off
-    if (TriforceHunt) {
-      Unhide({ TRIFORCE_COMPLETED });
-    } else {
-      IncludeAndHide({ TRIFORCE_COMPLETED });
-    }
+      // Force include 100 GS reward if it isn't shuffled
+      if (Shuffle100GSReward) {
+          Unhide({ RC_KAK_100_GOLD_SKULLTULA_REWARD });
+      } else {
+          IncludeAndHide({ RC_KAK_100_GOLD_SKULLTULA_REWARD });
+      }
 
-    //Force include Map and Compass Chests when Vanilla
-    std::vector<uint32_t> mapChests = GetLocations(everyPossibleLocation, Category::cVanillaMap);
-    std::vector<uint32_t> compassChests = GetLocations(everyPossibleLocation, Category::cVanillaCompass);
-    if (MapsAndCompasses.Is(MAPSANDCOMPASSES_VANILLA)) {
-      IncludeAndHide(mapChests);
-      IncludeAndHide(compassChests);
-    } else {
-      Unhide(mapChests);
-      Unhide(compassChests);
-    }
+      // Force include Triforce Hunt if it's off
+      if (TriforceHunt) {
+          Unhide({ RC_TRIFORCE_COMPLETED });
+      } else {
+          IncludeAndHide({ RC_TRIFORCE_COMPLETED });
+      }
 
-    //Force include Vanilla Small Key Locations (except gerudo Fortress) on Vanilla Keys
-    std::vector<uint32_t> smallKeyChests = GetLocations(everyPossibleLocation, Category::cVanillaSmallKey);
-    if (Keysanity.Is(KEYSANITY_VANILLA)) {
-      IncludeAndHide(smallKeyChests);
-    } else {
-      Unhide(smallKeyChests);
-    }
+      // Force include Map and Compass Chests when Vanilla
+      std::vector<RandomizerCheck> mapChests = ctx->GetLocations(ctx->everyPossibleLocation, Category::cVanillaMap);
+      std::vector<RandomizerCheck> compassChests =
+          ctx->GetLocations(ctx->everyPossibleLocation, Category::cVanillaCompass);
+      if (MapsAndCompasses.Is(MAPSANDCOMPASSES_VANILLA)) {
+          IncludeAndHide(mapChests);
+          IncludeAndHide(compassChests);
+      } else {
+          Unhide(mapChests);
+          Unhide(compassChests);
+      }
 
-    //Force include Gerudo Fortress carpenter fights if GF Small Keys are Vanilla
-    std::vector<uint32_t> vanillaGFKeyLocations = GetLocations(everyPossibleLocation, Category::cVanillaGFSmallKey);
-    if (GerudoKeys.Is(GERUDOKEYS_VANILLA)) {
-      IncludeAndHide(vanillaGFKeyLocations);
-    } else {
-      Unhide(vanillaGFKeyLocations);
-    }
+      // Force include Vanilla Small Key Locations (except gerudo Fortress) on Vanilla Keys
+      std::vector<RandomizerCheck> smallKeyChests =
+          ctx->GetLocations(ctx->everyPossibleLocation, Category::cVanillaSmallKey);
+      if (Keysanity.Is(KEYSANITY_VANILLA)) {
+          IncludeAndHide(smallKeyChests);
+      } else {
+          Unhide(smallKeyChests);
+      }
 
-    //Force include Boss Key Chests if Boss Keys are Vanilla
-    std::vector<uint32_t> bossKeyChests = GetLocations(everyPossibleLocation, Category::cVanillaBossKey);
-    if (BossKeysanity.Is(BOSSKEYSANITY_VANILLA)) {
-      IncludeAndHide(bossKeyChests);
-    } else {
-      Unhide(bossKeyChests);
-    }
+      // Force include Gerudo Fortress carpenter fights if GF Small Keys are Vanilla
+      std::vector<RandomizerCheck> vanillaGFKeyLocations =
+          ctx->GetLocations(ctx->everyPossibleLocation, Category::cVanillaGFSmallKey);
+      if (GerudoKeys.Is(GERUDOKEYS_VANILLA)) {
+          IncludeAndHide(vanillaGFKeyLocations);
+      } else {
+          Unhide(vanillaGFKeyLocations);
+      }
 
-    //Force include Ganons Boss Key Chest if ganons boss key has to be there
-    if (GanonsBossKey.Is(GANONSBOSSKEY_VANILLA)) {
-      IncludeAndHide({GANONS_TOWER_BOSS_KEY_CHEST});
-    } else {
-      Unhide({GANONS_TOWER_BOSS_KEY_CHEST});
-    }
+      // Force include Boss Key Chests if Boss Keys are Vanilla
+      std::vector<RandomizerCheck> bossKeyChests =
+          ctx->GetLocations(ctx->everyPossibleLocation, Category::cVanillaBossKey);
+      if (BossKeysanity.Is(BOSSKEYSANITY_VANILLA)) {
+          IncludeAndHide(bossKeyChests);
+      } else {
+          Unhide(bossKeyChests);
+      }
 
-    //Force include Light Arrow item if ganons boss key has to be there
-    if (GanonsBossKey.Value<uint8_t>() >= GANONSBOSSKEY_LACS_VANILLA) {
-      IncludeAndHide({TOT_LIGHT_ARROWS_CUTSCENE});
-    } else {
-      Unhide({TOT_LIGHT_ARROWS_CUTSCENE});
-    }
+      // Force include Ganons Boss Key Chest if ganons boss key has to be there
+      if (GanonsBossKey.Is(GANONSBOSSKEY_VANILLA)) {
+          IncludeAndHide({ RC_GANONS_TOWER_BOSS_KEY_CHEST });
+      } else {
+          Unhide({ RC_GANONS_TOWER_BOSS_KEY_CHEST });
+      }
+
+      // Force include Light Arrow item if ganons boss key has to be there
+      if (GanonsBossKey.Value<uint8_t>() >= GANONSBOSSKEY_LACS_VANILLA) {
+          IncludeAndHide({ RC_TOT_LIGHT_ARROWS_CUTSCENE });
+      } else {
+          Unhide({ RC_TOT_LIGHT_ARROWS_CUTSCENE });
+      }
   }
 
   uint8_t DungeonsOfType(uint8_t type) {
@@ -2205,10 +2223,10 @@ namespace Settings {
     }
 
     LocationsReachable.SetSelectedIndex(cvarSettings[RSK_ALL_LOCATIONS_REACHABLE]);
-
-    AddExcludedOptions();
-    for (auto locationKey : everyPossibleLocation) {
-      auto location = Location(locationKey);
+    auto ctx = Rando::Context::GetInstance();
+    ctx->AddExcludedOptions();
+    for (auto locationKey : ctx->everyPossibleLocation) {
+      auto location = ctx->GetItemLocation(locationKey);
       if (excludedLocations.count(location->GetRandomizerCheck())) {
         location->GetExcludedOption()->SetSelectedIndex(1);
       } else {
diff --git a/soh/soh/Enhancements/randomizer/3drando/settings.hpp b/soh/soh/Enhancements/randomizer/3drando/settings.hpp
index 0d3d3c898..a29df2a9b 100644
--- a/soh/soh/Enhancements/randomizer/3drando/settings.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/settings.hpp
@@ -737,7 +737,7 @@ class Menu {
 namespace Settings {
 void UpdateSettings(std::unordered_map<RandomizerSettingKey, uint8_t> cvarSettings, std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks);
   SettingsContext FillContext();
-  void ResolveExcludedLocationConflicts();
+  //void ResolveExcludedLocationConflicts();
   void RandomizeAllSettings(const bool selectOptions = false);
   void ForceChange(uint32_t kDown, Option* currentSetting);
   const std::vector<Menu*> GetAllOptionMenus();
diff --git a/soh/soh/Enhancements/randomizer/3drando/shops.cpp b/soh/soh/Enhancements/randomizer/3drando/shops.cpp
index 8c47ac976..76839fced 100644
--- a/soh/soh/Enhancements/randomizer/3drando/shops.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/shops.cpp
@@ -1,8 +1,6 @@
-#include "item_location.hpp"
 #include "item_pool.hpp"
 #include "location_access.hpp"
 #include "random.hpp"
-#include "item.hpp"
 #include "shops.hpp"
 
 #include <math.h>
@@ -18,10 +16,11 @@ bool initTrickNames = false; //Indicates if trick ice trap names have been initi
 
 //Set vanilla shop item locations before potentially shuffling
 void PlaceVanillaShopItems() {
+   auto ctx = Rando::Context::GetInstance();
   //Loop to place vanilla items in each location
-  for (size_t i = 0; i < ShopLocationLists.size(); i++) {
-    for (size_t j = 0; j < ShopLocationLists[i].size(); j++) {
-      Location(ShopLocationLists[i][j])->PlaceVanillaItem();
+  for (size_t i = 0; i < Rando::StaticData::shopLocationLists.size(); i++) {
+    for (size_t j = 0; j < Rando::StaticData::shopLocationLists[i].size(); j++) {
+      ctx->GetItemLocation(Rando::StaticData::shopLocationLists[i][j])->PlaceVanillaItem();
     }
   }
 }
@@ -31,77 +30,77 @@ void PlaceVanillaShopItems() {
 //The first 32 items here will always be present in shops
 //Shopsanity 4 will only have the first 32, shopsanity 1 will have the first 56, etc.
 //Shopsanity random will have anywhere from the first 32 to the first 56, so the order of items after 32 is relevant
-std::vector<uint32_t> GetMinVanillaShopItems(int total_replaced) {
-    std::vector<uint32_t> minShopItems = {
-    BUY_DEKU_SHIELD,
-    BUY_HYLIAN_SHIELD,
-    BUY_GORON_TUNIC,
-    BUY_ZORA_TUNIC,
-    BUY_DEKU_NUT_5,
-    BUY_DEKU_NUT_5,
-    BUY_DEKU_NUT_10,
-    BUY_DEKU_STICK_1,
-    BUY_DEKU_STICK_1,
-    BUY_DEKU_SEEDS_30,
-    BUY_ARROWS_10,
-    BUY_ARROWS_10,
-    BUY_ARROWS_30,
-    BUY_ARROWS_50,
-    BUY_BOMBCHU_10,
-    BUY_BOMBCHU_10,
-    BUY_BOMBCHU_10,
-    BUY_BOMBCHU_20,
-    BUY_BOMBS_525,
-    BUY_BOMBS_535,
-    BUY_BOMBS_10,
-    BUY_BOMBS_20,
-    BUY_GREEN_POTION,
-    BUY_RED_POTION_30,
-    BUY_BLUE_FIRE,
-    BUY_FAIRYS_SPIRIT,
-    BUY_BOTTLE_BUG,
-    BUY_FISH,
+std::vector<RandomizerGet> GetMinVanillaShopItems(int total_replaced) {
+    std::vector<RandomizerGet> minShopItems = {
+    RG_BUY_DEKU_SHIELD,
+    RG_BUY_HYLIAN_SHIELD,
+    RG_BUY_GORON_TUNIC,
+    RG_BUY_ZORA_TUNIC,
+    RG_BUY_DEKU_NUT_5,
+    RG_BUY_DEKU_NUT_5,
+    RG_BUY_DEKU_NUT_10,
+    RG_BUY_DEKU_STICK_1,
+    RG_BUY_DEKU_STICK_1,
+    RG_BUY_DEKU_SEEDS_30,
+    RG_BUY_ARROWS_10,
+    RG_BUY_ARROWS_10,
+    RG_BUY_ARROWS_30,
+    RG_BUY_ARROWS_50,
+    RG_BUY_BOMBCHU_10,
+    RG_BUY_BOMBCHU_10,
+    RG_BUY_BOMBCHU_10,
+    RG_BUY_BOMBCHU_20,
+    RG_BUY_BOMBS_525,
+    RG_BUY_BOMBS_535,
+    RG_BUY_BOMBS_10,
+    RG_BUY_BOMBS_20,
+    RG_BUY_GREEN_POTION,
+    RG_BUY_RED_POTION_30,
+    RG_BUY_BLUE_FIRE,
+    RG_BUY_FAIRYS_SPIRIT,
+    RG_BUY_BOTTLE_BUG,
+    RG_BUY_FISH,
     //^First 28 items from OoTR
-    BUY_HYLIAN_SHIELD,
-    BUY_BOTTLE_BUG,
-    BUY_DEKU_STICK_1,
-    BUY_FAIRYS_SPIRIT,
+    RG_BUY_HYLIAN_SHIELD,
+    RG_BUY_BOTTLE_BUG,
+    RG_BUY_DEKU_STICK_1,
+    RG_BUY_FAIRYS_SPIRIT,
     //^First 32 items: Always guaranteed
-    BUY_BLUE_FIRE,
-    BUY_FISH,
-    BUY_BOMBCHU_10,
-    BUY_DEKU_NUT_5,
-    BUY_ARROWS_10,
-    BUY_BOMBCHU_20,
-    BUY_BOMBS_535,
-    BUY_RED_POTION_30,
+    RG_BUY_BLUE_FIRE,
+    RG_BUY_FISH,
+    RG_BUY_BOMBCHU_10,
+    RG_BUY_DEKU_NUT_5,
+    RG_BUY_ARROWS_10,
+    RG_BUY_BOMBCHU_20,
+    RG_BUY_BOMBS_535,
+    RG_BUY_RED_POTION_30,
     //^First 40 items: Exist on shopsanity 3 or less
-    BUY_BOMBS_30,
-    BUY_BOMBCHU_20,
-    BUY_DEKU_NUT_5,
-    BUY_ARROWS_10,
-    BUY_DEKU_NUT_5,
-    BUY_ARROWS_30,
-    BUY_RED_POTION_40,
-    BUY_FISH,
+    RG_BUY_BOMBS_30,
+    RG_BUY_BOMBCHU_20,
+    RG_BUY_DEKU_NUT_5,
+    RG_BUY_ARROWS_10,
+    RG_BUY_DEKU_NUT_5,
+    RG_BUY_ARROWS_30,
+    RG_BUY_RED_POTION_40,
+    RG_BUY_FISH,
     //^First 48 items: Exist on shopsanity 2 or less
-    BUY_BOMBCHU_20,
-    BUY_ARROWS_30,
-    BUY_RED_POTION_50,
-    BUY_ARROWS_30,
-    BUY_DEKU_NUT_5,
-    BUY_ARROWS_50,
-    BUY_ARROWS_50,
-    BUY_GREEN_POTION,
+    RG_BUY_BOMBCHU_20,
+    RG_BUY_ARROWS_30,
+    RG_BUY_RED_POTION_50,
+    RG_BUY_ARROWS_30,
+    RG_BUY_DEKU_NUT_5,
+    RG_BUY_ARROWS_50,
+    RG_BUY_ARROWS_50,
+    RG_BUY_GREEN_POTION,
     //^First 56 items: Exist on shopsanity 1 or less
-    BUY_POE,
-    BUY_POE,
-    BUY_HEART,
-    BUY_HEART,
-    BUY_HEART,
-    BUY_HEART,
-    BUY_HEART,
-    BUY_HEART,
+    RG_BUY_POE,
+    RG_BUY_POE,
+    RG_BUY_HEART,
+    RG_BUY_HEART,
+    RG_BUY_HEART,
+    RG_BUY_HEART,
+    RG_BUY_HEART,
+    RG_BUY_HEART,
     //^All 64 items: Only exist with shopsanity 0
   };
   //Now delete however many items there are to replace
@@ -865,9 +864,9 @@ Text GetIceTrapName(uint8_t id) {
 //Get shop index based on a given location
 static std::map<std::string_view, int> ShopNameToNum = {{"KF Shop", 0},   {"Kak Potion Shop", 1}, {"MK Bombchu Shop", 2}, {"MK Potion Shop", 3},
                                                         {"MK Bazaar", 4}, {"Kak Bazaar", 5},      {"ZD Shop", 6},         {"GC Shop", 7}};
-int GetShopIndex(uint32_t loc) {
+int GetShopIndex(RandomizerCheck loc) {
   //Kind of hacky, but extract the shop and item position from the name
-  const std::string& name(Location(loc)->GetName());
+  const std::string& name(Rando::StaticData::GetLocation(loc)->GetName());
   int split = name.find(" Item ");
   std::string_view shop(name.c_str(), split);
   int pos = std::stoi(name.substr(split+6, 1)) - 1;
diff --git a/soh/soh/Enhancements/randomizer/3drando/shops.hpp b/soh/soh/Enhancements/randomizer/3drando/shops.hpp
index 4f9f8a957..33cf57ff4 100644
--- a/soh/soh/Enhancements/randomizer/3drando/shops.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/shops.hpp
@@ -1,6 +1,5 @@
 #pragma once
-#include "item.hpp"
-#include "item_location.hpp"
+#include "../context.h"
 
 #include <vector>
 #include <array>
@@ -12,12 +11,12 @@ struct ItemAndPrice {
 };
 
 extern void PlaceVanillaShopItems();
-extern std::vector<uint32_t> GetMinVanillaShopItems(int total_replaced);
+extern std::vector<RandomizerGet> GetMinVanillaShopItems(int total_replaced);
 extern int GetRandomShopPrice();
 extern int16_t GetRandomScrubPrice();
 extern int GetShopsanityReplaceAmount();
 extern Text GetIceTrapName(uint8_t id);
-extern int GetShopIndex(uint32_t loc);
+extern int GetShopIndex(RandomizerCheck loc);
 extern int TransformShopIndex(int index);
 
 extern std::vector<ItemAndPrice> NonShopItems;
diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
index 2884dd6e7..c7f443bd8 100644
--- a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
@@ -1,8 +1,8 @@
 #include "spoiler_log.hpp"
 
 #include "dungeon.hpp"
-#include "item_list.hpp"
-#include "item_location.hpp"
+#include "../static_data.h"
+#include "../context.h"
 #include "entrance.hpp"
 #include "random.hpp"
 #include "settings.hpp"
@@ -30,12 +30,12 @@
 #include <filesystem>
 #include <variables.h>
 
-#include <libultraship/libultraship.h>
+#include <Context.h>
 
 using json = nlohmann::ordered_json;
 
 json jsonData;
-std::map<HintKey, ItemLocation*> hintedLocations;
+std::map<RandomizerHintTextKey, Rando::ItemLocation*> hintedLocations;
 
 extern std::unordered_map<HintType, std::string> hintTypeNames;
 extern std::array<std::string, 17> hintCategoryNames;
@@ -79,6 +79,7 @@ static auto GetPlacementLogPath() {
 }
 
 void WriteIngameSpoilerLog() {
+    auto ctx = Rando::Context::GetInstance();
     uint16_t spoilerItemIndex = 0;
     uint32_t spoilerStringOffset = 0;
     uint16_t spoilerSphereItemoffset = 0;
@@ -91,28 +92,29 @@ void WriteIngameSpoilerLog() {
     // Some item names, like gold skulltula tokens, can appear many times in a playthrough
     std::unordered_map<uint32_t, uint16_t>
         itemLocationsMap; // Map of LocationKey to an index into spoiler data item locations
-    itemLocationsMap.reserve(allLocations.size());
+    itemLocationsMap.reserve(ctx->allLocations.size());
     std::unordered_map<std::string, uint16_t>
         stringOffsetMap; // Map of strings to their offset into spoiler string data array
-    stringOffsetMap.reserve(allLocations.size() * 2);
+    stringOffsetMap.reserve(ctx->allLocations.size() * 2);
 
     // Sort all locations by their group, so the in-game log can show a group of items by simply starting/ending at
     // certain indices
-    std::stable_sort(allLocations.begin(), allLocations.end(), [](const uint32_t& a, const uint32_t& b) {
-        auto groupA = Location(a)->GetCollectionCheckGroup();
-        auto groupB = Location(b)->GetCollectionCheckGroup();
+    std::stable_sort(ctx->allLocations.begin(), ctx->allLocations.end(), [](const RandomizerCheck& a, const RandomizerCheck& b) {
+        auto groupA = Rando::StaticData::GetLocation(a)->GetCollectionCheckGroup();
+        auto groupB = Rando::StaticData::GetLocation(b)->GetCollectionCheckGroup();
         return groupA < groupB;
     });
 
-    for (const uint32_t key : allLocations) {
-        auto loc = Location(key);
+    for (const RandomizerCheck key : ctx->allLocations) {
+        auto loc = Rando::StaticData::GetLocation(key);
+        auto itemLocation = ctx->GetItemLocation(key);
 
         // Hide excluded locations from ingame tracker
-        if (loc->IsExcluded()) {
-            continue;
-        }
+        // if (loc->IsExcluded()) {
+        //     continue;
+        // }
         // Cows
-        else if (!Settings::ShuffleCows && loc->IsCategory(Category::cCow)) {
+        if (!Settings::ShuffleCows && loc->IsCategory(Category::cCow)) {
             continue;
         }
         // Merchants
@@ -130,9 +132,9 @@ void WriteIngameSpoilerLog() {
         }
         // Gerudo Fortress
         else if ((Settings::GerudoFortress.Is(GERUDOFORTRESS_OPEN) &&
-                  (loc->IsCategory(Category::cVanillaGFSmallKey) || loc->GetHintKey() == GF_GERUDO_MEMBERSHIP_CARD)) ||
+                  (loc->IsCategory(Category::cVanillaGFSmallKey) || loc->GetHintKey() == RHT_GF_GERUDO_MEMBERSHIP_CARD)) ||
                  (Settings::GerudoFortress.Is(GERUDOFORTRESS_FAST) && loc->IsCategory(Category::cVanillaGFSmallKey) &&
-                  loc->GetHintKey() != GF_NORTH_F1_CARPENTER)) {
+                  loc->GetHintKey() != RHT_GF_NORTH_F1_CARPENTER)) {
             continue;
         }
 
@@ -151,8 +153,8 @@ void WriteIngameSpoilerLog() {
             }
         }
         // PURPLE TODO: LOCALIZATION
-        auto locItem = loc->GetPlacedItemName().GetEnglish();
-        if (loc->GetPlacedItemKey() == ICE_TRAP && loc->IsCategory(Category::cShop)) {
+        auto locItem = itemLocation->GetPlacedItemName().GetEnglish();
+        if (itemLocation->GetPlacedRandomizerGet() == RG_ICE_TRAP && loc->IsCategory(Category::cShop)) {
             locItem = NonShopItems[TransformShopIndex(GetShopIndex(key))].Name.GetEnglish();
         }
         if (stringOffsetMap.find(locItem) == stringOffsetMap.end()) {
@@ -175,10 +177,10 @@ void WriteIngameSpoilerLog() {
         spoilerData.ItemLocations[spoilerItemIndex].LocationFlag = loc->GetCollectionCheck().flag;
 
         // Collect Type and Reveal Type
-        if (key == GANON) {
+        if (key == RC_GANON) {
             spoilerData.ItemLocations[spoilerItemIndex].CollectType = COLLECTTYPE_NEVER;
             spoilerData.ItemLocations[spoilerItemIndex].RevealType = REVEALTYPE_ALWAYS;
-        } else if (key == MARKET_BOMBCHU_BOWLING_BOMBCHUS) {
+        } else if (key == RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS) {
             spoilerData.ItemLocations[spoilerItemIndex].CollectType = COLLECTTYPE_REPEATABLE;
             spoilerData.ItemLocations[spoilerItemIndex].RevealType = REVEALTYPE_ALWAYS;
         }
@@ -189,9 +191,9 @@ void WriteIngameSpoilerLog() {
             } else {
                 spoilerData.ItemLocations[spoilerItemIndex].RevealType = REVEALTYPE_SCENE;
             }
-            if (loc->GetPlacedItem().GetItemType() == ITEMTYPE_REFILL ||
-                loc->GetPlacedItem().GetItemType() == ITEMTYPE_SHOP ||
-                loc->GetPlacedItem().GetHintKey() == PROGRESSIVE_BOMBCHUS) {
+            if (itemLocation->GetPlacedItem().GetItemType() == ITEMTYPE_REFILL ||
+                itemLocation->GetPlacedItem().GetItemType() == ITEMTYPE_SHOP ||
+                itemLocation->GetPlacedItem().GetHintKey() == RHT_PROGRESSIVE_BOMBCHUS) {
                 spoilerData.ItemLocations[spoilerItemIndex].CollectType = COLLECTTYPE_REPEATABLE;
             }
         }
@@ -228,19 +230,19 @@ void WriteIngameSpoilerLog() {
         bool playthroughItemNotFound = false;
         // Write playthrough data to in-game spoiler log
         if (!spoilerOutOfSpace) {
-            for (uint32_t i = 0; i < playthroughLocations.size(); i++) {
+            for (uint32_t i = 0; i < ctx->playthroughLocations.size(); i++) {
                 if (i >= SPOILER_SPHERES_MAX) {
                     spoilerOutOfSpace = true;
                     break;
                 }
                 spoilerData.Spheres[i].ItemLocationsOffset = spoilerSphereItemoffset;
-                for (uint32_t loc = 0; loc < playthroughLocations[i].size(); ++loc) {
+                for (uint32_t loc = 0; loc < ctx->playthroughLocations[i].size(); ++loc) {
                     if (spoilerSphereItemoffset >= SPOILER_ITEMS_MAX) {
                         spoilerOutOfSpace = true;
                         break;
                     }
 
-                    const auto foundItemLoc = itemLocationsMap.find(playthroughLocations[i][loc]);
+                    const auto foundItemLoc = itemLocationsMap.find(ctx->playthroughLocations[i][loc]);
                     if (foundItemLoc != itemLocationsMap.end()) {
                         spoilerData.SphereItemLocations[spoilerSphereItemoffset++] = foundItemLoc->second;
                     } else {
@@ -252,24 +254,25 @@ void WriteIngameSpoilerLog() {
             }
         }
         if (spoilerOutOfSpace || playthroughItemNotFound) {
-            printf("%sError!%s ", YELLOW, WHITE);
+            printf("Error! ");
         }
     }
 }
 
 // Writes the location to the specified node.
 static void WriteLocation(
-    std::string sphere, const uint32_t locationKey, const bool withPadding = false) {
-  ItemLocation* location = Location(locationKey);
+    std::string sphere, const RandomizerCheck locationKey, const bool withPadding = false) {
+  Rando::Location* location = Rando::StaticData::GetLocation(locationKey);
+  Rando::ItemLocation* itemLocation = Rando::Context::GetInstance()->GetItemLocation(locationKey);
 
   // auto node = parentNode->InsertNewChildElement("location");
   switch (gSaveContext.language) {
         case LANGUAGE_ENG:
         default:
-            jsonData["playthrough"][sphere][location->GetName()] = location->GetPlacedItemName().GetEnglish();
+            jsonData["playthrough"][sphere][location->GetName()] = itemLocation->GetPlacedItemName().GetEnglish();
             break;
         case LANGUAGE_FRA:
-            jsonData["playthrough"][sphere][location->GetName()] = location->GetPlacedItemName().GetFrench();
+            jsonData["playthrough"][sphere][location->GetName()] = itemLocation->GetPlacedItemName().GetFrench();
             break;
     }
   // node->SetAttribute("name", location->GetName().c_str());
@@ -412,7 +415,7 @@ static void WriteSettings(const bool printAll = false) {
   // spoilerLog.RootElement()->InsertEndChild(parentNode);
 
   //     for (const uint32_t key : allLocations) {
-  //       ItemLocation* location = Location(key);
+  //       ItemLocation* location = GetLocation(key);
   //       settingsJsonData["locations"][location->GetName()] = location->GetPlacedItemName().english;
   //   }
 }
@@ -570,13 +573,14 @@ static void WriteRequiredTrials() {
 // Writes the intended playthrough to the spoiler log, separated into spheres.
 static void WritePlaythrough() {
   // auto playthroughNode = spoilerLog.NewElement("playthrough");
+  auto ctx = Rando::Context::GetInstance();
 
-  for (uint32_t i = 0; i < playthroughLocations.size(); ++i) {
+  for (uint32_t i = 0; i < ctx->playthroughLocations.size(); ++i) {
     auto sphereNum = std::to_string(i);
     std::string sphereString =  "sphere ";
     if (i < 10) sphereString += "0";
     sphereString += sphereNum;
-    for (const uint32_t key : playthroughLocations[i]) {
+    for (const RandomizerCheck key : ctx->playthroughLocations[i]) {
       WriteLocation(sphereString, key, true);
     }
   }
@@ -601,7 +605,7 @@ static void WriteShuffledEntrances() {
 static void WriteWayOfTheHeroLocation(tinyxml2::XMLDocument& spoilerLog) {
     auto parentNode = spoilerLog.NewElement("way-of-the-hero-locations");
 
-    for (const uint32_t key : wothLocations) {
+    for (const RandomizerCheck key : Rando::Context::GetInstance()->wothLocations) {
         // WriteLocation(parentNode, key, true);
     }
 
@@ -660,8 +664,11 @@ std::string AutoFormatHintTextString(std::string unformattedHintTextString) {
   return textStr;
 }
 
-ItemLocation* GetItemLocation(uint32_t item) {
-    return Location(FilterFromPool(allLocations, [item](const uint32_t loc){return Location(loc)->GetPlaceduint32_t() == item;})[0]);
+Rando::ItemLocation* GetItemLocation(RandomizerGet item) {
+    auto ctx = Rando::Context::GetInstance();
+    return ctx->GetItemLocation(FilterFromPool(ctx->allLocations, [item, ctx](const RandomizerCheck loc) {
+        return ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == item;
+    })[0]);
 }
 
 // Writes the hints to the spoiler log, if they are enabled.
@@ -709,30 +716,37 @@ static void WriteHints(int language) {
             break;
     }
 
-    ItemLocation* emeraldLoc = GetItemLocation(KOKIRI_EMERALD);
-    ItemLocation* rubyLoc = GetItemLocation(GORON_RUBY);
-    ItemLocation* sapphireLoc = GetItemLocation(ZORA_SAPPHIRE);
+    Rando::ItemLocation* emeraldLoc = GetItemLocation(RG_KOKIRI_EMERALD);
+    Rando::ItemLocation* rubyLoc = GetItemLocation(RG_GORON_RUBY);
+    Rando::ItemLocation* sapphireLoc = GetItemLocation(RG_ZORA_SAPPHIRE);
     std::string emeraldArea;
     std::string erubyArea;
     std::string sapphireArea;
 
-    jsonData["childAltar"]["rewards"]["emeraldLoc"] = emeraldLoc->GetName();
-    jsonData["childAltar"]["rewards"]["rubyLoc"] = rubyLoc->GetName();
-    jsonData["childAltar"]["rewards"]["sapphireLoc"] = sapphireLoc->GetName();
+    jsonData["childAltar"]["rewards"]["emeraldLoc"] = Rando::StaticData::GetLocation(emeraldLoc->GetRandomizerCheck())->GetName();
+    jsonData["childAltar"]["rewards"]["rubyLoc"] = Rando::StaticData::GetLocation(rubyLoc->GetRandomizerCheck())->GetName();
+    jsonData["childAltar"]["rewards"]["sapphireLoc"] =
+        Rando::StaticData::GetLocation(sapphireLoc->GetRandomizerCheck())->GetName();
 
-    ItemLocation* forestMedallionLoc = GetItemLocation(FOREST_MEDALLION);
-    ItemLocation* fireMedallionLoc = GetItemLocation(FIRE_MEDALLION);
-    ItemLocation* waterMedallionLoc = GetItemLocation(WATER_MEDALLION);
-    ItemLocation* shadowMedallionLoc = GetItemLocation(SHADOW_MEDALLION);
-    ItemLocation* spiritMedallionLoc = GetItemLocation(SPIRIT_MEDALLION);
-    ItemLocation* lightMedallionLoc = GetItemLocation(LIGHT_MEDALLION);
+    Rando::ItemLocation* forestMedallionLoc = GetItemLocation(RG_FOREST_MEDALLION);
+    Rando::ItemLocation* fireMedallionLoc = GetItemLocation(RG_FIRE_MEDALLION);
+    Rando::ItemLocation* waterMedallionLoc = GetItemLocation(RG_WATER_MEDALLION);
+    Rando::ItemLocation* shadowMedallionLoc = GetItemLocation(RG_SHADOW_MEDALLION);
+    Rando::ItemLocation* spiritMedallionLoc = GetItemLocation(RG_SPIRIT_MEDALLION);
+    Rando::ItemLocation* lightMedallionLoc = GetItemLocation(RG_LIGHT_MEDALLION);
 
-    jsonData["adultAltar"]["rewards"]["forestMedallionLoc"] = forestMedallionLoc->GetName();
-    jsonData["adultAltar"]["rewards"]["fireMedallionLoc"] = fireMedallionLoc->GetName();
-    jsonData["adultAltar"]["rewards"]["waterMedallionLoc"] = waterMedallionLoc->GetName();
-    jsonData["adultAltar"]["rewards"]["shadowMedallionLoc"] = shadowMedallionLoc->GetName();
-    jsonData["adultAltar"]["rewards"]["spiritMedallionLoc"] = spiritMedallionLoc->GetName();
-    jsonData["adultAltar"]["rewards"]["lightMedallionLoc"] = lightMedallionLoc->GetName();
+    jsonData["adultAltar"]["rewards"]["forestMedallionLoc"] =
+        Rando::StaticData::GetLocation(forestMedallionLoc->GetRandomizerCheck())->GetName();
+    jsonData["adultAltar"]["rewards"]["fireMedallionLoc"] =
+        Rando::StaticData::GetLocation(fireMedallionLoc->GetRandomizerCheck())->GetName();
+    jsonData["adultAltar"]["rewards"]["waterMedallionLoc"] =
+        Rando::StaticData::GetLocation(waterMedallionLoc->GetRandomizerCheck())->GetName();
+    jsonData["adultAltar"]["rewards"]["shadowMedallionLoc"] =
+        Rando::StaticData::GetLocation(shadowMedallionLoc->GetRandomizerCheck())->GetName();
+    jsonData["adultAltar"]["rewards"]["spiritMedallionLoc"] =
+        Rando::StaticData::GetLocation(spiritMedallionLoc->GetRandomizerCheck())->GetName();
+    jsonData["adultAltar"]["rewards"]["lightMedallionLoc"] =
+        Rando::StaticData::GetLocation(lightMedallionLoc->GetRandomizerCheck())->GetName();
 
     std::string ganonText = AutoFormatHintTextString(unformattedGanonText);
     std::string ganonHintText = AutoFormatHintTextString(unformattedGanonHintText);
@@ -747,7 +761,8 @@ static void WriteHints(int language) {
     jsonData["dampeText"] = dampesText;
     jsonData["dampeHintLoc"] = GetDampeHintLoc();
     jsonData["gregText"] = gregText;
-    jsonData["gregLoc"] = GetItemLocation(GREG_RUPEE)->GetName();
+    jsonData["gregLoc"] =
+        Rando::StaticData::GetLocation(GetItemLocation(RG_GREG_RUPEE)->GetRandomizerCheck())->GetName();
     jsonData["sheikText"] = sheikText;
     jsonData["sariaText"] = sariaText;
     jsonData["sariaHintLoc"] = GetSariaHintLoc();
@@ -755,41 +770,43 @@ static void WriteHints(int language) {
     if (Settings::GossipStoneHints.Is(HINTS_NO_HINTS)) {
         return;
     }
-
-    for (const uint32_t key : gossipStoneLocations) {
-        ItemLocation* location = Location(key);
-        ItemLocation* hintedLocation = Location(location->GetHintedLocation());
+    auto ctx = Rando::Context::GetInstance();
+    for (const RandomizerCheck key : Rando::StaticData::gossipStoneLocations) {
+        Rando::Hint* hint = ctx->GetHint((RandomizerHintKey)(key - RC_DMC_GOSSIP_STONE + 1));
+        Rando::ItemLocation* hintedLocation = ctx->GetItemLocation(hint->GetHintedLocation());
         std::string unformattedHintTextString;
         switch (language) {
             case 0:
             default:
-                unformattedHintTextString = location->GetPlacedItemName().GetEnglish();
+                unformattedHintTextString = hint->GetText().GetEnglish();
                 break;
             case 2:
-                unformattedHintTextString = location->GetPlacedItemName().GetFrench();
+                unformattedHintTextString = hint->GetText().GetFrench();
                 break;
         }
 
-        HintType hintType = location->GetHintType();
+        HintType hintType = hint->GetHintType();
 
         std::string textStr = AutoFormatHintTextString(unformattedHintTextString);
-        jsonData["hints"][location->GetName()]["hint"] = textStr;
-        jsonData["hints"][location->GetName()]["type"] = hintTypeNames.find(hintType)->second;
+        jsonData["hints"][Rando::StaticData::GetLocation(key)->GetName()]["hint"] = textStr;
+        jsonData["hints"][Rando::StaticData::GetLocation(key)->GetName()]["type"] = hintTypeNames.find(hintType)->second;
         if (hintType == HINT_TYPE_ITEM || hintType == HINT_TYPE_NAMED_ITEM || hintType == HINT_TYPE_WOTH) {
-            jsonData["hints"][location->GetName()]["item"] = hintedLocation->GetPlacedItemName().GetEnglish();
+            jsonData["hints"][Rando::StaticData::GetLocation(key)->GetName()]["item"] = hintedLocation->GetPlacedItemName().GetEnglish();
             if (hintType != HINT_TYPE_NAMED_ITEM || hintType == HINT_TYPE_WOTH) {
-                jsonData["hints"][location->GetName()]["location"] = hintedLocation->GetName();
+                jsonData["hints"][Rando::StaticData::GetLocation(key)->GetName()]["location"] =
+                    Rando::StaticData::GetLocation(hintedLocation->GetRandomizerCheck())->GetName();
             }
         }
         if (hintType != HINT_TYPE_TRIAL && hintType != HINT_TYPE_JUNK) {
-            jsonData["hints"][location->GetName()]["area"] = location->GetHintedRegion();
+            jsonData["hints"][Rando::StaticData::GetLocation(key)->GetName()]["area"] = hint->GetHintedRegion();
         }
     }
 }
 
 static void WriteAllLocations(int language) {
-    for (const uint32_t key : allLocations) {
-        ItemLocation* location = Location(key);
+    auto ctx = Rando::Context::GetInstance();
+    for (const RandomizerCheck key : ctx->allLocations) {
+        Rando::ItemLocation* location = ctx->GetItemLocation(key);
         std::string placedItemName;
 
         switch (language) {
@@ -806,52 +823,43 @@ static void WriteAllLocations(int language) {
         // just add the name of the item and move on
         if (!location->HasScrubsanityPrice() &&
             !location->HasShopsanityPrice() &&
-            location->GetPlacedItemKey() != ICE_TRAP) {
+            location->GetPlacedRandomizerGet() != RG_ICE_TRAP) {
             
-            jsonData["locations"][location->GetName()] = placedItemName;
+            jsonData["locations"][Rando::StaticData::GetLocation(location->GetRandomizerCheck())->GetName()] = placedItemName;
             continue;
         }
 
         // We're dealing with a complex item, build out the json object for it
-        jsonData["locations"][location->GetName()]["item"] = placedItemName;
+        jsonData["locations"][Rando::StaticData::GetLocation(location->GetRandomizerCheck())->GetName()]["item"] = placedItemName;
 
         if (location->HasScrubsanityPrice() || location->HasShopsanityPrice()) {
-          jsonData["locations"][location->GetName()]["price"] = location->GetPrice();
+            jsonData["locations"][Rando::StaticData::GetLocation(location->GetRandomizerCheck())->GetName()]["price"] =
+                location->GetPrice();
         }
         if (location->IsHintedAt()) {
-          hintedLocations.emplace(location->GetHintKey(), location);
+          hintedLocations.emplace(Rando::StaticData::GetLocation(key)->GetHintKey(), location);
         }
 
-        if (location->GetPlacedItemKey() == ICE_TRAP) {
+        if (location->GetPlacedRandomizerGet() == RG_ICE_TRAP) {
           switch (language) {
               case 0:
               default:
-                  jsonData["locations"][location->GetName()]["model"] =
-                      ItemFromGIID(iceTrapModels[location->GetRandomizerCheck()]).GetName().english;
-                  jsonData["locations"][location->GetName()]["trickName"] = 
-                      GetIceTrapName(iceTrapModels[location->GetRandomizerCheck()]).english;
+                  jsonData["locations"][Rando::StaticData::GetLocation(location->GetRandomizerCheck())->GetName()]["model"] =
+                      Rando::StaticData::ItemFromGIID(ctx->iceTrapModels[location->GetRandomizerCheck()]).GetName().english;
+                  jsonData["locations"][Rando::StaticData::GetLocation(location->GetRandomizerCheck())->GetName()]["trickName"] = 
+                      GetIceTrapName(ctx->iceTrapModels[location->GetRandomizerCheck()]).english;
                   break;
               case 2:
-                  jsonData["locations"][location->GetName()]["model"] =
-                      ItemFromGIID(iceTrapModels[location->GetRandomizerCheck()]).GetName().french;
-                  jsonData["locations"][location->GetName()]["trickName"] =
-                      GetIceTrapName(iceTrapModels[location->GetRandomizerCheck()]).french;
+                  jsonData["locations"][Rando::StaticData::GetLocation(location->GetRandomizerCheck())->GetName()]["model"] =
+                      Rando::StaticData::ItemFromGIID(ctx->iceTrapModels[location->GetRandomizerCheck()]).GetName().french;
+                  jsonData["locations"][Rando::StaticData::GetLocation(location->GetRandomizerCheck())->GetName()]["trickName"] =
+                      GetIceTrapName(ctx->iceTrapModels[location->GetRandomizerCheck()]).french;
                   break;
           }
       }
     }
 }
 
-//static void WriteHintData(int language) {
-//    for (auto [hintKey, item_location] : hintedLocations) {
-//        ItemLocation *hint_location = Location(hintKey);
-//        jsonData["hints"][hint_location->GetName()] = { { "text", hint_location->GetPlacedItemName().GetEnglish() },
-//                                                        { "item", item_location->GetPlacedItemName().GetEnglish() },
-//                                                        { "itemLocation", item_location->GetName() },
-//                                                        { "locationArea", item_location->GetParentRegionKey() } };
-//    }
-//}
-
 const char* SpoilerLog_Write(int language) {
     auto spoilerLog = tinyxml2::XMLDocument(false);
     spoilerLog.InsertEndChild(spoilerLog.NewDeclaration());
@@ -884,14 +892,14 @@ const char* SpoilerLog_Write(int language) {
     WritePlaythrough();
     //WriteWayOfTheHeroLocation(spoilerLog);
 
-    playthroughLocations.clear();
-    playthroughBeatable = false;
-    wothLocations.clear();
+    auto ctx = Rando::Context::GetInstance();
+    ctx->playthroughLocations.clear();
+    ctx->playthroughBeatable = false;
+    ctx->wothLocations.clear();
 
     WriteHints(language);
     WriteShuffledEntrances();
     WriteAllLocations(language);
-    //WriteHintData(language);
 
     if (!std::filesystem::exists(LUS::Context::GetPathRelativeToAppDirectory("Randomizer"))) {
         std::filesystem::create_directory(LUS::Context::GetPathRelativeToAppDirectory("Randomizer"));
@@ -914,6 +922,10 @@ const char* SpoilerLog_Write(int language) {
     jsonFile << std::setw(4) << jsonString << std::endl;
     jsonFile.close();
 
+    // Note: probably shouldn't return this without making sure this string is stored somewhere, but
+    // this return value is currently only used in playthrough.cpp as a true/false. Even if the pointer
+    // is no longer valid it would still not be nullptr if the spoilerfile was written, so it works but
+    // should probably be changed for correctness later on.
     return fileName.c_str();
 }
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.hpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.hpp
index 03bc2077e..50d02a839 100644
--- a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.hpp
@@ -29,7 +29,7 @@ typedef enum {
     SPOILER_CHK_RANDOMIZER_INF,
 } SpoilerCollectionCheckType;
 
-// Location groups for checks, used to group the checks by logical location
+// GetLocation groups for checks, used to group the checks by logical location
 typedef enum {
     GROUP_NO_GROUP,
     GROUP_KOKIRI_FOREST,              // 0x55, 0x28
diff --git a/soh/soh/Enhancements/randomizer/3drando/starting_inventory.cpp b/soh/soh/Enhancements/randomizer/3drando/starting_inventory.cpp
index 77b11203e..20698e8e9 100644
--- a/soh/soh/Enhancements/randomizer/3drando/starting_inventory.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/starting_inventory.cpp
@@ -1,16 +1,16 @@
 #include "starting_inventory.hpp"
 
 #include "dungeon.hpp"
-#include "item_list.hpp"
 #include "settings.hpp"
+#include "soh/Enhancements/randomizer/static_data.h"
 
 using namespace Settings;
 using namespace Dungeon;
 
-std::vector<uint32_t> StartingInventory;
+std::vector<RandomizerGet> StartingInventory;
 uint8_t AdditionalHeartContainers;
 
-static void AddItemToInventory(uint32_t item, size_t count = 1) {
+static void AddItemToInventory(RandomizerGet item, size_t count = 1) {
   StartingInventory.insert(StartingInventory.end(), count, item);
 }
 
@@ -19,11 +19,11 @@ void GenerateStartingInventory() {
 
   if (MapsAndCompasses.Is(MAPSANDCOMPASSES_START_WITH)) {
     for (auto* dungeon : dungeonList) {
-      if (dungeon->GetMap() != NONE) {
+      if (dungeon->GetMap() != RG_NONE) {
         AddItemToInventory(dungeon->GetMap());
       }
 
-      if (dungeon->GetCompass() != NONE) {
+      if (dungeon->GetCompass() != RG_NONE) {
         AddItemToInventory(dungeon->GetCompass());
       }
     }
@@ -42,123 +42,123 @@ void GenerateStartingInventory() {
     // We can resolve this by starting with some extra keys
     // - OoT Randomizer
     if (SpiritTemple.IsMQ()) {
-      AddItemToInventory(SPIRIT_TEMPLE_SMALL_KEY, 3);
+      AddItemToInventory(RG_SPIRIT_TEMPLE_SMALL_KEY, 3);
     }
   }
 
   if (BossKeysanity.Is(BOSSKEYSANITY_START_WITH)) {
-    AddItemToInventory(FOREST_TEMPLE_BOSS_KEY);
-    AddItemToInventory(FIRE_TEMPLE_BOSS_KEY);
-    AddItemToInventory(WATER_TEMPLE_BOSS_KEY);
-    AddItemToInventory(SPIRIT_TEMPLE_BOSS_KEY);
-    AddItemToInventory(SHADOW_TEMPLE_BOSS_KEY);
+    AddItemToInventory(RG_FOREST_TEMPLE_BOSS_KEY);
+    AddItemToInventory(RG_FIRE_TEMPLE_BOSS_KEY);
+    AddItemToInventory(RG_WATER_TEMPLE_BOSS_KEY);
+    AddItemToInventory(RG_SPIRIT_TEMPLE_BOSS_KEY);
+    AddItemToInventory(RG_SHADOW_TEMPLE_BOSS_KEY);
   }
 
   // Add Ganon's Boss key with Triforce Hunt so the game thinks it's obtainable from the start.
   // During save init, the boss key isn't actually given and it's instead given when completing the triforce.
   if (GanonsBossKey.Is(GANONSBOSSKEY_START_WITH) || GanonsBossKey.Is(GANONSBOSSKEY_TRIFORCE_HUNT)) {
-    AddItemToInventory(GANONS_CASTLE_BOSS_KEY);
+    AddItemToInventory(RG_GANONS_CASTLE_BOSS_KEY);
   }
 
   if (GerudoFortress.Is(GERUDOFORTRESS_OPEN) && !ShuffleGerudoToken) {
-    AddItemToInventory(GERUDO_MEMBERSHIP_CARD);
+    AddItemToInventory(RG_GERUDO_MEMBERSHIP_CARD);
   }
 
   //Starting Inventory Menu
   //Values are associated so that the count of items matches the index of
   //the option selected. If None is selected, the value will be zero and
   //zero of the item will be added to the starting inventory.
-  AddItemToInventory(PROGRESSIVE_STICK_UPGRADE, StartingStickCapacity.Value<uint8_t>());
-  AddItemToInventory(PROGRESSIVE_NUT_UPGRADE,   StartingNutCapacity.Value<uint8_t>());
-  AddItemToInventory(PROGRESSIVE_BOMB_BAG,      StartingBombBag.Value<uint8_t>());
-  AddItemToInventory((BombchusInLogic ? PROGRESSIVE_BOMBCHUS : BOMBCHU_20), StartingBombchus.Value<uint8_t>());
-  AddItemToInventory(PROGRESSIVE_BOW,           StartingBow.Value<uint8_t>());
-  AddItemToInventory(FIRE_ARROWS,               StartingFireArrows.Value<uint8_t>());
-  AddItemToInventory(ICE_ARROWS,                StartingIceArrows.Value<uint8_t>());
-  AddItemToInventory(LIGHT_ARROWS,              StartingLightArrows.Value<uint8_t>());
-  AddItemToInventory(DINS_FIRE,                 StartingDinsFire.Value<uint8_t>());
-  AddItemToInventory(FARORES_WIND,              StartingFaroresWind.Value<uint8_t>());
-  AddItemToInventory(NAYRUS_LOVE,               StartingNayrusLove.Value<uint8_t>());
-  AddItemToInventory(PROGRESSIVE_SLINGSHOT,     StartingSlingshot.Value<uint8_t>());
-  AddItemToInventory(BOOMERANG,                 StartingBoomerang.Value<uint8_t>());
-  AddItemToInventory(LENS_OF_TRUTH,             StartingLensOfTruth.Value<uint8_t>());
-  AddItemToInventory(MAGIC_BEAN_PACK,           StartingMagicBean.Value<uint8_t>());
-  AddItemToInventory(MEGATON_HAMMER,            StartingMegatonHammer.Value<uint8_t>());
-  AddItemToInventory(PROGRESSIVE_HOOKSHOT,      StartingHookshot.Value<uint8_t>());
-  AddItemToInventory(IRON_BOOTS,                StartingIronBoots.Value<uint8_t>());
-  AddItemToInventory(HOVER_BOOTS,               StartingHoverBoots.Value<uint8_t>());
+  AddItemToInventory(RG_PROGRESSIVE_STICK_UPGRADE, StartingStickCapacity.Value<uint8_t>());
+  AddItemToInventory(RG_PROGRESSIVE_NUT_UPGRADE, StartingNutCapacity.Value<uint8_t>());
+  AddItemToInventory(RG_PROGRESSIVE_BOMB_BAG, StartingBombBag.Value<uint8_t>());
+  AddItemToInventory((BombchusInLogic ? RG_PROGRESSIVE_BOMBCHUS : RG_BOMBCHU_20), StartingBombchus.Value<uint8_t>());
+  AddItemToInventory(RG_PROGRESSIVE_BOW, StartingBow.Value<uint8_t>());
+  AddItemToInventory(RG_FIRE_ARROWS, StartingFireArrows.Value<uint8_t>());
+  AddItemToInventory(RG_ICE_ARROWS, StartingIceArrows.Value<uint8_t>());
+  AddItemToInventory(RG_LIGHT_ARROWS, StartingLightArrows.Value<uint8_t>());
+  AddItemToInventory(RG_DINS_FIRE, StartingDinsFire.Value<uint8_t>());
+  AddItemToInventory(RG_FARORES_WIND, StartingFaroresWind.Value<uint8_t>());
+  AddItemToInventory(RG_NAYRUS_LOVE, StartingNayrusLove.Value<uint8_t>());
+  AddItemToInventory(RG_PROGRESSIVE_SLINGSHOT, StartingSlingshot.Value<uint8_t>());
+  AddItemToInventory(RG_BOOMERANG, StartingBoomerang.Value<uint8_t>());
+  AddItemToInventory(RG_LENS_OF_TRUTH, StartingLensOfTruth.Value<uint8_t>());
+  AddItemToInventory(RG_MAGIC_BEAN_PACK, StartingMagicBean.Value<uint8_t>());
+  AddItemToInventory(RG_MEGATON_HAMMER, StartingMegatonHammer.Value<uint8_t>());
+  AddItemToInventory(RG_PROGRESSIVE_HOOKSHOT, StartingHookshot.Value<uint8_t>());
+  AddItemToInventory(RG_IRON_BOOTS, StartingIronBoots.Value<uint8_t>());
+  AddItemToInventory(RG_HOVER_BOOTS, StartingHoverBoots.Value<uint8_t>());
   //For starting bottles, we need to check if they are a big poe and add that if so
   // since a big poe bottle is not logically equivalent to an empty bottle.
   if (StartingBottle1.Value<uint8_t>() == STARTINGBOTTLE_BIG_POE) {
-    AddItemToInventory(BOTTLE_WITH_BIG_POE, 1);
+    AddItemToInventory(RG_BOTTLE_WITH_BIG_POE, 1);
   } else if (StartingBottle1.Value<uint8_t>()) {
-    AddItemToInventory(EMPTY_BOTTLE, 1);
+    AddItemToInventory(RG_EMPTY_BOTTLE, 1);
   }
   if (StartingBottle2.Value<uint8_t>() == STARTINGBOTTLE_BIG_POE) {
-    AddItemToInventory(BOTTLE_WITH_BIG_POE, 1);
+    AddItemToInventory(RG_BOTTLE_WITH_BIG_POE, 1);
   } else if (StartingBottle2.Value<uint8_t>()) {
-    AddItemToInventory(EMPTY_BOTTLE, 1);
+    AddItemToInventory(RG_EMPTY_BOTTLE, 1);
   }
   if (StartingBottle3.Value<uint8_t>() == STARTINGBOTTLE_BIG_POE) {
-    AddItemToInventory(BOTTLE_WITH_BIG_POE, 1);
+    AddItemToInventory(RG_BOTTLE_WITH_BIG_POE, 1);
   } else if (StartingBottle3.Value<uint8_t>()) {
-    AddItemToInventory(EMPTY_BOTTLE, 1);
+    AddItemToInventory(RG_EMPTY_BOTTLE, 1);
   }
   if (StartingBottle4.Value<uint8_t>() == STARTINGBOTTLE_BIG_POE) {
-    AddItemToInventory(BOTTLE_WITH_BIG_POE, 1);
+    AddItemToInventory(RG_BOTTLE_WITH_BIG_POE, 1);
   } else if (StartingBottle4.Value<uint8_t>()) {
-    AddItemToInventory(EMPTY_BOTTLE, 1);
+    AddItemToInventory(RG_EMPTY_BOTTLE, 1);
   }
-  AddItemToInventory(RUTOS_LETTER,              StartingRutoBottle.Value<uint8_t>());
-  AddItemToInventory(PROGRESSIVE_OCARINA,       StartingOcarina.Value<uint8_t>());
-  AddItemToInventory(ZELDAS_LULLABY,            StartingZeldasLullaby.Value<uint8_t>());
-  AddItemToInventory(EPONAS_SONG,               StartingEponasSong.Value<uint8_t>());
-  AddItemToInventory(SARIAS_SONG,               StartingSariasSong.Value<uint8_t>());
-  AddItemToInventory(SUNS_SONG,                 StartingSunsSong.Value<uint8_t>());
-  AddItemToInventory(SONG_OF_TIME,              StartingSongOfTime.Value<uint8_t>());
-  AddItemToInventory(SONG_OF_STORMS,            StartingSongOfStorms.Value<uint8_t>());
-  AddItemToInventory(MINUET_OF_FOREST,          StartingMinuetOfForest.Value<uint8_t>());
-  AddItemToInventory(BOLERO_OF_FIRE,            StartingBoleroOfFire.Value<uint8_t>());
-  AddItemToInventory(SERENADE_OF_WATER,         StartingSerenadeOfWater.Value<uint8_t>());
-  AddItemToInventory(REQUIEM_OF_SPIRIT,         StartingRequiemOfSpirit.Value<uint8_t>());
-  AddItemToInventory(NOCTURNE_OF_SHADOW,        StartingNocturneOfShadow.Value<uint8_t>());
-  AddItemToInventory(PRELUDE_OF_LIGHT,          StartingPreludeOfLight.Value<uint8_t>());
-  AddItemToInventory(KOKIRI_SWORD,              StartingKokiriSword.Value<uint8_t>());
+  AddItemToInventory(RG_RUTOS_LETTER,              StartingRutoBottle.Value<uint8_t>());
+  AddItemToInventory(RG_PROGRESSIVE_OCARINA,       StartingOcarina.Value<uint8_t>());
+  AddItemToInventory(RG_ZELDAS_LULLABY,            StartingZeldasLullaby.Value<uint8_t>());
+  AddItemToInventory(RG_EPONAS_SONG,               StartingEponasSong.Value<uint8_t>());
+  AddItemToInventory(RG_SARIAS_SONG,               StartingSariasSong.Value<uint8_t>());
+  AddItemToInventory(RG_SUNS_SONG,                 StartingSunsSong.Value<uint8_t>());
+  AddItemToInventory(RG_SONG_OF_TIME,              StartingSongOfTime.Value<uint8_t>());
+  AddItemToInventory(RG_SONG_OF_STORMS,            StartingSongOfStorms.Value<uint8_t>());
+  AddItemToInventory(RG_MINUET_OF_FOREST,          StartingMinuetOfForest.Value<uint8_t>());
+  AddItemToInventory(RG_BOLERO_OF_FIRE,            StartingBoleroOfFire.Value<uint8_t>());
+  AddItemToInventory(RG_SERENADE_OF_WATER,         StartingSerenadeOfWater.Value<uint8_t>());
+  AddItemToInventory(RG_REQUIEM_OF_SPIRIT,         StartingRequiemOfSpirit.Value<uint8_t>());
+  AddItemToInventory(RG_NOCTURNE_OF_SHADOW,        StartingNocturneOfShadow.Value<uint8_t>());
+  AddItemToInventory(RG_PRELUDE_OF_LIGHT,          StartingPreludeOfLight.Value<uint8_t>());
+  AddItemToInventory(RG_KOKIRI_SWORD,              StartingKokiriSword.Value<uint8_t>());
   if (ProgressiveGoronSword) {
-    AddItemToInventory(PROGRESSIVE_GORONSWORD,  StartingBiggoronSword.Value<uint8_t>());
+    AddItemToInventory(RG_PROGRESSIVE_GORONSWORD, StartingBiggoronSword.Value<uint8_t>());
   } else {
-    AddItemToInventory(GIANTS_KNIFE,            (StartingBiggoronSword.Is(STARTINGBGS_GIANTS_KNIFE)) ? 1 : 0);
-    AddItemToInventory(BIGGORON_SWORD,          (StartingBiggoronSword.Is(STARTINGBGS_BIGGORON_SWORD)) ? 1 : 0);
+    AddItemToInventory(RG_GIANTS_KNIFE, (StartingBiggoronSword.Is(STARTINGBGS_GIANTS_KNIFE)) ? 1 : 0);
+    AddItemToInventory(RG_BIGGORON_SWORD, (StartingBiggoronSword.Is(STARTINGBGS_BIGGORON_SWORD)) ? 1 : 0);
   }
-  AddItemToInventory(DEKU_SHIELD,               StartingDekuShield.Value<uint8_t>());
-  AddItemToInventory(HYLIAN_SHIELD,             StartingHylianShield.Value<uint8_t>());
-  AddItemToInventory(MIRROR_SHIELD,             StartingMirrorShield.Value<uint8_t>());
-  AddItemToInventory(GORON_TUNIC,               StartingGoronTunic.Value<uint8_t>());
-  AddItemToInventory(ZORA_TUNIC,                StartingZoraTunic.Value<uint8_t>());
-  AddItemToInventory(PROGRESSIVE_MAGIC_METER,   StartingMagicMeter.Value<uint8_t>());
-  AddItemToInventory(PROGRESSIVE_STRENGTH,      StartingStrength.Value<uint8_t>());
-  AddItemToInventory(PROGRESSIVE_SCALE,         StartingScale.Value<uint8_t>());
-  AddItemToInventory(PROGRESSIVE_WALLET,        StartingWallet.Value<uint8_t>());
-  AddItemToInventory(STONE_OF_AGONY,            StartingShardOfAgony.Value<uint8_t>());
-  AddItemToInventory(DOUBLE_DEFENSE,            StartingDoubleDefense.Value<uint8_t>());
-  AddItemToInventory(KOKIRI_EMERALD,            StartingKokiriEmerald.Value<uint8_t>());
-  AddItemToInventory(GORON_RUBY,                StartingGoronRuby.Value<uint8_t>());
-  AddItemToInventory(ZORA_SAPPHIRE,             StartingZoraSapphire.Value<uint8_t>());
-  AddItemToInventory(FOREST_MEDALLION,          StartingForestMedallion.Value<uint8_t>());
-  AddItemToInventory(FIRE_MEDALLION,            StartingFireMedallion.Value<uint8_t>());
-  AddItemToInventory(WATER_MEDALLION,           StartingWaterMedallion.Value<uint8_t>());
-  AddItemToInventory(SPIRIT_MEDALLION,          StartingSpiritMedallion.Value<uint8_t>());
-  AddItemToInventory(SHADOW_MEDALLION,          StartingShadowMedallion.Value<uint8_t>());
-  AddItemToInventory(LIGHT_MEDALLION,           StartingLightMedallion.Value<uint8_t>());
-  AddItemToInventory(GOLD_SKULLTULA_TOKEN,      StartingSkulltulaToken.Value<uint8_t>());
+  AddItemToInventory(RG_DEKU_SHIELD, StartingDekuShield.Value<uint8_t>());
+  AddItemToInventory(RG_HYLIAN_SHIELD,             StartingHylianShield.Value<uint8_t>());
+  AddItemToInventory(RG_MIRROR_SHIELD,             StartingMirrorShield.Value<uint8_t>());
+  AddItemToInventory(RG_GORON_TUNIC,               StartingGoronTunic.Value<uint8_t>());
+  AddItemToInventory(RG_ZORA_TUNIC,                StartingZoraTunic.Value<uint8_t>());
+  AddItemToInventory(RG_PROGRESSIVE_MAGIC_METER,   StartingMagicMeter.Value<uint8_t>());
+  AddItemToInventory(RG_PROGRESSIVE_STRENGTH,      StartingStrength.Value<uint8_t>());
+  AddItemToInventory(RG_PROGRESSIVE_SCALE,         StartingScale.Value<uint8_t>());
+  AddItemToInventory(RG_PROGRESSIVE_WALLET,        StartingWallet.Value<uint8_t>());
+  AddItemToInventory(RG_STONE_OF_AGONY,            StartingShardOfAgony.Value<uint8_t>());
+  AddItemToInventory(RG_DOUBLE_DEFENSE,            StartingDoubleDefense.Value<uint8_t>());
+  AddItemToInventory(RG_KOKIRI_EMERALD,            StartingKokiriEmerald.Value<uint8_t>());
+  AddItemToInventory(RG_GORON_RUBY,                StartingGoronRuby.Value<uint8_t>());
+  AddItemToInventory(RG_ZORA_SAPPHIRE,             StartingZoraSapphire.Value<uint8_t>());
+  AddItemToInventory(RG_FOREST_MEDALLION,          StartingForestMedallion.Value<uint8_t>());
+  AddItemToInventory(RG_FIRE_MEDALLION,            StartingFireMedallion.Value<uint8_t>());
+  AddItemToInventory(RG_WATER_MEDALLION,           StartingWaterMedallion.Value<uint8_t>());
+  AddItemToInventory(RG_SPIRIT_MEDALLION,          StartingSpiritMedallion.Value<uint8_t>());
+  AddItemToInventory(RG_SHADOW_MEDALLION,          StartingShadowMedallion.Value<uint8_t>());
+  AddItemToInventory(RG_LIGHT_MEDALLION,           StartingLightMedallion.Value<uint8_t>());
+  AddItemToInventory(RG_GOLD_SKULLTULA_TOKEN,      StartingSkulltulaToken.Value<uint8_t>());
 
   int8_t hearts = StartingHearts.Value<uint8_t>() - 2;
   AdditionalHeartContainers = 0;
   if (hearts < 0) {
-    AddItemToInventory(PIECE_OF_HEART, 4);
+    AddItemToInventory(RG_PIECE_OF_HEART, 4);
     // Plentiful and minimal have less than 4 standard pieces of heart so also replace the winner heart
     if (ItemPoolValue.Value<uint8_t>() == 0 || ItemPoolValue.Value<uint8_t>() == 3) {
-        AddItemToInventory(TREASURE_GAME_HEART);
+      AddItemToInventory(RG_TREASURE_GAME_HEART);
     }
 
     AdditionalHeartContainers = 1 - hearts;
@@ -167,28 +167,28 @@ void GenerateStartingInventory() {
     uint8_t maxContainers = 8 * std::max(0, 2 - ItemPoolValue.Value<uint8_t>());
 
     if (hearts <= maxContainers) {
-      AddItemToInventory(HEART_CONTAINER, hearts);
+      AddItemToInventory(RG_HEART_CONTAINER, hearts);
     } else {
-      AddItemToInventory(HEART_CONTAINER, maxContainers);
-      AddItemToInventory(PIECE_OF_HEART, (hearts - maxContainers) * 4);
+      AddItemToInventory(RG_HEART_CONTAINER, maxContainers);
+      AddItemToInventory(RG_PIECE_OF_HEART, (hearts - maxContainers) * 4);
     }
 
     if (hearts == 17) {
-      AddItemToInventory(TREASURE_GAME_HEART);
+      AddItemToInventory(RG_TREASURE_GAME_HEART);
     }
   }
 }
 
 bool StartingInventoryHasBottle() {
-    uint32_t bottle = EMPTY_BOTTLE;
+  RandomizerGet bottle = RG_EMPTY_BOTTLE;
   return ElementInContainer(bottle, StartingInventory);
 }
 
 void ApplyStartingInventory() {
-    for (uint32_t item : StartingInventory) {
-    if (item == PIECE_OF_HEART || item == HEART_CONTAINER || item == TREASURE_GAME_HEART)
+    for (RandomizerGet item : StartingInventory) {
+    if (item == RG_PIECE_OF_HEART || item == RG_HEART_CONTAINER || item == RG_TREASURE_GAME_HEART)
       continue;
 
-    ItemTable(item).ApplyEffect();
+    Rando::StaticData::RetrieveItem(item).ApplyEffect();
   }
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/starting_inventory.hpp b/soh/soh/Enhancements/randomizer/3drando/starting_inventory.hpp
index e2c85c875..6c63dda95 100644
--- a/soh/soh/Enhancements/randomizer/3drando/starting_inventory.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/starting_inventory.hpp
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "keys.hpp"
+#include "../randomizerTypes.h"
 
 #include <vector>
 #include <stdint.h>
 
-extern std::vector<uint32_t> StartingInventory;
+extern std::vector<RandomizerGet> StartingInventory;
 extern uint8_t AdditionalHeartContainers;
 
 void GenerateStartingInventory();
diff --git a/soh/soh/Enhancements/randomizer/context.cpp b/soh/soh/Enhancements/randomizer/context.cpp
new file mode 100644
index 000000000..8995fa06b
--- /dev/null
+++ b/soh/soh/Enhancements/randomizer/context.cpp
@@ -0,0 +1,188 @@
+#include "context.h"
+#include "static_data.h"
+#include "3drando/shops.hpp"
+#include "3drando/dungeon.hpp"
+
+#include <spdlog/spdlog.h>
+
+namespace Rando {
+std::weak_ptr<Context> Context::mContext;
+
+Context::Context() {
+    for (int i = 0; i < RC_MAX; i++) {
+        itemLocationTable[i] = ItemLocation((RandomizerCheck)i);
+    }
+}
+
+std::shared_ptr<Context> Context::CreateInstance() {
+    if (mContext.expired()) {
+        auto instance = std::make_shared<Context>();
+        mContext = instance;
+        return instance;
+    }
+    return GetInstance();
+}
+
+std::shared_ptr<Context> Context::GetInstance() {
+    return mContext.lock();
+}
+
+Hint *Context::GetHint(RandomizerHintKey hintKey) {
+    return &hintTable[hintKey];
+}
+
+void Context::AddHint(RandomizerHintKey hintId, Text text, RandomizerCheck hintedLocation, HintType hintType,
+                      Text hintedRegion) {
+    hintTable[hintId] = Hint(text, hintedLocation, hintType, hintedRegion);
+    GetItemLocation(hintedLocation)->SetHintKey(hintId);
+}
+
+ItemLocation *Context::GetItemLocation(RandomizerCheck locKey) {
+    return &(itemLocationTable[locKey]);
+}
+
+void Context::PlaceItemInLocation(RandomizerCheck locKey, RandomizerGet item, bool applyEffectImmediately,
+                                  bool setHidden) {
+    auto loc = GetItemLocation(locKey);
+    SPDLOG_DEBUG("\n");
+    SPDLOG_DEBUG(StaticData::RetrieveItem(item).GetName().GetEnglish());
+    SPDLOG_DEBUG(" placed at ");
+    SPDLOG_DEBUG(StaticData::GetLocation(locKey)->GetName());
+    SPDLOG_DEBUG("\n\n");
+
+    if (applyEffectImmediately || Settings::Logic.Is(LOGIC_NONE) || Settings::Logic.Is(LOGIC_VANILLA)) {
+        Rando::StaticData::RetrieveItem(item).ApplyEffect();
+    }
+
+    //TODO? Show Progress
+
+    // If we're placing a non-shop item in a shop location, we want to record it for custom messages
+    if (StaticData::RetrieveItem(item).GetItemType() != ITEMTYPE_SHOP &&
+        Rando::StaticData::GetLocation(locKey)->IsCategory(Category::cShop)) {
+        int index = TransformShopIndex(GetShopIndex(locKey));
+        NonShopItems[index].Name = Rando::StaticData::RetrieveItem(item).GetName();
+        NonShopItems[index].Repurchaseable = Rando::StaticData::RetrieveItem(item).GetItemType() == ITEMTYPE_REFILL ||
+                                             Rando::StaticData::RetrieveItem(item).GetHintKey() == RHT_PROGRESSIVE_BOMBCHUS;
+    }
+
+    loc->SetPlacedItem(item);
+    if (setHidden) {
+        loc->SetHidden(true);
+    }
+}
+
+void Context::AddLocation(RandomizerCheck loc, std::vector<RandomizerCheck>* destination) {
+    if (destination == nullptr) {
+        destination = &allLocations;
+    }
+    destination->push_back(loc);
+}
+
+template<typename Container>
+void Context::AddLocations(const Container& locations, std::vector<RandomizerCheck>* destination) {
+    if (destination == nullptr) {
+        destination = &allLocations;
+    }
+    destination->insert(destination->end(), std::cbegin(locations), std::cend(locations));
+}
+
+void Context::GenerateLocationPool() {
+    allLocations.clear();
+    AddLocation(RC_LINKS_POCKET);
+    if (Settings::TriforceHunt.Is(TRIFORCE_HUNT_ON)) {
+        AddLocation(RC_TRIFORCE_COMPLETED);
+    }
+    AddLocations(StaticData::overworldLocations);
+
+    for (auto dungeon : Dungeon::dungeonList) {
+        AddLocations(dungeon->GetDungeonLocations());
+    }
+}
+
+void Context::AddExcludedOptions() {
+    AddLocations(StaticData::overworldLocations, &everyPossibleLocation);
+    for (auto dungeon : Dungeon::dungeonList) {
+        AddLocations(dungeon->GetEveryLocation(), &everyPossibleLocation);
+    }
+    for (RandomizerCheck rc : everyPossibleLocation) {
+        GetItemLocation(rc)->AddExcludeOption();
+    }
+}
+
+std::vector<RandomizerCheck> Context::GetLocations(const std::vector<RandomizerCheck>& locationPool,
+                                                   Category categoryInclude, Category categoryExclude) {
+    std::vector<RandomizerCheck> locationsInCategory;
+    for (RandomizerCheck locKey : locationPool) {
+        if (StaticData::GetLocation(locKey)->IsCategory(categoryInclude) &&
+            !StaticData::GetLocation(locKey)->IsCategory(categoryExclude)) {
+            locationsInCategory.push_back(locKey);
+        }
+    }
+    return locationsInCategory;
+}
+
+void Context::ItemReset() {
+    for (RandomizerCheck il : allLocations) {
+        GetItemLocation(il)->ResetVariables();
+    }
+
+    for (RandomizerCheck il : Rando::StaticData::dungeonRewardLocations) {
+        GetItemLocation(il)->ResetVariables();
+    }
+}
+
+void Context::LocationReset() {
+    for (RandomizerCheck il : allLocations) {
+        GetItemLocation(il)->RemoveFromPool();
+    }
+
+    for (RandomizerCheck il : Rando::StaticData::dungeonRewardLocations) {
+        GetItemLocation(il)->RemoveFromPool();
+    }
+
+    for (RandomizerCheck il : Rando::StaticData::gossipStoneLocations) {
+        GetItemLocation(il)->RemoveFromPool();
+    }
+
+    GetItemLocation(RC_GANONDORF_HINT)->RemoveFromPool();
+}
+
+void Context::HintReset() {
+    for (RandomizerCheck il : Rando::StaticData::gossipStoneLocations) {
+        GetItemLocation(il)->ResetVariables();
+        GetHint((RandomizerHintKey)(il - RC_DMC_GOSSIP_STONE + 1))->ResetVariables();
+    }
+}
+
+void Context::CreateItemOverrides() {
+    SPDLOG_DEBUG("NOW CREATING OVERRIDES\n\n");
+    for (RandomizerCheck locKey : allLocations) {
+        auto loc = Rando::StaticData::GetLocation(locKey);
+        auto itemLoc = GetItemLocation(locKey);
+        ItemOverride_Value val = Rando::StaticData::RetrieveItem(itemLoc->GetPlacedRandomizerGet()).Value();
+        // If this is an ice trap, store the disguise model in iceTrapModels
+        if (itemLoc->GetPlacedRandomizerGet() == RG_ICE_TRAP) {
+            iceTrapModels[loc->GetRandomizerCheck()] = val.looksLikeItemId;
+            // If this is ice trap is in a shop, change the name based on what the model will look like
+            if (loc->IsCategory(Category::cShop)) {
+                NonShopItems[TransformShopIndex(GetShopIndex(locKey))].Name = GetIceTrapName(val.looksLikeItemId);
+            }
+        }
+        overrides.insert({
+            .key = itemLoc->Key(),
+            .value = val,
+        });
+        SPDLOG_DEBUG("\tScene: ");
+        SPDLOG_DEBUG(std::to_string(itemLoc->Key().scene));
+        SPDLOG_DEBUG("\tType: ");
+        SPDLOG_DEBUG(std::to_string(itemLoc->Key().type));
+        SPDLOG_DEBUG("\t");
+        SPDLOG_DEBUG(loc->GetName());
+        SPDLOG_DEBUG(": ");
+        SPDLOG_DEBUG(itemLoc->GetPlacedItemName().GetEnglish());
+        SPDLOG_DEBUG("\n");
+    }
+    SPDLOG_DEBUG("Overrides Created: ");
+    SPDLOG_DEBUG(std::to_string(overrides.size()));
+}
+}
diff --git a/soh/soh/Enhancements/randomizer/context.h b/soh/soh/Enhancements/randomizer/context.h
new file mode 100644
index 000000000..d008077a8
--- /dev/null
+++ b/soh/soh/Enhancements/randomizer/context.h
@@ -0,0 +1,56 @@
+#pragma once
+
+#include "randomizerTypes.h"
+#include "item_location.h"
+#include "3drando/text.hpp"
+#include "hint.h"
+
+#include <memory>
+#include <array>
+
+/**
+ * @brief Singleton for storing and accessing dynamic Randomizer-related data
+ *
+ * The Context class is a class for storing and accessing dynamic Randomizer-related data.
+ * Dynamic Data, in this context, refers to data that can be different for each randomizer seed,
+ * i.e. item locations, hint contents and locations, settings, etc. This class is intended to be
+ * used as a Singleton.
+ */
+namespace Rando {
+class Context {
+  public:
+    Context();
+    static std::shared_ptr<Context> CreateInstance();
+    static std::shared_ptr<Context> GetInstance();
+    Hint* GetHint(RandomizerHintKey hintKey);
+    void AddHint(RandomizerHintKey hintId, Text text, RandomizerCheck hintedLocation, HintType hintType,
+                 Text hintedRegion);
+    ItemLocation* GetItemLocation(RandomizerCheck locKey);
+    void PlaceItemInLocation(RandomizerCheck locKey, RandomizerGet item, bool applyEffectImmediately = false,
+                             bool setHidden = false);
+    std::vector<RandomizerCheck> allLocations;
+    void AddLocation(RandomizerCheck loc, std::vector<RandomizerCheck>* destination = nullptr);
+    template <typename Container>
+    void AddLocations(const Container& locations, std::vector<RandomizerCheck>* destination = nullptr);
+    void GenerateLocationPool();
+    std::vector<RandomizerCheck> GetLocations(const std::vector<RandomizerCheck>& locationPool,
+                                              Category categoryInclude, Category categoryExclude = Category::cNull);
+    void AddExcludedOptions();
+    void LocationReset();
+    void ItemReset();
+    void HintReset();
+    void CreateItemOverrides();
+    std::set<ItemOverride, ItemOverride_Compare> overrides = {};
+    std::vector<std::vector<RandomizerCheck>> playthroughLocations = {};
+    std::vector<RandomizerCheck> everyPossibleLocation = {};
+    std::vector<RandomizerCheck> wothLocations = {};
+    std::unordered_map<RandomizerCheck, uint8_t> iceTrapModels = {};
+    bool playthroughBeatable = false;
+    bool allLocationsReachable = false;
+
+  private:
+    static std::weak_ptr<Context> mContext;
+    std::array<Hint, RH_MAX> hintTable = {};
+    std::array<ItemLocation, RC_MAX> itemLocationTable = {};
+};
+} // namespace Rando
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/draw.cpp b/soh/soh/Enhancements/randomizer/draw.cpp
index c2895dd62..660dee492 100644
--- a/soh/soh/Enhancements/randomizer/draw.cpp
+++ b/soh/soh/Enhancements/randomizer/draw.cpp
@@ -157,7 +157,7 @@ extern "C" void Randomizer_DrawKeyRing(PlayState* play, GetItemEntry* getItemEnt
     CLOSE_DISPS(play->state.gfxCtx);
 }
 
-extern "C" void Randomizer_DrawDoubleDefense(PlayState* play, GetItemEntry getItemEntry) {
+extern "C" void Randomizer_DrawDoubleDefense(PlayState* play, GetItemEntry* getItemEntry) {
     OPEN_DISPS(play->state.gfxCtx);
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
diff --git a/soh/soh/Enhancements/randomizer/draw.h b/soh/soh/Enhancements/randomizer/draw.h
index 19510c2f4..40ca196b6 100644
--- a/soh/soh/Enhancements/randomizer/draw.h
+++ b/soh/soh/Enhancements/randomizer/draw.h
@@ -12,7 +12,7 @@ extern "C" {
 void Randomizer_DrawSmallKey(PlayState* play, GetItemEntry* getItemEntry);
 void Randomizer_DrawKeyRing(PlayState* play, GetItemEntry* getItemEntry);
 void Randomizer_DrawBossKey(PlayState* play, GetItemEntry* getItemEntry);
-void Randomizer_DrawDoubleDefense(PlayState* play, GetItemEntry getItemEntry);
+void Randomizer_DrawDoubleDefense(PlayState* play, GetItemEntry* getItemEntry);
 void Randomizer_DrawTriforcePiece(PlayState* play, GetItemEntry getItemEntry);
 void Randomizer_DrawTriforcePieceGI(PlayState* play, GetItemEntry getItemEntry);
 #ifdef __cplusplus
diff --git a/soh/soh/Enhancements/randomizer/hint.cpp b/soh/soh/Enhancements/randomizer/hint.cpp
new file mode 100644
index 000000000..31c8f67b4
--- /dev/null
+++ b/soh/soh/Enhancements/randomizer/hint.cpp
@@ -0,0 +1,43 @@
+#include "hint.h"
+
+namespace Rando {
+Hint::Hint() {}
+Hint::Hint(Text text_): text(std::move(text_)) {}
+Hint::Hint(Text text_, RandomizerCheck hintedLocation_, HintType hintType_, Text hintedRegion_)
+    : text(std::move(text_)), hintedLocation(hintedLocation_), hintType(hintType_),
+      hintedRegion(std::move(hintedRegion_)) {
+}
+
+const Text& Hint::GetText() const {
+    return text;
+}
+
+void Hint::SetHintedLocation(RandomizerCheck location) {
+    hintedLocation = location;
+}
+
+RandomizerCheck Hint::GetHintedLocation() {
+    return hintedLocation;
+}
+
+void Hint::SetHintType(HintType type) {
+    hintType = type;
+}
+
+HintType Hint::GetHintType() {
+    return hintType;
+}
+
+void Hint::SetHintedRegion(Text region) {
+    hintedRegion = region;
+}
+
+std::string Hint::GetHintedRegion() {
+    return hintedRegion.GetEnglish();
+}
+
+void Hint::ResetVariables() {
+    hintedLocation = RC_UNKNOWN_CHECK;
+    addedToPool = false;
+}
+}
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/hint.h b/soh/soh/Enhancements/randomizer/hint.h
new file mode 100644
index 000000000..bba5a0715
--- /dev/null
+++ b/soh/soh/Enhancements/randomizer/hint.h
@@ -0,0 +1,30 @@
+#pragma once
+
+#include "3drando/text.hpp"
+#include "randomizerTypes.h"
+
+namespace Rando {
+class Hint {
+    public:
+    Hint();
+    Hint(Text text_);
+    Hint(Text text_, RandomizerCheck hintedLocation_, HintType hintType_, Text hintedRegion_);
+    const Text& GetText() const;
+    RandomizerCheck GetHintedLocation();
+    void SetHintedLocation (RandomizerCheck location);
+    HintType GetHintType();
+    void SetHintType (HintType type);
+    std::string GetHintedRegion();
+    void SetHintedRegion (Text region);
+    void ResetVariables();
+    bool IsAddedToPool();
+    void AddToPool();
+
+    private:
+    Text text;
+    RandomizerCheck hintedLocation;
+    HintType hintType;
+    Text hintedRegion;
+    bool addedToPool;
+};
+}
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/item.cpp b/soh/soh/Enhancements/randomizer/item.cpp
new file mode 100644
index 000000000..879a7324d
--- /dev/null
+++ b/soh/soh/Enhancements/randomizer/item.cpp
@@ -0,0 +1,379 @@
+#include "item.h"
+#include "item_location.h"
+
+#include "3drando/logic.hpp"
+#include "3drando/random.hpp"
+#include "3drando/item_pool.hpp"
+#include "z64item.h"
+#include "variables.h"
+#include "macros.h"
+#include "../../OTRGlobals.h"
+
+namespace Rando {
+Item::Item(RandomizerGet randomizerGet_, Text name_, ItemType type_, int16_t getItemId_, bool advancement_,
+                     bool* logicVar_, RandomizerHintTextKey hintKey_, uint16_t itemId_, uint16_t objectId_, uint16_t gid_,
+                     uint16_t textId_, uint16_t field_, int16_t chestAnimation_, GetItemCategory category_,
+                     uint16_t modIndex_, bool progressive_, uint16_t price_)
+    : randomizerGet(randomizerGet_), name(std::move(name_)), type(type_), getItemId(getItemId_),
+      advancement(advancement_), logicVar(logicVar_), hintKey(hintKey_), progressive(progressive_), price(price_) {
+    if (modIndex_ == MOD_RANDOMIZER || getItemId > 0x7D) {
+        giEntry = std::shared_ptr<GetItemEntry>(
+            new GetItemEntry(GET_ITEM(itemId_, objectId_, gid_, textId_, field_, chestAnimation_, category_, modIndex_,
+                                      (int16_t)randomizerGet_)));
+    } else {
+        giEntry = std::shared_ptr<GetItemEntry>(new GetItemEntry(
+            GET_ITEM(itemId_, objectId_, gid_, textId_, field_, chestAnimation_, category_, modIndex_, getItemId_)));
+    }
+}
+
+Item::Item(RandomizerGet randomizerGet_, Text name_, ItemType type_, int16_t getItemId_, bool advancement_,
+                     uint8_t* logicVar_, RandomizerHintTextKey hintKey_, uint16_t itemId_, uint16_t objectId_, uint16_t gid_,
+                     uint16_t textId_, uint16_t field_, int16_t chestAnimation_, GetItemCategory category_,
+                     uint16_t modIndex_, bool progressive_, uint16_t price_)
+    : randomizerGet(randomizerGet_), name(std::move(name_)), type(type_), getItemId(getItemId_),
+      advancement(advancement_), logicVar(logicVar_), hintKey(hintKey_), progressive(progressive_), price(price_) {
+    if (modIndex_ == MOD_RANDOMIZER || getItemId > 0x7D) {
+        giEntry = std::shared_ptr<GetItemEntry>(
+            new GetItemEntry(GET_ITEM(itemId_, objectId_, gid_, textId_, field_, chestAnimation_, category_, modIndex_,
+                                      (int16_t)randomizerGet_)));
+    } else {
+        giEntry = std::shared_ptr<GetItemEntry>(new GetItemEntry(
+            GET_ITEM(itemId_, objectId_, gid_, textId_, field_, chestAnimation_, category_, modIndex_, getItemId_)));
+    }
+}
+
+Item::Item(RandomizerGet randomizerGet_, Text name_, ItemType type_, int getItemId_, bool advancement_,
+                     bool* logicVar_, RandomizerHintTextKey hintKey_, bool progressive_, uint16_t price_)
+    : randomizerGet(randomizerGet_), name(std::move(name_)), type(type_), getItemId(getItemId_),
+      advancement(advancement_), logicVar(logicVar_), hintKey(hintKey_), progressive(progressive_), price(price_) {
+}
+
+Item::Item(RandomizerGet randomizerGet_, Text name_, ItemType type_, int getItemId_, bool advancement_,
+                     uint8_t* logicVar_, RandomizerHintTextKey hintKey_, bool progressive_, uint16_t price_)
+    : randomizerGet(randomizerGet_), name(std::move(name_)), type(type_), getItemId(getItemId_),
+      advancement(advancement_), logicVar(logicVar_), hintKey(hintKey_), progressive(progressive_), price(price_) {
+}
+
+    Item::~Item() = default;
+
+void Item::ApplyEffect() {
+    // If this is a key ring, logically add as many keys as we could need
+    if (RHT_FOREST_TEMPLE_KEY_RING <= hintKey && hintKey <= RHT_GANONS_CASTLE_KEY_RING) {
+        *std::get<uint8_t*>(logicVar) += 10;
+    } else {
+        if (std::holds_alternative<bool*>(logicVar)) {
+            *std::get<bool*>(logicVar) = true;
+        } else {
+            *std::get<uint8_t*>(logicVar) += 1;
+        }
+    }
+    Logic::UpdateHelpers();
+}
+
+void Item::UndoEffect() {
+    if (RHT_FOREST_TEMPLE_KEY_RING <= hintKey && hintKey <= RHT_GANONS_CASTLE_KEY_RING) {
+        *std::get<uint8_t*>(logicVar) -= 10;
+    } else {
+        if (std::holds_alternative<bool*>(logicVar)) {
+            *std::get<bool*>(logicVar) = false;
+        } else {
+            *std::get<uint8_t*>(logicVar) -= 1;
+        }
+    }
+    Logic::UpdateHelpers();
+}
+
+Rando::ItemOverride_Value Item::Value() const {
+    Rando::ItemOverride_Value val;
+
+    val.all = 0;
+    val.itemId = getItemId;
+    if (getItemId == RG_ICE_TRAP) {
+        val.looksLikeItemId = RandomElement(IceTrapModels);
+    }
+    if ((getItemId >= 0x95 && getItemId <= 0x9A)) { // Boss keys
+        val.looksLikeItemId = GI_KEY_BOSS;
+    }
+    if ((getItemId >= 0xAF && getItemId <= 0xB7)) { // Small keys
+        val.looksLikeItemId = GI_KEY_SMALL;
+    }
+    if (type == ITEMTYPE_SHOP) {
+        // With the current shopsanity implementation, we need a way to detect
+        // regular shop items. This method should have no unintended side effects
+        // unless there was a multiworld with 256 players... so, it should be fine.
+        val.player = 0xFF;
+    }
+    return val;
+}
+
+const Text& Item::GetName() const {
+    return name;
+}
+
+bool Item::IsAdvancement() const {
+    return advancement;
+}
+
+int Item::GetItemID() const {
+    return getItemId;
+}
+
+ItemType Item::GetItemType() const {
+    return type;
+}
+
+RandomizerGet Item::GetRandomizerGet() {
+    return randomizerGet;
+}
+
+uint16_t Item::GetPrice() const {
+    return price;
+}
+
+std::shared_ptr<GetItemEntry> Item::GetGIEntry() const {
+    if (giEntry != nullptr) {
+        return giEntry;
+    }
+    RandomizerGet actual = RG_NONE;
+    u8 numWallets =
+        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHOPSANITY) > RO_SHOPSANITY_ZERO_ITEMS ? 3 : 2;
+    switch (randomizerGet) {
+        case RG_PROGRESSIVE_STICK_UPGRADE:
+            switch (CUR_UPG_VALUE(UPG_STICKS)) {
+                case 0:
+                case 1:
+                    actual = RG_DEKU_STICK_CAPACITY_20;
+                    break;
+                case 2:
+                case 3:
+                    actual = RG_DEKU_STICK_CAPACITY_30;
+                    break;
+            }
+            break;
+        case RG_PROGRESSIVE_NUT_UPGRADE:
+            switch (CUR_UPG_VALUE(UPG_NUTS)) {
+                case 0:
+                case 1:
+                    actual = RG_DEKU_NUT_CAPACITY_30;
+                    break;
+                case 2:
+                case 3:
+                    actual = RG_DEKU_NUT_CAPACITY_40;
+                    break;
+            }
+            break;
+        case RG_PROGRESSIVE_BOMB_BAG:
+            switch (CUR_UPG_VALUE(UPG_BOMB_BAG)) {
+                case 0:
+                    actual = RG_BOMB_BAG;
+                    break;
+                case 1:
+                    actual = RG_BIG_BOMB_BAG;
+                    break;
+                case 2:
+                case 3:
+                    actual = RG_BIGGEST_BOMB_BAG;
+                    break;
+            }
+            break;
+        case RG_PROGRESSIVE_BOW:
+            switch (CUR_UPG_VALUE(UPG_QUIVER)) {
+                case 0:
+                    actual = RG_FAIRY_BOW;
+                    break;
+                case 1:
+                    actual = RG_BIG_QUIVER;
+                    break;
+                case 2:
+                case 3:
+                    actual = RG_BIGGEST_QUIVER;
+                    break;
+            }
+            break;
+        case RG_PROGRESSIVE_SLINGSHOT:
+            switch (CUR_UPG_VALUE(UPG_BULLET_BAG)) {
+                case 0:
+                    actual = RG_FAIRY_SLINGSHOT;
+                    break;
+                case 1:
+                    actual = RG_BIG_BULLET_BAG;
+                    break;
+                case 2:
+                case 3:
+                    actual = RG_BIGGEST_BULLET_BAG;
+                    break;
+            }
+            break;
+        case RG_PROGRESSIVE_OCARINA:
+            switch (INV_CONTENT(ITEM_OCARINA_FAIRY)) {
+                case ITEM_NONE:
+                    actual = RG_FAIRY_OCARINA;
+                    break;
+                case ITEM_OCARINA_FAIRY:
+                case ITEM_OCARINA_TIME:
+                    actual = RG_OCARINA_OF_TIME;
+                    break;
+            }
+            break;
+        case RG_PROGRESSIVE_HOOKSHOT:
+            switch (INV_CONTENT(ITEM_HOOKSHOT)) {
+                case ITEM_NONE:
+                    actual = RG_HOOKSHOT;
+                    break;
+                case ITEM_HOOKSHOT:
+                case ITEM_LONGSHOT:
+                    actual = RG_LONGSHOT;
+                    break;
+            }
+            break;
+        case RG_PROGRESSIVE_STRENGTH:
+            switch (CUR_UPG_VALUE(UPG_STRENGTH)) {
+                case 0:
+                    actual = RG_GORONS_BRACELET;
+                    break;
+                case 1:
+                    actual = RG_SILVER_GAUNTLETS;
+                    break;
+                case 2:
+                case 3:
+                    actual = RG_GOLDEN_GAUNTLETS;
+                    break;
+            }
+            break;
+        case RG_PROGRESSIVE_WALLET:
+            switch (CUR_UPG_VALUE(UPG_WALLET)) {
+                case 0:
+                    actual = RG_ADULT_WALLET;
+                    break;
+                case 1:
+                    actual = RG_GIANT_WALLET;
+                    break;
+                case 2:
+                case 3:
+                    actual = numWallets == 3 ? RG_TYCOON_WALLET : RG_GIANT_WALLET;
+                    break;
+            }
+            break;
+        case RG_PROGRESSIVE_SCALE:
+            switch (CUR_UPG_VALUE(UPG_SCALE)) {
+                case 0:
+                    actual = RG_SILVER_SCALE;
+                    break;
+                case 1:
+                case 2:
+                    actual = RG_GOLDEN_SCALE;
+                    break;
+            }
+            break;
+        case RG_PROGRESSIVE_MAGIC_METER:
+            switch (gSaveContext.magicLevel) {
+                case 0:
+                    actual = RG_MAGIC_SINGLE;
+                    break;
+                case 1:
+                case 2:
+                    actual = RG_MAGIC_DOUBLE;
+                    break;
+            }
+            break;
+        case RG_PROGRESSIVE_GORONSWORD: // todo progressive?
+           actual = RG_BIGGORON_SWORD;
+           break;
+        default:
+            actual = RG_NONE;
+            break;
+    }
+    return Rando::StaticData::RetrieveItem(actual).GetGIEntry();
+}
+
+GetItemEntry Item::GetGIEntry_Copy() {
+    return *GetGIEntry();
+}
+
+void Item::SetPrice(uint16_t price_) {
+    price = price_;
+}
+
+void Item::SetAsPlaythrough() {
+    playthrough = true;
+}
+
+void Item::SetCustomDrawFunc(CustomDrawFunc drawFunc) {
+    giEntry->drawFunc = drawFunc;
+}
+
+bool Item::IsPlaythrough() const {
+    return playthrough;
+}
+
+bool Item::IsBottleItem() const {
+    return getItemId == 0x0F ||                      // Empty Bottle
+           getItemId == 0X14 ||                      // Bottle with Milk
+           (getItemId >= 0x8C && getItemId <= 0x94); // Rest of bottled contents
+}
+
+bool Item::IsMajorItem() const {
+    using namespace Settings;
+    if (type == ITEMTYPE_TOKEN) {
+        return Bridge.Is(RAINBOWBRIDGE_TOKENS) || LACSCondition == LACSCONDITION_TOKENS;
+    }
+
+    if (type == ITEMTYPE_DROP || type == ITEMTYPE_EVENT || type == ITEMTYPE_SHOP || type == ITEMTYPE_MAP ||
+        type == ITEMTYPE_COMPASS) {
+        return false;
+    }
+
+    if (type == ITEMTYPE_DUNGEONREWARD && (ShuffleRewards.Is(REWARDSHUFFLE_END_OF_DUNGEON))) {
+        return false;
+    }
+
+    if ((randomizerGet == RG_BOMBCHU_5 || randomizerGet == RG_BOMBCHU_10 || randomizerGet == RG_BOMBCHU_20) &&
+        !BombchusInLogic) {
+        return false;
+    }
+
+    if (randomizerGet == RG_HEART_CONTAINER || randomizerGet == RG_PIECE_OF_HEART ||
+        randomizerGet == RG_TREASURE_GAME_HEART) {
+        return false;
+    }
+
+    if (type == ITEMTYPE_SMALLKEY && (Keysanity.Is(KEYSANITY_VANILLA) || Keysanity.Is(KEYSANITY_OWN_DUNGEON))) {
+        return false;
+    }
+
+    if (type == ITEMTYPE_FORTRESS_SMALLKEY && GerudoKeys.Is(GERUDOKEYS_VANILLA)) {
+        return false;
+    }
+
+    if ((type == ITEMTYPE_BOSSKEY && getItemId != 0xAD) &&
+        (BossKeysanity.Is(BOSSKEYSANITY_VANILLA) || BossKeysanity.Is(BOSSKEYSANITY_OWN_DUNGEON))) {
+        return false;
+    }
+    // Ganons Castle Boss Key
+    if (getItemId == 0xAD && (GanonsBossKey.Is(GANONSBOSSKEY_VANILLA) || GanonsBossKey.Is(GANONSBOSSKEY_OWN_DUNGEON))) {
+        return false;
+    }
+
+    if (randomizerGet == RG_GREG_RUPEE) {
+        return Bridge.Is(RAINBOWBRIDGE_GREG);
+    }
+
+    return IsAdvancement();
+}
+
+RandomizerHintTextKey Item::GetHintKey() const {
+    return hintKey;
+}
+
+const HintText& Item::GetHint() const {
+    return ::Hint(hintKey);
+}
+
+bool Item::operator==(const Item& right) const {
+    return type == right.GetItemType() && getItemId == right.GetItemID();
+}
+
+bool Item::operator!=(const Item& right) const {
+    return !operator==(right);
+}
+}
diff --git a/soh/soh/Enhancements/randomizer/item.h b/soh/soh/Enhancements/randomizer/item.h
new file mode 100644
index 000000000..5fd67760d
--- /dev/null
+++ b/soh/soh/Enhancements/randomizer/item.h
@@ -0,0 +1,88 @@
+#pragma once
+
+#include <string>
+#include <variant>
+#include <memory>
+
+#include "3drando/text.hpp"
+#include "3drando/settings.hpp"
+#include "3drando/hint_list.hpp"
+#include "randomizerTypes.h"
+#include "soh/Enhancements/item-tables/ItemTableTypes.h"
+
+namespace Rando {
+union ItemOverride_Value;
+}
+
+enum ItemType {
+    ITEMTYPE_ITEM,
+    ITEMTYPE_MAP,
+    ITEMTYPE_COMPASS,
+    ITEMTYPE_BOSSKEY,
+    ITEMTYPE_SMALLKEY,
+    ITEMTYPE_TOKEN,
+    ITEMTYPE_FORTRESS_SMALLKEY,
+    ITEMTYPE_EVENT,
+    ITEMTYPE_DROP,
+    ITEMTYPE_REFILL,
+    ITEMTYPE_SONG,
+    ITEMTYPE_SHOP,
+    ITEMTYPE_DUNGEONREWARD
+};
+
+namespace Rando {
+class Item {
+  public:
+    Item() = default;
+    Item(RandomizerGet randomizerGet_, Text name_, ItemType type_, int16_t getItemId_, bool advancement_,
+                     bool* logicVar_, RandomizerHintTextKey hintKey_, uint16_t itemId_, uint16_t objectId_, uint16_t gid_,
+                     uint16_t textId_, uint16_t field_, int16_t chestAnimation_, GetItemCategory category_,
+                     uint16_t modIndex_, bool progressive = false, uint16_t price_ = 0);
+    Item(RandomizerGet randomizerGet_, Text name_, ItemType type_, int16_t getItemId_, bool advancement_,
+              uint8_t* logicVar_, RandomizerHintTextKey hintKey_, uint16_t itemId_, uint16_t objectId_, uint16_t gid_,
+              uint16_t textId_, uint16_t field_, int16_t chestAnimation_, GetItemCategory category_, uint16_t modIndex_,
+              bool progressive = false, uint16_t price_ = 0);
+    Item(RandomizerGet randomizerGet_, Text name_, ItemType type_, int getItemId_, bool advancement_,
+              bool* logicVar_, RandomizerHintTextKey hintKey_, bool progressive = false, uint16_t price = 0);
+    Item(RandomizerGet randomizerGet_, Text name_, ItemType type_, int getItemId_, bool advancement_,
+              uint8_t* logicVar_, RandomizerHintTextKey hintKey_, bool progressive = false, uint16_t price = 0);
+    ~Item();
+
+    void ApplyEffect();
+    void UndoEffect();
+
+    Rando::ItemOverride_Value Value() const;
+    
+    const Text& GetName() const;
+    bool IsAdvancement() const;
+    int GetItemID() const;
+    ItemType GetItemType() const;
+    RandomizerGet GetRandomizerGet();
+    uint16_t GetPrice() const;
+    std::shared_ptr<GetItemEntry> GetGIEntry() const;
+    GetItemEntry GetGIEntry_Copy();
+    void SetPrice(uint16_t price_);
+    void SetAsPlaythrough();
+    void SetCustomDrawFunc(CustomDrawFunc);
+    bool IsPlaythrough() const;
+    bool IsBottleItem() const;
+    bool IsMajorItem() const;
+    RandomizerHintTextKey GetHintKey() const;
+    const HintText& GetHint() const;
+    bool operator==(const Item& right) const;
+    bool operator!=(const Item& right) const;
+
+  private:
+    RandomizerGet randomizerGet;
+    Text name;
+    ItemType type;
+    int16_t getItemId;
+    bool advancement;
+    std::variant<bool*, uint8_t*> logicVar;
+    RandomizerHintTextKey hintKey;
+    bool progressive = false;
+    uint16_t price;
+    bool playthrough = false;
+   std::shared_ptr<GetItemEntry> giEntry = nullptr;
+};
+}
diff --git a/soh/soh/Enhancements/randomizer/item_list.cpp b/soh/soh/Enhancements/randomizer/item_list.cpp
new file mode 100644
index 000000000..50ad6c36a
--- /dev/null
+++ b/soh/soh/Enhancements/randomizer/item_list.cpp
@@ -0,0 +1,295 @@
+#include "static_data.h"
+#include "3drando/logic.hpp"
+#include "z64object.h"
+#include "soh/Enhancements/custom-message/CustomMessageTypes.h"
+#include "draw.h"
+
+using namespace Rando;
+
+std::array<Item, RG_MAX> Rando::StaticData::itemTable;
+
+void Rando::StaticData::InitItemTable() {
+    itemTable[RG_NONE] =                                Item(RG_NONE,                             Text{ "No Item", "Rien", "Kein Artikel" },                                                                        ITEMTYPE_EVENT,             GI_RUPEE_GREEN,     false, &Logic::noVariable,          RHT_NONE,                   ITEM_NONE,                      0,                      0,                  0,                           0,    0,                ITEM_CATEGORY_JUNK,   MOD_NONE);
+    //        Randomizer Get                                 Randomizer Get                       Name Text                                                                                                         Type                        Get Item ID         Adv.   Logic Variable               Hint Text Key               Item ID                         Object ID               Draw ID             Text ID                      field Chest Animation Item Category         Mod Index
+    itemTable[RG_KOKIRI_SWORD] =                        Item(RG_KOKIRI_SWORD,                     Text{ "Kokiri Sword", "Épée Kokiri", "Kokiri-Schwert" },                                                          ITEMTYPE_ITEM,              GI_SWORD_KOKIRI,    true,  &Logic::KokiriSword,         RHT_KOKIRI_SWORD,           ITEM_SWORD_KOKIRI,              OBJECT_GI_SWORD_1,      GID_SWORD_KOKIRI,   0xA4,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_GIANTS_KNIFE] =                        Item(RG_GIANTS_KNIFE,                     Text{ "Giant's Knife", "Lame des Géants", "Messer des Riesen" },                                                  ITEMTYPE_ITEM,              GI_SWORD_KNIFE,     true,  &Logic::KokiriSword,         RHT_GIANTS_KNIFE,           ITEM_SWORD_BGS,                 OBJECT_GI_LONGSWORD,    GID_SWORD_BGS,      0x4B,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BIGGORON_SWORD] =                      Item(RG_BIGGORON_SWORD,                   Text{ "Biggoron's Sword", "Épée de Biggoron", "Biggoron-Schwert" },                                               ITEMTYPE_ITEM,              GI_SWORD_BGS,       true,  &Logic::BiggoronSword,       RHT_BIGGORON_SWORD,         ITEM_SWORD_BGS,                 OBJECT_GI_LONGSWORD,    GID_SWORD_BGS,      0x0C,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_DEKU_SHIELD] =                         Item(RG_DEKU_SHIELD,                      Text{ "Deku Shield", "Bouclier Mojo", "Deku-Schild" },                                                            ITEMTYPE_ITEM,              GI_SHIELD_DEKU,     false, &Logic::noVariable,          RHT_DEKU_SHIELD,            ITEM_SHIELD_DEKU,               OBJECT_GI_SHIELD_1,     GID_SHIELD_DEKU,    0x4C,                        0xA0, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_HYLIAN_SHIELD] =                       Item(RG_HYLIAN_SHIELD,                    Text{ "Hylian Shield", "Bouclier Hylien", "Hylia-Schild" },                                                       ITEMTYPE_ITEM,              GI_SHIELD_HYLIAN,   false, &Logic::noVariable,          RHT_HYLIAN_SHIELD,          ITEM_SHIELD_HYLIAN,             OBJECT_GI_SHIELD_2,     GID_SHIELD_HYLIAN,  0x4D,                        0xA0, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_MIRROR_SHIELD] =                       Item(RG_MIRROR_SHIELD,                    Text{ "Mirror Shield", "Bouclier Miroir", "Spiegel-Schild" },                                                     ITEMTYPE_ITEM,              GI_SHIELD_MIRROR,   true,  &Logic::MirrorShield,        RHT_MIRROR_SHIELD,          ITEM_SHIELD_MIRROR,             OBJECT_GI_SHIELD_3,     GID_SHIELD_MIRROR,  0x4E,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_GORON_TUNIC] =                         Item(RG_GORON_TUNIC,                      Text{ "Goron Tunic", "Tunique Goron", "Goronen-Tunika" },                                                         ITEMTYPE_ITEM,              GI_TUNIC_GORON,     true,  &Logic::GoronTunic,          RHT_GORON_TUNIC,            ITEM_TUNIC_GORON,               OBJECT_GI_CLOTHES,      GID_TUNIC_GORON,    0x50,                        0xA0, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_ZORA_TUNIC] =                          Item(RG_ZORA_TUNIC,                       Text{ "Zora Tunic", "Tunique Zora", "Zora-Tunika" },                                                              ITEMTYPE_ITEM,              GI_TUNIC_ZORA,      true,  &Logic::ZoraTunic,           RHT_ZORA_TUNIC,             ITEM_TUNIC_ZORA,                OBJECT_GI_CLOTHES,      GID_TUNIC_ZORA,     0x51,                        0xA0, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_IRON_BOOTS] =                          Item(RG_IRON_BOOTS,                       Text{ "Iron Boots", "Bottes de plomb", "Eisenstiefel" },                                                          ITEMTYPE_ITEM,              GI_BOOTS_IRON,      true,  &Logic::IronBoots,           RHT_IRON_BOOTS,             ITEM_BOOTS_IRON,                OBJECT_GI_BOOTS_2,      GID_BOOTS_IRON,     0x53,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_HOVER_BOOTS] =                         Item(RG_HOVER_BOOTS,                      Text{ "Hover Boots", "Bottes de airs", "Gleitstiefel" },                                                          ITEMTYPE_ITEM,              GI_BOOTS_HOVER,     true,  &Logic::HoverBoots,          RHT_HOVER_BOOTS,            ITEM_BOOTS_HOVER,               OBJECT_GI_HOVERBOOTS,   GID_BOOTS_HOVER,    0x54,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BOOMERANG] =                           Item(RG_BOOMERANG,                        Text{ "Boomerang", "Boomerang", "Bumerang" },                                                                     ITEMTYPE_ITEM,              GI_BOOMERANG,       true,  &Logic::Boomerang,           RHT_BOOMERANG,              ITEM_BOOMERANG,                 OBJECT_GI_BOOMERANG,    GID_BOOMERANG,      0x35,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_LENS_OF_TRUTH] =                       Item(RG_LENS_OF_TRUTH,                    Text{ "Lens of Truth", "Monocle de Vérité", "Auge der Wahrheit" },                                                ITEMTYPE_ITEM,              GI_LENS,            true,  &Logic::LensOfTruth,         RHT_LENS_OF_TRUTH,          ITEM_LENS,                      OBJECT_GI_GLASSES,      GID_LENS,           0x39,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_MEGATON_HAMMER] =                      Item(RG_MEGATON_HAMMER,                   Text{ "Megaton Hammer", "Masse des Titans", "Stahlhammer" },                                                      ITEMTYPE_ITEM,              GI_HAMMER,          true,  &Logic::Hammer,              RHT_MEGATON_HAMMER,         ITEM_HAMMER,                    OBJECT_GI_HAMMER,       GID_HAMMER,         0x38,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_STONE_OF_AGONY] =                      Item(RG_STONE_OF_AGONY,                   Text{ "Stone of Agony", "Pierre de Souffrance", "Stein der Qualen" },                                             ITEMTYPE_ITEM,              GI_STONE_OF_AGONY,  true,  &Logic::ShardOfAgony,        RHT_STONE_OF_AGONY,         ITEM_STONE_OF_AGONY,            OBJECT_GI_MAP,          GID_STONE_OF_AGONY, 0x68,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_DINS_FIRE] =                           Item(RG_DINS_FIRE,                        Text{ "Din's Fire", "Feu de Din", "Dins Feuerinferno" },                                                          ITEMTYPE_ITEM,              GI_DINS_FIRE,       true,  &Logic::DinsFire,            RHT_DINS_FIRE,              ITEM_DINS_FIRE,                 OBJECT_GI_GODDESS,      GID_DINS_FIRE,      0xAD,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_FARORES_WIND] =                        Item(RG_FARORES_WIND,                     Text{ "Farore's Wind", "Vent de Farore", "Farores Donnersturm" },                                                 ITEMTYPE_ITEM,              GI_FARORES_WIND,    true,  &Logic::FaroresWind,         RHT_FARORES_WIND,           ITEM_FARORES_WIND,              OBJECT_GI_GODDESS,      GID_FARORES_WIND,   0xAE,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_NAYRUS_LOVE] =                         Item(RG_NAYRUS_LOVE,                      Text{ "Nayru's Love", "Amour de Nayru", "Nayrus Umarmung" },                                                      ITEMTYPE_ITEM,              GI_NAYRUS_LOVE,     true,  &Logic::NayrusLove,          RHT_NAYRUS_LOVE,            ITEM_NAYRUS_LOVE,               OBJECT_GI_GODDESS,      GID_NAYRUS_LOVE,    0xAF,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_FIRE_ARROWS] =                         Item(RG_FIRE_ARROWS,                      Text{ "Fire Arrow", "Flèche de Feu", "Feuerpfeile" },                                                             ITEMTYPE_ITEM,              GI_ARROW_FIRE,      true,  &Logic::FireArrows,          RHT_FIRE_ARROWS,            ITEM_ARROW_FIRE,                OBJECT_GI_M_ARROW,      GID_ARROW_FIRE,     0x70,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_ICE_ARROWS] =                          Item(RG_ICE_ARROWS,                       Text{ "Ice Arrow", "Flèche de Glace", "Eispfeil" },                                                               ITEMTYPE_ITEM,              GI_ARROW_ICE,       true,  &Logic::IceArrows,           RHT_ICE_ARROWS,             ITEM_ARROW_ICE,                 OBJECT_GI_M_ARROW,      GID_ARROW_ICE,      0x71,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_LIGHT_ARROWS] =                        Item(RG_LIGHT_ARROWS,                     Text{ "Light Arrow", "Flèche de Lumière", "Lichtpfeil" },                                                         ITEMTYPE_ITEM,              GI_ARROW_LIGHT,     true,  &Logic::LightArrows,         RHT_LIGHT_ARROWS,           ITEM_ARROW_LIGHT,               OBJECT_GI_M_ARROW,      GID_ARROW_LIGHT,    0x72,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_GERUDO_MEMBERSHIP_CARD] =              Item(RG_GERUDO_MEMBERSHIP_CARD,           Text{ "Gerudo Membership Card", "Carte Gerudo", "Gerudo Karte" },                                                 ITEMTYPE_ITEM,              GI_GERUDO_CARD,     true,  &Logic::GerudoToken,         RHT_GERUDO_MEMBERSHIP_CARD, ITEM_GERUDO_CARD,               OBJECT_GI_GERUDO,       GID_GERUDO_CARD,    0x7B,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_MAGIC_BEAN] =                          Item(RG_MAGIC_BEAN,                       Text{ "Magic Bean", "Haricots Magiques", "Wundererbse" },                                                         ITEMTYPE_ITEM,              GI_BEAN,            true,  &Logic::MagicBean,           RHT_MAGIC_BEAN,             ITEM_BEAN,                      OBJECT_GI_BEAN,         GID_BEAN,           0x48,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_MAGIC_BEAN_PACK] =                     Item(RG_MAGIC_BEAN_PACK,                  Text{ "Magic Bean Pack", "Paquet de Haricots Magiques", "Wundererbsen-Packung" },                                 ITEMTYPE_ITEM,              RG_MAGIC_BEAN_PACK, true,  &Logic::MagicBeanPack,       RHT_MAGIC_BEAN_PACK,        RG_MAGIC_BEAN_PACK,             OBJECT_GI_BEAN,         GID_BEAN,           TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_DOUBLE_DEFENSE] =                      Item(RG_DOUBLE_DEFENSE,                   Text{ "Double Defense", "Double Défence", "Doppelte Verteidigung" },                                              ITEMTYPE_ITEM,              RG_DOUBLE_DEFENSE,  true,  &Logic::DoubleDefense,       RHT_DOUBLE_DEFENSE,         RG_DOUBLE_DEFENSE,              OBJECT_GI_HEARTS,       GID_HEART_CONTAINER,0xE9,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_DOUBLE_DEFENSE].SetCustomDrawFunc(Randomizer_DrawDoubleDefense);
+    // Trade Quest Items
+    itemTable[RG_WEIRD_EGG] =                           Item(RG_WEIRD_EGG,                        Text{ "Weird Egg", "Oeuf Curieux", "Seltsames Ei" },                                                              ITEMTYPE_ITEM,              GI_WEIRD_EGG,       true,  &Logic::WeirdEgg,            RHT_WEIRD_EGG,              ITEM_WEIRD_EGG,                 OBJECT_GI_EGG,          GID_EGG,            0x9A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_ZELDAS_LETTER] =                       Item(RG_ZELDAS_LETTER,                    Text{ "Zelda's Letter", "Lettre de Zelda", "Zeldas Brief" },                                                      ITEMTYPE_ITEM,              GI_LETTER_ZELDA,    true,  &Logic::ZeldasLetter,        RHT_ZELDAS_LETTER,          ITEM_LETTER_ZELDA,              OBJECT_GI_LETTER,       GID_LETTER_ZELDA,   0x69,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_POCKET_EGG] =                          Item(RG_POCKET_EGG,                       Text{ "Pocket Egg", "Oeuf de poche", "Taschenei" },                                                               ITEMTYPE_ITEM,              GI_POCKET_EGG,      true,  &Logic::PocketEgg,           RHT_POCKET_EGG,             ITEM_POCKET_EGG,                OBJECT_GI_EGG,          GID_EGG,            0x01,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_COJIRO] =                              Item(RG_COJIRO,                           Text{ "Cojiro", "P'tit Poulet", "Cojiro" },                                                                       ITEMTYPE_ITEM,              GI_COJIRO,          true,  &Logic::Cojiro,              RHT_COJIRO,                 ITEM_COJIRO,                    OBJECT_GI_NIWATORI,     GID_COJIRO,         0x02,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_ODD_MUSHROOM] =                        Item(RG_ODD_MUSHROOM,                     Text{ "Odd Mushroom", "Champigon Suspect", "Seltsamer Pilz" },                                                    ITEMTYPE_ITEM,              GI_ODD_MUSHROOM,    true,  &Logic::OddMushroom,         RHT_ODD_MUSHROOM,           ITEM_ODD_MUSHROOM,              OBJECT_GI_MUSHROOM,     GID_ODD_MUSHROOM,   0x03,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_ODD_POTION] =                          Item(RG_ODD_POTION,                       Text{ "Odd Potion", "Mixture Suspecte", "Seltsamer Trank" },                                                      ITEMTYPE_ITEM,              GI_ODD_POTION,      true,  &Logic::OddPoultice,         RHT_ODD_POTION,             ITEM_ODD_POTION,                OBJECT_GI_POWDER,       GID_ODD_POTION,     0x04,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_POACHERS_SAW] =                        Item(RG_POACHERS_SAW,                     Text{ "Poacher's Saw", "Scie du Chasseur", "Wilderer-Säge" },                                                     ITEMTYPE_ITEM,              GI_SAW,             true,  &Logic::PoachersSaw,         RHT_POACHERS_SAW,           ITEM_SAW,                       OBJECT_GI_SAW,          GID_SAW,            0x05,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BROKEN_SWORD] =                        Item(RG_BROKEN_SWORD,                     Text{ "Broken Goron's Sword", "Épée Brisée de Goron", "Schwert des gebrochenen Goronen" },                        ITEMTYPE_ITEM,              GI_SWORD_BROKEN,    true,  &Logic::BrokenSword,         RHT_BROKEN_SWORD,           ITEM_SWORD_BROKEN,              OBJECT_GI_BROKENSWORD,  GID_SWORD_BROKEN,   0x08,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_PRESCRIPTION] =                        Item(RG_PRESCRIPTION,                     Text{ "Prescription", "Ordonnance", "Verschreibung" },                                                            ITEMTYPE_ITEM,              GI_PRESCRIPTION,    true,  &Logic::Prescription,        RHT_PRESCRIPTION,           ITEM_PRESCRIPTION,              OBJECT_GI_PRESCRIPTION, GID_PRESCRIPTION,   0x09,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_EYEBALL_FROG] =                        Item(RG_EYEBALL_FROG,                     Text{ "Eyeball Frog", "Crapaud-qui-louche", "Augapfel-Frosch" },                                                  ITEMTYPE_ITEM,              GI_FROG,            true,  &Logic::EyeballFrog,         RHT_EYEBALL_FROG,           ITEM_FROG,                      OBJECT_GI_FROG,         GID_FROG,           0x0D,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_EYEDROPS] =                            Item(RG_EYEDROPS,                         Text{ "World's Finest Eyedrops", "Super Gouttes", "Supertropfen" },                                               ITEMTYPE_ITEM,              GI_EYEDROPS,        true,  &Logic::Eyedrops,            RHT_EYEDROPS,               ITEM_EYEDROPS,                  OBJECT_GI_EYE_LOTION,   GID_EYEDROPS,       0x0E,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_CLAIM_CHECK] =                         Item(RG_CLAIM_CHECK,                      Text{ "Claim Check", "Certificat", "Quittung" },                                                                  ITEMTYPE_ITEM,              GI_CLAIM_CHECK,     true,  &Logic::ClaimCheck,          RHT_CLAIM_CHECK,            ITEM_CLAIM_CHECK,               OBJECT_GI_TICKETSTONE,  GID_CLAIM_CHECK,    0x0A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    // Skulltula Token
+    itemTable[RG_GOLD_SKULLTULA_TOKEN] =                Item(RG_GOLD_SKULLTULA_TOKEN,             Text{ "Gold Skulltula Token", "Symbole de Skulltula d'Or", "Goldenes Skulltula-Symbol" },                         ITEMTYPE_TOKEN,             GI_SKULL_TOKEN,     true,  &Logic::GoldSkulltulaTokens, RHT_GOLD_SKULLTULA_TOKEN,   ITEM_SKULL_TOKEN,               OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    0xB4,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SKULLTULA_TOKEN, MOD_NONE);
+    // Progressive Items
+    itemTable[RG_PROGRESSIVE_HOOKSHOT] =                Item(RG_PROGRESSIVE_HOOKSHOT,             Text{ "Progressive Hookshot", "Grappin (prog.)", "Progressiver Fanghaken" },                                      ITEMTYPE_ITEM,              0x80,               true,  &Logic::ProgressiveHookshot, RHT_PROGRESSIVE_HOOKSHOT, true);
+    itemTable[RG_PROGRESSIVE_STRENGTH] =                Item(RG_PROGRESSIVE_STRENGTH,             Text{ "Strength Upgrade", "Amélioration de Force (prog.)", "Progressives Kraft-Upgrade" },                        ITEMTYPE_ITEM,              0x81,               true,  &Logic::ProgressiveStrength, RHT_PROGRESSIVE_STRENGTH, true);
+    itemTable[RG_PROGRESSIVE_BOMB_BAG] =                Item(RG_PROGRESSIVE_BOMB_BAG,             Text{ "Progressive Bomb Bag", "Sac de Bombes (prog.)", "Progressive Bombentasche" },                              ITEMTYPE_ITEM,              0x82,               true,  &Logic::ProgressiveBombBag,  RHT_PROGRESSIVE_BOMB_BAG, true);
+    itemTable[RG_PROGRESSIVE_BOW] =                     Item(RG_PROGRESSIVE_BOW,                  Text{ "Progressive Bow", "Arc (prog.)", "Progressiver Bogen" },                                                   ITEMTYPE_ITEM,              0x83,               true,  &Logic::ProgressiveBow,      RHT_PROGRESSIVE_BOW, true);
+    itemTable[RG_PROGRESSIVE_SLINGSHOT] =               Item(RG_PROGRESSIVE_SLINGSHOT,            Text{ "Progressive Slingshot", "Lance-Pierre (prog.)", "Progressive Steinschleuder" },                            ITEMTYPE_ITEM,              0x84,               true,  &Logic::ProgressiveBulletBag,RHT_PROGRESSIVE_SLINGSHOT, true);
+    itemTable[RG_PROGRESSIVE_WALLET] =                  Item(RG_PROGRESSIVE_WALLET,               Text{ "Progressive Wallet", "Bourse (prog.)", "Progressive Brieftasche" },                                        ITEMTYPE_ITEM,              0x85,               true,  &Logic::ProgressiveWallet,   RHT_PROGRESSIVE_WALLET, true);
+    itemTable[RG_PROGRESSIVE_SCALE] =                   Item(RG_PROGRESSIVE_SCALE,                Text{ "Progressive Scale", "Écaille (prog.)", "Progressive Skala" },                                              ITEMTYPE_ITEM,              0x86,               true,  &Logic::ProgressiveScale,    RHT_PROGRESSIVE_SCALE, true);
+    itemTable[RG_PROGRESSIVE_NUT_UPGRADE] =             Item(RG_PROGRESSIVE_NUT_UPGRADE,          Text{ "Progressive Nut Capacity", "Capacité de Noix (prog.)", "Progressive Nusskapazität" },                      ITEMTYPE_ITEM,              0x87,               false, &Logic::noVariable,          RHT_PROGRESSIVE_NUT_UPGRADE, true);
+    itemTable[RG_PROGRESSIVE_STICK_UPGRADE] =           Item(RG_PROGRESSIVE_STICK_UPGRADE,        Text{ "Progressive Stick Capacity", "Capacité de Bâtons (prog.)", "Progressive Stick-Kapazität" },                ITEMTYPE_ITEM,              0x88,               false, &Logic::noVariable,          RHT_PROGRESSIVE_STICK_UPGRADE, true);
+    itemTable[RG_PROGRESSIVE_BOMBCHUS] =                Item(RG_PROGRESSIVE_BOMBCHUS,             Text{ "Progressive Bombchu", "Missiles (prog.)", "Progressive Kriechgrube" },                                     ITEMTYPE_ITEM,              0x89,               true,  &Logic::Bombchus,            RHT_PROGRESSIVE_BOMBCHUS,   RG_PROGRESSIVE_BOMBCHUS,        OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER, true);
+    itemTable[RG_PROGRESSIVE_MAGIC_METER] =             Item(RG_PROGRESSIVE_MAGIC_METER,          Text{ "Progressive Magic Meter", "Jauge de Magie (prog.)", "Progressives magisches Messgerät" },                  ITEMTYPE_ITEM,              0x8A,               true,  &Logic::ProgressiveMagic,    RHT_PROGRESSIVE_MAGIC_METER, true);
+    itemTable[RG_PROGRESSIVE_OCARINA] =                 Item(RG_PROGRESSIVE_OCARINA,              Text{ "Progressive Ocarina", "Ocarina (prog.)", "Progressive Okarina" },                                          ITEMTYPE_ITEM,              0x8B,               true,  &Logic::ProgressiveOcarina,  RHT_PROGRESSIVE_OCARINA, true);
+    itemTable[RG_PROGRESSIVE_GORONSWORD] =              Item(RG_PROGRESSIVE_GORONSWORD,           Text{ "Progressive Goron Sword", "Épée Goron (prog.)", "Progressives Goronenschwert" },                           ITEMTYPE_ITEM,              0xD4,               true,  &Logic::ProgressiveGiantKnife,RHT_PROGRESSIVE_GORONSWORD, true);
+    // Bottles
+    itemTable[RG_EMPTY_BOTTLE] =                        Item(RG_EMPTY_BOTTLE,                     Text{ "Empty Bottle", "Bouteille Vide", "Leere Flasche" },                                                        ITEMTYPE_ITEM,              GI_BOTTLE,          true,  &Logic::Bottles,             RHT_BOTTLE_WITH_MILK,       ITEM_BOTTLE,                    OBJECT_GI_BOTTLE,       GID_BOTTLE,         0x42,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BOTTLE_WITH_MILK] =                    Item(RG_BOTTLE_WITH_MILK,                 Text{ "Bottle with Milk", "Bouteille avec du Lait", "Flasche mit Milch" },                                        ITEMTYPE_ITEM,              GI_MILK_BOTTLE,     true,  &Logic::Bottles,             RHT_BOTTLE_WITH_MILK,       ITEM_MILK_BOTTLE,               OBJECT_GI_MILK,         GID_MILK,           0x98,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BOTTLE_WITH_RED_POTION] =              Item(RG_BOTTLE_WITH_RED_POTION,           Text{ "Bottle with Red Potion", "Bouteille avec une Potion Rouge", "Flasche mit rotem Elixier" },                 ITEMTYPE_ITEM,              0x8C,               true,  &Logic::Bottles,             RHT_BOTTLE_WITH_RED_POTION, RG_BOTTLE_WITH_RED_POTION,      OBJECT_GI_LIQUID,       GID_POTION_RED,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BOTTLE_WITH_GREEN_POTION] =            Item(RG_BOTTLE_WITH_GREEN_POTION,         Text{ "Bottle with Green Potion", "Bouteille avec une Potion Verte", "Flasche mit grünem Elixier" },              ITEMTYPE_ITEM,              0x8D,               true,  &Logic::Bottles,             RHT_BOTTLE_WITH_GREEN_POTION,RG_BOTTLE_WITH_GREEN_POTION,   OBJECT_GI_LIQUID,       GID_POTION_GREEN,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BOTTLE_WITH_BLUE_POTION] =             Item(RG_BOTTLE_WITH_BLUE_POTION,          Text{ "Bottle with Blue Potion", "Bouteille avec une Potion Bleue", "Flasche mit blauem Elixier" },               ITEMTYPE_ITEM,              0x8E,               true,  &Logic::Bottles,             RHT_BOTTLE_WITH_BLUE_POTION,RG_BOTTLE_WITH_BLUE_POTION,     OBJECT_GI_LIQUID,       GID_POTION_BLUE,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BOTTLE_WITH_FAIRY] =                   Item(RG_BOTTLE_WITH_FAIRY,                Text{ "Bottle with Fairy", "Bouteille avec une Fée", "Flasche mit Fee" },                                         ITEMTYPE_ITEM,              0x8F,               true,  &Logic::Bottles,             RHT_BOTTLE_WITH_FAIRY,      RG_BOTTLE_WITH_FAIRY,           OBJECT_GI_BOTTLE,       GID_BOTTLE,         TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BOTTLE_WITH_FISH] =                    Item(RG_BOTTLE_WITH_FISH,                 Text{ "Bottle with Fish", "Bouteille avec un Poisson", "Flasche mit Fisch" },                                     ITEMTYPE_ITEM,              0x90,               true,  &Logic::Bottles,             RHT_BOTTLE_WITH_FISH,       RG_BOTTLE_WITH_FISH,            OBJECT_GI_FISH,         GID_FISH,           TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BOTTLE_WITH_BLUE_FIRE] =               Item(RG_BOTTLE_WITH_BLUE_FIRE,            Text{ "Bottle with Blue Fire", "Bouteille avec une Flamme Bleue", "Flasche mit blauem Feuer" },                   ITEMTYPE_ITEM,              0x91,               true,  &Logic::Bottles,             RHT_BOTTLE_WITH_BLUE_FIRE,  RG_BOTTLE_WITH_BLUE_FIRE,       OBJECT_GI_FIRE,         GID_BLUE_FIRE,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BOTTLE_WITH_BUGS] =                    Item(RG_BOTTLE_WITH_BUGS,                 Text{ "Bottle with Bugs", "Bouteille avec des Insectes", "Flasche mit Wanzen" },                                  ITEMTYPE_ITEM,              0x92,               true,  &Logic::Bottles,             RHT_BOTTLE_WITH_BUGS,       RG_BOTTLE_WITH_BUGS,            OBJECT_GI_INSECT,       GID_BUG,            TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BOTTLE_WITH_POE] =                     Item(RG_BOTTLE_WITH_POE,                  Text{ "Bottle with Poe", "Bouteille avec un Esprit", "Flasche mit einem Geist" },                                 ITEMTYPE_ITEM,              0x94,               true,  &Logic::Bottles,             RHT_BOTTLE_WITH_POE,        RG_BOTTLE_WITH_POE,             OBJECT_GI_GHOST,        GID_POE,            TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_RUTOS_LETTER] =                        Item(RG_RUTOS_LETTER,                     Text{ "Bottle with Ruto's Letter", "Bouteille avec la Lettre de Ruto", "Flasche mit Rutos Brief" },               ITEMTYPE_ITEM,              GI_LETTER_RUTO,     true,  &Logic::RutosLetter,         RHT_RUTOS_LETTER,           ITEM_LETTER_RUTO,               OBJECT_GI_BOTTLE_LETTER,GID_LETTER_RUTO,    0x99,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BOTTLE_WITH_BIG_POE] =                 Item(RG_BOTTLE_WITH_BIG_POE,              Text{ "Bottle with Big Poe", "Bouteille avec une Âme", "Flasche mit Seele" },                                     ITEMTYPE_ITEM,              0x93,               true,  &Logic::BottleWithBigPoe,    RHT_BOTTLE_WITH_BIG_POE,    RG_BOTTLE_WITH_BIG_POE,         OBJECT_GI_GHOST,        GID_BIG_POE,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    // Songs
+    itemTable[RG_ZELDAS_LULLABY] =                      Item(RG_ZELDAS_LULLABY,                   Text{ "Zelda's Lullaby", "Berceuse de Zelda", "Zeldas Wiegenlied" },                                              ITEMTYPE_SONG,              0xC1,               true,  &Logic::ZeldasLullaby,       RHT_ZELDAS_LULLABY,         ITEM_SONG_LULLABY,              OBJECT_GI_MELODY,       GID_SONG_ZELDA,     0xD4,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_EPONAS_SONG] =                         Item(RG_EPONAS_SONG,                      Text{ "Epona's Song", "Chant d'Epona", "Eponas Lied" },                                                           ITEMTYPE_SONG,              0xC2,               true,  &Logic::EponasSong,          RHT_EPONAS_SONG,            ITEM_SONG_EPONA,                OBJECT_GI_MELODY,       GID_SONG_EPONA,     0xD2,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_SARIAS_SONG] =                         Item(RG_SARIAS_SONG,                      Text{ "Saria's Song", "Chant de Saria", "Sarias Lied" },                                                          ITEMTYPE_SONG,              0xC3,               true,  &Logic::SariasSong,          RHT_SARIAS_SONG,            ITEM_SONG_SARIA,                OBJECT_GI_MELODY,       GID_SONG_SARIA,     0xD1,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_SUNS_SONG] =                           Item(RG_SUNS_SONG,                        Text{ "Sun's Song", "Chant du Soleil", "Das Lied der Sonne" },                                                    ITEMTYPE_SONG,              0xC4,               true,  &Logic::SunsSong,            RHT_SUNS_SONG,              ITEM_SONG_SUN,                  OBJECT_GI_MELODY,       GID_SONG_SUN,       0xD3,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_SONG_OF_TIME] =                        Item(RG_SONG_OF_TIME,                     Text{ "Song of Time", "Chant du Temps", "Das Lied der Zeit" },                                                    ITEMTYPE_SONG,              0xC5,               true,  &Logic::SongOfTime,          RHT_SONG_OF_TIME,           ITEM_SONG_TIME,                 OBJECT_GI_MELODY,       GID_SONG_TIME,      0xD5,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_SONG_OF_STORMS] =                      Item(RG_SONG_OF_STORMS,                   Text{ "Song of Storms", "Chant des Tempêtes", "Lied der Stürme" },                                                ITEMTYPE_SONG,              0xC6,               true,  &Logic::SongOfStorms,        RHT_SONG_OF_STORMS,         ITEM_SONG_STORMS,               OBJECT_GI_MELODY,       GID_SONG_STORM,     0xD6,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_MINUET_OF_FOREST] =                    Item(RG_MINUET_OF_FOREST,                 Text{ "Minuet of Forest", "Menuet des Bois", "Wald-Minuett" },                                                    ITEMTYPE_SONG,              0xBB,               true,  &Logic::MinuetOfForest,      RHT_MINUET_OF_FOREST,       ITEM_SONG_MINUET,               OBJECT_GI_MELODY,       GID_SONG_MINUET,    0x73,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BOLERO_OF_FIRE] =                      Item(RG_BOLERO_OF_FIRE,                   Text{ "Bolero of Fire", "Boléro du Feu", "Bolero des Feuers" },                                                   ITEMTYPE_SONG,              0xBC,               true,  &Logic::BoleroOfFire,        RHT_BOLERO_OF_FIRE,         ITEM_SONG_BOLERO,               OBJECT_GI_MELODY,       GID_SONG_BOLERO,    0x74,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_SERENADE_OF_WATER] =                   Item(RG_SERENADE_OF_WATER,                Text{ "Serenade of Water", "Sérénade de l'Eau", "Serenade des Wassers" },                                         ITEMTYPE_SONG,              0xBD,               true,  &Logic::SerenadeOfWater,     RHT_SERENADE_OF_WATER,      ITEM_SONG_SERENADE,             OBJECT_GI_MELODY,       GID_SONG_SERENADE,  0x75,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_NOCTURNE_OF_SHADOW] =                  Item(RG_NOCTURNE_OF_SHADOW,               Text{ "Nocturne of Shadow", "Nocturne de l'Ombre", "Nocturne der Schatten " },                                    ITEMTYPE_SONG,              0xBF,               true,  &Logic::NocturneOfShadow,    RHT_NOCTURNE_OF_SHADOW,     ITEM_SONG_NOCTURNE,             OBJECT_GI_MELODY,       GID_SONG_NOCTURNE,  0x77,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_REQUIEM_OF_SPIRIT] =                   Item(RG_REQUIEM_OF_SPIRIT,                Text{ "Requiem of Spirit", "Requiem des Esprits", "Requiem des Geistes" },                                        ITEMTYPE_SONG,              0xBE,               true,  &Logic::RequiemOfSpirit,     RHT_REQUIEM_OF_SPIRIT,      ITEM_SONG_REQUIEM,              OBJECT_GI_MELODY,       GID_SONG_REQUIEM,   0x76,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_PRELUDE_OF_LIGHT] =                    Item(RG_PRELUDE_OF_LIGHT,                 Text{ "Prelude of Light", "Prélude de la Lumière", "Präludium des Lichts" },                                      ITEMTYPE_SONG,              0xC0,               true,  &Logic::PreludeOfLight,      RHT_PRELUDE_OF_LIGHT,       ITEM_SONG_PRELUDE,              OBJECT_GI_MELODY,       GID_SONG_PRELUDE,   0x78,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    // Maps and Compasses
+    itemTable[RG_DEKU_TREE_MAP] =                       Item(RG_DEKU_TREE_MAP,                    Text{ "Great Deku Tree Map", "Carte de l'Arbre Mojo", "Karte des Deku-Baums" },                                   ITEMTYPE_MAP,               0xA5,               false, &Logic::noVariable,          RHT_DEKU_TREE_MAP,          RG_DEKU_TREE_MAP,               OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_DODONGOS_CAVERN_MAP] =                 Item(RG_DODONGOS_CAVERN_MAP,              Text{ "Dodongo's Cavern Map", "Carte de la Caverne Dodongo", "Karte der Dodongo-Höhle" },                         ITEMTYPE_MAP,               0xA6,               false, &Logic::noVariable,          RHT_DODONGOS_CAVERN_MAP,    RG_DODONGOS_CAVERN_MAP,         OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_JABU_JABUS_BELLY_MAP] =                Item(RG_JABU_JABUS_BELLY_MAP,             Text{ "Jabu-Jabu's Belly Map", "Carte du Ventre de Jabu-Jabu", "Karte des Jabu-Jabu-Bauchs" },                    ITEMTYPE_MAP,               0xA7,               false, &Logic::noVariable,          RHT_JABU_JABUS_BELLY_MAP,   RG_JABU_JABUS_BELLY_MAP,        OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_FOREST_TEMPLE_MAP] =                   Item(RG_FOREST_TEMPLE_MAP,                Text{ "Forest Temple Map", "Carte du Temple de la Forêt", "Waldtempel Karte" },                                   ITEMTYPE_MAP,               0xA8,               false, &Logic::noVariable,          RHT_FOREST_TEMPLE_MAP,      RG_FOREST_TEMPLE_MAP,           OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_FIRE_TEMPLE_MAP] =                     Item(RG_FIRE_TEMPLE_MAP,                  Text{ "Fire Temple Map", "Carte due Temple de Feu", "Feuertempel Karte" },                                        ITEMTYPE_MAP,               0xA9,               false, &Logic::noVariable,          RHT_FIRE_TEMPLE_MAP,        RG_FIRE_TEMPLE_MAP,             OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_WATER_TEMPLE_MAP] =                    Item(RG_WATER_TEMPLE_MAP,                 Text{ "Water Temple Map", "Carte du Temple de l'Eau", "Wassertempel-Karte" },                                     ITEMTYPE_MAP,               0xAA,               false, &Logic::noVariable,          RHT_WATER_TEMPLE_MAP,       RG_WATER_TEMPLE_MAP,            OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_SPIRIT_TEMPLE_MAP] =                   Item(RG_SPIRIT_TEMPLE_MAP,                Text{ "Spirit Temple Map", "Carte due Temple de l'Esprit", "Geistertempel Karte" },                               ITEMTYPE_MAP,               0xAB,               false, &Logic::noVariable,          RHT_SPIRIT_TEMPLE_MAP,      RG_SPIRIT_TEMPLE_MAP,           OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_SHADOW_TEMPLE_MAP] =                   Item(RG_SHADOW_TEMPLE_MAP,                Text{ "Shadow Temple Map", "Carte du Temple de l'Ombre", "Karte des Schattentempels" },                           ITEMTYPE_MAP,               0xAC,               false, &Logic::noVariable,          RHT_SHADOW_TEMPLE_MAP,      RG_SHADOW_TEMPLE_MAP,           OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_BOTTOM_OF_THE_WELL_MAP] =              Item(RG_BOTTOM_OF_THE_WELL_MAP,           Text{ "Bottom of the Well Map", "Carte du Puits", "Boden des Brunnens Karte" },                                   ITEMTYPE_MAP,               0xAD,               false, &Logic::noVariable,          RHT_BOTTOM_OF_THE_WELL_MAP, RG_BOTTOM_OF_THE_WELL_MAP,      OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_ICE_CAVERN_MAP] =                      Item(RG_ICE_CAVERN_MAP,                   Text{ "Ice Cavern Map", "Carte de la Caverne Polaire", "Eishöhle Karte" },                                        ITEMTYPE_MAP,               0xAE,               false, &Logic::noVariable,          RHT_ICE_CAVERN_MAP,         RG_ICE_CAVERN_MAP,              OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_DEKU_TREE_COMPASS] =                   Item(RG_DEKU_TREE_COMPASS,                Text{ "Great Deku Tree Compass", "Boussole de l'Arbre Mojo", "Kompass des Deku-Baums" },                          ITEMTYPE_COMPASS,           0x9B,               false, &Logic::noVariable,          RHT_DEKU_TREE_COMPASS,      RG_DEKU_TREE_COMPASS,           OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_DODONGOS_CAVERN_COMPASS] =             Item(RG_DODONGOS_CAVERN_COMPASS,          Text{ "Dodongo's Cavern Compass", "Boussole de la Caverne Dodongo", "Kompass der Dodongo-Höhle" },                ITEMTYPE_COMPASS,           0x9C,               false, &Logic::noVariable,          RHT_DODONGOS_CAVERN_COMPASS,RG_DODONGOS_CAVERN_COMPASS,     OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_JABU_JABUS_BELLY_COMPASS] =            Item(RG_JABU_JABUS_BELLY_COMPASS,         Text{ "Jabu-Jabu's Belly Compass", "Boussole du Ventre de Jabu-Jabu", "Kompass des Jabu-Jabu-Bauchs" },           ITEMTYPE_COMPASS,           0x9D,               false, &Logic::noVariable,          RHT_JABU_JABUS_BELLY_COMPASS,RG_JABU_JABUS_BELLY_COMPASS,   OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_FOREST_TEMPLE_COMPASS] =               Item(RG_FOREST_TEMPLE_COMPASS,            Text{ "Forest Temple Compass", "Boussole du Temple de la Forêt", "Waldtempel-Kompass" },                          ITEMTYPE_COMPASS,           0x9E,               false, &Logic::noVariable,          RHT_FOREST_TEMPLE_COMPASS,  RG_FOREST_TEMPLE_COMPASS,       OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_FIRE_TEMPLE_COMPASS] =                 Item(RG_FIRE_TEMPLE_COMPASS,              Text{ "Fire Temple Compass", "Boussole du Temple du Feu", "Feuertempel-Kompass" },                                ITEMTYPE_COMPASS,           0x9F,               false, &Logic::noVariable,          RHT_FIRE_TEMPLE_COMPASS,    RG_FIRE_TEMPLE_COMPASS,         OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_WATER_TEMPLE_COMPASS] =                Item(RG_WATER_TEMPLE_COMPASS,             Text{ "Water Temple Compass", "Boussole du Temple de l'Eau", "Wassertempel-Kompass" },                            ITEMTYPE_COMPASS,           0xA0,               false, &Logic::noVariable,          RHT_WATER_TEMPLE_COMPASS,   RG_WATER_TEMPLE_COMPASS,        OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_SPIRIT_TEMPLE_COMPASS] =               Item(RG_SPIRIT_TEMPLE_COMPASS,            Text{ "Spirit Temple Compass", "Boussole due Temple de l'Esprit", "Geistiger Tempelkompass" },                    ITEMTYPE_COMPASS,           0xA1,               false, &Logic::noVariable,          RHT_SPIRIT_TEMPLE_COMPASS,  RG_SPIRIT_TEMPLE_COMPASS,       OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_SHADOW_TEMPLE_COMPASS] =               Item(RG_SHADOW_TEMPLE_COMPASS,            Text{ "Shadow Temple Compass", "Boussole du Temple de l'Ombre", "Kompass des Schattentempels" },                  ITEMTYPE_COMPASS,           0xA2,               false, &Logic::noVariable,          RHT_SHADOW_TEMPLE_COMPASS,  RG_SHADOW_TEMPLE_COMPASS,       OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_BOTTOM_OF_THE_WELL_COMPASS] =          Item(RG_BOTTOM_OF_THE_WELL_COMPASS,       Text{ "Bottom of the Well Compass", "Boussole du Puits", "Boden des Brunnenkompasses" },                          ITEMTYPE_COMPASS,           0xA3,               false, &Logic::noVariable,          RHT_BOTTOM_OF_THE_WELL_COMPASS,RG_BOTTOM_OF_THE_WELL_COMPASS,OBJECT_GI_COMPASS,     GID_COMPASS,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_ICE_CAVERN_COMPASS] =                  Item(RG_ICE_CAVERN_COMPASS,               Text{ "Ice Cavern Compass", "Boussole de la Caverne Polaire", "Eishöhlenkompass" },                               ITEMTYPE_COMPASS,           0xA4,               false, &Logic::noVariable,          RHT_ICE_CAVERN_COMPASS,     RG_ICE_CAVERN_COMPASS,          OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    // Boss Keys
+    itemTable[RG_FOREST_TEMPLE_BOSS_KEY] =              Item(RG_FOREST_TEMPLE_BOSS_KEY,           Text{ "Forest Temple Boss Key", "Clé d'Or du Temple de la Forêt", "Waldtempel-Boss-Schlüssel" },                  ITEMTYPE_BOSSKEY,           0x95,               true,  &Logic::BossKeyForestTemple, RHT_FOREST_TEMPLE_BOSS_KEY, RG_FOREST_TEMPLE_BOSS_KEY,      OBJECT_GI_BOSSKEY,      GID_KEY_BOSS,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
+    itemTable[RG_FOREST_TEMPLE_BOSS_KEY].SetCustomDrawFunc(Randomizer_DrawBossKey);
+    itemTable[RG_FIRE_TEMPLE_BOSS_KEY] =                Item(RG_FIRE_TEMPLE_BOSS_KEY,             Text{ "Fire Temple Boss Key", "Clé d'Or du Temple du Feu", "Feuertempel-Boss-Schlüssel" },                        ITEMTYPE_BOSSKEY,           0x96,               true,  &Logic::BossKeyFireTemple,   RHT_FIRE_TEMPLE_BOSS_KEY,   RG_FIRE_TEMPLE_BOSS_KEY,        OBJECT_GI_BOSSKEY,      GID_KEY_BOSS,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
+    itemTable[RG_FIRE_TEMPLE_BOSS_KEY].SetCustomDrawFunc(Randomizer_DrawBossKey);
+    itemTable[RG_WATER_TEMPLE_BOSS_KEY] =               Item(RG_WATER_TEMPLE_BOSS_KEY,            Text{ "Water Temple Boss Key", "Clé d'Or du Temple de l'Eau", "Wassertempel-Boss-Schlüssel" },                    ITEMTYPE_BOSSKEY,           0x97,               true,  &Logic::BossKeyWaterTemple,  RHT_WATER_TEMPLE_BOSS_KEY,  RG_WATER_TEMPLE_BOSS_KEY,       OBJECT_GI_BOSSKEY,      GID_KEY_BOSS,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
+    itemTable[RG_WATER_TEMPLE_BOSS_KEY].SetCustomDrawFunc(Randomizer_DrawBossKey);
+    itemTable[RG_SPIRIT_TEMPLE_BOSS_KEY] =              Item(RG_SPIRIT_TEMPLE_BOSS_KEY,           Text{ "Spirit Temple Boss Key", "Clé d'Or du Temple de l'Esprit", "Geistertempel-Boss-Schlüssel" },               ITEMTYPE_BOSSKEY,           0x98,               true,  &Logic::BossKeySpiritTemple, RHT_SPIRIT_TEMPLE_BOSS_KEY, RG_SPIRIT_TEMPLE_BOSS_KEY,      OBJECT_GI_BOSSKEY,      GID_KEY_BOSS,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
+    itemTable[RG_SPIRIT_TEMPLE_BOSS_KEY].SetCustomDrawFunc(Randomizer_DrawBossKey);
+    itemTable[RG_SHADOW_TEMPLE_BOSS_KEY] =              Item( RG_SHADOW_TEMPLE_BOSS_KEY,          Text{ "Shadow Temple Boss Key", "Clé d'Or du Temple de l'Ombre", "Schlüssel für den Boss des Schattentempels" },  ITEMTYPE_BOSSKEY,           0x99,               true,  &Logic::BossKeyShadowTemple, RHT_SHADOW_TEMPLE_BOSS_KEY, RG_SHADOW_TEMPLE_BOSS_KEY,      OBJECT_GI_BOSSKEY,      GID_KEY_BOSS,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
+    itemTable[RG_SHADOW_TEMPLE_BOSS_KEY].SetCustomDrawFunc(Randomizer_DrawBossKey);
+    itemTable[RG_GANONS_CASTLE_BOSS_KEY] =              Item(RG_GANONS_CASTLE_BOSS_KEY,           Text{ "Ganon's Castle Boss Key", "Clé d'Or du Château de Ganon", "Ganons Schloss-Boss-Schlüssel" },               ITEMTYPE_BOSSKEY,           0x9A,               true,  &Logic::BossKeyGanonsCastle, RHT_GANONS_CASTLE_BOSS_KEY, RG_GANONS_CASTLE_BOSS_KEY,      OBJECT_GI_BOSSKEY,      GID_KEY_BOSS,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
+    itemTable[RG_GANONS_CASTLE_BOSS_KEY].SetCustomDrawFunc(Randomizer_DrawBossKey);
+    itemTable[RG_FOREST_TEMPLE_SMALL_KEY] =             Item(RG_FOREST_TEMPLE_SMALL_KEY,          Text{ "Forest Temple Small Key", "Petite Clé du Temple de la Forêt", "Waldtempel Kleiner Schlüssel" },            ITEMTYPE_SMALLKEY,          0xAF,               true,  &Logic::ForestTempleKeys,    RHT_FOREST_TEMPLE_SMALL_KEY,RG_FOREST_TEMPLE_SMALL_KEY,     OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_FOREST_TEMPLE_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
+    itemTable[RG_FIRE_TEMPLE_SMALL_KEY] =               Item(RG_FIRE_TEMPLE_SMALL_KEY,            Text{ "Fire Temple Small Key", "Petite Clé du Temple du Feu", "Feuertempel Kleiner Schlüssel" },                  ITEMTYPE_SMALLKEY,          0xB0,               true,  &Logic::FireTempleKeys,      RHT_FIRE_TEMPLE_SMALL_KEY,  RG_FIRE_TEMPLE_SMALL_KEY,       OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_FIRE_TEMPLE_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
+    itemTable[RG_WATER_TEMPLE_SMALL_KEY] =              Item(RG_WATER_TEMPLE_SMALL_KEY,           Text{ "Water Temple Small Key", "Petite Clé du Temple de l'Eau", "Wassertempel Kleiner Schlüssel" },              ITEMTYPE_SMALLKEY,          0xB1,               true,  &Logic::WaterTempleKeys,     RHT_WATER_TEMPLE_SMALL_KEY, RG_WATER_TEMPLE_SMALL_KEY,      OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_WATER_TEMPLE_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
+    itemTable[RG_SPIRIT_TEMPLE_SMALL_KEY] =             Item(RG_SPIRIT_TEMPLE_SMALL_KEY,          Text{ "Spirit Temple Small Key", "Petite Clé du Temple de l'Esprit", "Geisttempel Kleiner Schlüssel" },           ITEMTYPE_SMALLKEY,          0xB2,               true,  &Logic::SpiritTempleKeys,    RHT_SPIRIT_TEMPLE_SMALL_KEY,RG_SPIRIT_TEMPLE_SMALL_KEY,     OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_SPIRIT_TEMPLE_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
+    itemTable[RG_SHADOW_TEMPLE_SMALL_KEY] =             Item(RG_SHADOW_TEMPLE_SMALL_KEY,          Text{ "Shadow Temple Small Key", "Petite Clé du Temple de l'Ombre", "Schattentempel Kleiner Schlüssel" },         ITEMTYPE_SMALLKEY,          0xB3,               true,  &Logic::ShadowTempleKeys,    RHT_SHADOW_TEMPLE_SMALL_KEY,RG_SHADOW_TEMPLE_SMALL_KEY,     OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_SHADOW_TEMPLE_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
+    itemTable[RG_BOTTOM_OF_THE_WELL_SMALL_KEY] =        Item(RG_BOTTOM_OF_THE_WELL_SMALL_KEY,     Text{ "Bottom of the Well Small Key", "Petite Clé du Puits", "Boden des Brunnens Kleiner Schlüssel" },            ITEMTYPE_SMALLKEY,          0xB4,               true,  &Logic::BottomOfTheWellKeys, RHT_BOTTOM_OF_THE_WELL_SMALL_KEY,RG_BOTTOM_OF_THE_WELL_SMALL_KEY,OBJECT_GI_KEY,     GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_BOTTOM_OF_THE_WELL_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
+    itemTable[RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY] =   Item(RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, Text{ "Training Grounds Small Key", "Petite Clé du Gymnase Gerudo", "Trainingsgelände Kleiner Schlüssel" },      ITEMTYPE_SMALLKEY,          0xB5,               true,  &Logic::GerudoTrainingGroundsKeys, RHT_GERUDO_TRAINING_GROUNDS_SMALL_KEY,RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY,OBJECT_GI_KEY,GID_KEY_SMALL,TEXT_RANDOMIZER_CUSTOM_ITEM,0x80, CHEST_ANIM_SHORT,ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
+    itemTable[RG_GERUDO_FORTRESS_SMALL_KEY] =           Item(RG_GERUDO_FORTRESS_SMALL_KEY,        Text{ "Gerudo Fortress Small Key", "Petite Clé du Repaire des Voleurs", "Gerudo-Festung Kleiner Schlüssel" },     ITEMTYPE_FORTRESS_SMALLKEY, 0xB6,               true,  &Logic::GerudoFortressKeys,  RHT_GERUDO_FORTRESS_SMALL_KEY,RG_GERUDO_FORTRESS_SMALL_KEY, OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_GERUDO_FORTRESS_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
+    itemTable[RG_GANONS_CASTLE_SMALL_KEY] =             Item(RG_GANONS_CASTLE_SMALL_KEY,          Text{ "Ganon's Castle Small Key", "Petite Clé du Château de Ganon", "Ganons Schloss Kleiner Schlüssel" },         ITEMTYPE_SMALLKEY,          0xB7,               true,  &Logic::GanonsCastleKeys,    RHT_GANONS_CASTLE_SMALL_KEY,RG_GANONS_CASTLE_SMALL_KEY,     OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_GANONS_CASTLE_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
+    itemTable[RG_TREASURE_GAME_SMALL_KEY] =             Item(RG_TREASURE_GAME_SMALL_KEY,          Text{ "Chest Game Small Key", "Petite Clé du jeu la Chasse-aux-Trésors", "Truhenspiel Kleiner Schlüssel" },       ITEMTYPE_SMALLKEY,          0xDE,               true,  &Logic::TreasureGameKeys,    RHT_TREASURE_GAME_SMALL_KEY,RG_TREASURE_GAME_SMALL_KEY,     OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    // Key Rings
+    itemTable[RG_FOREST_TEMPLE_KEY_RING] =              Item(RG_FOREST_TEMPLE_KEY_RING,           Text{ "Forest Temple Key Ring", "Trousseau du Temple de la Forêt", "Waldtempel Schlüsselanhänger" },              ITEMTYPE_SMALLKEY,          0xD5,               true,  &Logic::ForestTempleKeys,    RHT_FOREST_TEMPLE_KEY_RING, RG_FOREST_TEMPLE_KEY_RING,      OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_FOREST_TEMPLE_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
+    itemTable[RG_FIRE_TEMPLE_KEY_RING] =                Item(RG_FIRE_TEMPLE_KEY_RING,             Text{ "Fire Temple Key Ring", "Trousseau du Temple du Feu", "Feuertempel Schlüsselanhänger" },                    ITEMTYPE_SMALLKEY,          0xD6,               true,  &Logic::FireTempleKeys,      RHT_FIRE_TEMPLE_KEY_RING,   RG_FIRE_TEMPLE_KEY_RING,        OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_FIRE_TEMPLE_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
+    itemTable[RG_WATER_TEMPLE_KEY_RING] =               Item(RG_WATER_TEMPLE_KEY_RING,            Text{ "Water Temple Key Ring", "Trousseau du Temple de l'Eau", "Wassertempel Schlüsselanhänger" },                ITEMTYPE_SMALLKEY,          0xD7,               true,  &Logic::WaterTempleKeys,     RHT_WATER_TEMPLE_KEY_RING,  RG_WATER_TEMPLE_KEY_RING,       OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_WATER_TEMPLE_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
+    itemTable[RG_SPIRIT_TEMPLE_KEY_RING] =              Item(RG_SPIRIT_TEMPLE_KEY_RING,           Text{ "Spirit Temple Key Ring", "Trousseau du Temple de l'Esprit", "Geisttempel Schlüsselanhänger" },             ITEMTYPE_SMALLKEY,          0xD8,               true,  &Logic::SpiritTempleKeys,    RHT_SPIRIT_TEMPLE_KEY_RING, RG_SPIRIT_TEMPLE_KEY_RING,      OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_SPIRIT_TEMPLE_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
+    itemTable[RG_SHADOW_TEMPLE_KEY_RING] =              Item(RG_SHADOW_TEMPLE_KEY_RING,           Text{ "Shadow Temple Key Ring", "Trousseau du Temple de l'Ombre", "Schattentempel Schlüsselanhänger" },           ITEMTYPE_SMALLKEY,          0xD9,               true,  &Logic::ShadowTempleKeys,    RHT_SHADOW_TEMPLE_KEY_RING, RG_SHADOW_TEMPLE_KEY_RING,      OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_SHADOW_TEMPLE_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
+    itemTable[RG_BOTTOM_OF_THE_WELL_KEY_RING] =         Item(RG_BOTTOM_OF_THE_WELL_KEY_RING,      Text{ "Bottom of the Well Key Ring", "Trousseau du Puits", "Boden des Brunnens Schlüsselanhänger" },              ITEMTYPE_SMALLKEY,          0xDA,               true,  &Logic::BottomOfTheWellKeys, RHT_BOTTOM_OF_THE_WELL_KEY_RING,RG_BOTTOM_OF_THE_WELL_KEY_RING,OBJECT_GI_KEY,       GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_BOTTOM_OF_THE_WELL_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
+    itemTable[RG_GERUDO_TRAINING_GROUNDS_KEY_RING] =    Item(RG_GERUDO_TRAINING_GROUNDS_KEY_RING, Text{ "Training Grounds Key Ring", "Trousseau du Gymnase Gerudo", "Trainingsgelände Schlüsselanhänger" },         ITEMTYPE_SMALLKEY,          0xDB,               true,  &Logic::GerudoTrainingGroundsKeys, RHT_GERUDO_TRAINING_GROUNDS_KEY_RING,RG_GERUDO_TRAINING_GROUNDS_KEY_RING,OBJECT_GI_KEY,GID_KEY_SMALL,TEXT_RANDOMIZER_CUSTOM_ITEM,0x80, CHEST_ANIM_SHORT,ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_GERUDO_TRAINING_GROUNDS_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
+    itemTable[RG_GERUDO_FORTRESS_KEY_RING] =            Item(RG_GERUDO_FORTRESS_KEY_RING,         Text{ "Gerudo Fortress Key Ring", "Trousseau du Repaire des Voleurs", "Gerudo Festung Schlüsselanhänger" },       ITEMTYPE_FORTRESS_SMALLKEY, 0xDC,               true,  &Logic::GerudoFortressKeys,  RHT_GERUDO_FORTRESS_KEY_RING,RG_GERUDO_FORTRESS_KEY_RING,   OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_GERUDO_FORTRESS_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
+    itemTable[RG_GANONS_CASTLE_KEY_RING] =              Item(RG_GANONS_CASTLE_KEY_RING,           Text{ "Ganon's Castle Key Ring", "Trousseau du Château de Ganon", "Ganons Schloss Schlüsselanhänger" },           ITEMTYPE_SMALLKEY,          0xDD,               true,  &Logic::GanonsCastleKeys,    RHT_GANONS_CASTLE_KEY_RING, RG_GANONS_CASTLE_KEY_RING,      OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_GANONS_CASTLE_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
+    // Dungeon Rewards
+    itemTable[RG_KOKIRI_EMERALD] =                      Item(RG_KOKIRI_EMERALD,                   Text{ "Kokiri's Emerald", "Émeraude Kokiri", "Kokiri-Smaragd" },                                                  ITEMTYPE_DUNGEONREWARD,     0xCB,               true,  &Logic::KokiriEmerald,       RHT_KOKIRI_EMERALD,         ITEM_KOKIRI_EMERALD,            OBJECT_GI_JEWEL,        GID_KOKIRI_EMERALD, 0x80,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_GORON_RUBY] =                          Item(RG_GORON_RUBY,                       Text{ "Goron's Ruby", "Rubis Goron", "Goronen-Rubin" },                                                           ITEMTYPE_DUNGEONREWARD,     0xCC,               true,  &Logic::GoronRuby,           RHT_GORON_RUBY,             ITEM_GORON_RUBY,                OBJECT_GI_JEWEL,        GID_GORON_RUBY,     0x81,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_ZORA_SAPPHIRE] =                       Item(RG_ZORA_SAPPHIRE,                    Text{ "Zora's Sapphire", "Saphir Zora", "Zora-Saphir" },                                                          ITEMTYPE_DUNGEONREWARD,     0xCD,               true,  &Logic::ZoraSapphire,        RHT_ZORA_SAPPHIRE,          ITEM_ZORA_SAPPHIRE,             OBJECT_GI_JEWEL,        GID_ZORA_SAPPHIRE,  0x82,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_FOREST_MEDALLION] =                    Item(RG_FOREST_MEDALLION,                 Text{ "Forest Medallion", "Médaillon de la Forêt", "Wald Medaillon" },                                            ITEMTYPE_DUNGEONREWARD,     0xCE,               true,  &Logic::ForestMedallion,     RHT_FOREST_MEDALLION,       ITEM_MEDALLION_FOREST,          OBJECT_GI_MEDAL,        GID_MEDALLION_FOREST,0x3E,                       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_FIRE_MEDALLION] =                      Item(RG_FIRE_MEDALLION,                   Text{ "Fire Medallion", "Médaillon du Feu", "Feuer Medaillon" },                                                  ITEMTYPE_DUNGEONREWARD,     0xCF,               true,  &Logic::FireMedallion,       RHT_FIRE_MEDALLION,         ITEM_MEDALLION_FIRE,            OBJECT_GI_MEDAL,        GID_MEDALLION_FIRE, 0x3C,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_WATER_MEDALLION] =                     Item(RG_WATER_MEDALLION,                  Text{ "Water Medallion", "Médaillon de l'Eau", "Wasser Medaillon" },                                              ITEMTYPE_DUNGEONREWARD,     0xD0,               true,  &Logic::WaterMedallion,      RHT_WATER_MEDALLION,        ITEM_MEDALLION_WATER,           OBJECT_GI_MEDAL,        GID_MEDALLION_WATER,0x3D,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_SPIRIT_MEDALLION] =                    Item(RG_SPIRIT_MEDALLION,                 Text{ "Spirit Medallion", "Médaillon de l'Esprit", "Geist Medaillon" },                                           ITEMTYPE_DUNGEONREWARD,     0xD1,               true,  &Logic::SpiritMedallion,     RHT_SPIRIT_MEDALLION,       ITEM_MEDALLION_SPIRIT,          OBJECT_GI_MEDAL,        GID_MEDALLION_SPIRIT,0x3F,                       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_SHADOW_MEDALLION] =                    Item(RG_SHADOW_MEDALLION,                 Text{ "Shadow Medallion", "Médaillon de l'Ombre", "Schatten Medaillon" },                                         ITEMTYPE_DUNGEONREWARD,     0xD2,               true,  &Logic::ShadowMedallion,     RHT_SHADOW_MEDALLION,       ITEM_MEDALLION_SHADOW,          OBJECT_GI_MEDAL,        GID_MEDALLION_SHADOW,0x41,                       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_LIGHT_MEDALLION] =                     Item(RG_LIGHT_MEDALLION,                  Text{ "Light Medallion", "Médaillon de la Lumière", "Licht Medaillon" },                                          ITEMTYPE_DUNGEONREWARD,     0xD3,               true,  &Logic::LightMedallion,      RHT_LIGHT_MEDALLION,        ITEM_MEDALLION_LIGHT,           OBJECT_GI_MEDAL,        GID_MEDALLION_LIGHT,0x40,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    // Generic Items
+    itemTable[RG_RECOVERY_HEART] =                      Item(RG_RECOVERY_HEART,                   Text{ "Recovery Heart", "Coeur de Vie", "Herz" },                                                                 ITEMTYPE_ITEM,              GI_HEART,           false, &Logic::noVariable,          RHT_RECOVERY_HEART,         ITEM_HEART,                     OBJECT_GI_HEART,        GID_HEART,          0x55,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_GREEN_RUPEE] =                         Item(RG_GREEN_RUPEE,                      Text{ "Green Rupee", "Rubis Vert", "Grüne Rupie" },                                                               ITEMTYPE_ITEM,              GI_RUPEE_GREEN,     false, &Logic::noVariable,          RHT_GREEN_RUPEE,            ITEM_RUPEE_GREEN,               OBJECT_GI_RUPY,         GID_RUPEE_GREEN,    0x6F,                        0x00, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_GREG_RUPEE] =                          Item(RG_GREG_RUPEE,                       Text{ "Greg the Green Rupee", "Rubis Greg", "Greg Rupie" },                                                       ITEMTYPE_ITEM,              GI_RUPEE_GREEN,     true,  &Logic::Greg,                RHT_GREG_RUPEE,             RG_GREG_RUPEE,                  OBJECT_GI_RUPY,         GID_RUPEE_GREEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BLUE_RUPEE] =                          Item(RG_BLUE_RUPEE,                       Text{ "Blue Rupee", "Rubis Bleu", "Blaue Rupie" },                                                                ITEMTYPE_ITEM,              GI_RUPEE_BLUE,      false, &Logic::noVariable,          RHT_BLUE_RUPEE,             ITEM_RUPEE_BLUE,                OBJECT_GI_RUPY,         GID_RUPEE_BLUE,     0xCC,                        0x01, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_RED_RUPEE] =                           Item(RG_RED_RUPEE,                        Text{ "Red Rupee", "Rubis Rouge", "Rote Rupie" },                                                                 ITEMTYPE_ITEM,              GI_RUPEE_RED,       false, &Logic::noVariable,          RHT_RED_RUPEE,              ITEM_RUPEE_RED,                 OBJECT_GI_RUPY,         GID_RUPEE_RED,      0xF0,                        0x02, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_PURPLE_RUPEE] =                        Item(RG_PURPLE_RUPEE,                     Text{ "Purple Rupee", "Rubis Pourpre", "Lila Rupie" },                                                            ITEMTYPE_ITEM,              GI_RUPEE_PURPLE,    false, &Logic::noVariable,          RHT_PURPLE_RUPEE,           ITEM_RUPEE_PURPLE,              OBJECT_GI_RUPY,         GID_RUPEE_PURPLE,   0xF1,                        0x14, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_HUGE_RUPEE] =                          Item(RG_HUGE_RUPEE,                       Text{ "Huge Rupee", "Énorme Rubis", "Riesige Rupie" },                                                            ITEMTYPE_ITEM,              GI_RUPEE_GOLD,      false, &Logic::noVariable,          RHT_HUGE_RUPEE,             ITEM_RUPEE_GOLD,                OBJECT_GI_RUPY,         GID_RUPEE_GOLD,     0xF2,                        0x13, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_PIECE_OF_HEART] =                      Item(RG_PIECE_OF_HEART,                   Text{ "Piece of Heart", "Quart de Coeur", "Herzstück" },                                                          ITEMTYPE_ITEM,              GI_HEART_PIECE,     true,  &Logic::PieceOfHeart,        RHT_PIECE_OF_HEART,         ITEM_HEART_PIECE_2,             OBJECT_GI_HEARTS,       GID_HEART_PIECE,    0xC2,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_HEART_CONTAINER] =                     Item(RG_HEART_CONTAINER,                  Text{ "Heart Container", "Réceptacle de Coeur", "Herz-Container" },                                               ITEMTYPE_ITEM,              GI_HEART_CONTAINER_2,true, &Logic::HeartContainer,      RHT_HEART_CONTAINER,        ITEM_HEART_CONTAINER,           OBJECT_GI_HEARTS,       GID_HEART_CONTAINER,0xC6,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_ICE_TRAP] =                            Item(RG_ICE_TRAP,                         Text{ "Ice Trap", "Piège de Glace", "Eisfalle" },                                                                 ITEMTYPE_ITEM,              RG_ICE_TRAP,        false, &Logic::noVariable,          RHT_ICE_TRAP,               RG_ICE_TRAP,                    OBJECT_GI_RUPY,         GID_RUPEE_GOLD,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_MILK] =                                Item(RG_MILK,                             Text{ "Milk", "Lait", "Milch" },                                                                                  ITEMTYPE_ITEM,              GI_MILK,            false, &Logic::noVariable,          RHT_NONE,                   ITEM_MILK,                      OBJECT_GI_MILK,         GID_MILK,           0x98,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
+    // Refills
+    itemTable[RG_BOMBS_5] =                             Item(RG_BOMBS_5,                          Text{ "Bombs (5)", "Bombes (5)", "Bomben (5)" },                                                                  ITEMTYPE_REFILL,            GI_BOMBS_5,         false, &Logic::noVariable,          RHT_BOMBS_5,                ITEM_BOMBS_5,                   OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_BOMBS_10] =                            Item(RG_BOMBS_10,                         Text{ "Bombs (10)", "Bombes (10)", "Bomben (10)" },                                                               ITEMTYPE_REFILL,            GI_BOMBS_10,        false, &Logic::noVariable,          RHT_BOMBS_10,               ITEM_BOMBS_10,                  OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_BOMBS_20] =                            Item(RG_BOMBS_20,                         Text{ "Bombs (20)", "Bombes (20)", "Bomben (20)" },                                                               ITEMTYPE_REFILL,            GI_BOMBS_20,        false, &Logic::noVariable,          RHT_BOMBS_20,               ITEM_BOMBS_20,                  OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_BOMBCHU_5] =                           Item(RG_BOMBCHU_5,                        Text{ "Bombchus (5)", "Missiles (5)", "Bombchus (5)" },                                                           ITEMTYPE_REFILL,            GI_BOMBCHUS_5,      true,  &Logic::Bombchus5,           RHT_BOMBCHU_5,              ITEM_BOMBCHUS_5,                OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_BOMBCHU_10] =                          Item(RG_BOMBCHU_10,                       Text{ "Bombchus (10)", "Missiles (10)", "Bombchus (10)" },                                                        ITEMTYPE_REFILL,            GI_BOMBCHUS_10,     true,  &Logic::Bombchus10,          RHT_BOMBCHU_10,             ITEM_BOMBCHU,                   OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_BOMBCHU_20] =                          Item(RG_BOMBCHU_20,                       Text{ "Bombchus (20)", "Missiles (20)", "Bombchus (20)" },                                                        ITEMTYPE_REFILL,            GI_BOMBCHUS_20,     true,  &Logic::Bombchus20,          RHT_BOMBCHU_20,             ITEM_BOMBCHUS_20,               OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_BOMBCHU_DROP] =                        Item(RG_BOMBCHU_DROP,                     Text{ "Bombchu Drop", "Drop Missiles", "Bombchus" },                                                              ITEMTYPE_DROP,              GI_BOMBCHUS_10,     true,  &Logic::BombchuDrop,         RHT_NONE,                   ITEM_BOMBCHU,                   OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_ARROWS_5] =                            Item(RG_ARROWS_5,                         Text{ "Arrows (5)", "Flèches (5)", "Pfeile (5)" },                                                                ITEMTYPE_REFILL,            GI_ARROWS_SMALL,    false, &Logic::noVariable,          RHT_ARROWS_5,               ITEM_ARROWS_SMALL,              OBJECT_GI_ARROW,        GID_ARROWS_SMALL,   0xE6,                        0x48, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_ARROWS_10] =                           Item(RG_ARROWS_10,                        Text{ "Arrows (10)", "Flèches (10)", "Pfeile (10)" },                                                             ITEMTYPE_REFILL,            GI_ARROWS_MEDIUM,   false, &Logic::noVariable,          RHT_ARROWS_10,              ITEM_ARROWS_MEDIUM,             OBJECT_GI_ARROW,        GID_ARROWS_MEDIUM,  0xE6,                        0x49, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_ARROWS_30] =                           Item(RG_ARROWS_30,                        Text{ "Arrows (30)", "Flèches (30)", "Pfeile (30)" },                                                             ITEMTYPE_REFILL,            GI_ARROWS_LARGE,    false, &Logic::noVariable,          RHT_ARROWS_30,              ITEM_ARROWS_LARGE,              OBJECT_GI_ARROW,        GID_ARROWS_LARGE,   0xE6,                        0x4A, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_DEKU_NUTS_5] =                         Item(RG_DEKU_NUTS_5,                      Text{ "Deku Nuts (5)", "Noix Mojo (5)", "Deku-Nüsse (5)" },                                                       ITEMTYPE_REFILL,            GI_NUTS_5,          false, &Logic::noVariable,          RHT_DEKU_NUTS_5,            ITEM_NUTS_5,                    OBJECT_GI_NUTS,         GID_NUTS,           0x34,                        0x0C, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_DEKU_NUTS_10] =                        Item(RG_DEKU_NUTS_10,                     Text{ "Deku Nuts (10)", "Noix Mojo (10)", "Deku-Nüsse (10)" },                                                    ITEMTYPE_REFILL,            GI_NUTS_10,         false, &Logic::noVariable,          RHT_DEKU_NUTS_10,           ITEM_NUTS_10,                   OBJECT_GI_NUTS,         GID_NUTS,           0x34,                        0x0C, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_DEKU_SEEDS_30] =                       Item(RG_DEKU_SEEDS_30,                    Text{ "Deku Seeds (30)", "Graines Mojo (30)", "Deku-Samen (30)" },                                                ITEMTYPE_REFILL,            GI_SEEDS_30,        false, &Logic::noVariable,          RHT_DEKU_SEEDS_30,          ITEM_SEEDS_30,                  OBJECT_GI_SEED,         GID_SEEDS,          0xDC,                        0x50, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_DEKU_STICK_1] =                        Item(RG_DEKU_STICK_1,                     Text{ "Deku Stick (1)", "Bâton Mojo (1)", "Deku-Stick (1)" },                                                     ITEMTYPE_REFILL,            GI_STICKS_1,        false, &Logic::noVariable,          RHT_DEKU_STICK_1,           ITEM_STICK,                     OBJECT_GI_STICK,        GID_STICK,          0x37,                        0x0D, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_RED_POTION_REFILL] =                   Item(RG_RED_POTION_REFILL,                Text{ "Red Potion Refill", "Recharge de Potion Rouge", "Rotes Elixier Nachfüllpackung" },                         ITEMTYPE_REFILL,            GI_POTION_RED,      false, &Logic::noVariable,          RHT_NONE,                   ITEM_POTION_RED,                OBJECT_GI_LIQUID,       GID_POTION_RED,     0x43,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_GREEN_POTION_REFILL] =                 Item(RG_GREEN_POTION_REFILL,              Text{ "Green Potion Refill", "Recharge de Potion Verte", "Grünes Elixier Nachfüllpackung" },                      ITEMTYPE_REFILL,            GI_POTION_GREEN,    false, &Logic::noVariable,          RHT_NONE,                   ITEM_POTION_GREEN,              OBJECT_GI_LIQUID,       GID_POTION_GREEN,   0x44,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_BLUE_POTION_REFILL] =                  Item(RG_BLUE_POTION_REFILL,               Text{ "Blue Potion Refill", "Recharge de Potion Bleue", "Blaues Elixier Nachfüllpackung" },                       ITEMTYPE_REFILL,            GI_POTION_BLUE,     false, &Logic::noVariable,          RHT_NONE,                   ITEM_POTION_BLUE,               OBJECT_GI_LIQUID,       GID_POTION_BLUE,    0x45,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
+    // Treasure Game
+    itemTable[RG_TREASURE_GAME_HEART] =                 Item(RG_TREASURE_GAME_HEART,              Text{ "Piece of Heart (WINNER)", "Quart de Coeur (Chasse-aux-Trésors)", "Herzstück (Schatztruhen-Minispiel)" },   ITEMTYPE_ITEM,              GI_HEART_PIECE_WIN, true,  &Logic::PieceOfHeart,        RHT_TREASURE_GAME_HEART,    ITEM_HEART_PIECE_2,             OBJECT_GI_HEARTS,       GID_HEART_PIECE,    0xFA,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_TREASURE_GAME_GREEN_RUPEE] =           Item(RG_TREASURE_GAME_GREEN_RUPEE,        Text{ "Green Rupee (LOSER)", "Rubis Vert (Chasse-aux-Trésors)", "Grüne Rupie (Schatztruhe-Minispiel)" },          ITEMTYPE_ITEM,              GI_RUPEE_GREEN_LOSE,false, &Logic::noVariable,          RHT_TREASURE_GAME_GREEN_RUPEE,ITEM_RUPEE_GREEN,             OBJECT_GI_RUPY,         GID_RUPEE_GREEN,    0xF4,                        0x00, CHEST_ANIM_SHORT, ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    // Shop
+    itemTable[RG_BUY_DEKU_NUT_5] =                      Item(RG_BUY_DEKU_NUT_5,                   Text{ "Buy Deku Nut (5)", "Acheter: Noix Mojo (5)", "Deku-Nuss kaufen (5)" },                                     ITEMTYPE_SHOP,              GI_NUTS_5_2,        true,  &Logic::Nuts,                RHT_DEKU_NUTS_5,            ITEM_NUTS_5,                    OBJECT_GI_NUTS,         GID_NUTS,           0x34,                        0x0C, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 15);
+    itemTable[RG_BUY_ARROWS_30] =                       Item(RG_BUY_ARROWS_30,                    Text{ "Buy Arrows (30)", "Acheter: Flèches (30)", "Pfeile kaufen (30)" },                                         ITEMTYPE_SHOP,              GI_ARROWS_MEDIUM,   true,  &Logic::BuyArrow,            RHT_ARROWS_30,              ITEM_ARROWS_MEDIUM,             OBJECT_GI_ARROW,        GID_ARROWS_MEDIUM,  0xE6,                        0x49, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 60);
+    itemTable[RG_BUY_ARROWS_50] =                       Item(RG_BUY_ARROWS_50,                    Text{ "Buy Arrows (50)", "Acheter: Flèches (50)", "Pfeile kaufen (50)" },                                         ITEMTYPE_SHOP,              GI_ARROWS_LARGE,    true,  &Logic::BuyArrow,            RHT_ARROWS_30,              ITEM_ARROWS_LARGE,              OBJECT_GI_ARROW,        GID_ARROWS_LARGE,   0xE6,                        0x4A, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 90);
+    itemTable[RG_BUY_BOMBS_525] =                       Item(RG_BUY_BOMBS_525,                    Text{ "Buy Bombs (5) [25]", "Acheter: Bombes (5) [25]", "Bomben kaufen (5) [25]" },                               ITEMTYPE_SHOP,              GI_BOMBS_5,         true,  &Logic::BuyBomb,             RHT_BOMBS_5,                ITEM_BOMBS_5,                   OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 25);
+    itemTable[RG_BUY_DEKU_NUT_10] =                     Item(RG_BUY_DEKU_NUT_10,                  Text{ "Buy Deku Nut (10)", "Acheter: Noix Mojo (10)", "Deku-Nuss kaufen (10)" },                                  ITEMTYPE_SHOP,              GI_NUTS_10,         true,  &Logic::Nuts,                RHT_DEKU_NUTS_10,           ITEM_NUTS_10,                   OBJECT_GI_NUTS,         GID_NUTS,           0x34,                        0x0C, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
+    itemTable[RG_BUY_DEKU_STICK_1] =                    Item(RG_BUY_DEKU_STICK_1,                 Text{ "Buy Deku Stick (1)", "Acheter: Bâton Mojo (1)", "Deku-Stick kaufen (1)" },                                 ITEMTYPE_SHOP,              GI_STICKS_1,        true,  &Logic::Sticks,              RHT_DEKU_STICK_1,           ITEM_STICK,                     OBJECT_GI_STICK,        GID_STICK,          0x37,                        0x0D, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 10);
+    itemTable[RG_BUY_BOMBS_10] =                        Item(RG_BUY_BOMBS_10,                     Text{ "Buy Bombs (10)", "Acheter: Bombes (10)", "Bomben kaufen (10)" },                                           ITEMTYPE_SHOP,              GI_BOMBS_10,        true,  &Logic::BuyBomb,             RHT_BOMBS_10,               ITEM_BOMBS_10,                  OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 50);
+    itemTable[RG_BUY_FISH] =                            Item(RG_BUY_FISH,                         Text{ "Buy Fish", "Acheter: Poisson", "Fisch kaufen" },                                                           ITEMTYPE_SHOP,              GI_FISH,            true,  &Logic::FishAccess,          RHT_BOTTLE_WITH_FISH,       ITEM_FISH,                      OBJECT_GI_FISH,         GID_FISH,           0x47,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 200);
+    itemTable[RG_BUY_RED_POTION_30] =                   Item(RG_BUY_RED_POTION_30,                Text{ "Buy Red Potion [30]", "Acheter: Potion Rouge [30]", "Rotes Elixier kaufen [30]" },                         ITEMTYPE_SHOP,              GI_POTION_RED,      false, &Logic::noVariable,          RHT_BOTTLE_WITH_RED_POTION, ITEM_POTION_RED,                OBJECT_GI_LIQUID,       GID_POTION_RED,     0x43,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
+    itemTable[RG_BUY_GREEN_POTION] =                    Item(RG_BUY_GREEN_POTION,                 Text{ "Buy Green Potion", "Acheter: Potion Verte", "Grünes Elixier kaufen" },                                     ITEMTYPE_SHOP,              GI_POTION_GREEN,    true,  &Logic::BuyGPotion,          RHT_BOTTLE_WITH_GREEN_POTION,ITEM_POTION_GREEN,             OBJECT_GI_LIQUID,       GID_POTION_GREEN,   0x44,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
+    itemTable[RG_BUY_BLUE_POTION] =                     Item(RG_BUY_BLUE_POTION,                  Text{ "Buy Blue Potion", "Acheter: Potion Bleue", "Blaues Elixier kaufen" },                                      ITEMTYPE_SHOP,              GI_POTION_BLUE,     true,  &Logic::BuyBPotion,          RHT_BOTTLE_WITH_BLUE_POTION,ITEM_POTION_BLUE,               OBJECT_GI_LIQUID,       GID_POTION_BLUE,    0x45,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 100);
+    itemTable[RG_BUY_HYLIAN_SHIELD] =                   Item(RG_BUY_HYLIAN_SHIELD,                Text{ "Buy Hylian Shield", "Acheter: Bouclier Hylien", "Hylianischer Schild kaufen" },                            ITEMTYPE_SHOP,              GI_SHIELD_HYLIAN,   true,  &Logic::HylianShield,        RHT_HYLIAN_SHIELD,          ITEM_SHIELD_HYLIAN,             OBJECT_GI_SHIELD_2,     GID_SHIELD_HYLIAN,  0x4D,                        0xA0, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE, false, 80);
+    itemTable[RG_BUY_DEKU_SHIELD] =                     Item(RG_BUY_DEKU_SHIELD,                  Text{ "Buy Deku Shield", "Acheter: Bouclier Mojo", "Deku-Schild kaufen" },                                        ITEMTYPE_SHOP,              GI_SHIELD_DEKU,     true,  &Logic::DekuShield,          RHT_DEKU_SHIELD,            ITEM_SHIELD_DEKU,               OBJECT_GI_SHIELD_1,     GID_SHIELD_DEKU,    0x4C,                        0xA0, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE, false, 40);
+    itemTable[RG_BUY_GORON_TUNIC] =                     Item(RG_BUY_GORON_TUNIC,                  Text{ "Buy Goron Tunic", "Acheter: Tunique Goron", "Goronen-Tunika kaufen" },                                     ITEMTYPE_SHOP,              GI_TUNIC_GORON,     true,  &Logic::GoronTunic,          RHT_GORON_TUNIC,            ITEM_TUNIC_GORON,               OBJECT_GI_CLOTHES,      GID_TUNIC_GORON,    0x50,                        0xA0, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE, false, 200);
+    itemTable[RG_BUY_ZORA_TUNIC] =                      Item(RG_BUY_ZORA_TUNIC,                   Text{ "Buy Zora Tunic", "Acheter: Tunique Zora", "Zora-Tunika kaufen" },                                          ITEMTYPE_SHOP,              GI_TUNIC_ZORA,      true,  &Logic::ZoraTunic,           RHT_ZORA_TUNIC,             ITEM_TUNIC_ZORA,                OBJECT_GI_CLOTHES,      GID_TUNIC_ZORA,     0x51,                        0xA0, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE, false, 300);
+    itemTable[RG_BUY_HEART] =                           Item(RG_BUY_HEART,                        Text{ "Buy Heart", "Acheter: Coeur de Vie", "Herz kaufen" },                                                      ITEMTYPE_SHOP,              GI_HEART,           false, &Logic::noVariable,          RHT_RECOVERY_HEART,         ITEM_HEART,                     OBJECT_GI_HEART,        GID_HEART,          0x55,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 10);
+    itemTable[RG_BUY_BOMBCHU_10] =                      Item(RG_BUY_BOMBCHU_10,                   Text{ "Buy Bombchu (10)", "Acheter: Missiles (10)", "Bomchu kaufen (10)" },                                       ITEMTYPE_SHOP,              GI_BOMBCHUS_10,     true,  &Logic::BuyBombchus10,       RHT_BOMBCHU_10,             ITEM_BOMBCHU,                   OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 99);
+    itemTable[RG_BUY_BOMBCHU_20] =                      Item(RG_BUY_BOMBCHU_20,                   Text{ "Buy Bombchu (20)", "Acheter: Missiles (20)", "Bomchu kaufen (20)" },                                       ITEMTYPE_SHOP,              GI_BOMBCHUS_20,     true,  &Logic::BuyBombchus20,       RHT_BOMBCHU_20,             ITEM_BOMBCHUS_20,               OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 180);
+    itemTable[RG_BUY_DEKU_SEEDS_30] =                   Item(RG_BUY_DEKU_SEEDS_30,                Text{ "Buy Deku Seeds (30)", "Acheter: Graines Mojo (30)", "Deku-Samen kaufen (30)" },                            ITEMTYPE_SHOP,              GI_SEEDS_30,        true,  &Logic::BuySeed,             RHT_DEKU_SEEDS_30,          ITEM_SEEDS_30,                  OBJECT_GI_SEED,         GID_SEEDS,          0xDC,                        0x50, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
+    itemTable[RG_SOLD_OUT] =                            Item(RG_SOLD_OUT,                         Text{ "Sold Out", "Rupture de stock", "Ausverkauft" },                                                            ITEMTYPE_SHOP,              RG_SOLD_OUT,        false, &Logic::noVariable,          RHT_NONE, false, 0);
+    itemTable[RG_BUY_BLUE_FIRE] =                       Item(RG_BUY_BLUE_FIRE,                    Text{ "Buy Blue Fire", "Acheter: Flamme Bleue", "Blaues Feuer kaufen" },                                          ITEMTYPE_SHOP,              GI_BLUE_FIRE,       true,  &Logic::BlueFireAccess,      RHT_BOTTLE_WITH_BLUE_FIRE,  ITEM_BLUE_FIRE,                 OBJECT_GI_FIRE,         GID_BLUE_FIRE,      0x5D,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 300);
+    itemTable[RG_BUY_BOTTLE_BUG] =                      Item(RG_BUY_BOTTLE_BUG,                   Text{ "Buy Bottle Bug", "Acheter: Insecte en bouteille", "Flaschenkäfer kaufen" },                                ITEMTYPE_SHOP,              GI_BUGS,            true,  &Logic::BugsAccess,          RHT_BOTTLE_WITH_BUGS,       ITEM_BUG,                       OBJECT_GI_INSECT,       GID_BUG,            0x7A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 50);
+    itemTable[RG_BUY_POE] =                             Item(RG_BUY_POE,                          Text{ "Buy Poe", "Acheter: Esprit", "Geist kaufen" },                                                             ITEMTYPE_SHOP,              RG_BUY_POE,         false, &Logic::noVariable,          RHT_BOTTLE_WITH_BIG_POE,    ITEM_POE,                       OBJECT_GI_GHOST,        GID_POE,            0x97,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
+    itemTable[RG_BUY_FAIRYS_SPIRIT] =                   Item(RG_BUY_FAIRYS_SPIRIT,                Text{ "Buy Fairy's Spirit", "Acheter: Esprit de Fée", "Feengeist kaufen" },                                       ITEMTYPE_SHOP,              GI_FAIRY,           true,  &Logic::FairyAccess,         RHT_BOTTLE_WITH_FAIRY,      ITEM_FAIRY,                     OBJECT_GI_BOTTLE,       GID_BOTTLE,         0x46,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 50);
+    itemTable[RG_BUY_ARROWS_10] =                       Item(RG_BUY_ARROWS_10,                    Text{ "Buy Arrows (10)", "Acheter: Flèches (10)", "Pfeile kaufen (10)" },                                         ITEMTYPE_SHOP,              GI_ARROWS_SMALL,    true,  &Logic::BuyArrow,            RHT_ARROWS_10,              ITEM_ARROWS_SMALL,              OBJECT_GI_ARROW,        GID_ARROWS_SMALL,   0xE6,                        0x48, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 20);
+    itemTable[RG_BUY_BOMBS_20] =                        Item(RG_BUY_BOMBS_20,                     Text{ "Buy Bombs (20)", "Acheter: Bombes (20)", "Bomben kaufen (20)" },                                           ITEMTYPE_SHOP,              GI_BOMBS_20,        true,  &Logic::BuyBomb,             RHT_BOMBS_20,               ITEM_BOMBS_20,                  OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 80);
+    itemTable[RG_BUY_BOMBS_30] =                        Item(RG_BUY_BOMBS_30,                     Text{ "Buy Bombs (30)", "Acheter: Bombes (30)", "Bomben kaufen (30)" },                                           ITEMTYPE_SHOP,              GI_BOMBS_30,        true,  &Logic::BuyBomb,             RHT_BOMBS_20,               ITEM_BOMBS_30,                  OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 120);
+    itemTable[RG_BUY_BOMBS_535] =                       Item(RG_BUY_BOMBS_535,                    Text{ "Buy Bombs (5) [35]", "Acheter: Bombes (5) [35]", "Bomben kaufen (5) [35]" },                               ITEMTYPE_SHOP,              GI_BOMBS_5,         true,  &Logic::BuyBomb,             RHT_BOMBS_5,                ITEM_BOMBS_5,                   OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 35);
+    itemTable[RG_BUY_RED_POTION_40] =                   Item(RG_BUY_RED_POTION_40,                Text{ "Buy Red Potion [40]", "Acheter: Potion Rouge [40]", "Rotes Elixier kaufen [40]" },                         ITEMTYPE_SHOP,              GI_POTION_RED,      false, &Logic::noVariable,          RHT_BOTTLE_WITH_RED_POTION, ITEM_POTION_RED,                OBJECT_GI_LIQUID,       GID_POTION_RED,     0x43,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 40);
+    itemTable[RG_BUY_RED_POTION_50] =                   Item(RG_BUY_RED_POTION_50,                Text{ "Buy Red Potion [50]", "Acheter: Potion Rouge [50]", "Rotes Elixier kaufen [50]" },                         ITEMTYPE_SHOP,              GI_POTION_RED,      false, &Logic::noVariable,          RHT_BOTTLE_WITH_RED_POTION, ITEM_POTION_RED,                OBJECT_GI_LIQUID,       GID_POTION_RED,     0x43,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 50);
+    // Misc.
+    itemTable[RG_TRIFORCE] =                            Item(RG_TRIFORCE,                         Text{ "Triforce", "Triforce", "Triforce" },                                                                       ITEMTYPE_EVENT,             RG_TRIFORCE,        false, &Logic::noVariable,          RHT_NONE);
+    itemTable[RG_HINT] =                                Item(RG_HINT,                             Text{ "Hint", "Indice", "Hinweis" },                                                                              ITEMTYPE_EVENT,             RG_HINT,            false, &Logic::noVariable,          RHT_NONE);
+    // Individual stages of progressive items (only here for GetItemEntry purposes, not for use in seed gen)
+    itemTable[RG_HOOKSHOT] =                            Item(RG_HOOKSHOT,                         Text{ "Hookshot", "Grappin", "Fanghaken" },                                                                       ITEMTYPE_ITEM,              GI_HOOKSHOT,        true,  &Logic::ProgressiveHookshot, RHT_HOOKSHOT,               ITEM_HOOKSHOT,                  OBJECT_GI_HOOKSHOT,     GID_HOOKSHOT,       0x36,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_LONGSHOT] =                            Item(RG_LONGSHOT,                         Text{ "Longshot", "Super-Grappin", "Enterhaken" },                                                                ITEMTYPE_ITEM,              GI_LONGSHOT,        true,  &Logic::ProgressiveHookshot, RHT_LONGSHOT,               ITEM_LONGSHOT,                  OBJECT_GI_HOOKSHOT,     GID_LONGSHOT,       0x4F,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_FAIRY_OCARINA] =                       Item(RG_FAIRY_OCARINA,                    Text{ "Fairy Ocarina", "Ocarina des fées", "Feen-Okarina" },                                                      ITEMTYPE_ITEM,              GI_OCARINA_FAIRY,   true,  &Logic::ProgressiveOcarina,  RHT_FAIRY_OCARINA,          ITEM_OCARINA_FAIRY,             OBJECT_GI_OCARINA_0,    GID_OCARINA_FAIRY,  0x4A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_OCARINA_OF_TIME] =                     Item(RG_OCARINA_OF_TIME,                  Text{ "Ocarina of Time", "Ocarina du Temps", "Okarina der Zeit" },                                                ITEMTYPE_ITEM,              GI_OCARINA_OOT,     true,  &Logic::ProgressiveOcarina,  RHT_OCARINA_OF_TIME,        ITEM_OCARINA_TIME,              OBJECT_GI_OCARINA,      GID_OCARINA_TIME,   0x3A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BOMB_BAG] =                            Item(RG_BOMB_BAG,                         Text{ "Bomb Bag", "Sac de Bombes", "Bombentasche" },                                                              ITEMTYPE_ITEM,              GI_BOMB_BAG_20,     true,  &Logic::ProgressiveBombBag,  RHT_BOMB_BAG,               ITEM_BOMB_BAG_20,               OBJECT_GI_BOMBPOUCH,    GID_BOMB_BAG_20,    0x58,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BIG_BOMB_BAG] =                        Item(RG_BIG_BOMB_BAG,                     Text{ "Big Bomb Bag", "Grand Sac de Bombes", "Große Bombentasche" },                                              ITEMTYPE_ITEM,              GI_BOMB_BAG_30,     true,  &Logic::ProgressiveBombBag,  RHT_BIG_BOMB_BAG,           ITEM_BOMB_BAG_30,               OBJECT_GI_BOMBPOUCH,    GID_BOMB_BAG_30,    0x59,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_BIGGEST_BOMB_BAG] =                    Item(RG_BIGGEST_BOMB_BAG,                 Text{ "Biggest Bomb Bag", "Énorme Sac de Bombes", "Größte Bombentasche" },                                        ITEMTYPE_ITEM,              GI_BOMB_BAG_40,     true,  &Logic::ProgressiveBombBag,  RHT_BIGGEST_BOMB_BAG,       ITEM_BOMB_BAG_40,               OBJECT_GI_BOMBPOUCH,    GID_BOMB_BAG_40,    0x5A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_FAIRY_BOW] =                           Item(RG_FAIRY_BOW,                        Text{ "Fairy Bow", "Arc des Fées", "Feen-Bogen" },                                                                ITEMTYPE_ITEM,              GI_BOW,             true,  &Logic::ProgressiveBow,      RHT_FAIRY_BOW,              ITEM_BOW,                       OBJECT_GI_BOW,          GID_BOW,            0x31,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BIG_QUIVER] =                          Item(RG_BIG_QUIVER,                       Text{ "Big Quiver", "Grand carquois", "Großer Köcher" },                                                          ITEMTYPE_ITEM,              GI_QUIVER_40,       true,  &Logic::ProgressiveBow,      RHT_BIG_QUIVER,             ITEM_QUIVER_40,                 OBJECT_GI_ARROWCASE,    GID_QUIVER_40,      0x56,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_BIGGEST_QUIVER] =                      Item(RG_BIGGEST_QUIVER,                   Text{ "Biggest Quiver", "Énorme carquois", "Größter Köcher" },                                                    ITEMTYPE_ITEM,              GI_QUIVER_50,       true,  &Logic::ProgressiveBow,      RHT_BIGGEST_QUIVER,         ITEM_QUIVER_50,                 OBJECT_GI_ARROWCASE,    GID_QUIVER_50,      0x57,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_FAIRY_SLINGSHOT] =                     Item(RG_FAIRY_SLINGSHOT,                  Text{ "Fairy Slingshot", "Lance-Pierre des Fées", "Feen-Schleuder" },                                             ITEMTYPE_ITEM,              GI_SLINGSHOT,       true,  &Logic::ProgressiveBulletBag,RHT_FAIRY_SLINGSHOT,        ITEM_SLINGSHOT,                 OBJECT_GI_PACHINKO,     GID_SLINGSHOT,      0x30,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BIG_BULLET_BAG] =                      Item(RG_BIG_BULLET_BAG,                   Text{ "Big Deku Seed Bullet Bag", "Grand sac de graines mojo", "Großer Deku-Samenkugelsack" },                    ITEMTYPE_ITEM,              GI_BULLET_BAG_40,   true,  &Logic::ProgressiveBulletBag,RHT_BIG_BULLET_BAG,         ITEM_BULLET_BAG_40,             OBJECT_GI_DEKUPOUCH,    GID_BULLET_BAG,     0x07,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_BIGGEST_BULLET_BAG] =                  Item(RG_BIGGEST_BULLET_BAG,               Text{ "Biggest Deku Seed Bullet Bag", "Énorme sac de graines mojo", "Größte Deku-Samenkugelsack" },               ITEMTYPE_ITEM,              GI_BULLET_BAG_50,   true,  &Logic::ProgressiveBulletBag,RHT_BIGGEST_BULLET_BAG,     ITEM_BULLET_BAG_50,             OBJECT_GI_DEKUPOUCH,    GID_BULLET_BAG,     0x07,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_GORONS_BRACELET] =                     Item(RG_GORONS_BRACELET,                  Text{ "Goron's Bracelet", "Bracelet Goron", "Goronen-Armband" },                                                  ITEMTYPE_ITEM,              GI_BRACELET,        true,  &Logic::ProgressiveStrength, RHT_GORONS_BRACELET,        ITEM_BRACELET,                  OBJECT_GI_BRACELET,     GID_BRACELET,       0x79,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_SILVER_GAUNTLETS] =                    Item(RG_SILVER_GAUNTLETS,                 Text{ "Silver Gauntlets", "Gantelets d'argent", "Silberne Fehdehandschuhe" },                                     ITEMTYPE_ITEM,              GI_GAUNTLETS_SILVER,true,  &Logic::ProgressiveStrength, RHT_SILVER_GAUNTLETS,       ITEM_GAUNTLETS_SILVER,          OBJECT_GI_GLOVES,       GID_GAUNTLETS_SILVER,0x5B,                       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_GOLDEN_GAUNTLETS] =                    Item(RG_GOLDEN_GAUNTLETS,                 Text{ "Golden Gauntlets", "Gantelets d'or", "Goldene Fehdehandschuhe" },                                          ITEMTYPE_ITEM,              GI_GAUNTLETS_GOLD,  true,  &Logic::ProgressiveStrength, RHT_GOLDEN_GAUNTLETS,       ITEM_GAUNTLETS_GOLD,            OBJECT_GI_GLOVES,       GID_GAUNTLETS_GOLD, 0x5C,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_SILVER_SCALE] =                        Item(RG_SILVER_SCALE,                     Text{ "Silver Scale", "Écaille d'argent", "Silberne Skala" },                                                     ITEMTYPE_ITEM,              GI_SCALE_SILVER,    true,  &Logic::ProgressiveScale,    RHT_SILVER_SCALE,           ITEM_SCALE_SILVER,              OBJECT_GI_SCALE,        GID_SCALE_SILVER,   0xCD,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_GOLDEN_SCALE] =                        Item(RG_GOLDEN_SCALE,                     Text{ "Golden Scale", "Écaille d'or", "Goldene Skala" },                                                          ITEMTYPE_ITEM,              GI_SCALE_GOLD,      true,  &Logic::ProgressiveScale,    RHT_GOLDEN_SCALE,           ITEM_SCALE_GOLDEN,              OBJECT_GI_SCALE,        GID_SCALE_GOLDEN,   0xCE,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_ADULT_WALLET] =                        Item(RG_ADULT_WALLET,                     Text{ "Adult Wallet", "Grande Bourse", "Erwachsene Geldbörse" },                                                  ITEMTYPE_ITEM,              GI_WALLET_ADULT,    true,  &Logic::ProgressiveWallet,   RHT_ADULT_WALLET,           ITEM_WALLET_ADULT,              OBJECT_GI_PURSE,        GID_WALLET_ADULT,   0x5E,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_GIANT_WALLET] =                        Item(RG_GIANT_WALLET,                     Text{ "Giant Wallet", "Bourse de Géant", "Riesige Geldbörse" },                                                   ITEMTYPE_ITEM,              GI_WALLET_GIANT,    true,  &Logic::ProgressiveWallet,   RHT_GIANT_WALLET,           ITEM_WALLET_GIANT,              OBJECT_GI_PURSE,        GID_WALLET_GIANT,   0x5F,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_TYCOON_WALLET] =                       Item(RG_TYCOON_WALLET,                    Text{ "Tycoon Wallet", "Bourse de Magnat", "Reiche Geldbörse" },                                                  ITEMTYPE_ITEM,              RG_TYCOON_WALLET,   true,  &Logic::ProgressiveWallet,   RHT_TYCOON_WALLET,          RG_TYCOON_WALLET,               OBJECT_GI_PURSE,        GID_WALLET_GIANT,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_DEKU_NUT_CAPACITY_30] =                Item(RG_DEKU_NUT_CAPACITY_30,             Text{ "Deku Nut Capacity (30)", "Capacité de noix Mojo (30)", "Deku Nuss Kapazität (30)" },                       ITEMTYPE_ITEM,              GI_NUT_UPGRADE_30,  false, &Logic::noVariable,          RHT_DEKU_NUT_CAPACITY_30,   ITEM_NUT_UPGRADE_30,            OBJECT_GI_NUTS,         GID_NUTS,           0xA7,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_DEKU_NUT_CAPACITY_40] =                Item(RG_DEKU_NUT_CAPACITY_40,             Text{ "Deku Nut Capacity (40)", "Capacité de noix Mojo (40)", "Deku Nuss Kapazität (40)" },                       ITEMTYPE_ITEM,              GI_NUT_UPGRADE_40,  false, &Logic::noVariable,          RHT_DEKU_NUT_CAPACITY_40,   ITEM_NUT_UPGRADE_40,            OBJECT_GI_NUTS,         GID_NUTS,           0xA8,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_DEKU_STICK_CAPACITY_20] =              Item(RG_DEKU_STICK_CAPACITY_20,           Text{ "Deku Stick Capacity (20)", "Capacité de Bâtons Mojo (20)", "Deku Stick Kapazität (20)" },                  ITEMTYPE_ITEM,              GI_STICK_UPGRADE_20,false, &Logic::noVariable,          RHT_DEKU_STICK_CAPACITY_20, ITEM_STICK_UPGRADE_20,          OBJECT_GI_STICK,        GID_STICK,          0x90,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_DEKU_STICK_CAPACITY_30] =              Item(RG_DEKU_STICK_CAPACITY_30,           Text{ "Deku Stick Capacity (30)", "Capacité de Bâtons Mojo (30)", "Deku Stick Kapazität (30)" },                  ITEMTYPE_ITEM,              GI_STICK_UPGRADE_30,false, &Logic::noVariable,          RHT_DEKU_STICK_CAPACITY_30, ITEM_STICK_UPGRADE_30,          OBJECT_GI_STICK,        GID_STICK,          0x91,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_MAGIC_SINGLE] =                        Item(RG_MAGIC_SINGLE,                     Text{ "Magic Meter", "Jauge de Magie", "Magisches Messgerät" },                                                   ITEMTYPE_ITEM,              0x8A,               true,  &Logic::ProgressiveMagic,    RHT_MAGIC_SINGLE,           RG_MAGIC_SINGLE,                OBJECT_GI_MAGICPOT,     GID_MAGIC_SMALL,    0xE4,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_MAGIC_DOUBLE] =                        Item(RG_MAGIC_DOUBLE,                     Text{ "Enhanced Magic Meter", "Jauge de Magie améliorée", "Verbesserte Magieanzeige" },                           ITEMTYPE_ITEM,              0x8A,               true,  &Logic::ProgressiveMagic,    RHT_MAGIC_DOUBLE,           RG_MAGIC_DOUBLE,                OBJECT_GI_MAGICPOT,     GID_MAGIC_LARGE,    0xE8,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_TRIFORCE_PIECE] =                      Item(RG_TRIFORCE_PIECE,                   Text{ "Triforce Piece", "Triforce Piece", "Triforce Piece" },                                                     ITEMTYPE_ITEM,              0xDF,               true,  &Logic::TriforcePieces,      RHT_TRIFORCE_PIECE,         RG_TRIFORCE_PIECE,              OBJECT_GI_BOMB_2,       GID_TRIFORCE_PIECE, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+}
+
+Item& Rando::StaticData::RetrieveItem(const RandomizerGet rgid) {
+    return itemTable[rgid];
+}
+
+Item& Rando::StaticData::ItemFromGIID(const int giid) {
+    uint32_t index = 0;
+    while (index < RG_MAX) {
+        if (itemTable[index].GetItemID() == giid) {
+            return itemTable[index];
+        }
+        index++;
+    }
+
+    // there are vanilla items that don't exist in the item table we're reading from here
+    // if we made it this far, it means we didn't find an item in the table
+    // if we don't return anything, the game will crash, so, as a workaround, return greg
+    return itemTable[RG_GREEN_RUPEE];
+}
+
+std::array<Item, RG_MAX>& Rando::StaticData::GetItemTable() {
+    return itemTable;
+}
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/item_location.cpp b/soh/soh/Enhancements/randomizer/item_location.cpp
new file mode 100644
index 000000000..62016b282
--- /dev/null
+++ b/soh/soh/Enhancements/randomizer/item_location.cpp
@@ -0,0 +1,189 @@
+#include "item_location.h"
+
+namespace Rando {
+ItemLocation::ItemLocation(RandomizerCheck rc_) : rc(rc_) {}
+
+RandomizerCheck ItemLocation::GetRandomizerCheck() const {
+    return rc;
+}
+
+bool ItemLocation::IsAddedToPool() const {
+    return addedToPool;
+}
+
+void ItemLocation::AddToPool() {
+    addedToPool = true;
+}
+
+void ItemLocation::RemoveFromPool() {
+    addedToPool = false;
+}
+
+const Item& ItemLocation::GetPlacedItem() const {
+    return Rando::StaticData::RetrieveItem(placedItem);
+}
+
+const Text& ItemLocation::GetPlacedItemName() const {
+    return Rando::StaticData::RetrieveItem(placedItem).GetName();
+}
+
+RandomizerGet ItemLocation::GetPlacedRandomizerGet() const {
+    return placedItem;
+}
+
+void ItemLocation::SetPlacedItem(const RandomizerGet item) {
+    placedItem = item;
+    SetPrice (StaticData::RetrieveItem(placedItem).GetPrice());
+}
+
+void ItemLocation::SetDelayedItem(const RandomizerGet item) {
+    delayedItem = item;
+}
+
+void ItemLocation::SaveDelayedItem () {
+    placedItem = delayedItem;
+    delayedItem = RG_NONE;
+}
+
+void ItemLocation::SetParentRegion(RandomizerRegion region) {
+    parentRegion = region;
+}
+
+RandomizerRegion ItemLocation::GetParentRegionKey() const {
+    return parentRegion;
+}
+
+void ItemLocation::PlaceVanillaItem() {
+    placedItem = Rando::StaticData::GetLocation(rc)->GetVanillaItem();
+}
+
+void ItemLocation::ApplyPlacedItemEffect() {
+    Rando::StaticData::RetrieveItem(placedItem).ApplyEffect();
+}
+
+uint16_t ItemLocation::GetPrice() const {
+    if (StaticData::RetrieveItem(placedItem).GetItemType() == ITEMTYPE_SHOP) {
+        return Rando::StaticData::RetrieveItem(placedItem).GetPrice();
+    }
+    return price;
+}
+
+void ItemLocation::SetPrice(uint16_t price_) {
+    if (hasShopsanityPrice || hasScrubsanityPrice) {
+        return;
+    }
+    price = price_;
+}
+
+bool ItemLocation::HasShopsanityPrice() const {
+    return hasShopsanityPrice;
+}
+
+void ItemLocation::SetShopsanityPrice(uint16_t price_) {
+    price = price_;
+    hasShopsanityPrice = true;
+}
+
+bool ItemLocation::HasScrubsanityPrice() const {
+    return hasScrubsanityPrice;
+}
+
+void ItemLocation::SetScrubsanityPrice(uint16_t price_) {
+    price = price_;
+    hasScrubsanityPrice = true;
+}
+
+bool ItemLocation::IsHintable() const {
+    return isHintable;
+}
+
+void ItemLocation::SetAsHintable() {
+    isHintable = true;
+}
+
+bool ItemLocation::IsHintedAt() const {
+    return hintedAt;
+}
+
+void ItemLocation::SetAsHinted() {
+    hintedAt = true;
+}
+
+RandomizerHintKey ItemLocation::GetHintKey() const {
+    return hintedBy;
+}
+
+void ItemLocation::SetHintKey(RandomizerHintKey hintKey) {
+    hintedBy = hintKey;
+} 
+
+bool ItemLocation::IsHidden() const {
+    return hidden;
+}
+
+void ItemLocation::SetHidden(const bool hidden_) {
+    hidden = hidden_;
+}
+
+bool ItemLocation::IsExcluded() const {
+    return excludedOption.Value<bool>();
+}
+
+Option* ItemLocation::GetExcludedOption() {
+    return &excludedOption;
+}
+
+void ItemLocation::AddExcludeOption() {
+    const std::string name = StaticData::GetLocation(rc)->GetName();
+    if (name.length() < 23) {
+        excludedOption = Option::Bool(name, {"Include", "Exclude"});
+    } else {
+        size_t lastSpace = name.rfind(' ', 23);
+        std::string settingText = name;
+        settingText.replace(lastSpace, 1, "\n ");
+
+        excludedOption = Option::Bool(settingText, {"Include", "Exclude"});
+    }
+    // RANDOTODO: this without string compares and loops
+    bool alreadyAdded = false;
+    Rando::Location* loc = StaticData::GetLocation(rc);
+    for (const Option* location : Settings::excludeLocationsOptionsVector[loc->GetCollectionCheckGroup()]) {
+        if (location->GetName() == excludedOption.GetName()) {
+            alreadyAdded = true;
+        }
+    }
+    if (!alreadyAdded) {
+        Settings::excludeLocationsOptionsVector[loc->GetCollectionCheckGroup()].push_back(&excludedOption);
+    }
+}
+
+bool ItemLocation::IsVisible() const {
+    return visibleInImGui;
+}
+void ItemLocation::SetVisible(bool visibleInImGui_) {
+    visibleInImGui = visibleInImGui_;
+
+}
+
+ItemOverride_Key ItemLocation::Key() const {
+    ItemOverride_Key key;
+    key.all = 0;
+
+    key.scene = Rando::StaticData::GetLocation(rc)->GetScene();
+    key.type = static_cast<uint8_t>(StaticData::GetLocation(rc)->GetLocationType()); // TODO make sure these match up
+    return key;
+}
+
+void ItemLocation::ResetVariables() {
+    addedToPool = false;
+    placedItem = RG_NONE;
+    delayedItem = RG_NONE;
+    isHintable = false;
+    hintedAt = false;
+    hintedBy = RH_NONE;
+    price = 0;
+    hasShopsanityPrice = false;
+    hasScrubsanityPrice = false;
+    hidden = false;
+}
+}
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/item_location.h b/soh/soh/Enhancements/randomizer/item_location.h
new file mode 100644
index 000000000..5b1c0dba7
--- /dev/null
+++ b/soh/soh/Enhancements/randomizer/item_location.h
@@ -0,0 +1,105 @@
+#pragma once
+
+#include "randomizerTypes.h"
+#include "item.h"
+#include "3drando/text.hpp"
+#include "static_data.h"
+
+namespace Rando {
+enum ItemOverride_Type {
+    OVR_BASE_ITEM = 0,
+    OVR_CHEST = 1,
+    OVR_COLLECTABLE = 2,
+    OVR_SKULL = 3,
+    OVR_GROTTO_SCRUB = 4,
+    OVR_DELAYED = 5,
+    OVR_TEMPLE = 6,
+};
+
+typedef union ItemOverride_Key {
+    uint32_t all;
+    struct {
+        char pad_;
+        uint8_t scene;
+        uint8_t type;
+    };
+} ItemOverride_Key;
+
+typedef union ItemOverride_Value {
+    uint32_t all;
+    struct {
+        uint16_t itemId;
+        uint8_t player;
+        uint8_t looksLikeItemId;
+    };
+} ItemOverride_Value;
+
+typedef struct ItemOverride {
+    ItemOverride_Key key;
+    ItemOverride_Value value;
+} ItemOverride;
+
+class ItemOverride_Compare {
+  public:
+    bool operator()(ItemOverride lhs, ItemOverride rhs) const {
+        return lhs.key.all < rhs.key.all;
+    }
+};
+
+class ItemLocation {
+  public:
+    ItemLocation() = default;
+    ItemLocation(RandomizerCheck rc);
+    RandomizerCheck GetRandomizerCheck() const;
+    bool IsAddedToPool() const;
+    void AddToPool();
+    void RemoveFromPool();
+    const Item& GetPlacedItem() const;
+    const Text& GetPlacedItemName() const;
+    RandomizerGet GetPlacedRandomizerGet() const;
+    void SetPlacedItem(const RandomizerGet item);
+    void SetDelayedItem(const RandomizerGet item);
+    RandomizerRegion GetParentRegionKey() const;
+    void SetParentRegion (RandomizerRegion region);
+    void PlaceVanillaItem();
+    void ApplyPlacedItemEffect();
+    void SaveDelayedItem();
+    uint16_t GetPrice() const;
+    void SetPrice(uint16_t price_);
+    bool HasShopsanityPrice() const;
+    void SetShopsanityPrice(uint16_t price_);
+    bool HasScrubsanityPrice() const;
+    void SetScrubsanityPrice(uint16_t price_);
+    bool IsHintable() const;
+    void SetAsHintable();
+    bool IsHintedAt() const;
+    void SetAsHinted();
+    RandomizerHintKey GetHintKey() const;
+    void SetHintKey(RandomizerHintKey hintKey);
+    bool IsHidden() const;
+    bool IsExcluded() const;
+    void AddExcludeOption();
+    Option* GetExcludedOption();
+    void SetHidden(const bool hidden_);
+    bool IsVisible() const;
+    void SetVisible(bool visibleInImGui_);
+    Rando::ItemOverride_Key Key() const;
+    void ResetVariables();
+
+  private:
+    RandomizerCheck rc;
+    RandomizerHintKey hintedBy;
+    bool hintedAt = false;
+    bool isHintable = false;
+    bool addedToPool = false;
+    RandomizerGet placedItem = RG_NONE;
+    RandomizerGet delayedItem = RG_NONE;
+    Option excludedOption = Option::Bool(StaticData::GetLocation(rc)->GetName(), {"Include", "Exclude"});
+    uint16_t price = 0;
+    RandomizerRegion parentRegion = RR_NONE;
+    bool hasShopsanityPrice = false;
+    bool hasScrubsanityPrice = false;
+    bool hidden = false;
+    bool visibleInImGui = false;
+};
+} // namespace Rando
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/location.cpp b/soh/soh/Enhancements/randomizer/location.cpp
new file mode 100644
index 000000000..e50b21be0
--- /dev/null
+++ b/soh/soh/Enhancements/randomizer/location.cpp
@@ -0,0 +1,252 @@
+#include "location.h"
+#include "3drando/hint_list.hpp"
+
+RandomizerCheck Rando::Location::GetRandomizerCheck() const {
+    return rc;
+}
+
+Rando::SpoilerCollectionCheck Rando::Location::GetCollectionCheck() const {
+    return collectionCheck;
+}
+
+SpoilerCollectionCheckGroup Rando::Location::GetCollectionCheckGroup() const {
+    return collectionCheckGroup;
+}
+
+RandomizerCheckQuest Rando::Location::GetQuest() const {
+    return quest;
+}
+
+RandomizerCheckArea Rando::Location::GetArea() const {
+    return area;
+}
+
+RandomizerCheckType Rando::Location::GetRCType() const {
+    return checkType;
+}
+
+ActorID Rando::Location::GetActorID() const {
+    return actorId;
+}
+
+int32_t Rando::Location::GetActorParams() const {
+    return actorParams;
+}
+
+SceneID Rando::Location::GetScene() const {
+    return (SceneID)scene;
+}
+
+uint8_t Rando::Location::GetFlag() const {
+    return flag;
+}
+
+RandomizerHintTextKey Rando::Location::GetHintKey() const {
+    return hintKey;
+}
+
+HintText* Rando::Location::GetHint() {
+    return &hintTable[hintKey];
+}
+
+const std::string& Rando::Location::GetName() const {
+    return spoilerName;
+}
+
+const std::string& Rando::Location::GetShortName() const {
+    return shortName;
+}
+
+Rando::LocationType Rando::Location::GetLocationType() const {
+    return locationType;
+}
+
+bool Rando::Location::IsCategory(Category category) const {
+    return std::any_of(categories.begin(), categories.end(), [category](auto entry) { return entry == category; });
+}
+
+bool Rando::Location::IsDungeon() const {
+    return (locationType != LocationType::GSToken &&
+            (scene < SCENE_GANONS_TOWER_COLLAPSE_INTERIOR ||
+             (scene > SCENE_TREASURE_BOX_SHOP && scene < SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR))) ||
+           (locationType == LocationType::GSToken && scene < SCENE_GANONS_TOWER);
+}
+
+bool Rando::Location::IsOverworld() const {
+    return !IsDungeon();
+}
+
+bool Rando::Location::IsShop() const {
+    return (scene >= SCENE_BAZAAR && scene <= SCENE_BOMBCHU_SHOP);
+}
+
+bool Rando::Location::IsVanillaCompletion() const {
+    return isVanillaCompletion;
+}
+
+uint32_t Rando::Location::Getuint32_t() const {
+    return hintKey;
+}
+
+const HintText& Rando::Location::GetHint() const {
+    return Hint(hintKey);
+}
+
+RandomizerGet Rando::Location::GetVanillaItem() const {
+    return vanillaItem;
+}
+
+Rando::Location Rando::Location::Base(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
+                                      RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_, int32_t actorParams_,
+                                      uint8_t flag_, std::string&& shortName_, std::string&& spoilerName_,
+                                      const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
+                                      std::vector<Category>&& categories, SpoilerCollectionCheck collectionCheck,
+                                      SpoilerCollectionCheckGroup collectionCheckGroup, bool isVanillaCompletion_) {
+    return Location(rc, quest_, checkType_, area_, LocationType::Base, actorId_, scene_, actorParams_, flag_,
+                    std::move(shortName_), std::move(spoilerName_), hintKey, vanillaItem, std::move(categories),
+                    isVanillaCompletion_, collectionCheck, collectionCheckGroup);
+}
+
+Rando::Location Rando::Location::Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
+                                       RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_,
+                                       int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
+                                       std::string&& spoilerName_, const RandomizerHintTextKey hintKey,
+                                       const RandomizerGet vanillaItem, std::vector<Category>&& categories,
+                                       SpoilerCollectionCheckGroup collectionCheckGroup, bool isVanillaCompletion_) {
+    return Location(rc, quest_, checkType_, area_, LocationType::Chest, actorId_, scene_, actorParams_, flag_,
+                    std::move(shortName_), std::move(spoilerName_), hintKey, vanillaItem, std::move(categories),
+                    isVanillaCompletion_,
+                    SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_CHEST, scene_, flag_),
+                    collectionCheckGroup);
+}
+
+Rando::Location Rando::Location::Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
+                                       RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_,
+                                       int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
+                                       std::string&& spoilerName_, const RandomizerHintTextKey hintKey,
+                                       const RandomizerGet vanillaItem, std::vector<Category>&& categories,
+                                       SpoilerCollectionCheck collectionCheck,
+                                       SpoilerCollectionCheckGroup collectionCheckGroup, bool isVanillaCompletion_) {
+    return Location(rc, quest_, checkType_, area_, LocationType::Chest, actorId_, scene_, actorParams_, flag_,
+                    std::move(shortName_), std::move(spoilerName_), hintKey, vanillaItem, std::move(categories),
+                    isVanillaCompletion_, collectionCheck, collectionCheckGroup);
+}
+
+Rando::Location Rando::Location::Collectable(
+    RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_,
+    ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
+    std::string&& spoilerName_, const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
+    std::vector<Category>&& categories, SpoilerCollectionCheckGroup collectionCheckGroup, bool isVanillaCompletion_) {
+    return Location(rc, quest_, checkType_, area_, LocationType::Collectable, actorId_, scene_, actorParams_, flag_,
+                    std::move(shortName_), std::move(spoilerName_), hintKey, vanillaItem, std::move(categories),
+                    isVanillaCompletion_,
+                    SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_COLLECTABLE, scene_, flag_),
+                    collectionCheckGroup);
+}
+
+Rando::Location Rando::Location::Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_,
+                                             RandomizerCheckType checkType_, RandomizerCheckArea area_,
+                                             ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_,
+                                             std::string&& shortName_, std::string&& spoilerName_,
+                                             const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
+                                             std::vector<Category>&& categories, uint8_t collectFlag_,
+                                             SpoilerCollectionCheckGroup collectionCheckGroup,
+                                             bool isVanillaCompletion_) {
+    return Location(rc, quest_, checkType_, area_, LocationType::Collectable, actorId_, scene_, actorParams_, flag_,
+                    std::move(shortName_), std::move(spoilerName_), hintKey, vanillaItem, std::move(categories),
+                    isVanillaCompletion_,
+                    SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_COLLECTABLE, scene_, collectFlag_),
+                    collectionCheckGroup);
+}
+
+Rando::Location Rando::Location::Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_,
+                                             RandomizerCheckType checkType_, RandomizerCheckArea area_,
+                                             ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_,
+                                             std::string&& shortName_, std::string&& spoilerName_,
+                                             const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
+                                             std::vector<Category>&& categories, SpoilerCollectionCheck collectionCheck,
+                                             SpoilerCollectionCheckGroup collectionCheckGroup,
+                                             bool isVanillaCompletion_) {
+    return Location(rc, quest_, checkType_, area_, LocationType::Collectable, actorId_, scene_, actorParams_, flag_,
+                    std::move(shortName_), std::move(spoilerName_), hintKey, vanillaItem, std::move(categories),
+                    isVanillaCompletion_, collectionCheck, collectionCheckGroup);
+}
+
+Rando::Location Rando::Location::GSToken(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
+                                         uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
+                                         std::string&& spoilerName_, const RandomizerHintTextKey hintKey,
+                                         std::vector<Category>&& categories,
+                                         SpoilerCollectionCheckGroup collectionCheckGroup, bool isVanillaCompletion_) {
+    return Location(rc, quest_, RCTYPE_SKULL_TOKEN, area_, LocationType::GSToken, ACTOR_EN_SI, scene_, actorParams_,
+                    flag_, std::move(shortName_), std::move(spoilerName_), hintKey, RG_GOLD_SKULLTULA_TOKEN,
+                    std::move(categories), isVanillaCompletion_,
+                    SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_GOLD_SKULLTULA, scene_, flag_),
+                    collectionCheckGroup);
+}
+
+Rando::Location Rando::Location::GSToken(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
+                                         uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
+                                         std::string&& spoilerName_, const RandomizerHintTextKey hintKey,
+                                         std::vector<Category>&& categories, uint8_t skullScene_,
+                                         SpoilerCollectionCheckGroup collectionCheckGroup, bool isVanillaCompletion_) {
+    return Location(rc, quest_, RCTYPE_SKULL_TOKEN, area_, LocationType::GSToken, ACTOR_EN_SI, scene_, actorParams_,
+                    flag_, std::move(shortName_), std::move(spoilerName_), hintKey, RG_GOLD_SKULLTULA_TOKEN,
+                    std::move(categories), isVanillaCompletion_,
+                    SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_GOLD_SKULLTULA, skullScene_, flag_),
+                    collectionCheckGroup);
+}
+
+Rando::Location Rando::Location::GrottoScrub(RandomizerCheck rc, RandomizerCheckQuest quest_,
+                                             RandomizerCheckType checkType_, RandomizerCheckArea area_,
+                                             ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_,
+                                             std::string&& shortName_, std::string&& spoilerName_,
+                                             const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
+                                             std::vector<Category>&& categories, SpoilerCollectionCheck collectionCheck,
+                                             SpoilerCollectionCheckGroup collectionCheckGroup,
+                                             bool isVanillaCompletion_) {
+    return Location(rc, quest_, checkType_, area_, LocationType::GrottoScrub, actorId_, scene_, actorParams_, flag_,
+                    std::move(shortName_), std::move(spoilerName_), hintKey, vanillaItem, std::move(categories),
+                    isVanillaCompletion_, collectionCheck, collectionCheckGroup);
+}
+
+Rando::Location Rando::Location::Delayed(RandomizerCheck rc, RandomizerCheckQuest quest_,
+                                         RandomizerCheckType checkType_, RandomizerCheckArea area_, ActorID actorId_,
+                                         uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
+                                         std::string&& spoilerName_, const RandomizerHintTextKey hintKey,
+                                         const RandomizerGet vanillaItem, std::vector<Category>&& categories,
+                                         SpoilerCollectionCheck collectionCheck,
+                                         SpoilerCollectionCheckGroup collectionCheckGroup, bool isVanillaCompletion_) {
+    return Location(rc, quest_, checkType_, area_, LocationType::Delayed, actorId_, scene_, actorParams_, flag_,
+                    std::move(shortName_), std::move(spoilerName_), hintKey, vanillaItem, std::move(categories),
+                    isVanillaCompletion_, collectionCheck, collectionCheckGroup);
+}
+
+Rando::Location Rando::Location::Reward(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
+                                        RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_,
+                                        int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
+                                        std::string&& spoilerName_, const RandomizerHintTextKey hintKey,
+                                        const RandomizerGet vanillaItem, std::vector<Category>&& categories,
+                                        SpoilerCollectionCheck collectionCheck,
+                                        SpoilerCollectionCheckGroup collectionCheckGroup, bool isVanillaCompletion_) {
+    return Location(rc, quest_, checkType_, area_, LocationType::TempleReward, actorId_, scene_, actorParams_, flag_,
+                    std::move(shortName_), std::move(spoilerName_), hintKey, vanillaItem, std::move(categories),
+                    isVanillaCompletion_, collectionCheck, collectionCheckGroup);
+}
+
+Rando::Location Rando::Location::OtherHint(RandomizerCheck rc, RandomizerCheckQuest quest_,
+                                           RandomizerCheckType checkType_, RandomizerCheckArea area_, ActorID actorId_,
+                                           uint8_t scene_, int32_t actorParams_, uint8_t flag_,
+                                           std::string&& shortName_, std::string&& spoilerName_,
+                                           std::vector<Category>&& categories, bool isVanillaCompletion_) {
+    return Location(rc, quest_, checkType_, area_, LocationType::OtherHint, actorId_, scene_, actorParams_, flag_,
+                    std::move(shortName_), std::move(spoilerName_), RHT_NONE, RG_NONE, std::move(categories), isVanillaCompletion_);
+}
+
+Rando::Location Rando::Location::HintStone(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
+                                           uint8_t scene_, int32_t actorParams_, uint8_t flag_,
+                                           std::string&& shortName_, std::string&& spoilerName_,
+                                           std::vector<Category>&& categories, bool isVanillaCompletion_) {
+    return Location(rc, quest_, RCTYPE_GOSSIP_STONE, area_, LocationType::Base, ACTOR_EN_GS, scene_, actorParams_, flag_,
+                    std::move(shortName_), std::move(spoilerName_), RHT_NONE, RG_NONE, std::move(categories),
+                    isVanillaCompletion_);
+}
diff --git a/soh/soh/Enhancements/randomizer/location.h b/soh/soh/Enhancements/randomizer/location.h
new file mode 100644
index 000000000..a1a47fd8f
--- /dev/null
+++ b/soh/soh/Enhancements/randomizer/location.h
@@ -0,0 +1,285 @@
+#pragma once
+
+#include <vector>
+
+#include "3drando/spoiler_log.hpp"
+#include "3drando/category.hpp"
+#include "3drando/hints.hpp"
+
+#include "z64item.h"
+#include "randomizerTypes.h"
+#include "z64actor_enum.h"
+#include "z64scene.h"
+
+namespace Rando {
+class SpoilerCollectionCheck {
+  public:
+    SpoilerCollectionCheckType type = SpoilerCollectionCheckType::SPOILER_CHK_NONE;
+    uint8_t scene = 0;
+    uint8_t flag = 0;
+
+    SpoilerCollectionCheck() {
+    }
+    SpoilerCollectionCheck(SpoilerCollectionCheckType type_, uint8_t scene_, uint8_t flag_)
+        : type(type_), scene(scene_), flag(flag_) {
+    }
+
+    static auto None() {
+        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_NONE, 0x00, 0x00);
+    }
+
+    static auto AlwaysCollected() {
+        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_ALWAYS_COLLECTED, 0x00, 0x00);
+    }
+
+    static auto ItemGetInf(uint8_t slot) {
+        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_ITEM_GET_INF, 0x00, slot);
+    }
+
+    static auto EventChkInf(uint8_t flag) {
+        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_EVENT_CHK_INF, 0xFF, flag);
+    }
+
+    static auto InfTable(uint8_t offset, uint8_t bit) {
+        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_INF_TABLE, offset, bit);
+    }
+
+    static auto Collectable(uint8_t scene, uint8_t flag) {
+        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_COLLECTABLE, scene, flag);
+    }
+
+    static auto Chest(uint8_t scene, uint8_t flag) {
+        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_CHEST, scene, flag);
+    }
+
+    static auto Cow(uint8_t scene, uint8_t flag) {
+        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_COW, scene, flag);
+    }
+
+    static auto Fishing(uint8_t bit) {
+        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_MINIGAME, 0x00, bit);
+    }
+
+    static auto Scrub(uint8_t scene, uint8_t bit) {
+        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_SCRUB, scene, bit);
+    }
+
+    static auto GerudoToken() {
+        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_GERUDO_MEMBERSHIP_CARD, 0x00, 0x00);
+    }
+
+    static auto BigPoePoints() {
+        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_POE_POINTS, 0x00, 0x00);
+    }
+
+    static auto Gravedigger(uint8_t scene, uint8_t flag) {
+        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_GRAVEDIGGER, scene, flag);
+    }
+
+    static auto ShopItem(uint8_t scene, uint8_t itemSlot) {
+        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_SHOP_ITEM, scene, itemSlot);
+    }
+
+    static auto MagicBeans(uint8_t scene, uint8_t flag) {
+        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_MAGIC_BEANS, scene, flag);
+    }
+
+    static auto Merchant(int8_t scene, uint8_t flag) {
+        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_MERCHANT, scene, flag);
+    }
+
+    static auto RandomizerInf(int8_t scene, uint8_t flag) {
+        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_RANDOMIZER_INF, scene, flag);
+    }
+};
+
+enum class LocationType {
+    Base,
+    Chest,
+    Collectable,
+    GSToken,
+    GrottoScrub,
+    Delayed,
+    TempleReward,
+    HintStone,
+    OtherHint,
+};
+
+class Location {
+  public:
+    Location() = default;
+    Location(RandomizerCheck rc_, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
+             RandomizerCheckArea area_, LocationType locationType_, ActorID actorId_, uint8_t scene_,
+             int32_t actorParams_, uint8_t flag_, std::string shortName_, std::string spoilerName_,
+             RandomizerHintTextKey hintKey_, RandomizerGet vanillaItem_, std::vector<Category> categories_,
+             bool isVanillaCompletion_ = false, SpoilerCollectionCheck collectionCheck_ = SpoilerCollectionCheck(),
+             SpoilerCollectionCheckGroup collectionCheckGroup_ = SpoilerCollectionCheckGroup::GROUP_NO_GROUP)
+        : rc(rc_), quest(quest_), checkType(checkType_), area(area_), locationType(locationType_), actorId(actorId_),
+          scene(scene_), actorParams(actorParams_), flag(flag_), shortName(std::move(shortName_)),
+          spoilerName(spoilerName_), hintKey(hintKey_), vanillaItem(vanillaItem_), categories(std::move(categories_)),
+          isVanillaCompletion(isVanillaCompletion_), collectionCheck(collectionCheck_),
+          collectionCheckGroup(collectionCheckGroup_) {
+    }
+
+    RandomizerCheck GetRandomizerCheck() const;
+    SpoilerCollectionCheck GetCollectionCheck() const;
+    SpoilerCollectionCheckGroup GetCollectionCheckGroup() const;
+    RandomizerCheckQuest GetQuest() const;
+    RandomizerCheckArea GetArea() const;
+    RandomizerCheckType GetRCType() const;
+    ActorID GetActorID() const;
+    int32_t GetActorParams() const;
+    SceneID GetScene() const;
+    uint8_t GetFlag() const;
+    RandomizerHintTextKey GetHintKey() const;
+    HintText* GetHint();
+    const std::string& GetName() const;
+    const std::string& GetShortName() const;
+    LocationType GetLocationType() const;
+    bool IsCategory(Category category) const;
+    bool IsDungeon() const;
+    bool IsOverworld() const;
+    bool IsShop() const;
+    bool IsVanillaCompletion() const;
+    uint32_t Getuint32_t() const;
+    const HintText& GetHint() const;
+    RandomizerGet GetVanillaItem() const;
+
+    static Location Base(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
+                         RandomizerCheckArea area_, ActorID actorId_, uint8_t scene, int32_t actorParams_,
+                         uint8_t flag_, std::string&& shortName_, std::string&& spoilerName_,
+                         const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
+                         std::vector<Category>&& categories,
+                         SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(),
+                         SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP,
+                         bool isVanillaCompletion_ = false);
+
+    static Location
+    Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_,
+          ActorID actorId_, uint8_t scene, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
+          std::string&& spoilerName_, const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
+          std::vector<Category>&& categories,
+          SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP,
+          bool isVanillaCompletion_ = false);
+
+    static Location
+    Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_,
+          ActorID actorId_, uint8_t scene, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
+          std::string&& spoilerName_, const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
+          std::vector<Category>&& categories, SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(),
+          SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP,
+          bool isVanillaCompletion_ = false);
+
+    static Location
+    Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
+                RandomizerCheckArea area_, ActorID actorId_, uint8_t scene, int32_t actorParams_, uint8_t flag_,
+                std::string&& shortName_, std::string&& spoilerName_, const RandomizerHintTextKey hintKey,
+                const RandomizerGet vanillaItem, std::vector<Category>&& categories,
+                SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP,
+                bool isVanillaCompletion_ = false);
+
+    static Location
+    Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
+                RandomizerCheckArea area_, ActorID actorId_, uint8_t scene, int32_t actorParams_, uint8_t flag_,
+                std::string&& shortName_, std::string&& spoilerName_, const RandomizerHintTextKey hintKey,
+                const RandomizerGet vanillaItem, std::vector<Category>&& categories, uint8_t collectFlag_,
+                SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP,
+                bool isVanillaCompletion_ = false);
+
+    static Location
+    Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
+                RandomizerCheckArea area_, ActorID actorId_, uint8_t scene, int32_t actorParams_, uint8_t flag_,
+                std::string&& shortName_, std::string&& spoilerName_, const RandomizerHintTextKey hintKey,
+                const RandomizerGet vanillaItem, std::vector<Category>&& categories,
+                SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(),
+                SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP,
+                bool isVanillaCompletion_ = false);
+
+    static Location
+    GSToken(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
+            uint8_t scene, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
+            std::string&& spoilerName_, const RandomizerHintTextKey hintKey, std::vector<Category>&& categories,
+            SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP,
+            bool isVanillaCompletion_ = true);
+
+    /// @brief For certain scenes, the sceneId and the "Scene" in spoiler collection check later used to check the
+    /// GS flags don't necessarily match. Use this constructor for those. scene_ should be the actual scene where
+    /// the GS is located, skullScene_ is the value passed to GET_GS_FLAGS to get the correct skulltula. It is normal
+    /// and expected that these don't always match, and the naming is a holdover from 3drando.
+    /// @param rc 
+    /// @param quest_ 
+    /// @param area_ 
+    /// @param scene_ 
+    /// @param actorParams_ 
+    /// @param flag_ 
+    /// @param shortName_ 
+    /// @param spoilerName_ 
+    /// @param hintKey 
+    /// @param categories 
+    /// @param collectionCheckGroup 
+    /// @param skullScene_ 
+    /// @param isVanillaCompletion_ 
+    /// @return
+    static Location
+    GSToken(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
+            uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
+            std::string&& spoilerName_, const RandomizerHintTextKey hintKey, std::vector<Category>&& categories,
+            uint8_t skullScene_,
+            SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP,
+            bool isVanillaCompletion_ = true);
+
+    static Location
+    GrottoScrub(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
+                RandomizerCheckArea area_, ActorID actorId_, uint8_t scene, int32_t actorParams_, uint8_t flag_,
+                std::string&& shortName_, std::string&& spoilerName_, const RandomizerHintTextKey hintKey,
+                const RandomizerGet vanillaItem, std::vector<Category>&& categories,
+                SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(),
+                SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP,
+                bool isVanillaCompletion_ = false);
+
+    static Location
+    Delayed(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_,
+            ActorID actorId_, uint8_t scene, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
+            std::string&& spoilerName_, const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
+            std::vector<Category>&& categories, SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(),
+            SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP,
+            bool isVanillaCompletion_ = false);
+
+    static Location
+    Reward(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_,
+           ActorID actorId_, uint8_t scene, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
+           std::string&& spoilerName_, const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
+           std::vector<Category>&& categories, SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(),
+           SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP, bool isVanillaCompletion_ = false);
+
+    static Location OtherHint(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
+                              RandomizerCheckArea area_, ActorID actorId_, uint8_t scene, int32_t actorParams_,
+                              uint8_t flag_, std::string&& shortName_, std::string&& spoilerName_,
+                              std::vector<Category>&& categories, bool isVanillaCompletion_ = false);
+
+    static Location HintStone(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_, uint8_t scene,
+                              int32_t actorParams_, uint8_t flag_, std::string&& shortName_, std::string&& spoilerName_,
+                              std::vector<Category>&& categories, bool isVanillaCompletion_ = false);
+
+  private:
+    RandomizerCheck rc;
+    RandomizerCheckQuest quest;
+    RandomizerCheckType checkType;
+    RandomizerCheckArea area;
+    LocationType locationType;
+    ActorID actorId;
+    uint8_t scene;
+    int32_t actorParams;
+    uint8_t flag;
+    bool checked = false;
+    std::string shortName;
+    std::string spoilerName;
+    RandomizerHintTextKey hintKey = RHT_NONE;
+    RandomizerGet vanillaItem = RG_NONE;
+    std::vector<Category> categories;
+    bool isVanillaCompletion = false;
+    SpoilerCollectionCheck collectionCheck;
+    SpoilerCollectionCheckGroup collectionCheckGroup;
+    bool isHintable = false;
+};
+} // namespace Rando
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/location_list.cpp b/soh/soh/Enhancements/randomizer/location_list.cpp
new file mode 100644
index 000000000..05b28fc17
--- /dev/null
+++ b/soh/soh/Enhancements/randomizer/location_list.cpp
@@ -0,0 +1,1417 @@
+#include "static_data.h"
+
+#define TWO_ACTOR_PARAMS(a, b) (abs(a) << 16) | abs(b)
+
+std::array<Rando::Location, RC_MAX> Rando::StaticData::locationTable;
+
+std::vector<RandomizerCheck> KF_ShopLocations = {
+    RC_KF_SHOP_ITEM_1, RC_KF_SHOP_ITEM_2, RC_KF_SHOP_ITEM_3, RC_KF_SHOP_ITEM_4,
+    RC_KF_SHOP_ITEM_5, RC_KF_SHOP_ITEM_6, RC_KF_SHOP_ITEM_7, RC_KF_SHOP_ITEM_8,
+};
+std::vector<RandomizerCheck> Kak_PotionShopLocations = {
+    RC_KAK_POTION_SHOP_ITEM_1, RC_KAK_POTION_SHOP_ITEM_2, RC_KAK_POTION_SHOP_ITEM_3, RC_KAK_POTION_SHOP_ITEM_4,
+    RC_KAK_POTION_SHOP_ITEM_5, RC_KAK_POTION_SHOP_ITEM_6, RC_KAK_POTION_SHOP_ITEM_7, RC_KAK_POTION_SHOP_ITEM_8,
+};
+std::vector<RandomizerCheck> MK_BombchuShopLocations = {
+    RC_MARKET_BOMBCHU_SHOP_ITEM_1, RC_MARKET_BOMBCHU_SHOP_ITEM_2, RC_MARKET_BOMBCHU_SHOP_ITEM_3,
+    RC_MARKET_BOMBCHU_SHOP_ITEM_4, RC_MARKET_BOMBCHU_SHOP_ITEM_5, RC_MARKET_BOMBCHU_SHOP_ITEM_6,
+    RC_MARKET_BOMBCHU_SHOP_ITEM_7, RC_MARKET_BOMBCHU_SHOP_ITEM_8,
+};
+std::vector<RandomizerCheck> MK_PotionShopLocations = {
+    RC_MARKET_POTION_SHOP_ITEM_1, RC_MARKET_POTION_SHOP_ITEM_2, RC_MARKET_POTION_SHOP_ITEM_3,
+    RC_MARKET_POTION_SHOP_ITEM_4, RC_MARKET_POTION_SHOP_ITEM_5, RC_MARKET_POTION_SHOP_ITEM_6,
+    RC_MARKET_POTION_SHOP_ITEM_7, RC_MARKET_POTION_SHOP_ITEM_8,
+};
+std::vector<RandomizerCheck> MK_BazaarLocations = {
+    RC_MARKET_BAZAAR_ITEM_1, RC_MARKET_BAZAAR_ITEM_2, RC_MARKET_BAZAAR_ITEM_3, RC_MARKET_BAZAAR_ITEM_4,
+    RC_MARKET_BAZAAR_ITEM_5, RC_MARKET_BAZAAR_ITEM_6, RC_MARKET_BAZAAR_ITEM_7, RC_MARKET_BAZAAR_ITEM_8,
+};
+std::vector<RandomizerCheck> Kak_BazaarLocations = {
+    RC_KAK_BAZAAR_ITEM_1, RC_KAK_BAZAAR_ITEM_2, RC_KAK_BAZAAR_ITEM_3, RC_KAK_BAZAAR_ITEM_4,
+    RC_KAK_BAZAAR_ITEM_5, RC_KAK_BAZAAR_ITEM_6, RC_KAK_BAZAAR_ITEM_7, RC_KAK_BAZAAR_ITEM_8,
+};
+std::vector<RandomizerCheck> ZD_ShopLocations = {
+    RC_ZD_SHOP_ITEM_1, RC_ZD_SHOP_ITEM_2, RC_ZD_SHOP_ITEM_3, RC_ZD_SHOP_ITEM_4,
+    RC_ZD_SHOP_ITEM_5, RC_ZD_SHOP_ITEM_6, RC_ZD_SHOP_ITEM_7, RC_ZD_SHOP_ITEM_8,
+};
+std::vector<RandomizerCheck> GC_ShopLocations = {
+    RC_GC_SHOP_ITEM_1, RC_GC_SHOP_ITEM_2, RC_GC_SHOP_ITEM_3, RC_GC_SHOP_ITEM_4,
+    RC_GC_SHOP_ITEM_5, RC_GC_SHOP_ITEM_6, RC_GC_SHOP_ITEM_7, RC_GC_SHOP_ITEM_8,
+};
+// List of shop location lists, used for shop shuffle
+std::vector<std::vector<RandomizerCheck>> Rando::StaticData::shopLocationLists = {
+    KF_ShopLocations,   Kak_PotionShopLocations, MK_BombchuShopLocations, MK_PotionShopLocations,
+    MK_BazaarLocations, Kak_BazaarLocations,     ZD_ShopLocations,        GC_ShopLocations,
+};
+
+std::vector<RandomizerCheck> Rando::StaticData::scrubLocations = {
+    RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT,
+    RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT,
+    RC_LW_DEKU_SCRUB_NEAR_BRIDGE,
+    RC_LW_DEKU_SCRUB_GROTTO_REAR,
+    RC_LW_DEKU_SCRUB_GROTTO_FRONT,
+    RC_SFM_DEKU_SCRUB_GROTTO_REAR,
+    RC_SFM_DEKU_SCRUB_GROTTO_FRONT,
+    RC_HF_DEKU_SCRUB_GROTTO,
+    RC_LH_DEKU_SCRUB_GROTTO_LEFT,
+    RC_LH_DEKU_SCRUB_GROTTO_RIGHT,
+    RC_LH_DEKU_SCRUB_GROTTO_CENTER,
+    RC_GV_DEKU_SCRUB_GROTTO_REAR,
+    RC_GV_DEKU_SCRUB_GROTTO_FRONT,
+    RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,
+    RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT,
+    RC_GC_DEKU_SCRUB_GROTTO_LEFT,
+    RC_GC_DEKU_SCRUB_GROTTO_RIGHT,
+    RC_GC_DEKU_SCRUB_GROTTO_CENTER,
+    RC_DMC_DEKU_SCRUB,
+    RC_DMC_DEKU_SCRUB_GROTTO_LEFT,
+    RC_DMC_DEKU_SCRUB_GROTTO_RIGHT,
+    RC_DMC_DEKU_SCRUB_GROTTO_CENTER,
+    RC_ZR_DEKU_SCRUB_GROTTO_REAR,
+    RC_ZR_DEKU_SCRUB_GROTTO_FRONT,
+    RC_LLR_DEKU_SCRUB_GROTTO_LEFT,
+    RC_LLR_DEKU_SCRUB_GROTTO_RIGHT,
+    RC_LLR_DEKU_SCRUB_GROTTO_CENTER,
+    RC_DEKU_TREE_MQ_DEKU_SCRUB,
+    RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,
+    RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS,
+    RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT,
+    RC_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY,
+    RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,
+    RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT,
+    RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,
+    RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS,
+    RC_JABU_JABUS_BELLY_DEKU_SCRUB,
+    RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,
+    RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT,
+    RC_GANONS_CASTLE_DEKU_SCRUB_RIGHT,
+    RC_GANONS_CASTLE_DEKU_SCRUB_LEFT,
+    RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,
+    RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,
+    RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,
+    RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT,
+    RC_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,
+};
+
+std::vector<RandomizerCheck> Rando::StaticData::dungeonRewardLocations = {
+    // Bosses
+    RC_QUEEN_GOHMA, RC_KING_DODONGO, RC_BARINADE,    RC_PHANTOM_GANON, RC_VOLVAGIA,
+    RC_MORPHA,      RC_TWINROVA,     RC_BONGO_BONGO, RC_LINKS_POCKET,
+};
+
+std::vector<RandomizerCheck> Rando::StaticData::overworldLocations = {
+    // Kokiri Forest
+    RC_KF_KOKIRI_SWORD_CHEST,
+    RC_KF_MIDOS_TOP_LEFT_CHEST,
+    RC_KF_MIDOS_TOP_RIGHT_CHEST,
+    RC_KF_MIDOS_BOTTOM_LEFT_CHEST,
+    RC_KF_MIDOS_BOTTOM_RIGHT_CHEST,
+    RC_KF_STORMS_GROTTO_CHEST,
+    RC_KF_LINKS_HOUSE_COW,
+
+    // Shop
+    RC_KF_SHOP_ITEM_1,
+    RC_KF_SHOP_ITEM_2,
+    RC_KF_SHOP_ITEM_3,
+    RC_KF_SHOP_ITEM_4,
+    RC_KF_SHOP_ITEM_5,
+    RC_KF_SHOP_ITEM_6,
+    RC_KF_SHOP_ITEM_7,
+    RC_KF_SHOP_ITEM_8,
+
+    // Lost Woods
+    RC_LW_GIFT_FROM_SARIA,
+    RC_LW_SKULL_KID,
+    RC_LW_TRADE_COJIRO,
+    RC_LW_TRADE_ODD_POTION,
+    RC_LW_OCARINA_MEMORY_GAME,
+    RC_LW_TARGET_IN_WOODS,
+    RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT,
+    RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT,
+    RC_LW_DEKU_SCRUB_NEAR_BRIDGE,
+    RC_LW_NEAR_SHORTCUTS_GROTTO_CHEST,
+    RC_LW_DEKU_SCRUB_GROTTO_REAR,
+    RC_LW_DEKU_SCRUB_GROTTO_FRONT,
+    RC_DEKU_THEATER_SKULL_MASK,
+    RC_DEKU_THEATER_MASK_OF_TRUTH,
+
+    // Sacred Forest Meadow
+    RC_SONG_FROM_SARIA,
+    RC_SHEIK_IN_FOREST,
+    RC_SFM_WOLFOS_GROTTO_CHEST,
+    RC_SFM_DEKU_SCRUB_GROTTO_REAR,
+    RC_SFM_DEKU_SCRUB_GROTTO_FRONT,
+
+    // Hyrule Field
+    RC_HF_SOUTHEAST_GROTTO_CHEST,
+    RC_HF_OPEN_GROTTO_CHEST,
+    RC_HF_NEAR_MARKET_GROTTO_CHEST,
+    RC_HF_OCARINA_OF_TIME_ITEM,
+    RC_SONG_FROM_OCARINA_OF_TIME,
+    RC_HF_TEKTITE_GROTTO_FREESTANDING_POH,
+    RC_HF_DEKU_SCRUB_GROTTO,
+    RC_HF_COW_GROTTO_COW,
+
+    // Lake Hylia
+    RC_LH_CHILD_FISHING,
+    RC_LH_ADULT_FISHING,
+    RC_LH_LAB_DIVE,
+    RC_LH_TRADE_FROG,
+    RC_LH_UNDERWATER_ITEM,
+    RC_LH_SUN,
+    RC_LH_FREESTANDING_POH,
+    RC_LH_DEKU_SCRUB_GROTTO_LEFT,
+    RC_LH_DEKU_SCRUB_GROTTO_RIGHT,
+    RC_LH_DEKU_SCRUB_GROTTO_CENTER,
+
+    // Gerudo Valley
+    RC_GV_CHEST,
+    RC_GV_TRADE_SAW,
+    RC_GV_WATERFALL_FREESTANDING_POH,
+    RC_GV_CRATE_FREESTANDING_POH,
+    RC_GV_DEKU_SCRUB_GROTTO_REAR,
+    RC_GV_DEKU_SCRUB_GROTTO_FRONT,
+    RC_GV_COW,
+
+    // Gerudo Fortress
+    RC_GF_CHEST,
+    RC_GF_HBA_1000_POINTS,
+    RC_GF_HBA_1500_POINTS,
+    RC_GF_NORTH_F1_CARPENTER,
+    RC_GF_NORTH_F2_CARPENTER,
+    RC_GF_SOUTH_F1_CARPENTER,
+    RC_GF_SOUTH_F2_CARPENTER,
+    RC_GF_GERUDO_MEMBERSHIP_CARD,
+
+    // Haunted Wasteland
+    RC_WASTELAND_CHEST,
+    RC_WASTELAND_BOMBCHU_SALESMAN,
+
+    // Desert Colossus
+    RC_SHEIK_AT_COLOSSUS,
+    RC_COLOSSUS_FREESTANDING_POH,
+    RC_COLOSSUS_GREAT_FAIRY_REWARD,
+    RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,
+    RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT,
+
+    // Market
+    RC_MARKET_TREASURE_CHEST_GAME_REWARD,
+    RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,
+    RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE,
+    RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS,
+    RC_MARKET_LOST_DOG,
+    RC_MARKET_SHOOTING_GALLERY_REWARD,
+    RC_MARKET_10_BIG_POES,
+    RC_MARKET_TREASURE_CHEST_GAME_ITEM_1,
+    RC_MARKET_TREASURE_CHEST_GAME_ITEM_2,
+    RC_MARKET_TREASURE_CHEST_GAME_ITEM_3,
+    RC_MARKET_TREASURE_CHEST_GAME_ITEM_4,
+    RC_MARKET_TREASURE_CHEST_GAME_ITEM_5,
+
+    // Market Shops
+    RC_MARKET_BOMBCHU_SHOP_ITEM_1,
+    RC_MARKET_BOMBCHU_SHOP_ITEM_2,
+    RC_MARKET_BOMBCHU_SHOP_ITEM_3,
+    RC_MARKET_BOMBCHU_SHOP_ITEM_4,
+    RC_MARKET_BOMBCHU_SHOP_ITEM_5,
+    RC_MARKET_BOMBCHU_SHOP_ITEM_6,
+    RC_MARKET_BOMBCHU_SHOP_ITEM_7,
+    RC_MARKET_BOMBCHU_SHOP_ITEM_8,
+    RC_MARKET_POTION_SHOP_ITEM_1,
+    RC_MARKET_POTION_SHOP_ITEM_2,
+    RC_MARKET_POTION_SHOP_ITEM_3,
+    RC_MARKET_POTION_SHOP_ITEM_4,
+    RC_MARKET_POTION_SHOP_ITEM_5,
+    RC_MARKET_POTION_SHOP_ITEM_6,
+    RC_MARKET_POTION_SHOP_ITEM_7,
+    RC_MARKET_POTION_SHOP_ITEM_8,
+    RC_MARKET_BAZAAR_ITEM_1,
+    RC_MARKET_BAZAAR_ITEM_2,
+    RC_MARKET_BAZAAR_ITEM_3,
+    RC_MARKET_BAZAAR_ITEM_4,
+    RC_MARKET_BAZAAR_ITEM_5,
+    RC_MARKET_BAZAAR_ITEM_6,
+    RC_MARKET_BAZAAR_ITEM_7,
+    RC_MARKET_BAZAAR_ITEM_8,
+
+    // Hyrule Castle
+    RC_HC_MALON_EGG,
+    RC_HC_ZELDAS_LETTER,
+    RC_SONG_FROM_IMPA,
+    RC_HC_GREAT_FAIRY_REWARD,
+    RC_OGC_GREAT_FAIRY_REWARD,
+
+    // Temple of Time
+    RC_SHEIK_AT_TEMPLE,
+    RC_TOT_LIGHT_ARROWS_CUTSCENE,
+
+    // Kakariko
+    RC_SHEIK_IN_KAKARIKO,
+    RC_KAK_REDEAD_GROTTO_CHEST,
+    RC_KAK_OPEN_GROTTO_CHEST,
+    RC_KAK_10_GOLD_SKULLTULA_REWARD,
+    RC_KAK_20_GOLD_SKULLTULA_REWARD,
+    RC_KAK_30_GOLD_SKULLTULA_REWARD,
+    RC_KAK_40_GOLD_SKULLTULA_REWARD,
+    RC_KAK_50_GOLD_SKULLTULA_REWARD,
+    RC_KAK_100_GOLD_SKULLTULA_REWARD,
+    RC_KAK_MAN_ON_ROOF,
+    RC_KAK_SHOOTING_GALLERY_REWARD,
+    RC_KAK_TRADE_ODD_MUSHROOM,
+    RC_KAK_GRANNYS_SHOP,
+    RC_KAK_ANJU_AS_CHILD,
+    RC_KAK_ANJU_AS_ADULT,
+    RC_KAK_TRADE_POCKET_CUCCO,
+    RC_KAK_IMPAS_HOUSE_FREESTANDING_POH,
+    RC_KAK_WINDMILL_FREESTANDING_POH,
+    RC_SONG_FROM_WINDMILL,
+    RC_KAK_IMPAS_HOUSE_COW,
+
+    // Kakariko Shops
+    RC_KAK_POTION_SHOP_ITEM_1,
+    RC_KAK_POTION_SHOP_ITEM_2,
+    RC_KAK_POTION_SHOP_ITEM_3,
+    RC_KAK_POTION_SHOP_ITEM_4,
+    RC_KAK_POTION_SHOP_ITEM_5,
+    RC_KAK_POTION_SHOP_ITEM_6,
+    RC_KAK_POTION_SHOP_ITEM_7,
+    RC_KAK_POTION_SHOP_ITEM_8,
+    RC_KAK_BAZAAR_ITEM_1,
+    RC_KAK_BAZAAR_ITEM_2,
+    RC_KAK_BAZAAR_ITEM_3,
+    RC_KAK_BAZAAR_ITEM_4,
+    RC_KAK_BAZAAR_ITEM_5,
+    RC_KAK_BAZAAR_ITEM_6,
+    RC_KAK_BAZAAR_ITEM_7,
+    RC_KAK_BAZAAR_ITEM_8,
+
+    // Graveyard
+    RC_GRAVEYARD_HOOKSHOT_CHEST,
+    RC_GRAVEYARD_SHIELD_GRAVE_CHEST,
+    RC_GRAVEYARD_HEART_PIECE_GRAVE_CHEST,
+    RC_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST,
+    RC_SONG_FROM_ROYAL_FAMILYS_TOMB,
+    RC_GRAVEYARD_FREESTANDING_POH,
+    RC_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH,
+    RC_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR,
+
+    // Death Mountain Trail
+    RC_DMT_CHEST,
+    RC_DMT_STORMS_GROTTO_CHEST,
+    RC_DMT_TRADE_BROKEN_SWORD,
+    RC_DMT_TRADE_EYEDROPS,
+    RC_DMT_TRADE_CLAIM_CHECK,
+    RC_DMT_GREAT_FAIRY_REWARD,
+    RC_DMT_FREESTANDING_POH,
+    RC_DMT_COW_GROTTO_COW,
+
+    // Goron City
+    RC_GC_MAZE_LEFT_CHEST,
+    RC_GC_MAZE_CENTER_CHEST,
+    RC_GC_MAZE_RIGHT_CHEST,
+    RC_GC_ROLLING_GORON_AS_CHILD,
+    RC_GC_ROLLING_GORON_AS_ADULT,
+    RC_GC_DARUNIAS_JOY,
+    RC_GC_POT_FREESTANDING_POH,
+    RC_GC_DEKU_SCRUB_GROTTO_LEFT,
+    RC_GC_DEKU_SCRUB_GROTTO_RIGHT,
+    RC_GC_DEKU_SCRUB_GROTTO_CENTER,
+    RC_GC_MEDIGORON,
+
+    // Goron City Shop
+    RC_GC_SHOP_ITEM_1,
+    RC_GC_SHOP_ITEM_2,
+    RC_GC_SHOP_ITEM_3,
+    RC_GC_SHOP_ITEM_4,
+    RC_GC_SHOP_ITEM_5,
+    RC_GC_SHOP_ITEM_6,
+    RC_GC_SHOP_ITEM_7,
+    RC_GC_SHOP_ITEM_8,
+
+    // Death Mountain
+    RC_DMC_UPPER_GROTTO_CHEST,
+    RC_DMC_WALL_FREESTANDING_POH,
+    RC_DMC_VOLCANO_FREESTANDING_POH,
+    RC_SHEIK_IN_CRATER,
+    RC_DMC_DEKU_SCRUB,
+    RC_DMC_GREAT_FAIRY_REWARD,
+    RC_DMC_DEKU_SCRUB_GROTTO_LEFT,
+    RC_DMC_DEKU_SCRUB_GROTTO_RIGHT,
+    RC_DMC_DEKU_SCRUB_GROTTO_CENTER,
+
+    // Zoras River
+    RC_ZR_OPEN_GROTTO_CHEST,
+    RC_ZR_MAGIC_BEAN_SALESMAN,
+    RC_ZR_FROGS_ZELDAS_LULLABY,
+    RC_ZR_FROGS_EPONAS_SONG,
+    RC_ZR_FROGS_SARIAS_SONG,
+    RC_ZR_FROGS_SUNS_SONG,
+    RC_ZR_FROGS_SONG_OF_TIME,
+    RC_ZR_FROGS_IN_THE_RAIN,
+    RC_ZR_FROGS_OCARINA_GAME,
+    RC_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH,
+    RC_ZR_NEAR_DOMAIN_FREESTANDING_POH,
+    RC_ZR_DEKU_SCRUB_GROTTO_REAR,
+    RC_ZR_DEKU_SCRUB_GROTTO_FRONT,
+
+    // Zoras Domain
+    RC_ZD_CHEST,
+    RC_ZD_DIVING_MINIGAME,
+    RC_ZD_KING_ZORA_THAWED,
+    RC_ZD_TRADE_PRESCRIPTION,
+
+    // Zora's Domain Shop
+    RC_ZD_SHOP_ITEM_1,
+    RC_ZD_SHOP_ITEM_2,
+    RC_ZD_SHOP_ITEM_3,
+    RC_ZD_SHOP_ITEM_4,
+    RC_ZD_SHOP_ITEM_5,
+    RC_ZD_SHOP_ITEM_6,
+    RC_ZD_SHOP_ITEM_7,
+    RC_ZD_SHOP_ITEM_8,
+
+    // Zoras Fountain
+    RC_ZF_ICEBERC_FREESTANDING_POH,
+    RC_ZF_BOTTOM_FREESTANDING_POH,
+    RC_ZF_GREAT_FAIRY_REWARD,
+
+    // Lon Lon Ranch
+    RC_SONG_FROM_MALON,
+    RC_LLR_TALONS_CHICKENS,
+    RC_LLR_FREESTANDING_POH,
+    RC_LLR_DEKU_SCRUB_GROTTO_LEFT,
+    RC_LLR_DEKU_SCRUB_GROTTO_RIGHT,
+    RC_LLR_DEKU_SCRUB_GROTTO_CENTER,
+    RC_LLR_STABLES_LEFT_COW,
+    RC_LLR_STABLES_RIGHT_COW,
+    RC_LLR_TOWER_LEFT_COW,
+    RC_LLR_TOWER_RIGHT_COW,
+
+    /*-------------------------------
+       --- GOLD SKULLTULA TOKENS ---
+      -------------------------------*/
+
+    // Overworld
+    RC_KF_GS_BEAN_PATCH,
+    RC_KF_GS_KNOW_IT_ALL_HOUSE,
+    RC_KF_GS_HOUSE_OF_TWINS,
+
+    RC_LW_GS_BEAN_PATCH_NEAR_BRIDGE,
+    RC_LW_GS_BEAN_PATCH_NEAR_THEATER,
+    RC_LW_GS_ABOVE_THEATER,
+    RC_SFM_GS,
+
+    RC_HF_GS_COW_GROTTO,
+    RC_HF_GS_NEAR_KAK_GROTTO,
+
+    RC_LH_GS_BEAN_PATCH,
+    RC_LH_GS_SMALL_ISLAND,
+    RC_LH_GS_LAB_WALL,
+    RC_LH_GS_LAB_CRATE,
+    RC_LH_GS_TREE,
+
+    RC_GV_GS_BEAN_PATCH,
+    RC_GV_GS_SMALL_BRIDGE,
+    RC_GV_GS_PILLAR,
+    RC_GV_GS_BEHIND_TENT,
+
+    RC_GF_GS_ARCHERY_RANGE,
+    RC_GF_GS_TOP_FLOOR,
+
+    RC_WASTELAND_GS,
+    RC_COLOSSUS_GS_BEAN_PATCH,
+    RC_COLOSSUS_GS_HILL,
+    RC_COLOSSUS_GS_TREE,
+
+    RC_OGC_GS,
+    RC_HC_GS_STORMS_GROTTO,
+    RC_HC_GS_TREE,
+    RC_MARKET_GS_GUARD_HOUSE,
+
+    RC_KAK_GS_HOUSE_UNDER_CONSTRUCTION,
+    RC_KAK_GS_SKULLTULA_HOUSE,
+    RC_KAK_GS_GUARDS_HOUSE,
+    RC_KAK_GS_TREE,
+    RC_KAK_GS_WATCHTOWER,
+    RC_KAK_GS_ABOVE_IMPAS_HOUSE,
+
+    RC_DMC_GS_BEAN_PATCH,
+    RC_DMC_GS_CRATE,
+
+    RC_DMT_GS_BEAN_PATCH,
+    RC_DMT_GS_NEAR_KAK,
+    RC_DMT_GS_ABOVE_DODONGOS_CAVERN,
+    RC_DMT_GS_FALLING_ROCKS_PATH,
+
+    RC_GC_GS_CENTER_PLATFORM,
+    RC_GC_GS_BOULDER_MAZE,
+    RC_GRAVEYARD_GS_WALL,
+    RC_GRAVEYARD_GS_BEAN_PATCH,
+
+    RC_ZR_GS_LADDER,
+    RC_ZR_GS_TREE,
+    RC_ZR_GS_ABOVE_BRIDGE,
+    RC_ZR_GS_NEAR_RAISED_GROTTOS,
+
+    RC_ZD_GS_FROZEN_WATERFALL,
+    RC_ZF_GS_ABOVE_THE_LOG,
+    RC_ZF_GS_HIDDEN_CAVE,
+    RC_ZF_GS_TREE,
+
+    RC_LLR_GS_BACK_WALL,
+    RC_LLR_GS_RAIN_SHED,
+    RC_LLR_GS_HOUSE_WINDOW,
+    RC_LLR_GS_TREE,
+};
+
+std::vector<RandomizerCheck> Rando::StaticData::gossipStoneLocations = {
+    RC_COLOSSUS_GOSSIP_STONE,
+    RC_DMC_GOSSIP_STONE,
+    RC_DMC_UPPER_GROTTO_GOSSIP_STONE,
+    RC_DMT_GOSSIP_STONE,
+    RC_DMT_STORMS_GROTTO_GOSSIP_STONE,
+    RC_DODONGOS_CAVERN_GOSSIP_STONE,
+    RC_FAIRY_GOSSIP_STONE,
+    RC_GC_MAZE_GOSSIP_STONE,
+    RC_GC_MEDIGORON_GOSSIP_STONE,
+    RC_GV_GOSSIP_STONE,
+    RC_GY_GOSSIP_STONE,
+    RC_HC_MALON_GOSSIP_STONE,
+    RC_HC_ROCK_WALL_GOSSIP_STONE,
+    RC_HC_STORMS_GROTTO_GOSSIP_STONE,
+    RC_HF_COW_GROTTO_GOSSIP_STONE,
+    RC_HF_NEAR_MARKET_GOSSIP_STONE,
+    RC_HF_OPEN_GROTTO_GOSSIP_STONE,
+    RC_HF_SOUTHEAST_GOSSIP_STONE,
+    RC_JABU_GOSSIP_STONE,
+    RC_KF_DEKU_TREE_LEFT_GOSSIP_STONE,
+    RC_KF_DEKU_TREE_RIGHT_GOSSIP_STONE,
+    RC_KF_GOSSIP_STONE,
+    RC_KF_STORMS_GOSSIP_STONE,
+    RC_KAK_OPEN_GROTTO_GOSSIP_STONE,
+    RC_LH_LAB_GOSSIP_STONE,
+    RC_LH_SOUTHEAST_GOSSIP_STONE,
+    RC_LH_SOUTHWEST_GOSSIP_STONE,
+    RC_LW_GOSSIP_STONE,
+    RC_LW_NEAR_SHORTCUTS_GOSSIP_STONE,
+    RC_SFM_MAZE_LOWER_GOSSIP_STONE,
+    RC_SFM_MAZE_UPPER_GOSSIP_STONE,
+    RC_SFM_SARIA_GOSSIP_STONE,
+    RC_TOT_LEFT_CENTER_GOSSIP_STONE,
+    RC_TOT_LEFT_GOSSIP_STONE,
+    RC_TOT_RIGHT_CENTER_GOSSIP_STONE,
+    RC_TOT_RIGHT_GOSSIP_STONE,
+    RC_ZD_GOSSIP_STONE,
+    RC_ZR_NEAR_DOMAIN_GOSSIP_STONE,
+    RC_ZR_NEAR_GROTTOS_GOSSIP_STONE,
+    RC_ZR_OPEN_GROTTO_GOSSIP_STONE,
+};
+
+typedef enum {
+    DUNGEON_DEKU_TREE = 0,
+    DUNGEON_DODONGOS_CAVERN,
+    DUNGEON_JABUJABUS_BELLY,
+    DUNGEON_FOREST_TEMPLE,
+    DUNGEON_FIRE_TEMPLE,
+    DUNGEON_WATER_TEMPLE,
+    DUNGEON_SPIRIT_TEMPLE,
+    DUNGEON_SHADOW_TEMPLE,
+    DUNGEON_BOTTOM_OF_THE_WELL,
+    DUNGEON_ICE_CAVERN,
+    DUNGEON_GANONS_CASTLE_SECOND_PART,
+    DUNGEON_GERUDO_TRAINING_GROUNDS,
+    DUNGEON_GERUDO_FORTRESS,
+    DUNGEON_GANONS_CASTLE_FIRST_PART,
+    DUNGEON_GANONS_CASTLE_FLOOR_BENEATH_BOSS_CHAMBER,
+    DUNGEON_GANONS_CASTLE_CRUMBLING,
+    DUNGEON_TREASURE_CHEST_SHOP,
+    DUNGEON_DEKU_TREE_BOSS_ROOM,
+    DUNGEON_DODONGOS_CAVERN_BOSS_ROOM,
+    DUNGEON_JABUJABUS_BELLY_BOSS_ROOM,
+} DungeonId;
+
+using namespace Rando;
+
+void Rando::StaticData::InitLocationTable() {
+    // clang-format off
+    locationTable[RC_UNKNOWN_CHECK] =                               Location::Base(RC_UNKNOWN_CHECK,                        RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_INVALID,         ACTOR_ID_MAX,         SCENE_ID_MAX,                     0x00,                         0x00, "Invalid Location",                  "Invalid Location",                     RHT_NONE,                                RG_NONE,                  {},                                                                           SpoilerCollectionCheck::None());
+    //            Randomizer Check                                                 Randomizer Check                         Quest         Type                Area                    Actor ID              Scene ID                          Params                        Flags Short Name                            Spoiler Name                           Hint Text Key                            Vanilla Item              Categories                 Spoiler Collection Check                           Collection Check Group                             Vanilla Progression
+    // Kokiri Forest
+    locationTable[RC_KF_KOKIRI_SWORD_CHEST] =                      Location::Chest(RC_KF_KOKIRI_SWORD_CHEST,                RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KOKIRI_FOREST,   ACTOR_EN_BOX,         SCENE_KOKIRI_FOREST,              1248,                         0x00, "Kokiri Sword Chest",                "KF Kokiri Sword Chest",                RHT_KF_KOKIRI_SWORD_CHEST,               RG_KOKIRI_SWORD,          {},                                                                           SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST,  true);
+    locationTable[RC_KF_MIDOS_TOP_LEFT_CHEST] =                    Location::Chest(RC_KF_MIDOS_TOP_LEFT_CHEST,              RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KOKIRI_FOREST,   ACTOR_EN_BOX,         SCENE_MIDOS_HOUSE,                22944,                        0x00, "Mido Top Left Chest",               "KF Mido Top Left Chest",               RHT_KF_MIDOS_TOP_LEFT_CHEST,             RG_BLUE_RUPEE,            {},                                                                           SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_MIDOS_TOP_RIGHT_CHEST] =                   Location::Chest(RC_KF_MIDOS_TOP_RIGHT_CHEST,             RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KOKIRI_FOREST,   ACTOR_EN_BOX,         SCENE_MIDOS_HOUSE,                22945,                        0x01, "Mido Top Right Chest",              "KF Mido Top Right Chest",              RHT_KF_MIDOS_TOP_RIGHT_CHEST,            RG_BLUE_RUPEE,            {},                                                                           SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_MIDOS_BOTTOM_LEFT_CHEST] =                 Location::Chest(RC_KF_MIDOS_BOTTOM_LEFT_CHEST,           RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KOKIRI_FOREST,   ACTOR_EN_BOX,         SCENE_MIDOS_HOUSE,                22914,                        0x02, "Mido Bottom Left Chest",            "KF Mido Bottom Left Chest",            RHT_KF_MIDOS_BOTTOM_LEFT_CHEST,          RG_GREG_RUPEE,            {},                                                                           SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_MIDOS_BOTTOM_RIGHT_CHEST] =                Location::Chest(RC_KF_MIDOS_BOTTOM_RIGHT_CHEST,          RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KOKIRI_FOREST,   ACTOR_EN_BOX,         SCENE_MIDOS_HOUSE,                22787,                        0x03, "Mido Bottom Right Chest",           "KF Mido Bottom Right Chest",           RHT_KF_MIDOS_BOTTOM_RIGHT_CHEST,         RG_RECOVERY_HEART,        {},                                                                           SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_STORMS_GROTTO_CHEST] =                     Location::Chest(RC_KF_STORMS_GROTTO_CHEST,               RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KOKIRI_FOREST,   ACTOR_EN_BOX,         SCENE_GROTTOS,                    22988,                        0x0C, "Storms Grotto Chest",               "KF Storms Grotto Chest",               RHT_KF_STORMS_GROTTO_CHEST,              RG_RED_RUPEE,             {},                                                                           SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    // Lost Woods
+    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_CHEST] =             Location::Chest(RC_LW_NEAR_SHORTCUTS_GROTTO_CHEST,       RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LOST_WOODS,      ACTOR_EN_BOX,         SCENE_GROTTOS,                    22964,                        0x14, "Near Shortcuts Grotto Chest",       "LW Near Shortcuts Grotto Chest",       RHT_KF_STORMS_GROTTO_CHEST,              RG_RED_RUPEE,             {},                                                                           SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_LW_SKULL_KID] =                                Location::Base(RC_LW_SKULL_KID,                         RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LOST_WOODS,      ACTOR_ID_MAX,         SCENE_LOST_WOODS,                 0x00,                         0x3E, "Skull Kid",                         "LW Skull Kid",                         RHT_LW_SKULL_KID,                        RG_PIECE_OF_HEART,        {},                        SpoilerCollectionCheck::ItemGetInf(30),            SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,     true);
+    locationTable[RC_LW_TRADE_COJIRO] =                             Location::Base(RC_LW_TRADE_COJIRO,                      RCQUEST_BOTH, RCTYPE_ADULT_TRADE, RCAREA_LOST_WOODS,      ACTOR_ID_MAX,         SCENE_LOST_WOODS,                 0x00,                         0x1F, "Trade Cojiro",                      "LW Trade Cojiro",                      RHT_LW_TRADE_COJIRO,                     RG_ODD_MUSHROOM,          { Category::cAdultTrade }, SpoilerCollectionCheck::RandomizerInf(0x5B, 0x1F), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,     true);
+    locationTable[RC_LW_TRADE_ODD_POTION] =                         Location::Base(RC_LW_TRADE_ODD_POTION,                  RCQUEST_BOTH, RCTYPE_ADULT_TRADE, RCAREA_LOST_WOODS,      ACTOR_ID_MAX,         SCENE_LOST_WOODS,                 0x00,                         0x21, "Trade Odd Potion",                  "LW Trade Odd Potion",                  RHT_LW_TRADE_COJIRO,                     RG_POACHERS_SAW,          { Category::cAdultTrade }, SpoilerCollectionCheck::ItemGetInf(57),            SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,     true);
+    locationTable[RC_LW_OCARINA_MEMORY_GAME] =                      Location::Base(RC_LW_OCARINA_MEMORY_GAME,               RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LOST_WOODS,      ACTOR_ID_MAX,         SCENE_LOST_WOODS,                 0x00,                         0x21, "Ocarina Memory Game",               "LW Ocarina Memory Game",               RHT_LW_OCARINA_MEMORY_GAME,              RG_PIECE_OF_HEART,        {},                        SpoilerCollectionCheck::ItemGetInf(31),            SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,     true);
+    locationTable[RC_LW_TARGET_IN_WOODS] =                          Location::Base(RC_LW_TARGET_IN_WOODS,                   RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LOST_WOODS,      ACTOR_ID_MAX,         SCENE_LOST_WOODS,                 0x00,                         0x60, "Target in Woods",                   "LW Target in Woods",                   RHT_LW_TARGET_IN_WOODS,                  RG_PROGRESSIVE_SLINGSHOT, {},                        SpoilerCollectionCheck::ItemGetInf(21),            SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,     true);
+    locationTable[RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT] =       Location::Base(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT,RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_LOST_WOODS,      ACTOR_EN_DNS,         SCENE_LOST_WOODS,                 0x00,                         0x30, "Deku Scrub Near Deku Theater Right","LW Deku Scrub Near Deku Theater Right",RHT_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT,RG_BUY_DEKU_NUT_5,       { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x5B, 0x01),         SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT] =        Location::Base(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT, RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_LOST_WOODS,      ACTOR_EN_DNS,         SCENE_LOST_WOODS,                 0x01,                         0x31, "Deku Scrub Near Deku Theater Left", "LW Deku Scrub Near Deku Theater Left", RHT_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT,RG_BUY_DEKU_STICK_1,      { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x5B, 0x02),         SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_LW_DEKU_SCRUB_NEAR_BRIDGE] =                   Location::Base(RC_LW_DEKU_SCRUB_NEAR_BRIDGE,            RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_LOST_WOODS,      ACTOR_EN_DNS,         SCENE_LOST_WOODS,                 0x09,                         0x77, "Deku Scrub Near Bridge",            "LW Deku Scrub Near Bridge",            RHT_LW_DEKU_SCRUB_NEAR_BRIDGE,           RG_PROGRESSIVE_STICK_UPGRADE,{ Category::cDekuScrub, Category::cDekuScrubUpgrades }, SpoilerCollectionCheck::Scrub(0x5B, 0x0A), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS, true);
+    locationTable[RC_LW_DEKU_SCRUB_GROTTO_REAR] =            Location::GrottoScrub(RC_LW_DEKU_SCRUB_GROTTO_REAR,            RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_LOST_WOODS,      ACTOR_EN_DNS,         SCENE_GROTTOS,                    TWO_ACTOR_PARAMS(0x03, 0xF5), 0x33, "Deku Scrub Grotto Rear",            "LW Deku Scrub Grotto Rear",            RHT_LW_DEKU_SCRUB_GROTTO_REAR,           RG_BUY_DEKU_SEEDS_30,     { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x1F, 0x04),         SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_LW_DEKU_SCRUB_GROTTO_FRONT] =           Location::GrottoScrub(RC_LW_DEKU_SCRUB_GROTTO_FRONT,           RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_LOST_WOODS,      ACTOR_EN_DNS,         SCENE_GROTTOS,                    TWO_ACTOR_PARAMS(0x0A, 0xF5), 0x79, "Deku Scrub Grotto Front",           "LW Deku Scrub Grotto Front",           RHT_LW_DEKU_SCRUB_GROTTO_FRONT,          RG_PROGRESSIVE_NUT_UPGRADE,{ Category::cDekuScrub, Category::cDekuScrubUpgrades }, SpoilerCollectionCheck::Scrub(0x1F, 0x0B), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_DEKU_THEATER_SKULL_MASK] =                     Location::Base(RC_DEKU_THEATER_SKULL_MASK,              RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LOST_WOODS,      ACTOR_ID_MAX,         SCENE_GROTTOS,                    0x00,                         0x77, "Deku Theater Skull Mask",           "Deku Theater Skull Mask",              RHT_DEKU_THEATER_SKULL_MASK,             RG_PROGRESSIVE_STICK_UPGRADE,{},                     SpoilerCollectionCheck::Chest(0x3E, 0x1F),         SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,     true);
+    locationTable[RC_DEKU_THEATER_MASK_OF_TRUTH] =                  Location::Base(RC_DEKU_THEATER_MASK_OF_TRUTH,           RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LOST_WOODS,      ACTOR_ID_MAX,         SCENE_GROTTOS,                    0x00,                         0x7A, "Deku Theater Mask of Truth",        "Deku Theater Mask of Truth",           RHT_DEKU_THEATER_MASK_OF_TRUTH,          RG_PROGRESSIVE_NUT_UPGRADE,{},                       SpoilerCollectionCheck::Chest(0x3E, 0x1E),         SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,     true);
+    // Sacred Forest Meadow
+    locationTable[RC_SFM_WOLFOS_GROTTO_CHEST] =                    Location::Chest(RC_SFM_WOLFOS_GROTTO_CHEST,              RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_SACRED_FOREST_MEADOW, ACTOR_EN_BOX,    SCENE_GROTTOS,                    31409,                        0x11, "Wolfos Grotto Chest",               "SFM Wolfos Grotto Chest",              RHT_SFM_WOLFOS_GROTTO_CHEST,             RG_PURPLE_RUPEE,          {},                                                                           SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_SFM_DEKU_SCRUB_GROTTO_REAR] =           Location::GrottoScrub(RC_SFM_DEKU_SCRUB_GROTTO_REAR,           RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_SACRED_FOREST_MEADOW, ACTOR_EN_DNS,    SCENE_GROTTOS,                    TWO_ACTOR_PARAMS(0x07, 0xEE), 0x39, "Deku Scrub Grotto Rear",            "SFM Deku Scrub Grotto Rear",           RHT_SFM_DEKU_SCRUB_GROTTO_REAR,          RG_BUY_RED_POTION_30,     { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x18, 0x08),         SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_SFM_DEKU_SCRUB_GROTTO_FRONT] =          Location::GrottoScrub(RC_SFM_DEKU_SCRUB_GROTTO_FRONT,          RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_SACRED_FOREST_MEADOW, ACTOR_EN_DNS,    SCENE_GROTTOS,                    TWO_ACTOR_PARAMS(0x08, 0xEE), 0x3A, "Deku Scrub Grotto Front",           "SFM Deku Scrub Grotto Front",          RHT_SFM_DEKU_SCRUB_GROTTO_FRONT,         RG_BUY_GREEN_POTION,      { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x18, 0x09),         SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    // Hyrule Field
+    locationTable[RC_HF_SOUTHEAST_GROTTO_CHEST] =                  Location::Chest(RC_HF_SOUTHEAST_GROTTO_CHEST,            RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_HYRULE_FIELD,    ACTOR_EN_BOX,         SCENE_GROTTOS,                    22978,                        0x02, "Southeast Grotto Chest",            "HF Southeast Grotto Chest",            RHT_HF_SOUTHEAST_GROTTO_CHEST,           RG_RED_RUPEE,             {},                                                                           SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_HF_OPEN_GROTTO_CHEST] =                       Location::Chest(RC_HF_OPEN_GROTTO_CHEST,                 RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_HYRULE_FIELD,    ACTOR_EN_BOX,         SCENE_GROTTOS,                    22947,                        0x03, "Open Grotto Chest",                 "HF Open Grotto Chest",                 RHT_HF_OPEN_GROTTO_CHEST,                RG_BLUE_RUPEE,            {},                                                                           SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_HF_NEAR_MARKET_GROTTO_CHEST] =                Location::Chest(RC_HF_NEAR_MARKET_GROTTO_CHEST,          RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_HYRULE_FIELD,    ACTOR_EN_BOX,         SCENE_GROTTOS,                    22944,                        0x00, "Near Market Grotto Chest",          "HF Near Market Grotto Chest",          RHT_HF_NEAR_MARKET_GROTTO_CHEST,         RG_BLUE_RUPEE,            {},                                                                           SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_HF_OCARINA_OF_TIME_ITEM] =                     Location::Base(RC_HF_OCARINA_OF_TIME_ITEM,              RCQUEST_BOTH, RCTYPE_OCARINA,     RCAREA_HYRULE_FIELD,    ACTOR_ID_MAX,         SCENE_HYRULE_FIELD,               0x00,                         0x0C, "Ocarina of Time Item",              "HF Ocarina of Time Item",              RHT_HF_OCARINA_OF_TIME_ITEM,             RG_PROGRESSIVE_OCARINA,   {},                        SpoilerCollectionCheck::EventChkInf(0x43),         SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_HF_TEKTITE_GROTTO_FREESTANDING_POH] =   Location::Collectable(RC_HF_TEKTITE_GROTTO_FREESTANDING_POH,   RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_HYRULE_FIELD,    ACTOR_EN_ITEM00,      SCENE_GROTTOS,                    262,                          0x01, "Tektite Grotto Freestanding PoH",   "HF Tektite Grotto Freestanding PoH",   RHT_HF_TEKTITE_GROTTO_FREESTANDING_POH,  RG_PIECE_OF_HEART,        {},                                                                           SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD,   true);
+    locationTable[RC_HF_DEKU_SCRUB_GROTTO] =                 Location::GrottoScrub(RC_HF_DEKU_SCRUB_GROTTO,                 RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_HYRULE_FIELD,    ACTOR_EN_DNS,         SCENE_GROTTOS,                    TWO_ACTOR_PARAMS(0x02, 0xE6), 0x3E, "Deku Scrub Grotto",                 "HF Deku Scrub Grotto",                 RHT_HF_DEKU_SCRUB_GROTTO,                RG_PIECE_OF_HEART,        { Category::cDekuScrub, Category::cDekuScrubUpgrades }, SpoilerCollectionCheck::Scrub(0x10, 0x03), SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD, true);
+    // Lake Hylia
+    locationTable[RC_LH_CHILD_FISHING] =                            Location::Base(RC_LH_CHILD_FISHING,                     RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LAKE_HYLIA,      ACTOR_ID_MAX,         SCENE_FISHING_POND,               0x00,                         0x3E, "Child Fishing",                     "LH Child Fishing",                     RHT_LH_CHILD_FISHING,                    RG_PIECE_OF_HEART,        {}, SpoilerCollectionCheck::RandomizerInf(SCENE_FISHING_POND, RAND_INF_CHILD_FISHING), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA, true);
+    locationTable[RC_LH_ADULT_FISHING] =                            Location::Base(RC_LH_ADULT_FISHING,                     RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LAKE_HYLIA,      ACTOR_ID_MAX,         SCENE_FISHING_POND,               0x00,                         0x38, "Adult Fishing",                     "LH Adult Fishing",                     RHT_LH_ADULT_FISHING,                    RG_PROGRESSIVE_SCALE,     {}, SpoilerCollectionCheck::RandomizerInf(SCENE_FISHING_POND, RAND_INF_ADULT_FISHING), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA, true);
+    locationTable[RC_LH_LAB_DIVE] =                                 Location::Base(RC_LH_LAB_DIVE,                          RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LAKE_HYLIA,      ACTOR_ID_MAX,         SCENE_LAKESIDE_LABORATORY,        0x00,                         0x3E, "Lab Dive",                          "LH Lab Dive",                          RHT_LH_LAB_DIVE,                         RG_PIECE_OF_HEART,        {},                        SpoilerCollectionCheck::ItemGetInf(24),            SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,     true);
+    locationTable[RC_LH_TRADE_FROG] =                               Location::Base(RC_LH_TRADE_FROG,                        RCQUEST_BOTH, RCTYPE_ADULT_TRADE, RCAREA_LAKE_HYLIA,      ACTOR_ID_MAX,         SCENE_LAKESIDE_LABORATORY,        0x00,                         0x25, "Lab Trade Eyeball Frog",            "LH Lab Trade Eyeball Frog",            RHT_LH_TRADE_FROG,                       RG_EYEDROPS,              { Category::cAdultTrade }, SpoilerCollectionCheck::RandomizerInf(0x38, 0x1F), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,     true);
+    locationTable[RC_LH_UNDERWATER_ITEM] =                          Location::Base(RC_LH_UNDERWATER_ITEM,                   RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LAKE_HYLIA,      ACTOR_ID_MAX,         SCENE_LAKE_HYLIA,                 0x00,                         0x15, "Underwater Item",                   "LH Underwater Item",                   RHT_LH_UNDERWATER_ITEM,                  RG_RUTOS_LETTER,          {},                        SpoilerCollectionCheck::EventChkInf(0x31),         SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,     true);
+    locationTable[RC_LH_SUN] =                                      Location::Base(RC_LH_SUN,                               RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LAKE_HYLIA,      ACTOR_ID_MAX,         SCENE_LAKE_HYLIA,                 0x00,                         0x58, "Sun",                               "LH Sun",                               RHT_LH_SUN,                              RG_FIRE_ARROWS,           {},                        SpoilerCollectionCheck::Chest(0x57, 0x1F),         SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,     true);
+    locationTable[RC_LH_FREESTANDING_POH] =                  Location::Collectable(RC_LH_FREESTANDING_POH,                  RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LAKE_HYLIA,      ACTOR_EN_ITEM00,      SCENE_LAKE_HYLIA,                 7686,                         0x1E, "Freestanding PoH",                  "LH Freestanding PoH",                  RHT_LH_FREESTANDING_POH,                 RG_PIECE_OF_HEART,        {},                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,     true);
+    locationTable[RC_LH_DEKU_SCRUB_GROTTO_LEFT] =            Location::GrottoScrub(RC_LH_DEKU_SCRUB_GROTTO_LEFT,            RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_LAKE_HYLIA,      ACTOR_EN_DNS,         SCENE_GROTTOS,                    TWO_ACTOR_PARAMS(0x00, 0xEF), 0x30, "Deku Scrub Grotto Left",            "LH Deku Scrub Grotto Left",            RHT_LH_DEKU_SCRUB_GROTTO_LEFT,           RG_BUY_DEKU_NUT_5,        { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x19, 0x01),         SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_DEKU_SCRUB_GROTTO_RIGHT] =           Location::GrottoScrub(RC_LH_DEKU_SCRUB_GROTTO_RIGHT,           RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_LAKE_HYLIA,      ACTOR_EN_DNS,         SCENE_GROTTOS,                    TWO_ACTOR_PARAMS(0x05, 0xEF), 0x37, "Deku Scrub Grotto Right",           "LH Deku Scrub Grotto Right",           RHT_LH_DEKU_SCRUB_GROTTO_RIGHT,          RG_BUY_BOMBS_535,         { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x19, 0x06),         SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_DEKU_SCRUB_GROTTO_CENTER] =          Location::GrottoScrub(RC_LH_DEKU_SCRUB_GROTTO_CENTER,          RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_LAKE_HYLIA,      ACTOR_EN_DNS,         SCENE_GROTTOS,                    TWO_ACTOR_PARAMS(0x03, 0xEF), 0x33, "Deku Scrub Grotto Center",          "LH Deku Scrub Grotto Center",          RHT_LH_DEKU_SCRUB_GROTTO_CENTER,         RG_BUY_DEKU_SEEDS_30,     { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x19, 0x04),         SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    // Gerudo Valley
+    locationTable[RC_GV_CHEST] =                                   Location::Chest(RC_GV_CHEST,                             RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GERUDO_VALLEY,   ACTOR_EN_BOX,         SCENE_GERUDO_VALLEY,              23200,                        0x00, "Chest",                             "GV Chest",                             RHT_GV_CHEST,                            RG_PURPLE_RUPEE,          {},                                                                           SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_GV_TRADE_SAW] =                                Location::Base(RC_GV_TRADE_SAW,                         RCQUEST_BOTH, RCTYPE_ADULT_TRADE, RCAREA_GERUDO_VALLEY,   ACTOR_ID_MAX,         SCENE_GERUDO_VALLEY,              0x00,                         0x22, "Trade Saw",                         "GV Trade Saw",                         RHT_GV_TRADE_SAW,                        RG_BROKEN_SWORD,          { Category::cAdultTrade }, SpoilerCollectionCheck::RandomizerInf(0x5A, 0x1F), SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
+    locationTable[RC_GV_WATERFALL_FREESTANDING_POH] =        Location::Collectable(RC_GV_WATERFALL_FREESTANDING_POH,        RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GERUDO_VALLEY,   ACTOR_EN_ITEM00,      SCENE_GERUDO_VALLEY,              262,                          0x01, "Waterfall Freestanding PoH",        "GV Waterfall Freestanding PoH",        RHT_GV_WATERFALL_FREESTANDING_POH,       RG_PIECE_OF_HEART,        {},                                                                           SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
+    locationTable[RC_GV_CRATE_FREESTANDING_POH] =            Location::Collectable(RC_GV_CRATE_FREESTANDING_POH,            RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GERUDO_VALLEY,   ACTOR_EN_ITEM00,      SCENE_GERUDO_VALLEY,              518,                          0x02, "Crate Freestanding PoH",            "GV Crate Freestanding PoH",            RHT_GV_CRATE_FREESTANDING_POH,           RG_PIECE_OF_HEART,        {},                                                                           SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
+    locationTable[RC_GV_DEKU_SCRUB_GROTTO_REAR] =            Location::GrottoScrub(RC_GV_DEKU_SCRUB_GROTTO_REAR,            RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_GERUDO_VALLEY,   ACTOR_EN_DNS,         SCENE_GROTTOS,                    TWO_ACTOR_PARAMS(0x07, 0xF0), 0x39, "Deku Scrub Grotto Rear",            "GV Deku Scrub Grotto Rear",            RHT_GV_DEKU_SCRUB_GROTTO_FRONT,          RG_BUY_GREEN_POTION,      { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x1A, 0x09),         SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_GV_DEKU_SCRUB_GROTTO_FRONT] =           Location::GrottoScrub(RC_GV_DEKU_SCRUB_GROTTO_FRONT,           RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_GERUDO_VALLEY,   ACTOR_EN_DNS,         SCENE_GROTTOS,                    TWO_ACTOR_PARAMS(0x08, 0xF0), 0x3A, "Deku Scrub Grotto Front",           "GV Deku Scrub Grotto Front",           RHT_GV_DEKU_SCRUB_GROTTO_FRONT,          RG_BUY_GREEN_POTION,      { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x1A, 0x09),         SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    // Gerudo Fortress
+    locationTable[RC_GF_CHEST] =                                   Location::Chest(RC_GF_CHEST,                             RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GERUDO_FORTRESS, ACTOR_EN_BOX,         SCENE_GERUDOS_FORTRESS,           1984,                         0x00, "Chest",                             "GF Chest",                             RHT_GF_CHEST,                            RG_PIECE_OF_HEART,        {},                                                                           SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
+    locationTable[RC_GF_HBA_1000_POINTS] =                          Location::Base(RC_GF_HBA_1000_POINTS,                   RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GERUDO_FORTRESS, ACTOR_ID_MAX,         SCENE_GERUDOS_FORTRESS,           0x00,                         0x3E, "GF HBA 1000 Points",                "GF HBA 1000 Points",                   RHT_GF_HBA_1000_POINTS,                  RG_PIECE_OF_HEART,        {},                        SpoilerCollectionCheck::InfTable(0x19, 0x08),      SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
+    locationTable[RC_GF_HBA_1500_POINTS] =                          Location::Base(RC_GF_HBA_1500_POINTS,                   RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GERUDO_FORTRESS, ACTOR_ID_MAX,         SCENE_GERUDOS_FORTRESS,           0x00,                         0x30, "GF HBA 1500 Points",                "GF HBA 1500 Points",                   RHT_GF_HBA_1500_POINTS,                  RG_PROGRESSIVE_BOW,       {},                        SpoilerCollectionCheck::ItemGetInf(7),             SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
+    // RandoTodo: Do we replace these with the RC_HIDEOUT keys or keep these?
+    locationTable[RC_GF_GERUDO_MEMBERSHIP_CARD] =                   Location::Base(RC_GF_GERUDO_MEMBERSHIP_CARD,            RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GERUDO_FORTRESS, ACTOR_ID_MAX,         SCENE_THIEVES_HIDEOUT,            0x00,                         0x3A, "GF Gerudo Membership Card",         "GF Gerudo Membership Card",            RHT_GF_GERUDO_MEMBERSHIP_CARD,           RG_GERUDO_MEMBERSHIP_CARD,{},                        SpoilerCollectionCheck::GerudoToken(),             SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
+    locationTable[RC_GF_NORTH_F1_CARPENTER] =                Location::Collectable(RC_GF_NORTH_F1_CARPENTER,                RCQUEST_BOTH, RCTYPE_GF_KEY,      RCAREA_GERUDO_FORTRESS, ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,            3089,                         0x0C, "GF North F1 Carpenter",             "GF North F1 Carpenter",                RHT_GF_NORTH_F1_CARPENTER,               RG_GERUDO_FORTRESS_SMALL_KEY,{ Category::cVanillaGFSmallKey },                                          SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
+    locationTable[RC_GF_NORTH_F2_CARPENTER] =                Location::Collectable(RC_GF_NORTH_F2_CARPENTER,                RCQUEST_BOTH, RCTYPE_GF_KEY,      RCAREA_GERUDO_FORTRESS, ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,            2577,                         0x0A, "GF North F2 Carpenter",             "GF North F2 Carpenter",                RHT_GF_NORTH_F2_CARPENTER,               RG_GERUDO_FORTRESS_SMALL_KEY,{ Category::cVanillaGFSmallKey },                                          SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
+    locationTable[RC_GF_SOUTH_F1_CARPENTER] =                Location::Collectable(RC_GF_SOUTH_F1_CARPENTER,                RCQUEST_BOTH, RCTYPE_GF_KEY,      RCAREA_GERUDO_FORTRESS, ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,            3601,                         0x0E, "GF South F1 Carpenter",             "GF South F1 Carpenter",                RHT_GF_SOUTH_F1_CARPENTER,               RG_GERUDO_FORTRESS_SMALL_KEY,{ Category::cVanillaGFSmallKey },                                          SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
+    locationTable[RC_GF_SOUTH_F2_CARPENTER] =                Location::Collectable(RC_GF_SOUTH_F2_CARPENTER,                RCQUEST_BOTH, RCTYPE_GF_KEY,      RCAREA_GERUDO_FORTRESS, ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,            3857,                         0x0F, "GF South F2 Carpenter",             "GF South F2 Carpenter",                RHT_GF_SOUTH_F2_CARPENTER,               RG_GERUDO_FORTRESS_SMALL_KEY,{ Category::cVanillaGFSmallKey },                                          SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
+    // Haunted Wasteland
+    locationTable[RC_WASTELAND_CHEST] =                            Location::Chest(RC_WASTELAND_CHEST,                      RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_WASTELAND,             ACTOR_EN_BOX,    SCENE_HAUNTED_WASTELAND,         -30048,                       0x00, "Chest",                             "Wasteland Chest",                      RHT_WASTELAND_CHEST,                     RG_PURPLE_RUPEE,          {},                                                                           SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_WASTELAND_BOMBCHU_SALESMAN] =                  Location::Base(RC_WASTELAND_BOMBCHU_SALESMAN,           RCQUEST_BOTH, RCTYPE_MERCHANT,    RCAREA_WASTELAND,             ACTOR_ID_MAX,    SCENE_HAUNTED_WASTELAND,         0x00,                         0x03, "Carpet Salesman",                   "Wasteland Carpet Salesman",            RHT_WASTELAND_BOMBCHU_SALESMAN,          RG_BOMBCHU_10,            { Category::cMerchant },   SpoilerCollectionCheck::Merchant(0x5E, 0x86),      SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    // Desert Colossus
+    locationTable[RC_COLOSSUS_FREESTANDING_POH] =            Location::Collectable(RC_COLOSSUS_FREESTANDING_POH,            RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_DESERT_COLOSSUS,       ACTOR_EN_ITEM00, SCENE_DESERT_COLOSSUS,           3334,                         0x0D, "Freestanding PoH",                  "Colossus Freestanding PoH",            RHT_COLOSSUS_FREESTANDING_POH,           RG_PIECE_OF_HEART,        {},                                                                           SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
+    locationTable[RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR] =      Location::GrottoScrub(RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,      RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_DESERT_COLOSSUS,       ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x07, 0xFD), 0x39, "Deku Scrub Grotto Rear",            "Colossus Deku Scrub Grotto Rear",      RHT_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,     RG_BUY_RED_POTION_30,     { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x27, 0x08),         SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT] =     Location::GrottoScrub(RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT,     RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_DESERT_COLOSSUS,       ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x08, 0xFD), 0x3A, "Deku Scrub Grotto Front",           "Colossus Deku Scrub Grotto Front",     RHT_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT,    RG_BUY_GREEN_POTION,      { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x27, 0x09),         SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    // Market
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_REWARD] =          Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_REWARD,    RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_MARKET,                ACTOR_EN_BOX,    SCENE_TREASURE_BOX_SHOP,         0x00,                         0x0A, "Treasure Chest Game Reward",        "MK Treasure Chest Game Reward",        RHT_MARKET_TREASURE_CHEST_GAME_REWARD,   RG_TREASURE_GAME_HEART,   {},                        SpoilerCollectionCheck::ItemGetInf(19),            SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,  true);
+    locationTable[RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE] =          Location::Base(RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,   RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_MARKET,                ACTOR_ID_MAX,    SCENE_BOMBCHU_BOWLING_ALLEY,     0x00,                         0x33, "Bombchu Bowling First Prize",       "MK Bombchu Bowling First Prize",       RHT_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,  RG_PROGRESSIVE_BOMB_BAG,  {},                        SpoilerCollectionCheck::ItemGetInf(25),            SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,  true);
+    locationTable[RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE] =         Location::Base(RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE,  RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_MARKET,                ACTOR_ID_MAX,    SCENE_BOMBCHU_BOWLING_ALLEY,     0x00,                         0x3E, "Bombchu Bowling Second Prize",      "MK Bombchu Bowling Second Prize",      RHT_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE, RG_PIECE_OF_HEART,        {},                        SpoilerCollectionCheck::ItemGetInf(26),            SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,  true);
+    locationTable[RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS] =             Location::Base(RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS,      RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_MARKET,                ACTOR_ID_MAX,    SCENE_BOMBCHU_BOWLING_ALLEY,     0x00,                         0x00, "Bombchu Bowling Bombchus",          "MK Bombchu Bowling Bombchus",          RHT_MARKET_BOMBCHU_BOWLING_BOMBCHUS,     RG_BOMBCHU_DROP,          {},                        SpoilerCollectionCheck::None(),                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_LOST_DOG] =                             Location::Base(RC_MARKET_LOST_DOG,                      RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_MARKET,                ACTOR_ID_MAX,    SCENE_DOG_LADY_HOUSE,            0x00,                         0x3E, "Lost Dog",                          "MK Lost Dog",                          RHT_MARKET_LOST_DOG,                     RG_PIECE_OF_HEART,        {},                        SpoilerCollectionCheck::InfTable(0x19, 0x09),      SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,  true);
+    locationTable[RC_MARKET_SHOOTING_GALLERY_REWARD] =              Location::Base(RC_MARKET_SHOOTING_GALLERY_REWARD,       RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_MARKET,                ACTOR_ID_MAX,    SCENE_SHOOTING_GALLERY,          0x00,                         0x60, "Shooting Gallery",                  "MK Shooting Gallery",                  RHT_MARKET_SHOOTING_GALLERY_REWARD,      RG_PROGRESSIVE_SLINGSHOT, {},                        SpoilerCollectionCheck::ItemGetInf(5),             SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,  true);
+    locationTable[RC_MARKET_10_BIG_POES] =                          Location::Base(RC_MARKET_10_BIG_POES,                   RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_MARKET,                ACTOR_ID_MAX,    SCENE_MARKET_GUARD_HOUSE,        0x00,                         0x0F, "10 Big Poes",                       "MK 10 Big Poes",                       RHT_MARKET_10_BIG_POES,                  RG_EMPTY_BOTTLE,          {},                        SpoilerCollectionCheck::RandomizerInf(SCENE_MARKET_GUARD_HOUSE, RAND_INF_10_BIG_POES), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE, true);
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_1] =          Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_1,    RCQUEST_BOTH, RCTYPE_CHEST_GAME,  RCAREA_MARKET,                ACTOR_EN_BOX,    SCENE_TREASURE_BOX_SHOP,         0x00,                         0x01, "Chest Game First Room Chest",       "MK Chest Game First Room Chest",       RHT_MARKET_TREASURE_CHEST_GAME_ITEM_1,   RG_TREASURE_GAME_SMALL_KEY,{ Category::cChestMinigame },                                                SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_2] =          Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_2,    RCQUEST_BOTH, RCTYPE_CHEST_GAME,  RCAREA_MARKET,                ACTOR_EN_BOX,    SCENE_TREASURE_BOX_SHOP,         0x00,                         0x03, "Chest Game Second Room Chest",      "MK Chest Game Second Room Chest",      RHT_MARKET_TREASURE_CHEST_GAME_ITEM_2,   RG_TREASURE_GAME_SMALL_KEY,{ Category::cChestMinigame },                                                SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_3] =          Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_3,    RCQUEST_BOTH, RCTYPE_CHEST_GAME,  RCAREA_MARKET,                ACTOR_EN_BOX,    SCENE_TREASURE_BOX_SHOP,         0x00,                         0x05, "Chest Game Third Room Chest",       "MK Chest Game Third Room Chest",       RHT_MARKET_TREASURE_CHEST_GAME_ITEM_3,   RG_TREASURE_GAME_SMALL_KEY,{ Category::cChestMinigame },                                                SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_4] =          Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_4,    RCQUEST_BOTH, RCTYPE_CHEST_GAME,  RCAREA_MARKET,                ACTOR_EN_BOX,    SCENE_TREASURE_BOX_SHOP,         0x00,                         0x07, "Chest Game Fourth Room Chest",      "MK Chest Game Fourth Room Chest",      RHT_MARKET_TREASURE_CHEST_GAME_ITEM_4,   RG_TREASURE_GAME_SMALL_KEY,{ Category::cChestMinigame },                                                SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_5] =          Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_5,    RCQUEST_BOTH, RCTYPE_CHEST_GAME,  RCAREA_MARKET,                ACTOR_EN_BOX,    SCENE_TREASURE_BOX_SHOP,         0x00,                         0x09, "Chest Game Fifth Room Chest",       "MK Chest Game Fifth Room Chest",       RHT_MARKET_TREASURE_CHEST_GAME_ITEM_5,   RG_TREASURE_GAME_SMALL_KEY,{ Category::cChestMinigame },                                                SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    // Hyrule Castle
+    locationTable[RC_HC_MALON_EGG] =                                Location::Base(RC_HC_MALON_EGG,                         RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_HYRULE_CASTLE,         ACTOR_ID_MAX,    SCENE_HYRULE_CASTLE,             0x00,                         0x47, "Malon Egg",                         "HC Malon Egg",                         RHT_HC_MALON_EGG,                        RG_WEIRD_EGG,             {},                        SpoilerCollectionCheck::EventChkInf(0x12),         SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,  true);
+    locationTable[RC_HC_ZELDAS_LETTER] =                            Location::Base(RC_HC_ZELDAS_LETTER,                     RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_HYRULE_CASTLE,         ACTOR_ID_MAX,    SCENE_CASTLE_COURTYARD_ZELDA,    0x00,                         0x0B, "Zeldas Letter",                     "HC Zeldas Letter",                     RHT_HC_ZELDAS_LETTER,                    RG_ZELDAS_LETTER,         {},                        SpoilerCollectionCheck::EventChkInf(0x40),         SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,  true);
+    // Kakariko
+    locationTable[RC_KAK_REDEAD_GROTTO_CHEST] =                    Location::Chest(RC_KAK_REDEAD_GROTTO_CHEST,              RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_EN_BOX,    SCENE_GROTTOS,                   31434,                        0x0A, "Redead Grotto Chest",               "Kak Redead Grotto Chest",              RHT_KAK_REDEAD_GROTTO_CHEST,              RG_HUGE_RUPEE,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_OPEN_GROTTO_CHEST] =                      Location::Chest(RC_KAK_OPEN_GROTTO_CHEST,                RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_EN_BOX,    SCENE_GROTTOS,                   22984,                        0x08, "Open Grotto Chest",                 "Kak Open Grotto Chest",                RHT_KAK_OPEN_GROTTO_CHEST,                RG_RED_RUPEE,            {},                                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_10_GOLD_SKULLTULA_REWARD] =                Location::Base(RC_KAK_10_GOLD_SKULLTULA_REWARD,         RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_HOUSE_OF_SKULLTULA,        0x00,                         0x45, "10 Gold Skulltula Reward",          "Kak 10 Gold Skulltula Reward",         RHT_KAK_10_GOLD_SKULLTULA_REWARD,         RG_PROGRESSIVE_WALLET,   {},                        SpoilerCollectionCheck::EventChkInf(0xDA),         SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
+    locationTable[RC_KAK_20_GOLD_SKULLTULA_REWARD] =                Location::Base(RC_KAK_20_GOLD_SKULLTULA_REWARD,         RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_HOUSE_OF_SKULLTULA,        0x00,                         0x39, "20 Gold Skulltula Reward",          "Kak 20 Gold Skulltula Reward",         RHT_KAK_20_GOLD_SKULLTULA_REWARD,         RG_STONE_OF_AGONY,       {},                        SpoilerCollectionCheck::EventChkInf(0xDB),         SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
+    locationTable[RC_KAK_30_GOLD_SKULLTULA_REWARD] =                Location::Base(RC_KAK_30_GOLD_SKULLTULA_REWARD,         RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_HOUSE_OF_SKULLTULA,        0x00,                         0x46, "30 Gold Skulltula Reward",          "Kak 30 Gold Skulltula Reward",         RHT_KAK_30_GOLD_SKULLTULA_REWARD,         RG_PROGRESSIVE_WALLET,   {},                        SpoilerCollectionCheck::EventChkInf(0xDC),         SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
+    locationTable[RC_KAK_40_GOLD_SKULLTULA_REWARD] =                Location::Base(RC_KAK_40_GOLD_SKULLTULA_REWARD,         RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_HOUSE_OF_SKULLTULA,        0x00,                         0x03, "40 Gold Skulltula Reward",          "Kak 40 Gold Skulltula Reward",         RHT_KAK_40_GOLD_SKULLTULA_REWARD,         RG_BOMBCHU_10,           {},                        SpoilerCollectionCheck::EventChkInf(0xDD),         SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_50_GOLD_SKULLTULA_REWARD] =                Location::Base(RC_KAK_50_GOLD_SKULLTULA_REWARD,         RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_HOUSE_OF_SKULLTULA,        0x00,                         0x3E, "50 Gold Skulltula Reward",          "Kak 50 Gold Skulltula Reward",         RHT_KAK_50_GOLD_SKULLTULA_REWARD,         RG_PIECE_OF_HEART,       {},                        SpoilerCollectionCheck::EventChkInf(0xDE),         SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
+    locationTable[RC_KAK_100_GOLD_SKULLTULA_REWARD] =               Location::Base(RC_KAK_100_GOLD_SKULLTULA_REWARD,        RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_HOUSE_OF_SKULLTULA,        0x00,                         0x3E, "100 Gold Skulltula Reward",         "Kak 100 Gold Skulltula Reward",        RHT_KAK_100_GOLD_SKULLTULA_REWARD,        RG_HUGE_RUPEE,           {},                        SpoilerCollectionCheck::EventChkInf(0xDF),         SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_MAN_ON_ROOF] =                             Location::Base(RC_KAK_MAN_ON_ROOF,                      RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_KAKARIKO_VILLAGE,          0x00,                         0x3E, "Man on Roof",                       "Kak Man on Roof",                      RHT_KAK_MAN_ON_ROOF,                      RG_PIECE_OF_HEART,       {},                        SpoilerCollectionCheck::ItemGetInf(29),            SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
+    locationTable[RC_KAK_SHOOTING_GALLERY_REWARD] =                 Location::Base(RC_KAK_SHOOTING_GALLERY_REWARD,          RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_SHOOTING_GALLERY,          0x00,                         0x30, "Shooting Gallery Reward",           "Kak Shooting Gallery Reward",          RHT_KAK_SHOOTING_GALLERY_REWARD,          RG_PROGRESSIVE_BOW,      {},                        SpoilerCollectionCheck::Chest(0x42, 0x1F),         SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
+    locationTable[RC_KAK_TRADE_ODD_MUSHROOM] =                      Location::Base(RC_KAK_TRADE_ODD_MUSHROOM,               RCQUEST_BOTH, RCTYPE_ADULT_TRADE, RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_POTION_SHOP_GRANNY,        0x00,                         0x20, "Trade Odd Mushroom",                "Kak Trade Odd Mushroom",               RHT_KAK_TRADE_ODD_MUSHROOM,               RG_ODD_POTION,           { Category::cAdultTrade }, SpoilerCollectionCheck::ItemGetInf(56),            SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
+    locationTable[RC_KAK_GRANNYS_SHOP] =                            Location::Base(RC_KAK_GRANNYS_SHOP,                     RCQUEST_BOTH, RCTYPE_MERCHANT,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_POTION_SHOP_GRANNY,        0x00,                         0x4E, "Granny's Shop",                     "Kak Granny's Shop",                    RHT_KAK_GRANNYS_SHOP,                     RG_BUY_BLUE_POTION,      {},                        SpoilerCollectionCheck::RandomizerInf(SCENE_POTION_SHOP_GRANNY, RAND_INF_MERCHANTS_GRANNYS_SHOP), SpoilerCollectionCheckGroup::GROUP_KAKARIKO, true);
+    locationTable[RC_KAK_ANJU_AS_ADULT] =                           Location::Base(RC_KAK_ANJU_AS_ADULT,                    RCQUEST_BOTH, RCTYPE_ADULT_TRADE, RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_KAKARIKO_VILLAGE,          0x00,                         0x1D, "Anju as Adult",                     "Kak Anju as Adult",                    RHT_KAK_ANJU_AS_ADULT,                    RG_CLAIM_CHECK,          {},                        SpoilerCollectionCheck::ItemGetInf(36),            SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
+    locationTable[RC_KAK_ANJU_AS_CHILD] =                           Location::Base(RC_KAK_ANJU_AS_CHILD,                    RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_KAKARIKO_VILLAGE,          0x00,                         0x0F, "Anju as Child",                     "Kak Anju as Child",                    RHT_KAK_ANJU_AS_CHILD,                    RG_EMPTY_BOTTLE,         {},                        SpoilerCollectionCheck::ItemGetInf(4),             SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
+    locationTable[RC_KAK_TRADE_POCKET_CUCCO] =                      Location::Base(RC_KAK_TRADE_POCKET_CUCCO,               RCQUEST_BOTH, RCTYPE_ADULT_TRADE, RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_KAKARIKO_VILLAGE,          0x00,                         0x0E, "Trade Pocket Cucco",                "Kak Trade Pocket Cucco",               RHT_KAK_TRADE_POCKET_CUCCO,               RG_COJIRO,               { Category::cAdultTrade }, SpoilerCollectionCheck::ItemGetInf(38),            SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
+    locationTable[RC_KAK_IMPAS_HOUSE_FREESTANDING_POH] =     Location::Collectable(RC_KAK_IMPAS_HOUSE_FREESTANDING_POH,     RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_EN_ITEM00, SCENE_IMPAS_HOUSE,               262,                          0x01, "Impas House Freestanding PoH",      "Kak Impas House Freestanding PoH",     RHT_KAK_IMPAS_HOUSE_FREESTANDING_POH,     RG_PIECE_OF_HEART,       {},                                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
+    locationTable[RC_KAK_WINDMILL_FREESTANDING_POH] =        Location::Collectable(RC_KAK_WINDMILL_FREESTANDING_POH,        RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_EN_ITEM00, SCENE_WINDMILL_AND_DAMPES_GRAVE, 262,                          0x01, "Windmill Freestanding PoH",         "Kak Windmill Freestanding PoH",        RHT_KAK_WINDMILL_FREESTANDING_POH,        RG_PIECE_OF_HEART,       {},                                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
+    // Graveyard
+    locationTable[RC_GRAVEYARD_SHIELD_GRAVE_CHEST] =               Location::Chest(RC_GRAVEYARD_SHIELD_GRAVE_CHEST,         RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GRAVEYARD,             ACTOR_EN_BOX,    SCENE_GRAVE_WITH_FAIRYS_FOUNTAIN,21824,                        0x00, "Shield Grave Chest",                "GY Shield Grave Chest",                RHT_GRAVEYARD_SHIELD_GRAVE_CHEST,         RG_HYLIAN_SHIELD,        {},                                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_GRAVEYARD_HEART_PIECE_GRAVE_CHEST] =          Location::Chest(RC_GRAVEYARD_HEART_PIECE_GRAVE_CHEST,    RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GRAVEYARD,             ACTOR_EN_BOX,    SCENE_REDEAD_GRAVE,              -22592,                       0x00, "Heart Piece Grave Chest",           "GY Heart Piece Grave Chest",           RHT_GRAVEYARD_HEART_PIECE_GRAVE_CHEST,    RG_PIECE_OF_HEART,       {},                                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
+    locationTable[RC_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST] =         Location::Chest(RC_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST,   RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GRAVEYARD,             ACTOR_EN_BOX,    SCENE_ROYAL_FAMILYS_TOMB,        -32736,                       0x00, "Composers Grave Chest",             "GY Composers Grave Chest",             RHT_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST,   RG_BOMBS_5,              {},                                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_GRAVEYARD_HOOKSHOT_CHEST] =                   Location::Chest(RC_GRAVEYARD_HOOKSHOT_CHEST,             RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GRAVEYARD,             ACTOR_EN_BOX,    SCENE_WINDMILL_AND_DAMPES_GRAVE, 4352,                         0x00, "Hookshot Chest",                    "GY Hookshot Chest",                    RHT_GRAVEYARD_HOOKSHOT_CHEST,             RG_PROGRESSIVE_HOOKSHOT, {},                                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
+    locationTable[RC_GRAVEYARD_FREESTANDING_POH] =           Location::Collectable(RC_GRAVEYARD_FREESTANDING_POH,           RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GRAVEYARD,             ACTOR_EN_ITEM00, SCENE_GRAVEYARD,                 1030,                         0x04, "Freestanding PoH",                  "GY Freestanding PoH",                  RHT_GRAVEYARD_FREESTANDING_POH,           RG_PIECE_OF_HEART,       {},                                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
+    locationTable[RC_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH] =Location::Collectable(RC_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH,RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GRAVEYARD,             ACTOR_EN_ITEM00, SCENE_WINDMILL_AND_DAMPES_GRAVE, 1798,                         0x07, "Dampe Race Freestanding PoH",       "GY Dampe Race Freestanding PoH",       RHT_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH,RG_PIECE_OF_HEART,       {},                                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
+    locationTable[RC_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR] =    Location::Collectable(RC_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR,    RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GRAVEYARD,             ACTOR_EN_ITEM00, SCENE_GRAVEYARD,                 7942,                         0x08, "Dampe Gravedigging Tour",           "GY Dampe Gravedigging Tour",           RHT_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR,    RG_PIECE_OF_HEART,       {},                        SpoilerCollectionCheck::Gravedigger(0x53, 0x1F),   SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
+    // Death Mountain
+    locationTable[RC_DMT_CHEST] =                                  Location::Chest(RC_DMT_CHEST,                            RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_DEATH_MOUNTAIN_TRAIL,  ACTOR_EN_BOX,    SCENE_DEATH_MOUNTAIN_TRAIL,      23201,                        0x01, "Chest",                             "DMT Chest",                            RHT_DMT_CHEST,                            RG_PURPLE_RUPEE,         {},                                                                           SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMT_STORMS_GROTTO_CHEST] =                    Location::Chest(RC_DMT_STORMS_GROTTO_CHEST,              RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_DEATH_MOUNTAIN_TRAIL,  ACTOR_EN_BOX,    SCENE_GROTTOS,                   23255,                        0x17, "Storms Grotto Chest",               "DMT Storms Grotto Chest",              RHT_DMT_STORMS_GROTTO_CHEST,              RG_HUGE_RUPEE,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMT_TRADE_BROKEN_SWORD] =                      Location::Base(RC_DMT_TRADE_BROKEN_SWORD,               RCQUEST_BOTH, RCTYPE_ADULT_TRADE, RCAREA_DEATH_MOUNTAIN_TRAIL,  ACTOR_ID_MAX,    SCENE_DEATH_MOUNTAIN_TRAIL,      0x00,                         0x23, "Trade Broken Sword",                "DMT Trade Broken Sword",               RHT_DMT_TRADE_BROKEN_SWORD,               RG_PRESCRIPTION,         { Category::cAdultTrade }, SpoilerCollectionCheck::RandomizerInf(0x60, 0x1D), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN, true);
+    locationTable[RC_DMT_TRADE_EYEDROPS] =                          Location::Base(RC_DMT_TRADE_EYEDROPS,                   RCQUEST_BOTH, RCTYPE_ADULT_TRADE, RCAREA_DEATH_MOUNTAIN_TRAIL,  ACTOR_ID_MAX,    SCENE_DEATH_MOUNTAIN_TRAIL,      0x00,                         0x26, "Trade Eyedrops",                    "DMT Trade Eyedrops",                   RHT_DMT_TRADE_EYEDROPS,                   RG_CLAIM_CHECK,          { Category::cAdultTrade }, SpoilerCollectionCheck::RandomizerInf(0x60, 0x1E), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN, true);
+    locationTable[RC_DMT_TRADE_CLAIM_CHECK] =                       Location::Base(RC_DMT_TRADE_CLAIM_CHECK,                RCQUEST_BOTH, RCTYPE_ADULT_TRADE, RCAREA_DEATH_MOUNTAIN_TRAIL,  ACTOR_ID_MAX,    SCENE_DEATH_MOUNTAIN_TRAIL,      0x00,                         0x57, "Trade Claim Check",                 "DMT Trade Claim Check",                RHT_DMT_TRADE_CLAIM_CHECK,                RG_BIGGORON_SWORD,       {},                        SpoilerCollectionCheck::Chest(0x60, 0x1F),         SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN, true);
+    locationTable[RC_DMT_FREESTANDING_POH] =                 Location::Collectable(RC_DMT_FREESTANDING_POH,                 RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_DEATH_MOUNTAIN_TRAIL,  ACTOR_EN_ITEM00, SCENE_DEATH_MOUNTAIN_TRAIL,      7686,                         0x1E, "Freestanding PoH",                  "DMT Freestanding PoH",                 RHT_DMT_FREESTANDING_POH,                 RG_PIECE_OF_HEART,       {},                                                                           SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN, true);
+    // Goron City
+    locationTable[RC_GC_MAZE_LEFT_CHEST] =                         Location::Chest(RC_GC_MAZE_LEFT_CHEST,                   RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GORON_CITY,            ACTOR_EN_BOX,    SCENE_GORON_CITY,                23232,                        0x00, "Maze Left Chest",                   "GC Maze Left Chest",                   RHT_GC_MAZE_LEFT_CHEST,                   RG_HUGE_RUPEE,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_MAZE_RIGHT_CHEST] =                        Location::Chest(RC_GC_MAZE_RIGHT_CHEST,                  RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GORON_CITY,            ACTOR_EN_BOX,    SCENE_GORON_CITY,                23201,                        0x01, "Maze Right Chest",                  "GC Maze Right Chest",                  RHT_GC_MAZE_RIGHT_CHEST,                  RG_PURPLE_RUPEE,         {},                                                                           SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_MAZE_CENTER_CHEST] =                       Location::Chest(RC_GC_MAZE_CENTER_CHEST,                 RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GORON_CITY,            ACTOR_EN_BOX,    SCENE_GORON_CITY,                23202,                        0x02, "Maze Center Chest",                 "GC Maze Center Chest",                 RHT_GC_MAZE_CENTER_CHEST,                 RG_PURPLE_RUPEE,         {},                                                                           SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_ROLLING_GORON_AS_CHILD] =                   Location::Base(RC_GC_ROLLING_GORON_AS_CHILD,            RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GORON_CITY,            ACTOR_ID_MAX,    SCENE_GORON_CITY,                0x00,                         0x34, "Rolling Goron as Child",            "GC Rolling Goron as Child",            RHT_GC_ROLLING_GORON_AS_CHILD,            RG_PROGRESSIVE_BOMB_BAG, {},                        SpoilerCollectionCheck::InfTable(0x11, 0x06),      SpoilerCollectionCheckGroup::GROUP_GORON_CITY,     true);
+    locationTable[RC_GC_ROLLING_GORON_AS_ADULT] =                   Location::Base(RC_GC_ROLLING_GORON_AS_ADULT,            RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GORON_CITY,            ACTOR_ID_MAX,    SCENE_GORON_CITY,                0x00,                         0x2C, "Rolling Goron as Adult",            "GC Rolling Goron as Adult",            RHT_GC_ROLLING_GORON_AS_ADULT,            RG_GORON_TUNIC,          {},                        SpoilerCollectionCheck::InfTable(0x10, 0x01),      SpoilerCollectionCheckGroup::GROUP_GORON_CITY,     true);
+    locationTable[RC_GC_DARUNIAS_JOY] =                             Location::Base(RC_GC_DARUNIAS_JOY,                      RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GORON_CITY,            ACTOR_ID_MAX,    SCENE_GORON_CITY,                0x00,                         0x54, "Darunias Joy",                      "GC Darunias Joy",                      RHT_GC_DARUNIAS_JOY,                      RG_PROGRESSIVE_STRENGTH, {},                        SpoilerCollectionCheck::Chest(0x62, 0x1E),         SpoilerCollectionCheckGroup::GROUP_GORON_CITY,     true);
+    locationTable[RC_GC_POT_FREESTANDING_POH] =              Location::Collectable(RC_GC_POT_FREESTANDING_POH,              RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GORON_CITY,            ACTOR_EN_ITEM00, SCENE_GORON_CITY,                7942,                         0x1F, "Pot Freestanding PoH",              "GC Pot Freestanding PoH",              RHT_GC_POT_FREESTANDING_POH,              RG_PIECE_OF_HEART,       {},                                                                           SpoilerCollectionCheckGroup::GROUP_GORON_CITY,     true);
+    locationTable[RC_GC_DEKU_SCRUB_GROTTO_LEFT] =            Location::GrottoScrub(RC_GC_DEKU_SCRUB_GROTTO_LEFT,            RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_GORON_CITY,            ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x00, 0xFB), 0x30, "Deku Scrub Grotto Left",            "GC Deku Scrub Grotto Left",            RHT_GC_DEKU_SCRUB_GROTTO_LEFT,            RG_BUY_DEKU_NUT_5,       { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x25, 0x01),         SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_DEKU_SCRUB_GROTTO_RIGHT] =           Location::GrottoScrub(RC_GC_DEKU_SCRUB_GROTTO_RIGHT,           RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_GORON_CITY,            ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x05, 0xFB), 0x37, "Deku Scrub Grotto Right",           "GC Deku Scrub Grotto Right",           RHT_GC_DEKU_SCRUB_GROTTO_RIGHT,           RG_BUY_BOMBS_535,        { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x25, 0x06),         SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_DEKU_SCRUB_GROTTO_CENTER] =          Location::GrottoScrub(RC_GC_DEKU_SCRUB_GROTTO_CENTER,          RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_GORON_CITY,            ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x03, 0xFB), 0x33, "Deku Scrub Grotto Center",          "GC Deku Scrub Grotto Center",          RHT_GC_DEKU_SCRUB_GROTTO_CENTER,          RG_BUY_ARROWS_30,        { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x25, 0x04),         SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_MEDIGORON] =                                Location::Base(RC_GC_MEDIGORON,                         RCQUEST_BOTH, RCTYPE_MERCHANT,    RCAREA_GORON_CITY,            ACTOR_ID_MAX,    SCENE_GORON_CITY,                0x00,                         0x51, "Medigoron",                         "GC Medigoron",                         RHT_GC_MEDIGORON,                         RG_GIANTS_KNIFE,         { Category::cMerchant },   SpoilerCollectionCheck::Merchant(0x62, 0x87),      SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    // Death Mountain Crater
+    locationTable[RC_DMC_UPPER_GROTTO_CHEST] =                     Location::Chest(RC_DMC_UPPER_GROTTO_CHEST,               RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_DEATH_MOUNTAIN_CRATER, ACTOR_EN_BOX,    SCENE_GROTTOS,                   23802,                        0x1A, "Upper Grotto Chest",                "DMC Upper Grotto Chest",               RHT_DMC_UPPER_GROTTO_CHEST,               RG_BOMBS_20,             {},                                                                           SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMC_WALL_FREESTANDING_POH] =            Location::Collectable(RC_DMC_WALL_FREESTANDING_POH,            RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_DEATH_MOUNTAIN_CRATER, ACTOR_EN_ITEM00, SCENE_DEATH_MOUNTAIN_CRATER,     518,                          0x02, "Wall Freestanding PoH",             "DMC Wall Freestanding PoH",            RHT_DMC_WALL_FREESTANDING_POH,            RG_PIECE_OF_HEART,       {},                                                                           SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN, true);
+    locationTable[RC_DMC_VOLCANO_FREESTANDING_POH] =         Location::Collectable(RC_DMC_VOLCANO_FREESTANDING_POH,         RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_DEATH_MOUNTAIN_CRATER, ACTOR_EN_ITEM00, SCENE_DEATH_MOUNTAIN_CRATER,     2054,                         0x08, "Volcano Freestanding PoH",          "DMC Volcano Freestanding PoH",         RHT_DMC_WALL_FREESTANDING_POH,            RG_PIECE_OF_HEART,       {},                                                                           SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN, true);
+    locationTable[RC_DMC_DEKU_SCRUB] =                              Location::Base(RC_DMC_DEKU_SCRUB,                       RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_DEATH_MOUNTAIN_CRATER, ACTOR_EN_DNS,    SCENE_DEATH_MOUNTAIN_CRATER,     0x05,                         0x37, "Deku Scrub",                        "DMC Deku Scrub",                       RHT_DMC_DEKU_SCRUB,                       RG_BUY_BOMBS_535,        { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x61, 0x06),         SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMC_DEKU_SCRUB_GROTTO_LEFT] =           Location::GrottoScrub(RC_DMC_DEKU_SCRUB_GROTTO_LEFT,           RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_DEATH_MOUNTAIN_CRATER, ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x00, 0xF9), 0x30, "Deku Scrub Grotto Left",            "DMC Deku Scrub Grotto Left",           RHT_DMC_DEKU_SCRUB_GROTTO_LEFT,           RG_BUY_DEKU_NUT_5,       { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x23, 0x01),         SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMC_DEKU_SCRUB_GROTTO_RIGHT] =          Location::GrottoScrub(RC_DMC_DEKU_SCRUB_GROTTO_RIGHT,          RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_DEATH_MOUNTAIN_CRATER, ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x05, 0xF9), 0x37, "Deku Scrub Grotto Right",           "DMC Deku Scrub Grotto Right",          RHT_DMC_DEKU_SCRUB_GROTTO_RIGHT,          RG_BUY_BOMBS_535,        { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x23, 0x06),         SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMC_DEKU_SCRUB_GROTTO_CENTER] =         Location::GrottoScrub(RC_DMC_DEKU_SCRUB_GROTTO_CENTER,         RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_DEATH_MOUNTAIN_CRATER, ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x03, 0xF9), 0x33, "Deku Scrub Grotto Center",          "DMC Deku Scrub Grotto Center",         RHT_DMC_DEKU_SCRUB_GROTTO_CENTER,         RG_BUY_ARROWS_30,        { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x23, 0x04),         SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    // Zoras River
+    locationTable[RC_ZR_OPEN_GROTTO_CHEST] =                       Location::Chest(RC_ZR_OPEN_GROTTO_CHEST,                 RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_ZORAS_RIVER,           ACTOR_EN_BOX,    SCENE_GROTTOS,                   22985,                        0x09, "Open Grotto Chest",                 "ZR Open Grotto Chest",                 RHT_ZR_OPEN_GROTTO_CHEST,                 RG_RED_RUPEE,            {},                                                                           SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZR_MAGIC_BEAN_SALESMAN] =                      Location::Base(RC_ZR_MAGIC_BEAN_SALESMAN,               RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_ZORAS_RIVER,           ACTOR_ID_MAX,    SCENE_ZORAS_RIVER,               0x00,                         0x16, "Magic Bean Salesman",               "ZR Magic Bean Salesman",               RHT_ZR_MAGIC_BEAN_SALESMAN,               RG_MAGIC_BEAN,           {},                        SpoilerCollectionCheck::MagicBeans(0x54, 0x01),    SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,    true);
+    locationTable[RC_ZR_FROGS_ZELDAS_LULLABY] =                     Location::Base(RC_ZR_FROGS_ZELDAS_LULLABY,              RCQUEST_BOTH, RCTYPE_FROG_SONG,   RCAREA_ZORAS_RIVER,           ACTOR_EN_FR,     SCENE_ZORAS_RIVER,               0x00,                         0x3E, "Frogs Zelda's Lullaby",             "ZR Frogs Zelda's Lullaby",             RHT_ZR_FROGS_ZELDAS_LULLABY,              RG_PURPLE_RUPEE,         {},                        SpoilerCollectionCheck::EventChkInf(0xD1),         SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZR_FROGS_EPONAS_SONG] =                        Location::Base(RC_ZR_FROGS_EPONAS_SONG,                 RCQUEST_BOTH, RCTYPE_FROG_SONG,   RCAREA_ZORAS_RIVER,           ACTOR_EN_FR,     SCENE_ZORAS_RIVER,               0x00,                         0x3E, "Frogs Epona's Song",                "ZR Frogs Epona's Song",                RHT_ZR_FROGS_EPONAS_SONG,                 RG_PURPLE_RUPEE,         {},                        SpoilerCollectionCheck::EventChkInf(0xD2),         SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZR_FROGS_SARIAS_SONG] =                        Location::Base(RC_ZR_FROGS_SARIAS_SONG,                 RCQUEST_BOTH, RCTYPE_FROG_SONG,   RCAREA_ZORAS_RIVER,           ACTOR_EN_FR,     SCENE_ZORAS_RIVER,               0x00,                         0x3E, "Frogs Saria's Song",                "ZR Frogs Saria's Song",                RHT_ZR_FROGS_SARIAS_SONG,                 RG_PURPLE_RUPEE,         {},                        SpoilerCollectionCheck::EventChkInf(0xD4),         SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZR_FROGS_SUNS_SONG] =                          Location::Base(RC_ZR_FROGS_SUNS_SONG,                   RCQUEST_BOTH, RCTYPE_FROG_SONG,   RCAREA_ZORAS_RIVER,           ACTOR_EN_FR,     SCENE_ZORAS_RIVER,               0x00,                         0x3E, "Frogs Sun's Song",                  "ZR Frogs Sun's Song",                  RHT_ZR_FROGS_SUNS_SONG,                   RG_PURPLE_RUPEE,         {},                        SpoilerCollectionCheck::EventChkInf(0xD3),         SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZR_FROGS_SONG_OF_TIME] =                       Location::Base(RC_ZR_FROGS_SONG_OF_TIME,                RCQUEST_BOTH, RCTYPE_FROG_SONG,   RCAREA_ZORAS_RIVER,           ACTOR_EN_FR,     SCENE_ZORAS_RIVER,               0x00,                         0x3E, "Frogs Song of Time",                "ZR Frogs Song of Time",                RHT_ZR_FROGS_SONG_OF_TIME,                RG_PURPLE_RUPEE,         {},                        SpoilerCollectionCheck::EventChkInf(0xD5),         SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZR_FROGS_IN_THE_RAIN] =                        Location::Base(RC_ZR_FROGS_IN_THE_RAIN,                 RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_ZORAS_RIVER,           ACTOR_EN_FR,     SCENE_ZORAS_RIVER,               0x00,                         0x3E, "Frogs in the Rain",                 "ZR Frogs in the Rain",                 RHT_ZR_FROGS_IN_THE_RAIN,                 RG_PIECE_OF_HEART,       {},                        SpoilerCollectionCheck::EventChkInf(0xD6),         SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,    true);
+    locationTable[RC_ZR_FROGS_OCARINA_GAME] =                       Location::Base(RC_ZR_FROGS_OCARINA_GAME,                RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_ZORAS_RIVER,           ACTOR_EN_FR,     SCENE_ZORAS_RIVER,               0x00,                         0x76, "Frogs Ocarina Game",                "ZR Frogs Ocarina Game",                RHT_ZR_FROGS_OCARINA_GAME,                RG_PIECE_OF_HEART,       {},                        SpoilerCollectionCheck::EventChkInf(0xD0),         SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,    true);
+    locationTable[RC_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH] = Location::Collectable(RC_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH, RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_ZORAS_RIVER,           ACTOR_EN_ITEM00, SCENE_ZORAS_RIVER,               1030,                         0x04, "Near Open Grotto Freestanding PoH", "ZR Near Open Grotto Freestanding PoH", RHT_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH, RG_PIECE_OF_HEART,       {},                                                                           SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,    true);
+    locationTable[RC_ZR_NEAR_DOMAIN_FREESTANDING_POH] =      Location::Collectable(RC_ZR_NEAR_DOMAIN_FREESTANDING_POH,      RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_ZORAS_RIVER,           ACTOR_EN_ITEM00, SCENE_ZORAS_RIVER,               2822,                         0x0B, "Near Domain Freestanding PoH",      "ZR Near Domain Freestanding PoH",      RHT_ZR_NEAR_DOMAIN_FREESTANDING_POH,      RG_PIECE_OF_HEART,       {},                                                                           SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,    true);
+    locationTable[RC_ZR_DEKU_SCRUB_GROTTO_REAR] =            Location::GrottoScrub(RC_ZR_DEKU_SCRUB_GROTTO_REAR,            RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_ZORAS_RIVER,           ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x07, 0xEB), 0x39, "Deku Scrub Grotto Rear",            "ZR Deku Scrub Grotto Rear",            RHT_ZR_DEKU_SCRUB_GROTTO_REAR,            RG_BUY_RED_POTION_30,    { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x15, 0x08),         SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZR_DEKU_SCRUB_GROTTO_FRONT] =           Location::GrottoScrub(RC_ZR_DEKU_SCRUB_GROTTO_FRONT,           RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_ZORAS_RIVER,           ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x08, 0xEB), 0x3A, "Deku Scrub Grotto Front",           "ZR Deku Scrub Grotto Front",           RHT_ZR_DEKU_SCRUB_GROTTO_FRONT,           RG_BUY_GREEN_POTION,     { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x15, 0x09),         SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    // Zoras Domain
+    locationTable[RC_ZD_CHEST] =                                   Location::Chest(RC_ZD_CHEST,                             RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_ZORAS_DOMAIN,          ACTOR_EN_BOX,    SCENE_ZORAS_DOMAIN,              -18496,                       0x00, "Chest",                             "ZD Chest",                             RHT_ZD_CHEST,                             RG_PIECE_OF_HEART,       {},                                                                           SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,   true);
+    locationTable[RC_ZD_DIVING_MINIGAME] =                          Location::Base(RC_ZD_DIVING_MINIGAME,                   RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_ZORAS_DOMAIN,          ACTOR_ID_MAX,    SCENE_ZORAS_DOMAIN,              0x00,                         0x37, "Diving Minigame",                   "ZD Diving Minigame",                   RHT_ZD_DIVING_MINIGAME,                   RG_PROGRESSIVE_SCALE,    {},                         SpoilerCollectionCheck::EventChkInf(0x38),        SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,   true);
+    locationTable[RC_ZD_KING_ZORA_THAWED] =                         Location::Base(RC_ZD_KING_ZORA_THAWED,                  RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_ZORAS_DOMAIN,          ACTOR_ID_MAX,    SCENE_ZORAS_DOMAIN,              0x00,                         0x2D, "King Zora Thawed",                  "ZD King Zora Thawed",                  RHT_ZD_KING_ZORA_THAWED,                  RG_ZORA_TUNIC,           {},                         SpoilerCollectionCheck::InfTable(0x13, 0x01),     SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,   true);
+    locationTable[RC_ZD_TRADE_PRESCRIPTION] =                       Location::Base(RC_ZD_TRADE_PRESCRIPTION,                RCQUEST_BOTH, RCTYPE_ADULT_TRADE, RCAREA_ZORAS_DOMAIN,          ACTOR_ID_MAX,    SCENE_ZORAS_DOMAIN,              0x00,                         0x24, "Trade Prescription",                "ZD Trade Prescription",                RHT_ZD_TRADE_PRESCRIPTION,                RG_EYEBALL_FROG,         { Category::cAdultTrade },  SpoilerCollectionCheck::Chest(0x58, 0x1F),        SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,   true);
+    // Zora's Fountain
+    locationTable[RC_ZF_ICEBERC_FREESTANDING_POH] =          Location::Collectable(RC_ZF_ICEBERC_FREESTANDING_POH,          RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_ZORAS_FOUNTAIN,        ACTOR_EN_ITEM00, SCENE_ZORAS_FOUNTAIN,            262,                          0x01, "Iceberg Freestanding PoH",          "ZF Iceberg Freestanding PoH",          RHT_ZF_ICEBERG_FREESTANDING_POH,          RG_PIECE_OF_HEART,       {},                                                                           SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,   true);
+    locationTable[RC_ZF_BOTTOM_FREESTANDING_POH] =           Location::Collectable(RC_ZF_BOTTOM_FREESTANDING_POH,           RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_ZORAS_FOUNTAIN,        ACTOR_EN_ITEM00, SCENE_ZORAS_FOUNTAIN,            5126,                         0x14, "Bottom Freestanding PoH",           "ZF Bottom Freestanding PoH",           RHT_ZF_BOTTOM_FREESTANDING_POH,           RG_PIECE_OF_HEART,       {},                                                                           SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,   true);
+    // Lon Lon Ranch
+    locationTable[RC_LLR_TALONS_CHICKENS] =                         Location::Base(RC_LLR_TALONS_CHICKENS,                  RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LON_LON_RANCH,         ACTOR_ID_MAX,    SCENE_LON_LON_BUILDINGS,         0x00,                         0x14, "Talons Chickens",                   "LLR Talons Chickens",                  RHT_LLR_TALONS_CHICKENS,                  RG_BOTTLE_WITH_MILK,     {},                         SpoilerCollectionCheck::ItemGetInf(10),           SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH,  true);
+    locationTable[RC_LLR_FREESTANDING_POH] =                 Location::Collectable(RC_LLR_FREESTANDING_POH,                 RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LON_LON_RANCH,         ACTOR_EN_ITEM00, SCENE_LON_LON_BUILDINGS,         262,                          0x01, "Freestanding PoH",                  "LLR Freestanding PoH",                 RHT_LLR_FREESTANDING_POH,                 RG_PIECE_OF_HEART,       {},                                                                           SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH,  true);
+    locationTable[RC_LLR_DEKU_SCRUB_GROTTO_LEFT] =           Location::GrottoScrub(RC_LLR_DEKU_SCRUB_GROTTO_LEFT,           RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_LON_LON_RANCH,         ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x00, 0xFC), 0x30, "Deku Scrub Grotto Left",            "LLR Deku Scrub Grotto Left",           RHT_LLR_DEKU_SCRUB_GROTTO_LEFT,           RG_BUY_DEKU_NUT_5,       { Category::cDekuScrub },   SpoilerCollectionCheck::Scrub(0x26, 0x01),        SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
+    locationTable[RC_LLR_DEKU_SCRUB_GROTTO_RIGHT] =          Location::GrottoScrub(RC_LLR_DEKU_SCRUB_GROTTO_RIGHT,          RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_LON_LON_RANCH,         ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x05, 0xFC), 0x37, "Deku Scrub Grotto Right",           "LLR Deku Scrub Grotto Right",          RHT_LLR_DEKU_SCRUB_GROTTO_RIGHT,          RG_BUY_BOMBS_535,        { Category::cDekuScrub },   SpoilerCollectionCheck::Scrub(0x26, 0x06),        SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
+    locationTable[RC_LLR_DEKU_SCRUB_GROTTO_CENTER] =         Location::GrottoScrub(RC_LLR_DEKU_SCRUB_GROTTO_CENTER,         RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_LON_LON_RANCH,         ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x03, 0xFC), 0x33, "Deku Scrub Grotto Center",          "LLR Deku Scrub Grotto Center",         RHT_LLR_DEKU_SCRUB_GROTTO_CENTER,         RG_BUY_DEKU_SEEDS_30,    { Category::cDekuScrub },   SpoilerCollectionCheck::Scrub(0x26, 0x04),        SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
+
+    // Dungeons
+    //            Randomizer Check                                             Randomizer Check                           Quest            Type                Area              Actor ID      Scene ID         Params Flags Short Name                       Spoiler Name                              Hint Text Key                               Vanilla Item              Categories                     Spoiler Collection Check                   Collection Check Group                                Vanilla Progression
+    // Deku Tree Vanilla
+    locationTable[RC_DEKU_TREE_MAP_CHEST] =                    Location::Chest(RC_DEKU_TREE_MAP_CHEST,                    RCQUEST_VANILLA, RCTYPE_MAP_COMPASS, RCAREA_DEKU_TREE, ACTOR_EN_BOX, SCENE_DEKU_TREE, 2083,  0x03, "Map Chest",                     "Deku Tree Map Chest",                    RHT_DEKU_TREE_MAP_CHEST,                    RG_DEKU_TREE_MAP,         { Category::cVanillaMap },                                                SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE, true);
+    locationTable[RC_DEKU_TREE_COMPASS_CHEST] =                Location::Chest(RC_DEKU_TREE_COMPASS_CHEST,                RCQUEST_VANILLA, RCTYPE_MAP_COMPASS, RCAREA_DEKU_TREE, ACTOR_EN_BOX, SCENE_DEKU_TREE, 2050,  0x02, "Compass Chest",                 "Deku Tree Compass Chest",                RHT_DEKU_TREE_COMPASS_CHEST,                RG_DEKU_TREE_COMPASS,     { Category::cVanillaCompass },                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE, true);
+    locationTable[RC_DEKU_TREE_COMPASS_ROOM_SIDE_CHEST] =      Location::Chest(RC_DEKU_TREE_COMPASS_ROOM_SIDE_CHEST,      RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_DEKU_TREE, ACTOR_EN_BOX, SCENE_DEKU_TREE, 22790, 0x06, "Compass Room Side Chest",       "Deku Tree Compass Room Side Chest",      RHT_DEKU_TREE_COMPASS_ROOM_SIDE_CHEST,      RG_RECOVERY_HEART,        {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_BASEMENT_CHEST] =               Location::Chest(RC_DEKU_TREE_BASEMENT_CHEST,               RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_DEKU_TREE, ACTOR_EN_BOX, SCENE_DEKU_TREE, 22788, 0x04, "Basement Chest",                "Deku Tree Basement Chest",               RHT_DEKU_TREE_BASEMENT_CHEST,               RG_RECOVERY_HEART,        {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_SLINGSHOT_CHEST] =              Location::Chest(RC_DEKU_TREE_SLINGSHOT_CHEST,              RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_DEKU_TREE, ACTOR_EN_BOX, SCENE_DEKU_TREE, 161,   0x01, "Slingshot Chest",               "Deku Tree Slingshot Chest",              RHT_DEKU_TREE_SLINGSHOT_CHEST,              RG_PROGRESSIVE_SLINGSHOT, {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE, true);
+    locationTable[RC_DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST] =    Location::Chest(RC_DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST,    RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_DEKU_TREE, ACTOR_EN_BOX, SCENE_DEKU_TREE, 22789, 0x05, "Slingshot Room Side Chest",     "Deku Tree Slingshot Room Side Chest",    RHT_DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST,    RG_RECOVERY_HEART,        {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    // Deku Tree MQ
+    locationTable[RC_DEKU_TREE_MQ_MAP_CHEST] =                 Location::Chest(RC_DEKU_TREE_MQ_MAP_CHEST,                 RCQUEST_MQ,      RCTYPE_MAP_COMPASS, RCAREA_DEKU_TREE, ACTOR_EN_BOX, SCENE_DEKU_TREE, 2083,   0x03, "MQ Map Chest",                 "Deku Tree MQ Map Chest",                 RHT_DEKU_TREE_MQ_MAP_CHEST,                 RG_DEKU_TREE_MAP,         { Category::cVanillaMap },                                                SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE, true);
+    locationTable[RC_DEKU_TREE_MQ_COMPASS_CHEST] =             Location::Chest(RC_DEKU_TREE_MQ_COMPASS_CHEST,             RCQUEST_MQ,      RCTYPE_MAP_COMPASS, RCAREA_DEKU_TREE, ACTOR_EN_BOX, SCENE_DEKU_TREE, 2049,   0x01, "MQ Compass Chest",             "Deku Tree MQ Compass Chest",             RHT_DEKU_TREE_MQ_COMPASS_CHEST,             RG_DEKU_TREE_COMPASS,     { Category::cVanillaCompass },                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE, true);
+    locationTable[RC_DEKU_TREE_MQ_SLINGSHOT_CHEST] =           Location::Chest(RC_DEKU_TREE_MQ_SLINGSHOT_CHEST,           RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_DEKU_TREE, ACTOR_EN_BOX, SCENE_DEKU_TREE, 4262,   0x06, "MQ Slingshot Chest",           "Deku Tree MQ Slingshot Chest",           RHT_DEKU_TREE_MQ_SLINGSHOT_CHEST,           RG_PROGRESSIVE_SLINGSHOT, {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE, true);
+    locationTable[RC_DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST] = Location::Chest(RC_DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST, RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_DEKU_TREE, ACTOR_EN_BOX, SCENE_DEKU_TREE, -31454, 0x02, "MQ Slingshot Room Back Chest", "Deku Tree MQ Slingshot Room Back Chest", RHT_DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST, RG_DEKU_SHIELD,           {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_MQ_BASEMENT_CHEST] =            Location::Chest(RC_DEKU_TREE_MQ_BASEMENT_CHEST,            RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_DEKU_TREE, ACTOR_EN_BOX, SCENE_DEKU_TREE, -31452, 0x04, "MQ Basement Chest",            "Deku Tree MQ Basement Chest",            RHT_DEKU_TREE_MQ_BASEMENT_CHEST,            RG_DEKU_SHIELD,           {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST] = Location::Chest(RC_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST, RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_DEKU_TREE, ACTOR_EN_BOX, SCENE_DEKU_TREE, 22789,  0x05, "MQ Before Spinning Log Chest", "Deku Tree MQ Before Spinning Log Chest", RHT_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST, RG_RECOVERY_HEART,        {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST] =  Location::Chest(RC_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST,  RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_DEKU_TREE, ACTOR_EN_BOX, SCENE_DEKU_TREE, 23200,  0x00, "MQ After Spinning Log Chest",  "Deku Tree MQ After Spinning Log Chest",  RHT_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST,  RG_PURPLE_RUPEE,          {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_MQ_DEKU_SCRUB] =                 Location::Base(RC_DEKU_TREE_MQ_DEKU_SCRUB,                RCQUEST_MQ,      RCTYPE_SCRUB,       RCAREA_DEKU_TREE, ACTOR_EN_DNS, SCENE_DEKU_TREE, 0x04,   0x34, "MQ Deku Scrub",                "Deku Tree MQ Deku Scrub",                RHT_DEKU_TREE_MQ_DEKU_SCRUB,                RG_BUY_DEKU_SHIELD,       { Category::cDekuScrub },      SpoilerCollectionCheck::Scrub(0x00, 0x05), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+
+    //            Randomizer Check                                                                 Randomizer Check                                                Quest            Type                Area                    Actor ID      Scene ID                    Params Flags Short Name                                     Spoiler Name                                                Hint Text Key                                                    Vanilla Item                Categories                     Spoiler Collection Check                   Collection Check Group                                      Vanilla Progression
+    // Dodongo's Cavern Shared
+    locationTable[RC_DODONGOS_CAVERN_BOSS_ROOM_CHEST] =                            Location::Chest(RC_DODONGOS_CAVERN_BOSS_ROOM_CHEST,                             RCQUEST_BOTH,    RCTYPE_STANDARD,    RCAREA_DODONGOS_CAVERN, ACTOR_EN_BOX, SCENE_DODONGOS_CAVERN_BOSS, 20512, 0x00, "Boss Room Chest",                             "Dodongos Cavern Boss Room Chest",                          RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST,                             RG_BOMBS_5,                 {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    // Dodongo's Cavern Vanilla
+    locationTable[RC_DODONGOS_CAVERN_MAP_CHEST] =                                  Location::Chest(RC_DODONGOS_CAVERN_MAP_CHEST,                                   RCQUEST_VANILLA, RCTYPE_MAP_COMPASS, RCAREA_DODONGOS_CAVERN, ACTOR_EN_BOX, SCENE_DODONGOS_CAVERN,      2088,  0x08, "Map Chest",                                   "Dodongos Cavern Map Chest",                                RHT_DODONGOS_CAVERN_MAP_CHEST,                                   RG_DODONGOS_CAVERN_MAP,     { Category::cVanillaMap },                                                SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN, true);
+    locationTable[RC_DODONGOS_CAVERN_COMPASS_CHEST] =                              Location::Chest(RC_DODONGOS_CAVERN_COMPASS_CHEST,                               RCQUEST_VANILLA, RCTYPE_MAP_COMPASS, RCAREA_DODONGOS_CAVERN, ACTOR_EN_BOX, SCENE_DODONGOS_CAVERN,      2053,  0x05, "Compass Chest",                               "Dodongos Cavern Compass Chest",                            RHT_DODONGOS_CAVERN_COMPASS_CHEST,                               RG_DODONGOS_CAVERN_COMPASS, { Category::cVanillaCompass },                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN, true);
+    locationTable[RC_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST] =                 Location::Chest(RC_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST,                  RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_DODONGOS_CAVERN, ACTOR_EN_BOX, SCENE_DODONGOS_CAVERN,      22982, 0x06, "Bomb Flower Platform Chest",                  "Dodongos Cavern Bomb Flower Platform Chest",               RHT_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST,                  RG_RED_RUPEE,               {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_BOMB_BAG_CHEST] =                             Location::Chest(RC_DODONGOS_CAVERN_BOMB_BAG_CHEST,                              RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_DODONGOS_CAVERN, ACTOR_EN_BOX, SCENE_DODONGOS_CAVERN,      1604,  0x04, "Bomb Bag Chest",                              "Dodongos Cavern Bomb Bag Chest",                           RHT_DODONGOS_CAVERN_BOMB_BAG_CHEST,                              RG_PROGRESSIVE_BOMB_BAG,    {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN, true);
+    locationTable[RC_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST] =                        Location::Chest(RC_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST,                         RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_DODONGOS_CAVERN, ACTOR_EN_BOX, SCENE_DODONGOS_CAVERN,      21802, 0x0A, "End Of Bridge Chest",                         "Dodongos Cavern End Of Bridge Chest",                      RHT_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST,                         RG_DEKU_SHIELD,             {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT] =               Location::Base(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,               RCQUEST_VANILLA, RCTYPE_SCRUB,       RCAREA_DODONGOS_CAVERN, ACTOR_EN_DNS, SCENE_DODONGOS_CAVERN,      0x00,  0x30, "Deku Scrub Near Bomb Bag Left",               "Dodongos Cavern Deku Scrub Near Bomb Bag Left",            RHT_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,               RG_BUY_DEKU_NUT_5,          { Category::cDekuScrub },      SpoilerCollectionCheck::Scrub(0x01, 0x01), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS] =          Location::Base(RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS,          RCQUEST_VANILLA, RCTYPE_SCRUB,       RCAREA_DODONGOS_CAVERN, ACTOR_EN_DNS, SCENE_DODONGOS_CAVERN,      0x01,  0x31, "Deku Scrub Side Room Near Dodongos",          "Dodongos Cavern Deku Scrub Side Room Near Dodongos",       RHT_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS,          RG_BUY_DEKU_STICK_1,        { Category::cDekuScrub },      SpoilerCollectionCheck::Scrub(0x01, 0x02), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT] =              Location::Base(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT,              RCQUEST_VANILLA, RCTYPE_SCRUB,       RCAREA_DODONGOS_CAVERN, ACTOR_EN_DNS, SCENE_DODONGOS_CAVERN,      0x03,  0x33, "Deku Scrub Near Bomb Bag Right",              "Dodongos Cavern Deku Scrub Near Bomb Bag Right",           RHT_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT,              RG_BUY_DEKU_SEEDS_30,       { Category::cDekuScrub },      SpoilerCollectionCheck::Scrub(0x01, 0x04), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY] =                            Location::Base(RC_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY,                            RCQUEST_VANILLA, RCTYPE_SCRUB,       RCAREA_DODONGOS_CAVERN, ACTOR_EN_DNS, SCENE_DODONGOS_CAVERN,      0x04,  0x34, "Deku Scrub Lobby",                            "Dodongos Cavern Deku Scrub Lobby",                         RHT_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY,                            RG_BUY_DEKU_SHIELD,         { Category::cDekuScrub },      SpoilerCollectionCheck::Scrub(0x01, 0x05), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    // Dodongo's Cavern MQ
+    locationTable[RC_DODONGOS_CAVERN_MQ_MAP_CHEST] =                               Location::Chest(RC_DODONGOS_CAVERN_MQ_MAP_CHEST,                                RCQUEST_MQ,      RCTYPE_MAP_COMPASS, RCAREA_DODONGOS_CAVERN, ACTOR_EN_BOX, SCENE_DODONGOS_CAVERN,      2080,  0x00, "MQ Map Chest",                                "Dodongos Cavern MQ Map Chest",                             RHT_DODONGOS_CAVERN_MQ_MAP_CHEST,                                RG_DODONGOS_CAVERN_MAP,     { Category::cVanillaMap },                                                SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN, true);
+    locationTable[RC_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST] =                          Location::Chest(RC_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST,                           RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_DODONGOS_CAVERN, ACTOR_EN_BOX, SCENE_DODONGOS_CAVERN,      1604,  0x04, "MQ Bomb Bag Chest",                           "Dodongos Cavern MQ Bomb Bag Chest",                        RHT_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST,                           RG_PROGRESSIVE_BOMB_BAG,    {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN, true);
+    locationTable[RC_DODONGOS_CAVERN_MQ_COMPASS_CHEST] =                           Location::Chest(RC_DODONGOS_CAVERN_MQ_COMPASS_CHEST,                            RCQUEST_MQ,      RCTYPE_MAP_COMPASS, RCAREA_DODONGOS_CAVERN, ACTOR_EN_BOX, SCENE_DODONGOS_CAVERN,      6149,  0x05, "MQ Compass Chest",                            "Dodongos Cavern MQ Compass Chest",                         RHT_DODONGOS_CAVERN_MQ_COMPASS_CHEST,                            RG_DODONGOS_CAVERN_COMPASS, { Category::cVanillaCompass },                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN, true);
+    locationTable[RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST] =                       Location::Chest(RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST,                        RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_DODONGOS_CAVERN, ACTOR_EN_BOX, SCENE_DODONGOS_CAVERN,      29986, 0x02, "MQ Larvae Room Chest",                        "Dodongos Cavern MQ Larvae Room Chest",                     RHT_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST,                        RG_DEKU_SHIELD,             {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST] =                 Location::Chest(RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST,                  RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_DODONGOS_CAVERN, ACTOR_EN_BOX, SCENE_DODONGOS_CAVERN,      22947, 0x03, "MQ Torch Puzzle Room Chest",                  "Dodongos Cavern MQ Torch Puzzle Room Chest",               RHT_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST,                  RG_BLUE_RUPEE,              {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST] =                       Location::Chest(RC_DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST,                        RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_DODONGOS_CAVERN, ACTOR_EN_BOX, SCENE_DODONGOS_CAVERN,      21825, 0x01, "MQ Under Grave Chest",                        "Dodongos Cavern MQ Under Grave Chest",                     RHT_DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST,                        RG_HYLIAN_SHIELD,           {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR] =                    Location::Base(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,                    RCQUEST_MQ,      RCTYPE_SCRUB,       RCAREA_DODONGOS_CAVERN, ACTOR_EN_DNS, SCENE_DODONGOS_CAVERN,      0x01,  0x31, "MQ Deku Scrub Lobby Rear",                    "Dodongos Cavern Deku Scrub Lobby Rear",                    RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,                    RG_BUY_DEKU_STICK_1,        { Category::cDekuScrub },      SpoilerCollectionCheck::Scrub(0x01, 0x02), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT] =                   Location::Base(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT,                   RCQUEST_MQ,      RCTYPE_SCRUB,       RCAREA_DODONGOS_CAVERN, ACTOR_EN_DNS, SCENE_DODONGOS_CAVERN,      0x03,  0x33, "MQ Deku Scrub Lobby Front",                   "Dodongos Cavern Deku Scrub Lobby Front",                   RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT,                   RG_BUY_DEKU_SEEDS_30,       { Category::cDekuScrub },      SpoilerCollectionCheck::Scrub(0x01, 0x04), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE] =                     Location::Base(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,                     RCQUEST_MQ,      RCTYPE_SCRUB,       RCAREA_DODONGOS_CAVERN, ACTOR_EN_DNS, SCENE_DODONGOS_CAVERN,      0x04,  0x34, "MQ Deku Scrub Staircase",                     "Dodongos Cavern Deku Scrub Staircase",                     RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,                     RG_BUY_DEKU_SHIELD,         { Category::cDekuScrub },      SpoilerCollectionCheck::Scrub(0x01, 0x05), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS] = Location::Base(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS, RCQUEST_MQ,      RCTYPE_SCRUB,       RCAREA_DODONGOS_CAVERN, ACTOR_EN_DNS, SCENE_DODONGOS_CAVERN,      0x07,  0x39, "MQ Deku Scrub Side Room Near Lower Lizalfos", "Dodongos Cavern Deku Scrub Side Room Near Lower Lizalfos", RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS, RG_BUY_RED_POTION_30,       { Category::cDekuScrub },      SpoilerCollectionCheck::Scrub(0x01, 0x08), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+
+    //            Randomizer Check                                                       Randomizer Check                                     Quest            Type                Area                     Actor ID      Scene ID         Params  Flags Short Name                         Spoiler Name                                        Hint Text Key                                         Vanilla Item                 Categories                     Spoiler Collection Check                   Collection Check Group                                      Vanilla Progression
+    // Jabu-Jabu's Belly Vanilla
+    locationTable[RC_JABU_JABUS_BELLY_MAP_CHEST] =                       Location::Chest(RC_JABU_JABUS_BELLY_MAP_CHEST,                       RCQUEST_VANILLA, RCTYPE_MAP_COMPASS, RCAREA_JABU_JABUS_BELLY, ACTOR_EN_BOX, SCENE_JABU_JABU, 6178,   0x02, "Map Chest",                       "Jabu Jabus Belly Map Chest",                       RHT_JABU_JABUS_BELLY_MAP_CHEST,                       RG_JABU_JABUS_BELLY_MAP,     { Category::cVanillaMap },                                                SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY, true);
+    locationTable[RC_JABU_JABUS_BELLY_COMPASS_CHEST] =                   Location::Chest(RC_JABU_JABUS_BELLY_COMPASS_CHEST,                   RCQUEST_VANILLA, RCTYPE_MAP_COMPASS, RCAREA_JABU_JABUS_BELLY, ACTOR_EN_BOX, SCENE_JABU_JABU, -18428, 0x04, "Compass Chest",                   "Jabu Jabus Belly Compass Chest",                   RHT_JABU_JABUS_BELLY_COMPASS_CHEST,                   RG_JABU_JABUS_BELLY_COMPASS, { Category::cVanillaCompass },                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY, true);
+    locationTable[RC_JABU_JABUS_BELLY_BOOMERANG_CHEST] =                 Location::Chest(RC_JABU_JABUS_BELLY_BOOMERANG_CHEST,                 RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_JABU_JABUS_BELLY, ACTOR_EN_BOX, SCENE_JABU_JABU, 4289,   0x01, "Boomerang Chest",                 "Jabu Jabus Belly Boomerang Chest",                 RHT_JABU_JABUS_BELLY_BOOMERANG_CHEST,                 RG_BOOMERANG,                {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY, true);
+    locationTable[RC_JABU_JABUS_BELLY_DEKU_SCRUB] =                      Location::Base(RC_JABU_JABUS_BELLY_DEKU_SCRUB,                       RCQUEST_VANILLA, RCTYPE_SCRUB,       RCAREA_JABU_JABUS_BELLY, ACTOR_EN_DNS, SCENE_JABU_JABU, 0x00,   0x30, "Deku Scrub",                      "Jabu Jabus Belly Deku Scrub",                      RHT_JABU_JABUS_BELLY_DEKU_SCRUB,                      RG_BUY_DEKU_NUT_5,           { Category::cDekuScrub },      SpoilerCollectionCheck::Scrub(0x02, 0x01), SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    // Jabu-Jabu's Belly MQ
+    locationTable[RC_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST] =        Location::Chest(RC_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST,        RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_JABU_JABUS_BELLY, ACTOR_EN_BOX, SCENE_JABU_JABU, -32699, 0x05, "MQ First Room Side Chest",        "Jabu Jabus Belly MQ First Room Side Chest",        RHT_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST,        RG_DEKU_NUTS_5,              {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_MAP_CHEST] =                    Location::Chest(RC_JABU_JABUS_BELLY_MQ_MAP_CHEST,                    RCQUEST_MQ,      RCTYPE_MAP_COMPASS, RCAREA_JABU_JABUS_BELLY, ACTOR_EN_BOX, SCENE_JABU_JABU, -18397, 0x03, "MQ Map Chest",                    "Jabu Jabus Belly MQ Map Chest",                    RHT_JABU_JABUS_BELLY_MQ_MAP_CHEST,                    RG_JABU_JABUS_BELLY_MAP,     { Category::cVanillaMap },                                                SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY, true);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST] =      Location::Chest(RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST,      RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_JABU_JABUS_BELLY, ACTOR_EN_BOX, SCENE_JABU_JABU, 20546,  0x02, "MQ Second Room Lower Chest",      "Jabu Jabus Belly MQ Second Room Lower Chest",      RHT_JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST,      RG_DEKU_NUTS_5,              {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_COMPASS_CHEST] =                Location::Chest(RC_JABU_JABUS_BELLY_MQ_COMPASS_CHEST,                RCQUEST_MQ,      RCTYPE_MAP_COMPASS, RCAREA_JABU_JABUS_BELLY, ACTOR_EN_BOX, SCENE_JABU_JABU, -18432, 0x00, "MQ Compass Chest",                "Jabu Jabus Belly MQ Compass Chest",                RHT_JABU_JABUS_BELLY_MQ_COMPASS_CHEST,                RG_JABU_JABUS_BELLY_COMPASS, { Category::cVanillaCompass },                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY, true);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST] =      Location::Chest(RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST,      RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_JABU_JABUS_BELLY, ACTOR_EN_BOX, SCENE_JABU_JABU, -30457, 0x07, "MQ Second Room Upper Chest",      "Jabu Jabus Belly MQ Second Room Upper Chest",      RHT_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST,      RG_RECOVERY_HEART,           {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST] = Location::Chest(RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST, RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_JABU_JABUS_BELLY, ACTOR_EN_BOX, SCENE_JABU_JABU, -32696, 0x08, "MQ Basement Near Switches Chest", "Jabu Jabus Belly MQ Basement Near Switches Chest", RHT_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST, RG_DEKU_NUTS_5,              {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST] =    Location::Chest(RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST,    RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_JABU_JABUS_BELLY, ACTOR_EN_BOX, SCENE_JABU_JABU, -32668, 0x04, "MQ Basement Near Vines Chest",    "Jabu Jabus Belly MQ Basement Near Vines Chest",    RHT_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST,    RG_BOMBCHU_10,               {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST] =              Location::Chest(RC_JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST,              RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_JABU_JABUS_BELLY, ACTOR_EN_BOX, SCENE_JABU_JABU, -31446, 0x0A, "MQ Near Boss Chest",              "Jabu Jabus Belly MQ Near Boss Chest",              RHT_JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST,              RG_DEKU_SHIELD,              {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST] = Location::Chest(RC_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST, RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_JABU_JABUS_BELLY, ACTOR_EN_BOX, SCENE_JABU_JABU, 28905,  0x09, "MQ Falling Like Like Room Chest", "Jabu Jabus Belly MQ Falling Like Like Room Chest", RHT_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST, RG_DEKU_STICK_1,             {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST] =   Location::Chest(RC_JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST,   RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_JABU_JABUS_BELLY, ACTOR_EN_BOX, SCENE_JABU_JABU, 20545,  0x01, "MQ Boomerang Room Small Chest",   "Jabu Jabus Belly MQ Boomerang Room Small Chest",   RHT_JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST,   RG_DEKU_NUTS_5,              {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST] =              Location::Chest(RC_JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST,              RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_JABU_JABUS_BELLY, ACTOR_EN_BOX, SCENE_JABU_JABU, 4294,   0x06, "MQ Boomerang Chest",              "Jabu Jabus Belly MQ Boomerang Chest",              RHT_JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST,              RG_BOOMERANG,                {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY, true);
+
+    //            Randomizer Check                                                           Randomizer Check                                         Quest            Type                Area                  Actor ID      Scene ID             Params  Flags Short Name                                Spoiler Name                                            Hint Text Key                                             Vanilla Item                Categories                      Collection Check Group                                    Vanilla Progression
+    // Forest Temple Vanilla
+    locationTable[RC_FOREST_TEMPLE_FIRST_ROOM_CHEST] =                       Location::Chest(RC_FOREST_TEMPLE_FIRST_ROOM_CHEST,                       RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, 22595,  0x03, "First Room Chest",                       "Forest Temple First Room Chest",                       RHT_FOREST_TEMPLE_FIRST_ROOM_CHEST,                       RG_FOREST_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE, true);
+    locationTable[RC_FOREST_TEMPLE_FIRST_STALFOS_CHEST] =                    Location::Chest(RC_FOREST_TEMPLE_FIRST_STALFOS_CHEST,                    RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, 30784,  0x00, "First Stalfos Chest",                    "Forest Temple First Stalfos Chest",                    RHT_FOREST_TEMPLE_FIRST_STALFOS_CHEST,                    RG_FOREST_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE, true);
+    locationTable[RC_FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST] =          Location::Chest(RC_FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST,          RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, 22789,  0x05, "Raised Island Courtyard Chest",          "Forest Temple Raised Island Courtyard Chest",          RHT_FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST,          RG_RECOVERY_HEART,          {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_MAP_CHEST] =                              Location::Chest(RC_FOREST_TEMPLE_MAP_CHEST,                              RCQUEST_VANILLA, RCTYPE_MAP_COMPASS, RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, 6177,   0x01, "Map Chest",                              "Forest Temple Map Chest",                              RHT_FOREST_TEMPLE_MAP_CHEST,                              RG_FOREST_TEMPLE_MAP,       { Category::cVanillaMap },      SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE, true);
+    locationTable[RC_FOREST_TEMPLE_WELL_CHEST] =                             Location::Chest(RC_FOREST_TEMPLE_WELL_CHEST,                             RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, 22601,  0x09, "Well Chest",                             "Forest Temple Well Chest",                             RHT_FOREST_TEMPLE_WELL_CHEST,                             RG_FOREST_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE, true);
+    locationTable[RC_FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST] =             Location::Chest(RC_FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST,             RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, 22855,  0x07, "Falling Ceiling Room Chest",             "Forest Temple Falling Ceiling Room Chest",             RHT_FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST,             RG_ARROWS_10,               {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_EYE_SWITCH_CHEST] =                       Location::Chest(RC_FOREST_TEMPLE_EYE_SWITCH_CHEST,                       RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, -30364, 0x04, "Eye Switch Chest",                       "Forest Temple Eye Switch Chest",                       RHT_FOREST_TEMPLE_EYE_SWITCH_CHEST,                       RG_ARROWS_30,               {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_BOSS_KEY_CHEST] =                         Location::Chest(RC_FOREST_TEMPLE_BOSS_KEY_CHEST,                         RCQUEST_VANILLA, RCTYPE_BOSS_KEY,    RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, 10222,  0x0E, "Boss Key Chest",                         "Forest Temple Boss Key Chest",                         RHT_FOREST_TEMPLE_BOSS_KEY_CHEST,                         RG_FOREST_TEMPLE_BOSS_KEY,  { Category::cVanillaBossKey },  SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE, true);
+    locationTable[RC_FOREST_TEMPLE_FLOORMASTER_CHEST] =                      Location::Chest(RC_FOREST_TEMPLE_FLOORMASTER_CHEST,                      RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, 30786,  0x02, "Floormaster Chest",                      "Forest Temple Floormaster Chest",                      RHT_FOREST_TEMPLE_FLOORMASTER_CHEST,                      RG_FOREST_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE, true);
+    locationTable[RC_FOREST_TEMPLE_BOW_CHEST] =                              Location::Chest(RC_FOREST_TEMPLE_BOW_CHEST,                              RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, -20340, 0x0C, "Bow Chest",                              "Forest Temple Bow Chest",                              RHT_FOREST_TEMPLE_BOW_CHEST,                              RG_PROGRESSIVE_BOW,         {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE, true);
+    locationTable[RC_FOREST_TEMPLE_RED_POE_CHEST] =                          Location::Chest(RC_FOREST_TEMPLE_RED_POE_CHEST,                          RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, 30797,  0x0D, "Red Poe Chest",                          "Forest Temple Red Poe Chest",                          RHT_FOREST_TEMPLE_RED_POE_CHEST,                          RG_FOREST_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE, true);
+    locationTable[RC_FOREST_TEMPLE_BLUE_POE_CHEST] =                         Location::Chest(RC_FOREST_TEMPLE_BLUE_POE_CHEST,                         RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, 6159,   0x0F, "Blue Poe Chest",                         "Forest Temple Blue Poe Chest",                         RHT_FOREST_TEMPLE_BLUE_POE_CHEST,                         RG_FOREST_TEMPLE_COMPASS,   { Category::cVanillaCompass },  SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE, true);
+    locationTable[RC_FOREST_TEMPLE_BASEMENT_CHEST] =                         Location::Chest(RC_FOREST_TEMPLE_BASEMENT_CHEST,                         RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, 22827,  0x0B, "Basement Chest",                         "Forest Temple Basement Chest",                         RHT_FOREST_TEMPLE_BASEMENT_CHEST,                         RG_ARROWS_5,                {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    // Forest Temple MQ
+    locationTable[RC_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST] =                    Location::Chest(RC_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST,                    RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, -30653, 0x03, "MQ First Room Chest",                    "Forest Temple MQ First Room Chest",                    RHT_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST,                    RG_FOREST_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_MQ_WOLFOS_CHEST] =                        Location::Chest(RC_FOREST_TEMPLE_MQ_WOLFOS_CHEST,                        RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, 30784,  0x00, "MQ Wolfos Chest",                        "Forest Temple MQ Wolfos Chest",                        RHT_FOREST_TEMPLE_MQ_WOLFOS_CHEST,                        RG_FOREST_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE, true);
+    locationTable[RC_FOREST_TEMPLE_MQ_BOW_CHEST] =                           Location::Chest(RC_FOREST_TEMPLE_MQ_BOW_CHEST,                           RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, -20340, 0x0C, "MQ Bow Chest",                           "Forest Temple MQ Bow Chest",                           RHT_FOREST_TEMPLE_MQ_BOW_CHEST,                           RG_PROGRESSIVE_BOW,         {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE, true);
+    locationTable[RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST] = Location::Chest(RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST, RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, 22593,  0x01, "MQ Raised Island Courtyard Lower Chest", "Forest Temple MQ Raised Island Courtyard Lower Chest", RHT_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST, RG_FOREST_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE, true);
+    locationTable[RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST] = Location::Chest(RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST, RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, 22597,  0x05, "MQ Raised Island Courtyard Upper Chest", "Forest Temple MQ Raised Island Courtyard Upper Chest", RHT_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST, RG_FOREST_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE, true);
+    locationTable[RC_FOREST_TEMPLE_MQ_WELL_CHEST] =                          Location::Chest(RC_FOREST_TEMPLE_MQ_WELL_CHEST,                          RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, 22601,  0x09, "MQ Well Chest",                          "Forest Temple MQ Well Chest",                          RHT_FOREST_TEMPLE_MQ_WELL_CHEST,                          RG_FOREST_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE, true);
+    locationTable[RC_FOREST_TEMPLE_MQ_MAP_CHEST] =                           Location::Chest(RC_FOREST_TEMPLE_MQ_MAP_CHEST,                           RCQUEST_MQ,      RCTYPE_MAP_COMPASS, RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, 6189,   0x0D, "MQ Map Chest",                           "Forest Temple MQ Map Chest",                           RHT_FOREST_TEMPLE_MQ_MAP_CHEST,                           RG_FOREST_TEMPLE_MAP,       { Category::cVanillaMap },      SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE, true);
+    locationTable[RC_FOREST_TEMPLE_MQ_COMPASS_CHEST] =                       Location::Chest(RC_FOREST_TEMPLE_MQ_COMPASS_CHEST,                       RCQUEST_MQ,      RCTYPE_MAP_COMPASS, RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, 6159,   0x0F, "MQ Compass Chest",                       "Forest Temple MQ Compass Chest",                       RHT_FOREST_TEMPLE_MQ_COMPASS_CHEST,                       RG_FOREST_TEMPLE_COMPASS,   { Category::cVanillaCompass },  SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE, true);
+    locationTable[RC_FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST] =          Location::Chest(RC_FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST,          RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, -30426, 0x06, "MQ Falling Ceiling Room Chest",          "Forest Temple MQ Falling Ceiling Room Chest",          RHT_FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST,          RG_ARROWS_5,                {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_MQ_BASEMENT_CHEST] =                      Location::Chest(RC_FOREST_TEMPLE_MQ_BASEMENT_CHEST,                      RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, 22827,  0x0B, "MQ Basement Chest",                      "Forest Temple MQ Basement Chest",                      RHT_FOREST_TEMPLE_MQ_BASEMENT_CHEST,                      RG_ARROWS_5,                {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_MQ_REDEAD_CHEST] =                        Location::Chest(RC_FOREST_TEMPLE_MQ_REDEAD_CHEST,                        RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, 30786,  0x02, "MQ Redead Chest",                        "Forest Temple MQ Redead Chest",                        RHT_FOREST_TEMPLE_MQ_REDEAD_CHEST,                        RG_FOREST_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE, true);
+    locationTable[RC_FOREST_TEMPLE_MQ_BOSS_KEY_CHEST] =                      Location::Chest(RC_FOREST_TEMPLE_MQ_BOSS_KEY_CHEST,                      RCQUEST_MQ,      RCTYPE_BOSS_KEY,    RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, 10222,  0x0E, "MQ Boss Key Chest",                      "Forest Temple MQ Boss Key Chest",                      RHT_FOREST_TEMPLE_MQ_BOSS_KEY_CHEST,                      RG_FOREST_TEMPLE_BOSS_KEY,  { Category::cVanillaBossKey },  SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE, true);
+
+    //            Randomizer Check                                                      Randomizer Check                                    Quest            Type                Area                Actor ID         Scene ID           Params Flags Short Name                             Spoiler Name                                       Hint Text Key                                        Vanilla Item              Categories                      Collection Check Group                                  Vanilla Progression
+    // Fire Temple Vanilla
+    locationTable[RC_FIRE_TEMPLE_NEAR_BOSS_CHEST] =                     Location::Chest(RC_FIRE_TEMPLE_NEAR_BOSS_CHEST,                     RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 22593, 0x01, "Near Boss Chest",                     "Fire Temple Near Boss Chest",                     RHT_FIRE_TEMPLE_NEAR_BOSS_CHEST,                     RG_FIRE_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE, true);
+    locationTable[RC_FIRE_TEMPLE_FLARE_DANCER_CHEST] =                  Location::Chest(RC_FIRE_TEMPLE_FLARE_DANCER_CHEST,                  RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 31936, 0x00, "Flare Dancer Chest",                  "Fire Temple Flare Dancer Chest",                  RHT_FIRE_TEMPLE_FLARE_DANCER_CHEST,                  RG_BOMBS_10,              {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    locationTable[RC_FIRE_TEMPLE_BOSS_KEY_CHEST] =                      Location::Chest(RC_FIRE_TEMPLE_BOSS_KEY_CHEST,                      RCQUEST_VANILLA, RCTYPE_BOSS_KEY,    RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 10220, 0x0C, "Boss Key Chest",                      "Fire Temple Boss Key Chest",                      RHT_FIRE_TEMPLE_BOSS_KEY_CHEST,                      RG_FIRE_TEMPLE_BOSS_KEY,  { Category::cVanillaBossKey },  SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE, true);
+    locationTable[RC_FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST] =    Location::Chest(RC_FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST,    RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 22594, 0x02, "Big Lava Room Blocked Door Chest",    "Fire Temple Big Lava Room Blocked Door Chest",    RHT_FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST,    RG_FIRE_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE, true);
+    locationTable[RC_FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST] = Location::Chest(RC_FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST, RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 22596, 0x04, "Big Lava Room Lower Open Door Chest", "Fire Temple Big Lava Room Lower Open Door Chest", RHT_FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST, RG_FIRE_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE, true);
+    locationTable[RC_FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST] =            Location::Chest(RC_FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST,            RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 22595, 0x03, "Boulder Maze Lower Chest",            "Fire Temple Boulder Maze Lower Chest",            RHT_FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST,            RG_FIRE_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE, true);
+    locationTable[RC_FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST] =            Location::Chest(RC_FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST,            RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 22598, 0x06, "Boulder Maze Upper Chest",            "Fire Temple Boulder Maze Upper Chest",            RHT_FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST,            RG_FIRE_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE, true);
+    locationTable[RC_FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST] =        Location::Chest(RC_FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST,        RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 22600, 0x08, "Boulder Maze Side Room Chest",        "Fire Temple Boulder Maze Side Room Chest",        RHT_FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST,        RG_FIRE_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE, true);
+    locationTable[RC_FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST] =         Location::Chest(RC_FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST,         RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 22603, 0x0B, "Boulder Maze Shortcut Chest",         "Fire Temple Boulder Maze Shortcut Chest",         RHT_FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST,         RG_FIRE_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE, true);
+    locationTable[RC_FIRE_TEMPLE_SCARECROW_CHEST] =                     Location::Chest(RC_FIRE_TEMPLE_SCARECROW_CHEST,                     RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 23245, 0x0D, "Scarecrow Chest",                     "Fire Temple Scarecrow Chest",                     RHT_FIRE_TEMPLE_SCARECROW_CHEST,                     RG_HUGE_RUPEE,            {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    locationTable[RC_FIRE_TEMPLE_MAP_CHEST] =                           Location::Chest(RC_FIRE_TEMPLE_MAP_CHEST,                           RCQUEST_VANILLA, RCTYPE_MAP_COMPASS, RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 2090,  0x0A, "Map Chest",                           "Fire Temple Map Chest",                           RHT_FIRE_TEMPLE_MAP_CHEST,                           RG_FIRE_TEMPLE_MAP,       { Category::cVanillaMap },      SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE, true);
+    locationTable[RC_FIRE_TEMPLE_COMPASS_CHEST] =                       Location::Chest(RC_FIRE_TEMPLE_COMPASS_CHEST,                       RCQUEST_VANILLA, RCTYPE_MAP_COMPASS, RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 2055,  0x07, "Compass Chest",                       "Fire Temple Compass Chest",                       RHT_FIRE_TEMPLE_COMPASS_CHEST,                       RG_FIRE_TEMPLE_COMPASS,   { Category::cVanillaCompass },  SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE, true);
+    locationTable[RC_FIRE_TEMPLE_HIGHEST_GORON_CHEST] =                 Location::Chest(RC_FIRE_TEMPLE_HIGHEST_GORON_CHEST,                 RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 22601, 0x09, "Highest Goron Chest",                 "Fire Temple Highest Goron Chest",                 RHT_FIRE_TEMPLE_HIGHEST_GORON_CHEST,                 RG_FIRE_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE, true);
+    locationTable[RC_FIRE_TEMPLE_MEGATON_HAMMER_CHEST] =                Location::Chest(RC_FIRE_TEMPLE_MEGATON_HAMMER_CHEST,                RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 421,   0x05, "Megaton Hammer Chest",                "Fire Temple Megaton Hammer Chest",                RHT_FIRE_TEMPLE_MEGATON_HAMMER_CHEST,                RG_MEGATON_HAMMER,        {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE, true);
+    // Fire Temple MQ
+    locationTable[RC_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST] =                  Location::Chest(RC_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST,                  RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 22599, 0x07, "MQ Near Boss Chest",                  "Fire Temple MQ Near Boss Chest",                  RHT_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST,                  RG_FIRE_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE, true);
+    locationTable[RC_FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST] =             Location::Chest(RC_FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST,             RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 4512,  0x00, "MQ Megaton Hammer Chest",             "Fire Temple MQ Megaton Hammer Chest",             RHT_FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST,             RG_MEGATON_HAMMER,        {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE, true);
+    locationTable[RC_FIRE_TEMPLE_MQ_COMPASS_CHEST] =                    Location::Chest(RC_FIRE_TEMPLE_MQ_COMPASS_CHEST,                    RCQUEST_MQ,      RCTYPE_MAP_COMPASS, RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 2059,  0x0B, "MQ Compass Chest",                    "Fire Temple MQ Compass Chest",                    RHT_FIRE_TEMPLE_MQ_COMPASS_CHEST,                    RG_FIRE_TEMPLE_COMPASS,   { Category::cVanillaCompass },  SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE, true);
+    locationTable[RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST] =        Location::Chest(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST,        RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 23747, 0x03, "MQ Lizalfos Maze Lower Chest",        "Fire Temple MQ Lizalfos Maze Lower Chest",        RHT_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST,        RG_BOMBS_10,              {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    locationTable[RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST] =        Location::Chest(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST,        RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 23782, 0x06, "MQ Lizalfos Maze Upper Chest",        "Fire Temple MQ Lizalfos Maze Upper Chest",        RHT_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST,        RG_BOMBS_10,              {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    locationTable[RC_FIRE_TEMPLE_MQ_CHEST_ON_FIRE] =                    Location::Chest(RC_FIRE_TEMPLE_MQ_CHEST_ON_FIRE,                    RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 22597, 0x05, "MQ Chest on Fire",                    "Fire Temple MQ Chest on Fire",                    RHT_FIRE_TEMPLE_MQ_CHEST_ON_FIRE,                    RG_FIRE_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE, true);
+    locationTable[RC_FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST] =              Location::Chest(RC_FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST,              RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 30018, 0x02, "MQ Map Room Side Chest",              "Fire Temple MQ Map Room Side Chest",              RHT_FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST,              RG_HYLIAN_SHIELD,         {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    locationTable[RC_FIRE_TEMPLE_MQ_MAP_CHEST] =                        Location::Chest(RC_FIRE_TEMPLE_MQ_MAP_CHEST,                        RCQUEST_MQ,      RCTYPE_MAP_COMPASS, RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 2092,  0x0C, "MQ Map Chest",                        "Fire Temple MQ Map Chest",                        RHT_FIRE_TEMPLE_MQ_MAP_CHEST,                        RG_FIRE_TEMPLE_MAP,       { Category::cVanillaMap },      SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE, true);
+    locationTable[RC_FIRE_TEMPLE_MQ_BOSS_KEY_CHEST] =                   Location::Chest(RC_FIRE_TEMPLE_MQ_BOSS_KEY_CHEST,                   RCQUEST_MQ,      RCTYPE_BOSS_KEY,    RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 10212, 0x04, "MQ Boss Key Chest",                   "Fire Temple MQ Boss Key Chest",                   RHT_FIRE_TEMPLE_MQ_BOSS_KEY_CHEST,                   RG_FIRE_TEMPLE_BOSS_KEY,  { Category::cVanillaBossKey },  SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE, true);
+    locationTable[RC_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST] = Location::Chest(RC_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST, RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 22593, 0x01, "MQ Big Lava Room Blocked Door Chest", "Fire Temple MQ Big Lava Room Blocked Door Chest", RHT_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST, RG_FIRE_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE, true);
+    locationTable[RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST] =    Location::Chest(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST,    RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 22600, 0x08, "MQ Lizalfos Maze Side Room Chest",    "Fire Temple MQ Lizalfos Maze Side Room Chest",    RHT_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST,    RG_FIRE_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE, true);
+    locationTable[RC_FIRE_TEMPLE_MQ_FREESTANDING_KEY] =           Location::Collectable(RC_FIRE_TEMPLE_MQ_FREESTANDING_KEY,                 RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_FIRE_TEMPLE, ACTOR_EN_ITEM00, SCENE_FIRE_TEMPLE, 7185,  0x1C, "MQ Freestanding Key",                 "Fire Temple MQ Freestanding Key",                 RHT_FIRE_TEMPLE_MQ_FREESTANDING_KEY,                 RG_FIRE_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE, true);
+
+    //            Randomizer Check                                             Randomizer Check                          Quest            Type                Area                 Actor ID         Scene ID            Params  Flags Short Name                  Spoiler Name                             Hint Text Key                              Randomizer Get             Categories                      Collection Check Group                                   Vanilla Progression
+    // Water Temple Vanilla
+    locationTable[RC_WATER_TEMPLE_MAP_CHEST] =                 Location::Chest(RC_WATER_TEMPLE_MAP_CHEST,                RCQUEST_VANILLA, RCTYPE_MAP_COMPASS, RCAREA_WATER_TEMPLE, ACTOR_EN_BOX,    SCENE_WATER_TEMPLE, 6178,   0x02, "Map Chest",                "Water Temple Map Chest",                RHT_WATER_TEMPLE_MAP_CHEST,                RG_WATER_TEMPLE_MAP,       { Category::cVanillaMap },      SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE, true);
+    locationTable[RC_WATER_TEMPLE_COMPASS_CHEST] =             Location::Chest(RC_WATER_TEMPLE_COMPASS_CHEST,            RCQUEST_VANILLA, RCTYPE_MAP_COMPASS, RCAREA_WATER_TEMPLE, ACTOR_EN_BOX,    SCENE_WATER_TEMPLE, 2057,   0x09, "Compass Chest",            "Water Temple Compass Chest",            RHT_WATER_TEMPLE_COMPASS_CHEST,            RG_WATER_TEMPLE_COMPASS,   { Category::cVanillaCompass },  SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE, true);
+    locationTable[RC_WATER_TEMPLE_TORCHES_CHEST] =             Location::Chest(RC_WATER_TEMPLE_TORCHES_CHEST,            RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_WATER_TEMPLE, ACTOR_EN_BOX,    SCENE_WATER_TEMPLE, 30785,  0x01, "Torches Chest",            "Water Temple Torches Chest",            RHT_WATER_TEMPLE_TORCHES_CHEST,            RG_WATER_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE, true);
+    locationTable[RC_WATER_TEMPLE_DRAGON_CHEST] =              Location::Chest(RC_WATER_TEMPLE_DRAGON_CHEST,             RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_WATER_TEMPLE, ACTOR_EN_BOX,    SCENE_WATER_TEMPLE, 22602,  0x0A, "Dragon Chest",             "Water Temple Dragon Chest",             RHT_WATER_TEMPLE_DRAGON_CHEST,             RG_WATER_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE, true);
+    locationTable[RC_WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST] =  Location::Chest(RC_WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST, RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_WATER_TEMPLE, ACTOR_EN_BOX,    SCENE_WATER_TEMPLE, 22600,  0x08, "Central Bow Target Chest", "Water Temple Central Bow Target Chest", RHT_WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST, RG_WATER_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE, true);
+    locationTable[RC_WATER_TEMPLE_CENTRAL_PILLAR_CHEST] =      Location::Chest(RC_WATER_TEMPLE_CENTRAL_PILLAR_CHEST,     RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_WATER_TEMPLE, ACTOR_EN_BOX,    SCENE_WATER_TEMPLE, 22598,  0x06, "Central Pillar Chest",     "Water Temple Central Pillar Chest",     RHT_WATER_TEMPLE_CENTRAL_PILLAR_CHEST,     RG_WATER_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE, true);
+    locationTable[RC_WATER_TEMPLE_CRACKED_WALL_CHEST] =        Location::Chest(RC_WATER_TEMPLE_CRACKED_WALL_CHEST,       RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_WATER_TEMPLE, ACTOR_EN_BOX,    SCENE_WATER_TEMPLE, 22592,  0x00, "Cracked Wall Chest",       "Water Temple Cracked Wall Chest",       RHT_WATER_TEMPLE_CRACKED_WALL_CHEST,       RG_WATER_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE, true);
+    locationTable[RC_WATER_TEMPLE_BOSS_KEY_CHEST] =            Location::Chest(RC_WATER_TEMPLE_BOSS_KEY_CHEST,           RCQUEST_VANILLA, RCTYPE_BOSS_KEY,    RCAREA_WATER_TEMPLE, ACTOR_EN_BOX,    SCENE_WATER_TEMPLE, 10213,  0x05, "Boss Key Chest",           "Water Temple Boss Key Chest",           RHT_WATER_TEMPLE_BOSS_KEY_CHEST,           RG_WATER_TEMPLE_BOSS_KEY,  { Category::cVanillaBossKey },  SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE, true);
+    locationTable[RC_WATER_TEMPLE_LONGSHOT_CHEST] =            Location::Chest(RC_WATER_TEMPLE_LONGSHOT_CHEST,           RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_WATER_TEMPLE, ACTOR_EN_BOX,    SCENE_WATER_TEMPLE, 295,    0x07, "Longshot Chest",           "Water Temple Longshot Chest",           RHT_WATER_TEMPLE_LONGSHOT_CHEST,           RG_PROGRESSIVE_HOOKSHOT,   {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE, true);
+    locationTable[RC_WATER_TEMPLE_RIVER_CHEST] =               Location::Chest(RC_WATER_TEMPLE_RIVER_CHEST,              RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_WATER_TEMPLE, ACTOR_EN_BOX,    SCENE_WATER_TEMPLE, 22595,  0x03, "River Chest",              "Water Temple River Chest",              RHT_WATER_TEMPLE_RIVER_CHEST,              RG_WATER_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE, true);
+    // Water Temple MQ
+    locationTable[RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST] =   Location::Chest(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST,  RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_WATER_TEMPLE, ACTOR_EN_BOX,    SCENE_WATER_TEMPLE, -30650, 0x06, "MQ Central Pillar Chest",  "Water Temple MQ Central Pillar Chest",  RHT_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST,  RG_WATER_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE, true);
+    locationTable[RC_WATER_TEMPLE_MQ_BOSS_KEY_CHEST] =         Location::Chest(RC_WATER_TEMPLE_MQ_BOSS_KEY_CHEST,        RCQUEST_MQ,      RCTYPE_BOSS_KEY,    RCAREA_WATER_TEMPLE, ACTOR_EN_BOX,    SCENE_WATER_TEMPLE, 10213,  0x05, "MQ Boss Key Chest",        "Water Temple MQ Boss Key Chest",        RHT_WATER_TEMPLE_MQ_BOSS_KEY_CHEST,        RG_WATER_TEMPLE_BOSS_KEY,  { Category::cVanillaBossKey },  SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE, true);
+    locationTable[RC_WATER_TEMPLE_MQ_LONGSHOT_CHEST] =         Location::Chest(RC_WATER_TEMPLE_MQ_LONGSHOT_CHEST,        RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_WATER_TEMPLE, ACTOR_EN_BOX,    SCENE_WATER_TEMPLE, -20192, 0x00, "MQ Longshot Chest",        "Water Temple MQ Longshot Chest",        RHT_WATER_TEMPLE_MQ_LONGSHOT_CHEST,        RG_PROGRESSIVE_HOOKSHOT,   {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE, true);
+    locationTable[RC_WATER_TEMPLE_MQ_COMPASS_CHEST] =          Location::Chest(RC_WATER_TEMPLE_MQ_COMPASS_CHEST,         RCQUEST_MQ,      RCTYPE_MAP_COMPASS, RCAREA_WATER_TEMPLE, ACTOR_EN_BOX,    SCENE_WATER_TEMPLE, 6145,   0x01, "MQ Compass Chest",         "Water Temple MQ Compass Chest",         RHT_WATER_TEMPLE_MQ_COMPASS_CHEST,         RG_WATER_TEMPLE_COMPASS,   { Category::cVanillaCompass },  SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE, true);
+    locationTable[RC_WATER_TEMPLE_MQ_MAP_CHEST] =              Location::Chest(RC_WATER_TEMPLE_MQ_MAP_CHEST,             RCQUEST_MQ,      RCTYPE_MAP_COMPASS, RCAREA_WATER_TEMPLE, ACTOR_EN_BOX,    SCENE_WATER_TEMPLE, -18398, 0x02, "MQ Map Chest",             "Water Temple MQ Map Chest",             RHT_WATER_TEMPLE_MQ_MAP_CHEST,             RG_WATER_TEMPLE_MAP,       { Category::cVanillaMap },      SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE, true);
+    locationTable[RC_WATER_TEMPLE_MQ_FREESTANDING_KEY] = Location::Collectable(RC_WATER_TEMPLE_MQ_FREESTANDING_KEY,      RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_WATER_TEMPLE, ACTOR_EN_ITEM00, SCENE_WATER_TEMPLE, 273,    0x01, "MQ Freestanding Key",      "Water Temple MQ Freestanding Key",      RHT_WATER_TEMPLE_MQ_FREESTANDING_KEY,      RG_WATER_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE, true);
+
+    //            Randomizer Check                                                     Randomizer Check                                   Quest            Type                Area                  Actor ID      Scene ID               Params  Flags Short Name                          Spoiler Name                                      Hint Text Key                                       Vanilla Item                Categories                      Collection Check Group                                    Vanilla Progression
+    // Spirit Temple Shared
+    locationTable[RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST] =           Location::Chest(RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST,           RCQUEST_BOTH,    RCTYPE_STANDARD,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_DESERT_COLOSSUS, 1707,   0x0B, "Silver Gauntlets Chest",           "Spirit Temple Silver Gauntlets Chest",           RHT_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST,           RG_PROGRESSIVE_STRENGTH,    {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE, true);
+    locationTable[RC_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST] =              Location::Chest(RC_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST,              RCQUEST_BOTH,    RCTYPE_STANDARD,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_DESERT_COLOSSUS, 13673,  0x09, "Mirror Shield Chest",              "Spirit Temple Mirror Shield Chest",              RHT_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST,              RG_MIRROR_SHIELD,           {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE, true);
+    // Spirit Temple Vanilla
+    locationTable[RC_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST] =               Location::Chest(RC_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST,               RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   21800,  0x08, "Child Bridge Chest",               "Spirit Temple Child Bridge Chest",               RHT_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST,               RG_DEKU_SHIELD,             {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST] =        Location::Chest(RC_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST,        RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   -30656, 0x00, "Child Early Torches Chest",        "Spirit Temple Child Early Torches Chest",        RHT_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST,        RG_SPIRIT_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE, true);
+    locationTable[RC_SPIRIT_TEMPLE_COMPASS_CHEST] =                    Location::Chest(RC_SPIRIT_TEMPLE_COMPASS_CHEST,                    RCQUEST_VANILLA, RCTYPE_MAP_COMPASS, RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   14340,  0x04, "Compass Chest",                    "Spirit Temple Compass Chest",                    RHT_SPIRIT_TEMPLE_COMPASS_CHEST,                    RG_SPIRIT_TEMPLE_COMPASS,   { Category::cVanillaCompass },  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE, true);
+    locationTable[RC_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST] =          Location::Chest(RC_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST,          RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   22599,  0x07, "Early Adult Right Chest",          "Spirit Temple Early Adult Right Chest",          RHT_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST,          RG_SPIRIT_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE, true);
+    locationTable[RC_SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST] =          Location::Chest(RC_SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST,          RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   -30451, 0x0D, "First Mirror Left Chest",          "Spirit Temple First Mirror Left Chest",          RHT_SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST,          RG_ICE_TRAP,                {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST] =         Location::Chest(RC_SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST,         RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   -28786, 0x0E, "First Mirror Right Chest",         "Spirit Temple First Mirror Right Chest",         RHT_SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST,         RG_RECOVERY_HEART,          {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MAP_CHEST] =                        Location::Chest(RC_SPIRIT_TEMPLE_MAP_CHEST,                        RCQUEST_VANILLA, RCTYPE_MAP_COMPASS, RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   -18397, 0x03, "Map Chest",                        "Spirit Temple Map Chest",                        RHT_SPIRIT_TEMPLE_MAP_CHEST,                        RG_SPIRIT_TEMPLE_MAP,       { Category::cVanillaMap },      SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE, true);
+    locationTable[RC_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST] =          Location::Chest(RC_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST,          RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   -32666, 0x06, "Child Climb North Chest",          "Spirit Temple Child Climb North Chest",          RHT_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST,          RG_BOMBCHU_10,              {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST] =           Location::Chest(RC_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST,           RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   -31444, 0x0C, "Child Climb East Chest",           "Spirit Temple Child Climb East Chest",           RHT_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST,           RG_DEKU_SHIELD,             {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST] =             Location::Chest(RC_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST,             RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   -30655, 0x01, "Sun Block Room Chest",             "Spirit Temple Sun Block Room Chest",             RHT_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST,             RG_SPIRIT_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE, true);
+    locationTable[RC_SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST] =           Location::Chest(RC_SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST,           RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   -30654, 0x02, "Statue Room Hand Chest",           "Spirit Temple Statue Room Hand Chest",           RHT_SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST,           RG_SPIRIT_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE, true);
+    locationTable[RC_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST] =      Location::Chest(RC_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST,      RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   -30577, 0x0F, "Statue Room Northeast Chest",      "Spirit Temple Statue Room Northeast Chest",      RHT_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST,      RG_BLUE_RUPEE,              {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST] =            Location::Chest(RC_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST,            RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   22597,  0x05, "Near Four Armos Chest",            "Spirit Temple Near Four Armos Chest",            RHT_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST,            RG_SPIRIT_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE, true);
+    locationTable[RC_SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST] =    Location::Chest(RC_SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST,    RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   26900,  0x14, "Hallway Right Invisible Chest",    "Spirit Temple Hallway Right Invisible Chest",    RHT_SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST,    RG_RECOVERY_HEART,          {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST] =     Location::Chest(RC_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST,     RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   26901,  0x15, "Hallway Left Invisible Chest",     "Spirit Temple Hallway Left Invisible Chest",     RHT_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST,     RG_RECOVERY_HEART,          {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_BOSS_KEY_CHEST] =                   Location::Chest(RC_SPIRIT_TEMPLE_BOSS_KEY_CHEST,                   RCQUEST_VANILLA, RCTYPE_BOSS_KEY,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   10218,  0x0A, "Boss Key Chest",                   "Spirit Temple Boss Key Chest",                   RHT_SPIRIT_TEMPLE_BOSS_KEY_CHEST,                   RG_SPIRIT_TEMPLE_BOSS_KEY,  { Category::cVanillaBossKey },  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE, true);
+    locationTable[RC_SPIRIT_TEMPLE_TOPMOST_CHEST] =                    Location::Chest(RC_SPIRIT_TEMPLE_TOPMOST_CHEST,                    RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   -29454, 0x12, "Topmost Chest",                    "Spirit Temple Topmost Chest",                    RHT_SPIRIT_TEMPLE_TOPMOST_CHEST,                    RG_BOMBS_20,                {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE, true);
+    // Spirit Temple MQ
+    locationTable[RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST] =     Location::Chest(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST,     RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   20602,  0x1A, "MQ Entrance Front Left Chest",     "Spirit Temple MQ Entrance Front Left Chest",     RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST,     RG_BOMBCHU_10,              {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST] =     Location::Chest(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST,     RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   -32641, 0x1F, "MQ Entrance Back Right Chest",     "Spirit Temple MQ Entrance Back Right Chest",     RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST,     RG_BOMBCHU_10,              {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST] =    Location::Chest(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST,    RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   -30629, 0x1B, "MQ Entrance Front Right Chest",    "Spirit Temple MQ Entrance Front Right Chest",    RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST,    RG_SPIRIT_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE, true);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST] =      Location::Chest(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST,      RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   -30626, 0x1E, "MQ Entrance Back Left Chest",      "Spirit Temple MQ Entrance Back Left Chest",      RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST,      RG_SPIRIT_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE, true);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST] =     Location::Chest(RC_SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST,     RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   -30627, 0x1D, "MQ Child Hammer Switch Chest",     "Spirit Temple MQ Child Hammer Switch Chest",     RHT_SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST,     RG_SPIRIT_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE, true);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_MAP_CHEST] =                     Location::Chest(RC_SPIRIT_TEMPLE_MQ_MAP_CHEST,                     RCQUEST_MQ,      RCTYPE_MAP_COMPASS, RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   2080,   0x00, "MQ Map Chest",                     "Spirit Temple MQ Map Chest",                     RHT_SPIRIT_TEMPLE_MQ_MAP_CHEST,                     RG_SPIRIT_TEMPLE_MAP,       { Category::cVanillaMap },      SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE, true);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST] =          Location::Chest(RC_SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST,          RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   30792,  0x08, "MQ Map Room Enemy Chest",          "Spirit Temple MQ Map Room Enemy Chest",          RHT_SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST,          RG_SPIRIT_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE, true);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST] =       Location::Chest(RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST,       RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   28774,  0x06, "MQ Child Climb North Chest",       "Spirit Temple MQ Child Climb North Chest",       RHT_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST,       RG_BOMBCHU_10,              {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST] =       Location::Chest(RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST,       RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   -30644, 0x0C, "MQ Child Climb South Chest",       "Spirit Temple MQ Child Climb South Chest",       RHT_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST,       RG_SPIRIT_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE, true);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_COMPASS_CHEST] =                 Location::Chest(RC_SPIRIT_TEMPLE_MQ_COMPASS_CHEST,                 RCQUEST_MQ,      RCTYPE_MAP_COMPASS, RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   -18429, 0x03, "MQ Compass Chest",                 "Spirit Temple MQ Compass Chest",                 RHT_SPIRIT_TEMPLE_MQ_COMPASS_CHEST,                 RG_SPIRIT_TEMPLE_COMPASS,   { Category::cVanillaCompass },  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE, true);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST] =     Location::Chest(RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST,     RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   -30577, 0x0F, "MQ Statue Room Lullaby Chest",     "Spirit Temple MQ Statue Room Lullaby Chest",     RHT_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST,     RG_BLUE_RUPEE,              {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST] =   Location::Chest(RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST,   RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   26882,  0x02, "MQ Statue Room Invisible Chest",   "Spirit Temple MQ Statue Room Invisible Chest",   RHT_SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST,   RG_RECOVERY_HEART,          {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST] =    Location::Chest(RC_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST,    RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   -30628, 0x1C, "MQ Silver Block Hallway Chest",    "Spirit Temple MQ Silver Block Hallway Chest",    RHT_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST,    RG_SPIRIT_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE, true);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST] =          Location::Chest(RC_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST,          RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   -30463, 0x01, "MQ Sun Block Room Chest",          "Spirit Temple MQ Sun Block Room Chest",          RHT_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST,          RG_RECOVERY_HEART,          {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST] =           Location::Chest(RC_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST,           RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   23207,  0x07, "MQ Symphony Room Chest",           "Spirit Temple MQ Symphony Room Chest",           RHT_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST,           RG_PURPLE_RUPEE,            {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST] =             Location::Chest(RC_SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST,             RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   31396,  0x04, "MQ Leever Room Chest",             "Spirit Temple MQ Leever Room Chest",             RHT_SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST,             RG_PURPLE_RUPEE,            {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST] =             Location::Chest(RC_SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST,             RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   24472,  0x19, "MQ Beamos Room Chest",             "Spirit Temple MQ Beamos Room Chest",             RHT_SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST,             RG_RECOVERY_HEART,          {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST] =            Location::Chest(RC_SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST,            RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   31097,  0x18, "MQ Chest Switch Chest",            "Spirit Temple MQ Chest Switch Chest",            RHT_SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST,            RG_ICE_TRAP,                {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST] =                Location::Chest(RC_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST,                RCQUEST_MQ,      RCTYPE_BOSS_KEY,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   10213,  0x05, "MQ Boss Key Chest",                "Spirit Temple MQ Boss Key Chest",                RHT_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST,                RG_SPIRIT_TEMPLE_BOSS_KEY,  { Category::cVanillaBossKey },  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE, true);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST] = Location::Chest(RC_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST, RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   26706,  0x12, "MQ Mirror Puzzle Invisible Chest", "Spirit Temple MQ Mirror Puzzle Invisible Chest", RHT_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST, RG_SPIRIT_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE, true);
+
+    //            Randomizer Check                                                        Randomizer Check                                      Quest            Type                Area                  Actor ID         Scene ID             Params Flags Short Name                              Spoiler Name                                         Hint Text Key                                          Vanilla Item                Categories                      Collection Check Group                                    Vanilla Progression
+    // Shadow Temple Vanilla
+    locationTable[RC_SHADOW_TEMPLE_MAP_CHEST] =                           Location::Chest(RC_SHADOW_TEMPLE_MAP_CHEST,                           RCQUEST_VANILLA, RCTYPE_MAP_COMPASS, RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 6177,  0x01, "Map Chest",                            "Shadow Temple Map Chest",                           RHT_SHADOW_TEMPLE_MAP_CHEST,                           RG_SHADOW_TEMPLE_MAP,       { Category::cVanillaMap },      SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE, true);
+    locationTable[RC_SHADOW_TEMPLE_HOVER_BOOTS_CHEST] =                   Location::Chest(RC_SHADOW_TEMPLE_HOVER_BOOTS_CHEST,                   RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 5607,  0x07, "Hover Boots Chest",                    "Shadow Temple Hover Boots Chest",                   RHT_SHADOW_TEMPLE_HOVER_BOOTS_CHEST,                   RG_HOVER_BOOTS,             {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE, true);
+    locationTable[RC_SHADOW_TEMPLE_COMPASS_CHEST] =                       Location::Chest(RC_SHADOW_TEMPLE_COMPASS_CHEST,                       RCQUEST_VANILLA, RCTYPE_MAP_COMPASS, RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 6147,  0x03, "Compass Chest",                        "Shadow Temple Compass Chest",                       RHT_SHADOW_TEMPLE_COMPASS_CHEST,                       RG_SHADOW_TEMPLE_COMPASS,   { Category::cVanillaCompass },  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE, true);
+    locationTable[RC_SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST] =            Location::Chest(RC_SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST,            RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 22594,  0x02, "Early Silver Rupee Chest",            "Shadow Temple Early Silver Rupee Chest",            RHT_SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST,            RG_SHADOW_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE, true);
+    locationTable[RC_SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST] =      Location::Chest(RC_SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST,      RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 22668,  0x0C, "Invisible Blades Visible Chest",      "Shadow Temple Invisible Blades Visible Chest",      RHT_SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST,      RG_BLUE_RUPEE,              {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST] =    Location::Chest(RC_SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST,    RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 26998,  0x16, "Invisible Blades Invisible Chest",    "Shadow Temple Invisible Blades Invisible Chest",    RHT_SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST,    RG_ARROWS_30,               {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST] =          Location::Chest(RC_SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST,          RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 22853,  0x05, "Falling Spikes Lower Chest",          "Shadow Temple Falling Spikes Lower Chest",          RHT_SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST,          RG_ARROWS_10,               {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST] =          Location::Chest(RC_SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST,          RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 22662,  0x06, "Falling Spikes Upper Chest",          "Shadow Temple Falling Spikes Upper Chest",          RHT_SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST,          RG_BLUE_RUPEE,              {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST] =         Location::Chest(RC_SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST,         RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, -30652, 0x04, "Falling Spikes Switch Chest",         "Shadow Temple Falling Spikes Switch Chest",         RHT_SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST,         RG_SHADOW_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE, true);
+    locationTable[RC_SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST] =              Location::Chest(RC_SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST,              RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 30857,  0x09, "Invisible Spikes Chest",              "Shadow Temple Invisible Spikes Chest",              RHT_SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST,              RG_BLUE_RUPEE,              {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_WIND_HINT_CHEST] =                     Location::Chest(RC_SHADOW_TEMPLE_WIND_HINT_CHEST,                     RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 26965,  0x15, "Wind Hint Chest",                     "Shadow Temple Wind Hint Chest",                     RHT_SHADOW_TEMPLE_WIND_HINT_CHEST,                     RG_ARROWS_10,               {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST] =              Location::Chest(RC_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST,              RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 30856,  0x08, "After Wind Enemy Chest",              "Shadow Temple After Wind Enemy Chest",              RHT_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST,              RG_BLUE_RUPEE,              {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST] =             Location::Chest(RC_SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST,             RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 26708,  0x14, "After Wind Hidden Chest",             "Shadow Temple After Wind Hidden Chest",             RHT_SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST,             RG_SHADOW_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE, true);
+    locationTable[RC_SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST] =              Location::Chest(RC_SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST,              RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 22666,  0x0A, "Spike Walls Left Chest",              "Shadow Temple Spike Walls Left Chest",              RHT_SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST,              RG_BLUE_RUPEE,              {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_BOSS_KEY_CHEST] =                      Location::Chest(RC_SHADOW_TEMPLE_BOSS_KEY_CHEST,                      RCQUEST_VANILLA, RCTYPE_BOSS_KEY,    RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 10219,  0x0B, "Boss Key Chest",                      "Shadow Temple Boss Key Chest",                      RHT_SHADOW_TEMPLE_BOSS_KEY_CHEST,                      RG_SHADOW_TEMPLE_BOSS_KEY,  { Category::cVanillaBossKey },  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE, true);
+    locationTable[RC_SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST] =         Location::Chest(RC_SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST,         RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 30797,  0x0D, "Invisible Floormaster Chest",         "Shadow Temple Invisible Floormaster Chest",         RHT_SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST,         RG_SHADOW_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE, true);
+    locationTable[RC_SHADOW_TEMPLE_FREESTANDING_KEY] =              Location::Collectable(RC_SHADOW_TEMPLE_FREESTANDING_KEY,                    RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_SHADOW_TEMPLE, ACTOR_EN_ITEM00, SCENE_SHADOW_TEMPLE, 273,    0x01, "Freestanding Key",                    "Shadow Temple Freestanding Key",                    RHT_SHADOW_TEMPLE_FREESTANDING_KEY,                    RG_SHADOW_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE, true);
+    // Shadow Temple MQ
+    locationTable[RC_SHADOW_TEMPLE_MQ_COMPASS_CHEST] =                    Location::Chest(RC_SHADOW_TEMPLE_MQ_COMPASS_CHEST,                    RCQUEST_MQ,      RCTYPE_MAP_COMPASS, RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 6145,   0x01, "MQ Compass Chest",                    "Shadow Temple MQ Compass Chest",                    RHT_SHADOW_TEMPLE_MQ_COMPASS_CHEST,                    RG_SHADOW_TEMPLE_COMPASS,   { Category::cVanillaCompass },  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE, true);
+    locationTable[RC_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST] =                Location::Chest(RC_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST,                RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 5607,   0x07, "MQ Hover Boots Chest",                "Shadow Temple MQ Hover Boots Chest",                RHT_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST,                RG_HOVER_BOOTS,             {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE, true);
+    locationTable[RC_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST] =               Location::Chest(RC_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST,               RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 30787,  0x03, "MQ Early Gibdos Chest",               "Shadow Temple MQ Early Gibdos Chest",               RHT_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST,               RG_SHADOW_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE, true);
+    locationTable[RC_SHADOW_TEMPLE_MQ_MAP_CHEST] =                        Location::Chest(RC_SHADOW_TEMPLE_MQ_MAP_CHEST,                        RCQUEST_MQ,      RCTYPE_MAP_COMPASS, RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 2082,   0x02, "MQ Map Chest",                        "Shadow Temple MQ Map Chest",                        RHT_SHADOW_TEMPLE_MQ_MAP_CHEST,                        RG_SHADOW_TEMPLE_MAP,       { Category::cVanillaMap },      SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE, true);
+    locationTable[RC_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST] =       Location::Chest(RC_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST,       RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, -30417, 0x0F, "MQ Beamos Silver Rupees Chest",       "Shadow Temple MQ Beamos Silver Rupees Chest",       RHT_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST,       RG_ARROWS_5,                {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST] =      Location::Chest(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST,      RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 22662,  0x04, "MQ Falling Spikes Switch Chest",      "Shadow Temple MQ Falling Spikes Switch Chest",      RHT_SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST,      RG_SHADOW_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE, true);
+    locationTable[RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST] =       Location::Chest(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST,       RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 22853,  0x05, "MQ Falling Spikes Lower Chest",       "Shadow Temple MQ Falling Spikes Lower Chest",       RHT_SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST,       RG_ARROWS_10,               {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST] =       Location::Chest(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST,       RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, -30652, 0x06, "MQ Falling Spikes Upper Chest",       "Shadow Temple MQ Falling Spikes Upper Chest",       RHT_SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST,       RG_ARROWS_5,                {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST] =           Location::Chest(RC_SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST,           RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 30857,  0x09, "MQ Invisible Spikes Chest",           "Shadow Temple MQ Invisible Spikes Chest",           RHT_SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST,           RG_BLUE_RUPEE,              {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST] =                   Location::Chest(RC_SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST,                   RCQUEST_MQ,      RCTYPE_BOSS_KEY,    RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 10219,  0x0B, "MQ Boss Key Chest",                   "Shadow Temple MQ Boss Key Chest",                   RHT_SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST,                   RG_SHADOW_TEMPLE_BOSS_KEY,  { Category::cVanillaBossKey },  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE, true);
+    locationTable[RC_SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST] =           Location::Chest(RC_SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST,           RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 22666,  0x0A, "MQ Spike Walls Left Chest",           "Shadow Temple MQ Spike Walls Left Chest",           RHT_SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST,           RG_BLUE_RUPEE,              {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST] =               Location::Chest(RC_SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST,               RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 31184,  0x10, "MQ Stalfos Room Chest",               "Shadow Temple MQ Stalfos Room Chest",               RHT_SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST,               RG_RED_RUPEE,               {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST] = Location::Chest(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST, RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 26710,  0x16, "MQ Invisible Blades Invisible Chest", "Shadow Temple MQ Invisible Blades Invisible Chest", RHT_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST, RG_SHADOW_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE, true);
+    locationTable[RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST] =   Location::Chest(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST,   RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 22668,  0x0C, "MQ Invisible Blades Visible Chest",   "Shadow Temple MQ Invisible Blades Visible Chest",   RHT_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST,   RG_BLUE_RUPEE,              {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST] =                Location::Chest(RC_SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST,                RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 31053,  0x0D, "MQ Bomb Flower Chest",                "Shadow Temple MQ Bomb Flower Chest",                RHT_SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST,                RG_ARROWS_10,               {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_WIND_HINT_CHEST] =                  Location::Chest(RC_SHADOW_TEMPLE_MQ_WIND_HINT_CHEST,                  RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 26709,  0x15, "MQ Wind Hint Chest",                  "Shadow Temple MQ Wind Hint Chest",                  RHT_SHADOW_TEMPLE_MQ_WIND_HINT_CHEST,                  RG_SHADOW_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE, true);
+    locationTable[RC_SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST] =          Location::Chest(RC_SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST,          RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 26932,  0x14, "MQ After Wind Hidden Chest",          "Shadow Temple MQ After Wind Hidden Chest",          RHT_SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST,          RG_ARROWS_5,                {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST] =           Location::Chest(RC_SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST,           RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 30856,  0x08, "MQ After Wind Enemy Chest",           "Shadow Temple MQ After Wind Enemy Chest",           RHT_SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST,           RG_BLUE_RUPEE,              {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST] =        Location::Chest(RC_SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST,        RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 26702,  0x0E, "MQ Near Ship Invisible Chest",        "Shadow Temple MQ Near Ship Invisible Chest",        RHT_SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST,        RG_SHADOW_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE, true);
+    locationTable[RC_SHADOW_TEMPLE_MQ_FREESTANDING_KEY] =           Location::Collectable(RC_SHADOW_TEMPLE_MQ_FREESTANDING_KEY,                 RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_SHADOW_TEMPLE, ACTOR_EN_ITEM00, SCENE_SHADOW_TEMPLE, 1553,   0x06, "MQ Freestanding Key",                 "Shadow Temple MQ Freestanding Key",                 RHT_SHADOW_TEMPLE_MQ_FREESTANDING_KEY,                 RG_SHADOW_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE, true);
+
+    //            Randomizer Check                                                                   Randomizer Check                                           Quest            Type                               Area                       Actor ID         Scene ID                  Params  Flags Short Name                             Spoiler Name                                              Hint Text Key                                               Vanilla Item                     Categories                        Collection Check Group                                         Vanilla Progression
+    // Bottom of the Well Vanilla
+    locationTable[RC_BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST] =          Location::Chest(      RC_BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST,          RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_BOTTOM_OF_THE_WELL, ACTOR_EN_BOX,    SCENE_BOTTOM_OF_THE_WELL, 22600,  0x08, "Front Left Fake Wall Chest",          "Bottom of the Well Front Left Fake Wall Chest",          RHT_BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST,          RG_BOTTOM_OF_THE_WELL_SMALL_KEY, { Category::cVanillaSmallKey },   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
+    locationTable[RC_BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST] =         Location::Chest(      RC_BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST,         RCQUEST_VANILLA, RCTYPE_STANDARD,                   RCAREA_BOTTOM_OF_THE_WELL, ACTOR_EN_BOX,    SCENE_BOTTOM_OF_THE_WELL, 20578,  0x02, "Front Center Bombable Chest",         "Bottom of the Well Front Center Bombable Chest",         RHT_BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST,         RG_BOMBCHU_10,                   {},                               SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
+    locationTable[RC_BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST] =        Location::Chest(      RC_BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST,        RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_BOTTOM_OF_THE_WELL, ACTOR_EN_BOX,    SCENE_BOTTOM_OF_THE_WELL, 22597,  0x05, "Right Bottom Fake Wall Chest",        "Bottom of the Well Right Bottom Fake Wall Chest",        RHT_BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST,        RG_BOTTOM_OF_THE_WELL_SMALL_KEY, { Category::cVanillaSmallKey },   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
+    locationTable[RC_BOTTOM_OF_THE_WELL_COMPASS_CHEST] =                       Location::Chest(      RC_BOTTOM_OF_THE_WELL_COMPASS_CHEST,                       RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                RCAREA_BOTTOM_OF_THE_WELL, ACTOR_EN_BOX,    SCENE_BOTTOM_OF_THE_WELL, 2049,   0x01, "Compass Chest",                       "Bottom of the Well Compass Chest",                       RHT_BOTTOM_OF_THE_WELL_COMPASS_CHEST,                       RG_BOTTOM_OF_THE_WELL_COMPASS,   { Category::cVanillaCompass },    SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
+    locationTable[RC_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST] =              Location::Chest(      RC_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST,              RCQUEST_VANILLA, RCTYPE_STANDARD,                   RCAREA_BOTTOM_OF_THE_WELL, ACTOR_EN_BOX,    SCENE_BOTTOM_OF_THE_WELL, 20558,  0x0E, "Center Skulltula Chest",              "Bottom of the Well Center Skulltula Chest",              RHT_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST,              RG_DEKU_NUTS_5,                  {},                               SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
+    locationTable[RC_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST] =            Location::Chest(      RC_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST,            RCQUEST_VANILLA, RCTYPE_STANDARD,                   RCAREA_BOTTOM_OF_THE_WELL, ACTOR_EN_BOX,    SCENE_BOTTOM_OF_THE_WELL, 23684,  0x04, "Back Left Bombable Chest",            "Bottom of the Well Back Left Bombable Chest",            RHT_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST,            RG_DEKU_NUTS_10,                 {},                               SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
+    locationTable[RC_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST] =                 Location::Chest(      RC_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST,                 RCQUEST_VANILLA, RCTYPE_BOSS_HEART_OR_OTHER_REWARD, RCAREA_BOTTOM_OF_THE_WELL, ACTOR_EN_BOX,    SCENE_BOTTOM_OF_THE_WELL, 4419,   0x03, "Lens of Truth Chest",                 "Bottom of the Well Lens of Truth Chest",                 RHT_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST,                 RG_LENS_OF_TRUTH,                { Category::cSongDungeonReward }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
+    locationTable[RC_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST] =                     Location::Chest(      RC_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST,                     RCQUEST_VANILLA, RCTYPE_STANDARD,                   RCAREA_BOTTOM_OF_THE_WELL, ACTOR_EN_BOX,    SCENE_BOTTOM_OF_THE_WELL, 27348,  0x14, "Invisible Chest",                     "Bottom of the Well Invisible Chest",                     RHT_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST,                     RG_HUGE_RUPEE,                   {},                               SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
+    locationTable[RC_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST] =              Location::Chest(      RC_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST,              RCQUEST_VANILLA, RCTYPE_STANDARD,                   RCAREA_BOTTOM_OF_THE_WELL, ACTOR_EN_BOX,    SCENE_BOTTOM_OF_THE_WELL, 23760,  0x10, "Underwater Front Chest",              "Bottom of the Well Underwater Front Chest",              RHT_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST,              RG_BOMBS_10,                     {},                               SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
+    locationTable[RC_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST] =               Location::Chest(      RC_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST,               RCQUEST_VANILLA, RCTYPE_STANDARD,                   RCAREA_BOTTOM_OF_THE_WELL, ACTOR_EN_BOX,    SCENE_BOTTOM_OF_THE_WELL, 22793,  0x09, "Underwater Left Chest",               "Bottom of the Well Underwater Left Chest",               RHT_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST,               RG_RECOVERY_HEART,               {},                               SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
+    locationTable[RC_BOTTOM_OF_THE_WELL_MAP_CHEST] =                           Location::Chest(      RC_BOTTOM_OF_THE_WELL_MAP_CHEST,                           RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                RCAREA_BOTTOM_OF_THE_WELL, ACTOR_EN_BOX,    SCENE_BOTTOM_OF_THE_WELL, 2087,   0x07, "Map Chest",                           "Bottom of the Well Map Chest",                           RHT_BOTTOM_OF_THE_WELL_MAP_CHEST,                           RG_BOTTOM_OF_THE_WELL_MAP,       { Category::cVanillaMap },        SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
+    locationTable[RC_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST] =                    Location::Chest(      RC_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST,                    RCQUEST_VANILLA, RCTYPE_STANDARD,                   RCAREA_BOTTOM_OF_THE_WELL, ACTOR_EN_BOX,    SCENE_BOTTOM_OF_THE_WELL, 21802,  0x0A, "Fire Keese Chest",                    "Bottom of the Well Fire Keese Chest",                    RHT_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST,                    RG_DEKU_SHIELD,                  {},                               SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
+    locationTable[RC_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST] =                     Location::Chest(      RC_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST,                     RCQUEST_VANILLA, RCTYPE_STANDARD,                   RCAREA_BOTTOM_OF_THE_WELL, ACTOR_EN_BOX,    SCENE_BOTTOM_OF_THE_WELL, 21836,  0x0C, "Like Like Chest",                     "Bottom of the Well Like Like Chest",                     RHT_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST,                     RG_HYLIAN_SHIELD,                {},                               SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
+    locationTable[RC_BOTTOM_OF_THE_WELL_FREESTANDING_KEY] =                    Location::Chest(      RC_BOTTOM_OF_THE_WELL_FREESTANDING_KEY,                    RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_BOTTOM_OF_THE_WELL, ACTOR_EN_ITEM00, SCENE_BOTTOM_OF_THE_WELL, 273,    0x01, "Freestanding Key",                    "Bottom of the Well Freestanding Key",                    RHT_BOTTOM_OF_THE_WELL_FREESTANDING_KEY,                    RG_BOTTOM_OF_THE_WELL_SMALL_KEY, { Category::cVanillaSmallKey },   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
+    // Bottom of the Well Master Quest
+    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_MAP_CHEST] =                        Location::Chest(      RC_BOTTOM_OF_THE_WELL_MQ_MAP_CHEST,                        RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                RCAREA_BOTTOM_OF_THE_WELL, ACTOR_EN_BOX,    SCENE_BOTTOM_OF_THE_WELL, 2083,   0x03, "MQ Map Chest",                        "Bottom of the Well MQ Map Chest",                        RHT_BOTTOM_OF_THE_WELL_MQ_MAP_CHEST,                        RG_BOTTOM_OF_THE_WELL_MAP,       { Category::cVanillaMap },        SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
+    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST] =              Location::Chest(      RC_BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST,              RCQUEST_MQ,      RCTYPE_BOSS_HEART_OR_OTHER_REWARD, RCAREA_BOTTOM_OF_THE_WELL, ACTOR_EN_BOX,    SCENE_BOTTOM_OF_THE_WELL, -20159, 0x01, "MQ Lens of Truth Chest",              "Bottom of the Well MQ Lens of Truth Chest",              RHT_BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST,              RG_LENS_OF_TRUTH,                { Category::cSongDungeonReward }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
+    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST] =                    Location::Chest(      RC_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST,                    RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                RCAREA_BOTTOM_OF_THE_WELL, ACTOR_EN_BOX,    SCENE_BOTTOM_OF_THE_WELL, 6146,   0x02, "MQ Compass Chest",                    "Bottom of the Well MQ Compass Chest",                    RHT_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST,                    RG_BOTTOM_OF_THE_WELL_COMPASS,   { Category::cVanillaCompass },    SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
+    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY] =       Location::Collectable(RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY,       RCQUEST_MQ,      RCTYPE_SMALL_KEY,                  RCAREA_BOTTOM_OF_THE_WELL, ACTOR_EN_ITEM00, SCENE_BOTTOM_OF_THE_WELL, 529,    0x02, "MQ Dead Hand Freestanding Key",       "Bottom of the Well MQ Dead Hand Freestanding Key",       RHT_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY,       RG_BOTTOM_OF_THE_WELL_SMALL_KEY, { Category::cVanillaSmallKey },   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
+    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY] = Location::Collectable(RC_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY, RCQUEST_MQ,      RCTYPE_SMALL_KEY,                  RCAREA_BOTTOM_OF_THE_WELL, ACTOR_EN_ITEM00, SCENE_BOTTOM_OF_THE_WELL, 273,    0x01, "MQ East Inner Room Freestanding Key", "Bottom of the Well MQ East Inner Room Freestanding Key", RHT_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY, RG_BOTTOM_OF_THE_WELL_SMALL_KEY, { Category::cVanillaSmallKey },   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
+
+    //            Randomizer Check                                           Randomizer Check                   Quest            Type                Area               Actor ID         Scene ID          Params  Flag  Short Name             Spoiler Name                      Hint Text Key                       Vanilla Item           Categories                     Collection Check Group                                 Vanilla Progression
+    // Ice Cavern Vanilla
+    locationTable[RC_ICE_CAVERN_MAP_CHEST] =           Location::Chest(      RC_ICE_CAVERN_MAP_CHEST,           RCQUEST_VANILLA, RCTYPE_MAP_COMPASS, RCAREA_ICE_CAVERN, ACTOR_EN_BOX,    SCENE_ICE_CAVERN, 2080,   0x00, "Map Chest",           "Ice Cavern Map Chest",           RHT_ICE_CAVERN_MAP_CHEST,           RG_ICE_CAVERN_MAP,     { Category::cVanillaMap },     SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN, true);
+    locationTable[RC_ICE_CAVERN_COMPASS_CHEST] =       Location::Chest(      RC_ICE_CAVERN_COMPASS_CHEST,       RCQUEST_VANILLA, RCTYPE_MAP_COMPASS, RCAREA_ICE_CAVERN, ACTOR_EN_BOX,    SCENE_ICE_CAVERN, 2049,   0x01, "Compass Chest",       "Ice Cavern Compass Chest",       RHT_ICE_CAVERN_COMPASS_CHEST,       RG_ICE_CAVERN_COMPASS, { Category::cVanillaCompass }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN, true);
+    locationTable[RC_ICE_CAVERN_IRON_BOOTS_CHEST] =    Location::Chest(      RC_ICE_CAVERN_IRON_BOOTS_CHEST,    RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_ICE_CAVERN, ACTOR_EN_BOX,    SCENE_ICE_CAVERN, 5570,   0x02, "Iron Boots Chest",    "Ice Cavern Iron Boots Chest",    RHT_ICE_CAVERN_IRON_BOOTS_CHEST,    RG_IRON_BOOTS,         {},                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN, true);
+    locationTable[RC_ICE_CAVERN_FREESTANDING_POH] =    Location::Collectable(RC_ICE_CAVERN_FREESTANDING_POH,    RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_ICE_CAVERN, ACTOR_EN_ITEM00, SCENE_ICE_CAVERN, 262,    0x01, "Freestanding PoH",    "Ice Cavern Freestanding PoH",    RHT_ICE_CAVERN_FREESTANDING_POH,    RG_PIECE_OF_HEART,     {},                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN, true);
+    // Ice Cavern Master Quest
+    locationTable[RC_ICE_CAVERN_MQ_IRON_BOOTS_CHEST] = Location::Chest(      RC_ICE_CAVERN_MQ_IRON_BOOTS_CHEST, RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_ICE_CAVERN, ACTOR_EN_BOX,    SCENE_ICE_CAVERN, 5570,   0x02, "MQ Iron Boots Chest", "Ice Cavern MQ Iron Boots Chest", RHT_ICE_CAVERN_MQ_IRON_BOOTS_CHEST, RG_IRON_BOOTS,         {},                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN, true);
+    locationTable[RC_ICE_CAVERN_MQ_COMPASS_CHEST] =    Location::Chest(      RC_ICE_CAVERN_MQ_COMPASS_CHEST,    RCQUEST_MQ,      RCTYPE_MAP_COMPASS, RCAREA_ICE_CAVERN, ACTOR_EN_BOX,    SCENE_ICE_CAVERN, 2048,   0x00, "MQ Compass Chest",    "Ice Cavern MQ Compass Chest",    RHT_ICE_CAVERN_MQ_COMPASS_CHEST,    RG_ICE_CAVERN_COMPASS, { Category::cVanillaCompass }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN, true);
+    locationTable[RC_ICE_CAVERN_MQ_MAP_CHEST] =        Location::Chest(      RC_ICE_CAVERN_MQ_MAP_CHEST,        RCQUEST_MQ,      RCTYPE_MAP_COMPASS, RCAREA_ICE_CAVERN, ACTOR_EN_BOX,    SCENE_ICE_CAVERN, -18399, 0x01, "MQ Map Chest",        "Ice Cavern MQ Map Chest",        RHT_ICE_CAVERN_MQ_MAP_CHEST,        RG_ICE_CAVERN_MAP,     { Category::cVanillaMap },     SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN, true);
+    locationTable[RC_ICE_CAVERN_MQ_FREESTANDING_POH] = Location::Collectable(RC_ICE_CAVERN_MQ_FREESTANDING_POH, RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_ICE_CAVERN, ACTOR_EN_ITEM00, SCENE_ICE_CAVERN, 262,    0x01, "MQ Freestanding PoH", "Ice Cavern MQ Freestanding PoH", RHT_ICE_CAVERN_MQ_FREESTANDING_POH, RG_PIECE_OF_HEART,     {},                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN, true);
+
+    //            Randomizer Check                                                              Randomizer Check                                            Quest            Type                               Area                           Actor ID         Scene ID                      Params  Flag  Short Name                          Spoiler Name                                                Hint Text Key                                                Vanilla Item                          Categories                        Collection Check Group                                     Vanilla Progression
+    // Gerudo Training Grounds Vanilla
+    locationTable[RC_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST] =                 Location::Chest(RC_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST,                 RCQUEST_VANILLA, RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, -30573, 0x13, "Lobby Left Chest",                 "Gerudo Training Grounds Lobby Left Chest",                 RHT_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST,                 RG_BLUE_RUPEE,                        {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST] =                Location::Chest(RC_GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST,                RCQUEST_VANILLA, RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, -30393, 0x07, "Lobby Right Chest",                "Gerudo Training Grounds Lobby Right Chest",                RHT_GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST,                RG_ARROWS_10,                         {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_STALFOS_CHEST] =                    Location::Chest(RC_GERUDO_TRAINING_GROUND_STALFOS_CHEST,                    RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, -30656, 0x00, "Stalfos Chest",                    "Gerudo Training Grounds Stalfos Chest",                    RHT_GERUDO_TRAINING_GROUND_STALFOS_CHEST,                    RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND, true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_BEAMOS_CHEST] =                     Location::Chest(RC_GERUDO_TRAINING_GROUND_BEAMOS_CHEST,                     RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, -30655, 0x01, "Beamos Chest",                     "Gerudo Training Grounds Beamos Chest",                     RHT_GERUDO_TRAINING_GROUND_BEAMOS_CHEST,                     RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND, true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST] =             Location::Chest(RC_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST,             RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 22603,  0x0B, "Hidden Ceiling Chest",             "Gerudo Training Grounds Hidden Ceiling Chest",             RHT_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST,             RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND, true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST] =            Location::Chest(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST,            RCQUEST_VANILLA, RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 23206,  0x06, "Maze Path First Chest",            "Gerudo Training Grounds Maze Path First Chest",            RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST,            RG_PURPLE_RUPEE,                      {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MAZE_PATH_SECOND_CHEST] =           Location::Chest(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_SECOND_CHEST,           RCQUEST_VANILLA, RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 22986,  0x0A, "Maze Path Second Chest",           "Gerudo Training Grounds Maze Path Second Chest",           RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_SECOND_CHEST,           RG_RED_RUPEE,                         {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MAZE_PATH_THIRD_CHEST] =            Location::Chest(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_THIRD_CHEST,            RCQUEST_VANILLA, RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 22889,  0x09, "Maze Path Third Chest",            "Gerudo Training Grounds Maze Path Third Chest",            RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_THIRD_CHEST,            RG_ARROWS_30,                         {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FINAL_CHEST] =            Location::Chest(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FINAL_CHEST,            RCQUEST_VANILLA, RCTYPE_BOSS_HEART_OR_OTHER_REWARD, RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 2860,   0x0C, "Maze Path Final Chest",            "Gerudo Training Grounds Maze Path Final Chest",            RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_FINAL_CHEST,            RG_ICE_ARROWS,                        { Category::cSongDungeonReward }, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND, true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_CENTRAL_CHEST] =         Location::Chest(RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_CENTRAL_CHEST,         RCQUEST_VANILLA, RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 23877,  0x05, "Maze Right Central Chest",         "Gerudo Training Grounds Maze Right Central Chest",         RHT_GERUDO_TRAINING_GROUND_MAZE_RIGHT_CENTRAL_CHEST,         RG_BOMBCHU_5,                         {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_SIDE_CHEST] =            Location::Chest(RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_SIDE_CHEST,            RCQUEST_VANILLA, RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 22888,  0x08, "Maze Right Side Chest",            "Gerudo Training Grounds Maze Right Side Chest",            RHT_GERUDO_TRAINING_GROUND_MAZE_RIGHT_SIDE_CHEST,            RG_ARROWS_30,                         {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST] =    Location::Chest(RC_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST,    RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, -30643, 0x0D, "Underwater Silver Rupee Chest",    "Gerudo Training Grounds Underwater Silver Rupee Chest",    RHT_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST,    RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND, true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST] =          Location::Chest(RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST,          RCQUEST_VANILLA, RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 31058,  0x12, "Hammer Room Clear Chest",          "Gerudo Training Grounds Hammer Room Clear Chest",          RHT_GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST,          RG_ARROWS_10,                         {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST] =         Location::Chest(RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST,         RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 22608,  0x10, "Hammer Room Switch Chest",         "Gerudo Training Grounds Hammer Room Switch Chest",         RHT_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST,         RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND, true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_EYE_STATUE_CHEST] =                 Location::Chest(RC_GERUDO_TRAINING_GROUND_EYE_STATUE_CHEST,                 RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, -30653, 0x03, "Eye Statue Chest",                 "Gerudo Training Grounds Eye Statue Chest",                 RHT_GERUDO_TRAINING_GROUND_EYE_STATUE_CHEST,                 RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND, true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_NEAR_SCARECROW_CHEST] =             Location::Chest(RC_GERUDO_TRAINING_GROUND_NEAR_SCARECROW_CHEST,             RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 22596,  0x04, "Near Scarecrow Chest",             "Gerudo Training Grounds Near Scarecrow Chest",             RHT_GERUDO_TRAINING_GROUND_NEAR_SCARECROW_CHEST,             RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND, true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST] =         Location::Chest(RC_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST,         RCQUEST_VANILLA, RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 31089,  0x11, "Before Heavy Block Chest",         "Gerudo Training Grounds Before Heavy Block Chest",         RHT_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST,         RG_ARROWS_30,                         {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST] =          Location::Chest(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST,          RCQUEST_VANILLA, RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 31439,  0x0F, "Heavy Block First Chest",          "Gerudo Training Grounds Heavy Block First Chest",          RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST,          RG_HUGE_RUPEE,                        {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST] =         Location::Chest(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST,         RCQUEST_VANILLA, RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 30862,  0x0E, "Heavy Block Second Chest",         "Gerudo Training Grounds Heavy Block Second Chest",         RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST,         RG_BLUE_RUPEE,                        {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_THIRD_CHEST] =          Location::Chest(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_THIRD_CHEST,          RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 26708,  0x14, "Heavy Block Third Chest",          "Gerudo Training Grounds Heavy Block Third Chest",          RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_THIRD_CHEST,          RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND, true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FOURTH_CHEST] =         Location::Chest(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FOURTH_CHEST,         RCQUEST_VANILLA, RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 24450,  0x02, "Heavy Block Fourth Chest",         "Gerudo Training Grounds Heavy Block Fourth Chest",         RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FOURTH_CHEST,         RG_ICE_TRAP,                          {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_FREESTANDING_KEY] =                 Location::Collectable(RC_GERUDO_TRAINING_GROUND_FREESTANDING_KEY,           RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_ITEM00, SCENE_GERUDO_TRAINING_GROUND, 273,    0x01, "Freestanding Key",                 "Gerudo Training Grounds Freestanding Key",                 RHT_GERUDO_TRAINING_GROUND_FREESTANDING_KEY,                 RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND, true);
+    // Gerudo Training Grounds Master Quest
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST] =             Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST,             RCQUEST_MQ,      RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 23879,  0x07, "MQ Lobby Right Chest",             "Gerudo Training Grounds MQ Lobby Right Chest",             RHT_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST,             RG_BOMBCHU_5,                         {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST] =              Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST,              RCQUEST_MQ,      RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 22867,  0x13, "MQ Lobby Left Chest",              "Gerudo Training Grounds MQ Lobby Left Chest",              RHT_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST,              RG_ARROWS_10,                         {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST] =      Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST,      RCQUEST_MQ,      RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, -30304, 0x00, "MQ First Iron Knuckle Chest",      "Gerudo Training Grounds MQ First Iron Knuckle Chest",      RHT_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST,      RG_BLUE_RUPEE,                        {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_BEFORE_HEAVY_BLOCK_CHEST] =      Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_BEFORE_HEAVY_BLOCK_CHEST,      RCQUEST_MQ,      RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 31057,  0x11, "MQ Before Heavy Block Chest",      "Gerudo Training Grounds MQ Before Heavy Block Chest",      RHT_GERUDO_TRAINING_GROUND_MQ_BEFORE_HEAVY_BLOCK_CHEST,      RG_ARROWS_10,                         {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_EYE_STATUE_CHEST] =              Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_EYE_STATUE_CHEST,              RCQUEST_MQ,      RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, -32669, 0x03, "MQ Eye Statue Chest",              "Gerudo Training Grounds MQ Eye Statue Chest",              RHT_GERUDO_TRAINING_GROUND_MQ_EYE_STATUE_CHEST,              RG_BOMBCHU_10,                        {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_FLAME_CIRCLE_CHEST] =            Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_FLAME_CIRCLE_CHEST,            RCQUEST_MQ,      RCTYPE_SMALL_KEY,                  RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, -30642, 0x0E, "MQ Flame Circle Chest",            "Gerudo Training Grounds MQ Flame Circle Chest",            RHT_GERUDO_TRAINING_GROUND_MQ_FLAME_CIRCLE_CHEST,            RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND, true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_SECOND_IRON_KNUCKLE_CHEST] =     Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_SECOND_IRON_KNUCKLE_CHEST,     RCQUEST_MQ,      RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 31058,  0x12, "MQ Second Iron Knuckle Chest",     "Gerudo Training Grounds MQ Second Iron Knuckle Chest",     RHT_GERUDO_TRAINING_GROUND_MQ_SECOND_IRON_KNUCKLE_CHEST,     RG_ARROWS_10,                         {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_DINOLFOS_CHEST] =                Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_DINOLFOS_CHEST,                RCQUEST_MQ,      RCTYPE_SMALL_KEY,                  RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, -30655, 0x01, "MQ Dinolfos Chest",                "Gerudo Training Grounds MQ Dinolfos Chest",                RHT_GERUDO_TRAINING_GROUND_MQ_DINOLFOS_CHEST,                RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND, true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_ICE_ARROWS_CHEST] =              Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_ICE_ARROWS_CHEST,              RCQUEST_MQ,      RCTYPE_BOSS_HEART_OR_OTHER_REWARD, RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, -17628, 0x04, "MQ Ice Arrows Chest",              "Gerudo Training Grounds MQ Ice Arrows Chest",              RHT_GERUDO_TRAINING_GROUND_MQ_ICE_ARROWS_CHEST,              RG_ICE_ARROWS,                        { Category::cSongDungeonReward }, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND, true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_CENTRAL_CHEST] =      Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_CENTRAL_CHEST,      RCQUEST_MQ,      RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 22661,  0x05, "MQ Maze Right Central Chest",      "Gerudo Training Grounds MQ Maze Right Central Chest",      RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_CENTRAL_CHEST,      RG_BLUE_RUPEE,                        {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_FIRST_CHEST] =         Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_FIRST_CHEST,         RCQUEST_MQ,      RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 22918,  0x06, "MQ Maze Path First Chest",         "Gerudo Training Grounds MQ Maze Path First Chest",         RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_FIRST_CHEST,         RG_GREEN_RUPEE,                       {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_SIDE_CHEST] =         Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_SIDE_CHEST,         RCQUEST_MQ,      RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 24136,  0x08, "MQ Maze Right Side Chest",         "Gerudo Training Grounds MQ Maze Right Side Chest",         RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_SIDE_CHEST,         RG_TREASURE_GAME_GREEN_RUPEE,         {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_THIRD_CHEST] =         Location::Chest( RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_THIRD_CHEST,        RCQUEST_MQ,      RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 24137,  0x09, "MQ Maze Path Third Chest",         "Gerudo Training Grounds MQ Maze Path Third Chest",         RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_THIRD_CHEST,         RG_TREASURE_GAME_GREEN_RUPEE,         {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_SECOND_CHEST] =        Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_SECOND_CHEST,        RCQUEST_MQ,      RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 22986,  0x0A, "MQ Maze Path Second Chest",        "Gerudo Training Grounds MQ Maze Path Second Chest",        RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_SECOND_CHEST,        RG_RED_RUPEE,                         {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_HIDDEN_CEILING_CHEST] =          Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_HIDDEN_CEILING_CHEST,          RCQUEST_MQ,      RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 23211,  0x0B, "MQ Hidden Ceiling Chest",          "Gerudo Training Grounds MQ Hidden Ceiling Chest",          RHT_GERUDO_TRAINING_GROUND_MQ_HIDDEN_CEILING_CHEST,          RG_PURPLE_RUPEE,                      {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST] = Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST, RCQUEST_MQ,      RCTYPE_SMALL_KEY,                  RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, -30643, 0x0D, "MQ Underwater Silver Rupee Chest", "Gerudo Training Grounds MQ Underwater Silver Rupee Chest", RHT_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST, RG_TREASURE_GAME_GREEN_RUPEE,         { Category::cVanillaSmallKey },   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND, true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_HEAVY_BLOCK_CHEST] =             Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_HEAVY_BLOCK_CHEST,             RCQUEST_MQ,      RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 31394,  0x02, "MQ Heavy Block Chest",             "Gerudo Training Grounds MQ Heavy Block Chest",             RHT_GERUDO_TRAINING_GROUND_MQ_HEAVY_BLOCK_CHEST,             RG_PURPLE_RUPEE,                      {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+
+    //            Randomizer Check                                                            Randomizer Check                                          Quest            Type                   Area                  Actor ID         Scene ID                    Params  Flag  Short Name                                 Spoiler Name                                              Hint Text Key                                              Vanilla Item                Categories                     Spoiler Collection Check                    Collection Check Group                                    Vanilla Progression
+    // Ganon's Castle Shared
+    locationTable[RC_GANONS_TOWER_BOSS_KEY_CHEST] =                           Location::Chest(RC_GANONS_TOWER_BOSS_KEY_CHEST,                           RCQUEST_BOTH,    RCTYPE_GANON_BOSS_KEY, RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_GANONS_TOWER,         10219,  0x0B, "Boss Key Chest",                          "Ganon's Tower Boss Key Chest",                           RHT_GANONS_TOWER_BOSS_KEY_CHEST,                           RG_GANONS_CASTLE_BOSS_KEY,  {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE, true);
+    // Ganon's Castle Vanilla
+    locationTable[RC_GANONS_CASTLE_FOREST_TRIAL_CHEST] =                      Location::Chest(RC_GANONS_CASTLE_FOREST_TRIAL_CHEST,                      RCQUEST_VANILLA, RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, 30857,  0x09, "Forest Trial Chest",                      "Ganon's Castle Forest Trial Chest",                      RHT_GANONS_CASTLE_FOREST_TRIAL_CHEST,                      RG_BLUE_RUPEE,              {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST] =                  Location::Chest(RC_GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST,                  RCQUEST_VANILLA, RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, 24455,  0x07, "Water Trial Left Chest",                  "Ganon's Castle Water Trial Left Chest",                  RHT_GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST,                  RG_ICE_TRAP,                {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST] =                 Location::Chest(RC_GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST,                 RCQUEST_VANILLA, RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, 22790,  0x06, "Water Trial Right Chest",                 "Ganon's Castle Water Trial Right Chest",                 RHT_GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST,                 RG_RECOVERY_HEART,          {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST] =                Location::Chest(RC_GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST,                RCQUEST_VANILLA, RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, 22664,  0x08, "Shadow Trial Front Chest",                "Ganon's Castle Shadow Trial Front Chest",                RHT_GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST,                RG_BLUE_RUPEE,              {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST] =     Location::Chest(RC_GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST,     RCQUEST_VANILLA, RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, 14021,  0x05, "Shadow Trial Golden Gauntlets Chest",     "Ganon's Castle Shadow Trial Golden Gauntlets Chest",     RHT_GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST,     RG_PROGRESSIVE_STRENGTH,    {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE, true);
+    locationTable[RC_GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST] =       Location::Chest(RC_GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST,       RCQUEST_VANILLA, RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, -29326, 0x12, "Spirit Trial Crystal Switch Chest",       "Ganon's Castle Spirit Trial Crystal Switch Chest",       RHT_GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST,       RG_BOMBCHU_20,              {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST] =            Location::Chest(RC_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST,            RCQUEST_VANILLA, RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, 26964,  0x14, "Spirit Trial Invisible Chest",            "Ganon's Castle Spirit Trial Invisible Chest",            RHT_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST,            RG_ARROWS_10,               {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST] =            Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST,            RCQUEST_VANILLA, RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, 22668,  0x0C, "Light Trial First Left Chest",            "Ganon's Castle Light Trial First Left Chest",            RHT_GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST,            RG_BLUE_RUPEE,              {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST] =           Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST,           RCQUEST_VANILLA, RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, 24459,  0x0B, "Light Trial Second Left Chest",           "Ganon's Castle Light Trial Second Left Chest",           RHT_GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST,           RG_ICE_TRAP,                {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST] =            Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST,            RCQUEST_VANILLA, RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, 22797,  0x0D, "Light Trial Third Left Chest",            "Ganon's Castle Light Trial Third Left Chest",            RHT_GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST,            RG_RECOVERY_HEART,          {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST] =           Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST,           RCQUEST_VANILLA, RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, 24462,  0x0E, "Light Trial First Right Chest",           "Ganon's Castle Light Trial First Right Chest",           RHT_GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST,           RG_ICE_TRAP,                {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST] =          Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST,          RCQUEST_VANILLA, RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, 22890,  0x0A, "Light Trial Second Right Chest",          "Ganon's Castle Light Trial Second Right Chest",          RHT_GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST,          RG_ARROWS_30,               {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST] =           Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST,           RCQUEST_VANILLA, RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, 24463,  0x0F, "Light Trial Third Right Chest",           "Ganon's Castle Light Trial Third Right Chest",           RHT_GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST,           RG_ICE_TRAP,                {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST] =     Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST,     RCQUEST_VANILLA, RCTYPE_SMALL_KEY,      RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, 30800,  0x10, "Light Trial Invisible Enemies Chest",     "Ganon's Castle Light Trial Invisible Enemies Chest",     RHT_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST,     RG_GANONS_CASTLE_SMALL_KEY, { Category::cVanillaSmallKey },                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE, true);
+    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST] =               Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST,               RCQUEST_VANILLA, RCTYPE_SMALL_KEY,      RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, -30639, 0x11, "Light Trial Lullaby Chest",               "Ganon's Castle Light Trial Lullaby Chest",               RHT_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST,               RG_GANONS_CASTLE_SMALL_KEY, { Category::cVanillaSmallKey },                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE, true);
+    locationTable[RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT] =                  Location::Base(RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,                   RCQUEST_VANILLA, RCTYPE_SCRUB,          RCAREA_GANONS_CASTLE, ACTOR_EN_DNS,    SCENE_INSIDE_GANONS_CASTLE, 0x05,   0x37, "Deku Scrub Center-Left",                  "Ganon's Castle Deku Scrub Center-Left",                  RHT_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,                  RG_BUY_BOMBS_535,           { Category::cDekuScrub },       SpoilerCollectionCheck::Scrub(0x0D, 0x06), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT] =                 Location::Base(RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT,                  RCQUEST_VANILLA, RCTYPE_SCRUB,          RCAREA_GANONS_CASTLE, ACTOR_EN_DNS,    SCENE_INSIDE_GANONS_CASTLE, 0x03,   0x33, "Deku Scrub Center-Right",                 "Ganon's Castle Deku Scrub Center-Right",                 RHT_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT,                 RG_BUY_ARROWS_30,           { Category::cDekuScrub },       SpoilerCollectionCheck::Scrub(0x0D, 0x04), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_DEKU_SCRUB_RIGHT] =                        Location::Base(RC_GANONS_CASTLE_DEKU_SCRUB_RIGHT,                         RCQUEST_VANILLA, RCTYPE_SCRUB,          RCAREA_GANONS_CASTLE, ACTOR_EN_DNS,    SCENE_INSIDE_GANONS_CASTLE, 0x07,   0x39, "Deku Scrub Right",                        "Ganon's Castle Deku Scrub Right",                        RHT_GANONS_CASTLE_DEKU_SCRUB_RIGHT,                        RG_BUY_RED_POTION_30,       { Category::cDekuScrub },       SpoilerCollectionCheck::Scrub(0x0D, 0x08), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_DEKU_SCRUB_LEFT] =                         Location::Base(RC_GANONS_CASTLE_DEKU_SCRUB_LEFT,                          RCQUEST_VANILLA, RCTYPE_SCRUB,          RCAREA_GANONS_CASTLE, ACTOR_EN_DNS,    SCENE_INSIDE_GANONS_CASTLE, 0x08,   0x3A, "Deku Scrub Left",                         "Ganon's Castle Deku Scrub Left",                         RHT_GANONS_CASTLE_DEKU_SCRUB_LEFT,                         RG_BUY_GREEN_POTION,        { Category::cDekuScrub },       SpoilerCollectionCheck::Scrub(0x0D, 0x09), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    // Ganon's Castle MQ
+    locationTable[RC_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST] =                    Location::Chest(RC_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST,                    RCQUEST_MQ,      RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, 22977,  0x01, "MQ Water Trial Chest",                    "Ganon's Castle MQ Water Trial Chest",                    RHT_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST,                    RG_RED_RUPEE,               {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST] =        Location::Chest(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST,        RCQUEST_MQ,      RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, -30398, 0x02, "MQ Forest Trial Eye Switch Chest",        "Ganon's Castle MQ Forest Trial Eye Switch Chest",        RHT_GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST,        RG_ARROWS_10,               {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST] = Location::Chest(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST, RCQUEST_MQ,      RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, -32733, 0x03, "MQ Forest Trial Frozen Eye Switch Chest", "Ganon's Castle MQ Forest Trial Frozen Eye Switch Chest", RHT_GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST, RG_BOMBS_5,                 {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST] =            Location::Chest(RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST,            RCQUEST_MQ,      RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, -30460, 0x04, "MQ Light Trial Lullaby Chest",            "Ganon's Castle MQ Light Trial Lullaby Chest",            RHT_GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST,            RG_RECOVERY_HEART,          {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST] =       Location::Chest(RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST,       RCQUEST_MQ,      RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, -30400, 0x00, "MQ Shadow Trial Bomb Flower Chest",       "Ganon's Castle MQ Shadow Trial Bomb Flower Chest",       RHT_GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST,       RG_ARROWS_10,               {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST] =        Location::Chest(RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST,        RCQUEST_MQ,      RCTYPE_SMALL_KEY,      RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, -30651, 0x05, "MQ Shadow Trial Eye Switch Chest",        "Ganon's Castle MQ Shadow Trial Eye Switch Chest",        RHT_GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST,        RG_GANONS_CASTLE_SMALL_KEY, { Category::cVanillaSmallKey },                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE, true);
+    locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST] =  Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST,  RCQUEST_MQ,      RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, -18746, 0x06, "MQ Spirit Trial Golden Gauntlets Chest",  "Ganon's Castle MQ Spirit Trial Golden Gauntlets Chest",  RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST,  RG_PROGRESSIVE_STRENGTH,    {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE, true);
+    locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST] =    Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST,    RCQUEST_MQ,      RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, -30457, 0x07, "MQ Spirit Trial Sun Back Right Chest",    "Ganon's Castle MQ Spirit Trial Sun Back Right Chest",    RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST,    RG_RECOVERY_HEART,          {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST] =     Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST,     RCQUEST_MQ,      RCTYPE_SMALL_KEY,      RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, -30648, 0x08, "MQ Spirit Trial Sun Back Left Chest",     "Ganon's Castle MQ Spirit Trial Sun Back Left Chest",     RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST,     RG_GANONS_CASTLE_SMALL_KEY, { Category::cVanillaSmallKey },                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST] =    Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST,    RCQUEST_MQ,      RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, -30455, 0x09, "MQ Spirit Trial Sun Front Left Chest",    "Ganon's Castle MQ Spirit Trial Sun Front Left Chest",    RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST,    RG_RECOVERY_HEART,          {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST] =             Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST,             RCQUEST_MQ,      RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, 20586,  0x0A, "MQ Spirit Trial First Chest",             "Ganon's Castle MQ Spirit Trial First Chest",             RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST,             RG_BOMBCHU_10,              {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST] =         Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST,         RCQUEST_MQ,      RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, 26964,  0x14, "MQ Spirit Trial Invisible Chest",         "Ganon's Castle MQ Spirit Trial Invisible Chest",         RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST,         RG_ARROWS_10,               {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY] =        Location::Collectable(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY,  RCQUEST_MQ,      RCTYPE_SMALL_KEY,      RCAREA_GANONS_CASTLE, ACTOR_EN_ITEM00, SCENE_INSIDE_GANONS_CASTLE, 273,    0x01, "MQ Forest Trial Freestanding Key",        "Ganon's Castle MQ Forest Trial Freestanding Key",        RHT_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY,        RG_GANONS_CASTLE_SMALL_KEY, { Category::cVanillaSmallKey },                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE, true);
+    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT] =                     Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,                      RCQUEST_MQ,      RCTYPE_SCRUB,          RCAREA_GANONS_CASTLE, ACTOR_EN_DNS,    SCENE_INSIDE_GANONS_CASTLE, 0x00,   0x30, "MQ Deku Scrub Right",                     "Ganon's Castle MQ Deku Scrub Right",                     RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,                     RG_BUY_DEKU_NUT_5,          { Category::cDekuScrub },       SpoilerCollectionCheck::Scrub(0x0D, 0x01), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT] =               Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,                RCQUEST_MQ,      RCTYPE_SCRUB,          RCAREA_GANONS_CASTLE, ACTOR_EN_DNS,    SCENE_INSIDE_GANONS_CASTLE, 0x05,   0x37, "MQ Deku Scrub Center-Left",               "Ganon's Castle MQ Deku Scrub Center-Left",               RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,               RG_BUY_BOMBS_535,           { Category::cDekuScrub },       SpoilerCollectionCheck::Scrub(0x0D, 0x06), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER] =                    Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,                     RCQUEST_MQ,      RCTYPE_SCRUB,          RCAREA_GANONS_CASTLE, ACTOR_EN_DNS,    SCENE_INSIDE_GANONS_CASTLE, 0x03,   0x33, "MQ Deku Scrub Center",                    "Ganon's Castle MQ Deku Scrub Center",                    RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,                    RG_BUY_ARROWS_30,           { Category::cDekuScrub },       SpoilerCollectionCheck::Scrub(0x0D, 0x04), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT] =              Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT,               RCQUEST_MQ,      RCTYPE_SCRUB,          RCAREA_GANONS_CASTLE, ACTOR_EN_DNS,    SCENE_INSIDE_GANONS_CASTLE, 0x07,   0x39, "MQ Deku Scrub Center-Right",              "Ganon's Castle MQ Deku Scrub Center-Right",              RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT,              RG_BUY_RED_POTION_30,       { Category::cDekuScrub },       SpoilerCollectionCheck::Scrub(0x0D, 0x08), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT] =                      Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,                       RCQUEST_MQ,      RCTYPE_SCRUB,          RCAREA_GANONS_CASTLE, ACTOR_EN_DNS,    SCENE_INSIDE_GANONS_CASTLE, 0x08,   0x3A, "MQ Deku Scrub Left",                      "Ganon's Castle MQ Deku Scrub Left",                      RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,                      RG_BUY_GREEN_POTION,        { Category::cDekuScrub },       SpoilerCollectionCheck::Scrub(0x0D, 0x09), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+
+    // Gold Skulltula Tokens
+
+    // Dungeons
+    // Deku Tree  RandomizerCheck                                                          RandomizerCheck                                      Quest            Area                          Scene ID                    params  Flag  Short Name                          Spoiler Name                                        Hint Text Key                                         Categories                Collection Check Group
+    locationTable[RC_DEKU_TREE_GS_BASEMENT_BACK_ROOM] =                  Location::GSToken(RC_DEKU_TREE_GS_BASEMENT_BACK_ROOM,                  RCQUEST_VANILLA, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,            8193,   0x01, "GS Basement Back Room",            "Deku Tree GS Basement Back Room",                  RHT_DEKU_TREE_GS_BASEMENT_BACK_ROOM,                  { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_GS_BASEMENT_GATE] =                       Location::GSToken(RC_DEKU_TREE_GS_BASEMENT_GATE,                       RCQUEST_VANILLA, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,            8194,   0x02, "GS Basement Gate",                 "Deku Tree GS Basement Gate",                       RHT_DEKU_TREE_GS_BASEMENT_GATE,                       { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_GS_BASEMENT_VINES] =                      Location::GSToken(RC_DEKU_TREE_GS_BASEMENT_VINES,                      RCQUEST_VANILLA, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,            8196,   0x04, "GS Basement Vines",                "Deku Tree GS Basement Vines",                      RHT_DEKU_TREE_GS_BASEMENT_VINES,                      { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_GS_COMPASS_ROOM] =                        Location::GSToken(RC_DEKU_TREE_GS_COMPASS_ROOM,                        RCQUEST_VANILLA, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,            8200,   0x08, "GS Compass Room",                  "Deku Tree GS Compass Room",                        RHT_DEKU_TREE_GS_COMPASS_ROOM,                        { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_MQ_GS_LOBBY] =                            Location::GSToken(RC_DEKU_TREE_MQ_GS_LOBBY,                            RCQUEST_MQ,      RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,            8194,   0x02, "MQ GS Lobby",                      "Deku Tree MQ GS Lobby",                            RHT_DEKU_TREE_MQ_GS_LOBBY,                            { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_MQ_GS_COMPASS_ROOM] =                     Location::GSToken(RC_DEKU_TREE_MQ_GS_COMPASS_ROOM,                     RCQUEST_MQ,      RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,            8200,   0x08, "MQ GS Compass Room",               "Deku Tree MQ GS Compass Room",                     RHT_DEKU_TREE_MQ_GS_COMPASS_ROOM,                     { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM] =             Location::GSToken(RC_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM,             RCQUEST_MQ,      RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,            8196,   0x04, "MQ GS Basement Graves Room",       "Deku Tree MQ GS Basement Graves Room",             RHT_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM,             { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM] =               Location::GSToken(RC_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM,               RCQUEST_MQ,      RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,            8193,   0x01, "MQ GS Basement Back Room",         "Deku Tree MQ GS Basement Back Room",               RHT_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM,               { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    // Dodongo's Cavern
+    locationTable[RC_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS] =            Location::GSToken(RC_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS,            RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,       SCENE_DODONGOS_CAVERN,      8449,   0x01, "GS Vines Above Stairs",            "Dodongos Cavern GS Vines Above Stairs",            RHT_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS,            { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_GS_SCARECROW] =                     Location::GSToken(RC_DODONGOS_CAVERN_GS_SCARECROW,                     RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,       SCENE_DODONGOS_CAVERN,      8450,   0x02, "GS Scarecrow",                     "Dodongos Cavern GS Scarecrow",                     RHT_DODONGOS_CAVERN_GS_SCARECROW,                     { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS] =           Location::GSToken(RC_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS,           RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,       SCENE_DODONGOS_CAVERN,      8452,   0x04, "GS Alcove Above Stairs",           "Dodongos Cavern GS Alcove Above Stairs",           RHT_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS,           { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_GS_BACK_ROOM] =                     Location::GSToken(RC_DODONGOS_CAVERN_GS_BACK_ROOM,                     RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,       SCENE_DODONGOS_CAVERN,      8456,   0x08, "GS Back Room",                     "Dodongos Cavern GS Back Room",                     RHT_DODONGOS_CAVERN_GS_BACK_ROOM,                     { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS] = Location::GSToken(RC_DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS, RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,       SCENE_DODONGOS_CAVERN,      8464,   0x10, "GS Side Room Near Lower Lizalfos", "Dodongos Cavern GS Side Room Near Lower Lizalfos", RHT_DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS, { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM] =                 Location::GSToken(RC_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM,                 RCQUEST_MQ,      RCAREA_DODONGOS_CAVERN,       SCENE_DODONGOS_CAVERN,      8450,   0x02, "MQ GS Scrub Room",                 "Dodongos Cavern MQ GS Scrub Room",                 RHT_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM,                 { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM] =    Location::GSToken(RC_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM,    RCQUEST_MQ,      RCAREA_DODONGOS_CAVERN,       SCENE_DODONGOS_CAVERN,      8456,   0x08, "MQ GS Song of Time Block Room",    "Dodongos Cavern MQ GS Song of Time Block Room",    RHT_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM,    { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM] =              Location::GSToken(RC_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM,              RCQUEST_MQ,      RCAREA_DODONGOS_CAVERN,       SCENE_DODONGOS_CAVERN,      8452,   0x04, "MQ GS Lizalfos Room",              "Dodongos Cavern MQ GS Lizalfos Room",              RHT_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM,              { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM] =                Location::GSToken(RC_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM,                RCQUEST_MQ,      RCAREA_DODONGOS_CAVERN,       SCENE_DODONGOS_CAVERN,      8464,   0x10, "MQ GS Larvae Room",                "Dodongos Cavern MQ GS Larvae Room",                RHT_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM,                { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_MQ_GS_BACK_AREA] =                  Location::GSToken(RC_DODONGOS_CAVERN_MQ_GS_BACK_AREA,                  RCQUEST_MQ,      RCAREA_DODONGOS_CAVERN,       SCENE_DODONGOS_CAVERN,      8449,   0x01, "MQ GS Back Room",                  "Dodongos Cavern MQ GS Back Room",                  RHT_DODONGOS_CAVERN_MQ_GS_BACK_AREA,                  { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER] =         Location::GSToken(RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER,         RCQUEST_VANILLA, RCAREA_JABU_JABUS_BELLY,      SCENE_JABU_JABU,            8705,   0x01, "GS Lobby Basement Lower",          "Jabu Jabus Belly GS Lobby Basement Lower",         RHT_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER,         { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER] =         Location::GSToken(RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER,         RCQUEST_VANILLA, RCAREA_JABU_JABUS_BELLY,      SCENE_JABU_JABU,            8706,   0x02, "GS Lobby Basement Upper",          "Jabu Jabus Belly GS Lobby Basement Upper",         RHT_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER,         { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_GS_NEAR_BOSS] =                    Location::GSToken(RC_JABU_JABUS_BELLY_GS_NEAR_BOSS,                    RCQUEST_VANILLA, RCAREA_JABU_JABUS_BELLY,      SCENE_JABU_JABU,            8708,   0x04, "GS Near Boss",                     "Jabu Jabus Belly GS Near Boss",                    RHT_JABU_JABUS_BELLY_GS_NEAR_BOSS,                    { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM] =            Location::GSToken(RC_JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM,            RCQUEST_VANILLA, RCAREA_JABU_JABUS_BELLY,      SCENE_JABU_JABU,            8712,   0x08, "GS Water Switch Room",             "Jabu Jabus Belly GS Water Switch Room",            RHT_JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM,            { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM] =          Location::GSToken(RC_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM,          RCQUEST_MQ,      RCAREA_JABU_JABUS_BELLY,      SCENE_JABU_JABU,            8708,   0x04, "MQ GS Tail Parasan Room",          "Jabu Jabus Belly MQ GS Tail Parasan Room",         RHT_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM,          { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM] =    Location::GSToken(RC_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM,    RCQUEST_MQ,      RCAREA_JABU_JABUS_BELLY,      SCENE_JABU_JABU,            8712,   0x08, "MQ GS Invisible Enemies Room",     "Jabu Jabus Belly MQ GS Invisible Enemies Room",    RHT_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM,    { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM] =      Location::GSToken(RC_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM,      RCQUEST_MQ,      RCAREA_JABU_JABUS_BELLY,      SCENE_JABU_JABU,            8705,   0x01, "MQ GS Boomerang Chest Room",       "Jabu Jabus Belly MQ GS Boomerang Chest Room",      RHT_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM,      { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS] =                 Location::GSToken(RC_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS,                 RCQUEST_MQ,      RCAREA_JABU_JABUS_BELLY,      SCENE_JABU_JABU,            8706,   0x02, "MQ GS Near Boss",                  "Jabu Jabus Belly MQ GS Near Boss",                 RHT_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS,                 { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD] =         Location::GSToken(RC_FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD,         RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,         SCENE_FOREST_TEMPLE,        8961,   0x01, "GS Raised Island Courtyard",       "Forest Temple GS Raised Island Courtyard",         RHT_FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD,         { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_GS_FIRST_ROOM] =                      Location::GSToken(RC_FOREST_TEMPLE_GS_FIRST_ROOM,                      RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,         SCENE_FOREST_TEMPLE,        8962,   0x02, "GS First Room",                    "Forest Temple GS First Room",                      RHT_FOREST_TEMPLE_GS_FIRST_ROOM,                      { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD] =          Location::GSToken(RC_FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD,          RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,         SCENE_FOREST_TEMPLE,        8964,   0x04, "GS Level Island Courtyard",        "Forest Temple GS Level Island Courtyard",          RHT_FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD,          { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_GS_LOBBY] =                           Location::GSToken(RC_FOREST_TEMPLE_GS_LOBBY,                           RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,         SCENE_FOREST_TEMPLE,        8968,   0x08, "GS Lobby",                         "Forest Temple GS Lobby",                           RHT_FOREST_TEMPLE_GS_LOBBY,                           { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_GS_BASEMENT] =                        Location::GSToken(RC_FOREST_TEMPLE_GS_BASEMENT,                        RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,         SCENE_FOREST_TEMPLE,        8976,   0x10, "GS Basement",                      "Forest Temple GS Basement",                        RHT_FOREST_TEMPLE_GS_BASEMENT,                        { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY] =                Location::GSToken(RC_FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY,                RCQUEST_MQ,      RCAREA_FOREST_TEMPLE,         SCENE_FOREST_TEMPLE,        8962,   0x02, "MQ GS First Hallway",              "Forest Temple MQ GS First Hallway",                RHT_FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY,                { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM] =              Location::GSToken(RC_FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM,              RCQUEST_MQ,      RCAREA_FOREST_TEMPLE,         SCENE_FOREST_TEMPLE,        8976,   0x10, "MQ GS Block Push Room",            "Forest Temple MQ GS Block Push Room",              RHT_FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM,              { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD] =      Location::GSToken(RC_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD,      RCQUEST_MQ,      RCAREA_FOREST_TEMPLE,         SCENE_FOREST_TEMPLE,        8961,   0x01, "MQ GS Raised Island Courtyard",    "Forest Temple MQ GS Raised Island Courtyard",      RHT_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD,      { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD] =       Location::GSToken(RC_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD,       RCQUEST_MQ,      RCAREA_FOREST_TEMPLE,         SCENE_FOREST_TEMPLE,        8964,   0x04, "MQ GS Level Island Courtyard",     "Forest Temple MQ GS Level Island Courtyard",       RHT_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD,       { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_MQ_GS_WELL] =                         Location::GSToken(RC_FOREST_TEMPLE_MQ_GS_WELL,                         RCQUEST_MQ,      RCAREA_FOREST_TEMPLE,         SCENE_FOREST_TEMPLE,        8968,   0x08, "MQ GS Well",                       "Forest Temple MQ GS Well",                         RHT_FOREST_TEMPLE_MQ_GS_WELL,                         { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    // Fire Temple
+    locationTable[RC_FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM] =                 Location::GSToken(RC_FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM,                 RCQUEST_VANILLA, RCAREA_FIRE_TEMPLE,           SCENE_FIRE_TEMPLE,          9217,   0x01, "GS Song of Time Room",             "Fire Temple GS Song of Time Room",                 RHT_FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM,                 { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    locationTable[RC_FIRE_TEMPLE_GS_BOSS_KEY_LOOP] =                     Location::GSToken(RC_FIRE_TEMPLE_GS_BOSS_KEY_LOOP,                     RCQUEST_VANILLA, RCAREA_FIRE_TEMPLE,           SCENE_FIRE_TEMPLE,          9218,   0x02, "GS Boss Key Loop",                 "Fire Temple GS Boss Key Loop",                     RHT_FIRE_TEMPLE_GS_BOSS_KEY_LOOP,                     { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    locationTable[RC_FIRE_TEMPLE_GS_BOULDER_MAZE] =                      Location::GSToken(RC_FIRE_TEMPLE_GS_BOULDER_MAZE,                      RCQUEST_VANILLA, RCAREA_FIRE_TEMPLE,           SCENE_FIRE_TEMPLE,          9220,   0x04, "GS Boulder Maze",                  "Fire Temple GS Boulder Maze",                      RHT_FIRE_TEMPLE_GS_BOULDER_MAZE,                      { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    locationTable[RC_FIRE_TEMPLE_GS_SCARECROW_TOP] =                     Location::GSToken(RC_FIRE_TEMPLE_GS_SCARECROW_TOP,                     RCQUEST_VANILLA, RCAREA_FIRE_TEMPLE,           SCENE_FIRE_TEMPLE,          9224,   0x08, "GS Scarecrow Top",                 "Fire Temple GS Scarecrow Top",                     RHT_FIRE_TEMPLE_GS_SCARECROW_TOP,                     { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    locationTable[RC_FIRE_TEMPLE_GS_SCARECROW_CLIMB] =                   Location::GSToken(RC_FIRE_TEMPLE_GS_SCARECROW_CLIMB,                   RCQUEST_VANILLA, RCAREA_FIRE_TEMPLE,           SCENE_FIRE_TEMPLE,          9232,   0x10, "GS Scarecrow Climb",               "Fire Temple GS Scarecrow Climb",                   RHT_FIRE_TEMPLE_GS_SCARECROW_CLIMB,                   { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    locationTable[RC_FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE] =           Location::GSToken(RC_FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE,           RCQUEST_MQ,      RCAREA_FIRE_TEMPLE,           SCENE_FIRE_TEMPLE,          9218,   0x02, "MQ GS Above Fire Wall Maze",       "Fire Temple MQ GS Above Fire Wall Maze",           RHT_FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE,           { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    locationTable[RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER] =          Location::GSToken(RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER,          RCQUEST_MQ,      RCAREA_FIRE_TEMPLE,           SCENE_FIRE_TEMPLE,          9224,   0x08, "MQ GS Fire Wall Maze Center",      "Fire Temple MQ GS Fire Wall Maze Center",          RHT_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER,          { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    locationTable[RC_FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR] =        Location::GSToken(RC_FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR,        RCQUEST_MQ,      RCAREA_FIRE_TEMPLE,           SCENE_FIRE_TEMPLE,          9217,   0x01, "MQ GS Big Lava Room Open Door",    "Fire Temple MQ GS Big Lava Room Open Door",        RHT_FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR,        { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    locationTable[RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM] =       Location::GSToken(RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM,       RCQUEST_MQ,      RCAREA_FIRE_TEMPLE,           SCENE_FIRE_TEMPLE,          9232,   0x10, "MQ GS Fire Wall Maze Side Room",   "Fire Temple MQ GS Fire Wall Maze Side Room",       RHT_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM,       { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    locationTable[RC_FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE] =                  Location::GSToken(RC_FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE,                  RCQUEST_MQ,      RCAREA_FIRE_TEMPLE,           SCENE_FIRE_TEMPLE,          9220,   0x04, "MQ GS Skull on Fire",              "Fire Temple MQ GS Skull on Fire",                  RHT_FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE,                  { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    // Water Temple
+    locationTable[RC_WATER_TEMPLE_GS_BEHIND_GATE] =                      Location::GSToken(RC_WATER_TEMPLE_GS_BEHIND_GATE,                      RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,          SCENE_WATER_TEMPLE,         9473,   0x01, "GS Behind Gate",                   "Water Temple GS Behind Gate",                      RHT_WATER_TEMPLE_GS_BEHIND_GATE,                      { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
+    locationTable[RC_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM] =            Location::GSToken(RC_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM,            RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,          SCENE_WATER_TEMPLE,         9474,   0x02, "GS Falling Platform Room",         "Water Temple GS Falling Platform Room",            RHT_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM,            { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
+    locationTable[RC_WATER_TEMPLE_GS_CENTRAL_PILLAR] =                   Location::GSToken(RC_WATER_TEMPLE_GS_CENTRAL_PILLAR,                   RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,          SCENE_WATER_TEMPLE,         9476,   0x04, "GS Central Pillar",                "Water Temple GS Central Pillar",                   RHT_WATER_TEMPLE_GS_CENTRAL_PILLAR,                   { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
+    locationTable[RC_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST] =              Location::GSToken(RC_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST,              RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,          SCENE_WATER_TEMPLE,         9480,   0x08, "GS Near Boss Key Chest",           "Water Temple GS Near Boss Key Chest",              RHT_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST,              { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
+    locationTable[RC_WATER_TEMPLE_GS_RIVER] =                            Location::GSToken(RC_WATER_TEMPLE_GS_RIVER,                            RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,          SCENE_WATER_TEMPLE,         9488,   0x10, "GS River",                         "Water Temple GS River",                            RHT_WATER_TEMPLE_GS_RIVER,                            { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
+    locationTable[RC_WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH] =     Location::GSToken(RC_WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH,     RCQUEST_MQ,      RCAREA_WATER_TEMPLE,          SCENE_WATER_TEMPLE,         9476,   0x04, "MQ GS Before Upper Water Switch",  "Water Temple MQ GS Before Upper Water Switch",     RHT_WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH,     { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
+    locationTable[RC_WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA] =         Location::GSToken(RC_WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA,         RCQUEST_MQ,      RCAREA_WATER_TEMPLE,          SCENE_WATER_TEMPLE,         9480,   0x08, "MQ GS Freestanding Key Area",      "Water Temple MQ GS Freestanding Key Area",         RHT_WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA,         { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
+    locationTable[RC_WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY] =              Location::GSToken(RC_WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY,              RCQUEST_MQ,      RCAREA_WATER_TEMPLE,          SCENE_WATER_TEMPLE,         9473,   0x01, "MQ GS Lizalfos Hallway",           "Water Temple MQ GS Lizalfos Hallway",              RHT_WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY,              { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
+    locationTable[RC_WATER_TEMPLE_MQ_GS_RIVER] =                         Location::GSToken(RC_WATER_TEMPLE_MQ_GS_RIVER,                         RCQUEST_MQ,      RCAREA_WATER_TEMPLE,          SCENE_WATER_TEMPLE,         9474,   0x02, "MQ GS River",                      "Water Temple MQ GS River",                         RHT_WATER_TEMPLE_MQ_GS_RIVER,                         { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
+    locationTable[RC_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH] =             Location::GSToken(RC_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH,             RCQUEST_MQ,      RCAREA_WATER_TEMPLE,          SCENE_WATER_TEMPLE,         9488,   0x10, "MQ GS Triple Wall Torch",          "Water Temple MQ GS Triple Wall Torch",             RHT_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH,             { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
+    // Spirit Temple
+    locationTable[RC_SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM] =       Location::GSToken(RC_SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM,       RCQUEST_VANILLA, RCAREA_SPIRIT_TEMPLE,         SCENE_SPIRIT_TEMPLE,        9729,   0x01, "GS Hall After Sun Block Room",     "Spirit Temple GS Hall After Sun Block Room",       RHT_SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM,       { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_GS_BOULDER_ROOM] =                    Location::GSToken(RC_SPIRIT_TEMPLE_GS_BOULDER_ROOM,                    RCQUEST_VANILLA, RCAREA_SPIRIT_TEMPLE,         SCENE_SPIRIT_TEMPLE,        9730,   0x02, "GS Boulder Room",                  "Spirit Temple GS Boulder Room",                    RHT_SPIRIT_TEMPLE_GS_BOULDER_ROOM,                    { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_GS_LOBBY] =                           Location::GSToken(RC_SPIRIT_TEMPLE_GS_LOBBY,                           RCQUEST_VANILLA, RCAREA_SPIRIT_TEMPLE,         SCENE_SPIRIT_TEMPLE,        9732,   0x04, "GS Lobby",                         "Spirit Temple GS Lobby",                           RHT_SPIRIT_TEMPLE_GS_LOBBY,                           { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM] =               Location::GSToken(RC_SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM,               RCQUEST_VANILLA, RCAREA_SPIRIT_TEMPLE,         SCENE_SPIRIT_TEMPLE,        9736,   0x08, "GS Sun on Floor Room",             "Spirit Temple GS Sun on Floor Room",               RHT_SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM,               { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_GS_METAL_FENCE] =                     Location::GSToken(RC_SPIRIT_TEMPLE_GS_METAL_FENCE,                     RCQUEST_VANILLA, RCAREA_SPIRIT_TEMPLE,         SCENE_SPIRIT_TEMPLE,        9744,   0x10, "GS Metal Fence",                   "Spirit Temple GS Metal Fence",                     RHT_SPIRIT_TEMPLE_GS_METAL_FENCE,                     { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM] =                Location::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM,                RCQUEST_MQ,      RCAREA_SPIRIT_TEMPLE,         SCENE_SPIRIT_TEMPLE,        9736,   0x08, "MQ GS Symphony Room",              "Spirit Temple MQ GS Symphony Room",                RHT_SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM,                { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM] =                  Location::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM,                  RCQUEST_MQ,      RCAREA_SPIRIT_TEMPLE,         SCENE_SPIRIT_TEMPLE,        9730,   0x02, "MQ GS Leever Room",                "Spirit Temple MQ GS Leever Room",                  RHT_SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM,                  { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST] =       Location::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST,       RCQUEST_MQ,      RCAREA_SPIRIT_TEMPLE,         SCENE_SPIRIT_TEMPLE,        9732,   0x04, "MQ GS Nine Thrones Room West",     "Spirit Temple MQ GS Nine Thrones Room West",       RHT_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST,       { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH] =      Location::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH,      RCQUEST_MQ,      RCAREA_SPIRIT_TEMPLE,         SCENE_SPIRIT_TEMPLE,        9744,   0x10, "MQ GS Nine Thrones Room North",    "Spirit Temple MQ GS Nine Thrones Room North",      RHT_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH,      { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM] =               Location::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM,               RCQUEST_MQ,      RCAREA_SPIRIT_TEMPLE,         SCENE_SPIRIT_TEMPLE,        9729,   0x01, "MQ GS Sun Block Room",             "Spirit Temple MQ GS Sun Block Room",               RHT_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM,               { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    // Shadow Temple
+    locationTable[RC_SHADOW_TEMPLE_GS_SINGLE_GIANT_POT] =                Location::GSToken(RC_SHADOW_TEMPLE_GS_SINGLE_GIANT_POT,                RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,         SCENE_SHADOW_TEMPLE,        9985,   0x01, "GS Single Giant Pot",              "Shadow Temple GS Single Giant Pot",                RHT_SHADOW_TEMPLE_GS_SINGLE_GIANT_POT,                { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM] =             Location::GSToken(RC_SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM,             RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,         SCENE_SHADOW_TEMPLE,        9986,   0x02, "GS Falling Spikes Room",           "Shadow Temple GS Falling Spikes Room",             RHT_SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM,             { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT] =                Location::GSToken(RC_SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT,                RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,         SCENE_SHADOW_TEMPLE,        9988,   0x04, "GS Triple Giant Pot",              "Shadow Temple GS Triple Giant Pot",                RHT_SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT,                { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM] =                  Location::GSToken(RC_SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM,                  RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,         SCENE_SHADOW_TEMPLE,        9992,   0x08, "GS Like Like Room",                "Shadow Temple GS Like Like Room",                  RHT_SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM,                  { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_GS_NEAR_SHIP] =                       Location::GSToken(RC_SHADOW_TEMPLE_GS_NEAR_SHIP,                       RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,         SCENE_SHADOW_TEMPLE,        10000,  0x10, "GS Near Ship",                     "Shadow Temple GS Near Ship",                       RHT_SHADOW_TEMPLE_GS_NEAR_SHIP,                       { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM] =          Location::GSToken(RC_SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM,          RCQUEST_MQ,      RCAREA_SHADOW_TEMPLE,         SCENE_SHADOW_TEMPLE,        9986,   0x02, "MQ GS Falling Spikes Room",        "Shadow Temple MQ GS Falling Spikes Room",          RHT_SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM,          { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM] =               Location::GSToken(RC_SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM,               RCQUEST_MQ,      RCAREA_SHADOW_TEMPLE,         SCENE_SHADOW_TEMPLE,        9985,   0x01, "MQ GS Wind Hint Room",             "Shadow Temple MQ GS Wind Hint Room",               RHT_SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM,               { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_GS_AFTER_WIND] =                   Location::GSToken(RC_SHADOW_TEMPLE_MQ_GS_AFTER_WIND,                   RCQUEST_MQ,      RCAREA_SHADOW_TEMPLE,         SCENE_SHADOW_TEMPLE,        9992,   0x08, "MQ GS After Wind",                 "Shadow Temple MQ GS After Wind",                   RHT_SHADOW_TEMPLE_MQ_GS_AFTER_WIND,                   { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_GS_AFTER_SHIP] =                   Location::GSToken(RC_SHADOW_TEMPLE_MQ_GS_AFTER_SHIP,                   RCQUEST_MQ,      RCAREA_SHADOW_TEMPLE,         SCENE_SHADOW_TEMPLE,        10000,  0x10, "MQ GS After Ship",                 "Shadow Temple MQ GS After Ship",                   RHT_SHADOW_TEMPLE_MQ_GS_AFTER_SHIP,                   { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS] =                    Location::GSToken(RC_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS,                    RCQUEST_MQ,      RCAREA_SHADOW_TEMPLE,         SCENE_SHADOW_TEMPLE,        9988,   0x04, "MQ GS Near Boss",                  "Shadow Temple MQ GS Near Boss",                    RHT_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS,                    { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    // Bottom of the Well
+    locationTable[RC_BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE] =             Location::GSToken(RC_BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE,             RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL,    SCENE_BOTTOM_OF_THE_WELL,   10241,  0x01, "GS Like Like Cage",                "Bottom of the Well GS Like Like Cage",             RHT_BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE,             { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
+    locationTable[RC_BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM] =            Location::GSToken(RC_BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM,            RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL,    SCENE_BOTTOM_OF_THE_WELL,   10242,  0x02, "GS East Inner Room",               "Bottom of the Well GS East Inner Room",            RHT_BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM,            { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
+    locationTable[RC_BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM] =            Location::GSToken(RC_BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM,            RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL,    SCENE_BOTTOM_OF_THE_WELL,   10244,  0x04, "GS West Inner Room",               "Bottom of the Well GS West Inner Room",            RHT_BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM,            { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
+    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT] =                Location::GSToken(RC_BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT,                RCQUEST_MQ,      RCAREA_BOTTOM_OF_THE_WELL,    SCENE_BOTTOM_OF_THE_WELL,   10241,  0x01, "MQ GS Basement",                   "Bottom of the Well MQ GS Basement",                RHT_BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT,                { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
+    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM] =             Location::GSToken(RC_BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM,             RCQUEST_MQ,      RCAREA_BOTTOM_OF_THE_WELL,    SCENE_BOTTOM_OF_THE_WELL,   10244,  0x04, "MQ GS Coffin Room",                "Bottom of the Well MQ GS Coffin Room",             RHT_BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM,             { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
+    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM] =         Location::GSToken(RC_BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM,         RCQUEST_MQ,      RCAREA_BOTTOM_OF_THE_WELL,    SCENE_BOTTOM_OF_THE_WELL,   10242,  0x02, "MQ GS West Inner Room",            "Bottom of the Well MQ GS West Inner Room",         RHT_BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM,         { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
+    // Ice Cavern
+    locationTable[RC_ICE_CAVERN_GS_PUSH_BLOCK_ROOM] =                    Location::GSToken(RC_ICE_CAVERN_GS_PUSH_BLOCK_ROOM,                    RCQUEST_VANILLA, RCAREA_ICE_CAVERN,            SCENE_ICE_CAVERN,           10497,  0x01, "GS Push Block Room",               "Ice Cavern GS Push Block Room",                    RHT_ICE_CAVERN_GS_PUSH_BLOCK_ROOM,                    { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
+    locationTable[RC_ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM] =               Location::GSToken(RC_ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM,               RCQUEST_VANILLA, RCAREA_ICE_CAVERN,            SCENE_ICE_CAVERN,           10498,  0x02, "GS Spinning Scythe Room",          "Ice Cavern GS Spinning Scythe Room",               RHT_ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM,               { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
+    locationTable[RC_ICE_CAVERN_GS_HEART_PIECE_ROOM] =                   Location::GSToken(RC_ICE_CAVERN_GS_HEART_PIECE_ROOM,                   RCQUEST_VANILLA, RCAREA_ICE_CAVERN,            SCENE_ICE_CAVERN,           10500,  0x04, "GS Heart Piece Room",              "Ice Cavern GS Heart Piece Room",                   RHT_ICE_CAVERN_GS_HEART_PIECE_ROOM,                   { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
+    locationTable[RC_ICE_CAVERN_MQ_GS_SCARECROW] =                       Location::GSToken(RC_ICE_CAVERN_MQ_GS_SCARECROW,                       RCQUEST_MQ,      RCAREA_ICE_CAVERN,            SCENE_ICE_CAVERN,           10497,  0x01, "MQ GS Scarecrow",                  "Ice Cavern MQ GS Scarecrow",                       RHT_ICE_CAVERN_MQ_GS_SCARECROW,                       { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
+    locationTable[RC_ICE_CAVERN_MQ_GS_ICE_BLOCK] =                       Location::GSToken(RC_ICE_CAVERN_MQ_GS_ICE_BLOCK,                       RCQUEST_MQ,      RCAREA_ICE_CAVERN,            SCENE_ICE_CAVERN,           10500,  0x04, "MQ GS Ice Block",                  "Ice Cavern MQ GS Ice Block",                       RHT_ICE_CAVERN_MQ_GS_ICE_BLOCK,                       { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
+    locationTable[RC_ICE_CAVERN_MQ_GS_RED_ICE] =                         Location::GSToken(RC_ICE_CAVERN_MQ_GS_RED_ICE,                         RCQUEST_MQ,      RCAREA_ICE_CAVERN,            SCENE_ICE_CAVERN,           10498,  0x02, "MQ GS Red Ice",                    "Ice Cavern MQ GS Red Ice",                         RHT_ICE_CAVERN_MQ_GS_RED_ICE,                         { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
+    // Overworld
+    // Kokiri Forest RandomizerCheck                                                       RandomizerCheck                                      Quest            Area                          Scene ID                    params  Flag  Short Name                          Spoiler Name                                        Hint Text Key                                         Categories                Map Index Collection Check Group
+    locationTable[RC_KF_GS_BEAN_PATCH] =                                 Location::GSToken(RC_KF_GS_BEAN_PATCH,                                 RCQUEST_BOTH,    RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,        27649,  0x01, "GS Bean Patch",                    "KF GS Bean Patch",                                 RHT_KF_GS_BEAN_PATCH,                                 { Category::cSkulltula }, 0x0C, SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_GS_KNOW_IT_ALL_HOUSE] =                          Location::GSToken(RC_KF_GS_KNOW_IT_ALL_HOUSE,                          RCQUEST_BOTH,    RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,        19458,  0x02, "GS Know It All House",             "KF GS Know It All House",                          RHT_KF_GS_KNOW_IT_ALL_HOUSE,                          { Category::cSkulltula }, 0x0C, SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_GS_HOUSE_OF_TWINS] =                             Location::GSToken(RC_KF_GS_HOUSE_OF_TWINS,                             RCQUEST_BOTH,    RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,        19460,  0x04, "GS House of Twins",                "KF GS House of Twins",                             RHT_KF_GS_HOUSE_OF_TWINS,                             { Category::cSkulltula }, 0x0C, SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    // Lost Woods
+    locationTable[RC_LW_GS_BEAN_PATCH_NEAR_BRIDGE] =                     Location::GSToken(RC_LW_GS_BEAN_PATCH_NEAR_BRIDGE,                     RCQUEST_BOTH,    RCAREA_LOST_WOODS,            SCENE_LOST_WOODS,           27905,  0x01, "GS Bean Patch Near Bridge",        "LW GS Bean Patch Near Bridge",                     RHT_LW_GS_BEAN_PATCH_NEAR_BRIDGE,                     { Category::cSkulltula }, 0x0D, SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_LW_GS_BEAN_PATCH_NEAR_THEATER] =                    Location::GSToken(RC_LW_GS_BEAN_PATCH_NEAR_THEATER,                    RCQUEST_BOTH,    RCAREA_LOST_WOODS,            SCENE_LOST_WOODS,           27906,  0x02, "GS Bean Patch Near Theater",       "LW GS Bean Patch Near Theater",                    RHT_LW_GS_BEAN_PATCH_NEAR_THEATER,                    { Category::cSkulltula }, 0x0D, SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_LW_GS_ABOVE_THEATER] =                              Location::GSToken(RC_LW_GS_ABOVE_THEATER,                              RCQUEST_BOTH,    RCAREA_LOST_WOODS,            SCENE_LOST_WOODS,           19716,  0x04, "GS Above Theater",                 "LW GS Above Theater",                              RHT_LW_GS_ABOVE_THEATER,                              { Category::cSkulltula }, 0x0D, SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_SFM_GS] =                                           Location::GSToken(RC_SFM_GS,                                           RCQUEST_BOTH,    RCAREA_SACRED_FOREST_MEADOW,  SCENE_SACRED_FOREST_MEADOW, 19720,  0x08, "GS",                               "SFM GS",                                           RHT_SFM_GS,                                           { Category::cSkulltula }, 0x0D, SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    // Hyrule Field
+    locationTable[RC_HF_GS_COW_GROTTO] =                                 Location::GSToken(RC_HF_GS_COW_GROTTO,                                 RCQUEST_BOTH,    RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,              10753,  0x01, "GS Cow Grotto",                    "HF GS Cow Grotto",                                 RHT_HF_GS_COW_GROTTO,                                 { Category::cSkulltula }, 0x0A, SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_HF_GS_NEAR_KAK_GROTTO] =                            Location::GSToken(RC_HF_GS_NEAR_KAK_GROTTO,                            RCQUEST_BOTH,    RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,              10754,  0x02, "GS Near Kak Grotto",               "HF GS Near Kak Grotto",                            RHT_HF_GS_NEAR_KAK_GROTTO,                            { Category::cSkulltula }, 0x0A, SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    // Lake Hylia
+    locationTable[RC_LH_GS_BEAN_PATCH] =                                 Location::GSToken(RC_LH_GS_BEAN_PATCH,                                 RCQUEST_BOTH,    RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,           29185,  0x01, "GS Bean Patch",                    "LH GS Bean Patch",                                 RHT_LH_GS_BEAN_PATCH,                                 { Category::cSkulltula }, 0x12, SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_GS_SMALL_ISLAND] =                               Location::GSToken(RC_LH_GS_SMALL_ISLAND,                               RCQUEST_BOTH,    RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,           20994,  0x02, "GS Small Island",                  "LH GS Small Island",                               RHT_LH_GS_SMALL_ISLAND,                               { Category::cSkulltula }, 0x12, SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_GS_LAB_WALL] =                                   Location::GSToken(RC_LH_GS_LAB_WALL,                                   RCQUEST_BOTH,    RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,           20996,  0x04, "GS Lab Wall",                      "LH GS Lab Wall",                                   RHT_LH_GS_LAB_WALL,                                   { Category::cSkulltula }, 0x12, SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_GS_LAB_CRATE] =                                  Location::GSToken(RC_LH_GS_LAB_CRATE,                                  RCQUEST_BOTH,    RCAREA_LAKE_HYLIA,            SCENE_LAKESIDE_LABORATORY,  -28152, 0x08, "GS Lab Crate",                     "LH GS Lab Crate",                                  RHT_LH_GS_LAB_CRATE,                                  { Category::cSkulltula }, 0x12, SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_GS_TREE] =                                       Location::GSToken(RC_LH_GS_TREE,                                       RCQUEST_BOTH,    RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,           21008,  0x10, "GS Tree",                          "LH GS Tree",                                       RHT_LH_GS_TREE,                                       { Category::cSkulltula }, 0x12, SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    // Gerudo Valley
+    locationTable[RC_GV_GS_BEAN_PATCH] =                                 Location::GSToken(RC_GV_GS_BEAN_PATCH,                                 RCQUEST_BOTH,    RCAREA_GERUDO_VALLEY,         SCENE_GERUDO_VALLEY,        29441,  0x01, "GS Bean Patch",                    "GV GS Bean Patch",                                 RHT_GV_GS_BEAN_PATCH,                                 { Category::cSkulltula }, 0x13, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_GV_GS_SMALL_BRIDGE] =                               Location::GSToken(RC_GV_GS_SMALL_BRIDGE,                               RCQUEST_BOTH,    RCAREA_GERUDO_VALLEY,         SCENE_GERUDO_VALLEY,        21250,  0x02, "GS Small Bridge",                  "GV GS Small Bridge",                               RHT_GV_GS_SMALL_BRIDGE,                               { Category::cSkulltula }, 0x13, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_GV_GS_PILLAR] =                                     Location::GSToken(RC_GV_GS_PILLAR,                                     RCQUEST_BOTH,    RCAREA_GERUDO_VALLEY,         SCENE_GERUDO_VALLEY,        21252,  0x04, "GS Pillar",                        "GV GS Pillar",                                     RHT_GV_GS_PILLAR,                                     { Category::cSkulltula }, 0x13, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_GV_GS_BEHIND_TENT] =                                Location::GSToken(RC_GV_GS_BEHIND_TENT,                                RCQUEST_BOTH,    RCAREA_GERUDO_VALLEY,         SCENE_GERUDO_VALLEY,        21256,  0x08, "GS Behind Tent",                   "GV GS Behind Tent",                                RHT_GV_GS_BEHIND_TENT,                                { Category::cSkulltula }, 0x13, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    // Gerudo Fortress
+    locationTable[RC_GF_GS_ARCHERY_RANGE] =                              Location::GSToken(RC_GF_GS_ARCHERY_RANGE,                              RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,       SCENE_GERUDOS_FORTRESS,     21505,  0x01, "GS Archery Range",                 "GF GS Archery Range",                              RHT_GF_GS_ARCHERY_RANGE,                              { Category::cSkulltula }, 0x14, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_GF_GS_TOP_FLOOR] =                                  Location::GSToken(RC_GF_GS_TOP_FLOOR,                                  RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,       SCENE_GERUDOS_FORTRESS,     21506,  0x02, "GS Top Floor",                     "GF GS Top Floor",                                  RHT_GF_GS_TOP_FLOOR,                                  { Category::cSkulltula }, 0x14, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    // Wasteland & Desert Colossus
+    locationTable[RC_WASTELAND_GS] =                                     Location::GSToken(RC_WASTELAND_GS,                                     RCQUEST_BOTH,    RCAREA_WASTELAND,             SCENE_HAUNTED_WASTELAND,    13570,  0x02, "GS",                               "Wasteland GS",                                     RHT_WASTELAND_GS,                                     { Category::cSkulltula }, 0x15, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_COLOSSUS_GS_BEAN_PATCH] =                           Location::GSToken(RC_COLOSSUS_GS_BEAN_PATCH,                           RCQUEST_BOTH,    RCAREA_DESERT_COLOSSUS,       SCENE_DESERT_COLOSSUS,      29953,  0x01, "GS Bean Patch",                    "Colossus GS Bean Patch",                           RHT_COLOSSUS_GS_BEAN_PATCH,                           { Category::cSkulltula }, 0x15, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_COLOSSUS_GS_HILL] =                                 Location::GSToken(RC_COLOSSUS_GS_HILL,                                 RCQUEST_BOTH,    RCAREA_DESERT_COLOSSUS,       SCENE_DESERT_COLOSSUS,      21764,  0x04, "GS Hill",                          "Colossus GS Hill",                                 RHT_COLOSSUS_GS_HILL,                                 { Category::cSkulltula }, 0x15, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_COLOSSUS_GS_TREE] =                                 Location::GSToken(RC_COLOSSUS_GS_TREE,                                 RCQUEST_BOTH,    RCAREA_DESERT_COLOSSUS,       SCENE_DESERT_COLOSSUS,      21768,  0x08, "GS Tree",                          "Colossus GS Tree",                                 RHT_COLOSSUS_GS_TREE,                                 { Category::cSkulltula }, 0x15, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    // Hyrule Castle, Market, and Outside Ganon's Castle
+    locationTable[RC_OGC_GS] =                                           Location::GSToken(RC_OGC_GS,                                           RCQUEST_BOTH,    RCAREA_HYRULE_CASTLE,         SCENE_OUTSIDE_GANONS_CASTLE,11777,  0x01, "OGC GS",                           "OGC GS",                                           RHT_OGC_GS,                                           { Category::cSkulltula }, 0x0E, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_HC_GS_STORMS_GROTTO] =                              Location::GSToken(RC_HC_GS_STORMS_GROTTO,                              RCQUEST_BOTH,    RCAREA_HYRULE_CASTLE,         SCENE_GROTTOS,              11778,  0x02, "GS Storms Grotto",                 "HC GS Storms Grotto",                              RHT_HC_GS_STORMS_GROTTO,                              { Category::cSkulltula }, 0x0E, SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_HC_GS_TREE] =                                       Location::GSToken(RC_HC_GS_TREE,                                       RCQUEST_BOTH,    RCAREA_HYRULE_CASTLE,         SCENE_HYRULE_CASTLE,        -29180, 0x04, "GS Tree",                          "HC GS Tree",                                       RHT_HC_GS_TREE,                                       { Category::cSkulltula }, 0x0E, SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_GS_GUARD_HOUSE] =                            Location::GSToken(RC_MARKET_GS_GUARD_HOUSE,                            RCQUEST_BOTH,    RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,   -29176, 0x08, "Market GS Guard House",            "Market GS Guard House",                            RHT_MARKET_GS_GUARD_HOUSE,                            { Category::cSkulltula }, 0x0E, SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    // Kakariko
+    locationTable[RC_KAK_GS_HOUSE_UNDER_CONSTRUCTION] =                  Location::GSToken(RC_KAK_GS_HOUSE_UNDER_CONSTRUCTION,                  RCQUEST_BOTH,    RCAREA_KAKARIKO_VILLAGE,      SCENE_KAKARIKO_VILLAGE,     20488,  0x08, "GS House Under Construction",      "Kak GS House Under Construction",                  RHT_KAK_GS_HOUSE_UNDER_CONSTRUCTION,                  { Category::cSkulltula }, 0x10, SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_GS_SKULLTULA_HOUSE] =                           Location::GSToken(RC_KAK_GS_SKULLTULA_HOUSE,                           RCQUEST_BOTH,    RCAREA_KAKARIKO_VILLAGE,      SCENE_KAKARIKO_VILLAGE,     20496,  0x10, "GS Skulltula House",               "Kak GS Skulltula House",                           RHT_KAK_GS_SKULLTULA_HOUSE,                           { Category::cSkulltula }, 0x10, SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_GS_GUARDS_HOUSE] =                              Location::GSToken(RC_KAK_GS_GUARDS_HOUSE,                              RCQUEST_BOTH,    RCAREA_KAKARIKO_VILLAGE,      SCENE_KAKARIKO_VILLAGE,     20482,  0x02, "GS Guards House",                  "Kak GS Guards House",                              RHT_KAK_GS_GUARDS_HOUSE,                              { Category::cSkulltula }, 0x10, SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_GS_TREE] =                                      Location::GSToken(RC_KAK_GS_TREE,                                      RCQUEST_BOTH,    RCAREA_KAKARIKO_VILLAGE,      SCENE_KAKARIKO_VILLAGE,     -28640, 0x20, "GS Tree",                          "Kak GS Tree",                                      RHT_KAK_GS_TREE,                                      { Category::cSkulltula }, 0x10, SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_GS_WATCHTOWER] =                                Location::GSToken(RC_KAK_GS_WATCHTOWER,                                RCQUEST_BOTH,    RCAREA_KAKARIKO_VILLAGE,      SCENE_KAKARIKO_VILLAGE,     20484,  0x04, "GS Watchtower",                    "Kak GS Watchtower",                                RHT_KAK_GS_WATCHTOWER,                                { Category::cSkulltula }, 0x10, SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_GS_ABOVE_IMPAS_HOUSE] =                         Location::GSToken(RC_KAK_GS_ABOVE_IMPAS_HOUSE,                         RCQUEST_BOTH,    RCAREA_KAKARIKO_VILLAGE,      SCENE_KAKARIKO_VILLAGE,     20544,  0x40, "GS Above Impas House",             "Kak GS Above Impas House",                         RHT_KAK_GS_ABOVE_IMPAS_HOUSE,                         { Category::cSkulltula }, 0x10, SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    // Graveyard
+    locationTable[RC_GRAVEYARD_GS_WALL] =                                Location::GSToken(RC_GRAVEYARD_GS_WALL,                                RCQUEST_BOTH,    RCAREA_GRAVEYARD,             SCENE_GRAVEYARD,            20608,  0x80, "GS Wall",                          "Graveyard GS Wall",                                RHT_GRAVEYARD_GS_WALL,                                { Category::cSkulltula }, 0x10, SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_GRAVEYARD_GS_BEAN_PATCH] =                          Location::GSToken(RC_GRAVEYARD_GS_BEAN_PATCH,                          RCQUEST_BOTH,    RCAREA_GRAVEYARD,             SCENE_GRAVEYARD,            28673,  0x01, "GS Bean Patch",                    "Graveyard GS Bean Patch",                          RHT_GRAVEYARD_GS_BEAN_PATCH,                          { Category::cSkulltula }, 0x10, SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    // Death Mountain
+    locationTable[RC_DMC_GS_BEAN_PATCH] =                                Location::GSToken(RC_DMC_GS_BEAN_PATCH,                                RCQUEST_BOTH,    RCAREA_DEATH_MOUNTAIN_CRATER, SCENE_DEATH_MOUNTAIN_CRATER,28417,  0x01, "GS Bean Patch",                    "DMC GS Bean Patch",                                RHT_DMC_GS_BEAN_PATCH,                                { Category::cSkulltula }, 0x0F, SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMC_GS_CRATE] =                                     Location::GSToken(RC_DMC_GS_CRATE,                                     RCQUEST_BOTH,    RCAREA_DEATH_MOUNTAIN_CRATER, SCENE_DEATH_MOUNTAIN_CRATER,-28800, 0x80, "GS Crate",                         "DMC GS Crate",                                     RHT_DMC_GS_CRATE,                                     { Category::cSkulltula }, 0x0F, SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMT_GS_BEAN_PATCH] =                                Location::GSToken(RC_DMT_GS_BEAN_PATCH,                                RCQUEST_BOTH,    RCAREA_DEATH_MOUNTAIN_TRAIL,  SCENE_DEATH_MOUNTAIN_TRAIL, 28418,  0x02, "GS Bean Patch",                    "DMT GS Bean Patch",                                RHT_DMT_GS_BEAN_PATCH,                                { Category::cSkulltula }, 0x0F, SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMT_GS_NEAR_KAK] =                                  Location::GSToken(RC_DMT_GS_NEAR_KAK,                                  RCQUEST_BOTH,    RCAREA_DEATH_MOUNTAIN_TRAIL,  SCENE_DEATH_MOUNTAIN_TRAIL, 12036,  0x04, "GS Near Kak",                      "DMT GS Near Kak",                                  RHT_DMT_GS_NEAR_KAK,                                  { Category::cSkulltula }, 0x0F, SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMT_GS_ABOVE_DODONGOS_CAVERN] =                     Location::GSToken(RC_DMT_GS_ABOVE_DODONGOS_CAVERN,                     RCQUEST_BOTH,    RCAREA_DEATH_MOUNTAIN_TRAIL,  SCENE_DEATH_MOUNTAIN_TRAIL, 20232,  0x08, "GS Above Dodongos Cavern",         "DMT GS Above Dodongos Cavern",                     RHT_DMT_GS_ABOVE_DODONGOS_CAVERN,                     { Category::cSkulltula }, 0x0F, SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMT_GS_FALLING_ROCKS_PATH] =                        Location::GSToken(RC_DMT_GS_FALLING_ROCKS_PATH,                        RCQUEST_BOTH,    RCAREA_DEATH_MOUNTAIN_TRAIL,  SCENE_DEATH_MOUNTAIN_TRAIL, 20240,  0x10, "GS Falling Rocks Path",            "DMT GS Falling Rocks Path",                        RHT_DMT_GS_FALLING_ROCKS_PATH,                        { Category::cSkulltula }, 0x0F, SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_GC_GS_CENTER_PLATFORM] =                            Location::GSToken(RC_GC_GS_CENTER_PLATFORM,                            RCQUEST_BOTH,    RCAREA_GORON_CITY,            SCENE_GORON_CITY,           12064,  0x20, "GS Center Platform",               "GC GS Center Platform",                            RHT_GC_GS_CENTER_PLATFORM,                            { Category::cSkulltula }, 0x0F, SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_GS_BOULDER_MAZE] =                               Location::GSToken(RC_GC_GS_BOULDER_MAZE,                               RCQUEST_BOTH,    RCAREA_GORON_CITY,            SCENE_GORON_CITY,           -28864, 0x40, "GS Boulder Maze",                  "GC GS Boulder Maze",                               RHT_GC_GS_BOULDER_MAZE,                               { Category::cSkulltula }, 0x0F, SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    // Zora's River, Domain, and Fountain
+    locationTable[RC_ZR_GS_LADDER] =                                     Location::GSToken(RC_ZR_GS_LADDER,                                     RCQUEST_BOTH,    RCAREA_ZORAS_RIVER,           SCENE_ZORAS_RIVER,          20737,  0x01, "GS Ladder",                        "ZR GS Ladder",                                     RHT_ZR_GS_LADDER,                                     { Category::cSkulltula }, 0x11, SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZR_GS_TREE] =                                       Location::GSToken(RC_ZR_GS_TREE,                                       RCQUEST_BOTH,    RCAREA_ZORAS_RIVER,           SCENE_ZORAS_RIVER,          -28414, 0x02, "GS Tree",                          "ZR GS Tree",                                       RHT_ZR_GS_TREE,                                       { Category::cSkulltula }, 0x11, SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZR_GS_ABOVE_BRIDGE] =                               Location::GSToken(RC_ZR_GS_ABOVE_BRIDGE,                               RCQUEST_BOTH,    RCAREA_ZORAS_RIVER,           SCENE_ZORAS_RIVER,          20744,  0x08, "GS Above Bridge",                  "ZR GS Above Bridge",                               RHT_ZR_GS_ABOVE_BRIDGE,                               { Category::cSkulltula }, 0x11, SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZR_GS_NEAR_RAISED_GROTTOS] =                        Location::GSToken(RC_ZR_GS_NEAR_RAISED_GROTTOS,                        RCQUEST_BOTH,    RCAREA_ZORAS_RIVER,           SCENE_ZORAS_RIVER,          20752,  0x10, "GS Near Raised Grottos",           "ZR GS Near Raised Grottos",                        RHT_ZR_GS_NEAR_RAISED_GROTTOS,                        { Category::cSkulltula }, 0x11, SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZD_GS_FROZEN_WATERFALL] =                           Location::GSToken(RC_ZD_GS_FROZEN_WATERFALL,                           RCQUEST_BOTH,    RCAREA_ZORAS_DOMAIN,          SCENE_ZORAS_DOMAIN,         20800,  0x40, "GS Frozen Waterfall",              "ZD GS Frozen Waterfall",                           RHT_ZD_GS_FROZEN_WATERFALL,                           { Category::cSkulltula }, 0x11, SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZF_GS_ABOVE_THE_LOG] =                              Location::GSToken(RC_ZF_GS_ABOVE_THE_LOG,                              RCQUEST_BOTH,    RCAREA_ZORAS_FOUNTAIN,        SCENE_ZORAS_FOUNTAIN,       20740,  0x04, "GS Above The Log",                 "ZF GS Above The Log",                              RHT_ZF_GS_ABOVE_THE_LOG,                              { Category::cSkulltula }, 0x11, SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZF_GS_HIDDEN_CAVE] =                                Location::GSToken(RC_ZF_GS_HIDDEN_CAVE,                                RCQUEST_BOTH,    RCAREA_ZORAS_FOUNTAIN,        SCENE_ZORAS_FOUNTAIN,       20768,  0x20, "GS Hidden Cave",                   "ZF GS Hidden Cave",                                RHT_ZF_GS_HIDDEN_CAVE,                                { Category::cSkulltula }, 0x11, SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZF_GS_TREE] =                                       Location::GSToken(RC_ZF_GS_TREE,                                       RCQUEST_BOTH,    RCAREA_ZORAS_FOUNTAIN,        SCENE_ZORAS_FOUNTAIN,       -28288, 0x80, "GS Tree",                          "ZF GS Tree",                                       RHT_ZF_GS_TREE,                                       { Category::cSkulltula }, 0x11, SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    // Lon Lon Ranch
+    locationTable[RC_LLR_GS_BACK_WALL] =                                 Location::GSToken(RC_LLR_GS_BACK_WALL,                                 RCQUEST_BOTH,    RCAREA_LON_LON_RANCH,         SCENE_LON_LON_RANCH,        11009,  0x01, "GS Back Wall",                     "LLR GS Back Wall",                                 RHT_LLR_GS_BACK_WALL,                                 { Category::cSkulltula }, 0x0B, SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
+    locationTable[RC_LLR_GS_RAIN_SHED] =                                 Location::GSToken(RC_LLR_GS_RAIN_SHED,                                 RCQUEST_BOTH,    RCAREA_LON_LON_RANCH,         SCENE_LON_LON_RANCH,        11010,  0x02, "GS Rain Shed",                     "LLR GS Rain Shed",                                 RHT_LLR_GS_RAIN_SHED,                                 { Category::cSkulltula }, 0x0B, SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
+    locationTable[RC_LLR_GS_HOUSE_WINDOW] =                              Location::GSToken(RC_LLR_GS_HOUSE_WINDOW,                              RCQUEST_BOTH,    RCAREA_LON_LON_RANCH,         SCENE_LON_LON_RANCH,        11012,  0x04, "GS House Window",                  "LLR GS House Window",                              RHT_LLR_GS_HOUSE_WINDOW,                              { Category::cSkulltula }, 0x0B, SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
+    locationTable[RC_LLR_GS_TREE] =                                      Location::GSToken(RC_LLR_GS_TREE,                                      RCQUEST_BOTH,    RCAREA_LON_LON_RANCH,         SCENE_LON_LON_RANCH,        -29944, 0x08, "GS Tree",                          "LLR GS Tree",                                      RHT_LLR_GS_TREE,                                      { Category::cSkulltula }, 0x0B, SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
+
+    // Bosses     Randomizer Check                       Randomizer Check    Quest         Type                   Area                     Actor ID          Scene ID                    Params Flags                                      Short Name         Spoiler Name       Hint Text Key      Vanilla Item        Categories Spoiler Collection Check             Collection Check Group                                      Vanilla Progression
+    locationTable[RC_LINKS_POCKET] =    Location::Reward(RC_LINKS_POCKET,    RCQUEST_BOTH, RCTYPE_LINKS_POCKET,   RCAREA_KOKIRI_FOREST,    ACTOR_ID_MAX,     SCENE_ID_MAX,               0x00, 0x00,                                       "Link's Pocket",   "Link's Pocket",   RHT_LINKS_POCKET,  RG_LIGHT_MEDALLION,  {}, SpoilerCollectionCheck::AlwaysCollected(), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST,           true);
+    locationTable[RC_QUEEN_GOHMA] =     Location::Reward( RC_QUEEN_GOHMA,    RCQUEST_BOTH, RCTYPE_DUNGEON_REWARD, RCAREA_DEKU_TREE,        ACTOR_DOOR_WARP1, SCENE_DEKU_TREE_BOSS,       0x00, DungeonId::DUNGEON_DEKU_TREE,               "Queen Gohma",     "Queen Gohma",     RHT_QUEEN_GOHMA,   RG_KOKIRI_EMERALD,   {}, SpoilerCollectionCheck::Chest(0x11, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE,       true);
+    locationTable[RC_KING_DODONGO] =    Location::Reward(RC_KING_DODONGO,    RCQUEST_BOTH, RCTYPE_DUNGEON_REWARD, RCAREA_DODONGOS_CAVERN,  ACTOR_DOOR_WARP1, SCENE_DODONGOS_CAVERN_BOSS, 0x00, DungeonId::DUNGEON_DODONGOS_CAVERN,         "King Dodongo",    "King Dodongo",    RHT_KING_DODONGO,  RG_GORON_RUBY,       {}, SpoilerCollectionCheck::Chest(0x12, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN, true);
+    locationTable[RC_BARINADE] =        Location::Reward(RC_BARINADE,        RCQUEST_BOTH, RCTYPE_DUNGEON_REWARD, RCAREA_JABU_JABUS_BELLY, ACTOR_DOOR_WARP1, SCENE_JABU_JABU_BOSS,       0x00, DungeonId::DUNGEON_JABUJABUS_BELLY,         "Barinade",        "Barinade",        RHT_BARINADE,      RG_ZORA_SAPPHIRE,    {}, SpoilerCollectionCheck::Chest(0x13, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY, true);
+    locationTable[RC_PHANTOM_GANON] =   Location::Reward(RC_PHANTOM_GANON,   RCQUEST_BOTH, RCTYPE_DUNGEON_REWARD, RCAREA_FOREST_TEMPLE,    ACTOR_DOOR_WARP1, SCENE_FOREST_TEMPLE_BOSS,   0x00, DungeonId::DUNGEON_FOREST_TEMPLE,           "Phantom Ganon",   "Phantom Ganon",   RHT_PHANTOM_GANON, RG_FOREST_MEDALLION, {}, SpoilerCollectionCheck::Chest(0x14, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,   true);
+    locationTable[RC_VOLVAGIA] =        Location::Reward(RC_VOLVAGIA,        RCQUEST_BOTH, RCTYPE_DUNGEON_REWARD, RCAREA_FIRE_TEMPLE,      ACTOR_DOOR_WARP1, SCENE_FIRE_TEMPLE_BOSS,     0x00, DungeonId::DUNGEON_FIRE_TEMPLE,             "Volvagia",        "Volvagia",        RHT_VOLVAGIA,      RG_FIRE_MEDALLION,   {}, SpoilerCollectionCheck::Chest(0x15, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,     true);
+    locationTable[RC_MORPHA] =          Location::Reward(RC_MORPHA,          RCQUEST_BOTH, RCTYPE_DUNGEON_REWARD, RCAREA_WATER_TEMPLE,     ACTOR_DOOR_WARP1, SCENE_WATER_TEMPLE_BOSS,    0x00, DungeonId::DUNGEON_WATER_TEMPLE,            "Morpha",          "Morpha",          RHT_MORPHA,        RG_WATER_MEDALLION,  {}, SpoilerCollectionCheck::Chest(0x16, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,    true);
+    locationTable[RC_TWINROVA] =        Location::Reward(RC_TWINROVA,        RCQUEST_BOTH, RCTYPE_DUNGEON_REWARD, RCAREA_SPIRIT_TEMPLE,    ACTOR_DOOR_WARP1, SCENE_SPIRIT_TEMPLE_BOSS,   0x00, DungeonId::DUNGEON_SPIRIT_TEMPLE,           "Twinrova",        "Twinrova",        RHT_TWINROVA,      RG_SPIRIT_MEDALLION, {}, SpoilerCollectionCheck::Chest(0x17, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,   true);
+    locationTable[RC_BONGO_BONGO] =     Location::Reward(RC_BONGO_BONGO,     RCQUEST_BOTH, RCTYPE_DUNGEON_REWARD, RCAREA_SHADOW_TEMPLE,    ACTOR_DOOR_WARP1, SCENE_SHADOW_TEMPLE_BOSS,   0x00, DungeonId::DUNGEON_SHADOW_TEMPLE,           "Bongo Bongo",     "Bongo Bongo",     RHT_BONGO_BONGO,   RG_SHADOW_MEDALLION, {}, SpoilerCollectionCheck::Chest(0x18, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,   true);
+    locationTable[RC_GANON] =           Location::Reward(RC_GANON,           RCQUEST_BOTH, RCTYPE_DUNGEON_REWARD, RCAREA_GANONS_CASTLE,    ACTOR_DOOR_WARP1, SCENE_GANON_BOSS,           0x00, DungeonId::DUNGEON_GANONS_CASTLE_CRUMBLING, "Ganon",           "Ganon",           RHT_NONE,          RG_TRIFORCE,         {}, SpoilerCollectionCheck::None(),            SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GIFT_FROM_SAGES] = Location::Reward(RC_GIFT_FROM_SAGES, RCQUEST_BOTH, RCTYPE_DUNGEON_REWARD, RCAREA_MARKET,           ACTOR_ID_MAX,     SCENE_ID_MAX,               0x00, 0x00,                                       "Gift from Raoru", "Gift from Raoru", RHT_NONE,          RG_LIGHT_MEDALLION,  {}, SpoilerCollectionCheck::None(),            SpoilerCollectionCheckGroup::GROUP_NO_GROUP,                true);
+
+    // Heart Containers     Randomizer Check                              Randomizer Check                       Quest         Type                               Area                     Actor ID            Scene ID                    Params Flags Short Name                      Spoiler Name                                    Hint Text Key                           Vanilla Item        Categories                        Spoiler Collection Check                         Collection Check Group                                      Vanilla Progression
+    locationTable[RC_DEKU_TREE_QUEEN_GOHMA_HEART] =        Location::Base(RC_DEKU_TREE_QUEEN_GOHMA_HEART,        RCQUEST_BOTH, RCTYPE_BOSS_HEART_OR_OTHER_REWARD, RCAREA_DEKU_TREE,        ACTOR_ITEM_B_HEART, SCENE_DEKU_TREE_BOSS,       0x00, 0x4F, "Queen Gohma Heart Container",   "Deku Tree Queen Gohma Heart Container",        RHT_DEKU_TREE_QUEEN_GOHMA_HEART,        RG_HEART_CONTAINER, { Category::cSongDungeonReward }, SpoilerCollectionCheck::Collectable(0x11, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE,       true);
+    locationTable[RC_DODONGOS_CAVERN_KING_DODONGO_HEART] = Location::Base(RC_DODONGOS_CAVERN_KING_DODONGO_HEART, RCQUEST_BOTH, RCTYPE_BOSS_HEART_OR_OTHER_REWARD, RCAREA_DODONGOS_CAVERN,  ACTOR_ITEM_B_HEART, SCENE_DODONGOS_CAVERN_BOSS, 0x00, 0x4F, "King Dodongo Heart Container",  "Dodongos Cavern King Dodongo Heart Container", RHT_DODONGOS_CAVERN_KING_DODONGO_HEART, RG_HEART_CONTAINER, { Category::cSongDungeonReward }, SpoilerCollectionCheck::Collectable(0x12, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN, true);
+    locationTable[RC_JABU_JABUS_BELLY_BARINADE_HEART] =    Location::Base(RC_JABU_JABUS_BELLY_BARINADE_HEART,    RCQUEST_BOTH, RCTYPE_BOSS_HEART_OR_OTHER_REWARD, RCAREA_JABU_JABUS_BELLY, ACTOR_ITEM_B_HEART, SCENE_JABU_JABU_BOSS,       0x00, 0x4F, "Barinade Heart Container",      "Jabu Jabus Belly Barinade Heart Container",    RHT_JABU_JABUS_BELLY_BARINADE_HEART,    RG_HEART_CONTAINER, { Category::cSongDungeonReward }, SpoilerCollectionCheck::Collectable(0x13, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY, true);
+    locationTable[RC_FOREST_TEMPLE_PHANTOM_GANON_HEART] =  Location::Base(RC_FOREST_TEMPLE_PHANTOM_GANON_HEART,  RCQUEST_BOTH, RCTYPE_BOSS_HEART_OR_OTHER_REWARD, RCAREA_FOREST_TEMPLE,    ACTOR_ITEM_B_HEART, SCENE_FOREST_TEMPLE_BOSS,   0x00, 0x4F, "Phantom Ganon Heart Container", "Forest Temple Phantom Ganon Heart Container",  RHT_FOREST_TEMPLE_PHANTOM_GANON_HEART,  RG_HEART_CONTAINER, { Category::cSongDungeonReward }, SpoilerCollectionCheck::Collectable(0x14, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,   true);
+    locationTable[RC_FIRE_TEMPLE_VOLVAGIA_HEART] =         Location::Base(RC_FIRE_TEMPLE_VOLVAGIA_HEART,         RCQUEST_BOTH, RCTYPE_BOSS_HEART_OR_OTHER_REWARD, RCAREA_FIRE_TEMPLE,      ACTOR_ITEM_B_HEART, SCENE_FIRE_TEMPLE_BOSS,     0x00, 0x4F, "Volvagia Heart Container",      "Fire Temple Volvagia Heart Container",         RHT_FIRE_TEMPLE_VOLVAGIA_HEART,         RG_HEART_CONTAINER, { Category::cSongDungeonReward }, SpoilerCollectionCheck::Collectable(0x15, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,     true);
+    locationTable[RC_WATER_TEMPLE_MORPHA_HEART] =          Location::Base(RC_WATER_TEMPLE_MORPHA_HEART,          RCQUEST_BOTH, RCTYPE_BOSS_HEART_OR_OTHER_REWARD, RCAREA_WATER_TEMPLE,     ACTOR_ITEM_B_HEART, SCENE_WATER_TEMPLE_BOSS,    0x00, 0x4F, "Morpha Heart Container",        "Water Temple Morpha Heart Container",          RHT_WATER_TEMPLE_MORPHA_HEART,          RG_HEART_CONTAINER, { Category::cSongDungeonReward }, SpoilerCollectionCheck::Collectable(0x16, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,    true);
+    locationTable[RC_SPIRIT_TEMPLE_TWINROVA_HEART] =       Location::Base(RC_SPIRIT_TEMPLE_TWINROVA_HEART,       RCQUEST_BOTH, RCTYPE_BOSS_HEART_OR_OTHER_REWARD, RCAREA_SPIRIT_TEMPLE,    ACTOR_ITEM_B_HEART, SCENE_SPIRIT_TEMPLE_BOSS,   0x00, 0x4F, "Twinrova Heart Container",      "Spirit Temple Twinrova Heart Container",       RHT_SPIRIT_TEMPLE_TWINROVA_HEART,       RG_HEART_CONTAINER, { Category::cSongDungeonReward }, SpoilerCollectionCheck::Collectable(0x17, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,   true);
+    locationTable[RC_SHADOW_TEMPLE_BONGO_BONGO_HEART] =    Location::Base(RC_SHADOW_TEMPLE_BONGO_BONGO_HEART,    RCQUEST_BOTH, RCTYPE_BOSS_HEART_OR_OTHER_REWARD, RCAREA_SHADOW_TEMPLE,    ACTOR_ITEM_B_HEART, SCENE_SHADOW_TEMPLE_BOSS,   0x00, 0x4F, "Bongo Bongo Heart Container",   "Shadow Temple Bongo Bongo Heart Container",    RHT_SHADOW_TEMPLE_BONGO_BONGO_HEART,    RG_HEART_CONTAINER, { Category::cSongDungeonReward }, SpoilerCollectionCheck::Collectable(0x18, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,   true);
+
+    // Cutscenes  Randomizer Check                                    Randomizer Check                Quest         Type             Area                          Actor ID             Scene ID                            Params Flags Short Name                 Spoiler Name                   Hint Text Key                    Vanilla Item                Categories Spoiler Collection Check            Collection Check Group                                    Vanilla Progression
+    locationTable[RC_TOT_LIGHT_ARROWS_CUTSCENE] =   Location::Delayed(RC_TOT_LIGHT_ARROWS_CUTSCENE,   RCQUEST_BOTH, RCTYPE_STANDARD, RCAREA_MARKET,                ACTOR_ID_MAX,        SCENE_ID_MAX,                       0x00, 0x01, "ToT Light Arrow Cutscene", "ToT Light Arrow Cutscene",    RHT_TOT_LIGHT_ARROWS_CUTSCENE,   RG_LIGHT_ARROWS,            {}, SpoilerCollectionCheck::Chest(0x43, 0x1E), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,         true);
+    locationTable[RC_LW_GIFT_FROM_SARIA] =          Location::Delayed(RC_LW_GIFT_FROM_SARIA,          RCQUEST_BOTH, RCTYPE_OCARINA,  RCAREA_LOST_WOODS,            ACTOR_ID_MAX,        SCENE_LOST_WOODS,                   0x00, 0x02, "Gift From Saria",          "LW Gift From Saria",          RHT_LW_GIFT_FROM_SARIA,          RG_PROGRESSIVE_OCARINA,     {}, SpoilerCollectionCheck::EventChkInf(0xC1), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,            true);
+    locationTable[RC_ZF_GREAT_FAIRY_REWARD] =       Location::Delayed(RC_ZF_GREAT_FAIRY_REWARD,       RCQUEST_BOTH, RCTYPE_STANDARD, RCAREA_ZORAS_FOUNTAIN,        ACTOR_BG_DY_YOSEIZO, SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 1,    0x10, "Great Fairy Reward",       "ZF Great Fairy Reward",       RHT_ZF_GREAT_FAIRY_REWARD,       RG_FARORES_WIND,            {}, SpoilerCollectionCheck::Chest(0x3D, 0x01), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,          true);
+    locationTable[RC_HC_GREAT_FAIRY_REWARD] =       Location::Delayed(RC_HC_GREAT_FAIRY_REWARD,       RCQUEST_BOTH, RCTYPE_STANDARD, RCAREA_HYRULE_CASTLE,         ACTOR_BG_DY_YOSEIZO, SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 2,    0x11, "Great Fairy Reward",       "HC Great Fairy Reward",       RHT_HC_GREAT_FAIRY_REWARD,       RG_DINS_FIRE,               {}, SpoilerCollectionCheck::Chest(0x3D, 0x02), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,         true);
+    locationTable[RC_COLOSSUS_GREAT_FAIRY_REWARD] = Location::Delayed(RC_COLOSSUS_GREAT_FAIRY_REWARD, RCQUEST_BOTH, RCTYPE_STANDARD, RCAREA_DESERT_COLOSSUS,       ACTOR_BG_DY_YOSEIZO, SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 3,    0x12, "Great Fairy Reward",       "Colossus Great Fairy Reward", RHT_COLOSSUS_GREAT_FAIRY_REWARD, RG_NAYRUS_LOVE,             {}, SpoilerCollectionCheck::Chest(0x3D, 0x03), SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,         true);
+    locationTable[RC_DMT_GREAT_FAIRY_REWARD] =      Location::Delayed(RC_DMT_GREAT_FAIRY_REWARD,      RCQUEST_BOTH, RCTYPE_STANDARD, RCAREA_DEATH_MOUNTAIN_TRAIL,  ACTOR_BG_DY_YOSEIZO, SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC,  1,    0x13, "Great Fairy Reward",       "DMT Great Fairy Reward",      RHT_DMT_GREAT_FAIRY_REWARD,      RG_PROGRESSIVE_MAGIC_METER, {}, SpoilerCollectionCheck::Chest(0x3B, 0x01), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,        true);
+    locationTable[RC_DMC_GREAT_FAIRY_REWARD] =      Location::Delayed(RC_DMC_GREAT_FAIRY_REWARD,      RCQUEST_BOTH, RCTYPE_STANDARD, RCAREA_DEATH_MOUNTAIN_CRATER, ACTOR_BG_DY_YOSEIZO, SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC,  2,    0x14, "Great Fairy Reward",       "DMC Great Fairy Reward",      RHT_DMC_GREAT_FAIRY_REWARD,      RG_PROGRESSIVE_MAGIC_METER, {}, SpoilerCollectionCheck::Chest(0x3B, 0x02), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,        true);
+    locationTable[RC_OGC_GREAT_FAIRY_REWARD] =      Location::Delayed(RC_OGC_GREAT_FAIRY_REWARD,      RCQUEST_BOTH, RCTYPE_STANDARD, RCAREA_HYRULE_CASTLE,         ACTOR_BG_DY_YOSEIZO, SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC,  3,    0x15, "OGC Great Fairy Reward",   "OGC Great Fairy Reward",      RHT_OGC_GREAT_FAIRY_REWARD,      RG_DOUBLE_DEFENSE,          {}, SpoilerCollectionCheck::Chest(0x3B, 0x03), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE, true);
+
+    // Songs      Randomizer Check                                     Randomizer Check                 Quest         Type                  Area                          Actor ID      Scene ID                    Params Flags Short Name                  Spoiler Name                 Hint Text Key                     Vanilla Item           Categories                                         Spoiler Collection Check                   Collection Check Group                                 Vanilla Progression
+    locationTable[RC_SHEIK_IN_FOREST] =              Location::Delayed(RC_SHEIK_IN_FOREST,              RCQUEST_BOTH, RCTYPE_SONG_LOCATION, RCAREA_SACRED_FOREST_MEADOW,  ACTOR_ID_MAX, SCENE_SACRED_FOREST_MEADOW, 0x00, 0x20, "Sheik in Forest",           "Sheik in Forest",           RHT_SHEIK_IN_FOREST,              RG_MINUET_OF_FOREST,   { Category::cSong },                               SpoilerCollectionCheck::EventChkInf(0x50), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,         true);
+    locationTable[RC_SHEIK_IN_CRATER] =              Location::Delayed(RC_SHEIK_IN_CRATER,              RCQUEST_BOTH, RCTYPE_SONG_LOCATION, RCAREA_DEATH_MOUNTAIN_CRATER, ACTOR_ID_MAX, SCENE_ID_MAX,               0x00, 0x21, "Sheik in Crater",           "Sheik in Crater",           RHT_SHEIK_IN_CRATER,              RG_BOLERO_OF_FIRE,     { Category::cSong },                               SpoilerCollectionCheck::EventChkInf(0x51), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,     true);
+    locationTable[RC_SHEIK_IN_ICE_CAVERN] =          Location::Delayed(RC_SHEIK_IN_ICE_CAVERN,          RCQUEST_BOTH, RCTYPE_SONG_LOCATION, RCAREA_ICE_CAVERN,            ACTOR_ID_MAX, SCENE_ICE_CAVERN,           0x00, 0x22, "Sheik in Ice Cavern",       "Sheik in Ice Cavern",       RHT_SHEIK_IN_ICE_CAVERN,          RG_SERENADE_OF_WATER,  { Category::cSong, Category::cSongDungeonReward }, SpoilerCollectionCheck::EventChkInf(0x52), SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN, true);
+    locationTable[RC_SHEIK_AT_COLOSSUS] =            Location::Delayed(RC_SHEIK_AT_COLOSSUS,            RCQUEST_BOTH, RCTYPE_SONG_LOCATION, RCAREA_DESERT_COLOSSUS,       ACTOR_ID_MAX, SCENE_DESERT_COLOSSUS,      0x00, 0x23, "Sheik at Colossus",         "Sheik at Colossus",         RHT_SHEIK_AT_COLOSSUS,            RG_REQUIEM_OF_SPIRIT,  { Category::cSong },                               SpoilerCollectionCheck::EventChkInf(0xAC), SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,      true);
+    locationTable[RC_SHEIK_IN_KAKARIKO] =            Location::Delayed(RC_SHEIK_IN_KAKARIKO,            RCQUEST_BOTH, RCTYPE_SONG_LOCATION, RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX, SCENE_ID_MAX,               0x00, 0x24, "Sheik in Kakariko",         "Sheik in Kakariko",         RHT_SHEIK_IN_KAKARIKO,            RG_NOCTURNE_OF_SHADOW, { Category::cSong },                               SpoilerCollectionCheck::EventChkInf(0xAA), SpoilerCollectionCheckGroup::GROUP_KAKARIKO,           true);
+    locationTable[RC_SHEIK_AT_TEMPLE] =              Location::Delayed(RC_SHEIK_AT_TEMPLE,              RCQUEST_BOTH, RCTYPE_SONG_LOCATION, RCAREA_MARKET,                ACTOR_ID_MAX, SCENE_ID_MAX,               0x00, 0x25, "Sheik at Temple",           "Sheik at Temple",           RHT_SHEIK_AT_TEMPLE,              RG_PRELUDE_OF_LIGHT,   { Category::cSong },                               SpoilerCollectionCheck::Chest(0x43, 0x1F), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,      true);
+    locationTable[RC_SONG_FROM_IMPA] =               Location::Delayed(RC_SONG_FROM_IMPA,               RCQUEST_BOTH, RCTYPE_SONG_LOCATION, RCAREA_HYRULE_CASTLE,         ACTOR_ID_MAX, SCENE_ID_MAX,               0x00, 0x26, "Song from Impa",            "Song from Impa",            RHT_SONG_FROM_IMPA,               RG_ZELDAS_LULLABY,     { Category::cSong, Category::cSongDungeonReward }, SpoilerCollectionCheck::EventChkInf(0x59), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,      true);
+    locationTable[RC_SONG_FROM_MALON] =              Location::Delayed(RC_SONG_FROM_MALON,              RCQUEST_BOTH, RCTYPE_SONG_LOCATION, RCAREA_LON_LON_RANCH,         ACTOR_ID_MAX, SCENE_ID_MAX,               0x00, 0x27, "Song from Malon",           "Song from Malon",           RHT_SONG_FROM_MALON,              RG_EPONAS_SONG,        { Category::cSong },                               SpoilerCollectionCheck::Chest(0x63, 0x1F), SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH,      true);
+    locationTable[RC_SONG_FROM_SARIA] =              Location::Delayed(RC_SONG_FROM_SARIA,              RCQUEST_BOTH, RCTYPE_SONG_LOCATION, RCAREA_SACRED_FOREST_MEADOW,  ACTOR_ID_MAX, SCENE_SACRED_FOREST_MEADOW, 0x00, 0x28, "Song from Saria",           "Song from Saria",           RHT_SONG_FROM_SARIA,              RG_SARIAS_SONG,        { Category::cSong },                               SpoilerCollectionCheck::Chest(0x56, 0x1F), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,         true);
+    locationTable[RC_SONG_FROM_ROYAL_FAMILYS_TOMB] = Location::Delayed(RC_SONG_FROM_ROYAL_FAMILYS_TOMB, RCQUEST_BOTH, RCTYPE_SONG_LOCATION, RCAREA_GRAVEYARD,             ACTOR_ID_MAX, SCENE_ID_MAX,               0x00, 0x29, "Song from Composers Grave", "Song from Composers Grave", RHT_SONG_FROM_ROYAL_FAMILYS_TOMB, RG_SUNS_SONG,          { Category::cSong },                               SpoilerCollectionCheck::Chest(0x41, 0x1F), SpoilerCollectionCheckGroup::GROUP_KAKARIKO,           true);
+    locationTable[RC_SONG_FROM_OCARINA_OF_TIME] =    Location::Delayed(RC_SONG_FROM_OCARINA_OF_TIME,    RCQUEST_BOTH, RCTYPE_SONG_LOCATION, RCAREA_HYRULE_FIELD,          ACTOR_ID_MAX, SCENE_ID_MAX,               0x00, 0x2A, "Song from Ocarina of Time", "Song from Ocarina of Time", RHT_SONG_FROM_OCARINA_OF_TIME,    RG_SONG_OF_TIME,       { Category::cSong },                               SpoilerCollectionCheck::Chest(0x51, 0x1F), SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD,       true);
+    locationTable[RC_SONG_FROM_WINDMILL] =           Location::Delayed(RC_SONG_FROM_WINDMILL,           RCQUEST_BOTH, RCTYPE_SONG_LOCATION, RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX, SCENE_ID_MAX,               0x00, 0x2B, "Song from Windmill",        "Song from Windmill",        RHT_SONG_FROM_WINDMILL,           RG_SONG_OF_STORMS,     { Category::cSong },                               SpoilerCollectionCheck::EventChkInf(0x5B), SpoilerCollectionCheckGroup::GROUP_KAKARIKO,           true);
+
+    // Cows       Randomizer Check                             Randomizer Check            Quest         Type        Area                         Actor ID      Scene ID                 Params                        Flags Short Name           Spoiler Name               Hint Text Key                Vanilla Item Categories      Spoiler Collection Check                 Collection Check Group
+    locationTable[RC_KF_LINKS_HOUSE_COW] =      Location::Base(RC_KF_LINKS_HOUSE_COW,      RCQUEST_BOTH, RCTYPE_COW, RCAREA_KOKIRI_FOREST,        ACTOR_EN_COW, SCENE_LINKS_HOUSE,       0x00,                         0x15, "Links House Cow",   "KF Links House Cow",      RHT_KF_LINKS_HOUSE_COW,      RG_MILK, { Category::cCow }, SpoilerCollectionCheck::Cow(0x34, 0x15), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_HF_COW_GROTTO_COW] =       Location::Base(RC_HF_COW_GROTTO_COW,       RCQUEST_BOTH, RCTYPE_COW, RCAREA_HYRULE_FIELD,         ACTOR_EN_COW, SCENE_GROTTOS,           TWO_ACTOR_PARAMS(3485, -291), 0x16, "Cow Grotto Cow",    "HF Cow Grotto Cow",       RHT_HF_COW_GROTTO_COW,       RG_MILK, { Category::cCow }, SpoilerCollectionCheck::Cow(0x3E, 0x16), SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_LLR_STABLES_LEFT_COW] =    Location::Base(RC_LLR_STABLES_LEFT_COW,    RCQUEST_BOTH, RCTYPE_COW, RCAREA_LON_LON_RANCH,        ACTOR_EN_COW, SCENE_STABLE,            TWO_ACTOR_PARAMS(-122, -254), 0x16, "Stables Left Cow",  "LLR Stables Left Cow",    RHT_LLR_STABLES_LEFT_COW,    RG_MILK, { Category::cCow }, SpoilerCollectionCheck::Cow(0x36, 0x16), SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
+    locationTable[RC_LLR_STABLES_RIGHT_COW] =   Location::Base(RC_LLR_STABLES_RIGHT_COW,   RCQUEST_BOTH, RCTYPE_COW, RCAREA_LON_LON_RANCH,        ACTOR_EN_COW, SCENE_STABLE,            TWO_ACTOR_PARAMS(116, -254),  0x15, "Stables Right Cow", "LLR Stables Right Cow",   RHT_LLR_STABLES_RIGHT_COW,   RG_MILK, { Category::cCow }, SpoilerCollectionCheck::Cow(0x36, 0x15), SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
+    locationTable[RC_LLR_TOWER_LEFT_COW] =      Location::Base(RC_LLR_TOWER_LEFT_COW,      RCQUEST_BOTH, RCTYPE_COW, RCAREA_LON_LON_RANCH,        ACTOR_EN_COW, SCENE_LON_LON_BUILDINGS, TWO_ACTOR_PARAMS(-229, 157),  0x15, "Tower Left Cow",    "LLR Tower Left Cow",      RHT_LLR_TOWER_LEFT_COW,      RG_MILK, { Category::cCow }, SpoilerCollectionCheck::Cow(0x4C, 0x16), SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
+    locationTable[RC_LLR_TOWER_RIGHT_COW] =     Location::Base(RC_LLR_TOWER_RIGHT_COW,     RCQUEST_BOTH, RCTYPE_COW, RCAREA_LON_LON_RANCH,        ACTOR_EN_COW, SCENE_LON_LON_BUILDINGS, TWO_ACTOR_PARAMS(-142, -140), 0x16, "Tower Right Cow",   "LLR Tower Right Cow",     RHT_LLR_TOWER_RIGHT_COW,     RG_MILK, { Category::cCow }, SpoilerCollectionCheck::Cow(0x4C, 0x15), SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
+    locationTable[RC_KAK_IMPAS_HOUSE_COW] =     Location::Base(RC_KAK_IMPAS_HOUSE_COW,     RCQUEST_BOTH, RCTYPE_COW, RCAREA_KAKARIKO_VILLAGE,     ACTOR_EN_COW, SCENE_IMPAS_HOUSE,       0x00,                         0x15, "Impas House Cow",   "Kak Impas House Cow",     RHT_KAK_IMPAS_HOUSE_COW,     RG_MILK, { Category::cCow }, SpoilerCollectionCheck::Cow(0x37, 0x15), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_DMT_COW_GROTTO_COW] =      Location::Base(RC_DMT_COW_GROTTO_COW,      RCQUEST_BOTH, RCTYPE_COW, RCAREA_DEATH_MOUNTAIN_TRAIL, ACTOR_EN_COW, SCENE_GROTTOS,           TWO_ACTOR_PARAMS(2444, -471), 0x15, "Cow Grotto Cow",    "DMT Cow Grotto Cow",      RHT_DMT_COW_GROTTO_COW,      RG_MILK, { Category::cCow }, SpoilerCollectionCheck::Cow(0x3E, 0x15), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_GV_COW] =                  Location::Base(RC_GV_COW,                  RCQUEST_BOTH, RCTYPE_COW, RCAREA_GERUDO_VALLEY,        ACTOR_EN_COW, SCENE_GERUDO_VALLEY,     0x00,                         0x15, "Cow",               "GV Cow",                  RHT_GV_COW,                  RG_MILK, { Category::cCow }, SpoilerCollectionCheck::Cow(0x5A, 0x15), SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_COW] = Location::Base(RC_JABU_JABUS_BELLY_MQ_COW, RCQUEST_MQ,   RCTYPE_COW, RCAREA_JABU_JABUS_BELLY,     ACTOR_EN_COW, SCENE_JABU_JABU,         0x00,                         0x15, "MQ Cow",            "Jabu Jabus Belly MQ Cow", RHT_JABU_JABUS_BELLY_MQ_COW, RG_MILK, { Category::cCow }, SpoilerCollectionCheck::Cow(0x02, 0x15), SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+
+    /*-------------------------------
+              --- SHOPS ---
+      8     6               2     4
+
+      7     5               1     3
+      -------------------------------*/
+    //            Randomizer Check                                 Randomizer Check               Quest         Type         Area                       Actor ID        Scene ID                    Params Flags Short Name            Spoiler Name              Hint Text Key                   Vanilla Item           Categories           Spoiler Collection Check                   Spoiler Collection Check Group
+    // Kokiri Forest
+    locationTable[RC_KF_SHOP_ITEM_1] =              Location::Base(RC_KF_SHOP_ITEM_1,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KOKIRI_FOREST,      ACTOR_EN_GIRLA, SCENE_KOKIRI_SHOP,          0x00, 0x00, "Shop Item 1",         "KF Shop Item 1",         RHT_KF_SHOP_ITEM_1,             RG_BUY_DEKU_SHIELD,    { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2D, 0), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_SHOP_ITEM_2] =              Location::Base(RC_KF_SHOP_ITEM_2,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KOKIRI_FOREST,      ACTOR_EN_GIRLA, SCENE_KOKIRI_SHOP,          0x01, 0x01, "Shop Item 2",         "KF Shop Item 2",         RHT_KF_SHOP_ITEM_2,             RG_BUY_DEKU_NUT_5,     { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2D, 1), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_SHOP_ITEM_3] =              Location::Base(RC_KF_SHOP_ITEM_3,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KOKIRI_FOREST,      ACTOR_EN_GIRLA, SCENE_KOKIRI_SHOP,          0x02, 0x02, "Shop Item 3",         "KF Shop Item 3",         RHT_KF_SHOP_ITEM_3,             RG_BUY_DEKU_NUT_10,    { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2D, 2), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_SHOP_ITEM_4] =              Location::Base(RC_KF_SHOP_ITEM_4,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KOKIRI_FOREST,      ACTOR_EN_GIRLA, SCENE_KOKIRI_SHOP,          0x03, 0x03, "Shop Item 4",         "KF Shop Item 4",         RHT_KF_SHOP_ITEM_4,             RG_BUY_DEKU_STICK_1,   { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2D, 3), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_SHOP_ITEM_5] =              Location::Base(RC_KF_SHOP_ITEM_5,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KOKIRI_FOREST,      ACTOR_EN_GIRLA, SCENE_KOKIRI_SHOP,          0x04, 0x04, "Shop Item 5",         "KF Shop Item 5",         RHT_KF_SHOP_ITEM_5,             RG_BUY_DEKU_SEEDS_30,  { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2D, 4), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_SHOP_ITEM_6] =              Location::Base(RC_KF_SHOP_ITEM_6,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KOKIRI_FOREST,      ACTOR_EN_GIRLA, SCENE_KOKIRI_SHOP,          0x05, 0x05, "Shop Item 6",         "KF Shop Item 6",         RHT_KF_SHOP_ITEM_6,             RG_BUY_ARROWS_10,      { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2D, 5), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_SHOP_ITEM_7] =              Location::Base(RC_KF_SHOP_ITEM_7,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KOKIRI_FOREST,      ACTOR_EN_GIRLA, SCENE_KOKIRI_SHOP,          0x06, 0x06, "Shop Item 7",         "KF Shop Item 7",         RHT_KF_SHOP_ITEM_7,             RG_BUY_ARROWS_30,      { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2D, 6), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_SHOP_ITEM_8] =              Location::Base(RC_KF_SHOP_ITEM_8,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KOKIRI_FOREST,      ACTOR_EN_GIRLA, SCENE_KOKIRI_SHOP,          0x07, 0x07, "Shop Item 8",         "KF Shop Item 8",         RHT_KF_SHOP_ITEM_8,             RG_BUY_HEART,          { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2D, 7), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+
+    // Kakariko Village
+    locationTable[RC_KAK_POTION_SHOP_ITEM_1] =      Location::Base(RC_KAK_POTION_SHOP_ITEM_1,     RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_POTION_SHOP_KAKARIKO, 0x00, 0x30, "Potion Shop Item 1",  "Kak Potion Shop Item 1", RHT_KAK_POTION_SHOP_ITEM_1,     RG_BUY_GREEN_POTION,   { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x30, 0), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_POTION_SHOP_ITEM_2] =      Location::Base(RC_KAK_POTION_SHOP_ITEM_2,     RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_POTION_SHOP_KAKARIKO, 0x01, 0x31, "Potion Shop Item 2",  "Kak Potion Shop Item 2", RHT_KAK_POTION_SHOP_ITEM_2,     RG_BUY_BLUE_FIRE,      { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x30, 1), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_POTION_SHOP_ITEM_3] =      Location::Base(RC_KAK_POTION_SHOP_ITEM_3,     RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_POTION_SHOP_KAKARIKO, 0x02, 0x32, "Potion Shop Item 3",  "Kak Potion Shop Item 3", RHT_KAK_POTION_SHOP_ITEM_3,     RG_BUY_RED_POTION_30,  { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x30, 2), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_POTION_SHOP_ITEM_4] =      Location::Base(RC_KAK_POTION_SHOP_ITEM_4,     RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_POTION_SHOP_KAKARIKO, 0x03, 0x33, "Potion Shop Item 4",  "Kak Potion Shop Item 4", RHT_KAK_POTION_SHOP_ITEM_4,     RG_BUY_FAIRYS_SPIRIT,  { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x30, 3), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_POTION_SHOP_ITEM_5] =      Location::Base(RC_KAK_POTION_SHOP_ITEM_5,     RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_POTION_SHOP_KAKARIKO, 0x04, 0x34, "Potion Shop Item 5",  "Kak Potion Shop Item 5", RHT_KAK_POTION_SHOP_ITEM_5,     RG_BUY_DEKU_NUT_5,     { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x30, 4), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_POTION_SHOP_ITEM_6] =      Location::Base(RC_KAK_POTION_SHOP_ITEM_6,     RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_POTION_SHOP_KAKARIKO, 0x05, 0x35, "Potion Shop Item 6",  "Kak Potion Shop Item 6", RHT_KAK_POTION_SHOP_ITEM_6,     RG_BUY_BOTTLE_BUG,     { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x30, 5), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_POTION_SHOP_ITEM_7] =      Location::Base(RC_KAK_POTION_SHOP_ITEM_7,     RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_POTION_SHOP_KAKARIKO, 0x06, 0x36, "Potion Shop Item 7",  "Kak Potion Shop Item 7", RHT_KAK_POTION_SHOP_ITEM_7,     RG_BUY_POE,            { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x30, 6), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_POTION_SHOP_ITEM_8] =      Location::Base(RC_KAK_POTION_SHOP_ITEM_8,     RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_POTION_SHOP_KAKARIKO, 0x07, 0x37, "Potion Shop Item 8",  "Kak Potion Shop Item 8", RHT_KAK_POTION_SHOP_ITEM_8,     RG_BUY_FISH,           { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x30, 7), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_BAZAAR_ITEM_1] =           Location::Base(RC_KAK_BAZAAR_ITEM_1,          RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_TEST01,               0x00, 0x38, "Bazaar Item 1",       "Kak Bazaar Item 1",      RHT_KAK_BAZAAR_ITEM_1,          RG_BUY_HYLIAN_SHIELD,  { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x33, 0), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_BAZAAR_ITEM_2] =           Location::Base(RC_KAK_BAZAAR_ITEM_2,          RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_TEST01,               0x01, 0x39, "Bazaar Item 2",       "Kak Bazaar Item 2",      RHT_KAK_BAZAAR_ITEM_2,          RG_BUY_BOMBS_535,      { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x33, 1), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_BAZAAR_ITEM_3] =           Location::Base(RC_KAK_BAZAAR_ITEM_3,          RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_TEST01,               0x02, 0x3A, "Bazaar Item 3",       "Kak Bazaar Item 3",      RHT_KAK_BAZAAR_ITEM_3,          RG_BUY_DEKU_NUT_5,     { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x33, 2), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_BAZAAR_ITEM_4] =           Location::Base(RC_KAK_BAZAAR_ITEM_4,          RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_TEST01,               0x03, 0x3B, "Bazaar Item 4",       "Kak Bazaar Item 4",      RHT_KAK_BAZAAR_ITEM_4,          RG_BUY_HEART,          { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x33, 3), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_BAZAAR_ITEM_5] =           Location::Base(RC_KAK_BAZAAR_ITEM_5,          RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_TEST01,               0x04, 0x3C, "Bazaar Item 5",       "Kak Bazaar Item 5",      RHT_KAK_BAZAAR_ITEM_5,          RG_BUY_ARROWS_10,      { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x33, 4), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_BAZAAR_ITEM_6] =           Location::Base(RC_KAK_BAZAAR_ITEM_6,          RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_TEST01,               0x05, 0x3D, "Bazaar Item 6",       "Kak Bazaar Item 6",      RHT_KAK_BAZAAR_ITEM_6,          RG_BUY_ARROWS_50,      { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x33, 5), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_BAZAAR_ITEM_7] =           Location::Base(RC_KAK_BAZAAR_ITEM_7,          RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_TEST01,               0x06, 0x3E, "Bazaar Item 7",       "Kak Bazaar Item 7",      RHT_KAK_BAZAAR_ITEM_7,          RG_BUY_DEKU_STICK_1,   { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x33, 6), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_BAZAAR_ITEM_8] =           Location::Base(RC_KAK_BAZAAR_ITEM_8,          RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_TEST01,               0x07, 0x3F, "Bazaar Item 8",       "Kak Bazaar Item 8",      RHT_KAK_BAZAAR_ITEM_8,          RG_BUY_ARROWS_30,      { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x33, 7), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+
+    // Market
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_1] =  Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_1, RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_BOMBCHU_SHOP,         0x00, 0x30, "Bombchu Shop Item 1", "MK Bombchu Shop Item 1", RHT_MARKET_BOMBCHU_SHOP_ITEM_1, RG_BUY_BOMBCHU_10,     { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x32, 0), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_2] =  Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_2, RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_BOMBCHU_SHOP,         0x01, 0x31, "Bombchu Shop Item 2", "MK Bombchu Shop Item 2", RHT_MARKET_BOMBCHU_SHOP_ITEM_2, RG_BUY_BOMBCHU_10,     { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x32, 1), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_3] =  Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_3, RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_BOMBCHU_SHOP,         0x02, 0x32, "Bombchu Shop Item 3", "MK Bombchu Shop Item 3", RHT_MARKET_BOMBCHU_SHOP_ITEM_3, RG_BUY_BOMBCHU_10,     { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x32, 2), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_4] =  Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_4, RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_BOMBCHU_SHOP,         0x03, 0x33, "Bombchu Shop Item 4", "MK Bombchu Shop Item 4", RHT_MARKET_BOMBCHU_SHOP_ITEM_4, RG_BUY_BOMBCHU_10,     { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x32, 3), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_5] =  Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_5, RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_BOMBCHU_SHOP,         0x04, 0x34, "Bombchu Shop Item 5", "MK Bombchu Shop Item 5", RHT_MARKET_BOMBCHU_SHOP_ITEM_5, RG_BUY_BOMBCHU_20,     { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x32, 4), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_6] =  Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_6, RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_BOMBCHU_SHOP,         0x05, 0x35, "Bombchu Shop Item 6", "MK Bombchu Shop Item 6", RHT_MARKET_BOMBCHU_SHOP_ITEM_6, RG_BUY_BOMBCHU_20,     { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x32, 5), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_7] =  Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_7, RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_BOMBCHU_SHOP,         0x06, 0x36, "Bombchu Shop Item 7", "MK Bombchu Shop Item 7", RHT_MARKET_BOMBCHU_SHOP_ITEM_7, RG_BUY_BOMBCHU_20,     { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x32, 6), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_8] =  Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_8, RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_BOMBCHU_SHOP,         0x07, 0x37, "Bombchu Shop Item 8", "MK Bombchu Shop Item 8", RHT_MARKET_BOMBCHU_SHOP_ITEM_8, RG_BUY_BOMBCHU_20,     { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x32, 7), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_POTION_SHOP_ITEM_1] =   Location::Base(RC_MARKET_POTION_SHOP_ITEM_1,  RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_POTION_SHOP_MARKET,   0x00, 0x30, "Potion Shop Item 1",  "MK Potion Shop Item 1",  RHT_MARKET_POTION_SHOP_ITEM_1,  RG_BUY_GREEN_POTION,   { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x31, 0), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_POTION_SHOP_ITEM_2] =   Location::Base(RC_MARKET_POTION_SHOP_ITEM_2,  RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_POTION_SHOP_MARKET,   0x01, 0x31, "Potion Shop Item 2",  "MK Potion Shop Item 2",  RHT_MARKET_POTION_SHOP_ITEM_2,  RG_BUY_BLUE_FIRE,      { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x31, 1), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_POTION_SHOP_ITEM_3] =   Location::Base(RC_MARKET_POTION_SHOP_ITEM_3,  RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_POTION_SHOP_MARKET,   0x02, 0x32, "Potion Shop Item 3",  "MK Potion Shop Item 3",  RHT_MARKET_POTION_SHOP_ITEM_3,  RG_BUY_RED_POTION_30,  { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x31, 2), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_POTION_SHOP_ITEM_4] =   Location::Base(RC_MARKET_POTION_SHOP_ITEM_4,  RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_POTION_SHOP_MARKET,   0x03, 0x33, "Potion Shop Item 4",  "MK Potion Shop Item 4",  RHT_MARKET_POTION_SHOP_ITEM_4,  RG_BUY_FAIRYS_SPIRIT,  { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x31, 3), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_POTION_SHOP_ITEM_5] =   Location::Base(RC_MARKET_POTION_SHOP_ITEM_5,  RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_POTION_SHOP_MARKET,   0x04, 0x34, "Potion Shop Item 5",  "MK Potion Shop Item 5",  RHT_MARKET_POTION_SHOP_ITEM_5,  RG_BUY_DEKU_NUT_5,     { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x31, 4), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_POTION_SHOP_ITEM_6] =   Location::Base(RC_MARKET_POTION_SHOP_ITEM_6,  RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_POTION_SHOP_MARKET,   0x05, 0x35, "Potion Shop Item 6",  "MK Potion Shop Item 6",  RHT_MARKET_POTION_SHOP_ITEM_6,  RG_BUY_BOTTLE_BUG,     { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x31, 5), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_POTION_SHOP_ITEM_7] =   Location::Base(RC_MARKET_POTION_SHOP_ITEM_7,  RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_POTION_SHOP_MARKET,   0x06, 0x36, "Potion Shop Item 7",  "MK Potion Shop Item 7",  RHT_MARKET_POTION_SHOP_ITEM_7,  RG_BUY_POE,            { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x31, 6), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_POTION_SHOP_ITEM_8] =   Location::Base(RC_MARKET_POTION_SHOP_ITEM_8,  RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_POTION_SHOP_MARKET,   0x07, 0x37, "Potion Shop Item 8",  "MK Potion Shop Item 8",  RHT_MARKET_POTION_SHOP_ITEM_8,  RG_BUY_FISH,           { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x31, 7), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BAZAAR_ITEM_1] =        Location::Base(RC_MARKET_BAZAAR_ITEM_1,       RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_BAZAAR,               0x00, 0x30, "Bazaar Item 1",       "MK Bazaar Item 1",       RHT_MARKET_BAZAAR_ITEM_1,       RG_BUY_HYLIAN_SHIELD,  { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2C, 0), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BAZAAR_ITEM_2] =        Location::Base(RC_MARKET_BAZAAR_ITEM_2,       RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_BAZAAR,               0x01, 0x31, "Bazaar Item 2",       "MK Bazaar Item 2",       RHT_MARKET_BAZAAR_ITEM_2,       RG_BUY_BOMBS_535,      { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2C, 1), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BAZAAR_ITEM_3] =        Location::Base(RC_MARKET_BAZAAR_ITEM_3,       RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_BAZAAR,               0x02, 0x32, "Bazaar Item 3",       "MK Bazaar Item 3",       RHT_MARKET_BAZAAR_ITEM_3,       RG_BUY_DEKU_NUT_5,     { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2C, 2), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BAZAAR_ITEM_4] =        Location::Base(RC_MARKET_BAZAAR_ITEM_4,       RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_BAZAAR,               0x03, 0x33, "Bazaar Item 4",       "MK Bazaar Item 4",       RHT_MARKET_BAZAAR_ITEM_4,       RG_BUY_HEART,          { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2C, 3), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BAZAAR_ITEM_5] =        Location::Base(RC_MARKET_BAZAAR_ITEM_5,       RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_BAZAAR,               0x04, 0x34, "Bazaar Item 5",       "MK Bazaar Item 5",       RHT_MARKET_BAZAAR_ITEM_5,       RG_BUY_ARROWS_10,      { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2C, 4), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BAZAAR_ITEM_6] =        Location::Base(RC_MARKET_BAZAAR_ITEM_6,       RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_BAZAAR,               0x05, 0x35, "Bazaar Item 6",       "MK Bazaar Item 6",       RHT_MARKET_BAZAAR_ITEM_6,       RG_BUY_ARROWS_50,      { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2C, 5), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BAZAAR_ITEM_7] =        Location::Base(RC_MARKET_BAZAAR_ITEM_7,       RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_BAZAAR,               0x06, 0x36, "Bazaar Item 7",       "MK Bazaar Item 7",       RHT_MARKET_BAZAAR_ITEM_7,       RG_BUY_DEKU_STICK_1,   { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2C, 6), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BAZAAR_ITEM_8] =        Location::Base(RC_MARKET_BAZAAR_ITEM_8,       RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_BAZAAR,               0x07, 0x37, "Bazaar Item 8",       "MK Bazaar Item 8",       RHT_MARKET_BAZAAR_ITEM_8,       RG_BUY_ARROWS_30,      { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2C, 7), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+ 
+    // Zora's Domain 
+    locationTable[RC_ZD_SHOP_ITEM_1] =              Location::Base(RC_ZD_SHOP_ITEM_1,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_ZORAS_DOMAIN,       ACTOR_EN_GIRLA, SCENE_ZORA_SHOP,            0x00, 0x30, "Shop Item 1",         "ZD Shop Item 1",         RHT_ZD_SHOP_ITEM_1,             RG_BUY_ZORA_TUNIC,     { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2F, 0), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZD_SHOP_ITEM_2] =              Location::Base(RC_ZD_SHOP_ITEM_2,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_ZORAS_DOMAIN,       ACTOR_EN_GIRLA, SCENE_ZORA_SHOP,            0x01, 0x31, "Shop Item 2",         "ZD Shop Item 2",         RHT_ZD_SHOP_ITEM_2,             RG_BUY_ARROWS_10,      { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2F, 1), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZD_SHOP_ITEM_3] =              Location::Base(RC_ZD_SHOP_ITEM_3,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_ZORAS_DOMAIN,       ACTOR_EN_GIRLA, SCENE_ZORA_SHOP,            0x02, 0x32, "Shop Item 3",         "ZD Shop Item 3",         RHT_ZD_SHOP_ITEM_3,             RG_BUY_HEART,          { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2F, 2), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZD_SHOP_ITEM_4] =              Location::Base(RC_ZD_SHOP_ITEM_4,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_ZORAS_DOMAIN,       ACTOR_EN_GIRLA, SCENE_ZORA_SHOP,            0x03, 0x33, "Shop Item 4",         "ZD Shop Item 4",         RHT_ZD_SHOP_ITEM_4,             RG_BUY_ARROWS_30,      { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2F, 3), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZD_SHOP_ITEM_5] =              Location::Base(RC_ZD_SHOP_ITEM_5,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_ZORAS_DOMAIN,       ACTOR_EN_GIRLA, SCENE_ZORA_SHOP,            0x04, 0x34, "Shop Item 5",         "ZD Shop Item 5",         RHT_ZD_SHOP_ITEM_5,             RG_BUY_DEKU_NUT_5,     { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2F, 4), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZD_SHOP_ITEM_6] =              Location::Base(RC_ZD_SHOP_ITEM_6,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_ZORAS_DOMAIN,       ACTOR_EN_GIRLA, SCENE_ZORA_SHOP,            0x05, 0x35, "Shop Item 6",         "ZD Shop Item 6",         RHT_ZD_SHOP_ITEM_6,             RG_BUY_ARROWS_50,      { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2F, 5), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZD_SHOP_ITEM_7] =              Location::Base(RC_ZD_SHOP_ITEM_7,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_ZORAS_DOMAIN,       ACTOR_EN_GIRLA, SCENE_ZORA_SHOP,            0x06, 0x36, "Shop Item 7",         "ZD Shop Item 7",         RHT_ZD_SHOP_ITEM_7,             RG_BUY_FISH,           { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2F, 6), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZD_SHOP_ITEM_8] =              Location::Base(RC_ZD_SHOP_ITEM_8,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_ZORAS_DOMAIN,       ACTOR_EN_GIRLA, SCENE_ZORA_SHOP,            0x07, 0x37, "Shop Item 8",         "ZD Shop Item 8",         RHT_ZD_SHOP_ITEM_8,             RG_BUY_RED_POTION_50,  { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2F, 7), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+              
+    // Goron City             
+    locationTable[RC_GC_SHOP_ITEM_1] =              Location::Base(RC_GC_SHOP_ITEM_1,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_GORON_CITY,         ACTOR_EN_GIRLA, SCENE_GORON_SHOP,           0x00, 0x30, "Shop Item 1",         "GC Shop Item 1",         RHT_GC_SHOP_ITEM_1,             RG_BUY_BOMBS_525,      { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2E, 0), SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_SHOP_ITEM_2] =              Location::Base(RC_GC_SHOP_ITEM_2,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_GORON_CITY,         ACTOR_EN_GIRLA, SCENE_GORON_SHOP,           0x01, 0x31, "Shop Item 2",         "GC Shop Item 2",         RHT_GC_SHOP_ITEM_2,             RG_BUY_BOMBS_10,       { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2E, 1), SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_SHOP_ITEM_3] =              Location::Base(RC_GC_SHOP_ITEM_3,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_GORON_CITY,         ACTOR_EN_GIRLA, SCENE_GORON_SHOP,           0x02, 0x32, "Shop Item 3",         "GC Shop Item 3",         RHT_GC_SHOP_ITEM_3,             RG_BUY_BOMBS_20,       { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2E, 2), SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_SHOP_ITEM_4] =              Location::Base(RC_GC_SHOP_ITEM_4,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_GORON_CITY,         ACTOR_EN_GIRLA, SCENE_GORON_SHOP,           0x03, 0x33, "Shop Item 4",         "GC Shop Item 4",         RHT_GC_SHOP_ITEM_4,             RG_BUY_BOMBS_30,       { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2E, 3), SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_SHOP_ITEM_5] =              Location::Base(RC_GC_SHOP_ITEM_5,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_GORON_CITY,         ACTOR_EN_GIRLA, SCENE_GORON_SHOP,           0x04, 0x34, "Shop Item 5",         "GC Shop Item 5",         RHT_GC_SHOP_ITEM_5,             RG_BUY_GORON_TUNIC,    { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2E, 4), SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_SHOP_ITEM_6] =              Location::Base(RC_GC_SHOP_ITEM_6,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_GORON_CITY,         ACTOR_EN_GIRLA, SCENE_GORON_SHOP,           0x05, 0x35, "Shop Item 6",         "GC Shop Item 6",         RHT_GC_SHOP_ITEM_6,             RG_BUY_HEART,          { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2E, 5), SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_SHOP_ITEM_7] =              Location::Base(RC_GC_SHOP_ITEM_7,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_GORON_CITY,         ACTOR_EN_GIRLA, SCENE_GORON_SHOP,           0x06, 0x36, "Shop Item 7",         "GC Shop Item 7",         RHT_GC_SHOP_ITEM_7,             RG_BUY_RED_POTION_40,  { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2E, 6), SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_SHOP_ITEM_8] =              Location::Base(RC_GC_SHOP_ITEM_8,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_GORON_CITY,         ACTOR_EN_GIRLA, SCENE_GORON_SHOP,           0x07, 0x37, "Shop Item 8",         "GC Shop Item 8",         RHT_GC_SHOP_ITEM_8,             RG_BUY_HEART,          { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2E, 7), SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+
+    // Gossip Stones
+    //            RandomizerCheck                                           Randomizer Check                    Quest            Area                          Scene                        Params  Flag  Short Name                       Spoiler name                       Categories
+    locationTable[RC_DMC_GOSSIP_STONE] =                Location::HintStone(RC_DMC_GOSSIP_STONE,                RCQUEST_BOTH,    RCAREA_DEATH_MOUNTAIN_CRATER, SCENE_DEATH_MOUNTAIN_CRATER, 14341,  0x05, "Gossip Stone",                  "DMC Gossip Stone",                {});
+    locationTable[RC_DMT_GOSSIP_STONE] =                Location::HintStone(RC_DMT_GOSSIP_STONE,                RCQUEST_BOTH,    RCAREA_DEATH_MOUNTAIN_TRAIL,  SCENE_DEATH_MOUNTAIN_TRAIL,  14340,  0x04, "Gossip Stone",                  "DMT Gossip Stone",                {});
+    locationTable[RC_COLOSSUS_GOSSIP_STONE] =           Location::HintStone(RC_COLOSSUS_GOSSIP_STONE,           RCQUEST_BOTH,    RCAREA_DESERT_COLOSSUS,       SCENE_DESERT_COLOSSUS,       14362,  0x1A, "Gossip Stone",                  "Colossus Gossip Stone",           {});
+    locationTable[RC_DODONGOS_CAVERN_GOSSIP_STONE] =    Location::HintStone(RC_DODONGOS_CAVERN_GOSSIP_STONE,    RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,       SCENE_DODONGOS_CAVERN,       4372,   0x14, "Gossip Stone",                  "Dodongo's Cavern Gossip Stone",   {});
+    locationTable[RC_GV_GOSSIP_STONE] =                 Location::HintStone(RC_GV_GOSSIP_STONE,                 RCQUEST_BOTH,    RCAREA_GERUDO_VALLEY,         SCENE_GERUDO_VALLEY,         14353,  0x11, "Gossip Stone",                  "GV Gossip Stone",                 {});
+    locationTable[RC_GC_MAZE_GOSSIP_STONE] =            Location::HintStone(RC_GC_MAZE_GOSSIP_STONE,            RCQUEST_BOTH,    RCAREA_GORON_CITY,            SCENE_GORON_CITY,            14357,  0x15, "Maze Gossip Stone",             "GC Maze Gossip Stone",            {});
+    locationTable[RC_GC_MEDIGORON_GOSSIP_STONE] =       Location::HintStone(RC_GC_MEDIGORON_GOSSIP_STONE,       RCQUEST_BOTH,    RCAREA_GORON_CITY,            SCENE_GORON_CITY,            14873,  0x19, "Medigoron Gossip Stone",        "GC Medigoron Gossip Stone",       {});
+    locationTable[RC_GY_GOSSIP_STONE] =                 Location::HintStone(RC_GY_GOSSIP_STONE,                 RCQUEST_BOTH,    RCAREA_GRAVEYARD,             SCENE_GRAVEYARD,             14346,  0x0A, "Gossip Stone",                  "GY Gossip Stone",                 {});
+    locationTable[RC_HC_MALON_GOSSIP_STONE] =           Location::HintStone(RC_HC_MALON_GOSSIP_STONE,           RCQUEST_BOTH,    RCAREA_HYRULE_CASTLE,         SCENE_HYRULE_CASTLE,         14610,  0x12, "Malon Gossip Stone",            "HC Malon Gossip Stone",           {});
+    locationTable[RC_HC_ROCK_WALL_GOSSIP_STONE] =       Location::HintStone(RC_HC_ROCK_WALL_GOSSIP_STONE,       RCQUEST_BOTH,    RCAREA_HYRULE_CASTLE,         SCENE_HYRULE_CASTLE,         14347,  0x0B, "Rock Wall Gossip Stone",        "HC Rock Wall Gossip Stone",       {});
+    locationTable[RC_HC_STORMS_GROTTO_GOSSIP_STONE] =   Location::HintStone(RC_HC_STORMS_GROTTO_GOSSIP_STONE,   RCQUEST_BOTH,    RCAREA_HYRULE_CASTLE,         SCENE_GROTTOS,               14355,  0x13, "Storms Grotto Gossip Stone",    "HC Storms Grotto Gossip Stone",   {});
+    locationTable[RC_KF_DEKU_TREE_LEFT_GOSSIP_STONE] =  Location::HintStone(RC_KF_DEKU_TREE_LEFT_GOSSIP_STONE,  RCQUEST_BOTH,    RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,         14623,  0x1F, "Deku Tree Left Gossip Stone",   "KF Deku Tree Left Gossip Stone",  {});
+    locationTable[RC_KF_DEKU_TREE_RIGHT_GOSSIP_STONE] = Location::HintStone(RC_KF_DEKU_TREE_RIGHT_GOSSIP_STONE, RCQUEST_BOTH,    RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,         14880,  0x20, "Deku Tree Right Gossip Stone",  "KF Deku Tree Right Gossip Stone", {});
+    locationTable[RC_KF_GOSSIP_STONE] =                 Location::HintStone(RC_KF_GOSSIP_STONE,                 RCQUEST_BOTH,    RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,         14366,  0x1E, "Gossip Stone",                  "KF Gossip Stone",                 {});
+    locationTable[RC_KF_STORMS_GOSSIP_STONE] =          Location::HintStone(RC_KF_STORMS_GOSSIP_STONE,          RCQUEST_BOTH,    RCAREA_KOKIRI_FOREST,         SCENE_GROTTOS,               -22988, 0x3C, "Storms Gossip Stone",           "KF Storms Gossip Stone",          {});
+    locationTable[RC_LH_LAB_GOSSIP_STONE] =             Location::HintStone(RC_LH_LAB_GOSSIP_STONE,             RCQUEST_BOTH,    RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,            14339,  0x03, "Lab Gossip Stone",              "LH Lab Gossip Stone",             {});
+    locationTable[RC_LH_SOUTHEAST_GOSSIP_STONE] =       Location::HintStone(RC_LH_SOUTHEAST_GOSSIP_STONE,       RCQUEST_BOTH,    RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,            14863,  0x0F, "Southeast Gossip Stone",        "LH Southeast Gossip Stone",       {});
+    locationTable[RC_LH_SOUTHWEST_GOSSIP_STONE] =       Location::HintStone(RC_LH_SOUTHWEST_GOSSIP_STONE,       RCQUEST_BOTH,    RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,            14600,  0x08, "Southwest Gossip Stone",        "LH Southwest Gossip Stone",       {});
+    locationTable[RC_LW_GOSSIP_STONE] =                 Location::HintStone(RC_LW_GOSSIP_STONE,                 RCQUEST_BOTH,    RCAREA_LOST_WOODS,            SCENE_LOST_WOODS,            14365,  0x1D, "Gossip Stone",                  "LW Gossip Stone",                 {});
+    locationTable[RC_SFM_MAZE_LOWER_GOSSIP_STONE] =     Location::HintStone(RC_SFM_MAZE_LOWER_GOSSIP_STONE,     RCQUEST_BOTH,    RCAREA_SACRED_FOREST_MEADOW,  SCENE_SACRED_FOREST_MEADOW,  14358,  0x16, "Maze Lower Gossip Stone",       "SFM Maze Lower Gossip Stone",     {});
+    locationTable[RC_SFM_MAZE_UPPER_GOSSIP_STONE] =     Location::HintStone(RC_SFM_MAZE_UPPER_GOSSIP_STONE,     RCQUEST_BOTH,    RCAREA_SACRED_FOREST_MEADOW,  SCENE_SACRED_FOREST_MEADOW,  14615,  0x17, "Maze Upper Gossip Stone",       "SFM Maze Upper Gossip Stone",     {});
+    locationTable[RC_SFM_SARIA_GOSSIP_STONE] =          Location::HintStone(RC_SFM_SARIA_GOSSIP_STONE,          RCQUEST_BOTH,    RCAREA_SACRED_FOREST_MEADOW,  SCENE_SACRED_FOREST_MEADOW,  14876,  0x1C, "Saria Gossip Stone",            "SFM Saria Gossip Stone",          {});
+    locationTable[RC_TOT_LEFT_GOSSIP_STONE] =           Location::HintStone(RC_TOT_LEFT_GOSSIP_STONE,           RCQUEST_BOTH,    RCAREA_MARKET,                SCENE_ID_MAX,                0x00,   0x06, "ToT Left Gossip Stone",         "ToT Left Gossip Stone",           {});
+    locationTable[RC_TOT_RIGHT_GOSSIP_STONE] =          Location::HintStone(RC_TOT_RIGHT_GOSSIP_STONE,          RCQUEST_BOTH,    RCAREA_MARKET,                SCENE_ID_MAX,                0x00,   0x07, "ToT Right Gossip Stone",        "ToT Right Gossip Stone",          {});
+    locationTable[RC_TOT_RIGHT_CENTER_GOSSIP_STONE] =   Location::HintStone(RC_TOT_RIGHT_CENTER_GOSSIP_STONE,   RCQUEST_BOTH,    RCAREA_MARKET,                SCENE_ID_MAX,                0x00,   0x10, "ToT Right Center Gossip Stone", "ToT Right Center Gossip Stone",   {});
+    locationTable[RC_TOT_LEFT_CENTER_GOSSIP_STONE] =    Location::HintStone(RC_TOT_LEFT_CENTER_GOSSIP_STONE,    RCQUEST_BOTH,    RCAREA_MARKET,                SCENE_ID_MAX,                0x00,   0x0E, "ToT Left Center Gossip Stone",  "ToT Left Center Gossip Stone",    {});
+    locationTable[RC_ZD_GOSSIP_STONE] =                 Location::HintStone(RC_ZD_GOSSIP_STONE,                 RCQUEST_BOTH,    RCAREA_ZORAS_DOMAIN,          SCENE_ZORAS_DOMAIN,          14345,  0x09, "Gossip Stone",                  "ZD Gossip Stone",                 {});
+    locationTable[RC_FAIRY_GOSSIP_STONE] =              Location::HintStone(RC_FAIRY_GOSSIP_STONE,              RCQUEST_BOTH,    RCAREA_ZORAS_FOUNTAIN,        SCENE_ZORAS_FOUNTAIN,        0x00,   0x01, "Fairy Gossip Stone",            "Fairy Gossip Stone",              {});
+    locationTable[RC_JABU_GOSSIP_STONE] =               Location::HintStone(RC_JABU_GOSSIP_STONE,               RCQUEST_BOTH,    RCAREA_ZORAS_FOUNTAIN,        SCENE_ZORAS_FOUNTAIN,        0x00,   0x02, "Jabu Gossip Stone",             "Jabu Gossip Stone",               {});
+    locationTable[RC_ZR_NEAR_GROTTOS_GOSSIP_STONE] =    Location::HintStone(RC_ZR_NEAR_GROTTOS_GOSSIP_STONE,    RCQUEST_BOTH,    RCAREA_ZORAS_RIVER,           SCENE_ZORAS_RIVER,           14605,  0x0D, "Near Grottos Gossip Stone",     "ZR Near Grottos Gossip Stone",    {});
+    locationTable[RC_ZR_NEAR_DOMAIN_GOSSIP_STONE] =     Location::HintStone(RC_ZR_NEAR_DOMAIN_GOSSIP_STONE,     RCQUEST_BOTH,    RCAREA_ZORAS_RIVER,           SCENE_ZORAS_RIVER,           14860,  0x0C, "Near Domain Gossip Stone",      "ZR Near Domain Gossip Stone",     {});
+    locationTable[RC_HF_COW_GROTTO_GOSSIP_STONE] =      Location::HintStone(RC_HF_COW_GROTTO_GOSSIP_STONE,      RCQUEST_BOTH,    RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,               14363,  0x1B, "Cow Grotto Gossip Stone",       "HF Cow Grotto Gossip Stone",      {});
+    locationTable[RC_HF_NEAR_MARKET_GOSSIP_STONE] =     Location::HintStone(RC_HF_NEAR_MARKET_GOSSIP_STONE,     RCQUEST_BOTH,    RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,               -22944, 0x30, "Near Market Gossip Stone",      "HF Near Market Gossip Stone",     {});
+    locationTable[RC_HF_SOUTHEAST_GOSSIP_STONE] =       Location::HintStone(RC_HF_SOUTHEAST_GOSSIP_STONE,       RCQUEST_BOTH,    RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,               -22978, 0x32, "Southeast Gossip Stone",        "HF Southeast Gossip Stone",       {});
+    locationTable[RC_HF_OPEN_GROTTO_GOSSIP_STONE] =     Location::HintStone(RC_HF_OPEN_GROTTO_GOSSIP_STONE,     RCQUEST_BOTH,    RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,               -22947, 0x33, "Open Grotto Gossip Stone",      "HF Open Grotto Gossip Stone",     {});
+    locationTable[RC_KAK_OPEN_GROTTO_GOSSIP_STONE] =    Location::HintStone(RC_KAK_OPEN_GROTTO_GOSSIP_STONE,    RCQUEST_BOTH,    RCAREA_KAKARIKO_VILLAGE,      SCENE_GROTTOS,               -22984, 0x38, "Open Grotto Gossip Stone",      "Kak Open Grotto Gossip Stone",    {});
+    locationTable[RC_ZR_OPEN_GROTTO_GOSSIP_STONE] =     Location::HintStone(RC_ZR_OPEN_GROTTO_GOSSIP_STONE,     RCQUEST_BOTH,    RCAREA_ZORAS_RIVER,           SCENE_GROTTOS,               -22985, 0x39, "Open Grotto Gossip Stone",      "ZR Open Grotto Gossip Stone",     {});
+    locationTable[RC_LW_NEAR_SHORTCUTS_GOSSIP_STONE] =  Location::HintStone(RC_LW_NEAR_SHORTCUTS_GOSSIP_STONE,  RCQUEST_BOTH,    RCAREA_LOST_WOODS,            SCENE_GROTTOS,               -22964, 0x34, "Near Shortcuts Gossip Stone",   "LW Near Shortcuts Gossip Stone",  {});
+    locationTable[RC_DMT_STORMS_GROTTO_GOSSIP_STONE] =  Location::HintStone(RC_DMT_STORMS_GROTTO_GOSSIP_STONE,  RCQUEST_BOTH,    RCAREA_DEATH_MOUNTAIN_TRAIL,  SCENE_GROTTOS,               -23255, 0x37, "Storms Grotto Gossip Stone",    "DMT Storms Grotto Gossip Stone",  {});
+    locationTable[RC_DMC_UPPER_GROTTO_GOSSIP_STONE] =   Location::HintStone(RC_DMC_UPPER_GROTTO_GOSSIP_STONE,   RCQUEST_BOTH,    RCAREA_DEATH_MOUNTAIN_CRATER, SCENE_GROTTOS,               -23802, 0x3A, "Upper Grotto Gossip Stone",     "DMC Upper Grotto Gossip Stone",   {});
+
+    // Other Hints
+    locationTable[RC_GANONDORF_HINT] = Location::OtherHint(RC_GANONDORF_HINT, RCQUEST_BOTH, RCTYPE_GOSSIP_STONE, RCAREA_GANONS_CASTLE, ACTOR_EN_GANON_MANT, SCENE_GANON_BOSS, 0x00, 0x00, "Hint", "Ganondorf Hint", {});
+    locationTable[RC_TRIFORCE_COMPLETED] = Location::Reward(RC_TRIFORCE_COMPLETED, RCQUEST_BOTH, RCTYPE_STANDARD, RCAREA_MARKET, ACTOR_ID_MAX, SCENE_ID_MAX, 0x00, 0x00, "Completed Triforce", "Completed Triforce", RHT_NONE, RG_NONE, {}, SpoilerCollectionCheck::None(), SpoilerCollectionCheckGroup::GROUP_NO_GROUP);
+    // clang-format on
+}
+
+Location* Rando::StaticData::GetLocation(RandomizerCheck locKey) {
+    return &(locationTable[locKey]);
+}
+
+std::array<Location, RC_MAX>& Rando::StaticData::GetLocationTable() {
+    return locationTable;
+}
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index 578532a33..5239e0f45 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -26,6 +26,7 @@
 #include <functional>
 #include "draw.h"
 #include "rando_hash.h"
+#include "static_data.h"
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include <boost_custom/container_hash/hash_32.hpp>
 #include "randomizer_settings_window.h"
@@ -44,7 +45,7 @@ std::unordered_map<std::string, RandomizerCheck> SpoilerfileCheckNameToEnum;
 std::unordered_map<std::string, RandomizerGet> SpoilerfileGetNameToEnum;
 std::unordered_map<std::string, RandomizerCheckArea> SpoilerfileAreaNameToEnum;
 std::unordered_map<std::string, HintType> SpoilerfileHintTypeNameToEnum;
-std::multimap<std::tuple<s16, s16, s32>, RandomizerCheckObject> checkFromActorMultimap;
+std::multimap<std::tuple<s16, s16, s32>, RandomizerCheck> checkFromActorMultimap;
 std::set<RandomizerCheck> excludedLocations;
 std::set<RandomizerTrick> enabledTricks;
 std::set<RandomizerTrick> enabledGlitches;
@@ -118,14 +119,16 @@ static const char* frenchRupeeNames[36] = {
 };
 
 Randomizer::Randomizer() {
-    for (auto& [randomizerCheck, rcObject] : RandomizerCheckObjects::GetAllRCObjects()) {
-        SpoilerfileCheckNameToEnum[rcObject.rcSpoilerName] = rcObject.rc;
-        checkFromActorMultimap.emplace(std::make_tuple((s16)rcObject.actorId, (s16)rcObject.sceneId, rcObject.actorParams), rcObject);
+    Rando::StaticData::InitItemTable();
+    Rando::StaticData::InitLocationTable();
+    for (auto& location : Rando::StaticData::GetLocationTable()) {
+        SpoilerfileCheckNameToEnum[location.GetName()] = location.GetRandomizerCheck();
+        checkFromActorMultimap.emplace(std::make_tuple((s16)location.GetActorID(), (s16)location.GetScene(), location.GetActorParams()), location.GetRandomizerCheck());
     }
     SpoilerfileCheckNameToEnum["Invalid Location"] = RC_UNKNOWN_CHECK;
     SpoilerfileCheckNameToEnum["Link's Pocket"] = RC_LINKS_POCKET;
 
-    for (auto& item: *RandoMain::GetFullItemTable()) {
+    for (auto& item: Rando::StaticData::GetItemTable()) {
         // Easiest way to filter out all the empty values from the array, since we still technically want the 0/RG_NONE entry
         if (item.GetName().english.empty()) continue;
         SpoilerfileGetNameToEnum[item.GetName().english] = item.GetRandomizerGet();
@@ -2573,7 +2576,7 @@ std::map<RandomizerCheck, RandomizerInf> rcToRandomizerInf = {
     { RC_MARKET_10_BIG_POES,                                          RAND_INF_10_BIG_POES },
 };
 
-RandomizerCheckObject Randomizer::GetCheckObjectFromActor(s16 actorId, s16 sceneNum, s32 actorParams = 0x00) {
+Rando::Location* Randomizer::GetCheckObjectFromActor(s16 actorId, s16 sceneNum, s32 actorParams = 0x00) {
     RandomizerCheck specialRc = RC_UNKNOWN_CHECK;
     // TODO: Migrate these special cases into table, or at least document why they are special
     switch(sceneNum) {
@@ -2674,22 +2677,22 @@ RandomizerCheckObject Randomizer::GetCheckObjectFromActor(s16 actorId, s16 scene
     }
 
     if (specialRc != RC_UNKNOWN_CHECK) {
-        return RandomizerCheckObjects::GetAllRCObjects()[specialRc];
+        return Rando::StaticData::GetLocation(specialRc);
     }
 
     auto range = checkFromActorMultimap.equal_range(std::make_tuple(actorId, sceneNum, actorParams));
 
     for (auto it = range.first; it != range.second; ++it) {
         if (
-            it->second.vOrMQ == RCVORMQ_BOTH ||
-            (it->second.vOrMQ == RCVORMQ_VANILLA && !ResourceMgr_IsGameMasterQuest()) ||
-            (it->second.vOrMQ == RCVORMQ_MQ && ResourceMgr_IsGameMasterQuest())
+            Rando::StaticData::GetLocation(it->second)->GetQuest() == RCQUEST_BOTH ||
+            (Rando::StaticData::GetLocation(it->second)->GetQuest() == RCQUEST_VANILLA && !ResourceMgr_IsGameMasterQuest()) ||
+            (Rando::StaticData::GetLocation(it->second)->GetQuest() == RCQUEST_MQ && ResourceMgr_IsGameMasterQuest())
         ) {
-            return it->second;
+            return Rando::StaticData::GetLocation(it->second);
         }
     }
 
-    return RandomizerCheckObjects::GetAllRCObjects()[RC_UNKNOWN_CHECK];
+    return Rando::StaticData::GetLocation(RC_UNKNOWN_CHECK);
 }
 
 ScrubIdentity Randomizer::IdentifyScrub(s32 sceneNum, s32 actorParams, s32 respawnData) {
@@ -2708,15 +2711,15 @@ ScrubIdentity Randomizer::IdentifyScrub(s32 sceneNum, s32 actorParams, s32 respa
         actorParams = TWO_ACTOR_PARAMS(actorParams, respawnData);
     }
 
-    RandomizerCheckObject rcObject = GetCheckObjectFromActor(ACTOR_EN_DNS, sceneNum, actorParams);
+    Rando::Location* location = GetCheckObjectFromActor(ACTOR_EN_DNS, sceneNum, actorParams);
 
-    if (rcObject.rc != RC_UNKNOWN_CHECK) {
-        scrubIdentity.randomizerInf = rcToRandomizerInf[rcObject.rc];
-        scrubIdentity.randomizerCheck = rcObject.rc;
-        scrubIdentity.getItemId = rcObject.ogItemId;
+    if (location->GetRandomizerCheck() != RC_UNKNOWN_CHECK) {
+        scrubIdentity.randomizerInf = rcToRandomizerInf[location->GetRandomizerCheck()];
+        scrubIdentity.randomizerCheck = location->GetRandomizerCheck();
+        scrubIdentity.getItemId = (GetItemID)Rando::StaticData::RetrieveItem(location->GetVanillaItem()).GetItemID();
         scrubIdentity.isShuffled = GetRandoSettingValue(RSK_SHUFFLE_SCRUBS) != RO_SCRUBS_OFF;
 
-        if (rcObject.rc == RC_HF_DEKU_SCRUB_GROTTO || rcObject.rc == RC_LW_DEKU_SCRUB_GROTTO_FRONT || rcObject.rc == RC_LW_DEKU_SCRUB_NEAR_BRIDGE) {
+        if (location->GetRandomizerCheck() == RC_HF_DEKU_SCRUB_GROTTO || location->GetRandomizerCheck() == RC_LW_DEKU_SCRUB_GROTTO_FRONT || location->GetRandomizerCheck() == RC_LW_DEKU_SCRUB_NEAR_BRIDGE) {
             scrubIdentity.isShuffled = true;
         }
 
@@ -2737,14 +2740,14 @@ ShopItemIdentity Randomizer::IdentifyShopItem(s32 sceneNum, u8 slotIndex) {
     shopItemIdentity.itemPrice = -1;
     shopItemIdentity.enGirlAShopItem = 0x32;
 
-    RandomizerCheckObject rcObject = GetCheckObjectFromActor(ACTOR_EN_GIRLA, 
+    Rando::Location* location = GetCheckObjectFromActor(ACTOR_EN_GIRLA, 
         // Bazaar (SHOP1) scene is reused, so if entering from Kak use debug scene to identify
         (sceneNum == SCENE_BAZAAR && gSaveContext.entranceIndex == 0xB7) ? SCENE_TEST01 : sceneNum, slotIndex);
 
-    if (rcObject.rc != RC_UNKNOWN_CHECK) {
-        shopItemIdentity.randomizerInf = rcToRandomizerInf[rcObject.rc];
-        shopItemIdentity.randomizerCheck = rcObject.rc;
-        shopItemIdentity.ogItemId = rcObject.ogItemId;
+    if (location->GetRandomizerCheck() != RC_UNKNOWN_CHECK) {
+        shopItemIdentity.randomizerInf = rcToRandomizerInf[location->GetRandomizerCheck()];
+        shopItemIdentity.randomizerCheck = location->GetRandomizerCheck();
+        shopItemIdentity.ogItemId = (GetItemID)Rando::StaticData::RetrieveItem(location->GetVanillaItem()).GetItemID();
 
         RandomizerGetData randoGet = GetRandomizerGetDataFromKnownCheck(shopItemIdentity.randomizerCheck);
         if (randomizerGetToEnGirlShopItem.find(randoGet.rgID) != randomizerGetToEnGirlShopItem.end()) {
@@ -2771,11 +2774,11 @@ CowIdentity Randomizer::IdentifyCow(s32 sceneNum, s32 posX, s32 posZ) {
         actorParams = TWO_ACTOR_PARAMS(posX, posZ);
     }
 
-    RandomizerCheckObject rcObject = GetCheckObjectFromActor(ACTOR_EN_COW, sceneNum, actorParams);
+    Rando::Location* location = GetCheckObjectFromActor(ACTOR_EN_COW, sceneNum, actorParams);
 
-    if (rcObject.rc != RC_UNKNOWN_CHECK) {
-        cowIdentity.randomizerInf = rcToRandomizerInf[rcObject.rc];
-        cowIdentity.randomizerCheck = rcObject.rc;
+    if (location->GetRandomizerCheck() != RC_UNKNOWN_CHECK) {
+        cowIdentity.randomizerInf = rcToRandomizerInf[location->GetRandomizerCheck()];
+        cowIdentity.randomizerCheck = location->GetRandomizerCheck();
     }
 
     return cowIdentity;
@@ -2793,27 +2796,17 @@ GetItemEntry Randomizer::GetItemEntryFromRGData(RandomizerGetData rgData, GetIte
     if (checkObtainability && OTRGlobals::Instance->gRandomizer->GetItemObtainabilityFromRandomizerGet(rgData.rgID) != CAN_OBTAIN) {
         return ItemTableManager::Instance->RetrieveItemEntry(MOD_NONE, GI_RUPEE_BLUE);
     }
-    // Can't get RG_ICE_TRAP if the rgID corresponds to a vanilla item
-    if (IsItemVanilla(rgData.rgID)) {
-        return ItemTableManager::Instance->RetrieveItemEntry(MOD_NONE, GetItemIdFromRandomizerGet(rgData.rgID, ogItemId));
-    }
-    // After this point we can assume we are dealing with a randomizer exclusive item.
-    GetItemEntry giEntry = ItemTableManager::Instance->RetrieveItemEntry(
-        MOD_RANDOMIZER, GetItemIdFromRandomizerGet(rgData.rgID, ogItemId));
-    // If we have an ice trap, we want to change the GID and DrawFunc to the fakeRgID's values.
+
+    Rando::Item item = Rando::StaticData::RetrieveItem(rgData.rgID);
+    GetItemEntry giEntry = item.GetGIEntry_Copy();
+    // If we have an ice trap, we want to change the GID and drawFunc to the fakeRgID's values.
     if (rgData.rgID == RG_ICE_TRAP) {
-        ModIndex modIndex;
-        if (IsItemVanilla(rgData.fakeRgID)) {
-            modIndex = MOD_NONE;
-        } else {
-            modIndex = MOD_RANDOMIZER;
-        }
-        GetItemEntry fakeGiEntry = ItemTableManager::Instance->RetrieveItemEntry(modIndex, GetItemIdFromRandomizerGet(rgData.fakeRgID, ogItemId));
-        giEntry.gid = fakeGiEntry.gid;
-        giEntry.gi = fakeGiEntry.gi;
-        giEntry.drawItemId = fakeGiEntry.drawItemId;
-        giEntry.drawModIndex = fakeGiEntry.drawModIndex;
-        giEntry.drawFunc = fakeGiEntry.drawFunc;
+        std::shared_ptr<GetItemEntry> fakeGiEntry = Rando::StaticData::RetrieveItem(rgData.fakeRgID).GetGIEntry();
+        giEntry.gid = fakeGiEntry->gid;
+        giEntry.gi = fakeGiEntry->gi;
+        giEntry.drawItemId = fakeGiEntry->drawItemId;
+        giEntry.drawModIndex = fakeGiEntry->drawModIndex;
+        giEntry.drawFunc = fakeGiEntry->drawFunc;
     }
     return giEntry;
 }
@@ -2824,7 +2817,7 @@ GetItemEntry Randomizer::GetItemFromKnownCheck(RandomizerCheck randomizerCheck,
 }
 
 RandomizerCheck Randomizer::GetCheckFromActor(s16 actorId, s16 sceneNum, s16 actorParams) {
-    return GetCheckObjectFromActor(actorId, sceneNum, actorParams).rc;
+    return GetCheckObjectFromActor(actorId, sceneNum, actorParams)->GetRandomizerCheck();
 }
 
 RandomizerInf Randomizer::GetRandomizerInfFromCheck(RandomizerCheck rc) {
@@ -3060,9 +3053,10 @@ void GenerateRandomizerImgui(std::string seed = "") {
     RandomizerCheckObjects::UpdateImGuiVisibility();
 
     // Remove excludes for locations that are no longer allowed to be excluded
-    for (auto& [randomizerCheck, rcObject] : RandomizerCheckObjects::GetAllRCObjects()) {
-        auto elfound = excludedLocations.find(rcObject.rc);
-        if (!rcObject.visibleInImgui && elfound != excludedLocations.end()) {
+    auto ctx = Rando::Context::GetInstance();
+    for (auto& location : Rando::StaticData::GetLocationTable()) {
+        auto elfound = excludedLocations.find(location.GetRandomizerCheck());
+        if (!ctx->GetItemLocation(location.GetRandomizerCheck())->IsVisible() && elfound != excludedLocations.end()) {
             excludedLocations.erase(elfound);
         }
     }
@@ -3085,6 +3079,7 @@ bool GenerateRandomizer(std::string seed /*= ""*/) {
 }
 
 void RandomizerSettingsWindow::DrawElement() {
+    auto ctx = Rando::Context::GetInstance();
     if (generated) {
         generated = 0;
         randoThread.join();
@@ -4632,11 +4627,11 @@ void RandomizerSettingsWindow::DrawElement() {
                 locationSearch.Draw();
 
                 ImGui::BeginChild("ChildIncludedLocations", ImVec2(0, -8));
-                for (auto& [rcArea, rcObjects] : RandomizerCheckObjects::GetAllRCObjectsByArea()) {
+                for (auto& [rcArea, locations] : RandomizerCheckObjects::GetAllRCObjectsByArea()) {
                     bool hasItems = false;
-                    for (auto& [randomizerCheck, rcObject] : rcObjects) {
-                        if (rcObject->visibleInImgui && !excludedLocations.count(rcObject->rc) &&
-                            locationSearch.PassFilter(rcObject->rcSpoilerName.c_str())) {
+                    for (RandomizerCheck rc : locations) {
+                        if (ctx->GetItemLocation(rc)->IsVisible() && !excludedLocations.count(rc) &&
+                            locationSearch.PassFilter(Rando::StaticData::GetLocation(rc)->GetName().c_str())) {
 
                             hasItems = true;
                             break;
@@ -4646,12 +4641,12 @@ void RandomizerSettingsWindow::DrawElement() {
                     if (hasItems) {
                         ImGui::SetNextItemOpen(true, ImGuiCond_Once);
                         if (ImGui::TreeNode(RandomizerCheckObjects::GetRCAreaName(rcArea).c_str())) {
-                            for (auto& [randomizerCheck, rcObject] : rcObjects) {
-                                if (rcObject->visibleInImgui && !excludedLocations.count(rcObject->rc) &&
-                                    locationSearch.PassFilter(rcObject->rcSpoilerName.c_str())) {
+                            for (auto& location : locations) {
+                                if (ctx->GetItemLocation(location)->IsVisible() && !excludedLocations.count(location) &&
+                                    locationSearch.PassFilter(Rando::StaticData::GetLocation(location)->GetName().c_str())) {
 
-                                    if (ImGui::ArrowButton(std::to_string(rcObject->rc).c_str(), ImGuiDir_Right)) {
-                                        excludedLocations.insert(rcObject->rc);
+                                    if (ImGui::ArrowButton(std::to_string(location).c_str(), ImGuiDir_Right)) {
+                                        excludedLocations.insert(location);
                                         // todo: this efficently when we build out cvar array support
                                         std::string excludedLocationString = "";
                                         for (auto excludedLocationIt : excludedLocations) {
@@ -4662,7 +4657,7 @@ void RandomizerSettingsWindow::DrawElement() {
                                         LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
                                     }
                                     ImGui::SameLine();
-                                    ImGui::Text("%s", rcObject->rcShortName.c_str());
+                                    ImGui::Text("%s", Rando::StaticData::GetLocation(location)->GetShortName().c_str());
                                 }
                             }
                             ImGui::TreePop();
@@ -4676,10 +4671,10 @@ void RandomizerSettingsWindow::DrawElement() {
                 window->DC.CurrLineTextBaseOffset = 0.0f;
 
                 ImGui::BeginChild("ChildExcludedLocations", ImVec2(0, -8));
-                for (auto& [rcArea, rcObjects] : RandomizerCheckObjects::GetAllRCObjectsByArea()) {
+                for (auto& [rcArea, locations] : RandomizerCheckObjects::GetAllRCObjectsByArea()) {
                     bool hasItems = false;
-                    for (auto& [randomizerCheck, rcObject] : rcObjects) {
-                        if (rcObject->visibleInImgui && excludedLocations.count(rcObject->rc)) {
+                    for (RandomizerCheck rc : locations) {
+                        if (ctx->GetItemLocation(rc)->IsVisible() && excludedLocations.count(rc)) {
                             hasItems = true;
                             break;
                         }
@@ -4688,10 +4683,10 @@ void RandomizerSettingsWindow::DrawElement() {
                     if (hasItems) {
                         ImGui::SetNextItemOpen(true, ImGuiCond_Once);
                         if (ImGui::TreeNode(RandomizerCheckObjects::GetRCAreaName(rcArea).c_str())) {
-                            for (auto& [randomizerCheck, rcObject] : rcObjects) {
-                                auto elfound = excludedLocations.find(rcObject->rc);
-                                if (rcObject->visibleInImgui && elfound != excludedLocations.end()) {
-                                    if (ImGui::ArrowButton(std::to_string(rcObject->rc).c_str(), ImGuiDir_Left)) {
+                            for (auto& location : locations) {
+                                auto elfound = excludedLocations.find(location);
+                                if (ctx->GetItemLocation(location)->IsVisible() && elfound != excludedLocations.end()) {
+                                    if (ImGui::ArrowButton(std::to_string(location).c_str(), ImGuiDir_Left)) {
                                         excludedLocations.erase(elfound);
                                         // todo: this efficently when we build out cvar array support
                                         std::string excludedLocationString = "";
@@ -4703,7 +4698,7 @@ void RandomizerSettingsWindow::DrawElement() {
                                         LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
                                     }
                                     ImGui::SameLine();
-                                    ImGui::Text("%s", rcObject->rcShortName.c_str());
+                                    ImGui::Text("%s", Rando::StaticData::GetLocation(location)->GetShortName().c_str());
                                 }
                             }
                             ImGui::TreePop();
@@ -6118,125 +6113,8 @@ class ExtendedVanillaTableInvalidItemIdException: public std::exception {
       }
 };
 
-void InitRandoItemTable() {
-    // These entries have ItemIDs from vanilla, but not GetItemIDs or entries in the old sGetItemTable
-    static GetItemEntry extendedVanillaGetItemTable[] = {
-        GET_ITEM(ITEM_MEDALLION_LIGHT,                 OBJECT_GI_MEDAL,    GID_MEDALLION_LIGHT,  0x40,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_NONE,       RG_LIGHT_MEDALLION),
-        GET_ITEM(ITEM_MEDALLION_FOREST,                OBJECT_GI_MEDAL,    GID_MEDALLION_FOREST, 0x3E,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_NONE,       RG_FOREST_MEDALLION),
-        GET_ITEM(ITEM_MEDALLION_FIRE,                  OBJECT_GI_MEDAL,    GID_MEDALLION_FIRE,   0x3C,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_NONE,       RG_FIRE_MEDALLION),
-        GET_ITEM(ITEM_MEDALLION_WATER,                 OBJECT_GI_MEDAL,    GID_MEDALLION_WATER,  0x3D,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_NONE,       RG_WATER_MEDALLION),
-        GET_ITEM(ITEM_MEDALLION_SHADOW,                OBJECT_GI_MEDAL,    GID_MEDALLION_SHADOW, 0x41,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_NONE,       RG_SHADOW_MEDALLION),
-        GET_ITEM(ITEM_MEDALLION_SPIRIT,                OBJECT_GI_MEDAL,    GID_MEDALLION_SPIRIT, 0x3F,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_NONE,       RG_SPIRIT_MEDALLION),
-
-        GET_ITEM(ITEM_KOKIRI_EMERALD,                  OBJECT_GI_JEWEL,    GID_KOKIRI_EMERALD,   0x80,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_NONE,       RG_KOKIRI_EMERALD),
-        GET_ITEM(ITEM_GORON_RUBY,                      OBJECT_GI_JEWEL,    GID_GORON_RUBY,       0x81,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_NONE,       RG_GORON_RUBY),
-        GET_ITEM(ITEM_ZORA_SAPPHIRE,                   OBJECT_GI_JEWEL,    GID_ZORA_SAPPHIRE,    0x82,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_NONE,       RG_ZORA_SAPPHIRE),
-
-        GET_ITEM(ITEM_SONG_LULLABY,                    OBJECT_GI_MELODY,   GID_SONG_ZELDA,       0xD4,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_NONE,       RG_ZELDAS_LULLABY),
-        GET_ITEM(ITEM_SONG_SUN,                        OBJECT_GI_MELODY,   GID_SONG_SUN,         0xD3,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_NONE,       RG_SUNS_SONG),
-        GET_ITEM(ITEM_SONG_EPONA,                      OBJECT_GI_MELODY,   GID_SONG_EPONA,       0xD2,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_NONE,       RG_EPONAS_SONG),
-        GET_ITEM(ITEM_SONG_STORMS,                     OBJECT_GI_MELODY,   GID_SONG_STORM,       0xD6,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_NONE,       RG_SONG_OF_STORMS),
-        GET_ITEM(ITEM_SONG_TIME,                       OBJECT_GI_MELODY,   GID_SONG_TIME,        0xD5,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_NONE,       RG_SONG_OF_TIME),
-        GET_ITEM(ITEM_SONG_SARIA,                      OBJECT_GI_MELODY,   GID_SONG_SARIA,       0xD1,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_NONE,       RG_SARIAS_SONG),
-
-        GET_ITEM(ITEM_SONG_MINUET,                     OBJECT_GI_MELODY,   GID_SONG_MINUET,      0x73,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_NONE,       RG_MINUET_OF_FOREST),
-        GET_ITEM(ITEM_SONG_BOLERO,                     OBJECT_GI_MELODY,   GID_SONG_BOLERO,      0x74,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_NONE,       RG_BOLERO_OF_FIRE),
-        GET_ITEM(ITEM_SONG_SERENADE,                   OBJECT_GI_MELODY,   GID_SONG_SERENADE,    0x75,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_NONE,       RG_SERENADE_OF_WATER),
-        GET_ITEM(ITEM_SONG_NOCTURNE,                   OBJECT_GI_MELODY,   GID_SONG_NOCTURNE,    0x77,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_NONE,       RG_NOCTURNE_OF_SHADOW),
-        GET_ITEM(ITEM_SONG_REQUIEM,                    OBJECT_GI_MELODY,   GID_SONG_REQUIEM,     0x76,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_NONE,       RG_REQUIEM_OF_SPIRIT),
-        GET_ITEM(ITEM_SONG_PRELUDE,                    OBJECT_GI_MELODY,   GID_SONG_PRELUDE,     0x78,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_NONE,       RG_PRELUDE_OF_LIGHT),
-    };
-
-    // These do not have ItemIDs or GetItemIDs from vanilla, so I'm using their
-    // RandomizerGet enum values for both.
-    static GetItemEntry randoGetItemTable[] = {
-        GET_ITEM(RG_ICE_TRAP,                          OBJECT_GI_RUPY,     GID_RUPEE_GOLD,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_ICE_TRAP),
-        GET_ITEM(RG_MAGIC_SINGLE,                      OBJECT_GI_MAGICPOT, GID_MAGIC_SMALL,      0xE4,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_MAGIC_SINGLE),
-        GET_ITEM(RG_MAGIC_DOUBLE,                      OBJECT_GI_MAGICPOT, GID_MAGIC_LARGE,      0xE8,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_MAGIC_DOUBLE),
-        GET_ITEM(RG_DOUBLE_DEFENSE,                    OBJECT_GI_HEARTS,   GID_HEART_CONTAINER,  0xE9,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_DOUBLE_DEFENSE),
-        GET_ITEM(RG_GREG_RUPEE,                        OBJECT_GI_RUPY,     GID_RUPEE_GREEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_GREG_RUPEE),
-        GET_ITEM(RG_BOTTLE_WITH_RED_POTION,            OBJECT_GI_LIQUID,   GID_POTION_RED,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_BOTTLE_WITH_RED_POTION),
-        GET_ITEM(RG_BOTTLE_WITH_GREEN_POTION,          OBJECT_GI_LIQUID,   GID_POTION_GREEN,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_BOTTLE_WITH_GREEN_POTION),
-        GET_ITEM(RG_BOTTLE_WITH_BLUE_POTION,           OBJECT_GI_LIQUID,   GID_POTION_BLUE,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_BOTTLE_WITH_BLUE_POTION),
-        GET_ITEM(RG_BOTTLE_WITH_FAIRY,                 OBJECT_GI_BOTTLE,   GID_BOTTLE,           TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_BOTTLE_WITH_FAIRY),
-        GET_ITEM(RG_BOTTLE_WITH_FISH,                  OBJECT_GI_FISH,     GID_FISH,             TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_BOTTLE_WITH_FISH),
-        GET_ITEM(RG_BOTTLE_WITH_BLUE_FIRE,             OBJECT_GI_FIRE,     GID_BLUE_FIRE,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_BOTTLE_WITH_BLUE_FIRE),
-        GET_ITEM(RG_BOTTLE_WITH_BUGS,                  OBJECT_GI_INSECT,   GID_BUG,              TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_BOTTLE_WITH_BUGS),
-        GET_ITEM(RG_BOTTLE_WITH_POE,                   OBJECT_GI_GHOST,    GID_POE,              TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_BOTTLE_WITH_POE),
-        GET_ITEM(RG_BOTTLE_WITH_BIG_POE,               OBJECT_GI_GHOST,    GID_BIG_POE,          TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_BOTTLE_WITH_BIG_POE),
-        GET_ITEM(RG_GERUDO_FORTRESS_SMALL_KEY,         OBJECT_GI_KEY,      GID_KEY_SMALL,        TEXT_ITEM_KEY_SMALL,         0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY, MOD_RANDOMIZER, RG_GERUDO_FORTRESS_SMALL_KEY),
-        GET_ITEM(RG_FOREST_TEMPLE_SMALL_KEY,           OBJECT_GI_KEY,      GID_KEY_SMALL,        TEXT_ITEM_KEY_SMALL,         0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY, MOD_RANDOMIZER, RG_FOREST_TEMPLE_SMALL_KEY),
-        GET_ITEM(RG_FIRE_TEMPLE_SMALL_KEY,             OBJECT_GI_KEY,      GID_KEY_SMALL,        TEXT_ITEM_KEY_SMALL,         0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY, MOD_RANDOMIZER, RG_FIRE_TEMPLE_SMALL_KEY),
-        GET_ITEM(RG_WATER_TEMPLE_SMALL_KEY,            OBJECT_GI_KEY,      GID_KEY_SMALL,        TEXT_ITEM_KEY_SMALL,         0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY, MOD_RANDOMIZER, RG_WATER_TEMPLE_SMALL_KEY),
-        GET_ITEM(RG_SPIRIT_TEMPLE_SMALL_KEY,           OBJECT_GI_KEY,      GID_KEY_SMALL,        TEXT_ITEM_KEY_SMALL,         0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY, MOD_RANDOMIZER, RG_SPIRIT_TEMPLE_SMALL_KEY),
-        GET_ITEM(RG_SHADOW_TEMPLE_SMALL_KEY,           OBJECT_GI_KEY,      GID_KEY_SMALL,        TEXT_ITEM_KEY_SMALL,         0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY, MOD_RANDOMIZER, RG_SHADOW_TEMPLE_SMALL_KEY),
-        GET_ITEM(RG_BOTTOM_OF_THE_WELL_SMALL_KEY,      OBJECT_GI_KEY,      GID_KEY_SMALL,        TEXT_ITEM_KEY_SMALL,         0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY, MOD_RANDOMIZER, RG_BOTTOM_OF_THE_WELL_SMALL_KEY),
-        GET_ITEM(RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, OBJECT_GI_KEY,      GID_KEY_SMALL,        TEXT_ITEM_KEY_SMALL,         0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY, MOD_RANDOMIZER, RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY),
-        GET_ITEM(RG_GANONS_CASTLE_SMALL_KEY,           OBJECT_GI_KEY,      GID_KEY_SMALL,        TEXT_ITEM_KEY_SMALL,         0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY, MOD_RANDOMIZER, RG_GANONS_CASTLE_SMALL_KEY),
-        GET_ITEM(RG_GERUDO_FORTRESS_KEY_RING,          OBJECT_GI_KEY,      GID_KEY_SMALL,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY, MOD_RANDOMIZER, RG_GERUDO_FORTRESS_KEY_RING),
-        GET_ITEM(RG_FOREST_TEMPLE_KEY_RING,            OBJECT_GI_KEY,      GID_KEY_SMALL,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY, MOD_RANDOMIZER, RG_FOREST_TEMPLE_KEY_RING),
-        GET_ITEM(RG_FIRE_TEMPLE_KEY_RING,              OBJECT_GI_KEY,      GID_KEY_SMALL,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY, MOD_RANDOMIZER, RG_FIRE_TEMPLE_KEY_RING),
-        GET_ITEM(RG_WATER_TEMPLE_KEY_RING,             OBJECT_GI_KEY,      GID_KEY_SMALL,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY, MOD_RANDOMIZER, RG_WATER_TEMPLE_KEY_RING),
-        GET_ITEM(RG_SPIRIT_TEMPLE_KEY_RING,            OBJECT_GI_KEY,      GID_KEY_SMALL,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY, MOD_RANDOMIZER, RG_SPIRIT_TEMPLE_KEY_RING),
-        GET_ITEM(RG_SHADOW_TEMPLE_KEY_RING,            OBJECT_GI_KEY,      GID_KEY_SMALL,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY, MOD_RANDOMIZER, RG_SHADOW_TEMPLE_KEY_RING),
-        GET_ITEM(RG_BOTTOM_OF_THE_WELL_KEY_RING,       OBJECT_GI_KEY,      GID_KEY_SMALL,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY, MOD_RANDOMIZER, RG_BOTTOM_OF_THE_WELL_KEY_RING),
-        GET_ITEM(RG_GERUDO_TRAINING_GROUNDS_KEY_RING,  OBJECT_GI_KEY,      GID_KEY_SMALL,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY, MOD_RANDOMIZER, RG_GERUDO_TRAINING_GROUNDS_KEY_RING),
-        GET_ITEM(RG_GANONS_CASTLE_KEY_RING,            OBJECT_GI_KEY,      GID_KEY_SMALL,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY, MOD_RANDOMIZER, RG_GANONS_CASTLE_KEY_RING),
-        GET_ITEM(RG_FOREST_TEMPLE_BOSS_KEY,            OBJECT_GI_BOSSKEY,  GID_KEY_BOSS,         TEXT_ITEM_KEY_BOSS,          0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,  MOD_RANDOMIZER, RG_FOREST_TEMPLE_BOSS_KEY),
-        GET_ITEM(RG_FIRE_TEMPLE_BOSS_KEY,              OBJECT_GI_BOSSKEY,  GID_KEY_BOSS,         TEXT_ITEM_KEY_BOSS,          0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,  MOD_RANDOMIZER, RG_FIRE_TEMPLE_BOSS_KEY),
-        GET_ITEM(RG_WATER_TEMPLE_BOSS_KEY,             OBJECT_GI_BOSSKEY,  GID_KEY_BOSS,         TEXT_ITEM_KEY_BOSS,          0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,  MOD_RANDOMIZER, RG_WATER_TEMPLE_BOSS_KEY),
-        GET_ITEM(RG_SPIRIT_TEMPLE_BOSS_KEY,            OBJECT_GI_BOSSKEY,  GID_KEY_BOSS,         TEXT_ITEM_KEY_BOSS,          0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,  MOD_RANDOMIZER, RG_SPIRIT_TEMPLE_BOSS_KEY),
-        GET_ITEM(RG_SHADOW_TEMPLE_BOSS_KEY,            OBJECT_GI_BOSSKEY,  GID_KEY_BOSS,         TEXT_ITEM_KEY_BOSS,          0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,  MOD_RANDOMIZER, RG_SHADOW_TEMPLE_BOSS_KEY),
-        GET_ITEM(RG_GANONS_CASTLE_BOSS_KEY,            OBJECT_GI_BOSSKEY,  GID_KEY_BOSS,         TEXT_ITEM_KEY_BOSS,          0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,  MOD_RANDOMIZER, RG_GANONS_CASTLE_BOSS_KEY),
-        GET_ITEM(RG_DEKU_TREE_MAP,                     OBJECT_GI_MAP,      GID_DUNGEON_MAP,      TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_DEKU_TREE_MAP),
-        GET_ITEM(RG_DODONGOS_CAVERN_MAP,               OBJECT_GI_MAP,      GID_DUNGEON_MAP,      TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_DODONGOS_CAVERN_MAP),
-        GET_ITEM(RG_JABU_JABUS_BELLY_MAP,              OBJECT_GI_MAP,      GID_DUNGEON_MAP,      TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_JABU_JABUS_BELLY_MAP),
-        GET_ITEM(RG_FOREST_TEMPLE_MAP,                 OBJECT_GI_MAP,      GID_DUNGEON_MAP,      TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_FOREST_TEMPLE_MAP),
-        GET_ITEM(RG_FIRE_TEMPLE_MAP,                   OBJECT_GI_MAP,      GID_DUNGEON_MAP,      TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_FIRE_TEMPLE_MAP),
-        GET_ITEM(RG_WATER_TEMPLE_MAP,                  OBJECT_GI_MAP,      GID_DUNGEON_MAP,      TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_WATER_TEMPLE_MAP),
-        GET_ITEM(RG_SPIRIT_TEMPLE_MAP,                 OBJECT_GI_MAP,      GID_DUNGEON_MAP,      TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_SPIRIT_TEMPLE_MAP),
-        GET_ITEM(RG_SHADOW_TEMPLE_MAP,                 OBJECT_GI_MAP,      GID_DUNGEON_MAP,      TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_SHADOW_TEMPLE_MAP),
-        GET_ITEM(RG_BOTTOM_OF_THE_WELL_MAP,            OBJECT_GI_MAP,      GID_DUNGEON_MAP,      TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_BOTTOM_OF_THE_WELL_MAP),
-        GET_ITEM(RG_ICE_CAVERN_MAP,                    OBJECT_GI_MAP,      GID_DUNGEON_MAP,      TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_ICE_CAVERN_MAP),
-        GET_ITEM(RG_DEKU_TREE_COMPASS,                 OBJECT_GI_COMPASS,  GID_COMPASS,          TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_DEKU_TREE_COMPASS),
-        GET_ITEM(RG_DODONGOS_CAVERN_COMPASS,           OBJECT_GI_COMPASS,  GID_COMPASS,          TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_DODONGOS_CAVERN_COMPASS),
-        GET_ITEM(RG_JABU_JABUS_BELLY_COMPASS,          OBJECT_GI_COMPASS,  GID_COMPASS,          TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_JABU_JABUS_BELLY_COMPASS),
-        GET_ITEM(RG_FOREST_TEMPLE_COMPASS,             OBJECT_GI_COMPASS,  GID_COMPASS,          TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_FOREST_TEMPLE_COMPASS),
-        GET_ITEM(RG_FIRE_TEMPLE_COMPASS,               OBJECT_GI_COMPASS,  GID_COMPASS,          TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_FIRE_TEMPLE_COMPASS),
-        GET_ITEM(RG_WATER_TEMPLE_COMPASS,              OBJECT_GI_COMPASS,  GID_COMPASS,          TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_WATER_TEMPLE_COMPASS),
-        GET_ITEM(RG_SPIRIT_TEMPLE_COMPASS,             OBJECT_GI_COMPASS,  GID_COMPASS,          TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_SPIRIT_TEMPLE_COMPASS),
-        GET_ITEM(RG_SHADOW_TEMPLE_COMPASS,             OBJECT_GI_COMPASS,  GID_COMPASS,          TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_SHADOW_TEMPLE_COMPASS),
-        GET_ITEM(RG_BOTTOM_OF_THE_WELL_COMPASS,        OBJECT_GI_COMPASS,  GID_COMPASS,          TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_BOTTOM_OF_THE_WELL_COMPASS),
-        GET_ITEM(RG_ICE_CAVERN_COMPASS,                OBJECT_GI_COMPASS,  GID_COMPASS,          TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_ICE_CAVERN_COMPASS),
-        GET_ITEM(RG_MAGIC_BEAN_PACK,                   OBJECT_GI_BEAN,     GID_BEAN,             TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_MAGIC_BEAN_PACK),
-        GET_ITEM(RG_TYCOON_WALLET,                     OBJECT_GI_PURSE,    GID_WALLET_GIANT,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_TYCOON_WALLET),
-        GET_ITEM(RG_PROGRESSIVE_BOMBCHUS,              OBJECT_GI_BOMB_2,   GID_BOMBCHU,          0x33,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_PROGRESSIVE_BOMBCHUS),
-        GET_ITEM(RG_TRIFORCE_PIECE,                    OBJECT_GI_BOMB_2,   GID_TRIFORCE_PIECE,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_TRIFORCE_PIECE),
-    };
-    ItemTableManager::Instance->AddItemTable(MOD_RANDOMIZER);
-    for (int i = 0; i < ARRAY_COUNT(extendedVanillaGetItemTable); i++) {
-        ItemTableManager::Instance->AddItemEntry(MOD_RANDOMIZER, extendedVanillaGetItemTable[i].getItemId, extendedVanillaGetItemTable[i]);
-    }
-    for (int i = 0; i < ARRAY_COUNT(randoGetItemTable); i++) {
-        if (randoGetItemTable[i].itemId >= RG_FOREST_TEMPLE_SMALL_KEY && randoGetItemTable[i].itemId <= RG_GANONS_CASTLE_SMALL_KEY
-            && randoGetItemTable[i].itemId != RG_GERUDO_FORTRESS_SMALL_KEY) {
-            randoGetItemTable[i].drawFunc = (CustomDrawFunc)Randomizer_DrawSmallKey;
-        } else if (randoGetItemTable[i].itemId >= RG_FOREST_TEMPLE_KEY_RING && randoGetItemTable[i].itemId <= RG_GANONS_CASTLE_KEY_RING) {
-            randoGetItemTable[i].drawFunc = (CustomDrawFunc)Randomizer_DrawKeyRing;
-        } else if (randoGetItemTable[i].itemId >= RG_FOREST_TEMPLE_BOSS_KEY && randoGetItemTable[i].itemId <= RG_GANONS_CASTLE_BOSS_KEY) {
-            randoGetItemTable[i].drawFunc = (CustomDrawFunc)Randomizer_DrawBossKey;
-        } else if (randoGetItemTable[i].itemId == RG_DOUBLE_DEFENSE) {
-            randoGetItemTable[i].drawFunc = (CustomDrawFunc)Randomizer_DrawDoubleDefense;
-        } else if (randoGetItemTable[i].itemId == RG_TRIFORCE_PIECE) {
-            randoGetItemTable[i].drawFunc = (CustomDrawFunc)Randomizer_DrawTriforcePiece;
-        }
-        ItemTableManager::Instance->AddItemEntry(MOD_RANDOMIZER, randoGetItemTable[i].itemId, randoGetItemTable[i]);
-    }
-}
-
 
 void RandomizerSettingsWindow::InitElement() {
     Randomizer::CreateCustomMessages();
     seedString = (char*)calloc(MAX_SEED_STRING_SIZE, sizeof(char));
-    InitRandoItemTable();
 }
diff --git a/soh/soh/Enhancements/randomizer/randomizer.h b/soh/soh/Enhancements/randomizer/randomizer.h
index a726cecde..ed3a45cb4 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.h
+++ b/soh/soh/Enhancements/randomizer/randomizer.h
@@ -7,6 +7,7 @@
 #include <libultraship/libultra.h>
 #include "z64item.h"
 #include <memory>
+#include "context.h"
 #include <soh/Enhancements/randomizer/randomizerTypes.h>
 #include "soh/Enhancements/randomizer/randomizer_check_objects.h"
 #include "soh/Enhancements/randomizer/randomizer_tricks.h"
@@ -85,7 +86,7 @@ class Randomizer {
     std::string GetDampeText() const;
     std::string GetSheikText() const;
     std::string GetSariaText() const;
-    RandomizerCheckObject GetCheckObjectFromActor(s16 actorId, s16 sceneNum, s32 actorParams);
+    Rando::Location* GetCheckObjectFromActor(s16 actorId, s16 sceneNum, s32 actorParams);
     ScrubIdentity IdentifyScrub(s32 sceneNum, s32 actorParams, s32 respawnData);
     ShopItemIdentity IdentifyShopItem(s32 sceneNum, u8 slotIndex);
     CowIdentity IdentifyCow(s32 sceneNum, s32 posX, s32 posZ);
diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h
index b1e843497..4dc5a590a 100644
--- a/soh/soh/Enhancements/randomizer/randomizerTypes.h
+++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@@ -44,6 +44,7 @@ typedef enum {
     HINT_TYPE_DUNGEON,
     HINT_TYPE_JUNK,
     HINT_TYPE_NAMED_ITEM,
+    HINT_TYPE_STATIC, // For special hints, like Light Arrows or Hookshot Hints
     HINT_TYPE_MAX
 } HintType;
 
@@ -71,7 +72,7 @@ typedef enum {
     RCTYPE_OCARINA,                    // Ocarina locations
 } RandomizerCheckType;
 
-typedef enum { RCVORMQ_VANILLA, RCVORMQ_MQ, RCVORMQ_BOTH } RandomizerCheckVanillaOrMQ;
+typedef enum { RCQUEST_VANILLA, RCQUEST_MQ, RCQUEST_BOTH } RandomizerCheckQuest;
 
 typedef enum {
     RCAREA_KOKIRI_FOREST,
@@ -110,6 +111,496 @@ typedef enum {
     RCAREA_INVALID
 } RandomizerCheckArea;
 
+typedef enum {
+    RR_NONE,
+    RR_ROOT,
+    RR_ROOT_EXITS,
+    RR_CHILD_SPAWN,
+    RR_ADULT_SPAWN,
+    RR_MINUET_OF_FOREST_WARP,
+    RR_BOLERO_OF_FIRE_WARP,
+    RR_SERENADE_OF_WATER_WARP,
+    RR_REQUIEM_OF_SPIRIT_WARP,
+    RR_NOCTURNE_OF_SHADOW_WARP,
+    RR_PRELUDE_OF_LIGHT_WARP,
+    RR_KOKIRI_FOREST,
+    RR_KF_LINKS_HOUSE,
+    RR_KF_MIDOS_HOUSE,
+    RR_KF_SARIAS_HOUSE,
+    RR_KF_HOUSE_OF_TWINS,
+    RR_KF_KNOW_IT_ALL_HOUSE,
+    RR_KF_KOKIRI_SHOP,
+    RR_KF_OUTSIDE_DEKU_TREE,
+    RR_KF_STORMS_GROTTO,
+    RR_THE_LOST_WOODS,
+    RR_LW_BRIDGE_FROM_FOREST,
+    RR_LW_BRIDGE,
+    RR_LW_FOREST_EXIT,
+    RR_LW_BEYOND_MIDO,
+    RR_LW_NEAR_SHORTCUTS_GROTTO,
+    RR_DEKU_THEATER,
+    RR_LW_SCRUBS_GROTTO,
+    RR_SFM_ENTRYWAY,
+    RR_SACRED_FOREST_MEADOW,
+    RR_SFM_WOLFOS_GROTTO,
+    RR_SFM_FAIRY_GROTTO,
+    RR_SFM_STORMS_GROTTO,
+    RR_HYRULE_FIELD,
+    RR_HF_SOUTHEAST_GROTTO,
+    RR_HF_OPEN_GROTTO,
+    RR_HF_INSIDE_FENCE_GROTTO,
+    RR_HF_COW_GROTTO,
+    RR_HF_NEAR_MARKET_GROTTO,
+    RR_HF_FAIRY_GROTTO,
+    RR_HF_NEAR_KAK_GROTTO,
+    RR_HF_TEKTITE_GROTTO,
+    RR_LAKE_HYLIA,
+    RR_LH_FISHING_ISLAND,
+    RR_LH_OWL_FLIGHT,
+    RR_LH_LAB,
+    RR_LH_FISHING_HOLE,
+    RR_LH_GROTTO,
+    RR_GERUDO_VALLEY,
+    RR_GV_UPPER_STREAM,
+    RR_GV_LOWER_STREAM,
+    RR_GV_GROTTO_LEDGE,
+    RR_GV_CRATE_LEDGE,
+    RR_GV_OCTOROK_GROTTO,
+    RR_GV_FORTRESS_SIDE,
+    RR_GV_CARPENTER_TENT,
+    RR_GV_STORMS_GROTTO,
+    RR_GERUDO_FORTRESS,
+    RR_GF_OUTSIDE_GATE,
+    RR_GF_STORMS_GROTTO,
+    RR_WASTELAND_NEAR_FORTRESS,
+    RR_HAUNTED_WASTELAND,
+    RR_WASTELAND_NEAR_COLOSSUS,
+    RR_DESERT_COLOSSUS,
+    RR_DESERT_COLOSSUS_FROM_SPIRIT_ENTRYWAY,
+    RR_COLOSSUS_GREAT_FAIRY_FOUNTAIN,
+    RR_COLOSSUS_GROTTO,
+    RR_MARKET_ENTRANCE,
+    RR_THE_MARKET,
+    RR_MARKET_GUARD_HOUSE,
+    RR_MARKET_BAZAAR,
+    RR_MARKET_MASK_SHOP,
+    RR_MARKET_SHOOTING_GALLERY,
+    RR_MARKET_BOMBCHU_BOWLING,
+    RR_MARKET_TREASURE_CHEST_GAME,
+    RR_MARKET_POTION_SHOP,
+    RR_MARKET_BACK_ALLEY,
+    RR_MARKET_BOMBCHU_SHOP,
+    RR_MARKET_DOG_LADY_HOUSE,
+    RR_MARKET_MAN_IN_GREEN_HOUSE,
+    RR_TOT_ENTRANCE,
+    RR_TEMPLE_OF_TIME,
+    RR_TOT_BEYOND_DOOR_OF_TIME,
+    RR_CASTLE_GROUNDS,
+    RR_CASTLE_GROUNDS_FROM_GANONS_CASTLE,
+    RR_HYRULE_CASTLE_GROUNDS,
+    RR_HC_GARDEN,
+    RR_HC_GREAT_FAIRY_FOUNTAIN,
+    RR_HC_STORMS_GROTTO,
+    RR_GANONS_CASTLE_GROUNDS,
+    RR_OGC_GREAT_FAIRY_FOUNTAIN,
+    RR_GANONS_CASTLE_LEDGE,
+    RR_KAKARIKO_VILLAGE,
+    RR_KAK_CARPENTER_BOSS_HOUSE,
+    RR_KAK_HOUSE_OF_SKULLTULA,
+    RR_KAK_IMPAS_HOUSE,
+    RR_KAK_IMPAS_LEDGE,
+    RR_KAK_IMPAS_HOUSE_BACK,
+    RR_KAK_IMPAS_HOUSE_NEAR_COW,
+    RR_KAK_WINDMILL,
+    RR_KAK_BAZAAR,
+    RR_KAK_SHOOTING_GALLERY,
+    RR_KAK_POTION_SHOP_FRONT,
+    RR_KAK_POTION_SHOP_BACK,
+    RR_KAK_ROOFTOP,
+    RR_KAK_IMPAS_ROOFTOP,
+    RR_KAK_BEHIND_GATE,
+    RR_KAK_BACKYARD,
+    RR_KAK_ODD_POTION_BUILDING,
+    RR_KAK_REDEAD_GROTTO,
+    RR_KAK_OPEN_GROTTO,
+    RR_THE_GRAVEYARD,
+    RR_GRAVEYARD_DAMPES_GRAVE,
+    RR_GRAVEYARD_DAMPES_HOUSE,
+    RR_GRAVEYARD_SHIELD_GRAVE,
+    RR_GRAVEYARD_COMPOSERS_GRAVE,
+    RR_GRAVEYARD_HEART_PIECE_GRAVE,
+    RR_GRAVEYARD_WARP_PAD_REGION,
+    RR_DEATH_MOUNTAIN_TRAIL,
+    RR_DEATH_MOUNTAIN_SUMMIT,
+    RR_DMT_OWL_FLIGHT,
+    RR_DMT_GREAT_FAIRY_FOUNTAIN,
+    RR_DMT_COW_GROTTO,
+    RR_DMT_STORMS_GROTTO,
+    RR_GORON_CITY,
+    RR_GC_WOODS_WARP,
+    RR_GC_DARUNIAS_CHAMBER,
+    RR_GC_GROTTO_PLATFORM,
+    RR_GC_SHOP,
+    RR_GC_GROTTO,
+    RR_DMC_UPPER_LOCAL,
+    RR_DMC_CENTRAL_LOCAL,
+    RR_DMC_LOWER_LOCAL,
+    RR_DMC_LOWER_NEARBY,
+    RR_DMC_UPPER_NEARBY,
+    RR_DMC_CENTRAL_NEARBY,
+    RR_DMC_LADDER_AREA_NEARBY,
+    RR_DMC_UPPER_GROTTO,
+    RR_DMC_HAMMER_GROTTO,
+    RR_DMC_GREAT_FAIRY_FOUNTAIN,
+    RR_ZR_FRONT,
+    RR_ZORAS_RIVER,
+    RR_ZR_BEHIND_WATERFALL,
+    RR_ZR_OPEN_GROTTO,
+    RR_ZR_FAIRY_GROTTO,
+    RR_ZR_STORMS_GROTTO,
+    RR_ZORAS_DOMAIN,
+    RR_ZD_BEHIND_KING_ZORA,
+    RR_ZD_SHOP,
+    RR_ZD_STORMS_GROTTO,
+    RR_ZORAS_FOUNTAIN,
+    RR_ZF_GREAT_FAIRY_FOUNTAIN,
+    RR_LON_LON_RANCH,
+    RR_LLR_TALONS_HOUSE,
+    RR_LLR_STABLES,
+    RR_LLR_TOWER,
+    RR_LLR_GROTTO,
+
+    RR_DEKU_TREE_ENTRYWAY,
+    RR_DODONGOS_CAVERN_ENTRYWAY,
+    RR_JABU_JABUS_BELLY_ENTRYWAY,
+    RR_FOREST_TEMPLE_ENTRYWAY,
+    RR_FIRE_TEMPLE_ENTRYWAY,
+    RR_WATER_TEMPLE_ENTRYWAY,
+    RR_SPIRIT_TEMPLE_ENTRYWAY,
+    RR_SHADOW_TEMPLE_ENTRYWAY,
+    RR_BOTTOM_OF_THE_WELL_ENTRYWAY,
+    RR_ICE_CAVERN_ENTRYWAY,
+    RR_GERUDO_TRAINING_GROUNDS_ENTRYWAY,
+    RR_GANONS_CASTLE_ENTRYWAY,
+
+    RR_DEKU_TREE_LOBBY,
+    RR_DEKU_TREE_2F_MIDDLE_ROOM,
+    RR_DEKU_TREE_SLINGSHOT_ROOM,
+    RR_DEKU_TREE_COMPASS_ROOM,
+    RR_DEKU_TREE_BASEMENT_LOWER,
+    RR_DEKU_TREE_BASEMENT_SCRUB_ROOM,
+    RR_DEKU_TREE_BASEMENT_WATER_ROOM,
+    RR_DEKU_TREE_BASEMENT_TORCH_ROOM,
+    RR_DEKU_TREE_BASEMENT_BACK_LOBBY,
+    RR_DEKU_TREE_BASEMENT_BACK_ROOM,
+    RR_DEKU_TREE_BASEMENT_UPPER,
+    RR_DEKU_TREE_OUTSIDE_BOSS_ROOM,
+
+    RR_DEKU_TREE_MQ_LOBBY,
+    RR_DEKU_TREE_MQ_COMPASS_ROOM,
+    RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_FRONT,
+    RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK,
+    RR_DEKU_TREE_MQ_BASEMENT_BACK_ROOM,
+    RR_DEKU_TREE_MQ_BASEMENT_LEDGE,
+    RR_DEKU_TREE_MQ_OUTSIDE_BOSS_ROOM,
+
+    RR_DEKU_TREE_BOSS_ENTRYWAY,
+    RR_DEKU_TREE_BOSS_ROOM,
+
+    RR_DODONGOS_CAVERN_BEGINNING,
+    RR_DODONGOS_CAVERN_LOBBY,
+    RR_DODONGOS_CAVERN_LOBBY_SWITCH,
+    RR_DODONGOS_CAVERN_SE_CORRIDOR,
+    RR_DODONGOS_CAVERN_SE_ROOM,
+    RR_DODONGOS_CAVERN_NEAR_LOWER_LIZALFOS,
+    RR_DODONGOS_CAVERN_LOWER_LIZALFOS,
+    RR_DODONGOS_CAVERN_DODONGO_ROOM,
+    RR_DODONGOS_CAVERN_NEAR_DODONGO_ROOM,
+    RR_DODONGOS_CAVERN_STAIRS_LOWER,
+    RR_DODONGOS_CAVERN_STAIRS_UPPER,
+    RR_DODONGOS_CAVERN_COMPASS_ROOM,
+    RR_DODONGOS_CAVERN_ARMOS_ROOM,
+    RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER,
+    RR_DODONGOS_CAVERN_2F_SIDE_ROOM,
+    RR_DODONGOS_CAVERN_FIRST_SLINGSHOT_ROOM,
+    RR_DODONGOS_CAVERN_UPPER_LIZALFOS,
+    RR_DODONGOS_CAVERN_SECOND_SLINGSHOT_ROOM,
+    RR_DODONGOS_CAVERN_BOMB_ROOM_UPPER,
+    RR_DODONGOS_CAVERN_FAR_BRIDGE,
+    RR_DODONGOS_CAVERN_BOSS_AREA,
+    RR_DODONGOS_CAVERN_BACK_ROOM,
+
+    RR_DODONGOS_CAVERN_MQ_BEGINNING,
+    RR_DODONGOS_CAVERN_MQ_LOBBY,
+    RR_DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE,
+    RR_DODONGOS_CAVERN_MQ_BOMB_BAG_AREA,
+    RR_DODONGOS_CAVERN_MQ_BOSS_AREA,
+
+    RR_DODONGOS_CAVERN_BOSS_ENTRYWAY,
+    RR_DODONGOS_CAVERN_BOSS_ROOM,
+
+    RR_JABU_JABUS_BELLY_BEGINNING,
+    RR_JABU_JABUS_BELLY_LIFT_MIDDLE,
+    RR_JABU_JABUS_BELLY_MAIN_UPPER,
+    RR_JABU_JABUS_BELLY_MAIN_LOWER,
+    RR_JABU_JABUS_BELLY_SHABOMB_CORRIDOR,
+    RR_JABU_JABUS_BELLY_LOWER_SIDE_ROOM,
+    RR_JABU_JABUS_BELLY_LIFT_LOWER,
+    RR_JABU_JABUS_BELLY_FORKED_CORRIDOR,
+    RR_JABU_JABUS_BELLY_BOOMERANG_ROOM,
+    RR_JABU_JABUS_BELLY_MAP_ROOM,
+    RR_JABU_JABUS_BELLY_COMPASS_ROOM,
+    RR_JABU_JABUS_BELLY_BLUE_TENTACLE,
+    RR_JABU_JABUS_BELLY_GREEN_TENTACLE,
+    RR_JABU_JABUS_BELLY_BIGOCTO_ROOM,
+    RR_JABU_JABUS_BELLY_ABOVE_BIGOCTO,
+    RR_JABU_JABUS_BELLY_LIFT_UPPER,
+    RR_JABU_JABUS_BELLY_NEAR_BOSS_ROOM,
+
+    RR_JABU_JABUS_BELLY_MQ_BEGINNING,
+    RR_JABU_JABUS_BELLY_MQ_MAIN,
+    RR_JABU_JABUS_BELLY_MQ_DEPTHS,
+    RR_JABU_JABUS_BELLY_MQ_BOSS_AREA,
+
+    RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY,
+    RR_JABU_JABUS_BELLY_BOSS_ROOM,
+
+    RR_FOREST_TEMPLE_FIRST_ROOM,
+    RR_FOREST_TEMPLE_SOUTH_CORRIDOR,
+    RR_FOREST_TEMPLE_LOBBY,
+    RR_FOREST_TEMPLE_NORTH_CORRIDOR,
+    RR_FOREST_TEMPLE_LOWER_STALFOS,
+    RR_FOREST_TEMPLE_NW_OUTDOORS_LOWER,
+    RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER,
+    RR_FOREST_TEMPLE_NE_OUTDOORS_LOWER,
+    RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER,
+    RR_FOREST_TEMPLE_MAP_ROOM,
+    RR_FOREST_TEMPLE_SEWER,
+    RR_FOREST_TEMPLE_BELOW_BOSS_KEY_CHEST,
+    RR_FOREST_TEMPLE_FLOORMASTER_ROOM,
+    RR_FOREST_TEMPLE_WEST_CORRIDOR,
+    RR_FOREST_TEMPLE_BLOCK_PUSH_ROOM,
+    RR_FOREST_TEMPLE_NW_CORRIDOR_TWISTED,
+    RR_FOREST_TEMPLE_NW_CORRIDOR_STRAIGHTENED,
+    RR_FOREST_TEMPLE_RED_POE_ROOM,
+    RR_FOREST_TEMPLE_UPPER_STALFOS,
+    RR_FOREST_TEMPLE_BLUE_POE_ROOM,
+    RR_FOREST_TEMPLE_NE_CORRIDOR_STRAIGHTENED,
+    RR_FOREST_TEMPLE_NE_CORRIDOR_TWISTED,
+    RR_FOREST_TEMPLE_FROZEN_EYE_ROOM,
+    RR_FOREST_TEMPLE_FALLING_ROOM,
+    RR_FOREST_TEMPLE_GREEN_POE_ROOM,
+    RR_FOREST_TEMPLE_EAST_CORRIDOR,
+    RR_FOREST_TEMPLE_BOSS_REGION,
+
+    RR_FOREST_TEMPLE_MQ_LOBBY,
+    RR_FOREST_TEMPLE_MQ_CENTRAL_AREA,
+    RR_FOREST_TEMPLE_MQ_AFTER_BLOCK_PUZZLE,
+    RR_FOREST_TEMPLE_MQ_OUTDOOR_LEDGE,
+    RR_FOREST_TEMPLE_MQ_NW_OUTDOORS,
+    RR_FOREST_TEMPLE_MQ_NE_OUTDOORS,
+    RR_FOREST_TEMPLE_MQ_OUTDOORS_TOP_LEDGES,
+    RR_FOREST_TEMPLE_MQ_NE_OUTDOORS_LEDGE,
+    RR_FOREST_TEMPLE_MQ_BOW_REGION,
+    RR_FOREST_TEMPLE_MQ_FALLING_ROOM,
+    RR_FOREST_TEMPLE_MQ_BOSS_REGION,
+
+    RR_FOREST_TEMPLE_BOSS_ENTRYWAY,
+    RR_FOREST_TEMPLE_BOSS_ROOM,
+
+    RR_FIRE_TEMPLE_FIRST_ROOM,
+    RR_FIRE_TEMPLE_NEAR_BOSS_ROOM,
+    RR_FIRE_TEMPLE_LOOP_ENEMIES,
+    RR_FIRE_TEMPLE_LOOP_TILES,
+    RR_FIRE_TEMPLE_LOOP_FLARE_DANCER,
+    RR_FIRE_TEMPLE_LOOP_HAMMER_SWITCH,
+    RR_FIRE_TEMPLE_LOOP_GORON_ROOM,
+    RR_FIRE_TEMPLE_LOOP_EXIT,
+    RR_FIRE_TEMPLE_BIG_LAVA_ROOM,
+    RR_FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_GORON,
+    RR_FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_TILES,
+    RR_FIRE_TEMPLE_BIG_LAVA_ROOM_SOUTH_GORON,
+    RR_FIRE_TEMPLE_FIRE_PILLAR_ROOM,
+    RR_FIRE_TEMPLE_SHORTCUT_ROOM,
+    RR_FIRE_TEMPLE_SHORTCUT_CLIMB,
+    RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER,
+    RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER_SIDE_ROOM,
+    RR_FIRE_TEMPLE_EAST_CENTRAL_ROOM,
+    RR_FIRE_TEMPLE_FIRE_WALL_CHASE,
+    RR_FIRE_TEMPLE_MAP_AREA,
+    RR_FIRE_TEMPLE_BOULDER_MAZE_UPPER,
+    RR_FIRE_TEMPLE_SCARECROW_ROOM,
+    RR_FIRE_TEMPLE_EAST_PEAK,
+    RR_FIRE_TEMPLE_CORRIDOR,
+    RR_FIRE_TEMPLE_FIRE_MAZE_ROOM,
+    RR_FIRE_TEMPLE_FIRE_MAZE_UPPER,
+    RR_FIRE_TEMPLE_FIRE_MAZE_SIDE_ROOM,
+    RR_FIRE_TEMPLE_WEST_CENTRAL_LOWER,
+    RR_FIRE_TEMPLE_WEST_CENTRAL_UPPER,
+    RR_FIRE_TEMPLE_LATE_FIRE_MAZE,
+    RR_FIRE_TEMPLE_UPPER_FLARE_DANCER,
+    RR_FIRE_TEMPLE_WEST_CLIMB,
+    RR_FIRE_TEMPLE_WEST_PEAK,
+    RR_FIRE_TEMPLE_HAMMER_RETURN_PATH,
+    RR_FIRE_TEMPLE_ABOVE_FIRE_MAZE,
+
+    RR_FIRE_TEMPLE_MQ_LOWER,
+    RR_FIRE_TEMPLE_MQ_LOWER_LOCKED_DOOR,
+    RR_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM,
+    RR_FIRE_TEMPLE_MQ_LOWER_MAZE,
+    RR_FIRE_TEMPLE_MQ_UPPER_MAZE,
+    RR_FIRE_TEMPLE_MQ_UPPER,
+
+    RR_FIRE_TEMPLE_BOSS_ENTRYWAY,
+    RR_FIRE_TEMPLE_BOSS_ROOM,
+
+    RR_WATER_TEMPLE_LOBBY,
+    RR_WATER_TEMPLE_EAST_LOWER,
+    RR_WATER_TEMPLE_MAP_ROOM,
+    RR_WATER_TEMPLE_CRACKED_WALL,
+    RR_WATER_TEMPLE_TORCH_ROOM,
+    RR_WATER_TEMPLE_NORTH_LOWER,
+    RR_WATER_TEMPLE_BOULDERS_LOWER,
+    RR_WATER_TEMPLE_BLOCK_ROOM,
+    RR_WATER_TEMPLE_JETS_ROOM,
+    RR_WATER_TEMPLE_BOULDERS_UPPER,
+    RR_WATER_TEMPLE_BOSS_KEY_ROOM,
+    RR_WATER_TEMPLE_SOUTH_LOWER,
+    RR_WATER_TEMPLE_WEST_LOWER,
+    RR_WATER_TEMPLE_DRAGON_ROOM,
+    RR_WATER_TEMPLE_CENTRAL_PILLAR_LOWER,
+    RR_WATER_TEMPLE_CENTRAL_PILLAR_UPPER,
+    RR_WATER_TEMPLE_CENTRAL_PILLAR_BASEMENT,
+    RR_WATER_TEMPLE_EAST_MIDDLE,
+    RR_WATER_TEMPLE_WEST_MIDDLE,
+    RR_WATER_TEMPLE_HIGH_WATER,
+    RR_WATER_TEMPLE_BLOCK_CORRIDOR,
+    RR_WATER_TEMPLE_FALLING_PLATFORM_ROOM,
+    RR_WATER_TEMPLE_DRAGON_PILLARS_ROOM,
+    RR_WATER_TEMPLE_DARK_LINK_ROOM,
+    RR_WATER_TEMPLE_LONGSHOT_ROOM,
+    RR_WATER_TEMPLE_RIVER,
+    RR_WATER_TEMPLE_PRE_BOSS_ROOM,
+
+    RR_WATER_TEMPLE_MQ_LOBBY,
+    RR_WATER_TEMPLE_MQ_DIVE,
+    RR_WATER_TEMPLE_MQ_LOWERED_WATER_LEVELS,
+    RR_WATER_TEMPLE_MQ_DARK_LINK_REGION,
+    RR_WATER_TEMPLE_MQ_BASEMENT_GATED_AREAS,
+
+    RR_WATER_TEMPLE_BOSS_ENTRYWAY,
+    RR_WATER_TEMPLE_BOSS_ROOM,
+
+    RR_SPIRIT_TEMPLE_LOBBY,
+    RR_SPIRIT_TEMPLE_CHILD,
+    RR_SPIRIT_TEMPLE_CHILD_CLIMB,
+    RR_SPIRIT_TEMPLE_EARLY_ADULT,
+    RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER,
+    RR_SPIRIT_TEMPLE_OUTDOOR_HANDS,
+    RR_SPIRIT_TEMPLE_BEYOND_CENTRAL_LOCKED_DOOR,
+    RR_SPIRIT_TEMPLE_BEYOND_FINAL_LOCKED_DOOR,
+    RR_SPIRIT_TEMPLE_INSIDE_STATUE_HEAD,
+
+    RR_SPIRIT_TEMPLE_MQ_LOBBY,
+    RR_SPIRIT_TEMPLE_MQ_CHILD,
+    RR_SPIRIT_TEMPLE_MQ_ADULT,
+    RR_SPIRIT_TEMPLE_MQ_SHARED,
+    RR_SPIRIT_TEMPLE_MQ_LOWER_ADULT,
+    RR_SPIRIT_TEMPLE_MQ_BOSS_AREA,
+    RR_SPIRIT_TEMPLE_MQ_MIRROR_SHIELD_HAND,
+    RR_SPIRIT_TEMPLE_MQ_SILVER_GAUNTLETS_HAND,
+    RR_SPIRIT_TEMPLE_MQ_INSIDE_STATUE_HEAD,
+
+    RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY,
+    RR_SPIRIT_TEMPLE_BOSS_ROOM,
+
+    RR_SHADOW_TEMPLE_BEGINNING,
+    RR_SHADOW_TEMPLE_FIRST_BEAMOS,
+    RR_SHADOW_TEMPLE_HUGE_PIT,
+    RR_SHADOW_TEMPLE_WIND_TUNNEL,
+    RR_SHADOW_TEMPLE_BEYOND_BOAT,
+
+    RR_SHADOW_TEMPLE_MQ_ENTRYWAY,
+    RR_SHADOW_TEMPLE_MQ_BEGINNING,
+    RR_SHADOW_TEMPLE_MQ_DEAD_HAND_AREA,
+    RR_SHADOW_TEMPLE_MQ_FIRST_BEAMOS,
+    RR_SHADOW_TEMPLE_MQ_UPPER_HUGE_PIT,
+    RR_SHADOW_TEMPLE_MQ_LOWER_HUGE_PIT,
+    RR_SHADOW_TEMPLE_MQ_WIND_TUNNEL,
+    RR_SHADOW_TEMPLE_MQ_BEYOND_BOAT,
+    RR_SHADOW_TEMPLE_MQ_INVISIBLE_MAZE,
+
+    RR_SHADOW_TEMPLE_BOSS_ENTRYWAY,
+    RR_SHADOW_TEMPLE_BOSS_ROOM,
+
+    RR_BOTTOM_OF_THE_WELL_MAIN_AREA,
+
+    RR_BOTTOM_OF_THE_WELL_MQ_PERIMETER,
+    RR_BOTTOM_OF_THE_WELL_MQ_MIDDLE,
+
+    RR_ICE_CAVERN_BEGINNING,
+    RR_ICE_CAVERN_MAIN,
+
+    RR_ICE_CAVERN_MQ_BEGINNING,
+    RR_ICE_CAVERN_MQ_MAP_ROOM,
+    RR_ICE_CAVERN_MQ_IRON_BOOTS_REGION,
+    RR_ICE_CAVERN_MQ_COMPASS_ROOM,
+
+    RR_GERUDO_TRAINING_GROUNDS_LOBBY,
+    RR_GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE,
+    RR_GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE_RIGHT,
+    RR_GERUDO_TRAINING_GROUNDS_LAVA_ROOM,
+    RR_GERUDO_TRAINING_GROUNDS_HAMMER_ROOM,
+    RR_GERUDO_TRAINING_GROUNDS_EYE_STATUE_LOWER,
+    RR_GERUDO_TRAINING_GROUNDS_EYE_STATUE_UPPER,
+    RR_GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_ROOM,
+    RR_GERUDO_TRAINING_GROUNDS_LIKE_LIKE_ROOM,
+
+    RR_GERUDO_TRAINING_GROUNDS_MQ_LOBBY,
+    RR_GERUDO_TRAINING_GROUNDS_MQ_RIGHT_SIDE,
+    RR_GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER,
+    RR_GERUDO_TRAINING_GROUNDS_MQ_LEFT_SIDE,
+    RR_GERUDO_TRAINING_GROUNDS_MQ_STALFOS_ROOM,
+    RR_GERUDO_TRAINING_GROUNDS_MQ_BACK_AREAS,
+    RR_GERUDO_TRAINING_GROUNDS_MQ_CENTRAL_MAZE_RIGHT,
+
+    RR_GANONS_CASTLE_LOBBY,
+    RR_GANONS_CASTLE_DEKU_SCRUBS,
+    RR_GANONS_CASTLE_FOREST_TRIAL,
+    RR_GANONS_CASTLE_FIRE_TRIAL,
+    RR_GANONS_CASTLE_WATER_TRIAL,
+    RR_GANONS_CASTLE_SHADOW_TRIAL,
+    RR_GANONS_CASTLE_SPIRIT_TRIAL,
+    RR_GANONS_CASTLE_LIGHT_TRIAL,
+    RR_GANONS_CASTLE_TOWER,
+
+    RR_GANONS_CASTLE_MQ_LOBBY,
+    RR_GANONS_CASTLE_MQ_DEKU_SCRUBS,
+    RR_GANONS_CASTLE_MQ_FOREST_TRIAL,
+    RR_GANONS_CASTLE_MQ_FIRE_TRIAL,
+    RR_GANONS_CASTLE_MQ_WATER_TRIAL,
+    RR_GANONS_CASTLE_MQ_SHADOW_TRIAL,
+    RR_GANONS_CASTLE_MQ_SPIRIT_TRIAL,
+    RR_GANONS_CASTLE_MQ_LIGHT_TRIAL,
+
+    RR_MARKER_AREAS_END, // Used for area key count
+
+    // DUNGEONS
+    RR_DEKU_TREE,
+    RR_DODONGOS_CAVERN,
+    RR_JABU_JABUS_BELLY,
+    RR_FOREST_TEMPLE,
+    RR_FIRE_TEMPLE,
+    RR_WATER_TEMPLE,
+    RR_SPIRIT_TEMPLE,
+    RR_SHADOW_TEMPLE,
+    RR_BOTTOM_OF_THE_WELL,
+    RR_ICE_CAVERN,
+    RR_GERUDO_TRAINING_GROUNDS,
+    RR_GANONS_CASTLE,
+    RR_MAX,
+} RandomizerRegion;
+
 typedef enum {
     RC_UNKNOWN_CHECK,
     RC_LINKS_POCKET,
@@ -1123,6 +1614,7 @@ typedef enum {
 typedef enum {
     RG_NONE,
     RG_KOKIRI_SWORD,
+    RG_MASTER_SWORD,
     RG_GIANTS_KNIFE,
     RG_BIGGORON_SWORD,
     RG_DEKU_SHIELD,
@@ -1316,9 +1808,1395 @@ typedef enum {
     RG_TRIFORCE_PIECE,
     RG_HINT,
     RG_TYCOON_WALLET,
+    RG_FAIRY_OCARINA,
+    RG_OCARINA_OF_TIME,
+    RG_BOMB_BAG,
+    RG_BIG_BOMB_BAG,
+    RG_BIGGEST_BOMB_BAG,
+    RG_FAIRY_BOW,
+    RG_BIG_QUIVER,
+    RG_BIGGEST_QUIVER,
+    RG_FAIRY_SLINGSHOT,
+    RG_BIG_BULLET_BAG,
+    RG_BIGGEST_BULLET_BAG,
+    RG_GORONS_BRACELET,
+    RG_SILVER_GAUNTLETS,
+    RG_GOLDEN_GAUNTLETS,
+    RG_SILVER_SCALE,
+    RG_GOLDEN_SCALE,
+    RG_ADULT_WALLET,
+    RG_GIANT_WALLET,
+    RG_DEKU_NUT_CAPACITY_30,
+    RG_DEKU_NUT_CAPACITY_40,
+    RG_DEKU_STICK_CAPACITY_20,
+    RG_DEKU_STICK_CAPACITY_30,
+    RG_HOOKSHOT,
+    RG_LONGSHOT,
+    RG_SCARECROW,
+    // Logic Only
+    RG_DISTANT_SCARECROW,
+    RG_STICKS,
     RG_MAX
 } RandomizerGet;
 
+typedef enum {
+    RH_NONE,
+    RH_DMC_GOSSIP_STONE,
+    RH_DMT_GOSSIP_STONE,
+    RH_COLOSSUS_GOSSIP_STONE,
+    RH_DODONGOS_CAVERN_GOSSIP_STONE,
+    RH_GV_GOSSIP_STONE,
+    RH_GC_MAZE_GOSSIP_STONE,
+    RH_GC_MEDIGORON_GOSSIP_STONE,
+    RH_GRAVEYARD_GOSSIP_STONE,
+    RH_HC_MALON_GOSSIP_STONE,
+    RH_HC_ROCK_WALL_GOSSIP_STONE,
+    RH_HC_STORMS_GROTTO_GOSSIP_STONE,
+    RH_KF_DEKU_TREE_GOSSIP_STONE_LEFT,
+    RH_KF_DEKU_TREE_GOSSIP_STONE_RIGHT,
+    RH_KF_GOSSIP_STONE,
+    RH_LH_LAB_GOSSIP_STONE,
+    RH_LH_GOSSIP_STONE_SOUTHEAST,
+    RH_LH_GOSSIP_STONE_SOUTHWEST,
+    RH_LW_GOSSIP_STONE,
+    RH_SFM_MAZE_GOSSIP_STONE_LOWER,
+    RH_SFM_MAZE_GOSSIP_STONE_UPPER,
+    RH_SFM_SARIA_GOSSIP_STONE,
+    RH_TOT_GOSSIP_STONE_LEFT,
+    RH_TOT_GOSSIP_STONE_RIGHT,
+    RH_TOT_GOSSIP_STONE_RIGHT_CENTER,
+    RH_TOT_GOSSIP_STONE_LEFT_CENTER,
+    RH_ZD_GOSSIP_STONE,
+    RH_ZF_FAIRY_GOSSIP_STONE,
+    RH_ZF_JABU_GOSSIP_STONE,
+    RH_ZR_NEAR_GROTTOS_GOSSIP_STONE,
+    RH_ZR_NEAR_DOMAIN_GOSSIP_STONE,
+    RH_HF_COW_GROTTO_GOSSIP_STONE,
+    RH_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE,
+    RH_HF_SOUTHEAST_GROTTO_GOSSIP_STONE,
+    RH_HF_OPEN_GROTTO_GOSSIP_STONE,
+    RH_KAK_OPEN_GROTTO_GOSSIP_STONE,
+    RH_ZR_OPEN_GROTTO_GOSSIP_STONE,
+    RH_KF_STORMS_GROTTO_GOSSIP_STONE,
+    RH_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE,
+    RH_DMT_STORMS_GROTTO_GOSSIP_STONE,
+    RH_DMC_UPPER_GROTTO_GOSSIP_STONE,
+    RH_GANONDORF_HINT,
+    RH_DAMPES_DIARY,
+    RH_GREG_RUPEE,
+    RH_MEDIGORON,
+    RH_GRANNYS_SHOP,
+    RH_WASTELAND_BOMBCHU_SALESMAN,
+    RH_ALTAR_CHILD,
+    RH_ALTAR_ADULT,
+    RH_MAX,
+} RandomizerHintKey;
+
+typedef enum {
+    RHT_NONE,
+    RHT_PREFIX,
+    RHT_WAY_OF_THE_HERO,
+    RHT_PLUNDERING,
+    RHT_FOOLISH,
+    RHT_CAN_BE_FOUND_AT,
+    RHT_HOARDS,
+    // Junk
+    RHT_JUNK02,
+    RHT_JUNK03,
+    RHT_JUNK04,
+    RHT_JUNK05,
+    RHT_JUNK06,
+    RHT_JUNK07,
+    RHT_JUNK08,
+    RHT_JUNK09,
+    RHT_JUNK10,
+    RHT_JUNK11,
+    RHT_JUNK12,
+    RHT_JUNK13,
+    RHT_JUNK14,
+    RHT_JUNK15,
+    RHT_JUNK16,
+    RHT_JUNK17,
+    RHT_JUNK18,
+    RHT_JUNK19,
+    RHT_JUNK20,
+    RHT_JUNK21,
+    RHT_JUNK22,
+    RHT_JUNK23,
+    RHT_JUNK24,
+    RHT_JUNK25,
+    RHT_JUNK26,
+    RHT_JUNK27,
+    RHT_JUNK28,
+    RHT_JUNK29,
+    RHT_JUNK30,
+    RHT_JUNK31,
+    RHT_JUNK32,
+    RHT_JUNK33,
+    RHT_JUNK34,
+    RHT_JUNK35,
+    RHT_JUNK36,
+    RHT_JUNK37,
+    RHT_JUNK38,
+    RHT_JUNK39,
+    RHT_JUNK40,
+    RHT_JUNK41,
+    RHT_JUNK42,
+    RHT_JUNK43,
+    RHT_JUNK44,
+    RHT_JUNK45,
+    RHT_JUNK46,
+    RHT_JUNK47,
+    RHT_JUNK48,
+    RHT_JUNK49,
+    RHT_JUNK50,
+    RHT_JUNK51,
+    RHT_JUNK52,
+    RHT_JUNK53,
+    RHT_JUNK54,
+    RHT_JUNK55,
+    RHT_JUNK56,
+    RHT_JUNK57,
+    RHT_JUNK58,
+    RHT_JUNK59,
+    RHT_JUNK60,
+    RHT_JUNK61,
+    RHT_JUNK62,
+    RHT_JUNK63,
+    RHT_JUNK64,
+    RHT_JUNK65,
+    RHT_JUNK66,
+    RHT_JUNK67,
+    RHT_JUNK68,
+    RHT_JUNK69,
+    RHT_JUNK70,
+    RHT_JUNK71,
+    RHT_JUNK72,
+    RHT_JUNK73,
+    RHT_JUNK74,
+    RHT_JUNK75,
+    RHT_JUNK76,
+    RHT_JUNK77,
+    RHT_JUNK78,
+    RHT_JUNK79,
+    RHT_JUNK80,
+    RHT_JUNK81,
+    RHT_JUNK_WTC_1,
+    RHT_JUNK_WTC_2,
+    RHT_JUNK_WTC_3,
+    RHT_JUNK_WTC_4,
+    RHT_JUNK_WTC_5,
+    RHT_JUNK_WTC_6,
+    RHT_JUNK_WTC_7,
+    RHT_JUNK_WTC_8,
+    RHT_JUNK_WTC_9,
+    RHT_JUNK_WTC_10,
+    RHT_JUNK_WTC_11,
+    RHT_JUNK_WTC_12,
+    RHT_JUNK_SEI_1,
+    RHT_JUNK_SEI_2,
+    RHT_JUNK_SEI_3,
+    RHT_JUNK_SEI_4,
+    RHT_JUNK_SEI_5,
+    RHT_JUNK_SEI_6,
+    RHT_JUNK_SEI_7,
+    RHT_JUNK_SEI_8,
+    RHT_JUNK_SEI_9,
+    RHT_JUNK_SEI_10,
+    RHT_JUNK_SEI_11,
+    RHT_JUNK_SEI_12,
+    RHT_JUNK_SEI_13,
+    RHT_JUNK_SEI_14,
+    RHT_JUNK_SEI_15,
+    RHT_JUNK_SEI_16,
+    RHT_JUNK_SEI_17,
+    RHT_JUNK_SEI_18,
+    RHT_JUNK_SEI_19,
+    RHT_JUNK_SEI_20,
+    RHT_JUNK_SEI_21,
+    RHT_JUNK_SEI_22,
+    RHT_JUNK_SEI_23,
+    RHT_JUNK_SEI_24,
+    RHT_JUNK_SEI_25,
+    RHT_JUNK_SEI_26,
+    RHT_JUNK_SEI_27,
+    RHT_JUNK_SEI_28,
+    RHT_JUNK_SEI_29,
+    RHT_JUNK_OTR_MEANS_1,
+    RHT_JUNK_OTR_MEANS_2,
+    RHT_JUNK_OTR_MEANS_3,
+    RHT_JUNK_OTR_MEANS_4,
+    RHT_JUNK_OTR_MEANS_5,
+    RHT_JUNK_OTR_MEANS_6,
+    RHT_JUNK_OTR_MEANS_7,
+    RHT_JUNK_OTR_MEANS_8,
+    RHT_JUNK_OTR_MEANS_9,
+    RHT_JUNK_OTR_MEANS_10,
+    RHT_JUNK_OTR_MEANS_11,
+    RHT_JUNK_OTR_MEANS_12,
+    RHT_JUNK_OTR_MEANS_13,
+    RHT_JUNK_OTR_MEANS_14,
+    RHT_JUNK_OTR_MEANS_15,
+    RHT_JUNK_OTR_MEANS_16,
+    RHT_JUNK_OTR_MEANS_17,
+    RHT_JUNK_OTR_MEANS_18,
+    RHT_JUNK_OTR_MEANS_19,
+    RHT_JUNK_OTR_MEANS_20,
+    RHT_JUNK_OTR_MEANS_21,
+    RHT_JUNK_OTR_MEANS_22,
+    RHT_JUNK_OTR_MEANS_23,
+    RHT_JUNK_OTR_MEANS_24,
+    RHT_JUNK_OTR_MEANS_25,
+    RHT_JUNK_OTR_MEANS_26,
+    RHT_JUNK_OTR_MEANS_27,
+    RHT_JUNK_OTR_MEANS_28,
+    RHT_JUNK_OTR_MEANS_29,
+    RHT_JUNK_OTR_MEANS_30,
+    RHT_JUNK_MISC_1,
+    RHT_JUNK_MISC_2,
+    RHT_JUNK_MISC_3,
+    RHT_JUNK_MISC_4,
+    RHT_JUNK_MISC_5,
+    RHT_JUNK_MISC_6,
+    RHT_JUNK_MISC_7,
+    RHT_JUNK_MISC_8,
+    RHT_JUNK_MISC_9,
+    RHT_JUNK_MISC_10,
+    RHT_JUNK_MISC_11,
+    RHT_JUNK_MISC_12,
+    RHT_JUNK_MISC_13,
+    RHT_JUNK_MISC_14,
+    RHT_JUNK_MISC_15,
+    RHT_JUNK_MISC_16,
+    RHT_JUNK_MISC_17,
+    RHT_JUNK_SG_1,
+    RHT_JUNK_SG_2,
+    RHT_JUNK_SG_3,
+    RHT_JUNK_SG_4,
+    RHT_JUNK_SG_5,
+    RHT_JUNK_SG_6,
+    RHT_JUNK_SG_7,
+    RHT_JUNK_SG_8,
+    // Locations
+    RHT_LINKS_POCKET,
+    RHT_QUEEN_GOHMA,
+    RHT_KING_DODONGO,
+    RHT_BARINADE,
+    RHT_PHANTOM_GANON,
+    RHT_VOLVAGIA,
+    RHT_MORPHA,
+    RHT_BONGO_BONGO,
+    RHT_TWINROVA,
+    RHT_SONG_FROM_IMPA,
+    RHT_SONG_FROM_MALON,
+    RHT_SONG_FROM_SARIA,
+    RHT_SONG_FROM_ROYAL_FAMILYS_TOMB,
+    RHT_SONG_FROM_OCARINA_OF_TIME,
+    RHT_SONG_FROM_WINDMILL,
+    RHT_SHEIK_IN_FOREST,
+    RHT_SHEIK_IN_CRATER,
+    RHT_SHEIK_IN_ICE_CAVERN,
+    RHT_SHEIK_AT_COLOSSUS,
+    RHT_SHEIK_IN_KAKARIKO,
+    RHT_SHEIK_AT_TEMPLE,
+    RHT_KF_MIDOS_TOP_LEFT_CHEST,
+    RHT_KF_MIDOS_TOP_RIGHT_CHEST,
+    RHT_KF_MIDOS_BOTTOM_LEFT_CHEST,
+    RHT_KF_MIDOS_BOTTOM_RIGHT_CHEST,
+    RHT_KF_KOKIRI_SWORD_CHEST,
+    RHT_KF_STORMS_GROTTO_CHEST,
+    RHT_KF_LINKS_HOUSE_COW,
+    RHT_KF_GS_KNOW_IT_ALL_HOUSE,
+    RHT_KF_GS_BEAN_PATCH,
+    RHT_KF_GS_HOUSE_OF_TWINS,
+    RHT_KF_SHOP_ITEM_1,
+    RHT_KF_SHOP_ITEM_2,
+    RHT_KF_SHOP_ITEM_3,
+    RHT_KF_SHOP_ITEM_4,
+    RHT_KF_SHOP_ITEM_5,
+    RHT_KF_SHOP_ITEM_6,
+    RHT_KF_SHOP_ITEM_7,
+    RHT_KF_SHOP_ITEM_8,
+    RHT_LW_GIFT_FROM_SARIA,
+    RHT_LW_OCARINA_MEMORY_GAME,
+    RHT_LW_TARGET_IN_WOODS,
+    RHT_LW_NEAR_SHORTCUTS_GROTTO_CHEST,
+    RHT_LW_TRADE_COJIRO,
+    RHT_DEKU_THEATER_SKULL_MASK,
+    RHT_DEKU_THEATER_MASK_OF_TRUTH,
+    RHT_LW_SKULL_KID,
+    RHT_LW_TRADE_ODD_POTION,
+    RHT_LW_DEKU_SCRUB_NEAR_BRIDGE,
+    RHT_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT,
+    RHT_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT,
+    RHT_LW_DEKU_SCRUB_GROTTO_FRONT,
+    RHT_LW_DEKU_SCRUB_GROTTO_REAR,
+    RHT_LW_GS_BEAN_PATCH_NEAR_BRIDGE,
+    RHT_LW_GS_BEAN_PATCH_NEAR_THEATER,
+    RHT_LW_GS_ABOVE_THEATER,
+    RHT_SFM_WOLFOS_GROTTO_CHEST,
+    RHT_SFM_DEKU_SCRUB_GROTTO_FRONT,
+    RHT_SFM_DEKU_SCRUB_GROTTO_REAR,
+    RHT_SFM_GS,
+    RHT_HF_OCARINA_OF_TIME_ITEM,
+    RHT_HF_NEAR_MARKET_GROTTO_CHEST,
+    RHT_HF_TEKTITE_GROTTO_FREESTANDING_POH,
+    RHT_HF_SOUTHEAST_GROTTO_CHEST,
+    RHT_HF_OPEN_GROTTO_CHEST,
+    RHT_HF_DEKU_SCRUB_GROTTO,
+    RHT_HF_COW_GROTTO_COW,
+    RHT_HF_GS_COW_GROTTO,
+    RHT_HF_GS_NEAR_KAK_GROTTO,
+    RHT_MARKET_SHOOTING_GALLERY_REWARD,
+    RHT_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,
+    RHT_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE,
+    RHT_MARKET_BOMBCHU_BOWLING_BOMBCHUS,
+    RHT_MARKET_LOST_DOG,
+    RHT_MARKET_TREASURE_CHEST_GAME_REWARD,
+    RHT_MARKET_10_BIG_POES,
+    RHT_MARKET_TREASURE_CHEST_GAME_ITEM_1,
+    RHT_MARKET_TREASURE_CHEST_GAME_ITEM_2,
+    RHT_MARKET_TREASURE_CHEST_GAME_ITEM_3,
+    RHT_MARKET_TREASURE_CHEST_GAME_ITEM_4,
+    RHT_MARKET_TREASURE_CHEST_GAME_ITEM_5,
+    RHT_MARKET_GS_GUARD_HOUSE,
+    RHT_MARKET_BAZAAR_ITEM_1,
+    RHT_MARKET_BAZAAR_ITEM_2,
+    RHT_MARKET_BAZAAR_ITEM_3,
+    RHT_MARKET_BAZAAR_ITEM_4,
+    RHT_MARKET_BAZAAR_ITEM_5,
+    RHT_MARKET_BAZAAR_ITEM_6,
+    RHT_MARKET_BAZAAR_ITEM_7,
+    RHT_MARKET_BAZAAR_ITEM_8,
+    RHT_MARKET_POTION_SHOP_ITEM_1,
+    RHT_MARKET_POTION_SHOP_ITEM_2,
+    RHT_MARKET_POTION_SHOP_ITEM_3,
+    RHT_MARKET_POTION_SHOP_ITEM_4,
+    RHT_MARKET_POTION_SHOP_ITEM_5,
+    RHT_MARKET_POTION_SHOP_ITEM_6,
+    RHT_MARKET_POTION_SHOP_ITEM_7,
+    RHT_MARKET_POTION_SHOP_ITEM_8,
+    RHT_MARKET_BOMBCHU_SHOP_ITEM_1,
+    RHT_MARKET_BOMBCHU_SHOP_ITEM_2,
+    RHT_MARKET_BOMBCHU_SHOP_ITEM_3,
+    RHT_MARKET_BOMBCHU_SHOP_ITEM_4,
+    RHT_MARKET_BOMBCHU_SHOP_ITEM_5,
+    RHT_MARKET_BOMBCHU_SHOP_ITEM_6,
+    RHT_MARKET_BOMBCHU_SHOP_ITEM_7,
+    RHT_MARKET_BOMBCHU_SHOP_ITEM_8,
+    RHT_TOT_LIGHT_ARROWS_CUTSCENE,
+    RHT_HC_MALON_EGG,
+    RHT_HC_ZELDAS_LETTER,
+    RHT_HC_GREAT_FAIRY_REWARD,
+    RHT_HC_GS_TREE,
+    RHT_HC_GS_STORMS_GROTTO,
+    RHT_LLR_TALONS_CHICKENS,
+    RHT_LLR_FREESTANDING_POH,
+    RHT_LLR_DEKU_SCRUB_GROTTO_LEFT,
+    RHT_LLR_DEKU_SCRUB_GROTTO_CENTER,
+    RHT_LLR_DEKU_SCRUB_GROTTO_RIGHT,
+    RHT_LLR_STABLES_LEFT_COW,
+    RHT_LLR_STABLES_RIGHT_COW,
+    RHT_LLR_TOWER_LEFT_COW,
+    RHT_LLR_TOWER_RIGHT_COW,
+    RHT_LLR_GS_HOUSE_WINDOW,
+    RHT_LLR_GS_TREE,
+    RHT_LLR_GS_RAIN_SHED,
+    RHT_LLR_GS_BACK_WALL,
+    RHT_KAK_ANJU_AS_CHILD,
+    RHT_KAK_ANJU_AS_ADULT,
+    RHT_KAK_IMPAS_HOUSE_FREESTANDING_POH,
+    RHT_KAK_WINDMILL_FREESTANDING_POH,
+    RHT_KAK_MAN_ON_ROOF,
+    RHT_KAK_OPEN_GROTTO_CHEST,
+    RHT_KAK_REDEAD_GROTTO_CHEST,
+    RHT_KAK_SHOOTING_GALLERY_REWARD,
+    RHT_KAK_TRADE_ODD_MUSHROOM,
+    RHT_KAK_GRANNYS_SHOP,
+    RHT_KAK_TRADE_POCKET_CUCCO,
+    RHT_KAK_10_GOLD_SKULLTULA_REWARD,
+    RHT_KAK_20_GOLD_SKULLTULA_REWARD,
+    RHT_KAK_30_GOLD_SKULLTULA_REWARD,
+    RHT_KAK_40_GOLD_SKULLTULA_REWARD,
+    RHT_KAK_50_GOLD_SKULLTULA_REWARD,
+    RHT_KAK_100_GOLD_SKULLTULA_REWARD,
+    RHT_KAK_IMPAS_HOUSE_COW,
+    RHT_KAK_GS_TREE,
+    RHT_KAK_GS_GUARDS_HOUSE,
+    RHT_KAK_GS_WATCHTOWER,
+    RHT_KAK_GS_SKULLTULA_HOUSE,
+    RHT_KAK_GS_HOUSE_UNDER_CONSTRUCTION,
+    RHT_KAK_GS_ABOVE_IMPAS_HOUSE,
+    RHT_KAK_BAZAAR_ITEM_1,
+    RHT_KAK_BAZAAR_ITEM_2,
+    RHT_KAK_BAZAAR_ITEM_3,
+    RHT_KAK_BAZAAR_ITEM_4,
+    RHT_KAK_BAZAAR_ITEM_5,
+    RHT_KAK_BAZAAR_ITEM_6,
+    RHT_KAK_BAZAAR_ITEM_7,
+    RHT_KAK_BAZAAR_ITEM_8,
+    RHT_KAK_POTION_SHOP_ITEM_1,
+    RHT_KAK_POTION_SHOP_ITEM_2,
+    RHT_KAK_POTION_SHOP_ITEM_3,
+    RHT_KAK_POTION_SHOP_ITEM_4,
+    RHT_KAK_POTION_SHOP_ITEM_5,
+    RHT_KAK_POTION_SHOP_ITEM_6,
+    RHT_KAK_POTION_SHOP_ITEM_7,
+    RHT_KAK_POTION_SHOP_ITEM_8,
+    RHT_GRAVEYARD_SHIELD_GRAVE_CHEST,
+    RHT_GRAVEYARD_HEART_PIECE_GRAVE_CHEST,
+    RHT_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST,
+    RHT_GRAVEYARD_FREESTANDING_POH,
+    RHT_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR,
+    RHT_GRAVEYARD_HOOKSHOT_CHEST,
+    RHT_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH,
+    RHT_GRAVEYARD_GS_BEAN_PATCH,
+    RHT_GRAVEYARD_GS_WALL,
+    RHT_DMT_FREESTANDING_POH,
+    RHT_DMT_CHEST,
+    RHT_DMT_STORMS_GROTTO_CHEST,
+    RHT_DMT_TRADE_BROKEN_SWORD,
+    RHT_DMT_TRADE_EYEDROPS,
+    RHT_DMT_TRADE_CLAIM_CHECK,
+    RHT_DMT_GREAT_FAIRY_REWARD,
+    RHT_DMT_COW_GROTTO_COW,
+    RHT_DMT_GS_NEAR_KAK,
+    RHT_DMT_GS_BEAN_PATCH,
+    RHT_DMT_GS_ABOVE_DODONGOS_CAVERN,
+    RHT_DMT_GS_FALLING_ROCKS_PATH,
+    RHT_GC_DARUNIAS_JOY,
+    RHT_GC_POT_FREESTANDING_POH,
+    RHT_GC_ROLLING_GORON_AS_CHILD,
+    RHT_GC_ROLLING_GORON_AS_ADULT,
+    RHT_GC_MEDIGORON,
+    RHT_GC_MAZE_LEFT_CHEST,
+    RHT_GC_MAZE_RIGHT_CHEST,
+    RHT_GC_MAZE_CENTER_CHEST,
+    RHT_GC_DEKU_SCRUB_GROTTO_LEFT,
+    RHT_GC_DEKU_SCRUB_GROTTO_CENTER,
+    RHT_GC_DEKU_SCRUB_GROTTO_RIGHT,
+    RHT_GC_GS_CENTER_PLATFORM,
+    RHT_GC_GS_BOULDER_MAZE,
+    RHT_GC_SHOP_ITEM_1,
+    RHT_GC_SHOP_ITEM_2,
+    RHT_GC_SHOP_ITEM_3,
+    RHT_GC_SHOP_ITEM_4,
+    RHT_GC_SHOP_ITEM_5,
+    RHT_GC_SHOP_ITEM_6,
+    RHT_GC_SHOP_ITEM_7,
+    RHT_GC_SHOP_ITEM_8,
+    RHT_DMC_VOLCANO_FREESTANDING_POH,
+    RHT_DMC_WALL_FREESTANDING_POH,
+    RHT_DMC_UPPER_GROTTO_CHEST,
+    RHT_DMC_GREAT_FAIRY_REWARD,
+    RHT_DMC_DEKU_SCRUB,
+    RHT_DMC_DEKU_SCRUB_GROTTO_LEFT,
+    RHT_DMC_DEKU_SCRUB_GROTTO_CENTER,
+    RHT_DMC_DEKU_SCRUB_GROTTO_RIGHT,
+    RHT_DMC_GS_CRATE,
+    RHT_DMC_GS_BEAN_PATCH,
+    RHT_ZR_MAGIC_BEAN_SALESMAN,
+    RHT_ZR_OPEN_GROTTO_CHEST,
+    RHT_ZR_FROGS_ZELDAS_LULLABY,
+    RHT_ZR_FROGS_EPONAS_SONG,
+    RHT_ZR_FROGS_SARIAS_SONG,
+    RHT_ZR_FROGS_SUNS_SONG,
+    RHT_ZR_FROGS_SONG_OF_TIME,
+    RHT_ZR_FROGS_IN_THE_RAIN,
+    RHT_ZR_FROGS_OCARINA_GAME,
+    RHT_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH,
+    RHT_ZR_NEAR_DOMAIN_FREESTANDING_POH,
+    RHT_ZR_DEKU_SCRUB_GROTTO_FRONT,
+    RHT_ZR_DEKU_SCRUB_GROTTO_REAR,
+    RHT_ZR_GS_TREE,
+    RHT_ZR_GS_LADDER,
+    RHT_ZR_GS_NEAR_RAISED_GROTTOS,
+    RHT_ZR_GS_ABOVE_BRIDGE,
+    RHT_ZD_DIVING_MINIGAME,
+    RHT_ZD_CHEST,
+    RHT_ZD_KING_ZORA_THAWED,
+    RHT_ZD_TRADE_PRESCRIPTION,
+    RHT_ZD_GS_FROZEN_WATERFALL,
+    RHT_ZD_SHOP_ITEM_1,
+    RHT_ZD_SHOP_ITEM_2,
+    RHT_ZD_SHOP_ITEM_3,
+    RHT_ZD_SHOP_ITEM_4,
+    RHT_ZD_SHOP_ITEM_5,
+    RHT_ZD_SHOP_ITEM_6,
+    RHT_ZD_SHOP_ITEM_7,
+    RHT_ZD_SHOP_ITEM_8,
+    RHT_ZF_GREAT_FAIRY_REWARD,
+    RHT_ZF_ICEBERG_FREESTANDING_POH,
+    RHT_ZF_BOTTOM_FREESTANDING_POH,
+    RHT_ZF_GS_ABOVE_THE_LOG,
+    RHT_ZF_GS_TREE,
+    RHT_ZF_GS_HIDDEN_CAVE,
+    RHT_LH_UNDERWATER_ITEM,
+    RHT_LH_CHILD_FISHING,
+    RHT_LH_ADULT_FISHING,
+    RHT_LH_LAB_DIVE,
+    RHT_LH_TRADE_FROG,
+    RHT_LH_FREESTANDING_POH,
+    RHT_LH_SUN,
+    RHT_LH_DEKU_SCRUB_GROTTO_LEFT,
+    RHT_LH_DEKU_SCRUB_GROTTO_CENTER,
+    RHT_LH_DEKU_SCRUB_GROTTO_RIGHT,
+    RHT_LH_GS_BEAN_PATCH,
+    RHT_LH_GS_LAB_WALL,
+    RHT_LH_GS_SMALL_ISLAND,
+    RHT_LH_GS_LAB_CRATE,
+    RHT_LH_GS_TREE,
+    RHT_GV_CRATE_FREESTANDING_POH,
+    RHT_GV_WATERFALL_FREESTANDING_POH,
+    RHT_GV_CHEST,
+    RHT_GV_TRADE_SAW,
+    RHT_GV_DEKU_SCRUB_GROTTO_FRONT,
+    RHT_GV_DEKU_SCRUB_GROTTO_REAR,
+    RHT_GV_COW,
+    RHT_GV_GS_SMALL_BRIDGE,
+    RHT_GV_GS_BEAN_PATCH,
+    RHT_GV_GS_BEHIND_TENT,
+    RHT_GV_GS_PILLAR,
+    RHT_GF_CHEST,
+    RHT_GF_HBA_1000_POINTS,
+    RHT_GF_HBA_1500_POINTS,
+    RHT_GF_GERUDO_MEMBERSHIP_CARD,
+    RHT_GF_NORTH_F1_CARPENTER,
+    RHT_GF_NORTH_F2_CARPENTER,
+    RHT_GF_SOUTH_F1_CARPENTER,
+    RHT_GF_SOUTH_F2_CARPENTER,
+    RHT_GF_GS_TOP_FLOOR,
+    RHT_GF_GS_ARCHERY_RANGE,
+    RHT_HIDEOUT_JAIL_GUARD_1_TORCH,
+    RHT_HIDEOUT_JAIL_GUARD_2_TORCHES,
+    RHT_HIDEOUT_JAIL_GUARD_3_TORCHES,
+    RHT_HIDEOUT_JAIL_GUARD_4_TORCHES,
+    RHT_HIDEOUT_GERUDO_MEMBERSHIP_CARD,
+    RHT_WASTELAND_BOMBCHU_SALESMAN,
+    RHT_WASTELAND_CHEST,
+    RHT_WASTELAND_GS,
+    RHT_COLOSSUS_GREAT_FAIRY_REWARD,
+    RHT_COLOSSUS_FREESTANDING_POH,
+    RHT_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT,
+    RHT_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,
+    RHT_COLOSSUS_GS_BEAN_PATCH,
+    RHT_COLOSSUS_GS_TREE,
+    RHT_COLOSSUS_GS_HILL,
+    RHT_OGC_GREAT_FAIRY_REWARD,
+    RHT_OGC_GS,
+    RHT_DEKU_TREE_MAP_CHEST,
+    RHT_DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST,
+    RHT_DEKU_TREE_SLINGSHOT_CHEST,
+    RHT_DEKU_TREE_COMPASS_CHEST,
+    RHT_DEKU_TREE_COMPASS_ROOM_SIDE_CHEST,
+    RHT_DEKU_TREE_BASEMENT_CHEST,
+    RHT_DEKU_TREE_GS_COMPASS_ROOM,
+    RHT_DEKU_TREE_GS_BASEMENT_VINES,
+    RHT_DEKU_TREE_GS_BASEMENT_GATE,
+    RHT_DEKU_TREE_GS_BASEMENT_BACK_ROOM,
+    RHT_DEKU_TREE_MQ_MAP_CHEST,
+    RHT_DEKU_TREE_MQ_SLINGSHOT_CHEST,
+    RHT_DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST,
+    RHT_DEKU_TREE_MQ_COMPASS_CHEST,
+    RHT_DEKU_TREE_MQ_BASEMENT_CHEST,
+    RHT_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST,
+    RHT_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST,
+    RHT_DEKU_TREE_MQ_DEKU_SCRUB,
+    RHT_DEKU_TREE_MQ_GS_LOBBY,
+    RHT_DEKU_TREE_MQ_GS_COMPASS_ROOM,
+    RHT_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM,
+    RHT_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM,
+    RHT_DEKU_TREE_QUEEN_GOHMA_HEART,
+    RHT_DODONGOS_CAVERN_MAP_CHEST,
+    RHT_DODONGOS_CAVERN_COMPASS_CHEST,
+    RHT_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST,
+    RHT_DODONGOS_CAVERN_BOMB_BAG_CHEST,
+    RHT_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST,
+    RHT_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS,
+    RHT_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY,
+    RHT_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,
+    RHT_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT,
+    RHT_DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS,
+    RHT_DODONGOS_CAVERN_GS_SCARECROW,
+    RHT_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS,
+    RHT_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS,
+    RHT_DODONGOS_CAVERN_GS_BACK_ROOM,
+    RHT_DODONGOS_CAVERN_MQ_MAP_CHEST,
+    RHT_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST,
+    RHT_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST,
+    RHT_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST,
+    RHT_DODONGOS_CAVERN_MQ_COMPASS_CHEST,
+    RHT_DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST,
+    RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT,
+    RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,
+    RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS,
+    RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,
+    RHT_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM,
+    RHT_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM,
+    RHT_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM,
+    RHT_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM,
+    RHT_DODONGOS_CAVERN_MQ_GS_BACK_AREA,
+    RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST,
+    RHT_DODONGOS_CAVERN_KING_DODONGO_HEART,
+    RHT_JABU_JABUS_BELLY_BOOMERANG_CHEST,
+    RHT_JABU_JABUS_BELLY_MAP_CHEST,
+    RHT_JABU_JABUS_BELLY_COMPASS_CHEST,
+    RHT_JABU_JABUS_BELLY_DEKU_SCRUB,
+    RHT_JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM,
+    RHT_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER,
+    RHT_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER,
+    RHT_JABU_JABUS_BELLY_GS_NEAR_BOSS,
+    RHT_JABU_JABUS_BELLY_MQ_MAP_CHEST,
+    RHT_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST,
+    RHT_JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST,
+    RHT_JABU_JABUS_BELLY_MQ_COMPASS_CHEST,
+    RHT_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST,
+    RHT_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST,
+    RHT_JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST,
+    RHT_JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST,
+    RHT_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST,
+    RHT_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST,
+    RHT_JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST,
+    RHT_JABU_JABUS_BELLY_MQ_COW,
+    RHT_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM,
+    RHT_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM,
+    RHT_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM,
+    RHT_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS,
+    RHT_JABU_JABUS_BELLY_BARINADE_HEART,
+    RHT_BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST,
+    RHT_BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST,
+    RHT_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST,
+    RHT_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST,
+    RHT_BOTTOM_OF_THE_WELL_FREESTANDING_KEY,
+    RHT_BOTTOM_OF_THE_WELL_COMPASS_CHEST,
+    RHT_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST,
+    RHT_BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST,
+    RHT_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST,
+    RHT_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST,
+    RHT_BOTTOM_OF_THE_WELL_MAP_CHEST,
+    RHT_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST,
+    RHT_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST,
+    RHT_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST,
+    RHT_BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM,
+    RHT_BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM,
+    RHT_BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE,
+    RHT_BOTTOM_OF_THE_WELL_MQ_MAP_CHEST,
+    RHT_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY,
+    RHT_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST,
+    RHT_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY,
+    RHT_BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST,
+    RHT_BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM,
+    RHT_BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM,
+    RHT_BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT,
+    RHT_FOREST_TEMPLE_FIRST_ROOM_CHEST,
+    RHT_FOREST_TEMPLE_FIRST_STALFOS_CHEST,
+    RHT_FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST,
+    RHT_FOREST_TEMPLE_MAP_CHEST,
+    RHT_FOREST_TEMPLE_WELL_CHEST,
+    RHT_FOREST_TEMPLE_EYE_SWITCH_CHEST,
+    RHT_FOREST_TEMPLE_BOSS_KEY_CHEST,
+    RHT_FOREST_TEMPLE_FLOORMASTER_CHEST,
+    RHT_FOREST_TEMPLE_RED_POE_CHEST,
+    RHT_FOREST_TEMPLE_BOW_CHEST,
+    RHT_FOREST_TEMPLE_BLUE_POE_CHEST,
+    RHT_FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST,
+    RHT_FOREST_TEMPLE_BASEMENT_CHEST,
+    RHT_FOREST_TEMPLE_GS_FIRST_ROOM,
+    RHT_FOREST_TEMPLE_GS_LOBBY,
+    RHT_FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD,
+    RHT_FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD,
+    RHT_FOREST_TEMPLE_GS_BASEMENT,
+    RHT_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST,
+    RHT_FOREST_TEMPLE_MQ_WOLFOS_CHEST,
+    RHT_FOREST_TEMPLE_MQ_WELL_CHEST,
+    RHT_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST,
+    RHT_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST,
+    RHT_FOREST_TEMPLE_MQ_BOSS_KEY_CHEST,
+    RHT_FOREST_TEMPLE_MQ_REDEAD_CHEST,
+    RHT_FOREST_TEMPLE_MQ_MAP_CHEST,
+    RHT_FOREST_TEMPLE_MQ_BOW_CHEST,
+    RHT_FOREST_TEMPLE_MQ_COMPASS_CHEST,
+    RHT_FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST,
+    RHT_FOREST_TEMPLE_MQ_BASEMENT_CHEST,
+    RHT_FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY,
+    RHT_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD,
+    RHT_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD,
+    RHT_FOREST_TEMPLE_MQ_GS_WELL,
+    RHT_FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM,
+    RHT_FOREST_TEMPLE_PHANTOM_GANON_HEART,
+    RHT_FIRE_TEMPLE_NEAR_BOSS_CHEST,
+    RHT_FIRE_TEMPLE_FLARE_DANCER_CHEST,
+    RHT_FIRE_TEMPLE_BOSS_KEY_CHEST,
+    RHT_FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST,
+    RHT_FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST,
+    RHT_FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST,
+    RHT_FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST,
+    RHT_FIRE_TEMPLE_MAP_CHEST,
+    RHT_FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST,
+    RHT_FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST,
+    RHT_FIRE_TEMPLE_SCARECROW_CHEST,
+    RHT_FIRE_TEMPLE_COMPASS_CHEST,
+    RHT_FIRE_TEMPLE_MEGATON_HAMMER_CHEST,
+    RHT_FIRE_TEMPLE_HIGHEST_GORON_CHEST,
+    RHT_FIRE_TEMPLE_GS_BOSS_KEY_LOOP,
+    RHT_FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM,
+    RHT_FIRE_TEMPLE_GS_BOULDER_MAZE,
+    RHT_FIRE_TEMPLE_GS_SCARECROW_CLIMB,
+    RHT_FIRE_TEMPLE_GS_SCARECROW_TOP,
+    RHT_FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST,
+    RHT_FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST,
+    RHT_FIRE_TEMPLE_MQ_MAP_CHEST,
+    RHT_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST,
+    RHT_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST,
+    RHT_FIRE_TEMPLE_MQ_BOSS_KEY_CHEST,
+    RHT_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST,
+    RHT_FIRE_TEMPLE_MQ_COMPASS_CHEST,
+    RHT_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST,
+    RHT_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST,
+    RHT_FIRE_TEMPLE_MQ_FREESTANDING_KEY,
+    RHT_FIRE_TEMPLE_MQ_CHEST_ON_FIRE,
+    RHT_FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR,
+    RHT_FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE,
+    RHT_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER,
+    RHT_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM,
+    RHT_FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE,
+    RHT_FIRE_TEMPLE_VOLVAGIA_HEART,
+    RHT_WATER_TEMPLE_COMPASS_CHEST,
+    RHT_WATER_TEMPLE_MAP_CHEST,
+    RHT_WATER_TEMPLE_CRACKED_WALL_CHEST,
+    RHT_WATER_TEMPLE_TORCHES_CHEST,
+    RHT_WATER_TEMPLE_BOSS_KEY_CHEST,
+    RHT_WATER_TEMPLE_CENTRAL_PILLAR_CHEST,
+    RHT_WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST,
+    RHT_WATER_TEMPLE_LONGSHOT_CHEST,
+    RHT_WATER_TEMPLE_RIVER_CHEST,
+    RHT_WATER_TEMPLE_DRAGON_CHEST,
+    RHT_WATER_TEMPLE_GS_BEHIND_GATE,
+    RHT_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST,
+    RHT_WATER_TEMPLE_GS_CENTRAL_PILLAR,
+    RHT_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM,
+    RHT_WATER_TEMPLE_GS_RIVER,
+    RHT_WATER_TEMPLE_MQ_LONGSHOT_CHEST,
+    RHT_WATER_TEMPLE_MQ_MAP_CHEST,
+    RHT_WATER_TEMPLE_MQ_COMPASS_CHEST,
+    RHT_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST,
+    RHT_WATER_TEMPLE_MQ_BOSS_KEY_CHEST,
+    RHT_WATER_TEMPLE_MQ_FREESTANDING_KEY,
+    RHT_WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY,
+    RHT_WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH,
+    RHT_WATER_TEMPLE_MQ_GS_RIVER,
+    RHT_WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA,
+    RHT_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH,
+    RHT_WATER_TEMPLE_MORPHA_HEART,
+    RHT_SHADOW_TEMPLE_MAP_CHEST,
+    RHT_SHADOW_TEMPLE_HOVER_BOOTS_CHEST,
+    RHT_SHADOW_TEMPLE_COMPASS_CHEST,
+    RHT_SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST,
+    RHT_SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST,
+    RHT_SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST,
+    RHT_SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST,
+    RHT_SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST,
+    RHT_SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST,
+    RHT_SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST,
+    RHT_SHADOW_TEMPLE_FREESTANDING_KEY,
+    RHT_SHADOW_TEMPLE_WIND_HINT_CHEST,
+    RHT_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST,
+    RHT_SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST,
+    RHT_SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST,
+    RHT_SHADOW_TEMPLE_BOSS_KEY_CHEST,
+    RHT_SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST,
+    RHT_SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM,
+    RHT_SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM,
+    RHT_SHADOW_TEMPLE_GS_SINGLE_GIANT_POT,
+    RHT_SHADOW_TEMPLE_GS_NEAR_SHIP,
+    RHT_SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT,
+    RHT_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST,
+    RHT_SHADOW_TEMPLE_MQ_MAP_CHEST,
+    RHT_SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST,
+    RHT_SHADOW_TEMPLE_MQ_COMPASS_CHEST,
+    RHT_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST,
+    RHT_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST,
+    RHT_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST,
+    RHT_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST,
+    RHT_SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST,
+    RHT_SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST,
+    RHT_SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST,
+    RHT_SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST,
+    RHT_SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST,
+    RHT_SHADOW_TEMPLE_MQ_WIND_HINT_CHEST,
+    RHT_SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST,
+    RHT_SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST,
+    RHT_SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST,
+    RHT_SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST,
+    RHT_SHADOW_TEMPLE_MQ_FREESTANDING_KEY,
+    RHT_SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST,
+    RHT_SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM,
+    RHT_SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM,
+    RHT_SHADOW_TEMPLE_MQ_GS_AFTER_WIND,
+    RHT_SHADOW_TEMPLE_MQ_GS_AFTER_SHIP,
+    RHT_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS,
+    RHT_SHADOW_TEMPLE_BONGO_BONGO_HEART,
+    RHT_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST,
+    RHT_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST,
+    RHT_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST,
+    RHT_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST,
+    RHT_SPIRIT_TEMPLE_MAP_CHEST,
+    RHT_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST,
+    RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST,
+    RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST,
+    RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST,
+    RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST,
+    RHT_SPIRIT_TEMPLE_MQ_MAP_CHEST,
+    RHT_SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST,
+    RHT_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST,
+    RHT_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST,
+    RHT_SPIRIT_TEMPLE_MQ_COMPASS_CHEST,
+    RHT_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST,
+    RHT_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST,
+    RHT_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST,
+    RHT_SPIRIT_TEMPLE_COMPASS_CHEST,
+    RHT_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST,
+    RHT_SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST,
+    RHT_SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST,
+    RHT_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST,
+    RHT_SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST,
+    RHT_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST,
+    RHT_SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST,
+    RHT_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST,
+    RHT_SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST,
+    RHT_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST,
+    RHT_SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST,
+    RHT_SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST,
+    RHT_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST,
+    RHT_SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST,
+    RHT_SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST,
+    RHT_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST,
+    RHT_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST,
+    RHT_SPIRIT_TEMPLE_BOSS_KEY_CHEST,
+    RHT_SPIRIT_TEMPLE_TOPMOST_CHEST,
+    RHT_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST,
+    RHT_SPIRIT_TEMPLE_GS_METAL_FENCE,
+    RHT_SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM,
+    RHT_SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM,
+    RHT_SPIRIT_TEMPLE_GS_LOBBY,
+    RHT_SPIRIT_TEMPLE_GS_BOULDER_ROOM,
+    RHT_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM,
+    RHT_SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM,
+    RHT_SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM,
+    RHT_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST,
+    RHT_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH,
+    RHT_SPIRIT_TEMPLE_TWINROVA_HEART,
+    RHT_ICE_CAVERN_MAP_CHEST,
+    RHT_ICE_CAVERN_COMPASS_CHEST,
+    RHT_ICE_CAVERN_FREESTANDING_POH,
+    RHT_ICE_CAVERN_IRON_BOOTS_CHEST,
+    RHT_ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM,
+    RHT_ICE_CAVERN_GS_HEART_PIECE_ROOM,
+    RHT_ICE_CAVERN_GS_PUSH_BLOCK_ROOM,
+    RHT_ICE_CAVERN_MQ_MAP_CHEST,
+    RHT_ICE_CAVERN_MQ_COMPASS_CHEST,
+    RHT_ICE_CAVERN_MQ_FREESTANDING_POH,
+    RHT_ICE_CAVERN_MQ_IRON_BOOTS_CHEST,
+    RHT_ICE_CAVERN_MQ_GS_RED_ICE,
+    RHT_ICE_CAVERN_MQ_GS_ICE_BLOCK,
+    RHT_ICE_CAVERN_MQ_GS_SCARECROW,
+    RHT_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST,
+    RHT_GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST,
+    RHT_GERUDO_TRAINING_GROUND_STALFOS_CHEST,
+    RHT_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST,
+    RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST,
+    RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST,
+    RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_THIRD_CHEST,
+    RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FOURTH_CHEST,
+    RHT_GERUDO_TRAINING_GROUND_EYE_STATUE_CHEST,
+    RHT_GERUDO_TRAINING_GROUND_NEAR_SCARECROW_CHEST,
+    RHT_GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST,
+    RHT_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST,
+    RHT_GERUDO_TRAINING_GROUND_FREESTANDING_KEY,
+    RHT_GERUDO_TRAINING_GROUND_MAZE_RIGHT_CENTRAL_CHEST,
+    RHT_GERUDO_TRAINING_GROUND_MAZE_RIGHT_SIDE_CHEST,
+    RHT_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST,
+    RHT_GERUDO_TRAINING_GROUND_BEAMOS_CHEST,
+    RHT_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST,
+    RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST,
+    RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_SECOND_CHEST,
+    RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_THIRD_CHEST,
+    RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_FINAL_CHEST,
+    RHT_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST,
+    RHT_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST,
+    RHT_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST,
+    RHT_GERUDO_TRAINING_GROUND_MQ_BEFORE_HEAVY_BLOCK_CHEST,
+    RHT_GERUDO_TRAINING_GROUND_MQ_HEAVY_BLOCK_CHEST,
+    RHT_GERUDO_TRAINING_GROUND_MQ_EYE_STATUE_CHEST,
+    RHT_GERUDO_TRAINING_GROUND_MQ_ICE_ARROWS_CHEST,
+    RHT_GERUDO_TRAINING_GROUND_MQ_SECOND_IRON_KNUCKLE_CHEST,
+    RHT_GERUDO_TRAINING_GROUND_MQ_FLAME_CIRCLE_CHEST,
+    RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_CENTRAL_CHEST,
+    RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_SIDE_CHEST,
+    RHT_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST,
+    RHT_GERUDO_TRAINING_GROUND_MQ_DINOLFOS_CHEST,
+    RHT_GERUDO_TRAINING_GROUND_MQ_HIDDEN_CEILING_CHEST,
+    RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_FIRST_CHEST,
+    RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_THIRD_CHEST,
+    RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_SECOND_CHEST,
+    RHT_GANONS_CASTLE_FOREST_TRIAL_CHEST,
+    RHT_GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST,
+    RHT_GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST,
+    RHT_GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST,
+    RHT_GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST,
+    RHT_GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST,
+    RHT_GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST,
+    RHT_GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST,
+    RHT_GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST,
+    RHT_GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST,
+    RHT_GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST,
+    RHT_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST,
+    RHT_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST,
+    RHT_GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST,
+    RHT_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST,
+    RHT_GANONS_CASTLE_DEKU_SCRUB_LEFT,
+    RHT_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,
+    RHT_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT,
+    RHT_GANONS_CASTLE_DEKU_SCRUB_RIGHT,
+    RHT_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY,
+    RHT_GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST,
+    RHT_GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST,
+    RHT_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST,
+    RHT_GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST,
+    RHT_GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST,
+    RHT_GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST,
+    RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST,
+    RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST,
+    RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST,
+    RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST,
+    RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST,
+    RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST,
+    RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,
+    RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,
+    RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,
+    RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT,
+    RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,
+    RHT_GANONS_TOWER_BOSS_KEY_CHEST,
+    RHT_DELIVER_RUTOS_LETTER,
+    RHT_MASTER_SWORD_PEDESTAL,
+    // Items
+    RHT_KOKIRI_SWORD,
+    RHT_MASTER_SWORD,
+    RHT_GIANTS_KNIFE,
+    RHT_BIGGORON_SWORD,
+    RHT_DEKU_SHIELD,
+    RHT_HYLIAN_SHIELD,
+    RHT_MIRROR_SHIELD,
+    RHT_GORON_TUNIC,
+    RHT_ZORA_TUNIC,
+    RHT_IRON_BOOTS,
+    RHT_HOVER_BOOTS,
+    RHT_BOOMERANG,
+    RHT_LENS_OF_TRUTH,
+    RHT_MEGATON_HAMMER,
+    RHT_STONE_OF_AGONY,
+    RHT_DINS_FIRE,
+    RHT_FARORES_WIND,
+    RHT_NAYRUS_LOVE,
+    RHT_FIRE_ARROWS,
+    RHT_ICE_ARROWS,
+    RHT_LIGHT_ARROWS,
+    RHT_GERUDO_MEMBERSHIP_CARD,
+    RHT_MAGIC_BEAN,
+    RHT_MAGIC_BEAN_PACK,
+    RHT_DOUBLE_DEFENSE,
+    RHT_WEIRD_EGG,
+    RHT_ZELDAS_LETTER,
+    RHT_POCKET_EGG,
+    RHT_POCKET_CUCCO,
+    RHT_COJIRO,
+    RHT_ODD_MUSHROOM,
+    RHT_ODD_POTION,
+    RHT_POACHERS_SAW,
+    RHT_BROKEN_SWORD,
+    RHT_PRESCRIPTION,
+    RHT_EYEBALL_FROG,
+    RHT_EYEDROPS,
+    RHT_CLAIM_CHECK,
+    RHT_GOLD_SKULLTULA_TOKEN,
+    RHT_PROGRESSIVE_HOOKSHOT,
+    RHT_PROGRESSIVE_STRENGTH,
+    RHT_PROGRESSIVE_BOMB_BAG,
+    RHT_PROGRESSIVE_BOW,
+    RHT_PROGRESSIVE_SLINGSHOT,
+    RHT_PROGRESSIVE_WALLET,
+    RHT_PROGRESSIVE_SCALE,
+    RHT_PROGRESSIVE_NUT_UPGRADE,
+    RHT_PROGRESSIVE_STICK_UPGRADE,
+    RHT_PROGRESSIVE_BOMBCHUS,
+    RHT_PROGRESSIVE_MAGIC_METER,
+    RHT_MAGIC_SINGLE, // Added for refactor of GetItemEntries
+    RHT_MAGIC_DOUBLE, // Added for refactor of GetItemEntries
+    RHT_PROGRESSIVE_OCARINA,
+    RHT_PROGRESSIVE_GORONSWORD,
+    RHT_EMPTY_BOTTLE,
+    RHT_BOTTLE_WITH_MILK,
+    RHT_BOTTLE_WITH_RED_POTION,
+    RHT_BOTTLE_WITH_GREEN_POTION,
+    RHT_BOTTLE_WITH_BLUE_POTION,
+    RHT_BOTTLE_WITH_FAIRY,
+    RHT_BOTTLE_WITH_FISH,
+    RHT_BOTTLE_WITH_BLUE_FIRE,
+    RHT_BOTTLE_WITH_BUGS,
+    RHT_BOTTLE_WITH_POE,
+    RHT_RUTOS_LETTER,
+    RHT_BOTTLE_WITH_BIG_POE,
+    RHT_ZELDAS_LULLABY,
+    RHT_EPONAS_SONG,
+    RHT_SARIAS_SONG,
+    RHT_SUNS_SONG,
+    RHT_SONG_OF_TIME,
+    RHT_SONG_OF_STORMS,
+    RHT_MINUET_OF_FOREST,
+    RHT_BOLERO_OF_FIRE,
+    RHT_SERENADE_OF_WATER,
+    RHT_REQUIEM_OF_SPIRIT,
+    RHT_NOCTURNE_OF_SHADOW,
+    RHT_PRELUDE_OF_LIGHT,
+    RHT_DEKU_TREE_MAP,
+    RHT_DODONGOS_CAVERN_MAP,
+    RHT_JABU_JABUS_BELLY_MAP,
+    RHT_FOREST_TEMPLE_MAP,
+    RHT_FIRE_TEMPLE_MAP,
+    RHT_WATER_TEMPLE_MAP,
+    RHT_SPIRIT_TEMPLE_MAP,
+    RHT_SHADOW_TEMPLE_MAP,
+    RHT_BOTTOM_OF_THE_WELL_MAP,
+    RHT_ICE_CAVERN_MAP,
+    RHT_DEKU_TREE_COMPASS,
+    RHT_DODONGOS_CAVERN_COMPASS,
+    RHT_JABU_JABUS_BELLY_COMPASS,
+    RHT_FOREST_TEMPLE_COMPASS,
+    RHT_FIRE_TEMPLE_COMPASS,
+    RHT_WATER_TEMPLE_COMPASS,
+    RHT_SPIRIT_TEMPLE_COMPASS,
+    RHT_SHADOW_TEMPLE_COMPASS,
+    RHT_BOTTOM_OF_THE_WELL_COMPASS,
+    RHT_ICE_CAVERN_COMPASS,
+    RHT_FOREST_TEMPLE_BOSS_KEY,
+    RHT_FIRE_TEMPLE_BOSS_KEY,
+    RHT_WATER_TEMPLE_BOSS_KEY,
+    RHT_SPIRIT_TEMPLE_BOSS_KEY,
+    RHT_SHADOW_TEMPLE_BOSS_KEY,
+    RHT_GANONS_CASTLE_BOSS_KEY,
+    RHT_FOREST_TEMPLE_SMALL_KEY,
+    RHT_FIRE_TEMPLE_SMALL_KEY,
+    RHT_WATER_TEMPLE_SMALL_KEY,
+    RHT_SPIRIT_TEMPLE_SMALL_KEY,
+    RHT_SHADOW_TEMPLE_SMALL_KEY,
+    RHT_BOTTOM_OF_THE_WELL_SMALL_KEY,
+    RHT_GERUDO_TRAINING_GROUNDS_SMALL_KEY,
+    RHT_GERUDO_FORTRESS_SMALL_KEY,
+    RHT_GANONS_CASTLE_SMALL_KEY,
+    RHT_TREASURE_GAME_SMALL_KEY,
+    RHT_FOREST_TEMPLE_KEY_RING,
+    RHT_FIRE_TEMPLE_KEY_RING,
+    RHT_WATER_TEMPLE_KEY_RING,
+    RHT_SPIRIT_TEMPLE_KEY_RING,
+    RHT_SHADOW_TEMPLE_KEY_RING,
+    RHT_BOTTOM_OF_THE_WELL_KEY_RING,
+    RHT_GERUDO_TRAINING_GROUNDS_KEY_RING,
+    RHT_GERUDO_FORTRESS_KEY_RING,
+    RHT_GANONS_CASTLE_KEY_RING,
+    RHT_KOKIRI_EMERALD,
+    RHT_GORON_RUBY,
+    RHT_ZORA_SAPPHIRE,
+    RHT_FOREST_MEDALLION,
+    RHT_FIRE_MEDALLION,
+    RHT_WATER_MEDALLION,
+    RHT_SPIRIT_MEDALLION,
+    RHT_SHADOW_MEDALLION,
+    RHT_LIGHT_MEDALLION,
+    RHT_RECOVERY_HEART,
+    RHT_GREEN_RUPEE,
+    RHT_GREG_RUPEE,
+    RHT_BLUE_RUPEE,
+    RHT_RED_RUPEE,
+    RHT_PURPLE_RUPEE,
+    RHT_HUGE_RUPEE,
+    RHT_PIECE_OF_HEART,
+    RHT_HEART_CONTAINER,
+    RHT_ICE_TRAP,
+    RHT_MILK,
+    RHT_BOMBS_5,
+    RHT_BOMBS_10,
+    RHT_BOMBS_20,
+    RHT_BOMBCHU_5,
+    RHT_BOMBCHU_10,
+    RHT_BOMBCHU_20,
+    RHT_BOMBCHU_DROP,
+    RHT_ARROWS_5,
+    RHT_ARROWS_10,
+    RHT_ARROWS_30,
+    RHT_DEKU_NUTS_5,
+    RHT_DEKU_NUTS_10,
+    RHT_DEKU_SEEDS_30,
+    RHT_DEKU_STICK_1,
+    RHT_RED_POTION_REFILL,
+    RHT_GREEN_POTION_REFILL,
+    RHT_BLUE_POTION_REFILL,
+    RHT_TREASURE_GAME_HEART,
+    RHT_TREASURE_GAME_GREEN_RUPEE,
+    RHT_BUY_DEKU_NUT_5,
+    RHT_BUY_ARROWS_30,
+    RHT_BUY_ARROWS_50,
+    RHT_BUY_BOMBS_525,
+    RHT_BUY_DEKU_NUT_10,
+    RHT_BUY_DEKU_STICK_1,
+    RHT_BUY_BOMBS_10,
+    RHT_BUY_FISH,
+    RHT_BUY_RED_POTION_30,
+    RHT_BUY_GREEN_POTION,
+    RHT_BUY_BLUE_POTION,
+    RHT_BUY_HYLIAN_SHIELD,
+    RHT_BUY_DEKU_SHIELD,
+    RHT_BUY_GORON_TUNIC,
+    RHT_BUY_ZORA_TUNIC,
+    RHT_BUY_HEART,
+    RHT_BUY_BOMBCHU_10,
+    RHT_BUY_BOMBCHU_20,
+    RHT_BUY_DEKU_SEEDS_30,
+    RHT_SOLD_OUT,
+    RHT_BUY_BLUE_FIRE,
+    RHT_BUY_BOTTLE_BUG,
+    RHT_BUY_POE,
+    RHT_BUY_FAIRYS_SPIRIT,
+    RHT_BUY_ARROWS_10,
+    RHT_BUY_BOMBS_20,
+    RHT_BUY_BOMBS_30,
+    RHT_BUY_BOMBS_535,
+    RHT_BUY_RED_POTION_40,
+    RHT_BUY_RED_POTION_50,
+    RHT_TRIFORCE,
+    RHT_HINT,
+    RHT_TYCOON_WALLET,
+    RHT_HOOKSHOT,
+    RHT_LONGSHOT,
+    RHT_FAIRY_OCARINA,
+    RHT_OCARINA_OF_TIME,
+    RHT_BOMB_BAG,
+    RHT_BIG_BOMB_BAG,
+    RHT_BIGGEST_BOMB_BAG,
+    RHT_FAIRY_BOW,
+    RHT_BIG_QUIVER,
+    RHT_BIGGEST_QUIVER,
+    RHT_FAIRY_SLINGSHOT,
+    RHT_BIG_BULLET_BAG,
+    RHT_BIGGEST_BULLET_BAG,
+    RHT_GORONS_BRACELET,
+    RHT_SILVER_GAUNTLETS,
+    RHT_GOLDEN_GAUNTLETS,
+    RHT_SILVER_SCALE,
+    RHT_GOLDEN_SCALE,
+    RHT_ADULT_WALLET,
+    RHT_GIANT_WALLET,
+    RHT_DEKU_NUT_CAPACITY_30,
+    RHT_DEKU_NUT_CAPACITY_40,
+    RHT_DEKU_STICK_CAPACITY_20,
+    RHT_DEKU_STICK_CAPACITY_30,
+    RHT_TRIFORCE_PIECE,
+    RHT_EPONA,
+    // Entrances
+    RHT_DESERT_COLOSSUS_TO_COLOSSUS_GROTTO,
+    RHT_GV_GROTTO_LEDGE_TO_GV_OCTOROK_GROTTO,
+    RHT_GC_GROTTO_PLATFORM_TO_GC_GROTTO,
+    RHT_GERUDO_FORTRESS_TO_GF_STORMS_GROTTO,
+    RHT_ZORAS_DOMAIN_TO_ZD_STORMS_GROTTO,
+    RHT_HYRULE_CASTLE_GROUNDS_TO_HC_STORMS_GROTTO,
+    RHT_GV_FORTRESS_SIDE_TO_GV_STORMS_GROTTO,
+    RHT_DESERT_COLOSSUS_TO_COLOSSUS_GREAT_FAIRY_FOUNTAIN,
+    RHT_GANONS_CASTLE_GROUNDS_TO_OGC_GREAT_FAIRY_FOUNTAIN,
+    RHT_ZORAS_FOUNTAIN_TO_ZF_GREAT_FAIRY_FOUNTAIN,
+    RHT_GV_FORTRESS_SIDE_TO_GV_CARPENTER_TENT,
+    RHT_GRAVEYARD_WARP_PAD_REGION_TO_SHADOW_TEMPLE_ENTRYWAY,
+    RHT_LAKE_HYLIA_TO_WATER_TEMPLE_LOBBY,
+    RHT_GERUDO_FORTRESS_TO_GERUDO_TRAINING_GROUNDS_LOBBY,
+    RHT_ZORAS_FOUNTAIN_TO_JABU_JABUS_BELLY_BEGINNING,
+    RHT_KAKARIKO_VILLAGE_TO_BOTTOM_OF_THE_WELL,
+    // Exits
+    RHT_KOKIRI_FOREST,
+    RHT_THE_LOST_WOODS,
+    RHT_SACRED_FOREST_MEADOW,
+    RHT_HYRULE_FIELD,
+    RHT_LAKE_HYLIA,
+    RHT_GERUDO_VALLEY,
+    RHT_GERUDO_FORTRESS,
+    RHT_HAUNTED_WASTELAND,
+    RHT_DESERT_COLOSSUS,
+    RHT_THE_MARKET,
+    RHT_TEMPLE_OF_TIME,
+    RHT_HYRULE_CASTLE,
+    RHT_OUTSIDE_GANONS_CASTLE,
+    RHT_KAKARIKO_VILLAGE,
+    RHT_THE_GRAVEYARD,
+    RHT_DEATH_MOUNTAIN_TRAIL,
+    RHT_GORON_CITY,
+    RHT_DEATH_MOUNTAIN_CRATER,
+    RHT_ZORAS_RIVER,
+    RHT_ZORAS_DOMAIN,
+    RHT_ZORAS_FOUNTAIN,
+    RHT_LON_LON_RANCH,
+    // Regions
+    RHT_KF_LINKS_HOUSE,
+    RHT_KF_MIDOS_HOUSE,
+    RHT_KF_SARIAS_HOUSE,
+    RHT_KF_HOUSE_OF_TWINS,
+    RHT_KF_KNOW_IT_ALL_HOUSE,
+    RHT_KF_KOKIRI_SHOP,
+    RHT_LH_LAB,
+    RHT_LH_FISHING_HOLE,
+    RHT_GV_CARPENTER_TENT,
+    RHT_MARKET_GUARD_HOUSE,
+    RHT_MARKET_MASK_SHOP,
+    RHT_MARKET_BOMBCHU_BOWLING,
+    RHT_MARKET_POTION_SHOP,
+    RHT_MARKET_TREASURE_CHEST_GAME,
+    RHT_MARKET_BOMBCHU_SHOP,
+    RHT_MARKET_MAN_IN_GREEN_HOUSE,
+    RHT_KAK_WINDMILL,
+    RHT_KAK_CARPENTER_BOSS_HOUSE,
+    RHT_KAK_HOUSE_OF_SKULLTULA,
+    RHT_KAK_IMPAS_HOUSE,
+    RHT_KAK_IMPAS_HOUSE_BACK,
+    RHT_KAK_ODD_POTION_BUILDING,
+    RHT_GRAVEYARD_DAMPES_HOUSE,
+    RHT_GC_SHOP,
+    RHT_ZD_SHOP,
+    RHT_LLR_TALONS_HOUSE,
+    RHT_LLR_STABLES,
+    RHT_LLR_TOWER,
+    RHT_MARKET_BAZAAR,
+    RHT_MARKET_SHOOTING_GALLERY,
+    RHT_KAK_BAZAAR,
+    RHT_KAK_POTION_SHOP_FRONT,
+    RHT_KAK_POTION_SHOP_BACK,
+    RHT_KAK_SHOOTING_GALLERY,
+    RHT_COLOSSUS_GREAT_FAIRY_FOUNTAIN,
+    RHT_HC_GREAT_FAIRY_FOUNTAIN,
+    RHT_OGC_GREAT_FAIRY_FOUNTAIN,
+    RHT_DMC_GREAT_FAIRY_FOUNTAIN,
+    RHT_DMT_GREAT_FAIRY_FOUNTAIN,
+    RHT_ZF_GREAT_FAIRY_FOUNTAIN,
+    RHT_GRAVEYARD_SHIELD_GRAVE,
+    RHT_GRAVEYARD_HEART_PIECE_GRAVE,
+    RHT_GRAVEYARD_COMPOSERS_GRAVE,
+    RHT_GRAVEYARD_DAMPES_GRAVE,
+    RHT_DMT_COW_GROTTO,
+    RHT_HC_STORMS_GROTTO,
+    RHT_HF_TEKTITE_GROTTO,
+    RHT_HF_NEAR_KAK_GROTTO,
+    RHT_HF_COW_GROTTO,
+    RHT_KAK_REDEAD_GROTTO,
+    RHT_SFM_WOLFOS_GROTTO,
+    RHT_GV_OCTOROK_GROTTO,
+    RHT_DEKU_THEATER,
+    RHT_ZR_OPEN_GROTTO,
+    RHT_DMC_UPPER_GROTTO,
+    RHT_DMT_STORMS_GROTTO,
+    RHT_KAK_OPEN_GROTTO,
+    RHT_HF_NEAR_MARKET_GROTTO,
+    RHT_HF_OPEN_GROTTO,
+    RHT_HF_SOUTHEAST_GROTTO,
+    RHT_KF_STORMS_GROTTO,
+    RHT_LW_NEAR_SHORTCUTS_GROTTO,
+    RHT_HF_INSIDE_FENCE_GROTTO,
+    RHT_LW_SCRUBS_GROTTO,
+    RHT_COLOSSUS_GROTTO,
+    RHT_ZR_STORMS_GROTTO,
+    RHT_SFM_STORMS_GROTTO,
+    RHT_GV_STORMS_GROTTO,
+    RHT_LH_GROTTO,
+    RHT_DMC_HAMMER_GROTTO,
+    RHT_GC_GROTTO,
+    RHT_LLR_GROTTO,
+    RHT_ZR_FAIRY_GROTTO,
+    RHT_HF_FAIRY_GROTTO,
+    RHT_SFM_FAIRY_GROTTO,
+    RHT_ZD_STORMS_GROTTO,
+    RHT_GF_STORMS_GROTTO,
+    RHT_DEKU_TREE,
+    RHT_DODONGOS_CAVERN,
+    RHT_JABU_JABUS_BELLY,
+    RHT_FOREST_TEMPLE,
+    RHT_FIRE_TEMPLE,
+    RHT_WATER_TEMPLE,
+    RHT_SPIRIT_TEMPLE,
+    RHT_SHADOW_TEMPLE,
+    RHT_ICE_CAVERN,
+    RHT_BOTTOM_OF_THE_WELL,
+    RHT_GERUDO_TRAINING_GROUND,
+    RHT_GANONS_CASTLE,
+    // Bridge Hints
+    RHT_BRIDGE_OPEN_HINT,
+    RHT_BRIDGE_VANILLA_HINT,
+    RHT_BRIDGE_STONES_HINT,
+    RHT_BRIDGE_MEDALLIONS_HINT,
+    RHT_BRIDGE_REWARDS_HINT,
+    RHT_BRIDGE_DUNGEONS_HINT,
+    RHT_BRIDGE_TOKENS_HINT,
+    RHT_BRIDGE_GREG_HINT,
+    // Ganon Boss Key
+    RHT_GANON_BK_START_WITH_HINT,
+    RHT_GANON_BK_VANILLA_HINT,
+    RHT_GANON_BK_OWN_DUNGEON_HINT,
+    RHT_GANON_BK_OVERWORLD_HINT,
+    RHT_GANON_BK_ANY_DUNGEON_HINT,
+    RHT_GANON_BK_ANYWHERE_HINT,
+    RHT_GANON_BK_TRIFORCE_HINT,
+    RHT_GANON_BK_SKULLTULA_HINT,
+    // LACS
+    RHT_LACS_VANILLA_HINT,
+    RHT_LACS_MEDALLIONS_HINT,
+    RHT_LACS_STONES_HINT,
+    RHT_LACS_REWARDS_HINT,
+    RHT_LACS_DUNGEONS_HINT,
+    RHT_LACS_TOKENS_HINT,
+    // Trials
+    RHT_SIX_TRIALS,
+    RHT_ZERO_TRIALS,
+    RHT_FOUR_TO_FIVE_TRIALS,
+    RHT_ONE_TO_THREE_TRIALS,
+    // Altar
+    RHT_SPIRITUAL_STONE_TEXT_START,
+    RHT_CHILD_ALTAR_TEXT_END_DOTOPEN,
+    RHT_CHILD_ALTAR_TEXT_END_DOTSONGONLY,
+    RHT_CHILD_ALTAR_TEXT_END_DOTCLOSED,
+    RHT_ADULT_ALTAR_TEXT_START,
+    RHT_ADULT_ALTAR_TEXT_END,
+    // Validation Line
+    RHT_VALIDATION_LINE,
+    // Light Arrow Location
+    RHT_LIGHT_ARROW_LOCATION_HINT,
+    // Your Pocket
+    RHT_YOUR_POCKET,
+    // Ganon Line
+    RHT_GANON_LINE01,
+    RHT_GANON_LINE02,
+    RHT_GANON_LINE03,
+    RHT_GANON_LINE04,
+    RHT_GANON_LINE05,
+    RHT_GANON_LINE06,
+    RHT_GANON_LINE07,
+    RHT_GANON_LINE08,
+    RHT_GANON_LINE09,
+    RHT_GANON_LINE10,
+    RHT_GANON_LINE11,
+    // Merchants
+    RHT_MEDIGORON_DIALOG_FIRST,
+    RHT_MEDIGORON_DIALOG_SECOND,
+    RHT_CARPET_SALESMAN_DIALOG_FIRST,
+    RHT_CARPET_SALESMAN_DIALOG_SECOND,
+    RHT_CARPET_SALESMAN_DIALOG_THIRD,
+    RHT_CARPET_SALESMAN_DIALOG_FOURTH,
+    RHT_GRANNY_DIALOG,
+    RHT_MAX
+} RandomizerHintTextKey;
+
 typedef struct {
     RandomizerGet rgID;
     RandomizerGet fakeRgID;
diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp
index be05be35d..ff0adf7a3 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp
@@ -1,852 +1,56 @@
 #include "randomizer_check_objects.h"
+#include "static_data.h"
+#include "context.h"
 #include <map>
 #include <string>
 #include <libultraship/bridge.h>
 #include "z64.h"
 
-//            RandomizerCheck,                                                RCVORMQ,         RCTYPE,              RCAREA,                        ActorId,            SceneId,                              ActorParams,                 OG ItemID,           "Short name", "Spoiler name", vanillaCompletion
-std::map<RandomizerCheck, RandomizerCheckObject> rcObjects = {
-    RC_OBJECT(RC_KF_KOKIRI_SWORD_CHEST,                                       RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_KOKIRI_FOREST,          ACTOR_EN_BOX,       SCENE_KOKIRI_FOREST,                  1248,                        GI_SWORD_KOKIRI,     "Kokiri Sword Chest", "KF Kokiri Sword Chest", true),
-    RC_OBJECT(RC_KF_MIDOS_TOP_LEFT_CHEST,                                     RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_KOKIRI_FOREST,          ACTOR_EN_BOX,       SCENE_MIDOS_HOUSE,                    22944,                       GI_RUPEE_BLUE,       "Mido Top Left Chest", "KF Mido Top Left Chest", false),
-    RC_OBJECT(RC_KF_MIDOS_TOP_RIGHT_CHEST,                                    RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_KOKIRI_FOREST,          ACTOR_EN_BOX,       SCENE_MIDOS_HOUSE,                    22945,                       GI_RUPEE_BLUE,       "Mido Top Right Chest", "KF Mido Top Right Chest", false),
-    RC_OBJECT(RC_KF_MIDOS_BOTTOM_LEFT_CHEST,                                  RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_KOKIRI_FOREST,          ACTOR_EN_BOX,       SCENE_MIDOS_HOUSE,                    22914,                       GI_RUPEE_GREEN,      "Mido Bottom Left Chest", "KF Mido Bottom Left Chest", false),
-    RC_OBJECT(RC_KF_MIDOS_BOTTOM_RIGHT_CHEST,                                 RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_KOKIRI_FOREST,          ACTOR_EN_BOX,       SCENE_MIDOS_HOUSE,                    22787,                       GI_HEART,            "Mido Bottom Right Chest", "KF Mido Bottom Right Chest", false),
-    RC_OBJECT(RC_KF_STORMS_GROTTO_CHEST,                                      RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_KOKIRI_FOREST,          ACTOR_EN_BOX,       SCENE_GROTTOS,                        22988,                       GI_RUPEE_RED,        "Storms Grotto Chest", "KF Storms Grotto Chest", false),
-    RC_OBJECT(RC_KF_GS_BEAN_PATCH,                                            RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,  RCAREA_KOKIRI_FOREST,          ACTOR_EN_SI,        SCENE_KOKIRI_FOREST,                  27649,                       GI_SKULL_TOKEN,      "GS Bean Patch", "KF GS Bean Patch", true),
-    RC_OBJECT(RC_KF_GS_KNOW_IT_ALL_HOUSE,                                     RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,  RCAREA_KOKIRI_FOREST,          ACTOR_EN_SI,        SCENE_KOKIRI_FOREST,                  19458,                       GI_SKULL_TOKEN,      "GS Know It All House", "KF GS Know It All House", true),
-    RC_OBJECT(RC_KF_GS_HOUSE_OF_TWINS,                                        RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,  RCAREA_KOKIRI_FOREST,          ACTOR_EN_SI,        SCENE_KOKIRI_FOREST,                  19460,                       GI_SKULL_TOKEN,      "GS House of Twins", "KF GS House of Twins", true),
-    RC_OBJECT(RC_KF_LINKS_HOUSE_COW,                                          RCVORMQ_BOTH,    RCTYPE_COW,          RCAREA_KOKIRI_FOREST,          ACTOR_EN_COW,       SCENE_LINKS_HOUSE,                    0x00,                        GI_MILK,             "Links House Cow", "KF Links House Cow", false),
-    RC_OBJECT(RC_KF_SHOP_ITEM_1,                                              RCVORMQ_BOTH,    RCTYPE_SHOP,         RCAREA_KOKIRI_FOREST,          ACTOR_EN_GIRLA,     SCENE_KOKIRI_SHOP,                    0x00,                        GI_SHIELD_DEKU,      "Shop Item 1", "KF Shop Item 1", true),
-    RC_OBJECT(RC_KF_SHOP_ITEM_2,                                              RCVORMQ_BOTH,    RCTYPE_SHOP,         RCAREA_KOKIRI_FOREST,          ACTOR_EN_GIRLA,     SCENE_KOKIRI_SHOP,                    0x01,                        GI_NUTS_5_2,         "Shop Item 2", "KF Shop Item 2", false),
-    RC_OBJECT(RC_KF_SHOP_ITEM_3,                                              RCVORMQ_BOTH,    RCTYPE_SHOP,         RCAREA_KOKIRI_FOREST,          ACTOR_EN_GIRLA,     SCENE_KOKIRI_SHOP,                    0x02,                        GI_NUTS_10,          "Shop Item 3", "KF Shop Item 3", false),
-    RC_OBJECT(RC_KF_SHOP_ITEM_4,                                              RCVORMQ_BOTH,    RCTYPE_SHOP,         RCAREA_KOKIRI_FOREST,          ACTOR_EN_GIRLA,     SCENE_KOKIRI_SHOP,                    0x03,                        GI_STICKS_1,         "Shop Item 4", "KF Shop Item 4", false),
-    RC_OBJECT(RC_KF_SHOP_ITEM_5,                                              RCVORMQ_BOTH,    RCTYPE_SHOP,         RCAREA_KOKIRI_FOREST,          ACTOR_EN_GIRLA,     SCENE_KOKIRI_SHOP,                    0x04,                        GI_SEEDS_30,         "Shop Item 5", "KF Shop Item 5", false),
-    RC_OBJECT(RC_KF_SHOP_ITEM_6,                                              RCVORMQ_BOTH,    RCTYPE_SHOP,         RCAREA_KOKIRI_FOREST,          ACTOR_EN_GIRLA,     SCENE_KOKIRI_SHOP,                    0x05,                        GI_ARROWS_SMALL,     "Shop Item 6", "KF Shop Item 6", false),
-    RC_OBJECT(RC_KF_SHOP_ITEM_7,                                              RCVORMQ_BOTH,    RCTYPE_SHOP,         RCAREA_KOKIRI_FOREST,          ACTOR_EN_GIRLA,     SCENE_KOKIRI_SHOP,                    0x06,                        GI_ARROWS_MEDIUM,    "Shop Item 7", "KF Shop Item 7", false),
-    RC_OBJECT(RC_KF_SHOP_ITEM_8,                                              RCVORMQ_BOTH,    RCTYPE_SHOP,         RCAREA_KOKIRI_FOREST,          ACTOR_EN_GIRLA,     SCENE_KOKIRI_SHOP,                    0x07,                        GI_HEART,            "Shop Item 8", "KF Shop Item 8", false),
-    RC_OBJECT(RC_KF_DEKU_TREE_LEFT_GOSSIP_STONE,                              RCVORMQ_BOTH,    RCTYPE_GOSSIP_STONE, RCAREA_KOKIRI_FOREST,          ACTOR_EN_GS,        SCENE_KOKIRI_FOREST,                  14623,                       GI_NONE,             "Deku Tree Left Gossip Stone", "KF Deku Tree Left Gossip Stone", false),
-    RC_OBJECT(RC_KF_DEKU_TREE_RIGHT_GOSSIP_STONE,                             RCVORMQ_BOTH,    RCTYPE_GOSSIP_STONE, RCAREA_KOKIRI_FOREST,          ACTOR_EN_GS,        SCENE_KOKIRI_FOREST,                  14880,                       GI_NONE,             "Deku Tree Right Gossip Stone", "KF Deku Tree Right Gossip Stone", false),
-    RC_OBJECT(RC_KF_GOSSIP_STONE,                                             RCVORMQ_BOTH,    RCTYPE_GOSSIP_STONE, RCAREA_KOKIRI_FOREST,          ACTOR_EN_GS,        SCENE_KOKIRI_FOREST,                  14366,                       GI_NONE,             "Gossip Stone", "KF Gossip Stone", false),
-    RC_OBJECT(RC_KF_STORMS_GOSSIP_STONE,                                      RCVORMQ_BOTH,    RCTYPE_GOSSIP_STONE, RCAREA_KOKIRI_FOREST,          ACTOR_EN_GS,        SCENE_GROTTOS,                        -22988,                      GI_NONE,             "Storms Gossip Stone", "KF Storms Gossip Stone", false),
-    
-
-    RC_OBJECT(RC_LW_NEAR_SHORTCUTS_GROTTO_CHEST,                              RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_LOST_WOODS,             ACTOR_EN_BOX,       SCENE_GROTTOS,                        22964,                       GI_RUPEE_BLUE,       "Near Shortcuts Grotto Chest", "LW Near Shortcuts Grotto Chest", false),
-    RC_OBJECT(RC_LW_SKULL_KID,                                                RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_LOST_WOODS,             ACTOR_ID_MAX,       SCENE_LOST_WOODS,                     0x00,                        GI_HEART_PIECE,      "Skull Kid", "LW Skull Kid", true),
-    RC_OBJECT(RC_LW_TRADE_COJIRO,                                             RCVORMQ_BOTH,    RCTYPE_ADULT_TRADE,  RCAREA_LOST_WOODS,             ACTOR_ID_MAX,       SCENE_LOST_WOODS,                     0x00,                        GI_ODD_MUSHROOM,     "Trade Cojiro", "LW Trade Cojiro", true),
-    RC_OBJECT(RC_LW_TRADE_ODD_POTION,                                         RCVORMQ_BOTH,    RCTYPE_ADULT_TRADE,  RCAREA_LOST_WOODS,             ACTOR_ID_MAX,       SCENE_LOST_WOODS,                     0x00,                        GI_SAW,              "Trade Odd Potion", "LW Trade Odd Potion", true),
-    RC_OBJECT(RC_LW_OCARINA_MEMORY_GAME,                                      RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_LOST_WOODS,             ACTOR_ID_MAX,       SCENE_LOST_WOODS,                     0x00,                        GI_HEART_PIECE,      "Ocarina Memory Game", "LW Ocarina Memory Game", true),
-    RC_OBJECT(RC_LW_TARGET_IN_WOODS,                                          RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_LOST_WOODS,             ACTOR_ID_MAX,       SCENE_LOST_WOODS,                     0x00,                        GI_NONE,             "Target in Woods", "LW Target in Woods", true),
-    RC_OBJECT(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT,                       RCVORMQ_BOTH,    RCTYPE_SCRUB,        RCAREA_LOST_WOODS,             ACTOR_EN_DNS,       SCENE_LOST_WOODS,                     0x00,                        GI_NUTS_5_2,         "Deku Scrub Near Deku Theater Right", "LW Deku Scrub Near Deku Theater Right", false),
-    RC_OBJECT(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT,                        RCVORMQ_BOTH,    RCTYPE_SCRUB,        RCAREA_LOST_WOODS,             ACTOR_EN_DNS,       SCENE_LOST_WOODS,                     0x01,                        GI_STICKS_1,         "Deku Scrub Near Deku Theater Left", "LW Deku Scrub Near Deku Theater Left", false),
-    RC_OBJECT(RC_LW_DEKU_SCRUB_NEAR_BRIDGE,                                   RCVORMQ_BOTH,    RCTYPE_SCRUB,        RCAREA_LOST_WOODS,             ACTOR_EN_DNS,       SCENE_LOST_WOODS,                     0x09,                        GI_STICK_UPGRADE_20, "Deku Scrub Near Bridge", "LW Deku Scrub Near Bridge", true),
-    RC_OBJECT(RC_LW_DEKU_SCRUB_GROTTO_REAR,                                   RCVORMQ_BOTH,    RCTYPE_SCRUB,        RCAREA_LOST_WOODS,             ACTOR_EN_DNS,       SCENE_GROTTOS,                        TWO_ACTOR_PARAMS(0x03,0xF5), GI_SEEDS_30,         "Deku Scrub Grotto Rear", "LW Deku Scrub Grotto Rear", false),
-    RC_OBJECT(RC_LW_DEKU_SCRUB_GROTTO_FRONT,                                  RCVORMQ_BOTH,    RCTYPE_SCRUB,        RCAREA_LOST_WOODS,             ACTOR_EN_DNS,       SCENE_GROTTOS,                        TWO_ACTOR_PARAMS(0x0A,0xF5), GI_NUT_UPGRADE_30,   "Deku Scrub Grotto Front", "LW Deku Scrub Grotto Front", false),
-    RC_OBJECT(RC_DEKU_THEATER_SKULL_MASK,                                     RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_LOST_WOODS,             ACTOR_ID_MAX,       SCENE_GROTTOS,                        0x00,                        GI_NONE,             "Deku Theater Skull Mask", "Deku Theater Skull Mask", true),
-    RC_OBJECT(RC_DEKU_THEATER_MASK_OF_TRUTH,                                  RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_LOST_WOODS,             ACTOR_ID_MAX,       SCENE_GROTTOS,                        0x00,                        GI_NONE,             "Deku Theater Mask of Truth", "Deku Theater Mask of Truth", true),
-    RC_OBJECT(RC_LW_GS_BEAN_PATCH_NEAR_BRIDGE,                                RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,  RCAREA_LOST_WOODS,             ACTOR_EN_SI,        SCENE_LOST_WOODS,                     27905,                       GI_SKULL_TOKEN,      "GS Bean Patch Near Bridge", "LW GS Bean Patch Near Bridge", true),
-    RC_OBJECT(RC_LW_GS_BEAN_PATCH_NEAR_THEATER,                               RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,  RCAREA_LOST_WOODS,             ACTOR_EN_SI,        SCENE_LOST_WOODS,                     27906,                       GI_SKULL_TOKEN,      "GS Bean Patch Near Theater", "LW GS Bean Patch Near Theater", true),
-    RC_OBJECT(RC_LW_GS_ABOVE_THEATER,                                         RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,  RCAREA_LOST_WOODS,             ACTOR_EN_SI,        SCENE_LOST_WOODS,                     19716,                       GI_SKULL_TOKEN,      "GS Above Theater", "LW GS Above Theater", true),
-    RC_OBJECT(RC_LW_GIFT_FROM_SARIA,                                          RCVORMQ_BOTH,    RCTYPE_OCARINA,      RCAREA_LOST_WOODS,             ACTOR_ID_MAX,       SCENE_LOST_WOODS,                     0x00,                        GI_OCARINA_FAIRY,    "Gift From Saria", "LW Gift From Saria", true),
-    RC_OBJECT(RC_LW_GOSSIP_STONE,                                             RCVORMQ_BOTH,    RCTYPE_GOSSIP_STONE, RCAREA_LOST_WOODS,             ACTOR_EN_GS,        SCENE_LOST_WOODS,                     14365,                       GI_NONE,             "Gossip Stone", "LW Gossip Stone", false),
-    RC_OBJECT(RC_LW_NEAR_SHORTCUTS_GOSSIP_STONE,                              RCVORMQ_BOTH,    RCTYPE_GOSSIP_STONE, RCAREA_LOST_WOODS,             ACTOR_EN_GS,        SCENE_GROTTOS,                        -22964,                      GI_NONE,             "Near Shortcuts Gossip Stone", "LW Near Shortcuts Gossip Stone", false),
-    
-
-    RC_OBJECT(RC_SFM_WOLFOS_GROTTO_CHEST,                                     RCVORMQ_BOTH,    RCTYPE_STANDARD,      RCAREA_SACRED_FOREST_MEADOW,   ACTOR_EN_BOX,       SCENE_GROTTOS,                        31409,                       GI_RUPEE_PURPLE,     "Wolfos Grotto Chest", "SFM Wolfos Grotto Chest", false),
-    RC_OBJECT(RC_SFM_DEKU_SCRUB_GROTTO_REAR,                                  RCVORMQ_BOTH,    RCTYPE_SCRUB,         RCAREA_SACRED_FOREST_MEADOW,   ACTOR_EN_DNS,       SCENE_GROTTOS,                        TWO_ACTOR_PARAMS(0x07,0xEE), GI_POTION_RED,       "Deku Scrub Grotto Rear", "SFM Deku Scrub Grotto Rear", false),
-    RC_OBJECT(RC_SFM_DEKU_SCRUB_GROTTO_FRONT,                                 RCVORMQ_BOTH,    RCTYPE_SCRUB,         RCAREA_SACRED_FOREST_MEADOW,   ACTOR_EN_DNS,       SCENE_GROTTOS,                        TWO_ACTOR_PARAMS(0x08,0xEE), GI_POTION_GREEN,     "Deku Scrub Grotto Front", "SFM Deku Scrub Grotto Front", false),
-    RC_OBJECT(RC_SFM_GS,                                                      RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,   RCAREA_SACRED_FOREST_MEADOW,   ACTOR_EN_SI,        SCENE_SACRED_FOREST_MEADOW,           19720,                       GI_SKULL_TOKEN,      "GS", "SFM GS", true),
-    RC_OBJECT(RC_SHEIK_IN_FOREST,                                             RCVORMQ_BOTH,    RCTYPE_SONG_LOCATION, RCAREA_SACRED_FOREST_MEADOW,   ACTOR_ID_MAX,       SCENE_SACRED_FOREST_MEADOW,           0x00,                        GI_NONE,             "Sheik in Forest", "Sheik in Forest", true),
-    RC_OBJECT(RC_SONG_FROM_SARIA,                                             RCVORMQ_BOTH,    RCTYPE_SONG_LOCATION, RCAREA_SACRED_FOREST_MEADOW,   ACTOR_ID_MAX,       SCENE_SACRED_FOREST_MEADOW,           0x00,                        GI_NONE,             "Song from Saria", "Song from Saria", true),
-    RC_OBJECT(RC_SFM_MAZE_LOWER_GOSSIP_STONE,                                 RCVORMQ_BOTH,    RCTYPE_GOSSIP_STONE,  RCAREA_SACRED_FOREST_MEADOW,   ACTOR_EN_GS,        SCENE_SACRED_FOREST_MEADOW,           14358,                       GI_NONE,             "Maze Lower Gossip Stone", "SFM Maze Lower Gossip Stone", false),
-    RC_OBJECT(RC_SFM_MAZE_UPPER_GOSSIP_STONE,                                 RCVORMQ_BOTH,    RCTYPE_GOSSIP_STONE,  RCAREA_SACRED_FOREST_MEADOW,   ACTOR_EN_GS,        SCENE_SACRED_FOREST_MEADOW,           14615,                       GI_NONE,             "Maze Upper Gossip Stone", "SFM Maze Upper Gossip Stone", false),
-    RC_OBJECT(RC_SFM_SARIA_GOSSIP_STONE,                                      RCVORMQ_BOTH,    RCTYPE_GOSSIP_STONE,  RCAREA_SACRED_FOREST_MEADOW,   ACTOR_EN_GS,        SCENE_SACRED_FOREST_MEADOW,           14876,                       GI_NONE,             "Saria Gossip Stone", "SFM Saria Gossip Stone", false),
-
-
-    RC_OBJECT(RC_HF_SOUTHEAST_GROTTO_CHEST,                                   RCVORMQ_BOTH,    RCTYPE_STANDARD,      RCAREA_HYRULE_FIELD,           ACTOR_EN_BOX,       SCENE_GROTTOS,                        22978,                       GI_RUPEE_RED,        "Southeast Grotto Chest", "HF Southeast Grotto Chest", false),
-    RC_OBJECT(RC_HF_OPEN_GROTTO_CHEST,                                        RCVORMQ_BOTH,    RCTYPE_STANDARD,      RCAREA_HYRULE_FIELD,           ACTOR_EN_BOX,       SCENE_GROTTOS,                        22947,                       GI_RUPEE_BLUE,       "Open Grotto Chest", "HF Open Grotto Chest", false),
-    RC_OBJECT(RC_HF_NEAR_MARKET_GROTTO_CHEST,                                 RCVORMQ_BOTH,    RCTYPE_STANDARD,      RCAREA_HYRULE_FIELD,           ACTOR_EN_BOX,       SCENE_GROTTOS,                        22944,                       GI_RUPEE_BLUE,       "Near Market Grotto Chest", "HF Near Market Grotto Chest", false),
-    RC_OBJECT(RC_HF_OCARINA_OF_TIME_ITEM,                                     RCVORMQ_BOTH,    RCTYPE_OCARINA,       RCAREA_HYRULE_FIELD,           ACTOR_ID_MAX,       SCENE_HYRULE_FIELD,                   0x00,                        GI_OCARINA_OOT,      "Ocarina of Time Item", "HF Ocarina of Time Item", true),
-    RC_OBJECT(RC_HF_TEKTITE_GROTTO_FREESTANDING_POH,                          RCVORMQ_BOTH,    RCTYPE_STANDARD,      RCAREA_HYRULE_FIELD,           ACTOR_EN_ITEM00,    SCENE_GROTTOS,                        262,                         GI_HEART_PIECE,      "Tektite Grotto Freestanding PoH", "HF Tektite Grotto Freestanding PoH", true),
-    RC_OBJECT(RC_HF_DEKU_SCRUB_GROTTO,                                        RCVORMQ_BOTH,    RCTYPE_SCRUB,         RCAREA_HYRULE_FIELD,           ACTOR_EN_DNS,       SCENE_GROTTOS,                        TWO_ACTOR_PARAMS(0x02,0xE6), GI_HEART_PIECE,      "Deku Scrub Grotto", "HF Deku Scrub Grotto", true),
-    RC_OBJECT(RC_HF_GS_COW_GROTTO,                                            RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,   RCAREA_HYRULE_FIELD,           ACTOR_EN_SI,        SCENE_GROTTOS,                        10753,                       GI_SKULL_TOKEN,      "GS Cow Grotto", "HF GS Cow Grotto", true),
-    RC_OBJECT(RC_HF_GS_NEAR_KAK_GROTTO,                                       RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,   RCAREA_HYRULE_FIELD,           ACTOR_EN_SI,        SCENE_GROTTOS,                        10754,                       GI_SKULL_TOKEN,      "GS Near Kak Grotto", "HF GS Near Kak Grotto", true),
-    RC_OBJECT(RC_SONG_FROM_OCARINA_OF_TIME,                                   RCVORMQ_BOTH,    RCTYPE_SONG_LOCATION, RCAREA_HYRULE_FIELD,           ACTOR_ID_MAX,       SCENE_ID_MAX,                         0x00,                        GI_NONE,             "Song from Ocarina of Time", "Song from Ocarina of Time", true),
-    RC_OBJECT(RC_HF_COW_GROTTO_COW,                                           RCVORMQ_BOTH,    RCTYPE_COW,           RCAREA_HYRULE_FIELD,           ACTOR_EN_COW,       SCENE_GROTTOS,                        TWO_ACTOR_PARAMS(3485,-291), GI_MILK,             "Cow Grotto Cow", "HF Cow Grotto Cow", false),
-    RC_OBJECT(RC_HF_COW_GROTTO_GOSSIP_STONE,                                  RCVORMQ_BOTH,    RCTYPE_GOSSIP_STONE,  RCAREA_HYRULE_FIELD,           ACTOR_EN_GS,        SCENE_GROTTOS,                        14363,                       GI_NONE,             "Cow Grotto Gossip Stone", "HF Cow Grotto Gossip Stone", false),
-    RC_OBJECT(RC_HF_NEAR_MARKET_GOSSIP_STONE,                                 RCVORMQ_BOTH,    RCTYPE_GOSSIP_STONE,  RCAREA_HYRULE_FIELD,           ACTOR_EN_GS,        SCENE_GROTTOS,                        -22944,                      GI_NONE,             "Near Market Gossip Stone", "HF Near Market Gossip Stone", false),
-    RC_OBJECT(RC_HF_OPEN_GROTTO_GOSSIP_STONE,                                 RCVORMQ_BOTH,    RCTYPE_GOSSIP_STONE,  RCAREA_HYRULE_FIELD,           ACTOR_EN_GS,        SCENE_GROTTOS,                        -22947,                      GI_NONE,             "Open Grotto Gossip Stone", "HF Open Grotto Gossip Stone", false),
-    RC_OBJECT(RC_HF_SOUTHEAST_GOSSIP_STONE,                                   RCVORMQ_BOTH,    RCTYPE_GOSSIP_STONE,  RCAREA_HYRULE_FIELD,           ACTOR_EN_GS,        SCENE_GROTTOS,                        -22978,                      GI_NONE,             "Southeast Gossip Stone", "HF Southeast Gossip Stone", false),
-
-
-    RC_OBJECT(RC_LH_CHILD_FISHING,                                            RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_LAKE_HYLIA,             ACTOR_ID_MAX,       SCENE_FISHING_POND,                   0x00,                        GI_HEART_PIECE,      "Child Fishing", "LH Child Fishing", true),
-    RC_OBJECT(RC_LH_ADULT_FISHING,                                            RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_LAKE_HYLIA,             ACTOR_ID_MAX,       SCENE_FISHING_POND,                   0x00,                        GI_SCALE_GOLD,       "Adult Fishing", "LH Adult Fishing", true),
-    RC_OBJECT(RC_LH_LAB_DIVE,                                                 RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_LAKE_HYLIA,             ACTOR_ID_MAX,       SCENE_LAKESIDE_LABORATORY,            0x00,                        GI_HEART_PIECE,      "Lab Dive", "LH Lab Dive", true),
-    RC_OBJECT(RC_LH_TRADE_FROG,                                               RCVORMQ_BOTH,    RCTYPE_ADULT_TRADE,  RCAREA_LAKE_HYLIA,             ACTOR_ID_MAX,       SCENE_LAKESIDE_LABORATORY,            0x00,                        GI_FROG,             "Lab Trade Eyeball Frog", "LH Lab Trade Eyeball Frog", true),
-    RC_OBJECT(RC_LH_UNDERWATER_ITEM,                                          RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_LAKE_HYLIA,             ACTOR_ID_MAX,       SCENE_LAKE_HYLIA,                     0x00,                        GI_LETTER_RUTO,      "Underwater Item", "LH Underwater Item", true),
-    RC_OBJECT(RC_LH_SUN,                                                      RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_LAKE_HYLIA,             ACTOR_ID_MAX,       SCENE_LAKE_HYLIA,                     0x00,                        GI_ARROW_FIRE,       "Sun", "LH Sun", true),
-    RC_OBJECT(RC_LH_FREESTANDING_POH,                                         RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_LAKE_HYLIA,             ACTOR_EN_ITEM00,    SCENE_LAKE_HYLIA,                     7686,                        GI_HEART_PIECE,      "Freestanding PoH", "LH Freestanding PoH", true),
-    RC_OBJECT(RC_LH_DEKU_SCRUB_GROTTO_LEFT,                                   RCVORMQ_BOTH,    RCTYPE_SCRUB,        RCAREA_LAKE_HYLIA,             ACTOR_EN_DNS,       SCENE_GROTTOS,                        TWO_ACTOR_PARAMS(0x00,0xEF), GI_NUTS_5_2,         "Deku Scrub Grotto Left", "LH Deku Scrub Grotto Left", false),
-    RC_OBJECT(RC_LH_DEKU_SCRUB_GROTTO_RIGHT,                                  RCVORMQ_BOTH,    RCTYPE_SCRUB,        RCAREA_LAKE_HYLIA,             ACTOR_EN_DNS,       SCENE_GROTTOS,                        TWO_ACTOR_PARAMS(0x05,0xEF), GI_BOMBS_5,          "Deku Scrub Grotto Right", "LH Deku Scrub Grotto Right", false),
-    RC_OBJECT(RC_LH_DEKU_SCRUB_GROTTO_CENTER,                                 RCVORMQ_BOTH,    RCTYPE_SCRUB,        RCAREA_LAKE_HYLIA,             ACTOR_EN_DNS,       SCENE_GROTTOS,                        TWO_ACTOR_PARAMS(0x03,0xEF), GI_SEEDS_30,         "Deku Scrub Grotto Center", "LH Deku Scrub Grotto Center", false),
-    RC_OBJECT(RC_LH_GS_BEAN_PATCH,                                            RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,  RCAREA_LAKE_HYLIA,             ACTOR_EN_SI,        SCENE_LAKE_HYLIA,                     29185,                       GI_SKULL_TOKEN,      "GS Bean Patch", "LH GS Bean Patch", true),
-    RC_OBJECT(RC_LH_GS_SMALL_ISLAND,                                          RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,  RCAREA_LAKE_HYLIA,             ACTOR_EN_SI,        SCENE_LAKE_HYLIA,                     20994,                       GI_SKULL_TOKEN,      "GS Small Island", "LH GS Small Island", true),
-    RC_OBJECT(RC_LH_GS_LAB_WALL,                                              RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,  RCAREA_LAKE_HYLIA,             ACTOR_EN_SI,        SCENE_LAKE_HYLIA,                     20996,                       GI_SKULL_TOKEN,      "GS Lab Wall", "LH GS Lab Wall", true),
-    RC_OBJECT(RC_LH_GS_LAB_CRATE,                                             RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,  RCAREA_LAKE_HYLIA,             ACTOR_EN_SI,        SCENE_LAKESIDE_LABORATORY,            -28152,                      GI_SKULL_TOKEN,      "GS Lab Crate", "LH GS Lab Crate", true),
-    RC_OBJECT(RC_LH_GS_TREE,                                                  RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,  RCAREA_LAKE_HYLIA,             ACTOR_EN_SI,        SCENE_LAKE_HYLIA,                     21008,                       GI_SKULL_TOKEN,      "GS Tree", "LH GS Tree", true),
-    RC_OBJECT(RC_LH_LAB_GOSSIP_STONE,                                         RCVORMQ_BOTH,    RCTYPE_GOSSIP_STONE, RCAREA_LAKE_HYLIA,             ACTOR_EN_GS,        SCENE_LAKE_HYLIA,                     14339,                       GI_NONE,             "Lab Gossip Stone", "LH Lab Gossip Stone", false),
-    RC_OBJECT(RC_LH_SOUTHEAST_GOSSIP_STONE,                                   RCVORMQ_BOTH,    RCTYPE_GOSSIP_STONE, RCAREA_LAKE_HYLIA,             ACTOR_EN_GS,        SCENE_LAKE_HYLIA,                     14863,                       GI_NONE,             "Southeast Gossip Stone", "LH Southeast Gossip Stone", false),
-    RC_OBJECT(RC_LH_SOUTHWEST_GOSSIP_STONE,                                   RCVORMQ_BOTH,    RCTYPE_GOSSIP_STONE, RCAREA_LAKE_HYLIA,             ACTOR_EN_GS,        SCENE_LAKE_HYLIA,                     14600,                       GI_NONE,             "Southwest Gossip Stone", "LH Southwest Gossip Stone", false),
-
-
-    RC_OBJECT(RC_GV_CHEST,                                                    RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_GERUDO_VALLEY,          ACTOR_EN_BOX,       SCENE_GERUDO_VALLEY,                  23200,                       GI_RUPEE_PURPLE,     "Chest", "GV Chest", false),
-    RC_OBJECT(RC_GV_TRADE_SAW,                                                RCVORMQ_BOTH,    RCTYPE_ADULT_TRADE,  RCAREA_GERUDO_VALLEY,          ACTOR_ID_MAX,       SCENE_GERUDO_VALLEY,                  0x00,                        GI_NONE,             "Trade Saw", "GV Trade Saw", true),
-    RC_OBJECT(RC_GV_WATERFALL_FREESTANDING_POH,                               RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_GERUDO_VALLEY,          ACTOR_EN_ITEM00,    SCENE_GERUDO_VALLEY,                  262,                         GI_HEART_PIECE,      "Waterfall Freestanding PoH", "GV Waterfall Freestanding PoH", true),
-    RC_OBJECT(RC_GV_CRATE_FREESTANDING_POH,                                   RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_GERUDO_VALLEY,          ACTOR_EN_ITEM00,    SCENE_GERUDO_VALLEY,                  518,                         GI_HEART_PIECE,      "Crate Freestanding PoH", "GV Crate Freestanding PoH", true),
-    RC_OBJECT(RC_GV_DEKU_SCRUB_GROTTO_REAR,                                   RCVORMQ_BOTH,    RCTYPE_SCRUB,        RCAREA_GERUDO_VALLEY,          ACTOR_EN_DNS,       SCENE_GROTTOS,                        TWO_ACTOR_PARAMS(0x07,0xF0), GI_POTION_RED,       "Deku Scrub Grotto Rear", "GV Deku Scrub Grotto Rear", false),
-    RC_OBJECT(RC_GV_DEKU_SCRUB_GROTTO_FRONT,                                  RCVORMQ_BOTH,    RCTYPE_SCRUB,        RCAREA_GERUDO_VALLEY,          ACTOR_EN_DNS,       SCENE_GROTTOS,                        TWO_ACTOR_PARAMS(0x08,0xF0), GI_POTION_GREEN,     "Deku Scrub Grotto Front", "GV Deku Scrub Grotto Front", false),
-    RC_OBJECT(RC_GV_GS_BEAN_PATCH,                                            RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,  RCAREA_GERUDO_VALLEY,          ACTOR_EN_SI,        SCENE_GERUDO_VALLEY,                  29441,                       GI_SKULL_TOKEN,      "GS Bean Patch", "GV GS Bean Patch", true),
-    RC_OBJECT(RC_GV_GS_SMALL_BRIDGE,                                          RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,  RCAREA_GERUDO_VALLEY,          ACTOR_EN_SI,        SCENE_GERUDO_VALLEY,                  21250,                       GI_SKULL_TOKEN,      "GS Small Bridge", "GV GS Small Bridge", true),
-    RC_OBJECT(RC_GV_GS_PILLAR,                                                RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,  RCAREA_GERUDO_VALLEY,          ACTOR_EN_SI,        SCENE_GERUDO_VALLEY,                  21252,                       GI_SKULL_TOKEN,      "GS Pillar", "GV GS Pillar", true),
-    RC_OBJECT(RC_GV_GS_BEHIND_TENT,                                           RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,  RCAREA_GERUDO_VALLEY,          ACTOR_EN_SI,        SCENE_GERUDO_VALLEY,                  21256,                       GI_SKULL_TOKEN,      "GS Behind Tent", "GV GS Behind Tent", true),
-    RC_OBJECT(RC_GV_COW,                                                      RCVORMQ_BOTH,    RCTYPE_COW,          RCAREA_GERUDO_VALLEY,          ACTOR_EN_COW,       SCENE_GERUDO_VALLEY,                  0x00,                        GI_MILK,             "Cow", "GV Cow", false),
-    RC_OBJECT(RC_GV_GOSSIP_STONE,                                             RCVORMQ_BOTH,    RCTYPE_GOSSIP_STONE, RCAREA_GERUDO_VALLEY,          ACTOR_EN_GS,        SCENE_GERUDO_VALLEY,                  14353,                       GI_NONE,             "Gossip Stone", "GV Gossip Stone", false),
-
-
-    RC_OBJECT(RC_GF_CHEST,                                                    RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_GERUDO_FORTRESS,        ACTOR_EN_BOX,       SCENE_GERUDOS_FORTRESS,               1984,                        GI_HEART_PIECE,      "Chest", "GF Chest", true),
-    RC_OBJECT(RC_GF_HBA_1000_POINTS,                                          RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_GERUDO_FORTRESS,        ACTOR_ID_MAX,       SCENE_GERUDOS_FORTRESS,               0x00,                        GI_HEART_PIECE,       "GF HBA 1000 Points", "GF HBA 1000 Points", true),
-    RC_OBJECT(RC_GF_HBA_1500_POINTS,                                          RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_GERUDO_FORTRESS,        ACTOR_ID_MAX,       SCENE_GERUDOS_FORTRESS,               0x00,                        GI_QUIVER_50,        "GF HBA 1500 Points", "GF HBA 1500 Points", true),
-    RC_OBJECT(RC_GF_GERUDO_MEMBERSHIP_CARD,                                   RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_GERUDO_FORTRESS,        ACTOR_ID_MAX,       SCENE_THIEVES_HIDEOUT,                0x00,                        GI_HEART_PIECE,      "GF Gerudo Membership Card", "GF Gerudo Membership Card", true),
-    RC_OBJECT(RC_GF_NORTH_F1_CARPENTER,                                       RCVORMQ_BOTH,    RCTYPE_GF_KEY,       RCAREA_GERUDO_FORTRESS,        ACTOR_EN_ITEM00,    SCENE_THIEVES_HIDEOUT,                3089,                        GI_KEY_SMALL,        "GF North F1 Carpenter", "GF North F1 Carpenter", true),
-    RC_OBJECT(RC_GF_NORTH_F2_CARPENTER,                                       RCVORMQ_BOTH,    RCTYPE_GF_KEY,       RCAREA_GERUDO_FORTRESS,        ACTOR_EN_ITEM00,    SCENE_THIEVES_HIDEOUT,                2577,                        GI_KEY_SMALL,        "GF North F2 Carpenter", "GF North F2 Carpenter", true),
-    RC_OBJECT(RC_GF_SOUTH_F1_CARPENTER,                                       RCVORMQ_BOTH,    RCTYPE_GF_KEY,       RCAREA_GERUDO_FORTRESS,        ACTOR_EN_ITEM00,    SCENE_THIEVES_HIDEOUT,                3601,                        GI_KEY_SMALL,        "GF South F1 Carpenter", "GF South F1 Carpenter", true),
-    RC_OBJECT(RC_GF_SOUTH_F2_CARPENTER,                                       RCVORMQ_BOTH,    RCTYPE_GF_KEY,       RCAREA_GERUDO_FORTRESS,        ACTOR_EN_ITEM00,    SCENE_THIEVES_HIDEOUT,                3857,                        GI_KEY_SMALL,        "GF South F2 Carpenter", "GF South F2 Carpenter", true),
-    RC_OBJECT(RC_GF_GS_ARCHERY_RANGE,                                         RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,  RCAREA_GERUDO_FORTRESS,        ACTOR_EN_SI,        SCENE_GERUDOS_FORTRESS,               21505,                       GI_SKULL_TOKEN,      "GS Archery Range", "GF GS Archery Range", true),
-    RC_OBJECT(RC_GF_GS_TOP_FLOOR,                                             RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,  RCAREA_GERUDO_FORTRESS,        ACTOR_EN_SI,        SCENE_GERUDOS_FORTRESS,               21506,                       GI_SKULL_TOKEN,      "GS Top Floor", "GF GS Top Floor", true),
-
-
-    RC_OBJECT(RC_WASTELAND_CHEST,                                             RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_WASTELAND,              ACTOR_EN_BOX,       SCENE_HAUNTED_WASTELAND,              -30048,                      GI_RUPEE_PURPLE,     "Chest", "Wasteland Chest", false),
-    RC_OBJECT(RC_WASTELAND_BOMBCHU_SALESMAN,                                  RCVORMQ_BOTH,    RCTYPE_MERCHANT,     RCAREA_WASTELAND,              ACTOR_ID_MAX,       SCENE_HAUNTED_WASTELAND,              0x00,                        GI_NONE,             "Carpet Salesman", "Wasteland Carpet Salesman", false),
-    RC_OBJECT(RC_WASTELAND_GS,                                                RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,  RCAREA_WASTELAND,              ACTOR_EN_SI,        SCENE_HAUNTED_WASTELAND,              13570,                       GI_SKULL_TOKEN,      "GS", "Wasteland GS", true),
-
-
-    RC_OBJECT(RC_COLOSSUS_FREESTANDING_POH,                                   RCVORMQ_BOTH,    RCTYPE_STANDARD,      RCAREA_DESERT_COLOSSUS,        ACTOR_EN_ITEM00,    SCENE_DESERT_COLOSSUS,                3334,                        GI_HEART_PIECE,      "Freestanding PoH", "Colossus Freestanding PoH", true),
-    RC_OBJECT(RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,                             RCVORMQ_BOTH,    RCTYPE_SCRUB,         RCAREA_DESERT_COLOSSUS,        ACTOR_EN_DNS,       SCENE_GROTTOS,                        TWO_ACTOR_PARAMS(0x07,0xFD), GI_POTION_RED,       "Deku Scrub Grotto Rear", "Colossus Deku Scrub Grotto Rear", false),
-    RC_OBJECT(RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT,                            RCVORMQ_BOTH,    RCTYPE_SCRUB,         RCAREA_DESERT_COLOSSUS,        ACTOR_EN_DNS,       SCENE_GROTTOS,                        TWO_ACTOR_PARAMS(0x08,0xFD), GI_POTION_GREEN,     "Deku Scrub Grotto Front", "Colossus Deku Scrub Grotto Front", false),
-    RC_OBJECT(RC_COLOSSUS_GS_BEAN_PATCH,                                      RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,   RCAREA_DESERT_COLOSSUS,        ACTOR_EN_SI,        SCENE_DESERT_COLOSSUS,                29953,                       GI_SKULL_TOKEN,      "GS Bean Patch", "Colossus GS Bean Patch", true),
-    RC_OBJECT(RC_COLOSSUS_GS_HILL,                                            RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,   RCAREA_DESERT_COLOSSUS,        ACTOR_EN_SI,        SCENE_DESERT_COLOSSUS,                21764,                       GI_SKULL_TOKEN,      "GS Hill", "Colossus GS Hill", true),
-    RC_OBJECT(RC_COLOSSUS_GS_TREE,                                            RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,   RCAREA_DESERT_COLOSSUS,        ACTOR_EN_SI,        SCENE_DESERT_COLOSSUS,                21768,                       GI_SKULL_TOKEN,      "GS Tree", "Colossus GS Tree", true),
-    RC_OBJECT(RC_COLOSSUS_GREAT_FAIRY_REWARD,                                 RCVORMQ_BOTH,    RCTYPE_STANDARD,      RCAREA_DESERT_COLOSSUS,        ACTOR_BG_DY_YOSEIZO,SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS,   3,                           GI_NONE,             "Great Fairy Reward", "Colossus Great Fairy Reward", true),
-    RC_OBJECT(RC_SHEIK_AT_COLOSSUS,                                           RCVORMQ_BOTH,    RCTYPE_SONG_LOCATION, RCAREA_DESERT_COLOSSUS,        ACTOR_ID_MAX,       SCENE_DESERT_COLOSSUS,                0x00,                        GI_NONE,             "Sheik at Colossus", "Sheik at Colossus", true),
-    RC_OBJECT(RC_COLOSSUS_GOSSIP_STONE,                                       RCVORMQ_BOTH,    RCTYPE_GOSSIP_STONE,  RCAREA_DESERT_COLOSSUS,        ACTOR_EN_GS,        SCENE_DESERT_COLOSSUS,                14362,                       GI_NONE,             "Gossip Stone", "Colossus Gossip Stone", false),
-
-
-    RC_OBJECT(RC_MARKET_TREASURE_CHEST_GAME_REWARD,                           RCVORMQ_BOTH,    RCTYPE_STANDARD,      RCAREA_MARKET,                 ACTOR_EN_BOX,       SCENE_TREASURE_BOX_SHOP,              0x00,                        GI_HEART_PIECE,      "Treasure Chest Game Reward", "MK Treasure Chest Game Reward", true),
-    RC_OBJECT(RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,                          RCVORMQ_BOTH,    RCTYPE_STANDARD,      RCAREA_MARKET,                 ACTOR_ID_MAX,       SCENE_BOMBCHU_BOWLING_ALLEY,          0x00,                        GI_NONE,             "Bombchu Bowling First Prize", "MK Bombchu Bowling First Prize", true),
-    RC_OBJECT(RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE,                         RCVORMQ_BOTH,    RCTYPE_STANDARD,      RCAREA_MARKET,                 ACTOR_ID_MAX,       SCENE_BOMBCHU_BOWLING_ALLEY,          0x00,                        GI_HEART_PIECE,      "Bombchu Bowling Second Prize", "MK Bombchu Bowling Second Prize", true),
-    RC_OBJECT(RC_MARKET_LOST_DOG,                                             RCVORMQ_BOTH,    RCTYPE_STANDARD,      RCAREA_MARKET,                 ACTOR_ID_MAX,       SCENE_DOG_LADY_HOUSE,                 0x00,                        GI_HEART_PIECE,      "Lost Dog", "MK Lost Dog", true),
-    RC_OBJECT(RC_MARKET_SHOOTING_GALLERY_REWARD,                              RCVORMQ_BOTH,    RCTYPE_STANDARD,      RCAREA_MARKET,                 ACTOR_ID_MAX,       SCENE_SHOOTING_GALLERY,               0x00,                        GI_BULLET_BAG_40,    "Shooting Gallery", "MK Shooting Gallery", true),
-    RC_OBJECT(RC_MARKET_10_BIG_POES,                                          RCVORMQ_BOTH,    RCTYPE_STANDARD,      RCAREA_MARKET,                 ACTOR_ID_MAX,       SCENE_MARKET_GUARD_HOUSE,             0x00,                        GI_BOTTLE,           "10 Big Poes", "MK 10 Big Poes", true),
-    RC_OBJECT(RC_MARKET_TREASURE_CHEST_GAME_ITEM_1,                           RCVORMQ_BOTH,    RCTYPE_CHEST_GAME,    RCAREA_MARKET,                 ACTOR_EN_BOX,       SCENE_TREASURE_BOX_SHOP,              0x00,                        GI_NONE,             "Chest Game First Room Chest", "MK Chest Game First Room Chest", false),
-    RC_OBJECT(RC_MARKET_TREASURE_CHEST_GAME_ITEM_2,                           RCVORMQ_BOTH,    RCTYPE_CHEST_GAME,    RCAREA_MARKET,                 ACTOR_EN_BOX,       SCENE_TREASURE_BOX_SHOP,              0x00,                        GI_NONE,             "Chest Game Second Room Chest", "MK Chest Game Second Room Chest", false),
-    RC_OBJECT(RC_MARKET_TREASURE_CHEST_GAME_ITEM_3,                           RCVORMQ_BOTH,    RCTYPE_CHEST_GAME,    RCAREA_MARKET,                 ACTOR_EN_BOX,       SCENE_TREASURE_BOX_SHOP,              0x00,                        GI_NONE,             "Chest Game Third Room Chest", "MK Chest Game Third Room Chest", false),
-    RC_OBJECT(RC_MARKET_TREASURE_CHEST_GAME_ITEM_4,                           RCVORMQ_BOTH,    RCTYPE_CHEST_GAME,    RCAREA_MARKET,                 ACTOR_EN_BOX,       SCENE_TREASURE_BOX_SHOP,              0x00,                        GI_NONE,             "Chest Game Fourth Room Chest", "MK Chest Game Fourth Room Chest", false),
-    RC_OBJECT(RC_MARKET_TREASURE_CHEST_GAME_ITEM_5,                           RCVORMQ_BOTH,    RCTYPE_CHEST_GAME,    RCAREA_MARKET,                 ACTOR_EN_BOX,       SCENE_TREASURE_BOX_SHOP,              0x00,                        GI_NONE,             "Chest Game Fifth Room Chest", "MK Chest Game Fifth Room Chest", false),
-    RC_OBJECT(RC_MARKET_GS_GUARD_HOUSE,                                       RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,   RCAREA_MARKET,                 ACTOR_EN_SI,        SCENE_MARKET_GUARD_HOUSE,             -29176,                      GI_SKULL_TOKEN,      "Market GS Guard House", "Market GS Guard House", true),
-    RC_OBJECT(RC_TOT_LIGHT_ARROWS_CUTSCENE,                                   RCVORMQ_BOTH,    RCTYPE_STANDARD,      RCAREA_MARKET,                 ACTOR_ID_MAX,       SCENE_ID_MAX,                         0x00,                        GI_ARROW_LIGHT,      "ToT Light Arrow Cutscene", "ToT Light Arrow Cutscene", true),
-    RC_OBJECT(RC_SHEIK_AT_TEMPLE,                                             RCVORMQ_BOTH,    RCTYPE_SONG_LOCATION, RCAREA_MARKET,                 ACTOR_ID_MAX,       SCENE_ID_MAX,                         0x00,                        GI_NONE,             "Sheik at Temple", "Sheik at Temple", true),
-    RC_OBJECT(RC_MARKET_BOMBCHU_SHOP_ITEM_1,                                  RCVORMQ_BOTH,    RCTYPE_SHOP,          RCAREA_MARKET,                 ACTOR_EN_GIRLA,     SCENE_BOMBCHU_SHOP,                   0x00,                        GI_BOMBCHUS_10,      "Bombchu Shop Item 1", "MK Bombchu Shop Item 1", false),
-    RC_OBJECT(RC_MARKET_BOMBCHU_SHOP_ITEM_2,                                  RCVORMQ_BOTH,    RCTYPE_SHOP,          RCAREA_MARKET,                 ACTOR_EN_GIRLA,     SCENE_BOMBCHU_SHOP,                   0x01,                        GI_BOMBCHUS_10,      "Bombchu Shop Item 2", "MK Bombchu Shop Item 2", false),
-    RC_OBJECT(RC_MARKET_BOMBCHU_SHOP_ITEM_3,                                  RCVORMQ_BOTH,    RCTYPE_SHOP,          RCAREA_MARKET,                 ACTOR_EN_GIRLA,     SCENE_BOMBCHU_SHOP,                   0x02,                        GI_BOMBCHUS_10,      "Bombchu Shop Item 3", "MK Bombchu Shop Item 3", false),
-    RC_OBJECT(RC_MARKET_BOMBCHU_SHOP_ITEM_4,                                  RCVORMQ_BOTH,    RCTYPE_SHOP,          RCAREA_MARKET,                 ACTOR_EN_GIRLA,     SCENE_BOMBCHU_SHOP,                   0x03,                        GI_BOMBCHUS_10,      "Bombchu Shop Item 4", "MK Bombchu Shop Item 4", false),
-    RC_OBJECT(RC_MARKET_BOMBCHU_SHOP_ITEM_5,                                  RCVORMQ_BOTH,    RCTYPE_SHOP,          RCAREA_MARKET,                 ACTOR_EN_GIRLA,     SCENE_BOMBCHU_SHOP,                   0x04,                        GI_BOMBCHUS_20,      "Bombchu Shop Item 5", "MK Bombchu Shop Item 5", false),
-    RC_OBJECT(RC_MARKET_BOMBCHU_SHOP_ITEM_6,                                  RCVORMQ_BOTH,    RCTYPE_SHOP,          RCAREA_MARKET,                 ACTOR_EN_GIRLA,     SCENE_BOMBCHU_SHOP,                   0x05,                        GI_BOMBCHUS_20,      "Bombchu Shop Item 6", "MK Bombchu Shop Item 6", false),
-    RC_OBJECT(RC_MARKET_BOMBCHU_SHOP_ITEM_7,                                  RCVORMQ_BOTH,    RCTYPE_SHOP,          RCAREA_MARKET,                 ACTOR_EN_GIRLA,     SCENE_BOMBCHU_SHOP,                   0x06,                        GI_BOMBCHUS_20,      "Bombchu Shop Item 7", "MK Bombchu Shop Item 7", false),
-    RC_OBJECT(RC_MARKET_BOMBCHU_SHOP_ITEM_8,                                  RCVORMQ_BOTH,    RCTYPE_SHOP,          RCAREA_MARKET,                 ACTOR_EN_GIRLA,     SCENE_BOMBCHU_SHOP,                   0x07,                        GI_BOMBCHUS_20,      "Bombchu Shop Item 8", "MK Bombchu Shop Item 8", false),
-    RC_OBJECT(RC_MARKET_POTION_SHOP_ITEM_1,                                   RCVORMQ_BOTH,    RCTYPE_SHOP,          RCAREA_MARKET,                 ACTOR_EN_GIRLA,     SCENE_POTION_SHOP_MARKET,             0x00,                        GI_POTION_GREEN,     "Potion Shop Item 1", "MK Potion Shop Item 1", false),
-    RC_OBJECT(RC_MARKET_POTION_SHOP_ITEM_2,                                   RCVORMQ_BOTH,    RCTYPE_SHOP,          RCAREA_MARKET,                 ACTOR_EN_GIRLA,     SCENE_POTION_SHOP_MARKET,             0x01,                        GI_BLUE_FIRE,        "Potion Shop Item 2", "MK Potion Shop Item 2", false),
-    RC_OBJECT(RC_MARKET_POTION_SHOP_ITEM_3,                                   RCVORMQ_BOTH,    RCTYPE_SHOP,          RCAREA_MARKET,                 ACTOR_EN_GIRLA,     SCENE_POTION_SHOP_MARKET,             0x02,                        GI_POTION_RED,       "Potion Shop Item 3", "MK Potion Shop Item 3", false),
-    RC_OBJECT(RC_MARKET_POTION_SHOP_ITEM_4,                                   RCVORMQ_BOTH,    RCTYPE_SHOP,          RCAREA_MARKET,                 ACTOR_EN_GIRLA,     SCENE_POTION_SHOP_MARKET,             0x03,                        GI_FAIRY,            "Potion Shop Item 4", "MK Potion Shop Item 4", false),
-    RC_OBJECT(RC_MARKET_POTION_SHOP_ITEM_5,                                   RCVORMQ_BOTH,    RCTYPE_SHOP,          RCAREA_MARKET,                 ACTOR_EN_GIRLA,     SCENE_POTION_SHOP_MARKET,             0x04,                        GI_NUTS_5_2,         "Potion Shop Item 5", "MK Potion Shop Item 5", false),
-    RC_OBJECT(RC_MARKET_POTION_SHOP_ITEM_6,                                   RCVORMQ_BOTH,    RCTYPE_SHOP,          RCAREA_MARKET,                 ACTOR_EN_GIRLA,     SCENE_POTION_SHOP_MARKET,             0x05,                        GI_BUGS,             "Potion Shop Item 6", "MK Potion Shop Item 6", false),
-    RC_OBJECT(RC_MARKET_POTION_SHOP_ITEM_7,                                   RCVORMQ_BOTH,    RCTYPE_SHOP,          RCAREA_MARKET,                 ACTOR_EN_GIRLA,     SCENE_POTION_SHOP_MARKET,             0x06,                        GI_POE,              "Potion Shop Item 7", "MK Potion Shop Item 7", false),
-    RC_OBJECT(RC_MARKET_POTION_SHOP_ITEM_8,                                   RCVORMQ_BOTH,    RCTYPE_SHOP,          RCAREA_MARKET,                 ACTOR_EN_GIRLA,     SCENE_POTION_SHOP_MARKET,             0x07,                        GI_FISH,             "Potion Shop Item 8", "MK Potion Shop Item 8", false),
-    RC_OBJECT(RC_MARKET_BAZAAR_ITEM_1,                                        RCVORMQ_BOTH,    RCTYPE_SHOP,          RCAREA_MARKET,                 ACTOR_EN_GIRLA,     SCENE_BAZAAR,                         0x00,                        GI_SHIELD_HYLIAN,    "Bazaar Item 1", "MK Bazaar Item 1", false),
-    RC_OBJECT(RC_MARKET_BAZAAR_ITEM_2,                                        RCVORMQ_BOTH,    RCTYPE_SHOP,          RCAREA_MARKET,                 ACTOR_EN_GIRLA,     SCENE_BAZAAR,                         0x01,                        GI_BOMBS_5,          "Bazaar Item 2", "MK Bazaar Item 2", false),
-    RC_OBJECT(RC_MARKET_BAZAAR_ITEM_3,                                        RCVORMQ_BOTH,    RCTYPE_SHOP,          RCAREA_MARKET,                 ACTOR_EN_GIRLA,     SCENE_BAZAAR,                         0x02,                        GI_NUTS_5_2,         "Bazaar Item 3", "MK Bazaar Item 3", false),
-    RC_OBJECT(RC_MARKET_BAZAAR_ITEM_4,                                        RCVORMQ_BOTH,    RCTYPE_SHOP,          RCAREA_MARKET,                 ACTOR_EN_GIRLA,     SCENE_BAZAAR,                         0x03,                        GI_HEART,            "Bazaar Item 4", "MK Bazaar Item 4", false),
-    RC_OBJECT(RC_MARKET_BAZAAR_ITEM_5,                                        RCVORMQ_BOTH,    RCTYPE_SHOP,          RCAREA_MARKET,                 ACTOR_EN_GIRLA,     SCENE_BAZAAR,                         0x04,                        GI_ARROWS_SMALL,     "Bazaar Item 5", "MK Bazaar Item 5", false),
-    RC_OBJECT(RC_MARKET_BAZAAR_ITEM_6,                                        RCVORMQ_BOTH,    RCTYPE_SHOP,          RCAREA_MARKET,                 ACTOR_EN_GIRLA,     SCENE_BAZAAR,                         0x05,                        GI_ARROWS_LARGE,     "Bazaar Item 6", "MK Bazaar Item 6", false),
-    RC_OBJECT(RC_MARKET_BAZAAR_ITEM_7,                                        RCVORMQ_BOTH,    RCTYPE_SHOP,          RCAREA_MARKET,                 ACTOR_EN_GIRLA,     SCENE_BAZAAR,                         0x06,                        GI_STICKS_1,         "Bazaar Item 7", "MK Bazaar Item 7", false),
-    RC_OBJECT(RC_MARKET_BAZAAR_ITEM_8,                                        RCVORMQ_BOTH,    RCTYPE_SHOP,          RCAREA_MARKET,                 ACTOR_EN_GIRLA,     SCENE_BAZAAR,                         0x07,                        GI_ARROWS_MEDIUM,    "Bazaar Item 8", "MK Bazaar Item 8", false),
-    RC_OBJECT(RC_TOT_LEFT_CENTER_GOSSIP_STONE,                                RCVORMQ_BOTH,    RCTYPE_GOSSIP_STONE,  RCAREA_MARKET,                 ACTOR_EN_GS,        SCENE_ID_MAX,                         0x00,                        GI_NONE,             "ToT Left Center Gossip Stone", "ToT Left Center Gossip Stone", false),
-    RC_OBJECT(RC_TOT_LEFT_GOSSIP_STONE,                                       RCVORMQ_BOTH,    RCTYPE_GOSSIP_STONE,  RCAREA_MARKET,                 ACTOR_EN_GS,        SCENE_ID_MAX,                         0x00,                        GI_NONE,             "ToT Left Gossip Stone", "ToT Left Gossip Stone", false),
-    RC_OBJECT(RC_TOT_RIGHT_CENTER_GOSSIP_STONE,                               RCVORMQ_BOTH,    RCTYPE_GOSSIP_STONE,  RCAREA_MARKET,                 ACTOR_EN_GS,        SCENE_ID_MAX,                         0x00,                        GI_NONE,             "ToT Right Center Gossip Stone", "ToT Right Center Gossip Stone", false),
-    RC_OBJECT(RC_TOT_RIGHT_GOSSIP_STONE,                                      RCVORMQ_BOTH,    RCTYPE_GOSSIP_STONE,  RCAREA_MARKET,                 ACTOR_EN_GS,        SCENE_ID_MAX,                         0x00,                        GI_NONE,             "ToT Right Gossip Stone", "ToT Right Gossip Stone", false),
-
-
-    RC_OBJECT(RC_HC_MALON_EGG,                                                RCVORMQ_BOTH,    RCTYPE_STANDARD,      RCAREA_HYRULE_CASTLE,          ACTOR_ID_MAX,       SCENE_HYRULE_CASTLE,                  0x00,                        GI_NONE,             "Malon Egg", "HC Malon Egg", true),
-    RC_OBJECT(RC_HC_ZELDAS_LETTER,                                            RCVORMQ_BOTH,    RCTYPE_STANDARD,      RCAREA_HYRULE_CASTLE,          ACTOR_ID_MAX,       SCENE_CASTLE_COURTYARD_ZELDA,         0x00,                        GI_LETTER_ZELDA,     "Zeldas Letter", "HC Zeldas Letter", true),
-    RC_OBJECT(RC_OGC_GS,                                                      RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,   RCAREA_HYRULE_CASTLE,          ACTOR_EN_SI,        SCENE_OUTSIDE_GANONS_CASTLE,          11777,                       GI_SKULL_TOKEN,      "OGC GS", "OGC GS", true),
-    RC_OBJECT(RC_HC_GS_STORMS_GROTTO,                                         RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,   RCAREA_HYRULE_CASTLE,          ACTOR_EN_SI,        SCENE_GROTTOS,                        11778,                       GI_SKULL_TOKEN,      "GS Storms Grotto", "HC GS Storms Grotto", true),
-    RC_OBJECT(RC_HC_GS_TREE,                                                  RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,   RCAREA_HYRULE_CASTLE,          ACTOR_EN_SI,        SCENE_HYRULE_CASTLE,                  -29180,                      GI_SKULL_TOKEN,      "GS Tree", "HC GS Tree", true),
-    RC_OBJECT(RC_HC_GREAT_FAIRY_REWARD,                                       RCVORMQ_BOTH,    RCTYPE_STANDARD,      RCAREA_HYRULE_CASTLE,          ACTOR_BG_DY_YOSEIZO,SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS,   2,                           GI_MAGIC_SMALL,      "Great Fairy Reward", "HC Great Fairy Reward", true),
-    RC_OBJECT(RC_OGC_GREAT_FAIRY_REWARD,                                      RCVORMQ_BOTH,    RCTYPE_STANDARD,      RCAREA_HYRULE_CASTLE,          ACTOR_BG_DY_YOSEIZO,SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC,    3,                           GI_NONE,             "OGC Great Fairy Reward", "OGC Great Fairy Reward", true),
-    RC_OBJECT(RC_SONG_FROM_IMPA,                                              RCVORMQ_BOTH,    RCTYPE_SONG_LOCATION, RCAREA_HYRULE_CASTLE,          ACTOR_ID_MAX,       SCENE_ID_MAX,                         0x00,                        GI_NONE,             "Song from Impa", "Song from Impa", true),
-    RC_OBJECT(RC_HC_MALON_GOSSIP_STONE,                                       RCVORMQ_BOTH,    RCTYPE_GOSSIP_STONE,  RCAREA_HYRULE_CASTLE,          ACTOR_EN_GS,        SCENE_HYRULE_CASTLE,                  14610,                       GI_NONE,             "Malon Gossip Stone", "HC Malon Gossip Stone", false),
-    RC_OBJECT(RC_HC_ROCK_WALL_GOSSIP_STONE,                                   RCVORMQ_BOTH,    RCTYPE_GOSSIP_STONE,  RCAREA_HYRULE_CASTLE,          ACTOR_EN_GS,        SCENE_HYRULE_CASTLE,                  14347,                       GI_NONE,             "Rock Wall Gossip Stone", "HC Rock Wall Gossip Stone", false),
-    RC_OBJECT(RC_HC_STORMS_GROTTO_GOSSIP_STONE,                               RCVORMQ_BOTH,    RCTYPE_GOSSIP_STONE,  RCAREA_HYRULE_CASTLE,          ACTOR_EN_GS,        SCENE_GROTTOS,                        14355,                       GI_NONE,             "Storms Grotto Gossip Stone", "HC Storms Grotto Gossip Stone", false),
-
-
-    RC_OBJECT(RC_KAK_REDEAD_GROTTO_CHEST,                                     RCVORMQ_BOTH,    RCTYPE_STANDARD,      RCAREA_KAKARIKO_VILLAGE,       ACTOR_EN_BOX,       SCENE_GROTTOS,                        31434,                       GI_RUPEE_GOLD,       "Redead Grotto Chest", "Kak Redead Grotto Chest", false),
-    RC_OBJECT(RC_KAK_OPEN_GROTTO_CHEST,                                       RCVORMQ_BOTH,    RCTYPE_STANDARD,      RCAREA_KAKARIKO_VILLAGE,       ACTOR_EN_BOX,       SCENE_GROTTOS,                        22984,                       GI_RUPEE_RED,        "Open Grotto Chest", "Kak Open Grotto Chest", false),
-    RC_OBJECT(RC_KAK_10_GOLD_SKULLTULA_REWARD,                                RCVORMQ_BOTH,    RCTYPE_STANDARD,      RCAREA_KAKARIKO_VILLAGE,       ACTOR_ID_MAX,       SCENE_HOUSE_OF_SKULLTULA,             0x00,                        GI_WALLET_ADULT,     "10 Gold Skulltula Reward", "Kak 10 Gold Skulltula Reward", true),
-    RC_OBJECT(RC_KAK_20_GOLD_SKULLTULA_REWARD,                                RCVORMQ_BOTH,    RCTYPE_STANDARD,      RCAREA_KAKARIKO_VILLAGE,       ACTOR_ID_MAX,       SCENE_HOUSE_OF_SKULLTULA,             0x00,                        GI_STONE_OF_AGONY,   "20 Gold Skulltula Reward", "Kak 20 Gold Skulltula Reward", true),
-    RC_OBJECT(RC_KAK_30_GOLD_SKULLTULA_REWARD,                                RCVORMQ_BOTH,    RCTYPE_STANDARD,      RCAREA_KAKARIKO_VILLAGE,       ACTOR_ID_MAX,       SCENE_HOUSE_OF_SKULLTULA,             0x00,                        GI_WALLET_GIANT,     "30 Gold Skulltula Reward", "Kak 30 Gold Skulltula Reward", true),
-    RC_OBJECT(RC_KAK_40_GOLD_SKULLTULA_REWARD,                                RCVORMQ_BOTH,    RCTYPE_STANDARD,      RCAREA_KAKARIKO_VILLAGE,       ACTOR_ID_MAX,       SCENE_HOUSE_OF_SKULLTULA,             0x00,                        GI_BOMBCHUS_10,      "40 Gold Skulltula Reward", "Kak 40 Gold Skulltula Reward", false),
-    RC_OBJECT(RC_KAK_50_GOLD_SKULLTULA_REWARD,                                RCVORMQ_BOTH,    RCTYPE_STANDARD,      RCAREA_KAKARIKO_VILLAGE,       ACTOR_ID_MAX,       SCENE_HOUSE_OF_SKULLTULA,             0x00,                        GI_HEART_PIECE,      "50 Gold Skulltula Reward", "Kak 50 Gold Skulltula Reward", true),
-    RC_OBJECT(RC_KAK_100_GOLD_SKULLTULA_REWARD,                               RCVORMQ_BOTH,    RCTYPE_STANDARD,      RCAREA_KAKARIKO_VILLAGE,       ACTOR_ID_MAX,       SCENE_HOUSE_OF_SKULLTULA,             0x00,                        GI_RUPEE_GOLD,       "100 Gold Skulltula Reward", "Kak 100 Gold Skulltula Reward", false),
-    RC_OBJECT(RC_KAK_MAN_ON_ROOF,                                             RCVORMQ_BOTH,    RCTYPE_STANDARD,      RCAREA_KAKARIKO_VILLAGE,       ACTOR_ID_MAX,       SCENE_KAKARIKO_VILLAGE,               0x00,                        GI_HEART_PIECE,      "Man on Roof", "Kak Man on Roof", true),
-    RC_OBJECT(RC_KAK_SHOOTING_GALLERY_REWARD,                                 RCVORMQ_BOTH,    RCTYPE_STANDARD,      RCAREA_KAKARIKO_VILLAGE,       ACTOR_ID_MAX,       SCENE_SHOOTING_GALLERY,               0x00,                        GI_NONE,             "Shooting Gallery Reward", "Kak Shooting Gallery Reward", true),
-    RC_OBJECT(RC_KAK_TRADE_ODD_MUSHROOM,                                      RCVORMQ_BOTH,    RCTYPE_ADULT_TRADE,   RCAREA_KAKARIKO_VILLAGE,       ACTOR_ID_MAX,       SCENE_POTION_SHOP_GRANNY,             0x00,                        GI_ODD_POTION,       "Trade Odd Mushroom", "Kak Trade Odd Mushroom", true),
-    RC_OBJECT(RC_KAK_GRANNYS_SHOP,                                            RCVORMQ_BOTH,    RCTYPE_MERCHANT,      RCAREA_KAKARIKO_VILLAGE,       ACTOR_ID_MAX,       SCENE_POTION_SHOP_GRANNY,             0x00,                        GI_POTION_BLUE,      "Granny's Shop", "Kak Granny's Shop", false),
-    RC_OBJECT(RC_KAK_ANJU_AS_ADULT,                                           RCVORMQ_BOTH,    RCTYPE_ADULT_TRADE,   RCAREA_KAKARIKO_VILLAGE,       ACTOR_ID_MAX,       SCENE_KAKARIKO_VILLAGE,               0x00,                        GI_POCKET_EGG,       "Anju as Adult", "Kak Anju as Adult", true),
-    RC_OBJECT(RC_KAK_ANJU_AS_CHILD,                                           RCVORMQ_BOTH,    RCTYPE_STANDARD,      RCAREA_KAKARIKO_VILLAGE,       ACTOR_ID_MAX,       SCENE_KAKARIKO_VILLAGE,               0x00,                        GI_BOTTLE,           "Anju as Child", "Kak Anju as Child", true),
-    RC_OBJECT(RC_KAK_TRADE_POCKET_CUCCO,                                      RCVORMQ_BOTH,    RCTYPE_ADULT_TRADE,   RCAREA_KAKARIKO_VILLAGE,       ACTOR_ID_MAX,       SCENE_KAKARIKO_VILLAGE,               0x00,                        GI_COJIRO,           "Trade Pocket Cucco", "Kak Trade Pocket Cucco", true),
-    RC_OBJECT(RC_KAK_IMPAS_HOUSE_FREESTANDING_POH,                            RCVORMQ_BOTH,    RCTYPE_STANDARD,      RCAREA_KAKARIKO_VILLAGE,       ACTOR_EN_ITEM00,    SCENE_IMPAS_HOUSE,                    262,                         GI_HEART_PIECE,      "Impas House Freestanding PoH", "Kak Impas House Freestanding PoH", true),
-    RC_OBJECT(RC_KAK_WINDMILL_FREESTANDING_POH,                               RCVORMQ_BOTH,    RCTYPE_STANDARD,      RCAREA_KAKARIKO_VILLAGE,       ACTOR_EN_ITEM00,    SCENE_WINDMILL_AND_DAMPES_GRAVE,      262,                         GI_HEART_PIECE,      "Windmill Freestanding PoH", "Kak Windmill Freestanding PoH", true),
-    RC_OBJECT(RC_KAK_GS_HOUSE_UNDER_CONSTRUCTION,                             RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,   RCAREA_KAKARIKO_VILLAGE,       ACTOR_EN_SI,        SCENE_KAKARIKO_VILLAGE,               20488,                       GI_SKULL_TOKEN,      "GS House Under Construction", "Kak GS House Under Construction", true),
-    RC_OBJECT(RC_KAK_GS_SKULLTULA_HOUSE,                                      RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,   RCAREA_KAKARIKO_VILLAGE,       ACTOR_EN_SI,        SCENE_KAKARIKO_VILLAGE,               20496,                       GI_SKULL_TOKEN,      "GS Skulltula House", "Kak GS Skulltula House", true),
-    RC_OBJECT(RC_KAK_GS_GUARDS_HOUSE,                                         RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,   RCAREA_KAKARIKO_VILLAGE,       ACTOR_EN_SI,        SCENE_KAKARIKO_VILLAGE,               20482,                       GI_SKULL_TOKEN,      "GS Guards House", "Kak GS Guards House", true),
-    RC_OBJECT(RC_KAK_GS_TREE,                                                 RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,   RCAREA_KAKARIKO_VILLAGE,       ACTOR_EN_SI,        SCENE_KAKARIKO_VILLAGE,               -28640,                      GI_SKULL_TOKEN,      "GS Tree", "Kak GS Tree", true),
-    RC_OBJECT(RC_KAK_GS_WATCHTOWER,                                           RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,   RCAREA_KAKARIKO_VILLAGE,       ACTOR_EN_SI,        SCENE_KAKARIKO_VILLAGE,               20484,                       GI_SKULL_TOKEN,      "GS Watchtower", "Kak GS Watchtower", true),
-    RC_OBJECT(RC_KAK_GS_ABOVE_IMPAS_HOUSE,                                    RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,   RCAREA_KAKARIKO_VILLAGE,       ACTOR_EN_SI,        SCENE_KAKARIKO_VILLAGE,               20544,                       GI_SKULL_TOKEN,      "GS Above Impas House", "Kak GS Above Impas House", true),
-    RC_OBJECT(RC_SHEIK_IN_KAKARIKO,                                           RCVORMQ_BOTH,    RCTYPE_SONG_LOCATION, RCAREA_KAKARIKO_VILLAGE,       ACTOR_ID_MAX,       SCENE_ID_MAX,                         0x00,                        GI_NONE,             "Sheik in Kakariko", "Sheik in Kakariko", true),
-    RC_OBJECT(RC_SONG_FROM_WINDMILL,                                          RCVORMQ_BOTH,    RCTYPE_SONG_LOCATION, RCAREA_KAKARIKO_VILLAGE,       ACTOR_ID_MAX,       SCENE_ID_MAX,                         0x00,                        GI_NONE,             "Song from Windmill", "Song from Windmill", true),
-    RC_OBJECT(RC_KAK_IMPAS_HOUSE_COW,                                         RCVORMQ_BOTH,    RCTYPE_COW,           RCAREA_KAKARIKO_VILLAGE,       ACTOR_EN_COW,       SCENE_IMPAS_HOUSE,                    0x00,                        GI_MILK,             "Impas House Cow", "Kak Impas House Cow", false),
-    RC_OBJECT(RC_KAK_POTION_SHOP_ITEM_1,                                      RCVORMQ_BOTH,    RCTYPE_SHOP,          RCAREA_KAKARIKO_VILLAGE,       ACTOR_EN_GIRLA,     SCENE_POTION_SHOP_KAKARIKO,           0x00,                        GI_POTION_GREEN,     "Potion Shop Item 1", "Kak Potion Shop Item 1", false),
-    RC_OBJECT(RC_KAK_POTION_SHOP_ITEM_2,                                      RCVORMQ_BOTH,    RCTYPE_SHOP,          RCAREA_KAKARIKO_VILLAGE,       ACTOR_EN_GIRLA,     SCENE_POTION_SHOP_KAKARIKO,           0x01,                        GI_BLUE_FIRE,        "Potion Shop Item 2", "Kak Potion Shop Item 2", false),
-    RC_OBJECT(RC_KAK_POTION_SHOP_ITEM_3,                                      RCVORMQ_BOTH,    RCTYPE_SHOP,          RCAREA_KAKARIKO_VILLAGE,       ACTOR_EN_GIRLA,     SCENE_POTION_SHOP_KAKARIKO,           0x02,                        GI_POTION_RED,       "Potion Shop Item 3", "Kak Potion Shop Item 3", false),
-    RC_OBJECT(RC_KAK_POTION_SHOP_ITEM_4,                                      RCVORMQ_BOTH,    RCTYPE_SHOP,          RCAREA_KAKARIKO_VILLAGE,       ACTOR_EN_GIRLA,     SCENE_POTION_SHOP_KAKARIKO,           0x03,                        GI_FAIRY,            "Potion Shop Item 4", "Kak Potion Shop Item 4", false),
-    RC_OBJECT(RC_KAK_POTION_SHOP_ITEM_5,                                      RCVORMQ_BOTH,    RCTYPE_SHOP,          RCAREA_KAKARIKO_VILLAGE,       ACTOR_EN_GIRLA,     SCENE_POTION_SHOP_KAKARIKO,           0x04,                        GI_NUTS_5_2,         "Potion Shop Item 5", "Kak Potion Shop Item 5", false),
-    RC_OBJECT(RC_KAK_POTION_SHOP_ITEM_6,                                      RCVORMQ_BOTH,    RCTYPE_SHOP,          RCAREA_KAKARIKO_VILLAGE,       ACTOR_EN_GIRLA,     SCENE_POTION_SHOP_KAKARIKO,           0x05,                        GI_BUGS,             "Potion Shop Item 6", "Kak Potion Shop Item 6", false),
-    RC_OBJECT(RC_KAK_POTION_SHOP_ITEM_7,                                      RCVORMQ_BOTH,    RCTYPE_SHOP,          RCAREA_KAKARIKO_VILLAGE,       ACTOR_EN_GIRLA,     SCENE_POTION_SHOP_KAKARIKO,           0x06,                        GI_POE,              "Potion Shop Item 7", "Kak Potion Shop Item 7", false),
-    RC_OBJECT(RC_KAK_POTION_SHOP_ITEM_8,                                      RCVORMQ_BOTH,    RCTYPE_SHOP,          RCAREA_KAKARIKO_VILLAGE,       ACTOR_EN_GIRLA,     SCENE_POTION_SHOP_KAKARIKO,           0x07,                        GI_FISH,             "Potion Shop Item 8", "Kak Potion Shop Item 8", false),
-    RC_OBJECT(RC_KAK_BAZAAR_ITEM_1,                                           RCVORMQ_BOTH,    RCTYPE_SHOP,          RCAREA_KAKARIKO_VILLAGE,       ACTOR_EN_GIRLA,     SCENE_TEST01,                         0x00,                        GI_SHIELD_HYLIAN,    "Bazaar Item 1", "Kak Bazaar Item 1", false),
-    RC_OBJECT(RC_KAK_BAZAAR_ITEM_2,                                           RCVORMQ_BOTH,    RCTYPE_SHOP,          RCAREA_KAKARIKO_VILLAGE,       ACTOR_EN_GIRLA,     SCENE_TEST01,                         0x01,                        GI_BOMBS_5,          "Bazaar Item 2", "Kak Bazaar Item 2", false),
-    RC_OBJECT(RC_KAK_BAZAAR_ITEM_3,                                           RCVORMQ_BOTH,    RCTYPE_SHOP,          RCAREA_KAKARIKO_VILLAGE,       ACTOR_EN_GIRLA,     SCENE_TEST01,                         0x02,                        GI_NUTS_5_2,         "Bazaar Item 3", "Kak Bazaar Item 3", false),
-    RC_OBJECT(RC_KAK_BAZAAR_ITEM_4,                                           RCVORMQ_BOTH,    RCTYPE_SHOP,          RCAREA_KAKARIKO_VILLAGE,       ACTOR_EN_GIRLA,     SCENE_TEST01,                         0x03,                        GI_HEART,            "Bazaar Item 4", "Kak Bazaar Item 4", false),
-    RC_OBJECT(RC_KAK_BAZAAR_ITEM_5,                                           RCVORMQ_BOTH,    RCTYPE_SHOP,          RCAREA_KAKARIKO_VILLAGE,       ACTOR_EN_GIRLA,     SCENE_TEST01,                         0x04,                        GI_ARROWS_SMALL,     "Bazaar Item 5", "Kak Bazaar Item 5", false),
-    RC_OBJECT(RC_KAK_BAZAAR_ITEM_6,                                           RCVORMQ_BOTH,    RCTYPE_SHOP,          RCAREA_KAKARIKO_VILLAGE,       ACTOR_EN_GIRLA,     SCENE_TEST01,                         0x05,                        GI_ARROWS_LARGE,     "Bazaar Item 6", "Kak Bazaar Item 6", false),
-    RC_OBJECT(RC_KAK_BAZAAR_ITEM_7,                                           RCVORMQ_BOTH,    RCTYPE_SHOP,          RCAREA_KAKARIKO_VILLAGE,       ACTOR_EN_GIRLA,     SCENE_TEST01,                         0x06,                        GI_STICKS_1,         "Bazaar Item 7", "Kak Bazaar Item 7", false),
-    RC_OBJECT(RC_KAK_BAZAAR_ITEM_8,                                           RCVORMQ_BOTH,    RCTYPE_SHOP,          RCAREA_KAKARIKO_VILLAGE,       ACTOR_EN_GIRLA,     SCENE_TEST01,                         0x07,                        GI_ARROWS_MEDIUM,    "Bazaar Item 8", "Kak Bazaar Item 8", false),
-    RC_OBJECT(RC_KAK_OPEN_GROTTO_GOSSIP_STONE,                                RCVORMQ_BOTH,    RCTYPE_GOSSIP_STONE,  RCAREA_KAKARIKO_VILLAGE,       ACTOR_EN_GS,        SCENE_GROTTOS,                        -22984,                      GI_NONE,             "Open Grotto Gossip Stone", "Kak Open Grotto Gossip Stone", false),
-
-
-    RC_OBJECT(RC_GRAVEYARD_SHIELD_GRAVE_CHEST,                                RCVORMQ_BOTH,    RCTYPE_STANDARD,      RCAREA_GRAVEYARD,              ACTOR_EN_BOX,       SCENE_GRAVE_WITH_FAIRYS_FOUNTAIN,     21824,                       GI_SHIELD_HYLIAN,    "Shield Grave Chest", "GY Shield Grave Chest", false),
-    RC_OBJECT(RC_GRAVEYARD_HEART_PIECE_GRAVE_CHEST,                           RCVORMQ_BOTH,    RCTYPE_STANDARD,      RCAREA_GRAVEYARD,              ACTOR_EN_BOX,       SCENE_REDEAD_GRAVE,                   -22592,                      GI_HEART_PIECE,      "Heart Piece Grave Chest", "GY Heart Piece Grave Chest", true),
-    RC_OBJECT(RC_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST,                          RCVORMQ_BOTH,    RCTYPE_STANDARD,      RCAREA_GRAVEYARD,              ACTOR_EN_BOX,       SCENE_ROYAL_FAMILYS_TOMB,             -32736,                      GI_BOMBS_5,          "Composers Grave Chest", "GY Composers Grave Chest", false),
-    RC_OBJECT(RC_GRAVEYARD_HOOKSHOT_CHEST,                                    RCVORMQ_BOTH,    RCTYPE_STANDARD,      RCAREA_GRAVEYARD,              ACTOR_EN_BOX,       SCENE_WINDMILL_AND_DAMPES_GRAVE,      4352,                        GI_HOOKSHOT,         "Hookshot Chest", "GY Hookshot Chest", true),
-    RC_OBJECT(RC_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH,                       RCVORMQ_BOTH,    RCTYPE_STANDARD,      RCAREA_GRAVEYARD,              ACTOR_EN_ITEM00,    SCENE_WINDMILL_AND_DAMPES_GRAVE,      1798,                        GI_HEART_PIECE,      "Dampe Race Freestanding PoH", "GY Dampe Race Freestanding PoH", true),
-    RC_OBJECT(RC_GRAVEYARD_FREESTANDING_POH,                                  RCVORMQ_BOTH,    RCTYPE_STANDARD,      RCAREA_GRAVEYARD,              ACTOR_EN_ITEM00,    SCENE_GRAVEYARD,                      1030,                        GI_HEART_PIECE,      "Freestanding PoH", "GY Freestanding PoH", true),
-    RC_OBJECT(RC_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR,                           RCVORMQ_BOTH,    RCTYPE_STANDARD,      RCAREA_GRAVEYARD,              ACTOR_EN_ITEM00,    SCENE_GRAVEYARD,                      7942,                        GI_HEART_PIECE,      "Dampe Gravedigging Tour", "GY Dampe Gravedigging Tour", true),
-    RC_OBJECT(RC_GRAVEYARD_GS_WALL,                                           RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,   RCAREA_GRAVEYARD,              ACTOR_EN_SI,        SCENE_GRAVEYARD,                      20608,                       GI_SKULL_TOKEN,      "GS Wall", "Graveyard GS Wall", true),
-    RC_OBJECT(RC_GRAVEYARD_GS_BEAN_PATCH,                                     RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,   RCAREA_GRAVEYARD,              ACTOR_EN_SI,        SCENE_GRAVEYARD,                      28673,                       GI_SKULL_TOKEN,      "GS Bean Patch", "Graveyard GS Bean Patch", true),
-    RC_OBJECT(RC_SONG_FROM_ROYAL_FAMILYS_TOMB,                                RCVORMQ_BOTH,    RCTYPE_SONG_LOCATION, RCAREA_GRAVEYARD,              ACTOR_ID_MAX,       SCENE_ID_MAX,                         0x00,                        GI_NONE,             "Song from Composers Grave", "Song from Composers Grave", true),
-    RC_OBJECT(RC_GY_GOSSIP_STONE,                                             RCVORMQ_BOTH,    RCTYPE_GOSSIP_STONE,  RCAREA_GRAVEYARD,              ACTOR_EN_GS,        SCENE_GRAVEYARD,                      14346,                       GI_NONE,             "Gossip Stone", "GY Gossip Stone", false),
-
-
-    RC_OBJECT(RC_DMT_CHEST,                                                   RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_DEATH_MOUNTAIN_TRAIL,   ACTOR_EN_BOX,       SCENE_DEATH_MOUNTAIN_TRAIL,           23201,                       GI_RUPEE_PURPLE,     "Chest", "DMT Chest", false),
-    RC_OBJECT(RC_DMT_STORMS_GROTTO_CHEST,                                     RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_DEATH_MOUNTAIN_TRAIL,   ACTOR_EN_BOX,       SCENE_GROTTOS,                        23255,                       GI_RUPEE_GOLD,       "Storms Grotto Chest", "DMT Storms Grotto Chest", false),
-    RC_OBJECT(RC_DMT_TRADE_BROKEN_SWORD,                                      RCVORMQ_BOTH,    RCTYPE_ADULT_TRADE,  RCAREA_DEATH_MOUNTAIN_TRAIL,   ACTOR_ID_MAX,       SCENE_DEATH_MOUNTAIN_TRAIL,           0x00,                        GI_NONE,             "Trade Broken Sword", "DMT Trade Broken Sword", true),
-    RC_OBJECT(RC_DMT_TRADE_EYEDROPS,                                          RCVORMQ_BOTH,    RCTYPE_ADULT_TRADE,  RCAREA_DEATH_MOUNTAIN_TRAIL,   ACTOR_ID_MAX,       SCENE_DEATH_MOUNTAIN_TRAIL,           0x00,                        GI_NONE,             "Trade Eyedrops", "DMT Trade Eyedrops", true),
-    RC_OBJECT(RC_DMT_TRADE_CLAIM_CHECK,                                       RCVORMQ_BOTH,    RCTYPE_ADULT_TRADE,  RCAREA_DEATH_MOUNTAIN_TRAIL,   ACTOR_ID_MAX,       SCENE_DEATH_MOUNTAIN_TRAIL,           0x00,                        GI_NONE,             "Trade Claim Check", "DMT Trade Claim Check", true),
-    RC_OBJECT(RC_DMT_FREESTANDING_POH,                                        RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_DEATH_MOUNTAIN_TRAIL,   ACTOR_EN_ITEM00,    SCENE_DEATH_MOUNTAIN_TRAIL,           7686,                        GI_HEART_PIECE,      "Freestanding PoH", "DMT Freestanding PoH", true),
-    RC_OBJECT(RC_DMT_GS_BEAN_PATCH,                                           RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,  RCAREA_DEATH_MOUNTAIN_TRAIL,   ACTOR_EN_SI,        SCENE_DEATH_MOUNTAIN_TRAIL,           28418,                       GI_SKULL_TOKEN,      "GS Bean Patch", "DMT GS Bean Patch", true),
-    RC_OBJECT(RC_DMT_GS_NEAR_KAK,                                             RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,  RCAREA_DEATH_MOUNTAIN_TRAIL,   ACTOR_EN_SI,        SCENE_DEATH_MOUNTAIN_TRAIL,           12036,                       GI_SKULL_TOKEN,      "GS Near Kak", "DMT GS Near Kak", true),
-    RC_OBJECT(RC_DMT_GS_ABOVE_DODONGOS_CAVERN,                                RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,  RCAREA_DEATH_MOUNTAIN_TRAIL,   ACTOR_EN_SI,        SCENE_DEATH_MOUNTAIN_TRAIL,           20232,                       GI_SKULL_TOKEN,      "GS Above Dodongos Cavern", "DMT GS Above Dodongos Cavern", true),
-    RC_OBJECT(RC_DMT_GS_FALLING_ROCKS_PATH,                                   RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,  RCAREA_DEATH_MOUNTAIN_TRAIL,   ACTOR_EN_SI,        SCENE_DEATH_MOUNTAIN_TRAIL,           20240,                       GI_SKULL_TOKEN,      "GS Falling Rocks Path", "DMT GS Falling Rocks Path", true),
-    RC_OBJECT(RC_DMT_GREAT_FAIRY_REWARD,                                      RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_DEATH_MOUNTAIN_TRAIL,   ACTOR_BG_DY_YOSEIZO,SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC,    1,                           GI_NONE,             "Great Fairy Reward", "DMT Great Fairy Reward", true),
-    RC_OBJECT(RC_DMT_COW_GROTTO_COW,                                          RCVORMQ_BOTH,    RCTYPE_COW,          RCAREA_DEATH_MOUNTAIN_TRAIL,   ACTOR_EN_COW,       SCENE_GROTTOS,                        TWO_ACTOR_PARAMS(2444,-471), GI_MILK,             "Cow Grotto Cow", "DMT Cow Grotto Cow", false),
-    RC_OBJECT(RC_DMT_GOSSIP_STONE,                                            RCVORMQ_BOTH,    RCTYPE_GOSSIP_STONE, RCAREA_DEATH_MOUNTAIN_TRAIL,   ACTOR_EN_GS,        SCENE_DEATH_MOUNTAIN_TRAIL,           14340,                       GI_NONE,             "Gossip Stone", "DMT Gossip Stone", false),
-    RC_OBJECT(RC_DMT_STORMS_GROTTO_GOSSIP_STONE,                              RCVORMQ_BOTH,    RCTYPE_GOSSIP_STONE, RCAREA_DEATH_MOUNTAIN_TRAIL,   ACTOR_EN_GS,        SCENE_GROTTOS,                        -23255,                      GI_NONE,             "Storms Grotto Gossip Stone", "DMT Storms Grotto Gossip Stone", false),
-
-
-    RC_OBJECT(RC_GC_MAZE_LEFT_CHEST,                                          RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_GORON_CITY,             ACTOR_EN_BOX,       SCENE_GORON_CITY,                     23232,                       GI_RUPEE_GOLD,       "Maze Left Chest", "GC Maze Left Chest", false),
-    RC_OBJECT(RC_GC_MAZE_RIGHT_CHEST,                                         RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_GORON_CITY,             ACTOR_EN_BOX,       SCENE_GORON_CITY,                     23201,                       GI_RUPEE_PURPLE,     "Maze Right Chest", "GC Maze Right Chest", false),
-    RC_OBJECT(RC_GC_MAZE_CENTER_CHEST,                                        RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_GORON_CITY,             ACTOR_EN_BOX,       SCENE_GORON_CITY,                     23202,                       GI_RUPEE_PURPLE,     "Maze Center Chest", "GC Maze Center Chest", false),
-    RC_OBJECT(RC_GC_ROLLING_GORON_AS_CHILD,                                   RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_GORON_CITY,             ACTOR_ID_MAX,       SCENE_GORON_CITY,                     0x00,                        GI_NONE,             "Rolling Goron as Child", "GC Rolling Goron as Child", true),
-    RC_OBJECT(RC_GC_ROLLING_GORON_AS_ADULT,                                   RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_GORON_CITY,             ACTOR_ID_MAX,       SCENE_GORON_CITY,                     0x00,                        GI_NONE,             "Rolling Goron as Adult", "GC Rolling Goron as Adult", true),
-    RC_OBJECT(RC_GC_DARUNIAS_JOY,                                             RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_GORON_CITY,             ACTOR_ID_MAX,       SCENE_GORON_CITY,                     0x00,                        GI_NONE,             "Darunias Joy", "GC Darunias Joy", true),
-    RC_OBJECT(RC_GC_POT_FREESTANDING_POH,                                     RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_GORON_CITY,             ACTOR_EN_ITEM00,    SCENE_GORON_CITY,                     7942,                        GI_HEART_PIECE,      "Pot Freestanding PoH", "GC Pot Freestanding PoH", true),
-    RC_OBJECT(RC_GC_DEKU_SCRUB_GROTTO_LEFT,                                   RCVORMQ_BOTH,    RCTYPE_SCRUB,        RCAREA_GORON_CITY,             ACTOR_EN_DNS,       SCENE_GROTTOS,                        TWO_ACTOR_PARAMS(0x00,0xFB), GI_NUTS_5_2,         "Deku Scrub Grotto Left", "GC Deku Scrub Grotto Left", false),
-    RC_OBJECT(RC_GC_DEKU_SCRUB_GROTTO_RIGHT,                                  RCVORMQ_BOTH,    RCTYPE_SCRUB,        RCAREA_GORON_CITY,             ACTOR_EN_DNS,       SCENE_GROTTOS,                        TWO_ACTOR_PARAMS(0x05,0xFB), GI_BOMBS_5,          "Deku Scrub Grotto Right", "GC Deku Scrub Grotto Right", false),
-    RC_OBJECT(RC_GC_DEKU_SCRUB_GROTTO_CENTER,                                 RCVORMQ_BOTH,    RCTYPE_SCRUB,        RCAREA_GORON_CITY,             ACTOR_EN_DNS,       SCENE_GROTTOS,                        TWO_ACTOR_PARAMS(0x03,0xFB), GI_SEEDS_30,         "Deku Scrub Grotto Center", "GC Deku Scrub Grotto Center", false),
-    RC_OBJECT(RC_GC_MEDIGORON,                                                RCVORMQ_BOTH,    RCTYPE_MERCHANT,     RCAREA_GORON_CITY,             ACTOR_ID_MAX,       SCENE_GORON_CITY,                     0x00,                        GI_NONE,             "Medigoron", "GC Medigoron", false),
-    RC_OBJECT(RC_GC_GS_CENTER_PLATFORM,                                       RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,  RCAREA_GORON_CITY,             ACTOR_EN_SI,        SCENE_GORON_CITY,                     12064,                       GI_SKULL_TOKEN,      "GS Center Platform", "GC GS Center Platform", true),
-    RC_OBJECT(RC_GC_GS_BOULDER_MAZE,                                          RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,  RCAREA_GORON_CITY,             ACTOR_EN_SI,        SCENE_GORON_CITY,                     -28864,                      GI_SKULL_TOKEN,      "GS Boulder Maze", "GC GS Boulder Maze", true),
-    RC_OBJECT(RC_GC_SHOP_ITEM_1,                                              RCVORMQ_BOTH,    RCTYPE_SHOP,         RCAREA_GORON_CITY,             ACTOR_EN_GIRLA,     SCENE_GORON_SHOP,                     0x00,                        GI_BOMBS_5,          "Shop Item 1", "GC Shop Item 1", false),
-    RC_OBJECT(RC_GC_SHOP_ITEM_2,                                              RCVORMQ_BOTH,    RCTYPE_SHOP,         RCAREA_GORON_CITY,             ACTOR_EN_GIRLA,     SCENE_GORON_SHOP,                     0x01,                        GI_BOMBS_10,         "Shop Item 2", "GC Shop Item 2", false),
-    RC_OBJECT(RC_GC_SHOP_ITEM_3,                                              RCVORMQ_BOTH,    RCTYPE_SHOP,         RCAREA_GORON_CITY,             ACTOR_EN_GIRLA,     SCENE_GORON_SHOP,                     0x02,                        GI_BOMBS_20,         "Shop Item 3", "GC Shop Item 3", false),
-    RC_OBJECT(RC_GC_SHOP_ITEM_4,                                              RCVORMQ_BOTH,    RCTYPE_SHOP,         RCAREA_GORON_CITY,             ACTOR_EN_GIRLA,     SCENE_GORON_SHOP,                     0x03,                        GI_BOMBS_30,         "Shop Item 4", "GC Shop Item 4", false),
-    RC_OBJECT(RC_GC_SHOP_ITEM_5,                                              RCVORMQ_BOTH,    RCTYPE_SHOP,         RCAREA_GORON_CITY,             ACTOR_EN_GIRLA,     SCENE_GORON_SHOP,                     0x04,                        GI_TUNIC_GORON,      "Shop Item 5", "GC Shop Item 5", false),
-    RC_OBJECT(RC_GC_SHOP_ITEM_6,                                              RCVORMQ_BOTH,    RCTYPE_SHOP,         RCAREA_GORON_CITY,             ACTOR_EN_GIRLA,     SCENE_GORON_SHOP,                     0x05,                        GI_HEART,            "Shop Item 6", "GC Shop Item 6", false),
-    RC_OBJECT(RC_GC_SHOP_ITEM_7,                                              RCVORMQ_BOTH,    RCTYPE_SHOP,         RCAREA_GORON_CITY,             ACTOR_EN_GIRLA,     SCENE_GORON_SHOP,                     0x06,                        GI_POTION_RED,       "Shop Item 7", "GC Shop Item 7", false),
-    RC_OBJECT(RC_GC_SHOP_ITEM_8,                                              RCVORMQ_BOTH,    RCTYPE_SHOP,         RCAREA_GORON_CITY,             ACTOR_EN_GIRLA,     SCENE_GORON_SHOP,                     0x07,                        GI_HEART,            "Shop Item 8", "GC Shop Item 8", false),
-    RC_OBJECT(RC_GC_MAZE_GOSSIP_STONE,                                        RCVORMQ_BOTH,    RCTYPE_GOSSIP_STONE, RCAREA_GORON_CITY,             ACTOR_EN_GS,        SCENE_GORON_CITY,                     14357,                       GI_NONE,             "Maze Gossip Stone", "GC Maze Gossip Stone", false),
-    RC_OBJECT(RC_GC_MEDIGORON_GOSSIP_STONE,                                   RCVORMQ_BOTH,    RCTYPE_GOSSIP_STONE, RCAREA_GORON_CITY,             ACTOR_EN_GS,        SCENE_GORON_CITY,                     14873,                       GI_NONE,             "Medigoron Gossip Stone", "GC Medigoron Gossip Stone", false),
-
-
-    RC_OBJECT(RC_DMC_UPPER_GROTTO_CHEST,                                      RCVORMQ_BOTH,    RCTYPE_STANDARD,      RCAREA_DEATH_MOUNTAIN_CRATER,  ACTOR_EN_BOX,       SCENE_GROTTOS,                        23802,                       GI_BOMBS_20,         "Upper Grotto Chest", "DMC Upper Grotto Chest", false),
-    RC_OBJECT(RC_DMC_WALL_FREESTANDING_POH,                                   RCVORMQ_BOTH,    RCTYPE_STANDARD,      RCAREA_DEATH_MOUNTAIN_CRATER,  ACTOR_EN_ITEM00,    SCENE_DEATH_MOUNTAIN_CRATER,          518,                         GI_HEART_PIECE,      "Wall Freestanding PoH", "DMC Wall Freestanding PoH", true),
-    RC_OBJECT(RC_DMC_VOLCANO_FREESTANDING_POH,                                RCVORMQ_BOTH,    RCTYPE_STANDARD,      RCAREA_DEATH_MOUNTAIN_CRATER,  ACTOR_EN_ITEM00,    SCENE_DEATH_MOUNTAIN_CRATER,          2054,                        GI_HEART_PIECE,      "Volcano Freestanding PoH", "DMC Volcano Freestanding PoH", true),
-    RC_OBJECT(RC_DMC_DEKU_SCRUB,                                              RCVORMQ_BOTH,    RCTYPE_SCRUB,         RCAREA_DEATH_MOUNTAIN_CRATER,  ACTOR_EN_DNS,       SCENE_DEATH_MOUNTAIN_CRATER,          0x05,                        GI_BOMBS_5,          "Deku Scrub", "DMC Deku Scrub", false),
-    RC_OBJECT(RC_DMC_DEKU_SCRUB_GROTTO_LEFT,                                  RCVORMQ_BOTH,    RCTYPE_SCRUB,         RCAREA_DEATH_MOUNTAIN_CRATER,  ACTOR_EN_DNS,       SCENE_GROTTOS,                        TWO_ACTOR_PARAMS(0x00,0xF9), GI_NUTS_5_2,         "Deku Scrub Grotto Left", "DMC Deku Scrub Grotto Left", false),
-    RC_OBJECT(RC_DMC_DEKU_SCRUB_GROTTO_RIGHT,                                 RCVORMQ_BOTH,    RCTYPE_SCRUB,         RCAREA_DEATH_MOUNTAIN_CRATER,  ACTOR_EN_DNS,       SCENE_GROTTOS,                        TWO_ACTOR_PARAMS(0x05,0xF9), GI_BOMBS_5,          "Deku Scrub Grotto Right", "DMC Deku Scrub Grotto Right", false),
-    RC_OBJECT(RC_DMC_DEKU_SCRUB_GROTTO_CENTER,                                RCVORMQ_BOTH,    RCTYPE_SCRUB,         RCAREA_DEATH_MOUNTAIN_CRATER,  ACTOR_EN_DNS,       SCENE_GROTTOS,                        TWO_ACTOR_PARAMS(0x03,0xF9), GI_SEEDS_30,         "Deku Scrub Grotto Center", "DMC Deku Scrub Grotto Center", false),
-    RC_OBJECT(RC_DMC_GS_BEAN_PATCH,                                           RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,   RCAREA_DEATH_MOUNTAIN_CRATER,  ACTOR_EN_SI,        SCENE_DEATH_MOUNTAIN_CRATER,          28417,                       GI_SKULL_TOKEN,      "GS Bean Patch", "DMC GS Bean Patch", true),
-    RC_OBJECT(RC_DMC_GS_CRATE,                                                RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,   RCAREA_DEATH_MOUNTAIN_CRATER,  ACTOR_EN_SI,        SCENE_DEATH_MOUNTAIN_CRATER,          -28800,                      GI_SKULL_TOKEN,      "GS Crate", "DMC GS Crate", true),
-    RC_OBJECT(RC_DMC_GREAT_FAIRY_REWARD,                                      RCVORMQ_BOTH,    RCTYPE_STANDARD,      RCAREA_DEATH_MOUNTAIN_CRATER,  ACTOR_BG_DY_YOSEIZO,SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC,    2,                           GI_NONE,             "Great Fairy Reward", "DMC Great Fairy Reward", true),
-    RC_OBJECT(RC_SHEIK_IN_CRATER,                                             RCVORMQ_BOTH,    RCTYPE_SONG_LOCATION, RCAREA_DEATH_MOUNTAIN_CRATER,  ACTOR_ID_MAX,       SCENE_ID_MAX,                         0x00,                        GI_NONE,             "Sheik in Crater", "Sheik in Crater", true),
-    RC_OBJECT(RC_DMC_GOSSIP_STONE,                                            RCVORMQ_BOTH,    RCTYPE_GOSSIP_STONE,  RCAREA_DEATH_MOUNTAIN_CRATER,  ACTOR_EN_GS,        SCENE_DEATH_MOUNTAIN_CRATER,          14341,                       GI_NONE,             "Gossip Stone", "DMC Gossip Stone", false),
-    RC_OBJECT(RC_DMC_UPPER_GROTTO_GOSSIP_STONE,                               RCVORMQ_BOTH,    RCTYPE_GOSSIP_STONE,  RCAREA_DEATH_MOUNTAIN_CRATER,  ACTOR_EN_GS,        SCENE_GROTTOS,                        -23802,                      GI_NONE,             "Upper Grotto Gossip Stone", "DMC Upper Grotto Gossip Stone", false),
-
-
-    RC_OBJECT(RC_ZR_OPEN_GROTTO_CHEST,                                        RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_ZORAS_RIVER,            ACTOR_EN_BOX,       SCENE_GROTTOS,                        22985,                       GI_RUPEE_RED,        "Open Grotto Chest", "ZR Open Grotto Chest", false),
-    RC_OBJECT(RC_ZR_MAGIC_BEAN_SALESMAN,                                      RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_ZORAS_RIVER,            ACTOR_ID_MAX,       SCENE_ZORAS_RIVER,                    0x00,                        GI_NONE,             "Magic Bean Salesman", "ZR Magic Bean Salesman", true),
-    RC_OBJECT(RC_ZR_FROGS_ZELDAS_LULLABY,                                     RCVORMQ_BOTH,    RCTYPE_FROG_SONG,    RCAREA_ZORAS_RIVER,            ACTOR_EN_FR,        SCENE_ZORAS_RIVER,                    0x00,                        GI_NONE,             "Frogs Zelda's Lullaby", "ZR Frogs Zelda's Lullaby", false),
-    RC_OBJECT(RC_ZR_FROGS_EPONAS_SONG,                                        RCVORMQ_BOTH,    RCTYPE_FROG_SONG,    RCAREA_ZORAS_RIVER,            ACTOR_EN_FR,        SCENE_ZORAS_RIVER,                    0x00,                        GI_NONE,             "Frogs Epona's Song", "ZR Frogs Epona's Song", false),
-    RC_OBJECT(RC_ZR_FROGS_SARIAS_SONG,                                        RCVORMQ_BOTH,    RCTYPE_FROG_SONG,    RCAREA_ZORAS_RIVER,            ACTOR_EN_FR,        SCENE_ZORAS_RIVER,                    0x00,                        GI_NONE,             "Frogs Saria's Song", "ZR Frogs Saria's Song", false),
-    RC_OBJECT(RC_ZR_FROGS_SUNS_SONG,                                          RCVORMQ_BOTH,    RCTYPE_FROG_SONG,    RCAREA_ZORAS_RIVER,            ACTOR_EN_FR,        SCENE_ZORAS_RIVER,                    0x00,                        GI_NONE,             "Frogs Sun's Song", "ZR Frogs Sun's Song", false),
-    RC_OBJECT(RC_ZR_FROGS_SONG_OF_TIME,                                       RCVORMQ_BOTH,    RCTYPE_FROG_SONG,    RCAREA_ZORAS_RIVER,            ACTOR_EN_FR,        SCENE_ZORAS_RIVER,                    0x00,                        GI_NONE,             "Frogs Song of Time", "ZR Frogs Song of Time", false),
-    RC_OBJECT(RC_ZR_FROGS_IN_THE_RAIN,                                        RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_ZORAS_RIVER,            ACTOR_EN_FR,        SCENE_ZORAS_RIVER,                    0x00,                        GI_HEART_PIECE,      "Frogs in the Rain", "ZR Frogs in the Rain", true),
-    RC_OBJECT(RC_ZR_FROGS_OCARINA_GAME,                                       RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_ZORAS_RIVER,            ACTOR_EN_FR,        SCENE_ZORAS_RIVER,                    0x00,                        GI_HEART_PIECE,      "Frogs Ocarina Game", "ZR Frogs Ocarina Game", true),
-    RC_OBJECT(RC_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH,                        RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_ZORAS_RIVER,            ACTOR_EN_ITEM00,    SCENE_ZORAS_RIVER,                    1030,                        GI_HEART_PIECE,      "Near Open Grotto Freestanding PoH", "ZR Near Open Grotto Freestanding PoH", true),
-    RC_OBJECT(RC_ZR_NEAR_DOMAIN_FREESTANDING_POH,                             RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_ZORAS_RIVER,            ACTOR_EN_ITEM00,    SCENE_ZORAS_RIVER,                    2822,                        GI_HEART_PIECE,      "Near Domain Freestanding PoH", "ZR Near Domain Freestanding PoH", true),
-    RC_OBJECT(RC_ZR_DEKU_SCRUB_GROTTO_REAR,                                   RCVORMQ_BOTH,    RCTYPE_SCRUB,        RCAREA_ZORAS_RIVER,            ACTOR_EN_DNS,       SCENE_GROTTOS,                        TWO_ACTOR_PARAMS(0x07,0xEB), GI_POTION_RED,       "Deku Scrub Grotto Rear", "ZR Deku Scrub Grotto Rear", false),
-    RC_OBJECT(RC_ZR_DEKU_SCRUB_GROTTO_FRONT,                                  RCVORMQ_BOTH,    RCTYPE_SCRUB,        RCAREA_ZORAS_RIVER,            ACTOR_EN_DNS,       SCENE_GROTTOS,                        TWO_ACTOR_PARAMS(0x08,0xEB), GI_POTION_GREEN,     "Deku Scrub Grotto Front", "ZR Deku Scrub Grotto Front", false),
-    RC_OBJECT(RC_ZR_GS_LADDER,                                                RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,  RCAREA_ZORAS_RIVER,            ACTOR_EN_SI,        SCENE_ZORAS_RIVER,                    20737,                       GI_SKULL_TOKEN,      "GS Ladder", "ZR GS Ladder", true),
-    RC_OBJECT(RC_ZR_GS_TREE,                                                  RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,  RCAREA_ZORAS_RIVER,            ACTOR_EN_SI,        SCENE_ZORAS_RIVER,                    -28414,                      GI_SKULL_TOKEN,      "GS Tree", "ZR GS Tree", true),
-    RC_OBJECT(RC_ZR_GS_ABOVE_BRIDGE,                                          RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,  RCAREA_ZORAS_RIVER,            ACTOR_EN_SI,        SCENE_ZORAS_RIVER,                    20744,                       GI_SKULL_TOKEN,      "GS Above Bridge", "ZR GS Above Bridge", true),
-    RC_OBJECT(RC_ZR_GS_NEAR_RAISED_GROTTOS,                                   RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,  RCAREA_ZORAS_RIVER,            ACTOR_EN_SI,        SCENE_ZORAS_RIVER,                    20752,                       GI_SKULL_TOKEN,      "GS Near Raised Grottos", "ZR GS Near Raised Grottos", true),
-    RC_OBJECT(RC_ZR_NEAR_DOMAIN_GOSSIP_STONE,                                 RCVORMQ_BOTH,    RCTYPE_GOSSIP_STONE, RCAREA_ZORAS_RIVER,            ACTOR_EN_GS,        SCENE_ZORAS_RIVER,                    14860,                       GI_NONE,             "Near Domain Gossip Stone", "ZR Near Domain Gossip Stone", false),
-    RC_OBJECT(RC_ZR_NEAR_GROTTOS_GOSSIP_STONE,                                RCVORMQ_BOTH,    RCTYPE_GOSSIP_STONE, RCAREA_ZORAS_RIVER,            ACTOR_EN_GS,        SCENE_ZORAS_RIVER,                    14605,                       GI_NONE,             "Near Grottos Gossip Stone", "ZR Near Grottos Gossip Stone", false),
-    RC_OBJECT(RC_ZR_OPEN_GROTTO_GOSSIP_STONE,                                 RCVORMQ_BOTH,    RCTYPE_GOSSIP_STONE, RCAREA_ZORAS_RIVER,            ACTOR_EN_GS,        SCENE_GROTTOS,                        -22985,                      GI_NONE,             "Open Grotto Gossip Stone", "ZR Open Grotto Gossip Stone", false),
-
-
-    RC_OBJECT(RC_ZD_CHEST,                                                    RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_ZORAS_DOMAIN,           ACTOR_EN_BOX,       SCENE_ZORAS_DOMAIN,                   -18496,                      GI_HEART_PIECE,      "Chest", "ZD Chest", true),
-    RC_OBJECT(RC_ZD_DIVING_MINIGAME,                                          RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_ZORAS_DOMAIN,           ACTOR_ID_MAX,       SCENE_ZORAS_DOMAIN,                   0x00,                        GI_NONE,             "Diving Minigame", "ZD Diving Minigame", true),
-    RC_OBJECT(RC_ZD_KING_ZORA_THAWED,                                         RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_ZORAS_DOMAIN,           ACTOR_ID_MAX,       SCENE_ZORAS_DOMAIN,                   0x00,                        GI_NONE,             "King Zora Thawed", "ZD King Zora Thawed", true),
-    RC_OBJECT(RC_ZD_TRADE_PRESCRIPTION,                                       RCVORMQ_BOTH,    RCTYPE_ADULT_TRADE,  RCAREA_ZORAS_DOMAIN,           ACTOR_ID_MAX,       SCENE_ZORAS_DOMAIN,                   0x00,                        GI_NONE,             "Trade Prescription", "ZD Trade Prescription", true),
-    RC_OBJECT(RC_ZD_GS_FROZEN_WATERFALL,                                      RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,  RCAREA_ZORAS_DOMAIN,           ACTOR_EN_SI,        SCENE_ZORAS_DOMAIN,                   20800,                       GI_SKULL_TOKEN,      "GS Frozen Waterfall", "ZD GS Frozen Waterfall", true),
-    RC_OBJECT(RC_ZD_SHOP_ITEM_1,                                              RCVORMQ_BOTH,    RCTYPE_SHOP,         RCAREA_ZORAS_DOMAIN,           ACTOR_EN_GIRLA,     SCENE_ZORA_SHOP,                      0x00,                        GI_TUNIC_ZORA,       "Shop Item 1", "ZD Shop Item 1", false),
-    RC_OBJECT(RC_ZD_SHOP_ITEM_2,                                              RCVORMQ_BOTH,    RCTYPE_SHOP,         RCAREA_ZORAS_DOMAIN,           ACTOR_EN_GIRLA,     SCENE_ZORA_SHOP,                      0x01,                        GI_ARROWS_SMALL,     "Shop Item 2", "ZD Shop Item 2", false),
-    RC_OBJECT(RC_ZD_SHOP_ITEM_3,                                              RCVORMQ_BOTH,    RCTYPE_SHOP,         RCAREA_ZORAS_DOMAIN,           ACTOR_EN_GIRLA,     SCENE_ZORA_SHOP,                      0x02,                        GI_HEART,            "Shop Item 3", "ZD Shop Item 3", false),
-    RC_OBJECT(RC_ZD_SHOP_ITEM_4,                                              RCVORMQ_BOTH,    RCTYPE_SHOP,         RCAREA_ZORAS_DOMAIN,           ACTOR_EN_GIRLA,     SCENE_ZORA_SHOP,                      0x03,                        GI_ARROWS_MEDIUM,    "Shop Item 4", "ZD Shop Item 4", false),
-    RC_OBJECT(RC_ZD_SHOP_ITEM_5,                                              RCVORMQ_BOTH,    RCTYPE_SHOP,         RCAREA_ZORAS_DOMAIN,           ACTOR_EN_GIRLA,     SCENE_ZORA_SHOP,                      0x04,                        GI_NUTS_5_2,         "Shop Item 5", "ZD Shop Item 5", false),
-    RC_OBJECT(RC_ZD_SHOP_ITEM_6,                                              RCVORMQ_BOTH,    RCTYPE_SHOP,         RCAREA_ZORAS_DOMAIN,           ACTOR_EN_GIRLA,     SCENE_ZORA_SHOP,                      0x05,                        GI_ARROWS_LARGE,     "Shop Item 6", "ZD Shop Item 6", false),
-    RC_OBJECT(RC_ZD_SHOP_ITEM_7,                                              RCVORMQ_BOTH,    RCTYPE_SHOP,         RCAREA_ZORAS_DOMAIN,           ACTOR_EN_GIRLA,     SCENE_ZORA_SHOP,                      0x06,                        GI_FISH,             "Shop Item 7", "ZD Shop Item 7", false),
-    RC_OBJECT(RC_ZD_SHOP_ITEM_8,                                              RCVORMQ_BOTH,    RCTYPE_SHOP,         RCAREA_ZORAS_DOMAIN,           ACTOR_EN_GIRLA,     SCENE_ZORA_SHOP,                      0x07,                        GI_POTION_RED,       "Shop Item 8", "ZD Shop Item 8", false),
-    RC_OBJECT(RC_ZD_GOSSIP_STONE,                                             RCVORMQ_BOTH,    RCTYPE_GOSSIP_STONE, RCAREA_ZORAS_DOMAIN,           ACTOR_EN_GS,        SCENE_ZORAS_DOMAIN,                   14345,                       GI_NONE,             "Gossip Stone", "ZD Gossip Stone", false),
-
-
-    RC_OBJECT(RC_ZF_ICEBERC_FREESTANDING_POH,                                 RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_ZORAS_FOUNTAIN,         ACTOR_EN_ITEM00,    SCENE_ZORAS_FOUNTAIN,                 262,                         GI_HEART_PIECE,      "Iceberg Freestanding PoH", "ZF Iceberg Freestanding PoH", true),
-    RC_OBJECT(RC_ZF_BOTTOM_FREESTANDING_POH,                                  RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_ZORAS_FOUNTAIN,         ACTOR_EN_ITEM00,    SCENE_ZORAS_FOUNTAIN,                 5126,                        GI_HEART_PIECE,      "Bottom Freestanding PoH", "ZF Bottom Freestanding PoH", true),
-    RC_OBJECT(RC_ZF_GS_ABOVE_THE_LOG,                                         RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,  RCAREA_ZORAS_FOUNTAIN,         ACTOR_EN_SI,        SCENE_ZORAS_FOUNTAIN,                 20740,                       GI_SKULL_TOKEN,      "GS Above The Log", "ZF GS Above The Log", true),
-    RC_OBJECT(RC_ZF_GS_HIDDEN_CAVE,                                           RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,  RCAREA_ZORAS_FOUNTAIN,         ACTOR_EN_SI,        SCENE_ZORAS_FOUNTAIN,                 20768,                       GI_SKULL_TOKEN,      "GS Hidden Cave", "ZF GS Hidden Cave", true),
-    RC_OBJECT(RC_ZF_GS_TREE,                                                  RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,  RCAREA_ZORAS_FOUNTAIN,         ACTOR_EN_SI,        SCENE_ZORAS_FOUNTAIN,                 -28288,                      GI_SKULL_TOKEN,      "GS Tree", "ZF GS Tree", true),
-    RC_OBJECT(RC_ZF_GREAT_FAIRY_REWARD,                                       RCVORMQ_BOTH,    RCTYPE_STANDARD,     RCAREA_ZORAS_FOUNTAIN,         ACTOR_BG_DY_YOSEIZO,SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS,   1,                           GI_NONE,             "Great Fairy Reward", "ZF Great Fairy Reward", true),
-    RC_OBJECT(RC_FAIRY_GOSSIP_STONE,                                          RCVORMQ_BOTH,    RCTYPE_GOSSIP_STONE, RCAREA_ZORAS_FOUNTAIN,         ACTOR_EN_GS,        SCENE_ZORAS_FOUNTAIN,                 0x00,                        GI_NONE,             "Fairy Gossip Stone", "Fairy Gossip Stone", false),
-    RC_OBJECT(RC_JABU_GOSSIP_STONE,                                           RCVORMQ_BOTH,    RCTYPE_GOSSIP_STONE, RCAREA_ZORAS_FOUNTAIN,         ACTOR_EN_GS,        SCENE_ZORAS_FOUNTAIN,                 0x00,                        GI_NONE,             "Jabu Gossip Stone", "Jabu Gossip Stone", false),
-
-
-    RC_OBJECT(RC_LLR_TALONS_CHICKENS,                                         RCVORMQ_BOTH,    RCTYPE_STANDARD,      RCAREA_LON_LON_RANCH,          ACTOR_ID_MAX,       SCENE_LON_LON_BUILDINGS,              0x00,                        GI_NONE,             "Talons Chickens", "LLR Talons Chickens", true),
-    RC_OBJECT(RC_LLR_FREESTANDING_POH,                                        RCVORMQ_BOTH,    RCTYPE_STANDARD,      RCAREA_LON_LON_RANCH,          ACTOR_EN_ITEM00,    SCENE_LON_LON_BUILDINGS,              262,                         GI_HEART_PIECE,      "Freestanding PoH", "LLR Freestanding PoH", true),
-    RC_OBJECT(RC_LLR_DEKU_SCRUB_GROTTO_LEFT,                                  RCVORMQ_BOTH,    RCTYPE_SCRUB,         RCAREA_LON_LON_RANCH,          ACTOR_EN_DNS,       SCENE_GROTTOS,                        TWO_ACTOR_PARAMS(0x00,0xFC), GI_NUTS_5_2,         "Deku Scrub Grotto Left", "LLR Deku Scrub Grotto Left", false),
-    RC_OBJECT(RC_LLR_DEKU_SCRUB_GROTTO_RIGHT,                                 RCVORMQ_BOTH,    RCTYPE_SCRUB,         RCAREA_LON_LON_RANCH,          ACTOR_EN_DNS,       SCENE_GROTTOS,                        TWO_ACTOR_PARAMS(0x05,0xFC), GI_BOMBS_5,          "Deku Scrub Grotto Right", "LLR Deku Scrub Grotto Right", false),
-    RC_OBJECT(RC_LLR_DEKU_SCRUB_GROTTO_CENTER,                                RCVORMQ_BOTH,    RCTYPE_SCRUB,         RCAREA_LON_LON_RANCH,          ACTOR_EN_DNS,       SCENE_GROTTOS,                        TWO_ACTOR_PARAMS(0x03,0xFC), GI_SEEDS_30,         "Deku Scrub Grotto Center", "LLR Deku Scrub Grotto Center", false),
-    RC_OBJECT(RC_LLR_GS_BACK_WALL,                                            RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,   RCAREA_LON_LON_RANCH,          ACTOR_EN_SI,        SCENE_LON_LON_RANCH,                  11009,                       GI_SKULL_TOKEN,      "GS Back Wall", "LLR GS Back Wall", true),
-    RC_OBJECT(RC_LLR_GS_RAIN_SHED,                                            RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,   RCAREA_LON_LON_RANCH,          ACTOR_EN_SI,        SCENE_LON_LON_RANCH,                  11010,                       GI_SKULL_TOKEN,      "GS Rain Shed", "LLR GS Rain Shed", true),
-    RC_OBJECT(RC_LLR_GS_HOUSE_WINDOW,                                         RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,   RCAREA_LON_LON_RANCH,          ACTOR_EN_SI,        SCENE_LON_LON_RANCH,                  11012,                       GI_SKULL_TOKEN,      "GS House Window", "LLR GS House Window", true),
-    RC_OBJECT(RC_LLR_GS_TREE,                                                 RCVORMQ_BOTH,    RCTYPE_SKULL_TOKEN,   RCAREA_LON_LON_RANCH,          ACTOR_EN_SI,        SCENE_LON_LON_RANCH,                  -29944,                      GI_SKULL_TOKEN,      "GS Tree", "LLR GS Tree", true),
-    RC_OBJECT(RC_SONG_FROM_MALON,                                             RCVORMQ_BOTH,    RCTYPE_SONG_LOCATION, RCAREA_LON_LON_RANCH,          ACTOR_ID_MAX,       SCENE_ID_MAX,                         0x00,                        GI_NONE,             "Song from Malon", "Song from Malon", true),
-    RC_OBJECT(RC_LLR_STABLES_LEFT_COW,                                        RCVORMQ_BOTH,    RCTYPE_COW,           RCAREA_LON_LON_RANCH,          ACTOR_EN_COW,       SCENE_STABLE,                         TWO_ACTOR_PARAMS(-122,-254), GI_MILK,             "Stables Left Cow", "LLR Stables Left Cow", false),
-    RC_OBJECT(RC_LLR_STABLES_RIGHT_COW,                                       RCVORMQ_BOTH,    RCTYPE_COW,           RCAREA_LON_LON_RANCH,          ACTOR_EN_COW,       SCENE_STABLE,                         TWO_ACTOR_PARAMS(116,-254),  GI_MILK,             "Stables Right Cow", "LLR Stables Right Cow", false),
-    RC_OBJECT(RC_LLR_TOWER_LEFT_COW,                                          RCVORMQ_BOTH,    RCTYPE_COW,           RCAREA_LON_LON_RANCH,          ACTOR_EN_COW,       SCENE_LON_LON_BUILDINGS,              TWO_ACTOR_PARAMS(-229,157),  GI_MILK,             "Tower Left Cow", "LLR Tower Left Cow", false),
-    RC_OBJECT(RC_LLR_TOWER_RIGHT_COW,                                         RCVORMQ_BOTH,    RCTYPE_COW,           RCAREA_LON_LON_RANCH,          ACTOR_EN_COW,       SCENE_LON_LON_BUILDINGS,              TWO_ACTOR_PARAMS(-142,-140), GI_MILK,             "Tower Right Cow", "LLR Tower Right Cow", false),
-
-
-    RC_OBJECT(RC_DEKU_TREE_MAP_CHEST,                                         RCVORMQ_VANILLA, RCTYPE_MAP_COMPASS,                RCAREA_DEKU_TREE,              ACTOR_EN_BOX,       SCENE_DEKU_TREE,                      2083,                        GI_MAP,              "Map Chest", "Deku Tree Map Chest", true),
-    RC_OBJECT(RC_DEKU_TREE_COMPASS_CHEST,                                     RCVORMQ_VANILLA, RCTYPE_MAP_COMPASS,                RCAREA_DEKU_TREE,              ACTOR_EN_BOX,       SCENE_DEKU_TREE,                      2050,                        GI_COMPASS,          "Compass Chest", "Deku Tree Compass Chest", true),
-    RC_OBJECT(RC_DEKU_TREE_COMPASS_ROOM_SIDE_CHEST,                           RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_DEKU_TREE,              ACTOR_EN_BOX,       SCENE_DEKU_TREE,                      22790,                       GI_HEART,            "Compass Room Side Chest", "Deku Tree Compass Room Side Chest", false),
-    RC_OBJECT(RC_DEKU_TREE_BASEMENT_CHEST,                                    RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_DEKU_TREE,              ACTOR_EN_BOX,       SCENE_DEKU_TREE,                      22788,                       GI_HEART,            "Basement Chest", "Deku Tree Basement Chest", false),
-    RC_OBJECT(RC_DEKU_TREE_SLINGSHOT_CHEST,                                   RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_DEKU_TREE,              ACTOR_EN_BOX,       SCENE_DEKU_TREE,                      161,                         GI_SLINGSHOT,        "Slingshot Chest", "Deku Tree Slingshot Chest", true),
-    RC_OBJECT(RC_DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST,                         RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_DEKU_TREE,              ACTOR_EN_BOX,       SCENE_DEKU_TREE,                      22789,                       GI_HEART,            "Slingshot Room Side Chest", "Deku Tree Slingshot Room Side Chest", false),
-    RC_OBJECT(RC_DEKU_TREE_MQ_MAP_CHEST,                                      RCVORMQ_MQ,      RCTYPE_MAP_COMPASS,                RCAREA_DEKU_TREE,              ACTOR_EN_BOX,       SCENE_DEKU_TREE,                      2083,                        GI_MAP,              "MQ Map Chest", "Deku Tree MQ Map Chest", true),
-    RC_OBJECT(RC_DEKU_TREE_MQ_COMPASS_CHEST,                                  RCVORMQ_MQ,      RCTYPE_MAP_COMPASS,                RCAREA_DEKU_TREE,              ACTOR_EN_BOX,       SCENE_DEKU_TREE,                      2049,                        GI_COMPASS,          "MQ Compass Chest", "Deku Tree MQ Compass Chest", true),
-    RC_OBJECT(RC_DEKU_TREE_MQ_SLINGSHOT_CHEST,                                RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_DEKU_TREE,              ACTOR_EN_BOX,       SCENE_DEKU_TREE,                      4262,                        GI_SLINGSHOT,        "MQ Slingshot Chest", "Deku Tree MQ Slingshot Chest", true),
-    RC_OBJECT(RC_DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST,                      RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_DEKU_TREE,              ACTOR_EN_BOX,       SCENE_DEKU_TREE,                      -31454,                      GI_SHIELD_DEKU,      "MQ Slingshot Room Back Chest", "Deku Tree MQ Slingshot Room Back Chest", false),
-    RC_OBJECT(RC_DEKU_TREE_MQ_BASEMENT_CHEST,                                 RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_DEKU_TREE,              ACTOR_EN_BOX,       SCENE_DEKU_TREE,                      -31452,                      GI_SHIELD_DEKU,      "MQ Basement Chest", "Deku Tree MQ Basement Chest", false),
-    RC_OBJECT(RC_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST,                      RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_DEKU_TREE,              ACTOR_EN_BOX,       SCENE_DEKU_TREE,                      22789,                       GI_HEART,            "MQ Before Spinning Log Chest", "Deku Tree MQ Before Spinning Log Chest", false),
-    RC_OBJECT(RC_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST,                       RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_DEKU_TREE,              ACTOR_EN_BOX,       SCENE_DEKU_TREE,                      23200,                       GI_RUPEE_PURPLE,     "MQ After Spinning Log Chest", "Deku Tree MQ After Spinning Log Chest", false),
-    RC_OBJECT(RC_DEKU_TREE_MQ_DEKU_SCRUB,                                     RCVORMQ_MQ,      RCTYPE_SCRUB,                      RCAREA_DEKU_TREE,              ACTOR_EN_DNS,       SCENE_DEKU_TREE,                      0x04,                        GI_SHIELD_DEKU,      "MQ Deku Scrub", "Deku Tree MQ Deku Scrub", false),
-    RC_OBJECT(RC_DEKU_TREE_GS_BASEMENT_BACK_ROOM,                             RCVORMQ_VANILLA, RCTYPE_SKULL_TOKEN,                RCAREA_DEKU_TREE,              ACTOR_EN_SI,        SCENE_DEKU_TREE,                      8193,                        GI_SKULL_TOKEN,      "GS Basement Back Room", "Deku Tree GS Basement Back Room", true),
-    RC_OBJECT(RC_DEKU_TREE_GS_BASEMENT_GATE,                                  RCVORMQ_VANILLA, RCTYPE_SKULL_TOKEN,                RCAREA_DEKU_TREE,              ACTOR_EN_SI,        SCENE_DEKU_TREE,                      8194,                        GI_SKULL_TOKEN,      "GS Basement Gate", "Deku Tree GS Basement Gate", true),
-    RC_OBJECT(RC_DEKU_TREE_GS_BASEMENT_VINES,                                 RCVORMQ_VANILLA, RCTYPE_SKULL_TOKEN,                RCAREA_DEKU_TREE,              ACTOR_EN_SI,        SCENE_DEKU_TREE,                      8196,                        GI_SKULL_TOKEN,      "GS Basement Vines", "Deku Tree GS Basement Vines", true),
-    RC_OBJECT(RC_DEKU_TREE_GS_COMPASS_ROOM,                                   RCVORMQ_VANILLA, RCTYPE_SKULL_TOKEN,                RCAREA_DEKU_TREE,              ACTOR_EN_SI,        SCENE_DEKU_TREE,                      8200,                        GI_SKULL_TOKEN,      "GS Compass Room", "Deku Tree GS Compass Room", true),
-    RC_OBJECT(RC_DEKU_TREE_MQ_GS_LOBBY,                                       RCVORMQ_MQ,      RCTYPE_SKULL_TOKEN,                RCAREA_DEKU_TREE,              ACTOR_EN_SI,        SCENE_DEKU_TREE,                      8194,                        GI_SKULL_TOKEN,      "MQ GS Lobby", "Deku Tree MQ GS Lobby", true),
-    RC_OBJECT(RC_DEKU_TREE_MQ_GS_COMPASS_ROOM,                                RCVORMQ_MQ,      RCTYPE_SKULL_TOKEN,                RCAREA_DEKU_TREE,              ACTOR_EN_SI,        SCENE_DEKU_TREE,                      8200,                        GI_SKULL_TOKEN,      "MQ GS Compass Room", "Deku Tree MQ GS Compass Room", true),
-    RC_OBJECT(RC_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM,                        RCVORMQ_MQ,      RCTYPE_SKULL_TOKEN,                RCAREA_DEKU_TREE,              ACTOR_EN_SI,        SCENE_DEKU_TREE,                      8196,                        GI_SKULL_TOKEN,      "MQ GS Basement Graves Room", "Deku Tree MQ GS Basement Graves Room", true),
-    RC_OBJECT(RC_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM,                          RCVORMQ_MQ,      RCTYPE_SKULL_TOKEN,                RCAREA_DEKU_TREE,              ACTOR_EN_SI,        SCENE_DEKU_TREE,                      8193,                        GI_SKULL_TOKEN,      "MQ GS Basement Back Room", "Deku Tree MQ GS Basement Back Room", true),
-    RC_OBJECT(RC_QUEEN_GOHMA,                                                 RCVORMQ_BOTH,    RCTYPE_DUNGEON_REWARD,             RCAREA_DEKU_TREE,              ACTOR_DOOR_WARP1,   SCENE_DEKU_TREE_BOSS,                 0x00,                        GI_NONE,             "Queen Gohma", "Queen Gohma", true),
-    RC_OBJECT(RC_DEKU_TREE_QUEEN_GOHMA_HEART,                                 RCVORMQ_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD, RCAREA_DEKU_TREE,              ACTOR_ITEM_B_HEART, SCENE_DEKU_TREE_BOSS,                 0x00,                        GI_HEART_CONTAINER,  "Queen Gohma Heart Container", "Deku Tree Queen Gohma Heart Container", true),
-
-
-    RC_OBJECT(RC_DODONGOS_CAVERN_BOSS_ROOM_CHEST,                             RCVORMQ_BOTH,    RCTYPE_STANDARD,                   RCAREA_DODONGOS_CAVERN,        ACTOR_EN_BOX,       SCENE_DODONGOS_CAVERN_BOSS,           20512,                       GI_BOMBS_5,          "Boss Room Chest", "Dodongos Cavern Boss Room Chest", false),
-    RC_OBJECT(RC_DODONGOS_CAVERN_MAP_CHEST,                                   RCVORMQ_VANILLA, RCTYPE_MAP_COMPASS,                RCAREA_DODONGOS_CAVERN,        ACTOR_EN_BOX,       SCENE_DODONGOS_CAVERN,                2088,                        GI_MAP,              "Map Chest", "Dodongos Cavern Map Chest", true),
-    RC_OBJECT(RC_DODONGOS_CAVERN_COMPASS_CHEST,                               RCVORMQ_VANILLA, RCTYPE_MAP_COMPASS,                RCAREA_DODONGOS_CAVERN,        ACTOR_EN_BOX,       SCENE_DODONGOS_CAVERN,                2053,                        GI_COMPASS,          "Compass Chest", "Dodongos Cavern Compass Chest", true),
-    RC_OBJECT(RC_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST,                  RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_DODONGOS_CAVERN,        ACTOR_EN_BOX,       SCENE_DODONGOS_CAVERN,                22982,                       GI_RUPEE_RED,        "Bomb Flower Platform Chest", "Dodongos Cavern Bomb Flower Platform Chest", false),
-    RC_OBJECT(RC_DODONGOS_CAVERN_BOMB_BAG_CHEST,                              RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_DODONGOS_CAVERN,        ACTOR_EN_BOX,       SCENE_DODONGOS_CAVERN,                1604,                        GI_BOMB_BAG_20,      "Bomb Bag Chest", "Dodongos Cavern Bomb Bag Chest", true),
-    RC_OBJECT(RC_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST,                         RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_DODONGOS_CAVERN,        ACTOR_EN_BOX,       SCENE_DODONGOS_CAVERN,                21802,                       GI_SHIELD_DEKU,      "End Of Bridge Chest", "Dodongos Cavern End Of Bridge Chest", false),
-    RC_OBJECT(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,               RCVORMQ_VANILLA, RCTYPE_SCRUB,                      RCAREA_DODONGOS_CAVERN,        ACTOR_EN_DNS,       SCENE_DODONGOS_CAVERN,                0x00,                        GI_NUTS_5_2,         "Deku Scrub Near Bomb Bag Left", "Dodongos Cavern Deku Scrub Near Bomb Bag Left", false),
-    RC_OBJECT(RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS,          RCVORMQ_VANILLA, RCTYPE_SCRUB,                      RCAREA_DODONGOS_CAVERN,        ACTOR_EN_DNS,       SCENE_DODONGOS_CAVERN,                0x01,                        GI_STICKS_1,         "Deku Scrub Side Room Near Dodongos", "Dodongos Cavern Deku Scrub Side Room Near Dodongos", false),
-    RC_OBJECT(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT,              RCVORMQ_VANILLA, RCTYPE_SCRUB,                      RCAREA_DODONGOS_CAVERN,        ACTOR_EN_DNS,       SCENE_DODONGOS_CAVERN,                0x03,                        GI_SEEDS_30,         "Deku Scrub Near Bomb Bag Right", "Dodongos Cavern Deku Scrub Near Bomb Bag Right", false),
-    RC_OBJECT(RC_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY,                            RCVORMQ_VANILLA, RCTYPE_SCRUB,                      RCAREA_DODONGOS_CAVERN,        ACTOR_EN_DNS,       SCENE_DODONGOS_CAVERN,                0x04,                        GI_SHIELD_DEKU,      "Deku Scrub Lobby", "Dodongos Cavern Deku Scrub Lobby", false),
-    RC_OBJECT(RC_DODONGOS_CAVERN_MQ_MAP_CHEST,                                RCVORMQ_MQ,      RCTYPE_MAP_COMPASS,                RCAREA_DODONGOS_CAVERN,        ACTOR_EN_BOX,       SCENE_DODONGOS_CAVERN,                2080,                        GI_MAP,              "MQ Map Chest", "Dodongos Cavern MQ Map Chest", true),
-    RC_OBJECT(RC_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST,                           RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_DODONGOS_CAVERN,        ACTOR_EN_BOX,       SCENE_DODONGOS_CAVERN,                1604,                        GI_BOMB_BAG_20,      "MQ Bomb Bag Chest", "Dodongos Cavern MQ Bomb Bag Chest", true),
-    RC_OBJECT(RC_DODONGOS_CAVERN_MQ_COMPASS_CHEST,                            RCVORMQ_MQ,      RCTYPE_MAP_COMPASS,                RCAREA_DODONGOS_CAVERN,        ACTOR_EN_BOX,       SCENE_DODONGOS_CAVERN,                6149,                        GI_COMPASS,          "MQ Compass Chest", "Dodongos Cavern MQ Compass Chest", true),
-    RC_OBJECT(RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST,                        RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_DODONGOS_CAVERN,        ACTOR_EN_BOX,       SCENE_DODONGOS_CAVERN,                29986,                       GI_SHIELD_DEKU,      "MQ Larvae Room Chest", "Dodongos Cavern MQ Larvae Room Chest", false),
-    RC_OBJECT(RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST,                  RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_DODONGOS_CAVERN,        ACTOR_EN_BOX,       SCENE_DODONGOS_CAVERN,                22947,                       GI_RUPEE_BLUE,       "MQ Torch Puzzle Room Chest", "Dodongos Cavern MQ Torch Puzzle Room Chest", false),
-    RC_OBJECT(RC_DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST,                        RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_DODONGOS_CAVERN,        ACTOR_EN_BOX,       SCENE_DODONGOS_CAVERN,                21825,                       GI_SHIELD_HYLIAN,    "MQ Under Grave Chest", "Dodongos Cavern MQ Under Grave Chest", false),
-    RC_OBJECT(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,                    RCVORMQ_MQ,      RCTYPE_SCRUB,                      RCAREA_DODONGOS_CAVERN,        ACTOR_EN_DNS,       SCENE_DODONGOS_CAVERN,                0x01,                        GI_STICKS_1,         "MQ Deku Scrub Lobby Rear", "Dodongos Cavern Deku Scrub Lobby Rear", false),
-    RC_OBJECT(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT,                   RCVORMQ_MQ,      RCTYPE_SCRUB,                      RCAREA_DODONGOS_CAVERN,        ACTOR_EN_DNS,       SCENE_DODONGOS_CAVERN,                0x03,                        GI_SEEDS_30,         "MQ Deku Scrub Lobby Front", "Dodongos Cavern Deku Scrub Lobby Front", false),
-    RC_OBJECT(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,                     RCVORMQ_MQ,      RCTYPE_SCRUB,                      RCAREA_DODONGOS_CAVERN,        ACTOR_EN_DNS,       SCENE_DODONGOS_CAVERN,                0x04,                        GI_SHIELD_DEKU,      "MQ Deku Scrub Staircase", "Dodongos Cavern Deku Scrub Staircase", false),
-    RC_OBJECT(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS, RCVORMQ_MQ,      RCTYPE_SCRUB,                      RCAREA_DODONGOS_CAVERN,        ACTOR_EN_DNS,       SCENE_DODONGOS_CAVERN,                0x07,                        GI_POTION_RED,       "MQ Deku Scrub Side Room Near Lower Lizalfos", "Dodongos Cavern Deku Scrub Side Room Near Lower Lizalfos", false),
-    RC_OBJECT(RC_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS,                       RCVORMQ_VANILLA, RCTYPE_SKULL_TOKEN,                RCAREA_DODONGOS_CAVERN,        ACTOR_EN_SI,        SCENE_DODONGOS_CAVERN,                8449,                        GI_SKULL_TOKEN,      "GS Vines Above Stairs", "Dodongos Cavern GS Vines Above Stairs", true),
-    RC_OBJECT(RC_DODONGOS_CAVERN_GS_SCARECROW,                                RCVORMQ_VANILLA, RCTYPE_SKULL_TOKEN,                RCAREA_DODONGOS_CAVERN,        ACTOR_EN_SI,        SCENE_DODONGOS_CAVERN,                8450,                        GI_SKULL_TOKEN,      "GS Scarecrow", "Dodongos Cavern GS Scarecrow", true),
-    RC_OBJECT(RC_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS,                      RCVORMQ_VANILLA, RCTYPE_SKULL_TOKEN,                RCAREA_DODONGOS_CAVERN,        ACTOR_EN_SI,        SCENE_DODONGOS_CAVERN,                8452,                        GI_SKULL_TOKEN,      "GS Alcove Above Stairs", "Dodongos Cavern GS Alcove Above Stairs", true),
-    RC_OBJECT(RC_DODONGOS_CAVERN_GS_BACK_ROOM,                                RCVORMQ_VANILLA, RCTYPE_SKULL_TOKEN,                RCAREA_DODONGOS_CAVERN,        ACTOR_EN_SI,        SCENE_DODONGOS_CAVERN,                8456,                        GI_SKULL_TOKEN,      "GS Back Room", "Dodongos Cavern GS Back Room", true),
-    RC_OBJECT(RC_DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS,            RCVORMQ_VANILLA, RCTYPE_SKULL_TOKEN,                RCAREA_DODONGOS_CAVERN,        ACTOR_EN_SI,        SCENE_DODONGOS_CAVERN,                8464,                        GI_SKULL_TOKEN,      "GS Side Room Near Lower Lizalfos", "Dodongos Cavern GS Side Room Near Lower Lizalfos", true),
-    RC_OBJECT(RC_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM,                            RCVORMQ_MQ,      RCTYPE_SKULL_TOKEN,                RCAREA_DODONGOS_CAVERN,        ACTOR_EN_SI,        SCENE_DODONGOS_CAVERN,                8450,                        GI_SKULL_TOKEN,      "MQ GS Scrub Room", "Dodongos Cavern MQ GS Scrub Room", true),
-    RC_OBJECT(RC_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM,               RCVORMQ_MQ,      RCTYPE_SKULL_TOKEN,                RCAREA_DODONGOS_CAVERN,        ACTOR_EN_SI,        SCENE_DODONGOS_CAVERN,                8456,                        GI_SKULL_TOKEN,      "MQ GS Song of Time Block Room", "Dodongos Cavern MQ GS Song of Time Block Room", true),
-    RC_OBJECT(RC_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM,                         RCVORMQ_MQ,      RCTYPE_SKULL_TOKEN,                RCAREA_DODONGOS_CAVERN,        ACTOR_EN_SI,        SCENE_DODONGOS_CAVERN,                8452,                        GI_SKULL_TOKEN,      "MQ GS Lizalfos Room", "Dodongos Cavern MQ GS Lizalfos Room", true),
-    RC_OBJECT(RC_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM,                           RCVORMQ_MQ,      RCTYPE_SKULL_TOKEN,                RCAREA_DODONGOS_CAVERN,        ACTOR_EN_SI,        SCENE_DODONGOS_CAVERN,                8464,                        GI_SKULL_TOKEN,      "MQ GS Larvae Room", "Dodongos Cavern MQ GS Larvae Room", true),
-    RC_OBJECT(RC_DODONGOS_CAVERN_MQ_GS_BACK_AREA,                             RCVORMQ_MQ,      RCTYPE_SKULL_TOKEN,                RCAREA_DODONGOS_CAVERN,        ACTOR_EN_SI,        SCENE_DODONGOS_CAVERN,                8449,                        GI_SKULL_TOKEN,      "MQ GS Back Room", "Dodongos Cavern MQ GS Back Room", true),
-    RC_OBJECT(RC_KING_DODONGO,                                                RCVORMQ_BOTH,    RCTYPE_DUNGEON_REWARD,             RCAREA_DODONGOS_CAVERN,        ACTOR_DOOR_WARP1,   SCENE_DODONGOS_CAVERN_BOSS,           0x00,                        GI_NONE,             "King Dodongo", "King Dodongo", true),
-    RC_OBJECT(RC_DODONGOS_CAVERN_KING_DODONGO_HEART,                          RCVORMQ_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD, RCAREA_DODONGOS_CAVERN,        ACTOR_ITEM_B_HEART, SCENE_DODONGOS_CAVERN_BOSS,           0x00,                        GI_HEART_CONTAINER,  "King Dodongo Heart Container", "Dodongos Cavern King Dodongo Heart Container", true),
-    RC_OBJECT(RC_DODONGOS_CAVERN_GOSSIP_STONE,                                RCVORMQ_VANILLA, RCTYPE_GOSSIP_STONE,               RCAREA_DODONGOS_CAVERN,        ACTOR_EN_GS,        SCENE_DODONGOS_CAVERN,                4372,                        GI_NONE,             "Gossip Stone", "Dodongo's Cavern Gossip Stone", false),
-
-
-    RC_OBJECT(RC_JABU_JABUS_BELLY_MAP_CHEST,                                  RCVORMQ_VANILLA, RCTYPE_MAP_COMPASS,                RCAREA_JABU_JABUS_BELLY,       ACTOR_EN_BOX,       SCENE_JABU_JABU,                      6178,                        GI_MAP,              "Map Chest", "Jabu Jabus Belly Map Chest", true),
-    RC_OBJECT(RC_JABU_JABUS_BELLY_COMPASS_CHEST,                              RCVORMQ_VANILLA, RCTYPE_MAP_COMPASS,                RCAREA_JABU_JABUS_BELLY,       ACTOR_EN_BOX,       SCENE_JABU_JABU,                      -18428,                      GI_COMPASS,          "Compass Chest", "Jabu Jabus Belly Compass Chest", true),
-    RC_OBJECT(RC_JABU_JABUS_BELLY_BOOMERANG_CHEST,                            RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_JABU_JABUS_BELLY,       ACTOR_EN_BOX,       SCENE_JABU_JABU,                      4289,                        GI_BOOMERANG,        "Boomerang Chest", "Jabu Jabus Belly Boomerang Chest", true),
-    RC_OBJECT(RC_JABU_JABUS_BELLY_DEKU_SCRUB,                                 RCVORMQ_VANILLA, RCTYPE_SCRUB,                      RCAREA_JABU_JABUS_BELLY,       ACTOR_EN_DNS,       SCENE_JABU_JABU,                      0x00,                        GI_NUTS_5_2,         "Deku Scrub", "Jabu Jabus Belly Deku Scrub", false),
-    RC_OBJECT(RC_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST,                   RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_JABU_JABUS_BELLY,       ACTOR_EN_BOX,       SCENE_JABU_JABU,                      -32699,                      GI_NUTS_5,           "MQ First Room Side Chest", "Jabu Jabus Belly MQ First Room Side Chest", false),
-    RC_OBJECT(RC_JABU_JABUS_BELLY_MQ_MAP_CHEST,                               RCVORMQ_MQ,      RCTYPE_MAP_COMPASS,                RCAREA_JABU_JABUS_BELLY,       ACTOR_EN_BOX,       SCENE_JABU_JABU,                      -18397,                      GI_MAP,              "MQ Map Chest", "Jabu Jabus Belly MQ Map Chest", true),
-    RC_OBJECT(RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST,                 RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_JABU_JABUS_BELLY,       ACTOR_EN_BOX,       SCENE_JABU_JABU,                      20546,                       GI_NUTS_5,           "MQ Second Room Lower Chest", "Jabu Jabus Belly MQ Second Room Lower Chest", false),
-    RC_OBJECT(RC_JABU_JABUS_BELLY_MQ_COMPASS_CHEST,                           RCVORMQ_MQ,      RCTYPE_MAP_COMPASS,                RCAREA_JABU_JABUS_BELLY,       ACTOR_EN_BOX,       SCENE_JABU_JABU,                      -18432,                      GI_COMPASS,          "MQ Compass Chest", "Jabu Jabus Belly MQ Compass Chest", true),
-    RC_OBJECT(RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST,                 RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_JABU_JABUS_BELLY,       ACTOR_EN_BOX,       SCENE_JABU_JABU,                      -30457,                      GI_HEART,            "MQ Second Room Upper Chest", "Jabu Jabus Belly MQ Second Room Upper Chest", false),
-    RC_OBJECT(RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST,            RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_JABU_JABUS_BELLY,       ACTOR_EN_BOX,       SCENE_JABU_JABU,                      -32696,                      GI_NUTS_5,           "MQ Basement Near Switches Chest", "Jabu Jabus Belly MQ Basement Near Switches Chest", false),
-    RC_OBJECT(RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST,               RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_JABU_JABUS_BELLY,       ACTOR_EN_BOX,       SCENE_JABU_JABU,                      -32668,                      GI_BOMBCHUS_10,      "MQ Basement Near Vines Chest", "Jabu Jabus Belly MQ Basement Near Vines Chest", false),
-    RC_OBJECT(RC_JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST,                         RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_JABU_JABUS_BELLY,       ACTOR_EN_BOX,       SCENE_JABU_JABU,                      -31446,                      GI_SHIELD_DEKU,      "MQ Near Boss Chest", "Jabu Jabus Belly MQ Near Boss Chest", false),
-    RC_OBJECT(RC_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST,            RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_JABU_JABUS_BELLY,       ACTOR_EN_BOX,       SCENE_JABU_JABU,                      28905,                       GI_STICKS_1,         "MQ Falling Like Like Room Chest", "Jabu Jabus Belly MQ Falling Like Like Room Chest", false),
-    RC_OBJECT(RC_JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST,              RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_JABU_JABUS_BELLY,       ACTOR_EN_BOX,       SCENE_JABU_JABU,                      20545,                       GI_NUTS_5,           "MQ Boomerang Room Small Chest", "Jabu Jabus Belly MQ Boomerang Room Small Chest", false),
-    RC_OBJECT(RC_JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST,                         RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_JABU_JABUS_BELLY,       ACTOR_EN_BOX,       SCENE_JABU_JABU,                      4294,                        GI_BOOMERANG,        "MQ Boomerang Chest", "Jabu Jabus Belly MQ Boomerang Chest", true),
-    RC_OBJECT(RC_JABU_JABUS_BELLY_MQ_COW,                                     RCVORMQ_MQ,      RCTYPE_COW,                        RCAREA_JABU_JABUS_BELLY,       ACTOR_EN_COW,       SCENE_JABU_JABU,                      0x00,                        GI_MILK,             "MQ Cow", "Jabu Jabus Belly MQ Cow", false),
-    RC_OBJECT(RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER,                    RCVORMQ_VANILLA, RCTYPE_SKULL_TOKEN,                RCAREA_JABU_JABUS_BELLY,       ACTOR_EN_SI,        SCENE_JABU_JABU,                      8705,                        GI_SKULL_TOKEN,      "GS Lobby Basement Lower", "Jabu Jabus Belly GS Lobby Basement Lower", true),
-    RC_OBJECT(RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER,                    RCVORMQ_VANILLA, RCTYPE_SKULL_TOKEN,                RCAREA_JABU_JABUS_BELLY,       ACTOR_EN_SI,        SCENE_JABU_JABU,                      8706,                        GI_SKULL_TOKEN,      "GS Lobby Basement Upper", "Jabu Jabus Belly GS Lobby Basement Upper", true),
-    RC_OBJECT(RC_JABU_JABUS_BELLY_GS_NEAR_BOSS,                               RCVORMQ_VANILLA, RCTYPE_SKULL_TOKEN,                RCAREA_JABU_JABUS_BELLY,       ACTOR_EN_SI,        SCENE_JABU_JABU,                      8708,                        GI_SKULL_TOKEN,      "GS Near Boss", "Jabu Jabus Belly GS Near Boss", true),
-    RC_OBJECT(RC_JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM,                       RCVORMQ_VANILLA, RCTYPE_SKULL_TOKEN,                RCAREA_JABU_JABUS_BELLY,       ACTOR_EN_SI,        SCENE_JABU_JABU,                      8712,                        GI_SKULL_TOKEN,      "GS Water Switch Room", "Jabu Jabus Belly GS Water Switch Room", true),
-    RC_OBJECT(RC_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM,                     RCVORMQ_MQ,      RCTYPE_SKULL_TOKEN,                RCAREA_JABU_JABUS_BELLY,       ACTOR_EN_SI,        SCENE_JABU_JABU,                      8708,                        GI_SKULL_TOKEN,      "MQ GS Tail Parasan Room", "Jabu Jabus Belly MQ GS Tail Parasan Room", true),
-    RC_OBJECT(RC_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM,               RCVORMQ_MQ,      RCTYPE_SKULL_TOKEN,                RCAREA_JABU_JABUS_BELLY,       ACTOR_EN_SI,        SCENE_JABU_JABU,                      8712,                        GI_SKULL_TOKEN,      "MQ GS Invisible Enemies Room", "Jabu Jabus Belly MQ GS Invisible Enemies Room", true),
-    RC_OBJECT(RC_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM,                 RCVORMQ_MQ,      RCTYPE_SKULL_TOKEN,                RCAREA_JABU_JABUS_BELLY,       ACTOR_EN_SI,        SCENE_JABU_JABU,                      8705,                        GI_SKULL_TOKEN,      "MQ GS Boomerang Chest Room", "Jabu Jabus Belly MQ GS Boomerang Chest Room", true),
-    RC_OBJECT(RC_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS,                            RCVORMQ_MQ,      RCTYPE_SKULL_TOKEN,                RCAREA_JABU_JABUS_BELLY,       ACTOR_EN_SI,        SCENE_JABU_JABU,                      8706,                        GI_SKULL_TOKEN,      "MQ GS Near Boss", "Jabu Jabus Belly MQ GS Near Boss", true),
-    RC_OBJECT(RC_BARINADE,                                                    RCVORMQ_BOTH,    RCTYPE_DUNGEON_REWARD,             RCAREA_JABU_JABUS_BELLY,       ACTOR_DOOR_WARP1,   SCENE_JABU_JABU_BOSS,                 0x00,                        GI_NONE,             "Barinade", "Barinade", true),
-    RC_OBJECT(RC_JABU_JABUS_BELLY_BARINADE_HEART,                             RCVORMQ_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD, RCAREA_JABU_JABUS_BELLY,       ACTOR_ITEM_B_HEART, SCENE_JABU_JABU_BOSS,                 0x00,                        GI_HEART_CONTAINER,  "Barinade Heart Container", "Jabu Jabus Belly Barinade Heart Container", true),
-
-
-    RC_OBJECT(RC_FOREST_TEMPLE_FIRST_ROOM_CHEST,                              RCVORMQ_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_FOREST_TEMPLE,          ACTOR_EN_BOX,       SCENE_FOREST_TEMPLE,                  22595,                       GI_KEY_SMALL,        "First Room Chest", "Forest Temple First Room Chest", true),
-    RC_OBJECT(RC_FOREST_TEMPLE_FIRST_STALFOS_CHEST,                           RCVORMQ_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_FOREST_TEMPLE,          ACTOR_EN_BOX,       SCENE_FOREST_TEMPLE,                  30784,                       GI_KEY_SMALL,        "First Stalfos Chest", "Forest Temple First Stalfos Chest", true),
-    RC_OBJECT(RC_FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST,                 RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_FOREST_TEMPLE,          ACTOR_EN_BOX,       SCENE_FOREST_TEMPLE,                  22789,                       GI_HEART,            "Raised Island Courtyard Chest", "Forest Temple Raised Island Courtyard Chest", false),
-    RC_OBJECT(RC_FOREST_TEMPLE_MAP_CHEST,                                     RCVORMQ_VANILLA, RCTYPE_MAP_COMPASS,                RCAREA_FOREST_TEMPLE,          ACTOR_EN_BOX,       SCENE_FOREST_TEMPLE,                  6177,                        GI_MAP,              "Map Chest", "Forest Temple Map Chest", true),
-    RC_OBJECT(RC_FOREST_TEMPLE_WELL_CHEST,                                    RCVORMQ_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_FOREST_TEMPLE,          ACTOR_EN_BOX,       SCENE_FOREST_TEMPLE,                  22601,                       GI_KEY_SMALL,        "Well Chest", "Forest Temple Well Chest", true),
-    RC_OBJECT(RC_FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST,                    RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_FOREST_TEMPLE,          ACTOR_EN_BOX,       SCENE_FOREST_TEMPLE,                  22855,                       GI_ARROWS_MEDIUM,    "Falling Ceiling Room Chest", "Forest Temple Falling Ceiling Room Chest", false),
-    RC_OBJECT(RC_FOREST_TEMPLE_EYE_SWITCH_CHEST,                              RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_FOREST_TEMPLE,          ACTOR_EN_BOX,       SCENE_FOREST_TEMPLE,                  -30364,                      GI_ARROWS_LARGE,     "Eye Switch Chest", "Forest Temple Eye Switch Chest", false),
-    RC_OBJECT(RC_FOREST_TEMPLE_BOSS_KEY_CHEST,                                RCVORMQ_VANILLA, RCTYPE_BOSS_KEY,                   RCAREA_FOREST_TEMPLE,          ACTOR_EN_BOX,       SCENE_FOREST_TEMPLE,                  10222,                       GI_KEY_BOSS,         "Boss Key Chest", "Forest Temple Boss Key Chest", true),
-    RC_OBJECT(RC_FOREST_TEMPLE_FLOORMASTER_CHEST,                             RCVORMQ_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_FOREST_TEMPLE,          ACTOR_EN_BOX,       SCENE_FOREST_TEMPLE,                  30786,                       GI_KEY_SMALL,        "Floormaster Chest", "Forest Temple Floormaster Chest", true),
-    RC_OBJECT(RC_FOREST_TEMPLE_BOW_CHEST,                                     RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_FOREST_TEMPLE,          ACTOR_EN_BOX,       SCENE_FOREST_TEMPLE,                  -20340,                      GI_BOW,              "Bow Chest", "Forest Temple Bow Chest", true),
-    RC_OBJECT(RC_FOREST_TEMPLE_RED_POE_CHEST,                                 RCVORMQ_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_FOREST_TEMPLE,          ACTOR_EN_BOX,       SCENE_FOREST_TEMPLE,                  30797,                       GI_KEY_SMALL,        "Red Poe Chest", "Forest Temple Red Poe Chest", true),
-    RC_OBJECT(RC_FOREST_TEMPLE_BLUE_POE_CHEST,                                RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_FOREST_TEMPLE,          ACTOR_EN_BOX,       SCENE_FOREST_TEMPLE,                  6159,                        GI_COMPASS,          "Blue Poe Chest", "Forest Temple Blue Poe Chest", true),
-    RC_OBJECT(RC_FOREST_TEMPLE_BASEMENT_CHEST,                                RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_FOREST_TEMPLE,          ACTOR_EN_BOX,       SCENE_FOREST_TEMPLE,                  22827,                       GI_ARROWS_SMALL,     "Basement Chest", "Forest Temple Basement Chest", false),
-    RC_OBJECT(RC_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST,                           RCVORMQ_MQ,      RCTYPE_SMALL_KEY,                  RCAREA_FOREST_TEMPLE,          ACTOR_EN_BOX,       SCENE_FOREST_TEMPLE,                  -30653,                      GI_KEY_SMALL,        "MQ First Room Chest", "Forest Temple MQ First Room Chest", true),
-    RC_OBJECT(RC_FOREST_TEMPLE_MQ_WOLFOS_CHEST,                               RCVORMQ_MQ,      RCTYPE_SMALL_KEY,                  RCAREA_FOREST_TEMPLE,          ACTOR_EN_BOX,       SCENE_FOREST_TEMPLE,                  30784,                       GI_KEY_SMALL,        "MQ Wolfos Chest", "Forest Temple MQ Wolfos Chest", true),
-    RC_OBJECT(RC_FOREST_TEMPLE_MQ_BOW_CHEST,                                  RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_FOREST_TEMPLE,          ACTOR_EN_BOX,       SCENE_FOREST_TEMPLE,                  -20340,                      GI_BOW,              "MQ Bow Chest", "Forest Temple MQ Bow Chest", true),
-    RC_OBJECT(RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST,        RCVORMQ_MQ,      RCTYPE_SMALL_KEY,                  RCAREA_FOREST_TEMPLE,          ACTOR_EN_BOX,       SCENE_FOREST_TEMPLE,                  22593,                       GI_KEY_SMALL,        "MQ Raised Island Courtyard Lower Chest", "Forest Temple MQ Raised Island Courtyard Lower Chest", true),
-    RC_OBJECT(RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST,        RCVORMQ_MQ,      RCTYPE_SMALL_KEY,                  RCAREA_FOREST_TEMPLE,          ACTOR_EN_BOX,       SCENE_FOREST_TEMPLE,                  22597,                       GI_KEY_SMALL,        "MQ Raised Island Courtyard Upper Chest", "Forest Temple MQ Raised Island Courtyard Upper Chest", true),
-    RC_OBJECT(RC_FOREST_TEMPLE_MQ_WELL_CHEST,                                 RCVORMQ_MQ,      RCTYPE_SMALL_KEY,                  RCAREA_FOREST_TEMPLE,          ACTOR_EN_BOX,       SCENE_FOREST_TEMPLE,                  22601,                       GI_KEY_SMALL,        "MQ Well Chest", "Forest Temple MQ Well Chest", true),
-    RC_OBJECT(RC_FOREST_TEMPLE_MQ_MAP_CHEST,                                  RCVORMQ_MQ,      RCTYPE_MAP_COMPASS,                RCAREA_FOREST_TEMPLE,          ACTOR_EN_BOX,       SCENE_FOREST_TEMPLE,                  6189,                        GI_MAP,              "MQ Map Chest", "Forest Temple MQ Map Chest", true),
-    RC_OBJECT(RC_FOREST_TEMPLE_MQ_COMPASS_CHEST,                              RCVORMQ_MQ,      RCTYPE_MAP_COMPASS,                RCAREA_FOREST_TEMPLE,          ACTOR_EN_BOX,       SCENE_FOREST_TEMPLE,                  6159,                        GI_COMPASS,          "MQ Compass Chest", "Forest Temple MQ Compass Chest", true),
-    RC_OBJECT(RC_FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST,                 RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_FOREST_TEMPLE,          ACTOR_EN_BOX,       SCENE_FOREST_TEMPLE,                  -30426,                      GI_ARROWS_SMALL,     "MQ Falling Ceiling Room Chest", "Forest Temple MQ Falling Ceiling Room Chest", false),
-    RC_OBJECT(RC_FOREST_TEMPLE_MQ_BASEMENT_CHEST,                             RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_FOREST_TEMPLE,          ACTOR_EN_BOX,       SCENE_FOREST_TEMPLE,                  22827,                       GI_ARROWS_SMALL,     "MQ Basement Chest", "Forest Temple MQ Basement Chest", false),
-    RC_OBJECT(RC_FOREST_TEMPLE_MQ_REDEAD_CHEST,                               RCVORMQ_MQ,      RCTYPE_SMALL_KEY,                  RCAREA_FOREST_TEMPLE,          ACTOR_EN_BOX,       SCENE_FOREST_TEMPLE,                  30786,                       GI_KEY_SMALL,        "MQ Redead Chest", "Forest Temple MQ Redead Chest", true),
-    RC_OBJECT(RC_FOREST_TEMPLE_MQ_BOSS_KEY_CHEST,                             RCVORMQ_MQ,      RCTYPE_BOSS_KEY,                   RCAREA_FOREST_TEMPLE,          ACTOR_EN_BOX,       SCENE_FOREST_TEMPLE,                  10222,                       GI_KEY_BOSS,         "MQ Boss Key Chest", "Forest Temple MQ Boss Key Chest", true),
-    RC_OBJECT(RC_FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD,                    RCVORMQ_VANILLA, RCTYPE_SKULL_TOKEN,                RCAREA_FOREST_TEMPLE,          ACTOR_EN_SI,        SCENE_FOREST_TEMPLE,                  8961,                        GI_SKULL_TOKEN,      "GS Raised Island Courtyard", "Forest Temple GS Raised Island Courtyard", true),
-    RC_OBJECT(RC_FOREST_TEMPLE_GS_FIRST_ROOM,                                 RCVORMQ_VANILLA, RCTYPE_SKULL_TOKEN,                RCAREA_FOREST_TEMPLE,          ACTOR_EN_SI,        SCENE_FOREST_TEMPLE,                  8962,                        GI_SKULL_TOKEN,      "GS First Room", "Forest Temple GS First Room", true),
-    RC_OBJECT(RC_FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD,                     RCVORMQ_VANILLA, RCTYPE_SKULL_TOKEN,                RCAREA_FOREST_TEMPLE,          ACTOR_EN_SI,        SCENE_FOREST_TEMPLE,                  8964,                        GI_SKULL_TOKEN,      "GS Level Island Courtyard", "Forest Temple GS Level Island Courtyard", true),
-    RC_OBJECT(RC_FOREST_TEMPLE_GS_LOBBY,                                      RCVORMQ_VANILLA, RCTYPE_SKULL_TOKEN,                RCAREA_FOREST_TEMPLE,          ACTOR_EN_SI,        SCENE_FOREST_TEMPLE,                  8968,                        GI_SKULL_TOKEN,      "GS Lobby", "Forest Temple GS Lobby", true),
-    RC_OBJECT(RC_FOREST_TEMPLE_GS_BASEMENT,                                   RCVORMQ_VANILLA, RCTYPE_SKULL_TOKEN,                RCAREA_FOREST_TEMPLE,          ACTOR_EN_SI,        SCENE_FOREST_TEMPLE,                  8976,                        GI_SKULL_TOKEN,      "GS Basement", "Forest Temple GS Basement", true),
-    RC_OBJECT(RC_FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY,                           RCVORMQ_MQ,      RCTYPE_SKULL_TOKEN,                RCAREA_FOREST_TEMPLE,          ACTOR_EN_SI,        SCENE_FOREST_TEMPLE,                  8962,                        GI_SKULL_TOKEN,      "MQ GS First Hallway", "Forest Temple MQ GS First Hallway", true),
-    RC_OBJECT(RC_FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM,                         RCVORMQ_MQ,      RCTYPE_SKULL_TOKEN,                RCAREA_FOREST_TEMPLE,          ACTOR_EN_SI,        SCENE_FOREST_TEMPLE,                  8976,                        GI_SKULL_TOKEN,      "MQ GS Block Push Room", "Forest Temple MQ GS Block Push Room", true),
-    RC_OBJECT(RC_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD,                 RCVORMQ_MQ,      RCTYPE_SKULL_TOKEN,                RCAREA_FOREST_TEMPLE,          ACTOR_EN_SI,        SCENE_FOREST_TEMPLE,                  8961,                        GI_SKULL_TOKEN,      "MQ GS Raised Island Courtyard", "Forest Temple MQ GS Raised Island Courtyard", true),
-    RC_OBJECT(RC_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD,                  RCVORMQ_MQ,      RCTYPE_SKULL_TOKEN,                RCAREA_FOREST_TEMPLE,          ACTOR_EN_SI,        SCENE_FOREST_TEMPLE,                  8964,                        GI_SKULL_TOKEN,      "MQ GS Level Island Courtyard", "Forest Temple MQ GS Level Island Courtyard", true),
-    RC_OBJECT(RC_FOREST_TEMPLE_MQ_GS_WELL,                                    RCVORMQ_MQ,      RCTYPE_SKULL_TOKEN,                RCAREA_FOREST_TEMPLE,          ACTOR_EN_SI,        SCENE_FOREST_TEMPLE,                  8968,                        GI_SKULL_TOKEN,      "MQ GS Well", "Forest Temple MQ GS Well", true),
-    RC_OBJECT(RC_PHANTOM_GANON,                                               RCVORMQ_BOTH,    RCTYPE_DUNGEON_REWARD,             RCAREA_FOREST_TEMPLE,          ACTOR_DOOR_WARP1,   SCENE_FOREST_TEMPLE_BOSS,             0x00,                        GI_NONE,             "Phantom Ganon", "Phantom Ganon", true),
-    RC_OBJECT(RC_FOREST_TEMPLE_PHANTOM_GANON_HEART,                           RCVORMQ_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD, RCAREA_FOREST_TEMPLE,          ACTOR_ITEM_B_HEART, SCENE_FOREST_TEMPLE_BOSS,             0x00,                        GI_HEART_CONTAINER,  "Phantom Ganon Heart Container", "Forest Temple Phantom Ganon Heart Container", true),
-
-
-    RC_OBJECT(RC_FIRE_TEMPLE_NEAR_BOSS_CHEST,                                 RCVORMQ_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_FIRE_TEMPLE,            ACTOR_EN_BOX,       SCENE_FIRE_TEMPLE,                    22593,                       GI_KEY_SMALL,        "Near Boss Chest", "Fire Temple Near Boss Chest", true),
-    RC_OBJECT(RC_FIRE_TEMPLE_FLARE_DANCER_CHEST,                              RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_FIRE_TEMPLE,            ACTOR_EN_BOX,       SCENE_FIRE_TEMPLE,                    31936,                       GI_BOMBS_10,         "Flare Dancer Chest", "Fire Temple Flare Dancer Chest", false),
-    RC_OBJECT(RC_FIRE_TEMPLE_BOSS_KEY_CHEST,                                  RCVORMQ_VANILLA, RCTYPE_BOSS_KEY,                   RCAREA_FIRE_TEMPLE,            ACTOR_EN_BOX,       SCENE_FIRE_TEMPLE,                    10220,                       GI_KEY_BOSS,         "Boss Key Chest", "Fire Temple Boss Key Chest", true),
-    RC_OBJECT(RC_FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST,                RCVORMQ_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_FIRE_TEMPLE,            ACTOR_EN_BOX,       SCENE_FIRE_TEMPLE,                    22594,                       GI_KEY_SMALL,        "Big Lava Room Blocked Door Chest", "Fire Temple Big Lava Room Blocked Door Chest", true),
-    RC_OBJECT(RC_FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST,             RCVORMQ_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_FIRE_TEMPLE,            ACTOR_EN_BOX,       SCENE_FIRE_TEMPLE,                    22596,                       GI_KEY_SMALL,        "Big Lava Room Lower Open Door Chest", "Fire Temple Big Lava Room Lower Open Door Chest", true),
-    RC_OBJECT(RC_FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST,                        RCVORMQ_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_FIRE_TEMPLE,            ACTOR_EN_BOX,       SCENE_FIRE_TEMPLE,                    22595,                       GI_KEY_SMALL,        "Boulder Maze Lower Chest", "Fire Temple Boulder Maze Lower Chest", true),
-    RC_OBJECT(RC_FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST,                        RCVORMQ_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_FIRE_TEMPLE,            ACTOR_EN_BOX,       SCENE_FIRE_TEMPLE,                    22598,                       GI_KEY_SMALL,        "Boulder Maze Upper Chest", "Fire Temple Boulder Maze Upper Chest", true),
-    RC_OBJECT(RC_FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST,                    RCVORMQ_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_FIRE_TEMPLE,            ACTOR_EN_BOX,       SCENE_FIRE_TEMPLE,                    22600,                       GI_KEY_SMALL,        "Boulder Maze Side Room Chest", "Fire Temple Boulder Maze Side Room Chest", true),
-    RC_OBJECT(RC_FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST,                     RCVORMQ_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_FIRE_TEMPLE,            ACTOR_EN_BOX,       SCENE_FIRE_TEMPLE,                    22603,                       GI_KEY_SMALL,        "Boulder Maze Shortcut Chest", "Fire Temple Boulder Maze Shortcut Chest", true),
-    RC_OBJECT(RC_FIRE_TEMPLE_SCARECROW_CHEST,                                 RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_FIRE_TEMPLE,            ACTOR_EN_BOX,       SCENE_FIRE_TEMPLE,                    23245,                       GI_RUPEE_GOLD,       "Scarecrow Chest", "Fire Temple Scarecrow Chest", false),
-    RC_OBJECT(RC_FIRE_TEMPLE_MAP_CHEST,                                       RCVORMQ_VANILLA, RCTYPE_MAP_COMPASS,                RCAREA_FIRE_TEMPLE,            ACTOR_EN_BOX,       SCENE_FIRE_TEMPLE,                    2090,                        GI_MAP,              "Map Chest", "Fire Temple Map Chest", true),
-    RC_OBJECT(RC_FIRE_TEMPLE_COMPASS_CHEST,                                   RCVORMQ_VANILLA, RCTYPE_MAP_COMPASS,                RCAREA_FIRE_TEMPLE,            ACTOR_EN_BOX,       SCENE_FIRE_TEMPLE,                    2055,                        GI_COMPASS,          "Compass Chest", "Fire Temple Compass Chest", true),
-    RC_OBJECT(RC_FIRE_TEMPLE_HIGHEST_GORON_CHEST,                             RCVORMQ_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_FIRE_TEMPLE,            ACTOR_EN_BOX,       SCENE_FIRE_TEMPLE,                    22601,                       GI_KEY_SMALL,        "Highest Goron Chest", "Fire Temple Highest Goron Chest", true),
-    RC_OBJECT(RC_FIRE_TEMPLE_MEGATON_HAMMER_CHEST,                            RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_FIRE_TEMPLE,            ACTOR_EN_BOX,       SCENE_FIRE_TEMPLE,                    421,                         GI_HAMMER,           "Megaton Hammer Chest", "Fire Temple Megaton Hammer Chest", true),
-    RC_OBJECT(RC_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST,                              RCVORMQ_MQ,      RCTYPE_SMALL_KEY,                  RCAREA_FIRE_TEMPLE,            ACTOR_EN_BOX,       SCENE_FIRE_TEMPLE,                    22599,                       GI_KEY_SMALL,        "MQ Near Boss Chest", "Fire Temple MQ Near Boss Chest", true),
-    RC_OBJECT(RC_FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST,                         RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_FIRE_TEMPLE,            ACTOR_EN_BOX,       SCENE_FIRE_TEMPLE,                    4512,                        GI_HAMMER,           "MQ Megaton Hammer Chest", "Fire Temple MQ Megaton Hammer Chest", true),
-    RC_OBJECT(RC_FIRE_TEMPLE_MQ_COMPASS_CHEST,                                RCVORMQ_MQ,      RCTYPE_MAP_COMPASS,                RCAREA_FIRE_TEMPLE,            ACTOR_EN_BOX,       SCENE_FIRE_TEMPLE,                    2059,                        GI_COMPASS,          "MQ Compass Chest", "Fire Temple MQ Compass Chest", true),
-    RC_OBJECT(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST,                    RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_FIRE_TEMPLE,            ACTOR_EN_BOX,       SCENE_FIRE_TEMPLE,                    23747,                       GI_BOMBS_10,         "MQ Lizalfos Maze Lower Chest", "Fire Temple MQ Lizalfos Maze Lower Chest", false),
-    RC_OBJECT(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST,                    RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_FIRE_TEMPLE,            ACTOR_EN_BOX,       SCENE_FIRE_TEMPLE,                    23782,                       GI_BOMBS_20,         "MQ Lizalfos Maze Upper Chest", "Fire Temple MQ Lizalfos Maze Upper Chest", false),
-    RC_OBJECT(RC_FIRE_TEMPLE_MQ_CHEST_ON_FIRE,                                RCVORMQ_MQ,      RCTYPE_SMALL_KEY,                  RCAREA_FIRE_TEMPLE,            ACTOR_EN_BOX,       SCENE_FIRE_TEMPLE,                    22597,                       GI_KEY_SMALL,        "MQ Chest on Fire", "Fire Temple MQ Chest on Fire", true),
-    RC_OBJECT(RC_FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST,                          RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_FIRE_TEMPLE,            ACTOR_EN_BOX,       SCENE_FIRE_TEMPLE,                    30018,                       GI_SHIELD_HYLIAN,    "MQ Map Room Side Chest", "Fire Temple MQ Map Room Side Chest", false),
-    RC_OBJECT(RC_FIRE_TEMPLE_MQ_MAP_CHEST,                                    RCVORMQ_MQ,      RCTYPE_MAP_COMPASS,                RCAREA_FIRE_TEMPLE,            ACTOR_EN_BOX,       SCENE_FIRE_TEMPLE,                    2092,                        GI_MAP,              "MQ Map Chest", "Fire Temple MQ Map Chest", true),
-    RC_OBJECT(RC_FIRE_TEMPLE_MQ_BOSS_KEY_CHEST,                               RCVORMQ_MQ,      RCTYPE_BOSS_KEY,                   RCAREA_FIRE_TEMPLE,            ACTOR_EN_BOX,       SCENE_FIRE_TEMPLE,                    10212,                       GI_KEY_BOSS,         "MQ Boss Key Chest", "Fire Temple MQ Boss Key Chest", true),
-    RC_OBJECT(RC_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST,             RCVORMQ_MQ,      RCTYPE_SMALL_KEY,                  RCAREA_FIRE_TEMPLE,            ACTOR_EN_BOX,       SCENE_FIRE_TEMPLE,                    22593,                       GI_KEY_SMALL,        "MQ Big Lava Room Blocked Door Chest", "Fire Temple MQ Big Lava Room Blocked Door Chest", true),
-    RC_OBJECT(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST,                RCVORMQ_MQ,      RCTYPE_SMALL_KEY,                  RCAREA_FIRE_TEMPLE,            ACTOR_EN_BOX,       SCENE_FIRE_TEMPLE,                    22600,                       GI_KEY_SMALL,        "MQ Lizalfos Maze Side Room Chest", "Fire Temple MQ Lizalfos Maze Side Room Chest", true),
-    RC_OBJECT(RC_FIRE_TEMPLE_MQ_FREESTANDING_KEY,                             RCVORMQ_MQ,      RCTYPE_SMALL_KEY,                  RCAREA_FIRE_TEMPLE,            ACTOR_EN_ITEM00,    SCENE_FIRE_TEMPLE,                    7185,                        GI_KEY_SMALL,        "MQ Freestanding Key", "Fire Temple MQ Freestanding Key", true),
-    RC_OBJECT(RC_FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM,                            RCVORMQ_VANILLA, RCTYPE_SKULL_TOKEN,                RCAREA_FIRE_TEMPLE,            ACTOR_EN_SI,        SCENE_FIRE_TEMPLE,                    9217,                        GI_SKULL_TOKEN,      "GS Song of Time Room", "Fire Temple GS Song of Time Room", true),
-    RC_OBJECT(RC_FIRE_TEMPLE_GS_BOSS_KEY_LOOP,                                RCVORMQ_VANILLA, RCTYPE_SKULL_TOKEN,                RCAREA_FIRE_TEMPLE,            ACTOR_EN_SI,        SCENE_FIRE_TEMPLE,                    9218,                        GI_SKULL_TOKEN,      "GS Boss Key Loop", "Fire Temple GS Boss Key Loop", true),
-    RC_OBJECT(RC_FIRE_TEMPLE_GS_BOULDER_MAZE,                                 RCVORMQ_VANILLA, RCTYPE_SKULL_TOKEN,                RCAREA_FIRE_TEMPLE,            ACTOR_EN_SI,        SCENE_FIRE_TEMPLE,                    9220,                        GI_SKULL_TOKEN,      "GS Boulder Maze", "Fire Temple GS Boulder Maze", true),
-    RC_OBJECT(RC_FIRE_TEMPLE_GS_SCARECROW_TOP,                                RCVORMQ_VANILLA, RCTYPE_SKULL_TOKEN,                RCAREA_FIRE_TEMPLE,            ACTOR_EN_SI,        SCENE_FIRE_TEMPLE,                    9224,                        GI_SKULL_TOKEN,      "GS Scarecrow Top", "Fire Temple GS Scarecrow Top", true),
-    RC_OBJECT(RC_FIRE_TEMPLE_GS_SCARECROW_CLIMB,                              RCVORMQ_VANILLA, RCTYPE_SKULL_TOKEN,                RCAREA_FIRE_TEMPLE,            ACTOR_EN_SI,        SCENE_FIRE_TEMPLE,                    9232,                        GI_SKULL_TOKEN,      "GS Scarecrow Climb", "Fire Temple GS Scarecrow Climb", true),
-    RC_OBJECT(RC_FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE,                      RCVORMQ_MQ,      RCTYPE_SKULL_TOKEN,                RCAREA_FIRE_TEMPLE,            ACTOR_EN_SI,        SCENE_FIRE_TEMPLE,                    9218,                        GI_SKULL_TOKEN,      "MQ GS Above Fire Wall Maze", "Fire Temple MQ GS Above Fire Wall Maze", true),
-    RC_OBJECT(RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER,                     RCVORMQ_MQ,      RCTYPE_SKULL_TOKEN,                RCAREA_FIRE_TEMPLE,            ACTOR_EN_SI,        SCENE_FIRE_TEMPLE,                    9224,                        GI_SKULL_TOKEN,      "MQ GS Fire Wall Maze Center", "Fire Temple MQ GS Fire Wall Maze Center", true),
-    RC_OBJECT(RC_FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR,                   RCVORMQ_MQ,      RCTYPE_SKULL_TOKEN,                RCAREA_FIRE_TEMPLE,            ACTOR_EN_SI,        SCENE_FIRE_TEMPLE,                    9217,                        GI_SKULL_TOKEN,      "MQ GS Big Lava Room Open Door", "Fire Temple MQ GS Big Lava Room Open Door", true),
-    RC_OBJECT(RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM,                  RCVORMQ_MQ,      RCTYPE_SKULL_TOKEN,                RCAREA_FIRE_TEMPLE,            ACTOR_EN_SI,        SCENE_FIRE_TEMPLE,                    9232,                        GI_SKULL_TOKEN,      "MQ GS Fire Wall Maze Side Room", "Fire Temple MQ GS Fire Wall Maze Side Room", true),
-    RC_OBJECT(RC_FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE,                             RCVORMQ_MQ,      RCTYPE_SKULL_TOKEN,                RCAREA_FIRE_TEMPLE,            ACTOR_EN_SI,        SCENE_FIRE_TEMPLE,                    9220,                        GI_SKULL_TOKEN,      "MQ GS Skull on Fire", "Fire Temple MQ GS Skull on Fire", true),
-    RC_OBJECT(RC_VOLVAGIA,                                                    RCVORMQ_BOTH,    RCTYPE_DUNGEON_REWARD,             RCAREA_FIRE_TEMPLE,            ACTOR_DOOR_WARP1,   SCENE_FIRE_TEMPLE_BOSS,               0x00,                        GI_NONE,             "Volvagia", "Volvagia", true),
-    RC_OBJECT(RC_FIRE_TEMPLE_VOLVAGIA_HEART,                                  RCVORMQ_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD, RCAREA_FIRE_TEMPLE,            ACTOR_ITEM_B_HEART, SCENE_FIRE_TEMPLE_BOSS,               0x00,                        GI_HEART_CONTAINER,  "Volvagia Heart Container", "Fire Temple Volvagia Heart Container", true),
-
-
-    RC_OBJECT(RC_WATER_TEMPLE_MAP_CHEST,                                      RCVORMQ_VANILLA, RCTYPE_MAP_COMPASS,                RCAREA_WATER_TEMPLE,           ACTOR_EN_BOX,       SCENE_WATER_TEMPLE,                   6178,                        GI_MAP,              "Map Chest", "Water Temple Map Chest", true),
-    RC_OBJECT(RC_WATER_TEMPLE_COMPASS_CHEST,                                  RCVORMQ_VANILLA, RCTYPE_MAP_COMPASS,                RCAREA_WATER_TEMPLE,           ACTOR_EN_BOX,       SCENE_WATER_TEMPLE,                   2057,                        GI_COMPASS,          "Compass Chest", "Water Temple Compass Chest", true),
-    RC_OBJECT(RC_WATER_TEMPLE_TORCHES_CHEST,                                  RCVORMQ_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_WATER_TEMPLE,           ACTOR_EN_BOX,       SCENE_WATER_TEMPLE,                   30785,                       GI_KEY_SMALL,        "Torches Chest", "Water Temple Torches Chest", true),
-    RC_OBJECT(RC_WATER_TEMPLE_DRAGON_CHEST,                                   RCVORMQ_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_WATER_TEMPLE,           ACTOR_EN_BOX,       SCENE_WATER_TEMPLE,                   22602,                       GI_KEY_SMALL,        "Dragon Chest", "Water Temple Dragon Chest", true),
-    RC_OBJECT(RC_WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST,                       RCVORMQ_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_WATER_TEMPLE,           ACTOR_EN_BOX,       SCENE_WATER_TEMPLE,                   22600,                       GI_KEY_SMALL,        "Central Bow Target Chest", "Water Temple Central Bow Target Chest", true),
-    RC_OBJECT(RC_WATER_TEMPLE_CENTRAL_PILLAR_CHEST,                           RCVORMQ_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_WATER_TEMPLE,           ACTOR_EN_BOX,       SCENE_WATER_TEMPLE,                   22598,                       GI_KEY_SMALL,        "Central Pillar Chest", "Water Temple Central Pillar Chest", true),
-    RC_OBJECT(RC_WATER_TEMPLE_CRACKED_WALL_CHEST,                             RCVORMQ_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_WATER_TEMPLE,           ACTOR_EN_BOX,       SCENE_WATER_TEMPLE,                   22592,                       GI_KEY_SMALL,        "Cracked Wall Chest", "Water Temple Cracked Wall Chest", true),
-    RC_OBJECT(RC_WATER_TEMPLE_BOSS_KEY_CHEST,                                 RCVORMQ_VANILLA, RCTYPE_BOSS_KEY,                   RCAREA_WATER_TEMPLE,           ACTOR_EN_BOX,       SCENE_WATER_TEMPLE,                   10213,                       GI_KEY_BOSS,         "Boss Key Chest", "Water Temple Boss Key Chest", true),
-    RC_OBJECT(RC_WATER_TEMPLE_LONGSHOT_CHEST,                                 RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_WATER_TEMPLE,           ACTOR_EN_BOX,       SCENE_WATER_TEMPLE,                   295,                         GI_LONGSHOT,         "Longshot Chest", "Water Temple Longshot Chest", true),
-    RC_OBJECT(RC_WATER_TEMPLE_RIVER_CHEST,                                    RCVORMQ_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_WATER_TEMPLE,           ACTOR_EN_BOX,       SCENE_WATER_TEMPLE,                   22595,                       GI_KEY_SMALL,        "River Chest", "Water Temple River Chest", true),
-    RC_OBJECT(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST,                        RCVORMQ_MQ,      RCTYPE_SMALL_KEY,                  RCAREA_WATER_TEMPLE,           ACTOR_EN_BOX,       SCENE_WATER_TEMPLE,                   -30650,                      GI_KEY_SMALL,        "MQ Central Pillar Chest", "Water Temple MQ Central Pillar Chest", true),
-    RC_OBJECT(RC_WATER_TEMPLE_MQ_BOSS_KEY_CHEST,                              RCVORMQ_MQ,      RCTYPE_BOSS_KEY,                   RCAREA_WATER_TEMPLE,           ACTOR_EN_BOX,       SCENE_WATER_TEMPLE,                   10213,                       GI_KEY_BOSS,         "MQ Boss Key Chest", "Water Temple MQ Boss Key Chest", true),
-    RC_OBJECT(RC_WATER_TEMPLE_MQ_LONGSHOT_CHEST,                              RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_WATER_TEMPLE,           ACTOR_EN_BOX,       SCENE_WATER_TEMPLE,                   -20192,                      GI_LONGSHOT,         "MQ Longshot Chest", "Water Temple MQ Longshot Chest", true),
-    RC_OBJECT(RC_WATER_TEMPLE_MQ_COMPASS_CHEST,                               RCVORMQ_MQ,      RCTYPE_MAP_COMPASS,                RCAREA_WATER_TEMPLE,           ACTOR_EN_BOX,       SCENE_WATER_TEMPLE,                   6145,                        GI_COMPASS,          "MQ Compass Chest", "Water Temple MQ Compass Chest", true),
-    RC_OBJECT(RC_WATER_TEMPLE_MQ_MAP_CHEST,                                   RCVORMQ_MQ,      RCTYPE_MAP_COMPASS,                RCAREA_WATER_TEMPLE,           ACTOR_EN_BOX,       SCENE_WATER_TEMPLE,                   -18398,                      GI_MAP,              "MQ Map Chest", "Water Temple MQ Map Chest", true),
-    RC_OBJECT(RC_WATER_TEMPLE_MQ_FREESTANDING_KEY,                            RCVORMQ_MQ,      RCTYPE_SMALL_KEY,                  RCAREA_WATER_TEMPLE,           ACTOR_EN_ITEM00,    SCENE_WATER_TEMPLE,                   273,                         GI_KEY_SMALL,        "MQ Freestanding Key", "Water Temple MQ Freestanding Key", true),
-    RC_OBJECT(RC_WATER_TEMPLE_GS_BEHIND_GATE,                                 RCVORMQ_VANILLA, RCTYPE_SKULL_TOKEN,                RCAREA_WATER_TEMPLE,           ACTOR_EN_SI,        SCENE_WATER_TEMPLE,                   9473,                        GI_SKULL_TOKEN,      "GS Behind Gate", "Water Temple GS Behind Gate", true),
-    RC_OBJECT(RC_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM,                       RCVORMQ_VANILLA, RCTYPE_SKULL_TOKEN,                RCAREA_WATER_TEMPLE,           ACTOR_EN_SI,        SCENE_WATER_TEMPLE,                   9474,                        GI_SKULL_TOKEN,      "GS Falling Platform Room", "Water Temple GS Falling Platform Room", true),
-    RC_OBJECT(RC_WATER_TEMPLE_GS_CENTRAL_PILLAR,                              RCVORMQ_VANILLA, RCTYPE_SKULL_TOKEN,                RCAREA_WATER_TEMPLE,           ACTOR_EN_SI,        SCENE_WATER_TEMPLE,                   9476,                        GI_SKULL_TOKEN,      "GS Central Pillar", "Water Temple GS Central Pillar", true),
-    RC_OBJECT(RC_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST,                         RCVORMQ_VANILLA, RCTYPE_SKULL_TOKEN,                RCAREA_WATER_TEMPLE,           ACTOR_EN_SI,        SCENE_WATER_TEMPLE,                   9480,                        GI_SKULL_TOKEN,      "GS Near Boss Key Chest", "Water Temple GS Near Boss Key Chest", true),
-    RC_OBJECT(RC_WATER_TEMPLE_GS_RIVER,                                       RCVORMQ_VANILLA, RCTYPE_SKULL_TOKEN,                RCAREA_WATER_TEMPLE,           ACTOR_EN_SI,        SCENE_WATER_TEMPLE,                   9488,                        GI_SKULL_TOKEN,      "GS River", "Water Temple GS River", true),
-    RC_OBJECT(RC_WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH,                RCVORMQ_MQ,      RCTYPE_SKULL_TOKEN,                RCAREA_WATER_TEMPLE,           ACTOR_EN_SI,        SCENE_WATER_TEMPLE,                   9476,                        GI_SKULL_TOKEN,      "MQ GS Before Upper Water Switch", "Water Temple MQ GS Before Upper Water Switch", true),
-    RC_OBJECT(RC_WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA,                    RCVORMQ_MQ,      RCTYPE_SKULL_TOKEN,                RCAREA_WATER_TEMPLE,           ACTOR_EN_SI,        SCENE_WATER_TEMPLE,                   9480,                        GI_SKULL_TOKEN,      "MQ GS Freestanding Key Area", "Water Temple MQ GS Freestanding Key Area", true),
-    RC_OBJECT(RC_WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY,                         RCVORMQ_MQ,      RCTYPE_SKULL_TOKEN,                RCAREA_WATER_TEMPLE,           ACTOR_EN_SI,        SCENE_WATER_TEMPLE,                   9473,                        GI_SKULL_TOKEN,      "MQ GS Lizalfos Hallway", "Water Temple MQ GS Lizalfos Hallway", true),
-    RC_OBJECT(RC_WATER_TEMPLE_MQ_GS_RIVER,                                    RCVORMQ_MQ,      RCTYPE_SKULL_TOKEN,                RCAREA_WATER_TEMPLE,           ACTOR_EN_SI,        SCENE_WATER_TEMPLE,                   9474,                        GI_SKULL_TOKEN,      "MQ GS River", "Water Temple MQ GS River", true),
-    RC_OBJECT(RC_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH,                        RCVORMQ_MQ,      RCTYPE_SKULL_TOKEN,                RCAREA_WATER_TEMPLE,           ACTOR_EN_SI,        SCENE_WATER_TEMPLE,                   9488,                        GI_SKULL_TOKEN,      "MQ GS Triple Wall Torch", "Water Temple MQ GS Triple Wall Torch", true),
-    RC_OBJECT(RC_MORPHA,                                                      RCVORMQ_BOTH,    RCTYPE_DUNGEON_REWARD,             RCAREA_WATER_TEMPLE,           ACTOR_DOOR_WARP1,   SCENE_WATER_TEMPLE_BOSS,              0x00,                        GI_NONE,             "Morpha", "Morpha", true),
-    RC_OBJECT(RC_WATER_TEMPLE_MORPHA_HEART,                                   RCVORMQ_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD, RCAREA_WATER_TEMPLE,           ACTOR_ITEM_B_HEART, SCENE_WATER_TEMPLE_BOSS,              0x00,                        GI_HEART_CONTAINER,  "Morpha Heart Container", "Water Temple Morpha Heart Container", true),
-
-
-    RC_OBJECT(RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST,                        RCVORMQ_BOTH,    RCTYPE_STANDARD,                   RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_BOX,       SCENE_DESERT_COLOSSUS,                1707,                        GI_GAUNTLETS_SILVER, "Silver Gauntlets Chest", "Spirit Temple Silver Gauntlets Chest", true),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST,                           RCVORMQ_BOTH,    RCTYPE_STANDARD,                   RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_BOX,       SCENE_DESERT_COLOSSUS,                13673,                       GI_SHIELD_MIRROR,    "Mirror Shield Chest", "Spirit Temple Mirror Shield Chest", true),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST,                            RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_BOX,       SCENE_SPIRIT_TEMPLE,                  21800,                       GI_SHIELD_DEKU,      "Child Bridge Chest", "Spirit Temple Child Bridge Chest", false),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST,                     RCVORMQ_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_BOX,       SCENE_SPIRIT_TEMPLE,                  -30656,                      GI_KEY_SMALL,        "Child Early Torches Chest", "Spirit Temple Child Early Torches Chest", true),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_COMPASS_CHEST,                                 RCVORMQ_VANILLA, RCTYPE_MAP_COMPASS,                RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_BOX,       SCENE_SPIRIT_TEMPLE,                  14340,                       GI_COMPASS,          "Compass Chest", "Spirit Temple Compass Chest", true),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST,                       RCVORMQ_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_BOX,       SCENE_SPIRIT_TEMPLE,                  22599,                       GI_KEY_SMALL,        "Early Adult Right Chest", "Spirit Temple Early Adult Right Chest", true),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST,                       RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_BOX,       SCENE_SPIRIT_TEMPLE,                  -30451,                      GI_HEART,            "First Mirror Left Chest", "Spirit Temple First Mirror Left Chest", false),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST,                      RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_BOX,       SCENE_SPIRIT_TEMPLE,                  -28786,                      GI_ICE_TRAP,         "First Mirror Right Chest", "Spirit Temple First Mirror Right Chest", false),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_MAP_CHEST,                                     RCVORMQ_VANILLA, RCTYPE_MAP_COMPASS,                RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_BOX,       SCENE_SPIRIT_TEMPLE,                  -18397,                      GI_MAP,              "Map Chest", "Spirit Temple Map Chest", true),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST,                       RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_BOX,       SCENE_SPIRIT_TEMPLE,                  -32666,                      GI_BOMBCHUS_10,      "Child Climb North Chest", "Spirit Temple Child Climb North Chest", false),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST,                        RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_BOX,       SCENE_SPIRIT_TEMPLE,                  -31444,                      GI_SHIELD_DEKU,      "Child Climb East Chest", "Spirit Temple Child Climb East Chest", false),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST,                          RCVORMQ_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_BOX,       SCENE_SPIRIT_TEMPLE,                  -30655,                      GI_KEY_SMALL,        "Sun Block Room Chest", "Spirit Temple Sun Block Room Chest", true),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST,                        RCVORMQ_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_BOX,       SCENE_SPIRIT_TEMPLE,                  -30654,                      GI_KEY_SMALL,        "Statue Room Hand Chest", "Spirit Temple Statue Room Hand Chest", true),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST,                   RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_BOX,       SCENE_SPIRIT_TEMPLE,                  -30577,                      GI_MAGIC_LARGE,      "Statue Room Northeast Chest", "Spirit Temple Statue Room Northeast Chest", false),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST,                         RCVORMQ_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_BOX,       SCENE_SPIRIT_TEMPLE,                  22597,                       GI_KEY_SMALL,        "Near Four Armos Chest", "Spirit Temple Near Four Armos Chest", true),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST,                 RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_BOX,       SCENE_SPIRIT_TEMPLE,                  26900,                       GI_HEART,            "Hallway Right Invisible Chest", "Spirit Temple Hallway Right Invisible Chest", false),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST,                  RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_BOX,       SCENE_SPIRIT_TEMPLE,                  26901,                       GI_HEART,            "Hallway Left Invisible Chest", "Spirit Temple Hallway Left Invisible Chest", false),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_BOSS_KEY_CHEST,                                RCVORMQ_VANILLA, RCTYPE_BOSS_KEY,                   RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_BOX,       SCENE_SPIRIT_TEMPLE,                  10218,                       GI_KEY_BOSS,         "Boss Key Chest", "Spirit Temple Boss Key Chest", true),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_TOPMOST_CHEST,                                 RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_BOX,       SCENE_SPIRIT_TEMPLE,                  -29454,                      GI_BOMBS_20,         "Topmost Chest", "Spirit Temple Topmost Chest", true),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST,                  RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_BOX,       SCENE_SPIRIT_TEMPLE,                  20602,                       GI_BOMBCHUS_10,      "MQ Entrance Front Left Chest", "Spirit Temple MQ Entrance Front Left Chest", false),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST,                  RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_BOX,       SCENE_SPIRIT_TEMPLE,                  -32641,                      GI_BOMBCHUS_10,      "MQ Entrance Back Right Chest", "Spirit Temple MQ Entrance Back Right Chest", false),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST,                 RCVORMQ_MQ,      RCTYPE_SMALL_KEY,                  RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_BOX,       SCENE_SPIRIT_TEMPLE,                  -30629,                      GI_KEY_SMALL,        "MQ Entrance Front Right Chest", "Spirit Temple MQ Entrance Front Right Chest", true),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST,                   RCVORMQ_MQ,      RCTYPE_SMALL_KEY,                  RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_BOX,       SCENE_SPIRIT_TEMPLE,                  -30626,                      GI_KEY_SMALL,        "MQ Entrance Back Left Chest", "Spirit Temple MQ Entrance Back Left Chest", true),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST,                  RCVORMQ_MQ,      RCTYPE_SMALL_KEY,                  RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_BOX,       SCENE_SPIRIT_TEMPLE,                  -30627,                      GI_KEY_SMALL,        "MQ Child Hammer Switch Chest", "Spirit Temple MQ Child Hammer Switch Chest", true),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_MQ_MAP_CHEST,                                  RCVORMQ_MQ,      RCTYPE_MAP_COMPASS,                RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_BOX,       SCENE_SPIRIT_TEMPLE,                  2080,                        GI_MAP,              "MQ Map Chest", "Spirit Temple MQ Map Chest", true),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST,                       RCVORMQ_MQ,      RCTYPE_SMALL_KEY,                  RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_BOX,       SCENE_SPIRIT_TEMPLE,                  30792,                       GI_KEY_SMALL,        "MQ Map Room Enemy Chest", "Spirit Temple MQ Map Room Enemy Chest", true),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST,                    RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_BOX,       SCENE_SPIRIT_TEMPLE,                  28774,                       GI_BOMBCHUS_10,      "MQ Child Climb North Chest", "Spirit Temple MQ Child Climb North Chest", false),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST,                    RCVORMQ_MQ,      RCTYPE_SMALL_KEY,                  RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_BOX,       SCENE_SPIRIT_TEMPLE,                  -30644,                      GI_KEY_SMALL,        "MQ Child Climb South Chest", "Spirit Temple MQ Child Climb South Chest", true),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_MQ_COMPASS_CHEST,                              RCVORMQ_MQ,      RCTYPE_MAP_COMPASS,                RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_BOX,       SCENE_SPIRIT_TEMPLE,                  -18429,                      GI_COMPASS,          "MQ Compass Chest", "Spirit Temple MQ Compass Chest", true),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST,                  RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_BOX,       SCENE_SPIRIT_TEMPLE,                  -30577,                      GI_MAGIC_LARGE,      "MQ Statue Room Lullaby Chest", "Spirit Temple MQ Statue Room Lullaby Chest", false),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST,                RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_BOX,       SCENE_SPIRIT_TEMPLE,                  26882,                       GI_HEART,            "MQ Statue Room Invisible Chest", "Spirit Temple MQ Statue Room Invisible Chest", false),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST,                 RCVORMQ_MQ,      RCTYPE_SMALL_KEY,                  RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_BOX,       SCENE_SPIRIT_TEMPLE,                  -30628,                      GI_KEY_SMALL,        "MQ Silver Block Hallway Chest", "Spirit Temple MQ Silver Block Hallway Chest", true),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST,                       RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_BOX,       SCENE_SPIRIT_TEMPLE,                  -30463,                      GI_HEART,            "MQ Sun Block Room Chest", "Spirit Temple MQ Sun Block Room Chest", false),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST,                        RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_BOX,       SCENE_SPIRIT_TEMPLE,                  23207,                       GI_RUPEE_PURPLE,     "MQ Symphony Room Chest", "Spirit Temple MQ Symphony Room Chest", false),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST,                          RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_BOX,       SCENE_SPIRIT_TEMPLE,                  31396,                       GI_RUPEE_PURPLE,     "MQ Leever Room Chest", "Spirit Temple MQ Leever Room Chest", false),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST,                          RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_BOX,       SCENE_SPIRIT_TEMPLE,                  24472,                       GI_ICE_TRAP,         "MQ Beamos Room Chest", "Spirit Temple MQ Beamos Room Chest", false),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST,                         RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_BOX,       SCENE_SPIRIT_TEMPLE,                  31097,                       GI_ARROWS_LARGE,     "MQ Chest Switch Chest", "Spirit Temple MQ Chest Switch Chest", false),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST,                             RCVORMQ_MQ,      RCTYPE_BOSS_KEY,                   RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_BOX,       SCENE_SPIRIT_TEMPLE,                  10213,                       GI_KEY_BOSS,         "MQ Boss Key Chest", "Spirit Temple MQ Boss Key Chest", true),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST,              RCVORMQ_MQ,      RCTYPE_SMALL_KEY,                  RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_BOX,       SCENE_SPIRIT_TEMPLE,                  26706,                       GI_KEY_SMALL,        "MQ Mirror Puzzle Invisible Chest", "Spirit Temple MQ Mirror Puzzle Invisible Chest", true),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM,                  RCVORMQ_VANILLA, RCTYPE_SKULL_TOKEN,                RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_SI,        SCENE_SPIRIT_TEMPLE,                  9729,                        GI_SKULL_TOKEN,      "GS Hall After Sun Block Room", "Spirit Temple GS Hall After Sun Block Room", true),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_GS_BOULDER_ROOM,                               RCVORMQ_VANILLA, RCTYPE_SKULL_TOKEN,                RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_SI,        SCENE_SPIRIT_TEMPLE,                  9730,                        GI_SKULL_TOKEN,      "GS Boulder Room", "Spirit Temple GS Boulder Room", true),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_GS_LOBBY,                                      RCVORMQ_VANILLA, RCTYPE_SKULL_TOKEN,                RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_SI,        SCENE_SPIRIT_TEMPLE,                  9732,                        GI_SKULL_TOKEN,      "GS Lobby", "Spirit Temple GS Lobby", true),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM,                          RCVORMQ_VANILLA, RCTYPE_SKULL_TOKEN,                RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_SI,        SCENE_SPIRIT_TEMPLE,                  9736,                        GI_SKULL_TOKEN,      "GS Sun on Floor Room", "Spirit Temple GS Sun on Floor Room", true),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_GS_METAL_FENCE,                                RCVORMQ_VANILLA, RCTYPE_SKULL_TOKEN,                RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_SI,        SCENE_SPIRIT_TEMPLE,                  9744,                        GI_SKULL_TOKEN,      "GS Metal Fence", "Spirit Temple GS Metal Fence", true),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM,                           RCVORMQ_MQ,      RCTYPE_SKULL_TOKEN,                RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_SI,        SCENE_SPIRIT_TEMPLE,                  9736,                        GI_SKULL_TOKEN,      "MQ GS Symphony Room", "Spirit Temple MQ GS Symphony Room", true),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM,                             RCVORMQ_MQ,      RCTYPE_SKULL_TOKEN,                RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_SI,        SCENE_SPIRIT_TEMPLE,                  9730,                        GI_SKULL_TOKEN,      "MQ GS Leever Room", "Spirit Temple MQ GS Leever Room", true),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST,                  RCVORMQ_MQ,      RCTYPE_SKULL_TOKEN,                RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_SI,        SCENE_SPIRIT_TEMPLE,                  9732,                        GI_SKULL_TOKEN,      "MQ GS Nine Thrones Room West", "Spirit Temple MQ GS Nine Thrones Room West", true),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH,                 RCVORMQ_MQ,      RCTYPE_SKULL_TOKEN,                RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_SI,        SCENE_SPIRIT_TEMPLE,                  9744,                        GI_SKULL_TOKEN,      "MQ GS Nine Thrones Room North", "Spirit Temple MQ GS Nine Thrones Room North", true),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM,                          RCVORMQ_MQ,      RCTYPE_SKULL_TOKEN,                RCAREA_SPIRIT_TEMPLE,          ACTOR_EN_SI,        SCENE_SPIRIT_TEMPLE,                  9729,                        GI_SKULL_TOKEN,      "MQ GS Sun Block Room", "Spirit Temple MQ GS Sun Block Room", true),
-    RC_OBJECT(RC_TWINROVA,                                                    RCVORMQ_BOTH,    RCTYPE_DUNGEON_REWARD,             RCAREA_SPIRIT_TEMPLE,          ACTOR_DOOR_WARP1,   SCENE_SPIRIT_TEMPLE_BOSS,             0x00,                        GI_NONE,             "Twinrova", "Twinrova", true),
-    RC_OBJECT(RC_SPIRIT_TEMPLE_TWINROVA_HEART,                                RCVORMQ_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD, RCAREA_SPIRIT_TEMPLE,          ACTOR_ITEM_B_HEART, SCENE_SPIRIT_TEMPLE_BOSS,             0x00,                        GI_HEART_CONTAINER,  "Twinrova Heart Container", "Spirit Temple Twinrova Heart Container", true),
-
-
-    RC_OBJECT(RC_SHADOW_TEMPLE_MAP_CHEST,                                     RCVORMQ_VANILLA, RCTYPE_MAP_COMPASS,                RCAREA_SHADOW_TEMPLE,          ACTOR_EN_BOX,       SCENE_SHADOW_TEMPLE,                  6177,                        GI_MAP,              "Map Chest", "Shadow Temple Map Chest", true),
-    RC_OBJECT(RC_SHADOW_TEMPLE_HOVER_BOOTS_CHEST,                             RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_SHADOW_TEMPLE,          ACTOR_EN_BOX,       SCENE_SHADOW_TEMPLE,                  5607,                        GI_BOOTS_HOVER,      "Hover Boots Chest", "Shadow Temple Hover Boots Chest", true),
-    RC_OBJECT(RC_SHADOW_TEMPLE_COMPASS_CHEST,                                 RCVORMQ_VANILLA, RCTYPE_MAP_COMPASS,                RCAREA_SHADOW_TEMPLE,          ACTOR_EN_BOX,       SCENE_SHADOW_TEMPLE,                  6147,                        GI_COMPASS,          "Compass Chest", "Shadow Temple Compass Chest", true),
-    RC_OBJECT(RC_SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST,                      RCVORMQ_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_SHADOW_TEMPLE,          ACTOR_EN_BOX,       SCENE_SHADOW_TEMPLE,                  22594,                       GI_KEY_SMALL,        "Early Silver Rupee Chest", "Shadow Temple Early Silver Rupee Chest", true),
-    RC_OBJECT(RC_SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST,                RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_SHADOW_TEMPLE,          ACTOR_EN_BOX,       SCENE_SHADOW_TEMPLE,                  22668,                       GI_MAGIC_LARGE,      "Invisible Blades Visible Chest", "Shadow Temple Invisible Blades Visible Chest", false),
-    RC_OBJECT(RC_SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST,              RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_SHADOW_TEMPLE,          ACTOR_EN_BOX,       SCENE_SHADOW_TEMPLE,                  26998,                       GI_ARROWS_LARGE,     "Invisible Blades Invisible Chest", "Shadow Temple Invisible Blades Invisible Chest", false),
-    RC_OBJECT(RC_SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST,                    RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_SHADOW_TEMPLE,          ACTOR_EN_BOX,       SCENE_SHADOW_TEMPLE,                  22853,                       GI_ARROWS_MEDIUM,    "Falling Spikes Lower Chest", "Shadow Temple Falling Spikes Lower Chest", false),
-    RC_OBJECT(RC_SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST,                    RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_SHADOW_TEMPLE,          ACTOR_EN_BOX,       SCENE_SHADOW_TEMPLE,                  22662,                       GI_MAGIC_LARGE,      "Falling Spikes Upper Chest", "Shadow Temple Falling Spikes Upper Chest", false),
-    RC_OBJECT(RC_SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST,                   RCVORMQ_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_SHADOW_TEMPLE,          ACTOR_EN_BOX,       SCENE_SHADOW_TEMPLE,                  -30652,                      GI_KEY_SMALL,        "Falling Spikes Switch Chest", "Shadow Temple Falling Spikes Switch Chest", true),
-    RC_OBJECT(RC_SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST,                        RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_SHADOW_TEMPLE,          ACTOR_EN_BOX,       SCENE_SHADOW_TEMPLE,                  30857,                       GI_MAGIC_LARGE,      "Invisible Spikes Chest", "Shadow Temple Invisible Spikes Chest", false),
-    RC_OBJECT(RC_SHADOW_TEMPLE_WIND_HINT_CHEST,                               RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_SHADOW_TEMPLE,          ACTOR_EN_BOX,       SCENE_SHADOW_TEMPLE,                  26965,                       GI_ARROWS_MEDIUM,    "Wind Hint Chest", "Shadow Temple Wind Hint Chest", false),
-    RC_OBJECT(RC_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST,                        RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_SHADOW_TEMPLE,          ACTOR_EN_BOX,       SCENE_SHADOW_TEMPLE,                  30856,                       GI_MAGIC_LARGE,      "After Wind Enemy Chest", "Shadow Temple After Wind Enemy Chest", false),
-    RC_OBJECT(RC_SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST,                       RCVORMQ_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_SHADOW_TEMPLE,          ACTOR_EN_BOX,       SCENE_SHADOW_TEMPLE,                  26708,                       GI_KEY_SMALL,        "After Wind Hidden Chest", "Shadow Temple After Wind Hidden Chest", false),
-    RC_OBJECT(RC_SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST,                        RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_SHADOW_TEMPLE,          ACTOR_EN_BOX,       SCENE_SHADOW_TEMPLE,                  22666,                       GI_MAGIC_LARGE,      "Spike Walls Left Chest", "Shadow Temple Spike Walls Left Chest", false),
-    RC_OBJECT(RC_SHADOW_TEMPLE_BOSS_KEY_CHEST,                                RCVORMQ_VANILLA, RCTYPE_BOSS_KEY,                   RCAREA_SHADOW_TEMPLE,          ACTOR_EN_BOX,       SCENE_SHADOW_TEMPLE,                  10219,                       GI_KEY_BOSS,         "Boss Key Chest", "Shadow Temple Boss Key Chest", true),
-    RC_OBJECT(RC_SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST,                   RCVORMQ_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_SHADOW_TEMPLE,          ACTOR_EN_BOX,       SCENE_SHADOW_TEMPLE,                  30797,                       GI_KEY_SMALL,        "Invisible Floormaster Chest", "Shadow Temple Invisible Floormaster Chest", true),
-    RC_OBJECT(RC_SHADOW_TEMPLE_FREESTANDING_KEY,                              RCVORMQ_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_SHADOW_TEMPLE,          ACTOR_EN_ITEM00,    SCENE_SHADOW_TEMPLE,                  273,                         GI_KEY_SMALL,        "Freestanding Key", "Shadow Temple Freestanding Key", true),
-    RC_OBJECT(RC_SHADOW_TEMPLE_MQ_COMPASS_CHEST,                              RCVORMQ_MQ,      RCTYPE_MAP_COMPASS,                RCAREA_SHADOW_TEMPLE,          ACTOR_EN_BOX,       SCENE_SHADOW_TEMPLE,                  6145,                        GI_COMPASS,          "MQ Compass Chest", "Shadow Temple MQ Compass Chest", true),
-    RC_OBJECT(RC_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST,                          RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_SHADOW_TEMPLE,          ACTOR_EN_BOX,       SCENE_SHADOW_TEMPLE,                  5607,                        GI_BOOTS_HOVER,      "MQ Hover Boots Chest", "Shadow Temple MQ Hover Boots Chest", true),
-    RC_OBJECT(RC_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST,                         RCVORMQ_MQ,      RCTYPE_SMALL_KEY,                  RCAREA_SHADOW_TEMPLE,          ACTOR_EN_BOX,       SCENE_SHADOW_TEMPLE,                  30787,                       GI_KEY_SMALL,        "MQ Early Gibdos Chest", "Shadow Temple MQ Early Gibdos Chest", true),
-    RC_OBJECT(RC_SHADOW_TEMPLE_MQ_MAP_CHEST,                                  RCVORMQ_MQ,      RCTYPE_MAP_COMPASS,                RCAREA_SHADOW_TEMPLE,          ACTOR_EN_BOX,       SCENE_SHADOW_TEMPLE,                  2082,                        GI_MAP,              "MQ Map Chest", "Shadow Temple MQ Map Chest", true),
-    RC_OBJECT(RC_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST,                 RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_SHADOW_TEMPLE,          ACTOR_EN_BOX,       SCENE_SHADOW_TEMPLE,                  -30417,                      GI_ARROWS_SMALL,     "MQ Beamos Silver Rupees Chest", "Shadow Temple MQ Beamos Silver Rupees Chest", false),
-    RC_OBJECT(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST,                RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_SHADOW_TEMPLE,          ACTOR_EN_BOX,       SCENE_SHADOW_TEMPLE,                  22662,                       GI_MAGIC_LARGE,      "MQ Falling Spikes Switch Chest", "Shadow Temple MQ Falling Spikes Switch Chest", false),
-    RC_OBJECT(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST,                 RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_SHADOW_TEMPLE,          ACTOR_EN_BOX,       SCENE_SHADOW_TEMPLE,                  22853,                       GI_ARROWS_MEDIUM,    "MQ Falling Spikes Lower Chest", "Shadow Temple MQ Falling Spikes Lower Chest", false),
-    RC_OBJECT(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST,                 RCVORMQ_MQ,      RCTYPE_SMALL_KEY,                  RCAREA_SHADOW_TEMPLE,          ACTOR_EN_BOX,       SCENE_SHADOW_TEMPLE,                  -30652,                      GI_KEY_SMALL,        "MQ Falling Spikes Upper Chest", "Shadow Temple MQ Falling Spikes Upper Chest", false),
-    RC_OBJECT(RC_SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST,                     RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_SHADOW_TEMPLE,          ACTOR_EN_BOX,       SCENE_SHADOW_TEMPLE,                  30857,                       GI_MAGIC_LARGE,      "MQ Invisible Spikes Chest", "Shadow Temple MQ Invisible Spikes Chest", false),
-    RC_OBJECT(RC_SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST,                             RCVORMQ_MQ,      RCTYPE_BOSS_KEY,                   RCAREA_SHADOW_TEMPLE,          ACTOR_EN_BOX,       SCENE_SHADOW_TEMPLE,                  10219,                       GI_KEY_BOSS,         "MQ Boss Key Chest", "Shadow Temple MQ Boss Key Chest", true),
-    RC_OBJECT(RC_SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST,                     RCVORMQ_MQ,      RCTYPE_SMALL_KEY,                  RCAREA_SHADOW_TEMPLE,          ACTOR_EN_BOX,       SCENE_SHADOW_TEMPLE,                  22666,                       GI_KEY_SMALL,        "MQ Spike Walls Left Chest", "Shadow Temple MQ Spike Walls Left Chest", true),
-    RC_OBJECT(RC_SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST,                         RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_SHADOW_TEMPLE,          ACTOR_EN_BOX,       SCENE_SHADOW_TEMPLE,                  31184,                       GI_RUPEE_RED,        "MQ Stalfos Room Chest", "Shadow Temple MQ Stalfos Room Chest", false),
-    RC_OBJECT(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST,           RCVORMQ_MQ,      RCTYPE_SMALL_KEY,                  RCAREA_SHADOW_TEMPLE,          ACTOR_EN_BOX,       SCENE_SHADOW_TEMPLE,                  26710,                       GI_KEY_SMALL,        "MQ Invisible Blades Invisible Chest", "Shadow Temple MQ Invisible Blades Invisible Chest", true),
-    RC_OBJECT(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST,             RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_SHADOW_TEMPLE,          ACTOR_EN_BOX,       SCENE_SHADOW_TEMPLE,                  22668,                       GI_MAGIC_LARGE,      "MQ Invisible Blades Visible Chest", "Shadow Temple MQ Invisible Blades Visible Chest", false),
-    RC_OBJECT(RC_SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST,                          RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_SHADOW_TEMPLE,          ACTOR_EN_BOX,       SCENE_SHADOW_TEMPLE,                  31053,                       GI_ARROWS_MEDIUM,    "MQ Bomb Flower Chest", "Shadow Temple MQ Bomb Flower Chest", false),
-    RC_OBJECT(RC_SHADOW_TEMPLE_MQ_WIND_HINT_CHEST,                            RCVORMQ_MQ,      RCTYPE_SMALL_KEY,                  RCAREA_SHADOW_TEMPLE,          ACTOR_EN_BOX,       SCENE_SHADOW_TEMPLE,                  26709,                       GI_KEY_SMALL,        "MQ Wind Hint Chest", "Shadow Temple MQ Wind Hint Chest", true),
-    RC_OBJECT(RC_SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST,                    RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_SHADOW_TEMPLE,          ACTOR_EN_BOX,       SCENE_SHADOW_TEMPLE,                  26932,                       GI_ARROWS_SMALL,     "MQ After Wind Hidden Chest", "Shadow Temple MQ After Wind Hidden Chest", false),
-    RC_OBJECT(RC_SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST,                     RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_SHADOW_TEMPLE,          ACTOR_EN_BOX,       SCENE_SHADOW_TEMPLE,                  30856,                       GI_MAGIC_LARGE,      "MQ After Wind Enemy Chest", "Shadow Temple MQ After Wind Enemy Chest", false),
-    RC_OBJECT(RC_SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST,                  RCVORMQ_MQ,      RCTYPE_SMALL_KEY,                  RCAREA_SHADOW_TEMPLE,          ACTOR_EN_BOX,       SCENE_SHADOW_TEMPLE,                  26702,                       GI_KEY_SMALL,        "MQ Near Ship Invisible Chest", "Shadow Temple MQ Near Ship Invisible Chest", true),
-    RC_OBJECT(RC_SHADOW_TEMPLE_MQ_FREESTANDING_KEY,                           RCVORMQ_MQ,      RCTYPE_SMALL_KEY,                  RCAREA_SHADOW_TEMPLE,          ACTOR_EN_ITEM00,    SCENE_SHADOW_TEMPLE,                  1553,                        GI_KEY_SMALL,        "MQ Freestanding Key", "Shadow Temple MQ Freestanding Key", true),
-    RC_OBJECT(RC_SHADOW_TEMPLE_GS_SINGLE_GIANT_POT,                           RCVORMQ_VANILLA, RCTYPE_SKULL_TOKEN,                RCAREA_SHADOW_TEMPLE,          ACTOR_EN_SI,        SCENE_SHADOW_TEMPLE,                  9985,                        GI_SKULL_TOKEN,      "GS Single Giant Pot", "Shadow Temple GS Single Giant Pot", true),
-    RC_OBJECT(RC_SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM,                        RCVORMQ_VANILLA, RCTYPE_SKULL_TOKEN,                RCAREA_SHADOW_TEMPLE,          ACTOR_EN_SI,        SCENE_SHADOW_TEMPLE,                  9986,                        GI_SKULL_TOKEN,      "GS Falling Spikes Room", "Shadow Temple GS Falling Spikes Room", true),
-    RC_OBJECT(RC_SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT,                           RCVORMQ_VANILLA, RCTYPE_SKULL_TOKEN,                RCAREA_SHADOW_TEMPLE,          ACTOR_EN_SI,        SCENE_SHADOW_TEMPLE,                  9988,                        GI_SKULL_TOKEN,      "GS Triple Giant Pot", "Shadow Temple GS Triple Giant Pot", true),
-    RC_OBJECT(RC_SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM,                             RCVORMQ_VANILLA, RCTYPE_SKULL_TOKEN,                RCAREA_SHADOW_TEMPLE,          ACTOR_EN_SI,        SCENE_SHADOW_TEMPLE,                  9992,                        GI_SKULL_TOKEN,      "GS Like Like Room", "Shadow Temple GS Like Like Room", true),
-    RC_OBJECT(RC_SHADOW_TEMPLE_GS_NEAR_SHIP,                                  RCVORMQ_VANILLA, RCTYPE_SKULL_TOKEN,                RCAREA_SHADOW_TEMPLE,          ACTOR_EN_SI,        SCENE_SHADOW_TEMPLE,                  10000,                       GI_SKULL_TOKEN,      "GS Near Ship", "Shadow Temple GS Near Ship", true),
-    RC_OBJECT(RC_SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM,                     RCVORMQ_MQ,      RCTYPE_SKULL_TOKEN,                RCAREA_SHADOW_TEMPLE,          ACTOR_EN_SI,        SCENE_SHADOW_TEMPLE,                  9986,                        GI_SKULL_TOKEN,      "MQ GS Falling Spikes Room", "Shadow Temple MQ GS Falling Spikes Room", true),
-    RC_OBJECT(RC_SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM,                          RCVORMQ_MQ,      RCTYPE_SKULL_TOKEN,                RCAREA_SHADOW_TEMPLE,          ACTOR_EN_SI,        SCENE_SHADOW_TEMPLE,                  9985,                        GI_SKULL_TOKEN,      "MQ GS Wind Hint Room", "Shadow Temple MQ GS Wind Hint Room", true),
-    RC_OBJECT(RC_SHADOW_TEMPLE_MQ_GS_AFTER_WIND,                              RCVORMQ_MQ,      RCTYPE_SKULL_TOKEN,                RCAREA_SHADOW_TEMPLE,          ACTOR_EN_SI,        SCENE_SHADOW_TEMPLE,                  9992,                        GI_SKULL_TOKEN,      "MQ GS After Wind", "Shadow Temple MQ GS After Wind", true),
-    RC_OBJECT(RC_SHADOW_TEMPLE_MQ_GS_AFTER_SHIP,                              RCVORMQ_MQ,      RCTYPE_SKULL_TOKEN,                RCAREA_SHADOW_TEMPLE,          ACTOR_EN_SI,        SCENE_SHADOW_TEMPLE,                  10000,                       GI_SKULL_TOKEN,      "MQ GS After Ship", "Shadow Temple MQ GS After Ship", true),
-    RC_OBJECT(RC_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS,                               RCVORMQ_MQ,      RCTYPE_SKULL_TOKEN,                RCAREA_SHADOW_TEMPLE,          ACTOR_EN_SI,        SCENE_SHADOW_TEMPLE,                  9988,                        GI_SKULL_TOKEN,      "MQ GS Near Boss", "Shadow Temple MQ GS Near Boss", true),
-    RC_OBJECT(RC_BONGO_BONGO,                                                 RCVORMQ_BOTH,    RCTYPE_DUNGEON_REWARD,             RCAREA_SHADOW_TEMPLE,          ACTOR_DOOR_WARP1,   SCENE_SHADOW_TEMPLE_BOSS,             0x00,                        GI_NONE,             "Bongo Bongo", "Bongo Bongo", true),
-    RC_OBJECT(RC_SHADOW_TEMPLE_BONGO_BONGO_HEART,                             RCVORMQ_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD, RCAREA_SHADOW_TEMPLE,          ACTOR_ITEM_B_HEART, SCENE_SHADOW_TEMPLE_BOSS,             0x00,                        GI_HEART_CONTAINER,  "Bongo Bongo Heart Container", "Shadow Temple Bongo Bongo Heart Container", true),
-
-
-    RC_OBJECT(RC_BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST,               RCVORMQ_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_BOTTOM_OF_THE_WELL,     ACTOR_EN_BOX,       SCENE_BOTTOM_OF_THE_WELL,             22600,                       GI_KEY_SMALL,        "Front Left Fake Wall Chest", "Bottom of the Well Front Left Fake Wall Chest", true),
-    RC_OBJECT(RC_BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST,              RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_BOTTOM_OF_THE_WELL,     ACTOR_EN_BOX,       SCENE_BOTTOM_OF_THE_WELL,             20578,                       GI_BOMBCHUS_10,      "Front Center Bombable Chest", "Bottom of the Well Front Center Bombable Chest", false),
-    RC_OBJECT(RC_BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST,             RCVORMQ_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_BOTTOM_OF_THE_WELL,     ACTOR_EN_BOX,       SCENE_BOTTOM_OF_THE_WELL,             22597,                       GI_KEY_SMALL,        "Right Bottom Fake Wall Chest", "Bottom of the Well Right Bottom Fake Wall Chest", true),
-    RC_OBJECT(RC_BOTTOM_OF_THE_WELL_COMPASS_CHEST,                            RCVORMQ_VANILLA, RCTYPE_MAP_COMPASS,                RCAREA_BOTTOM_OF_THE_WELL,     ACTOR_EN_BOX,       SCENE_BOTTOM_OF_THE_WELL,             2049,                        GI_COMPASS,          "Compass Chest", "Bottom of the Well Compass Chest", true),
-    RC_OBJECT(RC_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST,                   RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_BOTTOM_OF_THE_WELL,     ACTOR_EN_BOX,       SCENE_BOTTOM_OF_THE_WELL,             20558,                       GI_NUTS_5,           "Center Skulltula Chest", "Bottom of the Well Center Skulltula Chest", false),
-    RC_OBJECT(RC_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST,                 RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_BOTTOM_OF_THE_WELL,     ACTOR_EN_BOX,       SCENE_BOTTOM_OF_THE_WELL,             23684,                       GI_NUTS_10,          "Back Left Bombable Chest", "Bottom of the Well Back Left Bombable Chest", false),
-    RC_OBJECT(RC_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST,                      RCVORMQ_VANILLA, RCTYPE_BOSS_HEART_OR_OTHER_REWARD, RCAREA_BOTTOM_OF_THE_WELL,     ACTOR_EN_BOX,       SCENE_BOTTOM_OF_THE_WELL,             4419,                        GI_LENS,             "Lens of Truth Chest", "Bottom of the Well Lens of Truth Chest", true),
-    RC_OBJECT(RC_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST,                          RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_BOTTOM_OF_THE_WELL,     ACTOR_EN_BOX,       SCENE_BOTTOM_OF_THE_WELL,             27348,                       GI_RUPEE_GOLD,       "Invisible Chest", "Bottom of the Well Invisible Chest", false),
-    RC_OBJECT(RC_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST,                   RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_BOTTOM_OF_THE_WELL,     ACTOR_EN_BOX,       SCENE_BOTTOM_OF_THE_WELL,             23760,                       GI_BOMBS_10,         "Underwater Front Chest", "Bottom of the Well Underwater Front Chest", false),
-    RC_OBJECT(RC_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST,                    RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_BOTTOM_OF_THE_WELL,     ACTOR_EN_BOX,       SCENE_BOTTOM_OF_THE_WELL,             22793,                       GI_HEART,            "Underwater Left Chest", "Bottom of the Well Underwater Left Chest", false),
-    RC_OBJECT(RC_BOTTOM_OF_THE_WELL_MAP_CHEST,                                RCVORMQ_VANILLA, RCTYPE_MAP_COMPASS,                RCAREA_BOTTOM_OF_THE_WELL,     ACTOR_EN_BOX,       SCENE_BOTTOM_OF_THE_WELL,             2087,                        GI_MAP,              "Map Chest", "Bottom of the Well Map Chest", true),
-    RC_OBJECT(RC_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST,                         RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_BOTTOM_OF_THE_WELL,     ACTOR_EN_BOX,       SCENE_BOTTOM_OF_THE_WELL,             21802,                       GI_SHIELD_DEKU,      "Fire Keese Chest", "Bottom of the Well Fire Keese Chest", false),
-    RC_OBJECT(RC_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST,                          RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_BOTTOM_OF_THE_WELL,     ACTOR_EN_BOX,       SCENE_BOTTOM_OF_THE_WELL,             21836,                       GI_SHIELD_HYLIAN,    "Like Like Chest", "Bottom of the Well Like Like Chest", false),
-    RC_OBJECT(RC_BOTTOM_OF_THE_WELL_FREESTANDING_KEY,                         RCVORMQ_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_BOTTOM_OF_THE_WELL,     ACTOR_EN_ITEM00,    SCENE_BOTTOM_OF_THE_WELL,             273,                         GI_KEY_SMALL,        "Freestanding Key", "Bottom of the Well Freestanding Key", true),
-    RC_OBJECT(RC_BOTTOM_OF_THE_WELL_MQ_MAP_CHEST,                             RCVORMQ_MQ,      RCTYPE_MAP_COMPASS,                RCAREA_BOTTOM_OF_THE_WELL,     ACTOR_EN_BOX,       SCENE_BOTTOM_OF_THE_WELL,             2083,                        GI_MAP,              "MQ Map Chest", "Bottom of the Well MQ Map Chest", true),
-    RC_OBJECT(RC_BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST,                   RCVORMQ_MQ,      RCTYPE_BOSS_HEART_OR_OTHER_REWARD, RCAREA_BOTTOM_OF_THE_WELL,     ACTOR_EN_BOX,       SCENE_BOTTOM_OF_THE_WELL,             -20159,                      GI_LENS,             "MQ Lens of Truth Chest", "Bottom of the Well MQ Lens of Truth Chest", true),
-    RC_OBJECT(RC_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST,                         RCVORMQ_MQ,      RCTYPE_MAP_COMPASS,                RCAREA_BOTTOM_OF_THE_WELL,     ACTOR_EN_BOX,       SCENE_BOTTOM_OF_THE_WELL,             6146,                        GI_COMPASS,          "MQ Compass Chest", "Bottom of the Well MQ Compass Chest", true),
-    RC_OBJECT(RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY,            RCVORMQ_MQ,      RCTYPE_SMALL_KEY,                  RCAREA_BOTTOM_OF_THE_WELL,     ACTOR_EN_ITEM00,    SCENE_BOTTOM_OF_THE_WELL,             529,                         GI_KEY_SMALL,        "MQ Dead Hand Freestanding Key", "Bottom of the Well MQ Dead Hand Freestanding Key", true),
-    RC_OBJECT(RC_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY,      RCVORMQ_MQ,      RCTYPE_SMALL_KEY,                  RCAREA_BOTTOM_OF_THE_WELL,     ACTOR_EN_ITEM00,    SCENE_BOTTOM_OF_THE_WELL,             273,                         GI_KEY_SMALL,        "MQ East Inner Room Freestanding Key", "Bottom of the Well MQ East Inner Room Freestanding Key", true),
-    RC_OBJECT(RC_BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE,                        RCVORMQ_VANILLA, RCTYPE_SKULL_TOKEN,                RCAREA_BOTTOM_OF_THE_WELL,     ACTOR_EN_SI,        SCENE_BOTTOM_OF_THE_WELL,             10241,                       GI_SKULL_TOKEN,      "GS Like Like Cage", "Bottom of the Well GS Like Like Cage", true),
-    RC_OBJECT(RC_BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM,                       RCVORMQ_VANILLA, RCTYPE_SKULL_TOKEN,                RCAREA_BOTTOM_OF_THE_WELL,     ACTOR_EN_SI,        SCENE_BOTTOM_OF_THE_WELL,             10242,                       GI_SKULL_TOKEN,      "GS East Inner Room", "Bottom of the Well GS East Inner Room", true),
-    RC_OBJECT(RC_BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM,                       RCVORMQ_VANILLA, RCTYPE_SKULL_TOKEN,                RCAREA_BOTTOM_OF_THE_WELL,     ACTOR_EN_SI,        SCENE_BOTTOM_OF_THE_WELL,             10244,                       GI_SKULL_TOKEN,      "GS West Inner Room", "Bottom of the Well GS West Inner Room", true),
-    RC_OBJECT(RC_BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT,                           RCVORMQ_MQ,      RCTYPE_SKULL_TOKEN,                RCAREA_BOTTOM_OF_THE_WELL,     ACTOR_EN_SI,        SCENE_BOTTOM_OF_THE_WELL,             10241,                       GI_SKULL_TOKEN,      "MQ GS Basement", "Bottom of the Well MQ GS Basement", true),
-    RC_OBJECT(RC_BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM,                        RCVORMQ_MQ,      RCTYPE_SKULL_TOKEN,                RCAREA_BOTTOM_OF_THE_WELL,     ACTOR_EN_SI,        SCENE_BOTTOM_OF_THE_WELL,             10244,                       GI_SKULL_TOKEN,      "MQ GS Coffin Room", "Bottom of the Well MQ GS Coffin Room", true),
-    RC_OBJECT(RC_BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM,                    RCVORMQ_MQ,      RCTYPE_SKULL_TOKEN,                RCAREA_BOTTOM_OF_THE_WELL,     ACTOR_EN_SI,        SCENE_BOTTOM_OF_THE_WELL,             10242,                       GI_SKULL_TOKEN,      "MQ GS West Inner Room", "Bottom of the Well MQ GS West Inner Room", true),
-
-
-    RC_OBJECT(RC_ICE_CAVERN_MAP_CHEST,                                        RCVORMQ_VANILLA, RCTYPE_MAP_COMPASS,                RCAREA_ICE_CAVERN,             ACTOR_EN_BOX,       SCENE_ICE_CAVERN,                     2080,                        GI_MAP,              "Map Chest", "Ice Cavern Map Chest", true),
-    RC_OBJECT(RC_ICE_CAVERN_COMPASS_CHEST,                                    RCVORMQ_VANILLA, RCTYPE_MAP_COMPASS,                RCAREA_ICE_CAVERN,             ACTOR_EN_BOX,       SCENE_ICE_CAVERN,                     2049,                        GI_COMPASS,          "Compass Chest", "Ice Cavern Compass Chest", true),
-    RC_OBJECT(RC_ICE_CAVERN_IRON_BOOTS_CHEST,                                 RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_ICE_CAVERN,             ACTOR_EN_BOX,       SCENE_ICE_CAVERN,                     5570,                        GI_BOOTS_IRON,       "Iron Boots Chest", "Ice Cavern Iron Boots Chest", true),
-    RC_OBJECT(RC_ICE_CAVERN_FREESTANDING_POH,                                 RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_ICE_CAVERN,             ACTOR_EN_ITEM00,    SCENE_ICE_CAVERN,                     262,                         GI_HEART_PIECE,      "Freestanding PoH", "Ice Cavern Freestanding PoH", true),
-    RC_OBJECT(RC_ICE_CAVERN_MQ_IRON_BOOTS_CHEST,                              RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_ICE_CAVERN,             ACTOR_EN_BOX,       SCENE_ICE_CAVERN,                     5570,                        GI_BOOTS_IRON,       "MQ Iron Boots Chest", "Ice Cavern MQ Iron Boots Chest", true),
-    RC_OBJECT(RC_ICE_CAVERN_MQ_COMPASS_CHEST,                                 RCVORMQ_MQ,      RCTYPE_MAP_COMPASS,                RCAREA_ICE_CAVERN,             ACTOR_EN_BOX,       SCENE_ICE_CAVERN,                     2048,                        GI_COMPASS,          "MQ Compass Chest", "Ice Cavern MQ Compass Chest", true),
-    RC_OBJECT(RC_ICE_CAVERN_MQ_MAP_CHEST,                                     RCVORMQ_MQ,      RCTYPE_MAP_COMPASS,                RCAREA_ICE_CAVERN,             ACTOR_EN_BOX,       SCENE_ICE_CAVERN,                     -18399,                      GI_MAP,              "MQ Map Chest", "Ice Cavern MQ Map Chest", true),
-    RC_OBJECT(RC_ICE_CAVERN_MQ_FREESTANDING_POH,                              RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_ICE_CAVERN,             ACTOR_EN_ITEM00,    SCENE_ICE_CAVERN,                     262,                         GI_HEART_PIECE,      "MQ Freestanding PoH", "Ice Cavern MQ Freestanding PoH", true),
-    RC_OBJECT(RC_ICE_CAVERN_GS_PUSH_BLOCK_ROOM,                               RCVORMQ_VANILLA, RCTYPE_SKULL_TOKEN,                RCAREA_ICE_CAVERN,             ACTOR_EN_SI,        SCENE_ICE_CAVERN,                     10497,                       GI_SKULL_TOKEN,      "GS Push Block Room", "Ice Cavern GS Push Block Room", true),
-    RC_OBJECT(RC_ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM,                          RCVORMQ_VANILLA, RCTYPE_SKULL_TOKEN,                RCAREA_ICE_CAVERN,             ACTOR_EN_SI,        SCENE_ICE_CAVERN,                     10498,                       GI_SKULL_TOKEN,      "GS Spinning Scythe Room", "Ice Cavern GS Spinning Scythe Room", true),
-    RC_OBJECT(RC_ICE_CAVERN_GS_HEART_PIECE_ROOM,                              RCVORMQ_VANILLA, RCTYPE_SKULL_TOKEN,                RCAREA_ICE_CAVERN,             ACTOR_EN_SI,        SCENE_ICE_CAVERN,                     10500,                       GI_SKULL_TOKEN,      "GS Heart Piece Room", "Ice Cavern GS Heart Piece Room", true),
-    RC_OBJECT(RC_ICE_CAVERN_MQ_GS_SCARECROW,                                  RCVORMQ_MQ,      RCTYPE_SKULL_TOKEN,                RCAREA_ICE_CAVERN,             ACTOR_EN_SI,        SCENE_ICE_CAVERN,                     10497,                       GI_SKULL_TOKEN,      "MQ GS Scarecrow", "Ice Cavern MQ GS Scarecrow", true),
-    RC_OBJECT(RC_ICE_CAVERN_MQ_GS_ICE_BLOCK,                                  RCVORMQ_MQ,      RCTYPE_SKULL_TOKEN,                RCAREA_ICE_CAVERN,             ACTOR_EN_SI,        SCENE_ICE_CAVERN,                     10500,                       GI_SKULL_TOKEN,      "MQ GS Ice Block", "Ice Cavern MQ GS Ice Block", true),
-    RC_OBJECT(RC_ICE_CAVERN_MQ_GS_RED_ICE,                                    RCVORMQ_MQ,      RCTYPE_SKULL_TOKEN,                RCAREA_ICE_CAVERN,             ACTOR_EN_SI,        SCENE_ICE_CAVERN,                     10498,                       GI_SKULL_TOKEN,      "MQ GS Red Ice", "Ice Cavern MQ GS Red Ice", true),
-    RC_OBJECT(RC_SHEIK_IN_ICE_CAVERN,                                         RCVORMQ_BOTH,    RCTYPE_SONG_LOCATION,              RCAREA_ICE_CAVERN,             ACTOR_ID_MAX,       SCENE_ICE_CAVERN,                     0x00,                        GI_NONE,             "Sheik in Ice Cavern", "Sheik in Ice Cavern", true),
-
-
-    RC_OBJECT(RC_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST,                     RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,       SCENE_GERUDO_TRAINING_GROUND,         -30573,                      GI_MAGIC_LARGE,      "Lobby Left Chest", "Gerudo Training Grounds Lobby Left Chest", false),
-    RC_OBJECT(RC_GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST,                    RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,       SCENE_GERUDO_TRAINING_GROUND,         -30393,                      GI_ARROWS_MEDIUM,    "Lobby Right Chest", "Gerudo Training Grounds Lobby Right Chest", false),
-    RC_OBJECT(RC_GERUDO_TRAINING_GROUND_STALFOS_CHEST,                        RCVORMQ_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,       SCENE_GERUDO_TRAINING_GROUND,         -30656,                      GI_KEY_SMALL,        "Stalfos Chest", "Gerudo Training Grounds Stalfos Chest", true),
-    RC_OBJECT(RC_GERUDO_TRAINING_GROUND_BEAMOS_CHEST,                         RCVORMQ_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,       SCENE_GERUDO_TRAINING_GROUND,         -30655,                      GI_KEY_SMALL,        "Beamos Chest", "Gerudo Training Grounds Beamos Chest", true),
-    RC_OBJECT(RC_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST,                 RCVORMQ_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,       SCENE_GERUDO_TRAINING_GROUND,         22603,                       GI_KEY_SMALL,        "Hidden Ceiling Chest", "Gerudo Training Grounds Hidden Ceiling Chest", true),
-    RC_OBJECT(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST,                RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,       SCENE_GERUDO_TRAINING_GROUND,         23206,                       GI_RUPEE_PURPLE,     "Maze Path First Chest", "Gerudo Training Grounds Maze Path First Chest", false),
-    RC_OBJECT(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_SECOND_CHEST,               RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,       SCENE_GERUDO_TRAINING_GROUND,         22986,                       GI_RUPEE_RED,        "Maze Path Second Chest", "Gerudo Training Grounds Maze Path Second Chest", false),
-    RC_OBJECT(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_THIRD_CHEST,                RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,       SCENE_GERUDO_TRAINING_GROUND,         22889,                       GI_ARROWS_LARGE,     "Maze Path Third Chest", "Gerudo Training Grounds Maze Path Third Chest", false),
-    RC_OBJECT(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FINAL_CHEST,                RCVORMQ_VANILLA, RCTYPE_BOSS_HEART_OR_OTHER_REWARD, RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,       SCENE_GERUDO_TRAINING_GROUND,         2860,                        GI_ARROW_ICE,        "Maze Path Final Chest", "Gerudo Training Grounds Maze Path Final Chest", true),
-    RC_OBJECT(RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_CENTRAL_CHEST,             RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,       SCENE_GERUDO_TRAINING_GROUND,         23877,                       GI_BOMBCHUS_5,       "Maze Right Central Chest", "Gerudo Training Grounds Maze Right Central Chest", false),
-    RC_OBJECT(RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_SIDE_CHEST,                RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,       SCENE_GERUDO_TRAINING_GROUND,         22888,                       GI_ARROWS_LARGE,     "Maze Right Side Chest", "Gerudo Training Grounds Maze Right Side Chest", false),
-    RC_OBJECT(RC_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST,        RCVORMQ_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,       SCENE_GERUDO_TRAINING_GROUND,         -30643,                      GI_KEY_SMALL,        "Underwater Silver Rupee Chest", "Gerudo Training Grounds Underwater Silver Rupee Chest", true),
-    RC_OBJECT(RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST,              RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,       SCENE_GERUDO_TRAINING_GROUND,         31058,                       GI_ARROWS_MEDIUM,    "Hammer Room Clear Chest", "Gerudo Training Grounds Hammer Room Clear Chest", false),
-    RC_OBJECT(RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST,             RCVORMQ_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,       SCENE_GERUDO_TRAINING_GROUND,         22608,                       GI_KEY_SMALL,        "Hammer Room Switch Chest", "Gerudo Training Grounds Hammer Room Switch Chest", true),
-    RC_OBJECT(RC_GERUDO_TRAINING_GROUND_EYE_STATUE_CHEST,                     RCVORMQ_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,       SCENE_GERUDO_TRAINING_GROUND,         -30653,                      GI_KEY_SMALL,        "Eye Statue Chest", "Gerudo Training Grounds Eye Statue Chest", true),
-    RC_OBJECT(RC_GERUDO_TRAINING_GROUND_NEAR_SCARECROW_CHEST,                 RCVORMQ_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,       SCENE_GERUDO_TRAINING_GROUND,         22596,                       GI_KEY_SMALL,        "Near Scarecrow Chest", "Gerudo Training Grounds Near Scarecrow Chest", true),
-    RC_OBJECT(RC_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST,             RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,       SCENE_GERUDO_TRAINING_GROUND,         31089,                       GI_ARROWS_LARGE,     "Before Heavy Block Chest", "Gerudo Training Grounds Before Heavy Block Chest", false),
-    RC_OBJECT(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST,              RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,       SCENE_GERUDO_TRAINING_GROUND,         31439,                       GI_RUPEE_GOLD,       "Heavy Block First Chest", "Gerudo Training Grounds Heavy Block First Chest", false),
-    RC_OBJECT(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST,             RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,       SCENE_GERUDO_TRAINING_GROUND,         30862,                       GI_MAGIC_LARGE,      "Heavy Block Second Chest", "Gerudo Training Grounds Heavy Block Second Chest", false),
-    RC_OBJECT(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_THIRD_CHEST,              RCVORMQ_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,       SCENE_GERUDO_TRAINING_GROUND,         26708,                       GI_KEY_SMALL,        "Heavy Block Third Chest", "Gerudo Training Grounds Heavy Block Third Chest", true),
-    RC_OBJECT(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FOURTH_CHEST,             RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,       SCENE_GERUDO_TRAINING_GROUND,         24450,                       GI_ICE_TRAP,         "Heavy Block Fourth Chest", "Gerudo Training Grounds Heavy Block Fourth Chest", false),
-    RC_OBJECT(RC_GERUDO_TRAINING_GROUND_FREESTANDING_KEY,                     RCVORMQ_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_ITEM00,    SCENE_GERUDO_TRAINING_GROUND,         273,                         GI_KEY_SMALL,        "Freestanding Key", "Gerudo Training Grounds Freestanding Key", true),
-    RC_OBJECT(RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST,                 RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,       SCENE_GERUDO_TRAINING_GROUND,         23879,                       GI_BOMBCHUS_5,       "MQ Lobby Right Chest", "Gerudo Training Grounds MQ Lobby Right Chest", false),
-    RC_OBJECT(RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST,                  RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,       SCENE_GERUDO_TRAINING_GROUND,         22867,                       GI_ARROWS_MEDIUM,    "MQ Lobby Left Chest", "Gerudo Training Grounds MQ Lobby Left Chest", false),
-    RC_OBJECT(RC_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST,          RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,       SCENE_GERUDO_TRAINING_GROUND,         -30304,                      GI_RUPEE_BLUE,       "MQ First Iron Knuckle Chest", "Gerudo Training Grounds MQ First Iron Knuckle Chest", false),
-    RC_OBJECT(RC_GERUDO_TRAINING_GROUND_MQ_BEFORE_HEAVY_BLOCK_CHEST,          RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,       SCENE_GERUDO_TRAINING_GROUND,         31057,                       GI_ARROWS_MEDIUM,    "MQ Before Heavy Block Chest", "Gerudo Training Grounds MQ Before Heavy Block Chest", false),
-    RC_OBJECT(RC_GERUDO_TRAINING_GROUND_MQ_EYE_STATUE_CHEST,                  RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,       SCENE_GERUDO_TRAINING_GROUND,         -32669,                      GI_BOMBCHUS_10,      "MQ Eye Statue Chest", "Gerudo Training Grounds MQ Eye Statue Chest", false),
-    RC_OBJECT(RC_GERUDO_TRAINING_GROUND_MQ_FLAME_CIRCLE_CHEST,                RCVORMQ_MQ,      RCTYPE_SMALL_KEY,                  RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,       SCENE_GERUDO_TRAINING_GROUND,         -30642,                      GI_KEY_SMALL,        "MQ Flame Circle Chest", "Gerudo Training Grounds MQ Flame Circle Chest", true),
-    RC_OBJECT(RC_GERUDO_TRAINING_GROUND_MQ_SECOND_IRON_KNUCKLE_CHEST,         RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,       SCENE_GERUDO_TRAINING_GROUND,         31058,                       GI_ARROWS_MEDIUM,    "MQ Second Iron Knuckle Chest", "Gerudo Training Grounds MQ Second Iron Knuckle Chest", false),
-    RC_OBJECT(RC_GERUDO_TRAINING_GROUND_MQ_DINOLFOS_CHEST,                    RCVORMQ_MQ,      RCTYPE_SMALL_KEY,                  RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,       SCENE_GERUDO_TRAINING_GROUND,         -30655,                      GI_KEY_SMALL,        "MQ Dinolfos Chest", "Gerudo Training Grounds MQ Dinolfos Chest", true),
-    RC_OBJECT(RC_GERUDO_TRAINING_GROUND_MQ_ICE_ARROWS_CHEST,                  RCVORMQ_MQ,      RCTYPE_BOSS_HEART_OR_OTHER_REWARD, RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,       SCENE_GERUDO_TRAINING_GROUND,         -17628,                      GI_ARROW_ICE,        "MQ Ice Arrows Chest", "Gerudo Training Grounds MQ Ice Arrows Chest", true),
-    RC_OBJECT(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_CENTRAL_CHEST,          RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,       SCENE_GERUDO_TRAINING_GROUND,         22661,                       GI_MAGIC_LARGE,      "MQ Maze Right Central Chest", "Gerudo Training Grounds MQ Maze Right Central Chest", false),
-    RC_OBJECT(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_FIRST_CHEST,             RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,       SCENE_GERUDO_TRAINING_GROUND,         22918,                       GI_RUPEE_GREEN,      "MQ Maze Path First Chest", "Gerudo Training Grounds MQ Maze Path First Chest", false),
-    RC_OBJECT(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_SIDE_CHEST,             RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,       SCENE_GERUDO_TRAINING_GROUND,         24136,                       GI_RUPEE_GREEN_LOSE, "MQ Maze Right Side Chest", "Gerudo Training Grounds MQ Maze Right Side Chest", false),
-    RC_OBJECT(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_THIRD_CHEST,             RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,       SCENE_GERUDO_TRAINING_GROUND,         24137,                       GI_RUPEE_GREEN_LOSE, "MQ Maze Path Third Chest", "Gerudo Training Grounds MQ Maze Path Third Chest", false),
-    RC_OBJECT(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_SECOND_CHEST,            RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,       SCENE_GERUDO_TRAINING_GROUND,         22986,                       GI_RUPEE_RED,        "MQ Maze Path Second Chest", "Gerudo Training Grounds MQ Maze Path Second Chest", false),
-    RC_OBJECT(RC_GERUDO_TRAINING_GROUND_MQ_HIDDEN_CEILING_CHEST,              RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,       SCENE_GERUDO_TRAINING_GROUND,         23211,                       GI_RUPEE_PURPLE,     "MQ Hidden Ceiling Chest", "Gerudo Training Grounds MQ Hidden Ceiling Chest", false),
-    RC_OBJECT(RC_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST,     RCVORMQ_MQ,      RCTYPE_SMALL_KEY,                  RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,       SCENE_GERUDO_TRAINING_GROUND,         -30643,                      GI_KEY_SMALL,        "MQ Underwater Silver Rupee Chest", "Gerudo Training Grounds MQ Underwater Silver Rupee Chest", true),
-    RC_OBJECT(RC_GERUDO_TRAINING_GROUND_MQ_HEAVY_BLOCK_CHEST,                 RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,       SCENE_GERUDO_TRAINING_GROUND,         31394,                       GI_RUPEE_PURPLE,     "MQ Heavy Block Chest", "Gerudo Training Grounds MQ Heavy Block Chest", false),
-
-
-    RC_OBJECT(RC_GANONS_TOWER_BOSS_KEY_CHEST,                                 RCVORMQ_BOTH,    RCTYPE_GANON_BOSS_KEY,             RCAREA_GANONS_CASTLE,          ACTOR_EN_BOX,       SCENE_GANONS_TOWER,                   10219,                       GI_KEY_BOSS,         "Boss Key Chest", "Ganon's Tower Boss Key Chest", true),
-    RC_OBJECT(RC_GANONS_CASTLE_FOREST_TRIAL_CHEST,                            RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_GANONS_CASTLE,          ACTOR_EN_BOX,       SCENE_INSIDE_GANONS_CASTLE,           30857,                       GI_MAGIC_LARGE,      "Forest Trial Chest", "Ganon's Castle Forest Trial Chest", false),
-    RC_OBJECT(RC_GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST,                        RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_GANONS_CASTLE,          ACTOR_EN_BOX,       SCENE_INSIDE_GANONS_CASTLE,           24455,                       GI_ICE_TRAP,         "Water Trial Left Chest", "Ganon's Castle Water Trial Left Chest", false),
-    RC_OBJECT(RC_GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST,                       RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_GANONS_CASTLE,          ACTOR_EN_BOX,       SCENE_INSIDE_GANONS_CASTLE,           22790,                       GI_HEART,            "Water Trial Right Chest", "Ganon's Castle Water Trial Right Chest", false),
-    RC_OBJECT(RC_GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST,                      RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_GANONS_CASTLE,          ACTOR_EN_BOX,       SCENE_INSIDE_GANONS_CASTLE,           22664,                       GI_MAGIC_LARGE,      "Shadow Trial Front Chest", "Ganon's Castle Shadow Trial Front Chest", false),
-    RC_OBJECT(RC_GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST,           RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_GANONS_CASTLE,          ACTOR_EN_BOX,       SCENE_INSIDE_GANONS_CASTLE,           14021,                       GI_GAUNTLETS_GOLD,   "Shadow Trial Golden Gauntlets Chest", "Ganon's Castle Shadow Trial Golden Gauntlets Chest", true),
-    RC_OBJECT(RC_GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST,             RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_GANONS_CASTLE,          ACTOR_EN_BOX,       SCENE_INSIDE_GANONS_CASTLE,           -29326,                      GI_BOMBCHUS_20,      "Spirit Trial Crystal Switch Chest", "Ganon's Castle Spirit Trial Crystal Switch Chest", false),
-    RC_OBJECT(RC_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST,                  RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_GANONS_CASTLE,          ACTOR_EN_BOX,       SCENE_INSIDE_GANONS_CASTLE,           26964,                       GI_ARROWS_MEDIUM,    "Spirit Trial Invisible Chest", "Ganon's Castle Spirit Trial Invisible Chest", false),
-    RC_OBJECT(RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST,                  RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_GANONS_CASTLE,          ACTOR_EN_BOX,       SCENE_INSIDE_GANONS_CASTLE,           22668,                       GI_MAGIC_LARGE,      "Light Trial First Left Chest", "Ganon's Castle Light Trial First Left Chest", false),
-    RC_OBJECT(RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST,                 RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_GANONS_CASTLE,          ACTOR_EN_BOX,       SCENE_INSIDE_GANONS_CASTLE,           24459,                       GI_ICE_TRAP,         "Light Trial Second Left Chest", "Ganon's Castle Light Trial Second Left Chest", false),
-    RC_OBJECT(RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST,                  RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_GANONS_CASTLE,          ACTOR_EN_BOX,       SCENE_INSIDE_GANONS_CASTLE,           22797,                       GI_HEART,            "Light Trial Third Left Chest", "Ganon's Castle Light Trial Third Left Chest", false),
-    RC_OBJECT(RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST,                 RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_GANONS_CASTLE,          ACTOR_EN_BOX,       SCENE_INSIDE_GANONS_CASTLE,           24462,                       GI_ICE_TRAP,         "Light Trial First Right Chest", "Ganon's Castle Light Trial First Right Chest", false),
-    RC_OBJECT(RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST,                RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_GANONS_CASTLE,          ACTOR_EN_BOX,       SCENE_INSIDE_GANONS_CASTLE,           22890,                       GI_ARROWS_LARGE,     "Light Trial Second Right Chest", "Ganon's Castle Light Trial Second Right Chest", false),
-    RC_OBJECT(RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST,                 RCVORMQ_VANILLA, RCTYPE_STANDARD,                   RCAREA_GANONS_CASTLE,          ACTOR_EN_BOX,       SCENE_INSIDE_GANONS_CASTLE,           24463,                       GI_ICE_TRAP,         "Light Trial Third Right Chest", "Ganon's Castle Light Trial Third Right Chest", false),
-    RC_OBJECT(RC_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST,           RCVORMQ_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_GANONS_CASTLE,          ACTOR_EN_BOX,       SCENE_INSIDE_GANONS_CASTLE,           30800,                       GI_KEY_SMALL,        "Light Trial Invisible Enemies Chest", "Ganon's Castle Light Trial Invisible Enemies Chest", true),
-    RC_OBJECT(RC_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST,                     RCVORMQ_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_GANONS_CASTLE,          ACTOR_EN_BOX,       SCENE_INSIDE_GANONS_CASTLE,           -30639,                      GI_KEY_SMALL,        "Light Trial Lullaby Chest", "Ganon's Castle Light Trial Lullaby Chest", true),
-    RC_OBJECT(RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,                        RCVORMQ_VANILLA, RCTYPE_SCRUB,                      RCAREA_GANONS_CASTLE,          ACTOR_EN_DNS,       SCENE_INSIDE_GANONS_CASTLE,           0x05,                        GI_BOMBS_5,          "Deku Scrub Center-Left", "Ganon's Castle Deku Scrub Center-Left", false),
-    RC_OBJECT(RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT,                       RCVORMQ_VANILLA, RCTYPE_SCRUB,                      RCAREA_GANONS_CASTLE,          ACTOR_EN_DNS,       SCENE_INSIDE_GANONS_CASTLE,           0x03,                        GI_SEEDS_30,         "Deku Scrub Center-Right", "Ganon's Castle Deku Scrub Center-Right", false),
-    RC_OBJECT(RC_GANONS_CASTLE_DEKU_SCRUB_RIGHT,                              RCVORMQ_VANILLA, RCTYPE_SCRUB,                      RCAREA_GANONS_CASTLE,          ACTOR_EN_DNS,       SCENE_INSIDE_GANONS_CASTLE,           0x07,                        GI_POTION_RED,       "Deku Scrub Right", "Ganon's Castle Deku Scrub Right", false),
-    RC_OBJECT(RC_GANONS_CASTLE_DEKU_SCRUB_LEFT,                               RCVORMQ_VANILLA, RCTYPE_SCRUB,                      RCAREA_GANONS_CASTLE,          ACTOR_EN_DNS,       SCENE_INSIDE_GANONS_CASTLE,           0x08,                        GI_POTION_GREEN,     "Deku Scrub Left", "Ganon's Castle Deku Scrub Left", false),
-    RC_OBJECT(RC_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST,                          RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_GANONS_CASTLE,          ACTOR_EN_BOX,       SCENE_INSIDE_GANONS_CASTLE,           22977,                       GI_RUPEE_RED,        "MQ Water Trial Chest", "Ganon's Castle MQ Water Trial Chest", false),
-    RC_OBJECT(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST,              RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_GANONS_CASTLE,          ACTOR_EN_BOX,       SCENE_INSIDE_GANONS_CASTLE,           -30398,                      GI_ARROWS_MEDIUM,    "MQ Forest Trial Eye Switch Chest", "Ganon's Castle MQ Forest Trial Eye Switch Chest", false),
-    RC_OBJECT(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST,       RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_GANONS_CASTLE,          ACTOR_EN_BOX,       SCENE_INSIDE_GANONS_CASTLE,           -32733,                      GI_BOMBS_5,          "MQ Forest Trial Frozen Eye Switch Chest", "Ganon's Castle MQ Forest Trial Frozen Eye Switch Chest", false),
-    RC_OBJECT(RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST,                  RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_GANONS_CASTLE,          ACTOR_EN_BOX,       SCENE_INSIDE_GANONS_CASTLE,           -30460,                      GI_HEART,            "MQ Light Trial Lullaby Chest", "Ganon's Castle MQ Light Trial Lullaby Chest", false),
-    RC_OBJECT(RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST,             RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_GANONS_CASTLE,          ACTOR_EN_BOX,       SCENE_INSIDE_GANONS_CASTLE,           -30400,                      GI_ARROWS_MEDIUM,    "MQ Shadow Trial Bomb Flower Chest", "Ganon's Castle MQ Shadow Trial Bomb Flower Chest", false),
-    RC_OBJECT(RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST,              RCVORMQ_MQ,      RCTYPE_SMALL_KEY,                  RCAREA_GANONS_CASTLE,          ACTOR_EN_BOX,       SCENE_INSIDE_GANONS_CASTLE,           -30651,                      GI_KEY_SMALL,        "MQ Shadow Trial Eye Switch Chest", "Ganon's Castle MQ Shadow Trial Eye Switch Chest", true),
-    RC_OBJECT(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST,        RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_GANONS_CASTLE,          ACTOR_EN_BOX,       SCENE_INSIDE_GANONS_CASTLE,           -18746,                      GI_GAUNTLETS_GOLD,   "MQ Spirit Trial Golden Gauntlets Chest", "Ganon's Castle MQ Spirit Trial Golden Gauntlets Chest", true),
-    RC_OBJECT(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST,          RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_GANONS_CASTLE,          ACTOR_EN_BOX,       SCENE_INSIDE_GANONS_CASTLE,           -30457,                      GI_HEART,            "MQ Spirit Trial Sun Back Right Chest", "Ganon's Castle MQ Spirit Trial Sun Back Right Chest", false),
-    RC_OBJECT(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST,           RCVORMQ_MQ,      RCTYPE_SMALL_KEY,                  RCAREA_GANONS_CASTLE,          ACTOR_EN_BOX,       SCENE_INSIDE_GANONS_CASTLE,           -30648,                      GI_KEY_SMALL,        "MQ Spirit Trial Sun Back Left Chest", "Ganon's Castle MQ Spirit Trial Sun Back Left Chest", true),
-    RC_OBJECT(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST,          RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_GANONS_CASTLE,          ACTOR_EN_BOX,       SCENE_INSIDE_GANONS_CASTLE,           -30455,                      GI_HEART,            "MQ Spirit Trial Sun Front Left Chest", "Ganon's Castle MQ Spirit Trial Sun Front Left Chest", false),
-    RC_OBJECT(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST,                   RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_GANONS_CASTLE,          ACTOR_EN_BOX,       SCENE_INSIDE_GANONS_CASTLE,           20586,                       GI_BOMBCHUS_10,      "MQ Spirit Trial First Chest", "Ganon's Castle MQ Spirit Trial First Chest", false),
-    RC_OBJECT(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST,               RCVORMQ_MQ,      RCTYPE_STANDARD,                   RCAREA_GANONS_CASTLE,          ACTOR_EN_BOX,       SCENE_INSIDE_GANONS_CASTLE,           26964,                       GI_ARROWS_MEDIUM,    "MQ Spirit Trial Invisible Chest", "Ganon's Castle MQ Spirit Trial Invisible Chest", false),
-    RC_OBJECT(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY,              RCVORMQ_MQ,      RCTYPE_SMALL_KEY,                  RCAREA_GANONS_CASTLE,          ACTOR_EN_ITEM00,    SCENE_INSIDE_GANONS_CASTLE,           273,                         GI_KEY_SMALL,        "MQ Forest Trial Freestanding Key", "Ganon's Castle MQ Forest Trial Freestanding Key", true),
-    RC_OBJECT(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,                           RCVORMQ_MQ,      RCTYPE_SCRUB,                      RCAREA_GANONS_CASTLE,          ACTOR_EN_DNS,       SCENE_INSIDE_GANONS_CASTLE,           0x00,                        GI_NUTS_5_2,         "MQ Deku Scrub Right", "Ganon's Castle MQ Deku Scrub Right", false),
-    RC_OBJECT(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,                     RCVORMQ_MQ,      RCTYPE_SCRUB,                      RCAREA_GANONS_CASTLE,          ACTOR_EN_DNS,       SCENE_INSIDE_GANONS_CASTLE,           0x05,                        GI_BOMBS_5,          "MQ Deku Scrub Center-Left", "Ganon's Castle MQ Deku Scrub Center-Left", false),
-    RC_OBJECT(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,                          RCVORMQ_MQ,      RCTYPE_SCRUB,                      RCAREA_GANONS_CASTLE,          ACTOR_EN_DNS,       SCENE_INSIDE_GANONS_CASTLE,           0x03,                        GI_SEEDS_30,         "MQ Deku Scrub Center", "Ganon's Castle MQ Deku Scrub Center", false),
-    RC_OBJECT(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT,                    RCVORMQ_MQ,      RCTYPE_SCRUB,                      RCAREA_GANONS_CASTLE,          ACTOR_EN_DNS,       SCENE_INSIDE_GANONS_CASTLE,           0x07,                        GI_POTION_RED,       "MQ Deku Scrub Center-Right", "Ganon's Castle MQ Deku Scrub Center-Right", false),
-    RC_OBJECT(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,                            RCVORMQ_MQ,      RCTYPE_SCRUB,                      RCAREA_GANONS_CASTLE,          ACTOR_EN_DNS,       SCENE_INSIDE_GANONS_CASTLE,           0x08,                        GI_POTION_GREEN,     "MQ Deku Scrub Left", "Ganon's Castle MQ Deku Scrub Left", false),
-
-
-    RC_OBJECT(RC_UNKNOWN_CHECK,                                               RCVORMQ_BOTH,    RCTYPE_STANDARD,                   RCAREA_INVALID,                ACTOR_ID_MAX,       SCENE_ID_MAX,                         0x00,                        GI_NONE,             "Invalid Check", "Invalid Check", false),
+std::map<RandomizerCheckArea, std::string> rcAreaNames = {
+    { RCAREA_KOKIRI_FOREST, "Kokiri Forest" },
+    { RCAREA_LOST_WOODS, "Lost Woods" },
+    { RCAREA_SACRED_FOREST_MEADOW, "Sacred Forest Meadow" },
+    { RCAREA_HYRULE_FIELD, "Hyrule Field" },
+    { RCAREA_LAKE_HYLIA, "Lake Hylia" },
+    { RCAREA_GERUDO_VALLEY, "Gerudo Valley" },
+    { RCAREA_GERUDO_FORTRESS, "Gerudo Fortress" },
+    { RCAREA_WASTELAND, "Desert Wasteland" },
+    { RCAREA_DESERT_COLOSSUS, "Desert Colossus" },
+    { RCAREA_MARKET, "Hyrule Market" },
+    { RCAREA_HYRULE_CASTLE, "Hyrule Castle" },
+    { RCAREA_KAKARIKO_VILLAGE, "Kakariko Village" },
+    { RCAREA_GRAVEYARD, "Graveyard" },
+    { RCAREA_DEATH_MOUNTAIN_TRAIL, "Death Mountain Trail" },
+    { RCAREA_GORON_CITY, "Goron City" },
+    { RCAREA_DEATH_MOUNTAIN_CRATER, "Death Mountain Crater" },
+    { RCAREA_ZORAS_RIVER, "Zora's River" },
+    { RCAREA_ZORAS_DOMAIN, "Zora's Domain" },
+    { RCAREA_ZORAS_FOUNTAIN, "Zora's Fountain" },
+    { RCAREA_LON_LON_RANCH, "Lon Lon Ranch" },
+    { RCAREA_DEKU_TREE, "Deku Tree" },
+    { RCAREA_DODONGOS_CAVERN, "Dodongo's Cavern" },
+    { RCAREA_JABU_JABUS_BELLY, "Jabu Jabu's Belly" },
+    { RCAREA_FOREST_TEMPLE, "Forest Temple" },
+    { RCAREA_FIRE_TEMPLE, "Fire Temple" },
+    { RCAREA_WATER_TEMPLE, "Water Temple" },
+    { RCAREA_SPIRIT_TEMPLE, "Spirit Temple" },
+    { RCAREA_SHADOW_TEMPLE, "Shadow Temple" },
+    { RCAREA_BOTTOM_OF_THE_WELL, "Bottom of the Well" },
+    { RCAREA_ICE_CAVERN, "Ice Cavern" },
+    { RCAREA_GERUDO_TRAINING_GROUND, "Gerudo Training Grounds" },
+    { RCAREA_GANONS_CASTLE, "Ganon's Castle" },
+    { RCAREA_INVALID, "Invalid" },
 };
 
-std::map<RandomizerCheckArea, std::string> rcAreaNames = {
-    { RCAREA_KOKIRI_FOREST, "Kokiri Forest"},
-    { RCAREA_LOST_WOODS, "Lost Woods"},
-    { RCAREA_SACRED_FOREST_MEADOW, "Sacred Forest Meadow"},
-    { RCAREA_HYRULE_FIELD, "Hyrule Field"},
-    { RCAREA_LAKE_HYLIA, "Lake Hylia"},
-    { RCAREA_GERUDO_VALLEY, "Gerudo Valley"},
-    { RCAREA_GERUDO_FORTRESS, "Gerudo Fortress"},
-    { RCAREA_WASTELAND, "Desert Wasteland"},
-    { RCAREA_DESERT_COLOSSUS, "Desert Colossus"},
-    { RCAREA_MARKET, "Hyrule Market"},
-    { RCAREA_HYRULE_CASTLE, "Hyrule Castle"},
-    { RCAREA_KAKARIKO_VILLAGE, "Kakariko Village"},
-    { RCAREA_GRAVEYARD, "Graveyard"},
-    { RCAREA_DEATH_MOUNTAIN_TRAIL, "Death Mountain Trail"},
-    { RCAREA_GORON_CITY, "Goron City"},
-    { RCAREA_DEATH_MOUNTAIN_CRATER, "Death Mountain Crater"},
-    { RCAREA_ZORAS_RIVER, "Zora's River"},
-    { RCAREA_ZORAS_DOMAIN, "Zora's Domain"},
-    { RCAREA_ZORAS_FOUNTAIN, "Zora's Fountain"},
-    { RCAREA_LON_LON_RANCH, "Lon Lon Ranch"},
-    { RCAREA_DEKU_TREE, "Deku Tree"},
-    { RCAREA_DODONGOS_CAVERN, "Dodongo's Cavern"},
-    { RCAREA_JABU_JABUS_BELLY, "Jabu Jabu's Belly"},
-    { RCAREA_FOREST_TEMPLE, "Forest Temple"},
-    { RCAREA_FIRE_TEMPLE, "Fire Temple"},
-    { RCAREA_WATER_TEMPLE, "Water Temple"},
-    { RCAREA_SPIRIT_TEMPLE, "Spirit Temple"},
-    { RCAREA_SHADOW_TEMPLE, "Shadow Temple"},
-    { RCAREA_BOTTOM_OF_THE_WELL, "Bottom of the Well"},
-    { RCAREA_ICE_CAVERN, "Ice Cavern"},
-    { RCAREA_GERUDO_TRAINING_GROUND, "Gerudo Training Grounds"},
-    { RCAREA_GANONS_CASTLE, "Ganon's Castle"},
-    { RCAREA_INVALID, "Invalid"},
- };
+std::map<RandomizerCheckArea, std::vector<RandomizerCheck>> rcObjectsByArea = {};
 
-std::map<RandomizerCheckArea, std::map<RandomizerCheck, RandomizerCheckObject*>> rcObjectsByArea = {};
-
-std::map<RandomizerCheckArea, std::map<RandomizerCheck, RandomizerCheckObject*>> RandomizerCheckObjects::GetAllRCObjectsByArea() {
+std::map<RandomizerCheckArea, std::vector<RandomizerCheck>> RandomizerCheckObjects::GetAllRCObjectsByArea() {
     if (rcObjectsByArea.size() == 0) {
-        for (auto& [randomizerCheck, rcObject] : rcObjects) {
-            rcObjectsByArea[rcObject.rcArea][randomizerCheck] = &rcObject;
+        for (auto& location : Rando::StaticData::GetLocationTable()) {
+            // There are some RCs that don't have checks implemented yet, prevent adding these to the map.
+            if (location.GetRandomizerCheck() != RC_UNKNOWN_CHECK) {
+                rcObjectsByArea[location.GetArea()].push_back(location.GetRandomizerCheck());
+            }
         }
     }
 
@@ -854,18 +58,10 @@ std::map<RandomizerCheckArea, std::map<RandomizerCheck, RandomizerCheckObject*>>
 }
 
 bool RandomizerCheckObjects::AreaIsDungeon(RandomizerCheckArea area) {
-    return area == RCAREA_GANONS_CASTLE ||
-           area == RCAREA_GERUDO_TRAINING_GROUND ||
-           area == RCAREA_ICE_CAVERN ||
-           area == RCAREA_BOTTOM_OF_THE_WELL ||
-           area == RCAREA_SHADOW_TEMPLE ||
-           area == RCAREA_SPIRIT_TEMPLE ||
-           area == RCAREA_WATER_TEMPLE ||
-           area == RCAREA_FIRE_TEMPLE ||
-           area == RCAREA_FOREST_TEMPLE ||
-           area == RCAREA_JABU_JABUS_BELLY ||
-           area == RCAREA_DODONGOS_CAVERN ||
-           area == RCAREA_DEKU_TREE;
+    return area == RCAREA_GANONS_CASTLE || area == RCAREA_GERUDO_TRAINING_GROUND || area == RCAREA_ICE_CAVERN ||
+           area == RCAREA_BOTTOM_OF_THE_WELL || area == RCAREA_SHADOW_TEMPLE || area == RCAREA_SPIRIT_TEMPLE ||
+           area == RCAREA_WATER_TEMPLE || area == RCAREA_FIRE_TEMPLE || area == RCAREA_FOREST_TEMPLE ||
+           area == RCAREA_JABU_JABUS_BELLY || area == RCAREA_DODONGOS_CAVERN || area == RCAREA_DEKU_TREE;
 }
 
 bool RandomizerCheckObjects::AreaIsOverworld(RandomizerCheckArea area) {
@@ -876,18 +72,17 @@ std::string RandomizerCheckObjects::GetRCAreaName(RandomizerCheckArea area) {
     return rcAreaNames[area];
 }
 
-std::map<RandomizerCheck, RandomizerCheckObject> RandomizerCheckObjects::GetAllRCObjects() {
-    return rcObjects;
-}
-
 std::map<SceneID, RandomizerCheckArea> rcAreaBySceneID = {};
 std::map<SceneID, RandomizerCheckArea> RandomizerCheckObjects::GetAllRCAreaBySceneID() {
-    //memoize on first request
+    // memoize on first request
     if (rcAreaBySceneID.size() == 0) {
-        for (auto& [randomizerCheck, rcObject] : rcObjects) {
-            rcAreaBySceneID[rcObject.sceneId] = rcObject.rcArea;
+        for (auto& location : Rando::StaticData::GetLocationTable()) {
+            // There are some RCs that don't have checks implemented yet, prevent adding these to the map.
+            if (location.GetRandomizerCheck() != RC_UNKNOWN_CHECK) {
+                rcAreaBySceneID[location.GetScene()] = location.GetArea();
+            }
         }
-        //Add checkless Hyrule Market areas to the area return
+        // Add checkless Hyrule Market areas to the area return
         for (int id = (int)SCENE_MARKET_ENTRANCE_DAY; id <= (int)SCENE_MARKET_RUINS; id++) {
             rcAreaBySceneID[(SceneID)id] = RCAREA_MARKET;
         }
@@ -908,65 +103,105 @@ RandomizerCheckArea RandomizerCheckObjects::GetRCAreaBySceneID(SceneID sceneId)
 }
 
 void RandomizerCheckObjects::UpdateImGuiVisibility() {
-    for (auto& [randomizerCheck, locationIt] : rcObjects) {
-        locationIt.visibleInImgui = (
-            (locationIt.rc != RC_UNKNOWN_CHECK) &&
-            (!RandomizerCheckObjects::AreaIsDungeon(locationIt.rcArea) ||
-                locationIt.vOrMQ == RCVORMQ_BOTH ||
-                locationIt.vOrMQ == RCVORMQ_MQ &&
-                    ((CVarGetInteger("gRandomizeMqDungeons", RO_MQ_DUNGEONS_NONE) == RO_MQ_DUNGEONS_SET_NUMBER && (CVarGetInteger("gRandomizeMqDungeonCount", 12) > 0) || // at least one MQ dungeon
-                      CVarGetInteger("gRandomizeMqDungeons", RO_MQ_DUNGEONS_NONE) == RO_MQ_DUNGEONS_RANDOM_NUMBER)) ||
-                locationIt.vOrMQ == RCVORMQ_VANILLA &&
-                    (CVarGetInteger("gRandomizeMqDungeons", RO_MQ_DUNGEONS_NONE) != RO_MQ_DUNGEONS_SET_NUMBER || CVarGetInteger("gRandomizeMqDungeonCount", 12) < 12) // at least one vanilla dungeon
-            ) &&
-            (locationIt.rcType != RCTYPE_SHOP || CVarGetInteger("gRandomizeShopsanity", RO_SHOPSANITY_OFF) > RO_SHOPSANITY_ZERO_ITEMS) &&
-            (locationIt.rcType != RCTYPE_SCRUB || CVarGetInteger("gRandomizeShuffleScrubs", RO_SCRUBS_OFF) != RO_SCRUBS_OFF ||
-                locationIt.rc == RC_HF_DEKU_SCRUB_GROTTO || locationIt.rc == RC_LW_DEKU_SCRUB_GROTTO_FRONT || locationIt.rc == RC_LW_DEKU_SCRUB_NEAR_BRIDGE) && // The 3 scrubs that are always randomized
-            (locationIt.rcType != RCTYPE_MERCHANT || CVarGetInteger("gRandomizeShuffleMerchants", RO_SHUFFLE_MERCHANTS_OFF) != RO_SHUFFLE_MERCHANTS_OFF) &&
-            (locationIt.rcType != RCTYPE_SONG_LOCATION || CVarGetInteger("gRandomizeShuffleSongs", RO_SONG_SHUFFLE_SONG_LOCATIONS) != RO_SONG_SHUFFLE_SONG_LOCATIONS) && // song locations
-            ((locationIt.rcType != RCTYPE_BOSS_HEART_OR_OTHER_REWARD && locationIt.rc != RC_SONG_FROM_IMPA && locationIt.rc != RC_SHEIK_IN_ICE_CAVERN) ||
-                CVarGetInteger("gRandomizeShuffleSongs", RO_SONG_SHUFFLE_SONG_LOCATIONS) != RO_SONG_SHUFFLE_DUNGEON_REWARDS) && // song dungeon rewards
-            (locationIt.rcType != RCTYPE_DUNGEON_REWARD || CVarGetInteger("gRandomizeShuffleDungeonReward", RO_DUNGEON_REWARDS_END_OF_DUNGEON) != RO_DUNGEON_REWARDS_END_OF_DUNGEON) && // dungeon rewards end of dungeons
-            (locationIt.rcType != RCTYPE_OCARINA || CVarGetInteger("gRandomizeShuffleOcarinas", RO_GENERIC_NO)) && // ocarina locations
-            (locationIt.rc != RC_HC_ZELDAS_LETTER) && // don't show until we support shuffling letter
-            (locationIt.rcType != RCTYPE_GOSSIP_STONE) && // don't show gossip stones (maybe gossipsanity will be a thing eventually?)
-            (locationIt.rcType != RCTYPE_LINKS_POCKET) && // links pocket can be set to nothing if needed
-            (locationIt.rcType != RCTYPE_CHEST_GAME) && // don't show non final reward chest game checks until we support shuffling them
-            (locationIt.rcType != RCTYPE_SKULL_TOKEN ||
-                (CVarGetInteger("gRandomizeShuffleTokens", RO_TOKENSANITY_OFF) == RO_TOKENSANITY_ALL) ||
-                ((CVarGetInteger("gRandomizeShuffleTokens", RO_TOKENSANITY_OFF) == RO_TOKENSANITY_OVERWORLD) && RandomizerCheckObjects::AreaIsOverworld(locationIt.rcArea)) ||
-                ((CVarGetInteger("gRandomizeShuffleTokens", RO_TOKENSANITY_OFF) == RO_TOKENSANITY_DUNGEONS) && RandomizerCheckObjects::AreaIsDungeon(locationIt.rcArea))
-            ) &&
-            (locationIt.rcType != RCTYPE_COW || CVarGetInteger("gRandomizeShuffleCows", RO_GENERIC_NO)) &&
-            (locationIt.rcType != RCTYPE_ADULT_TRADE || CVarGetInteger("gRandomizeShuffleAdultTrade", RO_GENERIC_NO)) &&
-            (locationIt.rc != RC_KF_KOKIRI_SWORD_CHEST || CVarGetInteger("gRandomizeShuffleKokiriSword", RO_GENERIC_NO)) &&
-            (locationIt.rc != RC_ZR_MAGIC_BEAN_SALESMAN || CVarGetInteger("gRandomizeShuffleBeans", RO_GENERIC_NO)) &&
-            (locationIt.rc != RC_HC_MALON_EGG || CVarGetInteger("gRandomizeShuffleWeirdEgg", RO_GENERIC_NO)) &&
-            (locationIt.rcType != RCTYPE_FROG_SONG || CVarGetInteger("gRandomizeShuffleFrogSongRupees", RO_GENERIC_NO)) &&
-            (locationIt.rcType != RCTYPE_MAP_COMPASS || CVarGetInteger("gRandomizeStartingMapsCompasses", RO_DUNGEON_ITEM_LOC_OWN_DUNGEON) != RO_DUNGEON_ITEM_LOC_VANILLA) &&
-            (locationIt.rcType != RCTYPE_SMALL_KEY || CVarGetInteger("gRandomizeKeysanity", RO_DUNGEON_ITEM_LOC_OWN_DUNGEON) != RO_DUNGEON_ITEM_LOC_VANILLA) &&
-            (locationIt.rcType != RCTYPE_BOSS_KEY || CVarGetInteger("gRandomizeBossKeysanity", RO_DUNGEON_ITEM_LOC_OWN_DUNGEON) != RO_DUNGEON_ITEM_LOC_VANILLA) &&
-            (locationIt.rcType != RCTYPE_GANON_BOSS_KEY || CVarGetInteger("gRandomizeShuffleGanonBossKey", RO_GANON_BOSS_KEY_VANILLA) != RO_GANON_BOSS_KEY_VANILLA) && // vanilla ganon boss key
-            (locationIt.rc != RC_TOT_LIGHT_ARROWS_CUTSCENE ||
-                (CVarGetInteger("gRandomizeShuffleGanonBossKey", RO_GANON_BOSS_KEY_VANILLA) != RO_GANON_BOSS_KEY_LACS_DUNGEONS &&
-                CVarGetInteger("gRandomizeShuffleGanonBossKey", RO_GANON_BOSS_KEY_VANILLA) != RO_GANON_BOSS_KEY_LACS_MEDALLIONS &&
-                CVarGetInteger("gRandomizeShuffleGanonBossKey", RO_GANON_BOSS_KEY_VANILLA) != RO_GANON_BOSS_KEY_LACS_REWARDS &&
-                CVarGetInteger("gRandomizeShuffleGanonBossKey", RO_GANON_BOSS_KEY_VANILLA) != RO_GANON_BOSS_KEY_LACS_STONES &&
-                CVarGetInteger("gRandomizeShuffleGanonBossKey", RO_GANON_BOSS_KEY_VANILLA) != RO_GANON_BOSS_KEY_LACS_TOKENS &&
-                CVarGetInteger("gRandomizeShuffleGanonBossKey", RO_GANON_BOSS_KEY_VANILLA) != RO_GANON_BOSS_KEY_LACS_VANILLA)
-            ) && // LACS ganon boss key
-            (locationIt.rc != RC_KAK_100_GOLD_SKULLTULA_REWARD || CVarGetInteger("gRandomizeShuffleGanonBossKey", RO_GANON_BOSS_KEY_VANILLA) != RO_GANON_BOSS_KEY_KAK_TOKENS) && // 100 skull reward ganon boss key
-            (locationIt.rcType != RCTYPE_GF_KEY && locationIt.rc != RC_GF_GERUDO_MEMBERSHIP_CARD ||
-                (CVarGetInteger("gRandomizeGerudoFortress", RO_GF_NORMAL) == RO_GF_OPEN && locationIt.rcType != RCTYPE_GF_KEY && locationIt.rc != RC_GF_GERUDO_MEMBERSHIP_CARD) ||
-                (CVarGetInteger("gRandomizeGerudoFortress", RO_GF_NORMAL) == RO_GF_FAST &&
-                    ((locationIt.rc == RC_GF_GERUDO_MEMBERSHIP_CARD && CVarGetInteger("gRandomizeShuffleGerudoToken", RO_GENERIC_NO) == RO_GENERIC_YES) ||
-                    (locationIt.rc == RC_GF_NORTH_F1_CARPENTER && CVarGetInteger("gRandomizeGerudoKeys", RO_GERUDO_KEYS_VANILLA) != RO_GERUDO_KEYS_VANILLA))
-                ) ||
-                (CVarGetInteger("gRandomizeGerudoFortress", RO_GF_NORMAL) == RO_GF_NORMAL &&
-                    ((locationIt.rc == RC_GF_GERUDO_MEMBERSHIP_CARD && CVarGetInteger("gRandomizeShuffleGerudoToken", RO_GENERIC_NO) == RO_GENERIC_YES) ||
-                    (locationIt.rcType == RCTYPE_GF_KEY && CVarGetInteger("gRandomizeGerudoKeys", RO_GERUDO_KEYS_VANILLA) != RO_GERUDO_KEYS_VANILLA))
-                )
-            )
-        );
+    auto ctx = Rando::Context::GetInstance();
+    for (auto& location : Rando::StaticData::GetLocationTable()) {
+        auto itemLoc = ctx->GetItemLocation(location.GetRandomizerCheck());
+        itemLoc->SetVisible(
+            (location.GetRandomizerCheck() != RC_UNKNOWN_CHECK) &&
+            (!RandomizerCheckObjects::AreaIsDungeon(location.GetArea()) || location.GetQuest() == RCQUEST_BOTH ||
+             location.GetQuest() == RCQUEST_MQ &&
+                 ((CVarGetInteger("gRandomizeMqDungeons", RO_MQ_DUNGEONS_NONE) == RO_MQ_DUNGEONS_SET_NUMBER &&
+                       (CVarGetInteger("gRandomizeMqDungeonCount", 12) > 0) || // at least one MQ dungeon
+                   CVarGetInteger("gRandomizeMqDungeons", RO_MQ_DUNGEONS_NONE) == RO_MQ_DUNGEONS_RANDOM_NUMBER)) ||
+             location.GetQuest() == RCQUEST_VANILLA &&
+                 (CVarGetInteger("gRandomizeMqDungeons", RO_MQ_DUNGEONS_NONE) != RO_MQ_DUNGEONS_SET_NUMBER ||
+                  CVarGetInteger("gRandomizeMqDungeonCount", 12) < 12) // at least one vanilla dungeon
+             ) &&
+            (location.GetRCType() != RCTYPE_SHOP ||
+             CVarGetInteger("gRandomizeShopsanity", RO_SHOPSANITY_OFF) > RO_SHOPSANITY_ZERO_ITEMS) &&
+            (location.GetRCType() != RCTYPE_SCRUB ||
+             CVarGetInteger("gRandomizeShuffleScrubs", RO_SCRUBS_OFF) != RO_SCRUBS_OFF ||
+             location.GetRandomizerCheck() == RC_HF_DEKU_SCRUB_GROTTO ||
+             location.GetRandomizerCheck() == RC_LW_DEKU_SCRUB_GROTTO_FRONT ||
+             location.GetRandomizerCheck() ==
+                 RC_LW_DEKU_SCRUB_NEAR_BRIDGE) && // The 3 scrubs that are always randomized
+            (location.GetRCType() != RCTYPE_MERCHANT ||
+             CVarGetInteger("gRandomizeShuffleMerchants", RO_SHUFFLE_MERCHANTS_OFF) != RO_SHUFFLE_MERCHANTS_OFF) &&
+            (location.GetRCType() != RCTYPE_SONG_LOCATION ||
+             CVarGetInteger("gRandomizeShuffleSongs", RO_SONG_SHUFFLE_SONG_LOCATIONS) !=
+                 RO_SONG_SHUFFLE_SONG_LOCATIONS) && // song locations
+            ((location.GetRCType() != RCTYPE_BOSS_HEART_OR_OTHER_REWARD &&
+              location.GetRandomizerCheck() != RC_SONG_FROM_IMPA &&
+              location.GetRandomizerCheck() != RC_SHEIK_IN_ICE_CAVERN) ||
+             CVarGetInteger("gRandomizeShuffleSongs", RO_SONG_SHUFFLE_SONG_LOCATIONS) !=
+                 RO_SONG_SHUFFLE_DUNGEON_REWARDS) && // song dungeon rewards
+            (location.GetRCType() != RCTYPE_DUNGEON_REWARD ||
+             CVarGetInteger("gRandomizeShuffleDungeonReward", RO_DUNGEON_REWARDS_END_OF_DUNGEON) !=
+                 RO_DUNGEON_REWARDS_END_OF_DUNGEON) && // dungeon rewards end of dungeons
+            (location.GetRCType() != RCTYPE_OCARINA ||
+             CVarGetInteger("gRandomizeShuffleOcarinas", RO_GENERIC_NO)) && // ocarina locations
+            (location.GetRandomizerCheck() != RC_HC_ZELDAS_LETTER) && // don't show until we support shuffling letter
+            (location.GetRCType() !=
+             RCTYPE_GOSSIP_STONE) && // don't show gossip stones (maybe gossipsanity will be a thing eventually?)
+            (location.GetRCType() != RCTYPE_LINKS_POCKET) && // links pocket can be set to nothing if needed
+            (location.GetRCType() !=
+             RCTYPE_CHEST_GAME) && // don't show non final reward chest game checks until we support shuffling them
+            (location.GetRCType() != RCTYPE_SKULL_TOKEN ||
+             (CVarGetInteger("gRandomizeShuffleTokens", RO_TOKENSANITY_OFF) == RO_TOKENSANITY_ALL) ||
+             ((CVarGetInteger("gRandomizeShuffleTokens", RO_TOKENSANITY_OFF) == RO_TOKENSANITY_OVERWORLD) &&
+              RandomizerCheckObjects::AreaIsOverworld(location.GetArea())) ||
+             ((CVarGetInteger("gRandomizeShuffleTokens", RO_TOKENSANITY_OFF) == RO_TOKENSANITY_DUNGEONS) &&
+              RandomizerCheckObjects::AreaIsDungeon(location.GetArea()))) &&
+            (location.GetRCType() != RCTYPE_COW || CVarGetInteger("gRandomizeShuffleCows", RO_GENERIC_NO)) &&
+            (location.GetRCType() != RCTYPE_ADULT_TRADE ||
+             CVarGetInteger("gRandomizeShuffleAdultTrade", RO_GENERIC_NO)) &&
+            (location.GetRandomizerCheck() != RC_KF_KOKIRI_SWORD_CHEST ||
+             CVarGetInteger("gRandomizeShuffleKokiriSword", RO_GENERIC_NO)) &&
+            (location.GetRandomizerCheck() != RC_ZR_MAGIC_BEAN_SALESMAN ||
+             CVarGetInteger("gRandomizeShuffleBeans", RO_GENERIC_NO)) &&
+            (location.GetRandomizerCheck() != RC_HC_MALON_EGG ||
+             CVarGetInteger("gRandomizeShuffleWeirdEgg", RO_GENERIC_NO)) &&
+            (location.GetRCType() != RCTYPE_FROG_SONG ||
+             CVarGetInteger("gRandomizeShuffleFrogSongRupees", RO_GENERIC_NO)) &&
+            (location.GetRCType() != RCTYPE_MAP_COMPASS ||
+             CVarGetInteger("gRandomizeStartingMapsCompasses", RO_DUNGEON_ITEM_LOC_OWN_DUNGEON) !=
+                 RO_DUNGEON_ITEM_LOC_VANILLA) &&
+            (location.GetRCType() != RCTYPE_SMALL_KEY ||
+             CVarGetInteger("gRandomizeKeysanity", RO_DUNGEON_ITEM_LOC_OWN_DUNGEON) != RO_DUNGEON_ITEM_LOC_VANILLA) &&
+            (location.GetRCType() != RCTYPE_BOSS_KEY ||
+             CVarGetInteger("gRandomizeBossKeysanity", RO_DUNGEON_ITEM_LOC_OWN_DUNGEON) !=
+                 RO_DUNGEON_ITEM_LOC_VANILLA) &&
+            (location.GetRCType() != RCTYPE_GANON_BOSS_KEY ||
+             CVarGetInteger("gRandomizeShuffleGanonBossKey", RO_GANON_BOSS_KEY_VANILLA) !=
+                 RO_GANON_BOSS_KEY_VANILLA) && // vanilla ganon boss key
+            (location.GetRandomizerCheck() != RC_TOT_LIGHT_ARROWS_CUTSCENE ||
+             (CVarGetInteger("gRandomizeShuffleGanonBossKey", RO_GANON_BOSS_KEY_VANILLA) !=
+                  RO_GANON_BOSS_KEY_LACS_DUNGEONS &&
+              CVarGetInteger("gRandomizeShuffleGanonBossKey", RO_GANON_BOSS_KEY_VANILLA) !=
+                  RO_GANON_BOSS_KEY_LACS_MEDALLIONS &&
+              CVarGetInteger("gRandomizeShuffleGanonBossKey", RO_GANON_BOSS_KEY_VANILLA) !=
+                  RO_GANON_BOSS_KEY_LACS_REWARDS &&
+              CVarGetInteger("gRandomizeShuffleGanonBossKey", RO_GANON_BOSS_KEY_VANILLA) !=
+                  RO_GANON_BOSS_KEY_LACS_STONES &&
+              CVarGetInteger("gRandomizeShuffleGanonBossKey", RO_GANON_BOSS_KEY_VANILLA) !=
+                  RO_GANON_BOSS_KEY_LACS_TOKENS &&
+              CVarGetInteger("gRandomizeShuffleGanonBossKey", RO_GANON_BOSS_KEY_VANILLA) !=
+                  RO_GANON_BOSS_KEY_LACS_VANILLA)) && // LACS ganon boss key
+            (location.GetRandomizerCheck() != RC_KAK_100_GOLD_SKULLTULA_REWARD ||
+             CVarGetInteger("gRandomizeShuffleGanonBossKey", RO_GANON_BOSS_KEY_VANILLA) !=
+                 RO_GANON_BOSS_KEY_KAK_TOKENS) && // 100 skull reward ganon boss key
+            (location.GetRCType() != RCTYPE_GF_KEY && location.GetRandomizerCheck() != RC_GF_GERUDO_MEMBERSHIP_CARD ||
+             (CVarGetInteger("gRandomizeGerudoFortress", RO_GF_NORMAL) == RO_GF_OPEN &&
+              location.GetRCType() != RCTYPE_GF_KEY && location.GetRandomizerCheck() != RC_GF_GERUDO_MEMBERSHIP_CARD) ||
+             (CVarGetInteger("gRandomizeGerudoFortress", RO_GF_NORMAL) == RO_GF_FAST &&
+              ((location.GetRandomizerCheck() == RC_GF_GERUDO_MEMBERSHIP_CARD &&
+                CVarGetInteger("gRandomizeShuffleGerudoToken", RO_GENERIC_NO) == RO_GENERIC_YES) ||
+               (location.GetRandomizerCheck() == RC_GF_NORTH_F1_CARPENTER &&
+                CVarGetInteger("gRandomizeGerudoKeys", RO_GERUDO_KEYS_VANILLA) != RO_GERUDO_KEYS_VANILLA))) ||
+             (CVarGetInteger("gRandomizeGerudoFortress", RO_GF_NORMAL) == RO_GF_NORMAL &&
+              ((location.GetRandomizerCheck() == RC_GF_GERUDO_MEMBERSHIP_CARD &&
+                CVarGetInteger("gRandomizeShuffleGerudoToken", RO_GENERIC_NO) == RO_GENERIC_YES) ||
+               (location.GetRCType() == RCTYPE_GF_KEY &&
+                CVarGetInteger("gRandomizeGerudoKeys", RO_GERUDO_KEYS_VANILLA) != RO_GERUDO_KEYS_VANILLA)))));
     }
 }
diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_objects.h b/soh/soh/Enhancements/randomizer/randomizer_check_objects.h
index dc9bd2010..ab7e5538a 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_objects.h
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_objects.h
@@ -1,38 +1,18 @@
 #pragma once
 #include "randomizerTypes.h"
+#include "z64actor_enum.h"
+#include "z64scene.h"
 #include <string>
+#include <vector>
 #include <map>
 
-// Forward Declarations to avoid duplicate definition issues
-enum ActorID : int;
-enum SceneID : int;
-
 #define TWO_ACTOR_PARAMS(a, b) (abs(a) << 16) | abs(b)
 
-#define RC_OBJECT(rc, rc_v_or_mq, rc_type, rc_area, actor_id, scene_id, actor_params, og_item_id, rc_shortname, rc_spoilername, vanillaCompletion) \
-    { rc, {rc, rc_v_or_mq, rc_type, rc_area, actor_id, scene_id, actor_params, og_item_id, false, rc_shortname, rc_spoilername, vanillaCompletion} }
-
-typedef struct {
-    RandomizerCheck rc;
-    RandomizerCheckVanillaOrMQ vOrMQ;
-    RandomizerCheckType rcType;
-    RandomizerCheckArea rcArea;
-    ActorID actorId;
-    SceneID sceneId;
-    int32_t actorParams;
-    GetItemID ogItemId;
-    bool visibleInImgui;
-    std::string rcShortName;
-    std::string rcSpoilerName;
-    bool vanillaCompletion;
-} RandomizerCheckObject;
-
 namespace RandomizerCheckObjects {
     bool AreaIsDungeon(RandomizerCheckArea area);
     bool AreaIsOverworld(RandomizerCheckArea area);
     std::string GetRCAreaName(RandomizerCheckArea area);
-    std::map<RandomizerCheck, RandomizerCheckObject> GetAllRCObjects();
-    std::map<RandomizerCheckArea, std::map<RandomizerCheck, RandomizerCheckObject*>> GetAllRCObjectsByArea();
+    std::map<RandomizerCheckArea, std::vector<RandomizerCheck>> GetAllRCObjectsByArea();
     std::map<SceneID, RandomizerCheckArea> GetAllRCAreaBySceneID();
     RandomizerCheckArea GetRCAreaBySceneID(SceneID sceneId);
     void UpdateImGuiVisibility();
diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
index 0884a694f..5366e8905 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
@@ -9,9 +9,11 @@
 #include <vector>
 #include <set>
 #include <libultraship/libultraship.h>
-#include "3drando/item_location.hpp"
+#include "location.h"
+#include "item_location.h"
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "z64item.h"
+#include "randomizerTypes.h"
 
 extern "C" {
 #include "variables.h"
@@ -78,6 +80,7 @@ bool initialized;
 bool doAreaScroll;
 bool previousShowHidden = false;
 bool hideShopRightChecks = true;
+bool hideTriforceCompleted = true;
 
 bool checkCollected = false;
 int checkLoops = 0;
@@ -110,7 +113,7 @@ std::map<SceneID, RandomizerCheckArea> RCAreaFromSceneID = {
     {SCENE_INSIDE_GANONS_CASTLE,   RCAREA_GANONS_CASTLE},
 };
 
-std::map<RandomizerCheckArea, std::vector<RandomizerCheckObject>> checksByArea;
+std::map<RandomizerCheckArea, std::vector<RandomizerCheck>> checksByArea;
 bool areasFullyChecked[RCAREA_INVALID];
 u32 areasSpoiled = 0;
 bool showVOrMQ;
@@ -126,9 +129,9 @@ std::vector<GetItemEntry> itemsReceived;
 OSContPad* trackerButtonsPressed;
 
 void BeginFloatWindows(std::string UniqueName, bool& open, ImGuiWindowFlags flags = 0);
-bool CompareChecks(RandomizerCheckObject, RandomizerCheckObject);
+bool CompareChecks(RandomizerCheck, RandomizerCheck);
 bool CheckByArea(RandomizerCheckArea);
-void DrawLocation(RandomizerCheckObject);
+void DrawLocation(RandomizerCheck);
 void EndFloatWindows();
 bool HasItemBeenCollected(RandomizerCheck);
 void LoadSettings();
@@ -138,6 +141,7 @@ void UpdateInventoryChecks();
 void UpdateOrdering(RandomizerCheckArea);
 int sectionId;
 
+
 SceneID DungeonSceneLookupByArea(RandomizerCheckArea area) {
     switch (area) {
         case RCAREA_DEKU_TREE:              return SCENE_DEKU_TREE;
@@ -219,7 +223,7 @@ void GiftFromSages() {
     }
 }
 
-std::vector<RandomizerCheckObject> checks;
+std::vector<RandomizerCheck> checks;
 // Function for adding Link's Pocket check
 void LinksPocket() {
     if (IS_RANDO) {
@@ -234,21 +238,16 @@ void LinksPocket() {
 void TrySetAreas() {
     if (checksByArea.empty()) {
         for (int i = RCAREA_KOKIRI_FOREST; i < RCAREA_INVALID; i++) {
-            checksByArea.emplace(static_cast<RandomizerCheckArea>(i), std::vector<RandomizerCheckObject>());
+            checksByArea.emplace(static_cast<RandomizerCheckArea>(i), std::vector<RandomizerCheck>());
         }
     }
 }
 
 void SetCheckCollected(RandomizerCheck rc) {
     gSaveContext.checkTrackerData[rc].status = RCSHOW_COLLECTED;
-    RandomizerCheckObject rcObj;
-    if (rc == RC_GIFT_FROM_SAGES && !IS_RANDO) {
-        rcObj = RCO_RAORU;
-    } else {
-        rcObj = RandomizerCheckObjects::GetAllRCObjects().find(rc)->second;
-    }
+    Rando::Location* loc = Rando::StaticData::GetLocation(rc);
     if (!gSaveContext.checkTrackerData[rc].skipped) {
-        areaChecksGotten[rcObj.rcArea]++;
+        areaChecksGotten[loc->GetArea()]++;
     } else {
         gSaveContext.checkTrackerData[rc].skipped = false;
     }
@@ -258,7 +257,7 @@ void SetCheckCollected(RandomizerCheck rc) {
     SaveManager::Instance->SaveSection(gSaveContext.fileNum, sectionId, true);
 
     doAreaScroll = true;
-    UpdateOrdering(rcObj.rcArea);
+    UpdateOrdering(loc->GetArea());
     UpdateInventoryChecks();
 }
 
@@ -359,10 +358,10 @@ bool vector_contains_scene(std::vector<SceneID> vec, const int16_t scene) {
 
 std::vector<SceneID> skipScenes = {SCENE_GANON_BOSS, SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR, SCENE_GANON_BOSS, SCENE_INSIDE_GANONS_CASTLE_COLLAPSE, SCENE_GANONS_TOWER_COLLAPSE_INTERIOR};
 
-bool EvaluateCheck(RandomizerCheckObject rco) {
-    if (HasItemBeenCollected(rco.rc) && gSaveContext.checkTrackerData[rco.rc].status != RCSHOW_COLLECTED &&
-            gSaveContext.checkTrackerData[rco.rc].status != RCSHOW_SAVED) {
-        SetCheckCollected(rco.rc);
+bool EvaluateCheck(RandomizerCheck rc) {
+    if (HasItemBeenCollected(rc) && gSaveContext.checkTrackerData[rc].status != RCSHOW_COLLECTED &&
+            gSaveContext.checkTrackerData[rc].status != RCSHOW_SAVED) {
+        SetCheckCollected(rc);
         return true;
     }
     return false;
@@ -378,8 +377,8 @@ bool CheckByArea(RandomizerCheckArea area = RCAREA_INVALID) {
             checkCounter = 0;
             checkLoops++;
         }
-        auto rco = areaChecks.at(checkCounter);
-        return EvaluateCheck(rco);
+        auto rc = areaChecks.at(checkCounter);
+        return EvaluateCheck(rc);
     }
 }
 
@@ -404,8 +403,8 @@ bool HasItemBeenCollected(RandomizerCheck rc) {
     if (gPlayState == nullptr) {
         return false;
     }
-    ItemLocation* x = Location(rc);
-    SpoilerCollectionCheck check = x->GetCollectionCheck();
+    Rando::Location* x = Rando::StaticData::GetLocation(rc);
+    Rando::SpoilerCollectionCheck check = x->GetCollectionCheck();
     auto flag = check.flag;
     auto scene = check.scene;
     auto type = check.type;
@@ -640,9 +639,9 @@ void CheckTrackerItemReceive(GetItemEntry giEntry) {
 
 void InitTrackerData(bool isDebug) {
     TrySetAreas();
-    for (auto& [rc, rco] : RandomizerCheckObjects::GetAllRCObjects()) {
-        if (rc != RC_UNKNOWN_CHECK && rc != RC_MAX) {
-            DefaultCheckData(rc);
+    for (auto& loc : Rando::StaticData::GetLocationTable()) {
+        if (loc.GetRandomizerCheck() != RC_UNKNOWN_CHECK && loc.GetRandomizerCheck() != RC_MAX) {
+            DefaultCheckData(loc.GetRandomizerCheck());
         }
     }
     UpdateAllOrdering();
@@ -689,25 +688,27 @@ void LoadFile() {
         });
         RandomizerCheckTrackerData entry = gSaveContext.checkTrackerData[i];
         RandomizerCheck rc = static_cast<RandomizerCheck>(i);
-        if (rc == RC_UNKNOWN_CHECK || rc == RC_MAX ||
-            !RandomizerCheckObjects::GetAllRCObjects().contains(rc))
+        if (rc == RC_UNKNOWN_CHECK || rc == RC_MAX)
             return;
 
-        RandomizerCheckObject entry2;
+        Rando::Location* entry2;
         if (rc == RC_GIFT_FROM_SAGES && !IS_RANDO) {
-            entry2 = RCO_RAORU;
+            entry2 = Rando::StaticData::GetLocation(rc);
         } else {
-            entry2 = RandomizerCheckObjects::GetAllRCObjects().find(rc)->second;
+            entry2 = Rando::StaticData::GetLocation(rc);
         }
-        if (!IsVisibleInCheckTracker(entry2)) return;
+        if (!IsVisibleInCheckTracker(entry2->GetRandomizerCheck())) return;
 
-        checksByArea.find(entry2.rcArea)->second.push_back(entry2);
+        if (entry2->GetRandomizerCheck() != RC_LINKS_POCKET) {
+            // RC_LINKS_POCKET is a special case because it's RCAREA is different depending on starting age.
+            checksByArea.find(entry2->GetArea())->second.push_back(entry2->GetRandomizerCheck());
+        }
         if (entry.status == RCSHOW_SAVED || entry.skipped) {
-            areaChecksGotten[entry2.rcArea]++;
+            areaChecksGotten[entry2->GetArea()]++;
         }
 
-        if (areaChecksGotten[entry2.rcArea] != 0 || RandomizerCheckObjects::AreaIsOverworld(entry2.rcArea)) {
-            areasSpoiled |= (1 << entry2.rcArea);
+        if (areaChecksGotten[entry2->GetArea()] != 0 || RandomizerCheckObjects::AreaIsOverworld(entry2->GetArea())) {
+            areasSpoiled |= (1 << entry2->GetArea());
         }
     });
     if (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_LINKS_POCKET) != RO_LINKS_POCKET_NOTHING && IS_RANDO) {
@@ -724,9 +725,8 @@ void LoadFile() {
                 startingArea = RCAREA_KOKIRI_FOREST;
                 break;
         }
-        RandomizerCheckObject linksPocket = { RC_LINKS_POCKET, RCVORMQ_BOTH, RCTYPE_LINKS_POCKET, startingArea, ACTOR_ID_MAX, SCENE_ID_MAX, 0x00, GI_NONE, false, "Link's Pocket", "Link's Pocket" };
         
-        checksByArea.find(startingArea)->second.push_back(linksPocket);
+        checksByArea.find(startingArea)->second.push_back(RC_LINKS_POCKET);
         areaChecksGotten[startingArea]++;
     }
 
@@ -756,7 +756,7 @@ void Teardown() {
 }
 
 void UpdateCheck(uint32_t check, RandomizerCheckTrackerData data) {
-    auto area = RandomizerCheckObjects::GetAllRCObjects().find(static_cast<RandomizerCheck>(check))->second.rcArea;
+    auto area = Rando::StaticData::GetLocation(static_cast<RandomizerCheck>(check))->GetArea();
     if (!gSaveContext.checkTrackerData[check].skipped && data.skipped) {
         areaChecksGotten[area]++;
     } else if (gSaveContext.checkTrackerData[check].skipped && !data.skipped) {
@@ -869,10 +869,10 @@ void CheckTrackerWindow::DrawElement() {
     std::string stemp;
     s32 areaMask = 1;
 
-    for (auto& [rcArea, objs] : checksByArea) {
+    for (auto& [rcArea, checks] : checksByArea) {
         RandomizerCheckArea thisArea = currentArea;
 
-        const int areaChecksTotal = static_cast<int>(objs.size());
+        const int areaChecksTotal = static_cast<int>(checks.size());
         thisAreaFullyChecked = (areaChecksGotten[rcArea] == areaChecksTotal);
         //Last Area needs to be cleaned up
         if (lastArea != RCAREA_INVALID && doDraw) {
@@ -942,9 +942,9 @@ void CheckTrackerWindow::DrawElement() {
                 ImGui::SetScrollHereY(0.0f);
                 doAreaScroll = false;
             }
-            for (auto rco : objs) {
-                if (doDraw && isThisAreaSpoiled && IsVisibleInCheckTracker(rco))
-                    DrawLocation(rco);
+            for (auto rc : checks) {
+                if (doDraw && isThisAreaSpoiled && IsVisibleInCheckTracker(rc))
+                    DrawLocation(rc);
             }
             if (doDraw)
                 ImGui::TreePop();
@@ -1052,6 +1052,8 @@ void LoadSettings() {
         OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_LINKS_POCKET) != RO_LINKS_POCKET_NOTHING
         :false;
     hideShopRightChecks = IS_RANDO ? CVarGetInteger("gCheckTrackerOptionHideRightShopChecks", 1) : false;
+    hideTriforceCompleted = IS_RANDO ? 
+        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIFORCE_HUNT) != RO_GENERIC_ON : false;
 
     if (IS_RANDO) {
         switch (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_TOKENS)) {
@@ -1093,58 +1095,62 @@ void LoadSettings() {
     }
 }
 
-bool IsVisibleInCheckTracker(RandomizerCheckObject rcObj) {
+bool IsVisibleInCheckTracker(RandomizerCheck rc) {
+    Rando::Location* loc = Rando::StaticData::GetLocation(rc);
     if (IS_RANDO) {
         return
-            (rcObj.rcArea != RCAREA_INVALID) &&         // don't show Invalid locations
-            (rcObj.rcType != RCTYPE_GOSSIP_STONE) &&    //TODO: Don't show hints until tracker supports them
-            (rcObj.rcType != RCTYPE_CHEST_GAME) &&      // don't show non final reward chest game checks until we support shuffling them
-            (rcObj.rc != RC_HC_ZELDAS_LETTER) &&        // don't show zeldas letter until we support shuffling it
-            (rcObj.rc != RC_LINKS_POCKET || showLinksPocket) &&
-            (!RandomizerCheckObjects::AreaIsDungeon(rcObj.rcArea) ||
-                rcObj.vOrMQ == RCVORMQ_BOTH ||
-                rcObj.vOrMQ == RCVORMQ_MQ && OTRGlobals::Instance->gRandomizer->masterQuestDungeons.contains(rcObj.sceneId) ||
-                rcObj.vOrMQ == RCVORMQ_VANILLA && !OTRGlobals::Instance->gRandomizer->masterQuestDungeons.contains(rcObj.sceneId)
+            (loc->GetArea() != RCAREA_INVALID) &&         // don't show Invalid locations
+            (loc->GetRCType() != RCTYPE_GOSSIP_STONE) &&    //TODO: Don't show hints until tracker supports them
+            (loc->GetRCType() != RCTYPE_CHEST_GAME) &&      // don't show non final reward chest game checks until we support shuffling them
+            (rc != RC_HC_ZELDAS_LETTER) &&        // don't show zeldas letter until we support shuffling it
+            (rc != RC_LINKS_POCKET || showLinksPocket) &&
+            (!RandomizerCheckObjects::AreaIsDungeon(loc->GetArea()) ||
+                loc->GetQuest() == RCQUEST_BOTH ||
+                loc->GetQuest() == RCQUEST_MQ && OTRGlobals::Instance->gRandomizer->masterQuestDungeons.contains(loc->GetScene()) ||
+                loc->GetQuest() == RCQUEST_VANILLA && !OTRGlobals::Instance->gRandomizer->masterQuestDungeons.contains(loc->GetScene())
                 ) &&
-            (rcObj.rcType != RCTYPE_SHOP || (showShops && (!hideShopRightChecks || hideShopRightChecks && rcObj.actorParams > 0x03))) &&
-            (rcObj.rcType != RCTYPE_SCRUB ||
+            (loc->GetRCType() != RCTYPE_SHOP || (showShops && (!hideShopRightChecks || hideShopRightChecks && loc->GetActorParams() > 0x03))) &&
+            (loc->GetRandomizerCheck() != RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS) &&
+            (rc != RC_TRIFORCE_COMPLETED || !hideTriforceCompleted) &&
+            (rc != RC_GIFT_FROM_SAGES || !IS_RANDO) &&
+            (loc->GetRCType() != RCTYPE_SCRUB ||
                 showScrubs ||
-                rcObj.rc == RC_LW_DEKU_SCRUB_NEAR_BRIDGE || // The 3 scrubs that are always randomized
-                rcObj.rc == RC_HF_DEKU_SCRUB_GROTTO ||
-                rcObj.rc == RC_LW_DEKU_SCRUB_GROTTO_FRONT
+                rc == RC_LW_DEKU_SCRUB_NEAR_BRIDGE || // The 3 scrubs that are always randomized
+                rc == RC_HF_DEKU_SCRUB_GROTTO ||
+                rc == RC_LW_DEKU_SCRUB_GROTTO_FRONT
                 ) &&
-            (rcObj.rcType != RCTYPE_MERCHANT || showMerchants) &&
-            (rcObj.rcType != RCTYPE_OCARINA || showOcarinas) &&
-            (rcObj.rcType != RCTYPE_SKULL_TOKEN ||
-                (showOverworldTokens && RandomizerCheckObjects::AreaIsOverworld(rcObj.rcArea)) ||
-                (showDungeonTokens && RandomizerCheckObjects::AreaIsDungeon(rcObj.rcArea))
+            (loc->GetRCType() != RCTYPE_MERCHANT || showMerchants) &&
+            (loc->GetRCType() != RCTYPE_OCARINA || showOcarinas) &&
+            (loc->GetRCType() != RCTYPE_SKULL_TOKEN ||
+                (showOverworldTokens && RandomizerCheckObjects::AreaIsOverworld(loc->GetArea())) ||
+                (showDungeonTokens && RandomizerCheckObjects::AreaIsDungeon(loc->GetArea()))
                 ) &&
-            (rcObj.rcType != RCTYPE_COW || showCows) &&
-            (rcObj.rcType != RCTYPE_ADULT_TRADE ||
+            (loc->GetRCType() != RCTYPE_COW || showCows) &&
+            (loc->GetRCType() != RCTYPE_ADULT_TRADE ||
                 showAdultTrade ||
-                rcObj.rc == RC_KAK_ANJU_AS_ADULT ||  // adult trade checks that are always shuffled
-                rcObj.rc == RC_DMT_TRADE_CLAIM_CHECK // even when shuffle adult trade is off
+                rc == RC_KAK_ANJU_AS_ADULT ||  // adult trade checks that are always shuffled
+                rc == RC_DMT_TRADE_CLAIM_CHECK // even when shuffle adult trade is off
                 ) &&
-            (rcObj.rc != RC_KF_KOKIRI_SWORD_CHEST || showKokiriSword) &&
-            (rcObj.rc != RC_ZR_MAGIC_BEAN_SALESMAN || showBeans) &&
-            (rcObj.rc != RC_HC_MALON_EGG || showWeirdEgg) &&
-            (rcObj.rcType != RCTYPE_FROG_SONG || showFrogSongRupees) &&
-            (rcObj.rcType != RCTYPE_MAP_COMPASS || showStartingMapsCompasses) &&
-            (rcObj.rcType != RCTYPE_SMALL_KEY || showKeysanity) &&
-            (rcObj.rcType != RCTYPE_BOSS_KEY || showBossKeysanity) &&
-            (rcObj.rcType != RCTYPE_GANON_BOSS_KEY || showGanonBossKey) &&
-            (rcObj.rc != RC_KAK_100_GOLD_SKULLTULA_REWARD || show100SkullReward) &&
-            (rcObj.rcType != RCTYPE_GF_KEY && rcObj.rc != RC_GF_GERUDO_MEMBERSHIP_CARD ||
-                (showGerudoCard && rcObj.rc == RC_GF_GERUDO_MEMBERSHIP_CARD) ||
-                (fortressNormal && showGerudoFortressKeys && rcObj.rcType == RCTYPE_GF_KEY) ||
-                (fortressFast && showGerudoFortressKeys && rcObj.rc == RC_GF_NORTH_F1_CARPENTER)
+            (rc != RC_KF_KOKIRI_SWORD_CHEST || showKokiriSword) &&
+            (rc != RC_ZR_MAGIC_BEAN_SALESMAN || showBeans) &&
+            (rc != RC_HC_MALON_EGG || showWeirdEgg) &&
+            (loc->GetRCType() != RCTYPE_FROG_SONG || showFrogSongRupees) &&
+            (loc->GetRCType() != RCTYPE_MAP_COMPASS || showStartingMapsCompasses) &&
+            (loc->GetRCType() != RCTYPE_SMALL_KEY || showKeysanity) &&
+            (loc->GetRCType() != RCTYPE_BOSS_KEY || showBossKeysanity) &&
+            (loc->GetRCType() != RCTYPE_GANON_BOSS_KEY || showGanonBossKey) &&
+            (rc != RC_KAK_100_GOLD_SKULLTULA_REWARD || show100SkullReward) &&
+            (loc->GetRCType() != RCTYPE_GF_KEY && rc != RC_GF_GERUDO_MEMBERSHIP_CARD ||
+                (showGerudoCard && rc == RC_GF_GERUDO_MEMBERSHIP_CARD) ||
+                (fortressNormal && showGerudoFortressKeys && loc->GetRCType() == RCTYPE_GF_KEY) ||
+                (fortressFast && showGerudoFortressKeys && rc == RC_GF_NORTH_F1_CARPENTER)
                 );
     }
-    else if (rcObj.vanillaCompletion) {
-        return (rcObj.vOrMQ == RCVORMQ_BOTH ||
-            rcObj.vOrMQ == RCVORMQ_MQ && OTRGlobals::Instance->gRandomizer->masterQuestDungeons.contains(rcObj.sceneId) ||
-            rcObj.vOrMQ == RCVORMQ_VANILLA && !OTRGlobals::Instance->gRandomizer->masterQuestDungeons.contains(rcObj.sceneId) ||
-            rcObj.rc == RC_GIFT_FROM_SAGES) && rcObj.rc != RC_LINKS_POCKET;
+    else if (loc->IsVanillaCompletion()) {
+        return (loc->GetQuest() == RCQUEST_BOTH ||
+            loc->GetQuest() == RCQUEST_MQ && OTRGlobals::Instance->gRandomizer->masterQuestDungeons.contains(loc->GetScene()) ||
+            loc->GetQuest() == RCQUEST_VANILLA && !OTRGlobals::Instance->gRandomizer->masterQuestDungeons.contains(loc->GetScene()) ||
+            rc == RC_GIFT_FROM_SAGES) && rc != RC_LINKS_POCKET;
     }
     return false;
 }
@@ -1183,9 +1189,11 @@ bool IsEoDCheck(RandomizerCheckType type) {
     return type == RCTYPE_BOSS_HEART_OR_OTHER_REWARD || type == RCTYPE_DUNGEON_REWARD;
 }
 
-bool CompareChecks(RandomizerCheckObject i, RandomizerCheckObject j) {
-    RandomizerCheckTrackerData iShow = gSaveContext.checkTrackerData[i.rc];
-    RandomizerCheckTrackerData jShow = gSaveContext.checkTrackerData[j.rc];
+bool CompareChecks(RandomizerCheck i, RandomizerCheck j) {
+    RandomizerCheckTrackerData iShow = gSaveContext.checkTrackerData[i];
+    RandomizerCheckTrackerData jShow = gSaveContext.checkTrackerData[j];
+    Rando::Location* x = Rando::StaticData::GetLocation(i);
+    Rando::Location* y = Rando::StaticData::GetLocation(j);
     bool iCollected = iShow.status == RCSHOW_COLLECTED || iShow.status == RCSHOW_SAVED;
     bool iSaved = iShow.status == RCSHOW_SAVED;
     bool jCollected = jShow.status == RCSHOW_COLLECTED || jShow.status == RCSHOW_SAVED;
@@ -1205,14 +1213,14 @@ bool CompareChecks(RandomizerCheckObject i, RandomizerCheckObject j) {
     else if (iShow.skipped && !jShow.skipped)
         return false;
 
-    if (!IsEoDCheck(i.rcType) && IsEoDCheck(j.rcType))
+    if (!IsEoDCheck(x->GetRCType()) && IsEoDCheck(y->GetRCType()))
         return true;
-    else if (IsEoDCheck(i.rcType) && !IsEoDCheck(j.rcType))
+    else if (IsEoDCheck(x->GetRCType()) && !IsEoDCheck(y->GetRCType()))
         return false;
 
-    if (i.rc < j.rc)
+    if (x->GetRandomizerCheck() < y->GetRandomizerCheck())
         return true;
-    else if (i.rc > j.rc)
+    else if (x->GetRandomizerCheck() > y->GetRandomizerCheck())
         return false;
 
     return false;
@@ -1222,68 +1230,81 @@ bool IsHeartPiece(GetItemID giid) {
     return giid == GI_HEART_PIECE || giid == GI_HEART_PIECE_WIN;
 }
 
-void DrawLocation(RandomizerCheckObject rcObj) {
+void DrawLocation(RandomizerCheck rc) {
     Color_RGBA8 mainColor; 
     Color_RGBA8 extraColor;
     std::string txt;
     bool showHidden = CVarGetInteger("gCheckTrackerOptionShowHidden", 0);
-    RandomizerCheckTrackerData checkData = gSaveContext.checkTrackerData[rcObj.rc];
+    Rando::Location* loc = Rando::StaticData::GetLocation(rc);
+    RandomizerCheckTrackerData checkData = gSaveContext.checkTrackerData[rc];
     RandomizerCheckStatus status = checkData.status;
     bool skipped = checkData.skipped;
     if (status == RCSHOW_COLLECTED) {
         if (!showHidden && CVarGetInteger("gCheckTrackerCollectedHide", 0))
             return;
-        mainColor = !IsHeartPiece(rcObj.ogItemId) && !IS_RANDO ? CVarGetColor("gCheckTrackerCollectedExtraColor", Color_Collected_Extra_Default) :
-                  CVarGetColor("gCheckTrackerCollectedMainColor", Color_Main_Default);
+        mainColor =
+            !IsHeartPiece((GetItemID)Rando::StaticData::RetrieveItem(loc->GetVanillaItem()).GetItemID()) && !IS_RANDO
+                ? CVarGetColor("gCheckTrackerCollectedExtraColor", Color_Collected_Extra_Default)
+                : CVarGetColor("gCheckTrackerCollectedMainColor", Color_Main_Default);
         extraColor = CVarGetColor("gCheckTrackerCollectedExtraColor", Color_Collected_Extra_Default);
     } else if (status == RCSHOW_SAVED) {
         if (!showHidden && CVarGetInteger("gCheckTrackerSavedHide", 0))
             return;
-         mainColor = !IsHeartPiece(rcObj.ogItemId) && !IS_RANDO ? CVarGetColor("gCheckTrackerSavedExtraColor", Color_Saved_Extra_Default) :
-                  CVarGetColor("gCheckTrackerSavedMainColor", Color_Main_Default);
+        mainColor =
+            !IsHeartPiece((GetItemID)Rando::StaticData::RetrieveItem(loc->GetVanillaItem()).GetItemID()) && !IS_RANDO
+                ? CVarGetColor("gCheckTrackerSavedExtraColor", Color_Saved_Extra_Default)
+                : CVarGetColor("gCheckTrackerSavedMainColor", Color_Main_Default);
         extraColor = CVarGetColor("gCheckTrackerSavedExtraColor", Color_Saved_Extra_Default);
     } else if (skipped) {
         if (!showHidden && CVarGetInteger("gCheckTrackerSkippedHide", 0))
             return;
-         mainColor = !IsHeartPiece(rcObj.ogItemId) && !IS_RANDO ? CVarGetColor("gCheckTrackerSkippedExtraColor", Color_Skipped_Extra_Default) :
-                  CVarGetColor("gCheckTrackerSkippedMainColor", Color_Main_Default);
+        mainColor =
+            !IsHeartPiece((GetItemID)Rando::StaticData::RetrieveItem(loc->GetVanillaItem()).GetItemID()) && !IS_RANDO
+                ? CVarGetColor("gCheckTrackerSkippedExtraColor", Color_Skipped_Extra_Default)
+                : CVarGetColor("gCheckTrackerSkippedMainColor", Color_Main_Default);
         extraColor = CVarGetColor("gCheckTrackerSkippedExtraColor", Color_Skipped_Extra_Default);
     } else if (status == RCSHOW_SEEN || status == RCSHOW_IDENTIFIED) {
         if (!showHidden && CVarGetInteger("gCheckTrackerSeenHide", 0))
             return;
-         mainColor = !IsHeartPiece(rcObj.ogItemId) && !IS_RANDO ? CVarGetColor("gCheckTrackerSeenExtraColor", Color_Seen_Extra_Default) :
-                  CVarGetColor("gCheckTrackerSeenMainColor", Color_Main_Default);
+        mainColor =
+            !IsHeartPiece((GetItemID)Rando::StaticData::RetrieveItem(loc->GetVanillaItem()).GetItemID()) && !IS_RANDO
+                ? CVarGetColor("gCheckTrackerSeenExtraColor", Color_Seen_Extra_Default)
+                : CVarGetColor("gCheckTrackerSeenMainColor", Color_Main_Default);
         extraColor = CVarGetColor("gCheckTrackerSeenExtraColor", Color_Seen_Extra_Default);
     } else if (status == RCSHOW_SCUMMED) {
         if (!showHidden && CVarGetInteger("gCheckTrackerKnownHide", 0))
             return;
-         mainColor = !IsHeartPiece(rcObj.ogItemId) && !IS_RANDO ? CVarGetColor("gCheckTrackerScummedExtraColor", Color_Scummed_Extra_Default) :
-                  CVarGetColor("gCheckTrackerScummedMainColor", Color_Main_Default);
+        mainColor =
+            !IsHeartPiece((GetItemID)Rando::StaticData::RetrieveItem(loc->GetVanillaItem()).GetItemID()) && !IS_RANDO
+                ? CVarGetColor("gCheckTrackerScummedExtraColor", Color_Scummed_Extra_Default)
+                : CVarGetColor("gCheckTrackerScummedMainColor", Color_Main_Default);
         extraColor = CVarGetColor("gCheckTrackerScummedExtraColor", Color_Scummed_Extra_Default);
     } else if (status == RCSHOW_UNCHECKED) {
         if (!showHidden && CVarGetInteger("gCheckTrackerUncheckedHide", 0))
             return;
-         mainColor = !IsHeartPiece(rcObj.ogItemId) && !IS_RANDO ? CVarGetColor("gCheckTrackerUncheckedExtraColor", Color_Unchecked_Extra_Default) :
-                  CVarGetColor("gCheckTrackerUncheckedMainColor", Color_Main_Default);
+        mainColor =
+            !IsHeartPiece((GetItemID)Rando::StaticData::RetrieveItem(loc->GetVanillaItem()).GetItemID()) && !IS_RANDO
+                ? CVarGetColor("gCheckTrackerUncheckedExtraColor", Color_Unchecked_Extra_Default)
+                : CVarGetColor("gCheckTrackerUncheckedMainColor", Color_Main_Default);
         extraColor = CVarGetColor("gCheckTrackerUncheckedExtraColor",  Color_Unchecked_Extra_Default);
     }
  
     //Main Text
-    txt = rcObj.rcShortName;
-    if (lastLocationChecked == rcObj.rc)
+    txt = loc->GetShortName();
+    if (lastLocationChecked == loc->GetRandomizerCheck())
         txt = "* " + txt;
  
     // Draw button - for Skipped/Seen/Scummed/Unchecked only
     if (status == RCSHOW_UNCHECKED || status == RCSHOW_SEEN || status == RCSHOW_IDENTIFIED || status == RCSHOW_SCUMMED || skipped) {
-        if (UIWidgets::StateButton(std::to_string(rcObj.rc).c_str(), skipped ? ICON_FA_PLUS : ICON_FA_TIMES)) {
+        if (UIWidgets::StateButton(std::to_string(rc).c_str(), skipped ? ICON_FA_PLUS : ICON_FA_TIMES)) {
             if (skipped) {
-                gSaveContext.checkTrackerData[rcObj.rc].skipped = false;
-                areaChecksGotten[rcObj.rcArea]--;
+                gSaveContext.checkTrackerData[rc].skipped = false;
+                areaChecksGotten[loc->GetArea()]--;
             } else {
-                gSaveContext.checkTrackerData[rcObj.rc].skipped = true;
-                areaChecksGotten[rcObj.rcArea]++;
+                gSaveContext.checkTrackerData[rc].skipped = true;
+                areaChecksGotten[loc->GetArea()]++;
             }
-            UpdateOrdering(rcObj.rcArea);
+            UpdateOrdering(loc->GetArea());
             UpdateInventoryChecks();
             SaveManager::Instance->SaveSection(gSaveContext.fileNum, sectionId, true);
         }
@@ -1308,13 +1329,13 @@ void DrawLocation(RandomizerCheckObject rcObj) {
             case RCSHOW_COLLECTED:
             case RCSHOW_SCUMMED:
                 if (IS_RANDO) {
-                    txt = OTRGlobals::Instance->gRandomizer->EnumToSpoilerfileGetName[gSaveContext.itemLocations[rcObj.rc].get.rgID][gSaveContext.language];
+                    txt = OTRGlobals::Instance->gRandomizer->EnumToSpoilerfileGetName[gSaveContext.itemLocations[rc].get.rgID][gSaveContext.language];
                 } else {
-                    if (IsHeartPiece(rcObj.ogItemId)) {
+                    if (IsHeartPiece((GetItemID)Rando::StaticData::RetrieveItem(loc->GetVanillaItem()).GetItemID())) {
                         if (gSaveContext.language == LANGUAGE_ENG || gSaveContext.language == LANGUAGE_GER) {
-                            txt = ItemFromGIID(rcObj.ogItemId).GetName().english;
+                            txt = Rando::StaticData::RetrieveItem(loc->GetVanillaItem()).GetName().english;
                         } else if (gSaveContext.language == LANGUAGE_FRA) {
-                            txt = ItemFromGIID(rcObj.ogItemId).GetName().french;
+                            txt = Rando::StaticData::RetrieveItem(loc->GetVanillaItem()).GetName().french;
                         }
                     }
                 }
@@ -1322,24 +1343,24 @@ void DrawLocation(RandomizerCheckObject rcObj) {
             case RCSHOW_IDENTIFIED:
             case RCSHOW_SEEN:
                 if (IS_RANDO) {
-                    if (gSaveContext.itemLocations[rcObj.rc].get.rgID == RG_ICE_TRAP) {
+                    if (gSaveContext.itemLocations[rc].get.rgID == RG_ICE_TRAP) {
                         if (status == RCSHOW_IDENTIFIED) {
-                            txt = gSaveContext.itemLocations[rcObj.rc].get.trickName;
+                            txt = gSaveContext.itemLocations[rc].get.trickName;
                         } else {
-                            txt = OTRGlobals::Instance->gRandomizer->EnumToSpoilerfileGetName[gSaveContext.itemLocations[rcObj.rc].get.fakeRgID][gSaveContext.language];
+                            txt = OTRGlobals::Instance->gRandomizer->EnumToSpoilerfileGetName[gSaveContext.itemLocations[rc].get.fakeRgID][gSaveContext.language];
                         }
                     } else {
-                        txt = OTRGlobals::Instance->gRandomizer->EnumToSpoilerfileGetName[gSaveContext.itemLocations[rcObj.rc].get.rgID][gSaveContext.language];
+                        txt = OTRGlobals::Instance->gRandomizer->EnumToSpoilerfileGetName[gSaveContext.itemLocations[rc].get.rgID][gSaveContext.language];
                     }
                     if (status == RCSHOW_IDENTIFIED) {
-                        txt += fmt::format(" - {}", gSaveContext.checkTrackerData[rcObj.rc].price);
+                        txt += fmt::format(" - {}", gSaveContext.checkTrackerData[rc].price);
                     }
                 } else {
-                    if (IsHeartPiece(rcObj.ogItemId)) {
+                    if (IsHeartPiece((GetItemID)Rando::StaticData::RetrieveItem(loc->GetVanillaItem()).GetItemID())) {
                         if (gSaveContext.language == LANGUAGE_ENG || gSaveContext.language == LANGUAGE_GER) {
-                            txt = ItemFromGIID(rcObj.ogItemId).GetName().english;
+                            txt = Rando::StaticData::RetrieveItem(loc->GetVanillaItem()).GetName().english;
                         } else if (gSaveContext.language == LANGUAGE_FRA) {
-                            txt = ItemFromGIID(rcObj.ogItemId).GetName().french;
+                            txt = Rando::StaticData::RetrieveItem(loc->GetVanillaItem()).GetName().french;
                         }
                     }
                 }
@@ -1534,7 +1555,7 @@ void CheckTrackerWindow::InitElement() {
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnTransitionEnd>(CheckTrackerTransition);
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnShopSlotChange>(CheckTrackerShopSlotChange);
 
-    LocationTable_Init();
+    //LocationTable_Init();
 }
 
 } // namespace CheckTracker
diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.h b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.h
index b2193f696..9c52df388 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.h
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.h
@@ -46,7 +46,7 @@ class CheckTrackerWindow : public LUS::GuiWindow {
 void DefaultCheckData(RandomizerCheck rc);
 void Teardown();
 void UpdateAllOrdering();
-bool IsVisibleInCheckTracker(RandomizerCheckObject rcObj);
+bool IsVisibleInCheckTracker(RandomizerCheck rc);
 void InitTrackerData(bool isDebug);
 void SetLastItemGetRC(RandomizerCheck rc);
 RandomizerCheckArea GetCheckArea();
diff --git a/soh/soh/Enhancements/randomizer/static_data.h b/soh/soh/Enhancements/randomizer/static_data.h
new file mode 100644
index 000000000..3c8328590
--- /dev/null
+++ b/soh/soh/Enhancements/randomizer/static_data.h
@@ -0,0 +1,37 @@
+#pragma once
+
+#include <array>
+#include "randomizerTypes.h"
+#include "item.h"
+#include "location.h"
+
+namespace Rando {
+/**
+ * @brief Singleton for storing and accessing static Randomizer-related data
+ * 
+ * The StaticData class is a class for storing and accessing static Randomizer-related data.
+ * Static Data, in this context, refers to data that is the same for every single randomizer seed,
+ * i.e. the item and location tables. This class is intended to be used as a Singleton.
+ */
+class StaticData {
+    private:
+      static std::array<Item, RG_MAX> itemTable;
+      static std::array<Location, RC_MAX> locationTable;
+
+    public:
+      static void InitItemTable();
+      static Item& RetrieveItem(const RandomizerGet rgid);
+      static Item& ItemFromGIID(const int giid);
+      static std::array<Item, RG_MAX>& GetItemTable();
+      static void InitLocationTable();
+      static Location* GetLocation(RandomizerCheck locKey);
+      static std::array<Rando::Location, RC_MAX>& GetLocationTable();
+      static std::vector<RandomizerCheck> overworldLocations;
+      static std::vector<RandomizerCheck> dungeonRewardLocations;
+      static std::vector<std::vector<RandomizerCheck>> shopLocationLists;
+      static std::vector<RandomizerCheck> scrubLocations;
+      static std::vector<RandomizerCheck> gossipStoneLocations;
+      StaticData();
+      ~StaticData();
+};
+}
\ No newline at end of file
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
index 8b56d352c..d32322d58 100644
--- a/soh/soh/OTRGlobals.cpp
+++ b/soh/soh/OTRGlobals.cpp
@@ -40,6 +40,7 @@
 #include "Enhancements/randomizer/randomizer_item_tracker.h"
 #include "Enhancements/randomizer/randomizer_check_tracker.h"
 #include "Enhancements/randomizer/3drando/random.hpp"
+#include "Enhancements/randomizer/static_data.h"
 #include "Enhancements/gameplaystats.h"
 #include "Enhancements/n64_weird_frame_data.inc"
 #include "frame_interpolation.h"
@@ -265,6 +266,7 @@ OTRGlobals::OTRGlobals() {
     context->GetResourceManager()->GetResourceLoader()->RegisterResourceFactory(LUS::ResourceType::SOH_Background, "Background", std::make_shared<LUS::BackgroundFactory>());
 
     gSaveStateMgr = std::make_shared<SaveStateMgr>();
+    gRandoContext = Rando::Context::CreateInstance();
     gRandomizer = std::make_shared<Randomizer>();
 
     hasMasterQuest = hasOriginal = false;
diff --git a/soh/soh/OTRGlobals.h b/soh/soh/OTRGlobals.h
index b24f59d8b..5bb88c11e 100644
--- a/soh/soh/OTRGlobals.h
+++ b/soh/soh/OTRGlobals.h
@@ -17,6 +17,7 @@
 #include "Enhancements/savestates.h"
 #include "Enhancements/randomizer/randomizer.h"
 #include <vector>
+#include "Enhancements/randomizer/context.h"
 
 const std::string customMessageTableID = "BaseGameOverrides";
 const std::string appShortName = "soh";
@@ -29,6 +30,7 @@ public:
     std::shared_ptr<LUS::Context> context;
     std::shared_ptr<SaveStateMgr> gSaveStateMgr;
     std::shared_ptr<Randomizer> gRandomizer;
+    std::shared_ptr<Rando::Context> gRandoContext;
 
     OTRGlobals();
     ~OTRGlobals();

From 4d31463044b7fe42168aa51cce662415422ab263 Mon Sep 17 00:00:00 2001
From: Ralphie Morell <stratomaster64@gmail.com>
Date: Thu, 19 Oct 2023 21:21:00 -0400
Subject: [PATCH 007/230] merge pt 2

---
 .../Enhancements/randomizer/3drando/logic.cpp | 22 +++++++++----------
 .../Enhancements/randomizer/3drando/logic.hpp |  1 +
 .../Enhancements/randomizer/randomizerTypes.h |  9 ++++++++
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/logic.cpp b/soh/soh/Enhancements/randomizer/3drando/logic.cpp
index e6af19bd8..33032a62e 100644
--- a/soh/soh/Enhancements/randomizer/3drando/logic.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/logic.cpp
@@ -474,22 +474,22 @@ namespace Logic {
            (age == HasProjectileAge::Either && (Slingshot || Boomerang   ||  Hookshot || Bow));
   }
 
-  bool HasBossSoul(uint32_t itemName) {
+  bool HasBossSoul(RandomizerGet itemName) {
     if (ShuffleBossSouls.Is(BOSSSOULS_OFF)) {
       return true;
     }
-    if (ShuffleBossSouls.IsNot(BOSSSOULS_ON_PLUS_GANON) && itemName == GANON_BOSS_SOUL) {
+    if (ShuffleBossSouls.IsNot(BOSSSOULS_ON_PLUS_GANON) && itemName == RG_GANON_SOUL) {
       return true;
     }
-    return (itemName == GOHMA_BOSS_SOUL && CanSummonGohma)         ||
-    (itemName == KING_DODONGO_BOSS_SOUL && CanSummonKingDodongo)   ||
-    (itemName == BARINADE_BOSS_SOUL && CanSummonBarinade)          ||
-    (itemName == PHANTOM_GANON_BOSS_SOUL && CanSummonPhantomGanon) ||
-    (itemName == VOLVAGIA_BOSS_SOUL && CanSummonVolvagia)          ||
-    (itemName == MORPHA_BOSS_SOUL && CanSummonMorpha)              ||
-    (itemName == BONGO_BONGO_BOSS_SOUL && CanSummonBongoBongo)     ||
-    (itemName == TWINROVA_BOSS_SOUL && CanSummonTwinrova)          ||
-    (ShuffleBossSouls.Is(BOSSSOULS_ON_PLUS_GANON) && (itemName == GANON_BOSS_SOUL && CanSummonGanon));
+    return (itemName == RG_GOHMA_SOUL && CanSummonGohma)         ||
+    (itemName == RG_KING_DODONGO_SOUL && CanSummonKingDodongo)   ||
+    (itemName == RG_BARINADE_SOUL && CanSummonBarinade)          ||
+    (itemName == RG_PHANTOM_GANON_SOUL && CanSummonPhantomGanon) ||
+    (itemName == RG_VOLVAGIA_SOUL && CanSummonVolvagia)          ||
+    (itemName == RG_MORPHA_SOUL && CanSummonMorpha)              ||
+    (itemName == RG_MORPHA_SOUL && CanSummonBongoBongo)     ||
+    (itemName == RG_TWINROVA_SOUL && CanSummonTwinrova)          ||
+    (ShuffleBossSouls.Is(BOSSSOULS_ON_PLUS_GANON) && (itemName == RG_GANON_SOUL && CanSummonGanon));
 
   }
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/logic.hpp b/soh/soh/Enhancements/randomizer/3drando/logic.hpp
index 820a5ccf3..fc934ddd5 100644
--- a/soh/soh/Enhancements/randomizer/3drando/logic.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/logic.hpp
@@ -377,6 +377,7 @@ void UpdateHelpers();
 bool CanPlay(bool song);
 bool CanUse(RandomizerGet itemName);
 bool HasProjectile(HasProjectileAge age);
+bool HasBossSoul(RandomizerGet itemName);
 bool SmallKeys(RandomizerRegion dungeon, uint8_t requiredAmount);
 bool SmallKeys(RandomizerRegion dungeon, uint8_t requiredAmountGlitchless, uint8_t requiredAmountGlitched);
 bool CanDoGlitch(GlitchType glitch);
diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h
index b2acb97b2..86485b5e4 100644
--- a/soh/soh/Enhancements/randomizer/randomizerTypes.h
+++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@@ -3009,6 +3009,15 @@ typedef enum {
     RHT_DEKU_STICK_CAPACITY_20,
     RHT_DEKU_STICK_CAPACITY_30,
     RHT_TRIFORCE_PIECE,
+    RHT_GOHMA_SOUL,
+    RHT_KING_DODONGO_SOUL,
+    RHT_BARINADE_SOUL,
+    RHT_PHANTOM_GANON_SOUL,
+    RHT_VOLVAGIA_SOUL,
+    RHT_MORPHA_SOUL,
+    RHT_BONGO_BONGO_SOUL,
+    RHT_TWINROVA_SOUL,
+    RHT_GANON_SOUL,
     RHT_EPONA,
     // Entrances
     RHT_DESERT_COLOSSUS_TO_COLOSSUS_GROTTO,

From f41bbeab06eb6604ff687e0b30b9e82bad4a7ede Mon Sep 17 00:00:00 2001
From: Ralphie Morell <stratomaster64@gmail.com>
Date: Thu, 19 Oct 2023 23:14:51 -0400
Subject: [PATCH 008/230] actually get it running

---
 .../randomizer/3drando/item_list.cpp          | 323 ------------------
 .../randomizer/3drando/item_pool.cpp          |  18 +-
 .../Enhancements/randomizer/3drando/logic.cpp |   5 +-
 3 files changed, 10 insertions(+), 336 deletions(-)
 delete mode 100644 soh/soh/Enhancements/randomizer/3drando/item_list.cpp

diff --git a/soh/soh/Enhancements/randomizer/3drando/item_list.cpp b/soh/soh/Enhancements/randomizer/3drando/item_list.cpp
deleted file mode 100644
index b066a8933..000000000
--- a/soh/soh/Enhancements/randomizer/3drando/item_list.cpp
+++ /dev/null
@@ -1,323 +0,0 @@
-#include "item_list.hpp"
-
-#include "logic.hpp"
-#include <array>
-#include "z64item.h"
-#include "../randomizerTypes.h"
-
-using namespace Logic;
-
-static std::array<Item, KEY_ENUM_MAX> itemTable;
-
-void ItemTable_Init() {                              // RandomizerGet                              English name                       French                              Spanish                                     Item Type       getItemID       advancement    logic           hint key
-    itemTable[NONE]                              = Item(RG_NONE,                              Text{"No Item",                         "Rien",                             "Sin Objeto"},                              ITEMTYPE_EVENT, GI_RUPEE_GREEN,    false,      &noVariable,    NONE);
-    itemTable[KOKIRI_SWORD]                      = Item(RG_KOKIRI_SWORD,                      Text{"Kokiri Sword",                    "Épée Kokiri",                      "Espada Kokiri"},                           ITEMTYPE_ITEM,  GI_SWORD_KOKIRI,   true,       &KokiriSword,   KOKIRI_SWORD);
-  //[MASTER_SWORD]
-    itemTable[GIANTS_KNIFE]                      = Item(RG_GIANTS_KNIFE,                      Text{"Giant's Knife",                   "Lame des Géants",                  "Espada de Biggoron"},                      ITEMTYPE_ITEM,  GI_SWORD_KNIFE,    false,      &noVariable,    GIANTS_KNIFE);
-    itemTable[BIGGORON_SWORD]                    = Item(RG_BIGGORON_SWORD,                    Text{"Biggoron's Sword",                "Épée de Biggoron",                 "Espada de Biggoron"},                      ITEMTYPE_ITEM,  GI_SWORD_BGS,      true,       &BiggoronSword, BIGGORON_SWORD);
-    itemTable[DEKU_SHIELD]                       = Item(RG_DEKU_SHIELD,                       Text{"Deku Shield",                     "Bouclier Mojo",                    "Escudo deku"},                             ITEMTYPE_ITEM,  GI_SHIELD_DEKU,    false,      &noVariable,    DEKU_SHIELD);
-    itemTable[HYLIAN_SHIELD]                     = Item(RG_HYLIAN_SHIELD,                     Text{"Hylian Shield",                   "Bouclier Hylien",                  "Escudo hyliano"},                          ITEMTYPE_ITEM,  GI_SHIELD_HYLIAN,  false,      &noVariable,    HYLIAN_SHIELD);
-    itemTable[MIRROR_SHIELD]                     = Item(RG_MIRROR_SHIELD,                     Text{"Mirror Shield",                   "Bouclier Miroir",                  "Escudo espejo"},                           ITEMTYPE_ITEM,  GI_SHIELD_MIRROR,  true,       &MirrorShield,  MIRROR_SHIELD);
-    itemTable[GORON_TUNIC]                       = Item(RG_GORON_TUNIC,                       Text{"Goron Tunic",                     "Tunique Goron",                    "Sayo goron"},                              ITEMTYPE_ITEM,  GI_TUNIC_GORON,    true,       &GoronTunic,    GORON_TUNIC);
-    itemTable[ZORA_TUNIC]                        = Item(RG_ZORA_TUNIC,                        Text{"Zora Tunic",                      "Tunique Zora",                     "Sayo zora"},                               ITEMTYPE_ITEM,  GI_TUNIC_ZORA,     true,       &ZoraTunic,     ZORA_TUNIC);
-    itemTable[IRON_BOOTS]                        = Item(RG_IRON_BOOTS,                        Text{"Iron Boots",                      "Bottes de plomb",                  "Botas de hierro"},                         ITEMTYPE_ITEM,  GI_BOOTS_IRON,     true,       &IronBoots,     IRON_BOOTS);
-    itemTable[HOVER_BOOTS]                       = Item(RG_HOVER_BOOTS,                       Text{"Hover Boots",                     "Bottes des airs",                  "Botas voladoras"},                         ITEMTYPE_ITEM,  GI_BOOTS_HOVER,    true,       &HoverBoots,    HOVER_BOOTS);
-
-
-    itemTable[BOOMERANG]                         = Item(RG_BOOMERANG,                         Text{"Boomerang",                       "Boomerang",                        "Búmeran"},                                 ITEMTYPE_ITEM,  GI_BOOMERANG,      true,       &Boomerang,     BOOMERANG);
-    itemTable[LENS_OF_TRUTH]                     = Item(RG_LENS_OF_TRUTH,                     Text{"Lens of Truth",                   "Monocle de Vérité",                "Lupa de la Verdad"},                       ITEMTYPE_ITEM,  GI_LENS,           true,       &LensOfTruth,   LENS_OF_TRUTH);
-    itemTable[MEGATON_HAMMER]                    = Item(RG_MEGATON_HAMMER,                    Text{"Megaton Hammer",                  "Masse des Titans",                 "Martillo Megatón"},                        ITEMTYPE_ITEM,  GI_HAMMER,         true,       &Hammer,        MEGATON_HAMMER);
-    itemTable[STONE_OF_AGONY]                    = Item(RG_STONE_OF_AGONY,                    Text{"Stone of Agony",                  "Pierre de Souffrance",             "Piedra de la Agonía"},                     ITEMTYPE_ITEM,  GI_STONE_OF_AGONY, true,       &ShardOfAgony,  STONE_OF_AGONY);
-    itemTable[DINS_FIRE]                         = Item(RG_DINS_FIRE,                         Text{"Din's Fire",                      "Feu de Din",                       "Fuego de Din"},                            ITEMTYPE_ITEM,  GI_DINS_FIRE,      true,       &DinsFire,      DINS_FIRE);
-    itemTable[FARORES_WIND]                      = Item(RG_FARORES_WIND,                      Text{"Farore's Wind",                   "Vent de Farore",                   "Viento de Farore"},                        ITEMTYPE_ITEM,  GI_FARORES_WIND,   true,       &FaroresWind,   FARORES_WIND);
-    itemTable[NAYRUS_LOVE]                       = Item(RG_NAYRUS_LOVE,                       Text{"Nayru's Love",                    "Amour de Nayru",                   "Amor de Nayru"},                           ITEMTYPE_ITEM,  GI_NAYRUS_LOVE,    true,       &NayrusLove,    NAYRUS_LOVE);
-    itemTable[FIRE_ARROWS]                       = Item(RG_FIRE_ARROWS,                       Text{"Fire Arrow",                      "Flèche de Feu",                    "Flecha de fuego"},                         ITEMTYPE_ITEM,  GI_ARROW_FIRE,     true,       &FireArrows,    FIRE_ARROWS);
-    itemTable[ICE_ARROWS]                        = Item(RG_ICE_ARROWS,                        Text{"Ice Arrow",                       "Flèche de Glace",                  "Flecha de hielo"},                         ITEMTYPE_ITEM,  GI_ARROW_ICE,      true,       &IceArrows,     ICE_ARROWS);
-    itemTable[LIGHT_ARROWS]                      = Item(RG_LIGHT_ARROWS,                      Text{"Light Arrow",                     "Flèche de Lumière",                "Flecha de luz"},                           ITEMTYPE_ITEM,  GI_ARROW_LIGHT,    true,       &LightArrows,   LIGHT_ARROWS);
-    itemTable[GERUDO_MEMBERSHIP_CARD]            = Item(RG_GERUDO_MEMBERSHIP_CARD,            Text{"Gerudo Membership Card",          "Carte Gerudo",                     "Pase de socio gerudo"},                    ITEMTYPE_ITEM,  GI_GERUDO_CARD,    true,       &GerudoToken,   GERUDO_MEMBERSHIP_CARD);
-    itemTable[MAGIC_BEAN]                        = Item(RG_MAGIC_BEAN,                        Text{"Magic Bean",                      "Haricots Magiques",                "Habichuelas mágicas"},                     ITEMTYPE_ITEM,  GI_BEAN,           true,       &MagicBean,     MAGIC_BEAN);
-    itemTable[MAGIC_BEAN_PACK]                   = Item(RG_MAGIC_BEAN_PACK,                   Text{"Magic Bean Pack",                 "Paquet de Haricots Magiques",      "Lote de habichuelas mágicas"},             ITEMTYPE_ITEM,  0xC9,              true,       &MagicBeanPack, MAGIC_BEAN_PACK);
-    itemTable[DOUBLE_DEFENSE]                    = Item(RG_DOUBLE_DEFENSE,                    Text{"Double Defense",                  "Double Défence",                   "Doble poder defensivo"},                   ITEMTYPE_ITEM,  0xB8,              true,       &DoubleDefense, DOUBLE_DEFENSE);
-
-    itemTable[WEIRD_EGG]                         = Item(RG_WEIRD_EGG,                         Text{"Weird Egg",                       "Oeuf Curieux",                     "Huevo extraño"},                           ITEMTYPE_ITEM,  GI_WEIRD_EGG,      true,       &WeirdEgg,      WEIRD_EGG);
-//  itemTable[CUCCO]                             = Item(RG_CUCCO,                             Text{"Cucco",                           "Cocotte",                          "Cuco"},                                    ITEMTYPE_ITEM,  GI_CUCCO,          true,       &Cucco,         CUCCO);
-    itemTable[ZELDAS_LETTER]                     = Item(RG_ZELDAS_LETTER,                     Text{"Zelda's Letter",                  "Lettre de Zelda",                  "Carta de Zelda"},                          ITEMTYPE_ITEM,  GI_LETTER_ZELDA,   true,       &ZeldasLetter,  ZELDAS_LETTER);
-//  itemTable[KEATON_MASK]                       = Item(RG_KEATON_MASK,                       Text{"Keaton Mask",                     "Masque du Renard",                 "Careta de Keaton"},                        ITEMTYPE_ITEM,  GI_MASK_KEATON,    true,       &KeatonMask,    KEATON_MASK);
-//  itemTable[SKULL_MASK]                        = Item(RG_SKULL_MASK,                        Text{"Skull Mask",                      "Masque de Mort",                   "Máscara de calavera"},                     ITEMTYPE_ITEM,  GI_MASK_SKULL,     true,       &SkullMask,     SKULL_MASK);
-//  itemTable[SPOOKY_MASK]                       = Item(RG_SPOOKY_MASK,                       Text{"Spooky Mask",                     "Masque d'Effroi",                  "Máscara tenebrosa"},                       ITEMTYPE_ITEM,  GI_MASK_SPOOKY,    true,       &SpookyMask,    SPOOKY_MASK);
-//  itemTable[BUNNY_HOOD]                        = Item(RG_BUNNY_HOOD,                        Text{"Bunny Hood",                      "Masque du Lapin",                  "Capucha de conejo"},                       ITEMTYPE_ITEM,  GI_MASK_BUNNY,     true,       &BunnyHood,     BUNNY_HOOD);
-//  itemTable[GORON_MASK]                        = Item(RG_GORON_MASK,                        Text{"Goron Mask",                      "Masque de Goron",                  "Máscara Goron"},                           ITEMTYPE_ITEM,  GI_MASK_GORON,     true,       &GoronMask,     GORON_MASK);
-//  itemTable[ZORA_MASK]                         = Item(RG_ZORA_MASK,                         Text{"Zora Mask",                       "Masque de Zora",                   "Máscara Zora"},                            ITEMTYPE_ITEM,  GI_MASK_ZORA,      true,       &ZoraMask,      ZORA_MASK);
-//  itemTable[GERUDO_MASK]                       = Item(RG_GERUDO_MASK,                       Text{"Gerudo Mask",                     "Masque de Gerudo",                 "Máscara Gerudo"},                          ITEMTYPE_ITEM,  GI_MASK_GERUDO,    true,       &GerudoMask,    GERUDO_MASK);
-//  itemTable[MASK_OF_TRUTH]                     = Item(RG_MASK_OF_TRUTH,                     Text{"Mask of Truth",                   "Masque de Vérité",                 "Máscara de la Verdad"},                    ITEMTYPE_ITEM,  GI_MASK_MASK,      true,       &MaskofTruth,   MASK_OF_TRUTH);
-    itemTable[POCKET_EGG]                        = Item(RG_POCKET_EGG,                        Text{"Pocket Egg",                      "Oeuf de poche",                    "Huevo de bolsillo"},                       ITEMTYPE_ITEM,  GI_POCKET_EGG,     true,       &PocketEgg,     POCKET_EGG);
-//  itemTable[POCKET_CUCCO]                      = Item(RG_POCKET_CUCCO,                      Text{"Pocket Cucco",                    "Cocotte de poche",                 "Cuco de bolsillo"},                        ITEMTYPE_ITEM,  GI_POCKET_CUCCO,   true,       &PocketCucco,   POCKET_CUCCO);
-    itemTable[COJIRO]                            = Item(RG_COJIRO,                            Text{"Cojiro",                          "P'tit Poulet",                     "Cojiro"},                                  ITEMTYPE_ITEM,  GI_COJIRO,         true,       &Cojiro,        COJIRO);
-    itemTable[ODD_MUSHROOM]                      = Item(RG_ODD_MUSHROOM,                      Text{"Odd Mushroom",                    "Champignon Suspect",               "Champiñón extraño"},                       ITEMTYPE_ITEM,  GI_ODD_MUSHROOM,   true,       &OddMushroom,   ODD_MUSHROOM);
-    itemTable[ODD_POTION]                        = Item(RG_ODD_POTION,                        Text{"Odd Potion",                      "Mixture Suspecte",                 "Medicina rara"},                           ITEMTYPE_ITEM,  GI_ODD_POTION,     true,       &OddPoultice,   ODD_POTION);
-    itemTable[POACHERS_SAW]                      = Item(RG_POACHERS_SAW,                      Text{"Poacher's Saw",                   "Scie du Chasseur",                 "Sierra del furtivo"},                      ITEMTYPE_ITEM,  GI_SAW,            true,       &PoachersSaw,   POACHERS_SAW);
-    itemTable[BROKEN_SWORD]                      = Item(RG_BROKEN_SWORD,                      Text{"Broken Goron's Sword",            "Épée Brisée de Goron",             "Espada goron rota"},                       ITEMTYPE_ITEM,  GI_SWORD_BROKEN,   true,       &BrokenSword,   BROKEN_SWORD);
-    itemTable[PRESCRIPTION]                      = Item(RG_PRESCRIPTION,                      Text{"Prescription",                    "Ordonnance",                       "Receta"},                                  ITEMTYPE_ITEM,  GI_PRESCRIPTION,   true,       &Prescription,  PRESCRIPTION);
-    itemTable[EYEBALL_FROG]                      = Item(RG_EYEBALL_FROG,                      Text{"Eyeball Frog",                    "Crapaud-qui-louche",               "Rana de ojos saltones"},                   ITEMTYPE_ITEM,  GI_FROG,           true,       &EyeballFrog,   EYEBALL_FROG);
-    itemTable[EYEDROPS]                          = Item(RG_EYEDROPS,                          Text{"World's Finest Eyedrops",         "Super Gouttes",                    "Supergotas oculares"},                     ITEMTYPE_ITEM,  GI_EYEDROPS,       true,       &Eyedrops,      EYEDROPS);
-    itemTable[CLAIM_CHECK]                       = Item(RG_CLAIM_CHECK,                       Text{"Claim Check",                     "Certificat",                       "Recibo"},                                  ITEMTYPE_ITEM,  GI_CLAIM_CHECK,    true,       &ClaimCheck,    CLAIM_CHECK);
-
-    itemTable[GOLD_SKULLTULA_TOKEN]              = Item(RG_GOLD_SKULLTULA_TOKEN,              Text{"Gold Skulltula Token",            "Symbole de Skulltula d'Or",        "Símbolo de skulltula dorada"},             ITEMTYPE_TOKEN, GI_SKULL_TOKEN,    true,       &GoldSkulltulaTokens, GOLD_SKULLTULA_TOKEN);
-
-    //Progression Items
-    itemTable[PROGRESSIVE_HOOKSHOT]              = Item(RG_PROGRESSIVE_HOOKSHOT,              Text{"Progressive Hookshot",            "Grappin (prog.)",                  "Gancho progresivo"},                       ITEMTYPE_ITEM,     0x80, true,  &ProgressiveHookshot,   PROGRESSIVE_HOOKSHOT);
-    itemTable[PROGRESSIVE_STRENGTH]              = Item(RG_PROGRESSIVE_STRENGTH,              Text{"Strength Upgrade",                "Amélioration de Force (prog.)",    "Fuerza progresiva"},                       ITEMTYPE_ITEM,     0x81, true,  &ProgressiveStrength,   PROGRESSIVE_STRENGTH);
-    itemTable[PROGRESSIVE_BOMB_BAG]              = Item(RG_PROGRESSIVE_BOMB_BAG,              Text{"Progressive Bomb Bag",            "Sac de Bombes (prog.)",            "Saco de bombas progresivo"},               ITEMTYPE_ITEM,     0x82, true,  &ProgressiveBombBag,    PROGRESSIVE_BOMB_BAG);
-    itemTable[PROGRESSIVE_BOW]                   = Item(RG_PROGRESSIVE_BOW,                   Text{"Progressive Bow",                 "Arc (prog.)",                      "Arco progresivo"},                         ITEMTYPE_ITEM,     0x83, true,  &ProgressiveBow,        PROGRESSIVE_BOW);
-    itemTable[PROGRESSIVE_SLINGSHOT]             = Item(RG_PROGRESSIVE_SLINGSHOT,             Text{"Progressive Slingshot",           "Lance-Pierre (prog.)",             "Resortera progresiva"},                    ITEMTYPE_ITEM,     0x84, true,  &ProgressiveBulletBag,  PROGRESSIVE_SLINGSHOT);
-    itemTable[PROGRESSIVE_WALLET]                = Item(RG_PROGRESSIVE_WALLET,                Text{"Progressive Wallet",              "Bourse (prog.)",                   "Bolsa de rupias progresiva"},              ITEMTYPE_ITEM,     0x85, true,  &ProgressiveWallet,     PROGRESSIVE_WALLET);
-    itemTable[PROGRESSIVE_SCALE]                 = Item(RG_PROGRESSIVE_SCALE,                 Text{"Progressive Scale",               "Écaille (prog.)",                  "Escama progresiva"},                       ITEMTYPE_ITEM,     0x86, true,  &ProgressiveScale,      PROGRESSIVE_SCALE);
-    itemTable[PROGRESSIVE_NUT_UPGRADE]           = Item(RG_PROGRESSIVE_NUT_UPGRADE,           Text{"Progressive Nut Capacity",        "Capacité de Noix (prog.)",         "Capacidad de nueces deku progresiva"},     ITEMTYPE_ITEM,     0x87, false, &noVariable,            PROGRESSIVE_NUT_UPGRADE);
-    itemTable[PROGRESSIVE_STICK_UPGRADE]         = Item(RG_PROGRESSIVE_STICK_UPGRADE,         Text{"Progressive Stick Capacity",      "Capacité de Bâtons (prog.)",       "Capacidad de palos deku progresiva"},      ITEMTYPE_ITEM,     0x88, false, &noVariable,            PROGRESSIVE_STICK_UPGRADE);
-    itemTable[PROGRESSIVE_BOMBCHUS]              = Item(RG_PROGRESSIVE_BOMBCHUS,              Text{"Progressive Bombchu",             "Missiles (prog.)",                 "Bombchus progresivos"},                    ITEMTYPE_ITEM,     0x89, true,  &Bombchus,              PROGRESSIVE_BOMBCHUS);
-    itemTable[PROGRESSIVE_MAGIC_METER]           = Item(RG_PROGRESSIVE_MAGIC_METER,           Text{"Progressive Magic Meter",         "Jauge de Magie (prog.)",           "Poder mágico progresivo"},                 ITEMTYPE_ITEM,     0x8A, true,  &ProgressiveMagic,      PROGRESSIVE_MAGIC_METER);
-    itemTable[PROGRESSIVE_OCARINA]               = Item(RG_PROGRESSIVE_OCARINA,               Text{"Progressive Ocarina",             "Ocarina (prog.)",                  "Ocarina progresiva"},                      ITEMTYPE_ITEM,     0x8B, true,  &ProgressiveOcarina,    PROGRESSIVE_OCARINA);
-    itemTable[PROGRESSIVE_GORONSWORD]            = Item(RG_PROGRESSIVE_GORONSWORD,            Text{"Progressive Goron Sword",         "Épée Goron (prog.)",               "Espada Goron progresiva"},                 ITEMTYPE_ITEM,     0xD4, true,  &ProgressiveGiantKnife, PROGRESSIVE_GORONSWORD);
-
-    //Bottles
-    itemTable[EMPTY_BOTTLE]                      = Item(RG_EMPTY_BOTTLE,                      Text{"Empty Bottle",                    "Bouteille Vide",                   "Botella vacía"},                           ITEMTYPE_ITEM,     0x0F, true, &Bottles, EMPTY_BOTTLE);
-    itemTable[BOTTLE_WITH_MILK]                  = Item(RG_BOTTLE_WITH_MILK,                  Text{"Bottle with Milk",                "Bouteille avec du Lait",           "Botella de leche Lon Lon"},                ITEMTYPE_ITEM,     0x14, true, &Bottles, BOTTLE_WITH_MILK);
-    itemTable[BOTTLE_WITH_RED_POTION]            = Item(RG_BOTTLE_WITH_RED_POTION,            Text{"Bottle with Red Potion",          "Bouteille avec une Potion Rouge",  "Botella de poción roja"},                  ITEMTYPE_ITEM,     0x8C, true, &Bottles, BOTTLE_WITH_RED_POTION);
-    itemTable[BOTTLE_WITH_GREEN_POTION]          = Item(RG_BOTTLE_WITH_GREEN_POTION,          Text{"Bottle with Green Potion",        "Bouteille avec une Potion Verte",  "Botella de poción verde"},                 ITEMTYPE_ITEM,     0x8D, true, &Bottles, BOTTLE_WITH_GREEN_POTION);
-    itemTable[BOTTLE_WITH_BLUE_POTION]           = Item(RG_BOTTLE_WITH_BLUE_POTION,           Text{"Bottle with Blue Potion",         "Bouteille avec une Potion Bleue",  "Botella de poción azul"},                  ITEMTYPE_ITEM,     0x8E, true, &Bottles, BOTTLE_WITH_BLUE_POTION);
-    itemTable[BOTTLE_WITH_FAIRY]                 = Item(RG_BOTTLE_WITH_FAIRY,                 Text{"Bottle with Fairy",               "Bouteille avec une Fée",           "Hada en una botella"},                     ITEMTYPE_ITEM,     0x8F, true, &Bottles, BOTTLE_WITH_FAIRY);
-    itemTable[BOTTLE_WITH_FISH]                  = Item(RG_BOTTLE_WITH_FISH,                  Text{"Bottle with Fish",                "Bouteille avec un Poisson",        "Pez en una botella"},                      ITEMTYPE_ITEM,     0x90, true, &Bottles, BOTTLE_WITH_FISH);
-    itemTable[BOTTLE_WITH_BLUE_FIRE]             = Item(RG_BOTTLE_WITH_BLUE_FIRE,             Text{"Bottle with Blue Fire",           "Bouteille avec une Flamme Bleue",  "Botella de fuego azul"},                   ITEMTYPE_ITEM,     0x91, true, &Bottles, BOTTLE_WITH_BLUE_FIRE);
-    itemTable[BOTTLE_WITH_BUGS]                  = Item(RG_BOTTLE_WITH_BUGS,                  Text{"Bottle with Bugs",                "Bouteille avec des Insectes",      "Insecto en una botella"},                  ITEMTYPE_ITEM,     0x92, true, &Bottles, BOTTLE_WITH_BUGS);
-    itemTable[BOTTLE_WITH_POE]                   = Item(RG_BOTTLE_WITH_POE,                   Text{"Bottle with Poe",                 "Bouteille avec un Esprit",         "Poe en una botella"},                      ITEMTYPE_ITEM,     0x94, true, &Bottles, BOTTLE_WITH_POE);
-
-    //Special bottles that can't immediately dump contents
-    itemTable[RUTOS_LETTER]                      = Item(RG_RUTOS_LETTER,                      Text{"Bottle with Ruto's Letter",       "Bouteille avec la Lettre de Ruto", "Carta de Ruto"},                           ITEMTYPE_ITEM,     0x15, true, &RutosLetter,      RUTOS_LETTER);
-    itemTable[BOTTLE_WITH_BIG_POE]               = Item(RG_BOTTLE_WITH_BIG_POE,               Text{"Bottle with Big Poe",             "Bouteille avec une Âme",           "Gran Poe en una botella"},                 ITEMTYPE_ITEM,     0x93, true, &BottleWithBigPoe, BOTTLE_WITH_BIG_POE);
-
-    //Songs
-    itemTable[ZELDAS_LULLABY]                    = Item(RG_ZELDAS_LULLABY,                    Text{"Zelda's Lullaby",                 "Berceuse de Zelda",                "Nana de Zelda"},                           ITEMTYPE_SONG,     0xC1, true, &ZeldasLullaby,    ZELDAS_LULLABY);
-    itemTable[EPONAS_SONG]                       = Item(RG_EPONAS_SONG,                       Text{"Epona's Song",                    "Chant d'Épona",                    "Canción de Epona"},                        ITEMTYPE_SONG,     0xC2, true, &EponasSong,       EPONAS_SONG);
-    itemTable[SARIAS_SONG]                       = Item(RG_SARIAS_SONG,                       Text{"Saria's Song",                    "Chant de Saria",                   "Canción de Saria"},                        ITEMTYPE_SONG,     0xC3, true, &SariasSong,       SARIAS_SONG);
-    itemTable[SUNS_SONG]                         = Item(RG_SUNS_SONG,                         Text{"Sun's Song",                      "Chant du Soleil",                  "Canción del Sol"},                         ITEMTYPE_SONG,     0xC4, true, &SunsSong,         SUNS_SONG);
-    itemTable[SONG_OF_TIME]                      = Item(RG_SONG_OF_TIME,                      Text{"Song of Time",                    "Chant du Temps",                   "Canción del tiempo"},                      ITEMTYPE_SONG,     0xC5, true, &SongOfTime,       SONG_OF_TIME);
-    itemTable[SONG_OF_STORMS]                    = Item(RG_SONG_OF_STORMS,                    Text{"Song of Storms",                  "Chant des Tempêtes",               "Canción de la tormenta"},                  ITEMTYPE_SONG,     0xC6, true, &SongOfStorms,     SONG_OF_STORMS);
-    itemTable[MINUET_OF_FOREST]                  = Item(RG_MINUET_OF_FOREST,                  Text{"Minuet of Forest",                "Menuet des Bois",                  "Minueto del bosque"},                      ITEMTYPE_SONG,     0xBB, true, &MinuetOfForest,   MINUET_OF_FOREST);
-    itemTable[BOLERO_OF_FIRE]                    = Item(RG_BOLERO_OF_FIRE,                    Text{"Bolero of Fire",                  "Boléro du Feu",                    "Bolero del fuego"},                        ITEMTYPE_SONG,     0xBC, true, &BoleroOfFire,     BOLERO_OF_FIRE);
-    itemTable[SERENADE_OF_WATER]                 = Item(RG_SERENADE_OF_WATER,                 Text{"Serenade of Water",               "Sérénade de l'Eau",                "Serenata del agua"},                       ITEMTYPE_SONG,     0xBD, true, &SerenadeOfWater,  SERENADE_OF_WATER);
-    itemTable[REQUIEM_OF_SPIRIT]                 = Item(RG_REQUIEM_OF_SPIRIT,                 Text{"Requiem of Spirit",               "Requiem des Esprits",              "Réquiem del espíritu"},                    ITEMTYPE_SONG,     0xBE, true, &RequiemOfSpirit,  REQUIEM_OF_SPIRIT);
-    itemTable[NOCTURNE_OF_SHADOW]                = Item(RG_NOCTURNE_OF_SHADOW,                Text{"Nocturne of Shadow",              "Nocturne de l'Ombre",              "Nocturno de la sombra"},                   ITEMTYPE_SONG,     0xBF, true, &NocturneOfShadow, NOCTURNE_OF_SHADOW);
-    itemTable[PRELUDE_OF_LIGHT]                  = Item(RG_PRELUDE_OF_LIGHT,                  Text{"Prelude of Light",                "Prélude de la Lumière",            "Preludio de la luz"},                      ITEMTYPE_SONG,     0xC0, true, &PreludeOfLight,   PRELUDE_OF_LIGHT);
-
-    //Maps and Compasses
-    itemTable[DEKU_TREE_MAP]                     = Item(RG_DEKU_TREE_MAP,                     Text{"Great Deku Tree Map",             "Carte de l'Arbre Mojo",            "Mapa del Gran Árbol Deku"},                ITEMTYPE_MAP,      0xA5, false, &noVariable, DEKU_TREE_MAP);
-    itemTable[DODONGOS_CAVERN_MAP]               = Item(RG_DODONGOS_CAVERN_MAP,               Text{"Dodongo's Cavern Map",            "Carte de la Caverne Dodongo",      "Mapa de la Cueva de los Dodongos"},        ITEMTYPE_MAP,      0xA6, false, &noVariable, DODONGOS_CAVERN_MAP);
-    itemTable[JABU_JABUS_BELLY_MAP]              = Item(RG_JABU_JABUS_BELLY_MAP,              Text{"Jabu-Jabu's Belly Map",           "Carte du Ventre de Jabu-Jabu",     "Mapa de la tripa de Jabu-Jabu"},           ITEMTYPE_MAP,      0xA7, false, &noVariable, JABU_JABUS_BELLY_MAP);
-    itemTable[FOREST_TEMPLE_MAP]                 = Item(RG_FOREST_TEMPLE_MAP,                 Text{"Forest Temple Map",               "Carte du Temple de la Forêt",      "Mapa del Templo del Bosque"},              ITEMTYPE_MAP,      0xA8, false, &noVariable, FOREST_TEMPLE_MAP);
-    itemTable[FIRE_TEMPLE_MAP]                   = Item(RG_FIRE_TEMPLE_MAP,                   Text{"Fire Temple Map",                 "Carte du Temple du Feu",           "Mapa del Templo del Fuego"},               ITEMTYPE_MAP,      0xA9, false, &noVariable, FIRE_TEMPLE_MAP);
-    itemTable[WATER_TEMPLE_MAP]                  = Item(RG_WATER_TEMPLE_MAP,                  Text{"Water Temple Map",                "Carte du Temple de l'Eau",         "Mapa del Templo del Agua"},                ITEMTYPE_MAP,      0xAA, false, &noVariable, WATER_TEMPLE_MAP);
-    itemTable[SPIRIT_TEMPLE_MAP]                 = Item(RG_SPIRIT_TEMPLE_MAP,                 Text{"Spirit Temple Map",               "Carte du Temple de l'Esprit",      "Mapa del Templo del Espíritu"},            ITEMTYPE_MAP,      0xAB, false, &noVariable, SPIRIT_TEMPLE_MAP);
-    itemTable[SHADOW_TEMPLE_MAP]                 = Item(RG_SHADOW_TEMPLE_MAP,                 Text{"Shadow Temple Map",               "Carte du Temple de l'Ombre",       "Mapa del Templo de la Sombra"},            ITEMTYPE_MAP,      0xAC, false, &noVariable, SHADOW_TEMPLE_MAP);
-    itemTable[BOTTOM_OF_THE_WELL_MAP]            = Item(RG_BOTTOM_OF_THE_WELL_MAP,            Text{"Bottom of the Well Map",          "Carte du Puits",                   "Mapa del fondo del pozo"},                 ITEMTYPE_MAP,      0xAD, false, &noVariable, BOTTOM_OF_THE_WELL_MAP);
-    itemTable[ICE_CAVERN_MAP]                    = Item(RG_ICE_CAVERN_MAP,                    Text{"Ice Cavern Map",                  "Carte de la Caverne Polaire",      "Mapa de la caverna de hielo"},             ITEMTYPE_MAP,      0xAE, false, &noVariable, ICE_CAVERN_MAP);
-
-    itemTable[DEKU_TREE_COMPASS]                 = Item(RG_DEKU_TREE_COMPASS,                 Text{"Great Deku Tree Compass",         "Boussole de l'Arbre Mojo",         "Brújula del Gran Árbol Deku"},             ITEMTYPE_COMPASS,  0x9B, false, &noVariable, DEKU_TREE_COMPASS);
-    itemTable[DODONGOS_CAVERN_COMPASS]           = Item(RG_DODONGOS_CAVERN_COMPASS,           Text{"Dodongo's Cavern Compass",        "Boussole de la Caverne Dodongo",   "Brújula de la Cueva de los Dodongos"},     ITEMTYPE_COMPASS,  0x9C, false, &noVariable, DODONGOS_CAVERN_COMPASS);
-    itemTable[JABU_JABUS_BELLY_COMPASS]          = Item(RG_JABU_JABUS_BELLY_COMPASS,          Text{"Jabu-Jabu's Belly Compass",       "Boussole du Ventre de Jabu-Jabu",  "Brújula de la tripa de Jabu-Jabu"},        ITEMTYPE_COMPASS,  0x9D, false, &noVariable, JABU_JABUS_BELLY_COMPASS);
-    itemTable[FOREST_TEMPLE_COMPASS]             = Item(RG_FOREST_TEMPLE_COMPASS,             Text{"Forest Temple Compass",           "Boussole du Temple de la Forêt",   "Brújula del Templo del Bosque"},           ITEMTYPE_COMPASS,  0x9E, false, &noVariable, FOREST_TEMPLE_COMPASS);
-    itemTable[FIRE_TEMPLE_COMPASS]               = Item(RG_FIRE_TEMPLE_COMPASS,               Text{"Fire Temple Compass",             "Boussole du Temple du Feu",        "Brújula del Templo del Fuego"},            ITEMTYPE_COMPASS,  0x9F, false, &noVariable, FIRE_TEMPLE_COMPASS);
-    itemTable[WATER_TEMPLE_COMPASS]              = Item(RG_WATER_TEMPLE_COMPASS,              Text{"Water Temple Compass",            "Boussole du Temple de l'Eau",      "Brújula del Templo del Agua"},             ITEMTYPE_COMPASS,  0xA0, false, &noVariable, WATER_TEMPLE_COMPASS);
-    itemTable[SPIRIT_TEMPLE_COMPASS]             = Item(RG_SPIRIT_TEMPLE_COMPASS,             Text{"Spirit Temple Compass",           "Boussole du Temple de l'Esprit",   "Brújula del Templo del Espíritu"},         ITEMTYPE_COMPASS,  0xA1, false, &noVariable, SPIRIT_TEMPLE_COMPASS);
-    itemTable[SHADOW_TEMPLE_COMPASS]             = Item(RG_SHADOW_TEMPLE_COMPASS,             Text{"Shadow Temple Compass",           "Boussole du Temple de l'Ombre",    "Brújula del Templo de las Sombras"},       ITEMTYPE_COMPASS,  0xA2, false, &noVariable, SHADOW_TEMPLE_COMPASS);
-    itemTable[BOTTOM_OF_THE_WELL_COMPASS]        = Item(RG_BOTTOM_OF_THE_WELL_COMPASS,        Text{"Bottom of the Well Compass",      "Boussole du Puits",                "Brújula del fondo del pozo"},              ITEMTYPE_COMPASS,  0xA3, false, &noVariable, BOTTOM_OF_THE_WELL_COMPASS);
-    itemTable[ICE_CAVERN_COMPASS]                = Item(RG_ICE_CAVERN_COMPASS,                Text{"Ice Cavern Compass",              "Boussole de la Caverne Polaire",   "Brújula de la caverna de hielo"},          ITEMTYPE_COMPASS,  0xA4, false, &noVariable, ICE_CAVERN_COMPASS);
-
-    //Boss Keys
-    itemTable[FOREST_TEMPLE_BOSS_KEY]            = Item(RG_FOREST_TEMPLE_BOSS_KEY,            Text{"Forest Temple Boss Key",          "Clé d'Or du Temple de la Forêt",   "Gran llave del Templo del Bosque"},        ITEMTYPE_BOSSKEY,  0x95, true, &BossKeyForestTemple, FOREST_TEMPLE_BOSS_KEY);
-    itemTable[FIRE_TEMPLE_BOSS_KEY]              = Item(RG_FIRE_TEMPLE_BOSS_KEY,              Text{"Fire Temple Boss Key",            "Clé d'Or du Temple du Feu",        "Gran llave del Templo del Fuego"},         ITEMTYPE_BOSSKEY,  0x96, true, &BossKeyFireTemple,   FIRE_TEMPLE_BOSS_KEY);
-    itemTable[WATER_TEMPLE_BOSS_KEY]             = Item(RG_WATER_TEMPLE_BOSS_KEY,             Text{"Water Temple Boss Key",           "Clé d'Or du Temple de l'Eau",      "Gran llave del Templo del Agua"},          ITEMTYPE_BOSSKEY,  0x97, true, &BossKeyWaterTemple,  WATER_TEMPLE_BOSS_KEY);
-    itemTable[SPIRIT_TEMPLE_BOSS_KEY]            = Item(RG_SPIRIT_TEMPLE_BOSS_KEY,            Text{"Spirit Temple Boss Key",          "Clé d'Or du Temple de l'Esprit",   "Gran llave del Templo del Espíritu"},      ITEMTYPE_BOSSKEY,  0x98, true, &BossKeySpiritTemple, SPIRIT_TEMPLE_BOSS_KEY);
-    itemTable[SHADOW_TEMPLE_BOSS_KEY]            = Item(RG_SHADOW_TEMPLE_BOSS_KEY,            Text{"Shadow Temple Boss Key",          "Clé d'Or du Temple de l'Ombre",    "Gran llave del Templo de las Sombras"},    ITEMTYPE_BOSSKEY,  0x99, true, &BossKeyShadowTemple, SHADOW_TEMPLE_BOSS_KEY);
-    itemTable[GANONS_CASTLE_BOSS_KEY]            = Item(RG_GANONS_CASTLE_BOSS_KEY,            Text{"Ganon's Castle Boss Key",         "Clé d'Or du Château de Ganon",     "Gran llave del Castillo de Ganon"},        ITEMTYPE_BOSSKEY,  0x9A, true, &BossKeyGanonsCastle, GANONS_CASTLE_BOSS_KEY);
-
-    //Small Keys
-    itemTable[FOREST_TEMPLE_SMALL_KEY]           = Item(RG_FOREST_TEMPLE_SMALL_KEY,           Text{"Forest Temple Small Key",         "Petite Clé du Temple de la Forêt", "Llave del Templo del Bosque"},             ITEMTYPE_SMALLKEY,          0xAF, true, &ForestTempleKeys,          FOREST_TEMPLE_SMALL_KEY);
-    itemTable[FIRE_TEMPLE_SMALL_KEY]             = Item(RG_FIRE_TEMPLE_SMALL_KEY,             Text{"Fire Temple Small Key",           "Petite Clé du Temple du Feu",      "Llave del Templo del Fuego"},              ITEMTYPE_SMALLKEY,          0xB0, true, &FireTempleKeys,            FIRE_TEMPLE_SMALL_KEY);
-    itemTable[WATER_TEMPLE_SMALL_KEY]            = Item(RG_WATER_TEMPLE_SMALL_KEY,            Text{"Water Temple Small Key",          "Petite Clé du Temple de l'Eau",    "Llave del Templo del Agua"},               ITEMTYPE_SMALLKEY,          0xB1, true, &WaterTempleKeys,           WATER_TEMPLE_SMALL_KEY);
-    itemTable[SPIRIT_TEMPLE_SMALL_KEY]           = Item(RG_SPIRIT_TEMPLE_SMALL_KEY,           Text{"Spirit Temple Small Key",         "Petite Clé du Temple de l'Esprit", "Llave del Templo del Espíritu"},           ITEMTYPE_SMALLKEY,          0xB2, true, &SpiritTempleKeys,          SPIRIT_TEMPLE_SMALL_KEY);
-    itemTable[SHADOW_TEMPLE_SMALL_KEY]           = Item(RG_SHADOW_TEMPLE_SMALL_KEY,           Text{"Shadow Temple Small Key",         "Petite Clé du Temple de l'Ombre",  "Llave del Templo de las Sombras"},         ITEMTYPE_SMALLKEY,          0xB3, true, &ShadowTempleKeys,          SHADOW_TEMPLE_SMALL_KEY);
-    itemTable[BOTTOM_OF_THE_WELL_SMALL_KEY]      = Item(RG_BOTTOM_OF_THE_WELL_SMALL_KEY,      Text{"Bottom of the Well Small Key",    "Petite Clé du Puits",              "Llave del fondo del pozo"},                ITEMTYPE_SMALLKEY,          0xB4, true, &BottomOfTheWellKeys,       BOTTOM_OF_THE_WELL_SMALL_KEY);
-    itemTable[GERUDO_TRAINING_GROUNDS_SMALL_KEY] = Item(RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, Text{"Training Grounds Small Key",      "Petite Clé du Gymnase Gerudo",     "Llave del Centro de Instrucción"},         ITEMTYPE_SMALLKEY,          0xB5, true, &GerudoTrainingGroundsKeys, GERUDO_TRAINING_GROUNDS_SMALL_KEY);
-    itemTable[GERUDO_FORTRESS_SMALL_KEY]         = Item(RG_GERUDO_FORTRESS_SMALL_KEY,         Text{"Gerudo Fortress Small Key",       "Petite Clé du Repaire des Voleurs","Llave de la Fortaleza Gerudo"},            ITEMTYPE_FORTRESS_SMALLKEY, 0xB6, true, &GerudoFortressKeys,        GERUDO_FORTRESS_SMALL_KEY);
-    itemTable[GANONS_CASTLE_SMALL_KEY]           = Item(RG_GANONS_CASTLE_SMALL_KEY,           Text{"Ganon's Castle Small Key",        "Petite Clé du Château de Ganon",   "Llave del Castillo de Ganon"},             ITEMTYPE_SMALLKEY,          0xB7, true, &GanonsCastleKeys,          GANONS_CASTLE_SMALL_KEY);
-    itemTable[TREASURE_GAME_SMALL_KEY]           = Item(RG_TREASURE_GAME_SMALL_KEY,           Text{"Chest Game Small Key",            "Petite Clé du jeu la Chasse-aux-Trésors","Llave del Cofre del Tesoro"},        ITEMTYPE_ITEM,              0xDE, true, &TreasureGameKeys,          TREASURE_GAME_SMALL_KEY);
-
-    // Key Rings
-    itemTable[FOREST_TEMPLE_KEY_RING]            = Item(RG_FOREST_TEMPLE_KEY_RING,            Text{"Forest Temple Key Ring",          "Trousseau du Temple de la Forêt",  "Llavero del Templo del Bosque"},           ITEMTYPE_SMALLKEY,          0xD5, true, &ForestTempleKeys,          FOREST_TEMPLE_KEY_RING);
-    itemTable[FIRE_TEMPLE_KEY_RING]              = Item(RG_FIRE_TEMPLE_KEY_RING,              Text{"Fire Temple Key Ring",            "Trousseau du Temple du Feu",       "Llavero del Templo del Fuego"},            ITEMTYPE_SMALLKEY,          0xD6, true, &FireTempleKeys,            FIRE_TEMPLE_KEY_RING);
-    itemTable[WATER_TEMPLE_KEY_RING]             = Item(RG_WATER_TEMPLE_KEY_RING,             Text{"Water Temple Key Ring",           "Trousseau du Temple de l'Eau",     "Llavero del Templo del Agua"},             ITEMTYPE_SMALLKEY,          0xD7, true, &WaterTempleKeys,           WATER_TEMPLE_KEY_RING);
-    itemTable[SPIRIT_TEMPLE_KEY_RING]            = Item(RG_SPIRIT_TEMPLE_KEY_RING,            Text{"Spirit Temple Key Ring",          "Trousseau du Temple de l'Esprit",  "Llavero del Templo del Espíritu"},         ITEMTYPE_SMALLKEY,          0xD8, true, &SpiritTempleKeys,          SPIRIT_TEMPLE_KEY_RING);
-    itemTable[SHADOW_TEMPLE_KEY_RING]            = Item(RG_SHADOW_TEMPLE_KEY_RING,            Text{"Shadow Temple Key Ring",          "Trousseau du Temple de l'Ombre",   "Llavero del Templo de las Sombras"},       ITEMTYPE_SMALLKEY,          0xD9, true, &ShadowTempleKeys,          SHADOW_TEMPLE_KEY_RING);
-    itemTable[BOTTOM_OF_THE_WELL_KEY_RING]       = Item(RG_BOTTOM_OF_THE_WELL_KEY_RING,       Text{"Bottom of the Well Key Ring",     "Trousseau du Puits",               "Llavero del fondo del pozo"},              ITEMTYPE_SMALLKEY,          0xDA, true, &BottomOfTheWellKeys,       BOTTOM_OF_THE_WELL_KEY_RING);
-    itemTable[GERUDO_TRAINING_GROUNDS_KEY_RING]  = Item(RG_GERUDO_TRAINING_GROUNDS_KEY_RING,  Text{"Training Grounds Key Ring",       "Trousseau du Gymnase Gerudo",      "Llavero del Centro de Instrucción"},       ITEMTYPE_SMALLKEY,          0xDB, true, &GerudoTrainingGroundsKeys, GERUDO_TRAINING_GROUNDS_KEY_RING);
-    itemTable[GERUDO_FORTRESS_KEY_RING]          = Item(RG_GERUDO_FORTRESS_KEY_RING,          Text{"Gerudo Fortress Key Ring",        "Trousseau du Repaire des Voleurs", "Llavero de la Fortaleza Gerudo"},          ITEMTYPE_FORTRESS_SMALLKEY, 0xDC, true, &GerudoFortressKeys,        GERUDO_FORTRESS_KEY_RING);
-    itemTable[GANONS_CASTLE_KEY_RING]            = Item(RG_GANONS_CASTLE_KEY_RING,            Text{"Ganon's Castle Key Ring",         "Trousseau du Château de Ganon",    "Llavero del Castillo de Ganon"},           ITEMTYPE_SMALLKEY,          0xDD, true, &GanonsCastleKeys,          GANONS_CASTLE_KEY_RING);
-
-    //Stones and Medallions
-    itemTable[KOKIRI_EMERALD]                    = Item(RG_KOKIRI_EMERALD,                    Text{"Kokiri's Emerald",                "Émeraude Kokiri",                  "Esmeralda de los Kokiri"},                 ITEMTYPE_DUNGEONREWARD, 0xCB,  true, &KokiriEmerald,   KOKIRI_EMERALD);
-    itemTable[GORON_RUBY]                        = Item(RG_GORON_RUBY,                        Text{"Goron's Ruby",                    "Rubis Goron",                      "Rubí de los Goron"},                       ITEMTYPE_DUNGEONREWARD, 0xCC,  true, &GoronRuby,       GORON_RUBY);
-    itemTable[ZORA_SAPPHIRE]                     = Item(RG_ZORA_SAPPHIRE,                     Text{"Zora's Sapphire",                 "Saphir Zora",                      "Zafiro de los Zora"},                      ITEMTYPE_DUNGEONREWARD, 0xCD,  true, &ZoraSapphire,    ZORA_SAPPHIRE);
-    itemTable[FOREST_MEDALLION]                  = Item(RG_FOREST_MEDALLION,                  Text{"Forest Medallion",                "Médaillon de la Forêt",            "Medallón del Bosque"},                     ITEMTYPE_DUNGEONREWARD, 0xCE,  true, &ForestMedallion, FOREST_MEDALLION);
-    itemTable[FIRE_MEDALLION]                    = Item(RG_FIRE_MEDALLION,                    Text{"Fire Medallion",                  "Médaillon du Feu",                 "Medallón del Fuego"},                      ITEMTYPE_DUNGEONREWARD, 0xCF,  true, &FireMedallion,   FIRE_MEDALLION);
-    itemTable[WATER_MEDALLION]                   = Item(RG_WATER_MEDALLION,                   Text{"Water Medallion",                 "Médaillon de l'Eau",               "Medallón del Agua"},                       ITEMTYPE_DUNGEONREWARD, 0xD0,  true, &WaterMedallion,  WATER_MEDALLION);
-    itemTable[SPIRIT_MEDALLION]                  = Item(RG_SPIRIT_MEDALLION,                  Text{"Spirit Medallion",                "Médaillon de l'Esprit",            "Medallón del Espíritu"},                   ITEMTYPE_DUNGEONREWARD, 0xD1,  true, &SpiritMedallion, SPIRIT_MEDALLION);
-    itemTable[SHADOW_MEDALLION]                  = Item(RG_SHADOW_MEDALLION,                  Text{"Shadow Medallion",                "Médaillon de l'Ombre",             "Medallón de la Sombra"},                   ITEMTYPE_DUNGEONREWARD, 0xD2,  true, &ShadowMedallion, SHADOW_MEDALLION);
-    itemTable[LIGHT_MEDALLION]                   = Item(RG_LIGHT_MEDALLION,                   Text{"Light Medallion",                 "Médaillon de la Lumière",          "Medallón de la Luz"},                      ITEMTYPE_DUNGEONREWARD, 0xD3,  true, &LightMedallion,  LIGHT_MEDALLION);
-
-    //Generic Items
-    itemTable[RECOVERY_HEART]                    = Item(RG_RECOVERY_HEART,                    Text{"Recovery Heart",                  "Coeur de Vie",                     "Corazón"},                                 ITEMTYPE_ITEM, GI_HEART,             false, &noVariable,     RECOVERY_HEART);
-    itemTable[GREEN_RUPEE]                       = Item(RG_GREEN_RUPEE,                       Text{"Green Rupee",                     "Rubis Vert",                       "Rupia verde"},                             ITEMTYPE_ITEM, GI_RUPEE_GREEN,       false, &noVariable,     GREEN_RUPEE);
-    itemTable[GREG_RUPEE]                        = Item(RG_GREG_RUPEE,                        Text{"Greg the Green Rupee",            "Rubis Greg",                       "Rupia Greg"},                              ITEMTYPE_ITEM, GI_RUPEE_GREEN,       true,  &Greg,           GREG_RUPEE);
-    itemTable[BLUE_RUPEE]                        = Item(RG_BLUE_RUPEE,                        Text{"Blue Rupee",                      "Rubis Bleu",                       "Rupia azul"},                              ITEMTYPE_ITEM, GI_RUPEE_BLUE,        false, &noVariable,     BLUE_RUPEE);
-    itemTable[RED_RUPEE]                         = Item(RG_RED_RUPEE,                         Text{"Red Rupee",                       "Rubis Rouge",                      "Rupia roja"},                              ITEMTYPE_ITEM, GI_RUPEE_RED,         false, &noVariable,     RED_RUPEE);
-    itemTable[PURPLE_RUPEE]                      = Item(RG_PURPLE_RUPEE,                      Text{"Purple Rupee",                    "Rubis Pourpre",                    "Rupia morada"},                            ITEMTYPE_ITEM, GI_RUPEE_PURPLE,      false, &noVariable,     PURPLE_RUPEE);
-    itemTable[HUGE_RUPEE]                        = Item(RG_HUGE_RUPEE,                        Text{"Huge Rupee",                      "Énorme Rubis",                     "Rupia gigante"},                           ITEMTYPE_ITEM, GI_RUPEE_GOLD,        false, &noVariable,     HUGE_RUPEE);
-    itemTable[PIECE_OF_HEART]                    = Item(RG_PIECE_OF_HEART,                    Text{"Piece of Heart",                  "Quart de Coeur",                   "Pieza de corazón"},                        ITEMTYPE_ITEM, GI_HEART_PIECE,       true,  &PieceOfHeart,   PIECE_OF_HEART);
-    itemTable[HEART_CONTAINER]                   = Item(RG_HEART_CONTAINER,                   Text{"Heart Container",                 "Réceptacle de Coeur",              "Contenedor de corazón"},                   ITEMTYPE_ITEM, GI_HEART_CONTAINER_2, true,  &HeartContainer, HEART_CONTAINER);
-    itemTable[ICE_TRAP]                          = Item(RG_ICE_TRAP,                          Text{"Ice Trap",                        "Piège de Glace",                   "Trampa de hielo"},                         ITEMTYPE_ITEM, GI_ICE_TRAP,          false, &noVariable,     ICE_TRAP);
-    itemTable[MILK]                              = Item(RG_MILK,                              Text{"Milk",                            "Lait",                             "Leche Lon Lon"},                           ITEMTYPE_ITEM, GI_MILK,              false, &noVariable,     NONE);
-
-    //Refills
-    itemTable[BOMBS_5]                           = Item(RG_BOMBS_5,                           Text{"Bombs (5)",                       "Bombes (5)",                       "Bombas (5)"},                              ITEMTYPE_REFILL, GI_BOMBS_5,        false, &noVariable,  BOMBS_5);
-    itemTable[BOMBS_10]                          = Item(RG_BOMBS_10,                          Text{"Bombs (10)",                      "Bombes (10)",                      "Bombas (10)"},                             ITEMTYPE_REFILL, GI_BOMBS_10,       false, &noVariable,  BOMBS_10);
-    itemTable[BOMBS_20]                          = Item(RG_BOMBS_20,                          Text{"Bombs (20)",                      "Bombes (20)",                      "Bombas (20)"},                             ITEMTYPE_REFILL, GI_BOMBS_20,       false, &noVariable,  BOMBS_20);
-    itemTable[BOMBCHU_5]                         = Item(RG_BOMBCHU_5,                         Text{"Bombchus (5)",                    "Missiles (5)",                     "Bombchus (5)"},                            ITEMTYPE_REFILL, GI_BOMBCHUS_5,     true,  &Bombchus5,   BOMBCHU_5);
-    itemTable[BOMBCHU_10]                        = Item(RG_BOMBCHU_10,                        Text{"Bombchus (10)",                   "Missiles (10)",                    "Bombchus (10)"},                           ITEMTYPE_REFILL, GI_BOMBCHUS_10,    true,  &Bombchus10,  BOMBCHU_10);
-    itemTable[BOMBCHU_20]                        = Item(RG_BOMBCHU_20,                        Text{"Bombchus (20)",                   "Missiles (20)",                    "Bombchus (20)"},                           ITEMTYPE_REFILL, GI_BOMBCHUS_20,    true,  &Bombchus20,  BOMBCHU_20);
-    itemTable[BOMBCHU_DROP]                      = Item(RG_BOMBCHU_DROP,                      Text{"Bombchu Drop",                    "Drop Missiles",                    "Bombchus"},                                ITEMTYPE_DROP,   GI_BOMBCHUS_10,    true,  &BombchuDrop, NONE);
-    itemTable[ARROWS_5]                          = Item(RG_ARROWS_5,                          Text{"Arrows (5)",                      "Flèches (5)",                      "Flechas (5)"},                             ITEMTYPE_REFILL, GI_ARROWS_SMALL,   false, &noVariable,  ARROWS_5);
-    itemTable[ARROWS_10]                         = Item(RG_ARROWS_10,                         Text{"Arrows (10)",                     "Flèches (10)",                     "Flechas (10)"},                            ITEMTYPE_REFILL, GI_ARROWS_MEDIUM,  false, &noVariable,  ARROWS_10);
-    itemTable[ARROWS_30]                         = Item(RG_ARROWS_30,                         Text{"Arrows (30)",                     "Flèches (30)",                     "Flechas (30)"},                            ITEMTYPE_REFILL, GI_ARROWS_LARGE,   false, &noVariable,  ARROWS_30);
-    itemTable[DEKU_NUTS_5]                       = Item(RG_DEKU_NUTS_5,                       Text{"Deku Nuts (5)",                   "Noix Mojo (5)",                    "Nueces deku (5)"},                         ITEMTYPE_REFILL, GI_NUTS_5,         false, &noVariable,  DEKU_NUTS_5);
-    itemTable[DEKU_NUTS_10]                      = Item(RG_DEKU_NUTS_10,                      Text{"Deku Nuts (10)",                  "Noix Mojo (10)",                   "Nueces deku (10)"},                        ITEMTYPE_REFILL, GI_NUTS_10,        false, &noVariable,  DEKU_NUTS_10);
-    itemTable[DEKU_SEEDS_30]                     = Item(RG_DEKU_SEEDS_30,                     Text{"Deku Seeds (30)",                 "Graines Mojo (30)",                "Semillas deku (30)"},                      ITEMTYPE_REFILL, GI_SEEDS_30,       false, &noVariable,  DEKU_SEEDS_30);
-    itemTable[DEKU_STICK_1]                      = Item(RG_DEKU_STICK_1,                      Text{"Deku Stick (1)",                  "Bâton Mojo (1)",                   "Palo deku (1)"},                           ITEMTYPE_REFILL, GI_STICKS_1,       false, &noVariable,  DEKU_STICK_1);
-    itemTable[RED_POTION_REFILL]                 = Item(RG_RED_POTION_REFILL,                 Text{"Red Potion Refill",               "Recharge de Potion Rouge",         "Recarga de poción roja"},                  ITEMTYPE_REFILL, GI_POTION_RED,     false, &noVariable,  NONE);
-    itemTable[GREEN_POTION_REFILL]               = Item(RG_GREEN_POTION_REFILL,               Text{"Green Potion Refill",             "Recharge de Potion Verte",         "Recarga de poción verde"},                 ITEMTYPE_REFILL, GI_POTION_GREEN,   false, &noVariable,  NONE);
-    itemTable[BLUE_POTION_REFILL]                = Item(RG_BLUE_POTION_REFILL,                Text{"Blue Potion Refill",              "Recharge de Potion Bleue",         "Recarga de poción azul"},                  ITEMTYPE_REFILL, GI_POTION_BLUE,    false, &noVariable,  NONE);
-
-    //Treasure Game
-    itemTable[TREASURE_GAME_HEART]               = Item(RG_TREASURE_GAME_HEART,               Text{"Piece of Heart (WINNER)",    "Quart de Coeur (Chasse-aux-Trésors)",   "Pieza de corazón (Cofre del Tesoro)"}, ITEMTYPE_ITEM, GI_HEART_PIECE_WIN,  true,  &PieceOfHeart, TREASURE_GAME_HEART);
-    itemTable[TREASURE_GAME_GREEN_RUPEE]         = Item(RG_TREASURE_GAME_GREEN_RUPEE,         Text{"Green Rupee (LOSER)",       "Rubis Vert (Chasse-aux-Trésors)",      "Rupia Verde (Cofre del Tesoro)"},       ITEMTYPE_ITEM, GI_RUPEE_GREEN_LOSE, false, &noVariable,   TREASURE_GAME_GREEN_RUPEE);
-
-    //Shop Items                                                                                                                                                                                                                                                                            price
-    itemTable[BUY_DEKU_NUT_5]                    = Item(RG_BUY_DEKU_NUT_5,                    Text{"Buy Deku Nut (5)",                "Acheter: Noix Mojo (5)",           "Comprar nueces deku (5)"},                 ITEMTYPE_SHOP, 0x00, true,  &Nuts,           DEKU_NUTS_5,               15);
-    itemTable[BUY_ARROWS_30]                     = Item(RG_BUY_ARROWS_30,                     Text{"Buy Arrows (30)",                 "Acheter: Flèches (30)",            "Comprar flechas (30)"},                    ITEMTYPE_SHOP, 0x01, true,  &BuyArrow,       ARROWS_30,                 60);
-    itemTable[BUY_ARROWS_50]                     = Item(RG_BUY_ARROWS_50,                     Text{"Buy Arrows (50)",                 "Acheter: Flèches (50)",            "Comprar flechas (50)"},                    ITEMTYPE_SHOP, 0x02, true,  &BuyArrow,       ARROWS_30,                 90);
-    itemTable[BUY_BOMBS_525]                     = Item(RG_BUY_BOMBS_525,                     Text{"Buy Bombs (5) [25]",              "Acheter: Bombes (5) [25]",         "Comprar bombas (5) [25]"},                 ITEMTYPE_SHOP, 0x03, true,  &BuyBomb,        BOMBS_5,                   25);
-    itemTable[BUY_DEKU_NUT_10]                   = Item(RG_BUY_DEKU_NUT_10,                   Text{"Buy Deku Nut (10)",               "Acheter: Noix Mojo (10)",          "Comprar Nueces deku (10)"},                ITEMTYPE_SHOP, 0x04, true,  &Nuts,           DEKU_NUTS_10,              30);
-    itemTable[BUY_DEKU_STICK_1]                  = Item(RG_BUY_DEKU_STICK_1,                  Text{"Buy Deku Stick (1)",              "Acheter: Bâton Mojo (1)",          "Comprar palos deku (1)"},                  ITEMTYPE_SHOP, 0x05, true,  &Sticks,         DEKU_STICK_1,              10);
-    itemTable[BUY_BOMBS_10]                      = Item(RG_BUY_BOMBS_10,                      Text{"Buy Bombs (10)",                  "Acheter: Bombes (10)",             "Comprar Bombas (10)"},                     ITEMTYPE_SHOP, 0x06, true,  &BuyBomb,        BOMBS_10,                  50);
-    itemTable[BUY_FISH]                          = Item(RG_BUY_FISH,                          Text{"Buy Fish",                        "Acheter: Poisson",                 "Comprar pez"},                             ITEMTYPE_SHOP, 0x07, true,  &FishAccess,     BOTTLE_WITH_FISH,         200);
-    itemTable[BUY_RED_POTION_30]                 = Item(RG_BUY_RED_POTION_30,                 Text{"Buy Red Potion [30]",             "Acheter: Potion Rouge [30]",       "Comprar poción roja [30]"},                ITEMTYPE_SHOP, 0x08, false, &noVariable,     BOTTLE_WITH_RED_POTION,    30);
-    itemTable[BUY_GREEN_POTION]                  = Item(RG_BUY_GREEN_POTION,                  Text{"Buy Green Potion",                "Acheter: Potion Verte",            "Comprar poción verde"},                    ITEMTYPE_SHOP, 0x09, true,  &BuyGPotion,     BOTTLE_WITH_GREEN_POTION,  30);
-    itemTable[BUY_BLUE_POTION]                   = Item(RG_BUY_BLUE_POTION,                   Text{"Buy Blue Potion",                 "Acheter: Potion Bleue",            "Comprar poción azul"},                     ITEMTYPE_SHOP, 0x0A, true,  &BuyBPotion,     BOTTLE_WITH_BLUE_POTION,  100);
-    itemTable[BUY_HYLIAN_SHIELD]                 = Item(RG_BUY_HYLIAN_SHIELD,                 Text{"Buy Hylian Shield",               "Acheter: Bouclier Hylien",         "Comprar escudo hyliano"},                  ITEMTYPE_SHOP, 0x0C, true,  &HylianShield,   HYLIAN_SHIELD,             80);
-    itemTable[BUY_DEKU_SHIELD]                   = Item(RG_BUY_DEKU_SHIELD,                   Text{"Buy Deku Shield",                 "Acheter: Bouclier Mojo",           "Comprar escudo deku"},                     ITEMTYPE_SHOP, 0x0D, true,  &DekuShield,     DEKU_SHIELD,               40);
-    itemTable[BUY_GORON_TUNIC]                   = Item(RG_BUY_GORON_TUNIC,                   Text{"Buy Goron Tunic",                 "Acheter: Tunique Goron",           "Comprar sayo goron"},                      ITEMTYPE_SHOP, 0x0E, true,  &GoronTunic,     GORON_TUNIC,              200);
-    itemTable[BUY_ZORA_TUNIC]                    = Item(RG_BUY_ZORA_TUNIC,                    Text{"Buy Zora Tunic",                  "Acheter: Tunique Zora",            "Comprar sayo zora"},                       ITEMTYPE_SHOP, 0x0F, true,  &ZoraTunic,      ZORA_TUNIC,               300);
-    itemTable[BUY_HEART]                         = Item(RG_BUY_HEART,                         Text{"Buy Heart",                       "Acheter: Coeur de Vie",            "Comprar corazón"},                         ITEMTYPE_SHOP, 0x10, false, &noVariable,     RECOVERY_HEART,            10);
-    itemTable[BUY_BOMBCHU_10]                    = Item(RG_BUY_BOMBCHU_10,                    Text{"Buy Bombchu (10)",                "Acheter: Missiles (10)",           "Comprar bombchus (10)"},                   ITEMTYPE_SHOP, 0x15, true,  &BuyBombchus10,  BOMBCHU_10,                99);
-    itemTable[BUY_BOMBCHU_20]                    = Item(RG_BUY_BOMBCHU_20,                    Text{"Buy Bombchu (20)",                "Acheter: Missiles (20)",           "Comprar bombchus (20)"},                   ITEMTYPE_SHOP, 0x16, true,  &BuyBombchus20,  BOMBCHU_20,               180);
-    itemTable[BUY_DEKU_SEEDS_30]                 = Item(RG_BUY_DEKU_SEEDS_30,                 Text{"Buy Deku Seeds (30)",             "Acheter: Graines Mojo (30)",       "Comprar semillas deku (30)"},              ITEMTYPE_SHOP, 0x1D, true,  &BuySeed,        DEKU_SEEDS_30,             30);
-    itemTable[SOLD_OUT]                          = Item(RG_SOLD_OUT,                          Text{"Sold Out",                        "Rupture de stock",                 "Vendido"},                                 ITEMTYPE_SHOP, 0x26, false, &noVariable,     NONE,                       0);
-    itemTable[BUY_BLUE_FIRE]                     = Item(RG_BUY_BLUE_FIRE,                     Text{"Buy Blue Fire",                   "Acheter: Flamme Bleue",            "Comprar fuego azul"},                      ITEMTYPE_SHOP, 0x27, true,  &BlueFireAccess, BOTTLE_WITH_BLUE_FIRE,    300);
-    itemTable[BUY_BOTTLE_BUG]                    = Item(RG_BUY_BOTTLE_BUG,                    Text{"Buy Bottle Bug",                  "Acheter: Insecte en bouteille",    "Comprar bichos"},                          ITEMTYPE_SHOP, 0x28, true,  &BugsAccess,     BOTTLE_WITH_BUGS,          50);
-    itemTable[BUY_POE]                           = Item(RG_BUY_POE,                           Text{"Buy Poe",                         "Acheter: Esprit",                  "Comprar Poe"},                             ITEMTYPE_SHOP, 0x2A, false, &noVariable,     BOTTLE_WITH_BIG_POE,       30);
-    itemTable[BUY_FAIRYS_SPIRIT]                 = Item(RG_BUY_FAIRYS_SPIRIT,                 Text{"Buy Fairy's Spirit",              "Acheter: Esprit de Fée",           "Comprar hada"},                            ITEMTYPE_SHOP, 0x2B, true,  &FairyAccess,    BOTTLE_WITH_FAIRY,         50);
-    itemTable[BUY_ARROWS_10]                     = Item(RG_BUY_ARROWS_10,                     Text{"Buy Arrows (10)",                 "Acheter: Flèches (10)",            "Comprar flechas (10)"},                    ITEMTYPE_SHOP, 0x2C, true,  &BuyArrow,       ARROWS_10,                 20);
-    itemTable[BUY_BOMBS_20]                      = Item(RG_BUY_BOMBS_20,                      Text{"Buy Bombs (20)",                  "Acheter: Bombes (20)",             "Comprar bombas (20)"},                     ITEMTYPE_SHOP, 0x2D, true,  &BuyBomb,        BOMBS_20,                  80);
-    itemTable[BUY_BOMBS_30]                      = Item(RG_BUY_BOMBS_30,                      Text{"Buy Bombs (30)",                  "Acheter: Bombes (30)",             "Comprar bombas (30)"},                     ITEMTYPE_SHOP, 0x2E, true,  &BuyBomb,        BOMBS_20,                 120);
-    itemTable[BUY_BOMBS_535]                     = Item(RG_BUY_BOMBS_535,                     Text{"Buy Bombs (5) [35]",              "Acheter: Bombes (5) [35]",         "Comprar bombas (5) [35]"},                 ITEMTYPE_SHOP, 0x2F, true,  &BuyBomb,        BOMBS_5,                   35);
-    itemTable[BUY_RED_POTION_40]                 = Item(RG_BUY_RED_POTION_40,                 Text{"Buy Red Potion [40]",             "Acheter: Potion Rouge [40]",       "Comprar poción roja [40]"},                ITEMTYPE_SHOP, 0x30, false, &noVariable,     BOTTLE_WITH_RED_POTION,    40);
-    itemTable[BUY_RED_POTION_50]                 = Item(RG_BUY_RED_POTION_50,                 Text{"Buy Red Potion [50]",             "Acheter: Potion Rouge [50]",       "Comprar poción roja [50]"},                ITEMTYPE_SHOP, 0x31, false, &noVariable,     BOTTLE_WITH_RED_POTION,    50);
-
-    itemTable[TRIFORCE_PIECE]                    = Item(RG_TRIFORCE_PIECE,                    Text{"Triforce Piece",                  "Triforce Piece",                   "Triforce Piece"},                          ITEMTYPE_ITEM, 0xDF, true,  &TriforcePieces, TRIFORCE_PIECE);
-    itemTable[TRIFORCE]                          = Item(RG_TRIFORCE,                          Text{"Triforce",                        "Triforce",                         "Trifuerza"},                               ITEMTYPE_EVENT, GI_RUPEE_RED_LOSE,  false, &noVariable, NONE);
-    itemTable[HINT]                              = Item(RG_HINT,                              Text{"Hint",                            "Indice",                           "Pista"},                                   ITEMTYPE_EVENT, GI_RUPEE_BLUE_LOSE, false, &noVariable, NONE);
-
-    //Boss Souls
-    itemTable[GOHMA_BOSS_SOUL]                   = Item(RG_GOHMA_SOUL,                        Text{"Gohma's Soul",                    "Ame de Gohma",                     "Alma de Gohma"},                           ITEMTYPE_ITEM, 0xE1, true,  &CanSummonGohma, NONE);
-    itemTable[KING_DODONGO_BOSS_SOUL]            = Item(RG_KING_DODONGO_SOUL,                 Text{"King Dodongo's Soul",             "Ame de ",                          "Alma de "},                                ITEMTYPE_ITEM, 0xE2, true,  &CanSummonKingDodongo, NONE);
-    itemTable[BARINADE_BOSS_SOUL]                = Item(RG_BARINADE_SOUL,                     Text{"Barinade's Soul",                 "Ame de ",                          "Alma de "},                                ITEMTYPE_ITEM, 0xE3, true,  &CanSummonBarinade, NONE);
-    itemTable[PHANTOM_GANON_BOSS_SOUL]           = Item(RG_PHANTOM_GANON_SOUL,                Text{"Phantom Ganon's Soul",            "Ame de ",                          "Alma de "},                                ITEMTYPE_ITEM, 0xE4, true,  &CanSummonPhantomGanon, NONE);
-    itemTable[VOLVAGIA_BOSS_SOUL]                = Item(RG_VOLVAGIA_SOUL,                     Text{"Volvagia's Soul",                 "Ame de ",                          "Alma de "},                                ITEMTYPE_ITEM, 0xE5, true,  &CanSummonVolvagia, NONE);
-    itemTable[MORPHA_BOSS_SOUL]                  = Item(RG_MORPHA_SOUL,                       Text{"Morpha's Soul",                   "Ame de ",                          "Alma de "},                                ITEMTYPE_ITEM, 0xE6, true,  &CanSummonMorpha, NONE);
-    itemTable[BONGO_BONGO_BOSS_SOUL]             = Item(RG_BONGO_BONGO_SOUL,                  Text{"Bongo Bongo's Soul",              "Ame de ",                          "Alma de "},                                ITEMTYPE_ITEM, 0xE7, true,  &CanSummonBongoBongo, NONE);
-    itemTable[TWINROVA_BOSS_SOUL]                = Item(RG_TWINROVA_SOUL,                     Text{"Twinrova's Soul",                 "Ame de ",                          "Alma de "},                                ITEMTYPE_ITEM, 0xE8, true,  &CanSummonTwinrova, NONE);
-    itemTable[GANON_BOSS_SOUL]                   = Item(RG_GANON_SOUL,                        Text{"Ganon's Soul",                    "Ame de ",                          "Alma de "},                                ITEMTYPE_ITEM, 0xE9, true,  &CanSummonGanon, NONE);
-
-//  itemTable[HOOKSHOT]                          = Item(RG_HOOKSHOT,                          Text{"Hookshot",                        "Grappin",                          "Gancho"},                                  ITEMTYPE_ITEM, 0x80, true,  &ProgressiveHookshot, HOOKSHOT);
-//  itemTable[LONGSHOT]                          = Item(RG_LONGSHOT,                          Text{"Longshot",                        "Super-Grappin",                    "Supergancho"},                             ITEMTYPE_ITEM, 0x80, true,  &ProgressiveHookshot, LONGSHOT);
-//  itemTable[FAIRY_OCARINA]                     = Item(RG_FAIRY_OCARINA,                     Text{"Fairy Ocarina",                   "Ocarina des fées",                 "Ocarina de las Hadas"},                    ITEMTYPE_ITEM, 0x8B, true,  &ProgressiveOcarina, FAIRY_OCARINA);
-//  itemTable[OCARINA_OF_TIME]                   = Item(RG_OCARINA_OF_TIME,                   Text{"Ocarina of Time",                 "Ocarina du Temps",                 "Ocarina del Tiempo"},                      ITEMTYPE_ITEM, 0x8B, true,  &ProgressiveOcarina, OCARINA_OF_TIME);
-//  itemTable[BOMB_BAG]                          = Item(RG_BOMB_BAG,                          Text{"Bomb Bag",                        "Sac de Bombes",                    "Saco de bombas"},                          ITEMTYPE_ITEM, 0x82, true,  &ProgressiveBombBag, BOMB_BAG);
-//  itemTable[BIG_BOMB_BAG]                      = Item(RG_BIG_BOMB_BAG,                      Text{"Big Bomb Bag",                    "Grand Sac de Bombes",              "Saco de bombas grande"},                   ITEMTYPE_ITEM, 0x82, true,  &ProgressiveBombBag, BIG_BOMB_BAG);
-//  itemTable[BIGGEST_BOMB_BAG]                  = Item(RG_BIGGEST_BOMB_BAG,                  Text{"Biggest Bomb Bag",                "Énorme Sac de Bombes",             "Saco de bombas gigante"},                  ITEMTYPE_ITEM, 0x82, true,  &ProgressiveBombBag, BIGGEST_BOMB_BAG);
-//  itemTable[FAIRY_BOW]                         = Item(RG_FAIRY_BOW,                         Text{"Fairy Bow",                       "Arc des Fées",                     "Arco de las Hadas"},                       ITEMTYPE_ITEM, 0x83, true,  &ProgressiveBow, FAIRY_BOW);
-//  itemTable[BIG_QUIVER]                        = Item(RG_BIG_QUIVER,                        Text{"Big Quiver",                      "Grand carquois",                   "Carcaj grande"},                           ITEMTYPE_ITEM, 0x83, true,  &ProgressiveBow, BIG_QUIVER);
-//  itemTable[BIGGEST_QUIVER]                    = Item(RG_BIGGEST_QUIVER,                    Text{"Biggest Quiver",                  "Énorme carquois",                  "Carcaj gigante"},                          ITEMTYPE_ITEM, 0x83, true,  &ProgressiveBow, BIGGEST_QUIVER);
-//  itemTable[FAIRY_SLINGSHOT]                   = Item(RG_FAIRY_SLINGSHOT,                   Text{"Fairy Slingshot",                 "Lance-Pierre des Fées",            "Resortera de las hadas"},                  ITEMTYPE_ITEM, 0x84, true,  &ProgressiveBulletBag, FAIRY_SLINGSHOT);
-//  itemTable[BIG_BULLET_BAG]                    = Item(RG_BIG_BULLET_BAG,                    Text{"Big Deku Seed Bullet Bag",        "Grand sac de graines mojo",        "Bolsa de semillas deku grande"},           ITEMTYPE_ITEM, 0x84, true,  &ProgressiveBulletBag, BIG_BULLET_BAG);
-//  itemTable[BIGGEST_BULLET_BAD]                = Item(RG_BIGGEST_BULLET_BAD,                Text{"Biggest Deku Seed Bullet Bag",    "Énorme sac de graines mojo",       "Bolsa de semillas deku gigante"},          ITEMTYPE_ITEM, 0x84, true,  &ProgressiveBulletBag, BIGGEST_BULLET_BAD);
-//  itemTable[GORONS_BRACELET]                   = Item(RG_GORONS_BRACELET,                   Text{"Goron's Bracelet",                "Bracelet Goron",                   "Brazalete de los Goron"},                  ITEMTYPE_ITEM, 0x81, true,  &ProgressiveStrength, GORONS_BRACELET);
-//  itemTable[SILVER_GAUNTLETS]                  = Item(RG_SILVER_GAUNTLETS,                  Text{"Silver Gauntlets",                "Gantelets d'argent",               "Guantes de plata"},                        ITEMTYPE_ITEM, 0x81, true,  &ProgressiveStrength, SILVER_GAUNTLETS);
-//  itemTable[GOLDEN_GAUNTLETS]                  = Item(RG_GOLDEN_GAUNTLETS,                  Text{"Golden Gauntlets",                "Gantelets d'or",                   "Guantes de oro"},                          ITEMTYPE_ITEM, 0x81, true,  &ProgressiveStrength, GOLDEN_GAUNTLETS);
-//  itemTable[SILVER_SCALE]                      = Item(RG_SILVER_SCALE,                      Text{"Silver Scale",                    "Écaille d'argent",                 "Escama de Plata"},                         ITEMTYPE_ITEM, 0x86, true,  &ProgressiveScale, SILVER_SCALE);
-//  itemTable[GOLDEN_SCALE]                      = Item(RG_GOLDEN_SCALE,                      Text{"Golden Scale",                    "Écaille d'or",                     "Escama de Oro"},                           ITEMTYPE_ITEM, 0x86, true,  &ProgressiveScale, GOLDEN_SCALE);
-//  itemTable[ADULT_WALLET]                      = Item(RG_ADULT_WALLET,                      Text{"Adult Wallet",                    "Grande Bourse",                  "Bolsa de adulto"},                         ITEMTYPE_ITEM, 0x85, true,  &ProgressiveWallet, ADULT_WALLET);
-//  itemTable[GIANT_WALLET]                      = Item(RG_GIANT_WALLET,                      Text{"Giant Wallet",                    "Bourse de Géant",                  "Bolsa gigante"},                           ITEMTYPE_ITEM, 0x85, true,  &ProgressiveWallet, GIANT_WALLET);
-//  itemTable[TYCOON_WALLET]                     = Item(RG_TYCOON_WALLET,                     Text{"Tycoon Wallet",                   "Bourse de Magnat",                   "Bolsa de ricachón"},                       ITEMTYPE_ITEM, 0x85, true,  &ProgressiveWallet, TYCOON_WALLET);
-//  itemTable[DEKU_NUT_CAPACITY_30]              = Item(RG_DEKU_NUT_CAPACITY_30,              Text{"Deku Nut Capacity (30)",          "Capacité de noix Mojo (20)",       "Capacidad de nueces deku (40)"},           ITEMTYPE_ITEM, 0x87, false, &noVariable, DEKU_NUT_CAPACITY_30);
-//  itemTable[DEKU_NUT_CAPACITY_40]              = Item(RG_DEKU_NUT_CAPACITY_40,              Text{"Deku Nut Capacity (40)",          "Capacité de noix Mojo (30)",       "Capacidad de nueces deku (50)"},           ITEMTYPE_ITEM, 0x87, false, &noVariable, DEKU_NUT_CAPACITY_40);
-//  itemTable[DEKU_NUT_CAPACITY_20]              = Item(RG_DEKU_NUT_CAPACITY_20,              Text{"Deku Stick Capacity (20)",        "Capacité de Bâtons Mojo (20)",     "Capacidad de palos deku (20)"},            ITEMTYPE_ITEM, 0x88, false, &noVariable, DEKU_NUT_CAPACITY_20);
-//  itemTable[DEKU_NUT_CAPACITY_30]              = Item(RG_DEKU_NUT_CAPACITY_30,              Text{"Deku Nut Capacity (30)",          "Capacité de noix Mojo (20)",       "Capacidad de nueces deku (40)"},           ITEMTYPE_ITEM, 0x88, false, &noVariable, DEKU_NUT_CAPACITY_30);
-//  itemTable[MAGIC_METER]                       = Item(RG_MAGIC_METER,                       Text{"Magic Meter",                     "Jauge de Magie",                   "Poder mágico"},                            ITEMTYPE_ITEM, 0x8A, true,  &ProgressiveMagic, MAGIC_METER);
-//  itemTable[ENHANCED_MAGIC_METER]              = Item(RG_ENHANCED_MAGIC_METER,              Text{"Enhanced Magic Meter",            "Jauge de Magie améliorée",         "Poder mágico mejorado"},                   ITEMTYPE_ITEM, 0x8A, true,  &ProgressiveMagic, ENHANCED_MAGIC_METER);
-
-}
-
-Item& ItemTable(const uint32_t itemKey) {
-    return itemTable[itemKey];
-}
-
-Item& ItemFromGIID(const int giid) {
-    uint32_t index = 0;
-    while (index < KEY_ENUM_MAX) {
-        if (itemTable[index].GetItemID() == giid) {
-            return itemTable[index];
-        }
-        index++;
-    }
-
-    // there are vanilla items that don't exist in the item table we're reading from here
-    // if we made it this far, it means we didn't find an item in the table
-    // if we don't return anything, the game will crash, so, as a workaround, return greg
-    return itemTable[GREEN_RUPEE];
-}
-
-//This function should only be used to place items containing hint text
-//at gossip stone locations.
-void NewItem(const uint32_t itemKey, const Item item) {
-    if (itemKey <= BUY_RED_POTION_50) {
-      printf("\x1b[25;0HWARNING: ATTEMPTED TO OVERWRITE ITEM %lu\n", itemKey);
-      return;
-    }
-
-    itemTable[itemKey] = item;
-}
-
-std::array<Item, KEY_ENUM_MAX>* GetFullItemTable_() {
-    return &itemTable;
-}
-
diff --git a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
index 05d325b5b..039372cb0 100644
--- a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
@@ -821,16 +821,16 @@ void GenerateItemPool() {
   }
 
   if (ShuffleBossSouls.IsNot(BOSSSOULS_OFF)) {
-    AddItemToMainPool(GOHMA_BOSS_SOUL);
-    AddItemToMainPool(KING_DODONGO_BOSS_SOUL);
-    AddItemToMainPool(BARINADE_BOSS_SOUL);
-    AddItemToMainPool(PHANTOM_GANON_BOSS_SOUL);
-    AddItemToMainPool(VOLVAGIA_BOSS_SOUL);
-    AddItemToMainPool(MORPHA_BOSS_SOUL);
-    AddItemToMainPool(BONGO_BONGO_BOSS_SOUL);
-    AddItemToMainPool(TWINROVA_BOSS_SOUL);
+    AddItemToMainPool(RG_GOHMA_SOUL);
+    AddItemToMainPool(RG_KING_DODONGO_SOUL);
+    AddItemToMainPool(RG_BARINADE_SOUL);
+    AddItemToMainPool(RG_PHANTOM_GANON_SOUL);
+    AddItemToMainPool(RG_VOLVAGIA_SOUL);
+    AddItemToMainPool(RG_MORPHA_SOUL);
+    AddItemToMainPool(RG_BONGO_BONGO_SOUL);
+    AddItemToMainPool(RG_TWINROVA_SOUL);
     if (ShuffleBossSouls.Is(BOSSSOULS_ON_PLUS_GANON)) {
-      AddItemToMainPool(GANON_BOSS_SOUL);
+      AddItemToMainPool(RG_GANON_SOUL);
     }
   }
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/logic.cpp b/soh/soh/Enhancements/randomizer/3drando/logic.cpp
index 33032a62e..04b14ce56 100644
--- a/soh/soh/Enhancements/randomizer/3drando/logic.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/logic.cpp
@@ -478,9 +478,6 @@ namespace Logic {
     if (ShuffleBossSouls.Is(BOSSSOULS_OFF)) {
       return true;
     }
-    if (ShuffleBossSouls.IsNot(BOSSSOULS_ON_PLUS_GANON) && itemName == RG_GANON_SOUL) {
-      return true;
-    }
     return (itemName == RG_GOHMA_SOUL && CanSummonGohma)         ||
     (itemName == RG_KING_DODONGO_SOUL && CanSummonKingDodongo)   ||
     (itemName == RG_BARINADE_SOUL && CanSummonBarinade)          ||
@@ -489,7 +486,7 @@ namespace Logic {
     (itemName == RG_MORPHA_SOUL && CanSummonMorpha)              ||
     (itemName == RG_MORPHA_SOUL && CanSummonBongoBongo)     ||
     (itemName == RG_TWINROVA_SOUL && CanSummonTwinrova)          ||
-    (ShuffleBossSouls.Is(BOSSSOULS_ON_PLUS_GANON) && (itemName == RG_GANON_SOUL && CanSummonGanon));
+    (itemName == RG_GANON_SOUL && CanSummonGanon);
 
   }
 

From 9d8eab45111e9918487675dd50cfb038901520fd Mon Sep 17 00:00:00 2001
From: Ralphie Morell <stratomaster64@gmail.com>
Date: Fri, 20 Oct 2023 00:16:21 -0400
Subject: [PATCH 009/230] add souls back to item list

---
 soh/soh/Enhancements/randomizer/3drando/logic.cpp |  2 +-
 soh/soh/Enhancements/randomizer/item_list.cpp     | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/logic.cpp b/soh/soh/Enhancements/randomizer/3drando/logic.cpp
index 04b14ce56..7ecfc0819 100644
--- a/soh/soh/Enhancements/randomizer/3drando/logic.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/logic.cpp
@@ -484,7 +484,7 @@ namespace Logic {
     (itemName == RG_PHANTOM_GANON_SOUL && CanSummonPhantomGanon) ||
     (itemName == RG_VOLVAGIA_SOUL && CanSummonVolvagia)          ||
     (itemName == RG_MORPHA_SOUL && CanSummonMorpha)              ||
-    (itemName == RG_MORPHA_SOUL && CanSummonBongoBongo)     ||
+    (itemName == RG_MORPHA_SOUL && CanSummonBongoBongo)          ||
     (itemName == RG_TWINROVA_SOUL && CanSummonTwinrova)          ||
     (itemName == RG_GANON_SOUL && CanSummonGanon);
 
diff --git a/soh/soh/Enhancements/randomizer/item_list.cpp b/soh/soh/Enhancements/randomizer/item_list.cpp
index 50ad6c36a..4f89a2b86 100644
--- a/soh/soh/Enhancements/randomizer/item_list.cpp
+++ b/soh/soh/Enhancements/randomizer/item_list.cpp
@@ -238,6 +238,16 @@ void Rando::StaticData::InitItemTable() {
     itemTable[RG_BUY_RED_POTION_40] =                   Item(RG_BUY_RED_POTION_40,                Text{ "Buy Red Potion [40]", "Acheter: Potion Rouge [40]", "Rotes Elixier kaufen [40]" },                         ITEMTYPE_SHOP,              GI_POTION_RED,      false, &Logic::noVariable,          RHT_BOTTLE_WITH_RED_POTION, ITEM_POTION_RED,                OBJECT_GI_LIQUID,       GID_POTION_RED,     0x43,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 40);
     itemTable[RG_BUY_RED_POTION_50] =                   Item(RG_BUY_RED_POTION_50,                Text{ "Buy Red Potion [50]", "Acheter: Potion Rouge [50]", "Rotes Elixier kaufen [50]" },                         ITEMTYPE_SHOP,              GI_POTION_RED,      false, &Logic::noVariable,          RHT_BOTTLE_WITH_RED_POTION, ITEM_POTION_RED,                OBJECT_GI_LIQUID,       GID_POTION_RED,     0x43,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 50);
     // Misc.
+    itemTable[RG_GOHMA_SOUL] =                          Item(RG_GOHMA_SOUL,                      Text{ "Gohma's Soul", "", "" },                                                                                   ITEMTYPE_ITEM,              RG_GOHMA_SOUL,      true,  &Logic::CanSummonGohma,      RHT_GOHMA_SOUL,             RG_GOHMA_SOUL,                  OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_KING_DODONGO_SOUL] =                   Item(RG_KING_DODONGO_SOUL,               Text{ "King Dodongo's Soul", "", "" },                                                                            ITEMTYPE_ITEM,              RG_KING_DODONGO_SOUL,true, &Logic::CanSummonKingDodongo,RHT_KING_DODONGO_SOUL,      RG_KING_DODONGO_SOUL,           OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BARINADE_SOUL] =                       Item(RG_BARINADE_SOUL,                   Text{ "Barinade's Soul", "", "" },                                                                                ITEMTYPE_ITEM,              RG_BARINADE_SOUL,   true,  &Logic::CanSummonBarinade,   RHT_BARINADE_SOUL,          RG_BARINADE_SOUL,               OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_PHANTOM_GANON_SOUL] =                  Item(RG_PHANTOM_GANON_SOUL,              Text{ "Phantom Ganon's Soul", "", "" },                                                                           ITEMTYPE_ITEM,              RG_PHANTOM_GANON_SOUL,true,&Logic::CanSummonPhantomGanon,RHT_PHANTOM_GANON_SOUL,    RG_PHANTOM_GANON_SOUL,          OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_VOLVAGIA_SOUL] =                       Item(RG_VOLVAGIA_SOUL,                   Text{ "Volvagia's Soul", "", "" },                                                                                ITEMTYPE_ITEM,              RG_VOLVAGIA_SOUL,   true,  &Logic::CanSummonVolvagia,   RHT_VOLVAGIA_SOUL,          RG_VOLVAGIA_SOUL,               OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_MORPHA_SOUL] =                         Item(RG_MORPHA_SOUL,                     Text{ "Morpha's Soul", "", "" },                                                                                  ITEMTYPE_ITEM,              RG_MORPHA_SOUL,     true,  &Logic::CanSummonMorpha,     RHT_MORPHA_SOUL,            RG_MORPHA_SOUL,                 OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BONGO_BONGO_SOUL] =                    Item(RG_BONGO_BONGO_SOUL,                Text{ "Bongo Bongo's Soul", "", "" },                                                                             ITEMTYPE_ITEM,              RG_BONGO_BONGO_SOUL,true,  &Logic::CanSummonBongoBongo, RHT_BONGO_BONGO_SOUL,       RG_BONGO_BONGO_SOUL,            OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_TWINROVA_SOUL] =                       Item(RG_TWINROVA_SOUL,                   Text{ "Twinrova's Soul", "", "" },                                                                                ITEMTYPE_ITEM,              RG_TWINROVA_SOUL,   true,  &Logic::CanSummonTwinrova,   RHT_TWINROVA_SOUL,          RG_TWINROVA_SOUL,               OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_GANON_SOUL] =                          Item(RG_GANON_SOUL,                      Text{ "Ganon's Soul", "", "" },                                                                                   ITEMTYPE_ITEM,              RG_GANON_SOUL,      true,  &Logic::CanSummonGanon,      RHT_GANON_SOUL,             RG_GANON_SOUL,                  OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+
     itemTable[RG_TRIFORCE] =                            Item(RG_TRIFORCE,                         Text{ "Triforce", "Triforce", "Triforce" },                                                                       ITEMTYPE_EVENT,             RG_TRIFORCE,        false, &Logic::noVariable,          RHT_NONE);
     itemTable[RG_HINT] =                                Item(RG_HINT,                             Text{ "Hint", "Indice", "Hinweis" },                                                                              ITEMTYPE_EVENT,             RG_HINT,            false, &Logic::noVariable,          RHT_NONE);
     // Individual stages of progressive items (only here for GetItemEntry purposes, not for use in seed gen)

From 4d7fb88e2e8e917f0b2591a011e4514e8ce10e63 Mon Sep 17 00:00:00 2001
From: Christopher Leggett <chris@leggett.dev>
Date: Fri, 20 Oct 2023 15:37:59 -0400
Subject: [PATCH 010/230] Fix 100 GS check in check tracker (#3311)

---
 soh/soh/Enhancements/randomizer/location_list.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/soh/soh/Enhancements/randomizer/location_list.cpp b/soh/soh/Enhancements/randomizer/location_list.cpp
index 05b28fc17..3a07c3a08 100644
--- a/soh/soh/Enhancements/randomizer/location_list.cpp
+++ b/soh/soh/Enhancements/randomizer/location_list.cpp
@@ -627,7 +627,7 @@ void Rando::StaticData::InitLocationTable() {
     locationTable[RC_KAK_30_GOLD_SKULLTULA_REWARD] =                Location::Base(RC_KAK_30_GOLD_SKULLTULA_REWARD,         RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_HOUSE_OF_SKULLTULA,        0x00,                         0x46, "30 Gold Skulltula Reward",          "Kak 30 Gold Skulltula Reward",         RHT_KAK_30_GOLD_SKULLTULA_REWARD,         RG_PROGRESSIVE_WALLET,   {},                        SpoilerCollectionCheck::EventChkInf(0xDC),         SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
     locationTable[RC_KAK_40_GOLD_SKULLTULA_REWARD] =                Location::Base(RC_KAK_40_GOLD_SKULLTULA_REWARD,         RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_HOUSE_OF_SKULLTULA,        0x00,                         0x03, "40 Gold Skulltula Reward",          "Kak 40 Gold Skulltula Reward",         RHT_KAK_40_GOLD_SKULLTULA_REWARD,         RG_BOMBCHU_10,           {},                        SpoilerCollectionCheck::EventChkInf(0xDD),         SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
     locationTable[RC_KAK_50_GOLD_SKULLTULA_REWARD] =                Location::Base(RC_KAK_50_GOLD_SKULLTULA_REWARD,         RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_HOUSE_OF_SKULLTULA,        0x00,                         0x3E, "50 Gold Skulltula Reward",          "Kak 50 Gold Skulltula Reward",         RHT_KAK_50_GOLD_SKULLTULA_REWARD,         RG_PIECE_OF_HEART,       {},                        SpoilerCollectionCheck::EventChkInf(0xDE),         SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
-    locationTable[RC_KAK_100_GOLD_SKULLTULA_REWARD] =               Location::Base(RC_KAK_100_GOLD_SKULLTULA_REWARD,        RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_HOUSE_OF_SKULLTULA,        0x00,                         0x3E, "100 Gold Skulltula Reward",         "Kak 100 Gold Skulltula Reward",        RHT_KAK_100_GOLD_SKULLTULA_REWARD,        RG_HUGE_RUPEE,           {},                        SpoilerCollectionCheck::EventChkInf(0xDF),         SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_100_GOLD_SKULLTULA_REWARD] =               Location::Base(RC_KAK_100_GOLD_SKULLTULA_REWARD,        RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_HOUSE_OF_SKULLTULA,        0x00,                         0x3E, "100 Gold Skulltula Reward",         "Kak 100 Gold Skulltula Reward",        RHT_KAK_100_GOLD_SKULLTULA_REWARD,        RG_HUGE_RUPEE,           {},                        SpoilerCollectionCheck::RandomizerInf(SCENE_HOUSE_OF_SKULLTULA, RAND_INF_KAK_100_GOLD_SKULLTULA_REWARD), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
     locationTable[RC_KAK_MAN_ON_ROOF] =                             Location::Base(RC_KAK_MAN_ON_ROOF,                      RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_KAKARIKO_VILLAGE,          0x00,                         0x3E, "Man on Roof",                       "Kak Man on Roof",                      RHT_KAK_MAN_ON_ROOF,                      RG_PIECE_OF_HEART,       {},                        SpoilerCollectionCheck::ItemGetInf(29),            SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
     locationTable[RC_KAK_SHOOTING_GALLERY_REWARD] =                 Location::Base(RC_KAK_SHOOTING_GALLERY_REWARD,          RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_SHOOTING_GALLERY,          0x00,                         0x30, "Shooting Gallery Reward",           "Kak Shooting Gallery Reward",          RHT_KAK_SHOOTING_GALLERY_REWARD,          RG_PROGRESSIVE_BOW,      {},                        SpoilerCollectionCheck::Chest(0x42, 0x1F),         SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
     locationTable[RC_KAK_TRADE_ODD_MUSHROOM] =                      Location::Base(RC_KAK_TRADE_ODD_MUSHROOM,               RCQUEST_BOTH, RCTYPE_ADULT_TRADE, RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_POTION_SHOP_GRANNY,        0x00,                         0x20, "Trade Odd Mushroom",                "Kak Trade Odd Mushroom",               RHT_KAK_TRADE_ODD_MUSHROOM,               RG_ODD_POTION,           { Category::cAdultTrade }, SpoilerCollectionCheck::ItemGetInf(56),            SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);

From 2a52493d1f510b8b124e1b2d451b780520d15b06 Mon Sep 17 00:00:00 2001
From: Christopher Leggett <chris@leggett.dev>
Date: Fri, 20 Oct 2023 20:43:25 -0400
Subject: [PATCH 011/230] 100GS Tracker Fix (#3314)

* Fix 100 GS check in check tracker

* Add missing rcToRandomizerInf entry for 100 GS tokens
---
 soh/soh/Enhancements/randomizer/randomizer.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index 5239e0f45..06112f3de 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -2574,6 +2574,7 @@ std::map<RandomizerCheck, RandomizerInf> rcToRandomizerInf = {
     { RC_LH_CHILD_FISHING,                                            RAND_INF_CHILD_FISHING },
     { RC_LH_ADULT_FISHING,                                            RAND_INF_ADULT_FISHING },
     { RC_MARKET_10_BIG_POES,                                          RAND_INF_10_BIG_POES },
+    { RC_KAK_100_GOLD_SKULLTULA_REWARD,                               RAND_INF_KAK_100_GOLD_SKULLTULA_REWARD },
 };
 
 Rando::Location* Randomizer::GetCheckObjectFromActor(s16 actorId, s16 sceneNum, s32 actorParams = 0x00) {

From 15ebcd30fb6d0a0e04b4baf2fec564de81da59ab Mon Sep 17 00:00:00 2001
From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Date: Sun, 22 Oct 2023 16:11:36 +0100
Subject: [PATCH 012/230] Remove disabled special hints and warp song hints
 from the spoiler log (#3110)

* Initial implementation of no-duplicates of special hints

* stupid fixes

* fix always hints being suppressed by special hints

* Impa's song will no longer be hinted when you skip child zelda

* fix building

* Remove disabled special hints from the spoiler log

* Fix Loading spoiler logs causing corrupt hints, remove disabled warp song shuffle text from spoiler logs

* Fix not detecting text size correctly and badly named greg hint

* Remove disabled special hints from the spoiler log

* Fix Loading spoiler logs causing corrupt hints, remove disabled warp song shuffle text from spoiler logs

* Remove Sheik and Saria hints from the spoiler log when are not enabled

* Prevent Magic hinted by Saria and Light Arrows hinted by Sheik from being hinted elsewhere unless they are locked by that item.

* Prevent the Final Frogs gossip stone hint from spawning when the special final frogs hint is enabled.

* Fix building after rebasing in deduplication

* redelete keys.hpp
---
 soh/soh/Enhancements/mods.cpp                 |   2 +-
 .../Enhancements/randomizer/3drando/fill.cpp  |  13 +-
 .../randomizer/3drando/hint_list.cpp          |  51 +++--
 .../Enhancements/randomizer/3drando/hints.cpp | 182 +++++++++++-------
 .../Enhancements/randomizer/3drando/hints.hpp |   7 +-
 .../randomizer/3drando/location_access.cpp    |   5 +-
 .../location_access/locacc_castle_town.cpp    |   3 +
 .../location_access/locacc_ganons_castle.cpp  |  10 +-
 .../location_access/locacc_kakariko.cpp       |   5 +-
 .../randomizer/3drando/settings.hpp           |   2 +
 .../randomizer/3drando/spoiler_log.cpp        |  59 +++---
 soh/soh/Enhancements/randomizer/context.cpp   |   4 +-
 soh/soh/Enhancements/randomizer/location.cpp  |   8 +-
 soh/soh/Enhancements/randomizer/location.h    |   5 +-
 .../Enhancements/randomizer/location_list.cpp |  23 ++-
 .../Enhancements/randomizer/randomizer.cpp    | 102 +++++-----
 .../Enhancements/randomizer/randomizerTypes.h |   8 +
 soh/soh/Enhancements/randomizer/static_data.h |   1 +
 18 files changed, 297 insertions(+), 193 deletions(-)

diff --git a/soh/soh/Enhancements/mods.cpp b/soh/soh/Enhancements/mods.cpp
index 73d6c4634..838816997 100644
--- a/soh/soh/Enhancements/mods.cpp
+++ b/soh/soh/Enhancements/mods.cpp
@@ -996,7 +996,7 @@ void RegisterAltTrapTypes() {
 void RegisterRandomizerSheikSpawn() {
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneSpawnActors>([]() {
         if (!gPlayState) return;
-        bool canSheik = (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIAL_COUNT) != RO_GANONS_TRIALS_SKIP && 
+        bool canSheik = (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIAL_COUNT) != 0 && 
           OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_LIGHT_ARROWS_HINT));
         if (!IS_RANDO || !LINK_IS_ADULT || !canSheik) return;
         switch (gPlayState->sceneNum) {
diff --git a/soh/soh/Enhancements/randomizer/3drando/fill.cpp b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
index b0a99d85d..3f1f685be 100644
--- a/soh/soh/Enhancements/randomizer/3drando/fill.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
@@ -1098,6 +1098,12 @@ int Fill() {
       printf("Done");
       ctx->CreateItemOverrides();
       CreateEntranceOverrides();
+      //Always execute ganon hint generation for the funny line  
+      CreateGanonAndSheikText();
+      CreateAltarText();
+      CreateDampesDiaryText();
+      CreateGregRupeeHint();
+      CreateSariaText();
       if (GossipStoneHints.IsNot(HINTS_NO_HINTS)) {
         printf("\x1b[10;10HCreating Hints...");
         CreateAllHints();
@@ -1106,13 +1112,6 @@ int Fill() {
       if (ShuffleMerchants.Is(SHUFFLEMERCHANTS_HINTS)) {
         CreateMerchantsHints();
       }
-      //Always execute ganon hint generation for the funny line
-      CreateGanonText();
-      CreateAltarText();
-      CreateDampesDiaryText();
-      CreateGregRupeeHint();
-      CreateSheikText();
-      CreateSariaText();
       CreateWarpSongTexts();
       return 1;
     }
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
index fc47069fe..c8e1d4fa2 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
@@ -48,22 +48,6 @@ void HintTable_Init() {
     |     ALWAYS HINT TEXT     |
     ---------------------------*/
 
-    hintTable[RHT_ZR_FROGS_OCARINA_GAME] = HintText::Always(
-        {
-            // obscure text
-            Text{ "an #amphibian feast# yields", /*french*/ "un #festin d'amphibiens# donne",
-                  /*spanish*/ "una #fiesta anfibia# brinda" },
-            Text{ "the #croaking choir's magnum opus# awards", /*french*/ "la #chorale coassante# donne",
-                  /*spanish*/ "un #coro maestro de ancas# premia" },
-            Text{ "the #froggy finale# yields", /*french*/ "la #finale amphibienne# donne",
-                  /*spanish*/ "el #gran final batracio# brinda" },
-        },
-        {},
-        // clear text
-        Text{ "the final reward from the #Frogs of Zora's River# is",
-              /*french*/ "la dernière récompense des #grenouilles de la Rivière Zora# est",
-              /*spanish*/ "la recompensa final de las #ranas del Río Zora# premia" });
-
     hintTable[RHT_KF_LINKS_HOUSE_COW] = HintText::Always(
         {
             // obscure text
@@ -488,6 +472,22 @@ void HintTable_Init() {
         Text{ "a #cow behind webs# in a grotto gifts", /*french*/ "la #vache derrière les toiles# d'une grotte donne",
               /*spanish*/ "una #vaca tras la telaraña# de una cueva brinda" });
 
+    hintTable[RHT_ZR_FROGS_OCARINA_GAME] = HintText::Always(
+        {
+            // obscure text
+            Text{ "an #amphibian feast# yields", /*french*/ "un #festin d'amphibiens# donne",
+                  /*spanish*/ "una #fiesta anfibia# brinda" },
+            Text{ "the #croaking choir's magnum opus# awards", /*french*/ "la #chorale coassante# donne",
+                  /*spanish*/ "un #coro maestro de ancas# premia" },
+            Text{ "the #froggy finale# yields", /*french*/ "la #finale amphibienne# donne",
+                  /*spanish*/ "el #gran final batracio# brinda" },
+        },
+        {},
+        // clear text
+        Text{ "the final reward from the #Frogs of Zora's River# is",
+              /*french*/ "la dernière récompense des #grenouilles de la Rivière Zora# est",
+              /*spanish*/ "la recompensa final de las #ranas del Río Zora# premia" });
+
     hintTable[RHT_ZF_GS_HIDDEN_CAVE] = HintText::Sometimes({
         // obscure text
         Text{ "a spider high #above the icy waters# holds", /*french*/ "l'araignée #en haut des eaux glacées# donne",
@@ -2959,6 +2959,16 @@ void HintTable_Init() {
             "Ja, ja, ja... Nunca me derrotarás reflejando mis esferas de energía y desplegando la flecha de luz de " },
     });
 
+    hintTable[RHT_SHEIK_LIGHT_ARROW_HINT] = HintText::LightArrow({
+        // obscure text
+        Text{
+            "I overheard Ganondorf say that he misplaced the %yLight Arrows%w in&%r",
+            /*french*/
+            "J'ai entendu dire que Ganondorf aurait caché les %yFlèches de Lumière%w dans %r",
+            /*spanish*/
+            ""},
+    });
+
     hintTable[RHT_YOUR_POCKET] = HintText::Exclude({
         // obscure text
         Text{ "your pocket", /*french*/ "tes poches", /*spanish*/ "tu bolsillo" },
@@ -3193,7 +3203,7 @@ int32_t TokensRequiredBySettings() {
     return tokens;
 }
 
-std::array<ConditionalAlwaysHint, 9> conditionalAlwaysHints = {
+std::array<ConditionalAlwaysHint, 10> conditionalAlwaysHints = {
     std::make_pair(RC_MARKET_10_BIG_POES,
                    []() {
                        return Settings::BigPoeTargetCount.Value<uint8_t>() >= 3;
@@ -3203,9 +3213,10 @@ std::array<ConditionalAlwaysHint, 9> conditionalAlwaysHints = {
     std::make_pair(RC_HF_OCARINA_OF_TIME_ITEM, []() { return StonesRequiredBySettings() < 2; }),
     std::make_pair(RC_SHEIK_IN_KAKARIKO, []() { return MedallionsRequiredBySettings() < 5; }),
     std::make_pair(RC_DMT_TRADE_CLAIM_CHECK, []() { return false; }),
-    std::make_pair(RC_KAK_30_GOLD_SKULLTULA_REWARD, []() { return TokensRequiredBySettings() < 30; }),
-    std::make_pair(RC_KAK_40_GOLD_SKULLTULA_REWARD, []() { return TokensRequiredBySettings() < 40; }),
-    std::make_pair(RC_KAK_50_GOLD_SKULLTULA_REWARD, []() { return TokensRequiredBySettings() < 50; })
+    std::make_pair(RC_KAK_30_GOLD_SKULLTULA_REWARD, []() { return TokensRequiredBySettings() < 30 && !Settings::Kak30GSHintText; }),
+    std::make_pair(RC_KAK_40_GOLD_SKULLTULA_REWARD, []() { return TokensRequiredBySettings() < 40 && !Settings::Kak40GSHintText; }),
+    std::make_pair(RC_KAK_50_GOLD_SKULLTULA_REWARD, []() { return TokensRequiredBySettings() < 50 && !Settings::Kak50GSHintText; }),
+    std::make_pair(RC_ZR_FROGS_OCARINA_GAME, []() { return !Settings::FrogsHintText; }),
 };
 
 const HintText& Hint(const RandomizerHintTextKey hintKey) {
diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.cpp b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
index e0ae47dd0..f3d2051bb 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hints.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
@@ -275,6 +275,25 @@ static std::vector<RandomizerCheck> GetAccessibleGossipStones(const RandomizerCh
   return accessibleGossipStones;
 }
 
+bool IsReachableWithout(std::vector<RandomizerCheck> locsToCheck, RandomizerCheck excludedCheck, bool resetAfter = true){
+  //temporarily remove the hinted location's item, and then perform a
+  //reachability search for this check
+  auto ctx = Rando::Context::GetInstance();
+  RandomizerGet originalItem = ctx->GetItemLocation(excludedCheck)->GetPlacedRandomizerGet();
+  ctx->GetItemLocation(excludedCheck)->SetPlacedItem(RG_NONE);
+  LogicReset();
+  const auto rechableWithout = GetAccessibleLocations(locsToCheck);
+  ctx->GetItemLocation(excludedCheck)->SetPlacedItem(originalItem);
+  if (resetAfter){
+    //if resetAfter is on, reset logic we are done
+    LogicReset();
+  }
+  if (rechableWithout.empty()) {
+    return false;
+  }
+  return true;
+}
+
 static void AddHint(Text hint, const RandomizerCheck gossipStone, const std::vector<uint8_t>& colors = {}, HintType hintType = HINT_TYPE_ITEM, const RandomizerCheck hintedLocation = RC_UNKNOWN_CHECK) {
   //save hints as dummy items for writing to the spoiler log
   //NewItem(gossipStone, Item{RG_HINT, hint, ITEMTYPE_EVENT, GI_RUPEE_BLUE_LOSE, false, &noVariable, NONE});
@@ -479,10 +498,6 @@ static void CreateRandomLocationHint(const bool goodItem = false) {
   }
 }
 
-static void CreateGoodItemHint() {
-  CreateRandomLocationHint(true);
-}
-
 static void CreateJunkHint() {
   //duplicate junk hints are possible for now
   const HintText junkHint = RandomElement(GetHintCategory(HintCategory::Junk));
@@ -596,41 +611,56 @@ static void CreateTrialHints() {
   }
 }
 
-void CreateGanonText() {
+void CreateGanonAndSheikText() {
   auto ctx = Rando::Context::GetInstance();
   //funny ganon line
   ganonText = RandomElement(GetHintCategory(HintCategory::GanonLine)).GetText();
   CreateMessageFromTextObject(0x70CB, 0, 2, 3, AddColorsAndFormat(ganonText));
 
-  //Get the location of the light arrows
-  auto lightArrowLocation = FilterFromPool(ctx->allLocations, [ctx](const RandomizerCheck loc) {
+  if(Settings::LightArrowHintText){
+    //Get the location of the light arrows
+    auto lightArrowLocation = FilterFromPool(ctx->allLocations, [ctx](const RandomizerCheck loc) {
       return ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == RG_LIGHT_ARROWS;
-  });
+    });
+    Text lightArrowArea = GetHintRegion(ctx->GetItemLocation(lightArrowLocation[0])->GetParentRegionKey())->GetHint().GetText();
+    std::vector<RandomizerCheck> locsToCheck = {RC_GANONDORF_HINT};
+    
 
-  //If there is no light arrow location, it was in the player's inventory at the start
-  auto hint = Hint(RHT_LIGHT_ARROW_LOCATION_HINT);
-  if (lightArrowLocation.empty()) {
-    ganonHintText = hint.GetText()+Hint(RHT_YOUR_POCKET).GetText();
-    lightArrowHintLoc = "Link's Pocket";
-  } else {
-      ganonHintText =
-          hint.GetText() + "%r" +
-          GetHintRegion(ctx->GetItemLocation(lightArrowLocation[0])->GetParentRegionKey())->GetHint().GetText();
+    //If there is no light arrow location, it was in the player's inventory at the start
+    auto hint = Hint(RHT_LIGHT_ARROW_LOCATION_HINT);
+    if (lightArrowLocation.empty()) {
+      ganonHintText = hint.GetText()+Hint(RHT_YOUR_POCKET).GetText();
+      lightArrowHintLoc = "Link's Pocket";
+    } else {
+      ganonHintText = hint.GetText() + "%r" + lightArrowArea;
       lightArrowHintLoc = Rando::StaticData::GetLocation(lightArrowLocation[0])->GetName();
-  }
-  ganonHintText = ganonHintText + "!";
+    }
+    ganonHintText = ganonHintText + "!";
+    CreateMessageFromTextObject(0x70CC, 0, 2, 3, AddColorsAndFormat(ganonHintText));
+    ctx->AddHint(RH_GANONDORF_HINT, ganonHintText, lightArrowLocation[0], HINT_TYPE_STATIC, GetHintRegion(ctx->GetItemLocation(lightArrowLocation[0])->GetParentRegionKey())->GetHint().GetText());
 
-  CreateMessageFromTextObject(0x70CC, 0, 2, 3, AddColorsAndFormat(ganonHintText));
-  ctx->AddHint(RH_GANONDORF_HINT, ganonHintText, lightArrowLocation[0], HINT_TYPE_STATIC, GetHintRegion(ctx->GetItemLocation(lightArrowLocation[0])->GetParentRegionKey())->GetHint().GetText());
+    if(!Settings::GanonsTrialsCount.Is(0)){
+      sheikText = Hint(RHT_SHEIK_LIGHT_ARROW_HINT).GetText() + lightArrowArea + "%w.";
+      locsToCheck = {RC_GANONDORF_HINT, RC_SHEIK_HINT_GC, RC_SHEIK_HINT_MQ_GC};
+    }
+
+    if (IsReachableWithout(locsToCheck,lightArrowLocation[0],true)){
+      ctx->GetItemLocation(lightArrowLocation[0])->SetAsHinted();
+    }
+  }
 }
 
 //Find the location which has the given itemKey and create the generic altar text for the reward
-static Text BuildDungeonRewardText(const RandomizerGet itemKey) {
+static Text BuildDungeonRewardText(const RandomizerGet itemKey, bool isChild) {
     auto ctx = Rando::Context::GetInstance();
+    RandomizerCheck altarLoc = RC_ALTAR_HINT_ADULT;
+    if(isChild){altarLoc = RC_ALTAR_HINT_CHILD;}
     RandomizerCheck location = FilterFromPool(ctx->allLocations, [itemKey, ctx](const RandomizerCheck loc) {
         return ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == itemKey;
     })[0];
-    ctx->GetItemLocation(location)->SetAsHinted();
+    if (IsReachableWithout({altarLoc}, location, true) || ShuffleRewards.Is(REWARDSHUFFLE_END_OF_DUNGEON)){ //RANDOTODO check if works properly
+      ctx->GetItemLocation(location)->SetAsHinted();
+    }
 
     std::string rewardString = "$" + std::to_string(itemKey - RG_KOKIRI_EMERALD);
 
@@ -760,11 +790,11 @@ void CreateAltarText() {
     childAltarText = Hint(RHT_SPIRITUAL_STONE_TEXT_START).GetText()+"^"+
     //Spiritual Stones
         (StartingKokiriEmerald.Value<uint8_t>() ? Text{ "##", "##", "##" }
-                                                : BuildDungeonRewardText(RG_KOKIRI_EMERALD)) +
+                                                : BuildDungeonRewardText(RG_KOKIRI_EMERALD, true)) +
         (StartingGoronRuby.Value<uint8_t>() ? Text{ "##", "##", "##" }
-                                            : BuildDungeonRewardText(RG_GORON_RUBY)) +
+                                            : BuildDungeonRewardText(RG_GORON_RUBY, true)) +
         (StartingZoraSapphire.Value<uint8_t>() ? Text{ "##", "##", "##" }
-                                              : BuildDungeonRewardText(RG_ZORA_SAPPHIRE)) +
+                                              : BuildDungeonRewardText(RG_ZORA_SAPPHIRE, true)) +
     //How to open Door of Time, the event trigger is necessary to read the altar multiple times
     BuildDoorOfTimeText();
   } else {
@@ -780,17 +810,17 @@ void CreateAltarText() {
     adultAltarText = adultAltarText +
     //Medallion Areas
         (StartingLightMedallion.Value<uint8_t>() ? Text{ "##", "##", "##" }
-                                                : BuildDungeonRewardText(RG_LIGHT_MEDALLION)) +
+                                                : BuildDungeonRewardText(RG_LIGHT_MEDALLION, false)) +
         (StartingForestMedallion.Value<uint8_t>() ? Text{ "##", "##", "##" }
-                                                  : BuildDungeonRewardText(RG_FOREST_MEDALLION)) +
+                                                  : BuildDungeonRewardText(RG_FOREST_MEDALLION, false)) +
         (StartingFireMedallion.Value<uint8_t>() ? Text{ "##", "##", "##" }
-                                                : BuildDungeonRewardText(RG_FIRE_MEDALLION)) +
+                                                : BuildDungeonRewardText(RG_FIRE_MEDALLION, false)) +
         (StartingWaterMedallion.Value<uint8_t>() ? Text{ "##", "##", "##" }
-                                                : BuildDungeonRewardText(RG_WATER_MEDALLION)) +
+                                                : BuildDungeonRewardText(RG_WATER_MEDALLION, false)) +
         (StartingSpiritMedallion.Value<uint8_t>() ? Text{ "##", "##", "##" }
-                                                  : BuildDungeonRewardText(RG_SPIRIT_MEDALLION)) +
+                                                  : BuildDungeonRewardText(RG_SPIRIT_MEDALLION, false)) +
         (StartingShadowMedallion.Value<uint8_t>() ? Text{ "##", "##", "##" }
-                                                  : BuildDungeonRewardText(RG_SHADOW_MEDALLION));
+                                                  : BuildDungeonRewardText(RG_SHADOW_MEDALLION, false));
   }
   adultAltarText = adultAltarText + 
   //Bridge requirement
@@ -846,6 +876,10 @@ void CreateDampesDiaryText() {
   RandomizerCheck location = FilterFromPool(ctx->allLocations, [item, ctx](const RandomizerCheck loc) {
       return ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == item;
   })[0];
+  if (IsReachableWithout({RC_DAMPE_HINT},location,true)){
+    ctx->GetItemLocation(location)->SetAsHinted();
+  }
+
   Text area = GetHintRegion(ctx->GetItemLocation(location)->GetParentRegionKey())->GetHint().GetText();
   Text temp1 = Text{
     "Whoever reads this, please enter %r", 
@@ -875,6 +909,9 @@ void CreateGregRupeeHint() {
       return ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == RG_GREG_RUPEE;
   })[0];
   Text area = GetHintRegion(ctx->GetItemLocation(location)->GetParentRegionKey())->GetHint().GetText();
+  if (IsReachableWithout({RC_GREG_HINT},location,true)){
+    ctx->GetItemLocation(location)->SetAsHinted();
+  }
 
   Text temp1 = Text{
     "By the way, if you're interested, I saw the shiniest %gGreen Rupee%w somewhere in%r ",
@@ -892,38 +929,30 @@ void CreateGregRupeeHint() {
     ctx->AddHint(RH_GREG_RUPEE, gregText, location, HINT_TYPE_STATIC, area);
 }
 
-void CreateSheikText() {
-  auto ctx = Rando::Context::GetInstance();
-  //Get the location of the light arrows
-  auto lightArrowLocation = FilterFromPool(ctx->allLocations, [ctx](const RandomizerCheck loc){return ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == RG_LIGHT_ARROWS;});
-  lightArrowHintLoc = Rando::StaticData::GetLocation(lightArrowLocation[0])->GetName();
-  Text area = GetHintRegion(ctx->GetItemLocation(lightArrowLocation[0])->GetParentRegionKey())->GetHint().GetText();
-  Text temp1 = Text{
-    "I overheard Ganondorf say that he misplaced the %yLight Arrows%w in&%r",
-    "J'ai entendu dire que Ganondorf aurait caché les %yFlèches de Lumière%w dans %r",
-    ""
-  };
-  Text temp2 = Text{"%w.", "%w.", "%w."};
-  sheikText = temp1 + area + temp2;
-}
 
 void CreateSariaText() {
-  auto ctx = Rando::Context::GetInstance();
-  //Get the location of a magic upgrade
-  auto magicLocation = FilterFromPool(ctx->allLocations, [ctx](const RandomizerCheck loc){return ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == RG_PROGRESSIVE_MAGIC_METER;});
-  sariaHintLoc = Rando::StaticData::GetLocation(magicLocation[0])->GetName();
-  Text area = GetHintRegion(ctx->GetItemLocation(magicLocation[0])->GetParentRegionKey())->GetHint().GetText();
-  Text temp1 = Text{
-    "Did you feel the %gsurge of magic%w recently? A mysterious bird told me it came from %r",
-    "As-tu récemment ressenti une vague de %gpuissance magique%w? Un mystérieux hibou m'a dit  qu'elle provenait du %r",
-    ""
-  };
-  Text temp2 = Text{
-    "%w.^You should check that place out, @!$C", 
-    "%w. Tu devrais aller y jeter un coup d'oeil, @!$C", 
-    "%w.$C"
-  };
-  sariaText = temp1 + area + temp2;
+  if(Settings::SariaHintText){
+    auto ctx = Rando::Context::GetInstance();
+    //Get the location of a magic upgrade
+    auto magicLocation = FilterFromPool(ctx->allLocations, [ctx](const RandomizerCheck loc){return ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == RG_PROGRESSIVE_MAGIC_METER;})[0];
+    sariaHintLoc = Rando::StaticData::GetLocation(magicLocation)->GetName();
+    Text area = GetHintRegion(ctx->GetItemLocation(magicLocation)->GetParentRegionKey())->GetHint().GetText();
+    Text temp1 = Text{
+      "Did you feel the %gsurge of magic%w recently? A mysterious bird told me it came from %r",
+      "As-tu récemment ressenti une vague de %gpuissance magique%w? Un mystérieux hibou m'a dit  qu'elle provenait du %r",
+      ""
+    };
+    Text temp2 = Text{
+      "%w.^You should check that place out, @!$C", 
+      "%w. Tu devrais aller y jeter un coup d'oeil, @!$C", 
+      "%w.$C"
+    };
+    sariaText = temp1 + area + temp2;
+
+    if (IsReachableWithout({RC_SARIA_SONG_HINT},magicLocation,true)){
+      ctx->GetItemLocation(magicLocation)->SetAsHinted();
+    }
+  }
 }
 
 
@@ -983,6 +1012,29 @@ void CreateAllHints() {
   uint8_t remainingDungeonWothHints = hintSetting.dungeonsWothLimit;
   uint8_t remainingDungeonBarrenHints = hintSetting.dungeonsBarrenLimit;
 
+  // Apply Special hint exclusions with no requirements
+  if (Settings::Kak10GSHintText){
+      ctx->GetItemLocation(RC_KAK_10_GOLD_SKULLTULA_REWARD)->SetAsHinted();
+  }
+  if (Settings::Kak20GSHintText){
+      ctx->GetItemLocation(RC_KAK_20_GOLD_SKULLTULA_REWARD)->SetAsHinted();
+  }
+  if (Settings::Kak30GSHintText){
+      ctx->GetItemLocation(RC_KAK_30_GOLD_SKULLTULA_REWARD)->SetAsHinted();
+  }
+  if (Settings::Kak40GSHintText){
+      ctx->GetItemLocation(RC_KAK_40_GOLD_SKULLTULA_REWARD)->SetAsHinted();
+  }
+  if (Settings::Kak50GSHintText){
+      ctx->GetItemLocation(RC_KAK_50_GOLD_SKULLTULA_REWARD)->SetAsHinted();
+  }
+  if (Settings::FrogsHintText){
+      ctx->GetItemLocation(RC_ZR_FROGS_OCARINA_GAME)->SetAsHinted();
+  }
+  if (Settings::skipChildZelda){
+      ctx->GetItemLocation(RC_SONG_FROM_IMPA)->SetAsHinted();
+  }
+
   // Add 'always' location hints
   if (hintSetting.distTable[static_cast<int>(HINT_TYPE_ALWAYS)].copies > 0) {
       // Only filter locations that had a random item placed at them (e.g. don't get cow locations if shuffle cows is
@@ -990,14 +1042,14 @@ void CreateAllHints() {
       auto alwaysHintLocations = FilterFromPool(ctx->allLocations, [ctx](const RandomizerCheck loc) {
           return ((Rando::StaticData::GetLocation(loc)->GetHint()->GetType() == HintCategory::Always) ||
                   // If we have Rainbow Bridge set to Greg, add a hint for where Greg is
-                  (Bridge.Is(RAINBOWBRIDGE_GREG) && !GregHintText &&
+                  (Bridge.Is(RAINBOWBRIDGE_GREG) &&
                    ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == RG_GREG_RUPEE)) &&
                  ctx->GetItemLocation(loc)->IsHintable() && !(ctx->GetItemLocation(loc)->IsHintedAt());
       });
 
       for (auto& hint : conditionalAlwaysHints) {
           RandomizerCheck loc = hint.first;
-          if (hint.second() && ctx->GetItemLocation(loc)->IsHintable() && !ctx->GetItemLocation(loc)->IsHintedAt()) {
+          if (hint.second() && ctx->GetItemLocation(loc)->IsHintable()) {
               alwaysHintLocations.push_back(loc);
           }
       }
@@ -1106,7 +1158,7 @@ void CreateAllHints() {
           CreateRandomLocationHint();
 
       } else if (type == HINT_TYPE_ITEM) {
-          CreateGoodItemHint();
+        CreateRandomLocationHint(true);
 
       } else if (type == HINT_TYPE_SONG) {
           std::vector<RandomizerCheck> songHintLocations =
diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.hpp b/soh/soh/Enhancements/randomizer/3drando/hints.hpp
index ea942909c..c4261cab5 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hints.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hints.hpp
@@ -114,7 +114,7 @@ public:
 
     static auto LightArrow(std::vector<Text>&& obscureText, std::vector<Text>&& ambiguousText = {}, Text&& clearText = {}) {
         return HintText{std::move(obscureText), std::move(ambiguousText), std::move(clearText), HintCategory::LightArrow};
-    }
+    } //RANDOTODO Concert to generic special hints?
 
     static auto GanonLine(std::vector<Text>&& obscureText, std::vector<Text>&& ambiguousText = {}, Text&& clearText = {}) {
         return HintText{std::move(obscureText), std::move(ambiguousText), std::move(clearText), HintCategory::GanonLine};
@@ -198,7 +198,7 @@ using ConditionalAlwaysHint = std::pair<RandomizerCheck, std::function<bool()>>;
 //10 dungeons as GTG and GC are excluded
 extern std::array<DungeonInfo, 10> dungeonInfoData;
 
-extern std::array<ConditionalAlwaysHint, 9> conditionalAlwaysHints;
+extern std::array<ConditionalAlwaysHint, 10> conditionalAlwaysHints;
 
 extern RandomizerHintTextKey GetHintRegionHintKey(const RandomizerRegion area);
 extern void CreateAllHints();
@@ -206,9 +206,8 @@ extern void CreateMerchantsHints();
 extern void CreateWarpSongTexts();
 extern void CreateDampesDiaryText();
 extern void CreateGregRupeeHint();
-extern void CreateSheikText();
 extern void CreateSariaText();
-extern void CreateGanonText();
+extern void CreateGanonAndSheikText();
 extern void CreateAltarText();
 
 Text& GetChildAltarText();
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
index b04bf8207..f2e227324 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
@@ -258,8 +258,9 @@ void AreaTable_Init() {
                        //name, scene, hint text,                       events, locations, exits
   areaTable[RR_ROOT] = Area("Root", "", RHT_LINKS_POCKET, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_LINKS_POCKET, {[]{return true;}}),
-                  LocationAccess(RC_TRIFORCE_COMPLETED, { [] { return CanCompleteTriforce;}}),
+                  LocationAccess(RC_LINKS_POCKET,       {[]{return true;}}),
+                  LocationAccess(RC_TRIFORCE_COMPLETED, {[]{return CanCompleteTriforce;}}),
+                  LocationAccess(RC_SARIA_SONG_HINT,    {[]{return CanPlay(SariasSong);}}),
                 }, {
                   //Exits
                   Entrance(RR_ROOT_EXITS, {[]{return true;}})
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
index b69787769..57e9f6d63 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
@@ -53,6 +53,8 @@ void AreaTable_Init_CastleTown() {
   areaTable[RR_TEMPLE_OF_TIME] = Area("Temple of Time", "Temple of Time", RHT_TEMPLE_OF_TIME, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_TOT_LIGHT_ARROWS_CUTSCENE, {[]{return IsAdult && CanTriggerLACS;}}),
+                  LocationAccess(RC_ALTAR_HINT_CHILD, {[]{return IsChild;}}),
+                  LocationAccess(RC_ALTAR_HINT_ADULT, {[]{return IsAdult;}}),
                 }, {
                   //Exits
                   Entrance(RR_TOT_ENTRANCE,            {[]{return true;}}),
@@ -231,6 +233,7 @@ void AreaTable_Init_CastleTown() {
 
   areaTable[RR_MARKET_TREASURE_CHEST_GAME] = Area("Market Treasure Chest Game", "Market Treasure Chest Game", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
+                  LocationAccess(RC_GREG_HINT, {[]{return true;}}),
                   LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_REWARD, {[]{return (CanUse(RG_LENS_OF_TRUTH) && !ShuffleChestMinigame) || (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_SINGLE_KEYS) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 6)) || (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_PACK) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1));}}),
                   LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_1, {[]{return (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_SINGLE_KEYS) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_PACK) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (CanUse(RG_LENS_OF_TRUTH) && !ShuffleChestMinigame);}}),
                   LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_2, {[]{return (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_SINGLE_KEYS) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 2)) || (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_PACK) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (CanUse(RG_LENS_OF_TRUTH) && !ShuffleChestMinigame);}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
index 3aa73962f..9df23eedd 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
@@ -22,7 +22,10 @@ void AreaTable_Init_GanonsCastle() {
   |     VANILLA DUNGEON      |
   ---------------------------*/
   if (Dungeon::GanonsCastle.IsVanilla()) {
-  areaTable[RR_GANONS_CASTLE_LOBBY] = Area("Ganon's Castle Lobby", "Ganon's Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_GANONS_CASTLE_LOBBY] = Area("Ganon's Castle Lobby", "Ganon's Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {
+                  //Locations
+                  LocationAccess(RC_SHEIK_HINT_GC,  {[]{return true;}}), 
+                }, {
                   //Exits
                   Entrance(RR_GANONS_CASTLE_ENTRYWAY,     {[]{return true;}}),
                   Entrance(RR_GANONS_CASTLE_FOREST_TRIAL, {[]{return true;}}),
@@ -121,7 +124,10 @@ void AreaTable_Init_GanonsCastle() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (Dungeon::GanonsCastle.IsMQ()) {
-  areaTable[RR_GANONS_CASTLE_MQ_LOBBY] = Area("Ganon's Castle MQ Lobby", "Ganons Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_GANONS_CASTLE_MQ_LOBBY] = Area("Ganon's Castle MQ Lobby", "Ganons Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {
+                  //Locations
+                  LocationAccess(RC_SHEIK_HINT_MQ_GC,  {[]{return true;}}),
+                }, {
                   //Exits
                   Entrance(RR_GANONS_CASTLE_ENTRYWAY,        {[]{return (IsAdult || (HasExplosives || ((Nuts || Boomerang) && (Sticks || KokiriSword))));}}),
                   Entrance(RR_GANONS_CASTLE_MQ_FOREST_TRIAL, {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
index 0c4dd31fc..5e6e46417 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
@@ -267,7 +267,10 @@ void AreaTable_Init_Kakariko() {
                   Entrance(RR_KAK_WINDMILL,  {[]{return IsAdult && CanPlay(SongOfTime);}}),
   });
 
-  areaTable[RR_GRAVEYARD_DAMPES_HOUSE] = Area("Graveyard Dampes House", "Graveyard Dampes House", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_GRAVEYARD_DAMPES_HOUSE] = Area("Graveyard Dampes House", "Graveyard Dampes House", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+                  //Locations
+                  LocationAccess(RC_DAMPE_HINT, {[]{return IsAdult;}}),
+                }, {
                   //Exits
                   Entrance(RR_THE_GRAVEYARD, {[]{return true;}}),
   });
diff --git a/soh/soh/Enhancements/randomizer/3drando/settings.hpp b/soh/soh/Enhancements/randomizer/3drando/settings.hpp
index a29df2a9b..6dff0bfd8 100644
--- a/soh/soh/Enhancements/randomizer/3drando/settings.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/settings.hpp
@@ -858,6 +858,8 @@ void UpdateSettings(std::unordered_map<RandomizerSettingKey, uint8_t> cvarSettin
   extern Option HintDistribution;
   extern Option AltarHintText;
   extern Option LightArrowHintText;
+  extern Option SariaHintText;
+  extern Option FrogsHintText;
   extern Option DampeHintText;
   extern Option GregHintText;
   extern Option Kak10GSHintText;
diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
index c7f443bd8..aea9f1ebc 100644
--- a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
@@ -689,12 +689,15 @@ static void WriteHints(int language) {
             unformattedGregText = GetGregHintText().GetEnglish();
             unformattedSheikText = GetSheikHintText().GetEnglish();
             unformattedSariaText = GetSariaHintText().GetEnglish();
-            jsonData["warpMinuetText"] = GetWarpMinuetText().GetEnglish();
-            jsonData["warpBoleroText"] = GetWarpBoleroText().GetEnglish();
-            jsonData["warpSerenadeText"] = GetWarpSerenadeText().GetEnglish();
-            jsonData["warpRequiemText"] = GetWarpRequiemText().GetEnglish();
-            jsonData["warpNocturneText"] = GetWarpNocturneText().GetEnglish();
-            jsonData["warpPreludeText"] = GetWarpPreludeText().GetEnglish();
+
+            if (Settings::ShuffleWarpSongs){
+              jsonData["warpMinuetText"] = GetWarpMinuetText().GetEnglish();
+              jsonData["warpBoleroText"] = GetWarpBoleroText().GetEnglish();
+              jsonData["warpSerenadeText"] = GetWarpSerenadeText().GetEnglish();
+              jsonData["warpRequiemText"] = GetWarpRequiemText().GetEnglish();
+              jsonData["warpNocturneText"] = GetWarpNocturneText().GetEnglish();
+              jsonData["warpPreludeText"] = GetWarpPreludeText().GetEnglish();
+            }
             jsonData["childAltar"]["hintText"] = GetChildAltarText().GetEnglish();
             jsonData["adultAltar"]["hintText"] = GetAdultAltarText().GetEnglish();
             break;
@@ -705,12 +708,15 @@ static void WriteHints(int language) {
             unformattedGregText = GetGregHintText().GetFrench();
             unformattedSheikText = GetSheikHintText().GetFrench();
             unformattedSariaText = GetSariaHintText().GetFrench();
-            jsonData["warpMinuetText"] = GetWarpMinuetText().GetFrench();
-            jsonData["warpBoleroText"] = GetWarpBoleroText().GetFrench();
-            jsonData["warpSerenadeText"] = GetWarpSerenadeText().GetFrench();
-            jsonData["warpRequiemText"] = GetWarpRequiemText().GetFrench();
-            jsonData["warpNocturneText"] = GetWarpNocturneText().GetFrench();
-            jsonData["warpPreludeText"] = GetWarpPreludeText().GetFrench();
+
+            if (Settings::ShuffleWarpSongs){
+              jsonData["warpMinuetText"] = GetWarpMinuetText().GetFrench();
+              jsonData["warpBoleroText"] = GetWarpBoleroText().GetFrench();
+              jsonData["warpSerenadeText"] = GetWarpSerenadeText().GetFrench();
+              jsonData["warpRequiemText"] = GetWarpRequiemText().GetFrench();
+              jsonData["warpNocturneText"] = GetWarpNocturneText().GetFrench();
+              jsonData["warpPreludeText"] = GetWarpPreludeText().GetFrench();
+            }
             jsonData["childAltar"]["hintText"] = GetChildAltarText().GetFrench();
             jsonData["adultAltar"]["hintText"] = GetAdultAltarText().GetFrench();
             break;
@@ -756,16 +762,25 @@ static void WriteHints(int language) {
     std::string sariaText = AutoFormatHintTextString(unformattedSariaText);
 
     jsonData["ganonText"] = ganonText;
-    jsonData["ganonHintText"] = ganonHintText;
-    jsonData["lightArrowHintLoc"] = GetLightArrowHintLoc();
-    jsonData["dampeText"] = dampesText;
-    jsonData["dampeHintLoc"] = GetDampeHintLoc();
-    jsonData["gregText"] = gregText;
-    jsonData["gregLoc"] =
-        Rando::StaticData::GetLocation(GetItemLocation(RG_GREG_RUPEE)->GetRandomizerCheck())->GetName();
-    jsonData["sheikText"] = sheikText;
-    jsonData["sariaText"] = sariaText;
-    jsonData["sariaHintLoc"] = GetSariaHintLoc();
+    if (Settings::LightArrowHintText){
+      jsonData["ganonHintText"] = ganonHintText;
+      jsonData["lightArrowHintLoc"] = GetLightArrowHintLoc();
+      if (!Settings::GanonsTrialsCount.Is(0)){
+        jsonData["sheikText"] = sheikText;
+      }
+    }
+    if (Settings::DampeHintText){
+      jsonData["dampeText"] = dampesText;
+      jsonData["dampeHintLoc"] = GetDampeHintLoc();
+    }
+    if (Settings::GregHintText){
+      jsonData["gregText"] = gregText;
+      jsonData["gregLoc"] = Rando::StaticData::GetLocation(GetItemLocation(RG_GREG_RUPEE)->GetRandomizerCheck())->GetName();
+    }
+    if (Settings::SariaHintText){
+      jsonData["sariaText"] = sariaText;
+      jsonData["sariaHintLoc"] = GetSariaHintLoc();
+    }
 
     if (Settings::GossipStoneHints.Is(HINTS_NO_HINTS)) {
         return;
diff --git a/soh/soh/Enhancements/randomizer/context.cpp b/soh/soh/Enhancements/randomizer/context.cpp
index 8995fa06b..bf38b32fa 100644
--- a/soh/soh/Enhancements/randomizer/context.cpp
+++ b/soh/soh/Enhancements/randomizer/context.cpp
@@ -144,7 +144,9 @@ void Context::LocationReset() {
         GetItemLocation(il)->RemoveFromPool();
     }
 
-    GetItemLocation(RC_GANONDORF_HINT)->RemoveFromPool();
+    for (RandomizerCheck il : Rando::StaticData::otherHintLocations) {
+        GetItemLocation(il)->RemoveFromPool();
+    }
 }
 
 void Context::HintReset() {
diff --git a/soh/soh/Enhancements/randomizer/location.cpp b/soh/soh/Enhancements/randomizer/location.cpp
index e50b21be0..f8ef0cd7f 100644
--- a/soh/soh/Enhancements/randomizer/location.cpp
+++ b/soh/soh/Enhancements/randomizer/location.cpp
@@ -235,11 +235,11 @@ Rando::Location Rando::Location::Reward(RandomizerCheck rc, RandomizerCheckQuest
 
 Rando::Location Rando::Location::OtherHint(RandomizerCheck rc, RandomizerCheckQuest quest_,
                                            RandomizerCheckType checkType_, RandomizerCheckArea area_, ActorID actorId_,
-                                           uint8_t scene_, int32_t actorParams_, uint8_t flag_,
+                                           uint8_t scene_,
                                            std::string&& shortName_, std::string&& spoilerName_,
-                                           std::vector<Category>&& categories, bool isVanillaCompletion_) {
-    return Location(rc, quest_, checkType_, area_, LocationType::OtherHint, actorId_, scene_, actorParams_, flag_,
-                    std::move(shortName_), std::move(spoilerName_), RHT_NONE, RG_NONE, std::move(categories), isVanillaCompletion_);
+                                           bool isVanillaCompletion_) {
+    return Location(rc, quest_, checkType_, area_, LocationType::OtherHint, actorId_, scene_, 0x00, 0x00,
+                    std::move(shortName_), std::move(spoilerName_), RHT_NONE, RG_NONE, {}, isVanillaCompletion_);
 }
 
 Rando::Location Rando::Location::HintStone(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
diff --git a/soh/soh/Enhancements/randomizer/location.h b/soh/soh/Enhancements/randomizer/location.h
index a1a47fd8f..c21a56166 100644
--- a/soh/soh/Enhancements/randomizer/location.h
+++ b/soh/soh/Enhancements/randomizer/location.h
@@ -253,9 +253,8 @@ class Location {
            SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP, bool isVanillaCompletion_ = false);
 
     static Location OtherHint(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
-                              RandomizerCheckArea area_, ActorID actorId_, uint8_t scene, int32_t actorParams_,
-                              uint8_t flag_, std::string&& shortName_, std::string&& spoilerName_,
-                              std::vector<Category>&& categories, bool isVanillaCompletion_ = false);
+                              RandomizerCheckArea area_, ActorID actorId_, uint8_t scene,
+                              std::string&& shortName_, std::string&& spoilerName_, bool isVanillaCompletion_ = false);
 
     static Location HintStone(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_, uint8_t scene,
                               int32_t actorParams_, uint8_t flag_, std::string&& shortName_, std::string&& spoilerName_,
diff --git a/soh/soh/Enhancements/randomizer/location_list.cpp b/soh/soh/Enhancements/randomizer/location_list.cpp
index 3a07c3a08..fafae2661 100644
--- a/soh/soh/Enhancements/randomizer/location_list.cpp
+++ b/soh/soh/Enhancements/randomizer/location_list.cpp
@@ -507,6 +507,17 @@ std::vector<RandomizerCheck> Rando::StaticData::gossipStoneLocations = {
     RC_ZR_OPEN_GROTTO_GOSSIP_STONE,
 };
 
+std::vector<RandomizerCheck> Rando::StaticData::otherHintLocations = {
+    RC_GANONDORF_HINT,
+    RC_SHEIK_HINT_GC,
+    RC_SHEIK_HINT_MQ_GC,
+    RC_DAMPE_HINT,
+    RC_GREG_HINT,
+    RC_SARIA_SONG_HINT,
+    RC_ALTAR_HINT_CHILD,
+    RC_ALTAR_HINT_ADULT
+};
+
 typedef enum {
     DUNGEON_DEKU_TREE = 0,
     DUNGEON_DODONGOS_CAVERN,
@@ -1221,7 +1232,7 @@ void Rando::StaticData::InitLocationTable() {
 
     // Bosses     Randomizer Check                       Randomizer Check    Quest         Type                   Area                     Actor ID          Scene ID                    Params Flags                                      Short Name         Spoiler Name       Hint Text Key      Vanilla Item        Categories Spoiler Collection Check             Collection Check Group                                      Vanilla Progression
     locationTable[RC_LINKS_POCKET] =    Location::Reward(RC_LINKS_POCKET,    RCQUEST_BOTH, RCTYPE_LINKS_POCKET,   RCAREA_KOKIRI_FOREST,    ACTOR_ID_MAX,     SCENE_ID_MAX,               0x00, 0x00,                                       "Link's Pocket",   "Link's Pocket",   RHT_LINKS_POCKET,  RG_LIGHT_MEDALLION,  {}, SpoilerCollectionCheck::AlwaysCollected(), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST,           true);
-    locationTable[RC_QUEEN_GOHMA] =     Location::Reward( RC_QUEEN_GOHMA,    RCQUEST_BOTH, RCTYPE_DUNGEON_REWARD, RCAREA_DEKU_TREE,        ACTOR_DOOR_WARP1, SCENE_DEKU_TREE_BOSS,       0x00, DungeonId::DUNGEON_DEKU_TREE,               "Queen Gohma",     "Queen Gohma",     RHT_QUEEN_GOHMA,   RG_KOKIRI_EMERALD,   {}, SpoilerCollectionCheck::Chest(0x11, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE,       true);
+    locationTable[RC_QUEEN_GOHMA] =     Location::Reward(RC_QUEEN_GOHMA,     RCQUEST_BOTH, RCTYPE_DUNGEON_REWARD, RCAREA_DEKU_TREE,        ACTOR_DOOR_WARP1, SCENE_DEKU_TREE_BOSS,       0x00, DungeonId::DUNGEON_DEKU_TREE,               "Queen Gohma",     "Queen Gohma",     RHT_QUEEN_GOHMA,   RG_KOKIRI_EMERALD,   {}, SpoilerCollectionCheck::Chest(0x11, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE,       true);
     locationTable[RC_KING_DODONGO] =    Location::Reward(RC_KING_DODONGO,    RCQUEST_BOTH, RCTYPE_DUNGEON_REWARD, RCAREA_DODONGOS_CAVERN,  ACTOR_DOOR_WARP1, SCENE_DODONGOS_CAVERN_BOSS, 0x00, DungeonId::DUNGEON_DODONGOS_CAVERN,         "King Dodongo",    "King Dodongo",    RHT_KING_DODONGO,  RG_GORON_RUBY,       {}, SpoilerCollectionCheck::Chest(0x12, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN, true);
     locationTable[RC_BARINADE] =        Location::Reward(RC_BARINADE,        RCQUEST_BOTH, RCTYPE_DUNGEON_REWARD, RCAREA_JABU_JABUS_BELLY, ACTOR_DOOR_WARP1, SCENE_JABU_JABU_BOSS,       0x00, DungeonId::DUNGEON_JABUJABUS_BELLY,         "Barinade",        "Barinade",        RHT_BARINADE,      RG_ZORA_SAPPHIRE,    {}, SpoilerCollectionCheck::Chest(0x13, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY, true);
     locationTable[RC_PHANTOM_GANON] =   Location::Reward(RC_PHANTOM_GANON,   RCQUEST_BOTH, RCTYPE_DUNGEON_REWARD, RCAREA_FOREST_TEMPLE,    ACTOR_DOOR_WARP1, SCENE_FOREST_TEMPLE_BOSS,   0x00, DungeonId::DUNGEON_FOREST_TEMPLE,           "Phantom Ganon",   "Phantom Ganon",   RHT_PHANTOM_GANON, RG_FOREST_MEDALLION, {}, SpoilerCollectionCheck::Chest(0x14, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,   true);
@@ -1403,7 +1414,15 @@ void Rando::StaticData::InitLocationTable() {
     locationTable[RC_DMC_UPPER_GROTTO_GOSSIP_STONE] =   Location::HintStone(RC_DMC_UPPER_GROTTO_GOSSIP_STONE,   RCQUEST_BOTH,    RCAREA_DEATH_MOUNTAIN_CRATER, SCENE_GROTTOS,               -23802, 0x3A, "Upper Grotto Gossip Stone",     "DMC Upper Grotto Gossip Stone",   {});
 
     // Other Hints
-    locationTable[RC_GANONDORF_HINT] = Location::OtherHint(RC_GANONDORF_HINT, RCQUEST_BOTH, RCTYPE_GOSSIP_STONE, RCAREA_GANONS_CASTLE, ACTOR_EN_GANON_MANT, SCENE_GANON_BOSS, 0x00, 0x00, "Hint", "Ganondorf Hint", {});
+    locationTable[RC_GANONDORF_HINT]    = Location::OtherHint(RC_GANONDORF_HINT,   RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE, RCAREA_GANONS_CASTLE, ACTOR_EN_GANON_MANT, SCENE_GANON_BOSS,           "Ganondorf Hint",   "Ganondorf Hint");
+    locationTable[RC_SHEIK_HINT_GC]     = Location::OtherHint(RC_SHEIK_HINT_GC,    RCQUEST_VANILLA, RCTYPE_GOSSIP_STONE, RCAREA_GANONS_CASTLE, ACTOR_EN_XC,         SCENE_INSIDE_GANONS_CASTLE, "Sheik Hint",       "Sheik Hint in Ganons Castle");
+    locationTable[RC_SHEIK_HINT_MQ_GC]  = Location::OtherHint(RC_SHEIK_HINT_MQ_GC, RCQUEST_MQ,      RCTYPE_GOSSIP_STONE, RCAREA_GANONS_CASTLE, ACTOR_EN_XC,         SCENE_INSIDE_GANONS_CASTLE, "Sheik Hint",       "Sheik Hint in MQ Ganons Castle");
+    locationTable[RC_DAMPE_HINT]        = Location::OtherHint(RC_DAMPE_HINT,       RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE, RCAREA_GRAVEYARD,     ACTOR_ID_MAX,        SCENE_GRAVEKEEPERS_HUT,     "Diary Hint",       "Dampe's Diary Hint");
+    locationTable[RC_GREG_HINT]         = Location::OtherHint(RC_GREG_HINT,        RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE, RCAREA_MARKET,        ACTOR_EN_TAKARA_MAN, SCENE_TREASURE_BOX_SHOP,    "Greg Hint",        "Greg Hint");
+    locationTable[RC_SARIA_SONG_HINT]   = Location::OtherHint(RC_SARIA_SONG_HINT,  RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE, RCAREA_KOKIRI_FOREST, ACTOR_ID_MAX,        SCENE_ID_MAX,               "Sarias Song Hint", "Magic Hint Via Saria's Song");
+    locationTable[RC_ALTAR_HINT_CHILD]  = Location::OtherHint(RC_ALTAR_HINT_CHILD, RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE, RCAREA_MARKET,        ACTOR_ID_MAX,        SCENE_TEMPLE_OF_TIME,       "Child Altar Hint", "ToT Child Altar Text");
+    locationTable[RC_ALTAR_HINT_ADULT]  = Location::OtherHint(RC_ALTAR_HINT_ADULT, RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE, RCAREA_MARKET,        ACTOR_ID_MAX,        SCENE_TEMPLE_OF_TIME,       "Adult Altar Hint", "ToT Adult Altar Text");
+    
     locationTable[RC_TRIFORCE_COMPLETED] = Location::Reward(RC_TRIFORCE_COMPLETED, RCQUEST_BOTH, RCTYPE_STANDARD, RCAREA_MARKET, ACTOR_ID_MAX, SCENE_ID_MAX, 0x00, 0x00, "Completed Triforce", "Completed Triforce", RHT_NONE, RG_NONE, {}, SpoilerCollectionCheck::None(), SpoilerCollectionCheckGroup::GROUP_NO_GROUP);
     // clang-format on
 }
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index 06112f3de..896b739c2 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -474,11 +474,15 @@ void Randomizer::LoadHintLocations(const char* spoilerFileName) {
         );
         CustomMessageManager::Instance->CreateMessage(
             Randomizer::randoMiscHintsTableID, TEXT_DAMPES_DIARY,
-            CustomMessage(gSaveContext.dampeText, gSaveContext.dampeText, gSaveContext.dampeText)
+            CustomMessage(gSaveContext.dampeText,
+                gSaveContext.dampeText,
+                gSaveContext.dampeText)
         );
         CustomMessageManager::Instance->CreateMessage(
             Randomizer::randoMiscHintsTableID, TEXT_CHEST_GAME_PROCEED,
-            CustomMessage(gSaveContext.gregHintText, gSaveContext.gregHintText, gSaveContext.gregHintText)
+            CustomMessage(gSaveContext.gregHintText,
+                gSaveContext.gregHintText,
+                gSaveContext.gregHintText)
         );
         CustomMessageManager::Instance->CreateMessage(
             Randomizer::randoMiscHintsTableID, TEXT_FROGS_UNDERWATER,
@@ -491,7 +495,6 @@ void Randomizer::LoadHintLocations(const char* spoilerFileName) {
             CustomMessage("{{message}}", "{{message}}", "{{message}}", TEXTBOX_TYPE_BLUE)
         );
 
-
     CustomMessageManager::Instance->CreateMessage(Randomizer::hintMessageTableID, TEXT_WARP_RANDOM_REPLACED_TEXT,
         CustomMessage("Warp to&{{location}}?\x1B&%gOK&No%w\x02",
         "Zu {{location}}?\x1B&%gOK&No%w\x02",
@@ -1289,16 +1292,34 @@ std::string FormatJsonHintText(std::string jsonHint) {
             formattedHintMessage.replace(start_pos, textToReplace.length(), iconString);
         }
     }
+    formattedHintMessage += 0x02;
     return formattedHintMessage;
 }
 
+void ParseSpoilerHintText(json Json, std::string field, char* saveLoc, bool format, int size){
+    auto jsonIter = Json.find(field);
+    if (jsonIter != Json.end()){
+        std::string jsonText = jsonIter.value().get<std::string>();
+        if (format){
+            jsonText = FormatJsonHintText(jsonText);
+        }
+        strncpy(saveLoc, jsonText.c_str(), size-1);
+        saveLoc[size - 1] = 0;
+    }
+}
+
+void CheckNameToEnum(json Json, std::string field, RandomizerCheck* saveLoc){
+    auto jsonIter = Json.find(field);
+    if (jsonIter != Json.end()){
+        *saveLoc = SpoilerfileCheckNameToEnum[jsonIter.value().get<std::string>()];
+    };
+}
+
 void Randomizer::ParseHintLocationsFile(const char* spoilerFileName) {
     std::ifstream spoilerFileStream(sanitize(spoilerFileName));
     if (!spoilerFileStream)
         return;
 
-    bool success = false;
-
     // Have all these use strncpy so that the null terminator is copied 
     // and also set the last index to null for safety
     try {
@@ -1324,64 +1345,28 @@ void Randomizer::ParseHintLocationsFile(const char* spoilerFileName) {
         gSaveContext.rewardCheck[7] = SpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["spiritMedallionLoc"]];
         gSaveContext.rewardCheck[8] = SpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["lightMedallionLoc"]];
 
-        std::string ganonHintJsonText = spoilerFileJson["ganonHintText"].get<std::string>();
-        std::string formattedGanonHintJsonText = FormatJsonHintText(ganonHintJsonText);
-        strncpy(gSaveContext.ganonHintText, formattedGanonHintJsonText.c_str(), sizeof(gSaveContext.ganonHintText) - 1);
-        gSaveContext.ganonHintText[sizeof(gSaveContext.ganonHintText) - 1] = 0;
-        gSaveContext.lightArrowHintCheck = SpoilerfileCheckNameToEnum[spoilerFileJson["lightArrowHintLoc"]];
+        ParseSpoilerHintText(spoilerFileJson, "ganonHintText", gSaveContext.ganonHintText, true, sizeof(gSaveContext.ganonHintText));
+        CheckNameToEnum(spoilerFileJson, "lightArrowHintLoc", &gSaveContext.lightArrowHintCheck);
+        ParseSpoilerHintText(spoilerFileJson, "ganonText", gSaveContext.ganonText, true, sizeof(gSaveContext.ganonText));
 
-        std::string ganonJsonText = spoilerFileJson["ganonText"].get<std::string>();
-        std::string formattedGanonJsonText = FormatJsonHintText(ganonJsonText);
-        strncpy(gSaveContext.ganonText, formattedGanonJsonText.c_str(), sizeof(gSaveContext.ganonText) - 1);
-        gSaveContext.ganonText[sizeof(gSaveContext.ganonText) - 1] = 0;
+        ParseSpoilerHintText(spoilerFileJson, "dampeText", gSaveContext.dampeText, true, sizeof(gSaveContext.dampeText));
+        CheckNameToEnum(spoilerFileJson, "dampeHintLoc", &gSaveContext.dampeCheck);
 
-        std::string dampeJsonText = spoilerFileJson["dampeText"].get<std::string>();
-        std::string formattedDampeJsonText = FormatJsonHintText(dampeJsonText);
-        strncpy(gSaveContext.dampeText, formattedDampeJsonText.c_str(), sizeof(gSaveContext.dampeText) - 1);
-        gSaveContext.dampeText[sizeof(gSaveContext.dampeText) - 1] = 0;
-        gSaveContext.dampeCheck = SpoilerfileCheckNameToEnum[spoilerFileJson["dampeHintLoc"]];
+        ParseSpoilerHintText(spoilerFileJson, "gregText", gSaveContext.gregHintText, true, sizeof(gSaveContext.gregHintText));
+        CheckNameToEnum(spoilerFileJson, "gregLoc", &gSaveContext.gregCheck);
 
-        std::string gregJsonText = spoilerFileJson["gregText"].get<std::string>();
-        std::string formattedGregJsonText = FormatJsonHintText(gregJsonText);
-        strncpy(gSaveContext.gregHintText, formattedGregJsonText.c_str(), sizeof(gSaveContext.gregHintText) - 1);
-        gSaveContext.gregHintText[sizeof(gSaveContext.gregHintText) - 1] = 0;
-        gSaveContext.gregCheck = SpoilerfileCheckNameToEnum[spoilerFileJson["gregLoc"]];
+        ParseSpoilerHintText(spoilerFileJson, "sheikText", gSaveContext.sheikText, true, sizeof(gSaveContext.sheikText));
+        
+        ParseSpoilerHintText(spoilerFileJson, "sariaText", gSaveContext.sariaText, true, sizeof(gSaveContext.sariaText));
+        CheckNameToEnum(spoilerFileJson, "sariaHintLoc", &gSaveContext.sariaCheck);
 
-        std::string sheikJsonText = spoilerFileJson["sheikText"].get<std::string>();
-        std::string formattedSheikJsonText = FormatJsonHintText(sheikJsonText);
-        strncpy(gSaveContext.sheikText, formattedSheikJsonText.c_str(), sizeof(gSaveContext.sheikText) - 1);
-        gSaveContext.sheikText[sizeof(gSaveContext.sheikText) - 1] = 0;
-        gSaveContext.lightArrowHintCheck = SpoilerfileCheckNameToEnum[spoilerFileJson["lightArrowHintLoc"]];
+        ParseSpoilerHintText(spoilerFileJson, "warpMinuetText", gSaveContext.warpMinuetText, false, sizeof(gSaveContext.warpMinuetText));
+        ParseSpoilerHintText(spoilerFileJson, "warpBoleroText", gSaveContext.warpBoleroText, false, sizeof(gSaveContext.warpBoleroText));
+        ParseSpoilerHintText(spoilerFileJson, "warpSerenadeText", gSaveContext.warpSerenadeText, false, sizeof(gSaveContext.warpSerenadeText));
+        ParseSpoilerHintText(spoilerFileJson, "warpRequiemText", gSaveContext.warpRequiemText, false, sizeof(gSaveContext.warpRequiemText));
+        ParseSpoilerHintText(spoilerFileJson, "warpNocturneText", gSaveContext.warpNocturneText, false, sizeof(gSaveContext.warpNocturneText));
+        ParseSpoilerHintText(spoilerFileJson, "warpPreludeText", gSaveContext.warpPreludeText, false, sizeof(gSaveContext.warpPreludeText));
 
-        std::string sariaJsonText = spoilerFileJson["sariaText"].get<std::string>();
-        std::string formattedSariaJsonText = FormatJsonHintText(sariaJsonText);
-        strncpy(gSaveContext.sariaText, formattedSariaJsonText.c_str(), sizeof(gSaveContext.sariaText) - 1);
-        gSaveContext.sariaText[sizeof(gSaveContext.sariaText) - 1] = 0;
-        gSaveContext.sariaCheck = SpoilerfileCheckNameToEnum[spoilerFileJson["sariaHintLoc"]];
-
-        std::string warpMinuetJsonText = spoilerFileJson["warpMinuetText"].get<std::string>();
-        strncpy(gSaveContext.warpMinuetText, warpMinuetJsonText.c_str(), sizeof(gSaveContext.warpMinuetText) - 1);
-        gSaveContext.warpMinuetText[sizeof(gSaveContext.warpMinuetText) - 1] = 0;
-
-        std::string warpBoleroJsonText = spoilerFileJson["warpBoleroText"].get<std::string>();
-        strncpy(gSaveContext.warpBoleroText, warpBoleroJsonText.c_str(), sizeof(gSaveContext.warpBoleroText) - 1);
-        gSaveContext.warpBoleroText[sizeof(gSaveContext.warpBoleroText) - 1] = 0;
-
-        std::string warpSerenadeJsonText = spoilerFileJson["warpSerenadeText"].get<std::string>();
-        strncpy(gSaveContext.warpSerenadeText, warpSerenadeJsonText.c_str(), sizeof(gSaveContext.warpSerenadeText) - 1);
-        gSaveContext.warpSerenadeText[sizeof(gSaveContext.warpSerenadeText) - 1] = 0;
-
-        std::string warpRequiemJsonText = spoilerFileJson["warpRequiemText"].get<std::string>();
-        strncpy(gSaveContext.warpRequiemText, warpRequiemJsonText.c_str(), sizeof(gSaveContext.warpRequiemText) - 1);
-        gSaveContext.warpRequiemText[sizeof(gSaveContext.warpRequiemText) - 1] = 0;
-
-        std::string warpNocturneJsonText = spoilerFileJson["warpNocturneText"].get<std::string>();
-        strncpy(gSaveContext.warpNocturneText, warpNocturneJsonText.c_str(), sizeof(gSaveContext.warpNocturneText) - 1);
-        gSaveContext.warpNocturneText[sizeof(gSaveContext.warpNocturneText) - 1] = 0;
-
-        std::string warpPreludeJsonText = spoilerFileJson["warpPreludeText"].get<std::string>();
-        strncpy(gSaveContext.warpPreludeText, warpPreludeJsonText.c_str(), sizeof(gSaveContext.warpPreludeText) - 1);
-        gSaveContext.warpPreludeText[sizeof(gSaveContext.warpPreludeText) - 1] = 0;
 
         json hintsJson = spoilerFileJson["hints"];
         int index = 0;
@@ -1416,7 +1401,6 @@ void Randomizer::ParseHintLocationsFile(const char* spoilerFileName) {
             index++;
         }
 
-        success = true;
     } catch (const std::exception& e) {
         return;
     }
diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h
index 4dc5a590a..ff2a88b7e 100644
--- a/soh/soh/Enhancements/randomizer/randomizerTypes.h
+++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@@ -1348,7 +1348,14 @@ typedef enum {
     RC_ZR_NEAR_GROTTOS_GOSSIP_STONE,
     RC_ZR_OPEN_GROTTO_GOSSIP_STONE,
     RC_GANONDORF_HINT,
+    RC_SHEIK_HINT_GC,
+    RC_SHEIK_HINT_MQ_GC,
     RC_TRIFORCE_COMPLETED,
+    RC_DAMPE_HINT,
+    RC_GREG_HINT,
+    RC_SARIA_SONG_HINT,
+    RC_ALTAR_HINT_CHILD,
+    RC_ALTAR_HINT_ADULT,
     RC_MAX
 } RandomizerCheck;
 
@@ -3172,6 +3179,7 @@ typedef enum {
     RHT_VALIDATION_LINE,
     // Light Arrow Location
     RHT_LIGHT_ARROW_LOCATION_HINT,
+    RHT_SHEIK_LIGHT_ARROW_HINT,
     // Your Pocket
     RHT_YOUR_POCKET,
     // Ganon Line
diff --git a/soh/soh/Enhancements/randomizer/static_data.h b/soh/soh/Enhancements/randomizer/static_data.h
index 3c8328590..9a0000da2 100644
--- a/soh/soh/Enhancements/randomizer/static_data.h
+++ b/soh/soh/Enhancements/randomizer/static_data.h
@@ -31,6 +31,7 @@ class StaticData {
       static std::vector<std::vector<RandomizerCheck>> shopLocationLists;
       static std::vector<RandomizerCheck> scrubLocations;
       static std::vector<RandomizerCheck> gossipStoneLocations;
+      static std::vector<RandomizerCheck> otherHintLocations;
       StaticData();
       ~StaticData();
 };

From 2e50fbb0d2252292eb1f1ae8c0cfb57f79b006ce Mon Sep 17 00:00:00 2001
From: Ralphie Morell <stratomaster64@gmail.com>
Date: Fri, 27 Oct 2023 00:48:36 -0400
Subject: [PATCH 013/230] Rework boss soul helper

---
 .../Enhancements/randomizer/3drando/logic.cpp | 32 +++++++++++++------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/logic.cpp b/soh/soh/Enhancements/randomizer/3drando/logic.cpp
index 7ecfc0819..949d4433f 100644
--- a/soh/soh/Enhancements/randomizer/3drando/logic.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/logic.cpp
@@ -478,16 +478,28 @@ namespace Logic {
     if (ShuffleBossSouls.Is(BOSSSOULS_OFF)) {
       return true;
     }
-    return (itemName == RG_GOHMA_SOUL && CanSummonGohma)         ||
-    (itemName == RG_KING_DODONGO_SOUL && CanSummonKingDodongo)   ||
-    (itemName == RG_BARINADE_SOUL && CanSummonBarinade)          ||
-    (itemName == RG_PHANTOM_GANON_SOUL && CanSummonPhantomGanon) ||
-    (itemName == RG_VOLVAGIA_SOUL && CanSummonVolvagia)          ||
-    (itemName == RG_MORPHA_SOUL && CanSummonMorpha)              ||
-    (itemName == RG_MORPHA_SOUL && CanSummonBongoBongo)          ||
-    (itemName == RG_TWINROVA_SOUL && CanSummonTwinrova)          ||
-    (itemName == RG_GANON_SOUL && CanSummonGanon);
-
+    switch(itemName) {
+      case RG_GOHMA_SOUL:
+        return CanSummonGohma; break;
+      case RG_KING_DODONGO_SOUL:
+        return CanSummonKingDodongo; break;
+      case RG_BARINADE_SOUL:
+        return CanSummonBarinade; break;
+      case RG_PHANTOM_GANON_SOUL:
+        return CanSummonPhantomGanon; break;
+      case RG_VOLVAGIA_SOUL:
+        return CanSummonVolvagia; break;
+      case RG_MORPHA_SOUL:
+        return CanSummonMorpha; break;
+      case RG_BONGO_BONGO_SOUL:
+        return CanSummonBongoBongo; break;
+      case RG_TWINROVA_SOUL:
+        return CanSummonTwinrova; break;
+      case RG_GANON_SOUL:
+        return ShuffleBossSouls.Is(BOSSSOULS_ON_PLUS_GANON) ? CanSummonGanon : true;
+        break;
+      default: break;
+    }
   }
 
   uint8_t GetDifficultyValueFromString(Option& glitchOption) {

From be37cabaa96c7d3889c9d76f397cb599f6d6ea35 Mon Sep 17 00:00:00 2001
From: Ralphie Morell <stratomaster64@gmail.com>
Date: Sat, 28 Oct 2023 01:20:13 -0400
Subject: [PATCH 014/230] pls build on mac

---
 .../randomizer/randomizer_item_tracker.cpp    | 29 +++++++++----------
 .../randomizer/randomizer_item_tracker.h      |  5 ++++
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
index e3eb8fded..e5e633e74 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
@@ -86,20 +86,16 @@ std::vector<ItemTrackerItem> triforcePieces = {
 
 std::vector<ItemTrackerItem> bossSoulItems = {
     //Hack for right now, just gonna draw souls as bottles/big poes.
-    ItemTrackerItem(RG_GOHMA_SOUL, "ITEM_BIG_POE", "ITEM_BOTTLE_Faded", 0, DrawItem ),
-    ItemTrackerItem(RG_KING_DODONGO_SOUL, "ITEM_BIG_POE", "ITEM_BOTTLE_Faded", 0, DrawItem ),
-    ItemTrackerItem(RG_BARINADE_SOUL, "ITEM_BIG_POE", "ITEM_BOTTLE_Faded", 0, DrawItem ),
-    ItemTrackerItem(RG_PHANTOM_GANON_SOUL, "ITEM_BIG_POE", "ITEM_BOTTLE_Faded", 0, DrawItem ),
-    ItemTrackerItem(RG_VOLVAGIA_SOUL, "ITEM_BIG_POE", "ITEM_BOTTLE_Faded", 0, DrawItem ),
-    ItemTrackerItem(RG_MORPHA_SOUL, "ITEM_BIG_POE", "ITEM_BOTTLE_Faded", 0, DrawItem ),
-    ItemTrackerItem(RG_BONGO_BONGO_SOUL, "ITEM_BIG_POE", "ITEM_BOTTLE_Faded", 0, DrawItem ),
-    ItemTrackerItem(RG_TWINROVA_SOUL, "ITEM_BIG_POE", "ITEM_BOTTLE_Faded", 0, DrawItem ),
-    ItemTrackerItem(RG_GANON_SOUL, "ITEM_BIG_POE", "ITEM_BOTTLE_Faded", 0, DrawItem ),
-    
-    //For when these actually have textures, maybe?
-    // ITEM_TRACKER_ITEM(RG_GOHMA_SOUL, 0, DrawItem),         ITEM_TRACKER_ITEM(RG_KING_DODONGO_SOUL, 0, DrawItem), ITEM_TRACKER_ITEM(RG_BARINADE_SOUL, 0, DrawItem),
-    // ITEM_TRACKER_ITEM(RG_PHANTOM_GANON_SOUL, 0, DrawItem), ITEM_TRACKER_ITEM(RG_VOLVAGIA_SOUL, 0, DrawItem),     ITEM_TRACKER_ITEM(RG_MORPHA_SOUL, 0, DrawItem),
-    // ITEM_TRACKER_ITEM(RG_BONGO_BONGO_SOUL, 0, DrawItem),   ITEM_TRACKER_ITEM(RG_TWINROVA_SOUL, 0, DrawItem),     ITEM_TRACKER_ITEM(RG_GANON_SOUL, 0, DrawItem),
+    //Will replace with other macro once we have a custom texture
+    ITEM_TRACKER_ITEM_CUSTOM(RG_GOHMA_SOUL, ITEM_BIG_POE, ITEM_BOTTLE, 0, DrawItem ),
+    ITEM_TRACKER_ITEM_CUSTOM(RG_KING_DODONGO_SOUL, ITEM_BIG_POE, ITEM_BOTTLE, 0, DrawItem ),
+    ITEM_TRACKER_ITEM_CUSTOM(RG_BARINADE_SOUL, ITEM_BIG_POE, ITEM_BOTTLE, 0, DrawItem ),
+    ITEM_TRACKER_ITEM_CUSTOM(RG_PHANTOM_GANON_SOUL, ITEM_BIG_POE, ITEM_BOTTLE, 0, DrawItem ),
+    ITEM_TRACKER_ITEM_CUSTOM(RG_VOLVAGIA_SOUL, ITEM_BIG_POE, ITEM_BOTTLE, 0, DrawItem ),
+    ITEM_TRACKER_ITEM_CUSTOM(RG_MORPHA_SOUL, ITEM_BIG_POE, ITEM_BOTTLE, 0, DrawItem ),
+    ITEM_TRACKER_ITEM_CUSTOM(RG_BONGO_BONGO_SOUL, ITEM_BIG_POE, ITEM_BOTTLE, 0, DrawItem ),
+    ITEM_TRACKER_ITEM_CUSTOM(RG_TWINROVA_SOUL, ITEM_BIG_POE, ITEM_BOTTLE, 0, DrawItem ),
+    ITEM_TRACKER_ITEM_CUSTOM(RG_GANON_SOUL, ITEM_BIG_POE, ITEM_BOTTLE, 0, DrawItem ),
 };
 
 std::vector<ItemTrackerDungeon> itemTrackerDungeonsWithMapsHorizontal = {
@@ -681,8 +677,9 @@ void DrawItem(ItemTrackerItem item) {
             break;
         case RG_GANON_SOUL:
             actualItemId = item.id;
-            hasItem = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_BOSS_SOULS) == RO_BOSS_SOULS_ON_PLUS_GANON ? true :
-                Flags_GetRandomizerInf(RAND_INF_GANON_SOUL);
+            hasItem = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_BOSS_SOULS) == RO_BOSS_SOULS_ON_PLUS_GANON ? 
+                Flags_GetRandomizerInf(RAND_INF_GANON_SOUL) : true;
+                
             itemName = "Ganon's Soul";
             break;
     }
diff --git a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.h b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.h
index 1fb4e1063..8a0b754a8 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.h
+++ b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.h
@@ -24,6 +24,11 @@ bool HasEquipment(ItemTrackerItem);
         id, #id, #id "_Faded", data, drawFunc     \
     }
 
+#define ITEM_TRACKER_ITEM_CUSTOM(id, name, nameFaded, data, drawFunc)\
+    {                                                                \
+        id, #name, #nameFaded "_Faded", data, drawFunc               \
+    }
+
 typedef struct ItemTrackerDungeon {
     uint32_t id;
     std::vector<uint32_t> items;

From 9b49d73814209338fac0ac74ff8b2e93e8418239 Mon Sep 17 00:00:00 2001
From: Ralphie Morell <stratomaster64@gmail.com>
Date: Sun, 29 Oct 2023 21:48:57 -0400
Subject: [PATCH 015/230] playtest feedback; cleanup

---
 soh/soh/Enhancements/mods.cpp                 |   4 +-
 .../randomizer/3drando/item_pool.cpp          |  10 ++
 .../Enhancements/randomizer/3drando/shops.cpp |  18 +--
 soh/soh/Enhancements/randomizer/item_list.cpp |  18 +--
 .../Enhancements/randomizer/randomizer.cpp    | 124 ------------------
 .../actors/ovl_Demo_Effect/z_demo_effect.c    |   2 +-
 6 files changed, 32 insertions(+), 144 deletions(-)

diff --git a/soh/soh/Enhancements/mods.cpp b/soh/soh/Enhancements/mods.cpp
index 9415b0c67..84ccbe94a 100644
--- a/soh/soh/Enhancements/mods.cpp
+++ b/soh/soh/Enhancements/mods.cpp
@@ -1060,7 +1060,9 @@ void RegisterBossSouls() {
             default: break;
         }
 
-    if (!Flags_GetRandomizerInf(rand_inf) && actual->category == ACTORCAT_BOSS) {
+    //Deletes all actors in the boss category if the soul isn't found, with the exception of ToT since Zora's Sapphire becomes a boss for some reason.
+    //See `z_demo_effect.c`
+    if (!Flags_GetRandomizerInf(rand_inf) && actual->category == ACTORCAT_BOSS && gPlayState->sceneNum != SCENE_TEMPLE_OF_TIME) {
         Actor_Delete(&gPlayState->actorCtx, actual, gPlayState);
     }
     });
diff --git a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
index 039372cb0..09bdbff98 100644
--- a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
@@ -829,8 +829,18 @@ void GenerateItemPool() {
     AddItemToMainPool(RG_MORPHA_SOUL);
     AddItemToMainPool(RG_BONGO_BONGO_SOUL);
     AddItemToMainPool(RG_TWINROVA_SOUL);
+
+    IceTrapModels.push_back(0xE0);
+    IceTrapModels.push_back(0xE1);
+    IceTrapModels.push_back(0xE2);
+    IceTrapModels.push_back(0xE3);
+    IceTrapModels.push_back(0xE4);
+    IceTrapModels.push_back(0xE5);
+    IceTrapModels.push_back(0xE6);
+    IceTrapModels.push_back(0xE7);
     if (ShuffleBossSouls.Is(BOSSSOULS_ON_PLUS_GANON)) {
       AddItemToMainPool(RG_GANON_SOUL);
+      IceTrapModels.push_back(0xE8);
     }
   }
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/shops.cpp b/soh/soh/Enhancements/randomizer/3drando/shops.cpp
index d31b4b545..cde1ca41a 100644
--- a/soh/soh/Enhancements/randomizer/3drando/shops.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/shops.cpp
@@ -701,39 +701,39 @@ void InitTrickNames() {
      Text{"Piece of Cheese", "Morceau de Fromage", "Piece of Cheese"},
      Text{"Triforce Shard", "Éclat de Triforce", "Triforce Shard"},
      Text{"Shiny Rock", "Caiiloux Brillant", "Shiny Rock"}};
-  trickNameTable[0xE1] = {
+  trickNameTable[0xE0] = {
      Text{"Spider Sense", "", ""},
      Text{"Deku Spirit", "", ""},
      Text("Ghost of Ghoma", "", "")};
-  trickNameTable[0xE2] = {
+  trickNameTable[0xE1] = {
      Text{"Lizard Soul", "", ""},
      Text{"Regal Remains", "", ""},
      Text{"Dodongo's Core", "", ""}};
-  trickNameTable[0xE3] = {
+  trickNameTable[0xE2] = {
      Text{"Parasitic Poltergeist", "", ""},
      Text{"Jabu Insides", "", ""},
      Text{"Barinade Bacteria", "", ""}};
-  trickNameTable[0xE4] = {
+  trickNameTable[0xE3] = {
      Text{"Bigger Poe", "", ""},
      Text{"Sacred Forest Pine Tree", "", ""},
      Text{"Ganon's Phantom", "", ""}};
-  trickNameTable[0xE5] = {
+  trickNameTable[0xE4] = {
      Text{"Dragon Roast", "", ""},
      Text{"Hot n' Ready", "", ""},
      Text{"Volvagia's Vitality", "", ""}};
-  trickNameTable[0xE6] = {
+  trickNameTable[0xE5] = {
      Text{"Dihydrogen Monoxide", "", ""},
      Text{"Morpha Molecules", "", ""},
      Text{"Wet Stuff", "", ""}};
-  trickNameTable[0xE7] = {
+  trickNameTable[0xE6] = {
      Text{"Shadow Soul", "", ""},
      Text{"Dark Essence", "", ""},
      Text{"Bongo Bongo's Bongo", "", ""}};
-  trickNameTable[0xE8] = {
+  trickNameTable[0xE7] = {
      Text{"Sandy Ashes", "", ""},
      Text{"Spiritual Spirit", "", ""},
      Text{"Twin Rovers", "", ""}};
-  trickNameTable[0xE9] = {
+  trickNameTable[0xE8] = {
      Text{"Pure Evil", "", ""},
      Text{"Ganon's Ghost", "", ""},
      Text{"Pork", "", ""}};
diff --git a/soh/soh/Enhancements/randomizer/item_list.cpp b/soh/soh/Enhancements/randomizer/item_list.cpp
index 4f89a2b86..16a21504f 100644
--- a/soh/soh/Enhancements/randomizer/item_list.cpp
+++ b/soh/soh/Enhancements/randomizer/item_list.cpp
@@ -238,15 +238,15 @@ void Rando::StaticData::InitItemTable() {
     itemTable[RG_BUY_RED_POTION_40] =                   Item(RG_BUY_RED_POTION_40,                Text{ "Buy Red Potion [40]", "Acheter: Potion Rouge [40]", "Rotes Elixier kaufen [40]" },                         ITEMTYPE_SHOP,              GI_POTION_RED,      false, &Logic::noVariable,          RHT_BOTTLE_WITH_RED_POTION, ITEM_POTION_RED,                OBJECT_GI_LIQUID,       GID_POTION_RED,     0x43,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 40);
     itemTable[RG_BUY_RED_POTION_50] =                   Item(RG_BUY_RED_POTION_50,                Text{ "Buy Red Potion [50]", "Acheter: Potion Rouge [50]", "Rotes Elixier kaufen [50]" },                         ITEMTYPE_SHOP,              GI_POTION_RED,      false, &Logic::noVariable,          RHT_BOTTLE_WITH_RED_POTION, ITEM_POTION_RED,                OBJECT_GI_LIQUID,       GID_POTION_RED,     0x43,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 50);
     // Misc.
-    itemTable[RG_GOHMA_SOUL] =                          Item(RG_GOHMA_SOUL,                      Text{ "Gohma's Soul", "", "" },                                                                                   ITEMTYPE_ITEM,              RG_GOHMA_SOUL,      true,  &Logic::CanSummonGohma,      RHT_GOHMA_SOUL,             RG_GOHMA_SOUL,                  OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_KING_DODONGO_SOUL] =                   Item(RG_KING_DODONGO_SOUL,               Text{ "King Dodongo's Soul", "", "" },                                                                            ITEMTYPE_ITEM,              RG_KING_DODONGO_SOUL,true, &Logic::CanSummonKingDodongo,RHT_KING_DODONGO_SOUL,      RG_KING_DODONGO_SOUL,           OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_BARINADE_SOUL] =                       Item(RG_BARINADE_SOUL,                   Text{ "Barinade's Soul", "", "" },                                                                                ITEMTYPE_ITEM,              RG_BARINADE_SOUL,   true,  &Logic::CanSummonBarinade,   RHT_BARINADE_SOUL,          RG_BARINADE_SOUL,               OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_PHANTOM_GANON_SOUL] =                  Item(RG_PHANTOM_GANON_SOUL,              Text{ "Phantom Ganon's Soul", "", "" },                                                                           ITEMTYPE_ITEM,              RG_PHANTOM_GANON_SOUL,true,&Logic::CanSummonPhantomGanon,RHT_PHANTOM_GANON_SOUL,    RG_PHANTOM_GANON_SOUL,          OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_VOLVAGIA_SOUL] =                       Item(RG_VOLVAGIA_SOUL,                   Text{ "Volvagia's Soul", "", "" },                                                                                ITEMTYPE_ITEM,              RG_VOLVAGIA_SOUL,   true,  &Logic::CanSummonVolvagia,   RHT_VOLVAGIA_SOUL,          RG_VOLVAGIA_SOUL,               OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_MORPHA_SOUL] =                         Item(RG_MORPHA_SOUL,                     Text{ "Morpha's Soul", "", "" },                                                                                  ITEMTYPE_ITEM,              RG_MORPHA_SOUL,     true,  &Logic::CanSummonMorpha,     RHT_MORPHA_SOUL,            RG_MORPHA_SOUL,                 OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_BONGO_BONGO_SOUL] =                    Item(RG_BONGO_BONGO_SOUL,                Text{ "Bongo Bongo's Soul", "", "" },                                                                             ITEMTYPE_ITEM,              RG_BONGO_BONGO_SOUL,true,  &Logic::CanSummonBongoBongo, RHT_BONGO_BONGO_SOUL,       RG_BONGO_BONGO_SOUL,            OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_TWINROVA_SOUL] =                       Item(RG_TWINROVA_SOUL,                   Text{ "Twinrova's Soul", "", "" },                                                                                ITEMTYPE_ITEM,              RG_TWINROVA_SOUL,   true,  &Logic::CanSummonTwinrova,   RHT_TWINROVA_SOUL,          RG_TWINROVA_SOUL,               OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_GANON_SOUL] =                          Item(RG_GANON_SOUL,                      Text{ "Ganon's Soul", "", "" },                                                                                   ITEMTYPE_ITEM,              RG_GANON_SOUL,      true,  &Logic::CanSummonGanon,      RHT_GANON_SOUL,             RG_GANON_SOUL,                  OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_GOHMA_SOUL] =                          Item(RG_GOHMA_SOUL,                      Text{ "Gohma's Soul", "", "" },                                                                                    ITEMTYPE_ITEM,              0xE0,               true,  &Logic::CanSummonGohma,      RHT_GOHMA_SOUL,             RG_GOHMA_SOUL,                  OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_KING_DODONGO_SOUL] =                   Item(RG_KING_DODONGO_SOUL,               Text{ "King Dodongo's Soul", "", "" },                                                                             ITEMTYPE_ITEM,              0xE1,               true,  &Logic::CanSummonKingDodongo,RHT_KING_DODONGO_SOUL,      RG_KING_DODONGO_SOUL,           OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BARINADE_SOUL] =                       Item(RG_BARINADE_SOUL,                   Text{ "Barinade's Soul", "", "" },                                                                                 ITEMTYPE_ITEM,              0xE2,               true,  &Logic::CanSummonBarinade,   RHT_BARINADE_SOUL,          RG_BARINADE_SOUL,               OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_PHANTOM_GANON_SOUL] =                  Item(RG_PHANTOM_GANON_SOUL,              Text{ "Phantom Ganon's Soul", "", "" },                                                                            ITEMTYPE_ITEM,              0xE3,               true,  &Logic::CanSummonPhantomGanon,RHT_PHANTOM_GANON_SOUL,    RG_PHANTOM_GANON_SOUL,          OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_VOLVAGIA_SOUL] =                       Item(RG_VOLVAGIA_SOUL,                   Text{ "Volvagia's Soul", "", "" },                                                                                 ITEMTYPE_ITEM,              0xE4,               true,  &Logic::CanSummonVolvagia,   RHT_VOLVAGIA_SOUL,          RG_VOLVAGIA_SOUL,               OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_MORPHA_SOUL] =                         Item(RG_MORPHA_SOUL,                     Text{ "Morpha's Soul", "", "" },                                                                                   ITEMTYPE_ITEM,              0xE5,               true,  &Logic::CanSummonMorpha,     RHT_MORPHA_SOUL,            RG_MORPHA_SOUL,                 OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BONGO_BONGO_SOUL] =                    Item(RG_BONGO_BONGO_SOUL,                Text{ "Bongo Bongo's Soul", "", "" },                                                                              ITEMTYPE_ITEM,              0xE6,               true,  &Logic::CanSummonBongoBongo, RHT_BONGO_BONGO_SOUL,       RG_BONGO_BONGO_SOUL,            OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_TWINROVA_SOUL] =                       Item(RG_TWINROVA_SOUL,                   Text{ "Twinrova's Soul", "", "" },                                                                                 ITEMTYPE_ITEM,              0xE7,               true,  &Logic::CanSummonTwinrova,   RHT_TWINROVA_SOUL,          RG_TWINROVA_SOUL,               OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_GANON_SOUL] =                          Item(RG_GANON_SOUL,                      Text{ "Ganon's Soul", "", "" },                                                                                    ITEMTYPE_ITEM,              0xE8,               true,  &Logic::CanSummonGanon,      RHT_GANON_SOUL,             RG_GANON_SOUL,                  OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
 
     itemTable[RG_TRIFORCE] =                            Item(RG_TRIFORCE,                         Text{ "Triforce", "Triforce", "Triforce" },                                                                       ITEMTYPE_EVENT,             RG_TRIFORCE,        false, &Logic::noVariable,          RHT_NONE);
     itemTable[RG_HINT] =                                Item(RG_HINT,                             Text{ "Hint", "Indice", "Hinweis" },                                                                              ITEMTYPE_EVENT,             RG_HINT,            false, &Logic::noVariable,          RHT_NONE);
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index 5ca1a6ccf..98064e78e 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -6144,130 +6144,6 @@ class ExtendedVanillaTableInvalidItemIdException: public std::exception {
       }
 };
 
-void InitRandoItemTable() {
-    // These entries have ItemIDs from vanilla, but not GetItemIDs or entries in the old sGetItemTable
-    static GetItemEntry extendedVanillaGetItemTable[] = {
-        GET_ITEM(ITEM_MEDALLION_LIGHT,                 OBJECT_GI_MEDAL,    GID_MEDALLION_LIGHT,  0x40,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_NONE,       RG_LIGHT_MEDALLION),
-        GET_ITEM(ITEM_MEDALLION_FOREST,                OBJECT_GI_MEDAL,    GID_MEDALLION_FOREST, 0x3E,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_NONE,       RG_FOREST_MEDALLION),
-        GET_ITEM(ITEM_MEDALLION_FIRE,                  OBJECT_GI_MEDAL,    GID_MEDALLION_FIRE,   0x3C,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_NONE,       RG_FIRE_MEDALLION),
-        GET_ITEM(ITEM_MEDALLION_WATER,                 OBJECT_GI_MEDAL,    GID_MEDALLION_WATER,  0x3D,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_NONE,       RG_WATER_MEDALLION),
-        GET_ITEM(ITEM_MEDALLION_SHADOW,                OBJECT_GI_MEDAL,    GID_MEDALLION_SHADOW, 0x41,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_NONE,       RG_SHADOW_MEDALLION),
-        GET_ITEM(ITEM_MEDALLION_SPIRIT,                OBJECT_GI_MEDAL,    GID_MEDALLION_SPIRIT, 0x3F,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_NONE,       RG_SPIRIT_MEDALLION),
-
-        GET_ITEM(ITEM_KOKIRI_EMERALD,                  OBJECT_GI_JEWEL,    GID_KOKIRI_EMERALD,   0x80,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_NONE,       RG_KOKIRI_EMERALD),
-        GET_ITEM(ITEM_GORON_RUBY,                      OBJECT_GI_JEWEL,    GID_GORON_RUBY,       0x81,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_NONE,       RG_GORON_RUBY),
-        GET_ITEM(ITEM_ZORA_SAPPHIRE,                   OBJECT_GI_JEWEL,    GID_ZORA_SAPPHIRE,    0x82,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_NONE,       RG_ZORA_SAPPHIRE),
-
-        GET_ITEM(ITEM_SONG_LULLABY,                    OBJECT_GI_MELODY,   GID_SONG_ZELDA,       0xD4,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_NONE,       RG_ZELDAS_LULLABY),
-        GET_ITEM(ITEM_SONG_SUN,                        OBJECT_GI_MELODY,   GID_SONG_SUN,         0xD3,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_NONE,       RG_SUNS_SONG),
-        GET_ITEM(ITEM_SONG_EPONA,                      OBJECT_GI_MELODY,   GID_SONG_EPONA,       0xD2,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_NONE,       RG_EPONAS_SONG),
-        GET_ITEM(ITEM_SONG_STORMS,                     OBJECT_GI_MELODY,   GID_SONG_STORM,       0xD6,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_NONE,       RG_SONG_OF_STORMS),
-        GET_ITEM(ITEM_SONG_TIME,                       OBJECT_GI_MELODY,   GID_SONG_TIME,        0xD5,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_NONE,       RG_SONG_OF_TIME),
-        GET_ITEM(ITEM_SONG_SARIA,                      OBJECT_GI_MELODY,   GID_SONG_SARIA,       0xD1,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_NONE,       RG_SARIAS_SONG),
-
-        GET_ITEM(ITEM_SONG_MINUET,                     OBJECT_GI_MELODY,   GID_SONG_MINUET,      0x73,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_NONE,       RG_MINUET_OF_FOREST),
-        GET_ITEM(ITEM_SONG_BOLERO,                     OBJECT_GI_MELODY,   GID_SONG_BOLERO,      0x74,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_NONE,       RG_BOLERO_OF_FIRE),
-        GET_ITEM(ITEM_SONG_SERENADE,                   OBJECT_GI_MELODY,   GID_SONG_SERENADE,    0x75,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_NONE,       RG_SERENADE_OF_WATER),
-        GET_ITEM(ITEM_SONG_NOCTURNE,                   OBJECT_GI_MELODY,   GID_SONG_NOCTURNE,    0x77,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_NONE,       RG_NOCTURNE_OF_SHADOW),
-        GET_ITEM(ITEM_SONG_REQUIEM,                    OBJECT_GI_MELODY,   GID_SONG_REQUIEM,     0x76,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_NONE,       RG_REQUIEM_OF_SPIRIT),
-        GET_ITEM(ITEM_SONG_PRELUDE,                    OBJECT_GI_MELODY,   GID_SONG_PRELUDE,     0x78,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_NONE,       RG_PRELUDE_OF_LIGHT),
-    };
-
-    // These do not have ItemIDs or GetItemIDs from vanilla, so I'm using their
-    // RandomizerGet enum values for both.
-    static GetItemEntry randoGetItemTable[] = {
-        GET_ITEM(RG_ICE_TRAP,                          OBJECT_GI_RUPY,     GID_RUPEE_GOLD,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_ICE_TRAP),
-        GET_ITEM(RG_MAGIC_SINGLE,                      OBJECT_GI_MAGICPOT, GID_MAGIC_SMALL,      0xE4,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_MAGIC_SINGLE),
-        GET_ITEM(RG_MAGIC_DOUBLE,                      OBJECT_GI_MAGICPOT, GID_MAGIC_LARGE,      0xE8,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_MAGIC_DOUBLE),
-        GET_ITEM(RG_DOUBLE_DEFENSE,                    OBJECT_GI_HEARTS,   GID_HEART_CONTAINER,  0xE9,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_DOUBLE_DEFENSE),
-        GET_ITEM(RG_GREG_RUPEE,                        OBJECT_GI_RUPY,     GID_RUPEE_GREEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_GREG_RUPEE),
-        GET_ITEM(RG_BOTTLE_WITH_RED_POTION,            OBJECT_GI_LIQUID,   GID_POTION_RED,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_BOTTLE_WITH_RED_POTION),
-        GET_ITEM(RG_BOTTLE_WITH_GREEN_POTION,          OBJECT_GI_LIQUID,   GID_POTION_GREEN,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_BOTTLE_WITH_GREEN_POTION),
-        GET_ITEM(RG_BOTTLE_WITH_BLUE_POTION,           OBJECT_GI_LIQUID,   GID_POTION_BLUE,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_BOTTLE_WITH_BLUE_POTION),
-        GET_ITEM(RG_BOTTLE_WITH_FAIRY,                 OBJECT_GI_BOTTLE,   GID_BOTTLE,           TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_BOTTLE_WITH_FAIRY),
-        GET_ITEM(RG_BOTTLE_WITH_FISH,                  OBJECT_GI_FISH,     GID_FISH,             TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_BOTTLE_WITH_FISH),
-        GET_ITEM(RG_BOTTLE_WITH_BLUE_FIRE,             OBJECT_GI_FIRE,     GID_BLUE_FIRE,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_BOTTLE_WITH_BLUE_FIRE),
-        GET_ITEM(RG_BOTTLE_WITH_BUGS,                  OBJECT_GI_INSECT,   GID_BUG,              TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_BOTTLE_WITH_BUGS),
-        GET_ITEM(RG_BOTTLE_WITH_POE,                   OBJECT_GI_GHOST,    GID_POE,              TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_BOTTLE_WITH_POE),
-        GET_ITEM(RG_BOTTLE_WITH_BIG_POE,               OBJECT_GI_GHOST,    GID_BIG_POE,          TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_BOTTLE_WITH_BIG_POE),
-        GET_ITEM(RG_GERUDO_FORTRESS_SMALL_KEY,         OBJECT_GI_KEY,      GID_KEY_SMALL,        TEXT_ITEM_KEY_SMALL,         0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY, MOD_RANDOMIZER, RG_GERUDO_FORTRESS_SMALL_KEY),
-        GET_ITEM(RG_FOREST_TEMPLE_SMALL_KEY,           OBJECT_GI_KEY,      GID_KEY_SMALL,        TEXT_ITEM_KEY_SMALL,         0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY, MOD_RANDOMIZER, RG_FOREST_TEMPLE_SMALL_KEY),
-        GET_ITEM(RG_FIRE_TEMPLE_SMALL_KEY,             OBJECT_GI_KEY,      GID_KEY_SMALL,        TEXT_ITEM_KEY_SMALL,         0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY, MOD_RANDOMIZER, RG_FIRE_TEMPLE_SMALL_KEY),
-        GET_ITEM(RG_WATER_TEMPLE_SMALL_KEY,            OBJECT_GI_KEY,      GID_KEY_SMALL,        TEXT_ITEM_KEY_SMALL,         0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY, MOD_RANDOMIZER, RG_WATER_TEMPLE_SMALL_KEY),
-        GET_ITEM(RG_SPIRIT_TEMPLE_SMALL_KEY,           OBJECT_GI_KEY,      GID_KEY_SMALL,        TEXT_ITEM_KEY_SMALL,         0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY, MOD_RANDOMIZER, RG_SPIRIT_TEMPLE_SMALL_KEY),
-        GET_ITEM(RG_SHADOW_TEMPLE_SMALL_KEY,           OBJECT_GI_KEY,      GID_KEY_SMALL,        TEXT_ITEM_KEY_SMALL,         0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY, MOD_RANDOMIZER, RG_SHADOW_TEMPLE_SMALL_KEY),
-        GET_ITEM(RG_BOTTOM_OF_THE_WELL_SMALL_KEY,      OBJECT_GI_KEY,      GID_KEY_SMALL,        TEXT_ITEM_KEY_SMALL,         0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY, MOD_RANDOMIZER, RG_BOTTOM_OF_THE_WELL_SMALL_KEY),
-        GET_ITEM(RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, OBJECT_GI_KEY,      GID_KEY_SMALL,        TEXT_ITEM_KEY_SMALL,         0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY, MOD_RANDOMIZER, RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY),
-        GET_ITEM(RG_GANONS_CASTLE_SMALL_KEY,           OBJECT_GI_KEY,      GID_KEY_SMALL,        TEXT_ITEM_KEY_SMALL,         0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY, MOD_RANDOMIZER, RG_GANONS_CASTLE_SMALL_KEY),
-        GET_ITEM(RG_GERUDO_FORTRESS_KEY_RING,          OBJECT_GI_KEY,      GID_KEY_SMALL,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY, MOD_RANDOMIZER, RG_GERUDO_FORTRESS_KEY_RING),
-        GET_ITEM(RG_FOREST_TEMPLE_KEY_RING,            OBJECT_GI_KEY,      GID_KEY_SMALL,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY, MOD_RANDOMIZER, RG_FOREST_TEMPLE_KEY_RING),
-        GET_ITEM(RG_FIRE_TEMPLE_KEY_RING,              OBJECT_GI_KEY,      GID_KEY_SMALL,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY, MOD_RANDOMIZER, RG_FIRE_TEMPLE_KEY_RING),
-        GET_ITEM(RG_WATER_TEMPLE_KEY_RING,             OBJECT_GI_KEY,      GID_KEY_SMALL,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY, MOD_RANDOMIZER, RG_WATER_TEMPLE_KEY_RING),
-        GET_ITEM(RG_SPIRIT_TEMPLE_KEY_RING,            OBJECT_GI_KEY,      GID_KEY_SMALL,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY, MOD_RANDOMIZER, RG_SPIRIT_TEMPLE_KEY_RING),
-        GET_ITEM(RG_SHADOW_TEMPLE_KEY_RING,            OBJECT_GI_KEY,      GID_KEY_SMALL,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY, MOD_RANDOMIZER, RG_SHADOW_TEMPLE_KEY_RING),
-        GET_ITEM(RG_BOTTOM_OF_THE_WELL_KEY_RING,       OBJECT_GI_KEY,      GID_KEY_SMALL,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY, MOD_RANDOMIZER, RG_BOTTOM_OF_THE_WELL_KEY_RING),
-        GET_ITEM(RG_GERUDO_TRAINING_GROUNDS_KEY_RING,  OBJECT_GI_KEY,      GID_KEY_SMALL,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY, MOD_RANDOMIZER, RG_GERUDO_TRAINING_GROUNDS_KEY_RING),
-        GET_ITEM(RG_GANONS_CASTLE_KEY_RING,            OBJECT_GI_KEY,      GID_KEY_SMALL,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY, MOD_RANDOMIZER, RG_GANONS_CASTLE_KEY_RING),
-        GET_ITEM(RG_FOREST_TEMPLE_BOSS_KEY,            OBJECT_GI_BOSSKEY,  GID_KEY_BOSS,         TEXT_ITEM_KEY_BOSS,          0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,  MOD_RANDOMIZER, RG_FOREST_TEMPLE_BOSS_KEY),
-        GET_ITEM(RG_FIRE_TEMPLE_BOSS_KEY,              OBJECT_GI_BOSSKEY,  GID_KEY_BOSS,         TEXT_ITEM_KEY_BOSS,          0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,  MOD_RANDOMIZER, RG_FIRE_TEMPLE_BOSS_KEY),
-        GET_ITEM(RG_WATER_TEMPLE_BOSS_KEY,             OBJECT_GI_BOSSKEY,  GID_KEY_BOSS,         TEXT_ITEM_KEY_BOSS,          0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,  MOD_RANDOMIZER, RG_WATER_TEMPLE_BOSS_KEY),
-        GET_ITEM(RG_SPIRIT_TEMPLE_BOSS_KEY,            OBJECT_GI_BOSSKEY,  GID_KEY_BOSS,         TEXT_ITEM_KEY_BOSS,          0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,  MOD_RANDOMIZER, RG_SPIRIT_TEMPLE_BOSS_KEY),
-        GET_ITEM(RG_SHADOW_TEMPLE_BOSS_KEY,            OBJECT_GI_BOSSKEY,  GID_KEY_BOSS,         TEXT_ITEM_KEY_BOSS,          0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,  MOD_RANDOMIZER, RG_SHADOW_TEMPLE_BOSS_KEY),
-        GET_ITEM(RG_GANONS_CASTLE_BOSS_KEY,            OBJECT_GI_BOSSKEY,  GID_KEY_BOSS,         TEXT_ITEM_KEY_BOSS,          0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,  MOD_RANDOMIZER, RG_GANONS_CASTLE_BOSS_KEY),
-        GET_ITEM(RG_DEKU_TREE_MAP,                     OBJECT_GI_MAP,      GID_DUNGEON_MAP,      TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_DEKU_TREE_MAP),
-        GET_ITEM(RG_DODONGOS_CAVERN_MAP,               OBJECT_GI_MAP,      GID_DUNGEON_MAP,      TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_DODONGOS_CAVERN_MAP),
-        GET_ITEM(RG_JABU_JABUS_BELLY_MAP,              OBJECT_GI_MAP,      GID_DUNGEON_MAP,      TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_JABU_JABUS_BELLY_MAP),
-        GET_ITEM(RG_FOREST_TEMPLE_MAP,                 OBJECT_GI_MAP,      GID_DUNGEON_MAP,      TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_FOREST_TEMPLE_MAP),
-        GET_ITEM(RG_FIRE_TEMPLE_MAP,                   OBJECT_GI_MAP,      GID_DUNGEON_MAP,      TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_FIRE_TEMPLE_MAP),
-        GET_ITEM(RG_WATER_TEMPLE_MAP,                  OBJECT_GI_MAP,      GID_DUNGEON_MAP,      TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_WATER_TEMPLE_MAP),
-        GET_ITEM(RG_SPIRIT_TEMPLE_MAP,                 OBJECT_GI_MAP,      GID_DUNGEON_MAP,      TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_SPIRIT_TEMPLE_MAP),
-        GET_ITEM(RG_SHADOW_TEMPLE_MAP,                 OBJECT_GI_MAP,      GID_DUNGEON_MAP,      TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_SHADOW_TEMPLE_MAP),
-        GET_ITEM(RG_BOTTOM_OF_THE_WELL_MAP,            OBJECT_GI_MAP,      GID_DUNGEON_MAP,      TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_BOTTOM_OF_THE_WELL_MAP),
-        GET_ITEM(RG_ICE_CAVERN_MAP,                    OBJECT_GI_MAP,      GID_DUNGEON_MAP,      TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_ICE_CAVERN_MAP),
-        GET_ITEM(RG_DEKU_TREE_COMPASS,                 OBJECT_GI_COMPASS,  GID_COMPASS,          TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_DEKU_TREE_COMPASS),
-        GET_ITEM(RG_DODONGOS_CAVERN_COMPASS,           OBJECT_GI_COMPASS,  GID_COMPASS,          TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_DODONGOS_CAVERN_COMPASS),
-        GET_ITEM(RG_JABU_JABUS_BELLY_COMPASS,          OBJECT_GI_COMPASS,  GID_COMPASS,          TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_JABU_JABUS_BELLY_COMPASS),
-        GET_ITEM(RG_FOREST_TEMPLE_COMPASS,             OBJECT_GI_COMPASS,  GID_COMPASS,          TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_FOREST_TEMPLE_COMPASS),
-        GET_ITEM(RG_FIRE_TEMPLE_COMPASS,               OBJECT_GI_COMPASS,  GID_COMPASS,          TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_FIRE_TEMPLE_COMPASS),
-        GET_ITEM(RG_WATER_TEMPLE_COMPASS,              OBJECT_GI_COMPASS,  GID_COMPASS,          TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_WATER_TEMPLE_COMPASS),
-        GET_ITEM(RG_SPIRIT_TEMPLE_COMPASS,             OBJECT_GI_COMPASS,  GID_COMPASS,          TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_SPIRIT_TEMPLE_COMPASS),
-        GET_ITEM(RG_SHADOW_TEMPLE_COMPASS,             OBJECT_GI_COMPASS,  GID_COMPASS,          TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_SHADOW_TEMPLE_COMPASS),
-        GET_ITEM(RG_BOTTOM_OF_THE_WELL_COMPASS,        OBJECT_GI_COMPASS,  GID_COMPASS,          TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_BOTTOM_OF_THE_WELL_COMPASS),
-        GET_ITEM(RG_ICE_CAVERN_COMPASS,                OBJECT_GI_COMPASS,  GID_COMPASS,          TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_ICE_CAVERN_COMPASS),
-        GET_ITEM(RG_MAGIC_BEAN_PACK,                   OBJECT_GI_BEAN,     GID_BEAN,             TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_MAGIC_BEAN_PACK),
-        GET_ITEM(RG_TYCOON_WALLET,                     OBJECT_GI_PURSE,    GID_WALLET_GIANT,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER,    MOD_RANDOMIZER, RG_TYCOON_WALLET),
-        GET_ITEM(RG_PROGRESSIVE_BOMBCHUS,              OBJECT_GI_BOMB_2,   GID_BOMBCHU,          0x33,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_PROGRESSIVE_BOMBCHUS),
-        GET_ITEM(RG_TRIFORCE_PIECE,                    OBJECT_GI_BOMB_2,   GID_TRIFORCE_PIECE,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_TRIFORCE_PIECE),
-        GET_ITEM(RG_GOHMA_SOUL,                        OBJECT_GI_SUTARU,   GID_SKULL_TOKEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_GOHMA_SOUL),
-        GET_ITEM(RG_KING_DODONGO_SOUL,                 OBJECT_GI_SUTARU,   GID_SKULL_TOKEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_KING_DODONGO_SOUL),
-        GET_ITEM(RG_BARINADE_SOUL,                     OBJECT_GI_SUTARU,   GID_SKULL_TOKEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_BARINADE_SOUL),
-        GET_ITEM(RG_PHANTOM_GANON_SOUL,                OBJECT_GI_SUTARU,   GID_SKULL_TOKEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_PHANTOM_GANON_SOUL),
-        GET_ITEM(RG_VOLVAGIA_SOUL,                     OBJECT_GI_SUTARU,   GID_SKULL_TOKEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_VOLVAGIA_SOUL),
-        GET_ITEM(RG_MORPHA_SOUL,                       OBJECT_GI_SUTARU,   GID_SKULL_TOKEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_MORPHA_SOUL),
-        GET_ITEM(RG_BONGO_BONGO_SOUL,                  OBJECT_GI_SUTARU,   GID_SKULL_TOKEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_BONGO_BONGO_SOUL),
-        GET_ITEM(RG_TWINROVA_SOUL,                     OBJECT_GI_SUTARU,   GID_SKULL_TOKEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_TWINROVA_SOUL),
-        GET_ITEM(RG_GANON_SOUL,                        OBJECT_GI_SUTARU,   GID_SKULL_TOKEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,     MOD_RANDOMIZER, RG_GANON_SOUL),
-    };
-    ItemTableManager::Instance->AddItemTable(MOD_RANDOMIZER);
-    for (int i = 0; i < ARRAY_COUNT(extendedVanillaGetItemTable); i++) {
-        ItemTableManager::Instance->AddItemEntry(MOD_RANDOMIZER, extendedVanillaGetItemTable[i].getItemId, extendedVanillaGetItemTable[i]);
-    }
-    for (int i = 0; i < ARRAY_COUNT(randoGetItemTable); i++) {
-        if (randoGetItemTable[i].itemId >= RG_FOREST_TEMPLE_SMALL_KEY && randoGetItemTable[i].itemId <= RG_GANONS_CASTLE_SMALL_KEY
-            && randoGetItemTable[i].itemId != RG_GERUDO_FORTRESS_SMALL_KEY) {
-            randoGetItemTable[i].drawFunc = (CustomDrawFunc)Randomizer_DrawSmallKey;
-        } else if (randoGetItemTable[i].itemId >= RG_FOREST_TEMPLE_KEY_RING && randoGetItemTable[i].itemId <= RG_GANONS_CASTLE_KEY_RING) {
-            randoGetItemTable[i].drawFunc = (CustomDrawFunc)Randomizer_DrawKeyRing;
-        } else if (randoGetItemTable[i].itemId >= RG_FOREST_TEMPLE_BOSS_KEY && randoGetItemTable[i].itemId <= RG_GANONS_CASTLE_BOSS_KEY) {
-            randoGetItemTable[i].drawFunc = (CustomDrawFunc)Randomizer_DrawBossKey;
-        } else if (randoGetItemTable[i].itemId == RG_DOUBLE_DEFENSE) {
-            randoGetItemTable[i].drawFunc = (CustomDrawFunc)Randomizer_DrawDoubleDefense;
-        } else if (randoGetItemTable[i].itemId == RG_TRIFORCE_PIECE) {
-            randoGetItemTable[i].drawFunc = (CustomDrawFunc)Randomizer_DrawTriforcePiece;
-        }
-        ItemTableManager::Instance->AddItemEntry(MOD_RANDOMIZER, randoGetItemTable[i].itemId, randoGetItemTable[i]);
-    }
-}
 
 
 void RandomizerSettingsWindow::InitElement() {
diff --git a/soh/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c b/soh/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
index 7125984e2..dc19f2d7d 100644
--- a/soh/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
+++ b/soh/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
@@ -495,7 +495,7 @@ void DemoEffect_Init(Actor* thisx, PlayState* play2) {
             this->jewel.type = DEMO_EFFECT_JEWEL_ZORA;
             this->jewel.isPositionInit = 0;
             DemoEffect_InitJewel(play, this);
-            Actor_ChangeCategory(play, &play->actorCtx, &this->actor, ACTOR_EN_DOOR);
+            Actor_ChangeCategory(play, &play->actorCtx, &this->actor, ACTORCAT_BOSS);
             if ((play->sceneNum == SCENE_JABU_JABU) && (Flags_GetInfTable(INFTABLE_145))) {
                 Actor_Kill(&this->actor);
                 return;

From 279af81ead0a32500d02080719e169a39b7f74d4 Mon Sep 17 00:00:00 2001
From: Ralphie Morell <stratomaster64@gmail.com>
Date: Mon, 30 Oct 2023 01:13:26 -0400
Subject: [PATCH 016/230] Implement custom draw for souls; change souls from
 tokens to blue fire

---
 soh/soh/Enhancements/randomizer/draw.cpp      | 58 ++++++++++++-------
 soh/soh/Enhancements/randomizer/draw.h        |  1 +
 soh/soh/Enhancements/randomizer/item_list.cpp |  9 +++
 3 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/draw.cpp b/soh/soh/Enhancements/randomizer/draw.cpp
index 5f77ded79..d4884a13b 100644
--- a/soh/soh/Enhancements/randomizer/draw.cpp
+++ b/soh/soh/Enhancements/randomizer/draw.cpp
@@ -10,7 +10,7 @@
 #include "objects/object_gi_key/object_gi_key.h"
 #include "objects/object_gi_bosskey/object_gi_bosskey.h"
 #include "objects/object_gi_hearts/object_gi_hearts.h"
-#include "objects/object_gi_sutaru/object_gi_sutaru.h"
+#include "objects/object_gi_fire/object_gi_fire.h"
 #include "objects/gameplay_field_keep/gameplay_field_keep.h"
 #include "soh_assets.h"
 
@@ -258,28 +258,42 @@ extern "C" void Randomizer_DrawTriforcePieceGI(PlayState* play, GetItemEntry get
     CLOSE_DISPS(play->state.gfxCtx);
 }
 // TODO get custom model for boss souls
-// extern "C" void Randomizer_DrawBossSoul(PlayState* play, GetItemEntry getItemEntry) {
-//     OPEN_DISPS(play->state.gfxCtx);
 
-//     Gfx_SetupDL_25Opa(play->state.gfxCtx);
+
+extern "C" void Randomizer_DrawBossSoul(PlayState* play, GetItemEntry* getItemEntry) {
+    s16 slot = getItemEntry->getItemId - RG_GOHMA_SOUL;
+    s16 colors[9][3] = {
+        { 0, 255, 0 },   // Deku Tree
+        { 255, 0, 100 },   // Dodongo's Cavern
+        { 50, 255, 255},   // Jabu
+        { 4, 195, 46 },    // Forest Temple
+        { 237, 95, 95 },   // Fire Temple
+        { 85, 180, 223 },  // Water Temple
+        { 222, 158, 47 },  // Spirit Temple
+        { 126, 16, 177 },  // Shadow Temple
+        { 80, 80, 80 },    // Ganon's Castle
+
+    };
+    OPEN_DISPS(play->state.gfxCtx); 
     
-//     gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
-//       G_MTX_MODELVIEW | G_MTX_LOAD);
-//     gDPSetGrayscaleColor(POLY_OPA_DISP++, 255, 0, 0, 255);
-//     gSPGrayscale(POLY_OPA_DISP++, true);
-    
-//     gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gGiSkulltulaTokenDL);
+    Gfx_SetupDL_25Xlu(play->state.gfxCtx);
+    gSPSegment(POLY_XLU_DISP++, 8, (uintptr_t)Gfx_TwoTexScroll(
+        play->state.gfxCtx, 0, 0 * (play->state.frames * 0),
+        0 * (play->state.frames * 0), 16, 32, 1, 1 * (play->state.frames * 1),
+        -1 * (play->state.frames * 8), 16, 32
+    ));
+    Matrix_Push();
+    Matrix_Translate(0.0f, -50.0f, 0.0f, MTXMODE_APPLY);
+    Matrix_Scale(3.0f, 3.0f, 3.0f, MTXMODE_APPLY);
+    Matrix_ReplaceRotation(&play->billboardMtxF);
+    gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
+              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gDPSetGrayscaleColor(POLY_XLU_DISP++, colors[slot][0], colors[slot][1], colors[slot][2], 255);
+    gSPGrayscale(POLY_XLU_DISP++, true);
+    gSPDisplayList(POLY_XLU_DISP++, (Gfx*)gGiBlueFireFlameDL);
+    gSPGrayscale(POLY_XLU_DISP++, false);
+    Matrix_Pop();
 
-//     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-//     gSPSegment(POLY_XLU_DISP++, 8, Gfx_TwoTexScroll(
-//         play->state.gfxCtx, 0, 0 * (play->state.frames * 0),
-//         1 * -(play->state.frames * 5), 32, 32, 1, 0 * (play->state.frames * 0),
-//         0 * (play->state.frames * 0), 32, 64
-//     ));
-//     gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
-//               G_MTX_MODELVIEW | G_MTX_LOAD);
-//     gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gGiSkulltulaTokenFlameDL);
+    CLOSE_DISPS(play->state.gfxCtx);
 
-//     CLOSE_DISPS(play->state.gfxCtx);
-
-// }
+}
diff --git a/soh/soh/Enhancements/randomizer/draw.h b/soh/soh/Enhancements/randomizer/draw.h
index 40ca196b6..fd3b8f099 100644
--- a/soh/soh/Enhancements/randomizer/draw.h
+++ b/soh/soh/Enhancements/randomizer/draw.h
@@ -12,6 +12,7 @@ extern "C" {
 void Randomizer_DrawSmallKey(PlayState* play, GetItemEntry* getItemEntry);
 void Randomizer_DrawKeyRing(PlayState* play, GetItemEntry* getItemEntry);
 void Randomizer_DrawBossKey(PlayState* play, GetItemEntry* getItemEntry);
+void Randomizer_DrawBossSoul(PlayState* play, GetItemEntry* getItemEntry);
 void Randomizer_DrawDoubleDefense(PlayState* play, GetItemEntry* getItemEntry);
 void Randomizer_DrawTriforcePiece(PlayState* play, GetItemEntry getItemEntry);
 void Randomizer_DrawTriforcePieceGI(PlayState* play, GetItemEntry getItemEntry);
diff --git a/soh/soh/Enhancements/randomizer/item_list.cpp b/soh/soh/Enhancements/randomizer/item_list.cpp
index 16a21504f..63d01b022 100644
--- a/soh/soh/Enhancements/randomizer/item_list.cpp
+++ b/soh/soh/Enhancements/randomizer/item_list.cpp
@@ -239,14 +239,23 @@ void Rando::StaticData::InitItemTable() {
     itemTable[RG_BUY_RED_POTION_50] =                   Item(RG_BUY_RED_POTION_50,                Text{ "Buy Red Potion [50]", "Acheter: Potion Rouge [50]", "Rotes Elixier kaufen [50]" },                         ITEMTYPE_SHOP,              GI_POTION_RED,      false, &Logic::noVariable,          RHT_BOTTLE_WITH_RED_POTION, ITEM_POTION_RED,                OBJECT_GI_LIQUID,       GID_POTION_RED,     0x43,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 50);
     // Misc.
     itemTable[RG_GOHMA_SOUL] =                          Item(RG_GOHMA_SOUL,                      Text{ "Gohma's Soul", "", "" },                                                                                    ITEMTYPE_ITEM,              0xE0,               true,  &Logic::CanSummonGohma,      RHT_GOHMA_SOUL,             RG_GOHMA_SOUL,                  OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_GOHMA_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
     itemTable[RG_KING_DODONGO_SOUL] =                   Item(RG_KING_DODONGO_SOUL,               Text{ "King Dodongo's Soul", "", "" },                                                                             ITEMTYPE_ITEM,              0xE1,               true,  &Logic::CanSummonKingDodongo,RHT_KING_DODONGO_SOUL,      RG_KING_DODONGO_SOUL,           OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_KING_DODONGO_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
     itemTable[RG_BARINADE_SOUL] =                       Item(RG_BARINADE_SOUL,                   Text{ "Barinade's Soul", "", "" },                                                                                 ITEMTYPE_ITEM,              0xE2,               true,  &Logic::CanSummonBarinade,   RHT_BARINADE_SOUL,          RG_BARINADE_SOUL,               OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BARINADE_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
     itemTable[RG_PHANTOM_GANON_SOUL] =                  Item(RG_PHANTOM_GANON_SOUL,              Text{ "Phantom Ganon's Soul", "", "" },                                                                            ITEMTYPE_ITEM,              0xE3,               true,  &Logic::CanSummonPhantomGanon,RHT_PHANTOM_GANON_SOUL,    RG_PHANTOM_GANON_SOUL,          OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_PHANTOM_GANON_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
     itemTable[RG_VOLVAGIA_SOUL] =                       Item(RG_VOLVAGIA_SOUL,                   Text{ "Volvagia's Soul", "", "" },                                                                                 ITEMTYPE_ITEM,              0xE4,               true,  &Logic::CanSummonVolvagia,   RHT_VOLVAGIA_SOUL,          RG_VOLVAGIA_SOUL,               OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_VOLVAGIA_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
     itemTable[RG_MORPHA_SOUL] =                         Item(RG_MORPHA_SOUL,                     Text{ "Morpha's Soul", "", "" },                                                                                   ITEMTYPE_ITEM,              0xE5,               true,  &Logic::CanSummonMorpha,     RHT_MORPHA_SOUL,            RG_MORPHA_SOUL,                 OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_MORPHA_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
     itemTable[RG_BONGO_BONGO_SOUL] =                    Item(RG_BONGO_BONGO_SOUL,                Text{ "Bongo Bongo's Soul", "", "" },                                                                              ITEMTYPE_ITEM,              0xE6,               true,  &Logic::CanSummonBongoBongo, RHT_BONGO_BONGO_SOUL,       RG_BONGO_BONGO_SOUL,            OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BONGO_BONGO_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
     itemTable[RG_TWINROVA_SOUL] =                       Item(RG_TWINROVA_SOUL,                   Text{ "Twinrova's Soul", "", "" },                                                                                 ITEMTYPE_ITEM,              0xE7,               true,  &Logic::CanSummonTwinrova,   RHT_TWINROVA_SOUL,          RG_TWINROVA_SOUL,               OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_TWINROVA_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
     itemTable[RG_GANON_SOUL] =                          Item(RG_GANON_SOUL,                      Text{ "Ganon's Soul", "", "" },                                                                                    ITEMTYPE_ITEM,              0xE8,               true,  &Logic::CanSummonGanon,      RHT_GANON_SOUL,             RG_GANON_SOUL,                  OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_GANON_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
 
     itemTable[RG_TRIFORCE] =                            Item(RG_TRIFORCE,                         Text{ "Triforce", "Triforce", "Triforce" },                                                                       ITEMTYPE_EVENT,             RG_TRIFORCE,        false, &Logic::noVariable,          RHT_NONE);
     itemTable[RG_HINT] =                                Item(RG_HINT,                             Text{ "Hint", "Indice", "Hinweis" },                                                                              ITEMTYPE_EVENT,             RG_HINT,            false, &Logic::noVariable,          RHT_NONE);

From 0a5722d3efa6876d76fa7f86a0ea276c9ce91dfc Mon Sep 17 00:00:00 2001
From: Ralphie Morell <stratomaster64@gmail.com>
Date: Mon, 30 Oct 2023 17:44:21 -0400
Subject: [PATCH 017/230] Fix map/compass hints not showing V/MQ status

---
 soh/soh/Enhancements/randomizer/item_list.cpp | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/item_list.cpp b/soh/soh/Enhancements/randomizer/item_list.cpp
index 63d01b022..4246204c6 100644
--- a/soh/soh/Enhancements/randomizer/item_list.cpp
+++ b/soh/soh/Enhancements/randomizer/item_list.cpp
@@ -92,26 +92,26 @@ void Rando::StaticData::InitItemTable() {
     itemTable[RG_REQUIEM_OF_SPIRIT] =                   Item(RG_REQUIEM_OF_SPIRIT,                Text{ "Requiem of Spirit", "Requiem des Esprits", "Requiem des Geistes" },                                        ITEMTYPE_SONG,              0xBE,               true,  &Logic::RequiemOfSpirit,     RHT_REQUIEM_OF_SPIRIT,      ITEM_SONG_REQUIEM,              OBJECT_GI_MELODY,       GID_SONG_REQUIEM,   0x76,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
     itemTable[RG_PRELUDE_OF_LIGHT] =                    Item(RG_PRELUDE_OF_LIGHT,                 Text{ "Prelude of Light", "Prélude de la Lumière", "Präludium des Lichts" },                                      ITEMTYPE_SONG,              0xC0,               true,  &Logic::PreludeOfLight,      RHT_PRELUDE_OF_LIGHT,       ITEM_SONG_PRELUDE,              OBJECT_GI_MELODY,       GID_SONG_PRELUDE,   0x78,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
     // Maps and Compasses
-    itemTable[RG_DEKU_TREE_MAP] =                       Item(RG_DEKU_TREE_MAP,                    Text{ "Great Deku Tree Map", "Carte de l'Arbre Mojo", "Karte des Deku-Baums" },                                   ITEMTYPE_MAP,               0xA5,               false, &Logic::noVariable,          RHT_DEKU_TREE_MAP,          RG_DEKU_TREE_MAP,               OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_DODONGOS_CAVERN_MAP] =                 Item(RG_DODONGOS_CAVERN_MAP,              Text{ "Dodongo's Cavern Map", "Carte de la Caverne Dodongo", "Karte der Dodongo-Höhle" },                         ITEMTYPE_MAP,               0xA6,               false, &Logic::noVariable,          RHT_DODONGOS_CAVERN_MAP,    RG_DODONGOS_CAVERN_MAP,         OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_JABU_JABUS_BELLY_MAP] =                Item(RG_JABU_JABUS_BELLY_MAP,             Text{ "Jabu-Jabu's Belly Map", "Carte du Ventre de Jabu-Jabu", "Karte des Jabu-Jabu-Bauchs" },                    ITEMTYPE_MAP,               0xA7,               false, &Logic::noVariable,          RHT_JABU_JABUS_BELLY_MAP,   RG_JABU_JABUS_BELLY_MAP,        OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_FOREST_TEMPLE_MAP] =                   Item(RG_FOREST_TEMPLE_MAP,                Text{ "Forest Temple Map", "Carte du Temple de la Forêt", "Waldtempel Karte" },                                   ITEMTYPE_MAP,               0xA8,               false, &Logic::noVariable,          RHT_FOREST_TEMPLE_MAP,      RG_FOREST_TEMPLE_MAP,           OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_FIRE_TEMPLE_MAP] =                     Item(RG_FIRE_TEMPLE_MAP,                  Text{ "Fire Temple Map", "Carte due Temple de Feu", "Feuertempel Karte" },                                        ITEMTYPE_MAP,               0xA9,               false, &Logic::noVariable,          RHT_FIRE_TEMPLE_MAP,        RG_FIRE_TEMPLE_MAP,             OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_WATER_TEMPLE_MAP] =                    Item(RG_WATER_TEMPLE_MAP,                 Text{ "Water Temple Map", "Carte du Temple de l'Eau", "Wassertempel-Karte" },                                     ITEMTYPE_MAP,               0xAA,               false, &Logic::noVariable,          RHT_WATER_TEMPLE_MAP,       RG_WATER_TEMPLE_MAP,            OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_SPIRIT_TEMPLE_MAP] =                   Item(RG_SPIRIT_TEMPLE_MAP,                Text{ "Spirit Temple Map", "Carte due Temple de l'Esprit", "Geistertempel Karte" },                               ITEMTYPE_MAP,               0xAB,               false, &Logic::noVariable,          RHT_SPIRIT_TEMPLE_MAP,      RG_SPIRIT_TEMPLE_MAP,           OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_SHADOW_TEMPLE_MAP] =                   Item(RG_SHADOW_TEMPLE_MAP,                Text{ "Shadow Temple Map", "Carte du Temple de l'Ombre", "Karte des Schattentempels" },                           ITEMTYPE_MAP,               0xAC,               false, &Logic::noVariable,          RHT_SHADOW_TEMPLE_MAP,      RG_SHADOW_TEMPLE_MAP,           OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_BOTTOM_OF_THE_WELL_MAP] =              Item(RG_BOTTOM_OF_THE_WELL_MAP,           Text{ "Bottom of the Well Map", "Carte du Puits", "Boden des Brunnens Karte" },                                   ITEMTYPE_MAP,               0xAD,               false, &Logic::noVariable,          RHT_BOTTOM_OF_THE_WELL_MAP, RG_BOTTOM_OF_THE_WELL_MAP,      OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_ICE_CAVERN_MAP] =                      Item(RG_ICE_CAVERN_MAP,                   Text{ "Ice Cavern Map", "Carte de la Caverne Polaire", "Eishöhle Karte" },                                        ITEMTYPE_MAP,               0xAE,               false, &Logic::noVariable,          RHT_ICE_CAVERN_MAP,         RG_ICE_CAVERN_MAP,              OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_DEKU_TREE_COMPASS] =                   Item(RG_DEKU_TREE_COMPASS,                Text{ "Great Deku Tree Compass", "Boussole de l'Arbre Mojo", "Kompass des Deku-Baums" },                          ITEMTYPE_COMPASS,           0x9B,               false, &Logic::noVariable,          RHT_DEKU_TREE_COMPASS,      RG_DEKU_TREE_COMPASS,           OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_DODONGOS_CAVERN_COMPASS] =             Item(RG_DODONGOS_CAVERN_COMPASS,          Text{ "Dodongo's Cavern Compass", "Boussole de la Caverne Dodongo", "Kompass der Dodongo-Höhle" },                ITEMTYPE_COMPASS,           0x9C,               false, &Logic::noVariable,          RHT_DODONGOS_CAVERN_COMPASS,RG_DODONGOS_CAVERN_COMPASS,     OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_JABU_JABUS_BELLY_COMPASS] =            Item(RG_JABU_JABUS_BELLY_COMPASS,         Text{ "Jabu-Jabu's Belly Compass", "Boussole du Ventre de Jabu-Jabu", "Kompass des Jabu-Jabu-Bauchs" },           ITEMTYPE_COMPASS,           0x9D,               false, &Logic::noVariable,          RHT_JABU_JABUS_BELLY_COMPASS,RG_JABU_JABUS_BELLY_COMPASS,   OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_FOREST_TEMPLE_COMPASS] =               Item(RG_FOREST_TEMPLE_COMPASS,            Text{ "Forest Temple Compass", "Boussole du Temple de la Forêt", "Waldtempel-Kompass" },                          ITEMTYPE_COMPASS,           0x9E,               false, &Logic::noVariable,          RHT_FOREST_TEMPLE_COMPASS,  RG_FOREST_TEMPLE_COMPASS,       OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_FIRE_TEMPLE_COMPASS] =                 Item(RG_FIRE_TEMPLE_COMPASS,              Text{ "Fire Temple Compass", "Boussole du Temple du Feu", "Feuertempel-Kompass" },                                ITEMTYPE_COMPASS,           0x9F,               false, &Logic::noVariable,          RHT_FIRE_TEMPLE_COMPASS,    RG_FIRE_TEMPLE_COMPASS,         OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_WATER_TEMPLE_COMPASS] =                Item(RG_WATER_TEMPLE_COMPASS,             Text{ "Water Temple Compass", "Boussole du Temple de l'Eau", "Wassertempel-Kompass" },                            ITEMTYPE_COMPASS,           0xA0,               false, &Logic::noVariable,          RHT_WATER_TEMPLE_COMPASS,   RG_WATER_TEMPLE_COMPASS,        OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_SPIRIT_TEMPLE_COMPASS] =               Item(RG_SPIRIT_TEMPLE_COMPASS,            Text{ "Spirit Temple Compass", "Boussole due Temple de l'Esprit", "Geistiger Tempelkompass" },                    ITEMTYPE_COMPASS,           0xA1,               false, &Logic::noVariable,          RHT_SPIRIT_TEMPLE_COMPASS,  RG_SPIRIT_TEMPLE_COMPASS,       OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_SHADOW_TEMPLE_COMPASS] =               Item(RG_SHADOW_TEMPLE_COMPASS,            Text{ "Shadow Temple Compass", "Boussole du Temple de l'Ombre", "Kompass des Schattentempels" },                  ITEMTYPE_COMPASS,           0xA2,               false, &Logic::noVariable,          RHT_SHADOW_TEMPLE_COMPASS,  RG_SHADOW_TEMPLE_COMPASS,       OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_BOTTOM_OF_THE_WELL_COMPASS] =          Item(RG_BOTTOM_OF_THE_WELL_COMPASS,       Text{ "Bottom of the Well Compass", "Boussole du Puits", "Boden des Brunnenkompasses" },                          ITEMTYPE_COMPASS,           0xA3,               false, &Logic::noVariable,          RHT_BOTTOM_OF_THE_WELL_COMPASS,RG_BOTTOM_OF_THE_WELL_COMPASS,OBJECT_GI_COMPASS,     GID_COMPASS,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_ICE_CAVERN_COMPASS] =                  Item(RG_ICE_CAVERN_COMPASS,               Text{ "Ice Cavern Compass", "Boussole de la Caverne Polaire", "Eishöhlenkompass" },                               ITEMTYPE_COMPASS,           0xA4,               false, &Logic::noVariable,          RHT_ICE_CAVERN_COMPASS,     RG_ICE_CAVERN_COMPASS,          OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_DEKU_TREE_MAP] =                       Item(RG_DEKU_TREE_MAP,                    Text{ "Great Deku Tree Map", "Carte de l'Arbre Mojo", "Karte des Deku-Baums" },                                   ITEMTYPE_MAP,               0xA5,               false, &Logic::noVariable,          RHT_DEKU_TREE_MAP,          RG_DEKU_TREE_MAP,               OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_DODONGOS_CAVERN_MAP] =                 Item(RG_DODONGOS_CAVERN_MAP,              Text{ "Dodongo's Cavern Map", "Carte de la Caverne Dodongo", "Karte der Dodongo-Höhle" },                         ITEMTYPE_MAP,               0xA6,               false, &Logic::noVariable,          RHT_DODONGOS_CAVERN_MAP,    RG_DODONGOS_CAVERN_MAP,         OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_JABU_JABUS_BELLY_MAP] =                Item(RG_JABU_JABUS_BELLY_MAP,             Text{ "Jabu-Jabu's Belly Map", "Carte du Ventre de Jabu-Jabu", "Karte des Jabu-Jabu-Bauchs" },                    ITEMTYPE_MAP,               0xA7,               false, &Logic::noVariable,          RHT_JABU_JABUS_BELLY_MAP,   RG_JABU_JABUS_BELLY_MAP,        OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_FOREST_TEMPLE_MAP] =                   Item(RG_FOREST_TEMPLE_MAP,                Text{ "Forest Temple Map", "Carte du Temple de la Forêt", "Waldtempel Karte" },                                   ITEMTYPE_MAP,               0xA8,               false, &Logic::noVariable,          RHT_FOREST_TEMPLE_MAP,      RG_FOREST_TEMPLE_MAP,           OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_FIRE_TEMPLE_MAP] =                     Item(RG_FIRE_TEMPLE_MAP,                  Text{ "Fire Temple Map", "Carte due Temple de Feu", "Feuertempel Karte" },                                        ITEMTYPE_MAP,               0xA9,               false, &Logic::noVariable,          RHT_FIRE_TEMPLE_MAP,        RG_FIRE_TEMPLE_MAP,             OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_WATER_TEMPLE_MAP] =                    Item(RG_WATER_TEMPLE_MAP,                 Text{ "Water Temple Map", "Carte du Temple de l'Eau", "Wassertempel-Karte" },                                     ITEMTYPE_MAP,               0xAA,               false, &Logic::noVariable,          RHT_WATER_TEMPLE_MAP,       RG_WATER_TEMPLE_MAP,            OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_SPIRIT_TEMPLE_MAP] =                   Item(RG_SPIRIT_TEMPLE_MAP,                Text{ "Spirit Temple Map", "Carte due Temple de l'Esprit", "Geistertempel Karte" },                               ITEMTYPE_MAP,               0xAB,               false, &Logic::noVariable,          RHT_SPIRIT_TEMPLE_MAP,      RG_SPIRIT_TEMPLE_MAP,           OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_SHADOW_TEMPLE_MAP] =                   Item(RG_SHADOW_TEMPLE_MAP,                Text{ "Shadow Temple Map", "Carte du Temple de l'Ombre", "Karte des Schattentempels" },                           ITEMTYPE_MAP,               0xAC,               false, &Logic::noVariable,          RHT_SHADOW_TEMPLE_MAP,      RG_SHADOW_TEMPLE_MAP,           OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_BOTTOM_OF_THE_WELL_MAP] =              Item(RG_BOTTOM_OF_THE_WELL_MAP,           Text{ "Bottom of the Well Map", "Carte du Puits", "Boden des Brunnens Karte" },                                   ITEMTYPE_MAP,               0xAD,               false, &Logic::noVariable,          RHT_BOTTOM_OF_THE_WELL_MAP, RG_BOTTOM_OF_THE_WELL_MAP,      OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_ICE_CAVERN_MAP] =                      Item(RG_ICE_CAVERN_MAP,                   Text{ "Ice Cavern Map", "Carte de la Caverne Polaire", "Eishöhle Karte" },                                        ITEMTYPE_MAP,               0xAE,               false, &Logic::noVariable,          RHT_ICE_CAVERN_MAP,         RG_ICE_CAVERN_MAP,              OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_DEKU_TREE_COMPASS] =                   Item(RG_DEKU_TREE_COMPASS,                Text{ "Great Deku Tree Compass", "Boussole de l'Arbre Mojo", "Kompass des Deku-Baums" },                          ITEMTYPE_COMPASS,           0x9B,               false, &Logic::noVariable,          RHT_DEKU_TREE_COMPASS,      RG_DEKU_TREE_COMPASS,           OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_DODONGOS_CAVERN_COMPASS] =             Item(RG_DODONGOS_CAVERN_COMPASS,          Text{ "Dodongo's Cavern Compass", "Boussole de la Caverne Dodongo", "Kompass der Dodongo-Höhle" },                ITEMTYPE_COMPASS,           0x9C,               false, &Logic::noVariable,          RHT_DODONGOS_CAVERN_COMPASS,RG_DODONGOS_CAVERN_COMPASS,     OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_JABU_JABUS_BELLY_COMPASS] =            Item(RG_JABU_JABUS_BELLY_COMPASS,         Text{ "Jabu-Jabu's Belly Compass", "Boussole du Ventre de Jabu-Jabu", "Kompass des Jabu-Jabu-Bauchs" },           ITEMTYPE_COMPASS,           0x9D,               false, &Logic::noVariable,          RHT_JABU_JABUS_BELLY_COMPASS,RG_JABU_JABUS_BELLY_COMPASS,   OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_FOREST_TEMPLE_COMPASS] =               Item(RG_FOREST_TEMPLE_COMPASS,            Text{ "Forest Temple Compass", "Boussole du Temple de la Forêt", "Waldtempel-Kompass" },                          ITEMTYPE_COMPASS,           0x9E,               false, &Logic::noVariable,          RHT_FOREST_TEMPLE_COMPASS,  RG_FOREST_TEMPLE_COMPASS,       OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_FIRE_TEMPLE_COMPASS] =                 Item(RG_FIRE_TEMPLE_COMPASS,              Text{ "Fire Temple Compass", "Boussole du Temple du Feu", "Feuertempel-Kompass" },                                ITEMTYPE_COMPASS,           0x9F,               false, &Logic::noVariable,          RHT_FIRE_TEMPLE_COMPASS,    RG_FIRE_TEMPLE_COMPASS,         OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_WATER_TEMPLE_COMPASS] =                Item(RG_WATER_TEMPLE_COMPASS,             Text{ "Water Temple Compass", "Boussole du Temple de l'Eau", "Wassertempel-Kompass" },                            ITEMTYPE_COMPASS,           0xA0,               false, &Logic::noVariable,          RHT_WATER_TEMPLE_COMPASS,   RG_WATER_TEMPLE_COMPASS,        OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_SPIRIT_TEMPLE_COMPASS] =               Item(RG_SPIRIT_TEMPLE_COMPASS,            Text{ "Spirit Temple Compass", "Boussole due Temple de l'Esprit", "Geistiger Tempelkompass" },                    ITEMTYPE_COMPASS,           0xA1,               false, &Logic::noVariable,          RHT_SPIRIT_TEMPLE_COMPASS,  RG_SPIRIT_TEMPLE_COMPASS,       OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_SHADOW_TEMPLE_COMPASS] =               Item(RG_SHADOW_TEMPLE_COMPASS,            Text{ "Shadow Temple Compass", "Boussole du Temple de l'Ombre", "Kompass des Schattentempels" },                  ITEMTYPE_COMPASS,           0xA2,               false, &Logic::noVariable,          RHT_SHADOW_TEMPLE_COMPASS,  RG_SHADOW_TEMPLE_COMPASS,       OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_BOTTOM_OF_THE_WELL_COMPASS] =          Item(RG_BOTTOM_OF_THE_WELL_COMPASS,       Text{ "Bottom of the Well Compass", "Boussole du Puits", "Boden des Brunnenkompasses" },                          ITEMTYPE_COMPASS,           0xA3,               false, &Logic::noVariable,          RHT_BOTTOM_OF_THE_WELL_COMPASS,RG_BOTTOM_OF_THE_WELL_COMPASS,OBJECT_GI_COMPASS,     GID_COMPASS,        TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_ICE_CAVERN_COMPASS] =                  Item(RG_ICE_CAVERN_COMPASS,               Text{ "Ice Cavern Compass", "Boussole de la Caverne Polaire", "Eishöhlenkompass" },                               ITEMTYPE_COMPASS,           0xA4,               false, &Logic::noVariable,          RHT_ICE_CAVERN_COMPASS,     RG_ICE_CAVERN_COMPASS,          OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
     // Boss Keys
     itemTable[RG_FOREST_TEMPLE_BOSS_KEY] =              Item(RG_FOREST_TEMPLE_BOSS_KEY,           Text{ "Forest Temple Boss Key", "Clé d'Or du Temple de la Forêt", "Waldtempel-Boss-Schlüssel" },                  ITEMTYPE_BOSSKEY,           0x95,               true,  &Logic::BossKeyForestTemple, RHT_FOREST_TEMPLE_BOSS_KEY, RG_FOREST_TEMPLE_BOSS_KEY,      OBJECT_GI_BOSSKEY,      GID_KEY_BOSS,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
     itemTable[RG_FOREST_TEMPLE_BOSS_KEY].SetCustomDrawFunc(Randomizer_DrawBossKey);

From e1706e2aa1315274faca338c3e61eeb0dcd60995 Mon Sep 17 00:00:00 2001
From: Ralphie Morell <stratomaster64@gmail.com>
Date: Mon, 30 Oct 2023 21:50:00 -0400
Subject: [PATCH 018/230] test model v1

---
 .../object_gi_boss_soul/gGIBossSoulSkullDL    |  19 ++
 .../gGIBossSoulSkullDL_tri_0                  | 163 +++++++++++
 .../gGIBossSoulSkullDL_tri_1                  |  26 ++
 .../gGIBossSoulSkullDL_tri_2                  |   7 +
 .../gGIBossSoulSkullDL_tri_3                  |  48 ++++
 .../gGIBossSoulSkullDL_tri_4                  | 245 ++++++++++++++++
 .../gGIBossSoulSkullDL_vtx_0                  | 173 ++++++++++++
 .../gGIBossSoulSkullDL_vtx_1                  |  26 ++
 .../gGIBossSoulSkullDL_vtx_2                  |   6 +
 .../gGIBossSoulSkullDL_vtx_3                  |  58 ++++
 .../gGIBossSoulSkullDL_vtx_4                  | 267 ++++++++++++++++++
 .../mat_gGIBossSoulSkullDL_Gem_eyes           |  21 ++
 .../mat_gGIBossSoulSkullDL_skull_black        |  21 ++
 .../mat_gGIBossSoulSkullDL_skull_eyes         |  21 ++
 .../mat_gGIBossSoulSkullDL_skull_horns        |  21 ++
 .../mat_gGIBossSoulSkullDL_skull_surface      |  21 ++
 .../objects/object_gi_boss_soul/noise_tex     | Bin 0 -> 1116 bytes
 .../object_gi_boss_soul/noise_tex_copy        | Bin 0 -> 2140 bytes
 soh/assets/soh_assets.h                       |   3 +
 soh/soh/Enhancements/randomizer/draw.cpp      |  39 +--
 20 files changed, 1169 insertions(+), 16 deletions(-)
 create mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL
 create mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_0
 create mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_1
 create mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_2
 create mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_3
 create mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_4
 create mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_0
 create mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_1
 create mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_2
 create mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_3
 create mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4
 create mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_Gem_eyes
 create mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_black
 create mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_eyes
 create mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_horns
 create mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_surface
 create mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/noise_tex
 create mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/noise_tex_copy

diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL
new file mode 100644
index 000000000..be842d37d
--- /dev/null
+++ b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL
@@ -0,0 +1,19 @@
+<DisplayList Version="0">
+	<CallDisplayList Path="objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_surface"/>
+	<CallDisplayList Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_0"/>
+	<CallDisplayList Path="objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_black"/>
+	<CallDisplayList Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_1"/>
+	<CallDisplayList Path="objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_eyes"/>
+	<CallDisplayList Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_2"/>
+	<CallDisplayList Path="objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_horns"/>
+	<CallDisplayList Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_3"/>
+	<CallDisplayList Path="objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_Gem_eyes"/>
+	<CallDisplayList Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_4"/>
+	<PipeSync/>
+	<SetGeometryMode G_LIGHTING="1" />
+	<ClearGeometryMode G_TEXTURE_GEN="1" />
+	<SetCombineLERP A0="G_CCMUX_0" B0="G_CCMUX_0" C0="G_CCMUX_0" D0="G_CCMUX_SHADE" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_ENVIRONMENT" A1="G_CCMUX_0" B1="G_CCMUX_0" C1="G_CCMUX_0" D1="G_CCMUX_SHADE" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_ENVIRONMENT"/>
+	<Texture S="65535" T="65535" Level="0" Tile="0" On="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_0 b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_0
new file mode 100644
index 000000000..87cfedfaf
--- /dev/null
+++ b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_0
@@ -0,0 +1,163 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="0" V01="2" V02="3"/>
+	<Triangle1 V00="3" V01="2" V02="4"/>
+	<Triangle1 V00="2" V01="5" V02="4"/>
+	<Triangle1 V00="2" V01="6" V02="5"/>
+	<Triangle1 V00="7" V01="6" V02="2"/>
+	<Triangle1 V00="2" V01="8" V02="7"/>
+	<Triangle1 V00="2" V01="9" V02="8"/>
+	<Triangle1 V00="8" V01="9" V02="10"/>
+	<Triangle1 V00="8" V01="10" V02="11"/>
+	<Triangle1 V00="12" V01="11" V02="10"/>
+	<Triangle1 V00="10" V01="13" V02="12"/>
+	<Triangle1 V00="13" V01="14" V02="12"/>
+	<Triangle1 V00="12" V01="14" V02="15"/>
+	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_0" VertexBufferIndex="0" VertexOffset="16" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="0" V01="3" V02="1"/>
+	<Triangle1 V00="4" V01="2" V02="1"/>
+	<Triangle1 V00="2" V01="4" V02="5"/>
+	<Triangle1 V00="6" V01="5" V02="4"/>
+	<Triangle1 V00="4" V01="7" V02="6"/>
+	<Triangle1 V00="4" V01="8" V02="7"/>
+	<Triangle1 V00="1" V01="8" V02="4"/>
+	<Triangle1 V00="1" V01="9" V02="8"/>
+	<Triangle1 V00="9" V01="10" V02="8"/>
+	<Triangle1 V00="7" V01="8" V02="10"/>
+	<Triangle1 V00="7" V01="10" V02="11"/>
+	<Triangle1 V00="11" V01="10" V02="12"/>
+	<Triangle1 V00="11" V01="12" V02="13"/>
+	<Triangle1 V00="13" V01="12" V02="14"/>
+	<Triangle1 V00="15" V01="14" V02="12"/>
+	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_0" VertexBufferIndex="0" VertexOffset="32" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="2" V01="3" V02="0"/>
+	<Triangle1 V00="4" V01="3" V02="2"/>
+	<Triangle1 V00="4" V01="5" V02="3"/>
+	<Triangle1 V00="4" V01="6" V02="5"/>
+	<Triangle1 V00="4" V01="7" V02="6"/>
+	<Triangle1 V00="6" V01="7" V02="8"/>
+	<Triangle1 V00="6" V01="8" V02="9"/>
+	<Triangle1 V00="10" V01="9" V02="8"/>
+	<Triangle1 V00="10" V01="8" V02="11"/>
+	<Triangle1 V00="8" V01="12" V02="11"/>
+	<Triangle1 V00="13" V01="12" V02="8"/>
+	<Triangle1 V00="14" V01="13" V02="8"/>
+	<Triangle1 V00="14" V01="8" V02="15"/>
+	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_0" VertexBufferIndex="0" VertexOffset="48" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="3" V01="0" V02="2"/>
+	<Triangle1 V00="2" V01="4" V02="3"/>
+	<Triangle1 V00="2" V01="5" V02="4"/>
+	<Triangle1 V00="2" V01="6" V02="5"/>
+	<Triangle1 V00="6" V01="7" V02="5"/>
+	<Triangle1 V00="7" V01="6" V02="8"/>
+	<Triangle1 V00="7" V01="8" V02="9"/>
+	<Triangle1 V00="5" V01="7" V02="10"/>
+	<Triangle1 V00="5" V01="10" V02="11"/>
+	<Triangle1 V00="11" V01="12" V02="5"/>
+	<Triangle1 V00="13" V01="12" V02="11"/>
+	<Triangle1 V00="13" V01="11" V02="14"/>
+	<Triangle1 V00="15" V01="13" V02="14"/>
+	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_0" VertexBufferIndex="0" VertexOffset="64" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="2" V01="3" V02="0"/>
+	<Triangle1 V00="4" V01="0" V02="3"/>
+	<Triangle1 V00="0" V01="4" V02="5"/>
+	<Triangle1 V00="4" V01="6" V02="5"/>
+	<Triangle1 V00="6" V01="4" V02="7"/>
+	<Triangle1 V00="4" V01="8" V02="7"/>
+	<Triangle1 V00="4" V01="9" V02="8"/>
+	<Triangle1 V00="10" V01="9" V02="4"/>
+	<Triangle1 V00="4" V01="11" V02="10"/>
+	<Triangle1 V00="11" V01="12" V02="10"/>
+	<Triangle1 V00="11" V01="13" V02="12"/>
+	<Triangle1 V00="12" V01="13" V02="14"/>
+	<Triangle1 V00="12" V01="14" V02="15"/>
+	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_0" VertexBufferIndex="0" VertexOffset="80" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="0" V01="2" V02="3"/>
+	<Triangle1 V00="4" V01="0" V02="3"/>
+	<Triangle1 V00="4" V01="3" V02="5"/>
+	<Triangle1 V00="6" V01="5" V02="3"/>
+	<Triangle1 V00="6" V01="3" V02="7"/>
+	<Triangle1 V00="6" V01="7" V02="8"/>
+	<Triangle1 V00="6" V01="8" V02="9"/>
+	<Triangle1 V00="9" V01="10" V02="6"/>
+	<Triangle1 V00="9" V01="11" V02="10"/>
+	<Triangle1 V00="11" V01="12" V02="10"/>
+	<Triangle1 V00="12" V01="11" V02="13"/>
+	<Triangle1 V00="14" V01="12" V02="13"/>
+	<Triangle1 V00="14" V01="15" V02="12"/>
+	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_0" VertexBufferIndex="0" VertexOffset="96" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="0" V01="2" V02="3"/>
+	<Triangle1 V00="0" V01="3" V02="4"/>
+	<Triangle1 V00="0" V01="4" V02="5"/>
+	<Triangle1 V00="4" V01="6" V02="5"/>
+	<Triangle1 V00="6" V01="7" V02="5"/>
+	<Triangle1 V00="7" V01="8" V02="5"/>
+	<Triangle1 V00="8" V01="7" V02="9"/>
+	<Triangle1 V00="8" V01="9" V02="10"/>
+	<Triangle1 V00="11" V01="5" V02="8"/>
+	<Triangle1 V00="12" V01="5" V02="11"/>
+	<Triangle1 V00="13" V01="12" V02="11"/>
+	<Triangle1 V00="13" V01="11" V02="14"/>
+	<Triangle1 V00="15" V01="14" V02="11"/>
+	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_0" VertexBufferIndex="0" VertexOffset="112" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="1" V01="3" V02="2"/>
+	<Triangle1 V00="0" V01="4" V02="5"/>
+	<Triangle1 V00="0" V01="6" V02="4"/>
+	<Triangle1 V00="4" V01="7" V02="5"/>
+	<Triangle1 V00="4" V01="8" V02="7"/>
+	<Triangle1 V00="9" V01="7" V02="8"/>
+	<Triangle1 V00="8" V01="10" V02="9"/>
+	<Triangle1 V00="8" V01="11" V02="10"/>
+	<Triangle1 V00="11" V01="12" V02="10"/>
+	<Triangle1 V00="11" V01="13" V02="12"/>
+	<Triangle1 V00="14" V01="12" V02="13"/>
+	<Triangle1 V00="14" V01="15" V02="12"/>
+	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_0" VertexBufferIndex="0" VertexOffset="128" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="0" V01="2" V02="3"/>
+	<Triangle1 V00="3" V01="4" V02="0"/>
+	<Triangle1 V00="0" V01="5" V02="1"/>
+	<Triangle1 V00="0" V01="6" V02="5"/>
+	<Triangle1 V00="6" V01="7" V02="5"/>
+	<Triangle1 V00="6" V01="8" V02="7"/>
+	<Triangle1 V00="5" V01="7" V02="9"/>
+	<Triangle1 V00="10" V01="9" V02="7"/>
+	<Triangle1 V00="11" V01="10" V02="7"/>
+	<Triangle1 V00="12" V01="9" V02="10"/>
+	<Triangle1 V00="13" V01="9" V02="12"/>
+	<Triangle1 V00="14" V01="13" V02="12"/>
+	<Triangle1 V00="14" V01="12" V02="15"/>
+	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_0" VertexBufferIndex="0" VertexOffset="144" Count="14"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="3" V01="0" V02="2"/>
+	<Triangle1 V00="3" V01="2" V02="4"/>
+	<Triangle1 V00="2" V01="5" V02="4"/>
+	<Triangle1 V00="6" V01="0" V02="3"/>
+	<Triangle1 V00="7" V01="0" V02="6"/>
+	<Triangle1 V00="8" V01="7" V02="6"/>
+	<Triangle1 V00="8" V01="6" V02="9"/>
+	<Triangle1 V00="7" V01="1" V02="0"/>
+	<Triangle1 V00="10" V01="11" V02="12"/>
+	<Triangle1 V00="10" V01="12" V02="13"/>
+	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_0" VertexBufferIndex="0" VertexOffset="158" Count="13"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="0" V01="3" V02="1"/>
+	<Triangle1 V00="4" V01="5" V02="6"/>
+	<Triangle1 V00="4" V01="7" V02="5"/>
+	<Triangle1 V00="7" V01="8" V02="5"/>
+	<Triangle1 V00="7" V01="9" V02="8"/>
+	<Triangle1 V00="10" V01="8" V02="9"/>
+	<Triangle1 V00="10" V01="11" V02="8"/>
+	<Triangle1 V00="11" V01="12" V02="8"/>
+	<Triangle1 V00="5" V01="8" V02="12"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_1 b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_1
new file mode 100644
index 000000000..de52a892e
--- /dev/null
+++ b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_1
@@ -0,0 +1,26 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_1" VertexBufferIndex="0" VertexOffset="0" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="0" V01="2" V02="3"/>
+	<Triangle1 V00="2" V01="4" V02="3"/>
+	<Triangle1 V00="3" V01="5" V02="0"/>
+	<Triangle1 V00="3" V01="6" V02="5"/>
+	<Triangle1 V00="5" V01="7" V02="0"/>
+	<Triangle1 V00="8" V01="9" V02="10"/>
+	<Triangle1 V00="8" V01="10" V02="11"/>
+	<Triangle1 V00="10" V01="12" V02="11"/>
+	<Triangle1 V00="11" V01="13" V02="8"/>
+	<Triangle1 V00="11" V01="14" V02="13"/>
+	<Triangle1 V00="13" V01="15" V02="8"/>
+	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_1" VertexBufferIndex="0" VertexOffset="16" Count="8"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="3" V01="2" V02="1"/>
+	<Triangle1 V00="3" V01="4" V02="2"/>
+	<Triangle1 V00="5" V01="4" V02="3"/>
+	<Triangle1 V00="5" V01="6" V02="4"/>
+	<Triangle1 V00="5" V01="7" V02="6"/>
+	<Triangle1 V00="5" V01="0" V02="7"/>
+	<Triangle1 V00="0" V01="2" V02="7"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_2 b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_2
new file mode 100644
index 000000000..a0b27f7e9
--- /dev/null
+++ b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_2
@@ -0,0 +1,7 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_2" VertexBufferIndex="0" VertexOffset="0" Count="4"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="3" V01="2" V02="1"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_3 b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_3
new file mode 100644
index 000000000..6dbbdc411
--- /dev/null
+++ b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_3
@@ -0,0 +1,48 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_3" VertexBufferIndex="0" VertexOffset="0" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="0" V01="2" V02="3"/>
+	<Triangle1 V00="3" V01="2" V02="4"/>
+	<Triangle1 V00="3" V01="4" V02="5"/>
+	<Triangle1 V00="5" V01="4" V02="6"/>
+	<Triangle1 V00="7" V01="8" V02="9"/>
+	<Triangle1 V00="7" V01="9" V02="10"/>
+	<Triangle1 V00="10" V01="9" V02="11"/>
+	<Triangle1 V00="10" V01="11" V02="12"/>
+	<Triangle1 V00="12" V01="11" V02="13"/>
+	<Triangle1 V00="14" V01="10" V02="12"/>
+	<Triangle1 V00="15" V01="10" V02="14"/>
+	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_3" VertexBufferIndex="0" VertexOffset="16" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="0" V01="2" V02="3"/>
+	<Triangle1 V00="3" V01="2" V02="4"/>
+	<Triangle1 V00="2" V01="5" V02="4"/>
+	<Triangle1 V00="4" V01="5" V02="6"/>
+	<Triangle1 V00="3" V01="4" V02="7"/>
+	<Triangle1 V00="7" V01="4" V02="8"/>
+	<Triangle1 V00="1" V01="9" V02="10"/>
+	<Triangle1 V00="11" V01="12" V02="13"/>
+	<Triangle1 V00="11" V01="14" V02="12"/>
+	<Triangle1 V00="14" V01="15" V02="12"/>
+	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_3" VertexBufferIndex="0" VertexOffset="32" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="1" V01="3" V02="2"/>
+	<Triangle1 V00="4" V01="5" V02="6"/>
+	<Triangle1 V00="4" V01="7" V02="5"/>
+	<Triangle1 V00="8" V01="7" V02="4"/>
+	<Triangle1 V00="8" V01="9" V02="7"/>
+	<Triangle1 V00="10" V01="9" V02="8"/>
+	<Triangle1 V00="10" V01="11" V02="9"/>
+	<Triangle1 V00="11" V01="12" V02="9"/>
+	<Triangle1 V00="11" V01="13" V02="12"/>
+	<Triangle1 V00="13" V01="14" V02="12"/>
+	<Triangle1 V00="9" V01="12" V02="15"/>
+	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_3" VertexBufferIndex="0" VertexOffset="48" Count="8"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="3" V01="2" V02="4"/>
+	<Triangle1 V00="4" V01="2" V02="5"/>
+	<Triangle1 V00="2" V01="6" V02="5"/>
+	<Triangle1 V00="4" V01="5" V02="7"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_4 b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_4
new file mode 100644
index 000000000..13013ff53
--- /dev/null
+++ b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_4
@@ -0,0 +1,245 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="0" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="0" V01="3" V02="1"/>
+	<Triangle1 V00="4" V01="3" V02="0"/>
+	<Triangle1 V00="5" V01="4" V02="0"/>
+	<Triangle1 V00="0" V01="6" V02="5"/>
+	<Triangle1 V00="6" V01="7" V02="5"/>
+	<Triangle1 V00="6" V01="8" V02="7"/>
+	<Triangle1 V00="6" V01="9" V02="8"/>
+	<Triangle1 V00="8" V01="9" V02="10"/>
+	<Triangle1 V00="11" V01="10" V02="9"/>
+	<Triangle1 V00="2" V01="11" V02="9"/>
+	<Triangle1 V00="2" V01="12" V02="11"/>
+	<Triangle1 V00="12" V01="2" V02="13"/>
+	<Triangle1 V00="12" V01="13" V02="14"/>
+	<Triangle1 V00="15" V01="14" V02="13"/>
+	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="16" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="2" V01="3" V02="0"/>
+	<Triangle1 V00="3" V01="4" V02="0"/>
+	<Triangle1 V00="4" V01="3" V02="5"/>
+	<Triangle1 V00="5" V01="3" V02="6"/>
+	<Triangle1 V00="3" V01="7" V02="6"/>
+	<Triangle1 V00="3" V01="8" V02="7"/>
+	<Triangle1 V00="7" V01="8" V02="9"/>
+	<Triangle1 V00="10" V01="9" V02="8"/>
+	<Triangle1 V00="10" V01="11" V02="9"/>
+	<Triangle1 V00="12" V01="11" V02="10"/>
+	<Triangle1 V00="12" V01="13" V02="11"/>
+	<Triangle1 V00="12" V01="14" V02="13"/>
+	<Triangle1 V00="15" V01="14" V02="12"/>
+	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="32" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="3" V01="1" V02="0"/>
+	<Triangle1 V00="3" V01="0" V02="4"/>
+	<Triangle1 V00="5" V01="3" V02="4"/>
+	<Triangle1 V00="5" V01="6" V02="3"/>
+	<Triangle1 V00="5" V01="7" V02="6"/>
+	<Triangle1 V00="7" V01="8" V02="6"/>
+	<Triangle1 V00="7" V01="9" V02="8"/>
+	<Triangle1 V00="10" V01="9" V02="7"/>
+	<Triangle1 V00="11" V01="10" V02="7"/>
+	<Triangle1 V00="11" V01="12" V02="10"/>
+	<Triangle1 V00="11" V01="13" V02="12"/>
+	<Triangle1 V00="14" V01="12" V02="13"/>
+	<Triangle1 V00="14" V01="15" V02="12"/>
+	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="48" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="0" V01="3" V02="1"/>
+	<Triangle1 V00="0" V01="4" V02="3"/>
+	<Triangle1 V00="5" V01="4" V02="0"/>
+	<Triangle1 V00="6" V01="5" V02="0"/>
+	<Triangle1 V00="7" V01="5" V02="6"/>
+	<Triangle1 V00="7" V01="6" V02="8"/>
+	<Triangle1 V00="9" V01="7" V02="8"/>
+	<Triangle1 V00="9" V01="10" V02="7"/>
+	<Triangle1 V00="9" V01="11" V02="10"/>
+	<Triangle1 V00="9" V01="12" V02="11"/>
+	<Triangle1 V00="13" V01="11" V02="12"/>
+	<Triangle1 V00="13" V01="14" V02="11"/>
+	<Triangle1 V00="13" V01="15" V02="14"/>
+	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="64" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="3" V01="0" V02="2"/>
+	<Triangle1 V00="3" V01="2" V02="4"/>
+	<Triangle1 V00="0" V01="5" V02="1"/>
+	<Triangle1 V00="1" V01="5" V02="6"/>
+	<Triangle1 V00="5" V01="7" V02="6"/>
+	<Triangle1 V00="5" V01="8" V02="7"/>
+	<Triangle1 V00="8" V01="9" V02="7"/>
+	<Triangle1 V00="8" V01="10" V02="9"/>
+	<Triangle1 V00="9" V01="10" V02="11"/>
+	<Triangle1 V00="9" V01="11" V02="12"/>
+	<Triangle1 V00="12" V01="11" V02="13"/>
+	<Triangle1 V00="12" V01="13" V02="14"/>
+	<Triangle1 V00="15" V01="14" V02="13"/>
+	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="80" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="0" V01="3" V02="4"/>
+	<Triangle1 V00="3" V01="5" V02="4"/>
+	<Triangle1 V00="3" V01="6" V02="5"/>
+	<Triangle1 V00="7" V01="4" V02="5"/>
+	<Triangle1 V00="7" V01="8" V02="4"/>
+	<Triangle1 V00="9" V01="8" V02="7"/>
+	<Triangle1 V00="10" V01="9" V02="7"/>
+	<Triangle1 V00="11" V01="10" V02="7"/>
+	<Triangle1 V00="11" V01="7" V02="5"/>
+	<Triangle1 V00="12" V01="10" V02="11"/>
+	<Triangle1 V00="12" V01="13" V02="10"/>
+	<Triangle1 V00="13" V01="14" V02="10"/>
+	<Triangle1 V00="13" V01="15" V02="14"/>
+	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="96" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="0" V01="2" V02="3"/>
+	<Triangle1 V00="3" V01="2" V02="4"/>
+	<Triangle1 V00="3" V01="4" V02="5"/>
+	<Triangle1 V00="6" V01="5" V02="4"/>
+	<Triangle1 V00="6" V01="4" V02="7"/>
+	<Triangle1 V00="6" V01="8" V02="5"/>
+	<Triangle1 V00="8" V01="9" V02="5"/>
+	<Triangle1 V00="8" V01="10" V02="9"/>
+	<Triangle1 V00="11" V01="9" V02="10"/>
+	<Triangle1 V00="11" V01="12" V02="9"/>
+	<Triangle1 V00="13" V01="12" V02="11"/>
+	<Triangle1 V00="12" V01="14" V02="9"/>
+	<Triangle1 V00="12" V01="15" V02="14"/>
+	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="112" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="0" V01="3" V02="1"/>
+	<Triangle1 V00="1" V01="3" V02="4"/>
+	<Triangle1 V00="1" V01="5" V02="2"/>
+	<Triangle1 V00="1" V01="6" V02="5"/>
+	<Triangle1 V00="7" V01="6" V02="1"/>
+	<Triangle1 V00="2" V01="5" V02="8"/>
+	<Triangle1 V00="2" V01="8" V02="9"/>
+	<Triangle1 V00="10" V01="11" V02="12"/>
+	<Triangle1 V00="10" V01="13" V02="11"/>
+	<Triangle1 V00="13" V01="14" V02="11"/>
+	<Triangle1 V00="13" V01="15" V02="14"/>
+	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="128" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="3" V01="4" V02="5"/>
+	<Triangle1 V00="3" V01="5" V02="6"/>
+	<Triangle1 V00="6" V01="5" V02="7"/>
+	<Triangle1 V00="8" V01="7" V02="5"/>
+	<Triangle1 V00="9" V01="8" V02="5"/>
+	<Triangle1 V00="9" V01="10" V02="8"/>
+	<Triangle1 V00="11" V01="10" V02="9"/>
+	<Triangle1 V00="12" V01="11" V02="9"/>
+	<Triangle1 V00="13" V01="12" V02="9"/>
+	<Triangle1 V00="14" V01="13" V02="9"/>
+	<Triangle1 V00="13" V01="14" V02="15"/>
+	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="144" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="3" V01="2" V02="1"/>
+	<Triangle1 V00="3" V01="1" V02="4"/>
+	<Triangle1 V00="4" V01="5" V02="3"/>
+	<Triangle1 V00="4" V01="6" V02="5"/>
+	<Triangle1 V00="5" V01="6" V02="7"/>
+	<Triangle1 V00="8" V01="7" V02="6"/>
+	<Triangle1 V00="9" V01="8" V02="6"/>
+	<Triangle1 V00="9" V01="10" V02="8"/>
+	<Triangle1 V00="11" V01="10" V02="9"/>
+	<Triangle1 V00="12" V01="11" V02="9"/>
+	<Triangle1 V00="11" V01="12" V02="13"/>
+	<Triangle1 V00="13" V01="12" V02="14"/>
+	<Triangle1 V00="13" V01="14" V02="15"/>
+	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="160" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="3" V01="2" V02="1"/>
+	<Triangle1 V00="3" V01="1" V02="4"/>
+	<Triangle1 V00="4" V01="1" V02="5"/>
+	<Triangle1 V00="6" V01="5" V02="1"/>
+	<Triangle1 V00="6" V01="7" V02="5"/>
+	<Triangle1 V00="6" V01="8" V02="7"/>
+	<Triangle1 V00="9" V01="7" V02="8"/>
+	<Triangle1 V00="9" V01="10" V02="7"/>
+	<Triangle1 V00="9" V01="11" V02="10"/>
+	<Triangle1 V00="9" V01="12" V02="11"/>
+	<Triangle1 V00="11" V01="12" V02="13"/>
+	<Triangle1 V00="11" V01="13" V02="14"/>
+	<Triangle1 V00="13" V01="15" V02="14"/>
+	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="176" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="1" V01="3" V02="2"/>
+	<Triangle1 V00="1" V01="4" V02="3"/>
+	<Triangle1 V00="1" V01="5" V02="4"/>
+	<Triangle1 V00="5" V01="6" V02="4"/>
+	<Triangle1 V00="5" V01="7" V02="6"/>
+	<Triangle1 V00="8" V01="6" V02="7"/>
+	<Triangle1 V00="8" V01="9" V02="6"/>
+	<Triangle1 V00="8" V01="10" V02="9"/>
+	<Triangle1 V00="9" V01="10" V02="11"/>
+	<Triangle1 V00="10" V01="12" V02="11"/>
+	<Triangle1 V00="10" V01="13" V02="12"/>
+	<Triangle1 V00="14" V01="13" V02="10"/>
+	<Triangle1 V00="14" V01="15" V02="13"/>
+	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="192" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="2" V01="1" V02="3"/>
+	<Triangle1 V00="2" V01="3" V02="4"/>
+	<Triangle1 V00="3" V01="5" V02="4"/>
+	<Triangle1 V00="4" V01="5" V02="6"/>
+	<Triangle1 V00="5" V01="7" V02="6"/>
+	<Triangle1 V00="5" V01="8" V02="7"/>
+	<Triangle1 V00="4" V01="6" V02="9"/>
+	<Triangle1 V00="4" V01="9" V02="10"/>
+	<Triangle1 V00="11" V01="10" V02="9"/>
+	<Triangle1 V00="11" V01="9" V02="12"/>
+	<Triangle1 V00="13" V01="11" V02="12"/>
+	<Triangle1 V00="13" V01="12" V02="14"/>
+	<Triangle1 V00="15" V01="13" V02="14"/>
+	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="208" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="3" V01="1" V02="0"/>
+	<Triangle1 V00="3" V01="4" V02="1"/>
+	<Triangle1 V00="5" V01="4" V02="3"/>
+	<Triangle1 V00="6" V01="5" V02="3"/>
+	<Triangle1 V00="5" V01="7" V02="4"/>
+	<Triangle1 V00="7" V01="8" V02="4"/>
+	<Triangle1 V00="7" V01="9" V02="8"/>
+	<Triangle1 V00="10" V01="8" V02="9"/>
+	<Triangle1 V00="10" V01="11" V02="8"/>
+	<Triangle1 V00="12" V01="11" V02="10"/>
+	<Triangle1 V00="12" V01="13" V02="11"/>
+	<Triangle1 V00="12" V01="14" V02="13"/>
+	<Triangle1 V00="15" V01="11" V02="13"/>
+	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="224" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="3" V01="0" V02="2"/>
+	<Triangle1 V00="3" V01="2" V02="4"/>
+	<Triangle1 V00="4" V01="2" V02="5"/>
+	<Triangle1 V00="2" V01="6" V02="5"/>
+	<Triangle1 V00="4" V01="5" V02="7"/>
+	<Triangle1 V00="8" V01="4" V02="7"/>
+	<Triangle1 V00="8" V01="9" V02="4"/>
+	<Triangle1 V00="10" V01="9" V02="8"/>
+	<Triangle1 V00="10" V01="11" V02="9"/>
+	<Triangle1 V00="12" V01="11" V02="10"/>
+	<Triangle1 V00="13" V01="12" V02="10"/>
+	<Triangle1 V00="13" V01="14" V02="12"/>
+	<Triangle1 V00="15" V01="14" V02="13"/>
+	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="240" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="3" V01="4" V02="5"/>
+	<Triangle1 V00="3" V01="6" V02="4"/>
+	<Triangle1 V00="4" V01="6" V02="7"/>
+	<Triangle1 V00="8" V01="7" V02="6"/>
+	<Triangle1 V00="8" V01="6" V02="9"/>
+	<Triangle1 V00="10" V01="7" V02="8"/>
+	<Triangle1 V00="11" V01="12" V02="13"/>
+	<Triangle1 V00="14" V01="12" V02="11"/>
+	<Triangle1 V00="14" V01="11" V02="15"/>
+	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="256" Count="9"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="0" V01="2" V02="3"/>
+	<Triangle1 V00="2" V01="4" V02="3"/>
+	<Triangle1 V00="2" V01="5" V02="4"/>
+	<Triangle1 V00="6" V01="5" V02="2"/>
+	<Triangle1 V00="6" V01="2" V02="7"/>
+	<Triangle1 V00="5" V01="8" V02="4"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_0 b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_0
new file mode 100644
index 000000000..82c478df5
--- /dev/null
+++ b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_0
@@ -0,0 +1,173 @@
+<Vertex Version="0">
+	<Vtx X="173" Y="349" Z="-349" S="147" T="-17" R="202" G="69" B="164" A="255"/>
+	<Vtx X="0" Y="273" Z="-318" S="239" T="-17" R="167" G="65" B="193" A="255"/>
+	<Vtx X="0" Y="336" Z="-185" S="239" T="-81" R="159" G="78" B="231" A="255"/>
+	<Vtx X="173" Y="432" Z="-175" S="147" T="-81" R="198" G="112" B="239" A="255"/>
+	<Vtx X="0" Y="356" Z="0" S="239" T="-145" R="167" G="91" B="0" A="255"/>
+	<Vtx X="-40" Y="222" Z="0" S="111" T="-145" R="133" G="32" B="0" A="255"/>
+	<Vtx X="-40" Y="212" Z="-92" S="111" T="-113" R="132" G="23" B="244" A="255"/>
+	<Vtx X="-40" Y="122" Z="-185" S="15" T="-17" R="131" G="11" B="236" A="255"/>
+	<Vtx X="0" Y="155" Z="-370" S="47" T="111" R="161" G="18" B="174" A="255"/>
+	<Vtx X="0" Y="273" Z="-318" S="111" T="111" R="167" G="65" B="193" A="255"/>
+	<Vtx X="173" Y="349" Z="-349" S="111" T="19" R="202" G="69" B="164" A="255"/>
+	<Vtx X="173" Y="195" Z="-418" S="47" T="19" R="236" G="20" B="132" A="255"/>
+	<Vtx X="307" Y="195" Z="-418" S="47" T="-17" R="125" G="4" B="232" A="255"/>
+	<Vtx X="285" Y="349" Z="-349" S="111" T="-11" R="78" G="230" B="159" A="255"/>
+	<Vtx X="307" Y="349" Z="-349" S="111" T="-17" R="122" G="18" B="225" A="255"/>
+	<Vtx X="307" Y="432" Z="-175" S="111" T="-81" R="121" G="37" B="249" A="255"/>
+	<Vtx X="307" Y="349" Z="-349" S="111" T="-17" R="122" G="18" B="225" A="255"/>
+	<Vtx X="285" Y="432" Z="-175" S="117" T="-81" R="89" G="73" B="54" A="255"/>
+	<Vtx X="307" Y="432" Z="-175" S="111" T="-81" R="121" G="37" B="249" A="255"/>
+	<Vtx X="285" Y="349" Z="-349" S="117" T="-17" R="78" G="230" B="159" A="255"/>
+	<Vtx X="307" Y="457" Z="0" S="111" T="-145" R="123" G="32" B="0" A="255"/>
+	<Vtx X="307" Y="432" Z="175" S="111" T="-81" R="121" G="37" B="7" A="255"/>
+	<Vtx X="285" Y="432" Z="175" S="117" T="-81" R="89" G="73" B="202" A="255"/>
+	<Vtx X="173" Y="432" Z="175" S="147" T="-81" R="198" G="112" B="17" A="255"/>
+	<Vtx X="173" Y="457" Z="0" S="147" T="-145" R="217" G="121" B="0" A="255"/>
+	<Vtx X="173" Y="432" Z="-175" S="147" T="-81" R="198" G="112" B="239" A="255"/>
+	<Vtx X="0" Y="356" Z="0" S="239" T="-145" R="167" G="91" B="0" A="255"/>
+	<Vtx X="0" Y="336" Z="185" S="239" T="-81" R="159" G="78" B="25" A="255"/>
+	<Vtx X="-40" Y="222" Z="0" S="111" T="-145" R="133" G="32" B="0" A="255"/>
+	<Vtx X="-40" Y="212" Z="92" S="111" T="-113" R="132" G="23" B="12" A="255"/>
+	<Vtx X="-67" Y="68" Z="0" S="-17" T="-145" R="129" G="0" B="0" A="255"/>
+	<Vtx X="-40" Y="212" Z="-92" S="111" T="-113" R="132" G="23" B="244" A="255"/>
+	<Vtx X="-67" Y="68" Z="0" S="-17" T="-145" R="129" G="0" B="0" A="255"/>
+	<Vtx X="-40" Y="212" Z="-92" S="111" T="-113" R="132" G="23" B="244" A="255"/>
+	<Vtx X="-40" Y="122" Z="-185" S="15" T="-17" R="131" G="11" B="236" A="255"/>
+	<Vtx X="-40" Y="47" Z="-181" S="-17" T="-17" R="131" G="249" B="232" A="255"/>
+	<Vtx X="0" Y="155" Z="-370" S="47" T="111" R="161" G="18" B="174" A="255"/>
+	<Vtx X="0" Y="7" Z="-362" S="-17" T="111" R="175" G="227" B="162" A="255"/>
+	<Vtx X="173" Y="0" Z="-407" S="-17" T="19" R="239" G="218" B="136" A="255"/>
+	<Vtx X="173" Y="195" Z="-418" S="47" T="19" R="236" G="20" B="132" A="255"/>
+	<Vtx X="307" Y="195" Z="-418" S="47" T="-17" R="125" G="4" B="232" A="255"/>
+	<Vtx X="307" Y="0" Z="-407" S="-17" T="-17" R="120" G="244" B="216" A="255"/>
+	<Vtx X="307" Y="-175" Z="-301" S="-81" T="-17" R="121" G="250" B="218" A="255"/>
+	<Vtx X="307" Y="77" Z="-219" S="-4" T="-71" R="127" G="0" B="0" A="255"/>
+	<Vtx X="307" Y="145" Z="-240" S="23" T="-65" R="127" G="0" B="0" A="255"/>
+	<Vtx X="307" Y="216" Z="-211" S="45" T="-73" R="127" G="0" B="0" A="255"/>
+	<Vtx X="308" Y="240" Z="-141" S="49" T="-96" R="127" G="0" B="0" A="255"/>
+	<Vtx X="307" Y="432" Z="-175" S="111" T="-81" R="121" G="37" B="249" A="255"/>
+	<Vtx X="308" Y="214" Z="-75" S="35" T="-119" R="127" G="0" B="0" A="255"/>
+	<Vtx X="308" Y="240" Z="-141" S="49" T="-96" R="127" G="0" B="0" A="255"/>
+	<Vtx X="307" Y="432" Z="-175" S="111" T="-81" R="121" G="37" B="249" A="255"/>
+	<Vtx X="308" Y="214" Z="75" S="35" T="-119" R="127" G="0" B="0" A="255"/>
+	<Vtx X="308" Y="240" Z="141" S="49" T="-96" R="127" G="0" B="0" A="255"/>
+	<Vtx X="307" Y="195" Z="418" S="47" T="-17" R="125" G="4" B="24" A="255"/>
+	<Vtx X="307" Y="432" Z="175" S="111" T="-81" R="121" G="37" B="7" A="255"/>
+	<Vtx X="307" Y="349" Z="349" S="111" T="-17" R="122" G="18" B="31" A="255"/>
+	<Vtx X="285" Y="432" Z="175" S="117" T="-81" R="89" G="73" B="202" A="255"/>
+	<Vtx X="285" Y="349" Z="349" S="117" T="-17" R="78" G="230" B="97" A="255"/>
+	<Vtx X="285" Y="349" Z="349" S="111" T="-11" R="78" G="230" B="97" A="255"/>
+	<Vtx X="173" Y="349" Z="349" S="111" T="19" R="202" G="69" B="92" A="255"/>
+	<Vtx X="173" Y="195" Z="418" S="47" T="19" R="236" G="20" B="124" A="255"/>
+	<Vtx X="0" Y="155" Z="370" S="47" T="111" R="161" G="18" B="82" A="255"/>
+	<Vtx X="0" Y="273" Z="318" S="111" T="111" R="167" G="65" B="63" A="255"/>
+	<Vtx X="-40" Y="122" Z="185" S="15" T="-17" R="131" G="11" B="20" A="255"/>
+	<Vtx X="-40" Y="122" Z="185" S="15" T="-17" R="131" G="11" B="20" A="255"/>
+	<Vtx X="0" Y="273" Z="318" S="111" T="111" R="167" G="65" B="63" A="255"/>
+	<Vtx X="0" Y="336" Z="185" S="239" T="-81" R="159" G="78" B="25" A="255"/>
+	<Vtx X="-40" Y="212" Z="92" S="111" T="-113" R="132" G="23" B="12" A="255"/>
+	<Vtx X="-67" Y="68" Z="0" S="-17" T="-145" R="129" G="0" B="0" A="255"/>
+	<Vtx X="-40" Y="47" Z="181" S="-17" T="-17" R="131" G="249" B="24" A="255"/>
+	<Vtx X="-40" Y="-19" Z="141" S="-49" T="-17" R="131" G="238" B="14" A="255"/>
+	<Vtx X="-40" Y="-23" Z="92" S="-145" T="-113" R="132" G="236" B="20" A="255"/>
+	<Vtx X="-40" Y="-155" Z="0" S="-145" T="-145" R="130" G="237" B="0" A="255"/>
+	<Vtx X="-40" Y="-23" Z="-92" S="-145" T="-113" R="132" G="236" B="236" A="255"/>
+	<Vtx X="-40" Y="-19" Z="-141" S="-49" T="-17" R="131" G="238" B="242" A="255"/>
+	<Vtx X="-40" Y="47" Z="-181" S="-17" T="-17" R="131" G="249" B="232" A="255"/>
+	<Vtx X="0" Y="-126" Z="-282" S="-81" T="111" R="180" G="232" B="157" A="255"/>
+	<Vtx X="0" Y="7" Z="-362" S="-17" T="111" R="175" G="227" B="162" A="255"/>
+	<Vtx X="173" Y="0" Z="-407" S="-17" T="19" R="239" G="218" B="136" A="255"/>
+	<Vtx X="173" Y="-175" Z="-301" S="-81" T="19" R="246" G="236" B="131" A="255"/>
+	<Vtx X="173" Y="-175" Z="-301" S="-81" T="19" R="246" G="236" B="131" A="255"/>
+	<Vtx X="173" Y="0" Z="-407" S="-17" T="19" R="239" G="218" B="136" A="255"/>
+	<Vtx X="307" Y="0" Z="-407" S="-17" T="-17" R="120" G="244" B="216" A="255"/>
+	<Vtx X="307" Y="-175" Z="-301" S="-81" T="-17" R="121" G="250" B="218" A="255"/>
+	<Vtx X="173" Y="-349" Z="-349" S="-145" T="19" R="222" G="134" B="246" A="255"/>
+	<Vtx X="307" Y="-349" Z="-349" S="-145" T="-17" R="126" G="242" B="255" A="255"/>
+	<Vtx X="307" Y="-186" Z="-175" S="-145" T="-81" R="120" G="219" B="237" A="255"/>
+	<Vtx X="307" Y="77" Z="-219" S="-4" T="-71" R="127" G="0" B="0" A="255"/>
+	<Vtx X="308" Y="45" Z="-143" S="-21" T="-99" R="127" G="0" B="0" A="255"/>
+	<Vtx X="309" Y="78" Z="-69" S="-8" T="-121" R="127" G="0" B="0" A="255"/>
+	<Vtx X="309" Y="-109" Z="-59" S="-59" T="-133" R="127" G="0" B="2" A="255"/>
+	<Vtx X="309" Y="144" Z="-50" S="13" T="-127" R="127" G="0" B="0" A="255"/>
+	<Vtx X="309" Y="49" Z="0" S="-26" T="-145" R="127" G="0" B="0" A="255"/>
+	<Vtx X="308" Y="214" Z="-75" S="35" T="-119" R="127" G="0" B="0" A="255"/>
+	<Vtx X="308" Y="214" Z="75" S="35" T="-119" R="127" G="0" B="0" A="255"/>
+	<Vtx X="309" Y="144" Z="50" S="13" T="-127" R="127" G="0" B="0" A="255"/>
+	<Vtx X="309" Y="-109" Z="59" S="-59" T="-133" R="127" G="0" B="254" A="255"/>
+	<Vtx X="309" Y="49" Z="0" S="-26" T="-145" R="127" G="0" B="0" A="255"/>
+	<Vtx X="309" Y="144" Z="50" S="13" T="-127" R="127" G="0" B="0" A="255"/>
+	<Vtx X="309" Y="78" Z="69" S="-8" T="-121" R="127" G="0" B="0" A="255"/>
+	<Vtx X="308" Y="45" Z="143" S="-21" T="-99" R="127" G="0" B="0" A="255"/>
+	<Vtx X="307" Y="0" Z="407" S="-17" T="-17" R="120" G="244" B="40" A="255"/>
+	<Vtx X="307" Y="77" Z="219" S="-4" T="-71" R="127" G="0" B="0" A="255"/>
+	<Vtx X="307" Y="145" Z="240" S="23" T="-65" R="127" G="0" B="0" A="255"/>
+	<Vtx X="307" Y="195" Z="418" S="47" T="-17" R="125" G="4" B="24" A="255"/>
+	<Vtx X="307" Y="216" Z="211" S="45" T="-73" R="127" G="0" B="0" A="255"/>
+	<Vtx X="308" Y="240" Z="141" S="49" T="-96" R="127" G="0" B="0" A="255"/>
+	<Vtx X="173" Y="0" Z="407" S="-17" T="19" R="239" G="218" B="120" A="255"/>
+	<Vtx X="173" Y="-175" Z="301" S="-81" T="19" R="246" G="236" B="125" A="255"/>
+	<Vtx X="0" Y="-126" Z="282" S="-81" T="111" R="180" G="232" B="99" A="255"/>
+	<Vtx X="0" Y="7" Z="362" S="-17" T="111" R="175" G="227" B="94" A="255"/>
+	<Vtx X="0" Y="155" Z="370" S="47" T="111" R="161" G="18" B="82" A="255"/>
+	<Vtx X="0" Y="155" Z="370" S="47" T="111" R="161" G="18" B="82" A="255"/>
+	<Vtx X="173" Y="0" Z="407" S="-17" T="19" R="239" G="218" B="120" A="255"/>
+	<Vtx X="173" Y="195" Z="418" S="47" T="19" R="236" G="20" B="124" A="255"/>
+	<Vtx X="307" Y="195" Z="418" S="47" T="-17" R="125" G="4" B="24" A="255"/>
+	<Vtx X="-40" Y="47" Z="181" S="-17" T="-17" R="131" G="249" B="24" A="255"/>
+	<Vtx X="0" Y="7" Z="362" S="-17" T="111" R="175" G="227" B="94" A="255"/>
+	<Vtx X="-40" Y="122" Z="185" S="15" T="-17" R="131" G="11" B="20" A="255"/>
+	<Vtx X="0" Y="-126" Z="282" S="-81" T="111" R="180" G="232" B="99" A="255"/>
+	<Vtx X="-40" Y="-19" Z="141" S="-49" T="-17" R="131" G="238" B="14" A="255"/>
+	<Vtx X="0" Y="-260" Z="318" S="-273" T="-17" R="160" G="173" B="7" A="255"/>
+	<Vtx X="0" Y="-135" Z="185" S="-273" T="-81" R="167" G="176" B="43" A="255"/>
+	<Vtx X="-40" Y="-23" Z="92" S="-145" T="-113" R="132" G="236" B="20" A="255"/>
+	<Vtx X="0" Y="-398" Z="0" S="-273" T="-145" R="155" G="179" B="0" A="255"/>
+	<Vtx X="-40" Y="-155" Z="0" S="-145" T="-145" R="130" G="237" B="0" A="255"/>
+	<Vtx X="-40" Y="-23" Z="-92" S="-145" T="-113" R="132" G="236" B="236" A="255"/>
+	<Vtx X="0" Y="-135" Z="-185" S="-273" T="-81" R="167" G="176" B="213" A="255"/>
+	<Vtx X="0" Y="-260" Z="-318" S="-273" T="-17" R="160" G="173" B="249" A="255"/>
+	<Vtx X="0" Y="-135" Z="-185" S="-273" T="-81" R="167" G="176" B="213" A="255"/>
+	<Vtx X="-40" Y="-23" Z="-92" S="-145" T="-113" R="132" G="236" B="236" A="255"/>
+	<Vtx X="-40" Y="-19" Z="-141" S="-49" T="-17" R="131" G="238" B="242" A="255"/>
+	<Vtx X="0" Y="-126" Z="-282" S="-81" T="111" R="180" G="232" B="157" A="255"/>
+	<Vtx X="173" Y="-186" Z="-175" S="-180" T="-81" R="230" G="144" B="201" A="255"/>
+	<Vtx X="173" Y="-349" Z="-349" S="-180" T="-17" R="222" G="134" B="246" A="255"/>
+	<Vtx X="307" Y="-186" Z="-175" S="-145" T="-81" R="120" G="219" B="237" A="255"/>
+	<Vtx X="307" Y="-349" Z="-349" S="-145" T="-17" R="126" G="242" B="255" A="255"/>
+	<Vtx X="307" Y="-531" Z="0" S="-145" T="-145" R="126" G="237" B="0" A="255"/>
+	<Vtx X="307" Y="-90" Z="0" S="-59" T="-145" R="127" G="1" B="0" A="255"/>
+	<Vtx X="309" Y="-109" Z="-59" S="-59" T="-133" R="127" G="0" B="2" A="255"/>
+	<Vtx X="307" Y="-186" Z="175" S="-145" T="-81" R="120" G="219" B="19" A="255"/>
+	<Vtx X="173" Y="-186" Z="175" S="-180" T="-81" R="230" G="144" B="55" A="255"/>
+	<Vtx X="173" Y="-349" Z="349" S="-180" T="-17" R="222" G="134" B="10" A="255"/>
+	<Vtx X="307" Y="-349" Z="349" S="-145" T="-17" R="126" G="242" B="1" A="255"/>
+	<Vtx X="307" Y="-175" Z="301" S="-81" T="-17" R="121" G="250" B="38" A="255"/>
+	<Vtx X="307" Y="-349" Z="349" S="-145" T="-17" R="126" G="242" B="1" A="255"/>
+	<Vtx X="307" Y="-186" Z="175" S="-145" T="-81" R="120" G="219" B="19" A="255"/>
+	<Vtx X="307" Y="0" Z="407" S="-17" T="-17" R="120" G="244" B="40" A="255"/>
+	<Vtx X="309" Y="-109" Z="59" S="-59" T="-133" R="127" G="0" B="254" A="255"/>
+	<Vtx X="307" Y="-90" Z="0" S="-59" T="-145" R="127" G="1" B="0" A="255"/>
+	<Vtx X="173" Y="-175" Z="301" S="-81" T="19" R="246" G="236" B="125" A="255"/>
+	<Vtx X="173" Y="-349" Z="349" S="-145" T="19" R="222" G="134" B="10" A="255"/>
+	<Vtx X="0" Y="-260" Z="318" S="-145" T="111" R="160" G="173" B="7" A="255"/>
+	<Vtx X="0" Y="-126" Z="282" S="-81" T="111" R="180" G="232" B="99" A="255"/>
+	<Vtx X="0" Y="-260" Z="-318" S="-145" T="111" R="160" G="173" B="249" A="255"/>
+	<Vtx X="0" Y="-126" Z="-282" S="-81" T="111" R="180" G="232" B="157" A="255"/>
+	<Vtx X="173" Y="-175" Z="-301" S="-81" T="19" R="246" G="236" B="131" A="255"/>
+	<Vtx X="173" Y="-349" Z="-349" S="-145" T="19" R="222" G="134" B="246" A="255"/>
+	<Vtx X="173" Y="349" Z="349" S="147" T="-17" R="202" G="69" B="92" A="255"/>
+	<Vtx X="0" Y="336" Z="185" S="239" T="-81" R="159" G="78" B="25" A="255"/>
+	<Vtx X="0" Y="273" Z="318" S="239" T="-17" R="167" G="65" B="63" A="255"/>
+	<Vtx X="173" Y="432" Z="175" S="147" T="-81" R="198" G="112" B="17" A="255"/>
+	<Vtx X="0" Y="-260" Z="318" S="-273" T="-17" R="160" G="173" B="7" A="255"/>
+	<Vtx X="173" Y="-186" Z="175" S="-180" T="-81" R="230" G="144" B="55" A="255"/>
+	<Vtx X="173" Y="-349" Z="349" S="-180" T="-17" R="222" G="134" B="10" A="255"/>
+	<Vtx X="0" Y="-135" Z="185" S="-273" T="-81" R="167" G="176" B="43" A="255"/>
+	<Vtx X="173" Y="-531" Z="0" S="-180" T="-145" R="223" G="133" B="0" A="255"/>
+	<Vtx X="0" Y="-398" Z="0" S="-273" T="-145" R="155" G="179" B="0" A="255"/>
+	<Vtx X="0" Y="-135" Z="-185" S="-273" T="-81" R="167" G="176" B="213" A="255"/>
+	<Vtx X="173" Y="-186" Z="-175" S="-180" T="-81" R="230" G="144" B="201" A="255"/>
+	<Vtx X="307" Y="-531" Z="0" S="-145" T="-145" R="126" G="237" B="0" A="255"/>
+</Vertex>
diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_1 b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_1
new file mode 100644
index 000000000..2544d138b
--- /dev/null
+++ b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_1
@@ -0,0 +1,26 @@
+<Vertex Version="0">
+	<Vtx X="307" Y="145" Z="-240" S="23" T="-65" R="127" G="0" B="0" A="255"/>
+	<Vtx X="307" Y="216" Z="-211" S="45" T="-73" R="127" G="0" B="0" A="255"/>
+	<Vtx X="308" Y="240" Z="-141" S="49" T="-96" R="127" G="0" B="0" A="255"/>
+	<Vtx X="309" Y="144" Z="-50" S="13" T="-127" R="127" G="0" B="0" A="255"/>
+	<Vtx X="308" Y="214" Z="-75" S="35" T="-119" R="127" G="0" B="0" A="255"/>
+	<Vtx X="308" Y="45" Z="-143" S="-21" T="-99" R="127" G="0" B="0" A="255"/>
+	<Vtx X="309" Y="78" Z="-69" S="-8" T="-121" R="127" G="0" B="0" A="255"/>
+	<Vtx X="307" Y="77" Z="-219" S="-4" T="-71" R="127" G="0" B="0" A="255"/>
+	<Vtx X="308" Y="240" Z="141" S="49" T="-96" R="127" G="0" B="0" A="255"/>
+	<Vtx X="307" Y="216" Z="211" S="45" T="-73" R="127" G="0" B="0" A="255"/>
+	<Vtx X="307" Y="145" Z="240" S="23" T="-65" R="127" G="0" B="0" A="255"/>
+	<Vtx X="308" Y="45" Z="143" S="-21" T="-99" R="127" G="0" B="0" A="255"/>
+	<Vtx X="307" Y="77" Z="219" S="-4" T="-71" R="127" G="0" B="0" A="255"/>
+	<Vtx X="309" Y="144" Z="50" S="13" T="-127" R="127" G="0" B="0" A="255"/>
+	<Vtx X="309" Y="78" Z="69" S="-8" T="-121" R="127" G="0" B="0" A="255"/>
+	<Vtx X="308" Y="214" Z="75" S="35" T="-119" R="127" G="0" B="0" A="255"/>
+	<Vtx X="309" Y="-109" Z="-59" S="-59" T="-133" R="127" G="0" B="2" A="255"/>
+	<Vtx X="309" Y="49" Z="0" S="-26" T="-145" R="127" G="0" B="0" A="255"/>
+	<Vtx X="280" Y="29" Z="0" S="-26" T="-145" R="120" G="243" B="41" A="255"/>
+	<Vtx X="309" Y="-109" Z="59" S="-59" T="-133" R="127" G="0" B="254" A="255"/>
+	<Vtx X="280" Y="-99" Z="52" S="-59" T="-133" R="92" G="57" B="190" A="255"/>
+	<Vtx X="307" Y="-90" Z="0" S="-59" T="-145" R="127" G="1" B="0" A="255"/>
+	<Vtx X="282" Y="-83" Z="0" S="-59" T="-145" R="119" G="44" B="0" A="255"/>
+	<Vtx X="280" Y="-99" Z="-52" S="-59" T="-133" R="92" G="57" B="66" A="255"/>
+</Vertex>
diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_2 b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_2
new file mode 100644
index 000000000..3de701602
--- /dev/null
+++ b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_2
@@ -0,0 +1,6 @@
+<Vertex Version="0">
+	<Vtx X="280" Y="-99" Z="-52" S="1008" T="1008" R="92" G="57" B="66" A="255"/>
+	<Vtx X="280" Y="29" Z="0" S="1008" T="582" R="120" G="243" B="41" A="255"/>
+	<Vtx X="282" Y="-83" Z="0" S="883" T="967" R="119" G="44" B="0" A="255"/>
+	<Vtx X="280" Y="-99" Z="52" S="1008" T="1008" R="92" G="57" B="190" A="255"/>
+</Vertex>
diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_3 b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_3
new file mode 100644
index 000000000..80d934941
--- /dev/null
+++ b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_3
@@ -0,0 +1,58 @@
+<Vertex Version="0">
+	<Vtx X="285" Y="349" Z="-349" S="111" T="-11" R="78" G="230" B="159" A="255"/>
+	<Vtx X="173" Y="349" Z="-349" S="111" T="19" R="202" G="69" B="164" A="255"/>
+	<Vtx X="260" Y="450" Z="-397" S="111" T="19" R="187" G="245" B="150" A="255"/>
+	<Vtx X="371" Y="450" Z="-397" S="111" T="-11" R="93" G="199" B="191" A="255"/>
+	<Vtx X="251" Y="531" Z="-421" S="111" T="19" R="159" G="242" B="175" A="255"/>
+	<Vtx X="359" Y="506" Z="-406" S="111" T="-11" R="89" G="225" B="170" A="255"/>
+	<Vtx X="361" Y="701" Z="-519" S="111" T="-11" R="29" G="67" B="152" A="255"/>
+	<Vtx X="285" Y="432" Z="-175" S="117" T="-81" R="89" G="73" B="54" A="255"/>
+	<Vtx X="285" Y="349" Z="-349" S="117" T="-17" R="78" G="230" B="159" A="255"/>
+	<Vtx X="371" Y="450" Z="-397" S="117" T="-17" R="93" G="199" B="191" A="255"/>
+	<Vtx X="371" Y="532" Z="-222" S="117" T="-81" R="92" G="10" B="86" A="255"/>
+	<Vtx X="359" Y="506" Z="-406" S="117" T="-17" R="89" G="225" B="170" A="255"/>
+	<Vtx X="380" Y="664" Z="-297" S="117" T="-81" R="88" G="73" B="55" A="255"/>
+	<Vtx X="361" Y="701" Z="-519" S="117" T="-81" R="29" G="67" B="152" A="255"/>
+	<Vtx X="260" Y="532" Z="-222" S="147" T="-81" R="184" G="69" B="79" A="255"/>
+	<Vtx X="173" Y="432" Z="-175" S="147" T="-81" R="198" G="112" B="239" A="255"/>
+	<Vtx X="173" Y="349" Z="-349" S="147" T="-17" R="202" G="69" B="164" A="255"/>
+	<Vtx X="173" Y="432" Z="-175" S="147" T="-81" R="198" G="112" B="239" A="255"/>
+	<Vtx X="260" Y="532" Z="-222" S="147" T="-81" R="184" G="69" B="79" A="255"/>
+	<Vtx X="260" Y="450" Z="-397" S="147" T="-17" R="187" G="245" B="150" A="255"/>
+	<Vtx X="272" Y="689" Z="-312" S="147" T="-81" R="183" G="96" B="41" A="255"/>
+	<Vtx X="380" Y="664" Z="-297" S="117" T="-81" R="88" G="73" B="55" A="255"/>
+	<Vtx X="361" Y="701" Z="-519" S="147" T="-81" R="29" G="67" B="152" A="255"/>
+	<Vtx X="251" Y="531" Z="-421" S="147" T="-17" R="159" G="242" B="175" A="255"/>
+	<Vtx X="361" Y="701" Z="-519" S="147" T="-17" R="29" G="67" B="152" A="255"/>
+	<Vtx X="285" Y="432" Z="-175" S="117" T="-81" R="89" G="73" B="54" A="255"/>
+	<Vtx X="371" Y="532" Z="-222" S="117" T="-81" R="92" G="10" B="86" A="255"/>
+	<Vtx X="285" Y="349" Z="349" S="111" T="-11" R="78" G="230" B="97" A="255"/>
+	<Vtx X="260" Y="450" Z="397" S="111" T="19" R="187" G="245" B="106" A="255"/>
+	<Vtx X="173" Y="349" Z="349" S="111" T="19" R="202" G="69" B="92" A="255"/>
+	<Vtx X="371" Y="450" Z="397" S="111" T="-11" R="93" G="199" B="65" A="255"/>
+	<Vtx X="251" Y="531" Z="421" S="111" T="19" R="159" G="242" B="81" A="255"/>
+	<Vtx X="371" Y="450" Z="397" S="111" T="-11" R="93" G="199" B="65" A="255"/>
+	<Vtx X="359" Y="506" Z="406" S="111" T="-11" R="89" G="225" B="86" A="255"/>
+	<Vtx X="251" Y="531" Z="421" S="111" T="19" R="159" G="242" B="81" A="255"/>
+	<Vtx X="361" Y="701" Z="519" S="111" T="-11" R="29" G="67" B="104" A="255"/>
+	<Vtx X="285" Y="432" Z="175" S="117" T="-81" R="89" G="73" B="202" A="255"/>
+	<Vtx X="371" Y="450" Z="397" S="117" T="-17" R="93" G="199" B="65" A="255"/>
+	<Vtx X="285" Y="349" Z="349" S="117" T="-17" R="78" G="230" B="97" A="255"/>
+	<Vtx X="371" Y="532" Z="222" S="117" T="-81" R="92" G="10" B="170" A="255"/>
+	<Vtx X="173" Y="432" Z="175" S="147" T="-81" R="198" G="112" B="17" A="255"/>
+	<Vtx X="260" Y="532" Z="222" S="147" T="-81" R="184" G="69" B="177" A="255"/>
+	<Vtx X="173" Y="349" Z="349" S="147" T="-17" R="202" G="69" B="92" A="255"/>
+	<Vtx X="260" Y="450" Z="397" S="147" T="-17" R="187" G="245" B="106" A="255"/>
+	<Vtx X="272" Y="689" Z="312" S="147" T="-81" R="183" G="96" B="215" A="255"/>
+	<Vtx X="251" Y="531" Z="421" S="147" T="-17" R="159" G="242" B="81" A="255"/>
+	<Vtx X="361" Y="701" Z="519" S="147" T="-17" R="29" G="67" B="104" A="255"/>
+	<Vtx X="380" Y="664" Z="297" S="117" T="-81" R="88" G="73" B="201" A="255"/>
+	<Vtx X="272" Y="689" Z="312" S="147" T="-81" R="183" G="96" B="215" A="255"/>
+	<Vtx X="361" Y="701" Z="519" S="147" T="-81" R="29" G="67" B="104" A="255"/>
+	<Vtx X="380" Y="664" Z="297" S="117" T="-81" R="88" G="73" B="201" A="255"/>
+	<Vtx X="260" Y="532" Z="222" S="147" T="-81" R="184" G="69" B="177" A="255"/>
+	<Vtx X="371" Y="532" Z="222" S="117" T="-81" R="92" G="10" B="170" A="255"/>
+	<Vtx X="359" Y="506" Z="406" S="117" T="-17" R="89" G="225" B="86" A="255"/>
+	<Vtx X="361" Y="701" Z="519" S="117" T="-81" R="29" G="67" B="104" A="255"/>
+	<Vtx X="371" Y="450" Z="397" S="117" T="-17" R="93" G="199" B="65" A="255"/>
+</Vertex>
diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4 b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4
new file mode 100644
index 000000000..98009f97b
--- /dev/null
+++ b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4
@@ -0,0 +1,267 @@
+<Vertex Version="0">
+	<Vtx X="305" Y="105" Z="-72" S="422" T="14" R="1" G="208" B="118" A="255"/>
+	<Vtx X="305" Y="183" Z="-72" S="422" T="14" R="255" G="44" B="119" A="255"/>
+	<Vtx X="222" Y="144" Z="-146" S="206" T="14" R="149" G="192" B="233" A="255"/>
+	<Vtx X="305" Y="144" Z="-71" S="422" T="-50" R="252" G="0" B="127" A="255"/>
+	<Vtx X="324" Y="109" Z="-89" S="462" T="14" R="103" G="229" B="69" A="255"/>
+	<Vtx X="305" Y="86" Z="-89" S="422" T="78" R="251" G="166" B="90" A="255"/>
+	<Vtx X="222" Y="144" Z="-146" S="206" T="142" R="149" G="192" B="233" A="255"/>
+	<Vtx X="305" Y="69" Z="-106" S="422" T="142" R="3" G="140" B="51" A="255"/>
+	<Vtx X="305" Y="67" Z="-146" S="422" T="206" R="255" G="129" B="0" A="255"/>
+	<Vtx X="305" Y="69" Z="-186" S="422" T="142" R="0" G="141" B="201" A="255"/>
+	<Vtx X="324" Y="87" Z="-180" S="462" T="142" R="104" G="188" B="229" A="255"/>
+	<Vtx X="305" Y="86" Z="-202" S="422" T="78" R="252" G="167" B="165" A="255"/>
+	<Vtx X="305" Y="105" Z="-220" S="422" T="14" R="255" G="212" B="137" A="255"/>
+	<Vtx X="305" Y="183" Z="-220" S="422" T="14" R="1" G="48" B="138" A="255"/>
+	<Vtx X="305" Y="144" Z="-220" S="422" T="-50" R="252" G="0" B="129" A="255"/>
+	<Vtx X="324" Y="178" Z="-203" S="462" T="14" R="103" G="27" B="187" A="255"/>
+	<Vtx X="305" Y="202" Z="-202" S="422" T="78" R="251" G="90" B="166" A="255"/>
+	<Vtx X="324" Y="178" Z="-203" S="462" T="14" R="103" G="27" B="187" A="255"/>
+	<Vtx X="305" Y="183" Z="-220" S="422" T="14" R="1" G="48" B="138" A="255"/>
+	<Vtx X="222" Y="144" Z="-146" S="206" T="142" R="149" G="192" B="233" A="255"/>
+	<Vtx X="305" Y="219" Z="-186" S="422" T="142" R="3" G="116" B="204" A="255"/>
+	<Vtx X="305" Y="220" Z="-146" S="422" T="206" R="255" G="127" B="1" A="255"/>
+	<Vtx X="305" Y="219" Z="-106" S="422" T="142" R="255" G="102" B="76" A="255"/>
+	<Vtx X="305" Y="202" Z="-89" S="422" T="78" R="252" G="89" B="91" A="255"/>
+	<Vtx X="305" Y="183" Z="-72" S="422" T="14" R="255" G="44" B="119" A="255"/>
+	<Vtx X="324" Y="178" Z="-89" S="462" T="14" R="103" G="27" B="69" A="255"/>
+	<Vtx X="305" Y="144" Z="-71" S="422" T="-50" R="252" G="0" B="127" A="255"/>
+	<Vtx X="324" Y="144" Z="-84" S="462" T="-50" R="102" G="0" B="76" A="255"/>
+	<Vtx X="324" Y="109" Z="-89" S="462" T="14" R="103" G="229" B="69" A="255"/>
+	<Vtx X="330" Y="144" Z="-105" S="462" T="-50" R="123" G="0" B="31" A="255"/>
+	<Vtx X="330" Y="111" Z="-107" S="462" T="14" R="122" G="243" B="34" A="255"/>
+	<Vtx X="324" Y="96" Z="-99" S="462" T="78" R="100" G="200" B="55" A="255"/>
+	<Vtx X="305" Y="86" Z="-89" S="422" T="78" R="251" G="166" B="90" A="255"/>
+	<Vtx X="324" Y="96" Z="-99" S="462" T="78" R="100" G="200" B="55" A="255"/>
+	<Vtx X="324" Y="109" Z="-89" S="462" T="14" R="103" G="229" B="69" A="255"/>
+	<Vtx X="324" Y="87" Z="-112" S="462" T="142" R="104" G="188" B="27" A="255"/>
+	<Vtx X="305" Y="69" Z="-106" S="422" T="142" R="3" G="140" B="51" A="255"/>
+	<Vtx X="305" Y="67" Z="-146" S="422" T="206" R="255" G="129" B="0" A="255"/>
+	<Vtx X="324" Y="82" Z="-146" S="462" T="206" R="104" G="183" B="0" A="255"/>
+	<Vtx X="324" Y="87" Z="-180" S="462" T="142" R="104" G="188" B="229" A="255"/>
+	<Vtx X="330" Y="103" Z="-146" S="462" T="206" R="123" G="225" B="0" A="255"/>
+	<Vtx X="330" Y="104" Z="-178" S="462" T="142" R="122" G="221" B="244" A="255"/>
+	<Vtx X="324" Y="96" Z="-192" S="462" T="78" R="100" G="200" B="201" A="255"/>
+	<Vtx X="305" Y="86" Z="-202" S="422" T="78" R="252" G="167" B="165" A="255"/>
+	<Vtx X="324" Y="109" Z="-203" S="462" T="14" R="103" G="229" B="187" A="255"/>
+	<Vtx X="305" Y="105" Z="-220" S="422" T="14" R="255" G="212" B="137" A="255"/>
+	<Vtx X="305" Y="144" Z="-220" S="422" T="-50" R="252" G="0" B="129" A="255"/>
+	<Vtx X="324" Y="144" Z="-207" S="462" T="-50" R="102" G="0" B="180" A="255"/>
+	<Vtx X="324" Y="178" Z="-203" S="462" T="14" R="103" G="27" B="187" A="255"/>
+	<Vtx X="324" Y="144" Z="-207" S="462" T="-50" R="102" G="0" B="180" A="255"/>
+	<Vtx X="305" Y="144" Z="-220" S="422" T="-50" R="252" G="0" B="129" A="255"/>
+	<Vtx X="330" Y="144" Z="-186" S="462" T="-50" R="123" G="0" B="225" A="255"/>
+	<Vtx X="330" Y="176" Z="-185" S="462" T="14" R="122" G="13" B="222" A="255"/>
+	<Vtx X="324" Y="192" Z="-192" S="462" T="78" R="100" G="56" B="201" A="255"/>
+	<Vtx X="305" Y="202" Z="-202" S="422" T="78" R="251" G="90" B="166" A="255"/>
+	<Vtx X="324" Y="201" Z="-180" S="462" T="142" R="104" G="68" B="229" A="255"/>
+	<Vtx X="305" Y="219" Z="-186" S="422" T="142" R="3" G="116" B="204" A="255"/>
+	<Vtx X="305" Y="220" Z="-146" S="422" T="206" R="255" G="127" B="1" A="255"/>
+	<Vtx X="324" Y="205" Z="-146" S="462" T="206" R="104" G="73" B="0" A="255"/>
+	<Vtx X="324" Y="201" Z="-112" S="462" T="142" R="104" G="68" B="27" A="255"/>
+	<Vtx X="305" Y="219" Z="-106" S="422" T="142" R="255" G="102" B="76" A="255"/>
+	<Vtx X="305" Y="202" Z="-89" S="422" T="78" R="252" G="89" B="91" A="255"/>
+	<Vtx X="324" Y="192" Z="-99" S="462" T="78" R="100" G="56" B="55" A="255"/>
+	<Vtx X="324" Y="178" Z="-89" S="462" T="14" R="103" G="27" B="69" A="255"/>
+	<Vtx X="330" Y="176" Z="-107" S="462" T="14" R="122" G="13" B="34" A="255"/>
+	<Vtx X="324" Y="192" Z="-99" S="462" T="78" R="100" G="56" B="55" A="255"/>
+	<Vtx X="324" Y="178" Z="-89" S="462" T="14" R="103" G="27" B="69" A="255"/>
+	<Vtx X="330" Y="144" Z="-105" S="462" T="-50" R="123" G="0" B="31" A="255"/>
+	<Vtx X="324" Y="144" Z="-84" S="462" T="-50" R="102" G="0" B="76" A="255"/>
+	<Vtx X="330" Y="181" Z="-110" S="462" T="78" R="120" G="29" B="29" A="255"/>
+	<Vtx X="330" Y="183" Z="-114" S="462" T="142" R="122" G="35" B="12" A="255"/>
+	<Vtx X="332" Y="176" Z="-114" S="526" T="142" R="125" G="14" B="14" A="255"/>
+	<Vtx X="330" Y="176" Z="-107" S="526" T="78" R="122" G="13" B="34" A="255"/>
+	<Vtx X="332" Y="144" Z="-114" S="590" T="142" R="126" G="0" B="13" A="255"/>
+	<Vtx X="330" Y="144" Z="-105" S="590" T="78" R="123" G="0" B="31" A="255"/>
+	<Vtx X="330" Y="111" Z="-107" S="526" T="78" R="122" G="243" B="34" A="255"/>
+	<Vtx X="332" Y="111" Z="-114" S="526" T="142" R="125" G="242" B="14" A="255"/>
+	<Vtx X="330" Y="107" Z="-110" S="462" T="78" R="120" G="227" B="29" A="255"/>
+	<Vtx X="330" Y="104" Z="-114" S="462" T="142" R="122" G="221" B="12" A="255"/>
+	<Vtx X="324" Y="96" Z="-99" S="462" T="78" R="100" G="200" B="55" A="255"/>
+	<Vtx X="324" Y="96" Z="-99" S="462" T="78" R="100" G="200" B="55" A="255"/>
+	<Vtx X="330" Y="107" Z="-110" S="462" T="78" R="120" G="227" B="29" A="255"/>
+	<Vtx X="330" Y="111" Z="-107" S="462" T="14" R="122" G="243" B="34" A="255"/>
+	<Vtx X="324" Y="87" Z="-112" S="462" T="142" R="104" G="188" B="27" A="255"/>
+	<Vtx X="330" Y="104" Z="-114" S="462" T="142" R="122" G="221" B="12" A="255"/>
+	<Vtx X="330" Y="103" Z="-146" S="462" T="206" R="123" G="225" B="0" A="255"/>
+	<Vtx X="324" Y="82" Z="-146" S="462" T="206" R="104" G="183" B="0" A="255"/>
+	<Vtx X="332" Y="111" Z="-146" S="526" T="206" R="126" G="243" B="0" A="255"/>
+	<Vtx X="332" Y="111" Z="-114" S="526" T="142" R="125" G="242" B="14" A="255"/>
+	<Vtx X="332" Y="144" Z="-146" S="590" T="206" R="127" G="0" B="0" A="255"/>
+	<Vtx X="332" Y="111" Z="-178" S="526" T="142" R="125" G="242" B="242" A="255"/>
+	<Vtx X="330" Y="104" Z="-178" S="462" T="142" R="122" G="221" B="244" A="255"/>
+	<Vtx X="330" Y="107" Z="-182" S="462" T="78" R="120" G="227" B="227" A="255"/>
+	<Vtx X="330" Y="111" Z="-185" S="526" T="78" R="122" G="243" B="222" A="255"/>
+	<Vtx X="332" Y="144" Z="-178" S="590" T="142" R="126" G="0" B="243" A="255"/>
+	<Vtx X="330" Y="144" Z="-186" S="590" T="78" R="123" G="0" B="225" A="255"/>
+	<Vtx X="332" Y="144" Z="-178" S="590" T="142" R="126" G="0" B="243" A="255"/>
+	<Vtx X="330" Y="144" Z="-186" S="590" T="78" R="123" G="0" B="225" A="255"/>
+	<Vtx X="330" Y="176" Z="-185" S="526" T="78" R="122" G="13" B="222" A="255"/>
+	<Vtx X="332" Y="176" Z="-178" S="526" T="142" R="125" G="14" B="242" A="255"/>
+	<Vtx X="330" Y="181" Z="-182" S="462" T="78" R="120" G="29" B="227" A="255"/>
+	<Vtx X="330" Y="183" Z="-178" S="462" T="142" R="122" G="35" B="244" A="255"/>
+	<Vtx X="324" Y="192" Z="-192" S="462" T="78" R="100" G="56" B="201" A="255"/>
+	<Vtx X="330" Y="176" Z="-185" S="462" T="14" R="122" G="13" B="222" A="255"/>
+	<Vtx X="324" Y="201" Z="-180" S="462" T="142" R="104" G="68" B="229" A="255"/>
+	<Vtx X="330" Y="185" Z="-146" S="462" T="206" R="123" G="31" B="0" A="255"/>
+	<Vtx X="324" Y="205" Z="-146" S="462" T="206" R="104" G="73" B="0" A="255"/>
+	<Vtx X="324" Y="201" Z="-112" S="462" T="142" R="104" G="68" B="27" A="255"/>
+	<Vtx X="330" Y="183" Z="-114" S="462" T="142" R="122" G="35" B="12" A="255"/>
+	<Vtx X="324" Y="192" Z="-99" S="462" T="78" R="100" G="56" B="55" A="255"/>
+	<Vtx X="332" Y="176" Z="-146" S="526" T="206" R="126" G="13" B="0" A="255"/>
+	<Vtx X="332" Y="176" Z="-114" S="526" T="142" R="125" G="14" B="14" A="255"/>
+	<Vtx X="332" Y="176" Z="-114" S="526" T="142" R="125" G="14" B="14" A="255"/>
+	<Vtx X="332" Y="144" Z="-146" S="590" T="206" R="127" G="0" B="0" A="255"/>
+	<Vtx X="332" Y="176" Z="-146" S="526" T="206" R="126" G="13" B="0" A="255"/>
+	<Vtx X="332" Y="144" Z="-114" S="590" T="142" R="126" G="0" B="13" A="255"/>
+	<Vtx X="332" Y="111" Z="-114" S="526" T="142" R="125" G="242" B="14" A="255"/>
+	<Vtx X="332" Y="176" Z="-178" S="526" T="142" R="125" G="14" B="242" A="255"/>
+	<Vtx X="332" Y="144" Z="-178" S="590" T="142" R="126" G="0" B="243" A="255"/>
+	<Vtx X="332" Y="111" Z="-178" S="526" T="142" R="125" G="242" B="242" A="255"/>
+	<Vtx X="330" Y="183" Z="-178" S="462" T="142" R="122" G="35" B="244" A="255"/>
+	<Vtx X="330" Y="185" Z="-146" S="462" T="206" R="123" G="31" B="0" A="255"/>
+	<Vtx X="330" Y="144" Z="-186" S="462" T="-50" R="123" G="0" B="225" A="255"/>
+	<Vtx X="324" Y="109" Z="-203" S="462" T="14" R="103" G="229" B="187" A="255"/>
+	<Vtx X="324" Y="144" Z="-207" S="462" T="-50" R="102" G="0" B="180" A="255"/>
+	<Vtx X="330" Y="111" Z="-185" S="462" T="14" R="122" G="243" B="222" A="255"/>
+	<Vtx X="324" Y="96" Z="-192" S="462" T="78" R="100" G="200" B="201" A="255"/>
+	<Vtx X="330" Y="107" Z="-182" S="462" T="78" R="120" G="227" B="227" A="255"/>
+	<Vtx X="324" Y="96" Z="-192" S="462" T="78" R="100" G="200" B="201" A="255"/>
+	<Vtx X="330" Y="107" Z="-182" S="462" T="78" R="120" G="227" B="227" A="255"/>
+	<Vtx X="330" Y="104" Z="-178" S="462" T="142" R="122" G="221" B="244" A="255"/>
+	<Vtx X="305" Y="105" Z="72" S="422" T="14" R="1" G="208" B="138" A="255"/>
+	<Vtx X="222" Y="144" Z="146" S="206" T="14" R="149" G="192" B="23" A="255"/>
+	<Vtx X="305" Y="183" Z="72" S="422" T="14" R="254" G="44" B="137" A="255"/>
+	<Vtx X="305" Y="144" Z="71" S="422" T="-50" R="252" G="0" B="129" A="255"/>
+	<Vtx X="324" Y="178" Z="89" S="462" T="14" R="103" G="27" B="187" A="255"/>
+	<Vtx X="305" Y="202" Z="89" S="422" T="78" R="252" G="90" B="166" A="255"/>
+	<Vtx X="222" Y="144" Z="146" S="206" T="142" R="149" G="192" B="23" A="255"/>
+	<Vtx X="305" Y="219" Z="106" S="422" T="142" R="2" G="102" B="180" A="255"/>
+	<Vtx X="305" Y="220" Z="146" S="422" T="206" R="254" G="127" B="255" A="255"/>
+	<Vtx X="305" Y="219" Z="186" S="422" T="142" R="3" G="116" B="52" A="255"/>
+	<Vtx X="305" Y="202" Z="202" S="422" T="78" R="252" G="90" B="90" A="255"/>
+	<Vtx X="305" Y="183" Z="220" S="422" T="14" R="1" G="48" B="118" A="255"/>
+	<Vtx X="324" Y="178" Z="203" S="462" T="14" R="103" G="27" B="69" A="255"/>
+	<Vtx X="324" Y="178" Z="203" S="462" T="14" R="103" G="27" B="69" A="255"/>
+	<Vtx X="305" Y="183" Z="220" S="422" T="14" R="1" G="48" B="118" A="255"/>
+	<Vtx X="305" Y="144" Z="220" S="422" T="-50" R="252" G="0" B="127" A="255"/>
+	<Vtx X="305" Y="105" Z="220" S="422" T="14" R="254" G="212" B="119" A="255"/>
+	<Vtx X="222" Y="144" Z="146" S="206" T="14" R="149" G="192" B="23" A="255"/>
+	<Vtx X="305" Y="86" Z="202" S="422" T="78" R="252" G="166" B="90" A="255"/>
+	<Vtx X="305" Y="69" Z="186" S="422" T="142" R="0" G="141" B="55" A="255"/>
+	<Vtx X="324" Y="87" Z="180" S="462" T="142" R="104" G="188" B="27" A="255"/>
+	<Vtx X="305" Y="67" Z="146" S="422" T="206" R="255" G="129" B="255" A="255"/>
+	<Vtx X="222" Y="144" Z="146" S="206" T="142" R="149" G="192" B="23" A="255"/>
+	<Vtx X="305" Y="69" Z="106" S="422" T="142" R="3" G="140" B="204" A="255"/>
+	<Vtx X="305" Y="86" Z="89" S="422" T="78" R="252" G="166" B="166" A="255"/>
+	<Vtx X="305" Y="105" Z="72" S="422" T="14" R="1" G="208" B="138" A="255"/>
+	<Vtx X="324" Y="109" Z="89" S="462" T="14" R="103" G="229" B="187" A="255"/>
+	<Vtx X="305" Y="144" Z="71" S="422" T="-50" R="252" G="0" B="129" A="255"/>
+	<Vtx X="324" Y="144" Z="84" S="462" T="-50" R="102" G="0" B="180" A="255"/>
+	<Vtx X="305" Y="144" Z="71" S="422" T="-50" R="252" G="0" B="129" A="255"/>
+	<Vtx X="324" Y="178" Z="89" S="462" T="14" R="103" G="27" B="187" A="255"/>
+	<Vtx X="324" Y="144" Z="84" S="462" T="-50" R="102" G="0" B="180" A="255"/>
+	<Vtx X="330" Y="144" Z="105" S="462" T="-50" R="123" G="0" B="225" A="255"/>
+	<Vtx X="330" Y="176" Z="107" S="462" T="14" R="122" G="13" B="222" A="255"/>
+	<Vtx X="324" Y="192" Z="99" S="462" T="78" R="100" G="56" B="201" A="255"/>
+	<Vtx X="305" Y="202" Z="89" S="422" T="78" R="252" G="90" B="166" A="255"/>
+	<Vtx X="324" Y="201" Z="112" S="462" T="142" R="104" G="68" B="229" A="255"/>
+	<Vtx X="305" Y="219" Z="106" S="422" T="142" R="2" G="102" B="180" A="255"/>
+	<Vtx X="305" Y="220" Z="146" S="422" T="206" R="254" G="127" B="255" A="255"/>
+	<Vtx X="324" Y="205" Z="146" S="462" T="206" R="104" G="73" B="0" A="255"/>
+	<Vtx X="324" Y="201" Z="180" S="462" T="142" R="104" G="68" B="27" A="255"/>
+	<Vtx X="305" Y="219" Z="186" S="422" T="142" R="3" G="116" B="52" A="255"/>
+	<Vtx X="305" Y="202" Z="202" S="422" T="78" R="252" G="90" B="90" A="255"/>
+	<Vtx X="324" Y="192" Z="192" S="462" T="78" R="100" G="56" B="55" A="255"/>
+	<Vtx X="324" Y="178" Z="203" S="462" T="14" R="103" G="27" B="69" A="255"/>
+	<Vtx X="324" Y="192" Z="192" S="462" T="78" R="100" G="56" B="55" A="255"/>
+	<Vtx X="324" Y="178" Z="203" S="462" T="14" R="103" G="27" B="69" A="255"/>
+	<Vtx X="330" Y="176" Z="185" S="462" T="14" R="122" G="13" B="34" A="255"/>
+	<Vtx X="330" Y="144" Z="186" S="462" T="-50" R="123" G="0" B="31" A="255"/>
+	<Vtx X="324" Y="144" Z="207" S="462" T="-50" R="102" G="0" B="76" A="255"/>
+	<Vtx X="305" Y="144" Z="220" S="422" T="-50" R="252" G="0" B="127" A="255"/>
+	<Vtx X="324" Y="109" Z="203" S="462" T="14" R="103" G="229" B="69" A="255"/>
+	<Vtx X="305" Y="105" Z="220" S="422" T="14" R="254" G="212" B="119" A="255"/>
+	<Vtx X="305" Y="86" Z="202" S="422" T="78" R="252" G="166" B="90" A="255"/>
+	<Vtx X="324" Y="96" Z="192" S="462" T="78" R="100" G="200" B="55" A="255"/>
+	<Vtx X="324" Y="87" Z="180" S="462" T="142" R="104" G="188" B="27" A="255"/>
+	<Vtx X="330" Y="104" Z="178" S="462" T="142" R="122" G="221" B="12" A="255"/>
+	<Vtx X="330" Y="103" Z="146" S="462" T="206" R="123" G="225" B="0" A="255"/>
+	<Vtx X="324" Y="82" Z="146" S="462" T="206" R="104" G="183" B="0" A="255"/>
+	<Vtx X="305" Y="67" Z="146" S="422" T="206" R="255" G="129" B="255" A="255"/>
+	<Vtx X="324" Y="87" Z="112" S="462" T="142" R="104" G="188" B="229" A="255"/>
+	<Vtx X="305" Y="67" Z="146" S="422" T="206" R="255" G="129" B="255" A="255"/>
+	<Vtx X="305" Y="69" Z="106" S="422" T="142" R="3" G="140" B="204" A="255"/>
+	<Vtx X="324" Y="87" Z="112" S="462" T="142" R="104" G="188" B="229" A="255"/>
+	<Vtx X="305" Y="86" Z="89" S="422" T="78" R="252" G="166" B="166" A="255"/>
+	<Vtx X="324" Y="96" Z="99" S="462" T="78" R="100" G="200" B="201" A="255"/>
+	<Vtx X="324" Y="109" Z="89" S="462" T="14" R="103" G="229" B="187" A="255"/>
+	<Vtx X="330" Y="111" Z="107" S="462" T="14" R="122" G="243" B="222" A="255"/>
+	<Vtx X="330" Y="144" Z="105" S="462" T="-50" R="123" G="0" B="225" A="255"/>
+	<Vtx X="324" Y="144" Z="84" S="462" T="-50" R="102" G="0" B="180" A="255"/>
+	<Vtx X="330" Y="107" Z="110" S="462" T="78" R="120" G="227" B="227" A="255"/>
+	<Vtx X="330" Y="104" Z="114" S="462" T="142" R="122" G="221" B="244" A="255"/>
+	<Vtx X="332" Y="111" Z="114" S="526" T="142" R="125" G="242" B="242" A="255"/>
+	<Vtx X="330" Y="111" Z="107" S="526" T="78" R="122" G="243" B="222" A="255"/>
+	<Vtx X="332" Y="144" Z="114" S="590" T="142" R="126" G="0" B="243" A="255"/>
+	<Vtx X="330" Y="144" Z="105" S="590" T="78" R="123" G="0" B="225" A="255"/>
+	<Vtx X="330" Y="176" Z="107" S="526" T="78" R="122" G="13" B="222" A="255"/>
+	<Vtx X="330" Y="176" Z="107" S="526" T="78" R="122" G="13" B="222" A="255"/>
+	<Vtx X="332" Y="176" Z="114" S="526" T="142" R="125" G="14" B="242" A="255"/>
+	<Vtx X="332" Y="144" Z="114" S="590" T="142" R="126" G="0" B="243" A="255"/>
+	<Vtx X="330" Y="181" Z="110" S="462" T="78" R="120" G="29" B="227" A="255"/>
+	<Vtx X="330" Y="183" Z="114" S="462" T="142" R="122" G="35" B="244" A="255"/>
+	<Vtx X="324" Y="192" Z="99" S="462" T="78" R="100" G="56" B="201" A="255"/>
+	<Vtx X="330" Y="176" Z="107" S="462" T="14" R="122" G="13" B="222" A="255"/>
+	<Vtx X="324" Y="201" Z="112" S="462" T="142" R="104" G="68" B="229" A="255"/>
+	<Vtx X="330" Y="185" Z="146" S="462" T="206" R="123" G="31" B="0" A="255"/>
+	<Vtx X="324" Y="205" Z="146" S="462" T="206" R="104" G="73" B="0" A="255"/>
+	<Vtx X="324" Y="201" Z="180" S="462" T="142" R="104" G="68" B="27" A="255"/>
+	<Vtx X="330" Y="183" Z="178" S="462" T="142" R="122" G="35" B="12" A="255"/>
+	<Vtx X="324" Y="192" Z="192" S="462" T="78" R="100" G="56" B="55" A="255"/>
+	<Vtx X="330" Y="181" Z="182" S="462" T="78" R="120" G="29" B="29" A="255"/>
+	<Vtx X="330" Y="176" Z="185" S="462" T="14" R="122" G="13" B="34" A="255"/>
+	<Vtx X="332" Y="176" Z="178" S="526" T="142" R="125" G="14" B="14" A="255"/>
+	<Vtx X="332" Y="176" Z="146" S="526" T="206" R="126" G="13" B="0" A="255"/>
+	<Vtx X="330" Y="183" Z="178" S="462" T="142" R="122" G="35" B="12" A="255"/>
+	<Vtx X="332" Y="176" Z="178" S="526" T="142" R="125" G="14" B="14" A="255"/>
+	<Vtx X="332" Y="144" Z="146" S="590" T="206" R="127" G="0" B="0" A="255"/>
+	<Vtx X="332" Y="144" Z="178" S="590" T="142" R="126" G="0" B="13" A="255"/>
+	<Vtx X="330" Y="176" Z="185" S="526" T="78" R="122" G="13" B="34" A="255"/>
+	<Vtx X="330" Y="181" Z="182" S="462" T="78" R="120" G="29" B="29" A="255"/>
+	<Vtx X="330" Y="144" Z="186" S="590" T="78" R="123" G="0" B="31" A="255"/>
+	<Vtx X="330" Y="111" Z="185" S="526" T="78" R="122" G="243" B="34" A="255"/>
+	<Vtx X="332" Y="111" Z="178" S="526" T="142" R="125" G="242" B="14" A="255"/>
+	<Vtx X="330" Y="107" Z="182" S="462" T="78" R="120" G="227" B="29" A="255"/>
+	<Vtx X="330" Y="104" Z="178" S="462" T="142" R="122" G="221" B="12" A="255"/>
+	<Vtx X="324" Y="96" Z="192" S="462" T="78" R="100" G="200" B="55" A="255"/>
+	<Vtx X="330" Y="111" Z="185" S="462" T="14" R="122" G="243" B="34" A="255"/>
+	<Vtx X="324" Y="109" Z="203" S="462" T="14" R="103" G="229" B="69" A="255"/>
+	<Vtx X="330" Y="144" Z="186" S="462" T="-50" R="123" G="0" B="31" A="255"/>
+	<Vtx X="330" Y="144" Z="186" S="462" T="-50" R="123" G="0" B="31" A="255"/>
+	<Vtx X="324" Y="144" Z="207" S="462" T="-50" R="102" G="0" B="76" A="255"/>
+	<Vtx X="324" Y="109" Z="203" S="462" T="14" R="103" G="229" B="69" A="255"/>
+	<Vtx X="330" Y="104" Z="178" S="462" T="142" R="122" G="221" B="12" A="255"/>
+	<Vtx X="332" Y="111" Z="146" S="526" T="206" R="126" G="243" B="0" A="255"/>
+	<Vtx X="332" Y="111" Z="178" S="526" T="142" R="125" G="242" B="14" A="255"/>
+	<Vtx X="330" Y="103" Z="146" S="462" T="206" R="123" G="225" B="0" A="255"/>
+	<Vtx X="330" Y="104" Z="114" S="462" T="142" R="122" G="221" B="244" A="255"/>
+	<Vtx X="324" Y="87" Z="112" S="462" T="142" R="104" G="188" B="229" A="255"/>
+	<Vtx X="324" Y="82" Z="146" S="462" T="206" R="104" G="183" B="0" A="255"/>
+	<Vtx X="324" Y="96" Z="99" S="462" T="78" R="100" G="200" B="201" A="255"/>
+	<Vtx X="332" Y="176" Z="146" S="526" T="206" R="126" G="13" B="0" A="255"/>
+	<Vtx X="330" Y="185" Z="146" S="462" T="206" R="123" G="31" B="0" A="255"/>
+	<Vtx X="330" Y="183" Z="178" S="462" T="142" R="122" G="35" B="12" A="255"/>
+	<Vtx X="330" Y="183" Z="114" S="462" T="142" R="122" G="35" B="244" A="255"/>
+	<Vtx X="332" Y="176" Z="114" S="526" T="142" R="125" G="14" B="242" A="255"/>
+	<Vtx X="332" Y="176" Z="114" S="526" T="142" R="125" G="14" B="242" A="255"/>
+	<Vtx X="332" Y="176" Z="146" S="526" T="206" R="126" G="13" B="0" A="255"/>
+	<Vtx X="332" Y="144" Z="146" S="590" T="206" R="127" G="0" B="0" A="255"/>
+	<Vtx X="332" Y="144" Z="114" S="590" T="142" R="126" G="0" B="243" A="255"/>
+	<Vtx X="332" Y="111" Z="114" S="526" T="142" R="125" G="242" B="242" A="255"/>
+	<Vtx X="332" Y="111" Z="146" S="526" T="206" R="126" G="243" B="0" A="255"/>
+	<Vtx X="332" Y="111" Z="178" S="526" T="142" R="125" G="242" B="14" A="255"/>
+	<Vtx X="332" Y="144" Z="178" S="590" T="142" R="126" G="0" B="13" A="255"/>
+	<Vtx X="330" Y="104" Z="114" S="462" T="142" R="122" G="221" B="244" A="255"/>
+</Vertex>
diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_Gem_eyes b/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_Gem_eyes
new file mode 100644
index 000000000..774994e9e
--- /dev/null
+++ b/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_Gem_eyes
@@ -0,0 +1,21 @@
+<DisplayList Version="0">
+	<PipeSync/>
+	<SetCombineLERP A0="G_CCMUX_TEXEL0" B0="G_CCMUX_0" C0="G_CCMUX_TEXEL0" D0="G_CCMUX_TEXEL0" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_1" A1="G_CCMUX_COMBINED" B1="G_CCMUX_0" C1="G_CCMUX_PRIMITIVE" D1="G_CCMUX_0" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_COMBINED"/>
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="1" G_CULL_BACK="1" G_FOG="1" G_LIGHTING="1" G_TEXTURE_GEN="1" G_SHADING_SMOOTH="1" />
+	<ClearGeometryMode G_CULL_FRONT="1" G_TEXTURE_GEN_LINEAR="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_H" Sft="4" Length="20" G_AD_NOISE="1" G_CD_MAGICSQ="1" G_CK_NONE="1" G_TC_FILT="1" G_TF_BILERP="1" G_TL_TILE="1" G_TD_CLAMP="1" G_TP_PERSP="1" G_CYC_2CYCLE="1" G_PM_NPRIMITIVE="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_L" Sft="0" Length="32" G_AC_NONE="1" G_ZS_PIXEL="1" G_RM_FOG_SHADE_A="1" G_RM_AA_ZB_OPA_SURF2="1" />
+	<Texture S="5898" T="5898" Level="0" Tile="0" On="1"/>
+	<SetTextureLUT Mode="G_TT_NONE"/>
+	<TileSync/>
+	<SetTextureImage Path="objects/object_gi_boss_soul/noise_tex" Format="G_IM_FMT_I" Size="G_IM_SIZ_8b_LOAD_BLOCK" Width="1"/>
+	<SetTile Format="G_IM_FMT_I" Size="G_IM_SIZ_8b_LOAD_BLOCK" Line="0" TMem="0" Tile="7" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="511" Dxt="512"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_I" Size="G_IM_SIZ_8b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="124" Lrt="124"/>
+	<SetPrimColor M="0" L="0" R="223" G="62" B="53" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_black b/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_black
new file mode 100644
index 000000000..8a475974d
--- /dev/null
+++ b/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_black
@@ -0,0 +1,21 @@
+<DisplayList Version="0">
+	<PipeSync/>
+	<SetCombineLERP A0="G_CCMUX_TEXEL0" B0="G_CCMUX_0" C0="G_CCMUX_TEXEL0" D0="G_CCMUX_TEXEL0" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_1" A1="G_CCMUX_COMBINED" B1="G_CCMUX_0" C1="G_CCMUX_PRIMITIVE" D1="G_CCMUX_0" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_COMBINED"/>
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="1" G_CULL_BACK="1" G_FOG="1" G_LIGHTING="1" G_TEXTURE_GEN="1" G_SHADING_SMOOTH="1" />
+	<ClearGeometryMode G_CULL_FRONT="1" G_TEXTURE_GEN_LINEAR="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_H" Sft="4" Length="20" G_AD_NOISE="1" G_CD_MAGICSQ="1" G_CK_NONE="1" G_TC_FILT="1" G_TF_BILERP="1" G_TL_TILE="1" G_TD_CLAMP="1" G_TP_PERSP="1" G_CYC_2CYCLE="1" G_PM_NPRIMITIVE="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_L" Sft="0" Length="32" G_AC_NONE="1" G_ZS_PIXEL="1" G_RM_FOG_SHADE_A="1" G_RM_AA_ZB_OPA_SURF2="1" />
+	<Texture S="1984" T="1984" Level="0" Tile="0" On="1"/>
+	<SetTextureLUT Mode="G_TT_NONE"/>
+	<TileSync/>
+	<SetTextureImage Path="objects/object_gi_boss_soul/noise_tex_copy" Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b_LOAD_BLOCK" Width="1"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b_LOAD_BLOCK" Line="0" TMem="0" Tile="7" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="1023" Dxt="256"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="8" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="124" Lrt="124"/>
+	<SetPrimColor M="0" L="0" R="49" G="49" B="49" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_eyes b/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_eyes
new file mode 100644
index 000000000..90ecc4518
--- /dev/null
+++ b/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_eyes
@@ -0,0 +1,21 @@
+<DisplayList Version="0">
+	<PipeSync/>
+	<SetCombineLERP A0="G_CCMUX_0" B0="G_CCMUX_0" C0="G_CCMUX_0" D0="G_CCMUX_TEXEL0" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_1" A1="G_CCMUX_COMBINED" B1="G_CCMUX_0" C1="G_CCMUX_PRIMITIVE" D1="G_CCMUX_0" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_COMBINED"/>
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="1" G_CULL_BACK="1" G_FOG="1" G_LIGHTING="1" G_SHADING_SMOOTH="1" />
+	<ClearGeometryMode G_CULL_FRONT="1" G_TEXTURE_GEN="1" G_TEXTURE_GEN_LINEAR="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_H" Sft="4" Length="20" G_AD_NOISE="1" G_CD_MAGICSQ="1" G_CK_NONE="1" G_TC_FILT="1" G_TF_BILERP="1" G_TL_TILE="1" G_TD_CLAMP="1" G_TP_PERSP="1" G_CYC_2CYCLE="1" G_PM_NPRIMITIVE="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_L" Sft="0" Length="32" G_AC_NONE="1" G_ZS_PIXEL="1" G_RM_FOG_SHADE_A="1" G_RM_AA_ZB_OPA_SURF2="1" />
+	<Texture S="65535" T="65535" Level="0" Tile="0" On="1"/>
+	<SetTextureLUT Mode="G_TT_NONE"/>
+	<TileSync/>
+	<SetTextureImage Path="objects/object_gi_boss_soul/noise_tex_copy" Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b_LOAD_BLOCK" Width="1"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b_LOAD_BLOCK" Line="0" TMem="0" Tile="7" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="1023" Dxt="256"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="8" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="124" Lrt="124"/>
+	<SetPrimColor M="0" L="0" R="90" G="14" B="12" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_horns b/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_horns
new file mode 100644
index 000000000..2ea52e133
--- /dev/null
+++ b/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_horns
@@ -0,0 +1,21 @@
+<DisplayList Version="0">
+	<PipeSync/>
+	<SetCombineLERP A0="G_CCMUX_TEXEL0" B0="G_CCMUX_0" C0="G_CCMUX_TEXEL0" D0="G_CCMUX_TEXEL0" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_1" A1="G_CCMUX_COMBINED" B1="G_CCMUX_0" C1="G_CCMUX_PRIMITIVE" D1="G_CCMUX_0" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_COMBINED"/>
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="1" G_CULL_BACK="1" G_FOG="1" G_LIGHTING="1" G_TEXTURE_GEN="1" G_SHADING_SMOOTH="1" />
+	<ClearGeometryMode G_CULL_FRONT="1" G_TEXTURE_GEN_LINEAR="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_H" Sft="4" Length="20" G_AD_NOISE="1" G_CD_MAGICSQ="1" G_CK_NONE="1" G_TC_FILT="1" G_TF_BILERP="1" G_TL_TILE="1" G_TD_CLAMP="1" G_TP_PERSP="1" G_CYC_2CYCLE="1" G_PM_NPRIMITIVE="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_L" Sft="0" Length="32" G_AC_NONE="1" G_ZS_PIXEL="1" G_RM_FOG_SHADE_A="1" G_RM_AA_ZB_OPA_SURF2="1" />
+	<Texture S="1984" T="1984" Level="0" Tile="0" On="1"/>
+	<SetTextureLUT Mode="G_TT_NONE"/>
+	<TileSync/>
+	<SetTextureImage Path="objects/object_gi_boss_soul/noise_tex" Format="G_IM_FMT_I" Size="G_IM_SIZ_8b_LOAD_BLOCK" Width="1"/>
+	<SetTile Format="G_IM_FMT_I" Size="G_IM_SIZ_8b_LOAD_BLOCK" Line="0" TMem="0" Tile="7" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="511" Dxt="512"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_I" Size="G_IM_SIZ_8b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="124" Lrt="124"/>
+	<SetPrimColor M="0" L="0" R="255" G="241" B="124" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_surface b/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_surface
new file mode 100644
index 000000000..1b5b65898
--- /dev/null
+++ b/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_surface
@@ -0,0 +1,21 @@
+<DisplayList Version="0">
+	<PipeSync/>
+	<SetCombineLERP A0="G_CCMUX_TEXEL0" B0="G_CCMUX_0" C0="G_CCMUX_TEXEL0" D0="G_CCMUX_TEXEL0" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_1" A1="G_CCMUX_COMBINED" B1="G_CCMUX_0" C1="G_CCMUX_PRIMITIVE" D1="G_CCMUX_0" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_COMBINED"/>
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="1" G_CULL_BACK="1" G_FOG="1" G_LIGHTING="1" G_TEXTURE_GEN="1" G_SHADING_SMOOTH="1" />
+	<ClearGeometryMode G_CULL_FRONT="1" G_TEXTURE_GEN_LINEAR="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_H" Sft="4" Length="20" G_AD_NOISE="1" G_CD_MAGICSQ="1" G_CK_NONE="1" G_TC_FILT="1" G_TF_BILERP="1" G_TL_TILE="1" G_TD_CLAMP="1" G_TP_PERSP="1" G_CYC_2CYCLE="1" G_PM_NPRIMITIVE="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_L" Sft="0" Length="32" G_AC_NONE="1" G_ZS_PIXEL="1" G_RM_FOG_SHADE_A="1" G_RM_AA_ZB_OPA_SURF2="1" />
+	<Texture S="1984" T="1984" Level="0" Tile="0" On="1"/>
+	<SetTextureLUT Mode="G_TT_NONE"/>
+	<TileSync/>
+	<SetTextureImage Path="objects/object_gi_boss_soul/noise_tex" Format="G_IM_FMT_I" Size="G_IM_SIZ_8b_LOAD_BLOCK" Width="1"/>
+	<SetTile Format="G_IM_FMT_I" Size="G_IM_SIZ_8b_LOAD_BLOCK" Line="0" TMem="0" Tile="7" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="511" Dxt="512"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_I" Size="G_IM_SIZ_8b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="124" Lrt="124"/>
+	<SetPrimColor M="0" L="0" R="255" G="255" B="255" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/noise_tex b/OTRExporter/assets/objects/object_gi_boss_soul/noise_tex
new file mode 100644
index 0000000000000000000000000000000000000000..aaf4e331f15f797a3b1122b58c57b3767e66bc0f
GIT binary patch
literal 1116
zcma)5S&rmH5G^FcIk*X5eDlKxBf5LKx?JV<zND9QdQWd<yUM%Ec1`sZ(=$CnVgPXg
zj=~kV0y%;M5K<^Y%E*X}_g=16tJM$Re*fJUB>w&9uYY}ZlKyY|id266pZ|L)_-3^t
z{^e>VIz`u(`^dKQ%g2w`bDu%x{^r%I8%i=wg`pMy&>oT`wvAwTeqNf)RT*l1cl(+W
z4O3wm5FDBuCz%Uiv0TQ&*Cj#VNy!7F8h~R}KQ9uT<sn4bc%G_I6GT;0xy}7XAc0Xl
z9EM4G%%b!-&hwC40w?Q+Os^j}O=W1^_ib-q*JV+41F@s8a3Ua`shwm1mN7#QI_dF{
zC3#gJ4`q&_A_E=pJ4Q7D!zjqoEu1AT@}e}suH(73Ws=D>qZsmTyW<5x_pt+H9l4&R
zNV*$EuA#8o9Vc?s{bsv;)Pm5GMBTP6z|sQ5v2V)EX1(5QHV?AIOLmqzz`$u>%G@KX
zAm1U#Q1`b#-cdY`0zWyHA&UB`uvJOq1z;j%s@!gUchADQtBSnLBiuZ{ObIeINsvAl
zKp>GPf~X&wGE1T`oqzfLxlOSLfeJL;gpe$uxkXczdF&C0F2DWpa%!p~b}e0&RKxLI
z%T231NzwpnD1Z9&={oddS76r=ISB@l@A&(Ji`>A~6jZ+b`Tf)mbH67OcwTj)5Scc{
zK!pLxobvMFI`+$@k4zv-0AY+25fE@S6z$W{&&H?oX}(_jP*+sLjS^qu9wmr;+rj%{
zAEy-|@BH@CVH4;m%+kORMa{#BXIWla6lGO6!#wp(?ire4hv`1{96uqtA;^bi)3$9t
zo$9i#W2i_9OzJvM;xx4+nwI?IFm%JTj73}=LclXD2+J}FLmcRYNZGH3zUij9O&r(N
zIC{GkOwTb52m2bcW%RfiySf=qM4ckHqqfwB78L>#iUN&&l-#mE4Q;=iy9hjP)*G6p
zcAUU-vK4wNFT$)pja`3!_q^mt=2&vXvP9&Xrb8$zFlv{%J+_yZm#3OgWf__(%K$o#
zDT@+s;Ci{tRaQ>d>(W(+JVHPr6kC2^iS&+v`RR%Lt01bUX&g>t6B|4yh?4GjP~1K+
zRyjYNyVUUyr+Hf5EKR78{fMr0WJ>e{hl<lY9%I`(zIpc(8Bw{y=JoB(-A*<Qg`xfd
D(@X%Y

literal 0
HcmV?d00001

diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/noise_tex_copy b/OTRExporter/assets/objects/object_gi_boss_soul/noise_tex_copy
new file mode 100644
index 0000000000000000000000000000000000000000..a6d6cf945e1bd755148a4d4dcbb52a7547cff5fe
GIT binary patch
literal 2140
zcma)-p;iK66oglkuRxQ?Q<%&agGb`VjYNupNF+ksxY6os*d%WB6=crmckY4&-2)5j
zKXYg1-v6g*n&##4`RV3#|Na=h@;ZI|_uuVl<^Asq(Az`PoL+ZL(=FG>ZM*At{kGk<
zoB8^f@B6V|^o#wtA9sD8b<1}4`pMPKy5;JSt6Sz1_+WFbkE_FGzU#q*&dPQML+<DJ
z%{=v|cod}ewhdqEa0Pvd&uY;+hyw7NxjIoiWl%rLqoa6|2&u%qigm(w@yQGoVaO$V
z>cGs(0eCWBAFIAB+{qL)^;J{#(*^U779F9Cck7oMvyi7MiAz1X(~0sQ40!#}eYwJr
z)w$3!#TWA08q`zmoX`3-iMlqu)Ut1KlNXALA#>#Hnt0flT_;zLs4+)eg_T-0z2Jv#
z==wz%=q<_ft_t{={8V=eviFAWeF#3h{wM3p2TJs82JFS)hc4641%p29MHs>^6Wz%(
z_P%H)*j`R&0VaIl)cQF&g7^Hu`S~RA&8l$%2Rru~ep=hPLVc9b!Em_yQawC50ZL_7
zkVWyC0UUWR_wL|gup?AW-<Z*=ELuMHmHta9j-4iEQEZf_QdX-t3_b}~FWF6GFPghE
zg<tn+-0FtDa-!BOgRZ)@TXAao*3b7#^(OBrku@j)P5RDNvMlZX`dps=BI#!s$_eLv
zGRr4^eX3I;@GVZhWXi0NIFm~U$e%i}1Z~&r3@QBIIjH`nBD(oay~NWo=WjZ}=18y1
Wt?)@tzwBYq`!Okk_S7_uJpBQRG6N+5

literal 0
HcmV?d00001

diff --git a/soh/assets/soh_assets.h b/soh/assets/soh_assets.h
index 2b193053c..4a207787a 100644
--- a/soh/assets/soh_assets.h
+++ b/soh/assets/soh_assets.h
@@ -56,6 +56,9 @@ static const ALIGN_ASSET(2) char gTriforcePiece2DL[] = dgTriforcePiece2DL;
 #define dgTriforcePieceCompletedDL "__OTR__objects/object_triforce_completed/gTriforcePieceCompletedDL"
 static const ALIGN_ASSET(2) char gTriforcePieceCompletedDL[] = dgTriforcePieceCompletedDL;
 
+#define dgBossSoulSkullDL "__OTR__objects/object_gi_boss_soul/gGIBossSoulSkullDL"
+static const ALIGN_ASSET(2) char gBossSoulSkullDL[] = dgBossSoulSkullDL;
+
 // overlays
 #define dgOptionsDividerChangeLangVtx "__OTR__overlays/ovl_file_choose/gOptionsDividerChangeLangVtx"
 static const ALIGN_ASSET(2) char gOptionsDividerChangeLangVtx[] = dgOptionsDividerChangeLangVtx;
diff --git a/soh/soh/Enhancements/randomizer/draw.cpp b/soh/soh/Enhancements/randomizer/draw.cpp
index d4884a13b..636f2528c 100644
--- a/soh/soh/Enhancements/randomizer/draw.cpp
+++ b/soh/soh/Enhancements/randomizer/draw.cpp
@@ -274,25 +274,32 @@ extern "C" void Randomizer_DrawBossSoul(PlayState* play, GetItemEntry* getItemEn
         { 80, 80, 80 },    // Ganon's Castle
 
     };
-    OPEN_DISPS(play->state.gfxCtx); 
-    
+    OPEN_DISPS(play->state.gfxCtx);
+
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-    gSPSegment(POLY_XLU_DISP++, 8, (uintptr_t)Gfx_TwoTexScroll(
-        play->state.gfxCtx, 0, 0 * (play->state.frames * 0),
-        0 * (play->state.frames * 0), 16, 32, 1, 1 * (play->state.frames * 1),
-        -1 * (play->state.frames * 8), 16, 32
-    ));
-    Matrix_Push();
-    Matrix_Translate(0.0f, -50.0f, 0.0f, MTXMODE_APPLY);
-    Matrix_Scale(3.0f, 3.0f, 3.0f, MTXMODE_APPLY);
-    Matrix_ReplaceRotation(&play->billboardMtxF);
     gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
               G_MTX_MODELVIEW | G_MTX_LOAD);
-    gDPSetGrayscaleColor(POLY_XLU_DISP++, colors[slot][0], colors[slot][1], colors[slot][2], 255);
-    gSPGrayscale(POLY_XLU_DISP++, true);
-    gSPDisplayList(POLY_XLU_DISP++, (Gfx*)gGiBlueFireFlameDL);
-    gSPGrayscale(POLY_XLU_DISP++, false);
-    Matrix_Pop();
+    gSPDisplayList(POLY_XLU_DISP++, (Gfx*)gBossSoulSkullDL);
+    
+    
+    // TODO Add flame as backdrop for test model?
+    // Gfx_SetupDL_25Xlu(play->state.gfxCtx);
+    // gSPSegment(POLY_XLU_DISP++, 8, (uintptr_t)Gfx_TwoTexScroll(
+    //     play->state.gfxCtx, 0, 0 * (play->state.frames * 0),
+    //     0 * (play->state.frames * 0), 16, 32, 1, 1 * (play->state.frames * 1),
+    //     -1 * (play->state.frames * 8), 16, 32
+    // ));
+    // Matrix_Push();
+    // gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
+    //           G_MTX_MODELVIEW | G_MTX_LOAD);
+    // //Matrix_Translate(0.0f, -50.0f, 0.0f, MTXMODE_APPLY);
+    // //Matrix_Scale(5.0f, 5.0f, 5.0f, MTXMODE_APPLY);
+    // Matrix_ReplaceRotation(&play->billboardMtxF);
+    // gDPSetGrayscaleColor(POLY_XLU_DISP++, colors[slot][0], colors[slot][1], colors[slot][2], 255);
+    // gSPGrayscale(POLY_XLU_DISP++, true);
+    // gSPDisplayList(POLY_XLU_DISP++, (Gfx*)gGiBlueFireFlameDL);
+    // gSPGrayscale(POLY_XLU_DISP++, false);
+    // Matrix_Pop();
 
     CLOSE_DISPS(play->state.gfxCtx);
 

From b34471030c8e9ad3e228f4ccf0f660917dbaf945 Mon Sep 17 00:00:00 2001
From: Ralphie Morell <stratomaster64@gmail.com>
Date: Tue, 31 Oct 2023 20:31:27 -0400
Subject: [PATCH 019/230] refine boss soul model (thanks sitton76!)

---
 .../gGIBossSoulSkullDL_tri_0                  |   4 +-
 .../gGIBossSoulSkullDL_vtx_0                  | 342 +++++------
 .../gGIBossSoulSkullDL_vtx_1                  |  48 +-
 .../gGIBossSoulSkullDL_vtx_2                  |   8 +-
 .../gGIBossSoulSkullDL_vtx_3                  | 112 ++--
 .../gGIBossSoulSkullDL_vtx_4                  | 530 +++++++++---------
 .../mat_gGIBossSoulSkullDL_skull_surface      |   2 +-
 soh/soh/Enhancements/randomizer/draw.cpp      |  62 +-
 8 files changed, 555 insertions(+), 553 deletions(-)

diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_0 b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_0
index 87cfedfaf..49f29247f 100644
--- a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_0
+++ b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_0
@@ -12,8 +12,8 @@
 	<Triangle1 V00="8" V01="10" V02="11"/>
 	<Triangle1 V00="12" V01="11" V02="10"/>
 	<Triangle1 V00="10" V01="13" V02="12"/>
-	<Triangle1 V00="13" V01="14" V02="12"/>
-	<Triangle1 V00="12" V01="14" V02="15"/>
+	<Triangle1 V00="10" V01="14" V02="13"/>
+	<Triangle1 V00="12" V01="13" V02="15"/>
 	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_0" VertexBufferIndex="0" VertexOffset="16" Count="16"/>
 	<Triangle1 V00="0" V01="1" V02="2"/>
 	<Triangle1 V00="0" V01="3" V02="1"/>
diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_0 b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_0
index 82c478df5..ed4b6e1c0 100644
--- a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_0
+++ b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_0
@@ -1,173 +1,173 @@
 <Vertex Version="0">
-	<Vtx X="173" Y="349" Z="-349" S="147" T="-17" R="202" G="69" B="164" A="255"/>
-	<Vtx X="0" Y="273" Z="-318" S="239" T="-17" R="167" G="65" B="193" A="255"/>
-	<Vtx X="0" Y="336" Z="-185" S="239" T="-81" R="159" G="78" B="231" A="255"/>
-	<Vtx X="173" Y="432" Z="-175" S="147" T="-81" R="198" G="112" B="239" A="255"/>
-	<Vtx X="0" Y="356" Z="0" S="239" T="-145" R="167" G="91" B="0" A="255"/>
-	<Vtx X="-40" Y="222" Z="0" S="111" T="-145" R="133" G="32" B="0" A="255"/>
-	<Vtx X="-40" Y="212" Z="-92" S="111" T="-113" R="132" G="23" B="244" A="255"/>
-	<Vtx X="-40" Y="122" Z="-185" S="15" T="-17" R="131" G="11" B="236" A="255"/>
-	<Vtx X="0" Y="155" Z="-370" S="47" T="111" R="161" G="18" B="174" A="255"/>
-	<Vtx X="0" Y="273" Z="-318" S="111" T="111" R="167" G="65" B="193" A="255"/>
-	<Vtx X="173" Y="349" Z="-349" S="111" T="19" R="202" G="69" B="164" A="255"/>
-	<Vtx X="173" Y="195" Z="-418" S="47" T="19" R="236" G="20" B="132" A="255"/>
-	<Vtx X="307" Y="195" Z="-418" S="47" T="-17" R="125" G="4" B="232" A="255"/>
-	<Vtx X="285" Y="349" Z="-349" S="111" T="-11" R="78" G="230" B="159" A="255"/>
-	<Vtx X="307" Y="349" Z="-349" S="111" T="-17" R="122" G="18" B="225" A="255"/>
-	<Vtx X="307" Y="432" Z="-175" S="111" T="-81" R="121" G="37" B="249" A="255"/>
-	<Vtx X="307" Y="349" Z="-349" S="111" T="-17" R="122" G="18" B="225" A="255"/>
-	<Vtx X="285" Y="432" Z="-175" S="117" T="-81" R="89" G="73" B="54" A="255"/>
-	<Vtx X="307" Y="432" Z="-175" S="111" T="-81" R="121" G="37" B="249" A="255"/>
-	<Vtx X="285" Y="349" Z="-349" S="117" T="-17" R="78" G="230" B="159" A="255"/>
-	<Vtx X="307" Y="457" Z="0" S="111" T="-145" R="123" G="32" B="0" A="255"/>
-	<Vtx X="307" Y="432" Z="175" S="111" T="-81" R="121" G="37" B="7" A="255"/>
-	<Vtx X="285" Y="432" Z="175" S="117" T="-81" R="89" G="73" B="202" A="255"/>
-	<Vtx X="173" Y="432" Z="175" S="147" T="-81" R="198" G="112" B="17" A="255"/>
-	<Vtx X="173" Y="457" Z="0" S="147" T="-145" R="217" G="121" B="0" A="255"/>
-	<Vtx X="173" Y="432" Z="-175" S="147" T="-81" R="198" G="112" B="239" A="255"/>
-	<Vtx X="0" Y="356" Z="0" S="239" T="-145" R="167" G="91" B="0" A="255"/>
-	<Vtx X="0" Y="336" Z="185" S="239" T="-81" R="159" G="78" B="25" A="255"/>
-	<Vtx X="-40" Y="222" Z="0" S="111" T="-145" R="133" G="32" B="0" A="255"/>
-	<Vtx X="-40" Y="212" Z="92" S="111" T="-113" R="132" G="23" B="12" A="255"/>
-	<Vtx X="-67" Y="68" Z="0" S="-17" T="-145" R="129" G="0" B="0" A="255"/>
-	<Vtx X="-40" Y="212" Z="-92" S="111" T="-113" R="132" G="23" B="244" A="255"/>
-	<Vtx X="-67" Y="68" Z="0" S="-17" T="-145" R="129" G="0" B="0" A="255"/>
-	<Vtx X="-40" Y="212" Z="-92" S="111" T="-113" R="132" G="23" B="244" A="255"/>
-	<Vtx X="-40" Y="122" Z="-185" S="15" T="-17" R="131" G="11" B="236" A="255"/>
-	<Vtx X="-40" Y="47" Z="-181" S="-17" T="-17" R="131" G="249" B="232" A="255"/>
-	<Vtx X="0" Y="155" Z="-370" S="47" T="111" R="161" G="18" B="174" A="255"/>
-	<Vtx X="0" Y="7" Z="-362" S="-17" T="111" R="175" G="227" B="162" A="255"/>
-	<Vtx X="173" Y="0" Z="-407" S="-17" T="19" R="239" G="218" B="136" A="255"/>
-	<Vtx X="173" Y="195" Z="-418" S="47" T="19" R="236" G="20" B="132" A="255"/>
-	<Vtx X="307" Y="195" Z="-418" S="47" T="-17" R="125" G="4" B="232" A="255"/>
-	<Vtx X="307" Y="0" Z="-407" S="-17" T="-17" R="120" G="244" B="216" A="255"/>
-	<Vtx X="307" Y="-175" Z="-301" S="-81" T="-17" R="121" G="250" B="218" A="255"/>
-	<Vtx X="307" Y="77" Z="-219" S="-4" T="-71" R="127" G="0" B="0" A="255"/>
-	<Vtx X="307" Y="145" Z="-240" S="23" T="-65" R="127" G="0" B="0" A="255"/>
-	<Vtx X="307" Y="216" Z="-211" S="45" T="-73" R="127" G="0" B="0" A="255"/>
-	<Vtx X="308" Y="240" Z="-141" S="49" T="-96" R="127" G="0" B="0" A="255"/>
-	<Vtx X="307" Y="432" Z="-175" S="111" T="-81" R="121" G="37" B="249" A="255"/>
-	<Vtx X="308" Y="214" Z="-75" S="35" T="-119" R="127" G="0" B="0" A="255"/>
-	<Vtx X="308" Y="240" Z="-141" S="49" T="-96" R="127" G="0" B="0" A="255"/>
-	<Vtx X="307" Y="432" Z="-175" S="111" T="-81" R="121" G="37" B="249" A="255"/>
-	<Vtx X="308" Y="214" Z="75" S="35" T="-119" R="127" G="0" B="0" A="255"/>
-	<Vtx X="308" Y="240" Z="141" S="49" T="-96" R="127" G="0" B="0" A="255"/>
-	<Vtx X="307" Y="195" Z="418" S="47" T="-17" R="125" G="4" B="24" A="255"/>
-	<Vtx X="307" Y="432" Z="175" S="111" T="-81" R="121" G="37" B="7" A="255"/>
-	<Vtx X="307" Y="349" Z="349" S="111" T="-17" R="122" G="18" B="31" A="255"/>
-	<Vtx X="285" Y="432" Z="175" S="117" T="-81" R="89" G="73" B="202" A="255"/>
-	<Vtx X="285" Y="349" Z="349" S="117" T="-17" R="78" G="230" B="97" A="255"/>
-	<Vtx X="285" Y="349" Z="349" S="111" T="-11" R="78" G="230" B="97" A="255"/>
-	<Vtx X="173" Y="349" Z="349" S="111" T="19" R="202" G="69" B="92" A="255"/>
-	<Vtx X="173" Y="195" Z="418" S="47" T="19" R="236" G="20" B="124" A="255"/>
-	<Vtx X="0" Y="155" Z="370" S="47" T="111" R="161" G="18" B="82" A="255"/>
-	<Vtx X="0" Y="273" Z="318" S="111" T="111" R="167" G="65" B="63" A="255"/>
-	<Vtx X="-40" Y="122" Z="185" S="15" T="-17" R="131" G="11" B="20" A="255"/>
-	<Vtx X="-40" Y="122" Z="185" S="15" T="-17" R="131" G="11" B="20" A="255"/>
-	<Vtx X="0" Y="273" Z="318" S="111" T="111" R="167" G="65" B="63" A="255"/>
-	<Vtx X="0" Y="336" Z="185" S="239" T="-81" R="159" G="78" B="25" A="255"/>
-	<Vtx X="-40" Y="212" Z="92" S="111" T="-113" R="132" G="23" B="12" A="255"/>
-	<Vtx X="-67" Y="68" Z="0" S="-17" T="-145" R="129" G="0" B="0" A="255"/>
-	<Vtx X="-40" Y="47" Z="181" S="-17" T="-17" R="131" G="249" B="24" A="255"/>
-	<Vtx X="-40" Y="-19" Z="141" S="-49" T="-17" R="131" G="238" B="14" A="255"/>
-	<Vtx X="-40" Y="-23" Z="92" S="-145" T="-113" R="132" G="236" B="20" A="255"/>
-	<Vtx X="-40" Y="-155" Z="0" S="-145" T="-145" R="130" G="237" B="0" A="255"/>
-	<Vtx X="-40" Y="-23" Z="-92" S="-145" T="-113" R="132" G="236" B="236" A="255"/>
-	<Vtx X="-40" Y="-19" Z="-141" S="-49" T="-17" R="131" G="238" B="242" A="255"/>
-	<Vtx X="-40" Y="47" Z="-181" S="-17" T="-17" R="131" G="249" B="232" A="255"/>
-	<Vtx X="0" Y="-126" Z="-282" S="-81" T="111" R="180" G="232" B="157" A="255"/>
-	<Vtx X="0" Y="7" Z="-362" S="-17" T="111" R="175" G="227" B="162" A="255"/>
-	<Vtx X="173" Y="0" Z="-407" S="-17" T="19" R="239" G="218" B="136" A="255"/>
-	<Vtx X="173" Y="-175" Z="-301" S="-81" T="19" R="246" G="236" B="131" A="255"/>
-	<Vtx X="173" Y="-175" Z="-301" S="-81" T="19" R="246" G="236" B="131" A="255"/>
-	<Vtx X="173" Y="0" Z="-407" S="-17" T="19" R="239" G="218" B="136" A="255"/>
-	<Vtx X="307" Y="0" Z="-407" S="-17" T="-17" R="120" G="244" B="216" A="255"/>
-	<Vtx X="307" Y="-175" Z="-301" S="-81" T="-17" R="121" G="250" B="218" A="255"/>
-	<Vtx X="173" Y="-349" Z="-349" S="-145" T="19" R="222" G="134" B="246" A="255"/>
-	<Vtx X="307" Y="-349" Z="-349" S="-145" T="-17" R="126" G="242" B="255" A="255"/>
-	<Vtx X="307" Y="-186" Z="-175" S="-145" T="-81" R="120" G="219" B="237" A="255"/>
-	<Vtx X="307" Y="77" Z="-219" S="-4" T="-71" R="127" G="0" B="0" A="255"/>
-	<Vtx X="308" Y="45" Z="-143" S="-21" T="-99" R="127" G="0" B="0" A="255"/>
-	<Vtx X="309" Y="78" Z="-69" S="-8" T="-121" R="127" G="0" B="0" A="255"/>
-	<Vtx X="309" Y="-109" Z="-59" S="-59" T="-133" R="127" G="0" B="2" A="255"/>
-	<Vtx X="309" Y="144" Z="-50" S="13" T="-127" R="127" G="0" B="0" A="255"/>
-	<Vtx X="309" Y="49" Z="0" S="-26" T="-145" R="127" G="0" B="0" A="255"/>
-	<Vtx X="308" Y="214" Z="-75" S="35" T="-119" R="127" G="0" B="0" A="255"/>
-	<Vtx X="308" Y="214" Z="75" S="35" T="-119" R="127" G="0" B="0" A="255"/>
-	<Vtx X="309" Y="144" Z="50" S="13" T="-127" R="127" G="0" B="0" A="255"/>
-	<Vtx X="309" Y="-109" Z="59" S="-59" T="-133" R="127" G="0" B="254" A="255"/>
-	<Vtx X="309" Y="49" Z="0" S="-26" T="-145" R="127" G="0" B="0" A="255"/>
-	<Vtx X="309" Y="144" Z="50" S="13" T="-127" R="127" G="0" B="0" A="255"/>
-	<Vtx X="309" Y="78" Z="69" S="-8" T="-121" R="127" G="0" B="0" A="255"/>
-	<Vtx X="308" Y="45" Z="143" S="-21" T="-99" R="127" G="0" B="0" A="255"/>
-	<Vtx X="307" Y="0" Z="407" S="-17" T="-17" R="120" G="244" B="40" A="255"/>
-	<Vtx X="307" Y="77" Z="219" S="-4" T="-71" R="127" G="0" B="0" A="255"/>
-	<Vtx X="307" Y="145" Z="240" S="23" T="-65" R="127" G="0" B="0" A="255"/>
-	<Vtx X="307" Y="195" Z="418" S="47" T="-17" R="125" G="4" B="24" A="255"/>
-	<Vtx X="307" Y="216" Z="211" S="45" T="-73" R="127" G="0" B="0" A="255"/>
-	<Vtx X="308" Y="240" Z="141" S="49" T="-96" R="127" G="0" B="0" A="255"/>
-	<Vtx X="173" Y="0" Z="407" S="-17" T="19" R="239" G="218" B="120" A="255"/>
-	<Vtx X="173" Y="-175" Z="301" S="-81" T="19" R="246" G="236" B="125" A="255"/>
-	<Vtx X="0" Y="-126" Z="282" S="-81" T="111" R="180" G="232" B="99" A="255"/>
-	<Vtx X="0" Y="7" Z="362" S="-17" T="111" R="175" G="227" B="94" A="255"/>
-	<Vtx X="0" Y="155" Z="370" S="47" T="111" R="161" G="18" B="82" A="255"/>
-	<Vtx X="0" Y="155" Z="370" S="47" T="111" R="161" G="18" B="82" A="255"/>
-	<Vtx X="173" Y="0" Z="407" S="-17" T="19" R="239" G="218" B="120" A="255"/>
-	<Vtx X="173" Y="195" Z="418" S="47" T="19" R="236" G="20" B="124" A="255"/>
-	<Vtx X="307" Y="195" Z="418" S="47" T="-17" R="125" G="4" B="24" A="255"/>
-	<Vtx X="-40" Y="47" Z="181" S="-17" T="-17" R="131" G="249" B="24" A="255"/>
-	<Vtx X="0" Y="7" Z="362" S="-17" T="111" R="175" G="227" B="94" A="255"/>
-	<Vtx X="-40" Y="122" Z="185" S="15" T="-17" R="131" G="11" B="20" A="255"/>
-	<Vtx X="0" Y="-126" Z="282" S="-81" T="111" R="180" G="232" B="99" A="255"/>
-	<Vtx X="-40" Y="-19" Z="141" S="-49" T="-17" R="131" G="238" B="14" A="255"/>
-	<Vtx X="0" Y="-260" Z="318" S="-273" T="-17" R="160" G="173" B="7" A="255"/>
-	<Vtx X="0" Y="-135" Z="185" S="-273" T="-81" R="167" G="176" B="43" A="255"/>
-	<Vtx X="-40" Y="-23" Z="92" S="-145" T="-113" R="132" G="236" B="20" A="255"/>
-	<Vtx X="0" Y="-398" Z="0" S="-273" T="-145" R="155" G="179" B="0" A="255"/>
-	<Vtx X="-40" Y="-155" Z="0" S="-145" T="-145" R="130" G="237" B="0" A="255"/>
-	<Vtx X="-40" Y="-23" Z="-92" S="-145" T="-113" R="132" G="236" B="236" A="255"/>
-	<Vtx X="0" Y="-135" Z="-185" S="-273" T="-81" R="167" G="176" B="213" A="255"/>
-	<Vtx X="0" Y="-260" Z="-318" S="-273" T="-17" R="160" G="173" B="249" A="255"/>
-	<Vtx X="0" Y="-135" Z="-185" S="-273" T="-81" R="167" G="176" B="213" A="255"/>
-	<Vtx X="-40" Y="-23" Z="-92" S="-145" T="-113" R="132" G="236" B="236" A="255"/>
-	<Vtx X="-40" Y="-19" Z="-141" S="-49" T="-17" R="131" G="238" B="242" A="255"/>
-	<Vtx X="0" Y="-126" Z="-282" S="-81" T="111" R="180" G="232" B="157" A="255"/>
-	<Vtx X="173" Y="-186" Z="-175" S="-180" T="-81" R="230" G="144" B="201" A="255"/>
-	<Vtx X="173" Y="-349" Z="-349" S="-180" T="-17" R="222" G="134" B="246" A="255"/>
-	<Vtx X="307" Y="-186" Z="-175" S="-145" T="-81" R="120" G="219" B="237" A="255"/>
-	<Vtx X="307" Y="-349" Z="-349" S="-145" T="-17" R="126" G="242" B="255" A="255"/>
-	<Vtx X="307" Y="-531" Z="0" S="-145" T="-145" R="126" G="237" B="0" A="255"/>
-	<Vtx X="307" Y="-90" Z="0" S="-59" T="-145" R="127" G="1" B="0" A="255"/>
-	<Vtx X="309" Y="-109" Z="-59" S="-59" T="-133" R="127" G="0" B="2" A="255"/>
-	<Vtx X="307" Y="-186" Z="175" S="-145" T="-81" R="120" G="219" B="19" A="255"/>
-	<Vtx X="173" Y="-186" Z="175" S="-180" T="-81" R="230" G="144" B="55" A="255"/>
-	<Vtx X="173" Y="-349" Z="349" S="-180" T="-17" R="222" G="134" B="10" A="255"/>
-	<Vtx X="307" Y="-349" Z="349" S="-145" T="-17" R="126" G="242" B="1" A="255"/>
-	<Vtx X="307" Y="-175" Z="301" S="-81" T="-17" R="121" G="250" B="38" A="255"/>
-	<Vtx X="307" Y="-349" Z="349" S="-145" T="-17" R="126" G="242" B="1" A="255"/>
-	<Vtx X="307" Y="-186" Z="175" S="-145" T="-81" R="120" G="219" B="19" A="255"/>
-	<Vtx X="307" Y="0" Z="407" S="-17" T="-17" R="120" G="244" B="40" A="255"/>
-	<Vtx X="309" Y="-109" Z="59" S="-59" T="-133" R="127" G="0" B="254" A="255"/>
-	<Vtx X="307" Y="-90" Z="0" S="-59" T="-145" R="127" G="1" B="0" A="255"/>
-	<Vtx X="173" Y="-175" Z="301" S="-81" T="19" R="246" G="236" B="125" A="255"/>
-	<Vtx X="173" Y="-349" Z="349" S="-145" T="19" R="222" G="134" B="10" A="255"/>
-	<Vtx X="0" Y="-260" Z="318" S="-145" T="111" R="160" G="173" B="7" A="255"/>
-	<Vtx X="0" Y="-126" Z="282" S="-81" T="111" R="180" G="232" B="99" A="255"/>
-	<Vtx X="0" Y="-260" Z="-318" S="-145" T="111" R="160" G="173" B="249" A="255"/>
-	<Vtx X="0" Y="-126" Z="-282" S="-81" T="111" R="180" G="232" B="157" A="255"/>
-	<Vtx X="173" Y="-175" Z="-301" S="-81" T="19" R="246" G="236" B="131" A="255"/>
-	<Vtx X="173" Y="-349" Z="-349" S="-145" T="19" R="222" G="134" B="246" A="255"/>
-	<Vtx X="173" Y="349" Z="349" S="147" T="-17" R="202" G="69" B="92" A="255"/>
-	<Vtx X="0" Y="336" Z="185" S="239" T="-81" R="159" G="78" B="25" A="255"/>
-	<Vtx X="0" Y="273" Z="318" S="239" T="-17" R="167" G="65" B="63" A="255"/>
-	<Vtx X="173" Y="432" Z="175" S="147" T="-81" R="198" G="112" B="17" A="255"/>
-	<Vtx X="0" Y="-260" Z="318" S="-273" T="-17" R="160" G="173" B="7" A="255"/>
-	<Vtx X="173" Y="-186" Z="175" S="-180" T="-81" R="230" G="144" B="55" A="255"/>
-	<Vtx X="173" Y="-349" Z="349" S="-180" T="-17" R="222" G="134" B="10" A="255"/>
-	<Vtx X="0" Y="-135" Z="185" S="-273" T="-81" R="167" G="176" B="43" A="255"/>
-	<Vtx X="173" Y="-531" Z="0" S="-180" T="-145" R="223" G="133" B="0" A="255"/>
-	<Vtx X="0" Y="-398" Z="0" S="-273" T="-145" R="155" G="179" B="0" A="255"/>
-	<Vtx X="0" Y="-135" Z="-185" S="-273" T="-81" R="167" G="176" B="213" A="255"/>
-	<Vtx X="173" Y="-186" Z="-175" S="-180" T="-81" R="230" G="144" B="201" A="255"/>
-	<Vtx X="307" Y="-531" Z="0" S="-145" T="-145" R="126" G="237" B="0" A="255"/>
+	<Vtx X="18" Y="17" Z="0" S="147" T="-17" R="87" G="69" B="194" A="255"/>
+	<Vtx X="16" Y="14" Z="-8" S="239" T="-17" R="55" G="65" B="161" A="255"/>
+	<Vtx X="9" Y="17" Z="-8" S="239" T="-81" R="16" G="78" B="157" A="255"/>
+	<Vtx X="9" Y="22" Z="1" S="147" T="-81" R="12" G="111" B="196" A="255"/>
+	<Vtx X="0" Y="18" Z="-7" S="239" T="-145" R="249" G="91" B="167" A="255"/>
+	<Vtx X="0" Y="11" Z="-9" S="111" T="-145" R="246" G="32" B="133" A="255"/>
+	<Vtx X="4" Y="11" Z="-9" S="111" T="-113" R="1" G="23" B="131" A="255"/>
+	<Vtx X="9" Y="6" Z="-10" S="15" T="-17" R="9" G="11" B="130" A="255"/>
+	<Vtx X="18" Y="8" Z="-8" S="47" T="111" R="74" G="18" B="154" A="255"/>
+	<Vtx X="16" Y="14" Z="-8" S="111" T="111" R="55" G="65" B="161" A="255"/>
+	<Vtx X="18" Y="17" Z="0" S="111" T="19" R="87" G="69" B="194" A="255"/>
+	<Vtx X="22" Y="10" Z="0" S="47" T="19" R="122" G="20" B="225" A="255"/>
+	<Vtx X="22" Y="10" Z="7" S="47" T="-17" R="35" G="4" B="122" A="255"/>
+	<Vtx X="19" Y="17" Z="7" S="111" T="-17" R="41" G="18" B="119" A="255"/>
+	<Vtx X="19" Y="17" Z="6" S="111" T="-11" R="103" G="230" B="69" A="255"/>
+	<Vtx X="10" Y="22" Z="8" S="111" T="-81" R="18" G="37" B="120" A="255"/>
+	<Vtx X="19" Y="17" Z="7" S="111" T="-17" R="41" G="18" B="119" A="255"/>
+	<Vtx X="10" Y="22" Z="7" S="117" T="-81" R="210" G="73" B="94" A="255"/>
+	<Vtx X="10" Y="22" Z="8" S="111" T="-81" R="18" G="37" B="120" A="255"/>
+	<Vtx X="19" Y="17" Z="6" S="117" T="-17" R="103" G="230" B="69" A="255"/>
+	<Vtx X="1" Y="23" Z="9" S="111" T="-145" R="10" G="32" B="123" A="255"/>
+	<Vtx X="-7" Y="22" Z="9" S="111" T="-81" R="3" G="37" B="122" A="255"/>
+	<Vtx X="-7" Y="22" Z="8" S="117" T="-81" R="62" G="73" B="84" A="255"/>
+	<Vtx X="-8" Y="22" Z="3" S="147" T="-81" R="234" G="112" B="200" A="255"/>
+	<Vtx X="1" Y="23" Z="2" S="147" T="-145" R="253" G="121" B="217" A="255"/>
+	<Vtx X="9" Y="22" Z="1" S="147" T="-81" R="12" G="111" B="196" A="255"/>
+	<Vtx X="0" Y="18" Z="-7" S="239" T="-145" R="249" G="91" B="167" A="255"/>
+	<Vtx X="-9" Y="17" Z="-6" S="239" T="-81" R="222" G="78" B="161" A="255"/>
+	<Vtx X="0" Y="11" Z="-9" S="111" T="-145" R="246" G="32" B="133" A="255"/>
+	<Vtx X="-5" Y="11" Z="-8" S="111" T="-113" R="233" G="23" B="133" A="255"/>
+	<Vtx X="0" Y="3" Z="-10" S="-17" T="-145" R="245" G="0" B="129" A="255"/>
+	<Vtx X="4" Y="11" Z="-9" S="111" T="-113" R="1" G="23" B="131" A="255"/>
+	<Vtx X="0" Y="3" Z="-10" S="-17" T="-145" R="245" G="0" B="129" A="255"/>
+	<Vtx X="4" Y="11" Z="-9" S="111" T="-113" R="1" G="23" B="131" A="255"/>
+	<Vtx X="9" Y="6" Z="-10" S="15" T="-17" R="9" G="11" B="130" A="255"/>
+	<Vtx X="9" Y="2" Z="-10" S="-17" T="-17" R="13" G="249" B="130" A="255"/>
+	<Vtx X="18" Y="8" Z="-8" S="47" T="111" R="74" G="18" B="154" A="255"/>
+	<Vtx X="18" Y="0" Z="-8" S="-17" T="111" R="86" G="227" B="167" A="255"/>
+	<Vtx X="21" Y="0" Z="0" S="-17" T="19" R="118" G="218" B="229" A="255"/>
+	<Vtx X="22" Y="10" Z="0" S="47" T="19" R="122" G="20" B="225" A="255"/>
+	<Vtx X="22" Y="10" Z="7" S="47" T="-17" R="35" G="4" B="122" A="255"/>
+	<Vtx X="22" Y="0" Z="7" S="-17" T="-17" R="50" G="244" B="116" A="255"/>
+	<Vtx X="16" Y="-9" Z="7" S="-81" T="-17" R="48" G="250" B="118" A="255"/>
+	<Vtx X="12" Y="4" Z="8" S="-4" T="-71" R="11" G="0" B="127" A="255"/>
+	<Vtx X="13" Y="7" Z="7" S="23" T="-65" R="11" G="0" B="127" A="255"/>
+	<Vtx X="12" Y="11" Z="8" S="45" T="-73" R="11" G="0" B="127" A="255"/>
+	<Vtx X="8" Y="12" Z="8" S="49" T="-96" R="11" G="0" B="127" A="255"/>
+	<Vtx X="10" Y="22" Z="8" S="111" T="-81" R="18" G="37" B="120" A="255"/>
+	<Vtx X="5" Y="11" Z="8" S="35" T="-119" R="11" G="0" B="127" A="255"/>
+	<Vtx X="8" Y="12" Z="8" S="49" T="-96" R="11" G="0" B="127" A="255"/>
+	<Vtx X="10" Y="22" Z="8" S="111" T="-81" R="18" G="37" B="120" A="255"/>
+	<Vtx X="-2" Y="11" Z="9" S="35" T="-119" R="10" G="0" B="127" A="255"/>
+	<Vtx X="-6" Y="12" Z="9" S="49" T="-96" R="10" G="0" B="127" A="255"/>
+	<Vtx X="-19" Y="10" Z="10" S="47" T="-17" R="243" G="4" B="126" A="255"/>
+	<Vtx X="-7" Y="22" Z="9" S="111" T="-81" R="3" G="37" B="122" A="255"/>
+	<Vtx X="-16" Y="17" Z="10" S="111" T="-17" R="236" G="18" B="124" A="255"/>
+	<Vtx X="-7" Y="22" Z="8" S="117" T="-81" R="62" G="73" B="84" A="255"/>
+	<Vtx X="-16" Y="17" Z="9" S="117" T="-17" R="166" G="230" B="86" A="255"/>
+	<Vtx X="-16" Y="17" Z="9" S="111" T="-11" R="166" G="230" B="86" A="255"/>
+	<Vtx X="-17" Y="17" Z="3" S="111" T="19" R="159" G="69" B="210" A="255"/>
+	<Vtx X="-20" Y="10" Z="4" S="47" T="19" R="131" G="20" B="247" A="255"/>
+	<Vtx X="-18" Y="8" Z="-5" S="47" T="111" R="166" G="18" B="168" A="255"/>
+	<Vtx X="-16" Y="14" Z="-5" S="111" T="111" R="185" G="65" B="172" A="255"/>
+	<Vtx X="-9" Y="6" Z="-8" S="15" T="-17" R="225" G="11" B="133" A="255"/>
+	<Vtx X="-9" Y="6" Z="-8" S="15" T="-17" R="225" G="11" B="133" A="255"/>
+	<Vtx X="-16" Y="14" Z="-5" S="111" T="111" R="185" G="65" B="172" A="255"/>
+	<Vtx X="-9" Y="17" Z="-6" S="239" T="-81" R="222" G="78" B="161" A="255"/>
+	<Vtx X="-5" Y="11" Z="-8" S="111" T="-113" R="233" G="23" B="133" A="255"/>
+	<Vtx X="0" Y="3" Z="-10" S="-17" T="-145" R="245" G="0" B="129" A="255"/>
+	<Vtx X="-9" Y="2" Z="-8" S="-17" T="-17" R="222" G="249" B="134" A="255"/>
+	<Vtx X="-7" Y="-1" Z="-8" S="-49" T="-17" R="231" G="238" B="133" A="255"/>
+	<Vtx X="-5" Y="-1" Z="-8" S="-145" T="-113" R="225" G="236" B="134" A="255"/>
+	<Vtx X="0" Y="-8" Z="-9" S="-145" T="-145" R="245" G="237" B="131" A="255"/>
+	<Vtx X="4" Y="-1" Z="-9" S="-145" T="-113" R="9" G="236" B="131" A="255"/>
+	<Vtx X="7" Y="-1" Z="-9" S="-49" T="-17" R="3" G="238" B="130" A="255"/>
+	<Vtx X="9" Y="2" Z="-10" S="-17" T="-17" R="13" G="249" B="130" A="255"/>
+	<Vtx X="14" Y="-6" Z="-8" S="-81" T="111" R="92" G="232" B="171" A="255"/>
+	<Vtx X="18" Y="0" Z="-8" S="-17" T="111" R="86" G="227" B="167" A="255"/>
+	<Vtx X="21" Y="0" Z="0" S="-17" T="19" R="118" G="218" B="229" A="255"/>
+	<Vtx X="16" Y="-9" Z="1" S="-81" T="19" R="124" G="236" B="235" A="255"/>
+	<Vtx X="16" Y="-9" Z="1" S="-81" T="19" R="124" G="236" B="235" A="255"/>
+	<Vtx X="21" Y="0" Z="0" S="-17" T="19" R="118" G="218" B="229" A="255"/>
+	<Vtx X="22" Y="0" Z="7" S="-17" T="-17" R="50" G="244" B="116" A="255"/>
+	<Vtx X="16" Y="-9" Z="7" S="-81" T="-17" R="48" G="250" B="118" A="255"/>
+	<Vtx X="18" Y="-17" Z="0" S="-145" T="19" R="7" G="134" B="221" A="255"/>
+	<Vtx X="19" Y="-17" Z="7" S="-145" T="-17" R="12" G="242" B="126" A="255"/>
+	<Vtx X="10" Y="-9" Z="8" S="-145" T="-81" R="30" G="219" B="118" A="255"/>
+	<Vtx X="12" Y="4" Z="8" S="-4" T="-71" R="11" G="0" B="127" A="255"/>
+	<Vtx X="8" Y="2" Z="8" S="-21" T="-99" R="11" G="0" B="127" A="255"/>
+	<Vtx X="5" Y="4" Z="8" S="-8" T="-121" R="11" G="0" B="127" A="255"/>
+	<Vtx X="4" Y="-5" Z="8" S="-59" T="-133" R="8" G="0" B="127" A="255"/>
+	<Vtx X="4" Y="7" Z="8" S="13" T="-127" R="11" G="0" B="127" A="255"/>
+	<Vtx X="1" Y="2" Z="9" S="-26" T="-145" R="11" G="0" B="127" A="255"/>
+	<Vtx X="5" Y="11" Z="8" S="35" T="-119" R="11" G="0" B="127" A="255"/>
+	<Vtx X="-2" Y="11" Z="9" S="35" T="-119" R="10" G="0" B="127" A="255"/>
+	<Vtx X="-1" Y="7" Z="9" S="13" T="-127" R="10" G="0" B="127" A="255"/>
+	<Vtx X="-2" Y="-5" Z="9" S="-59" T="-133" R="14" G="0" B="126" A="255"/>
+	<Vtx X="1" Y="2" Z="9" S="-26" T="-145" R="11" G="0" B="127" A="255"/>
+	<Vtx X="-1" Y="7" Z="9" S="13" T="-127" R="10" G="0" B="127" A="255"/>
+	<Vtx X="-2" Y="4" Z="9" S="-8" T="-121" R="10" G="0" B="127" A="255"/>
+	<Vtx X="-6" Y="2" Z="9" S="-21" T="-99" R="10" G="0" B="127" A="255"/>
+	<Vtx X="-19" Y="0" Z="10" S="-17" T="-17" R="227" G="244" B="123" A="255"/>
+	<Vtx X="-10" Y="4" Z="9" S="-4" T="-71" R="10" G="0" B="127" A="255"/>
+	<Vtx X="-11" Y="7" Z="10" S="23" T="-65" R="10" G="0" B="127" A="255"/>
+	<Vtx X="-19" Y="10" Z="10" S="47" T="-17" R="243" G="4" B="126" A="255"/>
+	<Vtx X="-9" Y="11" Z="9" S="45" T="-73" R="10" G="0" B="127" A="255"/>
+	<Vtx X="-6" Y="12" Z="9" S="49" T="-96" R="10" G="0" B="127" A="255"/>
+	<Vtx X="-19" Y="0" Z="4" S="-17" T="19" R="135" G="218" B="250" A="255"/>
+	<Vtx X="-14" Y="-9" Z="3" S="-81" T="19" R="131" G="236" B="0" A="255"/>
+	<Vtx X="-14" Y="-6" Z="-6" S="-81" T="111" R="151" G="232" B="189" A="255"/>
+	<Vtx X="-18" Y="0" Z="-5" S="-17" T="111" R="156" G="227" B="183" A="255"/>
+	<Vtx X="-18" Y="8" Z="-5" S="47" T="111" R="166" G="18" B="168" A="255"/>
+	<Vtx X="-18" Y="8" Z="-5" S="47" T="111" R="166" G="18" B="168" A="255"/>
+	<Vtx X="-19" Y="0" Z="4" S="-17" T="19" R="135" G="218" B="250" A="255"/>
+	<Vtx X="-20" Y="10" Z="4" S="47" T="19" R="131" G="20" B="247" A="255"/>
+	<Vtx X="-19" Y="10" Z="10" S="47" T="-17" R="243" G="4" B="126" A="255"/>
+	<Vtx X="-9" Y="2" Z="-8" S="-17" T="-17" R="222" G="249" B="134" A="255"/>
+	<Vtx X="-18" Y="0" Z="-5" S="-17" T="111" R="156" G="227" B="183" A="255"/>
+	<Vtx X="-9" Y="6" Z="-8" S="15" T="-17" R="225" G="11" B="133" A="255"/>
+	<Vtx X="-14" Y="-6" Z="-6" S="-81" T="111" R="151" G="232" B="189" A="255"/>
+	<Vtx X="-7" Y="-1" Z="-8" S="-49" T="-17" R="231" G="238" B="133" A="255"/>
+	<Vtx X="-16" Y="-13" Z="-5" S="-273" T="-17" R="241" G="173" B="161" A="255"/>
+	<Vtx X="-9" Y="-7" Z="-6" S="-273" T="-81" R="205" G="176" B="171" A="255"/>
+	<Vtx X="-5" Y="-1" Z="-8" S="-145" T="-113" R="225" G="236" B="134" A="255"/>
+	<Vtx X="0" Y="-20" Z="-7" S="-273" T="-145" R="248" G="179" B="155" A="255"/>
+	<Vtx X="0" Y="-8" Z="-9" S="-145" T="-145" R="245" G="237" B="131" A="255"/>
+	<Vtx X="4" Y="-1" Z="-9" S="-145" T="-113" R="9" G="236" B="131" A="255"/>
+	<Vtx X="9" Y="-7" Z="-8" S="-273" T="-81" R="35" G="176" B="164" A="255"/>
+	<Vtx X="16" Y="-13" Z="-8" S="-273" T="-17" R="255" G="173" B="160" A="255"/>
+	<Vtx X="9" Y="-7" Z="-8" S="-273" T="-81" R="35" G="176" B="164" A="255"/>
+	<Vtx X="4" Y="-1" Z="-9" S="-145" T="-113" R="9" G="236" B="131" A="255"/>
+	<Vtx X="7" Y="-1" Z="-9" S="-49" T="-17" R="3" G="238" B="130" A="255"/>
+	<Vtx X="14" Y="-6" Z="-8" S="-81" T="111" R="92" G="232" B="171" A="255"/>
+	<Vtx X="9" Y="-9" Z="1" S="-180" T="-81" R="53" G="144" B="226" A="255"/>
+	<Vtx X="18" Y="-17" Z="0" S="-180" T="-17" R="7" G="134" B="221" A="255"/>
+	<Vtx X="10" Y="-9" Z="8" S="-145" T="-81" R="30" G="219" B="118" A="255"/>
+	<Vtx X="19" Y="-17" Z="7" S="-145" T="-17" R="12" G="242" B="126" A="255"/>
+	<Vtx X="1" Y="-27" Z="9" S="-145" T="-145" R="11" G="237" B="125" A="255"/>
+	<Vtx X="1" Y="-4" Z="9" S="-59" T="-145" R="11" G="1" B="127" A="255"/>
+	<Vtx X="4" Y="-5" Z="8" S="-59" T="-133" R="8" G="0" B="127" A="255"/>
+	<Vtx X="-7" Y="-9" Z="9" S="-145" T="-81" R="247" G="219" B="121" A="255"/>
+	<Vtx X="-8" Y="-9" Z="3" S="-180" T="-81" R="199" G="144" B="235" A="255"/>
+	<Vtx X="-17" Y="-17" Z="3" S="-180" T="-17" R="243" G="134" B="223" A="255"/>
+	<Vtx X="-16" Y="-17" Z="10" S="-145" T="-17" R="9" G="242" B="126" A="255"/>
+	<Vtx X="-14" Y="-9" Z="10" S="-81" T="-17" R="229" G="250" B="124" A="255"/>
+	<Vtx X="-16" Y="-17" Z="10" S="-145" T="-17" R="9" G="242" B="126" A="255"/>
+	<Vtx X="-7" Y="-9" Z="9" S="-145" T="-81" R="247" G="219" B="121" A="255"/>
+	<Vtx X="-19" Y="0" Z="10" S="-17" T="-17" R="227" G="244" B="123" A="255"/>
+	<Vtx X="-2" Y="-5" Z="9" S="-59" T="-133" R="14" G="0" B="126" A="255"/>
+	<Vtx X="1" Y="-4" Z="9" S="-59" T="-145" R="11" G="1" B="127" A="255"/>
+	<Vtx X="-14" Y="-9" Z="3" S="-81" T="19" R="131" G="236" B="0" A="255"/>
+	<Vtx X="-17" Y="-17" Z="3" S="-145" T="19" R="243" G="134" B="223" A="255"/>
+	<Vtx X="-16" Y="-13" Z="-5" S="-145" T="111" R="241" G="173" B="161" A="255"/>
+	<Vtx X="-14" Y="-6" Z="-6" S="-81" T="111" R="151" G="232" B="189" A="255"/>
+	<Vtx X="16" Y="-13" Z="-8" S="-145" T="111" R="255" G="173" B="160" A="255"/>
+	<Vtx X="14" Y="-6" Z="-8" S="-81" T="111" R="92" G="232" B="171" A="255"/>
+	<Vtx X="16" Y="-9" Z="1" S="-81" T="19" R="124" G="236" B="235" A="255"/>
+	<Vtx X="18" Y="-17" Z="0" S="-145" T="19" R="7" G="134" B="221" A="255"/>
+	<Vtx X="-17" Y="17" Z="3" S="147" T="-17" R="159" G="69" B="210" A="255"/>
+	<Vtx X="-9" Y="17" Z="-6" S="239" T="-81" R="222" G="78" B="161" A="255"/>
+	<Vtx X="-16" Y="14" Z="-5" S="239" T="-17" R="185" G="65" B="172" A="255"/>
+	<Vtx X="-8" Y="22" Z="3" S="147" T="-81" R="234" G="112" B="200" A="255"/>
+	<Vtx X="-16" Y="-13" Z="-5" S="-273" T="-17" R="241" G="173" B="161" A="255"/>
+	<Vtx X="-8" Y="-9" Z="3" S="-180" T="-81" R="199" G="144" B="235" A="255"/>
+	<Vtx X="-17" Y="-17" Z="3" S="-180" T="-17" R="243" G="134" B="223" A="255"/>
+	<Vtx X="-9" Y="-7" Z="-6" S="-273" T="-81" R="205" G="176" B="171" A="255"/>
+	<Vtx X="1" Y="-27" Z="2" S="-180" T="-145" R="254" G="133" B="223" A="255"/>
+	<Vtx X="0" Y="-20" Z="-7" S="-273" T="-145" R="248" G="179" B="155" A="255"/>
+	<Vtx X="9" Y="-7" Z="-8" S="-273" T="-81" R="35" G="176" B="164" A="255"/>
+	<Vtx X="9" Y="-9" Z="1" S="-180" T="-81" R="53" G="144" B="226" A="255"/>
+	<Vtx X="1" Y="-27" Z="9" S="-145" T="-145" R="11" G="237" B="125" A="255"/>
 </Vertex>
diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_1 b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_1
index 2544d138b..d2728aae4 100644
--- a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_1
+++ b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_1
@@ -1,26 +1,26 @@
 <Vertex Version="0">
-	<Vtx X="307" Y="145" Z="-240" S="23" T="-65" R="127" G="0" B="0" A="255"/>
-	<Vtx X="307" Y="216" Z="-211" S="45" T="-73" R="127" G="0" B="0" A="255"/>
-	<Vtx X="308" Y="240" Z="-141" S="49" T="-96" R="127" G="0" B="0" A="255"/>
-	<Vtx X="309" Y="144" Z="-50" S="13" T="-127" R="127" G="0" B="0" A="255"/>
-	<Vtx X="308" Y="214" Z="-75" S="35" T="-119" R="127" G="0" B="0" A="255"/>
-	<Vtx X="308" Y="45" Z="-143" S="-21" T="-99" R="127" G="0" B="0" A="255"/>
-	<Vtx X="309" Y="78" Z="-69" S="-8" T="-121" R="127" G="0" B="0" A="255"/>
-	<Vtx X="307" Y="77" Z="-219" S="-4" T="-71" R="127" G="0" B="0" A="255"/>
-	<Vtx X="308" Y="240" Z="141" S="49" T="-96" R="127" G="0" B="0" A="255"/>
-	<Vtx X="307" Y="216" Z="211" S="45" T="-73" R="127" G="0" B="0" A="255"/>
-	<Vtx X="307" Y="145" Z="240" S="23" T="-65" R="127" G="0" B="0" A="255"/>
-	<Vtx X="308" Y="45" Z="143" S="-21" T="-99" R="127" G="0" B="0" A="255"/>
-	<Vtx X="307" Y="77" Z="219" S="-4" T="-71" R="127" G="0" B="0" A="255"/>
-	<Vtx X="309" Y="144" Z="50" S="13" T="-127" R="127" G="0" B="0" A="255"/>
-	<Vtx X="309" Y="78" Z="69" S="-8" T="-121" R="127" G="0" B="0" A="255"/>
-	<Vtx X="308" Y="214" Z="75" S="35" T="-119" R="127" G="0" B="0" A="255"/>
-	<Vtx X="309" Y="-109" Z="-59" S="-59" T="-133" R="127" G="0" B="2" A="255"/>
-	<Vtx X="309" Y="49" Z="0" S="-26" T="-145" R="127" G="0" B="0" A="255"/>
-	<Vtx X="280" Y="29" Z="0" S="-26" T="-145" R="120" G="243" B="41" A="255"/>
-	<Vtx X="309" Y="-109" Z="59" S="-59" T="-133" R="127" G="0" B="254" A="255"/>
-	<Vtx X="280" Y="-99" Z="52" S="-59" T="-133" R="92" G="57" B="190" A="255"/>
-	<Vtx X="307" Y="-90" Z="0" S="-59" T="-145" R="127" G="1" B="0" A="255"/>
-	<Vtx X="282" Y="-83" Z="0" S="-59" T="-145" R="119" G="44" B="0" A="255"/>
-	<Vtx X="280" Y="-99" Z="-52" S="-59" T="-133" R="92" G="57" B="66" A="255"/>
+	<Vtx X="13" Y="7" Z="7" S="23" T="-65" R="11" G="0" B="127" A="255"/>
+	<Vtx X="12" Y="11" Z="8" S="45" T="-73" R="11" G="0" B="127" A="255"/>
+	<Vtx X="8" Y="12" Z="8" S="49" T="-96" R="11" G="0" B="127" A="255"/>
+	<Vtx X="4" Y="7" Z="8" S="13" T="-127" R="11" G="0" B="127" A="255"/>
+	<Vtx X="5" Y="11" Z="8" S="35" T="-119" R="11" G="0" B="127" A="255"/>
+	<Vtx X="8" Y="2" Z="8" S="-21" T="-99" R="11" G="0" B="127" A="255"/>
+	<Vtx X="5" Y="4" Z="8" S="-8" T="-121" R="11" G="0" B="127" A="255"/>
+	<Vtx X="12" Y="4" Z="8" S="-4" T="-71" R="11" G="0" B="127" A="255"/>
+	<Vtx X="-6" Y="12" Z="9" S="49" T="-96" R="10" G="0" B="127" A="255"/>
+	<Vtx X="-9" Y="11" Z="9" S="45" T="-73" R="10" G="0" B="127" A="255"/>
+	<Vtx X="-11" Y="7" Z="10" S="23" T="-65" R="10" G="0" B="127" A="255"/>
+	<Vtx X="-6" Y="2" Z="9" S="-21" T="-99" R="10" G="0" B="127" A="255"/>
+	<Vtx X="-10" Y="4" Z="9" S="-4" T="-71" R="10" G="0" B="127" A="255"/>
+	<Vtx X="-1" Y="7" Z="9" S="13" T="-127" R="10" G="0" B="127" A="255"/>
+	<Vtx X="-2" Y="4" Z="9" S="-8" T="-121" R="10" G="0" B="127" A="255"/>
+	<Vtx X="-2" Y="11" Z="9" S="35" T="-119" R="10" G="0" B="127" A="255"/>
+	<Vtx X="4" Y="-5" Z="8" S="-59" T="-133" R="8" G="0" B="127" A="255"/>
+	<Vtx X="1" Y="2" Z="9" S="-26" T="-145" R="11" G="0" B="127" A="255"/>
+	<Vtx X="1" Y="1" Z="7" S="-26" T="-145" R="225" G="243" B="123" A="255"/>
+	<Vtx X="-2" Y="-5" Z="9" S="-59" T="-133" R="14" G="0" B="126" A="255"/>
+	<Vtx X="-1" Y="-5" Z="7" S="-59" T="-133" R="74" G="57" B="86" A="255"/>
+	<Vtx X="1" Y="-4" Z="9" S="-59" T="-145" R="11" G="1" B="127" A="255"/>
+	<Vtx X="1" Y="-4" Z="7" S="-59" T="-145" R="10" G="44" B="119" A="255"/>
+	<Vtx X="4" Y="-5" Z="7" S="-59" T="-133" R="198" G="57" B="98" A="255"/>
 </Vertex>
diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_2 b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_2
index 3de701602..eb0050c03 100644
--- a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_2
+++ b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_2
@@ -1,6 +1,6 @@
 <Vertex Version="0">
-	<Vtx X="280" Y="-99" Z="-52" S="1008" T="1008" R="92" G="57" B="66" A="255"/>
-	<Vtx X="280" Y="29" Z="0" S="1008" T="582" R="120" G="243" B="41" A="255"/>
-	<Vtx X="282" Y="-83" Z="0" S="883" T="967" R="119" G="44" B="0" A="255"/>
-	<Vtx X="280" Y="-99" Z="52" S="1008" T="1008" R="92" G="57" B="190" A="255"/>
+	<Vtx X="4" Y="-5" Z="7" S="1008" T="1008" R="198" G="57" B="98" A="255"/>
+	<Vtx X="1" Y="1" Z="7" S="1008" T="582" R="225" G="243" B="123" A="255"/>
+	<Vtx X="1" Y="-4" Z="7" S="883" T="967" R="10" G="44" B="119" A="255"/>
+	<Vtx X="-1" Y="-5" Z="7" S="1008" T="1008" R="74" G="57" B="86" A="255"/>
 </Vertex>
diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_3 b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_3
index 80d934941..f124650c8 100644
--- a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_3
+++ b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_3
@@ -1,58 +1,58 @@
 <Vertex Version="0">
-	<Vtx X="285" Y="349" Z="-349" S="111" T="-11" R="78" G="230" B="159" A="255"/>
-	<Vtx X="173" Y="349" Z="-349" S="111" T="19" R="202" G="69" B="164" A="255"/>
-	<Vtx X="260" Y="450" Z="-397" S="111" T="19" R="187" G="245" B="150" A="255"/>
-	<Vtx X="371" Y="450" Z="-397" S="111" T="-11" R="93" G="199" B="191" A="255"/>
-	<Vtx X="251" Y="531" Z="-421" S="111" T="19" R="159" G="242" B="175" A="255"/>
-	<Vtx X="359" Y="506" Z="-406" S="111" T="-11" R="89" G="225" B="170" A="255"/>
-	<Vtx X="361" Y="701" Z="-519" S="111" T="-11" R="29" G="67" B="152" A="255"/>
-	<Vtx X="285" Y="432" Z="-175" S="117" T="-81" R="89" G="73" B="54" A="255"/>
-	<Vtx X="285" Y="349" Z="-349" S="117" T="-17" R="78" G="230" B="159" A="255"/>
-	<Vtx X="371" Y="450" Z="-397" S="117" T="-17" R="93" G="199" B="191" A="255"/>
-	<Vtx X="371" Y="532" Z="-222" S="117" T="-81" R="92" G="10" B="86" A="255"/>
-	<Vtx X="359" Y="506" Z="-406" S="117" T="-17" R="89" G="225" B="170" A="255"/>
-	<Vtx X="380" Y="664" Z="-297" S="117" T="-81" R="88" G="73" B="55" A="255"/>
-	<Vtx X="361" Y="701" Z="-519" S="117" T="-81" R="29" G="67" B="152" A="255"/>
-	<Vtx X="260" Y="532" Z="-222" S="147" T="-81" R="184" G="69" B="79" A="255"/>
-	<Vtx X="173" Y="432" Z="-175" S="147" T="-81" R="198" G="112" B="239" A="255"/>
-	<Vtx X="173" Y="349" Z="-349" S="147" T="-17" R="202" G="69" B="164" A="255"/>
-	<Vtx X="173" Y="432" Z="-175" S="147" T="-81" R="198" G="112" B="239" A="255"/>
-	<Vtx X="260" Y="532" Z="-222" S="147" T="-81" R="184" G="69" B="79" A="255"/>
-	<Vtx X="260" Y="450" Z="-397" S="147" T="-17" R="187" G="245" B="150" A="255"/>
-	<Vtx X="272" Y="689" Z="-312" S="147" T="-81" R="183" G="96" B="41" A="255"/>
-	<Vtx X="380" Y="664" Z="-297" S="117" T="-81" R="88" G="73" B="55" A="255"/>
-	<Vtx X="361" Y="701" Z="-519" S="147" T="-81" R="29" G="67" B="152" A="255"/>
-	<Vtx X="251" Y="531" Z="-421" S="147" T="-17" R="159" G="242" B="175" A="255"/>
-	<Vtx X="361" Y="701" Z="-519" S="147" T="-17" R="29" G="67" B="152" A="255"/>
-	<Vtx X="285" Y="432" Z="-175" S="117" T="-81" R="89" G="73" B="54" A="255"/>
-	<Vtx X="371" Y="532" Z="-222" S="117" T="-81" R="92" G="10" B="86" A="255"/>
-	<Vtx X="285" Y="349" Z="349" S="111" T="-11" R="78" G="230" B="97" A="255"/>
-	<Vtx X="260" Y="450" Z="397" S="111" T="19" R="187" G="245" B="106" A="255"/>
-	<Vtx X="173" Y="349" Z="349" S="111" T="19" R="202" G="69" B="92" A="255"/>
-	<Vtx X="371" Y="450" Z="397" S="111" T="-11" R="93" G="199" B="65" A="255"/>
-	<Vtx X="251" Y="531" Z="421" S="111" T="19" R="159" G="242" B="81" A="255"/>
-	<Vtx X="371" Y="450" Z="397" S="111" T="-11" R="93" G="199" B="65" A="255"/>
-	<Vtx X="359" Y="506" Z="406" S="111" T="-11" R="89" G="225" B="86" A="255"/>
-	<Vtx X="251" Y="531" Z="421" S="111" T="19" R="159" G="242" B="81" A="255"/>
-	<Vtx X="361" Y="701" Z="519" S="111" T="-11" R="29" G="67" B="104" A="255"/>
-	<Vtx X="285" Y="432" Z="175" S="117" T="-81" R="89" G="73" B="202" A="255"/>
-	<Vtx X="371" Y="450" Z="397" S="117" T="-17" R="93" G="199" B="65" A="255"/>
-	<Vtx X="285" Y="349" Z="349" S="117" T="-17" R="78" G="230" B="97" A="255"/>
-	<Vtx X="371" Y="532" Z="222" S="117" T="-81" R="92" G="10" B="170" A="255"/>
-	<Vtx X="173" Y="432" Z="175" S="147" T="-81" R="198" G="112" B="17" A="255"/>
-	<Vtx X="260" Y="532" Z="222" S="147" T="-81" R="184" G="69" B="177" A="255"/>
-	<Vtx X="173" Y="349" Z="349" S="147" T="-17" R="202" G="69" B="92" A="255"/>
-	<Vtx X="260" Y="450" Z="397" S="147" T="-17" R="187" G="245" B="106" A="255"/>
-	<Vtx X="272" Y="689" Z="312" S="147" T="-81" R="183" G="96" B="215" A="255"/>
-	<Vtx X="251" Y="531" Z="421" S="147" T="-17" R="159" G="242" B="81" A="255"/>
-	<Vtx X="361" Y="701" Z="519" S="147" T="-17" R="29" G="67" B="104" A="255"/>
-	<Vtx X="380" Y="664" Z="297" S="117" T="-81" R="88" G="73" B="201" A="255"/>
-	<Vtx X="272" Y="689" Z="312" S="147" T="-81" R="183" G="96" B="215" A="255"/>
-	<Vtx X="361" Y="701" Z="519" S="147" T="-81" R="29" G="67" B="104" A="255"/>
-	<Vtx X="380" Y="664" Z="297" S="117" T="-81" R="88" G="73" B="201" A="255"/>
-	<Vtx X="260" Y="532" Z="222" S="147" T="-81" R="184" G="69" B="177" A="255"/>
-	<Vtx X="371" Y="532" Z="222" S="117" T="-81" R="92" G="10" B="170" A="255"/>
-	<Vtx X="359" Y="506" Z="406" S="117" T="-17" R="89" G="225" B="86" A="255"/>
-	<Vtx X="361" Y="701" Z="519" S="117" T="-81" R="29" G="67" B="104" A="255"/>
-	<Vtx X="371" Y="450" Z="397" S="117" T="-17" R="93" G="199" B="65" A="255"/>
+	<Vtx X="19" Y="17" Z="6" S="111" T="-11" R="103" G="230" B="69" A="255"/>
+	<Vtx X="18" Y="17" Z="0" S="111" T="19" R="87" G="69" B="194" A="255"/>
+	<Vtx X="21" Y="23" Z="4" S="111" T="19" R="100" G="245" B="178" A="255"/>
+	<Vtx X="21" Y="23" Z="10" S="111" T="-11" R="73" G="199" B="87" A="255"/>
+	<Vtx X="22" Y="27" Z="4" S="111" T="19" R="72" G="242" B="152" A="255"/>
+	<Vtx X="22" Y="25" Z="9" S="111" T="-11" R="93" G="225" B="81" A="255"/>
+	<Vtx X="27" Y="35" Z="9" S="111" T="-11" R="106" G="67" B="20" A="255"/>
+	<Vtx X="10" Y="22" Z="7" S="117" T="-81" R="210" G="73" B="94" A="255"/>
+	<Vtx X="19" Y="17" Z="6" S="117" T="-17" R="103" G="230" B="69" A="255"/>
+	<Vtx X="21" Y="23" Z="10" S="117" T="-17" R="73" G="199" B="87" A="255"/>
+	<Vtx X="13" Y="27" Z="11" S="117" T="-81" R="178" G="10" B="100" A="255"/>
+	<Vtx X="22" Y="25" Z="9" S="117" T="-17" R="93" G="225" B="81" A="255"/>
+	<Vtx X="16" Y="33" Z="11" S="117" T="-81" R="209" G="73" B="93" A="255"/>
+	<Vtx X="27" Y="35" Z="9" S="117" T="-81" R="106" G="67" B="20" A="255"/>
+	<Vtx X="12" Y="27" Z="5" S="147" T="-81" R="171" G="69" B="191" A="255"/>
+	<Vtx X="9" Y="22" Z="1" S="147" T="-81" R="12" G="111" B="196" A="255"/>
+	<Vtx X="18" Y="17" Z="0" S="147" T="-17" R="87" G="69" B="194" A="255"/>
+	<Vtx X="9" Y="22" Z="1" S="147" T="-81" R="12" G="111" B="196" A="255"/>
+	<Vtx X="12" Y="27" Z="5" S="147" T="-81" R="171" G="69" B="191" A="255"/>
+	<Vtx X="21" Y="23" Z="4" S="147" T="-17" R="100" G="245" B="178" A="255"/>
+	<Vtx X="17" Y="34" Z="5" S="147" T="-81" R="209" G="96" B="187" A="255"/>
+	<Vtx X="16" Y="33" Z="11" S="117" T="-81" R="209" G="73" B="93" A="255"/>
+	<Vtx X="27" Y="35" Z="9" S="147" T="-81" R="106" G="67" B="20" A="255"/>
+	<Vtx X="22" Y="27" Z="4" S="147" T="-17" R="72" G="242" B="152" A="255"/>
+	<Vtx X="27" Y="35" Z="9" S="147" T="-17" R="106" G="67" B="20" A="255"/>
+	<Vtx X="10" Y="22" Z="7" S="117" T="-81" R="210" G="73" B="94" A="255"/>
+	<Vtx X="13" Y="27" Z="11" S="117" T="-81" R="178" G="10" B="100" A="255"/>
+	<Vtx X="-16" Y="17" Z="9" S="111" T="-11" R="166" G="230" B="86" A="255"/>
+	<Vtx X="-19" Y="23" Z="8" S="111" T="19" R="144" G="245" B="197" A="255"/>
+	<Vtx X="-17" Y="17" Z="3" S="111" T="19" R="159" G="69" B="210" A="255"/>
+	<Vtx X="-18" Y="23" Z="13" S="111" T="-11" R="199" G="199" B="98" A="255"/>
+	<Vtx X="-20" Y="27" Z="8" S="111" T="19" R="167" G="242" B="166" A="255"/>
+	<Vtx X="-18" Y="23" Z="13" S="111" T="-11" R="199" G="199" B="98" A="255"/>
+	<Vtx X="-19" Y="25" Z="13" S="111" T="-11" R="179" G="225" B="96" A="255"/>
+	<Vtx X="-20" Y="27" Z="8" S="111" T="19" R="167" G="242" B="166" A="255"/>
+	<Vtx X="-24" Y="35" Z="13" S="111" T="-11" R="155" G="67" B="38" A="255"/>
+	<Vtx X="-7" Y="22" Z="8" S="117" T="-81" R="62" G="73" B="84" A="255"/>
+	<Vtx X="-18" Y="23" Z="13" S="117" T="-17" R="199" G="199" B="98" A="255"/>
+	<Vtx X="-16" Y="17" Z="9" S="117" T="-17" R="166" G="230" B="86" A="255"/>
+	<Vtx X="-9" Y="27" Z="13" S="117" T="-81" R="94" G="10" B="85" A="255"/>
+	<Vtx X="-8" Y="22" Z="3" S="147" T="-81" R="234" G="112" B="200" A="255"/>
+	<Vtx X="-10" Y="27" Z="7" S="147" T="-81" R="72" G="69" B="177" A="255"/>
+	<Vtx X="-17" Y="17" Z="3" S="147" T="-17" R="159" G="69" B="210" A="255"/>
+	<Vtx X="-19" Y="23" Z="8" S="147" T="-17" R="144" G="245" B="197" A="255"/>
+	<Vtx X="-14" Y="34" Z="8" S="147" T="-81" R="34" G="96" B="180" A="255"/>
+	<Vtx X="-20" Y="27" Z="8" S="147" T="-17" R="167" G="242" B="166" A="255"/>
+	<Vtx X="-24" Y="35" Z="13" S="147" T="-17" R="155" G="67" B="38" A="255"/>
+	<Vtx X="-13" Y="33" Z="13" S="117" T="-81" R="62" G="73" B="83" A="255"/>
+	<Vtx X="-14" Y="34" Z="8" S="147" T="-81" R="34" G="96" B="180" A="255"/>
+	<Vtx X="-24" Y="35" Z="13" S="147" T="-81" R="155" G="67" B="38" A="255"/>
+	<Vtx X="-13" Y="33" Z="13" S="117" T="-81" R="62" G="73" B="83" A="255"/>
+	<Vtx X="-10" Y="27" Z="7" S="147" T="-81" R="72" G="69" B="177" A="255"/>
+	<Vtx X="-9" Y="27" Z="13" S="117" T="-81" R="94" G="10" B="85" A="255"/>
+	<Vtx X="-19" Y="25" Z="13" S="117" T="-17" R="179" G="225" B="96" A="255"/>
+	<Vtx X="-24" Y="35" Z="13" S="117" T="-81" R="155" G="67" B="38" A="255"/>
+	<Vtx X="-18" Y="23" Z="13" S="117" T="-17" R="199" G="199" B="98" A="255"/>
 </Vertex>
diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4 b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4
index 98009f97b..2bbe7895e 100644
--- a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4
+++ b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4
@@ -1,267 +1,267 @@
 <Vertex Version="0">
-	<Vtx X="305" Y="105" Z="-72" S="422" T="14" R="1" G="208" B="118" A="255"/>
-	<Vtx X="305" Y="183" Z="-72" S="422" T="14" R="255" G="44" B="119" A="255"/>
-	<Vtx X="222" Y="144" Z="-146" S="206" T="14" R="149" G="192" B="233" A="255"/>
-	<Vtx X="305" Y="144" Z="-71" S="422" T="-50" R="252" G="0" B="127" A="255"/>
-	<Vtx X="324" Y="109" Z="-89" S="462" T="14" R="103" G="229" B="69" A="255"/>
-	<Vtx X="305" Y="86" Z="-89" S="422" T="78" R="251" G="166" B="90" A="255"/>
-	<Vtx X="222" Y="144" Z="-146" S="206" T="142" R="149" G="192" B="233" A="255"/>
-	<Vtx X="305" Y="69" Z="-106" S="422" T="142" R="3" G="140" B="51" A="255"/>
-	<Vtx X="305" Y="67" Z="-146" S="422" T="206" R="255" G="129" B="0" A="255"/>
-	<Vtx X="305" Y="69" Z="-186" S="422" T="142" R="0" G="141" B="201" A="255"/>
-	<Vtx X="324" Y="87" Z="-180" S="462" T="142" R="104" G="188" B="229" A="255"/>
-	<Vtx X="305" Y="86" Z="-202" S="422" T="78" R="252" G="167" B="165" A="255"/>
-	<Vtx X="305" Y="105" Z="-220" S="422" T="14" R="255" G="212" B="137" A="255"/>
-	<Vtx X="305" Y="183" Z="-220" S="422" T="14" R="1" G="48" B="138" A="255"/>
-	<Vtx X="305" Y="144" Z="-220" S="422" T="-50" R="252" G="0" B="129" A="255"/>
-	<Vtx X="324" Y="178" Z="-203" S="462" T="14" R="103" G="27" B="187" A="255"/>
-	<Vtx X="305" Y="202" Z="-202" S="422" T="78" R="251" G="90" B="166" A="255"/>
-	<Vtx X="324" Y="178" Z="-203" S="462" T="14" R="103" G="27" B="187" A="255"/>
-	<Vtx X="305" Y="183" Z="-220" S="422" T="14" R="1" G="48" B="138" A="255"/>
-	<Vtx X="222" Y="144" Z="-146" S="206" T="142" R="149" G="192" B="233" A="255"/>
-	<Vtx X="305" Y="219" Z="-186" S="422" T="142" R="3" G="116" B="204" A="255"/>
-	<Vtx X="305" Y="220" Z="-146" S="422" T="206" R="255" G="127" B="1" A="255"/>
-	<Vtx X="305" Y="219" Z="-106" S="422" T="142" R="255" G="102" B="76" A="255"/>
-	<Vtx X="305" Y="202" Z="-89" S="422" T="78" R="252" G="89" B="91" A="255"/>
-	<Vtx X="305" Y="183" Z="-72" S="422" T="14" R="255" G="44" B="119" A="255"/>
-	<Vtx X="324" Y="178" Z="-89" S="462" T="14" R="103" G="27" B="69" A="255"/>
-	<Vtx X="305" Y="144" Z="-71" S="422" T="-50" R="252" G="0" B="127" A="255"/>
-	<Vtx X="324" Y="144" Z="-84" S="462" T="-50" R="102" G="0" B="76" A="255"/>
-	<Vtx X="324" Y="109" Z="-89" S="462" T="14" R="103" G="229" B="69" A="255"/>
-	<Vtx X="330" Y="144" Z="-105" S="462" T="-50" R="123" G="0" B="31" A="255"/>
-	<Vtx X="330" Y="111" Z="-107" S="462" T="14" R="122" G="243" B="34" A="255"/>
-	<Vtx X="324" Y="96" Z="-99" S="462" T="78" R="100" G="200" B="55" A="255"/>
-	<Vtx X="305" Y="86" Z="-89" S="422" T="78" R="251" G="166" B="90" A="255"/>
-	<Vtx X="324" Y="96" Z="-99" S="462" T="78" R="100" G="200" B="55" A="255"/>
-	<Vtx X="324" Y="109" Z="-89" S="462" T="14" R="103" G="229" B="69" A="255"/>
-	<Vtx X="324" Y="87" Z="-112" S="462" T="142" R="104" G="188" B="27" A="255"/>
-	<Vtx X="305" Y="69" Z="-106" S="422" T="142" R="3" G="140" B="51" A="255"/>
-	<Vtx X="305" Y="67" Z="-146" S="422" T="206" R="255" G="129" B="0" A="255"/>
-	<Vtx X="324" Y="82" Z="-146" S="462" T="206" R="104" G="183" B="0" A="255"/>
-	<Vtx X="324" Y="87" Z="-180" S="462" T="142" R="104" G="188" B="229" A="255"/>
-	<Vtx X="330" Y="103" Z="-146" S="462" T="206" R="123" G="225" B="0" A="255"/>
-	<Vtx X="330" Y="104" Z="-178" S="462" T="142" R="122" G="221" B="244" A="255"/>
-	<Vtx X="324" Y="96" Z="-192" S="462" T="78" R="100" G="200" B="201" A="255"/>
-	<Vtx X="305" Y="86" Z="-202" S="422" T="78" R="252" G="167" B="165" A="255"/>
-	<Vtx X="324" Y="109" Z="-203" S="462" T="14" R="103" G="229" B="187" A="255"/>
-	<Vtx X="305" Y="105" Z="-220" S="422" T="14" R="255" G="212" B="137" A="255"/>
-	<Vtx X="305" Y="144" Z="-220" S="422" T="-50" R="252" G="0" B="129" A="255"/>
-	<Vtx X="324" Y="144" Z="-207" S="462" T="-50" R="102" G="0" B="180" A="255"/>
-	<Vtx X="324" Y="178" Z="-203" S="462" T="14" R="103" G="27" B="187" A="255"/>
-	<Vtx X="324" Y="144" Z="-207" S="462" T="-50" R="102" G="0" B="180" A="255"/>
-	<Vtx X="305" Y="144" Z="-220" S="422" T="-50" R="252" G="0" B="129" A="255"/>
-	<Vtx X="330" Y="144" Z="-186" S="462" T="-50" R="123" G="0" B="225" A="255"/>
-	<Vtx X="330" Y="176" Z="-185" S="462" T="14" R="122" G="13" B="222" A="255"/>
-	<Vtx X="324" Y="192" Z="-192" S="462" T="78" R="100" G="56" B="201" A="255"/>
-	<Vtx X="305" Y="202" Z="-202" S="422" T="78" R="251" G="90" B="166" A="255"/>
-	<Vtx X="324" Y="201" Z="-180" S="462" T="142" R="104" G="68" B="229" A="255"/>
-	<Vtx X="305" Y="219" Z="-186" S="422" T="142" R="3" G="116" B="204" A="255"/>
-	<Vtx X="305" Y="220" Z="-146" S="422" T="206" R="255" G="127" B="1" A="255"/>
-	<Vtx X="324" Y="205" Z="-146" S="462" T="206" R="104" G="73" B="0" A="255"/>
-	<Vtx X="324" Y="201" Z="-112" S="462" T="142" R="104" G="68" B="27" A="255"/>
-	<Vtx X="305" Y="219" Z="-106" S="422" T="142" R="255" G="102" B="76" A="255"/>
-	<Vtx X="305" Y="202" Z="-89" S="422" T="78" R="252" G="89" B="91" A="255"/>
-	<Vtx X="324" Y="192" Z="-99" S="462" T="78" R="100" G="56" B="55" A="255"/>
-	<Vtx X="324" Y="178" Z="-89" S="462" T="14" R="103" G="27" B="69" A="255"/>
-	<Vtx X="330" Y="176" Z="-107" S="462" T="14" R="122" G="13" B="34" A="255"/>
-	<Vtx X="324" Y="192" Z="-99" S="462" T="78" R="100" G="56" B="55" A="255"/>
-	<Vtx X="324" Y="178" Z="-89" S="462" T="14" R="103" G="27" B="69" A="255"/>
-	<Vtx X="330" Y="144" Z="-105" S="462" T="-50" R="123" G="0" B="31" A="255"/>
-	<Vtx X="324" Y="144" Z="-84" S="462" T="-50" R="102" G="0" B="76" A="255"/>
-	<Vtx X="330" Y="181" Z="-110" S="462" T="78" R="120" G="29" B="29" A="255"/>
-	<Vtx X="330" Y="183" Z="-114" S="462" T="142" R="122" G="35" B="12" A="255"/>
-	<Vtx X="332" Y="176" Z="-114" S="526" T="142" R="125" G="14" B="14" A="255"/>
-	<Vtx X="330" Y="176" Z="-107" S="526" T="78" R="122" G="13" B="34" A="255"/>
-	<Vtx X="332" Y="144" Z="-114" S="590" T="142" R="126" G="0" B="13" A="255"/>
-	<Vtx X="330" Y="144" Z="-105" S="590" T="78" R="123" G="0" B="31" A="255"/>
-	<Vtx X="330" Y="111" Z="-107" S="526" T="78" R="122" G="243" B="34" A="255"/>
-	<Vtx X="332" Y="111" Z="-114" S="526" T="142" R="125" G="242" B="14" A="255"/>
-	<Vtx X="330" Y="107" Z="-110" S="462" T="78" R="120" G="227" B="29" A="255"/>
-	<Vtx X="330" Y="104" Z="-114" S="462" T="142" R="122" G="221" B="12" A="255"/>
-	<Vtx X="324" Y="96" Z="-99" S="462" T="78" R="100" G="200" B="55" A="255"/>
-	<Vtx X="324" Y="96" Z="-99" S="462" T="78" R="100" G="200" B="55" A="255"/>
-	<Vtx X="330" Y="107" Z="-110" S="462" T="78" R="120" G="227" B="29" A="255"/>
-	<Vtx X="330" Y="111" Z="-107" S="462" T="14" R="122" G="243" B="34" A="255"/>
-	<Vtx X="324" Y="87" Z="-112" S="462" T="142" R="104" G="188" B="27" A="255"/>
-	<Vtx X="330" Y="104" Z="-114" S="462" T="142" R="122" G="221" B="12" A="255"/>
-	<Vtx X="330" Y="103" Z="-146" S="462" T="206" R="123" G="225" B="0" A="255"/>
-	<Vtx X="324" Y="82" Z="-146" S="462" T="206" R="104" G="183" B="0" A="255"/>
-	<Vtx X="332" Y="111" Z="-146" S="526" T="206" R="126" G="243" B="0" A="255"/>
-	<Vtx X="332" Y="111" Z="-114" S="526" T="142" R="125" G="242" B="14" A="255"/>
-	<Vtx X="332" Y="144" Z="-146" S="590" T="206" R="127" G="0" B="0" A="255"/>
-	<Vtx X="332" Y="111" Z="-178" S="526" T="142" R="125" G="242" B="242" A="255"/>
-	<Vtx X="330" Y="104" Z="-178" S="462" T="142" R="122" G="221" B="244" A="255"/>
-	<Vtx X="330" Y="107" Z="-182" S="462" T="78" R="120" G="227" B="227" A="255"/>
-	<Vtx X="330" Y="111" Z="-185" S="526" T="78" R="122" G="243" B="222" A="255"/>
-	<Vtx X="332" Y="144" Z="-178" S="590" T="142" R="126" G="0" B="243" A="255"/>
-	<Vtx X="330" Y="144" Z="-186" S="590" T="78" R="123" G="0" B="225" A="255"/>
-	<Vtx X="332" Y="144" Z="-178" S="590" T="142" R="126" G="0" B="243" A="255"/>
-	<Vtx X="330" Y="144" Z="-186" S="590" T="78" R="123" G="0" B="225" A="255"/>
-	<Vtx X="330" Y="176" Z="-185" S="526" T="78" R="122" G="13" B="222" A="255"/>
-	<Vtx X="332" Y="176" Z="-178" S="526" T="142" R="125" G="14" B="242" A="255"/>
-	<Vtx X="330" Y="181" Z="-182" S="462" T="78" R="120" G="29" B="227" A="255"/>
-	<Vtx X="330" Y="183" Z="-178" S="462" T="142" R="122" G="35" B="244" A="255"/>
-	<Vtx X="324" Y="192" Z="-192" S="462" T="78" R="100" G="56" B="201" A="255"/>
-	<Vtx X="330" Y="176" Z="-185" S="462" T="14" R="122" G="13" B="222" A="255"/>
-	<Vtx X="324" Y="201" Z="-180" S="462" T="142" R="104" G="68" B="229" A="255"/>
-	<Vtx X="330" Y="185" Z="-146" S="462" T="206" R="123" G="31" B="0" A="255"/>
-	<Vtx X="324" Y="205" Z="-146" S="462" T="206" R="104" G="73" B="0" A="255"/>
-	<Vtx X="324" Y="201" Z="-112" S="462" T="142" R="104" G="68" B="27" A="255"/>
-	<Vtx X="330" Y="183" Z="-114" S="462" T="142" R="122" G="35" B="12" A="255"/>
-	<Vtx X="324" Y="192" Z="-99" S="462" T="78" R="100" G="56" B="55" A="255"/>
-	<Vtx X="332" Y="176" Z="-146" S="526" T="206" R="126" G="13" B="0" A="255"/>
-	<Vtx X="332" Y="176" Z="-114" S="526" T="142" R="125" G="14" B="14" A="255"/>
-	<Vtx X="332" Y="176" Z="-114" S="526" T="142" R="125" G="14" B="14" A="255"/>
-	<Vtx X="332" Y="144" Z="-146" S="590" T="206" R="127" G="0" B="0" A="255"/>
-	<Vtx X="332" Y="176" Z="-146" S="526" T="206" R="126" G="13" B="0" A="255"/>
-	<Vtx X="332" Y="144" Z="-114" S="590" T="142" R="126" G="0" B="13" A="255"/>
-	<Vtx X="332" Y="111" Z="-114" S="526" T="142" R="125" G="242" B="14" A="255"/>
-	<Vtx X="332" Y="176" Z="-178" S="526" T="142" R="125" G="14" B="242" A="255"/>
-	<Vtx X="332" Y="144" Z="-178" S="590" T="142" R="126" G="0" B="243" A="255"/>
-	<Vtx X="332" Y="111" Z="-178" S="526" T="142" R="125" G="242" B="242" A="255"/>
-	<Vtx X="330" Y="183" Z="-178" S="462" T="142" R="122" G="35" B="244" A="255"/>
-	<Vtx X="330" Y="185" Z="-146" S="462" T="206" R="123" G="31" B="0" A="255"/>
-	<Vtx X="330" Y="144" Z="-186" S="462" T="-50" R="123" G="0" B="225" A="255"/>
-	<Vtx X="324" Y="109" Z="-203" S="462" T="14" R="103" G="229" B="187" A="255"/>
-	<Vtx X="324" Y="144" Z="-207" S="462" T="-50" R="102" G="0" B="180" A="255"/>
-	<Vtx X="330" Y="111" Z="-185" S="462" T="14" R="122" G="243" B="222" A="255"/>
-	<Vtx X="324" Y="96" Z="-192" S="462" T="78" R="100" G="200" B="201" A="255"/>
-	<Vtx X="330" Y="107" Z="-182" S="462" T="78" R="120" G="227" B="227" A="255"/>
-	<Vtx X="324" Y="96" Z="-192" S="462" T="78" R="100" G="200" B="201" A="255"/>
-	<Vtx X="330" Y="107" Z="-182" S="462" T="78" R="120" G="227" B="227" A="255"/>
-	<Vtx X="330" Y="104" Z="-178" S="462" T="142" R="122" G="221" B="244" A="255"/>
-	<Vtx X="305" Y="105" Z="72" S="422" T="14" R="1" G="208" B="138" A="255"/>
-	<Vtx X="222" Y="144" Z="146" S="206" T="14" R="149" G="192" B="23" A="255"/>
-	<Vtx X="305" Y="183" Z="72" S="422" T="14" R="254" G="44" B="137" A="255"/>
-	<Vtx X="305" Y="144" Z="71" S="422" T="-50" R="252" G="0" B="129" A="255"/>
-	<Vtx X="324" Y="178" Z="89" S="462" T="14" R="103" G="27" B="187" A="255"/>
-	<Vtx X="305" Y="202" Z="89" S="422" T="78" R="252" G="90" B="166" A="255"/>
-	<Vtx X="222" Y="144" Z="146" S="206" T="142" R="149" G="192" B="23" A="255"/>
-	<Vtx X="305" Y="219" Z="106" S="422" T="142" R="2" G="102" B="180" A="255"/>
-	<Vtx X="305" Y="220" Z="146" S="422" T="206" R="254" G="127" B="255" A="255"/>
-	<Vtx X="305" Y="219" Z="186" S="422" T="142" R="3" G="116" B="52" A="255"/>
-	<Vtx X="305" Y="202" Z="202" S="422" T="78" R="252" G="90" B="90" A="255"/>
-	<Vtx X="305" Y="183" Z="220" S="422" T="14" R="1" G="48" B="118" A="255"/>
-	<Vtx X="324" Y="178" Z="203" S="462" T="14" R="103" G="27" B="69" A="255"/>
-	<Vtx X="324" Y="178" Z="203" S="462" T="14" R="103" G="27" B="69" A="255"/>
-	<Vtx X="305" Y="183" Z="220" S="422" T="14" R="1" G="48" B="118" A="255"/>
-	<Vtx X="305" Y="144" Z="220" S="422" T="-50" R="252" G="0" B="127" A="255"/>
-	<Vtx X="305" Y="105" Z="220" S="422" T="14" R="254" G="212" B="119" A="255"/>
-	<Vtx X="222" Y="144" Z="146" S="206" T="14" R="149" G="192" B="23" A="255"/>
-	<Vtx X="305" Y="86" Z="202" S="422" T="78" R="252" G="166" B="90" A="255"/>
-	<Vtx X="305" Y="69" Z="186" S="422" T="142" R="0" G="141" B="55" A="255"/>
-	<Vtx X="324" Y="87" Z="180" S="462" T="142" R="104" G="188" B="27" A="255"/>
-	<Vtx X="305" Y="67" Z="146" S="422" T="206" R="255" G="129" B="255" A="255"/>
-	<Vtx X="222" Y="144" Z="146" S="206" T="142" R="149" G="192" B="23" A="255"/>
-	<Vtx X="305" Y="69" Z="106" S="422" T="142" R="3" G="140" B="204" A="255"/>
-	<Vtx X="305" Y="86" Z="89" S="422" T="78" R="252" G="166" B="166" A="255"/>
-	<Vtx X="305" Y="105" Z="72" S="422" T="14" R="1" G="208" B="138" A="255"/>
-	<Vtx X="324" Y="109" Z="89" S="462" T="14" R="103" G="229" B="187" A="255"/>
-	<Vtx X="305" Y="144" Z="71" S="422" T="-50" R="252" G="0" B="129" A="255"/>
-	<Vtx X="324" Y="144" Z="84" S="462" T="-50" R="102" G="0" B="180" A="255"/>
-	<Vtx X="305" Y="144" Z="71" S="422" T="-50" R="252" G="0" B="129" A="255"/>
-	<Vtx X="324" Y="178" Z="89" S="462" T="14" R="103" G="27" B="187" A="255"/>
-	<Vtx X="324" Y="144" Z="84" S="462" T="-50" R="102" G="0" B="180" A="255"/>
-	<Vtx X="330" Y="144" Z="105" S="462" T="-50" R="123" G="0" B="225" A="255"/>
-	<Vtx X="330" Y="176" Z="107" S="462" T="14" R="122" G="13" B="222" A="255"/>
-	<Vtx X="324" Y="192" Z="99" S="462" T="78" R="100" G="56" B="201" A="255"/>
-	<Vtx X="305" Y="202" Z="89" S="422" T="78" R="252" G="90" B="166" A="255"/>
-	<Vtx X="324" Y="201" Z="112" S="462" T="142" R="104" G="68" B="229" A="255"/>
-	<Vtx X="305" Y="219" Z="106" S="422" T="142" R="2" G="102" B="180" A="255"/>
-	<Vtx X="305" Y="220" Z="146" S="422" T="206" R="254" G="127" B="255" A="255"/>
-	<Vtx X="324" Y="205" Z="146" S="462" T="206" R="104" G="73" B="0" A="255"/>
-	<Vtx X="324" Y="201" Z="180" S="462" T="142" R="104" G="68" B="27" A="255"/>
-	<Vtx X="305" Y="219" Z="186" S="422" T="142" R="3" G="116" B="52" A="255"/>
-	<Vtx X="305" Y="202" Z="202" S="422" T="78" R="252" G="90" B="90" A="255"/>
-	<Vtx X="324" Y="192" Z="192" S="462" T="78" R="100" G="56" B="55" A="255"/>
-	<Vtx X="324" Y="178" Z="203" S="462" T="14" R="103" G="27" B="69" A="255"/>
-	<Vtx X="324" Y="192" Z="192" S="462" T="78" R="100" G="56" B="55" A="255"/>
-	<Vtx X="324" Y="178" Z="203" S="462" T="14" R="103" G="27" B="69" A="255"/>
-	<Vtx X="330" Y="176" Z="185" S="462" T="14" R="122" G="13" B="34" A="255"/>
-	<Vtx X="330" Y="144" Z="186" S="462" T="-50" R="123" G="0" B="31" A="255"/>
-	<Vtx X="324" Y="144" Z="207" S="462" T="-50" R="102" G="0" B="76" A="255"/>
-	<Vtx X="305" Y="144" Z="220" S="422" T="-50" R="252" G="0" B="127" A="255"/>
-	<Vtx X="324" Y="109" Z="203" S="462" T="14" R="103" G="229" B="69" A="255"/>
-	<Vtx X="305" Y="105" Z="220" S="422" T="14" R="254" G="212" B="119" A="255"/>
-	<Vtx X="305" Y="86" Z="202" S="422" T="78" R="252" G="166" B="90" A="255"/>
-	<Vtx X="324" Y="96" Z="192" S="462" T="78" R="100" G="200" B="55" A="255"/>
-	<Vtx X="324" Y="87" Z="180" S="462" T="142" R="104" G="188" B="27" A="255"/>
-	<Vtx X="330" Y="104" Z="178" S="462" T="142" R="122" G="221" B="12" A="255"/>
-	<Vtx X="330" Y="103" Z="146" S="462" T="206" R="123" G="225" B="0" A="255"/>
-	<Vtx X="324" Y="82" Z="146" S="462" T="206" R="104" G="183" B="0" A="255"/>
-	<Vtx X="305" Y="67" Z="146" S="422" T="206" R="255" G="129" B="255" A="255"/>
-	<Vtx X="324" Y="87" Z="112" S="462" T="142" R="104" G="188" B="229" A="255"/>
-	<Vtx X="305" Y="67" Z="146" S="422" T="206" R="255" G="129" B="255" A="255"/>
-	<Vtx X="305" Y="69" Z="106" S="422" T="142" R="3" G="140" B="204" A="255"/>
-	<Vtx X="324" Y="87" Z="112" S="462" T="142" R="104" G="188" B="229" A="255"/>
-	<Vtx X="305" Y="86" Z="89" S="422" T="78" R="252" G="166" B="166" A="255"/>
-	<Vtx X="324" Y="96" Z="99" S="462" T="78" R="100" G="200" B="201" A="255"/>
-	<Vtx X="324" Y="109" Z="89" S="462" T="14" R="103" G="229" B="187" A="255"/>
-	<Vtx X="330" Y="111" Z="107" S="462" T="14" R="122" G="243" B="222" A="255"/>
-	<Vtx X="330" Y="144" Z="105" S="462" T="-50" R="123" G="0" B="225" A="255"/>
-	<Vtx X="324" Y="144" Z="84" S="462" T="-50" R="102" G="0" B="180" A="255"/>
-	<Vtx X="330" Y="107" Z="110" S="462" T="78" R="120" G="227" B="227" A="255"/>
-	<Vtx X="330" Y="104" Z="114" S="462" T="142" R="122" G="221" B="244" A="255"/>
-	<Vtx X="332" Y="111" Z="114" S="526" T="142" R="125" G="242" B="242" A="255"/>
-	<Vtx X="330" Y="111" Z="107" S="526" T="78" R="122" G="243" B="222" A="255"/>
-	<Vtx X="332" Y="144" Z="114" S="590" T="142" R="126" G="0" B="243" A="255"/>
-	<Vtx X="330" Y="144" Z="105" S="590" T="78" R="123" G="0" B="225" A="255"/>
-	<Vtx X="330" Y="176" Z="107" S="526" T="78" R="122" G="13" B="222" A="255"/>
-	<Vtx X="330" Y="176" Z="107" S="526" T="78" R="122" G="13" B="222" A="255"/>
-	<Vtx X="332" Y="176" Z="114" S="526" T="142" R="125" G="14" B="242" A="255"/>
-	<Vtx X="332" Y="144" Z="114" S="590" T="142" R="126" G="0" B="243" A="255"/>
-	<Vtx X="330" Y="181" Z="110" S="462" T="78" R="120" G="29" B="227" A="255"/>
-	<Vtx X="330" Y="183" Z="114" S="462" T="142" R="122" G="35" B="244" A="255"/>
-	<Vtx X="324" Y="192" Z="99" S="462" T="78" R="100" G="56" B="201" A="255"/>
-	<Vtx X="330" Y="176" Z="107" S="462" T="14" R="122" G="13" B="222" A="255"/>
-	<Vtx X="324" Y="201" Z="112" S="462" T="142" R="104" G="68" B="229" A="255"/>
-	<Vtx X="330" Y="185" Z="146" S="462" T="206" R="123" G="31" B="0" A="255"/>
-	<Vtx X="324" Y="205" Z="146" S="462" T="206" R="104" G="73" B="0" A="255"/>
-	<Vtx X="324" Y="201" Z="180" S="462" T="142" R="104" G="68" B="27" A="255"/>
-	<Vtx X="330" Y="183" Z="178" S="462" T="142" R="122" G="35" B="12" A="255"/>
-	<Vtx X="324" Y="192" Z="192" S="462" T="78" R="100" G="56" B="55" A="255"/>
-	<Vtx X="330" Y="181" Z="182" S="462" T="78" R="120" G="29" B="29" A="255"/>
-	<Vtx X="330" Y="176" Z="185" S="462" T="14" R="122" G="13" B="34" A="255"/>
-	<Vtx X="332" Y="176" Z="178" S="526" T="142" R="125" G="14" B="14" A="255"/>
-	<Vtx X="332" Y="176" Z="146" S="526" T="206" R="126" G="13" B="0" A="255"/>
-	<Vtx X="330" Y="183" Z="178" S="462" T="142" R="122" G="35" B="12" A="255"/>
-	<Vtx X="332" Y="176" Z="178" S="526" T="142" R="125" G="14" B="14" A="255"/>
-	<Vtx X="332" Y="144" Z="146" S="590" T="206" R="127" G="0" B="0" A="255"/>
-	<Vtx X="332" Y="144" Z="178" S="590" T="142" R="126" G="0" B="13" A="255"/>
-	<Vtx X="330" Y="176" Z="185" S="526" T="78" R="122" G="13" B="34" A="255"/>
-	<Vtx X="330" Y="181" Z="182" S="462" T="78" R="120" G="29" B="29" A="255"/>
-	<Vtx X="330" Y="144" Z="186" S="590" T="78" R="123" G="0" B="31" A="255"/>
-	<Vtx X="330" Y="111" Z="185" S="526" T="78" R="122" G="243" B="34" A="255"/>
-	<Vtx X="332" Y="111" Z="178" S="526" T="142" R="125" G="242" B="14" A="255"/>
-	<Vtx X="330" Y="107" Z="182" S="462" T="78" R="120" G="227" B="29" A="255"/>
-	<Vtx X="330" Y="104" Z="178" S="462" T="142" R="122" G="221" B="12" A="255"/>
-	<Vtx X="324" Y="96" Z="192" S="462" T="78" R="100" G="200" B="55" A="255"/>
-	<Vtx X="330" Y="111" Z="185" S="462" T="14" R="122" G="243" B="34" A="255"/>
-	<Vtx X="324" Y="109" Z="203" S="462" T="14" R="103" G="229" B="69" A="255"/>
-	<Vtx X="330" Y="144" Z="186" S="462" T="-50" R="123" G="0" B="31" A="255"/>
-	<Vtx X="330" Y="144" Z="186" S="462" T="-50" R="123" G="0" B="31" A="255"/>
-	<Vtx X="324" Y="144" Z="207" S="462" T="-50" R="102" G="0" B="76" A="255"/>
-	<Vtx X="324" Y="109" Z="203" S="462" T="14" R="103" G="229" B="69" A="255"/>
-	<Vtx X="330" Y="104" Z="178" S="462" T="142" R="122" G="221" B="12" A="255"/>
-	<Vtx X="332" Y="111" Z="146" S="526" T="206" R="126" G="243" B="0" A="255"/>
-	<Vtx X="332" Y="111" Z="178" S="526" T="142" R="125" G="242" B="14" A="255"/>
-	<Vtx X="330" Y="103" Z="146" S="462" T="206" R="123" G="225" B="0" A="255"/>
-	<Vtx X="330" Y="104" Z="114" S="462" T="142" R="122" G="221" B="244" A="255"/>
-	<Vtx X="324" Y="87" Z="112" S="462" T="142" R="104" G="188" B="229" A="255"/>
-	<Vtx X="324" Y="82" Z="146" S="462" T="206" R="104" G="183" B="0" A="255"/>
-	<Vtx X="324" Y="96" Z="99" S="462" T="78" R="100" G="200" B="201" A="255"/>
-	<Vtx X="332" Y="176" Z="146" S="526" T="206" R="126" G="13" B="0" A="255"/>
-	<Vtx X="330" Y="185" Z="146" S="462" T="206" R="123" G="31" B="0" A="255"/>
-	<Vtx X="330" Y="183" Z="178" S="462" T="142" R="122" G="35" B="12" A="255"/>
-	<Vtx X="330" Y="183" Z="114" S="462" T="142" R="122" G="35" B="244" A="255"/>
-	<Vtx X="332" Y="176" Z="114" S="526" T="142" R="125" G="14" B="242" A="255"/>
-	<Vtx X="332" Y="176" Z="114" S="526" T="142" R="125" G="14" B="242" A="255"/>
-	<Vtx X="332" Y="176" Z="146" S="526" T="206" R="126" G="13" B="0" A="255"/>
-	<Vtx X="332" Y="144" Z="146" S="590" T="206" R="127" G="0" B="0" A="255"/>
-	<Vtx X="332" Y="144" Z="114" S="590" T="142" R="126" G="0" B="243" A="255"/>
-	<Vtx X="332" Y="111" Z="114" S="526" T="142" R="125" G="242" B="242" A="255"/>
-	<Vtx X="332" Y="111" Z="146" S="526" T="206" R="126" G="243" B="0" A="255"/>
-	<Vtx X="332" Y="111" Z="178" S="526" T="142" R="125" G="242" B="14" A="255"/>
-	<Vtx X="332" Y="144" Z="178" S="590" T="142" R="126" G="0" B="13" A="255"/>
-	<Vtx X="330" Y="104" Z="114" S="462" T="142" R="122" G="221" B="244" A="255"/>
+	<Vtx X="5" Y="5" Z="8" S="422" T="14" R="139" G="208" B="12" A="255"/>
+	<Vtx X="5" Y="9" Z="8" S="422" T="14" R="137" G="44" B="8" A="255"/>
+	<Vtx X="8" Y="7" Z="4" S="206" T="14" R="13" G="192" B="147" A="255"/>
+	<Vtx X="5" Y="7" Z="8" S="422" T="-50" R="129" G="0" B="6" A="255"/>
+	<Vtx X="6" Y="5" Z="9" S="462" T="14" R="196" G="229" B="109" A="255"/>
+	<Vtx X="6" Y="4" Z="8" S="422" T="78" R="166" G="166" B="2" A="255"/>
+	<Vtx X="8" Y="7" Z="4" S="206" T="142" R="13" G="192" B="147" A="255"/>
+	<Vtx X="7" Y="3" Z="8" S="422" T="142" R="206" G="139" B="8" A="255"/>
+	<Vtx X="9" Y="3" Z="8" S="422" T="206" R="0" G="129" B="255" A="255"/>
+	<Vtx X="11" Y="3" Z="8" S="422" T="142" R="54" G="141" B="251" A="255"/>
+	<Vtx X="10" Y="4" Z="9" S="462" T="142" R="36" G="188" B="101" A="255"/>
+	<Vtx X="11" Y="4" Z="8" S="422" T="78" R="90" G="167" B="245" A="255"/>
+	<Vtx X="12" Y="5" Z="7" S="422" T="14" R="119" G="212" B="244" A="255"/>
+	<Vtx X="12" Y="9" Z="7" S="422" T="14" R="117" G="48" B="248" A="255"/>
+	<Vtx X="12" Y="7" Z="7" S="422" T="-50" R="126" G="0" B="241" A="255"/>
+	<Vtx X="12" Y="9" Z="8" S="462" T="14" R="78" G="27" B="97" A="255"/>
+	<Vtx X="11" Y="10" Z="8" S="422" T="78" R="89" G="90" B="243" A="255"/>
+	<Vtx X="12" Y="9" Z="8" S="462" T="14" R="78" G="27" B="97" A="255"/>
+	<Vtx X="12" Y="9" Z="7" S="422" T="14" R="117" G="48" B="248" A="255"/>
+	<Vtx X="8" Y="7" Z="4" S="206" T="142" R="13" G="192" B="147" A="255"/>
+	<Vtx X="11" Y="11" Z="8" S="422" T="142" R="52" G="116" B="255" A="255"/>
+	<Vtx X="9" Y="11" Z="8" S="422" T="206" R="255" G="127" B="255" A="255"/>
+	<Vtx X="7" Y="11" Z="8" S="422" T="142" R="180" G="102" B="5" A="255"/>
+	<Vtx X="6" Y="10" Z="8" S="422" T="78" R="165" G="89" B="3" A="255"/>
+	<Vtx X="5" Y="9" Z="8" S="422" T="14" R="137" G="44" B="8" A="255"/>
+	<Vtx X="6" Y="9" Z="9" S="462" T="14" R="196" G="27" B="109" A="255"/>
+	<Vtx X="5" Y="7" Z="8" S="422" T="-50" R="129" G="0" B="6" A="255"/>
+	<Vtx X="6" Y="7" Z="9" S="462" T="-50" R="189" G="0" B="108" A="255"/>
+	<Vtx X="6" Y="5" Z="9" S="462" T="14" R="196" G="229" B="109" A="255"/>
+	<Vtx X="7" Y="7" Z="9" S="462" T="-50" R="236" G="0" B="125" A="255"/>
+	<Vtx X="7" Y="6" Z="9" S="462" T="14" R="232" G="243" B="124" A="255"/>
+	<Vtx X="6" Y="5" Z="9" S="462" T="78" R="210" G="200" B="104" A="255"/>
+	<Vtx X="6" Y="4" Z="8" S="422" T="78" R="166" G="166" B="2" A="255"/>
+	<Vtx X="6" Y="5" Z="9" S="462" T="78" R="210" G="200" B="104" A="255"/>
+	<Vtx X="6" Y="5" Z="9" S="462" T="14" R="196" G="229" B="109" A="255"/>
+	<Vtx X="7" Y="4" Z="9" S="462" T="142" R="238" G="188" B="106" A="255"/>
+	<Vtx X="7" Y="3" Z="8" S="422" T="142" R="206" G="139" B="8" A="255"/>
+	<Vtx X="9" Y="3" Z="8" S="422" T="206" R="0" G="129" B="255" A="255"/>
+	<Vtx X="9" Y="4" Z="9" S="462" T="206" R="9" G="183" B="104" A="255"/>
+	<Vtx X="10" Y="4" Z="9" S="462" T="142" R="36" G="188" B="101" A="255"/>
+	<Vtx X="9" Y="5" Z="9" S="462" T="206" R="10" G="225" B="123" A="255"/>
+	<Vtx X="10" Y="5" Z="9" S="462" T="142" R="23" G="221" B="120" A="255"/>
+	<Vtx X="11" Y="5" Z="9" S="462" T="78" R="64" G="200" B="95" A="255"/>
+	<Vtx X="11" Y="4" Z="8" S="422" T="78" R="90" G="167" B="245" A="255"/>
+	<Vtx X="12" Y="5" Z="8" S="462" T="14" R="78" G="229" B="97" A="255"/>
+	<Vtx X="12" Y="5" Z="7" S="422" T="14" R="119" G="212" B="244" A="255"/>
+	<Vtx X="12" Y="7" Z="7" S="422" T="-50" R="126" G="0" B="241" A="255"/>
+	<Vtx X="12" Y="7" Z="8" S="462" T="-50" R="85" G="0" B="95" A="255"/>
+	<Vtx X="12" Y="9" Z="8" S="462" T="14" R="78" G="27" B="97" A="255"/>
+	<Vtx X="12" Y="7" Z="8" S="462" T="-50" R="85" G="0" B="95" A="255"/>
+	<Vtx X="12" Y="7" Z="7" S="422" T="-50" R="126" G="0" B="241" A="255"/>
+	<Vtx X="11" Y="7" Z="9" S="462" T="-50" R="42" G="0" B="120" A="255"/>
+	<Vtx X="11" Y="9" Z="9" S="462" T="14" R="45" G="13" B="118" A="255"/>
+	<Vtx X="11" Y="10" Z="9" S="462" T="78" R="64" G="56" B="95" A="255"/>
+	<Vtx X="11" Y="10" Z="8" S="422" T="78" R="89" G="90" B="243" A="255"/>
+	<Vtx X="10" Y="10" Z="9" S="462" T="142" R="36" G="68" B="101" A="255"/>
+	<Vtx X="11" Y="11" Z="8" S="422" T="142" R="52" G="116" B="255" A="255"/>
+	<Vtx X="9" Y="11" Z="8" S="422" T="206" R="255" G="127" B="255" A="255"/>
+	<Vtx X="9" Y="10" Z="9" S="462" T="206" R="9" G="73" B="104" A="255"/>
+	<Vtx X="7" Y="10" Z="9" S="462" T="142" R="238" G="68" B="106" A="255"/>
+	<Vtx X="7" Y="11" Z="8" S="422" T="142" R="180" G="102" B="5" A="255"/>
+	<Vtx X="6" Y="10" Z="8" S="422" T="78" R="165" G="89" B="3" A="255"/>
+	<Vtx X="6" Y="10" Z="9" S="462" T="78" R="210" G="56" B="104" A="255"/>
+	<Vtx X="6" Y="9" Z="9" S="462" T="14" R="196" G="27" B="109" A="255"/>
+	<Vtx X="7" Y="9" Z="9" S="462" T="14" R="232" G="13" B="124" A="255"/>
+	<Vtx X="6" Y="10" Z="9" S="462" T="78" R="210" G="56" B="104" A="255"/>
+	<Vtx X="6" Y="9" Z="9" S="462" T="14" R="196" G="27" B="109" A="255"/>
+	<Vtx X="7" Y="7" Z="9" S="462" T="-50" R="236" G="0" B="125" A="255"/>
+	<Vtx X="6" Y="7" Z="9" S="462" T="-50" R="189" G="0" B="108" A="255"/>
+	<Vtx X="7" Y="9" Z="9" S="462" T="78" R="238" G="29" B="122" A="255"/>
+	<Vtx X="7" Y="9" Z="9" S="462" T="142" R="255" G="35" B="122" A="255"/>
+	<Vtx X="7" Y="9" Z="9" S="526" T="142" R="253" G="14" B="126" A="255"/>
+	<Vtx X="7" Y="9" Z="9" S="526" T="78" R="232" G="13" B="124" A="255"/>
+	<Vtx X="7" Y="7" Z="9" S="590" T="142" R="254" G="0" B="127" A="255"/>
+	<Vtx X="7" Y="7" Z="9" S="590" T="78" R="236" G="0" B="125" A="255"/>
+	<Vtx X="7" Y="6" Z="9" S="526" T="78" R="232" G="243" B="124" A="255"/>
+	<Vtx X="7" Y="6" Z="9" S="526" T="142" R="253" G="242" B="126" A="255"/>
+	<Vtx X="7" Y="5" Z="9" S="462" T="78" R="238" G="227" B="122" A="255"/>
+	<Vtx X="7" Y="5" Z="9" S="462" T="142" R="255" G="221" B="122" A="255"/>
+	<Vtx X="6" Y="5" Z="9" S="462" T="78" R="210" G="200" B="104" A="255"/>
+	<Vtx X="6" Y="5" Z="9" S="462" T="78" R="210" G="200" B="104" A="255"/>
+	<Vtx X="7" Y="5" Z="9" S="462" T="78" R="238" G="227" B="122" A="255"/>
+	<Vtx X="7" Y="6" Z="9" S="462" T="14" R="232" G="243" B="124" A="255"/>
+	<Vtx X="7" Y="4" Z="9" S="462" T="142" R="238" G="188" B="106" A="255"/>
+	<Vtx X="7" Y="5" Z="9" S="462" T="142" R="255" G="221" B="122" A="255"/>
+	<Vtx X="9" Y="5" Z="9" S="462" T="206" R="10" G="225" B="123" A="255"/>
+	<Vtx X="9" Y="4" Z="9" S="462" T="206" R="9" G="183" B="104" A="255"/>
+	<Vtx X="9" Y="6" Z="9" S="526" T="206" R="11" G="243" B="126" A="255"/>
+	<Vtx X="7" Y="6" Z="9" S="526" T="142" R="253" G="242" B="126" A="255"/>
+	<Vtx X="9" Y="7" Z="9" S="590" T="206" R="11" G="0" B="127" A="255"/>
+	<Vtx X="10" Y="6" Z="9" S="526" T="142" R="25" G="242" B="124" A="255"/>
+	<Vtx X="10" Y="5" Z="9" S="462" T="142" R="23" G="221" B="120" A="255"/>
+	<Vtx X="10" Y="5" Z="9" S="462" T="78" R="39" G="227" B="117" A="255"/>
+	<Vtx X="11" Y="6" Z="9" S="526" T="78" R="45" G="243" B="118" A="255"/>
+	<Vtx X="10" Y="7" Z="9" S="590" T="142" R="24" G="0" B="125" A="255"/>
+	<Vtx X="11" Y="7" Z="9" S="590" T="78" R="42" G="0" B="120" A="255"/>
+	<Vtx X="10" Y="7" Z="9" S="590" T="142" R="24" G="0" B="125" A="255"/>
+	<Vtx X="11" Y="7" Z="9" S="590" T="78" R="42" G="0" B="120" A="255"/>
+	<Vtx X="11" Y="9" Z="9" S="526" T="78" R="45" G="13" B="118" A="255"/>
+	<Vtx X="10" Y="9" Z="9" S="526" T="142" R="25" G="14" B="124" A="255"/>
+	<Vtx X="10" Y="9" Z="9" S="462" T="78" R="39" G="29" B="117" A="255"/>
+	<Vtx X="10" Y="9" Z="9" S="462" T="142" R="23" G="35" B="120" A="255"/>
+	<Vtx X="11" Y="10" Z="9" S="462" T="78" R="64" G="56" B="95" A="255"/>
+	<Vtx X="11" Y="9" Z="9" S="462" T="14" R="45" G="13" B="118" A="255"/>
+	<Vtx X="10" Y="10" Z="9" S="462" T="142" R="36" G="68" B="101" A="255"/>
+	<Vtx X="9" Y="9" Z="9" S="462" T="206" R="10" G="31" B="123" A="255"/>
+	<Vtx X="9" Y="10" Z="9" S="462" T="206" R="9" G="73" B="104" A="255"/>
+	<Vtx X="7" Y="10" Z="9" S="462" T="142" R="238" G="68" B="106" A="255"/>
+	<Vtx X="7" Y="9" Z="9" S="462" T="142" R="255" G="35" B="122" A="255"/>
+	<Vtx X="6" Y="10" Z="9" S="462" T="78" R="210" G="56" B="104" A="255"/>
+	<Vtx X="9" Y="9" Z="9" S="526" T="206" R="11" G="13" B="126" A="255"/>
+	<Vtx X="7" Y="9" Z="9" S="526" T="142" R="253" G="14" B="126" A="255"/>
+	<Vtx X="7" Y="9" Z="9" S="526" T="142" R="253" G="14" B="126" A="255"/>
+	<Vtx X="9" Y="7" Z="9" S="590" T="206" R="11" G="0" B="127" A="255"/>
+	<Vtx X="9" Y="9" Z="9" S="526" T="206" R="11" G="13" B="126" A="255"/>
+	<Vtx X="7" Y="7" Z="9" S="590" T="142" R="254" G="0" B="127" A="255"/>
+	<Vtx X="7" Y="6" Z="9" S="526" T="142" R="253" G="242" B="126" A="255"/>
+	<Vtx X="10" Y="9" Z="9" S="526" T="142" R="25" G="14" B="124" A="255"/>
+	<Vtx X="10" Y="7" Z="9" S="590" T="142" R="24" G="0" B="125" A="255"/>
+	<Vtx X="10" Y="6" Z="9" S="526" T="142" R="25" G="242" B="124" A="255"/>
+	<Vtx X="10" Y="9" Z="9" S="462" T="142" R="23" G="35" B="120" A="255"/>
+	<Vtx X="9" Y="9" Z="9" S="462" T="206" R="10" G="31" B="123" A="255"/>
+	<Vtx X="11" Y="7" Z="9" S="462" T="-50" R="42" G="0" B="120" A="255"/>
+	<Vtx X="12" Y="5" Z="8" S="462" T="14" R="78" G="229" B="97" A="255"/>
+	<Vtx X="12" Y="7" Z="8" S="462" T="-50" R="85" G="0" B="95" A="255"/>
+	<Vtx X="11" Y="6" Z="9" S="462" T="14" R="45" G="243" B="118" A="255"/>
+	<Vtx X="11" Y="5" Z="9" S="462" T="78" R="64" G="200" B="95" A="255"/>
+	<Vtx X="10" Y="5" Z="9" S="462" T="78" R="39" G="227" B="117" A="255"/>
+	<Vtx X="11" Y="5" Z="9" S="462" T="78" R="64" G="200" B="95" A="255"/>
+	<Vtx X="10" Y="5" Z="9" S="462" T="78" R="39" G="227" B="117" A="255"/>
+	<Vtx X="10" Y="5" Z="9" S="462" T="142" R="23" G="221" B="120" A="255"/>
+	<Vtx X="-2" Y="5" Z="9" S="422" T="14" R="117" G="208" B="248" A="255"/>
+	<Vtx X="-6" Y="7" Z="5" S="206" T="14" R="224" G="192" B="151" A="255"/>
+	<Vtx X="-2" Y="9" Z="9" S="422" T="14" R="119" G="44" B="244" A="255"/>
+	<Vtx X="-2" Y="7" Z="9" S="422" T="-50" R="126" G="0" B="241" A="255"/>
+	<Vtx X="-3" Y="9" Z="10" S="462" T="14" R="78" G="27" B="97" A="255"/>
+	<Vtx X="-3" Y="10" Z="9" S="422" T="78" R="89" G="90" B="244" A="255"/>
+	<Vtx X="-6" Y="7" Z="5" S="206" T="142" R="224" G="192" B="151" A="255"/>
+	<Vtx X="-4" Y="11" Z="9" S="422" T="142" R="76" G="102" B="252" A="255"/>
+	<Vtx X="-6" Y="11" Z="9" S="422" T="206" R="1" G="127" B="254" A="255"/>
+	<Vtx X="-8" Y="11" Z="9" S="422" T="142" R="204" G="116" B="7" A="255"/>
+	<Vtx X="-9" Y="10" Z="9" S="422" T="78" R="166" G="90" B="3" A="255"/>
+	<Vtx X="-10" Y="9" Z="9" S="422" T="14" R="139" G="48" B="12" A="255"/>
+	<Vtx X="-9" Y="9" Z="10" S="462" T="14" R="196" G="27" B="109" A="255"/>
+	<Vtx X="-9" Y="9" Z="10" S="462" T="14" R="196" G="27" B="109" A="255"/>
+	<Vtx X="-10" Y="9" Z="9" S="422" T="14" R="139" G="48" B="12" A="255"/>
+	<Vtx X="-10" Y="7" Z="9" S="422" T="-50" R="129" G="0" B="6" A="255"/>
+	<Vtx X="-10" Y="5" Z="9" S="422" T="14" R="137" G="212" B="8" A="255"/>
+	<Vtx X="-6" Y="7" Z="5" S="206" T="14" R="224" G="192" B="151" A="255"/>
+	<Vtx X="-9" Y="4" Z="9" S="422" T="78" R="166" G="166" B="3" A="255"/>
+	<Vtx X="-8" Y="3" Z="9" S="422" T="142" R="202" G="141" B="4" A="255"/>
+	<Vtx X="-8" Y="4" Z="10" S="462" T="142" R="238" G="188" B="106" A="255"/>
+	<Vtx X="-6" Y="3" Z="9" S="422" T="206" R="0" G="129" B="254" A="255"/>
+	<Vtx X="-6" Y="7" Z="5" S="206" T="142" R="224" G="192" B="151" A="255"/>
+	<Vtx X="-4" Y="3" Z="9" S="422" T="142" R="52" G="140" B="255" A="255"/>
+	<Vtx X="-3" Y="4" Z="9" S="422" T="78" R="89" G="167" B="244" A="255"/>
+	<Vtx X="-2" Y="5" Z="9" S="422" T="14" R="117" G="208" B="248" A="255"/>
+	<Vtx X="-3" Y="5" Z="10" S="462" T="14" R="78" G="229" B="97" A="255"/>
+	<Vtx X="-2" Y="7" Z="9" S="422" T="-50" R="126" G="0" B="241" A="255"/>
+	<Vtx X="-3" Y="7" Z="10" S="462" T="-50" R="85" G="0" B="95" A="255"/>
+	<Vtx X="-2" Y="7" Z="9" S="422" T="-50" R="126" G="0" B="241" A="255"/>
+	<Vtx X="-3" Y="9" Z="10" S="462" T="14" R="78" G="27" B="97" A="255"/>
+	<Vtx X="-3" Y="7" Z="10" S="462" T="-50" R="85" G="0" B="95" A="255"/>
+	<Vtx X="-4" Y="7" Z="10" S="462" T="-50" R="42" G="0" B="120" A="255"/>
+	<Vtx X="-4" Y="9" Z="10" S="462" T="14" R="45" G="13" B="118" A="255"/>
+	<Vtx X="-4" Y="10" Z="10" S="462" T="78" R="64" G="56" B="95" A="255"/>
+	<Vtx X="-3" Y="10" Z="9" S="422" T="78" R="89" G="90" B="244" A="255"/>
+	<Vtx X="-4" Y="10" Z="10" S="462" T="142" R="36" G="68" B="101" A="255"/>
+	<Vtx X="-4" Y="11" Z="9" S="422" T="142" R="76" G="102" B="252" A="255"/>
+	<Vtx X="-6" Y="11" Z="9" S="422" T="206" R="1" G="127" B="254" A="255"/>
+	<Vtx X="-6" Y="10" Z="10" S="462" T="206" R="9" G="73" B="104" A="255"/>
+	<Vtx X="-8" Y="10" Z="10" S="462" T="142" R="238" G="68" B="106" A="255"/>
+	<Vtx X="-8" Y="11" Z="9" S="422" T="142" R="204" G="116" B="7" A="255"/>
+	<Vtx X="-9" Y="10" Z="9" S="422" T="78" R="166" G="90" B="3" A="255"/>
+	<Vtx X="-8" Y="10" Z="10" S="462" T="78" R="210" G="56" B="104" A="255"/>
+	<Vtx X="-9" Y="9" Z="10" S="462" T="14" R="196" G="27" B="109" A="255"/>
+	<Vtx X="-8" Y="10" Z="10" S="462" T="78" R="210" G="56" B="104" A="255"/>
+	<Vtx X="-9" Y="9" Z="10" S="462" T="14" R="196" G="27" B="109" A="255"/>
+	<Vtx X="-8" Y="9" Z="10" S="462" T="14" R="232" G="13" B="124" A="255"/>
+	<Vtx X="-8" Y="7" Z="10" S="462" T="-50" R="236" G="0" B="125" A="255"/>
+	<Vtx X="-9" Y="7" Z="10" S="462" T="-50" R="189" G="0" B="108" A="255"/>
+	<Vtx X="-10" Y="7" Z="9" S="422" T="-50" R="129" G="0" B="6" A="255"/>
+	<Vtx X="-9" Y="5" Z="10" S="462" T="14" R="196" G="229" B="109" A="255"/>
+	<Vtx X="-10" Y="5" Z="9" S="422" T="14" R="137" G="212" B="8" A="255"/>
+	<Vtx X="-9" Y="4" Z="9" S="422" T="78" R="166" G="166" B="3" A="255"/>
+	<Vtx X="-8" Y="5" Z="10" S="462" T="78" R="210" G="200" B="104" A="255"/>
+	<Vtx X="-8" Y="4" Z="10" S="462" T="142" R="238" G="188" B="106" A="255"/>
+	<Vtx X="-7" Y="5" Z="10" S="462" T="142" R="255" G="221" B="122" A="255"/>
+	<Vtx X="-6" Y="5" Z="10" S="462" T="206" R="10" G="225" B="123" A="255"/>
+	<Vtx X="-6" Y="4" Z="10" S="462" T="206" R="9" G="183" B="104" A="255"/>
+	<Vtx X="-6" Y="3" Z="9" S="422" T="206" R="0" G="129" B="254" A="255"/>
+	<Vtx X="-4" Y="4" Z="10" S="462" T="142" R="36" G="188" B="101" A="255"/>
+	<Vtx X="-6" Y="3" Z="9" S="422" T="206" R="0" G="129" B="254" A="255"/>
+	<Vtx X="-4" Y="3" Z="9" S="422" T="142" R="52" G="140" B="255" A="255"/>
+	<Vtx X="-4" Y="4" Z="10" S="462" T="142" R="36" G="188" B="101" A="255"/>
+	<Vtx X="-3" Y="4" Z="9" S="422" T="78" R="89" G="167" B="244" A="255"/>
+	<Vtx X="-4" Y="5" Z="10" S="462" T="78" R="64" G="200" B="95" A="255"/>
+	<Vtx X="-3" Y="5" Z="10" S="462" T="14" R="78" G="229" B="97" A="255"/>
+	<Vtx X="-4" Y="6" Z="10" S="462" T="14" R="45" G="243" B="118" A="255"/>
+	<Vtx X="-4" Y="7" Z="10" S="462" T="-50" R="42" G="0" B="120" A="255"/>
+	<Vtx X="-3" Y="7" Z="10" S="462" T="-50" R="85" G="0" B="95" A="255"/>
+	<Vtx X="-4" Y="5" Z="10" S="462" T="78" R="39" G="227" B="117" A="255"/>
+	<Vtx X="-4" Y="5" Z="10" S="462" T="142" R="23" G="221" B="120" A="255"/>
+	<Vtx X="-4" Y="6" Z="10" S="526" T="142" R="25" G="242" B="124" A="255"/>
+	<Vtx X="-4" Y="6" Z="10" S="526" T="78" R="45" G="243" B="118" A="255"/>
+	<Vtx X="-4" Y="7" Z="10" S="590" T="142" R="24" G="0" B="125" A="255"/>
+	<Vtx X="-4" Y="7" Z="10" S="590" T="78" R="42" G="0" B="120" A="255"/>
+	<Vtx X="-4" Y="9" Z="10" S="526" T="78" R="45" G="13" B="118" A="255"/>
+	<Vtx X="-4" Y="9" Z="10" S="526" T="78" R="45" G="13" B="118" A="255"/>
+	<Vtx X="-4" Y="9" Z="10" S="526" T="142" R="25" G="14" B="124" A="255"/>
+	<Vtx X="-4" Y="7" Z="10" S="590" T="142" R="24" G="0" B="125" A="255"/>
+	<Vtx X="-4" Y="9" Z="10" S="462" T="78" R="39" G="29" B="117" A="255"/>
+	<Vtx X="-4" Y="9" Z="10" S="462" T="142" R="23" G="35" B="120" A="255"/>
+	<Vtx X="-4" Y="10" Z="10" S="462" T="78" R="64" G="56" B="95" A="255"/>
+	<Vtx X="-4" Y="9" Z="10" S="462" T="14" R="45" G="13" B="118" A="255"/>
+	<Vtx X="-4" Y="10" Z="10" S="462" T="142" R="36" G="68" B="101" A="255"/>
+	<Vtx X="-6" Y="9" Z="10" S="462" T="206" R="10" G="31" B="123" A="255"/>
+	<Vtx X="-6" Y="10" Z="10" S="462" T="206" R="9" G="73" B="104" A="255"/>
+	<Vtx X="-8" Y="10" Z="10" S="462" T="142" R="238" G="68" B="106" A="255"/>
+	<Vtx X="-7" Y="9" Z="10" S="462" T="142" R="255" G="35" B="122" A="255"/>
+	<Vtx X="-8" Y="10" Z="10" S="462" T="78" R="210" G="56" B="104" A="255"/>
+	<Vtx X="-8" Y="9" Z="10" S="462" T="78" R="238" G="29" B="122" A="255"/>
+	<Vtx X="-8" Y="9" Z="10" S="462" T="14" R="232" G="13" B="124" A="255"/>
+	<Vtx X="-7" Y="9" Z="11" S="526" T="142" R="253" G="14" B="126" A="255"/>
+	<Vtx X="-6" Y="9" Z="10" S="526" T="206" R="11" G="13" B="126" A="255"/>
+	<Vtx X="-7" Y="9" Z="10" S="462" T="142" R="255" G="35" B="122" A="255"/>
+	<Vtx X="-7" Y="9" Z="11" S="526" T="142" R="253" G="14" B="126" A="255"/>
+	<Vtx X="-6" Y="7" Z="10" S="590" T="206" R="11" G="0" B="127" A="255"/>
+	<Vtx X="-7" Y="7" Z="11" S="590" T="142" R="254" G="0" B="127" A="255"/>
+	<Vtx X="-8" Y="9" Z="10" S="526" T="78" R="232" G="13" B="124" A="255"/>
+	<Vtx X="-8" Y="9" Z="10" S="462" T="78" R="238" G="29" B="122" A="255"/>
+	<Vtx X="-8" Y="7" Z="10" S="590" T="78" R="236" G="0" B="125" A="255"/>
+	<Vtx X="-8" Y="6" Z="10" S="526" T="78" R="232" G="243" B="124" A="255"/>
+	<Vtx X="-7" Y="6" Z="11" S="526" T="142" R="253" G="242" B="126" A="255"/>
+	<Vtx X="-8" Y="5" Z="10" S="462" T="78" R="238" G="227" B="122" A="255"/>
+	<Vtx X="-7" Y="5" Z="10" S="462" T="142" R="255" G="221" B="122" A="255"/>
+	<Vtx X="-8" Y="5" Z="10" S="462" T="78" R="210" G="200" B="104" A="255"/>
+	<Vtx X="-8" Y="6" Z="10" S="462" T="14" R="232" G="243" B="124" A="255"/>
+	<Vtx X="-9" Y="5" Z="10" S="462" T="14" R="196" G="229" B="109" A="255"/>
+	<Vtx X="-8" Y="7" Z="10" S="462" T="-50" R="236" G="0" B="125" A="255"/>
+	<Vtx X="-8" Y="7" Z="10" S="462" T="-50" R="236" G="0" B="125" A="255"/>
+	<Vtx X="-9" Y="7" Z="10" S="462" T="-50" R="189" G="0" B="108" A="255"/>
+	<Vtx X="-9" Y="5" Z="10" S="462" T="14" R="196" G="229" B="109" A="255"/>
+	<Vtx X="-7" Y="5" Z="10" S="462" T="142" R="255" G="221" B="122" A="255"/>
+	<Vtx X="-6" Y="6" Z="10" S="526" T="206" R="11" G="243" B="126" A="255"/>
+	<Vtx X="-7" Y="6" Z="11" S="526" T="142" R="253" G="242" B="126" A="255"/>
+	<Vtx X="-6" Y="5" Z="10" S="462" T="206" R="10" G="225" B="123" A="255"/>
+	<Vtx X="-4" Y="5" Z="10" S="462" T="142" R="23" G="221" B="120" A="255"/>
+	<Vtx X="-4" Y="4" Z="10" S="462" T="142" R="36" G="188" B="101" A="255"/>
+	<Vtx X="-6" Y="4" Z="10" S="462" T="206" R="9" G="183" B="104" A="255"/>
+	<Vtx X="-4" Y="5" Z="10" S="462" T="78" R="64" G="200" B="95" A="255"/>
+	<Vtx X="-6" Y="9" Z="10" S="526" T="206" R="11" G="13" B="126" A="255"/>
+	<Vtx X="-6" Y="9" Z="10" S="462" T="206" R="10" G="31" B="123" A="255"/>
+	<Vtx X="-7" Y="9" Z="10" S="462" T="142" R="255" G="35" B="122" A="255"/>
+	<Vtx X="-4" Y="9" Z="10" S="462" T="142" R="23" G="35" B="120" A="255"/>
+	<Vtx X="-4" Y="9" Z="10" S="526" T="142" R="25" G="14" B="124" A="255"/>
+	<Vtx X="-4" Y="9" Z="10" S="526" T="142" R="25" G="14" B="124" A="255"/>
+	<Vtx X="-6" Y="9" Z="10" S="526" T="206" R="11" G="13" B="126" A="255"/>
+	<Vtx X="-6" Y="7" Z="10" S="590" T="206" R="11" G="0" B="127" A="255"/>
+	<Vtx X="-4" Y="7" Z="10" S="590" T="142" R="24" G="0" B="125" A="255"/>
+	<Vtx X="-4" Y="6" Z="10" S="526" T="142" R="25" G="242" B="124" A="255"/>
+	<Vtx X="-6" Y="6" Z="10" S="526" T="206" R="11" G="243" B="126" A="255"/>
+	<Vtx X="-7" Y="6" Z="11" S="526" T="142" R="253" G="242" B="126" A="255"/>
+	<Vtx X="-7" Y="7" Z="11" S="590" T="142" R="254" G="0" B="127" A="255"/>
+	<Vtx X="-4" Y="5" Z="10" S="462" T="142" R="23" G="221" B="120" A="255"/>
 </Vertex>
diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_surface b/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_surface
index 1b5b65898..ea4bbdc17 100644
--- a/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_surface
+++ b/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_surface
@@ -15,7 +15,7 @@
 	<PipeSync/>
 	<SetTile Format="G_IM_FMT_I" Size="G_IM_SIZ_8b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
 	<SetTileSize T="0" Uls="0" Ult="0" Lrs="124" Lrt="124"/>
-	<SetPrimColor M="0" L="0" R="255" G="255" B="255" A="255"/>
+	<!-- <SetPrimColor M="0" L="0" R="255" G="255" B="255" A="255"/> -->
 	<EndDisplayList/>
 </DisplayList>
 
diff --git a/soh/soh/Enhancements/randomizer/draw.cpp b/soh/soh/Enhancements/randomizer/draw.cpp
index 636f2528c..fd325e7d1 100644
--- a/soh/soh/Enhancements/randomizer/draw.cpp
+++ b/soh/soh/Enhancements/randomizer/draw.cpp
@@ -262,44 +262,46 @@ extern "C" void Randomizer_DrawTriforcePieceGI(PlayState* play, GetItemEntry get
 
 extern "C" void Randomizer_DrawBossSoul(PlayState* play, GetItemEntry* getItemEntry) {
     s16 slot = getItemEntry->getItemId - RG_GOHMA_SOUL;
-    s16 colors[9][3] = {
-        { 0, 255, 0 },   // Deku Tree
-        { 255, 0, 100 },   // Dodongo's Cavern
-        { 50, 255, 255},   // Jabu
-        { 4, 195, 46 },    // Forest Temple
-        { 237, 95, 95 },   // Fire Temple
-        { 85, 180, 223 },  // Water Temple
-        { 222, 158, 47 },  // Spirit Temple
-        { 126, 16, 177 },  // Shadow Temple
-        { 80, 80, 80 },    // Ganon's Castle
-
+    s16 flameColors[9][3] = {
+        { 0, 255, 0 },     // Gohma
+        { 255, 0, 100 },   // King Dodongo
+        { 50, 255, 255},   // Barinade
+        { 4, 195, 46 },    // Phantom Ganon
+        { 237, 95, 95 },   // Volvagia
+        { 85, 180, 223 },  // Morpha
+        { 126, 16, 177 },  // Bongo Bongo
+        { 222, 158, 47 },  // Twinrova
+        { 80, 80, 80 },    // Ganon/Dorf
     };
     OPEN_DISPS(play->state.gfxCtx);
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
     gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
               G_MTX_MODELVIEW | G_MTX_LOAD);
+    if (slot == 8) { // For Ganon only...
+        gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0, 0, 0, 255);
+    } else {
+        gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 255);
+    }
     gSPDisplayList(POLY_XLU_DISP++, (Gfx*)gBossSoulSkullDL);
     
-    
-    // TODO Add flame as backdrop for test model?
-    // Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-    // gSPSegment(POLY_XLU_DISP++, 8, (uintptr_t)Gfx_TwoTexScroll(
-    //     play->state.gfxCtx, 0, 0 * (play->state.frames * 0),
-    //     0 * (play->state.frames * 0), 16, 32, 1, 1 * (play->state.frames * 1),
-    //     -1 * (play->state.frames * 8), 16, 32
-    // ));
-    // Matrix_Push();
-    // gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
-    //           G_MTX_MODELVIEW | G_MTX_LOAD);
-    // //Matrix_Translate(0.0f, -50.0f, 0.0f, MTXMODE_APPLY);
-    // //Matrix_Scale(5.0f, 5.0f, 5.0f, MTXMODE_APPLY);
-    // Matrix_ReplaceRotation(&play->billboardMtxF);
-    // gDPSetGrayscaleColor(POLY_XLU_DISP++, colors[slot][0], colors[slot][1], colors[slot][2], 255);
-    // gSPGrayscale(POLY_XLU_DISP++, true);
-    // gSPDisplayList(POLY_XLU_DISP++, (Gfx*)gGiBlueFireFlameDL);
-    // gSPGrayscale(POLY_XLU_DISP++, false);
-    // Matrix_Pop();
+    Gfx_SetupDL_25Xlu(play->state.gfxCtx);
+    gSPSegment(POLY_XLU_DISP++, 8, (uintptr_t)Gfx_TwoTexScroll(
+        play->state.gfxCtx, 0, 0 * (play->state.frames * 0),
+        0 * (play->state.frames * 0), 16, 32, 1, 1 * (play->state.frames * 1),
+        -1 * (play->state.frames * 8), 16, 32
+    ));
+    Matrix_Push();
+    Matrix_Translate(0.0f, -70.0f, 0.0f, MTXMODE_APPLY);
+    Matrix_Scale(5.0f, 5.0f, 5.0f, MTXMODE_APPLY);
+    Matrix_ReplaceRotation(&play->billboardMtxF);
+    gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
+              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gDPSetGrayscaleColor(POLY_XLU_DISP++, flameColors[slot][0], flameColors[slot][1], flameColors[slot][2], 255);
+    gSPGrayscale(POLY_XLU_DISP++, true);
+    gSPDisplayList(POLY_XLU_DISP++, (Gfx*)gGiBlueFireFlameDL);
+    gSPGrayscale(POLY_XLU_DISP++, false);
+    Matrix_Pop();
 
     CLOSE_DISPS(play->state.gfxCtx);
 

From 58aab05e41636f39f7ef7e2b13bffed9ef24aef2 Mon Sep 17 00:00:00 2001
From: Ralphie Morell <stratomaster64@gmail.com>
Date: Tue, 31 Oct 2023 23:54:05 -0400
Subject: [PATCH 020/230] cleanup hook

---
 soh/soh/Enhancements/mods.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/soh/soh/Enhancements/mods.cpp b/soh/soh/Enhancements/mods.cpp
index 84ccbe94a..212bdb587 100644
--- a/soh/soh/Enhancements/mods.cpp
+++ b/soh/soh/Enhancements/mods.cpp
@@ -1060,12 +1060,14 @@ void RegisterBossSouls() {
             default: break;
         }
 
-    //Deletes all actors in the boss category if the soul isn't found, with the exception of ToT since Zora's Sapphire becomes a boss for some reason.
-    //See `z_demo_effect.c`
-    if (!Flags_GetRandomizerInf(rand_inf) && actual->category == ACTORCAT_BOSS && gPlayState->sceneNum != SCENE_TEMPLE_OF_TIME) {
-        Actor_Delete(&gPlayState->actorCtx, actual, gPlayState);
-    }
-    });
+    //Deletes all actors in the boss category if the soul isn't found.
+    //Some actors, like Dark Link, Arwings, and Zora's Sapphire...?, are in this category despite not being actual bosses,
+    //so ignore any "boss" if `rand_inf` doesn't change from RAND_INF_MAX.
+    if (rand_inf != RAND_INF_MAX) {
+         if (!Flags_GetRandomizerInf(rand_inf) && actual->category == ACTORCAT_BOSS) {
+            Actor_Delete(&gPlayState->actorCtx, actual, gPlayState);
+        }
+    }});
 
 }
 

From 4006c10bda5b1a16a6349e9e72745d621ac2cd92 Mon Sep 17 00:00:00 2001
From: Ralphie Morell <stratomaster64@gmail.com>
Date: Wed, 1 Nov 2023 22:15:03 -0400
Subject: [PATCH 021/230] don't kill ganon if no ganon boss soul setting; save
 editor support

---
 soh/soh/Enhancements/debugger/debugSaveEditor.h | 10 ++++++++++
 soh/soh/Enhancements/mods.cpp                   |  6 +++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.h b/soh/soh/Enhancements/debugger/debugSaveEditor.h
index 3c3b66d73..96af28375 100644
--- a/soh/soh/Enhancements/debugger/debugSaveEditor.h
+++ b/soh/soh/Enhancements/debugger/debugSaveEditor.h
@@ -503,6 +503,16 @@ const std::vector<FlagTable> flagTables = {
         { RAND_INF_CHILD_FISHING, "RAND_INF_CHILD_FISHING" },
         { RAND_INF_ADULT_FISHING, "RAND_INF_ADULT_FISHING" },
         { RAND_INF_10_BIG_POES, "RAND_INF_10_BIG_POES" },
+
+        { RAND_INF_GOHMA_SOUL, "RAND_INF_GOHMA_SOUL" },
+        { RAND_INF_KING_DODONGO_SOUL, "RAND_INF_KING_DODONGO_SOUL" },
+        { RAND_INF_BARINADE_SOUL, "RAND_INF_BARINADE_SOUL" },
+        { RAND_INF_PHANTOM_GANON_SOUL, "RAND_INF_PHANTOM_GANON_SOUL" },
+        { RAND_INF_VOLVAGIA_SOUL, "RAND_INF_VOLVAGIA_SOUL" },
+        { RAND_INF_MORPHA_SOUL, "RAND_INF_MORPHA_SOUL" },
+        { RAND_INF_BONGO_BONGO_SOUL, "RAND_INF_BONGO_BONGO_SOUL" },
+        { RAND_INF_TWINROVA_SOUL, "RAND_INF_TWINROVA_SOUL" },
+        { RAND_INF_GANON_SOUL, "RAND_INF_GANON_SOUL" },
     } },
 };
 
diff --git a/soh/soh/Enhancements/mods.cpp b/soh/soh/Enhancements/mods.cpp
index 212bdb587..24bdb7ca7 100644
--- a/soh/soh/Enhancements/mods.cpp
+++ b/soh/soh/Enhancements/mods.cpp
@@ -1052,10 +1052,10 @@ void RegisterBossSouls() {
                 rand_inf = RAND_INF_TWINROVA_SOUL;
                 break;
             case SCENE_GANONDORF_BOSS:
-                rand_inf = RAND_INF_GANON_SOUL;
-                break;
             case SCENE_GANON_BOSS:
-                rand_inf = RAND_INF_GANON_SOUL;
+                if (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_BOSS_SOULS) == RO_BOSS_SOULS_ON_PLUS_GANON) {
+                    rand_inf = RAND_INF_GANON_SOUL;
+                }
                 break;
             default: break;
         }

From 051314e8b1f452cbfa62abe7decac73b8b5ae071 Mon Sep 17 00:00:00 2001
From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Date: Thu, 2 Nov 2023 16:42:33 +0000
Subject: [PATCH 022/230] Refactor Hint Creation and add support for hint
 Copies and fixed number of hints. (#3205)

* Initial implementation of no-duplicates of special hints

* stupid fixes

* Impa's song will no longer be hinted when you skip child zelda

* fix building

* Fix Loading spoiler logs causing corrupt hints, remove disabled warp song shuffle text from spoiler logs

* Remove Sheik and Saria hints from the spoiler log when are not enabled

* Prevent Magic hinted by Saria and Light Arrows hinted by Sheik from being hinted elsewhere unless they are locked by that item.

* Prevent the Final Frogs gossip stone hint from spawning when the special final frogs hint is enabled.

* Fix building after rebasing in deduplication

* redelete keys.hpp

* Remove Sheik and Saria hints from the spoiler log when are not enabled

* Prevent the Final Frogs gossip stone hint from spawning when the special final frogs hint is enabled.

* First part of copies implementation

* Refactor hint system (broken)

* fix building

* fix obvious errors

* fix fixed hints doubling after failing to place a hint

* Fix bugs with hint distrabution

* Split PlaceRandomHint and fix hint bugs

* Merge special hint functions, move special hint text to the HintTable, expand LightArrow hint category into OtherHint category.

* Fix remaining hint distribution errors

* Forgot to stage dampe diary update

* Restore building after conflict resolution

* fix SetAllInRegionAsHinted
---
 .../Enhancements/randomizer/3drando/fill.cpp  |  21 +-
 .../Enhancements/randomizer/3drando/fill.hpp  |   4 +-
 .../randomizer/3drando/hint_list.cpp          |  70 +-
 .../Enhancements/randomizer/3drando/hints.cpp | 864 ++++++++----------
 .../Enhancements/randomizer/3drando/hints.hpp |  21 +-
 .../randomizer/3drando/spoiler_log.cpp        |  12 +-
 .../Enhancements/randomizer/randomizer.cpp    |  14 +-
 .../Enhancements/randomizer/randomizerTypes.h |  17 +-
 8 files changed, 480 insertions(+), 543 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/fill.cpp b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
index 3f1f685be..a3db898b3 100644
--- a/soh/soh/Enhancements/randomizer/3drando/fill.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
@@ -1098,20 +1098,13 @@ int Fill() {
       printf("Done");
       ctx->CreateItemOverrides();
       CreateEntranceOverrides();
-      //Always execute ganon hint generation for the funny line  
-      CreateGanonAndSheikText();
-      CreateAltarText();
-      CreateDampesDiaryText();
-      CreateGregRupeeHint();
-      CreateSariaText();
-      if (GossipStoneHints.IsNot(HINTS_NO_HINTS)) {
-        printf("\x1b[10;10HCreating Hints...");
-        CreateAllHints();
-        printf("Done");
-      }
-      if (ShuffleMerchants.Is(SHUFFLEMERCHANTS_HINTS)) {
-        CreateMerchantsHints();
-      }
+
+      //funny ganon line
+      Text ganonText = RandomElement(GetHintCategory(HintCategory::GanonLine)).GetText();
+      CreateMessageFromTextObject(0x70CB, 0, 2, 3, AddColorsAndFormat(ganonText));
+      SetGanonText(ganonText);
+      
+      CreateAllHints();
       CreateWarpSongTexts();
       return 1;
     }
diff --git a/soh/soh/Enhancements/randomizer/3drando/fill.hpp b/soh/soh/Enhancements/randomizer/3drando/fill.hpp
index 0b0ab59d8..0a9f1fab2 100644
--- a/soh/soh/Enhancements/randomizer/3drando/fill.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/fill.hpp
@@ -21,7 +21,9 @@ void ClearProgress();
 void VanillaFill();
 int Fill();
 
+std::vector<RandomizerCheck> GetEmptyLocations(std::vector<RandomizerCheck> allowedLocations);
+
 std::vector<RandomizerCheck> GetAccessibleLocations(const std::vector<RandomizerCheck>& allowedLocations,
                                              SearchMode mode = SearchMode::ReachabilitySearch, std::string ignore = "",
                                              bool checkPoeCollectorAccess = false,
-                                             bool checkOtherEntranceAccess = false);
+                                             bool checkOtherEntranceAccess = false);
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
index c8e1d4fa2..5fd267b88 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
@@ -472,7 +472,7 @@ void HintTable_Init() {
         Text{ "a #cow behind webs# in a grotto gifts", /*french*/ "la #vache derrière les toiles# d'une grotte donne",
               /*spanish*/ "una #vaca tras la telaraña# de una cueva brinda" });
 
-    hintTable[RHT_ZR_FROGS_OCARINA_GAME] = HintText::Always(
+    hintTable[RHT_ZR_FROGS_OCARINA_GAME] = HintText::Sometimes(
         {
             // obscure text
             Text{ "an #amphibian feast# yields", /*french*/ "un #festin d'amphibiens# donne",
@@ -2949,7 +2949,7 @@ void HintTable_Init() {
     | LIGHT ARROW LOCATION TEXT|
     ---------------------------*/
 
-    hintTable[RHT_LIGHT_ARROW_LOCATION_HINT] = HintText::LightArrow({
+    hintTable[RHT_LIGHT_ARROW_LOCATION_HINT] = HintText::OtherHint({
         // obscure text
         Text{
             "Ha ha ha... You'll never beat me by reflecting my lightning bolts and unleashing the arrows from ",
@@ -2959,7 +2959,7 @@ void HintTable_Init() {
             "Ja, ja, ja... Nunca me derrotarás reflejando mis esferas de energía y desplegando la flecha de luz de " },
     });
 
-    hintTable[RHT_SHEIK_LIGHT_ARROW_HINT] = HintText::LightArrow({
+    hintTable[RHT_SHEIK_LIGHT_ARROW_HINT] = HintText::OtherHint({
         // obscure text
         Text{
             "I overheard Ganondorf say that he misplaced the %yLight Arrows%w in&%r",
@@ -2974,6 +2974,70 @@ void HintTable_Init() {
         Text{ "your pocket", /*french*/ "tes poches", /*spanish*/ "tu bolsillo" },
     });
 
+    /*--------------------------
+    |      OTHER HINT TEXT     |
+    ---------------------------*/
+
+    hintTable[RHT_DAMPE_DIARY01] = HintText::OtherHint({
+        // obscure text
+        Text{
+            "Whoever reads this, please enter %r", 
+            /*french*/
+            "Toi qui lit ce journal, rends-toi dans %r",
+            /*german?*/
+            "Wer immer dies liest, der möge folgenden Ort aufsuchen: %r"},
+    });
+
+    hintTable[RHT_DAMPE_DIARY02] = HintText::OtherHint({
+        // obscure text
+        Text{
+            "%w. I will let you have my stretching, shrinking keepsake.^I'm waiting for you.&--Dampé",
+            /*french*/
+            "%w. Et peut-être auras-tu droit à mon précieux %rtrésor%w.^Je t'attends...&--Igor",
+            /*german?*/
+            "%w. Ihm gebe ich meinen langen, kurzen Schatz.^Ich warte!&Boris"},
+    });
+
+    hintTable[RHT_GREG_HINT01] = HintText::OtherHint({
+        // obscure text
+        Text{
+            "By the way, if you're interested, I saw the shiniest %gGreen Rupee%w somewhere in%g ", 
+            /*french*/
+            "Au fait, si ça t'intéresse, j'ai aperçu le plus éclatant des %gRubis Verts%w quelque part à %g",
+            /*spanish*/
+            ""},
+    });
+
+    hintTable[RHT_GREG_HINT02] = HintText::OtherHint({
+        // obscure text
+        Text{
+            "%w.^It's said to have %rmysterious powers%w...^But then, it could just be another regular rupee.&Oh well.",
+            /*french*/
+            "%w. On dit qu'il possède des pouvoirs mystérieux... Mais bon, ça pourrait juste être un autre rubis ordinaire.",
+            /*spanish*/
+            ""},
+    });
+
+    hintTable[RHT_SARIA_TEXT01] = HintText::OtherHint({
+        // obscure text
+        Text{
+            "Did you feel the %gsurge of magic%w recently? A mysterious bird told me it came from %g", 
+            /*french*/
+            "As-tu récemment ressenti une vague de %gpuissance magique%w? Un mystérieux hibou m'a dit  qu'elle provenait du %g",
+            /*spanish*/
+            ""},
+    });
+
+    hintTable[RHT_SARIA_TEXT02] = HintText::OtherHint({
+        // obscure text
+        Text{
+            "%w.^You should check that place out, @!$C",
+            /*french*/
+            "%w. Tu devrais aller y jeter un coup d'oeil, @!$C",
+            /*spanish*/
+            "%w.$C"},
+    });
+
     /*--------------------------
     |      GANON LINE TEXT     |
     ---------------------------*/
diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.cpp b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
index f3d2051bb..f3d44dfc8 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hints.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
@@ -20,20 +20,20 @@ using namespace Logic;
 using namespace Settings;
 using namespace Trial;
 
-std::unordered_map<HintType, std::string> hintTypeNames = {
-    { HINT_TYPE_TRIAL, "Trial" },
-    { HINT_TYPE_ALWAYS, "Always" },
-    { HINT_TYPE_WOTH, "WotH" },
-    { HINT_TYPE_BARREN, "Barren" },
-    { HINT_TYPE_ENTRANCE, "Entrance" },
-    { HINT_TYPE_SOMETIMES, "Sometimes" },
-    { HINT_TYPE_RANDOM, "Random"},
-    { HINT_TYPE_ITEM, "Item" },
-    { HINT_TYPE_SONG, "Song" },
-    { HINT_TYPE_OVERWORLD, "Overworld" },
-    { HINT_TYPE_DUNGEON, "Dungeon" },
-    { HINT_TYPE_JUNK, "Junk" },
-    { HINT_TYPE_NAMED_ITEM, "NamedItem" },
+std::array<std::string, HINT_TYPE_MAX> hintTypeNames = {
+    "Static",
+    "Trial",
+    "WotH",
+    "Barren",
+    "Entrance",
+    "Always",
+    "Sometimes",
+    "Song",
+    "Overworld",
+    "Dungeon",
+    "Named Item",
+    "Random",
+    "Junk"
 };
 
 constexpr std::array<HintSetting, 4> hintSettingTable{{
@@ -43,19 +43,19 @@ constexpr std::array<HintSetting, 4> hintSettingTable{{
     .dungeonsBarrenLimit = 1,
     .namedItemsRequired = false,
     .distTable = {{
-      {.type = HINT_TYPE_TRIAL,     .order =  1, .weight =  0, .fixed = 0, .copies = 0},
-      {.type = HINT_TYPE_ALWAYS,    .order =  2, .weight =  0, .fixed = 0, .copies = 0},
-      {.type = HINT_TYPE_WOTH,      .order =  3, .weight =  0, .fixed = 0, .copies = 0},
-      {.type = HINT_TYPE_BARREN,    .order =  4, .weight =  0, .fixed = 0, .copies = 0},
-      {.type = HINT_TYPE_ENTRANCE,  .order =  5, .weight =  0, .fixed = 0, .copies = 0},
-      {.type = HINT_TYPE_SOMETIMES, .order =  6, .weight =  0, .fixed = 0, .copies = 0},
-      {.type = HINT_TYPE_RANDOM,    .order =  7, .weight =  0, .fixed = 0, .copies = 0},
-      {.type = HINT_TYPE_ITEM,      .order =  8, .weight =  0, .fixed = 0, .copies = 0},
-      {.type = HINT_TYPE_SONG,      .order =  9, .weight =  0, .fixed = 0, .copies = 0},
-      {.type = HINT_TYPE_OVERWORLD, .order = 10, .weight =  0, .fixed = 0, .copies = 0},
-      {.type = HINT_TYPE_DUNGEON,   .order = 11, .weight =  0, .fixed = 0, .copies = 0},
-      {.type = HINT_TYPE_JUNK,      .order = 12, .weight = 99, .fixed = 0, .copies = 0},
-      {.type = HINT_TYPE_NAMED_ITEM, .order = 13, .weight =  0, .fixed = 0, .copies = 0},
+      {.type = HINT_TYPE_STATIC,    .weight =  0, .fixed = 0, .copies = 0},
+      {.type = HINT_TYPE_TRIAL,     .weight =  0, .fixed = 0, .copies = 0},
+      {.type = HINT_TYPE_WOTH,      .weight =  0, .fixed = 0, .copies = 0},
+      {.type = HINT_TYPE_BARREN,    .weight =  0, .fixed = 0, .copies = 0},
+      {.type = HINT_TYPE_ENTRANCE,  .weight =  0, .fixed = 0, .copies = 0},
+      {.type = HINT_TYPE_ALWAYS,    .weight =  0, .fixed = 0, .copies = 0},
+      {.type = HINT_TYPE_SOMETIMES, .weight =  0, .fixed = 0, .copies = 0},
+      {.type = HINT_TYPE_SONG,      .weight =  0, .fixed = 0, .copies = 0},
+      {.type = HINT_TYPE_OVERWORLD, .weight =  0, .fixed = 0, .copies = 0},
+      {.type = HINT_TYPE_DUNGEON,   .weight =  0, .fixed = 0, .copies = 0},
+      {.type = HINT_TYPE_NAMED_ITEM,.weight =  0, .fixed = 0, .copies = 0},
+      {.type = HINT_TYPE_RANDOM,    .weight =  0, .fixed = 0, .copies = 0},
+      {.type = HINT_TYPE_JUNK,      .weight =  1, .fixed = 0, .copies = 1},
     }},
   },
 
@@ -65,19 +65,19 @@ constexpr std::array<HintSetting, 4> hintSettingTable{{
     .dungeonsBarrenLimit = 1,
     .namedItemsRequired = true,
     .distTable = {{
-      {.type = HINT_TYPE_TRIAL,     .order =  1, .weight =  0, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_ALWAYS,    .order =  2, .weight =  0, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_WOTH,      .order =  3, .weight =  7, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_BARREN,    .order =  4, .weight =  4, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_ENTRANCE,  .order =  5, .weight =  6, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_SOMETIMES, .order =  6, .weight =  0, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_RANDOM,    .order =  7, .weight = 12, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_ITEM,      .order =  8, .weight = 10, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_SONG,      .order =  9, .weight =  2, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_OVERWORLD, .order = 10, .weight =  4, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_DUNGEON,   .order = 11, .weight =  3, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_JUNK,      .order = 12, .weight =  6, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_NAMED_ITEM, .order = 13, .weight =  0, .fixed = 0, .copies = 1},
+      {.type = HINT_TYPE_STATIC,    .weight =  0, .fixed = 0, .copies = 0},
+      {.type = HINT_TYPE_TRIAL,     .weight =  0, .fixed = 0, .copies = 1},
+      {.type = HINT_TYPE_WOTH,      .weight =  7, .fixed = 0, .copies = 1},
+      {.type = HINT_TYPE_BARREN,    .weight =  4, .fixed = 0, .copies = 1},
+      {.type = HINT_TYPE_ENTRANCE,  .weight =  0, .fixed = 0, .copies = 1}, //not yet implemented, should be 6 weight
+      {.type = HINT_TYPE_ALWAYS,    .weight =  0, .fixed = 0, .copies = 1},
+      {.type = HINT_TYPE_SOMETIMES, .weight =  0, .fixed = 0, .copies = 1},
+      {.type = HINT_TYPE_SONG,      .weight =  2, .fixed = 0, .copies = 1},
+      {.type = HINT_TYPE_OVERWORLD, .weight =  4, .fixed = 0, .copies = 1},
+      {.type = HINT_TYPE_DUNGEON,   .weight =  3, .fixed = 0, .copies = 1},
+      {.type = HINT_TYPE_NAMED_ITEM,.weight = 10, .fixed = 0, .copies = 1},
+      {.type = HINT_TYPE_RANDOM,    .weight = 12, .fixed = 0, .copies = 1},
+      {.type = HINT_TYPE_JUNK,      .weight =  6, .fixed = 0, .copies = 1}, //Junk is hardcoded to 1 copy to avoid fill in issues, this setting is ignored
     }},
   },
 
@@ -87,19 +87,19 @@ constexpr std::array<HintSetting, 4> hintSettingTable{{
     .dungeonsBarrenLimit = 1,
     .namedItemsRequired = true,
     .distTable = {{
-      {.type = HINT_TYPE_TRIAL,     .order =  1, .weight =  0, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_ALWAYS,    .order =  2, .weight =  0, .fixed = 0, .copies = 2},
-      {.type = HINT_TYPE_WOTH,      .order =  3, .weight = 12, .fixed = 0, .copies = 2},
-      {.type = HINT_TYPE_BARREN,    .order =  4, .weight = 12, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_ENTRANCE,  .order =  5, .weight =  4, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_SOMETIMES, .order =  6, .weight =  0, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_RANDOM,    .order =  7, .weight =  8, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_ITEM,      .order =  8, .weight =  8, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_SONG,      .order =  9, .weight =  4, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_OVERWORLD, .order = 10, .weight =  6, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_DUNGEON,   .order = 11, .weight =  6, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_JUNK,      .order = 12, .weight =  0, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_NAMED_ITEM, .order = 13, .weight =  0, .fixed = 0, .copies = 1},
+      {.type = HINT_TYPE_STATIC,    .weight =  0, .fixed = 0, .copies = 0},
+      {.type = HINT_TYPE_TRIAL,     .weight =  0, .fixed = 0, .copies = 1},
+      {.type = HINT_TYPE_WOTH,      .weight = 12, .fixed = 0, .copies = 2},
+      {.type = HINT_TYPE_BARREN,    .weight = 12, .fixed = 0, .copies = 1},
+      {.type = HINT_TYPE_ENTRANCE,  .weight =  0, .fixed = 0, .copies = 1}, //not yet implemented, should be 4 weight
+      {.type = HINT_TYPE_ALWAYS,    .weight =  0, .fixed = 0, .copies = 2},
+      {.type = HINT_TYPE_SOMETIMES, .weight =  0, .fixed = 0, .copies = 1},
+      {.type = HINT_TYPE_SONG,      .weight =  4, .fixed = 0, .copies = 1},
+      {.type = HINT_TYPE_OVERWORLD, .weight =  6, .fixed = 0, .copies = 1},
+      {.type = HINT_TYPE_DUNGEON,   .weight =  6, .fixed = 0, .copies = 1},
+      {.type = HINT_TYPE_NAMED_ITEM,.weight =  8, .fixed = 0, .copies = 1},
+      {.type = HINT_TYPE_RANDOM,    .weight =  8, .fixed = 0, .copies = 1},
+      {.type = HINT_TYPE_JUNK,      .weight =  0, .fixed = 0, .copies = 1},
     }},
   },
 
@@ -109,25 +109,23 @@ constexpr std::array<HintSetting, 4> hintSettingTable{{
     .dungeonsBarrenLimit = 40,
     .namedItemsRequired = true,
     .distTable = {{
-      {.type = HINT_TYPE_TRIAL,     .order =  1, .weight =  0, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_ALWAYS,    .order =  2, .weight =  0, .fixed = 0, .copies = 2},
-      {.type = HINT_TYPE_WOTH,      .order =  3, .weight = 15, .fixed = 0, .copies = 2},
-      {.type = HINT_TYPE_BARREN,    .order =  4, .weight = 15, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_ENTRANCE,  .order =  5, .weight = 10, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_SOMETIMES, .order =  6, .weight =  0, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_RANDOM,    .order =  7, .weight =  0, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_ITEM,      .order =  8, .weight =  5, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_SONG,      .order =  9, .weight =  2, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_OVERWORLD, .order = 10, .weight =  7, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_DUNGEON,   .order = 11, .weight =  7, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_JUNK,      .order = 12, .weight =  0, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_NAMED_ITEM, .order = 13, .weight =  0, .fixed = 0, .copies = 1},
+      {.type = HINT_TYPE_STATIC,    .weight =  0, .fixed = 0, .copies = 0},
+      {.type = HINT_TYPE_TRIAL,     .weight =  0, .fixed = 0, .copies = 1},
+      {.type = HINT_TYPE_WOTH,      .weight = 15, .fixed = 0, .copies = 2},
+      {.type = HINT_TYPE_BARREN,    .weight = 15, .fixed = 0, .copies = 1},
+      {.type = HINT_TYPE_ENTRANCE,  .weight =  0, .fixed = 0, .copies = 1}, //not yet implemented, should be 10 weight
+      {.type = HINT_TYPE_ALWAYS,    .weight =  0, .fixed = 0, .copies = 2},
+      {.type = HINT_TYPE_SOMETIMES, .weight =  0, .fixed = 0, .copies = 1},
+      {.type = HINT_TYPE_SONG,      .weight =  2, .fixed = 0, .copies = 1},
+      {.type = HINT_TYPE_OVERWORLD, .weight =  7, .fixed = 0, .copies = 1},
+      {.type = HINT_TYPE_DUNGEON,   .weight =  7, .fixed = 0, .copies = 1},
+      {.type = HINT_TYPE_NAMED_ITEM,.weight =  5, .fixed = 0, .copies = 1},
+      {.type = HINT_TYPE_RANDOM,    .weight =  0, .fixed = 0, .copies = 1},
+      {.type = HINT_TYPE_JUNK,      .weight =  0, .fixed = 0, .copies = 1},
     }},
   },
 }};
 
-std::array<DungeonInfo, 10> dungeonInfoData;
-
 Text childAltarText;
 Text adultAltarText;
 Text ganonText;
@@ -144,8 +142,10 @@ Text warpNocturneText;
 Text warpPreludeText;
 
 std::string lightArrowHintLoc;
-std::string sariaHintLoc;
 std::string dampeHintLoc;
+std::string gregHintLoc;
+std::string sariaHintLoc;
+
 
 Text& GetChildAltarText() {
   return childAltarText;
@@ -155,6 +155,10 @@ Text& GetAdultAltarText() {
   return adultAltarText;
 }
 
+void SetGanonText(Text text){
+  ganonText = text;
+}
+
 Text& GetGanonText() {
   return ganonText;
 }
@@ -211,6 +215,10 @@ std::string GetDampeHintLoc() {
     return dampeHintLoc;
 }
 
+std::string GetGregHintLoc() {
+    return gregHintLoc;
+}
+
 std::string GetSariaHintLoc() {
   return sariaHintLoc;
 }
@@ -260,6 +268,11 @@ uint32_t GetLocationRegionuint32_t(const RandomizerCheck location) {
   return GetHintRegion(Rando::Context::GetInstance()->GetItemLocation(location)->GetParentRegionKey())->hintKey;
 }
 
+static std::vector<RandomizerCheck> GetEmptyGossipStones() {
+  auto emptyGossipStones = GetEmptyLocations(Rando::StaticData::gossipStoneLocations);
+  return emptyGossipStones;
+}
+
 static std::vector<RandomizerCheck> GetAccessibleGossipStones(const RandomizerCheck hintedLocation = RC_GANON) {
   auto ctx = Rando::Context::GetInstance();
   //temporarily remove the hinted location's item, and then perform a
@@ -294,7 +307,17 @@ bool IsReachableWithout(std::vector<RandomizerCheck> locsToCheck, RandomizerChec
   return true;
 }
 
-static void AddHint(Text hint, const RandomizerCheck gossipStone, const std::vector<uint8_t>& colors = {}, HintType hintType = HINT_TYPE_ITEM, const RandomizerCheck hintedLocation = RC_UNKNOWN_CHECK) {
+static void SetAllInRegionAsHinted(RandomizerHintTextKey region, std::vector<RandomizerCheck> locations){
+  auto ctx = Rando::Context::GetInstance();
+  std::vector<RandomizerCheck> locsInRegion = FilterFromPool(locations, [region, ctx](const RandomizerCheck loc){
+                                        return GetHintRegion(ctx->GetItemLocation(loc)->GetParentRegionKey())->hintKey == region;
+                                      });
+  for(RandomizerCheck loc: locsInRegion){
+    ctx->GetItemLocation(loc)->SetAsHinted();
+  }
+}
+
+static void AddHint(Text hint, const RandomizerCheck gossipStone, const std::vector<uint8_t>& colors = {}, HintType hintType = HINT_TYPE_NAMED_ITEM, const RandomizerCheck hintedLocation = RC_UNKNOWN_CHECK) {
   //save hints as dummy items for writing to the spoiler log
   //NewItem(gossipStone, Item{RG_HINT, hint, ITEMTYPE_EVENT, GI_RUPEE_BLUE_LOSE, false, &noVariable, NONE});
   //GetLocation(gossipStone)->SetPlacedItem(gossipStone);
@@ -304,68 +327,104 @@ static void AddHint(Text hint, const RandomizerCheck gossipStone, const std::vec
   ctx->GetItemLocation(gossipStone)->SetPlacedItem(RG_HINT);
 }
 
-static void CreateLocationHint(const std::vector<RandomizerCheck>& possibleHintLocations) {
-  auto ctx = Rando::Context::GetInstance();
-  //return if there aren't any hintable locations or gossip stones available
-  if (possibleHintLocations.empty()) {
-      SPDLOG_DEBUG("\tNO LOCATIONS TO HINT\n\n");
-    return;
+static void AddHintCopies(uint8_t copies, Text hint, std::vector<uint8_t> colours, HintType type, RandomizerCheck location = RC_UNKNOWN_CHECK, RandomizerCheck firstStone = RC_UNKNOWN_CHECK){
+  if (firstStone != RC_UNKNOWN_CHECK && copies > 0){
+      AddHint(hint, firstStone, colours, type, location);
+      copies -= 1;
   }
-
-  RandomizerCheck hintedLocation = RandomElement(possibleHintLocations);
-  const std::vector<RandomizerCheck> accessibleGossipStones = GetAccessibleGossipStones(hintedLocation);
-
-  SPDLOG_DEBUG("\tLocation: ");
-  SPDLOG_DEBUG(Rando::StaticData::GetLocation(hintedLocation)->GetName());
-  SPDLOG_DEBUG("\n");
-
-  SPDLOG_DEBUG("\tItem: ");
-  SPDLOG_DEBUG(ctx->GetItemLocation(hintedLocation)->GetPlacedItemName().GetEnglish());
-  SPDLOG_DEBUG("\n");
-
-  if (accessibleGossipStones.empty()) {
+  for(int c=0; c<copies; c++){
+    //get a random gossip stone
+    auto gossipStones = GetEmptyGossipStones();
+    if (gossipStones.empty()) {
       SPDLOG_DEBUG("\tNO GOSSIP STONES TO PLACE HINT\n\n");
-    return;
+      return;
+    }
+    auto gossipStone = RandomElement(gossipStones, false);
+
+    AddHint(hint, gossipStone, colours, type, location);
+  }
+}
+
+
+static bool CreateHint(RandomizerCheck hintedLocation, uint8_t copies, HintType type){
+  auto ctx = Rando::Context::GetInstance();
+  //get a gossip stone accessible without the hinted item
+  std::vector<RandomizerCheck> gossipStoneLocations;
+  gossipStoneLocations = GetAccessibleGossipStones(hintedLocation);
+
+  if (gossipStoneLocations.empty()) { 
+      SPDLOG_DEBUG("\tNO IN LOGIC GOSSIP STONE\n\n"); 
+      return false;
   }
 
-  RandomizerCheck gossipStone = RandomElement(accessibleGossipStones);
-  ctx->GetItemLocation(hintedLocation)->SetAsHinted();
+  RandomizerCheck gossipStone = RandomElement(gossipStoneLocations);
 
   //make hint text
-  Text locationHintText = Rando::StaticData::GetLocation(hintedLocation)->GetHint()->GetText();
-  Text itemHintText = ctx->GetItemLocation(hintedLocation)->GetPlacedItem().GetHint().GetText();
+  Text finalHint;
   Text prefix = Hint(RHT_PREFIX).GetText();
+  std::vector<uint8_t> colours = {QM_GREEN, QM_RED};
+  if (type == HINT_TYPE_WOTH){
+    Text regionText = GetHintRegion(ctx->GetItemLocation(hintedLocation)->GetParentRegionKey())->GetHint().GetText();
+    finalHint = prefix + "%r#" + regionText + "#%w" + Hint(RHT_WAY_OF_THE_HERO).GetText();
+    colours = {QM_LBLUE};
+  }
+  else if(type == HINT_TYPE_BARREN){
+    Text regionText = GetHintRegion(ctx->GetItemLocation(hintedLocation)->GetParentRegionKey())->GetHint().GetText();
+    finalHint = prefix + Hint(RHT_PLUNDERING).GetText() + "%r#" + regionText + "#%w" + Hint(RHT_FOOLISH).GetText();
+    colours = {QM_PINK};
+  }
+  else {
+    Text itemText = ctx->GetItemLocation(hintedLocation)->GetPlacedItem().GetHint().GetText();
+    if (type >= HINT_TYPE_ALWAYS && type < HINT_TYPE_NAMED_ITEM){
+      Text locationText = Rando::StaticData::GetLocation(hintedLocation)->GetHint()->GetText();
+      finalHint = prefix + locationText + " #"+itemText+"#.";
+    }
+    else if (type == HINT_TYPE_NAMED_ITEM || type == HINT_TYPE_RANDOM){
+      Text regionText = GetHintRegion(ctx->GetItemLocation(hintedLocation)->GetParentRegionKey())->GetHint().GetText();
+      // RANDOTODO: reconsider dungeon vs non-dungeon item location hints when boss shuffle mixed pools happens
+      if (Rando::StaticData::GetLocation(hintedLocation)->IsDungeon()) {
+        finalHint = prefix+"%r#"+regionText+"#%w "+Hint(RHT_HOARDS).GetText()+" %g#"+itemText+"#%w.";
+      } else {
+        finalHint = prefix+"%r#"+itemText+"#%w "+Hint(RHT_CAN_BE_FOUND_AT).GetText()+" %g#"+regionText+"#%w.";
+        colours = {QM_RED, QM_GREEN};
+      }
+    }
+    else{
+      SPDLOG_DEBUG("\tINVALID HINT TYPE\n\n");
+      return false;
+    }
+  }
   
-  Text finalHint = prefix + "%r" + locationHintText + " #%g" + itemHintText + "#%w.";
+  ctx->GetItemLocation(hintedLocation)->SetAsHinted();
+
   SPDLOG_DEBUG("\tMessage: ");
   SPDLOG_DEBUG(finalHint.english);
   SPDLOG_DEBUG("\n\n");
 
-  AddHint(finalHint, gossipStone, {QM_GREEN, QM_RED}, HINT_TYPE_ITEM, hintedLocation);
+  AddHintCopies(copies, finalHint, colours, type, hintedLocation, gossipStone);
+
+  return true;
 }
 
-static void CreateWothHint(uint8_t* remainingDungeonWothHints) {
-    auto ctx = Rando::Context::GetInstance();
-    // get locations that are in the current playthrough
-    std::vector<RandomizerCheck> possibleHintLocations = {};
-    // iterate through playthrough locations by sphere
-    std::vector<RandomizerCheck> wothHintLocations =
-        FilterFromPool(ctx->wothLocations, [remainingDungeonWothHints, ctx](RandomizerCheck loc) {
-            return ctx->GetItemLocation(loc)->IsHintable() &&    // only filter hintable locations
-                   !(ctx->GetItemLocation(loc)->IsHintedAt()) && // only filter locations that haven't been hinted at
-                   (Rando::StaticData::GetLocation(loc)->IsOverworld() ||
-                    (Rando::StaticData::GetLocation(loc)->IsDungeon() &&
-                     (*remainingDungeonWothHints) > 0)); // make sure we haven't surpassed the woth dungeon limit
-        });
-    AddElementsToPool(possibleHintLocations, wothHintLocations);
 
-    // If no more locations can be hinted at for woth, then just try to get another hint
+static RandomizerCheck CreateRandomHint(std::vector<RandomizerCheck>& possibleHintLocations, uint8_t copies, HintType type) {
+  auto ctx = Rando::Context::GetInstance();
+
+  //return if there aren't any hintable locations or gossip stones available
+  if (GetEmptyGossipStones().size() < copies) {
+    SPDLOG_DEBUG("\tNOT ENOUGH GOSSIP STONES TO PLACE HINTS\n\n");
+    return RC_UNKNOWN_CHECK;
+  }
+
+  RandomizerCheck hintedLocation;
+  bool placed = false;
+  while (!placed){
     if (possibleHintLocations.empty()) {
         SPDLOG_DEBUG("\tNO LOCATIONS TO HINT\n\n");
-        return;
+      return RC_UNKNOWN_CHECK;
     }
-    RandomizerCheck hintedLocation = RandomElement(possibleHintLocations);
-
+    hintedLocation = RandomElement(possibleHintLocations, true); //removing the location to avoid it being hinted again on fail
+   
     SPDLOG_DEBUG("\tLocation: ");
     SPDLOG_DEBUG(Rando::StaticData::GetLocation(hintedLocation)->GetName());
     SPDLOG_DEBUG("\n");
@@ -374,147 +433,32 @@ static void CreateWothHint(uint8_t* remainingDungeonWothHints) {
     SPDLOG_DEBUG(ctx->GetItemLocation(hintedLocation)->GetPlacedItemName().GetEnglish());
     SPDLOG_DEBUG("\n");
 
-    // get an accessible gossip stone
-    const std::vector<RandomizerCheck> gossipStoneLocations = GetAccessibleGossipStones(hintedLocation);
-
-    if (gossipStoneLocations.empty()) {
-        SPDLOG_DEBUG("\tNO GOSSIP STONES TO PLACE HINT\n\n");
-        return;
-    }
-    ctx->GetItemLocation(hintedLocation)->SetAsHinted();
-    RandomizerCheck gossipStone = RandomElement(gossipStoneLocations);
-
-    if (Rando::StaticData::GetLocation(hintedLocation)->IsDungeon()) {
-        *remainingDungeonWothHints -= 1;
-    }
-
-    // form hint text
-    Text locationText = GetHintRegion(ctx->GetItemLocation(hintedLocation)->GetParentRegionKey())->GetHint().GetText();
-    Text finalWothHint = Hint(RHT_PREFIX).GetText() + "%r#" + locationText + "#%w" + Hint(RHT_WAY_OF_THE_HERO).GetText();
-    SPDLOG_DEBUG("\tMessage: ");
-    SPDLOG_DEBUG(finalWothHint.english);
-    SPDLOG_DEBUG("\n\n");
-    AddHint(finalWothHint, gossipStone, { QM_LBLUE }, HINT_TYPE_WOTH, hintedLocation);
+    placed = CreateHint(hintedLocation, copies, type);
+  }
+  if (type == HINT_TYPE_BARREN){
+     SetAllInRegionAsHinted(GetHintRegion(ctx->GetItemLocation(hintedLocation)->GetParentRegionKey())->hintKey, possibleHintLocations);
+  }
+  return hintedLocation;
 }
 
-static void CreateBarrenHint(uint8_t* remainingDungeonBarrenHints, std::vector<RandomizerCheck>& barrenLocations) {
-    auto ctx = Rando::Context::GetInstance();
-    // remove dungeon locations if necessary
-    if (*remainingDungeonBarrenHints < 1) {
-        barrenLocations =
-            FilterFromPool(barrenLocations, [](const RandomizerCheck loc) { 
-              return !(Rando::StaticData::GetLocation(loc)->IsDungeon()); 
-            });
-    }
-
-    if (barrenLocations.empty()) {
-        return;
-    }
-
-    RandomizerCheck hintedLocation = RandomElement(barrenLocations, true);
-
-    SPDLOG_DEBUG("\tLocation: ");
-    SPDLOG_DEBUG(Rando::StaticData::GetLocation(hintedLocation)->GetName());
-    SPDLOG_DEBUG("\n");
-
-    SPDLOG_DEBUG("\tItem: ");
-    SPDLOG_DEBUG(ctx->GetItemLocation(hintedLocation)->GetPlacedItemName().GetEnglish());
-    SPDLOG_DEBUG("\n");
-
-    // get an accessible gossip stone
-    const std::vector<RandomizerCheck> gossipStoneLocations = GetAccessibleGossipStones(hintedLocation);
-    if (gossipStoneLocations.empty()) {
-        SPDLOG_DEBUG("\tNO GOSSIP STONES TO PLACE HINT\n\n");
-        return;
-    }
-    ctx->GetItemLocation(hintedLocation)->SetAsHinted();
-    RandomizerCheck gossipStone = RandomElement(gossipStoneLocations);
-
-    if (Rando::StaticData::GetLocation(hintedLocation)->IsDungeon()) {
-        *remainingDungeonBarrenHints -= 1;
-    }
-
-    // form hint text
-    Text locationText = GetHintRegion(ctx->GetItemLocation(hintedLocation)->GetParentRegionKey())->GetHint().GetText();
-    Text finalBarrenHint =
-        Hint(RHT_PREFIX).GetText() + Hint(RHT_PLUNDERING).GetText() + "%r#" + locationText + "#%w" + Hint(RHT_FOOLISH).GetText();
-    SPDLOG_DEBUG("\tMessage: ");
-    SPDLOG_DEBUG(finalBarrenHint.english);
-    SPDLOG_DEBUG("\n\n");
-    AddHint(finalBarrenHint, gossipStone, { QM_PINK }, HINT_TYPE_BARREN, hintedLocation);
-
-    // get rid of all other locations in this same barren region
-    barrenLocations = FilterFromPool(barrenLocations, [hintedLocation, ctx](RandomizerCheck loc) {
-        return GetHintRegion(ctx->GetItemLocation(loc)->GetParentRegionKey())->hintKey !=
-               GetHintRegion(ctx->GetItemLocation(hintedLocation)->GetParentRegionKey())->hintKey;
-    });
-}
-
-static void CreateRandomLocationHint(const bool goodItem = false) {
+static std::vector<RandomizerCheck> FilterHintability(std::vector<RandomizerCheck>& locations, const bool goodItemsOnly = false, const bool dungeonsOK = true){
   auto ctx = Rando::Context::GetInstance();
-  const std::vector<RandomizerCheck> possibleHintLocations = FilterFromPool(ctx->allLocations, [goodItem, ctx](const RandomizerCheck loc) {
-    return ctx->GetItemLocation(loc)->IsHintable() && !(ctx->GetItemLocation(loc)->IsHintedAt()) && (!goodItem || ctx->GetItemLocation(loc)->GetPlacedItem().IsMajorItem());
+  return FilterFromPool(locations, [goodItemsOnly, dungeonsOK, ctx](const RandomizerCheck loc) {
+    return ctx->GetItemLocation(loc)->IsHintable() && !(ctx->GetItemLocation(loc)->IsHintedAt()) && 
+    (!goodItemsOnly || ctx->GetItemLocation(loc)->GetPlacedItem().IsMajorItem()) && (dungeonsOK || Rando::StaticData::GetLocation(loc)->IsOverworld());
   });
-  //If no more locations can be hinted at, then just try to get another hint
-  if (possibleHintLocations.empty()) {
-    SPDLOG_DEBUG("\tNO LOCATIONS TO HINT\n\n");
-    return;
-  }
-  RandomizerCheck hintedLocation = RandomElement(possibleHintLocations);
-
-  SPDLOG_DEBUG("\tLocation: ");
-  SPDLOG_DEBUG(Rando::StaticData::GetLocation(hintedLocation)->GetName());
-  SPDLOG_DEBUG("\n");
-
-  SPDLOG_DEBUG("\tItem: ");
-  SPDLOG_DEBUG(ctx->GetItemLocation(hintedLocation)->GetPlacedItemName().GetEnglish());
-  SPDLOG_DEBUG("\n");
-
-  //get an acessible gossip stone
-  const std::vector<RandomizerCheck> gossipStoneLocations = GetAccessibleGossipStones(hintedLocation);
-  if (gossipStoneLocations.empty()) {
-      SPDLOG_DEBUG("\tNO GOSSIP STONES TO PLACE HINT\n\n");
-    return;
-  }
-  ctx->GetItemLocation(hintedLocation)->SetAsHinted();
-  RandomizerCheck gossipStone = RandomElement(gossipStoneLocations);
-
-  //form hint text
-  Text itemText = ctx->GetItemLocation(hintedLocation)->GetPlacedItem().GetHint().GetText();
-  Text locationText = GetHintRegion(ctx->GetItemLocation(hintedLocation)->GetParentRegionKey())->GetHint().GetText();
-  // RANDOTODO: reconsider dungeon vs non-dungeon item location hints when boss shuffle mixed pools happens
-  if (Rando::StaticData::GetLocation(hintedLocation)->IsDungeon()) {
-    Text finalHint = Hint(RHT_PREFIX).GetText()+"%r#"+locationText+"#%w "+Hint(RHT_HOARDS).GetText()+" %g#"+itemText+"#%w.";
-    SPDLOG_DEBUG("\tMessage: ");
-    SPDLOG_DEBUG(finalHint.english);
-    SPDLOG_DEBUG("\n\n");
-    AddHint(finalHint, gossipStone, {QM_GREEN, QM_RED}, HINT_TYPE_NAMED_ITEM, hintedLocation);
-  } else {
-    Text finalHint = Hint(RHT_PREFIX).GetText()+"%r#"+itemText+"#%w "+Hint(RHT_CAN_BE_FOUND_AT).GetText()+" %g#"+locationText+"#%w.";
-    SPDLOG_DEBUG("\tMessage: ");
-    SPDLOG_DEBUG(finalHint.english);
-    SPDLOG_DEBUG("\n\n");
-    AddHint(finalHint, gossipStone, { QM_RED, QM_GREEN }, HINT_TYPE_NAMED_ITEM, hintedLocation);
-  }
 }
 
 static void CreateJunkHint() {
   //duplicate junk hints are possible for now
   const HintText junkHint = RandomElement(GetHintCategory(HintCategory::Junk));
-  LogicReset();
-  const std::vector<RandomizerCheck> gossipStones = GetAccessibleLocations(Rando::StaticData::gossipStoneLocations);
-  if (gossipStones.empty()) {
-      SPDLOG_DEBUG("\tNO GOSSIP STONES TO PLACE HINT\n\n");
-    return;
-  }
-  RandomizerCheck gossipStone = RandomElement(gossipStones);
   Text hint = junkHint.GetText();
 
   SPDLOG_DEBUG("\tMessage: ");
   SPDLOG_DEBUG(hint.english);
   SPDLOG_DEBUG("\n\n");
 
-  AddHint(hint, gossipStone, { QM_PINK }, HINT_TYPE_JUNK);
+  AddHintCopies(1, hint, {QM_PINK}, HINT_TYPE_JUNK);
 }
 
 static std::vector<RandomizerCheck> CalculateBarrenRegions() {
@@ -550,32 +494,16 @@ static std::vector<RandomizerCheck> CalculateBarrenRegions() {
   return finalBarrenLocations;
 }
 
-static void CreateTrialHints() {
+static void CreateTrialHints(uint8_t copies) {
+  Text prefix = Hint(RHT_PREFIX).GetText();
     //six trials
   if (RandomGanonsTrials && GanonsTrialsCount.Is(6)) {
-
-    //get a random gossip stone
-    auto gossipStones = GetAccessibleGossipStones();
-    auto gossipStone = RandomElement(gossipStones, false);
-
-    //make hint
-    auto hint = Hint(RHT_PREFIX).GetText() + Hint(RHT_SIX_TRIALS).GetText();
-    AddHint(hint, gossipStone, { QM_PINK }, HINT_TYPE_TRIAL);
-
+    AddHintCopies(copies, prefix + Hint(RHT_SIX_TRIALS).GetText(), {QM_PINK}, HINT_TYPE_TRIAL);
     //zero trials
   } else if (RandomGanonsTrials && GanonsTrialsCount.Is(0)) {
-
-    //get a random gossip stone
-    auto gossipStones = GetAccessibleGossipStones();
-    auto gossipStone = RandomElement(gossipStones, false);
-
-    //make hint
-    auto hint = Hint(RHT_PREFIX).GetText() + Hint(RHT_ZERO_TRIALS).GetText();
-    AddHint(hint, gossipStone, { QM_YELLOW }, HINT_TYPE_TRIAL);
-
+    AddHintCopies(copies, prefix + Hint(RHT_ZERO_TRIALS).GetText(), {QM_YELLOW}, HINT_TYPE_TRIAL);
     //4 or 5 required trials
   } else if (GanonsTrialsCount.Is(5) || GanonsTrialsCount.Is(4)) {
-
     //get skipped trials
     std::vector<TrialInfo*> trials = {};
     trials.assign(trialList.begin(), trialList.end());
@@ -583,13 +511,9 @@ static void CreateTrialHints() {
 
     //create a hint for each skipped trial
     for (auto& trial : skippedTrials) {
-      //get a random gossip stone
-      auto gossipStones = GetAccessibleGossipStones();
-      auto gossipStone = RandomElement(gossipStones, false);
-
       //make hint
-      auto hint = Hint(RHT_PREFIX).GetText()+"#"+trial->GetName()+"#"+Hint(RHT_FOUR_TO_FIVE_TRIALS).GetText();
-      AddHint(hint, gossipStone, { QM_YELLOW }, HINT_TYPE_TRIAL);
+      auto hint = prefix+"#"+trial->GetName()+"#"+Hint(RHT_FOUR_TO_FIVE_TRIALS).GetText();
+      AddHintCopies(copies, hint, {QM_YELLOW}, HINT_TYPE_TRIAL);
     }
     //1 to 3 trials
   } else if (GanonsTrialsCount.Value<uint8_t>() >= 1 && GanonsTrialsCount.Value<uint8_t>() <= 3) {
@@ -600,23 +524,16 @@ static void CreateTrialHints() {
 
     //create a hint for each required trial
     for (auto& trial : requiredTrials) {
-      //get a random gossip stone
-      auto gossipStones = GetAccessibleGossipStones();
-      auto gossipStone = RandomElement(gossipStones, false);
-
       //make hint
-      auto hint = Hint(RHT_PREFIX).GetText()+"#"+trial->GetName()+"#"+Hint(RHT_ONE_TO_THREE_TRIALS).GetText();
-      AddHint(hint, gossipStone, { QM_PINK }, HINT_TYPE_TRIAL);
+      auto hint = prefix+"#"+trial->GetName()+"#"+Hint(RHT_ONE_TO_THREE_TRIALS).GetText();
+      AddHintCopies(copies, hint, {QM_PINK}, HINT_TYPE_TRIAL);
     }
   }
 }
 
+//RANDOTODO clean this mess up once starting items are expanded
 void CreateGanonAndSheikText() {
   auto ctx = Rando::Context::GetInstance();
-  //funny ganon line
-  ganonText = RandomElement(GetHintCategory(HintCategory::GanonLine)).GetText();
-  CreateMessageFromTextObject(0x70CB, 0, 2, 3, AddColorsAndFormat(ganonText));
-
   if(Settings::LightArrowHintText){
     //Get the location of the light arrows
     auto lightArrowLocation = FilterFromPool(ctx->allLocations, [ctx](const RandomizerCheck loc) {
@@ -838,17 +755,16 @@ void CreateAltarText() {
 void CreateMerchantsHints() {
     auto ctx = Rando::Context::GetInstance();
     Text medigoronItemText = ctx->GetItemLocation(RC_GC_MEDIGORON)->GetPlacedItem().GetHint().GetText();
-    Text grannyItemText = ctx->GetItemLocation(RC_KAK_GRANNYS_SHOP)->GetPlacedItem().GetHint().GetText();
+    Text grannyItemText = ctx->GetItemLocation(RC_KAK_GRANNYS_SHOP)->GetPlacedItem().GetHint().GetText().Capitalize();
     Text carpetSalesmanItemText =
         ctx->GetItemLocation(RC_WASTELAND_BOMBCHU_SALESMAN)->GetPlacedItem().GetHint().GetText();
     Text carpetSalesmanItemClearText =
         ctx->GetItemLocation(RC_WASTELAND_BOMBCHU_SALESMAN)->GetPlacedItem().GetHint().GetClear();
 
-    Text grannyCapitalItemText = grannyItemText.Capitalize();
 
     Text medigoronText =
         Hint(RHT_MEDIGORON_DIALOG_FIRST).GetText() + medigoronItemText + Hint(RHT_MEDIGORON_DIALOG_SECOND).GetText();
-    Text grannyText = grannyCapitalItemText + Hint(RHT_GRANNY_DIALOG).GetText();
+    Text grannyText = grannyItemText + Hint(RHT_GRANNY_DIALOG).GetText();
     Text carpetSalesmanTextOne = Hint(RHT_CARPET_SALESMAN_DIALOG_FIRST).GetText() + carpetSalesmanItemText +
                                  Hint(RHT_CARPET_SALESMAN_DIALOG_SECOND).GetText();
     Text carpetSalesmanTextTwo = Hint(RHT_CARPET_SALESMAN_DIALOG_THIRD).GetText() + carpetSalesmanItemClearText +
@@ -864,94 +780,24 @@ void CreateMerchantsHints() {
     ctx->AddHint(RH_WASTELAND_BOMBCHU_SALESMAN, carpetSalesmanTextOne, RC_WASTELAND_BOMBCHU_SALESMAN, HINT_TYPE_STATIC, GetHintRegion(RR_HAUNTED_WASTELAND)->GetHint().GetText());
 }
 
-void CreateDampesDiaryText() {
+//RANDOTODO add Better Links Pocket and starting item handling once more starting items are added
+void CreateSpecialItemHint(uint32_t item, std::vector<RandomizerCheck> hints, RandomizerHintTextKey text1, RandomizerHintTextKey text2, Text& textLoc, std::string& nameLoc, bool condition, bool yourpocket = false) {
   auto ctx = Rando::Context::GetInstance();
-  if (!DampeHintText) {
-    dampesText = Text();
-    dampeHintLoc = "";
-    return;
-  }
-
-  RandomizerGet item = RG_PROGRESSIVE_HOOKSHOT;
-  RandomizerCheck location = FilterFromPool(ctx->allLocations, [item, ctx](const RandomizerCheck loc) {
+  if(condition){
+      RandomizerCheck location = FilterFromPool(ctx->allLocations, [item, ctx](const RandomizerCheck loc) {
       return ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == item;
   })[0];
-  if (IsReachableWithout({RC_DAMPE_HINT},location,true)){
-    ctx->GetItemLocation(location)->SetAsHinted();
-  }
 
-  Text area = GetHintRegion(ctx->GetItemLocation(location)->GetParentRegionKey())->GetHint().GetText();
-  Text temp1 = Text{
-    "Whoever reads this, please enter %r", 
-    "Toi qui lit ce journal, rends-toi dans %r",
-    "Wer immer dies liest, der möge folgenden Ort aufsuchen: %r"
-  };
-
-  Text temp2 = {
-    "%w. I will let you have my stretching, shrinking keepsake.^I'm waiting for you.&--Dampé",
-    "%w. Et peut-être auras-tu droit à mon précieux %rtrésor%w.^Je t'attends...&--Igor",
-    "%w. Ihm gebe ich meinen langen, kurzen Schatz.^Ich warte!&Boris"
-  };
-  
-  dampesText = temp1 + area + temp2;
-  dampeHintLoc = Rando::StaticData::GetLocation(location)->GetName();
-  ctx->AddHint(RH_DAMPES_DIARY, dampesText, location, HINT_TYPE_STATIC, area);
-}
-
-void CreateGregRupeeHint() {
-  auto ctx = Rando::Context::GetInstance();
-  if (!GregHintText) {
-    gregText = Text();
-    return;
-  }
-
-  RandomizerCheck location = FilterFromPool(ctx->allLocations, [ctx](const RandomizerCheck loc) {
-      return ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == RG_GREG_RUPEE;
-  })[0];
-  Text area = GetHintRegion(ctx->GetItemLocation(location)->GetParentRegionKey())->GetHint().GetText();
-  if (IsReachableWithout({RC_GREG_HINT},location,true)){
-    ctx->GetItemLocation(location)->SetAsHinted();
-  }
-
-  Text temp1 = Text{
-    "By the way, if you're interested, I saw the shiniest %gGreen Rupee%w somewhere in%r ",
-    "Au fait, si ça t'intéresse, j'ai aperçu le plus éclatant des %gRubis Verts%w quelque part à %r",
-    ""
-  };
-
-  Text temp2 = {
-    "%w.^It's said to have %cmysterious powers%w...^But then, it could just be another regular rupee.&Oh well.",
-    "%w. On dit qu'il possède des pouvoirs mystérieux... Mais bon, ça pourrait juste être un autre rubis ordinaire.",
-    ""
-  };
-
-    gregText = temp1 + area + temp2;
-    ctx->AddHint(RH_GREG_RUPEE, gregText, location, HINT_TYPE_STATIC, area);
-}
-
-
-void CreateSariaText() {
-  if(Settings::SariaHintText){
-    auto ctx = Rando::Context::GetInstance();
-    //Get the location of a magic upgrade
-    auto magicLocation = FilterFromPool(ctx->allLocations, [ctx](const RandomizerCheck loc){return ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == RG_PROGRESSIVE_MAGIC_METER;})[0];
-    sariaHintLoc = Rando::StaticData::GetLocation(magicLocation)->GetName();
-    Text area = GetHintRegion(ctx->GetItemLocation(magicLocation)->GetParentRegionKey())->GetHint().GetText();
-    Text temp1 = Text{
-      "Did you feel the %gsurge of magic%w recently? A mysterious bird told me it came from %r",
-      "As-tu récemment ressenti une vague de %gpuissance magique%w? Un mystérieux hibou m'a dit  qu'elle provenait du %r",
-      ""
-    };
-    Text temp2 = Text{
-      "%w.^You should check that place out, @!$C", 
-      "%w. Tu devrais aller y jeter un coup d'oeil, @!$C", 
-      "%w.$C"
-    };
-    sariaText = temp1 + area + temp2;
-
-    if (IsReachableWithout({RC_SARIA_SONG_HINT},magicLocation,true)){
-      ctx->GetItemLocation(magicLocation)->SetAsHinted();
+    if (IsReachableWithout(hints,location,true)){
+      ctx->GetItemLocation(location)->SetAsHinted();
     }
+    
+    Text area = GetHintRegion(ctx->GetItemLocation(location)->GetParentRegionKey())->GetHint().GetText();
+    textLoc = Hint(text1).GetText() + area + Hint(text2).GetText();
+    nameLoc = Rando::StaticData::GetLocation(location)->GetName();
+  } else {
+    textLoc = Text();
+    nameLoc = "";
   }
 }
 
@@ -1004,13 +850,134 @@ void CreateWarpSongTexts() {
   }
 }
 
-void CreateAllHints() {
+
+int32_t getRandomWeight(int32_t totalWeight){
+  if (totalWeight <= 1){
+    return 1;
+  }
+  return Random(1,totalWeight);
+}
+
+
+static void DistrabuteHints(std::array<uint8_t, HINT_TYPE_MAX>& selected, uint8_t stoneCount, std::array<HintDistributionSetting, (int)HINT_TYPE_MAX> distTable, bool addFixed = true){
+  int32_t totalWeight = 0;
+
+  distTable[HINT_TYPE_JUNK].copies = 1; //Junk is hardcoded to 1 copy to avoid fill in issues
+
+  for (HintDistributionSetting setting: distTable){
+    totalWeight += setting.weight;
+    if (addFixed){
+      selected[setting.type] += setting.fixed;
+      stoneCount -= setting.fixed * setting.copies;
+    }
+  }
+
+  int32_t currentWeight = getRandomWeight(totalWeight);
+  while(stoneCount > 0 && totalWeight > 0){
+    for (uint8_t hintType = 0; hintType < HINT_TYPE_MAX; hintType++){
+      currentWeight -= distTable[hintType].weight;
+      if (currentWeight <= 0){
+        if (stoneCount >= distTable[hintType].copies){
+          selected[hintType] += 1;
+          stoneCount -= distTable[hintType].copies;
+          break;
+        }
+        else {
+          totalWeight -= distTable[hintType].weight;
+          distTable[hintType].weight = 0;
+          break;
+        }
+      }
+    }
+    currentWeight = getRandomWeight(totalWeight);
+  }
+  //if stones are left, assign junk
+  if (stoneCount > 0){
+    selected[HINT_TYPE_JUNK] += stoneCount;
+  }
+}
+
+
+uint8_t PlaceHints(std::array<uint8_t, HINT_TYPE_MAX>& selectedHints,
+                std::array<HintDistributionSetting, (int)HINT_TYPE_MAX>& distTable, 
+                uint8_t* remainingDungeonWothHints,
+                uint8_t* remainingDungeonBarrenHints){
+
+  std::vector<RandomizerCheck> blankList = {};
+  auto ctx = Rando::Context::GetInstance();
+
+  std::array<std::vector<RandomizerCheck>, HINT_TYPE_MAX> hintTypePools = {
+      blankList, //static, should not happen
+      blankList, //trial, should not happen
+      ctx->wothLocations, //woth
+      CalculateBarrenRegions(), //Barren
+      blankList, //enternce, not yet implemented
+      blankList, // always, should not happen
+      FilterFromPool(ctx->allLocations, [](const RandomizerCheck loc){return Rando::StaticData::GetLocation(loc)->GetHint()->GetType() == HintCategory::Sometimes;}), //sometimes
+      FilterFromPool(ctx->allLocations, [](const RandomizerCheck loc){return Rando::StaticData::GetLocation(loc)->IsCategory(Category::cSong);}), //songs
+      FilterFromPool(ctx->allLocations, [](const RandomizerCheck loc){return Rando::StaticData::GetLocation(loc)->IsOverworld();}), //overworld
+      FilterFromPool(ctx->allLocations, [](const RandomizerCheck loc){return Rando::StaticData::GetLocation(loc)->IsDungeon();}), //dungeon
+      ctx->allLocations, //Named item
+      ctx->allLocations, //random
+      blankList //junk, irrelevent
+  };
+
+  for (uint8_t hintType = 0; hintType < HINT_TYPE_MAX; hintType++){
+    for (uint8_t numHint = 0; numHint < selectedHints[hintType]; numHint++){
+
+      SPDLOG_DEBUG("Attempting to make hint of type: ");
+      SPDLOG_DEBUG(hintTypeNames[hintType]);
+      SPDLOG_DEBUG("\n");
+
+      RandomizerCheck hintedLocation = RC_UNKNOWN_CHECK;
+
+      //create the appropriate hint for the type
+      if (hintType == HINT_TYPE_JUNK){
+        CreateJunkHint();
+      }
+      else{
+        hintTypePools[hintType] = FilterHintability(hintTypePools[hintType], (hintType == HINT_TYPE_NAMED_ITEM));
+        hintedLocation = CreateRandomHint(hintTypePools[hintType], distTable[hintType].copies, (HintType)hintType);
+        if (hintedLocation == RC_UNKNOWN_CHECK){ //if hint failed to place
+          uint8_t hintsToRemove = (selectedHints[hintType] - numHint) * distTable[hintType].copies;
+          selectedHints[hintType] = 0; //RANDOTODO is there a better way to filter out things hinted between hintTypePools creation and now
+          distTable[hintType].weight = 0;
+          return hintsToRemove;
+        }
+      }
+
+      switch(hintType){
+        case HINT_TYPE_WOTH:
+          if (Rando::StaticData::GetLocation(hintedLocation)->IsDungeon()){
+            *remainingDungeonWothHints -= 1;
+            if (*remainingDungeonWothHints <= 0){
+              hintTypePools[hintType] = FilterHintability(hintTypePools[hintType], false, false);
+            }
+          }
+          break;
+        case HINT_TYPE_BARREN:
+          if (Rando::StaticData::GetLocation(hintedLocation)->IsDungeon()){
+            *remainingDungeonBarrenHints -= 1;
+            if (*remainingDungeonBarrenHints <= 0){
+              hintTypePools[hintType] = FilterHintability(hintTypePools[hintType], false, false);
+            }
+          }
+          break;
+      }
+    }
+    selectedHints[hintType] = 0;
+  }
+  return 0;
+}
+
+void CreateStoneHints() {
   auto ctx = Rando::Context::GetInstance();
   SPDLOG_DEBUG("\nNOW CREATING HINTS\n");
   const HintSetting& hintSetting = hintSettingTable[Settings::HintDistribution.Value<uint8_t>()];
+  std::array<HintDistributionSetting, (int)HINT_TYPE_MAX> distTable = hintSetting.distTable;
 
-  uint8_t remainingDungeonWothHints = hintSetting.dungeonsWothLimit;
-  uint8_t remainingDungeonBarrenHints = hintSetting.dungeonsBarrenLimit;
+  uint8_t* remainingDungeonWothHints = new uint8_t(hintSetting.dungeonsWothLimit);
+  uint8_t* remainingDungeonBarrenHints = new uint8_t(hintSetting.dungeonsBarrenLimit);
 
   // Apply Special hint exclusions with no requirements
   if (Settings::Kak10GSHintText){
@@ -1036,7 +1003,8 @@ void CreateAllHints() {
   }
 
   // Add 'always' location hints
-  if (hintSetting.distTable[static_cast<int>(HINT_TYPE_ALWAYS)].copies > 0) {
+  auto alwaysCopies = distTable[static_cast<int>(HINT_TYPE_ALWAYS)].copies;
+  if (alwaysCopies > 0) {
       // Only filter locations that had a random item placed at them (e.g. don't get cow locations if shuffle cows is
       // off)
       auto alwaysHintLocations = FilterFromPool(ctx->allLocations, [ctx](const RandomizerCheck loc) {
@@ -1054,151 +1022,47 @@ void CreateAllHints() {
           }
       }
 
-      for (RandomizerCheck location : alwaysHintLocations) {
-          CreateLocationHint({ location });
-      }
+    for (RandomizerCheck location : alwaysHintLocations) {
+      CreateHint(location, alwaysCopies, HINT_TYPE_ALWAYS);
+    }
   }
 
   //Add 'trial' location hints
-  if (hintSetting.distTable[static_cast<int>(HINT_TYPE_TRIAL)].copies > 0) {
-    CreateTrialHints();
+  auto trialCopies = distTable[static_cast<int>(HINT_TYPE_TRIAL)].copies;
+  if (trialCopies > 0) {
+    CreateTrialHints(trialCopies);
   }
 
-  //create a vector with each hint type proportional to it's weight in the distribution setting.
-  //ootr uses a weighted probability function to decide hint types, but selecting randomly from
-  //this vector will do for now
-  std::vector<HintType> remainingHintTypes = {};
-  for (HintDistributionSetting hds : hintSetting.distTable) {
-    remainingHintTypes.insert(remainingHintTypes.end(), hds.weight, hds.type);
-  }
-  Shuffle(remainingHintTypes);
+  uint8_t totalStones = GetEmptyGossipStones().size();
+  std::array<uint8_t, HINT_TYPE_MAX> selectedHints = {};
+  DistrabuteHints(selectedHints, totalStones, distTable);
 
-  //get barren regions
-  auto barrenLocations = CalculateBarrenRegions();
-
-  //Calculate dungeon woth/barren info
-
-  std::vector<std::string> dungeonNames = {"Deku Tree", "Dodongos Cavern", "Jabu Jabus Belly", "Forest Temple", "Fire Temple",
-                                           "Water Temple", "Spirit Temple", "Shadow Temple", "Bottom of the Well", "Ice Cavern"};
-  //Get list of all barren dungeons
-  std::vector<std::string> barrenDungeons;
-  for (RandomizerCheck barrenLocation : barrenLocations) {
-    std::string barrenRegion = GetHintRegion(ctx->GetItemLocation(barrenLocation)->GetParentRegionKey())->scene;
-    bool isDungeon = std::find(dungeonNames.begin(), dungeonNames.end(), barrenRegion) != dungeonNames.end();
-    //If it hasn't already been added to the list and is a dungeon, add to list
-    if (isDungeon && std::find(barrenDungeons.begin(), barrenDungeons.end(), barrenRegion) == barrenDungeons.end()) {
-      barrenDungeons.push_back(barrenRegion);
+  while(totalStones != 0){
+    totalStones = PlaceHints(selectedHints, distTable, remainingDungeonWothHints, remainingDungeonBarrenHints);
+    if (totalStones != 0){
+      DistrabuteHints(selectedHints, totalStones, distTable, false);
     }
   }
-  SPDLOG_DEBUG("\nBarren Dungeons:\n");
-  for (std::string barrenDungeon : barrenDungeons) {
-      SPDLOG_DEBUG(barrenDungeon + "\n");
-  }
-
-  //Get list of all woth dungeons
-  std::vector<std::string> wothDungeons;
-  for (RandomizerCheck wothLocation : ctx->wothLocations) {
-    std::string wothRegion = GetHintRegion(ctx->GetItemLocation(wothLocation)->GetParentRegionKey())->scene;
-    bool isDungeon = std::find(dungeonNames.begin(), dungeonNames.end(), wothRegion) != dungeonNames.end();
-    //If it hasn't already been added to the list and is a dungeon, add to list
-    if (isDungeon && std::find(wothDungeons.begin(), wothDungeons.end(), wothRegion) == wothDungeons.end()) {
-      wothDungeons.push_back(wothRegion);
-    }
-  }
-  SPDLOG_DEBUG("\nWoth Dungeons:\n");
-  for (std::string wothDungeon : wothDungeons) {
-      SPDLOG_DEBUG(wothDungeon + "\n");
-  }
-
-  //Set DungeonInfo array for each dungeon
-  for (uint32_t i = 0; i < dungeonInfoData.size(); i++) {
-    std::string dungeonName = dungeonNames[i];
-    if (std::find(barrenDungeons.begin(), barrenDungeons.end(), dungeonName) != barrenDungeons.end()) {
-      dungeonInfoData[i] = DungeonInfo::DUNGEON_BARREN;
-    } else if (std::find(wothDungeons.begin(), wothDungeons.end(), dungeonName) != wothDungeons.end()) {
-      dungeonInfoData[i] = DungeonInfo::DUNGEON_WOTH;
-    } else {
-      dungeonInfoData[i] = DungeonInfo::DUNGEON_NEITHER;
-    }
-  }
-
-  //while there are still gossip stones remaining
-  while (FilterFromPool(Rando::StaticData::gossipStoneLocations, [ctx](const RandomizerCheck loc) {
-             return ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == RG_NONE;
-         }).size() != 0) {
-      // TODO: fixed hint types
-
-      if (remainingHintTypes.empty()) {
-          break;
-      }
-
-      // get a random hint type from the remaining hints
-      HintType type = RandomElement(remainingHintTypes, true);
-
-      SPDLOG_DEBUG("Attempting to make hint of type: ");
-      SPDLOG_DEBUG(hintTypeNames.find(type)->second);
-      SPDLOG_DEBUG("\n");
-
-      // create the appropriate hint for the type
-      if (type == HINT_TYPE_WOTH) {
-          CreateWothHint(&remainingDungeonWothHints);
-
-      } else if (type == HINT_TYPE_BARREN) {
-          CreateBarrenHint(&remainingDungeonBarrenHints, barrenLocations);
-
-      } else if (type == HINT_TYPE_SOMETIMES) {
-          std::vector<RandomizerCheck> sometimesHintLocations =
-              FilterFromPool(ctx->allLocations, [ctx](const RandomizerCheck loc) {
-                  return ctx->GetHint(ctx->GetItemLocation(loc)->GetHintKey())->GetHintType() == HINT_TYPE_SOMETIMES &&
-                         ctx->GetItemLocation(loc)->IsHintable() && !(ctx->GetItemLocation(loc)->IsHintedAt());
-              });
-          CreateLocationHint(sometimesHintLocations);
-
-      } else if (type == HINT_TYPE_RANDOM) {
-          CreateRandomLocationHint();
-
-      } else if (type == HINT_TYPE_ITEM) {
-        CreateRandomLocationHint(true);
-
-      } else if (type == HINT_TYPE_SONG) {
-          std::vector<RandomizerCheck> songHintLocations =
-              FilterFromPool(ctx->allLocations, [ctx](const RandomizerCheck loc) {
-                  return Rando::StaticData::GetLocation(loc)->IsCategory(Category::cSong) &&
-                         ctx->GetItemLocation(loc)->IsHintable() && !(ctx->GetItemLocation(loc)->IsHintedAt());
-              });
-          CreateLocationHint(songHintLocations);
-
-      } else if (type == HINT_TYPE_OVERWORLD) {
-          std::vector<RandomizerCheck> overworldHintLocations =
-              FilterFromPool(ctx->allLocations, [ctx](const RandomizerCheck loc) {
-                  return Rando::StaticData::GetLocation(loc)->IsOverworld() && ctx->GetItemLocation(loc)->IsHintable() &&
-                         !(ctx->GetItemLocation(loc)->IsHintedAt());
-              });
-          CreateLocationHint(overworldHintLocations);
-
-      } else if (type == HINT_TYPE_DUNGEON) {
-          std::vector<RandomizerCheck> dungeonHintLocations =
-              FilterFromPool(ctx->allLocations, [ctx](const RandomizerCheck loc) {
-                  return Rando::StaticData::GetLocation(loc)->IsDungeon() && ctx->GetItemLocation(loc)->IsHintable() &&
-                         !(ctx->GetItemLocation(loc)->IsHintedAt());
-              });
-          CreateLocationHint(dungeonHintLocations);
-
-      } else if (type == HINT_TYPE_JUNK) {
-          CreateJunkHint();
-      }
-  }
-
-  //If any gossip stones failed to have a hint placed on them for some reason, place a junk hint as a failsafe.
-  for (RandomizerCheck gossipStone : FilterFromPool(Rando::StaticData::gossipStoneLocations, [ctx](const RandomizerCheck loc) {
-           return ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == RG_NONE;
-       })) {
-      const HintText junkHint = RandomElement(GetHintCategory(HintCategory::Junk));
-      AddHint(junkHint.GetText(), gossipStone, { QM_PINK });
-  }
 
   //Getting gossip stone locations temporarily sets one location to not be reachable.
   //Call the function one last time to get rid of false positives on locations not
   //being reachable.
   GetAccessibleLocations({});
 }
+
+void CreateAllHints(){
+  CreateGanonAndSheikText();
+  CreateAltarText();
+  CreateSpecialItemHint(RG_PROGRESSIVE_HOOKSHOT, {RC_DAMPE_HINT}, RHT_DAMPE_DIARY01, RHT_DAMPE_DIARY02, dampesText, dampeHintLoc, (bool)DampeHintText);
+  CreateSpecialItemHint(RG_GREG_RUPEE, {RC_GREG_HINT}, RHT_GREG_HINT01, RHT_GREG_HINT02, gregText, gregHintLoc, (bool)GregHintText);
+  CreateSpecialItemHint(RG_PROGRESSIVE_MAGIC_METER, {RC_SARIA_SONG_HINT, RC_SONG_FROM_SARIA}, RHT_SARIA_TEXT01, RHT_SARIA_TEXT02, sariaText, sariaHintLoc, (bool)SariaHintText);
+
+  if (ShuffleMerchants.Is(SHUFFLEMERCHANTS_HINTS)) {
+    CreateMerchantsHints();
+  }
+  if (GossipStoneHints.IsNot(HINTS_NO_HINTS)) {
+    printf("\x1b[10;10HCreating Hints...");
+    CreateStoneHints();
+    printf("Done");
+  }
+}
diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.hpp b/soh/soh/Enhancements/randomizer/3drando/hints.hpp
index c4261cab5..51defc8f0 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hints.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hints.hpp
@@ -12,7 +12,6 @@
 
 struct HintDistributionSetting {
   HintType type;
-  uint8_t order;
   size_t weight;
   uint8_t fixed;
   uint8_t copies;
@@ -42,7 +41,7 @@ enum class HintCategory {
   LACS,
   Altar,
   Validation,
-  LightArrow,
+  OtherHint,
   GanonLine,
   MerchantsDialogs,
 };
@@ -112,9 +111,9 @@ public:
         return HintText{std::move(obscureText), std::move(ambiguousText), std::move(clearText), HintCategory::Validation};
     }
 
-    static auto LightArrow(std::vector<Text>&& obscureText, std::vector<Text>&& ambiguousText = {}, Text&& clearText = {}) {
-        return HintText{std::move(obscureText), std::move(ambiguousText), std::move(clearText), HintCategory::LightArrow};
-    } //RANDOTODO Concert to generic special hints?
+    static auto OtherHint(std::vector<Text>&& obscureText, std::vector<Text>&& ambiguousText = {}, Text&& clearText = {}) {
+        return HintText{std::move(obscureText), std::move(ambiguousText), std::move(clearText), HintCategory::OtherHint};
+    }
 
     static auto GanonLine(std::vector<Text>&& obscureText, std::vector<Text>&& ambiguousText = {}, Text&& clearText = {}) {
         return HintText{std::move(obscureText), std::move(ambiguousText), std::move(clearText), HintCategory::GanonLine};
@@ -197,22 +196,17 @@ using ConditionalAlwaysHint = std::pair<RandomizerCheck, std::function<bool()>>;
 
 //10 dungeons as GTG and GC are excluded
 extern std::array<DungeonInfo, 10> dungeonInfoData;
-
 extern std::array<ConditionalAlwaysHint, 10> conditionalAlwaysHints;
 
 extern RandomizerHintTextKey GetHintRegionHintKey(const RandomizerRegion area);
 extern void CreateAllHints();
-extern void CreateMerchantsHints();
 extern void CreateWarpSongTexts();
-extern void CreateDampesDiaryText();
-extern void CreateGregRupeeHint();
-extern void CreateSariaText();
-extern void CreateGanonAndSheikText();
-extern void CreateAltarText();
+
 
 Text& GetChildAltarText();
 Text& GetAdultAltarText();
 Text& GetGanonText();
+void SetGanonText(Text text);
 Text& GetGanonHintText();
 Text& GetDampeHintText();
 Text& GetGregHintText();
@@ -226,6 +220,7 @@ Text& GetWarpRequiemText();
 Text& GetWarpNocturneText();
 Text& GetWarpPreludeText();
 
-std::string GetDampeHintLoc();
 std::string GetLightArrowHintLoc();
+std::string GetDampeHintLoc();
+std::string GetGregHintLoc();
 std::string GetSariaHintLoc();
diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
index aea9f1ebc..1f647fb54 100644
--- a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
@@ -37,7 +37,7 @@ using json = nlohmann::ordered_json;
 json jsonData;
 std::map<RandomizerHintTextKey, Rando::ItemLocation*> hintedLocations;
 
-extern std::unordered_map<HintType, std::string> hintTypeNames;
+extern std::array<std::string, HINT_TYPE_MAX> hintTypeNames;
 extern std::array<std::string, 17> hintCategoryNames;
 extern Area* GetHintRegion(uint32_t);
 
@@ -775,7 +775,7 @@ static void WriteHints(int language) {
     }
     if (Settings::GregHintText){
       jsonData["gregText"] = gregText;
-      jsonData["gregLoc"] = Rando::StaticData::GetLocation(GetItemLocation(RG_GREG_RUPEE)->GetRandomizerCheck())->GetName();
+      jsonData["gregLoc"] = GetGregHintLoc();
     }
     if (Settings::SariaHintText){
       jsonData["sariaText"] = sariaText;
@@ -804,16 +804,16 @@ static void WriteHints(int language) {
 
         std::string textStr = AutoFormatHintTextString(unformattedHintTextString);
         jsonData["hints"][Rando::StaticData::GetLocation(key)->GetName()]["hint"] = textStr;
-        jsonData["hints"][Rando::StaticData::GetLocation(key)->GetName()]["type"] = hintTypeNames.find(hintType)->second;
-        if (hintType == HINT_TYPE_ITEM || hintType == HINT_TYPE_NAMED_ITEM || hintType == HINT_TYPE_WOTH) {
+        jsonData["hints"][Rando::StaticData::GetLocation(key)->GetName()]["type"] = hintTypeNames[(int)hintType];
+        if ((hintType >= HINT_TYPE_ALWAYS && hintType < HINT_TYPE_JUNK) || hintType == HINT_TYPE_WOTH) {
             jsonData["hints"][Rando::StaticData::GetLocation(key)->GetName()]["item"] = hintedLocation->GetPlacedItemName().GetEnglish();
-            if (hintType != HINT_TYPE_NAMED_ITEM || hintType == HINT_TYPE_WOTH) {
+            if (hintType != HINT_TYPE_NAMED_ITEM) {
                 jsonData["hints"][Rando::StaticData::GetLocation(key)->GetName()]["location"] =
                     Rando::StaticData::GetLocation(hintedLocation->GetRandomizerCheck())->GetName();
             }
         }
         if (hintType != HINT_TYPE_TRIAL && hintType != HINT_TYPE_JUNK) {
-            jsonData["hints"][Rando::StaticData::GetLocation(key)->GetName()]["area"] = hint->GetHintedRegion();
+            jsonData["hints"][Rando::StaticData::GetLocation(key)->GetName()]["area"] = hint->GetHintedRegion(); //RANDOTODO find elegent way to capitalise this
         }
     }
 }
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index 896b739c2..6c3fa7c38 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -36,7 +36,7 @@ extern "C" uint32_t ResourceMgr_IsGameMasterQuest();
 extern "C" uint32_t ResourceMgr_IsSceneMasterQuest(s16 sceneNum);
 
 extern std::map<RandomizerCheckArea, std::string> rcAreaNames;
-extern std::unordered_map<HintType, std::string> hintTypeNames;
+extern std::array<std::string, HINT_TYPE_MAX> hintTypeNames;
 
 using json = nlohmann::json;
 using namespace std::literals::string_literals;
@@ -139,6 +139,18 @@ Randomizer::Randomizer() {
             item.GetName().french,
         };
     }
+    for (auto area : rcAreaNames) {
+        SpoilerfileAreaNameToEnum[area.second] = area.first;
+    }
+    SpoilerfileAreaNameToEnum["Inside Ganon's Castle"] = RCAREA_GANONS_CASTLE;
+    SpoilerfileAreaNameToEnum["the Lost Woods"] = RCAREA_LOST_WOODS;
+    SpoilerfileAreaNameToEnum["the Market"] = RCAREA_MARKET;
+    SpoilerfileAreaNameToEnum["the Graveyard"] = RCAREA_GRAVEYARD;
+    SpoilerfileAreaNameToEnum["Haunted Wasteland"] = RCAREA_WASTELAND;
+    SpoilerfileAreaNameToEnum["outside Ganon's Castle"] = RCAREA_HYRULE_CASTLE;
+    for (int c = 0; c < hintTypeNames.size(); c++) {
+        SpoilerfileHintTypeNameToEnum[hintTypeNames[c]] = (HintType)c;
+    }
 }
 
 Sprite* Randomizer::GetSeedTexture(uint8_t index) {
diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h
index ff2a88b7e..657034d84 100644
--- a/soh/soh/Enhancements/randomizer/randomizerTypes.h
+++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@@ -31,23 +31,23 @@ typedef enum {
 } RandomizerCheckStatus;
 
 typedef enum {
+    HINT_TYPE_STATIC,
     HINT_TYPE_TRIAL,
-    HINT_TYPE_ALWAYS,
     HINT_TYPE_WOTH, // Way of the Hero
     HINT_TYPE_BARREN,
     HINT_TYPE_ENTRANCE,
+    HINT_TYPE_ALWAYS,
     HINT_TYPE_SOMETIMES,
-    HINT_TYPE_RANDOM,
-    HINT_TYPE_ITEM,
     HINT_TYPE_SONG,
     HINT_TYPE_OVERWORLD,
     HINT_TYPE_DUNGEON,
-    HINT_TYPE_JUNK,
     HINT_TYPE_NAMED_ITEM,
-    HINT_TYPE_STATIC, // For special hints, like Light Arrows or Hookshot Hints
+    HINT_TYPE_RANDOM,
+    HINT_TYPE_JUNK,
     HINT_TYPE_MAX
 } HintType;
 
+
 // Check types based on main settings
 typedef enum {
     RCTYPE_STANDARD,       // Base set of rando checks
@@ -3182,6 +3182,13 @@ typedef enum {
     RHT_SHEIK_LIGHT_ARROW_HINT,
     // Your Pocket
     RHT_YOUR_POCKET,
+    // Other Hints
+    RHT_DAMPE_DIARY01,
+    RHT_DAMPE_DIARY02,
+    RHT_GREG_HINT01,
+    RHT_GREG_HINT02,
+    RHT_SARIA_TEXT01,
+    RHT_SARIA_TEXT02,
     // Ganon Line
     RHT_GANON_LINE01,
     RHT_GANON_LINE02,

From 8ad79a7855b01e9c8057b4e37efe60e90765a7e7 Mon Sep 17 00:00:00 2001
From: Ralphie Morell <stratomaster64@gmail.com>
Date: Sun, 5 Nov 2023 12:50:41 -0500
Subject: [PATCH 023/230] horseshit

---
 soh/soh/Enhancements/mods.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/soh/soh/Enhancements/mods.cpp b/soh/soh/Enhancements/mods.cpp
index 24bdb7ca7..aa731e687 100644
--- a/soh/soh/Enhancements/mods.cpp
+++ b/soh/soh/Enhancements/mods.cpp
@@ -1034,10 +1034,6 @@ void RegisterBossSouls() {
                 break;
             case SCENE_FOREST_TEMPLE_BOSS:
                 rand_inf = RAND_INF_PHANTOM_GANON_SOUL;
-                //Special case for Phantom Ganon's horse (and fake), as they're considered "background actors."
-                if (actual->id == ACTOR_EN_FHG) {
-                    Actor_Delete(&gPlayState->actorCtx, actual, gPlayState);
-                }
                 break;
             case SCENE_FIRE_TEMPLE_BOSS:
                 rand_inf = RAND_INF_VOLVAGIA_SOUL;
@@ -1067,7 +1063,13 @@ void RegisterBossSouls() {
          if (!Flags_GetRandomizerInf(rand_inf) && actual->category == ACTORCAT_BOSS) {
             Actor_Delete(&gPlayState->actorCtx, actual, gPlayState);
         }
-    }});
+        //Special case for Phantom Ganon's horse (and fake), as they're considered "background actors",
+        //but still control the boss fight flow.
+        if (!Flags_GetRandomizerInf(RAND_INF_PHANTOM_GANON_SOUL) && actual->id == ACTOR_EN_FHG) {
+            Actor_Delete(&gPlayState->actorCtx, actual, gPlayState);
+        }
+    }
+    });
 
 }
 

From 4ff7e5442650ae4dfaec8a8441fd2cda3daf99ec Mon Sep 17 00:00:00 2001
From: Ralphie Morell <stratomaster64@gmail.com>
Date: Sun, 5 Nov 2023 13:24:07 -0500
Subject: [PATCH 024/230] clean out old OTRExporter

---
 .../object_gi_boss_soul/gGIBossSoulSkullDL    |  19 --
 .../gGIBossSoulSkullDL_tri_0                  | 163 -----------
 .../gGIBossSoulSkullDL_tri_1                  |  26 --
 .../gGIBossSoulSkullDL_tri_2                  |   7 -
 .../gGIBossSoulSkullDL_tri_3                  |  48 ----
 .../gGIBossSoulSkullDL_tri_4                  | 245 ----------------
 .../gGIBossSoulSkullDL_vtx_0                  | 173 ------------
 .../gGIBossSoulSkullDL_vtx_1                  |  26 --
 .../gGIBossSoulSkullDL_vtx_2                  |   6 -
 .../gGIBossSoulSkullDL_vtx_3                  |  58 ----
 .../gGIBossSoulSkullDL_vtx_4                  | 267 ------------------
 .../mat_gGIBossSoulSkullDL_Gem_eyes           |  21 --
 .../mat_gGIBossSoulSkullDL_skull_black        |  21 --
 .../mat_gGIBossSoulSkullDL_skull_eyes         |  21 --
 .../mat_gGIBossSoulSkullDL_skull_horns        |  21 --
 .../mat_gGIBossSoulSkullDL_skull_surface      |  21 --
 .../objects/object_gi_boss_soul/noise_tex     | Bin 1116 -> 0 bytes
 .../object_gi_boss_soul/noise_tex_copy        | Bin 2140 -> 0 bytes
 18 files changed, 1143 deletions(-)
 delete mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL
 delete mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_0
 delete mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_1
 delete mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_2
 delete mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_3
 delete mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_4
 delete mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_0
 delete mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_1
 delete mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_2
 delete mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_3
 delete mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4
 delete mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_Gem_eyes
 delete mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_black
 delete mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_eyes
 delete mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_horns
 delete mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_surface
 delete mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/noise_tex
 delete mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/noise_tex_copy

diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL
deleted file mode 100644
index be842d37d..000000000
--- a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL
+++ /dev/null
@@ -1,19 +0,0 @@
-<DisplayList Version="0">
-	<CallDisplayList Path="objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_surface"/>
-	<CallDisplayList Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_0"/>
-	<CallDisplayList Path="objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_black"/>
-	<CallDisplayList Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_1"/>
-	<CallDisplayList Path="objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_eyes"/>
-	<CallDisplayList Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_2"/>
-	<CallDisplayList Path="objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_horns"/>
-	<CallDisplayList Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_3"/>
-	<CallDisplayList Path="objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_Gem_eyes"/>
-	<CallDisplayList Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_4"/>
-	<PipeSync/>
-	<SetGeometryMode G_LIGHTING="1" />
-	<ClearGeometryMode G_TEXTURE_GEN="1" />
-	<SetCombineLERP A0="G_CCMUX_0" B0="G_CCMUX_0" C0="G_CCMUX_0" D0="G_CCMUX_SHADE" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_ENVIRONMENT" A1="G_CCMUX_0" B1="G_CCMUX_0" C1="G_CCMUX_0" D1="G_CCMUX_SHADE" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_ENVIRONMENT"/>
-	<Texture S="65535" T="65535" Level="0" Tile="0" On="0"/>
-	<EndDisplayList/>
-</DisplayList>
-
diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_0 b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_0
deleted file mode 100644
index 49f29247f..000000000
--- a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_0
+++ /dev/null
@@ -1,163 +0,0 @@
-<DisplayList Version="0">
-	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="16"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="0" V01="2" V02="3"/>
-	<Triangle1 V00="3" V01="2" V02="4"/>
-	<Triangle1 V00="2" V01="5" V02="4"/>
-	<Triangle1 V00="2" V01="6" V02="5"/>
-	<Triangle1 V00="7" V01="6" V02="2"/>
-	<Triangle1 V00="2" V01="8" V02="7"/>
-	<Triangle1 V00="2" V01="9" V02="8"/>
-	<Triangle1 V00="8" V01="9" V02="10"/>
-	<Triangle1 V00="8" V01="10" V02="11"/>
-	<Triangle1 V00="12" V01="11" V02="10"/>
-	<Triangle1 V00="10" V01="13" V02="12"/>
-	<Triangle1 V00="10" V01="14" V02="13"/>
-	<Triangle1 V00="12" V01="13" V02="15"/>
-	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_0" VertexBufferIndex="0" VertexOffset="16" Count="16"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="0" V01="3" V02="1"/>
-	<Triangle1 V00="4" V01="2" V02="1"/>
-	<Triangle1 V00="2" V01="4" V02="5"/>
-	<Triangle1 V00="6" V01="5" V02="4"/>
-	<Triangle1 V00="4" V01="7" V02="6"/>
-	<Triangle1 V00="4" V01="8" V02="7"/>
-	<Triangle1 V00="1" V01="8" V02="4"/>
-	<Triangle1 V00="1" V01="9" V02="8"/>
-	<Triangle1 V00="9" V01="10" V02="8"/>
-	<Triangle1 V00="7" V01="8" V02="10"/>
-	<Triangle1 V00="7" V01="10" V02="11"/>
-	<Triangle1 V00="11" V01="10" V02="12"/>
-	<Triangle1 V00="11" V01="12" V02="13"/>
-	<Triangle1 V00="13" V01="12" V02="14"/>
-	<Triangle1 V00="15" V01="14" V02="12"/>
-	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_0" VertexBufferIndex="0" VertexOffset="32" Count="16"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="2" V01="3" V02="0"/>
-	<Triangle1 V00="4" V01="3" V02="2"/>
-	<Triangle1 V00="4" V01="5" V02="3"/>
-	<Triangle1 V00="4" V01="6" V02="5"/>
-	<Triangle1 V00="4" V01="7" V02="6"/>
-	<Triangle1 V00="6" V01="7" V02="8"/>
-	<Triangle1 V00="6" V01="8" V02="9"/>
-	<Triangle1 V00="10" V01="9" V02="8"/>
-	<Triangle1 V00="10" V01="8" V02="11"/>
-	<Triangle1 V00="8" V01="12" V02="11"/>
-	<Triangle1 V00="13" V01="12" V02="8"/>
-	<Triangle1 V00="14" V01="13" V02="8"/>
-	<Triangle1 V00="14" V01="8" V02="15"/>
-	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_0" VertexBufferIndex="0" VertexOffset="48" Count="16"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="3" V01="0" V02="2"/>
-	<Triangle1 V00="2" V01="4" V02="3"/>
-	<Triangle1 V00="2" V01="5" V02="4"/>
-	<Triangle1 V00="2" V01="6" V02="5"/>
-	<Triangle1 V00="6" V01="7" V02="5"/>
-	<Triangle1 V00="7" V01="6" V02="8"/>
-	<Triangle1 V00="7" V01="8" V02="9"/>
-	<Triangle1 V00="5" V01="7" V02="10"/>
-	<Triangle1 V00="5" V01="10" V02="11"/>
-	<Triangle1 V00="11" V01="12" V02="5"/>
-	<Triangle1 V00="13" V01="12" V02="11"/>
-	<Triangle1 V00="13" V01="11" V02="14"/>
-	<Triangle1 V00="15" V01="13" V02="14"/>
-	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_0" VertexBufferIndex="0" VertexOffset="64" Count="16"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="2" V01="3" V02="0"/>
-	<Triangle1 V00="4" V01="0" V02="3"/>
-	<Triangle1 V00="0" V01="4" V02="5"/>
-	<Triangle1 V00="4" V01="6" V02="5"/>
-	<Triangle1 V00="6" V01="4" V02="7"/>
-	<Triangle1 V00="4" V01="8" V02="7"/>
-	<Triangle1 V00="4" V01="9" V02="8"/>
-	<Triangle1 V00="10" V01="9" V02="4"/>
-	<Triangle1 V00="4" V01="11" V02="10"/>
-	<Triangle1 V00="11" V01="12" V02="10"/>
-	<Triangle1 V00="11" V01="13" V02="12"/>
-	<Triangle1 V00="12" V01="13" V02="14"/>
-	<Triangle1 V00="12" V01="14" V02="15"/>
-	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_0" VertexBufferIndex="0" VertexOffset="80" Count="16"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="0" V01="2" V02="3"/>
-	<Triangle1 V00="4" V01="0" V02="3"/>
-	<Triangle1 V00="4" V01="3" V02="5"/>
-	<Triangle1 V00="6" V01="5" V02="3"/>
-	<Triangle1 V00="6" V01="3" V02="7"/>
-	<Triangle1 V00="6" V01="7" V02="8"/>
-	<Triangle1 V00="6" V01="8" V02="9"/>
-	<Triangle1 V00="9" V01="10" V02="6"/>
-	<Triangle1 V00="9" V01="11" V02="10"/>
-	<Triangle1 V00="11" V01="12" V02="10"/>
-	<Triangle1 V00="12" V01="11" V02="13"/>
-	<Triangle1 V00="14" V01="12" V02="13"/>
-	<Triangle1 V00="14" V01="15" V02="12"/>
-	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_0" VertexBufferIndex="0" VertexOffset="96" Count="16"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="0" V01="2" V02="3"/>
-	<Triangle1 V00="0" V01="3" V02="4"/>
-	<Triangle1 V00="0" V01="4" V02="5"/>
-	<Triangle1 V00="4" V01="6" V02="5"/>
-	<Triangle1 V00="6" V01="7" V02="5"/>
-	<Triangle1 V00="7" V01="8" V02="5"/>
-	<Triangle1 V00="8" V01="7" V02="9"/>
-	<Triangle1 V00="8" V01="9" V02="10"/>
-	<Triangle1 V00="11" V01="5" V02="8"/>
-	<Triangle1 V00="12" V01="5" V02="11"/>
-	<Triangle1 V00="13" V01="12" V02="11"/>
-	<Triangle1 V00="13" V01="11" V02="14"/>
-	<Triangle1 V00="15" V01="14" V02="11"/>
-	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_0" VertexBufferIndex="0" VertexOffset="112" Count="16"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="1" V01="3" V02="2"/>
-	<Triangle1 V00="0" V01="4" V02="5"/>
-	<Triangle1 V00="0" V01="6" V02="4"/>
-	<Triangle1 V00="4" V01="7" V02="5"/>
-	<Triangle1 V00="4" V01="8" V02="7"/>
-	<Triangle1 V00="9" V01="7" V02="8"/>
-	<Triangle1 V00="8" V01="10" V02="9"/>
-	<Triangle1 V00="8" V01="11" V02="10"/>
-	<Triangle1 V00="11" V01="12" V02="10"/>
-	<Triangle1 V00="11" V01="13" V02="12"/>
-	<Triangle1 V00="14" V01="12" V02="13"/>
-	<Triangle1 V00="14" V01="15" V02="12"/>
-	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_0" VertexBufferIndex="0" VertexOffset="128" Count="16"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="0" V01="2" V02="3"/>
-	<Triangle1 V00="3" V01="4" V02="0"/>
-	<Triangle1 V00="0" V01="5" V02="1"/>
-	<Triangle1 V00="0" V01="6" V02="5"/>
-	<Triangle1 V00="6" V01="7" V02="5"/>
-	<Triangle1 V00="6" V01="8" V02="7"/>
-	<Triangle1 V00="5" V01="7" V02="9"/>
-	<Triangle1 V00="10" V01="9" V02="7"/>
-	<Triangle1 V00="11" V01="10" V02="7"/>
-	<Triangle1 V00="12" V01="9" V02="10"/>
-	<Triangle1 V00="13" V01="9" V02="12"/>
-	<Triangle1 V00="14" V01="13" V02="12"/>
-	<Triangle1 V00="14" V01="12" V02="15"/>
-	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_0" VertexBufferIndex="0" VertexOffset="144" Count="14"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="3" V01="0" V02="2"/>
-	<Triangle1 V00="3" V01="2" V02="4"/>
-	<Triangle1 V00="2" V01="5" V02="4"/>
-	<Triangle1 V00="6" V01="0" V02="3"/>
-	<Triangle1 V00="7" V01="0" V02="6"/>
-	<Triangle1 V00="8" V01="7" V02="6"/>
-	<Triangle1 V00="8" V01="6" V02="9"/>
-	<Triangle1 V00="7" V01="1" V02="0"/>
-	<Triangle1 V00="10" V01="11" V02="12"/>
-	<Triangle1 V00="10" V01="12" V02="13"/>
-	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_0" VertexBufferIndex="0" VertexOffset="158" Count="13"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="0" V01="3" V02="1"/>
-	<Triangle1 V00="4" V01="5" V02="6"/>
-	<Triangle1 V00="4" V01="7" V02="5"/>
-	<Triangle1 V00="7" V01="8" V02="5"/>
-	<Triangle1 V00="7" V01="9" V02="8"/>
-	<Triangle1 V00="10" V01="8" V02="9"/>
-	<Triangle1 V00="10" V01="11" V02="8"/>
-	<Triangle1 V00="11" V01="12" V02="8"/>
-	<Triangle1 V00="5" V01="8" V02="12"/>
-	<EndDisplayList/>
-</DisplayList>
-
diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_1 b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_1
deleted file mode 100644
index de52a892e..000000000
--- a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_1
+++ /dev/null
@@ -1,26 +0,0 @@
-<DisplayList Version="0">
-	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_1" VertexBufferIndex="0" VertexOffset="0" Count="16"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="0" V01="2" V02="3"/>
-	<Triangle1 V00="2" V01="4" V02="3"/>
-	<Triangle1 V00="3" V01="5" V02="0"/>
-	<Triangle1 V00="3" V01="6" V02="5"/>
-	<Triangle1 V00="5" V01="7" V02="0"/>
-	<Triangle1 V00="8" V01="9" V02="10"/>
-	<Triangle1 V00="8" V01="10" V02="11"/>
-	<Triangle1 V00="10" V01="12" V02="11"/>
-	<Triangle1 V00="11" V01="13" V02="8"/>
-	<Triangle1 V00="11" V01="14" V02="13"/>
-	<Triangle1 V00="13" V01="15" V02="8"/>
-	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_1" VertexBufferIndex="0" VertexOffset="16" Count="8"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="3" V01="2" V02="1"/>
-	<Triangle1 V00="3" V01="4" V02="2"/>
-	<Triangle1 V00="5" V01="4" V02="3"/>
-	<Triangle1 V00="5" V01="6" V02="4"/>
-	<Triangle1 V00="5" V01="7" V02="6"/>
-	<Triangle1 V00="5" V01="0" V02="7"/>
-	<Triangle1 V00="0" V01="2" V02="7"/>
-	<EndDisplayList/>
-</DisplayList>
-
diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_2 b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_2
deleted file mode 100644
index a0b27f7e9..000000000
--- a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_2
+++ /dev/null
@@ -1,7 +0,0 @@
-<DisplayList Version="0">
-	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_2" VertexBufferIndex="0" VertexOffset="0" Count="4"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="3" V01="2" V02="1"/>
-	<EndDisplayList/>
-</DisplayList>
-
diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_3 b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_3
deleted file mode 100644
index 6dbbdc411..000000000
--- a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_3
+++ /dev/null
@@ -1,48 +0,0 @@
-<DisplayList Version="0">
-	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_3" VertexBufferIndex="0" VertexOffset="0" Count="16"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="0" V01="2" V02="3"/>
-	<Triangle1 V00="3" V01="2" V02="4"/>
-	<Triangle1 V00="3" V01="4" V02="5"/>
-	<Triangle1 V00="5" V01="4" V02="6"/>
-	<Triangle1 V00="7" V01="8" V02="9"/>
-	<Triangle1 V00="7" V01="9" V02="10"/>
-	<Triangle1 V00="10" V01="9" V02="11"/>
-	<Triangle1 V00="10" V01="11" V02="12"/>
-	<Triangle1 V00="12" V01="11" V02="13"/>
-	<Triangle1 V00="14" V01="10" V02="12"/>
-	<Triangle1 V00="15" V01="10" V02="14"/>
-	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_3" VertexBufferIndex="0" VertexOffset="16" Count="16"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="0" V01="2" V02="3"/>
-	<Triangle1 V00="3" V01="2" V02="4"/>
-	<Triangle1 V00="2" V01="5" V02="4"/>
-	<Triangle1 V00="4" V01="5" V02="6"/>
-	<Triangle1 V00="3" V01="4" V02="7"/>
-	<Triangle1 V00="7" V01="4" V02="8"/>
-	<Triangle1 V00="1" V01="9" V02="10"/>
-	<Triangle1 V00="11" V01="12" V02="13"/>
-	<Triangle1 V00="11" V01="14" V02="12"/>
-	<Triangle1 V00="14" V01="15" V02="12"/>
-	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_3" VertexBufferIndex="0" VertexOffset="32" Count="16"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="1" V01="3" V02="2"/>
-	<Triangle1 V00="4" V01="5" V02="6"/>
-	<Triangle1 V00="4" V01="7" V02="5"/>
-	<Triangle1 V00="8" V01="7" V02="4"/>
-	<Triangle1 V00="8" V01="9" V02="7"/>
-	<Triangle1 V00="10" V01="9" V02="8"/>
-	<Triangle1 V00="10" V01="11" V02="9"/>
-	<Triangle1 V00="11" V01="12" V02="9"/>
-	<Triangle1 V00="11" V01="13" V02="12"/>
-	<Triangle1 V00="13" V01="14" V02="12"/>
-	<Triangle1 V00="9" V01="12" V02="15"/>
-	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_3" VertexBufferIndex="0" VertexOffset="48" Count="8"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="3" V01="2" V02="4"/>
-	<Triangle1 V00="4" V01="2" V02="5"/>
-	<Triangle1 V00="2" V01="6" V02="5"/>
-	<Triangle1 V00="4" V01="5" V02="7"/>
-	<EndDisplayList/>
-</DisplayList>
-
diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_4 b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_4
deleted file mode 100644
index 13013ff53..000000000
--- a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_4
+++ /dev/null
@@ -1,245 +0,0 @@
-<DisplayList Version="0">
-	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="0" Count="16"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="0" V01="3" V02="1"/>
-	<Triangle1 V00="4" V01="3" V02="0"/>
-	<Triangle1 V00="5" V01="4" V02="0"/>
-	<Triangle1 V00="0" V01="6" V02="5"/>
-	<Triangle1 V00="6" V01="7" V02="5"/>
-	<Triangle1 V00="6" V01="8" V02="7"/>
-	<Triangle1 V00="6" V01="9" V02="8"/>
-	<Triangle1 V00="8" V01="9" V02="10"/>
-	<Triangle1 V00="11" V01="10" V02="9"/>
-	<Triangle1 V00="2" V01="11" V02="9"/>
-	<Triangle1 V00="2" V01="12" V02="11"/>
-	<Triangle1 V00="12" V01="2" V02="13"/>
-	<Triangle1 V00="12" V01="13" V02="14"/>
-	<Triangle1 V00="15" V01="14" V02="13"/>
-	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="16" Count="16"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="2" V01="3" V02="0"/>
-	<Triangle1 V00="3" V01="4" V02="0"/>
-	<Triangle1 V00="4" V01="3" V02="5"/>
-	<Triangle1 V00="5" V01="3" V02="6"/>
-	<Triangle1 V00="3" V01="7" V02="6"/>
-	<Triangle1 V00="3" V01="8" V02="7"/>
-	<Triangle1 V00="7" V01="8" V02="9"/>
-	<Triangle1 V00="10" V01="9" V02="8"/>
-	<Triangle1 V00="10" V01="11" V02="9"/>
-	<Triangle1 V00="12" V01="11" V02="10"/>
-	<Triangle1 V00="12" V01="13" V02="11"/>
-	<Triangle1 V00="12" V01="14" V02="13"/>
-	<Triangle1 V00="15" V01="14" V02="12"/>
-	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="32" Count="16"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="3" V01="1" V02="0"/>
-	<Triangle1 V00="3" V01="0" V02="4"/>
-	<Triangle1 V00="5" V01="3" V02="4"/>
-	<Triangle1 V00="5" V01="6" V02="3"/>
-	<Triangle1 V00="5" V01="7" V02="6"/>
-	<Triangle1 V00="7" V01="8" V02="6"/>
-	<Triangle1 V00="7" V01="9" V02="8"/>
-	<Triangle1 V00="10" V01="9" V02="7"/>
-	<Triangle1 V00="11" V01="10" V02="7"/>
-	<Triangle1 V00="11" V01="12" V02="10"/>
-	<Triangle1 V00="11" V01="13" V02="12"/>
-	<Triangle1 V00="14" V01="12" V02="13"/>
-	<Triangle1 V00="14" V01="15" V02="12"/>
-	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="48" Count="16"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="0" V01="3" V02="1"/>
-	<Triangle1 V00="0" V01="4" V02="3"/>
-	<Triangle1 V00="5" V01="4" V02="0"/>
-	<Triangle1 V00="6" V01="5" V02="0"/>
-	<Triangle1 V00="7" V01="5" V02="6"/>
-	<Triangle1 V00="7" V01="6" V02="8"/>
-	<Triangle1 V00="9" V01="7" V02="8"/>
-	<Triangle1 V00="9" V01="10" V02="7"/>
-	<Triangle1 V00="9" V01="11" V02="10"/>
-	<Triangle1 V00="9" V01="12" V02="11"/>
-	<Triangle1 V00="13" V01="11" V02="12"/>
-	<Triangle1 V00="13" V01="14" V02="11"/>
-	<Triangle1 V00="13" V01="15" V02="14"/>
-	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="64" Count="16"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="3" V01="0" V02="2"/>
-	<Triangle1 V00="3" V01="2" V02="4"/>
-	<Triangle1 V00="0" V01="5" V02="1"/>
-	<Triangle1 V00="1" V01="5" V02="6"/>
-	<Triangle1 V00="5" V01="7" V02="6"/>
-	<Triangle1 V00="5" V01="8" V02="7"/>
-	<Triangle1 V00="8" V01="9" V02="7"/>
-	<Triangle1 V00="8" V01="10" V02="9"/>
-	<Triangle1 V00="9" V01="10" V02="11"/>
-	<Triangle1 V00="9" V01="11" V02="12"/>
-	<Triangle1 V00="12" V01="11" V02="13"/>
-	<Triangle1 V00="12" V01="13" V02="14"/>
-	<Triangle1 V00="15" V01="14" V02="13"/>
-	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="80" Count="16"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="0" V01="3" V02="4"/>
-	<Triangle1 V00="3" V01="5" V02="4"/>
-	<Triangle1 V00="3" V01="6" V02="5"/>
-	<Triangle1 V00="7" V01="4" V02="5"/>
-	<Triangle1 V00="7" V01="8" V02="4"/>
-	<Triangle1 V00="9" V01="8" V02="7"/>
-	<Triangle1 V00="10" V01="9" V02="7"/>
-	<Triangle1 V00="11" V01="10" V02="7"/>
-	<Triangle1 V00="11" V01="7" V02="5"/>
-	<Triangle1 V00="12" V01="10" V02="11"/>
-	<Triangle1 V00="12" V01="13" V02="10"/>
-	<Triangle1 V00="13" V01="14" V02="10"/>
-	<Triangle1 V00="13" V01="15" V02="14"/>
-	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="96" Count="16"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="0" V01="2" V02="3"/>
-	<Triangle1 V00="3" V01="2" V02="4"/>
-	<Triangle1 V00="3" V01="4" V02="5"/>
-	<Triangle1 V00="6" V01="5" V02="4"/>
-	<Triangle1 V00="6" V01="4" V02="7"/>
-	<Triangle1 V00="6" V01="8" V02="5"/>
-	<Triangle1 V00="8" V01="9" V02="5"/>
-	<Triangle1 V00="8" V01="10" V02="9"/>
-	<Triangle1 V00="11" V01="9" V02="10"/>
-	<Triangle1 V00="11" V01="12" V02="9"/>
-	<Triangle1 V00="13" V01="12" V02="11"/>
-	<Triangle1 V00="12" V01="14" V02="9"/>
-	<Triangle1 V00="12" V01="15" V02="14"/>
-	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="112" Count="16"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="0" V01="3" V02="1"/>
-	<Triangle1 V00="1" V01="3" V02="4"/>
-	<Triangle1 V00="1" V01="5" V02="2"/>
-	<Triangle1 V00="1" V01="6" V02="5"/>
-	<Triangle1 V00="7" V01="6" V02="1"/>
-	<Triangle1 V00="2" V01="5" V02="8"/>
-	<Triangle1 V00="2" V01="8" V02="9"/>
-	<Triangle1 V00="10" V01="11" V02="12"/>
-	<Triangle1 V00="10" V01="13" V02="11"/>
-	<Triangle1 V00="13" V01="14" V02="11"/>
-	<Triangle1 V00="13" V01="15" V02="14"/>
-	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="128" Count="16"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="3" V01="4" V02="5"/>
-	<Triangle1 V00="3" V01="5" V02="6"/>
-	<Triangle1 V00="6" V01="5" V02="7"/>
-	<Triangle1 V00="8" V01="7" V02="5"/>
-	<Triangle1 V00="9" V01="8" V02="5"/>
-	<Triangle1 V00="9" V01="10" V02="8"/>
-	<Triangle1 V00="11" V01="10" V02="9"/>
-	<Triangle1 V00="12" V01="11" V02="9"/>
-	<Triangle1 V00="13" V01="12" V02="9"/>
-	<Triangle1 V00="14" V01="13" V02="9"/>
-	<Triangle1 V00="13" V01="14" V02="15"/>
-	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="144" Count="16"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="3" V01="2" V02="1"/>
-	<Triangle1 V00="3" V01="1" V02="4"/>
-	<Triangle1 V00="4" V01="5" V02="3"/>
-	<Triangle1 V00="4" V01="6" V02="5"/>
-	<Triangle1 V00="5" V01="6" V02="7"/>
-	<Triangle1 V00="8" V01="7" V02="6"/>
-	<Triangle1 V00="9" V01="8" V02="6"/>
-	<Triangle1 V00="9" V01="10" V02="8"/>
-	<Triangle1 V00="11" V01="10" V02="9"/>
-	<Triangle1 V00="12" V01="11" V02="9"/>
-	<Triangle1 V00="11" V01="12" V02="13"/>
-	<Triangle1 V00="13" V01="12" V02="14"/>
-	<Triangle1 V00="13" V01="14" V02="15"/>
-	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="160" Count="16"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="3" V01="2" V02="1"/>
-	<Triangle1 V00="3" V01="1" V02="4"/>
-	<Triangle1 V00="4" V01="1" V02="5"/>
-	<Triangle1 V00="6" V01="5" V02="1"/>
-	<Triangle1 V00="6" V01="7" V02="5"/>
-	<Triangle1 V00="6" V01="8" V02="7"/>
-	<Triangle1 V00="9" V01="7" V02="8"/>
-	<Triangle1 V00="9" V01="10" V02="7"/>
-	<Triangle1 V00="9" V01="11" V02="10"/>
-	<Triangle1 V00="9" V01="12" V02="11"/>
-	<Triangle1 V00="11" V01="12" V02="13"/>
-	<Triangle1 V00="11" V01="13" V02="14"/>
-	<Triangle1 V00="13" V01="15" V02="14"/>
-	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="176" Count="16"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="1" V01="3" V02="2"/>
-	<Triangle1 V00="1" V01="4" V02="3"/>
-	<Triangle1 V00="1" V01="5" V02="4"/>
-	<Triangle1 V00="5" V01="6" V02="4"/>
-	<Triangle1 V00="5" V01="7" V02="6"/>
-	<Triangle1 V00="8" V01="6" V02="7"/>
-	<Triangle1 V00="8" V01="9" V02="6"/>
-	<Triangle1 V00="8" V01="10" V02="9"/>
-	<Triangle1 V00="9" V01="10" V02="11"/>
-	<Triangle1 V00="10" V01="12" V02="11"/>
-	<Triangle1 V00="10" V01="13" V02="12"/>
-	<Triangle1 V00="14" V01="13" V02="10"/>
-	<Triangle1 V00="14" V01="15" V02="13"/>
-	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="192" Count="16"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="2" V01="1" V02="3"/>
-	<Triangle1 V00="2" V01="3" V02="4"/>
-	<Triangle1 V00="3" V01="5" V02="4"/>
-	<Triangle1 V00="4" V01="5" V02="6"/>
-	<Triangle1 V00="5" V01="7" V02="6"/>
-	<Triangle1 V00="5" V01="8" V02="7"/>
-	<Triangle1 V00="4" V01="6" V02="9"/>
-	<Triangle1 V00="4" V01="9" V02="10"/>
-	<Triangle1 V00="11" V01="10" V02="9"/>
-	<Triangle1 V00="11" V01="9" V02="12"/>
-	<Triangle1 V00="13" V01="11" V02="12"/>
-	<Triangle1 V00="13" V01="12" V02="14"/>
-	<Triangle1 V00="15" V01="13" V02="14"/>
-	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="208" Count="16"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="3" V01="1" V02="0"/>
-	<Triangle1 V00="3" V01="4" V02="1"/>
-	<Triangle1 V00="5" V01="4" V02="3"/>
-	<Triangle1 V00="6" V01="5" V02="3"/>
-	<Triangle1 V00="5" V01="7" V02="4"/>
-	<Triangle1 V00="7" V01="8" V02="4"/>
-	<Triangle1 V00="7" V01="9" V02="8"/>
-	<Triangle1 V00="10" V01="8" V02="9"/>
-	<Triangle1 V00="10" V01="11" V02="8"/>
-	<Triangle1 V00="12" V01="11" V02="10"/>
-	<Triangle1 V00="12" V01="13" V02="11"/>
-	<Triangle1 V00="12" V01="14" V02="13"/>
-	<Triangle1 V00="15" V01="11" V02="13"/>
-	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="224" Count="16"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="3" V01="0" V02="2"/>
-	<Triangle1 V00="3" V01="2" V02="4"/>
-	<Triangle1 V00="4" V01="2" V02="5"/>
-	<Triangle1 V00="2" V01="6" V02="5"/>
-	<Triangle1 V00="4" V01="5" V02="7"/>
-	<Triangle1 V00="8" V01="4" V02="7"/>
-	<Triangle1 V00="8" V01="9" V02="4"/>
-	<Triangle1 V00="10" V01="9" V02="8"/>
-	<Triangle1 V00="10" V01="11" V02="9"/>
-	<Triangle1 V00="12" V01="11" V02="10"/>
-	<Triangle1 V00="13" V01="12" V02="10"/>
-	<Triangle1 V00="13" V01="14" V02="12"/>
-	<Triangle1 V00="15" V01="14" V02="13"/>
-	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="240" Count="16"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="3" V01="4" V02="5"/>
-	<Triangle1 V00="3" V01="6" V02="4"/>
-	<Triangle1 V00="4" V01="6" V02="7"/>
-	<Triangle1 V00="8" V01="7" V02="6"/>
-	<Triangle1 V00="8" V01="6" V02="9"/>
-	<Triangle1 V00="10" V01="7" V02="8"/>
-	<Triangle1 V00="11" V01="12" V02="13"/>
-	<Triangle1 V00="14" V01="12" V02="11"/>
-	<Triangle1 V00="14" V01="11" V02="15"/>
-	<LoadVertices Path="objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="256" Count="9"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="0" V01="2" V02="3"/>
-	<Triangle1 V00="2" V01="4" V02="3"/>
-	<Triangle1 V00="2" V01="5" V02="4"/>
-	<Triangle1 V00="6" V01="5" V02="2"/>
-	<Triangle1 V00="6" V01="2" V02="7"/>
-	<Triangle1 V00="5" V01="8" V02="4"/>
-	<EndDisplayList/>
-</DisplayList>
-
diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_0 b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_0
deleted file mode 100644
index ed4b6e1c0..000000000
--- a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_0
+++ /dev/null
@@ -1,173 +0,0 @@
-<Vertex Version="0">
-	<Vtx X="18" Y="17" Z="0" S="147" T="-17" R="87" G="69" B="194" A="255"/>
-	<Vtx X="16" Y="14" Z="-8" S="239" T="-17" R="55" G="65" B="161" A="255"/>
-	<Vtx X="9" Y="17" Z="-8" S="239" T="-81" R="16" G="78" B="157" A="255"/>
-	<Vtx X="9" Y="22" Z="1" S="147" T="-81" R="12" G="111" B="196" A="255"/>
-	<Vtx X="0" Y="18" Z="-7" S="239" T="-145" R="249" G="91" B="167" A="255"/>
-	<Vtx X="0" Y="11" Z="-9" S="111" T="-145" R="246" G="32" B="133" A="255"/>
-	<Vtx X="4" Y="11" Z="-9" S="111" T="-113" R="1" G="23" B="131" A="255"/>
-	<Vtx X="9" Y="6" Z="-10" S="15" T="-17" R="9" G="11" B="130" A="255"/>
-	<Vtx X="18" Y="8" Z="-8" S="47" T="111" R="74" G="18" B="154" A="255"/>
-	<Vtx X="16" Y="14" Z="-8" S="111" T="111" R="55" G="65" B="161" A="255"/>
-	<Vtx X="18" Y="17" Z="0" S="111" T="19" R="87" G="69" B="194" A="255"/>
-	<Vtx X="22" Y="10" Z="0" S="47" T="19" R="122" G="20" B="225" A="255"/>
-	<Vtx X="22" Y="10" Z="7" S="47" T="-17" R="35" G="4" B="122" A="255"/>
-	<Vtx X="19" Y="17" Z="7" S="111" T="-17" R="41" G="18" B="119" A="255"/>
-	<Vtx X="19" Y="17" Z="6" S="111" T="-11" R="103" G="230" B="69" A="255"/>
-	<Vtx X="10" Y="22" Z="8" S="111" T="-81" R="18" G="37" B="120" A="255"/>
-	<Vtx X="19" Y="17" Z="7" S="111" T="-17" R="41" G="18" B="119" A="255"/>
-	<Vtx X="10" Y="22" Z="7" S="117" T="-81" R="210" G="73" B="94" A="255"/>
-	<Vtx X="10" Y="22" Z="8" S="111" T="-81" R="18" G="37" B="120" A="255"/>
-	<Vtx X="19" Y="17" Z="6" S="117" T="-17" R="103" G="230" B="69" A="255"/>
-	<Vtx X="1" Y="23" Z="9" S="111" T="-145" R="10" G="32" B="123" A="255"/>
-	<Vtx X="-7" Y="22" Z="9" S="111" T="-81" R="3" G="37" B="122" A="255"/>
-	<Vtx X="-7" Y="22" Z="8" S="117" T="-81" R="62" G="73" B="84" A="255"/>
-	<Vtx X="-8" Y="22" Z="3" S="147" T="-81" R="234" G="112" B="200" A="255"/>
-	<Vtx X="1" Y="23" Z="2" S="147" T="-145" R="253" G="121" B="217" A="255"/>
-	<Vtx X="9" Y="22" Z="1" S="147" T="-81" R="12" G="111" B="196" A="255"/>
-	<Vtx X="0" Y="18" Z="-7" S="239" T="-145" R="249" G="91" B="167" A="255"/>
-	<Vtx X="-9" Y="17" Z="-6" S="239" T="-81" R="222" G="78" B="161" A="255"/>
-	<Vtx X="0" Y="11" Z="-9" S="111" T="-145" R="246" G="32" B="133" A="255"/>
-	<Vtx X="-5" Y="11" Z="-8" S="111" T="-113" R="233" G="23" B="133" A="255"/>
-	<Vtx X="0" Y="3" Z="-10" S="-17" T="-145" R="245" G="0" B="129" A="255"/>
-	<Vtx X="4" Y="11" Z="-9" S="111" T="-113" R="1" G="23" B="131" A="255"/>
-	<Vtx X="0" Y="3" Z="-10" S="-17" T="-145" R="245" G="0" B="129" A="255"/>
-	<Vtx X="4" Y="11" Z="-9" S="111" T="-113" R="1" G="23" B="131" A="255"/>
-	<Vtx X="9" Y="6" Z="-10" S="15" T="-17" R="9" G="11" B="130" A="255"/>
-	<Vtx X="9" Y="2" Z="-10" S="-17" T="-17" R="13" G="249" B="130" A="255"/>
-	<Vtx X="18" Y="8" Z="-8" S="47" T="111" R="74" G="18" B="154" A="255"/>
-	<Vtx X="18" Y="0" Z="-8" S="-17" T="111" R="86" G="227" B="167" A="255"/>
-	<Vtx X="21" Y="0" Z="0" S="-17" T="19" R="118" G="218" B="229" A="255"/>
-	<Vtx X="22" Y="10" Z="0" S="47" T="19" R="122" G="20" B="225" A="255"/>
-	<Vtx X="22" Y="10" Z="7" S="47" T="-17" R="35" G="4" B="122" A="255"/>
-	<Vtx X="22" Y="0" Z="7" S="-17" T="-17" R="50" G="244" B="116" A="255"/>
-	<Vtx X="16" Y="-9" Z="7" S="-81" T="-17" R="48" G="250" B="118" A="255"/>
-	<Vtx X="12" Y="4" Z="8" S="-4" T="-71" R="11" G="0" B="127" A="255"/>
-	<Vtx X="13" Y="7" Z="7" S="23" T="-65" R="11" G="0" B="127" A="255"/>
-	<Vtx X="12" Y="11" Z="8" S="45" T="-73" R="11" G="0" B="127" A="255"/>
-	<Vtx X="8" Y="12" Z="8" S="49" T="-96" R="11" G="0" B="127" A="255"/>
-	<Vtx X="10" Y="22" Z="8" S="111" T="-81" R="18" G="37" B="120" A="255"/>
-	<Vtx X="5" Y="11" Z="8" S="35" T="-119" R="11" G="0" B="127" A="255"/>
-	<Vtx X="8" Y="12" Z="8" S="49" T="-96" R="11" G="0" B="127" A="255"/>
-	<Vtx X="10" Y="22" Z="8" S="111" T="-81" R="18" G="37" B="120" A="255"/>
-	<Vtx X="-2" Y="11" Z="9" S="35" T="-119" R="10" G="0" B="127" A="255"/>
-	<Vtx X="-6" Y="12" Z="9" S="49" T="-96" R="10" G="0" B="127" A="255"/>
-	<Vtx X="-19" Y="10" Z="10" S="47" T="-17" R="243" G="4" B="126" A="255"/>
-	<Vtx X="-7" Y="22" Z="9" S="111" T="-81" R="3" G="37" B="122" A="255"/>
-	<Vtx X="-16" Y="17" Z="10" S="111" T="-17" R="236" G="18" B="124" A="255"/>
-	<Vtx X="-7" Y="22" Z="8" S="117" T="-81" R="62" G="73" B="84" A="255"/>
-	<Vtx X="-16" Y="17" Z="9" S="117" T="-17" R="166" G="230" B="86" A="255"/>
-	<Vtx X="-16" Y="17" Z="9" S="111" T="-11" R="166" G="230" B="86" A="255"/>
-	<Vtx X="-17" Y="17" Z="3" S="111" T="19" R="159" G="69" B="210" A="255"/>
-	<Vtx X="-20" Y="10" Z="4" S="47" T="19" R="131" G="20" B="247" A="255"/>
-	<Vtx X="-18" Y="8" Z="-5" S="47" T="111" R="166" G="18" B="168" A="255"/>
-	<Vtx X="-16" Y="14" Z="-5" S="111" T="111" R="185" G="65" B="172" A="255"/>
-	<Vtx X="-9" Y="6" Z="-8" S="15" T="-17" R="225" G="11" B="133" A="255"/>
-	<Vtx X="-9" Y="6" Z="-8" S="15" T="-17" R="225" G="11" B="133" A="255"/>
-	<Vtx X="-16" Y="14" Z="-5" S="111" T="111" R="185" G="65" B="172" A="255"/>
-	<Vtx X="-9" Y="17" Z="-6" S="239" T="-81" R="222" G="78" B="161" A="255"/>
-	<Vtx X="-5" Y="11" Z="-8" S="111" T="-113" R="233" G="23" B="133" A="255"/>
-	<Vtx X="0" Y="3" Z="-10" S="-17" T="-145" R="245" G="0" B="129" A="255"/>
-	<Vtx X="-9" Y="2" Z="-8" S="-17" T="-17" R="222" G="249" B="134" A="255"/>
-	<Vtx X="-7" Y="-1" Z="-8" S="-49" T="-17" R="231" G="238" B="133" A="255"/>
-	<Vtx X="-5" Y="-1" Z="-8" S="-145" T="-113" R="225" G="236" B="134" A="255"/>
-	<Vtx X="0" Y="-8" Z="-9" S="-145" T="-145" R="245" G="237" B="131" A="255"/>
-	<Vtx X="4" Y="-1" Z="-9" S="-145" T="-113" R="9" G="236" B="131" A="255"/>
-	<Vtx X="7" Y="-1" Z="-9" S="-49" T="-17" R="3" G="238" B="130" A="255"/>
-	<Vtx X="9" Y="2" Z="-10" S="-17" T="-17" R="13" G="249" B="130" A="255"/>
-	<Vtx X="14" Y="-6" Z="-8" S="-81" T="111" R="92" G="232" B="171" A="255"/>
-	<Vtx X="18" Y="0" Z="-8" S="-17" T="111" R="86" G="227" B="167" A="255"/>
-	<Vtx X="21" Y="0" Z="0" S="-17" T="19" R="118" G="218" B="229" A="255"/>
-	<Vtx X="16" Y="-9" Z="1" S="-81" T="19" R="124" G="236" B="235" A="255"/>
-	<Vtx X="16" Y="-9" Z="1" S="-81" T="19" R="124" G="236" B="235" A="255"/>
-	<Vtx X="21" Y="0" Z="0" S="-17" T="19" R="118" G="218" B="229" A="255"/>
-	<Vtx X="22" Y="0" Z="7" S="-17" T="-17" R="50" G="244" B="116" A="255"/>
-	<Vtx X="16" Y="-9" Z="7" S="-81" T="-17" R="48" G="250" B="118" A="255"/>
-	<Vtx X="18" Y="-17" Z="0" S="-145" T="19" R="7" G="134" B="221" A="255"/>
-	<Vtx X="19" Y="-17" Z="7" S="-145" T="-17" R="12" G="242" B="126" A="255"/>
-	<Vtx X="10" Y="-9" Z="8" S="-145" T="-81" R="30" G="219" B="118" A="255"/>
-	<Vtx X="12" Y="4" Z="8" S="-4" T="-71" R="11" G="0" B="127" A="255"/>
-	<Vtx X="8" Y="2" Z="8" S="-21" T="-99" R="11" G="0" B="127" A="255"/>
-	<Vtx X="5" Y="4" Z="8" S="-8" T="-121" R="11" G="0" B="127" A="255"/>
-	<Vtx X="4" Y="-5" Z="8" S="-59" T="-133" R="8" G="0" B="127" A="255"/>
-	<Vtx X="4" Y="7" Z="8" S="13" T="-127" R="11" G="0" B="127" A="255"/>
-	<Vtx X="1" Y="2" Z="9" S="-26" T="-145" R="11" G="0" B="127" A="255"/>
-	<Vtx X="5" Y="11" Z="8" S="35" T="-119" R="11" G="0" B="127" A="255"/>
-	<Vtx X="-2" Y="11" Z="9" S="35" T="-119" R="10" G="0" B="127" A="255"/>
-	<Vtx X="-1" Y="7" Z="9" S="13" T="-127" R="10" G="0" B="127" A="255"/>
-	<Vtx X="-2" Y="-5" Z="9" S="-59" T="-133" R="14" G="0" B="126" A="255"/>
-	<Vtx X="1" Y="2" Z="9" S="-26" T="-145" R="11" G="0" B="127" A="255"/>
-	<Vtx X="-1" Y="7" Z="9" S="13" T="-127" R="10" G="0" B="127" A="255"/>
-	<Vtx X="-2" Y="4" Z="9" S="-8" T="-121" R="10" G="0" B="127" A="255"/>
-	<Vtx X="-6" Y="2" Z="9" S="-21" T="-99" R="10" G="0" B="127" A="255"/>
-	<Vtx X="-19" Y="0" Z="10" S="-17" T="-17" R="227" G="244" B="123" A="255"/>
-	<Vtx X="-10" Y="4" Z="9" S="-4" T="-71" R="10" G="0" B="127" A="255"/>
-	<Vtx X="-11" Y="7" Z="10" S="23" T="-65" R="10" G="0" B="127" A="255"/>
-	<Vtx X="-19" Y="10" Z="10" S="47" T="-17" R="243" G="4" B="126" A="255"/>
-	<Vtx X="-9" Y="11" Z="9" S="45" T="-73" R="10" G="0" B="127" A="255"/>
-	<Vtx X="-6" Y="12" Z="9" S="49" T="-96" R="10" G="0" B="127" A="255"/>
-	<Vtx X="-19" Y="0" Z="4" S="-17" T="19" R="135" G="218" B="250" A="255"/>
-	<Vtx X="-14" Y="-9" Z="3" S="-81" T="19" R="131" G="236" B="0" A="255"/>
-	<Vtx X="-14" Y="-6" Z="-6" S="-81" T="111" R="151" G="232" B="189" A="255"/>
-	<Vtx X="-18" Y="0" Z="-5" S="-17" T="111" R="156" G="227" B="183" A="255"/>
-	<Vtx X="-18" Y="8" Z="-5" S="47" T="111" R="166" G="18" B="168" A="255"/>
-	<Vtx X="-18" Y="8" Z="-5" S="47" T="111" R="166" G="18" B="168" A="255"/>
-	<Vtx X="-19" Y="0" Z="4" S="-17" T="19" R="135" G="218" B="250" A="255"/>
-	<Vtx X="-20" Y="10" Z="4" S="47" T="19" R="131" G="20" B="247" A="255"/>
-	<Vtx X="-19" Y="10" Z="10" S="47" T="-17" R="243" G="4" B="126" A="255"/>
-	<Vtx X="-9" Y="2" Z="-8" S="-17" T="-17" R="222" G="249" B="134" A="255"/>
-	<Vtx X="-18" Y="0" Z="-5" S="-17" T="111" R="156" G="227" B="183" A="255"/>
-	<Vtx X="-9" Y="6" Z="-8" S="15" T="-17" R="225" G="11" B="133" A="255"/>
-	<Vtx X="-14" Y="-6" Z="-6" S="-81" T="111" R="151" G="232" B="189" A="255"/>
-	<Vtx X="-7" Y="-1" Z="-8" S="-49" T="-17" R="231" G="238" B="133" A="255"/>
-	<Vtx X="-16" Y="-13" Z="-5" S="-273" T="-17" R="241" G="173" B="161" A="255"/>
-	<Vtx X="-9" Y="-7" Z="-6" S="-273" T="-81" R="205" G="176" B="171" A="255"/>
-	<Vtx X="-5" Y="-1" Z="-8" S="-145" T="-113" R="225" G="236" B="134" A="255"/>
-	<Vtx X="0" Y="-20" Z="-7" S="-273" T="-145" R="248" G="179" B="155" A="255"/>
-	<Vtx X="0" Y="-8" Z="-9" S="-145" T="-145" R="245" G="237" B="131" A="255"/>
-	<Vtx X="4" Y="-1" Z="-9" S="-145" T="-113" R="9" G="236" B="131" A="255"/>
-	<Vtx X="9" Y="-7" Z="-8" S="-273" T="-81" R="35" G="176" B="164" A="255"/>
-	<Vtx X="16" Y="-13" Z="-8" S="-273" T="-17" R="255" G="173" B="160" A="255"/>
-	<Vtx X="9" Y="-7" Z="-8" S="-273" T="-81" R="35" G="176" B="164" A="255"/>
-	<Vtx X="4" Y="-1" Z="-9" S="-145" T="-113" R="9" G="236" B="131" A="255"/>
-	<Vtx X="7" Y="-1" Z="-9" S="-49" T="-17" R="3" G="238" B="130" A="255"/>
-	<Vtx X="14" Y="-6" Z="-8" S="-81" T="111" R="92" G="232" B="171" A="255"/>
-	<Vtx X="9" Y="-9" Z="1" S="-180" T="-81" R="53" G="144" B="226" A="255"/>
-	<Vtx X="18" Y="-17" Z="0" S="-180" T="-17" R="7" G="134" B="221" A="255"/>
-	<Vtx X="10" Y="-9" Z="8" S="-145" T="-81" R="30" G="219" B="118" A="255"/>
-	<Vtx X="19" Y="-17" Z="7" S="-145" T="-17" R="12" G="242" B="126" A="255"/>
-	<Vtx X="1" Y="-27" Z="9" S="-145" T="-145" R="11" G="237" B="125" A="255"/>
-	<Vtx X="1" Y="-4" Z="9" S="-59" T="-145" R="11" G="1" B="127" A="255"/>
-	<Vtx X="4" Y="-5" Z="8" S="-59" T="-133" R="8" G="0" B="127" A="255"/>
-	<Vtx X="-7" Y="-9" Z="9" S="-145" T="-81" R="247" G="219" B="121" A="255"/>
-	<Vtx X="-8" Y="-9" Z="3" S="-180" T="-81" R="199" G="144" B="235" A="255"/>
-	<Vtx X="-17" Y="-17" Z="3" S="-180" T="-17" R="243" G="134" B="223" A="255"/>
-	<Vtx X="-16" Y="-17" Z="10" S="-145" T="-17" R="9" G="242" B="126" A="255"/>
-	<Vtx X="-14" Y="-9" Z="10" S="-81" T="-17" R="229" G="250" B="124" A="255"/>
-	<Vtx X="-16" Y="-17" Z="10" S="-145" T="-17" R="9" G="242" B="126" A="255"/>
-	<Vtx X="-7" Y="-9" Z="9" S="-145" T="-81" R="247" G="219" B="121" A="255"/>
-	<Vtx X="-19" Y="0" Z="10" S="-17" T="-17" R="227" G="244" B="123" A="255"/>
-	<Vtx X="-2" Y="-5" Z="9" S="-59" T="-133" R="14" G="0" B="126" A="255"/>
-	<Vtx X="1" Y="-4" Z="9" S="-59" T="-145" R="11" G="1" B="127" A="255"/>
-	<Vtx X="-14" Y="-9" Z="3" S="-81" T="19" R="131" G="236" B="0" A="255"/>
-	<Vtx X="-17" Y="-17" Z="3" S="-145" T="19" R="243" G="134" B="223" A="255"/>
-	<Vtx X="-16" Y="-13" Z="-5" S="-145" T="111" R="241" G="173" B="161" A="255"/>
-	<Vtx X="-14" Y="-6" Z="-6" S="-81" T="111" R="151" G="232" B="189" A="255"/>
-	<Vtx X="16" Y="-13" Z="-8" S="-145" T="111" R="255" G="173" B="160" A="255"/>
-	<Vtx X="14" Y="-6" Z="-8" S="-81" T="111" R="92" G="232" B="171" A="255"/>
-	<Vtx X="16" Y="-9" Z="1" S="-81" T="19" R="124" G="236" B="235" A="255"/>
-	<Vtx X="18" Y="-17" Z="0" S="-145" T="19" R="7" G="134" B="221" A="255"/>
-	<Vtx X="-17" Y="17" Z="3" S="147" T="-17" R="159" G="69" B="210" A="255"/>
-	<Vtx X="-9" Y="17" Z="-6" S="239" T="-81" R="222" G="78" B="161" A="255"/>
-	<Vtx X="-16" Y="14" Z="-5" S="239" T="-17" R="185" G="65" B="172" A="255"/>
-	<Vtx X="-8" Y="22" Z="3" S="147" T="-81" R="234" G="112" B="200" A="255"/>
-	<Vtx X="-16" Y="-13" Z="-5" S="-273" T="-17" R="241" G="173" B="161" A="255"/>
-	<Vtx X="-8" Y="-9" Z="3" S="-180" T="-81" R="199" G="144" B="235" A="255"/>
-	<Vtx X="-17" Y="-17" Z="3" S="-180" T="-17" R="243" G="134" B="223" A="255"/>
-	<Vtx X="-9" Y="-7" Z="-6" S="-273" T="-81" R="205" G="176" B="171" A="255"/>
-	<Vtx X="1" Y="-27" Z="2" S="-180" T="-145" R="254" G="133" B="223" A="255"/>
-	<Vtx X="0" Y="-20" Z="-7" S="-273" T="-145" R="248" G="179" B="155" A="255"/>
-	<Vtx X="9" Y="-7" Z="-8" S="-273" T="-81" R="35" G="176" B="164" A="255"/>
-	<Vtx X="9" Y="-9" Z="1" S="-180" T="-81" R="53" G="144" B="226" A="255"/>
-	<Vtx X="1" Y="-27" Z="9" S="-145" T="-145" R="11" G="237" B="125" A="255"/>
-</Vertex>
diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_1 b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_1
deleted file mode 100644
index d2728aae4..000000000
--- a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_1
+++ /dev/null
@@ -1,26 +0,0 @@
-<Vertex Version="0">
-	<Vtx X="13" Y="7" Z="7" S="23" T="-65" R="11" G="0" B="127" A="255"/>
-	<Vtx X="12" Y="11" Z="8" S="45" T="-73" R="11" G="0" B="127" A="255"/>
-	<Vtx X="8" Y="12" Z="8" S="49" T="-96" R="11" G="0" B="127" A="255"/>
-	<Vtx X="4" Y="7" Z="8" S="13" T="-127" R="11" G="0" B="127" A="255"/>
-	<Vtx X="5" Y="11" Z="8" S="35" T="-119" R="11" G="0" B="127" A="255"/>
-	<Vtx X="8" Y="2" Z="8" S="-21" T="-99" R="11" G="0" B="127" A="255"/>
-	<Vtx X="5" Y="4" Z="8" S="-8" T="-121" R="11" G="0" B="127" A="255"/>
-	<Vtx X="12" Y="4" Z="8" S="-4" T="-71" R="11" G="0" B="127" A="255"/>
-	<Vtx X="-6" Y="12" Z="9" S="49" T="-96" R="10" G="0" B="127" A="255"/>
-	<Vtx X="-9" Y="11" Z="9" S="45" T="-73" R="10" G="0" B="127" A="255"/>
-	<Vtx X="-11" Y="7" Z="10" S="23" T="-65" R="10" G="0" B="127" A="255"/>
-	<Vtx X="-6" Y="2" Z="9" S="-21" T="-99" R="10" G="0" B="127" A="255"/>
-	<Vtx X="-10" Y="4" Z="9" S="-4" T="-71" R="10" G="0" B="127" A="255"/>
-	<Vtx X="-1" Y="7" Z="9" S="13" T="-127" R="10" G="0" B="127" A="255"/>
-	<Vtx X="-2" Y="4" Z="9" S="-8" T="-121" R="10" G="0" B="127" A="255"/>
-	<Vtx X="-2" Y="11" Z="9" S="35" T="-119" R="10" G="0" B="127" A="255"/>
-	<Vtx X="4" Y="-5" Z="8" S="-59" T="-133" R="8" G="0" B="127" A="255"/>
-	<Vtx X="1" Y="2" Z="9" S="-26" T="-145" R="11" G="0" B="127" A="255"/>
-	<Vtx X="1" Y="1" Z="7" S="-26" T="-145" R="225" G="243" B="123" A="255"/>
-	<Vtx X="-2" Y="-5" Z="9" S="-59" T="-133" R="14" G="0" B="126" A="255"/>
-	<Vtx X="-1" Y="-5" Z="7" S="-59" T="-133" R="74" G="57" B="86" A="255"/>
-	<Vtx X="1" Y="-4" Z="9" S="-59" T="-145" R="11" G="1" B="127" A="255"/>
-	<Vtx X="1" Y="-4" Z="7" S="-59" T="-145" R="10" G="44" B="119" A="255"/>
-	<Vtx X="4" Y="-5" Z="7" S="-59" T="-133" R="198" G="57" B="98" A="255"/>
-</Vertex>
diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_2 b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_2
deleted file mode 100644
index eb0050c03..000000000
--- a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_2
+++ /dev/null
@@ -1,6 +0,0 @@
-<Vertex Version="0">
-	<Vtx X="4" Y="-5" Z="7" S="1008" T="1008" R="198" G="57" B="98" A="255"/>
-	<Vtx X="1" Y="1" Z="7" S="1008" T="582" R="225" G="243" B="123" A="255"/>
-	<Vtx X="1" Y="-4" Z="7" S="883" T="967" R="10" G="44" B="119" A="255"/>
-	<Vtx X="-1" Y="-5" Z="7" S="1008" T="1008" R="74" G="57" B="86" A="255"/>
-</Vertex>
diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_3 b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_3
deleted file mode 100644
index f124650c8..000000000
--- a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_3
+++ /dev/null
@@ -1,58 +0,0 @@
-<Vertex Version="0">
-	<Vtx X="19" Y="17" Z="6" S="111" T="-11" R="103" G="230" B="69" A="255"/>
-	<Vtx X="18" Y="17" Z="0" S="111" T="19" R="87" G="69" B="194" A="255"/>
-	<Vtx X="21" Y="23" Z="4" S="111" T="19" R="100" G="245" B="178" A="255"/>
-	<Vtx X="21" Y="23" Z="10" S="111" T="-11" R="73" G="199" B="87" A="255"/>
-	<Vtx X="22" Y="27" Z="4" S="111" T="19" R="72" G="242" B="152" A="255"/>
-	<Vtx X="22" Y="25" Z="9" S="111" T="-11" R="93" G="225" B="81" A="255"/>
-	<Vtx X="27" Y="35" Z="9" S="111" T="-11" R="106" G="67" B="20" A="255"/>
-	<Vtx X="10" Y="22" Z="7" S="117" T="-81" R="210" G="73" B="94" A="255"/>
-	<Vtx X="19" Y="17" Z="6" S="117" T="-17" R="103" G="230" B="69" A="255"/>
-	<Vtx X="21" Y="23" Z="10" S="117" T="-17" R="73" G="199" B="87" A="255"/>
-	<Vtx X="13" Y="27" Z="11" S="117" T="-81" R="178" G="10" B="100" A="255"/>
-	<Vtx X="22" Y="25" Z="9" S="117" T="-17" R="93" G="225" B="81" A="255"/>
-	<Vtx X="16" Y="33" Z="11" S="117" T="-81" R="209" G="73" B="93" A="255"/>
-	<Vtx X="27" Y="35" Z="9" S="117" T="-81" R="106" G="67" B="20" A="255"/>
-	<Vtx X="12" Y="27" Z="5" S="147" T="-81" R="171" G="69" B="191" A="255"/>
-	<Vtx X="9" Y="22" Z="1" S="147" T="-81" R="12" G="111" B="196" A="255"/>
-	<Vtx X="18" Y="17" Z="0" S="147" T="-17" R="87" G="69" B="194" A="255"/>
-	<Vtx X="9" Y="22" Z="1" S="147" T="-81" R="12" G="111" B="196" A="255"/>
-	<Vtx X="12" Y="27" Z="5" S="147" T="-81" R="171" G="69" B="191" A="255"/>
-	<Vtx X="21" Y="23" Z="4" S="147" T="-17" R="100" G="245" B="178" A="255"/>
-	<Vtx X="17" Y="34" Z="5" S="147" T="-81" R="209" G="96" B="187" A="255"/>
-	<Vtx X="16" Y="33" Z="11" S="117" T="-81" R="209" G="73" B="93" A="255"/>
-	<Vtx X="27" Y="35" Z="9" S="147" T="-81" R="106" G="67" B="20" A="255"/>
-	<Vtx X="22" Y="27" Z="4" S="147" T="-17" R="72" G="242" B="152" A="255"/>
-	<Vtx X="27" Y="35" Z="9" S="147" T="-17" R="106" G="67" B="20" A="255"/>
-	<Vtx X="10" Y="22" Z="7" S="117" T="-81" R="210" G="73" B="94" A="255"/>
-	<Vtx X="13" Y="27" Z="11" S="117" T="-81" R="178" G="10" B="100" A="255"/>
-	<Vtx X="-16" Y="17" Z="9" S="111" T="-11" R="166" G="230" B="86" A="255"/>
-	<Vtx X="-19" Y="23" Z="8" S="111" T="19" R="144" G="245" B="197" A="255"/>
-	<Vtx X="-17" Y="17" Z="3" S="111" T="19" R="159" G="69" B="210" A="255"/>
-	<Vtx X="-18" Y="23" Z="13" S="111" T="-11" R="199" G="199" B="98" A="255"/>
-	<Vtx X="-20" Y="27" Z="8" S="111" T="19" R="167" G="242" B="166" A="255"/>
-	<Vtx X="-18" Y="23" Z="13" S="111" T="-11" R="199" G="199" B="98" A="255"/>
-	<Vtx X="-19" Y="25" Z="13" S="111" T="-11" R="179" G="225" B="96" A="255"/>
-	<Vtx X="-20" Y="27" Z="8" S="111" T="19" R="167" G="242" B="166" A="255"/>
-	<Vtx X="-24" Y="35" Z="13" S="111" T="-11" R="155" G="67" B="38" A="255"/>
-	<Vtx X="-7" Y="22" Z="8" S="117" T="-81" R="62" G="73" B="84" A="255"/>
-	<Vtx X="-18" Y="23" Z="13" S="117" T="-17" R="199" G="199" B="98" A="255"/>
-	<Vtx X="-16" Y="17" Z="9" S="117" T="-17" R="166" G="230" B="86" A="255"/>
-	<Vtx X="-9" Y="27" Z="13" S="117" T="-81" R="94" G="10" B="85" A="255"/>
-	<Vtx X="-8" Y="22" Z="3" S="147" T="-81" R="234" G="112" B="200" A="255"/>
-	<Vtx X="-10" Y="27" Z="7" S="147" T="-81" R="72" G="69" B="177" A="255"/>
-	<Vtx X="-17" Y="17" Z="3" S="147" T="-17" R="159" G="69" B="210" A="255"/>
-	<Vtx X="-19" Y="23" Z="8" S="147" T="-17" R="144" G="245" B="197" A="255"/>
-	<Vtx X="-14" Y="34" Z="8" S="147" T="-81" R="34" G="96" B="180" A="255"/>
-	<Vtx X="-20" Y="27" Z="8" S="147" T="-17" R="167" G="242" B="166" A="255"/>
-	<Vtx X="-24" Y="35" Z="13" S="147" T="-17" R="155" G="67" B="38" A="255"/>
-	<Vtx X="-13" Y="33" Z="13" S="117" T="-81" R="62" G="73" B="83" A="255"/>
-	<Vtx X="-14" Y="34" Z="8" S="147" T="-81" R="34" G="96" B="180" A="255"/>
-	<Vtx X="-24" Y="35" Z="13" S="147" T="-81" R="155" G="67" B="38" A="255"/>
-	<Vtx X="-13" Y="33" Z="13" S="117" T="-81" R="62" G="73" B="83" A="255"/>
-	<Vtx X="-10" Y="27" Z="7" S="147" T="-81" R="72" G="69" B="177" A="255"/>
-	<Vtx X="-9" Y="27" Z="13" S="117" T="-81" R="94" G="10" B="85" A="255"/>
-	<Vtx X="-19" Y="25" Z="13" S="117" T="-17" R="179" G="225" B="96" A="255"/>
-	<Vtx X="-24" Y="35" Z="13" S="117" T="-81" R="155" G="67" B="38" A="255"/>
-	<Vtx X="-18" Y="23" Z="13" S="117" T="-17" R="199" G="199" B="98" A="255"/>
-</Vertex>
diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4 b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4
deleted file mode 100644
index 2bbe7895e..000000000
--- a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4
+++ /dev/null
@@ -1,267 +0,0 @@
-<Vertex Version="0">
-	<Vtx X="5" Y="5" Z="8" S="422" T="14" R="139" G="208" B="12" A="255"/>
-	<Vtx X="5" Y="9" Z="8" S="422" T="14" R="137" G="44" B="8" A="255"/>
-	<Vtx X="8" Y="7" Z="4" S="206" T="14" R="13" G="192" B="147" A="255"/>
-	<Vtx X="5" Y="7" Z="8" S="422" T="-50" R="129" G="0" B="6" A="255"/>
-	<Vtx X="6" Y="5" Z="9" S="462" T="14" R="196" G="229" B="109" A="255"/>
-	<Vtx X="6" Y="4" Z="8" S="422" T="78" R="166" G="166" B="2" A="255"/>
-	<Vtx X="8" Y="7" Z="4" S="206" T="142" R="13" G="192" B="147" A="255"/>
-	<Vtx X="7" Y="3" Z="8" S="422" T="142" R="206" G="139" B="8" A="255"/>
-	<Vtx X="9" Y="3" Z="8" S="422" T="206" R="0" G="129" B="255" A="255"/>
-	<Vtx X="11" Y="3" Z="8" S="422" T="142" R="54" G="141" B="251" A="255"/>
-	<Vtx X="10" Y="4" Z="9" S="462" T="142" R="36" G="188" B="101" A="255"/>
-	<Vtx X="11" Y="4" Z="8" S="422" T="78" R="90" G="167" B="245" A="255"/>
-	<Vtx X="12" Y="5" Z="7" S="422" T="14" R="119" G="212" B="244" A="255"/>
-	<Vtx X="12" Y="9" Z="7" S="422" T="14" R="117" G="48" B="248" A="255"/>
-	<Vtx X="12" Y="7" Z="7" S="422" T="-50" R="126" G="0" B="241" A="255"/>
-	<Vtx X="12" Y="9" Z="8" S="462" T="14" R="78" G="27" B="97" A="255"/>
-	<Vtx X="11" Y="10" Z="8" S="422" T="78" R="89" G="90" B="243" A="255"/>
-	<Vtx X="12" Y="9" Z="8" S="462" T="14" R="78" G="27" B="97" A="255"/>
-	<Vtx X="12" Y="9" Z="7" S="422" T="14" R="117" G="48" B="248" A="255"/>
-	<Vtx X="8" Y="7" Z="4" S="206" T="142" R="13" G="192" B="147" A="255"/>
-	<Vtx X="11" Y="11" Z="8" S="422" T="142" R="52" G="116" B="255" A="255"/>
-	<Vtx X="9" Y="11" Z="8" S="422" T="206" R="255" G="127" B="255" A="255"/>
-	<Vtx X="7" Y="11" Z="8" S="422" T="142" R="180" G="102" B="5" A="255"/>
-	<Vtx X="6" Y="10" Z="8" S="422" T="78" R="165" G="89" B="3" A="255"/>
-	<Vtx X="5" Y="9" Z="8" S="422" T="14" R="137" G="44" B="8" A="255"/>
-	<Vtx X="6" Y="9" Z="9" S="462" T="14" R="196" G="27" B="109" A="255"/>
-	<Vtx X="5" Y="7" Z="8" S="422" T="-50" R="129" G="0" B="6" A="255"/>
-	<Vtx X="6" Y="7" Z="9" S="462" T="-50" R="189" G="0" B="108" A="255"/>
-	<Vtx X="6" Y="5" Z="9" S="462" T="14" R="196" G="229" B="109" A="255"/>
-	<Vtx X="7" Y="7" Z="9" S="462" T="-50" R="236" G="0" B="125" A="255"/>
-	<Vtx X="7" Y="6" Z="9" S="462" T="14" R="232" G="243" B="124" A="255"/>
-	<Vtx X="6" Y="5" Z="9" S="462" T="78" R="210" G="200" B="104" A="255"/>
-	<Vtx X="6" Y="4" Z="8" S="422" T="78" R="166" G="166" B="2" A="255"/>
-	<Vtx X="6" Y="5" Z="9" S="462" T="78" R="210" G="200" B="104" A="255"/>
-	<Vtx X="6" Y="5" Z="9" S="462" T="14" R="196" G="229" B="109" A="255"/>
-	<Vtx X="7" Y="4" Z="9" S="462" T="142" R="238" G="188" B="106" A="255"/>
-	<Vtx X="7" Y="3" Z="8" S="422" T="142" R="206" G="139" B="8" A="255"/>
-	<Vtx X="9" Y="3" Z="8" S="422" T="206" R="0" G="129" B="255" A="255"/>
-	<Vtx X="9" Y="4" Z="9" S="462" T="206" R="9" G="183" B="104" A="255"/>
-	<Vtx X="10" Y="4" Z="9" S="462" T="142" R="36" G="188" B="101" A="255"/>
-	<Vtx X="9" Y="5" Z="9" S="462" T="206" R="10" G="225" B="123" A="255"/>
-	<Vtx X="10" Y="5" Z="9" S="462" T="142" R="23" G="221" B="120" A="255"/>
-	<Vtx X="11" Y="5" Z="9" S="462" T="78" R="64" G="200" B="95" A="255"/>
-	<Vtx X="11" Y="4" Z="8" S="422" T="78" R="90" G="167" B="245" A="255"/>
-	<Vtx X="12" Y="5" Z="8" S="462" T="14" R="78" G="229" B="97" A="255"/>
-	<Vtx X="12" Y="5" Z="7" S="422" T="14" R="119" G="212" B="244" A="255"/>
-	<Vtx X="12" Y="7" Z="7" S="422" T="-50" R="126" G="0" B="241" A="255"/>
-	<Vtx X="12" Y="7" Z="8" S="462" T="-50" R="85" G="0" B="95" A="255"/>
-	<Vtx X="12" Y="9" Z="8" S="462" T="14" R="78" G="27" B="97" A="255"/>
-	<Vtx X="12" Y="7" Z="8" S="462" T="-50" R="85" G="0" B="95" A="255"/>
-	<Vtx X="12" Y="7" Z="7" S="422" T="-50" R="126" G="0" B="241" A="255"/>
-	<Vtx X="11" Y="7" Z="9" S="462" T="-50" R="42" G="0" B="120" A="255"/>
-	<Vtx X="11" Y="9" Z="9" S="462" T="14" R="45" G="13" B="118" A="255"/>
-	<Vtx X="11" Y="10" Z="9" S="462" T="78" R="64" G="56" B="95" A="255"/>
-	<Vtx X="11" Y="10" Z="8" S="422" T="78" R="89" G="90" B="243" A="255"/>
-	<Vtx X="10" Y="10" Z="9" S="462" T="142" R="36" G="68" B="101" A="255"/>
-	<Vtx X="11" Y="11" Z="8" S="422" T="142" R="52" G="116" B="255" A="255"/>
-	<Vtx X="9" Y="11" Z="8" S="422" T="206" R="255" G="127" B="255" A="255"/>
-	<Vtx X="9" Y="10" Z="9" S="462" T="206" R="9" G="73" B="104" A="255"/>
-	<Vtx X="7" Y="10" Z="9" S="462" T="142" R="238" G="68" B="106" A="255"/>
-	<Vtx X="7" Y="11" Z="8" S="422" T="142" R="180" G="102" B="5" A="255"/>
-	<Vtx X="6" Y="10" Z="8" S="422" T="78" R="165" G="89" B="3" A="255"/>
-	<Vtx X="6" Y="10" Z="9" S="462" T="78" R="210" G="56" B="104" A="255"/>
-	<Vtx X="6" Y="9" Z="9" S="462" T="14" R="196" G="27" B="109" A="255"/>
-	<Vtx X="7" Y="9" Z="9" S="462" T="14" R="232" G="13" B="124" A="255"/>
-	<Vtx X="6" Y="10" Z="9" S="462" T="78" R="210" G="56" B="104" A="255"/>
-	<Vtx X="6" Y="9" Z="9" S="462" T="14" R="196" G="27" B="109" A="255"/>
-	<Vtx X="7" Y="7" Z="9" S="462" T="-50" R="236" G="0" B="125" A="255"/>
-	<Vtx X="6" Y="7" Z="9" S="462" T="-50" R="189" G="0" B="108" A="255"/>
-	<Vtx X="7" Y="9" Z="9" S="462" T="78" R="238" G="29" B="122" A="255"/>
-	<Vtx X="7" Y="9" Z="9" S="462" T="142" R="255" G="35" B="122" A="255"/>
-	<Vtx X="7" Y="9" Z="9" S="526" T="142" R="253" G="14" B="126" A="255"/>
-	<Vtx X="7" Y="9" Z="9" S="526" T="78" R="232" G="13" B="124" A="255"/>
-	<Vtx X="7" Y="7" Z="9" S="590" T="142" R="254" G="0" B="127" A="255"/>
-	<Vtx X="7" Y="7" Z="9" S="590" T="78" R="236" G="0" B="125" A="255"/>
-	<Vtx X="7" Y="6" Z="9" S="526" T="78" R="232" G="243" B="124" A="255"/>
-	<Vtx X="7" Y="6" Z="9" S="526" T="142" R="253" G="242" B="126" A="255"/>
-	<Vtx X="7" Y="5" Z="9" S="462" T="78" R="238" G="227" B="122" A="255"/>
-	<Vtx X="7" Y="5" Z="9" S="462" T="142" R="255" G="221" B="122" A="255"/>
-	<Vtx X="6" Y="5" Z="9" S="462" T="78" R="210" G="200" B="104" A="255"/>
-	<Vtx X="6" Y="5" Z="9" S="462" T="78" R="210" G="200" B="104" A="255"/>
-	<Vtx X="7" Y="5" Z="9" S="462" T="78" R="238" G="227" B="122" A="255"/>
-	<Vtx X="7" Y="6" Z="9" S="462" T="14" R="232" G="243" B="124" A="255"/>
-	<Vtx X="7" Y="4" Z="9" S="462" T="142" R="238" G="188" B="106" A="255"/>
-	<Vtx X="7" Y="5" Z="9" S="462" T="142" R="255" G="221" B="122" A="255"/>
-	<Vtx X="9" Y="5" Z="9" S="462" T="206" R="10" G="225" B="123" A="255"/>
-	<Vtx X="9" Y="4" Z="9" S="462" T="206" R="9" G="183" B="104" A="255"/>
-	<Vtx X="9" Y="6" Z="9" S="526" T="206" R="11" G="243" B="126" A="255"/>
-	<Vtx X="7" Y="6" Z="9" S="526" T="142" R="253" G="242" B="126" A="255"/>
-	<Vtx X="9" Y="7" Z="9" S="590" T="206" R="11" G="0" B="127" A="255"/>
-	<Vtx X="10" Y="6" Z="9" S="526" T="142" R="25" G="242" B="124" A="255"/>
-	<Vtx X="10" Y="5" Z="9" S="462" T="142" R="23" G="221" B="120" A="255"/>
-	<Vtx X="10" Y="5" Z="9" S="462" T="78" R="39" G="227" B="117" A="255"/>
-	<Vtx X="11" Y="6" Z="9" S="526" T="78" R="45" G="243" B="118" A="255"/>
-	<Vtx X="10" Y="7" Z="9" S="590" T="142" R="24" G="0" B="125" A="255"/>
-	<Vtx X="11" Y="7" Z="9" S="590" T="78" R="42" G="0" B="120" A="255"/>
-	<Vtx X="10" Y="7" Z="9" S="590" T="142" R="24" G="0" B="125" A="255"/>
-	<Vtx X="11" Y="7" Z="9" S="590" T="78" R="42" G="0" B="120" A="255"/>
-	<Vtx X="11" Y="9" Z="9" S="526" T="78" R="45" G="13" B="118" A="255"/>
-	<Vtx X="10" Y="9" Z="9" S="526" T="142" R="25" G="14" B="124" A="255"/>
-	<Vtx X="10" Y="9" Z="9" S="462" T="78" R="39" G="29" B="117" A="255"/>
-	<Vtx X="10" Y="9" Z="9" S="462" T="142" R="23" G="35" B="120" A="255"/>
-	<Vtx X="11" Y="10" Z="9" S="462" T="78" R="64" G="56" B="95" A="255"/>
-	<Vtx X="11" Y="9" Z="9" S="462" T="14" R="45" G="13" B="118" A="255"/>
-	<Vtx X="10" Y="10" Z="9" S="462" T="142" R="36" G="68" B="101" A="255"/>
-	<Vtx X="9" Y="9" Z="9" S="462" T="206" R="10" G="31" B="123" A="255"/>
-	<Vtx X="9" Y="10" Z="9" S="462" T="206" R="9" G="73" B="104" A="255"/>
-	<Vtx X="7" Y="10" Z="9" S="462" T="142" R="238" G="68" B="106" A="255"/>
-	<Vtx X="7" Y="9" Z="9" S="462" T="142" R="255" G="35" B="122" A="255"/>
-	<Vtx X="6" Y="10" Z="9" S="462" T="78" R="210" G="56" B="104" A="255"/>
-	<Vtx X="9" Y="9" Z="9" S="526" T="206" R="11" G="13" B="126" A="255"/>
-	<Vtx X="7" Y="9" Z="9" S="526" T="142" R="253" G="14" B="126" A="255"/>
-	<Vtx X="7" Y="9" Z="9" S="526" T="142" R="253" G="14" B="126" A="255"/>
-	<Vtx X="9" Y="7" Z="9" S="590" T="206" R="11" G="0" B="127" A="255"/>
-	<Vtx X="9" Y="9" Z="9" S="526" T="206" R="11" G="13" B="126" A="255"/>
-	<Vtx X="7" Y="7" Z="9" S="590" T="142" R="254" G="0" B="127" A="255"/>
-	<Vtx X="7" Y="6" Z="9" S="526" T="142" R="253" G="242" B="126" A="255"/>
-	<Vtx X="10" Y="9" Z="9" S="526" T="142" R="25" G="14" B="124" A="255"/>
-	<Vtx X="10" Y="7" Z="9" S="590" T="142" R="24" G="0" B="125" A="255"/>
-	<Vtx X="10" Y="6" Z="9" S="526" T="142" R="25" G="242" B="124" A="255"/>
-	<Vtx X="10" Y="9" Z="9" S="462" T="142" R="23" G="35" B="120" A="255"/>
-	<Vtx X="9" Y="9" Z="9" S="462" T="206" R="10" G="31" B="123" A="255"/>
-	<Vtx X="11" Y="7" Z="9" S="462" T="-50" R="42" G="0" B="120" A="255"/>
-	<Vtx X="12" Y="5" Z="8" S="462" T="14" R="78" G="229" B="97" A="255"/>
-	<Vtx X="12" Y="7" Z="8" S="462" T="-50" R="85" G="0" B="95" A="255"/>
-	<Vtx X="11" Y="6" Z="9" S="462" T="14" R="45" G="243" B="118" A="255"/>
-	<Vtx X="11" Y="5" Z="9" S="462" T="78" R="64" G="200" B="95" A="255"/>
-	<Vtx X="10" Y="5" Z="9" S="462" T="78" R="39" G="227" B="117" A="255"/>
-	<Vtx X="11" Y="5" Z="9" S="462" T="78" R="64" G="200" B="95" A="255"/>
-	<Vtx X="10" Y="5" Z="9" S="462" T="78" R="39" G="227" B="117" A="255"/>
-	<Vtx X="10" Y="5" Z="9" S="462" T="142" R="23" G="221" B="120" A="255"/>
-	<Vtx X="-2" Y="5" Z="9" S="422" T="14" R="117" G="208" B="248" A="255"/>
-	<Vtx X="-6" Y="7" Z="5" S="206" T="14" R="224" G="192" B="151" A="255"/>
-	<Vtx X="-2" Y="9" Z="9" S="422" T="14" R="119" G="44" B="244" A="255"/>
-	<Vtx X="-2" Y="7" Z="9" S="422" T="-50" R="126" G="0" B="241" A="255"/>
-	<Vtx X="-3" Y="9" Z="10" S="462" T="14" R="78" G="27" B="97" A="255"/>
-	<Vtx X="-3" Y="10" Z="9" S="422" T="78" R="89" G="90" B="244" A="255"/>
-	<Vtx X="-6" Y="7" Z="5" S="206" T="142" R="224" G="192" B="151" A="255"/>
-	<Vtx X="-4" Y="11" Z="9" S="422" T="142" R="76" G="102" B="252" A="255"/>
-	<Vtx X="-6" Y="11" Z="9" S="422" T="206" R="1" G="127" B="254" A="255"/>
-	<Vtx X="-8" Y="11" Z="9" S="422" T="142" R="204" G="116" B="7" A="255"/>
-	<Vtx X="-9" Y="10" Z="9" S="422" T="78" R="166" G="90" B="3" A="255"/>
-	<Vtx X="-10" Y="9" Z="9" S="422" T="14" R="139" G="48" B="12" A="255"/>
-	<Vtx X="-9" Y="9" Z="10" S="462" T="14" R="196" G="27" B="109" A="255"/>
-	<Vtx X="-9" Y="9" Z="10" S="462" T="14" R="196" G="27" B="109" A="255"/>
-	<Vtx X="-10" Y="9" Z="9" S="422" T="14" R="139" G="48" B="12" A="255"/>
-	<Vtx X="-10" Y="7" Z="9" S="422" T="-50" R="129" G="0" B="6" A="255"/>
-	<Vtx X="-10" Y="5" Z="9" S="422" T="14" R="137" G="212" B="8" A="255"/>
-	<Vtx X="-6" Y="7" Z="5" S="206" T="14" R="224" G="192" B="151" A="255"/>
-	<Vtx X="-9" Y="4" Z="9" S="422" T="78" R="166" G="166" B="3" A="255"/>
-	<Vtx X="-8" Y="3" Z="9" S="422" T="142" R="202" G="141" B="4" A="255"/>
-	<Vtx X="-8" Y="4" Z="10" S="462" T="142" R="238" G="188" B="106" A="255"/>
-	<Vtx X="-6" Y="3" Z="9" S="422" T="206" R="0" G="129" B="254" A="255"/>
-	<Vtx X="-6" Y="7" Z="5" S="206" T="142" R="224" G="192" B="151" A="255"/>
-	<Vtx X="-4" Y="3" Z="9" S="422" T="142" R="52" G="140" B="255" A="255"/>
-	<Vtx X="-3" Y="4" Z="9" S="422" T="78" R="89" G="167" B="244" A="255"/>
-	<Vtx X="-2" Y="5" Z="9" S="422" T="14" R="117" G="208" B="248" A="255"/>
-	<Vtx X="-3" Y="5" Z="10" S="462" T="14" R="78" G="229" B="97" A="255"/>
-	<Vtx X="-2" Y="7" Z="9" S="422" T="-50" R="126" G="0" B="241" A="255"/>
-	<Vtx X="-3" Y="7" Z="10" S="462" T="-50" R="85" G="0" B="95" A="255"/>
-	<Vtx X="-2" Y="7" Z="9" S="422" T="-50" R="126" G="0" B="241" A="255"/>
-	<Vtx X="-3" Y="9" Z="10" S="462" T="14" R="78" G="27" B="97" A="255"/>
-	<Vtx X="-3" Y="7" Z="10" S="462" T="-50" R="85" G="0" B="95" A="255"/>
-	<Vtx X="-4" Y="7" Z="10" S="462" T="-50" R="42" G="0" B="120" A="255"/>
-	<Vtx X="-4" Y="9" Z="10" S="462" T="14" R="45" G="13" B="118" A="255"/>
-	<Vtx X="-4" Y="10" Z="10" S="462" T="78" R="64" G="56" B="95" A="255"/>
-	<Vtx X="-3" Y="10" Z="9" S="422" T="78" R="89" G="90" B="244" A="255"/>
-	<Vtx X="-4" Y="10" Z="10" S="462" T="142" R="36" G="68" B="101" A="255"/>
-	<Vtx X="-4" Y="11" Z="9" S="422" T="142" R="76" G="102" B="252" A="255"/>
-	<Vtx X="-6" Y="11" Z="9" S="422" T="206" R="1" G="127" B="254" A="255"/>
-	<Vtx X="-6" Y="10" Z="10" S="462" T="206" R="9" G="73" B="104" A="255"/>
-	<Vtx X="-8" Y="10" Z="10" S="462" T="142" R="238" G="68" B="106" A="255"/>
-	<Vtx X="-8" Y="11" Z="9" S="422" T="142" R="204" G="116" B="7" A="255"/>
-	<Vtx X="-9" Y="10" Z="9" S="422" T="78" R="166" G="90" B="3" A="255"/>
-	<Vtx X="-8" Y="10" Z="10" S="462" T="78" R="210" G="56" B="104" A="255"/>
-	<Vtx X="-9" Y="9" Z="10" S="462" T="14" R="196" G="27" B="109" A="255"/>
-	<Vtx X="-8" Y="10" Z="10" S="462" T="78" R="210" G="56" B="104" A="255"/>
-	<Vtx X="-9" Y="9" Z="10" S="462" T="14" R="196" G="27" B="109" A="255"/>
-	<Vtx X="-8" Y="9" Z="10" S="462" T="14" R="232" G="13" B="124" A="255"/>
-	<Vtx X="-8" Y="7" Z="10" S="462" T="-50" R="236" G="0" B="125" A="255"/>
-	<Vtx X="-9" Y="7" Z="10" S="462" T="-50" R="189" G="0" B="108" A="255"/>
-	<Vtx X="-10" Y="7" Z="9" S="422" T="-50" R="129" G="0" B="6" A="255"/>
-	<Vtx X="-9" Y="5" Z="10" S="462" T="14" R="196" G="229" B="109" A="255"/>
-	<Vtx X="-10" Y="5" Z="9" S="422" T="14" R="137" G="212" B="8" A="255"/>
-	<Vtx X="-9" Y="4" Z="9" S="422" T="78" R="166" G="166" B="3" A="255"/>
-	<Vtx X="-8" Y="5" Z="10" S="462" T="78" R="210" G="200" B="104" A="255"/>
-	<Vtx X="-8" Y="4" Z="10" S="462" T="142" R="238" G="188" B="106" A="255"/>
-	<Vtx X="-7" Y="5" Z="10" S="462" T="142" R="255" G="221" B="122" A="255"/>
-	<Vtx X="-6" Y="5" Z="10" S="462" T="206" R="10" G="225" B="123" A="255"/>
-	<Vtx X="-6" Y="4" Z="10" S="462" T="206" R="9" G="183" B="104" A="255"/>
-	<Vtx X="-6" Y="3" Z="9" S="422" T="206" R="0" G="129" B="254" A="255"/>
-	<Vtx X="-4" Y="4" Z="10" S="462" T="142" R="36" G="188" B="101" A="255"/>
-	<Vtx X="-6" Y="3" Z="9" S="422" T="206" R="0" G="129" B="254" A="255"/>
-	<Vtx X="-4" Y="3" Z="9" S="422" T="142" R="52" G="140" B="255" A="255"/>
-	<Vtx X="-4" Y="4" Z="10" S="462" T="142" R="36" G="188" B="101" A="255"/>
-	<Vtx X="-3" Y="4" Z="9" S="422" T="78" R="89" G="167" B="244" A="255"/>
-	<Vtx X="-4" Y="5" Z="10" S="462" T="78" R="64" G="200" B="95" A="255"/>
-	<Vtx X="-3" Y="5" Z="10" S="462" T="14" R="78" G="229" B="97" A="255"/>
-	<Vtx X="-4" Y="6" Z="10" S="462" T="14" R="45" G="243" B="118" A="255"/>
-	<Vtx X="-4" Y="7" Z="10" S="462" T="-50" R="42" G="0" B="120" A="255"/>
-	<Vtx X="-3" Y="7" Z="10" S="462" T="-50" R="85" G="0" B="95" A="255"/>
-	<Vtx X="-4" Y="5" Z="10" S="462" T="78" R="39" G="227" B="117" A="255"/>
-	<Vtx X="-4" Y="5" Z="10" S="462" T="142" R="23" G="221" B="120" A="255"/>
-	<Vtx X="-4" Y="6" Z="10" S="526" T="142" R="25" G="242" B="124" A="255"/>
-	<Vtx X="-4" Y="6" Z="10" S="526" T="78" R="45" G="243" B="118" A="255"/>
-	<Vtx X="-4" Y="7" Z="10" S="590" T="142" R="24" G="0" B="125" A="255"/>
-	<Vtx X="-4" Y="7" Z="10" S="590" T="78" R="42" G="0" B="120" A="255"/>
-	<Vtx X="-4" Y="9" Z="10" S="526" T="78" R="45" G="13" B="118" A="255"/>
-	<Vtx X="-4" Y="9" Z="10" S="526" T="78" R="45" G="13" B="118" A="255"/>
-	<Vtx X="-4" Y="9" Z="10" S="526" T="142" R="25" G="14" B="124" A="255"/>
-	<Vtx X="-4" Y="7" Z="10" S="590" T="142" R="24" G="0" B="125" A="255"/>
-	<Vtx X="-4" Y="9" Z="10" S="462" T="78" R="39" G="29" B="117" A="255"/>
-	<Vtx X="-4" Y="9" Z="10" S="462" T="142" R="23" G="35" B="120" A="255"/>
-	<Vtx X="-4" Y="10" Z="10" S="462" T="78" R="64" G="56" B="95" A="255"/>
-	<Vtx X="-4" Y="9" Z="10" S="462" T="14" R="45" G="13" B="118" A="255"/>
-	<Vtx X="-4" Y="10" Z="10" S="462" T="142" R="36" G="68" B="101" A="255"/>
-	<Vtx X="-6" Y="9" Z="10" S="462" T="206" R="10" G="31" B="123" A="255"/>
-	<Vtx X="-6" Y="10" Z="10" S="462" T="206" R="9" G="73" B="104" A="255"/>
-	<Vtx X="-8" Y="10" Z="10" S="462" T="142" R="238" G="68" B="106" A="255"/>
-	<Vtx X="-7" Y="9" Z="10" S="462" T="142" R="255" G="35" B="122" A="255"/>
-	<Vtx X="-8" Y="10" Z="10" S="462" T="78" R="210" G="56" B="104" A="255"/>
-	<Vtx X="-8" Y="9" Z="10" S="462" T="78" R="238" G="29" B="122" A="255"/>
-	<Vtx X="-8" Y="9" Z="10" S="462" T="14" R="232" G="13" B="124" A="255"/>
-	<Vtx X="-7" Y="9" Z="11" S="526" T="142" R="253" G="14" B="126" A="255"/>
-	<Vtx X="-6" Y="9" Z="10" S="526" T="206" R="11" G="13" B="126" A="255"/>
-	<Vtx X="-7" Y="9" Z="10" S="462" T="142" R="255" G="35" B="122" A="255"/>
-	<Vtx X="-7" Y="9" Z="11" S="526" T="142" R="253" G="14" B="126" A="255"/>
-	<Vtx X="-6" Y="7" Z="10" S="590" T="206" R="11" G="0" B="127" A="255"/>
-	<Vtx X="-7" Y="7" Z="11" S="590" T="142" R="254" G="0" B="127" A="255"/>
-	<Vtx X="-8" Y="9" Z="10" S="526" T="78" R="232" G="13" B="124" A="255"/>
-	<Vtx X="-8" Y="9" Z="10" S="462" T="78" R="238" G="29" B="122" A="255"/>
-	<Vtx X="-8" Y="7" Z="10" S="590" T="78" R="236" G="0" B="125" A="255"/>
-	<Vtx X="-8" Y="6" Z="10" S="526" T="78" R="232" G="243" B="124" A="255"/>
-	<Vtx X="-7" Y="6" Z="11" S="526" T="142" R="253" G="242" B="126" A="255"/>
-	<Vtx X="-8" Y="5" Z="10" S="462" T="78" R="238" G="227" B="122" A="255"/>
-	<Vtx X="-7" Y="5" Z="10" S="462" T="142" R="255" G="221" B="122" A="255"/>
-	<Vtx X="-8" Y="5" Z="10" S="462" T="78" R="210" G="200" B="104" A="255"/>
-	<Vtx X="-8" Y="6" Z="10" S="462" T="14" R="232" G="243" B="124" A="255"/>
-	<Vtx X="-9" Y="5" Z="10" S="462" T="14" R="196" G="229" B="109" A="255"/>
-	<Vtx X="-8" Y="7" Z="10" S="462" T="-50" R="236" G="0" B="125" A="255"/>
-	<Vtx X="-8" Y="7" Z="10" S="462" T="-50" R="236" G="0" B="125" A="255"/>
-	<Vtx X="-9" Y="7" Z="10" S="462" T="-50" R="189" G="0" B="108" A="255"/>
-	<Vtx X="-9" Y="5" Z="10" S="462" T="14" R="196" G="229" B="109" A="255"/>
-	<Vtx X="-7" Y="5" Z="10" S="462" T="142" R="255" G="221" B="122" A="255"/>
-	<Vtx X="-6" Y="6" Z="10" S="526" T="206" R="11" G="243" B="126" A="255"/>
-	<Vtx X="-7" Y="6" Z="11" S="526" T="142" R="253" G="242" B="126" A="255"/>
-	<Vtx X="-6" Y="5" Z="10" S="462" T="206" R="10" G="225" B="123" A="255"/>
-	<Vtx X="-4" Y="5" Z="10" S="462" T="142" R="23" G="221" B="120" A="255"/>
-	<Vtx X="-4" Y="4" Z="10" S="462" T="142" R="36" G="188" B="101" A="255"/>
-	<Vtx X="-6" Y="4" Z="10" S="462" T="206" R="9" G="183" B="104" A="255"/>
-	<Vtx X="-4" Y="5" Z="10" S="462" T="78" R="64" G="200" B="95" A="255"/>
-	<Vtx X="-6" Y="9" Z="10" S="526" T="206" R="11" G="13" B="126" A="255"/>
-	<Vtx X="-6" Y="9" Z="10" S="462" T="206" R="10" G="31" B="123" A="255"/>
-	<Vtx X="-7" Y="9" Z="10" S="462" T="142" R="255" G="35" B="122" A="255"/>
-	<Vtx X="-4" Y="9" Z="10" S="462" T="142" R="23" G="35" B="120" A="255"/>
-	<Vtx X="-4" Y="9" Z="10" S="526" T="142" R="25" G="14" B="124" A="255"/>
-	<Vtx X="-4" Y="9" Z="10" S="526" T="142" R="25" G="14" B="124" A="255"/>
-	<Vtx X="-6" Y="9" Z="10" S="526" T="206" R="11" G="13" B="126" A="255"/>
-	<Vtx X="-6" Y="7" Z="10" S="590" T="206" R="11" G="0" B="127" A="255"/>
-	<Vtx X="-4" Y="7" Z="10" S="590" T="142" R="24" G="0" B="125" A="255"/>
-	<Vtx X="-4" Y="6" Z="10" S="526" T="142" R="25" G="242" B="124" A="255"/>
-	<Vtx X="-6" Y="6" Z="10" S="526" T="206" R="11" G="243" B="126" A="255"/>
-	<Vtx X="-7" Y="6" Z="11" S="526" T="142" R="253" G="242" B="126" A="255"/>
-	<Vtx X="-7" Y="7" Z="11" S="590" T="142" R="254" G="0" B="127" A="255"/>
-	<Vtx X="-4" Y="5" Z="10" S="462" T="142" R="23" G="221" B="120" A="255"/>
-</Vertex>
diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_Gem_eyes b/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_Gem_eyes
deleted file mode 100644
index 774994e9e..000000000
--- a/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_Gem_eyes
+++ /dev/null
@@ -1,21 +0,0 @@
-<DisplayList Version="0">
-	<PipeSync/>
-	<SetCombineLERP A0="G_CCMUX_TEXEL0" B0="G_CCMUX_0" C0="G_CCMUX_TEXEL0" D0="G_CCMUX_TEXEL0" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_1" A1="G_CCMUX_COMBINED" B1="G_CCMUX_0" C1="G_CCMUX_PRIMITIVE" D1="G_CCMUX_0" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_COMBINED"/>
-	<SetGeometryMode G_ZBUFFER="1" G_SHADE="1" G_CULL_BACK="1" G_FOG="1" G_LIGHTING="1" G_TEXTURE_GEN="1" G_SHADING_SMOOTH="1" />
-	<ClearGeometryMode G_CULL_FRONT="1" G_TEXTURE_GEN_LINEAR="1" />
-	<SetOtherMode Cmd="G_SETOTHERMODE_H" Sft="4" Length="20" G_AD_NOISE="1" G_CD_MAGICSQ="1" G_CK_NONE="1" G_TC_FILT="1" G_TF_BILERP="1" G_TL_TILE="1" G_TD_CLAMP="1" G_TP_PERSP="1" G_CYC_2CYCLE="1" G_PM_NPRIMITIVE="1" />
-	<SetOtherMode Cmd="G_SETOTHERMODE_L" Sft="0" Length="32" G_AC_NONE="1" G_ZS_PIXEL="1" G_RM_FOG_SHADE_A="1" G_RM_AA_ZB_OPA_SURF2="1" />
-	<Texture S="5898" T="5898" Level="0" Tile="0" On="1"/>
-	<SetTextureLUT Mode="G_TT_NONE"/>
-	<TileSync/>
-	<SetTextureImage Path="objects/object_gi_boss_soul/noise_tex" Format="G_IM_FMT_I" Size="G_IM_SIZ_8b_LOAD_BLOCK" Width="1"/>
-	<SetTile Format="G_IM_FMT_I" Size="G_IM_SIZ_8b_LOAD_BLOCK" Line="0" TMem="0" Tile="7" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
-	<LoadSync/>
-	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="511" Dxt="512"/>
-	<PipeSync/>
-	<SetTile Format="G_IM_FMT_I" Size="G_IM_SIZ_8b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
-	<SetTileSize T="0" Uls="0" Ult="0" Lrs="124" Lrt="124"/>
-	<SetPrimColor M="0" L="0" R="223" G="62" B="53" A="255"/>
-	<EndDisplayList/>
-</DisplayList>
-
diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_black b/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_black
deleted file mode 100644
index 8a475974d..000000000
--- a/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_black
+++ /dev/null
@@ -1,21 +0,0 @@
-<DisplayList Version="0">
-	<PipeSync/>
-	<SetCombineLERP A0="G_CCMUX_TEXEL0" B0="G_CCMUX_0" C0="G_CCMUX_TEXEL0" D0="G_CCMUX_TEXEL0" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_1" A1="G_CCMUX_COMBINED" B1="G_CCMUX_0" C1="G_CCMUX_PRIMITIVE" D1="G_CCMUX_0" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_COMBINED"/>
-	<SetGeometryMode G_ZBUFFER="1" G_SHADE="1" G_CULL_BACK="1" G_FOG="1" G_LIGHTING="1" G_TEXTURE_GEN="1" G_SHADING_SMOOTH="1" />
-	<ClearGeometryMode G_CULL_FRONT="1" G_TEXTURE_GEN_LINEAR="1" />
-	<SetOtherMode Cmd="G_SETOTHERMODE_H" Sft="4" Length="20" G_AD_NOISE="1" G_CD_MAGICSQ="1" G_CK_NONE="1" G_TC_FILT="1" G_TF_BILERP="1" G_TL_TILE="1" G_TD_CLAMP="1" G_TP_PERSP="1" G_CYC_2CYCLE="1" G_PM_NPRIMITIVE="1" />
-	<SetOtherMode Cmd="G_SETOTHERMODE_L" Sft="0" Length="32" G_AC_NONE="1" G_ZS_PIXEL="1" G_RM_FOG_SHADE_A="1" G_RM_AA_ZB_OPA_SURF2="1" />
-	<Texture S="1984" T="1984" Level="0" Tile="0" On="1"/>
-	<SetTextureLUT Mode="G_TT_NONE"/>
-	<TileSync/>
-	<SetTextureImage Path="objects/object_gi_boss_soul/noise_tex_copy" Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b_LOAD_BLOCK" Width="1"/>
-	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b_LOAD_BLOCK" Line="0" TMem="0" Tile="7" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
-	<LoadSync/>
-	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="1023" Dxt="256"/>
-	<PipeSync/>
-	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="8" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
-	<SetTileSize T="0" Uls="0" Ult="0" Lrs="124" Lrt="124"/>
-	<SetPrimColor M="0" L="0" R="49" G="49" B="49" A="255"/>
-	<EndDisplayList/>
-</DisplayList>
-
diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_eyes b/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_eyes
deleted file mode 100644
index 90ecc4518..000000000
--- a/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_eyes
+++ /dev/null
@@ -1,21 +0,0 @@
-<DisplayList Version="0">
-	<PipeSync/>
-	<SetCombineLERP A0="G_CCMUX_0" B0="G_CCMUX_0" C0="G_CCMUX_0" D0="G_CCMUX_TEXEL0" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_1" A1="G_CCMUX_COMBINED" B1="G_CCMUX_0" C1="G_CCMUX_PRIMITIVE" D1="G_CCMUX_0" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_COMBINED"/>
-	<SetGeometryMode G_ZBUFFER="1" G_SHADE="1" G_CULL_BACK="1" G_FOG="1" G_LIGHTING="1" G_SHADING_SMOOTH="1" />
-	<ClearGeometryMode G_CULL_FRONT="1" G_TEXTURE_GEN="1" G_TEXTURE_GEN_LINEAR="1" />
-	<SetOtherMode Cmd="G_SETOTHERMODE_H" Sft="4" Length="20" G_AD_NOISE="1" G_CD_MAGICSQ="1" G_CK_NONE="1" G_TC_FILT="1" G_TF_BILERP="1" G_TL_TILE="1" G_TD_CLAMP="1" G_TP_PERSP="1" G_CYC_2CYCLE="1" G_PM_NPRIMITIVE="1" />
-	<SetOtherMode Cmd="G_SETOTHERMODE_L" Sft="0" Length="32" G_AC_NONE="1" G_ZS_PIXEL="1" G_RM_FOG_SHADE_A="1" G_RM_AA_ZB_OPA_SURF2="1" />
-	<Texture S="65535" T="65535" Level="0" Tile="0" On="1"/>
-	<SetTextureLUT Mode="G_TT_NONE"/>
-	<TileSync/>
-	<SetTextureImage Path="objects/object_gi_boss_soul/noise_tex_copy" Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b_LOAD_BLOCK" Width="1"/>
-	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b_LOAD_BLOCK" Line="0" TMem="0" Tile="7" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
-	<LoadSync/>
-	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="1023" Dxt="256"/>
-	<PipeSync/>
-	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="8" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
-	<SetTileSize T="0" Uls="0" Ult="0" Lrs="124" Lrt="124"/>
-	<SetPrimColor M="0" L="0" R="90" G="14" B="12" A="255"/>
-	<EndDisplayList/>
-</DisplayList>
-
diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_horns b/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_horns
deleted file mode 100644
index 2ea52e133..000000000
--- a/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_horns
+++ /dev/null
@@ -1,21 +0,0 @@
-<DisplayList Version="0">
-	<PipeSync/>
-	<SetCombineLERP A0="G_CCMUX_TEXEL0" B0="G_CCMUX_0" C0="G_CCMUX_TEXEL0" D0="G_CCMUX_TEXEL0" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_1" A1="G_CCMUX_COMBINED" B1="G_CCMUX_0" C1="G_CCMUX_PRIMITIVE" D1="G_CCMUX_0" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_COMBINED"/>
-	<SetGeometryMode G_ZBUFFER="1" G_SHADE="1" G_CULL_BACK="1" G_FOG="1" G_LIGHTING="1" G_TEXTURE_GEN="1" G_SHADING_SMOOTH="1" />
-	<ClearGeometryMode G_CULL_FRONT="1" G_TEXTURE_GEN_LINEAR="1" />
-	<SetOtherMode Cmd="G_SETOTHERMODE_H" Sft="4" Length="20" G_AD_NOISE="1" G_CD_MAGICSQ="1" G_CK_NONE="1" G_TC_FILT="1" G_TF_BILERP="1" G_TL_TILE="1" G_TD_CLAMP="1" G_TP_PERSP="1" G_CYC_2CYCLE="1" G_PM_NPRIMITIVE="1" />
-	<SetOtherMode Cmd="G_SETOTHERMODE_L" Sft="0" Length="32" G_AC_NONE="1" G_ZS_PIXEL="1" G_RM_FOG_SHADE_A="1" G_RM_AA_ZB_OPA_SURF2="1" />
-	<Texture S="1984" T="1984" Level="0" Tile="0" On="1"/>
-	<SetTextureLUT Mode="G_TT_NONE"/>
-	<TileSync/>
-	<SetTextureImage Path="objects/object_gi_boss_soul/noise_tex" Format="G_IM_FMT_I" Size="G_IM_SIZ_8b_LOAD_BLOCK" Width="1"/>
-	<SetTile Format="G_IM_FMT_I" Size="G_IM_SIZ_8b_LOAD_BLOCK" Line="0" TMem="0" Tile="7" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
-	<LoadSync/>
-	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="511" Dxt="512"/>
-	<PipeSync/>
-	<SetTile Format="G_IM_FMT_I" Size="G_IM_SIZ_8b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
-	<SetTileSize T="0" Uls="0" Ult="0" Lrs="124" Lrt="124"/>
-	<SetPrimColor M="0" L="0" R="255" G="241" B="124" A="255"/>
-	<EndDisplayList/>
-</DisplayList>
-
diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_surface b/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_surface
deleted file mode 100644
index ea4bbdc17..000000000
--- a/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_surface
+++ /dev/null
@@ -1,21 +0,0 @@
-<DisplayList Version="0">
-	<PipeSync/>
-	<SetCombineLERP A0="G_CCMUX_TEXEL0" B0="G_CCMUX_0" C0="G_CCMUX_TEXEL0" D0="G_CCMUX_TEXEL0" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_1" A1="G_CCMUX_COMBINED" B1="G_CCMUX_0" C1="G_CCMUX_PRIMITIVE" D1="G_CCMUX_0" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_COMBINED"/>
-	<SetGeometryMode G_ZBUFFER="1" G_SHADE="1" G_CULL_BACK="1" G_FOG="1" G_LIGHTING="1" G_TEXTURE_GEN="1" G_SHADING_SMOOTH="1" />
-	<ClearGeometryMode G_CULL_FRONT="1" G_TEXTURE_GEN_LINEAR="1" />
-	<SetOtherMode Cmd="G_SETOTHERMODE_H" Sft="4" Length="20" G_AD_NOISE="1" G_CD_MAGICSQ="1" G_CK_NONE="1" G_TC_FILT="1" G_TF_BILERP="1" G_TL_TILE="1" G_TD_CLAMP="1" G_TP_PERSP="1" G_CYC_2CYCLE="1" G_PM_NPRIMITIVE="1" />
-	<SetOtherMode Cmd="G_SETOTHERMODE_L" Sft="0" Length="32" G_AC_NONE="1" G_ZS_PIXEL="1" G_RM_FOG_SHADE_A="1" G_RM_AA_ZB_OPA_SURF2="1" />
-	<Texture S="1984" T="1984" Level="0" Tile="0" On="1"/>
-	<SetTextureLUT Mode="G_TT_NONE"/>
-	<TileSync/>
-	<SetTextureImage Path="objects/object_gi_boss_soul/noise_tex" Format="G_IM_FMT_I" Size="G_IM_SIZ_8b_LOAD_BLOCK" Width="1"/>
-	<SetTile Format="G_IM_FMT_I" Size="G_IM_SIZ_8b_LOAD_BLOCK" Line="0" TMem="0" Tile="7" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
-	<LoadSync/>
-	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="511" Dxt="512"/>
-	<PipeSync/>
-	<SetTile Format="G_IM_FMT_I" Size="G_IM_SIZ_8b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
-	<SetTileSize T="0" Uls="0" Ult="0" Lrs="124" Lrt="124"/>
-	<!-- <SetPrimColor M="0" L="0" R="255" G="255" B="255" A="255"/> -->
-	<EndDisplayList/>
-</DisplayList>
-
diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/noise_tex b/OTRExporter/assets/objects/object_gi_boss_soul/noise_tex
deleted file mode 100644
index aaf4e331f15f797a3b1122b58c57b3767e66bc0f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1116
zcma)5S&rmH5G^FcIk*X5eDlKxBf5LKx?JV<zND9QdQWd<yUM%Ec1`sZ(=$CnVgPXg
zj=~kV0y%;M5K<^Y%E*X}_g=16tJM$Re*fJUB>w&9uYY}ZlKyY|id266pZ|L)_-3^t
z{^e>VIz`u(`^dKQ%g2w`bDu%x{^r%I8%i=wg`pMy&>oT`wvAwTeqNf)RT*l1cl(+W
z4O3wm5FDBuCz%Uiv0TQ&*Cj#VNy!7F8h~R}KQ9uT<sn4bc%G_I6GT;0xy}7XAc0Xl
z9EM4G%%b!-&hwC40w?Q+Os^j}O=W1^_ib-q*JV+41F@s8a3Ua`shwm1mN7#QI_dF{
zC3#gJ4`q&_A_E=pJ4Q7D!zjqoEu1AT@}e}suH(73Ws=D>qZsmTyW<5x_pt+H9l4&R
zNV*$EuA#8o9Vc?s{bsv;)Pm5GMBTP6z|sQ5v2V)EX1(5QHV?AIOLmqzz`$u>%G@KX
zAm1U#Q1`b#-cdY`0zWyHA&UB`uvJOq1z;j%s@!gUchADQtBSnLBiuZ{ObIeINsvAl
zKp>GPf~X&wGE1T`oqzfLxlOSLfeJL;gpe$uxkXczdF&C0F2DWpa%!p~b}e0&RKxLI
z%T231NzwpnD1Z9&={oddS76r=ISB@l@A&(Ji`>A~6jZ+b`Tf)mbH67OcwTj)5Scc{
zK!pLxobvMFI`+$@k4zv-0AY+25fE@S6z$W{&&H?oX}(_jP*+sLjS^qu9wmr;+rj%{
zAEy-|@BH@CVH4;m%+kORMa{#BXIWla6lGO6!#wp(?ire4hv`1{96uqtA;^bi)3$9t
zo$9i#W2i_9OzJvM;xx4+nwI?IFm%JTj73}=LclXD2+J}FLmcRYNZGH3zUij9O&r(N
zIC{GkOwTb52m2bcW%RfiySf=qM4ckHqqfwB78L>#iUN&&l-#mE4Q;=iy9hjP)*G6p
zcAUU-vK4wNFT$)pja`3!_q^mt=2&vXvP9&Xrb8$zFlv{%J+_yZm#3OgWf__(%K$o#
zDT@+s;Ci{tRaQ>d>(W(+JVHPr6kC2^iS&+v`RR%Lt01bUX&g>t6B|4yh?4GjP~1K+
zRyjYNyVUUyr+Hf5EKR78{fMr0WJ>e{hl<lY9%I`(zIpc(8Bw{y=JoB(-A*<Qg`xfd
D(@X%Y

diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/noise_tex_copy b/OTRExporter/assets/objects/object_gi_boss_soul/noise_tex_copy
deleted file mode 100644
index a6d6cf945e1bd755148a4d4dcbb52a7547cff5fe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2140
zcma)-p;iK66oglkuRxQ?Q<%&agGb`VjYNupNF+ksxY6os*d%WB6=crmckY4&-2)5j
zKXYg1-v6g*n&##4`RV3#|Na=h@;ZI|_uuVl<^Asq(Az`PoL+ZL(=FG>ZM*At{kGk<
zoB8^f@B6V|^o#wtA9sD8b<1}4`pMPKy5;JSt6Sz1_+WFbkE_FGzU#q*&dPQML+<DJ
z%{=v|cod}ewhdqEa0Pvd&uY;+hyw7NxjIoiWl%rLqoa6|2&u%qigm(w@yQGoVaO$V
z>cGs(0eCWBAFIAB+{qL)^;J{#(*^U779F9Cck7oMvyi7MiAz1X(~0sQ40!#}eYwJr
z)w$3!#TWA08q`zmoX`3-iMlqu)Ut1KlNXALA#>#Hnt0flT_;zLs4+)eg_T-0z2Jv#
z==wz%=q<_ft_t{={8V=eviFAWeF#3h{wM3p2TJs82JFS)hc4641%p29MHs>^6Wz%(
z_P%H)*j`R&0VaIl)cQF&g7^Hu`S~RA&8l$%2Rru~ep=hPLVc9b!Em_yQawC50ZL_7
zkVWyC0UUWR_wL|gup?AW-<Z*=ELuMHmHta9j-4iEQEZf_QdX-t3_b}~FWF6GFPghE
zg<tn+-0FtDa-!BOgRZ)@TXAao*3b7#^(OBrku@j)P5RDNvMlZX`dps=BI#!s$_eLv
zGRr4^eX3I;@GVZhWXi0NIFm~U$e%i}1Z~&r3@QBIIjH`nBD(oay~NWo=WjZ}=18y1
Wt?)@tzwBYq`!Okk_S7_uJpBQRG6N+5


From 5de2e731c8a559813aad6678a3dc39d2e9cf7da0 Mon Sep 17 00:00:00 2001
From: Ralphie Morell <stratomaster64@gmail.com>
Date: Sun, 5 Nov 2023 13:33:28 -0500
Subject: [PATCH 025/230] move boss soul assets

---
 .../object_boss_soul/gGIBossSoulSkullDL       |  19 ++
 .../object_boss_soul/gGIBossSoulSkullDL_tri_0 | 163 +++++++++++
 .../object_boss_soul/gGIBossSoulSkullDL_tri_1 |  26 ++
 .../object_boss_soul/gGIBossSoulSkullDL_tri_2 |   7 +
 .../object_boss_soul/gGIBossSoulSkullDL_tri_3 |  48 ++++
 .../object_boss_soul/gGIBossSoulSkullDL_tri_4 | 245 ++++++++++++++++
 .../object_boss_soul/gGIBossSoulSkullDL_vtx_0 | 173 ++++++++++++
 .../object_boss_soul/gGIBossSoulSkullDL_vtx_1 |  26 ++
 .../object_boss_soul/gGIBossSoulSkullDL_vtx_2 |   6 +
 .../object_boss_soul/gGIBossSoulSkullDL_vtx_3 |  58 ++++
 .../object_boss_soul/gGIBossSoulSkullDL_vtx_4 | 267 ++++++++++++++++++
 .../mat_gGIBossSoulSkullDL_Gem_eyes           |  21 ++
 .../mat_gGIBossSoulSkullDL_skull_black        |  21 ++
 .../mat_gGIBossSoulSkullDL_skull_eyes         |  21 ++
 .../mat_gGIBossSoulSkullDL_skull_horns        |  21 ++
 .../mat_gGIBossSoulSkullDL_skull_surface      |  21 ++
 .../custom/objects/object_boss_soul/noise_tex | Bin 0 -> 1116 bytes
 .../objects/object_boss_soul/noise_tex_copy   | Bin 0 -> 2140 bytes
 soh/assets/soh_assets.h                       |   2 +-
 19 files changed, 1144 insertions(+), 1 deletion(-)
 create mode 100644 soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL
 create mode 100644 soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_tri_0
 create mode 100644 soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_tri_1
 create mode 100644 soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_tri_2
 create mode 100644 soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_tri_3
 create mode 100644 soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_tri_4
 create mode 100644 soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_vtx_0
 create mode 100644 soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_vtx_1
 create mode 100644 soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_vtx_2
 create mode 100644 soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_vtx_3
 create mode 100644 soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_vtx_4
 create mode 100644 soh/assets/custom/objects/object_boss_soul/mat_gGIBossSoulSkullDL_Gem_eyes
 create mode 100644 soh/assets/custom/objects/object_boss_soul/mat_gGIBossSoulSkullDL_skull_black
 create mode 100644 soh/assets/custom/objects/object_boss_soul/mat_gGIBossSoulSkullDL_skull_eyes
 create mode 100644 soh/assets/custom/objects/object_boss_soul/mat_gGIBossSoulSkullDL_skull_horns
 create mode 100644 soh/assets/custom/objects/object_boss_soul/mat_gGIBossSoulSkullDL_skull_surface
 create mode 100644 soh/assets/custom/objects/object_boss_soul/noise_tex
 create mode 100644 soh/assets/custom/objects/object_boss_soul/noise_tex_copy

diff --git a/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL b/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL
new file mode 100644
index 000000000..6e3cbc204
--- /dev/null
+++ b/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL
@@ -0,0 +1,19 @@
+<DisplayList Version="0">
+	<CallDisplayList Path="objects/object_boss_soul/mat_gGIBossSoulSkullDL_skull_surface"/>
+	<CallDisplayList Path="objects/object_boss_soul/gGIBossSoulSkullDL_tri_0"/>
+	<CallDisplayList Path="objects/object_boss_soul/mat_gGIBossSoulSkullDL_skull_black"/>
+	<CallDisplayList Path="objects/object_boss_soul/gGIBossSoulSkullDL_tri_1"/>
+	<CallDisplayList Path="objects/object_boss_soul/mat_gGIBossSoulSkullDL_skull_eyes"/>
+	<CallDisplayList Path="objects/object_boss_soul/gGIBossSoulSkullDL_tri_2"/>
+	<CallDisplayList Path="objects/object_boss_soul/mat_gGIBossSoulSkullDL_skull_horns"/>
+	<CallDisplayList Path="objects/object_boss_soul/gGIBossSoulSkullDL_tri_3"/>
+	<CallDisplayList Path="objects/object_boss_soul/mat_gGIBossSoulSkullDL_Gem_eyes"/>
+	<CallDisplayList Path="objects/object_boss_soul/gGIBossSoulSkullDL_tri_4"/>
+	<PipeSync/>
+	<SetGeometryMode G_LIGHTING="1" />
+	<ClearGeometryMode G_TEXTURE_GEN="1" />
+	<SetCombineLERP A0="G_CCMUX_0" B0="G_CCMUX_0" C0="G_CCMUX_0" D0="G_CCMUX_SHADE" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_ENVIRONMENT" A1="G_CCMUX_0" B1="G_CCMUX_0" C1="G_CCMUX_0" D1="G_CCMUX_SHADE" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_ENVIRONMENT"/>
+	<Texture S="65535" T="65535" Level="0" Tile="0" On="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_tri_0 b/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_tri_0
new file mode 100644
index 000000000..34ff33a71
--- /dev/null
+++ b/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_tri_0
@@ -0,0 +1,163 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_boss_soul/gGIBossSoulSkullDL_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="0" V01="2" V02="3"/>
+	<Triangle1 V00="3" V01="2" V02="4"/>
+	<Triangle1 V00="2" V01="5" V02="4"/>
+	<Triangle1 V00="2" V01="6" V02="5"/>
+	<Triangle1 V00="7" V01="6" V02="2"/>
+	<Triangle1 V00="2" V01="8" V02="7"/>
+	<Triangle1 V00="2" V01="9" V02="8"/>
+	<Triangle1 V00="8" V01="9" V02="10"/>
+	<Triangle1 V00="8" V01="10" V02="11"/>
+	<Triangle1 V00="12" V01="11" V02="10"/>
+	<Triangle1 V00="10" V01="13" V02="12"/>
+	<Triangle1 V00="10" V01="14" V02="13"/>
+	<Triangle1 V00="12" V01="13" V02="15"/>
+	<LoadVertices Path="objects/object_boss_soul/gGIBossSoulSkullDL_vtx_0" VertexBufferIndex="0" VertexOffset="16" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="0" V01="3" V02="1"/>
+	<Triangle1 V00="4" V01="2" V02="1"/>
+	<Triangle1 V00="2" V01="4" V02="5"/>
+	<Triangle1 V00="6" V01="5" V02="4"/>
+	<Triangle1 V00="4" V01="7" V02="6"/>
+	<Triangle1 V00="4" V01="8" V02="7"/>
+	<Triangle1 V00="1" V01="8" V02="4"/>
+	<Triangle1 V00="1" V01="9" V02="8"/>
+	<Triangle1 V00="9" V01="10" V02="8"/>
+	<Triangle1 V00="7" V01="8" V02="10"/>
+	<Triangle1 V00="7" V01="10" V02="11"/>
+	<Triangle1 V00="11" V01="10" V02="12"/>
+	<Triangle1 V00="11" V01="12" V02="13"/>
+	<Triangle1 V00="13" V01="12" V02="14"/>
+	<Triangle1 V00="15" V01="14" V02="12"/>
+	<LoadVertices Path="objects/object_boss_soul/gGIBossSoulSkullDL_vtx_0" VertexBufferIndex="0" VertexOffset="32" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="2" V01="3" V02="0"/>
+	<Triangle1 V00="4" V01="3" V02="2"/>
+	<Triangle1 V00="4" V01="5" V02="3"/>
+	<Triangle1 V00="4" V01="6" V02="5"/>
+	<Triangle1 V00="4" V01="7" V02="6"/>
+	<Triangle1 V00="6" V01="7" V02="8"/>
+	<Triangle1 V00="6" V01="8" V02="9"/>
+	<Triangle1 V00="10" V01="9" V02="8"/>
+	<Triangle1 V00="10" V01="8" V02="11"/>
+	<Triangle1 V00="8" V01="12" V02="11"/>
+	<Triangle1 V00="13" V01="12" V02="8"/>
+	<Triangle1 V00="14" V01="13" V02="8"/>
+	<Triangle1 V00="14" V01="8" V02="15"/>
+	<LoadVertices Path="objects/object_boss_soul/gGIBossSoulSkullDL_vtx_0" VertexBufferIndex="0" VertexOffset="48" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="3" V01="0" V02="2"/>
+	<Triangle1 V00="2" V01="4" V02="3"/>
+	<Triangle1 V00="2" V01="5" V02="4"/>
+	<Triangle1 V00="2" V01="6" V02="5"/>
+	<Triangle1 V00="6" V01="7" V02="5"/>
+	<Triangle1 V00="7" V01="6" V02="8"/>
+	<Triangle1 V00="7" V01="8" V02="9"/>
+	<Triangle1 V00="5" V01="7" V02="10"/>
+	<Triangle1 V00="5" V01="10" V02="11"/>
+	<Triangle1 V00="11" V01="12" V02="5"/>
+	<Triangle1 V00="13" V01="12" V02="11"/>
+	<Triangle1 V00="13" V01="11" V02="14"/>
+	<Triangle1 V00="15" V01="13" V02="14"/>
+	<LoadVertices Path="objects/object_boss_soul/gGIBossSoulSkullDL_vtx_0" VertexBufferIndex="0" VertexOffset="64" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="2" V01="3" V02="0"/>
+	<Triangle1 V00="4" V01="0" V02="3"/>
+	<Triangle1 V00="0" V01="4" V02="5"/>
+	<Triangle1 V00="4" V01="6" V02="5"/>
+	<Triangle1 V00="6" V01="4" V02="7"/>
+	<Triangle1 V00="4" V01="8" V02="7"/>
+	<Triangle1 V00="4" V01="9" V02="8"/>
+	<Triangle1 V00="10" V01="9" V02="4"/>
+	<Triangle1 V00="4" V01="11" V02="10"/>
+	<Triangle1 V00="11" V01="12" V02="10"/>
+	<Triangle1 V00="11" V01="13" V02="12"/>
+	<Triangle1 V00="12" V01="13" V02="14"/>
+	<Triangle1 V00="12" V01="14" V02="15"/>
+	<LoadVertices Path="objects/object_boss_soul/gGIBossSoulSkullDL_vtx_0" VertexBufferIndex="0" VertexOffset="80" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="0" V01="2" V02="3"/>
+	<Triangle1 V00="4" V01="0" V02="3"/>
+	<Triangle1 V00="4" V01="3" V02="5"/>
+	<Triangle1 V00="6" V01="5" V02="3"/>
+	<Triangle1 V00="6" V01="3" V02="7"/>
+	<Triangle1 V00="6" V01="7" V02="8"/>
+	<Triangle1 V00="6" V01="8" V02="9"/>
+	<Triangle1 V00="9" V01="10" V02="6"/>
+	<Triangle1 V00="9" V01="11" V02="10"/>
+	<Triangle1 V00="11" V01="12" V02="10"/>
+	<Triangle1 V00="12" V01="11" V02="13"/>
+	<Triangle1 V00="14" V01="12" V02="13"/>
+	<Triangle1 V00="14" V01="15" V02="12"/>
+	<LoadVertices Path="objects/object_boss_soul/gGIBossSoulSkullDL_vtx_0" VertexBufferIndex="0" VertexOffset="96" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="0" V01="2" V02="3"/>
+	<Triangle1 V00="0" V01="3" V02="4"/>
+	<Triangle1 V00="0" V01="4" V02="5"/>
+	<Triangle1 V00="4" V01="6" V02="5"/>
+	<Triangle1 V00="6" V01="7" V02="5"/>
+	<Triangle1 V00="7" V01="8" V02="5"/>
+	<Triangle1 V00="8" V01="7" V02="9"/>
+	<Triangle1 V00="8" V01="9" V02="10"/>
+	<Triangle1 V00="11" V01="5" V02="8"/>
+	<Triangle1 V00="12" V01="5" V02="11"/>
+	<Triangle1 V00="13" V01="12" V02="11"/>
+	<Triangle1 V00="13" V01="11" V02="14"/>
+	<Triangle1 V00="15" V01="14" V02="11"/>
+	<LoadVertices Path="objects/object_boss_soul/gGIBossSoulSkullDL_vtx_0" VertexBufferIndex="0" VertexOffset="112" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="1" V01="3" V02="2"/>
+	<Triangle1 V00="0" V01="4" V02="5"/>
+	<Triangle1 V00="0" V01="6" V02="4"/>
+	<Triangle1 V00="4" V01="7" V02="5"/>
+	<Triangle1 V00="4" V01="8" V02="7"/>
+	<Triangle1 V00="9" V01="7" V02="8"/>
+	<Triangle1 V00="8" V01="10" V02="9"/>
+	<Triangle1 V00="8" V01="11" V02="10"/>
+	<Triangle1 V00="11" V01="12" V02="10"/>
+	<Triangle1 V00="11" V01="13" V02="12"/>
+	<Triangle1 V00="14" V01="12" V02="13"/>
+	<Triangle1 V00="14" V01="15" V02="12"/>
+	<LoadVertices Path="objects/object_boss_soul/gGIBossSoulSkullDL_vtx_0" VertexBufferIndex="0" VertexOffset="128" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="0" V01="2" V02="3"/>
+	<Triangle1 V00="3" V01="4" V02="0"/>
+	<Triangle1 V00="0" V01="5" V02="1"/>
+	<Triangle1 V00="0" V01="6" V02="5"/>
+	<Triangle1 V00="6" V01="7" V02="5"/>
+	<Triangle1 V00="6" V01="8" V02="7"/>
+	<Triangle1 V00="5" V01="7" V02="9"/>
+	<Triangle1 V00="10" V01="9" V02="7"/>
+	<Triangle1 V00="11" V01="10" V02="7"/>
+	<Triangle1 V00="12" V01="9" V02="10"/>
+	<Triangle1 V00="13" V01="9" V02="12"/>
+	<Triangle1 V00="14" V01="13" V02="12"/>
+	<Triangle1 V00="14" V01="12" V02="15"/>
+	<LoadVertices Path="objects/object_boss_soul/gGIBossSoulSkullDL_vtx_0" VertexBufferIndex="0" VertexOffset="144" Count="14"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="3" V01="0" V02="2"/>
+	<Triangle1 V00="3" V01="2" V02="4"/>
+	<Triangle1 V00="2" V01="5" V02="4"/>
+	<Triangle1 V00="6" V01="0" V02="3"/>
+	<Triangle1 V00="7" V01="0" V02="6"/>
+	<Triangle1 V00="8" V01="7" V02="6"/>
+	<Triangle1 V00="8" V01="6" V02="9"/>
+	<Triangle1 V00="7" V01="1" V02="0"/>
+	<Triangle1 V00="10" V01="11" V02="12"/>
+	<Triangle1 V00="10" V01="12" V02="13"/>
+	<LoadVertices Path="objects/object_boss_soul/gGIBossSoulSkullDL_vtx_0" VertexBufferIndex="0" VertexOffset="158" Count="13"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="0" V01="3" V02="1"/>
+	<Triangle1 V00="4" V01="5" V02="6"/>
+	<Triangle1 V00="4" V01="7" V02="5"/>
+	<Triangle1 V00="7" V01="8" V02="5"/>
+	<Triangle1 V00="7" V01="9" V02="8"/>
+	<Triangle1 V00="10" V01="8" V02="9"/>
+	<Triangle1 V00="10" V01="11" V02="8"/>
+	<Triangle1 V00="11" V01="12" V02="8"/>
+	<Triangle1 V00="5" V01="8" V02="12"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_tri_1 b/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_tri_1
new file mode 100644
index 000000000..e406505e8
--- /dev/null
+++ b/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_tri_1
@@ -0,0 +1,26 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_boss_soul/gGIBossSoulSkullDL_vtx_1" VertexBufferIndex="0" VertexOffset="0" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="0" V01="2" V02="3"/>
+	<Triangle1 V00="2" V01="4" V02="3"/>
+	<Triangle1 V00="3" V01="5" V02="0"/>
+	<Triangle1 V00="3" V01="6" V02="5"/>
+	<Triangle1 V00="5" V01="7" V02="0"/>
+	<Triangle1 V00="8" V01="9" V02="10"/>
+	<Triangle1 V00="8" V01="10" V02="11"/>
+	<Triangle1 V00="10" V01="12" V02="11"/>
+	<Triangle1 V00="11" V01="13" V02="8"/>
+	<Triangle1 V00="11" V01="14" V02="13"/>
+	<Triangle1 V00="13" V01="15" V02="8"/>
+	<LoadVertices Path="objects/object_boss_soul/gGIBossSoulSkullDL_vtx_1" VertexBufferIndex="0" VertexOffset="16" Count="8"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="3" V01="2" V02="1"/>
+	<Triangle1 V00="3" V01="4" V02="2"/>
+	<Triangle1 V00="5" V01="4" V02="3"/>
+	<Triangle1 V00="5" V01="6" V02="4"/>
+	<Triangle1 V00="5" V01="7" V02="6"/>
+	<Triangle1 V00="5" V01="0" V02="7"/>
+	<Triangle1 V00="0" V01="2" V02="7"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_tri_2 b/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_tri_2
new file mode 100644
index 000000000..d93755356
--- /dev/null
+++ b/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_tri_2
@@ -0,0 +1,7 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_boss_soul/gGIBossSoulSkullDL_vtx_2" VertexBufferIndex="0" VertexOffset="0" Count="4"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="3" V01="2" V02="1"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_tri_3 b/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_tri_3
new file mode 100644
index 000000000..87fb8da01
--- /dev/null
+++ b/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_tri_3
@@ -0,0 +1,48 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_boss_soul/gGIBossSoulSkullDL_vtx_3" VertexBufferIndex="0" VertexOffset="0" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="0" V01="2" V02="3"/>
+	<Triangle1 V00="3" V01="2" V02="4"/>
+	<Triangle1 V00="3" V01="4" V02="5"/>
+	<Triangle1 V00="5" V01="4" V02="6"/>
+	<Triangle1 V00="7" V01="8" V02="9"/>
+	<Triangle1 V00="7" V01="9" V02="10"/>
+	<Triangle1 V00="10" V01="9" V02="11"/>
+	<Triangle1 V00="10" V01="11" V02="12"/>
+	<Triangle1 V00="12" V01="11" V02="13"/>
+	<Triangle1 V00="14" V01="10" V02="12"/>
+	<Triangle1 V00="15" V01="10" V02="14"/>
+	<LoadVertices Path="objects/object_boss_soul/gGIBossSoulSkullDL_vtx_3" VertexBufferIndex="0" VertexOffset="16" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="0" V01="2" V02="3"/>
+	<Triangle1 V00="3" V01="2" V02="4"/>
+	<Triangle1 V00="2" V01="5" V02="4"/>
+	<Triangle1 V00="4" V01="5" V02="6"/>
+	<Triangle1 V00="3" V01="4" V02="7"/>
+	<Triangle1 V00="7" V01="4" V02="8"/>
+	<Triangle1 V00="1" V01="9" V02="10"/>
+	<Triangle1 V00="11" V01="12" V02="13"/>
+	<Triangle1 V00="11" V01="14" V02="12"/>
+	<Triangle1 V00="14" V01="15" V02="12"/>
+	<LoadVertices Path="objects/object_boss_soul/gGIBossSoulSkullDL_vtx_3" VertexBufferIndex="0" VertexOffset="32" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="1" V01="3" V02="2"/>
+	<Triangle1 V00="4" V01="5" V02="6"/>
+	<Triangle1 V00="4" V01="7" V02="5"/>
+	<Triangle1 V00="8" V01="7" V02="4"/>
+	<Triangle1 V00="8" V01="9" V02="7"/>
+	<Triangle1 V00="10" V01="9" V02="8"/>
+	<Triangle1 V00="10" V01="11" V02="9"/>
+	<Triangle1 V00="11" V01="12" V02="9"/>
+	<Triangle1 V00="11" V01="13" V02="12"/>
+	<Triangle1 V00="13" V01="14" V02="12"/>
+	<Triangle1 V00="9" V01="12" V02="15"/>
+	<LoadVertices Path="objects/object_boss_soul/gGIBossSoulSkullDL_vtx_3" VertexBufferIndex="0" VertexOffset="48" Count="8"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="3" V01="2" V02="4"/>
+	<Triangle1 V00="4" V01="2" V02="5"/>
+	<Triangle1 V00="2" V01="6" V02="5"/>
+	<Triangle1 V00="4" V01="5" V02="7"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_tri_4 b/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_tri_4
new file mode 100644
index 000000000..6e436b142
--- /dev/null
+++ b/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_tri_4
@@ -0,0 +1,245 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="0" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="0" V01="3" V02="1"/>
+	<Triangle1 V00="4" V01="3" V02="0"/>
+	<Triangle1 V00="5" V01="4" V02="0"/>
+	<Triangle1 V00="0" V01="6" V02="5"/>
+	<Triangle1 V00="6" V01="7" V02="5"/>
+	<Triangle1 V00="6" V01="8" V02="7"/>
+	<Triangle1 V00="6" V01="9" V02="8"/>
+	<Triangle1 V00="8" V01="9" V02="10"/>
+	<Triangle1 V00="11" V01="10" V02="9"/>
+	<Triangle1 V00="2" V01="11" V02="9"/>
+	<Triangle1 V00="2" V01="12" V02="11"/>
+	<Triangle1 V00="12" V01="2" V02="13"/>
+	<Triangle1 V00="12" V01="13" V02="14"/>
+	<Triangle1 V00="15" V01="14" V02="13"/>
+	<LoadVertices Path="objects/object_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="16" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="2" V01="3" V02="0"/>
+	<Triangle1 V00="3" V01="4" V02="0"/>
+	<Triangle1 V00="4" V01="3" V02="5"/>
+	<Triangle1 V00="5" V01="3" V02="6"/>
+	<Triangle1 V00="3" V01="7" V02="6"/>
+	<Triangle1 V00="3" V01="8" V02="7"/>
+	<Triangle1 V00="7" V01="8" V02="9"/>
+	<Triangle1 V00="10" V01="9" V02="8"/>
+	<Triangle1 V00="10" V01="11" V02="9"/>
+	<Triangle1 V00="12" V01="11" V02="10"/>
+	<Triangle1 V00="12" V01="13" V02="11"/>
+	<Triangle1 V00="12" V01="14" V02="13"/>
+	<Triangle1 V00="15" V01="14" V02="12"/>
+	<LoadVertices Path="objects/object_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="32" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="3" V01="1" V02="0"/>
+	<Triangle1 V00="3" V01="0" V02="4"/>
+	<Triangle1 V00="5" V01="3" V02="4"/>
+	<Triangle1 V00="5" V01="6" V02="3"/>
+	<Triangle1 V00="5" V01="7" V02="6"/>
+	<Triangle1 V00="7" V01="8" V02="6"/>
+	<Triangle1 V00="7" V01="9" V02="8"/>
+	<Triangle1 V00="10" V01="9" V02="7"/>
+	<Triangle1 V00="11" V01="10" V02="7"/>
+	<Triangle1 V00="11" V01="12" V02="10"/>
+	<Triangle1 V00="11" V01="13" V02="12"/>
+	<Triangle1 V00="14" V01="12" V02="13"/>
+	<Triangle1 V00="14" V01="15" V02="12"/>
+	<LoadVertices Path="objects/object_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="48" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="0" V01="3" V02="1"/>
+	<Triangle1 V00="0" V01="4" V02="3"/>
+	<Triangle1 V00="5" V01="4" V02="0"/>
+	<Triangle1 V00="6" V01="5" V02="0"/>
+	<Triangle1 V00="7" V01="5" V02="6"/>
+	<Triangle1 V00="7" V01="6" V02="8"/>
+	<Triangle1 V00="9" V01="7" V02="8"/>
+	<Triangle1 V00="9" V01="10" V02="7"/>
+	<Triangle1 V00="9" V01="11" V02="10"/>
+	<Triangle1 V00="9" V01="12" V02="11"/>
+	<Triangle1 V00="13" V01="11" V02="12"/>
+	<Triangle1 V00="13" V01="14" V02="11"/>
+	<Triangle1 V00="13" V01="15" V02="14"/>
+	<LoadVertices Path="objects/object_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="64" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="3" V01="0" V02="2"/>
+	<Triangle1 V00="3" V01="2" V02="4"/>
+	<Triangle1 V00="0" V01="5" V02="1"/>
+	<Triangle1 V00="1" V01="5" V02="6"/>
+	<Triangle1 V00="5" V01="7" V02="6"/>
+	<Triangle1 V00="5" V01="8" V02="7"/>
+	<Triangle1 V00="8" V01="9" V02="7"/>
+	<Triangle1 V00="8" V01="10" V02="9"/>
+	<Triangle1 V00="9" V01="10" V02="11"/>
+	<Triangle1 V00="9" V01="11" V02="12"/>
+	<Triangle1 V00="12" V01="11" V02="13"/>
+	<Triangle1 V00="12" V01="13" V02="14"/>
+	<Triangle1 V00="15" V01="14" V02="13"/>
+	<LoadVertices Path="objects/object_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="80" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="0" V01="3" V02="4"/>
+	<Triangle1 V00="3" V01="5" V02="4"/>
+	<Triangle1 V00="3" V01="6" V02="5"/>
+	<Triangle1 V00="7" V01="4" V02="5"/>
+	<Triangle1 V00="7" V01="8" V02="4"/>
+	<Triangle1 V00="9" V01="8" V02="7"/>
+	<Triangle1 V00="10" V01="9" V02="7"/>
+	<Triangle1 V00="11" V01="10" V02="7"/>
+	<Triangle1 V00="11" V01="7" V02="5"/>
+	<Triangle1 V00="12" V01="10" V02="11"/>
+	<Triangle1 V00="12" V01="13" V02="10"/>
+	<Triangle1 V00="13" V01="14" V02="10"/>
+	<Triangle1 V00="13" V01="15" V02="14"/>
+	<LoadVertices Path="objects/object_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="96" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="0" V01="2" V02="3"/>
+	<Triangle1 V00="3" V01="2" V02="4"/>
+	<Triangle1 V00="3" V01="4" V02="5"/>
+	<Triangle1 V00="6" V01="5" V02="4"/>
+	<Triangle1 V00="6" V01="4" V02="7"/>
+	<Triangle1 V00="6" V01="8" V02="5"/>
+	<Triangle1 V00="8" V01="9" V02="5"/>
+	<Triangle1 V00="8" V01="10" V02="9"/>
+	<Triangle1 V00="11" V01="9" V02="10"/>
+	<Triangle1 V00="11" V01="12" V02="9"/>
+	<Triangle1 V00="13" V01="12" V02="11"/>
+	<Triangle1 V00="12" V01="14" V02="9"/>
+	<Triangle1 V00="12" V01="15" V02="14"/>
+	<LoadVertices Path="objects/object_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="112" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="0" V01="3" V02="1"/>
+	<Triangle1 V00="1" V01="3" V02="4"/>
+	<Triangle1 V00="1" V01="5" V02="2"/>
+	<Triangle1 V00="1" V01="6" V02="5"/>
+	<Triangle1 V00="7" V01="6" V02="1"/>
+	<Triangle1 V00="2" V01="5" V02="8"/>
+	<Triangle1 V00="2" V01="8" V02="9"/>
+	<Triangle1 V00="10" V01="11" V02="12"/>
+	<Triangle1 V00="10" V01="13" V02="11"/>
+	<Triangle1 V00="13" V01="14" V02="11"/>
+	<Triangle1 V00="13" V01="15" V02="14"/>
+	<LoadVertices Path="objects/object_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="128" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="3" V01="4" V02="5"/>
+	<Triangle1 V00="3" V01="5" V02="6"/>
+	<Triangle1 V00="6" V01="5" V02="7"/>
+	<Triangle1 V00="8" V01="7" V02="5"/>
+	<Triangle1 V00="9" V01="8" V02="5"/>
+	<Triangle1 V00="9" V01="10" V02="8"/>
+	<Triangle1 V00="11" V01="10" V02="9"/>
+	<Triangle1 V00="12" V01="11" V02="9"/>
+	<Triangle1 V00="13" V01="12" V02="9"/>
+	<Triangle1 V00="14" V01="13" V02="9"/>
+	<Triangle1 V00="13" V01="14" V02="15"/>
+	<LoadVertices Path="objects/object_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="144" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="3" V01="2" V02="1"/>
+	<Triangle1 V00="3" V01="1" V02="4"/>
+	<Triangle1 V00="4" V01="5" V02="3"/>
+	<Triangle1 V00="4" V01="6" V02="5"/>
+	<Triangle1 V00="5" V01="6" V02="7"/>
+	<Triangle1 V00="8" V01="7" V02="6"/>
+	<Triangle1 V00="9" V01="8" V02="6"/>
+	<Triangle1 V00="9" V01="10" V02="8"/>
+	<Triangle1 V00="11" V01="10" V02="9"/>
+	<Triangle1 V00="12" V01="11" V02="9"/>
+	<Triangle1 V00="11" V01="12" V02="13"/>
+	<Triangle1 V00="13" V01="12" V02="14"/>
+	<Triangle1 V00="13" V01="14" V02="15"/>
+	<LoadVertices Path="objects/object_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="160" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="3" V01="2" V02="1"/>
+	<Triangle1 V00="3" V01="1" V02="4"/>
+	<Triangle1 V00="4" V01="1" V02="5"/>
+	<Triangle1 V00="6" V01="5" V02="1"/>
+	<Triangle1 V00="6" V01="7" V02="5"/>
+	<Triangle1 V00="6" V01="8" V02="7"/>
+	<Triangle1 V00="9" V01="7" V02="8"/>
+	<Triangle1 V00="9" V01="10" V02="7"/>
+	<Triangle1 V00="9" V01="11" V02="10"/>
+	<Triangle1 V00="9" V01="12" V02="11"/>
+	<Triangle1 V00="11" V01="12" V02="13"/>
+	<Triangle1 V00="11" V01="13" V02="14"/>
+	<Triangle1 V00="13" V01="15" V02="14"/>
+	<LoadVertices Path="objects/object_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="176" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="1" V01="3" V02="2"/>
+	<Triangle1 V00="1" V01="4" V02="3"/>
+	<Triangle1 V00="1" V01="5" V02="4"/>
+	<Triangle1 V00="5" V01="6" V02="4"/>
+	<Triangle1 V00="5" V01="7" V02="6"/>
+	<Triangle1 V00="8" V01="6" V02="7"/>
+	<Triangle1 V00="8" V01="9" V02="6"/>
+	<Triangle1 V00="8" V01="10" V02="9"/>
+	<Triangle1 V00="9" V01="10" V02="11"/>
+	<Triangle1 V00="10" V01="12" V02="11"/>
+	<Triangle1 V00="10" V01="13" V02="12"/>
+	<Triangle1 V00="14" V01="13" V02="10"/>
+	<Triangle1 V00="14" V01="15" V02="13"/>
+	<LoadVertices Path="objects/object_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="192" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="2" V01="1" V02="3"/>
+	<Triangle1 V00="2" V01="3" V02="4"/>
+	<Triangle1 V00="3" V01="5" V02="4"/>
+	<Triangle1 V00="4" V01="5" V02="6"/>
+	<Triangle1 V00="5" V01="7" V02="6"/>
+	<Triangle1 V00="5" V01="8" V02="7"/>
+	<Triangle1 V00="4" V01="6" V02="9"/>
+	<Triangle1 V00="4" V01="9" V02="10"/>
+	<Triangle1 V00="11" V01="10" V02="9"/>
+	<Triangle1 V00="11" V01="9" V02="12"/>
+	<Triangle1 V00="13" V01="11" V02="12"/>
+	<Triangle1 V00="13" V01="12" V02="14"/>
+	<Triangle1 V00="15" V01="13" V02="14"/>
+	<LoadVertices Path="objects/object_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="208" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="3" V01="1" V02="0"/>
+	<Triangle1 V00="3" V01="4" V02="1"/>
+	<Triangle1 V00="5" V01="4" V02="3"/>
+	<Triangle1 V00="6" V01="5" V02="3"/>
+	<Triangle1 V00="5" V01="7" V02="4"/>
+	<Triangle1 V00="7" V01="8" V02="4"/>
+	<Triangle1 V00="7" V01="9" V02="8"/>
+	<Triangle1 V00="10" V01="8" V02="9"/>
+	<Triangle1 V00="10" V01="11" V02="8"/>
+	<Triangle1 V00="12" V01="11" V02="10"/>
+	<Triangle1 V00="12" V01="13" V02="11"/>
+	<Triangle1 V00="12" V01="14" V02="13"/>
+	<Triangle1 V00="15" V01="11" V02="13"/>
+	<LoadVertices Path="objects/object_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="224" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="3" V01="0" V02="2"/>
+	<Triangle1 V00="3" V01="2" V02="4"/>
+	<Triangle1 V00="4" V01="2" V02="5"/>
+	<Triangle1 V00="2" V01="6" V02="5"/>
+	<Triangle1 V00="4" V01="5" V02="7"/>
+	<Triangle1 V00="8" V01="4" V02="7"/>
+	<Triangle1 V00="8" V01="9" V02="4"/>
+	<Triangle1 V00="10" V01="9" V02="8"/>
+	<Triangle1 V00="10" V01="11" V02="9"/>
+	<Triangle1 V00="12" V01="11" V02="10"/>
+	<Triangle1 V00="13" V01="12" V02="10"/>
+	<Triangle1 V00="13" V01="14" V02="12"/>
+	<Triangle1 V00="15" V01="14" V02="13"/>
+	<LoadVertices Path="objects/object_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="240" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="3" V01="4" V02="5"/>
+	<Triangle1 V00="3" V01="6" V02="4"/>
+	<Triangle1 V00="4" V01="6" V02="7"/>
+	<Triangle1 V00="8" V01="7" V02="6"/>
+	<Triangle1 V00="8" V01="6" V02="9"/>
+	<Triangle1 V00="10" V01="7" V02="8"/>
+	<Triangle1 V00="11" V01="12" V02="13"/>
+	<Triangle1 V00="14" V01="12" V02="11"/>
+	<Triangle1 V00="14" V01="11" V02="15"/>
+	<LoadVertices Path="objects/object_boss_soul/gGIBossSoulSkullDL_vtx_4" VertexBufferIndex="0" VertexOffset="256" Count="9"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="0" V01="2" V02="3"/>
+	<Triangle1 V00="2" V01="4" V02="3"/>
+	<Triangle1 V00="2" V01="5" V02="4"/>
+	<Triangle1 V00="6" V01="5" V02="2"/>
+	<Triangle1 V00="6" V01="2" V02="7"/>
+	<Triangle1 V00="5" V01="8" V02="4"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_vtx_0 b/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_vtx_0
new file mode 100644
index 000000000..ed4b6e1c0
--- /dev/null
+++ b/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_vtx_0
@@ -0,0 +1,173 @@
+<Vertex Version="0">
+	<Vtx X="18" Y="17" Z="0" S="147" T="-17" R="87" G="69" B="194" A="255"/>
+	<Vtx X="16" Y="14" Z="-8" S="239" T="-17" R="55" G="65" B="161" A="255"/>
+	<Vtx X="9" Y="17" Z="-8" S="239" T="-81" R="16" G="78" B="157" A="255"/>
+	<Vtx X="9" Y="22" Z="1" S="147" T="-81" R="12" G="111" B="196" A="255"/>
+	<Vtx X="0" Y="18" Z="-7" S="239" T="-145" R="249" G="91" B="167" A="255"/>
+	<Vtx X="0" Y="11" Z="-9" S="111" T="-145" R="246" G="32" B="133" A="255"/>
+	<Vtx X="4" Y="11" Z="-9" S="111" T="-113" R="1" G="23" B="131" A="255"/>
+	<Vtx X="9" Y="6" Z="-10" S="15" T="-17" R="9" G="11" B="130" A="255"/>
+	<Vtx X="18" Y="8" Z="-8" S="47" T="111" R="74" G="18" B="154" A="255"/>
+	<Vtx X="16" Y="14" Z="-8" S="111" T="111" R="55" G="65" B="161" A="255"/>
+	<Vtx X="18" Y="17" Z="0" S="111" T="19" R="87" G="69" B="194" A="255"/>
+	<Vtx X="22" Y="10" Z="0" S="47" T="19" R="122" G="20" B="225" A="255"/>
+	<Vtx X="22" Y="10" Z="7" S="47" T="-17" R="35" G="4" B="122" A="255"/>
+	<Vtx X="19" Y="17" Z="7" S="111" T="-17" R="41" G="18" B="119" A="255"/>
+	<Vtx X="19" Y="17" Z="6" S="111" T="-11" R="103" G="230" B="69" A="255"/>
+	<Vtx X="10" Y="22" Z="8" S="111" T="-81" R="18" G="37" B="120" A="255"/>
+	<Vtx X="19" Y="17" Z="7" S="111" T="-17" R="41" G="18" B="119" A="255"/>
+	<Vtx X="10" Y="22" Z="7" S="117" T="-81" R="210" G="73" B="94" A="255"/>
+	<Vtx X="10" Y="22" Z="8" S="111" T="-81" R="18" G="37" B="120" A="255"/>
+	<Vtx X="19" Y="17" Z="6" S="117" T="-17" R="103" G="230" B="69" A="255"/>
+	<Vtx X="1" Y="23" Z="9" S="111" T="-145" R="10" G="32" B="123" A="255"/>
+	<Vtx X="-7" Y="22" Z="9" S="111" T="-81" R="3" G="37" B="122" A="255"/>
+	<Vtx X="-7" Y="22" Z="8" S="117" T="-81" R="62" G="73" B="84" A="255"/>
+	<Vtx X="-8" Y="22" Z="3" S="147" T="-81" R="234" G="112" B="200" A="255"/>
+	<Vtx X="1" Y="23" Z="2" S="147" T="-145" R="253" G="121" B="217" A="255"/>
+	<Vtx X="9" Y="22" Z="1" S="147" T="-81" R="12" G="111" B="196" A="255"/>
+	<Vtx X="0" Y="18" Z="-7" S="239" T="-145" R="249" G="91" B="167" A="255"/>
+	<Vtx X="-9" Y="17" Z="-6" S="239" T="-81" R="222" G="78" B="161" A="255"/>
+	<Vtx X="0" Y="11" Z="-9" S="111" T="-145" R="246" G="32" B="133" A="255"/>
+	<Vtx X="-5" Y="11" Z="-8" S="111" T="-113" R="233" G="23" B="133" A="255"/>
+	<Vtx X="0" Y="3" Z="-10" S="-17" T="-145" R="245" G="0" B="129" A="255"/>
+	<Vtx X="4" Y="11" Z="-9" S="111" T="-113" R="1" G="23" B="131" A="255"/>
+	<Vtx X="0" Y="3" Z="-10" S="-17" T="-145" R="245" G="0" B="129" A="255"/>
+	<Vtx X="4" Y="11" Z="-9" S="111" T="-113" R="1" G="23" B="131" A="255"/>
+	<Vtx X="9" Y="6" Z="-10" S="15" T="-17" R="9" G="11" B="130" A="255"/>
+	<Vtx X="9" Y="2" Z="-10" S="-17" T="-17" R="13" G="249" B="130" A="255"/>
+	<Vtx X="18" Y="8" Z="-8" S="47" T="111" R="74" G="18" B="154" A="255"/>
+	<Vtx X="18" Y="0" Z="-8" S="-17" T="111" R="86" G="227" B="167" A="255"/>
+	<Vtx X="21" Y="0" Z="0" S="-17" T="19" R="118" G="218" B="229" A="255"/>
+	<Vtx X="22" Y="10" Z="0" S="47" T="19" R="122" G="20" B="225" A="255"/>
+	<Vtx X="22" Y="10" Z="7" S="47" T="-17" R="35" G="4" B="122" A="255"/>
+	<Vtx X="22" Y="0" Z="7" S="-17" T="-17" R="50" G="244" B="116" A="255"/>
+	<Vtx X="16" Y="-9" Z="7" S="-81" T="-17" R="48" G="250" B="118" A="255"/>
+	<Vtx X="12" Y="4" Z="8" S="-4" T="-71" R="11" G="0" B="127" A="255"/>
+	<Vtx X="13" Y="7" Z="7" S="23" T="-65" R="11" G="0" B="127" A="255"/>
+	<Vtx X="12" Y="11" Z="8" S="45" T="-73" R="11" G="0" B="127" A="255"/>
+	<Vtx X="8" Y="12" Z="8" S="49" T="-96" R="11" G="0" B="127" A="255"/>
+	<Vtx X="10" Y="22" Z="8" S="111" T="-81" R="18" G="37" B="120" A="255"/>
+	<Vtx X="5" Y="11" Z="8" S="35" T="-119" R="11" G="0" B="127" A="255"/>
+	<Vtx X="8" Y="12" Z="8" S="49" T="-96" R="11" G="0" B="127" A="255"/>
+	<Vtx X="10" Y="22" Z="8" S="111" T="-81" R="18" G="37" B="120" A="255"/>
+	<Vtx X="-2" Y="11" Z="9" S="35" T="-119" R="10" G="0" B="127" A="255"/>
+	<Vtx X="-6" Y="12" Z="9" S="49" T="-96" R="10" G="0" B="127" A="255"/>
+	<Vtx X="-19" Y="10" Z="10" S="47" T="-17" R="243" G="4" B="126" A="255"/>
+	<Vtx X="-7" Y="22" Z="9" S="111" T="-81" R="3" G="37" B="122" A="255"/>
+	<Vtx X="-16" Y="17" Z="10" S="111" T="-17" R="236" G="18" B="124" A="255"/>
+	<Vtx X="-7" Y="22" Z="8" S="117" T="-81" R="62" G="73" B="84" A="255"/>
+	<Vtx X="-16" Y="17" Z="9" S="117" T="-17" R="166" G="230" B="86" A="255"/>
+	<Vtx X="-16" Y="17" Z="9" S="111" T="-11" R="166" G="230" B="86" A="255"/>
+	<Vtx X="-17" Y="17" Z="3" S="111" T="19" R="159" G="69" B="210" A="255"/>
+	<Vtx X="-20" Y="10" Z="4" S="47" T="19" R="131" G="20" B="247" A="255"/>
+	<Vtx X="-18" Y="8" Z="-5" S="47" T="111" R="166" G="18" B="168" A="255"/>
+	<Vtx X="-16" Y="14" Z="-5" S="111" T="111" R="185" G="65" B="172" A="255"/>
+	<Vtx X="-9" Y="6" Z="-8" S="15" T="-17" R="225" G="11" B="133" A="255"/>
+	<Vtx X="-9" Y="6" Z="-8" S="15" T="-17" R="225" G="11" B="133" A="255"/>
+	<Vtx X="-16" Y="14" Z="-5" S="111" T="111" R="185" G="65" B="172" A="255"/>
+	<Vtx X="-9" Y="17" Z="-6" S="239" T="-81" R="222" G="78" B="161" A="255"/>
+	<Vtx X="-5" Y="11" Z="-8" S="111" T="-113" R="233" G="23" B="133" A="255"/>
+	<Vtx X="0" Y="3" Z="-10" S="-17" T="-145" R="245" G="0" B="129" A="255"/>
+	<Vtx X="-9" Y="2" Z="-8" S="-17" T="-17" R="222" G="249" B="134" A="255"/>
+	<Vtx X="-7" Y="-1" Z="-8" S="-49" T="-17" R="231" G="238" B="133" A="255"/>
+	<Vtx X="-5" Y="-1" Z="-8" S="-145" T="-113" R="225" G="236" B="134" A="255"/>
+	<Vtx X="0" Y="-8" Z="-9" S="-145" T="-145" R="245" G="237" B="131" A="255"/>
+	<Vtx X="4" Y="-1" Z="-9" S="-145" T="-113" R="9" G="236" B="131" A="255"/>
+	<Vtx X="7" Y="-1" Z="-9" S="-49" T="-17" R="3" G="238" B="130" A="255"/>
+	<Vtx X="9" Y="2" Z="-10" S="-17" T="-17" R="13" G="249" B="130" A="255"/>
+	<Vtx X="14" Y="-6" Z="-8" S="-81" T="111" R="92" G="232" B="171" A="255"/>
+	<Vtx X="18" Y="0" Z="-8" S="-17" T="111" R="86" G="227" B="167" A="255"/>
+	<Vtx X="21" Y="0" Z="0" S="-17" T="19" R="118" G="218" B="229" A="255"/>
+	<Vtx X="16" Y="-9" Z="1" S="-81" T="19" R="124" G="236" B="235" A="255"/>
+	<Vtx X="16" Y="-9" Z="1" S="-81" T="19" R="124" G="236" B="235" A="255"/>
+	<Vtx X="21" Y="0" Z="0" S="-17" T="19" R="118" G="218" B="229" A="255"/>
+	<Vtx X="22" Y="0" Z="7" S="-17" T="-17" R="50" G="244" B="116" A="255"/>
+	<Vtx X="16" Y="-9" Z="7" S="-81" T="-17" R="48" G="250" B="118" A="255"/>
+	<Vtx X="18" Y="-17" Z="0" S="-145" T="19" R="7" G="134" B="221" A="255"/>
+	<Vtx X="19" Y="-17" Z="7" S="-145" T="-17" R="12" G="242" B="126" A="255"/>
+	<Vtx X="10" Y="-9" Z="8" S="-145" T="-81" R="30" G="219" B="118" A="255"/>
+	<Vtx X="12" Y="4" Z="8" S="-4" T="-71" R="11" G="0" B="127" A="255"/>
+	<Vtx X="8" Y="2" Z="8" S="-21" T="-99" R="11" G="0" B="127" A="255"/>
+	<Vtx X="5" Y="4" Z="8" S="-8" T="-121" R="11" G="0" B="127" A="255"/>
+	<Vtx X="4" Y="-5" Z="8" S="-59" T="-133" R="8" G="0" B="127" A="255"/>
+	<Vtx X="4" Y="7" Z="8" S="13" T="-127" R="11" G="0" B="127" A="255"/>
+	<Vtx X="1" Y="2" Z="9" S="-26" T="-145" R="11" G="0" B="127" A="255"/>
+	<Vtx X="5" Y="11" Z="8" S="35" T="-119" R="11" G="0" B="127" A="255"/>
+	<Vtx X="-2" Y="11" Z="9" S="35" T="-119" R="10" G="0" B="127" A="255"/>
+	<Vtx X="-1" Y="7" Z="9" S="13" T="-127" R="10" G="0" B="127" A="255"/>
+	<Vtx X="-2" Y="-5" Z="9" S="-59" T="-133" R="14" G="0" B="126" A="255"/>
+	<Vtx X="1" Y="2" Z="9" S="-26" T="-145" R="11" G="0" B="127" A="255"/>
+	<Vtx X="-1" Y="7" Z="9" S="13" T="-127" R="10" G="0" B="127" A="255"/>
+	<Vtx X="-2" Y="4" Z="9" S="-8" T="-121" R="10" G="0" B="127" A="255"/>
+	<Vtx X="-6" Y="2" Z="9" S="-21" T="-99" R="10" G="0" B="127" A="255"/>
+	<Vtx X="-19" Y="0" Z="10" S="-17" T="-17" R="227" G="244" B="123" A="255"/>
+	<Vtx X="-10" Y="4" Z="9" S="-4" T="-71" R="10" G="0" B="127" A="255"/>
+	<Vtx X="-11" Y="7" Z="10" S="23" T="-65" R="10" G="0" B="127" A="255"/>
+	<Vtx X="-19" Y="10" Z="10" S="47" T="-17" R="243" G="4" B="126" A="255"/>
+	<Vtx X="-9" Y="11" Z="9" S="45" T="-73" R="10" G="0" B="127" A="255"/>
+	<Vtx X="-6" Y="12" Z="9" S="49" T="-96" R="10" G="0" B="127" A="255"/>
+	<Vtx X="-19" Y="0" Z="4" S="-17" T="19" R="135" G="218" B="250" A="255"/>
+	<Vtx X="-14" Y="-9" Z="3" S="-81" T="19" R="131" G="236" B="0" A="255"/>
+	<Vtx X="-14" Y="-6" Z="-6" S="-81" T="111" R="151" G="232" B="189" A="255"/>
+	<Vtx X="-18" Y="0" Z="-5" S="-17" T="111" R="156" G="227" B="183" A="255"/>
+	<Vtx X="-18" Y="8" Z="-5" S="47" T="111" R="166" G="18" B="168" A="255"/>
+	<Vtx X="-18" Y="8" Z="-5" S="47" T="111" R="166" G="18" B="168" A="255"/>
+	<Vtx X="-19" Y="0" Z="4" S="-17" T="19" R="135" G="218" B="250" A="255"/>
+	<Vtx X="-20" Y="10" Z="4" S="47" T="19" R="131" G="20" B="247" A="255"/>
+	<Vtx X="-19" Y="10" Z="10" S="47" T="-17" R="243" G="4" B="126" A="255"/>
+	<Vtx X="-9" Y="2" Z="-8" S="-17" T="-17" R="222" G="249" B="134" A="255"/>
+	<Vtx X="-18" Y="0" Z="-5" S="-17" T="111" R="156" G="227" B="183" A="255"/>
+	<Vtx X="-9" Y="6" Z="-8" S="15" T="-17" R="225" G="11" B="133" A="255"/>
+	<Vtx X="-14" Y="-6" Z="-6" S="-81" T="111" R="151" G="232" B="189" A="255"/>
+	<Vtx X="-7" Y="-1" Z="-8" S="-49" T="-17" R="231" G="238" B="133" A="255"/>
+	<Vtx X="-16" Y="-13" Z="-5" S="-273" T="-17" R="241" G="173" B="161" A="255"/>
+	<Vtx X="-9" Y="-7" Z="-6" S="-273" T="-81" R="205" G="176" B="171" A="255"/>
+	<Vtx X="-5" Y="-1" Z="-8" S="-145" T="-113" R="225" G="236" B="134" A="255"/>
+	<Vtx X="0" Y="-20" Z="-7" S="-273" T="-145" R="248" G="179" B="155" A="255"/>
+	<Vtx X="0" Y="-8" Z="-9" S="-145" T="-145" R="245" G="237" B="131" A="255"/>
+	<Vtx X="4" Y="-1" Z="-9" S="-145" T="-113" R="9" G="236" B="131" A="255"/>
+	<Vtx X="9" Y="-7" Z="-8" S="-273" T="-81" R="35" G="176" B="164" A="255"/>
+	<Vtx X="16" Y="-13" Z="-8" S="-273" T="-17" R="255" G="173" B="160" A="255"/>
+	<Vtx X="9" Y="-7" Z="-8" S="-273" T="-81" R="35" G="176" B="164" A="255"/>
+	<Vtx X="4" Y="-1" Z="-9" S="-145" T="-113" R="9" G="236" B="131" A="255"/>
+	<Vtx X="7" Y="-1" Z="-9" S="-49" T="-17" R="3" G="238" B="130" A="255"/>
+	<Vtx X="14" Y="-6" Z="-8" S="-81" T="111" R="92" G="232" B="171" A="255"/>
+	<Vtx X="9" Y="-9" Z="1" S="-180" T="-81" R="53" G="144" B="226" A="255"/>
+	<Vtx X="18" Y="-17" Z="0" S="-180" T="-17" R="7" G="134" B="221" A="255"/>
+	<Vtx X="10" Y="-9" Z="8" S="-145" T="-81" R="30" G="219" B="118" A="255"/>
+	<Vtx X="19" Y="-17" Z="7" S="-145" T="-17" R="12" G="242" B="126" A="255"/>
+	<Vtx X="1" Y="-27" Z="9" S="-145" T="-145" R="11" G="237" B="125" A="255"/>
+	<Vtx X="1" Y="-4" Z="9" S="-59" T="-145" R="11" G="1" B="127" A="255"/>
+	<Vtx X="4" Y="-5" Z="8" S="-59" T="-133" R="8" G="0" B="127" A="255"/>
+	<Vtx X="-7" Y="-9" Z="9" S="-145" T="-81" R="247" G="219" B="121" A="255"/>
+	<Vtx X="-8" Y="-9" Z="3" S="-180" T="-81" R="199" G="144" B="235" A="255"/>
+	<Vtx X="-17" Y="-17" Z="3" S="-180" T="-17" R="243" G="134" B="223" A="255"/>
+	<Vtx X="-16" Y="-17" Z="10" S="-145" T="-17" R="9" G="242" B="126" A="255"/>
+	<Vtx X="-14" Y="-9" Z="10" S="-81" T="-17" R="229" G="250" B="124" A="255"/>
+	<Vtx X="-16" Y="-17" Z="10" S="-145" T="-17" R="9" G="242" B="126" A="255"/>
+	<Vtx X="-7" Y="-9" Z="9" S="-145" T="-81" R="247" G="219" B="121" A="255"/>
+	<Vtx X="-19" Y="0" Z="10" S="-17" T="-17" R="227" G="244" B="123" A="255"/>
+	<Vtx X="-2" Y="-5" Z="9" S="-59" T="-133" R="14" G="0" B="126" A="255"/>
+	<Vtx X="1" Y="-4" Z="9" S="-59" T="-145" R="11" G="1" B="127" A="255"/>
+	<Vtx X="-14" Y="-9" Z="3" S="-81" T="19" R="131" G="236" B="0" A="255"/>
+	<Vtx X="-17" Y="-17" Z="3" S="-145" T="19" R="243" G="134" B="223" A="255"/>
+	<Vtx X="-16" Y="-13" Z="-5" S="-145" T="111" R="241" G="173" B="161" A="255"/>
+	<Vtx X="-14" Y="-6" Z="-6" S="-81" T="111" R="151" G="232" B="189" A="255"/>
+	<Vtx X="16" Y="-13" Z="-8" S="-145" T="111" R="255" G="173" B="160" A="255"/>
+	<Vtx X="14" Y="-6" Z="-8" S="-81" T="111" R="92" G="232" B="171" A="255"/>
+	<Vtx X="16" Y="-9" Z="1" S="-81" T="19" R="124" G="236" B="235" A="255"/>
+	<Vtx X="18" Y="-17" Z="0" S="-145" T="19" R="7" G="134" B="221" A="255"/>
+	<Vtx X="-17" Y="17" Z="3" S="147" T="-17" R="159" G="69" B="210" A="255"/>
+	<Vtx X="-9" Y="17" Z="-6" S="239" T="-81" R="222" G="78" B="161" A="255"/>
+	<Vtx X="-16" Y="14" Z="-5" S="239" T="-17" R="185" G="65" B="172" A="255"/>
+	<Vtx X="-8" Y="22" Z="3" S="147" T="-81" R="234" G="112" B="200" A="255"/>
+	<Vtx X="-16" Y="-13" Z="-5" S="-273" T="-17" R="241" G="173" B="161" A="255"/>
+	<Vtx X="-8" Y="-9" Z="3" S="-180" T="-81" R="199" G="144" B="235" A="255"/>
+	<Vtx X="-17" Y="-17" Z="3" S="-180" T="-17" R="243" G="134" B="223" A="255"/>
+	<Vtx X="-9" Y="-7" Z="-6" S="-273" T="-81" R="205" G="176" B="171" A="255"/>
+	<Vtx X="1" Y="-27" Z="2" S="-180" T="-145" R="254" G="133" B="223" A="255"/>
+	<Vtx X="0" Y="-20" Z="-7" S="-273" T="-145" R="248" G="179" B="155" A="255"/>
+	<Vtx X="9" Y="-7" Z="-8" S="-273" T="-81" R="35" G="176" B="164" A="255"/>
+	<Vtx X="9" Y="-9" Z="1" S="-180" T="-81" R="53" G="144" B="226" A="255"/>
+	<Vtx X="1" Y="-27" Z="9" S="-145" T="-145" R="11" G="237" B="125" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_vtx_1 b/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_vtx_1
new file mode 100644
index 000000000..d2728aae4
--- /dev/null
+++ b/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_vtx_1
@@ -0,0 +1,26 @@
+<Vertex Version="0">
+	<Vtx X="13" Y="7" Z="7" S="23" T="-65" R="11" G="0" B="127" A="255"/>
+	<Vtx X="12" Y="11" Z="8" S="45" T="-73" R="11" G="0" B="127" A="255"/>
+	<Vtx X="8" Y="12" Z="8" S="49" T="-96" R="11" G="0" B="127" A="255"/>
+	<Vtx X="4" Y="7" Z="8" S="13" T="-127" R="11" G="0" B="127" A="255"/>
+	<Vtx X="5" Y="11" Z="8" S="35" T="-119" R="11" G="0" B="127" A="255"/>
+	<Vtx X="8" Y="2" Z="8" S="-21" T="-99" R="11" G="0" B="127" A="255"/>
+	<Vtx X="5" Y="4" Z="8" S="-8" T="-121" R="11" G="0" B="127" A="255"/>
+	<Vtx X="12" Y="4" Z="8" S="-4" T="-71" R="11" G="0" B="127" A="255"/>
+	<Vtx X="-6" Y="12" Z="9" S="49" T="-96" R="10" G="0" B="127" A="255"/>
+	<Vtx X="-9" Y="11" Z="9" S="45" T="-73" R="10" G="0" B="127" A="255"/>
+	<Vtx X="-11" Y="7" Z="10" S="23" T="-65" R="10" G="0" B="127" A="255"/>
+	<Vtx X="-6" Y="2" Z="9" S="-21" T="-99" R="10" G="0" B="127" A="255"/>
+	<Vtx X="-10" Y="4" Z="9" S="-4" T="-71" R="10" G="0" B="127" A="255"/>
+	<Vtx X="-1" Y="7" Z="9" S="13" T="-127" R="10" G="0" B="127" A="255"/>
+	<Vtx X="-2" Y="4" Z="9" S="-8" T="-121" R="10" G="0" B="127" A="255"/>
+	<Vtx X="-2" Y="11" Z="9" S="35" T="-119" R="10" G="0" B="127" A="255"/>
+	<Vtx X="4" Y="-5" Z="8" S="-59" T="-133" R="8" G="0" B="127" A="255"/>
+	<Vtx X="1" Y="2" Z="9" S="-26" T="-145" R="11" G="0" B="127" A="255"/>
+	<Vtx X="1" Y="1" Z="7" S="-26" T="-145" R="225" G="243" B="123" A="255"/>
+	<Vtx X="-2" Y="-5" Z="9" S="-59" T="-133" R="14" G="0" B="126" A="255"/>
+	<Vtx X="-1" Y="-5" Z="7" S="-59" T="-133" R="74" G="57" B="86" A="255"/>
+	<Vtx X="1" Y="-4" Z="9" S="-59" T="-145" R="11" G="1" B="127" A="255"/>
+	<Vtx X="1" Y="-4" Z="7" S="-59" T="-145" R="10" G="44" B="119" A="255"/>
+	<Vtx X="4" Y="-5" Z="7" S="-59" T="-133" R="198" G="57" B="98" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_vtx_2 b/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_vtx_2
new file mode 100644
index 000000000..eb0050c03
--- /dev/null
+++ b/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_vtx_2
@@ -0,0 +1,6 @@
+<Vertex Version="0">
+	<Vtx X="4" Y="-5" Z="7" S="1008" T="1008" R="198" G="57" B="98" A="255"/>
+	<Vtx X="1" Y="1" Z="7" S="1008" T="582" R="225" G="243" B="123" A="255"/>
+	<Vtx X="1" Y="-4" Z="7" S="883" T="967" R="10" G="44" B="119" A="255"/>
+	<Vtx X="-1" Y="-5" Z="7" S="1008" T="1008" R="74" G="57" B="86" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_vtx_3 b/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_vtx_3
new file mode 100644
index 000000000..f124650c8
--- /dev/null
+++ b/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_vtx_3
@@ -0,0 +1,58 @@
+<Vertex Version="0">
+	<Vtx X="19" Y="17" Z="6" S="111" T="-11" R="103" G="230" B="69" A="255"/>
+	<Vtx X="18" Y="17" Z="0" S="111" T="19" R="87" G="69" B="194" A="255"/>
+	<Vtx X="21" Y="23" Z="4" S="111" T="19" R="100" G="245" B="178" A="255"/>
+	<Vtx X="21" Y="23" Z="10" S="111" T="-11" R="73" G="199" B="87" A="255"/>
+	<Vtx X="22" Y="27" Z="4" S="111" T="19" R="72" G="242" B="152" A="255"/>
+	<Vtx X="22" Y="25" Z="9" S="111" T="-11" R="93" G="225" B="81" A="255"/>
+	<Vtx X="27" Y="35" Z="9" S="111" T="-11" R="106" G="67" B="20" A="255"/>
+	<Vtx X="10" Y="22" Z="7" S="117" T="-81" R="210" G="73" B="94" A="255"/>
+	<Vtx X="19" Y="17" Z="6" S="117" T="-17" R="103" G="230" B="69" A="255"/>
+	<Vtx X="21" Y="23" Z="10" S="117" T="-17" R="73" G="199" B="87" A="255"/>
+	<Vtx X="13" Y="27" Z="11" S="117" T="-81" R="178" G="10" B="100" A="255"/>
+	<Vtx X="22" Y="25" Z="9" S="117" T="-17" R="93" G="225" B="81" A="255"/>
+	<Vtx X="16" Y="33" Z="11" S="117" T="-81" R="209" G="73" B="93" A="255"/>
+	<Vtx X="27" Y="35" Z="9" S="117" T="-81" R="106" G="67" B="20" A="255"/>
+	<Vtx X="12" Y="27" Z="5" S="147" T="-81" R="171" G="69" B="191" A="255"/>
+	<Vtx X="9" Y="22" Z="1" S="147" T="-81" R="12" G="111" B="196" A="255"/>
+	<Vtx X="18" Y="17" Z="0" S="147" T="-17" R="87" G="69" B="194" A="255"/>
+	<Vtx X="9" Y="22" Z="1" S="147" T="-81" R="12" G="111" B="196" A="255"/>
+	<Vtx X="12" Y="27" Z="5" S="147" T="-81" R="171" G="69" B="191" A="255"/>
+	<Vtx X="21" Y="23" Z="4" S="147" T="-17" R="100" G="245" B="178" A="255"/>
+	<Vtx X="17" Y="34" Z="5" S="147" T="-81" R="209" G="96" B="187" A="255"/>
+	<Vtx X="16" Y="33" Z="11" S="117" T="-81" R="209" G="73" B="93" A="255"/>
+	<Vtx X="27" Y="35" Z="9" S="147" T="-81" R="106" G="67" B="20" A="255"/>
+	<Vtx X="22" Y="27" Z="4" S="147" T="-17" R="72" G="242" B="152" A="255"/>
+	<Vtx X="27" Y="35" Z="9" S="147" T="-17" R="106" G="67" B="20" A="255"/>
+	<Vtx X="10" Y="22" Z="7" S="117" T="-81" R="210" G="73" B="94" A="255"/>
+	<Vtx X="13" Y="27" Z="11" S="117" T="-81" R="178" G="10" B="100" A="255"/>
+	<Vtx X="-16" Y="17" Z="9" S="111" T="-11" R="166" G="230" B="86" A="255"/>
+	<Vtx X="-19" Y="23" Z="8" S="111" T="19" R="144" G="245" B="197" A="255"/>
+	<Vtx X="-17" Y="17" Z="3" S="111" T="19" R="159" G="69" B="210" A="255"/>
+	<Vtx X="-18" Y="23" Z="13" S="111" T="-11" R="199" G="199" B="98" A="255"/>
+	<Vtx X="-20" Y="27" Z="8" S="111" T="19" R="167" G="242" B="166" A="255"/>
+	<Vtx X="-18" Y="23" Z="13" S="111" T="-11" R="199" G="199" B="98" A="255"/>
+	<Vtx X="-19" Y="25" Z="13" S="111" T="-11" R="179" G="225" B="96" A="255"/>
+	<Vtx X="-20" Y="27" Z="8" S="111" T="19" R="167" G="242" B="166" A="255"/>
+	<Vtx X="-24" Y="35" Z="13" S="111" T="-11" R="155" G="67" B="38" A="255"/>
+	<Vtx X="-7" Y="22" Z="8" S="117" T="-81" R="62" G="73" B="84" A="255"/>
+	<Vtx X="-18" Y="23" Z="13" S="117" T="-17" R="199" G="199" B="98" A="255"/>
+	<Vtx X="-16" Y="17" Z="9" S="117" T="-17" R="166" G="230" B="86" A="255"/>
+	<Vtx X="-9" Y="27" Z="13" S="117" T="-81" R="94" G="10" B="85" A="255"/>
+	<Vtx X="-8" Y="22" Z="3" S="147" T="-81" R="234" G="112" B="200" A="255"/>
+	<Vtx X="-10" Y="27" Z="7" S="147" T="-81" R="72" G="69" B="177" A="255"/>
+	<Vtx X="-17" Y="17" Z="3" S="147" T="-17" R="159" G="69" B="210" A="255"/>
+	<Vtx X="-19" Y="23" Z="8" S="147" T="-17" R="144" G="245" B="197" A="255"/>
+	<Vtx X="-14" Y="34" Z="8" S="147" T="-81" R="34" G="96" B="180" A="255"/>
+	<Vtx X="-20" Y="27" Z="8" S="147" T="-17" R="167" G="242" B="166" A="255"/>
+	<Vtx X="-24" Y="35" Z="13" S="147" T="-17" R="155" G="67" B="38" A="255"/>
+	<Vtx X="-13" Y="33" Z="13" S="117" T="-81" R="62" G="73" B="83" A="255"/>
+	<Vtx X="-14" Y="34" Z="8" S="147" T="-81" R="34" G="96" B="180" A="255"/>
+	<Vtx X="-24" Y="35" Z="13" S="147" T="-81" R="155" G="67" B="38" A="255"/>
+	<Vtx X="-13" Y="33" Z="13" S="117" T="-81" R="62" G="73" B="83" A="255"/>
+	<Vtx X="-10" Y="27" Z="7" S="147" T="-81" R="72" G="69" B="177" A="255"/>
+	<Vtx X="-9" Y="27" Z="13" S="117" T="-81" R="94" G="10" B="85" A="255"/>
+	<Vtx X="-19" Y="25" Z="13" S="117" T="-17" R="179" G="225" B="96" A="255"/>
+	<Vtx X="-24" Y="35" Z="13" S="117" T="-81" R="155" G="67" B="38" A="255"/>
+	<Vtx X="-18" Y="23" Z="13" S="117" T="-17" R="199" G="199" B="98" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_vtx_4 b/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_vtx_4
new file mode 100644
index 000000000..2bbe7895e
--- /dev/null
+++ b/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_vtx_4
@@ -0,0 +1,267 @@
+<Vertex Version="0">
+	<Vtx X="5" Y="5" Z="8" S="422" T="14" R="139" G="208" B="12" A="255"/>
+	<Vtx X="5" Y="9" Z="8" S="422" T="14" R="137" G="44" B="8" A="255"/>
+	<Vtx X="8" Y="7" Z="4" S="206" T="14" R="13" G="192" B="147" A="255"/>
+	<Vtx X="5" Y="7" Z="8" S="422" T="-50" R="129" G="0" B="6" A="255"/>
+	<Vtx X="6" Y="5" Z="9" S="462" T="14" R="196" G="229" B="109" A="255"/>
+	<Vtx X="6" Y="4" Z="8" S="422" T="78" R="166" G="166" B="2" A="255"/>
+	<Vtx X="8" Y="7" Z="4" S="206" T="142" R="13" G="192" B="147" A="255"/>
+	<Vtx X="7" Y="3" Z="8" S="422" T="142" R="206" G="139" B="8" A="255"/>
+	<Vtx X="9" Y="3" Z="8" S="422" T="206" R="0" G="129" B="255" A="255"/>
+	<Vtx X="11" Y="3" Z="8" S="422" T="142" R="54" G="141" B="251" A="255"/>
+	<Vtx X="10" Y="4" Z="9" S="462" T="142" R="36" G="188" B="101" A="255"/>
+	<Vtx X="11" Y="4" Z="8" S="422" T="78" R="90" G="167" B="245" A="255"/>
+	<Vtx X="12" Y="5" Z="7" S="422" T="14" R="119" G="212" B="244" A="255"/>
+	<Vtx X="12" Y="9" Z="7" S="422" T="14" R="117" G="48" B="248" A="255"/>
+	<Vtx X="12" Y="7" Z="7" S="422" T="-50" R="126" G="0" B="241" A="255"/>
+	<Vtx X="12" Y="9" Z="8" S="462" T="14" R="78" G="27" B="97" A="255"/>
+	<Vtx X="11" Y="10" Z="8" S="422" T="78" R="89" G="90" B="243" A="255"/>
+	<Vtx X="12" Y="9" Z="8" S="462" T="14" R="78" G="27" B="97" A="255"/>
+	<Vtx X="12" Y="9" Z="7" S="422" T="14" R="117" G="48" B="248" A="255"/>
+	<Vtx X="8" Y="7" Z="4" S="206" T="142" R="13" G="192" B="147" A="255"/>
+	<Vtx X="11" Y="11" Z="8" S="422" T="142" R="52" G="116" B="255" A="255"/>
+	<Vtx X="9" Y="11" Z="8" S="422" T="206" R="255" G="127" B="255" A="255"/>
+	<Vtx X="7" Y="11" Z="8" S="422" T="142" R="180" G="102" B="5" A="255"/>
+	<Vtx X="6" Y="10" Z="8" S="422" T="78" R="165" G="89" B="3" A="255"/>
+	<Vtx X="5" Y="9" Z="8" S="422" T="14" R="137" G="44" B="8" A="255"/>
+	<Vtx X="6" Y="9" Z="9" S="462" T="14" R="196" G="27" B="109" A="255"/>
+	<Vtx X="5" Y="7" Z="8" S="422" T="-50" R="129" G="0" B="6" A="255"/>
+	<Vtx X="6" Y="7" Z="9" S="462" T="-50" R="189" G="0" B="108" A="255"/>
+	<Vtx X="6" Y="5" Z="9" S="462" T="14" R="196" G="229" B="109" A="255"/>
+	<Vtx X="7" Y="7" Z="9" S="462" T="-50" R="236" G="0" B="125" A="255"/>
+	<Vtx X="7" Y="6" Z="9" S="462" T="14" R="232" G="243" B="124" A="255"/>
+	<Vtx X="6" Y="5" Z="9" S="462" T="78" R="210" G="200" B="104" A="255"/>
+	<Vtx X="6" Y="4" Z="8" S="422" T="78" R="166" G="166" B="2" A="255"/>
+	<Vtx X="6" Y="5" Z="9" S="462" T="78" R="210" G="200" B="104" A="255"/>
+	<Vtx X="6" Y="5" Z="9" S="462" T="14" R="196" G="229" B="109" A="255"/>
+	<Vtx X="7" Y="4" Z="9" S="462" T="142" R="238" G="188" B="106" A="255"/>
+	<Vtx X="7" Y="3" Z="8" S="422" T="142" R="206" G="139" B="8" A="255"/>
+	<Vtx X="9" Y="3" Z="8" S="422" T="206" R="0" G="129" B="255" A="255"/>
+	<Vtx X="9" Y="4" Z="9" S="462" T="206" R="9" G="183" B="104" A="255"/>
+	<Vtx X="10" Y="4" Z="9" S="462" T="142" R="36" G="188" B="101" A="255"/>
+	<Vtx X="9" Y="5" Z="9" S="462" T="206" R="10" G="225" B="123" A="255"/>
+	<Vtx X="10" Y="5" Z="9" S="462" T="142" R="23" G="221" B="120" A="255"/>
+	<Vtx X="11" Y="5" Z="9" S="462" T="78" R="64" G="200" B="95" A="255"/>
+	<Vtx X="11" Y="4" Z="8" S="422" T="78" R="90" G="167" B="245" A="255"/>
+	<Vtx X="12" Y="5" Z="8" S="462" T="14" R="78" G="229" B="97" A="255"/>
+	<Vtx X="12" Y="5" Z="7" S="422" T="14" R="119" G="212" B="244" A="255"/>
+	<Vtx X="12" Y="7" Z="7" S="422" T="-50" R="126" G="0" B="241" A="255"/>
+	<Vtx X="12" Y="7" Z="8" S="462" T="-50" R="85" G="0" B="95" A="255"/>
+	<Vtx X="12" Y="9" Z="8" S="462" T="14" R="78" G="27" B="97" A="255"/>
+	<Vtx X="12" Y="7" Z="8" S="462" T="-50" R="85" G="0" B="95" A="255"/>
+	<Vtx X="12" Y="7" Z="7" S="422" T="-50" R="126" G="0" B="241" A="255"/>
+	<Vtx X="11" Y="7" Z="9" S="462" T="-50" R="42" G="0" B="120" A="255"/>
+	<Vtx X="11" Y="9" Z="9" S="462" T="14" R="45" G="13" B="118" A="255"/>
+	<Vtx X="11" Y="10" Z="9" S="462" T="78" R="64" G="56" B="95" A="255"/>
+	<Vtx X="11" Y="10" Z="8" S="422" T="78" R="89" G="90" B="243" A="255"/>
+	<Vtx X="10" Y="10" Z="9" S="462" T="142" R="36" G="68" B="101" A="255"/>
+	<Vtx X="11" Y="11" Z="8" S="422" T="142" R="52" G="116" B="255" A="255"/>
+	<Vtx X="9" Y="11" Z="8" S="422" T="206" R="255" G="127" B="255" A="255"/>
+	<Vtx X="9" Y="10" Z="9" S="462" T="206" R="9" G="73" B="104" A="255"/>
+	<Vtx X="7" Y="10" Z="9" S="462" T="142" R="238" G="68" B="106" A="255"/>
+	<Vtx X="7" Y="11" Z="8" S="422" T="142" R="180" G="102" B="5" A="255"/>
+	<Vtx X="6" Y="10" Z="8" S="422" T="78" R="165" G="89" B="3" A="255"/>
+	<Vtx X="6" Y="10" Z="9" S="462" T="78" R="210" G="56" B="104" A="255"/>
+	<Vtx X="6" Y="9" Z="9" S="462" T="14" R="196" G="27" B="109" A="255"/>
+	<Vtx X="7" Y="9" Z="9" S="462" T="14" R="232" G="13" B="124" A="255"/>
+	<Vtx X="6" Y="10" Z="9" S="462" T="78" R="210" G="56" B="104" A="255"/>
+	<Vtx X="6" Y="9" Z="9" S="462" T="14" R="196" G="27" B="109" A="255"/>
+	<Vtx X="7" Y="7" Z="9" S="462" T="-50" R="236" G="0" B="125" A="255"/>
+	<Vtx X="6" Y="7" Z="9" S="462" T="-50" R="189" G="0" B="108" A="255"/>
+	<Vtx X="7" Y="9" Z="9" S="462" T="78" R="238" G="29" B="122" A="255"/>
+	<Vtx X="7" Y="9" Z="9" S="462" T="142" R="255" G="35" B="122" A="255"/>
+	<Vtx X="7" Y="9" Z="9" S="526" T="142" R="253" G="14" B="126" A="255"/>
+	<Vtx X="7" Y="9" Z="9" S="526" T="78" R="232" G="13" B="124" A="255"/>
+	<Vtx X="7" Y="7" Z="9" S="590" T="142" R="254" G="0" B="127" A="255"/>
+	<Vtx X="7" Y="7" Z="9" S="590" T="78" R="236" G="0" B="125" A="255"/>
+	<Vtx X="7" Y="6" Z="9" S="526" T="78" R="232" G="243" B="124" A="255"/>
+	<Vtx X="7" Y="6" Z="9" S="526" T="142" R="253" G="242" B="126" A="255"/>
+	<Vtx X="7" Y="5" Z="9" S="462" T="78" R="238" G="227" B="122" A="255"/>
+	<Vtx X="7" Y="5" Z="9" S="462" T="142" R="255" G="221" B="122" A="255"/>
+	<Vtx X="6" Y="5" Z="9" S="462" T="78" R="210" G="200" B="104" A="255"/>
+	<Vtx X="6" Y="5" Z="9" S="462" T="78" R="210" G="200" B="104" A="255"/>
+	<Vtx X="7" Y="5" Z="9" S="462" T="78" R="238" G="227" B="122" A="255"/>
+	<Vtx X="7" Y="6" Z="9" S="462" T="14" R="232" G="243" B="124" A="255"/>
+	<Vtx X="7" Y="4" Z="9" S="462" T="142" R="238" G="188" B="106" A="255"/>
+	<Vtx X="7" Y="5" Z="9" S="462" T="142" R="255" G="221" B="122" A="255"/>
+	<Vtx X="9" Y="5" Z="9" S="462" T="206" R="10" G="225" B="123" A="255"/>
+	<Vtx X="9" Y="4" Z="9" S="462" T="206" R="9" G="183" B="104" A="255"/>
+	<Vtx X="9" Y="6" Z="9" S="526" T="206" R="11" G="243" B="126" A="255"/>
+	<Vtx X="7" Y="6" Z="9" S="526" T="142" R="253" G="242" B="126" A="255"/>
+	<Vtx X="9" Y="7" Z="9" S="590" T="206" R="11" G="0" B="127" A="255"/>
+	<Vtx X="10" Y="6" Z="9" S="526" T="142" R="25" G="242" B="124" A="255"/>
+	<Vtx X="10" Y="5" Z="9" S="462" T="142" R="23" G="221" B="120" A="255"/>
+	<Vtx X="10" Y="5" Z="9" S="462" T="78" R="39" G="227" B="117" A="255"/>
+	<Vtx X="11" Y="6" Z="9" S="526" T="78" R="45" G="243" B="118" A="255"/>
+	<Vtx X="10" Y="7" Z="9" S="590" T="142" R="24" G="0" B="125" A="255"/>
+	<Vtx X="11" Y="7" Z="9" S="590" T="78" R="42" G="0" B="120" A="255"/>
+	<Vtx X="10" Y="7" Z="9" S="590" T="142" R="24" G="0" B="125" A="255"/>
+	<Vtx X="11" Y="7" Z="9" S="590" T="78" R="42" G="0" B="120" A="255"/>
+	<Vtx X="11" Y="9" Z="9" S="526" T="78" R="45" G="13" B="118" A="255"/>
+	<Vtx X="10" Y="9" Z="9" S="526" T="142" R="25" G="14" B="124" A="255"/>
+	<Vtx X="10" Y="9" Z="9" S="462" T="78" R="39" G="29" B="117" A="255"/>
+	<Vtx X="10" Y="9" Z="9" S="462" T="142" R="23" G="35" B="120" A="255"/>
+	<Vtx X="11" Y="10" Z="9" S="462" T="78" R="64" G="56" B="95" A="255"/>
+	<Vtx X="11" Y="9" Z="9" S="462" T="14" R="45" G="13" B="118" A="255"/>
+	<Vtx X="10" Y="10" Z="9" S="462" T="142" R="36" G="68" B="101" A="255"/>
+	<Vtx X="9" Y="9" Z="9" S="462" T="206" R="10" G="31" B="123" A="255"/>
+	<Vtx X="9" Y="10" Z="9" S="462" T="206" R="9" G="73" B="104" A="255"/>
+	<Vtx X="7" Y="10" Z="9" S="462" T="142" R="238" G="68" B="106" A="255"/>
+	<Vtx X="7" Y="9" Z="9" S="462" T="142" R="255" G="35" B="122" A="255"/>
+	<Vtx X="6" Y="10" Z="9" S="462" T="78" R="210" G="56" B="104" A="255"/>
+	<Vtx X="9" Y="9" Z="9" S="526" T="206" R="11" G="13" B="126" A="255"/>
+	<Vtx X="7" Y="9" Z="9" S="526" T="142" R="253" G="14" B="126" A="255"/>
+	<Vtx X="7" Y="9" Z="9" S="526" T="142" R="253" G="14" B="126" A="255"/>
+	<Vtx X="9" Y="7" Z="9" S="590" T="206" R="11" G="0" B="127" A="255"/>
+	<Vtx X="9" Y="9" Z="9" S="526" T="206" R="11" G="13" B="126" A="255"/>
+	<Vtx X="7" Y="7" Z="9" S="590" T="142" R="254" G="0" B="127" A="255"/>
+	<Vtx X="7" Y="6" Z="9" S="526" T="142" R="253" G="242" B="126" A="255"/>
+	<Vtx X="10" Y="9" Z="9" S="526" T="142" R="25" G="14" B="124" A="255"/>
+	<Vtx X="10" Y="7" Z="9" S="590" T="142" R="24" G="0" B="125" A="255"/>
+	<Vtx X="10" Y="6" Z="9" S="526" T="142" R="25" G="242" B="124" A="255"/>
+	<Vtx X="10" Y="9" Z="9" S="462" T="142" R="23" G="35" B="120" A="255"/>
+	<Vtx X="9" Y="9" Z="9" S="462" T="206" R="10" G="31" B="123" A="255"/>
+	<Vtx X="11" Y="7" Z="9" S="462" T="-50" R="42" G="0" B="120" A="255"/>
+	<Vtx X="12" Y="5" Z="8" S="462" T="14" R="78" G="229" B="97" A="255"/>
+	<Vtx X="12" Y="7" Z="8" S="462" T="-50" R="85" G="0" B="95" A="255"/>
+	<Vtx X="11" Y="6" Z="9" S="462" T="14" R="45" G="243" B="118" A="255"/>
+	<Vtx X="11" Y="5" Z="9" S="462" T="78" R="64" G="200" B="95" A="255"/>
+	<Vtx X="10" Y="5" Z="9" S="462" T="78" R="39" G="227" B="117" A="255"/>
+	<Vtx X="11" Y="5" Z="9" S="462" T="78" R="64" G="200" B="95" A="255"/>
+	<Vtx X="10" Y="5" Z="9" S="462" T="78" R="39" G="227" B="117" A="255"/>
+	<Vtx X="10" Y="5" Z="9" S="462" T="142" R="23" G="221" B="120" A="255"/>
+	<Vtx X="-2" Y="5" Z="9" S="422" T="14" R="117" G="208" B="248" A="255"/>
+	<Vtx X="-6" Y="7" Z="5" S="206" T="14" R="224" G="192" B="151" A="255"/>
+	<Vtx X="-2" Y="9" Z="9" S="422" T="14" R="119" G="44" B="244" A="255"/>
+	<Vtx X="-2" Y="7" Z="9" S="422" T="-50" R="126" G="0" B="241" A="255"/>
+	<Vtx X="-3" Y="9" Z="10" S="462" T="14" R="78" G="27" B="97" A="255"/>
+	<Vtx X="-3" Y="10" Z="9" S="422" T="78" R="89" G="90" B="244" A="255"/>
+	<Vtx X="-6" Y="7" Z="5" S="206" T="142" R="224" G="192" B="151" A="255"/>
+	<Vtx X="-4" Y="11" Z="9" S="422" T="142" R="76" G="102" B="252" A="255"/>
+	<Vtx X="-6" Y="11" Z="9" S="422" T="206" R="1" G="127" B="254" A="255"/>
+	<Vtx X="-8" Y="11" Z="9" S="422" T="142" R="204" G="116" B="7" A="255"/>
+	<Vtx X="-9" Y="10" Z="9" S="422" T="78" R="166" G="90" B="3" A="255"/>
+	<Vtx X="-10" Y="9" Z="9" S="422" T="14" R="139" G="48" B="12" A="255"/>
+	<Vtx X="-9" Y="9" Z="10" S="462" T="14" R="196" G="27" B="109" A="255"/>
+	<Vtx X="-9" Y="9" Z="10" S="462" T="14" R="196" G="27" B="109" A="255"/>
+	<Vtx X="-10" Y="9" Z="9" S="422" T="14" R="139" G="48" B="12" A="255"/>
+	<Vtx X="-10" Y="7" Z="9" S="422" T="-50" R="129" G="0" B="6" A="255"/>
+	<Vtx X="-10" Y="5" Z="9" S="422" T="14" R="137" G="212" B="8" A="255"/>
+	<Vtx X="-6" Y="7" Z="5" S="206" T="14" R="224" G="192" B="151" A="255"/>
+	<Vtx X="-9" Y="4" Z="9" S="422" T="78" R="166" G="166" B="3" A="255"/>
+	<Vtx X="-8" Y="3" Z="9" S="422" T="142" R="202" G="141" B="4" A="255"/>
+	<Vtx X="-8" Y="4" Z="10" S="462" T="142" R="238" G="188" B="106" A="255"/>
+	<Vtx X="-6" Y="3" Z="9" S="422" T="206" R="0" G="129" B="254" A="255"/>
+	<Vtx X="-6" Y="7" Z="5" S="206" T="142" R="224" G="192" B="151" A="255"/>
+	<Vtx X="-4" Y="3" Z="9" S="422" T="142" R="52" G="140" B="255" A="255"/>
+	<Vtx X="-3" Y="4" Z="9" S="422" T="78" R="89" G="167" B="244" A="255"/>
+	<Vtx X="-2" Y="5" Z="9" S="422" T="14" R="117" G="208" B="248" A="255"/>
+	<Vtx X="-3" Y="5" Z="10" S="462" T="14" R="78" G="229" B="97" A="255"/>
+	<Vtx X="-2" Y="7" Z="9" S="422" T="-50" R="126" G="0" B="241" A="255"/>
+	<Vtx X="-3" Y="7" Z="10" S="462" T="-50" R="85" G="0" B="95" A="255"/>
+	<Vtx X="-2" Y="7" Z="9" S="422" T="-50" R="126" G="0" B="241" A="255"/>
+	<Vtx X="-3" Y="9" Z="10" S="462" T="14" R="78" G="27" B="97" A="255"/>
+	<Vtx X="-3" Y="7" Z="10" S="462" T="-50" R="85" G="0" B="95" A="255"/>
+	<Vtx X="-4" Y="7" Z="10" S="462" T="-50" R="42" G="0" B="120" A="255"/>
+	<Vtx X="-4" Y="9" Z="10" S="462" T="14" R="45" G="13" B="118" A="255"/>
+	<Vtx X="-4" Y="10" Z="10" S="462" T="78" R="64" G="56" B="95" A="255"/>
+	<Vtx X="-3" Y="10" Z="9" S="422" T="78" R="89" G="90" B="244" A="255"/>
+	<Vtx X="-4" Y="10" Z="10" S="462" T="142" R="36" G="68" B="101" A="255"/>
+	<Vtx X="-4" Y="11" Z="9" S="422" T="142" R="76" G="102" B="252" A="255"/>
+	<Vtx X="-6" Y="11" Z="9" S="422" T="206" R="1" G="127" B="254" A="255"/>
+	<Vtx X="-6" Y="10" Z="10" S="462" T="206" R="9" G="73" B="104" A="255"/>
+	<Vtx X="-8" Y="10" Z="10" S="462" T="142" R="238" G="68" B="106" A="255"/>
+	<Vtx X="-8" Y="11" Z="9" S="422" T="142" R="204" G="116" B="7" A="255"/>
+	<Vtx X="-9" Y="10" Z="9" S="422" T="78" R="166" G="90" B="3" A="255"/>
+	<Vtx X="-8" Y="10" Z="10" S="462" T="78" R="210" G="56" B="104" A="255"/>
+	<Vtx X="-9" Y="9" Z="10" S="462" T="14" R="196" G="27" B="109" A="255"/>
+	<Vtx X="-8" Y="10" Z="10" S="462" T="78" R="210" G="56" B="104" A="255"/>
+	<Vtx X="-9" Y="9" Z="10" S="462" T="14" R="196" G="27" B="109" A="255"/>
+	<Vtx X="-8" Y="9" Z="10" S="462" T="14" R="232" G="13" B="124" A="255"/>
+	<Vtx X="-8" Y="7" Z="10" S="462" T="-50" R="236" G="0" B="125" A="255"/>
+	<Vtx X="-9" Y="7" Z="10" S="462" T="-50" R="189" G="0" B="108" A="255"/>
+	<Vtx X="-10" Y="7" Z="9" S="422" T="-50" R="129" G="0" B="6" A="255"/>
+	<Vtx X="-9" Y="5" Z="10" S="462" T="14" R="196" G="229" B="109" A="255"/>
+	<Vtx X="-10" Y="5" Z="9" S="422" T="14" R="137" G="212" B="8" A="255"/>
+	<Vtx X="-9" Y="4" Z="9" S="422" T="78" R="166" G="166" B="3" A="255"/>
+	<Vtx X="-8" Y="5" Z="10" S="462" T="78" R="210" G="200" B="104" A="255"/>
+	<Vtx X="-8" Y="4" Z="10" S="462" T="142" R="238" G="188" B="106" A="255"/>
+	<Vtx X="-7" Y="5" Z="10" S="462" T="142" R="255" G="221" B="122" A="255"/>
+	<Vtx X="-6" Y="5" Z="10" S="462" T="206" R="10" G="225" B="123" A="255"/>
+	<Vtx X="-6" Y="4" Z="10" S="462" T="206" R="9" G="183" B="104" A="255"/>
+	<Vtx X="-6" Y="3" Z="9" S="422" T="206" R="0" G="129" B="254" A="255"/>
+	<Vtx X="-4" Y="4" Z="10" S="462" T="142" R="36" G="188" B="101" A="255"/>
+	<Vtx X="-6" Y="3" Z="9" S="422" T="206" R="0" G="129" B="254" A="255"/>
+	<Vtx X="-4" Y="3" Z="9" S="422" T="142" R="52" G="140" B="255" A="255"/>
+	<Vtx X="-4" Y="4" Z="10" S="462" T="142" R="36" G="188" B="101" A="255"/>
+	<Vtx X="-3" Y="4" Z="9" S="422" T="78" R="89" G="167" B="244" A="255"/>
+	<Vtx X="-4" Y="5" Z="10" S="462" T="78" R="64" G="200" B="95" A="255"/>
+	<Vtx X="-3" Y="5" Z="10" S="462" T="14" R="78" G="229" B="97" A="255"/>
+	<Vtx X="-4" Y="6" Z="10" S="462" T="14" R="45" G="243" B="118" A="255"/>
+	<Vtx X="-4" Y="7" Z="10" S="462" T="-50" R="42" G="0" B="120" A="255"/>
+	<Vtx X="-3" Y="7" Z="10" S="462" T="-50" R="85" G="0" B="95" A="255"/>
+	<Vtx X="-4" Y="5" Z="10" S="462" T="78" R="39" G="227" B="117" A="255"/>
+	<Vtx X="-4" Y="5" Z="10" S="462" T="142" R="23" G="221" B="120" A="255"/>
+	<Vtx X="-4" Y="6" Z="10" S="526" T="142" R="25" G="242" B="124" A="255"/>
+	<Vtx X="-4" Y="6" Z="10" S="526" T="78" R="45" G="243" B="118" A="255"/>
+	<Vtx X="-4" Y="7" Z="10" S="590" T="142" R="24" G="0" B="125" A="255"/>
+	<Vtx X="-4" Y="7" Z="10" S="590" T="78" R="42" G="0" B="120" A="255"/>
+	<Vtx X="-4" Y="9" Z="10" S="526" T="78" R="45" G="13" B="118" A="255"/>
+	<Vtx X="-4" Y="9" Z="10" S="526" T="78" R="45" G="13" B="118" A="255"/>
+	<Vtx X="-4" Y="9" Z="10" S="526" T="142" R="25" G="14" B="124" A="255"/>
+	<Vtx X="-4" Y="7" Z="10" S="590" T="142" R="24" G="0" B="125" A="255"/>
+	<Vtx X="-4" Y="9" Z="10" S="462" T="78" R="39" G="29" B="117" A="255"/>
+	<Vtx X="-4" Y="9" Z="10" S="462" T="142" R="23" G="35" B="120" A="255"/>
+	<Vtx X="-4" Y="10" Z="10" S="462" T="78" R="64" G="56" B="95" A="255"/>
+	<Vtx X="-4" Y="9" Z="10" S="462" T="14" R="45" G="13" B="118" A="255"/>
+	<Vtx X="-4" Y="10" Z="10" S="462" T="142" R="36" G="68" B="101" A="255"/>
+	<Vtx X="-6" Y="9" Z="10" S="462" T="206" R="10" G="31" B="123" A="255"/>
+	<Vtx X="-6" Y="10" Z="10" S="462" T="206" R="9" G="73" B="104" A="255"/>
+	<Vtx X="-8" Y="10" Z="10" S="462" T="142" R="238" G="68" B="106" A="255"/>
+	<Vtx X="-7" Y="9" Z="10" S="462" T="142" R="255" G="35" B="122" A="255"/>
+	<Vtx X="-8" Y="10" Z="10" S="462" T="78" R="210" G="56" B="104" A="255"/>
+	<Vtx X="-8" Y="9" Z="10" S="462" T="78" R="238" G="29" B="122" A="255"/>
+	<Vtx X="-8" Y="9" Z="10" S="462" T="14" R="232" G="13" B="124" A="255"/>
+	<Vtx X="-7" Y="9" Z="11" S="526" T="142" R="253" G="14" B="126" A="255"/>
+	<Vtx X="-6" Y="9" Z="10" S="526" T="206" R="11" G="13" B="126" A="255"/>
+	<Vtx X="-7" Y="9" Z="10" S="462" T="142" R="255" G="35" B="122" A="255"/>
+	<Vtx X="-7" Y="9" Z="11" S="526" T="142" R="253" G="14" B="126" A="255"/>
+	<Vtx X="-6" Y="7" Z="10" S="590" T="206" R="11" G="0" B="127" A="255"/>
+	<Vtx X="-7" Y="7" Z="11" S="590" T="142" R="254" G="0" B="127" A="255"/>
+	<Vtx X="-8" Y="9" Z="10" S="526" T="78" R="232" G="13" B="124" A="255"/>
+	<Vtx X="-8" Y="9" Z="10" S="462" T="78" R="238" G="29" B="122" A="255"/>
+	<Vtx X="-8" Y="7" Z="10" S="590" T="78" R="236" G="0" B="125" A="255"/>
+	<Vtx X="-8" Y="6" Z="10" S="526" T="78" R="232" G="243" B="124" A="255"/>
+	<Vtx X="-7" Y="6" Z="11" S="526" T="142" R="253" G="242" B="126" A="255"/>
+	<Vtx X="-8" Y="5" Z="10" S="462" T="78" R="238" G="227" B="122" A="255"/>
+	<Vtx X="-7" Y="5" Z="10" S="462" T="142" R="255" G="221" B="122" A="255"/>
+	<Vtx X="-8" Y="5" Z="10" S="462" T="78" R="210" G="200" B="104" A="255"/>
+	<Vtx X="-8" Y="6" Z="10" S="462" T="14" R="232" G="243" B="124" A="255"/>
+	<Vtx X="-9" Y="5" Z="10" S="462" T="14" R="196" G="229" B="109" A="255"/>
+	<Vtx X="-8" Y="7" Z="10" S="462" T="-50" R="236" G="0" B="125" A="255"/>
+	<Vtx X="-8" Y="7" Z="10" S="462" T="-50" R="236" G="0" B="125" A="255"/>
+	<Vtx X="-9" Y="7" Z="10" S="462" T="-50" R="189" G="0" B="108" A="255"/>
+	<Vtx X="-9" Y="5" Z="10" S="462" T="14" R="196" G="229" B="109" A="255"/>
+	<Vtx X="-7" Y="5" Z="10" S="462" T="142" R="255" G="221" B="122" A="255"/>
+	<Vtx X="-6" Y="6" Z="10" S="526" T="206" R="11" G="243" B="126" A="255"/>
+	<Vtx X="-7" Y="6" Z="11" S="526" T="142" R="253" G="242" B="126" A="255"/>
+	<Vtx X="-6" Y="5" Z="10" S="462" T="206" R="10" G="225" B="123" A="255"/>
+	<Vtx X="-4" Y="5" Z="10" S="462" T="142" R="23" G="221" B="120" A="255"/>
+	<Vtx X="-4" Y="4" Z="10" S="462" T="142" R="36" G="188" B="101" A="255"/>
+	<Vtx X="-6" Y="4" Z="10" S="462" T="206" R="9" G="183" B="104" A="255"/>
+	<Vtx X="-4" Y="5" Z="10" S="462" T="78" R="64" G="200" B="95" A="255"/>
+	<Vtx X="-6" Y="9" Z="10" S="526" T="206" R="11" G="13" B="126" A="255"/>
+	<Vtx X="-6" Y="9" Z="10" S="462" T="206" R="10" G="31" B="123" A="255"/>
+	<Vtx X="-7" Y="9" Z="10" S="462" T="142" R="255" G="35" B="122" A="255"/>
+	<Vtx X="-4" Y="9" Z="10" S="462" T="142" R="23" G="35" B="120" A="255"/>
+	<Vtx X="-4" Y="9" Z="10" S="526" T="142" R="25" G="14" B="124" A="255"/>
+	<Vtx X="-4" Y="9" Z="10" S="526" T="142" R="25" G="14" B="124" A="255"/>
+	<Vtx X="-6" Y="9" Z="10" S="526" T="206" R="11" G="13" B="126" A="255"/>
+	<Vtx X="-6" Y="7" Z="10" S="590" T="206" R="11" G="0" B="127" A="255"/>
+	<Vtx X="-4" Y="7" Z="10" S="590" T="142" R="24" G="0" B="125" A="255"/>
+	<Vtx X="-4" Y="6" Z="10" S="526" T="142" R="25" G="242" B="124" A="255"/>
+	<Vtx X="-6" Y="6" Z="10" S="526" T="206" R="11" G="243" B="126" A="255"/>
+	<Vtx X="-7" Y="6" Z="11" S="526" T="142" R="253" G="242" B="126" A="255"/>
+	<Vtx X="-7" Y="7" Z="11" S="590" T="142" R="254" G="0" B="127" A="255"/>
+	<Vtx X="-4" Y="5" Z="10" S="462" T="142" R="23" G="221" B="120" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_boss_soul/mat_gGIBossSoulSkullDL_Gem_eyes b/soh/assets/custom/objects/object_boss_soul/mat_gGIBossSoulSkullDL_Gem_eyes
new file mode 100644
index 000000000..07364ba3a
--- /dev/null
+++ b/soh/assets/custom/objects/object_boss_soul/mat_gGIBossSoulSkullDL_Gem_eyes
@@ -0,0 +1,21 @@
+<DisplayList Version="0">
+	<PipeSync/>
+	<SetCombineLERP A0="G_CCMUX_TEXEL0" B0="G_CCMUX_0" C0="G_CCMUX_TEXEL0" D0="G_CCMUX_TEXEL0" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_1" A1="G_CCMUX_COMBINED" B1="G_CCMUX_0" C1="G_CCMUX_PRIMITIVE" D1="G_CCMUX_0" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_COMBINED"/>
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="1" G_CULL_BACK="1" G_FOG="1" G_LIGHTING="1" G_TEXTURE_GEN="1" G_SHADING_SMOOTH="1" />
+	<ClearGeometryMode G_CULL_FRONT="1" G_TEXTURE_GEN_LINEAR="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_H" Sft="4" Length="20" G_AD_NOISE="1" G_CD_MAGICSQ="1" G_CK_NONE="1" G_TC_FILT="1" G_TF_BILERP="1" G_TL_TILE="1" G_TD_CLAMP="1" G_TP_PERSP="1" G_CYC_2CYCLE="1" G_PM_NPRIMITIVE="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_L" Sft="0" Length="32" G_AC_NONE="1" G_ZS_PIXEL="1" G_RM_FOG_SHADE_A="1" G_RM_AA_ZB_OPA_SURF2="1" />
+	<Texture S="5898" T="5898" Level="0" Tile="0" On="1"/>
+	<SetTextureLUT Mode="G_TT_NONE"/>
+	<TileSync/>
+	<SetTextureImage Path="objects/object_boss_soul/noise_tex" Format="G_IM_FMT_I" Size="G_IM_SIZ_8b_LOAD_BLOCK" Width="1"/>
+	<SetTile Format="G_IM_FMT_I" Size="G_IM_SIZ_8b_LOAD_BLOCK" Line="0" TMem="0" Tile="7" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="511" Dxt="512"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_I" Size="G_IM_SIZ_8b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="124" Lrt="124"/>
+	<SetPrimColor M="0" L="0" R="223" G="62" B="53" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_boss_soul/mat_gGIBossSoulSkullDL_skull_black b/soh/assets/custom/objects/object_boss_soul/mat_gGIBossSoulSkullDL_skull_black
new file mode 100644
index 000000000..6aee093d9
--- /dev/null
+++ b/soh/assets/custom/objects/object_boss_soul/mat_gGIBossSoulSkullDL_skull_black
@@ -0,0 +1,21 @@
+<DisplayList Version="0">
+	<PipeSync/>
+	<SetCombineLERP A0="G_CCMUX_TEXEL0" B0="G_CCMUX_0" C0="G_CCMUX_TEXEL0" D0="G_CCMUX_TEXEL0" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_1" A1="G_CCMUX_COMBINED" B1="G_CCMUX_0" C1="G_CCMUX_PRIMITIVE" D1="G_CCMUX_0" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_COMBINED"/>
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="1" G_CULL_BACK="1" G_FOG="1" G_LIGHTING="1" G_TEXTURE_GEN="1" G_SHADING_SMOOTH="1" />
+	<ClearGeometryMode G_CULL_FRONT="1" G_TEXTURE_GEN_LINEAR="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_H" Sft="4" Length="20" G_AD_NOISE="1" G_CD_MAGICSQ="1" G_CK_NONE="1" G_TC_FILT="1" G_TF_BILERP="1" G_TL_TILE="1" G_TD_CLAMP="1" G_TP_PERSP="1" G_CYC_2CYCLE="1" G_PM_NPRIMITIVE="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_L" Sft="0" Length="32" G_AC_NONE="1" G_ZS_PIXEL="1" G_RM_FOG_SHADE_A="1" G_RM_AA_ZB_OPA_SURF2="1" />
+	<Texture S="1984" T="1984" Level="0" Tile="0" On="1"/>
+	<SetTextureLUT Mode="G_TT_NONE"/>
+	<TileSync/>
+	<SetTextureImage Path="objects/object_boss_soul/noise_tex_copy" Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b_LOAD_BLOCK" Width="1"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b_LOAD_BLOCK" Line="0" TMem="0" Tile="7" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="1023" Dxt="256"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="8" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="124" Lrt="124"/>
+	<SetPrimColor M="0" L="0" R="49" G="49" B="49" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_boss_soul/mat_gGIBossSoulSkullDL_skull_eyes b/soh/assets/custom/objects/object_boss_soul/mat_gGIBossSoulSkullDL_skull_eyes
new file mode 100644
index 000000000..c08beb94a
--- /dev/null
+++ b/soh/assets/custom/objects/object_boss_soul/mat_gGIBossSoulSkullDL_skull_eyes
@@ -0,0 +1,21 @@
+<DisplayList Version="0">
+	<PipeSync/>
+	<SetCombineLERP A0="G_CCMUX_0" B0="G_CCMUX_0" C0="G_CCMUX_0" D0="G_CCMUX_TEXEL0" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_1" A1="G_CCMUX_COMBINED" B1="G_CCMUX_0" C1="G_CCMUX_PRIMITIVE" D1="G_CCMUX_0" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_COMBINED"/>
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="1" G_CULL_BACK="1" G_FOG="1" G_LIGHTING="1" G_SHADING_SMOOTH="1" />
+	<ClearGeometryMode G_CULL_FRONT="1" G_TEXTURE_GEN="1" G_TEXTURE_GEN_LINEAR="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_H" Sft="4" Length="20" G_AD_NOISE="1" G_CD_MAGICSQ="1" G_CK_NONE="1" G_TC_FILT="1" G_TF_BILERP="1" G_TL_TILE="1" G_TD_CLAMP="1" G_TP_PERSP="1" G_CYC_2CYCLE="1" G_PM_NPRIMITIVE="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_L" Sft="0" Length="32" G_AC_NONE="1" G_ZS_PIXEL="1" G_RM_FOG_SHADE_A="1" G_RM_AA_ZB_OPA_SURF2="1" />
+	<Texture S="65535" T="65535" Level="0" Tile="0" On="1"/>
+	<SetTextureLUT Mode="G_TT_NONE"/>
+	<TileSync/>
+	<SetTextureImage Path="objects/object_boss_soul/noise_tex_copy" Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b_LOAD_BLOCK" Width="1"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b_LOAD_BLOCK" Line="0" TMem="0" Tile="7" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="1023" Dxt="256"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="8" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="124" Lrt="124"/>
+	<SetPrimColor M="0" L="0" R="90" G="14" B="12" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_boss_soul/mat_gGIBossSoulSkullDL_skull_horns b/soh/assets/custom/objects/object_boss_soul/mat_gGIBossSoulSkullDL_skull_horns
new file mode 100644
index 000000000..78d2a531c
--- /dev/null
+++ b/soh/assets/custom/objects/object_boss_soul/mat_gGIBossSoulSkullDL_skull_horns
@@ -0,0 +1,21 @@
+<DisplayList Version="0">
+	<PipeSync/>
+	<SetCombineLERP A0="G_CCMUX_TEXEL0" B0="G_CCMUX_0" C0="G_CCMUX_TEXEL0" D0="G_CCMUX_TEXEL0" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_1" A1="G_CCMUX_COMBINED" B1="G_CCMUX_0" C1="G_CCMUX_PRIMITIVE" D1="G_CCMUX_0" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_COMBINED"/>
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="1" G_CULL_BACK="1" G_FOG="1" G_LIGHTING="1" G_TEXTURE_GEN="1" G_SHADING_SMOOTH="1" />
+	<ClearGeometryMode G_CULL_FRONT="1" G_TEXTURE_GEN_LINEAR="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_H" Sft="4" Length="20" G_AD_NOISE="1" G_CD_MAGICSQ="1" G_CK_NONE="1" G_TC_FILT="1" G_TF_BILERP="1" G_TL_TILE="1" G_TD_CLAMP="1" G_TP_PERSP="1" G_CYC_2CYCLE="1" G_PM_NPRIMITIVE="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_L" Sft="0" Length="32" G_AC_NONE="1" G_ZS_PIXEL="1" G_RM_FOG_SHADE_A="1" G_RM_AA_ZB_OPA_SURF2="1" />
+	<Texture S="1984" T="1984" Level="0" Tile="0" On="1"/>
+	<SetTextureLUT Mode="G_TT_NONE"/>
+	<TileSync/>
+	<SetTextureImage Path="objects/object_boss_soul/noise_tex" Format="G_IM_FMT_I" Size="G_IM_SIZ_8b_LOAD_BLOCK" Width="1"/>
+	<SetTile Format="G_IM_FMT_I" Size="G_IM_SIZ_8b_LOAD_BLOCK" Line="0" TMem="0" Tile="7" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="511" Dxt="512"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_I" Size="G_IM_SIZ_8b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="124" Lrt="124"/>
+	<SetPrimColor M="0" L="0" R="255" G="241" B="124" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_boss_soul/mat_gGIBossSoulSkullDL_skull_surface b/soh/assets/custom/objects/object_boss_soul/mat_gGIBossSoulSkullDL_skull_surface
new file mode 100644
index 000000000..e15a4dce4
--- /dev/null
+++ b/soh/assets/custom/objects/object_boss_soul/mat_gGIBossSoulSkullDL_skull_surface
@@ -0,0 +1,21 @@
+<DisplayList Version="0">
+	<PipeSync/>
+	<SetCombineLERP A0="G_CCMUX_TEXEL0" B0="G_CCMUX_0" C0="G_CCMUX_TEXEL0" D0="G_CCMUX_TEXEL0" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_1" A1="G_CCMUX_COMBINED" B1="G_CCMUX_0" C1="G_CCMUX_PRIMITIVE" D1="G_CCMUX_0" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_COMBINED"/>
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="1" G_CULL_BACK="1" G_FOG="1" G_LIGHTING="1" G_TEXTURE_GEN="1" G_SHADING_SMOOTH="1" />
+	<ClearGeometryMode G_CULL_FRONT="1" G_TEXTURE_GEN_LINEAR="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_H" Sft="4" Length="20" G_AD_NOISE="1" G_CD_MAGICSQ="1" G_CK_NONE="1" G_TC_FILT="1" G_TF_BILERP="1" G_TL_TILE="1" G_TD_CLAMP="1" G_TP_PERSP="1" G_CYC_2CYCLE="1" G_PM_NPRIMITIVE="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_L" Sft="0" Length="32" G_AC_NONE="1" G_ZS_PIXEL="1" G_RM_FOG_SHADE_A="1" G_RM_AA_ZB_OPA_SURF2="1" />
+	<Texture S="1984" T="1984" Level="0" Tile="0" On="1"/>
+	<SetTextureLUT Mode="G_TT_NONE"/>
+	<TileSync/>
+	<SetTextureImage Path="objects/object_boss_soul/noise_tex" Format="G_IM_FMT_I" Size="G_IM_SIZ_8b_LOAD_BLOCK" Width="1"/>
+	<SetTile Format="G_IM_FMT_I" Size="G_IM_SIZ_8b_LOAD_BLOCK" Line="0" TMem="0" Tile="7" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="511" Dxt="512"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_I" Size="G_IM_SIZ_8b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="124" Lrt="124"/>
+	<!-- <SetPrimColor M="0" L="0" R="255" G="255" B="255" A="255"/> -->
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_boss_soul/noise_tex b/soh/assets/custom/objects/object_boss_soul/noise_tex
new file mode 100644
index 0000000000000000000000000000000000000000..aaf4e331f15f797a3b1122b58c57b3767e66bc0f
GIT binary patch
literal 1116
zcma)5S&rmH5G^FcIk*X5eDlKxBf5LKx?JV<zND9QdQWd<yUM%Ec1`sZ(=$CnVgPXg
zj=~kV0y%;M5K<^Y%E*X}_g=16tJM$Re*fJUB>w&9uYY}ZlKyY|id266pZ|L)_-3^t
z{^e>VIz`u(`^dKQ%g2w`bDu%x{^r%I8%i=wg`pMy&>oT`wvAwTeqNf)RT*l1cl(+W
z4O3wm5FDBuCz%Uiv0TQ&*Cj#VNy!7F8h~R}KQ9uT<sn4bc%G_I6GT;0xy}7XAc0Xl
z9EM4G%%b!-&hwC40w?Q+Os^j}O=W1^_ib-q*JV+41F@s8a3Ua`shwm1mN7#QI_dF{
zC3#gJ4`q&_A_E=pJ4Q7D!zjqoEu1AT@}e}suH(73Ws=D>qZsmTyW<5x_pt+H9l4&R
zNV*$EuA#8o9Vc?s{bsv;)Pm5GMBTP6z|sQ5v2V)EX1(5QHV?AIOLmqzz`$u>%G@KX
zAm1U#Q1`b#-cdY`0zWyHA&UB`uvJOq1z;j%s@!gUchADQtBSnLBiuZ{ObIeINsvAl
zKp>GPf~X&wGE1T`oqzfLxlOSLfeJL;gpe$uxkXczdF&C0F2DWpa%!p~b}e0&RKxLI
z%T231NzwpnD1Z9&={oddS76r=ISB@l@A&(Ji`>A~6jZ+b`Tf)mbH67OcwTj)5Scc{
zK!pLxobvMFI`+$@k4zv-0AY+25fE@S6z$W{&&H?oX}(_jP*+sLjS^qu9wmr;+rj%{
zAEy-|@BH@CVH4;m%+kORMa{#BXIWla6lGO6!#wp(?ire4hv`1{96uqtA;^bi)3$9t
zo$9i#W2i_9OzJvM;xx4+nwI?IFm%JTj73}=LclXD2+J}FLmcRYNZGH3zUij9O&r(N
zIC{GkOwTb52m2bcW%RfiySf=qM4ckHqqfwB78L>#iUN&&l-#mE4Q;=iy9hjP)*G6p
zcAUU-vK4wNFT$)pja`3!_q^mt=2&vXvP9&Xrb8$zFlv{%J+_yZm#3OgWf__(%K$o#
zDT@+s;Ci{tRaQ>d>(W(+JVHPr6kC2^iS&+v`RR%Lt01bUX&g>t6B|4yh?4GjP~1K+
zRyjYNyVUUyr+Hf5EKR78{fMr0WJ>e{hl<lY9%I`(zIpc(8Bw{y=JoB(-A*<Qg`xfd
D(@X%Y

literal 0
HcmV?d00001

diff --git a/soh/assets/custom/objects/object_boss_soul/noise_tex_copy b/soh/assets/custom/objects/object_boss_soul/noise_tex_copy
new file mode 100644
index 0000000000000000000000000000000000000000..a6d6cf945e1bd755148a4d4dcbb52a7547cff5fe
GIT binary patch
literal 2140
zcma)-p;iK66oglkuRxQ?Q<%&agGb`VjYNupNF+ksxY6os*d%WB6=crmckY4&-2)5j
zKXYg1-v6g*n&##4`RV3#|Na=h@;ZI|_uuVl<^Asq(Az`PoL+ZL(=FG>ZM*At{kGk<
zoB8^f@B6V|^o#wtA9sD8b<1}4`pMPKy5;JSt6Sz1_+WFbkE_FGzU#q*&dPQML+<DJ
z%{=v|cod}ewhdqEa0Pvd&uY;+hyw7NxjIoiWl%rLqoa6|2&u%qigm(w@yQGoVaO$V
z>cGs(0eCWBAFIAB+{qL)^;J{#(*^U779F9Cck7oMvyi7MiAz1X(~0sQ40!#}eYwJr
z)w$3!#TWA08q`zmoX`3-iMlqu)Ut1KlNXALA#>#Hnt0flT_;zLs4+)eg_T-0z2Jv#
z==wz%=q<_ft_t{={8V=eviFAWeF#3h{wM3p2TJs82JFS)hc4641%p29MHs>^6Wz%(
z_P%H)*j`R&0VaIl)cQF&g7^Hu`S~RA&8l$%2Rru~ep=hPLVc9b!Em_yQawC50ZL_7
zkVWyC0UUWR_wL|gup?AW-<Z*=ELuMHmHta9j-4iEQEZf_QdX-t3_b}~FWF6GFPghE
zg<tn+-0FtDa-!BOgRZ)@TXAao*3b7#^(OBrku@j)P5RDNvMlZX`dps=BI#!s$_eLv
zGRr4^eX3I;@GVZhWXi0NIFm~U$e%i}1Z~&r3@QBIIjH`nBD(oay~NWo=WjZ}=18y1
Wt?)@tzwBYq`!Okk_S7_uJpBQRG6N+5

literal 0
HcmV?d00001

diff --git a/soh/assets/soh_assets.h b/soh/assets/soh_assets.h
index 4a207787a..16a2f5cd0 100644
--- a/soh/assets/soh_assets.h
+++ b/soh/assets/soh_assets.h
@@ -56,7 +56,7 @@ static const ALIGN_ASSET(2) char gTriforcePiece2DL[] = dgTriforcePiece2DL;
 #define dgTriforcePieceCompletedDL "__OTR__objects/object_triforce_completed/gTriforcePieceCompletedDL"
 static const ALIGN_ASSET(2) char gTriforcePieceCompletedDL[] = dgTriforcePieceCompletedDL;
 
-#define dgBossSoulSkullDL "__OTR__objects/object_gi_boss_soul/gGIBossSoulSkullDL"
+#define dgBossSoulSkullDL "__OTR__objects/object_boss_soul/gGIBossSoulSkullDL"
 static const ALIGN_ASSET(2) char gBossSoulSkullDL[] = dgBossSoulSkullDL;
 
 // overlays

From 05ba7874ae384cd6a8928830217d38edd9d0e02c Mon Sep 17 00:00:00 2001
From: Ralphie Morell <stratomaster64@gmail.com>
Date: Sun, 5 Nov 2023 13:42:31 -0500
Subject: [PATCH 026/230] does this work?

---
 .gitmodules | 2 +-
 OTRExporter | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 160000 OTRExporter

diff --git a/.gitmodules b/.gitmodules
index 7098d9d08..f5b67b3ab 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,4 +6,4 @@
 	url = https://github.com/harbourmasters/ZAPDTR
 [submodule "OTRExporter"]
 	path = OTRExporter
-	url = https://github.com/harbourmasters/OTRExporter
+	url = https://github.com/harbourmasters/OTRExporter/
diff --git a/OTRExporter b/OTRExporter
new file mode 160000
index 000000000..f1bc0a726
--- /dev/null
+++ b/OTRExporter
@@ -0,0 +1 @@
+Subproject commit f1bc0a726813d7e70ad471fdebd080e6fd77996a

From e90dc91767e56a00e9b8b89ad481b7327c505200 Mon Sep 17 00:00:00 2001
From: Ralphie Morell <stratomaster64@gmail.com>
Date: Sun, 5 Nov 2023 13:52:19 -0500
Subject: [PATCH 027/230] gee bill how come you had TWO master swords?

---
 soh/soh/Enhancements/randomizer/draw.cpp | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/draw.cpp b/soh/soh/Enhancements/randomizer/draw.cpp
index 466c492cb..a8dc5abd1 100644
--- a/soh/soh/Enhancements/randomizer/draw.cpp
+++ b/soh/soh/Enhancements/randomizer/draw.cpp
@@ -199,27 +199,6 @@ extern "C" void Randomizer_DrawMasterSword(PlayState* play, GetItemEntry* getIte
     CLOSE_DISPS(play->state.gfxCtx);
 }
 
-extern "C" void Randomizer_DrawMasterSword(PlayState* play, GetItemEntry* getItemEntry) {
-    OPEN_DISPS(play->state.gfxCtx);
-
-    Gfx_SetupDL_25Opa(play->state.gfxCtx);
-
-    gSPSegment(POLY_OPA_DISP++, 0x08,
-               (uintptr_t)Gfx_TwoTexScroll(play->state.gfxCtx, 0, 1 * (play->state.frames * 1),
-                                0 * (play->state.frames * 1), 32, 32, 1, 0 * (play->state.frames * 1),
-                                0 * (play->state.frames * 1), 32, 32));
-
-    Matrix_Scale(0.05f, 0.05f, 0.05f, MTXMODE_APPLY);
-    Matrix_RotateZ(2.1f, MTXMODE_APPLY);
-
-    gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
-
-    gSPDisplayList(POLY_OPA_DISP++, (Gfx*)object_toki_objects_DL_001BD0);
-    
-    CLOSE_DISPS(play->state.gfxCtx);
-}
-
 Gfx* Randomizer_GetTriforcePieceDL(uint8_t index) {
     switch (index) {
         case 1:

From 2698d453bb07a2933bc89574fcd4093797a27141 Mon Sep 17 00:00:00 2001
From: Christopher Leggett <chris@leggett.dev>
Date: Mon, 13 Nov 2023 13:25:37 -0500
Subject: [PATCH 028/230] More gap-bridging (#3323)

* Initial StaticData and RandoItem class definitions

* Initial implementation of RandoItem class.

* Rerranges RandoItem Constructor parameters

The parameters were rearranged for easy copy-paste from the GET_ITEM macro calls later on.

* Switches static data from map to static array.

Array is all that is needed, since the item list will be contiguous and indexed by the RandomizerGet Enum values.

* Defines part of the randomizer item list.

* Adds more item class instances to item_list.cpp

Up through bottles, many more items still to go.

* Adds song items

* Adds Maps and Compasses to the item_list

* Added Key Items to item_list

* Added Key Rings to item_list

* Added Dungeon Rewards to item_list

* Adds generic items and refills to item_list

* Adds shop items, triforce, and hints

Also added constructors that put the GET_ITEM_NONE data in for these items, since there is no corresponding GetItemEntry for them.

* Adds in the stages of progressive items

These are present for GetItemEntry purposes, and aren't really meant to be used in seed generation (unless we find a need for it later on.)

* Remove GetItemEntry data from progressive items

* Moves/adds function definitions to item/item_list

* Refactors GetItemEntry data

It's now a pointer to memory instantiated on the heap in the constructor. These are shared pointers so the memory is freed if any of the item instances get deconstructed (which they shouldn't but just in case.)

* Adds item class member for if item is progressive

* Removes unneeded stuff from initializer list macro

* Replaces relevant `uint32_t`s w/ `RandomizerGet`s

Also replaces calls to the ItemTable method with StaticData::RetrieveItem

* Switches our runtime code to use the new itemList.

* Changes just enough hint gen code to compile

* Initial Definition of Location Class

* Initial Implementation of Location

* Fixes some names and definitions.

* Extracts ActorID and SceneID enums to separate files.

This allows importing them without causing weird conflicts in cpp files when importing the z64scene.h and z64actor.h files directly. Now you can just import z64scene_enum.h and z64actor_enum.h instead. The two old files also import these new files so that existing setups still work as expected.

* Replaces the forward definitions with the new imports.

* Adds missing data for RandomizerCheckObjects.

* Definition and first entry of locationTable

* Added Mido's House Locations

* Added locations up through lost woods.

* Adds in Hyrule Field locations.

* Adds Lake Hylia locations

* Adds location name comments

* Adds Gerudo Valley Locations

* Adds Gerudo Fortress locations.

* Adds the Wasteland and Collosus locations

* Adds Market locations

* Adds Hyrule Castle locations.

* Adds Kakariko and Graveyard locations.

* Adds Death Mountain checks.

* Adds Goron City locations

* Adds Death Mountain Crater locations

* Adds Zora's River locations

* Added Zora's Domain Locations.

* Added Zora's Fountain locations

* Adds Lon Lon Ranch locations.

* Adds Deku Tree locations

* Adds Dodongo's Cavern Locations.

* Adds Jabu Jabu's Belly Locations

* Adds Forest Temple Locations

* Adds Fire Temple Locations

* Adds Water Temple Locations

* Added Spirit Temple Locations

* Some of shadow temple locations.

* Adds remaining Shadow Temple locations

* Fixes a leftover merge conflict

* Adds Bottom of the Well locations.

* Adds Ice Cavern locations

* Adds GTG locations.

* Adds Ganon's Castle and Tower locations

* Adds dungeon Gold Skulltula locations.

* Adds Overworld Gold Skulltula locations

* Adds dungeon reward locations

* Adds Heart Container Locations

* Adds Cutscene and Song locations

* Adds Cow locations

* Adds Shop locations.

* Adds hint locations

* Adds function for retrieving the Location data.

* Initial definition of ItemLocation structure for tracking runtime data

* First push on converting code to use new location definitions

* Changes hints to use the new tables

* Further conversion of hints to new definitions.

* Adds new Hint and Location IDs to area tables

* Moves areaTable to use new RandomizerRegion keys

* Removal of 3drando/item_location files.

* Uses new RandomizerRegion keys in entrance.cpp

* Final push for removal of massive keys.hpp enum

* Uses new SceneID Enum Values

* Remove RandomizerCheckObject structs in favor of new location list.

* Fix a few stragglers to successfully build

* Rename of RandoItem to just Item, but in the Rando namespace

* Adds static hints (Light Arrows, Altar text, etc) to the new Hint table.

* More hint related fixes/edits

* small fix for #include path

* Fix various miscellaneous issues related to seed gen and spoiler parsing.

* Handle progressive items correctly.

* Fixes some hint generation logic

* Fix a few GetItemEntry niche bugs.

* Adds missing shop GI Entries

* Formatting fixes

* small formatting fix

* Namespace StaticData under Rando

* Added a note about a potential use-after-free.

I confirmed the actual pointer in question isn't currently being used, but I added the note as a reminder to fix it later and/or as a warning to anyone who changes how the return value is used.

* Fixes missing location table entries

* Fixes LUS submodule and removes now-unused code

* Resolves weird duplicate definition issue

* Fix missing include

It was missed because not being included wasn't an issue on Windows.

* Fixes error present on Linux builds

* Fixes some issues with excluding locations

* Updates the Resolve Exclusion conflicts function

not sure if actually used, will look into that more later

* Removes some duplicate RGs

* More fixes of duplicate RG values.

* Fix a few duplication issues in the check tracker.

* Fix progressive bombchus.

* Minor typo fix, shouldn't really be affecting anything though

* Should fix some of the remaining check tracker issues.

* oops wrong boolean operator

* Fix skulltulas in the check tracker.

* oops, missing comma

* re-formatting of HintStone locations

* Fixes issue when picking up second Progressive Bullet Bag

* Hide bombchu bowling bombchus

* Fixes missed skullScene in location_list

* Reformats shop items

* Re-formats cow checks

* reformat song locations

* reformat "cutscene" checks

* reformat heart container locaitons

* reformat Boss/Dungeon reward checks

* Hide Triforce Completed if not playing Triforce Hunt

* Fixes incorrect chest param

* reformat GS Tokens locations and cuts down on duplicate data

* reformat Ganons Castle checks

* reformat GTG check locations

* Prevents Gift from Raoru from appearing in the check tracker

* more reformatting (botw, ice cavern, shadow temple)

* Should fix a couple more check tracker checks

* reformat spirit temple checks

* reformat water and fire temple checks

* fix RC_ZR_GS_ABOVE_BRIDGE flag typo

* reformat Forest Temple checks

* Fix RC_LW_TRADE_ODD_POTION in check tracker

* reformat child dungeon locations

* reformat overworld locations

* reformat item entries

* New Item Override system

* use new ItemOverrides and use ItemLocations table for getting items

* Saves/Loads directly from/to new ItemLocation table with overrides for traps

* Removes gSaveContext.itemLocations

* Don't load spoiler file on boot automatically.

Currently this means the old spoiler will have to be manually dropped or a new one generated in order to make a new rando file. Next I want to make it so that:
1. The Randomizer Quest button on the file select menu is always unlocked, even if a spoiler is not loaded.
2. If it's selected and a spoiler is not loaded, a menu will appear that asks if you want to generate a new seed or re-generate the previous one (if a spoiler file is present).
3. On choosing to generate a new one, you may also get an in-game menu to quickly apply a preset before generating (not sure if I'm going that far just yet).
4. After that, a seed is generated and you are taken back to the file select screen with the new file present.
5. If a seed is generated via the menu ahead of time, the CVar for loading the spoiler file will be set, but the spoiler file will not be parsed. All the data needed to actually play the randomizer at that point is
already in memory and in the save file (or at least I'll make it so that it is if it isn't already).
6. If a spoiler file is dropped over the window, the spoiler file is loaded, but it will only be parsed to get the seed and the settings, then the playthrough will be generated from scratch with that data. Thus allowing
for hints to be in the user's language of choice no matter what language the spoiler file was generated in.
7. Additionally, there will be a plandomizer mode that, if enabled, causes dragging and dropping a spoiler file to read the entire spoiler file instead of just the seed, and making a new file will use the data from there
instead of generating a new seed. This in particular may be expanded to have a "plando file" that contains more info than a spoiler file would normally have, such as cosmetic data and a more fleshed out
custom message syntax for various types of custom hints and whatnot. But that will be probably much later.

* Auto-gen rando seed when making a new rando file.

Also adds new logic for displaying the seed hash icons. Now, it is displayed in the following situations:
1. On the confirmation page when loading a rando save, the hash icons for *that save* are displayed.
2. On the name select screen after generating a seed, the hash icons for the seed that was just generated will be shown.
3. If you have dragged a spoiler log onto the window, the hash icons for that seed will be displayed while randomizer is selected on the quest select screen.
Currently the spoiler is just ignored, as the logic for pulling the settings from the spoiler file and regenerating the same seed has not been coded yet.

* Fix a few typos/bugs

* Partial conversion to new Settings/Option class

* Further conversion to new settings/options classes

* New settings struct (not fully working, need to wire it up to SaveManager)

* Move save files to new settings struct. Also fixes MQ options to match 3drando

* Fixes some spoilerfile related issues

* Cleans up now unused arrays

* Fixes some unhandled entries in parse settings switch case

* Reimplements parsing of settings on file drop to re-generate seeds

* Move merchantPrices into ItemLocation tables.

* Move hints to new struct

* Fixes a few seed gen bugs surrounding hints

* Fix treasure chest game.

* Relocate Entrance Shuffle code into ctx

* Move entrances to new context at runtime

* Remove now unused code from SaveContext and randomizer.cpp/.h

* Fix non-windows builds?

* Moves Dungeon Quests to new context

* Move trials into new context

* Whoops, forgot to construct the Trials in the context.

* Fixes accidental nullptr reference

* Fixes bug with saving MQ dungeons

* Implements plando mode and removes now unused code.

Largely untested, expect some bugfixes.

* prevent a multiple definition bug

* another attempt to fix the gSeedTextures multiple def error

* Fixes some minor hint issues from conflict resolution

* Some additional glue needed for merge

* Fixes another couple of miscellaneous issues/inconsistencies.

* A few french corrections

* Makes CVar gRandomizeWarpSongText match the checkbox default value.
---
 soh/include/z64save.h                         |   38 -
 soh/soh/Enhancements/enemyrandomizer.cpp      |    3 +-
 soh/soh/Enhancements/mods.cpp                 |    3 +-
 .../randomizer/3drando/dungeon.cpp            |  682 -----
 .../randomizer/3drando/dungeon.hpp            |  109 -
 .../randomizer/3drando/entrance.cpp           | 1300 --------
 .../randomizer/3drando/entrance.hpp           |  289 --
 .../Enhancements/randomizer/3drando/fill.cpp  |  167 +-
 .../randomizer/3drando/hint_list.cpp          |   93 +-
 .../Enhancements/randomizer/3drando/hints.cpp |  367 ++-
 .../Enhancements/randomizer/3drando/hints.hpp |   35 +-
 .../randomizer/3drando/item_pool.cpp          |  327 +-
 .../randomizer/3drando/item_pool.hpp          |    1 -
 .../randomizer/3drando/location_access.cpp    |   49 +-
 .../randomizer/3drando/location_access.hpp    |   36 +-
 .../locacc_bottom_of_the_well.cpp             |   48 +-
 .../location_access/locacc_castle_town.cpp    |   26 +-
 .../location_access/locacc_death_mountain.cpp |   35 +-
 .../location_access/locacc_deku_tree.cpp      |   30 +-
 .../locacc_dodongos_cavern.cpp                |   40 +-
 .../location_access/locacc_fire_temple.cpp    |   54 +-
 .../location_access/locacc_forest_temple.cpp  |   42 +-
 .../location_access/locacc_ganons_castle.cpp  |   84 +-
 .../locacc_gerudo_training_grounds.cpp        |   30 +-
 .../location_access/locacc_gerudo_valley.cpp  |   28 +-
 .../location_access/locacc_hyrule_field.cpp   |   10 +-
 .../location_access/locacc_ice_cavern.cpp     |   20 +-
 .../locacc_jabujabus_belly.cpp                |   28 +-
 .../location_access/locacc_kakariko.cpp       |   26 +-
 .../location_access/locacc_lost_woods.cpp     |   28 +-
 .../location_access/locacc_shadow_temple.cpp  |   66 +-
 .../location_access/locacc_spirit_temple.cpp  |   92 +-
 .../location_access/locacc_water_temple.cpp   |   60 +-
 .../location_access/locacc_zoras_domain.cpp   |   18 +-
 .../Enhancements/randomizer/3drando/logic.cpp |  151 +-
 .../Enhancements/randomizer/3drando/menu.cpp  |   24 +-
 .../randomizer/3drando/playthrough.cpp        |   32 +-
 .../randomizer/3drando/rando_main.cpp         |    6 +-
 .../randomizer/3drando/settings.cpp           | 2652 -----------------
 .../randomizer/3drando/settings.hpp           | 1179 --------
 .../Enhancements/randomizer/3drando/shops.cpp |  212 +-
 .../randomizer/3drando/spoiler_log.cpp        |  313 +-
 .../randomizer/3drando/starting_inventory.cpp |  199 +-
 .../Enhancements/randomizer/3drando/text.hpp  |   18 +
 .../Enhancements/randomizer/3drando/trial.cpp |   26 -
 .../Enhancements/randomizer/3drando/trial.hpp |   51 -
 soh/soh/Enhancements/randomizer/context.cpp   |  426 ++-
 soh/soh/Enhancements/randomizer/context.h     |   56 +-
 soh/soh/Enhancements/randomizer/dungeon.cpp   |  783 +++++
 soh/soh/Enhancements/randomizer/dungeon.h     |   96 +
 soh/soh/Enhancements/randomizer/entrance.cpp  | 1597 ++++++++++
 soh/soh/Enhancements/randomizer/entrance.h    |  151 +
 soh/soh/Enhancements/randomizer/hint.cpp      |    6 +-
 soh/soh/Enhancements/randomizer/hint.h        |   11 +-
 soh/soh/Enhancements/randomizer/item.cpp      |   43 +-
 soh/soh/Enhancements/randomizer/item.h        |    8 +-
 soh/soh/Enhancements/randomizer/item_list.cpp |    2 +-
 .../Enhancements/randomizer/item_location.cpp |   46 +-
 .../Enhancements/randomizer/item_location.h   |   53 +-
 .../Enhancements/randomizer/item_override.cpp |   30 +
 .../Enhancements/randomizer/item_override.h   |   23 +
 soh/soh/Enhancements/randomizer/location.cpp  |    1 +
 soh/soh/Enhancements/randomizer/option.cpp    |  144 +
 soh/soh/Enhancements/randomizer/option.h      |  100 +
 soh/soh/Enhancements/randomizer/rando_hash.h  |    6 +-
 .../Enhancements/randomizer/randomizer.cpp    | 1560 ++--------
 soh/soh/Enhancements/randomizer/randomizer.h  |   40 +-
 .../Enhancements/randomizer/randomizerTypes.h |  139 +-
 .../randomizer/randomizer_check_tracker.cpp   |   28 +-
 .../randomizer/randomizer_entrance.c          |   15 +-
 .../randomizer_entrance_tracker.cpp           |   21 +-
 soh/soh/Enhancements/randomizer/savefile.cpp  |    2 +-
 soh/soh/Enhancements/randomizer/settings.cpp  | 1798 +++++++++++
 soh/soh/Enhancements/randomizer/settings.h    |   49 +
 soh/soh/Enhancements/randomizer/trial.cpp     |   82 +
 soh/soh/Enhancements/randomizer/trial.h       |   47 +
 soh/soh/OTRGlobals.cpp                        |   83 +-
 soh/soh/OTRGlobals.h                          |   18 +-
 soh/soh/SaveManager.cpp                       |  434 ++-
 soh/soh/SaveManager.h                         |    1 +
 soh/soh/SohMenuBar.cpp                        |    8 +
 soh/src/code/z_sram.c                         |    3 +-
 .../gamestates/ovl_file_choose/file_choose.h  |    1 +
 .../ovl_file_choose/z_file_choose.c           |  201 +-
 .../ovl_file_choose/z_file_nameset_PAL.c      |    4 +
 85 files changed, 7692 insertions(+), 9551 deletions(-)
 delete mode 100644 soh/soh/Enhancements/randomizer/3drando/dungeon.cpp
 delete mode 100644 soh/soh/Enhancements/randomizer/3drando/dungeon.hpp
 delete mode 100644 soh/soh/Enhancements/randomizer/3drando/entrance.cpp
 delete mode 100644 soh/soh/Enhancements/randomizer/3drando/entrance.hpp
 delete mode 100644 soh/soh/Enhancements/randomizer/3drando/settings.cpp
 delete mode 100644 soh/soh/Enhancements/randomizer/3drando/settings.hpp
 delete mode 100644 soh/soh/Enhancements/randomizer/3drando/trial.cpp
 delete mode 100644 soh/soh/Enhancements/randomizer/3drando/trial.hpp
 create mode 100644 soh/soh/Enhancements/randomizer/dungeon.cpp
 create mode 100644 soh/soh/Enhancements/randomizer/dungeon.h
 create mode 100644 soh/soh/Enhancements/randomizer/entrance.cpp
 create mode 100644 soh/soh/Enhancements/randomizer/entrance.h
 create mode 100644 soh/soh/Enhancements/randomizer/item_override.cpp
 create mode 100644 soh/soh/Enhancements/randomizer/item_override.h
 create mode 100644 soh/soh/Enhancements/randomizer/option.cpp
 create mode 100644 soh/soh/Enhancements/randomizer/option.h
 create mode 100644 soh/soh/Enhancements/randomizer/settings.cpp
 create mode 100644 soh/soh/Enhancements/randomizer/settings.h
 create mode 100644 soh/soh/Enhancements/randomizer/trial.cpp
 create mode 100644 soh/soh/Enhancements/randomizer/trial.h

diff --git a/soh/include/z64save.h b/soh/include/z64save.h
index 9458f28c7..e3d1dd8d1 100644
--- a/soh/include/z64save.h
+++ b/soh/include/z64save.h
@@ -147,11 +147,6 @@ typedef struct {
     /* 0x24 */ s32 tempCollectFlags;
 } FaroresWindData; // size = 0x28
 
-typedef struct {
-    RandomizerCheck check;
-    RandomizerGetData get;
-} ItemLocationRando;
-
 typedef struct {
     RandomizerCheck check;
     RandomizerCheck hintedCheck;
@@ -161,11 +156,6 @@ typedef struct {
     char hintText[200];
 } HintLocationRando;
 
-typedef struct {
-    RandomizerSettingKey key;
-    u8 value;
-} RandoSetting;
-
 typedef struct {
     /* 0x0000 */ s32 entranceIndex; // start of `save` substruct, originally called "memory"
     /* 0x0004 */ s32 linkAge; // 0: Adult; 1: Child (see enum `LinkAge`)
@@ -286,7 +276,6 @@ typedef struct {
     /*        */ uint8_t questId;
     /*        */ uint32_t isBossRushPaused;
     /*        */ uint8_t bossRushOptions[BOSSRUSH_OPTIONS_AMOUNT];
-    /*        */ u8 mqDungeonCount;
     /*        */ u8 pendingIceTrapCount;
     /*        */ SohStats sohStats;
     /*        */ FaroresWindData backupFW;
@@ -294,33 +283,6 @@ typedef struct {
     // #endregion
     // #region SOH [Randomizer]
     // Upstream TODO: Move these to their own struct or name to more obviously specific to Randomizer
-    /*        */ RandoSetting randoSettings[300];
-    /*        */ ItemLocationRando itemLocations[RC_MAX];
-    /*        */ HintLocationRando hintLocations[50];
-    /*        */ EntranceOverride entranceOverrides[ENTRANCE_OVERRIDES_MAX_COUNT];
-    /*        */ char childAltarText[250];
-    /*        */ char adultAltarText[750];
-    /*        */ RandomizerCheck rewardCheck[9];
-    /*        */ char ganonHintText[300];
-    /*        */ char gregHintText[250];
-    /*        */ char ganonText[250];
-    /*        */ char dampeText[150];
-    /*        */ char sheikText[200];
-    /*        */ char sariaText[150];
-    /*        */ char warpMinuetText[100];
-    /*        */ char warpBoleroText[100];
-    /*        */ char warpSerenadeText[100];
-    /*        */ char warpRequiemText[100];
-    /*        */ char warpNocturneText[100];
-    /*        */ char warpPreludeText[100];
-    /*        */ RandomizerCheck masterSwordHintCheck;
-    /*        */ RandomizerCheck lightArrowHintCheck;
-    /*        */ RandomizerCheck sariaCheck;
-    /*        */ RandomizerCheck gregCheck;
-    /*        */ RandomizerCheck dampeCheck;
-    /*        */ char inputSeed[1024];
-    /*        */ u32 finalSeed;
-    /*        */ u8 seedIcons[5];
     /*        */ u16 randomizerInf[10];
     /*        */ u16 adultTradeItems;
     /*        */ u8 triforcePiecesCollected;
diff --git a/soh/soh/Enhancements/enemyrandomizer.cpp b/soh/soh/Enhancements/enemyrandomizer.cpp
index a89400844..65dfb5f0d 100644
--- a/soh/soh/Enhancements/enemyrandomizer.cpp
+++ b/soh/soh/Enhancements/enemyrandomizer.cpp
@@ -2,6 +2,7 @@
 #include "functions.h"
 #include "macros.h"
 #include "soh/Enhancements/randomizer/3drando/random.hpp"
+#include "soh/Enhancements/randomizer/context.h"
 #include "soh/Enhancements/enhancementTypes.h"
 #include "variables.h"
 
@@ -234,7 +235,7 @@ extern "C" uint8_t GetRandomizedEnemy(PlayState* play, int16_t *actorId, f32 *po
 
 EnemyEntry GetRandomizedEnemyEntry(uint32_t seed) {
     if (CVarGetInteger("gRandomizedEnemies", ENEMY_RANDOMIZER_OFF) == ENEMY_RANDOMIZER_RANDOM_SEEDED) {
-        uint32_t finalSeed = seed + (IS_RANDO ? gSaveContext.finalSeed : gSaveContext.sohStats.fileCreatedAt);
+        uint32_t finalSeed = seed + (IS_RANDO ? Rando::Context::GetInstance()->GetSettings()->GetSeed() : gSaveContext.sohStats.fileCreatedAt);
         Random_Init(finalSeed);
     }
 
diff --git a/soh/soh/Enhancements/mods.cpp b/soh/soh/Enhancements/mods.cpp
index a4a654f84..73110a7d6 100644
--- a/soh/soh/Enhancements/mods.cpp
+++ b/soh/soh/Enhancements/mods.cpp
@@ -604,7 +604,8 @@ void UpdateMirrorModeState(int32_t sceneNum) {
                         (sceneNum == SCENE_GANON_BOSS);
 
     if (mirroredMode == MIRRORED_WORLD_RANDOM_SEEDED || mirroredMode == MIRRORED_WORLD_DUNGEONS_RANDOM_SEEDED) {
-        uint32_t seed = sceneNum + (IS_RANDO ? gSaveContext.finalSeed : gSaveContext.sohStats.fileCreatedAt);
+        uint32_t seed = sceneNum + (IS_RANDO ? Rando::Context::GetInstance()->GetSettings()->GetSeed()
+                                             : gSaveContext.sohStats.fileCreatedAt);
         Random_Init(seed);
     }
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/dungeon.cpp b/soh/soh/Enhancements/randomizer/3drando/dungeon.cpp
deleted file mode 100644
index 511217036..000000000
--- a/soh/soh/Enhancements/randomizer/3drando/dungeon.cpp
+++ /dev/null
@@ -1,682 +0,0 @@
-#include "dungeon.hpp"
-
-#include "category.hpp"
-#include "pool_functions.hpp"
-#include "../context.h"
-#include "../static_data.h"
-
-namespace Dungeon {
-
-DungeonInfo::DungeonInfo(std::string name_, RandomizerHintTextKey hintKey_, RandomizerGet map_, RandomizerGet compass_,
-                         RandomizerGet smallKey_, RandomizerGet keyRing_, RandomizerGet bossKey_,
-                         uint8_t vanillaKeyCount_, uint8_t mqKeyCount_, std::vector<RandomizerCheck> vanillaLocations_,
-                         std::vector<RandomizerCheck> mqLocations_, std::vector<RandomizerCheck> sharedLocations_,
-                         std::vector<RandomizerCheck> bossRoomLocations_)
-    : name(std::move(name_)), hintKey(hintKey_), map(map_), compass(compass_), smallKey(smallKey_), keyRing(keyRing_),
-      bossKey(bossKey_), vanillaKeyCount(vanillaKeyCount_), mqKeyCount(mqKeyCount_),
-      vanillaLocations(std::move(vanillaLocations_)), mqLocations(std::move(mqLocations_)),
-      sharedLocations(std::move(sharedLocations_)), bossRoomLocations(std::move(bossRoomLocations_)) {
-}
-
-DungeonInfo::~DungeonInfo() = default;
-
-RandomizerHintTextKey DungeonInfo::GetHintKey() const {
-    return hintKey;
-}
-
-RandomizerGet DungeonInfo::GetSmallKey() const {
-    return smallKey;
-}
-
-RandomizerGet DungeonInfo::GetKeyRing() const {
-    return keyRing;
-}
-
-RandomizerGet DungeonInfo::GetMap() const {
-    return map;
-}
-
-RandomizerGet DungeonInfo::GetCompass() const {
-    return compass;
-}
-
-RandomizerGet DungeonInfo::GetBossKey() const {
-    return bossKey;
-}
-
-void DungeonInfo::PlaceVanillaMap() {
-    if (map == RG_NONE) {
-        return;
-    }
-
-    auto dungeonLocations = GetDungeonLocations();
-    auto mapLocation = FilterFromPool(dungeonLocations, [](const RandomizerCheck loc) {
-        return Rando::StaticData::GetLocation(loc)->IsCategory(Category::cVanillaMap);
-    })[0];
-    Rando::Context::GetInstance()->PlaceItemInLocation(mapLocation, map);
-}
-
-void DungeonInfo::PlaceVanillaCompass() {
-    if (compass == RG_NONE) {
-        return;
-    }
-
-    auto dungeonLocations = GetDungeonLocations();
-    auto compassLocation = FilterFromPool(dungeonLocations, [](const RandomizerCheck loc) {
-        return Rando::StaticData::GetLocation(loc)->IsCategory(Category::cVanillaCompass);
-    })[0];
-    Rando::Context::GetInstance()->PlaceItemInLocation(compassLocation, compass);
-}
-
-void DungeonInfo::PlaceVanillaBossKey() {
-    if (bossKey == RG_NONE || bossKey == RG_GANONS_CASTLE_BOSS_KEY) {
-        return;
-    }
-
-    auto dungeonLocations = GetDungeonLocations();
-    auto bossKeyLocation = FilterFromPool(dungeonLocations, [](const RandomizerCheck loc) {
-        return Rando::StaticData::GetLocation(loc)->IsCategory(Category::cVanillaBossKey);
-    })[0];
-    Rando::Context::GetInstance()->PlaceItemInLocation(bossKeyLocation, bossKey);
-}
-
-void DungeonInfo::PlaceVanillaSmallKeys() {
-    if (smallKey == RG_NONE) {
-        return;
-    }
-
-    auto dungeonLocations = GetDungeonLocations();
-    auto smallKeyLocations = FilterFromPool(dungeonLocations, [](const RandomizerCheck loc) {
-        return Rando::StaticData::GetLocation(loc)->IsCategory(Category::cVanillaSmallKey);
-    });
-    for (auto location : smallKeyLocations) {
-        Rando::Context::GetInstance()->PlaceItemInLocation(location, smallKey);
-    }
-}
-
-// Gets the chosen dungeon locations for a playthrough (so either MQ or Vanilla)
-std::vector<RandomizerCheck> DungeonInfo::GetDungeonLocations() const {
-    auto locations = masterQuest ? mqLocations : vanillaLocations;
-    AddElementsToPool(locations, sharedLocations);
-    AddElementsToPool(locations, bossRoomLocations);
-    return locations;
-}
-
-// Gets all dungeon locations (MQ + Vanilla)
-std::vector<RandomizerCheck> DungeonInfo::GetEveryLocation() const {
-    auto locations = vanillaLocations;
-    AddElementsToPool(locations, mqLocations);
-    AddElementsToPool(locations, sharedLocations);
-    AddElementsToPool(locations, bossRoomLocations);
-    return locations;
-}
-
-DungeonInfo DekuTree =
-    DungeonInfo("Deku Tree", RHT_DEKU_TREE, RG_DEKU_TREE_MAP, RG_DEKU_TREE_COMPASS, RG_NONE, RG_NONE, RG_NONE, 0, 0,
-                {
-                    // Vanilla Locations
-                    RC_DEKU_TREE_MAP_CHEST,
-                    RC_DEKU_TREE_COMPASS_CHEST,
-                    RC_DEKU_TREE_COMPASS_ROOM_SIDE_CHEST,
-                    RC_DEKU_TREE_BASEMENT_CHEST,
-                    RC_DEKU_TREE_SLINGSHOT_CHEST,
-                    RC_DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST,
-                    RC_DEKU_TREE_GS_BASEMENT_BACK_ROOM,
-                    RC_DEKU_TREE_GS_BASEMENT_GATE,
-                    RC_DEKU_TREE_GS_BASEMENT_VINES,
-                    RC_DEKU_TREE_GS_COMPASS_ROOM,
-                },
-                {
-                    // MQ Locations
-                    RC_DEKU_TREE_MQ_MAP_CHEST,
-                    RC_DEKU_TREE_MQ_COMPASS_CHEST,
-                    RC_DEKU_TREE_MQ_SLINGSHOT_CHEST,
-                    RC_DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST,
-                    RC_DEKU_TREE_MQ_BASEMENT_CHEST,
-                    RC_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST,
-                    RC_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST,
-                    RC_DEKU_TREE_MQ_DEKU_SCRUB,
-                    RC_DEKU_TREE_MQ_GS_LOBBY,
-                    RC_DEKU_TREE_MQ_GS_COMPASS_ROOM,
-                    RC_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM,
-                    RC_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM,
-                },
-                {},
-                {
-                    // Boss Room Locations
-                    RC_DEKU_TREE_QUEEN_GOHMA_HEART,
-                    RC_QUEEN_GOHMA,
-                });
-
-DungeonInfo DodongosCavern = DungeonInfo("Dodongo's Cavern", RHT_DODONGOS_CAVERN, RG_DODONGOS_CAVERN_MAP,
-                                         RG_DODONGOS_CAVERN_COMPASS, RG_NONE, RG_NONE, RG_NONE, 0, 0,
-                                         {
-                                             // Vanilla Locations
-                                             RC_DODONGOS_CAVERN_MAP_CHEST,
-                                             RC_DODONGOS_CAVERN_COMPASS_CHEST,
-                                             RC_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST,
-                                             RC_DODONGOS_CAVERN_BOMB_BAG_CHEST,
-                                             RC_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST,
-                                             RC_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY,
-                                             RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS,
-                                             RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,
-                                             RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT,
-                                             RC_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS,
-                                             RC_DODONGOS_CAVERN_GS_SCARECROW,
-                                             RC_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS,
-                                             RC_DODONGOS_CAVERN_GS_BACK_ROOM,
-                                             RC_DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS,
-                                         },
-                                         {
-                                             // MQ Locations
-                                             RC_DODONGOS_CAVERN_MQ_MAP_CHEST,
-                                             RC_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST,
-                                             RC_DODONGOS_CAVERN_MQ_COMPASS_CHEST,
-                                             RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST,
-                                             RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST,
-                                             RC_DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST,
-                                             RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,
-                                             RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT,
-                                             RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,
-                                             RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS,
-                                             RC_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM,
-                                             RC_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM,
-                                             RC_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM,
-                                             RC_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM,
-                                             RC_DODONGOS_CAVERN_MQ_GS_BACK_AREA,
-                                         },
-                                         {},
-                                         {
-                                             // Boss Room Locations
-                                             RC_DODONGOS_CAVERN_BOSS_ROOM_CHEST,
-                                             RC_DODONGOS_CAVERN_KING_DODONGO_HEART,
-                                             RC_KING_DODONGO,
-                                         });
-
-DungeonInfo JabuJabusBelly = DungeonInfo("Jabu Jabu's Belly", RHT_JABU_JABUS_BELLY, RG_JABU_JABUS_BELLY_MAP,
-                                         RG_JABU_JABUS_BELLY_COMPASS, RG_NONE, RG_NONE, RG_NONE, 0, 0,
-                                         {
-                                             // Vanilla Locations
-                                             RC_JABU_JABUS_BELLY_MAP_CHEST,
-                                             RC_JABU_JABUS_BELLY_COMPASS_CHEST,
-                                             RC_JABU_JABUS_BELLY_BOOMERANG_CHEST,
-                                             RC_JABU_JABUS_BELLY_DEKU_SCRUB,
-                                             RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER,
-                                             RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER,
-                                             RC_JABU_JABUS_BELLY_GS_NEAR_BOSS,
-                                             RC_JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM,
-                                         },
-                                         {
-                                             // MQ Locations
-                                             RC_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST,
-                                             RC_JABU_JABUS_BELLY_MQ_MAP_CHEST,
-                                             RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST,
-                                             RC_JABU_JABUS_BELLY_MQ_COMPASS_CHEST,
-                                             RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST,
-                                             RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST,
-                                             RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST,
-                                             RC_JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST,
-                                             RC_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST,
-                                             RC_JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST,
-                                             RC_JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST,
-                                             RC_JABU_JABUS_BELLY_MQ_COW,
-                                             RC_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM,
-                                             RC_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM,
-                                             RC_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM,
-                                             RC_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS,
-                                         },
-                                         {},
-                                         {
-                                             // Boss Room Locations
-                                             RC_JABU_JABUS_BELLY_BARINADE_HEART,
-                                             RC_BARINADE,
-                                         });
-
-DungeonInfo ForestTemple =
-    DungeonInfo("Forest Temple", RHT_FOREST_TEMPLE, RG_FOREST_TEMPLE_MAP, RG_FOREST_TEMPLE_COMPASS,
-                RG_FOREST_TEMPLE_SMALL_KEY, RG_FOREST_TEMPLE_KEY_RING, RG_FOREST_TEMPLE_BOSS_KEY, 5, 6,
-                {
-                    // Vanilla Locations
-                    RC_FOREST_TEMPLE_FIRST_ROOM_CHEST,
-                    RC_FOREST_TEMPLE_FIRST_STALFOS_CHEST,
-                    RC_FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST,
-                    RC_FOREST_TEMPLE_MAP_CHEST,
-                    RC_FOREST_TEMPLE_WELL_CHEST,
-                    RC_FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST,
-                    RC_FOREST_TEMPLE_EYE_SWITCH_CHEST,
-                    RC_FOREST_TEMPLE_BOSS_KEY_CHEST,
-                    RC_FOREST_TEMPLE_FLOORMASTER_CHEST,
-                    RC_FOREST_TEMPLE_BOW_CHEST,
-                    RC_FOREST_TEMPLE_RED_POE_CHEST,
-                    RC_FOREST_TEMPLE_BLUE_POE_CHEST,
-                    RC_FOREST_TEMPLE_BASEMENT_CHEST,
-                    RC_FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD,
-                    RC_FOREST_TEMPLE_GS_FIRST_ROOM,
-                    RC_FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD,
-                    RC_FOREST_TEMPLE_GS_LOBBY,
-                    RC_FOREST_TEMPLE_GS_BASEMENT,
-                },
-                {
-                    // MQ Locations
-                    RC_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST,
-                    RC_FOREST_TEMPLE_MQ_WOLFOS_CHEST,
-                    RC_FOREST_TEMPLE_MQ_BOW_CHEST,
-                    RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST,
-                    RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST,
-                    RC_FOREST_TEMPLE_MQ_WELL_CHEST,
-                    RC_FOREST_TEMPLE_MQ_MAP_CHEST,
-                    RC_FOREST_TEMPLE_MQ_COMPASS_CHEST,
-                    RC_FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST,
-                    RC_FOREST_TEMPLE_MQ_BASEMENT_CHEST,
-                    RC_FOREST_TEMPLE_MQ_REDEAD_CHEST,
-                    RC_FOREST_TEMPLE_MQ_BOSS_KEY_CHEST,
-                    RC_FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY,
-                    RC_FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM,
-                    RC_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD,
-                    RC_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD,
-                    RC_FOREST_TEMPLE_MQ_GS_WELL,
-                },
-                {},
-                {
-                    // Boss Room Locations
-                    RC_FOREST_TEMPLE_PHANTOM_GANON_HEART,
-                    RC_PHANTOM_GANON,
-                });
-
-DungeonInfo FireTemple = DungeonInfo("Fire Temple", RHT_FIRE_TEMPLE, RG_FIRE_TEMPLE_MAP, RG_FIRE_TEMPLE_COMPASS,
-                                     RG_FIRE_TEMPLE_SMALL_KEY, RG_FIRE_TEMPLE_KEY_RING, RG_FIRE_TEMPLE_BOSS_KEY, 8, 5,
-                                     {
-                                         // Vanilla Locations
-                                         RC_FIRE_TEMPLE_NEAR_BOSS_CHEST,
-                                         RC_FIRE_TEMPLE_FLARE_DANCER_CHEST,
-                                         RC_FIRE_TEMPLE_BOSS_KEY_CHEST,
-                                         RC_FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST,
-                                         RC_FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST,
-                                         RC_FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST,
-                                         RC_FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST,
-                                         RC_FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST,
-                                         RC_FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST,
-                                         RC_FIRE_TEMPLE_SCARECROW_CHEST,
-                                         RC_FIRE_TEMPLE_MAP_CHEST,
-                                         RC_FIRE_TEMPLE_COMPASS_CHEST,
-                                         RC_FIRE_TEMPLE_HIGHEST_GORON_CHEST,
-                                         RC_FIRE_TEMPLE_MEGATON_HAMMER_CHEST,
-                                         RC_FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM,
-                                         RC_FIRE_TEMPLE_GS_BOSS_KEY_LOOP,
-                                         RC_FIRE_TEMPLE_GS_BOULDER_MAZE,
-                                         RC_FIRE_TEMPLE_GS_SCARECROW_TOP,
-                                         RC_FIRE_TEMPLE_GS_SCARECROW_CLIMB,
-                                     },
-                                     {
-                                         // MQ Locations
-                                         RC_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST,
-                                         RC_FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST,
-                                         RC_FIRE_TEMPLE_MQ_COMPASS_CHEST,
-                                         RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST,
-                                         RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST,
-                                         RC_FIRE_TEMPLE_MQ_CHEST_ON_FIRE,
-                                         RC_FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST,
-                                         RC_FIRE_TEMPLE_MQ_MAP_CHEST,
-                                         RC_FIRE_TEMPLE_MQ_BOSS_KEY_CHEST,
-                                         RC_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST,
-                                         RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST,
-                                         RC_FIRE_TEMPLE_MQ_FREESTANDING_KEY,
-                                         RC_FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE,
-                                         RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER,
-                                         RC_FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR,
-                                         RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM,
-                                         RC_FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE,
-                                     },
-                                     {},
-                                     {
-                                         // Boos Room Locations
-                                         RC_FIRE_TEMPLE_VOLVAGIA_HEART,
-                                         RC_VOLVAGIA,
-                                     });
-
-DungeonInfo WaterTemple =
-    DungeonInfo("Water Temple", RHT_WATER_TEMPLE, RG_WATER_TEMPLE_MAP, RG_WATER_TEMPLE_COMPASS,
-                RG_WATER_TEMPLE_SMALL_KEY, RG_WATER_TEMPLE_KEY_RING, RG_WATER_TEMPLE_BOSS_KEY, 6, 2,
-                {
-                    // Vanilla Locations
-                    RC_WATER_TEMPLE_MAP_CHEST,
-                    RC_WATER_TEMPLE_COMPASS_CHEST,
-                    RC_WATER_TEMPLE_TORCHES_CHEST,
-                    RC_WATER_TEMPLE_DRAGON_CHEST,
-                    RC_WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST,
-                    RC_WATER_TEMPLE_CENTRAL_PILLAR_CHEST,
-                    RC_WATER_TEMPLE_CRACKED_WALL_CHEST,
-                    RC_WATER_TEMPLE_BOSS_KEY_CHEST,
-                    RC_WATER_TEMPLE_LONGSHOT_CHEST,
-                    RC_WATER_TEMPLE_RIVER_CHEST,
-                    RC_WATER_TEMPLE_GS_BEHIND_GATE,
-                    RC_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM,
-                    RC_WATER_TEMPLE_GS_CENTRAL_PILLAR,
-                    RC_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST,
-                    RC_WATER_TEMPLE_GS_RIVER,
-                },
-                {
-                    // MQ Locations
-                    RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST,
-                    RC_WATER_TEMPLE_MQ_BOSS_KEY_CHEST,
-                    RC_WATER_TEMPLE_MQ_LONGSHOT_CHEST,
-                    RC_WATER_TEMPLE_MQ_COMPASS_CHEST,
-                    RC_WATER_TEMPLE_MQ_MAP_CHEST,
-                    RC_WATER_TEMPLE_MQ_FREESTANDING_KEY,
-                    RC_WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH,
-                    RC_WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA,
-                    RC_WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY,
-                    RC_WATER_TEMPLE_MQ_GS_RIVER,
-                    RC_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH,
-                },
-                {},
-                {
-                    // Boss Room Locations
-                    RC_WATER_TEMPLE_MORPHA_HEART,
-                    RC_MORPHA,
-                });
-
-DungeonInfo SpiritTemple =
-    DungeonInfo("Spirit Temple", RHT_SPIRIT_TEMPLE, RG_SPIRIT_TEMPLE_MAP, RG_SPIRIT_TEMPLE_COMPASS,
-                RG_SPIRIT_TEMPLE_SMALL_KEY, RG_SPIRIT_TEMPLE_KEY_RING, RG_SPIRIT_TEMPLE_BOSS_KEY, 5, 7,
-                {
-                    // Vanilla Locations
-                    RC_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST,
-                    RC_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST,
-                    RC_SPIRIT_TEMPLE_COMPASS_CHEST,
-                    RC_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST,
-                    RC_SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST,
-                    RC_SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST,
-                    RC_SPIRIT_TEMPLE_MAP_CHEST,
-                    RC_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST,
-                    RC_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST,
-                    RC_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST,
-                    RC_SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST,
-                    RC_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST,
-                    RC_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST,
-                    RC_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST,
-                    RC_SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST,
-                    RC_SPIRIT_TEMPLE_BOSS_KEY_CHEST,
-                    RC_SPIRIT_TEMPLE_TOPMOST_CHEST,
-                    RC_SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM,
-                    RC_SPIRIT_TEMPLE_GS_BOULDER_ROOM,
-                    RC_SPIRIT_TEMPLE_GS_LOBBY,
-                    RC_SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM,
-                    RC_SPIRIT_TEMPLE_GS_METAL_FENCE,
-                },
-                {
-                    // MQ Locations
-                    RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST,
-                    RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST,
-                    RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST,
-                    RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST,
-                    RC_SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST,
-                    RC_SPIRIT_TEMPLE_MQ_MAP_CHEST,
-                    RC_SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST,
-                    RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST,
-                    RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST,
-                    RC_SPIRIT_TEMPLE_MQ_COMPASS_CHEST,
-                    RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST,
-                    RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST,
-                    RC_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST,
-                    RC_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST,
-                    RC_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST,
-                    RC_SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST,
-                    RC_SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST,
-                    RC_SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST,
-                    RC_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST,
-                    RC_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST,
-                    RC_SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM,
-                    RC_SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM,
-                    RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST,
-                    RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH,
-                    RC_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM,
-                },
-                {
-                    // Shared Locations
-                    RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST,
-                    RC_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST,
-                },
-                {
-                    // Boss Room Locations
-                    RC_SPIRIT_TEMPLE_TWINROVA_HEART,
-                    RC_TWINROVA,
-                });
-
-DungeonInfo ShadowTemple =
-    DungeonInfo("Shadow Temple", RHT_SHADOW_TEMPLE, RG_SHADOW_TEMPLE_MAP, RG_SHADOW_TEMPLE_COMPASS,
-                RG_SHADOW_TEMPLE_SMALL_KEY, RG_SHADOW_TEMPLE_KEY_RING, RG_SHADOW_TEMPLE_BOSS_KEY, 5, 6,
-                {
-                    // Vanilla Locations
-                    RC_SHADOW_TEMPLE_MAP_CHEST,
-                    RC_SHADOW_TEMPLE_HOVER_BOOTS_CHEST,
-                    RC_SHADOW_TEMPLE_COMPASS_CHEST,
-                    RC_SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST,
-                    RC_SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST,
-                    RC_SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST,
-                    RC_SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST,
-                    RC_SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST,
-                    RC_SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST,
-                    RC_SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST,
-                    RC_SHADOW_TEMPLE_WIND_HINT_CHEST,
-                    RC_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST,
-                    RC_SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST,
-                    RC_SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST,
-                    RC_SHADOW_TEMPLE_BOSS_KEY_CHEST,
-                    RC_SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST,
-                    RC_SHADOW_TEMPLE_FREESTANDING_KEY,
-                    RC_SHADOW_TEMPLE_GS_SINGLE_GIANT_POT,
-                    RC_SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM,
-                    RC_SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT,
-                    RC_SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM,
-                    RC_SHADOW_TEMPLE_GS_NEAR_SHIP,
-                },
-                {
-                    // MQ Locations
-                    RC_SHADOW_TEMPLE_MQ_COMPASS_CHEST,
-                    RC_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST,
-                    RC_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST,
-                    RC_SHADOW_TEMPLE_MQ_MAP_CHEST,
-                    RC_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST,
-                    RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST,
-                    RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST,
-                    RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST,
-                    RC_SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST,
-                    RC_SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST,
-                    RC_SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST,
-                    RC_SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST,
-                    RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST,
-                    RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST,
-                    RC_SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST,
-                    RC_SHADOW_TEMPLE_MQ_WIND_HINT_CHEST,
-                    RC_SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST,
-                    RC_SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST,
-                    RC_SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST,
-                    RC_SHADOW_TEMPLE_MQ_FREESTANDING_KEY,
-                    RC_SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM,
-                    RC_SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM,
-                    RC_SHADOW_TEMPLE_MQ_GS_AFTER_WIND,
-                    RC_SHADOW_TEMPLE_MQ_GS_AFTER_SHIP,
-                    RC_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS,
-                },
-                {},
-                {
-                    // Boss Room Locations
-                    RC_SHADOW_TEMPLE_BONGO_BONGO_HEART,
-                    RC_BONGO_BONGO,
-                });
-
-DungeonInfo BottomOfTheWell =
-    DungeonInfo("Bottom of the Well", RHT_BOTTOM_OF_THE_WELL, RG_BOTTOM_OF_THE_WELL_MAP, RG_BOTTOM_OF_THE_WELL_COMPASS,
-                RG_BOTTOM_OF_THE_WELL_SMALL_KEY, RG_BOTTOM_OF_THE_WELL_KEY_RING, RG_NONE, 3, 2,
-                {
-                    // Vanilla Locations
-                    RC_BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST,
-                    RC_BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST,
-                    RC_BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST,
-                    RC_BOTTOM_OF_THE_WELL_COMPASS_CHEST,
-                    RC_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST,
-                    RC_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST,
-                    RC_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST,
-                    RC_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST,
-                    RC_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST,
-                    RC_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST,
-                    RC_BOTTOM_OF_THE_WELL_MAP_CHEST,
-                    RC_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST,
-                    RC_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST,
-                    RC_BOTTOM_OF_THE_WELL_FREESTANDING_KEY,
-                    RC_BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE,
-                    RC_BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM,
-                    RC_BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM,
-                },
-                {
-                    // MQ Locations
-                    RC_BOTTOM_OF_THE_WELL_MQ_MAP_CHEST,
-                    RC_BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST,
-                    RC_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST,
-                    RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY,
-                    RC_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY,
-                    RC_BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT,
-                    RC_BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM,
-                    RC_BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM,
-                },
-                {}, {});
-
-DungeonInfo IceCavern =
-    DungeonInfo("Ice Cavern", RHT_ICE_CAVERN, RG_ICE_CAVERN_MAP, RG_ICE_CAVERN_COMPASS, RG_NONE, RG_NONE, RG_NONE, 0, 0,
-                {
-                    // Vanilla Locations
-                    RC_ICE_CAVERN_MAP_CHEST,
-                    RC_ICE_CAVERN_COMPASS_CHEST,
-                    RC_ICE_CAVERN_IRON_BOOTS_CHEST,
-                    RC_ICE_CAVERN_FREESTANDING_POH,
-                    RC_ICE_CAVERN_GS_PUSH_BLOCK_ROOM,
-                    RC_ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM,
-                    RC_ICE_CAVERN_GS_HEART_PIECE_ROOM,
-                },
-                {
-                    // MQ Locations
-                    RC_ICE_CAVERN_MQ_IRON_BOOTS_CHEST,
-                    RC_ICE_CAVERN_MQ_COMPASS_CHEST,
-                    RC_ICE_CAVERN_MQ_MAP_CHEST,
-                    RC_ICE_CAVERN_MQ_FREESTANDING_POH,
-                    RC_ICE_CAVERN_MQ_GS_SCARECROW,
-                    RC_ICE_CAVERN_MQ_GS_ICE_BLOCK,
-                    RC_ICE_CAVERN_MQ_GS_RED_ICE,
-                },
-                {
-                    // Shared Locations
-                    RC_SHEIK_IN_ICE_CAVERN,
-                },
-                {});
-
-DungeonInfo GerudoTrainingGrounds =
-    DungeonInfo("Gerudo Training Grounds", RHT_GERUDO_TRAINING_GROUND, RG_NONE, RG_NONE,
-                RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, RG_GERUDO_TRAINING_GROUNDS_KEY_RING, RG_NONE, 9, 3,
-                {
-                    // Vanilla Locations
-                    RC_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST,
-                    RC_GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST,
-                    RC_GERUDO_TRAINING_GROUND_STALFOS_CHEST,
-                    RC_GERUDO_TRAINING_GROUND_BEAMOS_CHEST,
-                    RC_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST,
-                    RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST,
-                    RC_GERUDO_TRAINING_GROUND_MAZE_PATH_SECOND_CHEST,
-                    RC_GERUDO_TRAINING_GROUND_MAZE_PATH_THIRD_CHEST,
-                    RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FINAL_CHEST,
-                    RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_CENTRAL_CHEST,
-                    RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_SIDE_CHEST,
-                    RC_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST,
-                    RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST,
-                    RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST,
-                    RC_GERUDO_TRAINING_GROUND_EYE_STATUE_CHEST,
-                    RC_GERUDO_TRAINING_GROUND_NEAR_SCARECROW_CHEST,
-                    RC_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST,
-                    RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST,
-                    RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST,
-                    RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_THIRD_CHEST,
-                    RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FOURTH_CHEST,
-                    RC_GERUDO_TRAINING_GROUND_FREESTANDING_KEY,
-                },
-                {
-                    // MQ Locations
-                    RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST,
-                    RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST,
-                    RC_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST,
-                    RC_GERUDO_TRAINING_GROUND_MQ_BEFORE_HEAVY_BLOCK_CHEST,
-                    RC_GERUDO_TRAINING_GROUND_MQ_EYE_STATUE_CHEST,
-                    RC_GERUDO_TRAINING_GROUND_MQ_FLAME_CIRCLE_CHEST,
-                    RC_GERUDO_TRAINING_GROUND_MQ_SECOND_IRON_KNUCKLE_CHEST,
-                    RC_GERUDO_TRAINING_GROUND_MQ_DINOLFOS_CHEST,
-                    RC_GERUDO_TRAINING_GROUND_MQ_ICE_ARROWS_CHEST,
-                    RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_CENTRAL_CHEST,
-                    RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_FIRST_CHEST,
-                    RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_SIDE_CHEST,
-                    RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_THIRD_CHEST,
-                    RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_SECOND_CHEST,
-                    RC_GERUDO_TRAINING_GROUND_MQ_HIDDEN_CEILING_CHEST,
-                    RC_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST,
-                    RC_GERUDO_TRAINING_GROUND_MQ_HEAVY_BLOCK_CHEST,
-                },
-                {}, {});
-
-DungeonInfo GanonsCastle =
-    DungeonInfo("Ganon's Castle", RHT_GANONS_CASTLE, RG_NONE, RG_NONE, RG_GANONS_CASTLE_SMALL_KEY,
-                RG_GANONS_CASTLE_KEY_RING, RG_GANONS_CASTLE_BOSS_KEY, 2, 3,
-                {
-                    // Vanilla Locations
-                    RC_GANONS_CASTLE_FOREST_TRIAL_CHEST,
-                    RC_GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST,
-                    RC_GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST,
-                    RC_GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST,
-                    RC_GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST,
-                    RC_GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST,
-                    RC_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST,
-                    RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST,
-                    RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST,
-                    RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST,
-                    RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST,
-                    RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST,
-                    RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST,
-                    RC_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST,
-                    RC_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST,
-                    RC_GANONS_CASTLE_DEKU_SCRUB_LEFT,
-                    RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,
-                    RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT,
-                    RC_GANONS_CASTLE_DEKU_SCRUB_RIGHT,
-                },
-                {
-                    // MQ Locations
-                    RC_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST,
-                    RC_GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST,
-                    RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST,
-                    RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST,
-                    RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST,
-                    RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST,
-                    RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST,
-                    RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST,
-                    RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST,
-                    RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST,
-                    RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST,
-                    RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST,
-                    RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY,
-                    RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,
-                    RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,
-                    RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,
-                    RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT,
-                    RC_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,
-                },
-                {
-                    // Shared Locations
-                    RC_GANONS_TOWER_BOSS_KEY_CHEST,
-                    RC_GANON,
-                },
-                {});
-
-const DungeonArray dungeonList = {
-    &DekuTree,        &DodongosCavern, &JabuJabusBelly,        &ForestTemple,
-    &FireTemple,      &WaterTemple,    &SpiritTemple,          &ShadowTemple,
-    &BottomOfTheWell, &IceCavern,      &GerudoTrainingGrounds, &GanonsCastle,
-};
-
-} // namespace Dungeon
diff --git a/soh/soh/Enhancements/randomizer/3drando/dungeon.hpp b/soh/soh/Enhancements/randomizer/3drando/dungeon.hpp
deleted file mode 100644
index 93f3017d6..000000000
--- a/soh/soh/Enhancements/randomizer/3drando/dungeon.hpp
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma once
-
-#include <array>
-#include <string>
-#include <vector>
-
-#include "../randomizerTypes.h"
-
-namespace Dungeon {
-class DungeonInfo {
-public:
-  DungeonInfo(std::string name_, RandomizerHintTextKey hintKey_, RandomizerGet map_, RandomizerGet compass_, RandomizerGet smallKey_,
-              RandomizerGet keyRing_, RandomizerGet bossKey_,
-              uint8_t vanillaKeyCount_, uint8_t mqKeyCount_,
-                std::vector<RandomizerCheck> vanillaLocations_,
-                std::vector<RandomizerCheck> mqLocations_,
-                std::vector<RandomizerCheck> sharedLocations_,
-                std::vector<RandomizerCheck> bossRoomLocations_);
-    ~DungeonInfo();
-
-    const std::string& GetName() const {
-        return name;
-    }
-
-    void SetMQ() {
-        masterQuest = true;
-    }
-
-    void ClearMQ() {
-        masterQuest = false;
-    }
-
-    bool IsMQ() const {
-        return masterQuest;
-    }
-
-    void SetKeyRing() {
-        hasKeyRing = true;
-    }
-
-    void ClearKeyRing() {
-        hasKeyRing = false;
-    }
-
-    bool HasKeyRing() const {
-        return hasKeyRing;
-    }
-
-    bool IsVanilla() const {
-        return !masterQuest;
-    }
-
-    uint8_t GetSmallKeyCount() const {
-        return (masterQuest) ? mqKeyCount : vanillaKeyCount;
-    }
-
-    RandomizerHintTextKey GetHintKey() const;
-    RandomizerGet GetSmallKey() const;
-    RandomizerGet GetKeyRing() const;
-    RandomizerGet GetMap() const;
-    RandomizerGet GetCompass() const;
-    RandomizerGet GetBossKey() const;
-
-    void PlaceVanillaMap();
-    void PlaceVanillaCompass();
-    void PlaceVanillaBossKey();
-    void PlaceVanillaSmallKeys();
-
-    // Gets the chosen dungeon locations for a playthrough (so either MQ or Vanilla)
-    std::vector<RandomizerCheck> GetDungeonLocations() const;
-
-    // Gets all dungeon locations (MQ + Vanilla)
-    std::vector<RandomizerCheck> GetEveryLocation() const;
-
-private:
-    std::string name;
-    RandomizerHintTextKey hintKey;
-    RandomizerGet map;
-    RandomizerGet compass;
-    RandomizerGet smallKey;
-    RandomizerGet keyRing;
-    RandomizerGet bossKey;
-    uint8_t vanillaKeyCount;
-    uint8_t mqKeyCount;
-    bool masterQuest = false;
-    bool hasKeyRing = false;
-    std::vector<RandomizerCheck> vanillaLocations;
-    std::vector<RandomizerCheck> mqLocations;
-    std::vector<RandomizerCheck> sharedLocations;
-    std::vector<RandomizerCheck> bossRoomLocations;
-};
-
-extern DungeonInfo DekuTree;
-extern DungeonInfo DodongosCavern;
-extern DungeonInfo JabuJabusBelly;
-extern DungeonInfo ForestTemple;
-extern DungeonInfo FireTemple;
-extern DungeonInfo WaterTemple;
-extern DungeonInfo SpiritTemple;
-extern DungeonInfo ShadowTemple;
-extern DungeonInfo BottomOfTheWell;
-extern DungeonInfo IceCavern;
-extern DungeonInfo GerudoTrainingGrounds;
-extern DungeonInfo GanonsCastle;
-
-using DungeonArray = std::array<DungeonInfo*, 12>;
-
-extern const DungeonArray dungeonList;
-} // namespace Dungeon
diff --git a/soh/soh/Enhancements/randomizer/3drando/entrance.cpp b/soh/soh/Enhancements/randomizer/3drando/entrance.cpp
deleted file mode 100644
index ccdf516f9..000000000
--- a/soh/soh/Enhancements/randomizer/3drando/entrance.cpp
+++ /dev/null
@@ -1,1300 +0,0 @@
-#include "entrance.hpp"
-
-#include "fill.hpp"
-#include "settings.hpp"
-#include "item_pool.hpp"
-#include "../context.h"
-#include "spoiler_log.hpp"
-#include "hints.hpp"
-#include "location_access.hpp"
-#include "soh/Enhancements/randomizer/static_data.h"
-
-#include <vector>
-#include <utility>
-#include <set>
-#include <map>
-#include <spdlog/spdlog.h>
-
-std::list<EntranceOverride> entranceOverrides = {};
-bool noRandomEntrances = false;
-static bool entranceShuffleFailure = false;
-static int totalRandomizableEntrances = 0;
-static int curNumRandomizedEntrances = 0;
-
-typedef struct {
-    EntranceType type;
-    RandomizerRegion parentRegion;
-    RandomizerRegion connectedRegion;
-    int16_t index;
-    int16_t blueWarp;
-} EntranceLinkInfo;
-
-EntranceLinkInfo NO_RETURN_ENTRANCE = {EntranceType::None, RR_NONE, RR_NONE, -1};
-
-typedef struct {
-    std::list<RandomizerRegion> targetRegions;
-    std::list<EntranceType> allowedTypes;
-} PriorityEntrance;
-                                 //primary,          secondary
-using EntranceInfoPair = std::pair<EntranceLinkInfo, EntranceLinkInfo>;
-using EntrancePair = std::pair<Entrance*, Entrance*>;
-using EntrancePools = std::map<EntranceType, std::vector<Entrance*>>;
-
-//The entrance randomization algorithm used here is a direct copy of
-//the algorithm used in the original N64 randomizer (except now in C++ instead
-//of python). It may be easier to understand the algorithm by looking at the
-//base randomizer's code instead:
-// https://github.com/TestRunnerSRL/OoT-Randomizer/blob/Dev/EntranceShuffle.py
-
-// Updates the user on how many entrances are currently shuffled
-static void DisplayEntranceProgress() {
-  std::string dots = ".";
-  float progress = (float)curNumRandomizedEntrances / (float)totalRandomizableEntrances;
-  if (progress > 0.33) {
-    dots += ".";
-  } else {
-    dots += " ";
-  }
-  if (progress > 0.66) {
-    dots += ".";
-  } else {
-    dots += " ";
-  }
-  printf("\x1b[7;29H%s", dots.c_str());
-  #ifdef ENABLE_DEBUG
-    if (curNumRandomizedEntrances == totalRandomizableEntrances) {
-      Areas::DumpWorldGraph("Finish Validation");
-    }
-  #endif
-}
-
-void SetAllEntrancesData(std::vector<EntranceInfoPair>& entranceShuffleTable) {
-  for (auto& entrancePair: entranceShuffleTable) {
-
-    auto& forwardEntry = entrancePair.first;
-    auto& returnEntry = entrancePair.second;
-
-    //set data
-    Entrance* forwardEntrance = AreaTable(forwardEntry.parentRegion)->GetExit(forwardEntry.connectedRegion);
-    forwardEntrance->SetIndex(forwardEntry.index);
-    forwardEntrance->SetBlueWarp(forwardEntry.blueWarp);
-    forwardEntrance->SetType(forwardEntry.type);
-    forwardEntrance->SetAsPrimary();
-
-    // When decouple entrances is on, mark it for entrances except boss rooms
-    if (Settings::DecoupleEntrances && forwardEntry.type != EntranceType::ChildBoss &&
-      forwardEntry.type != EntranceType::AdultBoss) {
-      forwardEntrance->SetDecoupled();
-    }
-
-    if (returnEntry.parentRegion != RR_NONE) {
-      Entrance* returnEntrance = AreaTable(returnEntry.parentRegion)->GetExit(returnEntry.connectedRegion);
-      returnEntrance->SetIndex(returnEntry.index);
-      returnEntrance->SetBlueWarp(returnEntry.blueWarp);
-      returnEntrance->SetType(returnEntry.type);
-      forwardEntrance->BindTwoWay(returnEntrance);
-
-      // Mark reverse entrance as decoupled
-      if (Settings::DecoupleEntrances && returnEntry.type != EntranceType::ChildBoss &&
-        returnEntry.type != EntranceType::AdultBoss) {
-        returnEntrance->SetDecoupled();
-      }
-    }
-  }
-}
-
-static std::vector<Entrance*> AssumeEntrancePool(std::vector<Entrance*>& entrancePool) {
-  std::vector<Entrance*> assumedPool = {};
-  for (Entrance* entrance : entrancePool) {
-    totalRandomizableEntrances++;
-    Entrance* assumedForward = entrance->AssumeReachable();
-    if (entrance->GetReverse() != nullptr && !entrance->IsDecoupled()) {
-      Entrance* assumedReturn = entrance->GetReverse()->AssumeReachable();
-      if (!(Settings::MixedEntrancePools && (Settings::ShuffleOverworldEntrances || Settings::ShuffleInteriorEntrances.Is(SHUFFLEINTERIORS_ALL)))) {
-        auto type = entrance->GetType();
-        if (((type == EntranceType::Dungeon || type == EntranceType::GrottoGrave) && entrance->GetReverse()->GetName() != "Spirit Temple Entryway -> Desert Colossus From Spirit Entryway") ||
-             (type == EntranceType::Interior && Settings::ShuffleInteriorEntrances.Is(SHUFFLEINTERIORS_ALL))) {
-               // In most cases, Dungeon, Grotto/Grave and Simple Interior exits shouldn't be assumed able to give access to their parent region
-               assumedReturn->SetCondition([]{return false;});
-             }
-      }
-      assumedForward->BindTwoWay(assumedReturn);
-    }
-    assumedPool.push_back(assumedForward);
-  }
-  return assumedPool;
-}
-
-static std::vector<Entrance*> BuildOneWayTargets(std::vector<EntranceType> typesToInclude, std::vector<std::pair<RandomizerRegion, RandomizerRegion>> exclude = {}/*, target_region_names*/) {
-  std::vector<Entrance*> oneWayEntrances = {};
-  // Get all entrances of the specified type
-  for (EntranceType poolType : typesToInclude) {
-    AddElementsToPool(oneWayEntrances, GetShuffleableEntrances(poolType, false));
-  }
-  // Filter out any that are passed in the exclusion list
-  FilterAndEraseFromPool(oneWayEntrances, [&exclude](Entrance* entrance){
-    std::pair<RandomizerRegion, RandomizerRegion> entranceBeingChecked (entrance->GetParentRegionKey(), entrance->GetConnectedRegionKey());
-    return ElementInContainer(entranceBeingChecked, exclude);
-  });
-
-  // The code below is part of the function in ootr, but no use of the function ever provides target_region_names
-  // if target_region_names:
-  //     return [entrance.get_new_target() for entrance in valid_one_way_entrances
-  //             if entrance.connected_region.name in target_region_names]
-
-  std::vector<Entrance*> newTargets = {};
-  for (Entrance* entrance : oneWayEntrances) {
-    newTargets.push_back(entrance->GetNewTarget());
-  }
-  return newTargets;
-}
-
-//returns restrictive entrances and soft entrances in an array of size 2 (restrictive vector is index 0, soft is index 1)
-static std::array<std::vector<Entrance*>, 2> SplitEntrancesByRequirements(std::vector<Entrance*>& entrancesToSplit, std::vector<Entrance*>& assumedEntrances) {
-  //First, disconnect all root assumed entrances and save which regions they were originally connected to, so we can reconnect them later
-  std::map<Entrance*, RandomizerRegion> originalConnectedRegions = {};
-  std::set<Entrance*> entrancesToDisconnect = {};
-  for (Entrance* entrance : assumedEntrances) {
-    entrancesToDisconnect.insert(entrance);
-    if (entrance->GetReverse() != nullptr) {
-      entrancesToDisconnect.insert(entrance->GetReverse());
-    }
-  }
-
-  //disconnect each entrance temporarily to find restrictive vs soft entrances
-  //soft entrances are ones that can be accessed by both ages (child/adult) at both times of day (day/night)
-  //restrictive entrances are ones that do not meet this criteria
-  for (Entrance* entrance : entrancesToDisconnect) {
-    if (entrance->GetConnectedRegionKey() != RR_NONE) {
-      originalConnectedRegions[entrance] = entrance->Disconnect();
-    }
-  }
-
-  std::vector<Entrance*> restrictiveEntrances = {};
-  std::vector<Entrance*> softEntrances = {};
-
-  Logic::LogicReset();
-  // Apply the effects of all advancement items to search for entrance accessibility
-  std::vector<RandomizerGet> items = 
-    FilterFromPool(ItemPool, [](const RandomizerGet i){ return Rando::StaticData::RetrieveItem(i).IsAdvancement();});
-  for (RandomizerGet unplacedItem : items) {
-    Rando::StaticData::RetrieveItem(unplacedItem).ApplyEffect();
-  }
-  // run a search to see what's accessible
-  GetAccessibleLocations({});
-
-  for (Entrance* entrance : entrancesToSplit) {
-    // if an entrance is accessible at all times of day by both ages, it's a soft entrance with no restrictions
-    if (entrance->ConditionsMet(true)) {
-      softEntrances.push_back(entrance);
-    } else {
-      restrictiveEntrances.push_back(entrance);
-    }
-  }
-
-  //Reconnect all disconnected entrances
-  for (Entrance* entrance : entrancesToDisconnect) {
-    entrance->Connect(originalConnectedRegions[entrance]);
-  }
-
-  return {restrictiveEntrances, softEntrances};
-}
-
-static bool AreEntrancesCompatible(Entrance* entrance, Entrance* target, std::vector<EntrancePair>& rollbacks) {
-
-  //Entrances shouldn't connect to their own scene, fail in this situation
-  if (entrance->GetParentRegion()->scene != "" && entrance->GetParentRegion()->scene == target->GetConnectedRegion()->scene) {
-    auto message = "Entrance " + entrance->GetName() + " attempted to connect with own scene target " + target->to_string() + ". Connection failed.\n";
-    SPDLOG_DEBUG(message);
-    return false;
-  }
-
-  // One way entrances shouldn't lead to the same scene as other already chosen one way entrances
-  auto type = entrance->GetType();
-  const std::vector<EntranceType> oneWayTypes = {EntranceType::OwlDrop, EntranceType::Spawn, EntranceType::WarpSong};
-  if (ElementInContainer(type, oneWayTypes)) {
-    for (auto& rollback : rollbacks) {
-      if (rollback.first->GetConnectedRegion()->scene == target->GetConnectedRegion()->scene) {
-        auto message = "A one way entrance already leads to " + target->to_string() + ". Connection failed.\n";
-        SPDLOG_DEBUG(message);
-        return false;
-      }
-    }
-  }
-
-  return true;
-}
-
-//Change connections between an entrance and a target assumed entrance, in order to test the connections afterwards if necessary
-static void ChangeConnections(Entrance* entrance, Entrance* targetEntrance) {
-  auto message = "Attempting to connect " + entrance->GetName() + " to " + targetEntrance->to_string() + "\n";
-  SPDLOG_DEBUG(message);
-  entrance->Connect(targetEntrance->Disconnect());
-  entrance->SetReplacement(targetEntrance->GetReplacement());
-  if (entrance->GetReverse() != nullptr && !entrance->IsDecoupled()) {
-    targetEntrance->GetReplacement()->GetReverse()->Connect(entrance->GetReverse()->GetAssumed()->Disconnect());
-    targetEntrance->GetReplacement()->GetReverse()->SetReplacement(entrance->GetReverse());
-  }
-}
-
-// In the event that we need to retry shuffling an entire group we can restore the
-// original connections to reset the entrance and target entrance.
-static void RestoreConnections(Entrance* entrance, Entrance* targetEntrance) {
-  targetEntrance->Connect(entrance->Disconnect());
-  entrance->SetReplacement(nullptr);
-  if (entrance->GetReverse() != nullptr && !entrance->IsDecoupled()) {
-    entrance->GetReverse()->GetAssumed()->Connect(targetEntrance->GetReplacement()->GetReverse()->Disconnect());
-    targetEntrance->GetReplacement()->GetReverse()->SetReplacement(nullptr);
-  }
-}
-
-static void DeleteTargetEntrance(Entrance* targetEntrance) {
-  if (targetEntrance->GetConnectedRegionKey() != RR_NONE) {
-    targetEntrance->Disconnect();
-  }
-  if (targetEntrance->GetParentRegionKey() != RR_NONE) {
-    targetEntrance->GetParentRegion()->RemoveExit(targetEntrance);
-    targetEntrance->SetParentRegion(RR_NONE);
-  }
-}
-
-static void ConfirmReplacement(Entrance* entrance, Entrance* targetEntrance) {
-  DeleteTargetEntrance(targetEntrance);
-  if (entrance->GetReverse() != nullptr && !entrance->IsDecoupled()) {
-    auto replacedReverse = targetEntrance->GetReplacement()->GetReverse();
-    DeleteTargetEntrance(replacedReverse->GetReverse()->GetAssumed());
-  }
-}
-
-// Returns whether or not we can affirm the entrance can never be accessed as the given age
-static bool EntranceUnreachableAs(Entrance* entrance, uint8_t age, std::vector<Entrance*>& alreadyChecked) {
-
-  if (entrance == nullptr) {
-    SPDLOG_DEBUG("Entrance is nullptr in EntranceUnreachableAs()");
-    return true;
-  }
-
-  alreadyChecked.push_back(entrance);
-  auto type = entrance->GetType();
-
-  // The following cases determine when we say an entrance is not safe to affirm unreachable as the given age
-  if (type == EntranceType::WarpSong || type == EntranceType::Overworld) {
-    // Note that we consider all overworld entrances as potentially accessible as both ages, to be completely safe
-    return false;
-  } else if (type == EntranceType::OwlDrop) {
-    return age == AGE_ADULT;
-  } else if (type == EntranceType::Spawn && entrance->GetConnectedRegionKey() == RR_KF_LINKS_HOUSE) {
-    return age == AGE_ADULT;
-  } else if (type == EntranceType::Spawn && entrance->GetConnectedRegionKey() == RR_TEMPLE_OF_TIME) {
-    return age == AGE_CHILD;
-  }
-
-  // Other entrances such as Interior, Dungeon or Grotto are fine unless they have a parent which is one of the above cases
-  // Recursively check parent entrances to verify that they are also not reachable as the wrong age
-  auto& parentEntrances = entrance->GetParentRegion()->entrances;
-  for (Entrance* parentEntrance : parentEntrances) {
-
-    //if parentEntrance is in alreadyChecked, then continue
-    if (ElementInContainer(parentEntrance, alreadyChecked)) {
-      continue;
-    }
-
-    bool unreachable = EntranceUnreachableAs(parentEntrance, age, alreadyChecked);
-    if (!unreachable) {
-      return false;
-    }
-  }
-
-  return true;
-}
-
-static bool ValidateWorld(Entrance* entrancePlaced) {
-  SPDLOG_DEBUG("Validating world\n");
-
-  //check certain conditions when certain types of ER are enabled
-  EntranceType type = EntranceType::None;
-  if (entrancePlaced != nullptr) {
-    type = entrancePlaced->GetType();
-  }
-
-  bool checkPoeCollectorAccess  = (Settings::ShuffleOverworldEntrances || Settings::ShuffleInteriorEntrances.Is(SHUFFLEINTERIORS_ALL)) && (entrancePlaced == nullptr || Settings::MixedEntrancePools ||
-                                 type == EntranceType::Interior || type == EntranceType::SpecialInterior || type == EntranceType::Overworld || type == EntranceType::Spawn || type == EntranceType::WarpSong || type == EntranceType::OwlDrop);
-  bool checkOtherEntranceAccess = (Settings::ShuffleOverworldEntrances || Settings::ShuffleInteriorEntrances.Is(SHUFFLEINTERIORS_ALL) || Settings::ShuffleOverworldSpawns) && (entrancePlaced == nullptr || Settings::MixedEntrancePools ||
-                                 type == EntranceType::SpecialInterior || type == EntranceType::Overworld || type == EntranceType::Spawn || type == EntranceType::WarpSong || type == EntranceType::OwlDrop);
-
-  // Search the world to verify that all necessary conditions are still being held
-  // Conditions will be checked during the search and any that fail will be figured out
-  // afterwards
-  Logic::LogicReset();
-  GetAccessibleLocations({}, SearchMode::ValidateWorld, "", checkPoeCollectorAccess, checkOtherEntranceAccess);
-
-  if (!Settings::DecoupleEntrances) {
-  // Unless entrances are decoupled, we don't want the player to end up through certain entrances as the wrong age
-  // This means we need to hard check that none of the relevant entrances are ever reachable as that age
-  // This is mostly relevant when mixing entrance pools or shuffling special interiors (such as windmill or kak potion shop)
-  // Warp Songs and Overworld Spawns can also end up inside certain indoors so those need to be handled as well
-    std::array<std::string, 3> childForbidden = {"OGC Great Fairy Fountain -> Castle Grounds", "GV Carpenter Tent -> GV Fortress Side", "Ganon's Castle Entryway -> Castle Grounds From Ganon's Castle"};
-    std::array<std::string, 2> adultForbidden = {"HC Great Fairy Fountain -> Castle Grounds", "HC Storms Grotto -> Castle Grounds"};
-
-    auto allShuffleableEntrances = GetShuffleableEntrances(EntranceType::All, false);
-    for (auto& entrance: allShuffleableEntrances) {
-
-      std::vector<Entrance*> alreadyChecked = {};
-
-      if (entrance->IsShuffled()) {
-        if (entrance->GetReplacement() != nullptr) {
-
-          auto replacementName = entrance->GetReplacement()->GetName();
-          alreadyChecked.push_back(entrance->GetReplacement()->GetReverse());
-
-          if (ElementInContainer(replacementName, childForbidden) && !EntranceUnreachableAs(entrance, AGE_CHILD, alreadyChecked)) {
-            auto message = replacementName + " is replaced by an entrance with a potential child access\n";
-            SPDLOG_DEBUG(message);
-            return false;
-          } else if (ElementInContainer(replacementName, adultForbidden) && !EntranceUnreachableAs(entrance, AGE_ADULT, alreadyChecked)) {
-            auto message = replacementName + " is replaced by an entrance with a potential adult access\n";
-            SPDLOG_DEBUG(message);
-            return false;
-          }
-        }
-      } else {
-        auto name = entrance->GetName();
-        alreadyChecked.push_back(entrance->GetReverse());
-
-        if (ElementInContainer(name, childForbidden) && !EntranceUnreachableAs(entrance, AGE_CHILD, alreadyChecked)) {
-          auto message = name + " is potentially accessible as child\n";
-          SPDLOG_DEBUG(message);
-          return false;
-        } else if (ElementInContainer(name, adultForbidden) && !EntranceUnreachableAs(entrance, AGE_ADULT, alreadyChecked)) {
-          auto message = name + " is potentially accessible as adult\n";
-          SPDLOG_DEBUG(message);
-          return false;
-        }
-      }
-    }
-  }
-
-  if (Settings::ShuffleInteriorEntrances.IsNot(SHUFFLEINTERIORS_OFF) && Settings::GossipStoneHints.IsNot(HINTS_NO_HINTS) &&
-  (entrancePlaced == nullptr || type == EntranceType::Interior || type == EntranceType::SpecialInterior)) {
-    //When cows are shuffled, ensure both Impa's House entrances are in the same hint area because the cow is reachable from both sides
-    if (Settings::ShuffleCows) {
-      auto impasHouseFrontHintRegion = GetHintRegionHintKey(RR_KAK_IMPAS_HOUSE);
-      auto impasHouseBackHintRegion = GetHintRegionHintKey(RR_KAK_IMPAS_HOUSE_BACK);
-      if (impasHouseFrontHintRegion != RHT_NONE && impasHouseBackHintRegion != RHT_NONE && impasHouseBackHintRegion != RHT_LINKS_POCKET && impasHouseFrontHintRegion != RHT_LINKS_POCKET && impasHouseBackHintRegion != impasHouseFrontHintRegion) {
-        auto message = "Kak Impas House entrances are not in the same hint area\n";
-        SPDLOG_DEBUG(message);
-        return false;
-      }
-    }
-  }
-
-  // If all locations aren't reachable, that means that one of the conditions failed when searching
-  if (!Rando::Context::GetInstance()->allLocationsReachable) {
-    if (checkOtherEntranceAccess) {
-      // At least one valid starting region with all basic refills should be reachable without using any items at the beginning of the seed
-      if (!AreaTable(RR_KOKIRI_FOREST)->HasAccess() && !AreaTable(RR_KAKARIKO_VILLAGE)->HasAccess()) {
-        SPDLOG_DEBUG("Invalid starting area\n");
-        return false;
-      }
-
-      // Check that a region where time passes is always reachable as both ages without having collected any items
-      if (!Areas::HasTimePassAccess(AGE_CHILD) || !Areas::HasTimePassAccess(AGE_ADULT)) {
-        SPDLOG_DEBUG("Time passing is not guaranteed as both ages\n");
-        return false;
-      }
-
-      // The player should be able to get back to ToT after going through time, without having collected any items
-      // This is important to ensure that the player never loses access to the pedestal after going through time
-      if (Settings::ResolvedStartingAge == AGE_CHILD && !AreaTable(RR_TEMPLE_OF_TIME)->Adult()) {
-        SPDLOG_DEBUG("Path to Temple of Time as adult is not guaranteed\n");
-        return false;
-      } else if (Settings::ResolvedStartingAge == AGE_ADULT && !AreaTable(RR_TEMPLE_OF_TIME)->Child()) {
-        SPDLOG_DEBUG("Path to Temple of Time as child is not guaranteed\n");
-        return false;
-      }
-    }
-
-    // The Big Poe shop should always be accessible as adult without the need to use any bottles
-    // This is important to ensure that players can never lock their only bottles by filling them with Big Poes they can't sell
-    if (checkPoeCollectorAccess) {
-      if (!AreaTable(RR_MARKET_GUARD_HOUSE)->Adult()) {
-        SPDLOG_DEBUG("Big Poe Shop access is not guarenteed as adult\n");
-        return false;
-      }
-    }
-    SPDLOG_DEBUG("All Locations NOT REACHABLE\n");
-    return false;
-  }
-  return true;
-}
-
-static bool ReplaceEntrance(Entrance* entrance, Entrance* target, std::vector<EntrancePair>& rollbacks) {
-
-  if (!AreEntrancesCompatible(entrance, target, rollbacks)) {
-    return false;
-  }
-  ChangeConnections(entrance, target);
-  if (ValidateWorld(entrance)) {
-    #ifdef ENABLE_DEBUG
-      std::string ticks = std::to_string(svcGetSystemTick());
-      auto message = "Dumping World Graph at " + ticks + "\n";
-      //SPDLOG_DEBUG(message);
-      //Areas::DumpWorldGraph(ticks);
-    #endif
-    rollbacks.push_back(EntrancePair{entrance, target});
-    curNumRandomizedEntrances++;
-    DisplayEntranceProgress();
-    return true;
-  } else {
-    #ifdef ENABLE_DEBUG
-      std::string ticks = std::to_string(svcGetSystemTick());
-      auto message = "Dumping World Graph at " + ticks + "\n";
-      //SPDLOG_DEBUG(message);
-      //Areas::DumpWorldGraph(ticks);
-    #endif
-    if (entrance->GetConnectedRegionKey() != RR_NONE) {
-      RestoreConnections(entrance, target);
-    }
-  }
-  DisplayEntranceProgress();
-  return false;
-}
-
-// Connect one random entrance from entrance pools to one random target in the respective target pool.
-// Entrance chosen will have one of the allowed types.
-// Target chosen will lead to one of the allowed regions.
-static bool PlaceOneWayPriorityEntrance(std::string priorityName, std::list<RandomizerRegion>& allowedRegions, std::list<EntranceType>& allowedTypes, std::vector<EntrancePair>& rollbacks, EntrancePools oneWayEntrancePools, EntrancePools oneWayTargetEntrancePools) {
-  // Combine the entrances for allowed types in one list.
-  // Shuffle this list.
-  // Pick the first one not already set, not adult spawn, that has a valid target entrance.
-  // Assemble then clear entrances from the pool and target pools as appropriate.
-  std::vector<Entrance*> availPool = {};
-  for (auto& pool : oneWayEntrancePools) {
-    auto entranceType = pool.first;
-    if (ElementInContainer(entranceType, allowedTypes)) {
-      AddElementsToPool(availPool, pool.second);
-    }
-  }
-  Shuffle(availPool);
-
-  for (Entrance* entrance : availPool) {
-    if (entrance->GetReplacement() != nullptr) {
-      continue;
-    }
-    // Only allow Adult Spawn as sole Nocturne access if hints != mask.
-    // Otherwise, child access is required here (adult access assumed or guaranteed later).
-    if (entrance->GetParentRegionKey() == RR_ADULT_SPAWN) {
-      if (priorityName != "Nocturne" || Settings::GossipStoneHints.Is(HINTS_MASK_OF_TRUTH)) {
-        continue;
-      }
-    }
-    // If not shuffling dungeons, Nocturne requires adult access
-    if (!Settings::ShuffleDungeonEntrances && priorityName == "Nocturne") {
-      if (entrance->GetType() != EntranceType::WarpSong && entrance->GetParentRegionKey() != RR_ADULT_SPAWN) {
-        continue;
-      }
-    }
-    for (Entrance* target : oneWayTargetEntrancePools[entrance->GetType()]) {
-      RandomizerRegion targetRegionKey = target->GetConnectedRegionKey();
-      if (targetRegionKey != RR_NONE && ElementInContainer(targetRegionKey, allowedRegions)) {
-        if (ReplaceEntrance(entrance, target, rollbacks)) {
-          // Return once the entrance has been replaced
-          return true;
-        }
-      }
-    }
-  }
-  #ifdef ENABLE_DEBUG
-    auto message = "ERROR: Unable to place priority one-way entrance for " + priorityName + "\n";
-    SPDLOG_DEBUG(message);
-    PlacementLog_Write();
-  #endif
-  return false;
-}
-
-// Once the first entrance to Impas House has been placed, try to place the next one immediately to reduce chances of failure.
-static bool PlaceOtherImpasHouseEntrance(std::vector<Entrance*> entrances, std::vector<Entrance*> targetEntrances, std::vector<EntrancePair>& rollbacks) {
-  // Get the other impas house entrance
-  auto otherImpaTargets = FilterFromPool(targetEntrances, [](const Entrance* target) {
-      return (target->GetConnectedRegionKey() == RR_KAK_IMPAS_HOUSE ||
-              target->GetConnectedRegionKey() == RR_KAK_IMPAS_HOUSE_BACK);
-  });
-  if (otherImpaTargets.empty()) {
-    return true;
-  }
-
-  Entrance* otherImpaTarget = otherImpaTargets[0];
-  auto m = "Now Placing Other Impa Target: " + otherImpaTarget->GetName() + "\n";
-  SPDLOG_DEBUG(m);
-  RandomizerRegion otherImpaRegion = otherImpaTarget->GetConnectedRegionKey() != RR_KAK_IMPAS_HOUSE_BACK
-                                         ? RR_KAK_IMPAS_HOUSE_BACK
-                                         : RR_KAK_IMPAS_HOUSE;
-  for (Entrance* entrance : entrances) {
-    // If the entrance is already connected or it doesn't have the same hint region as the already placed impas house entrance, then don't try to use it
-    if (entrance->GetConnectedRegionKey() != RR_NONE ||
-        (GetHintRegionHintKey(otherImpaRegion) != GetHintRegionHintKey(entrance->GetParentRegionKey()))) {
-        continue;
-    }
-    // If the placement succeeds, we return true
-    if (ReplaceEntrance(entrance, otherImpaTarget, rollbacks)) {
-      return true;
-    }
-  }
-  SPDLOG_DEBUG("No available entrances for placing other impa region.\n");
-  return false;
-}
-
-// Shuffle entrances by placing them instead of entrances in the provided target entrances list
-static bool ShuffleEntrances(std::vector<Entrance*>& entrances, std::vector<Entrance*>& targetEntrances, std::vector<EntrancePair>& rollbacks) {
-
-  Shuffle(entrances);
-
-  //place all entrances in the pool, validating after every placement
-  for (Entrance* entrance : entrances) {
-    if (entrance->GetConnectedRegionKey() != RR_NONE) {
-      continue;
-    }
-
-    Shuffle(targetEntrances);
-    for (Entrance* target : targetEntrances) {
-      if (target->GetConnectedRegionKey() == RR_NONE) {
-        continue;
-      }
-
-      // Store whether or not we're about to attempt placing an entrance to Impas House
-      bool attemptedImpasHousePlacement = (target->GetConnectedRegionKey() == RR_KAK_IMPAS_HOUSE || target->GetConnectedRegionKey() == RR_KAK_IMPAS_HOUSE_BACK);
-
-      if (ReplaceEntrance(entrance, target, rollbacks)) {
-        // If shuffle cows is enabled and the last entrance was one to Impas House,
-        // then immediately attempt to place the other entrance to Impas House
-        if (Settings::ShuffleCows && attemptedImpasHousePlacement) {
-          if (!PlaceOtherImpasHouseEntrance(entrances, targetEntrances, rollbacks)) {
-            return false;
-          }
-        }
-        break;
-      }
-    }
-
-    if (entrance->GetConnectedRegionKey() == RR_NONE) {
-      return false;
-    }
-  }
-
-  //all entrances were validly connected
-  return true;
-}
-
-static bool ShuffleOneWayPriorityEntrances(std::map<std::string, PriorityEntrance>& oneWayPriorities, EntrancePools oneWayEntrancePools, EntrancePools oneWayTargetEntrancePools, int retryCount = 2) {
-  while (retryCount > 0) {
-    retryCount--;
-    std::vector<EntrancePair> rollbacks = {};
-
-    bool success = true;
-    for (auto& priority : oneWayPriorities) {
-      std::string key = priority.first;
-      auto& regions = priority.second.targetRegions;
-      auto& types = priority.second.allowedTypes;
-      success = PlaceOneWayPriorityEntrance(key, regions, types, rollbacks, oneWayEntrancePools, oneWayTargetEntrancePools);
-      if (!success) {
-        for (auto& pair : rollbacks) {
-          RestoreConnections(pair.first, pair.second);
-        }
-        break;
-      }
-    }
-    if (!success) {
-      continue;
-    }
-    // If there are no issues, log the connections and continue
-    for (auto& pair : rollbacks) {
-      ConfirmReplacement(pair.first, pair.second);
-    }
-    break;
-  }
-
-  if (retryCount <= 0) {
-    SPDLOG_DEBUG("Entrance placement attempt count for one way priorities exceeded. Restarting randomization completely\n");
-    entranceShuffleFailure = true;
-    return false;
-  }
-  return true;
-}
-
-static void ShuffleEntrancePool(std::vector<Entrance*>& entrancePool, std::vector<Entrance*>& targetEntrances, int retryCount = 20) {
-  noRandomEntrances = false;
-
-  auto splitEntrances = SplitEntrancesByRequirements(entrancePool, targetEntrances);
-
-  auto& restrictiveEntrances = splitEntrances[0];
-  auto& softEntrances = splitEntrances[1];
-
-  int retries = retryCount;
-  while (retries > 0) {
-    if (retries != retryCount) {
-      #ifdef ENABLE_DEBUG
-        std::string ticks = std::to_string(svcGetSystemTick());
-        auto message = "Failed to connect entrances. Retrying " + std::to_string(retries) + " more times.\nDumping World Graph at " + ticks + "\n";
-        SPDLOG_DEBUG(message);
-        //Areas::DumpWorldGraph(ticks);
-      #endif
-    }
-    retries--;
-
-    std::vector<EntrancePair> rollbacks = {};
-
-    //Shuffle Restrictive Entrances first while more regions are available in
-    //order to heavily reduce the chances of the placement failing
-    bool success = ShuffleEntrances(restrictiveEntrances, targetEntrances, rollbacks);
-    if (success) {
-      success = ShuffleEntrances(softEntrances, targetEntrances, rollbacks);
-      if(!success) {
-        for (auto& pair : rollbacks) {
-          RestoreConnections(pair.first, pair.second);
-          curNumRandomizedEntrances--;
-        }
-        continue;
-      }
-    } else {
-      for (auto& pair : rollbacks) {
-        RestoreConnections(pair.first, pair.second);
-        curNumRandomizedEntrances--;
-      }
-      continue;
-    }
-
-    //If there are no issues, log the connections and continue
-    for (auto& pair : rollbacks) {
-      ConfirmReplacement(pair.first, pair.second);
-    }
-    break;
-  }
-
-  if (retries <= 0) {
-    SPDLOG_DEBUG("Entrance placement attempt count exceeded. Restarting randomization completely");
-    entranceShuffleFailure = true;
-  }
-}
-
-static void SetShuffledEntrances(EntrancePools entrancePools) {
-  for (auto& pool : entrancePools) {
-    for (Entrance* entrance : pool.second) {
-      entrance->SetAsShuffled();
-      if (entrance->GetReverse() != nullptr) {
-        entrance->GetReverse()->SetAsShuffled();
-      }
-    }
-  }
-}
-
-//Process for setting up the shuffling of all entrances to be shuffled
-int ShuffleAllEntrances() {
-
-  totalRandomizableEntrances = 0;
-  curNumRandomizedEntrances = 0;
-
-  std::vector<EntranceInfoPair> entranceShuffleTable = {
-      // Parent Region                     Connected Region                      index   blue warp
-      { { EntranceType::Dungeon, RR_KF_OUTSIDE_DEKU_TREE, RR_DEKU_TREE_ENTRYWAY, 0x0000 },
-        { EntranceType::Dungeon, RR_DEKU_TREE_ENTRYWAY, RR_KF_OUTSIDE_DEKU_TREE, 0x0209, 0x0457 } },
-      { { EntranceType::Dungeon, RR_DEATH_MOUNTAIN_TRAIL, RR_DODONGOS_CAVERN_ENTRYWAY, 0x0004 },
-        { EntranceType::Dungeon, RR_DODONGOS_CAVERN_ENTRYWAY, RR_DEATH_MOUNTAIN_TRAIL, 0x0242, 0x047A } },
-      { { EntranceType::Dungeon, RR_ZORAS_FOUNTAIN, RR_JABU_JABUS_BELLY_ENTRYWAY, 0x0028 },
-        { EntranceType::Dungeon, RR_JABU_JABUS_BELLY_ENTRYWAY, RR_ZORAS_FOUNTAIN, 0x0221, 0x010E } },
-      { { EntranceType::Dungeon, RR_SACRED_FOREST_MEADOW, RR_FOREST_TEMPLE_ENTRYWAY, 0x0169 },
-        { EntranceType::Dungeon, RR_FOREST_TEMPLE_ENTRYWAY, RR_SACRED_FOREST_MEADOW, 0x0215, 0x0608 } },
-      { { EntranceType::Dungeon, RR_DMC_CENTRAL_LOCAL, RR_FIRE_TEMPLE_ENTRYWAY, 0x0165 },
-        { EntranceType::Dungeon, RR_FIRE_TEMPLE_ENTRYWAY, RR_DMC_CENTRAL_LOCAL, 0x024A, 0x0564 } },
-      { { EntranceType::Dungeon, RR_LAKE_HYLIA, RR_WATER_TEMPLE_ENTRYWAY, 0x0010 },
-        { EntranceType::Dungeon, RR_WATER_TEMPLE_ENTRYWAY, RR_LAKE_HYLIA, 0x021D, 0x060C } },
-      { { EntranceType::Dungeon, RR_DESERT_COLOSSUS, RR_SPIRIT_TEMPLE_ENTRYWAY, 0x0082 },
-        { EntranceType::Dungeon, RR_SPIRIT_TEMPLE_ENTRYWAY, RR_DESERT_COLOSSUS_FROM_SPIRIT_ENTRYWAY, 0x01E1, 0x0610 } },
-      { { EntranceType::Dungeon, RR_GRAVEYARD_WARP_PAD_REGION, RR_SHADOW_TEMPLE_ENTRYWAY, 0x0037 },
-        { EntranceType::Dungeon, RR_SHADOW_TEMPLE_ENTRYWAY, RR_GRAVEYARD_WARP_PAD_REGION, 0x0205, 0x0580 } },
-      { { EntranceType::Dungeon, RR_KAKARIKO_VILLAGE, RR_BOTTOM_OF_THE_WELL_ENTRYWAY, 0x0098 },
-        { EntranceType::Dungeon, RR_BOTTOM_OF_THE_WELL_ENTRYWAY, RR_KAKARIKO_VILLAGE, 0x02A6 } },
-      { { EntranceType::Dungeon, RR_ZORAS_FOUNTAIN, RR_ICE_CAVERN_ENTRYWAY, 0x0088 },
-        { EntranceType::Dungeon, RR_ICE_CAVERN_ENTRYWAY, RR_ZORAS_FOUNTAIN, 0x03D4 } },
-      { { EntranceType::Dungeon, RR_GERUDO_FORTRESS, RR_GERUDO_TRAINING_GROUNDS_ENTRYWAY, 0x0008 },
-        { EntranceType::Dungeon, RR_GERUDO_TRAINING_GROUNDS_ENTRYWAY, RR_GERUDO_FORTRESS, 0x03A8 } },
-      { { EntranceType::GanonDungeon, RR_GANONS_CASTLE_LEDGE, RR_GANONS_CASTLE_ENTRYWAY, 0x0467 },
-        { EntranceType::GanonDungeon, RR_GANONS_CASTLE_ENTRYWAY, RR_CASTLE_GROUNDS_FROM_GANONS_CASTLE, 0x023D } },
-
-      { { EntranceType::Interior, RR_KOKIRI_FOREST, RR_KF_MIDOS_HOUSE, 0x0433 },
-        { EntranceType::Interior, RR_KF_MIDOS_HOUSE, RR_KOKIRI_FOREST, 0x0443 } },
-      { { EntranceType::Interior, RR_KOKIRI_FOREST, RR_KF_SARIAS_HOUSE, 0x0437 },
-        { EntranceType::Interior, RR_KF_SARIAS_HOUSE, RR_KOKIRI_FOREST, 0x0447 } },
-      { { EntranceType::Interior, RR_KOKIRI_FOREST, RR_KF_HOUSE_OF_TWINS, 0x009C },
-        { EntranceType::Interior, RR_KF_HOUSE_OF_TWINS, RR_KOKIRI_FOREST, 0x033C } },
-      { { EntranceType::Interior, RR_KOKIRI_FOREST, RR_KF_KNOW_IT_ALL_HOUSE, 0x00C9 },
-        { EntranceType::Interior, RR_KF_KNOW_IT_ALL_HOUSE, RR_KOKIRI_FOREST, 0x026A } },
-      { { EntranceType::Interior, RR_KOKIRI_FOREST, RR_KF_KOKIRI_SHOP, 0x00C1 },
-        { EntranceType::Interior, RR_KF_KOKIRI_SHOP, RR_KOKIRI_FOREST, 0x0266 } },
-      { { EntranceType::Interior, RR_LAKE_HYLIA, RR_LH_LAB, 0x0043 },
-        { EntranceType::Interior, RR_LH_LAB, RR_LAKE_HYLIA, 0x03CC } },
-      { { EntranceType::Interior, RR_LH_FISHING_ISLAND, RR_LH_FISHING_HOLE, 0x045F },
-        { EntranceType::Interior, RR_LH_FISHING_HOLE, RR_LH_FISHING_ISLAND, 0x0309 } },
-      { { EntranceType::Interior, RR_GV_FORTRESS_SIDE, RR_GV_CARPENTER_TENT, 0x03A0 },
-        { EntranceType::Interior, RR_GV_CARPENTER_TENT, RR_GV_FORTRESS_SIDE, 0x03D0 } },
-      { { EntranceType::Interior, RR_MARKET_ENTRANCE, RR_MARKET_GUARD_HOUSE, 0x007E },
-        { EntranceType::Interior, RR_MARKET_GUARD_HOUSE, RR_MARKET_ENTRANCE, 0x026E } },
-      { { EntranceType::Interior, RR_THE_MARKET, RR_MARKET_MASK_SHOP, 0x0530 },
-        { EntranceType::Interior, RR_MARKET_MASK_SHOP, RR_THE_MARKET, 0x01D1 } },
-      { { EntranceType::Interior, RR_THE_MARKET, RR_MARKET_BOMBCHU_BOWLING, 0x0507 },
-        { EntranceType::Interior, RR_MARKET_BOMBCHU_BOWLING, RR_THE_MARKET, 0x03BC } },
-      { { EntranceType::Interior, RR_THE_MARKET, RR_MARKET_POTION_SHOP, 0x0388 },
-        { EntranceType::Interior, RR_MARKET_POTION_SHOP, RR_THE_MARKET, 0x02A2 } },
-      { { EntranceType::Interior, RR_THE_MARKET, RR_MARKET_TREASURE_CHEST_GAME, 0x0063 },
-        { EntranceType::Interior, RR_MARKET_TREASURE_CHEST_GAME, RR_THE_MARKET, 0x01D5 } },
-      { { EntranceType::Interior, RR_MARKET_BACK_ALLEY, RR_MARKET_BOMBCHU_SHOP, 0x0528 },
-        { EntranceType::Interior, RR_MARKET_BOMBCHU_SHOP, RR_MARKET_BACK_ALLEY, 0x03C0 } },
-      { { EntranceType::Interior, RR_MARKET_BACK_ALLEY, RR_MARKET_MAN_IN_GREEN_HOUSE, 0x043B },
-        { EntranceType::Interior, RR_MARKET_MAN_IN_GREEN_HOUSE, RR_MARKET_BACK_ALLEY, 0x0067 } },
-      { { EntranceType::Interior, RR_KAKARIKO_VILLAGE, RR_KAK_CARPENTER_BOSS_HOUSE, 0x02FD },
-        { EntranceType::Interior, RR_KAK_CARPENTER_BOSS_HOUSE, RR_KAKARIKO_VILLAGE, 0x0349 } },
-      { { EntranceType::Interior, RR_KAKARIKO_VILLAGE, RR_KAK_HOUSE_OF_SKULLTULA, 0x0550 },
-        { EntranceType::Interior, RR_KAK_HOUSE_OF_SKULLTULA, RR_KAKARIKO_VILLAGE, 0x04EE } },
-      { { EntranceType::Interior, RR_KAKARIKO_VILLAGE, RR_KAK_IMPAS_HOUSE, 0x039C },
-        { EntranceType::Interior, RR_KAK_IMPAS_HOUSE, RR_KAKARIKO_VILLAGE, 0x0345 } },
-      { { EntranceType::Interior, RR_KAK_IMPAS_LEDGE, RR_KAK_IMPAS_HOUSE_BACK, 0x05C8 },
-        { EntranceType::Interior, RR_KAK_IMPAS_HOUSE_BACK, RR_KAK_IMPAS_LEDGE, 0x05DC } },
-      { { EntranceType::Interior, RR_KAK_BACKYARD, RR_KAK_ODD_POTION_BUILDING, 0x0072 },
-        { EntranceType::Interior, RR_KAK_ODD_POTION_BUILDING, RR_KAK_BACKYARD, 0x034D } },
-      { { EntranceType::Interior, RR_THE_GRAVEYARD, RR_GRAVEYARD_DAMPES_HOUSE, 0x030D },
-        { EntranceType::Interior, RR_GRAVEYARD_DAMPES_HOUSE, RR_THE_GRAVEYARD, 0x0355 } },
-      { { EntranceType::Interior, RR_GORON_CITY, RR_GC_SHOP, 0x037C },
-        { EntranceType::Interior, RR_GC_SHOP, RR_GORON_CITY, 0x03FC } },
-      { { EntranceType::Interior, RR_ZORAS_DOMAIN, RR_ZD_SHOP, 0x0380 },
-        { EntranceType::Interior, RR_ZD_SHOP, RR_ZORAS_DOMAIN, 0x03C4 } },
-      { { EntranceType::Interior, RR_LON_LON_RANCH, RR_LLR_TALONS_HOUSE, 0x004F },
-        { EntranceType::Interior, RR_LLR_TALONS_HOUSE, RR_LON_LON_RANCH, 0x0378 } },
-      { { EntranceType::Interior, RR_LON_LON_RANCH, RR_LLR_STABLES, 0x02F9 },
-        { EntranceType::Interior, RR_LLR_STABLES, RR_LON_LON_RANCH, 0x042F } },
-      { { EntranceType::Interior, RR_LON_LON_RANCH, RR_LLR_TOWER, 0x05D0 },
-        { EntranceType::Interior, RR_LLR_TOWER, RR_LON_LON_RANCH, 0x05D4 } },
-      { { EntranceType::Interior, RR_THE_MARKET, RR_MARKET_BAZAAR, 0x052C },
-        { EntranceType::Interior, RR_MARKET_BAZAAR, RR_THE_MARKET, 0x03B8 } },
-      { { EntranceType::Interior, RR_THE_MARKET, RR_MARKET_SHOOTING_GALLERY, 0x016D },
-        { EntranceType::Interior, RR_MARKET_SHOOTING_GALLERY, RR_THE_MARKET, 0x01CD } },
-      { { EntranceType::Interior, RR_KAKARIKO_VILLAGE, RR_KAK_BAZAAR, 0x00B7 },
-        { EntranceType::Interior, RR_KAK_BAZAAR, RR_KAKARIKO_VILLAGE, 0x0201 } },
-      { { EntranceType::Interior, RR_KAKARIKO_VILLAGE, RR_KAK_SHOOTING_GALLERY, 0x003B },
-        { EntranceType::Interior, RR_KAK_SHOOTING_GALLERY, RR_KAKARIKO_VILLAGE, 0x0463 } },
-      { { EntranceType::Interior, RR_DESERT_COLOSSUS, RR_COLOSSUS_GREAT_FAIRY_FOUNTAIN, 0x0588 },
-        { EntranceType::Interior, RR_COLOSSUS_GREAT_FAIRY_FOUNTAIN, RR_DESERT_COLOSSUS, 0x057C } },
-      { { EntranceType::Interior, RR_HYRULE_CASTLE_GROUNDS, RR_HC_GREAT_FAIRY_FOUNTAIN, 0x0578 },
-        { EntranceType::Interior, RR_HC_GREAT_FAIRY_FOUNTAIN, RR_CASTLE_GROUNDS, 0x0340 } },
-      { { EntranceType::Interior, RR_GANONS_CASTLE_GROUNDS, RR_OGC_GREAT_FAIRY_FOUNTAIN, 0x04C2 },
-        { EntranceType::Interior, RR_OGC_GREAT_FAIRY_FOUNTAIN, RR_CASTLE_GROUNDS,
-          0x03E8 } }, // 0x3E8 is an unused entrance index repruposed to differentiate between the HC and OGC fairy
-                      // fountain exits (normally they both use 0x340)
-      { { EntranceType::Interior, RR_DMC_LOWER_NEARBY, RR_DMC_GREAT_FAIRY_FOUNTAIN, 0x04BE },
-        { EntranceType::Interior, RR_DMC_GREAT_FAIRY_FOUNTAIN, RR_DMC_LOWER_LOCAL, 0x0482 } },
-      { { EntranceType::Interior, RR_DEATH_MOUNTAIN_SUMMIT, RR_DMT_GREAT_FAIRY_FOUNTAIN, 0x0315 },
-        { EntranceType::Interior, RR_DMT_GREAT_FAIRY_FOUNTAIN, RR_DEATH_MOUNTAIN_SUMMIT, 0x045B } },
-      { { EntranceType::Interior, RR_ZORAS_FOUNTAIN, RR_ZF_GREAT_FAIRY_FOUNTAIN, 0x0371 },
-        { EntranceType::Interior, RR_ZF_GREAT_FAIRY_FOUNTAIN, RR_ZORAS_FOUNTAIN, 0x0394 } },
-
-      { { EntranceType::SpecialInterior, RR_KOKIRI_FOREST, RR_KF_LINKS_HOUSE, 0x0272 },
-        { EntranceType::SpecialInterior, RR_KF_LINKS_HOUSE, RR_KOKIRI_FOREST, 0x0211 } },
-      { { EntranceType::SpecialInterior, RR_TOT_ENTRANCE, RR_TEMPLE_OF_TIME, 0x0053 },
-        { EntranceType::SpecialInterior, RR_TEMPLE_OF_TIME, RR_TOT_ENTRANCE, 0x0472 } },
-      { { EntranceType::SpecialInterior, RR_KAKARIKO_VILLAGE, RR_KAK_WINDMILL, 0x0453 },
-        { EntranceType::SpecialInterior, RR_KAK_WINDMILL, RR_KAKARIKO_VILLAGE, 0x0351 } },
-      { { EntranceType::SpecialInterior, RR_KAKARIKO_VILLAGE, RR_KAK_POTION_SHOP_FRONT, 0x0384 },
-        { EntranceType::SpecialInterior, RR_KAK_POTION_SHOP_FRONT, RR_KAKARIKO_VILLAGE, 0x044B } },
-      { { EntranceType::SpecialInterior, RR_KAK_BACKYARD, RR_KAK_POTION_SHOP_BACK, 0x03EC },
-        { EntranceType::SpecialInterior, RR_KAK_POTION_SHOP_BACK, RR_KAK_BACKYARD, 0x04FF } },
-
-      // Grotto Loads use an entrance index of 0x0700 + their grotto id. The id is used as index for the
-      // grottoLoadTable in soh/soh/Enhancements/randomizer/randomizer_grotto.c
-      // Grotto Returns use an entrance index of 0x0800 + their grotto id. The id is used as index for the
-      // grottoReturnTable in soh/soh/Enhancements/randomizer/randomizer_grotto.c
-      { { EntranceType::GrottoGrave, RR_DESERT_COLOSSUS, RR_COLOSSUS_GROTTO, 0x0700 },
-        { EntranceType::GrottoGrave, RR_COLOSSUS_GROTTO, RR_DESERT_COLOSSUS, 0x0800 } },
-      { { EntranceType::GrottoGrave, RR_LAKE_HYLIA, RR_LH_GROTTO, 0x0701 },
-        { EntranceType::GrottoGrave, RR_LH_GROTTO, RR_LAKE_HYLIA, 0x0801 } },
-      { { EntranceType::GrottoGrave, RR_ZORAS_RIVER, RR_ZR_STORMS_GROTTO, 0x0702 },
-        { EntranceType::GrottoGrave, RR_ZR_STORMS_GROTTO, RR_ZORAS_RIVER, 0x0802 } },
-      { { EntranceType::GrottoGrave, RR_ZORAS_RIVER, RR_ZR_FAIRY_GROTTO, 0x0703 },
-        { EntranceType::GrottoGrave, RR_ZR_FAIRY_GROTTO, RR_ZORAS_RIVER, 0x0803 } },
-      { { EntranceType::GrottoGrave, RR_ZORAS_RIVER, RR_ZR_OPEN_GROTTO, 0x0704 },
-        { EntranceType::GrottoGrave, RR_ZR_OPEN_GROTTO, RR_ZORAS_RIVER, 0x0804 } },
-      { { EntranceType::GrottoGrave, RR_DMC_LOWER_NEARBY, RR_DMC_HAMMER_GROTTO, 0x0705 },
-        { EntranceType::GrottoGrave, RR_DMC_HAMMER_GROTTO, RR_DMC_LOWER_LOCAL, 0x0805 } },
-      { { EntranceType::GrottoGrave, RR_DMC_UPPER_NEARBY, RR_DMC_UPPER_GROTTO, 0x0706 },
-        { EntranceType::GrottoGrave, RR_DMC_UPPER_GROTTO, RR_DMC_UPPER_LOCAL, 0x0806 } },
-      { { EntranceType::GrottoGrave, RR_GC_GROTTO_PLATFORM, RR_GC_GROTTO, 0x0707 },
-        { EntranceType::GrottoGrave, RR_GC_GROTTO, RR_GC_GROTTO_PLATFORM, 0x0807 } },
-      { { EntranceType::GrottoGrave, RR_DEATH_MOUNTAIN_TRAIL, RR_DMT_STORMS_GROTTO, 0x0708 },
-        { EntranceType::GrottoGrave, RR_DMT_STORMS_GROTTO, RR_DEATH_MOUNTAIN_TRAIL, 0x0808 } },
-      { { EntranceType::GrottoGrave, RR_DEATH_MOUNTAIN_SUMMIT, RR_DMT_COW_GROTTO, 0x0709 },
-        { EntranceType::GrottoGrave, RR_DMT_COW_GROTTO, RR_DEATH_MOUNTAIN_SUMMIT, 0x0809 } },
-      { { EntranceType::GrottoGrave, RR_KAK_BACKYARD, RR_KAK_OPEN_GROTTO, 0x070A },
-        { EntranceType::GrottoGrave, RR_KAK_OPEN_GROTTO, RR_KAK_BACKYARD, 0x080A } },
-      { { EntranceType::GrottoGrave, RR_KAKARIKO_VILLAGE, RR_KAK_REDEAD_GROTTO, 0x070B },
-        { EntranceType::GrottoGrave, RR_KAK_REDEAD_GROTTO, RR_KAKARIKO_VILLAGE, 0x080B } },
-      { { EntranceType::GrottoGrave, RR_HYRULE_CASTLE_GROUNDS, RR_HC_STORMS_GROTTO, 0x070C },
-        { EntranceType::GrottoGrave, RR_HC_STORMS_GROTTO, RR_CASTLE_GROUNDS, 0x080C } },
-      { { EntranceType::GrottoGrave, RR_HYRULE_FIELD, RR_HF_TEKTITE_GROTTO, 0x070D },
-        { EntranceType::GrottoGrave, RR_HF_TEKTITE_GROTTO, RR_HYRULE_FIELD, 0x080D } },
-      { { EntranceType::GrottoGrave, RR_HYRULE_FIELD, RR_HF_NEAR_KAK_GROTTO, 0x070E },
-        { EntranceType::GrottoGrave, RR_HF_NEAR_KAK_GROTTO, RR_HYRULE_FIELD, 0x080E } },
-      { { EntranceType::GrottoGrave, RR_HYRULE_FIELD, RR_HF_FAIRY_GROTTO, 0x070F },
-        { EntranceType::GrottoGrave, RR_HF_FAIRY_GROTTO, RR_HYRULE_FIELD, 0x080F } },
-      { { EntranceType::GrottoGrave, RR_HYRULE_FIELD, RR_HF_NEAR_MARKET_GROTTO, 0x0710 },
-        { EntranceType::GrottoGrave, RR_HF_NEAR_MARKET_GROTTO, RR_HYRULE_FIELD, 0x0810 } },
-      { { EntranceType::GrottoGrave, RR_HYRULE_FIELD, RR_HF_COW_GROTTO, 0x0711 },
-        { EntranceType::GrottoGrave, RR_HF_COW_GROTTO, RR_HYRULE_FIELD, 0x0811 } },
-      { { EntranceType::GrottoGrave, RR_HYRULE_FIELD, RR_HF_INSIDE_FENCE_GROTTO, 0x0712 },
-        { EntranceType::GrottoGrave, RR_HF_INSIDE_FENCE_GROTTO, RR_HYRULE_FIELD, 0x0812 } },
-      { { EntranceType::GrottoGrave, RR_HYRULE_FIELD, RR_HF_OPEN_GROTTO, 0x0713 },
-        { EntranceType::GrottoGrave, RR_HF_OPEN_GROTTO, RR_HYRULE_FIELD, 0x0813 } },
-      { { EntranceType::GrottoGrave, RR_HYRULE_FIELD, RR_HF_SOUTHEAST_GROTTO, 0x0714 },
-        { EntranceType::GrottoGrave, RR_HF_SOUTHEAST_GROTTO, RR_HYRULE_FIELD, 0x0814 } },
-      { { EntranceType::GrottoGrave, RR_LON_LON_RANCH, RR_LLR_GROTTO, 0x0715 },
-        { EntranceType::GrottoGrave, RR_LLR_GROTTO, RR_LON_LON_RANCH, 0x0815 } },
-      { { EntranceType::GrottoGrave, RR_SFM_ENTRYWAY, RR_SFM_WOLFOS_GROTTO, 0x0716 },
-        { EntranceType::GrottoGrave, RR_SFM_WOLFOS_GROTTO, RR_SFM_ENTRYWAY, 0x0816 } },
-      { { EntranceType::GrottoGrave, RR_SACRED_FOREST_MEADOW, RR_SFM_STORMS_GROTTO, 0x0717 },
-        { EntranceType::GrottoGrave, RR_SFM_STORMS_GROTTO, RR_SACRED_FOREST_MEADOW, 0x0817 } },
-      { { EntranceType::GrottoGrave, RR_SACRED_FOREST_MEADOW, RR_SFM_FAIRY_GROTTO, 0x0718 },
-        { EntranceType::GrottoGrave, RR_SFM_FAIRY_GROTTO, RR_SACRED_FOREST_MEADOW, 0x0818 } },
-      { { EntranceType::GrottoGrave, RR_LW_BEYOND_MIDO, RR_LW_SCRUBS_GROTTO, 0x0719 },
-        { EntranceType::GrottoGrave, RR_LW_SCRUBS_GROTTO, RR_LW_BEYOND_MIDO, 0x0819 } },
-      { { EntranceType::GrottoGrave, RR_THE_LOST_WOODS, RR_LW_NEAR_SHORTCUTS_GROTTO, 0x071A },
-        { EntranceType::GrottoGrave, RR_LW_NEAR_SHORTCUTS_GROTTO, RR_THE_LOST_WOODS, 0x081A } },
-      { { EntranceType::GrottoGrave, RR_KOKIRI_FOREST, RR_KF_STORMS_GROTTO, 0x071B },
-        { EntranceType::GrottoGrave, RR_KF_STORMS_GROTTO, RR_KOKIRI_FOREST, 0x081B } },
-      { { EntranceType::GrottoGrave, RR_ZORAS_DOMAIN, RR_ZD_STORMS_GROTTO, 0x071C },
-        { EntranceType::GrottoGrave, RR_ZD_STORMS_GROTTO, RR_ZORAS_DOMAIN, 0x081C } },
-      { { EntranceType::GrottoGrave, RR_GERUDO_FORTRESS, RR_GF_STORMS_GROTTO, 0x071D },
-        { EntranceType::GrottoGrave, RR_GF_STORMS_GROTTO, RR_GERUDO_FORTRESS, 0x081D } },
-      { { EntranceType::GrottoGrave, RR_GV_FORTRESS_SIDE, RR_GV_STORMS_GROTTO, 0x071E },
-        { EntranceType::GrottoGrave, RR_GV_STORMS_GROTTO, RR_GV_FORTRESS_SIDE, 0x081E } },
-      { { EntranceType::GrottoGrave, RR_GV_GROTTO_LEDGE, RR_GV_OCTOROK_GROTTO, 0x071F },
-        { EntranceType::GrottoGrave, RR_GV_OCTOROK_GROTTO, RR_GV_GROTTO_LEDGE, 0x081F } },
-      { { EntranceType::GrottoGrave, RR_LW_BEYOND_MIDO, RR_DEKU_THEATER, 0x0720 },
-        { EntranceType::GrottoGrave, RR_DEKU_THEATER, RR_LW_BEYOND_MIDO, 0x0820 } },
-
-      // Graves have their own specified entrance indices
-      { { EntranceType::GrottoGrave, RR_THE_GRAVEYARD, RR_GRAVEYARD_SHIELD_GRAVE, 0x004B },
-        { EntranceType::GrottoGrave, RR_GRAVEYARD_SHIELD_GRAVE, RR_THE_GRAVEYARD, 0x035D } },
-      { { EntranceType::GrottoGrave, RR_THE_GRAVEYARD, RR_GRAVEYARD_HEART_PIECE_GRAVE, 0x031C },
-        { EntranceType::GrottoGrave, RR_GRAVEYARD_HEART_PIECE_GRAVE, RR_THE_GRAVEYARD, 0x0361 } },
-      { { EntranceType::GrottoGrave, RR_THE_GRAVEYARD, RR_GRAVEYARD_COMPOSERS_GRAVE, 0x002D },
-        { EntranceType::GrottoGrave, RR_GRAVEYARD_COMPOSERS_GRAVE, RR_THE_GRAVEYARD, 0x050B } },
-      { { EntranceType::GrottoGrave, RR_THE_GRAVEYARD, RR_GRAVEYARD_DAMPES_GRAVE, 0x044F },
-        { EntranceType::GrottoGrave, RR_GRAVEYARD_DAMPES_GRAVE, RR_THE_GRAVEYARD, 0x0359 } },
-
-      { { EntranceType::Overworld, RR_KOKIRI_FOREST, RR_LW_BRIDGE_FROM_FOREST, 0x05E0 },
-        { EntranceType::Overworld, RR_LW_BRIDGE, RR_KOKIRI_FOREST, 0x020D } },
-      { { EntranceType::Overworld, RR_KOKIRI_FOREST, RR_THE_LOST_WOODS, 0x011E },
-        { EntranceType::Overworld, RR_LW_FOREST_EXIT, RR_KOKIRI_FOREST, 0x0286 } },
-      { { EntranceType::Overworld, RR_THE_LOST_WOODS, RR_GC_WOODS_WARP, 0x04E2 },
-        { EntranceType::Overworld, RR_GC_WOODS_WARP, RR_THE_LOST_WOODS, 0x04D6 } },
-      { { EntranceType::Overworld, RR_THE_LOST_WOODS, RR_ZORAS_RIVER, 0x01DD },
-        { EntranceType::Overworld, RR_ZORAS_RIVER, RR_THE_LOST_WOODS, 0x04DA } },
-      { { EntranceType::Overworld, RR_LW_BEYOND_MIDO, RR_SFM_ENTRYWAY, 0x00FC },
-        { EntranceType::Overworld, RR_SFM_ENTRYWAY, RR_LW_BEYOND_MIDO, 0x01A9 } },
-      { { EntranceType::Overworld, RR_LW_BRIDGE, RR_HYRULE_FIELD, 0x0185 },
-        { EntranceType::Overworld, RR_HYRULE_FIELD, RR_LW_BRIDGE, 0x04DE } },
-      { { EntranceType::Overworld, RR_HYRULE_FIELD, RR_LAKE_HYLIA, 0x0102 },
-        { EntranceType::Overworld, RR_LAKE_HYLIA, RR_HYRULE_FIELD, 0x0189 } },
-      { { EntranceType::Overworld, RR_HYRULE_FIELD, RR_GERUDO_VALLEY, 0x0117 },
-        { EntranceType::Overworld, RR_GERUDO_VALLEY, RR_HYRULE_FIELD, 0x018D } },
-      { { EntranceType::Overworld, RR_HYRULE_FIELD, RR_MARKET_ENTRANCE, 0x0276 },
-        { EntranceType::Overworld, RR_MARKET_ENTRANCE, RR_HYRULE_FIELD, 0x01FD } },
-      { { EntranceType::Overworld, RR_HYRULE_FIELD, RR_KAKARIKO_VILLAGE, 0x00DB },
-        { EntranceType::Overworld, RR_KAKARIKO_VILLAGE, RR_HYRULE_FIELD, 0x017D } },
-      { { EntranceType::Overworld, RR_HYRULE_FIELD, RR_ZR_FRONT, 0x00EA },
-        { EntranceType::Overworld, RR_ZR_FRONT, RR_HYRULE_FIELD, 0x0181 } },
-      { { EntranceType::Overworld, RR_HYRULE_FIELD, RR_LON_LON_RANCH, 0x0157 },
-        { EntranceType::Overworld, RR_LON_LON_RANCH, RR_HYRULE_FIELD, 0x01F9 } },
-      { { EntranceType::Overworld, RR_LAKE_HYLIA, RR_ZORAS_DOMAIN, 0x0328 },
-        { EntranceType::Overworld, RR_ZORAS_DOMAIN, RR_LAKE_HYLIA, 0x0560 } },
-      { { EntranceType::Overworld, RR_GV_FORTRESS_SIDE, RR_GERUDO_FORTRESS, 0x0129 },
-        { EntranceType::Overworld, RR_GERUDO_FORTRESS, RR_GV_FORTRESS_SIDE, 0x022D } },
-      { { EntranceType::Overworld, RR_GF_OUTSIDE_GATE, RR_WASTELAND_NEAR_FORTRESS, 0x0130 },
-        { EntranceType::Overworld, RR_WASTELAND_NEAR_FORTRESS, RR_GF_OUTSIDE_GATE, 0x03AC } },
-      { { EntranceType::Overworld, RR_WASTELAND_NEAR_COLOSSUS, RR_DESERT_COLOSSUS, 0x0123 },
-        { EntranceType::Overworld, RR_DESERT_COLOSSUS, RR_WASTELAND_NEAR_COLOSSUS, 0x0365 } },
-      { { EntranceType::Overworld, RR_MARKET_ENTRANCE, RR_THE_MARKET, 0x00B1 },
-        { EntranceType::Overworld, RR_THE_MARKET, RR_MARKET_ENTRANCE, 0x0033 } },
-      { { EntranceType::Overworld, RR_THE_MARKET, RR_CASTLE_GROUNDS, 0x0138 },
-        { EntranceType::Overworld, RR_CASTLE_GROUNDS, RR_THE_MARKET, 0x025A } },
-      { { EntranceType::Overworld, RR_THE_MARKET, RR_TOT_ENTRANCE, 0x0171 },
-        { EntranceType::Overworld, RR_TOT_ENTRANCE, RR_THE_MARKET, 0x025E } },
-      { { EntranceType::Overworld, RR_KAKARIKO_VILLAGE, RR_THE_GRAVEYARD, 0x00E4 },
-        { EntranceType::Overworld, RR_THE_GRAVEYARD, RR_KAKARIKO_VILLAGE, 0x0195 } },
-      { { EntranceType::Overworld, RR_KAK_BEHIND_GATE, RR_DEATH_MOUNTAIN_TRAIL, 0x013D },
-        { EntranceType::Overworld, RR_DEATH_MOUNTAIN_TRAIL, RR_KAK_BEHIND_GATE, 0x0191 } },
-      { { EntranceType::Overworld, RR_DEATH_MOUNTAIN_TRAIL, RR_GORON_CITY, 0x014D },
-        { EntranceType::Overworld, RR_GORON_CITY, RR_DEATH_MOUNTAIN_TRAIL, 0x01B9 } },
-      { { EntranceType::Overworld, RR_GC_DARUNIAS_CHAMBER, RR_DMC_LOWER_LOCAL, 0x0246 },
-        { EntranceType::Overworld, RR_DMC_LOWER_NEARBY, RR_GC_DARUNIAS_CHAMBER, 0x01C1 } },
-      { { EntranceType::Overworld, RR_DEATH_MOUNTAIN_SUMMIT, RR_DMC_UPPER_LOCAL, 0x0147 },
-        { EntranceType::Overworld, RR_DMC_UPPER_NEARBY, RR_DEATH_MOUNTAIN_SUMMIT, 0x01BD } },
-      { { EntranceType::Overworld, RR_ZR_BEHIND_WATERFALL, RR_ZORAS_DOMAIN, 0x0108 },
-        { EntranceType::Overworld, RR_ZORAS_DOMAIN, RR_ZR_BEHIND_WATERFALL, 0x019D } },
-      { { EntranceType::Overworld, RR_ZD_BEHIND_KING_ZORA, RR_ZORAS_FOUNTAIN, 0x0225 },
-        { EntranceType::Overworld, RR_ZORAS_FOUNTAIN, RR_ZD_BEHIND_KING_ZORA, 0x01A1 } },
-
-      { { EntranceType::Overworld, RR_GV_LOWER_STREAM, RR_LAKE_HYLIA, 0x0219 }, NO_RETURN_ENTRANCE },
-
-      { { EntranceType::OwlDrop, RR_LH_OWL_FLIGHT, RR_HYRULE_FIELD, 0x027E }, NO_RETURN_ENTRANCE },
-      { { EntranceType::OwlDrop, RR_DMT_OWL_FLIGHT, RR_KAK_IMPAS_ROOFTOP, 0x0554 }, NO_RETURN_ENTRANCE },
-
-      { { EntranceType::Spawn, RR_CHILD_SPAWN, RR_KF_LINKS_HOUSE, 0x00BB }, NO_RETURN_ENTRANCE },
-      { { EntranceType::Spawn, RR_ADULT_SPAWN, RR_TEMPLE_OF_TIME, 0x0282 },
-        NO_RETURN_ENTRANCE }, // 0x282 is an unused entrance index repurposed to differentiate between
-                              // Adult Spawn and prelude of light (normally they both use 0x5F4)
-      { { EntranceType::WarpSong, RR_MINUET_OF_FOREST_WARP, RR_SACRED_FOREST_MEADOW, 0x0600 }, NO_RETURN_ENTRANCE },
-      { { EntranceType::WarpSong, RR_BOLERO_OF_FIRE_WARP, RR_DMC_CENTRAL_LOCAL, 0x04F6 }, NO_RETURN_ENTRANCE },
-      { { EntranceType::WarpSong, RR_SERENADE_OF_WATER_WARP, RR_LAKE_HYLIA, 0x0604 }, NO_RETURN_ENTRANCE },
-      { { EntranceType::WarpSong, RR_REQUIEM_OF_SPIRIT_WARP, RR_DESERT_COLOSSUS, 0x01F1 }, NO_RETURN_ENTRANCE },
-      { { EntranceType::WarpSong, RR_NOCTURNE_OF_SHADOW_WARP, RR_GRAVEYARD_WARP_PAD_REGION, 0x0568 },
-        NO_RETURN_ENTRANCE },
-      { { EntranceType::WarpSong, RR_PRELUDE_OF_LIGHT_WARP, RR_TEMPLE_OF_TIME, 0x05F4 }, NO_RETURN_ENTRANCE },
-
-      { { EntranceType::ChildBoss, RR_DEKU_TREE_BOSS_ENTRYWAY, RR_DEKU_TREE_BOSS_ROOM, 0x040F },
-        { EntranceType::ChildBoss, RR_DEKU_TREE_BOSS_ROOM, RR_DEKU_TREE_BOSS_ENTRYWAY, 0x0252, 0x0457 } },
-      { { EntranceType::ChildBoss, RR_DODONGOS_CAVERN_BOSS_ENTRYWAY, RR_DODONGOS_CAVERN_BOSS_ROOM, 0x040B },
-        { EntranceType::ChildBoss, RR_DODONGOS_CAVERN_BOSS_ROOM, RR_DODONGOS_CAVERN_BOSS_ENTRYWAY, 0x00C5, 0x047A } },
-      { { EntranceType::ChildBoss, RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY, RR_JABU_JABUS_BELLY_BOSS_ROOM, 0x0301 },
-        { EntranceType::ChildBoss, RR_JABU_JABUS_BELLY_BOSS_ROOM, RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY, 0x0407, 0x010E } },
-      { { EntranceType::AdultBoss, RR_FOREST_TEMPLE_BOSS_ENTRYWAY, RR_FOREST_TEMPLE_BOSS_ROOM, 0x000C },
-        { EntranceType::AdultBoss, RR_FOREST_TEMPLE_BOSS_ROOM, RR_FOREST_TEMPLE_BOSS_ENTRYWAY, 0x024E, 0x0608 } },
-      { { EntranceType::AdultBoss, RR_FIRE_TEMPLE_BOSS_ENTRYWAY, RR_FIRE_TEMPLE_BOSS_ROOM, 0x0305 },
-        { EntranceType::AdultBoss, RR_FIRE_TEMPLE_BOSS_ROOM, RR_FIRE_TEMPLE_BOSS_ENTRYWAY, 0x0175, 0x0564 } },
-      { { EntranceType::AdultBoss, RR_WATER_TEMPLE_BOSS_ENTRYWAY, RR_WATER_TEMPLE_BOSS_ROOM, 0x0417 },
-        { EntranceType::AdultBoss, RR_WATER_TEMPLE_BOSS_ROOM, RR_WATER_TEMPLE_BOSS_ENTRYWAY, 0x0423, 0x060C } },
-      { { EntranceType::AdultBoss, RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY, RR_SPIRIT_TEMPLE_BOSS_ROOM, 0x008D },
-        { EntranceType::AdultBoss, RR_SPIRIT_TEMPLE_BOSS_ROOM, RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY, 0x02F5, 0x0610 } },
-      { { EntranceType::AdultBoss, RR_SHADOW_TEMPLE_BOSS_ENTRYWAY, RR_SHADOW_TEMPLE_BOSS_ROOM, 0x0413 },
-        { EntranceType::AdultBoss, RR_SHADOW_TEMPLE_BOSS_ROOM, RR_SHADOW_TEMPLE_BOSS_ENTRYWAY, 0x02B2, 0x0580 } },
-  };
-
-  std::map<std::string, PriorityEntrance> priorityEntranceTable = {
-      { "Bolero", { { RR_DMC_CENTRAL_LOCAL }, { EntranceType::OwlDrop, EntranceType::WarpSong } } },
-      { "Nocturne",
-        { { RR_GRAVEYARD_WARP_PAD_REGION }, { EntranceType::OwlDrop, EntranceType::Spawn, EntranceType::WarpSong } } },
-      { "Requiem",
-        { { RR_DESERT_COLOSSUS, RR_DESERT_COLOSSUS_FROM_SPIRIT_ENTRYWAY },
-          { EntranceType::OwlDrop, EntranceType::Spawn, EntranceType::WarpSong } } },
-  };
-
-  entranceShuffleFailure = false;
-  SetAllEntrancesData(entranceShuffleTable);
-
-  EntrancePools oneWayEntrancePools = {};
-  EntrancePools entrancePools = {};
-  std::map<std::string, PriorityEntrance> oneWayPriorities = {};
-
-  // Owl Drops
-  if (Settings::ShuffleOwlDrops) {
-    oneWayEntrancePools[EntranceType::OwlDrop] = GetShuffleableEntrances(EntranceType::OwlDrop);
-  }
-
-  // Spawns
-  if (Settings::ShuffleOverworldSpawns) {
-    oneWayEntrancePools[EntranceType::Spawn] = GetShuffleableEntrances(EntranceType::Spawn);
-  }
-
-  // Warpsongs
-  if (Settings::ShuffleWarpSongs) {
-    oneWayEntrancePools[EntranceType::WarpSong] = GetShuffleableEntrances(EntranceType::WarpSong);
-    // In Glitchless, there aren't any other ways to access these areas
-    if (Settings::Logic.Is(LOGIC_GLITCHLESS)) {
-      oneWayPriorities["Bolero"] = priorityEntranceTable["Bolero"];
-      oneWayPriorities["Nocturne"] = priorityEntranceTable["Nocturne"];
-      if (!Settings::ShuffleDungeonEntrances && !Settings::ShuffleOverworldEntrances) {
-        oneWayPriorities["Requiem"] = priorityEntranceTable["Requiem"];
-      }
-    }
-  }
-
-  // Shuffle Bosses
-  if (Settings::ShuffleBossEntrances.IsNot(SHUFFLEBOSSES_OFF)) {
-    if (Settings::ShuffleBossEntrances.Is(SHUFFLEBOSSES_FULL)) {
-      entrancePools[EntranceType::Boss] = GetShuffleableEntrances(EntranceType::ChildBoss);
-      AddElementsToPool(entrancePools[EntranceType::Boss], GetShuffleableEntrances(EntranceType::AdultBoss));
-      // If forest is closed, ensure Ghoma is inside the Deku tree
-      // Deku tree being in its vanilla location is handled below
-      if (Settings::OpenForest.Is(OPENFOREST_CLOSED) && !(Settings::ShuffleOverworldEntrances || Settings::ShuffleInteriorEntrances)) {
-        FilterAndEraseFromPool(entrancePools[EntranceType::Boss], [](const Entrance* entrance){return entrance->GetParentRegionKey()    == RR_DEKU_TREE_BOSS_ENTRYWAY &&
-                                                                                                      entrance->GetConnectedRegionKey() == RR_DEKU_TREE_BOSS_ROOM;});
-      }
-    } else {
-      entrancePools[EntranceType::ChildBoss] = GetShuffleableEntrances(EntranceType::ChildBoss);
-      entrancePools[EntranceType::AdultBoss] = GetShuffleableEntrances(EntranceType::AdultBoss);
-      // If forest is closed, ensure Ghoma is inside the Deku tree
-      if (Settings::OpenForest.Is(OPENFOREST_CLOSED) && !(Settings::ShuffleOverworldEntrances || Settings::ShuffleInteriorEntrances)) {
-        FilterAndEraseFromPool(entrancePools[EntranceType::ChildBoss], [](const Entrance* entrance){return entrance->GetParentRegionKey()    == RR_DEKU_TREE_BOSS_ENTRYWAY &&
-                                                                                                           entrance->GetConnectedRegionKey() == RR_DEKU_TREE_BOSS_ROOM;});
-      }
-    }
-  }
-
-  //Shuffle Dungeon Entrances
-  if (Settings::ShuffleDungeonEntrances.IsNot(SHUFFLEDUNGEONS_OFF)) {
-    entrancePools[EntranceType::Dungeon] = GetShuffleableEntrances(EntranceType::Dungeon);
-	//Add Ganon's Castle, if set to On + Ganon
-    if (Settings::ShuffleDungeonEntrances.Is(SHUFFLEDUNGEONS_GANON)) {
-      AddElementsToPool(entrancePools[EntranceType::Dungeon], GetShuffleableEntrances(EntranceType::GanonDungeon));
-    }
-    //If forest is closed don't allow a forest escape via spirit temple hands
-    if (Settings::OpenForest.Is(OPENFOREST_CLOSED) && !(Settings::ShuffleOverworldEntrances || Settings::ShuffleInteriorEntrances)) {
-      FilterAndEraseFromPool(entrancePools[EntranceType::Dungeon], [](const Entrance* entrance){return entrance->GetParentRegionKey()    == RR_KF_OUTSIDE_DEKU_TREE &&
-                                                                                                       entrance->GetConnectedRegionKey() == RR_DEKU_TREE_ENTRYWAY;});
-    }
-    if (Settings::DecoupleEntrances) {
-      for (Entrance* entrance : entrancePools[EntranceType::Dungeon]) {
-        entrancePools[EntranceType::DungeonReverse].push_back(entrance->GetReverse());
-      }
-    }
-  }
-
-  // Interior entrances
-  if (Settings::ShuffleInteriorEntrances.IsNot(SHUFFLEINTERIORS_OFF)) {
-    entrancePools[EntranceType::Interior] = GetShuffleableEntrances(EntranceType::Interior);
-    // Special interiors
-    if (Settings::ShuffleInteriorEntrances.Is(SHUFFLEINTERIORS_ALL)) {
-      AddElementsToPool(entrancePools[EntranceType::Interior], GetShuffleableEntrances(EntranceType::SpecialInterior));
-    }
-    if (Settings::DecoupleEntrances) {
-      for (Entrance* entrance : entrancePools[EntranceType::Interior]) {
-        entrancePools[EntranceType::InteriorReverse].push_back(entrance->GetReverse());
-      }
-    }
-  }
-
-  //grotto entrances
-  if (Settings::ShuffleGrottoEntrances) {
-    entrancePools[EntranceType::GrottoGrave] = GetShuffleableEntrances(EntranceType::GrottoGrave);
-
-    if (Settings::DecoupleEntrances) {
-      for (Entrance* entrance : entrancePools[EntranceType::GrottoGrave]) {
-        entrancePools[EntranceType::GrottoGraveReverse].push_back(entrance->GetReverse());
-      }
-    }
-  }
-
-  //overworld entrances
-  if (Settings::ShuffleOverworldEntrances) {
-    bool excludeOverworldReverse = Settings::MixOverworld && !Settings::DecoupleEntrances;
-    entrancePools[EntranceType::Overworld] = GetShuffleableEntrances(EntranceType::Overworld, excludeOverworldReverse);
-    // Only shuffle GV Lower Stream -> Lake Hylia if decoupled entrances are on
-    if (!Settings::DecoupleEntrances) {
-      FilterAndEraseFromPool(entrancePools[EntranceType::Overworld], [](const Entrance* entrance){return entrance->GetParentRegionKey()    == RR_GV_LOWER_STREAM &&
-                                                                                                         entrance->GetConnectedRegionKey() == RR_LAKE_HYLIA;});
-    }
-  }
-
-  // Set shuffled entrances as such
-  SetShuffledEntrances(entrancePools);
-  SetShuffledEntrances(oneWayEntrancePools);
-
-  //combine entrance pools if mixing pools. Only continue if more than one pool is selected.
-  int totalMixedPools = (Settings::MixDungeons ? 1 : 0) + (Settings::MixOverworld ? 1 : 0) + (Settings::MixInteriors ? 1 : 0) + (Settings::MixGrottos ? 1 : 0);
-  if (totalMixedPools < 2) {
-    Settings::MixedEntrancePools.SetSelectedIndex(OFF);
-    Settings::MixDungeons.SetSelectedIndex(OFF);
-    Settings::MixOverworld.SetSelectedIndex(OFF);
-    Settings::MixInteriors.SetSelectedIndex(OFF);
-    Settings::MixGrottos.SetSelectedIndex(OFF);
-  }
-  if (Settings::MixedEntrancePools) {
-    std::set<EntranceType> poolsToMix = {};
-    if (Settings::MixDungeons) {
-      poolsToMix.insert(EntranceType::Dungeon);
-      // Insert reverse entrances when decoupled entrances is on
-      if (Settings::DecoupleEntrances) {
-        poolsToMix.insert(EntranceType::DungeonReverse);
-      }
-    }
-    if (Settings::MixOverworld) {
-      poolsToMix.insert(EntranceType::Overworld);
-    }
-    if (Settings::MixInteriors) {
-      poolsToMix.insert(EntranceType::Interior);
-      if (Settings::DecoupleEntrances) {
-        poolsToMix.insert(EntranceType::InteriorReverse);
-      }
-    }
-    if (Settings::MixGrottos) {
-      poolsToMix.insert(EntranceType::GrottoGrave);
-      if (Settings::DecoupleEntrances) {
-        poolsToMix.insert(EntranceType::GrottoGraveReverse);
-      }
-    }
-
-    for (auto& pool : entrancePools) {
-
-      auto type = pool.first;
-
-      if (poolsToMix.count(type) > 0) {
-        AddElementsToPool(entrancePools[EntranceType::Mixed], pool.second);
-        entrancePools[type].clear();
-      }
-    }
-  }
-
-  // Build target entrance pools and set the assumption for entrances being reachable
-  EntrancePools oneWayTargetEntrancePools = {};
-  for (auto& pool : oneWayEntrancePools) {
-
-    std::vector<EntranceType> validTargetTypes = {};
-    EntranceType poolType = pool.first;
-
-    if (poolType == EntranceType::OwlDrop) {
-      validTargetTypes = {EntranceType::WarpSong, EntranceType::OwlDrop, EntranceType::Overworld, EntranceType::Extra};
-      oneWayTargetEntrancePools[poolType] = BuildOneWayTargets(validTargetTypes, {std::make_pair(RR_PRELUDE_OF_LIGHT_WARP, RR_TEMPLE_OF_TIME)});
-      // Owl Drops are only accessible as child, so targets should reflect that
-      for (Entrance* target : oneWayTargetEntrancePools[poolType]) {
-        target->SetCondition([]{return Logic::IsChild;});
-      }
-
-    } else if (poolType == EntranceType::Spawn) {
-      validTargetTypes = {EntranceType::Spawn, EntranceType::WarpSong, EntranceType::OwlDrop, EntranceType::Overworld, EntranceType::Interior, EntranceType::SpecialInterior, EntranceType::GrottoGrave, EntranceType::Extra};
-      oneWayTargetEntrancePools[poolType] = BuildOneWayTargets(validTargetTypes);
-
-    } else if (poolType == EntranceType::WarpSong) {
-      validTargetTypes = {EntranceType::Spawn, EntranceType::WarpSong, EntranceType::OwlDrop, EntranceType::Overworld, EntranceType::Interior, EntranceType::SpecialInterior, EntranceType::GrottoGrave, EntranceType::Extra};
-      oneWayTargetEntrancePools[poolType] = BuildOneWayTargets(validTargetTypes);
-    }
-    // for target in one_way_target_entrance_pools[pool_type]:
-    //           target.add_rule((lambda entrances=entrance_pool: (lambda state, **kwargs: any(entrance.connected_region == None for entrance in entrances)))())
-  }
-
-  // Disconnect all one way entrances at this point (they need to be connected during all of the above process)
-  for (auto& pool : oneWayEntrancePools) {
-    for (Entrance* entrance : pool.second) {
-      totalRandomizableEntrances++;
-      entrance->Disconnect();
-    }
-  }
-
-  // Assume entrance pools for each type
-  EntrancePools targetEntrancePools = {};
-  for (auto& pool : entrancePools) {
-    targetEntrancePools[pool.first] = AssumeEntrancePool(pool.second);
-  }
-
-  //distribution stuff
-
-  //check placed on-way entrances
-  //remove replaced entrances so we don't place two in one target
-  //remvoe priority targets if any placed entrances point at their regions
-
-  // Place priority entrances
-  ShuffleOneWayPriorityEntrances(oneWayPriorities, oneWayEntrancePools, oneWayTargetEntrancePools);
-  if (entranceShuffleFailure) {
-    return ENTRANCE_SHUFFLE_FAILURE;
-  }
-
-  // Delete all targets that we just placed from one way target pools so
-  // multiple one way entrances don't use the same target
-  std::vector<Entrance*> replacedEntrances = {};
-  for (auto& pool : oneWayEntrancePools) {
-    for (Entrance* entrance : pool.second) {
-      if (entrance->GetReplacement() != nullptr) {
-        replacedEntrances.push_back(entrance);
-      }
-    }
-  }
-  for (auto& pool : oneWayTargetEntrancePools) {
-    for (Entrance* remainingTarget : pool.second) {
-      auto replacement = remainingTarget->GetReplacement();
-      if (ElementInContainer(replacement, replacedEntrances)) {
-        DeleteTargetEntrance(remainingTarget);
-      }
-    }
-  }
-
-  // Shuffle all one way entrances among pools to shuffle
-  for (auto& pool : oneWayEntrancePools) {
-    ShuffleEntrancePool(pool.second, oneWayTargetEntrancePools[pool.first], 5);
-    if (entranceShuffleFailure) {
-      return ENTRANCE_SHUFFLE_FAILURE;
-    }
-    // Delete all targets that we just placed from other one way target pools so
-    // multiple one way entrances don't use the same target
-    replacedEntrances = FilterFromPool(pool.second, [](Entrance* entrance){
-      return entrance->GetReplacement() != nullptr;
-    });
-    for (auto& targetPool : oneWayTargetEntrancePools) {
-      for (Entrance* remainingTarget : targetPool.second) {
-        auto replacement = remainingTarget->GetReplacement();
-        if (ElementInContainer(replacement, replacedEntrances)) {
-          DeleteTargetEntrance(remainingTarget);
-        }
-      }
-    }
-    // Delete all unused extra targets after placing a one way pool, since the
-    // unused targets won't ever be replaced
-    for (Entrance* unusedTarget : oneWayTargetEntrancePools[pool.first]) {
-      DeleteTargetEntrance(unusedTarget);
-    }
-  }
-
-  //shuffle all entrances among pools to shuffle
-  for (auto& pool : entrancePools) {
-    ShuffleEntrancePool(pool.second, targetEntrancePools[pool.first]);
-    if (entranceShuffleFailure) {
-      return ENTRANCE_SHUFFLE_FAILURE;
-    }
-  }
-
-  return ENTRANCE_SHUFFLE_SUCCESS;
-}
-
-// Save the set of shuffled entrances that will be sent to the patch
-void CreateEntranceOverrides() {
-  entranceOverrides.clear();
-  if (noRandomEntrances) {
-    return;
-  }
-  SPDLOG_DEBUG("\nCREATING ENTRANCE OVERRIDES\n");
-  auto allShuffleableEntrances = GetShuffleableEntrances(EntranceType::All, false);
-
-  for (Entrance* entrance : allShuffleableEntrances) {
-
-    //Double-check to make sure the entrance is actually shuffled
-    if (!entrance->IsShuffled()) {
-      continue;
-    }
-
-    auto message = "Setting " + entrance->to_string() + "\n";
-    SPDLOG_DEBUG(message);
-
-    int16_t originalIndex = entrance->GetIndex();
-    int16_t originalBlueWarp = entrance->GetBlueWarp();
-    int16_t replacementIndex = entrance->GetReplacement()->GetIndex();
-
-    int16_t destinationIndex = -1;
-    int16_t replacementDestinationIndex = -1;
-
-    // Only set destination indices for two way entrances and when decouple entrances
-    // is off
-    if (entrance->GetReverse() != nullptr && !Settings::DecoupleEntrances) {
-      replacementDestinationIndex = entrance->GetReplacement()->GetReverse()->GetIndex();
-      destinationIndex = entrance->GetReverse()->GetIndex();
-    }
-
-    entranceOverrides.push_back({
-      .index = originalIndex,
-      .destination = destinationIndex,
-      .blueWarp = originalBlueWarp,
-      .override = replacementIndex,
-      .overrideDestination = replacementDestinationIndex,
-    });
-
-    message = "\tOriginal: " + std::to_string(originalIndex) + "\n";
-    SPDLOG_DEBUG(message);
-    message = "\tReplacement " + std::to_string(replacementIndex) + "\n";
-    SPDLOG_DEBUG(message);
-  }
-}
-
-std::vector<std::list<Entrance*>> playthroughEntrances;
diff --git a/soh/soh/Enhancements/randomizer/3drando/entrance.hpp b/soh/soh/Enhancements/randomizer/3drando/entrance.hpp
deleted file mode 100644
index d9c62a5fb..000000000
--- a/soh/soh/Enhancements/randomizer/3drando/entrance.hpp
+++ /dev/null
@@ -1,289 +0,0 @@
-#pragma once
-
-#include "location_access.hpp"
-
-#include <string>
-#include <list>
-
-#include "../randomizer_entrance.h"
-
-#define ENTRANCE_SHUFFLE_SUCCESS 0
-#define ENTRANCE_SHUFFLE_FAILURE 1
-
-extern std::list<EntranceOverride> entranceOverrides;
-
-enum class EntranceType {
-    None,
-    OwlDrop,
-    Spawn,
-    WarpSong,
-    Dungeon,
-    GanonDungeon,
-    DungeonReverse,
-    Boss,
-    ChildBoss,
-    AdultBoss,
-    Interior,
-    InteriorReverse,
-    SpecialInterior,
-    GrottoGrave,
-    GrottoGraveReverse,
-    Overworld,
-    Extra,
-    Mixed,
-    All,
-};
-
-class Entrance {
-public:
-
-    Entrance(RandomizerRegion connectedRegion_, std::vector<ConditionFn> conditions_met_)
-        : connectedRegion(connectedRegion_) {
-        conditions_met.resize(2);
-        for (size_t i = 0; i < conditions_met_.size(); i++) {
-            conditions_met[i] = conditions_met_[i];
-        }
-    }
-
-    // Resets the glitchless condition for the entrance
-    void SetCondition(ConditionFn newCondition) {
-        conditions_met[0] = newCondition;
-    }
-
-    bool GetConditionsMet() const {
-        if (Settings::Logic.Is(LOGIC_NONE) || Settings::Logic.Is(LOGIC_VANILLA)) {
-            return true;
-        } else if (Settings::Logic.Is(LOGIC_GLITCHLESS)) {
-            return conditions_met[0]();
-        } else if (Settings::Logic.Is(LOGIC_GLITCHED)) {
-            if (conditions_met[0]()) {
-                return true;
-            } else if (conditions_met[1] != NULL) {
-                return conditions_met[1]();
-            }
-        }
-        return false;
-    }
-
-    std::string to_string() const {
-        return AreaTable(parentRegion)->regionName + " -> " + AreaTable(connectedRegion)->regionName;
-    }
-
-    void SetName(std::string name_ = "") {
-        if (name_ == "") {
-          name = AreaTable(parentRegion)->regionName + " -> " + AreaTable(connectedRegion)->regionName;
-        } else {
-          name = std::move(name_);
-        }
-
-    }
-
-    std::string GetName() const {
-        return name;
-    }
-
-    void printAgeTimeAccess() {
-      //CitraPrint("Name: ");
-      //CitraPrint(name);
-      auto message = "Child Day:   " + std::to_string(CheckConditionAtAgeTime(Logic::IsChild, Logic::AtDay))   + "\t"
-                     "Child Night: " + std::to_string(CheckConditionAtAgeTime(Logic::IsChild, Logic::AtNight)) + "\t"
-                     "Adult Day:   " + std::to_string(CheckConditionAtAgeTime(Logic::IsAdult, Logic::AtDay))   + "\t"
-                     "Adult Night: " + std::to_string(CheckConditionAtAgeTime(Logic::IsAdult, Logic::AtNight));
-      //CitraPrint(message);
-    }
-
-    bool ConditionsMet(bool allAgeTimes = false) const {
-
-        Area* parent = AreaTable(parentRegion);
-        int conditionsMet = 0;
-
-        if (allAgeTimes && !parent->AllAccess()) {
-            return false;
-        }
-
-        //check all possible day/night condition combinations
-        conditionsMet = (parent->childDay   && CheckConditionAtAgeTime(Logic::IsChild, Logic::AtDay, allAgeTimes))   +
-                        (parent->childNight && CheckConditionAtAgeTime(Logic::IsChild, Logic::AtNight, allAgeTimes)) +
-                        (parent->adultDay   && CheckConditionAtAgeTime(Logic::IsAdult, Logic::AtDay, allAgeTimes))   +
-                        (parent->adultNight && CheckConditionAtAgeTime(Logic::IsAdult, Logic::AtNight, allAgeTimes));
-
-        return conditionsMet && (!allAgeTimes || conditionsMet == 4);
-    }
-
-    uint32_t Getuint32_t() const {
-        return connectedRegion;
-    }
-
-    //set the logic to be a specific age and time of day and see if the condition still holds
-    bool CheckConditionAtAgeTime(bool& age, bool& time, bool passAnyway = false) const {
-
-        Logic::IsChild = false;
-        Logic::IsAdult = false;
-        Logic::AtDay   = false;
-        Logic::AtNight = false;
-
-        time = true;
-        age = true;
-
-        Logic::UpdateHelpers();
-        return GetConditionsMet() && (connectedRegion != RR_NONE || passAnyway);
-    }
-
-    RandomizerRegion GetConnectedRegionKey() const {
-        return connectedRegion;
-    }
-
-    Area* GetConnectedRegion() const {
-        return AreaTable(connectedRegion);
-    }
-
-    void SetParentRegion(RandomizerRegion newParent) {
-        parentRegion = newParent;
-    }
-
-    RandomizerRegion GetParentRegionKey() const {
-        return parentRegion;
-    }
-
-    Area* GetParentRegion() const {
-        return AreaTable(parentRegion);
-    }
-
-    void SetNewEntrance(RandomizerRegion newRegion) {
-        connectedRegion = newRegion;
-    }
-
-    void SetAsShuffled() {
-        shuffled = true;
-    }
-
-    bool IsShuffled() const {
-        return shuffled;
-    }
-
-    bool IsAddedToPool() const {
-        return addedToPool;
-    }
-
-    void AddToPool() {
-        addedToPool = true;
-    }
-
-    void RemoveFromPool() {
-        addedToPool = false;
-    }
-
-    void SetAsPrimary() {
-        primary = true;
-    }
-
-    bool IsPrimary() const {
-        return primary;
-    }
-
-    bool IsDecoupled() const {
-        return decoupled;
-    }
-
-    void SetDecoupled() {
-        decoupled = true;
-    }
-
-    int16_t GetIndex() const {
-        return index;
-    }
-
-    void SetIndex(int16_t newIndex) {
-        index = newIndex;
-    }
-
-    int16_t GetBlueWarp() const {
-        return blueWarp;
-    }
-
-    void SetBlueWarp(int16_t newBlueWarp) {
-        blueWarp = newBlueWarp;
-    }
-
-    Entrance* GetAssumed() const {
-        return assumed;
-    }
-
-    void SetReplacement(Entrance* newReplacement) {
-        replacement = newReplacement;
-    }
-
-    Entrance* GetReplacement() const {
-        return replacement;
-    }
-
-    EntranceType GetType() const {
-        return type;
-    }
-
-    void SetType(EntranceType newType) {
-        type = newType;
-    }
-
-    Entrance* GetReverse() const {
-        return reverse;
-    }
-
-    void Connect(RandomizerRegion newConnectedRegion) {
-        connectedRegion = newConnectedRegion;
-        AreaTable(newConnectedRegion)->entrances.push_front(this);
-    }
-
-    RandomizerRegion Disconnect() {
-        AreaTable(connectedRegion)->entrances.remove_if([this](const auto entrance){return this == entrance;});
-        RandomizerRegion previouslyConnected = connectedRegion;
-        connectedRegion = RR_NONE;
-        return previouslyConnected;
-    }
-
-    void BindTwoWay(Entrance* otherEntrance) {
-        reverse = otherEntrance;
-        otherEntrance->reverse = this;
-    }
-
-    Entrance* GetNewTarget() {
-        AreaTable(RR_ROOT)->AddExit(RR_ROOT, connectedRegion, []{return true;});
-        Entrance* targetEntrance = AreaTable(RR_ROOT)->GetExit(connectedRegion);
-        targetEntrance->SetReplacement(this);
-        targetEntrance->SetName(GetParentRegion()->regionName + " -> " + GetConnectedRegion()->regionName);
-        return targetEntrance;
-    }
-
-    Entrance* AssumeReachable() {
-        if (assumed == nullptr) {
-            assumed = GetNewTarget();
-            Disconnect();
-        }
-        return assumed;
-    }
-
-private:
-    RandomizerRegion parentRegion;
-    RandomizerRegion connectedRegion;
-    std::vector<ConditionFn> conditions_met;
-
-    //Entrance Randomizer stuff
-    EntranceType type = EntranceType::None;
-    Entrance* target = nullptr;
-    Entrance* reverse = nullptr;
-    Entrance* assumed = nullptr;
-    Entrance* replacement = nullptr;
-    int16_t index = 0xFFFF;
-    int16_t blueWarp = 0;
-    bool shuffled = false;
-    bool primary = false;
-    bool addedToPool = false;
-    bool decoupled = false;
-    std::string name = "";
-};
-
-int  ShuffleAllEntrances();
-void CreateEntranceOverrides();
-
-extern std::vector<std::list<Entrance*>> playthroughEntrances;
-extern bool noRandomEntrances;
diff --git a/soh/soh/Enhancements/randomizer/3drando/fill.cpp b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
index a3db898b3..3effc3840 100644
--- a/soh/soh/Enhancements/randomizer/3drando/fill.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
@@ -1,7 +1,7 @@
 #include "fill.hpp"
 
 #include "custom_messages.hpp"
-#include "dungeon.hpp"
+#include "../dungeon.h"
 #include "../context.h"
 #include "item_pool.hpp"
 #include "location_access.hpp"
@@ -11,8 +11,9 @@
 #include "starting_inventory.hpp"
 #include "hints.hpp"
 #include "hint_list.hpp"
-#include "entrance.hpp"
+#include "../entrance.h"
 #include "shops.hpp"
+#include "pool_functions.hpp"
 //#include "debug.hpp"
 #include "soh/Enhancements/randomizer/static_data.h"
 
@@ -22,7 +23,7 @@
 
 using namespace CustomMessages;
 using namespace Logic;
-using namespace Settings;
+using namespace Rando;
 
 static bool placementFailure = false;
 
@@ -90,14 +91,15 @@ static bool UpdateToDAccess(Entrance* entrance, SearchMode mode) {
 
 // Various checks that need to pass for the world to be validated as completable
 static void ValidateWorldChecks(SearchMode& mode, bool checkPoeCollectorAccess, bool checkOtherEntranceAccess, std::vector<RandomizerRegion>& areaPool) {
+  auto ctx = Rando::Context::GetInstance();
   // Condition for validating Temple of Time Access
-  if (mode == SearchMode::TempleOfTimeAccess && ((Settings::ResolvedStartingAge == AGE_CHILD && AreaTable(RR_TEMPLE_OF_TIME)->Adult()) || (Settings::ResolvedStartingAge == AGE_ADULT && AreaTable(RR_TEMPLE_OF_TIME)->Child()) || !checkOtherEntranceAccess)) {
+  if (mode == SearchMode::TempleOfTimeAccess && ((ctx->GetSettings()->ResolvedStartingAge() == RO_AGE_CHILD && AreaTable(RR_TEMPLE_OF_TIME)->Adult()) || (ctx->GetSettings()->ResolvedStartingAge() == RO_AGE_ADULT && AreaTable(RR_TEMPLE_OF_TIME)->Child()) || !checkOtherEntranceAccess)) {
     mode = SearchMode::ValidStartingRegion;
   }
   // Condition for validating a valid starting region
   if (mode == SearchMode::ValidStartingRegion) {
-    bool childAccess = Settings::ResolvedStartingAge == AGE_CHILD || AreaTable(RR_TOT_BEYOND_DOOR_OF_TIME)->Child();
-    bool adultAccess = Settings::ResolvedStartingAge == AGE_ADULT || AreaTable(RR_TOT_BEYOND_DOOR_OF_TIME)->Adult();
+    bool childAccess = ctx->GetSettings()->ResolvedStartingAge() == RO_AGE_CHILD || AreaTable(RR_TOT_BEYOND_DOOR_OF_TIME)->Child();
+    bool adultAccess = ctx->GetSettings()->ResolvedStartingAge() == RO_AGE_ADULT || AreaTable(RR_TOT_BEYOND_DOOR_OF_TIME)->Adult();
 
     Area* kokiri = AreaTable(RR_KOKIRI_FOREST);
     Area* kakariko = AreaTable(RR_KAKARIKO_VILLAGE);
@@ -119,7 +121,7 @@ static void ValidateWorldChecks(SearchMode& mode, bool checkPoeCollectorAccess,
       Rando::StaticData::RetrieveItem(unplacedItem).ApplyEffect();
     }
     // Reset access as the non-starting age
-    if (Settings::ResolvedStartingAge == AGE_CHILD) {
+    if (ctx->GetSettings()->ResolvedStartingAge() == RO_AGE_CHILD) {
       for (RandomizerRegion areaKey : areaPool) {
         AreaTable(areaKey)->adultDay = false;
         AreaTable(areaKey)->adultNight = false;
@@ -142,11 +144,11 @@ static int GetMaxGSCount() {
   //If bridge or LACS is set to tokens, get how many are required
   int maxBridge = 0;
   int maxLACS = 0;
-  if (Settings::Bridge.Is(RAINBOWBRIDGE_TOKENS)) {
-    maxBridge = Settings::BridgeTokenCount.Value<uint8_t>();
+  if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_TOKENS)) {
+    maxBridge = ctx->GetOption(RSK_RAINBOW_BRIDGE_TOKEN_COUNT).Value<uint8_t>();
   }
-  if (Settings::GanonsBossKey.Is(GANONSBOSSKEY_LACS_TOKENS)) {
-    maxLACS = Settings::LACSTokenCount.Value<uint8_t>();
+  if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_TOKENS)) {
+    maxLACS = ctx->GetOption(RSK_LACS_TOKEN_COUNT).Value<uint8_t>();
   }
   maxBridge = std::max(maxBridge, maxLACS);
   //Get the max amount of GS which could be useful from token reward locations
@@ -171,7 +173,7 @@ static int GetMaxGSCount() {
       maxUseful = 10;
   }
   //Return max of the two possible reasons tokens could be important, minus the tokens in the starting inventory
-  return std::max(maxUseful, maxBridge) - StartingSkulltulaToken.Value<uint8_t>();
+  return std::max(maxUseful, maxBridge) - ctx->GetOption(RSK_STARTING_SKULLTULA_TOKEN).Value<uint8_t>();
 }
 
 std::string GetShopItemBaseName(std::string itemName) {
@@ -306,7 +308,7 @@ std::vector<RandomizerCheck> GetAccessibleLocations(const std::vector<Randomizer
         }
 
         // Add shuffled entrances to the entrance playthrough
-        if (mode == SearchMode::GeneratePlaythrough && exit.IsShuffled() && !exit.IsAddedToPool() && !noRandomEntrances) {
+        if (mode == SearchMode::GeneratePlaythrough && exit.IsShuffled() && !exit.IsAddedToPool() && !ctx->GetEntranceShuffler()->HasNoRandomEntrances()) {
           entranceSphere.push_back(&exit);
           exit.AddToPool();
           // Don't list a two-way coupled entrance from both directions
@@ -384,7 +386,8 @@ std::vector<RandomizerCheck> GetAccessibleLocations(const std::vector<Randomizer
                 }
                 //Handle buy items
                 //If ammo drops are off, don't do this step, since buyable ammo becomes logically important
-                else if (AmmoDrops.IsNot(AMMODROPS_NONE) && !(bombchus && bombchusFound) && type == ITEMTYPE_SHOP) {
+                // TODO: Reimplement Ammo Drops setting
+                else if (/*AmmoDrops.IsNot(AMMODROPS_NONE) &&*/ !(bombchus && bombchusFound) && type == ITEMTYPE_SHOP) {
                   //Only check each buy item once
                   std::string buyItem = GetShopItemBaseName(itemName);
                   //Buy item not in list to ignore, add it to list and write to playthrough
@@ -394,7 +397,7 @@ std::vector<RandomizerCheck> GetAccessibleLocations(const std::vector<Randomizer
                   }
                 }
                 //Add all other advancement items
-                else if (!bombchus && type != ITEMTYPE_TOKEN && (AmmoDrops.Is(AMMODROPS_NONE) || type != ITEMTYPE_SHOP)) {
+                else if (!bombchus && type != ITEMTYPE_TOKEN && (/*AmmoDrops.Is(AMMODROPS_NONE) ||*/ type != ITEMTYPE_SHOP)) {
                   exclude = false;
                 }
                 //Has not been excluded, add to playthrough
@@ -422,8 +425,8 @@ std::vector<RandomizerCheck> GetAccessibleLocations(const std::vector<Randomizer
     if (mode == SearchMode::GeneratePlaythrough && itemSphere.size() > 0) {
       ctx->playthroughLocations.push_back(itemSphere);
     }
-    if (mode == SearchMode::GeneratePlaythrough && entranceSphere.size() > 0 && !noRandomEntrances) {
-      playthroughEntrances.push_back(entranceSphere);
+    if (mode == SearchMode::GeneratePlaythrough && entranceSphere.size() > 0 && !ctx->GetEntranceShuffler()->HasNoRandomEntrances()) {
+      ctx->GetEntranceShuffler()->playthroughEntrances.push_back(entranceSphere);
     }
   }
 
@@ -605,7 +608,7 @@ static void AssumedFill(const std::vector<RandomizerGet>& items, const std::vect
         return;
     }
 
-    if (Settings::Logic.Is(LOGIC_NONE)) {
+    if (ctx->GetOption(RSK_LOGIC_RULES).Is(RO_LOGIC_NO_LOGIC)) {
         FastFill(items, GetEmptyLocations(allowedLocations), true);
         return;
     }
@@ -683,7 +686,7 @@ static void AssumedFill(const std::vector<RandomizerGet>& items, const std::vect
 
             // If ALR is off, then we check beatability after placing the item.
             // If the game is beatable, then we can stop placing items with logic.
-            if (!LocationsReachable) {
+            if (!ctx->GetOption(RSK_ALL_LOCATIONS_REACHABLE)) {
                 ctx->playthroughBeatable = false;
                 LogicReset();
                 GetAccessibleLocations(ctx->allLocations, SearchMode::CheckBeatable);
@@ -702,22 +705,23 @@ static void AssumedFill(const std::vector<RandomizerGet>& items, const std::vect
 //setting, or randomize one dungeon reward to Link's Pocket if that setting is on
 static void RandomizeDungeonRewards() {
   auto ctx = Rando::Context::GetInstance();
+  std::array<uint32_t, 9> rDungeonRewardOverrides{};
   //quest item bit mask of each stone/medallion for the savefile
-  static constexpr std::array<uint32_t, 9> bitMaskTable = {
-    0x00040000, //Kokiri Emerald
-    0x00080000, //Goron Ruby
-    0x00100000, //Zora Sapphire
-    0x00000001, //Forest Medallion
-    0x00000002, //Fire Medallion
-    0x00000004, //Water Medallion
-    0x00000008, //Spirit Medallion
-    0x00000010, //Shadow Medallion
-    0x00000020, //Light Medallion
-  };
+  // static constexpr std::array<uint32_t, 9> bitMaskTable = {
+  //   0x00040000, //Kokiri Emerald
+  //   0x00080000, //Goron Ruby
+  //   0x00100000, //Zora Sapphire
+  //   0x00000001, //Forest Medallion
+  //   0x00000002, //Fire Medallion
+  //   0x00000004, //Water Medallion
+  //   0x00000008, //Spirit Medallion
+  //   0x00000010, //Shadow Medallion
+  //   0x00000020, //Light Medallion
+  // };
   int baseOffset = Rando::StaticData::RetrieveItem(RG_KOKIRI_EMERALD).GetItemID();
 
   //End of Dungeons includes Link's Pocket
-  if (ShuffleRewards.Is(REWARDSHUFFLE_END_OF_DUNGEON)) {
+  if (ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_END_OF_DUNGEON)) {
     //get stones and medallions
     std::vector<RandomizerGet> rewards = FilterAndEraseFromPool(ItemPool, [](const auto i) {return Rando::StaticData::RetrieveItem(i).GetItemType() == ITEMTYPE_DUNGEONREWARD;});
 
@@ -727,7 +731,7 @@ static void RandomizeDungeonRewards() {
       ctx->PlaceItemInLocation(RC_LINKS_POCKET, RG_GREEN_RUPEE);
     }
 
-    if (Settings::Logic.Is(LOGIC_VANILLA)) { //Place dungeon rewards in vanilla locations
+    if (ctx->GetOption(RSK_LOGIC_RULES).Is(RO_LOGIC_VANILLA)) { //Place dungeon rewards in vanilla locations
       for (RandomizerCheck loc : Rando::StaticData::dungeonRewardLocations) {
         ctx->GetItemLocation(loc)->PlaceVanillaItem();
       }
@@ -742,11 +746,11 @@ static void RandomizeDungeonRewards() {
       //set the player's dungeon reward on file creation instead of pushing it to them at the start.
       //This is done mainly because players are already familiar with seeing their dungeon reward
       //before opening up their file
-      if (i == Rando::StaticData::dungeonRewardLocations.size()-1) {
-        LinksPocketRewardBitMask = bitMaskTable[index];
-      }
+      // if (i == Rando::StaticData::dungeonRewardLocations.size()-1) {
+      //   LinksPocketRewardBitMask = bitMaskTable[index];
+      // }
     }
-  } else if (LinksPocketItem.Is(LINKSPOCKETITEM_DUNGEON_REWARD)) {
+  } else if (ctx->GetOption(RSK_LINKS_POCKET).Is(RO_LINKS_POCKET_DUNGEON_REWARD)) {
     //get 1 stone/medallion
     std::vector<RandomizerGet> rewards = FilterFromPool(
         ItemPool, [](const auto i) { return Rando::StaticData::RetrieveItem(i).GetItemType() == ITEMTYPE_DUNGEONREWARD; });
@@ -757,7 +761,7 @@ static void RandomizeDungeonRewards() {
     }
     RandomizerGet startingReward = RandomElement(rewards, true);
 
-    LinksPocketRewardBitMask = bitMaskTable[Rando::StaticData::RetrieveItem(startingReward).GetItemID() - baseOffset];
+    //LinksPocketRewardBitMask = bitMaskTable[Rando::StaticData::RetrieveItem(startingReward).GetItemID() - baseOffset];
     ctx->PlaceItemInLocation(RC_LINKS_POCKET, startingReward);
     //erase the stone/medallion from the Item Pool
     FilterAndEraseFromPool(ItemPool, [startingReward](const RandomizerGet i) {return i == startingReward;});
@@ -779,7 +783,7 @@ static void FillExcludedLocations() {
 }
 
 //Function to handle the Own Dungeon setting
-static void RandomizeOwnDungeon(const Dungeon::DungeonInfo* dungeon) {
+static void RandomizeOwnDungeon(const Rando::DungeonInfo* dungeon) {
   auto ctx = Rando::Context::GetInstance();
   std::vector<RandomizerGet> dungeonItems;
 
@@ -791,24 +795,24 @@ static void RandomizeOwnDungeon(const Dungeon::DungeonInfo* dungeon) {
   });
 
   //filter out locations that may be required to have songs placed at them
-  dungeonLocations = FilterFromPool(dungeonLocations, [](const auto loc){
-    if (ShuffleSongs.Is(SONGSHUFFLE_SONG_LOCATIONS)) {
+  dungeonLocations = FilterFromPool(dungeonLocations, [ctx](const auto loc){
+    if (ctx->GetOption(RSK_SHUFFLE_SONGS).Is(RO_SONG_SHUFFLE_SONG_LOCATIONS)) {
       return !(Rando::StaticData::GetLocation(loc)->IsCategory(Category::cSong));
     }
-    if (ShuffleSongs.Is(SONGSHUFFLE_DUNGEON_REWARDS)) {
+    if (ctx->GetOption(RSK_SHUFFLE_SONGS).Is(RO_SONG_SHUFFLE_SONG_LOCATIONS)) {
       return !(Rando::StaticData::GetLocation(loc)->IsCategory(Category::cSongDungeonReward));
     }
     return true;
   });
 
   //Add specific items that need be randomized within this dungeon
-  if (Keysanity.Is(KEYSANITY_OWN_DUNGEON) && dungeon->GetSmallKey() != RG_NONE) {
+  if (ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_OWN_DUNGEON) && dungeon->GetSmallKey() != RG_NONE) {
     std::vector<RandomizerGet> dungeonSmallKeys = FilterAndEraseFromPool(ItemPool, [dungeon](const RandomizerGet i){ return (i == dungeon->GetSmallKey()) || (i == dungeon->GetKeyRing());});
     AddElementsToPool(dungeonItems, dungeonSmallKeys);
   }
 
-  if ((BossKeysanity.Is(BOSSKEYSANITY_OWN_DUNGEON) && dungeon->GetBossKey() != RG_GANONS_CASTLE_BOSS_KEY) ||
-      (GanonsBossKey.Is(GANONSBOSSKEY_OWN_DUNGEON) && dungeon->GetBossKey() == RG_GANONS_CASTLE_BOSS_KEY)) {
+  if ((ctx->GetOption(RSK_BOSS_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_OWN_DUNGEON) && dungeon->GetBossKey() != RG_GANONS_CASTLE_BOSS_KEY) ||
+      (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_OWN_DUNGEON) && dungeon->GetBossKey() == RG_GANONS_CASTLE_BOSS_KEY)) {
         auto dungeonBossKey = FilterAndEraseFromPool(ItemPool, [dungeon](const RandomizerGet i){ return i == dungeon->GetBossKey();});
         AddElementsToPool(dungeonItems, dungeonBossKey);
   }
@@ -817,7 +821,7 @@ static void RandomizeOwnDungeon(const Dungeon::DungeonInfo* dungeon) {
   AssumedFill(dungeonItems, dungeonLocations);
 
   //randomize map and compass separately since they're not progressive
-  if (MapsAndCompasses.Is(MAPSANDCOMPASSES_OWN_DUNGEON) && dungeon->GetMap() != RG_NONE && dungeon->GetCompass() != RG_NONE) {
+  if (ctx->GetOption(RSK_SHUFFLE_MAPANDCOMPASS).Is(RO_DUNGEON_ITEM_LOC_OWN_DUNGEON) && dungeon->GetMap() != RG_NONE && dungeon->GetCompass() != RG_NONE) {
     auto dungeonMapAndCompass = FilterAndEraseFromPool(ItemPool, [dungeon](const RandomizerGet i){ return i == dungeon->GetMap() || i == dungeon->GetCompass();});
     AssumedFill(dungeonMapAndCompass, dungeonLocations);
   }
@@ -833,7 +837,6 @@ static void RandomizeOwnDungeon(const Dungeon::DungeonInfo* dungeon) {
   are randomized separately once the dungeon advancement items have all been placed.*/
 static void RandomizeDungeonItems() {
   auto ctx = Rando::Context::GetInstance();
-  using namespace Dungeon;
 
   //Get Any Dungeon and Overworld group locations
   std::vector<RandomizerCheck> anyDungeonLocations = FilterFromPool(ctx->allLocations, [](const auto loc){return Rando::StaticData::GetLocation(loc)->IsDungeon();});
@@ -843,45 +846,45 @@ static void RandomizeDungeonItems() {
   std::vector<RandomizerGet> anyDungeonItems;
   std::vector<RandomizerGet> overworldItems;
 
-  for (auto dungeon : dungeonList) {
-    if (Keysanity.Is(KEYSANITY_ANY_DUNGEON)) {
+  for (auto dungeon : ctx->GetDungeons()->GetDungeonList()) {
+    if (ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_OWN_DUNGEON)) {
       auto dungeonKeys = FilterAndEraseFromPool(ItemPool, [dungeon](const RandomizerGet i){return (i == dungeon->GetSmallKey()) || (i == dungeon->GetKeyRing());});
       AddElementsToPool(anyDungeonItems, dungeonKeys);
-    } else if (Keysanity.Is(KEYSANITY_OVERWORLD)) {
+    } else if (ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_OVERWORLD)) {
       auto dungeonKeys = FilterAndEraseFromPool(ItemPool, [dungeon](const RandomizerGet i){return (i == dungeon->GetSmallKey()) || (i == dungeon->GetKeyRing());});
       AddElementsToPool(overworldItems, dungeonKeys);
     }
 
-    if (BossKeysanity.Is(BOSSKEYSANITY_ANY_DUNGEON) && dungeon->GetBossKey() != RG_GANONS_CASTLE_BOSS_KEY) {
+    if (ctx->GetOption(RSK_BOSS_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_ANY_DUNGEON) && dungeon->GetBossKey() != RG_GANONS_CASTLE_BOSS_KEY) {
       auto bossKey = FilterAndEraseFromPool(ItemPool, [dungeon](const RandomizerGet i){return i == dungeon->GetBossKey();});
       AddElementsToPool(anyDungeonItems, bossKey);
-    } else if (BossKeysanity.Is(BOSSKEYSANITY_OVERWORLD) && dungeon->GetBossKey() != RG_GANONS_CASTLE_BOSS_KEY) {
+    } else if (ctx->GetOption(RSK_BOSS_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_OVERWORLD) && dungeon->GetBossKey() != RG_GANONS_CASTLE_BOSS_KEY) {
       auto bossKey = FilterAndEraseFromPool(ItemPool, [dungeon](const RandomizerGet i){return i == dungeon->GetBossKey();});
       AddElementsToPool(overworldItems, bossKey);
     }
 
-    if (GanonsBossKey.Is(GANONSBOSSKEY_ANY_DUNGEON)) {
+    if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_ANY_DUNGEON)) {
       auto ganonBossKey = FilterAndEraseFromPool(ItemPool, [](const auto i){return i == RG_GANONS_CASTLE_BOSS_KEY;});
       AddElementsToPool(anyDungeonItems, ganonBossKey);
-    } else if (GanonsBossKey.Is(GANONSBOSSKEY_OVERWORLD)) {
+    } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_OVERWORLD)) {
         auto ganonBossKey = FilterAndEraseFromPool(ItemPool, [](const auto i) { return i == RG_GANONS_CASTLE_BOSS_KEY; });
       AddElementsToPool(overworldItems, ganonBossKey);
     }
   }
 
-  if (GerudoKeys.Is(GERUDOKEYS_ANY_DUNGEON)) {
+  if (ctx->GetOption(RSK_GERUDO_KEYS).Is(RO_GERUDO_KEYS_ANY_DUNGEON)) {
       auto gerudoKeys = FilterAndEraseFromPool(ItemPool, [](const auto i) { return i == RG_GERUDO_FORTRESS_SMALL_KEY; });
     AddElementsToPool(anyDungeonItems, gerudoKeys);
-  } else if (GerudoKeys.Is(GERUDOKEYS_OVERWORLD)) {
+  } else if (ctx->GetOption(RSK_GERUDO_KEYS).Is(RO_GERUDO_KEYS_OVERWORLD)) {
       auto gerudoKeys = FilterAndEraseFromPool(ItemPool, [](const auto i) { return i == RG_GERUDO_FORTRESS_SMALL_KEY; });
     AddElementsToPool(overworldItems, gerudoKeys);
   }
 
-  if (ShuffleRewards.Is(REWARDSHUFFLE_ANY_DUNGEON)) {
+  if (ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_ANY_DUNGEON)) {
       auto rewards = FilterAndEraseFromPool(
           ItemPool, [](const auto i) { return Rando::StaticData::RetrieveItem(i).GetItemType() == ITEMTYPE_DUNGEONREWARD; });
     AddElementsToPool(anyDungeonItems, rewards);
-  } else if (ShuffleRewards.Is(REWARDSHUFFLE_OVERWORLD)) {
+  } else if (ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_OVERWORLD)) {
       auto rewards = FilterAndEraseFromPool(
           ItemPool, [](const auto i) { return Rando::StaticData::RetrieveItem(i).GetItemType() == ITEMTYPE_DUNGEONREWARD; });
     AddElementsToPool(overworldItems, rewards);
@@ -892,11 +895,11 @@ static void RandomizeDungeonItems() {
   AssumedFill(overworldItems, Rando::StaticData::overworldLocations, true);
 
   //Randomize maps and compasses after since they're not advancement items
-  for (auto dungeon : dungeonList) {
-    if (MapsAndCompasses.Is(MAPSANDCOMPASSES_ANY_DUNGEON)) {
+  for (auto dungeon : ctx->GetDungeons()->GetDungeonList()) {
+    if (ctx->GetOption(RSK_SHUFFLE_MAPANDCOMPASS).Is(RO_DUNGEON_ITEM_LOC_ANY_DUNGEON)) {
       auto mapAndCompassItems = FilterAndEraseFromPool(ItemPool, [dungeon](const RandomizerGet i){return i == dungeon->GetMap() || i == dungeon->GetCompass();});
       AssumedFill(mapAndCompassItems, anyDungeonLocations, true);
-    } else if (MapsAndCompasses.Is(MAPSANDCOMPASSES_OVERWORLD)) {
+    } else if (ctx->GetOption(RSK_SHUFFLE_MAPANDCOMPASS).Is(RO_DUNGEON_ITEM_LOC_OVERWORLD)) {
       auto mapAndCompassItems = FilterAndEraseFromPool(ItemPool, [dungeon](const RandomizerGet i){return i == dungeon->GetMap() || i == dungeon->GetCompass();});
       AssumedFill(mapAndCompassItems, Rando::StaticData::overworldLocations, true);
     }
@@ -905,7 +908,7 @@ static void RandomizeDungeonItems() {
 
 static void RandomizeLinksPocket() {
   auto ctx = Rando::Context::GetInstance();
-  if (LinksPocketItem.Is(LINKSPOCKETITEM_ADVANCEMENT)) {
+  if (ctx->GetOption(RSK_LINKS_POCKET).Is(RO_LINKS_POCKET_ADVANCEMENT)) {
    //Get all the advancement items                                                                                                     don't include tokens
       std::vector<RandomizerGet> advancementItems = FilterAndEraseFromPool(ItemPool, [](const auto i) {
           return Rando::StaticData::RetrieveItem(i).IsAdvancement() && Rando::StaticData::RetrieveItem(i).GetItemType() != ITEMTYPE_TOKEN;
@@ -916,7 +919,7 @@ static void RandomizeLinksPocket() {
    AddElementsToPool(ItemPool, advancementItems);
 
    ctx->PlaceItemInLocation(RC_LINKS_POCKET, startingItem);
- } else if (LinksPocketItem.Is(LINKSPOCKETITEM_NOTHING)) {
+ } else if (ctx->GetOption(RSK_LINKS_POCKET).Is(RO_LINKS_POCKET_NOTHING)) {
    ctx->PlaceItemInLocation(RC_LINKS_POCKET, RG_GREEN_RUPEE);
  }
 }
@@ -934,14 +937,14 @@ void VanillaFill() {
     ctx->GetItemLocation(loc)->PlaceVanillaItem();
   }
   //If necessary, handle ER stuff
-  if (ShuffleEntrances) {
+  if (ctx->GetOption(RSK_SHUFFLE_ENTRANCES)) {
     printf("\x1b[7;10HShuffling Entrances...");
-    ShuffleAllEntrances();
+    ctx->GetEntranceShuffler()->ShuffleAllEntrances();
     printf("\x1b[7;32HDone");
   }
   //Finish up
   ctx->CreateItemOverrides();
-  CreateEntranceOverrides();
+  ctx->GetEntranceShuffler()->CreateEntranceOverrides();
   CreateWarpSongTexts();
 }
 
@@ -960,7 +963,7 @@ int Fill() {
     placementFailure = false;
     //showItemProgress = false;
     ctx->playthroughLocations.clear();
-    playthroughEntrances.clear();
+    ctx->GetEntranceShuffler()->playthroughEntrances.clear();
     ctx->wothLocations.clear();
     AreaTable_Init(); //Reset the world graph to intialize the proper locations
     ctx->ItemReset(); //Reset shops incase of shopsanity random
@@ -973,9 +976,9 @@ int Fill() {
     //Temporarily add shop items to the ItemPool so that entrance randomization
     //can validate the world using deku/hylian shields
     AddElementsToPool(ItemPool, GetMinVanillaShopItems(32)); //assume worst case shopsanity 4
-    if (ShuffleEntrances) {
+    if (ctx->GetOption(RSK_SHUFFLE_ENTRANCES)) {
       printf("\x1b[7;10HShuffling Entrances");
-      if (ShuffleAllEntrances() == ENTRANCE_SHUFFLE_FAILURE) {
+      if (ctx->GetEntranceShuffler()->ShuffleAllEntrances() == ENTRANCE_SHUFFLE_FAILURE) {
         retries++;
         ClearProgress();
         continue;
@@ -988,11 +991,11 @@ int Fill() {
     //ctx->showItemProgress = true;
     //Place shop items first, since a buy shield is needed to place a dungeon reward on Gohma due to access
     NonShopItems = {};
-    if (Shopsanity.Is(SHOPSANITY_OFF)) {
+    if (ctx->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_OFF)) {
       PlaceVanillaShopItems(); //Place vanilla shop items in vanilla location
     } else {
       int total_replaced = 0;
-      if (Shopsanity.IsNot(SHOPSANITY_ZERO)) { //Shopsanity 1-4, random
+      if (ctx->GetOption(RSK_SHOPSANITY).IsNot(RO_SHOPSANITY_ZERO_ITEMS)) { //Shopsanity 1-4, random
         //Initialize NonShopItems
         ItemAndPrice init;
         init.Name = Text{"No Item", "Sin objeto", "Pas d'objet"};
@@ -1010,7 +1013,7 @@ int Fill() {
             int shopsanityPrice = GetRandomShopPrice();
             NonShopItems[TransformShopIndex(i * 8 + itemindex - 1)].Price =
                 shopsanityPrice; // Set price to be retrieved by the patch and textboxes
-            ctx->GetItemLocation(Rando::StaticData::shopLocationLists[i][itemindex - 1])->SetShopsanityPrice(shopsanityPrice);
+            ctx->GetItemLocation(Rando::StaticData::shopLocationLists[i][itemindex - 1])->SetCustomPrice(shopsanityPrice);
           }
         }
       }
@@ -1023,7 +1026,7 @@ int Fill() {
       for (size_t i = 0; i < Rando::StaticData::shopLocationLists.size(); i++) {
         for (size_t j = 0; j < Rando::StaticData::shopLocationLists[i].size(); j++) {
           RandomizerCheck loc = Rando::StaticData::shopLocationLists[i][j];
-          if (!(ctx->GetItemLocation(loc)->HasShopsanityPrice())) {
+          if (!(ctx->GetItemLocation(loc)->HasCustomPrice())) {
             shopLocations.push_back(loc);
           }
         }
@@ -1036,12 +1039,12 @@ int Fill() {
     RandomizeDungeonRewards();
 
     //Place dungeon items restricted to their Own Dungeon
-    for (auto dungeon : Dungeon::dungeonList) {
+    for (auto dungeon : ctx->GetDungeons()->GetDungeonList()) {
       RandomizeOwnDungeon(dungeon);
     }
 
     //Then Place songs if song shuffle is set to specific locations
-    if (ShuffleSongs.IsNot(SONGSHUFFLE_ANYWHERE)) {
+    if (ctx->GetOption(RSK_SHUFFLE_SONGS).IsNot(RO_SONG_SHUFFLE_ANYWHERE)) {
 
       //Get each song
       std::vector<RandomizerGet> songs = FilterAndEraseFromPool(
@@ -1049,11 +1052,11 @@ int Fill() {
 
       //Get each song location
       std::vector<RandomizerCheck> songLocations;
-      if (ShuffleSongs.Is(SONGSHUFFLE_SONG_LOCATIONS)) {
+      if (ctx->GetOption(RSK_SHUFFLE_SONGS).Is(RO_SONG_SHUFFLE_SONG_LOCATIONS)) {
           songLocations = FilterFromPool(
               ctx->allLocations, [](const auto loc) { return Rando::StaticData::GetLocation(loc)->IsCategory(Category::cSong); });
 
-      } else if (ShuffleSongs.Is(SONGSHUFFLE_DUNGEON_REWARDS)) {
+      } else if (ctx->GetOption(RSK_SHUFFLE_SONGS).Is(RO_SONG_SHUFFLE_DUNGEON_REWARDS)) {
           songLocations = FilterFromPool(ctx->allLocations, [](const auto loc) {
               return Rando::StaticData::GetLocation(loc)->IsCategory(Category::cSongDungeonReward);
           });
@@ -1077,14 +1080,14 @@ int Fill() {
     FastFill(remainingPool, GetAllEmptyLocations(), false);
 
     //Add prices for scrubsanity, this is unique to SoH because we write/read scrub prices to/from the spoilerfile.
-    if (Scrubsanity.Is(SCRUBSANITY_AFFORDABLE)) {
+    if (ctx->GetOption(RSK_SHUFFLE_SCRUBS).Is(RO_SCRUBS_AFFORDABLE)) {
       for (size_t i = 0; i < Rando::StaticData::scrubLocations.size(); i++) {
-        ctx->GetItemLocation(Rando::StaticData::scrubLocations[i])->SetScrubsanityPrice(10);
+        ctx->GetItemLocation(Rando::StaticData::scrubLocations[i])->SetCustomPrice(10);
       }
-    } else if (Scrubsanity.Is(SCRUBSANITY_RANDOM_PRICES)) {
+    } else if (ctx->GetOption(RSK_SHUFFLE_SCRUBS).Is(RO_SCRUBS_RANDOM)) {
       for (size_t i = 0; i < Rando::StaticData::scrubLocations.size(); i++) {
         int randomPrice = GetRandomScrubPrice();
-        ctx->GetItemLocation(Rando::StaticData::scrubLocations[i])->SetScrubsanityPrice(randomPrice);
+        ctx->GetItemLocation(Rando::StaticData::scrubLocations[i])->SetCustomPrice(randomPrice);
       }
     }
 
@@ -1097,8 +1100,8 @@ int Fill() {
       CalculateWotH();
       printf("Done");
       ctx->CreateItemOverrides();
-      CreateEntranceOverrides();
-
+      ctx->GetEntranceShuffler()->CreateEntranceOverrides();
+      
       //funny ganon line
       Text ganonText = RandomElement(GetHintCategory(HintCategory::GanonLine)).GetText();
       CreateMessageFromTextObject(0x70CB, 0, 2, 3, AddColorsAndFormat(ganonText));
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
index 51764763e..4931c147d 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
@@ -2,6 +2,7 @@
 #include "custom_messages.hpp"
 
 #include "../randomizerTypes.h"
+#include "../context.h"
 
 #include <array>
 
@@ -3238,58 +3239,61 @@ void HintTable_Init() {
 }
 
 int32_t StonesRequiredBySettings() {
+    auto ctx = Rando::Context::GetInstance();
     int32_t stones = 0;
-    if (Settings::Bridge.Is(RAINBOWBRIDGE_STONES)) {
-        stones = std::max<int32_t>({ stones, (int32_t)Settings::BridgeStoneCount.Value<uint8_t>() });
+    if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_STONES)) {
+        stones = std::max<int32_t>({ stones, (int32_t)ctx->GetOption(RSK_RAINBOW_BRIDGE_STONE_COUNT).Value<uint8_t>() });
     }
-    if (Settings::Bridge.Is(RAINBOWBRIDGE_REWARDS)) {
-        stones = std::max<int32_t>({ stones, (int32_t)Settings::BridgeRewardCount.Value<uint8_t>() - 6 });
+    if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_DUNGEON_REWARDS)) {
+        stones = std::max<int32_t>({ stones, (int32_t)ctx->GetOption(RSK_RAINBOW_BRIDGE_REWARD_COUNT).Value<uint8_t>() - 6 });
     }
-    if ((Settings::Bridge.Is(RAINBOWBRIDGE_DUNGEONS)) && (Settings::ShuffleRewards.Is(REWARDSHUFFLE_END_OF_DUNGEON))) {
-        stones = std::max<int32_t>({ stones, (int32_t)Settings::BridgeDungeonCount.Value<uint8_t>() - 6 });
+    if ((ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_DUNGEONS)) && (ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_END_OF_DUNGEON))) {
+        stones = std::max<int32_t>({ stones, (int32_t)ctx->GetOption(RSK_RAINBOW_BRIDGE_DUNGEON_COUNT).Value<uint8_t>() - 6 });
     }
-    if (Settings::GanonsBossKey.Is(GANONSBOSSKEY_LACS_STONES)) {
-        stones = std::max<int32_t>({ stones, (int32_t)Settings::LACSStoneCount.Value<uint8_t>() });
+    if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_STONES)) {
+        stones = std::max<int32_t>({ stones, (int32_t)ctx->GetOption(RSK_LACS_STONE_COUNT).Value<uint8_t>() });
     }
-    if (Settings::GanonsBossKey.Is(GANONSBOSSKEY_LACS_REWARDS)) {
-        stones = std::max<int32_t>({ stones, (int32_t)Settings::LACSRewardCount.Value<uint8_t>() - 6 });
+    if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_STONES)) {
+        stones = std::max<int32_t>({ stones, (int32_t)ctx->GetOption(RSK_LACS_REWARD_COUNT).Value<uint8_t>() - 6 });
     }
-    if (Settings::GanonsBossKey.Is(GANONSBOSSKEY_LACS_DUNGEONS)) {
-        stones = std::max<int32_t>({ stones, (int32_t)Settings::LACSDungeonCount.Value<uint8_t>() - 6 });
+    if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_DUNGEONS)) {
+        stones = std::max<int32_t>({ stones, (int32_t)ctx->GetOption(RSK_LACS_DUNGEON_COUNT).Value<uint8_t>() - 6 });
     }
     return stones;
 }
 
 int32_t MedallionsRequiredBySettings() {
+    auto ctx = Rando::Context::GetInstance();
     int32_t medallions = 0;
-    if (Settings::Bridge.Is(RAINBOWBRIDGE_MEDALLIONS)) {
-        medallions = std::max<int32_t>({ medallions, (int32_t)Settings::BridgeMedallionCount.Value<uint8_t>() });
+    if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_MEDALLIONS)) {
+        medallions = std::max<int32_t>({ medallions, (int32_t)ctx->GetOption(RSK_RAINBOW_BRIDGE_MEDALLION_COUNT).Value<uint8_t>() });
     }
-    if (Settings::Bridge.Is(RAINBOWBRIDGE_REWARDS)) {
-        medallions = std::max<int32_t>({ medallions, (int32_t)Settings::BridgeRewardCount.Value<uint8_t>() - 3 });
+    if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_DUNGEON_REWARDS)) {
+        medallions = std::max<int32_t>({ medallions, (int32_t)ctx->GetOption(RSK_RAINBOW_BRIDGE_REWARD_COUNT).Value<uint8_t>() - 3 });
     }
-    if ((Settings::Bridge.Is(RAINBOWBRIDGE_DUNGEONS)) && (Settings::ShuffleRewards.Is(REWARDSHUFFLE_END_OF_DUNGEON))) {
-        medallions = std::max<int32_t>({ medallions, (int32_t)Settings::BridgeDungeonCount.Value<uint8_t>() - 3 });
+    if ((ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_DUNGEONS)) && (ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_END_OF_DUNGEON))) {
+        medallions = std::max<int32_t>({ medallions, (int32_t)ctx->GetOption(RSK_RAINBOW_BRIDGE_DUNGEON_COUNT).Value<uint8_t>() - 3 });
     }
-    if (Settings::GanonsBossKey.Is(GANONSBOSSKEY_LACS_MEDALLIONS)) {
-        medallions = std::max<int32_t>({ medallions, (int32_t)Settings::LACSMedallionCount.Value<uint8_t>() });
+    if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_MEDALLIONS)) {
+        medallions = std::max<int32_t>({ medallions, (int32_t)ctx->GetOption(RSK_LACS_MEDALLION_COUNT).Value<uint8_t>() });
     }
-    if (Settings::GanonsBossKey.Is(GANONSBOSSKEY_LACS_REWARDS)) {
-        medallions = std::max<int32_t>({ medallions, (int32_t)Settings::LACSRewardCount.Value<uint8_t>() - 3 });
+    if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_REWARDS)) {
+        medallions = std::max<int32_t>({ medallions, (int32_t)ctx->GetOption(RSK_LACS_REWARD_COUNT).Value<uint8_t>() - 3 });
     }
-    if (Settings::GanonsBossKey.Is(GANONSBOSSKEY_LACS_DUNGEONS)) {
-        medallions = std::max<int32_t>({ medallions, (int32_t)Settings::LACSDungeonCount.Value<uint8_t>() - 3 });
+    if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_DUNGEONS)) {
+        medallions = std::max<int32_t>({ medallions, (int32_t)ctx->GetOption(RSK_LACS_DUNGEON_COUNT).Value<uint8_t>() - 3 });
     }
     return medallions;
 }
 
 int32_t TokensRequiredBySettings() {
+    auto ctx = Rando::Context::GetInstance();
     int32_t tokens = 0;
-    if (Settings::Bridge.Is(RAINBOWBRIDGE_TOKENS)) {
-        tokens = std::max<int32_t>({ tokens, (int32_t)Settings::BridgeTokenCount.Value<uint8_t>() });
+    if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_TOKENS)) {
+        tokens = std::max<int32_t>({ tokens, (int32_t)ctx->GetOption(RSK_RAINBOW_BRIDGE_TOKEN_COUNT).Value<uint8_t>() });
     }
-    if (Settings::GanonsBossKey.Is(GANONSBOSSKEY_LACS_TOKENS)) {
-        tokens = std::max<int32_t>({ tokens, (int32_t)Settings::LACSTokenCount.Value<uint8_t>() });
+    if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_TOKENS)) {
+        tokens = std::max<int32_t>({ tokens, (int32_t)ctx->GetOption(RSK_LACS_TOKEN_COUNT).Value<uint8_t>() });
     }
     return tokens;
 }
@@ -3297,17 +3301,38 @@ int32_t TokensRequiredBySettings() {
 std::array<ConditionalAlwaysHint, 10> conditionalAlwaysHints = {
     std::make_pair(RC_MARKET_10_BIG_POES,
                    []() {
-                       return Settings::BigPoeTargetCount.Value<uint8_t>() >= 3;
+                       auto ctx = Rando::Context::GetInstance();
+                       return ctx->GetOption(RSK_BIG_POE_COUNT).Value<uint8_t>() >= 3;
                    }), // Remember, the option's value being 3 means 4 are required
-    std::make_pair(RC_DEKU_THEATER_MASK_OF_TRUTH, []() { return !Settings::CompleteMaskQuest; }),
+    std::make_pair(RC_DEKU_THEATER_MASK_OF_TRUTH,
+                   []() {
+                       auto ctx = Rando::Context::GetInstance();
+                       return !ctx->GetOption(RSK_COMPLETE_MASK_QUEST);
+                   }),
     std::make_pair(RC_SONG_FROM_OCARINA_OF_TIME, []() { return StonesRequiredBySettings() < 2; }),
     std::make_pair(RC_HF_OCARINA_OF_TIME_ITEM, []() { return StonesRequiredBySettings() < 2; }),
     std::make_pair(RC_SHEIK_IN_KAKARIKO, []() { return MedallionsRequiredBySettings() < 5; }),
     std::make_pair(RC_DMT_TRADE_CLAIM_CHECK, []() { return false; }),
-    std::make_pair(RC_KAK_30_GOLD_SKULLTULA_REWARD, []() { return TokensRequiredBySettings() < 30 && !Settings::Kak30GSHintText; }),
-    std::make_pair(RC_KAK_40_GOLD_SKULLTULA_REWARD, []() { return TokensRequiredBySettings() < 40 && !Settings::Kak40GSHintText; }),
-    std::make_pair(RC_KAK_50_GOLD_SKULLTULA_REWARD, []() { return TokensRequiredBySettings() < 50 && !Settings::Kak50GSHintText; }),
-    std::make_pair(RC_ZR_FROGS_OCARINA_GAME, []() { return !Settings::FrogsHintText; }),
+    std::make_pair(RC_KAK_30_GOLD_SKULLTULA_REWARD,
+                   []() {
+                       auto ctx = Rando::Context::GetInstance();
+                       return TokensRequiredBySettings() < 30 && !ctx->GetOption(RSK_KAK_30_SKULLS_HINT);
+                   }),
+    std::make_pair(RC_KAK_40_GOLD_SKULLTULA_REWARD,
+                   []() {
+                       auto ctx = Rando::Context::GetInstance();
+                       return TokensRequiredBySettings() < 40 && !ctx->GetOption(RSK_KAK_40_SKULLS_HINT);
+                   }),
+    std::make_pair(RC_KAK_50_GOLD_SKULLTULA_REWARD,
+                   []() {
+                       auto ctx = Rando::Context::GetInstance();
+                       return TokensRequiredBySettings() < 50 && !ctx->GetOption(RSK_KAK_50_SKULLS_HINT);
+                   }),
+    std::make_pair(RC_ZR_FROGS_OCARINA_GAME,
+                   []() {
+                       auto ctx = Rando::Context::GetInstance();
+                       return !ctx->GetOption(RSK_FROGS_HINT);
+                   }),
 };
 
 const HintText& Hint(const RandomizerHintTextKey hintKey) {
diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.cpp b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
index dc57a5b71..3892c70d9 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hints.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
@@ -1,24 +1,45 @@
 #include "hints.hpp"
 
 #include "custom_messages.hpp"
-#include "dungeon.hpp"
 #include "item_pool.hpp"
 #include "logic.hpp"
 #include "random.hpp"
 #include "spoiler_log.hpp"
 #include "fill.hpp"
 #include "hint_list.hpp"
-#include "trial.hpp"
-#include "entrance.hpp"
+#include "../trial.h"
+#include "../entrance.h"
 #include "z64item.h"
 #include <spdlog/spdlog.h>
 #include "../randomizerTypes.h"
 #include "../context.h"
+#include "pool_functions.hpp"
 
 using namespace CustomMessages;
 using namespace Logic;
-using namespace Settings;
-using namespace Trial;
+using namespace Rando;
+
+const Text& HintText::GetText() const {
+  auto ctx = Rando::Context::GetInstance();
+    if (ctx->GetOption(RSK_HINT_CLARITY).Is(RO_HINT_CLARITY_OBSCURE)) {
+        return GetObscure();
+    } else if (ctx->GetOption(RSK_HINT_CLARITY).Is(RO_HINT_CLARITY_AMBIGUOUS)) {
+        return GetAmbiguous();
+    } else {
+        return GetClear();
+    }
+}
+
+const Text HintText::GetTextCopy() const {
+    auto ctx = Rando::Context::GetInstance();
+    if (ctx->GetOption(RSK_HINT_CLARITY).Is(RO_HINT_CLARITY_OBSCURE)) {
+        return GetObscure();
+    } else if (ctx->GetOption(RSK_HINT_CLARITY).Is(RO_HINT_CLARITY_AMBIGUOUS)) {
+        return GetAmbiguous();
+    } else {
+        return GetClear();
+    }
+}
 
 std::array<std::string, HINT_TYPE_MAX> hintTypeNames = {
     "Static",
@@ -126,6 +147,61 @@ constexpr std::array<HintSetting, 4> hintSettingTable{{
   },
 }};
 
+Text AutoFormatHintText(Text unformattedHintText) {
+  std::array<std::string, LANGUAGE_MAX> strings;
+  for (int i = 0; i < LANGUAGE_MAX; i++) {
+    std::string textStr = unformattedHintText.GetForLanguage(i);
+    // RANDOTODO: don't just make manual exceptions
+    bool needsAutomaicNewlines = true;
+    if (textStr == "Erreur 0x69a504:&Traduction manquante^C'est de la faute à Purple Hato!&J'vous jure!" ||
+      textStr == "Mon très cher @:&Viens vite au château, je t'ai préparé&un délicieux gâteau...^À bientôt, Princesse Zelda" ||
+      textStr == "What about Zelda makes you think&she'd be a better ruler than I?^I saved Lon Lon Ranch,&fed the hungry,&and my castle floats." ||
+      textStr == "Many tricks are up my sleeve,&to save yourself&you'd better leave!" ||
+      textStr == "I've learned this spell,&it's really neat,&I'll keep it later&for your treat!" ||
+      textStr == "Sale petit garnement,&tu fais erreur!&C'est maintenant que marque&ta dernière heure!" ||
+      textStr == "Gamin, ton destin achève,&sous mon sort tu périras!&Cette partie ne fut pas brève,&et cette mort, tu subiras!" ||
+      textStr == "Oh! It's @.&I was expecting someone called Sheik.&Do you know what happened to them?" ||
+      textStr == "Ah, c'est @.&J'attendais un certain Sheik.&Tu sais ce qui lui est arrivé?" ||
+      textStr == "They say \"Forgive me, but-^Your script will not be used.&....After all...^The one writing the rest of the script...&will be me.\"") {
+    needsAutomaicNewlines = false;
+  }
+
+    if (needsAutomaicNewlines) {
+        // insert newlines either manually or when encountering a '&'
+        constexpr size_t lineLength = 34;
+        size_t lastNewline = 0;
+        while (lastNewline + lineLength < textStr.length()) {
+            size_t carrot = textStr.find('^', lastNewline);
+            size_t ampersand = textStr.find('&', lastNewline);
+            size_t lastSpace = textStr.rfind(' ', lastNewline + lineLength);
+            size_t lastPeriod = textStr.rfind('.', lastNewline + lineLength);
+            // replace '&' first if it's within the newline range
+            if (ampersand < lastNewline + lineLength) {
+                lastNewline = ampersand;
+                // or move the lastNewline cursor to the next line if a '^' is encountered
+            } else if (carrot < lastNewline + lineLength) {
+                lastNewline = carrot + 1;
+                // some lines need to be split but don't have spaces, look for periods instead
+            } else if (lastSpace == std::string::npos) {
+                textStr.replace(lastPeriod, 1, ".&");
+                lastNewline = lastPeriod + 2;
+            } else {
+                textStr.replace(lastSpace, 1, "&");
+                lastNewline = lastSpace + 1;
+            }
+        }
+    }
+
+    // todo add colors (see `AddColorsAndFormat` in `custom_messages.cpp`)
+    textStr.erase(std::remove(textStr.begin(), textStr.end(), '#'), textStr.end());
+    strings[i] = textStr;
+  }
+
+  return Text(strings[0], strings[1], strings[2]);
+}
+
+std::array<DungeonHintInfo, 10> dungeonInfoData;
+
 Text childAltarText;
 Text adultAltarText;
 Text ganonText;
@@ -328,7 +404,7 @@ static void AddHint(Text hint, const RandomizerCheck gossipStone, const std::vec
   //GetLocation(gossipStone)->SetPlacedItem(gossipStone);
 
   auto ctx = Rando::Context::GetInstance();
-  ctx->AddHint((RandomizerHintKey)((gossipStone - RC_DMC_GOSSIP_STONE) + 1), hint, hintedLocation, hintType, GetHintRegion(ctx->GetItemLocation(hintedLocation)->GetParentRegionKey())->GetHint().GetText());
+  ctx->AddHint((RandomizerHintKey)((gossipStone - RC_COLOSSUS_GOSSIP_STONE) + 1), AutoFormatHintText(hint), hintedLocation, hintType, GetHintRegion(ctx->GetItemLocation(hintedLocation)->GetParentRegionKey())->GetHint().GetText());
   ctx->GetItemLocation(gossipStone)->SetPlacedItem(RG_HINT);
 }
 
@@ -366,31 +442,31 @@ static bool CreateHint(RandomizerCheck hintedLocation, uint8_t copies, HintType
 
   //make hint text
   Text finalHint;
-  Text prefix = Hint(RHT_PREFIX).GetText();
+  Text prefix = ::Hint(RHT_PREFIX).GetText();
   std::vector<uint8_t> colours = {QM_GREEN, QM_RED};
   if (type == HINT_TYPE_WOTH){
     Text regionText = GetHintRegion(ctx->GetItemLocation(hintedLocation)->GetParentRegionKey())->GetHint().GetText();
-    finalHint = prefix + "%r#" + regionText + "#%w" + Hint(RHT_WAY_OF_THE_HERO).GetText();
+    finalHint = prefix + "%r#" + regionText + "#%w" + ::Hint(RHT_WAY_OF_THE_HERO).GetText();
     colours = {QM_LBLUE};
   }
   else if(type == HINT_TYPE_BARREN){
     Text regionText = GetHintRegion(ctx->GetItemLocation(hintedLocation)->GetParentRegionKey())->GetHint().GetText();
-    finalHint = prefix + Hint(RHT_PLUNDERING).GetText() + "%r#" + regionText + "#%w" + Hint(RHT_FOOLISH).GetText();
+    finalHint = prefix + ::Hint(RHT_PLUNDERING).GetText() + "%r#" + regionText + "#%w" + ::Hint(RHT_FOOLISH).GetText();
     colours = {QM_PINK};
   }
   else {
     Text itemText = ctx->GetItemLocation(hintedLocation)->GetPlacedItem().GetHint().GetText();
     if (type >= HINT_TYPE_ALWAYS && type < HINT_TYPE_NAMED_ITEM){
       Text locationText = Rando::StaticData::GetLocation(hintedLocation)->GetHint()->GetText();
-      finalHint = prefix + locationText + " #"+itemText+"#.";
+      finalHint = prefix + "%r" + locationText + " %g#"+itemText+"#%w.";
     }
     else if (type == HINT_TYPE_NAMED_ITEM || type == HINT_TYPE_RANDOM){
       Text regionText = GetHintRegion(ctx->GetItemLocation(hintedLocation)->GetParentRegionKey())->GetHint().GetText();
       // RANDOTODO: reconsider dungeon vs non-dungeon item location hints when boss shuffle mixed pools happens
       if (Rando::StaticData::GetLocation(hintedLocation)->IsDungeon()) {
-        finalHint = prefix+"%r#"+regionText+"#%w "+Hint(RHT_HOARDS).GetText()+" %g#"+itemText+"#%w.";
+        finalHint = prefix+"%r#"+regionText+"#%w "+::Hint(RHT_HOARDS).GetText()+" %g#"+itemText+"#%w.";
       } else {
-        finalHint = prefix+"%r#"+itemText+"#%w "+Hint(RHT_CAN_BE_FOUND_AT).GetText()+" %g#"+regionText+"#%w.";
+        finalHint = prefix+"%r#"+itemText+"#%w "+::Hint(RHT_CAN_BE_FOUND_AT).GetText()+" %g#"+regionText+"#%w.";
         colours = {QM_RED, QM_GREEN};
       }
     }
@@ -500,37 +576,40 @@ static std::vector<RandomizerCheck> CalculateBarrenRegions() {
 }
 
 static void CreateTrialHints(uint8_t copies) {
-  Text prefix = Hint(RHT_PREFIX).GetText();
+  auto ctx = Rando::Context::GetInstance();
+  Text prefix = ::Hint(RHT_PREFIX).GetText();
     //six trials
-  if (RandomGanonsTrials && GanonsTrialsCount.Is(6)) {
-    AddHintCopies(copies, prefix + Hint(RHT_SIX_TRIALS).GetText(), {QM_PINK}, HINT_TYPE_TRIAL);
+  if (ctx->GetOption(RSK_GANONS_TRIALS).IsNot(RO_GANONS_TRIALS_SKIP) && ctx->GetOption(RSK_TRIAL_COUNT).Is(6)) {
+    AddHintCopies(copies, prefix + ::Hint(RHT_SIX_TRIALS).GetText(), {QM_PINK}, HINT_TYPE_TRIAL);
     //zero trials
-  } else if (RandomGanonsTrials && GanonsTrialsCount.Is(0)) {
-    AddHintCopies(copies, prefix + Hint(RHT_ZERO_TRIALS).GetText(), {QM_YELLOW}, HINT_TYPE_TRIAL);
+  } else if (ctx->GetOption(RSK_GANONS_TRIALS).IsNot(RO_GANONS_TRIALS_SKIP) && ctx->GetOption(RSK_TRIAL_COUNT).Is(0)) {
+    AddHintCopies(copies, prefix + ::Hint(RHT_ZERO_TRIALS).GetText(), {QM_YELLOW}, HINT_TYPE_TRIAL);
     //4 or 5 required trials
-  } else if (GanonsTrialsCount.Is(5) || GanonsTrialsCount.Is(4)) {
+  } else if (ctx->GetOption(RSK_TRIAL_COUNT).Is(5) || ctx->GetOption(RSK_TRIAL_COUNT).Is(4)) {
     //get skipped trials
     std::vector<TrialInfo*> trials = {};
+    auto trialList = ctx->GetTrials()->GetTrialList();
     trials.assign(trialList.begin(), trialList.end());
     auto skippedTrials = FilterFromPool(trials, [](TrialInfo* trial){return trial->IsSkipped();});
 
     //create a hint for each skipped trial
     for (auto& trial : skippedTrials) {
       //make hint
-      auto hint = prefix+"#"+trial->GetName()+"#"+Hint(RHT_FOUR_TO_FIVE_TRIALS).GetText();
+      auto hint = prefix+"#"+trial->GetName()+"#"+::Hint(RHT_FOUR_TO_FIVE_TRIALS).GetText();
       AddHintCopies(copies, hint, {QM_YELLOW}, HINT_TYPE_TRIAL);
     }
     //1 to 3 trials
-  } else if (GanonsTrialsCount.Value<uint8_t>() >= 1 && GanonsTrialsCount.Value<uint8_t>() <= 3) {
+  } else if (ctx->GetOption(RSK_TRIAL_COUNT).Value<uint8_t>() >= 1 && ctx->GetOption(RSK_TRIAL_COUNT).Value<uint8_t>() <= 3) {
     //get requried trials
     std::vector<TrialInfo*> trials = {};
+    auto trialList = ctx->GetTrials()->GetTrialList();
     trials.assign(trialList.begin(), trialList.end());
     auto requiredTrials = FilterFromPool(trials, [](TrialInfo* trial){return trial->IsRequired();});
 
     //create a hint for each required trial
     for (auto& trial : requiredTrials) {
       //make hint
-      auto hint = prefix+"#"+trial->GetName()+"#"+Hint(RHT_ONE_TO_THREE_TRIALS).GetText();
+      auto hint = prefix+"#"+trial->GetName()+"#"+::Hint(RHT_ONE_TO_THREE_TRIALS).GetText();
       AddHintCopies(copies, hint, {QM_PINK}, HINT_TYPE_TRIAL);
     }
   }
@@ -539,7 +618,7 @@ static void CreateTrialHints(uint8_t copies) {
 //RANDOTODO clean this mess up once starting items are expanded
 void CreateGanonAndSheikText() {
   auto ctx = Rando::Context::GetInstance();
-  if(Settings::LightArrowHintText){
+  if(ctx->GetOption(RSK_LIGHT_ARROWS_HINT)){
     //Get the location of the light arrows
     auto lightArrowLocation = FilterFromPool(ctx->allLocations, [ctx](const RandomizerCheck loc) {
       return ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == RG_LIGHT_ARROWS;
@@ -548,9 +627,9 @@ void CreateGanonAndSheikText() {
     std::vector<RandomizerCheck> locsToCheck = {RC_GANONDORF_HINT};
 
     //If there is no light arrow location, it was in the player's inventory at the start
-    auto hint = Hint(RHT_LIGHT_ARROW_LOCATION_HINT);
+    auto hint = ::Hint(RHT_LIGHT_ARROW_LOCATION_HINT);
     if (lightArrowLocation.empty()) {
-      ganonHintText = hint.GetText()+Hint(RHT_YOUR_POCKET).GetText();
+      ganonHintText = hint.GetText()+::Hint(RHT_YOUR_POCKET).GetText();
       lightArrowHintLoc = "Link's Pocket";
     } else {
       ganonHintText = hint.GetText() + "%r" + lightArrowArea + "%w";
@@ -564,36 +643,37 @@ void CreateGanonAndSheikText() {
     });
     Text masterSwordArea = GetHintRegion(ctx->GetItemLocation(masterSwordLocation[0])->GetParentRegionKey())->GetHint().GetText();
 
-    if (ShuffleMasterSword) {
+    if (ctx->GetOption(RSK_SHUFFLE_MASTER_SWORD)) {
       // Add second text box
       ganonHintText = ganonHintText + "^";
       if (masterSwordLocation.empty()) {
-        ganonHintText = ganonHintText + Hint(RHT_MASTER_SWORD_LOCATION_HINT).GetText() + "%r" + Hint(RHT_YOUR_POCKET).GetText() + "%w";
+        ganonHintText = ganonHintText + ::Hint(RHT_MASTER_SWORD_LOCATION_HINT).GetText() + "%r" + ::Hint(RHT_YOUR_POCKET).GetText() + "%w";
         masterSwordHintLoc = "Link's Pocket";
       } else {
-        ganonHintText = ganonHintText + Hint(RHT_MASTER_SWORD_LOCATION_HINT).GetText() + "%r" + masterSwordArea + "%w";
+        ganonHintText = ganonHintText + ::Hint(RHT_MASTER_SWORD_LOCATION_HINT).GetText() + "%r" + masterSwordArea + "%w";
         masterSwordHintLoc = Rando::StaticData::GetLocation(masterSwordLocation[0])->GetName();
       }
       ganonHintText = ganonHintText + "!";
     }
 
-    CreateMessageFromTextObject(0x70CC, 0, 2, 3, AddColorsAndFormat(ganonHintText));
-    ctx->AddHint(RH_GANONDORF_HINT, ganonHintText, lightArrowLocation[0], HINT_TYPE_STATIC, GetHintRegion(ctx->GetItemLocation(lightArrowLocation[0])->GetParentRegionKey())->GetHint().GetText());
+    //CreateMessageFromTextObject(0x70CC, 0, 2, 3, AddColorsAndFormat(ganonHintText));
+    ctx->AddHint(RH_GANONDORF_HINT, AutoFormatHintText(ganonHintText), lightArrowLocation[0], HINT_TYPE_STATIC, GetHintRegion(ctx->GetItemLocation(lightArrowLocation[0])->GetParentRegionKey())->GetHint().GetText());
 
-    if (!Settings::GanonsTrialsCount.Is(0)) {
-      sheikText = Hint(RHT_SHEIK_LIGHT_ARROW_HINT).GetText() + lightArrowArea + "%w.";
+    if(!ctx->GetOption(RSK_TRIAL_COUNT).Is(0)){
+      sheikText = ::Hint(RHT_SHEIK_LIGHT_ARROW_HINT).GetText() + lightArrowArea + "%w.";
       locsToCheck = {RC_GANONDORF_HINT, RC_SHEIK_HINT_GC, RC_SHEIK_HINT_MQ_GC};
 
-      if (ShuffleMasterSword) {
-        sheikText = sheikText + "^" + Hint(RHT_SHEIK_MASTER_SWORD_LOCATION_HINT).GetText() + masterSwordArea + "%w.";
+      if (ctx->GetOption(RSK_SHUFFLE_MASTER_SWORD)) {
+        sheikText = sheikText + "^" + ::Hint(RHT_SHEIK_MASTER_SWORD_LOCATION_HINT).GetText() + masterSwordArea + "%w.";
       }
     }
 
     if (IsReachableWithout(locsToCheck, lightArrowLocation[0], true)) {
       ctx->GetItemLocation(lightArrowLocation[0])->SetAsHinted();
     }
+    ctx->AddHint(RH_SHEIK_LIGHT_ARROWS, AutoFormatHintText(sheikText), lightArrowLocation[0], HINT_TYPE_STATIC, lightArrowArea);
 
-    if (ShuffleMasterSword) {
+    if (ctx->GetOption(RSK_SHUFFLE_MASTER_SWORD)) {
       if (IsReachableWithout(locsToCheck, masterSwordLocation[0], true)) {
         ctx->GetItemLocation(masterSwordLocation[0])->SetHintKey(RH_GANONDORF_HINT);
         ctx->GetItemLocation(masterSwordLocation[0])->SetAsHinted();
@@ -610,7 +690,7 @@ static Text BuildDungeonRewardText(const RandomizerGet itemKey, bool isChild) {
     RandomizerCheck location = FilterFromPool(ctx->allLocations, [itemKey, ctx](const RandomizerCheck loc) {
         return ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == itemKey;
     })[0];
-    if (IsReachableWithout({altarLoc}, location, true) || ShuffleRewards.Is(REWARDSHUFFLE_END_OF_DUNGEON)){ //RANDOTODO check if works properly
+    if (IsReachableWithout({altarLoc}, location, true) || ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_END_OF_DUNGEON)){ //RANDOTODO check if works properly
       ctx->GetItemLocation(location)->SetAsHinted();
     }
 
@@ -623,28 +703,29 @@ static Text BuildDungeonRewardText(const RandomizerGet itemKey, bool isChild) {
 }
 
 static Text BuildDoorOfTimeText() {
+  auto ctx = Rando::Context::GetInstance();
   std::string itemObtained;
   Text doorOfTimeText;
 
-  if (OpenDoorOfTime.Is(OPENDOOROFTIME_OPEN)) {
+  if (ctx->GetOption(RSK_DOOR_OF_TIME).Is(RO_DOOROFTIME_OPEN)) {
     itemObtained = "$o";
-    doorOfTimeText = Hint(RHT_CHILD_ALTAR_TEXT_END_DOTOPEN).GetText();
+    doorOfTimeText = ::Hint(RHT_CHILD_ALTAR_TEXT_END_DOTOPEN).GetText();
 
-  } else if (OpenDoorOfTime.Is(OPENDOOROFTIME_SONGONLY)) {
+  } else if (ctx->GetOption(RSK_DOOR_OF_TIME).Is(RO_DOOROFTIME_SONGONLY)) {
     itemObtained = "$c";
-    doorOfTimeText = Hint(RHT_CHILD_ALTAR_TEXT_END_DOTSONGONLY).GetText();
+    doorOfTimeText = ::Hint(RHT_CHILD_ALTAR_TEXT_END_DOTSONGONLY).GetText();
 
-  } else if (OpenDoorOfTime.Is(OPENDOOROFTIME_CLOSED)) {
+  } else if (ctx->GetOption(RSK_DOOR_OF_TIME).Is(RO_DOOROFTIME_CLOSED)) {
     itemObtained = "$i";
-    doorOfTimeText = Hint(RHT_CHILD_ALTAR_TEXT_END_DOTCLOSED).GetText();
+    doorOfTimeText = ::Hint(RHT_CHILD_ALTAR_TEXT_END_DOTCLOSED).GetText();
   }
 
   return Text()+itemObtained+doorOfTimeText;
 }
 
 //insert the required number into the hint and set the singular/plural form
-static Text BuildCountReq(const RandomizerHintTextKey req, const Option& count) {
-  Text requirement = Hint(req).GetTextCopy();
+static Text BuildCountReq(const RandomizerHintTextKey req, const Rando::Option& count) {
+  Text requirement = ::Hint(req).GetTextCopy();
     if (count.Value<uint8_t>() == 1) {
     requirement.SetForm(SINGULAR);
   } else {
@@ -655,80 +736,82 @@ static Text BuildCountReq(const RandomizerHintTextKey req, const Option& count)
 }
 
 static Text BuildBridgeReqsText() {
+  auto ctx = Rando::Context::GetInstance();
   Text bridgeText;
 
-  if (Bridge.Is(RAINBOWBRIDGE_OPEN)) {
-    bridgeText = Hint(RHT_BRIDGE_OPEN_HINT).GetText();
+  if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_ALWAYS_OPEN)) {
+    bridgeText = ::Hint(RHT_BRIDGE_OPEN_HINT).GetText();
 
-  } else if (Bridge.Is(RAINBOWBRIDGE_VANILLA)) {
-    bridgeText = Hint(RHT_BRIDGE_VANILLA_HINT).GetText();
+  } else if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_VANILLA)) {
+      bridgeText = ::Hint(RHT_BRIDGE_VANILLA_HINT).GetText();
 
-  } else if (Bridge.Is(RAINBOWBRIDGE_STONES)) {
-    bridgeText = BuildCountReq(RHT_BRIDGE_STONES_HINT, BridgeStoneCount);
+  } else if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_STONES)) {
+      bridgeText = BuildCountReq(RHT_BRIDGE_STONES_HINT, ctx->GetOption(RSK_RAINBOW_BRIDGE_STONE_COUNT));
 
-  } else if (Bridge.Is(RAINBOWBRIDGE_MEDALLIONS)) {
-    bridgeText = BuildCountReq(RHT_BRIDGE_MEDALLIONS_HINT, BridgeMedallionCount);
+  } else if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_MEDALLIONS)) {
+      bridgeText = BuildCountReq(RHT_BRIDGE_MEDALLIONS_HINT, ctx->GetOption(RSK_RAINBOW_BRIDGE_MEDALLION_COUNT));
 
-  } else if (Bridge.Is(RAINBOWBRIDGE_REWARDS)) {
-    bridgeText = BuildCountReq(RHT_BRIDGE_REWARDS_HINT, BridgeRewardCount);
+  } else if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_DUNGEON_REWARDS)) {
+      bridgeText = BuildCountReq(RHT_BRIDGE_REWARDS_HINT, ctx->GetOption(RSK_RAINBOW_BRIDGE_REWARD_COUNT));
 
-  } else if (Bridge.Is(RAINBOWBRIDGE_DUNGEONS)) {
-    bridgeText = BuildCountReq(RHT_BRIDGE_DUNGEONS_HINT, BridgeDungeonCount);
+  } else if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_DUNGEONS)) {
+      bridgeText = BuildCountReq(RHT_BRIDGE_DUNGEONS_HINT, ctx->GetOption(RSK_RAINBOW_BRIDGE_DUNGEON_COUNT));
 
-  } else if (Bridge.Is(RAINBOWBRIDGE_TOKENS)) {
-    bridgeText = BuildCountReq(RHT_BRIDGE_TOKENS_HINT, BridgeTokenCount);
-  
-  } else if (Bridge.Is(RAINBOWBRIDGE_GREG)) {
-    bridgeText = Hint(RHT_BRIDGE_GREG_HINT).GetText();
+  } else if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_TOKENS)) {
+      bridgeText = BuildCountReq(RHT_BRIDGE_TOKENS_HINT, ctx->GetOption(RSK_RAINBOW_BRIDGE_TOKEN_COUNT));
+
+  } else if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_GREG)) {
+      bridgeText = ::Hint(RHT_BRIDGE_GREG_HINT).GetText();
   }
 
   return Text()+"$l"+bridgeText+"^";
 }
 
 static Text BuildGanonBossKeyText() {
+  auto ctx = Rando::Context::GetInstance();
   Text ganonBossKeyText;
 
-  if (GanonsBossKey.Is(GANONSBOSSKEY_START_WITH)) {
-    ganonBossKeyText = Hint(RHT_GANON_BK_START_WITH_HINT).GetText();
+  if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_STARTWITH)) {
+    ganonBossKeyText = ::Hint(RHT_GANON_BK_START_WITH_HINT).GetText();
 
-  } else if (GanonsBossKey.Is(GANONSBOSSKEY_VANILLA)) {
-    ganonBossKeyText = Hint(RHT_GANON_BK_VANILLA_HINT).GetText();
+  } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_VANILLA)) {
+    ganonBossKeyText = ::Hint(RHT_GANON_BK_VANILLA_HINT).GetText();
 
-  } else if (GanonsBossKey.Is(GANONSBOSSKEY_OWN_DUNGEON)) {
-    ganonBossKeyText = Hint(RHT_GANON_BK_OWN_DUNGEON_HINT).GetText();
+  } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_OWN_DUNGEON)) {
+    ganonBossKeyText = ::Hint(RHT_GANON_BK_OWN_DUNGEON_HINT).GetText();
 
-  } else if (GanonsBossKey.Is(GANONSBOSSKEY_ANY_DUNGEON)) {
-    ganonBossKeyText = Hint(RHT_GANON_BK_ANY_DUNGEON_HINT).GetText();
+  } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_ANY_DUNGEON)) {
+    ganonBossKeyText = ::Hint(RHT_GANON_BK_ANY_DUNGEON_HINT).GetText();
 
-  } else if (GanonsBossKey.Is(GANONSBOSSKEY_OVERWORLD)) {
-    ganonBossKeyText = Hint(RHT_GANON_BK_OVERWORLD_HINT).GetText();
+  } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_OVERWORLD)) {
+    ganonBossKeyText = ::Hint(RHT_GANON_BK_OVERWORLD_HINT).GetText();
 
-  } else if (GanonsBossKey.Is(GANONSBOSSKEY_ANYWHERE)) {
-    ganonBossKeyText = Hint(RHT_GANON_BK_ANYWHERE_HINT).GetText();
+  } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_ANYWHERE)) {
+    ganonBossKeyText = ::Hint(RHT_GANON_BK_ANYWHERE_HINT).GetText();
 
-  } else if (GanonsBossKey.Is(GANONSBOSSKEY_FINAL_GS_REWARD)) {
-    ganonBossKeyText = Hint(RHT_GANON_BK_SKULLTULA_HINT).GetText();
+  } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_KAK_TOKENS)) {
+    ganonBossKeyText = ::Hint(RHT_GANON_BK_SKULLTULA_HINT).GetText();
 
-  } else if (GanonsBossKey.Is(GANONSBOSSKEY_LACS_VANILLA)) {
-    ganonBossKeyText = Hint(RHT_LACS_VANILLA_HINT).GetText();
+  } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_VANILLA)) {
+    ganonBossKeyText = ::Hint(RHT_LACS_VANILLA_HINT).GetText();
 
-  } else if (GanonsBossKey.Is(GANONSBOSSKEY_LACS_STONES)) {
-    ganonBossKeyText = BuildCountReq(RHT_LACS_STONES_HINT, LACSStoneCount);
+  } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_STONES)) {
+    ganonBossKeyText = BuildCountReq(RHT_LACS_STONES_HINT, ctx->GetOption(RSK_LACS_STONE_COUNT));
 
-  } else if (GanonsBossKey.Is(GANONSBOSSKEY_LACS_MEDALLIONS)) {
-    ganonBossKeyText = BuildCountReq(RHT_LACS_MEDALLIONS_HINT, LACSMedallionCount);
+  } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_MEDALLIONS)) {
+    ganonBossKeyText = BuildCountReq(RHT_LACS_MEDALLIONS_HINT, ctx->GetOption(RSK_LACS_MEDALLION_COUNT));
 
-  } else if (GanonsBossKey.Is(GANONSBOSSKEY_LACS_REWARDS)) {
-    ganonBossKeyText = BuildCountReq(RHT_LACS_REWARDS_HINT, LACSRewardCount);
+  } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_REWARDS)) {
+    ganonBossKeyText = BuildCountReq(RHT_LACS_REWARDS_HINT, ctx->GetOption(RSK_LACS_REWARD_COUNT));
 
-  } else if (GanonsBossKey.Is(GANONSBOSSKEY_LACS_DUNGEONS)) {
-    ganonBossKeyText = BuildCountReq(RHT_LACS_DUNGEONS_HINT, LACSDungeonCount);
+  } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_DUNGEONS)) {
+    ganonBossKeyText = BuildCountReq(RHT_LACS_DUNGEONS_HINT, ctx->GetOption(RSK_LACS_DUNGEON_COUNT));
 
-  } else if (GanonsBossKey.Is(GANONSBOSSKEY_LACS_TOKENS)) {
-    ganonBossKeyText = BuildCountReq(RHT_LACS_TOKENS_HINT, LACSTokenCount);
+  } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_TOKENS)) {
+    ganonBossKeyText = BuildCountReq(RHT_LACS_TOKENS_HINT, ctx->GetOption(RSK_LACS_TOKEN_COUNT));
 
-  } else if (GanonsBossKey.Is(GANONSBOSSKEY_TRIFORCE_HUNT)) {
-    ganonBossKeyText = Hint(RHT_GANON_BK_TRIFORCE_HINT).GetText();
+  } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_TRIFORCE_HUNT)) {
+    ganonBossKeyText = ::Hint(RHT_GANON_BK_TRIFORCE_HINT).GetText();
   }
 
   return Text()+"$b"+ganonBossKeyText+"^";
@@ -738,14 +821,15 @@ void CreateAltarText() {
   auto ctx = Rando::Context::GetInstance();
 
   //Child Altar Text
-  if (AltarHintText) {
-    childAltarText = Hint(RHT_SPIRITUAL_STONE_TEXT_START).GetText()+"^"+
+  if (ctx->GetOption(RSK_TOT_ALTAR_HINT)) {
+    childAltarText = ::Hint(RHT_SPIRITUAL_STONE_TEXT_START).GetText()+"^"+
     //Spiritual Stones
-        (StartingKokiriEmerald.Value<uint8_t>() ? Text{ "##", "##", "##" }
+    // TODO: Starting Inventory Dungeon Rewards
+        (/*StartingKokiriEmerald.Value<uint8_t>()*/false ? Text{ "##", "##", "##" }
                                                 : BuildDungeonRewardText(RG_KOKIRI_EMERALD, true)) +
-        (StartingGoronRuby.Value<uint8_t>() ? Text{ "##", "##", "##" }
+        (/*StartingGoronRuby.Value<uint8_t>()*/false ? Text{ "##", "##", "##" }
                                             : BuildDungeonRewardText(RG_GORON_RUBY, true)) +
-        (StartingZoraSapphire.Value<uint8_t>() ? Text{ "##", "##", "##" }
+        (/*StartingZoraSapphire.Value<uint8_t>()*/false ? Text{ "##", "##", "##" }
                                               : BuildDungeonRewardText(RG_ZORA_SAPPHIRE, true)) +
     //How to open Door of Time, the event trigger is necessary to read the altar multiple times
     BuildDoorOfTimeText();
@@ -754,24 +838,24 @@ void CreateAltarText() {
   }
   ctx->AddHint(RH_ALTAR_CHILD, childAltarText, RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text());
 
-  CreateMessageFromTextObject(0x7040, 0, 2, 3, AddColorsAndFormat(childAltarText, {QM_GREEN, QM_RED, QM_BLUE}));
+  //CreateMessageFromTextObject(0x7040, 0, 2, 3, AddColorsAndFormat(childAltarText, {QM_GREEN, QM_RED, QM_BLUE}));
 
   //Adult Altar Text
-  adultAltarText = Hint(RHT_ADULT_ALTAR_TEXT_START).GetText() + "^";
-  if (AltarHintText) {
+  adultAltarText = ::Hint(RHT_ADULT_ALTAR_TEXT_START).GetText() + "^";
+  if (ctx->GetOption(RSK_TOT_ALTAR_HINT)) {
     adultAltarText = adultAltarText +
     //Medallion Areas
-        (StartingLightMedallion.Value<uint8_t>() ? Text{ "##", "##", "##" }
+        (/*StartingLightMedallion.Value<uint8_t>()*/false ? Text{ "##", "##", "##" }
                                                 : BuildDungeonRewardText(RG_LIGHT_MEDALLION, false)) +
-        (StartingForestMedallion.Value<uint8_t>() ? Text{ "##", "##", "##" }
+        (/*StartingForestMedallion.Value<uint8_t>()*/false ? Text{ "##", "##", "##" }
                                                   : BuildDungeonRewardText(RG_FOREST_MEDALLION, false)) +
-        (StartingFireMedallion.Value<uint8_t>() ? Text{ "##", "##", "##" }
+        (/*StartingFireMedallion.Value<uint8_t>()*/false ? Text{ "##", "##", "##" }
                                                 : BuildDungeonRewardText(RG_FIRE_MEDALLION, false)) +
-        (StartingWaterMedallion.Value<uint8_t>() ? Text{ "##", "##", "##" }
+        (/*StartingWaterMedallion.Value<uint8_t>()*/false ? Text{ "##", "##", "##" }
                                                 : BuildDungeonRewardText(RG_WATER_MEDALLION, false)) +
-        (StartingSpiritMedallion.Value<uint8_t>() ? Text{ "##", "##", "##" }
+        (/*StartingSpiritMedallion.Value<uint8_t>()*/false ? Text{ "##", "##", "##" }
                                                   : BuildDungeonRewardText(RG_SPIRIT_MEDALLION, false)) +
-        (StartingShadowMedallion.Value<uint8_t>() ? Text{ "##", "##", "##" }
+        (/*StartingShadowMedallion.Value<uint8_t>()*/false ? Text{ "##", "##", "##" }
                                                   : BuildDungeonRewardText(RG_SHADOW_MEDALLION, false));
   }
   adultAltarText = adultAltarText + 
@@ -782,8 +866,8 @@ void CreateAltarText() {
   BuildGanonBossKeyText()+
 
   //End
-  Hint(RHT_ADULT_ALTAR_TEXT_END).GetText();
-  CreateMessageFromTextObject(0x7088, 0, 2, 3, AddColorsAndFormat(adultAltarText, {QM_RED, QM_YELLOW, QM_GREEN, QM_RED, QM_BLUE, QM_YELLOW, QM_PINK, QM_RED, QM_RED, QM_RED, QM_RED}));
+  ::Hint(RHT_ADULT_ALTAR_TEXT_END).GetText();
+  //CreateMessageFromTextObject(0x7088, 0, 2, 3, AddColorsAndFormat(adultAltarText, {QM_RED, QM_YELLOW, QM_GREEN, QM_RED, QM_BLUE, QM_YELLOW, QM_PINK, QM_RED, QM_RED, QM_RED, QM_RED}));
   ctx->AddHint(RH_ALTAR_ADULT, adultAltarText, RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text());
 }
 
@@ -798,25 +882,25 @@ void CreateMerchantsHints() {
 
 
     Text medigoronText =
-        Hint(RHT_MEDIGORON_DIALOG_FIRST).GetText() + medigoronItemText + Hint(RHT_MEDIGORON_DIALOG_SECOND).GetText();
-    Text grannyText = grannyItemText + Hint(RHT_GRANNY_DIALOG).GetText();
-    Text carpetSalesmanTextOne = Hint(RHT_CARPET_SALESMAN_DIALOG_FIRST).GetText() + carpetSalesmanItemText +
-                                 Hint(RHT_CARPET_SALESMAN_DIALOG_SECOND).GetText();
-    Text carpetSalesmanTextTwo = Hint(RHT_CARPET_SALESMAN_DIALOG_THIRD).GetText() + carpetSalesmanItemClearText +
-                                 Hint(RHT_CARPET_SALESMAN_DIALOG_FOURTH).GetText();
+        ::Hint(RHT_MEDIGORON_DIALOG_FIRST).GetText() + medigoronItemText + ::Hint(RHT_MEDIGORON_DIALOG_SECOND).GetText();
+    Text grannyText = grannyItemText + ::Hint(RHT_GRANNY_DIALOG).GetText();
+    Text carpetSalesmanTextOne = ::Hint(RHT_CARPET_SALESMAN_DIALOG_FIRST).GetText() + carpetSalesmanItemText +
+                                 ::Hint(RHT_CARPET_SALESMAN_DIALOG_SECOND).GetText();
+    Text carpetSalesmanTextTwo = ::Hint(RHT_CARPET_SALESMAN_DIALOG_THIRD).GetText() + carpetSalesmanItemClearText +
+                                 ::Hint(RHT_CARPET_SALESMAN_DIALOG_FOURTH).GetText();
 
-    CreateMessageFromTextObject(0x9120, 0, 2, 3, AddColorsAndFormat(medigoronText, { QM_RED, QM_GREEN }));
-    CreateMessageFromTextObject(0x9121, 0, 2, 3, AddColorsAndFormat(grannyText, { QM_RED, QM_GREEN }));
-    CreateMessageFromTextObject(0x6077, 0, 2, 3, AddColorsAndFormat(carpetSalesmanTextOne, { QM_RED, QM_GREEN }));
-    CreateMessageFromTextObject(0x6078, 0, 2, 3,
-                                AddColorsAndFormat(carpetSalesmanTextTwo, { QM_RED, QM_YELLOW, QM_RED }));
-    ctx->AddHint(RH_MEDIGORON, medigoronText, RC_GC_MEDIGORON, HINT_TYPE_STATIC, GetHintRegion(RR_GORON_CITY)->GetHint().GetText());
-    ctx->AddHint(RH_GRANNYS_SHOP, grannyText, RC_KAK_GRANNYS_SHOP, HINT_TYPE_STATIC, GetHintRegion(RR_KAKARIKO_VILLAGE)->GetHint().GetText());
-    ctx->AddHint(RH_WASTELAND_BOMBCHU_SALESMAN, carpetSalesmanTextOne, RC_WASTELAND_BOMBCHU_SALESMAN, HINT_TYPE_STATIC, GetHintRegion(RR_HAUNTED_WASTELAND)->GetHint().GetText());
+    // CreateMessageFromTextObject(0x9120, 0, 2, 3, AddColorsAndFormat(medigoronText, { QM_RED, QM_GREEN }));
+    // CreateMessageFromTextObject(0x9121, 0, 2, 3, AddColorsAndFormat(grannyText, { QM_RED, QM_GREEN }));
+    // CreateMessageFromTextObject(0x6077, 0, 2, 3, AddColorsAndFormat(carpetSalesmanTextOne, { QM_RED, QM_GREEN }));
+    // CreateMessageFromTextObject(0x6078, 0, 2, 3,
+                                // AddColorsAndFormat(carpetSalesmanTextTwo, { QM_RED, QM_YELLOW, QM_RED }));
+    // ctx->AddHint(RH_MEDIGORON, AutoFormatHintText(medigoronText), RC_GC_MEDIGORON, HINT_TYPE_STATIC, GetHintRegion(RR_GORON_CITY)->GetHint().GetText());
+    // ctx->AddHint(RH_GRANNYS_SHOP, AutoFormatHintText(grannyText), RC_KAK_GRANNYS_SHOP, HINT_TYPE_STATIC, GetHintRegion(RR_KAKARIKO_VILLAGE)->GetHint().GetText());
+    // ctx->AddHint(RH_WASTELAND_BOMBCHU_SALESMAN, AutoFormatHintText(carpetSalesmanTextOne), RC_WASTELAND_BOMBCHU_SALESMAN, HINT_TYPE_STATIC, GetHintRegion(RR_HAUNTED_WASTELAND)->GetHint().GetText());
 }
 
 //RANDOTODO add Better Links Pocket and starting item handling once more starting items are added
-void CreateSpecialItemHint(uint32_t item, std::vector<RandomizerCheck> hints, RandomizerHintTextKey text1, RandomizerHintTextKey text2, Text& textLoc, std::string& nameLoc, bool condition, bool yourpocket = false) {
+void CreateSpecialItemHint(uint32_t item, RandomizerHintKey hintKey, std::vector<RandomizerCheck> hints, RandomizerHintTextKey text1, RandomizerHintTextKey text2, Text& textLoc, std::string& nameLoc, bool condition, bool yourpocket = false) {
   auto ctx = Rando::Context::GetInstance();
   if(condition){
       RandomizerCheck location = FilterFromPool(ctx->allLocations, [item, ctx](const RandomizerCheck loc) {
@@ -828,8 +912,9 @@ void CreateSpecialItemHint(uint32_t item, std::vector<RandomizerCheck> hints, Ra
     }
     
     Text area = GetHintRegion(ctx->GetItemLocation(location)->GetParentRegionKey())->GetHint().GetText();
-    textLoc = Hint(text1).GetText() + area + Hint(text2).GetText();
+    textLoc = ::Hint(text1).GetText() + area + ::Hint(text2).GetText();
     nameLoc = Rando::StaticData::GetLocation(location)->GetName();
+    ctx->AddHint(hintKey, AutoFormatHintText(textLoc), location, HINT_TYPE_STATIC, area);
   } else {
     textLoc = Text();
     nameLoc = "";
@@ -838,7 +923,8 @@ void CreateSpecialItemHint(uint32_t item, std::vector<RandomizerCheck> hints, Ra
 
 
 void CreateWarpSongTexts() {
-  if (!ShuffleWarpSongs) {
+  auto ctx = Rando::Context::GetInstance();
+  if (!ctx->GetOption(RSK_WARP_SONG_HINTS)) {
     warpMinuetText = Text();
     warpBoleroText = Text();
     warpSerenadeText = Text();
@@ -865,21 +951,27 @@ void CreateWarpSongTexts() {
     switch (entrance->GetIndex()) {
       case 0x0600: // minuet
         warpMinuetText = resolvedHint;
+        ctx->AddHint(RH_MINUET_WARP_LOC, resolvedHint, RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, resolvedHint);
         break;
       case 0x04F6: // bolero
         warpBoleroText = resolvedHint;
+        ctx->AddHint(RH_BOLERO_WARP_LOC, resolvedHint, RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, resolvedHint);
         break;
       case 0x0604: // serenade
         warpSerenadeText = resolvedHint;
+        ctx->AddHint(RH_SERENADE_WARP_LOC, resolvedHint, RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, resolvedHint);
         break;
       case 0x01F1: // requiem
         warpRequiemText = resolvedHint;
+        ctx->AddHint(RH_REQUIEM_WARP_LOC, resolvedHint, RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, resolvedHint);
         break;
       case 0x0568: // nocturne
-        warpNocturneText = resolvedHint;
-        break;
+          warpNocturneText = resolvedHint;
+          ctx->AddHint(RH_NOCTURNE_WARP_LOC, resolvedHint, RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, resolvedHint);
+          break;
       case 0x05F4: // prelude
         warpPreludeText = resolvedHint;
+        ctx->AddHint(RH_PRELUDE_WARP_LOC, resolvedHint, RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, resolvedHint);
         break;
     }
   }
@@ -1008,32 +1100,32 @@ uint8_t PlaceHints(std::array<uint8_t, HINT_TYPE_MAX>& selectedHints,
 void CreateStoneHints() {
   auto ctx = Rando::Context::GetInstance();
   SPDLOG_DEBUG("\nNOW CREATING HINTS\n");
-  const HintSetting& hintSetting = hintSettingTable[Settings::HintDistribution.Value<uint8_t>()];
+  const HintSetting& hintSetting = hintSettingTable[ctx->GetOption(RSK_HINT_DISTRIBUTION).Value<uint8_t>()];
   std::array<HintDistributionSetting, (int)HINT_TYPE_MAX> distTable = hintSetting.distTable;
 
   uint8_t* remainingDungeonWothHints = new uint8_t(hintSetting.dungeonsWothLimit);
   uint8_t* remainingDungeonBarrenHints = new uint8_t(hintSetting.dungeonsBarrenLimit);
 
   // Apply Special hint exclusions with no requirements
-  if (Settings::Kak10GSHintText){
+  if (ctx->GetOption(RSK_KAK_10_SKULLS_HINT)){
       ctx->GetItemLocation(RC_KAK_10_GOLD_SKULLTULA_REWARD)->SetAsHinted();
   }
-  if (Settings::Kak20GSHintText){
+  if (ctx->GetOption(RSK_KAK_20_SKULLS_HINT)){
       ctx->GetItemLocation(RC_KAK_20_GOLD_SKULLTULA_REWARD)->SetAsHinted();
   }
-  if (Settings::Kak30GSHintText){
+  if (ctx->GetOption(RSK_KAK_30_SKULLS_HINT)){
       ctx->GetItemLocation(RC_KAK_30_GOLD_SKULLTULA_REWARD)->SetAsHinted();
   }
-  if (Settings::Kak40GSHintText){
+  if (ctx->GetOption(RSK_KAK_40_SKULLS_HINT)){
       ctx->GetItemLocation(RC_KAK_40_GOLD_SKULLTULA_REWARD)->SetAsHinted();
   }
-  if (Settings::Kak50GSHintText){
+  if (ctx->GetOption(RSK_KAK_50_SKULLS_HINT)){
       ctx->GetItemLocation(RC_KAK_50_GOLD_SKULLTULA_REWARD)->SetAsHinted();
   }
-  if (Settings::FrogsHintText){
+  if (ctx->GetOption(RSK_FROGS_HINT)){
       ctx->GetItemLocation(RC_ZR_FROGS_OCARINA_GAME)->SetAsHinted();
   }
-  if (Settings::skipChildZelda){
+  if (ctx->GetOption(RSK_SKIP_CHILD_ZELDA)){
       ctx->GetItemLocation(RC_SONG_FROM_IMPA)->SetAsHinted();
   }
 
@@ -1045,7 +1137,7 @@ void CreateStoneHints() {
       auto alwaysHintLocations = FilterFromPool(ctx->allLocations, [ctx](const RandomizerCheck loc) {
           return ((Rando::StaticData::GetLocation(loc)->GetHint()->GetType() == HintCategory::Always) ||
                   // If we have Rainbow Bridge set to Greg, add a hint for where Greg is
-                  (Bridge.Is(RAINBOWBRIDGE_GREG) &&
+                  (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_GREG) &&
                    ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == RG_GREG_RUPEE)) &&
                  ctx->GetItemLocation(loc)->IsHintable() && !(ctx->GetItemLocation(loc)->IsHintedAt());
       });
@@ -1086,16 +1178,17 @@ void CreateStoneHints() {
 }
 
 void CreateAllHints(){
+  auto ctx = Rando::Context::GetInstance();
   CreateGanonAndSheikText();
   CreateAltarText();
-  CreateSpecialItemHint(RG_PROGRESSIVE_HOOKSHOT, {RC_DAMPE_HINT}, RHT_DAMPE_DIARY01, RHT_DAMPE_DIARY02, dampesText, dampeHintLoc, (bool)DampeHintText);
-  CreateSpecialItemHint(RG_GREG_RUPEE, {RC_GREG_HINT}, RHT_GREG_HINT01, RHT_GREG_HINT02, gregText, gregHintLoc, (bool)GregHintText);
-  CreateSpecialItemHint(RG_PROGRESSIVE_MAGIC_METER, {RC_SARIA_SONG_HINT, RC_SONG_FROM_SARIA}, RHT_SARIA_TEXT01, RHT_SARIA_TEXT02, sariaText, sariaHintLoc, (bool)SariaHintText);
+  CreateSpecialItemHint(RG_PROGRESSIVE_HOOKSHOT, RH_DAMPES_DIARY, {RC_DAMPE_HINT}, RHT_DAMPE_DIARY01, RHT_DAMPE_DIARY02, dampesText, dampeHintLoc, (bool)ctx->GetOption(RSK_DAMPES_DIARY_HINT));
+  CreateSpecialItemHint(RG_GREG_RUPEE, RH_GREG_RUPEE, {RC_GREG_HINT}, RHT_GREG_HINT01, RHT_GREG_HINT02, gregText, gregHintLoc, (bool)ctx->GetOption(RSK_GREG_HINT));
+  CreateSpecialItemHint(RG_PROGRESSIVE_MAGIC_METER, RH_SARIA, {RC_SARIA_SONG_HINT, RC_SONG_FROM_SARIA}, RHT_SARIA_TEXT01, RHT_SARIA_TEXT02, sariaText, sariaHintLoc, (bool)ctx->GetOption(RSK_SARIA_HINT));
 
-  if (ShuffleMerchants.Is(SHUFFLEMERCHANTS_HINTS)) {
+  if (ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ON_HINT)) {
     CreateMerchantsHints();
   }
-  if (GossipStoneHints.IsNot(HINTS_NO_HINTS)) {
+  if (ctx->GetOption(RSK_GOSSIP_STONE_HINTS).IsNot(RO_GOSSIP_STONES_NONE)) {
     printf("\x1b[10;10HCreating Hints...");
     CreateStoneHints();
     printf("Done");
diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.hpp b/soh/soh/Enhancements/randomizer/3drando/hints.hpp
index 501f0b36a..eb9b9fd05 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hints.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hints.hpp
@@ -6,10 +6,7 @@
 
 #include "text.hpp"
 #include "random.hpp"
-#include "settings.hpp"
-#include "dungeon.hpp"
 #include <functional>
-
 struct HintDistributionSetting {
   HintType type;
   size_t weight;
@@ -55,7 +52,8 @@ public:
     : obscureText(std::move(obscureText_)),
       ambiguousText(std::move(ambiguousText_)),
       clearText(std::move(clearText_)),
-      type(type_) {}
+      type(type_) {
+      }
 
     static auto Item(std::vector<Text>&& obscureText, std::vector<Text>&& ambiguousText = {}, Text&& clearText = {}) {
         return HintText{std::move(obscureText), std::move(ambiguousText), std::move(clearText), HintCategory::Item};
@@ -162,25 +160,9 @@ public:
         return clearText;
     }
 
-    const Text& GetText() const {
-        if (Settings::ClearerHints.Is(HINTMODE_OBSCURE)) {
-            return GetObscure();
-        } else if (Settings::ClearerHints.Is(HINTMODE_AMBIGUOUS)){
-            return GetAmbiguous();
-        } else {
-            return GetClear();
-        }
-    }
+    const Text& GetText() const;
 
-    const Text GetTextCopy() const {
-        if (Settings::ClearerHints.Is(HINTMODE_OBSCURE)) {
-            return GetObscure();
-        } else if (Settings::ClearerHints.Is(HINTMODE_AMBIGUOUS)){
-            return GetAmbiguous();
-        } else {
-            return GetClear();
-        }
-    }
+    const Text GetTextCopy() const;
 
     HintCategory GetType() const {
         return type;
@@ -204,8 +186,15 @@ private:
 
 using ConditionalAlwaysHint = std::pair<RandomizerCheck, std::function<bool()>>;
 
+typedef enum {
+    DUNGEON_NEITHER,
+    DUNGEON_BARREN,
+    DUNGEON_WOTH,
+} DungeonHintInfo;
+
 //10 dungeons as GTG and GC are excluded
-extern std::array<DungeonInfo, 10> dungeonInfoData;
+extern std::array<DungeonHintInfo, 10> dungeonInfoData;
+
 extern std::array<ConditionalAlwaysHint, 10> conditionalAlwaysHints;
 
 extern RandomizerHintTextKey GetHintRegionHintKey(const RandomizerRegion area);
diff --git a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
index 3b29ad195..6a3c4d744 100644
--- a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
@@ -1,23 +1,17 @@
 #include "item_pool.hpp"
 
-#include "dungeon.hpp"
+#include "../dungeon.h"
 #include "fill.hpp"
 #include "../static_data.h"
 #include "../context.h"
 #include "pool_functions.hpp"
 #include "random.hpp"
-#include "settings.hpp"
 #include "spoiler_log.hpp"
 #include "z64item.h"
 #include <spdlog/spdlog.h>
 
-
-using namespace Settings;
-using namespace Dungeon;
-
 std::vector<RandomizerGet> ItemPool = {};
 std::vector<RandomizerGet> PendingJunkPool = {};
-std::vector<uint8_t> IceTrapModels = {};
 const std::array<RandomizerGet, 9> dungeonRewards = {
   RG_KOKIRI_EMERALD,
   RG_GORON_RUBY,
@@ -432,9 +426,10 @@ static void AddRandomBottle(std::vector<RandomizerGet>& bottlePool) {
 }
 
 RandomizerGet GetJunkItem() {
-  if (IceTrapValue.Is(ICETRAPS_MAYHEM) || IceTrapValue.Is(ICETRAPS_ONSLAUGHT)) {
+  auto ctx = Rando::Context::GetInstance();
+  if (ctx->GetOption(RSK_ICE_TRAPS).Is(RO_ICE_TRAPS_MAYHEM) || ctx->GetOption(RSK_ICE_TRAPS).Is(RO_ICE_TRAPS_ONSLAUGHT)) {
       return RG_ICE_TRAP;
-  } else if (IceTrapValue.Is(ICETRAPS_EXTRA)) {
+  } else if (ctx->GetOption(RSK_ICE_TRAPS).Is(RO_ICE_TRAPS_EXTRA)) {
       return RandomElement(JunkPoolItems);
   }
   //Ice Trap is the last item in JunkPoolItems, so subtract 1 to never hit that index
@@ -504,10 +499,10 @@ static void PlaceVanillaDekuScrubItems() {
     ctx->PlaceItemInLocation(RC_LLR_DEKU_SCRUB_GROTTO_CENTER,          RG_DEKU_SEEDS_30, false, true);
 
     //Dungeon Scrubs
-    if (DekuTree.IsMQ()) {
+    if (ctx->GetDungeon(Rando::DEKU_TREE)->IsMQ()) {
         ctx->PlaceItemInLocation(RC_DEKU_TREE_MQ_DEKU_SCRUB, RG_DEKU_SHIELD, false, true);
     }
-    if (DodongosCavern.IsMQ()) {
+    if (ctx->GetDungeon(Rando::DODONGOS_CAVERN)->IsMQ()) {
         ctx->PlaceItemInLocation(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR, RG_DEKU_STICK_1, false, true);
         ctx->PlaceItemInLocation(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT, RG_DEKU_SEEDS_30, false, true);
         ctx->PlaceItemInLocation(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE, RG_DEKU_SHIELD, false, true);
@@ -519,10 +514,10 @@ static void PlaceVanillaDekuScrubItems() {
       ctx->PlaceItemInLocation(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT,     RG_DEKU_SEEDS_30, false, true);
       ctx->PlaceItemInLocation(RC_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY,                   RG_DEKU_SHIELD, false, true);
     }
-    if (JabuJabusBelly.IsVanilla()) {
+    if (ctx->GetDungeon(Rando::JABU_JABUS_BELLY)->IsVanilla()) {
         ctx->PlaceItemInLocation(RC_JABU_JABUS_BELLY_DEKU_SCRUB, RG_DEKU_NUTS_5, false, true);
     }
-    if (GanonsCastle.IsMQ()) {
+    if (ctx->GetDungeon(Rando::GANONS_CASTLE)->IsMQ()) {
       ctx->PlaceItemInLocation(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,         RG_GREEN_POTION_REFILL, false, true);
       ctx->PlaceItemInLocation(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,  RG_BOMBS_5, false, true);
       ctx->PlaceItemInLocation(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,       RG_ARROWS_30, false, true);
@@ -539,23 +534,28 @@ static void PlaceVanillaDekuScrubItems() {
 }
 
 static void PlaceVanillaMapsAndCompasses() {
-  for (auto dungeon : dungeonList) {
+  auto ctx = Rando::Context::GetInstance();
+  for (auto dungeon : ctx->GetDungeons()->GetDungeonList()) {
     dungeon->PlaceVanillaMap();
     dungeon->PlaceVanillaCompass();
   }
 }
 
 static void PlaceVanillaSmallKeys() {
-  for (auto dungeon : dungeonList) {
+  auto ctx = Rando::Context::GetInstance();
+  for (auto dungeon : ctx->GetDungeons()->GetDungeonList()) {
     dungeon->PlaceVanillaSmallKeys();
   }
 }
 
 static void PlaceVanillaBossKeys() {
-  for (auto dungeon : dungeonList) {
+  auto ctx = Rando::Context::GetInstance();
+  for (auto dungeon : ctx->GetDungeons()->GetDungeonList()) {
     dungeon->PlaceVanillaBossKey();
   }
 }
+// TODO: This feels like it could be moved to Dungeons class and probably shorten
+// a few function call chains. Needs investigation.
 
 static void PlaceVanillaCowMilk() {
   auto ctx = Rando::Context::GetInstance();
@@ -569,7 +569,7 @@ static void PlaceVanillaCowMilk() {
   ctx->PlaceItemInLocation(RC_LLR_TOWER_LEFT_COW,    RG_MILK, false, true);
   ctx->PlaceItemInLocation(RC_LLR_TOWER_RIGHT_COW,   RG_MILK, false, true);
 
-  if (JabuJabusBelly.IsMQ()) {
+  if (ctx->GetDungeon(Rando::JABU_JABUS_BELLY)->IsMQ()) {
     ctx->PlaceItemInLocation(RC_JABU_JABUS_BELLY_MQ_COW, RG_MILK, false, true);
   }
 }
@@ -590,6 +590,7 @@ static void SetScarceItemPool() {
 }
 
 static void SetMinimalItemPool() {
+  auto ctx = Rando::Context::GetInstance();
   ReplaceMaxItem(RG_PROGRESSIVE_BOMBCHUS, 1);
   ReplaceMaxItem(RG_BOMBCHU_5, 1);
   ReplaceMaxItem(RG_BOMBCHU_10, 0);
@@ -604,7 +605,7 @@ static void SetMinimalItemPool() {
   ReplaceMaxItem(RG_PROGRESSIVE_BOMB_BAG, 1);
   ReplaceMaxItem(RG_PIECE_OF_HEART, 0);
   // Need an extra heart container when starting with 1 heart to be able to reach 3 hearts
-  ReplaceMaxItem(RG_HEART_CONTAINER, (StartingHearts.Value<uint8_t>() == 18)? 1 : 0);
+  ReplaceMaxItem(RG_HEART_CONTAINER, (ctx->GetOption(RSK_STARTING_HEARTS).Value<uint8_t>() == 18)? 1 : 0);
 }
 
 void GenerateItemPool() {
@@ -613,63 +614,63 @@ void GenerateItemPool() {
   PendingJunkPool.clear();
 
   //Initialize ice trap models to always major items
-  IceTrapModels = {
-    GI_SHIELD_MIRROR,
-    GI_BOOMERANG,
-    GI_LENS,
-    GI_HAMMER,
-    GI_BOOTS_IRON,
-    GI_BOOTS_HOVER,
-    GI_STONE_OF_AGONY,
-    GI_DINS_FIRE,
-    GI_FARORES_WIND,
-    GI_NAYRUS_LOVE,
-    GI_ARROW_FIRE,
-    GI_ARROW_ICE,
-    GI_ARROW_LIGHT,
-    0xB8, //Double defense
-    GI_CLAIM_CHECK,
-    0x80, //Progressive hookshot
-    0x81, //Progressive strength
-    0x82, //Progressive bomb bag
-    0x83, //Progressive bow
-    0x84, //Progressive slingshot
-    0x85, //Progressive wallet
-    0x86, //Progressive scale
-    0x8A, //Progressive magic
+  ctx->possibleIceTrapModels = {
+    RG_MIRROR_SHIELD,
+    RG_BOOMERANG,
+    RG_LENS_OF_TRUTH,
+    RG_MEGATON_HAMMER,
+    RG_IRON_BOOTS,
+    RG_HOVER_BOOTS,
+    RG_STONE_OF_AGONY,
+    RG_DINS_FIRE,
+    RG_FARORES_WIND,
+    RG_NAYRUS_LOVE,
+    RG_FIRE_ARROWS,
+    RG_ICE_ARROWS,
+    RG_LIGHT_ARROWS,
+    RG_DOUBLE_DEFENSE, //Double defense
+    RG_CLAIM_CHECK,
+    RG_PROGRESSIVE_HOOKSHOT, //Progressive hookshot
+    RG_PROGRESSIVE_STRENGTH, //Progressive strength
+    RG_PROGRESSIVE_BOMB_BAG, //Progressive bomb bag
+    RG_PROGRESSIVE_BOW, //Progressive bow
+    RG_PROGRESSIVE_SLINGSHOT, //Progressive slingshot
+    RG_PROGRESSIVE_WALLET, //Progressive wallet
+    RG_PROGRESSIVE_SCALE, //Progressive scale
+    RG_PROGRESSIVE_MAGIC_METER, //Progressive magic
   };
   //Check song shuffle and dungeon reward shuffle just for ice traps
-  if (ShuffleSongs.Is(SONGSHUFFLE_ANYWHERE)) {
+  if (ctx->GetOption(RSK_SHUFFLE_SONGS).Is(RO_SONG_SHUFFLE_ANYWHERE)) {
     //Push item ids for songs
-    IceTrapModels.push_back(0xC1);
-    IceTrapModels.push_back(0xC2);
-    IceTrapModels.push_back(0xC3);
-    IceTrapModels.push_back(0xC4);
-    IceTrapModels.push_back(0xC5);
-    IceTrapModels.push_back(0xC6);
-    IceTrapModels.push_back(0xBB);
-    IceTrapModels.push_back(0xBC);
-    IceTrapModels.push_back(0xBD);
-    IceTrapModels.push_back(0xBE);
-    IceTrapModels.push_back(0xBF);
-    IceTrapModels.push_back(0xC0);
+    ctx->possibleIceTrapModels.push_back(RG_ZELDAS_LULLABY);
+    ctx->possibleIceTrapModels.push_back(RG_EPONAS_SONG);
+    ctx->possibleIceTrapModels.push_back(RG_SARIAS_SONG);
+    ctx->possibleIceTrapModels.push_back(RG_SUNS_SONG);
+    ctx->possibleIceTrapModels.push_back(RG_SONG_OF_TIME);
+    ctx->possibleIceTrapModels.push_back(RG_SONG_OF_STORMS);
+    ctx->possibleIceTrapModels.push_back(RG_MINUET_OF_FOREST);
+    ctx->possibleIceTrapModels.push_back(RG_BOLERO_OF_FIRE);
+    ctx->possibleIceTrapModels.push_back(RG_SERENADE_OF_WATER);
+    ctx->possibleIceTrapModels.push_back(RG_REQUIEM_OF_SPIRIT);
+    ctx->possibleIceTrapModels.push_back(RG_NOCTURNE_OF_SHADOW);
+    ctx->possibleIceTrapModels.push_back(RG_PRELUDE_OF_LIGHT);
   }
-  if (ShuffleRewards.Is(REWARDSHUFFLE_ANYWHERE)) {
+  if (ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_ANYWHERE)) {
     //Push item ids for dungeon rewards
-    IceTrapModels.push_back(0xCB);
-    IceTrapModels.push_back(0xCC);
-    IceTrapModels.push_back(0xCD);
-    IceTrapModels.push_back(0xCE);
-    IceTrapModels.push_back(0xCF);
-    IceTrapModels.push_back(0xD0);
-    IceTrapModels.push_back(0xD1);
-    IceTrapModels.push_back(0xD2);
-    IceTrapModels.push_back(0xD3);
+    ctx->possibleIceTrapModels.push_back(RG_KOKIRI_EMERALD);
+    ctx->possibleIceTrapModels.push_back(RG_GORON_RUBY);
+    ctx->possibleIceTrapModels.push_back(RG_ZORA_SAPPHIRE);
+    ctx->possibleIceTrapModels.push_back(RG_FOREST_MEDALLION);
+    ctx->possibleIceTrapModels.push_back(RG_FIRE_MEDALLION);
+    ctx->possibleIceTrapModels.push_back(RG_WATER_MEDALLION);
+    ctx->possibleIceTrapModels.push_back(RG_SPIRIT_MEDALLION);
+    ctx->possibleIceTrapModels.push_back(RG_SHADOW_MEDALLION);
+    ctx->possibleIceTrapModels.push_back(RG_LIGHT_MEDALLION);
   }
 
-  if (TriforceHunt.Is(TRIFORCE_HUNT_ON)) {
-    IceTrapModels.push_back(0xDF);
-    AddItemToMainPool(RG_TRIFORCE_PIECE, Settings::TriforceHuntTotal.Value<uint8_t>());
+  if (ctx->GetOption(RSK_TRIFORCE_HUNT)) {
+    ctx->possibleIceTrapModels.push_back(RG_TRIFORCE_PIECE);
+    AddItemToMainPool(RG_TRIFORCE_PIECE, ctx->GetOption(RSK_TRIFORCE_HUNT_PIECES_TOTAL).Value<uint8_t>());
     ctx->PlaceItemInLocation(RC_TRIFORCE_COMPLETED, RG_TRIFORCE); // Win condition
     ctx->PlaceItemInLocation(RC_GANON, GetJunkItem(), false, true);
   } else {
@@ -680,66 +681,66 @@ void GenerateItemPool() {
   ctx->PlaceItemInLocation(RC_HC_ZELDAS_LETTER, RG_ZELDAS_LETTER);
   ctx->PlaceItemInLocation(RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS, RG_BOMBCHU_DROP);
 
-  if (ShuffleKokiriSword) {
+  if (ctx->GetOption(RSK_SHUFFLE_KOKIRI_SWORD)) {
     AddItemToMainPool(RG_KOKIRI_SWORD);
-    IceTrapModels.push_back(GI_SWORD_KOKIRI);
+    ctx->possibleIceTrapModels.push_back(RG_KOKIRI_SWORD);
   } else {
     ctx->PlaceItemInLocation(RC_KF_KOKIRI_SWORD_CHEST, RG_KOKIRI_SWORD, false, true);
   }
 
-  if (ShuffleMasterSword) {
+  if (ctx->GetOption(RSK_SHUFFLE_MASTER_SWORD)) {
     AddItemToMainPool(RG_MASTER_SWORD);
-    IceTrapModels.push_back(0xE0); //Master Sword without the GI enum
+    ctx->possibleIceTrapModels.push_back(RG_MASTER_SWORD); //Master Sword without the GI enum
   } else {
     ctx->PlaceItemInLocation(RC_TOT_MASTER_SWORD, RG_MASTER_SWORD, false, true);
   }
 
-  if (ShuffleWeirdEgg) {
+  if (ctx->GetOption(RSK_SHUFFLE_WEIRD_EGG)) {
     AddItemToMainPool(RG_WEIRD_EGG);
-    IceTrapModels.push_back(GI_WEIRD_EGG);
+    ctx->possibleIceTrapModels.push_back(RG_WEIRD_EGG);
   } else {
     ctx->PlaceItemInLocation(RC_HC_MALON_EGG, RG_WEIRD_EGG, false, true);
   }
 
-  if (ShuffleOcarinas) {
+  if (ctx->GetOption(RSK_SHUFFLE_OCARINA)) {
     AddItemToMainPool(RG_PROGRESSIVE_OCARINA, 2);
-    if (ItemPoolValue.Is(ITEMPOOL_PLENTIFUL)) {
+    if (ctx->GetOption(RSK_ITEM_POOL).Is(RO_ITEM_POOL_PLENTIFUL)) {
       AddItemToPool(PendingJunkPool, RG_PROGRESSIVE_OCARINA);
     }
-    IceTrapModels.push_back(0x8B); //Progressive ocarina
+    ctx->possibleIceTrapModels.push_back(RG_PROGRESSIVE_OCARINA); //Progressive ocarina
   } else {
     ctx->PlaceItemInLocation(RC_LW_GIFT_FROM_SARIA, RG_PROGRESSIVE_OCARINA, false, true);
     ctx->PlaceItemInLocation(RC_HF_OCARINA_OF_TIME_ITEM, RG_PROGRESSIVE_OCARINA, false, true);
   }
 
-  if (ShuffleCows) {
+  if (ctx->GetOption(RSK_SHUFFLE_COWS)) {
     //9 total cow locations
     for (uint8_t i = 0; i < 9; i++) {
       AddItemToMainPool(GetJunkItem());
     }
     //extra location for Jabu MQ
-    if (JabuJabusBelly.IsMQ()) {
+    if (ctx->GetDungeon(Rando::JABU_JABUS_BELLY)->IsMQ()) {
       AddItemToMainPool(GetJunkItem());
     }
   } else {
     PlaceVanillaCowMilk();
   }
 
-  if (ShuffleMagicBeans) {
+  if (ctx->GetOption(RSK_SHUFFLE_MAGIC_BEANS)) {
     AddItemToMainPool(RG_MAGIC_BEAN_PACK);
-    if (ItemPoolValue.Is(ITEMPOOL_PLENTIFUL)) {
+    if (ctx->GetOption(RSK_ITEM_POOL).Is(RO_ITEM_POOL_PLENTIFUL)) {
       AddItemToPool(PendingJunkPool, RG_MAGIC_BEAN_PACK);
     }
-    IceTrapModels.push_back(0xC9); //Magic bean pack
+    ctx->possibleIceTrapModels.push_back(RG_MAGIC_BEAN_PACK); //Magic bean pack
   } else {
     ctx->PlaceItemInLocation(RC_ZR_MAGIC_BEAN_SALESMAN, RG_MAGIC_BEAN, false, true);
   }
 
-  if (ShuffleMerchants.IsNot(SHUFFLEMERCHANTS_OFF)) {
-    if (!ProgressiveGoronSword) {
+  if (ctx->GetOption(RSK_SHUFFLE_MERCHANTS).IsNot(RO_SHUFFLE_MERCHANTS_OFF)) {
+    if (/*!ProgressiveGoronSword TODO: Implement Progressive Goron Sword*/true) {
       AddItemToMainPool(RG_GIANTS_KNIFE);
     }
-    if (BombchusInLogic) {
+    if (ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC)) {
       AddItemToMainPool(RG_PROGRESSIVE_BOMBCHUS);
     } else {
       AddItemToMainPool(RG_BOMBCHU_10);
@@ -750,7 +751,7 @@ void GenerateItemPool() {
     ctx->PlaceItemInLocation(RC_WASTELAND_BOMBCHU_SALESMAN, RG_BOMBCHU_10, false, true);
   }
 
-  if (ShuffleFrogSongRupees) {
+  if (ctx->GetOption(RSK_SHUFFLE_FROG_SONG_RUPEES)) {
     AddItemToMainPool(RG_PURPLE_RUPEE, 5);
   } else {
     ctx->PlaceItemInLocation(RC_ZR_FROGS_ZELDAS_LULLABY, RG_PURPLE_RUPEE, false, true);
@@ -760,7 +761,7 @@ void GenerateItemPool() {
     ctx->PlaceItemInLocation(RC_ZR_FROGS_SONG_OF_TIME, RG_PURPLE_RUPEE, false, true);
   }
 
-  if (ShuffleAdultTradeQuest) {
+  if (ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE)) {
     AddItemToMainPool(RG_POCKET_EGG);
     AddItemToMainPool(RG_COJIRO);
     AddItemToMainPool(RG_ODD_MUSHROOM);
@@ -783,9 +784,9 @@ void GenerateItemPool() {
   }
   AddItemToMainPool(RG_CLAIM_CHECK);
 
-  if (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_SINGLE_KEYS)) {
+  if (ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS)) {
     AddItemToMainPool(RG_TREASURE_GAME_SMALL_KEY, 6); // 6 individual keys
-  } else if (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_PACK)) {
+  } else if (ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK)) {
     AddItemToMainPool(RG_TREASURE_GAME_SMALL_KEY); // 1 key which will behave as a pack of 6
   } else {
     ctx->PlaceItemInLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_1, RG_TREASURE_GAME_SMALL_KEY, false, true);
@@ -795,11 +796,11 @@ void GenerateItemPool() {
     ctx->PlaceItemInLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_5, RG_TREASURE_GAME_SMALL_KEY, false, true);
   };
 
-  if (Tokensanity.Is(TOKENSANITY_OFF)) {
+  if (ctx->GetOption(RSK_SHUFFLE_TOKENS).Is(RO_TOKENSANITY_OFF)) {
     for (RandomizerCheck loc : ctx->GetLocations(ctx->allLocations, Category::cSkulltula)) {
       ctx->PlaceItemInLocation(loc, RG_GOLD_SKULLTULA_TOKEN, false, true);
     }
-  } else if (Tokensanity.Is(TOKENSANITY_DUNGEONS)) {
+  } else if (ctx->GetOption(RSK_SHUFFLE_TOKENS).Is(RO_TOKENSANITY_DUNGEONS)) {
     for (RandomizerCheck loc : ctx->GetLocations(ctx->allLocations, Category::cSkulltula)) {
       if (Rando::StaticData::GetLocation(loc)->IsOverworld()) {
           ctx->PlaceItemInLocation((RandomizerCheck)loc, RG_GOLD_SKULLTULA_TOKEN, false, true);
@@ -807,7 +808,7 @@ void GenerateItemPool() {
         AddItemToMainPool(RG_GOLD_SKULLTULA_TOKEN);
       }
     }
-  } else if (Tokensanity.Is(TOKENSANITY_OVERWORLD)) {
+  } else if (ctx->GetOption(RSK_SHUFFLE_TOKENS).Is(RO_TOKENSANITY_OVERWORLD)) {
     for (RandomizerCheck loc : ctx->GetLocations(ctx->allLocations, Category::cSkulltula)) {
       if (Rando::StaticData::GetLocation(loc)->IsDungeon()) {
           ctx->PlaceItemInLocation((RandomizerCheck)loc, RG_GOLD_SKULLTULA_TOKEN, false, true);
@@ -819,8 +820,8 @@ void GenerateItemPool() {
     AddItemToMainPool(RG_GOLD_SKULLTULA_TOKEN, 100);
   }
 
-  if (Shuffle100GSReward) {
-    if (Tokensanity.IsNot(TOKENSANITY_OFF) && ItemPoolValue.Is(ITEMPOOL_PLENTIFUL)) {
+  if (ctx->GetOption(RSK_SHUFFLE_100_GS_REWARD)) {
+    if (ctx->GetOption(RSK_SHUFFLE_TOKENS).IsNot(RO_TOKENSANITY_OFF) && ctx->GetOption(RSK_ITEM_POOL).Is(RO_ITEM_POOL_PLENTIFUL)) {
       AddItemToPool(PendingJunkPool, RG_GOLD_SKULLTULA_TOKEN, 10);
     }
     AddItemToMainPool(RG_HUGE_RUPEE);
@@ -828,7 +829,7 @@ void GenerateItemPool() {
     ctx->PlaceItemInLocation(RC_KAK_100_GOLD_SKULLTULA_REWARD, RG_HUGE_RUPEE, false, true);
   }
 
-  if (BombchusInLogic) {
+  if (ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC)) {
     AddItemToMainPool(RG_PROGRESSIVE_BOMBCHUS, 5);
   } else {
     AddItemToMainPool(RG_BOMBCHU_5);
@@ -838,28 +839,28 @@ void GenerateItemPool() {
 
   //Ice Traps
   AddItemToMainPool(RG_ICE_TRAP);
-  if (GerudoTrainingGrounds.IsVanilla()) {
+  if (ctx->GetDungeon(Rando::GERUDO_TRAINING_GROUNDS)->IsVanilla()) {
     AddItemToMainPool(RG_ICE_TRAP);
   }
-  if (GanonsCastle.IsVanilla()) {
+  if (ctx->GetDungeon(Rando::GANONS_CASTLE)->IsVanilla()) {
     AddItemToMainPool(RG_ICE_TRAP, 4);
   }
 
   //Gerudo Fortress
-  if (GerudoFortress.Is(GERUDOFORTRESS_OPEN)) {
+  if (ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_OPEN)) {
     ctx->PlaceItemInLocation(RC_GF_NORTH_F1_CARPENTER, RG_RECOVERY_HEART, false, true);
     ctx->PlaceItemInLocation(RC_GF_NORTH_F2_CARPENTER, RG_RECOVERY_HEART, false, true);
     ctx->PlaceItemInLocation(RC_GF_SOUTH_F1_CARPENTER, RG_RECOVERY_HEART, false, true);
     ctx->PlaceItemInLocation(RC_GF_SOUTH_F2_CARPENTER, RG_RECOVERY_HEART, false, true);
-  } else if (GerudoKeys.IsNot(GERUDOKEYS_VANILLA)) {
-    if (GerudoFortress.Is(GERUDOFORTRESS_FAST)) {
+  } else if (ctx->GetOption(RSK_GERUDO_KEYS).IsNot(RO_GERUDO_KEYS_VANILLA)) {
+    if (ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_FAST)) {
       AddItemToMainPool(RG_GERUDO_FORTRESS_SMALL_KEY);
       ctx->PlaceItemInLocation(RC_GF_NORTH_F2_CARPENTER, RG_RECOVERY_HEART, false, true);
       ctx->PlaceItemInLocation(RC_GF_SOUTH_F1_CARPENTER, RG_RECOVERY_HEART, false, true);
       ctx->PlaceItemInLocation(RC_GF_SOUTH_F2_CARPENTER, RG_RECOVERY_HEART, false, true);
     } else {
       //Only add key ring if 4 Fortress keys necessary
-      if (RingFortress) {
+      if (ctx->GetOption(RSK_KEYRINGS_GERUDO_FORTRESS)) {
         AddItemToMainPool(RG_GERUDO_FORTRESS_KEY_RING);
         //Add junk to make up for missing keys
         for (uint8_t i = 0; i < 3; i++) {
@@ -869,15 +870,15 @@ void GenerateItemPool() {
         AddItemToMainPool(RG_GERUDO_FORTRESS_SMALL_KEY, 4);
       }
     }
-    if (ItemPoolValue.Is(ITEMPOOL_PLENTIFUL)) {
-      if (RingFortress && GerudoFortress.Is(GERUDOFORTRESS_NORMAL)) {
+    if (ctx->GetOption(RSK_ITEM_POOL).Is(RO_ITEM_POOL_PLENTIFUL)) {
+      if (ctx->GetOption(RSK_KEYRINGS_GERUDO_FORTRESS) && ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_NORMAL)) {
         AddItemToPool(PendingJunkPool, RG_GERUDO_FORTRESS_KEY_RING);
       } else {
         AddItemToPool(PendingJunkPool, RG_GERUDO_FORTRESS_SMALL_KEY);
       }
     }
   } else {
-    if (GerudoFortress.Is(GERUDOFORTRESS_FAST)) {
+    if (ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_FAST)) {
       ctx->PlaceItemInLocation(RC_GF_NORTH_F1_CARPENTER, RG_GERUDO_FORTRESS_SMALL_KEY, false, true);
       ctx->PlaceItemInLocation(RC_GF_NORTH_F2_CARPENTER, RG_RECOVERY_HEART, false, true);
       ctx->PlaceItemInLocation(RC_GF_SOUTH_F1_CARPENTER, RG_RECOVERY_HEART, false, true);
@@ -891,10 +892,10 @@ void GenerateItemPool() {
   }
 
   //Gerudo Membership Card
-  if (ShuffleGerudoToken && GerudoFortress.IsNot(GERUDOFORTRESS_OPEN)) {
+  if (ctx->GetOption(RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD) && ctx->GetOption(RSK_GERUDO_FORTRESS).IsNot(RO_GF_OPEN)) {
     AddItemToMainPool(RG_GERUDO_MEMBERSHIP_CARD);
-    IceTrapModels.push_back(GI_GERUDO_CARD);
-  } else if (ShuffleGerudoToken) {
+    ctx->possibleIceTrapModels.push_back(RG_GERUDO_MEMBERSHIP_CARD);
+  } else if (ctx->GetOption(RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD)) {
     AddItemToPool(PendingJunkPool, RG_GERUDO_MEMBERSHIP_CARD);
     ctx->PlaceItemInLocation(RC_GF_GERUDO_MEMBERSHIP_CARD, RG_ICE_TRAP, false, true);
   } else {
@@ -904,9 +905,9 @@ void GenerateItemPool() {
   //Keys
 
   //For key rings, need to add as many junk items as "missing" keys
-  if (KeyRings.IsNot(KEYRINGS_OFF)) {
+  if (ctx->GetOption(RSK_KEYRINGS).IsNot(RO_KEYRINGS_OFF)) {
     uint8_t ringJunkAmt = 0;
-    for (auto dungeon : dungeonList) {
+    for (auto dungeon : ctx->GetDungeons()->GetDungeonList()) {
       if (dungeon->HasKeyRing()) {
         ringJunkAmt += dungeon->GetSmallKeyCount() - 1;
       }
@@ -916,56 +917,56 @@ void GenerateItemPool() {
     }
   }
 
-  if (ItemPoolValue.Is(ITEMPOOL_PLENTIFUL)) {
-    if (ShuffleGerudoToken) {
+  if (ctx->GetOption(RSK_ITEM_POOL).Is(RO_ITEM_POOL_PLENTIFUL)) {
+    if (ctx->GetOption(RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD)) {
       AddItemToPool(PendingJunkPool, RG_GERUDO_MEMBERSHIP_CARD);
     }
 
     //Plentiful small keys
-    if (Keysanity.Is(KEYSANITY_ANYWHERE) || Keysanity.Is(KEYSANITY_ANY_DUNGEON) || Keysanity.Is(KEYSANITY_OVERWORLD)) {
-      if (BottomOfTheWell.HasKeyRing()) {
+    if (ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_ANYWHERE) || ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_ANY_DUNGEON) || ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_OVERWORLD)) {
+      if (ctx->GetDungeon(Rando::BOTTOM_OF_THE_WELL)->HasKeyRing()) {
         AddItemToPool(PendingJunkPool, RG_BOTTOM_OF_THE_WELL_KEY_RING);
       } else {
         AddItemToPool(PendingJunkPool, RG_BOTTOM_OF_THE_WELL_SMALL_KEY);
       }
-      if (ForestTemple.HasKeyRing()) {
+      if (ctx->GetDungeon(Rando::FOREST_TEMPLE)->HasKeyRing()) {
         AddItemToPool(PendingJunkPool, RG_FOREST_TEMPLE_KEY_RING);
       } else {
         AddItemToPool(PendingJunkPool, RG_FOREST_TEMPLE_SMALL_KEY);
       }
-      if (FireTemple.HasKeyRing()) {
+      if (ctx->GetDungeon(Rando::FIRE_TEMPLE)->HasKeyRing()) {
         AddItemToPool(PendingJunkPool, RG_FIRE_TEMPLE_KEY_RING);
       } else {
         AddItemToPool(PendingJunkPool, RG_FIRE_TEMPLE_SMALL_KEY);
       }
-      if (WaterTemple.HasKeyRing()) {
+      if (ctx->GetDungeon(Rando::WATER_TEMPLE)->HasKeyRing()) {
         AddItemToPool(PendingJunkPool, RG_WATER_TEMPLE_KEY_RING);
       } else {
         AddItemToPool(PendingJunkPool, RG_WATER_TEMPLE_SMALL_KEY);
       }
-      if (SpiritTemple.HasKeyRing()) {
+      if (ctx->GetDungeon(Rando::SPIRIT_TEMPLE)->HasKeyRing()) {
         AddItemToPool(PendingJunkPool, RG_SPIRIT_TEMPLE_KEY_RING);
       } else {
         AddItemToPool(PendingJunkPool, RG_SPIRIT_TEMPLE_SMALL_KEY);
       }
-      if (ShadowTemple.HasKeyRing()) {
+      if (ctx->GetDungeon(Rando::SHADOW_TEMPLE)->HasKeyRing()) {
         AddItemToPool(PendingJunkPool, RG_SHADOW_TEMPLE_KEY_RING);
       } else {
         AddItemToPool(PendingJunkPool, RG_SHADOW_TEMPLE_SMALL_KEY);
       }
-      if (GerudoTrainingGrounds.HasKeyRing()) {
+      if (ctx->GetDungeon(Rando::GERUDO_TRAINING_GROUNDS)->HasKeyRing()) {
         AddItemToPool(PendingJunkPool, RG_GERUDO_TRAINING_GROUNDS_KEY_RING);
       } else {
         AddItemToPool(PendingJunkPool, RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY);
       }
-      if (GanonsCastle.HasKeyRing()) {
+      if (ctx->GetDungeon(Rando::GANONS_CASTLE)->HasKeyRing()) {
         AddItemToPool(PendingJunkPool, RG_GANONS_CASTLE_KEY_RING);
       } else {
         AddItemToPool(PendingJunkPool, RG_GANONS_CASTLE_SMALL_KEY);
       } 
     }
 
-    if (BossKeysanity.Is(BOSSKEYSANITY_ANYWHERE) || BossKeysanity.Is(BOSSKEYSANITY_ANY_DUNGEON) || BossKeysanity.Is(BOSSKEYSANITY_OVERWORLD)) {
+    if (ctx->GetOption(RSK_BOSS_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_ANYWHERE) || ctx->GetOption(RSK_BOSS_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_ANY_DUNGEON) || ctx->GetOption(RSK_BOSS_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_OVERWORLD)) {
       AddItemToPool(PendingJunkPool, RG_FOREST_TEMPLE_BOSS_KEY);
       AddItemToPool(PendingJunkPool, RG_FIRE_TEMPLE_BOSS_KEY);
       AddItemToPool(PendingJunkPool, RG_WATER_TEMPLE_BOSS_KEY);
@@ -973,36 +974,36 @@ void GenerateItemPool() {
       AddItemToPool(PendingJunkPool, RG_SHADOW_TEMPLE_BOSS_KEY);
     }
 
-    if (GanonsBossKey.Is(GANONSBOSSKEY_ANYWHERE) || GanonsBossKey.Is(GANONSBOSSKEY_ANY_DUNGEON) || GanonsBossKey.Is(GANONSBOSSKEY_OVERWORLD)) {
+    if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_ANYWHERE) || ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_ANY_DUNGEON) || ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_OVERWORLD)) {
       AddItemToPool(PendingJunkPool, RG_GANONS_CASTLE_BOSS_KEY);
     }
   }
 
   //Shopsanity
-  if (Settings::Shopsanity.Is(SHOPSANITY_OFF) || Settings::Shopsanity.Is(SHOPSANITY_ZERO)) {
+  if (ctx->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_OFF) || ctx->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_ZERO_ITEMS)) {
     AddItemsToPool(ItemPool, normalRupees);
   } else { //Shopsanity 1-4, random
     AddItemsToPool(ItemPool, shopsanityRupees); //Shopsanity gets extra large rupees
   }
 
   //Scrubsanity
-  if (Settings::Scrubsanity.IsNot(SCRUBSANITY_OFF)) {
+  if (ctx->GetOption(RSK_SHUFFLE_SCRUBS).IsNot(RO_SCRUBS_OFF)) {
     //Deku Tree
-    if (DekuTree.IsMQ()) {
+    if (ctx->GetDungeon(Rando::DEKU_TREE)->IsMQ()) {
       AddItemToMainPool(RG_DEKU_SHIELD);
     }
 
     //Dodongos Cavern
     AddItemToMainPool(RG_DEKU_STICK_1);
     AddItemToMainPool(RG_DEKU_SHIELD);
-    if (DodongosCavern.IsMQ()) {
+    if (ctx->GetDungeon(Rando::DODONGOS_CAVERN)->IsMQ()) {
       AddItemToMainPool(RG_RECOVERY_HEART);
     } else {
       AddItemToMainPool(RG_DEKU_NUTS_5);
     }
 
     //Jabu Jabus Belly
-    if (JabuJabusBelly.IsVanilla()) {
+    if (ctx->GetDungeon(Rando::JABU_JABUS_BELLY)->IsVanilla()) {
       AddItemToMainPool(RG_DEKU_NUTS_5);
     }
 
@@ -1010,7 +1011,7 @@ void GenerateItemPool() {
     AddItemToMainPool(RG_BOMBS_5);
     AddItemToMainPool(RG_RECOVERY_HEART);
     AddItemToMainPool(RG_BLUE_RUPEE);
-    if (GanonsCastle.IsMQ()) {
+    if (ctx->GetDungeon(Rando::GANONS_CASTLE)->IsMQ()) {
       AddItemToMainPool(RG_DEKU_NUTS_5);
     }
 
@@ -1033,55 +1034,55 @@ void GenerateItemPool() {
   AddItemsToPool(ItemPool, dungeonRewards);
 
   //Dungeon pools
-  if (DekuTree.IsMQ()) {
+  if (ctx->GetDungeon(Rando::DEKU_TREE)->IsMQ()) {
     AddItemsToPool(ItemPool, DT_MQ);
   } else {
     AddItemsToPool(ItemPool, DT_Vanilla);
   }
-  if (DodongosCavern.IsMQ()) {
+  if (ctx->GetDungeon(Rando::DODONGOS_CAVERN)->IsMQ()) {
     AddItemsToPool(ItemPool, DC_MQ);
   } else {
     AddItemsToPool(ItemPool, DC_Vanilla);
   }
-  if (JabuJabusBelly.IsMQ()) {
+  if (ctx->GetDungeon(Rando::JABU_JABUS_BELLY)->IsMQ()) {
     AddItemsToPool(ItemPool, JB_MQ);
   }
-  if (ForestTemple.IsMQ()) {
+  if (ctx->GetDungeon(Rando::FOREST_TEMPLE)->IsMQ()) {
     AddItemsToPool(ItemPool, FoT_MQ);
   } else {
     AddItemsToPool(ItemPool, FoT_Vanilla);
   }
-  if (FireTemple.IsMQ()) {
+  if (ctx->GetDungeon(Rando::FIRE_TEMPLE)->IsMQ()) {
     AddItemsToPool(ItemPool, FiT_MQ);
   } else {
     AddItemsToPool(ItemPool, FiT_Vanilla);
   }
-  if (SpiritTemple.IsMQ()) {
+  if (ctx->GetDungeon(Rando::SPIRIT_TEMPLE)->IsMQ()) {
     AddItemsToPool(ItemPool, SpT_MQ);
   } else {
     AddItemsToPool(ItemPool, SpT_Vanilla);
   }
-  if (ShadowTemple.IsMQ()) {
+  if (ctx->GetDungeon(Rando::SHADOW_TEMPLE)->IsMQ()) {
     AddItemsToPool(ItemPool, ShT_MQ);
   } else {
     AddItemsToPool(ItemPool, ShT_Vanilla);
   }
-  if (BottomOfTheWell.IsVanilla()) {
+  if (ctx->GetDungeon(Rando::BOTTOM_OF_THE_WELL)->IsVanilla()) {
     AddItemsToPool(ItemPool, BW_Vanilla);
   }
-  if (GerudoTrainingGrounds.IsMQ()) {
+  if (ctx->GetDungeon(Rando::GERUDO_TRAINING_GROUNDS)->IsMQ()) {
     AddItemsToPool(ItemPool, GTG_MQ);
   } else {
     AddItemsToPool(ItemPool, GTG_Vanilla);
   }
-  if (GanonsCastle.IsMQ()) {
+  if (ctx->GetDungeon(Rando::GANONS_CASTLE)->IsMQ()) {
     AddItemsToPool(ItemPool, GC_MQ);
   } else {
     AddItemsToPool(ItemPool, GC_Vanilla);
   }
 
   uint8_t rutoBottles = 1;
-  if (ZorasFountain.Is(ZORASFOUNTAIN_OPEN)) {
+  if (ctx->GetOption(RSK_ZORAS_FOUNTAIN).Is(RO_ZF_OPEN)) {
     rutoBottles = 0;
   }
 
@@ -1089,11 +1090,11 @@ void GenerateItemPool() {
   uint8_t bottleCount = 4;
   std::vector<RandomizerGet> bottles;
   bottles.assign(normalBottles.begin(), normalBottles.end());
-  IceTrapModels.push_back(
-      Rando::StaticData::RetrieveItem(RandomElement(bottles)).GetItemID()); // Get one random bottle type for ice traps
+  ctx->possibleIceTrapModels.push_back(
+      Rando::StaticData::RetrieveItem(RandomElement(bottles)).GetRandomizerGet()); // Get one random bottle type for ice traps
   for (uint8_t i = 0; i < bottleCount; i++) {
     if (i >= rutoBottles) {
-      if ((i == bottleCount - 1) && ShuffleMerchants.IsNot(SHUFFLEMERCHANTS_OFF)) {
+      if ((i == bottleCount - 1) && ctx->GetOption(RSK_SHUFFLE_MERCHANTS).IsNot(RO_SHUFFLE_MERCHANTS_OFF)) {
         AddItemToMainPool(RG_BOTTLE_WITH_BLUE_POTION);
       } else {
         AddRandomBottle(bottles);
@@ -1105,7 +1106,7 @@ void GenerateItemPool() {
 
   //add extra songs only if song shuffle is anywhere
   AddItemsToPool(ItemPool, songList);
-  if (ShuffleSongs.Is(SONGSHUFFLE_ANYWHERE) && ItemPoolValue.Is(ITEMPOOL_PLENTIFUL)) {
+  if (ctx->GetOption(RSK_SHUFFLE_SONGS).Is(RO_SONG_SHUFFLE_ANYWHERE) && ctx->GetOption(RSK_ITEM_POOL).Is(RO_ITEM_POOL_PLENTIFUL)) {
     AddItemsToPool(PendingJunkPool, songList);
   }
 
@@ -1116,10 +1117,10 @@ void GenerateItemPool() {
   | advancement items that haven't been placed yet for placing higher priority
   | items like stones/medallions.*/
 
-  if (MapsAndCompasses.Is(MAPSANDCOMPASSES_VANILLA)) {
+  if (ctx->GetOption(RSK_SHUFFLE_MAPANDCOMPASS).Is(RO_DUNGEON_ITEM_LOC_VANILLA)) {
     PlaceVanillaMapsAndCompasses();
   } else  {
-    for (auto dungeon : dungeonList) {
+    for (auto dungeon : ctx->GetDungeons()->GetDungeonList()) {
       if (dungeon->GetMap() != RG_NONE) {
         AddItemToMainPool(dungeon->GetMap());
       }
@@ -1130,11 +1131,11 @@ void GenerateItemPool() {
     }
   }
 
-  if (Keysanity.Is(KEYSANITY_VANILLA)) {
+  if (ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_VANILLA)) {
     PlaceVanillaSmallKeys();
   } else {
-    for (auto dungeon : dungeonList) {
-      if (dungeon->HasKeyRing() && Keysanity.IsNot(KEYSANITY_START_WITH)) {
+    for (auto dungeon : ctx->GetDungeons()->GetDungeonList()) {
+      if (dungeon->HasKeyRing() && ctx->GetOption(RSK_KEYSANITY).IsNot(RO_DUNGEON_ITEM_LOC_STARTWITH)) {
         AddItemToMainPool(dungeon->GetKeyRing());
       } else {
         if (dungeon->GetSmallKeyCount() > 0) {
@@ -1144,7 +1145,7 @@ void GenerateItemPool() {
     }
   }
 
-  if (BossKeysanity.Is(BOSSKEYSANITY_VANILLA)) {
+  if (ctx->GetOption(RSK_BOSS_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_VANILLA)) {
     PlaceVanillaBossKeys();
   } else {
     AddItemToMainPool(RG_FOREST_TEMPLE_BOSS_KEY);
@@ -1154,54 +1155,54 @@ void GenerateItemPool() {
     AddItemToMainPool(RG_SHADOW_TEMPLE_BOSS_KEY);
   }
 
-  if (GanonsBossKey.Is(GANONSBOSSKEY_FINAL_GS_REWARD)) {
+  if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_KAK_TOKENS)) {
     ctx->PlaceItemInLocation(RC_KAK_100_GOLD_SKULLTULA_REWARD, RG_GANONS_CASTLE_BOSS_KEY);
-  } else if (GanonsBossKey.Value<uint8_t>() >= GANONSBOSSKEY_LACS_VANILLA && GanonsBossKey.IsNot(GANONSBOSSKEY_TRIFORCE_HUNT)) {
+  } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Value<uint8_t>() >= RO_GANON_BOSS_KEY_LACS_VANILLA && ctx->GetOption(RSK_GANONS_BOSS_KEY).IsNot(RO_GANON_BOSS_KEY_TRIFORCE_HUNT)) {
     ctx->PlaceItemInLocation(RC_TOT_LIGHT_ARROWS_CUTSCENE, RG_GANONS_CASTLE_BOSS_KEY);
-  } else if (GanonsBossKey.Is(GANONSBOSSKEY_VANILLA)) {
+  } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_VANILLA)) {
     ctx->PlaceItemInLocation(RC_GANONS_TOWER_BOSS_KEY_CHEST, RG_GANONS_CASTLE_BOSS_KEY);
   } else {
     AddItemToMainPool(RG_GANONS_CASTLE_BOSS_KEY);
   }
 
-  if (ItemPoolValue.Is(ITEMPOOL_PLENTIFUL)) {
+  if (ctx->GetOption(RSK_ITEM_POOL).Is(RO_ITEM_POOL_PLENTIFUL)) {
     AddItemsToPool(ItemPool, easyItems);
   } else {
     AddItemsToPool(ItemPool, normalItems);
   }
 
-  if (!ShuffleKokiriSword) {
+  if (!ctx->GetOption(RSK_SHUFFLE_KOKIRI_SWORD)) {
     ReplaceMaxItem(RG_KOKIRI_SWORD, 0);
   }
 
-  if (!ShuffleMasterSword) {
+  if (!ctx->GetOption(RSK_SHUFFLE_MASTER_SWORD)) {
     ReplaceMaxItem(RG_MASTER_SWORD, 0);
   }
 
-  if (ProgressiveGoronSword) {
+  if (/*ProgressiveGoronSword TODO: Implement Setting*/false) {
     ReplaceMaxItem(RG_BIGGORON_SWORD, 0);
     AddItemToMainPool(RG_PROGRESSIVE_GORONSWORD, 2);
-    IceTrapModels.push_back(0xD4); // Progressive Goron Sword
+    ctx->possibleIceTrapModels.push_back(RG_PROGRESSIVE_GORONSWORD); // Progressive Goron Sword
   } else {
-    IceTrapModels.push_back(GI_SWORD_BGS);
+    ctx->possibleIceTrapModels.push_back(RG_BIGGORON_SWORD);
   }
 
   //Replace ice traps with junk from the pending junk pool if necessary
-  if (IceTrapValue.Is(ICETRAPS_OFF)) {
+  if (ctx->GetOption(RSK_ICE_TRAPS).Is(RO_ICE_TRAPS_OFF)) {
     ReplaceMaxItem(RG_ICE_TRAP, 0);
   }
   //Replace all junk items with ice traps for onslaught mode
-  else if (IceTrapValue.Is(ICETRAPS_ONSLAUGHT)) {
+  else if (ctx->GetOption(RSK_ICE_TRAPS).Is(RO_ICE_TRAPS_ONSLAUGHT)) {
     for (uint8_t i = 0; i < JunkPoolItems.size() - 3; i++) { // -3 Omits Huge Rupees and Deku Nuts 10
       ReplaceMaxItem(JunkPoolItems[i], 0);
     }
   }
 
-  if (ItemPoolValue.Is(ITEMPOOL_SCARCE)) {
+  if (ctx->GetOption(RSK_ITEM_POOL).Is(RO_ITEM_POOL_SCARCE)) {
     SetScarceItemPool();
-  } else if (ItemPoolValue.Is(ITEMPOOL_MINIMAL)) {
+  } else if (ctx->GetOption(RSK_ITEM_POOL).Is(RO_ITEM_POOL_MINIMAL)) {
     SetMinimalItemPool();
-  } else if (RemoveDoubleDefense) {
+  } else if (/*RemoveDoubleDefense TODO: Implement setting*/ false) {
     ReplaceMaxItem(RG_DOUBLE_DEFENSE, 0);
   }
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/item_pool.hpp b/soh/soh/Enhancements/randomizer/3drando/item_pool.hpp
index 749a2a46d..4ef583001 100644
--- a/soh/soh/Enhancements/randomizer/3drando/item_pool.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/item_pool.hpp
@@ -14,4 +14,3 @@ void GenerateItemPool();
 void AddJunk();
 
 extern std::vector<RandomizerGet> ItemPool;
-extern std::vector<uint8_t> IceTrapModels;
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
index f2e227324..50d53f698 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
@@ -1,20 +1,18 @@
 #include "location_access.hpp"
 
-#include "dungeon.hpp"
+#include "../dungeon.h"
 #include "../static_data.h"
 #include "../context.h"
 #include "item_pool.hpp"
 #include "logic.hpp"
-#include "settings.hpp"
 #include "spoiler_log.hpp"
-#include "trial.hpp"
-#include "entrance.hpp"
+#include "../trial.h"
+#include "../entrance.h"
 
 #include <fstream>
 #include <iostream>
 
 using namespace Logic;
-using namespace Settings;
 
 //generic grotto event list
 std::vector<EventAccess> grottoEvents = {
@@ -80,7 +78,8 @@ bool LocationAccess::CanBuy() const {
   }
   // If bombchus in logic, need to have found chus to buy; if not just need bomb bag
   else if (placed == RG_BUY_BOMBCHU_10 || placed == RG_BUY_BOMBCHU_20) {
-      OtherCondition = (!BombchusInLogic && Bombs) || (BombchusInLogic && FoundBombchus);
+      OtherCondition =
+          (!ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && Bombs) || (ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && FoundBombchus);
   }
 
   return SufficientWallet && OtherCondition;
@@ -91,7 +90,7 @@ Area::Area(std::string regionName_, std::string scene_, RandomizerHintTextKey hi
          bool timePass_,
          std::vector<EventAccess> events_,
          std::vector<LocationAccess> locations_,
-         std::list<Entrance> exits_)
+         std::list<Rando::Entrance> exits_)
   : regionName(std::move(regionName_)),
     scene(std::move(scene_)),
     hintKey(hintKey_),
@@ -139,13 +138,13 @@ bool Area::UpdateEvents(SearchMode mode) {
 }
 
 void Area::AddExit(RandomizerRegion parentKey, RandomizerRegion newExitKey, ConditionFn condition) {
-  Entrance newExit = Entrance(newExitKey, {condition});
+  Rando::Entrance newExit = Rando::Entrance(newExitKey, {condition});
   newExit.SetParentRegion(parentKey);
   exits.push_front(newExit);
 }
 
 //The exit will be completely removed from this area
-void Area::RemoveExit(Entrance* exitToRemove) {
+void Area::RemoveExit(Rando::Entrance* exitToRemove) {
   exits.remove_if([exitToRemove](const auto exit){return &exit == exitToRemove;});
 }
 
@@ -158,7 +157,7 @@ void Area::SetAsPrimary(RandomizerRegion exitToBePrimary) {
   }
 }
 
-Entrance* Area::GetExit(RandomizerRegion exitToReturn) {
+Rando::Entrance* Area::GetExit(RandomizerRegion exitToReturn) {
   for (auto& exit : exits) {
     if (exit.Getuint32_t() == exitToReturn) {
       return &exit;
@@ -200,7 +199,7 @@ bool Area::CheckAllAccess(const RandomizerRegion exitKey) {
     return false;
   }
 
-  for (Entrance& exit : exits) {
+  for (Rando::Entrance& exit : exits) {
     if (exit.GetConnectedRegionKey() == exitKey) {
       return exit.CheckConditionAtAgeTime(Logic::IsChild, Logic::AtDay)   &&
              exit.CheckConditionAtAgeTime(Logic::IsChild, Logic::AtNight) &&
@@ -248,9 +247,11 @@ bool HasAccessTo(const RandomizerRegion area) {
   return areaTable[area].HasAccess();
 }
 
-
+std::shared_ptr<Rando::Context> randoCtx;
 
 void AreaTable_Init() {
+  using namespace Rando;
+  randoCtx = Context::GetInstance();
   //Clear the array from any previous playthrough attempts. This is important so that
   //locations which appear in both MQ and Vanilla dungeons don't get set in both areas.
   areaTable.fill(Area("Invalid Area", "Invalid Area", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {}));
@@ -380,18 +381,19 @@ namespace Areas {
   }
 
   void AccessReset() {
+    auto ctx = Rando::Context::GetInstance();
       for (const RandomizerRegion area : GetAllAreas()) {
       AreaTable(area)->ResetVariables();
     }
 
-    if(Settings::HasNightStart) {
-        if(Settings::ResolvedStartingAge == AGE_CHILD) {
+    if(/*Settings::HasNightStart TODO:: Randomize Starting Time*/ false) {
+        if(ctx->GetSettings()->ResolvedStartingAge() == RO_AGE_CHILD) {
           AreaTable(RR_ROOT)->childNight = true;
         } else {
           AreaTable(RR_ROOT)->adultNight = true;
         }
       } else {
-        if(Settings::ResolvedStartingAge == AGE_CHILD) {
+        if(ctx->GetSettings()->ResolvedStartingAge() == RO_AGE_CHILD) {
           AreaTable(RR_ROOT)->childDay = true;
         } else {
           AreaTable(RR_ROOT)->adultDay = true;
@@ -401,6 +403,7 @@ namespace Areas {
 
   //Reset exits and clear items from locations
   void ResetAllLocations() {
+    auto ctx = Rando::Context::GetInstance();
       for (const RandomizerRegion area : GetAllAreas()) {
       AreaTable(area)->ResetVariables();
       //Erase item from every location in this exit
@@ -410,14 +413,14 @@ namespace Areas {
       }
     }
 
-    if(Settings::HasNightStart) {
-        if(Settings::ResolvedStartingAge == AGE_CHILD) {
+    if (/*Settings::HasNightStart TODO:: Randomize Starting Time*/ false) {
+        if(ctx->GetSettings()->ResolvedStartingAge() == RO_AGE_CHILD) {
           AreaTable(RR_ROOT)->childNight = true;
         } else {
           AreaTable(RR_ROOT)->adultNight = true;
         }
-      } else {
-        if(Settings::ResolvedStartingAge == AGE_CHILD) {
+    } else {
+        if(ctx->GetSettings()->ResolvedStartingAge() == RO_AGE_CHILD) {
           AreaTable(RR_ROOT)->childDay = true;
         } else {
           AreaTable(RR_ROOT)->adultDay = true;
@@ -428,7 +431,7 @@ namespace Areas {
   bool HasTimePassAccess(uint8_t age) {
       for (const RandomizerRegion areaKey : GetAllAreas()) {
       auto area = AreaTable(areaKey);
-      if (area->timePass && ((age == AGE_CHILD && area->Child()) || (age == AGE_ADULT && area->Adult()))) {
+      if (area->timePass && ((age == RO_AGE_CHILD && area->Child()) || (age == RO_AGE_ADULT && area->Adult()))) {
         return true;
       }
     }
@@ -495,11 +498,11 @@ Area* AreaTable(const RandomizerRegion areaKey) {
 }
 
 //Retrieve all the shuffable entrances of a specific type
-std::vector<Entrance*> GetShuffleableEntrances(EntranceType type, bool onlyPrimary /*= true*/) {
-  std::vector<Entrance*> entrancesToShuffle = {};
+std::vector<Rando::Entrance*> GetShuffleableEntrances(Rando::EntranceType type, bool onlyPrimary /*= true*/) {
+  std::vector<Rando::Entrance*> entrancesToShuffle = {};
     for (RandomizerRegion area : Areas::GetAllAreas()) {
     for (auto& exit: AreaTable(area)->exits) {
-      if ((exit.GetType() == type || type == EntranceType::All) && (exit.IsPrimary() || !onlyPrimary) && exit.GetType() != EntranceType::None) {
+      if ((exit.GetType() == type || type == Rando::EntranceType::All) && (exit.IsPrimary() || !onlyPrimary) && exit.GetType() != Rando::EntranceType::None) {
         entrancesToShuffle.push_back(&exit);
       }
     }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access.hpp b/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
index 54bb39f50..aadc8d0b2 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
@@ -7,9 +7,13 @@
 #include "logic.hpp"
 #include "hint_list.hpp"
 #include "fill.hpp"
+#include "../context.h"
 
 typedef bool (*ConditionFn)();
 
+// I hate this but every alternative I can think of right now is worse
+extern std::shared_ptr<Rando::Context> randoCtx;
+
 class EventAccess {
 public:
 
@@ -23,11 +27,12 @@ public:
     }
 
     bool ConditionsMet() const {
-        if (Settings::Logic.Is(LOGIC_NONE) || Settings::Logic.Is(LOGIC_VANILLA)) {
+        auto ctx = Rando::Context::GetInstance();
+        if (ctx->GetOption(RSK_LOGIC_RULES).Is(RO_LOGIC_NO_LOGIC) || ctx->GetOption(RSK_LOGIC_RULES).Is(RO_LOGIC_VANILLA)) {
             return true;
-        } else if (Settings::Logic.Is(LOGIC_GLITCHLESS)) {
+        } else if (ctx->GetOption(RSK_LOGIC_RULES).Is(RO_LOGIC_GLITCHLESS)) {
             return conditions_met[0]();
-        } else if (Settings::Logic.Is(LOGIC_GLITCHED)) {
+        } else if (ctx->GetOption(RSK_LOGIC_RULES).Is(RO_LOGIC_GLITCHED)) {
             if (conditions_met[0]()) {
                 return true;
             } else if (conditions_met[1] != NULL) {
@@ -77,11 +82,12 @@ public:
     }
 
     bool GetConditionsMet() const {
-        if (Settings::Logic.Is(LOGIC_NONE) || Settings::Logic.Is(LOGIC_VANILLA)) {
+        auto ctx = Rando::Context::GetInstance();
+        if (ctx->GetOption(RSK_LOGIC_RULES).Is(RO_LOGIC_NO_LOGIC) || ctx->GetOption(RSK_LOGIC_RULES).Is(RO_LOGIC_VANILLA)) {
             return true;
-        } else if (Settings::Logic.Is(LOGIC_GLITCHLESS)) {
+        } else if (ctx->GetOption(RSK_LOGIC_RULES).Is(RO_LOGIC_GLITCHLESS)) {
             return conditions_met[0]();
-        } else if (Settings::Logic.Is(LOGIC_GLITCHED)) {
+        } else if (ctx->GetOption(RSK_LOGIC_RULES).Is(RO_LOGIC_GLITCHED)) {
             if (conditions_met[0]()) {
                 return true;
             } else if (conditions_met[1] != NULL) {
@@ -107,8 +113,10 @@ protected:
     bool CanBuy() const;
 };
 
-class Entrance;
-enum class EntranceType;
+namespace Rando {
+    class Entrance;
+    enum class EntranceType;
+}
 
 class Area {
 public:
@@ -117,7 +125,7 @@ public:
          bool timePass_,
          std::vector<EventAccess> events_,
          std::vector<LocationAccess> locations_,
-         std::list<Entrance> exits_);
+         std::list<Rando::Entrance> exits_);
     ~Area();
 
     std::string regionName;
@@ -126,8 +134,8 @@ public:
     bool        timePass;
     std::vector<EventAccess> events;
     std::vector<LocationAccess> locations;
-    std::list<Entrance> exits;
-    std::list<Entrance*> entrances;
+    std::list<Rando::Entrance> exits;
+    std::list<Rando::Entrance*> entrances;
     //^ The above exits are now stored in a list instead of a vector because
     //the entrance randomization algorithm plays around with pointers to these
     //entrances a lot. By putting the entrances in a list, we don't have to
@@ -144,11 +152,11 @@ public:
 
     void AddExit(RandomizerRegion parentKey, RandomizerRegion newExitKey, ConditionFn condition);
 
-    void RemoveExit(Entrance* exitToRemove);
+    void RemoveExit(Rando::Entrance* exitToRemove);
 
     void SetAsPrimary(RandomizerRegion exitToBePrimary);
 
-    Entrance* GetExit(RandomizerRegion exit);
+    Rando::Entrance* GetExit(RandomizerRegion exit);
 
     bool Child() const {
       return childDay || childNight;
@@ -240,7 +248,7 @@ namespace Areas {
 
 void  AreaTable_Init();
 Area* AreaTable(const RandomizerRegion areaKey);
-std::vector<Entrance*> GetShuffleableEntrances(EntranceType type, bool onlyPrimary = true);
+std::vector<Rando::Entrance*> GetShuffleableEntrances(Rando::EntranceType type, bool onlyPrimary = true);
 
 // Overworld
 void AreaTable_Init_LostWoods();
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_bottom_of_the_well.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_bottom_of_the_well.cpp
index 31cbf7c44..b9499ff23 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_bottom_of_the_well.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_bottom_of_the_well.cpp
@@ -1,10 +1,10 @@
 #include "../location_access.hpp"
 #include "../logic.hpp"
-#include "../entrance.hpp"
-#include "../dungeon.hpp"
+#include "../../entrance.h"
+#include "../../dungeon.h"
 
 using namespace Logic;
-using namespace Settings;
+using namespace Rando;
 
 void AreaTable_Init_BottomOfTheWell() {
   /*--------------------------
@@ -12,38 +12,38 @@ void AreaTable_Init_BottomOfTheWell() {
   ---------------------------*/
   areaTable[RR_BOTTOM_OF_THE_WELL_ENTRYWAY] = Area("Bottom of the Well Entryway", "Bottom of the Well", RHT_BOTTOM_OF_THE_WELL, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_BOTTOM_OF_THE_WELL_MAIN_AREA,    {[]{return Dungeon::BottomOfTheWell.IsVanilla() && IsChild && (CanChildAttack || Nuts);}}),
-                  Entrance(RR_BOTTOM_OF_THE_WELL_MQ_PERIMETER, {[]{return Dungeon::BottomOfTheWell.IsMQ()      && IsChild;}}),
+                  Entrance(RR_BOTTOM_OF_THE_WELL_MAIN_AREA,    {[]{return randoCtx->GetDungeon(Rando::BOTTOM_OF_THE_WELL)->IsVanilla() && IsChild && (CanChildAttack || Nuts);}}),
+                  Entrance(RR_BOTTOM_OF_THE_WELL_MQ_PERIMETER, {[]{return randoCtx->GetDungeon(Rando::BOTTOM_OF_THE_WELL)->IsMQ()      && IsChild;}}),
                   Entrance(RR_KAKARIKO_VILLAGE,                {[]{return true;}}),
   });
 
   /*--------------------------
   |     VANILLA DUNGEON      |
   ---------------------------*/
-  if (Dungeon::BottomOfTheWell.IsVanilla()) {
+  if (randoCtx->GetDungeon(Rando::BOTTOM_OF_THE_WELL)->IsVanilla()) {
   areaTable[RR_BOTTOM_OF_THE_WELL_MAIN_AREA] = Area("Bottom of the Well Main Area", "Bottom of the Well", RHT_BOTTOM_OF_THE_WELL, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&StickPot, {[]{return true;}}),
                   EventAccess(&NutPot,   {[]{return true;}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST,   {[]{return LogicLensBotw || CanUse(RG_LENS_OF_TRUTH);}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST,   {[]{return randoCtx->GetTrickOption(RT_LENS_BOTW) || CanUse(RG_LENS_OF_TRUTH);}}),
                   LocationAccess(RC_BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST,  {[]{return HasExplosives;}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST, {[]{return LogicLensBotw || CanUse(RG_LENS_OF_TRUTH);}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_COMPASS_CHEST,                {[]{return LogicLensBotw || CanUse(RG_LENS_OF_TRUTH);}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST,       {[]{return LogicLensBotw || CanUse(RG_LENS_OF_TRUTH);}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST,     {[]{return (LogicLensBotw || CanUse(RG_LENS_OF_TRUTH)) && HasExplosives;}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST, {[]{return randoCtx->GetTrickOption(RT_LENS_BOTW) || CanUse(RG_LENS_OF_TRUTH);}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_COMPASS_CHEST,                {[]{return randoCtx->GetTrickOption(RT_LENS_BOTW) || CanUse(RG_LENS_OF_TRUTH);}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST,       {[]{return randoCtx->GetTrickOption(RT_LENS_BOTW) || CanUse(RG_LENS_OF_TRUTH);}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST,     {[]{return (randoCtx->GetTrickOption(RT_LENS_BOTW) || CanUse(RG_LENS_OF_TRUTH)) && HasExplosives;}}),
                   LocationAccess(RC_BOTTOM_OF_THE_WELL_FREESTANDING_KEY,             {[]{return Sticks || CanUse(RG_DINS_FIRE);}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST,          {[]{return CanPlay(ZeldasLullaby) && (KokiriSword || (Sticks && LogicChildDeadhand));}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST,              {[]{return CanPlay(ZeldasLullaby) && (LogicLensBotw || CanUse(RG_LENS_OF_TRUTH));}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST,          {[]{return CanPlay(ZeldasLullaby) && (KokiriSword || (Sticks && randoCtx->GetTrickOption(RT_BOTW_CHILD_DEADHAND)));}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST,              {[]{return CanPlay(ZeldasLullaby) && (randoCtx->GetTrickOption(RT_LENS_BOTW) || CanUse(RG_LENS_OF_TRUTH));}}),
                   LocationAccess(RC_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST,       {[]{return CanPlay(ZeldasLullaby);}}),
                   LocationAccess(RC_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST,        {[]{return CanPlay(ZeldasLullaby);}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_MAP_CHEST,                    {[]{return HasExplosives || (((SmallKeys(RR_BOTTOM_OF_THE_WELL, 3) && (LogicLensBotw || CanUse(RG_LENS_OF_TRUTH))) || CanUse(RG_DINS_FIRE) || (Sticks && LogicBotwBasement)) && GoronBracelet);}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST,             {[]{return SmallKeys(RR_BOTTOM_OF_THE_WELL, 3) && (LogicLensBotw || CanUse(RG_LENS_OF_TRUTH));}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST,              {[]{return SmallKeys(RR_BOTTOM_OF_THE_WELL, 3) && (LogicLensBotw || CanUse(RG_LENS_OF_TRUTH));}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM,           {[]{return Boomerang && (LogicLensBotw || CanUse(RG_LENS_OF_TRUTH)) && SmallKeys(RR_BOTTOM_OF_THE_WELL, 3);}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM,           {[]{return Boomerang && (LogicLensBotw || CanUse(RG_LENS_OF_TRUTH)) && SmallKeys(RR_BOTTOM_OF_THE_WELL, 3);}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE,            {[]{return SmallKeys(RR_BOTTOM_OF_THE_WELL, 3) && (LogicLensBotw || CanUse(RG_LENS_OF_TRUTH)) && Boomerang;}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_MAP_CHEST,                    {[]{return HasExplosives || (((SmallKeys(RR_BOTTOM_OF_THE_WELL, 3) && (randoCtx->GetTrickOption(RT_LENS_BOTW) || CanUse(RG_LENS_OF_TRUTH))) || CanUse(RG_DINS_FIRE) || (Sticks && randoCtx->GetTrickOption(RT_BOTW_BASEMENT))) && GoronBracelet);}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST,             {[]{return SmallKeys(RR_BOTTOM_OF_THE_WELL, 3) && (randoCtx->GetTrickOption(RT_LENS_BOTW) || CanUse(RG_LENS_OF_TRUTH));}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST,              {[]{return SmallKeys(RR_BOTTOM_OF_THE_WELL, 3) && (randoCtx->GetTrickOption(RT_LENS_BOTW) || CanUse(RG_LENS_OF_TRUTH));}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM,           {[]{return Boomerang && (randoCtx->GetTrickOption(RT_LENS_BOTW) || CanUse(RG_LENS_OF_TRUTH)) && SmallKeys(RR_BOTTOM_OF_THE_WELL, 3);}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM,           {[]{return Boomerang && (randoCtx->GetTrickOption(RT_LENS_BOTW) || CanUse(RG_LENS_OF_TRUTH)) && SmallKeys(RR_BOTTOM_OF_THE_WELL, 3);}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE,            {[]{return SmallKeys(RR_BOTTOM_OF_THE_WELL, 3) && (randoCtx->GetTrickOption(RT_LENS_BOTW) || CanUse(RG_LENS_OF_TRUTH)) && Boomerang;}}),
                 }, {
                   //Exits
                   Entrance(RR_BOTTOM_OF_THE_WELL_ENTRYWAY, {[]{return true;}}),
@@ -53,21 +53,21 @@ void AreaTable_Init_BottomOfTheWell() {
   /*---------------------------
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
-  if (Dungeon::BottomOfTheWell.IsMQ()) {
+  if (randoCtx->GetDungeon(Rando::BOTTOM_OF_THE_WELL)->IsMQ()) {
   areaTable[RR_BOTTOM_OF_THE_WELL_MQ_PERIMETER] = Area("Bottom of the Well MQ Perimeter", "Bottom of the Well", RHT_BOTTOM_OF_THE_WELL, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   //EventAccess(&WallFairy, {[]{return WallFairy || Slingshot;}}),
   }, {
                   //Locations
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST,              {[]{return KokiriSword || (Sticks && LogicChildDeadhand);}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY, {[]{return HasExplosives || (LogicBotwMQDeadHandKey && Boomerang);}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST,              {[]{return KokiriSword || (Sticks && randoCtx->GetTrickOption(RT_BOTW_CHILD_DEADHAND));}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY, {[]{return HasExplosives || (randoCtx->GetTrickOption(RT_BOTW_MQ_DEADHAND_KEY) && Boomerang);}}),
                     //Trick: HasExplosives || (LogicBotWMQDeadHandKey && Boomerang)
                   LocationAccess(RC_BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT,                {[]{return CanChildAttack;}}),
                   LocationAccess(RC_BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM,             {[]{return CanChildAttack && SmallKeys(RR_BOTTOM_OF_THE_WELL, 2);}}),
   }, {
                   //Exits
                   Entrance(RR_BOTTOM_OF_THE_WELL_ENTRYWAY,  {[]{return true;}}),
-                  Entrance(RR_BOTTOM_OF_THE_WELL_MQ_MIDDLE, {[]{return CanPlay(ZeldasLullaby) || (LogicBotwMQPits && HasExplosives);}}),
+                  Entrance(RR_BOTTOM_OF_THE_WELL_MQ_MIDDLE, {[]{return CanPlay(ZeldasLullaby) || (randoCtx->GetTrickOption(RT_BOTW_MQ_PITS) && HasExplosives);}}),
                     //Trick: CanPlay(ZeldasLullaby) || (LogicBotWMQPits && HasExplosives)
   });
 
@@ -76,7 +76,7 @@ void AreaTable_Init_BottomOfTheWell() {
                   LocationAccess(RC_BOTTOM_OF_THE_WELL_MQ_MAP_CHEST,                        {[]{return true;}}),
                   LocationAccess(RC_BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST,              {[]{return HasExplosives && SmallKeys(RR_BOTTOM_OF_THE_WELL, 2);}}),
                   LocationAccess(RC_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY, {[]{return true;}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM,               {[]{return CanChildAttack && (LogicBotwMQPits || HasExplosives);}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM,               {[]{return CanChildAttack && (randoCtx->GetTrickOption(RT_BOTW_MQ_PITS) || HasExplosives);}}),
                     //Trick: CanChildAttack && (LogicBotWMQPits || HasExplosives)
   }, {
                   //Exits
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
index edcf795ad..dd4f942de 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
@@ -1,9 +1,9 @@
 #include "../location_access.hpp"
 #include "../logic.hpp"
-#include "../entrance.hpp"
+#include "../../entrance.h"
 
 using namespace Logic;
-using namespace Settings;
+using namespace Rando;
 
 void AreaTable_Init_CastleTown() {
   areaTable[RR_MARKET_ENTRANCE] = Area("Market Entrance", "Market Entrance", RHT_THE_MARKET, NO_DAY_NIGHT_CYCLE, {}, {}, {
@@ -58,7 +58,7 @@ void AreaTable_Init_CastleTown() {
                 }, {
                   //Exits
                   Entrance(RR_TOT_ENTRANCE,            {[]{return true;}}),
-                  Entrance(RR_TOT_BEYOND_DOOR_OF_TIME, {[]{return OpenDoorOfTime.Is(OPENDOOROFTIME_OPEN) || (CanPlay(SongOfTime) && (OpenDoorOfTime.Is(OPENDOOROFTIME_SONGONLY) || (HasAllStones && OcarinaOfTime)));}}),
+                  Entrance(RR_TOT_BEYOND_DOOR_OF_TIME, {[]{return randoCtx->GetOption(RSK_DOOR_OF_TIME).Is(RO_DOOROFTIME_OPEN) || (CanPlay(SongOfTime) && (randoCtx->GetOption(RSK_DOOR_OF_TIME).Is(RO_DOOROFTIME_SONGONLY) || (HasAllStones && OcarinaOfTime)));}}),
   });
 
   areaTable[RR_TOT_BEYOND_DOOR_OF_TIME] = Area("Beyond Door of Time", "Beyond Door of Time", RHT_TEMPLE_OF_TIME, NO_DAY_NIGHT_CYCLE, {
@@ -94,7 +94,7 @@ void AreaTable_Init_CastleTown() {
                 }, {
                   //Exits
                   Entrance(RR_CASTLE_GROUNDS,          {[]{return true;}}),
-                  Entrance(RR_HC_GARDEN,               {[]{return WeirdEgg || !ShuffleWeirdEgg;}}),
+                  Entrance(RR_HC_GARDEN,               {[]{return WeirdEgg || !randoCtx->GetOption(RSK_SHUFFLE_WEIRD_EGG);}}),
                   Entrance(RR_HC_GREAT_FAIRY_FOUNTAIN, {[]{return CanBlastOrSmash;}}),
                   Entrance(RR_HC_STORMS_GROTTO,        {[]{return CanOpenStormGrotto;}}),
   });
@@ -125,7 +125,7 @@ void AreaTable_Init_CastleTown() {
                   EventAccess(&WanderingBugs,    {[]{return WanderingBugs    || CanBlastOrSmash;}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_HC_GS_STORMS_GROTTO,           {[]{return (CanBlastOrSmash && HookshotOrBoomerang) || (Boomerang && LogicCastleStormsGS);}}),
+                  LocationAccess(RC_HC_GS_STORMS_GROTTO,           {[]{return (CanBlastOrSmash && HookshotOrBoomerang) || (Boomerang && randoCtx->GetTrickOption(RT_HC_STORMS_GS));}}),
                   LocationAccess(RC_HC_STORMS_GROTTO_GOSSIP_STONE, {[]{return CanBlastOrSmash;}}),
                 }, {
                   //Exits
@@ -192,8 +192,8 @@ void AreaTable_Init_CastleTown() {
 
   areaTable[RR_MARKET_MASK_SHOP] = Area("Market Mask Shop", "Market Mask Shop", RHT_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&SkullMask,   {[]{return SkullMask   || (ZeldasLetter && (CompleteMaskQuest ||  ChildCanAccess(RR_KAKARIKO_VILLAGE)));}}),
-                  EventAccess(&MaskOfTruth, {[]{return MaskOfTruth || (SkullMask && (CompleteMaskQuest || (ChildCanAccess(RR_THE_LOST_WOODS) && CanPlay(SariasSong) && AreaTable(RR_THE_GRAVEYARD)->childDay && ChildCanAccess(RR_HYRULE_FIELD) && HasAllStones)));}}),
+                  EventAccess(&SkullMask,   {[]{return SkullMask   || (ZeldasLetter && (randoCtx->GetOption(RSK_COMPLETE_MASK_QUEST) ||  ChildCanAccess(RR_KAKARIKO_VILLAGE)));}}),
+                  EventAccess(&MaskOfTruth, {[]{return MaskOfTruth || (SkullMask && (randoCtx->GetOption(RSK_COMPLETE_MASK_QUEST) || (ChildCanAccess(RR_THE_LOST_WOODS) && CanPlay(SariasSong) && AreaTable(RR_THE_GRAVEYARD)->childDay && ChildCanAccess(RR_HYRULE_FIELD) && HasAllStones)));}}),
                 }, {}, {
                   //Exits
                   Entrance(RR_THE_MARKET, {[]{return true;}}),
@@ -235,12 +235,12 @@ void AreaTable_Init_CastleTown() {
   areaTable[RR_MARKET_TREASURE_CHEST_GAME] = Area("Market Treasure Chest Game", "Market Treasure Chest Game", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_GREG_HINT, {[]{return true;}}),
-                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_REWARD, {[]{return (CanUse(RG_LENS_OF_TRUTH) && !ShuffleChestMinigame) || (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_SINGLE_KEYS) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 6)) || (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_PACK) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1));}}),
-                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_1, {[]{return (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_SINGLE_KEYS) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_PACK) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (CanUse(RG_LENS_OF_TRUTH) && !ShuffleChestMinigame);}}),
-                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_2, {[]{return (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_SINGLE_KEYS) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 2)) || (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_PACK) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (CanUse(RG_LENS_OF_TRUTH) && !ShuffleChestMinigame);}}),
-                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_3, {[]{return (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_SINGLE_KEYS) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 3)) || (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_PACK) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (CanUse(RG_LENS_OF_TRUTH) && !ShuffleChestMinigame);}}),
-                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_4, {[]{return (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_SINGLE_KEYS) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 4)) || (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_PACK) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (CanUse(RG_LENS_OF_TRUTH) && !ShuffleChestMinigame);}}),
-                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_5, {[]{return (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_SINGLE_KEYS) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 5)) || (ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_PACK) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (CanUse(RG_LENS_OF_TRUTH) && !ShuffleChestMinigame);}}),
+                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_REWARD, {[]{return (CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 6)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1));}}),
+                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_1, {[]{return (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME));}}),
+                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_2, {[]{return (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 2)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME));}}),
+                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_3, {[]{return (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 3)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME));}}),
+                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_4, {[]{return (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 4)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME));}}),
+                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_5, {[]{return (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 5)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME));}}),
                 }, {
                   //Exits
                   Entrance(RR_THE_MARKET, {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
index 65c6a4c2c..ced34dcd9 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
@@ -1,26 +1,27 @@
 #include "../location_access.hpp"
 #include "../logic.hpp"
-#include "../entrance.hpp"
+#include "../../entrance.h"
 
 using namespace Logic;
-using namespace Settings;
+using namespace Rando;
 
 void AreaTable_Init_DeathMountain() {
+  auto ctx = Rando::Context::GetInstance();
   areaTable[RR_DEATH_MOUNTAIN_TRAIL] = Area("Death Mountain", "Death Mountain", RHT_DEATH_MOUNTAIN_TRAIL, DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&BeanPlantFairy, {[]{return BeanPlantFairy || (CanPlantBean(RR_DEATH_MOUNTAIN_TRAIL) && CanPlay(SongOfStorms) && (HasExplosives || GoronBracelet));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_DMT_CHEST,                    {[]{return CanBlastOrSmash || (LogicDMTBombable && IsChild && GoronBracelet);}}),
+                  LocationAccess(RC_DMT_CHEST,                    {[]{return CanBlastOrSmash || (randoCtx->GetTrickOption(RT_DMT_BOMBABLE) && IsChild && GoronBracelet);}}),
                   LocationAccess(RC_DMT_FREESTANDING_POH,         {[]{return CanTakeDamage || CanUse(RG_HOVER_BOOTS) || (IsAdult && CanPlantBean(RR_DEATH_MOUNTAIN_TRAIL) && (HasExplosives || GoronBracelet));}}),
-                  LocationAccess(RC_DMT_GS_BEAN_PATCH,            {[]{return CanPlantBugs && (HasExplosives || GoronBracelet || (LogicDMTSoilGS && (CanTakeDamage || CanUse(RG_HOVER_BOOTS)) && CanUse(RG_BOOMERANG)));}}),
+                  LocationAccess(RC_DMT_GS_BEAN_PATCH,            {[]{return CanPlantBugs && (HasExplosives || GoronBracelet || (randoCtx->GetTrickOption(RT_DMT_SOIL_GS) && (CanTakeDamage || CanUse(RG_HOVER_BOOTS)) && CanUse(RG_BOOMERANG)));}}),
                   LocationAccess(RC_DMT_GS_NEAR_KAK,              {[]{return CanBlastOrSmash;}}),
-                  LocationAccess(RC_DMT_GS_ABOVE_DODONGOS_CAVERN, {[]{return IsAdult && AtNight && (CanUse(RG_MEGATON_HAMMER) || (LogicDMTGSLowerHookshot && CanUse(RG_HOOKSHOT)) || (LogicDMTGSLowerBean && CanPlantBean(RR_DEATH_MOUNTAIN_TRAIL)) || (LogicDMTGSLowerHovers && CanUse(RG_HOVER_BOOTS)) || LogicDMTGSLowerJS) && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_DMT_GS_ABOVE_DODONGOS_CAVERN, {[]{return IsAdult && AtNight && (CanUse(RG_MEGATON_HAMMER) || (randoCtx->GetTrickOption(RT_DMT_HOOKSHOT_LOWER_GS) && CanUse(RG_HOOKSHOT)) || (randoCtx->GetTrickOption(RT_DMT_BEAN_LOWER_GS) && CanPlantBean(RR_DEATH_MOUNTAIN_TRAIL)) || (randoCtx->GetTrickOption(RT_DMT_HOVERS_LOWER_GS) && CanUse(RG_HOVER_BOOTS)) || randoCtx->GetTrickOption(RT_DMT_JS_LOWER_GS)) && CanGetNightTimeGS;}}),
                 }, {
                   //Exits
                   Entrance(RR_KAK_BEHIND_GATE,          {[]{return true;}}),
                   Entrance(RR_GORON_CITY,               {[]{return true;}}),
-                  Entrance(RR_DEATH_MOUNTAIN_SUMMIT,    {[]{return Here(RR_DEATH_MOUNTAIN_TRAIL, []{return CanBlastOrSmash;}) || (IsAdult && ((CanPlantBean(RR_DEATH_MOUNTAIN_TRAIL) && GoronBracelet) || (HoverBoots && LogicDMTClimbHovers)));}}),
+                  Entrance(RR_DEATH_MOUNTAIN_SUMMIT,    {[]{return Here(RR_DEATH_MOUNTAIN_TRAIL, []{return CanBlastOrSmash;}) || (IsAdult && ((CanPlantBean(RR_DEATH_MOUNTAIN_TRAIL) && GoronBracelet) || (HoverBoots && randoCtx->GetTrickOption(RT_DMT_CLIMB_HOVERS))));}}),
                   Entrance(RR_DODONGOS_CAVERN_ENTRYWAY, {[]{return HasExplosives || GoronBracelet || IsAdult;}}),
                   Entrance(RR_DMT_STORMS_GROTTO,        {[]{return CanOpenStormGrotto;}}),
   });
@@ -35,7 +36,7 @@ void AreaTable_Init_DeathMountain() {
                   LocationAccess(RC_DMT_TRADE_BROKEN_SWORD,    {[]{return IsAdult && BrokenSword;}}),
                   LocationAccess(RC_DMT_TRADE_EYEDROPS,        {[]{return IsAdult && Eyedrops;}}),
                   LocationAccess(RC_DMT_TRADE_CLAIM_CHECK,     {[]{return IsAdult && ClaimCheck;}}),
-                  LocationAccess(RC_DMT_GS_FALLING_ROCKS_PATH, {[]{return IsAdult && AtNight && (CanUse(RG_MEGATON_HAMMER) || LogicDMTGSUpper) && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_DMT_GS_FALLING_ROCKS_PATH, {[]{return IsAdult && AtNight && (CanUse(RG_MEGATON_HAMMER) || randoCtx->GetTrickOption(RT_DMT_UPPER_GS)) && CanGetNightTimeGS;}}),
                   LocationAccess(RC_DMT_GOSSIP_STONE,          {[]{return true;}}),
                 }, {
                   //Exits
@@ -85,14 +86,14 @@ void AreaTable_Init_DeathMountain() {
                   EventAccess(&GoronCityChildFire,        {[]{return GoronCityChildFire        || (IsChild && CanUse(RG_DINS_FIRE));}}),
                   EventAccess(&GCWoodsWarpOpen,           {[]{return GCWoodsWarpOpen           || (CanBlastOrSmash || CanUse(RG_DINS_FIRE) || CanUse(RG_FAIRY_BOW) || GoronBracelet || GoronCityChildFire);}}),
                   EventAccess(&GCDaruniasDoorOpenChild,   {[]{return GCDaruniasDoorOpenChild   || (IsChild && CanPlay(ZeldasLullaby));}}),
-                  EventAccess(&StopGCRollingGoronAsAdult, {[]{return StopGCRollingGoronAsAdult || (IsAdult && (GoronBracelet || HasExplosives || Bow || (LogicGoronCityLinkGoronDins && CanUse(RG_DINS_FIRE))));}}),
+                  EventAccess(&StopGCRollingGoronAsAdult, {[]{return StopGCRollingGoronAsAdult || (IsAdult && (GoronBracelet || HasExplosives || Bow || (randoCtx->GetTrickOption(RT_GC_LINK_GORON_DINS) && CanUse(RG_DINS_FIRE))));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_GC_MAZE_LEFT_CHEST,        {[]{return CanUse(RG_MEGATON_HAMMER) || CanUse(RG_SILVER_GAUNTLETS) || (LogicGoronCityLeftMost && HasExplosives && CanUse(RG_HOVER_BOOTS));}}),
+                  LocationAccess(RC_GC_MAZE_LEFT_CHEST,        {[]{return CanUse(RG_MEGATON_HAMMER) || CanUse(RG_SILVER_GAUNTLETS) || (randoCtx->GetTrickOption(RT_GC_LEFTMOST) && HasExplosives && CanUse(RG_HOVER_BOOTS));}}),
                   LocationAccess(RC_GC_MAZE_CENTER_CHEST,      {[]{return CanBlastOrSmash  || CanUse(RG_SILVER_GAUNTLETS);}}),
                   LocationAccess(RC_GC_MAZE_RIGHT_CHEST,       {[]{return CanBlastOrSmash  || CanUse(RG_SILVER_GAUNTLETS);}}),
-                  LocationAccess(RC_GC_POT_FREESTANDING_POH,   {[]{return IsChild && GoronCityChildFire && (Bombs || (GoronBracelet && LogicGoronCityPotWithStrength) || (HasBombchus && LogicGoronCityPot));}}),
-                  LocationAccess(RC_GC_ROLLING_GORON_AS_CHILD, {[]{return IsChild && (HasExplosives || (GoronBracelet && LogicChildRollingWithStrength));}}),
+                  LocationAccess(RC_GC_POT_FREESTANDING_POH,   {[]{return IsChild && GoronCityChildFire && (Bombs || (GoronBracelet && randoCtx->GetTrickOption(RT_GC_POT_STRENGTH)) || (HasBombchus && randoCtx->GetTrickOption(RT_GC_POT)));}}),
+                  LocationAccess(RC_GC_ROLLING_GORON_AS_CHILD, {[]{return IsChild && (HasExplosives || (GoronBracelet && randoCtx->GetTrickOption(RT_GC_ROLLING_STRENGTH)));}}),
                   LocationAccess(RC_GC_ROLLING_GORON_AS_ADULT, {[]{return StopGCRollingGoronAsAdult;}}),
                   LocationAccess(RC_GC_GS_BOULDER_MAZE,        {[]{return IsChild && CanBlastOrSmash;}}),
                   LocationAccess(RC_GC_GS_CENTER_PLATFORM,     {[]{return CanAdultAttack;}}),
@@ -105,7 +106,7 @@ void AreaTable_Init_DeathMountain() {
                   Entrance(RR_GC_WOODS_WARP,        {[]{return GCWoodsWarpOpen;}}),
                   Entrance(RR_GC_SHOP,              {[]{return (IsAdult && StopGCRollingGoronAsAdult) || (IsChild && (CanBlastOrSmash || GoronBracelet || GoronCityChildFire || CanUse(RG_FAIRY_BOW)));}}),
                   Entrance(RR_GC_DARUNIAS_CHAMBER,  {[]{return (IsAdult && StopGCRollingGoronAsAdult) || GCDaruniasDoorOpenChild;}}),
-                  Entrance(RR_GC_GROTTO_PLATFORM,   {[]{return IsAdult && ((CanPlay(SongOfTime) && ((EffectiveHealth > 2) || CanUse(RG_GORON_TUNIC) || CanUse(RG_LONGSHOT) || CanUse(RG_NAYRUS_LOVE))) || (EffectiveHealth > 1 && CanUse(RG_GORON_TUNIC) && CanUse(RG_HOOKSHOT)) || (CanUse(RG_NAYRUS_LOVE) && CanUse(RG_HOOKSHOT)) || (EffectiveHealth > 2 && CanUse(RG_HOOKSHOT) && LogicGoronCityGrotto));}}),
+                  Entrance(RR_GC_GROTTO_PLATFORM,   {[]{return IsAdult && ((CanPlay(SongOfTime) && ((EffectiveHealth > 2) || CanUse(RG_GORON_TUNIC) || CanUse(RG_LONGSHOT) || CanUse(RG_NAYRUS_LOVE))) || (EffectiveHealth > 1 && CanUse(RG_GORON_TUNIC) && CanUse(RG_HOOKSHOT)) || (CanUse(RG_NAYRUS_LOVE) && CanUse(RG_HOOKSHOT)) || (EffectiveHealth > 2 && CanUse(RG_HOOKSHOT) && randoCtx->GetTrickOption(RT_GC_GROTTO)));}}),
   });
 
   areaTable[RR_GC_WOODS_WARP] = Area("GC Woods Warp", "Goron City", RHT_GORON_CITY, NO_DAY_NIGHT_CYCLE, {
@@ -179,7 +180,7 @@ void AreaTable_Init_DeathMountain() {
                   //Exits
                   Entrance(RR_DMC_UPPER_NEARBY,         {[]{return true;}}),
                   Entrance(RR_DMC_LADDER_AREA_NEARBY,   {[]{return FireTimer >= 16 || Hearts >= 3;}}),
-                  Entrance(RR_DMC_CENTRAL_NEARBY,       {[]{return IsAdult && CanUse(RG_GORON_TUNIC) && CanUse(RG_DISTANT_SCARECROW) && ((EffectiveHealth > 2) || (Fairy && ShuffleDungeonEntrances.IsNot(SHUFFLEDUNGEONS_OFF)) || CanUse(RG_NAYRUS_LOVE));}}),
+                  Entrance(RR_DMC_CENTRAL_NEARBY,       {[]{return IsAdult && CanUse(RG_GORON_TUNIC) && CanUse(RG_DISTANT_SCARECROW) && ((EffectiveHealth > 2) || (Fairy && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).IsNot(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF)) || CanUse(RG_NAYRUS_LOVE));}}),
                   Entrance(RR_DMC_LOWER_NEARBY,         {[]{return false;}}),
   });
 
@@ -189,7 +190,7 @@ void AreaTable_Init_DeathMountain() {
                 }, {
                   //Exits
                   Entrance(RR_DMC_UPPER_NEARBY, {[]{return Hearts >= 3;}}),
-                  Entrance(RR_DMC_LOWER_NEARBY, {[]{return Hearts >= 3 && (CanUse(RG_HOVER_BOOTS) || (LogicCraterBoulderJS && IsAdult && CanUse(RG_MEGATON_HAMMER)) || (LogicCraterBoulderSkip && IsAdult));}}),
+                  Entrance(RR_DMC_LOWER_NEARBY, {[]{return Hearts >= 3 && (CanUse(RG_HOVER_BOOTS) || (randoCtx->GetTrickOption(RT_DMC_BOULDER_JS) && IsAdult && CanUse(RG_MEGATON_HAMMER)) || (randoCtx->GetTrickOption(RT_DMC_BOULDER_SKIP) && IsAdult));}}),
   });
 
   areaTable[RR_DMC_LOWER_NEARBY] = Area("DMC Lower Nearby", "Death Mountain Crater", RHT_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {}, {
@@ -205,12 +206,12 @@ void AreaTable_Init_DeathMountain() {
                   Entrance(RR_DMC_LOWER_NEARBY,       {[]{return true;}}),
                   Entrance(RR_DMC_LADDER_AREA_NEARBY, {[]{return FireTimer >= 8 || Hearts >= 3;}}),
                   Entrance(RR_DMC_CENTRAL_NEARBY,     {[]{return (CanUse(RG_HOVER_BOOTS) || CanUse(RG_HOOKSHOT)) && (FireTimer >= 8 || Hearts >= 3);}}),
-                  Entrance(RR_DMC_CENTRAL_LOCAL,      {[]{return (CanUse(RG_HOVER_BOOTS) || CanUse(RG_HOOKSHOT) || (IsAdult && CanShield && LogicCraterBoleroJump)) && FireTimer >= 24;}}),
+                  Entrance(RR_DMC_CENTRAL_LOCAL,      {[]{return (CanUse(RG_HOVER_BOOTS) || CanUse(RG_HOOKSHOT) || (IsAdult && CanShield && randoCtx->GetTrickOption(RT_DMC_BOLERO_JUMP))) && FireTimer >= 24;}}),
   });
 
   areaTable[RR_DMC_CENTRAL_NEARBY] = Area("DMC Central Nearby", "Death Mountain Crater", RHT_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DMC_VOLCANO_FREESTANDING_POH, {[]{return IsAdult && Hearts >= 3 && (CanPlantBean(RR_DMC_CENTRAL_LOCAL) || (LogicCraterBeanPoHWithHovers && HoverBoots));}}),
+                  LocationAccess(RC_DMC_VOLCANO_FREESTANDING_POH, {[]{return IsAdult && Hearts >= 3 && (CanPlantBean(RR_DMC_CENTRAL_LOCAL) || (randoCtx->GetTrickOption(RT_DMC_HOVER_BEAN_POH) && HoverBoots));}}),
                   LocationAccess(RC_SHEIK_IN_CRATER,              {[]{return IsAdult && (FireTimer >= 8 || Hearts >= 3);}}),
                 }, {
                   //Exits
@@ -228,7 +229,7 @@ void AreaTable_Init_DeathMountain() {
                   Entrance(RR_DMC_CENTRAL_NEARBY,   {[]{return true;}}),
                   Entrance(RR_DMC_LOWER_NEARBY,     {[]{return (IsAdult && CanPlantBean(RR_DMC_CENTRAL_LOCAL)) || CanUse(RG_HOVER_BOOTS) || CanUse(RG_HOOKSHOT);}}),
                   Entrance(RR_DMC_UPPER_NEARBY,     {[]{return IsAdult && CanPlantBean(RR_DMC_CENTRAL_LOCAL);}}),
-                  Entrance(RR_FIRE_TEMPLE_ENTRYWAY, {[]{return (IsChild && Hearts >= 3 && ShuffleDungeonEntrances.IsNot(SHUFFLEDUNGEONS_OFF)) || (IsAdult && FireTimer >= 24);}}),
+                  Entrance(RR_FIRE_TEMPLE_ENTRYWAY, {[]{return (IsChild && Hearts >= 3 && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).IsNot(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF)) || (IsAdult && FireTimer >= 24);}}),
   });
 
   areaTable[RR_DMC_GREAT_FAIRY_FOUNTAIN] = Area("DMC Great Fairy Fountain", "DMC Great Fairy Fountain", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp
index fa78e021b..fd0fbe6f0 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp
@@ -1,10 +1,10 @@
 #include "../location_access.hpp"
 #include "../logic.hpp"
-#include "../entrance.hpp"
-#include "../dungeon.hpp"
+#include "../../entrance.h"
+#include "../../dungeon.h"
 
 using namespace Logic;
-using namespace Settings;
+using namespace Rando;
 
 void AreaTable_Init_DekuTree() {
   /*--------------------------
@@ -12,15 +12,15 @@ void AreaTable_Init_DekuTree() {
   ---------------------------*/
   areaTable[RR_DEKU_TREE_ENTRYWAY] = Area("Deku Tree Entryway", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_DEKU_TREE_LOBBY,      {[]{return Dungeon::DekuTree.IsVanilla();}}),
-                  Entrance(RR_DEKU_TREE_MQ_LOBBY,   {[]{return Dungeon::DekuTree.IsMQ();}}),
+                  Entrance(RR_DEKU_TREE_LOBBY,      {[]{return randoCtx->GetDungeon(DEKU_TREE)->IsVanilla();}}),
+                  Entrance(RR_DEKU_TREE_MQ_LOBBY,   {[]{return randoCtx->GetDungeon(DEKU_TREE)->IsMQ();}}),
                   Entrance(RR_KF_OUTSIDE_DEKU_TREE, {[]{return true;}}),
   });
 
   /*--------------------------
   |     VANILLA DUNGEON      |
   ---------------------------*/
-  if (Dungeon::DekuTree.IsVanilla()) {
+  if (randoCtx->GetDungeon(DEKU_TREE)->IsVanilla()) {
   areaTable[RR_DEKU_TREE_LOBBY] = Area("Deku Tree Lobby", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_BOOMERANG));}}),
@@ -77,12 +77,12 @@ void AreaTable_Init_DekuTree() {
                   //Locations
                   LocationAccess(RC_DEKU_TREE_BASEMENT_CHEST,    {[]{return true;}}),
                   LocationAccess(RC_DEKU_TREE_GS_BASEMENT_GATE,  {[]{return CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOOMERANG) || HasExplosives || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_DINS_FIRE);}}),
-                  LocationAccess(RC_DEKU_TREE_GS_BASEMENT_VINES, {[]{return CanUseProjectile || CanUse(RG_DINS_FIRE) || (LogicDekuBasementGS && CanJumpslash);}}),
+                  LocationAccess(RC_DEKU_TREE_GS_BASEMENT_VINES, {[]{return CanUseProjectile || CanUse(RG_DINS_FIRE) || (randoCtx->GetTrickOption(RT_DEKU_MQ_COMPASS_GS) && CanJumpslash);}}),
                 }, {
                   //Exits
                   Entrance(RR_DEKU_TREE_LOBBY,               {[]{return true;}}),
                   Entrance(RR_DEKU_TREE_BASEMENT_SCRUB_ROOM, {[]{return Here(RR_DEKU_TREE_BASEMENT_LOWER, []{return HasFireSourceWithTorch || CanUse(RG_FAIRY_BOW);});}}),
-                  Entrance(RR_DEKU_TREE_BASEMENT_UPPER,      {[]{return IsAdult || LogicDekuB1Skip || HasAccessTo(RR_DEKU_TREE_BASEMENT_UPPER);}}),
+                  Entrance(RR_DEKU_TREE_BASEMENT_UPPER,      {[]{return IsAdult || randoCtx->GetTrickOption(RT_DEKU_B1_SKIP) || HasAccessTo(RR_DEKU_TREE_BASEMENT_UPPER);}}),
                   Entrance(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM,   {[]{return false;}}),
   });
 
@@ -137,7 +137,7 @@ void AreaTable_Init_DekuTree() {
                   //Exits
                   Entrance(RR_DEKU_TREE_BASEMENT_LOWER,      {[]{return true;}}),
                   Entrance(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, {[]{return IsChild;}}),
-                  Entrance(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM,   {[]{return Here(RR_DEKU_TREE_BASEMENT_UPPER, []{return HasFireSourceWithTorch || (LogicDekuB1WebsWithBow && IsAdult && CanUse(RG_FAIRY_BOW));});}}),
+                  Entrance(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM,   {[]{return Here(RR_DEKU_TREE_BASEMENT_UPPER, []{return HasFireSourceWithTorch || (randoCtx->GetTrickOption(RT_DEKU_B1_BOW_WEBS) && IsAdult && CanUse(RG_FAIRY_BOW));});}}),
   });
 
   areaTable[RR_DEKU_TREE_OUTSIDE_BOSS_ROOM] = Area("Deku Tree Outside Boss Room", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
@@ -150,7 +150,7 @@ void AreaTable_Init_DekuTree() {
   /*---------------------------
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
-  if (Dungeon::DekuTree.IsMQ()) {
+  if (randoCtx->GetDungeon(DEKU_TREE)->IsMQ()) {
   areaTable[RR_DEKU_TREE_MQ_LOBBY] = Area("Deku Tree MQ Lobby", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_BOOMERANG));}}),
@@ -169,7 +169,7 @@ void AreaTable_Init_DekuTree() {
                                                                                Here(RR_DEKU_TREE_MQ_LOBBY, []{return HasFireSourceWithTorch || (IsAdult && CanUse(RG_FAIRY_BOW));});}}),
                   Entrance(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_FRONT, {[]{return Here(RR_DEKU_TREE_MQ_LOBBY, []{return (IsChild && CanUse(RG_FAIRY_SLINGSHOT)) || (IsAdult && CanUse(RG_FAIRY_BOW));}) &&
                                                                                Here(RR_DEKU_TREE_MQ_LOBBY, []{return HasFireSourceWithTorch;});}}),
-                  Entrance(RR_DEKU_TREE_MQ_BASEMENT_LEDGE,            {[]{return LogicDekuB1Skip || Here(RR_DEKU_TREE_MQ_LOBBY, []{return IsAdult;});}}),
+                  Entrance(RR_DEKU_TREE_MQ_BASEMENT_LEDGE,            {[]{return randoCtx->GetTrickOption(RT_DEKU_B1_SKIP) || Here(RR_DEKU_TREE_MQ_LOBBY, []{return IsAdult;});}}),
   });
 
   areaTable[RR_DEKU_TREE_MQ_COMPASS_ROOM] = Area("Deku Tree MQ Compass Room", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -178,7 +178,7 @@ void AreaTable_Init_DekuTree() {
                   LocationAccess(RC_DEKU_TREE_MQ_GS_COMPASS_ROOM, {[]{return HookshotOrBoomerang &&
                                                                                Here(RR_DEKU_TREE_MQ_COMPASS_ROOM, []{return HasBombchus ||
                                                                                (Bombs && (CanPlay(SongOfTime) || IsAdult)) ||
-                                                                               (IsAdult && CanUse(RG_MEGATON_HAMMER) && (CanPlay(SongOfTime) || LogicDekuMQCompassGS));});}}),
+                                                                               (IsAdult && CanUse(RG_MEGATON_HAMMER) && (CanPlay(SongOfTime) || randoCtx->GetTrickOption(RT_DEKU_MQ_COMPASS_GS)));});}}),
   }, {
                   //Exits
                   Entrance(RR_DEKU_TREE_MQ_LOBBY, {[]{return true;}}),
@@ -189,7 +189,7 @@ void AreaTable_Init_DekuTree() {
                   LocationAccess(RC_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST, {[]{return true;}}),
   }, {
                   //Exits
-                  Entrance(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK, {[]{return LogicDekuMQLog ||  (IsChild && (DekuShield || HylianShield)) ||
+                  Entrance(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK, {[]{return randoCtx->GetTrickOption(RT_DEKU_MQ_LOG) ||  (IsChild && (DekuShield || HylianShield)) ||
                                                                              (IsAdult && (CanUse(RG_LONGSHOT) || (CanUse(RG_HOOKSHOT) && CanUse(RG_IRON_BOOTS))));}}),
                   Entrance(RR_DEKU_TREE_MQ_LOBBY,                    {[]{return true;}}),
   });
@@ -244,8 +244,8 @@ void AreaTable_Init_DekuTree() {
         Area("Deku Tree Boss Entryway", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {},
              {
                  // Exits
-                 Entrance(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM, { [] { return Dungeon::DekuTree.IsVanilla(); } }),
-                 Entrance(RR_DEKU_TREE_MQ_OUTSIDE_BOSS_ROOM, { [] { return Dungeon::DekuTree.IsMQ(); } }),
+                 Entrance(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM, { [] { return randoCtx->GetDungeon(DEKU_TREE)->IsVanilla(); } }),
+                 Entrance(RR_DEKU_TREE_MQ_OUTSIDE_BOSS_ROOM, { [] { return randoCtx->GetDungeon(DEKU_TREE)->IsMQ(); } }),
                  Entrance(RR_DEKU_TREE_BOSS_ROOM, { [] { return true; } }),
              });
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp
index 984ce8dc5..ed9502b77 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp
@@ -1,10 +1,10 @@
 #include "../location_access.hpp"
 #include "../logic.hpp"
-#include "../entrance.hpp"
-#include "../dungeon.hpp"
+#include "../../entrance.h"
+#include "../../dungeon.h"
 
 using namespace Logic;
-using namespace Settings;
+using namespace Rando;
 
 void AreaTable_Init_DodongosCavern() {
   /*--------------------------
@@ -12,15 +12,15 @@ void AreaTable_Init_DodongosCavern() {
   ---------------------------*/
   areaTable[RR_DODONGOS_CAVERN_ENTRYWAY] = Area("Dodongos Cavern Entryway", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_DODONGOS_CAVERN_BEGINNING,    {[]{return Dungeon::DodongosCavern.IsVanilla();}}),
-                  Entrance(RR_DODONGOS_CAVERN_MQ_BEGINNING, {[]{return Dungeon::DodongosCavern.IsMQ();}}),
+                  Entrance(RR_DODONGOS_CAVERN_BEGINNING,    {[]{return randoCtx->GetDungeon(DODONGOS_CAVERN)->IsVanilla();}}),
+                  Entrance(RR_DODONGOS_CAVERN_MQ_BEGINNING, {[]{return randoCtx->GetDungeon(DODONGOS_CAVERN)->IsMQ();}}),
                   Entrance(RR_DEATH_MOUNTAIN_TRAIL,         {[]{return true;}}),
   });
 
   /*--------------------------
   |     VANILLA DUNGEON      |
   ---------------------------*/
-  if (Dungeon::DodongosCavern.IsVanilla()) {
+  if (randoCtx->GetDungeon(DODONGOS_CAVERN)->IsVanilla()) {
   areaTable[RR_DODONGOS_CAVERN_BEGINNING] = Area("Dodongos Cavern Beginning", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_ENTRYWAY, {[]{return true;}}),
@@ -54,7 +54,7 @@ void AreaTable_Init_DodongosCavern() {
 
   areaTable[RR_DODONGOS_CAVERN_SE_CORRIDOR] = Area("Dodongos Cavern SE Corridor", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DODONGOS_CAVERN_GS_SCARECROW, {[]{return CanUse(RG_SCARECROW) || (IsAdult && CanUse(RG_LONGSHOT)) || (LogicDCScarecrowGS && (CanAdultAttack || CanChildAttack));}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_GS_SCARECROW, {[]{return CanUse(RG_SCARECROW) || (IsAdult && CanUse(RG_LONGSHOT)) || (randoCtx->GetTrickOption(RT_DC_SCARECROW_GS) && (CanAdultAttack || CanChildAttack));}}),
                 }, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_LOBBY,               {[]{return true;}}),
@@ -102,14 +102,14 @@ void AreaTable_Init_DodongosCavern() {
   areaTable[RR_DODONGOS_CAVERN_STAIRS_LOWER] = Area("Dodongos Cavern Stairs Lower", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_LOBBY,        {[]{return true;}}),
-                  Entrance(RR_DODONGOS_CAVERN_STAIRS_UPPER, {[]{return HasExplosives || GoronBracelet || CanUse(RG_DINS_FIRE) || (LogicDCStaircase && CanUse(RG_FAIRY_BOW));}}),
+                  Entrance(RR_DODONGOS_CAVERN_STAIRS_UPPER, {[]{return HasExplosives || GoronBracelet || CanUse(RG_DINS_FIRE) || (randoCtx->GetTrickOption(RT_DC_STAIRCASE) && CanUse(RG_FAIRY_BOW));}}),
                   Entrance(RR_DODONGOS_CAVERN_COMPASS_ROOM, {[]{return Here(RR_DODONGOS_CAVERN_STAIRS_LOWER, []{return CanBlastOrSmash || GoronBracelet;});}}),
   });
 
   areaTable[RR_DODONGOS_CAVERN_STAIRS_UPPER] = Area("Dodongos Cavern Stairs Upper", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS, {[]{return Here(RR_DODONGOS_CAVERN_FAR_BRIDGE, []{return HookshotOrBoomerang;}) || CanUse(RG_LONGSHOT);}}),
-                  LocationAccess(RC_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS,  {[]{return IsAdult || CanChildAttack || (HasAccessTo(RR_DODONGOS_CAVERN_STAIRS_LOWER) && CanUse(RG_LONGSHOT) && LogicDCVinesGS);}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS,  {[]{return IsAdult || CanChildAttack || (HasAccessTo(RR_DODONGOS_CAVERN_STAIRS_LOWER) && CanUse(RG_LONGSHOT) && randoCtx->GetTrickOption(RT_DC_VINES_GS));}}),
                 }, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_STAIRS_LOWER, {[]{return true;}}),
@@ -135,9 +135,9 @@ void AreaTable_Init_DodongosCavern() {
                   LocationAccess(RC_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(RR_DODONGOS_CAVERN_2F_SIDE_ROOM,         {[]{return Here(RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER, []{return CanBlastOrSmash || (LogicDCScrubRoom && GoronBracelet);});}}),
+                  Entrance(RR_DODONGOS_CAVERN_2F_SIDE_ROOM,         {[]{return Here(RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER, []{return CanBlastOrSmash || (randoCtx->GetTrickOption(RT_DC_SCRUB_ROOM) && GoronBracelet);});}}),
                   Entrance(RR_DODONGOS_CAVERN_FIRST_SLINGSHOT_ROOM, {[]{return Here(RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER, []{return CanBlastOrSmash || GoronBracelet;});}}),
-                  Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_UPPER,      {[]{return (IsAdult && LogicDCJump) || CanUse(RG_HOVER_BOOTS) || (IsAdult && CanUse(RG_LONGSHOT));}}),
+                  Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_UPPER,      {[]{return (IsAdult && randoCtx->GetTrickOption(RT_DC_JUMP)) || CanUse(RG_HOVER_BOOTS) || (IsAdult && CanUse(RG_LONGSHOT));}}),
   });
 
   areaTable[RR_DODONGOS_CAVERN_2F_SIDE_ROOM] = Area("Dodongos Cavern 2F Side Room", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
@@ -152,7 +152,7 @@ void AreaTable_Init_DodongosCavern() {
   areaTable[RR_DODONGOS_CAVERN_FIRST_SLINGSHOT_ROOM] = Area("Dodongos Cavern First Slingshot Room", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER, {[]{return true;}}),
-                  Entrance(RR_DODONGOS_CAVERN_UPPER_LIZALFOS,  {[]{return CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || LogicDCSlingshotSkip;}}),
+                  Entrance(RR_DODONGOS_CAVERN_UPPER_LIZALFOS,  {[]{return CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || randoCtx->GetTrickOption(RT_DC_SLINGSHOT_SKIP);}}),
   });
 
   areaTable[RR_DODONGOS_CAVERN_UPPER_LIZALFOS] = Area("Dodongos Cavern Upper Lizalfos", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
@@ -167,7 +167,7 @@ void AreaTable_Init_DodongosCavern() {
   areaTable[RR_DODONGOS_CAVERN_SECOND_SLINGSHOT_ROOM] = Area("Dodongos Cavern Second Slingshot Room", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_UPPER_LIZALFOS,  {[]{return true;}}),
-                  Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_UPPER, {[]{return CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || LogicDCSlingshotSkip;}}),
+                  Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_UPPER, {[]{return CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || randoCtx->GetTrickOption(RT_DC_SLINGSHOT_SKIP);}}),
   });
 
   areaTable[RR_DODONGOS_CAVERN_BOMB_ROOM_UPPER] = Area("Dodongos Cavern Bomb Room Upper", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
@@ -211,7 +211,7 @@ void AreaTable_Init_DodongosCavern() {
   /*---------------------------
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
-  if (Dungeon::DodongosCavern.IsMQ()) {
+  if (randoCtx->GetDungeon(DODONGOS_CAVERN)->IsMQ()) {
   areaTable[RR_DODONGOS_CAVERN_MQ_BEGINNING] = Area("Dodongos Cavern MQ Beginning", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_ENTRYWAY, {[]{return true;}}),
@@ -227,7 +227,7 @@ void AreaTable_Init_DodongosCavern() {
                   LocationAccess(RC_DODONGOS_CAVERN_MQ_MAP_CHEST,                  {[]{return true;}}),
                   LocationAccess(RC_DODONGOS_CAVERN_MQ_COMPASS_CHEST,              {[]{return CanAdultAttack || CanChildAttack || Nuts;}}),
                   LocationAccess(RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST,          {[]{return (IsChild && CanUse(RG_STICKS)) || HasFireSource;}}),
-                  LocationAccess(RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST,    {[]{return CanBlastOrSmash || (IsChild && CanUse(RG_STICKS)) || CanUse(RG_DINS_FIRE) || (IsAdult && (LogicDCJump || HoverBoots || Hookshot));}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST,    {[]{return CanBlastOrSmash || (IsChild && CanUse(RG_STICKS)) || CanUse(RG_DINS_FIRE) || (IsAdult && (randoCtx->GetTrickOption(RT_DC_JUMP) || HoverBoots || Hookshot));}}),
                   LocationAccess(RC_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM, {[]{return CanPlay(SongOfTime) && (CanChildAttack || CanAdultAttack);}}),
                   LocationAccess(RC_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM,             {[]{return (IsChild && CanUse(RG_STICKS)) || HasFireSource;}}),
                   LocationAccess(RC_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM,           {[]{return CanBlastOrSmash;}}),
@@ -238,9 +238,9 @@ void AreaTable_Init_DodongosCavern() {
   }, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE,  {[]{return Here(RR_DODONGOS_CAVERN_MQ_LOBBY, []{return CanBlastOrSmash || (((IsChild && CanUse(RG_STICKS)) || CanUse(RG_DINS_FIRE)) && CanTakeDamage);});}}),
-                  Entrance(RR_DODONGOS_CAVERN_MQ_BOMB_BAG_AREA,     {[]{return IsAdult || (Here(RR_DODONGOS_CAVERN_MQ_LOBBY, []{return IsAdult;}) && HasExplosives) || (LogicDCMQChildBombs && CanJumpslash && CanTakeDamage);}}),
+                  Entrance(RR_DODONGOS_CAVERN_MQ_BOMB_BAG_AREA,     {[]{return IsAdult || (Here(RR_DODONGOS_CAVERN_MQ_LOBBY, []{return IsAdult;}) && HasExplosives) || (randoCtx->GetTrickOption(RT_DC_MQ_CHILD_BOMBS) && CanJumpslash && CanTakeDamage);}}),
                     //Trick: IsAdult || HasExplosives || (LogicDCMQChildBombs && (KokiriSword || Sticks) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO))
-                  Entrance(RR_DODONGOS_CAVERN_MQ_BOSS_AREA,         {[]{return HasExplosives || (GoronBracelet && ((IsAdult && LogicDCMQEyesAdult) || (IsChild && LogicDCMQEyesChild)) && ((IsChild && (CanUse(RG_STICKS))) || CanUse(RG_DINS_FIRE) || (IsAdult && (LogicDCJump || Hammer || HoverBoots || Hookshot))));}}), 
+                  Entrance(RR_DODONGOS_CAVERN_MQ_BOSS_AREA,         {[]{return HasExplosives || (GoronBracelet && ((IsAdult && randoCtx->GetTrickOption(RT_DC_MQ_ADULT_EYES)) || (IsChild && randoCtx->GetTrickOption(RT_DC_MQ_CHILD_EYES))) && ((IsChild && (CanUse(RG_STICKS))) || CanUse(RG_DINS_FIRE) || (IsAdult && (randoCtx->GetTrickOption(RT_DC_JUMP) || Hammer || HoverBoots || Hookshot))));}}), 
                     //Trick: HasExplosives || (LogicDCMQEyes && GoronBracelet && (IsAdult || LogicDCMQChildBack) && ((IsChild && CanUse(RG_STICKS)) || CanUse(RG_DINS_FIRE) || (IsAdult && (LogicDCJump || Hammer || HoverBoots || Hookshot))))
   });
 
@@ -283,8 +283,8 @@ void AreaTable_Init_DodongosCavern() {
         Area("Dodongos Cavern Boss Entryway", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {},
              {
                  // Exits
-                 Entrance(RR_DODONGOS_CAVERN_BOSS_AREA, { [] { return Dungeon::DodongosCavern.IsVanilla(); } }),
-                 Entrance(RR_DODONGOS_CAVERN_MQ_BOSS_AREA, { [] { return Dungeon::DodongosCavern.IsMQ(); } }),
+                 Entrance(RR_DODONGOS_CAVERN_BOSS_AREA, { [] { return randoCtx->GetDungeon(DODONGOS_CAVERN)->IsVanilla(); } }),
+                 Entrance(RR_DODONGOS_CAVERN_MQ_BOSS_AREA, { [] { return randoCtx->GetDungeon(DODONGOS_CAVERN)->IsMQ(); } }),
                  Entrance(RR_DODONGOS_CAVERN_BOSS_ROOM, { [] { return true; } }),
              });
 
@@ -296,7 +296,7 @@ void AreaTable_Init_DodongosCavern() {
                              { [] {
                                   return DodongosCavernClear ||
                                          (Here(RR_DODONGOS_CAVERN_BOSS_ROOM,
-                                               [] { return HasExplosives || (CanUse(RG_MEGATON_HAMMER) && LogicDCHammerFloor); }) &&
+                                               [] { return HasExplosives || (CanUse(RG_MEGATON_HAMMER) && randoCtx->GetTrickOption(RT_DC_HAMMER_FLOOR)); }) &&
                                           (Bombs || GoronBracelet) && CanJumpslash); /*todo add chu kill to tricks*/
                               }}),
              },
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp
index fc274f1b2..9b43ecff4 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp
@@ -1,10 +1,10 @@
 #include "../location_access.hpp"
 #include "../logic.hpp"
-#include "../entrance.hpp"
-#include "../dungeon.hpp"
+#include "../../entrance.h"
+#include "../../dungeon.h"
 
 using namespace Logic;
-using namespace Settings;
+using namespace Rando;
 
 void AreaTable_Init_FireTemple() {
   /*--------------------------
@@ -12,15 +12,15 @@ void AreaTable_Init_FireTemple() {
   ---------------------------*/
   areaTable[RR_FIRE_TEMPLE_ENTRYWAY] = Area("Fire Temple Entryway", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_FIRE_TEMPLE_FIRST_ROOM, {[]{return Dungeon::FireTemple.IsVanilla();}}),
-                  Entrance(RR_FIRE_TEMPLE_MQ_LOWER,   {[]{return Dungeon::FireTemple.IsMQ();}}),
+                  Entrance(RR_FIRE_TEMPLE_FIRST_ROOM, {[]{return randoCtx->GetDungeon(FIRE_TEMPLE)->IsVanilla();}}),
+                  Entrance(RR_FIRE_TEMPLE_MQ_LOWER,   {[]{return randoCtx->GetDungeon(FIRE_TEMPLE)->IsMQ();}}),
                   Entrance(RR_DMC_CENTRAL_LOCAL,      {[]{return true;}}),
   });
 
   /*--------------------------
   |     VANILLA DUNGEON      |
   ---------------------------*/
-  if (Dungeon::FireTemple.IsVanilla()) {
+  if (randoCtx->GetDungeon(FIRE_TEMPLE)->IsVanilla()) {
   areaTable[RR_FIRE_TEMPLE_FIRST_ROOM] = Area("Fire Temple First Room", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                 }, {
                   //Exits
@@ -40,7 +40,7 @@ void AreaTable_Init_FireTemple() {
                 }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_FIRST_ROOM, {[]{return true;}}),
-                  Entrance(RR_FIRE_TEMPLE_BOSS_ENTRYWAY, {[]{return BossKeyFireTemple && ((IsAdult && LogicFireBossDoorJump) || CanUse(RG_HOVER_BOOTS) || Here(RR_FIRE_TEMPLE_FIRE_MAZE_UPPER, []{return CanUse(RG_MEGATON_HAMMER);}));}}),
+                  Entrance(RR_FIRE_TEMPLE_BOSS_ENTRYWAY, {[]{return BossKeyFireTemple && ((IsAdult && randoCtx->GetTrickOption(RT_FIRE_BOSS_DOOR_JUMP)) || CanUse(RG_HOVER_BOOTS) || Here(RR_FIRE_TEMPLE_FIRE_MAZE_UPPER, []{return CanUse(RG_MEGATON_HAMMER);}));}}),
   });
 
   areaTable[RR_FIRE_TEMPLE_LOOP_ENEMIES] = Area("Fire Temple Loop Enemies", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
@@ -96,7 +96,7 @@ void AreaTable_Init_FireTemple() {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_FIRST_ROOM,                {[]{return SmallKeys(RR_FIRE_TEMPLE, 2);}}),
                   Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_GORON, {[]{return true;}}),
-                  Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_TILES, {[]{return IsAdult && (CanPlay(SongOfTime) || LogicFireSongOfTime);}}),
+                  Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_TILES, {[]{return IsAdult && (CanPlay(SongOfTime) || randoCtx->GetTrickOption(RT_FIRE_SOT));}}),
                   Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM_SOUTH_GORON, {[]{return IsAdult && HasExplosives;}}),
                   Entrance(RR_FIRE_TEMPLE_FIRE_PILLAR_ROOM,          {[]{return SmallKeys(RR_FIRE_TEMPLE, 3);}}),
   });
@@ -138,7 +138,7 @@ void AreaTable_Init_FireTemple() {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_FIRE_PILLAR_ROOM,   {[]{return SmallKeys(RR_FIRE_TEMPLE, 4);}}),
                   Entrance(RR_FIRE_TEMPLE_SHORTCUT_CLIMB,     {[]{return Here(RR_FIRE_TEMPLE_SHORTCUT_CLIMB, []{return true;});}}),
-                  Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER, {[]{return IsAdult && (GoronBracelet || LogicFireStrength) && (HasExplosives || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_SLINGSHOT));}}),
+                  Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER, {[]{return IsAdult && (GoronBracelet || randoCtx->GetTrickOption(RT_FIRE_STRENGTH)) && (HasExplosives || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_SLINGSHOT));}}),
   });
 
   areaTable[RR_FIRE_TEMPLE_SHORTCUT_CLIMB] = Area("Fire Temple Shortcut Climb", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
@@ -199,7 +199,7 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_SHORTCUT_CLIMB,     {[]{return HasExplosives;}}),
                   Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER, {[]{return true;}}),
                   Entrance(RR_FIRE_TEMPLE_FIRE_WALL_CHASE,    {[]{return true;}}),
-                  Entrance(RR_FIRE_TEMPLE_SCARECROW_ROOM,     {[]{return CanUse(RG_SCARECROW) || (LogicFireScarecrow && IsAdult && CanUse(RG_LONGSHOT));}}),
+                  Entrance(RR_FIRE_TEMPLE_SCARECROW_ROOM,     {[]{return CanUse(RG_SCARECROW) || (randoCtx->GetTrickOption(RT_FIRE_SCARECROW) && IsAdult && CanUse(RG_LONGSHOT));}}),
   });
 
   areaTable[RR_FIRE_TEMPLE_SCARECROW_ROOM] = Area("Fire Temple Scarecrow Room", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -233,7 +233,7 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_UPPER,     {[]{return CanUse(RG_HOVER_BOOTS);}}),
                   Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_SIDE_ROOM, {[]{return true;}}),
                   Entrance(RR_FIRE_TEMPLE_WEST_CENTRAL_LOWER,  {[]{return SmallKeys(RR_FIRE_TEMPLE, 8);}}),
-                  Entrance(RR_FIRE_TEMPLE_LATE_FIRE_MAZE,      {[]{return LogicFireFlameMaze || false;}}),
+                  Entrance(RR_FIRE_TEMPLE_LATE_FIRE_MAZE,      {[]{return randoCtx->GetTrickOption(RT_FIRE_FLAME_MAZE) || false;}}),
   });
 
   areaTable[RR_FIRE_TEMPLE_FIRE_MAZE_UPPER] = Area("Fire Temple Fire Maze Upper", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
@@ -253,7 +253,7 @@ void AreaTable_Init_FireTemple() {
 
   areaTable[RR_FIRE_TEMPLE_WEST_CENTRAL_LOWER] = Area("Fire Temple West Central Lower", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FIRE_TEMPLE_HIGHEST_GORON_CHEST, {[]{return Here(RR_FIRE_TEMPLE_WEST_CENTRAL_UPPER, []{return (CanPlay(SongOfTime) || LogicRustedSwitches) && CanUse(RG_MEGATON_HAMMER);});}}),
+                  LocationAccess(RC_FIRE_TEMPLE_HIGHEST_GORON_CHEST, {[]{return Here(RR_FIRE_TEMPLE_WEST_CENTRAL_UPPER, []{return (CanPlay(SongOfTime) || randoCtx->GetTrickOption(RT_RUSTED_SWITCHES)) && CanUse(RG_MEGATON_HAMMER);});}}),
                 }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_ROOM,     {[]{return SmallKeys(RR_FIRE_TEMPLE, 8);}}),
@@ -314,16 +314,16 @@ void AreaTable_Init_FireTemple() {
   /*---------------------------
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
-  if (Dungeon::FireTemple.IsMQ()) {
+  if (randoCtx->GetDungeon(FIRE_TEMPLE)->IsMQ()) {
   areaTable[RR_FIRE_TEMPLE_MQ_LOWER] = Area("Fire Temple MQ Lower", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST, {[]{return CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || Bombs || CanUse(RG_DINS_FIRE);}}),
-                  LocationAccess(RC_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST,     {[]{return IsAdult && (LogicFewerTunicRequirements || CanUse(RG_GORON_TUNIC)) && (((CanUse(RG_HOVER_BOOTS) || (LogicFireMQNearBoss && CanUse(RG_FAIRY_BOW))) && HasFireSource) || (CanUse(RG_HOOKSHOT) && CanUse(RG_FIRE_ARROWS) || (CanUse(RG_DINS_FIRE) && ((DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_QUADRUPLE) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OCTUPLE) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_SEXDECUPLE)) || CanUse(RG_GORON_TUNIC) || CanUse(RG_FAIRY_BOW) || CanUse(RG_LONGSHOT)))));}}),
+                  LocationAccess(RC_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST,     {[]{return IsAdult && (randoCtx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS) || CanUse(RG_GORON_TUNIC)) && (((CanUse(RG_HOVER_BOOTS) || (randoCtx->GetTrickOption(RT_FIRE_MQ_NEAR_BOSS) && CanUse(RG_FAIRY_BOW))) && HasFireSource) || (CanUse(RG_HOOKSHOT) && CanUse(RG_FIRE_ARROWS) || (CanUse(RG_DINS_FIRE) && ((randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_OHKO) && randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_QUADRUPLE) && randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_OCTUPLE) && randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_SEXDECUPLE)) || CanUse(RG_GORON_TUNIC) || CanUse(RG_FAIRY_BOW) || CanUse(RG_LONGSHOT)))));}}),
                     //Trick: IsAdult && (LogicFewerTunicRequirements || CanUse(RG_GORON_TUNIC)) && (((CanUse(RG_HOVER_BOOTS) || (LogicFireMQNearBoss && CanUse(RG_FAIRY_BOW))) && HasFireSource) || (CanUse(RG_HOOKSHOT) && CanUse(RG_FIRE_ARROWS) || (CanUse(RG_DINS_FIRE) && ((DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_QUADRUPLE) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OCTUPLE) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_SEXDECUPLE)) || CanUse(RG_GORON_TUNIC) || CanUse(RG_FAIRY_BOW) || CanUse(RG_LONGSHOT)))))
   }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_ENTRYWAY,             {[]{return true;}}),
-                  Entrance(RR_FIRE_TEMPLE_BOSS_ENTRYWAY,        {[]{return IsAdult && CanUse(RG_GORON_TUNIC) && CanUse(RG_MEGATON_HAMMER) && BossKeyFireTemple && ((HasFireSource && (LogicFireBossDoorJump || HoverBoots)) || HasAccessTo(RR_FIRE_TEMPLE_MQ_UPPER));}}),
+                  Entrance(RR_FIRE_TEMPLE_BOSS_ENTRYWAY,        {[]{return IsAdult && CanUse(RG_GORON_TUNIC) && CanUse(RG_MEGATON_HAMMER) && BossKeyFireTemple && ((HasFireSource && (randoCtx->GetTrickOption(RT_FIRE_BOSS_DOOR_JUMP) || HoverBoots)) || HasAccessTo(RR_FIRE_TEMPLE_MQ_UPPER));}}),
                   Entrance(RR_FIRE_TEMPLE_MQ_LOWER_LOCKED_DOOR, {[]{return SmallKeys(RR_FIRE_TEMPLE, 5) && (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD));}}),
                   Entrance(RR_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM,     {[]{return IsAdult && FireTimer >= 24 && CanUse(RG_MEGATON_HAMMER);}}),
   });
@@ -339,29 +339,29 @@ void AreaTable_Init_FireTemple() {
 
   areaTable[RR_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM] = Area("Fire Temple MQ Big Lava Room", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&FairyPot, {[]{return FairyPot || (HasFireSource && (Bow || LogicFireMQBKChest) && IsAdult && (CanUse(RG_HOOKSHOT) || LogicFireSongOfTime));}}),
+                  EventAccess(&FairyPot, {[]{return FairyPot || (HasFireSource && (Bow || randoCtx->GetTrickOption(RT_FIRE_MQ_BK_CHEST)) && IsAdult && (CanUse(RG_HOOKSHOT) || randoCtx->GetTrickOption(RT_FIRE_SOT)));}}),
                     //Trick: HasFireSource && (Bow || LogicFireMQBKChest) && IsAdult && (CanUse(RG_HOOKSHOT) || LogicFireSongOfTime)
   }, {
                   //Locations
-                  LocationAccess(RC_FIRE_TEMPLE_MQ_BOSS_KEY_CHEST,                   {[]{return HasFireSource && (Bow || LogicFireMQBKChest) && IsAdult && CanUse(RG_HOOKSHOT);}}),
+                  LocationAccess(RC_FIRE_TEMPLE_MQ_BOSS_KEY_CHEST,                   {[]{return HasFireSource && (Bow || randoCtx->GetTrickOption(RT_FIRE_MQ_BK_CHEST)) && IsAdult && CanUse(RG_HOOKSHOT);}}),
                     //Trick: HasFireSource && (Bow || LogicFireMQBKChest) && IsAdult && CanUse(RG_HOOKSHOT)
-                  LocationAccess(RC_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST, {[]{return HasFireSource && HasExplosives && IsAdult && (CanUse(RG_HOOKSHOT) || LogicFireMQBlockedChest);}}),
+                  LocationAccess(RC_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST, {[]{return HasFireSource && HasExplosives && IsAdult && (CanUse(RG_HOOKSHOT) || randoCtx->GetTrickOption(RT_FIRE_MQ_BLOCKED_CHEST));}}),
                     //Trick: HasFireSource && HasExplosives && IsAdult && (CanUse(RG_HOOKSHOT) || LogicFireMQBlockedChest)
                   LocationAccess(RC_FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR,       {[]{return true;}}),
   }, {
                   //Exits
-                  Entrance(RR_FIRE_TEMPLE_MQ_LOWER_MAZE, {[]{return IsAdult && CanUse(RG_GORON_TUNIC) && SmallKeys(RR_FIRE_TEMPLE, 2) && (HasFireSource || (LogicFireMQClimb && HoverBoots));}}),
+                  Entrance(RR_FIRE_TEMPLE_MQ_LOWER_MAZE, {[]{return IsAdult && CanUse(RG_GORON_TUNIC) && SmallKeys(RR_FIRE_TEMPLE, 2) && (HasFireSource || (randoCtx->GetTrickOption(RT_FIRE_MQ_CLIMB) && HoverBoots));}}),
                     //Trick: IsAdult && CanUse(RG_GORON_TUNIC) && SmallKeys(RR_FIRE_TEMPLE, 2) && (HasFireSource || (LogicFireMQClimb && HoverBoots))
   });
 
   areaTable[RR_FIRE_TEMPLE_MQ_LOWER_MAZE] = Area("Fire Temple MQ Lower Maze", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST,     {[]{return CanUse(RG_MASTER_SWORD) || CanUse(RG_KOKIRI_SWORD) || CanUse(RG_BIGGORON_SWORD);}}),
-                  LocationAccess(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST, {[]{return HasExplosives && (LogicFireMQMazeSideRoom || HasAccessTo(RR_FIRE_TEMPLE_MQ_UPPER_MAZE));}}),
+                  LocationAccess(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST, {[]{return HasExplosives && (randoCtx->GetTrickOption(RT_FIRE_MQ_MAZE_SIDE_ROOM) || HasAccessTo(RR_FIRE_TEMPLE_MQ_UPPER_MAZE));}}),
                     //Trick: HasExplosives && (LogicFireMQMazeSideRoom || FIRE_TEMPLE_MQ_UPPER_MAZE.Adult())
    }, {
                   //Exits
-                  Entrance(RR_FIRE_TEMPLE_MQ_UPPER_MAZE, {[]{return (IsAdult && ((HasExplosives && CanUse(RG_HOOKSHOT)) || (LogicFireMQMazeHovers && CanUse(RG_HOVER_BOOTS)))) || LogicFireMQMazeJump;}}),
+                  Entrance(RR_FIRE_TEMPLE_MQ_UPPER_MAZE, {[]{return (IsAdult && ((HasExplosives && CanUse(RG_HOOKSHOT)) || (randoCtx->GetTrickOption(RT_FIRE_MQ_MAZE_HOVERS) && CanUse(RG_HOVER_BOOTS)))) || randoCtx->GetTrickOption(RT_FIRE_MQ_MAZE_JUMP);}}),
                     //Trick: (IsAdult && ((HasExplosives && CanUse(RG_HOOKSHOT)) || (LogicFireMQMazeHovers && CanUse(RG_HOVER_BOOTS)))) || LogicFireMQMazeJump
   });
 
@@ -381,14 +381,14 @@ void AreaTable_Init_FireTemple() {
 
   areaTable[RR_FIRE_TEMPLE_MQ_UPPER] = Area("Fire Temple MQ Upper", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FIRE_TEMPLE_MQ_FREESTANDING_KEY,            {[]{return ((CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOOMERANG)) && CanUse(RG_HOOKSHOT)) || LogicFireMQFlameMaze;}}),
+                  LocationAccess(RC_FIRE_TEMPLE_MQ_FREESTANDING_KEY,            {[]{return ((CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOOMERANG)) && CanUse(RG_HOOKSHOT)) || randoCtx->GetTrickOption(RT_FIRE_MQ_FLAME_MAZE);}}),
                     //Trick: (IsAdult && CanUse(RG_HOOKSHOT)) || LogicFireMQFlameMaze
-                  LocationAccess(RC_FIRE_TEMPLE_MQ_CHEST_ON_FIRE,               {[]{return ((IsAdult && CanUse(RG_HOOKSHOT)) || LogicFireMQFlameMaze) && SmallKeys(RR_FIRE_TEMPLE, 4);}}),
+                  LocationAccess(RC_FIRE_TEMPLE_MQ_CHEST_ON_FIRE,               {[]{return ((IsAdult && CanUse(RG_HOOKSHOT)) || randoCtx->GetTrickOption(RT_FIRE_MQ_FLAME_MAZE)) && SmallKeys(RR_FIRE_TEMPLE, 4);}}),
                     //Trick: ((IsAdult && CanUse(RG_HOOKSHOT)) || LogicFireMQFlameMaze) && SmallKeys(RR_FIRE_TEMPLE, 4)
-                  LocationAccess(RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM, {[]{return CanPlay(SongOfTime) || HoverBoots || LogicFireMQFlameMaze;}}),
+                  LocationAccess(RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM, {[]{return CanPlay(SongOfTime) || HoverBoots || randoCtx->GetTrickOption(RT_FIRE_MQ_FLAME_MAZE);}}),
                     //Trick: CanPlay(SongOfTime) || HoverBoots || LogicFireMQFlameMaze
                   LocationAccess(RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER,    {[]{return HasExplosives;}}),
-                  LocationAccess(RC_FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE,     {[]{return (IsAdult && CanUse(RG_HOOKSHOT) && SmallKeys(RR_FIRE_TEMPLE, 5)) || (LogicFireMQAboveMazeGS && IsAdult && CanUse(RG_LONGSHOT));}}),
+                  LocationAccess(RC_FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE,     {[]{return (IsAdult && CanUse(RG_HOOKSHOT) && SmallKeys(RR_FIRE_TEMPLE, 5)) || (randoCtx->GetTrickOption(RT_FIRE_MQ_ABOVE_MAZE_GS) && IsAdult && CanUse(RG_LONGSHOT));}}),
                     //Trick: (IsAdult && CanUse(RG_HOOKSHOT) && SmallKeys(RR_FIRE_TEMPLE, 5)) || (LogicFireMQAboveMazeGS && IsAdult && CanUse(RG_LONGSHOT))
   }, {});
   }
@@ -400,8 +400,8 @@ void AreaTable_Init_FireTemple() {
         Area("Fire Temple Boss Entryway", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
              {
                  // Exits
-                 Entrance(RR_FIRE_TEMPLE_NEAR_BOSS_ROOM, { [] { return Dungeon::FireTemple.IsVanilla() && false; } }),
-                 Entrance(RR_FIRE_TEMPLE_MQ_LOWER, { [] { return Dungeon::FireTemple.IsMQ() && false; } }),
+                 Entrance(RR_FIRE_TEMPLE_NEAR_BOSS_ROOM, { [] { return randoCtx->GetDungeon(FIRE_TEMPLE)->IsVanilla() && false; } }),
+                 Entrance(RR_FIRE_TEMPLE_MQ_LOWER, { [] { return randoCtx->GetDungeon(FIRE_TEMPLE)->IsMQ() && false; } }),
                  Entrance(RR_FIRE_TEMPLE_BOSS_ROOM, { [] { return true; } }),
              });
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp
index 46eb64343..1f542e0e9 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp
@@ -1,10 +1,10 @@
 #include "../location_access.hpp"
 #include "../logic.hpp"
-#include "../entrance.hpp"
-#include "../dungeon.hpp"
+#include "../../entrance.h"
+#include "../../dungeon.h"
 
 using namespace Logic;
-using namespace Settings;
+using namespace Rando;
 
 void AreaTable_Init_ForestTemple() {
   /*--------------------------
@@ -12,19 +12,19 @@ void AreaTable_Init_ForestTemple() {
   ---------------------------*/
   areaTable[RR_FOREST_TEMPLE_ENTRYWAY] = Area("Forest Temple Entryway", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_FOREST_TEMPLE_FIRST_ROOM, {[]{return Dungeon::ForestTemple.IsVanilla();}}),
-                  Entrance(RR_FOREST_TEMPLE_MQ_LOBBY,   {[]{return Dungeon::ForestTemple.IsMQ();}}),
+                  Entrance(RR_FOREST_TEMPLE_FIRST_ROOM, {[]{return randoCtx->GetDungeon(FOREST_TEMPLE)->IsVanilla();}}),
+                  Entrance(RR_FOREST_TEMPLE_MQ_LOBBY,   {[]{return randoCtx->GetDungeon(FOREST_TEMPLE)->IsMQ();}}),
                   Entrance(RR_SACRED_FOREST_MEADOW,     {[]{return true;}}),
   });
 
   /*--------------------------
   |     VANILLA DUNGEON      |
   ---------------------------*/
-  if (Dungeon::ForestTemple.IsVanilla()) {
+  if (randoCtx->GetDungeon(FOREST_TEMPLE)->IsVanilla()) {
   areaTable[RR_FOREST_TEMPLE_FIRST_ROOM] = Area("Forest Temple First Room", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_FOREST_TEMPLE_FIRST_ROOM_CHEST, {[]{return true;}}),
-                  LocationAccess(RC_FOREST_TEMPLE_GS_FIRST_ROOM,    {[]{return (IsAdult && Bombs) || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_BOOMERANG) || CanUse(RG_FAIRY_SLINGSHOT) || HasBombchus || CanUse(RG_DINS_FIRE) || (LogicForestFirstGS && (CanJumpslash || (IsChild && Bombs)));}}),
+                  LocationAccess(RC_FOREST_TEMPLE_GS_FIRST_ROOM,    {[]{return (IsAdult && Bombs) || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_BOOMERANG) || CanUse(RG_FAIRY_SLINGSHOT) || HasBombchus || CanUse(RG_DINS_FIRE) || (randoCtx->GetTrickOption(RT_FOREST_FIRST_GS) && (CanJumpslash || (IsChild && Bombs)));}}),
                 }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_ENTRYWAY,       {[]{return true;}}),
@@ -106,12 +106,12 @@ void AreaTable_Init_ForestTemple() {
                   EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_MEGATON_HAMMER) || HasExplosives || CanUse(RG_DINS_FIRE));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST, {[]{return CanUse(RG_HOOKSHOT) || HasAccessTo(RR_FOREST_TEMPLE_FALLING_ROOM) || (HasAccessTo(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER) && IsAdult && LogicForestOutdoorsLedge && HoverBoots);}}),
-                  LocationAccess(RC_FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD,    {[]{return CanUse(RG_HOOKSHOT) || (LogicForestOutdoorEastGS && CanUse(RG_BOOMERANG)) || Here(RR_FOREST_TEMPLE_FALLING_ROOM, []{return CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_DINS_FIRE) || HasExplosives;});}}),
+                  LocationAccess(RC_FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST, {[]{return CanUse(RG_HOOKSHOT) || HasAccessTo(RR_FOREST_TEMPLE_FALLING_ROOM) || (HasAccessTo(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER) && IsAdult && randoCtx->GetTrickOption(RT_FOREST_OUTDOORS_LEDGE) && HoverBoots);}}),
+                  LocationAccess(RC_FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD,    {[]{return CanUse(RG_HOOKSHOT) || (randoCtx->GetTrickOption(RT_FOREST_OUTDOORS_EAST_GS) && CanUse(RG_BOOMERANG)) || Here(RR_FOREST_TEMPLE_FALLING_ROOM, []{return CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_DINS_FIRE) || HasExplosives;});}}),
                 }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_LOBBY,             {[]{return true;}}),
-                  Entrance(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER, {[]{return CanUse(RG_LONGSHOT) || (LogicForestVines && CanUse(RG_HOOKSHOT));}}),
+                  Entrance(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER, {[]{return CanUse(RG_LONGSHOT) || (randoCtx->GetTrickOption(RT_FOREST_VINES) && CanUse(RG_HOOKSHOT));}}),
                   Entrance(RR_FOREST_TEMPLE_SEWER,             {[]{return GoldScale || CanUse(RG_IRON_BOOTS) || HasAccessTo(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER);}}),
                   Entrance(RR_FOREST_TEMPLE_FALLING_ROOM,      {[]{return false;}}),
   });
@@ -124,7 +124,7 @@ void AreaTable_Init_ForestTemple() {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_NE_OUTDOORS_LOWER, {[]{return true;}}),
                   Entrance(RR_FOREST_TEMPLE_MAP_ROOM,          {[]{return true;}}),
-                  Entrance(RR_FOREST_TEMPLE_FALLING_ROOM,      {[]{return LogicForestDoorFrame && CanJumpslash && CanUse(RG_HOVER_BOOTS) && CanUse(RG_SCARECROW);}}),
+                  Entrance(RR_FOREST_TEMPLE_FALLING_ROOM,      {[]{return randoCtx->GetTrickOption(RT_FOREST_DOORFRAME) && CanJumpslash && CanUse(RG_HOVER_BOOTS) && CanUse(RG_SCARECROW);}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_MAP_ROOM] = Area("Forest Temple Map Room", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -170,7 +170,7 @@ void AreaTable_Init_ForestTemple() {
                 }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_WEST_CORRIDOR,            {[]{return true;}}),
-                  Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER,        {[]{return CanUse(RG_HOVER_BOOTS) || (LogicForestOutsideBackdoor && CanJumpslash && GoronBracelet);}}),
+                  Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER,        {[]{return CanUse(RG_HOVER_BOOTS) || (randoCtx->GetTrickOption(RT_FOREST_OUTSIDE_BACKDOOR) && CanJumpslash && GoronBracelet);}}),
                   Entrance(RR_FOREST_TEMPLE_NW_CORRIDOR_TWISTED,      {[]{return IsAdult && GoronBracelet && SmallKeys(RR_FOREST_TEMPLE, 2);}}),
                   Entrance(RR_FOREST_TEMPLE_NW_CORRIDOR_STRAIGHTENED, {[]{return (CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT)) && GoronBracelet && SmallKeys(RR_FOREST_TEMPLE, 2);}}),
   });
@@ -279,7 +279,7 @@ void AreaTable_Init_ForestTemple() {
   /*---------------------------
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
-  if (Dungeon::ForestTemple.IsMQ()) {
+  if (randoCtx->GetDungeon(FOREST_TEMPLE)->IsMQ()) {
   areaTable[RR_FOREST_TEMPLE_MQ_LOBBY] = Area("Forest Temple MQ Lobby", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST, {[]{return CanJumpslash || Bombs || CanUse(RG_STICKS) || Nuts || HookshotOrBoomerang || CanUse(RG_DINS_FIRE) || KokiriSword || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOVER_BOOTS);}}),
@@ -301,9 +301,9 @@ void AreaTable_Init_ForestTemple() {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_MQ_NW_OUTDOORS,        {[]{return CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT);}}),
                   Entrance(RR_FOREST_TEMPLE_MQ_NE_OUTDOORS,        {[]{return CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT);}}), //This is as far as child can get
-                  Entrance(RR_FOREST_TEMPLE_MQ_AFTER_BLOCK_PUZZLE, {[]{return IsAdult && (GoronBracelet || (LogicForestMQBlockPuzzle && HasBombchus && IsAdult && CanUse(RG_HOOKSHOT)));}}),
+                  Entrance(RR_FOREST_TEMPLE_MQ_AFTER_BLOCK_PUZZLE, {[]{return IsAdult && (GoronBracelet || (randoCtx->GetTrickOption(RT_FOREST_MQ_BLOCK_PUZZLE) && HasBombchus && IsAdult && CanUse(RG_HOOKSHOT)));}}),
                     //Trick: IsAdult && (GoronBracelet || (LogicForestMQBlockPuzzle && HasBombchus && IsAdult && CanUse(RG_HOOKSHOT)))
-                  Entrance(RR_FOREST_TEMPLE_MQ_OUTDOOR_LEDGE,      {[]{return (LogicForestMQHallwaySwitchJS && IsAdult && CanUse(RG_HOVER_BOOTS)) || (LogicForestMQHallwaySwitchBoomerang && CanUse(RG_BOOMERANG)) || (LogicForestMQHallwaySwitchHookshot && IsAdult && CanUse(RG_HOOKSHOT));}}),
+                  Entrance(RR_FOREST_TEMPLE_MQ_OUTDOOR_LEDGE,      {[]{return (randoCtx->GetTrickOption(RT_FOREST_MQ_JS_HALLWAY_SWITCH) && IsAdult && CanUse(RG_HOVER_BOOTS)) || (randoCtx->GetTrickOption(RT_FOREST_MQ_RANG_HALLWAY_SWITCH) && CanUse(RG_BOOMERANG)) || (randoCtx->GetTrickOption(RT_FOREST_MQ_HOOKSHOT_HALLWAY_SWITCH) && IsAdult && CanUse(RG_HOOKSHOT));}}),
                     //Trick (Hookshot trick not added to either n64 or oot3d rando as of yet, to enable in SoH needs uncommenting in randomizer_tricks.cpp): (LogicForestMQHallwaySwitchJS && IsAdult && CanUse(RG_HOVER_BOOTS)) || (LogicForestMQHallwaySwitchHookshot && IsAdult && CanUse(RG_HOOKSHOT)) 
                   Entrance(RR_FOREST_TEMPLE_MQ_BOSS_REGION,        {[]{return ForestTempleJoAndBeth && ForestTempleAmyAndMeg;}}),
   });
@@ -314,7 +314,7 @@ void AreaTable_Init_ForestTemple() {
   }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_MQ_BOW_REGION,    {[]{return SmallKeys(RR_FOREST_TEMPLE, 4);}}),
-                  Entrance(RR_FOREST_TEMPLE_MQ_OUTDOOR_LEDGE, {[]{return  SmallKeys(RR_FOREST_TEMPLE, 3) || (LogicForestMQHallwaySwitchJS && ((IsAdult && CanUse(RG_HOOKSHOT)) || (LogicForestOutsideBackdoor && (IsAdult || (IsChild && CanUse(RG_STICKS))))));}}),
+                  Entrance(RR_FOREST_TEMPLE_MQ_OUTDOOR_LEDGE, {[]{return  SmallKeys(RR_FOREST_TEMPLE, 3) || (randoCtx->GetTrickOption(RT_FOREST_MQ_JS_HALLWAY_SWITCH) && ((IsAdult && CanUse(RG_HOOKSHOT)) || (randoCtx->GetTrickOption(RT_FOREST_OUTSIDE_BACKDOOR) && (IsAdult || (IsChild && CanUse(RG_STICKS))))));}}),
                     //Trick (Doing the hallway switch jumpslash as child requires sticks and has been added above): SmallKeys(RR_FOREST_TEMPLE, 3) || (LogicForestMQHallwaySwitchJS && ((IsAdult && CanUse(RG_HOOKSHOT)) || LogicForestOutsideBackdoor))
                   Entrance(RR_FOREST_TEMPLE_MQ_NW_OUTDOORS,   {[]{return SmallKeys(RR_FOREST_TEMPLE, 2);}}),
   });
@@ -332,7 +332,7 @@ void AreaTable_Init_ForestTemple() {
                   LocationAccess(RC_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD, {[]{return CanAdultAttack || CanChildAttack;}}),
   }, {
                   //Exits
-                  Entrance(RR_FOREST_TEMPLE_MQ_NE_OUTDOORS,         {[]{return (IsAdult && (CanUse(RG_IRON_BOOTS) || CanUse(RG_LONGSHOT) || (LogicForestMQWellSwim && CanUse(RG_HOOKSHOT)))) || ProgressiveScale >= 2;}}),
+                  Entrance(RR_FOREST_TEMPLE_MQ_NE_OUTDOORS,         {[]{return (IsAdult && (CanUse(RG_IRON_BOOTS) || CanUse(RG_LONGSHOT) || (randoCtx->GetTrickOption(RT_FOREST_MQ_WELL_SWIM) && CanUse(RG_HOOKSHOT)))) || ProgressiveScale >= 2;}}),
                     //Trick: (IsAdult && (CanUse(RG_IRON_BOOTS) || CanUse(RG_LONGSHOT) || (LogicForestMQWellSwim && CanUse(RG_HOOKSHOT)))) || ProgressiveScale >= 2
                   Entrance(RR_FOREST_TEMPLE_MQ_OUTDOORS_TOP_LEDGES, {[]{return IsAdult && CanUse(RG_FIRE_ARROWS);}}),
   });
@@ -344,7 +344,7 @@ void AreaTable_Init_ForestTemple() {
   }, {
                   //Locations
                   LocationAccess(RC_FOREST_TEMPLE_MQ_WELL_CHEST,                 {[]{return (IsAdult && CanUse(RG_FAIRY_BOW)) || (IsChild && CanUse(RG_FAIRY_SLINGSHOT));}}),
-                  LocationAccess(RC_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD, {[]{return HookshotOrBoomerang || (IsAdult && CanUse(RG_FIRE_ARROWS) && (CanPlay(SongOfTime) || (CanUse(RG_HOVER_BOOTS) && LogicForestDoorFrame)));}}),
+                  LocationAccess(RC_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD, {[]{return HookshotOrBoomerang || (IsAdult && CanUse(RG_FIRE_ARROWS) && (CanPlay(SongOfTime) || (CanUse(RG_HOVER_BOOTS) && randoCtx->GetTrickOption(RT_FOREST_DOORFRAME))));}}),
                   LocationAccess(RC_FOREST_TEMPLE_MQ_GS_WELL,                    {[]{return (IsAdult && ((CanUse(RG_IRON_BOOTS) && CanUse(RG_HOOKSHOT)) || CanUse(RG_FAIRY_BOW))) || (IsChild && CanUse(RG_FAIRY_SLINGSHOT));}}),
   }, {
                   //Exits
@@ -358,7 +358,7 @@ void AreaTable_Init_ForestTemple() {
   }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_MQ_NE_OUTDOORS,       {[]{return true;}}),
-                  Entrance(RR_FOREST_TEMPLE_MQ_NE_OUTDOORS_LEDGE, {[]{return LogicForestOutdoorsLedge && IsAdult && CanUse(RG_HOVER_BOOTS);}}),
+                  Entrance(RR_FOREST_TEMPLE_MQ_NE_OUTDOORS_LEDGE, {[]{return randoCtx->GetTrickOption(RT_FOREST_OUTDOORS_LEDGE) && IsAdult && CanUse(RG_HOVER_BOOTS);}}),
                     //Trick: LogicForestOutdoorsLedge && IsAdult && CanUse(RG_HOVER_BOOTS)
   });
 
@@ -411,8 +411,8 @@ void AreaTable_Init_ForestTemple() {
         Area("Forest Temple Boss Entryway", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
              {
                  // Exits
-                 Entrance(RR_FOREST_TEMPLE_BOSS_REGION, { [] { return Dungeon::ForestTemple.IsVanilla() && false; } }),
-                 Entrance(RR_FOREST_TEMPLE_MQ_BOSS_REGION, { [] { return Dungeon::ForestTemple.IsMQ() && false; } }),
+                 Entrance(RR_FOREST_TEMPLE_BOSS_REGION, { [] { return randoCtx->GetDungeon(FOREST_TEMPLE)->IsVanilla() && false; } }),
+                 Entrance(RR_FOREST_TEMPLE_MQ_BOSS_REGION, { [] { return randoCtx->GetDungeon(FOREST_TEMPLE)->IsMQ() && false; } }),
                  Entrance(RR_FOREST_TEMPLE_BOSS_ROOM, { [] { return true; } }),
              });
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
index 63365b178..3538b567f 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
@@ -1,11 +1,11 @@
 #include "../location_access.hpp"
 #include "../logic.hpp"
-#include "../entrance.hpp"
-#include "../dungeon.hpp"
-#include "../trial.hpp"
+#include "../../entrance.h"
+#include "../../dungeon.h"
+#include "../../trial.h"
 
 using namespace Logic;
-using namespace Settings;
+using namespace Rando;
 
 void AreaTable_Init_GanonsCastle() {
   /*--------------------------
@@ -13,15 +13,15 @@ void AreaTable_Init_GanonsCastle() {
   ---------------------------*/
   areaTable[RR_GANONS_CASTLE_ENTRYWAY] = Area("Ganon's Castle Entryway", "Ganon's Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_GANONS_CASTLE_LOBBY,    {[]{return Dungeon::GanonsCastle.IsVanilla();}}),
-                  Entrance(RR_GANONS_CASTLE_MQ_LOBBY, {[]{return Dungeon::GanonsCastle.IsMQ();}}),
+                  Entrance(RR_GANONS_CASTLE_LOBBY,    {[]{return randoCtx->GetDungeon(GANONS_CASTLE)->IsVanilla();}}),
+                  Entrance(RR_GANONS_CASTLE_MQ_LOBBY, {[]{return randoCtx->GetDungeon(GANONS_CASTLE)->IsMQ();}}),
                   Entrance(RR_CASTLE_GROUNDS_FROM_GANONS_CASTLE,    {[]{return true;}}),
   });
 
   /*--------------------------
   |     VANILLA DUNGEON      |
   ---------------------------*/
-  if (Dungeon::GanonsCastle.IsVanilla()) {
+  if (randoCtx->GetDungeon(GANONS_CASTLE)->IsVanilla()) {
   areaTable[RR_GANONS_CASTLE_LOBBY] = Area("Ganon's Castle Lobby", "Ganon's Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_SHEIK_HINT_GC,  {[]{return true;}}), 
@@ -34,13 +34,13 @@ void AreaTable_Init_GanonsCastle() {
                   Entrance(RR_GANONS_CASTLE_SHADOW_TRIAL, {[]{return true;}}),
                   Entrance(RR_GANONS_CASTLE_SPIRIT_TRIAL, {[]{return true;}}),
                   Entrance(RR_GANONS_CASTLE_LIGHT_TRIAL,  {[]{return CanUse(RG_GOLDEN_GAUNTLETS);}}),
-                  Entrance(RR_GANONS_CASTLE_TOWER,        {[]{return (ForestTrialClear || Trial::ForestTrial.IsSkipped()) &&
-                                                                         (FireTrialClear   || Trial::FireTrial.IsSkipped())   &&
-                                                                         (WaterTrialClear  || Trial::WaterTrial.IsSkipped())  &&
-                                                                         (ShadowTrialClear || Trial::ShadowTrial.IsSkipped()) &&
-                                                                         (SpiritTrialClear || Trial::SpiritTrial.IsSkipped()) &&
-                                                                         (LightTrialClear  || Trial::LightTrial.IsSkipped());}}),
-                  Entrance(RR_GANONS_CASTLE_DEKU_SCRUBS,  {[]{return LogicLensCastle || CanUse(RG_LENS_OF_TRUTH);}}),
+                  Entrance(RR_GANONS_CASTLE_TOWER,        {[]{return (ForestTrialClear || randoCtx->GetTrial(Rando::FOREST_TRIAL)->IsSkipped()) &&
+                                                                         (FireTrialClear   || randoCtx->GetTrial(Rando::FIRE_TRIAL)->IsSkipped())   &&
+                                                                         (WaterTrialClear  || randoCtx->GetTrial(Rando::WATER_TRIAL)->IsSkipped())  &&
+                                                                         (ShadowTrialClear || randoCtx->GetTrial(Rando::SHADOW_TRIAL)->IsSkipped()) &&
+                                                                         (SpiritTrialClear || randoCtx->GetTrial(Rando::SPIRIT_TRIAL)->IsSkipped()) &&
+                                                                         (LightTrialClear  || randoCtx->GetTrial(Rando::LIGHT_TRIAL)->IsSkipped());}}),
+                  Entrance(RR_GANONS_CASTLE_DEKU_SCRUBS,  {[]{return randoCtx->GetTrickOption(RT_LENS_GANON) || CanUse(RG_LENS_OF_TRUTH);}}),
   });
 
   areaTable[RR_GANONS_CASTLE_DEKU_SCRUBS] = Area("Ganon's Castle Deku Scrubs", "Ganon's Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
@@ -80,7 +80,7 @@ void AreaTable_Init_GanonsCastle() {
 
   areaTable[RR_GANONS_CASTLE_SHADOW_TRIAL] = Area("Ganon's Castle Shadow Trial", "Ganon's Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&ShadowTrialClear, {[]{return CanUse(RG_LIGHT_ARROWS) && CanUse(RG_MEGATON_HAMMER) && ((FireArrows && (LogicLensCastle || CanUse(RG_LENS_OF_TRUTH))) || (CanUse(RG_LONGSHOT) && (CanUse(RG_HOVER_BOOTS) || (DinsFire && (LogicLensCastle || CanUse(RG_LENS_OF_TRUTH))))));}}),
+                  EventAccess(&ShadowTrialClear, {[]{return CanUse(RG_LIGHT_ARROWS) && CanUse(RG_MEGATON_HAMMER) && ((FireArrows && (randoCtx->GetTrickOption(RT_LENS_GANON) || CanUse(RG_LENS_OF_TRUTH))) || (CanUse(RG_LONGSHOT) && (CanUse(RG_HOVER_BOOTS) || (DinsFire && (randoCtx->GetTrickOption(RT_LENS_GANON) || CanUse(RG_LENS_OF_TRUTH))))));}}),
                 }, {
                   //Locations
                   LocationAccess(RC_GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST,            {[]{return CanUse(RG_FIRE_ARROWS) || CanUse(RG_HOOKSHOT) || CanUse(RG_HOVER_BOOTS) || CanPlay(SongOfTime) || IsChild;}}),
@@ -89,17 +89,17 @@ void AreaTable_Init_GanonsCastle() {
 
   areaTable[RR_GANONS_CASTLE_SPIRIT_TRIAL] = Area("Ganon's Castle Spirit Trial", "Ganon's Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&NutPot,           {[]{return NutPot || (((LogicSpiritTrialHookshot && CanJumpslash) || CanUse(RG_HOOKSHOT)) && HasBombchus && CanUse(RG_FAIRY_BOW) && (CanUse(RG_MIRROR_SHIELD) || (SunlightArrows && CanUse(RG_LIGHT_ARROWS))));}}),
-                  EventAccess(&SpiritTrialClear, {[]{return CanUse(RG_LIGHT_ARROWS) && (CanUse(RG_MIRROR_SHIELD) || SunlightArrows) && HasBombchus && ((LogicSpiritTrialHookshot && CanJumpslash) || CanUse(RG_HOOKSHOT));}}),
+                  EventAccess(&NutPot,           {[]{return NutPot || (((randoCtx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) && CanJumpslash) || CanUse(RG_HOOKSHOT)) && HasBombchus && CanUse(RG_FAIRY_BOW) && (CanUse(RG_MIRROR_SHIELD) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && CanUse(RG_LIGHT_ARROWS))));}}),
+                  EventAccess(&SpiritTrialClear, {[]{return CanUse(RG_LIGHT_ARROWS) && (CanUse(RG_MIRROR_SHIELD) || randoCtx->GetOption(RSK_SUNLIGHT_ARROWS)) && HasBombchus && ((randoCtx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) && CanJumpslash) || CanUse(RG_HOOKSHOT));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST, {[]{return (LogicSpiritTrialHookshot || CanUse(RG_HOOKSHOT)) && CanJumpslash;}}),
-                  LocationAccess(RC_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST,      {[]{return (LogicSpiritTrialHookshot || CanUse(RG_HOOKSHOT)) && HasBombchus && (LogicLensCastle || CanUse(RG_LENS_OF_TRUTH));}}),
+                  LocationAccess(RC_GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST, {[]{return (randoCtx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) || CanUse(RG_HOOKSHOT)) && CanJumpslash;}}),
+                  LocationAccess(RC_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST,      {[]{return (randoCtx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) || CanUse(RG_HOOKSHOT)) && HasBombchus && (randoCtx->GetTrickOption(RT_LENS_GANON) || CanUse(RG_LENS_OF_TRUTH));}}),
   }, {});
 
   areaTable[RR_GANONS_CASTLE_LIGHT_TRIAL] = Area("Ganon's Castle Light Trial", "Ganon's Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&LightTrialClear, {[]{return CanUse(RG_LIGHT_ARROWS) && CanUse(RG_HOOKSHOT) && SmallKeys(RR_GANONS_CASTLE, 2) && (LogicLensCastle || CanUse(RG_LENS_OF_TRUTH));}}),
+                  EventAccess(&LightTrialClear, {[]{return CanUse(RG_LIGHT_ARROWS) && CanUse(RG_HOOKSHOT) && SmallKeys(RR_GANONS_CASTLE, 2) && (randoCtx->GetTrickOption(RT_LENS_GANON) || CanUse(RG_LENS_OF_TRUTH));}}),
                 }, {
                   //Locations
                   LocationAccess(RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST,        {[]{return true;}}),
@@ -108,7 +108,7 @@ void AreaTable_Init_GanonsCastle() {
                   LocationAccess(RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST,       {[]{return true;}}),
                   LocationAccess(RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST,      {[]{return true;}}),
                   LocationAccess(RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST,       {[]{return true;}}),
-                  LocationAccess(RC_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST, {[]{return LogicLensCastle || CanUse(RG_LENS_OF_TRUTH);}}),
+                  LocationAccess(RC_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST, {[]{return randoCtx->GetTrickOption(RT_LENS_GANON) || CanUse(RG_LENS_OF_TRUTH);}}),
                   LocationAccess(RC_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST,           {[]{return CanPlay(ZeldasLullaby) && SmallKeys(RR_GANONS_CASTLE, 1);}}),
   }, {});
   }
@@ -123,7 +123,7 @@ void AreaTable_Init_GanonsCastle() {
   /*---------------------------
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
-  if (Dungeon::GanonsCastle.IsMQ()) {
+  if (randoCtx->GetDungeon(GANONS_CASTLE)->IsMQ()) {
   areaTable[RR_GANONS_CASTLE_MQ_LOBBY] = Area("Ganon's Castle MQ Lobby", "Ganons Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_SHEIK_HINT_MQ_GC,  {[]{return true;}}),
@@ -136,13 +136,13 @@ void AreaTable_Init_GanonsCastle() {
                   Entrance(RR_GANONS_CASTLE_MQ_SHADOW_TRIAL, {[]{return true;}}),
                   Entrance(RR_GANONS_CASTLE_MQ_SPIRIT_TRIAL, {[]{return true;}}),
                   Entrance(RR_GANONS_CASTLE_MQ_LIGHT_TRIAL,  {[]{return CanUse(RG_GOLDEN_GAUNTLETS);}}),
-                  Entrance(RR_GANONS_CASTLE_TOWER,           {[]{return (ForestTrialClear || Trial::ForestTrial.IsSkipped()) &&
-                                                                            (FireTrialClear   || Trial::FireTrial.IsSkipped())   &&
-                                                                            (WaterTrialClear  || Trial::WaterTrial.IsSkipped())  &&
-                                                                            (ShadowTrialClear || Trial::ShadowTrial.IsSkipped()) &&
-                                                                            (SpiritTrialClear || Trial::SpiritTrial.IsSkipped()) &&
-                                                                            (LightTrialClear  || Trial::LightTrial.IsSkipped());}}),
-                  Entrance(RR_GANONS_CASTLE_MQ_DEKU_SCRUBS,  {[]{return LogicLensCastleMQ || CanUse(RG_LENS_OF_TRUTH);}}),
+                  Entrance(RR_GANONS_CASTLE_TOWER,           {[]{return (ForestTrialClear || randoCtx->GetTrial(Rando::FOREST_TRIAL)->IsSkipped()) &&
+                                                                            (FireTrialClear   || randoCtx->GetTrial(Rando::FIRE_TRIAL)->IsSkipped())   &&
+                                                                            (WaterTrialClear  || randoCtx->GetTrial(Rando::WATER_TRIAL)->IsSkipped())  &&
+                                                                            (ShadowTrialClear || randoCtx->GetTrial(Rando::SHADOW_TRIAL)->IsSkipped()) &&
+                                                                            (SpiritTrialClear || randoCtx->GetTrial(Rando::SPIRIT_TRIAL)->IsSkipped()) &&
+                                                                            (LightTrialClear  || randoCtx->GetTrial(Rando::LIGHT_TRIAL)->IsSkipped());}}),
+                  Entrance(RR_GANONS_CASTLE_MQ_DEKU_SCRUBS,  {[]{return randoCtx->GetTrickOption(RT_LENS_GANON_MQ) || CanUse(RG_LENS_OF_TRUTH);}}),
   });
 
   areaTable[RR_GANONS_CASTLE_MQ_DEKU_SCRUBS] = Area("Ganon's Castle MQ Deku Scrubs", "Ganon's Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
@@ -169,7 +169,7 @@ void AreaTable_Init_GanonsCastle() {
 
   areaTable[RR_GANONS_CASTLE_MQ_FIRE_TRIAL] = Area("Ganon's Castle MQ Fire Trial", "Ganons Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&FireTrialClear, {[]{return CanUse(RG_GORON_TUNIC) && CanUse(RG_GOLDEN_GAUNTLETS) && CanUse(RG_LIGHT_ARROWS) && (CanUse(RG_LONGSHOT) || HoverBoots || (LogicFireTrialMQ && CanUse(RG_HOOKSHOT)));}}),
+                  EventAccess(&FireTrialClear, {[]{return CanUse(RG_GORON_TUNIC) && CanUse(RG_GOLDEN_GAUNTLETS) && CanUse(RG_LIGHT_ARROWS) && (CanUse(RG_LONGSHOT) || HoverBoots || (randoCtx->GetTrickOption(RT_GANON_MQ_FIRE_TRIAL) && CanUse(RG_HOOKSHOT)));}}),
                     //Trick: CanUse(RG_GORON_TUNIC) && CanUse(RG_GOLDEN_GAUNTLETS) && CanUse(RG_LIGHT_ARROWS) && (CanUse(RG_LONGSHOT) || HoverBoots || (LogicFireTrialMQ && CanUse(RG_HOOKSHOT)))
   }, {}, {});
 
@@ -184,32 +184,32 @@ void AreaTable_Init_GanonsCastle() {
 
   areaTable[RR_GANONS_CASTLE_MQ_SHADOW_TRIAL] = Area("Ganon's Castle MQ Shadow Trial", "Ganons Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&ShadowTrialClear, {[]{return IsAdult && CanUse(RG_LIGHT_ARROWS) && (LogicLensCastleMQ || CanUse(RG_LENS_OF_TRUTH)) && (HoverBoots || (Hookshot && (HasFireSource || LogicShadowTrialMQ)));}}),
+                  EventAccess(&ShadowTrialClear, {[]{return IsAdult && CanUse(RG_LIGHT_ARROWS) && (randoCtx->GetTrickOption(RT_LENS_GANON_MQ) || CanUse(RG_LENS_OF_TRUTH)) && (HoverBoots || (Hookshot && (HasFireSource || randoCtx->GetTrickOption(RT_GANON_MQ_SHADOW_TRIAL))));}}),
                     //Trick: IsAdult && CanUse(RG_LIGHT_ARROWS) && (LogicLensCastleMQ || CanUse(RG_LENS_OF_TRUTH)) && (HoverBoots || (Hookshot && (HasFireSource || LogicShadowTrialMQ)))
   }, {
                   //Locations
-                  LocationAccess(RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST, {[]{return IsAdult && ((Bow && (CanUse(RG_HOOKSHOT) || CanUse(RG_HOVER_BOOTS))) || (CanUse(RG_HOVER_BOOTS) && (LogicLensCastleMQ || CanUse(RG_LENS_OF_TRUTH)) && (HasExplosives || GoronBracelet || CanUse(RG_DINS_FIRE))));}}),
-                  LocationAccess(RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST,  {[]{return IsAdult && Bow && (LogicLensCastleMQ || CanUse(RG_LENS_OF_TRUTH)) && (HoverBoots || (Hookshot && (HasFireSource || LogicShadowTrialMQ)));}}),
+                  LocationAccess(RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST, {[]{return IsAdult && ((Bow && (CanUse(RG_HOOKSHOT) || CanUse(RG_HOVER_BOOTS))) || (CanUse(RG_HOVER_BOOTS) && (randoCtx->GetTrickOption(RT_LENS_GANON_MQ) || CanUse(RG_LENS_OF_TRUTH)) && (HasExplosives || GoronBracelet || CanUse(RG_DINS_FIRE))));}}),
+                  LocationAccess(RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST,  {[]{return IsAdult && Bow && (randoCtx->GetTrickOption(RT_LENS_GANON_MQ) || CanUse(RG_LENS_OF_TRUTH)) && (HoverBoots || (Hookshot && (HasFireSource || randoCtx->GetTrickOption(RT_GANON_MQ_SHADOW_TRIAL))));}}),
                     //Trick: IsAdult && Bow && (LogicLensCastleMQ || CanUse(RG_LENS_OF_TRUTH)) && (HoverBoots || (Hookshot && (HasFireSource || LogicShadowTrialMQ)))
   }, {});
 
   areaTable[RR_GANONS_CASTLE_MQ_SPIRIT_TRIAL] = Area("Ganon's Castle MQ Spirit Castle", "Ganons Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&SpiritTrialClear, {[]{return IsAdult && CanUse(RG_LIGHT_ARROWS) && Hammer && HasBombchus && ((FireArrows && MirrorShield) || SunlightArrows);}}),
-                  EventAccess(&NutPot,           {[]{return NutPot || (Hammer && HasBombchus && IsAdult && ((CanUse(RG_FIRE_ARROWS) && MirrorShield) || (SunlightArrows && CanUse(RG_LIGHT_ARROWS))));}}),
+                  EventAccess(&SpiritTrialClear, {[]{return IsAdult && CanUse(RG_LIGHT_ARROWS) && Hammer && HasBombchus && ((FireArrows && MirrorShield) || randoCtx->GetOption(RSK_SUNLIGHT_ARROWS));}}),
+                  EventAccess(&NutPot,           {[]{return NutPot || (Hammer && HasBombchus && IsAdult && ((CanUse(RG_FIRE_ARROWS) && MirrorShield) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && CanUse(RG_LIGHT_ARROWS))));}}),
   }, {
                   //Locations
-                  LocationAccess(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST,             {[]{return IsAdult && (Bow || LogicRustedSwitches) && Hammer;}}),
-                  LocationAccess(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST,         {[]{return IsAdult && (Bow || LogicRustedSwitches) && Hammer && HasBombchus && (LogicLensCastleMQ || CanUse(RG_LENS_OF_TRUTH));}}),
-                  LocationAccess(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST,    {[]{return IsAdult && Hammer && HasBombchus && ((CanUse(RG_FIRE_ARROWS) && CanUse(RG_MIRROR_SHIELD)) || (SunlightArrows && CanUse(RG_LIGHT_ARROWS)));}}),
-                  LocationAccess(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST,     {[]{return IsAdult && Hammer && HasBombchus && ((CanUse(RG_FIRE_ARROWS) && CanUse(RG_MIRROR_SHIELD)) || (SunlightArrows && CanUse(RG_LIGHT_ARROWS)));}}),
-                  LocationAccess(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST,  {[]{return IsAdult && Hammer && HasBombchus && ((CanUse(RG_FIRE_ARROWS) && CanUse(RG_MIRROR_SHIELD)) || (SunlightArrows && CanUse(RG_LIGHT_ARROWS)));}}),
-                  LocationAccess(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST,    {[]{return IsAdult && Hammer && HasBombchus && ((CanUse(RG_FIRE_ARROWS) && CanUse(RG_MIRROR_SHIELD)) || (SunlightArrows && CanUse(RG_LIGHT_ARROWS)));}}),
+                  LocationAccess(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST,             {[]{return IsAdult && (Bow || randoCtx->GetTrickOption(RT_RUSTED_SWITCHES)) && Hammer;}}),
+                  LocationAccess(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST,         {[]{return IsAdult && (Bow || randoCtx->GetTrickOption(RT_RUSTED_SWITCHES)) && Hammer && HasBombchus && (randoCtx->GetTrickOption(RT_LENS_GANON_MQ) || CanUse(RG_LENS_OF_TRUTH));}}),
+                  LocationAccess(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST,    {[]{return IsAdult && Hammer && HasBombchus && ((CanUse(RG_FIRE_ARROWS) && CanUse(RG_MIRROR_SHIELD)) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && CanUse(RG_LIGHT_ARROWS)));}}),
+                  LocationAccess(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST,     {[]{return IsAdult && Hammer && HasBombchus && ((CanUse(RG_FIRE_ARROWS) && CanUse(RG_MIRROR_SHIELD)) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && CanUse(RG_LIGHT_ARROWS)));}}),
+                  LocationAccess(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST,  {[]{return IsAdult && Hammer && HasBombchus && ((CanUse(RG_FIRE_ARROWS) && CanUse(RG_MIRROR_SHIELD)) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && CanUse(RG_LIGHT_ARROWS)));}}),
+                  LocationAccess(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST,    {[]{return IsAdult && Hammer && HasBombchus && ((CanUse(RG_FIRE_ARROWS) && CanUse(RG_MIRROR_SHIELD)) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && CanUse(RG_LIGHT_ARROWS)));}}),
   }, {});
 
   areaTable[RR_GANONS_CASTLE_MQ_LIGHT_TRIAL] = Area("Ganon's Castle MQ Light Trial", "Ganons Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&LightTrialClear, {[]{return IsAdult && (CanUse(RG_MASTER_SWORD) || CanUse(RG_KOKIRI_SWORD) || CanUse(RG_BIGGORON_SWORD)) && CanUse(RG_LIGHT_ARROWS) && SmallKeys(RR_GANONS_CASTLE, 3) && (LogicLensCastleMQ || CanUse(RG_LENS_OF_TRUTH)) && (Hookshot || LogicLightTrialMQ);}}),
+                  EventAccess(&LightTrialClear, {[]{return IsAdult && (CanUse(RG_MASTER_SWORD) || CanUse(RG_KOKIRI_SWORD) || CanUse(RG_BIGGORON_SWORD)) && CanUse(RG_LIGHT_ARROWS) && SmallKeys(RR_GANONS_CASTLE, 3) && (randoCtx->GetTrickOption(RT_LENS_GANON_MQ) || CanUse(RG_LENS_OF_TRUTH)) && (Hookshot || randoCtx->GetTrickOption(RT_GANON_MQ_LIGHT_TRIAL));}}),
                     //Trick: IsAdult && CanUse(RG_LIGHT_ARROWS) && SmallKeys(RR_GANONS_CASTLE, 3) && (LogicLensCastleMQ || CanUse(RG_LENS_OF_TRUTH)) && (Hookshot || LogicLightTrialMQ)
   }, {
                   //Locations
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp
index 7316baf3c..2412dbfce 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp
@@ -1,10 +1,10 @@
 #include "../location_access.hpp"
 #include "../logic.hpp"
-#include "../entrance.hpp"
-#include "../dungeon.hpp"
+#include "../../entrance.h"
+#include "../../dungeon.h"
 
 using namespace Logic;
-using namespace Settings;
+using namespace Rando;
 
 void AreaTable_Init_GerudoTrainingGrounds() {
   /*--------------------------
@@ -12,15 +12,15 @@ void AreaTable_Init_GerudoTrainingGrounds() {
   ---------------------------*/
   areaTable[RR_GERUDO_TRAINING_GROUNDS_ENTRYWAY] = Area("Gerudo Training Grounds Entryway", "Gerudo Training Grounds", RHT_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_GERUDO_TRAINING_GROUNDS_LOBBY,    {[]{return Dungeon::GerudoTrainingGrounds.IsVanilla();}}),
-                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_LOBBY, {[]{return Dungeon::GerudoTrainingGrounds.IsMQ();}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_LOBBY,    {[]{return randoCtx->GetDungeon(GERUDO_TRAINING_GROUNDS)->IsVanilla();}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_LOBBY, {[]{return randoCtx->GetDungeon(GERUDO_TRAINING_GROUNDS)->IsMQ();}}),
                   Entrance(RR_GERUDO_FORTRESS,                  {[]{return true;}}),
   });
 
   /*--------------------------
   |     VANILLA DUNGEON      |
   ---------------------------*/
-  if (Dungeon::GerudoTrainingGrounds.IsVanilla()) {
+  if (randoCtx->GetDungeon(GERUDO_TRAINING_GROUNDS)->IsVanilla()) {
   areaTable[RR_GERUDO_TRAINING_GROUNDS_LOBBY] = Area("Gerudo Training Grounds Lobby", "Gerudo Training Grounds", RHT_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST,  {[]{return CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT);}}),
@@ -30,14 +30,14 @@ void AreaTable_Init_GerudoTrainingGrounds() {
                 }, {
                   //Exits
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_ENTRYWAY,         {[]{return true;}}),
-                  Entrance(RR_GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_ROOM, {[]{return (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) && (CanUse(RG_HOOKSHOT) || LogicGtgWithoutHookshot);}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_ROOM, {[]{return (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) && (CanUse(RG_HOOKSHOT) || randoCtx->GetTrickOption(RT_GTG_WITHOUT_HOOKSHOT));}}),
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_LAVA_ROOM,        {[]{return Here(RR_GERUDO_TRAINING_GROUNDS_LOBBY, []{return (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) && HasExplosives;});}}),
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE,     {[]{return true;}}),
   });
 
   areaTable[RR_GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE] = Area("Gerudo Training Grounds Central Maze", "Gerudo Training Grounds", RHT_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST,   {[]{return SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 3) && (LogicLensGtg || CanUse(RG_LENS_OF_TRUTH));}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST,   {[]{return SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 3) && (randoCtx->GetTrickOption(RT_LENS_GTG) || CanUse(RG_LENS_OF_TRUTH));}}),
                   LocationAccess(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST,  {[]{return SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 4);}}),
                   LocationAccess(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_SECOND_CHEST, {[]{return SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 6);}}),
                   LocationAccess(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_THIRD_CHEST,  {[]{return SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 7);}}),
@@ -70,7 +70,7 @@ void AreaTable_Init_GerudoTrainingGrounds() {
   areaTable[RR_GERUDO_TRAINING_GROUNDS_HAMMER_ROOM] = Area("Gerudo Training Grounds Hammer Room", "Gerudo Training Grounds", RHT_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST,  {[]{return CanAdultAttack || CanChildAttack;}}),
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST, {[]{return CanUse(RG_MEGATON_HAMMER) || (CanTakeDamage && LogicFlamingChests);}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST, {[]{return CanUse(RG_MEGATON_HAMMER) || (CanTakeDamage && randoCtx->GetTrickOption(RT_FLAMING_CHESTS));}}),
                 }, {
                   //Exits
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_EYE_STATUE_LOWER, {[]{return CanUse(RG_MEGATON_HAMMER) && CanUse(RG_FAIRY_BOW);}}),
@@ -98,8 +98,8 @@ void AreaTable_Init_GerudoTrainingGrounds() {
                   LocationAccess(RC_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST, {[]{return CanJumpslash;}}),
                 }, {
                   //Exits
-                  Entrance(RR_GERUDO_TRAINING_GROUNDS_EYE_STATUE_UPPER, {[]{return (LogicLensGtg || CanUse(RG_LENS_OF_TRUTH)) && (CanUse(RG_HOOKSHOT) || (LogicGtgFakeWall && CanUse(RG_HOVER_BOOTS)));}}),
-                  Entrance(RR_GERUDO_TRAINING_GROUNDS_LIKE_LIKE_ROOM,   {[]{return (LogicLensGtg || CanUse(RG_LENS_OF_TRUTH)) && (CanUse(RG_HOOKSHOT) || (LogicGtgFakeWall && CanUse(RG_HOVER_BOOTS))) && CanUse(RG_SILVER_GAUNTLETS);}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_EYE_STATUE_UPPER, {[]{return (randoCtx->GetTrickOption(RT_LENS_GTG) || CanUse(RG_LENS_OF_TRUTH)) && (CanUse(RG_HOOKSHOT) || (randoCtx->GetTrickOption(RT_GTG_FAKE_WALL) && CanUse(RG_HOVER_BOOTS)));}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_LIKE_LIKE_ROOM,   {[]{return (randoCtx->GetTrickOption(RT_LENS_GTG) || CanUse(RG_LENS_OF_TRUTH)) && (CanUse(RG_HOOKSHOT) || (randoCtx->GetTrickOption(RT_GTG_FAKE_WALL) && CanUse(RG_HOVER_BOOTS))) && CanUse(RG_SILVER_GAUNTLETS);}}),
   });
 
   areaTable[RR_GERUDO_TRAINING_GROUNDS_LIKE_LIKE_ROOM] = Area("Gerudo Training Grounds Like Like Room", "Gerudo Training Grounds", RHT_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
@@ -114,12 +114,12 @@ void AreaTable_Init_GerudoTrainingGrounds() {
   /*---------------------------
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
-  if (Dungeon::GerudoTrainingGrounds.IsMQ()) {
+  if (randoCtx->GetDungeon(GERUDO_TRAINING_GROUNDS)->IsMQ()) {
   areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_LOBBY] = Area("Gerudo Training Grounds MQ Lobby", "Gerudo Training Grounds", RHT_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST,       {[]{return true;}}),
                   LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST,      {[]{return true;}}),
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_HIDDEN_CEILING_CHEST,   {[]{return LogicLensGtgMQ || CanUse(RG_LENS_OF_TRUTH);}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_HIDDEN_CEILING_CHEST,   {[]{return randoCtx->GetTrickOption(RT_LENS_GTG_MQ) || CanUse(RG_LENS_OF_TRUTH);}}),
                   LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_FIRST_CHEST,  {[]{return true;}}),
                   LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_SECOND_CHEST, {[]{return true;}}),
                   LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_THIRD_CHEST,  {[]{return SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 1);}}),
@@ -151,7 +151,7 @@ void AreaTable_Init_GerudoTrainingGrounds() {
                   LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST, {[]{return CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || HasExplosives;}}),
   }, {
                   //Exits
-                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_STALFOS_ROOM, {[]{return (IsAdult && CanUse(RG_LONGSHOT)) || LogicGtgMQWithoutHookshot || (LogicGtgMQWithHookshot && IsAdult && CanUse(RG_HOOKSHOT));}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_STALFOS_ROOM, {[]{return (IsAdult && CanUse(RG_LONGSHOT)) || randoCtx->GetTrickOption(RT_GTG_MQ_WIHTOUT_HOOKSHOT) || (randoCtx->GetTrickOption(RT_GTG_MQ_WITH_HOOKSHOT) && IsAdult && CanUse(RG_HOOKSHOT));}}),
                     //Trick: (IsAdult && CanUse(RG_LONGSHOT)) || LogicGtgMQWithoutHookshot || (LogicGtgMQWithHookshot && IsAdult && CanUse(RG_HOOKSHOT))
   });
 
@@ -164,7 +164,7 @@ void AreaTable_Init_GerudoTrainingGrounds() {
                   LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_HEAVY_BLOCK_CHEST,        {[]{return CanUse(RG_SILVER_GAUNTLETS) && (CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD));}}),
   }, {
                   //Exits
-                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_BACK_AREAS, {[]{return IsAdult && (CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) && (LogicLensGtgMQ || CanUse(RG_LENS_OF_TRUTH)) && BlueFire && (CanPlay(SongOfTime) || (LogicGtgFakeWall && IsAdult && CanUse(RG_HOVER_BOOTS)));}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_BACK_AREAS, {[]{return IsAdult && (CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) && (randoCtx->GetTrickOption(RT_LENS_GTG_MQ) || CanUse(RG_LENS_OF_TRUTH)) && BlueFire && (CanPlay(SongOfTime) || (randoCtx->GetTrickOption(RT_GTG_FAKE_WALL) && IsAdult && CanUse(RG_HOVER_BOOTS)));}}),
                     //Trick: IsAdult && (LogicLensGtgMQ || CanUse(RG_LENS_OF_TRUTH)) && BlueFire && (CanPlay(SongOfTime) || (LogicGtgFakeWall && IsAdult && CanUse(RG_HOVER_BOOTS)))
   });
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
index 3ec4d52d7..568b7f028 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
@@ -1,9 +1,9 @@
 #include "../location_access.hpp"
 #include "../logic.hpp"
-#include "../entrance.hpp"
+#include "../../entrance.h"
 
 using namespace Logic;
-using namespace Settings;
+using namespace Rando;
 
 void AreaTable_Init_GerudoValley() {
   areaTable[RR_GERUDO_VALLEY] = Area("Gerudo Valley", "Gerudo Valley", RHT_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {
@@ -18,7 +18,7 @@ void AreaTable_Init_GerudoValley() {
                   Entrance(RR_GV_UPPER_STREAM,   {[]{return true;}}),
                   Entrance(RR_GV_CRATE_LEDGE,    {[]{return IsChild || CanUse(RG_LONGSHOT);}}),
                   Entrance(RR_GV_GROTTO_LEDGE,   {[]{return true;}}),
-                  Entrance(RR_GV_FORTRESS_SIDE,  {[]{return (IsAdult && (CanRideEpona || CanUse(RG_LONGSHOT) || GerudoFortress.Is(GERUDOFORTRESS_OPEN) || CarpenterRescue)) || (IsChild && CanUse(RG_HOOKSHOT));}}),
+                  Entrance(RR_GV_FORTRESS_SIDE,  {[]{return (IsAdult && (CanRideEpona || CanUse(RG_LONGSHOT) || randoCtx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_OPEN) || CarpenterRescue)) || (IsChild && CanUse(RG_HOOKSHOT));}}),
   });
 
   areaTable[RR_GV_UPPER_STREAM] = Area("GV Upper Stream", "Gerudo Valley", RHT_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {
@@ -69,7 +69,7 @@ void AreaTable_Init_GerudoValley() {
                   //Exits
                   Entrance(RR_GERUDO_FORTRESS,   {[]{return true;}}),
                   Entrance(RR_GV_UPPER_STREAM,   {[]{return true;}}),
-                  Entrance(RR_GERUDO_VALLEY,     {[]{return IsChild || CanRideEpona || CanUse(RG_LONGSHOT) || GerudoFortress.Is(GERUDOFORTRESS_OPEN) || CarpenterRescue;}}),
+                  Entrance(RR_GERUDO_VALLEY,     {[]{return IsChild || CanRideEpona || CanUse(RG_LONGSHOT) || randoCtx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_OPEN) || CarpenterRescue;}}),
                   Entrance(RR_GV_CARPENTER_TENT, {[]{return IsAdult;}}),
                   Entrance(RR_GV_STORMS_GROTTO,  {[]{return IsAdult && CanOpenStormGrotto;}}),
                   Entrance(RR_GV_CRATE_LEDGE, {[]{return false;}}),
@@ -105,26 +105,26 @@ void AreaTable_Init_GerudoValley() {
                   LocationAccess(RC_GF_HBA_1000_POINTS,    {[]{return GerudoToken && CanRideEpona && Bow && AtDay;}}),
                   LocationAccess(RC_GF_HBA_1500_POINTS,    {[]{return GerudoToken && CanRideEpona && Bow && AtDay;}}),
                   LocationAccess(RC_GF_NORTH_F1_CARPENTER, {[]{return  CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD);}}),
-                  LocationAccess(RC_GF_NORTH_F2_CARPENTER, {[]{return (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) && (GerudoToken || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_HOVER_BOOTS) || LogicGerudoKitchen);}}),
+                  LocationAccess(RC_GF_NORTH_F2_CARPENTER, {[]{return (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) && (GerudoToken || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_HOVER_BOOTS) || randoCtx->GetTrickOption(RT_GF_KITCHEN));}}),
                   LocationAccess(RC_GF_SOUTH_F1_CARPENTER, {[]{return  CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD);}}),
                   LocationAccess(RC_GF_SOUTH_F2_CARPENTER, {[]{return  CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD);}}),
                   LocationAccess(RC_GF_GERUDO_MEMBERSHIP_CARD,       {[]{return CanFinishGerudoFortress;}}),
                   LocationAccess(RC_GF_GS_ARCHERY_RANGE,   {[]{return IsAdult && HookshotOrBoomerang && GerudoToken && AtNight && CanGetNightTimeGS;}}),
-                  LocationAccess(RC_GF_GS_TOP_FLOOR,       {[]{return IsAdult && AtNight && (CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOOMERANG) || HasExplosives || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_DINS_FIRE)) && (GerudoToken || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_HOVER_BOOTS) || LogicGerudoKitchen || LogicGFJump) && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_GF_GS_TOP_FLOOR,       {[]{return IsAdult && AtNight && (CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOOMERANG) || HasExplosives || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_DINS_FIRE)) && (GerudoToken || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_HOVER_BOOTS) || randoCtx->GetTrickOption(RT_GF_KITCHEN) || randoCtx->GetTrickOption(RT_GF_JUMP)) && CanGetNightTimeGS;}}),
                 }, {
                   //Exits
                   Entrance(RR_GV_FORTRESS_SIDE,                 {[]{return true;}}),
                   Entrance(RR_GF_OUTSIDE_GATE,                  {[]{return GF_GateOpen;}}),
-                  Entrance(RR_GERUDO_TRAINING_GROUNDS_ENTRYWAY, {[]{return GtG_GateOpen && (IsAdult || ShuffleDungeonEntrances);}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_ENTRYWAY, {[]{return GtG_GateOpen && (IsAdult || randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES));}}),
                   Entrance(RR_GF_STORMS_GROTTO,                 {[]{return IsAdult && CanOpenStormGrotto;}}),
   });
 
   areaTable[RR_GF_OUTSIDE_GATE] = Area("GF Outside Gate", "Gerudo Fortress", RHT_GERUDO_FORTRESS, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&GF_GateOpen, {[]{return IsAdult && GerudoToken && (ShuffleGerudoToken || ShuffleOverworldEntrances /*|| ShuffleSpecialIndoorEntrances*/);}}),
+                  EventAccess(&GF_GateOpen, {[]{return IsAdult && GerudoToken && (randoCtx->GetOption(RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD) || randoCtx->GetOption(RSK_SHUFFLE_OVERWORLD_ENTRANCES) /*|| ShuffleSpecialIndoorEntrances*/);}}),
                 }, {}, {
                   //Exits
-                  Entrance(RR_GERUDO_FORTRESS,         {[]{return (IsAdult && (Hookshot || !ShuffleOverworldEntrances)) || GF_GateOpen;}}),
+                  Entrance(RR_GERUDO_FORTRESS,         {[]{return (IsAdult && (Hookshot || !randoCtx->GetOption(RSK_SHUFFLE_OVERWORLD_ENTRANCES))) || GF_GateOpen;}}),
                   Entrance(RR_WASTELAND_NEAR_FORTRESS, {[]{return true;}}),
   });
 
@@ -139,7 +139,7 @@ void AreaTable_Init_GerudoValley() {
   areaTable[RR_WASTELAND_NEAR_FORTRESS] = Area("Wasteland Near Fortress", "Haunted Wasteland", RHT_HAUNTED_WASTELAND, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_GF_OUTSIDE_GATE,   {[]{return true;}}),
-                  Entrance(RR_HAUNTED_WASTELAND, {[]{return CanUse(RG_HOVER_BOOTS) || CanUse(RG_LONGSHOT) || LogicWastelandCrossing;}}),
+                  Entrance(RR_HAUNTED_WASTELAND, {[]{return CanUse(RG_HOVER_BOOTS) || CanUse(RG_LONGSHOT) || randoCtx->GetTrickOption(RT_HW_CROSSING);}}),
   });
 
   areaTable[RR_HAUNTED_WASTELAND] = Area("Haunted Wasteland", "Haunted Wasteland", RHT_HAUNTED_WASTELAND, NO_DAY_NIGHT_CYCLE, {
@@ -153,14 +153,14 @@ void AreaTable_Init_GerudoValley() {
                   LocationAccess(RC_WASTELAND_GS,               {[]{return HookshotOrBoomerang;}}),
                 }, {
                   //Exits
-                  Entrance(RR_WASTELAND_NEAR_COLOSSUS, {[]{return LogicLensWasteland || CanUse(RG_LENS_OF_TRUTH);}}),
-                  Entrance(RR_WASTELAND_NEAR_FORTRESS, {[]{return CanUse(RG_HOVER_BOOTS) || CanUse(RG_LONGSHOT) || LogicWastelandCrossing;}}),
+                  Entrance(RR_WASTELAND_NEAR_COLOSSUS, {[]{return randoCtx->GetTrickOption(RT_LENS_HW) || CanUse(RG_LENS_OF_TRUTH);}}),
+                  Entrance(RR_WASTELAND_NEAR_FORTRESS, {[]{return CanUse(RG_HOVER_BOOTS) || CanUse(RG_LONGSHOT) || randoCtx->GetTrickOption(RT_HW_CROSSING);}}),
   });
 
   areaTable[RR_WASTELAND_NEAR_COLOSSUS] = Area("Wasteland Near Colossus", "Haunted Wasteland", RHT_HAUNTED_WASTELAND, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DESERT_COLOSSUS,   {[]{return true;}}),
-                  Entrance(RR_HAUNTED_WASTELAND, {[]{return LogicReverseWasteland || false;}}),
+                  Entrance(RR_HAUNTED_WASTELAND, {[]{return randoCtx->GetTrickOption(RT_HW_REVERSE) || false;}}),
   });
 
   areaTable[RR_DESERT_COLOSSUS] = Area("Desert Colossus", "Desert Colossus", RHT_DESERT_COLOSSUS, DAY_NIGHT_CYCLE, {
@@ -172,7 +172,7 @@ void AreaTable_Init_GerudoValley() {
                   LocationAccess(RC_COLOSSUS_FREESTANDING_POH, {[]{return IsAdult && CanPlantBean(RR_DESERT_COLOSSUS);}}),
                   LocationAccess(RC_COLOSSUS_GS_BEAN_PATCH,    {[]{return CanPlantBugs && CanChildAttack;}}),
                   LocationAccess(RC_COLOSSUS_GS_TREE,          {[]{return IsAdult && HookshotOrBoomerang && AtNight && CanGetNightTimeGS;}}),
-                  LocationAccess(RC_COLOSSUS_GS_HILL,          {[]{return IsAdult && AtNight && ((CanPlantBean(RR_DESERT_COLOSSUS) && CanAdultAttack) || CanUse(RG_LONGSHOT) || (LogicColossusGS && CanUse(RG_HOOKSHOT))) && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_COLOSSUS_GS_HILL,          {[]{return IsAdult && AtNight && ((CanPlantBean(RR_DESERT_COLOSSUS) && CanAdultAttack) || CanUse(RG_LONGSHOT) || (randoCtx->GetTrickOption(RT_COLOSSUS_GS) && CanUse(RG_HOOKSHOT))) && CanGetNightTimeGS;}}),
                   LocationAccess(RC_COLOSSUS_GOSSIP_STONE,     {[]{return true;}}),
                 }, {
                   //Exits
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
index 1e4e15807..cf7438e5e 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
@@ -1,9 +1,9 @@
 #include "../location_access.hpp"
 #include "../logic.hpp"
-#include "../entrance.hpp"
+#include "../../entrance.h"
 
 using namespace Logic;
-using namespace Settings;
+using namespace Rando;
 
 void AreaTable_Init_HyruleField() {
   areaTable[RR_HYRULE_FIELD] = Area("Hyrule Field", "Hyrule Field", RHT_HYRULE_FIELD, DAY_NIGHT_CYCLE, {
@@ -115,7 +115,7 @@ void AreaTable_Init_HyruleField() {
                   LocationAccess(RC_LH_SUN,                    {[]{return IsAdult && WaterTempleClear && CanUse(RG_FAIRY_BOW);}}),
                   LocationAccess(RC_LH_FREESTANDING_POH,       {[]{return IsAdult && (CanUse(RG_SCARECROW) || CanPlantBean(RR_LAKE_HYLIA));}}),
                   LocationAccess(RC_LH_GS_BEAN_PATCH,          {[]{return CanPlantBugs && CanChildAttack;}}),
-                  LocationAccess(RC_LH_GS_LAB_WALL,            {[]{return IsChild && (HookshotOrBoomerang || (LogicLabWallGS && CanJumpslash)) && AtNight && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_LH_GS_LAB_WALL,            {[]{return IsChild && (HookshotOrBoomerang || (randoCtx->GetTrickOption(RT_LH_LAB_WALL_GS) && CanJumpslash)) && AtNight && CanGetNightTimeGS;}}),
                   LocationAccess(RC_LH_GS_SMALL_ISLAND,        {[]{return IsChild && CanChildAttack && AtNight && CanGetNightTimeGS;}}),
                   LocationAccess(RC_LH_GS_TREE,                {[]{return IsAdult && CanUse(RG_LONGSHOT) && AtNight && CanGetNightTimeGS;}}),
                   LocationAccess(RC_LH_LAB_GOSSIP_STONE,       {[]{return true;}}),
@@ -128,7 +128,7 @@ void AreaTable_Init_HyruleField() {
                   Entrance(RR_LH_OWL_FLIGHT,         {[]{return IsChild;}}),
                   Entrance(RR_LH_FISHING_ISLAND,     {[]{return IsChild || CanUse(RG_SCARECROW) || CanPlantBean(RR_LAKE_HYLIA) || WaterTempleClear;}}),
                   Entrance(RR_LH_LAB,                {[]{return true;}}),
-                  Entrance(RR_WATER_TEMPLE_ENTRYWAY, {[]{return CanUse(RG_HOOKSHOT) && ((CanUse(RG_IRON_BOOTS) || (LogicWaterHookshotEntry && ProgressiveScale >= 2)) || (IsAdult && CanUse(RG_LONGSHOT) && ProgressiveScale >= 2));}}),
+                  Entrance(RR_WATER_TEMPLE_ENTRYWAY, {[]{return CanUse(RG_HOOKSHOT) && ((CanUse(RG_IRON_BOOTS) || (randoCtx->GetTrickOption(RT_LH_WATER_HOOKSHOT) && ProgressiveScale >= 2)) || (IsAdult && CanUse(RG_LONGSHOT) && ProgressiveScale >= 2));}}),
                   Entrance(RR_LH_GROTTO,             {[]{return true;}}),
   });
 
@@ -148,7 +148,7 @@ void AreaTable_Init_HyruleField() {
                   EventAccess(&EyedropsAccess, {[]{return EyedropsAccess || (IsAdult && (EyeballFrogAccess || (EyeballFrog && DisableTradeRevert)));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_LH_LAB_DIVE,     {[]{return ProgressiveScale >= 2 || (LogicLabDiving && CanUse(RG_IRON_BOOTS) && CanUse(RG_HOOKSHOT));}}),
+                  LocationAccess(RC_LH_LAB_DIVE,     {[]{return ProgressiveScale >= 2 || (randoCtx->GetTrickOption(RT_LH_LAB_DIVING) && CanUse(RG_IRON_BOOTS) && CanUse(RG_HOOKSHOT));}}),
                   LocationAccess(RC_LH_TRADE_FROG,   {[]{return IsAdult && EyeballFrog;}}),
                   LocationAccess(RC_LH_GS_LAB_CRATE, {[]{return CanUse(RG_IRON_BOOTS) && CanUse(RG_HOOKSHOT);}}),
                 }, {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp
index 4386b97ae..3cbbd94e3 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp
@@ -1,10 +1,10 @@
 #include "../location_access.hpp"
 #include "../logic.hpp"
-#include "../entrance.hpp"
-#include "../dungeon.hpp"
+#include "../../entrance.h"
+#include "../../dungeon.h"
 
 using namespace Logic;
-using namespace Settings;
+using namespace Rando;
 
 void AreaTable_Init_IceCavern() {
   /*--------------------------
@@ -12,15 +12,15 @@ void AreaTable_Init_IceCavern() {
   ---------------------------*/
   areaTable[RR_ICE_CAVERN_ENTRYWAY] = Area("Ice Cavern Entryway", "Ice Cavern", RHT_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_ICE_CAVERN_BEGINNING,    {[]{return Dungeon::IceCavern.IsVanilla();}}),
-                  Entrance(RR_ICE_CAVERN_MQ_BEGINNING, {[]{return Dungeon::IceCavern.IsMQ() && CanUseProjectile;}}),
+                  Entrance(RR_ICE_CAVERN_BEGINNING,    {[]{return randoCtx->GetDungeon(ICE_CAVERN)->IsVanilla();}}),
+                  Entrance(RR_ICE_CAVERN_MQ_BEGINNING, {[]{return randoCtx->GetDungeon(ICE_CAVERN)->IsMQ() && CanUseProjectile;}}),
                   Entrance(RR_ZORAS_FOUNTAIN,          {[]{return true;}}),
   });
 
   /*--------------------------
   |     VANILLA DUNGEON      |
   ---------------------------*/
-  if (Dungeon::IceCavern.IsVanilla()) {
+  if (randoCtx->GetDungeon(ICE_CAVERN)->IsVanilla()) {
   areaTable[RR_ICE_CAVERN_BEGINNING] = Area("Ice Cavern Beginning", "Ice Cavern", RHT_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_ICE_CAVERN_ENTRYWAY, {[]{return true;}}),
@@ -39,14 +39,14 @@ void AreaTable_Init_IceCavern() {
                   LocationAccess(RC_ICE_CAVERN_FREESTANDING_POH,        {[]{return BlueFire;}}),
                   LocationAccess(RC_ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM, {[]{return HookshotOrBoomerang;}}),
                   LocationAccess(RC_ICE_CAVERN_GS_HEART_PIECE_ROOM,     {[]{return BlueFire && HookshotOrBoomerang;}}),
-                  LocationAccess(RC_ICE_CAVERN_GS_PUSH_BLOCK_ROOM,      {[]{return BlueFire && (HookshotOrBoomerang || (LogicIceBlockGS && IsAdult && CanUse(RG_HOVER_BOOTS)));}}),
+                  LocationAccess(RC_ICE_CAVERN_GS_PUSH_BLOCK_ROOM,      {[]{return BlueFire && (HookshotOrBoomerang || (randoCtx->GetTrickOption(RT_ICE_BLOCK_GS) && IsAdult && CanUse(RG_HOVER_BOOTS)));}}),
   }, {});
   }
 
   /*---------------------------
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
-  if (Dungeon::IceCavern.IsMQ()) {
+  if (randoCtx->GetDungeon(ICE_CAVERN)->IsMQ()) {
   areaTable[RR_ICE_CAVERN_MQ_BEGINNING] = Area("Ice Cavern MQ Beginning", "Ice Cavern", RHT_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FairyPot, {[]{return true;}}),
@@ -71,7 +71,7 @@ void AreaTable_Init_IceCavern() {
                   LocationAccess(RC_ICE_CAVERN_MQ_IRON_BOOTS_CHEST, {[]{return IsAdult && (CanJumpslash || CanUse(RG_MEGATON_HAMMER));}}),
                   LocationAccess(RC_SHEIK_IN_ICE_CAVERN,            {[]{return IsAdult && (CanJumpslash || CanUse(RG_MEGATON_HAMMER));}}),
                   LocationAccess(RC_ICE_CAVERN_MQ_GS_ICE_BLOCK,     {[]{return CanAdultAttack || CanChildAttack;}}),
-                  LocationAccess(RC_ICE_CAVERN_MQ_GS_SCARECROW,     {[]{return CanUse(RG_SCARECROW) || (HoverBoots && CanUse(RG_LONGSHOT)) || (LogicIceMQScarecrow && IsAdult);}}),
+                  LocationAccess(RC_ICE_CAVERN_MQ_GS_SCARECROW,     {[]{return CanUse(RG_SCARECROW) || (HoverBoots && CanUse(RG_LONGSHOT)) || (randoCtx->GetTrickOption(RT_ICE_MQ_SCARECROW) && IsAdult);}}),
                     //Tricks: (CanUse(RG_SCARECROW) || (HoverBoots && CanUse(RG_LONGSHOT)) || LogicIceMQScarecrow) && IsAdult
   }, {});
 
@@ -79,7 +79,7 @@ void AreaTable_Init_IceCavern() {
                   //Locations
                   LocationAccess(RC_ICE_CAVERN_MQ_COMPASS_CHEST,    {[]{return true;}}),
                   LocationAccess(RC_ICE_CAVERN_MQ_FREESTANDING_POH, {[]{return HasExplosives;}}),
-                  LocationAccess(RC_ICE_CAVERN_MQ_GS_RED_ICE,       {[]{return CanPlay(SongOfTime) || LogicIceMQRedIceGS;}}),
+                  LocationAccess(RC_ICE_CAVERN_MQ_GS_RED_ICE,       {[]{return CanPlay(SongOfTime) || randoCtx->GetTrickOption(RT_ICE_MQ_RED_ICE_GS);}}),
                     //Trick: CanPlay(SongOfTime) || LogicIceMQRedIceGS
   }, {});
   }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp
index 2ca264328..4ddcbf58f 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp
@@ -1,10 +1,10 @@
 #include "../location_access.hpp"
 #include "../logic.hpp"
-#include "../entrance.hpp"
-#include "../dungeon.hpp"
+#include "../../entrance.h"
+#include "../../dungeon.h"
 
 using namespace Logic;
-using namespace Settings;
+using namespace Rando;
 
 void AreaTable_Init_JabuJabusBelly() {
   /*--------------------------
@@ -12,15 +12,15 @@ void AreaTable_Init_JabuJabusBelly() {
   ---------------------------*/
   areaTable[RR_JABU_JABUS_BELLY_ENTRYWAY] = Area("Jabu Jabus Belly Entryway", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_JABU_JABUS_BELLY_BEGINNING,    {[]{return Dungeon::JabuJabusBelly.IsVanilla();}}),
-                  Entrance(RR_JABU_JABUS_BELLY_MQ_BEGINNING, {[]{return Dungeon::JabuJabusBelly.IsMQ();}}),
+                  Entrance(RR_JABU_JABUS_BELLY_BEGINNING,    {[]{return randoCtx->GetDungeon(JABU_JABUS_BELLY)->IsVanilla();}}),
+                  Entrance(RR_JABU_JABUS_BELLY_MQ_BEGINNING, {[]{return randoCtx->GetDungeon(JABU_JABUS_BELLY)->IsMQ();}}),
                   Entrance(RR_ZORAS_FOUNTAIN,                {[]{return true;}}),
   });
 
   /*--------------------------
   |     VANILLA DUNGEON      |
   ---------------------------*/
-  if (Dungeon::JabuJabusBelly.IsVanilla()) {
+  if (randoCtx->GetDungeon(JABU_JABUS_BELLY)->IsVanilla()) {
   areaTable[RR_JABU_JABUS_BELLY_BEGINNING] = Area("Jabu Jabus Belly Beginning", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_ENTRYWAY,    {[]{return true;}}),
@@ -32,7 +32,7 @@ void AreaTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_BEGINNING,      {[]{return true;}}),
                   Entrance(RR_JABU_JABUS_BELLY_MAIN_UPPER,     {[]{return true;}}),
                   Entrance(RR_JABU_JABUS_BELLY_LIFT_LOWER,     {[]{return true;}}),
-                  Entrance(RR_JABU_JABUS_BELLY_NEAR_BOSS_ROOM, {[]{return HasAccessTo(RR_JABU_JABUS_BELLY_LIFT_UPPER) || (LogicJabuBossHover && IsAdult && CanUse(RG_HOVER_BOOTS));}}),
+                  Entrance(RR_JABU_JABUS_BELLY_NEAR_BOSS_ROOM, {[]{return HasAccessTo(RR_JABU_JABUS_BELLY_LIFT_UPPER) || (randoCtx->GetTrickOption(RT_JABU_BOSS_HOVER) && IsAdult && CanUse(RG_HOVER_BOOTS));}}),
   });
 
   areaTable[RR_JABU_JABUS_BELLY_MAIN_UPPER] = Area("Jabu Jabus Belly Main Upper", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
@@ -76,7 +76,7 @@ void AreaTable_Init_JabuJabusBelly() {
 
   areaTable[RR_JABU_JABUS_BELLY_LIFT_LOWER] = Area("Jabu Jabus Belly Lift Lower", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_JABU_JABUS_BELLY_DEKU_SCRUB, {[]{return (IsChild || CanDive || LogicJabuAlcoveJumpDive || CanUse(RG_IRON_BOOTS)) && CanStunDeku;}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_DEKU_SCRUB, {[]{return (IsChild || CanDive || randoCtx->GetTrickOption(RT_JABU_ALCOVE_JUMP_DIVE) || CanUse(RG_IRON_BOOTS)) && CanStunDeku;}}),
                 }, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_SHABOMB_CORRIDOR, {[]{return true;}}),
@@ -154,14 +154,14 @@ void AreaTable_Init_JabuJabusBelly() {
                 }, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_LIFT_MIDDLE, {[]{return true;}}),
-                  Entrance(RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY, {[]{return CanUse(RG_BOOMERANG) || (LogicJabuNearBossRanged && ((IsAdult && (CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_BOW))) || (IsChild && CanUse(RG_FAIRY_SLINGSHOT)))) || (LogicJabuNearBossExplosives && (HasBombchus || (IsAdult && CanUse(RG_HOVER_BOOTS) && Bombs)));}}),
+                  Entrance(RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY, {[]{return CanUse(RG_BOOMERANG) || (randoCtx->GetTrickOption(RT_JABU_NEAR_BOSS_RANGED) && ((IsAdult && (CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_BOW))) || (IsChild && CanUse(RG_FAIRY_SLINGSHOT)))) || (randoCtx->GetTrickOption(RT_JABU_NEAR_BOSS_EXPLOSIVES) && (HasBombchus || (IsAdult && CanUse(RG_HOVER_BOOTS) && Bombs)));}}),
   });
   }
 
   /*---------------------------
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
-  if (Dungeon::JabuJabusBelly.IsMQ()) {
+  if (randoCtx->GetDungeon(JABU_JABUS_BELLY)->IsMQ()) {
   areaTable[RR_JABU_JABUS_BELLY_MQ_BEGINNING] = Area("Jabu Jabus Belly MQ Beginning", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&NutPot, {[]{return true;}}),
@@ -184,7 +184,7 @@ void AreaTable_Init_JabuJabusBelly() {
                   LocationAccess(RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST, {[]{return true;}}),
                   LocationAccess(RC_JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST,   {[]{return true;}}),
                   LocationAccess(RC_JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST,              {[]{return true;}}),
-                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM,      {[]{return CanPlay(SongOfTime) || (LogicJabuMQSoTGS && IsChild && CanUse(RG_BOOMERANG));}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM,      {[]{return CanPlay(SongOfTime) || (randoCtx->GetTrickOption(RT_JABU_MQ_SOT_GS) && IsChild && CanUse(RG_BOOMERANG));}}),
                     //Trick: CanPlay(SongOfTime) || (LogicJabuMQSoTGS && IsChild && CanUse(RG_BOOMERANG))
   }, {
                   //Exits
@@ -196,7 +196,7 @@ void AreaTable_Init_JabuJabusBelly() {
                   //Locations
                   LocationAccess(RC_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST, {[]{return true;}}),
                   LocationAccess(RC_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM,          {[]{return Sticks || CanUse(RG_DINS_FIRE);}}),
-                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM,    {[]{return (LogicLensJabuMQ || CanUse(RG_LENS_OF_TRUTH)) || Here(RR_JABU_JABUS_BELLY_MQ_MAIN, []{return IsAdult && CanUse(RG_HOVER_BOOTS) && CanUse(RG_HOOKSHOT);});}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM,    {[]{return (randoCtx->GetTrickOption(RT_LENS_JABU_MQ) || CanUse(RG_LENS_OF_TRUTH)) || Here(RR_JABU_JABUS_BELLY_MQ_MAIN, []{return IsAdult && CanUse(RG_HOVER_BOOTS) && CanUse(RG_HOOKSHOT);});}}),
   }, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_MQ_MAIN,      {[]{return true;}}),
@@ -225,8 +225,8 @@ void AreaTable_Init_JabuJabusBelly() {
         Area("Jabu Jabus Belly Boss Entryway", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {},
              {
                  // Exits
-                 Entrance(RR_JABU_JABUS_BELLY_NEAR_BOSS_ROOM, { [] { return Dungeon::JabuJabusBelly.IsVanilla(); } }),
-                 Entrance(RR_JABU_JABUS_BELLY_MQ_BOSS_AREA, { [] { return Dungeon::JabuJabusBelly.IsMQ(); } }),
+                 Entrance(RR_JABU_JABUS_BELLY_NEAR_BOSS_ROOM, { [] { return randoCtx->GetDungeon(JABU_JABUS_BELLY)->IsVanilla(); } }),
+                 Entrance(RR_JABU_JABUS_BELLY_MQ_BOSS_AREA, { [] { return randoCtx->GetDungeon(JABU_JABUS_BELLY)->IsMQ(); } }),
                  Entrance(RR_JABU_JABUS_BELLY_BOSS_ROOM, { [] { return true; } }),
              });
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
index 786bd19cc..47176d0fd 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
@@ -1,16 +1,16 @@
 #include "../location_access.hpp"
 #include "../logic.hpp"
-#include "../entrance.hpp"
+#include "../../entrance.h"
 
 using namespace Logic;
-using namespace Settings;
+using namespace Rando;
 
 void AreaTable_Init_Kakariko() {
   areaTable[RR_KAKARIKO_VILLAGE] = Area("Kakariko Village", "Kakariko Village", RHT_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&CojiroAccess,            {[]{return CojiroAccess || (IsAdult && WakeUpAdultTalon);}}),
                   EventAccess(&BugRock,                 {[]{return true;}}),
-                  EventAccess(&KakarikoVillageGateOpen, {[]{return KakarikoVillageGateOpen || (IsChild && (ZeldasLetter || OpenKakariko.Is(OPENKAKARIKO_OPEN)));}}),
+                  EventAccess(&KakarikoVillageGateOpen, {[]{return KakarikoVillageGateOpen || (IsChild && (ZeldasLetter || randoCtx->GetOption(RSK_KAK_GATE).Is(RO_KAK_GATE_OPEN)));}}),
                 }, {
                   //Locations
                   LocationAccess(RC_SHEIK_IN_KAKARIKO,               {[]{return IsAdult && ForestMedallion && FireMedallion && WaterMedallion;}}),
@@ -21,7 +21,7 @@ void AreaTable_Init_Kakariko() {
                   LocationAccess(RC_KAK_GS_SKULLTULA_HOUSE,          {[]{return IsChild && AtNight && CanGetNightTimeGS;}}),
                   LocationAccess(RC_KAK_GS_GUARDS_HOUSE,             {[]{return IsChild && AtNight && CanGetNightTimeGS;}}),
                   LocationAccess(RC_KAK_GS_TREE,                     {[]{return IsChild && AtNight && CanGetNightTimeGS;}}),
-                  LocationAccess(RC_KAK_GS_WATCHTOWER,               {[]{return IsChild && (Slingshot || HasBombchus || CanUse(RG_FAIRY_BOW) || CanUse(RG_LONGSHOT) || (LogicKakarikoTowerGS && CanJumpslash)) && AtNight && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_KAK_GS_WATCHTOWER,               {[]{return IsChild && (Slingshot || HasBombchus || CanUse(RG_FAIRY_BOW) || CanUse(RG_LONGSHOT) || (randoCtx->GetTrickOption(RT_KAK_TOWER_GS) && CanJumpslash)) && AtNight && CanGetNightTimeGS;}}),
                 }, {
                   //Exits
                   Entrance(RR_HYRULE_FIELD,                {[]{return true;}}),
@@ -31,12 +31,12 @@ void AreaTable_Init_Kakariko() {
                   Entrance(RR_KAK_WINDMILL,                {[]{return true;}}),
                   Entrance(RR_KAK_BAZAAR,                  {[]{return IsAdult && AtDay;}}),
                   Entrance(RR_KAK_SHOOTING_GALLERY,        {[]{return IsAdult && AtDay;}}),
-                  Entrance(RR_BOTTOM_OF_THE_WELL_ENTRYWAY, {[]{return DrainWell && (IsChild || ShuffleDungeonEntrances.IsNot(SHUFFLEDUNGEONS_OFF));}}),
+                  Entrance(RR_BOTTOM_OF_THE_WELL_ENTRYWAY, {[]{return DrainWell && (IsChild || randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).IsNot(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF));}}),
                   Entrance(RR_KAK_POTION_SHOP_FRONT,       {[]{return AtDay || IsChild;}}),
                   Entrance(RR_KAK_REDEAD_GROTTO,           {[]{return CanOpenBombGrotto;}}),
-                  Entrance(RR_KAK_IMPAS_LEDGE,             {[]{return (IsChild && AtDay) || CanUse(RG_HOOKSHOT) || (IsAdult && LogicVisibleCollision);}}),
-                  Entrance(RR_KAK_ROOFTOP,                 {[]{return CanUse(RG_HOOKSHOT) || (LogicManOnRoof && (IsAdult || AtDay || Slingshot || HasBombchus || CanUse(RG_FAIRY_BOW) || CanUse(RG_LONGSHOT)));}}),
-                  Entrance(RR_KAK_IMPAS_ROOFTOP,           {[]{return CanUse(RG_HOOKSHOT) || (LogicKakarikoRooftopGS && CanUse(RG_HOVER_BOOTS));}}),
+                  Entrance(RR_KAK_IMPAS_LEDGE,             {[]{return (IsChild && AtDay) || CanUse(RG_HOOKSHOT) || (IsAdult && randoCtx->GetTrickOption(RT_VISIBLE_COLLISION));}}),
+                  Entrance(RR_KAK_ROOFTOP,                 {[]{return CanUse(RG_HOOKSHOT) || (randoCtx->GetTrickOption(RT_KAK_MAN_ON_ROOF) && (IsAdult || AtDay || Slingshot || HasBombchus || CanUse(RG_FAIRY_BOW) || CanUse(RG_LONGSHOT)));}}),
+                  Entrance(RR_KAK_IMPAS_ROOFTOP,           {[]{return CanUse(RG_HOOKSHOT) || (randoCtx->GetTrickOption(RT_KAK_ROOFTOP_GS) && CanUse(RG_HOVER_BOOTS));}}),
                   Entrance(RR_THE_GRAVEYARD,               {[]{return true;}}),
                   Entrance(RR_KAK_BEHIND_GATE,             {[]{return IsAdult || (KakarikoVillageGateOpen);}}),
   });
@@ -118,7 +118,7 @@ void AreaTable_Init_Kakariko() {
                   EventAccess(&DrainWell, {[]{return DrainWell || (IsChild && CanPlay(SongOfStorms));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_KAK_WINDMILL_FREESTANDING_POH, {[]{return CanUse(RG_BOOMERANG) || DampesWindmillAccess || (IsAdult && LogicAdultWindmillPoH) || (IsChild && CanJumpslash && LogicChildWindmillPoH);}}),
+                  LocationAccess(RC_KAK_WINDMILL_FREESTANDING_POH, {[]{return CanUse(RG_BOOMERANG) || DampesWindmillAccess || (IsAdult && randoCtx->GetTrickOption(RT_KAK_ADULT_WINDMILL_POH)) || (IsChild && CanJumpslash && randoCtx->GetTrickOption(RT_KAK_CHILD_WINDMILL_POH));}}),
                     //PoH as child not added to trick options yet (needs uncommenting in randomizer_tricks.cpp)
                   LocationAccess(RC_SONG_FROM_WINDMILL,            {[]{return IsAdult && Ocarina;}}),
                 }, {
@@ -212,7 +212,7 @@ void AreaTable_Init_Kakariko() {
                   EventAccess(&BugRock,        {[]{return true;}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_GRAVEYARD_FREESTANDING_POH,        {[]{return (IsAdult && CanPlantBean(RR_THE_GRAVEYARD)) || CanUse(RG_LONGSHOT) || (LogicGraveyardPoH && CanUse(RG_BOOMERANG));}}),
+                  LocationAccess(RC_GRAVEYARD_FREESTANDING_POH,        {[]{return (IsAdult && CanPlantBean(RR_THE_GRAVEYARD)) || CanUse(RG_LONGSHOT) || (randoCtx->GetTrickOption(RT_GY_POH) && CanUse(RG_BOOMERANG));}}),
                   LocationAccess(RC_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR, {[]{return IsChild && AtNight;}}), //TODO: This needs to change
                   LocationAccess(RC_GRAVEYARD_GS_WALL,                 {[]{return IsChild && HookshotOrBoomerang && AtNight && CanGetNightTimeGS;}}),
                   LocationAccess(RC_GRAVEYARD_GS_BEAN_PATCH,           {[]{return CanPlantBugs && CanChildAttack;}}),
@@ -260,7 +260,7 @@ void AreaTable_Init_Kakariko() {
                 }, {
                   //Locations
                   LocationAccess(RC_GRAVEYARD_HOOKSHOT_CHEST,              {[]{return true;}}),
-                  LocationAccess(RC_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH, {[]{return IsAdult || LogicChildDampeRacePoH;}}),
+                  LocationAccess(RC_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH, {[]{return IsAdult || randoCtx->GetTrickOption(RT_GY_CHILD_DAMPE_RACE_POH);}}),
                 }, {
                   //Exits
                   Entrance(RR_THE_GRAVEYARD, {[]{return true;}}),
@@ -284,12 +284,12 @@ void AreaTable_Init_Kakariko() {
                 }, {
                   //Exits
                   Entrance(RR_THE_GRAVEYARD,             {[]{return true;}}),
-                  Entrance(RR_SHADOW_TEMPLE_ENTRYWAY,    {[]{return CanUse(RG_DINS_FIRE) || (LogicShadowFireArrowEntry && IsAdult && CanUse(RG_FIRE_ARROWS));}}),
+                  Entrance(RR_SHADOW_TEMPLE_ENTRYWAY,    {[]{return CanUse(RG_DINS_FIRE) || (randoCtx->GetTrickOption(RT_GY_SHADOW_FIRE_ARROWS) && IsAdult && CanUse(RG_FIRE_ARROWS));}}),
   });
 
   areaTable[RR_KAK_BEHIND_GATE] = Area("Kak Behind Gate", "Kakariko Village", RHT_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_KAKARIKO_VILLAGE,     {[]{return IsAdult || LogicVisibleCollision || KakarikoVillageGateOpen || OpenKakariko.Is(OPENKAKARIKO_OPEN);}}),
+                  Entrance(RR_KAKARIKO_VILLAGE,     {[]{return IsAdult || randoCtx->GetTrickOption(RT_VISIBLE_COLLISION) || KakarikoVillageGateOpen || randoCtx->GetOption(RSK_KAK_GATE).Is(RO_KAK_GATE_OPEN);}}),
                   Entrance(RR_DEATH_MOUNTAIN_TRAIL, {[]{return true;}}),
   });
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
index 833c8eebf..94699a271 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
@@ -1,9 +1,9 @@
 #include "../location_access.hpp"
 #include "../logic.hpp"
-#include "../entrance.hpp"
+#include "../../entrance.h"
 
 using namespace Logic;
-using namespace Settings;
+using namespace Rando;
 
 void AreaTable_Init_LostWoods() {
   areaTable[RR_KOKIRI_FOREST] = Area("Kokiri Forest", "Kokiri Forest", RHT_KOKIRI_FOREST, NO_DAY_NIGHT_CYCLE, {
@@ -14,9 +14,9 @@ void AreaTable_Init_LostWoods() {
                 }, {
                   //Locations
                   LocationAccess(RC_KF_KOKIRI_SWORD_CHEST,   {[]{return IsChild;}}),
-                  LocationAccess(RC_KF_GS_KNOW_IT_ALL_HOUSE, {[]{return IsChild && CanChildAttack && AtNight && (HasNightStart || CanLeaveForest || CanPlay(SunsSong)) && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_KF_GS_KNOW_IT_ALL_HOUSE, {[]{return IsChild && CanChildAttack && AtNight && (/*TODO: HasNightStart ||*/ CanLeaveForest || CanPlay(SunsSong)) && CanGetNightTimeGS;}}),
                   LocationAccess(RC_KF_GS_BEAN_PATCH,        {[]{return CanPlantBugs && CanChildAttack;}}),
-                  LocationAccess(RC_KF_GS_HOUSE_OF_TWINS,    {[]{return IsAdult && AtNight && (HookshotOrBoomerang || (LogicAdultKokiriGS && CanUse(RG_HOVER_BOOTS))) && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_KF_GS_HOUSE_OF_TWINS,    {[]{return IsAdult && AtNight && (HookshotOrBoomerang || (randoCtx->GetTrickOption(RT_KF_ADULT_GS) && CanUse(RG_HOVER_BOOTS))) && CanGetNightTimeGS;}}),
                   LocationAccess(RC_KF_GOSSIP_STONE,         {[]{return true;}}),
                 }, {
                   //Exits
@@ -26,16 +26,16 @@ void AreaTable_Init_LostWoods() {
                   Entrance(RR_KF_HOUSE_OF_TWINS,     {[]{return true;}}),
                   Entrance(RR_KF_KNOW_IT_ALL_HOUSE,  {[]{return true;}}),
                   Entrance(RR_KF_KOKIRI_SHOP,        {[]{return true;}}),
-                  Entrance(RR_KF_OUTSIDE_DEKU_TREE,  {[]{return IsAdult || OpenForest.Is(OPENFOREST_OPEN) || ShowedMidoSwordAndShield;}}),
+                  Entrance(RR_KF_OUTSIDE_DEKU_TREE,  {[]{return IsAdult || randoCtx->GetOption(RSK_FOREST).Is(RO_FOREST_OPEN) || ShowedMidoSwordAndShield;}}),
                   Entrance(RR_THE_LOST_WOODS,        {[]{return true;}}),
-                  Entrance(RR_LW_BRIDGE_FROM_FOREST, {[]{return IsAdult || OpenForest.IsNot(OPENFOREST_CLOSED) || DekuTreeClear;}}),
+                  Entrance(RR_LW_BRIDGE_FROM_FOREST, {[]{return IsAdult || randoCtx->GetOption(RSK_FOREST).IsNot(RO_FOREST_CLOSED) || DekuTreeClear;}}),
                   Entrance(RR_KF_STORMS_GROTTO,      {[]{return CanOpenStormGrotto;}}),
   });
 
   areaTable[RR_KF_OUTSIDE_DEKU_TREE] = Area("KF Outside Deku Tree", "Kokiri Forest", RHT_KOKIRI_FOREST, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&DekuBabaSticks,           {[]{return DekuBabaSticks || ((IsAdult && (CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_KOKIRI_SWORD)) && !ShuffleEntrances) || (IsChild && (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BOOMERANG))));}}),
-                  EventAccess(&DekuBabaNuts,             {[]{return DekuBabaNuts   || ((IsAdult && (CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_KOKIRI_SWORD)) && !ShuffleEntrances) || (IsChild && (CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT) || HasExplosives || CanUse(RG_DINS_FIRE))));}}),
+                  EventAccess(&DekuBabaSticks,           {[]{return DekuBabaSticks || ((IsAdult && (CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_KOKIRI_SWORD)) && !randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES)) || (IsChild && (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BOOMERANG))));}}),
+                  EventAccess(&DekuBabaNuts,             {[]{return DekuBabaNuts   || ((IsAdult && (CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_KOKIRI_SWORD)) && !randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES)) || (IsChild && (CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT) || HasExplosives || CanUse(RG_DINS_FIRE))));}}),
                   EventAccess(&ShowedMidoSwordAndShield, {[]{return ShowedMidoSwordAndShield || (IsChild && KokiriSword && DekuShield);}}),
                 }, {
                   //Locations
@@ -43,8 +43,8 @@ void AreaTable_Init_LostWoods() {
                   LocationAccess(RC_KF_DEKU_TREE_RIGHT_GOSSIP_STONE, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(RR_DEKU_TREE_ENTRYWAY, {[]{return IsChild || (ShuffleDungeonEntrances.IsNot(SHUFFLEDUNGEONS_OFF) && (OpenForest.Is(OPENFOREST_OPEN) || ShowedMidoSwordAndShield));}}),
-                  Entrance(RR_KOKIRI_FOREST,      {[]{return IsAdult || OpenForest.Is(OPENFOREST_OPEN) || ShowedMidoSwordAndShield;}}),
+                  Entrance(RR_DEKU_TREE_ENTRYWAY, {[]{return IsChild || (randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).IsNot(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF) && (randoCtx->GetOption(RSK_FOREST).Is(RO_FOREST_OPEN) || ShowedMidoSwordAndShield));}}),
+                  Entrance(RR_KOKIRI_FOREST,      {[]{return IsAdult || randoCtx->GetOption(RSK_FOREST).Is(RO_FOREST_OPEN) || ShowedMidoSwordAndShield;}}),
   });
 
   areaTable[RR_KF_LINKS_HOUSE] = Area("KF Link's House", "KF Link's House", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -131,9 +131,9 @@ void AreaTable_Init_LostWoods() {
                   //Exits
                   Entrance(RR_LW_FOREST_EXIT,           {[]{return true;}}),
                   Entrance(RR_GC_WOODS_WARP,            {[]{return true;}}),
-                  Entrance(RR_LW_BRIDGE,                {[]{return CanLeaveForest && ((IsAdult && (CanPlantBean(RR_THE_LOST_WOODS) || LogicLostWoodsBridge)) || CanUse(RG_HOVER_BOOTS) || CanUse(RG_LONGSHOT));}}),
+                  Entrance(RR_LW_BRIDGE,                {[]{return CanLeaveForest && ((IsAdult && (CanPlantBean(RR_THE_LOST_WOODS) || randoCtx->GetTrickOption(RT_LW_BRIDGE))) || CanUse(RG_HOVER_BOOTS) || CanUse(RG_LONGSHOT));}}),
                   Entrance(RR_ZORAS_RIVER,              {[]{return CanLeaveForest && (CanDive || CanUse(RG_IRON_BOOTS));}}),
-                  Entrance(RR_LW_BEYOND_MIDO,           {[]{return IsChild || CanPlay(SariasSong) || LogicMidoBackflip;}}),
+                  Entrance(RR_LW_BEYOND_MIDO,           {[]{return IsChild || CanPlay(SariasSong) || randoCtx->GetTrickOption(RT_LW_MIDO_BACKFLIP);}}),
                   Entrance(RR_LW_NEAR_SHORTCUTS_GROTTO, {[]{return Here(RR_THE_LOST_WOODS, []{return CanBlastOrSmash;});}}),
   });
 
@@ -144,8 +144,8 @@ void AreaTable_Init_LostWoods() {
                   //Locations
                   LocationAccess(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT, {[]{return IsChild && CanStunDeku;}}),
                   LocationAccess(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT,  {[]{return IsChild && CanStunDeku;}}),
-                  LocationAccess(RC_LW_GS_ABOVE_THEATER,                   {[]{return IsAdult && AtNight && ((CanPlantBean(RR_LW_BEYOND_MIDO) && CanAdultAttack) || (LogicLostWoodsGSBean && CanUse(RG_HOOKSHOT) && (CanUse(RG_LONGSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT) || HasBombchus || CanUse(RG_DINS_FIRE)))) && CanGetNightTimeGS;}}),
-                  LocationAccess(RC_LW_GS_BEAN_PATCH_NEAR_THEATER,         {[]{return CanPlantBugs && (CanChildAttack || (Scrubsanity.Is(SCRUBSANITY_OFF) && DekuShield));}}),
+                  LocationAccess(RC_LW_GS_ABOVE_THEATER,                   {[]{return IsAdult && AtNight && ((CanPlantBean(RR_LW_BEYOND_MIDO) && CanAdultAttack) || (randoCtx->GetTrickOption(RT_LW_GS_BEAN) && CanUse(RG_HOOKSHOT) && (CanUse(RG_LONGSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT) || HasBombchus || CanUse(RG_DINS_FIRE)))) && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_LW_GS_BEAN_PATCH_NEAR_THEATER,         {[]{return CanPlantBugs && (CanChildAttack || (randoCtx->GetOption(RSK_SHUFFLE_SCRUBS).Is(RO_SCRUBS_OFF) && DekuShield));}}),
                 }, {
                   //Exits
                   Entrance(RR_LW_FOREST_EXIT,   {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp
index 21c9ac641..5b935fe5e 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp
@@ -1,10 +1,10 @@
 #include "../location_access.hpp"
 #include "../logic.hpp"
-#include "../entrance.hpp"
-#include "../dungeon.hpp"
+#include "../../entrance.h"
+#include "../../dungeon.h"
 
 using namespace Logic;
-using namespace Settings;
+using namespace Rando;
 
 void AreaTable_Init_ShadowTemple() {
   /*--------------------------
@@ -12,15 +12,15 @@ void AreaTable_Init_ShadowTemple() {
   ---------------------------*/
   areaTable[RR_SHADOW_TEMPLE_ENTRYWAY] = Area("Shadow Temple Entryway", "Shadow Temple", RHT_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_SHADOW_TEMPLE_BEGINNING,    {[]{return Dungeon::ShadowTemple.IsVanilla() && (LogicLensShadow || CanUse(RG_LENS_OF_TRUTH)) && (CanUse(RG_HOVER_BOOTS) || CanUse(RG_HOOKSHOT));}}),
-                  Entrance(RR_SHADOW_TEMPLE_MQ_BEGINNING, {[]{return Dungeon::ShadowTemple.IsMQ()    && (LogicLensShadowMQ || CanUse(RG_LENS_OF_TRUTH)) && (CanUse(RG_HOVER_BOOTS) || CanUse(RG_HOOKSHOT));}}),
+                  Entrance(RR_SHADOW_TEMPLE_BEGINNING,    {[]{return randoCtx->GetDungeon(SHADOW_TEMPLE)->IsVanilla() && (randoCtx->GetTrickOption(RT_LENS_SHADOW) || CanUse(RG_LENS_OF_TRUTH)) && (CanUse(RG_HOVER_BOOTS) || CanUse(RG_HOOKSHOT));}}),
+                  Entrance(RR_SHADOW_TEMPLE_MQ_BEGINNING, {[]{return randoCtx->GetDungeon(SHADOW_TEMPLE)->IsMQ()    && (randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ) || CanUse(RG_LENS_OF_TRUTH)) && (CanUse(RG_HOVER_BOOTS) || CanUse(RG_HOOKSHOT));}}),
                   Entrance(RR_GRAVEYARD_WARP_PAD_REGION,  {[]{return true;}}),
   });
 
   /*--------------------------
   |     VANILLA DUNGEON      |
   ---------------------------*/
-  if (Dungeon::ShadowTemple.IsVanilla()) {
+  if (randoCtx->GetDungeon(SHADOW_TEMPLE)->IsVanilla()) {
   areaTable[RR_SHADOW_TEMPLE_BEGINNING] = Area("Shadow Temple Beginning", "Shadow Temple", RHT_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&NutPot, {[]{return true;}}),
@@ -53,16 +53,16 @@ void AreaTable_Init_ShadowTemple() {
                   LocationAccess(RC_SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST,   {[]{return CanJumpslash;}}),
                   LocationAccess(RC_SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST, {[]{return CanJumpslash;}}),
                   LocationAccess(RC_SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST,       {[]{return true;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST,       {[]{return (LogicShadowUmbrella && HoverBoots) || GoronBracelet;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST,      {[]{return (LogicShadowUmbrella && HoverBoots) || GoronBracelet;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST,           {[]{return SmallKeys(RR_SHADOW_TEMPLE, 2, 3) && ((LogicLensShadowPlatform && LogicLensShadow) || CanUse(RG_LENS_OF_TRUTH));}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_FREESTANDING_KEY,                 {[]{return SmallKeys(RR_SHADOW_TEMPLE, 2, 3) && ((LogicLensShadowPlatform && LogicLensShadow) || CanUse(RG_LENS_OF_TRUTH)) && Hookshot && (Bombs || GoronBracelet || (LogicShadowFreestandingKey && HasBombchus));}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST,       {[]{return (randoCtx->GetTrickOption(RT_SHADOW_UMBRELLA) && HoverBoots) || GoronBracelet;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST,      {[]{return (randoCtx->GetTrickOption(RT_SHADOW_UMBRELLA) && HoverBoots) || GoronBracelet;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST,           {[]{return SmallKeys(RR_SHADOW_TEMPLE, 2, 3) && ((randoCtx->GetTrickOption(RT_LENS_SHADOW_PLATFORM) && randoCtx->GetTrickOption(RT_LENS_SHADOW)) || CanUse(RG_LENS_OF_TRUTH));}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_FREESTANDING_KEY,                 {[]{return SmallKeys(RR_SHADOW_TEMPLE, 2, 3) && ((randoCtx->GetTrickOption(RT_LENS_SHADOW_PLATFORM) && randoCtx->GetTrickOption(RT_LENS_SHADOW)) || CanUse(RG_LENS_OF_TRUTH)) && Hookshot && (Bombs || GoronBracelet || (randoCtx->GetTrickOption(RT_SHADOW_FREESTANDING_KEY) && HasBombchus));}}),
                   LocationAccess(RC_SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM,                {[]{return CanJumpslash;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM,           {[]{return Hookshot || (LogicShadowUmbrellaGS && HoverBoots);}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_GS_SINGLE_GIANT_POT,              {[]{return SmallKeys(RR_SHADOW_TEMPLE, 2, 3) && ((LogicLensShadowPlatform && LogicLensShadow) || CanUse(RG_LENS_OF_TRUTH)) && Hookshot;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM,           {[]{return Hookshot || (randoCtx->GetTrickOption(RT_SHADOW_UMBRELLA_GS) && HoverBoots);}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_GS_SINGLE_GIANT_POT,              {[]{return SmallKeys(RR_SHADOW_TEMPLE, 2, 3) && ((randoCtx->GetTrickOption(RT_LENS_SHADOW_PLATFORM) && randoCtx->GetTrickOption(RT_LENS_SHADOW)) || CanUse(RG_LENS_OF_TRUTH)) && Hookshot;}}),
                 }, {
                   //Exits
-                  Entrance(RR_SHADOW_TEMPLE_WIND_TUNNEL, {[]{return ((LogicLensShadowPlatform && LogicLensShadow) || CanUse(RG_LENS_OF_TRUTH)) && Hookshot && SmallKeys(RR_SHADOW_TEMPLE, 3, 4);}}),
+                  Entrance(RR_SHADOW_TEMPLE_WIND_TUNNEL, {[]{return ((randoCtx->GetTrickOption(RT_LENS_SHADOW_PLATFORM) && randoCtx->GetTrickOption(RT_LENS_SHADOW)) || CanUse(RG_LENS_OF_TRUTH)) && Hookshot && SmallKeys(RR_SHADOW_TEMPLE, 3, 4);}}),
   });
 
   areaTable[RR_SHADOW_TEMPLE_WIND_TUNNEL] = Area("Shadow Temple Wind Tunnel", "Shadow Temple", RHT_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -84,18 +84,18 @@ void AreaTable_Init_ShadowTemple() {
                   LocationAccess(RC_SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT,         {[]{return CanAdultAttack;}}),
   }, {
                   //Exits
-                  Entrance(RR_SHADOW_TEMPLE_BOSS_ENTRYWAY, {[]{return (CanUse(RG_FAIRY_BOW) || CanUse(RG_DISTANT_SCARECROW) || (LogicShadowStatue && HasBombchus)) && SmallKeys(RR_SHADOW_TEMPLE, 5) && CanUse(RG_HOVER_BOOTS) && BossKeyShadowTemple;}})
+                  Entrance(RR_SHADOW_TEMPLE_BOSS_ENTRYWAY, {[]{return (CanUse(RG_FAIRY_BOW) || CanUse(RG_DISTANT_SCARECROW) || (randoCtx->GetTrickOption(RT_SHADOW_STATUE) && HasBombchus)) && SmallKeys(RR_SHADOW_TEMPLE, 5) && CanUse(RG_HOVER_BOOTS) && BossKeyShadowTemple;}})
   });
   }
 
   /*---------------------------
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
-  if (Dungeon::ShadowTemple.IsMQ()) {
+  if (randoCtx->GetDungeon(SHADOW_TEMPLE)->IsMQ()) {
   areaTable[RR_SHADOW_TEMPLE_MQ_BEGINNING] = Area("Shadow Temple MQ Beginning", "Shadow Temple", RHT_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_SHADOW_TEMPLE_ENTRYWAY,          {[]{return true;}}),
-                  Entrance(RR_SHADOW_TEMPLE_MQ_FIRST_BEAMOS,   {[]{return IsAdult && (CanUse(RG_FIRE_ARROWS) || HoverBoots || (LogicShadowMQGap && CanUse(RG_LONGSHOT)));}}),
+                  Entrance(RR_SHADOW_TEMPLE_MQ_FIRST_BEAMOS,   {[]{return IsAdult && (CanUse(RG_FIRE_ARROWS) || HoverBoots || (randoCtx->GetTrickOption(RT_SHADOW_MQ_GAP) && CanUse(RG_LONGSHOT)));}}),
                     //Trick: IsAdult && (CanUse(RG_FIRE_ARROWS) || HoverBoots || (LogicShadowMQGap && CanUse(RG_LONGSHOT)))
                   Entrance(RR_SHADOW_TEMPLE_MQ_DEAD_HAND_AREA, {[]{return HasExplosives && SmallKeys(RR_SHADOW_TEMPLE, 6);}}),
   });
@@ -118,13 +118,13 @@ void AreaTable_Init_ShadowTemple() {
 
   areaTable[RR_SHADOW_TEMPLE_MQ_UPPER_HUGE_PIT] = Area("Shadow Temple MQ Upper Huge Pit", "Shadow Temple", RHT_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST,   {[]{return CanPlay(SongOfTime) || (LogicShadowMQInvisibleBlades && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO));}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST,   {[]{return CanPlay(SongOfTime) || (randoCtx->GetTrickOption(RT_SHADOW_MQ_INVISIBLE_BLADES) && randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_OHKO));}}),
                     //Trick: CanPlay(SongOfTime) || (LogicShadowMQInvisibleBlades && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO))
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST, {[]{return CanPlay(SongOfTime) || (LogicShadowMQInvisibleBlades && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO));}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST, {[]{return CanPlay(SongOfTime) || (randoCtx->GetTrickOption(RT_SHADOW_MQ_INVISIBLE_BLADES) && randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_OHKO));}}),
                     //Trick: CanPlay(SongOfTime) || (LogicShadowMQInvisibleBlades && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO))
   }, {
                   //Exits
-                  Entrance(RR_SHADOW_TEMPLE_MQ_LOWER_HUGE_PIT, {[]{return HasFireSource || LogicShadowMQHugePit;}}),
+                  Entrance(RR_SHADOW_TEMPLE_MQ_LOWER_HUGE_PIT, {[]{return HasFireSource || randoCtx->GetTrickOption(RT_SHADOW_MQ_HUGE_PIT);}}),
                     //Trick: HasFireSource || LogicShadowMQHugePit
   });
 
@@ -132,15 +132,15 @@ void AreaTable_Init_ShadowTemple() {
                   //Locations
                   LocationAccess(RC_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST,  {[]{return IsAdult && CanUse(RG_LONGSHOT);}}),
                   LocationAccess(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST,  {[]{return true;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST,  {[]{return (LogicShadowUmbrella && HoverBoots) || GoronBracelet;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST, {[]{return (LogicShadowUmbrella && HoverBoots) || GoronBracelet;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST,      {[]{return CanJumpslash && HoverBoots && SmallKeys(RR_SHADOW_TEMPLE, 3) && ((LogicLensShadowMQ && LogicLensShadowMQPlatform) || CanUse(RG_LENS_OF_TRUTH));}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST,          {[]{return (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) && HoverBoots && SmallKeys(RR_SHADOW_TEMPLE, 3) && Hookshot && ((LogicLensShadowMQ &&
-                   LogicLensShadowMQInvisibleBlades && LogicLensShadowMQPlatform) || CanUse(RG_LENS_OF_TRUTH));}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM,      {[]{return Hookshot || (LogicShadowUmbrellaGS && HoverBoots);}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST,  {[]{return (randoCtx->GetTrickOption(RT_SHADOW_UMBRELLA) && HoverBoots) || GoronBracelet;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST, {[]{return (randoCtx->GetTrickOption(RT_SHADOW_UMBRELLA) && HoverBoots) || GoronBracelet;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST,      {[]{return CanJumpslash && HoverBoots && SmallKeys(RR_SHADOW_TEMPLE, 3) && ((randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ) && randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ_PLATFORM)) || CanUse(RG_LENS_OF_TRUTH));}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST,          {[]{return (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) && HoverBoots && SmallKeys(RR_SHADOW_TEMPLE, 3) && Hookshot && ((randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ) &&
+                   randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ_INVISIBLE_BLADES) && randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ_PLATFORM)) || CanUse(RG_LENS_OF_TRUTH));}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM,      {[]{return Hookshot || (randoCtx->GetTrickOption(RT_SHADOW_UMBRELLA_GS) && HoverBoots);}}),
   }, {
                   //Exits
-                  Entrance(RR_SHADOW_TEMPLE_MQ_WIND_TUNNEL, {[]{return HoverBoots && ((LogicLensShadowMQ && LogicLensShadowMQPlatform) || CanUse(RG_LENS_OF_TRUTH)) && Hookshot && SmallKeys(RR_SHADOW_TEMPLE, 4);}}),
+                  Entrance(RR_SHADOW_TEMPLE_MQ_WIND_TUNNEL, {[]{return HoverBoots && ((randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ) && randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ_PLATFORM)) || CanUse(RG_LENS_OF_TRUTH)) && Hookshot && SmallKeys(RR_SHADOW_TEMPLE, 4);}}),
   });
 
   areaTable[RR_SHADOW_TEMPLE_MQ_WIND_TUNNEL] = Area("Shadow Temple MQ Wind Tunnel", "Shadow Temple", RHT_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {
@@ -161,11 +161,11 @@ void AreaTable_Init_ShadowTemple() {
   areaTable[RR_SHADOW_TEMPLE_MQ_BEYOND_BOAT] = Area("Shadow Temple MQ Beyond Boat", "Shadow Temple", RHT_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_SHADOW_TEMPLE_MQ_GS_AFTER_SHIP,  {[]{return true;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS,   {[]{return Bow || (LogicShadowStatue && HasBombchus);}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS,   {[]{return Bow || (randoCtx->GetTrickOption(RT_SHADOW_STATUE) && HasBombchus);}}),
   }, {
                   //Exits
                   Entrance(RR_SHADOW_TEMPLE_MQ_INVISIBLE_MAZE, {[]{return Bow && CanPlay(SongOfTime) && IsAdult && CanUse(RG_LONGSHOT);}}),
-                  Entrance(RR_SHADOW_TEMPLE_BOSS_ENTRYWAY,     {[]{return (CanUse(RG_FAIRY_BOW) || (LogicShadowStatue && HasBombchus)) && CanUse(RG_HOVER_BOOTS) && BossKeyShadowTemple;}}),
+                  Entrance(RR_SHADOW_TEMPLE_BOSS_ENTRYWAY,     {[]{return (CanUse(RG_FAIRY_BOW) || (randoCtx->GetTrickOption(RT_SHADOW_STATUE) && HasBombchus)) && CanUse(RG_HOVER_BOOTS) && BossKeyShadowTemple;}}),
   });
 
   areaTable[RR_SHADOW_TEMPLE_MQ_INVISIBLE_MAZE] = Area("Shadow Temple MQ Invisible Maze", "Shadow Temple", RHT_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -173,7 +173,7 @@ void AreaTable_Init_ShadowTemple() {
                   LocationAccess(RC_SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST, {[]{return CanUse(RG_DINS_FIRE) && SmallKeys(RR_SHADOW_TEMPLE, 6);}}),
                   LocationAccess(RC_SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST,         {[]{return CanUse(RG_DINS_FIRE) && SmallKeys(RR_SHADOW_TEMPLE, 6);}}),
                   //below previously returned true
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST,      {[]{return CanUse(RG_LENS_OF_TRUTH) || LogicLensShadowMQDeadHand;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST,      {[]{return CanUse(RG_LENS_OF_TRUTH) || randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ_DEADHAND);}}),
                   LocationAccess(RC_SHADOW_TEMPLE_MQ_FREESTANDING_KEY,       {[]{return true;}}),
   }, {});
   }
@@ -185,8 +185,8 @@ void AreaTable_Init_ShadowTemple() {
         Area("Shadow Temple Boss Entryway", "Shadow Temple", RHT_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
              {
                  // Exits
-                 Entrance(RR_SHADOW_TEMPLE_BEYOND_BOAT, { [] { return Dungeon::ShadowTemple.IsVanilla() && false; } }),
-                 Entrance(RR_SHADOW_TEMPLE_MQ_BEYOND_BOAT, { [] { return Dungeon::ShadowTemple.IsMQ() && false; } }),
+                 Entrance(RR_SHADOW_TEMPLE_BEYOND_BOAT, { [] { return randoCtx->GetDungeon(SHADOW_TEMPLE)->IsVanilla() && false; } }),
+                 Entrance(RR_SHADOW_TEMPLE_MQ_BEYOND_BOAT, { [] { return randoCtx->GetDungeon(SHADOW_TEMPLE)->IsMQ() && false; } }),
                  Entrance(RR_SHADOW_TEMPLE_BOSS_ROOM, { [] { return true; } }),
              });
 
@@ -196,9 +196,9 @@ void AreaTable_Init_ShadowTemple() {
                  // Events
                  EventAccess(&ShadowTempleClear, { [] {
                      return ShadowTempleClear ||
-                            ((CanUse(RG_LENS_OF_TRUTH) || LogicLensBongo) &&
+                            ((CanUse(RG_LENS_OF_TRUTH) || randoCtx->GetTrickOption(RT_LENS_BONGO)) &&
                              (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) &&
-                             (CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT) || LogicShadowBongo));
+                             (CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT) || randoCtx->GetTrickOption(RT_SHADOW_BONGO)));
                  } }),
              },
              {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp
index e9b67bb63..c5ab8348f 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp
@@ -1,10 +1,10 @@
 #include "../location_access.hpp"
 #include "../logic.hpp"
-#include "../entrance.hpp"
-#include "../dungeon.hpp"
+#include "../../entrance.h"
+#include "../../dungeon.h"
 
 using namespace Logic;
-using namespace Settings;
+using namespace Rando;
 
 void AreaTable_Init_SpiritTemple() {
   /*--------------------------
@@ -12,15 +12,15 @@ void AreaTable_Init_SpiritTemple() {
   ---------------------------*/
   areaTable[RR_SPIRIT_TEMPLE_ENTRYWAY] = Area("Spirit Temple Entryway", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_SPIRIT_TEMPLE_LOBBY,                  {[]{return Dungeon::SpiritTemple.IsVanilla();}}),
-                  Entrance(RR_SPIRIT_TEMPLE_MQ_LOBBY,               {[]{return Dungeon::SpiritTemple.IsMQ();}}),
+                  Entrance(RR_SPIRIT_TEMPLE_LOBBY,                  {[]{return randoCtx->GetDungeon(SPIRIT_TEMPLE)->IsVanilla();}}),
+                  Entrance(RR_SPIRIT_TEMPLE_MQ_LOBBY,               {[]{return randoCtx->GetDungeon(SPIRIT_TEMPLE)->IsMQ();}}),
                   Entrance(RR_DESERT_COLOSSUS_FROM_SPIRIT_ENTRYWAY, {[]{return true;}}),
   });
 
   /*--------------------------
   |     VANILLA DUNGEON      |
   ---------------------------*/
-  if (Dungeon::SpiritTemple.IsVanilla()) {
+  if (randoCtx->GetDungeon(SPIRIT_TEMPLE)->IsVanilla()) {
   areaTable[RR_SPIRIT_TEMPLE_LOBBY] = Area("Spirit Temple Lobby", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_SPIRIT_TEMPLE_ENTRYWAY,    {[]{return true;}}),
@@ -33,9 +33,9 @@ void AreaTable_Init_SpiritTemple() {
                   EventAccess(&NutCrate, {[]{return true;}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST,        {[]{return (Boomerang || Slingshot || (HasBombchus && LogicSpiritChildBombchu)) && (HasExplosives || ((Nuts || Boomerang) && (Sticks || KokiriSword || Slingshot)));}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST, {[]{return (Boomerang || Slingshot || (HasBombchus && LogicSpiritChildBombchu)) && (HasExplosives || ((Nuts || Boomerang) && (Sticks || KokiriSword || Slingshot))) && (Sticks || CanUse(RG_DINS_FIRE));}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_GS_METAL_FENCE,            {[]{return (Boomerang || Slingshot || (HasBombchus && LogicSpiritChildBombchu)) && (HasExplosives || ((Nuts || Boomerang) && (Sticks || KokiriSword || Slingshot)));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST,        {[]{return (Boomerang || Slingshot || (HasBombchus && randoCtx->GetTrickOption(RT_SPIRIT_CHILD_CHU))) && (HasExplosives || ((Nuts || Boomerang) && (Sticks || KokiriSword || Slingshot)));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST, {[]{return (Boomerang || Slingshot || (HasBombchus && randoCtx->GetTrickOption(RT_SPIRIT_CHILD_CHU))) && (HasExplosives || ((Nuts || Boomerang) && (Sticks || KokiriSword || Slingshot))) && (Sticks || CanUse(RG_DINS_FIRE));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_GS_METAL_FENCE,            {[]{return (Boomerang || Slingshot || (HasBombchus && randoCtx->GetTrickOption(RT_SPIRIT_CHILD_CHU))) && (HasExplosives || ((Nuts || Boomerang) && (Sticks || KokiriSword || Slingshot)));}}),
                 }, {
                   //Exits
                   Entrance(RR_SPIRIT_TEMPLE_CHILD_CLIMB, {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 1);}}),
@@ -43,24 +43,24 @@ void AreaTable_Init_SpiritTemple() {
 
   areaTable[RR_SPIRIT_TEMPLE_CHILD_CLIMB] = Area("Child Spirit Temple Climb", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST, {[]{return HasProjectile(HasProjectileAge::Both) || ((SmallKeys(RR_SPIRIT_TEMPLE, 3) || (SmallKeys(RR_SPIRIT_TEMPLE, 2) && BombchusInLogic && ShuffleDungeonEntrances.Is(SHUFFLEDUNGEONS_OFF))) && CanUse(RG_SILVER_GAUNTLETS) && HasProjectile(HasProjectileAge::Adult)) || (SmallKeys(RR_SPIRIT_TEMPLE, 5) && IsChild && HasProjectile(HasProjectileAge::Child));}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST,  {[]{return HasProjectile(HasProjectileAge::Both) || ((SmallKeys(RR_SPIRIT_TEMPLE, 3) || (SmallKeys(RR_SPIRIT_TEMPLE, 2) && BombchusInLogic && ShuffleDungeonEntrances.Is(SHUFFLEDUNGEONS_OFF))) && CanUse(RG_SILVER_GAUNTLETS) && HasProjectile(HasProjectileAge::Adult)) || (SmallKeys(RR_SPIRIT_TEMPLE, 5) && IsChild && HasProjectile(HasProjectileAge::Child));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST, {[]{return HasProjectile(HasProjectileAge::Both) || ((SmallKeys(RR_SPIRIT_TEMPLE, 3) || (SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && CanUse(RG_SILVER_GAUNTLETS) && HasProjectile(HasProjectileAge::Adult)) || (SmallKeys(RR_SPIRIT_TEMPLE, 5) && IsChild && HasProjectile(HasProjectileAge::Child));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST,  {[]{return HasProjectile(HasProjectileAge::Both) || ((SmallKeys(RR_SPIRIT_TEMPLE, 3) || (SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && CanUse(RG_SILVER_GAUNTLETS) && HasProjectile(HasProjectileAge::Adult)) || (SmallKeys(RR_SPIRIT_TEMPLE, 5) && IsChild && HasProjectile(HasProjectileAge::Child));}}),
                   LocationAccess(RC_SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM,    {[]{return HasProjectile(HasProjectileAge::Both) || CanUse(RG_DINS_FIRE) ||
                                                                                       (CanTakeDamage && (CanJumpslash || HasProjectile(HasProjectileAge::Child))) ||
                                                                                         (IsChild && SmallKeys(RR_SPIRIT_TEMPLE, 5) && HasProjectile(HasProjectileAge::Child)) ||
-                                                                                          ((SmallKeys(RR_SPIRIT_TEMPLE, 3) || (SmallKeys(RR_SPIRIT_TEMPLE, 2) && BombchusInLogic && ShuffleDungeonEntrances.Is(SHUFFLEDUNGEONS_OFF))) && CanUse(RG_SILVER_GAUNTLETS) && (HasProjectile(HasProjectileAge::Adult) || (CanTakeDamage && CanJumpslash)));}}),
+                                                                                          ((SmallKeys(RR_SPIRIT_TEMPLE, 3) || (SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && CanUse(RG_SILVER_GAUNTLETS) && (HasProjectile(HasProjectileAge::Adult) || (CanTakeDamage && CanJumpslash)));}}),
                 }, {
                   //Exits
-                  Entrance(RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER, {[]{return HasExplosives || (SunlightArrows && CanUse(RG_LIGHT_ARROWS));}}),
+                  Entrance(RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER, {[]{return HasExplosives || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && CanUse(RG_LIGHT_ARROWS));}}),
   });
 
   areaTable[RR_SPIRIT_TEMPLE_EARLY_ADULT] = Area("Early Adult Spirit Temple", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_SPIRIT_TEMPLE_COMPASS_CHEST,            {[]{return CanUse(RG_HOOKSHOT) && CanPlay(ZeldasLullaby);}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST,  {[]{return (CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOOMERANG) || HasBombchus || (Bombs && IsAdult && LogicSpiritLowerAdultSwitch)) && (CanUse(RG_HOVER_BOOTS) || CanJumpslash);}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST,  {[]{return (CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOOMERANG) || HasBombchus || (Bombs && IsAdult && randoCtx->GetTrickOption(RT_SPIRIT_LOWER_ADULT_SWITCH))) && (CanUse(RG_HOVER_BOOTS) || CanJumpslash);}}),
                   LocationAccess(RC_SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST,  {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 3);}}),
                   LocationAccess(RC_SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST, {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 3);}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_GS_BOULDER_ROOM,          {[]{return CanPlay(SongOfTime) && (Bow || Hookshot || HasBombchus || (Bombs && LogicSpiritLowerAdultSwitch));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_GS_BOULDER_ROOM,          {[]{return CanPlay(SongOfTime) && (Bow || Hookshot || HasBombchus || (Bombs && randoCtx->GetTrickOption(RT_SPIRIT_LOWER_ADULT_SWITCH)));}}),
                 }, {
                   //Exits
                   Entrance(RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER, {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 1);}}),
@@ -68,34 +68,34 @@ void AreaTable_Init_SpiritTemple() {
 
   areaTable[RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER] = Area("Spirit Temple Central Chamber", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SPIRIT_TEMPLE_MAP_CHEST,                    {[]{return ((HasExplosives || SmallKeys(RR_SPIRIT_TEMPLE, 3) || (SmallKeys(RR_SPIRIT_TEMPLE, 2) && BombchusInLogic && ShuffleDungeonEntrances.Is(SHUFFLEDUNGEONS_OFF))) &&
+                  LocationAccess(RC_SPIRIT_TEMPLE_MAP_CHEST,                    {[]{return ((HasExplosives || SmallKeys(RR_SPIRIT_TEMPLE, 3) || (SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) &&
 
                                                                                                 (CanUse(RG_DINS_FIRE) ||
-                                                                                                    (((MagicMeter && FireArrows) || LogicSpiritMapChest) && Bow && Sticks))) ||
+                                                                                                    (((MagicMeter && FireArrows) || randoCtx->GetTrickOption(RT_SPIRIT_MAP_CHEST)) && Bow && Sticks))) ||
                                                                                             (SmallKeys(RR_SPIRIT_TEMPLE, 5) && HasExplosives &&
                                                                                                 CanUse(RG_STICKS)) ||
                                                                                             (SmallKeys(RR_SPIRIT_TEMPLE, 3) &&
-                                                                                                (CanUse(RG_FIRE_ARROWS) || (LogicSpiritMapChest && Bow)) &&
+                                                                                                (CanUse(RG_FIRE_ARROWS) || (randoCtx->GetTrickOption(RT_SPIRIT_MAP_CHEST) && Bow)) &&
                                                                                                 CanUse(RG_SILVER_GAUNTLETS));}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST,         {[]{return ((HasExplosives || SmallKeys(RR_SPIRIT_TEMPLE, 3) || (SmallKeys(RR_SPIRIT_TEMPLE, 2) && BombchusInLogic && ShuffleDungeonEntrances.Is(SHUFFLEDUNGEONS_OFF))) &&
+                  LocationAccess(RC_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST,         {[]{return ((HasExplosives || SmallKeys(RR_SPIRIT_TEMPLE, 3) || (SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) &&
                                                                                                 (CanUse(RG_DINS_FIRE) ||
-                                                                                                    (((MagicMeter && FireArrows) || LogicSpiritSunChest) && Bow && Sticks))) ||
+                                                                                                    (((MagicMeter && FireArrows) || randoCtx->GetTrickOption(RT_SPIRIT_SUN_CHEST)) && Bow && Sticks))) ||
                                                                                             (SmallKeys(RR_SPIRIT_TEMPLE, 5) && HasExplosives &&
                                                                                                 CanUse(RG_STICKS)) ||
                                                                                             (SmallKeys(RR_SPIRIT_TEMPLE, 3) &&
-                                                                                                (CanUse(RG_FIRE_ARROWS) || (LogicSpiritSunChest && Bow)) &&
+                                                                                                (CanUse(RG_FIRE_ARROWS) || (randoCtx->GetTrickOption(RT_SPIRIT_SUN_CHEST) && Bow)) &&
                                                                                                 CanUse(RG_SILVER_GAUNTLETS));}}),
                   LocationAccess(RC_SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST,       {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 3) && CanUse(RG_SILVER_GAUNTLETS) && CanPlay(ZeldasLullaby);}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST,  {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 3) && CanUse(RG_SILVER_GAUNTLETS) && CanPlay(ZeldasLullaby) && (Hookshot || HoverBoots || LogicSpiritLobbyJump);}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST,  {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 3) && CanUse(RG_SILVER_GAUNTLETS) && CanPlay(ZeldasLullaby) && (Hookshot || HoverBoots || randoCtx->GetTrickOption(RT_SPIRIT_LOBBY_JUMP));}}),
                   LocationAccess(RC_SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM, {[]{return (HasExplosives && Boomerang && Hookshot) ||
                                                                                             (CanUse(RG_BOOMERANG) && SmallKeys(RR_SPIRIT_TEMPLE, 5) && HasExplosives) ||
                                                                                             (Hookshot && CanUse(RG_SILVER_GAUNTLETS) &&
                                                                                                 (SmallKeys(RR_SPIRIT_TEMPLE, 3) ||
-                                                                                                    (SmallKeys(RR_SPIRIT_TEMPLE, 2) && Boomerang && BombchusInLogic && ShuffleDungeonEntrances.Is(SHUFFLEDUNGEONS_OFF))));}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_GS_LOBBY,                     {[]{return ((HasExplosives || SmallKeys(RR_SPIRIT_TEMPLE, 3) || (SmallKeys(RR_SPIRIT_TEMPLE, 2) && BombchusInLogic && ShuffleDungeonEntrances.Is(SHUFFLEDUNGEONS_OFF))) &&
-                                                                                                LogicSpiritLobbyGS && Boomerang && (Hookshot || HoverBoots || LogicSpiritLobbyJump)) ||
-                                                                                            (LogicSpiritLobbyGS && SmallKeys(RR_SPIRIT_TEMPLE, 5) && HasExplosives && CanUse(RG_BOOMERANG)) ||
-                                                                                            (SmallKeys(RR_SPIRIT_TEMPLE, 3) && CanUse(RG_SILVER_GAUNTLETS) && (Hookshot || HoverBoots || LogicSpiritLobbyJump));}}),
+                                                                                                    (SmallKeys(RR_SPIRIT_TEMPLE, 2) && Boomerang && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_GS_LOBBY,                     {[]{return ((HasExplosives || SmallKeys(RR_SPIRIT_TEMPLE, 3) || (SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) &&
+                                                                                                randoCtx->GetTrickOption(RT_SPIRIT_LOBBY_GS) && Boomerang && (Hookshot || HoverBoots || randoCtx->GetTrickOption(RT_SPIRIT_LOBBY_JUMP))) ||
+                                                                                            (randoCtx->GetTrickOption(RT_SPIRIT_LOBBY_GS) && SmallKeys(RR_SPIRIT_TEMPLE, 5) && HasExplosives && CanUse(RG_BOOMERANG)) ||
+                                                                                            (SmallKeys(RR_SPIRIT_TEMPLE, 3) && CanUse(RG_SILVER_GAUNTLETS) && (Hookshot || HoverBoots || randoCtx->GetTrickOption(RT_SPIRIT_LOBBY_JUMP)));}}),
                 }, {
                   //Exits
                   Entrance(RR_SPIRIT_TEMPLE_OUTDOOR_HANDS,              {[]{return CanJumpslash || HasExplosives;}}),
@@ -114,18 +114,18 @@ void AreaTable_Init_SpiritTemple() {
 
   areaTable[RR_SPIRIT_TEMPLE_BEYOND_CENTRAL_LOCKED_DOOR] = Area("Spirit Temple Beyond Central Locked Door", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST,         {[]{return (MirrorShield || (SunlightArrows && CanUse(RG_LIGHT_ARROWS))) && HasExplosives;}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST,  {[]{return (LogicLensSpirit || CanUse(RG_LENS_OF_TRUTH)) && HasExplosives;}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST, {[]{return (LogicLensSpirit || CanUse(RG_LENS_OF_TRUTH)) && HasExplosives;}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST,         {[]{return (MirrorShield || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && CanUse(RG_LIGHT_ARROWS))) && HasExplosives;}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST,  {[]{return (randoCtx->GetTrickOption(RT_LENS_SPIRIT) || CanUse(RG_LENS_OF_TRUTH)) && HasExplosives;}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST, {[]{return (randoCtx->GetTrickOption(RT_LENS_SPIRIT) || CanUse(RG_LENS_OF_TRUTH)) && HasExplosives;}}),
                 }, {
                   //Exits
-                  Entrance(RR_SPIRIT_TEMPLE_BEYOND_FINAL_LOCKED_DOOR, {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 5) && (LogicSpiritWall || CanUse(RG_LONGSHOT) || HasBombchus || ((Bombs || Nuts || CanUse(RG_DINS_FIRE)) && (Bow || CanUse(RG_HOOKSHOT) || Hammer)));}}),
+                  Entrance(RR_SPIRIT_TEMPLE_BEYOND_FINAL_LOCKED_DOOR, {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 5) && (randoCtx->GetTrickOption(RT_SPIRIT_WALL) || CanUse(RG_LONGSHOT) || HasBombchus || ((Bombs || Nuts || CanUse(RG_DINS_FIRE)) && (Bow || CanUse(RG_HOOKSHOT) || Hammer)));}}),
   });
 
   areaTable[RR_SPIRIT_TEMPLE_BEYOND_FINAL_LOCKED_DOOR] = Area("Spirit Temple Beyond Final Locked Door", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SPIRIT_TEMPLE_BOSS_KEY_CHEST, {[]{return CanPlay(ZeldasLullaby) && ((CanTakeDamage && LogicFlamingChests) || (Bow && Hookshot));}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_TOPMOST_CHEST,  {[]{return (MirrorShield && CanAdultAttack) || (SunlightArrows && CanUse(RG_LIGHT_ARROWS));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_BOSS_KEY_CHEST, {[]{return CanPlay(ZeldasLullaby) && ((CanTakeDamage && randoCtx->GetTrickOption(RT_FLAMING_CHESTS)) || (Bow && Hookshot));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_TOPMOST_CHEST,  {[]{return (MirrorShield && CanAdultAttack) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && CanUse(RG_LIGHT_ARROWS));}}),
   }, {
                   //Exits
                   Entrance(RR_SPIRIT_TEMPLE_INSIDE_STATUE_HEAD, {[]{return MirrorShield && HasExplosives && Hookshot;}}),
@@ -143,7 +143,7 @@ void AreaTable_Init_SpiritTemple() {
   /*---------------------------
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
-  if (Dungeon::SpiritTemple.IsMQ()) {
+  if (randoCtx->GetDungeon(SPIRIT_TEMPLE)->IsMQ()) {
   areaTable[RR_SPIRIT_TEMPLE_MQ_LOBBY] = Area("Spirit Temple MQ Lobby", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST, {[]{return true;}}),
@@ -164,7 +164,7 @@ void AreaTable_Init_SpiritTemple() {
                   LocationAccess(RC_SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST,  {[]{return Here(RR_SPIRIT_TEMPLE_MQ_ADULT, []{return SmallKeys(RR_SPIRIT_TEMPLE, 7) && Hammer;});}}),
                   LocationAccess(RC_SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST,       {[]{return KokiriSword && HasBombchus && Slingshot && CanUse(RG_DINS_FIRE);}}),
                   LocationAccess(RC_SPIRIT_TEMPLE_MQ_MAP_CHEST,                  {[]{return KokiriSword || Bombs;}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST, {[]{return HasBombchus && SmallKeys(RR_SPIRIT_TEMPLE, 7) && Slingshot && (CanUse(RG_DINS_FIRE) || (Here(RR_SPIRIT_TEMPLE_MQ_ADULT, []{return IsAdult && (CanUse(RG_FIRE_ARROWS) || (LogicSpiritMQFrozenEye && CanUse(RG_FAIRY_BOW) && CanPlay(SongOfTime)));})));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST, {[]{return HasBombchus && SmallKeys(RR_SPIRIT_TEMPLE, 7) && Slingshot && (CanUse(RG_DINS_FIRE) || (Here(RR_SPIRIT_TEMPLE_MQ_ADULT, []{return IsAdult && (CanUse(RG_FIRE_ARROWS) || (randoCtx->GetTrickOption(RT_SPIRIT_MQ_FROZEN_EYE) && CanUse(RG_FAIRY_BOW) && CanPlay(SongOfTime)));})));}}),
                     //Trick: HasBombchus && SmallKeys(RR_SPIRIT_TEMPLE, 7) && Slingshot && (CanUse(RG_DINS_FIRE) || (SPIRIT_TEMPLE_MQ_ADULT.Adult() && IsAdult && (CanUse(RG_FIRE_ARROWS) || (LogicSpiritMQFrozenEye && CanUse(RG_FAIRY_BOW) && CanPlay(SongOfTime)))))
   }, {
                   //Exits
@@ -175,34 +175,34 @@ void AreaTable_Init_SpiritTemple() {
                   //Locations
                   LocationAccess(RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST,     {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 7);}}),
                   LocationAccess(RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST,   {[]{return CanPlay(ZeldasLullaby) && (CanJumpslash || CanUse(RG_HOVER_BOOTS));}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST, {[]{return (LogicLensSpiritMQ || CanUse(RG_LENS_OF_TRUTH));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST, {[]{return (randoCtx->GetTrickOption(RT_LENS_SPIRIT_MQ) || CanUse(RG_LENS_OF_TRUTH));}}),
                   LocationAccess(RC_SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST,           {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 5);}}),
                   LocationAccess(RC_SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST,          {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 5) && CanPlay(SongOfTime);}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST,              {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 5) && CanPlay(SongOfTime) && (MirrorShield || (SunlightArrows && CanUse(RG_LIGHT_ARROWS)));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST,              {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 5) && CanPlay(SongOfTime) && (MirrorShield || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && CanUse(RG_LIGHT_ARROWS)));}}),
                   LocationAccess(RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST,   {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 7);}}),
                   LocationAccess(RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH,  {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 7);}}),
   }, {
                   //Exits
-                  Entrance(RR_SPIRIT_TEMPLE_MQ_LOWER_ADULT,        {[]{return MirrorShield && IsAdult && (CanUse(RG_FIRE_ARROWS) || (LogicSpiritMQLowerAdult && CanUse(RG_DINS_FIRE) && Bow));}}),
+                  Entrance(RR_SPIRIT_TEMPLE_MQ_LOWER_ADULT,        {[]{return MirrorShield && IsAdult && (CanUse(RG_FIRE_ARROWS) || (randoCtx->GetTrickOption(RT_SPIRIT_MQ_LOWER_ADULT) && CanUse(RG_DINS_FIRE) && Bow));}}),
                     //Trick: MirrorShield && IsAdult && (CanUse(RG_FIRE_ARROWS) || (LogicSpiritMQLowerAdult && CanUse(RG_DINS_FIRE) && Bow))
                   Entrance(RR_SPIRIT_TEMPLE_MQ_SHARED,             {[]{return true;}}),
                   Entrance(RR_SPIRIT_TEMPLE_MQ_BOSS_AREA,          {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 6) && CanPlay(ZeldasLullaby) && Hammer;}}),
-                  Entrance(RR_SPIRIT_TEMPLE_MQ_MIRROR_SHIELD_HAND, {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 5) && CanPlay(SongOfTime) && CanJumpslash && (LogicLensSpiritMQ || CanUse(RG_LENS_OF_TRUTH));}}),
+                  Entrance(RR_SPIRIT_TEMPLE_MQ_MIRROR_SHIELD_HAND, {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 5) && CanPlay(SongOfTime) && CanJumpslash && (randoCtx->GetTrickOption(RT_LENS_SPIRIT_MQ) || CanUse(RG_LENS_OF_TRUTH));}}),
   });
 
   areaTable[RR_SPIRIT_TEMPLE_MQ_SHARED] = Area("Spirit Temple MQ Shared", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST, {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 6);}}),
                   LocationAccess(RC_SPIRIT_TEMPLE_MQ_COMPASS_CHEST,           {[]{return (IsChild && CanUse(RG_FAIRY_SLINGSHOT) && SmallKeys(RR_SPIRIT_TEMPLE, 7)) || (IsAdult && CanUse(RG_FAIRY_BOW)) || (Bow && Slingshot);}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST,    {[]{return CanPlay(SongOfTime) || LogicSpiritMQSunBlockSoT || IsAdult;}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST,    {[]{return CanPlay(SongOfTime) || randoCtx->GetTrickOption(RT_SPIRIT_MQ_SUN_BLOCK_SOT) || IsAdult;}}),
                     //Trick: CanPlay(SongOfTime) || LogicSpiritMQSunBlockSoT || IsAdult
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM,       {[]{return (LogicSpiritMQSunBlockGS && Boomerang && (CanPlay(SongOfTime) || LogicSpiritMQSunBlockSoT)) || IsAdult;}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM,       {[]{return (randoCtx->GetTrickOption(RT_SPIRIT_MQ_SUN_BLOCK_GS) && Boomerang && (CanPlay(SongOfTime) || randoCtx->GetTrickOption(RT_SPIRIT_MQ_SUN_BLOCK_SOT))) || IsAdult;}}),
                     //Trick: (LogicSpiritMQSunBlockGS && Boomerang && (CanPlay(SongOfTime) || LogicSpiritMQSunBlockSoT)) || IsAdult
    }, {
                   //Exits
-                  Entrance(RR_SPIRIT_TEMPLE_MQ_SILVER_GAUNTLETS_HAND, {[]{return (SmallKeys(RR_SPIRIT_TEMPLE, 7) && (CanPlay(SongOfTime) || LogicSpiritMQSunBlockSoT || IsAdult)) || (SmallKeys(RR_SPIRIT_TEMPLE, 4) && CanPlay(SongOfTime) && CanJumpslash && (LogicLensSpiritMQ || CanUse(RG_LENS_OF_TRUTH)));}}),
+                  Entrance(RR_SPIRIT_TEMPLE_MQ_SILVER_GAUNTLETS_HAND, {[]{return (SmallKeys(RR_SPIRIT_TEMPLE, 7) && (CanPlay(SongOfTime) || randoCtx->GetTrickOption(RT_SPIRIT_MQ_SUN_BLOCK_SOT) || IsAdult)) || (SmallKeys(RR_SPIRIT_TEMPLE, 4) && CanPlay(SongOfTime) && CanJumpslash && (randoCtx->GetTrickOption(RT_LENS_SPIRIT_MQ) || CanUse(RG_LENS_OF_TRUTH)));}}),
                     //Trick: (SmallKeys(RR_SPIRIT_TEMPLE, 7) && (CanPlay(SongOfTime) || LogicSpiritMQSunBlockSoT || IsAdult)) || (SmallKeys(RR_SPIRIT_TEMPLE, 4) && CanPlay(SongOfTime) && (LogicLensSpiritMQ || CanUse(RG_LENS_OF_TRUTH)))
-                  Entrance(RR_DESERT_COLOSSUS,                        {[]{return (SmallKeys(RR_SPIRIT_TEMPLE, 7) && (CanPlay(SongOfTime) || LogicSpiritMQSunBlockSoT || IsAdult)) || (SmallKeys(RR_SPIRIT_TEMPLE, 4) && CanPlay(SongOfTime) && CanJumpslash && (LogicLensSpiritMQ || CanUse(RG_LENS_OF_TRUTH)) && IsAdult);}}),
+                  Entrance(RR_DESERT_COLOSSUS,                        {[]{return (SmallKeys(RR_SPIRIT_TEMPLE, 7) && (CanPlay(SongOfTime) || randoCtx->GetTrickOption(RT_SPIRIT_MQ_SUN_BLOCK_SOT) || IsAdult)) || (SmallKeys(RR_SPIRIT_TEMPLE, 4) && CanPlay(SongOfTime) && CanJumpslash && (randoCtx->GetTrickOption(RT_LENS_SPIRIT_MQ) || CanUse(RG_LENS_OF_TRUTH)) && IsAdult);}}),
                     //Trick: (SmallKeys(RR_SPIRIT_TEMPLE, 7) && (CanPlay(SongOfTime) || LogicSpiritMQSunBlockSoT || IsAdult)) || (SmallKeys(RR_SPIRIT_TEMPLE, 4) && CanPlay(SongOfTime) && (LogicLensSpiritMQ || CanUse(RG_LENS_OF_TRUTH)) && IsAdult)
   });
 
@@ -217,7 +217,7 @@ void AreaTable_Init_SpiritTemple() {
 
   areaTable[RR_SPIRIT_TEMPLE_MQ_BOSS_AREA] = Area("Spirit Temple MQ Boss Area", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST, {[]{return LogicLensSpiritMQ || CanUse(RG_LENS_OF_TRUTH);}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST, {[]{return randoCtx->GetTrickOption(RT_LENS_SPIRIT_MQ) || CanUse(RG_LENS_OF_TRUTH);}}),
   }, {
                   //Exits
                   Entrance(RR_SPIRIT_TEMPLE_MQ_INSIDE_STATUE_HEAD, {[]{return MirrorShield && Hookshot;}}),
@@ -249,8 +249,8 @@ void AreaTable_Init_SpiritTemple() {
         "Spirit Temple Boss Entryway", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
         {
             // Exits
-            Entrance(RR_SPIRIT_TEMPLE_INSIDE_STATUE_HEAD, { [] { return Dungeon::SpiritTemple.IsVanilla() && false; } }),
-            Entrance(RR_SPIRIT_TEMPLE_MQ_INSIDE_STATUE_HEAD, { [] { return Dungeon::SpiritTemple.IsMQ() && false; } }),
+            Entrance(RR_SPIRIT_TEMPLE_INSIDE_STATUE_HEAD, { [] { return randoCtx->GetDungeon(SPIRIT_TEMPLE)->IsVanilla() && false; } }),
+            Entrance(RR_SPIRIT_TEMPLE_MQ_INSIDE_STATUE_HEAD, { [] { return randoCtx->GetDungeon(SPIRIT_TEMPLE)->IsMQ() && false; } }),
             Entrance(RR_SPIRIT_TEMPLE_BOSS_ROOM, { [] { return true; } }),
         });
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp
index 07a3bd517..8b50289e1 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp
@@ -1,10 +1,10 @@
 #include "../location_access.hpp"
 #include "../logic.hpp"
-#include "../entrance.hpp"
-#include "../dungeon.hpp"
+#include "../../entrance.h"
+#include "../../dungeon.h"
 
 using namespace Logic;
-using namespace Settings;
+using namespace Rando;
 
 void AreaTable_Init_WaterTemple() {
   /*--------------------------
@@ -12,29 +12,29 @@ void AreaTable_Init_WaterTemple() {
   ---------------------------*/
   areaTable[RR_WATER_TEMPLE_ENTRYWAY] = Area("Water Temple Entryway", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_WATER_TEMPLE_LOBBY,    {[]{return Dungeon::WaterTemple.IsVanilla();}}),
-                  Entrance(RR_WATER_TEMPLE_MQ_LOBBY, {[]{return Dungeon::WaterTemple.IsMQ();}}),
+                  Entrance(RR_WATER_TEMPLE_LOBBY,    {[]{return randoCtx->GetDungeon(WATER_TEMPLE)->IsVanilla();}}),
+                  Entrance(RR_WATER_TEMPLE_MQ_LOBBY, {[]{return randoCtx->GetDungeon(WATER_TEMPLE)->IsMQ();}}),
                   Entrance(RR_LAKE_HYLIA,            {[]{return true;}}),
   });
 
   /*--------------------------
   |     VANILLA DUNGEON      |
   ---------------------------*/
-  if (Dungeon::WaterTemple.IsVanilla()) {
+  if (randoCtx->GetDungeon(WATER_TEMPLE)->IsVanilla()) {
   //Water Temple logic currently assumes that the locked door leading to the upper water raising location is unlocked from the start
   areaTable[RR_WATER_TEMPLE_LOBBY] = Area("Water Temple Lobby", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_ENTRYWAY,              {[]{return true;}}),
-                  Entrance(RR_WATER_TEMPLE_EAST_LOWER,            {[]{return WaterTempleLow || ((LogicFewerTunicRequirements || CanUse(RG_ZORA_TUNIC)) && (CanUse(RG_IRON_BOOTS) || (CanUse(RG_LONGSHOT) && LogicWaterTempleTorchLongshot)));}}),
-                  Entrance(RR_WATER_TEMPLE_NORTH_LOWER,           {[]{return WaterTempleLow || ((LogicFewerTunicRequirements || CanUse(RG_ZORA_TUNIC)) && CanUse(RG_IRON_BOOTS));}}),
-                  Entrance(RR_WATER_TEMPLE_SOUTH_LOWER,           {[]{return WaterTempleLow && HasExplosives && (CanDive || CanUse(RG_IRON_BOOTS)) && (LogicFewerTunicRequirements || CanUse(RG_ZORA_TUNIC));}}),
-                  Entrance(RR_WATER_TEMPLE_WEST_LOWER,            {[]{return WaterTempleLow && GoronBracelet && (IsChild || CanDive || CanUse(RG_IRON_BOOTS)) && (LogicFewerTunicRequirements || CanUse(RG_ZORA_TUNIC));}}),
+                  Entrance(RR_WATER_TEMPLE_EAST_LOWER,            {[]{return WaterTempleLow || ((randoCtx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS) || CanUse(RG_ZORA_TUNIC)) && (CanUse(RG_IRON_BOOTS) || (CanUse(RG_LONGSHOT) && randoCtx->GetTrickOption(RT_WATER_LONGSHOT_TORCH))));}}),
+                  Entrance(RR_WATER_TEMPLE_NORTH_LOWER,           {[]{return WaterTempleLow || ((randoCtx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS) || CanUse(RG_ZORA_TUNIC)) && CanUse(RG_IRON_BOOTS));}}),
+                  Entrance(RR_WATER_TEMPLE_SOUTH_LOWER,           {[]{return WaterTempleLow && HasExplosives && (CanDive || CanUse(RG_IRON_BOOTS)) && (randoCtx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS) || CanUse(RG_ZORA_TUNIC));}}),
+                  Entrance(RR_WATER_TEMPLE_WEST_LOWER,            {[]{return WaterTempleLow && GoronBracelet && (IsChild || CanDive || CanUse(RG_IRON_BOOTS)) && (randoCtx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS) || CanUse(RG_ZORA_TUNIC));}}),
                   Entrance(RR_WATER_TEMPLE_CENTRAL_PILLAR_LOWER,  {[]{return WaterTempleLow && SmallKeys(RR_WATER_TEMPLE, 5);}}),
                   Entrance(RR_WATER_TEMPLE_CENTRAL_PILLAR_UPPER,  {[]{return (WaterTempleLow || WaterTempleMiddle) && (HasFireSourceWithTorch || CanUse(RG_FAIRY_BOW));}}),
                   Entrance(RR_WATER_TEMPLE_EAST_MIDDLE,           {[]{return (WaterTempleLow || WaterTempleMiddle || (CanUse(RG_IRON_BOOTS) && WaterTimer >= 16)) && CanUse(RG_HOOKSHOT);}}),
                   Entrance(RR_WATER_TEMPLE_WEST_MIDDLE,           {[]{return WaterTempleMiddle;}}),
-                  Entrance(RR_WATER_TEMPLE_HIGH_WATER,            {[]{return IsAdult && (CanUse(RG_HOVER_BOOTS) || (LogicDamageBoost && Bombs && CanTakeDamage));}}),
-                  Entrance(RR_WATER_TEMPLE_BLOCK_CORRIDOR,        {[]{return (WaterTempleLow || WaterTempleMiddle) && (CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW)) && (CanUse(RG_LONGSHOT) || CanUse(RG_HOVER_BOOTS) || (LogicWaterCentralBow && (IsAdult || WaterTempleMiddle)));}}),
+                  Entrance(RR_WATER_TEMPLE_HIGH_WATER,            {[]{return IsAdult && (CanUse(RG_HOVER_BOOTS) || (randoCtx->GetTrickOption(RT_DAMAGE_BOOST) && Bombs && CanTakeDamage));}}),
+                  Entrance(RR_WATER_TEMPLE_BLOCK_CORRIDOR,        {[]{return (WaterTempleLow || WaterTempleMiddle) && (CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW)) && (CanUse(RG_LONGSHOT) || CanUse(RG_HOVER_BOOTS) || (randoCtx->GetTrickOption(RT_WATER_CENTRAL_BOW) && (IsAdult || WaterTempleMiddle)));}}),
                   Entrance(RR_WATER_TEMPLE_FALLING_PLATFORM_ROOM, {[]{return WaterTempleHigh && SmallKeys(RR_WATER_TEMPLE, 4);}}),
                   Entrance(RR_WATER_TEMPLE_PRE_BOSS_ROOM,         {[]{return WaterTempleHigh && CanUse(RG_LONGSHOT);}}),
   });
@@ -44,9 +44,9 @@ void AreaTable_Init_WaterTemple() {
                   EventAccess(&WaterTempleLow, {[]{return WaterTempleLow || CanPlay(ZeldasLullaby);}}),
                 }, {}, {
                   //Exits
-                  Entrance(RR_WATER_TEMPLE_LOBBY,        {[]{return WaterTempleLow || ((LogicFewerTunicRequirements || CanUse(RG_ZORA_TUNIC)) && CanUse(RG_IRON_BOOTS));}}),
+                  Entrance(RR_WATER_TEMPLE_LOBBY,        {[]{return WaterTempleLow || ((randoCtx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS) || CanUse(RG_ZORA_TUNIC)) && CanUse(RG_IRON_BOOTS));}}),
                   Entrance(RR_WATER_TEMPLE_MAP_ROOM,     {[]{return WaterTempleHigh;}}),
-                  Entrance(RR_WATER_TEMPLE_CRACKED_WALL, {[]{return WaterTempleMiddle || (WaterTempleHigh && WaterTempleLow && ((CanUse(RG_HOVER_BOOTS) && LogicWaterCrackedWallHovers) || LogicWaterCrackedWallNothing));}}),
+                  Entrance(RR_WATER_TEMPLE_CRACKED_WALL, {[]{return WaterTempleMiddle || (WaterTempleHigh && WaterTempleLow && ((CanUse(RG_HOVER_BOOTS) && randoCtx->GetTrickOption(RT_WATER_CRACKED_WALL_HOVERS)) || randoCtx->GetTrickOption(RT_WATER_CRACKED_WALL)));}}),
                   Entrance(RR_WATER_TEMPLE_TORCH_ROOM,   {[]{return WaterTempleLow && (HasFireSourceWithTorch || CanUse(RG_FAIRY_BOW));}}),
   });
 
@@ -77,7 +77,7 @@ void AreaTable_Init_WaterTemple() {
   areaTable[RR_WATER_TEMPLE_NORTH_LOWER] = Area("Water Temple North Lower", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_LOBBY,          {[]{return true;}}),
-                  Entrance(RR_WATER_TEMPLE_BOULDERS_LOWER, {[]{return (CanUse(RG_LONGSHOT) || (LogicWaterBossKeyRegion && CanUse(RG_HOVER_BOOTS))) && SmallKeys(RR_WATER_TEMPLE, 4);}}),
+                  Entrance(RR_WATER_TEMPLE_BOULDERS_LOWER, {[]{return (CanUse(RG_LONGSHOT) || (randoCtx->GetTrickOption(RT_WATER_BK_REGION) && CanUse(RG_HOVER_BOOTS))) && SmallKeys(RR_WATER_TEMPLE, 4);}}),
   });
 
   areaTable[RR_WATER_TEMPLE_BOULDERS_LOWER] = Area("Water Temple Boulders Lower", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -87,7 +87,7 @@ void AreaTable_Init_WaterTemple() {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_NORTH_LOWER,    {[]{return SmallKeys(RR_WATER_TEMPLE, 4);}}),
                   Entrance(RR_WATER_TEMPLE_BLOCK_ROOM,     {[]{return true;}}),
-                  Entrance(RR_WATER_TEMPLE_BOULDERS_UPPER, {[]{return (IsAdult && (CanUse(RG_HOVER_BOOTS) || LogicWaterNorthBasementLedgeJump)) || (CanUse(RG_HOVER_BOOTS) && CanUse(RG_IRON_BOOTS));}}),
+                  Entrance(RR_WATER_TEMPLE_BOULDERS_UPPER, {[]{return (IsAdult && (CanUse(RG_HOVER_BOOTS) || randoCtx->GetTrickOption(RT_WATER_NORTH_BASEMENT_LEDGE_JUMP))) || (CanUse(RG_HOVER_BOOTS) && CanUse(RG_IRON_BOOTS));}}),
   });
 
   areaTable[RR_WATER_TEMPLE_BLOCK_ROOM] = Area("Water Temple Block Room", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
@@ -106,7 +106,7 @@ void AreaTable_Init_WaterTemple() {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_BOULDERS_LOWER, {[]{return true;}}),
                   Entrance(RR_WATER_TEMPLE_JETS_ROOM,      {[]{return IsAdult;}}),
-                  Entrance(RR_WATER_TEMPLE_BOSS_KEY_ROOM,  {[]{return (CanUse(RG_IRON_BOOTS) || (IsAdult && LogicWaterBKJumpDive)) && SmallKeys(RR_WATER_TEMPLE, 5);}}),
+                  Entrance(RR_WATER_TEMPLE_BOSS_KEY_ROOM,  {[]{return (CanUse(RG_IRON_BOOTS) || (IsAdult && randoCtx->GetTrickOption(RT_WATER_BK_JUMP_DIVE))) && SmallKeys(RR_WATER_TEMPLE, 5);}}),
   });
 
   areaTable[RR_WATER_TEMPLE_BOSS_KEY_ROOM] = Area("Water Temple Boss Key Room", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
@@ -117,7 +117,7 @@ void AreaTable_Init_WaterTemple() {
                   LocationAccess(RC_WATER_TEMPLE_BOSS_KEY_CHEST, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(RR_WATER_TEMPLE_BOULDERS_UPPER, {[]{return (CanUse(RG_IRON_BOOTS) || (IsAdult && LogicWaterBKJumpDive) || IsChild || CanDive) && SmallKeys(RR_WATER_TEMPLE, 5);}}),
+                  Entrance(RR_WATER_TEMPLE_BOULDERS_UPPER, {[]{return (CanUse(RG_IRON_BOOTS) || (IsAdult && randoCtx->GetTrickOption(RT_WATER_BK_JUMP_DIVE)) || IsChild || CanDive) && SmallKeys(RR_WATER_TEMPLE, 5);}}),
   });
 
   areaTable[RR_WATER_TEMPLE_SOUTH_LOWER] = Area("Water Temple South Lower", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -136,8 +136,8 @@ void AreaTable_Init_WaterTemple() {
 
   areaTable[RR_WATER_TEMPLE_DRAGON_ROOM] = Area("Water Temple Dragon Room", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_WATER_TEMPLE_DRAGON_CHEST, {[]{return (CanUse(RG_HOOKSHOT) && CanUse(RG_IRON_BOOTS)) || (((IsAdult && LogicWaterDragonAdult && (CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_BOW) || HasBombchus)) || (IsChild && LogicWaterDragonChild && (CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOOMERANG) || HasBombchus))) && (CanDive || CanUse(RG_IRON_BOOTS))) ||
-                                                                       Here(RR_WATER_TEMPLE_RIVER, []{return IsAdult && CanUse(RG_FAIRY_BOW) && ((LogicWaterDragonAdult && (CanDive || CanUse(RG_IRON_BOOTS))) || LogicWaterDragonJumpDive);});}}),
+                  LocationAccess(RC_WATER_TEMPLE_DRAGON_CHEST, {[]{return (CanUse(RG_HOOKSHOT) && CanUse(RG_IRON_BOOTS)) || (((IsAdult && randoCtx->GetTrickOption(RT_WATER_ADULT_DRAGON) && (CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_BOW) || HasBombchus)) || (IsChild && randoCtx->GetTrickOption(RT_WATER_CHILD_DRAGON) && (CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOOMERANG) || HasBombchus))) && (CanDive || CanUse(RG_IRON_BOOTS))) ||
+                                                                       Here(RR_WATER_TEMPLE_RIVER, []{return IsAdult && CanUse(RG_FAIRY_BOW) && ((randoCtx->GetTrickOption(RT_WATER_ADULT_DRAGON) && (CanDive || CanUse(RG_IRON_BOOTS))) || randoCtx->GetTrickOption(RT_WATER_DRAGON_JUMP_DIVE));});}}),
                 }, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_WEST_LOWER, {[]{return true;}}),
@@ -155,7 +155,7 @@ void AreaTable_Init_WaterTemple() {
                   EventAccess(&WaterTempleMiddle, {[]{return WaterTempleMiddle || CanPlay(ZeldasLullaby);}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_WATER_TEMPLE_GS_CENTRAL_PILLAR, {[]{return CanUse(RG_LONGSHOT) || (((LogicWaterCentralGSFW && CanUse(RG_FARORES_WIND) && (CanUse(RG_FAIRY_BOW) || CanUse(RG_DINS_FIRE) || SmallKeys(RR_WATER_TEMPLE, 5))) || (LogicWaterCentralGSIrons && CanUse(RG_IRON_BOOTS) && ((CanUse(RG_HOOKSHOT) && CanUse(RG_FAIRY_BOW)) || (CanUse(RG_DINS_FIRE))))) && WaterTempleHigh && HookshotOrBoomerang);}}),
+                  LocationAccess(RC_WATER_TEMPLE_GS_CENTRAL_PILLAR, {[]{return CanUse(RG_LONGSHOT) || (((randoCtx->GetTrickOption(RT_WATER_FW_CENTRAL_GS) && CanUse(RG_FARORES_WIND) && (CanUse(RG_FAIRY_BOW) || CanUse(RG_DINS_FIRE) || SmallKeys(RR_WATER_TEMPLE, 5))) || (randoCtx->GetTrickOption(RT_WATER_IRONS_CENTRAL_GS) && CanUse(RG_IRON_BOOTS) && ((CanUse(RG_HOOKSHOT) && CanUse(RG_FAIRY_BOW)) || (CanUse(RG_DINS_FIRE))))) && WaterTempleHigh && HookshotOrBoomerang);}}),
                 }, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_LOBBY,                {[]{return true;}}),
@@ -202,7 +202,7 @@ void AreaTable_Init_WaterTemple() {
 
   areaTable[RR_WATER_TEMPLE_FALLING_PLATFORM_ROOM] = Area("Water Temple Falling Platform Room", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM, {[]{return CanUse(RG_LONGSHOT) || (LogicWaterFallingPlatformGSBoomerang && IsChild && CanUse(RG_BOOMERANG)) || (LogicWaterFallingPlatformGSHookshot && IsAdult && CanUse(RG_HOOKSHOT));}}),
+                  LocationAccess(RC_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM, {[]{return CanUse(RG_LONGSHOT) || (randoCtx->GetTrickOption(RT_WATER_RANG_FALLING_PLATFORM_GS) && IsChild && CanUse(RG_BOOMERANG)) || (randoCtx->GetTrickOption(RT_WATER_HOOKSHOT_FALLING_PLATFORM_GS) && IsAdult && CanUse(RG_HOOKSHOT));}}),
                 }, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_LOBBY,               {[]{return CanUse(RG_HOOKSHOT) && SmallKeys(RR_WATER_TEMPLE, 4);}}),
@@ -233,7 +233,7 @@ void AreaTable_Init_WaterTemple() {
   areaTable[RR_WATER_TEMPLE_RIVER] = Area("Water Temple River", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_WATER_TEMPLE_RIVER_CHEST, {[]{return (CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW)) && (IsAdult || CanUse(RG_HOVER_BOOTS) || CanUse(RG_HOOKSHOT));}}),
-                  LocationAccess(RC_WATER_TEMPLE_GS_RIVER,    {[]{return (CanUse(RG_IRON_BOOTS) && CanUse(RG_HOOKSHOT)) || (LogicWaterRiverGS && CanUse(RG_LONGSHOT));}}),
+                  LocationAccess(RC_WATER_TEMPLE_GS_RIVER,    {[]{return (CanUse(RG_IRON_BOOTS) && CanUse(RG_HOOKSHOT)) || (randoCtx->GetTrickOption(RT_WATER_RIVER_GS) && CanUse(RG_LONGSHOT));}}),
                 }, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_DRAGON_ROOM, {[]{return (CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW)) && (IsAdult || CanUse(RG_HOVER_BOOTS) || CanUse(RG_HOOKSHOT));}}),
@@ -252,7 +252,7 @@ void AreaTable_Init_WaterTemple() {
   /*---------------------------
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
-  if (Dungeon::WaterTemple.IsMQ()) {
+  if (randoCtx->GetDungeon(WATER_TEMPLE)->IsMQ()) {
   areaTable[RR_WATER_TEMPLE_MQ_LOBBY] = Area("Water Temple MQ Lobby", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_ENTRYWAY,            {[]{return true;}}),
@@ -264,7 +264,7 @@ void AreaTable_Init_WaterTemple() {
   areaTable[RR_WATER_TEMPLE_MQ_DIVE] = Area("Water Temple MQ Dive", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_WATER_TEMPLE_MQ_MAP_CHEST,            {[]{return HasFireSource && IsAdult && CanUse(RG_HOOKSHOT);}}),
-                  LocationAccess(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST, {[]{return IsAdult && CanUse(RG_ZORA_TUNIC) && CanUse(RG_HOOKSHOT) && ((LogicWaterMQCentralPillar && CanUse(RG_FIRE_ARROWS)) || (CanUse(RG_DINS_FIRE) && CanPlay(SongOfTime)));}}),
+                  LocationAccess(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST, {[]{return IsAdult && CanUse(RG_ZORA_TUNIC) && CanUse(RG_HOOKSHOT) && ((randoCtx->GetTrickOption(RT_WATER_MQ_CENTRAL_PILLAR) && CanUse(RG_FIRE_ARROWS)) || (CanUse(RG_DINS_FIRE) && CanPlay(SongOfTime)));}}),
                     //Trick: IsAdult && CanUse(RG_ZORA_TUNIC) && CanUse(RG_HOOKSHOT) && ((LogicWaterMQCentralPillar && CanUse(RG_FIRE_ARROWS)) || (CanUse(RG_DINS_FIRE) && CanPlay(SongOfTime)))
   }, {
                   //Exits
@@ -286,7 +286,7 @@ void AreaTable_Init_WaterTemple() {
                   EventAccess(&NutPot,   {[]{return true;}}),
   }, {
                   //Locations
-                  LocationAccess(RC_WATER_TEMPLE_MQ_BOSS_KEY_CHEST, {[]{return IsAdult && WaterTimer >= 24 && CanUse(RG_DINS_FIRE) && (LogicWaterDragonJumpDive || CanDive || CanUse(RG_IRON_BOOTS));}}),
+                  LocationAccess(RC_WATER_TEMPLE_MQ_BOSS_KEY_CHEST, {[]{return IsAdult && WaterTimer >= 24 && CanUse(RG_DINS_FIRE) && (randoCtx->GetTrickOption(RT_WATER_DRAGON_JUMP_DIVE) || CanDive || CanUse(RG_IRON_BOOTS));}}),
                   LocationAccess(RC_WATER_TEMPLE_MQ_GS_RIVER,       {[]{return true;}}),
   }, {
                   //Exits
@@ -295,9 +295,9 @@ void AreaTable_Init_WaterTemple() {
 
   areaTable[RR_WATER_TEMPLE_MQ_BASEMENT_GATED_AREAS] = Area("Water Temple MQ Basement Gated Areas", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_WATER_TEMPLE_MQ_FREESTANDING_KEY,         {[]{return HoverBoots || CanUse(RG_SCARECROW) || LogicWaterNorthBasementLedgeJump;}}),
+                  LocationAccess(RC_WATER_TEMPLE_MQ_FREESTANDING_KEY,         {[]{return HoverBoots || CanUse(RG_SCARECROW) || randoCtx->GetTrickOption(RT_WATER_NORTH_BASEMENT_LEDGE_JUMP);}}),
                   LocationAccess(RC_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH,     {[]{return CanUse(RG_FIRE_ARROWS) && (HoverBoots || CanUse(RG_SCARECROW));}}),
-                  LocationAccess(RC_WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA, {[]{return LogicWaterMQLockedGS || (SmallKeys(RR_WATER_TEMPLE, 2) && (HoverBoots || CanUse(RG_SCARECROW) || LogicWaterNorthBasementLedgeJump) && CanJumpslash);}}),
+                  LocationAccess(RC_WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA, {[]{return randoCtx->GetTrickOption(RT_WATER_MQ_LOCKED_GS) || (SmallKeys(RR_WATER_TEMPLE, 2) && (HoverBoots || CanUse(RG_SCARECROW) || randoCtx->GetTrickOption(RT_WATER_NORTH_BASEMENT_LEDGE_JUMP)) && CanJumpslash);}}),
                     //Trick: LogicWaterMQLockedGS || (SmallKeys(RR_WATER_TEMPLE, 2) && (HoverBoots || CanUse(RG_SCARECROW) || LogicWaterNorthBasementLedgeJump))
   }, {});
   }
@@ -309,8 +309,8 @@ void AreaTable_Init_WaterTemple() {
         Area("Water Temple Boss Entryway", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
              {
                  // Exits
-                 Entrance(RR_WATER_TEMPLE_PRE_BOSS_ROOM, { [] { return Dungeon::WaterTemple.IsVanilla() && false; } }),
-                 Entrance(RR_WATER_TEMPLE_MQ_LOBBY, { [] { return Dungeon::WaterTemple.IsMQ() && false; } }),
+                 Entrance(RR_WATER_TEMPLE_PRE_BOSS_ROOM, { [] { return randoCtx->GetDungeon(WATER_TEMPLE)->IsVanilla() && false; } }),
+                 Entrance(RR_WATER_TEMPLE_MQ_LOBBY, { [] { return randoCtx->GetDungeon(WATER_TEMPLE)->IsMQ() && false; } }),
                  Entrance(RR_WATER_TEMPLE_BOSS_ROOM, { [] { return true; } }),
              });
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
index 346186255..a6f49c4b3 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
@@ -1,9 +1,9 @@
 #include "../location_access.hpp"
 #include "../logic.hpp"
-#include "../entrance.hpp"
+#include "../../entrance.h"
 
 using namespace Logic;
-using namespace Settings;
+using namespace Rando;
 
 void AreaTable_Init_ZorasDomain() {
   areaTable[RR_ZR_FRONT] = Area("ZR Front", "Zora River", RHT_ZORAS_RIVER, DAY_NIGHT_CYCLE, {}, {
@@ -31,8 +31,8 @@ void AreaTable_Init_ZorasDomain() {
                   LocationAccess(RC_ZR_FROGS_SARIAS_SONG,                 {[]{return IsChild && CanPlay(SariasSong);}}),
                   LocationAccess(RC_ZR_FROGS_SUNS_SONG,                   {[]{return IsChild && CanPlay(SunsSong);}}),
                   LocationAccess(RC_ZR_FROGS_SONG_OF_TIME,                {[]{return IsChild && CanPlay(SongOfTime);}}),
-                  LocationAccess(RC_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH, {[]{return IsChild || CanUse(RG_HOVER_BOOTS) || (IsAdult && LogicZoraRiverLower);}}),
-                  LocationAccess(RC_ZR_NEAR_DOMAIN_FREESTANDING_POH,      {[]{return IsChild || CanUse(RG_HOVER_BOOTS) || (IsAdult && LogicZoraRiverUpper);}}),
+                  LocationAccess(RC_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH, {[]{return IsChild || CanUse(RG_HOVER_BOOTS) || (IsAdult && randoCtx->GetTrickOption(RT_ZR_LOWER));}}),
+                  LocationAccess(RC_ZR_NEAR_DOMAIN_FREESTANDING_POH,      {[]{return IsChild || CanUse(RG_HOVER_BOOTS) || (IsAdult && randoCtx->GetTrickOption(RT_ZR_UPPER));}}),
                   LocationAccess(RC_ZR_GS_LADDER,                         {[]{return IsChild && AtNight && CanChildAttack && CanGetNightTimeGS;}}),
                   LocationAccess(RC_ZR_GS_NEAR_RAISED_GROTTOS,            {[]{return IsAdult && HookshotOrBoomerang && AtNight && CanGetNightTimeGS;}}),
                   LocationAccess(RC_ZR_GS_ABOVE_BRIDGE,                   {[]{return IsAdult && CanUse(RG_HOOKSHOT) && AtNight && CanGetNightTimeGS;}}),
@@ -45,7 +45,7 @@ void AreaTable_Init_ZorasDomain() {
                   Entrance(RR_ZR_FAIRY_GROTTO,     {[]{return Here(RR_ZORAS_RIVER, []{return CanBlastOrSmash;});}}),
                   Entrance(RR_THE_LOST_WOODS,      {[]{return CanDive || CanUse(RG_IRON_BOOTS);}}),
                   Entrance(RR_ZR_STORMS_GROTTO,    {[]{return CanOpenStormGrotto;}}),
-                  Entrance(RR_ZR_BEHIND_WATERFALL, {[]{return CanPlay(ZeldasLullaby) || (IsChild && LogicZoraWithCucco) || (IsAdult && CanUse(RG_HOVER_BOOTS) && LogicZoraWithHovers);}}),
+                  Entrance(RR_ZR_BEHIND_WATERFALL, {[]{return CanPlay(ZeldasLullaby) || (IsChild && randoCtx->GetTrickOption(RT_ZR_CUCCO)) || (IsAdult && CanUse(RG_HOVER_BOOTS) && randoCtx->GetTrickOption(RT_ZR_HOVERS));}}),
   });
 
   areaTable[RR_ZR_BEHIND_WATERFALL] = Area("ZR Behind Waterfall", "Zora River", RHT_ZORAS_RIVER, DAY_NIGHT_CYCLE, {}, {}, {
@@ -88,27 +88,27 @@ void AreaTable_Init_ZorasDomain() {
                   EventAccess(&StickPot,          {[]{return StickPot          || IsChild;}}),
                   EventAccess(&FishGroup,         {[]{return FishGroup         || IsChild;}}),
                   EventAccess(&KingZoraThawed,    {[]{return KingZoraThawed    || (IsAdult     && BlueFire);}}),
-                  EventAccess(&DeliverLetter,     {[]{return DeliverLetter     || (RutosLetter && IsChild && ZorasFountain.IsNot(ZORASFOUNTAIN_OPEN));}}),
+                  EventAccess(&DeliverLetter,     {[]{return DeliverLetter     || (RutosLetter && IsChild && randoCtx->GetOption(RSK_ZORAS_FOUNTAIN).IsNot(RO_ZF_OPEN));}}),
                 }, {
                   //Locations
                   LocationAccess(RC_ZD_DIVING_MINIGAME,     {[]{return IsChild;}}),
                   LocationAccess(RC_ZD_CHEST,               {[]{return IsChild && CanUse(RG_STICKS);}}),
                   LocationAccess(RC_ZD_KING_ZORA_THAWED,    {[]{return KingZoraThawed;}}),
                   LocationAccess(RC_ZD_TRADE_PRESCRIPTION,  {[]{return KingZoraThawed && Prescription;}}),
-                  LocationAccess(RC_ZD_GS_FROZEN_WATERFALL, {[]{return IsAdult && AtNight && (HookshotOrBoomerang || CanUse(RG_FAIRY_SLINGSHOT) || Bow || (MagicMeter && (CanUse(RG_MASTER_SWORD) || CanUse(RG_KOKIRI_SWORD) || CanUse(RG_BIGGORON_SWORD))) || (LogicDomainGS && CanJumpslash)) && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_ZD_GS_FROZEN_WATERFALL, {[]{return IsAdult && AtNight && (HookshotOrBoomerang || CanUse(RG_FAIRY_SLINGSHOT) || Bow || (MagicMeter && (CanUse(RG_MASTER_SWORD) || CanUse(RG_KOKIRI_SWORD) || CanUse(RG_BIGGORON_SWORD))) || (randoCtx->GetTrickOption(RT_ZD_GS) && CanJumpslash)) && CanGetNightTimeGS;}}),
                   LocationAccess(RC_ZD_GOSSIP_STONE,        {[]{return true;}}),
                 }, {
                   //Exits
                   Entrance(RR_ZR_BEHIND_WATERFALL, {[]{return true;}}),
                   Entrance(RR_LAKE_HYLIA,          {[]{return IsChild && (CanDive || CanUse(RG_IRON_BOOTS));}}),
-                  Entrance(RR_ZD_BEHIND_KING_ZORA, {[]{return DeliverLetter || ZorasFountain.Is(ZORASFOUNTAIN_OPEN) || (ZorasFountain.Is(ZORASFOUNTAIN_ADULT) && IsAdult) || (LogicKingZoraSkip && IsAdult);}}),
+                  Entrance(RR_ZD_BEHIND_KING_ZORA, {[]{return DeliverLetter || randoCtx->GetOption(RSK_ZORAS_FOUNTAIN).Is(RO_ZF_OPEN) || (randoCtx->GetOption(RSK_ZORAS_FOUNTAIN).Is(RO_ZF_CLOSED_CHILD) && IsAdult) || (randoCtx->GetTrickOption(RT_ZD_KING_ZORA_SKIP) && IsAdult);}}),
                   Entrance(RR_ZD_SHOP,             {[]{return IsChild || BlueFire;}}),
                   Entrance(RR_ZD_STORMS_GROTTO,    {[]{return CanOpenStormGrotto;}}),
   });
 
   areaTable[RR_ZD_BEHIND_KING_ZORA] = Area("ZD Behind King Zora", "Zoras Domain", RHT_ZORAS_DOMAIN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_ZORAS_DOMAIN,   {[]{return DeliverLetter || ZorasFountain.Is(ZORASFOUNTAIN_OPEN) || (ZorasFountain.Is(ZORASFOUNTAIN_ADULT) && IsAdult);}}),
+                  Entrance(RR_ZORAS_DOMAIN,   {[]{return DeliverLetter || randoCtx->GetOption(RSK_ZORAS_FOUNTAIN).Is(RO_ZF_OPEN) || (randoCtx->GetOption(RSK_ZORAS_FOUNTAIN).Is(RO_ZF_CLOSED_CHILD) && IsAdult);}}),
                   Entrance(RR_ZORAS_FOUNTAIN, {[]{return true;}}),
   });
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/logic.cpp b/soh/soh/Enhancements/randomizer/3drando/logic.cpp
index d7b8f018a..5e16727b6 100644
--- a/soh/soh/Enhancements/randomizer/3drando/logic.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/logic.cpp
@@ -6,10 +6,8 @@
 #include <string_view>
 #include <vector>
 
-#include "settings.hpp"
-#include "dungeon.hpp"
-
-using namespace Settings;
+#include "../dungeon.h"
+#include "../context.h"
 
 namespace Logic {
 
@@ -430,29 +428,30 @@ namespace Logic {
 
     switch (itemName) {
       // Adult items
-      case RG_FAIRY_BOW:               return IsAdult || BowAsChild;
-      case RG_MEGATON_HAMMER:    return IsAdult || HammerAsChild;
-      case RG_IRON_BOOTS:        return IsAdult || IronBootsAsChild;
-      case RG_HOVER_BOOTS:       return IsAdult || HoverBootsAsChild;
-      case RG_HOOKSHOT:          return IsAdult || HookshotAsChild;
-      case RG_LONGSHOT:          return IsAdult || HookshotAsChild;
+      // TODO: Uncomment those if we ever implement more item usability settings
+      case RG_FAIRY_BOW:               return IsAdult;// || BowAsChild;
+      case RG_MEGATON_HAMMER:    return IsAdult;// || HammerAsChild;
+      case RG_IRON_BOOTS:        return IsAdult;// || IronBootsAsChild;
+      case RG_HOVER_BOOTS:       return IsAdult;// || HoverBootsAsChild;
+      case RG_HOOKSHOT:          return IsAdult;// || HookshotAsChild;
+      case RG_LONGSHOT:          return IsAdult;// || HookshotAsChild;
       case RG_SILVER_GAUNTLETS:  return IsAdult;
       case RG_GOLDEN_GAUNTLETS:  return IsAdult;
-      case RG_GORON_TUNIC:       return IsAdult || GoronTunicAsChild;
-      case RG_ZORA_TUNIC:        return IsAdult || ZoraTunicAsChild;
-      case RG_SCARECROW:         return IsAdult || HookshotAsChild;
-      case RG_DISTANT_SCARECROW: return IsAdult || HookshotAsChild;
+      case RG_GORON_TUNIC:       return IsAdult;// || GoronTunicAsChild;
+      case RG_ZORA_TUNIC:        return IsAdult;// || ZoraTunicAsChild;
+      case RG_SCARECROW:         return IsAdult;// || HookshotAsChild;
+      case RG_DISTANT_SCARECROW: return IsAdult;// || HookshotAsChild;
       case RG_HYLIAN_SHIELD:     return IsAdult;
-      case RG_MIRROR_SHIELD:     return IsAdult || MirrorShieldAsChild;
-      case RG_MASTER_SWORD:      return IsAdult || MasterSwordAsChild;
-      case RG_BIGGORON_SWORD:    return IsAdult || BiggoronSwordAsChild;
+      case RG_MIRROR_SHIELD:     return IsAdult;// || MirrorShieldAsChild;
+      case RG_MASTER_SWORD:      return IsAdult;// || MasterSwordAsChild;
+      case RG_BIGGORON_SWORD:    return IsAdult;// || BiggoronSwordAsChild;
 
       // Child items
-      case RG_FAIRY_SLINGSHOT:         return IsChild || SlingshotAsAdult;
-      case RG_BOOMERANG:         return IsChild || BoomerangAsAdult;
-      case RG_KOKIRI_SWORD:      return IsChild || KokiriSwordAsAdult;
-      case RG_STICKS:            return IsChild || StickAsAdult;
-      case RG_DEKU_SHIELD:       return IsChild || DekuShieldAsAdult;
+      case RG_FAIRY_SLINGSHOT:         return IsChild;// || SlingshotAsAdult;
+      case RG_BOOMERANG:         return IsChild;// || BoomerangAsAdult;
+      case RG_KOKIRI_SWORD:      return IsChild;// || KokiriSwordAsAdult;
+      case RG_STICKS:            return IsChild;// || StickAsAdult;
+      case RG_DEKU_SHIELD:       return IsChild;// || DekuShieldAsAdult;
 
       // Magic items
       default: return MagicMeter && (IsMagicItem(itemName) || (IsMagicArrow(itemName) && CanUse(RG_FAIRY_BOW)));
@@ -467,7 +466,7 @@ namespace Logic {
            (age == HasProjectileAge::Either && (Slingshot || Boomerang   ||  Hookshot || Bow));
   }
 
-  uint8_t GetDifficultyValueFromString(Option& glitchOption) {
+  uint8_t GetDifficultyValueFromString(Rando::Option& glitchOption) {
     return 0;
   }
 
@@ -484,11 +483,12 @@ namespace Logic {
   }
 
   bool CanDoGlitch(GlitchType glitch) {
+    // TODO: Uncomment when glitches are implemented
     switch(glitch) {
       case GlitchType::EquipSwapDins:
-        return ((IsAdult && HasItem(RG_DINS_FIRE)) || (IsChild && (HasItem(RG_STICKS) || HasItem(RG_DINS_FIRE)))) && GlitchEquipSwapDins;
+        return ((IsAdult && HasItem(RG_DINS_FIRE)) || (IsChild && (HasItem(RG_STICKS) || HasItem(RG_DINS_FIRE)))) && false;//GlitchEquipSwapDins;
       case GlitchType::EquipSwap: // todo: add bunny hood to adult item equippable list and child trade item to child item equippable list
-        return ((IsAdult && (HasItem(RG_DINS_FIRE) || HasItem(RG_FARORES_WIND) || HasItem(RG_NAYRUS_LOVE))) || (IsChild && (HasItem(RG_STICKS) || HasItem(RG_FAIRY_SLINGSHOT) || HasItem(RG_BOOMERANG) || HasBottle || Nuts || Ocarina || HasItem(RG_LENS_OF_TRUTH) || HasExplosives || (MagicBean || MagicBeanPack) || HasItem(RG_DINS_FIRE) || HasItem(RG_FARORES_WIND) || HasItem(RG_NAYRUS_LOVE)))) && GlitchEquipSwap;
+        return ((IsAdult && (HasItem(RG_DINS_FIRE) || HasItem(RG_FARORES_WIND) || HasItem(RG_NAYRUS_LOVE))) || (IsChild && (HasItem(RG_STICKS) || HasItem(RG_FAIRY_SLINGSHOT) || HasItem(RG_BOOMERANG) || HasBottle || Nuts || Ocarina || HasItem(RG_LENS_OF_TRUTH) || HasExplosives || (MagicBean || MagicBeanPack) || HasItem(RG_DINS_FIRE) || HasItem(RG_FARORES_WIND) || HasItem(RG_NAYRUS_LOVE)))) && false;//GlitchEquipSwap;
     }
 
     //Shouldn't be reached
@@ -497,6 +497,7 @@ namespace Logic {
 
   //Updates all logic helpers. Should be called whenever a non-helper is changed
   void UpdateHelpers() {
+    auto ctx = Rando::Context::GetInstance();
     NumBottles      = ((NoBottles) ? 0 : (Bottles + ((DeliverLetter) ? 1 : 0)));
     HasBottle       = NumBottles >= 1;
     Slingshot       = (ProgressiveBulletBag >= 1) && (BuySeed || AmmoCanDrop);
@@ -515,7 +516,7 @@ namespace Logic {
     AdultsWallet    = ProgressiveWallet     >= 1;
     BiggoronSword   = BiggoronSword || ProgressiveGiantKnife >= 2;
 
-    ScarecrowSong    = ScarecrowSong || FreeScarecrow || (ChildScarecrow && AdultScarecrow);
+    ScarecrowSong    = ScarecrowSong || ctx->GetOption(RSK_SKIP_SCARECROWS_SONG) || (ChildScarecrow && AdultScarecrow);
     Scarecrow        = Hookshot && CanPlay(ScarecrowSong);
     DistantScarecrow = Longshot && CanPlay(ScarecrowSong);
 
@@ -532,28 +533,29 @@ namespace Logic {
     Nuts         = DekuNutDrop || Nuts;
     Sticks       = DekuStickDrop || Sticks;
     Bugs         = HasBottle && BugsAccess;
-    BlueFire     = (HasBottle && BlueFireAccess) || (BlueFireArrows && CanUse(RG_ICE_ARROWS));
+    BlueFire     = (HasBottle && BlueFireAccess) || (ctx->GetOption(RSK_BLUE_FIRE_ARROWS) && CanUse(RG_ICE_ARROWS));
     Fish         = HasBottle && FishAccess;
     Fairy        = HasBottle && FairyAccess;
 
     FoundBombchus   = (BombchuDrop || Bombchus || Bombchus5 || Bombchus10 || Bombchus20);
-    CanPlayBowling  = (BombchusInLogic && FoundBombchus) || (!BombchusInLogic && BombBag);
-    HasBombchus     = (BuyBombchus10 || BuyBombchus20 || (AmmoDrops.Is(AMMODROPS_BOMBCHU) && FoundBombchus));
+    CanPlayBowling  = (ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && FoundBombchus) || (!ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && BombBag);
+    // TODO: Implement Ammo Drop Setting in place of bombchu drops
+    HasBombchus     = (BuyBombchus10 || BuyBombchus20 || (ctx->GetOption(RSK_ENABLE_BOMBCHU_DROPS).Is(RO_AMMO_DROPS_ON_PLUS_BOMBCHU) && FoundBombchus));
 
-    HasExplosives =  Bombs || (BombchusInLogic && HasBombchus);
+    HasExplosives =  Bombs || (ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && HasBombchus);
 
     HasBoots = IronBoots || HoverBoots;
 
     //Unshuffled adult trade quest
-    Eyedrops     = Eyedrops     || (!ShuffleAdultTradeQuest && ClaimCheck);
-    EyeballFrog  = EyeballFrog  || (!ShuffleAdultTradeQuest && Eyedrops);
-    Prescription = Prescription || (!ShuffleAdultTradeQuest && EyeballFrog);
-    BrokenSword  = BrokenSword  || (!ShuffleAdultTradeQuest && Prescription);
-    PoachersSaw  = PoachersSaw  || (!ShuffleAdultTradeQuest && BrokenSword);
-    OddPoultice  = OddPoultice  || (!ShuffleAdultTradeQuest && PoachersSaw);
-    OddMushroom  = OddMushroom  || (!ShuffleAdultTradeQuest && OddPoultice);
-    Cojiro       = Cojiro       || (!ShuffleAdultTradeQuest && OddMushroom);
-    PocketEgg    = PocketEgg    || (!ShuffleAdultTradeQuest && Cojiro);
+    Eyedrops     = Eyedrops     || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && ClaimCheck);
+    EyeballFrog  = EyeballFrog  || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && Eyedrops);
+    Prescription = Prescription || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && EyeballFrog);
+    BrokenSword  = BrokenSword  || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && Prescription);
+    PoachersSaw  = PoachersSaw  || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && BrokenSword);
+    OddPoultice  = OddPoultice  || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && PoachersSaw);
+    OddMushroom  = OddMushroom  || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && OddPoultice);
+    Cojiro       = Cojiro       || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && OddMushroom);
+    PocketEgg    = PocketEgg    || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && Cojiro);
 
     // IsChild = Age == AGE_CHILD;
     // IsAdult = Age == AGE_ADULT;
@@ -566,34 +568,34 @@ namespace Logic {
     CanStunDeku     = CanAdultAttack || CanChildAttack || Nuts || HasShield;
     CanCutShrubs    = CanUse(RG_KOKIRI_SWORD) || CanUse(RG_BOOMERANG) || HasExplosives || CanUse(RG_MASTER_SWORD) || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_BIGGORON_SWORD);
     CanDive         = ProgressiveScale >= 1;
-    CanLeaveForest  = OpenForest.IsNot(OPENFOREST_CLOSED) || IsAdult || DekuTreeClear || ShuffleInteriorEntrances || ShuffleOverworldEntrances;
+    CanLeaveForest  = ctx->GetOption(RSK_FOREST).IsNot(RO_FOREST_CLOSED) || IsAdult || DekuTreeClear || ctx->GetOption(RSK_SHUFFLE_INTERIOR_ENTRANCES) || ctx->GetOption(RSK_SHUFFLE_OVERWORLD_ENTRANCES);
     CanPlantBugs    = IsChild && Bugs;
     CanRideEpona    = IsAdult && Epona && CanPlay(EponasSong);
     CanSummonGossipFairy            = Ocarina && (ZeldasLullaby || EponasSong || SongOfTime || SunsSong);
     CanSummonGossipFairyWithoutSuns = Ocarina && (ZeldasLullaby || EponasSong || SongOfTime);
     Hearts          = BaseHearts + HeartContainer + (PieceOfHeart >> 2);
     EffectiveHealth = ((Hearts << (2 + DoubleDefense)) >> Multiplier) + ((Hearts << (2 + DoubleDefense)) % (1 << Multiplier) > 0); //Number of half heart hits to die, ranges from 1 to 160
-    FireTimer       = CanUse(RG_GORON_TUNIC) ? 255 : (LogicFewerTunicRequirements) ? (Hearts * 8) : 0;
-    WaterTimer      = CanUse(RG_ZORA_TUNIC) ? 255 : (LogicFewerTunicRequirements) ? (Hearts * 8) : 0;
+    FireTimer       = CanUse(RG_GORON_TUNIC) ? 255 : (ctx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS)) ? (Hearts * 8) : 0;
+    WaterTimer      = CanUse(RG_ZORA_TUNIC) ? 255 : (ctx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS)) ? (Hearts * 8) : 0;
     NeedNayrusLove      = (EffectiveHealth == 1);
     CanSurviveDamage    = !NeedNayrusLove || CanUse(RG_NAYRUS_LOVE);
     CanTakeDamage       = Fairy || CanSurviveDamage;
     CanTakeDamageTwice  = (Fairy && NumBottles >= 2) || ((EffectiveHealth == 2) && (CanUse(RG_NAYRUS_LOVE) || Fairy)) || (EffectiveHealth > 2);
     //CanPlantBean        = IsChild && (MagicBean || MagicBeanPack);
-    CanOpenBombGrotto   = CanBlastOrSmash       && (ShardOfAgony || LogicGrottosWithoutAgony);
-    CanOpenStormGrotto  = CanPlay(SongOfStorms) && (ShardOfAgony || LogicGrottosWithoutAgony);
+    CanOpenBombGrotto   = CanBlastOrSmash       && (ShardOfAgony || ctx->GetTrickOption(RT_GROTTOS_WITHOUT_AGONY));
+    CanOpenStormGrotto  = CanPlay(SongOfStorms) && (ShardOfAgony || ctx->GetTrickOption(RT_GROTTOS_WITHOUT_AGONY));
     HookshotOrBoomerang = CanUse(RG_HOOKSHOT) || CanUse(RG_BOOMERANG);
-    CanGetNightTimeGS   = (CanPlay(SunsSong) || !NightGSExpectSuns);
+    CanGetNightTimeGS   = (CanPlay(SunsSong) || !ctx->GetOption(RSK_SKULLS_SUNS_SONG));
 
-    GuaranteeTradePath     = ShuffleInteriorEntrances || ShuffleOverworldEntrances || LogicBiggoronBolero || CanBlastOrSmash || StopGCRollingGoronAsAdult;
+    GuaranteeTradePath     = ctx->GetOption(RSK_SHUFFLE_INTERIOR_ENTRANCES) || ctx->GetOption(RSK_SHUFFLE_OVERWORLD_ENTRANCES) || ctx->GetTrickOption(RT_DMT_BOLERO_BIGGORON) || CanBlastOrSmash || StopGCRollingGoronAsAdult;
   //GuaranteeHint          = (hints == "Mask" && MaskofTruth) || (hints == "Agony") || (hints != "Mask" && hints != "Agony");
     HasFireSource          = CanUse(RG_DINS_FIRE) || CanUse(RG_FIRE_ARROWS);
     HasFireSourceWithTorch = HasFireSource || CanUse(RG_STICKS);
 
     //Gerudo Fortress
-    CanFinishGerudoFortress = (GerudoFortress.Is(GERUDOFORTRESS_NORMAL)    && GerudoFortressKeys >= 4 && (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) && (GerudoToken || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_HOVER_BOOTS) || LogicGerudoKitchen)) ||
-                              (GerudoFortress.Is(GERUDOFORTRESS_FAST)      && GerudoFortressKeys >= 1 && (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD))) ||
-                              (GerudoFortress.IsNot(GERUDOFORTRESS_NORMAL) && GerudoFortress.IsNot(GERUDOFORTRESS_FAST));
+    CanFinishGerudoFortress = (ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_NORMAL)    && GerudoFortressKeys >= 4 && (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) && (GerudoToken || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_HOVER_BOOTS) || ctx->GetTrickOption(RT_GF_KITCHEN))) ||
+                              (ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_FAST)      && GerudoFortressKeys >= 1 && (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD))) ||
+                              (ctx->GetOption(RSK_GERUDO_FORTRESS).IsNot(RO_GF_NORMAL) && ctx->GetOption(RSK_GERUDO_FORTRESS).IsNot(RO_GF_FAST));
 
     HasShield          = CanUse(RG_HYLIAN_SHIELD) || CanUse(RG_DEKU_SHIELD); //Mirror shield can't reflect attacks
     CanShield          = CanUse(RG_MIRROR_SHIELD) || HasShield;
@@ -611,25 +613,25 @@ namespace Logic {
     DungeonCount          = (DekuTreeClear ? 1:0) + (DodongosCavernClear ? 1:0) + (JabuJabusBellyClear ? 1:0) + (ForestTempleClear ? 1:0) + (FireTempleClear ? 1:0) + (WaterTempleClear ? 1:0) + (SpiritTempleClear ? 1:0) + (ShadowTempleClear ? 1:0);
     HasAllStones          = StoneCount == 3;
     HasAllMedallions      = MedallionCount == 6;
-    GregInBridgeLogic     = BridgeRewardOptions.Is(BRIDGE_OPTION_GREG);
-    GregInLacsLogic       = LACSRewardOptions.Is(LACS_OPTION_GREG);
+    GregInBridgeLogic     = ctx->GetOption(RSK_BRIDGE_OPTIONS).Is(RO_BRIDGE_GREG);
+    GregInLacsLogic       = ctx->GetOption(RSK_LACS_OPTIONS).Is(RO_LACS_GREG_REWARD);
 
-    CanBuildRainbowBridge = Bridge.Is(RAINBOWBRIDGE_OPEN)                                                                         ||
-                           (Bridge.Is(RAINBOWBRIDGE_VANILLA)    && ShadowMedallion && SpiritMedallion && LightArrows)             ||
-                           (Bridge.Is(RAINBOWBRIDGE_STONES)     && StoneCount + (Greg && GregInBridgeLogic ? 1 : 0) >= BridgeStoneCount.Value<uint8_t>())                    ||
-                           (Bridge.Is(RAINBOWBRIDGE_MEDALLIONS) && MedallionCount + (Greg && GregInBridgeLogic ? 1 : 0) >= BridgeMedallionCount.Value<uint8_t>())            ||
-                           (Bridge.Is(RAINBOWBRIDGE_REWARDS)    && StoneCount + MedallionCount + (Greg && GregInBridgeLogic ? 1 : 0) >= BridgeRewardCount.Value<uint8_t>())  ||
-                           (Bridge.Is(RAINBOWBRIDGE_DUNGEONS)   && DungeonCount + (Greg && GregInBridgeLogic ? 1 : 0) >= BridgeDungeonCount.Value<uint8_t>())                ||
-                           (Bridge.Is(RAINBOWBRIDGE_TOKENS)     && GoldSkulltulaTokens >= BridgeTokenCount.Value<uint8_t>()) ||
-                           (Bridge.Is(RAINBOWBRIDGE_GREG)       && Greg);
+    CanBuildRainbowBridge = ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_ALWAYS_OPEN)                                                                         ||
+                           (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_VANILLA)    && ShadowMedallion && SpiritMedallion && LightArrows)             ||
+                           (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_STONES)     && StoneCount + (Greg && GregInBridgeLogic ? 1 : 0) >= ctx->GetOption(RSK_RAINBOW_BRIDGE_STONE_COUNT).Value<uint8_t>())                    ||
+                           (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_MEDALLIONS) && MedallionCount + (Greg && GregInBridgeLogic ? 1 : 0) >= ctx->GetOption(RSK_RAINBOW_BRIDGE_MEDALLION_COUNT).Value<uint8_t>())            ||
+                           (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_DUNGEON_REWARDS)    && StoneCount + MedallionCount + (Greg && GregInBridgeLogic ? 1 : 0) >= ctx->GetOption(RSK_RAINBOW_BRIDGE_REWARD_COUNT).Value<uint8_t>())  ||
+                           (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_DUNGEONS)   && DungeonCount + (Greg && GregInBridgeLogic ? 1 : 0) >= ctx->GetOption(RSK_RAINBOW_BRIDGE_DUNGEON_COUNT).Value<uint8_t>())                ||
+                           (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_TOKENS)     && GoldSkulltulaTokens >= ctx->GetOption(RSK_RAINBOW_BRIDGE_TOKEN_COUNT).Value<uint8_t>()) ||
+                           (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_GREG)       && Greg);
 
-    CanTriggerLACS = (LACSCondition == LACSCONDITION_VANILLA    && ShadowMedallion && SpiritMedallion)                          ||
-                     (LACSCondition == LACSCONDITION_STONES     && StoneCount + (Greg && GregInLacsLogic ? 1 : 0) >= LACSStoneCount.Value<uint8_t>())                    ||
-                     (LACSCondition == LACSCONDITION_MEDALLIONS && MedallionCount + (Greg && GregInLacsLogic ? 1 : 0) >= LACSMedallionCount.Value<uint8_t>())            ||
-                     (LACSCondition == LACSCONDITION_REWARDS    && StoneCount + MedallionCount + (Greg && GregInLacsLogic ? 1 : 0) >= LACSRewardCount.Value<uint8_t>())  ||
-                     (LACSCondition == LACSCONDITION_DUNGEONS   && DungeonCount + (Greg && GregInLacsLogic ? 1 : 0) >= LACSDungeonCount.Value<uint8_t>())                ||
-                     (LACSCondition == LACSCONDITION_TOKENS     && GoldSkulltulaTokens >= LACSTokenCount.Value<uint8_t>());
-    CanCompleteTriforce = TriforcePieces >= TriforceHuntRequired.Value<uint8_t>();
+    CanTriggerLACS = (ctx->GetSettings()->LACSCondition() == RO_LACS_VANILLA    && ShadowMedallion && SpiritMedallion)                          ||
+                     (ctx->GetSettings()->LACSCondition() == RO_LACS_STONES     && StoneCount + (Greg && GregInLacsLogic ? 1 : 0) >= ctx->GetOption(RSK_LACS_STONE_COUNT).Value<uint8_t>())                    ||
+                     (ctx->GetSettings()->LACSCondition() == RO_LACS_MEDALLIONS && MedallionCount + (Greg && GregInLacsLogic ? 1 : 0) >= ctx->GetOption(RSK_LACS_MEDALLION_COUNT).Value<uint8_t>())            ||
+                     (ctx->GetSettings()->LACSCondition() == RO_LACS_REWARDS    && StoneCount + MedallionCount + (Greg && GregInLacsLogic ? 1 : 0) >= ctx->GetOption(RSK_LACS_REWARD_COUNT).Value<uint8_t>())  ||
+                     (ctx->GetSettings()->LACSCondition() == RO_LACS_DUNGEONS   && DungeonCount + (Greg && GregInLacsLogic ? 1 : 0) >= ctx->GetOption(RSK_LACS_DUNGEON_COUNT).Value<uint8_t>())                ||
+                     (ctx->GetSettings()->LACSCondition() == RO_LACS_TOKENS     && GoldSkulltulaTokens >= ctx->GetOption(RSK_LACS_TOKEN_COUNT).Value<uint8_t>());
+    CanCompleteTriforce = TriforcePieces >= ctx->GetOption(RSK_TRIFORCE_HUNT_PIECES_REQUIRED).Value<uint8_t>();
   }
 
   bool SmallKeys(RandomizerRegion dungeon, uint8_t requiredAmount) {
@@ -730,9 +732,12 @@ namespace Logic {
 
    //Reset All Logic to false
    void LogicReset() {
+    auto ctx = Rando::Context::GetInstance();
      //Settings-dependent variables
-     IsKeysanity = Keysanity.Is(KEYSANITY_ANYWHERE) || Keysanity.Is(KEYSANITY_OVERWORLD) || Keysanity.Is(KEYSANITY_ANY_DUNGEON);
-     AmmoCanDrop = AmmoDrops.IsNot(AMMODROPS_NONE);
+     IsKeysanity = ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_ANYWHERE) || 
+                   ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_ANYWHERE) || 
+                   ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_ANYWHERE);
+     AmmoCanDrop = /*AmmoDrops.IsNot(AMMODROPS_NONE) TODO: AmmoDrop setting*/ true;
 
      //Child item logic
      KokiriSword   = false;
@@ -858,7 +863,7 @@ namespace Logic {
      //Keys
      ForestTempleKeys          = 0;
      //If not keysanity, start with 1 logical key to account for automatically unlocking the basement door in vanilla FiT
-     FireTempleKeys            = IsKeysanity || Dungeon::FireTemple.IsMQ() ? 0 : 1;
+     FireTempleKeys            = IsKeysanity || ctx->GetDungeon(Rando::FIRE_TEMPLE)->IsMQ() ? 0 : 1;
      WaterTempleKeys           = 0;
      SpiritTempleKeys          = 0;
      ShadowTempleKeys          = 0;
@@ -968,7 +973,7 @@ namespace Logic {
      HasBoots         = false;
      IsChild          = false;
      IsAdult          = false;
-     IsGlitched       = Settings::Logic.Is(LOGIC_GLITCHED);
+     IsGlitched       = ctx->GetOption(RSK_LOGIC_RULES).Is(RO_LOGIC_GLITCHED);
      CanBlastOrSmash  = false;
      CanChildAttack   = false;
      CanChildDamage   = false;
@@ -986,9 +991,9 @@ namespace Logic {
      BigPoeKill          = false;
      HookshotOrBoomerang = false;
 
-     BaseHearts      = StartingHearts.Value<uint8_t>() + 1;
+     BaseHearts      = ctx->GetOption(RSK_STARTING_HEARTS).Value<uint8_t>() + 1;
      Hearts          = 0;
-     Multiplier      = (DamageMultiplier.Value<uint8_t>() < 6) ? DamageMultiplier.Value<uint8_t>() : 10;
+     Multiplier      = (ctx->GetOption(RSK_DAMAGE_MULTIPLIER).Value<uint8_t>() < 6) ? ctx->GetOption(RSK_DAMAGE_MULTIPLIER).Value<uint8_t>() : 10;
      EffectiveHealth = 0;
      FireTimer       = 0;
      WaterTimer      = 0;
@@ -1020,7 +1025,7 @@ namespace Logic {
      //Other
      AtDay         = false;
      AtNight       = false;
-     Age           = Settings::ResolvedStartingAge;
+     Age           = ctx->GetSettings()->ResolvedStartingAge();
 
      //Events
      ShowedMidoSwordAndShield  = false;
diff --git a/soh/soh/Enhancements/randomizer/3drando/menu.cpp b/soh/soh/Enhancements/randomizer/3drando/menu.cpp
index 5da2b618c..f6131cd87 100644
--- a/soh/soh/Enhancements/randomizer/3drando/menu.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/menu.cpp
@@ -8,7 +8,6 @@
 #include "menu.hpp"
 #include "playthrough.hpp"
 #include "randomizer.hpp"
-#include "settings.hpp"
 #include "spoiler_log.hpp"
 #include "location_access.hpp"
 #include <spdlog/spdlog.h>
@@ -19,11 +18,12 @@ namespace {
 bool seedChanged;
 uint16_t pastSeedLength;
 std::vector<std::string> presetEntries;
-Option* currentSetting;
+Rando::Option* currentSetting;
 } // namespace
 
 std::string GenerateRandomizer(std::unordered_map<RandomizerSettingKey, uint8_t> cvarSettings, std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks,
     std::string seedString) {
+    auto ctx = Rando::Context::GetInstance();
 
     srand(time(NULL));
     // if a blank seed was entered, make a random one
@@ -42,11 +42,11 @@ std::string GenerateRandomizer(std::unordered_map<RandomizerSettingKey, uint8_t>
         return "";
     }
 
-    Settings::seedString = seedString;
-    uint32_t seedHash = boost::hash_32<std::string>{}(Settings::seedString);
-    Settings::seed = seedHash & 0xFFFFFFFF;
+    ctx->GetSettings()->SetSeedString(seedString);
+    uint32_t seedHash = boost::hash_32<std::string>{}(ctx->GetSettings()->GetSeedString());
+    ctx->GetSettings()->SetSeed(seedHash & 0xFFFFFFFF);
 
-    int ret = Playthrough::Playthrough_Init(Settings::seed, cvarSettings, excludedLocations, enabledTricks);
+    int ret = Playthrough::Playthrough_Init(ctx->GetSettings()->GetSeed(), cvarSettings, excludedLocations, enabledTricks);
     if (ret < 0) {
         if (ret == -1) { // Failed to generate after 5 tries
             printf("\n\nFailed to generate after 5 tries.\nPress B to go back to the menu.\nA different seed might be "
@@ -60,21 +60,21 @@ std::string GenerateRandomizer(std::unordered_map<RandomizerSettingKey, uint8_t>
     }
 
     // Restore settings that were set to a specific value for vanilla logic
-    if (Settings::Logic.Is(LOGIC_VANILLA)) {
-        for (Option* setting : Settings::vanillaLogicDefaults) {
+    if (ctx->GetOption(RSK_LOGIC_RULES).Is(RO_LOGIC_VANILLA)) {
+        for (Rando::Option* setting : ctx->GetSettings()->VanillaLogicDefaults) {
             setting->RestoreDelayedOption();
         }
-        Settings::Keysanity.RestoreDelayedOption();
+        ctx->GetOption(RSK_KEYSANITY).RestoreDelayedOption();
     }
     std::ostringstream fileNameStream;
-    for (int i = 0; i < Settings::hashIconIndexes.size(); i++) {
+    for (int i = 0; i < ctx->hashIconIndexes.size(); i++) {
         if (i) {
             fileNameStream << '-';
         }
-        if (Settings::hashIconIndexes[i] < 10) {
+        if (ctx->hashIconIndexes[i] < 10) {
             fileNameStream << '0';
         }
-        fileNameStream << std::to_string(Settings::hashIconIndexes[i]);
+        fileNameStream << std::to_string(ctx->hashIconIndexes[i]);
     }
     std::string fileName = fileNameStream.str();
     return "./Randomizer/" + fileName + ".json";
diff --git a/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp b/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
index 4ae1c3b67..8dfa38d7e 100644
--- a/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
@@ -8,6 +8,8 @@
 #include "random.hpp"
 #include "spoiler_log.hpp"
 #include "soh/Enhancements/randomizer/randomizerTypes.h"
+#include <variables.h>
+#include "../option.h"
 
 namespace Playthrough {
 
@@ -23,30 +25,29 @@ int Playthrough_Init(uint32_t seed, std::unordered_map<RandomizerSettingKey, uin
     ctx->HintReset();
     Areas::AccessReset();
 
-    Settings::UpdateSettings(cvarSettings, excludedLocations, enabledTricks);
+    ctx->GetSettings()->UpdateSettings(cvarSettings, excludedLocations, enabledTricks);
     // once the settings have been finalized turn them into a string for hashing
     std::string settingsStr;
-    for (Menu* menu : Settings::GetAllOptionMenus()) {
+    for (const Rando::OptionGroup& optionGroup : ctx->GetSettings()->GetOptionGroups()) {
         // don't go through non-menus
-        if (menu->mode != OPTION_SUB_MENU) {
+        if (optionGroup.GetContainsType() != Rando::OptionGroupType::SUBGROUP) {
             continue;
         }
 
-        for (size_t i = 0; i < menu->settingsList->size(); i++) {
-            Option* setting = menu->settingsList->at(i);
-            if (setting->IsCategory(OptionCategory::Setting)) {
-                settingsStr += setting->GetSelectedOptionText();
+        for (Rando::Option* option : optionGroup.GetOptions()) {
+            if (option->IsCategory(Rando::OptionCategory::Setting)) {
+                settingsStr += option->GetSelectedOptionText();
             }
         }
     }
 
-    uint32_t finalHash = boost::hash_32<std::string>{}(std::to_string(Settings::seed) + settingsStr);
+    uint32_t finalHash = boost::hash_32<std::string>{}(std::to_string(ctx->GetSettings()->GetSeed()) + settingsStr);
     Random_Init(finalHash);
-    Settings::hash = std::to_string(finalHash);
+    ctx->GetSettings()->SetHash(std::to_string(finalHash));
 
     Logic::UpdateHelpers();
 
-    if (Settings::Logic.Is(LOGIC_VANILLA)) {
+    if (ctx->GetOption(RSK_LOGIC_RULES).Is(RO_LOGIC_VANILLA)) {
         VanillaFill(); // Just place items in their vanilla locations
     } else {           // Fill locations with logic
         int ret = Fill();
@@ -58,7 +59,7 @@ int Playthrough_Init(uint32_t seed, std::unordered_map<RandomizerSettingKey, uin
     GenerateHash();
     WriteIngameSpoilerLog();
 
-    if (Settings::GenerateSpoilerLog) {
+    if (/*Settings::GenerateSpoilerLog TODO: do we ever not want to write a spoiler log?*/ true) {
         // write logs
         printf("\x1b[11;10HWriting Spoiler Log...");
         if (SpoilerLog_Write(cvarSettings[RSK_LANGUAGE])) {
@@ -86,14 +87,15 @@ int Playthrough_Init(uint32_t seed, std::unordered_map<RandomizerSettingKey, uin
 // used for generating a lot of seeds at once
 int Playthrough_Repeat(std::unordered_map<RandomizerSettingKey, uint8_t> cvarSettings, std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks, int count /*= 1*/) {
     printf("\x1b[0;0HGENERATING %d SEEDS", count);
+    auto ctx = Rando::Context::GetInstance();
     uint32_t repeatedSeed = 0;
     for (int i = 0; i < count; i++) {
-        Settings::seedString = std::to_string(rand() % 0xFFFFFFFF);
-        repeatedSeed = boost::hash_32<std::string>{}(Settings::seedString);
-        Settings::seed = repeatedSeed % 0xFFFFFFFF;
+        ctx->GetSettings()->SetSeedString(std::to_string(rand() % 0xFFFFFFFF));
+        repeatedSeed = boost::hash_32<std::string>{}(ctx->GetSettings()->GetSeedString());
+        ctx->GetSettings()->SetSeed(repeatedSeed % 0xFFFFFFFF);
         //CitraPrint("testing seed: " + std::to_string(Settings::seed));
         ClearProgress();
-        Playthrough_Init(Settings::seed, cvarSettings, excludedLocations, enabledTricks);
+        Playthrough_Init(ctx->GetSettings()->GetSeed(), cvarSettings, excludedLocations, enabledTricks);
         printf("\x1b[15;15HSeeds Generated: %d\n", i + 1);
     }
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/rando_main.cpp b/soh/soh/Enhancements/randomizer/3drando/rando_main.cpp
index 5b35a85ab..2c2ea3158 100644
--- a/soh/soh/Enhancements/randomizer/3drando/rando_main.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/rando_main.cpp
@@ -4,6 +4,7 @@
 #include "../item_location.h"
 #include "location_access.hpp"
 #include "rando_main.hpp"
+#include "../context.h"
 // #include <soh/Enhancements/randomizer.h>
 #include <libultraship/bridge.h>
 #include <Context.h>
@@ -17,9 +18,10 @@ void RandoMain::GenerateRando(std::unordered_map<RandomizerSettingKey, u8> cvarS
     // CVarSetString("gLoadedPreset", settingsFileName.c_str());
 
     std::string fileName = LUS::Context::GetPathRelativeToAppDirectory(GenerateRandomizer(cvarSettings, excludedLocations, enabledTricks, seedString).c_str());
-    CVarSetString("gSpoilerLog", fileName.c_str());
 
     CVarSave();
     CVarLoad();
-    CVarSetInteger("gNewSeedGenerated", 1);
+    Rando::Context::GetInstance()->SetSeedGenerated();
+    Rando::Context::GetInstance()->SetSpoilerLoaded(false);
+    Rando::Context::GetInstance()->SetPlandoLoaded(false);
 }
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/3drando/settings.cpp b/soh/soh/Enhancements/randomizer/3drando/settings.cpp
deleted file mode 100644
index f5d3e41b6..000000000
--- a/soh/soh/Enhancements/randomizer/3drando/settings.cpp
+++ /dev/null
@@ -1,2652 +0,0 @@
-#include "settings.hpp"
-
-#include "dungeon.hpp"
-#include "fill.hpp"
-#include "../context.h"
-#include "../item_location.h"
-#include "random.hpp"
-#include "randomizer.hpp"
-#include "trial.hpp"
-
-using namespace Dungeon;
-using namespace Trial;
-
-namespace Settings {
-  uint32_t seed;
-  std::string hash;
-  std::string version = RANDOMIZER_VERSION "-" COMMIT_NUMBER;
-  std::array<uint8_t, 5> hashIconIndexes;
-  std::string seedString;
-
-  bool skipChildZelda = false;
-
-  std::vector<std::string> NumOpts(int min, int max, int step = 1, std::string textBefore = {}, std::string textAfter = {}) {
-    std::vector<std::string> options;
-    options.reserve((max - min) / step + 1);
-    for (int i = min; i <= max; i += step) {
-      options.push_back(textBefore + std::to_string(i) + textAfter);
-    }
-    return options;
-  }
-
-  std::vector<std::string> MultiVecOpts(std::vector<std::vector<std::string>> optionsVector) {
-    uint32_t totalSize = 0;
-    for (auto vector : optionsVector) {
-      totalSize += vector.size();
-    }
-    std::vector<std::string> options;
-    options.reserve(totalSize);
-    for (auto vector : optionsVector) {
-      for (auto op : vector) {
-        options.push_back(op);
-      }
-    }
-    return options;
-  }
-
-  //                                        Setting name,            Options,                           Category (default: Setting),Default index (default: 0), Default hidden (default: false)
-  //Open Settings
-  Option RandomizeOpen       = Option::Bool("Randomize Settings",    {"No","Yes"},                      OptionCategory::Toggle);
-  Option OpenForest          = Option::U8  ("Forest",                {"Closed", "Closed Deku", "Open"}, OptionCategory::Setting, OPENFOREST_CLOSED);
-  Option OpenKakariko        = Option::U8  ("Kakariko Gate",         {"Closed", "Open"});
-  Option OpenDoorOfTime      = Option::U8  ("Door of Time",          {"Closed", "Song only", "Open"});
-  Option ZorasFountain       = Option::U8  ("Zora's Fountain",       {"Closed", "Closed as child", "Open"});
-  Option GerudoFortress      = Option::U8  ("Gerudo Fortress",       {"Normal", "Fast", "Open"});
-  Option Bridge              = Option::U8  ("Rainbow Bridge",        {"Vanilla", "Always open", "Stones", "Medallions", "Dungeon rewards", "Dungeons", "Tokens", "Greg"}, OptionCategory::Setting, RAINBOWBRIDGE_VANILLA);
-  Option BridgeStoneCount    = Option::U8  ("Stone Count",           {NumOpts(0, 4)},   OptionCategory::Setting, 1, true);
-  Option BridgeMedallionCount= Option::U8  ("Medallion Count",       {NumOpts(0, 7)},   OptionCategory::Setting, 1, true);
-  Option BridgeRewardCount   = Option::U8  ("Reward Count",          {NumOpts(0, 10)},  OptionCategory::Setting, 1, true);
-  Option BridgeDungeonCount  = Option::U8  ("Dungeon Count",         {NumOpts(0, 9)},   OptionCategory::Setting, 1, true);
-  Option BridgeTokenCount    = Option::U8  ("Token Count",           {NumOpts(0, 100)}, OptionCategory::Setting, 1, true);
-  Option BridgeRewardOptions = Option::U8  ("Bridge Reward Options", {"Standard Rewards", "Greg as Reward", "Greg as Wildcard"});
-  Option RandomGanonsTrials  = Option::Bool("Random Ganon's Trials", {"Off", "On"},     OptionCategory::Setting, ON);
-  Option GanonsTrialsCount   = Option::U8  ("Trial Count",           {NumOpts(0, 6)},   OptionCategory::Setting, 1, true);
-  std::vector<Option *> openOptions = {
-    &RandomizeOpen,
-    &OpenForest,
-    &OpenKakariko,
-    &OpenDoorOfTime,
-    &ZorasFountain,
-    &GerudoFortress,
-    &Bridge,
-    &BridgeStoneCount,
-    &BridgeMedallionCount,
-    &BridgeRewardCount,
-    &BridgeDungeonCount,
-    &BridgeTokenCount,
-    &BridgeRewardOptions,
-    &RandomGanonsTrials,
-    &GanonsTrialsCount,
-  };
-
-  //World Settings
-  Option RandomizeWorld            = Option::Bool("Randomize Settings",     {"No","Yes"},                 OptionCategory::Toggle);
-  Option StartingAge               = Option::U8  ("Starting Age",           {"Child", "Adult", "Random"}, OptionCategory::Setting, AGE_CHILD);
-  uint8_t ResolvedStartingAge;
-  Option ShuffleEntrances          = Option::Bool("Shuffle Entrances",      {"Off", "On"});
-  Option ShuffleDungeonEntrances   = Option::U8  ("Dungeon Entrances",      {"Off", "On", "On + Ganon"});
-  Option ShuffleBossEntrances      = Option::U8  ("Boss Entrances",         {"Off", "Age Restricted", "Full"});
-  Option ShuffleOverworldEntrances = Option::Bool("Overworld Entrances",    {"Off", "On"});
-  Option ShuffleInteriorEntrances  = Option::U8  ("Interior Entrances",     {"Off", "Simple", "All"});
-  Option ShuffleGrottoEntrances    = Option::Bool("Grottos Entrances",      {"Off", "On"});
-  Option ShuffleOwlDrops           = Option::Bool("Owl Drops",              {"Off", "On"});
-  Option ShuffleWarpSongs          = Option::Bool("Warp Songs",             {"Off", "On"});
-  Option ShuffleOverworldSpawns    = Option::Bool("Overworld Spawns",       {"Off", "On"});
-  Option MixedEntrancePools        = Option::Bool("Mixed Entrance Pools",   {"Off", "On"});
-  Option MixDungeons               = Option::Bool("Mix Dungeons",           {"Off", "On"});
-  Option MixOverworld              = Option::Bool("Mix Overworld",          {"Off", "On"});
-  Option MixInteriors              = Option::Bool("Mix Interiors",          {"Off", "On"});
-  Option MixGrottos                = Option::Bool("Mix Grottos",            {"Off", "On"});
-  Option DecoupleEntrances         = Option::Bool("Decouple Entrances",     {"Off", "On"});
-  Option BombchusInLogic           = Option::Bool("Bombchus in Logic",      {"Off", "On"});
-  Option AmmoDrops                 = Option::U8  ("Ammo Drops",             {"On", "On + Bombchu", "Off"},         OptionCategory::Setting, AMMODROPS_BOMBCHU);
-  Option HeartDropRefill           = Option::U8  ("Heart Drops and Refills",{"On", "No Drop", "No Refill", "Off"}, OptionCategory::Setting, HEARTDROPREFILL_VANILLA);
-  Option TriforceHunt              = Option::U8  ("Triforce Hunt",          {"Off", "On"});
-  Option TriforceHuntTotal         = Option::U8  ("Triforce Hunt Total Pieces", {NumOpts(0, 100)});
-  Option TriforceHuntRequired      = Option::U8  ("Triforce Hunt Required Pieces", {NumOpts(0, 100)});
-  Option MQDungeonCount = Option::U8(
-      "MQ Dungeon Count", { MultiVecOpts({ NumOpts(0, 12), { "Random" }, { "Selection" } }) });
-  uint8_t MQSet;
-  bool DungeonModesKnown[12];
-  Option SetDungeonTypes           = Option::Bool("Set Dungeon Types",    {"Off", "On"});
-  Option MQDeku                    = Option::U8  ("Deku Tree",            {"Vanilla", "Master Quest", "Random"});
-  Option MQDodongo                 = Option::U8  ("Dodongo's Cavern",     {"Vanilla", "Master Quest", "Random"});
-  Option MQJabu                    = Option::U8  ("Jabu-Jabu's Belly",    {"Vanilla", "Master Quest", "Random"});
-  Option MQForest                  = Option::U8  ("Forest Temple",        {"Vanilla", "Master Quest", "Random"});
-  Option MQFire                    = Option::U8  ("Fire Temple",          {"Vanilla", "Master Quest", "Random"});
-  Option MQWater                   = Option::U8  ("Water Temple",         {"Vanilla", "Master Quest", "Random"});
-  Option MQSpirit                  = Option::U8  ("Spirit Temple",        {"Vanilla", "Master Quest", "Random"});
-  Option MQShadow                  = Option::U8  ("Shadow Temple",        {"Vanilla", "Master Quest", "Random"});
-  Option MQBotW                    = Option::U8  ("Bottom of the Well",   {"Vanilla", "Master Quest", "Random"});
-  Option MQIceCavern               = Option::U8  ("Ice Cavern",           {"Vanilla", "Master Quest", "Random"});
-  Option MQGTG                     = Option::U8  ("Training Grounds",     {"Vanilla", "Master Quest", "Random"});
-  Option MQCastle                  = Option::U8  ("Ganon's Castle",       {"Vanilla", "Master Quest", "Random"});
-  std::vector<Option *> worldOptions = {
-    &RandomizeWorld,
-    &StartingAge,
-    &ShuffleEntrances,
-    &ShuffleDungeonEntrances,
-    &ShuffleBossEntrances,
-    &ShuffleOverworldEntrances,
-    &ShuffleInteriorEntrances,
-    &ShuffleGrottoEntrances,
-    &ShuffleOwlDrops,
-    &ShuffleWarpSongs,
-    &ShuffleOverworldSpawns,
-    &MixedEntrancePools,
-    &MixDungeons,
-    &MixOverworld,
-    &MixInteriors,
-    &MixGrottos,
-    &DecoupleEntrances,
-    &BombchusInLogic,
-    &AmmoDrops,
-    &HeartDropRefill,
-    &TriforceHunt,
-    &TriforceHuntTotal,
-    &TriforceHuntRequired,
-    &MQDungeonCount,
-    &SetDungeonTypes,
-    &MQDeku,
-    &MQDodongo,
-    &MQJabu,
-    &MQForest,
-    &MQFire,
-    &MQWater,
-    &MQSpirit,
-    &MQShadow,
-    &MQBotW,
-    &MQIceCavern,
-    &MQGTG,
-    &MQCastle,
-  };
-  std::vector<Option *> dungeonOptions = {
-    &MQDeku,
-    &MQDodongo,
-    &MQJabu,
-    &MQForest,
-    &MQFire,
-    &MQWater,
-    &MQSpirit,
-    &MQShadow,
-    &MQBotW,
-    &MQIceCavern,
-    &MQGTG,
-    &MQCastle,
-  };
-
-  //Shuffle Settings
-  Option RandomizeShuffle           = Option::Bool("Randomize Settings",     {"No","Yes"}, OptionCategory::Toggle);
-  Option ShuffleRewards             = Option::U8  ("Shuffle Dungeon Rewards",{"End of dungeons", "Any dungeon", "Overworld", "Anywhere"});
-  Option LinksPocketItem            = Option::U8  ("Link's Pocket",          {"Dungeon Reward", "Advancement", "Anything", "Nothing"});
-  Option ShuffleSongs               = Option::U8  ("Shuffle Songs",          {"Song locations", "Dungeon rewards", "Anywhere"});
-  Option Shopsanity                 = Option::U8  ("Shopsanity",             {"Off","0 Items","1 Item","2 Items","3 Items","4 Items","Random"});
-  Option ShopsanityPrices           = Option::U8  ("Shopsanity Prices",      {"Balanced", "Starting Wallet", "Adult Wallet", "Giant's Wallet", "Tycoon's Wallet" });
-  Option ShopsanityPricesAffordable = Option::Bool("Affordable Prices",      {"Off", "On"});
-  Option Tokensanity                = Option::U8  ("Tokensanity",            {"Off", "Dungeons", "Overworld", "All Tokens"});
-  Option Scrubsanity                = Option::U8  ("Scrub Shuffle",          {"Off", "Affordable", "Expensive", "Random Prices"});
-  Option ShuffleCows                = Option::Bool("Shuffle Cows",           {"Off", "On"});
-  Option ShuffleKokiriSword         = Option::Bool("Shuffle Kokiri Sword",   {"Off", "On"});
-  Option ShuffleMasterSword         = Option::Bool("Shuffle Master Sword",   {"Off", "On"});
-  Option ShuffleOcarinas            = Option::Bool("Shuffle Ocarinas",       {"Off", "On"});
-  Option ShuffleWeirdEgg            = Option::Bool("Shuffle Weird Egg",      {"Off", "On"});
-  Option ShuffleGerudoToken         = Option::Bool("Shuffle Gerudo Card",    {"Off", "On"});
-  Option ShuffleMagicBeans          = Option::Bool("Shuffle Magic Beans",    {"Off", "On"});
-  Option ShuffleMerchants           = Option::U8  ("Shuffle Merchants",      {"Off", "On (No Hints)", "On (With Hints)"});
-  Option ShuffleFrogSongRupees      = Option::Bool("Shuffle Frog Song Rupees",{"Off", "On"});
-  Option ShuffleAdultTradeQuest     = Option::Bool("Shuffle Adult Trade",    {"Off", "On"});
-  Option ShuffleChestMinigame       = Option::U8  ("Shuffle Chest Minigame", {"Off", "On (Separate)", "On (Pack)"});
-  Option Shuffle100GSReward         = Option::Bool("Shuffle 100 GS Reward",  {"Off", "On"});
-
-  std::vector<Option *> shuffleOptions = {
-    &RandomizeShuffle,
-    &ShuffleRewards,
-    &LinksPocketItem,
-    &ShuffleSongs,
-    &Shopsanity,
-    &ShopsanityPrices,
-    &ShopsanityPricesAffordable,
-    &Tokensanity,
-    &Scrubsanity,
-    &ShuffleCows,
-    &ShuffleKokiriSword,
-    &ShuffleMasterSword,
-    &ShuffleOcarinas,
-    &ShuffleWeirdEgg,
-    &ShuffleGerudoToken,
-    &ShuffleMagicBeans,
-    &ShuffleMerchants,
-    &ShuffleFrogSongRupees,
-    &ShuffleAdultTradeQuest,
-    &ShuffleChestMinigame,
-    &Shuffle100GSReward,
-  };
-
-  //Shuffle Dungeon Items
-  Option RandomizeDungeon    = Option::Bool("Randomize Settings",        {"No","Yes"}, OptionCategory::Toggle);
-  Option MapsAndCompasses    = Option::U8  ("Maps/Compasses",            {"Start With", "Vanilla", "Own Dungeon", "Any Dungeon", "Overworld", "Anywhere"}, OptionCategory::Setting, MAPSANDCOMPASSES_OWN_DUNGEON);
-  Option Keysanity           = Option::U8  ("Small Keys",                {"Start With", "Vanilla", "Own Dungeon", "Any Dungeon", "Overworld", "Anywhere"}, OptionCategory::Setting, KEYSANITY_OWN_DUNGEON);
-  Option GerudoKeys          = Option::U8  ("Gerudo Fortress Keys",      {"Vanilla", "Any Dungeon", "Overworld", "Anywhere"});
-  Option BossKeysanity       = Option::U8  ("Boss Keys",                 {"Start With", "Vanilla", "Own Dungeon", "Any Dungeon", "Overworld", "Anywhere"}, OptionCategory::Setting, BOSSKEYSANITY_OWN_DUNGEON);
-  Option GanonsBossKey       = Option::U8  ("Ganon's Boss Key",          {"Vanilla", "Own dungeon", "Start with", "Any Dungeon", "Overworld", "Anywhere", "LACS-Vanilla", "LACS-Stones", "LACS-Medallions", "LACS-Rewards", "LACS-Dungeons", "LACS-Tokens", "100 GS Reward", "Triforce Hunt"}, OptionCategory::Setting, GANONSBOSSKEY_VANILLA);
-  uint8_t LACSCondition           = 0;
-  Option LACSStoneCount      = Option::U8  ("Stone Count",             {NumOpts(0, 4)},   OptionCategory::Setting, 1, true);
-  Option LACSMedallionCount  = Option::U8  ("Medallion Count",         {NumOpts(0, 7)},   OptionCategory::Setting, 1, true);
-  Option LACSRewardCount     = Option::U8  ("Reward Count",            {NumOpts(0, 10)},  OptionCategory::Setting, 1, true);
-  Option LACSDungeonCount    = Option::U8  ("Dungeon Count",           {NumOpts(0, 9)},   OptionCategory::Setting, 1, true);
-  Option LACSTokenCount      = Option::U8  ("Token Count",             {NumOpts(0, 100)}, OptionCategory::Setting, 1, true);
-  Option LACSRewardOptions   = Option::U8  ("LACS Reward Options",     {"Standard Reward", "Greg as Reward", "Greg as Wildcard"});
-  Option KeyRings            = Option::U8  ("Key Rings",               {"Off", "Random", "Count", "Selection"});
-  Option KeyRingsRandomCount = Option::U8  ("Keyring Dungeon Count",   {NumOpts(0, 9)}, OptionCategory::Setting, 1);
-  Option RingFortress        = Option::Bool("Gerudo Fortress",         {"Off", "On"},   OptionCategory::Setting);
-  Option RingForest          = Option::Bool("Forest Temple",           {"Off", "On"},   OptionCategory::Setting);
-  Option RingFire            = Option::Bool("Fire Temple",             {"Off", "On"},   OptionCategory::Setting);
-  Option RingWater           = Option::Bool("Water Temple",            {"Off", "On"},   OptionCategory::Setting);
-  Option RingSpirit          = Option::Bool("Spirit Temple",           {"Off", "On"},   OptionCategory::Setting);
-  Option RingShadow          = Option::Bool("Shadow Temple",           {"Off", "On"},   OptionCategory::Setting);
-  Option RingWell            = Option::Bool("Bottom of the Well",      {"Off", "On"},   OptionCategory::Setting);
-  Option RingGtg             = Option::Bool("GTG",                     {"Off", "On"},   OptionCategory::Setting);
-  Option RingCastle          = Option::Bool("Ganon's Castle",          {"Off", "On"},   OptionCategory::Setting);
-
-  std::vector<Option *> shuffleDungeonItemOptions = {
-    &RandomizeDungeon,
-    &MapsAndCompasses,
-    &Keysanity,
-    &GerudoKeys,
-    &BossKeysanity,
-    &GanonsBossKey,
-    &LACSStoneCount,
-    &LACSMedallionCount,
-    &LACSRewardCount,
-    &LACSDungeonCount,
-    &LACSTokenCount,
-    &LACSRewardOptions,
-    &KeyRings,
-    &KeyRingsRandomCount,
-    &RingFortress,
-    &RingForest,
-    &RingFire,
-    &RingWater,
-    &RingSpirit,
-    &RingShadow,
-    &RingWell,
-    &RingGtg,
-    &RingCastle,
-  };
-  std::vector<Option *> keyRingOptions = {
-    &RingForest,
-    &RingFire,
-    &RingWater,
-    &RingSpirit,
-    &RingShadow,
-    &RingWell,
-    &RingGtg,
-    &RingCastle,
-  };
-
-  //Timesaver Settings
-  Option SkipChildStealth    = Option::Bool("Skip Child Stealth",     {"Don't Skip", "Skip"}, OptionCategory::Setting, SKIP);
-  Option SkipTowerEscape     = Option::Bool("Skip Tower Escape",      {"Don't Skip", "Skip"}, OptionCategory::Setting, SKIP);
-  Option SkipEponaRace       = Option::Bool("Skip Epona Race",        {"Don't Skip", "Skip"});
-  Option SkipMinigamePhases  = Option::Bool("Minigames repetitions",  {"Don't Skip", "Skip"});
-  Option FreeScarecrow       = Option::Bool("Skip Scarecrow's Song",  {"Off", "On"});
-  Option FourPoesCutscene    = Option::Bool("Four Poes Cutscene",     {"Don't Skip", "Skip"}, OptionCategory::Setting, SKIP);
-  Option LakeHyliaOwl        = Option::Bool("Lake Hylia Owl",         {"Don't Skip", "Skip"}, OptionCategory::Setting, SKIP);
-  Option BigPoeTargetCount   = Option::U8  ("Big Poe Target Count",   {NumOpts(1, 10)});
-  Option NumRequiredCuccos   = Option::U8  ("Cuccos to return",       {NumOpts(0, 7)});
-  Option KingZoraSpeed       = Option::U8  ("King Zora Speed",        {"Fast", "Vanilla", "Random"});
-  Option CompleteMaskQuest   = Option::Bool("Complete Mask Quest",    {"Off", "On"});
-  Option EnableGlitchCutscenes = Option::Bool("Enable Glitch-Useful Cutscenes", {"Off", "On"});
-  Option QuickText           = Option::U8  ("Quick Text",             {"0: Vanilla", "1: Skippable", "2: Instant", "3: Turbo"}, OptionCategory::Setting, QUICKTEXT_INSTANT);
-  Option SkipSongReplays     = Option::U8  ("Skip Song Replays",    {"Don't Skip", "Skip (No SFX)", "Skip (Keep SFX)"});
-  Option KeepFWWarpPoint     = Option::Bool("Keep FW Warp Point",     {"Off", "On"});
-  Option FastBunnyHood       = Option::Bool("Fast Bunny Hood",        {"Off", "On"});
-  std::vector<Option *> timesaverOptions = {
-    &SkipChildStealth,
-    &SkipTowerEscape,
-    &SkipEponaRace,
-    &SkipMinigamePhases,
-    &FreeScarecrow,
-    &FourPoesCutscene,
-    &LakeHyliaOwl,
-    &BigPoeTargetCount,
-    &NumRequiredCuccos,
-    &KingZoraSpeed,
-    &CompleteMaskQuest,
-    &EnableGlitchCutscenes,
-    &QuickText,
-    &SkipSongReplays,
-    &KeepFWWarpPoint,
-    &FastBunnyHood,
-  };
-
-  //Misc Settings
-  Option GossipStoneHints    = Option::U8  ("Gossip Stone Hints",     {"No Hints", "Need Nothing", "Mask of Truth", "Stone of Agony"}, OptionCategory::Setting, HINTS_NEED_NOTHING);
-  Option ClearerHints        = Option::U8  ("Hint Clarity",           {"Obscure", "Ambiguous", "Clear"});
-  Option HintDistribution    = Option::U8  ("Hint Distribution",      {"Useless", "Balanced", "Strong", "Very Strong"}, OptionCategory::Setting, 1); // Balanced
-  Option AltarHintText       = Option::Bool("ToT Altar Hint",         {"Off", "On"}, OptionCategory::Setting, 1);
-  Option LightArrowHintText  = Option::Bool("Light Arrow Hint",       {"Off", "On"}, OptionCategory::Setting, 1);
-  Option DampeHintText       = Option::Bool("Dampe's Diary Hint",     {"Off", "On"}, OptionCategory::Setting, 0);
-  Option GregHintText        = Option::Bool("Greg the Rupee Hint",    {"Off", "On"}, OptionCategory::Setting, 0);
-  Option SariaHintText       = Option::Bool("Saria's Hint",           {"Off", "On"}, OptionCategory::Setting, 0);
-  Option FrogsHintText       = Option::Bool("Frog Ocarina Game Hint", {"Off", "On"}, OptionCategory::Setting, 0);
-  Option WarpSongHints       = Option::Bool("Warp Song Hints",        {"Off", "On"}, OptionCategory::Setting, 0);
-  Option Kak10GSHintText     = Option::Bool("10 GS Hint",             {"Off", "On"}, OptionCategory::Setting, 0);
-  Option Kak20GSHintText     = Option::Bool("20 GS Hint",             {"Off", "On"}, OptionCategory::Setting, 0);
-  Option Kak30GSHintText     = Option::Bool("30 GS Hint",             {"Off", "On"}, OptionCategory::Setting, 0);
-  Option Kak40GSHintText     = Option::Bool("40 GS Hint",             {"Off", "On"}, OptionCategory::Setting, 0);
-  Option Kak50GSHintText     = Option::Bool("50 GS Hint",             {"Off", "On"}, OptionCategory::Setting, 0);
-  Option ScrubHintText       = Option::Bool("Scrub Hint Text",        {"Off", "On"}, OptionCategory::Setting, 0);
-  Option CompassesShowReward = Option::U8  ("Compasses Show Rewards", {"No", "Yes"}, OptionCategory::Setting, 1);
-  Option CompassesShowWotH   = Option::U8  ("Compasses Show WotH",    {"No", "Yes"}, OptionCategory::Setting, 1);
-  Option MapsShowDungeonMode = Option::U8  ("Maps Show Dungeon Modes",{"No", "Yes"}, OptionCategory::Setting, 1);
-  Option DamageMultiplier    = Option::U8  ("Damage Multiplier",      {"x1/2", "x1", "x2", "x4", "x8", "x16", "OHKO"}, OptionCategory::Setting, DAMAGEMULTIPLIER_DEFAULT);
-  Option StartingTime        = Option::U8  ("Starting Time",          {"Day", "Night"});
-  Option ChestAnimations     = Option::Bool("Chest Animations",       {"Always Fast", "Match Contents"});
-  Option ChestSize           = Option::Bool("Chest Size and Color",   {"Vanilla", "Match Contents"});
-  Option GenerateSpoilerLog  = Option::Bool("Generate Spoiler Log",   {"No", "Yes"}, OptionCategory::Setting, 1); // On
-  Option IngameSpoilers      = Option::Bool("Ingame Spoilers",        {"Hide", "Show"});
-  Option RandomTrapDmg       = Option::U8  ("Random Trap Damage",     {"Off", "Basic", "Advanced"}, OptionCategory::Setting, 1); // Basic
-  Option BlueFireArrows      = Option::Bool("Blue Fire Arrows",       {"Off", "On"});
-  Option SunlightArrows      = Option::Bool("Sunlight Arrows",        {"Off", "On"});
-
-  bool HasNightStart         = false;
-  std::vector<Option *> miscOptions = {
-    &GossipStoneHints,
-    &ClearerHints,
-    &HintDistribution,
-    &AltarHintText,
-    &LightArrowHintText,
-    &DampeHintText,
-    &GregHintText,
-    &SariaHintText,
-    &FrogsHintText,
-    &WarpSongHints,
-    &Kak10GSHintText,
-    &Kak20GSHintText,
-    &Kak30GSHintText,
-    &Kak40GSHintText,
-    &Kak50GSHintText,
-    &ScrubHintText,
-    &CompassesShowReward,
-    &CompassesShowWotH,
-    &MapsShowDungeonMode,
-    &DamageMultiplier,
-    &StartingTime,
-    &ChestAnimations,
-    &ChestSize,
-    &GenerateSpoilerLog,
-    &IngameSpoilers,
-    &RandomTrapDmg,
-    &BlueFireArrows,
-    &SunlightArrows
-  };
-
-  //Item Usability Settings
-  Option FaroresWindAnywhere = Option::Bool("Farore's Wind Anywhere", {"Disabled", "Enabled"});
-  Option AgeItemsToggle      = Option::U8  ("Lift Age Restrictions",  {"All Disabled",  "All Enabled", "Choose"});
-  Option StickAsAdult        = Option::Bool("Adult Deku Stick",     {"Disabled", "Enabled"});
-  Option BoomerangAsAdult    = Option::Bool("Adult Boomerang",      {"Disabled", "Enabled"});
-  Option HammerAsChild       = Option::Bool("Child Hammer",         {"Disabled", "Enabled"});
-  Option SlingshotAsAdult    = Option::Bool("Adult Slingshot",      {"Disabled", "Enabled"});
-  Option BowAsChild          = Option::Bool("Child Bow",            {"Disabled", "Enabled"});
-  Option HookshotAsChild     = Option::Bool("Child Hookshot",       {"Disabled", "Enabled"});
-  Option IronBootsAsChild    = Option::Bool("Child Iron Boots",     {"Disabled", "Enabled"});
-  Option HoverBootsAsChild   = Option::Bool("Child Hover Boots",    {"Disabled", "Enabled"});
-  Option MasksAsAdult        = Option::Bool("Adult Masks",          {"Disabled", "Enabled"});
-  Option KokiriSwordAsAdult  = Option::Bool("Adult Kokiri Sword",   {"Disabled", "Enabled"});
-  Option MasterSwordAsChild  = Option::Bool("Child Master Sword",   {"Disabled", "Enabled"});
-  Option BiggoronSwordAsChild= Option::Bool("Child Biggoron Sword", {"Disabled", "Enabled"});
-  Option DekuShieldAsAdult   = Option::Bool("Adult Deku Shield",    {"Disabled", "Enabled"});
-  Option MirrorShieldAsChild = Option::Bool("Child Mirror Shield",  {"Disabled", "Enabled"});
-  Option GoronTunicAsChild   = Option::Bool("Child Goron Tunic",    {"Disabled", "Enabled"});
-  Option ZoraTunicAsChild    = Option::Bool("Child Zora Tunic",     {"Disabled", "Enabled"});
-  Option GkDurability        = Option::U8  ("GK Durability",          {"Vanilla", "Random Risk", "Random Safe"});
-  std::vector<Option *> itemUsabilityOptions = {
-    &FaroresWindAnywhere,
-    &AgeItemsToggle,
-    &StickAsAdult,
-    &BoomerangAsAdult,
-    &HammerAsChild,
-    &SlingshotAsAdult,
-    &BowAsChild,
-    &HookshotAsChild,
-    &IronBootsAsChild,
-    &HoverBootsAsChild,
-    &MasksAsAdult,
-    &KokiriSwordAsAdult,
-    &MasterSwordAsChild,
-    &BiggoronSwordAsChild,
-    &DekuShieldAsAdult,
-    &MirrorShieldAsChild,
-    &GoronTunicAsChild,
-    &ZoraTunicAsChild,
-    &GkDurability,
-  };
-
-  //Item Pool Settings
-  Option ItemPoolValue         = Option::U8  ("Item Pool",             {"Plentiful", "Balanced", "Scarce", "Minimal"},    OptionCategory::Setting, ITEMPOOL_BALANCED);
-  Option IceTrapValue          = Option::U8  ("Ice Traps",             {"Off", "Normal", "Extra", "Mayhem", "Onslaught"}, OptionCategory::Setting, ICETRAPS_NORMAL);
-  Option RemoveDoubleDefense   = Option::Bool("Remove Double Defense", {"No", "Yes"});
-  Option ProgressiveGoronSword = Option::Bool("Prog Goron Sword",      {"Disabled", "Enabled"});
-  std::vector<Option *> itemPoolOptions = {
-    &ItemPoolValue,
-    &IceTrapValue,
-    &RemoveDoubleDefense,
-    &ProgressiveGoronSword,
-  };
-
-  //Excluded Locations (Individual definitions made in ItemLocation class)
-  std::vector<std::vector<Option *>> excludeLocationsOptionsVector(SPOILER_COLLECTION_GROUP_COUNT);
-  Menu excludeKokiriForest          = Menu::SubMenu("Kokiri Forest",           &excludeLocationsOptionsVector[GROUP_KOKIRI_FOREST], false);
-  Menu excludeLostWoods             = Menu::SubMenu("Lost Woods",              &excludeLocationsOptionsVector[GROUP_LOST_WOODS], false);
-  Menu excludeDekuTree              = Menu::SubMenu("Deku Tree",               &excludeLocationsOptionsVector[GROUP_DUNGEON_DEKU_TREE], false);
-  Menu excludeForestTemple          = Menu::SubMenu("Forest Temple",           &excludeLocationsOptionsVector[GROUP_DUNGEON_FOREST_TEMPLE], false);
-  Menu excludeKakariko              = Menu::SubMenu("Kakariko Village",        &excludeLocationsOptionsVector[GROUP_KAKARIKO], false);
-  Menu excludeBottomWell            = Menu::SubMenu("Bottom of the Well",      &excludeLocationsOptionsVector[GROUP_DUNGEON_BOTTOM_OF_THE_WELL], false);
-  Menu excludeShadowTemple          = Menu::SubMenu("Shadow Temple",           &excludeLocationsOptionsVector[GROUP_DUNGEON_SHADOW_TEMPLE], false);
-  Menu excludeDeathMountain         = Menu::SubMenu("Death Mountain",          &excludeLocationsOptionsVector[GROUP_DEATH_MOUNTAIN], false);
-  Menu excludeGoronCity             = Menu::SubMenu("Goron City",              &excludeLocationsOptionsVector[GROUP_GORON_CITY], false);
-  Menu excludeDodongosCavern        = Menu::SubMenu("Dodongo's Cavern",        &excludeLocationsOptionsVector[GROUP_DUNGEON_DODONGOS_CAVERN], false);
-  Menu excludeFireTemple            = Menu::SubMenu("Fire Temple",             &excludeLocationsOptionsVector[GROUP_DUNGEON_FIRE_TEMPLE], false);
-  Menu excludeZorasRiver            = Menu::SubMenu("Zora's River",            &excludeLocationsOptionsVector[GROUP_ZORAS_RIVER], false);
-  Menu excludeZorasDomain           = Menu::SubMenu("Zora's Domain",           &excludeLocationsOptionsVector[GROUP_ZORAS_DOMAIN], false);
-  Menu excludeJabuJabu              = Menu::SubMenu("Jabu Jabu's Belly",       &excludeLocationsOptionsVector[GROUP_DUNGEON_JABUJABUS_BELLY], false);
-  Menu excludeIceCavern             = Menu::SubMenu("Ice Cavern",              &excludeLocationsOptionsVector[GROUP_DUNGEON_ICE_CAVERN], false);
-  Menu excludeHyruleField           = Menu::SubMenu("Hyrule Field",            &excludeLocationsOptionsVector[GROUP_HYRULE_FIELD], false);
-  Menu excludeLonLonRanch           = Menu::SubMenu("Lon Lon Ranch",           &excludeLocationsOptionsVector[GROUP_LON_LON_RANCH], false);
-  Menu excludeLakeHylia             = Menu::SubMenu("Lake Hylia",              &excludeLocationsOptionsVector[GROUP_LAKE_HYLIA], false);
-  Menu excludeWaterTemple           = Menu::SubMenu("Water Temple",            &excludeLocationsOptionsVector[GROUP_DUNGEON_WATER_TEMPLE], false);
-  Menu excludeGerudoValley          = Menu::SubMenu("Gerudo Valley",           &excludeLocationsOptionsVector[GROUP_GERUDO_VALLEY], false);
-  Menu excludeGerudoTrainingGrounds = Menu::SubMenu("Gerudo Training Grounds", &excludeLocationsOptionsVector[GROUP_GERUDO_TRAINING_GROUND], false);
-  Menu excludeSpiritTemple          = Menu::SubMenu("Spirit Temple",           &excludeLocationsOptionsVector[GROUP_DUNGEON_SPIRIT_TEMPLE], false);
-  Menu excludeHyruleCastle          = Menu::SubMenu("Hyrule Castle",           &excludeLocationsOptionsVector[GROUP_HYRULE_CASTLE], false);
-  Menu excludeGanonsCastle          = Menu::SubMenu("Ganon's Castle",          &excludeLocationsOptionsVector[GROUP_DUNGEON_GANONS_CASTLE], false);
-  std::vector<Menu *> excludeLocationsMenus = {
-    &excludeKokiriForest,
-    &excludeLostWoods,
-    &excludeDekuTree,
-    &excludeForestTemple,
-    &excludeKakariko,
-    &excludeBottomWell,
-    &excludeShadowTemple,
-    &excludeDeathMountain,
-    &excludeGoronCity,
-    &excludeDodongosCavern,
-    &excludeFireTemple,
-    &excludeZorasRiver,
-    &excludeZorasDomain,
-    &excludeJabuJabu,
-    &excludeIceCavern,
-    &excludeHyruleField,
-    &excludeLonLonRanch,
-    &excludeLakeHylia,
-    &excludeWaterTemple,
-    &excludeGerudoValley,
-    &excludeGerudoTrainingGrounds,
-    &excludeSpiritTemple,
-    &excludeHyruleCastle,
-    &excludeGanonsCastle,
-  };
-
-  //Starting Inventory submenus and menus
-  std::vector<std::string> bottleOptions = {"Off", "Empty Bottle", "Red Potion", "Green Potion", "Blue Potion", "Fairy", "Fish", "Milk", "Blue Fire", "Bugs", "Big Poe", "Half Milk", "Poe"};
-  Option StartingStickCapacity    = Option::U8  ("Deku Stick Capacity",  {NumOpts(10, 30, 10, {}, " Deku Sticks")});
-  Option StartingNutCapacity      = Option::U8  ("Deku Nut Capacity",    {NumOpts(20, 40, 10, {}, " Deku Nuts")});
-  Option StartingSlingshot        = Option::U8  ("Slingshot",            {"Off",             "Slingshot (30)",   "Slingshot (40)",    "Slingshot (50)"});
-  Option StartingOcarina          = Option::U8  ("Start with Fairy Ocarina",              {"Off",             "Fairy Ocarina",    "Ocarina of Time"});
-  Option StartingBombBag          = Option::U8  ("Bombs",                {"Off",             "Bomb Bag (20)",    "Bomb Bag (30)",     "Bomb Bag (40)"});
-  Option StartingBombchus         = Option::U8  ("Bombchus",             {"Off",             "20 Bombchus",      "50 Bombchus"});
-  Option StartingBoomerang        = Option::U8  ("Boomerang",            {"Off",             "On"});
-  Option StartingHookshot         = Option::U8  ("Hookshot",             {"Off",             "Hookshot",         "Longshot"});
-  Option StartingBow              = Option::U8  ("Bow",                  {"Off",             "Bow (30)",         "Bow (40)",          "Bow (50)"});
-  Option StartingFireArrows       = Option::U8  ("Fire Arrow",           {"Off",             "On"});
-  Option StartingIceArrows        = Option::U8  ("Ice Arrow",            {"Off",             "On"});
-  Option StartingLightArrows      = Option::U8  ("Light Arrow",          {"Off",             "On"});
-  Option StartingMegatonHammer    = Option::U8  ("Megaton Hammer",       {"Off",             "On"});
-  Option StartingIronBoots        = Option::U8  ("Iron Boots",           {"Off",             "On"});
-  Option StartingHoverBoots       = Option::U8  ("Hover Boots",          {"Off",             "On"});
-  Option StartingLensOfTruth      = Option::U8  ("Lens of Truth",        {"Off",             "On"});
-  Option StartingDinsFire         = Option::U8  ("Din's Fire",           {"Off",             "On"});
-  Option StartingFaroresWind      = Option::U8  ("Farore's Wind",        {"Off",             "On"});
-  Option StartingNayrusLove       = Option::U8  ("Nayru's Love",         {"Off",             "On"});
-  Option StartingMagicBean        = Option::U8  ("Magic Beans",          {"Off",             "On"});
-  Option StartingBottle1          = Option::U8  ("Bottle 1",             bottleOptions);
-  Option StartingBottle2          = Option::U8  ("Bottle 2",             bottleOptions);
-  Option StartingBottle3          = Option::U8  ("Bottle 3",             bottleOptions);
-  Option StartingBottle4          = Option::U8  ("Bottle 4",             bottleOptions);
-  Option StartingRutoBottle       = Option::U8  ("Ruto's Letter",        {"Off",             "On"});
-  std::vector<Option *> startingItemsOptions = {
-    &StartingStickCapacity,
-    &StartingNutCapacity,
-    &StartingSlingshot,
-    &StartingOcarina,
-    &StartingBombBag,
-    &StartingBombchus,
-    &StartingBoomerang,
-    &StartingHookshot,
-    &StartingBow,
-    &StartingFireArrows,
-    &StartingIceArrows,
-    &StartingLightArrows,
-    &StartingMegatonHammer,
-    &StartingIronBoots,
-    &StartingHoverBoots,
-    &StartingLensOfTruth,
-    &StartingDinsFire,
-    &StartingFaroresWind,
-    &StartingNayrusLove,
-    &StartingMagicBean,
-    &StartingBottle1,
-    &StartingBottle2,
-    &StartingBottle3,
-    &StartingBottle4,
-    &StartingRutoBottle,
-  };
-
-  Option StartingZeldasLullaby    = Option::U8  ("Start with Zelda's Lullaby",      {"Off", "On"});
-  Option StartingEponasSong       = Option::U8  ("Start with Epona's Song",         {"Off", "On"});
-  Option StartingSariasSong       = Option::U8  ("Start with Saria's Song",         {"Off", "On"});
-  Option StartingSunsSong         = Option::U8  ("Start with Sun's Song",           {"Off", "On"});
-  Option StartingSongOfTime       = Option::U8  ("Start with Song of Time",         {"Off", "On"});
-  Option StartingSongOfStorms     = Option::U8  ("Start with Song of Storms",       {"Off", "On"});
-  Option StartingMinuetOfForest   = Option::U8  ("Start with Minuet of Forest",     {"Off", "On"});
-  Option StartingBoleroOfFire     = Option::U8  ("Start with Bolero of Fire",       {"Off", "On"});
-  Option StartingSerenadeOfWater  = Option::U8  ("Start with Serenade of Water",    {"Off", "On"});
-  Option StartingRequiemOfSpirit  = Option::U8  ("Start with Requiem of Spirit",    {"Off", "On"});
-  Option StartingNocturneOfShadow = Option::U8  ("Start with Nocturne of Shadow",   {"Off", "On"});
-  Option StartingPreludeOfLight   = Option::U8  ("Start with Prelude of Light",     {"Off", "On"});
-  std::vector<Option *> startingSongsOptions = {
-    &StartingZeldasLullaby,
-    &StartingEponasSong,
-    &StartingSariasSong,
-    &StartingSunsSong,
-    &StartingSongOfTime,
-    &StartingSongOfStorms,
-    &StartingMinuetOfForest,
-    &StartingBoleroOfFire,
-    &StartingSerenadeOfWater,
-    &StartingRequiemOfSpirit,
-    &StartingNocturneOfShadow,
-    &StartingPreludeOfLight,
-  };
-
-  Option StartingKokiriSword      = Option::U8  ("Start with Kokiri Sword",         {"Off",             "On"});
-  Option StartingMasterSword      = Option::U8  ("Start with Master Sword",         {"Off",             "On"});
-  Option StartingBiggoronSword    = Option::U8  ("Biggoron Sword",       {"Off",             "Giant's Knife",    "Biggoron Sword"});
-  Option StartingDekuShield       = Option::U8  ("Start with Deku Shield",          {"Off",             "On"});
-  Option StartingHylianShield     = Option::U8  ("Hylian Shield",        {"Off",             "On"});
-  Option StartingMirrorShield     = Option::U8  ("Mirror Shield",        {"Off",             "On"});
-  Option StartingGoronTunic       = Option::U8  ("Goron Tunic",          {"Off",             "On"});
-  Option StartingZoraTunic        = Option::U8  ("Zora Tunic",           {"Off",             "On"});
-  Option StartingStrength         = Option::U8  ("Strength Upgrade",     {"Off",             "Goron Bracelet",   "Silver Gauntlet",  "Golden Gauntlet"});
-  Option StartingScale            = Option::U8  ("Scale Upgrade",        {"Off",             "Silver Scale"  ,   "Golden Scale"});
-  Option StartingWallet           = Option::U8  ("Wallet Upgrade",       {"Off",             "Adult's Wallet",   "Giant's Wallet" ,  "Tycoon's Wallet"});
-  Option StartingShardOfAgony     = Option::U8  ("Stone of Agony",       {"Off",             "On"});
-  Option StartingHearts           = Option::U8  ("Hearts",               {NumOpts(1, 20)}, OptionCategory::Setting, 2); // Default 3 hearts
-  Option StartingMagicMeter       = Option::U8  ("Magic Meter",          {"Off",             "Single Magic",     "Double Magic"});
-  Option StartingDoubleDefense    = Option::U8  ("Double Defense",       {"Off",             "On"});
-
-  std::vector<Option *> startingEquipmentOptions = {
-    &StartingKokiriSword,
-    &StartingBiggoronSword,
-    &StartingDekuShield,
-    &StartingHylianShield,
-    &StartingMirrorShield,
-    &StartingGoronTunic,
-    &StartingZoraTunic,
-    &StartingStrength,
-    &StartingScale,
-    &StartingWallet,
-    &StartingShardOfAgony,
-    &StartingHearts,
-    &StartingMagicMeter,
-    &StartingDoubleDefense,
-  };
-
-  Option StartingKokiriEmerald    = Option::U8  ("Kokiri's Emerald",     {"Off", "On"});
-  Option StartingGoronRuby        = Option::U8  ("Goron's Ruby",         {"Off", "On"});
-  Option StartingZoraSapphire     = Option::U8  ("Zora's Sapphire",      {"Off", "On"});
-  Option StartingLightMedallion   = Option::U8  ("Light Medallion",      {"Off", "On"});
-  Option StartingForestMedallion  = Option::U8  ("Forest Medallion",     {"Off", "On"});
-  Option StartingFireMedallion    = Option::U8  ("Fire Medallion",       {"Off", "On"});
-  Option StartingWaterMedallion   = Option::U8  ("Water Medallion",      {"Off", "On"});
-  Option StartingSpiritMedallion  = Option::U8  ("Spirit Medallion",     {"Off", "On"});
-  Option StartingShadowMedallion  = Option::U8  ("Shadow Medallion",     {"Off", "On"});
-  std::vector<Option *> startingStonesMedallionsOptions = {
-    &StartingKokiriEmerald,
-    &StartingGoronRuby,
-    &StartingZoraSapphire,
-    &StartingLightMedallion,
-    &StartingForestMedallion,
-    &StartingFireMedallion,
-    &StartingWaterMedallion,
-    &StartingSpiritMedallion,
-    &StartingShadowMedallion,
-  };
-
-  Option StartingConsumables      = Option::Bool("Start with Consumables", {"No",               "Yes"});
-  Option StartingMaxRupees        = Option::Bool("Start with Max Rupees",  {"No",               "Yes"});
-  Option StartingSkulltulaToken   = Option::U8  ("Gold Skulltula Tokens",  {NumOpts(0, 100)});
-  std::vector<Option *> startingOthersOptions = {
-    &StartingConsumables,
-    &StartingMaxRupees,
-    &StartingSkulltulaToken,
-  };
-
-  Menu startingItems            = Menu::SubMenu("Items",                &startingItemsOptions, false);
-  Menu startingSongs            = Menu::SubMenu("Ocarina Songs",        &startingSongsOptions, false);
-  Menu startingEquipment        = Menu::SubMenu("Equipment & Upgrades", &startingEquipmentOptions, false);
-  Menu startingStonesMedallions = Menu::SubMenu("Stones & Medallions",  &startingStonesMedallionsOptions, false);
-  Menu startingOthers           = Menu::SubMenu("Other",                &startingOthersOptions, false);
-  std::vector<Menu *> startingInventoryOptions = {
-    &startingItems,
-    &startingSongs,
-    &startingEquipment,
-    &startingStonesMedallions,
-    &startingOthers,
-  };
-  Option Logic              = Option::U8  ("Logic",                   {"Glitchless", "Glitched", "No Logic", "Vanilla"});
-  Option LocationsReachable = Option::Bool("All Locations Reachable", {"Off", "On"}, OptionCategory::Setting, 1); //All Locations Reachable On
-  Option NightGSExpectSuns  = Option::Bool("Night GSs Expect Sun's",  {"Off", "On"});
-  std::vector<Option *> logicOptions = {
-    &Logic,
-    &LocationsReachable,
-    &NightGSExpectSuns,
-  };
-
-  //Function to make defining logic tricks easier to read
-  Option LogicTrick(std::string setting) {
-    return Option::Bool(setting, {"Disabled", "Enabled"});
-  }
-
-  //Detailed Logic Tricks                               ---------------------
-  Option LogicVisibleCollision                    = LogicTrick(std::to_string(RT_VISIBLE_COLLISION));
-  Option LogicGrottosWithoutAgony                 = LogicTrick(std::to_string(RT_GROTTOS_WITHOUT_AGONY));
-  Option LogicFewerTunicRequirements              = LogicTrick(std::to_string(RT_FEWER_TUNIC_REQUIREMENTS));
-  Option LogicRustedSwitches                      = LogicTrick(std::to_string(RT_RUSTED_SWITCHES));
-  Option LogicFlamingChests                       = LogicTrick(std::to_string(RT_FLAMING_CHESTS));
-  Option LogicBunnyHoodJump                       = LogicTrick(std::to_string(RT_BUNNY_HOOD_JUMPS));
-  Option LogicDamageBoost                         = LogicTrick(std::to_string(RT_DAMAGE_BOOST_SIMPLE));
-  Option LogicHoverBoost                          = LogicTrick(std::to_string(RT_HOVER_BOOST_SIMPLE));
-  Option LogicAdultKokiriGS                       = LogicTrick(std::to_string(RT_KF_ADULT_GS));
-  Option LogicLostWoodsBridge                     = LogicTrick(std::to_string(RT_LW_BRIDGE));
-  Option LogicMidoBackflip                        = LogicTrick(std::to_string(RT_LW_MIDO_BACKFLIP));
-  Option LogicLostWoodsGSBean                     = LogicTrick(std::to_string(RT_LW_GS_BEAN));
-  Option LogicCastleStormsGS                      = LogicTrick(std::to_string(RT_HC_STORMS_GS));
-  Option LogicManOnRoof                           = LogicTrick(std::to_string(RT_KAK_MAN_ON_ROOF));
-  Option LogicKakarikoTowerGS                     = LogicTrick(std::to_string(RT_KAK_TOWER_GS));
-  Option LogicAdultWindmillPoH                    = LogicTrick(std::to_string(RT_KAK_ADULT_WINDMILL_POH));
-  Option LogicChildWindmillPoH                    = LogicTrick(std::to_string(RT_KAK_CHILD_WINDMILL_POH));
-  Option LogicKakarikoRooftopGS                   = LogicTrick(std::to_string(RT_KAK_ROOFTOP_GS));
-  Option LogicGraveyardPoH                        = LogicTrick(std::to_string(RT_GY_POH));
-  Option LogicChildDampeRacePoH                   = LogicTrick(std::to_string(RT_GY_CHILD_DAMPE_RACE_POH));
-  Option LogicShadowFireArrowEntry                = LogicTrick(std::to_string(RT_GY_SHADOW_FIRE_ARROWS));
-  Option LogicDMTSoilGS                           = LogicTrick(std::to_string(RT_DMT_SOIL_GS));
-  Option LogicDMTBombable                         = LogicTrick(std::to_string(RT_DMT_BOMBABLE));
-  Option LogicDMTGSLowerHookshot                  = LogicTrick(std::to_string(RT_DMT_HOOKSHOT_LOWER_GS));
-  Option LogicDMTGSLowerHovers                    = LogicTrick(std::to_string(RT_DMT_HOVERS_LOWER_GS));
-  Option LogicDMTGSLowerBean                      = LogicTrick(std::to_string(RT_DMT_BEAN_LOWER_GS));
-  Option LogicDMTGSLowerJS                        = LogicTrick(std::to_string(RT_DMT_JS_LOWER_GS));
-  Option LogicDMTClimbHovers                      = LogicTrick(std::to_string(RT_DMT_CLIMB_HOVERS));
-  Option LogicDMTGSUpper                          = LogicTrick(std::to_string(RT_DMT_UPPER_GS));
-  Option LogicBiggoronBolero                      = LogicTrick(std::to_string(RT_DMT_BOLERO_BIGGORON));
-  Option LogicGoronCityPot                        = LogicTrick(std::to_string(RT_GC_POT));
-  Option LogicGoronCityPotWithStrength            = LogicTrick(std::to_string(RT_GC_POT_STRENGTH));
-  Option LogicChildRollingWithStrength            = LogicTrick(std::to_string(RT_GC_ROLLING_STRENGTH));
-  Option LogicGoronCityLeftMost                   = LogicTrick(std::to_string(RT_GC_LEFTMOST));
-  Option LogicGoronCityGrotto                     = LogicTrick(std::to_string(RT_GC_GROTTO));
-  Option LogicGoronCityLinkGoronDins              = LogicTrick(std::to_string(RT_GC_LINK_GORON_DINS));
-  Option LogicCraterBeanPoHWithHovers             = LogicTrick(std::to_string(RT_DMC_HOVER_BEAN_POH));
-  Option LogicCraterBoleroJump                    = LogicTrick(std::to_string(RT_DMC_BOLERO_JUMP));
-  Option LogicCraterBoulderJS                     = LogicTrick(std::to_string(RT_DMC_BOULDER_JS));
-  Option LogicCraterBoulderSkip                   = LogicTrick(std::to_string(RT_DMC_BOULDER_SKIP));
-  Option LogicZoraRiverLower                      = LogicTrick(std::to_string(RT_ZR_LOWER));
-  Option LogicZoraRiverUpper                      = LogicTrick(std::to_string(RT_ZR_UPPER));
-  Option LogicZoraWithHovers                      = LogicTrick(std::to_string(RT_ZR_HOVERS));
-  Option LogicZoraWithCucco                       = LogicTrick(std::to_string(RT_ZR_CUCCO));
-  Option LogicKingZoraSkip                        = LogicTrick(std::to_string(RT_ZD_KING_ZORA_SKIP));
-  Option LogicDomainGS                            = LogicTrick(std::to_string(RT_ZD_GS));
-  Option LogicLabWallGS                           = LogicTrick(std::to_string(RT_LH_LAB_WALL_GS));
-  Option LogicLabDiving                           = LogicTrick(std::to_string(RT_LH_LAB_DIVING));
-  Option LogicWaterHookshotEntry                  = LogicTrick(std::to_string(RT_LH_WATER_HOOKSHOT));
-  Option LogicValleyCrateHovers                   = LogicTrick(std::to_string(RT_GV_CRATE_HOVERS));
-  Option LogicGerudoKitchen                       = LogicTrick(std::to_string(RT_GF_KITCHEN));
-  Option LogicGFJump                              = LogicTrick(std::to_string(RT_GF_JUMP));
-  Option LogicWastelandBunnyCrossing              = LogicTrick(std::to_string(RT_HW_BUNNY_CROSSING));
-  Option LogicWastelandCrossing                   = LogicTrick(std::to_string(RT_HW_CROSSING));
-  Option LogicLensWasteland                       = LogicTrick(std::to_string(RT_LENS_HW));
-  Option LogicReverseWasteland                    = LogicTrick(std::to_string(RT_HW_REVERSE));
-  Option LogicColossusGS                          = LogicTrick(std::to_string(RT_COLOSSUS_GS));
-  Option LogicDekuBasementGS                      = LogicTrick(std::to_string(RT_DEKU_BASEMENT_GS));
-  Option LogicDekuB1Skip                          = LogicTrick(std::to_string(RT_DEKU_B1_SKIP));
-  Option LogicDekuB1WebsWithBow                   = LogicTrick(std::to_string(RT_DEKU_B1_BOW_WEBS));
-  Option LogicDekuMQCompassGS                     = LogicTrick(std::to_string(RT_DEKU_MQ_COMPASS_GS));
-  Option LogicDekuMQLog                           = LogicTrick(std::to_string(RT_DEKU_MQ_LOG));
-  Option LogicDCScarecrowGS                       = LogicTrick(std::to_string(RT_DC_SCARECROW_GS));
-  Option LogicDCVinesGS                           = LogicTrick(std::to_string(RT_DC_VINES_GS));
-  Option LogicDCStaircase                         = LogicTrick(std::to_string(RT_DC_STAIRCASE));
-  Option LogicDCSlingshotSkip                     = LogicTrick(std::to_string(RT_DC_SLINGSHOT_SKIP));
-  Option LogicDCScrubRoom                         = LogicTrick(std::to_string(RT_DC_SCRUB_ROOM));
-  Option LogicDCJump                              = LogicTrick(std::to_string(RT_DC_JUMP));
-  Option LogicDCHammerFloor                       = LogicTrick(std::to_string(RT_DC_HAMMER_FLOOR));
-  Option LogicDCMQChildBombs                      = LogicTrick(std::to_string(RT_DC_MQ_CHILD_BOMBS));
-  Option LogicDCMQEyesChild                       = LogicTrick(std::to_string(RT_DC_MQ_CHILD_EYES));
-  Option LogicDCMQEyesAdult                       = LogicTrick(std::to_string(RT_DC_MQ_ADULT_EYES));
-  Option LogicJabuAlcoveJumpDive                  = LogicTrick(std::to_string(RT_JABU_ALCOVE_JUMP_DIVE));
-  Option LogicJabuBossHover                       = LogicTrick(std::to_string(RT_JABU_BOSS_HOVER));
-  Option LogicJabuNearBossRanged                  = LogicTrick(std::to_string(RT_JABU_NEAR_BOSS_RANGED));
-  Option LogicJabuNearBossExplosives              = LogicTrick(std::to_string(RT_JABU_NEAR_BOSS_EXPLOSIVES));
-  Option LogicLensJabuMQ                          = LogicTrick(std::to_string(RT_LENS_JABU_MQ));
-  Option LogicJabuMQRangJump                      = LogicTrick(std::to_string(RT_JABU_MQ_RANG_JUMP));
-  Option LogicJabuMQSoTGS                         = LogicTrick(std::to_string(RT_JABU_MQ_SOT_GS));
-  Option LogicLensBotw                            = LogicTrick(std::to_string(RT_LENS_BOTW));
-  Option LogicChildDeadhand                       = LogicTrick(std::to_string(RT_BOTW_CHILD_DEADHAND));
-  Option LogicBotwBasement                        = LogicTrick(std::to_string(RT_BOTW_BASEMENT));
-  Option LogicBotwMQPits                          = LogicTrick(std::to_string(RT_BOTW_MQ_PITS));
-  Option LogicBotwMQDeadHandKey                   = LogicTrick(std::to_string(RT_BOTW_MQ_DEADHAND_KEY));
-  Option LogicForestFirstGS                       = LogicTrick(std::to_string(RT_FOREST_FIRST_GS));
-  Option LogicForestOutdoorEastGS                 = LogicTrick(std::to_string(RT_FOREST_OUTDOORS_EAST_GS));
-  Option LogicForestVines                         = LogicTrick(std::to_string(RT_FOREST_VINES));
-  Option LogicForestOutdoorsLedge                 = LogicTrick(std::to_string(RT_FOREST_OUTDOORS_LEDGE));
-  Option LogicForestDoorFrame                     = LogicTrick(std::to_string(RT_FOREST_DOORFRAME));
-  Option LogicForestOutsideBackdoor               = LogicTrick(std::to_string(RT_FOREST_OUTSIDE_BACKDOOR));
-  Option LogicForestMQWellSwim                    = LogicTrick(std::to_string(RT_FOREST_MQ_WELL_SWIM));
-  Option LogicForestMQBlockPuzzle                 = LogicTrick(std::to_string(RT_FOREST_MQ_BLOCK_PUZZLE));
-  Option LogicForestMQHallwaySwitchJS             = LogicTrick(std::to_string(RT_FOREST_MQ_JS_HALLWAY_SWITCH));
-  Option LogicForestMQHallwaySwitchHookshot       = LogicTrick(std::to_string(RT_FOREST_MQ_HOOKSHOT_HALLWAY_SWITCH));
-  Option LogicForestMQHallwaySwitchBoomerang      = LogicTrick(std::to_string(RT_FOREST_MQ_RANG_HALLWAY_SWITCH));
-  Option LogicFireBossDoorJump                    = LogicTrick(std::to_string(RT_FIRE_BOSS_DOOR_JUMP));
-  Option LogicFireSongOfTime                      = LogicTrick(std::to_string(RT_FIRE_SOT));
-  Option LogicFireStrength                        = LogicTrick(std::to_string(RT_FIRE_STRENGTH));
-  Option LogicFireScarecrow                       = LogicTrick(std::to_string(RT_FIRE_SCARECROW));
-  Option LogicFireFlameMaze                       = LogicTrick(std::to_string(RT_FIRE_FLAME_MAZE));
-  Option LogicFireMQNearBoss                      = LogicTrick(std::to_string(RT_FIRE_MQ_NEAR_BOSS));
-  Option LogicFireMQBlockedChest                  = LogicTrick(std::to_string(RT_FIRE_MQ_BLOCKED_CHEST));
-  Option LogicFireMQBKChest                       = LogicTrick(std::to_string(RT_FIRE_MQ_BK_CHEST));
-  Option LogicFireMQClimb                         = LogicTrick(std::to_string(RT_FIRE_MQ_CLIMB));
-  Option LogicFireMQMazeSideRoom                  = LogicTrick(std::to_string(RT_FIRE_MQ_MAZE_SIDE_ROOM));
-  Option LogicFireMQMazeHovers                    = LogicTrick(std::to_string(RT_FIRE_MQ_MAZE_HOVERS));
-  Option LogicFireMQMazeJump                      = LogicTrick(std::to_string(RT_FIRE_MQ_MAZE_JUMP));
-  Option LogicFireMQAboveMazeGS                   = LogicTrick(std::to_string(RT_FIRE_MQ_ABOVE_MAZE_GS));
-  Option LogicFireMQFlameMaze                     = LogicTrick(std::to_string(RT_FIRE_MQ_FLAME_MAZE));
-  Option LogicWaterTempleTorchLongshot            = LogicTrick(std::to_string(RT_WATER_LONGSHOT_TORCH));
-  Option LogicWaterCrackedWallHovers              = LogicTrick(std::to_string(RT_WATER_CRACKED_WALL_HOVERS));
-  Option LogicWaterCrackedWallNothing             = LogicTrick(std::to_string(RT_WATER_CRACKED_WALL));
-  Option LogicWaterBossKeyRegion                  = LogicTrick(std::to_string(RT_WATER_BK_REGION));
-  Option LogicWaterNorthBasementLedgeJump         = LogicTrick(std::to_string(RT_WATER_NORTH_BASEMENT_LEDGE_JUMP));
-  Option LogicWaterBKJumpDive                     = LogicTrick(std::to_string(RT_WATER_BK_JUMP_DIVE));
-  Option LogicWaterCentralGSFW                    = LogicTrick(std::to_string(RT_WATER_FW_CENTRAL_GS));
-  Option LogicWaterCentralGSIrons                 = LogicTrick(std::to_string(RT_WATER_IRONS_CENTRAL_GS));
-  Option LogicWaterCentralBow                     = LogicTrick(std::to_string(RT_WATER_CENTRAL_BOW));
-  Option LogicWaterFallingPlatformGSHookshot      = LogicTrick(std::to_string(RT_WATER_HOOKSHOT_FALLING_PLATFORM_GS));
-  Option LogicWaterFallingPlatformGSBoomerang     = LogicTrick(std::to_string(RT_WATER_RANG_FALLING_PLATFORM_GS));
-  Option LogicWaterRiverGS                        = LogicTrick(std::to_string(RT_WATER_RIVER_GS));
-  Option LogicWaterDragonJumpDive                 = LogicTrick(std::to_string(RT_WATER_DRAGON_JUMP_DIVE));
-  Option LogicWaterDragonAdult                    = LogicTrick(std::to_string(RT_WATER_ADULT_DRAGON));
-  Option LogicWaterDragonChild                    = LogicTrick(std::to_string(RT_WATER_CHILD_DRAGON));
-  Option LogicWaterMQCentralPillar                = LogicTrick(std::to_string(RT_WATER_MQ_CENTRAL_PILLAR));
-  Option LogicWaterMQLockedGS                     = LogicTrick(std::to_string(RT_WATER_MQ_LOCKED_GS));
-  Option LogicLensShadow                          = LogicTrick(std::to_string(RT_LENS_SHADOW));
-  Option LogicLensShadowPlatform                  = LogicTrick(std::to_string(RT_LENS_SHADOW_PLATFORM));
-  Option LogicLensBongo                           = LogicTrick(std::to_string(RT_LENS_BONGO));
-  Option LogicShadowUmbrella                      = LogicTrick(std::to_string(RT_SHADOW_UMBRELLA));
-  Option LogicShadowUmbrellaGS                    = LogicTrick(std::to_string(RT_SHADOW_UMBRELLA_GS));
-  Option LogicShadowFreestandingKey               = LogicTrick(std::to_string(RT_SHADOW_FREESTANDING_KEY));
-  Option LogicShadowStatue                        = LogicTrick(std::to_string(RT_SHADOW_STATUE));
-  Option LogicShadowBongo                         = LogicTrick(std::to_string(RT_SHADOW_BONGO));
-  Option LogicLensShadowMQ                        = LogicTrick(std::to_string(RT_LENS_SHADOW_MQ));
-  Option LogicLensShadowMQInvisibleBlades         = LogicTrick(std::to_string(RT_LENS_SHADOW_MQ_INVISIBLE_BLADES));
-  Option LogicLensShadowMQPlatform                = LogicTrick(std::to_string(RT_LENS_SHADOW_MQ_PLATFORM));
-  Option LogicLensShadowMQDeadHand                = LogicTrick(std::to_string(RT_LENS_SHADOW_MQ_DEADHAND));
-  Option LogicShadowMQGap                         = LogicTrick(std::to_string(RT_SHADOW_MQ_GAP));
-  Option LogicShadowMQInvisibleBlades             = LogicTrick(std::to_string(RT_SHADOW_MQ_INVISIBLE_BLADES));
-  Option LogicShadowMQHugePit                     = LogicTrick(std::to_string(RT_SHADOW_MQ_HUGE_PIT));
-  Option LogicShadowMQWindyWalkway                = LogicTrick(std::to_string(RT_SHADOW_MQ_WINDY_WALKWAY));
-  Option LogicLensSpirit                          = LogicTrick(std::to_string(RT_LENS_SPIRIT));
-  Option LogicSpiritChildBombchu                  = LogicTrick(std::to_string(RT_SPIRIT_CHILD_CHU));
-  Option LogicSpiritLobbyGS                       = LogicTrick(std::to_string(RT_SPIRIT_LOBBY_GS));
-  Option LogicSpiritLowerAdultSwitch              = LogicTrick(std::to_string(RT_SPIRIT_LOWER_ADULT_SWITCH));
-  Option LogicSpiritLobbyJump                     = LogicTrick(std::to_string(RT_SPIRIT_LOBBY_JUMP));
-  Option LogicSpiritPlatformHookshot              = LogicTrick(std::to_string(RT_SPIRIT_PLATFORM_HOOKSHOT));
-  Option LogicSpiritMapChest                      = LogicTrick(std::to_string(RT_SPIRIT_MAP_CHEST));
-  Option LogicSpiritSunChest                      = LogicTrick(std::to_string(RT_SPIRIT_SUN_CHEST));
-  Option LogicSpiritWall                          = LogicTrick(std::to_string(RT_SPIRIT_WALL));
-  Option LogicLensSpiritMQ                        = LogicTrick(std::to_string(RT_LENS_SPIRIT_MQ));
-  Option LogicSpiritMQSunBlockSoT                 = LogicTrick(std::to_string(RT_SPIRIT_MQ_SUN_BLOCK_SOT));
-  Option LogicSpiritMQSunBlockGS                  = LogicTrick(std::to_string(RT_SPIRIT_MQ_SUN_BLOCK_GS));
-  Option LogicSpiritMQLowerAdult                  = LogicTrick(std::to_string(RT_SPIRIT_MQ_LOWER_ADULT));
-  Option LogicSpiritMQFrozenEye                   = LogicTrick(std::to_string(RT_SPIRIT_MQ_FROZEN_EYE));
-  Option LogicIceBlockGS                          = LogicTrick(std::to_string(RT_ICE_BLOCK_GS));
-  Option LogicIceMQRedIceGS                       = LogicTrick(std::to_string(RT_ICE_MQ_RED_ICE_GS));
-  Option LogicIceMQScarecrow                      = LogicTrick(std::to_string(RT_ICE_MQ_SCARECROW));
-  Option LogicLensGtg                             = LogicTrick(std::to_string(RT_LENS_GTG));
-  Option LogicGtgWithoutHookshot                  = LogicTrick(std::to_string(RT_GTG_WITHOUT_HOOKSHOT));
-  Option LogicGtgFakeWall                         = LogicTrick(std::to_string(RT_GTG_FAKE_WALL));
-  Option LogicLensGtgMQ                           = LogicTrick(std::to_string(RT_LENS_GTG_MQ));
-  Option LogicGtgMQWithHookshot                   = LogicTrick(std::to_string(RT_GTG_MQ_WITH_HOOKSHOT));
-  Option LogicGtgMQWithoutHookshot                = LogicTrick(std::to_string(RT_GTG_MQ_WIHTOUT_HOOKSHOT));
-  Option LogicLensCastle                          = LogicTrick(std::to_string(RT_LENS_GANON));
-  Option LogicSpiritTrialHookshot                 = LogicTrick(std::to_string(RT_GANON_SPIRIT_TRIAL_HOOKSHOT));
-  Option LogicLensCastleMQ                        = LogicTrick(std::to_string(RT_LENS_GANON_MQ));
-  Option LogicFireTrialMQ                         = LogicTrick(std::to_string(RT_GANON_MQ_FIRE_TRIAL));
-  Option LogicShadowTrialMQ                       = LogicTrick(std::to_string(RT_GANON_MQ_SHADOW_TRIAL));
-  Option LogicLightTrialMQ                        = LogicTrick(std::to_string(RT_GANON_MQ_LIGHT_TRIAL));
-
-  std::vector<Option *> trickOptions = {
-    &LogicVisibleCollision,
-    &LogicGrottosWithoutAgony,
-    &LogicFewerTunicRequirements,
-    &LogicRustedSwitches,
-    &LogicFlamingChests,
-    &LogicBunnyHoodJump,
-    &LogicDamageBoost,
-    &LogicHoverBoost,
-    &LogicAdultKokiriGS,
-    &LogicLostWoodsBridge,
-    &LogicMidoBackflip,
-    &LogicLostWoodsGSBean,
-    &LogicCastleStormsGS,
-    &LogicManOnRoof,
-    &LogicKakarikoTowerGS,
-    &LogicAdultWindmillPoH,
-    &LogicChildWindmillPoH,
-    &LogicKakarikoRooftopGS,
-    &LogicGraveyardPoH,
-    &LogicChildDampeRacePoH,
-    &LogicShadowFireArrowEntry,
-    &LogicDMTSoilGS,
-    &LogicDMTBombable,
-    &LogicDMTGSLowerHookshot,
-    &LogicDMTGSLowerHovers,
-    &LogicDMTGSLowerBean,
-    &LogicDMTGSLowerJS,
-    &LogicDMTClimbHovers,
-    &LogicDMTGSUpper,
-    &LogicBiggoronBolero,
-    &LogicGoronCityPot,
-    &LogicGoronCityPotWithStrength,
-    &LogicChildRollingWithStrength,
-    &LogicGoronCityLeftMost,
-    &LogicGoronCityGrotto,
-    &LogicGoronCityLinkGoronDins,
-    &LogicCraterBeanPoHWithHovers,
-    &LogicCraterBoleroJump,
-    &LogicCraterBoulderJS,
-    &LogicCraterBoulderSkip,
-    &LogicZoraRiverLower,
-    &LogicZoraRiverUpper,
-    &LogicZoraWithHovers,
-    &LogicZoraWithCucco,
-    &LogicKingZoraSkip,
-    &LogicDomainGS,
-    &LogicLabWallGS,
-    &LogicLabDiving,
-    &LogicWaterHookshotEntry,
-    &LogicValleyCrateHovers,
-    &LogicGerudoKitchen,
-    &LogicGFJump,
-    &LogicWastelandBunnyCrossing,
-    &LogicWastelandCrossing,
-    &LogicLensWasteland,
-    &LogicReverseWasteland,
-    &LogicColossusGS,
-    &LogicDekuBasementGS,
-    &LogicDekuB1Skip,
-    &LogicDekuB1WebsWithBow,
-    &LogicDekuMQCompassGS,
-    &LogicDekuMQLog,
-    &LogicDCScarecrowGS,
-    &LogicDCVinesGS,
-    &LogicDCStaircase,
-    &LogicDCSlingshotSkip,
-    &LogicDCScrubRoom,
-    &LogicDCJump,
-    &LogicDCHammerFloor,
-    &LogicDCMQChildBombs,
-    &LogicDCMQEyesChild,
-    &LogicDCMQEyesAdult,
-    &LogicJabuAlcoveJumpDive,
-    &LogicJabuBossHover,
-    &LogicJabuNearBossRanged,
-    &LogicJabuNearBossExplosives,
-    &LogicLensJabuMQ,
-    &LogicJabuMQRangJump,
-    &LogicJabuMQSoTGS,
-    &LogicLensBotw,
-    &LogicChildDeadhand,
-    &LogicBotwBasement,
-    &LogicBotwMQPits,
-    &LogicBotwMQDeadHandKey,
-    &LogicForestFirstGS,
-    &LogicForestOutdoorEastGS,
-    &LogicForestVines,
-    &LogicForestOutdoorsLedge,
-    &LogicForestDoorFrame,
-    &LogicForestOutsideBackdoor,
-    &LogicForestMQWellSwim,
-    &LogicForestMQBlockPuzzle,
-    &LogicForestMQHallwaySwitchJS,
-    //&LogicForestMQHallwaySwitchHookshot,
-    &LogicForestMQHallwaySwitchBoomerang,
-    &LogicFireBossDoorJump,
-    &LogicFireSongOfTime,
-    &LogicFireStrength,
-    &LogicFireScarecrow,
-    &LogicFireFlameMaze,
-    &LogicFireMQNearBoss,
-    &LogicFireMQBlockedChest,
-    &LogicFireMQBKChest,
-    &LogicFireMQClimb,
-    &LogicFireMQMazeSideRoom,
-    &LogicFireMQMazeHovers,
-    &LogicFireMQMazeJump,
-    &LogicFireMQAboveMazeGS,
-    &LogicFireMQFlameMaze,
-    &LogicWaterTempleTorchLongshot,
-    &LogicWaterCrackedWallHovers,
-    &LogicWaterCrackedWallNothing,
-    &LogicWaterBossKeyRegion,
-    &LogicWaterNorthBasementLedgeJump,
-    &LogicWaterBKJumpDive,
-    &LogicWaterCentralGSFW,
-    &LogicWaterCentralGSIrons,
-    &LogicWaterCentralBow,
-    &LogicWaterFallingPlatformGSHookshot,
-    &LogicWaterFallingPlatformGSBoomerang,
-    &LogicWaterRiverGS,
-    &LogicWaterDragonJumpDive,
-    &LogicWaterDragonAdult,
-    &LogicWaterDragonChild,
-    &LogicWaterMQCentralPillar,
-    &LogicWaterMQLockedGS,
-    &LogicLensShadow,
-    &LogicLensShadowPlatform,
-    &LogicLensBongo,
-    &LogicShadowUmbrella,
-    &LogicShadowUmbrellaGS,
-    &LogicShadowFreestandingKey,
-    &LogicShadowStatue,
-    &LogicShadowBongo,
-    &LogicLensShadowMQ,
-    &LogicLensShadowMQInvisibleBlades,
-    &LogicLensShadowMQPlatform,
-    &LogicLensShadowMQDeadHand,
-    &LogicShadowMQGap,
-    &LogicShadowMQInvisibleBlades,
-    &LogicShadowMQHugePit,
-    &LogicShadowMQWindyWalkway,
-    &LogicLensSpirit,
-    &LogicSpiritChildBombchu,
-    &LogicSpiritLobbyGS,
-    &LogicSpiritLowerAdultSwitch,
-    &LogicSpiritLobbyJump,
-    &LogicSpiritPlatformHookshot,
-    &LogicSpiritMapChest,
-    &LogicSpiritSunChest,
-    &LogicSpiritWall,
-    &LogicLensSpiritMQ,
-    &LogicSpiritMQSunBlockSoT,
-    &LogicSpiritMQSunBlockGS,
-    &LogicSpiritMQLowerAdult,
-    &LogicSpiritMQFrozenEye,
-    &LogicIceBlockGS,
-    &LogicIceMQRedIceGS,
-    &LogicIceMQScarecrow,
-    &LogicLensGtg,
-    &LogicGtgWithoutHookshot,
-    &LogicGtgFakeWall,
-    &LogicLensGtgMQ,
-    &LogicGtgMQWithHookshot,
-    &LogicGtgMQWithoutHookshot,
-    &LogicLensCastle,
-    &LogicSpiritTrialHookshot,
-    &LogicLensCastleMQ,
-    &LogicFireTrialMQ,
-    &LogicShadowTrialMQ,
-    &LogicLightTrialMQ,
-  };
-  std::unordered_map<RandomizerTrick,Option *> trickOptionMap = {
-    {RT_VISIBLE_COLLISION,&LogicVisibleCollision},
-    {RT_GROTTOS_WITHOUT_AGONY,&LogicGrottosWithoutAgony},
-    {RT_FEWER_TUNIC_REQUIREMENTS,&LogicFewerTunicRequirements},
-    {RT_RUSTED_SWITCHES,&LogicRustedSwitches},
-    {RT_FLAMING_CHESTS,&LogicFlamingChests},
-    {RT_BUNNY_HOOD_JUMPS,&LogicBunnyHoodJump},
-    {RT_DAMAGE_BOOST_SIMPLE,&LogicDamageBoost},
-    {RT_HOVER_BOOST_SIMPLE,&LogicHoverBoost},
-    {RT_KF_ADULT_GS,&LogicAdultKokiriGS},
-    {RT_LW_BRIDGE,&LogicLostWoodsBridge},
-    {RT_LW_MIDO_BACKFLIP,&LogicMidoBackflip},
-    {RT_LW_GS_BEAN,&LogicLostWoodsGSBean},
-    {RT_HC_STORMS_GS,&LogicCastleStormsGS},
-    {RT_KAK_MAN_ON_ROOF,&LogicManOnRoof},
-    {RT_KAK_TOWER_GS,&LogicKakarikoTowerGS},
-    {RT_KAK_ADULT_WINDMILL_POH,&LogicAdultWindmillPoH},
-    {RT_KAK_CHILD_WINDMILL_POH,&LogicChildWindmillPoH},
-    {RT_KAK_ROOFTOP_GS,&LogicKakarikoRooftopGS},
-    {RT_GY_POH,&LogicGraveyardPoH},
-    {RT_GY_CHILD_DAMPE_RACE_POH,&LogicChildDampeRacePoH},
-    {RT_GY_SHADOW_FIRE_ARROWS,&LogicShadowFireArrowEntry},
-    {RT_DMT_SOIL_GS,&LogicDMTSoilGS},
-    {RT_DMT_BOMBABLE,&LogicDMTBombable},
-    {RT_DMT_HOOKSHOT_LOWER_GS,&LogicDMTGSLowerHookshot},
-    {RT_DMT_HOVERS_LOWER_GS,&LogicDMTGSLowerHovers},
-    {RT_DMT_BEAN_LOWER_GS,&LogicDMTGSLowerBean},
-    {RT_DMT_JS_LOWER_GS,&LogicDMTGSLowerJS},
-    {RT_DMT_CLIMB_HOVERS,&LogicDMTClimbHovers},
-    {RT_DMT_UPPER_GS,&LogicDMTGSUpper},
-    {RT_DMT_BOLERO_BIGGORON,&LogicBiggoronBolero},
-    {RT_GC_POT,&LogicGoronCityPot},
-    {RT_GC_POT_STRENGTH,&LogicGoronCityPotWithStrength},
-    {RT_GC_ROLLING_STRENGTH,&LogicChildRollingWithStrength},
-    {RT_GC_LEFTMOST,&LogicGoronCityLeftMost},
-    {RT_GC_GROTTO,&LogicGoronCityGrotto},
-    {RT_GC_LINK_GORON_DINS,&LogicGoronCityLinkGoronDins},
-    {RT_DMC_HOVER_BEAN_POH,&LogicCraterBeanPoHWithHovers},
-    {RT_DMC_BOLERO_JUMP,&LogicCraterBoleroJump},
-    {RT_DMC_BOULDER_JS,&LogicCraterBoulderJS},
-    {RT_DMC_BOULDER_SKIP,&LogicCraterBoulderSkip},
-    {RT_ZR_LOWER,&LogicZoraRiverLower},
-    {RT_ZR_UPPER,&LogicZoraRiverUpper},
-    {RT_ZR_HOVERS,&LogicZoraWithHovers},
-    {RT_ZR_CUCCO,&LogicZoraWithCucco},
-    {RT_ZD_KING_ZORA_SKIP,&LogicKingZoraSkip},
-    {RT_ZD_GS,&LogicDomainGS},
-    {RT_LH_LAB_WALL_GS,&LogicLabWallGS},
-    {RT_LH_LAB_DIVING,&LogicLabDiving},
-    {RT_LH_WATER_HOOKSHOT,&LogicWaterHookshotEntry},
-    {RT_GV_CRATE_HOVERS,&LogicValleyCrateHovers},
-    {RT_GF_KITCHEN,&LogicGerudoKitchen},
-    {RT_GF_JUMP,&LogicGFJump},
-    {RT_HW_BUNNY_CROSSING,&LogicWastelandBunnyCrossing},
-    {RT_HW_CROSSING,&LogicWastelandCrossing},
-    {RT_LENS_HW,&LogicLensWasteland},
-    {RT_HW_REVERSE,&LogicReverseWasteland},
-    {RT_COLOSSUS_GS,&LogicColossusGS},
-    {RT_DEKU_BASEMENT_GS,&LogicDekuBasementGS},
-    {RT_DEKU_B1_SKIP,&LogicDekuB1Skip},
-    {RT_DEKU_B1_BOW_WEBS,&LogicDekuB1WebsWithBow},
-    {RT_DEKU_MQ_COMPASS_GS,&LogicDekuMQCompassGS},
-    {RT_DEKU_MQ_LOG,&LogicDekuMQLog},
-    {RT_DC_SCARECROW_GS,&LogicDCScarecrowGS},
-    {RT_DC_VINES_GS,&LogicDCVinesGS},
-    {RT_DC_STAIRCASE,&LogicDCStaircase},
-    {RT_DC_SLINGSHOT_SKIP,&LogicDCSlingshotSkip},
-    {RT_DC_SCRUB_ROOM,&LogicDCScrubRoom},
-    {RT_DC_JUMP,&LogicDCJump},
-    {RT_DC_HAMMER_FLOOR,&LogicDCHammerFloor},
-    {RT_DC_MQ_CHILD_BOMBS,&LogicDCMQChildBombs},
-    {RT_DC_MQ_CHILD_EYES,&LogicDCMQEyesChild},
-    {RT_DC_MQ_ADULT_EYES,&LogicDCMQEyesAdult},
-    {RT_JABU_ALCOVE_JUMP_DIVE,&LogicJabuAlcoveJumpDive},
-    {RT_JABU_BOSS_HOVER,&LogicJabuBossHover},
-    {RT_JABU_NEAR_BOSS_RANGED,&LogicJabuNearBossRanged},
-    {RT_JABU_NEAR_BOSS_EXPLOSIVES,&LogicJabuNearBossExplosives},
-    {RT_LENS_JABU_MQ,&LogicLensJabuMQ},
-    {RT_JABU_MQ_RANG_JUMP,&LogicJabuMQRangJump},
-    {RT_JABU_MQ_SOT_GS,&LogicJabuMQSoTGS},
-    {RT_LENS_BOTW,&LogicLensBotw},
-    {RT_BOTW_CHILD_DEADHAND,&LogicChildDeadhand},
-    {RT_BOTW_BASEMENT,&LogicBotwBasement},
-    {RT_BOTW_MQ_PITS,&LogicBotwMQPits},
-    {RT_BOTW_MQ_DEADHAND_KEY,&LogicBotwMQDeadHandKey},
-    {RT_FOREST_FIRST_GS,&LogicForestFirstGS},
-    {RT_FOREST_OUTDOORS_EAST_GS,&LogicForestOutdoorEastGS},
-    {RT_FOREST_VINES,&LogicForestVines},
-    {RT_FOREST_OUTDOORS_LEDGE,&LogicForestOutdoorsLedge},
-    {RT_FOREST_DOORFRAME,&LogicForestDoorFrame},
-    {RT_FOREST_OUTSIDE_BACKDOOR,&LogicForestOutsideBackdoor},
-    {RT_FOREST_MQ_WELL_SWIM,&LogicForestMQWellSwim},
-    {RT_FOREST_MQ_BLOCK_PUZZLE,&LogicForestMQBlockPuzzle},
-    {RT_FOREST_MQ_JS_HALLWAY_SWITCH,&LogicForestMQHallwaySwitchJS},
-    {RT_FOREST_MQ_HOOKSHOT_HALLWAY_SWITCH,&LogicForestMQHallwaySwitchHookshot},
-    {RT_FOREST_MQ_RANG_HALLWAY_SWITCH,&LogicForestMQHallwaySwitchBoomerang},
-    {RT_FIRE_BOSS_DOOR_JUMP,&LogicFireBossDoorJump},
-    {RT_FIRE_SOT,&LogicFireSongOfTime},
-    {RT_FIRE_STRENGTH,&LogicFireStrength},
-    {RT_FIRE_SCARECROW,&LogicFireScarecrow},
-    {RT_FIRE_FLAME_MAZE,&LogicFireFlameMaze},
-    {RT_FIRE_MQ_NEAR_BOSS,&LogicFireMQNearBoss},
-    {RT_FIRE_MQ_BLOCKED_CHEST,&LogicFireMQBlockedChest},
-    {RT_FIRE_MQ_BK_CHEST,&LogicFireMQBKChest},
-    {RT_FIRE_MQ_CLIMB,&LogicFireMQClimb},
-    {RT_FIRE_MQ_MAZE_SIDE_ROOM,&LogicFireMQMazeSideRoom},
-    {RT_FIRE_MQ_MAZE_HOVERS,&LogicFireMQMazeHovers},
-    {RT_FIRE_MQ_MAZE_JUMP,&LogicFireMQMazeJump},
-    {RT_FIRE_MQ_ABOVE_MAZE_GS,&LogicFireMQAboveMazeGS},
-    {RT_FIRE_MQ_FLAME_MAZE,&LogicFireMQFlameMaze},
-    {RT_WATER_LONGSHOT_TORCH,&LogicWaterTempleTorchLongshot},
-    {RT_WATER_CRACKED_WALL_HOVERS,&LogicWaterCrackedWallHovers},
-    {RT_WATER_CRACKED_WALL,&LogicWaterCrackedWallNothing},
-    {RT_WATER_BK_REGION,&LogicWaterBossKeyRegion},
-    {RT_WATER_NORTH_BASEMENT_LEDGE_JUMP,&LogicWaterNorthBasementLedgeJump},
-    {RT_WATER_BK_JUMP_DIVE,&LogicWaterBKJumpDive},
-    {RT_WATER_FW_CENTRAL_GS,&LogicWaterCentralGSFW},
-    {RT_WATER_IRONS_CENTRAL_GS,&LogicWaterCentralGSIrons},
-    {RT_WATER_CENTRAL_BOW,&LogicWaterCentralBow},
-    {RT_WATER_HOOKSHOT_FALLING_PLATFORM_GS,&LogicWaterFallingPlatformGSHookshot},
-    {RT_WATER_RANG_FALLING_PLATFORM_GS,&LogicWaterFallingPlatformGSBoomerang},
-    {RT_WATER_RIVER_GS,&LogicWaterRiverGS},
-    {RT_WATER_DRAGON_JUMP_DIVE,&LogicWaterDragonJumpDive},
-    {RT_WATER_ADULT_DRAGON,&LogicWaterDragonAdult},
-    {RT_WATER_CHILD_DRAGON,&LogicWaterDragonChild},
-    {RT_WATER_MQ_CENTRAL_PILLAR,&LogicWaterMQCentralPillar},
-    {RT_WATER_MQ_LOCKED_GS,&LogicWaterMQLockedGS},
-    {RT_LENS_SHADOW,&LogicLensShadow},
-    {RT_LENS_SHADOW_PLATFORM,&LogicLensShadowPlatform},
-    {RT_LENS_BONGO,&LogicLensBongo},
-    {RT_SHADOW_UMBRELLA,&LogicShadowUmbrella},
-    {RT_SHADOW_UMBRELLA_GS,&LogicShadowUmbrellaGS},
-    {RT_SHADOW_FREESTANDING_KEY,&LogicShadowFreestandingKey},
-    {RT_SHADOW_STATUE,&LogicShadowStatue},
-    {RT_SHADOW_BONGO,&LogicShadowBongo},
-    {RT_LENS_SHADOW_MQ,&LogicLensShadowMQ},
-    {RT_LENS_SHADOW_MQ_INVISIBLE_BLADES,&LogicLensShadowMQInvisibleBlades},
-    {RT_LENS_SHADOW_MQ_PLATFORM,&LogicLensShadowMQPlatform},
-    {RT_LENS_SHADOW_MQ_DEADHAND,&LogicLensShadowMQDeadHand},
-    {RT_SHADOW_MQ_GAP,&LogicShadowMQGap},
-    {RT_SHADOW_MQ_INVISIBLE_BLADES,&LogicShadowMQInvisibleBlades},
-    {RT_SHADOW_MQ_HUGE_PIT,&LogicShadowMQHugePit},
-    {RT_SHADOW_MQ_WINDY_WALKWAY,&LogicShadowMQWindyWalkway},
-    {RT_LENS_SPIRIT,&LogicLensSpirit},
-    {RT_SPIRIT_CHILD_CHU,&LogicSpiritChildBombchu},
-    {RT_SPIRIT_LOBBY_GS,&LogicSpiritLobbyGS},
-    {RT_SPIRIT_LOWER_ADULT_SWITCH,&LogicSpiritLowerAdultSwitch},
-    {RT_SPIRIT_LOBBY_JUMP,&LogicSpiritLobbyJump},
-    {RT_SPIRIT_PLATFORM_HOOKSHOT,&LogicSpiritPlatformHookshot},
-    {RT_SPIRIT_MAP_CHEST,&LogicSpiritMapChest},
-    {RT_SPIRIT_SUN_CHEST,&LogicSpiritSunChest},
-    {RT_SPIRIT_WALL,&LogicSpiritWall},
-    {RT_LENS_SPIRIT_MQ,&LogicLensSpiritMQ},
-    {RT_SPIRIT_MQ_SUN_BLOCK_SOT,&LogicSpiritMQSunBlockSoT},
-    {RT_SPIRIT_MQ_SUN_BLOCK_GS,&LogicSpiritMQSunBlockGS},
-    {RT_SPIRIT_MQ_LOWER_ADULT,&LogicSpiritMQLowerAdult},
-    {RT_SPIRIT_MQ_FROZEN_EYE,&LogicSpiritMQFrozenEye},
-    {RT_ICE_BLOCK_GS,&LogicIceBlockGS},
-    {RT_ICE_MQ_RED_ICE_GS,&LogicIceMQRedIceGS},
-    {RT_ICE_MQ_SCARECROW,&LogicIceMQScarecrow},
-    {RT_LENS_GTG,&LogicLensGtg},
-    {RT_GTG_WITHOUT_HOOKSHOT,&LogicGtgWithoutHookshot},
-    {RT_GTG_FAKE_WALL,&LogicGtgFakeWall},
-    {RT_LENS_GTG_MQ,&LogicLensGtgMQ},
-    {RT_GTG_MQ_WITH_HOOKSHOT,&LogicGtgMQWithHookshot},
-    {RT_GTG_MQ_WIHTOUT_HOOKSHOT,&LogicGtgMQWithoutHookshot},
-    {RT_LENS_GANON,&LogicLensCastle},
-    {RT_GANON_SPIRIT_TRIAL_HOOKSHOT,&LogicSpiritTrialHookshot},
-    {RT_LENS_GANON_MQ,&LogicLensCastleMQ},
-    {RT_GANON_MQ_FIRE_TRIAL,&LogicFireTrialMQ},
-    {RT_GANON_MQ_SHADOW_TRIAL,&LogicShadowTrialMQ},
-    {RT_GANON_MQ_LIGHT_TRIAL,&LogicLightTrialMQ},
-  };
-
-  //TODO completely rewrite glitch section since oot3d glitches differ from oot
-  
-  Option GlitchEquipSwapDins = LogicTrick("");
-  Option GlitchEquipSwap     = LogicTrick("");
-
-  std::vector<Option*> glitchCategories = {
-    &GlitchEquipSwapDins,
-    &GlitchEquipSwap,
-  };
-  
-  std::vector<Option*> miscGlitches = {
-    
-  };
-  
-
-  Menu glitchCategorySettings = Menu::SubMenu("General Categories",     &glitchCategories, false);
-  Menu miscGlitchSettings     = Menu::SubMenu("Miscellaneous Glitches", &miscGlitches,     false);
-  std::vector<Menu*> glitchOptions = {
-    &glitchCategorySettings,
-    &miscGlitchSettings,
-  };
-
-  Menu loadSettingsPreset       = Menu::Action("Load Settings Preset",       LOAD_PRESET);
-  Menu saveSettingsPreset       = Menu::Action("Save Settings Preset",       SAVE_PRESET);
-  Menu deleteSettingsPreset     = Menu::Action("Delete Settings Preset",     DELETE_PRESET);
-  Menu resetToDefaultSettings   = Menu::Action("Reset to Default Settings",  RESET_TO_DEFAULTS);
-
-  std::vector<Menu *> settingsPresetItems = {
-    &loadSettingsPreset,
-    &saveSettingsPreset,
-    &deleteSettingsPreset,
-    &resetToDefaultSettings,
-  };
-
-  //Detailed Logic Options Submenu
-  Menu logicSettings    = Menu::SubMenu("Logic Options",     &logicOptions);
-  Menu excludeLocations = Menu::SubMenu("Exclude Locations", &excludeLocationsMenus, false);
-  Menu tricks           = Menu::SubMenu("Logical Tricks",    &trickOptions, false);
-  Menu glitchSettings   = Menu::SubMenu("Glitch Options",    &glitchOptions, false);
-  std::vector<Menu *> detailedLogicOptions = {
-    &logicSettings,
-    &excludeLocations,
-    &tricks,
-    &glitchSettings,
-  };
-
-  Menu open                     = Menu::SubMenu("Open Settings",              &openOptions);
-  Menu world                    = Menu::SubMenu("World Settings",             &worldOptions);
-  Menu shuffle                  = Menu::SubMenu("Shuffle Settings",           &shuffleOptions);
-  Menu shuffleDungeonItems      = Menu::SubMenu("Shuffle Dungeon Items",      &shuffleDungeonItemOptions);
-  Menu detailedLogic            = Menu::SubMenu("Detailed Logic Settings",    &detailedLogicOptions);
-  Menu startingInventory        = Menu::SubMenu("Starting Inventory",         &startingInventoryOptions, false);
-  Menu timesaverSettings        = Menu::SubMenu("Timesaver Settings",         &timesaverOptions);
-  Menu miscSettings             = Menu::SubMenu("Misc Settings",              &miscOptions);
-  Menu itemPoolSettings         = Menu::SubMenu("Item Pool Settings",         &itemPoolOptions);
-  Menu itemUsabilitySettings    = Menu::SubMenu("Item Usability Settings",    &itemUsabilityOptions);
-  Menu settingsPresets          = Menu::SubMenu("Settings Presets",           &settingsPresetItems);
-  Menu generateRandomizer       = Menu::Action ("Generate Randomizer",        GENERATE_MODE);
-
-  //adding a menu with no options crashes, might fix later
-  std::vector<Menu *> mainMenu = {
-    &open,
-    &world,
-    &shuffle,
-    &shuffleDungeonItems,
-    &timesaverSettings,
-    &detailedLogic,
-    &startingInventory,
-    &miscSettings,
-    &itemPoolSettings,
-    &itemUsabilitySettings,
-    &settingsPresets,
-    &generateRandomizer,
-  };
-
-  //declared here, set in fill.cpp
-  uint32_t LinksPocketRewardBitMask = 0;
-  std::array<uint32_t, 9> rDungeonRewardOverrides{};
-
-  //Fills and returns a SettingsContext struct.
-  //This struct is written to the code.ips patch and allows the game
-  //to read what settings the player selected to make in game decisions.
-  SettingsContext FillContext() {
-    SettingsContext ctx = {};
-    ctx.hashIndexes[0] = hashIconIndexes[0];
-    ctx.hashIndexes[1] = hashIconIndexes[1];
-    ctx.hashIndexes[2] = hashIconIndexes[2];
-    ctx.hashIndexes[3] = hashIconIndexes[3];
-    ctx.hashIndexes[4] = hashIconIndexes[4];
-
-    ctx.logic                = Logic.Value<uint8_t>();
-    ctx.openForest           = OpenForest.Value<uint8_t>();
-    ctx.openKakariko         = OpenKakariko.Value<uint8_t>();
-    ctx.openDoorOfTime       = OpenDoorOfTime.Value<uint8_t>();
-    ctx.zorasFountain        = ZorasFountain.Value<uint8_t>();
-    ctx.gerudoFortress       = GerudoFortress.Value<uint8_t>();
-    ctx.rainbowBridge        = Bridge.Value<uint8_t>();
-    ctx.bridgeStoneCount     = BridgeStoneCount.Value<uint8_t>();
-    ctx.bridgeMedallionCount = BridgeMedallionCount.Value<uint8_t>();
-    ctx.bridgeRewardCount    = BridgeRewardCount.Value<uint8_t>();
-    ctx.bridgeDungeonCount   = BridgeDungeonCount.Value<uint8_t>();
-    ctx.bridgeTokenCount     = BridgeTokenCount.Value<uint8_t>();
-    ctx.bridgeRewardOptions  = BridgeRewardOptions.Value<uint8_t>();
-    ctx.randomGanonsTrials   = (RandomGanonsTrials) ? 1 : 0;
-    ctx.ganonsTrialsCount    = GanonsTrialsCount.Value<uint8_t>();
-
-    ctx.startingAge          = StartingAge.Value<uint8_t>();
-    ctx.resolvedStartingAge  = ResolvedStartingAge;
-    ctx.shuffleDungeonEntrances = ShuffleDungeonEntrances.Value<uint8_t>();
-    ctx.shuffleBossEntrances    = ShuffleBossEntrances.Value<uint8_t>();
-    ctx.shuffleOverworldEntrances = (ShuffleOverworldEntrances) ? 1 : 0;
-    ctx.shuffleInteriorEntrances = ShuffleInteriorEntrances.Value<uint8_t>();
-    ctx.shuffleGrottoEntrances  = (ShuffleGrottoEntrances) ? 1 : 0;
-    ctx.shuffleOwlDrops         = (ShuffleOwlDrops) ? 1 : 0;
-    ctx.shuffleWarpSongs        = (ShuffleWarpSongs) ? 1 : 0;
-    ctx.shuffleOverworldSpawns  = (ShuffleOverworldSpawns) ? 1 : 0;
-    ctx.mixedEntrancePools      = (MixedEntrancePools) ? 1 : 0;
-    ctx.mixDungeons             = (MixDungeons) ? 1 : 0;
-    ctx.mixOverworld            = (MixOverworld) ? 1 : 0;
-    ctx.mixInteriors            = (MixInteriors) ? 1 : 0;
-    ctx.mixGrottos              = (MixGrottos) ? 1 : 0;
-    ctx.decoupleEntrances       = (DecoupleEntrances) ? 1 : 0;
-    ctx.bombchusInLogic         = (BombchusInLogic) ? 1 : 0;
-    ctx.ammoDrops            = AmmoDrops.Value<uint8_t>();
-    ctx.heartDropRefill      = HeartDropRefill.Value<uint8_t>();
-    ctx.randomMQDungeons        = (MQDungeonCount.Value<uint8_t>() == 13) ? 1 : 0;
-    ctx.mqDungeonCount          = MQSet;
-
-    ctx.shuffleRewards       = ShuffleRewards.Value<uint8_t>();
-    ctx.linksPocketItem      = LinksPocketItem.Value<uint8_t>();
-    ctx.shuffleSongs         = ShuffleSongs.Value<uint8_t>();
-    ctx.tokensanity          = Tokensanity.Value<uint8_t>();
-    ctx.scrubsanity          = Scrubsanity.Value<uint8_t>();
-    ctx.shuffleCows          = (ShuffleCows) ? 1 : 0;
-    ctx.shuffleKokiriSword   = (ShuffleKokiriSword) ? 1 : 0;
-    ctx.shuffleOcarinas      = (ShuffleOcarinas) ? 1 : 0;
-    ctx.shuffleWeirdEgg      = (ShuffleWeirdEgg) ? 1 : 0;
-    ctx.shuffleGerudoToken   = (ShuffleGerudoToken) ? 1 : 0;
-    ctx.shuffleMagicBeans    = (ShuffleMagicBeans) ? 1 : 0;
-    ctx.shuffleMerchants     = ShuffleMerchants.Value<uint8_t>();
-    ctx.shuffleFrogSongRupees= (ShuffleFrogSongRupees) ? 1 : 0;
-    ctx.shuffleAdultTradeQuest = (ShuffleAdultTradeQuest) ? 1 : 0;
-    ctx.shuffleChestMinigame = ShuffleChestMinigame.Value<uint8_t>();
-    ctx.shuffle100GsReward   = (Shuffle100GSReward) ? 1 : 0;
-
-    ctx.mapsAndCompasses     = MapsAndCompasses.Value<uint8_t>();
-    ctx.keysanity            = Keysanity.Value<uint8_t>();
-    ctx.gerudoKeys           = GerudoKeys.Value<uint8_t>();
-    ctx.bossKeysanity        = BossKeysanity.Value<uint8_t>();
-    ctx.ganonsBossKey        = GanonsBossKey.Value<uint8_t>();
-    ctx.lacsCondition        = LACSCondition;
-    ctx.lacsStoneCount       = LACSStoneCount.Value<uint8_t>();
-    ctx.lacsMedallionCount   = LACSMedallionCount.Value<uint8_t>();
-    ctx.lacsRewardCount      = LACSRewardCount.Value<uint8_t>();
-    ctx.lacsDungeonCount     = LACSDungeonCount.Value<uint8_t>();
-    ctx.lacsTokenCount       = LACSTokenCount.Value<uint8_t>();
-    ctx.lacsRewardOptions    = LACSRewardOptions.Value<uint8_t>();
-
-    ctx.ringFortress         = (RingFortress) ? 1 : 0;
-    ctx.ringForest           = (RingForest) ? 1 : 0;
-    ctx.ringFire             = (RingFire) ? 1 : 0;
-    ctx.ringWater            = (RingWater) ? 1 : 0;
-    ctx.ringSpirit           = (RingSpirit) ? 1 : 0;
-    ctx.ringShadow           = (RingShadow) ? 1 : 0;
-    ctx.ringWell             = (RingWell) ? 1 : 0;
-    ctx.ringGtg              = (RingGtg) ? 1 : 0;
-    ctx.ringCastle           = (RingCastle) ? 1 : 0;
-
-    ctx.skipChildStealth     = (SkipChildStealth) ? 1 : 0;
-    ctx.skipTowerEscape      = (SkipTowerEscape) ? 1 : 0;
-    ctx.skipEponaRace        = (SkipEponaRace) ? 1 : 0;
-    ctx.skipMinigamePhases   = (SkipMinigamePhases) ? 1 : 0;
-    ctx.freeScarecrow        = (FreeScarecrow) ? 1 : 0;
-    ctx.fourPoesCutscene     = (FourPoesCutscene) ? 1 : 0;
-    ctx.lakeHyliaOwl         = (LakeHyliaOwl) ? 1 : 0;
-    ctx.bigPoeTargetCount    = BigPoeTargetCount.Value<uint8_t>() + 1;
-    ctx.numRequiredCuccos    = NumRequiredCuccos.Value<uint8_t>();
-    ctx.kingZoraSpeed        = KingZoraSpeed.Value<uint8_t>();
-    ctx.completeMaskQuest    = CompleteMaskQuest ? 1 : 0;
-    ctx.enableGlitchCutscenes = EnableGlitchCutscenes ? 1 : 0;
-    ctx.quickText            = QuickText.Value<uint8_t>();
-    ctx.skipSongReplays      = SkipSongReplays.Value<uint8_t>();
-    ctx.keepFWWarpPoint      = KeepFWWarpPoint ? 1 : 0;
-    ctx.fastBunnyHood        = FastBunnyHood ? 1 : 0;
-
-    ctx.gossipStoneHints     = GossipStoneHints.Value<uint8_t>();
-    ctx.compassesShowReward  = CompassesShowReward.Value<uint8_t>();
-    ctx.compassesShowWotH    = CompassesShowWotH.Value<uint8_t>();
-    ctx.mapsShowDungeonMode  = MapsShowDungeonMode.Value<uint8_t>();
-    ctx.damageMultiplier     = DamageMultiplier.Value<uint8_t>();
-    ctx.startingTime         = StartingTime.Value<uint8_t>();
-    ctx.chestAnimations      = (ChestAnimations) ? 1 : 0;
-    ctx.chestSize            = (ChestSize) ? 1 : 0;
-    ctx.generateSpoilerLog   = (GenerateSpoilerLog) ? 1 : 0;
-    ctx.ingameSpoilers       = (IngameSpoilers) ? 1 : 0;
-    ctx.randomTrapDmg        = RandomTrapDmg.Value<uint8_t>();
-    ctx.blueFireArrows       = (BlueFireArrows) ? 1 : 0;
-    ctx.sunLightArrows       = (SunlightArrows) ? 1 : 0;
-
-    ctx.faroresWindAnywhere  = (FaroresWindAnywhere) ? 1 : 0;
-    ctx.stickAsAdult         = (StickAsAdult) ? 1 : 0;
-    ctx.boomerangAsAdult     = (BoomerangAsAdult) ? 1 : 0;
-    ctx.hammerAsChild        = (HammerAsChild) ? 1 : 0;
-    ctx.slingshotAsAdult     = (SlingshotAsAdult) ? 1 : 0;
-    ctx.bowAsChild           = (BowAsChild) ? 1 : 0;
-    ctx.hookshotAsChild      = (HookshotAsChild) ? 1 : 0;
-    ctx.ironbootsAsChild     = (IronBootsAsChild) ? 1 : 0;
-    ctx.hoverbootsAsChild    = (HoverBootsAsChild) ? 1 : 0;
-    ctx.masksAsAdult         = (MasksAsAdult) ? 1 : 0;
-    ctx.kokiriSwordAsAdult   = (KokiriSwordAsAdult) ? 1 : 0;
-    ctx.masterSwordAsChild   = (MasterSwordAsChild) ? 1 : 0;
-    ctx.biggoronSwordAsChild = (BiggoronSwordAsChild) ? 1 : 0;
-    ctx.dekuShieldAsAdult    = (DekuShieldAsAdult) ? 1 : 0;
-    ctx.mirrorShieldAsChild  = (MirrorShieldAsChild) ? 1 : 0;
-    ctx.goronTunicAsChild    = (GoronTunicAsChild) ? 1 : 0;
-    ctx.zoraTunicAsChild     = (ZoraTunicAsChild) ? 1 : 0;
-    ctx.gkDurability         = GkDurability.Value<uint8_t>();
-
-    ctx.itemPoolValue        = ItemPoolValue.Value<uint8_t>();
-    ctx.iceTrapValue         = IceTrapValue.Value<uint8_t>();
-    ctx.progressiveGoronSword = (ProgressiveGoronSword) ? 1 : 0;
-
-    ctx.linksPocketRewardBitMask = LinksPocketRewardBitMask;
-
-    ctx.dekuTreeDungeonMode              = DekuTree.IsMQ()              ? 1 : 0;
-    ctx.dodongosCavernDungeonMode        = DodongosCavern.IsMQ()        ? 1 : 0;
-    ctx.jabuJabusBellyDungeonMode        = JabuJabusBelly.IsMQ()        ? 1 : 0;
-    ctx.forestTempleDungeonMode          = ForestTemple.IsMQ()          ? 1 : 0;
-    ctx.fireTempleDungeonMode            = FireTemple.IsMQ()            ? 1 : 0;
-    ctx.waterTempleDungeonMode           = WaterTemple.IsMQ()           ? 1 : 0;
-    ctx.spiritTempleDungeonMode          = SpiritTemple.IsMQ()          ? 1 : 0;
-    ctx.shadowTempleDungeonMode          = ShadowTemple.IsMQ()          ? 1 : 0;
-    ctx.bottomOfTheWellDungeonMode       = BottomOfTheWell.IsMQ()       ? 1 : 0;
-    ctx.iceCavernDungeonMode             = IceCavern.IsMQ()             ? 1 : 0;
-    ctx.ganonsCastleDungeonMode          = GanonsCastle.IsMQ()          ? 1 : 0;
-    ctx.gerudoTrainingGroundsDungeonMode = GerudoTrainingGrounds.IsMQ() ? 1 : 0;
-
-    for (uint8_t i = 0; i < sizeof(ctx.dungeonModesKnown); ++i) {
-      ctx.dungeonModesKnown[i] = DungeonModesKnown[i];
-    }
-
-    ctx.forestTrialSkip = (ForestTrial.IsSkipped()) ? 1 : 0;
-    ctx.fireTrialSkip   = (FireTrial.IsSkipped())   ? 1 : 0;
-    ctx.waterTrialSkip  = (WaterTrial.IsSkipped())  ? 1 : 0;
-    ctx.spiritTrialSkip = (SpiritTrial.IsSkipped()) ? 1 : 0;
-    ctx.shadowTrialSkip = (ShadowTrial.IsSkipped()) ? 1 : 0;
-    ctx.lightTrialSkip  = (LightTrial.IsSkipped())  ? 1 : 0;
-
-    //Starting Inventory
-    ctx.startingConsumables   = (StartingConsumables) ? 1 : 0;
-    ctx.startingMaxRupees     = (StartingMaxRupees) ? 1 : 0;
-    ctx.startingStickCapacity = StartingStickCapacity.Value<uint8_t>();
-    ctx.startingNutCapacity   = StartingNutCapacity.Value<uint8_t>();
-    ctx.startingBombBag       = StartingBombBag.Value<uint8_t>();
-    ctx.startingBombchus      = StartingBombchus.Value<uint8_t>();
-    ctx.startingBow           = StartingBow.Value<uint8_t>();
-    ctx.startingFireArrows    = StartingFireArrows.Value<uint8_t>();
-    ctx.startingIceArrows     = StartingIceArrows.Value<uint8_t>();
-    ctx.startingLightArrows   = StartingLightArrows.Value<uint8_t>();
-    ctx.startingDinsFire      = StartingDinsFire.Value<uint8_t>();
-    ctx.startingFaroresWind   = StartingFaroresWind.Value<uint8_t>();
-    ctx.startingNayrusLove    = StartingNayrusLove.Value<uint8_t>();
-    ctx.startingSlingshot     = StartingSlingshot.Value<uint8_t>();
-    ctx.startingBoomerang     = StartingBoomerang.Value<uint8_t>();
-    ctx.startingLensOfTruth   = StartingLensOfTruth.Value<uint8_t>();
-    ctx.startingMagicBean     = StartingMagicBean.Value<uint8_t>();
-    ctx.startingMegatonHammer = StartingMegatonHammer.Value<uint8_t>();
-    ctx.startingHookshot      = StartingHookshot.Value<uint8_t>();
-    ctx.startingIronBoots     = StartingIronBoots.Value<uint8_t>();
-    ctx.startingHoverBoots    = StartingHoverBoots.Value<uint8_t>();
-    ctx.startingBottle1       = StartingBottle1.Value<uint8_t>();
-    ctx.startingBottle2       = StartingBottle2.Value<uint8_t>();
-    ctx.startingBottle3       = StartingBottle3.Value<uint8_t>();
-    ctx.startingBottle4       = StartingBottle4.Value<uint8_t>();
-    ctx.startingRutoBottle    = StartingRutoBottle.Value<uint8_t>();
-    ctx.startingOcarina       = StartingOcarina.Value<uint8_t>();
-    ctx.startingKokiriSword   = StartingKokiriSword.Value<uint8_t>();
-    ctx.startingBiggoronSword = StartingBiggoronSword.Value<uint8_t>();
-    ctx.startingHearts        = StartingHearts.Value<uint8_t>() + 1;
-    ctx.startingMagicMeter    = StartingMagicMeter.Value<uint8_t>();
-    ctx.startingDoubleDefense = StartingDoubleDefense.Value<uint8_t>();
-
-    //Starting Quest Items
-    ctx.startingQuestItems |= StartingMinuetOfForest.Value<uint8_t>()   << 6;
-    ctx.startingQuestItems |= StartingBoleroOfFire.Value<uint8_t>()     << 7;
-    ctx.startingQuestItems |= StartingSerenadeOfWater.Value<uint8_t>()  << 8;
-    ctx.startingQuestItems |= StartingRequiemOfSpirit.Value<uint8_t>()  << 9;
-    ctx.startingQuestItems |= StartingNocturneOfShadow.Value<uint8_t>() << 10;
-    ctx.startingQuestItems |= StartingPreludeOfLight.Value<uint8_t>()   << 11;
-    ctx.startingQuestItems |= StartingZeldasLullaby.Value<uint8_t>()    << 12;
-    ctx.startingQuestItems |= StartingEponasSong.Value<uint8_t>()       << 13;
-    ctx.startingQuestItems |= StartingSariasSong.Value<uint8_t>()       << 14;
-    ctx.startingQuestItems |= StartingSunsSong.Value<uint8_t>()         << 15;
-    ctx.startingQuestItems |= StartingSongOfTime.Value<uint8_t>()       << 16;
-    ctx.startingQuestItems |= StartingSongOfStorms.Value<uint8_t>()     << 17;
-    ctx.startingQuestItems |= StartingShardOfAgony.Value<uint8_t>()     << 21;
-    ctx.startingDungeonReward |= StartingKokiriEmerald.Value<uint8_t>()    << 18;
-    ctx.startingDungeonReward |= StartingGoronRuby.Value<uint8_t>()        << 19;
-    ctx.startingDungeonReward |= StartingZoraSapphire.Value<uint8_t>()     << 20;
-    ctx.startingDungeonReward |= StartingLightMedallion.Value<uint8_t>()   << 5;
-    ctx.startingDungeonReward |= StartingForestMedallion.Value<uint8_t>()  << 0;
-    ctx.startingDungeonReward |= StartingFireMedallion.Value<uint8_t>()    << 1;
-    ctx.startingDungeonReward |= StartingWaterMedallion.Value<uint8_t>()   << 2;
-    ctx.startingDungeonReward |= StartingSpiritMedallion.Value<uint8_t>()  << 3;
-    ctx.startingDungeonReward |= StartingShadowMedallion.Value<uint8_t>()  << 4;
-
-    ctx.startingTokens        = StartingSkulltulaToken.Value<uint8_t>();
-
-    //Give the Gerudo Membership Card if Gerudo Fortress is Open and Shuffle Gerudo Card is off
-    if (GerudoFortress.Is(GERUDOFORTRESS_OPEN) && !ShuffleGerudoToken) {
-        ctx.startingQuestItems |= 0x00400000;
-    }
-
-    //Starting Equipment
-    ctx.startingEquipment |= StartingKokiriSword.Value<uint8_t>();
-    ctx.startingEquipment |= (StartingBiggoronSword.Value<uint8_t>() ? 1: 0) << 2;
-    ctx.startingEquipment |= StartingDekuShield.Value<uint8_t>()    << 4;
-    ctx.startingEquipment |= StartingHylianShield.Value<uint8_t>()  << 5;
-    ctx.startingEquipment |= StartingMirrorShield.Value<uint8_t>()  << 6;
-    ctx.startingEquipment |= StartingGoronTunic.Value<uint8_t>()    << 9;
-    ctx.startingEquipment |= StartingZoraTunic.Value<uint8_t>()     << 10;
-    ctx.startingEquipment |= StartingIronBoots.Value<uint8_t>()     << 13;
-    ctx.startingEquipment |= StartingHoverBoots.Value<uint8_t>()    << 14;
-
-    //Starting Upgrades
-    ctx.startingUpgrades |= StartingStrength.Value<uint8_t>() << 6;
-    ctx.startingUpgrades |= StartingScale.Value<uint8_t>() << 9;
-    ctx.startingUpgrades |= StartingWallet.Value<uint8_t>() << 12;
-
-    return ctx;
-  }
-
-  //Include and Lock the desired locations
-  static void IncludeAndHide(std::vector<RandomizerCheck> locations) {
-    auto ctx = Rando::Context::GetInstance();
-    for (RandomizerCheck loc : locations) {
-      ctx->GetItemLocation(loc)->GetExcludedOption()->SetSelectedIndex(INCLUDE);
-      ctx->GetItemLocation(loc)->GetExcludedOption()->Hide();
-    }
-  }
-
-  //Unlock the desired locations
-  static void Unhide(std::vector<RandomizerCheck> locations) {
-    auto ctx = Rando::Context::GetInstance();
-    for (RandomizerCheck loc : locations) {
-      ctx->GetItemLocation(loc)->GetExcludedOption()->Unhide();
-    }
-  }
-
-  //Used for toggle options, enables/disables all the options between the 2 given
-  void ToggleSet(std::vector<Option *> optionsList, Option* toggleOption, Option* firstOptionInSet, Option* lastOptionInSet) {
-    uint32_t i;
-    for(i = 0; i < optionsList.size(); i++){
-      if(optionsList[i] == firstOptionInSet)
-        break;
-    }
-    for(; i < optionsList.size(); i++){
-      switch(toggleOption->Value<uint8_t>()) {
-        case 0:
-          optionsList[i]->Hide();
-          optionsList[i]->SetSelectedIndex(0);
-          break;
-        case 1:
-          optionsList[i]->Hide();
-          optionsList[i]->SetSelectedIndex(1);
-          break;
-        case 2:
-          optionsList[i]->Unhide();
-          break;
-      }
-      if(optionsList[i] == lastOptionInSet)
-        return;
-    }
-  }
-
-  //This function will hide certain locations from the Excluded Locations
-  //menu if the player's current settings would require non-junk to be placed
-  //at those locations. Excluded locations will have junk placed at them.
-  void ResolveExcludedLocationConflicts() {
-      auto ctx = Rando::Context::GetInstance();
-      std::vector<RandomizerCheck> shopLocations = ctx->GetLocations(ctx->everyPossibleLocation, Category::cShop);
-      // For now, just always hide shop locations, as not sure how to handle hiding them-
-      // 1-4 should always be hidden, while the others should be settings dependent, but random shopsanity makes that
-      // more complicated... Excluded shop locations are also wonky
-      IncludeAndHide(shopLocations);
-
-      // Force include song locations
-      std::vector<RandomizerCheck> songLocations = ctx->GetLocations(ctx->everyPossibleLocation, Category::cSong);
-      std::vector<RandomizerCheck> songDungeonRewards =
-          ctx->GetLocations(ctx->everyPossibleLocation, Category::cSongDungeonReward);
-
-      // Unhide all song locations, then lock necessary ones
-      Unhide(songLocations);
-      Unhide(songDungeonRewards);
-
-      if (ShuffleSongs.Is(SONGSHUFFLE_SONG_LOCATIONS)) {
-          IncludeAndHide(songLocations);
-      } else if (ShuffleSongs.Is(SONGSHUFFLE_DUNGEON_REWARDS)) {
-          IncludeAndHide(songDungeonRewards);
-      }
-
-      // Force Include Vanilla Skulltula locations
-      std::vector<RandomizerCheck> skulltulaLocations =
-          ctx->GetLocations(ctx->everyPossibleLocation, Category::cSkulltula);
-      Unhide(skulltulaLocations);
-      if (Tokensanity.IsNot(TOKENSANITY_ALL_TOKENS)) {
-          if (Tokensanity.Is(TOKENSANITY_OVERWORLD)) {
-              // filter overworld skulls so we're just left with dungeons
-              FilterAndEraseFromPool(skulltulaLocations, [](const RandomizerCheck loc) {
-                  return Rando::StaticData::GetLocation(loc)->GetScene() >= 0x0A;
-              });
-          } else if (Tokensanity.Is(TOKENSANITY_DUNGEONS)) {
-              // filter dungeon skulls so we're just left with overworld
-              FilterAndEraseFromPool(skulltulaLocations, [](const RandomizerCheck loc) {
-                  return Rando::StaticData::GetLocation(loc)->GetScene() < 0x0A;
-              });
-          }
-          IncludeAndHide(skulltulaLocations);
-      }
-
-      // Force Include scrubs if Scrubsanity is Off
-      std::vector<RandomizerCheck> scrubLocations =
-          ctx->GetLocations(ctx->everyPossibleLocation, Category::cDekuScrub, Category::cDekuScrubUpgrades);
-      if (Scrubsanity.Is(OFF)) {
-          IncludeAndHide(scrubLocations);
-      } else {
-          Unhide(scrubLocations);
-      }
-
-      // Force include Cows if Shuffle Cows is Off
-      std::vector<RandomizerCheck> cowLocations = ctx->GetLocations(ctx->everyPossibleLocation, Category::cCow);
-      if (ShuffleCows) {
-          Unhide(cowLocations);
-      } else {
-          IncludeAndHide(cowLocations);
-      }
-
-      // Force include the Kokiri Sword Chest if Shuffle Kokiri Sword is Off
-      if (ShuffleKokiriSword) {
-          Unhide({ RC_KF_KOKIRI_SWORD_CHEST });
-      } else {
-          IncludeAndHide({ RC_KF_KOKIRI_SWORD_CHEST });
-      }
-
-      // Force include the ocarina locations if Shuffle Ocarinas is Off
-      std::vector<RandomizerCheck> ocarinaLocations = { RC_LW_GIFT_FROM_SARIA, RC_HF_OCARINA_OF_TIME_ITEM };
-      if (ShuffleOcarinas) {
-          Unhide(ocarinaLocations);
-      } else {
-          IncludeAndHide(ocarinaLocations);
-      }
-
-      // Force include Malon if Shuffle Weird Egg is Off
-      if (ShuffleWeirdEgg) {
-          Unhide({ RC_HC_MALON_EGG });
-      } else {
-          IncludeAndHide({ RC_HC_MALON_EGG });
-      }
-
-      // Force include Gerudo Membership Card GetLocation if it's not shuffled
-      if (ShuffleGerudoToken) {
-          Unhide({ RC_GF_GERUDO_MEMBERSHIP_CARD });
-      } else {
-          IncludeAndHide({ RC_GF_GERUDO_MEMBERSHIP_CARD });
-      }
-
-      // Force include Magic Bean salesman if Shuffle Magic Beans is off
-      if (ShuffleMagicBeans) {
-          Unhide({ RC_ZR_MAGIC_BEAN_SALESMAN });
-      } else {
-          IncludeAndHide({ RC_ZR_MAGIC_BEAN_SALESMAN });
-      }
-
-      // Force include Medigoron, Granny and Carpet salesman if Shuffle Merchants is off
-      if (ShuffleMerchants.IsNot(SHUFFLEMERCHANTS_OFF)) {
-          Unhide({ RC_GC_MEDIGORON });
-          Unhide({ RC_KAK_GRANNYS_SHOP });
-          Unhide({ RC_WASTELAND_BOMBCHU_SALESMAN });
-      } else {
-          IncludeAndHide({ RC_GC_MEDIGORON });
-          IncludeAndHide({ RC_KAK_GRANNYS_SHOP });
-          IncludeAndHide({ RC_WASTELAND_BOMBCHU_SALESMAN });
-      }
-
-      // Force include frog song rupees if they're not shuffled
-      if (ShuffleFrogSongRupees) {
-          Unhide({ RC_ZR_FROGS_ZELDAS_LULLABY });
-          Unhide({ RC_ZR_FROGS_EPONAS_SONG });
-          Unhide({ RC_ZR_FROGS_SARIAS_SONG });
-          Unhide({ RC_ZR_FROGS_SUNS_SONG });
-          Unhide({ RC_ZR_FROGS_SONG_OF_TIME });
-      } else {
-          IncludeAndHide({ RC_ZR_FROGS_ZELDAS_LULLABY });
-          IncludeAndHide({ RC_ZR_FROGS_EPONAS_SONG });
-          IncludeAndHide({ RC_ZR_FROGS_SARIAS_SONG });
-          IncludeAndHide({ RC_ZR_FROGS_SUNS_SONG });
-          IncludeAndHide({ RC_ZR_FROGS_SONG_OF_TIME });
-      }
-
-      // Force include adult trade quest if Shuffle Adult Trade Quest is off
-      std::vector<RandomizerCheck> adultTradeLocations = { RC_KAK_TRADE_POCKET_CUCCO, RC_LW_TRADE_COJIRO,
-                                                           RC_KAK_TRADE_ODD_MUSHROOM, RC_LW_TRADE_ODD_POTION,
-                                                           RC_GV_TRADE_SAW,           RC_DMT_TRADE_BROKEN_SWORD,
-                                                           RC_ZD_TRADE_PRESCRIPTION,  RC_LH_TRADE_FROG,
-                                                           RC_DMT_TRADE_EYEDROPS };
-      if (ShuffleAdultTradeQuest) {
-          Unhide(adultTradeLocations);
-      } else {
-          IncludeAndHide(adultTradeLocations);
-      }
-
-      // Force include Chest Game keys if Shuffle Chest Minigame is off
-      std::vector<RandomizerCheck> ChestMinigameLocations = { RC_MARKET_TREASURE_CHEST_GAME_ITEM_1,
-                                                              RC_MARKET_TREASURE_CHEST_GAME_ITEM_2,
-                                                              RC_MARKET_TREASURE_CHEST_GAME_ITEM_3,
-                                                              RC_MARKET_TREASURE_CHEST_GAME_ITEM_4,
-                                                              RC_MARKET_TREASURE_CHEST_GAME_ITEM_5 };
-      if (ShuffleChestMinigame) {
-          Unhide(ChestMinigameLocations);
-      } else {
-          IncludeAndHide(ChestMinigameLocations);
-      }
-
-      // Force include 100 GS reward if it isn't shuffled
-      if (Shuffle100GSReward) {
-          Unhide({ RC_KAK_100_GOLD_SKULLTULA_REWARD });
-      } else {
-          IncludeAndHide({ RC_KAK_100_GOLD_SKULLTULA_REWARD });
-      }
-
-      // Force include Triforce Hunt if it's off
-      if (TriforceHunt) {
-          Unhide({ RC_TRIFORCE_COMPLETED });
-      } else {
-          IncludeAndHide({ RC_TRIFORCE_COMPLETED });
-      }
-
-      // Force include Map and Compass Chests when Vanilla
-      std::vector<RandomizerCheck> mapChests = ctx->GetLocations(ctx->everyPossibleLocation, Category::cVanillaMap);
-      std::vector<RandomizerCheck> compassChests =
-          ctx->GetLocations(ctx->everyPossibleLocation, Category::cVanillaCompass);
-      if (MapsAndCompasses.Is(MAPSANDCOMPASSES_VANILLA)) {
-          IncludeAndHide(mapChests);
-          IncludeAndHide(compassChests);
-      } else {
-          Unhide(mapChests);
-          Unhide(compassChests);
-      }
-
-      // Force include Vanilla Small Key Locations (except gerudo Fortress) on Vanilla Keys
-      std::vector<RandomizerCheck> smallKeyChests =
-          ctx->GetLocations(ctx->everyPossibleLocation, Category::cVanillaSmallKey);
-      if (Keysanity.Is(KEYSANITY_VANILLA)) {
-          IncludeAndHide(smallKeyChests);
-      } else {
-          Unhide(smallKeyChests);
-      }
-
-      // Force include Gerudo Fortress carpenter fights if GF Small Keys are Vanilla
-      std::vector<RandomizerCheck> vanillaGFKeyLocations =
-          ctx->GetLocations(ctx->everyPossibleLocation, Category::cVanillaGFSmallKey);
-      if (GerudoKeys.Is(GERUDOKEYS_VANILLA)) {
-          IncludeAndHide(vanillaGFKeyLocations);
-      } else {
-          Unhide(vanillaGFKeyLocations);
-      }
-
-      // Force include Boss Key Chests if Boss Keys are Vanilla
-      std::vector<RandomizerCheck> bossKeyChests =
-          ctx->GetLocations(ctx->everyPossibleLocation, Category::cVanillaBossKey);
-      if (BossKeysanity.Is(BOSSKEYSANITY_VANILLA)) {
-          IncludeAndHide(bossKeyChests);
-      } else {
-          Unhide(bossKeyChests);
-      }
-
-      // Force include Ganons Boss Key Chest if ganons boss key has to be there
-      if (GanonsBossKey.Is(GANONSBOSSKEY_VANILLA)) {
-          IncludeAndHide({ RC_GANONS_TOWER_BOSS_KEY_CHEST });
-      } else {
-          Unhide({ RC_GANONS_TOWER_BOSS_KEY_CHEST });
-      }
-
-      // Force include Light Arrow item if ganons boss key has to be there
-      if (GanonsBossKey.Value<uint8_t>() >= GANONSBOSSKEY_LACS_VANILLA) {
-          IncludeAndHide({ RC_TOT_LIGHT_ARROWS_CUTSCENE });
-      } else {
-          Unhide({ RC_TOT_LIGHT_ARROWS_CUTSCENE });
-      }
-  }
-
-  uint8_t DungeonsOfType(uint8_t type) {
-    uint8_t count = 0;
-
-    for (Option *option : dungeonOptions) {
-      count += (option->Value<uint8_t>() == type) ? 1 : 0;
-    }
-
-    return count;
-  }
-
-  //Hide certain settings if they aren't relevant or Lock settings if they
-  //can't be changed due to another setting that was chosen. (i.e. Closed Forest
-  //will force Starting Age to Child).
-  void ForceChange(uint32_t kDown, Option* currentSetting) {
-
-    // If Zora's Fountain is open, hide and un-select Ruto's Letter. If not open, hide and un-select bottle 4 instead
-    if (ZorasFountain.Is(ZORASFOUNTAIN_OPEN)) {
-      startingItemsOptions[23]->Unhide();
-      startingItemsOptions[24]->Hide();
-      startingItemsOptions[24]->SetSelectedIndex(0);
-    } else {
-      startingItemsOptions[24]->Unhide();
-      startingItemsOptions[23]->Hide();
-      startingItemsOptions[23]->SetSelectedIndex(0);
-    }
-
-    //Only hide the options for now, select them later in UpdateSettings()
-    RandomizeAllSettings();
-
-    //Only go through options if all settings are not randomized
-    if (!RandomizeOpen) {
-      //Adult is not compatible with Closed Forest
-      if (OpenForest.Is(OPENFOREST_CLOSED)) {
-        StartingAge.SetSelectedIndex(AGE_CHILD);
-      }
-
-      //Adult is also not compatible with the following combination:
-      //DoT:Intended, ShuffleOcarinas:false, Logic:Glitchless
-      if (OpenDoorOfTime.Is(OPENDOOROFTIME_CLOSED) && !ShuffleOcarinas &&
-        Logic.Is(LOGIC_GLITCHLESS)) {
-          StartingAge.SetSelectedIndex(AGE_CHILD);
-        }
-
-      //Only show stone count option if Stones is selected
-      if (Bridge.Is(RAINBOWBRIDGE_STONES)) {
-        BridgeStoneCount.Unhide();
-      } else {
-        BridgeStoneCount.SetSelectedIndex(3);
-        BridgeStoneCount.Hide();
-      }
-
-      //Only show medallion count option if Medallions is selected
-      if (Bridge.Is(RAINBOWBRIDGE_MEDALLIONS)) {
-        BridgeMedallionCount.Unhide();
-      } else {
-        BridgeMedallionCount.Hide();
-        BridgeMedallionCount.SetSelectedIndex(6);
-      }
-
-      //Only show reward count option if Rewards is selected
-      if (Bridge.Is(RAINBOWBRIDGE_REWARDS)) {
-        BridgeRewardCount.Unhide();
-      } else {
-        BridgeRewardCount.SetSelectedIndex(9);
-        BridgeRewardCount.Hide();
-      }
-
-      //Only show reward count option if Rewards is selected
-      if (Bridge.Is(RAINBOWBRIDGE_DUNGEONS)) {
-        BridgeDungeonCount.Unhide();
-      } else {
-        BridgeDungeonCount.SetSelectedIndex(8);
-        BridgeDungeonCount.Hide();
-      }
-
-      //Only show token count option if Tokens is selected
-      if (Bridge.Is(RAINBOWBRIDGE_TOKENS)) {
-        BridgeTokenCount.Unhide();
-      } else {
-        BridgeTokenCount.SetSelectedIndex(1);
-        BridgeTokenCount.Hide();
-      }
-
-      //Only show Trial Count option if Random Trial Count is off
-      if (RandomGanonsTrials) {
-        GanonsTrialsCount.SetSelectedIndex(6);
-        GanonsTrialsCount.Hide();
-      } else {
-        GanonsTrialsCount.Unhide();
-      }
-    }
-
-    //Only go through options if all settings are not randomized
-    if (!RandomizeWorld) {
-      //Show Shuffle options when Shuffle Entrances is On
-      if (ShuffleEntrances) {
-        ShuffleDungeonEntrances.Unhide();
-        ShuffleBossEntrances.Unhide();
-        ShuffleOverworldEntrances.Unhide();
-        ShuffleInteriorEntrances.Unhide();
-        ShuffleGrottoEntrances.Unhide();
-        ShuffleOwlDrops.Unhide();
-        ShuffleWarpSongs.Unhide();
-        ShuffleOverworldSpawns.Unhide();
-        MixedEntrancePools.Unhide();
-        DecoupleEntrances.Unhide();
-      } else {
-        ShuffleDungeonEntrances.SetSelectedIndex(SHUFFLEDUNGEONS_OFF);
-        ShuffleDungeonEntrances.Hide();
-        ShuffleBossEntrances.SetSelectedIndex(SHUFFLEBOSSES_OFF);
-        ShuffleBossEntrances.Hide();
-        ShuffleOverworldEntrances.SetSelectedIndex(OFF);
-        ShuffleOverworldEntrances.Hide();
-        ShuffleInteriorEntrances.SetSelectedIndex(SHUFFLEINTERIORS_OFF);
-        ShuffleInteriorEntrances.Hide();
-        ShuffleGrottoEntrances.SetSelectedIndex(OFF);
-        ShuffleGrottoEntrances.Hide();
-        ShuffleOwlDrops.SetSelectedIndex(OFF);
-        ShuffleOwlDrops.Hide();
-        ShuffleWarpSongs.SetSelectedIndex(OFF);
-        ShuffleWarpSongs.Hide();
-        ShuffleOverworldSpawns.SetSelectedIndex(OFF);
-        ShuffleOverworldSpawns.Hide();
-        MixedEntrancePools.SetSelectedIndex(OFF);
-        MixedEntrancePools.Hide();
-        DecoupleEntrances.SetSelectedIndex(OFF);
-        DecoupleEntrances.Hide();
-      }
-
-      // Only show the options for mixing each pool if they're already being shuffled
-      if (MixedEntrancePools) {
-        if (ShuffleDungeonEntrances) {
-          MixDungeons.Unhide();
-        } else {
-          MixDungeons.Hide();
-          MixDungeons.SetSelectedIndex(OFF);
-        }
-
-        if (ShuffleOverworldEntrances) {
-          MixOverworld.Unhide();
-        } else {
-          MixOverworld.Hide();
-          MixOverworld.SetSelectedIndex(OFF);
-        }
-
-        if (ShuffleInteriorEntrances.IsNot(OFF)) {
-          MixInteriors.Unhide();
-        } else {
-          MixInteriors.Hide();
-          MixInteriors.SetSelectedIndex(OFF);
-        }
-
-        if (ShuffleGrottoEntrances) {
-          MixGrottos.Unhide();
-        } else {
-          MixGrottos.Hide();
-          MixGrottos.SetSelectedIndex(OFF);
-        }
-      } else {
-        MixDungeons.Hide();
-        MixDungeons.SetSelectedIndex(OFF);
-        MixOverworld.Hide();
-        MixOverworld.SetSelectedIndex(OFF);
-        MixInteriors.Hide();
-        MixInteriors.SetSelectedIndex(OFF);
-        MixGrottos.Hide();
-        MixGrottos.SetSelectedIndex(OFF);
-      }
-    }
-
-    if (SetDungeonTypes) {
-      for (Option *option : dungeonOptions) {
-        option->Unhide();
-      }
-
-      // Restrict MQDungeonCount options so they can't be less than the number of dungeons set to MQ and can't be more
-      // than the number of dungeons set to MQ plus the number of dungeons set to random
-      uint8_t MQ = DungeonsOfType(1), R = DungeonsOfType(2);
-      if (MQDungeonCount.Value<uint8_t>() < MQ) {
-        MQDungeonCount.SetSelectedIndex((currentSetting == &MQDungeonCount) ? 13 : MQ);
-      } else if (MQDungeonCount.Value<uint8_t>() != 13 && MQDungeonCount.Value<uint8_t>() > MQ + R) {
-        MQDungeonCount.SetSelectedIndex((currentSetting == &MQDungeonCount) ? 13 : MQ + R);
-      }
-    } else {
-      for (Option *option : dungeonOptions) {
-        option->SetSelectedIndex(2);
-        option->Hide();
-      }
-    }
-
-    //Only go through options if all settings are not randomized
-    if (!RandomizeShuffle) {
-      // Ganon's Boss Key on 100 GS reward must also have the reward shuffled
-      if (GanonsBossKey.Is(GANONSBOSSKEY_FINAL_GS_REWARD)) {
-        Shuffle100GSReward.SetSelectedIndex(ON);
-      }
-    }
-
-    //Force Link's Pocket Item to be a dungeon reward if Shuffle Rewards is end of dungeons
-    if (ShuffleRewards.Is(REWARDSHUFFLE_END_OF_DUNGEON)) {
-      LinksPocketItem.SetSelectedIndex(LINKSPOCKETITEM_DUNGEON_REWARD);
-      if (RandomizeShuffle) {
-        //Even if it is supposed to be locked, still hide it to keep the surprise
-
-        LinksPocketItem.Hide();
-      }
-    }
-
-    if (!RandomizeDungeon) {
-      //Only show Stone Count if setting Ganons Boss Key to LACS Stones
-      if (GanonsBossKey.Is(GANONSBOSSKEY_LACS_STONES)) {
-        LACSStoneCount.Unhide();
-      } else {
-        LACSStoneCount.SetSelectedIndex(3);
-        LACSStoneCount.Hide();
-      }
-      
-      //Only show Medallion Count if setting Ganons Boss Key to LACS Medallions
-      if (GanonsBossKey.Is(GANONSBOSSKEY_LACS_MEDALLIONS)) {
-        LACSMedallionCount.Unhide();
-      } else {
-        LACSMedallionCount.SetSelectedIndex(6);
-        LACSMedallionCount.Hide();
-      }
-
-      //Only show Reward Count if setting Ganons Boss Key to LACS Rewards
-      if (GanonsBossKey.Is(GANONSBOSSKEY_LACS_REWARDS)) {
-        LACSRewardCount.Unhide();
-      } else {
-        LACSRewardCount.SetSelectedIndex(9);
-        LACSRewardCount.Hide();
-      }
-
-      //Only show Dungeon Count if setting Ganons Boss Key to LACS Dungeons
-      if (GanonsBossKey.Is(GANONSBOSSKEY_LACS_DUNGEONS)) {
-        LACSDungeonCount.Unhide();
-      } else {
-        LACSDungeonCount.SetSelectedIndex(8);
-        LACSDungeonCount.Hide();
-      }
-
-      //Only show Token Count if setting Ganons Boss Key to LACS Tokens
-      if (GanonsBossKey.Is(GANONSBOSSKEY_LACS_TOKENS)) {
-        LACSTokenCount.Unhide();
-      } else {
-        LACSTokenCount.SetSelectedIndex(100);
-        LACSTokenCount.Hide();
-      }
-
-      // Only show dungeons when keyring selection is enabled
-      if (KeyRings.Is(KEYRINGS_SELECTION)) {
-        for (Option *option : keyRingOptions) {
-          option->Unhide();
-        }
-      } else {
-        for (Option *option : keyRingOptions) {
-          option->Hide();
-          option->SetSelectedIndex(0);
-        }
-      }
-    }
-
-    //Only show Skip Song Replays if Quick Text is enabled
-    if (QuickText.Is(QUICKTEXT_VANILLA)) {
-      SkipSongReplays.SetSelectedIndex(DONT_SKIP);
-      SkipSongReplays.Hide();
-    } else {
-      SkipSongReplays.Unhide();
-    }
-
-    //Only show hint options if hints are enabled
-    if (GossipStoneHints.Is(HINTS_NO_HINTS)) {
-      ClearerHints.Hide();
-      HintDistribution.Hide();
-    } else {
-      ClearerHints.Unhide();
-      HintDistribution.Unhide();
-    }
-
-    //Manage toggle for item usability options
-    ToggleSet(itemUsabilityOptions, &AgeItemsToggle, &StickAsAdult, &ZoraTunicAsChild);
-
-    if (RemoveDoubleDefense) {
-      StartingDoubleDefense.SetSelectedIndex(0);
-    }
-
-    ResolveExcludedLocationConflicts();
-  }
-
-  bool IsMQOption(Option *option) {
-    return option == &MQDungeonCount  ||
-           option == &SetDungeonTypes ||
-           option == &MQDeku          ||
-           option == &MQDodongo       ||
-           option == &MQJabu          ||
-           option == &MQForest        ||
-           option == &MQFire          ||
-           option == &MQWater         ||
-           option == &MQSpirit        ||
-           option == &MQShadow        ||
-           option == &MQBotW          ||
-           option == &MQIceCavern     ||
-           option == &MQGTG           ||
-           option == &MQCastle;
-  }
-
-  //Options that should be saved, set to default, then restored after finishing when vanilla logic is enabled
-  std::vector<Option *> vanillaLogicDefaults = {
-    &LinksPocketItem,
-    &ShuffleRewards,
-    &ShuffleSongs,
-    &Shopsanity,
-    &ShopsanityPrices,
-    &ShopsanityPricesAffordable,
-    &Scrubsanity,
-    &ShuffleCows,
-    &ShuffleMagicBeans,
-    &ShuffleMerchants,
-    &ShuffleFrogSongRupees,
-    &ShuffleAdultTradeQuest,
-    &Shuffle100GSReward,
-    &GossipStoneHints,
-  };
-
-  // Randomizes all settings in a category if chosen
-  // Hides all relevant options
-  void RandomizeAllSettings(const bool selectOptions /*= false*/) {
-
-    // Open Settings
-    if (RandomizeOpen) {
-      // Skip RandomizeOpen Option
-      for (size_t i = 1; i < openOptions.size(); i++) {
-        //hide options
-        openOptions[i]->Hide();
-
-        //randomize options
-        if (selectOptions) {
-          openOptions[i]->SetSelectedIndex(Random(0,openOptions[i]->GetOptionCount()));
-        }
-      }
-      // Randomize Ganon Trials
-      RandomGanonsTrials.SetSelectedIndex(ON);
-    }
-    else {
-      for (size_t i = 1; i < openOptions.size(); i++) {
-        openOptions[i]->Unhide();
-      }
-    }
-
-    // World Settings
-    if (RandomizeWorld) {
-      // Skip RandomizeWorld Option
-      for (size_t i=1; i < worldOptions.size(); i++) {
-        // skip MQ options
-        if (IsMQOption(worldOptions[i])) {
-          continue;
-        }
-        worldOptions[i]->Hide();
-        //randomize options
-        if (selectOptions) {
-          worldOptions[i]->SetSelectedIndex(Random(0,worldOptions[i]->GetOptionCount()));
-        }
-        // Sanity Check Closed Forest
-        if (OpenForest.Is(OPENFOREST_CLOSED)) {
-          StartingAge.SetSelectedIndex(AGE_CHILD);
-        }
-      }
-    }
-    else {
-      for (size_t i=1; i < worldOptions.size(); i++) {
-        if (IsMQOption(worldOptions[i])) {
-          continue;
-        }
-        worldOptions[i]->Unhide();
-      }
-    }
-
-    // Sanity Check Entrance Shuffling
-    if (!ShuffleEntrances) {
-      ShuffleDungeonEntrances.SetSelectedIndex(OFF);
-      ShuffleBossEntrances.SetSelectedIndex(OFF);
-      ShuffleOverworldEntrances.SetSelectedIndex(OFF);
-      ShuffleInteriorEntrances.SetSelectedIndex(OFF);
-      ShuffleGrottoEntrances.SetSelectedIndex(OFF);
-      ShuffleOwlDrops.SetSelectedIndex(OFF);
-      ShuffleWarpSongs.SetSelectedIndex(OFF);
-      ShuffleOverworldSpawns.SetSelectedIndex(OFF);
-      MixedEntrancePools.SetSelectedIndex(OFF);
-      DecoupleEntrances.SetSelectedIndex(OFF);
-    }
-
-    if (!MixedEntrancePools) {
-      MixDungeons.SetSelectedIndex(OFF);
-      MixOverworld.SetSelectedIndex(OFF);
-      MixInteriors.SetSelectedIndex(OFF);
-      MixGrottos.SetSelectedIndex(OFF);
-    }
-
-    // Shuffle Settings
-    if (RandomizeShuffle) {
-      // Skip RandomizeShuffle Option
-      for (size_t i=1; i < shuffleOptions.size(); i++) {
-        shuffleOptions[i]->Hide();
-        //randomize options
-        if (selectOptions) {
-          shuffleOptions[i]->SetSelectedIndex(Random(0,shuffleOptions[i]->GetOptionCount()));
-        }
-      }
-      // Double check that this is the case in case of randomization on init
-      if (ShuffleRewards.Is(REWARDSHUFFLE_END_OF_DUNGEON)) {
-        LinksPocketItem.SetSelectedIndex(LINKSPOCKETITEM_DUNGEON_REWARD);
-      }
-    }
-    else {
-      for (size_t i=1; i < shuffleOptions.size(); i++) {
-        shuffleOptions[i]->Unhide();
-      }
-    }
-
-    // Dungeon Shuffle Settings
-    if (RandomizeDungeon) {
-      // Skip RandomizeDungeon Option
-      for (size_t i=1; i < shuffleDungeonItemOptions.size(); i++) {
-        shuffleDungeonItemOptions[i]->Hide();
-        //randomize options
-        if (selectOptions) {
-          shuffleDungeonItemOptions[i]->SetSelectedIndex(Random(0,shuffleDungeonItemOptions[i]->GetOptionCount()));
-        }
-      }
-    }
-    else {
-      for (size_t i=1; i < shuffleDungeonItemOptions.size(); i++) {
-        shuffleDungeonItemOptions[i]->Unhide();
-      }
-    }
-
-    //resolve any settings that need to change
-    if (selectOptions) {
-      ForceChange(0, nullptr);
-    }
-  }
-
-  //Function to set flags depending on settings
-  void UpdateSettings(std::unordered_map<RandomizerSettingKey, uint8_t> cvarSettings, std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks) {
-
-    //Logic.SetSelectedIndex(cvarSettings[RSK_LOGIC_RULES]);
-    //TODO switch back for glitch logic
-    switch (cvarSettings[RSK_LOGIC_RULES]) {
-      case RO_LOGIC_GLITCHLESS:
-        Logic.SetSelectedIndex(0);
-        break;
-      case RO_LOGIC_NO_LOGIC:
-        Logic.SetSelectedIndex(2);
-        break;
-    }
-
-    LocationsReachable.SetSelectedIndex(cvarSettings[RSK_ALL_LOCATIONS_REACHABLE]);
-    auto ctx = Rando::Context::GetInstance();
-    ctx->AddExcludedOptions();
-    for (auto locationKey : ctx->everyPossibleLocation) {
-      auto location = ctx->GetItemLocation(locationKey);
-      if (excludedLocations.count(location->GetRandomizerCheck())) {
-        location->GetExcludedOption()->SetSelectedIndex(1);
-      } else {
-        location->GetExcludedOption()->SetSelectedIndex(0);
-      }
-    }
-
-    //tricks
-    
-    for (auto randomizerTrick : enabledTricks) {
-      trickOptionMap[randomizerTrick]->SetSelectedIndex(1);
-    }
-    
-
-    OpenForest.SetSelectedIndex(cvarSettings[RSK_FOREST]);
-    OpenKakariko.SetSelectedIndex(cvarSettings[RSK_KAK_GATE]);
-    ZorasFountain.SetSelectedIndex(cvarSettings[RSK_ZORAS_FOUNTAIN]);
-    OpenDoorOfTime.SetSelectedIndex(cvarSettings[RSK_DOOR_OF_TIME]);
-    StartingAge.SetSelectedIndex(cvarSettings[RSK_STARTING_AGE]);
-    GerudoFortress.SetSelectedIndex(cvarSettings[RSK_GERUDO_FORTRESS]);
-    Bridge.SetSelectedIndex(cvarSettings[RSK_RAINBOW_BRIDGE]);
-    BridgeStoneCount.SetSelectedIndex(cvarSettings[RSK_RAINBOW_BRIDGE_STONE_COUNT]);
-    BridgeMedallionCount.SetSelectedIndex(cvarSettings[RSK_RAINBOW_BRIDGE_MEDALLION_COUNT]);
-    BridgeRewardCount.SetSelectedIndex(cvarSettings[RSK_RAINBOW_BRIDGE_REWARD_COUNT]);
-    BridgeDungeonCount.SetSelectedIndex(cvarSettings[RSK_RAINBOW_BRIDGE_DUNGEON_COUNT]);
-    BridgeTokenCount.SetSelectedIndex(cvarSettings[RSK_RAINBOW_BRIDGE_TOKEN_COUNT]);
-    BridgeRewardOptions.SetSelectedIndex(cvarSettings[RSK_BRIDGE_OPTIONS]);
-    if (cvarSettings[RSK_GANONS_TRIALS] == RO_GANONS_TRIALS_RANDOM_NUMBER) {
-        RandomGanonsTrials.SetSelectedIndex(1);
-    } else {
-        RandomGanonsTrials.SetSelectedIndex(0);
-    }
-    if (cvarSettings[RSK_GANONS_TRIALS] == RO_GANONS_TRIALS_SKIP) {
-        GanonsTrialsCount.SetSelectedIndex(0);
-    } else {
-        GanonsTrialsCount.SetSelectedIndex(cvarSettings[RSK_TRIAL_COUNT]);
-    }
-    SetDungeonTypes.SetSelectedIndex(false);
-    if (cvarSettings[RSK_RANDOM_MQ_DUNGEONS] == RO_MQ_DUNGEONS_RANDOM_NUMBER) {
-        MQDungeonCount.SetSelectedIndex(13);
-    } else if (cvarSettings[RSK_RANDOM_MQ_DUNGEONS] == RO_MQ_DUNGEONS_NONE) {
-        MQDungeonCount.SetSelectedIndex(0);
-    } else if (cvarSettings[RSK_RANDOM_MQ_DUNGEONS] == RO_MQ_DUNGEONS_SET_NUMBER) {
-        MQDungeonCount.SetSelectedIndex(cvarSettings[RSK_MQ_DUNGEON_COUNT]);
-    } else if (cvarSettings[RSK_RANDOM_MQ_DUNGEONS] == RO_MQ_DUNGEONS_SELECTION) {
-        SetDungeonTypes.SetSelectedIndex(true);
-        MQDeku.SetSelectedIndex(cvarSettings[RSK_MQ_DEKU_TREE]);
-        MQDodongo.SetSelectedIndex(cvarSettings[RSK_MQ_DODONGOS_CAVERN]);
-        MQJabu.SetSelectedIndex(cvarSettings[RSK_MQ_JABU_JABU]);
-        MQForest.SetSelectedIndex(cvarSettings[RSK_MQ_FOREST_TEMPLE]);
-        MQFire.SetSelectedIndex(cvarSettings[RSK_MQ_FIRE_TEMPLE]);
-        MQWater.SetSelectedIndex(cvarSettings[RSK_MQ_WATER_TEMPLE]);
-        MQSpirit.SetSelectedIndex(cvarSettings[RSK_MQ_SPIRIT_TEMPLE]);
-        MQShadow.SetSelectedIndex(cvarSettings[RSK_MQ_SHADOW_TEMPLE]);
-        MQIceCavern.SetSelectedIndex(cvarSettings[RSK_MQ_ICE_CAVERN]);
-        MQBotW.SetSelectedIndex(cvarSettings[RSK_MQ_BOTTOM_OF_THE_WELL]);
-        MQGTG.SetSelectedIndex(cvarSettings[RSK_MQ_GTG]);
-        MQCastle.SetSelectedIndex(cvarSettings[RSK_MQ_GANONS_CASTLE]);
-    }
-    ShuffleRewards.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_DUNGEON_REWARDS]);
-    ShuffleSongs.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_SONGS]);
-    Tokensanity.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_TOKENS]);
-    Shopsanity.SetSelectedIndex(cvarSettings[RSK_SHOPSANITY]);
-    ShopsanityPrices.SetSelectedIndex(cvarSettings[RSK_SHOPSANITY_PRICES]);
-    ShopsanityPricesAffordable.SetSelectedIndex(cvarSettings[RSK_SHOPSANITY_PRICES_AFFORDABLE]);
-    Scrubsanity.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_SCRUBS]);
-    ShuffleCows.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_COWS]);
-    ShuffleKokiriSword.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_KOKIRI_SWORD]);
-    ShuffleMasterSword.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_MASTER_SWORD]);
-    ShuffleOcarinas.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_OCARINA]);
-
-    // Shuffle Entrances
-    ShuffleEntrances.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_ENTRANCES]);
-    ShuffleDungeonEntrances.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_DUNGEON_ENTRANCES]);
-    ShuffleBossEntrances.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_BOSS_ENTRANCES]);
-    ShuffleOverworldEntrances.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_OVERWORLD_ENTRANCES]);
-    ShuffleInteriorEntrances.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_INTERIOR_ENTRANCES]);
-    ShuffleGrottoEntrances.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_GROTTO_ENTRANCES]);
-    ShuffleOwlDrops.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_OWL_DROPS]);
-    ShuffleWarpSongs.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_WARP_SONGS]);
-    ShuffleOverworldSpawns.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_OVERWORLD_SPAWNS]);
-    MixedEntrancePools.SetSelectedIndex(cvarSettings[RSK_MIXED_ENTRANCE_POOLS]);
-    MixDungeons.SetSelectedIndex(cvarSettings[RSK_MIX_DUNGEON_ENTRANCES]);
-    MixOverworld.SetSelectedIndex(cvarSettings[RSK_MIX_OVERWORLD_ENTRANCES]);
-    MixInteriors.SetSelectedIndex(cvarSettings[RSK_MIX_INTERIOR_ENTRANCES]);
-    MixGrottos.SetSelectedIndex(cvarSettings[RSK_MIX_GROTTO_ENTRANCES]);
-    DecoupleEntrances.SetSelectedIndex(cvarSettings[RSK_DECOUPLED_ENTRANCES]);
-
-    // if we skip child zelda, we start with zelda's letter, and malon starts
-    // at the ranch, so we should *not* shuffle the weird egg
-    if(cvarSettings[RSK_SKIP_CHILD_ZELDA]) {
-      skipChildZelda = true;
-      ShuffleWeirdEgg.SetSelectedIndex(0);
-    } else {
-      skipChildZelda = false;
-      ShuffleWeirdEgg.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_WEIRD_EGG]);
-    }
-    SkipChildStealth.SetSelectedIndex(cvarSettings[RSK_SKIP_CHILD_STEALTH]);
-    
-    ShuffleGerudoToken.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD]);
-    ShuffleFrogSongRupees.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_FROG_SONG_RUPEES]);
-
-    ShuffleAdultTradeQuest.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_ADULT_TRADE]);
-    ShuffleMagicBeans.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_MAGIC_BEANS]);
-    ShuffleMerchants.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_MERCHANTS]);
-
-    // Force 100 GS Shuffle if that's where Ganon's Boss Key is
-    if (cvarSettings[RSK_GANONS_BOSS_KEY] == RO_GANON_BOSS_KEY_KAK_TOKENS) {
-      Shuffle100GSReward.SetSelectedIndex(1);
-    } else {
-      Shuffle100GSReward.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_100_GS_REWARD]);
-    }
-
-    // the  checkbox works because 0 is "Off" and 1 is "Fairy Ocarina"
-    StartingOcarina.SetSelectedIndex(cvarSettings[RSK_STARTING_OCARINA]);
-    
-    // the checkboxes work because 0 is "Off" and 1 is "On"
-    StartingDekuShield.SetSelectedIndex(cvarSettings[RSK_STARTING_DEKU_SHIELD]);
-    StartingKokiriSword.SetSelectedIndex(cvarSettings[RSK_STARTING_KOKIRI_SWORD]);
-
-    StartingSkulltulaToken.SetSelectedIndex(cvarSettings[RSK_STARTING_SKULLTULA_TOKEN]);
-
-    MapsAndCompasses.SetSelectedIndex(cvarSettings[RSK_STARTING_MAPS_COMPASSES]);
-
-    StartingZeldasLullaby.SetSelectedIndex(cvarSettings[RSK_STARTING_ZELDAS_LULLABY]);
-    StartingEponasSong.SetSelectedIndex(cvarSettings[RSK_STARTING_EPONAS_SONG]);
-    StartingSariasSong.SetSelectedIndex(cvarSettings[RSK_STARTING_SARIAS_SONG]);
-    StartingSunsSong.SetSelectedIndex(cvarSettings[RSK_STARTING_SUNS_SONG]);
-    StartingSongOfTime.SetSelectedIndex(cvarSettings[RSK_STARTING_SONG_OF_TIME]);
-    StartingSongOfStorms.SetSelectedIndex(cvarSettings[RSK_STARTING_SONG_OF_STORMS]);
-    StartingMinuetOfForest.SetSelectedIndex(cvarSettings[RSK_STARTING_MINUET_OF_FOREST]);
-    StartingBoleroOfFire.SetSelectedIndex(cvarSettings[RSK_STARTING_BOLERO_OF_FIRE]);
-    StartingSerenadeOfWater.SetSelectedIndex(cvarSettings[RSK_STARTING_SERENADE_OF_WATER]);
-    StartingRequiemOfSpirit.SetSelectedIndex(cvarSettings[RSK_STARTING_REQUIEM_OF_SPIRIT]);
-    StartingNocturneOfShadow.SetSelectedIndex(cvarSettings[RSK_STARTING_NOCTURNE_OF_SHADOW]);
-    StartingPreludeOfLight.SetSelectedIndex(cvarSettings[RSK_STARTING_PRELUDE_OF_LIGHT]);
-
-    // RANDOTODO: Implement disabling ammo drops. Currently only "On" (index 0) or "On + Bombchus" (index 1) is implemented.
-    AmmoDrops.SetSelectedIndex(cvarSettings[RSK_ENABLE_BOMBCHU_DROPS]);
-
-    BombchusInLogic.SetSelectedIndex(cvarSettings[RSK_BOMBCHUS_IN_LOGIC]);
-
-    StartingConsumables.SetSelectedIndex(cvarSettings[RSK_STARTING_CONSUMABLES]);
-    StartingMaxRupees.SetSelectedIndex(cvarSettings[RSK_FULL_WALLETS]);
-    
-    GossipStoneHints.SetSelectedIndex(cvarSettings[RSK_GOSSIP_STONE_HINTS]);
-    ClearerHints.SetSelectedIndex(cvarSettings[RSK_HINT_CLARITY]);
-    AltarHintText.SetSelectedIndex(cvarSettings[RSK_TOT_ALTAR_HINT]);
-    LightArrowHintText.SetSelectedIndex(cvarSettings[RSK_LIGHT_ARROWS_HINT]);
-    DampeHintText.SetSelectedIndex(cvarSettings[RSK_DAMPES_DIARY_HINT]);
-    GregHintText.SetSelectedIndex(cvarSettings[RSK_GREG_HINT]);
-    SariaHintText.SetSelectedIndex(cvarSettings[RSK_SARIA_HINT]);
-    FrogsHintText.SetSelectedIndex(cvarSettings[RSK_FROGS_HINT]);
-    WarpSongHints.SetSelectedIndex(cvarSettings[RSK_WARP_SONG_HINTS]);
-    Kak10GSHintText.SetSelectedIndex(cvarSettings[RSK_KAK_10_SKULLS_HINT]);
-    Kak20GSHintText.SetSelectedIndex(cvarSettings[RSK_KAK_20_SKULLS_HINT]);
-    Kak30GSHintText.SetSelectedIndex(cvarSettings[RSK_KAK_30_SKULLS_HINT]);
-    Kak40GSHintText.SetSelectedIndex(cvarSettings[RSK_KAK_40_SKULLS_HINT]);
-    Kak50GSHintText.SetSelectedIndex(cvarSettings[RSK_KAK_50_SKULLS_HINT]);
-    ScrubHintText.SetSelectedIndex(cvarSettings[RSK_SCRUB_TEXT_HINT]);
-    HintDistribution.SetSelectedIndex(cvarSettings[RSK_HINT_DISTRIBUTION]);
-    BlueFireArrows.SetSelectedIndex(cvarSettings[RSK_BLUE_FIRE_ARROWS]);
-    SunlightArrows.SetSelectedIndex(cvarSettings[RSK_SUNLIGHT_ARROWS]);
-
-    ItemPoolValue.SetSelectedIndex(cvarSettings[RSK_ITEM_POOL]);
-    IceTrapValue.SetSelectedIndex(cvarSettings[RSK_ICE_TRAPS]);
-
-    Keysanity.SetSelectedIndex(cvarSettings[RSK_KEYSANITY]);
-    GerudoKeys.SetSelectedIndex(cvarSettings[RSK_GERUDO_KEYS]);
-    BossKeysanity.SetSelectedIndex(cvarSettings[RSK_BOSS_KEYSANITY]);
-    if (cvarSettings[RSK_TRIFORCE_HUNT]) {
-      GanonsBossKey.SetSelectedIndex(RO_GANON_BOSS_KEY_TRIFORCE_HUNT);
-    } else {
-      GanonsBossKey.SetSelectedIndex(cvarSettings[RSK_GANONS_BOSS_KEY]);
-    }
-    LACSStoneCount.SetSelectedIndex(cvarSettings[RSK_LACS_STONE_COUNT]);
-    LACSMedallionCount.SetSelectedIndex(cvarSettings[RSK_LACS_MEDALLION_COUNT]);
-    LACSRewardCount.SetSelectedIndex(cvarSettings[RSK_LACS_REWARD_COUNT]);
-    LACSDungeonCount.SetSelectedIndex(cvarSettings[RSK_LACS_DUNGEON_COUNT]);
-    LACSTokenCount.SetSelectedIndex(cvarSettings[RSK_LACS_TOKEN_COUNT]);
-    LACSRewardOptions.SetSelectedIndex(cvarSettings[RSK_LACS_OPTIONS]);
-
-    KeyRings.SetSelectedIndex(cvarSettings[RSK_KEYRINGS]);
-    KeyRingsRandomCount.SetSelectedIndex(cvarSettings[RSK_KEYRINGS_RANDOM_COUNT]);
-    RingFortress.SetSelectedIndex(cvarSettings[RSK_KEYRINGS_GERUDO_FORTRESS]);
-    RingForest.SetSelectedIndex(cvarSettings[RSK_KEYRINGS_FOREST_TEMPLE]);
-    RingFire.SetSelectedIndex(cvarSettings[RSK_KEYRINGS_FIRE_TEMPLE]);
-    RingWater.SetSelectedIndex(cvarSettings[RSK_KEYRINGS_WATER_TEMPLE]);
-    RingSpirit.SetSelectedIndex(cvarSettings[RSK_KEYRINGS_SPIRIT_TEMPLE]);
-    RingShadow.SetSelectedIndex(cvarSettings[RSK_KEYRINGS_SHADOW_TEMPLE]);
-    RingWell.SetSelectedIndex(cvarSettings[RSK_KEYRINGS_BOTTOM_OF_THE_WELL]);
-    RingGtg.SetSelectedIndex(cvarSettings[RSK_KEYRINGS_GTG]);
-    RingCastle.SetSelectedIndex(cvarSettings[RSK_KEYRINGS_GANONS_CASTLE]);
-
-    NumRequiredCuccos.SetSelectedIndex(cvarSettings[RSK_CUCCO_COUNT]);
-    BigPoeTargetCount.SetSelectedIndex(cvarSettings[RSK_BIG_POE_COUNT]-1);
-
-    SkipEponaRace.SetSelectedIndex(cvarSettings[RSK_SKIP_EPONA_RACE]);
-
-    SkipTowerEscape.SetSelectedIndex(cvarSettings[RSK_SKIP_TOWER_ESCAPE]);
-
-    CompleteMaskQuest.SetSelectedIndex(cvarSettings[RSK_COMPLETE_MASK_QUEST]);
-
-    FreeScarecrow.SetSelectedIndex(cvarSettings[RSK_SKIP_SCARECROWS_SONG]);
-
-    EnableGlitchCutscenes.SetSelectedIndex(cvarSettings[RSK_ENABLE_GLITCH_CUTSCENES]);
-
-    NightGSExpectSuns.SetSelectedIndex(cvarSettings[RSK_SKULLS_SUNS_SONG]);
-
-    LinksPocketItem.SetSelectedIndex(cvarSettings[RSK_LINKS_POCKET]);
-
-    // RANDOTODO implement chest shuffle with keysanity
-    // ShuffleChestMinigame.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_CHEST_MINIGAME]);
-
-    RandomizeAllSettings(true); //now select any random options instead of just hiding them
-
-    //shuffle the dungeons and then set MQ for as many as necessary
-    auto dungeons = dungeonList;
-    if (SetDungeonTypes) {
-      MQSet = MQDungeonCount.Value<uint8_t>();
-      uint8_t dungeonCount = 0;
-      std::vector<uint8_t> randMQOption = {};
-
-      for (size_t i = 0; i < dungeons.size(); i++) {
-        dungeons[i]->ClearMQ();
-        // Dungeon mode assumed known at first
-        DungeonModesKnown[i] = true;
-
-        switch (dungeonOptions[i]->Value<uint8_t>()) {
-          case 1:
-            // Set MQ dungeons and track how many have been set
-            dungeons[i]->SetMQ();
-            dungeonCount++;
-            break;
-          case 2:
-            // Track indexes of dungeons set to random
-            randMQOption.push_back(i);
-            // Dungeon mode will be unknown for this dungeon
-            DungeonModesKnown[i] = false;
-            break;
-        }
-      }
-
-      // Add more MQ dungeons from the pool set to random until the MQ dungeon count is reached
-      Shuffle(randMQOption);
-
-      if (MQSet == 13) {
-        MQSet = dungeonCount + Random(0, randMQOption.size() + 1);
-      }
-
-      for (uint8_t i = 0; dungeonCount < MQSet; i++) {
-        dungeons[randMQOption[i]]->SetMQ();
-        dungeonCount++;
-      }
-    } else {
-      Shuffle(dungeons);
-      MQSet = MQDungeonCount.Value<uint8_t>();
-
-      //Clear MQ dungeons
-      for (size_t i = 0; i < dungeons.size(); i++) {
-        dungeons[i]->ClearMQ();
-      }
-
-      // If we won't be randomly choosing any MQ dungeons, or if we'll be setting
-      // all dungeons to MQ, dungeon modes are assumed known
-      bool allDungeonModesKnown = MQSet == 0 || MQSet == dungeons.size();
-      for (uint8_t i = 0; i < sizeof(DungeonModesKnown); ++i) {
-        DungeonModesKnown[i] = allDungeonModesKnown;
-      }
-
-      //Set appropriate amount of MQ dungeons
-      if (MQSet == 13) {
-        MQSet = Random(0, 13);
-      }
-      for (uint8_t i = 0; i < MQSet; i++) {
-        dungeons[i]->SetMQ();
-      }
-    }
-
-    TriforceHunt.SetSelectedIndex(cvarSettings[RSK_TRIFORCE_HUNT]);
-    TriforceHuntTotal.SetSelectedIndex(cvarSettings[RSK_TRIFORCE_HUNT_PIECES_TOTAL]);
-    TriforceHuntRequired.SetSelectedIndex(cvarSettings[RSK_TRIFORCE_HUNT_PIECES_REQUIRED]);
-
-    //Set key ring for each dungeon
-    for (size_t i = 0; i < dungeons.size(); i++) {
-      dungeons[i]->ClearKeyRing();
-    }
-    if (KeyRings) {
-      // Random Key Rings
-      if (KeyRings.Is(KEYRINGS_RANDOM) || KeyRings.Is(KEYRINGS_RANDOM_COUNT)) {
-        auto keyRings = keyRingOptions;
-        if (GerudoFortress.Is(GERUDOFORTRESS_NORMAL) && GerudoKeys.IsNot(GERUDOKEYS_VANILLA)) {
-          keyRings.push_back(&RingFortress);
-        }
-        int keyRingCount = KeyRings.Is(KEYRINGS_RANDOM_COUNT) ? KeyRingsRandomCount.Value<uint8_t>() : Random(0, keyRings.size());
-        Shuffle(keyRings);
-        for (size_t i = 0; i < keyRingCount; i++) {
-          keyRings[i]->SetSelectedIndex(ON);
-        }
-      }
-      if (RingWell) {
-        BottomOfTheWell.SetKeyRing();
-      }
-      if (RingForest) {
-        ForestTemple.SetKeyRing();
-      }
-      if (RingFire) {
-        FireTemple.SetKeyRing();
-      }
-      if (RingWater) {
-        WaterTemple.SetKeyRing();
-      }
-      if (RingSpirit) {
-        SpiritTemple.SetKeyRing();
-      }
-      if (RingShadow) {
-        ShadowTemple.SetKeyRing();
-      }
-      if (RingGtg) {
-        GerudoTrainingGrounds.SetKeyRing();
-      }
-      if (RingCastle) {
-        GanonsCastle.SetKeyRing();
-      }
-    }
-
-    //shuffle the trials then require the amount set in GanonsTrialsCount
-    auto trials = trialList;
-    Shuffle(trials);
-
-    //clear required trials
-    for (auto& trial : trials) {
-      trial->SetAsSkipped();
-    }
-
-    //Set appropriate amount of required trials
-    if (RandomGanonsTrials) {
-      GanonsTrialsCount.SetSelectedIndex(Random(0, GanonsTrialsCount.GetOptionCount()));
-    }
-    for (uint8_t i = 0; i < GanonsTrialsCount.Value<uint8_t>(); i++) {
-      trials[i]->SetAsRequired();
-    }
-
-    // If any ER option is on that would allow you to escape forest, then we should set closed forest to closed deku
-    if (OpenForest.Is(OPENFOREST_CLOSED) &&
-        (ShuffleInteriorEntrances.Is(SHUFFLEINTERIORS_ALL) || ShuffleOverworldEntrances || ShuffleOverworldSpawns ||
-         DecoupleEntrances || MixedEntrancePools)) {
-        OpenForest.SetSelectedIndex(OPENFOREST_CLOSED_DEKU);
-    }
-
-    if (StartingAge.Is(AGE_RANDOM)) {
-      int choice = Random(0, 2); //50% chance of each
-      if (choice == 0) {
-        ResolvedStartingAge = AGE_CHILD;
-        StartingAge.SetSelectedIndex(AGE_CHILD);
-      }
-      else {
-        ResolvedStartingAge = AGE_ADULT;
-        StartingAge.SetSelectedIndex(AGE_ADULT);
-      }
-    }
-    else {
-      ResolvedStartingAge = StartingAge.Value<uint8_t>();
-    }
-
-    HasNightStart = StartingTime.Is(STARTINGTIME_NIGHT);
-
-    if (GanonsBossKey.Is(GANONSBOSSKEY_LACS_STONES)) {
-      LACSCondition = LACSCONDITION_STONES;
-    } else if (GanonsBossKey.Is(GANONSBOSSKEY_LACS_MEDALLIONS)) {
-      LACSCondition = LACSCONDITION_MEDALLIONS;
-    } else if (GanonsBossKey.Is(GANONSBOSSKEY_LACS_REWARDS)) {
-      LACSCondition = LACSCONDITION_REWARDS;
-    } else if (GanonsBossKey.Is(GANONSBOSSKEY_LACS_DUNGEONS)) {
-      LACSCondition = LACSCONDITION_DUNGEONS;
-    } else if (GanonsBossKey.Is(GANONSBOSSKEY_LACS_TOKENS)) {
-      LACSCondition = LACSCONDITION_TOKENS;
-    } else {
-      LACSCondition = LACSCONDITION_VANILLA;
-    }
-
-    //If vanilla logic, we want to set all settings which unnecessarily modify vanilla behavior to off
-    if (Logic.Is(LOGIC_VANILLA)) {
-      for (Option* setting : vanillaLogicDefaults) {
-        setting->SetDelayedOption();
-        setting->SetSelectedIndex(0);
-      }
-      Keysanity.SetDelayedOption();
-      Keysanity.SetSelectedIndex(3); //Set small keys to any dungeon so FiT basement door will be locked
-    }
-  }
-
-  //If this is an option menu, return the options
-  //Else, recursively call each sub menu of this sub menu
-  const std::vector<Menu*> GetMenusRecursive(Menu* menu) {
-    std::vector<Menu*> menus;
-    if (menu->mode == OPTION_SUB_MENU) {
-      menus.push_back(menu);
-    } else if (menu->mode == SUB_MENU) {
-        for (Menu* subMenu : *menu->itemsList) {
-          std::vector<Menu*> foundMenus = GetMenusRecursive(subMenu);
-          menus.insert(menus.end(), foundMenus.begin(), foundMenus.end());
-        }
-    }
-    return menus;
-  }
-
-  //Recursively look through each menu from the main menu to get all settings
-  const std::vector<Menu*> GetAllOptionMenus() {
-    std::vector<Menu*> allMenus;
-    for (Menu* menu : Settings::mainMenu) {
-      std::vector<Menu*> foundMenus = GetMenusRecursive(menu);
-      allMenus.insert(allMenus.end(), foundMenus.begin(), foundMenus.end());
-    }
-    return allMenus;
-  }
-
-} // namespace Settings
diff --git a/soh/soh/Enhancements/randomizer/3drando/settings.hpp b/soh/soh/Enhancements/randomizer/3drando/settings.hpp
deleted file mode 100644
index 97dac8c26..000000000
--- a/soh/soh/Enhancements/randomizer/3drando/settings.hpp
+++ /dev/null
@@ -1,1179 +0,0 @@
-#pragma once
-
-#include <array>
-#include <algorithm>
-#include <cstdlib>
-#include <string>
-#include <string_view>
-#include <type_traits>
-#include <variant>
-#include <vector>
-
-#include "category.hpp"
-#include "menu.hpp"
-#include "pool_functions.hpp"
-
-typedef enum {
-    OFF,
-    ON,
-} BooleanSetting;
-
-typedef enum {
-    DONT_SKIP,
-    SKIP,
-} SkipSetting;
-
-typedef enum {
-    LOGIC_GLITCHLESS,
-    LOGIC_GLITCHED,
-    LOGIC_NONE,
-    LOGIC_VANILLA,
-} LogicSetting;
-
-typedef enum {
-    OPENFOREST_CLOSED,
-    OPENFOREST_CLOSED_DEKU,
-    OPENFOREST_OPEN,
-} OpenForestSetting;
-
-typedef enum {
-    OPENKAKARIKO_CLOSED,
-    OPENKAKARIKO_OPEN,
-} OpenKakarikoSetting;
-
-typedef enum {
-    OPENDOOROFTIME_CLOSED,
-    OPENDOOROFTIME_SONGONLY,
-    OPENDOOROFTIME_OPEN,
-} OpenDoorOfTimeSetting;
-
-typedef enum {
-    ZORASFOUNTAIN_NORMAL,
-    ZORASFOUNTAIN_ADULT,
-    ZORASFOUNTAIN_OPEN,
-} ZorasFountainSetting;
-
-typedef enum {
-    GERUDOFORTRESS_NORMAL,
-    GERUDOFORTRESS_FAST,
-    GERUDOFORTRESS_OPEN,
-} GerudoFortressSetting;
-
-typedef enum {
-    RAINBOWBRIDGE_VANILLA,
-    RAINBOWBRIDGE_OPEN,
-    RAINBOWBRIDGE_STONES,
-    RAINBOWBRIDGE_MEDALLIONS,
-    RAINBOWBRIDGE_REWARDS,
-    RAINBOWBRIDGE_DUNGEONS,
-    RAINBOWBRIDGE_TOKENS,
-    RAINBOWBRIDGE_GREG,
-} RainbowBridgeSetting;
-
-typedef enum {
-    BRIDGE_OPTION_STANDARD,
-    BRIDGE_OPTION_GREG,
-    BRIDGE_OPTION_WILDCARD,
-} BridgeRewardOptionsSetting;
-
-typedef enum {
-    LACSCONDITION_VANILLA,
-    LACSCONDITION_STONES,
-    LACSCONDITION_MEDALLIONS,
-    LACSCONDITION_REWARDS,
-    LACSCONDITION_DUNGEONS,
-    LACSCONDITION_TOKENS,
-} LACSConditionSetting;
-
-typedef enum {
-    LACS_OPTION_STANDARD,
-    LACS_OPTION_GREG,
-    LACS_OPTION_WILDCARD,
-} LACSRewardOptionsSetting;
-
-typedef enum {
-    TRIFORCE_HUNT_OFF,
-    TRIFORCE_HUNT_ON,
-} TriforceHuntSetting;
-
-typedef enum {
-    AGE_CHILD,
-    AGE_ADULT,
-    AGE_RANDOM,
-} AgeSetting;
-
-typedef enum {
-    SHUFFLEDUNGEONS_OFF,
-    SHUFFLEDUNGEONS_ON,
-    SHUFFLEDUNGEONS_GANON,
-} ShuffleDungeonEntrancesSetting;
-
-typedef enum {
-    SHUFFLEBOSSES_OFF,
-    SHUFFLEBOSSES_AGE_RESTRICTED,
-    SHUFFLEBOSSES_FULL,
-} ShuffleBossEntrancesSetting;
-
-typedef enum {
-    SHUFFLEINTERIORS_OFF,
-    SHUFFLEINTERIORS_SIMPLE,
-    SHUFFLEINTERIORS_ALL,
-} ShuffleInteriorEntrancesSetting;
-
-typedef enum {
-    AMMODROPS_VANILLA,
-    AMMODROPS_BOMBCHU,
-    AMMODROPS_NONE,
-} AmmoDropsSetting;
-
-typedef enum {
-    HEARTDROPREFILL_VANILLA,
-    HEARTDROPREFILL_NODROP,
-    HEARTDROPREFILL_NOREFILL,
-    HEARTDROPREFILL_NODROPREFILL,
-} HeartDropRefillSetting;
-
-typedef enum {
-    DUNGEONMODE_VANILLA,
-    DUNGEONMODE_MQ,
-} DungeonMode;
-
-typedef enum {
-    REWARDSHUFFLE_END_OF_DUNGEON,
-    REWARDSHUFFLE_ANY_DUNGEON,
-    REWARDSHUFFLE_OVERWORLD,
-    REWARDSHUFFLE_ANYWHERE,
-} RewardShuffleSetting;
-
-typedef enum {
-    LINKSPOCKETITEM_DUNGEON_REWARD,
-    LINKSPOCKETITEM_ADVANCEMENT,
-    LINKSPOCKETITEM_ANYTHING,
-    LINKSPOCKETITEM_NOTHING,
-} LinksPocketSetting;
-
-typedef enum {
-    SONGSHUFFLE_SONG_LOCATIONS,
-    SONGSHUFFLE_DUNGEON_REWARDS,
-    SONGSHUFFLE_ANYWHERE,
-} SongShuffleSetting;
-
-typedef enum {
-    SHOPSANITY_OFF,
-    SHOPSANITY_ZERO,
-    SHOPSANITY_ONE,
-    SHOPSANITY_TWO,
-    SHOPSANITY_THREE,
-    SHOPSANITY_FOUR,
-    SHOPSANITY_RANDOM,
-} ShopsanitySetting;
-
-typedef enum {
-    TOKENSANITY_OFF,
-    TOKENSANITY_DUNGEONS,
-    TOKENSANITY_OVERWORLD,
-    TOKENSANITY_ALL_TOKENS,
-} TokensanitySetting;
-
-typedef enum {
-    SCRUBSANITY_OFF,
-    SCRUBSANITY_AFFORDABLE,
-    SCRUBSANITY_EXPENSIVE,
-    SCRUBSANITY_RANDOM_PRICES,
-} ScrubsanitySetting;
-
-typedef enum {
-    SHUFFLEMERCHANTS_OFF,
-    SHUFFLEMERCHANTS_NO_HINTS,
-    SHUFFLEMERCHANTS_HINTS,
-} ShuffleMerchantsSetting;
-
-typedef enum {
-    SHUFFLEADULTTRADEQUEST_OFF,
-    SHUFFLEADULTTRADEQUEST_ON,
-} ShuffleAdultTradeQuestSetting;
-
-typedef enum {
-    SHUFFLECHESTMINIGAME_OFF,
-    SHUFFLECHESTMINIGAME_SINGLE_KEYS,
-    SHUFFLECHESTMINIGAME_PACK,
-} ShuffleChestMinigameSetting;
-
-typedef enum {
-    MAPSANDCOMPASSES_START_WITH,
-    MAPSANDCOMPASSES_VANILLA,
-    MAPSANDCOMPASSES_OWN_DUNGEON,
-    MAPSANDCOMPASSES_ANY_DUNGEON,
-    MAPSANDCOMPASSES_OVERWORLD,
-    MAPSANDCOMPASSES_ANYWHERE,
-} MapsAndCompassesSetting;
-
-typedef enum {
-    KEYSANITY_START_WITH,
-    KEYSANITY_VANILLA,
-    KEYSANITY_OWN_DUNGEON,
-    KEYSANITY_ANY_DUNGEON,
-    KEYSANITY_OVERWORLD,
-    KEYSANITY_ANYWHERE,
-} KeysanitySetting;
-
-typedef enum {
-    GERUDOKEYS_VANILLA,
-    GERUDOKEYS_ANY_DUNGEON,
-    GERUDOKEYS_OVERWORLD,
-    GERUDOKEYS_ANYWHERE,
-} GerudoKeysSetting;
-
-typedef enum {
-    KEYRINGS_OFF,
-    KEYRINGS_RANDOM,
-    KEYRINGS_RANDOM_COUNT,
-    KEYRINGS_SELECTION,
-} KeyRingsSetting;
-
-typedef enum {
-    BOSSKEYSANITY_START_WITH,
-    BOSSKEYSANITY_VANILLA,
-    BOSSKEYSANITY_OWN_DUNGEON,
-    BOSSKEYSANITY_ANY_DUNGEON,
-    BOSSKEYSANITY_OVERWORLD,
-    BOSSKEYSANITY_ANYWHERE,
-} BossKeysanitySetting;
-
-typedef enum {
-    GANONSBOSSKEY_VANILLA,
-    GANONSBOSSKEY_OWN_DUNGEON,
-    GANONSBOSSKEY_START_WITH,
-    GANONSBOSSKEY_ANY_DUNGEON,
-    GANONSBOSSKEY_OVERWORLD,
-    GANONSBOSSKEY_ANYWHERE,
-    GANONSBOSSKEY_LACS_VANILLA,
-    GANONSBOSSKEY_LACS_STONES,
-    GANONSBOSSKEY_LACS_MEDALLIONS,
-    GANONSBOSSKEY_LACS_REWARDS,
-    GANONSBOSSKEY_LACS_DUNGEONS,
-    GANONSBOSSKEY_LACS_TOKENS,
-    GANONSBOSSKEY_FINAL_GS_REWARD,
-    GANONSBOSSKEY_TRIFORCE_HUNT,
-} GanonsBossKeySetting;
-
-typedef enum {
-    QUICKTEXT_VANILLA,
-    QUICKTEXT_SKIPPABLE,
-    QUICKTEXT_INSTANT,
-    QUICKTEXT_TURBO,
-} QuickTextSetting;
-
-typedef enum {
-    SONGREPLAYS_DONT_SKIP,
-    SONGREPLAYS_SKIP_NO_SFX,
-    SONGREPLAYS_SKIP_KEEP_SFX,
-} SkipSongReplaysSetting;
-
-typedef enum {
-    INCLUDE,
-    EXCLUDE,
-} ExcludeLocationSetting;
-
-typedef enum {
-    STARTINGINVENTORY_NONE,
-} StartingInventorySetting;
-
-typedef enum {
-    TRICK_DISABLED,
-    TRICK_ENABLED,
-} LogicTrickSetting;
-
-typedef enum {
-    HINTMODE_OBSCURE,
-    HINTMODE_AMBIGUOUS,
-    HINTMODE_CLEAR,
-} HintModeSetting;
-
-typedef enum {
-    DAMAGEMULTIPLIER_HALF,
-    DAMAGEMULTIPLIER_DEFAULT,
-    DAMAGEMULTIPLIER_DOUBLE,
-    DAMAGEMULTIPLIER_QUADRUPLE,
-    DAMAGEMULTIPLIER_OCTUPLE,
-    DAMAGEMULTIPLIER_SEXDECUPLE,
-    DAMAGEMULTIPLIER_OHKO,
-} DamageMultiplierSetting;
-
-typedef enum {
-    STARTINGTIME_DAY,
-    STARTINGTIME_NIGHT,
-} StartingTimeSetting;
-
-typedef enum {
-    HINTS_NO_HINTS,
-    HINTS_NEED_NOTHING,
-    HINTS_MASK_OF_TRUTH,
-    HINTS_STONE_OF_AGONY,
-} GossipStoneHintsSetting;
-
-typedef enum {
-    ITEMPOOL_PLENTIFUL,
-    ITEMPOOL_BALANCED,
-    ITEMPOOL_SCARCE,
-    ITEMPOOL_MINIMAL,
-} ItemPoolSetting;
-
-typedef enum {
-    ICETRAPS_OFF,
-    ICETRAPS_NORMAL,
-    ICETRAPS_EXTRA,
-    ICETRAPS_MAYHEM,
-    ICETRAPS_ONSLAUGHT,
-} IceTrapSetting;
-
-typedef enum {
-    GKDURABILITY_VANILLA,
-    GKDURABILITY_RANDOMRISK,
-    GKDURABILITY_RANDOMSAFE,
-} GkDurabilitySetting;
-
-typedef enum {
-    STARTINGBOTTLE_NONE,
-    STARTINGBOTTLE_EMPTY_BOTTLE,
-    STARTINGBOTTLE_RED_POTION,
-    STARTINGBOTTLE_GREEN_POTION,
-    STARTINGBOTTLE_BLUE_POTION,
-    STARTINGBOTTLE_FAIRY,
-    STARTINGBOTTLE_FISH,
-    STARTINGBOTTLE_MILK,
-    STARTINGBOTTLE_BLUE_FIRE,
-    STARTINGBOTTLE_BUGS,
-    STARTINGBOTTLE_BIG_POE,
-    STARTINGBOTTLE_HALF_MILK,
-    STARTINGBOTTLE_POE,
-} StartingBottleSetting;
-
-typedef enum {
-    STARTINGBGS_NONE,
-    STARTINGBGS_GIANTS_KNIFE,
-    STARTINGBGS_BIGGORON_SWORD,
-} StartingBiggoronSwordSetting;
-
-typedef enum {
-    DUNGEON_NEITHER,
-    DUNGEON_BARREN,
-    DUNGEON_WOTH,
-} DungeonInfo;
-
-typedef struct {
-    uint8_t hashIndexes[5];
-
-    uint8_t logic;
-    uint8_t openForest;
-    uint8_t openKakariko;
-    uint8_t openDoorOfTime;
-    uint8_t zorasFountain;
-    uint8_t gerudoFortress;
-    uint8_t rainbowBridge;
-    uint8_t bridgeStoneCount;
-    uint8_t bridgeMedallionCount;
-    uint8_t bridgeRewardCount;
-    uint8_t bridgeDungeonCount;
-    uint8_t bridgeTokenCount;
-    uint8_t bridgeRewardOptions;
-    uint8_t randomGanonsTrials;
-    uint8_t ganonsTrialsCount;
-
-    uint8_t startingAge;
-    uint8_t resolvedStartingAge;
-    uint8_t shuffleDungeonEntrances;
-    uint8_t shuffleBossEntrances;
-    uint8_t shuffleOverworldEntrances;
-    uint8_t shuffleInteriorEntrances;
-    uint8_t shuffleGrottoEntrances;
-    uint8_t shuffleOwlDrops;
-    uint8_t shuffleWarpSongs;
-    uint8_t shuffleOverworldSpawns;
-    uint8_t mixedEntrancePools;
-    uint8_t mixDungeons;
-    uint8_t mixOverworld;
-    uint8_t mixInteriors;
-    uint8_t mixGrottos;
-    uint8_t decoupleEntrances;
-    uint8_t bombchusInLogic;
-    uint8_t ammoDrops;
-    uint8_t heartDropRefill;
-    uint8_t randomMQDungeons;
-    uint8_t mqDungeonCount;
-    uint8_t dungeonModesKnown[12]; // 12 dungeons which can be set Vanilla or MQ
-
-    uint8_t shuffleRewards;
-    uint8_t linksPocketItem;
-    uint8_t shuffleSongs;
-    uint8_t tokensanity;
-    uint8_t scrubsanity;
-    uint8_t shopsanity;
-    uint8_t shopsanityPrices;
-    uint8_t shuffleCows;
-    uint8_t shuffleKokiriSword;
-    uint8_t shuffleOcarinas;
-    uint8_t shuffleWeirdEgg;
-    uint8_t shuffleGerudoToken;
-    uint8_t shuffleMagicBeans;
-    uint8_t shuffleMerchants;
-    uint8_t shuffleFrogSongRupees;
-    uint8_t shuffleAdultTradeQuest;
-    uint8_t shuffleChestMinigame;
-    uint8_t shuffle100GsReward;
-
-    uint8_t mapsAndCompasses;
-    uint8_t keysanity;
-    uint8_t gerudoKeys;
-    uint8_t bossKeysanity;
-    uint8_t ganonsBossKey;
-    uint8_t lacsCondition;
-    uint8_t lacsStoneCount;
-    uint8_t lacsMedallionCount;
-    uint8_t lacsRewardCount;
-    uint8_t lacsDungeonCount;
-    uint8_t lacsTokenCount;
-    uint8_t lacsRewardOptions;
-
-    uint8_t ringFortress;
-    uint8_t ringForest;
-    uint8_t ringFire;
-    uint8_t ringWater;
-    uint8_t ringSpirit;
-    uint8_t ringShadow;
-    uint8_t ringWell;
-    uint8_t ringGtg;
-    uint8_t ringCastle;
-
-    uint8_t skipChildStealth;
-    uint8_t skipTowerEscape;
-    uint8_t skipEponaRace;
-    uint8_t skipMinigamePhases;
-    uint8_t freeScarecrow;
-    uint8_t fourPoesCutscene;
-    uint8_t lakeHyliaOwl;
-    uint8_t bigPoeTargetCount;
-    uint8_t numRequiredCuccos;
-    uint8_t kingZoraSpeed;
-    uint8_t completeMaskQuest;
-    uint8_t enableGlitchCutscenes;
-    uint8_t quickText;
-    uint8_t skipSongReplays;
-    uint8_t keepFWWarpPoint;
-    uint8_t fastBunnyHood;
-
-    uint8_t damageMultiplier;
-    uint8_t startingTime;
-    uint8_t gossipStoneHints;
-    uint8_t compassesShowReward;
-    uint8_t compassesShowWotH;
-    uint8_t mapsShowDungeonMode;
-    uint8_t chestAnimations;
-    uint8_t chestSize;
-    uint8_t generateSpoilerLog;
-    uint8_t ingameSpoilers;
-    uint8_t randomTrapDmg;
-    uint8_t blueFireArrows;
-    uint8_t sunLightArrows;
-
-    uint8_t faroresWindAnywhere;
-    uint8_t stickAsAdult;
-    uint8_t boomerangAsAdult;
-    uint8_t hammerAsChild;
-    uint8_t slingshotAsAdult;
-    uint8_t bowAsChild;
-    uint8_t hookshotAsChild;
-    uint8_t ironbootsAsChild;
-    uint8_t hoverbootsAsChild;
-    uint8_t masksAsAdult;
-    uint8_t kokiriSwordAsAdult;
-    uint8_t masterSwordAsChild;
-    uint8_t biggoronSwordAsChild;
-    uint8_t dekuShieldAsAdult;
-    uint8_t mirrorShieldAsChild;
-    uint8_t goronTunicAsChild;
-    uint8_t zoraTunicAsChild;
-    uint8_t gkDurability;
-
-    uint8_t itemPoolValue;
-    uint8_t iceTrapValue;
-    uint8_t progressiveGoronSword;
-
-    union {
-        uint8_t dungeonModes[12];
-        struct {
-            uint8_t dekuTreeDungeonMode;
-            uint8_t dodongosCavernDungeonMode;
-            uint8_t jabuJabusBellyDungeonMode;
-            uint8_t forestTempleDungeonMode;
-            uint8_t fireTempleDungeonMode;
-            uint8_t waterTempleDungeonMode;
-            uint8_t spiritTempleDungeonMode;
-            uint8_t shadowTempleDungeonMode;
-            uint8_t bottomOfTheWellDungeonMode;
-            uint8_t iceCavernDungeonMode;
-            uint8_t ganonsCastleDungeonMode;
-            uint8_t gerudoTrainingGroundsDungeonMode;
-        };
-    };
-
-    uint8_t forestTrialSkip;
-    uint8_t fireTrialSkip;
-    uint8_t waterTrialSkip;
-    uint8_t spiritTrialSkip;
-    uint8_t shadowTrialSkip;
-    uint8_t lightTrialSkip;
-
-    uint32_t linksPocketRewardBitMask;
-
-    uint8_t startingConsumables;
-    uint8_t startingMaxRupees;
-    uint8_t startingStickCapacity;
-    uint8_t startingNutCapacity;
-    uint8_t startingBombBag;
-    uint8_t startingBombchus;
-    uint8_t startingBow;
-    uint8_t startingFireArrows;
-    uint8_t startingIceArrows;
-    uint8_t startingLightArrows;
-    uint8_t startingDinsFire;
-    uint8_t startingFaroresWind;
-    uint8_t startingNayrusLove;
-    uint8_t startingSlingshot;
-    uint8_t startingBoomerang;
-    uint8_t startingLensOfTruth;
-    uint8_t startingMagicBean;
-    uint8_t startingMegatonHammer;
-    uint8_t startingHookshot;
-    uint8_t startingIronBoots;
-    uint8_t startingHoverBoots;
-    uint8_t startingBottle1;
-    uint8_t startingBottle2;
-    uint8_t startingBottle3;
-    uint8_t startingBottle4;
-    uint8_t startingRutoBottle;
-    uint8_t startingOcarina;
-    uint8_t startingKokiriSword;
-    uint8_t startingBiggoronSword;
-    uint8_t startingMagicMeter;
-    uint8_t startingDoubleDefense;
-    uint8_t startingHearts;
-
-    uint32_t startingQuestItems;
-    uint32_t startingDungeonReward;
-    uint32_t startingEquipment;
-    uint32_t startingUpgrades;
-
-    uint8_t startingTokens;
-
-} SettingsContext;
-
-class Option {
-public:
-    static Option Bool(std::string name_, std::vector<std::string> options_, OptionCategory category_ = OptionCategory::Setting, uint8_t defaultOption_ = 0, bool defaultHidden_ = false) {
-        return Option{false, std::move(name_), std::move(options_), category_, defaultOption_, defaultHidden_};
-    }
-
-    static Option U8(std::string name_, std::vector<std::string> options_, OptionCategory category_  = OptionCategory::Setting, uint8_t defaultOption_ = 0, bool defaultHidden_ = false) {
-        return Option{uint8_t{0}, std::move(name_), std::move(options_), category_, defaultOption_, defaultHidden_};
-    }
-
-    template <typename T>
-    T Value() const {
-        return std::get<T>(var);
-    }
-
-    template <typename T>
-    bool Is(T other) const {
-        static_assert(std::is_integral_v<T> || std::is_enum_v<T>,
-                      "T must be an integral type or an enum.");
-
-        if constexpr ((std::is_integral_v<T> && !std::is_same_v<bool, T>) || std::is_enum_v<T>) {
-            return Value<uint8_t>() == static_cast<uint8_t>(other);
-        } else {
-            return Value<bool>() == static_cast<bool>(other);
-        }
-    }
-
-    template <typename T>
-    bool IsNot(T other) const {
-        return !Is(other);
-    }
-
-    explicit operator bool() const {
-        if (std::holds_alternative<bool>(var)) {
-            return Value<bool>();
-        } else {
-            return Value<uint8_t>() != 0;
-        }
-    }
-
-    size_t GetOptionCount() const {
-        return options.size();
-    }
-
-    const std::string& GetName() const {
-        return name;
-    }
-
-    const std::string& GetSelectedOptionText() const {
-        return options[selectedOption];
-    }
-
-    uint8_t GetSelectedOptionIndex() const {
-      return selectedOption;
-    }
-
-    void SetVariable() {
-      if (std::holds_alternative<bool>(var)) {
-        var.emplace<bool>(selectedOption != 0);
-      } else {
-        var.emplace<uint8_t>(selectedOption);
-      }
-    }
-
-    void SetDelayedOption() {
-      delayedOption = selectedOption;
-    }
-
-    void RestoreDelayedOption() {
-      selectedOption = delayedOption;
-      SetVariable();
-    }
-
-    void SetSelectedIndex(size_t idx) {
-      selectedOption = idx;
-      if (selectedOption >= options.size()) {
-        printf("\x1b[30;0HERROR: Incompatible selection for %s\n", name.c_str());
-        selectedOption = 0;
-      }
-
-      SetVariable();
-    }
-
-    void Hide() {
-      hidden = true;
-    }
-
-    void Unhide() {
-      hidden = false;
-    }
-
-    bool IsHidden() const {
-      return hidden;
-    }
-
-    bool IsCategory(OptionCategory category) const {
-      return category == this->category;
-    }
-
-private:
-    Option(uint8_t var_, std::string name_, std::vector<std::string> options_, OptionCategory category_, uint8_t defaultOption_, bool defaultHidden_)
-          : var(var_), name(std::move(name_)), options(std::move(options_)), category(category_), defaultOption(defaultOption_), defaultHidden(defaultHidden_) {
-        selectedOption = defaultOption;
-        hidden = defaultHidden;
-        SetVariable();
-    }
-
-    Option(bool var_, std::string name_, std::vector<std::string> options_, OptionCategory category_, uint8_t defaultOption_, bool defaultHidden_)
-          : var(var_), name(std::move(name_)),  options(std::move(options_)), category(category_), defaultOption(defaultOption_), defaultHidden(defaultHidden_) {
-        selectedOption = defaultOption;
-        hidden = defaultHidden;
-        SetVariable();
-    }
-
-  std::variant<bool, uint8_t> var;
-  std::string name;
-  std::vector<std::string> options;
-  uint8_t selectedOption = 0;
-  uint8_t delayedOption = 0;
-  bool hidden = false;
-  OptionCategory category;
-  uint8_t defaultOption = 0;
-  bool defaultHidden = false;
-};
-
-enum class MenuType {
-  MainMenu,
-  SubMenu,
-  Action,
-};
-
-class Menu {
-  public:
-
-    static Menu SubMenu(std::string name_, std::vector<Option *>* settingsList_, bool printInSpoiler_ = true) {
-      return Menu{std::move(name_), MenuType::SubMenu, std::move(settingsList_), OPTION_SUB_MENU, printInSpoiler_};
-    }
-
-    static Menu SubMenu(std::string name_, std::vector<Menu *>* itemsList_, bool printInSpoiler_ = true) {
-      return Menu{std::move(name_), MenuType::SubMenu, std::move(itemsList_), SUB_MENU, printInSpoiler_};
-    }
-
-    static Menu Action(std::string name_, uint8_t mode_) {
-      return Menu{std::move(name_), MenuType::Action, std::move(mode_)};
-    }
-
-    Menu(std::string name_, MenuType type_, std::vector<Option *>* settingsList_, uint8_t mode_, bool printInSpoiler_ = true)
-        : name(std::move(name_)), type(type_), settingsList(std::move(settingsList_)), mode(mode_), printInSpoiler(printInSpoiler_) {}
-
-    Menu(std::string name_, MenuType type_, std::vector<Menu *>* itemsList_, uint8_t mode_, bool printInSpoiler_ = true)
-        : name(std::move(name_)), type(type_), itemsList(std::move(itemsList_)), mode(mode_), printInSpoiler(printInSpoiler_) {}
-
-    Menu(std::string name_, MenuType type_, uint8_t mode_)
-        : name(std::move(name_)), type(type_), mode(mode_) {}
-
-    std::string name;
-    MenuType type;
-    std::vector<Option *>* settingsList;
-    std::vector<Menu *>* itemsList;
-    uint8_t mode;
-    uint16_t menuIdx = 0;
-    uint16_t settingBound = 0;
-    int selectedSetting = 0;
-    bool printInSpoiler = true;
-};
-
-namespace Settings {
-void UpdateSettings(std::unordered_map<RandomizerSettingKey, uint8_t> cvarSettings, std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks);
-  SettingsContext FillContext();
-  //void ResolveExcludedLocationConflicts();
-  void RandomizeAllSettings(const bool selectOptions = false);
-  void ForceChange(uint32_t kDown, Option* currentSetting);
-  const std::vector<Menu*> GetAllOptionMenus();
-
-
-  extern uint32_t seed;
-  extern std::string version;
-  extern std::array<uint8_t, 5> hashIconIndexes;
-  extern std::string hash;
-  extern std::string seedString;
-
-  extern bool skipChildZelda;
-
-  extern Option OpenForest;
-  extern Option OpenKakariko;
-  extern Option OpenDoorOfTime;
-  extern Option ZorasFountain;
-  extern Option GerudoFortress;
-  extern Option Bridge;
-  extern Option BridgeStoneCount;
-  extern Option BridgeMedallionCount;
-  extern Option BridgeRewardCount;
-  extern Option BridgeDungeonCount;
-  extern Option BridgeTokenCount;
-  extern Option BridgeRewardOptions;
-  extern Option RandomGanonsTrials;
-  extern Option GanonsTrialsCount;
-
-  extern Option StartingAge;
-  extern uint8_t ResolvedStartingAge;
-  extern Option ShuffleEntrances;
-  extern Option ShuffleDungeonEntrances;
-  extern Option ShuffleBossEntrances;
-  extern Option ShuffleOverworldEntrances;
-  extern Option ShuffleInteriorEntrances;
-  extern Option ShuffleGrottoEntrances;
-  extern Option ShuffleOwlDrops;
-  extern Option ShuffleWarpSongs;
-  extern Option ShuffleOverworldSpawns;
-  extern Option MixedEntrancePools;
-  extern Option MixDungeons;
-  extern Option MixOverworld;
-  extern Option MixInteriors;
-  extern Option MixGrottos;
-  extern Option DecoupleEntrances;
-  extern Option BombchusInLogic;
-  extern Option AmmoDrops;
-  extern Option HeartDropRefill;
-  extern Option TriforceHunt;
-  extern Option TriforceHuntTotal;
-  extern Option TriforceHuntRequired;
-  extern Option MQDungeonCount;
-  extern Option SetDungeonTypes;
-
-  extern Option ShuffleRewards;
-  extern Option LinksPocketItem;
-  extern Option ShuffleSongs;
-  extern Option Shopsanity;
-  extern Option ShopsanityPrices;
-  extern Option ShopsanityPricesAffordable;
-  extern Option Tokensanity;
-  extern Option Scrubsanity;
-  extern Option ShuffleCows;
-  extern Option ShuffleKokiriSword;
-  extern Option ShuffleMasterSword;
-  extern Option ShuffleOcarinas;
-  extern Option ShuffleWeirdEgg;
-  extern Option ShuffleGerudoToken;
-  extern Option ShuffleMagicBeans;
-  extern Option ShuffleMerchants;
-  extern Option ShuffleFrogSongRupees;
-  extern Option ShuffleAdultTradeQuest;
-  extern Option ShuffleChestMinigame;
-  extern Option Shuffle100GSReward;
-
-  extern Option MapsAndCompasses;
-  extern Option Keysanity;
-  extern Option GerudoKeys;
-  extern Option BossKeysanity;
-  extern Option GanonsBossKey;
-  extern uint8_t LACSCondition;
-  extern Option LACSStoneCount;
-  extern Option LACSMedallionCount;
-  extern Option LACSRewardCount;
-  extern Option LACSDungeonCount;
-  extern Option LACSTokenCount;
-  extern Option LACSRewardOptions;
-  extern Option KeyRings;
-  extern Option KeyRingsRandomCount;
-  extern Option RingFortress;
-  extern Option RingForest;
-  extern Option RingFire;
-  extern Option RingWater;
-  extern Option RingSpirit;
-  extern Option RingShadow;
-  extern Option RingWell;
-  extern Option RingGtg;
-  extern Option RingCastle;
-
-  extern Option SkipChildStealth;
-  extern Option SkipTowerEscape;
-  extern Option SkipEponaRace;
-  extern Option SkipMinigamePhases;
-  extern Option FreeScarecrow;
-  extern Option FourPoesCutscene;
-  extern Option LakeHyliaOwl;
-  extern Option BigPoeTargetCount;
-  extern Option NumRequiredCuccos;
-  extern Option KingZoraSpeed;
-  extern Option CompleteMaskQuest;
-  extern Option EnableGlitchCutscenes;
-  extern Option QuickText;
-  extern Option SkipSongReplays;
-  extern Option KeepFWWarpPoint;
-  extern Option FastBunnyHood;
-
-  extern Option GossipStoneHints;
-  extern Option ClearerHints;
-  extern Option HintDistribution;
-  extern Option AltarHintText;
-  extern Option LightArrowHintText;
-  extern Option SariaHintText;
-  extern Option FrogsHintText;
-  extern Option DampeHintText;
-  extern Option GregHintText;
-  extern Option Kak10GSHintText;
-  extern Option Kak20GSHintText;
-  extern Option Kak30GSHintText;
-  extern Option Kak40GSHintText;
-  extern Option Kak50GSHintText;
-  extern Option ScrubHintText;
-  extern Option WarpSongHints;
-  extern Option DamageMultiplier;
-  extern Option StartingTime;
-  extern Option ChestAnimations;
-  extern Option ChestSize;
-  extern Option GenerateSpoilerLog;
-  extern Option IngameSpoilers;
-  extern Option RandomTrapDmg;
-  extern Option BlueFireArrows;
-  extern Option SunlightArrows;
-  extern bool HasNightStart;
-
-  extern Option FaroresWindAnywhere;
-  extern Option StickAsAdult;
-  extern Option BoomerangAsAdult;
-  extern Option HammerAsChild;
-  extern Option SlingshotAsAdult;
-  extern Option BowAsChild;
-  extern Option HookshotAsChild;
-  extern Option IronBootsAsChild;
-  extern Option HoverBootsAsChild;
-  extern Option MasksAsAdult;
-  extern Option KokiriSwordAsAdult;
-  extern Option MasterSwordAsChild;
-  extern Option BiggoronSwordAsChild;
-  extern Option DekuShieldAsAdult;
-  extern Option MirrorShieldAsChild;
-  extern Option GoronTunicAsChild;
-  extern Option ZoraTunicAsChild;
-  extern Option GkDurability;
-
-  extern Option ItemPoolValue;
-  extern Option IceTrapValue;
-  extern Option RemoveDoubleDefense;
-  extern Option ProgressiveGoronSword;
-
-  //Starting Inventory
-  extern Option StartingConsumables;
-  extern Option StartingMaxRupees;
-  extern Option StartingStickCapacity;
-  extern Option StartingNutCapacity;
-  extern Option StartingBombBag;
-  extern Option StartingBombchus;
-  extern Option StartingBow;
-  extern Option StartingFireArrows;
-  extern Option StartingIceArrows;
-  extern Option StartingLightArrows;
-  extern Option StartingDinsFire;
-  extern Option StartingFaroresWind;
-  extern Option StartingNayrusLove;
-  extern Option StartingSlingshot;
-  extern Option StartingBoomerang;
-  extern Option StartingLensOfTruth;
-  extern Option StartingMagicBean;
-  extern Option StartingMegatonHammer;
-  extern Option StartingHookshot;
-  extern Option StartingIronBoots;
-  extern Option StartingHoverBoots;
-  extern Option StartingBottle1;
-  extern Option StartingBottle2;
-  extern Option StartingBottle3;
-  extern Option StartingBottle4;
-  extern Option StartingRutoBottle;
-  extern Option StartingOcarina;
-  extern Option StartingZeldasLullaby;
-  extern Option StartingEponasSong;
-  extern Option StartingSariasSong;
-  extern Option StartingSunsSong;
-  extern Option StartingSongOfTime;
-  extern Option StartingSongOfStorms;
-  extern Option StartingMinuetOfForest;
-  extern Option StartingBoleroOfFire;
-  extern Option StartingSerenadeOfWater;
-  extern Option StartingRequiemOfSpirit;
-  extern Option StartingNocturneOfShadow;
-  extern Option StartingPreludeOfLight;
-  extern Option StartingKokiriSword;
-  extern Option StartingBiggoronSword;
-  extern Option StartingDekuShield;
-  extern Option StartingHylianShield;
-  extern Option StartingMirrorShield;
-  extern Option StartingGoronTunic;
-  extern Option StartingZoraTunic;
-  extern Option StartingMagicMeter;
-  extern Option StartingStrength;
-  extern Option StartingScale;
-  extern Option StartingWallet;
-  extern Option StartingShardOfAgony;
-  extern Option StartingDoubleDefense;
-  extern Option StartingHearts;
-  extern Option StartingKokiriEmerald;
-  extern Option StartingGoronRuby;
-  extern Option StartingZoraSapphire;
-  extern Option StartingForestMedallion;
-  extern Option StartingFireMedallion;
-  extern Option StartingWaterMedallion;
-  extern Option StartingSpiritMedallion;
-  extern Option StartingShadowMedallion;
-  extern Option StartingLightMedallion;
-  extern Option StartingSkulltulaToken;
-
-  //Logic Settings
-  extern Option Logic;
-  extern Option LocationsReachable;
-  extern Option NightGSExpectSuns;
-
-  //Trick Settings
-  //New Trick Settings (from ootr https://github.com/ootrandomizer/OoT-Randomizer/blob/Dev/SettingsList.py, additions to this list marked)
-  extern Option ToggleAllTricks;
-  extern Option LogicVisibleCollision;
-  extern Option LogicGrottosWithoutAgony;
-  extern Option LogicFewerTunicRequirements;
-  extern Option LogicRustedSwitches;
-  extern Option LogicFlamingChests;
-  extern Option LogicBunnyHoodJump; //NEW not implemented
-  extern Option LogicDamageBoost; //NEW not implemented
-  extern Option LogicHoverBoost; //NEW not implemented
-  extern Option LogicAdultKokiriGS;
-  extern Option LogicLostWoodsBridge;
-  extern Option LogicMidoBackflip;
-  extern Option LogicLostWoodsGSBean;
-  extern Option LogicCastleStormsGS;
-  extern Option LogicManOnRoof;
-  extern Option LogicKakarikoTowerGS;
-  extern Option LogicAdultWindmillPoH;
-  extern Option LogicChildWindmillPoH; //NEW not implemented
-  extern Option LogicKakarikoRooftopGS;
-  extern Option LogicGraveyardPoH;
-  extern Option LogicChildDampeRacePoH;
-  extern Option LogicShadowFireArrowEntry;
-  extern Option LogicDMTSoilGS;
-  extern Option LogicDMTBombable;
-  extern Option LogicDMTGSLowerHookshot;
-  extern Option LogicDMTGSLowerHovers;
-  extern Option LogicDMTGSLowerBean;
-  extern Option LogicDMTGSLowerJS; //NEW
-  extern Option LogicDMTClimbHovers;
-  extern Option LogicDMTGSUpper;
-  extern Option LogicBiggoronBolero; //not implemented - unnecessary with SoH rando
-  extern Option LogicGoronCityPot;
-  extern Option LogicGoronCityPotWithStrength;
-  extern Option LogicChildRollingWithStrength;
-  extern Option LogicGoronCityLeftMost;
-  extern Option LogicGoronCityGrotto;
-  extern Option LogicGoronCityLinkGoronDins;
-  extern Option LogicCraterBeanPoHWithHovers;
-  extern Option LogicCraterBoleroJump;
-  extern Option LogicCraterBoulderJS;
-  extern Option LogicCraterBoulderSkip;
-  extern Option LogicZoraRiverLower;
-  extern Option LogicZoraRiverUpper;
-  extern Option LogicZoraWithHovers;
-  extern Option LogicZoraWithCucco;
-  extern Option LogicKingZoraSkip;
-  extern Option LogicDomainGS;
-  extern Option LogicLabWallGS;
-  extern Option LogicLabDiving;
-  extern Option LogicWaterHookshotEntry;
-  extern Option LogicValleyCrateHovers;
-  extern Option LogicGerudoKitchen;
-  extern Option LogicGFJump;
-  extern Option LogicWastelandBunnyCrossing; //NEW not implemented
-  extern Option LogicWastelandCrossing;
-  extern Option LogicLensWasteland;
-  extern Option LogicReverseWasteland;
-  extern Option LogicColossusGS;
-  extern Option LogicDekuBasementGS;
-  extern Option LogicDekuB1Skip;
-  extern Option LogicDekuB1WebsWithBow;
-  extern Option LogicDekuMQCompassGS;
-  extern Option LogicDekuMQLog;
-  extern Option LogicDCScarecrowGS;
-  extern Option LogicDCVinesGS;
-  extern Option LogicDCStaircase;
-  extern Option LogicDCSlingshotSkip;
-  extern Option LogicDCScrubRoom;
-  extern Option LogicDCJump;
-  extern Option LogicDCHammerFloor;
-  extern Option LogicDCMQChildBombs;
-  extern Option LogicDCMQEyesChild;
-  extern Option LogicDCMQEyesAdult;
-  extern Option LogicJabuAlcoveJumpDive;
-  extern Option LogicJabuBossHover;
-  extern Option LogicJabuNearBossRanged;
-  extern Option LogicJabuNearBossExplosives;
-  extern Option LogicLensJabuMQ;
-  extern Option LogicJabuMQRangJump; //not implemented - requires dungeon shortcuts which is not built into rando yet
-  extern Option LogicJabuMQSoTGS;
-  extern Option LogicLensBotw;
-  extern Option LogicChildDeadhand;
-  extern Option LogicBotwBasement;
-  extern Option LogicBotwMQPits;
-  extern Option LogicBotwMQDeadHandKey;
-  extern Option LogicForestFirstGS;
-  extern Option LogicForestOutdoorEastGS;
-  extern Option LogicForestVines;
-  extern Option LogicForestOutdoorsLedge;
-  extern Option LogicForestDoorFrame;
-  extern Option LogicForestOutsideBackdoor;
-  extern Option LogicForestMQWellSwim;
-  extern Option LogicForestMQBlockPuzzle;
-  extern Option LogicForestMQHallwaySwitchJS;
-  extern Option LogicForestMQHallwaySwitchHookshot; //not implemented yet
-  extern Option LogicForestMQHallwaySwitchBoomerang;
-  extern Option LogicFireBossDoorJump;
-  extern Option LogicFireSongOfTime;
-  extern Option LogicFireStrength;
-  extern Option LogicFireScarecrow;
-  extern Option LogicFireFlameMaze;
-  extern Option LogicFireMQNearBoss;
-  extern Option LogicFireMQBlockedChest;
-  extern Option LogicFireMQBKChest;
-  extern Option LogicFireMQClimb;
-  extern Option LogicFireMQMazeSideRoom;
-  extern Option LogicFireMQMazeHovers;
-  extern Option LogicFireMQMazeJump;
-  extern Option LogicFireMQAboveMazeGS;
-  extern Option LogicFireMQFlameMaze;
-  extern Option LogicWaterTempleTorchLongshot;
-  extern Option LogicWaterCrackedWallHovers;
-  extern Option LogicWaterCrackedWallNothing;
-  extern Option LogicWaterBossKeyRegion;
-  extern Option LogicWaterNorthBasementLedgeJump;
-  extern Option LogicWaterBKJumpDive;
-  extern Option LogicWaterCentralGSFW;
-  extern Option LogicWaterCentralGSIrons;
-  extern Option LogicWaterCentralBow;
-  extern Option LogicWaterFallingPlatformGSHookshot;
-  extern Option LogicWaterFallingPlatformGSBoomerang;
-  extern Option LogicWaterRiverGS;
-  extern Option LogicWaterDragonJumpDive;
-  extern Option LogicWaterDragonAdult;
-  extern Option LogicWaterDragonChild;
-  extern Option LogicWaterMQCentralPillar;
-  extern Option LogicWaterMQLockedGS;
-  extern Option LogicLensShadow;
-  extern Option LogicLensShadowPlatform;
-  extern Option LogicLensBongo;
-  extern Option LogicShadowUmbrella;
-  extern Option LogicShadowUmbrellaGS;
-  extern Option LogicShadowFreestandingKey;
-  extern Option LogicShadowStatue;
-  extern Option LogicShadowBongo; //not implemented - projectiles are not expected for bongo anyways
-  extern Option LogicLensShadowMQ;
-  extern Option LogicLensShadowMQInvisibleBlades;
-  extern Option LogicLensShadowMQPlatform;
-  extern Option LogicLensShadowMQDeadHand;
-  extern Option LogicShadowMQGap;
-  extern Option LogicShadowMQInvisibleBlades;
-  extern Option LogicShadowMQHugePit;
-  extern Option LogicShadowMQWindyWalkway; //not implemented - requires dungeon shortcuts which is not built into rando yet
-  extern Option LogicLensSpirit;
-  extern Option LogicSpiritChildBombchu;
-  extern Option LogicSpiritLobbyGS;
-  extern Option LogicSpiritLowerAdultSwitch;
-  extern Option LogicSpiritLobbyJump;
-  extern Option LogicSpiritPlatformHookshot; //not implemented - requires boss shortcuts which is not built into rando yet
-  extern Option LogicSpiritMapChest;
-  extern Option LogicSpiritSunChest;
-  extern Option LogicSpiritWall;
-  extern Option LogicLensSpiritMQ;
-  extern Option LogicSpiritMQSunBlockSoT;
-  extern Option LogicSpiritMQSunBlockGS;
-  extern Option LogicSpiritMQLowerAdult;
-  extern Option LogicSpiritMQFrozenEye;
-  extern Option LogicIceBlockGS;
-  extern Option LogicIceMQRedIceGS;
-  extern Option LogicIceMQScarecrow;
-  extern Option LogicLensGtg;
-  extern Option LogicGtgWithoutHookshot;
-  extern Option LogicGtgFakeWall;
-  extern Option LogicLensGtgMQ;
-  extern Option LogicGtgMQWithHookshot;
-  extern Option LogicGtgMQWithoutHookshot;
-  extern Option LogicLensCastle;
-  extern Option LogicSpiritTrialHookshot;
-  extern Option LogicLensCastleMQ;
-  extern Option LogicFireTrialMQ;
-  extern Option LogicShadowTrialMQ;
-  extern Option LogicLightTrialMQ;
-
-  
-
-  //Glitch Settings
-  extern Option GlitchEquipSwapDins;
-  extern Option GlitchEquipSwap;
-  
-  extern uint32_t LinksPocketRewardBitMask;
-  extern std::array<uint32_t, 9> rDungeonRewardOverrides;
-
-  extern std::vector<std::vector<Option *>> excludeLocationsOptionsVector;
-  extern std::vector<Menu *> excludeLocationsMenus;
-  extern std::vector<Option *> startingItemsOptions;
-  extern std::vector<Option *> startingSongsOptions;
-  extern std::vector<Option *> startingEquipmentOptions;
-  extern std::vector<Option *> startingStonesMedallionsOptions;
-  extern std::vector<Option *> startingOthersOptions;
-  extern std::vector<Option *> trickOptions;
-  extern std::vector<Option *> glitchCategories;
-  extern std::vector<Option *> miscGlitches;
-
-  extern std::vector<Menu *> startingInventoryOptions;
-  extern std::vector<Menu *> detailedLogicOptions;
-
-  extern std::vector<Menu *> mainMenu;
-
-  extern std::vector<Option *> vanillaLogicDefaults;
-}
diff --git a/soh/soh/Enhancements/randomizer/3drando/shops.cpp b/soh/soh/Enhancements/randomizer/3drando/shops.cpp
index bb4287570..cd2c8004d 100644
--- a/soh/soh/Enhancements/randomizer/3drando/shops.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/shops.cpp
@@ -7,7 +7,6 @@
 #include <map>
 #include "z64item.h"
 
-using namespace Settings;
 
 std::vector<ItemAndPrice> NonShopItems = {};
 
@@ -134,13 +133,14 @@ int GetPriceFromMax(int max) {
 // Get random price out of available "affordable prices", or just return 10 if Starter wallet is selected (no need to randomly select
 // from a single element)
 int GetPriceAffordable() {
-    if (Settings::ShopsanityPrices.Is(RO_SHOPSANITY_PRICE_STARTER)) {
+   auto ctx = Rando::Context::GetInstance();
+    if (ctx->GetOption(RSK_SHOPSANITY_PRICES).Is(RO_SHOPSANITY_PRICE_STARTER)) {
         return 10;
     }
 
     static const std::vector<int> affordablePrices = { 10, 105, 205, 505 };
     std::vector<int> priceList;
-    uint8_t maxElements = Settings::ShopsanityPrices.Value<uint8_t>();
+    uint8_t maxElements = ctx->GetOption(RSK_SHOPSANITY_PRICES).Value<uint8_t>();
     for (int i = 0; i < maxElements; i++) {
         priceList.push_back(affordablePrices.at(i));
     }
@@ -148,8 +148,9 @@ int GetPriceAffordable() {
 }
 
 int GetRandomShopPrice() {
+   auto ctx = Rando::Context::GetInstance();
     // If Shopsanity prices aren't Balanced, but Affordable is on, don't GetPriceFromMax
-    if (Settings::ShopsanityPricesAffordable.Is(true) && Settings::ShopsanityPrices.IsNot(RO_SHOPSANITY_PRICE_BALANCED)) {
+    if (ctx->GetOption(RSK_SHOPSANITY_PRICES_AFFORDABLE).Is(true) && ctx->GetOption(RSK_SHOPSANITY_PRICES).IsNot(RO_SHOPSANITY_PRICE_BALANCED)) {
         return GetPriceAffordable();
     }
 
@@ -157,16 +158,16 @@ int GetRandomShopPrice() {
     int max = 0;
 
     // check settings for a wallet tier selection and set max amount as method for setting true randomization
-    if(Settings::ShopsanityPrices.Is(RO_SHOPSANITY_PRICE_STARTER)) {
+    if(ctx->GetOption(RSK_SHOPSANITY_PRICES).Is(RO_SHOPSANITY_PRICE_STARTER)) {
         max = 19; // 95/5
     }
-    else if (Settings::ShopsanityPrices.Is(RO_SHOPSANITY_PRICE_ADULT)) {
+    else if (ctx->GetOption(RSK_SHOPSANITY_PRICES).Is(RO_SHOPSANITY_PRICE_ADULT)) {
         max = 40; // 200/5
     }
-    else if (Settings::ShopsanityPrices.Is(RO_SHOPSANITY_PRICE_GIANT)) {
+    else if (ctx->GetOption(RSK_SHOPSANITY_PRICES).Is(RO_SHOPSANITY_PRICE_GIANT)) {
         max = 100; // 500/5
     }
-    else if (Settings::ShopsanityPrices.Is(RO_SHOPSANITY_PRICE_TYCOON)) {
+    else if (ctx->GetOption(RSK_SHOPSANITY_PRICES).Is(RO_SHOPSANITY_PRICE_TYCOON)) {
         max = 199; // 995/5
     }
     if (max != 0) {
@@ -205,13 +206,14 @@ int16_t GetRandomScrubPrice() {
 
 //Get 1 to 4, or a random number from 1-4 depending on shopsanity setting
 int GetShopsanityReplaceAmount() {
-  if (Settings::Shopsanity.Is(SHOPSANITY_ONE)) {
+   auto ctx = Rando::Context::GetInstance();
+  if (ctx->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_ONE_ITEM)) {
     return 1;
-  } else if (Settings::Shopsanity.Is(SHOPSANITY_TWO)) {
+  } else if (ctx->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_TWO_ITEMS)) {
     return 2;
-  } else if (Settings::Shopsanity.Is(SHOPSANITY_THREE)) {
+  } else if (ctx->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_THREE_ITEMS)) {
     return 3;
-  } else if (Settings::Shopsanity.Is(SHOPSANITY_FOUR)) {
+  } else if (ctx->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_FOUR_ITEMS)) {
     return 4;
   } else { //Random, get number in [1, 4]
     return Random(1, 5);
@@ -220,195 +222,195 @@ int GetShopsanityReplaceAmount() {
 
 //Initialize the table of trick names with an easy, medium, and hard name for each language
 void InitTrickNames() {
-  trickNameTable[GI_SWORD_KOKIRI] = {
+  trickNameTable[RG_KOKIRI_SWORD] = {
      Text{"Korok Sword", "Épée Korok", "Espada Korok"},
      Text{"Hero's Sword", "Épée du Héros", "Espada del héroe"},
      Text{"Razor Sword", "Lame Rasoir", "Espada de esmeril"}};
-  trickNameTable[0xE0] = { //Master Sword without the GI enum
+  trickNameTable[RG_MASTER_SWORD] = { //Master Sword without the GI enum
      Text{"Goddess Sword", "Épée de la déesse", "Espada Divina"},
      Text{"Gilded Sword", "Excalibur", "Espada de los Sabios"},
      Text{"Magical Sword", "Lame dorée", "Fay"}};
-  trickNameTable[GI_SWORD_KNIFE] = {
+  trickNameTable[RG_GIANTS_KNIFE] = {
      Text{"Medigoron's Sword", "l'Épée de Medigoron", "La espada de Medigoron"},
      Text{"Razor Sword", "Lame Rasoir", "Espada de esmeril"},
      Text{"Royal Claymore", "Claymore Royale", "Royal Claymore"}};
-  trickNameTable[GI_SWORD_BGS] = {
+  trickNameTable[RG_BIGGORON_SWORD] = {
      Text{"Power Sword", "Épée de Puissance", "Espada de poder"},
      Text{"Fierce Deity Sword", "Épée du dieu démon", "Espada de la Fiera Deidad"},
      Text{"Tempered Sword", "Épée de Légende Nv.2", "Espada Maestra mejorada"},
      Text{"Biggoron's Knife", "Lame de Grogoron", "Daga de Biggoron"}};
-  trickNameTable[GI_SHIELD_DEKU] = {
+  trickNameTable[RG_DEKU_SHIELD] = {
      Text{"Boko Shield", "Bouclier Boko", "Escudo Boko"},
      Text{"Ordon Shield", "Bouclier de Toal", "Escudo de Ordon"},
      Text{"Wooden Shield", "Bouclier de Bois", "Escudo de madera"}};
-  trickNameTable[GI_SHIELD_HYLIAN] = {
+  trickNameTable[RG_HYLIAN_SHIELD] = {
      Text{"Hyrule Shield", "Bouclier d'Hyrule", "Escudo Hylian"},
      Text{"Goddess Shield", "Bouclier Sacré", "Escudo Divino"},
      Text{"Hero's Shield", "Bouclier du Héros", "Escudo del héroe"}};
-  trickNameTable[GI_SHIELD_MIRROR] = {
+  trickNameTable[RG_MIRROR_SHIELD] = {
      Text{"Magic Mirror", "Miroir Magique", "Escudo mágico"},
      Text{"Magical Shield", "Bouclier Magique", "Escudo arcano"},
      Text{"Mirror of Twilight", "Miroir des Ombres", "Espejo del Crepúsculo"}};
-  trickNameTable[GI_TUNIC_GORON] = {
+  trickNameTable[RG_GORON_TUNIC] = {
      Text{"Gerudo Top", "Tunique Gerudo", "Pechera gerudo"},
      Text{"Flamebreaker Armor", "Armure de Pierre", "	Armadura ignífuga"},
      Text{"Red Mail", "Habits Rouges", "Ropas rojas"}};
-  trickNameTable[GI_TUNIC_ZORA] = {
+  trickNameTable[RG_ZORA_TUNIC] = {
      Text{"Rito Tunic", "Tunique Rito", "Sayo rito"},
      Text{"Mermaid Suit", "Costume de sirène", "Costume de sirène"},
      Text{"Zora Armor", "Armure Zora", "Túnica Zora"},
      Text{"Blue Mail", "Habits Bleus", "Ropas azules"}};
-  trickNameTable[GI_BOOTS_IRON] = {
+  trickNameTable[RG_IRON_BOOTS] = {
      Text{"Iron Hoofs", "Patins de Plomb", "Botas férreas"},
      Text{"Snow Boots", "Bottes de Neige", "Botas de nieve"},
      Text{"Red Boots", "Bottes rouges", "Botas rojas"},
      Text{"Zora Greaves", "Bottes Zora", "Zora Greaves"},
      Text{"Boots of Power", "Bottes de Puissance", "Botas de plomo"}};
-  trickNameTable[GI_BOOTS_HOVER] = {
+  trickNameTable[RG_HOVER_BOOTS] = {
      Text{"Hover Hoofs", "Patins des airs", "Botas flotadoras"},
      Text{"Golden Boots", "Bottes dorées", "Botas de Oro"},
      Text{"Pegasus Boots", "Bottes pégase", "Botas de Pegaso"},
      Text{"Boots of Speed", "Bottes de vitesse", "Botas del desierto"}};
-  trickNameTable[GI_WEIRD_EGG] = {
+  trickNameTable[RG_WEIRD_EGG] = {
      Text{"Poached Egg", "Oeuf à la coque", "Huevo pasado"},
      Text{"Lon Lon Egg", "Oeuf Lon Lon", "Huevo Lon Lon"},
      Text{"Zora Egg", "Oeuf Zora", "Huevo Zora"}};
-  trickNameTable[GI_LETTER_ZELDA] = {
+  trickNameTable[RG_ZELDAS_LETTER] = {
       Text{"Ruto's Letter", "Lettre de Ruto", "Carta de Ruto"},
      Text{"Royal Letter", "Lettre Eoyale", "Carta para Kafei"},
      Text{"Zelda's Business Card", "Carte d'affaires de Zelda", "Carta"},
      Text{"Letter to Kafei", "Lettre pour Kafei", "Carta para Kafei "},
      Text{"Goat's Letter", "Lettre de la Chèvre", "Carta de la Cabra"},
      Text{"Maggie's Letter", "Lettre de Maggy", "Carta de Dolores"}};
-  trickNameTable[GI_BOOMERANG] = {
+  trickNameTable[RG_BOOMERANG] = {
      Text{"Banana", "Banane", "Plátano"},
      Text{"Prank Fetch Toy", "Inséparable Bâtonnet", "Bumerang"},
      Text{"Gale Boomerang", "Boomerang Tornade", "Bumerán tornado"},
      Text{"Magic Boomerang", "Boomerang Magique", "Bumerán mágico"}};
-  trickNameTable[GI_LENS] = {
+  trickNameTable[RG_LENS_OF_TRUTH] = {
      Text{"Sheikah-leidoscope", "Sheikah-léidoscope", "Monóculo de la Verdad"},
      Text{"Sheikah Sensor", "Sonar Sheikah", "Sensor Sheikah"},
      Text{"Crystal of Vision", "Cristal de Vision", "Cristal de Visión"},
      Text{"Magnifying Lens", "Loupe", "Lente Aumentadora"}};
-  trickNameTable[GI_HAMMER] = {
+  trickNameTable[RG_MEGATON_HAMMER] = {
      Text{"Goron Gavel", "Masse Perforatrice", "Mazo Goron"},
      Text{"Magic Hammer", "Marteau Magique", "Martillo mágico"},
      Text{"Skull Hammer", "Maillet Ressort", "Martillo de hierro"}};
-  trickNameTable[GI_STONE_OF_AGONY] = {
+  trickNameTable[RG_STONE_OF_AGONY] = {
      Text{"Cave Charm", "Charme de grotte", "Amuleto de la cueva"},
      Text{"Stone of Agahnim", "Fragment d'Agahnim", "Piedra de Agahnim"},
      Text{"Shard of Agony", "Fragment de Souffrance", "Piedra de la Agonía"},
      Text{"Pirate's Charm", "Pierre de Pirate", "Amuleto Pirata"}};
-  trickNameTable[GI_DINS_FIRE] = {
+  trickNameTable[RG_DINS_FIRE] = {
      Text{"Eldin's Fire", "Feu d'Eldin", "Fuego de Eldin"},
      Text{"Din's Blaze", "Flamme de Din", "Poder de Din"},
      Text{"Magic Lantern", "Lanterne Magique", "Linterna mágica"},
      Text{"Ether Medallion", "Médaillon d'Éther", "Medallón de Tesoro"},
      Text{"Bombos Medallion", "Médaillon des Flammes", "Medallón del Temblor"}};
-  trickNameTable[GI_FARORES_WIND] = {
+  trickNameTable[RG_FARORES_WIND] = {
      Text{"Faron's Wind", "Vent de Firone", "Viento de Farone"},
      Text{"Farore's Windfall", "Zéphyr de Farore", "Valor de Farore"},
      Text{"Tingle Air", "Tingle Air", "Tingle de aire"},
      Text{"Travel Medallion", "Amulette de téléportation", "Medallón Maligno"},
      Text{"Irene's Taxi", "Le taxi d'Aëline", "El taxi de Airín"}};
-  trickNameTable[GI_NAYRUS_LOVE] = {
+  trickNameTable[RG_NAYRUS_LOVE] = {
      Text{"Lanayru's Love", "Amour de Lanelle", "Amor de Lanayru"},
      Text{"Nayru's Passion", "Passion de Nayru", "Sabiduría de Nayru"},
      Text{"Tingle Shield", "Bouclier Tingle", "Escudo de hormigueo"},
      Text{"Shield Spell", "Bouclier Magique", "Hechizo de Protección"},
      Text{"Magic Armor", "Armure Magique", "Armadura mágica"}};
-  trickNameTable[GI_ARROW_FIRE] = {
+  trickNameTable[RG_FIRE_ARROWS] = {
      Text{"Fire Rod", "Baguette de feu", "Cetro de fuego"},
      Text{"Bomb Arrow", "Flèche-Bombe", "Flecha bomba"},
      Text{"Red Candle", "Bougie Rouge", "Vela roja"}};
-  trickNameTable[GI_ARROW_ICE] = {
+  trickNameTable[RG_ICE_ARROWS] = {
      Text{"Ice Rod", "Baguette des Glaces", "Cetro de Hielo"},
      Text{"Ancient Arrow", "Flèche Archéonique", "Flecha ancestral"},
      Text{"Ice Trap Arrow", "Flèche de Piège de Glace", "Cetro de hielo"}};
-  trickNameTable[GI_ARROW_LIGHT] = {
+  trickNameTable[RG_LIGHT_ARROWS] = {
      Text{"Wind Arrow", "Flèche de Vent", "Flecha del Viento"},
      Text{"Wand of Gamelon", "Baguette de Gamelon", "Varita de Gamelón"},
      Text{"Shock Arrow", "Flèches Électriques", "Flecha eléctrica"},
      Text{"Silver Arrow", "Flèches d'Argent", "Flecha de plata"}};
-  trickNameTable[GI_GERUDO_CARD] = {
+  trickNameTable[RG_GERUDO_MEMBERSHIP_CARD] = {
      Text{"Desert Title Deed", "Abonnement Gerudo", "Escritura del desierto"},
      Text{"Sickle Moon Flag", "Drapeau du croissant de lune", "Bandera de la Luna Creciente"},
      Text{"Complimentary ID", "Bon de félicitation", "Cupón especial"},
      Text{"Gerudo's Card", "Carte Goron", "Tóken Gerudo"},
      Text{"Gerudo's Membership Card", "Autographe de Nabooru", "Tarjeta Gerudo"}};
 
-  trickNameTable[0xC9] = {
+  trickNameTable[RG_MAGIC_BEAN_PACK] = {
      Text{"Funky Bean Pack", "Paquet de Fèves Magiques", "Lote de frijoles mágicos"},
      Text{"Grapple Berries", "Baies de grappin", "Bayas de garfio"},
      Text{"Crenel Bean Pack", "Paquet de Haricots Gonggle", "Lote de alubias mágicas"},
      Text{"Mystical Seed Pack", "Pack de graines mystiques", "Paquete de semillas místicas"}};
-  trickNameTable[0xB8] = {
+  trickNameTable[RG_DOUBLE_DEFENSE] = {
      Text{"Diamond Hearts", "Coeurs de Diamant", "Contenedor de diamante"},
      Text{"Double Damage", "Double Souffrance", "Doble daño receptivo"},
      Text{"Quadruple Defence", "Quadruple Défence", "Defensa cuádruple"}};
 
-  trickNameTable[GI_POCKET_EGG] = {
+  trickNameTable[RG_POCKET_EGG] = {
      Text{"Arpagos Egg", "Oeuf d'Arpagos", "Huevo de Arpagos"},
      Text{"Lon Lon Egg", "oeuf Lon Lon", "Huevo Lon Lon"},
      Text{"Zora Egg", "oeuf Zora", "Huevo del Pez Viento"}};
-  trickNameTable[GI_POCKET_CUCCO] = {
+  trickNameTable[RG_POCKET_EGG] = {
      Text{"D.I.Y. Alarm Clock", "Réveille-matin improvisé", "Alarma emplumada portátil"},
      Text{"Kakariko Cucco", "Cocotte Cocorico", "Cuco de Kakariko"},
      Text{"Hatched Cucco", "Cocotte éclose", "Pollo de bolsillo"}};
-  trickNameTable[GI_COJIRO] = {
+  trickNameTable[RG_COJIRO] = {
      Text{"Blucco", "Chair-Qui-Poule", "Cucazul"},
      Text{"Piyoko", "Piyoko", "Piyoko"},
      Text{"Dark Cucco", "Cocotte Sombre", "Cucco oscuro"},
      Text{"Grog's Cucco", "Cocotte de Grog", "Cuco de Grog"}};
-  trickNameTable[GI_ODD_MUSHROOM] = {
+  trickNameTable[RG_ODD_MUSHROOM] = {
      Text{"Magic Mushroom", "Champignon magique", "Champiñón mágico"},
      Text{"Endura Shroom", "Champi Vigueur", "Champiñón del bosque"},
      Text{"Sleepy Toadstool", "Crapaud Fatigué", "Seta durmiente"},
      Text{"Mushroom", "Champignon", "Seta"}};
-  trickNameTable[GI_ODD_POTION] = {
+  trickNameTable[RG_ODD_POTION] = {
      Text{"Odd Medicine", "Élixir suspect", "Poción rara"},
      Text{"Granny's Poultice", "Mixture de Granny", "Medicina de la abuela"},
      Text{"Mushroom Poultice", "Mixture de champignon", "Medicina de champiñones"},
      Text{"Secret Medicine", "Médicament", "Pócima secreta"},
      Text{"Mushroom Spores", "Spores de Champignons", "Esporas de hongos"},
      Text{"Hanyu Spore", "Hanyu Spore", "Espora Hanyu"}};
-  trickNameTable[GI_SAW] = {
+  trickNameTable[RG_POACHERS_SAW] = {
      Text{"Carpenter's Saw", "Scie du charpentier", "Sierra del carpintero"},
      Text{"Poacher's Sword", "Hache du chasseur", "Espada del capataz"},
      Text{"Ancient Bladesaw", "Longue Épée Archéonique", "Mandoble ancestral"},
      Text{"Woodcutter's Axe", "Hache du Bûcheron", "Hacha de leñador"},
      Text{"Grog's Saw", "Scie de Grog", "Sierra del Cazador Furtivo"}};
-  trickNameTable[GI_SWORD_BROKEN] = {
+  trickNameTable[RG_BROKEN_SWORD] = {
      Text{"Broken Biggoron's Sword", "Épée brisée de Grogoron", "Espada de Biggoron rota"},
      Text{"Broken Giant's Knife", "Lame des Géants brisée", "Daga gigante rota"},
      Text{"Broken Noble Sword", "Épée noble brisée", "Espada noble rota"},
      Text{"Broken Picori Blade", "Épée Minish brisée", "Espada minish rota"},
      Text{"Decayed Master Sword", "Épée de légende pourrie", "Espada decadente de leyenda"}};
-  trickNameTable[GI_PRESCRIPTION] = {
+  trickNameTable[RG_PRESCRIPTION] = {
      Text{"Biggoron's Prescription", "Ordonnance de Grogoron", "Receta de Biggoron"},
      Text{"Eyedrop Prescription", "Ordonnance de gouttes", "Receta ocular"},
      Text{"Urgent Prescription", "Ordonnance urgente", "Prescripción"},
      Text{"Swordsman's Scroll", "Précis d'escrime", "Esgrimidorium"},
      Text{"Portrait of Oren", "Portrait d'Orlène", "Retrato de Oren"},
      Text{"Letter to King Zora", "Lettre au roi Zora", "Carta al Rey Zora"}};
-  trickNameTable[GI_FROG] = {
+  trickNameTable[RG_EYEBALL_FROG] = {
      Text{"Don Gero", "Don Gero", "Don Gero"},
      Text{"Hot-Footed Frog", "Grenouille à pieds chauds", "Rana de patas calientes"},
      Text{"Lost Swordsmith", "Forgeron perdu", "Espadachín perdido"},
      Text{"Eyedrop Frog", "Grenouille-qui-louche", "Globo Ocular de Rana"}};
-  trickNameTable[GI_EYEDROPS] = {
+  trickNameTable[RG_EYEDROPS] = {
      Text{"Biggoron's Eyedrops", "Gouttes de Grogoron", "Gotas de Biggoron"},
      Text{"Hyrule's Finest Eyedrops", "Eau du Lac Hylia", "Gotas oculares"},
      Text{"Moon's Tear", "Larme de Lune", "Lágrima de Luna"},
      Text{"Engine Grease", "Graisse moteur", "Grasa del motor"},
      Text{"Zora Perfume", "Parfum Zora", "Perfume Zora"}};
-  trickNameTable[GI_CLAIM_CHECK] = {
+  trickNameTable[RG_CLAIM_CHECK] = {
      Text{"Clay Check", "Certificat Grogoron", "Comprobante de Reclamación"},
      Text{"Ancient Tablet", "Stèle ancienne", "Litografía arcana"},
      Text{"Sheikah Slate", "Tablette Sheikah", "Piedra Sheikah"},
      Text{"Cyclone Slate", "Ardoise des tornades", "Pizarra de los Torbellinos"}};
 
-  trickNameTable[GI_SKULL_TOKEN] = {
+  trickNameTable[RG_GOLD_SKULLTULA_TOKEN] = {
      Text{"Skulltula Token", "Bon de Skulltula dorée", "Símbolo de Skulltula"},
      Text{"Golden Skulltula Spirit", "Pièce de Skulltula dorée", "Tóken de Skulltula Dorada"},
      Text{"Gold Walltula Token", "Jeton de Walltula dorée", "Skulltula dorada"},
@@ -416,75 +418,75 @@ void InitTrickNames() {
      Text{"Gratitude Crystal", "Cristal de gratitude", "Gema de gratitud"},
      Text{"Korok Seed", "Noix korogu", "Semilla de kolog"}};
 
-  trickNameTable[0x80] = {
+  trickNameTable[RG_PROGRESSIVE_HOOKSHOT] = {
      Text{"Progressive Grappling Hook", "Lance-chaîne (prog.)", "Garra progresiva"},
      Text{"Progressive Clawshot", "Grappin-griffe (prog.)", "Zarpa progresiva"},
      Text{"Progressive Gripshot", "Grappince (prog.)", "Enganchador progresivo"},
      Text{"Progressive Rope", "Corde (prog.)", "Cuerda progresivo"}};
-  trickNameTable[0x81] = {
+  trickNameTable[RG_PROGRESSIVE_STRENGTH] = {
      Text{"Power Glove", "Gant de Puissance (prog.)", "Guanteletes progresivos"},
      Text{"Power Bracelet", "Bracelet de Force (prog.)", "Brasaletes progresivos"},
      Text{"Magic Bracelet", "Bracelet Magique (prog.)", "Manoplas progresivas"}};
-  trickNameTable[0x82] = {
+  trickNameTable[RG_PROGRESSIVE_BOMB_BAG] = {
      Text{"Progressive Bomb Capacity", "Capacité de bombes (prog.)", "Mayor capacidad de bombas"},
      Text{"Progressive Bomb Pack", "Paquet de bombes (prog.)", "Zurrón de bombas progresivo"},
      Text{"Progressive Bomb Box", "Boîte à bombes (prog.)", "Bolsa de bombas progresiva"},
      Text{"Progressive Blast Mask", "Masque d'Explosion (prog.)", "Máscara explosiva progresiva"},
      Text{"Progressive Powder Kegs", "Baril de Poudre (prog.)", "Barril de polvo progresivo"},
      Text{"Progressive Remote Bombs", "Bombes à distance (prog.)", "Bombas remotas progresivas"}};
-  trickNameTable[0x83] = {
+  trickNameTable[RG_PROGRESSIVE_BOW] = {
      Text{"Progressive Arrow Capacity", "Capacité de flèches (prog.)", "Mayor capacidad de flechas"},
      Text{"Progressive Hero's Bow", "Arc du héros (prog.)", "Arco del héroe progresivo"},
      Text{"Progressive Arrow Holder", "Arbalète (prog.)", "Ballesta progresiva"},
      Text{"Progressive Crossbow", "Arbalète (prog.)", "Ballesta progresiva"},
      Text{"Progressive Sacred Bow", "Arc sacré (prog)", "Arco Sagrado Progresivo"},
      Text{"Progressive Lynel Bow", "Arc de Lynel (prog.)", "Arco de centaleón Progresivo"}};
-  trickNameTable[0x84] = {
+  trickNameTable[RG_PROGRESSIVE_SLINGSHOT] = {
      Text{"Progressive Seed Capacity", "Capacité de graines (prog.)", "Mayor capacidad de semillas"},
      Text{"Progressive Catapult", "Catapulte (prog.)", "Catapulta progresiva"},
      Text{"Progressive Scattershot", "Lance-Pierre rafale (prog.)", "Resortera múltiple progresiva"},
      Text{"Progressive Seed Launcher", "Lanceur de semences (prog.)", "Lanzador de semillas progresivo"},
      Text{"Progressive Seed Satchel", "Sac de graines (prog.)", "Bolsa de semillas progresiva"}};
-  trickNameTable[0x85] = {
+  trickNameTable[RG_PROGRESSIVE_WALLET] = {
      Text{"Progressive Rupee Capacity", "Capacité de rubis (prog.)", "Mayor capacidad de rupias"},
      Text{"Progressive Purse", "Sacoche (prog.)", "Cartera de rupias progresiva"},
      Text{"Progressive Rupee Bag", "Sac à rubis (prog.)", "Zurrón de rupias progresivo"},
      Text{"Progressive Rupoor Capacity", "Capacité de Roupir (prog.)", "Capacidad progresiva Rupobre"},
      Text{"Progressive Spoils Bag", "Sac à Butin (prog.)", "Bolsa de trofeos progresiva"},
      Text{"Progressive Ruby Bag", "Capacité du sac Ruby (prog.)", "Bolso Ruby progresivo"}};
-  trickNameTable[0x86] = {
+  trickNameTable[RG_PROGRESSIVE_SCALE] = {
      Text{"Progressive Flippers", "Palmes de Zora (prog.)", "Aletas de zora progresiva"},
      Text{"Progressive Dragon's Scale", "Écaille du dragon d'eau (prog.)", "Escama dragón acuático progresiva"},
      Text{"Progressive Diving Ability", "Plongée (prog.)", "Buceo progresivo"},
      Text{"Progressive Pearl", "Perle (prog.)", "Perla progresiva"},
      Text{"Progressive Scute", "Bulle (prog.)", "Fragmento Zora progresivo"}};
-  trickNameTable[0x87] = {
+  trickNameTable[RG_PROGRESSIVE_NUT_UPGRADE] = {
      Text{"Progressive Nut Pack", "Paquet de noix (prog.)", "Mayor capacidad de semillas"},
      Text{"Progressive Bait Bag", "Sac à Appâts (prog.)", "Bolsa de cebo progresiva"},
      Text{"Progressive Pear Capacity", "Capacité de poire (prog.)", "Capacidad progresiva de pera"},
      Text{"Progressive Nut Bag", "Sac de noix (prog.)", "Bolsa de nueces progresiva"},
      Text{"Progressive Husk Capacity", "Capacité de noisettes (prog.)", "Mayor capacidad de castañas"}};
-  trickNameTable[0x88] = {
+  trickNameTable[RG_PROGRESSIVE_STICK_UPGRADE] = {
      Text{"Progressive Stick Bag", "Sac de bâtons (prog.)", "Mayor capacidad de ramas deku"},
      Text{"Progressive Stick Pack", "Paquet de bâtons Mojo (prog.)", "Mayor capacidad de bastones"},
      Text{"Progressive Branch Capacity", "Capacité de la succursale (prog.)", "Capacidad progresiva de la sucursal"},
      Text{"Progressive Rod Capacity", "Capacité de tiges (prog.)", "Mayor capacidad de cetros deku"}};
-  trickNameTable[0x89] = {
+  trickNameTable[RG_PROGRESSIVE_BOMBCHUS] = {
      Text{"Progressive Bomblings", "Bombinsectes (prog.)", "Bombinsectos progresivos"},
      Text{"Progressive Sentrobe Bombs", "Bombe de Sphérodrone (prog.)", "Bomba de helicobot progresivo"},
      Text{"Progressive Bomb-ombs", "Bombe Soldat (prog.)", "Soldado bomba progresivo"},
      Text{"Progressive Missiles", "Missiles (prog.)", "Misiles progresivos"},
      Text{"Progressive Bombchu Bag", "Sac à Bombchu (prog.)", "Bombachus progresivos"}};
-  trickNameTable[0x8A] = {
+  trickNameTable[RG_PROGRESSIVE_MAGIC_METER] = {
      Text{"Progressive Stamina Meter", "Jauge d'endurance (prog.)", "Medidor de vigor progresivo"},
      Text{"Progressive Energy Gauge", "Jauge d'énergie (prog.)", "Medidor de energía progresivo"},
      Text{"Progressive Magic Powder", "Poudre magique (prog.)", "Medidor de carga progresivo"}};
-  trickNameTable[0x8B] = {
+  trickNameTable[RG_PROGRESSIVE_OCARINA] = {
      Text{"Progressive Memento", "Souvenir (prog.)", "Silbato progresivo"},
      Text{"Progressive Whistle", "Siffler (prog.)", "Silbido progresivo"},
      Text{"Progressive Flute", "Flûte (prog.)", "Flauta progresiva"},
      Text{"Progressive Recorder", "Harmonica (prog.)", "Armónica progresiva"}};
-  trickNameTable[0xD4] = {
+  trickNameTable[RG_PROGRESSIVE_GORONSWORD] = {
      Text{"Progressive Titan Blade", "Lame des Titans (prog.)", "Hoja del Titán progresiva"},
      Text{"Progressive Goron Knife", "Lame Goron (prog.)", "Daga Goron progresiva"},
      Text{"Progressive Giant Sword", "Épée géante (prog.)", "Espada gigante progresiva"},
@@ -492,212 +494,212 @@ void InitTrickNames() {
      Text{"Progressive Power Sword", "Épée de Puissance (prog.)", "Espada de poder progresiva"},
      Text{"Progressive Big Stabby", "Gros coup de poignard (prog.)", "Gran puñalada progresiva"}};
 
-  trickNameTable[0x0F] = {
+  trickNameTable[RG_EMPTY_BOTTLE] = {
      Text{"Empty Canteen", "Cantine vide", "cantimplora vacía"},
      Text{"Vial of Winds", "Fiole de vents", "Vial de Vientos"},
      Text{"Tingle Bottle", "Flacon de Tingle", "Botella de Tingle"},
      Text{"Magic Bottle", "Flacon magique", "Frasco feérico"},
      Text{"Glass Bottle", "Flacon de verre", "Botella de cristal"},
      Text{"Bottle with Water", "Flacon d'eau", "Botella Tingle"}};
-  trickNameTable[0x14] = {
+  trickNameTable[RG_BOTTLE_WITH_MILK] = {
      Text{"Bottle with Chateau Romani", "Flacon de cuvée Romani", "Botella de Reserva Romani"},
      Text{"Bottle with Premium Milk", "Flacon avec lait de qualité supérieure", "Biberón con leche Premium"},
      Text{"Bottle with Mystery Milk", "Flacon de lait grand cru", "Botella de leche extra"},
      Text{"Bottle with Fresh Milk", "Flacon de lait frais", "Botella de leche fresca"},};
-  trickNameTable[0x8C] = {
+  trickNameTable[RG_BOTTLE_WITH_RED_POTION] = {
      Text{"Bottle with Red Chu Jelly", "Flacon de gelée Chuchu rouge", "Jugo de Chuchu Rojo"},
      Text{"Bottle with Hibiscus Potion", "Flacon de potion de Hibiscus", "Botella de poción de Hibisco"},
      Text{"Bottle with Medicine of Life", "Flacon d'élixir rouge", "Botella de medicina de la vida"},
      Text{"Bottle with Heart Potion", "Flacon de potion de soin", "Botella de poción de salud"}};
-  trickNameTable[0x8D] = {
+  trickNameTable[RG_BOTTLE_WITH_GREEN_POTION] = {
      Text{"Bottle with Green Chu Jelly", "Flacon de gelée Chuchu verte", "Jugo de Chuchu Verde"},
      Text{"Bottle with Lamp Oil", "Flacon de Huile à lanterne", "Botella de Aceite de candil "},
      Text{"Bottle with Medicine of Magic", "Flacon d'élixir vert", "Botella de medicina mágica"},
      Text{"Bottle with Stamina Potion", "Flacon d'Endurol", "Botella de elixir vigorizante"}};
-  trickNameTable[0x8E] = {
+  trickNameTable[RG_BOTTLE_WITH_BLUE_POTION] = {
      Text{"Bottle with Blue Chu Jelly", "Flacon de gelée Chuchu bleue", "Jugo de Chuchu Azul"},
      Text{"Bottle with Water of Life", "Flacon d'élixir bleu", "Botella de agua de la vida"},
      Text{"Bottle with Air Potion", "Flacon de potion d'oxygène", "Botella de oxígeno"}};
-  trickNameTable[0x8F] = {
+  trickNameTable[RG_BOTTLE_WITH_FAIRY] = {
      Text{"Bottle with Forest Firefly", "Flacon avec une luciole", "Luciérnaga del bosque"},
      Text{"Bottle with Deku Princess", "Flacon avec Deku Princess", "Botella con Deku Princess"},
      Text{"Bottle with Stray Fairy", "Flacon avec une fée perdue", "Hada perdida en una botella"}};
-  trickNameTable[0x90] = {
+  trickNameTable[RG_BOTTLE_WITH_FISH] = {
      Text{"Bottle with Small Jabu-Jabu", "Flacon avec mini Jabu-Jabu", "Lord Chapu-Chapu embotellado"},
      Text{"Bottle with Reekfish", "Flacon avec Reekfish", "Reekfish embotellada"},
      Text{"Bottle with Hyrule Bass", "Flacon avec perche d'Hyrule", "Locha de Hyrule embotellada"},
      Text{"Bottle with Hyrule Loach", "Flacon avec loche d'Hyrule", "Perca de Términa embotellada"}};
-  trickNameTable[0x91] = {
+  trickNameTable[RG_BOTTLE_WITH_BLUE_FIRE] = {
      Text{"Bottle with Will-O-Wisp", "Flacon avec feu follet", "Botella de llama azul"},
      Text{"Bottle with Ancient Flame", "Flacon de flamme ancienne", "Botella de fuego ancestral"},
      Text{"Bottle with a Blue Candle", "Flacon avec une bougie bleue", "Botella con una vela azul"},
      Text{"Bottle with Red Ice", "Flacon de Glace Rouge", "Botella de Hielo rojo"},
      Text{"Bottle with Nayru's Flame", "Flacon de flamme de Nayru", "Botella de llamas de Nayru"}};
-  trickNameTable[0x92] = {
+  trickNameTable[RG_BOTTLE_WITH_BUGS] = {
      Text{"Bottle with Baby Tektites", "Flacon de bébé Araknon", "Tektites en una botella"},
      Text{"Bottle with A Beetle", "Flacon avec un scarabée", "Botella con un escarabajo"},
      Text{"Bottle with Lanayru Ants", "Flacon de fourmis de Lanelle", "Celestarabajo embotellado"},
      Text{"Bottle with Insects", "Flacon de bibittes", "Saltabosques embotellados"},
      Text{"Bottle with a Golden Bee", "Flacon avec une abeille dorée", "Botella con una abeja dorada"}};
-  trickNameTable[0x94] = {
+  trickNameTable[RG_BOTTLE_WITH_POE] = {
      Text{"Bottle with Ghini", "Flacon avec Ghini", "Ghini en una botella"},
      Text{"Bottle with Reapling", "Flacon avec Âme Damnée", "Reapling en una botella"},
      Text{"Bottle with Imp Poe", "Flacon avec Spectre", "Espectro en una botella"},
      Text{"Bottle with Anti-Fairy", "Flacon avec Tetdoss", "Whisp en una botella"}};
 
-  trickNameTable[0x15] = {
+  trickNameTable[RG_RUTOS_LETTER] = {
      Text{"Bottle with Maggie's Letter", "Flacon avec lettre de Maggy", "Carta de Dolores"},
      Text{"Bottle with Letter to Kafei", "Flacon avec lettre pour Kafei", "Carta para Kafei"},
      Text{"Bottle with Zelda's Letter", "Flacon avec Lettre de Zelda", "Carta náutica"}};
-  trickNameTable[0x93] = {
+  trickNameTable[RG_BOTTLE_WITH_BIG_POE] = {
      Text{"Bottle with Composer Brother", "Flacon avec un compositeur", "Hermana Poe embotellada"},
      Text{"Bottle with Jalhalla", "Flacon avec Jalhalla", "Yaihalla embotellado"},
      Text{"Bottle with Grim Repoe", "Flacon avec le Faucheur", "Bubble en una botella"}};
 
-  trickNameTable[0xC1] = {
+  trickNameTable[RG_ZELDAS_LULLABY] = {
      Text{"Ballad of the Goddess", "Chant de la déesse", "Cántico de la Diosa"},
      Text{"Song of Healing", "Chant de l'apaisement", "Canción de curación"},
      Text{"Song of the Hero", "Chant du héros", "Canción del héroe"}};
-  trickNameTable[0xC2] = {
+  trickNameTable[RG_EPONAS_SONG] = {
      Text{"Song of Birds","Chant des oiseaux","Cantar del ave"},
      Text{"Song of Soaring", "Chant de l'envol", "Canción del viento"},
      Text{"Song of Horse", "Chant du cheval", "Chant du cheval"}};
-  trickNameTable[0xC3] = {
+  trickNameTable[RG_SARIAS_SONG] = {
      Text{"Mido's Song", "La chanson de Mido", "La canción de Mido"},
      Text{"Kass' Theme", "Le thème de Kass", "El tema de Kass"},
      Text{"Tune of Echoes", "Chant des Échos ", "Melodía del Eco "}};
-  trickNameTable[0xC4] = {
+  trickNameTable[RG_SUNS_SONG] = {
      Text{"Song of Passing", "Mambo de Manbo", "Melodía del transcurrir"},
      Text{"Command Melody", "Air du marionnettiste", "Cara al Sol"},
      Text{"Moon's Song", "La chanson de Moon", "La canción de la luna"}};
-  trickNameTable[0xC5] = {
+  trickNameTable[RG_SONG_OF_TIME] = {
      Text{"Song of Double Time", "Chant accéléré", "Canción del doble tiempo"},
      Text{"Inverted Song of Time", "Chant du temps inversé", "Canción del tiempo invertida"},
      Text{"Tune of Ages", "Chant du Temps", "Melodía del Tiempo"}};
-  trickNameTable[0xC6] = {
+  trickNameTable[RG_SONG_OF_STORMS] = {
      Text{"Ballad of Gales", "Requiem de la tornade", "Melodía del Tornado"},
      Text{"Frog's Song of Soul", "Rap des grenouilles", "Canción del alma de la rana"},
      Text{"Wind's Requiem", "Mélodie du vent", "Melodía del Viento"}};
-  trickNameTable[0xBB] = {
+  trickNameTable[RG_MINUET_OF_FOREST] = {
      Text{"Saria's Karaoke", "Karaoké de Saria", "Dueto del bosque"},
      Text{"Sonata of Awakening", "Sonate de l'éveil", "Sonata del despertar"},
      Text{"Wind God's Aria", "Hymne du dieu du vent", "Melodía del Espíritu del Viento"}};
-  trickNameTable[0xBC] = {
+  trickNameTable[RG_BOLERO_OF_FIRE] = {
      Text{"Darunia's Tango", "Tango de Darunia", "Coro del fuego"},
      Text{"Tune of Currents", "Chants des Flux", "Melodía de las Corrientes"},
      Text{"Goron Lullaby", "Berceuse des Gorons", "Nana goron"}};
-  trickNameTable[0xBD] = {
+  trickNameTable[RG_SERENADE_OF_WATER] = {
      Text{"Ruto's Blues", "Blues de Ruto", "Sonata del agua"},
      Text{"New Wave Bossa Nova", "Bossa-nova des flots", "Bossanova de las olas"},
      Text{"Manbo's Mambo", "Mambo de Manbo", "Mambo de Manbo"}};
-  trickNameTable[0xBE] = {
+  trickNameTable[RG_REQUIEM_OF_SPIRIT] = {
      Text{"Nabooru's Reggae", "Reggae de Nabooru", "Reggae del espíritu"},
      Text{"Elegy of Emptiness", "Hymne du vide", "Elegía al vacío"},
      Text{"Earth God's Lyric", "Hymne du dieu de la terre", "Melodía del Espíritu de la Tierra"}};
-  trickNameTable[0xBF] = {
+  trickNameTable[RG_NOCTURNE_OF_SHADOW] = {
      Text{"Impa's Death Metal", "Death métal d'Impa", "Diurno de la sombra"},
      Text{"Oath to Order", "Ode de l'appel", "Oda al orden"},
      Text{"Song of Discovery", "Chant des secrets", "Canto revelador"}};
-  trickNameTable[0xC0] = {
+  trickNameTable[RG_PRELUDE_OF_LIGHT] = {
      Text{"Rauru's Sing-Along", "Chansonnette de Rauru", "Predulio de luz"},
      Text{"Ballad of the Wind Fish", "Ballade sur Poisson-Rêve", "Balada del Piez Viento"},
      Text{"Song of Light", "Chant de la lumière", "Sonidos de la luz"}};
 
-  trickNameTable[0xCB] = {
+  trickNameTable[RG_KOKIRI_EMERALD] = {
      Text{"Pendant of Courage", "Pendentif du courage", "Colgante del valor"},
      Text{"Farore's Pearl", "Perle de Farore", "Orbe de Farore"},
      Text{"Aquanine", "Smaragdine", "Yerbánida"},
      Text{"Farore's Emerald", "Émeraude de Farore", "Esmeralda de Farore"},
      Text{"Kokiri's Peridot", "Péridot Kokiri", "Ágata de los Kokiri"}};
-  trickNameTable[0xCC] = {
+  trickNameTable[RG_GORON_RUBY] = {
      Text{"Pendant of Power", "Pendentif de la force", "Colgante del poder"},
      Text{"Din's Pearl", "Perle de Din", "Orbe de Din"},
      Text{"Crimsonine", "Alzanine", "Bermellina"},
      Text{"Din's Ruby", "Rubis de Din", "Rubí de Din"},
      Text{"Goron's Garnet", "Grenat Goron", "Topacio de los Goron"}};
-  trickNameTable[0xCD] = {
+  trickNameTable[RG_ZORA_SAPPHIRE] = {
      Text{"Pendant of Wisdom", "Pendentif de la sagesse", "Colgante de la sabiduría"},
      Text{"Nayru's Pearl", "Perle de Nayru", "Orbe de Nayru"},
      Text{"Azurine", "Aquanine", "Azurina"},
      Text{"Nayru's Sapphire", "Saphir de Nayru", "Zafiro de Nayru"},
      Text{"Zora's Aquamarine", "Aquamarine Zora", "Lapislázuli de los Zora"}};
-  trickNameTable[0xCE] = {
+  trickNameTable[RG_FOREST_MEDALLION] = {
      Text{"Wind Medallion", "Médaillon du vent", "Medallón del Viento"},
      Text{"Wind Element", "Elément Vent", "Elemento de aire"},
      Text{"Saria's Medallion", "Médaillon de Saria", "Medallón de Saria"},
      Text{"Sign of Air", "Glyphe de l'air", "Glifo de aire"},
      Text{"Medallion of Forest", "Médaillon du Temple de la Forêt", "Medalla del Bosque"}};
-  trickNameTable[0xCF] = {
+  trickNameTable[RG_FIRE_MEDALLION] = {
      Text{"Fire Element", "Elément Feu", "Elemento de fuego"},
      Text{"Darunia's Medallion", "Médaillon de Darunia", "Medallón de Darunia"},
      Text{"Sign of Fire", "Glyphe de feu", "Glifo de fuego"},
      Text{"Medallion of Fire", "Médaillon du Temple du Feu", "Medalla del Fuego"}};
-  trickNameTable[0xD0] = {
+  trickNameTable[RG_WATER_MEDALLION] = {
      Text{"Water Element", "Elément Eau", "Elemento de agua"},
      Text{"Ice Medallion", "Médaillon de glace", "Medallón Helado"},
      Text{"Ruto's Medallion", "Médaillon de Ruto", "Medallón de Ruto"},
      Text{"Sign of Water", "Glyphe de l'eau", "Glifo de agua"},
      Text{"Medallion of Water", "Médaillon du Temple de l'Eau", "Medalla del Agua"}};
-  trickNameTable[0xD1] = {
+  trickNameTable[RG_SPIRIT_MEDALLION] = {
      Text{"Earth Element", "Elément Terre", "Elemento de tierra"},
      Text{"Nabooru's Medallion", "Médaillon de Nabooru", "Medallón de Nabooru"},
      Text{"Sign of Earth", "Glyphe de la Terre", "Glifo de la tierra"},
      Text{"Medallion of Spirit", "Médaillon du Temple de l'Esprit", "Medalla del Espíritu"}};
-  trickNameTable[0xD2] = {
+  trickNameTable[RG_SHADOW_MEDALLION] = {
      Text{"Fused Shadow", "Cristal d'ombre", "Sombra Fundida"},
      Text{"Impa's Medallion", "Médaillon d'Impa", "Medallón de Impa"},
      Text{"Sign of Illusion", "Glyphe de l'illusion", "Glifo de ilusión"},
      Text{"Medallion of Shadow", "Médaillon du Temple de l'Ombre", "Medalla de la Sombra"}};
-  trickNameTable[0xD3] = {
+  trickNameTable[RG_LIGHT_MEDALLION] = {
      Text{"Compass of Light", "Boussole de lumière", "Brújula de Luz"},
      Text{"Rauru's Medallion", "Médaillon de Rauru", "Medallón de Rauru"},
      Text{"Sign of Destiny", "Glyphe du destin", "Glifo del destino"},
      Text{"Medallion of Light", "Médaillon du temple de lumière", "Medalla de la Luz"}};
 
-  trickNameTable[GI_HEART] = {
+  trickNameTable[RG_RECOVERY_HEART] = {
      Text{"Love", "Bisou", "Te amo"},
      Text{"Life", "Vie", "vida"},
      Text{"HP", "VP", "VP"}};
-  trickNameTable[GI_RUPEE_GREEN] = {
+  trickNameTable[RG_GREEN_RUPEE] = {
      Text{"False Greg", "Faux Greg", "Falso Greg"},
      Text{"One Ruby", "Un rubis", "Un rubí"},
      Text{"Rupoor (1)", "Roupir (1)", "Rupobre (1)"},
      Text{"One Rupee", "Un rubis", "Guaraní hyliano"},
      Text{"Rupee (1)", "Rubis (1)", "Peso hyliano"}};
-  trickNameTable[GI_RUPEE_BLUE] = {
+  trickNameTable[RG_BLUE_RUPEE] = {
      Text{"Blupee", "Bleubi", "Azupia"},
      Text{"Five Rubies", "Cinq Rubys", "Cinco rubíes"},
      Text{"Five Rupees", "Cinq rubis", "Bolívar hyliano"},
      Text{"Rupee (5)", "Rubis (5)", "Peso hyliano"},
      Text{"Rupoor (5)", "Roupir (5)", "Rupobre (5)"}};
-  trickNameTable[GI_RUPEE_RED] = {
+  trickNameTable[RG_RED_RUPEE] = {
      Text{"Big 20", "Grand 20", "Los 20 grandes"},
      Text{"Twenty Rubies", "vingt rubis", "Veinte rubíes"},
      Text{"Rupoor (20)", "Roupir (20)", "Rupobre (20)"},
      Text{"Twenty Rupees", "Vingt rubis", "Colon hyliano"},
      Text{"Rupee (20)", "Rubis (20)", "Peso hyliano"}};
-  trickNameTable[GI_RUPEE_PURPLE] = {
+  trickNameTable[RG_PURPLE_RUPEE] = {
      Text{"Purpee", "pourbi", "morupiua"},
      Text{"Fifty Rubies", "cinquante rubis", "Cincuenta rubíes"},
      Text{"Rupoor (50)", "Roupir (50)", "Rupobre (50)"},
      Text{"Fifty Rupees", "Cinquante rubis", "Balboa hyliano"},
      Text{"Rupee (50)", "Rubis (50)", "Peso hyliano"}};
-  trickNameTable[GI_RUPEE_GOLD] = {
+  trickNameTable[RG_HUGE_RUPEE] = {
      Text{"Hugo", "Or Rubi", "Oro Rubi"},
      Text{"Two Hundred Rubies", "deux cents rubis", "Doscientos rubíes"},
      Text{"Diamond", "Diamant", "Diamante"},
      Text{"Huge Ruby", "Énorme rubis", "Rubi gigante"},
      Text{"Two Hundred Rupees", "Deux cent rubis", "Euro hyliano"},
      Text{"Rupee (200)", "Rubis (200)", "Dólar hyliano"}};
-  trickNameTable[GI_HEART_PIECE] = {
+  trickNameTable[RG_PIECE_OF_HEART] = {
      Text{"Pizza Heart", "Fromage de cœur", "Pieza de Chorizo"},
      Text{"Little Bit Of Love", "Un peu d'amour", "Un poco de amor"},
      Text{"Rare Peach Stone", "Pierre de pêche rare", "Pierre de pêche rare"}};
-  trickNameTable[GI_HEART_CONTAINER_2] = {
+  trickNameTable[RG_HEART_CONTAINER] = {
      Text{"Crystal Heart", "Cœur de cristal", "Corazón de cristal"},
      Text{"Life Heart", "Cœur de vie", "Vida Corazón"},
      Text{"Lots of Love", "Beaucoup d'amour", "Mucho amor"}};
-  trickNameTable[0xDF] = {
+  trickNameTable[RG_TRIFORCE_PIECE] = {
      Text{"Piece of Cheese", "Morceau de Fromage", "Piece of Cheese"},
      Text{"Triforce Shard", "Éclat de Triforce", "Triforce Shard"},
      Text{"Shiny Rock", "Caiiloux Brillant", "Shiny Rock"}};
diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
index 56288070b..f28f8b3c3 100644
--- a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
@@ -1,12 +1,11 @@
 #include "spoiler_log.hpp"
 
-#include "dungeon.hpp"
+#include "../dungeon.h"
 #include "../static_data.h"
 #include "../context.h"
-#include "entrance.hpp"
+#include "../entrance.h"
 #include "random.hpp"
-#include "settings.hpp"
-#include "trial.hpp"
+#include "../trial.h"
 #include "tinyxml2.h"
 #include "utils.hpp"
 #include "shops.hpp"
@@ -33,6 +32,7 @@
 #include <Context.h>
 
 using json = nlohmann::ordered_json;
+using namespace Rando;
 
 json jsonData;
 std::map<RandomizerHintTextKey, Rando::ItemLocation*> hintedLocations;
@@ -48,14 +48,15 @@ std::string placementtxt;
 static SpoilerData spoilerData;
 
 void GenerateHash() {
-    std::string hash = Settings::hash;
+    auto ctx = Rando::Context::GetInstance();
+    std::string hash = ctx->GetSettings()->GetHash();
     // adds leading 0s to the hash string if it has less than 10 digits.
     while (hash.length() < 10) {
         hash = "0" + hash;
     }
-    for (size_t i = 0, j = 0; i < Settings::hashIconIndexes.size(); i++, j += 2) {
+    for (size_t i = 0, j = 0; i < ctx->hashIconIndexes.size(); i++, j += 2) {
         int number = std::stoi(hash.substr(j, 2));
-        Settings::hashIconIndexes[i] = number;
+        ctx->hashIconIndexes[i] = number;
     }
 
     // Clear out spoiler log data here, in case we aren't going to re-generate it
@@ -114,26 +115,26 @@ void WriteIngameSpoilerLog() {
         //     continue;
         // }
         // Cows
-        if (!Settings::ShuffleCows && loc->IsCategory(Category::cCow)) {
+        if (!ctx->GetOption(RSK_SHUFFLE_COWS) && loc->IsCategory(Category::cCow)) {
             continue;
         }
         // Merchants
-        else if (Settings::ShuffleMerchants.Is(SHUFFLEMERCHANTS_OFF) && loc->IsCategory(Category::cMerchant)) {
+        else if (ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_OFF) && loc->IsCategory(Category::cMerchant)) {
             continue;
         }
         // Adult Trade
-        else if (!Settings::ShuffleAdultTradeQuest && loc->IsCategory(Category::cAdultTrade)) {
+        else if (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && loc->IsCategory(Category::cAdultTrade)) {
             continue;
         }
         // Chest Minigame
-        else if (Settings::ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_OFF) &&
+        else if (ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_GENERIC_OFF) &&
                  loc->IsCategory(Category::cChestMinigame)) {
             continue;
         }
         // Gerudo Fortress
-        else if ((Settings::GerudoFortress.Is(GERUDOFORTRESS_OPEN) &&
+        else if ((ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_NORMAL) &&
                   (loc->IsCategory(Category::cVanillaGFSmallKey) || loc->GetHintKey() == RHT_GF_GERUDO_MEMBERSHIP_CARD)) ||
-                 (Settings::GerudoFortress.Is(GERUDOFORTRESS_FAST) && loc->IsCategory(Category::cVanillaGFSmallKey) &&
+                 (ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_FAST) && loc->IsCategory(Category::cVanillaGFSmallKey) &&
                   loc->GetHintKey() != RHT_GF_NORTH_F1_CARPENTER)) {
             continue;
         }
@@ -186,7 +187,7 @@ void WriteIngameSpoilerLog() {
         }
         // Shops
         else if (loc->IsShop()) {
-            if (Settings::Shopsanity.Is(SHOPSANITY_OFF)) {
+            if (ctx->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_OFF)) {
                 spoilerData.ItemLocations[spoilerItemIndex].RevealType = REVEALTYPE_ALWAYS;
             } else {
                 spoilerData.ItemLocations[spoilerItemIndex].RevealType = REVEALTYPE_SCENE;
@@ -199,14 +200,14 @@ void WriteIngameSpoilerLog() {
         }
         // Gold Skulltulas
         else if (loc->IsCategory(Category::cSkulltula) &&
-                 ((Settings::Tokensanity.Is(TOKENSANITY_OFF)) ||
-                  (Settings::Tokensanity.Is(TOKENSANITY_DUNGEONS) && !loc->IsDungeon()) ||
-                  (Settings::Tokensanity.Is(TOKENSANITY_OVERWORLD) && loc->IsDungeon()))) {
+                 ((ctx->GetOption(RSK_SHUFFLE_TOKENS).Is(RO_TOKENSANITY_OFF)) ||
+                  (ctx->GetOption(RSK_SHUFFLE_TOKENS).Is(RO_TOKENSANITY_DUNGEONS) && !loc->IsDungeon()) ||
+                  (ctx->GetOption(RSK_SHUFFLE_TOKENS).Is(RO_TOKENSANITY_OVERWORLD) && loc->IsDungeon()))) {
             spoilerData.ItemLocations[spoilerItemIndex].RevealType = REVEALTYPE_ALWAYS;
         }
         // Deku Scrubs
         else if (loc->IsCategory(Category::cDekuScrub) && !loc->IsCategory(Category::cDekuScrubUpgrades) &&
-                 Settings::Scrubsanity.Is(SCRUBSANITY_OFF)) {
+                 ctx->GetOption(RSK_SHUFFLE_SCRUBS).Is(RO_SCRUBS_OFF)) {
             spoilerData.ItemLocations[spoilerItemIndex].CollectType = COLLECTTYPE_REPEATABLE;
             spoilerData.ItemLocations[spoilerItemIndex].RevealType = REVEALTYPE_ALWAYS;
         }
@@ -226,7 +227,7 @@ void WriteIngameSpoilerLog() {
     }
     spoilerData.ItemLocationsCount = spoilerItemIndex;
 
-    if (Settings::IngameSpoilers) {
+    if (/*Settings::IngameSpoilers TODO: Remove: don't think we have any need for this*/ false) {
         bool playthroughItemNotFound = false;
         // Write playthrough data to in-game spoiler log
         if (!spoilerOutOfSpace) {
@@ -357,76 +358,47 @@ static void WriteShuffledEntrance(std::string sphereString, Entrance* entrance)
 
 // Writes the settings (without excluded locations, starting inventory and tricks) to the spoilerLog document.
 static void WriteSettings(const bool printAll = false) {
-  // auto parentNode = spoilerLog.NewElement("settings");
-
-  std::vector<Menu*> allMenus = Settings::GetAllOptionMenus();
-
-  for (const Menu* menu : allMenus) {
-    if (menu->name == "Item Usability Settings" ||
-        menu->name == "Multiplayer Settings") continue;
-
-    if (menu->name == "Timesaver Settings") {
-      for (const Option* setting : *menu->settingsList) {
-        if (setting->GetName() == "Big Poe Target Count" ||
-            setting->GetName() == "Cuccos to return" ||
-            setting->GetName() == "Skip Epona Race" ||
-            setting->GetName() == "Skip Tower Escape" ||
-            setting->GetName() == "Skip Child Stealth" ||
-            setting->GetName() == "Complete Mask Quest" ||
-            setting->GetName() == "Skip Scarecrow's Song" ||
-            setting->GetName() == "Enable Glitch-Useful Cutscenes") {
-            std::string settingName = menu->name + ":" + setting->GetName();
-            jsonData["settings"][settingName] = setting->GetSelectedOptionText();
+    // auto parentNode = spoilerLog.NewElement("settings");
+    auto ctx = Rando::Context::GetInstance();
+    auto allOptionGroups = ctx->GetSettings()->GetOptionGroups();
+    for (const Rando::OptionGroup& optionGroup : allOptionGroups) {
+        if (optionGroup.GetName() == "Timesaver Settings") {
+            for (const Rando::Option* option : optionGroup.GetOptions()) {
+                if (option->GetName() == "Big Poe Target Count" || option->GetName() == "Cuccos to return" ||
+                    option->GetName() == "Skip Epona Race" || option->GetName() == "Skip Tower Escape" ||
+                    option->GetName() == "Skip Child Stealth" || option->GetName() == "Complete Mask Quest" ||
+                    option->GetName() == "Skip Scarecrow's Song" ||
+                    option->GetName() == "Enable Glitch-Useful Cutscenes") {
+                    std::string settingName = optionGroup.GetName() + ":" + option->GetName();
+                    jsonData["settings"][settingName] = option->GetSelectedOptionText();
+                }
+            }
+            continue;
+        }
+        if (optionGroup.GetContainsType() == Rando::OptionGroupType::DEFAULT && optionGroup.PrintInSpoiler()) {
+            for (const Rando::Option* option : optionGroup.GetOptions()) {
+                std::string settingName = optionGroup.GetName() + ":" + option->GetName();
+                jsonData["settings"][settingName] = option->GetSelectedOptionText();
+            }
         }
-      }
-      continue;
     }
 
-    //This is a menu of settings, write them
-    if (menu->mode == OPTION_SUB_MENU && menu->printInSpoiler) {
-      for (const Option* setting : *menu->settingsList) {
-        std::string settingName = menu->name + ":" + setting->GetName();
-        jsonData["settings"][settingName] = setting->GetSelectedOptionText();
-      }
+    // spoilerLog.RootElement()->InsertEndChild(parentNode);
 
-
-      // for (const Option* setting : *menu->settingsList) {
-      //   if (printAll || (!setting->IsHidden() && setting->IsCategory(OptionCategory::Setting))) {
-      //     auto node = parentNode->InsertNewChildElement("setting");
-      //     node->SetAttribute("name", RemoveLineBreaks(setting->GetName()).c_str());
-      //     node->SetText(setting->GetSelectedOptionText().c_str());
-      //   }
-      // }
-    }
-  }
-
-  // 3drando doesn't have a "skip child zelda" setting, manually add it to the spoilerfile
-  jsonData["settings"]["Skip Child Zelda"] = Settings::skipChildZelda;
-
-  // 3drando uses an MQ dungeon count of 13 to mean random, manually add that to the spoilerfile as a bool
-  if (Settings::MQDungeonCount.GetSelectedOptionIndex() == 0) {
-    jsonData["settings"]["World Settings:MQ Dungeons"] = "None";
-  } else if (Settings::MQDungeonCount.GetSelectedOptionIndex() == 13) {
-    jsonData["settings"]["World Settings:MQ Dungeons"] = "Random Number";
-  } else {
-    jsonData["settings"]["World Settings:MQ Dungeons"] = "Set Number";
-  }
-
-  // spoilerLog.RootElement()->InsertEndChild(parentNode);
-
-  //     for (const uint32_t key : allLocations) {
-  //       ItemLocation* location = GetLocation(key);
-  //       settingsJsonData["locations"][location->GetName()] = location->GetPlacedItemName().english;
-  //   }
+    //     for (const uint32_t key : allLocations) {
+    //       ItemLocation* location = GetLocation(key);
+    //       settingsJsonData["locations"][location->GetName()] = location->GetPlacedItemName().english;
+    //   }
 }
 
 // Writes the excluded locations to the spoiler log, if there are any.
 static void WriteExcludedLocations() {
   // auto parentNode = spoilerLog.NewElement("excluded-locations");
+  auto ctx = Rando::Context::GetInstance();
 
-  for (size_t i = 1; i < Settings::excludeLocationsOptionsVector.size(); i++) {
-    for (const auto& location : Settings::excludeLocationsOptionsVector[i]) {
-      if (location->GetSelectedOptionIndex() == INCLUDE) {
+  for (size_t i = 1; i < ctx->GetSettings()->GetExcludeLocationsOptions().size(); i++) {
+    for (const auto& location : ctx->GetSettings()->GetExcludeLocationsOptions()[i]) {
+      if (location->GetSelectedOptionIndex() == RO_LOCATION_INCLUDE) {
         continue;
       }
 
@@ -445,61 +417,24 @@ static void WriteExcludedLocations() {
 
 // Writes the starting inventory to the spoiler log, if there is any.
 static void WriteStartingInventory() {
-  std::vector<std::vector<Option *>*> startingInventoryOptions = {
-    &Settings::startingItemsOptions,
-    &Settings::startingSongsOptions,
-    &Settings::startingEquipmentOptions,
-    &Settings::startingStonesMedallionsOptions,
-    &Settings::startingOthersOptions
-  };
-
-  for (std::vector<Option*>* menu : startingInventoryOptions) {
-      for (size_t i = 0; i < menu->size(); ++i) {
-          const auto setting = menu->at(i);
-          // Starting Songs
-          if (setting->GetName() == "Start with Zelda's Lullaby" || 
-              setting->GetName() == "Start with Epona's Song" ||
-              setting->GetName() == "Start with Saria's Song" || 
-              setting->GetName() == "Start with Sun's Song" ||
-              setting->GetName() == "Start with Song of Time" || 
-              setting->GetName() == "Start with Song of Storms" ||
-              setting->GetName() == "Start with Minuet of Forest" || 
-              setting->GetName() == "Start with Bolero of Fire" ||
-              setting->GetName() == "Start with Serenade of Water" || 
-              setting->GetName() == "Start with Requiem of Spirit" ||
-              setting->GetName() == "Start with Nocturne of Shadow" || 
-              setting->GetName() == "Start with Prelude of Light") {
-              jsonData["settings"][setting->GetName()] = setting->GetSelectedOptionText();
-          }
-      }
-  }
-  for (std::vector<Option *>* menu : startingInventoryOptions) {
-    for (size_t i = 0; i < menu->size(); ++i) {
-      const auto setting = menu->at(i);
-   
-      // we need to write these every time because we're not clearing jsondata, so
-      // the default logic of only writing it when we aren't using the default value
-      // doesn't work, and because it'd be bad to set every single possible starting
-      // inventory item as "false" in the json, we're just going to check
-      // to see if the name is one of the 3 we're using rn
-      if (setting->GetName() == "Start with Consumables" ||
-          setting->GetName() == "Start with Max Rupees" ||
-          setting->GetName() == "Gold Skulltula Tokens" ||
-          setting->GetName() == "Start with Fairy Ocarina" ||
-          setting->GetName() == "Start with Kokiri Sword" ||
-          setting->GetName() == "Start with Deku Shield") {
-        jsonData["settings"][setting->GetName()] = setting->GetSelectedOptionText();
-      }
+    auto ctx = Rando::Context::GetInstance();
+    const Rando::OptionGroup& optionGroup = ctx->GetSettings()->GetOptionGroup(RSG_STARTING_INVENTORY);
+    for (const Rando::OptionGroup* subGroup : optionGroup.GetSubGroups()) {
+        if (subGroup->GetContainsType() == Rando::OptionGroupType::DEFAULT) {
+            for (const Rando::Option* option : subGroup->GetOptions()) {
+                jsonData["settings"][option->GetName()] = option->GetSelectedOptionText();
+            }
+        }
     }
-  }
 }
 
 // Writes the enabled tricks to the spoiler log, if there are any.
 static void WriteEnabledTricks(tinyxml2::XMLDocument& spoilerLog) {
   //auto parentNode = spoilerLog.NewElement("enabled-tricks");
+  auto ctx = Rando::Context::GetInstance();
 
-  for (const auto& setting : Settings::trickOptions) {
-    if (setting->GetSelectedOptionIndex() != TRICK_ENABLED/* || !setting->IsCategory(OptionCategory::Setting)*/) {
+  for (const auto& setting : ctx->GetSettings()->GetOptionGroup(RSG_TRICKS).GetOptions()) {
+    if (setting->GetSelectedOptionIndex() != RO_GENERIC_ON/* || !setting->IsCategory(OptionCategory::Setting)*/) {
       continue;
     }
     jsonData["enabledTricks"].push_back(RemoveLineBreaks(RandomizerTricks::GetRTName((RandomizerTrick)std::stoi(setting->GetName()))).c_str());
@@ -513,36 +448,38 @@ static void WriteEnabledTricks(tinyxml2::XMLDocument& spoilerLog) {
 }
 
 // Writes the enabled glitches to the spoiler log, if there are any.
-static void WriteEnabledGlitches(tinyxml2::XMLDocument& spoilerLog) {
-  auto parentNode = spoilerLog.NewElement("enabled-glitches");
+// TODO: Implement Glitches
+// static void WriteEnabledGlitches(tinyxml2::XMLDocument& spoilerLog) {
+//   auto parentNode = spoilerLog.NewElement("enabled-glitches");
 
-  for (const auto& setting : Settings::glitchCategories) {
-    if (setting->Value<uint8_t>() == 0) {
-      continue;
-    }
+//   for (const auto& setting : Settings::glitchCategories) {
+//     if (setting->Value<uint8_t>() == 0) {
+//       continue;
+//     }
 
-    auto node = parentNode->InsertNewChildElement("glitch-category");
-    node->SetAttribute("name", setting->GetName().c_str());
-    node->SetText(setting->GetSelectedOptionText().c_str());
-  }
+//     auto node = parentNode->InsertNewChildElement("glitch-category");
+//     node->SetAttribute("name", setting->GetName().c_str());
+//     node->SetText(setting->GetSelectedOptionText().c_str());
+//   }
 
-  for (const auto& setting : Settings::miscGlitches) {
-    if (!setting->Value<bool>()) {
-      continue;
-    }
+//   for (const auto& setting : Settings::miscGlitches) {
+//     if (!setting->Value<bool>()) {
+//       continue;
+//     }
 
-    auto node = parentNode->InsertNewChildElement("misc-glitch");
-    node->SetAttribute("name", RemoveLineBreaks(setting->GetName()).c_str());
-  }
+//     auto node = parentNode->InsertNewChildElement("misc-glitch");
+//     node->SetAttribute("name", RemoveLineBreaks(setting->GetName()).c_str());
+//   }
 
-  if (!parentNode->NoChildren()) {
-    spoilerLog.RootElement()->InsertEndChild(parentNode);
-  }
-}
+//   if (!parentNode->NoChildren()) {
+//     spoilerLog.RootElement()->InsertEndChild(parentNode);
+//   }
+// }
 
 // Writes the Master Quest dungeons to the spoiler log, if there are any.
 static void WriteMasterQuestDungeons(tinyxml2::XMLDocument& spoilerLog) {
-    for (const auto* dungeon : Dungeon::dungeonList) {
+    auto ctx = Rando::Context::GetInstance();
+    for (const auto* dungeon : ctx->GetDungeons()->GetDungeonList()) {
         std::string dungeonName;
         if (dungeon->IsVanilla()) {
             continue;
@@ -553,7 +490,8 @@ static void WriteMasterQuestDungeons(tinyxml2::XMLDocument& spoilerLog) {
 
 // Writes the required trials to the spoiler log, if there are any.
 static void WriteRequiredTrials() {
-    for (const auto& trial : Trial::trialList) {
+    auto ctx = Rando::Context::GetInstance();
+    for (const auto& trial : ctx->GetTrials()->GetTrialList()) {
         if (trial->IsRequired()) {
             std::string trialName;
             switch (gSaveContext.language) {
@@ -590,13 +528,14 @@ static void WritePlaythrough() {
 
 //Write the randomized entrance playthrough to the spoiler log, if applicable
 static void WriteShuffledEntrances() {
-  for (uint32_t i = 0; i < playthroughEntrances.size(); ++i) {
+  auto ctx = Rando::Context::GetInstance();
+  for (uint32_t i = 0; i < ctx->GetEntranceShuffler()->playthroughEntrances.size(); ++i) {
     auto sphereNum = std::to_string(i);
     std::string sphereString = "sphere ";
     if (i < 10) sphereString += "0";
     sphereString += sphereNum;
-    for (Entrance* entrance : playthroughEntrances[i]) {
-      WriteShuffledEntrance(sphereString, entrance);
+    for (Entrance* entrance : ctx->GetEntranceShuffler()->playthroughEntrances[i]) {
+        WriteShuffledEntrance(sphereString, entrance);
     }
   }
 }
@@ -673,6 +612,7 @@ Rando::ItemLocation* GetItemLocation(RandomizerGet item) {
 
 // Writes the hints to the spoiler log, if they are enabled.
 static void WriteHints(int language) {
+    auto ctx = Rando::Context::GetInstance();
     std::string unformattedGanonText;
     std::string unformattedGanonHintText;
     std::string unformattedDampesText;
@@ -690,7 +630,7 @@ static void WriteHints(int language) {
             unformattedSheikText = GetSheikHintText().GetEnglish();
             unformattedSariaText = GetSariaHintText().GetEnglish();
 
-            if (Settings::ShuffleWarpSongs){
+            if (ctx->GetOption(RSK_SHUFFLE_WARP_SONGS)){
               jsonData["warpMinuetText"] = GetWarpMinuetText().GetEnglish();
               jsonData["warpBoleroText"] = GetWarpBoleroText().GetEnglish();
               jsonData["warpSerenadeText"] = GetWarpSerenadeText().GetEnglish();
@@ -709,7 +649,7 @@ static void WriteHints(int language) {
             unformattedSheikText = GetSheikHintText().GetFrench();
             unformattedSariaText = GetSariaHintText().GetFrench();
 
-            if (Settings::ShuffleWarpSongs){
+            if (ctx->GetOption(RSK_SHUFFLE_WARP_SONGS)){
               jsonData["warpMinuetText"] = GetWarpMinuetText().GetFrench();
               jsonData["warpBoleroText"] = GetWarpBoleroText().GetFrench();
               jsonData["warpSerenadeText"] = GetWarpSerenadeText().GetFrench();
@@ -762,48 +702,51 @@ static void WriteHints(int language) {
     std::string sariaText = AutoFormatHintTextString(unformattedSariaText);
 
     jsonData["ganonText"] = ganonText;
-    if (Settings::LightArrowHintText){
+    if (ctx->GetOption(RSK_LIGHT_ARROWS_HINT)){
       jsonData["ganonHintText"] = ganonHintText;
       jsonData["lightArrowHintLoc"] = GetLightArrowHintLoc();
+      jsonData["lightArrowRegion"] = ctx->GetHint(RH_GANONDORF_HINT)->GetHintedRegion();
       jsonData["masterSwordHintLoc"] = GetMasterSwordHintLoc();
-      if (!Settings::GanonsTrialsCount.Is(0)){
-        jsonData["sheikText"] = sheikText;
+      if (!ctx->GetOption(RSK_TRIAL_COUNT).Is(0)) {
+          jsonData["sheikText"] = sheikText;
       }
     }
-    if (Settings::DampeHintText){
+    if (ctx->GetOption(RSK_DAMPES_DIARY_HINT)){
       jsonData["dampeText"] = dampesText;
       jsonData["dampeHintLoc"] = GetDampeHintLoc();
+      jsonData["dampeRegion"] = ctx->GetHint(RH_DAMPES_DIARY)->GetHintedRegion();
     }
-    if (Settings::GregHintText){
+    if (ctx->GetOption(RSK_GREG_HINT)){
       jsonData["gregText"] = gregText;
       jsonData["gregLoc"] = GetGregHintLoc();
+      jsonData["gregRegion"] = ctx->GetHint(RH_GREG_RUPEE)->GetHintedRegion();
     }
-    if (Settings::SariaHintText){
+    if (ctx->GetOption(RSK_SARIA_HINT)){
       jsonData["sariaText"] = sariaText;
       jsonData["sariaHintLoc"] = GetSariaHintLoc();
+      jsonData["sariaRegion"] = ctx->GetHint(RH_SARIA)->GetHintedRegion();
     }
 
-    if (Settings::GossipStoneHints.Is(HINTS_NO_HINTS)) {
+    if (ctx->GetOption(RSK_GOSSIP_STONE_HINTS).Is(RO_GOSSIP_STONES_NONE)) {
         return;
     }
-    auto ctx = Rando::Context::GetInstance();
     for (const RandomizerCheck key : Rando::StaticData::gossipStoneLocations) {
-        Rando::Hint* hint = ctx->GetHint((RandomizerHintKey)(key - RC_DMC_GOSSIP_STONE + 1));
+        Rando::Hint* hint = ctx->GetHint((RandomizerHintKey)(key - RC_COLOSSUS_GOSSIP_STONE + 1));
         Rando::ItemLocation* hintedLocation = ctx->GetItemLocation(hint->GetHintedLocation());
-        std::string unformattedHintTextString;
+        std::string hintTextString;
         switch (language) {
             case 0:
             default:
-                unformattedHintTextString = hint->GetText().GetEnglish();
+                hintTextString = hint->GetText().GetEnglish();
                 break;
             case 2:
-                unformattedHintTextString = hint->GetText().GetFrench();
+                hintTextString = hint->GetText().GetFrench();
                 break;
         }
 
         HintType hintType = hint->GetHintType();
 
-        std::string textStr = AutoFormatHintTextString(unformattedHintTextString);
+        std::string textStr = hintTextString;
         jsonData["hints"][Rando::StaticData::GetLocation(key)->GetName()]["hint"] = textStr;
         jsonData["hints"][Rando::StaticData::GetLocation(key)->GetName()]["type"] = hintTypeNames[(int)hintType];
         if ((hintType >= HINT_TYPE_ALWAYS && hintType < HINT_TYPE_JUNK) || hintType == HINT_TYPE_WOTH) {
@@ -837,8 +780,7 @@ static void WriteAllLocations(int language) {
 
         // If it's a simple item (not an ice trap, doesn't have a price)
         // just add the name of the item and move on
-        if (!location->HasScrubsanityPrice() &&
-            !location->HasShopsanityPrice() &&
+        if (!location->HasCustomPrice() &&
             location->GetPlacedRandomizerGet() != RG_ICE_TRAP) {
             
             jsonData["locations"][Rando::StaticData::GetLocation(location->GetRandomizerCheck())->GetName()] = placedItemName;
@@ -848,7 +790,7 @@ static void WriteAllLocations(int language) {
         // We're dealing with a complex item, build out the json object for it
         jsonData["locations"][Rando::StaticData::GetLocation(location->GetRandomizerCheck())->GetName()]["item"] = placedItemName;
 
-        if (location->HasScrubsanityPrice() || location->HasShopsanityPrice()) {
+        if (location->HasCustomPrice()) {
             jsonData["locations"][Rando::StaticData::GetLocation(location->GetRandomizerCheck())->GetName()]["price"] =
                 location->GetPrice();
         }
@@ -861,15 +803,15 @@ static void WriteAllLocations(int language) {
               case 0:
               default:
                   jsonData["locations"][Rando::StaticData::GetLocation(location->GetRandomizerCheck())->GetName()]["model"] =
-                      Rando::StaticData::ItemFromGIID(ctx->iceTrapModels[location->GetRandomizerCheck()]).GetName().english;
+                      Rando::StaticData::RetrieveItem(ctx->overrides[location->GetRandomizerCheck()].LooksLike()).GetName().english;
                   jsonData["locations"][Rando::StaticData::GetLocation(location->GetRandomizerCheck())->GetName()]["trickName"] = 
-                      GetIceTrapName(ctx->iceTrapModels[location->GetRandomizerCheck()]).english;
+                      ctx->overrides[location->GetRandomizerCheck()].GetTrickName().english;
                   break;
               case 2:
                   jsonData["locations"][Rando::StaticData::GetLocation(location->GetRandomizerCheck())->GetName()]["model"] =
-                      Rando::StaticData::ItemFromGIID(ctx->iceTrapModels[location->GetRandomizerCheck()]).GetName().french;
+                      Rando::StaticData::RetrieveItem(ctx->overrides[location->GetRandomizerCheck()].LooksLike()).GetName().french;
                   jsonData["locations"][Rando::StaticData::GetLocation(location->GetRandomizerCheck())->GetName()]["trickName"] =
-                      GetIceTrapName(ctx->iceTrapModels[location->GetRandomizerCheck()]).french;
+                      ctx->overrides[location->GetRandomizerCheck()].GetTrickName().french;
                   break;
           }
       }
@@ -877,6 +819,7 @@ static void WriteAllLocations(int language) {
 }
 
 const char* SpoilerLog_Write(int language) {
+    auto ctx = Rando::Context::GetInstance();
     auto spoilerLog = tinyxml2::XMLDocument(false);
     spoilerLog.InsertEndChild(spoilerLog.NewDeclaration());
 
@@ -886,12 +829,12 @@ const char* SpoilerLog_Write(int language) {
     jsonData.clear();
 
     jsonData["version"] = (char*) gBuildVersion;
-    jsonData["seed"] = Settings::seedString;
-    jsonData["finalSeed"] = Settings::seed;
+    jsonData["seed"] = ctx->GetSettings()->GetSeedString();
+    jsonData["finalSeed"] = ctx->GetSettings()->GetSeed();
 
     // Write Hash
     int index = 0;
-    for (uint8_t seed_value : Settings::hashIconIndexes) {
+    for (uint8_t seed_value : ctx->hashIconIndexes) {
         jsonData["file_hash"][index] = seed_value;
         index++;
     }
@@ -908,7 +851,6 @@ const char* SpoilerLog_Write(int language) {
     WritePlaythrough();
     //WriteWayOfTheHeroLocation(spoilerLog);
 
-    auto ctx = Rando::Context::GetInstance();
     ctx->playthroughLocations.clear();
     ctx->playthroughBeatable = false;
     ctx->wothLocations.clear();
@@ -923,14 +865,14 @@ const char* SpoilerLog_Write(int language) {
 
     std::string jsonString = jsonData.dump(4);
     std::ostringstream fileNameStream;
-    for (int i = 0; i < Settings::hashIconIndexes.size(); i ++) {
+    for (int i = 0; i < ctx->hashIconIndexes.size(); i ++) {
         if (i) {
             fileNameStream << '-';
         }
-        if (Settings::hashIconIndexes[i] < 10) {
+        if (ctx->hashIconIndexes[i] < 10) {
             fileNameStream << '0';
         }
-        fileNameStream << std::to_string(Settings::hashIconIndexes[i]);
+        fileNameStream << std::to_string(ctx->hashIconIndexes[i]);
     }
     std::string fileName = fileNameStream.str();
     std::ofstream jsonFile(LUS::Context::GetPathRelativeToAppDirectory(
@@ -960,14 +902,15 @@ bool PlacementLog_Write() {
     auto rootNode = placementLog.NewElement("placement-log");
     placementLog.InsertEndChild(rootNode);
 
-    rootNode->SetAttribute("version", Settings::version.c_str());
-    rootNode->SetAttribute("seed", Settings::seed);
+    // rootNode->SetAttribute("version", Settings::version.c_str());
+    // rootNode->SetAttribute("seed", Settings::seed);
+    // TODO: Do we even use this?
 
     // WriteSettings(placementLog, true); // Include hidden settings.
     // WriteExcludedLocations(placementLog);
     // WriteStartingInventory(placementLog);
     WriteEnabledTricks(placementLog);
-    WriteEnabledGlitches(placementLog);
+    //WriteEnabledGlitches(placementLog);
     WriteMasterQuestDungeons(placementLog);
     //WriteRequiredTrials(placementLog);
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/starting_inventory.cpp b/soh/soh/Enhancements/randomizer/3drando/starting_inventory.cpp
index 20698e8e9..95fe0460e 100644
--- a/soh/soh/Enhancements/randomizer/3drando/starting_inventory.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/starting_inventory.cpp
@@ -1,12 +1,10 @@
 #include "starting_inventory.hpp"
 
-#include "dungeon.hpp"
-#include "settings.hpp"
+#include "../dungeon.h"
+#include "../context.h"
+#include "pool_functions.hpp"
 #include "soh/Enhancements/randomizer/static_data.h"
 
-using namespace Settings;
-using namespace Dungeon;
-
 std::vector<RandomizerGet> StartingInventory;
 uint8_t AdditionalHeartContainers;
 
@@ -15,10 +13,11 @@ static void AddItemToInventory(RandomizerGet item, size_t count = 1) {
 }
 
 void GenerateStartingInventory() {
+  auto ctx = Rando::Context::GetInstance();
   StartingInventory.clear();
 
-  if (MapsAndCompasses.Is(MAPSANDCOMPASSES_START_WITH)) {
-    for (auto* dungeon : dungeonList) {
+  if (ctx->GetOption(RSK_SHUFFLE_MAPANDCOMPASS).Is(RO_DUNGEON_ITEM_LOC_STARTWITH)) {
+    for (auto* dungeon : ctx->GetDungeons()->GetDungeonList()) {
       if (dungeon->GetMap() != RG_NONE) {
         AddItemToInventory(dungeon->GetMap());
       }
@@ -29,24 +28,24 @@ void GenerateStartingInventory() {
     }
   }
 
-  if (Keysanity.Is(KEYSANITY_START_WITH)) {
-    for (auto* dungeon : dungeonList) {
+  if (ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_STARTWITH)) {
+    for (auto* dungeon : ctx->GetDungeons()->GetDungeonList()) {
       if (dungeon->GetSmallKeyCount() > 0) {
         AddItemToInventory(dungeon->GetSmallKey(), dungeon->GetSmallKeyCount());
       }
     }
-  } else if (Keysanity.Is(KEYSANITY_VANILLA)) {
+  } else if (ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_VANILLA)) {
     // Logic cannot handle vanilla key layout in some dungeons
     // this is because vanilla expects the dungeon major item to be
     // locked behind the keys, which is not always true in rando.
     // We can resolve this by starting with some extra keys
     // - OoT Randomizer
-    if (SpiritTemple.IsMQ()) {
+    if (ctx->GetDungeon(Rando::SPIRIT_TEMPLE)->IsMQ()) {
       AddItemToInventory(RG_SPIRIT_TEMPLE_SMALL_KEY, 3);
     }
   }
 
-  if (BossKeysanity.Is(BOSSKEYSANITY_START_WITH)) {
+  if (ctx->GetOption(RSK_BOSS_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_STARTWITH)) {
     AddItemToInventory(RG_FOREST_TEMPLE_BOSS_KEY);
     AddItemToInventory(RG_FIRE_TEMPLE_BOSS_KEY);
     AddItemToInventory(RG_WATER_TEMPLE_BOSS_KEY);
@@ -56,11 +55,12 @@ void GenerateStartingInventory() {
 
   // Add Ganon's Boss key with Triforce Hunt so the game thinks it's obtainable from the start.
   // During save init, the boss key isn't actually given and it's instead given when completing the triforce.
-  if (GanonsBossKey.Is(GANONSBOSSKEY_START_WITH) || GanonsBossKey.Is(GANONSBOSSKEY_TRIFORCE_HUNT)) {
-    AddItemToInventory(RG_GANONS_CASTLE_BOSS_KEY);
+  if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_STARTWITH) ||
+      ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_TRIFORCE_HUNT)) {
+      AddItemToInventory(RG_GANONS_CASTLE_BOSS_KEY);
   }
 
-  if (GerudoFortress.Is(GERUDOFORTRESS_OPEN) && !ShuffleGerudoToken) {
+  if (ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_OPEN) && !ctx->GetOption(RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD)) {
     AddItemToInventory(RG_GERUDO_MEMBERSHIP_CARD);
   }
 
@@ -68,103 +68,104 @@ void GenerateStartingInventory() {
   //Values are associated so that the count of items matches the index of
   //the option selected. If None is selected, the value will be zero and
   //zero of the item will be added to the starting inventory.
-  AddItemToInventory(RG_PROGRESSIVE_STICK_UPGRADE, StartingStickCapacity.Value<uint8_t>());
-  AddItemToInventory(RG_PROGRESSIVE_NUT_UPGRADE, StartingNutCapacity.Value<uint8_t>());
-  AddItemToInventory(RG_PROGRESSIVE_BOMB_BAG, StartingBombBag.Value<uint8_t>());
-  AddItemToInventory((BombchusInLogic ? RG_PROGRESSIVE_BOMBCHUS : RG_BOMBCHU_20), StartingBombchus.Value<uint8_t>());
-  AddItemToInventory(RG_PROGRESSIVE_BOW, StartingBow.Value<uint8_t>());
-  AddItemToInventory(RG_FIRE_ARROWS, StartingFireArrows.Value<uint8_t>());
-  AddItemToInventory(RG_ICE_ARROWS, StartingIceArrows.Value<uint8_t>());
-  AddItemToInventory(RG_LIGHT_ARROWS, StartingLightArrows.Value<uint8_t>());
-  AddItemToInventory(RG_DINS_FIRE, StartingDinsFire.Value<uint8_t>());
-  AddItemToInventory(RG_FARORES_WIND, StartingFaroresWind.Value<uint8_t>());
-  AddItemToInventory(RG_NAYRUS_LOVE, StartingNayrusLove.Value<uint8_t>());
-  AddItemToInventory(RG_PROGRESSIVE_SLINGSHOT, StartingSlingshot.Value<uint8_t>());
-  AddItemToInventory(RG_BOOMERANG, StartingBoomerang.Value<uint8_t>());
-  AddItemToInventory(RG_LENS_OF_TRUTH, StartingLensOfTruth.Value<uint8_t>());
-  AddItemToInventory(RG_MAGIC_BEAN_PACK, StartingMagicBean.Value<uint8_t>());
-  AddItemToInventory(RG_MEGATON_HAMMER, StartingMegatonHammer.Value<uint8_t>());
-  AddItemToInventory(RG_PROGRESSIVE_HOOKSHOT, StartingHookshot.Value<uint8_t>());
-  AddItemToInventory(RG_IRON_BOOTS, StartingIronBoots.Value<uint8_t>());
-  AddItemToInventory(RG_HOVER_BOOTS, StartingHoverBoots.Value<uint8_t>());
+  // TODO: Uncomment when these options are implemented.
+  // AddItemToInventory(RG_PROGRESSIVE_STICK_UPGRADE, StartingStickCapacity.Value<uint8_t>());
+  // AddItemToInventory(RG_PROGRESSIVE_NUT_UPGRADE, StartingNutCapacity.Value<uint8_t>());
+  // AddItemToInventory(RG_PROGRESSIVE_BOMB_BAG, StartingBombBag.Value<uint8_t>());
+  // AddItemToInventory((BombchusInLogic ? RG_PROGRESSIVE_BOMBCHUS : RG_BOMBCHU_20), StartingBombchus.Value<uint8_t>());
+  // AddItemToInventory(RG_PROGRESSIVE_BOW, StartingBow.Value<uint8_t>());
+  // AddItemToInventory(RG_FIRE_ARROWS, StartingFireArrows.Value<uint8_t>());
+  // AddItemToInventory(RG_ICE_ARROWS, StartingIceArrows.Value<uint8_t>());
+  // AddItemToInventory(RG_LIGHT_ARROWS, StartingLightArrows.Value<uint8_t>());
+  // AddItemToInventory(RG_DINS_FIRE, StartingDinsFire.Value<uint8_t>());
+  // AddItemToInventory(RG_FARORES_WIND, StartingFaroresWind.Value<uint8_t>());
+  // AddItemToInventory(RG_NAYRUS_LOVE, StartingNayrusLove.Value<uint8_t>());
+  // AddItemToInventory(RG_PROGRESSIVE_SLINGSHOT, StartingSlingshot.Value<uint8_t>());
+  // AddItemToInventory(RG_BOOMERANG, StartingBoomerang.Value<uint8_t>());
+  // AddItemToInventory(RG_LENS_OF_TRUTH, StartingLensOfTruth.Value<uint8_t>());
+  // AddItemToInventory(RG_MAGIC_BEAN_PACK, StartingMagicBean.Value<uint8_t>());
+  // AddItemToInventory(RG_MEGATON_HAMMER, StartingMegatonHammer.Value<uint8_t>());
+  // AddItemToInventory(RG_PROGRESSIVE_HOOKSHOT, StartingHookshot.Value<uint8_t>());
+  // AddItemToInventory(RG_IRON_BOOTS, StartingIronBoots.Value<uint8_t>());
+  // AddItemToInventory(RG_HOVER_BOOTS, StartingHoverBoots.Value<uint8_t>());
   //For starting bottles, we need to check if they are a big poe and add that if so
   // since a big poe bottle is not logically equivalent to an empty bottle.
-  if (StartingBottle1.Value<uint8_t>() == STARTINGBOTTLE_BIG_POE) {
-    AddItemToInventory(RG_BOTTLE_WITH_BIG_POE, 1);
-  } else if (StartingBottle1.Value<uint8_t>()) {
-    AddItemToInventory(RG_EMPTY_BOTTLE, 1);
-  }
-  if (StartingBottle2.Value<uint8_t>() == STARTINGBOTTLE_BIG_POE) {
-    AddItemToInventory(RG_BOTTLE_WITH_BIG_POE, 1);
-  } else if (StartingBottle2.Value<uint8_t>()) {
-    AddItemToInventory(RG_EMPTY_BOTTLE, 1);
-  }
-  if (StartingBottle3.Value<uint8_t>() == STARTINGBOTTLE_BIG_POE) {
-    AddItemToInventory(RG_BOTTLE_WITH_BIG_POE, 1);
-  } else if (StartingBottle3.Value<uint8_t>()) {
-    AddItemToInventory(RG_EMPTY_BOTTLE, 1);
-  }
-  if (StartingBottle4.Value<uint8_t>() == STARTINGBOTTLE_BIG_POE) {
-    AddItemToInventory(RG_BOTTLE_WITH_BIG_POE, 1);
-  } else if (StartingBottle4.Value<uint8_t>()) {
-    AddItemToInventory(RG_EMPTY_BOTTLE, 1);
-  }
-  AddItemToInventory(RG_RUTOS_LETTER,              StartingRutoBottle.Value<uint8_t>());
-  AddItemToInventory(RG_PROGRESSIVE_OCARINA,       StartingOcarina.Value<uint8_t>());
-  AddItemToInventory(RG_ZELDAS_LULLABY,            StartingZeldasLullaby.Value<uint8_t>());
-  AddItemToInventory(RG_EPONAS_SONG,               StartingEponasSong.Value<uint8_t>());
-  AddItemToInventory(RG_SARIAS_SONG,               StartingSariasSong.Value<uint8_t>());
-  AddItemToInventory(RG_SUNS_SONG,                 StartingSunsSong.Value<uint8_t>());
-  AddItemToInventory(RG_SONG_OF_TIME,              StartingSongOfTime.Value<uint8_t>());
-  AddItemToInventory(RG_SONG_OF_STORMS,            StartingSongOfStorms.Value<uint8_t>());
-  AddItemToInventory(RG_MINUET_OF_FOREST,          StartingMinuetOfForest.Value<uint8_t>());
-  AddItemToInventory(RG_BOLERO_OF_FIRE,            StartingBoleroOfFire.Value<uint8_t>());
-  AddItemToInventory(RG_SERENADE_OF_WATER,         StartingSerenadeOfWater.Value<uint8_t>());
-  AddItemToInventory(RG_REQUIEM_OF_SPIRIT,         StartingRequiemOfSpirit.Value<uint8_t>());
-  AddItemToInventory(RG_NOCTURNE_OF_SHADOW,        StartingNocturneOfShadow.Value<uint8_t>());
-  AddItemToInventory(RG_PRELUDE_OF_LIGHT,          StartingPreludeOfLight.Value<uint8_t>());
-  AddItemToInventory(RG_KOKIRI_SWORD,              StartingKokiriSword.Value<uint8_t>());
-  if (ProgressiveGoronSword) {
-    AddItemToInventory(RG_PROGRESSIVE_GORONSWORD, StartingBiggoronSword.Value<uint8_t>());
-  } else {
-    AddItemToInventory(RG_GIANTS_KNIFE, (StartingBiggoronSword.Is(STARTINGBGS_GIANTS_KNIFE)) ? 1 : 0);
-    AddItemToInventory(RG_BIGGORON_SWORD, (StartingBiggoronSword.Is(STARTINGBGS_BIGGORON_SWORD)) ? 1 : 0);
-  }
-  AddItemToInventory(RG_DEKU_SHIELD, StartingDekuShield.Value<uint8_t>());
-  AddItemToInventory(RG_HYLIAN_SHIELD,             StartingHylianShield.Value<uint8_t>());
-  AddItemToInventory(RG_MIRROR_SHIELD,             StartingMirrorShield.Value<uint8_t>());
-  AddItemToInventory(RG_GORON_TUNIC,               StartingGoronTunic.Value<uint8_t>());
-  AddItemToInventory(RG_ZORA_TUNIC,                StartingZoraTunic.Value<uint8_t>());
-  AddItemToInventory(RG_PROGRESSIVE_MAGIC_METER,   StartingMagicMeter.Value<uint8_t>());
-  AddItemToInventory(RG_PROGRESSIVE_STRENGTH,      StartingStrength.Value<uint8_t>());
-  AddItemToInventory(RG_PROGRESSIVE_SCALE,         StartingScale.Value<uint8_t>());
-  AddItemToInventory(RG_PROGRESSIVE_WALLET,        StartingWallet.Value<uint8_t>());
-  AddItemToInventory(RG_STONE_OF_AGONY,            StartingShardOfAgony.Value<uint8_t>());
-  AddItemToInventory(RG_DOUBLE_DEFENSE,            StartingDoubleDefense.Value<uint8_t>());
-  AddItemToInventory(RG_KOKIRI_EMERALD,            StartingKokiriEmerald.Value<uint8_t>());
-  AddItemToInventory(RG_GORON_RUBY,                StartingGoronRuby.Value<uint8_t>());
-  AddItemToInventory(RG_ZORA_SAPPHIRE,             StartingZoraSapphire.Value<uint8_t>());
-  AddItemToInventory(RG_FOREST_MEDALLION,          StartingForestMedallion.Value<uint8_t>());
-  AddItemToInventory(RG_FIRE_MEDALLION,            StartingFireMedallion.Value<uint8_t>());
-  AddItemToInventory(RG_WATER_MEDALLION,           StartingWaterMedallion.Value<uint8_t>());
-  AddItemToInventory(RG_SPIRIT_MEDALLION,          StartingSpiritMedallion.Value<uint8_t>());
-  AddItemToInventory(RG_SHADOW_MEDALLION,          StartingShadowMedallion.Value<uint8_t>());
-  AddItemToInventory(RG_LIGHT_MEDALLION,           StartingLightMedallion.Value<uint8_t>());
-  AddItemToInventory(RG_GOLD_SKULLTULA_TOKEN,      StartingSkulltulaToken.Value<uint8_t>());
+  // if (StartingBottle1.Value<uint8_t>() == STARTINGBOTTLE_BIG_POE) {
+  //   AddItemToInventory(RG_BOTTLE_WITH_BIG_POE, 1);
+  // } else if (StartingBottle1.Value<uint8_t>()) {
+  //   AddItemToInventory(RG_EMPTY_BOTTLE, 1);
+  // }
+  // if (StartingBottle2.Value<uint8_t>() == STARTINGBOTTLE_BIG_POE) {
+  //   AddItemToInventory(RG_BOTTLE_WITH_BIG_POE, 1);
+  // } else if (StartingBottle2.Value<uint8_t>()) {
+  //   AddItemToInventory(RG_EMPTY_BOTTLE, 1);
+  // }
+  // if (StartingBottle3.Value<uint8_t>() == STARTINGBOTTLE_BIG_POE) {
+  //   AddItemToInventory(RG_BOTTLE_WITH_BIG_POE, 1);
+  // } else if (StartingBottle3.Value<uint8_t>()) {
+  //   AddItemToInventory(RG_EMPTY_BOTTLE, 1);
+  // }
+  // if (StartingBottle4.Value<uint8_t>() == STARTINGBOTTLE_BIG_POE) {
+  //   AddItemToInventory(RG_BOTTLE_WITH_BIG_POE, 1);
+  // } else if (StartingBottle4.Value<uint8_t>()) {
+  //   AddItemToInventory(RG_EMPTY_BOTTLE, 1);
+  // }
+  // AddItemToInventory(RG_RUTOS_LETTER,              StartingRutoBottle.Value<uint8_t>());
+  AddItemToInventory(RG_PROGRESSIVE_OCARINA,       ctx->GetOption(RSK_STARTING_OCARINA).Value<uint8_t>());
+  AddItemToInventory(RG_ZELDAS_LULLABY,            ctx->GetOption(RSK_STARTING_ZELDAS_LULLABY) ? 1 : 0);
+  AddItemToInventory(RG_EPONAS_SONG,               ctx->GetOption(RSK_STARTING_EPONAS_SONG) ? 1 : 0);
+  AddItemToInventory(RG_SARIAS_SONG,               ctx->GetOption(RSK_STARTING_SARIAS_SONG) ? 1 : 0);
+  AddItemToInventory(RG_SUNS_SONG,                 ctx->GetOption(RSK_STARTING_SUNS_SONG) ? 1 : 0);
+  AddItemToInventory(RG_SONG_OF_TIME,              ctx->GetOption(RSK_STARTING_SONG_OF_TIME) ? 1 : 0);
+  AddItemToInventory(RG_SONG_OF_STORMS,            ctx->GetOption(RSK_STARTING_SONG_OF_STORMS) ? 1 : 0);
+  AddItemToInventory(RG_MINUET_OF_FOREST,          ctx->GetOption(RSK_STARTING_MINUET_OF_FOREST) ? 1 : 0);
+  AddItemToInventory(RG_BOLERO_OF_FIRE,            ctx->GetOption(RSK_STARTING_BOLERO_OF_FIRE) ? 1 : 0);
+  AddItemToInventory(RG_SERENADE_OF_WATER,         ctx->GetOption(RSK_STARTING_SERENADE_OF_WATER) ? 1 : 0);
+  AddItemToInventory(RG_REQUIEM_OF_SPIRIT,         ctx->GetOption(RSK_STARTING_REQUIEM_OF_SPIRIT) ? 1 : 0);
+  AddItemToInventory(RG_NOCTURNE_OF_SHADOW,        ctx->GetOption(RSK_STARTING_NOCTURNE_OF_SHADOW) ? 1 : 0);
+  AddItemToInventory(RG_PRELUDE_OF_LIGHT,          ctx->GetOption(RSK_STARTING_PRELUDE_OF_LIGHT) ? 1 : 0);
+  AddItemToInventory(RG_KOKIRI_SWORD,              ctx->GetOption(RSK_STARTING_KOKIRI_SWORD) ? 1 : 0);
+  // if (ProgressiveGoronSword) {
+  //   AddItemToInventory(RG_PROGRESSIVE_GORONSWORD, StartingBiggoronSword.Value<uint8_t>());
+  // } else {
+  //   AddItemToInventory(RG_GIANTS_KNIFE, (StartingBiggoronSword.Is(STARTINGBGS_GIANTS_KNIFE)) ? 1 : 0);
+  //   AddItemToInventory(RG_BIGGORON_SWORD, (StartingBiggoronSword.Is(STARTINGBGS_BIGGORON_SWORD)) ? 1 : 0);
+  // }
+  AddItemToInventory(RG_DEKU_SHIELD, ctx->GetOption(RSK_STARTING_DEKU_SHIELD) ? 1 : 0);
+  // AddItemToInventory(RG_HYLIAN_SHIELD,             StartingHylianShield.Value<uint8_t>());
+  // AddItemToInventory(RG_MIRROR_SHIELD,             StartingMirrorShield.Value<uint8_t>());
+  // AddItemToInventory(RG_GORON_TUNIC,               StartingGoronTunic.Value<uint8_t>());
+  // AddItemToInventory(RG_ZORA_TUNIC,                StartingZoraTunic.Value<uint8_t>());
+  // AddItemToInventory(RG_PROGRESSIVE_MAGIC_METER,   StartingMagicMeter.Value<uint8_t>());
+  // AddItemToInventory(RG_PROGRESSIVE_STRENGTH,      StartingStrength.Value<uint8_t>());
+  // AddItemToInventory(RG_PROGRESSIVE_SCALE,         StartingScale.Value<uint8_t>());
+  // AddItemToInventory(RG_PROGRESSIVE_WALLET,        StartingWallet.Value<uint8_t>());
+  // AddItemToInventory(RG_STONE_OF_AGONY,            StartingShardOfAgony.Value<uint8_t>());
+  // AddItemToInventory(RG_DOUBLE_DEFENSE,            StartingDoubleDefense.Value<uint8_t>());
+  // AddItemToInventory(RG_KOKIRI_EMERALD,            StartingKokiriEmerald.Value<uint8_t>());
+  // AddItemToInventory(RG_GORON_RUBY,                StartingGoronRuby.Value<uint8_t>());
+  // AddItemToInventory(RG_ZORA_SAPPHIRE,             StartingZoraSapphire.Value<uint8_t>());
+  // AddItemToInventory(RG_FOREST_MEDALLION,          StartingForestMedallion.Value<uint8_t>());
+  // AddItemToInventory(RG_FIRE_MEDALLION,            StartingFireMedallion.Value<uint8_t>());
+  // AddItemToInventory(RG_WATER_MEDALLION,           StartingWaterMedallion.Value<uint8_t>());
+  // AddItemToInventory(RG_SPIRIT_MEDALLION,          StartingSpiritMedallion.Value<uint8_t>());
+  // AddItemToInventory(RG_SHADOW_MEDALLION,          StartingShadowMedallion.Value<uint8_t>());
+  // AddItemToInventory(RG_LIGHT_MEDALLION,           StartingLightMedallion.Value<uint8_t>());
+  AddItemToInventory(RG_GOLD_SKULLTULA_TOKEN,      ctx->GetOption(RSK_STARTING_SKULLTULA_TOKEN).Value<uint8_t>());
 
-  int8_t hearts = StartingHearts.Value<uint8_t>() - 2;
+  int8_t hearts = ctx->GetOption(RSK_STARTING_HEARTS).Value<uint8_t>() - 2;
   AdditionalHeartContainers = 0;
   if (hearts < 0) {
     AddItemToInventory(RG_PIECE_OF_HEART, 4);
     // Plentiful and minimal have less than 4 standard pieces of heart so also replace the winner heart
-    if (ItemPoolValue.Value<uint8_t>() == 0 || ItemPoolValue.Value<uint8_t>() == 3) {
+    if (ctx->GetOption(RSK_ITEM_POOL).Value<uint8_t>() == 0 || ctx->GetOption(RSK_ITEM_POOL).Value<uint8_t>() == 3) {
       AddItemToInventory(RG_TREASURE_GAME_HEART);
     }
 
     AdditionalHeartContainers = 1 - hearts;
   } else if (hearts > 0) {
     // 16 containers in plentiful, 8 in balanced and 0 in the others
-    uint8_t maxContainers = 8 * std::max(0, 2 - ItemPoolValue.Value<uint8_t>());
+    uint8_t maxContainers = 8 * std::max(0, 2 - ctx->GetOption(RSK_ITEM_POOL).Value<uint8_t>());
 
     if (hearts <= maxContainers) {
       AddItemToInventory(RG_HEART_CONTAINER, hearts);
diff --git a/soh/soh/Enhancements/randomizer/3drando/text.hpp b/soh/soh/Enhancements/randomizer/3drando/text.hpp
index c1e32ddfd..e5c872ae4 100644
--- a/soh/soh/Enhancements/randomizer/3drando/text.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/text.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <string>
+#include "z64.h"
 
 #define PLURAL 0
 #define SINGULAR 1
@@ -12,6 +13,7 @@ public:
       : english(std::move(english_)),
         french(std::move(french_)),
         spanish(std::move(spanish_)) {}
+    Text(std::string english_) : english(std::move(english_)), french(std::move("")), spanish(std::move("")) {}
 
     const std::string& GetEnglish() const {
         return english;
@@ -31,6 +33,18 @@ public:
         return english;
     }
 
+    const std::string& GetForLanguage(uint8_t language) const {
+        switch (language) {
+            case LANGUAGE_ENG:
+                return english;
+            case LANGUAGE_FRA:
+                return french;
+            case LANGUAGE_GER:
+            default:
+                return english; // TODO: German
+        }
+    }
+
     Text operator+ (const Text& right) const {
         return Text{english + right.GetEnglish(), french + right.GetFrench(), spanish + right.GetSpanish()};
     }
@@ -43,6 +57,10 @@ public:
         return english == right.english;
     }
 
+    bool operator==(const std::string& right) const {
+        return english == right || french == right || spanish == right;
+    }
+
     bool operator!=(const Text& right) const {
         return !operator==(right);
     }
diff --git a/soh/soh/Enhancements/randomizer/3drando/trial.cpp b/soh/soh/Enhancements/randomizer/3drando/trial.cpp
deleted file mode 100644
index e9ee31317..000000000
--- a/soh/soh/Enhancements/randomizer/3drando/trial.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "trial.hpp"
-
-namespace Trial {
-
-TrialInfo::TrialInfo(Text name_)
-  : name(std::move(name_)) {}
-
-  TrialInfo::~TrialInfo() = default;
-
-  TrialInfo ForestTrial = TrialInfo(Text{"the Forest Trial", /*french*/"l'épreuve de la Forêt",   /*spanish*/"la prueba del bosque"});
-  TrialInfo FireTrial   = TrialInfo(Text{"the Fire Trial",   /*french*/"l'épreuve du Feu",        /*spanish*/"la prueba del fuego"});
-  TrialInfo WaterTrial  = TrialInfo(Text{"the Water Trial",  /*french*/"l'épreuve de l'Eau",      /*spanish*/"la prueba del agua"});
-  TrialInfo SpiritTrial = TrialInfo(Text{"the Spirit Trial", /*french*/"l'épreuve de l'Esprit",   /*spanish*/"la prueba del espíritu"});
-  TrialInfo ShadowTrial = TrialInfo(Text{"the Shadow Trial", /*french*/"l'épreuve de l'Ombre",    /*spanish*/"la prueba de las sombras"});
-  TrialInfo LightTrial  = TrialInfo(Text{"the Light Trial",  /*french*/"l'épreuve de la Lumière", /*spanish*/"la prueba de la luz"});
-
-  const TrialArray trialList = {
-    &ForestTrial,
-    &FireTrial,
-    &WaterTrial,
-    &SpiritTrial,
-    &ShadowTrial,
-    &LightTrial,
-  };
-
-} //namespace Trial
diff --git a/soh/soh/Enhancements/randomizer/3drando/trial.hpp b/soh/soh/Enhancements/randomizer/3drando/trial.hpp
deleted file mode 100644
index aa7f32033..000000000
--- a/soh/soh/Enhancements/randomizer/3drando/trial.hpp
+++ /dev/null
@@ -1,51 +0,0 @@
-#pragma once
-
-#include <array>
-
-#include "text.hpp"
-
-//This is probably overkill for a small amount of information, but we can add
-//stuff later if we want
-
-namespace Trial {
-class TrialInfo {
-public:
-    TrialInfo(const Text name_);
-    ~TrialInfo();
-
-    Text GetName() const {
-        return name;
-    }
-
-    bool IsSkipped() const {
-        return skipped;
-    }
-
-    bool IsRequired() const {
-        return !skipped;
-    }
-
-    void SetAsRequired() {
-        skipped = false;
-    }
-
-    void SetAsSkipped() {
-        skipped = true;
-    }
-
-private:
-      Text name;
-      bool skipped = true;
-};
-
-extern TrialInfo ForestTrial;
-extern TrialInfo FireTrial;
-extern TrialInfo WaterTrial;
-extern TrialInfo SpiritTrial;
-extern TrialInfo ShadowTrial;
-extern TrialInfo LightTrial;
-
-using TrialArray = std::array<TrialInfo*, 6>;
-
-extern const TrialArray trialList;
-} //namespace Trial
diff --git a/soh/soh/Enhancements/randomizer/context.cpp b/soh/soh/Enhancements/randomizer/context.cpp
index bf38b32fa..f85ed3ec3 100644
--- a/soh/soh/Enhancements/randomizer/context.cpp
+++ b/soh/soh/Enhancements/randomizer/context.cpp
@@ -1,17 +1,58 @@
 #include "context.h"
 #include "static_data.h"
+#include "soh/OTRGlobals.h"
+#include "soh/Enhancements/item-tables/ItemTableManager.h"
 #include "3drando/shops.hpp"
-#include "3drando/dungeon.hpp"
+#include "dungeon.h"
+#include "trial.h"
+#include "entrance.h"
+#include "settings.h"
+#include "rando_hash.h"
 
+#include <fstream>
 #include <spdlog/spdlog.h>
 
 namespace Rando {
 std::weak_ptr<Context> Context::mContext;
 
 Context::Context() {
+    for (auto& location : StaticData::GetLocationTable()) {
+        mSpoilerfileCheckNameToEnum[location.GetName()] = location.GetRandomizerCheck();
+    }
+    mSpoilerfileCheckNameToEnum["Invalid Location"] = RC_UNKNOWN_CHECK;
+    mSpoilerfileCheckNameToEnum["Link's Pocket"] = RC_LINKS_POCKET;
+
+    for (auto& item : StaticData::GetItemTable()) {
+        // Easiest way to filter out all the empty values from the array, since we still technically want the 0/RG_NONE
+        // entry
+        if (item.GetName().english.empty())
+            continue;
+        mSpoilerfileGetNameToEnum[item.GetName().english] = item.GetRandomizerGet();
+        mSpoilerfileGetNameToEnum[item.GetName().french] = item.GetRandomizerGet();
+    }
+    mSpoilerfileHintTypeNameToEnum = {
+        { "Trial", HINT_TYPE_TRIAL },
+        { "Always", HINT_TYPE_ALWAYS },
+        { "WotH", HINT_TYPE_WOTH },
+        { "Barren", HINT_TYPE_BARREN },
+        { "Entrance", HINT_TYPE_ENTRANCE },
+        { "Sometimes", HINT_TYPE_SOMETIMES },
+        { "Random", HINT_TYPE_RANDOM },
+        { "Static", HINT_TYPE_STATIC },
+        { "Song", HINT_TYPE_SONG },
+        { "Overworld", HINT_TYPE_OVERWORLD },
+        { "Dungeon", HINT_TYPE_DUNGEON },
+        { "Junk", HINT_TYPE_JUNK },
+        { "Named Item", HINT_TYPE_NAMED_ITEM },
+        { "Random", HINT_TYPE_RANDOM }
+    };
     for (int i = 0; i < RC_MAX; i++) {
         itemLocationTable[i] = ItemLocation((RandomizerCheck)i);
     }
+    mEntranceShuffler = std::make_shared<EntranceShuffler>();
+    mDungeons = std::make_shared<Dungeons>();
+    mTrials = std::make_shared<Trials>();
+    mSettings = std::make_shared<Settings>();
 }
 
 std::shared_ptr<Context> Context::CreateInstance() {
@@ -27,7 +68,7 @@ std::shared_ptr<Context> Context::GetInstance() {
     return mContext.lock();
 }
 
-Hint *Context::GetHint(RandomizerHintKey hintKey) {
+Hint* Context::GetHint(RandomizerHintKey hintKey) {
     return &hintTable[hintKey];
 }
 
@@ -37,10 +78,14 @@ void Context::AddHint(RandomizerHintKey hintId, Text text, RandomizerCheck hinte
     GetItemLocation(hintedLocation)->SetHintKey(hintId);
 }
 
-ItemLocation *Context::GetItemLocation(RandomizerCheck locKey) {
+ItemLocation* Context::GetItemLocation(RandomizerCheck locKey) {
     return &(itemLocationTable[locKey]);
 }
 
+ItemLocation* Context::GetItemLocation(size_t locKey) {
+    return &(itemLocationTable[static_cast<RandomizerCheck>(locKey)]);
+}
+
 void Context::PlaceItemInLocation(RandomizerCheck locKey, RandomizerGet item, bool applyEffectImmediately,
                                   bool setHidden) {
     auto loc = GetItemLocation(locKey);
@@ -50,19 +95,20 @@ void Context::PlaceItemInLocation(RandomizerCheck locKey, RandomizerGet item, bo
     SPDLOG_DEBUG(StaticData::GetLocation(locKey)->GetName());
     SPDLOG_DEBUG("\n\n");
 
-    if (applyEffectImmediately || Settings::Logic.Is(LOGIC_NONE) || Settings::Logic.Is(LOGIC_VANILLA)) {
+    if (applyEffectImmediately || mSettings->Setting(RSK_LOGIC_RULES).Is(RO_LOGIC_GLITCHLESS) || mSettings->Setting(RSK_LOGIC_RULES).Is(RO_LOGIC_VANILLA)) {
         Rando::StaticData::RetrieveItem(item).ApplyEffect();
     }
 
-    //TODO? Show Progress
+    // TODO? Show Progress
 
     // If we're placing a non-shop item in a shop location, we want to record it for custom messages
     if (StaticData::RetrieveItem(item).GetItemType() != ITEMTYPE_SHOP &&
         Rando::StaticData::GetLocation(locKey)->IsCategory(Category::cShop)) {
         int index = TransformShopIndex(GetShopIndex(locKey));
         NonShopItems[index].Name = Rando::StaticData::RetrieveItem(item).GetName();
-        NonShopItems[index].Repurchaseable = Rando::StaticData::RetrieveItem(item).GetItemType() == ITEMTYPE_REFILL ||
-                                             Rando::StaticData::RetrieveItem(item).GetHintKey() == RHT_PROGRESSIVE_BOMBCHUS;
+        NonShopItems[index].Repurchaseable =
+            Rando::StaticData::RetrieveItem(item).GetItemType() == ITEMTYPE_REFILL ||
+            Rando::StaticData::RetrieveItem(item).GetHintKey() == RHT_PROGRESSIVE_BOMBCHUS;
     }
 
     loc->SetPlacedItem(item);
@@ -78,7 +124,7 @@ void Context::AddLocation(RandomizerCheck loc, std::vector<RandomizerCheck>* des
     destination->push_back(loc);
 }
 
-template<typename Container>
+template <typename Container>
 void Context::AddLocations(const Container& locations, std::vector<RandomizerCheck>* destination) {
     if (destination == nullptr) {
         destination = &allLocations;
@@ -89,19 +135,19 @@ void Context::AddLocations(const Container& locations, std::vector<RandomizerChe
 void Context::GenerateLocationPool() {
     allLocations.clear();
     AddLocation(RC_LINKS_POCKET);
-    if (Settings::TriforceHunt.Is(TRIFORCE_HUNT_ON)) {
+    if (mSettings->Setting(RSK_TRIFORCE_HUNT)) {
         AddLocation(RC_TRIFORCE_COMPLETED);
     }
     AddLocations(StaticData::overworldLocations);
 
-    for (auto dungeon : Dungeon::dungeonList) {
+    for (auto dungeon : mDungeons->GetDungeonList()) {
         AddLocations(dungeon->GetDungeonLocations());
     }
 }
 
 void Context::AddExcludedOptions() {
     AddLocations(StaticData::overworldLocations, &everyPossibleLocation);
-    for (auto dungeon : Dungeon::dungeonList) {
+    for (auto dungeon : mDungeons->GetDungeonList()) {
         AddLocations(dungeon->GetEveryLocation(), &everyPossibleLocation);
     }
     for (RandomizerCheck rc : everyPossibleLocation) {
@@ -144,15 +190,13 @@ void Context::LocationReset() {
         GetItemLocation(il)->RemoveFromPool();
     }
 
-    for (RandomizerCheck il : Rando::StaticData::otherHintLocations) {
-        GetItemLocation(il)->RemoveFromPool();
-    }
+    GetItemLocation(RC_GANONDORF_HINT)->RemoveFromPool();
 }
 
 void Context::HintReset() {
     for (RandomizerCheck il : Rando::StaticData::gossipStoneLocations) {
         GetItemLocation(il)->ResetVariables();
-        GetHint((RandomizerHintKey)(il - RC_DMC_GOSSIP_STONE + 1))->ResetVariables();
+        GetHint((RandomizerHintKey)(il - RC_COLOSSUS_GOSSIP_STONE + 1))->ResetVariables();
     }
 }
 
@@ -161,24 +205,17 @@ void Context::CreateItemOverrides() {
     for (RandomizerCheck locKey : allLocations) {
         auto loc = Rando::StaticData::GetLocation(locKey);
         auto itemLoc = GetItemLocation(locKey);
-        ItemOverride_Value val = Rando::StaticData::RetrieveItem(itemLoc->GetPlacedRandomizerGet()).Value();
         // If this is an ice trap, store the disguise model in iceTrapModels
         if (itemLoc->GetPlacedRandomizerGet() == RG_ICE_TRAP) {
-            iceTrapModels[loc->GetRandomizerCheck()] = val.looksLikeItemId;
+            ItemOverride val(locKey, RandomElement(possibleIceTrapModels));
+            iceTrapModels[locKey] = val.LooksLike();
+            val.SetTrickName(GetIceTrapName(val.LooksLike()));
             // If this is ice trap is in a shop, change the name based on what the model will look like
             if (loc->IsCategory(Category::cShop)) {
-                NonShopItems[TransformShopIndex(GetShopIndex(locKey))].Name = GetIceTrapName(val.looksLikeItemId);
+                NonShopItems[TransformShopIndex(GetShopIndex(locKey))].Name = val.GetTrickName();
             }
+            overrides[locKey] = val;
         }
-        overrides.insert({
-            .key = itemLoc->Key(),
-            .value = val,
-        });
-        SPDLOG_DEBUG("\tScene: ");
-        SPDLOG_DEBUG(std::to_string(itemLoc->Key().scene));
-        SPDLOG_DEBUG("\tType: ");
-        SPDLOG_DEBUG(std::to_string(itemLoc->Key().type));
-        SPDLOG_DEBUG("\t");
         SPDLOG_DEBUG(loc->GetName());
         SPDLOG_DEBUG(": ");
         SPDLOG_DEBUG(itemLoc->GetPlacedItemName().GetEnglish());
@@ -187,4 +224,339 @@ void Context::CreateItemOverrides() {
     SPDLOG_DEBUG("Overrides Created: ");
     SPDLOG_DEBUG(std::to_string(overrides.size()));
 }
+
+bool Context::IsSeedGenerated() {
+    return mSeedGenerated;
 }
+
+void Context::SetSeedGenerated(bool seedGenerated) {
+    mSeedGenerated = seedGenerated;
+}
+
+bool Context::IsSpoilerLoaded() {
+    return mSpoilerLoaded;
+}
+
+void Context::SetSpoilerLoaded(bool spoilerLoaded) {
+    mSpoilerLoaded = spoilerLoaded;
+}
+
+bool Context::IsPlandoLoaded() {
+    return mPlandoLoaded;
+}
+
+void Context::SetPlandoLoaded(bool plandoLoaded) {
+    mPlandoLoaded = plandoLoaded;
+}
+
+GetItemEntry Context::GetFinalGIEntry(RandomizerCheck rc, bool checkObtainability, GetItemID ogItemId) {
+    auto itemLoc = GetItemLocation(rc);
+    if (itemLoc->GetPlacedRandomizerGet() == RG_NONE) {
+        if (ogItemId != GI_NONE) {
+            return ItemTableManager::Instance->RetrieveItemEntry(MOD_NONE, ogItemId);
+        }
+        return ItemTableManager::Instance->RetrieveItemEntry(
+            MOD_NONE, StaticData::RetrieveItem(StaticData::GetLocation(rc)->GetVanillaItem()).GetItemID());
+    }
+    if (checkObtainability && OTRGlobals::Instance->gRandomizer->GetItemObtainabilityFromRandomizerGet(
+                                  itemLoc->GetPlacedRandomizerGet()) != CAN_OBTAIN) {
+        return ItemTableManager::Instance->RetrieveItemEntry(MOD_NONE, GI_RUPEE_BLUE);
+    }
+    GetItemEntry giEntry = itemLoc->GetPlacedItem().GetGIEntry_Copy();
+    if (overrides.contains(rc)) {
+        auto fakeGiEntry = StaticData::RetrieveItem(overrides[rc].LooksLike()).GetGIEntry();
+        giEntry.gid = fakeGiEntry->gid;
+        giEntry.gi = fakeGiEntry->gi;
+        giEntry.drawItemId = fakeGiEntry->drawItemId;
+        giEntry.drawModIndex = fakeGiEntry->drawModIndex;
+        giEntry.drawFunc = fakeGiEntry->drawFunc;
+    }
+    return giEntry;
+}
+
+std::string sanitize(std::string stringValue) {
+    // Add backslashes.
+    for (auto i = stringValue.begin();;) {
+        auto const pos =
+            std::find_if(i, stringValue.end(), [](char const c) { return '\\' == c || '\'' == c || '"' == c; });
+        if (pos == stringValue.end()) {
+            break;
+        }
+        i = std::next(stringValue.insert(pos, '\\'), 2);
+    }
+
+    // Removes others.
+    stringValue.erase(std::remove_if(stringValue.begin(), stringValue.end(),
+                                     [](char const c) { return '\n' == c || '\r' == c || '\0' == c || '\x1A' == c; }),
+                      stringValue.end());
+
+    return stringValue;
+}
+
+void Context::ParseSpoiler(const char* spoilerFileName, bool plandoMode) {
+    std::ifstream spoilerFileStream(sanitize(spoilerFileName));
+    if (!spoilerFileStream) {
+        return;
+    }
+    mSeedGenerated = false;
+    mSpoilerLoaded = false;
+    mPlandoLoaded = false;
+    try {
+        nlohmann::json spoilerFileJson;
+        spoilerFileStream >> spoilerFileJson;
+        ParseHashIconIndexesJson(spoilerFileJson);
+        mSettings->ParseJson(spoilerFileJson);
+        if (plandoMode) {
+            ParseItemLocationsJson(spoilerFileJson);
+            ParseHintJson(spoilerFileJson);
+            mEntranceShuffler->ParseJson(spoilerFileJson);
+            mDungeons->ParseJson(spoilerFileJson);
+            mTrials->ParseJson(spoilerFileJson);
+            mPlandoLoaded = true;
+        }
+        mSpoilerLoaded = true;
+        mSeedGenerated = false;
+    } catch (std::exception& e) {
+        throw e;
+    }
+}
+
+void Context::ParseHashIconIndexesJson(nlohmann::json spoilerFileJson) {
+    nlohmann::json hashJson = spoilerFileJson["file_hash"];
+    int index = 0;
+    for (auto it = hashJson.begin(); it != hashJson.end(); ++it) {
+        hashIconIndexes[index] = gSeedTextures[it.value()].id;
+        index++;
+    }
+}
+
+void Context::ParseItemLocationsJson(nlohmann::json spoilerFileJson) {
+    nlohmann::json locationsJson = spoilerFileJson["locations"];
+    for (auto it = locationsJson.begin(); it != locationsJson.end(); ++it) {
+        RandomizerCheck rc = mSpoilerfileCheckNameToEnum[it.key()];
+        if (it->is_structured()) {
+            nlohmann::json itemJson = *it;
+            for (auto itemit = itemJson.begin(); itemit != itemJson.end(); ++itemit) {
+                if (itemit.key() == "item") {
+                    itemLocationTable[rc].SetPlacedItem(mSpoilerfileGetNameToEnum[itemit.value().template get<std::string>()]);
+                } else if (itemit.key() == "price") {
+                    itemLocationTable[rc].SetCustomPrice(itemit.value().template get<uint16_t>());
+                } else if (itemit.key() == "model") {
+                    overrides[rc] = ItemOverride(rc, mSpoilerfileGetNameToEnum[itemit.value().template get<std::string>()]);
+                } else if (itemit.key() == "trickName") {
+                    overrides[rc].SetTrickName(Text(itemit.value().template get<std::string>()));
+                }
+            }
+        } else {
+            itemLocationTable[rc].SetPlacedItem(mSpoilerfileGetNameToEnum[it.value().template get<std::string>()]);
+        }
+    }
+}
+
+std::string AltarIconString(char iconChar) {
+    std::string iconString = "";
+    switch (iconChar) {
+        case '0':
+            // Kokiri Emerald
+            iconString += 0x13;
+            iconString += 0x6C;
+            break;
+        case '1':
+            // Goron Ruby
+            iconString += 0x13;
+            iconString += 0x6D;
+            break;
+        case '2':
+            // Zora Sapphire
+            iconString += 0x13;
+            iconString += 0x6E;
+            break;
+        case '3':
+            // Forest Medallion
+            iconString += 0x13;
+            iconString += 0x66;
+            break;
+        case '4':
+            // Fire Medallion
+            iconString += 0x13;
+            iconString += 0x67;
+            break;
+        case '5':
+            // Water Medallion
+            iconString += 0x13;
+            iconString += 0x68;
+            break;
+        case '6':
+            // Spirit Medallion
+            iconString += 0x13;
+            iconString += 0x69;
+            break;
+        case '7':
+            // Shadow Medallion
+            iconString += 0x13;
+            iconString += 0x6A;
+            break;
+        case '8':
+            // Light Medallion
+            iconString += 0x13;
+            iconString += 0x6B;
+            break;
+        case 'o':
+            // Open DOT (master sword)
+            iconString += 0x13;
+            iconString += 0x3C;
+            break;
+        case 'c':
+            // Closed DOT (fairy ocarina)
+            iconString += 0x13;
+            iconString += 0x07;
+            break;
+        case 'i':
+            // Intended DOT (oot)
+            iconString += 0x13;
+            iconString += 0x08;
+            break;
+        case 'l':
+            // Light Arrow (for bridge reqs)
+            iconString += 0x13;
+            iconString += 0x12;
+            break;
+        case 'b':
+            // Boss Key (ganon boss key location)
+            iconString += 0x13;
+            iconString += 0x74;
+            break;
+        case 'L':
+            // Bow with Light Arrow
+            iconString += 0x13;
+            iconString += 0x3A;
+            break;
+        case 'k':
+            // Kokiri Tunic
+            iconString += 0x13;
+            iconString += 0x41;
+            break;
+    }
+    return iconString;
+}
+
+std::string FormatJsonHintText(std::string jsonHint) {
+    std::string formattedHintMessage = jsonHint;
+
+    // add icons to altar text
+    for (char iconChar : { '0', '1', '2', '3', '4', '5', '6', '7', '8', 'o', 'c', 'i', 'l', 'b', 'L', 'k' }) {
+        std::string textToReplace = "$";
+        textToReplace += iconChar;
+        size_t start_pos = formattedHintMessage.find(textToReplace);
+        if (!(start_pos == std::string::npos)) {
+            std::string iconString = AltarIconString(iconChar);
+            formattedHintMessage.replace(start_pos, textToReplace.length(), iconString);
+        }
+    }
+    return formattedHintMessage;
+}
+
+void Context::ParseHintJson(nlohmann::json spoilerFileJson) {
+    // Child Altar
+    std::string childAltarJsonText = spoilerFileJson["childAltar"]["hintText"].template get<std::string>();
+    std::string formattedChildAltarText = FormatJsonHintText(childAltarJsonText);
+    AddHint(RH_ALTAR_CHILD, Text(formattedChildAltarText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text());
+    mEmeraldLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["childAltar"]["rewards"]["emeraldLoc"]];
+    mRubyLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["childAltar"]["rewards"]["rubyLoc"]];
+    mSapphireLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["childAltar"]["rewards"]["sapphireLoc"]];
+    // Adult Altar
+    std::string adultAltarJsonText = spoilerFileJson["adultAltar"]["hintText"].template get<std::string>();
+    std::string formattedAdultAltarText = FormatJsonHintText(adultAltarJsonText);
+    AddHint(RH_ALTAR_ADULT, Text(formattedAdultAltarText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text());
+    mForestMedallionLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["forestMedallionLoc"].template get<std::string>()];
+    mFireMedallionLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["fireMedallionLoc"].template get<std::string>()];
+    mWaterMedallionLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["waterMedallionLoc"].template get<std::string>()];
+    mShadowMedallionLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["shadowMedallionLoc"].template get<std::string>()];
+    mSpiritMedallionLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["spiritMedallionLoc"].template get<std::string>()];
+    mLightMedallionLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["lightMedallionLoc"].template get<std::string>()];
+    // Ganondorf and Sheik Light Arrow Hints
+    std::string ganonHintText = FormatJsonHintText(spoilerFileJson["ganonHintText"].template get<std::string>());
+    RandomizerCheck lightArrowLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["lightArrowHintLoc"].template get<std::string>()];
+    std::string lightArrowRegion = spoilerFileJson["lightArrowHintRegion"].template get<std::string>();
+    AddHint(RH_GANONDORF_HINT, Text(ganonHintText), lightArrowLoc, HINT_TYPE_STATIC, Text(lightArrowRegion));
+    std::string sheikText = FormatJsonHintText(spoilerFileJson["sheikText"].template get<std::string>());
+    AddHint(RH_SHEIK_LIGHT_ARROWS, Text(sheikText), lightArrowLoc, HINT_TYPE_STATIC, lightArrowRegion);
+    std::string ganonText = FormatJsonHintText(spoilerFileJson["ganonText"].template get<std::string>());
+    AddHint(RH_GANONDORF_NOHINT, Text(ganonText), RC_UNKNOWN_CHECK, HINT_TYPE_JUNK, Text());
+    // Dampe Hookshot Hint
+    std::string dampeText = FormatJsonHintText(spoilerFileJson["dampeText"].template get<std::string>());
+    std::string dampeRegion = spoilerFileJson["dampeRegion"].template get<std::string>();
+    RandomizerCheck dampeHintLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["dampeHintLoc"].template get<std::string>()];
+    AddHint(RH_DAMPES_DIARY, Text(dampeText), dampeHintLoc, HINT_TYPE_STATIC, Text(dampeRegion));
+    // Greg Hint
+    std::string gregText = FormatJsonHintText(spoilerFileJson["gregText"].template get<std::string>());
+    std::string gregRegion = spoilerFileJson["gregRegion"].template get<std::string>();
+    RandomizerCheck gregLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["gregLoc"].template get<std::string>()];
+    AddHint(RH_GREG_RUPEE, Text(gregText), gregLoc, HINT_TYPE_STATIC, Text(gregRegion));
+    // Saria Magic Hint
+    std::string sariaText = FormatJsonHintText(spoilerFileJson["sariaText"].template get<std::string>());
+    std::string sariaRegion = spoilerFileJson["sariaRegion"].template get<std::string>();
+    RandomizerCheck sariaHintLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["sariaHintLoc"].template get<std::string>()];
+    AddHint(RH_SARIA, Text(sariaText), sariaHintLoc, HINT_TYPE_STATIC, Text(sariaRegion));
+    // Warp Songs
+    std::string warpMinuetText = FormatJsonHintText(spoilerFileJson["warpMinuetText"].template get<std::string>());
+    AddHint(RH_MINUET_WARP_LOC, Text(warpMinuetText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text(warpMinuetText));
+    std::string warpBoleroText = FormatJsonHintText(spoilerFileJson["warpBoleroText"].template get<std::string>());
+    AddHint(RH_BOLERO_WARP_LOC, Text(warpBoleroText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text(warpBoleroText));
+    std::string warpSerenadeText = FormatJsonHintText(spoilerFileJson["warpSerenadeText"].template get<std::string>());
+    AddHint(RH_SERENADE_WARP_LOC, Text(warpSerenadeText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text(warpSerenadeText));
+    std::string warpRequiemText = FormatJsonHintText(spoilerFileJson["warpRequiemText"].template get<std::string>());
+    AddHint(RH_REQUIEM_WARP_LOC, Text(warpRequiemText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text(warpRequiemText));
+    std::string warpNocturneText = FormatJsonHintText(spoilerFileJson["warpNocturneText"].template get<std::string>());
+    AddHint(RH_NOCTURNE_WARP_LOC, Text(warpNocturneText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text(warpNocturneText));
+    std::string warpPreludeText = FormatJsonHintText(spoilerFileJson["warpPreludeText"].template get<std::string>());
+    AddHint(RH_PRELUDE_WARP_LOC, Text(warpPreludeText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text(warpPreludeText));
+    // Gossip Stones
+    nlohmann::json hintsJson = spoilerFileJson["hints"];
+    for (auto it = hintsJson.begin(); it != hintsJson.end(); it++) {
+        RandomizerCheck gossipStoneLoc = mSpoilerfileCheckNameToEnum[it.key()];
+        nlohmann::json hintInfo = it.value();
+        std::string hintText = FormatJsonHintText(hintInfo["hint"].template get<std::string>());
+        HintType hintType = mSpoilerfileHintTypeNameToEnum[hintInfo["type"].template get<std::string>()];
+        RandomizerCheck hintedLocation = mSpoilerfileCheckNameToEnum[hintInfo["location"]];
+        std::string hintedArea = hintInfo["area"].template get<std::string>();
+        AddHint(RandomizerHintKey(gossipStoneLoc - RC_COLOSSUS_GOSSIP_STONE + 1), Text(hintText), hintedLocation, hintType, hintedArea);
+    }
+}
+
+std::shared_ptr<Settings> Context::GetSettings() {
+    return mSettings;
+}
+
+const std::shared_ptr<EntranceShuffler> Context::GetEntranceShuffler() {
+    return mEntranceShuffler;
+}
+
+std::shared_ptr<Dungeons> Context::GetDungeons() {
+    return mDungeons;
+}
+
+DungeonInfo* Context::GetDungeon(size_t key) {
+    return mDungeons->GetDungeon(DungeonKey(key));
+}
+
+std::shared_ptr<Trials> Context::GetTrials() {
+    return mTrials;
+}
+
+TrialInfo* Context::GetTrial(size_t key) {
+    return mTrials->GetTrial(TrialKey(key));
+}
+
+Sprite* Context::GetSeedTexture(uint8_t index) {
+    return &gSeedTextures[index];
+}
+
+Rando::Option& Context::GetOption(RandomizerSettingKey key) {
+    return mSettings->Setting(key);
+}
+
+Rando::Option& Context::GetTrickOption(RandomizerTrick key) {
+    return mSettings->GetTrickOption(key);
+}
+} // namespace Rando
diff --git a/soh/soh/Enhancements/randomizer/context.h b/soh/soh/Enhancements/randomizer/context.h
index d008077a8..4d7e07eee 100644
--- a/soh/soh/Enhancements/randomizer/context.h
+++ b/soh/soh/Enhancements/randomizer/context.h
@@ -2,11 +2,14 @@
 
 #include "randomizerTypes.h"
 #include "item_location.h"
+#include "item_override.h"
 #include "3drando/text.hpp"
 #include "hint.h"
 
 #include <memory>
 #include <array>
+#include <map>
+#include <nlohmann/json.hpp>
 
 /**
  * @brief Singleton for storing and accessing dynamic Randomizer-related data
@@ -17,6 +20,13 @@
  * used as a Singleton.
  */
 namespace Rando {
+class EntranceShuffler;
+class Settings;
+class Dungeons;
+class DungeonInfo;
+class TrialInfo;
+class Trials;
+
 class Context {
   public:
     Context();
@@ -26,6 +36,7 @@ class Context {
     void AddHint(RandomizerHintKey hintId, Text text, RandomizerCheck hintedLocation, HintType hintType,
                  Text hintedRegion);
     ItemLocation* GetItemLocation(RandomizerCheck locKey);
+    ItemLocation* GetItemLocation(size_t locKey);
     void PlaceItemInLocation(RandomizerCheck locKey, RandomizerGet item, bool applyEffectImmediately = false,
                              bool setHidden = false);
     std::vector<RandomizerCheck> allLocations;
@@ -40,17 +51,58 @@ class Context {
     void ItemReset();
     void HintReset();
     void CreateItemOverrides();
-    std::set<ItemOverride, ItemOverride_Compare> overrides = {};
+    bool IsSeedGenerated();
+    void SetSeedGenerated(bool seedGenerated = true);
+    bool IsSpoilerLoaded();
+    void SetSpoilerLoaded(bool spoilerLoaded = true);
+    bool IsPlandoLoaded();
+    void SetPlandoLoaded(bool plandoLoaded = true);
+    std::shared_ptr<Settings> GetSettings();
+    const std::shared_ptr<EntranceShuffler> GetEntranceShuffler();
+    std::shared_ptr<Dungeons> GetDungeons();
+    DungeonInfo* GetDungeon(size_t key);
+    std::shared_ptr<Trials> GetTrials();
+    TrialInfo* GetTrial(size_t key);
+    Sprite* GetSeedTexture(uint8_t index);
+    Option& GetOption(RandomizerSettingKey key);
+    Option& GetTrickOption(RandomizerTrick key);
+    GetItemEntry GetFinalGIEntry(RandomizerCheck rc, bool checkObtainability = true, GetItemID ogItemId = GI_NONE);
+    void ParseSpoiler(const char* spoilerFileName, bool plandoMode);
+    void ParseHashIconIndexesJson(nlohmann::json spoilerFileJson);
+    void ParseItemLocationsJson(nlohmann::json spoilerFileJson);
+    void ParseHintJson(nlohmann::json spoilerFileJson);
+    std::map<RandomizerCheck, ItemOverride> overrides = {};
     std::vector<std::vector<RandomizerCheck>> playthroughLocations = {};
     std::vector<RandomizerCheck> everyPossibleLocation = {};
     std::vector<RandomizerCheck> wothLocations = {};
-    std::unordered_map<RandomizerCheck, uint8_t> iceTrapModels = {};
+    std::vector<RandomizerGet> possibleIceTrapModels = {};
+    std::unordered_map<RandomizerCheck, RandomizerGet> iceTrapModels = {};
+    std::array<uint8_t, 5> hashIconIndexes = {};
+    std::unordered_map<std::string, RandomizerCheck> mSpoilerfileCheckNameToEnum;
     bool playthroughBeatable = false;
     bool allLocationsReachable = false;
 
   private:
     static std::weak_ptr<Context> mContext;
+    std::unordered_map<std::string, RandomizerGet> mSpoilerfileGetNameToEnum;
+    std::unordered_map<std::string, HintType> mSpoilerfileHintTypeNameToEnum;
     std::array<Hint, RH_MAX> hintTable = {};
+    RandomizerCheck mEmeraldLoc;
+    RandomizerCheck mRubyLoc;
+    RandomizerCheck mSapphireLoc;
+    RandomizerCheck mForestMedallionLoc;
+    RandomizerCheck mFireMedallionLoc;
+    RandomizerCheck mWaterMedallionLoc;
+    RandomizerCheck mShadowMedallionLoc;
+    RandomizerCheck mSpiritMedallionLoc;
+    RandomizerCheck mLightMedallionLoc;
     std::array<ItemLocation, RC_MAX> itemLocationTable = {};
+    std::shared_ptr<Settings> mSettings;
+    std::shared_ptr<EntranceShuffler> mEntranceShuffler;
+    std::shared_ptr<Dungeons> mDungeons;
+    std::shared_ptr<Trials> mTrials;
+    bool mSeedGenerated = false;
+    bool mSpoilerLoaded = false;
+    bool mPlandoLoaded = false;
 };
 } // namespace Rando
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/dungeon.cpp b/soh/soh/Enhancements/randomizer/dungeon.cpp
new file mode 100644
index 000000000..6b05efe48
--- /dev/null
+++ b/soh/soh/Enhancements/randomizer/dungeon.cpp
@@ -0,0 +1,783 @@
+#include "dungeon.h"
+
+#include "3drando/pool_functions.hpp"
+#include "static_data.h"
+#include "context.h"
+
+namespace Rando {
+DungeonInfo::DungeonInfo(std::string name_, RandomizerHintTextKey hintKey_, RandomizerGet map_, RandomizerGet compass_,
+                         RandomizerGet smallKey_, RandomizerGet keyRing_, RandomizerGet bossKey_,
+                         uint8_t vanillaKeyCount_, uint8_t mqKeyCount_, std::vector<RandomizerCheck> vanillaLocations_,
+                         std::vector<RandomizerCheck> mqLocations_, std::vector<RandomizerCheck> sharedLocations_,
+                         std::vector<RandomizerCheck> bossRoomLocations_)
+    : name(std::move(name_)), hintKey(hintKey_), map(map_), compass(compass_), smallKey(smallKey_), keyRing(keyRing_),
+      bossKey(bossKey_), vanillaKeyCount(vanillaKeyCount_), mqKeyCount(mqKeyCount_),
+      vanillaLocations(std::move(vanillaLocations_)), mqLocations(std::move(mqLocations_)),
+      sharedLocations(std::move(sharedLocations_)), bossRoomLocations(std::move(bossRoomLocations_)) {
+}
+DungeonInfo::DungeonInfo() = default;
+DungeonInfo::~DungeonInfo() = default;
+
+const std::string& DungeonInfo::GetName() const {
+    return name;
+}
+
+void DungeonInfo::SetMQ() {
+    masterQuest = true;
+}
+
+void DungeonInfo::ClearMQ() {
+    masterQuest = false;
+}
+
+bool DungeonInfo::IsMQ() const {
+    return masterQuest;
+}
+
+void DungeonInfo::SetKeyRing() {
+    hasKeyRing = true;
+}
+
+void DungeonInfo::ClearKeyRing() {
+    hasKeyRing = false;
+}
+
+bool DungeonInfo::HasKeyRing() const {
+    return hasKeyRing;
+}
+
+bool DungeonInfo::IsVanilla() const {
+    return !masterQuest;
+}
+
+uint8_t DungeonInfo::GetSmallKeyCount() const {
+    return (masterQuest) ? mqKeyCount : vanillaKeyCount;
+}
+
+RandomizerHintTextKey DungeonInfo::GetHintKey() const {
+    return hintKey;
+}
+
+RandomizerGet DungeonInfo::GetSmallKey() const {
+    return smallKey;
+}
+
+RandomizerGet DungeonInfo::GetKeyRing() const {
+    return keyRing;
+}
+
+RandomizerGet DungeonInfo::GetMap() const {
+    return map;
+}
+
+RandomizerGet DungeonInfo::GetCompass() const {
+    return compass;
+}
+
+RandomizerGet DungeonInfo::GetBossKey() const {
+    return bossKey;
+}
+
+void DungeonInfo::PlaceVanillaMap() {
+    if (map == RG_NONE) {
+        return;
+    }
+
+    auto dungeonLocations = GetDungeonLocations();
+    auto mapLocation = FilterFromPool(dungeonLocations, [](const RandomizerCheck loc) {
+        return StaticData::GetLocation(loc)->IsCategory(Category::cVanillaMap);
+    })[0];
+    Context::GetInstance()->PlaceItemInLocation(mapLocation, map);
+}
+
+void DungeonInfo::PlaceVanillaCompass() {
+    if (compass == RG_NONE) {
+        return;
+    }
+
+    auto dungeonLocations = GetDungeonLocations();
+    auto compassLocation = FilterFromPool(dungeonLocations, [](const RandomizerCheck loc) {
+        return StaticData::GetLocation(loc)->IsCategory(Category::cVanillaCompass);
+    })[0];
+    Context::GetInstance()->PlaceItemInLocation(compassLocation, compass);
+}
+
+void DungeonInfo::PlaceVanillaBossKey() {
+    if (bossKey == RG_NONE || bossKey == RG_GANONS_CASTLE_BOSS_KEY) {
+        return;
+    }
+
+    auto dungeonLocations = GetDungeonLocations();
+    auto bossKeyLocation = FilterFromPool(dungeonLocations, [](const RandomizerCheck loc) {
+        return StaticData::GetLocation(loc)->IsCategory(Category::cVanillaBossKey);
+    })[0];
+    Context::GetInstance()->PlaceItemInLocation(bossKeyLocation, bossKey);
+}
+
+void DungeonInfo::PlaceVanillaSmallKeys() {
+    if (smallKey == RG_NONE) {
+        return;
+    }
+
+    auto dungeonLocations = GetDungeonLocations();
+    auto smallKeyLocations = FilterFromPool(dungeonLocations, [](const RandomizerCheck loc) {
+        return StaticData::GetLocation(loc)->IsCategory(Category::cVanillaSmallKey);
+    });
+    for (auto location : smallKeyLocations) {
+        Context::GetInstance()->PlaceItemInLocation(location, smallKey);
+    }
+}
+
+// Gets the chosen dungeon locations for a playthrough (so either MQ or Vanilla)
+std::vector<RandomizerCheck> DungeonInfo::GetDungeonLocations() const {
+    auto locations = masterQuest ? mqLocations : vanillaLocations;
+    AddElementsToPool(locations, sharedLocations);
+    AddElementsToPool(locations, bossRoomLocations);
+    return locations;
+}
+
+// Gets all dungeon locations (MQ + Vanilla)
+std::vector<RandomizerCheck> DungeonInfo::GetEveryLocation() const {
+    auto locations = vanillaLocations;
+    AddElementsToPool(locations, mqLocations);
+    AddElementsToPool(locations, sharedLocations);
+    AddElementsToPool(locations, bossRoomLocations);
+    return locations;
+}
+
+Dungeons::Dungeons() {
+    dungeonList[DEKU_TREE] =
+        DungeonInfo("Deku Tree", RHT_DEKU_TREE, RG_DEKU_TREE_MAP, RG_DEKU_TREE_COMPASS, RG_NONE, RG_NONE, RG_NONE, 0, 0,
+                    {
+                        // Vanilla Locations
+                        RC_DEKU_TREE_MAP_CHEST,
+                        RC_DEKU_TREE_COMPASS_CHEST,
+                        RC_DEKU_TREE_COMPASS_ROOM_SIDE_CHEST,
+                        RC_DEKU_TREE_BASEMENT_CHEST,
+                        RC_DEKU_TREE_SLINGSHOT_CHEST,
+                        RC_DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST,
+                        RC_DEKU_TREE_GS_BASEMENT_BACK_ROOM,
+                        RC_DEKU_TREE_GS_BASEMENT_GATE,
+                        RC_DEKU_TREE_GS_BASEMENT_VINES,
+                        RC_DEKU_TREE_GS_COMPASS_ROOM,
+                    },
+                    {
+                        // MQ Locations
+                        RC_DEKU_TREE_MQ_MAP_CHEST,
+                        RC_DEKU_TREE_MQ_COMPASS_CHEST,
+                        RC_DEKU_TREE_MQ_SLINGSHOT_CHEST,
+                        RC_DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST,
+                        RC_DEKU_TREE_MQ_BASEMENT_CHEST,
+                        RC_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST,
+                        RC_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST,
+                        RC_DEKU_TREE_MQ_DEKU_SCRUB,
+                        RC_DEKU_TREE_MQ_GS_LOBBY,
+                        RC_DEKU_TREE_MQ_GS_COMPASS_ROOM,
+                        RC_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM,
+                        RC_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM,
+                    },
+                    {},
+                    {
+                        // Boss Room Locations
+                        RC_DEKU_TREE_QUEEN_GOHMA_HEART,
+                        RC_QUEEN_GOHMA,
+                    });
+    dungeonList[DODONGOS_CAVERN] = DungeonInfo("Dodongo's Cavern", RHT_DODONGOS_CAVERN, RG_DODONGOS_CAVERN_MAP,
+                                               RG_DODONGOS_CAVERN_COMPASS, RG_NONE, RG_NONE, RG_NONE, 0, 0,
+                                               {
+                                                   // Vanilla Locations
+                                                   RC_DODONGOS_CAVERN_MAP_CHEST,
+                                                   RC_DODONGOS_CAVERN_COMPASS_CHEST,
+                                                   RC_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST,
+                                                   RC_DODONGOS_CAVERN_BOMB_BAG_CHEST,
+                                                   RC_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST,
+                                                   RC_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY,
+                                                   RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS,
+                                                   RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,
+                                                   RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT,
+                                                   RC_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS,
+                                                   RC_DODONGOS_CAVERN_GS_SCARECROW,
+                                                   RC_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS,
+                                                   RC_DODONGOS_CAVERN_GS_BACK_ROOM,
+                                                   RC_DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS,
+                                               },
+                                               {
+                                                   // MQ Locations
+                                                   RC_DODONGOS_CAVERN_MQ_MAP_CHEST,
+                                                   RC_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST,
+                                                   RC_DODONGOS_CAVERN_MQ_COMPASS_CHEST,
+                                                   RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST,
+                                                   RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST,
+                                                   RC_DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST,
+                                                   RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,
+                                                   RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT,
+                                                   RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,
+                                                   RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS,
+                                                   RC_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM,
+                                                   RC_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM,
+                                                   RC_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM,
+                                                   RC_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM,
+                                                   RC_DODONGOS_CAVERN_MQ_GS_BACK_AREA,
+                                               },
+                                               {},
+                                               {
+                                                   // Boss Room Locations
+                                                   RC_DODONGOS_CAVERN_BOSS_ROOM_CHEST,
+                                                   RC_DODONGOS_CAVERN_KING_DODONGO_HEART,
+                                                   RC_KING_DODONGO,
+                                               });
+    dungeonList[JABU_JABUS_BELLY] = DungeonInfo("Jabu Jabu's Belly", RHT_JABU_JABUS_BELLY, RG_JABU_JABUS_BELLY_MAP,
+                                                RG_JABU_JABUS_BELLY_COMPASS, RG_NONE, RG_NONE, RG_NONE, 0, 0,
+                                                {
+                                                    // Vanilla Locations
+                                                    RC_JABU_JABUS_BELLY_MAP_CHEST,
+                                                    RC_JABU_JABUS_BELLY_COMPASS_CHEST,
+                                                    RC_JABU_JABUS_BELLY_BOOMERANG_CHEST,
+                                                    RC_JABU_JABUS_BELLY_DEKU_SCRUB,
+                                                    RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER,
+                                                    RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER,
+                                                    RC_JABU_JABUS_BELLY_GS_NEAR_BOSS,
+                                                    RC_JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM,
+                                                },
+                                                {
+                                                    // MQ Locations
+                                                    RC_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST,
+                                                    RC_JABU_JABUS_BELLY_MQ_MAP_CHEST,
+                                                    RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST,
+                                                    RC_JABU_JABUS_BELLY_MQ_COMPASS_CHEST,
+                                                    RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST,
+                                                    RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST,
+                                                    RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST,
+                                                    RC_JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST,
+                                                    RC_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST,
+                                                    RC_JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST,
+                                                    RC_JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST,
+                                                    RC_JABU_JABUS_BELLY_MQ_COW,
+                                                    RC_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM,
+                                                    RC_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM,
+                                                    RC_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM,
+                                                    RC_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS,
+                                                },
+                                                {},
+                                                {
+                                                    // Boss Room Locations
+                                                    RC_JABU_JABUS_BELLY_BARINADE_HEART,
+                                                    RC_BARINADE,
+                                                });
+    dungeonList[FOREST_TEMPLE] =
+        DungeonInfo("Forest Temple", RHT_FOREST_TEMPLE, RG_FOREST_TEMPLE_MAP, RG_FOREST_TEMPLE_COMPASS,
+                    RG_FOREST_TEMPLE_SMALL_KEY, RG_FOREST_TEMPLE_KEY_RING, RG_FOREST_TEMPLE_BOSS_KEY, 5, 6,
+                    {
+                        // Vanilla Locations
+                        RC_FOREST_TEMPLE_FIRST_ROOM_CHEST,
+                        RC_FOREST_TEMPLE_FIRST_STALFOS_CHEST,
+                        RC_FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST,
+                        RC_FOREST_TEMPLE_MAP_CHEST,
+                        RC_FOREST_TEMPLE_WELL_CHEST,
+                        RC_FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST,
+                        RC_FOREST_TEMPLE_EYE_SWITCH_CHEST,
+                        RC_FOREST_TEMPLE_BOSS_KEY_CHEST,
+                        RC_FOREST_TEMPLE_FLOORMASTER_CHEST,
+                        RC_FOREST_TEMPLE_BOW_CHEST,
+                        RC_FOREST_TEMPLE_RED_POE_CHEST,
+                        RC_FOREST_TEMPLE_BLUE_POE_CHEST,
+                        RC_FOREST_TEMPLE_BASEMENT_CHEST,
+                        RC_FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD,
+                        RC_FOREST_TEMPLE_GS_FIRST_ROOM,
+                        RC_FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD,
+                        RC_FOREST_TEMPLE_GS_LOBBY,
+                        RC_FOREST_TEMPLE_GS_BASEMENT,
+                    },
+                    {
+                        // MQ Locations
+                        RC_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST,
+                        RC_FOREST_TEMPLE_MQ_WOLFOS_CHEST,
+                        RC_FOREST_TEMPLE_MQ_BOW_CHEST,
+                        RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST,
+                        RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST,
+                        RC_FOREST_TEMPLE_MQ_WELL_CHEST,
+                        RC_FOREST_TEMPLE_MQ_MAP_CHEST,
+                        RC_FOREST_TEMPLE_MQ_COMPASS_CHEST,
+                        RC_FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST,
+                        RC_FOREST_TEMPLE_MQ_BASEMENT_CHEST,
+                        RC_FOREST_TEMPLE_MQ_REDEAD_CHEST,
+                        RC_FOREST_TEMPLE_MQ_BOSS_KEY_CHEST,
+                        RC_FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY,
+                        RC_FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM,
+                        RC_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD,
+                        RC_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD,
+                        RC_FOREST_TEMPLE_MQ_GS_WELL,
+                    },
+                    {},
+                    {
+                        // Boss Room Locations
+                        RC_FOREST_TEMPLE_PHANTOM_GANON_HEART,
+                        RC_PHANTOM_GANON,
+                    });
+    dungeonList[FIRE_TEMPLE] =
+        DungeonInfo("Fire Temple", RHT_FIRE_TEMPLE, RG_FIRE_TEMPLE_MAP, RG_FIRE_TEMPLE_COMPASS,
+                    RG_FIRE_TEMPLE_SMALL_KEY, RG_FIRE_TEMPLE_KEY_RING, RG_FIRE_TEMPLE_BOSS_KEY, 8, 5,
+                    {
+                        // Vanilla Locations
+                        RC_FIRE_TEMPLE_NEAR_BOSS_CHEST,
+                        RC_FIRE_TEMPLE_FLARE_DANCER_CHEST,
+                        RC_FIRE_TEMPLE_BOSS_KEY_CHEST,
+                        RC_FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST,
+                        RC_FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST,
+                        RC_FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST,
+                        RC_FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST,
+                        RC_FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST,
+                        RC_FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST,
+                        RC_FIRE_TEMPLE_SCARECROW_CHEST,
+                        RC_FIRE_TEMPLE_MAP_CHEST,
+                        RC_FIRE_TEMPLE_COMPASS_CHEST,
+                        RC_FIRE_TEMPLE_HIGHEST_GORON_CHEST,
+                        RC_FIRE_TEMPLE_MEGATON_HAMMER_CHEST,
+                        RC_FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM,
+                        RC_FIRE_TEMPLE_GS_BOSS_KEY_LOOP,
+                        RC_FIRE_TEMPLE_GS_BOULDER_MAZE,
+                        RC_FIRE_TEMPLE_GS_SCARECROW_TOP,
+                        RC_FIRE_TEMPLE_GS_SCARECROW_CLIMB,
+                    },
+                    {
+                        // MQ Locations
+                        RC_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST,
+                        RC_FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST,
+                        RC_FIRE_TEMPLE_MQ_COMPASS_CHEST,
+                        RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST,
+                        RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST,
+                        RC_FIRE_TEMPLE_MQ_CHEST_ON_FIRE,
+                        RC_FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST,
+                        RC_FIRE_TEMPLE_MQ_MAP_CHEST,
+                        RC_FIRE_TEMPLE_MQ_BOSS_KEY_CHEST,
+                        RC_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST,
+                        RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST,
+                        RC_FIRE_TEMPLE_MQ_FREESTANDING_KEY,
+                        RC_FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE,
+                        RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER,
+                        RC_FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR,
+                        RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM,
+                        RC_FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE,
+                    },
+                    {},
+                    {
+                        // Boos Room Locations
+                        RC_FIRE_TEMPLE_VOLVAGIA_HEART,
+                        RC_VOLVAGIA,
+                    });
+    dungeonList[WATER_TEMPLE] =
+        DungeonInfo("Water Temple", RHT_WATER_TEMPLE, RG_WATER_TEMPLE_MAP, RG_WATER_TEMPLE_COMPASS,
+                    RG_WATER_TEMPLE_SMALL_KEY, RG_WATER_TEMPLE_KEY_RING, RG_WATER_TEMPLE_BOSS_KEY, 6, 2,
+                    {
+                        // Vanilla Locations
+                        RC_WATER_TEMPLE_MAP_CHEST,
+                        RC_WATER_TEMPLE_COMPASS_CHEST,
+                        RC_WATER_TEMPLE_TORCHES_CHEST,
+                        RC_WATER_TEMPLE_DRAGON_CHEST,
+                        RC_WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST,
+                        RC_WATER_TEMPLE_CENTRAL_PILLAR_CHEST,
+                        RC_WATER_TEMPLE_CRACKED_WALL_CHEST,
+                        RC_WATER_TEMPLE_BOSS_KEY_CHEST,
+                        RC_WATER_TEMPLE_LONGSHOT_CHEST,
+                        RC_WATER_TEMPLE_RIVER_CHEST,
+                        RC_WATER_TEMPLE_GS_BEHIND_GATE,
+                        RC_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM,
+                        RC_WATER_TEMPLE_GS_CENTRAL_PILLAR,
+                        RC_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST,
+                        RC_WATER_TEMPLE_GS_RIVER,
+                    },
+                    {
+                        // MQ Locations
+                        RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST,
+                        RC_WATER_TEMPLE_MQ_BOSS_KEY_CHEST,
+                        RC_WATER_TEMPLE_MQ_LONGSHOT_CHEST,
+                        RC_WATER_TEMPLE_MQ_COMPASS_CHEST,
+                        RC_WATER_TEMPLE_MQ_MAP_CHEST,
+                        RC_WATER_TEMPLE_MQ_FREESTANDING_KEY,
+                        RC_WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH,
+                        RC_WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA,
+                        RC_WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY,
+                        RC_WATER_TEMPLE_MQ_GS_RIVER,
+                        RC_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH,
+                    },
+                    {},
+                    {
+                        // Boss Room Locations
+                        RC_WATER_TEMPLE_MORPHA_HEART,
+                        RC_MORPHA,
+                    });
+    dungeonList[SPIRIT_TEMPLE] =
+        DungeonInfo("Spirit Temple", RHT_SPIRIT_TEMPLE, RG_SPIRIT_TEMPLE_MAP, RG_SPIRIT_TEMPLE_COMPASS,
+                    RG_SPIRIT_TEMPLE_SMALL_KEY, RG_SPIRIT_TEMPLE_KEY_RING, RG_SPIRIT_TEMPLE_BOSS_KEY, 5, 7,
+                    {
+                        // Vanilla Locations
+                        RC_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST,
+                        RC_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST,
+                        RC_SPIRIT_TEMPLE_COMPASS_CHEST,
+                        RC_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST,
+                        RC_SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST,
+                        RC_SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST,
+                        RC_SPIRIT_TEMPLE_MAP_CHEST,
+                        RC_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST,
+                        RC_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST,
+                        RC_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST,
+                        RC_SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST,
+                        RC_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST,
+                        RC_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST,
+                        RC_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST,
+                        RC_SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST,
+                        RC_SPIRIT_TEMPLE_BOSS_KEY_CHEST,
+                        RC_SPIRIT_TEMPLE_TOPMOST_CHEST,
+                        RC_SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM,
+                        RC_SPIRIT_TEMPLE_GS_BOULDER_ROOM,
+                        RC_SPIRIT_TEMPLE_GS_LOBBY,
+                        RC_SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM,
+                        RC_SPIRIT_TEMPLE_GS_METAL_FENCE,
+                    },
+                    {
+                        // MQ Locations
+                        RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST,
+                        RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST,
+                        RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST,
+                        RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST,
+                        RC_SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST,
+                        RC_SPIRIT_TEMPLE_MQ_MAP_CHEST,
+                        RC_SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST,
+                        RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST,
+                        RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST,
+                        RC_SPIRIT_TEMPLE_MQ_COMPASS_CHEST,
+                        RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST,
+                        RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST,
+                        RC_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST,
+                        RC_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST,
+                        RC_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST,
+                        RC_SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST,
+                        RC_SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST,
+                        RC_SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST,
+                        RC_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST,
+                        RC_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST,
+                        RC_SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM,
+                        RC_SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM,
+                        RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST,
+                        RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH,
+                        RC_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM,
+                    },
+                    {
+                        // Shared Locations
+                        RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST,
+                        RC_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST,
+                    },
+                    {
+                        // Boss Room Locations
+                        RC_SPIRIT_TEMPLE_TWINROVA_HEART,
+                        RC_TWINROVA,
+                    });
+    dungeonList[SHADOW_TEMPLE] =
+        DungeonInfo("Shadow Temple", RHT_SHADOW_TEMPLE, RG_SHADOW_TEMPLE_MAP, RG_SHADOW_TEMPLE_COMPASS,
+                    RG_SHADOW_TEMPLE_SMALL_KEY, RG_SHADOW_TEMPLE_KEY_RING, RG_SHADOW_TEMPLE_BOSS_KEY, 5, 6,
+                    {
+                        // Vanilla Locations
+                        RC_SHADOW_TEMPLE_MAP_CHEST,
+                        RC_SHADOW_TEMPLE_HOVER_BOOTS_CHEST,
+                        RC_SHADOW_TEMPLE_COMPASS_CHEST,
+                        RC_SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST,
+                        RC_SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST,
+                        RC_SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST,
+                        RC_SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST,
+                        RC_SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST,
+                        RC_SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST,
+                        RC_SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST,
+                        RC_SHADOW_TEMPLE_WIND_HINT_CHEST,
+                        RC_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST,
+                        RC_SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST,
+                        RC_SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST,
+                        RC_SHADOW_TEMPLE_BOSS_KEY_CHEST,
+                        RC_SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST,
+                        RC_SHADOW_TEMPLE_FREESTANDING_KEY,
+                        RC_SHADOW_TEMPLE_GS_SINGLE_GIANT_POT,
+                        RC_SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM,
+                        RC_SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT,
+                        RC_SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM,
+                        RC_SHADOW_TEMPLE_GS_NEAR_SHIP,
+                    },
+                    {
+                        // MQ Locations
+                        RC_SHADOW_TEMPLE_MQ_COMPASS_CHEST,
+                        RC_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST,
+                        RC_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST,
+                        RC_SHADOW_TEMPLE_MQ_MAP_CHEST,
+                        RC_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST,
+                        RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST,
+                        RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST,
+                        RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST,
+                        RC_SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST,
+                        RC_SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST,
+                        RC_SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST,
+                        RC_SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST,
+                        RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST,
+                        RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST,
+                        RC_SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST,
+                        RC_SHADOW_TEMPLE_MQ_WIND_HINT_CHEST,
+                        RC_SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST,
+                        RC_SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST,
+                        RC_SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST,
+                        RC_SHADOW_TEMPLE_MQ_FREESTANDING_KEY,
+                        RC_SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM,
+                        RC_SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM,
+                        RC_SHADOW_TEMPLE_MQ_GS_AFTER_WIND,
+                        RC_SHADOW_TEMPLE_MQ_GS_AFTER_SHIP,
+                        RC_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS,
+                    },
+                    {},
+                    {
+                        // Boss Room Locations
+                        RC_SHADOW_TEMPLE_BONGO_BONGO_HEART,
+                        RC_BONGO_BONGO,
+                    });
+    dungeonList[BOTTOM_OF_THE_WELL] = DungeonInfo(
+        "Bottom of the Well", RHT_BOTTOM_OF_THE_WELL, RG_BOTTOM_OF_THE_WELL_MAP, RG_BOTTOM_OF_THE_WELL_COMPASS,
+        RG_BOTTOM_OF_THE_WELL_SMALL_KEY, RG_BOTTOM_OF_THE_WELL_KEY_RING, RG_NONE, 3, 2,
+        {
+            // Vanilla Locations
+            RC_BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST,
+            RC_BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST,
+            RC_BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST,
+            RC_BOTTOM_OF_THE_WELL_COMPASS_CHEST,
+            RC_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST,
+            RC_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST,
+            RC_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST,
+            RC_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST,
+            RC_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST,
+            RC_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST,
+            RC_BOTTOM_OF_THE_WELL_MAP_CHEST,
+            RC_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST,
+            RC_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST,
+            RC_BOTTOM_OF_THE_WELL_FREESTANDING_KEY,
+            RC_BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE,
+            RC_BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM,
+            RC_BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM,
+        },
+        {
+            // MQ Locations
+            RC_BOTTOM_OF_THE_WELL_MQ_MAP_CHEST,
+            RC_BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST,
+            RC_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST,
+            RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY,
+            RC_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY,
+            RC_BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT,
+            RC_BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM,
+            RC_BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM,
+        },
+        {}, {});
+    dungeonList[ICE_CAVERN] = DungeonInfo("Ice Cavern", RHT_ICE_CAVERN, RG_ICE_CAVERN_MAP, RG_ICE_CAVERN_COMPASS,
+                                          RG_NONE, RG_NONE, RG_NONE, 0, 0,
+                                          {
+                                              // Vanilla Locations
+                                              RC_ICE_CAVERN_MAP_CHEST,
+                                              RC_ICE_CAVERN_COMPASS_CHEST,
+                                              RC_ICE_CAVERN_IRON_BOOTS_CHEST,
+                                              RC_ICE_CAVERN_FREESTANDING_POH,
+                                              RC_ICE_CAVERN_GS_PUSH_BLOCK_ROOM,
+                                              RC_ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM,
+                                              RC_ICE_CAVERN_GS_HEART_PIECE_ROOM,
+                                          },
+                                          {
+                                              // MQ Locations
+                                              RC_ICE_CAVERN_MQ_IRON_BOOTS_CHEST,
+                                              RC_ICE_CAVERN_MQ_COMPASS_CHEST,
+                                              RC_ICE_CAVERN_MQ_MAP_CHEST,
+                                              RC_ICE_CAVERN_MQ_FREESTANDING_POH,
+                                              RC_ICE_CAVERN_MQ_GS_SCARECROW,
+                                              RC_ICE_CAVERN_MQ_GS_ICE_BLOCK,
+                                              RC_ICE_CAVERN_MQ_GS_RED_ICE,
+                                          },
+                                          {
+                                              // Shared Locations
+                                              RC_SHEIK_IN_ICE_CAVERN,
+                                          },
+                                          {});
+    dungeonList[GERUDO_TRAINING_GROUNDS] =
+        DungeonInfo("Gerudo Training Grounds", RHT_GERUDO_TRAINING_GROUND, RG_NONE, RG_NONE,
+                    RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, RG_GERUDO_TRAINING_GROUNDS_KEY_RING, RG_NONE, 9, 3,
+                    {
+                        // Vanilla Locations
+                        RC_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST,
+                        RC_GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST,
+                        RC_GERUDO_TRAINING_GROUND_STALFOS_CHEST,
+                        RC_GERUDO_TRAINING_GROUND_BEAMOS_CHEST,
+                        RC_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST,
+                        RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST,
+                        RC_GERUDO_TRAINING_GROUND_MAZE_PATH_SECOND_CHEST,
+                        RC_GERUDO_TRAINING_GROUND_MAZE_PATH_THIRD_CHEST,
+                        RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FINAL_CHEST,
+                        RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_CENTRAL_CHEST,
+                        RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_SIDE_CHEST,
+                        RC_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST,
+                        RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST,
+                        RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST,
+                        RC_GERUDO_TRAINING_GROUND_EYE_STATUE_CHEST,
+                        RC_GERUDO_TRAINING_GROUND_NEAR_SCARECROW_CHEST,
+                        RC_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST,
+                        RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST,
+                        RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST,
+                        RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_THIRD_CHEST,
+                        RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FOURTH_CHEST,
+                        RC_GERUDO_TRAINING_GROUND_FREESTANDING_KEY,
+                    },
+                    {
+                        // MQ Locations
+                        RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST,
+                        RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST,
+                        RC_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST,
+                        RC_GERUDO_TRAINING_GROUND_MQ_BEFORE_HEAVY_BLOCK_CHEST,
+                        RC_GERUDO_TRAINING_GROUND_MQ_EYE_STATUE_CHEST,
+                        RC_GERUDO_TRAINING_GROUND_MQ_FLAME_CIRCLE_CHEST,
+                        RC_GERUDO_TRAINING_GROUND_MQ_SECOND_IRON_KNUCKLE_CHEST,
+                        RC_GERUDO_TRAINING_GROUND_MQ_DINOLFOS_CHEST,
+                        RC_GERUDO_TRAINING_GROUND_MQ_ICE_ARROWS_CHEST,
+                        RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_CENTRAL_CHEST,
+                        RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_FIRST_CHEST,
+                        RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_SIDE_CHEST,
+                        RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_THIRD_CHEST,
+                        RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_SECOND_CHEST,
+                        RC_GERUDO_TRAINING_GROUND_MQ_HIDDEN_CEILING_CHEST,
+                        RC_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST,
+                        RC_GERUDO_TRAINING_GROUND_MQ_HEAVY_BLOCK_CHEST,
+                    },
+                    {}, {});
+    dungeonList[GANONS_CASTLE] =
+        DungeonInfo("Ganon's Castle", RHT_GANONS_CASTLE, RG_NONE, RG_NONE, RG_GANONS_CASTLE_SMALL_KEY,
+                    RG_GANONS_CASTLE_KEY_RING, RG_GANONS_CASTLE_BOSS_KEY, 2, 3,
+                    {
+                        // Vanilla Locations
+                        RC_GANONS_CASTLE_FOREST_TRIAL_CHEST,
+                        RC_GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST,
+                        RC_GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST,
+                        RC_GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST,
+                        RC_GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST,
+                        RC_GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST,
+                        RC_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST,
+                        RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST,
+                        RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST,
+                        RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST,
+                        RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST,
+                        RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST,
+                        RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST,
+                        RC_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST,
+                        RC_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST,
+                        RC_GANONS_CASTLE_DEKU_SCRUB_LEFT,
+                        RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,
+                        RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT,
+                        RC_GANONS_CASTLE_DEKU_SCRUB_RIGHT,
+                    },
+                    {
+                        // MQ Locations
+                        RC_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST,
+                        RC_GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST,
+                        RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST,
+                        RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST,
+                        RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST,
+                        RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST,
+                        RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST,
+                        RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST,
+                        RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST,
+                        RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST,
+                        RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST,
+                        RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST,
+                        RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY,
+                        RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,
+                        RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,
+                        RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,
+                        RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT,
+                        RC_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,
+                    },
+                    {
+                        // Shared Locations
+                        RC_GANONS_TOWER_BOSS_KEY_CHEST,
+                        RC_GANON,
+                    },
+                    {});
+}
+
+Dungeons::~Dungeons() = default;
+
+DungeonInfo* Dungeons::GetDungeon(DungeonKey key) {
+    return &dungeonList[key];
+}
+
+DungeonInfo* Dungeons::GetDungeonFromScene(uint16_t scene) {
+    switch (scene) {
+        case SCENE_DEKU_TREE:
+            return &dungeonList[DEKU_TREE];
+        case SCENE_DODONGOS_CAVERN:
+            return &dungeonList[DODONGOS_CAVERN];
+        case SCENE_JABU_JABU:
+            return &dungeonList[JABU_JABUS_BELLY];
+        case SCENE_FOREST_TEMPLE:
+            return &dungeonList[FOREST_TEMPLE];
+        case SCENE_FIRE_TEMPLE:
+            return &dungeonList[FIRE_TEMPLE];
+        case SCENE_WATER_TEMPLE:
+            return &dungeonList[WATER_TEMPLE];
+        case SCENE_SPIRIT_TEMPLE:
+            return &dungeonList[SPIRIT_TEMPLE];
+        case SCENE_SHADOW_TEMPLE:
+            return &dungeonList[SHADOW_TEMPLE];
+        case SCENE_BOTTOM_OF_THE_WELL:
+            return &dungeonList[BOTTOM_OF_THE_WELL];
+        case SCENE_ICE_CAVERN:
+            return &dungeonList[ICE_CAVERN];
+        case SCENE_GERUDO_TRAINING_GROUND:
+            return &dungeonList[GERUDO_TRAINING_GROUNDS];
+        case SCENE_INSIDE_GANONS_CASTLE:
+            return &dungeonList[GANONS_CASTLE];
+        default:
+            return nullptr;
+    }
+}
+
+size_t Dungeons::CountMQ() {
+    size_t count = 0;
+    for (DungeonInfo& dungeon : dungeonList) {
+        if (dungeon.IsMQ()) {
+            count++;
+        }
+    }
+    return count;
+}
+
+void Dungeons::ClearAllMQ() {
+    for (DungeonInfo& dungeon : dungeonList) {
+        dungeon.ClearMQ();
+    }
+}
+
+std::array<DungeonInfo*, 12> Dungeons::GetDungeonList() {
+    std::array<DungeonInfo*, 12> dungeonList_;
+    for (size_t i = 0; i < dungeonList.size(); i++) {
+        dungeonList_[i] = &dungeonList[i];
+    }
+    return dungeonList_;
+}
+
+size_t Dungeons::GetDungeonListSize() {
+    return dungeonList.size();
+}
+void Dungeons::ParseJson(nlohmann::json spoilerFileJson) {
+    try {
+        nlohmann::json mqDungeonsJson = spoilerFileJson["masterQuestDungeons"];
+        for (auto it = mqDungeonsJson.begin(); it != mqDungeonsJson.end(); it++) {
+            std::string dungeonName = it.value().template get<std::string>();
+            for (auto& dungeon : dungeonList) {
+                if (dungeon.GetName() == dungeonName) {
+                    dungeon.SetMQ();
+                } else {
+                    dungeon.ClearMQ();
+                }
+            }
+        }
+    } catch (const std::exception& e) {
+        throw e;
+    }
+}
+} // namespace Rando
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/dungeon.h b/soh/soh/Enhancements/randomizer/dungeon.h
new file mode 100644
index 000000000..e52f7b39b
--- /dev/null
+++ b/soh/soh/Enhancements/randomizer/dungeon.h
@@ -0,0 +1,96 @@
+#pragma once
+
+#include "randomizerTypes.h"
+
+#include <array>
+#include <vector>
+#include <string>
+#include "nlohmann/json.hpp"
+
+namespace Rando {
+class DungeonInfo {
+  public:
+    DungeonInfo(std::string name_, RandomizerHintTextKey hintKey_, RandomizerGet map_, RandomizerGet compass_,
+                RandomizerGet smallKey_, RandomizerGet keyRing_, RandomizerGet bossKey_, uint8_t vanillaKeyCount_,
+                uint8_t mqKeyCount_, std::vector<RandomizerCheck> vanillaLocations_,
+                std::vector<RandomizerCheck> mqLocations_, std::vector<RandomizerCheck> sharedLocations_,
+                std::vector<RandomizerCheck> bossRoomLocations_);
+    DungeonInfo();
+    ~DungeonInfo();
+
+    const std::string& GetName() const;
+    void SetMQ();
+    void ClearMQ();
+    bool IsMQ() const;
+    void SetKeyRing();
+    void ClearKeyRing();
+    bool HasKeyRing() const;
+    bool IsVanilla() const;
+    uint8_t GetSmallKeyCount() const;
+    RandomizerHintTextKey GetHintKey() const;
+    RandomizerGet GetSmallKey() const;
+    RandomizerGet GetKeyRing() const;
+    RandomizerGet GetMap() const;
+    RandomizerGet GetCompass() const;
+    RandomizerGet GetBossKey() const;
+    void PlaceVanillaMap();
+    void PlaceVanillaCompass();
+    void PlaceVanillaBossKey();
+    void PlaceVanillaSmallKeys();
+    std::vector<RandomizerCheck> GetDungeonLocations() const;
+    std::vector<RandomizerCheck> GetEveryLocation() const;
+
+  private:
+    std::string name;
+    RandomizerHintTextKey hintKey;
+    RandomizerGet map;
+    RandomizerGet compass;
+    RandomizerGet smallKey;
+    RandomizerGet keyRing;
+    RandomizerGet bossKey;
+    uint8_t vanillaKeyCount;
+    uint8_t mqKeyCount;
+    bool masterQuest = false;
+    bool hasKeyRing = false;
+    std::vector<RandomizerCheck> vanillaLocations;
+    std::vector<RandomizerCheck> mqLocations;
+    std::vector<RandomizerCheck> sharedLocations;
+    std::vector<RandomizerCheck> bossRoomLocations;
+};
+
+typedef enum {
+    DEKU_TREE,
+    DODONGOS_CAVERN,
+    JABU_JABUS_BELLY,
+    FOREST_TEMPLE,
+    FIRE_TEMPLE,
+    WATER_TEMPLE,
+    SPIRIT_TEMPLE,
+    SHADOW_TEMPLE,
+    BOTTOM_OF_THE_WELL,
+    ICE_CAVERN,
+    GERUDO_TRAINING_GROUNDS,
+    GANONS_CASTLE
+} DungeonKey;
+
+class Dungeons {
+  public:
+    Dungeons();
+    ~Dungeons();
+    DungeonInfo* GetDungeon(DungeonKey key);
+    DungeonInfo* GetDungeonFromScene(uint16_t scene);
+    size_t CountMQ();
+    void ClearAllMQ();
+    /// @brief Returns a new array of pointers to the DungeonInfo entries.
+    /// It returns an array of pointers rather than a pointer to an array so that
+    /// this new array can be shuffled for the purposes of randomizing MQ dungeons.
+    /// If you want an individual DungeonInfo entry you should use the GetDungeon
+    /// function from either here or the Context class.
+    /// @return 
+    std::array<DungeonInfo*, 12> GetDungeonList();
+    size_t GetDungeonListSize();
+    void ParseJson(nlohmann::json spoilerFileJson);
+  private:
+    std::array<DungeonInfo, 12> dungeonList;
+};
+}
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/entrance.cpp b/soh/soh/Enhancements/randomizer/entrance.cpp
new file mode 100644
index 000000000..766ca38cc
--- /dev/null
+++ b/soh/soh/Enhancements/randomizer/entrance.cpp
@@ -0,0 +1,1597 @@
+#include "entrance.h"
+
+#include "3drando/pool_functions.hpp"
+#include "3drando/item_pool.hpp"
+
+#include <spdlog/spdlog.h>
+
+namespace Rando {
+EntranceLinkInfo NO_RETURN_ENTRANCE = { EntranceType::None, RR_NONE, RR_NONE, -1 };
+
+Entrance::Entrance(RandomizerRegion connectedRegion_, std::vector<ConditionFn> conditions_met_)
+    : connectedRegion(connectedRegion_) {
+    conditions_met.resize(2);
+    for (size_t i = 0; i < conditions_met_.size(); i++) {
+        conditions_met[i] = conditions_met_[i];
+    }
+}
+
+void Entrance::SetCondition(ConditionFn newCondition) {
+    conditions_met[0] = newCondition;
+}
+
+bool Entrance::GetConditionsMet() const {
+    auto ctx = Rando::Context::GetInstance();
+    if (ctx->GetOption(RSK_LOGIC_RULES).Is(RO_LOGIC_NO_LOGIC) || ctx->GetOption(RSK_LOGIC_RULES).Is(RO_LOGIC_VANILLA)) {
+        return true;
+    } else if (ctx->GetOption(RSK_LOGIC_RULES).Is(RO_LOGIC_GLITCHLESS)) {
+        return conditions_met[0]();
+    } else if (ctx->GetOption(RSK_LOGIC_RULES).Is(RO_LOGIC_GLITCHED)) {
+        if (conditions_met[0]()) {
+            return true;
+        } else if (conditions_met[1] != NULL) {
+            return conditions_met[1]();
+        }
+    }
+    return false;
+}
+
+std::string Entrance::to_string() const {
+    return AreaTable(parentRegion)->regionName + " -> " + AreaTable(connectedRegion)->regionName;
+}
+
+void Entrance::SetName(std::string name_) {
+    if (name_ == "") {
+        name = AreaTable(parentRegion)->regionName + " -> " + AreaTable(connectedRegion)->regionName;
+    } else {
+        name = std::move(name_);
+    }
+}
+
+std::string Entrance::GetName() const {
+    return name;
+}
+
+void Entrance::printAgeTimeAccess() {
+    // CitraPrint("Name: ");
+    // CitraPrint(name);
+    auto message = "Child Day:   " + std::to_string(CheckConditionAtAgeTime(Logic::IsChild, Logic::AtDay)) +
+                   "\t"
+                   "Child Night: " +
+                   std::to_string(CheckConditionAtAgeTime(Logic::IsChild, Logic::AtNight)) +
+                   "\t"
+                   "Adult Day:   " +
+                   std::to_string(CheckConditionAtAgeTime(Logic::IsAdult, Logic::AtDay)) +
+                   "\t"
+                   "Adult Night: " +
+                   std::to_string(CheckConditionAtAgeTime(Logic::IsAdult, Logic::AtNight));
+    // CitraPrint(message);
+}
+
+bool Entrance::ConditionsMet(bool allAgeTimes) const {
+
+    Area* parent = AreaTable(parentRegion);
+    int conditionsMet = 0;
+
+    if (allAgeTimes && !parent->AllAccess()) {
+        return false;
+    }
+
+    // check all possible day/night condition combinations
+    conditionsMet = (parent->childDay && CheckConditionAtAgeTime(Logic::IsChild, Logic::AtDay, allAgeTimes)) +
+                    (parent->childNight && CheckConditionAtAgeTime(Logic::IsChild, Logic::AtNight, allAgeTimes)) +
+                    (parent->adultDay && CheckConditionAtAgeTime(Logic::IsAdult, Logic::AtDay, allAgeTimes)) +
+                    (parent->adultNight && CheckConditionAtAgeTime(Logic::IsAdult, Logic::AtNight, allAgeTimes));
+
+    return conditionsMet && (!allAgeTimes || conditionsMet == 4);
+}
+
+uint32_t Entrance::Getuint32_t() const {
+    return connectedRegion;
+}
+
+// set the logic to be a specific age and time of day and see if the condition still holds
+bool Entrance::CheckConditionAtAgeTime(bool& age, bool& time, bool passAnyway) const {
+
+    Logic::IsChild = false;
+    Logic::IsAdult = false;
+    Logic::AtDay = false;
+    Logic::AtNight = false;
+
+    time = true;
+    age = true;
+
+    Logic::UpdateHelpers();
+    return GetConditionsMet() && (connectedRegion != RR_NONE || passAnyway);
+}
+
+RandomizerRegion Entrance::GetConnectedRegionKey() const {
+    return connectedRegion;
+}
+
+Area* Entrance::GetConnectedRegion() const {
+    return AreaTable(connectedRegion);
+}
+
+void Entrance::SetParentRegion(RandomizerRegion newParent) {
+    parentRegion = newParent;
+}
+
+RandomizerRegion Entrance::GetParentRegionKey() const {
+    return parentRegion;
+}
+
+Area* Entrance::GetParentRegion() const {
+    return AreaTable(parentRegion);
+}
+
+void Entrance::SetNewEntrance(RandomizerRegion newRegion) {
+    connectedRegion = newRegion;
+}
+
+void Entrance::SetAsShuffled() {
+    shuffled = true;
+}
+
+bool Entrance::IsShuffled() const {
+    return shuffled;
+}
+
+bool Entrance::IsAddedToPool() const {
+    return addedToPool;
+}
+
+void Entrance::AddToPool() {
+    addedToPool = true;
+}
+
+void Entrance::RemoveFromPool() {
+    addedToPool = false;
+}
+
+void Entrance::SetAsPrimary() {
+    primary = true;
+}
+
+bool Entrance::IsPrimary() const {
+    return primary;
+}
+
+bool Entrance::IsDecoupled() const {
+    return decoupled;
+}
+
+void Entrance::SetDecoupled() {
+    decoupled = true;
+}
+
+int16_t Entrance::GetIndex() const {
+    return index;
+}
+
+void Entrance::SetIndex(int16_t newIndex) {
+    index = newIndex;
+}
+
+int16_t Entrance::GetBlueWarp() const {
+    return blueWarp;
+}
+
+void Entrance::SetBlueWarp(int16_t newBlueWarp) {
+    blueWarp = newBlueWarp;
+}
+
+Entrance* Entrance::GetAssumed() const {
+    return assumed;
+}
+
+void Entrance::SetReplacement(Entrance* newReplacement) {
+    replacement = newReplacement;
+}
+
+Entrance* Entrance::GetReplacement() const {
+    return replacement;
+}
+
+EntranceType Entrance::GetType() const {
+    return type;
+}
+
+void Entrance::SetType(EntranceType newType) {
+    type = newType;
+}
+
+Entrance* Entrance::GetReverse() const {
+    return reverse;
+}
+
+void Entrance::Connect(RandomizerRegion newConnectedRegion) {
+    connectedRegion = newConnectedRegion;
+    AreaTable(newConnectedRegion)->entrances.push_front(this);
+}
+
+RandomizerRegion Entrance::Disconnect() {
+    AreaTable(connectedRegion)->entrances.remove_if([this](const auto entrance) { return this == entrance; });
+    RandomizerRegion previouslyConnected = connectedRegion;
+    connectedRegion = RR_NONE;
+    return previouslyConnected;
+}
+
+void Entrance::BindTwoWay(Entrance* otherEntrance) {
+    reverse = otherEntrance;
+    otherEntrance->reverse = this;
+}
+
+Entrance* Entrance::GetNewTarget() {
+    AreaTable(RR_ROOT)->AddExit(RR_ROOT, connectedRegion, [] { return true; });
+    Entrance* targetEntrance = AreaTable(RR_ROOT)->GetExit(connectedRegion);
+    targetEntrance->SetReplacement(this);
+    targetEntrance->SetName(GetParentRegion()->regionName + " -> " + GetConnectedRegion()->regionName);
+    return targetEntrance;
+}
+
+Entrance* Entrance::AssumeReachable() {
+    if (assumed == nullptr) {
+        assumed = GetNewTarget();
+        Disconnect();
+    }
+    return assumed;
+}
+
+bool EntranceShuffler::HasNoRandomEntrances() {
+    return mNoRandomEntrances;
+}
+
+void EntranceShuffler::SetNoRandomEntrances(bool noRandomEntrances) {
+    mNoRandomEntrances = noRandomEntrances;
+}
+
+void SetAllEntrancesData(std::vector<EntranceInfoPair>& entranceShuffleTable) {
+    auto ctx = Rando::Context::GetInstance();
+    for (auto& entrancePair : entranceShuffleTable) {
+
+        auto& forwardEntry = entrancePair.first;
+        auto& returnEntry = entrancePair.second;
+
+        // set data
+        Entrance* forwardEntrance = AreaTable(forwardEntry.parentRegion)->GetExit(forwardEntry.connectedRegion);
+        forwardEntrance->SetIndex(forwardEntry.index);
+        forwardEntrance->SetBlueWarp(forwardEntry.blueWarp);
+        forwardEntrance->SetType(forwardEntry.type);
+        forwardEntrance->SetAsPrimary();
+
+        // When decouple entrances is on, mark it for entrances except boss rooms
+        if (ctx->GetOption(RSK_DECOUPLED_ENTRANCES) && forwardEntry.type != EntranceType::ChildBoss &&
+            forwardEntry.type != EntranceType::AdultBoss) {
+            forwardEntrance->SetDecoupled();
+        }
+
+        if (returnEntry.parentRegion != RR_NONE) {
+            Entrance* returnEntrance = AreaTable(returnEntry.parentRegion)->GetExit(returnEntry.connectedRegion);
+            returnEntrance->SetIndex(returnEntry.index);
+            returnEntrance->SetBlueWarp(returnEntry.blueWarp);
+            returnEntrance->SetType(returnEntry.type);
+            forwardEntrance->BindTwoWay(returnEntrance);
+
+            // Mark reverse entrance as decoupled
+            if (ctx->GetOption(RSK_DECOUPLED_ENTRANCES) && returnEntry.type != EntranceType::ChildBoss &&
+                returnEntry.type != EntranceType::AdultBoss) {
+                returnEntrance->SetDecoupled();
+            }
+        }
+    }
+}
+
+static void SetShuffledEntrances(EntrancePools entrancePools) {
+    for (auto& pool : entrancePools) {
+        for (Entrance* entrance : pool.second) {
+            entrance->SetAsShuffled();
+            if (entrance->GetReverse() != nullptr) {
+                entrance->GetReverse()->SetAsShuffled();
+            }
+        }
+    }
+}
+
+static std::vector<Entrance*>
+BuildOneWayTargets(std::vector<EntranceType> typesToInclude,
+                   std::vector<std::pair<RandomizerRegion, RandomizerRegion>> exclude = {} /*, target_region_names*/) {
+    std::vector<Entrance*> oneWayEntrances = {};
+    // Get all entrances of the specified type
+    for (EntranceType poolType : typesToInclude) {
+        AddElementsToPool(oneWayEntrances, GetShuffleableEntrances(poolType, false));
+    }
+    // Filter out any that are passed in the exclusion list
+    FilterAndEraseFromPool(oneWayEntrances, [&exclude](Entrance* entrance) {
+        std::pair<RandomizerRegion, RandomizerRegion> entranceBeingChecked(entrance->GetParentRegionKey(),
+                                                                           entrance->GetConnectedRegionKey());
+        return ElementInContainer(entranceBeingChecked, exclude);
+    });
+
+    // The code below is part of the function in ootr, but no use of the function ever provides target_region_names
+    // if target_region_names:
+    //     return [entrance.get_new_target() for entrance in valid_one_way_entrances
+    //             if entrance.connected_region.name in target_region_names]
+
+    std::vector<Entrance*> newTargets = {};
+    for (Entrance* entrance : oneWayEntrances) {
+        newTargets.push_back(entrance->GetNewTarget());
+    }
+    return newTargets;
+}
+
+std::vector<Entrance*> EntranceShuffler::AssumeEntrancePool(std::vector<Entrance*>& entrancePool) {
+    auto ctx = Rando::Context::GetInstance();
+    std::vector<Entrance*> assumedPool = {};
+    for (Entrance* entrance : entrancePool) {
+        mTotalRandomizableEntrances++;
+        Entrance* assumedForward = entrance->AssumeReachable();
+        if (entrance->GetReverse() != nullptr && !entrance->IsDecoupled()) {
+            Entrance* assumedReturn = entrance->GetReverse()->AssumeReachable();
+            if (!(ctx->GetOption(RSK_MIXED_ENTRANCE_POOLS) &&
+                  (ctx->GetOption(RSK_SHUFFLE_OVERWORLD_ENTRANCES) ||
+                   ctx->GetOption(RSK_SHUFFLE_INTERIOR_ENTRANCES).Is(RO_INTERIOR_ENTRANCE_SHUFFLE_ALL)))) {
+                auto type = entrance->GetType();
+                if (((type == EntranceType::Dungeon || type == EntranceType::GrottoGrave) &&
+                     entrance->GetReverse()->GetName() !=
+                         "Spirit Temple Entryway -> Desert Colossus From Spirit Entryway") ||
+                    (type == EntranceType::Interior &&
+                     ctx->GetOption(RSK_SHUFFLE_INTERIOR_ENTRANCES).Is(RO_INTERIOR_ENTRANCE_SHUFFLE_ALL))) {
+                    // In most cases, Dungeon, Grotto/Grave and Simple Interior exits shouldn't be assumed able to give
+                    // access to their parent region
+                    assumedReturn->SetCondition([] { return false; });
+                }
+            }
+            assumedForward->BindTwoWay(assumedReturn);
+        }
+        assumedPool.push_back(assumedForward);
+    }
+    return assumedPool;
+}
+
+static bool AreEntrancesCompatible(Entrance* entrance, Entrance* target, std::vector<EntrancePair>& rollbacks) {
+
+    // Entrances shouldn't connect to their own scene, fail in this situation
+    if (entrance->GetParentRegion()->scene != "" &&
+        entrance->GetParentRegion()->scene == target->GetConnectedRegion()->scene) {
+        auto message = "Entrance " + entrance->GetName() + " attempted to connect with own scene target " +
+                       target->to_string() + ". Connection failed.\n";
+        SPDLOG_DEBUG(message);
+        return false;
+    }
+
+    // One way entrances shouldn't lead to the same scene as other already chosen one way entrances
+    auto type = entrance->GetType();
+    const std::vector<EntranceType> oneWayTypes = { EntranceType::OwlDrop, EntranceType::Spawn,
+                                                    EntranceType::WarpSong };
+    if (ElementInContainer(type, oneWayTypes)) {
+        for (auto& rollback : rollbacks) {
+            if (rollback.first->GetConnectedRegion()->scene == target->GetConnectedRegion()->scene) {
+                auto message = "A one way entrance already leads to " + target->to_string() + ". Connection failed.\n";
+                SPDLOG_DEBUG(message);
+                return false;
+            }
+        }
+    }
+
+    return true;
+}
+
+// Change connections between an entrance and a target assumed entrance, in order to test the connections afterwards if
+// necessary
+static void ChangeConnections(Entrance* entrance, Entrance* targetEntrance) {
+    auto message = "Attempting to connect " + entrance->GetName() + " to " + targetEntrance->to_string() + "\n";
+    SPDLOG_DEBUG(message);
+    entrance->Connect(targetEntrance->Disconnect());
+    entrance->SetReplacement(targetEntrance->GetReplacement());
+    if (entrance->GetReverse() != nullptr && !entrance->IsDecoupled()) {
+        targetEntrance->GetReplacement()->GetReverse()->Connect(entrance->GetReverse()->GetAssumed()->Disconnect());
+        targetEntrance->GetReplacement()->GetReverse()->SetReplacement(entrance->GetReverse());
+    }
+}
+
+static bool EntranceUnreachableAs(Entrance* entrance, uint8_t age, std::vector<Entrance*>& alreadyChecked) {
+
+    if (entrance == nullptr) {
+        SPDLOG_DEBUG("Entrance is nullptr in EntranceUnreachableAs()");
+        return true;
+    }
+
+    alreadyChecked.push_back(entrance);
+    auto type = entrance->GetType();
+
+    // The following cases determine when we say an entrance is not safe to affirm unreachable as the given age
+    if (type == EntranceType::WarpSong || type == EntranceType::Overworld) {
+        // Note that we consider all overworld entrances as potentially accessible as both ages, to be completely safe
+        return false;
+    } else if (type == EntranceType::OwlDrop) {
+        return age == RO_AGE_ADULT;
+    } else if (type == EntranceType::Spawn && entrance->GetConnectedRegionKey() == RR_KF_LINKS_HOUSE) {
+        return age == RO_AGE_ADULT;
+    } else if (type == EntranceType::Spawn && entrance->GetConnectedRegionKey() == RR_TEMPLE_OF_TIME) {
+        return age == RO_AGE_CHILD;
+    }
+
+    // Other entrances such as Interior, Dungeon or Grotto are fine unless they have a parent which is one of the above
+    // cases Recursively check parent entrances to verify that they are also not reachable as the wrong age
+    auto& parentEntrances = entrance->GetParentRegion()->entrances;
+    for (Entrance* parentEntrance : parentEntrances) {
+
+        // if parentEntrance is in alreadyChecked, then continue
+        if (ElementInContainer(parentEntrance, alreadyChecked)) {
+            continue;
+        }
+
+        bool unreachable = EntranceUnreachableAs(parentEntrance, age, alreadyChecked);
+        if (!unreachable) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+static bool ValidateWorld(Entrance* entrancePlaced) {
+    auto ctx = Rando::Context::GetInstance();
+    SPDLOG_DEBUG("Validating world\n");
+
+    // check certain conditions when certain types of ER are enabled
+    EntranceType type = EntranceType::None;
+    if (entrancePlaced != nullptr) {
+        type = entrancePlaced->GetType();
+    }
+
+    bool checkPoeCollectorAccess =
+        (ctx->GetOption(RSK_SHUFFLE_OVERWORLD_ENTRANCES) ||
+         ctx->GetOption(RSK_SHUFFLE_INTERIOR_ENTRANCES).Is(RO_INTERIOR_ENTRANCE_SHUFFLE_ALL)) &&
+        (entrancePlaced == nullptr || ctx->GetOption(RSK_MIXED_ENTRANCE_POOLS) || type == EntranceType::Interior ||
+         type == EntranceType::SpecialInterior || type == EntranceType::Overworld || type == EntranceType::Spawn ||
+         type == EntranceType::WarpSong || type == EntranceType::OwlDrop);
+    bool checkOtherEntranceAccess =
+        (ctx->GetOption(RSK_SHUFFLE_OVERWORLD_ENTRANCES) ||
+         ctx->GetOption(RSK_SHUFFLE_INTERIOR_ENTRANCES).Is(RO_INTERIOR_ENTRANCE_SHUFFLE_ALL) ||
+         ctx->GetOption(RSK_SHUFFLE_OVERWORLD_SPAWNS)) &&
+        (entrancePlaced == nullptr || ctx->GetOption(RSK_MIXED_ENTRANCE_POOLS) ||
+         type == EntranceType::SpecialInterior || type == EntranceType::Overworld || type == EntranceType::Spawn ||
+         type == EntranceType::WarpSong || type == EntranceType::OwlDrop);
+
+    // Search the world to verify that all necessary conditions are still being held
+    // Conditions will be checked during the search and any that fail will be figured out
+    // afterwards
+    Logic::LogicReset();
+    GetAccessibleLocations({}, SearchMode::ValidateWorld, "", checkPoeCollectorAccess, checkOtherEntranceAccess);
+
+    if (!ctx->GetOption(RSK_DECOUPLED_ENTRANCES)) {
+        // Unless entrances are decoupled, we don't want the player to end up through certain entrances as the wrong age
+        // This means we need to hard check that none of the relevant entrances are ever reachable as that age
+        // This is mostly relevant when mixing entrance pools or shuffling special interiors (such as windmill or kak
+        // potion shop) Warp Songs and Overworld Spawns can also end up inside certain indoors so those need to be
+        // handled as well
+        std::array<std::string, 3> childForbidden = { "OGC Great Fairy Fountain -> Castle Grounds",
+                                                      "GV Carpenter Tent -> GV Fortress Side",
+                                                      "Ganon's Castle Entryway -> Castle Grounds From Ganon's Castle" };
+        std::array<std::string, 2> adultForbidden = { "HC Great Fairy Fountain -> Castle Grounds",
+                                                      "HC Storms Grotto -> Castle Grounds" };
+
+        auto allShuffleableEntrances = GetShuffleableEntrances(EntranceType::All, false);
+        for (auto& entrance : allShuffleableEntrances) {
+
+            std::vector<Entrance*> alreadyChecked = {};
+
+            if (entrance->IsShuffled()) {
+                if (entrance->GetReplacement() != nullptr) {
+
+                    auto replacementName = entrance->GetReplacement()->GetName();
+                    alreadyChecked.push_back(entrance->GetReplacement()->GetReverse());
+
+                    if (ElementInContainer(replacementName, childForbidden) &&
+                        !EntranceUnreachableAs(entrance, RO_AGE_CHILD, alreadyChecked)) {
+                        auto message = replacementName + " is replaced by an entrance with a potential child access\n";
+                        SPDLOG_DEBUG(message);
+                        return false;
+                    } else if (ElementInContainer(replacementName, adultForbidden) &&
+                               !EntranceUnreachableAs(entrance, RO_AGE_ADULT, alreadyChecked)) {
+                        auto message = replacementName + " is replaced by an entrance with a potential adult access\n";
+                        SPDLOG_DEBUG(message);
+                        return false;
+                    }
+                }
+            } else {
+                auto name = entrance->GetName();
+                alreadyChecked.push_back(entrance->GetReverse());
+
+                if (ElementInContainer(name, childForbidden) &&
+                    !EntranceUnreachableAs(entrance, RO_AGE_CHILD, alreadyChecked)) {
+                    auto message = name + " is potentially accessible as child\n";
+                    SPDLOG_DEBUG(message);
+                    return false;
+                } else if (ElementInContainer(name, adultForbidden) &&
+                           !EntranceUnreachableAs(entrance, RO_AGE_ADULT, alreadyChecked)) {
+                    auto message = name + " is potentially accessible as adult\n";
+                    SPDLOG_DEBUG(message);
+                    return false;
+                }
+            }
+        }
+    }
+
+    if (ctx->GetOption(RSK_SHUFFLE_INTERIOR_ENTRANCES).IsNot(RO_INTERIOR_ENTRANCE_SHUFFLE_OFF) &&
+        ctx->GetOption(RSK_GOSSIP_STONE_HINTS).IsNot(RO_GOSSIP_STONES_NONE) &&
+        (entrancePlaced == nullptr || type == EntranceType::Interior || type == EntranceType::SpecialInterior)) {
+        // When cows are shuffled, ensure both Impa's House entrances are in the same hint area because the cow is
+        // reachable from both sides
+        if (ctx->GetOption(RSK_SHUFFLE_COWS)) {
+            auto impasHouseFrontHintRegion = GetHintRegionHintKey(RR_KAK_IMPAS_HOUSE);
+            auto impasHouseBackHintRegion = GetHintRegionHintKey(RR_KAK_IMPAS_HOUSE_BACK);
+            if (impasHouseFrontHintRegion != RHT_NONE && impasHouseBackHintRegion != RHT_NONE &&
+                impasHouseBackHintRegion != RHT_LINKS_POCKET && impasHouseFrontHintRegion != RHT_LINKS_POCKET &&
+                impasHouseBackHintRegion != impasHouseFrontHintRegion) {
+                auto message = "Kak Impas House entrances are not in the same hint area\n";
+                SPDLOG_DEBUG(message);
+                return false;
+            }
+        }
+    }
+
+    // If all locations aren't reachable, that means that one of the conditions failed when searching
+    if (!Rando::Context::GetInstance()->allLocationsReachable) {
+        if (checkOtherEntranceAccess) {
+            // At least one valid starting region with all basic refills should be reachable without using any items at
+            // the beginning of the seed
+            if (!AreaTable(RR_KOKIRI_FOREST)->HasAccess() && !AreaTable(RR_KAKARIKO_VILLAGE)->HasAccess()) {
+                SPDLOG_DEBUG("Invalid starting area\n");
+                return false;
+            }
+
+            // Check that a region where time passes is always reachable as both ages without having collected any items
+            if (!Areas::HasTimePassAccess(RO_AGE_CHILD) || !Areas::HasTimePassAccess(RO_AGE_ADULT)) {
+                SPDLOG_DEBUG("Time passing is not guaranteed as both ages\n");
+                return false;
+            }
+
+            // The player should be able to get back to ToT after going through time, without having collected any items
+            // This is important to ensure that the player never loses access to the pedestal after going through time
+            if (ctx->GetSettings()->ResolvedStartingAge() == RO_AGE_CHILD && !AreaTable(RR_TEMPLE_OF_TIME)->Adult()) {
+                SPDLOG_DEBUG("Path to Temple of Time as adult is not guaranteed\n");
+                return false;
+            } else if (ctx->GetSettings()->ResolvedStartingAge() == RO_AGE_ADULT &&
+                       !AreaTable(RR_TEMPLE_OF_TIME)->Child()) {
+                SPDLOG_DEBUG("Path to Temple of Time as child is not guaranteed\n");
+                return false;
+            }
+        }
+
+        // The Big Poe shop should always be accessible as adult without the need to use any bottles
+        // This is important to ensure that players can never lock their only bottles by filling them with Big Poes they
+        // can't sell
+        if (checkPoeCollectorAccess) {
+            if (!AreaTable(RR_MARKET_GUARD_HOUSE)->Adult()) {
+                SPDLOG_DEBUG("Big Poe Shop access is not guarenteed as adult\n");
+                return false;
+            }
+        }
+        SPDLOG_DEBUG("All Locations NOT REACHABLE\n");
+        return false;
+    }
+    return true;
+}
+
+// In the event that we need to retry shuffling an entire group we can restore the
+// original connections to reset the entrance and target entrance.
+static void RestoreConnections(Entrance* entrance, Entrance* targetEntrance) {
+    targetEntrance->Connect(entrance->Disconnect());
+    entrance->SetReplacement(nullptr);
+    if (entrance->GetReverse() != nullptr && !entrance->IsDecoupled()) {
+        entrance->GetReverse()->GetAssumed()->Connect(targetEntrance->GetReplacement()->GetReverse()->Disconnect());
+        targetEntrance->GetReplacement()->GetReverse()->SetReplacement(nullptr);
+    }
+}
+
+static void DeleteTargetEntrance(Entrance* targetEntrance) {
+    if (targetEntrance->GetConnectedRegionKey() != RR_NONE) {
+        targetEntrance->Disconnect();
+    }
+    if (targetEntrance->GetParentRegionKey() != RR_NONE) {
+        targetEntrance->GetParentRegion()->RemoveExit(targetEntrance);
+        targetEntrance->SetParentRegion(RR_NONE);
+    }
+}
+
+static void ConfirmReplacement(Entrance* entrance, Entrance* targetEntrance) {
+    DeleteTargetEntrance(targetEntrance);
+    if (entrance->GetReverse() != nullptr && !entrance->IsDecoupled()) {
+        auto replacedReverse = targetEntrance->GetReplacement()->GetReverse();
+        DeleteTargetEntrance(replacedReverse->GetReverse()->GetAssumed());
+    }
+}
+
+bool EntranceShuffler::ReplaceEntrance(Entrance* entrance, Entrance* target, std::vector<EntrancePair>& rollbacks) {
+
+    if (!AreEntrancesCompatible(entrance, target, rollbacks)) {
+        return false;
+    }
+    ChangeConnections(entrance, target);
+    if (ValidateWorld(entrance)) {
+#ifdef ENABLE_DEBUG
+        std::string ticks = std::to_string(svcGetSystemTick());
+        auto message = "Dumping World Graph at " + ticks + "\n";
+        // SPDLOG_DEBUG(message);
+        // Areas::DumpWorldGraph(ticks);
+#endif
+        rollbacks.push_back(EntrancePair{ entrance, target });
+        mCurNumRandomizedEntrances++;
+        return true;
+    } else {
+#ifdef ENABLE_DEBUG
+        std::string ticks = std::to_string(svcGetSystemTick());
+        auto message = "Dumping World Graph at " + ticks + "\n";
+        // SPDLOG_DEBUG(message);
+        // Areas::DumpWorldGraph(ticks);
+#endif
+        if (entrance->GetConnectedRegionKey() != RR_NONE) {
+            RestoreConnections(entrance, target);
+        }
+    }
+    return false;
+}
+
+bool EntranceShuffler::PlaceOneWayPriorityEntrance(
+    std::string priorityName, std::list<RandomizerRegion>& allowedRegions, std::list<EntranceType>& allowedTypes,
+    std::vector<EntrancePair>& rollbacks, EntrancePools oneWayEntrancePools, EntrancePools oneWayTargetEntrancePools) {
+    auto ctx = Rando::Context::GetInstance();
+    // Combine the entrances for allowed types in one list.
+    // Shuffle this list.
+    // Pick the first one not already set, not adult spawn, that has a valid target entrance.
+    // Assemble then clear entrances from the pool and target pools as appropriate.
+    std::vector<Entrance*> availPool = {};
+    for (auto& pool : oneWayEntrancePools) {
+        auto entranceType = pool.first;
+        if (ElementInContainer(entranceType, allowedTypes)) {
+            AddElementsToPool(availPool, pool.second);
+        }
+    }
+    Shuffle(availPool);
+
+    for (Entrance* entrance : availPool) {
+        if (entrance->GetReplacement() != nullptr) {
+            continue;
+        }
+        // Only allow Adult Spawn as sole Nocturne access if hints != mask.
+        // Otherwise, child access is required here (adult access assumed or guaranteed later).
+        if (entrance->GetParentRegionKey() == RR_ADULT_SPAWN) {
+            if (priorityName != "Nocturne" || ctx->GetOption(RSK_GOSSIP_STONE_HINTS).Is(RO_GOSSIP_STONES_NEED_TRUTH)) {
+                continue;
+            }
+        }
+        // If not shuffling dungeons, Nocturne requires adult access
+        if (!ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES) && priorityName == "Nocturne") {
+            if (entrance->GetType() != EntranceType::WarpSong && entrance->GetParentRegionKey() != RR_ADULT_SPAWN) {
+                continue;
+            }
+        }
+        for (Entrance* target : oneWayTargetEntrancePools[entrance->GetType()]) {
+            RandomizerRegion targetRegionKey = target->GetConnectedRegionKey();
+            if (targetRegionKey != RR_NONE && ElementInContainer(targetRegionKey, allowedRegions)) {
+                if (ReplaceEntrance(entrance, target, rollbacks)) {
+                    // Return once the entrance has been replaced
+                    return true;
+                }
+            }
+        }
+    }
+#ifdef ENABLE_DEBUG
+    auto message = "ERROR: Unable to place priority one-way entrance for " + priorityName + "\n";
+    SPDLOG_DEBUG(message);
+    PlacementLog_Write();
+#endif
+    return false;
+}
+
+bool EntranceShuffler::ShuffleOneWayPriorityEntrances(std::map<std::string, PriorityEntrance>& oneWayPriorities,
+                                                      EntrancePools oneWayEntrancePools,
+                                                      EntrancePools oneWayTargetEntrancePools, int retryCount) {
+    while (retryCount > 0) {
+        retryCount--;
+        std::vector<EntrancePair> rollbacks = {};
+
+        bool success = true;
+        for (auto& priority : oneWayPriorities) {
+            std::string key = priority.first;
+            auto& regions = priority.second.targetRegions;
+            auto& types = priority.second.allowedTypes;
+            success = PlaceOneWayPriorityEntrance(key, regions, types, rollbacks, oneWayEntrancePools,
+                                                  oneWayTargetEntrancePools);
+            if (!success) {
+                for (auto& pair : rollbacks) {
+                    RestoreConnections(pair.first, pair.second);
+                }
+                break;
+            }
+        }
+        if (!success) {
+            continue;
+        }
+        // If there are no issues, log the connections and continue
+        for (auto& pair : rollbacks) {
+            ConfirmReplacement(pair.first, pair.second);
+        }
+        break;
+    }
+
+    if (retryCount <= 0) {
+        SPDLOG_DEBUG(
+            "Entrance placement attempt count for one way priorities exceeded. Restarting randomization completely\n");
+        mEntranceShuffleFailure = true;
+        return false;
+    }
+    return true;
+}
+
+// returns restrictive entrances and soft entrances in an array of size 2 (restrictive vector is index 0, soft is index
+// 1)
+static std::array<std::vector<Entrance*>, 2> SplitEntrancesByRequirements(std::vector<Entrance*>& entrancesToSplit,
+                                                                          std::vector<Entrance*>& assumedEntrances) {
+    // First, disconnect all root assumed entrances and save which regions they were originally connected to, so we can
+    // reconnect them later
+    std::map<Entrance*, RandomizerRegion> originalConnectedRegions = {};
+    std::set<Entrance*> entrancesToDisconnect = {};
+    for (Entrance* entrance : assumedEntrances) {
+        entrancesToDisconnect.insert(entrance);
+        if (entrance->GetReverse() != nullptr) {
+            entrancesToDisconnect.insert(entrance->GetReverse());
+        }
+    }
+
+    // disconnect each entrance temporarily to find restrictive vs soft entrances
+    // soft entrances are ones that can be accessed by both ages (child/adult) at both times of day (day/night)
+    // restrictive entrances are ones that do not meet this criteria
+    for (Entrance* entrance : entrancesToDisconnect) {
+        if (entrance->GetConnectedRegionKey() != RR_NONE) {
+            originalConnectedRegions[entrance] = entrance->Disconnect();
+        }
+    }
+
+    std::vector<Entrance*> restrictiveEntrances = {};
+    std::vector<Entrance*> softEntrances = {};
+
+    Logic::LogicReset();
+    // Apply the effects of all advancement items to search for entrance accessibility
+    std::vector<RandomizerGet> items = FilterFromPool(
+        ItemPool, [](const RandomizerGet i) { return Rando::StaticData::RetrieveItem(i).IsAdvancement(); });
+    for (RandomizerGet unplacedItem : items) {
+        Rando::StaticData::RetrieveItem(unplacedItem).ApplyEffect();
+    }
+    // run a search to see what's accessible
+    GetAccessibleLocations({});
+
+    for (Entrance* entrance : entrancesToSplit) {
+        // if an entrance is accessible at all times of day by both ages, it's a soft entrance with no restrictions
+        if (entrance->ConditionsMet(true)) {
+            softEntrances.push_back(entrance);
+        } else {
+            restrictiveEntrances.push_back(entrance);
+        }
+    }
+
+    // Reconnect all disconnected entrances
+    for (Entrance* entrance : entrancesToDisconnect) {
+        entrance->Connect(originalConnectedRegions[entrance]);
+    }
+
+    return { restrictiveEntrances, softEntrances };
+}
+
+// Once the first entrance to Impas House has been placed, try to place the next one immediately to reduce chances of
+// failure.
+bool EntranceShuffler::PlaceOtherImpasHouseEntrance(std::vector<Entrance*> entrances,
+                                                    std::vector<Entrance*> targetEntrances,
+                                                    std::vector<EntrancePair>& rollbacks) {
+    // Get the other impas house entrance
+    auto otherImpaTargets = FilterFromPool(targetEntrances, [](const Entrance* target) {
+        return (target->GetConnectedRegionKey() == RR_KAK_IMPAS_HOUSE ||
+                target->GetConnectedRegionKey() == RR_KAK_IMPAS_HOUSE_BACK);
+    });
+    if (otherImpaTargets.empty()) {
+        return true;
+    }
+
+    Entrance* otherImpaTarget = otherImpaTargets[0];
+    auto m = "Now Placing Other Impa Target: " + otherImpaTarget->GetName() + "\n";
+    SPDLOG_DEBUG(m);
+    RandomizerRegion otherImpaRegion = otherImpaTarget->GetConnectedRegionKey() != RR_KAK_IMPAS_HOUSE_BACK
+                                           ? RR_KAK_IMPAS_HOUSE_BACK
+                                           : RR_KAK_IMPAS_HOUSE;
+    for (Entrance* entrance : entrances) {
+        // If the entrance is already connected or it doesn't have the same hint region as the already placed impas
+        // house entrance, then don't try to use it
+        if (entrance->GetConnectedRegionKey() != RR_NONE ||
+            (GetHintRegionHintKey(otherImpaRegion) != GetHintRegionHintKey(entrance->GetParentRegionKey()))) {
+            continue;
+        }
+        // If the placement succeeds, we return true
+        if (ReplaceEntrance(entrance, otherImpaTarget, rollbacks)) {
+            return true;
+        }
+    }
+    SPDLOG_DEBUG("No available entrances for placing other impa region.\n");
+    return false;
+}
+
+// Shuffle entrances by placing them instead of entrances in the provided target entrances list
+bool EntranceShuffler::ShuffleEntrances(std::vector<Entrance*>& entrances, std::vector<Entrance*>& targetEntrances,
+                                        std::vector<EntrancePair>& rollbacks) {
+    auto ctx = Rando::Context::GetInstance();
+
+    Shuffle(entrances);
+
+    // place all entrances in the pool, validating after every placement
+    for (Entrance* entrance : entrances) {
+        if (entrance->GetConnectedRegionKey() != RR_NONE) {
+            continue;
+        }
+
+        Shuffle(targetEntrances);
+        for (Entrance* target : targetEntrances) {
+            if (target->GetConnectedRegionKey() == RR_NONE) {
+                continue;
+            }
+
+            // Store whether or not we're about to attempt placing an entrance to Impas House
+            bool attemptedImpasHousePlacement = (target->GetConnectedRegionKey() == RR_KAK_IMPAS_HOUSE ||
+                                                 target->GetConnectedRegionKey() == RR_KAK_IMPAS_HOUSE_BACK);
+
+            if (ReplaceEntrance(entrance, target, rollbacks)) {
+                // If shuffle cows is enabled and the last entrance was one to Impas House,
+                // then immediately attempt to place the other entrance to Impas House
+                if (ctx->GetOption(RSK_SHUFFLE_COWS) && attemptedImpasHousePlacement) {
+                    if (!PlaceOtherImpasHouseEntrance(entrances, targetEntrances, rollbacks)) {
+                        return false;
+                    }
+                }
+                break;
+            }
+        }
+
+        if (entrance->GetConnectedRegionKey() == RR_NONE) {
+            return false;
+        }
+    }
+
+    // all entrances were validly connected
+    return true;
+}
+
+void EntranceShuffler::ShuffleEntrancePool(std::vector<Entrance*>& entrancePool,
+                                           std::vector<Entrance*>& targetEntrances, int retryCount) {
+    mNoRandomEntrances = false;
+
+    auto splitEntrances = SplitEntrancesByRequirements(entrancePool, targetEntrances);
+
+    auto& restrictiveEntrances = splitEntrances[0];
+    auto& softEntrances = splitEntrances[1];
+
+    int retries = retryCount;
+    while (retries > 0) {
+        if (retries != retryCount) {
+#ifdef ENABLE_DEBUG
+            std::string ticks = std::to_string(svcGetSystemTick());
+            auto message = "Failed to connect entrances. Retrying " + std::to_string(retries) +
+                           " more times.\nDumping World Graph at " + ticks + "\n";
+            SPDLOG_DEBUG(message);
+            // Areas::DumpWorldGraph(ticks);
+#endif
+        }
+        retries--;
+
+        std::vector<EntrancePair> rollbacks = {};
+
+        // Shuffle Restrictive Entrances first while more regions are available in
+        // order to heavily reduce the chances of the placement failing
+        bool success = ShuffleEntrances(restrictiveEntrances, targetEntrances, rollbacks);
+        if (success) {
+            success = ShuffleEntrances(softEntrances, targetEntrances, rollbacks);
+            if (!success) {
+                for (auto& pair : rollbacks) {
+                    RestoreConnections(pair.first, pair.second);
+                    mCurNumRandomizedEntrances--;
+                }
+                continue;
+            }
+        } else {
+            for (auto& pair : rollbacks) {
+                RestoreConnections(pair.first, pair.second);
+                mCurNumRandomizedEntrances--;
+            }
+            continue;
+        }
+
+        // If there are no issues, log the connections and continue
+        for (auto& pair : rollbacks) {
+            ConfirmReplacement(pair.first, pair.second);
+        }
+        break;
+    }
+
+    if (retries <= 0) {
+        SPDLOG_DEBUG("Entrance placement attempt count exceeded. Restarting randomization completely");
+        mEntranceShuffleFailure = true;
+    }
+}
+
+int EntranceShuffler::ShuffleAllEntrances() {
+    auto ctx = Rando::Context::GetInstance();
+
+    mTotalRandomizableEntrances = 0;
+    mCurNumRandomizedEntrances = 0;
+
+    std::vector<EntranceInfoPair> entranceShuffleTable = {
+        // Parent Region                     Connected Region                      index   blue warp
+        { { EntranceType::Dungeon, RR_KF_OUTSIDE_DEKU_TREE, RR_DEKU_TREE_ENTRYWAY, 0x0000 },
+          { EntranceType::Dungeon, RR_DEKU_TREE_ENTRYWAY, RR_KF_OUTSIDE_DEKU_TREE, 0x0209, 0x0457 } },
+        { { EntranceType::Dungeon, RR_DEATH_MOUNTAIN_TRAIL, RR_DODONGOS_CAVERN_ENTRYWAY, 0x0004 },
+          { EntranceType::Dungeon, RR_DODONGOS_CAVERN_ENTRYWAY, RR_DEATH_MOUNTAIN_TRAIL, 0x0242, 0x047A } },
+        { { EntranceType::Dungeon, RR_ZORAS_FOUNTAIN, RR_JABU_JABUS_BELLY_ENTRYWAY, 0x0028 },
+          { EntranceType::Dungeon, RR_JABU_JABUS_BELLY_ENTRYWAY, RR_ZORAS_FOUNTAIN, 0x0221, 0x010E } },
+        { { EntranceType::Dungeon, RR_SACRED_FOREST_MEADOW, RR_FOREST_TEMPLE_ENTRYWAY, 0x0169 },
+          { EntranceType::Dungeon, RR_FOREST_TEMPLE_ENTRYWAY, RR_SACRED_FOREST_MEADOW, 0x0215, 0x0608 } },
+        { { EntranceType::Dungeon, RR_DMC_CENTRAL_LOCAL, RR_FIRE_TEMPLE_ENTRYWAY, 0x0165 },
+          { EntranceType::Dungeon, RR_FIRE_TEMPLE_ENTRYWAY, RR_DMC_CENTRAL_LOCAL, 0x024A, 0x0564 } },
+        { { EntranceType::Dungeon, RR_LAKE_HYLIA, RR_WATER_TEMPLE_ENTRYWAY, 0x0010 },
+          { EntranceType::Dungeon, RR_WATER_TEMPLE_ENTRYWAY, RR_LAKE_HYLIA, 0x021D, 0x060C } },
+        { { EntranceType::Dungeon, RR_DESERT_COLOSSUS, RR_SPIRIT_TEMPLE_ENTRYWAY, 0x0082 },
+          { EntranceType::Dungeon, RR_SPIRIT_TEMPLE_ENTRYWAY, RR_DESERT_COLOSSUS_FROM_SPIRIT_ENTRYWAY, 0x01E1,
+            0x0610 } },
+        { { EntranceType::Dungeon, RR_GRAVEYARD_WARP_PAD_REGION, RR_SHADOW_TEMPLE_ENTRYWAY, 0x0037 },
+          { EntranceType::Dungeon, RR_SHADOW_TEMPLE_ENTRYWAY, RR_GRAVEYARD_WARP_PAD_REGION, 0x0205, 0x0580 } },
+        { { EntranceType::Dungeon, RR_KAKARIKO_VILLAGE, RR_BOTTOM_OF_THE_WELL_ENTRYWAY, 0x0098 },
+          { EntranceType::Dungeon, RR_BOTTOM_OF_THE_WELL_ENTRYWAY, RR_KAKARIKO_VILLAGE, 0x02A6 } },
+        { { EntranceType::Dungeon, RR_ZORAS_FOUNTAIN, RR_ICE_CAVERN_ENTRYWAY, 0x0088 },
+          { EntranceType::Dungeon, RR_ICE_CAVERN_ENTRYWAY, RR_ZORAS_FOUNTAIN, 0x03D4 } },
+        { { EntranceType::Dungeon, RR_GERUDO_FORTRESS, RR_GERUDO_TRAINING_GROUNDS_ENTRYWAY, 0x0008 },
+          { EntranceType::Dungeon, RR_GERUDO_TRAINING_GROUNDS_ENTRYWAY, RR_GERUDO_FORTRESS, 0x03A8 } },
+        { { EntranceType::GanonDungeon, RR_GANONS_CASTLE_LEDGE, RR_GANONS_CASTLE_ENTRYWAY, 0x0467 },
+          { EntranceType::GanonDungeon, RR_GANONS_CASTLE_ENTRYWAY, RR_CASTLE_GROUNDS_FROM_GANONS_CASTLE, 0x023D } },
+
+        { { EntranceType::Interior, RR_KOKIRI_FOREST, RR_KF_MIDOS_HOUSE, 0x0433 },
+          { EntranceType::Interior, RR_KF_MIDOS_HOUSE, RR_KOKIRI_FOREST, 0x0443 } },
+        { { EntranceType::Interior, RR_KOKIRI_FOREST, RR_KF_SARIAS_HOUSE, 0x0437 },
+          { EntranceType::Interior, RR_KF_SARIAS_HOUSE, RR_KOKIRI_FOREST, 0x0447 } },
+        { { EntranceType::Interior, RR_KOKIRI_FOREST, RR_KF_HOUSE_OF_TWINS, 0x009C },
+          { EntranceType::Interior, RR_KF_HOUSE_OF_TWINS, RR_KOKIRI_FOREST, 0x033C } },
+        { { EntranceType::Interior, RR_KOKIRI_FOREST, RR_KF_KNOW_IT_ALL_HOUSE, 0x00C9 },
+          { EntranceType::Interior, RR_KF_KNOW_IT_ALL_HOUSE, RR_KOKIRI_FOREST, 0x026A } },
+        { { EntranceType::Interior, RR_KOKIRI_FOREST, RR_KF_KOKIRI_SHOP, 0x00C1 },
+          { EntranceType::Interior, RR_KF_KOKIRI_SHOP, RR_KOKIRI_FOREST, 0x0266 } },
+        { { EntranceType::Interior, RR_LAKE_HYLIA, RR_LH_LAB, 0x0043 },
+          { EntranceType::Interior, RR_LH_LAB, RR_LAKE_HYLIA, 0x03CC } },
+        { { EntranceType::Interior, RR_LH_FISHING_ISLAND, RR_LH_FISHING_HOLE, 0x045F },
+          { EntranceType::Interior, RR_LH_FISHING_HOLE, RR_LH_FISHING_ISLAND, 0x0309 } },
+        { { EntranceType::Interior, RR_GV_FORTRESS_SIDE, RR_GV_CARPENTER_TENT, 0x03A0 },
+          { EntranceType::Interior, RR_GV_CARPENTER_TENT, RR_GV_FORTRESS_SIDE, 0x03D0 } },
+        { { EntranceType::Interior, RR_MARKET_ENTRANCE, RR_MARKET_GUARD_HOUSE, 0x007E },
+          { EntranceType::Interior, RR_MARKET_GUARD_HOUSE, RR_MARKET_ENTRANCE, 0x026E } },
+        { { EntranceType::Interior, RR_THE_MARKET, RR_MARKET_MASK_SHOP, 0x0530 },
+          { EntranceType::Interior, RR_MARKET_MASK_SHOP, RR_THE_MARKET, 0x01D1 } },
+        { { EntranceType::Interior, RR_THE_MARKET, RR_MARKET_BOMBCHU_BOWLING, 0x0507 },
+          { EntranceType::Interior, RR_MARKET_BOMBCHU_BOWLING, RR_THE_MARKET, 0x03BC } },
+        { { EntranceType::Interior, RR_THE_MARKET, RR_MARKET_POTION_SHOP, 0x0388 },
+          { EntranceType::Interior, RR_MARKET_POTION_SHOP, RR_THE_MARKET, 0x02A2 } },
+        { { EntranceType::Interior, RR_THE_MARKET, RR_MARKET_TREASURE_CHEST_GAME, 0x0063 },
+          { EntranceType::Interior, RR_MARKET_TREASURE_CHEST_GAME, RR_THE_MARKET, 0x01D5 } },
+        { { EntranceType::Interior, RR_MARKET_BACK_ALLEY, RR_MARKET_BOMBCHU_SHOP, 0x0528 },
+          { EntranceType::Interior, RR_MARKET_BOMBCHU_SHOP, RR_MARKET_BACK_ALLEY, 0x03C0 } },
+        { { EntranceType::Interior, RR_MARKET_BACK_ALLEY, RR_MARKET_MAN_IN_GREEN_HOUSE, 0x043B },
+          { EntranceType::Interior, RR_MARKET_MAN_IN_GREEN_HOUSE, RR_MARKET_BACK_ALLEY, 0x0067 } },
+        { { EntranceType::Interior, RR_KAKARIKO_VILLAGE, RR_KAK_CARPENTER_BOSS_HOUSE, 0x02FD },
+          { EntranceType::Interior, RR_KAK_CARPENTER_BOSS_HOUSE, RR_KAKARIKO_VILLAGE, 0x0349 } },
+        { { EntranceType::Interior, RR_KAKARIKO_VILLAGE, RR_KAK_HOUSE_OF_SKULLTULA, 0x0550 },
+          { EntranceType::Interior, RR_KAK_HOUSE_OF_SKULLTULA, RR_KAKARIKO_VILLAGE, 0x04EE } },
+        { { EntranceType::Interior, RR_KAKARIKO_VILLAGE, RR_KAK_IMPAS_HOUSE, 0x039C },
+          { EntranceType::Interior, RR_KAK_IMPAS_HOUSE, RR_KAKARIKO_VILLAGE, 0x0345 } },
+        { { EntranceType::Interior, RR_KAK_IMPAS_LEDGE, RR_KAK_IMPAS_HOUSE_BACK, 0x05C8 },
+          { EntranceType::Interior, RR_KAK_IMPAS_HOUSE_BACK, RR_KAK_IMPAS_LEDGE, 0x05DC } },
+        { { EntranceType::Interior, RR_KAK_BACKYARD, RR_KAK_ODD_POTION_BUILDING, 0x0072 },
+          { EntranceType::Interior, RR_KAK_ODD_POTION_BUILDING, RR_KAK_BACKYARD, 0x034D } },
+        { { EntranceType::Interior, RR_THE_GRAVEYARD, RR_GRAVEYARD_DAMPES_HOUSE, 0x030D },
+          { EntranceType::Interior, RR_GRAVEYARD_DAMPES_HOUSE, RR_THE_GRAVEYARD, 0x0355 } },
+        { { EntranceType::Interior, RR_GORON_CITY, RR_GC_SHOP, 0x037C },
+          { EntranceType::Interior, RR_GC_SHOP, RR_GORON_CITY, 0x03FC } },
+        { { EntranceType::Interior, RR_ZORAS_DOMAIN, RR_ZD_SHOP, 0x0380 },
+          { EntranceType::Interior, RR_ZD_SHOP, RR_ZORAS_DOMAIN, 0x03C4 } },
+        { { EntranceType::Interior, RR_LON_LON_RANCH, RR_LLR_TALONS_HOUSE, 0x004F },
+          { EntranceType::Interior, RR_LLR_TALONS_HOUSE, RR_LON_LON_RANCH, 0x0378 } },
+        { { EntranceType::Interior, RR_LON_LON_RANCH, RR_LLR_STABLES, 0x02F9 },
+          { EntranceType::Interior, RR_LLR_STABLES, RR_LON_LON_RANCH, 0x042F } },
+        { { EntranceType::Interior, RR_LON_LON_RANCH, RR_LLR_TOWER, 0x05D0 },
+          { EntranceType::Interior, RR_LLR_TOWER, RR_LON_LON_RANCH, 0x05D4 } },
+        { { EntranceType::Interior, RR_THE_MARKET, RR_MARKET_BAZAAR, 0x052C },
+          { EntranceType::Interior, RR_MARKET_BAZAAR, RR_THE_MARKET, 0x03B8 } },
+        { { EntranceType::Interior, RR_THE_MARKET, RR_MARKET_SHOOTING_GALLERY, 0x016D },
+          { EntranceType::Interior, RR_MARKET_SHOOTING_GALLERY, RR_THE_MARKET, 0x01CD } },
+        { { EntranceType::Interior, RR_KAKARIKO_VILLAGE, RR_KAK_BAZAAR, 0x00B7 },
+          { EntranceType::Interior, RR_KAK_BAZAAR, RR_KAKARIKO_VILLAGE, 0x0201 } },
+        { { EntranceType::Interior, RR_KAKARIKO_VILLAGE, RR_KAK_SHOOTING_GALLERY, 0x003B },
+          { EntranceType::Interior, RR_KAK_SHOOTING_GALLERY, RR_KAKARIKO_VILLAGE, 0x0463 } },
+        { { EntranceType::Interior, RR_DESERT_COLOSSUS, RR_COLOSSUS_GREAT_FAIRY_FOUNTAIN, 0x0588 },
+          { EntranceType::Interior, RR_COLOSSUS_GREAT_FAIRY_FOUNTAIN, RR_DESERT_COLOSSUS, 0x057C } },
+        { { EntranceType::Interior, RR_HYRULE_CASTLE_GROUNDS, RR_HC_GREAT_FAIRY_FOUNTAIN, 0x0578 },
+          { EntranceType::Interior, RR_HC_GREAT_FAIRY_FOUNTAIN, RR_CASTLE_GROUNDS, 0x0340 } },
+        { { EntranceType::Interior, RR_GANONS_CASTLE_GROUNDS, RR_OGC_GREAT_FAIRY_FOUNTAIN, 0x04C2 },
+          { EntranceType::Interior, RR_OGC_GREAT_FAIRY_FOUNTAIN, RR_CASTLE_GROUNDS,
+            0x03E8 } }, // 0x3E8 is an unused entrance index repruposed to differentiate between the HC and OGC fairy
+                        // fountain exits (normally they both use 0x340)
+        { { EntranceType::Interior, RR_DMC_LOWER_NEARBY, RR_DMC_GREAT_FAIRY_FOUNTAIN, 0x04BE },
+          { EntranceType::Interior, RR_DMC_GREAT_FAIRY_FOUNTAIN, RR_DMC_LOWER_LOCAL, 0x0482 } },
+        { { EntranceType::Interior, RR_DEATH_MOUNTAIN_SUMMIT, RR_DMT_GREAT_FAIRY_FOUNTAIN, 0x0315 },
+          { EntranceType::Interior, RR_DMT_GREAT_FAIRY_FOUNTAIN, RR_DEATH_MOUNTAIN_SUMMIT, 0x045B } },
+        { { EntranceType::Interior, RR_ZORAS_FOUNTAIN, RR_ZF_GREAT_FAIRY_FOUNTAIN, 0x0371 },
+          { EntranceType::Interior, RR_ZF_GREAT_FAIRY_FOUNTAIN, RR_ZORAS_FOUNTAIN, 0x0394 } },
+
+        { { EntranceType::SpecialInterior, RR_KOKIRI_FOREST, RR_KF_LINKS_HOUSE, 0x0272 },
+          { EntranceType::SpecialInterior, RR_KF_LINKS_HOUSE, RR_KOKIRI_FOREST, 0x0211 } },
+        { { EntranceType::SpecialInterior, RR_TOT_ENTRANCE, RR_TEMPLE_OF_TIME, 0x0053 },
+          { EntranceType::SpecialInterior, RR_TEMPLE_OF_TIME, RR_TOT_ENTRANCE, 0x0472 } },
+        { { EntranceType::SpecialInterior, RR_KAKARIKO_VILLAGE, RR_KAK_WINDMILL, 0x0453 },
+          { EntranceType::SpecialInterior, RR_KAK_WINDMILL, RR_KAKARIKO_VILLAGE, 0x0351 } },
+        { { EntranceType::SpecialInterior, RR_KAKARIKO_VILLAGE, RR_KAK_POTION_SHOP_FRONT, 0x0384 },
+          { EntranceType::SpecialInterior, RR_KAK_POTION_SHOP_FRONT, RR_KAKARIKO_VILLAGE, 0x044B } },
+        { { EntranceType::SpecialInterior, RR_KAK_BACKYARD, RR_KAK_POTION_SHOP_BACK, 0x03EC },
+          { EntranceType::SpecialInterior, RR_KAK_POTION_SHOP_BACK, RR_KAK_BACKYARD, 0x04FF } },
+
+        // Grotto Loads use an entrance index of 0x0700 + their grotto id. The id is used as index for the
+        // grottoLoadTable in soh/soh/Enhancements/randomizer/randomizer_grotto.c
+        // Grotto Returns use an entrance index of 0x0800 + their grotto id. The id is used as index for the
+        // grottoReturnTable in soh/soh/Enhancements/randomizer/randomizer_grotto.c
+        { { EntranceType::GrottoGrave, RR_DESERT_COLOSSUS, RR_COLOSSUS_GROTTO, 0x0700 },
+          { EntranceType::GrottoGrave, RR_COLOSSUS_GROTTO, RR_DESERT_COLOSSUS, 0x0800 } },
+        { { EntranceType::GrottoGrave, RR_LAKE_HYLIA, RR_LH_GROTTO, 0x0701 },
+          { EntranceType::GrottoGrave, RR_LH_GROTTO, RR_LAKE_HYLIA, 0x0801 } },
+        { { EntranceType::GrottoGrave, RR_ZORAS_RIVER, RR_ZR_STORMS_GROTTO, 0x0702 },
+          { EntranceType::GrottoGrave, RR_ZR_STORMS_GROTTO, RR_ZORAS_RIVER, 0x0802 } },
+        { { EntranceType::GrottoGrave, RR_ZORAS_RIVER, RR_ZR_FAIRY_GROTTO, 0x0703 },
+          { EntranceType::GrottoGrave, RR_ZR_FAIRY_GROTTO, RR_ZORAS_RIVER, 0x0803 } },
+        { { EntranceType::GrottoGrave, RR_ZORAS_RIVER, RR_ZR_OPEN_GROTTO, 0x0704 },
+          { EntranceType::GrottoGrave, RR_ZR_OPEN_GROTTO, RR_ZORAS_RIVER, 0x0804 } },
+        { { EntranceType::GrottoGrave, RR_DMC_LOWER_NEARBY, RR_DMC_HAMMER_GROTTO, 0x0705 },
+          { EntranceType::GrottoGrave, RR_DMC_HAMMER_GROTTO, RR_DMC_LOWER_LOCAL, 0x0805 } },
+        { { EntranceType::GrottoGrave, RR_DMC_UPPER_NEARBY, RR_DMC_UPPER_GROTTO, 0x0706 },
+          { EntranceType::GrottoGrave, RR_DMC_UPPER_GROTTO, RR_DMC_UPPER_LOCAL, 0x0806 } },
+        { { EntranceType::GrottoGrave, RR_GC_GROTTO_PLATFORM, RR_GC_GROTTO, 0x0707 },
+          { EntranceType::GrottoGrave, RR_GC_GROTTO, RR_GC_GROTTO_PLATFORM, 0x0807 } },
+        { { EntranceType::GrottoGrave, RR_DEATH_MOUNTAIN_TRAIL, RR_DMT_STORMS_GROTTO, 0x0708 },
+          { EntranceType::GrottoGrave, RR_DMT_STORMS_GROTTO, RR_DEATH_MOUNTAIN_TRAIL, 0x0808 } },
+        { { EntranceType::GrottoGrave, RR_DEATH_MOUNTAIN_SUMMIT, RR_DMT_COW_GROTTO, 0x0709 },
+          { EntranceType::GrottoGrave, RR_DMT_COW_GROTTO, RR_DEATH_MOUNTAIN_SUMMIT, 0x0809 } },
+        { { EntranceType::GrottoGrave, RR_KAK_BACKYARD, RR_KAK_OPEN_GROTTO, 0x070A },
+          { EntranceType::GrottoGrave, RR_KAK_OPEN_GROTTO, RR_KAK_BACKYARD, 0x080A } },
+        { { EntranceType::GrottoGrave, RR_KAKARIKO_VILLAGE, RR_KAK_REDEAD_GROTTO, 0x070B },
+          { EntranceType::GrottoGrave, RR_KAK_REDEAD_GROTTO, RR_KAKARIKO_VILLAGE, 0x080B } },
+        { { EntranceType::GrottoGrave, RR_HYRULE_CASTLE_GROUNDS, RR_HC_STORMS_GROTTO, 0x070C },
+          { EntranceType::GrottoGrave, RR_HC_STORMS_GROTTO, RR_CASTLE_GROUNDS, 0x080C } },
+        { { EntranceType::GrottoGrave, RR_HYRULE_FIELD, RR_HF_TEKTITE_GROTTO, 0x070D },
+          { EntranceType::GrottoGrave, RR_HF_TEKTITE_GROTTO, RR_HYRULE_FIELD, 0x080D } },
+        { { EntranceType::GrottoGrave, RR_HYRULE_FIELD, RR_HF_NEAR_KAK_GROTTO, 0x070E },
+          { EntranceType::GrottoGrave, RR_HF_NEAR_KAK_GROTTO, RR_HYRULE_FIELD, 0x080E } },
+        { { EntranceType::GrottoGrave, RR_HYRULE_FIELD, RR_HF_FAIRY_GROTTO, 0x070F },
+          { EntranceType::GrottoGrave, RR_HF_FAIRY_GROTTO, RR_HYRULE_FIELD, 0x080F } },
+        { { EntranceType::GrottoGrave, RR_HYRULE_FIELD, RR_HF_NEAR_MARKET_GROTTO, 0x0710 },
+          { EntranceType::GrottoGrave, RR_HF_NEAR_MARKET_GROTTO, RR_HYRULE_FIELD, 0x0810 } },
+        { { EntranceType::GrottoGrave, RR_HYRULE_FIELD, RR_HF_COW_GROTTO, 0x0711 },
+          { EntranceType::GrottoGrave, RR_HF_COW_GROTTO, RR_HYRULE_FIELD, 0x0811 } },
+        { { EntranceType::GrottoGrave, RR_HYRULE_FIELD, RR_HF_INSIDE_FENCE_GROTTO, 0x0712 },
+          { EntranceType::GrottoGrave, RR_HF_INSIDE_FENCE_GROTTO, RR_HYRULE_FIELD, 0x0812 } },
+        { { EntranceType::GrottoGrave, RR_HYRULE_FIELD, RR_HF_OPEN_GROTTO, 0x0713 },
+          { EntranceType::GrottoGrave, RR_HF_OPEN_GROTTO, RR_HYRULE_FIELD, 0x0813 } },
+        { { EntranceType::GrottoGrave, RR_HYRULE_FIELD, RR_HF_SOUTHEAST_GROTTO, 0x0714 },
+          { EntranceType::GrottoGrave, RR_HF_SOUTHEAST_GROTTO, RR_HYRULE_FIELD, 0x0814 } },
+        { { EntranceType::GrottoGrave, RR_LON_LON_RANCH, RR_LLR_GROTTO, 0x0715 },
+          { EntranceType::GrottoGrave, RR_LLR_GROTTO, RR_LON_LON_RANCH, 0x0815 } },
+        { { EntranceType::GrottoGrave, RR_SFM_ENTRYWAY, RR_SFM_WOLFOS_GROTTO, 0x0716 },
+          { EntranceType::GrottoGrave, RR_SFM_WOLFOS_GROTTO, RR_SFM_ENTRYWAY, 0x0816 } },
+        { { EntranceType::GrottoGrave, RR_SACRED_FOREST_MEADOW, RR_SFM_STORMS_GROTTO, 0x0717 },
+          { EntranceType::GrottoGrave, RR_SFM_STORMS_GROTTO, RR_SACRED_FOREST_MEADOW, 0x0817 } },
+        { { EntranceType::GrottoGrave, RR_SACRED_FOREST_MEADOW, RR_SFM_FAIRY_GROTTO, 0x0718 },
+          { EntranceType::GrottoGrave, RR_SFM_FAIRY_GROTTO, RR_SACRED_FOREST_MEADOW, 0x0818 } },
+        { { EntranceType::GrottoGrave, RR_LW_BEYOND_MIDO, RR_LW_SCRUBS_GROTTO, 0x0719 },
+          { EntranceType::GrottoGrave, RR_LW_SCRUBS_GROTTO, RR_LW_BEYOND_MIDO, 0x0819 } },
+        { { EntranceType::GrottoGrave, RR_THE_LOST_WOODS, RR_LW_NEAR_SHORTCUTS_GROTTO, 0x071A },
+          { EntranceType::GrottoGrave, RR_LW_NEAR_SHORTCUTS_GROTTO, RR_THE_LOST_WOODS, 0x081A } },
+        { { EntranceType::GrottoGrave, RR_KOKIRI_FOREST, RR_KF_STORMS_GROTTO, 0x071B },
+          { EntranceType::GrottoGrave, RR_KF_STORMS_GROTTO, RR_KOKIRI_FOREST, 0x081B } },
+        { { EntranceType::GrottoGrave, RR_ZORAS_DOMAIN, RR_ZD_STORMS_GROTTO, 0x071C },
+          { EntranceType::GrottoGrave, RR_ZD_STORMS_GROTTO, RR_ZORAS_DOMAIN, 0x081C } },
+        { { EntranceType::GrottoGrave, RR_GERUDO_FORTRESS, RR_GF_STORMS_GROTTO, 0x071D },
+          { EntranceType::GrottoGrave, RR_GF_STORMS_GROTTO, RR_GERUDO_FORTRESS, 0x081D } },
+        { { EntranceType::GrottoGrave, RR_GV_FORTRESS_SIDE, RR_GV_STORMS_GROTTO, 0x071E },
+          { EntranceType::GrottoGrave, RR_GV_STORMS_GROTTO, RR_GV_FORTRESS_SIDE, 0x081E } },
+        { { EntranceType::GrottoGrave, RR_GV_GROTTO_LEDGE, RR_GV_OCTOROK_GROTTO, 0x071F },
+          { EntranceType::GrottoGrave, RR_GV_OCTOROK_GROTTO, RR_GV_GROTTO_LEDGE, 0x081F } },
+        { { EntranceType::GrottoGrave, RR_LW_BEYOND_MIDO, RR_DEKU_THEATER, 0x0720 },
+          { EntranceType::GrottoGrave, RR_DEKU_THEATER, RR_LW_BEYOND_MIDO, 0x0820 } },
+
+        // Graves have their own specified entrance indices
+        { { EntranceType::GrottoGrave, RR_THE_GRAVEYARD, RR_GRAVEYARD_SHIELD_GRAVE, 0x004B },
+          { EntranceType::GrottoGrave, RR_GRAVEYARD_SHIELD_GRAVE, RR_THE_GRAVEYARD, 0x035D } },
+        { { EntranceType::GrottoGrave, RR_THE_GRAVEYARD, RR_GRAVEYARD_HEART_PIECE_GRAVE, 0x031C },
+          { EntranceType::GrottoGrave, RR_GRAVEYARD_HEART_PIECE_GRAVE, RR_THE_GRAVEYARD, 0x0361 } },
+        { { EntranceType::GrottoGrave, RR_THE_GRAVEYARD, RR_GRAVEYARD_COMPOSERS_GRAVE, 0x002D },
+          { EntranceType::GrottoGrave, RR_GRAVEYARD_COMPOSERS_GRAVE, RR_THE_GRAVEYARD, 0x050B } },
+        { { EntranceType::GrottoGrave, RR_THE_GRAVEYARD, RR_GRAVEYARD_DAMPES_GRAVE, 0x044F },
+          { EntranceType::GrottoGrave, RR_GRAVEYARD_DAMPES_GRAVE, RR_THE_GRAVEYARD, 0x0359 } },
+
+        { { EntranceType::Overworld, RR_KOKIRI_FOREST, RR_LW_BRIDGE_FROM_FOREST, 0x05E0 },
+          { EntranceType::Overworld, RR_LW_BRIDGE, RR_KOKIRI_FOREST, 0x020D } },
+        { { EntranceType::Overworld, RR_KOKIRI_FOREST, RR_THE_LOST_WOODS, 0x011E },
+          { EntranceType::Overworld, RR_LW_FOREST_EXIT, RR_KOKIRI_FOREST, 0x0286 } },
+        { { EntranceType::Overworld, RR_THE_LOST_WOODS, RR_GC_WOODS_WARP, 0x04E2 },
+          { EntranceType::Overworld, RR_GC_WOODS_WARP, RR_THE_LOST_WOODS, 0x04D6 } },
+        { { EntranceType::Overworld, RR_THE_LOST_WOODS, RR_ZORAS_RIVER, 0x01DD },
+          { EntranceType::Overworld, RR_ZORAS_RIVER, RR_THE_LOST_WOODS, 0x04DA } },
+        { { EntranceType::Overworld, RR_LW_BEYOND_MIDO, RR_SFM_ENTRYWAY, 0x00FC },
+          { EntranceType::Overworld, RR_SFM_ENTRYWAY, RR_LW_BEYOND_MIDO, 0x01A9 } },
+        { { EntranceType::Overworld, RR_LW_BRIDGE, RR_HYRULE_FIELD, 0x0185 },
+          { EntranceType::Overworld, RR_HYRULE_FIELD, RR_LW_BRIDGE, 0x04DE } },
+        { { EntranceType::Overworld, RR_HYRULE_FIELD, RR_LAKE_HYLIA, 0x0102 },
+          { EntranceType::Overworld, RR_LAKE_HYLIA, RR_HYRULE_FIELD, 0x0189 } },
+        { { EntranceType::Overworld, RR_HYRULE_FIELD, RR_GERUDO_VALLEY, 0x0117 },
+          { EntranceType::Overworld, RR_GERUDO_VALLEY, RR_HYRULE_FIELD, 0x018D } },
+        { { EntranceType::Overworld, RR_HYRULE_FIELD, RR_MARKET_ENTRANCE, 0x0276 },
+          { EntranceType::Overworld, RR_MARKET_ENTRANCE, RR_HYRULE_FIELD, 0x01FD } },
+        { { EntranceType::Overworld, RR_HYRULE_FIELD, RR_KAKARIKO_VILLAGE, 0x00DB },
+          { EntranceType::Overworld, RR_KAKARIKO_VILLAGE, RR_HYRULE_FIELD, 0x017D } },
+        { { EntranceType::Overworld, RR_HYRULE_FIELD, RR_ZR_FRONT, 0x00EA },
+          { EntranceType::Overworld, RR_ZR_FRONT, RR_HYRULE_FIELD, 0x0181 } },
+        { { EntranceType::Overworld, RR_HYRULE_FIELD, RR_LON_LON_RANCH, 0x0157 },
+          { EntranceType::Overworld, RR_LON_LON_RANCH, RR_HYRULE_FIELD, 0x01F9 } },
+        { { EntranceType::Overworld, RR_LAKE_HYLIA, RR_ZORAS_DOMAIN, 0x0328 },
+          { EntranceType::Overworld, RR_ZORAS_DOMAIN, RR_LAKE_HYLIA, 0x0560 } },
+        { { EntranceType::Overworld, RR_GV_FORTRESS_SIDE, RR_GERUDO_FORTRESS, 0x0129 },
+          { EntranceType::Overworld, RR_GERUDO_FORTRESS, RR_GV_FORTRESS_SIDE, 0x022D } },
+        { { EntranceType::Overworld, RR_GF_OUTSIDE_GATE, RR_WASTELAND_NEAR_FORTRESS, 0x0130 },
+          { EntranceType::Overworld, RR_WASTELAND_NEAR_FORTRESS, RR_GF_OUTSIDE_GATE, 0x03AC } },
+        { { EntranceType::Overworld, RR_WASTELAND_NEAR_COLOSSUS, RR_DESERT_COLOSSUS, 0x0123 },
+          { EntranceType::Overworld, RR_DESERT_COLOSSUS, RR_WASTELAND_NEAR_COLOSSUS, 0x0365 } },
+        { { EntranceType::Overworld, RR_MARKET_ENTRANCE, RR_THE_MARKET, 0x00B1 },
+          { EntranceType::Overworld, RR_THE_MARKET, RR_MARKET_ENTRANCE, 0x0033 } },
+        { { EntranceType::Overworld, RR_THE_MARKET, RR_CASTLE_GROUNDS, 0x0138 },
+          { EntranceType::Overworld, RR_CASTLE_GROUNDS, RR_THE_MARKET, 0x025A } },
+        { { EntranceType::Overworld, RR_THE_MARKET, RR_TOT_ENTRANCE, 0x0171 },
+          { EntranceType::Overworld, RR_TOT_ENTRANCE, RR_THE_MARKET, 0x025E } },
+        { { EntranceType::Overworld, RR_KAKARIKO_VILLAGE, RR_THE_GRAVEYARD, 0x00E4 },
+          { EntranceType::Overworld, RR_THE_GRAVEYARD, RR_KAKARIKO_VILLAGE, 0x0195 } },
+        { { EntranceType::Overworld, RR_KAK_BEHIND_GATE, RR_DEATH_MOUNTAIN_TRAIL, 0x013D },
+          { EntranceType::Overworld, RR_DEATH_MOUNTAIN_TRAIL, RR_KAK_BEHIND_GATE, 0x0191 } },
+        { { EntranceType::Overworld, RR_DEATH_MOUNTAIN_TRAIL, RR_GORON_CITY, 0x014D },
+          { EntranceType::Overworld, RR_GORON_CITY, RR_DEATH_MOUNTAIN_TRAIL, 0x01B9 } },
+        { { EntranceType::Overworld, RR_GC_DARUNIAS_CHAMBER, RR_DMC_LOWER_LOCAL, 0x0246 },
+          { EntranceType::Overworld, RR_DMC_LOWER_NEARBY, RR_GC_DARUNIAS_CHAMBER, 0x01C1 } },
+        { { EntranceType::Overworld, RR_DEATH_MOUNTAIN_SUMMIT, RR_DMC_UPPER_LOCAL, 0x0147 },
+          { EntranceType::Overworld, RR_DMC_UPPER_NEARBY, RR_DEATH_MOUNTAIN_SUMMIT, 0x01BD } },
+        { { EntranceType::Overworld, RR_ZR_BEHIND_WATERFALL, RR_ZORAS_DOMAIN, 0x0108 },
+          { EntranceType::Overworld, RR_ZORAS_DOMAIN, RR_ZR_BEHIND_WATERFALL, 0x019D } },
+        { { EntranceType::Overworld, RR_ZD_BEHIND_KING_ZORA, RR_ZORAS_FOUNTAIN, 0x0225 },
+          { EntranceType::Overworld, RR_ZORAS_FOUNTAIN, RR_ZD_BEHIND_KING_ZORA, 0x01A1 } },
+
+        { { EntranceType::Overworld, RR_GV_LOWER_STREAM, RR_LAKE_HYLIA, 0x0219 }, NO_RETURN_ENTRANCE },
+
+        { { EntranceType::OwlDrop, RR_LH_OWL_FLIGHT, RR_HYRULE_FIELD, 0x027E }, NO_RETURN_ENTRANCE },
+        { { EntranceType::OwlDrop, RR_DMT_OWL_FLIGHT, RR_KAK_IMPAS_ROOFTOP, 0x0554 }, NO_RETURN_ENTRANCE },
+
+        { { EntranceType::Spawn, RR_CHILD_SPAWN, RR_KF_LINKS_HOUSE, 0x00BB }, NO_RETURN_ENTRANCE },
+        { { EntranceType::Spawn, RR_ADULT_SPAWN, RR_TEMPLE_OF_TIME, 0x0282 },
+          NO_RETURN_ENTRANCE }, // 0x282 is an unused entrance index repurposed to differentiate between
+                                // Adult Spawn and prelude of light (normally they both use 0x5F4)
+        { { EntranceType::WarpSong, RR_MINUET_OF_FOREST_WARP, RR_SACRED_FOREST_MEADOW, 0x0600 }, NO_RETURN_ENTRANCE },
+        { { EntranceType::WarpSong, RR_BOLERO_OF_FIRE_WARP, RR_DMC_CENTRAL_LOCAL, 0x04F6 }, NO_RETURN_ENTRANCE },
+        { { EntranceType::WarpSong, RR_SERENADE_OF_WATER_WARP, RR_LAKE_HYLIA, 0x0604 }, NO_RETURN_ENTRANCE },
+        { { EntranceType::WarpSong, RR_REQUIEM_OF_SPIRIT_WARP, RR_DESERT_COLOSSUS, 0x01F1 }, NO_RETURN_ENTRANCE },
+        { { EntranceType::WarpSong, RR_NOCTURNE_OF_SHADOW_WARP, RR_GRAVEYARD_WARP_PAD_REGION, 0x0568 },
+          NO_RETURN_ENTRANCE },
+        { { EntranceType::WarpSong, RR_PRELUDE_OF_LIGHT_WARP, RR_TEMPLE_OF_TIME, 0x05F4 }, NO_RETURN_ENTRANCE },
+
+        { { EntranceType::ChildBoss, RR_DEKU_TREE_BOSS_ENTRYWAY, RR_DEKU_TREE_BOSS_ROOM, 0x040F },
+          { EntranceType::ChildBoss, RR_DEKU_TREE_BOSS_ROOM, RR_DEKU_TREE_BOSS_ENTRYWAY, 0x0252, 0x0457 } },
+        { { EntranceType::ChildBoss, RR_DODONGOS_CAVERN_BOSS_ENTRYWAY, RR_DODONGOS_CAVERN_BOSS_ROOM, 0x040B },
+          { EntranceType::ChildBoss, RR_DODONGOS_CAVERN_BOSS_ROOM, RR_DODONGOS_CAVERN_BOSS_ENTRYWAY, 0x00C5, 0x047A } },
+        { { EntranceType::ChildBoss, RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY, RR_JABU_JABUS_BELLY_BOSS_ROOM, 0x0301 },
+          { EntranceType::ChildBoss, RR_JABU_JABUS_BELLY_BOSS_ROOM, RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY, 0x0407,
+            0x010E } },
+        { { EntranceType::AdultBoss, RR_FOREST_TEMPLE_BOSS_ENTRYWAY, RR_FOREST_TEMPLE_BOSS_ROOM, 0x000C },
+          { EntranceType::AdultBoss, RR_FOREST_TEMPLE_BOSS_ROOM, RR_FOREST_TEMPLE_BOSS_ENTRYWAY, 0x024E, 0x0608 } },
+        { { EntranceType::AdultBoss, RR_FIRE_TEMPLE_BOSS_ENTRYWAY, RR_FIRE_TEMPLE_BOSS_ROOM, 0x0305 },
+          { EntranceType::AdultBoss, RR_FIRE_TEMPLE_BOSS_ROOM, RR_FIRE_TEMPLE_BOSS_ENTRYWAY, 0x0175, 0x0564 } },
+        { { EntranceType::AdultBoss, RR_WATER_TEMPLE_BOSS_ENTRYWAY, RR_WATER_TEMPLE_BOSS_ROOM, 0x0417 },
+          { EntranceType::AdultBoss, RR_WATER_TEMPLE_BOSS_ROOM, RR_WATER_TEMPLE_BOSS_ENTRYWAY, 0x0423, 0x060C } },
+        { { EntranceType::AdultBoss, RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY, RR_SPIRIT_TEMPLE_BOSS_ROOM, 0x008D },
+          { EntranceType::AdultBoss, RR_SPIRIT_TEMPLE_BOSS_ROOM, RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY, 0x02F5, 0x0610 } },
+        { { EntranceType::AdultBoss, RR_SHADOW_TEMPLE_BOSS_ENTRYWAY, RR_SHADOW_TEMPLE_BOSS_ROOM, 0x0413 },
+          { EntranceType::AdultBoss, RR_SHADOW_TEMPLE_BOSS_ROOM, RR_SHADOW_TEMPLE_BOSS_ENTRYWAY, 0x02B2, 0x0580 } },
+    };
+
+    std::map<std::string, PriorityEntrance> priorityEntranceTable = {
+        { "Bolero", { { RR_DMC_CENTRAL_LOCAL }, { EntranceType::OwlDrop, EntranceType::WarpSong } } },
+        { "Nocturne",
+          { { RR_GRAVEYARD_WARP_PAD_REGION },
+            { EntranceType::OwlDrop, EntranceType::Spawn, EntranceType::WarpSong } } },
+        { "Requiem",
+          { { RR_DESERT_COLOSSUS, RR_DESERT_COLOSSUS_FROM_SPIRIT_ENTRYWAY },
+            { EntranceType::OwlDrop, EntranceType::Spawn, EntranceType::WarpSong } } },
+    };
+
+    mEntranceShuffleFailure = false;
+    SetAllEntrancesData(entranceShuffleTable);
+
+    EntrancePools oneWayEntrancePools = {};
+    EntrancePools entrancePools = {};
+    std::map<std::string, PriorityEntrance> oneWayPriorities = {};
+
+    // Owl Drops
+    if (ctx->GetOption(RSK_SHUFFLE_OWL_DROPS)) {
+        oneWayEntrancePools[EntranceType::OwlDrop] = GetShuffleableEntrances(EntranceType::OwlDrop);
+    }
+
+    // Spawns
+    if (ctx->GetOption(RSK_SHUFFLE_OVERWORLD_SPAWNS)) {
+        oneWayEntrancePools[EntranceType::Spawn] = GetShuffleableEntrances(EntranceType::Spawn);
+    }
+
+    // Warpsongs
+    if (ctx->GetOption(RSK_SHUFFLE_WARP_SONGS)) {
+        oneWayEntrancePools[EntranceType::WarpSong] = GetShuffleableEntrances(EntranceType::WarpSong);
+        // In Glitchless, there aren't any other ways to access these areas
+        if (ctx->GetOption(RSK_LOGIC_RULES).Is(RO_LOGIC_GLITCHLESS)) {
+            oneWayPriorities["Bolero"] = priorityEntranceTable["Bolero"];
+            oneWayPriorities["Nocturne"] = priorityEntranceTable["Nocturne"];
+            if (!ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES) && !ctx->GetOption(RSK_SHUFFLE_OVERWORLD_ENTRANCES)) {
+                oneWayPriorities["Requiem"] = priorityEntranceTable["Requiem"];
+            }
+        }
+    }
+
+    // Shuffle Bosses
+    if (ctx->GetOption(RSK_SHUFFLE_BOSS_ENTRANCES).IsNot(RO_BOSS_ROOM_ENTRANCE_SHUFFLE_OFF)) {
+        if (ctx->GetOption(RSK_SHUFFLE_BOSS_ENTRANCES).Is(RO_BOSS_ROOM_ENTRANCE_SHUFFLE_FULL)) {
+            entrancePools[EntranceType::Boss] = GetShuffleableEntrances(EntranceType::ChildBoss);
+            AddElementsToPool(entrancePools[EntranceType::Boss], GetShuffleableEntrances(EntranceType::AdultBoss));
+            // If forest is closed, ensure Ghoma is inside the Deku tree
+            // Deku tree being in its vanilla location is handled below
+            if (ctx->GetOption(RSK_FOREST).Is(RO_FOREST_CLOSED) &&
+                !(ctx->GetOption(RSK_SHUFFLE_OVERWORLD_ENTRANCES) || ctx->GetOption(RSK_SHUFFLE_INTERIOR_ENTRANCES))) {
+                FilterAndEraseFromPool(entrancePools[EntranceType::Boss], [](const Entrance* entrance) {
+                    return entrance->GetParentRegionKey() == RR_DEKU_TREE_BOSS_ENTRYWAY &&
+                           entrance->GetConnectedRegionKey() == RR_DEKU_TREE_BOSS_ROOM;
+                });
+            }
+        } else {
+            entrancePools[EntranceType::ChildBoss] = GetShuffleableEntrances(EntranceType::ChildBoss);
+            entrancePools[EntranceType::AdultBoss] = GetShuffleableEntrances(EntranceType::AdultBoss);
+            // If forest is closed, ensure Ghoma is inside the Deku tree
+            if (ctx->GetOption(RSK_FOREST).Is(RO_FOREST_CLOSED) &&
+                !(ctx->GetOption(RSK_SHUFFLE_OVERWORLD_ENTRANCES) || ctx->GetOption(RSK_SHUFFLE_INTERIOR_ENTRANCES))) {
+                FilterAndEraseFromPool(entrancePools[EntranceType::ChildBoss], [](const Entrance* entrance) {
+                    return entrance->GetParentRegionKey() == RR_DEKU_TREE_BOSS_ENTRYWAY &&
+                           entrance->GetConnectedRegionKey() == RR_DEKU_TREE_BOSS_ROOM;
+                });
+            }
+        }
+    }
+
+    // Shuffle Dungeon Entrances
+    if (ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).IsNot(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF)) {
+        entrancePools[EntranceType::Dungeon] = GetShuffleableEntrances(EntranceType::Dungeon);
+        // Add Ganon's Castle, if set to On + Ganon
+        if (ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_ON_PLUS_GANON)) {
+            AddElementsToPool(entrancePools[EntranceType::Dungeon],
+                              GetShuffleableEntrances(EntranceType::GanonDungeon));
+        }
+        // If forest is closed don't allow a forest escape via spirit temple hands
+        if (ctx->GetOption(RSK_FOREST).Is(RO_FOREST_CLOSED) &&
+            !(ctx->GetOption(RSK_SHUFFLE_OVERWORLD_ENTRANCES) || ctx->GetOption(RSK_SHUFFLE_INTERIOR_ENTRANCES))) {
+            FilterAndEraseFromPool(entrancePools[EntranceType::Dungeon], [](const Entrance* entrance) {
+                return entrance->GetParentRegionKey() == RR_KF_OUTSIDE_DEKU_TREE &&
+                       entrance->GetConnectedRegionKey() == RR_DEKU_TREE_ENTRYWAY;
+            });
+        }
+        if (ctx->GetOption(RSK_DECOUPLED_ENTRANCES)) {
+            for (Entrance* entrance : entrancePools[EntranceType::Dungeon]) {
+                entrancePools[EntranceType::DungeonReverse].push_back(entrance->GetReverse());
+            }
+        }
+    }
+
+    // Interior entrances
+    if (ctx->GetOption(RSK_SHUFFLE_INTERIOR_ENTRANCES).IsNot(RO_INTERIOR_ENTRANCE_SHUFFLE_OFF)) {
+        entrancePools[EntranceType::Interior] = GetShuffleableEntrances(EntranceType::Interior);
+        // Special interiors
+        if (ctx->GetOption(RSK_SHUFFLE_INTERIOR_ENTRANCES).Is(RO_INTERIOR_ENTRANCE_SHUFFLE_ALL)) {
+            AddElementsToPool(entrancePools[EntranceType::Interior],
+                              GetShuffleableEntrances(EntranceType::SpecialInterior));
+        }
+        if (ctx->GetOption(RSK_DECOUPLED_ENTRANCES)) {
+            for (Entrance* entrance : entrancePools[EntranceType::Interior]) {
+                entrancePools[EntranceType::InteriorReverse].push_back(entrance->GetReverse());
+            }
+        }
+    }
+
+    // grotto entrances
+    if (ctx->GetOption(RSK_SHUFFLE_GROTTO_ENTRANCES)) {
+        entrancePools[EntranceType::GrottoGrave] = GetShuffleableEntrances(EntranceType::GrottoGrave);
+
+        if (ctx->GetOption(RSK_DECOUPLED_ENTRANCES)) {
+            for (Entrance* entrance : entrancePools[EntranceType::GrottoGrave]) {
+                entrancePools[EntranceType::GrottoGraveReverse].push_back(entrance->GetReverse());
+            }
+        }
+    }
+
+    // overworld entrances
+    if (ctx->GetOption(RSK_SHUFFLE_OVERWORLD_ENTRANCES)) {
+        bool excludeOverworldReverse =
+            ctx->GetOption(RSK_MIX_OVERWORLD_ENTRANCES) && !ctx->GetOption(RSK_DECOUPLED_ENTRANCES);
+        entrancePools[EntranceType::Overworld] =
+            GetShuffleableEntrances(EntranceType::Overworld, excludeOverworldReverse);
+        // Only shuffle GV Lower Stream -> Lake Hylia if decoupled entrances are on
+        if (!ctx->GetOption(RSK_DECOUPLED_ENTRANCES)) {
+            FilterAndEraseFromPool(entrancePools[EntranceType::Overworld], [](const Entrance* entrance) {
+                return entrance->GetParentRegionKey() == RR_GV_LOWER_STREAM &&
+                       entrance->GetConnectedRegionKey() == RR_LAKE_HYLIA;
+            });
+        }
+    }
+
+    // Set shuffled entrances as such
+    SetShuffledEntrances(entrancePools);
+    SetShuffledEntrances(oneWayEntrancePools);
+
+    // combine entrance pools if mixing pools. Only continue if more than one pool is selected.
+    int totalMixedPools =
+        (ctx->GetOption(RSK_MIX_DUNGEON_ENTRANCES) ? 1 : 0) + (ctx->GetOption(RSK_MIX_OVERWORLD_ENTRANCES) ? 1 : 0) +
+        (ctx->GetOption(RSK_MIX_INTERIOR_ENTRANCES) ? 1 : 0) + (ctx->GetOption(RSK_MIX_GROTTO_ENTRANCES) ? 1 : 0);
+    if (totalMixedPools < 2) {
+        ctx->GetOption(RSK_MIXED_ENTRANCE_POOLS).SetSelectedIndex(RO_GENERIC_OFF);
+        ctx->GetOption(RSK_MIX_DUNGEON_ENTRANCES).SetSelectedIndex(RO_GENERIC_OFF);
+        ctx->GetOption(RSK_MIX_OVERWORLD_ENTRANCES).SetSelectedIndex(RO_GENERIC_OFF);
+        ctx->GetOption(RSK_MIX_INTERIOR_ENTRANCES).SetSelectedIndex(RO_GENERIC_OFF);
+        ctx->GetOption(RSK_MIX_GROTTO_ENTRANCES).SetSelectedIndex(RO_GENERIC_OFF);
+    }
+    if (ctx->GetOption(RSK_MIXED_ENTRANCE_POOLS)) {
+        std::set<EntranceType> poolsToMix = {};
+        if (ctx->GetOption(RSK_MIX_DUNGEON_ENTRANCES)) {
+            poolsToMix.insert(EntranceType::Dungeon);
+            // Insert reverse entrances when decoupled entrances is on
+            if (ctx->GetOption(RSK_DECOUPLED_ENTRANCES)) {
+                poolsToMix.insert(EntranceType::DungeonReverse);
+            }
+        }
+        if (ctx->GetOption(RSK_SHUFFLE_OVERWORLD_ENTRANCES)) {
+            poolsToMix.insert(EntranceType::Overworld);
+        }
+        if (ctx->GetOption(RSK_SHUFFLE_INTERIOR_ENTRANCES)) {
+            poolsToMix.insert(EntranceType::Interior);
+            if (ctx->GetOption(RSK_DECOUPLED_ENTRANCES)) {
+                poolsToMix.insert(EntranceType::InteriorReverse);
+            }
+        }
+        if (ctx->GetOption(RSK_SHUFFLE_GROTTO_ENTRANCES)) {
+            poolsToMix.insert(EntranceType::GrottoGrave);
+            if (ctx->GetOption(RSK_DECOUPLED_ENTRANCES)) {
+                poolsToMix.insert(EntranceType::GrottoGraveReverse);
+            }
+        }
+
+        for (auto& pool : entrancePools) {
+
+            auto type = pool.first;
+
+            if (poolsToMix.count(type) > 0) {
+                AddElementsToPool(entrancePools[EntranceType::Mixed], pool.second);
+                entrancePools[type].clear();
+            }
+        }
+    }
+
+    // Build target entrance pools and set the assumption for entrances being reachable
+    EntrancePools oneWayTargetEntrancePools = {};
+    for (auto& pool : oneWayEntrancePools) {
+
+        std::vector<EntranceType> validTargetTypes = {};
+        EntranceType poolType = pool.first;
+
+        if (poolType == EntranceType::OwlDrop) {
+            validTargetTypes = { EntranceType::WarpSong, EntranceType::OwlDrop, EntranceType::Overworld,
+                                 EntranceType::Extra };
+            oneWayTargetEntrancePools[poolType] =
+                BuildOneWayTargets(validTargetTypes, { std::make_pair(RR_PRELUDE_OF_LIGHT_WARP, RR_TEMPLE_OF_TIME) });
+            // Owl Drops are only accessible as child, so targets should reflect that
+            for (Entrance* target : oneWayTargetEntrancePools[poolType]) {
+                target->SetCondition([] { return Logic::IsChild; });
+            }
+
+        } else if (poolType == EntranceType::Spawn) {
+            validTargetTypes = { EntranceType::Spawn,       EntranceType::WarpSong, EntranceType::OwlDrop,
+                                 EntranceType::Overworld,   EntranceType::Interior, EntranceType::SpecialInterior,
+                                 EntranceType::GrottoGrave, EntranceType::Extra };
+            oneWayTargetEntrancePools[poolType] = BuildOneWayTargets(validTargetTypes);
+
+        } else if (poolType == EntranceType::WarpSong) {
+            validTargetTypes = { EntranceType::Spawn,       EntranceType::WarpSong, EntranceType::OwlDrop,
+                                 EntranceType::Overworld,   EntranceType::Interior, EntranceType::SpecialInterior,
+                                 EntranceType::GrottoGrave, EntranceType::Extra };
+            oneWayTargetEntrancePools[poolType] = BuildOneWayTargets(validTargetTypes);
+        }
+        // for target in one_way_target_entrance_pools[pool_type]:
+        //           target.add_rule((lambda entrances=entrance_pool: (lambda state, **kwargs:
+        //           any(entrance.connected_region == None for entrance in entrances)))())
+    }
+
+    // Disconnect all one way entrances at this point (they need to be connected during all of the above process)
+    for (auto& pool : oneWayEntrancePools) {
+        for (Entrance* entrance : pool.second) {
+            mTotalRandomizableEntrances++;
+            entrance->Disconnect();
+        }
+    }
+
+    // Assume entrance pools for each type
+    EntrancePools targetEntrancePools = {};
+    for (auto& pool : entrancePools) {
+        targetEntrancePools[pool.first] = AssumeEntrancePool(pool.second);
+    }
+
+    // distribution stuff
+
+    // check placed on-way entrances
+    // remove replaced entrances so we don't place two in one target
+    // remvoe priority targets if any placed entrances point at their regions
+
+    // Place priority entrances
+    ShuffleOneWayPriorityEntrances(oneWayPriorities, oneWayEntrancePools, oneWayTargetEntrancePools);
+    if (mEntranceShuffleFailure) {
+        return ENTRANCE_SHUFFLE_FAILURE;
+    }
+
+    // Delete all targets that we just placed from one way target pools so
+    // multiple one way entrances don't use the same target
+    std::vector<Entrance*> replacedEntrances = {};
+    for (auto& pool : oneWayEntrancePools) {
+        for (Entrance* entrance : pool.second) {
+            if (entrance->GetReplacement() != nullptr) {
+                replacedEntrances.push_back(entrance);
+            }
+        }
+    }
+    for (auto& pool : oneWayTargetEntrancePools) {
+        for (Entrance* remainingTarget : pool.second) {
+            auto replacement = remainingTarget->GetReplacement();
+            if (ElementInContainer(replacement, replacedEntrances)) {
+                DeleteTargetEntrance(remainingTarget);
+            }
+        }
+    }
+
+    // Shuffle all one way entrances among pools to shuffle
+    for (auto& pool : oneWayEntrancePools) {
+        ShuffleEntrancePool(pool.second, oneWayTargetEntrancePools[pool.first], 5);
+        if (mEntranceShuffleFailure) {
+            return ENTRANCE_SHUFFLE_FAILURE;
+        }
+        // Delete all targets that we just placed from other one way target pools so
+        // multiple one way entrances don't use the same target
+        replacedEntrances =
+            FilterFromPool(pool.second, [](Entrance* entrance) { return entrance->GetReplacement() != nullptr; });
+        for (auto& targetPool : oneWayTargetEntrancePools) {
+            for (Entrance* remainingTarget : targetPool.second) {
+                auto replacement = remainingTarget->GetReplacement();
+                if (ElementInContainer(replacement, replacedEntrances)) {
+                    DeleteTargetEntrance(remainingTarget);
+                }
+            }
+        }
+        // Delete all unused extra targets after placing a one way pool, since the
+        // unused targets won't ever be replaced
+        for (Entrance* unusedTarget : oneWayTargetEntrancePools[pool.first]) {
+            DeleteTargetEntrance(unusedTarget);
+        }
+    }
+
+    // shuffle all entrances among pools to shuffle
+    for (auto& pool : entrancePools) {
+        ShuffleEntrancePool(pool.second, targetEntrancePools[pool.first]);
+        if (mEntranceShuffleFailure) {
+            return ENTRANCE_SHUFFLE_FAILURE;
+        }
+    }
+
+    return ENTRANCE_SHUFFLE_SUCCESS;
+}
+
+void EntranceShuffler::CreateEntranceOverrides() {
+    auto ctx = Rando::Context::GetInstance();
+    entranceOverrides.fill({0, 0, 0, 0, 0});
+    if (mNoRandomEntrances) {
+        return;
+    }
+    SPDLOG_DEBUG("\nCREATING ENTRANCE OVERRIDES\n");
+    auto allShuffleableEntrances = GetShuffleableEntrances(EntranceType::All, false);
+
+    int i = 0;
+    for (Entrance* entrance : allShuffleableEntrances) {
+
+        // Double-check to make sure the entrance is actually shuffled
+        if (!entrance->IsShuffled()) {
+            continue;
+        }
+
+        auto message = "Setting " + entrance->to_string() + "\n";
+        SPDLOG_DEBUG(message);
+
+        int16_t originalIndex = entrance->GetIndex();
+        int16_t originalBlueWarp = entrance->GetBlueWarp();
+        int16_t replacementIndex = entrance->GetReplacement()->GetIndex();
+
+        int16_t destinationIndex = -1;
+        int16_t replacementDestinationIndex = -1;
+
+        // Only set destination indices for two way entrances and when decouple entrances
+        // is off
+        if (entrance->GetReverse() != nullptr && !ctx->GetOption(RSK_DECOUPLED_ENTRANCES)) {
+            replacementDestinationIndex = entrance->GetReplacement()->GetReverse()->GetIndex();
+            destinationIndex = entrance->GetReverse()->GetIndex();
+        }
+
+        entranceOverrides[i] = {
+            .index = originalIndex,
+            .destination = destinationIndex,
+            .blueWarp = originalBlueWarp,
+            .override = replacementIndex,
+            .overrideDestination = replacementDestinationIndex,
+        };
+
+        message = "\tOriginal: " + std::to_string(originalIndex) + "\n";
+        SPDLOG_DEBUG(message);
+        message = "\tReplacement " + std::to_string(replacementIndex) + "\n";
+        SPDLOG_DEBUG(message);
+        i++;
+    }
+}
+
+/// @brief set all the entrances to be 0 to indicate an unshuffled entrance
+void EntranceShuffler::UnshuffleAllEntrances() {
+    for (auto& entranceOveride : entranceOverrides) {
+        entranceOveride.index = 0;
+        entranceOveride.destination = 0;
+        entranceOveride.blueWarp = 0;
+        entranceOveride.override = 0;
+        entranceOveride.overrideDestination = 0;
+    }
+}
+
+void EntranceShuffler::ParseJson(nlohmann::json spoilerFileJson) {
+    UnshuffleAllEntrances();
+    try {
+        nlohmann::json entrancesJson = spoilerFileJson["entrances"];
+        size_t i = 0;
+        for (auto it = entrancesJson.begin(); it != entrancesJson.end(); ++it, i++) {
+            nlohmann::json entranceJson = *it;
+            for (auto entranceIt = entranceJson.begin(); entranceIt != entranceJson.end(); ++entranceIt) {
+                if (entranceIt.key() == "index") {
+                    entranceOverrides[i].index = entranceIt.value();
+                } else if (entranceIt.key() == "destination") {
+                    entranceOverrides[i].destination = entranceIt.value();
+                } else if (entranceIt.key() == "blueWarp") {
+                    entranceOverrides[i].blueWarp = entranceIt.value();
+                } else if (entranceIt.key() == "override") {
+                    entranceOverrides[i].override = entranceIt.value();
+                } else if (entranceIt.key() == "overrideDestination") {
+                    entranceOverrides[i].overrideDestination = entranceIt.value();
+                }
+            }
+        }
+    } catch (const std::exception& e) { throw e; }
+}
+} // namespace Rando
+
+extern "C" EntranceOverride* Randomizer_GetEntranceOverrides() {
+  return Rando::Context::GetInstance()->GetEntranceShuffler()->entranceOverrides.data();
+}
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/entrance.h b/soh/soh/Enhancements/randomizer/entrance.h
new file mode 100644
index 000000000..0886ddb26
--- /dev/null
+++ b/soh/soh/Enhancements/randomizer/entrance.h
@@ -0,0 +1,151 @@
+#pragma once
+#ifdef __cplusplus
+
+#include "randomizerTypes.h"
+#include "3drando/location_access.hpp"
+
+#include <nlohmann/json.hpp>
+
+#define ENTRANCE_SHUFFLE_SUCCESS 0
+#define ENTRANCE_SHUFFLE_FAILURE 1
+
+namespace Rando {
+enum class EntranceType {
+    None,
+    OwlDrop,
+    Spawn,
+    WarpSong,
+    Dungeon,
+    GanonDungeon,
+    DungeonReverse,
+    Boss,
+    ChildBoss,
+    AdultBoss,
+    Interior,
+    InteriorReverse,
+    SpecialInterior,
+    GrottoGrave,
+    GrottoGraveReverse,
+    Overworld,
+    Extra,
+    Mixed,
+    All,
+};
+
+class Entrance {
+  public:
+    Entrance(RandomizerRegion connectedRegion_, std::vector<ConditionFn> conditions_met_);
+    void SetCondition(ConditionFn newCondition);
+    bool GetConditionsMet() const;
+    std::string to_string() const;
+    void SetName(std::string name_ = "");
+    std::string GetName() const;
+    void printAgeTimeAccess();
+    bool ConditionsMet(bool allAgeTimes = false) const;
+    uint32_t Getuint32_t() const;
+    bool CheckConditionAtAgeTime(bool& age, bool& time, bool passAnyway = false) const;
+    RandomizerRegion GetConnectedRegionKey() const;
+    Area* GetConnectedRegion() const;
+    void SetParentRegion(RandomizerRegion newParent);
+    RandomizerRegion GetParentRegionKey() const;
+    Area* GetParentRegion() const;
+    void SetNewEntrance(RandomizerRegion newRegion);
+    void SetAsShuffled();
+    bool IsShuffled() const;
+    bool IsAddedToPool() const;
+    void AddToPool();
+    void RemoveFromPool();
+    void SetAsPrimary();
+    bool IsPrimary() const;
+    bool IsDecoupled() const;
+    void SetDecoupled();
+    int16_t GetIndex() const;
+    void SetIndex(int16_t newIndex);
+    int16_t GetBlueWarp() const;
+    void SetBlueWarp(int16_t newBlueWarp);
+    Entrance* GetAssumed() const;
+    void SetReplacement(Entrance* newReplacement);
+    Entrance* GetReplacement() const;
+    EntranceType GetType() const;
+    void SetType(EntranceType newType);
+    Entrance* GetReverse() const;
+    void Connect(RandomizerRegion newConnectedRegion);
+    RandomizerRegion Disconnect();
+    void BindTwoWay(Entrance* otherEntrance);
+    Entrance* GetNewTarget();
+    Entrance* AssumeReachable();
+
+  private:
+    RandomizerRegion parentRegion;
+    RandomizerRegion connectedRegion;
+    std::vector<ConditionFn> conditions_met;
+
+    EntranceType type = EntranceType::None;
+    Entrance* target = nullptr;
+    Entrance* reverse = nullptr;
+    Entrance* assumed = nullptr;
+    Entrance* replacement = nullptr;
+    int16_t index = 0xFFFF;
+    int16_t blueWarp = 0;
+    bool shuffled = false;
+    bool primary = false;
+    bool addedToPool = false;
+    bool decoupled = false;
+    std::string name = "";
+};
+
+typedef struct {
+    EntranceType type;
+    RandomizerRegion parentRegion;
+    RandomizerRegion connectedRegion;
+    int16_t index;
+    int16_t blueWarp;
+} EntranceLinkInfo;
+
+typedef struct {
+    std::list<RandomizerRegion> targetRegions;
+    std::list<EntranceType> allowedTypes;
+} PriorityEntrance;
+// primary,          secondary
+using EntranceInfoPair = std::pair<EntranceLinkInfo, EntranceLinkInfo>;
+using EntrancePair = std::pair<Entrance*, Entrance*>;
+using EntrancePools = std::map<EntranceType, std::vector<Entrance*>>;
+
+class EntranceShuffler {
+  public:
+    std::array<EntranceOverride, ENTRANCE_OVERRIDES_MAX_COUNT> entranceOverrides;
+    std::vector<std::list<Entrance*>> playthroughEntrances;
+    bool HasNoRandomEntrances();
+    void SetNoRandomEntrances(bool noRandomEntrances);
+    int ShuffleAllEntrances();
+    void CreateEntranceOverrides();
+    void UnshuffleAllEntrances();
+    void ParseJson(nlohmann::json spoilerFileJson);
+  private:
+    std::vector<Entrance*> AssumeEntrancePool(std::vector<Entrance*>& entrancePool);
+    bool ShuffleOneWayPriorityEntrances(std::map<std::string, PriorityEntrance>& oneWayPriorities,
+                                        EntrancePools oneWayEntrancePools, EntrancePools oneWayTargetEntrancePools,
+                                        int retryCount = 2);
+    bool PlaceOneWayPriorityEntrance(std::string priorityName, std::list<RandomizerRegion>& allowedRegions,
+                                     std::list<EntranceType>& allowedTypes, std::vector<EntrancePair>& rollbacks,
+                                     EntrancePools oneWayEntrancePools, EntrancePools oneWayTargetEntrancePools);
+    bool ReplaceEntrance(Entrance* entrance, Entrance* target, std::vector<EntrancePair>& rollbacks);
+    void ShuffleEntrancePool(std::vector<Entrance*>& entrancePool, std::vector<Entrance*>& targetEntrances,
+                             int retryCount = 20);
+    bool ShuffleEntrances(std::vector<Entrance*>& entrances, std::vector<Entrance*>& targetEntrances,
+                          std::vector<EntrancePair>& rollbacks);
+    bool PlaceOtherImpasHouseEntrance(std::vector<Entrance*> entrances, std::vector<Entrance*> targetEntrances,
+                                      std::vector<EntrancePair>& rollbacks);
+    bool mNoRandomEntrances;
+    int mTotalRandomizableEntrances = 0;
+    int mCurNumRandomizedEntrances = 0;
+    bool mEntranceShuffleFailure = false;
+};
+} // namespace Rando
+
+extern "C" {
+#endif
+  EntranceOverride* Randomizer_GetEntranceOverrides();
+#ifdef __cplusplus
+}
+#endif
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/hint.cpp b/soh/soh/Enhancements/randomizer/hint.cpp
index 31c8f67b4..a6af0afd6 100644
--- a/soh/soh/Enhancements/randomizer/hint.cpp
+++ b/soh/soh/Enhancements/randomizer/hint.cpp
@@ -1,7 +1,7 @@
 #include "hint.h"
 
 namespace Rando {
-Hint::Hint() {}
+Hint::Hint() : text(std::move(Text())) {}
 Hint::Hint(Text text_): text(std::move(text_)) {}
 Hint::Hint(Text text_, RandomizerCheck hintedLocation_, HintType hintType_, Text hintedRegion_)
     : text(std::move(text_)), hintedLocation(hintedLocation_), hintType(hintType_),
@@ -36,6 +36,10 @@ std::string Hint::GetHintedRegion() {
     return hintedRegion.GetEnglish();
 }
 
+const Text& Hint::GetHintedRegionText() {
+    return hintedRegion;
+};
+
 void Hint::ResetVariables() {
     hintedLocation = RC_UNKNOWN_CHECK;
     addedToPool = false;
diff --git a/soh/soh/Enhancements/randomizer/hint.h b/soh/soh/Enhancements/randomizer/hint.h
index bba5a0715..fe97611ce 100644
--- a/soh/soh/Enhancements/randomizer/hint.h
+++ b/soh/soh/Enhancements/randomizer/hint.h
@@ -15,16 +15,17 @@ class Hint {
     HintType GetHintType();
     void SetHintType (HintType type);
     std::string GetHintedRegion();
+    const Text& GetHintedRegionText();
     void SetHintedRegion (Text region);
     void ResetVariables();
     bool IsAddedToPool();
     void AddToPool();
 
     private:
-    Text text;
-    RandomizerCheck hintedLocation;
-    HintType hintType;
-    Text hintedRegion;
-    bool addedToPool;
+    Text text = Text();
+    RandomizerCheck hintedLocation = RC_UNKNOWN_CHECK;
+    HintType hintType = HINT_TYPE_STATIC;
+    Text hintedRegion = Text();
+    bool addedToPool = false;
 };
 }
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/item.cpp b/soh/soh/Enhancements/randomizer/item.cpp
index 879a7324d..7fcb48d65 100644
--- a/soh/soh/Enhancements/randomizer/item.cpp
+++ b/soh/soh/Enhancements/randomizer/item.cpp
@@ -83,29 +83,6 @@ void Item::UndoEffect() {
     Logic::UpdateHelpers();
 }
 
-Rando::ItemOverride_Value Item::Value() const {
-    Rando::ItemOverride_Value val;
-
-    val.all = 0;
-    val.itemId = getItemId;
-    if (getItemId == RG_ICE_TRAP) {
-        val.looksLikeItemId = RandomElement(IceTrapModels);
-    }
-    if ((getItemId >= 0x95 && getItemId <= 0x9A)) { // Boss keys
-        val.looksLikeItemId = GI_KEY_BOSS;
-    }
-    if ((getItemId >= 0xAF && getItemId <= 0xB7)) { // Small keys
-        val.looksLikeItemId = GI_KEY_SMALL;
-    }
-    if (type == ITEMTYPE_SHOP) {
-        // With the current shopsanity implementation, we need a way to detect
-        // regular shop items. This method should have no unintended side effects
-        // unless there was a multiworld with 256 players... so, it should be fine.
-        val.player = 0xFF;
-    }
-    return val;
-}
-
 const Text& Item::GetName() const {
     return name;
 }
@@ -286,7 +263,7 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const {
     return Rando::StaticData::RetrieveItem(actual).GetGIEntry();
 }
 
-GetItemEntry Item::GetGIEntry_Copy() {
+GetItemEntry Item::GetGIEntry_Copy() const {
     return *GetGIEntry();
 }
 
@@ -313,9 +290,9 @@ bool Item::IsBottleItem() const {
 }
 
 bool Item::IsMajorItem() const {
-    using namespace Settings;
+    auto ctx = Rando::Context::GetInstance();
     if (type == ITEMTYPE_TOKEN) {
-        return Bridge.Is(RAINBOWBRIDGE_TOKENS) || LACSCondition == LACSCONDITION_TOKENS;
+        return ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_TOKENS) || ctx->GetSettings()->LACSCondition() == RO_LACS_TOKENS;
     }
 
     if (type == ITEMTYPE_DROP || type == ITEMTYPE_EVENT || type == ITEMTYPE_SHOP || type == ITEMTYPE_MAP ||
@@ -323,12 +300,12 @@ bool Item::IsMajorItem() const {
         return false;
     }
 
-    if (type == ITEMTYPE_DUNGEONREWARD && (ShuffleRewards.Is(REWARDSHUFFLE_END_OF_DUNGEON))) {
+    if (type == ITEMTYPE_DUNGEONREWARD && (ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_END_OF_DUNGEON))) {
         return false;
     }
 
     if ((randomizerGet == RG_BOMBCHU_5 || randomizerGet == RG_BOMBCHU_10 || randomizerGet == RG_BOMBCHU_20) &&
-        !BombchusInLogic) {
+        !ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC)) {
         return false;
     }
 
@@ -337,25 +314,25 @@ bool Item::IsMajorItem() const {
         return false;
     }
 
-    if (type == ITEMTYPE_SMALLKEY && (Keysanity.Is(KEYSANITY_VANILLA) || Keysanity.Is(KEYSANITY_OWN_DUNGEON))) {
+    if (type == ITEMTYPE_SMALLKEY && (ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_VANILLA) || ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_OWN_DUNGEON))) {
         return false;
     }
 
-    if (type == ITEMTYPE_FORTRESS_SMALLKEY && GerudoKeys.Is(GERUDOKEYS_VANILLA)) {
+    if (type == ITEMTYPE_FORTRESS_SMALLKEY && ctx->GetOption(RSK_GERUDO_KEYS).Is(RO_GERUDO_KEYS_VANILLA)) {
         return false;
     }
 
     if ((type == ITEMTYPE_BOSSKEY && getItemId != 0xAD) &&
-        (BossKeysanity.Is(BOSSKEYSANITY_VANILLA) || BossKeysanity.Is(BOSSKEYSANITY_OWN_DUNGEON))) {
+        (ctx->GetOption(RSK_BOSS_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_VANILLA) || ctx->GetOption(RSK_BOSS_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_OWN_DUNGEON))) {
         return false;
     }
     // Ganons Castle Boss Key
-    if (getItemId == 0xAD && (GanonsBossKey.Is(GANONSBOSSKEY_VANILLA) || GanonsBossKey.Is(GANONSBOSSKEY_OWN_DUNGEON))) {
+    if (getItemId == 0xAD && (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_VANILLA) || ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_OWN_DUNGEON))) {
         return false;
     }
 
     if (randomizerGet == RG_GREG_RUPEE) {
-        return Bridge.Is(RAINBOWBRIDGE_GREG);
+        return ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_GREG);
     }
 
     return IsAdvancement();
diff --git a/soh/soh/Enhancements/randomizer/item.h b/soh/soh/Enhancements/randomizer/item.h
index 5fd67760d..3a8d9dd65 100644
--- a/soh/soh/Enhancements/randomizer/item.h
+++ b/soh/soh/Enhancements/randomizer/item.h
@@ -5,15 +5,10 @@
 #include <memory>
 
 #include "3drando/text.hpp"
-#include "3drando/settings.hpp"
 #include "3drando/hint_list.hpp"
 #include "randomizerTypes.h"
 #include "soh/Enhancements/item-tables/ItemTableTypes.h"
 
-namespace Rando {
-union ItemOverride_Value;
-}
-
 enum ItemType {
     ITEMTYPE_ITEM,
     ITEMTYPE_MAP,
@@ -51,7 +46,6 @@ class Item {
     void ApplyEffect();
     void UndoEffect();
 
-    Rando::ItemOverride_Value Value() const;
     
     const Text& GetName() const;
     bool IsAdvancement() const;
@@ -60,7 +54,7 @@ class Item {
     RandomizerGet GetRandomizerGet();
     uint16_t GetPrice() const;
     std::shared_ptr<GetItemEntry> GetGIEntry() const;
-    GetItemEntry GetGIEntry_Copy();
+    GetItemEntry GetGIEntry_Copy() const;
     void SetPrice(uint16_t price_);
     void SetAsPlaythrough();
     void SetCustomDrawFunc(CustomDrawFunc);
diff --git a/soh/soh/Enhancements/randomizer/item_list.cpp b/soh/soh/Enhancements/randomizer/item_list.cpp
index d5a5b9669..c7df99e04 100644
--- a/soh/soh/Enhancements/randomizer/item_list.cpp
+++ b/soh/soh/Enhancements/randomizer/item_list.cpp
@@ -145,7 +145,7 @@ void Rando::StaticData::InitItemTable() {
     itemTable[RG_GERUDO_FORTRESS_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
     itemTable[RG_GANONS_CASTLE_SMALL_KEY] =             Item(RG_GANONS_CASTLE_SMALL_KEY,          Text{ "Ganon's Castle Small Key", "Petite Clé du Château de Ganon", "Ganons Schloss Kleiner Schlüssel" },         ITEMTYPE_SMALLKEY,          0xB7,               true,  &Logic::GanonsCastleKeys,    RHT_GANONS_CASTLE_SMALL_KEY,RG_GANONS_CASTLE_SMALL_KEY,     OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_GANONS_CASTLE_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
-    itemTable[RG_TREASURE_GAME_SMALL_KEY] =             Item(RG_TREASURE_GAME_SMALL_KEY,          Text{ "Chest Game Small Key", "Petite Clé du jeu la Chasse-aux-Trésors", "Truhenspiel Kleiner Schlüssel" },       ITEMTYPE_SMALLKEY,          0xDE,               true,  &Logic::TreasureGameKeys,    RHT_TREASURE_GAME_SMALL_KEY,RG_TREASURE_GAME_SMALL_KEY,     OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_TREASURE_GAME_SMALL_KEY] =             Item(RG_TREASURE_GAME_SMALL_KEY,          Text{ "Chest Game Small Key", "Petite Clé du jeu la Chasse-aux-Trésors", "Truhenspiel Kleiner Schlüssel" },       ITEMTYPE_SMALLKEY,          GI_DOOR_KEY,        true,  &Logic::TreasureGameKeys,    RHT_TREASURE_GAME_SMALL_KEY,ITEM_KEY_SMALL,                 OBJECT_GI_KEY,          GID_KEY_SMALL,      0xF3,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_NONE);
     // Key Rings
     itemTable[RG_FOREST_TEMPLE_KEY_RING] =              Item(RG_FOREST_TEMPLE_KEY_RING,           Text{ "Forest Temple Key Ring", "Trousseau du Temple de la Forêt", "Waldtempel Schlüsselanhänger" },              ITEMTYPE_SMALLKEY,          0xD5,               true,  &Logic::ForestTempleKeys,    RHT_FOREST_TEMPLE_KEY_RING, RG_FOREST_TEMPLE_KEY_RING,      OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_FOREST_TEMPLE_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
diff --git a/soh/soh/Enhancements/randomizer/item_location.cpp b/soh/soh/Enhancements/randomizer/item_location.cpp
index 62016b282..388378d3b 100644
--- a/soh/soh/Enhancements/randomizer/item_location.cpp
+++ b/soh/soh/Enhancements/randomizer/item_location.cpp
@@ -1,4 +1,5 @@
 #include "item_location.h"
+#include "context.h"
 
 namespace Rando {
 ItemLocation::ItemLocation(RandomizerCheck rc_) : rc(rc_) {}
@@ -23,6 +24,10 @@ const Item& ItemLocation::GetPlacedItem() const {
     return Rando::StaticData::RetrieveItem(placedItem);
 }
 
+RandomizerGet& ItemLocation::RefPlacedItem() {
+    return placedItem;
+}
+
 const Text& ItemLocation::GetPlacedItemName() const {
     return Rando::StaticData::RetrieveItem(placedItem).GetName();
 }
@@ -69,28 +74,19 @@ uint16_t ItemLocation::GetPrice() const {
 }
 
 void ItemLocation::SetPrice(uint16_t price_) {
-    if (hasShopsanityPrice || hasScrubsanityPrice) {
+    if (hasCustomPrice) {
         return;
     }
     price = price_;
 }
 
-bool ItemLocation::HasShopsanityPrice() const {
-    return hasShopsanityPrice;
+bool ItemLocation::HasCustomPrice() const {
+    return hasCustomPrice;
 }
 
-void ItemLocation::SetShopsanityPrice(uint16_t price_) {
+void ItemLocation::SetCustomPrice(uint16_t price_) {
     price = price_;
-    hasShopsanityPrice = true;
-}
-
-bool ItemLocation::HasScrubsanityPrice() const {
-    return hasScrubsanityPrice;
-}
-
-void ItemLocation::SetScrubsanityPrice(uint16_t price_) {
-    price = price_;
-    hasScrubsanityPrice = true;
+    hasCustomPrice = true;
 }
 
 bool ItemLocation::IsHintable() const {
@@ -129,31 +125,31 @@ bool ItemLocation::IsExcluded() const {
     return excludedOption.Value<bool>();
 }
 
-Option* ItemLocation::GetExcludedOption() {
+Rando::Option* ItemLocation::GetExcludedOption() {
     return &excludedOption;
 }
 
 void ItemLocation::AddExcludeOption() {
     const std::string name = StaticData::GetLocation(rc)->GetName();
     if (name.length() < 23) {
-        excludedOption = Option::Bool(name, {"Include", "Exclude"});
+        excludedOption = Rando::Option::Bool(name, {"Include", "Exclude"});
     } else {
         size_t lastSpace = name.rfind(' ', 23);
         std::string settingText = name;
         settingText.replace(lastSpace, 1, "\n ");
 
-        excludedOption = Option::Bool(settingText, {"Include", "Exclude"});
+        excludedOption = Rando::Option::Bool(settingText, {"Include", "Exclude"});
     }
     // RANDOTODO: this without string compares and loops
     bool alreadyAdded = false;
     Rando::Location* loc = StaticData::GetLocation(rc);
-    for (const Option* location : Settings::excludeLocationsOptionsVector[loc->GetCollectionCheckGroup()]) {
+    for (const Rando::Option* location : Rando::Context::GetInstance()->GetSettings()->GetExcludeOptionsForGroup(loc->GetCollectionCheckGroup())) {
         if (location->GetName() == excludedOption.GetName()) {
             alreadyAdded = true;
         }
     }
     if (!alreadyAdded) {
-        Settings::excludeLocationsOptionsVector[loc->GetCollectionCheckGroup()].push_back(&excludedOption);
+        Rando::Context::GetInstance()->GetSettings()->GetExcludeOptionsForGroup(loc->GetCollectionCheckGroup()).push_back(&excludedOption);
     }
 }
 
@@ -165,15 +161,6 @@ void ItemLocation::SetVisible(bool visibleInImGui_) {
 
 }
 
-ItemOverride_Key ItemLocation::Key() const {
-    ItemOverride_Key key;
-    key.all = 0;
-
-    key.scene = Rando::StaticData::GetLocation(rc)->GetScene();
-    key.type = static_cast<uint8_t>(StaticData::GetLocation(rc)->GetLocationType()); // TODO make sure these match up
-    return key;
-}
-
 void ItemLocation::ResetVariables() {
     addedToPool = false;
     placedItem = RG_NONE;
@@ -182,8 +169,7 @@ void ItemLocation::ResetVariables() {
     hintedAt = false;
     hintedBy = RH_NONE;
     price = 0;
-    hasShopsanityPrice = false;
-    hasScrubsanityPrice = false;
+    hasCustomPrice = false;
     hidden = false;
 }
 }
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/item_location.h b/soh/soh/Enhancements/randomizer/item_location.h
index 5b1c0dba7..bb07f67d6 100644
--- a/soh/soh/Enhancements/randomizer/item_location.h
+++ b/soh/soh/Enhancements/randomizer/item_location.h
@@ -1,51 +1,11 @@
 #pragma once
 
 #include "randomizerTypes.h"
-#include "item.h"
 #include "3drando/text.hpp"
 #include "static_data.h"
+#include "settings.h"
 
 namespace Rando {
-enum ItemOverride_Type {
-    OVR_BASE_ITEM = 0,
-    OVR_CHEST = 1,
-    OVR_COLLECTABLE = 2,
-    OVR_SKULL = 3,
-    OVR_GROTTO_SCRUB = 4,
-    OVR_DELAYED = 5,
-    OVR_TEMPLE = 6,
-};
-
-typedef union ItemOverride_Key {
-    uint32_t all;
-    struct {
-        char pad_;
-        uint8_t scene;
-        uint8_t type;
-    };
-} ItemOverride_Key;
-
-typedef union ItemOverride_Value {
-    uint32_t all;
-    struct {
-        uint16_t itemId;
-        uint8_t player;
-        uint8_t looksLikeItemId;
-    };
-} ItemOverride_Value;
-
-typedef struct ItemOverride {
-    ItemOverride_Key key;
-    ItemOverride_Value value;
-} ItemOverride;
-
-class ItemOverride_Compare {
-  public:
-    bool operator()(ItemOverride lhs, ItemOverride rhs) const {
-        return lhs.key.all < rhs.key.all;
-    }
-};
-
 class ItemLocation {
   public:
     ItemLocation() = default;
@@ -58,6 +18,7 @@ class ItemLocation {
     const Text& GetPlacedItemName() const;
     RandomizerGet GetPlacedRandomizerGet() const;
     void SetPlacedItem(const RandomizerGet item);
+    RandomizerGet& RefPlacedItem();
     void SetDelayedItem(const RandomizerGet item);
     RandomizerRegion GetParentRegionKey() const;
     void SetParentRegion (RandomizerRegion region);
@@ -66,10 +27,8 @@ class ItemLocation {
     void SaveDelayedItem();
     uint16_t GetPrice() const;
     void SetPrice(uint16_t price_);
-    bool HasShopsanityPrice() const;
-    void SetShopsanityPrice(uint16_t price_);
-    bool HasScrubsanityPrice() const;
-    void SetScrubsanityPrice(uint16_t price_);
+    bool HasCustomPrice() const;
+    void SetCustomPrice(uint16_t price_);
     bool IsHintable() const;
     void SetAsHintable();
     bool IsHintedAt() const;
@@ -83,7 +42,6 @@ class ItemLocation {
     void SetHidden(const bool hidden_);
     bool IsVisible() const;
     void SetVisible(bool visibleInImGui_);
-    Rando::ItemOverride_Key Key() const;
     void ResetVariables();
 
   private:
@@ -97,8 +55,7 @@ class ItemLocation {
     Option excludedOption = Option::Bool(StaticData::GetLocation(rc)->GetName(), {"Include", "Exclude"});
     uint16_t price = 0;
     RandomizerRegion parentRegion = RR_NONE;
-    bool hasShopsanityPrice = false;
-    bool hasScrubsanityPrice = false;
+    bool hasCustomPrice = false;
     bool hidden = false;
     bool visibleInImGui = false;
 };
diff --git a/soh/soh/Enhancements/randomizer/item_override.cpp b/soh/soh/Enhancements/randomizer/item_override.cpp
new file mode 100644
index 000000000..b9ef2fd78
--- /dev/null
+++ b/soh/soh/Enhancements/randomizer/item_override.cpp
@@ -0,0 +1,30 @@
+#include "item_override.h"
+
+namespace Rando {
+ItemOverride::ItemOverride(RandomizerCheck location_, RandomizerGet looksLike_)
+    : location(location_), looksLike(looksLike_) {};
+
+RandomizerCheck ItemOverride::GetLocation() const {
+    return location;
+}
+
+void ItemOverride::SetLocation(RandomizerCheck location_) {
+    location = location_;
+}
+
+RandomizerGet ItemOverride::LooksLike() const {
+    return looksLike;
+}
+
+RandomizerGet& ItemOverride::RefLooksLike() {
+    return looksLike;
+}
+
+Text& ItemOverride::GetTrickName() {
+    return trickName;
+}
+
+void ItemOverride::SetTrickName(Text trickName_) {
+    trickName = trickName_;
+}
+} // namespace Rando
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/item_override.h b/soh/soh/Enhancements/randomizer/item_override.h
new file mode 100644
index 000000000..c073d9e2f
--- /dev/null
+++ b/soh/soh/Enhancements/randomizer/item_override.h
@@ -0,0 +1,23 @@
+#pragma once
+
+#include "randomizerTypes.h"
+#include "3drando/text.hpp"
+
+namespace Rando {
+/// @brief Class representing overrides of individual items. Used for trick names and models for ice traps.
+class ItemOverride {
+  public:
+    ItemOverride() = default;
+    ItemOverride(RandomizerCheck location_, RandomizerGet looksLike_);
+    RandomizerCheck GetLocation() const;
+    void SetLocation(RandomizerCheck);
+    RandomizerGet LooksLike() const;
+    RandomizerGet& RefLooksLike();
+    Text& GetTrickName();
+    void SetTrickName (Text trickName);
+  private:
+    RandomizerCheck location;
+    RandomizerGet looksLike;
+    Text trickName;
+};
+} // namespace Rando
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/location.cpp b/soh/soh/Enhancements/randomizer/location.cpp
index f8ef0cd7f..3f518ae43 100644
--- a/soh/soh/Enhancements/randomizer/location.cpp
+++ b/soh/soh/Enhancements/randomizer/location.cpp
@@ -1,5 +1,6 @@
 #include "location.h"
 #include "3drando/hint_list.hpp"
+#include <algorithm>
 
 RandomizerCheck Rando::Location::GetRandomizerCheck() const {
     return rc;
diff --git a/soh/soh/Enhancements/randomizer/option.cpp b/soh/soh/Enhancements/randomizer/option.cpp
new file mode 100644
index 000000000..fb20fe086
--- /dev/null
+++ b/soh/soh/Enhancements/randomizer/option.cpp
@@ -0,0 +1,144 @@
+#include "option.h"
+
+namespace Rando {
+Option Option::Bool(std::string name_, std::vector<std::string> options_, OptionCategory category_,
+                    uint8_t defaultOption_, bool defaultHidden_) {
+    return Option(false, std::move(name_), std::move(options_), category_, defaultOption_, defaultHidden_);
+}
+
+Option Option::U8(std::string name_, std::vector<std::string> options_, OptionCategory category_,
+                  uint8_t defaultOption_, bool defaultHidden_) {
+    return Option(uint8_t(0), std::move(name_), std::move(options_), category_, defaultOption_, defaultHidden_);
+}
+
+Option Option::LogicTrick(std::string name_) {
+    return Option(false, std::move(name_), { "Disabled", "Enabled" }, OptionCategory::Setting, 0, 0);
+}
+
+Option::operator bool() const {
+    if (std::holds_alternative<bool>(var)) {
+        return Value<bool>();
+    } else {
+        return Value<uint8_t>() != 0;
+    }
+}
+
+size_t Option::GetOptionCount() const {
+    return options.size();
+}
+
+const std::string& Option::GetName() const {
+    return name;
+}
+
+uint8_t Option::GetSelectedOptionIndex() const {
+    return selectedOption;
+}
+
+const std::string& Option::GetSelectedOptionText() const {
+    return options[selectedOption];
+}
+
+void Option::SetVariable() {
+    if (std::holds_alternative<bool>(var)) {
+        var.emplace<bool>(selectedOption != 0);
+    } else {
+        var.emplace<uint8_t>(selectedOption);
+    }
+}
+
+void Option::SetDelayedOption() {
+    delayedOption = selectedOption;
+}
+
+void Option::RestoreDelayedOption() {
+    selectedOption = delayedOption;
+    SetVariable();
+}
+
+void Option::SetSelectedIndex(size_t idx) {
+    selectedOption = idx;
+    if (selectedOption >= options.size()) {
+        selectedOption = 0;
+    }
+    SetVariable();
+}
+
+void Option::Hide() {
+    hidden = true;
+}
+
+void Option::Unhide() {
+    hidden = false;
+}
+
+bool Option::IsHidden() const {
+    return hidden;
+}
+
+bool Option::IsCategory(OptionCategory category) const {
+    return category == this->category;
+}
+
+Option::Option(uint8_t var_, std::string name_, std::vector<std::string> options_, OptionCategory category_,
+               uint8_t defaultOption_, bool defaultHidden_)
+    : var(var_), name(std::move(name_)), options(std::move(options_)), category(category_),
+      defaultOption(defaultOption_), defaultHidden(defaultHidden_) {
+    selectedOption = defaultOption;
+    hidden = defaultHidden;
+    SetVariable();
+}
+Option::Option(bool var_, std::string name_, std::vector<std::string> options_, OptionCategory category_,
+               uint8_t defaultOption_, bool defaultHidden_)
+    : var(var_), name(std::move(name_)), options(std::move(options_)), category(category_),
+      defaultOption(defaultOption_), defaultHidden(defaultHidden_) {
+    selectedOption = defaultOption;
+    hidden = defaultHidden;
+    SetVariable();
+}
+
+OptionGroup::OptionGroup(std::string name, std::vector<Option*> options, OptionGroupType groupType, bool printInSpoiler,
+                         OptionGroupType containsType)
+    : mName(std::move(name)), mOptions(std::move(options)), mGroupType(groupType), mPrintInSpoiler(printInSpoiler),
+      mContainsType(containsType) {
+}
+
+OptionGroup::OptionGroup(std::string name, std::vector<OptionGroup*> subGroups, OptionGroupType groupType,
+                         bool printInSpoiler, OptionGroupType containsType)
+    : mName(std::move(name)), mSubGroups(std::move(subGroups)), mGroupType(groupType), mPrintInSpoiler(printInSpoiler),
+      mContainsType(containsType) {
+}
+
+OptionGroup OptionGroup::SubGroup(std::string name, std::vector<Option*> options, bool printInSpoiler) {
+    return OptionGroup(std::move(name), std::move(options), OptionGroupType::SUBGROUP, printInSpoiler);
+}
+
+OptionGroup OptionGroup::SubGroup(std::string name, std::vector<OptionGroup*> subGroups, bool printInSpoiler) {
+    return OptionGroup(std::move(name), std::move(subGroups), OptionGroupType::SUBGROUP, printInSpoiler,
+                       OptionGroupType::SUBGROUP);
+}
+
+const std::string& OptionGroup::GetName() const {
+    return mName;
+}
+
+const std::vector<Option*>& OptionGroup::GetOptions() const {
+    return mOptions;
+}
+
+const std::vector<OptionGroup*>& OptionGroup::GetSubGroups() const {
+    return mSubGroups;
+}
+
+bool OptionGroup::PrintInSpoiler() const {
+    return mPrintInSpoiler;
+}
+
+OptionGroupType OptionGroup::GetGroupType() const {
+    return mGroupType;
+}
+
+OptionGroupType OptionGroup::GetContainsType() const {
+    return mContainsType;
+}
+} // namespace Rando
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/option.h b/soh/soh/Enhancements/randomizer/option.h
new file mode 100644
index 000000000..a610282b6
--- /dev/null
+++ b/soh/soh/Enhancements/randomizer/option.h
@@ -0,0 +1,100 @@
+#pragma once
+
+#include <stdint.h>
+#include <string>
+#include <vector>
+#include <variant>
+#include <type_traits>
+
+namespace Rando {
+enum class OptionCategory {
+    Setting,
+    Toggle,
+};
+
+class Option {
+  public:
+    Option() = default;
+    static Option Bool(std::string name_, std::vector<std::string> options_ = { "Off", "On" },
+                       OptionCategory category_ = OptionCategory::Setting, uint8_t defaultOption_ = 0,
+                       bool defaultHidden_ = false);
+    static Option U8(std::string name_, std::vector<std::string> options_,
+                     OptionCategory category_ = OptionCategory::Setting, uint8_t defaultOption = 0,
+                     bool defaultHidden = false);
+    static Option LogicTrick(std::string name_);
+
+    template <typename T> T Value() const {
+        return std::get<T>(var);
+    }
+
+    template <typename T> bool Is(T other) const {
+        static_assert(std::is_integral_v<T> || std::is_enum_v<T>, "T must be an integral type or an enum.");
+        if constexpr ((std::is_integral_v<T> && !std::is_same_v<bool, T>) || std::is_enum_v<T>) {
+            return Value<uint8_t>() == static_cast<uint8_t>(other);
+        } else {
+            return Value<bool>() == static_cast<bool>(other);
+        }
+    }
+
+    template <typename T> bool IsNot(T other) const {
+        return !Is(other);
+    }
+
+    explicit operator bool() const;
+    size_t GetOptionCount() const;
+    const std::string& GetName() const;
+    const std::string& GetSelectedOptionText() const;
+    uint8_t GetSelectedOptionIndex() const;
+    void SetVariable();
+    void SetDelayedOption();
+    void RestoreDelayedOption();
+    void SetSelectedIndex(size_t idx);
+    void Hide();
+    void Unhide();
+    bool IsHidden() const;
+    bool IsCategory(OptionCategory category) const;
+
+  private:
+    Option(uint8_t var_, std::string name_, std::vector<std::string> options_, OptionCategory category_,
+           uint8_t defaultOption_, bool defaultHidden_);
+    Option(bool var_, std::string name_, std::vector<std::string> options_, OptionCategory category_,
+           uint8_t defaultOption_, bool defaultHidden_);
+    std::variant<bool, uint8_t> var;
+    std::string name;
+    std::vector<std::string> options;
+    uint8_t selectedOption = 0;
+    uint8_t delayedOption = 0;
+    bool hidden = false;
+    OptionCategory category;
+    uint8_t defaultOption = false;
+    bool defaultHidden = false;
+};
+
+enum class OptionGroupType {
+    DEFAULT,
+    SUBGROUP,
+};
+
+class OptionGroup {
+  public:
+    OptionGroup() = default;
+    OptionGroup(std::string name, std::vector<Option*> options, OptionGroupType groupType = OptionGroupType::DEFAULT, bool printInSpoiler = true, OptionGroupType containsType = OptionGroupType::DEFAULT);
+    OptionGroup(std::string name, std::vector<OptionGroup*> subGroups, OptionGroupType groupType = OptionGroupType::DEFAULT, bool printInSpoiler = true, OptionGroupType containsType = OptionGroupType::SUBGROUP);
+    static OptionGroup SubGroup(std::string name, std::vector<Option*> options, bool printInSpoiler = true);
+    static OptionGroup SubGroup(std::string name, std::vector<OptionGroup*> subGroups, bool printInSpoiler = true);
+    const std::string& GetName() const;
+    const std::vector<Option*>& GetOptions() const;
+    const std::vector<OptionGroup*>& GetSubGroups() const;
+    bool PrintInSpoiler() const;
+    OptionGroupType GetGroupType() const;
+    OptionGroupType GetContainsType() const;
+
+  private:
+    std::string mName;
+    std::vector<Option*> mOptions;
+    std::vector<OptionGroup*> mSubGroups;
+    OptionGroupType mGroupType = OptionGroupType::DEFAULT;
+    bool mPrintInSpoiler;
+    OptionGroupType mContainsType = OptionGroupType::DEFAULT;
+};
+} // namespace Rando
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/rando_hash.h b/soh/soh/Enhancements/randomizer/rando_hash.h
index 12d9a13a9..76c3ce0a3 100644
--- a/soh/soh/Enhancements/randomizer/rando_hash.h
+++ b/soh/soh/Enhancements/randomizer/rando_hash.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#ifndef RANDOHASH_H
+#define RANDOHASH_H
+
 #include "randomizerTypes.h"
 #include <array>
 #include "variables.h"
@@ -108,4 +111,5 @@ std::array<Sprite, 100> gSeedTextures = { {
     { dgQuestIconSmallKeyTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, 97 },
     { dgQuestIconMagicJarSmallTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, 98 },
     { dgQuestIconMagicJarBigTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, 99 },
-} };
\ No newline at end of file
+} };
+#endif
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index c82086750..3ca43436c 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -1,6 +1,5 @@
 #include "randomizer.h"
 #include <nlohmann/json.hpp>
-#include "3drando/settings.hpp"
 #include <fstream>
 #include <variables.h>
 #include <macros.h>
@@ -25,12 +24,14 @@
 #include <tuple>
 #include <functional>
 #include "draw.h"
-#include "rando_hash.h"
 #include "static_data.h"
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include <boost_custom/container_hash/hash_32.hpp>
 #include "randomizer_settings_window.h"
 #include "savefile.h"
+#include "entrance.h"
+#include "dungeon.h"
+#include "trial.h"
 #include "soh/util.h"
 
 extern "C" uint32_t ResourceMgr_IsGameMasterQuest();
@@ -48,6 +49,7 @@ std::unordered_map<std::string, RandomizerCheckArea> SpoilerfileAreaNameToEnum;
 std::unordered_map<std::string, HintType> SpoilerfileHintTypeNameToEnum;
 std::multimap<std::tuple<s16, s16, s32>, RandomizerCheck> checkFromActorMultimap;
 std::set<RandomizerCheck> excludedLocations;
+std::set<RandomizerCheck> spoilerExcludedLocations;
 std::set<RandomizerTrick> enabledTricks;
 std::set<RandomizerTrick> enabledGlitches;
 
@@ -154,14 +156,7 @@ Randomizer::Randomizer() {
     }
 }
 
-Sprite* Randomizer::GetSeedTexture(uint8_t index) {
-    return &gSeedTextures[index];
-}
-
 Randomizer::~Randomizer() { 
-    this->randoSettings.clear();
-    this->itemLocations.clear();
-    this->merchantPrices.clear();
 }
 
 std::unordered_map<std::string, RandomizerInf> spoilerFileTrialToEnum = {
@@ -236,145 +231,6 @@ std::unordered_map<s16, s16> getItemIdToItemId = {
     { GI_CLAIM_CHECK, ITEM_CLAIM_CHECK } 
 };
 
-std::unordered_map<std::string, RandomizerSettingKey> SpoilerfileSettingNameToEnum = {
-    { "Detailed Logic Settings:Logic", RSK_LOGIC_RULES },
-    { "Detailed Logic Settings:Night GSs Expect Sun's", RSK_SKULLS_SUNS_SONG },
-    { "Detailed Logic Settings:All Locations Reachable", RSK_ALL_LOCATIONS_REACHABLE },
-    { "Item Pool Settings:Item Pool", RSK_ITEM_POOL },
-    { "Item Pool Settings:Ice Traps", RSK_ICE_TRAPS },
-    { "Open Settings:Forest", RSK_FOREST },
-    { "Open Settings:Kakariko Gate", RSK_KAK_GATE },
-    { "Open Settings:Door of Time", RSK_DOOR_OF_TIME },
-    { "Open Settings:Zora's Fountain", RSK_ZORAS_FOUNTAIN },
-    { "Open Settings:Gerudo Fortress", RSK_GERUDO_FORTRESS },
-    { "Open Settings:Rainbow Bridge", RSK_RAINBOW_BRIDGE },
-    { "Open Settings:Trial Count", RSK_TRIAL_COUNT },
-    { "Open Settings:Stone Count", RSK_RAINBOW_BRIDGE_STONE_COUNT },
-    { "Open Settings:Medallion Count", RSK_RAINBOW_BRIDGE_MEDALLION_COUNT },
-    { "Open Settings:Reward Count", RSK_RAINBOW_BRIDGE_REWARD_COUNT },
-    { "Open Settings:Dungeon Count", RSK_RAINBOW_BRIDGE_DUNGEON_COUNT },
-    { "Open Settings:Token Count", RSK_RAINBOW_BRIDGE_TOKEN_COUNT },
-    { "Open Settings:Bridge Reward Options", RSK_BRIDGE_OPTIONS },
-    { "Shuffle Settings:Shuffle Dungeon Rewards", RSK_SHUFFLE_DUNGEON_REWARDS },
-    { "Shuffle Settings:Link's Pocket", RSK_LINKS_POCKET},
-    { "Shuffle Settings:Shuffle Songs", RSK_SHUFFLE_SONGS },
-    { "Shuffle Settings:Shuffle Gerudo Card", RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD },
-    { "Shuffle Settings:Shopsanity", RSK_SHOPSANITY },
-    { "Shuffle Settings:Shopsanity Prices", RSK_SHOPSANITY_PRICES },
-    { "Shuffle Settings:Affordable Prices", RSK_SHOPSANITY_PRICES_AFFORDABLE },
-    { "Shuffle Settings:Scrub Shuffle", RSK_SHUFFLE_SCRUBS },
-    { "Shuffle Settings:Shuffle Cows", RSK_SHUFFLE_COWS },
-    { "Shuffle Settings:Tokensanity", RSK_SHUFFLE_TOKENS },
-    { "Shuffle Settings:Shuffle Ocarinas", RSK_SHUFFLE_OCARINA },
-    { "Shuffle Settings:Shuffle Adult Trade", RSK_SHUFFLE_ADULT_TRADE },
-    { "Shuffle Settings:Shuffle Magic Beans", RSK_SHUFFLE_MAGIC_BEANS },
-    { "Shuffle Settings:Shuffle Kokiri Sword", RSK_SHUFFLE_KOKIRI_SWORD },
-    { "Shuffle Settings:Shuffle Master Sword", RSK_SHUFFLE_MASTER_SWORD },
-    { "Shuffle Settings:Shuffle Weird Egg", RSK_SHUFFLE_WEIRD_EGG },
-    { "Shuffle Settings:Shuffle Frog Song Rupees", RSK_SHUFFLE_FROG_SONG_RUPEES },
-    { "Shuffle Settings:Shuffle Merchants", RSK_SHUFFLE_MERCHANTS },
-    { "Shuffle Settings:Shuffle 100 GS Reward", RSK_SHUFFLE_100_GS_REWARD },
-    { "Start with Deku Shield", RSK_STARTING_DEKU_SHIELD },
-    { "Start with Kokiri Sword", RSK_STARTING_KOKIRI_SWORD },
-    { "Start with Fairy Ocarina", RSK_STARTING_OCARINA },
-    { "Start with Zelda's Lullaby", RSK_STARTING_ZELDAS_LULLABY },
-    { "Start with Epona's Song", RSK_STARTING_EPONAS_SONG },
-    { "Start with Saria's Song", RSK_STARTING_SARIAS_SONG },
-    { "Start with Sun's Song", RSK_STARTING_SUNS_SONG },
-    { "Start with Song of Time", RSK_STARTING_SONG_OF_TIME },
-    { "Start with Song of Storms", RSK_STARTING_SONG_OF_STORMS },
-    { "Start with Minuet of Forest", RSK_STARTING_MINUET_OF_FOREST },
-    { "Start with Bolero of Fire", RSK_STARTING_BOLERO_OF_FIRE },
-    { "Start with Serenade of Water", RSK_STARTING_SERENADE_OF_WATER },
-    { "Start with Requiem of Spirit", RSK_STARTING_REQUIEM_OF_SPIRIT },
-    { "Start with Nocturne of Shadow", RSK_STARTING_NOCTURNE_OF_SHADOW },
-    { "Start with Prelude of Light", RSK_STARTING_PRELUDE_OF_LIGHT },
-    { "Shuffle Dungeon Items:Maps/Compasses", RSK_STARTING_MAPS_COMPASSES },
-    { "Shuffle Dungeon Items:Small Keys", RSK_KEYSANITY },
-    { "Shuffle Dungeon Items:Gerudo Fortress Keys", RSK_GERUDO_KEYS },
-    { "Shuffle Dungeon Items:Boss Keys", RSK_BOSS_KEYSANITY },
-    { "Shuffle Dungeon Items:Ganon's Boss Key", RSK_GANONS_BOSS_KEY },
-    { "Shuffle Dungeon Items:Stone Count", RSK_LACS_STONE_COUNT },
-    { "Shuffle Dungeon Items:Medallion Count", RSK_LACS_MEDALLION_COUNT },
-    { "Shuffle Dungeon Items:Reward Count", RSK_LACS_REWARD_COUNT },
-    { "Shuffle Dungeon Items:Dungeon Count", RSK_LACS_DUNGEON_COUNT },
-    { "Shuffle Dungeon Items:Token Count", RSK_LACS_TOKEN_COUNT },
-    { "Shuffle Dungeon Items:LACS Reward Options", RSK_LACS_OPTIONS },
-    { "Shuffle Dungeon Items:Key Rings", RSK_KEYRINGS },
-    { "Shuffle Dungeon Items:Keyring Dungeon Count", RSK_KEYRINGS_RANDOM_COUNT },
-    { "Shuffle Dungeon Items:Gerudo Fortress", RSK_KEYRINGS_GERUDO_FORTRESS },
-    { "Shuffle Dungeon Items:Forest Temple", RSK_KEYRINGS_FOREST_TEMPLE },
-    { "Shuffle Dungeon Items:Fire Temple", RSK_KEYRINGS_FIRE_TEMPLE },
-    { "Shuffle Dungeon Items:Water Temple", RSK_KEYRINGS_WATER_TEMPLE },
-    { "Shuffle Dungeon Items:Spirit Temple", RSK_KEYRINGS_SPIRIT_TEMPLE },
-    { "Shuffle Dungeon Items:Shadow Temple", RSK_KEYRINGS_SHADOW_TEMPLE },
-    { "Shuffle Dungeon Items:Bottom of the Well", RSK_KEYRINGS_BOTTOM_OF_THE_WELL },
-    { "Shuffle Dungeon Items:GTG", RSK_KEYRINGS_GTG },
-    { "Shuffle Dungeon Items:Ganon's Castle", RSK_KEYRINGS_GANONS_CASTLE },
-    { "World Settings:Starting Age", RSK_STARTING_AGE },
-    { "World Settings:Ammo Drops", RSK_ENABLE_BOMBCHU_DROPS },
-    { "World Settings:Bombchus in Logic", RSK_BOMBCHUS_IN_LOGIC },
-    { "World Settings:Shuffle Entrances", RSK_SHUFFLE_ENTRANCES },
-    { "World Settings:Dungeon Entrances", RSK_SHUFFLE_DUNGEON_ENTRANCES },
-    { "World Settings:Boss Entrances", RSK_SHUFFLE_BOSS_ENTRANCES },
-    { "World Settings:Overworld Entrances", RSK_SHUFFLE_OVERWORLD_ENTRANCES },
-    { "World Settings:Interior Entrances", RSK_SHUFFLE_INTERIOR_ENTRANCES },
-    { "World Settings:Grottos Entrances", RSK_SHUFFLE_GROTTO_ENTRANCES },
-    { "World Settings:Owl Drops", RSK_SHUFFLE_OWL_DROPS },
-    { "World Settings:Warp Songs", RSK_SHUFFLE_WARP_SONGS },
-    { "World Settings:Overworld Spawns", RSK_SHUFFLE_OVERWORLD_SPAWNS },
-    { "World Settings:Mixed Entrance Pools", RSK_MIXED_ENTRANCE_POOLS },
-    { "World Settings:Mix Dungeons", RSK_MIX_DUNGEON_ENTRANCES },
-    { "World Settings:Mix Overworld", RSK_MIX_OVERWORLD_ENTRANCES },
-    { "World Settings:Mix Interiors", RSK_MIX_INTERIOR_ENTRANCES },
-    { "World Settings:Mix Grottos", RSK_MIX_GROTTO_ENTRANCES },
-    { "World Settings:Decouple Entrances", RSK_DECOUPLED_ENTRANCES },
-    { "World Settings:Triforce Hunt", RSK_TRIFORCE_HUNT },
-    { "World Settings:Triforce Hunt Total Pieces", RSK_TRIFORCE_HUNT_PIECES_TOTAL },
-    { "World Settings:Triforce Hunt Required Pieces", RSK_TRIFORCE_HUNT_PIECES_REQUIRED },
-    { "Misc Settings:Gossip Stone Hints", RSK_GOSSIP_STONE_HINTS },
-    { "Misc Settings:Hint Clarity", RSK_HINT_CLARITY },
-    { "Misc Settings:ToT Altar Hint", RSK_TOT_ALTAR_HINT },
-    { "Misc Settings:Light Arrow Hint", RSK_LIGHT_ARROWS_HINT },
-    { "Misc Settings:Dampe's Diary Hint", RSK_DAMPES_DIARY_HINT },
-    { "Misc Settings:Greg the Rupee Hint", RSK_GREG_HINT },
-    { "Misc Settings:Saria's Hint", RSK_SARIA_HINT },
-    { "Misc Settings:Frog Ocarina Game Hint", RSK_FROGS_HINT },
-    { "Misc Settings:10 GS Hint", RSK_KAK_10_SKULLS_HINT },
-    { "Misc Settings:20 GS Hint", RSK_KAK_20_SKULLS_HINT },
-    { "Misc Settings:30 GS Hint", RSK_KAK_30_SKULLS_HINT },
-    { "Misc Settings:40 GS Hint", RSK_KAK_40_SKULLS_HINT },
-    { "Misc Settings:50 GS Hint", RSK_KAK_50_SKULLS_HINT },
-    { "Misc Settings:Warp Song Hints", RSK_WARP_SONG_HINTS },
-    { "Misc Settings:Scrub Hint Text", RSK_SCRUB_TEXT_HINT },
-    { "Misc Settings:Hint Distribution", RSK_HINT_DISTRIBUTION },
-    { "Misc Settings:Blue Fire Arrows", RSK_BLUE_FIRE_ARROWS },
-    { "Misc Settings:Sunlight Arrows", RSK_SUNLIGHT_ARROWS },
-    { "Skip Child Zelda", RSK_SKIP_CHILD_ZELDA },
-    { "Start with Consumables", RSK_STARTING_CONSUMABLES },
-    { "Start with Max Rupees", RSK_FULL_WALLETS },
-    { "Gold Skulltula Tokens", RSK_STARTING_SKULLTULA_TOKEN },
-    { "Timesaver Settings:Cuccos to return", RSK_CUCCO_COUNT },
-    { "Timesaver Settings:Big Poe Target Count", RSK_BIG_POE_COUNT },
-    { "Timesaver Settings:Skip Child Stealth", RSK_SKIP_CHILD_STEALTH },
-    { "Timesaver Settings:Skip Epona Race", RSK_SKIP_EPONA_RACE },
-    { "Timesaver Settings:Skip Tower Escape", RSK_SKIP_TOWER_ESCAPE },
-    { "Timesaver Settings:Complete Mask Quest", RSK_COMPLETE_MASK_QUEST },
-    { "Timesaver Settings:Skip Scarecrow's Song", RSK_SKIP_SCARECROWS_SONG },
-    { "Timesaver Settings:Enable Glitch-Useful Cutscenes", RSK_ENABLE_GLITCH_CUTSCENES },
-    { "World Settings:MQ Dungeons", RSK_RANDOM_MQ_DUNGEONS },
-    { "World Settings:MQ Dungeon Count", RSK_MQ_DUNGEON_COUNT },
-    { "Shuffle Dungeon Quest:Forest Temple", RSK_MQ_FOREST_TEMPLE },
-    { "Shuffle Dungeon Quest:Fire Temple", RSK_MQ_FIRE_TEMPLE },
-    { "Shuffle Dungeon Quest:Water Temple", RSK_MQ_WATER_TEMPLE },
-    { "Shuffle Dungeon Quest:Spirit Temple", RSK_MQ_SPIRIT_TEMPLE },
-    { "Shuffle Dungeon Quest:Shadow Temple", RSK_MQ_SHADOW_TEMPLE },
-    { "Shuffle Dungeon Quest:Bottom of the Well", RSK_MQ_BOTTOM_OF_THE_WELL },
-    { "Shuffle Dungeon Quest:Ice Cavern", RSK_MQ_ICE_CAVERN },
-    { "Shuffle Dungeon Quest:GTG", RSK_MQ_GTG },
-    { "Shuffle Dungeon Quest:Ganon's Castle", RSK_MQ_GANONS_CASTLE },
-};
-
 std::string sanitize(std::string stringValue) {
     // Add backslashes.
     for (auto i = stringValue.begin();;) {
@@ -421,36 +277,24 @@ void DrawTagChips(const std::vector<RandomizerTrickTag> &rtTags) {
     }
 }
 
-void Randomizer::LoadRandomizerSettings(const char* spoilerFileName) {
-    if (strcmp(spoilerFileName, "") != 0) {
-        ParseRandomizerSettingsFile(spoilerFileName);
-    }
-
-    for(auto& randoSetting : gSaveContext.randoSettings) {
-        this->randoSettings[randoSetting.key] = randoSetting.value;
-    }
-}
-
-void Randomizer::LoadHintLocations(const char* spoilerFileName) {
-    if (strcmp(spoilerFileName, "") != 0) {
-        ParseHintLocationsFile(spoilerFileName);
-    }
+void Randomizer::LoadHintMessages() {
+    auto ctx = Rando::Context::GetInstance();
 
     CustomMessageManager::Instance->ClearMessageTable(Randomizer::hintMessageTableID);
     CustomMessageManager::Instance->AddCustomMessageTable(Randomizer::hintMessageTableID);
 
     CustomMessageManager::Instance->CreateMessage(
         Randomizer::hintMessageTableID, TEXT_ALTAR_CHILD,
-        CustomMessage(gSaveContext.childAltarText, gSaveContext.childAltarText, gSaveContext.childAltarText, TEXTBOX_TYPE_BLUE));
+        CustomMessage(ctx->GetHint(RH_ALTAR_CHILD)->GetText().GetEnglish(), ctx->GetHint(RH_ALTAR_CHILD)->GetText().GetEnglish(), ctx->GetHint(RH_ALTAR_CHILD)->GetText().GetFrench(), TEXTBOX_TYPE_BLUE));
     CustomMessageManager::Instance->CreateMessage(
         Randomizer::hintMessageTableID, TEXT_ALTAR_ADULT,
-        CustomMessage(gSaveContext.adultAltarText, gSaveContext.adultAltarText, gSaveContext.adultAltarText, TEXTBOX_TYPE_BLUE));
+        CustomMessage(ctx->GetHint(RH_ALTAR_ADULT)->GetText().GetEnglish(), ctx->GetHint(RH_ALTAR_ADULT)->GetText().GetEnglish(), ctx->GetHint(RH_ALTAR_ADULT)->GetText().GetFrench(), TEXTBOX_TYPE_BLUE));
     CustomMessageManager::Instance->CreateMessage(
         Randomizer::hintMessageTableID, TEXT_GANONDORF,
-        CustomMessage(gSaveContext.ganonHintText, gSaveContext.ganonHintText, gSaveContext.ganonHintText));
+        CustomMessage(ctx->GetHint(RH_GANONDORF_HINT)->GetText().GetEnglish(), ctx->GetHint(RH_GANONDORF_HINT)->GetText().GetEnglish(), ctx->GetHint(RH_GANONDORF_HINT)->GetText().GetFrench()));
     CustomMessageManager::Instance->CreateMessage(
         Randomizer::hintMessageTableID, TEXT_GANONDORF_NOHINT,
-        CustomMessage(gSaveContext.ganonText, gSaveContext.ganonText, gSaveContext.ganonText));
+        CustomMessage(ctx->GetHint(RH_SARIA)->GetText().GetEnglish(), ctx->GetHint(RH_SARIA)->GetText().GetEnglish(), ctx->GetHint(RH_SARIA)->GetText().GetFrench()));
     CustomMessageManager::Instance->CreateMessage(
         Randomizer::hintMessageTableID, TEXT_SHEIK_NEED_HOOK,
         CustomMessage("{{message}}", "{{message}}", "{{message}}"));
@@ -459,21 +303,12 @@ void Randomizer::LoadHintLocations(const char* spoilerFileName) {
         CustomMessage("{{message}}", "{{message}}", "{{message}}"));
     CustomMessageManager::Instance->CreateMessage(
         Randomizer::hintMessageTableID, TEXT_SARIAS_SONG_FACE_TO_FACE,
-        CustomMessage(gSaveContext.sariaText, gSaveContext.sariaText, gSaveContext.sariaText, TEXTBOX_TYPE_BLUE));
+        CustomMessage(ctx->GetHint(RH_SARIA)->GetText().GetEnglish(), ctx->GetHint(RH_SARIA)->GetText().GetEnglish(), ctx->GetHint(RH_SARIA)->GetText().GetFrench(), TEXTBOX_TYPE_BLUE));
 
-
-    this->childAltarText = gSaveContext.childAltarText;
-    this->adultAltarText = gSaveContext.adultAltarText;
-    this->ganonHintText = gSaveContext.ganonHintText;
-    this->ganonText = gSaveContext.ganonText;
-    this->sheikText = gSaveContext.sheikText;
-    this->sariaText = gSaveContext.sariaText;
-
-    for (const auto& hintLocation : gSaveContext.hintLocations) {
-        if(hintLocation.check == RC_LINKS_POCKET) break;
-        this->hintLocations[hintLocation.check] = hintLocation.hintText;
+    for (int i : Rando::StaticData::gossipStoneLocations) {
+        RandomizerHintKey rhk = RandomizerHintKey(i - RC_COLOSSUS_GOSSIP_STONE + 1);
         CustomMessageManager::Instance->CreateMessage(
-            Randomizer::hintMessageTableID, hintLocation.check, CustomMessage(hintLocation.hintText, hintLocation.hintText, hintLocation.hintText));
+            Randomizer::hintMessageTableID, i, CustomMessage(ctx->GetHint(rhk)->GetText().GetEnglish(), ctx->GetHint(rhk)->GetText().GetEnglish(), ctx->GetHint(rhk)->GetText().GetFrench()));
     }
 
     //Extra Hints
@@ -488,15 +323,15 @@ void Randomizer::LoadHintLocations(const char* spoilerFileName) {
         );
         CustomMessageManager::Instance->CreateMessage(
             Randomizer::randoMiscHintsTableID, TEXT_DAMPES_DIARY,
-            CustomMessage(gSaveContext.dampeText,
-                gSaveContext.dampeText,
-                gSaveContext.dampeText)
+            CustomMessage(ctx->GetHint(RH_DAMPES_DIARY)->GetText().GetEnglish(),
+                ctx->GetHint(RH_DAMPES_DIARY)->GetText().GetEnglish(),
+                ctx->GetHint(RH_DAMPES_DIARY)->GetText().GetFrench())
         );
         CustomMessageManager::Instance->CreateMessage(
             Randomizer::randoMiscHintsTableID, TEXT_CHEST_GAME_PROCEED,
-            CustomMessage(gSaveContext.gregHintText,
-                gSaveContext.gregHintText,
-                gSaveContext.gregHintText)
+            CustomMessage(ctx->GetHint(RH_GREG_RUPEE)->GetText().GetEnglish(),
+                ctx->GetHint(RH_GREG_RUPEE)->GetText().GetEnglish(),
+                ctx->GetHint(RH_GREG_RUPEE)->GetText().GetFrench())
         );
         CustomMessageManager::Instance->CreateMessage(
             Randomizer::randoMiscHintsTableID, TEXT_FROGS_UNDERWATER,
@@ -557,7 +392,7 @@ std::unordered_map<RandomizerGet, EnGirlAShopItem> randomizerGetToEnGirlShopItem
     { RG_BUY_RED_POTION_50, SI_RED_POTION_R50 },
 };
 
-void Randomizer::LoadMerchantMessages(const char* spoilerFileName) {
+void Randomizer::LoadMerchantMessages() {
     CustomMessageManager::Instance->ClearMessageTable(Randomizer::merchantMessageTableID);
     CustomMessageManager::Instance->AddCustomMessageTable(Randomizer::merchantMessageTableID);
 
@@ -645,995 +480,19 @@ void Randomizer::LoadMerchantMessages(const char* spoilerFileName) {
                 "\x08{{item}}  {{price}} Rubis\x09&&\x1B%gAcheter&Ne pas acheter%w\x09\x02"));
 }
 
-void Randomizer::LoadItemLocations(const char* spoilerFileName, bool silent) {
-    if (strcmp(spoilerFileName, "") != 0) {
-        ParseItemLocationsFile(spoilerFileName, silent);
-    }
-
-    for (auto& itemLocation : gSaveContext.itemLocations) {
-        this->itemLocations[itemLocation.check] = itemLocation.get;
-    }
-
-    itemLocations[RC_UNKNOWN_CHECK].rgID = itemLocations[RC_UNKNOWN_CHECK].fakeRgID = RG_NONE;
-}
-
-void Randomizer::LoadRequiredTrials(const char* spoilerFileName) {
-    if (strcmp(spoilerFileName, "") != 0) {
-        ParseRequiredTrialsFile(spoilerFileName);
-    }
-}
-
-void Randomizer::LoadEntranceOverrides(const char* spoilerFileName, bool silent){
-    if (strcmp(spoilerFileName, "") != 0) {
-        ParseEntranceDataFile(spoilerFileName, silent);
-    }
-}
-
-void Randomizer::LoadMasterQuestDungeons(const char* spoilerFileName) {
-    if (strcmp(spoilerFileName, "") != 0) {
-        ParseMasterQuestDungeonsFile(spoilerFileName);
-    }
-    gSaveContext.mqDungeonCount = this->masterQuestDungeons.size();
-}
-
-void Randomizer::ParseRandomizerSettingsFile(const char* spoilerFileName) {
-    std::ifstream spoilerFileStream(sanitize(spoilerFileName));
-    if (!spoilerFileStream)
-        return;
-
-    bool success = false;
-
-    try {
-        // clear out existing settings
-        for(size_t i = 0; i < RSK_MAX; i++) {
-            gSaveContext.randoSettings[i].key = RSK_NONE;
-            gSaveContext.randoSettings[i].value = 0;
-        }
-
-        json spoilerFileJson;
-        spoilerFileStream >> spoilerFileJson;
-        json settingsJson = spoilerFileJson["settings"];
-
-        for (auto it = settingsJson.begin(); it != settingsJson.end(); ++it) {
-            // todo load into cvars for UI
-            
-            std::string numericValueString;
-            if(SpoilerfileSettingNameToEnum.count(it.key())) {
-                RandomizerSettingKey index = SpoilerfileSettingNameToEnum[it.key()];
-                gSaveContext.randoSettings[index].key = SpoilerfileSettingNameToEnum[it.key()];
-                // this is annoying but the same strings are used in different orders
-                // and i don't want the spoilerfile to just have numbers instead of
-                // human readable settings values so it'll have to do for now
-                switch(gSaveContext.randoSettings[index].key) {
-                    case RSK_LOGIC_RULES:
-                        if (it.value() == "Glitchless") {
-                            gSaveContext.randoSettings[index].value = RO_LOGIC_GLITCHLESS;
-                        } else if (it.value() == "No Logic") {
-                            gSaveContext.randoSettings[index].value = RO_LOGIC_NO_LOGIC;
-                        }
-                        break;
-                    case RSK_FOREST:
-                        if(it.value() == "Closed") {
-                            gSaveContext.randoSettings[index].value = RO_FOREST_CLOSED;
-                        } else if(it.value() == "Open") {
-                            gSaveContext.randoSettings[index].value = RO_FOREST_OPEN;
-                        } else if(it.value() == "Closed Deku") {
-                            gSaveContext.randoSettings[index].value = RO_FOREST_CLOSED_DEKU;
-                        }
-                        break;
-                    case RSK_KAK_GATE:
-                        if(it.value() == "Closed") {
-                            gSaveContext.randoSettings[index].value = RO_KAK_GATE_CLOSED;
-                        } else if(it.value() == "Open") {
-                            gSaveContext.randoSettings[index].value = RO_KAK_GATE_OPEN;
-                        }
-                        break;
-                    case RSK_DOOR_OF_TIME:
-                        if(it.value() == "Open") {
-                            gSaveContext.randoSettings[index].value = RO_DOOROFTIME_OPEN;
-                        } else if(it.value() == "Song only") {
-                            gSaveContext.randoSettings[index].value = RO_DOOROFTIME_SONGONLY;
-                        } else if(it.value() == "Closed") {
-                            gSaveContext.randoSettings[index].value = RO_DOOROFTIME_CLOSED;
-                        }
-                        break;
-                    case RSK_ZORAS_FOUNTAIN:
-                        if(it.value() == "Closed") {
-                            gSaveContext.randoSettings[index].value = RO_ZF_CLOSED;
-                        } else if(it.value() == "Closed as child") {
-                            gSaveContext.randoSettings[index].value = RO_ZF_CLOSED_CHILD;
-                        } else if(it.value() == "Open") {
-                            gSaveContext.randoSettings[index].value = RO_ZF_OPEN;
-                        }
-                        break;
-                    case RSK_STARTING_AGE:
-                        if(it.value() == "Child") {
-                            gSaveContext.randoSettings[index].value = RO_AGE_CHILD;
-                        } else if (it.value() == "Adult") {
-                            gSaveContext.randoSettings[index].value = RO_AGE_ADULT;
-                        }
-                        break;
-                    case RSK_GERUDO_FORTRESS:
-                        if(it.value() == "Normal") {
-                            gSaveContext.randoSettings[index].value = RO_GF_NORMAL;
-                        } else if(it.value() == "Fast") {
-                            gSaveContext.randoSettings[index].value = RO_GF_FAST;
-                        } else if(it.value() == "Open") {
-                            gSaveContext.randoSettings[index].value = RO_GF_OPEN;
-                        }
-                        break;
-                    case RSK_RAINBOW_BRIDGE:
-                        if(it.value() == "Vanilla") {
-                            gSaveContext.randoSettings[index].value = RO_BRIDGE_VANILLA;
-                        } else if(it.value() == "Always open") {
-                            gSaveContext.randoSettings[index].value = RO_BRIDGE_ALWAYS_OPEN;
-                        } else if(it.value() == "Stones") {
-                            gSaveContext.randoSettings[index].value = RO_BRIDGE_STONES;
-                        } else if(it.value() == "Medallions") {
-                            gSaveContext.randoSettings[index].value = RO_BRIDGE_MEDALLIONS;
-                        } else if(it.value() == "Dungeon rewards") {
-                            gSaveContext.randoSettings[index].value = RO_BRIDGE_DUNGEON_REWARDS;
-                        } else if(it.value() == "Dungeons") {
-                            gSaveContext.randoSettings[index].value = RO_BRIDGE_DUNGEONS;
-                        } else if(it.value() == "Tokens") {
-                            gSaveContext.randoSettings[index].value = RO_BRIDGE_TOKENS;
-                        } else if(it.value() == "Greg") {
-                            gSaveContext.randoSettings[index].value = RO_BRIDGE_GREG;
-                        }
-                        break;
-                    case RSK_BRIDGE_OPTIONS:
-                        if (it.value() == "Standard Rewards") {
-                            gSaveContext.randoSettings[index].value = RO_BRIDGE_STANDARD_REWARD;
-                        } else if (it.value() == "Greg as Reward") {
-                            gSaveContext.randoSettings[index].value = RO_BRIDGE_GREG_REWARD;
-                        } else if (it.value() == "Greg as Wildcard") {
-                            gSaveContext.randoSettings[index].value = RO_BRIDGE_WILDCARD_REWARD;
-                        }
-                        break;
-                    case RSK_LACS_OPTIONS:
-                        if (it.value() == "Standard Reward") {
-                            gSaveContext.randoSettings[index].value = RO_LACS_STANDARD_REWARD;
-                        } else if (it.value() == "Greg as Reward") {
-                            gSaveContext.randoSettings[index].value = RO_LACS_GREG_REWARD;
-                        } else if (it.value() == "Greg as Wildcard") {
-                            gSaveContext.randoSettings[index].value = RO_LACS_WILDCARD_REWARD;
-                        }
-                        break;
-                    case RSK_RAINBOW_BRIDGE_STONE_COUNT:
-                    case RSK_RAINBOW_BRIDGE_MEDALLION_COUNT:
-                    case RSK_RAINBOW_BRIDGE_REWARD_COUNT:
-                    case RSK_RAINBOW_BRIDGE_DUNGEON_COUNT:
-                    case RSK_RAINBOW_BRIDGE_TOKEN_COUNT:
-                    case RSK_TRIAL_COUNT:
-                    case RSK_LACS_STONE_COUNT:
-                    case RSK_LACS_MEDALLION_COUNT:
-                    case RSK_LACS_REWARD_COUNT:
-                    case RSK_LACS_DUNGEON_COUNT:
-                    case RSK_LACS_TOKEN_COUNT:
-                    case RSK_KEYRINGS_RANDOM_COUNT:
-                    case RSK_BIG_POE_COUNT:
-                    case RSK_CUCCO_COUNT:
-                    case RSK_STARTING_SKULLTULA_TOKEN:
-                    case RSK_TRIFORCE_HUNT_PIECES_TOTAL:
-                    case RSK_TRIFORCE_HUNT_PIECES_REQUIRED:
-                        numericValueString = it.value();
-                        gSaveContext.randoSettings[index].value = std::stoi(numericValueString);
-                        break;
-                    case RSK_SHOPSANITY:
-                        if(it.value() == "Off") {
-                            gSaveContext.randoSettings[index].value = RO_SHOPSANITY_OFF;
-                        } else if(it.value() == "0 Items") {
-                            gSaveContext.randoSettings[index].value = RO_SHOPSANITY_ZERO_ITEMS;
-                        } else if(it.value() == "1 Item") {
-                            gSaveContext.randoSettings[index].value = RO_SHOPSANITY_ONE_ITEM;
-                        } else if(it.value() == "2 Items") {
-                            gSaveContext.randoSettings[index].value = RO_SHOPSANITY_TWO_ITEMS;
-                        } else if(it.value() == "3 Items") {
-                            gSaveContext.randoSettings[index].value = RO_SHOPSANITY_THREE_ITEMS;
-                        } else if(it.value() == "4 Items") {
-                            gSaveContext.randoSettings[index].value = RO_SHOPSANITY_FOUR_ITEMS;
-                        } else if(it.value() == "Random") {
-                            gSaveContext.randoSettings[index].value = RO_SHOPSANITY_RANDOM;
-                        }
-                        break;
-                    case RSK_SHOPSANITY_PRICES:
-                        if (it.value() == "Random") {
-                            gSaveContext.randoSettings[index].value = RO_SHOPSANITY_PRICE_BALANCED;
-                        } else if (it.value() == "Starter Wallet") {
-                            gSaveContext.randoSettings[index].value = RO_SHOPSANITY_PRICE_STARTER;
-                        } else if (it.value() == "Adult's Wallet") {
-                            gSaveContext.randoSettings[index].value = RO_SHOPSANITY_PRICE_ADULT;
-                        } else if (it.value() == "Giant's Wallet") {
-                            gSaveContext.randoSettings[index].value = RO_SHOPSANITY_PRICE_GIANT;
-                        } else if (it.value() == "Tycoon's Wallet") {
-                            gSaveContext.randoSettings[index].value = RO_SHOPSANITY_PRICE_TYCOON;
-                        }
-                    case RSK_SHUFFLE_SCRUBS:
-                        if(it.value() == "Off") {
-                            gSaveContext.randoSettings[index].value = RO_SCRUBS_OFF;
-                        } else if(it.value() == "Affordable") {
-                            gSaveContext.randoSettings[index].value = RO_SCRUBS_AFFORDABLE;
-                        } else if(it.value() == "Expensive") {
-                            gSaveContext.randoSettings[index].value = RO_SCRUBS_EXPENSIVE;
-                        } else if(it.value() == "Random Prices") {
-                            gSaveContext.randoSettings[index].value = RO_SCRUBS_RANDOM;
-                        }
-                        break;
-                    case RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD:
-                    case RSK_SHUFFLE_COWS:
-                    case RSK_SHUFFLE_ADULT_TRADE:
-                    case RSK_SHUFFLE_MAGIC_BEANS:
-                    case RSK_SHUFFLE_KOKIRI_SWORD:
-                    case RSK_SHUFFLE_MASTER_SWORD:
-                    case RSK_SHUFFLE_WEIRD_EGG:
-                    case RSK_SHUFFLE_FROG_SONG_RUPEES:
-                    case RSK_SHUFFLE_100_GS_REWARD:
-                    case RSK_SHUFFLE_OCARINA:
-                    case RSK_STARTING_DEKU_SHIELD:
-                    case RSK_STARTING_KOKIRI_SWORD:
-                    case RSK_STARTING_ZELDAS_LULLABY:
-                    case RSK_STARTING_EPONAS_SONG:
-                    case RSK_STARTING_SARIAS_SONG:
-                    case RSK_STARTING_SUNS_SONG:
-                    case RSK_STARTING_SONG_OF_TIME:
-                    case RSK_STARTING_SONG_OF_STORMS:
-                    case RSK_STARTING_MINUET_OF_FOREST:
-                    case RSK_STARTING_BOLERO_OF_FIRE:
-                    case RSK_STARTING_SERENADE_OF_WATER:
-                    case RSK_STARTING_REQUIEM_OF_SPIRIT:
-                    case RSK_STARTING_NOCTURNE_OF_SHADOW:
-                    case RSK_STARTING_PRELUDE_OF_LIGHT:
-                    case RSK_COMPLETE_MASK_QUEST:
-                    case RSK_SKIP_SCARECROWS_SONG:
-                    case RSK_ENABLE_GLITCH_CUTSCENES:
-                    case RSK_SKULLS_SUNS_SONG:
-                    case RSK_BLUE_FIRE_ARROWS:
-                    case RSK_SUNLIGHT_ARROWS:
-                    case RSK_BOMBCHUS_IN_LOGIC:
-                    case RSK_TOT_ALTAR_HINT:
-                    case RSK_LIGHT_ARROWS_HINT:
-                    case RSK_DAMPES_DIARY_HINT:
-                    case RSK_GREG_HINT:
-                    case RSK_SARIA_HINT:
-                    case RSK_FROGS_HINT:
-                    case RSK_KAK_10_SKULLS_HINT:
-                    case RSK_KAK_20_SKULLS_HINT:
-                    case RSK_KAK_30_SKULLS_HINT:
-                    case RSK_KAK_40_SKULLS_HINT:
-                    case RSK_KAK_50_SKULLS_HINT:
-                    case RSK_WARP_SONG_HINTS:
-                    case RSK_SCRUB_TEXT_HINT:
-                    case RSK_KEYRINGS_GERUDO_FORTRESS:
-                    case RSK_KEYRINGS_FOREST_TEMPLE:
-                    case RSK_KEYRINGS_FIRE_TEMPLE:
-                    case RSK_KEYRINGS_WATER_TEMPLE:
-                    case RSK_KEYRINGS_SHADOW_TEMPLE:
-                    case RSK_KEYRINGS_SPIRIT_TEMPLE:
-                    case RSK_KEYRINGS_BOTTOM_OF_THE_WELL:
-                    case RSK_KEYRINGS_GTG:
-                    case RSK_KEYRINGS_GANONS_CASTLE:
-                    case RSK_SHUFFLE_ENTRANCES:
-                    case RSK_SHUFFLE_OVERWORLD_ENTRANCES:
-                    case RSK_SHUFFLE_GROTTO_ENTRANCES:
-                    case RSK_SHUFFLE_OWL_DROPS:
-                    case RSK_SHUFFLE_WARP_SONGS:
-                    case RSK_SHUFFLE_OVERWORLD_SPAWNS:
-                    case RSK_MIXED_ENTRANCE_POOLS:
-                    case RSK_MIX_DUNGEON_ENTRANCES:
-                    case RSK_MIX_OVERWORLD_ENTRANCES:
-                    case RSK_MIX_INTERIOR_ENTRANCES:
-                    case RSK_MIX_GROTTO_ENTRANCES:
-                    case RSK_DECOUPLED_ENTRANCES:
-                    case RSK_SHOPSANITY_PRICES_AFFORDABLE:
-                    case RSK_ALL_LOCATIONS_REACHABLE:
-                    case RSK_TRIFORCE_HUNT:
-                        if(it.value() == "Off") {
-                            gSaveContext.randoSettings[index].value = RO_GENERIC_OFF;
-                        } else if(it.value() == "On") {
-                            gSaveContext.randoSettings[index].value = RO_GENERIC_ON;
-                        }
-                        break;
-                    case RSK_KEYRINGS:
-                        if (it.value() == "Off") {
-                            gSaveContext.randoSettings[index].value = RO_KEYRINGS_OFF;
-                        } else if (it.value() == "Random") {
-                            gSaveContext.randoSettings[index].value = RO_KEYRINGS_RANDOM;
-                        } else if (it.value() == "Count") {
-                            gSaveContext.randoSettings[index].value = RO_KEYRINGS_COUNT;
-                        } else if (it.value() == "Selection") {
-                            gSaveContext.randoSettings[index].value = RO_KEYRINGS_SELECTION;
-                        }
-                        break;
-                    case RSK_SHUFFLE_MERCHANTS:
-                        if(it.value() == "Off") {
-                            gSaveContext.randoSettings[index].value = RO_SHUFFLE_MERCHANTS_OFF;
-                        } else if (it.value() == "On (No Hints)") {
-                            gSaveContext.randoSettings[index].value = RO_SHUFFLE_MERCHANTS_ON_NO_HINT;
-                        } else if (it.value() == "On (With Hints)") {
-                            gSaveContext.randoSettings[index].value = RO_SHUFFLE_MERCHANTS_ON_HINT;
-                        }
-                        break;
-                    // Uses Ammo Drops option for now. "Off" not yet implemented
-                    case RSK_ENABLE_BOMBCHU_DROPS:
-                        if (it.value() == "On") {
-                            gSaveContext.randoSettings[index].value = RO_AMMO_DROPS_ON;
-                        } else if (it.value() == "On + Bombchu") {
-                            gSaveContext.randoSettings[index].value = RO_AMMO_DROPS_ON_PLUS_BOMBCHU;
-                        } else if (it.value() == "Off") {
-                            gSaveContext.randoSettings[index].value = RO_AMMO_DROPS_OFF;
-                        }
-                        break;
-                    case RSK_STARTING_OCARINA:
-                        if(it.value() == "Off") {
-                            gSaveContext.randoSettings[index].value = RO_STARTING_OCARINA_OFF;
-                        } else if(it.value() == "Fairy Ocarina") {
-                            gSaveContext.randoSettings[index].value = RO_STARTING_OCARINA_FAIRY;
-                        }
-                        break;
-                    case RSK_ITEM_POOL:
-                        if(it.value() == "Plentiful") {
-                            gSaveContext.randoSettings[index].value = RO_ITEM_POOL_PLENTIFUL;
-                        } else if(it.value() == "Balanced") {
-                            gSaveContext.randoSettings[index].value = RO_ITEM_POOL_BALANCED;
-                        } else if(it.value() == "Scarce") {
-                            gSaveContext.randoSettings[index].value = RO_ITEM_POOL_SCARCE;
-                        } else if(it.value() == "Minimal") {
-                            gSaveContext.randoSettings[index].value = RO_ITEM_POOL_MINIMAL;
-                        }
-                        break;
-                    case RSK_ICE_TRAPS:
-                        if(it.value() == "Off") {
-                            gSaveContext.randoSettings[index].value = RO_ICE_TRAPS_OFF;
-                        } else if(it.value() == "Normal") {
-                            gSaveContext.randoSettings[index].value = RO_ICE_TRAPS_NORMAL;
-                        } else if(it.value() == "Extra") {
-                            gSaveContext.randoSettings[index].value = RO_ICE_TRAPS_EXTRA;
-                        } else if(it.value() == "Mayhem") {
-                            gSaveContext.randoSettings[index].value = RO_ICE_TRAPS_MAYHEM;
-                        } else if(it.value() == "Onslaught") {
-                            gSaveContext.randoSettings[index].value = RO_ICE_TRAPS_ONSLAUGHT;
-                        }
-                        break;
-                    case RSK_GOSSIP_STONE_HINTS:
-                        if(it.value() == "No Hints") {
-                            gSaveContext.randoSettings[index].value = RO_GOSSIP_STONES_NONE;
-                        } else if(it.value() == "Need Nothing") {
-                            gSaveContext.randoSettings[index].value = RO_GOSSIP_STONES_NEED_NOTHING;
-                        } else if(it.value() == "Mask of Truth") {
-                            gSaveContext.randoSettings[index].value = RO_GOSSIP_STONES_NEED_TRUTH;
-                        } else if(it.value() == "Stone of Agony") {
-                            gSaveContext.randoSettings[index].value = RO_GOSSIP_STONES_NEED_STONE;
-                        }
-                        break;
-                    case RSK_HINT_CLARITY:
-                        if(it.value() == "Obscure") {
-                            gSaveContext.randoSettings[index].value = RO_HINT_CLARITY_OBSCURE;
-                        } else if(it.value() == "Ambiguous") {
-                            gSaveContext.randoSettings[index].value = RO_HINT_CLARITY_AMBIGUOUS;
-                        } else if(it.value() == "Clear") {
-                            gSaveContext.randoSettings[index].value = RO_HINT_CLARITY_CLEAR;
-                        }
-                        break;
-                    case RSK_HINT_DISTRIBUTION:
-                        if(it.value() == "Useless") {
-                            gSaveContext.randoSettings[index].value = RO_HINT_DIST_USELESS;
-                        } else if(it.value() == "Balanced") {
-                            gSaveContext.randoSettings[index].value = RO_HINT_DIST_BALANCED;
-                        } else if(it.value() == "Strong") {
-                            gSaveContext.randoSettings[index].value = RO_HINT_DIST_STRONG;
-                        } else if(it.value() == "Very Strong") {
-                            gSaveContext.randoSettings[index].value = RO_HINT_DIST_VERY_STRONG;
-                        }
-                        break;
-                    case RSK_GERUDO_KEYS:
-                        if (it.value() == "Vanilla") {
-                            gSaveContext.randoSettings[index].value = RO_GERUDO_KEYS_VANILLA;
-                        } else if (it.value() == "Any Dungeon") {
-                            gSaveContext.randoSettings[index].value = RO_GERUDO_KEYS_ANY_DUNGEON;
-                        } else if (it.value() == "Overworld") {
-                            gSaveContext.randoSettings[index].value = RO_GERUDO_KEYS_OVERWORLD;
-                        } else if (it.value() == "Anywhere") {
-                            gSaveContext.randoSettings[index].value = RO_GERUDO_KEYS_ANYWHERE;
-                        }
-                        break;
-                    case RSK_KEYSANITY:
-                    case RSK_BOSS_KEYSANITY:
-                    case RSK_STARTING_MAPS_COMPASSES:
-                        if(it.value() == "Start With") {
-                            gSaveContext.randoSettings[index].value = RO_DUNGEON_ITEM_LOC_STARTWITH;
-                        } else if(it.value() == "Vanilla") {
-                            gSaveContext.randoSettings[index].value = RO_DUNGEON_ITEM_LOC_VANILLA;
-                        } else if(it.value() == "Own Dungeon") {
-                            gSaveContext.randoSettings[index].value = RO_DUNGEON_ITEM_LOC_OWN_DUNGEON;
-                        } else if(it.value() == "Any Dungeon") {
-                            gSaveContext.randoSettings[index].value = RO_DUNGEON_ITEM_LOC_ANY_DUNGEON;
-                        } else if(it.value() == "Overworld") {
-                            gSaveContext.randoSettings[index].value = RO_DUNGEON_ITEM_LOC_OVERWORLD;
-                        } else if(it.value() == "Anywhere") {
-                            gSaveContext.randoSettings[index].value = RO_DUNGEON_ITEM_LOC_ANYWHERE;
-                        }
-                        break;
-                    case RSK_GANONS_BOSS_KEY:
-                        if(it.value() == "Vanilla") {
-                            gSaveContext.randoSettings[index].value = RO_GANON_BOSS_KEY_VANILLA;
-                        } else if(it.value() == "Own dungeon") {
-                            gSaveContext.randoSettings[index].value = RO_GANON_BOSS_KEY_OWN_DUNGEON;
-                        } else if(it.value() == "Start with") {
-                            gSaveContext.randoSettings[index].value = RO_GANON_BOSS_KEY_STARTWITH;
-                        } else if(it.value() == "Any Dungeon") {
-                            gSaveContext.randoSettings[index].value = RO_GANON_BOSS_KEY_ANY_DUNGEON;
-                        } else if(it.value() == "Overworld") {
-                            gSaveContext.randoSettings[index].value = RO_GANON_BOSS_KEY_OVERWORLD;
-                        } else if(it.value() == "Anywhere") {                         
-                            gSaveContext.randoSettings[index].value = RO_GANON_BOSS_KEY_ANYWHERE;
-                        } else if(it.value() == "LACS-Vanilla") {
-                            gSaveContext.randoSettings[index].value = RO_GANON_BOSS_KEY_LACS_VANILLA;
-                        } else if(it.value() == "LACS-Stones") {
-                            gSaveContext.randoSettings[index].value = RO_GANON_BOSS_KEY_LACS_STONES;
-                        } else if(it.value() == "LACS-Medallions") {
-                            gSaveContext.randoSettings[index].value = RO_GANON_BOSS_KEY_LACS_MEDALLIONS;
-                        } else if(it.value() == "LACS-Rewards") {
-                            gSaveContext.randoSettings[index].value = RO_GANON_BOSS_KEY_LACS_REWARDS;
-                        } else if(it.value() == "LACS-Dungeons") {
-                            gSaveContext.randoSettings[index].value = RO_GANON_BOSS_KEY_LACS_DUNGEONS;
-                        } else if(it.value() == "LACS-Tokens") {
-                            gSaveContext.randoSettings[index].value = RO_GANON_BOSS_KEY_LACS_TOKENS;
-                        } else if(it.value() == "100 GS Reward") {
-                            gSaveContext.randoSettings[index].value = RO_GANON_BOSS_KEY_KAK_TOKENS;
-                        } else if(it.value() == "Triforce Hunt") {
-                            gSaveContext.randoSettings[index].value = RO_GANON_BOSS_KEY_TRIFORCE_HUNT;
-                        }
-                        break;
-                    case RSK_RANDOM_MQ_DUNGEONS:
-                        if (it.value() == "None") {
-                            gSaveContext.randoSettings[index].value = RO_MQ_DUNGEONS_NONE;
-                        } else if (it.value() == "Random Number") {
-                            gSaveContext.randoSettings[index].value = RO_MQ_DUNGEONS_RANDOM_NUMBER;
-                        } else if (it.value() == "Set Number") {
-                            gSaveContext.randoSettings[index].value = RO_MQ_DUNGEONS_SET_NUMBER;
-                        }
-                        break;
-                    case RSK_SKIP_CHILD_ZELDA:
-                        gSaveContext.randoSettings[index].value = it.value();
-                        break;
-                    case RSK_STARTING_CONSUMABLES:
-                    case RSK_FULL_WALLETS:
-                        if(it.value() == "No") {
-                            gSaveContext.randoSettings[index].value = RO_GENERIC_NO;
-                        } else if(it.value() == "Yes") {
-                            gSaveContext.randoSettings[index].value = RO_GENERIC_YES;
-                        }
-                        break;
-                    case RSK_SKIP_CHILD_STEALTH:
-                    case RSK_SKIP_EPONA_RACE:
-                    case RSK_SKIP_TOWER_ESCAPE:
-                        if(it.value() == "Don't Skip") {
-                            gSaveContext.randoSettings[index].value = RO_GENERIC_DONT_SKIP;
-                        } else if (it.value() == "Skip") {
-                            gSaveContext.randoSettings[index].value = RO_GENERIC_SKIP;
-                        }
-                        break;
-                    case RSK_SHUFFLE_DUNGEON_REWARDS:
-                        if (it.value() == "End of dungeons") {
-                            gSaveContext.randoSettings[index].value = RO_DUNGEON_REWARDS_END_OF_DUNGEON;
-                        } else if (it.value() == "Any dungeon") {
-                            gSaveContext.randoSettings[index].value = RO_DUNGEON_REWARDS_ANY_DUNGEON;
-                        } else if (it.value() == "Overworld") {
-                            gSaveContext.randoSettings[index].value = RO_DUNGEON_REWARDS_OVERWORLD;
-                        } else if (it.value() == "Anywhere") {
-                            gSaveContext.randoSettings[index].value = RO_DUNGEON_REWARDS_ANYWHERE;
-                        }
-                        break;
-                    case RSK_SHUFFLE_SONGS:
-                        if (it.value() == "Song locations") {
-                            gSaveContext.randoSettings[index].value = RO_SONG_SHUFFLE_SONG_LOCATIONS;
-                        } else if (it.value() == "Dungeon rewards") {
-                            gSaveContext.randoSettings[index].value = RO_SONG_SHUFFLE_DUNGEON_REWARDS;
-                        } else if (it.value() == "Anywhere") {
-                            gSaveContext.randoSettings[index].value = RO_SONG_SHUFFLE_ANYWHERE;
-                        }
-                        break;
-                    case RSK_SHUFFLE_TOKENS:
-                        if (it.value() == "Off") {
-                            gSaveContext.randoSettings[index].value = RO_TOKENSANITY_OFF;
-                        } else if (it.value() == "Dungeons") {
-                            gSaveContext.randoSettings[index].value = RO_TOKENSANITY_DUNGEONS;
-                        } else if (it.value() == "Overworld") {
-                            gSaveContext.randoSettings[index].value = RO_TOKENSANITY_OVERWORLD;
-                        } else if (it.value() == "All Tokens") {
-                            gSaveContext.randoSettings[index].value = RO_TOKENSANITY_ALL;
-                        }
-                        break;
-                    case RSK_LINKS_POCKET:
-                        if (it.value() == "Dungeon Reward") {
-                            gSaveContext.randoSettings[index].value = RO_LINKS_POCKET_DUNGEON_REWARD;
-                        } else if (it.value() == "Advancement") {
-                            gSaveContext.randoSettings[index].value = RO_LINKS_POCKET_ADVANCEMENT;
-                        } else if (it.value() == "Anything") {
-                            gSaveContext.randoSettings[index].value = RO_LINKS_POCKET_ANYTHING;
-                        } else if (it.value() == "Nothing") {
-                            gSaveContext.randoSettings[index].value = RO_LINKS_POCKET_NOTHING;
-                        }
-                        break;
-                    case RSK_MQ_DUNGEON_COUNT:
-                        if (it.value() == "Count") {
-                            numericValueString = it.value();
-                            gSaveContext.randoSettings[index].value = std::stoi(numericValueString);
-                        }
-
-                        else if (it.value() == "Random") {
-                            gSaveContext.randoSettings[index].value = 13;
-                        }
-
-                        else if (it.value() == "Selection") {
-                            gSaveContext.randoSettings[index].value = RO_MQ_DUNGEONS_SELECTION;
-                        }
-
-                        break;
-                    case RSK_SHUFFLE_DUNGEON_ENTRANCES:
-                        if (it.value() == "Off") {
-                            gSaveContext.randoSettings[index].value = RO_DUNGEON_ENTRANCE_SHUFFLE_OFF;
-                        } else if (it.value() == "On") {
-                            gSaveContext.randoSettings[index].value = RO_DUNGEON_ENTRANCE_SHUFFLE_ON;
-                        } else if (it.value() == "On + Ganon") {
-                            gSaveContext.randoSettings[index].value = RO_DUNGEON_ENTRANCE_SHUFFLE_ON_PLUS_GANON;
-                        }
-                        break;
-                    case RSK_SHUFFLE_BOSS_ENTRANCES:
-                        if (it.value() == "Off") {
-                            gSaveContext.randoSettings[index].value = RO_BOSS_ROOM_ENTRANCE_SHUFFLE_OFF;
-                        } else if (it.value() == "Age Restricted") {
-                            gSaveContext.randoSettings[index].value = RO_BOSS_ROOM_ENTRANCE_SHUFFLE_AGE_RESTRICTED;
-                        } else if (it.value() == "Full") {
-                            gSaveContext.randoSettings[index].value = RO_BOSS_ROOM_ENTRANCE_SHUFFLE_FULL;
-                        }
-                        break;
-                    case RSK_SHUFFLE_INTERIOR_ENTRANCES:
-                        if (it.value() == "Off") {
-                            gSaveContext.randoSettings[index].value = RO_INTERIOR_ENTRANCE_SHUFFLE_OFF;
-                        } else if (it.value() == "Simple") {
-                            gSaveContext.randoSettings[index].value = RO_INTERIOR_ENTRANCE_SHUFFLE_SIMPLE;
-                        } else if (it.value() == "All") {
-                            gSaveContext.randoSettings[index].value = RO_INTERIOR_ENTRANCE_SHUFFLE_ALL;
-                        }
-                        break;
-                }
-            }
-        }
-
-        success = true;
-    } catch (const std::exception& e) {
-        return;
-    }
-}
-
-std::string AltarIconString(char iconChar) {
-    std::string iconString = "";
-    switch (iconChar) {
-        case '0':
-            // Kokiri Emerald
-            iconString += 0x13;
-            iconString += 0x6C;
-            break;
-        case '1':
-            // Goron Ruby
-            iconString += 0x13;
-            iconString += 0x6D;
-            break;
-        case '2':
-            // Zora Sapphire
-            iconString += 0x13;
-            iconString += 0x6E;
-            break;
-        case '3':
-            // Forest Medallion
-            iconString += 0x13;
-            iconString += 0x66;
-            break;
-        case '4':
-            // Fire Medallion
-            iconString += 0x13;
-            iconString += 0x67;
-            break;
-        case '5':
-            // Water Medallion
-            iconString += 0x13;
-            iconString += 0x68;
-            break;
-        case '6':
-            // Spirit Medallion
-            iconString += 0x13;
-            iconString += 0x69;
-            break;
-        case '7':
-            // Shadow Medallion
-            iconString += 0x13;
-            iconString += 0x6A;
-            break;
-        case '8':
-            // Light Medallion
-            iconString += 0x13;
-            iconString += 0x6B;
-            break;
-        case 'o':
-            // Open DOT (master sword)
-            iconString += 0x13;
-            iconString += 0x3C;
-            break;
-        case 'c':
-            // Closed DOT (fairy ocarina)
-            iconString += 0x13;
-            iconString += 0x07;
-            break;
-        case 'i':
-            // Intended DOT (oot)
-            iconString += 0x13;
-            iconString += 0x08;
-            break;
-        case 'l':
-            // Light Arrow (for bridge reqs)
-            iconString += 0x13;
-            iconString += 0x12;
-            break;
-        case 'b':
-            // Boss Key (ganon boss key location)
-            iconString += 0x13;
-            iconString += 0x74;
-            break;
-        case 'L':
-            // Bow with Light Arrow
-            iconString += 0x13;
-            iconString += 0x3A;
-            break;
-        case 'k':
-            // Kokiri Tunic
-            iconString += 0x13;
-            iconString += 0x41;
-            break;
-    }
-    return iconString;
-}
-
-std::string FormatJsonHintText(std::string jsonHint) {
-    std::string formattedHintMessage = jsonHint;
-
-    // add icons to altar text
-    for (char iconChar : {'0', '1', '2', '3', '4', '5', '6', '7', '8', 'o', 'c', 'i', 'l', 'b', 'L', 'k'}) {
-        std::string textToReplace = "$";
-        textToReplace += iconChar;
-        size_t start_pos = formattedHintMessage.find(textToReplace);
-        if(!(start_pos == std::string::npos)) {
-            std::string iconString = AltarIconString(iconChar);
-            formattedHintMessage.replace(start_pos, textToReplace.length(), iconString);
-        }
-    }
-    return formattedHintMessage;
-}
-
-void ParseSpoilerHintText(json Json, std::string field, char* saveLoc, size_t size){
-    auto jsonIter = Json.find(field);
-    if (jsonIter != Json.end()){
-        SohUtils::CopyStringToCharArray(saveLoc, jsonIter.value(), size);
-    }
-}
-
-void CheckNameToEnum(json Json, std::string field, RandomizerCheck* saveLoc){
-    auto jsonIter = Json.find(field);
-    if (jsonIter != Json.end()){
-        *saveLoc = SpoilerfileCheckNameToEnum[jsonIter.value().get<std::string>()];
-    };
-}
-
-void Randomizer::ParseHintLocationsFile(const char* spoilerFileName) {
-    std::ifstream spoilerFileStream(sanitize(spoilerFileName));
-    if (!spoilerFileStream)
-        return;
-
-    try {
-        json spoilerFileJson;
-        spoilerFileStream >> spoilerFileJson;
-
-        SohUtils::CopyStringToCharArray(gSaveContext.childAltarText,
-                                        FormatJsonHintText(spoilerFileJson["childAltar"]["hintText"]),
-                                        ARRAY_COUNT(gSaveContext.childAltarText));
-        gSaveContext.rewardCheck[0] = SpoilerfileCheckNameToEnum[spoilerFileJson["childAltar"]["rewards"]["emeraldLoc"]];
-        gSaveContext.rewardCheck[1] = SpoilerfileCheckNameToEnum[spoilerFileJson["childAltar"]["rewards"]["rubyLoc"]];
-        gSaveContext.rewardCheck[2] = SpoilerfileCheckNameToEnum[spoilerFileJson["childAltar"]["rewards"]["sapphireLoc"]];
-
-        SohUtils::CopyStringToCharArray(gSaveContext.adultAltarText,
-                                        FormatJsonHintText(spoilerFileJson["adultAltar"]["hintText"]),
-                                        ARRAY_COUNT(gSaveContext.adultAltarText));
-        gSaveContext.rewardCheck[3] = SpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["forestMedallionLoc"]];
-        gSaveContext.rewardCheck[4] = SpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["fireMedallionLoc"]];
-        gSaveContext.rewardCheck[5] = SpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["waterMedallionLoc"]];
-        gSaveContext.rewardCheck[6] = SpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["shadowMedallionLoc"]];
-        gSaveContext.rewardCheck[7] = SpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["spiritMedallionLoc"]];
-        gSaveContext.rewardCheck[8] = SpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["lightMedallionLoc"]];
-
-        ParseSpoilerHintText(spoilerFileJson, "ganonHintText", gSaveContext.ganonHintText, ARRAY_COUNT(gSaveContext.ganonHintText));
-        ParseSpoilerHintText(spoilerFileJson, "ganonText", gSaveContext.ganonText, ARRAY_COUNT(gSaveContext.ganonText));
-        CheckNameToEnum(spoilerFileJson, "lightArrowHintLoc", &gSaveContext.lightArrowHintCheck);
-        CheckNameToEnum(spoilerFileJson, "masterSwordHintLoc", &gSaveContext.masterSwordHintCheck);
-
-        ParseSpoilerHintText(spoilerFileJson, "dampeText", gSaveContext.dampeText, ARRAY_COUNT(gSaveContext.dampeText));
-        CheckNameToEnum(spoilerFileJson, "dampeHintLoc", &gSaveContext.dampeCheck);
-
-        ParseSpoilerHintText(spoilerFileJson, "gregText", gSaveContext.gregHintText, ARRAY_COUNT(gSaveContext.gregHintText));
-        CheckNameToEnum(spoilerFileJson, "gregLoc", &gSaveContext.gregCheck);
-
-        ParseSpoilerHintText(spoilerFileJson, "sheikText", gSaveContext.sheikText, ARRAY_COUNT(gSaveContext.sheikText));
-        
-        ParseSpoilerHintText(spoilerFileJson, "sariaText", gSaveContext.sariaText, ARRAY_COUNT(gSaveContext.sariaText));
-        CheckNameToEnum(spoilerFileJson, "sariaHintLoc", &gSaveContext.sariaCheck);
-
-        ParseSpoilerHintText(spoilerFileJson, "warpMinuetText", gSaveContext.warpMinuetText, ARRAY_COUNT(gSaveContext.warpMinuetText));
-        ParseSpoilerHintText(spoilerFileJson, "warpBoleroText", gSaveContext.warpBoleroText, ARRAY_COUNT(gSaveContext.warpBoleroText));
-        ParseSpoilerHintText(spoilerFileJson, "warpSerenadeText", gSaveContext.warpSerenadeText, ARRAY_COUNT(gSaveContext.warpSerenadeText));
-        ParseSpoilerHintText(spoilerFileJson, "warpRequiemText", gSaveContext.warpRequiemText, ARRAY_COUNT(gSaveContext.warpRequiemText));
-        ParseSpoilerHintText(spoilerFileJson, "warpNocturneText", gSaveContext.warpNocturneText, ARRAY_COUNT(gSaveContext.warpNocturneText));
-        ParseSpoilerHintText(spoilerFileJson, "warpPreludeText", gSaveContext.warpPreludeText, ARRAY_COUNT(gSaveContext.warpPreludeText));
-
-        json hintsJson = spoilerFileJson["hints"];
-        int index = 0;
-        for (auto it = hintsJson.begin(); it != hintsJson.end(); ++it) {
-            gSaveContext.hintLocations[index].check = SpoilerfileCheckNameToEnum[it.key()];
-            auto hintInfo = it.value();
-            if (hintInfo["location"].is_null()) {
-                gSaveContext.hintLocations[index].hintedCheck = RC_UNKNOWN_CHECK;
-            } else {
-                gSaveContext.hintLocations[index].hintedCheck = SpoilerfileCheckNameToEnum[hintInfo["location"]];
-            }
-            if (hintInfo["item"].is_null()) {
-                gSaveContext.hintLocations[index].rGet = RG_NONE;
-            } else {
-                gSaveContext.hintLocations[index].rGet = SpoilerfileGetNameToEnum[hintInfo["item"]];
-            }
-            gSaveContext.hintLocations[index].type = SpoilerfileHintTypeNameToEnum[hintInfo["type"]];
-
-            if (gSaveContext.hintLocations[index].type == HINT_TYPE_TRIAL) {
-                gSaveContext.hintLocations[index].area = RCAREA_GANONS_CASTLE;
-            } else if (gSaveContext.hintLocations[index].type == HINT_TYPE_JUNK) {
-                gSaveContext.hintLocations[index].area = RCAREA_INVALID;
-            } else {
-                gSaveContext.hintLocations[index].area = SpoilerfileAreaNameToEnum[hintInfo["area"]];
-            }
-
-            SohUtils::CopyStringToCharArray(gSaveContext.hintLocations[index].hintText, hintInfo["hint"], ARRAY_COUNT(gSaveContext.hintLocations[index].hintText));
-
-            index++;
-        }
-
-    } catch (const std::exception& e) {
-        return;
-    }
-}
-
-void Randomizer::ParseRequiredTrialsFile(const char* spoilerFileName) {
-    std::ifstream spoilerFileStream(sanitize(spoilerFileName));
-    if (!spoilerFileStream) {
-        return;
-    }
-
-    this->trialsRequired.clear();
-
-    try {
-        json spoilerFileJson;
-        spoilerFileStream >> spoilerFileJson;
-        json trialsJson = spoilerFileJson["requiredTrials"];
-
-        for (auto it = trialsJson.begin(); it != trialsJson.end(); it++) {
-            this->trialsRequired[spoilerFileTrialToEnum[it.value()]] = true;
-        }
-    } catch (const std::exception& e) {
-        return;
-    }
-}
-
-void Randomizer::ParseMasterQuestDungeonsFile(const char* spoilerFileName) {
-    std::ifstream spoilerFileStream(sanitize(spoilerFileName));
-    if (!spoilerFileStream) {
-        return;
-    }
-
-    this->masterQuestDungeons.clear();
-
-    try {
-        json spoilerFileJson;
-        spoilerFileStream >> spoilerFileJson;
-        json mqDungeonsJson = spoilerFileJson["masterQuestDungeons"];
-
-        for (auto it = mqDungeonsJson.begin(); it != mqDungeonsJson.end(); it++) {
-            this->masterQuestDungeons.emplace(spoilerFileDungeonToScene[it.value()]);
-        }
-    } catch (const std::exception& e) {
-        return;
-    }
-}
-
-int16_t Randomizer::GetVanillaMerchantPrice(RandomizerCheck check) {
-    switch (check) { 
-        case RC_HF_DEKU_SCRUB_GROTTO:
-            return 10;    
-        case RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT:
-        case RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS:
-        case RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR:
-            return 15;    
-        case RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT:
-        case RC_LH_DEKU_SCRUB_GROTTO_LEFT:
-        case RC_GC_DEKU_SCRUB_GROTTO_LEFT:
-        case RC_DMC_DEKU_SCRUB_GROTTO_LEFT:
-        case RC_LLR_DEKU_SCRUB_GROTTO_LEFT:
-        case RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT:
-        case RC_JABU_JABUS_BELLY_DEKU_SCRUB:
-        case RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT:
-            return 20;
-        case RC_LW_DEKU_SCRUB_NEAR_BRIDGE:
-        case RC_LW_DEKU_SCRUB_GROTTO_REAR:
-        case RC_LW_DEKU_SCRUB_GROTTO_FRONT:
-        case RC_SFM_DEKU_SCRUB_GROTTO_REAR:
-        case RC_SFM_DEKU_SCRUB_GROTTO_FRONT:
-        case RC_LH_DEKU_SCRUB_GROTTO_RIGHT:
-        case RC_LH_DEKU_SCRUB_GROTTO_CENTER:
-        case RC_GV_DEKU_SCRUB_GROTTO_REAR:
-        case RC_GV_DEKU_SCRUB_GROTTO_FRONT:
-        case RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR:
-        case RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT:
-        case RC_GC_DEKU_SCRUB_GROTTO_RIGHT:
-        case RC_GC_DEKU_SCRUB_GROTTO_CENTER:
-        case RC_DMC_DEKU_SCRUB:
-        case RC_DMC_DEKU_SCRUB_GROTTO_RIGHT:
-        case RC_DMC_DEKU_SCRUB_GROTTO_CENTER:
-        case RC_ZR_DEKU_SCRUB_GROTTO_REAR:
-        case RC_ZR_DEKU_SCRUB_GROTTO_FRONT:
-        case RC_LLR_DEKU_SCRUB_GROTTO_RIGHT:
-        case RC_LLR_DEKU_SCRUB_GROTTO_CENTER:
-        case RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT:
-        case RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT:
-        case RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS:
-        case RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT:
-        case RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT:
-        case RC_GANONS_CASTLE_DEKU_SCRUB_RIGHT:
-        case RC_GANONS_CASTLE_DEKU_SCRUB_LEFT:
-        case RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT:
-        case RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER:
-        case RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT:
-        case RC_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT:
-            return 40;
-        case RC_DEKU_TREE_MQ_DEKU_SCRUB:
-        case RC_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY:
-        case RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE:
-            return 50;
-        default:
-            // we check for -1 when calling this to know if we don't have a price
-            return -1;
-    }
-}
-
-void Randomizer::ParseItemLocationsFile(const char* spoilerFileName, bool silent) {
-    std::ifstream spoilerFileStream(sanitize(spoilerFileName));
-    if (!spoilerFileStream)
-        return;
-
-    bool success = false;
-
-    try {
-        json spoilerFileJson;
-        spoilerFileStream >> spoilerFileJson;
-        json locationsJson = spoilerFileJson["locations"];
-        json hashJson = spoilerFileJson["file_hash"];
-
-        int index = 0;
-        for (auto it = hashJson.begin(); it != hashJson.end(); ++it) {
-            gSaveContext.seedIcons[index] = gSeedTextures[it.value()].id;
-            index++;
-        }
-
-        SohUtils::CopyStringToCharArray(gSaveContext.inputSeed, spoilerFileJson["seed"],
-                                        ARRAY_COUNT(gSaveContext.inputSeed));
-
-        gSaveContext.finalSeed = spoilerFileJson["finalSeed"].get<uint32_t>();
-
-        for (auto it = locationsJson.begin(); it != locationsJson.end(); ++it) {
-            RandomizerCheck randomizerCheck = SpoilerfileCheckNameToEnum[it.key()];
-            if (it->is_structured()) {
-                json itemJson = *it;
-                for (auto itemit = itemJson.begin(); itemit != itemJson.end(); ++itemit) {
-                    if (itemit.key() == "item") {
-                        gSaveContext.itemLocations[randomizerCheck].check = randomizerCheck;
-                        gSaveContext.itemLocations[randomizerCheck].get.rgID = SpoilerfileGetNameToEnum[itemit.value()];
-                    } else if (itemit.key() == "price") {
-                        merchantPrices[gSaveContext.itemLocations[randomizerCheck].check] = itemit.value();
-                    } else if (itemit.key() == "model") {
-                        gSaveContext.itemLocations[randomizerCheck].get.fakeRgID =
-                            SpoilerfileGetNameToEnum[itemit.value()];
-                    } else if (itemit.key() == "trickName") {
-                        SohUtils::CopyStringToCharArray(gSaveContext.itemLocations[randomizerCheck].get.trickName,
-                                                        itemit.value(), MAX_TRICK_NAME_SIZE);
-                    }
-                }
-            } else {
-                gSaveContext.itemLocations[randomizerCheck].check = SpoilerfileCheckNameToEnum[it.key()];
-                gSaveContext.itemLocations[randomizerCheck].get.rgID = SpoilerfileGetNameToEnum[it.value()];
-                gSaveContext.itemLocations[randomizerCheck].get.fakeRgID = RG_NONE;
-                int16_t price = GetVanillaMerchantPrice(randomizerCheck);
-                if (price != -1) {
-                    merchantPrices[gSaveContext.itemLocations[randomizerCheck].check] = price;
-                }
-            }
-        }
-
-        if(!silent) {
-            Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
-        }
-        success = true;
-    } catch (const std::exception& e) {
-        Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
-        return;
-    }
-}
-
-void Randomizer::ParseEntranceDataFile(const char* spoilerFileName, bool silent) {
-    std::ifstream spoilerFileStream(sanitize(spoilerFileName));
-    if (!spoilerFileStream) {
-        return;
-    }
-
-    // set all the entrances to be 0 to indicate an unshuffled entrance
-    for (auto &entranceOveride : gSaveContext.entranceOverrides) {
-        entranceOveride.index = 0;
-        entranceOveride.destination = 0;
-        entranceOveride.blueWarp = 0;
-        entranceOveride.override = 0;
-        entranceOveride.overrideDestination = 0;
-    }
-
-    try {
-        json spoilerFileJson;
-        spoilerFileStream >> spoilerFileJson;
-        json EntrancesJson = spoilerFileJson["entrances"];
-
-        size_t i = 0;
-        for (auto it = EntrancesJson.begin(); it != EntrancesJson.end(); ++it, i++) {
-            json entranceJson = *it;
-
-            for (auto entranceIt = entranceJson.begin(); entranceIt != entranceJson.end(); ++entranceIt) {
-                if (entranceIt.key() == "index") {
-                    gSaveContext.entranceOverrides[i].index = entranceIt.value();
-                } else if (entranceIt.key() == "destination") {
-                    gSaveContext.entranceOverrides[i].destination = entranceIt.value();
-                } else if (entranceIt.key() == "blueWarp") {
-                    gSaveContext.entranceOverrides[i].blueWarp = entranceIt.value();
-                } else if (entranceIt.key() == "override") {
-                    gSaveContext.entranceOverrides[i].override = entranceIt.value();
-                } else if (entranceIt.key() == "overrideDestination") {
-                    gSaveContext.entranceOverrides[i].overrideDestination = entranceIt.value();
-                }
-            }
-        }
-    } catch (const std::exception& e) {
-        return;
-    }
-}
-
 bool Randomizer::IsTrialRequired(RandomizerInf trial) {
-    return this->trialsRequired.contains(trial);
+    return Rando::Context::GetInstance()->GetTrial(trial - RAND_INF_TRIALS_DONE_LIGHT_TRIAL);
 }
 
-RandomizerGetData Randomizer::GetRandomizerGetDataFromActor(s16 actorId, s16 sceneNum, s16 actorParams) {
-    return this->itemLocations[GetCheckFromActor(actorId, sceneNum, actorParams)];
-}
-
-RandomizerGetData Randomizer::GetRandomizerGetDataFromKnownCheck(RandomizerCheck randomizerCheck) {
-    return this->itemLocations[randomizerCheck];
-}
-
-GetItemEntry Randomizer::GetItemFromActor(s16 actorId, s16 sceneNum, s16 actorParams, GetItemID ogItemId, bool checkObtainability) {
-    RandomizerGetData rgData = this->itemLocations[GetCheckFromActor(actorId, sceneNum, actorParams)];
-    return GetItemEntryFromRGData(rgData, ogItemId, checkObtainability);
+GetItemEntry Randomizer::GetItemFromActor(s16 actorId, s16 sceneNum, s16 actorParams, GetItemID ogItemId,
+                                          bool checkObtainability) {
+    return Rando::Context::GetInstance()->GetFinalGIEntry(GetCheckFromActor(actorId, sceneNum, actorParams),
+                                                          checkObtainability, ogItemId);
 }
 
 ItemObtainability Randomizer::GetItemObtainabilityFromRandomizerCheck(RandomizerCheck randomizerCheck) {
-    return GetItemObtainabilityFromRandomizerGet(GetRandomizerGetDataFromKnownCheck(randomizerCheck).rgID);
+    return GetItemObtainabilityFromRandomizerGet(
+        Rando::Context::GetInstance()->GetItemLocation(randomizerCheck)->GetPlacedRandomizerGet());
 }
 
 ItemObtainability Randomizer::GetItemObtainabilityFromRandomizerGet(RandomizerGet randoGet) {
@@ -2403,30 +1262,10 @@ bool Randomizer::IsItemVanilla(RandomizerGet randoGet) {
 }
 
 bool Randomizer::CheckContainsVanillaItem(RandomizerCheck randoCheck) {
-    RandomizerGet randoGet = this->itemLocations[randoCheck].rgID;
+    RandomizerGet randoGet = Rando::Context::GetInstance()->GetItemLocation(randoCheck)->GetPlacedRandomizerGet();
     return IsItemVanilla(randoGet);
 }
 
-std::string Randomizer::GetAdultAltarText() const {
-    return this->adultAltarText;
-}
-
-std::string Randomizer::GetChildAltarText() const {
-    return this->childAltarText;
-}
-
-std::string Randomizer::GetGanonText() const {
-    return ganonText;
-}
-
-std::string Randomizer::GetGanonHintText() const {
-    return ganonHintText;
-}
-
-std::string Randomizer::GetDampeText() const {
-    return dampeText;
-}
-
 // There has been some talk about potentially just using the RC identifier to store flags rather than randomizer inf, so
 // for now we're not going to store randomzierInf in the randomizer check objects, we're just going to map them 1:1 here
 std::map<RandomizerCheck, RandomizerInf> rcToRandomizerInf = {
@@ -2712,9 +1551,7 @@ ScrubIdentity Randomizer::IdentifyScrub(s32 sceneNum, s32 actorParams, s32 respa
             scrubIdentity.isShuffled = true;
         }
 
-        if (merchantPrices.find(scrubIdentity.randomizerCheck) != merchantPrices.end()) {
-            scrubIdentity.itemPrice = merchantPrices[scrubIdentity.randomizerCheck];
-        }
+        scrubIdentity.itemPrice = OTRGlobals::Instance->gRandoContext->GetItemLocation(scrubIdentity.randomizerCheck)->GetPrice();
     }
 
     return scrubIdentity;
@@ -2738,14 +1575,13 @@ ShopItemIdentity Randomizer::IdentifyShopItem(s32 sceneNum, u8 slotIndex) {
         shopItemIdentity.randomizerCheck = location->GetRandomizerCheck();
         shopItemIdentity.ogItemId = (GetItemID)Rando::StaticData::RetrieveItem(location->GetVanillaItem()).GetItemID();
 
-        RandomizerGetData randoGet = GetRandomizerGetDataFromKnownCheck(shopItemIdentity.randomizerCheck);
-        if (randomizerGetToEnGirlShopItem.find(randoGet.rgID) != randomizerGetToEnGirlShopItem.end()) {
-            shopItemIdentity.enGirlAShopItem = randomizerGetToEnGirlShopItem[randoGet.rgID];
+        RandomizerGet randoGet =
+            Rando::Context::GetInstance()->GetItemLocation(shopItemIdentity.randomizerCheck)->GetPlacedRandomizerGet();
+        if (randomizerGetToEnGirlShopItem.find(randoGet) != randomizerGetToEnGirlShopItem.end()) {
+            shopItemIdentity.enGirlAShopItem = randomizerGetToEnGirlShopItem[randoGet];
         }
 
-        if (merchantPrices.find(shopItemIdentity.randomizerCheck) != merchantPrices.end()) {
-            shopItemIdentity.itemPrice = merchantPrices[shopItemIdentity.randomizerCheck];
-        }
+        shopItemIdentity.itemPrice = OTRGlobals::Instance->gRandoContext->GetItemLocation(shopItemIdentity.randomizerCheck)->GetPrice();
     }
 
     return shopItemIdentity;
@@ -2774,35 +1610,11 @@ CowIdentity Randomizer::IdentifyCow(s32 sceneNum, s32 posX, s32 posZ) {
 }
 
 u8 Randomizer::GetRandoSettingValue(RandomizerSettingKey randoSettingKey) {
-    return this->randoSettings[randoSettingKey];
-}
-
-GetItemEntry Randomizer::GetItemEntryFromRGData(RandomizerGetData rgData, GetItemID ogItemId, bool checkObtainability) {
-    // Go ahead and early return the ogItemId's entry if we somehow get RG_NONE.
-    if (rgData.rgID == RG_NONE) {
-        return ItemTableManager::Instance->RetrieveItemEntry(MOD_NONE, ogItemId);
-    }
-    if (checkObtainability && OTRGlobals::Instance->gRandomizer->GetItemObtainabilityFromRandomizerGet(rgData.rgID) != CAN_OBTAIN) {
-        return ItemTableManager::Instance->RetrieveItemEntry(MOD_NONE, GI_RUPEE_BLUE);
-    }
-
-    Rando::Item item = Rando::StaticData::RetrieveItem(rgData.rgID);
-    GetItemEntry giEntry = item.GetGIEntry_Copy();
-    // If we have an ice trap, we want to change the GID and drawFunc to the fakeRgID's values.
-    if (rgData.rgID == RG_ICE_TRAP) {
-        std::shared_ptr<GetItemEntry> fakeGiEntry = Rando::StaticData::RetrieveItem(rgData.fakeRgID).GetGIEntry();
-        giEntry.gid = fakeGiEntry->gid;
-        giEntry.gi = fakeGiEntry->gi;
-        giEntry.drawItemId = fakeGiEntry->drawItemId;
-        giEntry.drawModIndex = fakeGiEntry->drawModIndex;
-        giEntry.drawFunc = fakeGiEntry->drawFunc;
-    }
-    return giEntry;
+    return Rando::Context::GetInstance()->GetOption(randoSettingKey).GetSelectedOptionIndex();
 }
 
 GetItemEntry Randomizer::GetItemFromKnownCheck(RandomizerCheck randomizerCheck, GetItemID ogItemId, bool checkObtainability) {
-    RandomizerGetData rgData = this->itemLocations[randomizerCheck];
-    return GetItemEntryFromRGData(rgData, ogItemId, checkObtainability);
+    return Rando::Context::GetInstance()->GetFinalGIEntry(randomizerCheck, checkObtainability);
 }
 
 RandomizerCheck Randomizer::GetCheckFromActor(s16 actorId, s16 sceneNum, s16 actorParams) {
@@ -2870,7 +1682,7 @@ void GenerateRandomizerImgui(std::string seed = "") {
     cvarSettings[RSK_STARTING_NOCTURNE_OF_SHADOW] = CVarGetInteger("gRandomizeStartingNocturneOfShadow", 0);
     cvarSettings[RSK_STARTING_PRELUDE_OF_LIGHT] = CVarGetInteger("gRandomizeStartingPreludeOfLight", 0);
     cvarSettings[RSK_STARTING_SKULLTULA_TOKEN] = CVarGetInteger("gRandomizeStartingSkulltulaToken", 0);
-    cvarSettings[RSK_STARTING_MAPS_COMPASSES] = CVarGetInteger("gRandomizeStartingMapsCompasses", RO_DUNGEON_ITEM_LOC_OWN_DUNGEON);
+    cvarSettings[RSK_SHUFFLE_MAPANDCOMPASS] = CVarGetInteger("gRandomizeStartingMapsCompasses", RO_DUNGEON_ITEM_LOC_OWN_DUNGEON);
     cvarSettings[RSK_SHUFFLE_DUNGEON_REWARDS] = CVarGetInteger("gRandomizeShuffleDungeonReward", RO_DUNGEON_REWARDS_END_OF_DUNGEON);
     cvarSettings[RSK_SHUFFLE_SONGS] = CVarGetInteger("gRandomizeShuffleSongs", RO_SONG_SHUFFLE_SONG_LOCATIONS);
     cvarSettings[RSK_SHUFFLE_TOKENS] = CVarGetInteger("gRandomizeShuffleTokens", RO_TOKENSANITY_OFF);
@@ -2901,7 +1713,7 @@ void GenerateRandomizerImgui(std::string seed = "") {
     cvarSettings[RSK_GREG_HINT] = CVarGetInteger("gRandomizeGregHint", RO_GENERIC_OFF);
     cvarSettings[RSK_SARIA_HINT] = CVarGetInteger("gRandomizeSariaHint", RO_GENERIC_OFF);
     cvarSettings[RSK_FROGS_HINT] = CVarGetInteger("gRandomizeFrogsHint", RO_GENERIC_OFF);
-    cvarSettings[RSK_WARP_SONG_HINTS] = CVarGetInteger("gRandomizeWarpSongText", RO_GENERIC_OFF);
+    cvarSettings[RSK_WARP_SONG_HINTS] = CVarGetInteger("gRandomizeWarpSongText", RO_GENERIC_ON);
     cvarSettings[RSK_SCRUB_TEXT_HINT] = CVarGetInteger("gRandomizeScrubText", RO_GENERIC_OFF);
     cvarSettings[RSK_KAK_10_SKULLS_HINT] = CVarGetInteger("gRandomize10GSHint", RO_GENERIC_OFF);
     cvarSettings[RSK_KAK_20_SKULLS_HINT] = CVarGetInteger("gRandomize20GSHint", RO_GENERIC_OFF);
@@ -2967,15 +1779,15 @@ void GenerateRandomizerImgui(std::string seed = "") {
 
     if (OTRGlobals::Instance->HasMasterQuest() && OTRGlobals::Instance->HasOriginal()) {
         // If both OTRs are loaded.
-        cvarSettings[RSK_RANDOM_MQ_DUNGEONS] = CVarGetInteger("gRandomizeMqDungeons", RO_MQ_DUNGEONS_NONE);
+        cvarSettings[RSK_MQ_DUNGEON_RANDOM] = CVarGetInteger("gRandomizeMqDungeons", RO_MQ_DUNGEONS_NONE);
         cvarSettings[RSK_MQ_DUNGEON_COUNT] = CVarGetInteger("gRandomizeMqDungeonCount", 12);
     } else if (OTRGlobals::Instance->HasMasterQuest()) {
         // If only Master Quest is loaded.
-        cvarSettings[RSK_RANDOM_MQ_DUNGEONS] = RO_MQ_DUNGEONS_SET_NUMBER;
+        cvarSettings[RSK_MQ_DUNGEON_RANDOM] = RO_MQ_DUNGEONS_SET_NUMBER;
         cvarSettings[RSK_MQ_DUNGEON_COUNT] = 12;
     } else {
         // If only Original Quest is loaded.
-        cvarSettings[RSK_RANDOM_MQ_DUNGEONS] = RO_MQ_DUNGEONS_NONE;
+        cvarSettings[RSK_MQ_DUNGEON_RANDOM] = RO_MQ_DUNGEONS_NONE;
         cvarSettings[RSK_MQ_DUNGEON_COUNT] = 0;
     }
 
@@ -2983,18 +1795,18 @@ void GenerateRandomizerImgui(std::string seed = "") {
     cvarSettings[RSK_TRIFORCE_HUNT_PIECES_TOTAL] = CVarGetInteger("gRandomizeTriforceHuntTotalPieces", 30);
     cvarSettings[RSK_TRIFORCE_HUNT_PIECES_REQUIRED] = CVarGetInteger("gRandomizeTriforceHuntRequiredPieces", 20);
     
-    cvarSettings[RSK_MQ_DEKU_TREE] = CVarGetInteger("gRandomizeMqDungeonsDekuTree", 0);
-    cvarSettings[RSK_MQ_DODONGOS_CAVERN] = CVarGetInteger("gRandomizeMqDungeonsDodongosCavern", 0);
-    cvarSettings[RSK_MQ_JABU_JABU] = CVarGetInteger("gRandomizeMqDungeonsJabuJabu", 0);
-    cvarSettings[RSK_MQ_FOREST_TEMPLE] = CVarGetInteger("gRandomizeMqDungeonsForestTemple", 0);
-    cvarSettings[RSK_MQ_FIRE_TEMPLE] = CVarGetInteger("gRandomizeMqDungeonsFireTemple", 0);
-    cvarSettings[RSK_MQ_WATER_TEMPLE] = CVarGetInteger("gRandomizeMqDungeonsWaterTemple", 0);
-    cvarSettings[RSK_MQ_SPIRIT_TEMPLE] = CVarGetInteger("gRandomizeMqDungeonsSpiritTemple", 0);
-    cvarSettings[RSK_MQ_SHADOW_TEMPLE] = CVarGetInteger("gRandomizeMqDungeonsShadowTemple", 0);
-    cvarSettings[RSK_MQ_BOTTOM_OF_THE_WELL] = CVarGetInteger("gRandomizeMqDungeonsBottomOfTheWell", 0);
-    cvarSettings[RSK_MQ_ICE_CAVERN] = CVarGetInteger("gRandomizeMqDungeonsIceCavern", 0);
-    cvarSettings[RSK_MQ_GTG] = CVarGetInteger("gRandomizeMqDungeonsGTG", 0);
-    cvarSettings[RSK_MQ_GANONS_CASTLE] = CVarGetInteger("gRandomizeMqDungeonsGanonsCastle", 0);
+    cvarSettings[RSK_MQ_DEKU_TREE] = CVarGetInteger("gRandomizeMqDungeonsDekuTree", RO_MQ_SET_VANILLA);
+    cvarSettings[RSK_MQ_DODONGOS_CAVERN] = CVarGetInteger("gRandomizeMqDungeonsDodongosCavern", RO_MQ_SET_VANILLA);
+    cvarSettings[RSK_MQ_JABU_JABU] = CVarGetInteger("gRandomizeMqDungeonsJabuJabu", RO_MQ_SET_VANILLA);
+    cvarSettings[RSK_MQ_FOREST_TEMPLE] = CVarGetInteger("gRandomizeMqDungeonsForestTemple", RO_MQ_SET_VANILLA);
+    cvarSettings[RSK_MQ_FIRE_TEMPLE] = CVarGetInteger("gRandomizeMqDungeonsFireTemple", RO_MQ_SET_VANILLA);
+    cvarSettings[RSK_MQ_WATER_TEMPLE] = CVarGetInteger("gRandomizeMqDungeonsWaterTemple", RO_MQ_SET_VANILLA);
+    cvarSettings[RSK_MQ_SPIRIT_TEMPLE] = CVarGetInteger("gRandomizeMqDungeonsSpiritTemple", RO_MQ_SET_VANILLA);
+    cvarSettings[RSK_MQ_SHADOW_TEMPLE] = CVarGetInteger("gRandomizeMqDungeonsShadowTemple", RO_MQ_SET_VANILLA);
+    cvarSettings[RSK_MQ_BOTTOM_OF_THE_WELL] = CVarGetInteger("gRandomizeMqDungeonsBottomOfTheWell", RO_MQ_SET_VANILLA);
+    cvarSettings[RSK_MQ_ICE_CAVERN] = CVarGetInteger("gRandomizeMqDungeonsIceCavern", RO_MQ_SET_VANILLA);
+    cvarSettings[RSK_MQ_GTG] = CVarGetInteger("gRandomizeMqDungeonsGTG", RO_MQ_SET_VANILLA);
+    cvarSettings[RSK_MQ_GANONS_CASTLE] = CVarGetInteger("gRandomizeMqDungeonsGanonsCastle", RO_MQ_SET_VANILLA);
 
     // Enable if any of the entrance rando options are enabled.
     cvarSettings[RSK_SHUFFLE_ENTRANCES] = CVarGetInteger("gRandomizeShuffleDungeonsEntrances", RO_DUNGEON_ENTRANCE_SHUFFLE_OFF) ||
@@ -3061,6 +1873,10 @@ void GenerateRandomizerImgui(std::string seed = "") {
 }
 
 bool GenerateRandomizer(std::string seed /*= ""*/) {
+    if (generated) {
+        generated = 0;
+        randoThread.join();
+    }
     if (CVarGetInteger("gRandoGenerating", 0) == 0) {
         randoThread = std::thread(&GenerateRandomizerImgui, seed);
         return true;
@@ -3089,7 +1905,8 @@ void RandomizerSettingsWindow::DrawElement() {
                                           "Dungeon rewards", "Dungeons", "Tokens", "Greg" };
     static const char* randoBridgeRewardOptions[3] = { "Standard Rewards", "Greg as Reward", "Greg as Wildcard" };
     static const char* randoGanonsTrial[3] = { "Skip", "Set Number", "Random Number" };
-    static const char* randoMqDungeons[4] = { "None", "Set Number", "Random Number", "Selection" };
+    static const char* randoMqDungeons[4] = { "None", "Set Number", "Random Number", "Selection Only" };
+    static const char* randoMqDungeonOptions[3] = {"Vanilla", "Master Quest", "Random"};
 
     // World Settings
     static const char* randoStartingAge[3] = { "Child", "Adult", "Random" };
@@ -3210,7 +2027,7 @@ void RandomizerSettingsWindow::DrawElement() {
                 ImGui::PushItemWidth(-FLT_MIN);
 
                 // Forest
-                ImGui::Text("%s", Settings::OpenForest.GetName().c_str());
+                ImGui::Text("%s", ctx->GetOption(RSK_FOREST).GetName().c_str());
                 UIWidgets::InsertHelpHoverText(
                     "Closed - Kokiri sword & shield are required to access "
                     "the Deku Tree, and completing the Deku Tree is required to "
@@ -3228,7 +2045,7 @@ void RandomizerSettingsWindow::DrawElement() {
                 UIWidgets::PaddedSeparator();
 
                 // Kakariko Gate
-                ImGui::Text("%s", Settings::OpenKakariko.GetName().c_str());
+                ImGui::Text("%s", ctx->GetOption(RSK_KAK_GATE).GetName().c_str());
                 UIWidgets::InsertHelpHoverText(
                     "Closed - The gate will remain closed until Zelda's letter "
                     "is shown to the guard.\n"
@@ -3241,7 +2058,7 @@ void RandomizerSettingsWindow::DrawElement() {
                 UIWidgets::PaddedSeparator();
 
                 // Door of Time
-                ImGui::Text("%s", Settings::OpenDoorOfTime.GetName().c_str());
+                ImGui::Text("%s", ctx->GetOption(RSK_DOOR_OF_TIME).GetName().c_str());
                 UIWidgets::InsertHelpHoverText(
                     "Closed - The Ocarina of Time, the Song of Time and all "
                     "three spiritual stones are required to open the Door of Time.\n"
@@ -3256,7 +2073,7 @@ void RandomizerSettingsWindow::DrawElement() {
                 UIWidgets::PaddedSeparator();
 
                 // Zora's Fountain
-                ImGui::Text("%s", Settings::ZorasFountain.GetName().c_str());
+                ImGui::Text("%s", ctx->GetOption(RSK_ZORAS_FOUNTAIN).GetName().c_str());
                 UIWidgets::InsertHelpHoverText(
                     "Closed - King Zora obstructs the way to Zora's Fountain. "
                     "Ruto's letter must be shown as child Link in order to move "
@@ -3287,7 +2104,7 @@ void RandomizerSettingsWindow::DrawElement() {
                     (CVarGetInteger("gRandomizeShuffleOcarinas", RO_GENERIC_OFF) == RO_GENERIC_OFF)); // closed door of time with ocarina shuffle off
 
                 static const char* disableRandoStartingAgeText = "This option is disabled due to other options making the game unbeatable.";
-                ImGui::Text("%s", Settings::StartingAge.GetName().c_str());
+                ImGui::Text("%s", ctx->GetOption(RSK_STARTING_AGE).GetName().c_str());
                 UIWidgets::InsertHelpHoverText(
                     "Choose which age Link will start as.\n\n"
                     "Starting as adult means you start with the Master Sword in your inventory.\n"
@@ -3511,7 +2328,7 @@ void RandomizerSettingsWindow::DrawElement() {
                         "\n"
                         "Random Number - A Random number and set of dungeons will be their Master Quest varieties.\n"
                         "\n"
-                        "Selection - Leave unchecked for Vanilla and checked for Master Quest."
+                        "Selection Only - Specify which dungeons are Vanilla or Master Quest."
                     );
                     UIWidgets::EnhancementCombobox("gRandomizeMqDungeons", randoMqDungeons, RO_MQ_DUNGEONS_NONE);
                     ImGui::PopItemWidth();
@@ -3520,30 +2337,46 @@ void RandomizerSettingsWindow::DrawElement() {
                             "Master Quest Dungeon Count: %d", "##RandoMqDungeonCount", "gRandomizeMqDungeonCount", 1,
                             12, "", CVarGetInteger("gRandomizeMqDungeonCount", 12), true, true, false);
                     }
-                    else if (CVarGetInteger("gRandomizeMqDungeons", RO_MQ_DUNGEONS_NONE) == RO_MQ_DUNGEONS_SELECTION) {
-                        UIWidgets::EnhancementCheckbox("Deku Tree##RandomizeMqDungeons",
-                                                       "gRandomizeMqDungeonsDekuTree");
-                        UIWidgets::EnhancementCheckbox("Dodongo's Cavern##RandomizeMqDungeons",
-                                                       "gRandomizeMqDungeonsDodongosCavern");
-                        UIWidgets::EnhancementCheckbox("Jabu Jabu's Belly##RandomizeMqDungeons",
-                                                       "gRandomizeMqDungeonsJabuJabu");
-                        UIWidgets::EnhancementCheckbox("Forest Temple##RandomizeMqDungeons",
-                                                       "gRandomizeMqDungeonsForestTemple");
-                        UIWidgets::EnhancementCheckbox("Fire Temple##RandomizeMqDungeons",
-                                                       "gRandomizeMqDungeonsFireTemple");
-                        UIWidgets::EnhancementCheckbox("Water Temple##RandomizeMqDungeons",
-                                                       "gRandomizeMqDungeonsWaterTemple");
-                        UIWidgets::EnhancementCheckbox("Spirit Temple##RandomizeMqDungeons",
-                                                       "gRandomizeMqDungeonsSpiritTemple");
-                        UIWidgets::EnhancementCheckbox("Shadow Temple##RandomizeMqDungeons",
-                                                       "gRandomizeMqDungeonsShadowTemple");
-                        UIWidgets::EnhancementCheckbox("Bottom of the Well##RandomizeMqDungeons",
-                                                       "gRandomizeMqDungeonsBottomOfTheWell");
-                        UIWidgets::EnhancementCheckbox("Ice Cavern##RandomizeMqDungeons",
-                                                       "gRandomizeMqDungeonsIceCavern");
-                        UIWidgets::EnhancementCheckbox("Gerudo Training Grounds##RandomizeMqDungeons", "gRandomizeMqDungeonsGTG");
-                        UIWidgets::EnhancementCheckbox("Ganon's Castle##RandomizeMqDungeons",
-                                                       "gRandomizeMqDungeonsGanonsCastle");
+                    if (CVarGetInteger("gRandomizeMqDungeons", RO_MQ_DUNGEONS_NONE) != RO_MQ_DUNGEONS_NONE) {
+                        UIWidgets::EnhancementCheckbox(
+                            ctx->GetOption(RSK_MQ_DUNGEON_SET).GetName().c_str(), "gRandomizeMqDungeonsSelection",
+                            CVarGetInteger("gRandomizeMqDungeons", RO_MQ_DUNGEONS_NONE) == RO_MQ_DUNGEONS_SELECTION,
+                            "This option is enabled because Master Quest Dungeons is set to Selection Only",
+                            UIWidgets::CheckboxGraphics::Checkmark);
+                        UIWidgets::InsertHelpHoverText(
+                            "Choose specific Dungeons to be Master Quest or Vanilla.\n"
+                            "\n"
+                            "If Master Quest Dungeons is set to Set Number or Random, the dungeons chosen "
+                            "to be Master Quest here will count towards that total. Any Dungeons set to Vanilla "
+                            "here will be guaranteed to be Vanilla. If Set Number is higher than the amount of dungeons "
+                            "set to either MQ or Random here, you will have fewer MQ Dungeons than the number you "
+                            "set.");
+                        if (CVarGetInteger("gRandomizeMqDungeonsSelection", RO_GENERIC_OFF) == RO_GENERIC_ON) {
+                            UIWidgets::PaddedText("Deku Tree", true, false);
+                            UIWidgets::EnhancementCombobox("gRandomizeMqDungeonsDekuTree", randoMqDungeonOptions, RO_MQ_SET_VANILLA);
+                            UIWidgets::PaddedText("Dodongo's Cavern", true, false);
+                            UIWidgets::EnhancementCombobox("gRandomizeMqDungeonsDodongosCavern", randoMqDungeonOptions, RO_MQ_SET_VANILLA);
+                            UIWidgets::PaddedText("Jabu Jabu's Belly", true, false);
+                            UIWidgets::EnhancementCombobox("gRandomizeMqDungeonsJabuJabu", randoMqDungeonOptions, RO_MQ_SET_VANILLA);
+                            UIWidgets::PaddedText("Forest Temple", true, false);
+                            UIWidgets::EnhancementCombobox("gRandomizeMqDungeonsForestTemple", randoMqDungeonOptions, RO_MQ_SET_VANILLA);
+                            UIWidgets::PaddedText("Fire Temple", true, false);
+                            UIWidgets::EnhancementCombobox("gRandomizeMqDungeonsFireTemple", randoMqDungeonOptions, RO_MQ_SET_VANILLA);
+                            UIWidgets::PaddedText("Water Temple", true, false);
+                            UIWidgets::EnhancementCombobox("gRandomizeMqDungeonsWaterTemple", randoMqDungeonOptions, RO_MQ_SET_VANILLA);
+                            UIWidgets::PaddedText("Spirit Temple", true, false);
+                            UIWidgets::EnhancementCombobox("gRandomizeMqDungeonsSpiritTemple", randoMqDungeonOptions, RO_MQ_SET_VANILLA);
+                            UIWidgets::PaddedText("Shadow Temple", true, false);
+                            UIWidgets::EnhancementCombobox("gRandomizeMqDungeonsShadowTemple", randoMqDungeonOptions, RO_MQ_SET_VANILLA);
+                            UIWidgets::PaddedText("Bottom of the Well", true, false);
+                            UIWidgets::EnhancementCombobox("gRandomizeMqDungeonsBottomOfTheWell", randoMqDungeonOptions, RO_MQ_SET_VANILLA);
+                            UIWidgets::PaddedText("Ice Cavern", true, false);
+                            UIWidgets::EnhancementCombobox("gRandomizeMqDungeonsIceCavern", randoMqDungeonOptions, RO_MQ_SET_VANILLA);
+                            UIWidgets::PaddedText("Gerudo Training Grounds", true, false);
+                            UIWidgets::EnhancementCombobox("gRandomizeMqDungeonsGTG", randoMqDungeonOptions, RO_MQ_SET_VANILLA);
+                            UIWidgets::PaddedText("Ganon's Castle", true, false);
+                            UIWidgets::EnhancementCombobox("gRandomizeMqDungeonsGanonsCastle", randoMqDungeonOptions, RO_MQ_SET_VANILLA);
+                        }
                     }
 
                     UIWidgets::PaddedSeparator();
@@ -3762,7 +2595,7 @@ void RandomizerSettingsWindow::DrawElement() {
                 ImGui::PushItemWidth(-FLT_MIN);
 
                 // Shuffle Songs
-                ImGui::Text("%s", Settings::ShuffleSongs.GetName().c_str());
+                ImGui::Text("%s", ctx->GetOption(RSK_SHUFFLE_SONGS).GetName().c_str());
                 UIWidgets::InsertHelpHoverText(
                     "Song locations - Songs will only appear at locations that normally teach songs.\n"
                     "\n"
@@ -3780,7 +2613,7 @@ void RandomizerSettingsWindow::DrawElement() {
                 UIWidgets::PaddedSeparator();
 
                 // Shuffle Tokens
-                ImGui::Text("%s", Settings::Tokensanity.GetName().c_str());
+                ImGui::Text("%s", ctx->GetOption(RSK_SHUFFLE_TOKENS).GetName().c_str());
                 UIWidgets::InsertHelpHoverText(
                     "Shuffles Golden Skulltula Tokens into the item pool. This means "
                     "Golden Skulltulas can contain other items as well.\n"
@@ -3807,7 +2640,7 @@ void RandomizerSettingsWindow::DrawElement() {
                 // Disabled when Start with Kokiri Sword is active
                 bool disableShuffleKokiriSword = CVarGetInteger("gRandomizeStartingKokiriSword", 0);
                 static const char* disableShuffleKokiriSwordText = "This option is disabled because \"Start with Kokiri Sword\" is enabled.";
-                UIWidgets::EnhancementCheckbox(Settings::ShuffleKokiriSword.GetName().c_str(), "gRandomizeShuffleKokiriSword",
+                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_SHUFFLE_KOKIRI_SWORD).GetName().c_str(), "gRandomizeShuffleKokiriSword",
                                                 disableShuffleKokiriSword, disableShuffleKokiriSwordText);
                 UIWidgets::InsertHelpHoverText(
                     "Shuffles the Kokiri Sword into the item pool.\n"
@@ -3821,7 +2654,7 @@ void RandomizerSettingsWindow::DrawElement() {
                 //RANDOTODO: Disable when Start with Master Sword is active
                 // bool disableShuffleMasterSword = CvarGetInteger("gRandomizeStartingMasterSword", 0);
                 // static const char* disableShuffleMasterSwordText = "This option is disabled because \"Start with Master Sword\" is enabled.";
-                UIWidgets::EnhancementCheckbox(Settings::ShuffleMasterSword.GetName().c_str(), "gRandomizeShuffleMasterSword");
+                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_SHUFFLE_MASTER_SWORD).GetName().c_str(), "gRandomizeShuffleMasterSword");
                 UIWidgets::InsertHelpHoverText(
                     "Shuffles the Master Sword into the item pool.\n"
                     "\n"
@@ -3835,7 +2668,7 @@ void RandomizerSettingsWindow::DrawElement() {
                 // Disabled when Start with Ocarina is active
                 bool disableShuffleOcarinas = CVarGetInteger("gRandomizeStartingOcarina", 0);
                 static const char* disableShuffleOcarinasText = "This option is disabled because \"Start with Fairy Ocarina\" is enabled.";
-                UIWidgets::EnhancementCheckbox(Settings::ShuffleOcarinas.GetName().c_str(), "gRandomizeShuffleOcarinas",
+                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_SHUFFLE_OCARINA).GetName().c_str(), "gRandomizeShuffleOcarinas",
                                               disableShuffleOcarinas, disableShuffleOcarinasText);
                 UIWidgets::InsertHelpHoverText(
                     "Enabling this shuffles the Fairy Ocarina and the Ocarina of Time into the item pool.\n"
@@ -3849,7 +2682,7 @@ void RandomizerSettingsWindow::DrawElement() {
                 // Disabled when Skip Child Zelda is active
                 bool disableShuffleWeirdEgg = CVarGetInteger("gRandomizeSkipChildZelda", 0);
                 static const char* disableShuffleWeirdEggText = "This option is disabled because \"Skip Child Zelda\" is enabled.";
-                UIWidgets::EnhancementCheckbox(Settings::ShuffleWeirdEgg.GetName().c_str(), "gRandomizeShuffleWeirdEgg",
+                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_SHUFFLE_WEIRD_EGG).GetName().c_str(), "gRandomizeShuffleWeirdEgg",
                                               disableShuffleWeirdEgg, disableShuffleWeirdEggText);
                 UIWidgets::InsertHelpHoverText(
                     "Shuffles the Weird Egg from Malon in to the item pool. Enabling "
@@ -3866,7 +2699,7 @@ void RandomizerSettingsWindow::DrawElement() {
                 UIWidgets::PaddedSeparator();
 
                 // Shuffle Gerudo Membership Card
-                UIWidgets::EnhancementCheckbox(Settings::ShuffleGerudoToken.GetName().c_str(), "gRandomizeShuffleGerudoToken");
+                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD).GetName().c_str(), "gRandomizeShuffleGerudoToken");
                 UIWidgets::InsertHelpHoverText(
                     "Shuffles the Gerudo Membership Card into the item pool.\n"
                     "\n"
@@ -3886,7 +2719,7 @@ void RandomizerSettingsWindow::DrawElement() {
                 ImGui::PushItemWidth(-FLT_MIN);
 
                 // Shopsanity
-                ImGui::Text("%s", Settings::Shopsanity.GetName().c_str());
+                ImGui::Text("%s", ctx->GetOption(RSK_SHOPSANITY).GetName().c_str());
                 UIWidgets::InsertHelpHoverText(
                     "Off - All shop items will be the same as vanilla.\n"
                     "\n"
@@ -3904,7 +2737,7 @@ void RandomizerSettingsWindow::DrawElement() {
                     case RO_SHOPSANITY_ZERO_ITEMS: // no need to show it if there aren't shop slots in the pool
                         break;
                     default:
-                        ImGui::Text("%s", Settings::ShopsanityPrices.GetName().c_str());
+                        ImGui::Text("%s", ctx->GetOption(RSK_SHOPSANITY_PRICES).GetName().c_str());
                         UIWidgets::InsertHelpHoverText(
                             "Balanced - The default randomization. Shop prices for shopsanity items will range between 0 to 300 rupees, "
                             "with a bias towards values slightly below the middle of the range, in multiples of 5.\n "
@@ -3912,7 +2745,7 @@ void RandomizerSettingsWindow::DrawElement() {
                             "X Wallet - Randomized between 5 and the wallet's max size, in multiples of 5"
                         );
                         UIWidgets::EnhancementCombobox("gRandomizeShopsanityPrices", randoShopsanityPrices, RO_SHOPSANITY_PRICE_BALANCED);
-                        UIWidgets::EnhancementCheckbox(Settings::ShopsanityPricesAffordable.GetName().c_str(), "gRandomizeShopsanityPricesAffordable",
+                        UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_SHOPSANITY_PRICES_AFFORDABLE).GetName().c_str(), "gRandomizeShopsanityPricesAffordable",
                             CVarGetInteger("gRandomizeShopsanityPrices", RO_SHOPSANITY_PRICE_BALANCED) == RO_SHOPSANITY_PRICE_BALANCED,
                             "This can only apply to a wallet range.");
                         UIWidgets::InsertHelpHoverText("Random selection between the selected wallet tier's affordable price and the affordable prices of the preceding wallet tiers.\n\n"
@@ -3923,7 +2756,7 @@ void RandomizerSettingsWindow::DrawElement() {
                 UIWidgets::PaddedSeparator();
 
                 // Shuffle Scrubs
-                ImGui::Text("%s", Settings::Scrubsanity.GetName().c_str());
+                ImGui::Text("%s", ctx->GetOption(RSK_SHUFFLE_SCRUBS).GetName().c_str());
                 UIWidgets::InsertHelpHoverText(
                     "Off - Scrubs will not be shuffled. The 3 Scrubs that give one-time items in the vanilla game "
                     "(PoH, Deku Nut capacity, and Deku Stick capacity) will have random items.\n"
@@ -3938,12 +2771,12 @@ void RandomizerSettingsWindow::DrawElement() {
                 UIWidgets::PaddedSeparator();
 
                 // Shuffle Cows
-                UIWidgets::EnhancementCheckbox(Settings::ShuffleCows.GetName().c_str(), "gRandomizeShuffleCows");
+                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_SHUFFLE_COWS).GetName().c_str(), "gRandomizeShuffleCows");
                 UIWidgets::InsertHelpHoverText("Cows give a randomized item from the pool upon performing Epona's Song in front of them.");
 
                 UIWidgets::PaddedSeparator();
 
-                UIWidgets::EnhancementCheckbox(Settings::ShuffleMagicBeans.GetName().c_str(), "gRandomizeShuffleBeans");
+                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_SHUFFLE_MAGIC_BEANS).GetName().c_str(), "gRandomizeShuffleBeans");
                 UIWidgets::InsertHelpHoverText(
                     "Enabling this adds a pack of 10 beans to the item pool and changes the Magic Bean "
                     "Salesman to sell a random item at a price of 60 rupees."
@@ -3952,7 +2785,7 @@ void RandomizerSettingsWindow::DrawElement() {
                 UIWidgets::PaddedSeparator();
 
                 // Shuffle Merchants
-                ImGui::Text("%s", Settings::ShuffleMerchants.GetName().c_str());
+                ImGui::Text("%s", ctx->GetOption(RSK_SHUFFLE_MERCHANTS).GetName().c_str());
                 UIWidgets::InsertHelpHoverText(
                     "Enabling this changes Medigoron, Granny and the Carpet Salesman to sell a random item "
                     "once at a high price (100 for Granny, 200 for the others).\n"
@@ -3969,7 +2802,7 @@ void RandomizerSettingsWindow::DrawElement() {
                 UIWidgets::PaddedSeparator();
 
                 // Shuffle Frog Song Rupees
-                UIWidgets::EnhancementCheckbox(Settings::ShuffleFrogSongRupees.GetName().c_str(), "gRandomizeShuffleFrogSongRupees");
+                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_SHUFFLE_FROG_SONG_RUPEES).GetName().c_str(), "gRandomizeShuffleFrogSongRupees");
                 UIWidgets::InsertHelpHoverText(
                     "Shuffles 5 Purple Rupees into to the item pool, and allows\n"
                     "you to earn items by playing songs at the Frog Choir.\n"
@@ -3981,7 +2814,7 @@ void RandomizerSettingsWindow::DrawElement() {
                 UIWidgets::PaddedSeparator();
 
                 // Shuffle Adult Trade Quest
-                UIWidgets::EnhancementCheckbox(Settings::ShuffleAdultTradeQuest.GetName().c_str(), "gRandomizeShuffleAdultTrade");
+                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE).GetName().c_str(), "gRandomizeShuffleAdultTrade");
                 UIWidgets::InsertHelpHoverText(
                     "Adds all of the adult trade quest items into the pool, each of which "
                     "can be traded for a unique reward.\n"
@@ -4000,7 +2833,7 @@ void RandomizerSettingsWindow::DrawElement() {
                 bool forceEnable100GSShuffle =
                     (CVarGetInteger("gRandomizeShuffleGanonBossKey", RO_GANON_BOSS_KEY_VANILLA) == RO_GANON_BOSS_KEY_KAK_TOKENS);
                 static const char* disable100GSRewardText = "This option is forcefully enabled because \"Ganon's Boss Key\" is set to \"100 GS Reward.\"";
-                UIWidgets::EnhancementCheckbox(Settings::Shuffle100GSReward.GetName().c_str(), "gRandomizeShuffle100GSReward",
+                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_SHUFFLE_100_GS_REWARD).GetName().c_str(), "gRandomizeShuffle100GSReward",
                     forceEnable100GSShuffle, disable100GSRewardText, UIWidgets::CheckboxGraphics::Checkmark);
                 UIWidgets::InsertHelpHoverText(
                     "Shuffle the item the cursed rich man in the House of Skulltula gives when you "
@@ -4021,7 +2854,7 @@ void RandomizerSettingsWindow::DrawElement() {
                 ImGui::PushItemWidth(-FLT_MIN);
 
                 // Shuffle Dungeon Rewards
-                ImGui::Text("%s", Settings::ShuffleRewards.GetName().c_str());
+                ImGui::Text("%s", ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).GetName().c_str());
                 UIWidgets::InsertHelpHoverText(
                     "Shuffles the location of spiritual stones and medallions.\n"
                     "\n"
@@ -4039,7 +2872,7 @@ void RandomizerSettingsWindow::DrawElement() {
                 UIWidgets::PaddedSeparator();
 
                 // Maps & Compasses
-                ImGui::Text("%s", Settings::MapsAndCompasses.GetName().c_str());
+                ImGui::Text("%s", ctx->GetOption(RSK_SHUFFLE_MAPANDCOMPASS).GetName().c_str());
                 UIWidgets::InsertHelpHoverText(
                     "Start with - You will start with Maps & Compasses from all dungeons.\n"
                     "\n"
@@ -4058,7 +2891,7 @@ void RandomizerSettingsWindow::DrawElement() {
                 UIWidgets::PaddedSeparator();
 
                 // Keysanity
-                ImGui::Text("%s", Settings::Keysanity.GetName().c_str());
+                ImGui::Text("%s", ctx->GetOption(RSK_KEYSANITY).GetName().c_str());
                 UIWidgets::InsertHelpHoverText(
                     "Start with - You will start with all Small Keys from all dungeons.\n"
                     "\n"
@@ -4079,7 +2912,7 @@ void RandomizerSettingsWindow::DrawElement() {
                 UIWidgets::PaddedSeparator();
 
                  // Key Rings
-                ImGui::Text("%s", Settings::KeyRings.GetName().c_str());
+                ImGui::Text("%s", ctx->GetOption(RSK_KEYRINGS).GetName().c_str());
                 UIWidgets::InsertHelpHoverText(
                     "Keyrings will replace all small keys from a particular dungeon with a single keyring that awards all keys for it's associated dungeon\n"
                     "\n"
@@ -4130,7 +2963,7 @@ void RandomizerSettingsWindow::DrawElement() {
                 UIWidgets::PaddedSeparator();
 
                 // Gerudo Keys
-                ImGui::Text("%s", Settings::GerudoKeys.GetName().c_str());
+                ImGui::Text("%s", ctx->GetOption(RSK_GERUDO_KEYS).GetName().c_str());
                 UIWidgets::InsertHelpHoverText(
                     "Vanilla - Thieve's Hideout Keys will appear in their vanilla locations.\n"
                     "\n"
@@ -4145,7 +2978,7 @@ void RandomizerSettingsWindow::DrawElement() {
                 UIWidgets::PaddedSeparator();
 
                 // Boss Keysanity
-                ImGui::Text("%s", Settings::BossKeysanity.GetName().c_str());
+                ImGui::Text("%s", ctx->GetOption(RSK_BOSS_KEYSANITY).GetName().c_str());
                 UIWidgets::InsertHelpHoverText(
                     "Start with - You will start with Boss keys from all dungeons.\n"
                     "\n"
@@ -4164,7 +2997,7 @@ void RandomizerSettingsWindow::DrawElement() {
                 UIWidgets::PaddedSeparator();
 
                 // Ganon's Boss Key
-                ImGui::Text("%s", Settings::GanonsBossKey.GetName().c_str());
+                ImGui::Text("%s", ctx->GetOption(RSK_GANONS_BOSS_KEY).GetName().c_str());
                 UIWidgets::InsertHelpHoverText(
                     "Vanilla - Ganon's Boss Key will appear in the vanilla location.\n"
                     "\n"
@@ -4366,38 +3199,38 @@ void RandomizerSettingsWindow::DrawElement() {
                 // Disabled when Skip Child Zelda is active
                 bool disableChildStealth = CVarGetInteger("gRandomizeSkipChildZelda", 0);
                 static const char* disableChildStealthText = "This option is disabled because \"Skip Child Zelda\" is enabled";
-                UIWidgets::EnhancementCheckbox(Settings::SkipChildStealth.GetName().c_str(), "gRandomizeSkipChildStealth", disableChildStealth, disableChildStealthText);
+                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_SKIP_CHILD_STEALTH).GetName().c_str(), "gRandomizeSkipChildStealth", disableChildStealth, disableChildStealthText);
                 UIWidgets::InsertHelpHoverText("The crawlspace into Hyrule Castle goes straight to Zelda, skipping the guards.");
 
                 UIWidgets::PaddedSeparator();
 
                 // Skip child zelda
-                UIWidgets::EnhancementCheckbox("Skip Child Zelda", "gRandomizeSkipChildZelda");
+                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_SKIP_CHILD_ZELDA).GetName().c_str(), "gRandomizeSkipChildZelda");
                 UIWidgets::InsertHelpHoverText("Start with Zelda's Letter and the item Impa would normally give you and skip the sequence up "
                                     "until after meeting Zelda. Disables the ability to shuffle Weird Egg.");
 
                 UIWidgets::PaddedSeparator();
 
                 // Skip Epona race
-                UIWidgets::EnhancementCheckbox(Settings::SkipEponaRace.GetName().c_str(), "gRandomizeSkipEponaRace");
+                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_SKIP_EPONA_RACE).GetName().c_str(), "gRandomizeSkipEponaRace");
                 UIWidgets::InsertHelpHoverText("Epona can be summoned with Epona's Song without needing to race Ingo.");
 
                 UIWidgets::PaddedSeparator();
 
                 // Skip tower escape
-                UIWidgets::EnhancementCheckbox(Settings::SkipTowerEscape.GetName().c_str(), "gRandomizeSkipTowerEscape");
+                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_SKIP_TOWER_ESCAPE).GetName().c_str(), "gRandomizeSkipTowerEscape");
                 UIWidgets::InsertHelpHoverText("The tower escape sequence between Ganondorf and Ganon will be skipped.");
 
                 UIWidgets::PaddedSeparator();
 
                 // Complete mask quest
-                UIWidgets::EnhancementCheckbox(Settings::CompleteMaskQuest.GetName().c_str(), "gRandomizeCompleteMaskQuest");
+                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_COMPLETE_MASK_QUEST).GetName().c_str(), "gRandomizeCompleteMaskQuest");
                 UIWidgets::InsertHelpHoverText("Once the happy mask shop is opened, all masks will be available to be borrowed.");
 
                 UIWidgets::PaddedSeparator();
 
                 // Skip Scarecrow Song
-                UIWidgets::EnhancementCheckbox(Settings::FreeScarecrow.GetName().c_str(), "gRandomizeSkipScarecrowsSong");
+                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_SKIP_SCARECROWS_SONG).GetName().c_str(), "gRandomizeSkipScarecrowsSong");
                 UIWidgets::InsertHelpHoverText(
                     "Start with the ability to summon Pierre the scarecrow. Pulling out an ocarina in the usual locations will automatically summon him."
                 );
@@ -4413,7 +3246,7 @@ void RandomizerSettingsWindow::DrawElement() {
                 ImGui::PushItemWidth(-FLT_MIN);
 
                 // Item Pool Settings
-                ImGui::Text("%s", Settings::ItemPoolValue.GetName().c_str());
+                ImGui::Text("%s", ctx->GetOption(RSK_ITEM_POOL).GetName().c_str());
                 UIWidgets::InsertHelpHoverText(
                     "Sets how many major items appear in the item pool.\n"
                     "\n"
@@ -4429,7 +3262,7 @@ void RandomizerSettingsWindow::DrawElement() {
                 UIWidgets::PaddedSeparator();
 
                 // Ice Traps
-                ImGui::Text("%s", Settings::IceTrapValue.GetName().c_str());
+                ImGui::Text("%s", ctx->GetOption(RSK_ICE_TRAPS).GetName().c_str());
                 UIWidgets::InsertHelpHoverText(
                     "Sets how many items are replaced by ice traps.\n"
                     "\n"
@@ -4449,7 +3282,7 @@ void RandomizerSettingsWindow::DrawElement() {
                 UIWidgets::PaddedSeparator();
 
                 // Gossip Stone Hints
-                ImGui::Text("%s", Settings::GossipStoneHints.GetName().c_str());
+                ImGui::Text("%s", ctx->GetOption(RSK_GOSSIP_STONE_HINTS).GetName().c_str());
                 UIWidgets::InsertHelpHoverText(
                     "Allows Gossip Stones to provide hints on item locations. Hints mentioning "
                     "\"Way of the Hero\" indicate a location that holds an item required to beat "
@@ -4467,7 +3300,7 @@ void RandomizerSettingsWindow::DrawElement() {
                     // Hint Clarity
                     UIWidgets::Spacer(0);
                     ImGui::Indent();
-                    ImGui::Text("%s", Settings::ClearerHints.GetName().c_str());
+                    ImGui::Text("%s", ctx->GetOption(RSK_HINT_CLARITY).GetName().c_str());
                     UIWidgets::InsertHelpHoverText(
                         "Sets the difficulty of hints.\n"
                         "\n"
@@ -4484,7 +3317,7 @@ void RandomizerSettingsWindow::DrawElement() {
 
                     // Hint Distribution
                     UIWidgets::Spacer(0);
-                    ImGui::Text("%s", Settings::HintDistribution.GetName().c_str());
+                    ImGui::Text("%s", ctx->GetOption(RSK_HINT_DISTRIBUTION).GetName().c_str());
                     UIWidgets::InsertHelpHoverText(
                         "Sets how many hints will be useful.\n"
                         "\n"
@@ -4555,7 +3388,7 @@ void RandomizerSettingsWindow::DrawElement() {
                 UIWidgets::PaddedSeparator();
 
                 // Bombchus in Logic
-                UIWidgets::EnhancementCheckbox(Settings::BombchusInLogic.GetName().c_str(), "gRandomizeBombchusInLogic");
+                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC).GetName().c_str(), "gRandomizeBombchusInLogic");
                 UIWidgets::InsertHelpHoverText(
                     "Bombchus are properly considered in logic.\n"
                     "\n"
@@ -4756,7 +3589,7 @@ void RandomizerSettingsWindow::DrawElement() {
                 UIWidgets::EnhancementCombobox("gRandomizeLogicRules", randoLogicRules, RO_LOGIC_GLITCHLESS);
                 if (CVarGetInteger("gRandomizeLogicRules", RO_LOGIC_GLITCHLESS) != RO_LOGIC_NO_LOGIC) {
                     ImGui::SameLine();
-                    UIWidgets::EnhancementCheckbox(Settings::LocationsReachable.GetName().c_str(), "gRandomizeAllLocationsReachable", false, "", UIWidgets::CheckboxGraphics::Cross, RO_GENERIC_ON);
+                    UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_ALL_LOCATIONS_REACHABLE).GetName().c_str(), "gRandomizeAllLocationsReachable", false, "", UIWidgets::CheckboxGraphics::Cross, RO_GENERIC_ON);
                     UIWidgets::InsertHelpHoverText(
                         "When this options is enabled, the randomizer will "
                         "guarantee that every item is obtainable and every "
@@ -4769,7 +3602,7 @@ void RandomizerSettingsWindow::DrawElement() {
                 UIWidgets::PaddedSeparator();
 
                 // Enable Glitch-Useful Cutscenes
-                UIWidgets::EnhancementCheckbox(Settings::EnableGlitchCutscenes.GetName().c_str(), "gRandomizeEnableGlitchCutscenes");
+                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_ENABLE_GLITCH_CUTSCENES).GetName().c_str(), "gRandomizeEnableGlitchCutscenes");
                 UIWidgets::InsertHelpHoverText(
                     "The cutscenes of the Poes in Forest Temple and Darunia in Fire Temple will not be skipped. "
                     "These cutscenes are only useful for glitched gameplay and can be safely skipped otherwise.");
@@ -5174,14 +4007,14 @@ void RandomizerSettingsWindow::DrawElement() {
                 // Don't display this option if Dungeon Rewards are Shuffled to End of Dungeon.
                 // TODO: Show this but disabled when we have options for disabled Comboboxes.
                 if (CVarGetInteger("gRandomizeShuffleDungeonReward", RO_DUNGEON_REWARDS_END_OF_DUNGEON) != RO_DUNGEON_REWARDS_END_OF_DUNGEON) {
-                    ImGui::Text("%s", Settings::LinksPocketItem.GetName().c_str());
+                    ImGui::Text("%s", ctx->GetOption(RSK_LINKS_POCKET).GetName().c_str());
                     UIWidgets::EnhancementCombobox("gRandomizeLinksPocket", randoLinksPocket, RO_LINKS_POCKET_DUNGEON_REWARD);
                     UIWidgets::PaddedSeparator();
                 }
 
-                UIWidgets::EnhancementCheckbox(Settings::StartingKokiriSword.GetName().c_str(), "gRandomizeStartingKokiriSword");
+                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_STARTING_KOKIRI_SWORD).GetName().c_str(), "gRandomizeStartingKokiriSword");
                 UIWidgets::PaddedSeparator();
-                UIWidgets::EnhancementCheckbox(Settings::StartingDekuShield.GetName().c_str(), "gRandomizeStartingDekuShield");
+                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_STARTING_DEKU_SHIELD).GetName().c_str(), "gRandomizeStartingDekuShield");
 
                 UIWidgets::PaddedSeparator();
 
@@ -5192,9 +4025,9 @@ void RandomizerSettingsWindow::DrawElement() {
                 window->DC.CurrLineTextBaseOffset = 0.0f;
                 ImGui::BeginChild("ChildStartingItems", ImVec2(0, -8));
 
-                UIWidgets::EnhancementCheckbox(Settings::StartingOcarina.GetName().c_str(), "gRandomizeStartingOcarina");
+                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_STARTING_OCARINA).GetName().c_str(), "gRandomizeStartingOcarina");
                 UIWidgets::PaddedSeparator();
-                UIWidgets::EnhancementCheckbox(Settings::StartingConsumables.GetName().c_str(), "gRandomizeStartingConsumables");
+                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_STARTING_CONSUMABLES).GetName().c_str(), "gRandomizeStartingConsumables");
                 UIWidgets::PaddedSeparator();
                 UIWidgets::EnhancementSliderInt("Gold Skulltula Tokens: %d", "##RandoStartingSkulltulaToken", "gRandomizeStartingSkulltulaToken", 0, 100, "", 0);
                 UIWidgets::PaddedSeparator();
@@ -5205,22 +4038,22 @@ void RandomizerSettingsWindow::DrawElement() {
                 ImGui::TableNextColumn();
                 window->DC.CurrLineTextBaseOffset = 0.0f;
                 ImGui::BeginChild("ChildStartingSongs", ImVec2(0, -8));
-                UIWidgets::EnhancementCheckbox(Settings::StartingZeldasLullaby.GetName().c_str(), "gRandomizeStartingZeldasLullaby");
-                UIWidgets::EnhancementCheckbox(Settings::StartingEponasSong.GetName().c_str(), "gRandomizeStartingEponasSong");
-                UIWidgets::EnhancementCheckbox(Settings::StartingSariasSong.GetName().c_str(), "gRandomizeStartingSariasSong");
-                UIWidgets::EnhancementCheckbox(Settings::StartingSunsSong.GetName().c_str(), "gRandomizeStartingSunsSong");
-                UIWidgets::EnhancementCheckbox(Settings::StartingSongOfTime.GetName().c_str(), "gRandomizeStartingSongOfTime");
-                UIWidgets::EnhancementCheckbox(Settings::StartingSongOfStorms.GetName().c_str(), "gRandomizeStartingSongOfStorms");
+                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_STARTING_ZELDAS_LULLABY).GetName().c_str(), "gRandomizeStartingZeldasLullaby");
+                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_STARTING_EPONAS_SONG).GetName().c_str(), "gRandomizeStartingEponasSong");
+                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_STARTING_SARIAS_SONG).GetName().c_str(), "gRandomizeStartingSariasSong");
+                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_STARTING_SUNS_SONG).GetName().c_str(), "gRandomizeStartingSunsSong");
+                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_STARTING_SONG_OF_TIME).GetName().c_str(), "gRandomizeStartingSongOfTime");
+                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_STARTING_SONG_OF_STORMS).GetName().c_str(), "gRandomizeStartingSongOfStorms");
                 UIWidgets::PaddedSeparator();
 
                 ImGui::Text("Warp Songs");
                 UIWidgets::PaddedSeparator();
-                UIWidgets::EnhancementCheckbox(Settings::StartingMinuetOfForest.GetName().c_str(), "gRandomizeStartingMinuetOfForest");
-                UIWidgets::EnhancementCheckbox(Settings::StartingBoleroOfFire.GetName().c_str(), "gRandomizeStartingBoleroOfFire");
-                UIWidgets::EnhancementCheckbox(Settings::StartingSerenadeOfWater.GetName().c_str(), "gRandomizeStartingSerenadeOfWater");
-                UIWidgets::EnhancementCheckbox(Settings::StartingRequiemOfSpirit.GetName().c_str(), "gRandomizeStartingRequiemOfSpirit");
-                UIWidgets::EnhancementCheckbox(Settings::StartingNocturneOfShadow.GetName().c_str(), "gRandomizeStartingNocturneOfShadow");
-                UIWidgets::EnhancementCheckbox(Settings::StartingPreludeOfLight.GetName().c_str(), "gRandomizeStartingPreludeOfLight");
+                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_STARTING_MINUET_OF_FOREST).GetName().c_str(), "gRandomizeStartingMinuetOfForest");
+                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_STARTING_BOLERO_OF_FIRE).GetName().c_str(), "gRandomizeStartingBoleroOfFire");
+                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_STARTING_SERENADE_OF_WATER).GetName().c_str(), "gRandomizeStartingSerenadeOfWater");
+                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_STARTING_REQUIEM_OF_SPIRIT).GetName().c_str(), "gRandomizeStartingRequiemOfSpirit");
+                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_STARTING_NOCTURNE_OF_SHADOW).GetName().c_str(), "gRandomizeStartingNocturneOfShadow");
+                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_STARTING_PRELUDE_OF_LIGHT).GetName().c_str(), "gRandomizeStartingPreludeOfLight");
                 UIWidgets::PaddedSeparator();
 
                 ImGui::EndChild();
@@ -5254,42 +4087,54 @@ CustomMessage Randomizer::GetWarpSongMessage(u16 textId, bool mysterious) {
         return messageEntry;
     }
 
-    const char* locationName;
+    auto ctx = Rando::Context::GetInstance();
+    RandomizerHintKey locHintKey = RH_NONE;
     switch (textId) {
         case TEXT_WARP_MINUET_OF_FOREST:
-            locationName = gSaveContext.warpMinuetText;
+            locHintKey = RH_MINUET_WARP_LOC;
             break;
         case TEXT_WARP_BOLERO_OF_FIRE:
-            locationName = gSaveContext.warpBoleroText;
+            locHintKey = RH_BOLERO_WARP_LOC;
             break;
         case TEXT_WARP_SERENADE_OF_WATER:
-            locationName = gSaveContext.warpSerenadeText;
+            locHintKey = RH_SERENADE_WARP_LOC;
             break;
         case TEXT_WARP_REQUIEM_OF_SPIRIT:
-            locationName = gSaveContext.warpRequiemText;
+            locHintKey = RH_REQUIEM_WARP_LOC;
             break;
         case TEXT_WARP_NOCTURNE_OF_SHADOW:
-            locationName = gSaveContext.warpNocturneText;
+            locHintKey = RH_NOCTURNE_WARP_LOC;
             break;
         case TEXT_WARP_PRELUDE_OF_LIGHT:
-            locationName = gSaveContext.warpPreludeText;
+            locHintKey = RH_PRELUDE_WARP_LOC;
+            break;
+    }
+    std::string locationName = "";
+    switch (gSaveContext.language) {
+        case LANGUAGE_FRA:
+            locationName = ctx->GetHint(locHintKey)->GetText().GetFrench();
+            break;
+        case LANGUAGE_ENG:
+        default:
+            locationName = ctx->GetHint(locHintKey)->GetText().GetEnglish();
             break;
     }
 
-    messageEntry.Replace("{{location}}", locationName);
+    messageEntry.Replace("{{location}}", std::move(locationName));
     return messageEntry;
 }
 
 CustomMessage Randomizer::GetFrogsMessage(u16 originalTextId) {
+    auto ctx = Rando::Context::GetInstance();
     CustomMessage messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::randoMiscHintsTableID, originalTextId);
-        RandomizerGet frogsGet = this->itemLocations[RC_ZR_FROGS_OCARINA_GAME].rgID;
+        RandomizerGet frogsGet = ctx->GetItemLocation(RC_ZR_FROGS_OCARINA_GAME)->GetPlacedRandomizerGet();
         std::array<std::string, LANGUAGE_MAX> frogItemName;
         if (frogsGet == RG_ICE_TRAP) {
-            frogsGet = this->itemLocations[RC_ZR_FROGS_OCARINA_GAME].fakeRgID;
+            frogsGet = ctx->overrides[RC_ZR_FROGS_OCARINA_GAME].LooksLike();
             frogItemName = {
-                this->itemLocations[RC_ZR_FROGS_OCARINA_GAME].trickName,
-                this->itemLocations[RC_ZR_FROGS_OCARINA_GAME].trickName,
-                this->itemLocations[RC_ZR_FROGS_OCARINA_GAME].trickName
+                ctx->overrides[RC_ZR_FROGS_OCARINA_GAME].GetTrickName().english,
+                ctx->overrides[RC_ZR_FROGS_OCARINA_GAME].GetTrickName().french,
+                ctx->overrides[RC_ZR_FROGS_OCARINA_GAME].GetTrickName().english
             };
         } else {
             frogItemName = EnumToSpoilerfileGetName[frogsGet];
@@ -5299,6 +4144,7 @@ CustomMessage Randomizer::GetFrogsMessage(u16 originalTextId) {
 }
 
 CustomMessage Randomizer::GetSheikMessage(s16 scene, u16 originalTextId) {
+    auto ctx = Rando::Context::GetInstance();
     CustomMessage messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::hintMessageTableID, originalTextId);
     switch (scene) {
         case SCENE_TEMPLE_OF_TIME:
@@ -5322,7 +4168,7 @@ CustomMessage Randomizer::GetSheikMessage(s16 scene, u16 originalTextId) {
                   (!CHECK_OWNED_EQUIP(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_MASTER) || INV_CONTENT(ITEM_ARROW_LIGHT) != ITEM_ARROW_LIGHT) :
                   (INV_CONTENT(ITEM_ARROW_LIGHT) != ITEM_ARROW_LIGHT);
                 if (needRequirements) {
-                    messageEntry.Replace("{{message}}", gSaveContext.sheikText, gSaveContext.sheikText, gSaveContext.sheikText);
+                    messageEntry.Replace("{{message}}", ctx->GetHint(RH_SHEIK_LIGHT_ARROWS)->GetText().GetEnglish().c_str(), ctx->GetHint(RH_SHEIK_LIGHT_ARROWS)->GetText().GetEnglish().c_str(), ctx->GetHint(RH_SHEIK_LIGHT_ARROWS)->GetText().GetFrench().c_str());
                 } else {
                     messageEntry.Replace("{{message}}", "You are still ill-equipped to&face %rGanondorf%w."
                     "^Seek out the %cMaster Sword%w,&%rsomething to hold your arrows%w,&and %gmagic%w to summon the %ylight%w.",
@@ -5360,9 +4206,10 @@ CustomMessage Randomizer::GetSariaMessage(u16 originalTextId) {
 }
 
 CustomMessage Randomizer::GetMerchantMessage(RandomizerInf randomizerInf, u16 textId, bool mysterious) {
+    auto ctx = Rando::Context::GetInstance();
     CustomMessage messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::merchantMessageTableID, textId);
     RandomizerCheck rc = GetCheckFromRandomizerInf(randomizerInf);
-    RandomizerGet shopItemGet = this->itemLocations[rc].rgID;
+    RandomizerGet shopItemGet = ctx->GetItemLocation(rc)->GetPlacedRandomizerGet();
     std::array<std::string, LANGUAGE_MAX> shopItemName;
     if (mysterious) {
         shopItemName = {
@@ -5372,16 +4219,16 @@ CustomMessage Randomizer::GetMerchantMessage(RandomizerInf randomizerInf, u16 te
         };
     // TODO: This should eventually be replaced with a full fledged trick model & trick name system
     } else if (shopItemGet == RG_ICE_TRAP) {
-        shopItemGet = this->itemLocations[rc].fakeRgID;
+        shopItemGet = ctx->overrides[rc].LooksLike();
         shopItemName = {
-            std::string(this->itemLocations[rc].trickName),
-            std::string(this->itemLocations[rc].trickName),
-            std::string(this->itemLocations[rc].trickName)
+            std::string(ctx->overrides[rc].GetTrickName().english),
+            std::string(ctx->overrides[rc].GetTrickName().french),
+            std::string(ctx->overrides[rc].GetTrickName().english)
         };
     } else { 
         shopItemName = EnumToSpoilerfileGetName[shopItemGet];
     }
-    u16 shopItemPrice = merchantPrices[rc];
+    u16 shopItemPrice = ctx->GetItemLocation(rc)->GetPrice();
 
     if (textId == TEXT_SCRUB_RANDOM && shopItemPrice == 0) {
         messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::merchantMessageTableID, TEXT_SCRUB_RANDOM_FREE);
@@ -5398,16 +4245,17 @@ CustomMessage Randomizer::GetMerchantMessage(RandomizerInf randomizerInf, u16 te
 }
 
 CustomMessage Randomizer::GetCursedSkullMessage(s16 params) {
+    auto ctx = Rando::Context::GetInstance();
     CustomMessage messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::randoMiscHintsTableID, TEXT_CURSED_SKULLTULA_PEOPLE);
     RandomizerCheck rc = GetCheckFromActor(ACTOR_EN_SSH, SCENE_HOUSE_OF_SKULLTULA, params);
-    RandomizerGet itemGet = this->itemLocations[rc].rgID;
+    RandomizerGet itemGet = ctx->GetItemLocation(rc)->GetPlacedRandomizerGet();
     std::array<std::string, LANGUAGE_MAX> itemName;
     if (itemGet == RG_ICE_TRAP) {
-        itemGet = this->itemLocations[rc].fakeRgID;
+        itemGet = ctx->overrides[rc].LooksLike();
         itemName = {
-            std::string(this->itemLocations[rc].trickName),
-            std::string(this->itemLocations[rc].trickName),
-            std::string(this->itemLocations[rc].trickName)
+            std::string(ctx->overrides[rc].GetTrickName().english),
+            std::string(ctx->overrides[rc].GetTrickName().french),
+            std::string(ctx->overrides[rc].GetTrickName().english)
         };
     } else {
         itemName = EnumToSpoilerfileGetName[itemGet];
@@ -5460,9 +4308,9 @@ CustomMessage Randomizer::GetMapGetItemMessageWithHint(GetItemEntry itemEntry) {
             break;
     }
 
-    if (this->randoSettings[RSK_RANDOM_MQ_DUNGEONS] == RO_MQ_DUNGEONS_NONE ||
-        (this->randoSettings[RSK_RANDOM_MQ_DUNGEONS] == RO_MQ_DUNGEONS_SET_NUMBER &&
-         this->randoSettings[RSK_MQ_DUNGEON_COUNT] == 12)
+    if (GetRandoSettingValue(RSK_MQ_DUNGEON_RANDOM) == RO_MQ_DUNGEONS_NONE ||
+        (GetRandoSettingValue(RSK_MQ_DUNGEON_RANDOM) == RO_MQ_DUNGEONS_SET_NUMBER &&
+         GetRandoSettingValue(RSK_MQ_DUNGEON_COUNT) == 12)
        ) {
         messageEntry.Replace("{{typeHint}}", "");
     } else if (ResourceMgr_IsSceneMasterQuest(sceneNum)) {
diff --git a/soh/soh/Enhancements/randomizer/randomizer.h b/soh/soh/Enhancements/randomizer/randomizer.h
index ed3a45cb4..9dab10b99 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.h
+++ b/soh/soh/Enhancements/randomizer/randomizer.h
@@ -22,24 +22,8 @@
 
 class Randomizer {
   private:
-    std::unordered_map<RandomizerCheck, RandomizerGetData> itemLocations;
-    std::unordered_map<RandomizerCheck, std::string> hintLocations;
-    std::string childAltarText;
-    std::string adultAltarText;
-    std::string ganonHintText;
-    std::string ganonText;
-    std::string dampeText;
-    std::string sheikText;
-    std::string sariaText;
     std::unordered_map<RandomizerSettingKey, u8> randoSettings;
-    void ParseRandomizerSettingsFile(const char* spoilerFileName);
-    void ParseHintLocationsFile(const char* spoilerFileName);
-    void ParseRequiredTrialsFile(const char* spoilerFileName);
-    void ParseMasterQuestDungeonsFile(const char* spoilerFileName);
-    void ParseItemLocationsFile(const char* spoilerFileName, bool silent);
-    void ParseEntranceDataFile(const char* spoilerFileName, bool silent);
     bool IsItemVanilla(RandomizerGet randoGet);
-    int16_t GetVanillaMerchantPrice(RandomizerCheck check);
 
   public:
     Randomizer();
@@ -55,37 +39,17 @@ class Randomizer {
     static const std::string randoMiscHintsTableID;
 
     // Public for now to be accessed by SaveManager, will be made private again soon :tm:
-    std::unordered_map<RandomizerInf, bool> trialsRequired;
-    std::unordered_set<uint16_t> masterQuestDungeons;
-    std::unordered_map<RandomizerCheck, u16> merchantPrices;
     std::unordered_map<RandomizerGet, std::array<std::string, 3>> EnumToSpoilerfileGetName;
 
     static Sprite* GetSeedTexture(uint8_t index);
-    s16 GetItemModelFromId(s16 itemId);
-    s32 GetItemIDFromGetItemID(s32 getItemId);
     bool SpoilerFileExists(const char* spoilerFileName);
-    void LoadRandomizerSettings(const char* spoilerFileName);
-    void LoadHintLocations(const char* spoilerFileName);
-    void LoadMerchantMessages(const char* spoilerFileName);
-    void LoadItemLocations(const char* spoilerFileName, bool silent);
-    void LoadRequiredTrials(const char* spoilerFileName);
-    void LoadMasterQuestDungeons(const char* spoilerFileName);
+    void LoadMerchantMessages();
+    void LoadHintMessages();
     bool IsTrialRequired(RandomizerInf trial);
-    void LoadEntranceOverrides(const char* spoilerFileName, bool silent);
     u8 GetRandoSettingValue(RandomizerSettingKey randoSettingKey);
     RandomizerCheck GetCheckFromActor(s16 actorId, s16 sceneNum, s16 actorParams);
     RandomizerCheck GetCheckFromRandomizerInf(RandomizerInf randomizerInf);
     RandomizerInf GetRandomizerInfFromCheck(RandomizerCheck rc);
-    RandomizerGetData GetRandomizerGetDataFromActor(s16 actorId, s16 sceneNum, s16 actorParams);
-    RandomizerGetData GetRandomizerGetDataFromKnownCheck(RandomizerCheck randomizerCheck);
-    GetItemEntry GetItemEntryFromRGData(RandomizerGetData rgData, GetItemID ogItemId, bool checkObtainability = true);
-    std::string GetChildAltarText() const;
-    std::string GetAdultAltarText() const;
-    std::string GetGanonText() const;
-    std::string GetGanonHintText() const;
-    std::string GetDampeText() const;
-    std::string GetSheikText() const;
-    std::string GetSariaText() const;
     Rando::Location* GetCheckObjectFromActor(s16 actorId, s16 sceneNum, s32 actorParams);
     ScrubIdentity IdentifyScrub(s32 sceneNum, s32 actorParams, s32 respawnData);
     ShopItemIdentity IdentifyShopItem(s32 sceneNum, u8 slotIndex);
diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h
index d2a0a9a80..02652a83d 100644
--- a/soh/soh/Enhancements/randomizer/randomizerTypes.h
+++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@@ -1849,47 +1849,48 @@ typedef enum {
 
 typedef enum {
     RH_NONE,
-    RH_DMC_GOSSIP_STONE,
-    RH_DMT_GOSSIP_STONE,
     RH_COLOSSUS_GOSSIP_STONE,
+    RH_DMC_GOSSIP_STONE,
+    RH_DMC_UPPER_GROTTO_GOSSIP_STONE,
+    RH_DMT_GOSSIP_STONE,
+    RH_DMT_STORMS_GROTTO_GOSSIP_STONE,
     RH_DODONGOS_CAVERN_GOSSIP_STONE,
-    RH_GV_GOSSIP_STONE,
+    RH_ZF_FAIRY_GOSSIP_STONE,
     RH_GC_MAZE_GOSSIP_STONE,
     RH_GC_MEDIGORON_GOSSIP_STONE,
+    RH_GV_GOSSIP_STONE,
     RH_GRAVEYARD_GOSSIP_STONE,
     RH_HC_MALON_GOSSIP_STONE,
     RH_HC_ROCK_WALL_GOSSIP_STONE,
     RH_HC_STORMS_GROTTO_GOSSIP_STONE,
+    RH_HF_COW_GROTTO_GOSSIP_STONE,
+    RH_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE,
+    RH_HF_OPEN_GROTTO_GOSSIP_STONE,
+    RH_HF_SOUTHEAST_GROTTO_GOSSIP_STONE,
+    RH_ZF_JABU_GOSSIP_STONE,
     RH_KF_DEKU_TREE_GOSSIP_STONE_LEFT,
     RH_KF_DEKU_TREE_GOSSIP_STONE_RIGHT,
     RH_KF_GOSSIP_STONE,
+    RH_KF_STORMS_GROTTO_GOSSIP_STONE,
+    RH_KAK_OPEN_GROTTO_GOSSIP_STONE,
     RH_LH_LAB_GOSSIP_STONE,
     RH_LH_GOSSIP_STONE_SOUTHEAST,
     RH_LH_GOSSIP_STONE_SOUTHWEST,
     RH_LW_GOSSIP_STONE,
+    RH_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE,
     RH_SFM_MAZE_GOSSIP_STONE_LOWER,
     RH_SFM_MAZE_GOSSIP_STONE_UPPER,
     RH_SFM_SARIA_GOSSIP_STONE,
-    RH_TOT_GOSSIP_STONE_LEFT,
-    RH_TOT_GOSSIP_STONE_RIGHT,
-    RH_TOT_GOSSIP_STONE_RIGHT_CENTER,
     RH_TOT_GOSSIP_STONE_LEFT_CENTER,
+    RH_TOT_GOSSIP_STONE_LEFT,
+    RH_TOT_GOSSIP_STONE_RIGHT_CENTER,
+    RH_TOT_GOSSIP_STONE_RIGHT,
     RH_ZD_GOSSIP_STONE,
-    RH_ZF_FAIRY_GOSSIP_STONE,
-    RH_ZF_JABU_GOSSIP_STONE,
-    RH_ZR_NEAR_GROTTOS_GOSSIP_STONE,
     RH_ZR_NEAR_DOMAIN_GOSSIP_STONE,
-    RH_HF_COW_GROTTO_GOSSIP_STONE,
-    RH_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE,
-    RH_HF_SOUTHEAST_GROTTO_GOSSIP_STONE,
-    RH_HF_OPEN_GROTTO_GOSSIP_STONE,
-    RH_KAK_OPEN_GROTTO_GOSSIP_STONE,
+    RH_ZR_NEAR_GROTTOS_GOSSIP_STONE,
     RH_ZR_OPEN_GROTTO_GOSSIP_STONE,
-    RH_KF_STORMS_GROTTO_GOSSIP_STONE,
-    RH_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE,
-    RH_DMT_STORMS_GROTTO_GOSSIP_STONE,
-    RH_DMC_UPPER_GROTTO_GOSSIP_STONE,
     RH_GANONDORF_HINT,
+    RH_GANONDORF_NOHINT,
     RH_DAMPES_DIARY,
     RH_GREG_RUPEE,
     RH_MEDIGORON,
@@ -1897,6 +1898,14 @@ typedef enum {
     RH_WASTELAND_BOMBCHU_SALESMAN,
     RH_ALTAR_CHILD,
     RH_ALTAR_ADULT,
+    RH_SARIA,
+    RH_SHEIK_LIGHT_ARROWS,
+    RH_MINUET_WARP_LOC,
+    RH_BOLERO_WARP_LOC,
+    RH_SERENADE_WARP_LOC,
+    RH_REQUIEM_WARP_LOC,
+    RH_NOCTURNE_WARP_LOC,
+    RH_PRELUDE_WARP_LOC,
     RH_MAX,
 } RandomizerHintKey;
 
@@ -3224,6 +3233,52 @@ typedef struct {
     char trickName[MAX_TRICK_NAME_SIZE];
 } RandomizerGetData;
 
+typedef enum {
+    RSG_NONE,
+    RSG_LOGIC,
+    RSG_EXCLUDES_KOKIRI_FOREST,
+    RSG_EXCLUDES_LOST_WOODS,
+    RSG_EXCLUDES_DEKU_TREE,
+    RSG_EXCLUDES_FOREST_TEMPLE,
+    RSG_EXCLUDES_KAKARIKO_VILLAGE,
+    RSG_EXCLUDES_BOTTOM_OF_THE_WELL,
+    RSG_EXCLUDES_SHADOW_TEMPLE,
+    RSG_EXCLUDES_DEATH_MOUNTAIN,
+    RSG_EXCLUDES_GORON_CITY,
+    RSG_EXCLUDES_DODONGOS_CAVERN,
+    RSG_EXCLUDES_FIRE_TEMPLE,
+    RSG_EXCLUDES_ZORAS_RIVER,
+    RSG_EXCLUDES_ZORAS_DOMAIN,
+    RSG_EXCLUDES_JABU_JABU,
+    RSG_EXCLUDES_ICE_CAVERN,
+    RSG_EXCLUDES_HYRULE_FIELD,
+    RSG_EXCLUDES_LON_LON_RANCH,
+    RSG_EXCLUDES_LAKE_HYLIA,
+    RSG_EXCLUDES_WATER_TEMPLE,
+    RSG_EXCLUDES_GERUDO_VALLEY,
+    RSG_EXCLUDES_GERUDO_TRAINING_GROUNDS,
+    RSG_EXCLUDES_SPIRIT_TEMPLE,
+    RSG_EXCLUDES_HYRULE_CASTLE,
+    RSG_EXCLUDES_GANONS_CASTLE,
+    RSG_EXCLUDES,
+    RSG_TRICKS,
+    RSG_GLITCHES,
+    RSG_OPEN,
+    RSG_WORLD,
+    RSG_SHUFFLE,
+    RSG_SHUFFLE_DUNGEON_ITEMS,
+    RSG_SHUFFLE_DUNGEON_QUESTS,
+    RSG_DETAILED_LOGIC,
+    RSG_STARTING_ITEMS,
+    RSG_STARTING_SONGS,
+    RSG_STARTING_OTHER,
+    RSG_STARTING_INVENTORY,
+    RSG_TIMESAVERS,
+    RSG_MISC,
+    RSG_ITEM_POOL,
+    RSG_MAX,
+} RandomizerSettingGroupKey;
+
 typedef enum {
     RSK_NONE,
     RSK_LOGIC_RULES,
@@ -3246,6 +3301,7 @@ typedef enum {
     RSK_SHUFFLE_OCARINA,
     RSK_STARTING_DEKU_SHIELD,
     RSK_STARTING_KOKIRI_SWORD,
+    RSK_STARTING_MASTER_SWORD,
     RSK_STARTING_ZELDAS_LULLABY, 
     RSK_STARTING_EPONAS_SONG, 
     RSK_STARTING_SARIAS_SONG, 
@@ -3260,7 +3316,6 @@ typedef enum {
     RSK_STARTING_PRELUDE_OF_LIGHT,
     RSK_SHUFFLE_KOKIRI_SWORD,
     RSK_SHUFFLE_MASTER_SWORD,
-    RSK_STARTING_MAPS_COMPASSES,
     RSK_SHUFFLE_DUNGEON_REWARDS,
     RSK_SHUFFLE_SONGS,
     RSK_SHUFFLE_TOKENS,
@@ -3290,6 +3345,7 @@ typedef enum {
     RSK_SCRUB_TEXT_HINT,
     RSK_HINT_CLARITY,
     RSK_HINT_DISTRIBUTION,
+    RSK_SHUFFLE_MAPANDCOMPASS,
     RSK_KEYSANITY,
     RSK_GERUDO_KEYS,
     RSK_BOSS_KEYSANITY,
@@ -3316,8 +3372,9 @@ typedef enum {
     RSK_ENABLE_BOMBCHU_DROPS,
     RSK_BOMBCHUS_IN_LOGIC,
     RSK_LINKS_POCKET,
-    RSK_RANDOM_MQ_DUNGEONS,
+    RSK_MQ_DUNGEON_RANDOM,
     RSK_MQ_DUNGEON_COUNT,
+    RSK_MQ_DUNGEON_SET,
     RSK_MQ_DEKU_TREE,
     RSK_MQ_DODONGOS_CAVERN,
     RSK_MQ_JABU_JABU,
@@ -3362,6 +3419,8 @@ typedef enum {
     RSK_MIX_GROTTO_ENTRANCES,
     RSK_DECOUPLED_ENTRANCES,
     RSK_STARTING_SKULLTULA_TOKEN,
+    RSK_STARTING_HEARTS,
+    RSK_DAMAGE_MULTIPLIER,
     RSK_ALL_LOCATIONS_REACHABLE,
     RSK_SHUFFLE_BOSS_ENTRANCES,
     RSK_SHUFFLE_100_GS_REWARD,
@@ -3538,6 +3597,15 @@ typedef enum {
     RO_GANON_BOSS_KEY_TRIFORCE_HUNT,
 } RandoOptionGanonsBossKey;
 
+typedef enum {
+    RO_LACS_VANILLA,
+    RO_LACS_STONES,
+    RO_LACS_MEDALLIONS,
+    RO_LACS_REWARDS,
+    RO_LACS_DUNGEONS,
+    RO_LACS_TOKENS,
+} RandoOptionLACSCondition;
+
 // LACS Reward Options settings (Standard rewards, Greg as reward, Greg as wildcard)
 typedef enum {
     RO_LACS_STANDARD_REWARD,
@@ -3662,10 +3730,22 @@ typedef enum {
 // Logic (glitchless/no logic)
 typedef enum {
     RO_LOGIC_GLITCHLESS,
-    //RO_LOGIC_GLITCHED,
+    RO_LOGIC_GLITCHED,
     RO_LOGIC_NO_LOGIC,
+    RO_LOGIC_VANILLA
 } RandoOptionLogic;
 
+// Damage Multiplier
+typedef enum {
+    RO_DAMAGE_MULTIPLIER_HALF,
+    RO_DAMAGE_MULTIPLIER_DEFAULT,
+    RO_DAMAGE_MULTIPLIER_DOUBLE,
+    RO_DAMAGE_MULTIPLIER_QUADRUPLE,
+    RO_DAMAGE_MULTIPLIER_OCTUPLE,
+    RO_DAMAGE_MULTIPLIER_SEXDECUPLE,
+    RO_DAMAGE_MULTIPLIER_OHKO,
+} RandoOptionDamageMultiplier;
+
 // MQ Dungeons
 typedef enum {
     RO_MQ_DUNGEONS_NONE,
@@ -3674,6 +3754,23 @@ typedef enum {
     RO_MQ_DUNGEONS_SELECTION,
 } RandoOptionMQDungeons;
 
+typedef enum {
+    RO_LOCATION_INCLUDE,
+    RO_LOCATION_EXCLUDE,
+} RandoOptionLocationInclusion;
+
+typedef enum {
+    RO_CHEST_GAME_OFF,
+    RO_CHEST_GAME_SINGLE_KEYS,
+    RO_CHEST_GAME_PACK,
+} RandoOptionChestGame;
+
+typedef enum {
+    RO_MQ_SET_VANILLA,
+    RO_MQ_SET_MQ,
+    RO_MQ_SET_RANDOM,
+} RandoOptionMQSet;
+
 typedef enum {
     CAN_OBTAIN,
     CANT_OBTAIN_MISC,
diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
index 25f07820c..5fdca02f5 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
@@ -2,6 +2,7 @@
 #include "randomizer_entrance_tracker.h"
 #include "randomizer_item_tracker.h"
 #include "randomizerTypes.h"
+#include "dungeon.h"
 #include "../../OTRGlobals.h"
 #include "../../UIWidgets.hpp"
 
@@ -732,8 +733,8 @@ void LoadFile() {
         areaChecksGotten[startingArea]++;
     }
 
-    showVOrMQ = (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_RANDOM_MQ_DUNGEONS) == RO_MQ_DUNGEONS_RANDOM_NUMBER ||
-                (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_RANDOM_MQ_DUNGEONS) == RO_MQ_DUNGEONS_SET_NUMBER &&
+    showVOrMQ = (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_MQ_DUNGEON_RANDOM) == RO_MQ_DUNGEONS_RANDOM_NUMBER ||
+                (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_MQ_DUNGEON_RANDOM) == RO_MQ_DUNGEONS_SET_NUMBER &&
                 OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_MQ_DUNGEON_COUNT) < 12));
     LinksPocket();
     SongFromImpa();
@@ -926,7 +927,7 @@ void CheckTrackerWindow::DrawElement() {
 
             if (isThisAreaSpoiled) {
                 if (showVOrMQ && RandomizerCheckObjects::AreaIsDungeon(rcArea)) {
-                    if (OTRGlobals::Instance->gRandomizer->masterQuestDungeons.contains(DungeonSceneLookupByArea(rcArea)))
+                    if (OTRGlobals::Instance->gRandoContext->GetDungeons()->GetDungeonFromScene(DungeonSceneLookupByArea(rcArea))->IsMQ())
                         ImGui::Text("(%d/%d) - MQ", areaChecksGotten[rcArea], areaChecksTotal);
                     else
                         ImGui::Text("(%d/%d) - Vanilla", areaChecksGotten[rcArea], areaChecksTotal);
@@ -1033,7 +1034,7 @@ void LoadSettings() {
         OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_FROG_SONG_RUPEES) == RO_GENERIC_YES
         : false;
     showStartingMapsCompasses = IS_RANDO ?
-        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_STARTING_MAPS_COMPASSES) != RO_DUNGEON_ITEM_LOC_VANILLA
+        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_MAPANDCOMPASS) != RO_DUNGEON_ITEM_LOC_VANILLA
         : false;
     showKeysanity = IS_RANDO ?
         OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_KEYSANITY) != RO_DUNGEON_ITEM_LOC_VANILLA
@@ -1111,8 +1112,8 @@ bool IsVisibleInCheckTracker(RandomizerCheck rc) {
             (rc != RC_LINKS_POCKET || showLinksPocket) &&
             (!RandomizerCheckObjects::AreaIsDungeon(loc->GetArea()) ||
                 loc->GetQuest() == RCQUEST_BOTH ||
-                loc->GetQuest() == RCQUEST_MQ && OTRGlobals::Instance->gRandomizer->masterQuestDungeons.contains(loc->GetScene()) ||
-                loc->GetQuest() == RCQUEST_VANILLA && !OTRGlobals::Instance->gRandomizer->masterQuestDungeons.contains(loc->GetScene())
+                loc->GetQuest() == RCQUEST_MQ && OTRGlobals::Instance->gRandoContext->GetDungeons()->GetDungeonFromScene(loc->GetScene())->IsMQ() ||
+                loc->GetQuest() == RCQUEST_VANILLA && OTRGlobals::Instance->gRandoContext->GetDungeons()->GetDungeonFromScene(loc->GetScene())->IsVanilla()
                 ) &&
             (loc->GetRCType() != RCTYPE_SHOP || (showShops && (!hideShopRightChecks || hideShopRightChecks && loc->GetActorParams() > 0x03))) &&
             (loc->GetRandomizerCheck() != RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS) &&
@@ -1154,8 +1155,8 @@ bool IsVisibleInCheckTracker(RandomizerCheck rc) {
     }
     else if (loc->IsVanillaCompletion()) {
         return (loc->GetQuest() == RCQUEST_BOTH ||
-            loc->GetQuest() == RCQUEST_MQ && OTRGlobals::Instance->gRandomizer->masterQuestDungeons.contains(loc->GetScene()) ||
-            loc->GetQuest() == RCQUEST_VANILLA && !OTRGlobals::Instance->gRandomizer->masterQuestDungeons.contains(loc->GetScene()) ||
+            loc->GetQuest() == RCQUEST_MQ && OTRGlobals::Instance->gRandoContext->GetDungeons()->GetDungeonFromScene(loc->GetScene())->IsMQ() ||
+            loc->GetQuest() == RCQUEST_VANILLA && OTRGlobals::Instance->gRandoContext->GetDungeons()->GetDungeonFromScene(loc->GetScene())->IsVanilla() ||
             rc == RC_GIFT_FROM_SAGES) && rc != RC_LINKS_POCKET;
     }
     return false;
@@ -1242,6 +1243,7 @@ void DrawLocation(RandomizerCheck rc) {
     std::string txt;
     bool showHidden = CVarGetInteger("gCheckTrackerOptionShowHidden", 0);
     Rando::Location* loc = Rando::StaticData::GetLocation(rc);
+    Rando::ItemLocation* itemLoc = OTRGlobals::Instance->gRandoContext->GetItemLocation(rc);
     RandomizerCheckTrackerData checkData = gSaveContext.checkTrackerData[rc];
     RandomizerCheckStatus status = checkData.status;
     bool skipped = checkData.skipped;
@@ -1335,7 +1337,7 @@ void DrawLocation(RandomizerCheck rc) {
             case RCSHOW_COLLECTED:
             case RCSHOW_SCUMMED:
                 if (IS_RANDO) {
-                    txt = OTRGlobals::Instance->gRandomizer->EnumToSpoilerfileGetName[gSaveContext.itemLocations[rc].get.rgID][gSaveContext.language];
+                    txt = itemLoc->GetPlacedItem().GetName().GetForLanguage(gSaveContext.language);
                 } else {
                     if (IsHeartPiece((GetItemID)Rando::StaticData::RetrieveItem(loc->GetVanillaItem()).GetItemID())) {
                         if (gSaveContext.language == LANGUAGE_ENG || gSaveContext.language == LANGUAGE_GER) {
@@ -1349,14 +1351,14 @@ void DrawLocation(RandomizerCheck rc) {
             case RCSHOW_IDENTIFIED:
             case RCSHOW_SEEN:
                 if (IS_RANDO) {
-                    if (gSaveContext.itemLocations[rc].get.rgID == RG_ICE_TRAP) {
+                    if (itemLoc->GetPlacedRandomizerGet() == RG_ICE_TRAP) {
                         if (status == RCSHOW_IDENTIFIED) {
-                            txt = gSaveContext.itemLocations[rc].get.trickName;
+                            txt = OTRGlobals::Instance->gRandoContext->overrides[rc].GetTrickName().GetForLanguage(gSaveContext.language);
                         } else {
-                            txt = OTRGlobals::Instance->gRandomizer->EnumToSpoilerfileGetName[gSaveContext.itemLocations[rc].get.fakeRgID][gSaveContext.language];
+                            txt = Rando::StaticData::RetrieveItem(OTRGlobals::Instance->gRandoContext->overrides[rc].LooksLike()).GetName().GetForLanguage(gSaveContext.language);
                         }
                     } else {
-                        txt = OTRGlobals::Instance->gRandomizer->EnumToSpoilerfileGetName[gSaveContext.itemLocations[rc].get.rgID][gSaveContext.language];
+                        txt = itemLoc->GetPlacedItem().GetName().GetForLanguage(gSaveContext.language);
                     }
                     if (status == RCSHOW_IDENTIFIED) {
                         txt += fmt::format(" - {}", gSaveContext.checkTrackerData[rc].price);
diff --git a/soh/soh/Enhancements/randomizer/randomizer_entrance.c b/soh/soh/Enhancements/randomizer/randomizer_entrance.c
index f2f1a8a3f..439954ba1 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_entrance.c
+++ b/soh/soh/Enhancements/randomizer/randomizer_entrance.c
@@ -12,6 +12,7 @@
 #include <string.h>
 
 #include "global.h"
+#include "entrance.h"
 
 extern PlayState* gPlayState;
 
@@ -114,6 +115,7 @@ void Entrance_ResetEntranceTable(void) {
 }
 
 void Entrance_Init(void) {
+    EntranceOverride* entranceOverrides = Randomizer_GetEntranceOverrides();
     s32 index;
 
     size_t blueWarpRemapIdx = 0;
@@ -153,13 +155,13 @@ void Entrance_Init(void) {
     // Then overwrite the indices which are shuffled
     for (size_t i = 0; i < ENTRANCE_OVERRIDES_MAX_COUNT; i++) {
 
-        if (Entrance_EntranceIsNull(&gSaveContext.entranceOverrides[i])) {
+        if (Entrance_EntranceIsNull(&entranceOverrides[i])) {
             break;
         }
 
-        s16 originalIndex = gSaveContext.entranceOverrides[i].index;
-        s16 blueWarpIndex = gSaveContext.entranceOverrides[i].blueWarp;
-        s16 overrideIndex = gSaveContext.entranceOverrides[i].override;
+        s16 originalIndex = entranceOverrides[i].index;
+        s16 blueWarpIndex = entranceOverrides[i].blueWarp;
+        s16 overrideIndex = entranceOverrides[i].override;
 
         //Overwrite grotto related indices
         if (originalIndex >= ENTRANCE_RANDO_GROTTO_EXIT_START) {
@@ -785,6 +787,7 @@ u8 Entrance_GetIsEntranceDiscovered(u16 entranceIndex) {
 }
 
 void Entrance_SetEntranceDiscovered(u16 entranceIndex) {
+    EntranceOverride* entranceOverrides = Randomizer_GetEntranceOverrides();
     // Skip if already set to save time from setting the connected entrance or
     // if this entrance is outside of the randomized entrance range (i.e. is a dynamic entrance)
     if (entranceIndex > MAX_ENTRANCE_RANDO_USED_INDEX || Entrance_GetIsEntranceDiscovered(entranceIndex)) {
@@ -798,8 +801,8 @@ void Entrance_SetEntranceDiscovered(u16 entranceIndex) {
         gSaveContext.sohStats.entrancesDiscovered[idx] |= entranceBit;
         // Set connected
         for (size_t i = 0; i < ENTRANCE_OVERRIDES_MAX_COUNT; i++) {
-            if (entranceIndex == gSaveContext.entranceOverrides[i].index) {
-                Entrance_SetEntranceDiscovered(gSaveContext.entranceOverrides[i].overrideDestination);
+            if (entranceIndex == entranceOverrides[i].index) {
+                Entrance_SetEntranceDiscovered(entranceOverrides[i].overrideDestination);
                 break;
             }
         }
diff --git a/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.cpp
index fe335c2b6..dc40b2b1a 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.cpp
@@ -19,6 +19,7 @@ extern PlayState* gPlayState;
 }
 
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "entrance.h"
 
 #define COLOR_ORANGE IM_COL32(230, 159, 0, 255)
 #define COLOR_GREEN IM_COL32(0, 158, 115, 255)
@@ -459,6 +460,7 @@ void SortEntranceListByType(EntranceOverride* entranceList, u8 byDest) {
 }
 
 void SortEntranceListByArea(EntranceOverride* entranceList, u8 byDest) {
+    auto entranceCtx = Rando::Context::GetInstance()->GetEntranceShuffler();
     EntranceOverride tempList[ENTRANCE_OVERRIDES_MAX_COUNT] = { 0 };
 
     // Store to temp
@@ -498,10 +500,10 @@ void SortEntranceListByArea(EntranceOverride* entranceList, u8 byDest) {
         // and otherwise by group
         for (size_t group = ENTRANCE_GROUP_KOKIRI_FOREST; group < SPOILER_ENTRANCE_GROUP_COUNT; group++) {
             for (size_t i = 0; i < ENTRANCE_OVERRIDES_MAX_COUNT; i++) {
-                if (Entrance_EntranceIsNull(&gSaveContext.entranceOverrides[i])) {
+                if (Entrance_EntranceIsNull(&entranceCtx->entranceOverrides[i])) {
                     continue;
                 }
-                const EntranceData* curEntrance = GetEntranceData(gSaveContext.entranceOverrides[i].index);
+                const EntranceData* curEntrance = GetEntranceData(entranceCtx->entranceOverrides[i].index);
                 if (curEntrance->srcGroup != group) {
                     continue;
                 }
@@ -561,6 +563,7 @@ void ClearEntranceTrackingData() {
 }
 
 void InitEntranceTrackingData() {
+    auto entranceCtx = Rando::Context::GetInstance()->GetEntranceShuffler();
     gEntranceTrackingData = {0};
 
     // Check if entrance randomization is disabled
@@ -570,11 +573,11 @@ void InitEntranceTrackingData() {
 
     // Set total and group counts
     for (size_t i = 0; i < ENTRANCE_OVERRIDES_MAX_COUNT; i++) {
-        if (Entrance_EntranceIsNull(&gSaveContext.entranceOverrides[i])) {
+        if (Entrance_EntranceIsNull(&entranceCtx->entranceOverrides[i])) {
             break;
         }
-        const EntranceData* index = GetEntranceData(gSaveContext.entranceOverrides[i].index);
-        const EntranceData* override = GetEntranceData(gSaveContext.entranceOverrides[i].override);
+        const EntranceData* index = GetEntranceData(entranceCtx->entranceOverrides[i].index);
+        const EntranceData* override = GetEntranceData(entranceCtx->entranceOverrides[i].override);
 
         if (index->srcGroup == ENTRANCE_GROUP_ONE_WAY) {
             gEntranceTrackingData.GroupEntranceCounts[ENTRANCE_SOURCE_AREA][ENTRANCE_GROUP_ONE_WAY]++;
@@ -616,10 +619,10 @@ void InitEntranceTrackingData() {
 
     // Sort entrances by group and type in entranceData
     for (size_t i = 0; i < ENTRANCE_OVERRIDES_MAX_COUNT; i++) {
-        srcListSortedByArea[i] = gSaveContext.entranceOverrides[i];
-        destListSortedByArea[i] = gSaveContext.entranceOverrides[i];
-        srcListSortedByType[i] = gSaveContext.entranceOverrides[i];
-        destListSortedByType[i] = gSaveContext.entranceOverrides[i];
+        srcListSortedByArea[i] = entranceCtx->entranceOverrides[i];
+        destListSortedByArea[i] = entranceCtx->entranceOverrides[i];
+        srcListSortedByType[i] = entranceCtx->entranceOverrides[i];
+        destListSortedByType[i] = entranceCtx->entranceOverrides[i];
     }
     SortEntranceListByArea(srcListSortedByArea, 0);
     SortEntranceListByArea(destListSortedByArea, 1);
diff --git a/soh/soh/Enhancements/randomizer/savefile.cpp b/soh/soh/Enhancements/randomizer/savefile.cpp
index 33278d0b7..16b52147f 100644
--- a/soh/soh/Enhancements/randomizer/savefile.cpp
+++ b/soh/soh/Enhancements/randomizer/savefile.cpp
@@ -150,7 +150,7 @@ void SetStartingItems() {
         GiveLinkRupees(9001);
     }
 
-    if (Randomizer_GetSettingValue(RSK_STARTING_MAPS_COMPASSES) == RO_DUNGEON_ITEM_LOC_STARTWITH) {
+    if (Randomizer_GetSettingValue(RSK_SHUFFLE_MAPANDCOMPASS) == RO_DUNGEON_ITEM_LOC_STARTWITH) {
         uint32_t mapBitMask = 1 << 1;
         uint32_t compassBitMask = 1 << 2;
         uint32_t startingDungeonItemsBitMask = mapBitMask | compassBitMask;
diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
new file mode 100644
index 000000000..12deeba6b
--- /dev/null
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -0,0 +1,1798 @@
+#include "settings.h"
+#include "trial.h"
+#include "dungeon.h"
+#include "context.h"
+
+#include <spdlog/spdlog.h>
+
+namespace Rando {
+std::vector<std::string> NumOpts(int min, int max, int step = 1, std::string textBefore = {}, std::string textAfter = {}) {
+    std::vector<std::string> options;
+    options.reserve((max - min) / step + 1);
+    for (int i = min; i <= max; i += step) {
+        options.push_back(textBefore + std::to_string(i) + textAfter);
+    }
+    return options;
+}
+
+std::vector<std::string> MultiVecOpts(std::vector<std::vector<std::string>> optionsVector) {
+    uint32_t totalSize = 0;
+    for (auto vector: optionsVector) {
+        totalSize += vector.size();
+    }
+    std::vector<std::string> options;
+    options.reserve(totalSize);
+    for (auto vector : optionsVector) {
+        for (auto op : vector) {
+            options.push_back(op);
+        }
+    }
+    return options;
+}
+
+Settings::Settings() : mExcludeLocationsOptionsGroups(SPOILER_COLLECTION_GROUP_COUNT) {
+}
+
+void Settings::CreateOptions() {
+    //clang-format off
+    mOptions[RSK_FOREST] = Option::U8("Forest", {"Closed", "Closed Deku", "Open"}, OptionCategory::Setting, RO_FOREST_CLOSED);
+    mOptions[RSK_KAK_GATE] = Option::U8("Kakariko Gate", {"Close", "Open"});
+    mOptions[RSK_DOOR_OF_TIME] = Option::U8("Door of Time", {"Closed", "Song only", "Open"});
+    mOptions[RSK_ZORAS_FOUNTAIN] = Option::U8("Zora's Fountain", {"Closed", "Closed as child", "Open"});
+    mOptions[RSK_GERUDO_FORTRESS] = Option::U8("Gerudo Fortress", {"Normal", "Fast", "Open"});
+    mOptions[RSK_RAINBOW_BRIDGE] = Option::U8("Rainbow Bridge", {"Vanilla", "Always open", "Stones", "Medallions", "Dungeons", "Tokens", "Greg"}, OptionCategory::Setting, RO_BRIDGE_VANILLA);
+    mOptions[RSK_RAINBOW_BRIDGE_STONE_COUNT] = Option::U8("Stone Count", {NumOpts(0, 4)}, OptionCategory::Setting, 1, true);
+    mOptions[RSK_RAINBOW_BRIDGE_MEDALLION_COUNT] = Option::U8("Medallion Count", {NumOpts(0, 7)}, OptionCategory::Setting, 1, true);
+    mOptions[RSK_RAINBOW_BRIDGE_REWARD_COUNT] = Option::U8("Reward Count", {NumOpts(0, 10)}, OptionCategory::Setting, 1, true);
+    mOptions[RSK_RAINBOW_BRIDGE_DUNGEON_COUNT] = Option::U8("Dungeon Count", {NumOpts(0, 9)}, OptionCategory::Setting, 1, true);
+    mOptions[RSK_RAINBOW_BRIDGE_TOKEN_COUNT] = Option::U8("Token Count", {NumOpts(0, 100)}, OptionCategory::Setting, 1, true);
+    mOptions[RSK_BRIDGE_OPTIONS] = Option::U8("Bridge Reward Options", {"Standard Rewards", "Greg as Reward", "Greg as Wildcard"});
+    mOptions[RSK_GANONS_TRIALS] = Option::U8("Ganon's Trials", {"Skip", "Set Number", "Random Number"}, OptionCategory::Setting, RO_GANONS_TRIALS_SKIP);
+    mOptions[RSK_TRIAL_COUNT] = Option::U8("Ganon's Trials Count", {NumOpts(1, 6)}, OptionCategory::Setting, 1, true);
+    mOptions[RSK_STARTING_AGE] = Option::U8("Starting Age", {"Child", "Adult", "Random"}, OptionCategory::Setting, RO_AGE_CHILD);
+    mOptions[RSK_SHUFFLE_ENTRANCES] = Option::Bool("Shuffle Entrances");
+    mOptions[RSK_SHUFFLE_DUNGEON_ENTRANCES] = Option::U8("Dungeon Entrances", {"Off", "On", "On + Ganon"});
+    mOptions[RSK_SHUFFLE_BOSS_ENTRANCES] = Option::U8("Boss Entrances", {"Off", "Age Restricted", "Full"});
+    mOptions[RSK_SHUFFLE_OVERWORLD_ENTRANCES] = Option::Bool("Overworld Entrances");
+    mOptions[RSK_SHUFFLE_INTERIOR_ENTRANCES] = Option::U8("Interior Entrances", {"Off", "Simple", "All"});
+    mOptions[RSK_SHUFFLE_GROTTO_ENTRANCES] = Option::Bool("Grottos Entrances");
+    mOptions[RSK_SHUFFLE_OWL_DROPS] = Option::Bool("Owl Drops");
+    mOptions[RSK_SHUFFLE_WARP_SONGS] = Option::Bool("Warp Songs");
+    mOptions[RSK_SHUFFLE_OVERWORLD_SPAWNS] = Option::Bool("Overworld Spawns");
+    mOptions[RSK_MIXED_ENTRANCE_POOLS] = Option::Bool("Mixed Entrance Pools");
+    mOptions[RSK_MIX_DUNGEON_ENTRANCES] = Option::Bool("Mix Dungeons");
+    mOptions[RSK_MIX_OVERWORLD_ENTRANCES] = Option::Bool("Mix Overworld");
+    mOptions[RSK_MIX_INTERIOR_ENTRANCES] = Option::Bool("Mix Interiors");
+    mOptions[RSK_MIX_GROTTO_ENTRANCES] = Option::Bool("Mix Grottos");
+    mOptions[RSK_DECOUPLED_ENTRANCES] = Option::Bool("Decouple Entrances");
+    mOptions[RSK_BOMBCHUS_IN_LOGIC] = Option::Bool("Bombchus in Logic");
+    mOptions[RSK_ENABLE_BOMBCHU_DROPS] = Option::U8("Bombchu Drops", {"No", "Yes"});
+    // TODO: AmmoDrops and/or HeartDropRefill, combine with/separate Ammo Drops from Bombchu Drops?
+    mOptions[RSK_TRIFORCE_HUNT] = Option::Bool("Triforce Hunt");
+    mOptions[RSK_TRIFORCE_HUNT_PIECES_TOTAL] = Option::U8("Triforce Hunt Total Pieces", {NumOpts(0, 100)});
+    mOptions[RSK_TRIFORCE_HUNT_PIECES_REQUIRED] = Option::U8("Triforce Hunt Required Pieces", {NumOpts(0, 100)});
+    mOptions[RSK_MQ_DUNGEON_RANDOM] = Option::U8("MQ Dungeon Setting", {"None", "Set Number", "Random", "Selection Only"});
+    mOptions[RSK_MQ_DUNGEON_COUNT] = Option::U8("MQ Dungeon Count", {NumOpts(0, 12)});
+    mOptions[RSK_MQ_DUNGEON_SET] = Option::Bool("Set Dungeon Quests");
+    mOptions[RSK_MQ_DEKU_TREE] = Option::U8("Deku Tree", {"Vanilla", "Master Quest", "Random"});
+    mOptions[RSK_MQ_DODONGOS_CAVERN] = Option::U8("Dodongo's Cavern", {"Vanilla", "Master Quest", "Random"});
+    mOptions[RSK_MQ_JABU_JABU] = Option::U8("Jabu-Jabu's Belly", {"Vanilla", "Master Quest", "Random"});
+    mOptions[RSK_MQ_FOREST_TEMPLE] = Option::U8("Forest Temple", {"Vanilla", "Master Quest", "Random"});
+    mOptions[RSK_MQ_FIRE_TEMPLE] = Option::U8("Fire Temple", {"Vanilla", "Master Quest", "Random"});
+    mOptions[RSK_MQ_WATER_TEMPLE] = Option::U8("Water Temple", {"Vanilla", "Master Quest", "Random"});
+    mOptions[RSK_MQ_SPIRIT_TEMPLE] = Option::U8("Spirit Temple", {"Vanilla", "Master Quest", "Random"});
+    mOptions[RSK_MQ_SHADOW_TEMPLE] = Option::U8("Shadow Temple", {"Vanilla", "Master Quest", "Random"});
+    mOptions[RSK_MQ_BOTTOM_OF_THE_WELL] = Option::U8("Bottom of the Well", {"Vanilla", "Master Quest", "Random"});
+    mOptions[RSK_MQ_ICE_CAVERN] = Option::U8("Ice Cavern", {"Vanilla", "Master Quest", "Random"});
+    mOptions[RSK_MQ_GTG] = Option::U8("Gerudo Training Grounds", {"Vanilla", "Master Quest", "Random"});
+    mOptions[RSK_MQ_GANONS_CASTLE] = Option::U8("Ganon's Castle", {"Vanilla", "Master Quest", "Random"});
+    mOptions[RSK_SHUFFLE_DUNGEON_REWARDS] = Option::U8("Shuffle Dungeon Rewards", {"End of Dungeons", "Any Dungeon", "Overworld", "Anywhere"});
+    mOptions[RSK_LINKS_POCKET] = Option::U8("Link's Pocket", {"Dungeon Reward", "Advancement", "Anything", "Nothing"});
+    mOptions[RSK_SHUFFLE_SONGS] = Option::U8("Shuffle Songs", {"Song Locations", "Dungeon Rewards", "Anywhere"});
+    mOptions[RSK_SHOPSANITY] = Option::U8("Shopsanity", {"Off", "0 Items", "1 Item", "2 Items", "3 Items", "4 Items", "Random"});
+    mOptions[RSK_SHOPSANITY_PRICES] = Option::U8("Shopsanity Prices", {"Balanced", "Starting Wallet", "Adult Wallet", "Giant's Wallet", "Tycoon's Wallet"});
+    mOptions[RSK_SHOPSANITY_PRICES_AFFORDABLE] = Option::Bool("Affordable Prices"); // TODO: Can this be added as a selection for above option?
+    mOptions[RSK_SHUFFLE_TOKENS] = Option::U8("Tokensanity", {"Off", "Dungeons", "Overworld", "All Tokens"});
+    mOptions[RSK_SHUFFLE_SCRUBS] = Option::U8("Scrub Shuffle", {"Off", "Affordable", "Expensive", "Random Prices"});
+    mOptions[RSK_SHUFFLE_COWS] = Option::Bool("Shuffle Cows");
+    mOptions[RSK_SHUFFLE_KOKIRI_SWORD] = Option::Bool("Shuffle Kokiri Sword");
+    mOptions[RSK_SHUFFLE_MASTER_SWORD] = Option::Bool("Shuffle Master Sword");
+    mOptions[RSK_SHUFFLE_OCARINA] = Option::Bool("Shuffle Ocarinas");
+    mOptions[RSK_SHUFFLE_WEIRD_EGG] = Option::Bool("Shuffle Weird Egg");
+    mOptions[RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD] = Option::Bool("Shuffle Gerudo Membership Card");
+    mOptions[RSK_SHUFFLE_MAGIC_BEANS] = Option::Bool("Shuffle Magic Beans");
+    mOptions[RSK_SHUFFLE_MERCHANTS] = Option::U8("Shuffle Merchants", {"Off", "On (No Hints)", "On (With Hints)"});
+    mOptions[RSK_SHUFFLE_FROG_SONG_RUPEES] = Option::Bool("Shuffle Frog Song Rupees");
+    mOptions[RSK_SHUFFLE_ADULT_TRADE] = Option::Bool("Shuffle Adult Trade");
+    mOptions[RSK_SHUFFLE_CHEST_MINIGAME] = Option::U8("Shuffle Chest Minigame", {"Off", "On (Separate)", "On (Pack)"});
+    mOptions[RSK_SHUFFLE_100_GS_REWARD] = Option::Bool("Shuffle 100 GS Reward");
+    mOptions[RSK_SHUFFLE_MAPANDCOMPASS] = Option::U8("Maps/Compasses", {"Start With", "Vanilla", "Own Dungeon", "Any Dungeon", "Overworld", "Anywhere"}, OptionCategory::Setting, RO_DUNGEON_ITEM_LOC_OWN_DUNGEON);
+    mOptions[RSK_KEYSANITY] = Option::U8("Small Keys", {"Start With", "Vanilla", "Own Dungeon", "Any Dungeon", "Overworld", "Anywhere"}, OptionCategory::Setting, RO_DUNGEON_ITEM_LOC_OWN_DUNGEON);
+    mOptions[RSK_GERUDO_KEYS] = Option::U8("Gerudo Fortress Keys", {"Vanilla", "Any Dungeon", "Overworld", "Anywhere"});
+    mOptions[RSK_BOSS_KEYSANITY] = Option::U8("Boss Keys", {"Start With", "Vanilla", "Own Dungeon", "Any Dungeon", "Overworld", "Anywhere"}, OptionCategory::Setting, RO_DUNGEON_ITEM_LOC_OWN_DUNGEON);
+    mOptions[RSK_GANONS_BOSS_KEY] = Option::U8("Ganon's Boss Key", {"Vanilla", "Own Dungeon", "Start With", "Any Dungeon", "Overworld", "Anywhere", "LACS-Vanilla", "LACS-Stones", "LACS-Medallions", "LACS-Rewards", "LACS-Dungeons", "LACS-Tokens", "Triforce Hunt"}, OptionCategory::Setting, RO_GANON_BOSS_KEY_VANILLA);
+    mOptions[RSK_LACS_STONE_COUNT] = Option::U8("Stone Count", {NumOpts(0, 4)}, OptionCategory::Setting, 1, true);
+    mOptions[RSK_LACS_MEDALLION_COUNT] = Option::U8("Medallion Count", {NumOpts(0, 7)}, OptionCategory::Setting, 1, true);
+    mOptions[RSK_LACS_REWARD_COUNT] = Option::U8("Reward Count", {NumOpts(0, 10)}, OptionCategory::Setting, 1, true);
+    mOptions[RSK_LACS_DUNGEON_COUNT] = Option::U8("Dungeon Count", {NumOpts(0, 9)}, OptionCategory::Setting, 1, true);
+    mOptions[RSK_LACS_TOKEN_COUNT] = Option::U8("Token Count", {NumOpts(0, 100)}, OptionCategory::Setting, 1, true);
+    mOptions[RSK_LACS_OPTIONS] = Option::U8("LACS Reward Options", {"Standard Reward", "Greg as Reward", "Greg as Wildcard"});
+    mOptions[RSK_KEYRINGS] = Option::U8("Key Rings", {"Off", "Random", "Count", "Selection"});
+    mOptions[RSK_KEYRINGS_RANDOM_COUNT] = Option::U8("Keyring Dungeon Count", {NumOpts(0, 9)}, OptionCategory::Setting, 1);
+    mOptions[RSK_KEYRINGS_GERUDO_FORTRESS] = Option::Bool("Gerudo Fortress");
+    mOptions[RSK_KEYRINGS_FOREST_TEMPLE] = Option::Bool("Forest Temple");
+    mOptions[RSK_KEYRINGS_FIRE_TEMPLE] = Option::Bool("Fire Temple");
+    mOptions[RSK_KEYRINGS_WATER_TEMPLE] = Option::Bool("Water Temple");
+    mOptions[RSK_KEYRINGS_SPIRIT_TEMPLE] = Option::Bool("Spirit Temple");
+    mOptions[RSK_KEYRINGS_SHADOW_TEMPLE] = Option::Bool("Shadow Temple");
+    mOptions[RSK_KEYRINGS_BOTTOM_OF_THE_WELL] = Option::Bool("Bottom of the Well");
+    mOptions[RSK_KEYRINGS_GTG] = Option::Bool("Gerudo Training Grounds");
+    mOptions[RSK_KEYRINGS_GANONS_CASTLE] = Option::Bool("Ganon's Castle");
+    mOptions[RSK_SKIP_CHILD_STEALTH] = Option::Bool("Skip Child Stealth", {"Don't Skip", "Skip"}, OptionCategory::Setting, RO_GENERIC_SKIP);
+    mOptions[RSK_SKIP_CHILD_ZELDA] = Option::Bool("Skip Child Zelda", {"Don't Skip", "Skip"}, OptionCategory::Setting, RO_GENERIC_DONT_SKIP);
+    mOptions[RSK_SKIP_TOWER_ESCAPE] = Option::Bool("Skip Tower Escape", {"Don't Skip", "Skip"});
+    mOptions[RSK_SKIP_EPONA_RACE] = Option::Bool("Skip Epona Race", {"Don't Skip", "Skip"});
+    mOptions[RSK_SKIP_SCARECROWS_SONG] = Option::Bool("Skip Scarecrow's Song");
+    mOptions[RSK_BIG_POE_COUNT] = Option::U8("Big Poe Target Count", {NumOpts(1, 10)});
+    mOptions[RSK_CUCCO_COUNT] = Option::U8("Cuccos to return", {NumOpts(0, 7)});
+    mOptions[RSK_COMPLETE_MASK_QUEST] = Option::Bool("Complete Mask Quest");
+    mOptions[RSK_ENABLE_GLITCH_CUTSCENES] = Option::Bool("Enable Glitch-Useful Cutscenes");
+    mOptions[RSK_GOSSIP_STONE_HINTS] = Option::U8("Gossip Stone Hints", {"No Hints", "Need Nothing", "Mask of Truth", "Stone of Agony"}, OptionCategory::Setting, RO_GOSSIP_STONES_NEED_NOTHING);
+    mOptions[RSK_HINT_CLARITY] = Option::U8("Hint Clarity", {"Obscure", "Ambiguous", "Clear"});
+    mOptions[RSK_HINT_DISTRIBUTION] = Option::U8("Hint Distribution", {"Useless", "Balanced", "Strong", "Very Strong"}, OptionCategory::Setting, RO_HINT_DIST_BALANCED);
+    mOptions[RSK_TOT_ALTAR_HINT] = Option::Bool("ToT Altar Hint", {"Off", "On"}, OptionCategory::Setting, RO_GENERIC_ON);
+    mOptions[RSK_LIGHT_ARROWS_HINT] = Option::Bool("Light Arrow Hint", {"Off", "On"}, OptionCategory::Setting, RO_GENERIC_ON);
+    mOptions[RSK_DAMPES_DIARY_HINT] = Option::Bool("Dampe's Diary Hint");
+    mOptions[RSK_GREG_HINT] = Option::Bool("Greg the Green Rupee Hint");
+    mOptions[RSK_SARIA_HINT] = Option::Bool("Saria's Hint");
+    mOptions[RSK_FROGS_HINT] = Option::Bool("Frog Ocarina Game Hint");
+    mOptions[RSK_WARP_SONG_HINTS] = Option::Bool("Warp Song Hints");
+    mOptions[RSK_KAK_10_SKULLS_HINT] = Option::Bool("10 GS Hint");
+    mOptions[RSK_KAK_20_SKULLS_HINT] = Option::Bool("20 GS Hint");
+    mOptions[RSK_KAK_30_SKULLS_HINT] = Option::Bool("30 GS Hint");
+    mOptions[RSK_KAK_40_SKULLS_HINT] = Option::Bool("40 GS Hint");
+    mOptions[RSK_KAK_50_SKULLS_HINT] = Option::Bool("50 GS Hint");
+    mOptions[RSK_SCRUB_TEXT_HINT] = Option::Bool("Scrub Hint Text");
+    // TODO: Compasses show rewards/woth, maps show dungeon mode
+    mOptions[RSK_BLUE_FIRE_ARROWS] = Option::Bool("Blue Fire Arrows");
+    mOptions[RSK_SUNLIGHT_ARROWS] = Option::Bool("Sunlight Arrows");
+    mOptions[RSK_ITEM_POOL] = Option::U8("Item Pool", {"Plentiful", "Balanced", "Scarce", "Minimal"}, OptionCategory::Setting, RO_ITEM_POOL_BALANCED);
+    mOptions[RSK_ICE_TRAPS] = Option::U8("Ice Traps", {"Off", "Normal", "Extra", "Mayhem", "Onslaught"}, OptionCategory::Setting, RO_ICE_TRAPS_NORMAL);
+    // TODO: Remove Double Defense, Progressive Goron Sword
+    mOptions[RSK_STARTING_OCARINA] = Option::U8("Start with Ocarina", {"Off", "Fairy Ocarina", "Ocarina of Time"});
+    mOptions[RSK_STARTING_DEKU_SHIELD] = Option::Bool("Start with Deku Shield");
+    mOptions[RSK_STARTING_KOKIRI_SWORD] = Option::Bool("Start with Kokiri Sword");
+    mOptions[RSK_STARTING_MASTER_SWORD] = Option::Bool("Start with Master Sword");
+    mOptions[RSK_STARTING_CONSUMABLES] = Option::Bool("Start with Consumables", {"No", "Yes"});
+    mOptions[RSK_FULL_WALLETS] = Option::Bool("Full Wallets", {"No", "Yes"});
+    mOptions[RSK_STARTING_ZELDAS_LULLABY] = Option::Bool("Start with Zelda's Lullaby");
+    mOptions[RSK_STARTING_EPONAS_SONG] = Option::Bool("Start with Epona's Song");
+    mOptions[RSK_STARTING_SARIAS_SONG] = Option::Bool("Start with Epona's Song");
+    mOptions[RSK_STARTING_SUNS_SONG] = Option::Bool("Start with Sun's Song");
+    mOptions[RSK_STARTING_SONG_OF_TIME] = Option::Bool("Start with Song of Time");
+    mOptions[RSK_STARTING_SONG_OF_STORMS] = Option::Bool("Start with Song of Storms");
+    mOptions[RSK_STARTING_MINUET_OF_FOREST] = Option::Bool("Start with Minuet of Forest");
+    mOptions[RSK_STARTING_BOLERO_OF_FIRE] = Option::Bool("Start with Bolero of Fire");
+    mOptions[RSK_STARTING_SERENADE_OF_WATER] = Option::Bool("Start with Serenade of Water");
+    mOptions[RSK_STARTING_REQUIEM_OF_SPIRIT] = Option::Bool("Start with Requiem of Spirit");
+    mOptions[RSK_STARTING_NOCTURNE_OF_SHADOW] = Option::Bool("Start with Nocturne of Shadow");
+    mOptions[RSK_STARTING_PRELUDE_OF_LIGHT] = Option::Bool("Start with Prelude of Light");
+    mOptions[RSK_STARTING_SKULLTULA_TOKEN] = Option::U8("Gold Skulltula Tokens", {NumOpts(0, 100)});
+    mOptions[RSK_STARTING_HEARTS] = Option::U8("Hearts", {NumOpts(1, 20)}, OptionCategory::Setting, 2);
+    // TODO: Remainder of Starting Items
+    mOptions[RSK_LOGIC_RULES] = Option::U8("Logic", {"Glitchless", "Glitched", "No Logic", "Vanilla"});
+    mOptions[RSK_ALL_LOCATIONS_REACHABLE] = Option::Bool("All Locations Reachable", {"Off", "On"}, OptionCategory::Setting, RO_GENERIC_ON);
+    mOptions[RSK_SKULLS_SUNS_SONG] = Option::Bool("Night Skulltula's Expect Sun's Song");
+    mOptions[RSK_DAMAGE_MULTIPLIER] = Option::U8("Damage Multiplier", {"x1/2", "x1", "x2", "x4", "x8", "x16", "OHKO"}, OptionCategory::Setting, RO_DAMAGE_MULTIPLIER_DEFAULT);
+    // clang-format on
+
+    mExcludeLocationsOptionsGroups.reserve(SPOILER_COLLECTION_GROUP_COUNT);
+
+    mTrickOptions[RT_VISIBLE_COLLISION] = Option::LogicTrick(std::to_string(RT_VISIBLE_COLLISION));
+    mTrickOptions[RT_GROTTOS_WITHOUT_AGONY] = Option::LogicTrick(std::to_string(RT_GROTTOS_WITHOUT_AGONY));
+    mTrickOptions[RT_FEWER_TUNIC_REQUIREMENTS] = Option::LogicTrick(std::to_string(RT_FEWER_TUNIC_REQUIREMENTS));
+    mTrickOptions[RT_RUSTED_SWITCHES] = Option::LogicTrick(std::to_string(RT_RUSTED_SWITCHES));
+    mTrickOptions[RT_FLAMING_CHESTS] = Option::LogicTrick(std::to_string(RT_FLAMING_CHESTS));
+    mTrickOptions[RT_BUNNY_HOOD_JUMPS] = Option::LogicTrick(std::to_string(RT_BUNNY_HOOD_JUMPS));
+    mTrickOptions[RT_DAMAGE_BOOST_SIMPLE] = Option::LogicTrick(std::to_string(RT_DAMAGE_BOOST_SIMPLE));
+    mTrickOptions[RT_HOVER_BOOST_SIMPLE] = Option::LogicTrick(std::to_string(RT_HOVER_BOOST_SIMPLE));
+    mTrickOptions[RT_KF_ADULT_GS] = Option::LogicTrick(std::to_string(RT_KF_ADULT_GS));
+    mTrickOptions[RT_LW_BRIDGE] = Option::LogicTrick(std::to_string(RT_LW_BRIDGE));
+    mTrickOptions[RT_LW_MIDO_BACKFLIP] = Option::LogicTrick(std::to_string(RT_LW_MIDO_BACKFLIP));
+    mTrickOptions[RT_LW_GS_BEAN] = Option::LogicTrick(std::to_string(RT_LW_GS_BEAN));
+    mTrickOptions[RT_HC_STORMS_GS] = Option::LogicTrick(std::to_string(RT_HC_STORMS_GS));
+    mTrickOptions[RT_KAK_MAN_ON_ROOF] = Option::LogicTrick(std::to_string(RT_KAK_MAN_ON_ROOF));
+    mTrickOptions[RT_KAK_TOWER_GS] = Option::LogicTrick(std::to_string(RT_KAK_TOWER_GS));
+    mTrickOptions[RT_KAK_ADULT_WINDMILL_POH] = Option::LogicTrick(std::to_string(RT_KAK_ADULT_WINDMILL_POH));
+    mTrickOptions[RT_KAK_CHILD_WINDMILL_POH] = Option::LogicTrick(std::to_string(RT_KAK_CHILD_WINDMILL_POH));
+    mTrickOptions[RT_KAK_ROOFTOP_GS] = Option::LogicTrick(std::to_string(RT_KAK_ROOFTOP_GS));
+    mTrickOptions[RT_GY_POH] = Option::LogicTrick(std::to_string(RT_GY_POH));
+    mTrickOptions[RT_GY_CHILD_DAMPE_RACE_POH] = Option::LogicTrick(std::to_string(RT_GY_CHILD_DAMPE_RACE_POH));
+    mTrickOptions[RT_GY_SHADOW_FIRE_ARROWS] = Option::LogicTrick(std::to_string(RT_GY_SHADOW_FIRE_ARROWS));
+    mTrickOptions[RT_DMT_SOIL_GS] = Option::LogicTrick(std::to_string(RT_DMT_SOIL_GS));
+    mTrickOptions[RT_DMT_BOMBABLE] = Option::LogicTrick(std::to_string(RT_DMT_BOMBABLE));
+    mTrickOptions[RT_DMT_HOOKSHOT_LOWER_GS] = Option::LogicTrick(std::to_string(RT_DMT_HOOKSHOT_LOWER_GS));
+    mTrickOptions[RT_DMT_HOVERS_LOWER_GS] = Option::LogicTrick(std::to_string(RT_DMT_HOVERS_LOWER_GS));
+    mTrickOptions[RT_DMT_BEAN_LOWER_GS] = Option::LogicTrick(std::to_string(RT_DMT_BEAN_LOWER_GS));
+    mTrickOptions[RT_DMT_JS_LOWER_GS] = Option::LogicTrick(std::to_string(RT_DMT_JS_LOWER_GS));
+    mTrickOptions[RT_DMT_CLIMB_HOVERS] = Option::LogicTrick(std::to_string(RT_DMT_CLIMB_HOVERS));
+    mTrickOptions[RT_DMT_UPPER_GS] = Option::LogicTrick(std::to_string(RT_DMT_UPPER_GS));
+    mTrickOptions[RT_DMT_BOLERO_BIGGORON] = Option::LogicTrick(std::to_string(RT_DMT_BOLERO_BIGGORON));
+    mTrickOptions[RT_GC_POT] = Option::LogicTrick(std::to_string(RT_GC_POT));
+    mTrickOptions[RT_GC_POT_STRENGTH] = Option::LogicTrick(std::to_string(RT_GC_POT_STRENGTH));
+    mTrickOptions[RT_GC_ROLLING_STRENGTH] = Option::LogicTrick(std::to_string(RT_GC_ROLLING_STRENGTH));
+    mTrickOptions[RT_GC_LEFTMOST] = Option::LogicTrick(std::to_string(RT_GC_LEFTMOST));
+    mTrickOptions[RT_GC_GROTTO] = Option::LogicTrick(std::to_string(RT_GC_GROTTO));
+    mTrickOptions[RT_GC_LINK_GORON_DINS] = Option::LogicTrick(std::to_string(RT_GC_LINK_GORON_DINS));
+    mTrickOptions[RT_DMC_HOVER_BEAN_POH] = Option::LogicTrick(std::to_string(RT_DMC_HOVER_BEAN_POH));
+    mTrickOptions[RT_DMC_BOLERO_JUMP] = Option::LogicTrick(std::to_string(RT_DMC_BOLERO_JUMP));
+    mTrickOptions[RT_DMC_BOULDER_JS] = Option::LogicTrick(std::to_string(RT_DMC_BOULDER_JS));
+    mTrickOptions[RT_DMC_BOULDER_SKIP] = Option::LogicTrick(std::to_string(RT_DMC_BOULDER_SKIP));
+    mTrickOptions[RT_ZR_LOWER] = Option::LogicTrick(std::to_string(RT_ZR_LOWER));
+    mTrickOptions[RT_ZR_UPPER] = Option::LogicTrick(std::to_string(RT_ZR_UPPER));
+    mTrickOptions[RT_ZR_HOVERS] = Option::LogicTrick(std::to_string(RT_ZR_HOVERS));
+    mTrickOptions[RT_ZR_CUCCO] = Option::LogicTrick(std::to_string(RT_ZR_CUCCO));
+    mTrickOptions[RT_ZD_KING_ZORA_SKIP] = Option::LogicTrick(std::to_string(RT_ZD_KING_ZORA_SKIP));
+    mTrickOptions[RT_ZD_GS] = Option::LogicTrick(std::to_string(RT_ZD_GS));
+    mTrickOptions[RT_LH_LAB_WALL_GS] = Option::LogicTrick(std::to_string(RT_LH_LAB_WALL_GS));
+    mTrickOptions[RT_LH_LAB_DIVING] = Option::LogicTrick(std::to_string(RT_LH_LAB_DIVING));
+    mTrickOptions[RT_LH_WATER_HOOKSHOT] = Option::LogicTrick(std::to_string(RT_LH_WATER_HOOKSHOT));
+    mTrickOptions[RT_GV_CRATE_HOVERS] = Option::LogicTrick(std::to_string(RT_GV_CRATE_HOVERS));
+    mTrickOptions[RT_GF_KITCHEN] = Option::LogicTrick(std::to_string(RT_GF_KITCHEN));
+    mTrickOptions[RT_GF_JUMP] = Option::LogicTrick(std::to_string(RT_GF_JUMP));
+    mTrickOptions[RT_HW_BUNNY_CROSSING] = Option::LogicTrick(std::to_string(RT_HW_BUNNY_CROSSING));
+    mTrickOptions[RT_HW_CROSSING] = Option::LogicTrick(std::to_string(RT_HW_CROSSING));
+    mTrickOptions[RT_LENS_HW] = Option::LogicTrick(std::to_string(RT_LENS_HW));
+    mTrickOptions[RT_HW_REVERSE] = Option::LogicTrick(std::to_string(RT_HW_REVERSE));
+    mTrickOptions[RT_COLOSSUS_GS] = Option::LogicTrick(std::to_string(RT_COLOSSUS_GS));
+    mTrickOptions[RT_DEKU_BASEMENT_GS] = Option::LogicTrick(std::to_string(RT_DEKU_BASEMENT_GS));
+    mTrickOptions[RT_DEKU_B1_SKIP] = Option::LogicTrick(std::to_string(RT_DEKU_B1_SKIP));
+    mTrickOptions[RT_DEKU_B1_BOW_WEBS] = Option::LogicTrick(std::to_string(RT_DEKU_B1_BOW_WEBS));
+    mTrickOptions[RT_DEKU_MQ_COMPASS_GS] = Option::LogicTrick(std::to_string(RT_DEKU_MQ_COMPASS_GS));
+    mTrickOptions[RT_DEKU_MQ_LOG] = Option::LogicTrick(std::to_string(RT_DEKU_MQ_LOG));
+    mTrickOptions[RT_DC_SCARECROW_GS] = Option::LogicTrick(std::to_string(RT_DC_SCARECROW_GS));
+    mTrickOptions[RT_DC_VINES_GS] = Option::LogicTrick(std::to_string(RT_DC_VINES_GS));
+    mTrickOptions[RT_DC_STAIRCASE] = Option::LogicTrick(std::to_string(RT_DC_STAIRCASE));
+    mTrickOptions[RT_DC_SLINGSHOT_SKIP] = Option::LogicTrick(std::to_string(RT_DC_SLINGSHOT_SKIP));
+    mTrickOptions[RT_DC_SCRUB_ROOM] = Option::LogicTrick(std::to_string(RT_DC_SCRUB_ROOM));
+    mTrickOptions[RT_DC_JUMP] = Option::LogicTrick(std::to_string(RT_DC_JUMP));
+    mTrickOptions[RT_DC_HAMMER_FLOOR] = Option::LogicTrick(std::to_string(RT_DC_HAMMER_FLOOR));
+    mTrickOptions[RT_DC_MQ_CHILD_BOMBS] = Option::LogicTrick(std::to_string(RT_DC_MQ_CHILD_BOMBS));
+    mTrickOptions[RT_DC_MQ_CHILD_EYES] = Option::LogicTrick(std::to_string(RT_DC_MQ_CHILD_EYES));
+    mTrickOptions[RT_DC_MQ_ADULT_EYES] = Option::LogicTrick(std::to_string(RT_DC_MQ_ADULT_EYES));
+    mTrickOptions[RT_JABU_ALCOVE_JUMP_DIVE] = Option::LogicTrick(std::to_string(RT_JABU_ALCOVE_JUMP_DIVE));
+    mTrickOptions[RT_JABU_BOSS_HOVER] = Option::LogicTrick(std::to_string(RT_JABU_BOSS_HOVER));
+    mTrickOptions[RT_JABU_NEAR_BOSS_RANGED] = Option::LogicTrick(std::to_string(RT_JABU_NEAR_BOSS_RANGED));
+    mTrickOptions[RT_JABU_NEAR_BOSS_EXPLOSIVES] = Option::LogicTrick(std::to_string(RT_JABU_NEAR_BOSS_EXPLOSIVES));
+    mTrickOptions[RT_LENS_JABU_MQ] = Option::LogicTrick(std::to_string(RT_LENS_JABU_MQ));
+    mTrickOptions[RT_JABU_MQ_RANG_JUMP] = Option::LogicTrick(std::to_string(RT_JABU_MQ_RANG_JUMP));
+    mTrickOptions[RT_JABU_MQ_SOT_GS] = Option::LogicTrick(std::to_string(RT_JABU_MQ_SOT_GS));
+    mTrickOptions[RT_LENS_BOTW] = Option::LogicTrick(std::to_string(RT_LENS_BOTW));
+    mTrickOptions[RT_BOTW_CHILD_DEADHAND] = Option::LogicTrick(std::to_string(RT_BOTW_CHILD_DEADHAND));
+    mTrickOptions[RT_BOTW_BASEMENT] = Option::LogicTrick(std::to_string(RT_BOTW_BASEMENT));
+    mTrickOptions[RT_BOTW_MQ_PITS] = Option::LogicTrick(std::to_string(RT_BOTW_MQ_PITS));
+    mTrickOptions[RT_BOTW_MQ_DEADHAND_KEY] = Option::LogicTrick(std::to_string(RT_BOTW_MQ_DEADHAND_KEY));
+    mTrickOptions[RT_FOREST_FIRST_GS] = Option::LogicTrick(std::to_string(RT_FOREST_FIRST_GS));
+    mTrickOptions[RT_FOREST_OUTDOORS_EAST_GS] = Option::LogicTrick(std::to_string(RT_FOREST_OUTDOORS_EAST_GS));
+    mTrickOptions[RT_FOREST_VINES] = Option::LogicTrick(std::to_string(RT_FOREST_VINES));
+    mTrickOptions[RT_FOREST_OUTDOORS_LEDGE] = Option::LogicTrick(std::to_string(RT_FOREST_OUTDOORS_LEDGE));
+    mTrickOptions[RT_FOREST_DOORFRAME] = Option::LogicTrick(std::to_string(RT_FOREST_DOORFRAME));
+    mTrickOptions[RT_FOREST_OUTSIDE_BACKDOOR] = Option::LogicTrick(std::to_string(RT_FOREST_OUTSIDE_BACKDOOR));
+    mTrickOptions[RT_FOREST_MQ_WELL_SWIM] = Option::LogicTrick(std::to_string(RT_FOREST_MQ_WELL_SWIM));
+    mTrickOptions[RT_FOREST_MQ_BLOCK_PUZZLE] = Option::LogicTrick(std::to_string(RT_FOREST_MQ_BLOCK_PUZZLE));
+    mTrickOptions[RT_FOREST_MQ_JS_HALLWAY_SWITCH] = Option::LogicTrick(std::to_string(RT_FOREST_MQ_JS_HALLWAY_SWITCH));
+    mTrickOptions[RT_FOREST_MQ_HOOKSHOT_HALLWAY_SWITCH] = Option::LogicTrick(std::to_string(RT_FOREST_MQ_HOOKSHOT_HALLWAY_SWITCH));
+    mTrickOptions[RT_FOREST_MQ_RANG_HALLWAY_SWITCH] = Option::LogicTrick(std::to_string(RT_FOREST_MQ_RANG_HALLWAY_SWITCH));
+    mTrickOptions[RT_FIRE_BOSS_DOOR_JUMP] = Option::LogicTrick(std::to_string(RT_FIRE_BOSS_DOOR_JUMP));
+    mTrickOptions[RT_FIRE_SOT] = Option::LogicTrick(std::to_string(RT_FIRE_SOT));
+    mTrickOptions[RT_FIRE_STRENGTH] = Option::LogicTrick(std::to_string(RT_FIRE_STRENGTH));
+    mTrickOptions[RT_FIRE_SCARECROW] = Option::LogicTrick(std::to_string(RT_FIRE_SCARECROW));
+    mTrickOptions[RT_FIRE_FLAME_MAZE] = Option::LogicTrick(std::to_string(RT_FIRE_FLAME_MAZE));
+    mTrickOptions[RT_FIRE_MQ_NEAR_BOSS] = Option::LogicTrick(std::to_string(RT_FIRE_MQ_NEAR_BOSS));
+    mTrickOptions[RT_FIRE_MQ_BLOCKED_CHEST] = Option::LogicTrick(std::to_string(RT_FIRE_MQ_BLOCKED_CHEST));
+    mTrickOptions[RT_FIRE_MQ_BK_CHEST] = Option::LogicTrick(std::to_string(RT_FIRE_MQ_BK_CHEST));
+    mTrickOptions[RT_FIRE_MQ_CLIMB] = Option::LogicTrick(std::to_string(RT_FIRE_MQ_CLIMB));
+    mTrickOptions[RT_FIRE_MQ_MAZE_SIDE_ROOM] = Option::LogicTrick(std::to_string(RT_FIRE_MQ_MAZE_SIDE_ROOM));
+    mTrickOptions[RT_FIRE_MQ_MAZE_HOVERS] = Option::LogicTrick(std::to_string(RT_FIRE_MQ_MAZE_HOVERS));
+    mTrickOptions[RT_FIRE_MQ_MAZE_JUMP] = Option::LogicTrick(std::to_string(RT_FIRE_MQ_MAZE_JUMP));
+    mTrickOptions[RT_FIRE_MQ_ABOVE_MAZE_GS] = Option::LogicTrick(std::to_string(RT_FIRE_MQ_ABOVE_MAZE_GS));
+    mTrickOptions[RT_FIRE_MQ_FLAME_MAZE] = Option::LogicTrick(std::to_string(RT_FIRE_MQ_FLAME_MAZE));
+    mTrickOptions[RT_WATER_LONGSHOT_TORCH] = Option::LogicTrick(std::to_string(RT_WATER_LONGSHOT_TORCH));
+    mTrickOptions[RT_WATER_CRACKED_WALL_HOVERS] = Option::LogicTrick(std::to_string(RT_WATER_CRACKED_WALL_HOVERS));
+    mTrickOptions[RT_WATER_CRACKED_WALL] = Option::LogicTrick(std::to_string(RT_WATER_CRACKED_WALL));
+    mTrickOptions[RT_WATER_BK_REGION] = Option::LogicTrick(std::to_string(RT_WATER_BK_REGION));
+    mTrickOptions[RT_WATER_NORTH_BASEMENT_LEDGE_JUMP] = Option::LogicTrick(std::to_string(RT_WATER_NORTH_BASEMENT_LEDGE_JUMP));
+    mTrickOptions[RT_WATER_BK_JUMP_DIVE] = Option::LogicTrick(std::to_string(RT_WATER_BK_JUMP_DIVE));
+    mTrickOptions[RT_WATER_FW_CENTRAL_GS] = Option::LogicTrick(std::to_string(RT_WATER_FW_CENTRAL_GS));
+    mTrickOptions[RT_WATER_IRONS_CENTRAL_GS] = Option::LogicTrick(std::to_string(RT_WATER_IRONS_CENTRAL_GS));
+    mTrickOptions[RT_WATER_CENTRAL_BOW] = Option::LogicTrick(std::to_string(RT_WATER_CENTRAL_BOW));
+    mTrickOptions[RT_WATER_HOOKSHOT_FALLING_PLATFORM_GS] = Option::LogicTrick(std::to_string(RT_WATER_HOOKSHOT_FALLING_PLATFORM_GS));
+    mTrickOptions[RT_WATER_RANG_FALLING_PLATFORM_GS] = Option::LogicTrick(std::to_string(RT_WATER_RANG_FALLING_PLATFORM_GS));
+    mTrickOptions[RT_WATER_RIVER_GS] = Option::LogicTrick(std::to_string(RT_WATER_RIVER_GS));
+    mTrickOptions[RT_WATER_DRAGON_JUMP_DIVE] = Option::LogicTrick(std::to_string(RT_WATER_DRAGON_JUMP_DIVE));
+    mTrickOptions[RT_WATER_ADULT_DRAGON] = Option::LogicTrick(std::to_string(RT_WATER_ADULT_DRAGON));
+    mTrickOptions[RT_WATER_CHILD_DRAGON] = Option::LogicTrick(std::to_string(RT_WATER_CHILD_DRAGON));
+    mTrickOptions[RT_WATER_MQ_CENTRAL_PILLAR] = Option::LogicTrick(std::to_string(RT_WATER_MQ_CENTRAL_PILLAR));
+    mTrickOptions[RT_WATER_MQ_LOCKED_GS] = Option::LogicTrick(std::to_string(RT_WATER_MQ_LOCKED_GS));
+    mTrickOptions[RT_LENS_SHADOW] = Option::LogicTrick(std::to_string(RT_LENS_SHADOW));
+    mTrickOptions[RT_LENS_SHADOW_PLATFORM] = Option::LogicTrick(std::to_string(RT_LENS_SHADOW_PLATFORM));
+    mTrickOptions[RT_LENS_BONGO] = Option::LogicTrick(std::to_string(RT_LENS_BONGO));
+    mTrickOptions[RT_SHADOW_UMBRELLA] = Option::LogicTrick(std::to_string(RT_SHADOW_UMBRELLA));
+    mTrickOptions[RT_SHADOW_UMBRELLA_GS] = Option::LogicTrick(std::to_string(RT_SHADOW_UMBRELLA_GS));
+    mTrickOptions[RT_SHADOW_FREESTANDING_KEY] = Option::LogicTrick(std::to_string(RT_SHADOW_FREESTANDING_KEY));
+    mTrickOptions[RT_SHADOW_STATUE] = Option::LogicTrick(std::to_string(RT_SHADOW_STATUE));
+    mTrickOptions[RT_SHADOW_BONGO] = Option::LogicTrick(std::to_string(RT_SHADOW_BONGO));
+    mTrickOptions[RT_LENS_SHADOW_MQ] = Option::LogicTrick(std::to_string(RT_LENS_SHADOW_MQ));
+    mTrickOptions[RT_LENS_SHADOW_MQ_INVISIBLE_BLADES] = Option::LogicTrick(std::to_string(RT_LENS_SHADOW_MQ_INVISIBLE_BLADES));
+    mTrickOptions[RT_LENS_SHADOW_MQ_PLATFORM] = Option::LogicTrick(std::to_string(RT_LENS_SHADOW_MQ_PLATFORM));
+    mTrickOptions[RT_LENS_SHADOW_MQ_DEADHAND] = Option::LogicTrick(std::to_string(RT_LENS_SHADOW_MQ_DEADHAND));
+    mTrickOptions[RT_SHADOW_MQ_GAP] = Option::LogicTrick(std::to_string(RT_SHADOW_MQ_GAP));
+    mTrickOptions[RT_SHADOW_MQ_INVISIBLE_BLADES] = Option::LogicTrick(std::to_string(RT_SHADOW_MQ_INVISIBLE_BLADES));
+    mTrickOptions[RT_SHADOW_MQ_HUGE_PIT] = Option::LogicTrick(std::to_string(RT_SHADOW_MQ_HUGE_PIT));
+    mTrickOptions[RT_SHADOW_MQ_WINDY_WALKWAY] = Option::LogicTrick(std::to_string(RT_SHADOW_MQ_WINDY_WALKWAY));
+    mTrickOptions[RT_LENS_SPIRIT] = Option::LogicTrick(std::to_string(RT_LENS_SPIRIT));
+    mTrickOptions[RT_SPIRIT_CHILD_CHU] = Option::LogicTrick(std::to_string(RT_SPIRIT_CHILD_CHU));
+    mTrickOptions[RT_SPIRIT_LOBBY_GS] = Option::LogicTrick(std::to_string(RT_SPIRIT_LOBBY_GS));
+    mTrickOptions[RT_SPIRIT_LOWER_ADULT_SWITCH] = Option::LogicTrick(std::to_string(RT_SPIRIT_LOWER_ADULT_SWITCH));
+    mTrickOptions[RT_SPIRIT_LOBBY_JUMP] = Option::LogicTrick(std::to_string(RT_SPIRIT_LOBBY_JUMP));
+    mTrickOptions[RT_SPIRIT_PLATFORM_HOOKSHOT] = Option::LogicTrick(std::to_string(RT_SPIRIT_PLATFORM_HOOKSHOT));
+    mTrickOptions[RT_SPIRIT_MAP_CHEST] = Option::LogicTrick(std::to_string(RT_SPIRIT_MAP_CHEST));
+    mTrickOptions[RT_SPIRIT_SUN_CHEST] = Option::LogicTrick(std::to_string(RT_SPIRIT_SUN_CHEST));
+    mTrickOptions[RT_SPIRIT_WALL] = Option::LogicTrick(std::to_string(RT_SPIRIT_WALL));
+    mTrickOptions[RT_LENS_SPIRIT_MQ] = Option::LogicTrick(std::to_string(RT_LENS_SPIRIT_MQ));
+    mTrickOptions[RT_SPIRIT_MQ_SUN_BLOCK_SOT] = Option::LogicTrick(std::to_string(RT_SPIRIT_MQ_SUN_BLOCK_SOT));
+    mTrickOptions[RT_SPIRIT_MQ_SUN_BLOCK_GS] = Option::LogicTrick(std::to_string(RT_SPIRIT_MQ_SUN_BLOCK_GS));
+    mTrickOptions[RT_SPIRIT_MQ_LOWER_ADULT] = Option::LogicTrick(std::to_string(RT_SPIRIT_MQ_LOWER_ADULT));
+    mTrickOptions[RT_SPIRIT_MQ_FROZEN_EYE] = Option::LogicTrick(std::to_string(RT_SPIRIT_MQ_FROZEN_EYE));
+    mTrickOptions[RT_ICE_BLOCK_GS] = Option::LogicTrick(std::to_string(RT_ICE_BLOCK_GS));
+    mTrickOptions[RT_ICE_MQ_RED_ICE_GS] = Option::LogicTrick(std::to_string(RT_ICE_MQ_RED_ICE_GS));
+    mTrickOptions[RT_ICE_MQ_SCARECROW] = Option::LogicTrick(std::to_string(RT_ICE_MQ_SCARECROW));
+    mTrickOptions[RT_LENS_GTG] = Option::LogicTrick(std::to_string(RT_LENS_GTG));
+    mTrickOptions[RT_GTG_WITHOUT_HOOKSHOT] = Option::LogicTrick(std::to_string(RT_GTG_WITHOUT_HOOKSHOT));
+    mTrickOptions[RT_GTG_FAKE_WALL] = Option::LogicTrick(std::to_string(RT_GTG_FAKE_WALL));
+    mTrickOptions[RT_LENS_GTG_MQ] = Option::LogicTrick(std::to_string(RT_LENS_GTG_MQ));
+    mTrickOptions[RT_GTG_MQ_WITH_HOOKSHOT] = Option::LogicTrick(std::to_string(RT_GTG_MQ_WITH_HOOKSHOT));
+    mTrickOptions[RT_GTG_MQ_WIHTOUT_HOOKSHOT] = Option::LogicTrick(std::to_string(RT_GTG_MQ_WIHTOUT_HOOKSHOT));
+    mTrickOptions[RT_LENS_GANON] = Option::LogicTrick(std::to_string(RT_LENS_GANON));
+    mTrickOptions[RT_GANON_SPIRIT_TRIAL_HOOKSHOT] = Option::LogicTrick(std::to_string(RT_GANON_SPIRIT_TRIAL_HOOKSHOT));
+    mTrickOptions[RT_LENS_GANON_MQ] = Option::LogicTrick(std::to_string(RT_LENS_GANON_MQ));
+    mTrickOptions[RT_GANON_MQ_FIRE_TRIAL] = Option::LogicTrick(std::to_string(RT_GANON_MQ_FIRE_TRIAL));
+    mTrickOptions[RT_GANON_MQ_SHADOW_TRIAL] = Option::LogicTrick(std::to_string(RT_GANON_MQ_SHADOW_TRIAL));
+    mTrickOptions[RT_GANON_MQ_LIGHT_TRIAL] = Option::LogicTrick(std::to_string(RT_GANON_MQ_LIGHT_TRIAL));
+
+    mOptionGroups[RSG_LOGIC] = OptionGroup::SubGroup("Logic Options", {
+        &mOptions[RSK_LOGIC_RULES],
+        &mOptions[RSK_ALL_LOCATIONS_REACHABLE],
+        &mOptions[RSK_SKULLS_SUNS_SONG],
+    });
+    // TODO: Exclude Locations Menus
+    mOptionGroups[RSG_TRICKS] = OptionGroup::SubGroup("Logical Tricks", {
+        &mTrickOptions[RT_VISIBLE_COLLISION],
+        &mTrickOptions[RT_GROTTOS_WITHOUT_AGONY],
+        &mTrickOptions[RT_FEWER_TUNIC_REQUIREMENTS],
+        &mTrickOptions[RT_RUSTED_SWITCHES],
+        &mTrickOptions[RT_FLAMING_CHESTS],
+        &mTrickOptions[RT_BUNNY_HOOD_JUMPS],
+        &mTrickOptions[RT_DAMAGE_BOOST_SIMPLE],
+        &mTrickOptions[RT_HOVER_BOOST_SIMPLE],
+        &mTrickOptions[RT_KF_ADULT_GS],
+        &mTrickOptions[RT_LW_BRIDGE],
+        &mTrickOptions[RT_LW_MIDO_BACKFLIP],
+        &mTrickOptions[RT_LW_GS_BEAN],
+        &mTrickOptions[RT_HC_STORMS_GS],
+        &mTrickOptions[RT_KAK_MAN_ON_ROOF],
+        &mTrickOptions[RT_KAK_TOWER_GS],
+        &mTrickOptions[RT_KAK_ADULT_WINDMILL_POH],
+        &mTrickOptions[RT_KAK_CHILD_WINDMILL_POH],
+        &mTrickOptions[RT_KAK_ROOFTOP_GS],
+        &mTrickOptions[RT_GY_POH],
+        &mTrickOptions[RT_GY_CHILD_DAMPE_RACE_POH],
+        &mTrickOptions[RT_GY_SHADOW_FIRE_ARROWS],
+        &mTrickOptions[RT_DMT_SOIL_GS],
+        &mTrickOptions[RT_DMT_BOMBABLE],
+        &mTrickOptions[RT_DMT_HOOKSHOT_LOWER_GS],
+        &mTrickOptions[RT_DMT_HOVERS_LOWER_GS],
+        &mTrickOptions[RT_DMT_BEAN_LOWER_GS],
+        &mTrickOptions[RT_DMT_JS_LOWER_GS],
+        &mTrickOptions[RT_DMT_CLIMB_HOVERS],
+        &mTrickOptions[RT_DMT_UPPER_GS],
+        &mTrickOptions[RT_DMT_BOLERO_BIGGORON],
+        &mTrickOptions[RT_GC_POT],
+        &mTrickOptions[RT_GC_POT_STRENGTH],
+        &mTrickOptions[RT_GC_ROLLING_STRENGTH],
+        &mTrickOptions[RT_GC_LEFTMOST],
+        &mTrickOptions[RT_GC_GROTTO],
+        &mTrickOptions[RT_GC_LINK_GORON_DINS],
+        &mTrickOptions[RT_DMC_HOVER_BEAN_POH],
+        &mTrickOptions[RT_DMC_BOLERO_JUMP],
+        &mTrickOptions[RT_DMC_BOULDER_JS],
+        &mTrickOptions[RT_DMC_BOULDER_SKIP],
+        &mTrickOptions[RT_ZR_LOWER],
+        &mTrickOptions[RT_ZR_UPPER],
+        &mTrickOptions[RT_ZR_HOVERS],
+        &mTrickOptions[RT_ZR_CUCCO],
+        &mTrickOptions[RT_ZD_KING_ZORA_SKIP],
+        &mTrickOptions[RT_ZD_GS],
+        &mTrickOptions[RT_LH_LAB_WALL_GS],
+        &mTrickOptions[RT_LH_LAB_DIVING],
+        &mTrickOptions[RT_LH_WATER_HOOKSHOT],
+        &mTrickOptions[RT_GV_CRATE_HOVERS],
+        &mTrickOptions[RT_GF_KITCHEN],
+        &mTrickOptions[RT_GF_JUMP],
+        &mTrickOptions[RT_HW_BUNNY_CROSSING],
+        &mTrickOptions[RT_HW_CROSSING],
+        &mTrickOptions[RT_LENS_HW],
+        &mTrickOptions[RT_HW_REVERSE],
+        &mTrickOptions[RT_COLOSSUS_GS],
+        &mTrickOptions[RT_DEKU_BASEMENT_GS],
+        &mTrickOptions[RT_DEKU_B1_SKIP],
+        &mTrickOptions[RT_DEKU_B1_BOW_WEBS],
+        &mTrickOptions[RT_DEKU_MQ_COMPASS_GS],
+        &mTrickOptions[RT_DEKU_MQ_LOG],
+        &mTrickOptions[RT_DC_SCARECROW_GS],
+        &mTrickOptions[RT_DC_VINES_GS],
+        &mTrickOptions[RT_DC_STAIRCASE],
+        &mTrickOptions[RT_DC_SLINGSHOT_SKIP],
+        &mTrickOptions[RT_DC_SCRUB_ROOM],
+        &mTrickOptions[RT_DC_JUMP],
+        &mTrickOptions[RT_DC_HAMMER_FLOOR],
+        &mTrickOptions[RT_DC_MQ_CHILD_BOMBS],
+        &mTrickOptions[RT_DC_MQ_CHILD_EYES],
+        &mTrickOptions[RT_DC_MQ_ADULT_EYES],
+        &mTrickOptions[RT_JABU_ALCOVE_JUMP_DIVE],
+        &mTrickOptions[RT_JABU_BOSS_HOVER],
+        &mTrickOptions[RT_JABU_NEAR_BOSS_RANGED],
+        &mTrickOptions[RT_JABU_NEAR_BOSS_EXPLOSIVES],
+        &mTrickOptions[RT_LENS_JABU_MQ],
+        &mTrickOptions[RT_JABU_MQ_RANG_JUMP],
+        &mTrickOptions[RT_JABU_MQ_SOT_GS],
+        &mTrickOptions[RT_LENS_BOTW],
+        &mTrickOptions[RT_BOTW_CHILD_DEADHAND],
+        &mTrickOptions[RT_BOTW_BASEMENT],
+        &mTrickOptions[RT_BOTW_MQ_PITS],
+        &mTrickOptions[RT_BOTW_MQ_DEADHAND_KEY],
+        &mTrickOptions[RT_FOREST_FIRST_GS],
+        &mTrickOptions[RT_FOREST_OUTDOORS_EAST_GS],
+        &mTrickOptions[RT_FOREST_VINES],
+        &mTrickOptions[RT_FOREST_OUTDOORS_LEDGE],
+        &mTrickOptions[RT_FOREST_DOORFRAME],
+        &mTrickOptions[RT_FOREST_OUTSIDE_BACKDOOR],
+        &mTrickOptions[RT_FOREST_MQ_WELL_SWIM],
+        &mTrickOptions[RT_FOREST_MQ_BLOCK_PUZZLE],
+        &mTrickOptions[RT_FOREST_MQ_JS_HALLWAY_SWITCH],
+        &mTrickOptions[RT_FOREST_MQ_HOOKSHOT_HALLWAY_SWITCH],
+        &mTrickOptions[RT_FOREST_MQ_RANG_HALLWAY_SWITCH],
+        &mTrickOptions[RT_FIRE_BOSS_DOOR_JUMP],
+        &mTrickOptions[RT_FIRE_SOT],
+        &mTrickOptions[RT_FIRE_STRENGTH],
+        &mTrickOptions[RT_FIRE_SCARECROW],
+        &mTrickOptions[RT_FIRE_FLAME_MAZE],
+        &mTrickOptions[RT_FIRE_MQ_NEAR_BOSS],
+        &mTrickOptions[RT_FIRE_MQ_BLOCKED_CHEST],
+        &mTrickOptions[RT_FIRE_MQ_BK_CHEST],
+        &mTrickOptions[RT_FIRE_MQ_CLIMB],
+        &mTrickOptions[RT_FIRE_MQ_MAZE_SIDE_ROOM],
+        &mTrickOptions[RT_FIRE_MQ_MAZE_HOVERS],
+        &mTrickOptions[RT_FIRE_MQ_MAZE_JUMP],
+        &mTrickOptions[RT_FIRE_MQ_ABOVE_MAZE_GS],
+        &mTrickOptions[RT_FIRE_MQ_FLAME_MAZE],
+        &mTrickOptions[RT_WATER_LONGSHOT_TORCH],
+        &mTrickOptions[RT_WATER_CRACKED_WALL_HOVERS],
+        &mTrickOptions[RT_WATER_CRACKED_WALL],
+        &mTrickOptions[RT_WATER_BK_REGION],
+        &mTrickOptions[RT_WATER_NORTH_BASEMENT_LEDGE_JUMP],
+        &mTrickOptions[RT_WATER_BK_JUMP_DIVE],
+        &mTrickOptions[RT_WATER_FW_CENTRAL_GS],
+        &mTrickOptions[RT_WATER_IRONS_CENTRAL_GS],
+        &mTrickOptions[RT_WATER_CENTRAL_BOW],
+        &mTrickOptions[RT_WATER_HOOKSHOT_FALLING_PLATFORM_GS],
+        &mTrickOptions[RT_WATER_RANG_FALLING_PLATFORM_GS],
+        &mTrickOptions[RT_WATER_RIVER_GS],
+        &mTrickOptions[RT_WATER_DRAGON_JUMP_DIVE],
+        &mTrickOptions[RT_WATER_ADULT_DRAGON],
+        &mTrickOptions[RT_WATER_CHILD_DRAGON],
+        &mTrickOptions[RT_WATER_MQ_CENTRAL_PILLAR],
+        &mTrickOptions[RT_WATER_MQ_LOCKED_GS],
+        &mTrickOptions[RT_LENS_SHADOW],
+        &mTrickOptions[RT_LENS_SHADOW_PLATFORM],
+        &mTrickOptions[RT_LENS_BONGO],
+        &mTrickOptions[RT_SHADOW_UMBRELLA],
+        &mTrickOptions[RT_SHADOW_UMBRELLA_GS],
+        &mTrickOptions[RT_SHADOW_FREESTANDING_KEY],
+        &mTrickOptions[RT_SHADOW_STATUE],
+        &mTrickOptions[RT_SHADOW_BONGO],
+        &mTrickOptions[RT_LENS_SHADOW_MQ],
+        &mTrickOptions[RT_LENS_SHADOW_MQ_INVISIBLE_BLADES],
+        &mTrickOptions[RT_LENS_SHADOW_MQ_PLATFORM],
+        &mTrickOptions[RT_LENS_SHADOW_MQ_DEADHAND],
+        &mTrickOptions[RT_SHADOW_MQ_GAP],
+        &mTrickOptions[RT_SHADOW_MQ_INVISIBLE_BLADES],
+        &mTrickOptions[RT_SHADOW_MQ_HUGE_PIT],
+        &mTrickOptions[RT_SHADOW_MQ_WINDY_WALKWAY],
+        &mTrickOptions[RT_LENS_SPIRIT],
+        &mTrickOptions[RT_SPIRIT_CHILD_CHU],
+        &mTrickOptions[RT_SPIRIT_LOBBY_GS],
+        &mTrickOptions[RT_SPIRIT_LOWER_ADULT_SWITCH],
+        &mTrickOptions[RT_SPIRIT_LOBBY_JUMP],
+        &mTrickOptions[RT_SPIRIT_PLATFORM_HOOKSHOT],
+        &mTrickOptions[RT_SPIRIT_MAP_CHEST],
+        &mTrickOptions[RT_SPIRIT_SUN_CHEST],
+        &mTrickOptions[RT_SPIRIT_WALL],
+        &mTrickOptions[RT_LENS_SPIRIT_MQ],
+        &mTrickOptions[RT_SPIRIT_MQ_SUN_BLOCK_SOT],
+        &mTrickOptions[RT_SPIRIT_MQ_SUN_BLOCK_GS],
+        &mTrickOptions[RT_SPIRIT_MQ_LOWER_ADULT],
+        &mTrickOptions[RT_SPIRIT_MQ_FROZEN_EYE],
+        &mTrickOptions[RT_ICE_BLOCK_GS],
+        &mTrickOptions[RT_ICE_MQ_RED_ICE_GS],
+        &mTrickOptions[RT_ICE_MQ_SCARECROW],
+        &mTrickOptions[RT_LENS_GTG],
+        &mTrickOptions[RT_GTG_WITHOUT_HOOKSHOT],
+        &mTrickOptions[RT_GTG_FAKE_WALL],
+        &mTrickOptions[RT_LENS_GTG_MQ],
+        &mTrickOptions[RT_GTG_MQ_WITH_HOOKSHOT],
+        &mTrickOptions[RT_GTG_MQ_WIHTOUT_HOOKSHOT],
+        &mTrickOptions[RT_LENS_GANON],
+        &mTrickOptions[RT_GANON_SPIRIT_TRIAL_HOOKSHOT],
+        &mTrickOptions[RT_LENS_GANON_MQ],
+        &mTrickOptions[RT_GANON_MQ_FIRE_TRIAL],
+        &mTrickOptions[RT_GANON_MQ_SHADOW_TRIAL],
+        &mTrickOptions[RT_GANON_MQ_LIGHT_TRIAL],
+    }, false);
+    // TODO: Glitches
+    mOptionGroups[RSG_OPEN] = OptionGroup("Open Settings", {
+        &mOptions[RSK_FOREST],
+        &mOptions[RSK_KAK_GATE],
+        &mOptions[RSK_DOOR_OF_TIME],
+        &mOptions[RSK_ZORAS_FOUNTAIN],
+        &mOptions[RSK_GERUDO_FORTRESS],
+        &mOptions[RSK_RAINBOW_BRIDGE],
+        &mOptions[RSK_RAINBOW_BRIDGE_STONE_COUNT],
+        &mOptions[RSK_RAINBOW_BRIDGE_MEDALLION_COUNT],
+        &mOptions[RSK_RAINBOW_BRIDGE_REWARD_COUNT],
+        &mOptions[RSK_RAINBOW_BRIDGE_DUNGEON_COUNT],
+        &mOptions[RSK_RAINBOW_BRIDGE_TOKEN_COUNT],
+        &mOptions[RSK_BRIDGE_OPTIONS],
+        &mOptions[RSK_GANONS_TRIALS],
+        &mOptions[RSK_TRIAL_COUNT],
+    });
+    mOptionGroups[RSG_WORLD] = OptionGroup("World Settings", {
+        &mOptions[RSK_STARTING_AGE],
+        &mOptions[RSK_SHUFFLE_ENTRANCES],
+        &mOptions[RSK_SHUFFLE_DUNGEON_ENTRANCES],
+        &mOptions[RSK_SHUFFLE_BOSS_ENTRANCES],
+        &mOptions[RSK_SHUFFLE_OVERWORLD_ENTRANCES],
+        &mOptions[RSK_SHUFFLE_INTERIOR_ENTRANCES],
+        &mOptions[RSK_SHUFFLE_GROTTO_ENTRANCES],
+        &mOptions[RSK_SHUFFLE_OWL_DROPS],
+        &mOptions[RSK_SHUFFLE_WARP_SONGS],
+        &mOptions[RSK_SHUFFLE_OVERWORLD_SPAWNS],
+        &mOptions[RSK_MIXED_ENTRANCE_POOLS],
+        &mOptions[RSK_MIX_DUNGEON_ENTRANCES],
+        &mOptions[RSK_MIX_OVERWORLD_ENTRANCES],
+        &mOptions[RSK_MIX_INTERIOR_ENTRANCES],
+        &mOptions[RSK_MIX_GROTTO_ENTRANCES],
+        &mOptions[RSK_DECOUPLED_ENTRANCES],
+        &mOptions[RSK_BOMBCHUS_IN_LOGIC],
+        &mOptions[RSK_ENABLE_BOMBCHU_DROPS],
+        &mOptions[RSK_TRIFORCE_HUNT],
+        &mOptions[RSK_TRIFORCE_HUNT_PIECES_TOTAL],
+        &mOptions[RSK_TRIFORCE_HUNT_PIECES_REQUIRED],
+        &mOptions[RSK_MQ_DUNGEON_RANDOM],
+        &mOptions[RSK_MQ_DUNGEON_COUNT],
+        &mOptions[RSK_MQ_DUNGEON_SET],
+    });
+    mOptionGroups[RSG_SHUFFLE_DUNGEON_QUESTS] = OptionGroup::SubGroup("Shuffle Dungeon Quest", {
+        &mOptions[RSK_MQ_DEKU_TREE],
+        &mOptions[RSK_MQ_DODONGOS_CAVERN],
+        &mOptions[RSK_MQ_JABU_JABU],
+        &mOptions[RSK_MQ_FOREST_TEMPLE],
+        &mOptions[RSK_MQ_FIRE_TEMPLE],
+        &mOptions[RSK_MQ_WATER_TEMPLE],
+        &mOptions[RSK_MQ_SPIRIT_TEMPLE],
+        &mOptions[RSK_MQ_SHADOW_TEMPLE],
+        &mOptions[RSK_MQ_BOTTOM_OF_THE_WELL],
+        &mOptions[RSK_MQ_ICE_CAVERN],
+        &mOptions[RSK_MQ_GTG],
+        &mOptions[RSK_MQ_GANONS_CASTLE]
+    });
+    mOptionGroups[RSG_SHUFFLE] = OptionGroup("Shuffle Settings", {
+        &mOptions[RSK_SHUFFLE_DUNGEON_REWARDS],
+        &mOptions[RSK_LINKS_POCKET],
+        &mOptions[RSK_SHUFFLE_SONGS],
+        &mOptions[RSK_SHOPSANITY],
+        &mOptions[RSK_SHOPSANITY_PRICES],
+        &mOptions[RSK_SHOPSANITY_PRICES_AFFORDABLE],
+        &mOptions[RSK_SHUFFLE_TOKENS],
+        &mOptions[RSK_SHUFFLE_SCRUBS],
+        &mOptions[RSK_SHUFFLE_COWS],
+        &mOptions[RSK_SHUFFLE_KOKIRI_SWORD],
+        &mOptions[RSK_SHUFFLE_OCARINA],
+        &mOptions[RSK_SHUFFLE_WEIRD_EGG],
+        &mOptions[RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD],
+        &mOptions[RSK_SHUFFLE_MAGIC_BEANS],
+        &mOptions[RSK_SHUFFLE_MERCHANTS],
+        &mOptions[RSK_SHUFFLE_FROG_SONG_RUPEES],
+        &mOptions[RSK_SHUFFLE_ADULT_TRADE],
+        &mOptions[RSK_SHUFFLE_CHEST_MINIGAME],
+        &mOptions[RSK_SHUFFLE_100_GS_REWARD],
+    });
+    mOptionGroups[RSG_SHUFFLE_DUNGEON_ITEMS] = OptionGroup("Shuffle Dungeon Items", {
+        &mOptions[RSK_SHUFFLE_MAPANDCOMPASS],
+        &mOptions[RSK_KEYSANITY],
+        &mOptions[RSK_GERUDO_KEYS],
+        &mOptions[RSK_BOSS_KEYSANITY],
+        &mOptions[RSK_GANONS_BOSS_KEY],
+        &mOptions[RSK_LACS_STONE_COUNT],
+        &mOptions[RSK_LACS_MEDALLION_COUNT],
+        &mOptions[RSK_LACS_DUNGEON_COUNT],
+        &mOptions[RSK_LACS_REWARD_COUNT],
+        &mOptions[RSK_LACS_TOKEN_COUNT],
+        &mOptions[RSK_LACS_OPTIONS],
+        &mOptions[RSK_KEYRINGS],
+        &mOptions[RSK_KEYRINGS_RANDOM_COUNT],
+        &mOptions[RSK_KEYRINGS_GERUDO_FORTRESS],
+        &mOptions[RSK_KEYRINGS_FOREST_TEMPLE],
+        &mOptions[RSK_KEYRINGS_FIRE_TEMPLE],
+        &mOptions[RSK_KEYRINGS_WATER_TEMPLE],
+        &mOptions[RSK_KEYRINGS_SPIRIT_TEMPLE],
+        &mOptions[RSK_KEYRINGS_SHADOW_TEMPLE],
+        &mOptions[RSK_KEYRINGS_BOTTOM_OF_THE_WELL],
+        &mOptions[RSK_KEYRINGS_GTG],
+        &mOptions[RSK_KEYRINGS_GANONS_CASTLE],
+    });
+    mOptionGroups[RSG_STARTING_ITEMS] = OptionGroup::SubGroup("Items", {
+        &mOptions[RSK_STARTING_OCARINA],
+        &mOptions[RSK_STARTING_KOKIRI_SWORD],
+        &mOptions[RSK_STARTING_DEKU_SHIELD]
+    }, false);
+    mOptionGroups[RSG_STARTING_SONGS] = OptionGroup::SubGroup("Ocarina Songs", {
+        &mOptions[RSK_STARTING_ZELDAS_LULLABY],
+        &mOptions[RSK_STARTING_EPONAS_SONG],
+        &mOptions[RSK_STARTING_SARIAS_SONG],
+        &mOptions[RSK_STARTING_SUNS_SONG],
+        &mOptions[RSK_STARTING_SONG_OF_TIME],
+        &mOptions[RSK_STARTING_SONG_OF_STORMS],
+        &mOptions[RSK_STARTING_SONG_OF_TIME],
+        &mOptions[RSK_STARTING_MINUET_OF_FOREST],
+        &mOptions[RSK_STARTING_BOLERO_OF_FIRE],
+        &mOptions[RSK_STARTING_SERENADE_OF_WATER],
+        &mOptions[RSK_STARTING_REQUIEM_OF_SPIRIT],
+        &mOptions[RSK_STARTING_NOCTURNE_OF_SHADOW],
+        &mOptions[RSK_STARTING_PRELUDE_OF_LIGHT],
+    }, false);
+    mOptionGroups[RSG_STARTING_OTHER] = OptionGroup::SubGroup("Other", {
+        &mOptions[RSK_STARTING_CONSUMABLES],
+        &mOptions[RSK_FULL_WALLETS],
+        &mOptions[RSK_STARTING_SKULLTULA_TOKEN],
+    }, false);
+    mOptionGroups[RSG_STARTING_INVENTORY] = OptionGroup("Starting Inventory", {
+        &mOptionGroups[RSG_STARTING_ITEMS],
+        &mOptionGroups[RSG_STARTING_SONGS],
+        &mOptionGroups[RSG_STARTING_OTHER],
+    }, OptionGroupType::DEFAULT, false);
+    mOptionGroups[RSG_TIMESAVERS] = OptionGroup("Timesaver Settings", {
+        &mOptions[RSK_SKIP_CHILD_STEALTH],
+        &mOptions[RSK_SKIP_CHILD_ZELDA],
+        &mOptions[RSK_SKIP_EPONA_RACE],
+        &mOptions[RSK_SKIP_SCARECROWS_SONG],
+        &mOptions[RSK_BIG_POE_COUNT],
+        &mOptions[RSK_CUCCO_COUNT],
+        &mOptions[RSK_COMPLETE_MASK_QUEST],
+        &mOptions[RSK_ENABLE_GLITCH_CUTSCENES],
+    });
+    mOptionGroups[RSG_MISC] = OptionGroup("Miscellaneous Settings", {
+        &mOptions[RSK_GOSSIP_STONE_HINTS],
+        &mOptions[RSK_HINT_CLARITY],
+        &mOptions[RSK_HINT_DISTRIBUTION],
+        &mOptions[RSK_TOT_ALTAR_HINT],
+        &mOptions[RSK_LIGHT_ARROWS_HINT],
+        &mOptions[RSK_DAMPES_DIARY_HINT],
+        &mOptions[RSK_GREG_HINT],
+        &mOptions[RSK_SARIA_HINT],
+        &mOptions[RSK_FROGS_HINT],
+        &mOptions[RSK_WARP_SONG_HINTS],
+        &mOptions[RSK_KAK_10_SKULLS_HINT],
+        &mOptions[RSK_KAK_20_SKULLS_HINT],
+        &mOptions[RSK_KAK_30_SKULLS_HINT],
+        &mOptions[RSK_KAK_40_SKULLS_HINT],
+        &mOptions[RSK_KAK_50_SKULLS_HINT],
+        &mOptions[RSK_SCRUB_TEXT_HINT],
+        // TODO: Compasses show Reward/WOTH, Maps show Dungeon Mode, Starting Time
+        &mOptions[RSK_DAMAGE_MULTIPLIER],
+        &mOptions[RSK_BLUE_FIRE_ARROWS],
+        &mOptions[RSK_SUNLIGHT_ARROWS],
+    });
+    // TODO: For some reason this group and only this group is an ambiguous constructor call, despite
+    // the initializer list only having Option* in it. For now explictly declare and initialize
+    // a vector of Option* and construct the group with that.
+    std::vector<Option*> itemPoolOptions = {&mOptions[RSK_ITEM_POOL], &mOptions[RSK_ICE_TRAPS]};
+    mOptionGroups[RSG_ITEM_POOL] = OptionGroup("Item Pool Settings", itemPoolOptions);
+    // TODO: Progressive Goron Sword, Remove Double Defense
+    mOptionGroups[RSG_EXCLUDES_KOKIRI_FOREST] = OptionGroup::SubGroup("Kokiri Forest", mExcludeLocationsOptionsGroups[GROUP_KOKIRI_FOREST], false);
+    mOptionGroups[RSG_EXCLUDES_LOST_WOODS] = OptionGroup::SubGroup("Lost Woods", mExcludeLocationsOptionsGroups[GROUP_LOST_WOODS], false);
+    mOptionGroups[RSG_EXCLUDES_DEKU_TREE] = OptionGroup::SubGroup("Deku Tree", mExcludeLocationsOptionsGroups[GROUP_DUNGEON_DEKU_TREE], false);
+    mOptionGroups[RSG_EXCLUDES_FOREST_TEMPLE] = OptionGroup::SubGroup("Forest Temple", mExcludeLocationsOptionsGroups[GROUP_DUNGEON_FOREST_TEMPLE], false);
+    mOptionGroups[RSG_EXCLUDES_KAKARIKO_VILLAGE] = OptionGroup::SubGroup("Kakariko Village", mExcludeLocationsOptionsGroups[GROUP_KAKARIKO], false);
+    mOptionGroups[RSG_EXCLUDES_BOTTOM_OF_THE_WELL] = OptionGroup::SubGroup("Bottom of the Well", mExcludeLocationsOptionsGroups[GROUP_DUNGEON_BOTTOM_OF_THE_WELL], false);
+    mOptionGroups[RSG_EXCLUDES_SHADOW_TEMPLE] = OptionGroup::SubGroup("Shadow Temple", mExcludeLocationsOptionsGroups[GROUP_DUNGEON_SHADOW_TEMPLE], false);
+    mOptionGroups[RSG_EXCLUDES_DEATH_MOUNTAIN] = OptionGroup::SubGroup("Death Mountain", mExcludeLocationsOptionsGroups[GROUP_DEATH_MOUNTAIN], false);
+    mOptionGroups[RSG_EXCLUDES_GORON_CITY] = OptionGroup::SubGroup("Goron City", mExcludeLocationsOptionsGroups[GROUP_GORON_CITY], false);
+    mOptionGroups[RSG_EXCLUDES_DODONGOS_CAVERN] = OptionGroup::SubGroup("Dodongo's Cavern", mExcludeLocationsOptionsGroups[GROUP_DUNGEON_DODONGOS_CAVERN], false);
+    mOptionGroups[RSG_EXCLUDES_FIRE_TEMPLE] = OptionGroup::SubGroup("Fire Temple", mExcludeLocationsOptionsGroups[GROUP_DUNGEON_FIRE_TEMPLE], false);
+    mOptionGroups[RSG_EXCLUDES_ZORAS_RIVER] = OptionGroup::SubGroup("Zora's River", mExcludeLocationsOptionsGroups[GROUP_ZORAS_RIVER], false);
+    mOptionGroups[RSG_EXCLUDES_ZORAS_DOMAIN] = OptionGroup::SubGroup("Zora's Domain", mExcludeLocationsOptionsGroups[GROUP_ZORAS_DOMAIN], false);
+    mOptionGroups[RSG_EXCLUDES_JABU_JABU] = OptionGroup::SubGroup("Jabu Jabu's Belly", mExcludeLocationsOptionsGroups[GROUP_DUNGEON_JABUJABUS_BELLY], false);
+    mOptionGroups[RSG_EXCLUDES_ICE_CAVERN] = OptionGroup::SubGroup("Ice Cavern", mExcludeLocationsOptionsGroups[GROUP_DUNGEON_ICE_CAVERN], false);
+    mOptionGroups[RSG_EXCLUDES_HYRULE_FIELD] = OptionGroup::SubGroup("Hyrule Field", mExcludeLocationsOptionsGroups[GROUP_HYRULE_FIELD], false);
+    mOptionGroups[RSG_EXCLUDES_LON_LON_RANCH] = OptionGroup::SubGroup("Lon Lon Ranch", mExcludeLocationsOptionsGroups[GROUP_LON_LON_RANCH], false);
+    mOptionGroups[RSG_EXCLUDES_LAKE_HYLIA] = OptionGroup::SubGroup("Lake Hylia", mExcludeLocationsOptionsGroups[GROUP_LAKE_HYLIA], false);
+    mOptionGroups[RSG_EXCLUDES_WATER_TEMPLE] = OptionGroup::SubGroup("Water Temple", mExcludeLocationsOptionsGroups[GROUP_DUNGEON_WATER_TEMPLE], false);
+    mOptionGroups[RSG_EXCLUDES_GERUDO_VALLEY] = OptionGroup::SubGroup("Gerudo Valley", mExcludeLocationsOptionsGroups[GROUP_GERUDO_VALLEY], false);
+    mOptionGroups[RSG_EXCLUDES_GERUDO_TRAINING_GROUNDS] = OptionGroup::SubGroup("Gerudo Training Grounds", mExcludeLocationsOptionsGroups[GROUP_GERUDO_TRAINING_GROUND], false);
+    mOptionGroups[RSG_EXCLUDES_SPIRIT_TEMPLE] = OptionGroup::SubGroup("Spirit Temple", mExcludeLocationsOptionsGroups[GROUP_DUNGEON_SPIRIT_TEMPLE], false);
+    mOptionGroups[RSG_EXCLUDES_HYRULE_CASTLE] = OptionGroup::SubGroup("Hyrule Castle", mExcludeLocationsOptionsGroups[GROUP_HYRULE_CASTLE], false);
+    mOptionGroups[RSG_EXCLUDES_GANONS_CASTLE] = OptionGroup::SubGroup("Ganon's Castle", mExcludeLocationsOptionsGroups[GROUP_DUNGEON_GANONS_CASTLE], false);
+    mOptionGroups[RSG_EXCLUDES] = OptionGroup::SubGroup("Exclude Locations", {
+        &mOptionGroups[RSG_EXCLUDES_KOKIRI_FOREST],
+        &mOptionGroups[RSG_EXCLUDES_LOST_WOODS],
+        &mOptionGroups[RSG_EXCLUDES_DEKU_TREE],
+        &mOptionGroups[RSG_EXCLUDES_FOREST_TEMPLE],
+        &mOptionGroups[RSG_EXCLUDES_KAKARIKO_VILLAGE],
+        &mOptionGroups[RSG_EXCLUDES_BOTTOM_OF_THE_WELL],
+        &mOptionGroups[RSG_EXCLUDES_SHADOW_TEMPLE],
+        &mOptionGroups[RSG_EXCLUDES_DEATH_MOUNTAIN],
+        &mOptionGroups[RSG_EXCLUDES_GORON_CITY],
+        &mOptionGroups[RSG_EXCLUDES_DODONGOS_CAVERN],
+        &mOptionGroups[RSG_EXCLUDES_FIRE_TEMPLE],
+        &mOptionGroups[RSG_EXCLUDES_ZORAS_RIVER],
+        &mOptionGroups[RSG_EXCLUDES_ZORAS_DOMAIN],
+        &mOptionGroups[RSG_EXCLUDES_JABU_JABU],
+        &mOptionGroups[RSG_EXCLUDES_ICE_CAVERN],
+        &mOptionGroups[RSG_EXCLUDES_HYRULE_FIELD],
+        &mOptionGroups[RSG_EXCLUDES_LON_LON_RANCH],
+        &mOptionGroups[RSG_EXCLUDES_LAKE_HYLIA],
+        &mOptionGroups[RSG_EXCLUDES_WATER_TEMPLE],
+        &mOptionGroups[RSG_EXCLUDES_GERUDO_VALLEY],
+        &mOptionGroups[RSG_EXCLUDES_GERUDO_TRAINING_GROUNDS],
+        &mOptionGroups[RSG_EXCLUDES_SPIRIT_TEMPLE],
+        &mOptionGroups[RSG_EXCLUDES_HYRULE_CASTLE],
+        &mOptionGroups[RSG_EXCLUDES_GANONS_CASTLE],
+    }, false);
+    mOptionGroups[RSG_DETAILED_LOGIC] = OptionGroup("Detailed Logic Settings", {
+        &mOptionGroups[RSG_LOGIC],
+        &mOptionGroups[RSG_TRICKS],
+        &mOptionGroups[RSG_EXCLUDES]
+    });
+
+    VanillaLogicDefaults = {
+        &mOptions[RSK_LINKS_POCKET],
+        &mOptions[RSK_SHUFFLE_DUNGEON_REWARDS],
+        &mOptions[RSK_SHUFFLE_SONGS],
+        &mOptions[RSK_SHOPSANITY],
+        &mOptions[RSK_SHOPSANITY_PRICES],
+        &mOptions[RSK_SHOPSANITY_PRICES_AFFORDABLE],
+        &mOptions[RSK_SHUFFLE_SCRUBS],
+        &mOptions[RSK_SHUFFLE_COWS],
+        &mOptions[RSK_SHUFFLE_MAGIC_BEANS],
+        &mOptions[RSK_SHUFFLE_MERCHANTS],
+        &mOptions[RSK_SHUFFLE_FROG_SONG_RUPEES],
+        &mOptions[RSK_SHUFFLE_ADULT_TRADE],
+        &mOptions[RSK_SHUFFLE_100_GS_REWARD],
+        &mOptions[RSK_GOSSIP_STONE_HINTS],
+    };
+
+    mSpoilerfileSettingNameToEnum = {
+        { "Logic Options:Logic", RSK_LOGIC_RULES },
+        { "Logic Options:Night Skulltula's Expect Sun's Song", RSK_SKULLS_SUNS_SONG },
+        { "Logic Options:All Locations Reachable", RSK_ALL_LOCATIONS_REACHABLE },
+        { "Item Pool Settings:Item Pool", RSK_ITEM_POOL },
+        { "Item Pool Settings:Ice Traps", RSK_ICE_TRAPS },
+        { "Open Settings:Forest", RSK_FOREST },
+        { "Open Settings:Kakariko Gate", RSK_KAK_GATE },
+        { "Open Settings:Door of Time", RSK_DOOR_OF_TIME },
+        { "Open Settings:Zora's Fountain", RSK_ZORAS_FOUNTAIN },
+        { "Open Settings:Gerudo Fortress", RSK_GERUDO_FORTRESS },
+        { "Open Settings:Rainbow Bridge", RSK_RAINBOW_BRIDGE },
+        { "Open Settings:Ganon's Trials", RSK_GANONS_TRIALS },
+        { "Open Settings:Ganon's Trials Count", RSK_TRIAL_COUNT },
+        { "Open Settings:Stone Count", RSK_RAINBOW_BRIDGE_STONE_COUNT },
+        { "Open Settings:Medallion Count", RSK_RAINBOW_BRIDGE_MEDALLION_COUNT },
+        { "Open Settings:Reward Count", RSK_RAINBOW_BRIDGE_REWARD_COUNT },
+        { "Open Settings:Dungeon Count", RSK_RAINBOW_BRIDGE_DUNGEON_COUNT },
+        { "Open Settings:Token Count", RSK_RAINBOW_BRIDGE_TOKEN_COUNT },
+        { "Open Settings:Bridge Reward Options", RSK_BRIDGE_OPTIONS },
+        { "Shuffle Settings:Shuffle Dungeon Rewards", RSK_SHUFFLE_DUNGEON_REWARDS },
+        { "Shuffle Settings:Link's Pocket", RSK_LINKS_POCKET },
+        { "Shuffle Settings:Shuffle Songs", RSK_SHUFFLE_SONGS },
+        { "Shuffle Settings:Shuffle Gerudo Membership Card", RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD },
+        { "Shuffle Settings:Shopsanity", RSK_SHOPSANITY },
+        { "Shuffle Settings:Shopsanity Prices", RSK_SHOPSANITY_PRICES },
+        { "Shuffle Settings:Affordable Prices", RSK_SHOPSANITY_PRICES_AFFORDABLE },
+        { "Shuffle Settings:Scrub Shuffle", RSK_SHUFFLE_SCRUBS },
+        { "Shuffle Settings:Shuffle Cows", RSK_SHUFFLE_COWS },
+        { "Shuffle Settings:Tokensanity", RSK_SHUFFLE_TOKENS },
+        { "Shuffle Settings:Shuffle Ocarinas", RSK_SHUFFLE_OCARINA },
+        { "Shuffle Settings:Shuffle Adult Trade", RSK_SHUFFLE_ADULT_TRADE },
+        { "Shuffle Settings:Shuffle Magic Beans", RSK_SHUFFLE_MAGIC_BEANS },
+        { "Shuffle Settings:Shuffle Kokiri Sword", RSK_SHUFFLE_KOKIRI_SWORD },
+        { "Shuffle Settings:Shuffle Master Sword", RSK_SHUFFLE_MASTER_SWORD },
+        { "Shuffle Settings:Shuffle Weird Egg", RSK_SHUFFLE_WEIRD_EGG },
+        { "Shuffle Settings:Shuffle Frog Song Rupees", RSK_SHUFFLE_FROG_SONG_RUPEES },
+        { "Shuffle Settings:Shuffle Merchants", RSK_SHUFFLE_MERCHANTS },
+        { "Shuffle Settings:Shuffle 100 GS Reward", RSK_SHUFFLE_100_GS_REWARD },
+        { "Start with Deku Shield", RSK_STARTING_DEKU_SHIELD },
+        { "Start with Kokiri Sword", RSK_STARTING_KOKIRI_SWORD },
+        { "Start with Fairy Ocarina", RSK_STARTING_OCARINA },
+        { "Start with Zelda's Lullaby", RSK_STARTING_ZELDAS_LULLABY },
+        { "Start with Epona's Song", RSK_STARTING_EPONAS_SONG },
+        { "Start with Saria's Song", RSK_STARTING_SARIAS_SONG },
+        { "Start with Sun's Song", RSK_STARTING_SUNS_SONG },
+        { "Start with Song of Time", RSK_STARTING_SONG_OF_TIME },
+        { "Start with Song of Storms", RSK_STARTING_SONG_OF_STORMS },
+        { "Start with Minuet of Forest", RSK_STARTING_MINUET_OF_FOREST },
+        { "Start with Bolero of Fire", RSK_STARTING_BOLERO_OF_FIRE },
+        { "Start with Serenade of Water", RSK_STARTING_SERENADE_OF_WATER },
+        { "Start with Requiem of Spirit", RSK_STARTING_REQUIEM_OF_SPIRIT },
+        { "Start with Nocturne of Shadow", RSK_STARTING_NOCTURNE_OF_SHADOW },
+        { "Start with Prelude of Light", RSK_STARTING_PRELUDE_OF_LIGHT },
+        { "Shuffle Dungeon Items:Maps/Compasses", RSK_SHUFFLE_MAPANDCOMPASS },
+        { "Shuffle Dungeon Items:Small Keys", RSK_KEYSANITY },
+        { "Shuffle Dungeon Items:Gerudo Fortress Keys", RSK_GERUDO_KEYS },
+        { "Shuffle Dungeon Items:Boss Keys", RSK_BOSS_KEYSANITY },
+        { "Shuffle Dungeon Items:Ganon's Boss Key", RSK_GANONS_BOSS_KEY },
+        { "Shuffle Dungeon Items:Stone Count", RSK_LACS_STONE_COUNT },
+        { "Shuffle Dungeon Items:Medallion Count", RSK_LACS_MEDALLION_COUNT },
+        { "Shuffle Dungeon Items:Reward Count", RSK_LACS_REWARD_COUNT },
+        { "Shuffle Dungeon Items:Dungeon Count", RSK_LACS_DUNGEON_COUNT },
+        { "Shuffle Dungeon Items:Token Count", RSK_LACS_TOKEN_COUNT },
+        { "Shuffle Dungeon Items:LACS Reward Options", RSK_LACS_OPTIONS },
+        { "Shuffle Dungeon Items:Key Rings", RSK_KEYRINGS },
+        { "Shuffle Dungeon Items:Keyring Dungeon Count", RSK_KEYRINGS_RANDOM_COUNT },
+        { "Shuffle Dungeon Items:Gerudo Fortress", RSK_KEYRINGS_GERUDO_FORTRESS },
+        { "Shuffle Dungeon Items:Forest Temple", RSK_KEYRINGS_FOREST_TEMPLE },
+        { "Shuffle Dungeon Items:Fire Temple", RSK_KEYRINGS_FIRE_TEMPLE },
+        { "Shuffle Dungeon Items:Water Temple", RSK_KEYRINGS_WATER_TEMPLE },
+        { "Shuffle Dungeon Items:Spirit Temple", RSK_KEYRINGS_SPIRIT_TEMPLE },
+        { "Shuffle Dungeon Items:Shadow Temple", RSK_KEYRINGS_SHADOW_TEMPLE },
+        { "Shuffle Dungeon Items:Bottom of the Well", RSK_KEYRINGS_BOTTOM_OF_THE_WELL },
+        { "Shuffle Dungeon Items:GTG", RSK_KEYRINGS_GTG },
+        { "Shuffle Dungeon Items:Ganon's Castle", RSK_KEYRINGS_GANONS_CASTLE },
+        { "World Settings:Starting Age", RSK_STARTING_AGE },
+        // TODO: Ammo Drop settings
+        { "World Settings:Bombchu Drops", RSK_ENABLE_BOMBCHU_DROPS },
+        { "World Settings:Bombchus in Logic", RSK_BOMBCHUS_IN_LOGIC },
+        { "World Settings:Shuffle Entrances", RSK_SHUFFLE_ENTRANCES },
+        { "World Settings:Dungeon Entrances", RSK_SHUFFLE_DUNGEON_ENTRANCES },
+        { "World Settings:Boss Entrances", RSK_SHUFFLE_BOSS_ENTRANCES },
+        { "World Settings:Overworld Entrances", RSK_SHUFFLE_OVERWORLD_ENTRANCES },
+        { "World Settings:Interior Entrances", RSK_SHUFFLE_INTERIOR_ENTRANCES },
+        { "World Settings:Grottos Entrances", RSK_SHUFFLE_GROTTO_ENTRANCES },
+        { "World Settings:Owl Drops", RSK_SHUFFLE_OWL_DROPS },
+        { "World Settings:Warp Songs", RSK_SHUFFLE_WARP_SONGS },
+        { "World Settings:Overworld Spawns", RSK_SHUFFLE_OVERWORLD_SPAWNS },
+        { "World Settings:Mixed Entrance Pools", RSK_MIXED_ENTRANCE_POOLS },
+        { "World Settings:Mix Dungeons", RSK_MIX_DUNGEON_ENTRANCES },
+        { "World Settings:Mix Overworld", RSK_MIX_OVERWORLD_ENTRANCES },
+        { "World Settings:Mix Interiors", RSK_MIX_INTERIOR_ENTRANCES },
+        { "World Settings:Mix Grottos", RSK_MIX_GROTTO_ENTRANCES },
+        { "World Settings:Decouple Entrances", RSK_DECOUPLED_ENTRANCES },
+        { "World Settings:Triforce Hunt", RSK_TRIFORCE_HUNT },
+        { "World Settings:Triforce Hunt Total Pieces", RSK_TRIFORCE_HUNT_PIECES_TOTAL },
+        { "World Settings:Triforce Hunt Required Pieces", RSK_TRIFORCE_HUNT_PIECES_REQUIRED },
+        { "Miscellaneous Settings:Gossip Stone Hints", RSK_GOSSIP_STONE_HINTS },
+        { "Miscellaneous Settings:Hint Clarity", RSK_HINT_CLARITY },
+        { "Miscellaneous Settings:ToT Altar Hint", RSK_TOT_ALTAR_HINT },
+        { "Miscellaneous Settings:Light Arrow Hint", RSK_LIGHT_ARROWS_HINT },
+        { "Miscellaneous Settings:Dampe's Diary Hint", RSK_DAMPES_DIARY_HINT },
+        { "Miscellaneous Settings:Greg the Rupee Hint", RSK_GREG_HINT },
+        { "Miscellaneous Settings:Saria's Hint", RSK_SARIA_HINT },
+        { "Miscellaneous Settings:Frog Ocarina Game Hint", RSK_FROGS_HINT },
+        { "Miscellaneous Settings:10 GS Hint", RSK_KAK_10_SKULLS_HINT },
+        { "Miscellaneous Settings:20 GS Hint", RSK_KAK_20_SKULLS_HINT },
+        { "Miscellaneous Settings:30 GS Hint", RSK_KAK_30_SKULLS_HINT },
+        { "Miscellaneous Settings:40 GS Hint", RSK_KAK_40_SKULLS_HINT },
+        { "Miscellaneous Settings:50 GS Hint", RSK_KAK_50_SKULLS_HINT },
+        { "Miscellaneous Settings:Warp Song Hints", RSK_WARP_SONG_HINTS },
+        { "Miscellaneous Settings:Scrub Hint Text", RSK_SCRUB_TEXT_HINT },
+        { "Miscellaneous Settings:Hint Distribution", RSK_HINT_DISTRIBUTION },
+        { "Miscellaneous Settings:Blue Fire Arrows", RSK_BLUE_FIRE_ARROWS },
+        { "Miscellaneous Settings:Sunlight Arrows", RSK_SUNLIGHT_ARROWS },
+        { "Timesaver Settings:Skip Child Zelda", RSK_SKIP_CHILD_ZELDA },
+        { "Start with Consumables", RSK_STARTING_CONSUMABLES },
+        { "Full Wallets", RSK_FULL_WALLETS },
+        { "Gold Skulltula Tokens", RSK_STARTING_SKULLTULA_TOKEN },
+        { "Timesaver Settings:Cuccos to return", RSK_CUCCO_COUNT },
+        { "Timesaver Settings:Big Poe Target Count", RSK_BIG_POE_COUNT },
+        { "Timesaver Settings:Skip Child Stealth", RSK_SKIP_CHILD_STEALTH },
+        { "Timesaver Settings:Skip Epona Race", RSK_SKIP_EPONA_RACE },
+        { "Timesaver Settings:Skip Tower Escape", RSK_SKIP_TOWER_ESCAPE },
+        { "Timesaver Settings:Complete Mask Quest", RSK_COMPLETE_MASK_QUEST },
+        { "Timesaver Settings:Skip Scarecrow's Song", RSK_SKIP_SCARECROWS_SONG },
+        { "Timesaver Settings:Enable Glitch-Useful Cutscenes", RSK_ENABLE_GLITCH_CUTSCENES },
+        { "World Settings:MQ Dungeon Setting", RSK_MQ_DUNGEON_RANDOM },
+        { "World Settings:MQ Dungeon Count", RSK_MQ_DUNGEON_COUNT },
+        { "World Settings:Set Dungeon Quests", RSK_MQ_DUNGEON_SET },
+        { "Shuffle Dungeon Quest:Forest Temple", RSK_MQ_FOREST_TEMPLE },
+        { "Shuffle Dungeon Quest:Fire Temple", RSK_MQ_FIRE_TEMPLE },
+        { "Shuffle Dungeon Quest:Water Temple", RSK_MQ_WATER_TEMPLE },
+        { "Shuffle Dungeon Quest:Spirit Temple", RSK_MQ_SPIRIT_TEMPLE },
+        { "Shuffle Dungeon Quest:Shadow Temple", RSK_MQ_SHADOW_TEMPLE },
+        { "Shuffle Dungeon Quest:Bottom of the Well", RSK_MQ_BOTTOM_OF_THE_WELL },
+        { "Shuffle Dungeon Quest:Ice Cavern", RSK_MQ_ICE_CAVERN },
+        { "Shuffle Dungeon Quest:GTG", RSK_MQ_GTG },
+        { "Shuffle Dungeon Quest:Ganon's Castle", RSK_MQ_GANONS_CASTLE },
+    };
+}
+
+Option& Settings::Setting(RandomizerSettingKey key) {
+    return mOptions[key];
+}
+
+Option& Settings::GetTrickOption(RandomizerTrick key) {
+    return mTrickOptions[key];
+}
+
+const std::array<Option, RSK_MAX>& Settings::GetAllOptions() const {
+    return mOptions;
+}
+
+std::vector<Option *>& Settings::GetExcludeOptionsForGroup(SpoilerCollectionCheckGroup group) {
+    return mExcludeLocationsOptionsGroups[group];
+}
+
+const std::vector<std::vector<Option *>>& Settings::GetExcludeLocationsOptions() const {
+    return mExcludeLocationsOptionsGroups;
+}
+
+RandoOptionStartingAge Settings::ResolvedStartingAge() const {
+    return mResolvedStartingAge;
+}
+
+RandoOptionLACSCondition Settings::LACSCondition() const {
+    return mLACSCondition;
+}
+
+std::string Settings::GetHash() const {
+    return mHash;
+}
+
+void Settings::SetHash(std::string hash) {
+    mHash = hash;
+}
+
+const std::string& Settings::GetSeedString() const {
+    return mSeedString;
+}
+
+void Settings::SetSeedString(std::string seedString) {
+    mSeedString = seedString;
+}
+
+const uint32_t Settings::GetSeed() const {
+    return mFinalSeed;
+}
+
+void Settings::SetSeed(uint32_t seed) {
+    mFinalSeed = seed;
+}
+
+const std::array<OptionGroup, RSG_MAX>& Settings::GetOptionGroups() {
+    return mOptionGroups;
+}
+
+const OptionGroup& Settings::GetOptionGroup(RandomizerSettingGroupKey key) {
+    return mOptionGroups[key];
+}
+
+void Settings::UpdateSettings(std::unordered_map<RandomizerSettingKey, uint8_t> cvarSettings, std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks) {
+    auto ctx = Rando::Context::GetInstance();
+    if (!ctx->IsSpoilerLoaded()) {
+        // If we've loaded a spoiler file, the settings have already been populated, so we
+        // only need to do things like resolve the starting age or determine MQ dungeons.
+        // Any logic dependent on cvarSettings should go in this if statement
+        for (auto [key, value] : cvarSettings) {
+            mOptions[key].SetSelectedIndex(value);
+        }
+        switch (cvarSettings[RSK_LOGIC_RULES]) {
+            case RO_LOGIC_GLITCHLESS:
+                mOptions[RSK_LOGIC_RULES].SetSelectedIndex(RO_LOGIC_GLITCHLESS);
+                break;
+            case RO_LOGIC_NO_LOGIC:
+                mOptions[RSK_LOGIC_RULES].SetSelectedIndex(RO_LOGIC_NO_LOGIC);
+                break;
+        }
+        
+        // if we skip child zelda, we start with zelda's letter, and malon starts
+        // at the ranch, so we should *not* shuffle the weird egg
+        if (cvarSettings[RSK_SKIP_CHILD_ZELDA]) {
+            mOptions[RSK_SKIP_CHILD_ZELDA].SetSelectedIndex(true);
+            mOptions[RSK_SHUFFLE_WEIRD_EGG].SetSelectedIndex(0);
+        } else {
+            mOptions[RSK_SKIP_CHILD_ZELDA].SetSelectedIndex(false);
+            mOptions[RSK_SHUFFLE_WEIRD_EGG].SetSelectedIndex(cvarSettings[RSK_SHUFFLE_WEIRD_EGG]);
+        }
+        // Force 100 GS Shuffle if that's where Ganon's Boss Key is
+        if (cvarSettings[RSK_GANONS_BOSS_KEY] == RO_GANON_BOSS_KEY_KAK_TOKENS) {
+            mOptions[RSK_SHUFFLE_100_GS_REWARD].SetSelectedIndex(1);
+        } else {
+            mOptions[RSK_SHUFFLE_100_GS_REWARD].SetSelectedIndex(cvarSettings[RSK_SHUFFLE_100_GS_REWARD]);
+        }
+
+        if (cvarSettings[RSK_TRIFORCE_HUNT]) {
+            mOptions[RSK_GANONS_BOSS_KEY].SetSelectedIndex(RO_GANON_BOSS_KEY_TRIFORCE_HUNT);
+        } else {
+            mOptions[RSK_GANONS_BOSS_KEY].SetSelectedIndex(cvarSettings[RSK_GANONS_BOSS_KEY]);
+        }
+        // ImGui has a slider which returns the actual number, which is off by one since
+        // the ImGui slider can't go down to 0 (the first index aka 1 big poe).
+        mOptions[RSK_BIG_POE_COUNT].SetSelectedIndex(cvarSettings[RSK_BIG_POE_COUNT] - 1);
+        ctx->AddExcludedOptions();
+        for (auto locationKey : ctx->everyPossibleLocation) {
+            auto location = ctx->GetItemLocation(locationKey);
+            if (excludedLocations.count(location->GetRandomizerCheck())) {
+                location->GetExcludedOption()->SetSelectedIndex(1);
+            } else {
+                location->GetExcludedOption()->SetSelectedIndex(0);
+            }
+        }
+        // Tricks
+        for (auto randomizerTrick : enabledTricks) {
+            mTrickOptions[randomizerTrick].SetSelectedIndex(1);
+        }
+    }
+
+    // RANDOTODO implement chest shuffle with keysanity
+    // ShuffleChestMinigame.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_CHEST_MINIGAME]);
+    //TODO: RandomizeAllSettings(true) when implementing the ability to randomize the options themselves.
+    std::array<DungeonInfo*, 12> dungeons = ctx->GetDungeons()->GetDungeonList();
+    std::array<bool, 12> dungeonModesKnown;
+    std::vector<Option*> dungeonOptions = {
+        &mOptions[RSK_MQ_DEKU_TREE],
+        &mOptions[RSK_MQ_DODONGOS_CAVERN],
+        &mOptions[RSK_MQ_JABU_JABU],
+        &mOptions[RSK_MQ_FOREST_TEMPLE],
+        &mOptions[RSK_MQ_FIRE_TEMPLE],
+        &mOptions[RSK_MQ_WATER_TEMPLE],
+        &mOptions[RSK_MQ_SPIRIT_TEMPLE],
+        &mOptions[RSK_MQ_SHADOW_TEMPLE],
+        &mOptions[RSK_MQ_BOTTOM_OF_THE_WELL],
+        &mOptions[RSK_MQ_ICE_CAVERN],
+        &mOptions[RSK_MQ_GTG],
+        &mOptions[RSK_MQ_GANONS_CASTLE]
+    };
+    uint8_t mqSet = mOptions[RSK_MQ_DUNGEON_COUNT].Value<uint8_t>();
+    if (mOptions[RSK_MQ_DUNGEON_RANDOM].Is(RO_MQ_DUNGEONS_SELECTION)) {
+        mqSet = 0;
+    }
+    uint8_t dungeonCount = 0;
+    std::vector<uint8_t> randMQOption = {};
+    if (mOptions[RSK_MQ_DUNGEON_SET]) {
+        for (size_t i = 0; i < dungeons.size(); i++) {
+            dungeons[i]->ClearMQ();
+            dungeonModesKnown[i] = true;
+            switch (dungeonOptions[i]->Value<uint8_t>()) {
+                case 1:
+                    dungeons[i]->SetMQ();
+                    dungeonCount++;
+                    break;
+                case 2:
+                    randMQOption.push_back(i);
+                    dungeonModesKnown[i] = false;
+                    break;
+            }
+        }
+        Shuffle(randMQOption);
+        if (mOptions[RSK_MQ_DUNGEON_RANDOM].Is(RO_MQ_DUNGEONS_RANDOM_NUMBER)) {
+            mqSet = dungeonCount + Random(0, randMQOption.size() + 1);
+        }
+        for (uint8_t i = 0; dungeonCount < mqSet; i++) {
+            if (i > randMQOption.size()) {
+                // This can happen if the amount of MQ Dungeons is specifically
+                // set to a higher number than the amount of Dungeons specifically set to MQ or Random,
+                // break out of the loop and just have fewer MQ dungeons than the Set Count.
+                break;
+            }
+            dungeons[randMQOption[i]]->SetMQ();
+            dungeonCount++;
+        }
+    } else {
+        Shuffle(dungeons);
+        for (size_t i = 0; i < dungeons.size(); i++) {
+            dungeons[i]->ClearMQ();
+        }
+        bool allDungeonModesKnown = mqSet == 0 || mqSet == dungeons.size();
+        for (uint8_t i = 0; i < sizeof(dungeonModesKnown); ++i) {
+            dungeonModesKnown[i] = allDungeonModesKnown;
+        }
+        if (mOptions[RSK_MQ_DUNGEON_RANDOM].Is(RO_MQ_DUNGEONS_RANDOM_NUMBER)) {
+            mqSet = Random(0, 13);
+        }
+        for (uint8_t i = 0; i < mqSet; i++) {
+            dungeons[i]->SetMQ();
+        }
+    }
+
+    // Set key ring for each dungeon
+    for (size_t i = 0; i < dungeons.size(); i++) {
+        dungeons[i]->ClearKeyRing();
+    }
+
+    std::vector<Option*> keyRingOptions = {
+        &mOptions[RSK_KEYRINGS_FOREST_TEMPLE],
+        &mOptions[RSK_KEYRINGS_FIRE_TEMPLE],
+        &mOptions[RSK_KEYRINGS_WATER_TEMPLE],
+        &mOptions[RSK_KEYRINGS_SPIRIT_TEMPLE],
+        &mOptions[RSK_KEYRINGS_SHADOW_TEMPLE],
+        &mOptions[RSK_KEYRINGS_BOTTOM_OF_THE_WELL],
+        &mOptions[RSK_KEYRINGS_GTG],
+        &mOptions[RSK_KEYRINGS_GANONS_CASTLE],
+    };
+
+    if (mOptions[RSK_KEYRINGS]) {
+        // Random Key Rings
+        if (mOptions[RSK_KEYRINGS].Is(RO_KEYRINGS_RANDOM) || mOptions[RSK_KEYRINGS].Is(RO_KEYRINGS_COUNT)) {
+            auto keyrings = keyRingOptions;
+            if (mOptions[RSK_GERUDO_FORTRESS].Is(RO_GF_NORMAL) && mOptions[RSK_GERUDO_KEYS].IsNot(RO_GERUDO_KEYS_VANILLA)) {
+                keyrings.push_back(&mOptions[RSK_KEYRINGS_GERUDO_FORTRESS]);
+            }
+            int keyRingCount = mOptions[RSK_KEYRINGS].Is(RO_KEYRINGS_COUNT) ? mOptions[RSK_KEYRINGS_RANDOM_COUNT].Value<uint8_t>() : Random(0, keyrings.size());
+            Shuffle(keyrings);
+            for (size_t i = 0; i < keyRingCount; i++) {
+                keyrings[i]->SetSelectedIndex(RO_GENERIC_ON);
+            }
+        }
+        if (mOptions[RSK_KEYRINGS_BOTTOM_OF_THE_WELL]) {
+            ctx->GetDungeon(BOTTOM_OF_THE_WELL)->SetKeyRing();
+        }
+        if (mOptions[RSK_KEYRINGS_FOREST_TEMPLE]) {
+            ctx->GetDungeon(FOREST_TEMPLE)->SetKeyRing();
+        }
+        if (mOptions[RSK_KEYRINGS_FIRE_TEMPLE]) {
+            ctx->GetDungeon(FIRE_TEMPLE)->SetKeyRing();
+        }
+        if (mOptions[RSK_KEYRINGS_WATER_TEMPLE]) {
+            ctx->GetDungeon(WATER_TEMPLE)->SetKeyRing();
+        }
+        if (mOptions[RSK_KEYRINGS_SPIRIT_TEMPLE]) {
+            ctx->GetDungeon(SPIRIT_TEMPLE)->SetKeyRing();
+        }
+        if (mOptions[RSK_KEYRINGS_SHADOW_TEMPLE]) {
+            ctx->GetDungeon(SHADOW_TEMPLE)->SetKeyRing();
+        }
+        if (mOptions[RSK_KEYRINGS_GTG]) {
+            ctx->GetDungeon(GERUDO_TRAINING_GROUNDS)->SetKeyRing();
+        }
+        if (mOptions[RSK_KEYRINGS_GANONS_CASTLE]) {
+            ctx->GetDungeon(GANONS_CASTLE)->SetKeyRing();
+        }
+    }
+    auto trials = ctx->GetTrials()->GetTrialList();
+    Shuffle(trials);
+    for (auto& trial : trials) {
+        trial->SetAsSkipped();
+    }
+    if (mOptions[RSK_GANONS_TRIALS].Is(RO_GANONS_TRIALS_RANDOM_NUMBER)) {
+        mOptions[RSK_TRIAL_COUNT].SetSelectedIndex(Random(0, mOptions[RSK_TRIAL_COUNT].GetOptionCount()));
+    }
+    for (uint8_t i = 0; i < mOptions[RSK_TRIAL_COUNT].Value<uint8_t>(); i++) {
+        trials[i]->SetAsRequired();
+    }
+
+    if (mOptions[RSK_FOREST].Is(RO_FOREST_CLOSED) &&
+        (mOptions[RSK_SHUFFLE_INTERIOR_ENTRANCES].Is(RO_INTERIOR_ENTRANCE_SHUFFLE_ALL) ||
+         mOptions[RSK_SHUFFLE_OVERWORLD_ENTRANCES] || mOptions[RSK_SHUFFLE_OVERWORLD_SPAWNS] ||
+         mOptions[RSK_DECOUPLED_ENTRANCES] || mOptions[RSK_MIXED_ENTRANCE_POOLS])) {
+        mOptions[RSK_FOREST].SetSelectedIndex(RO_FOREST_CLOSED_DEKU);
+    }
+
+    if (mOptions[RSK_STARTING_AGE].Is(RO_AGE_RANDOM)) {
+        int choice = Random(0, 2);
+        if (choice == 0) {
+            mResolvedStartingAge = RO_AGE_CHILD;
+        } else {
+            mResolvedStartingAge = RO_AGE_ADULT;
+        }
+    } else {
+        mResolvedStartingAge = static_cast<RandoOptionStartingAge>(mOptions[RSK_STARTING_AGE].Value<uint8_t>());
+    }
+
+    // TODO: Random Starting Time
+
+    if (mOptions[RSK_GANONS_BOSS_KEY].Is(RO_GANON_BOSS_KEY_LACS_STONES)) {
+        mLACSCondition = RO_LACS_STONES;
+    } else if (mOptions[RSK_GANONS_BOSS_KEY].Is(RO_GANON_BOSS_KEY_LACS_MEDALLIONS)) {
+        mLACSCondition = RO_LACS_MEDALLIONS;
+    } else if (mOptions[RSK_GANONS_BOSS_KEY].Is(RO_GANON_BOSS_KEY_LACS_REWARDS)) {
+        mLACSCondition = RO_LACS_REWARDS;
+    } else if (mOptions[RSK_GANONS_BOSS_KEY].Is(RO_GANON_BOSS_KEY_LACS_DUNGEONS)) {
+        mLACSCondition = RO_LACS_DUNGEONS;
+    } else if (mOptions[RSK_GANONS_BOSS_KEY].Is(RO_GANON_BOSS_KEY_LACS_TOKENS)) {
+        mLACSCondition = RO_LACS_TOKENS;
+    } else {
+        mLACSCondition = RO_LACS_VANILLA;
+    }
+
+    if (mOptions[RSK_LOGIC_RULES].Is(RO_LOGIC_VANILLA)) {
+        for (Option* setting : VanillaLogicDefaults) {
+            setting->SetDelayedOption();
+            setting->SetSelectedIndex(0);
+        }
+        mOptions[RSK_KEYSANITY].SetDelayedOption();
+        mOptions[RSK_KEYSANITY].SetSelectedIndex(3);
+    }
+}
+void Settings::ParseJson(nlohmann::json spoilerFileJson) {
+    mSeedString = spoilerFileJson["seed"].template get<std::string>();
+    mFinalSeed = spoilerFileJson["finalSeed"].get<uint32_t>();
+    nlohmann::json settingsJson = spoilerFileJson["settings"];
+    for (auto it = settingsJson.begin(); it != settingsJson.end(); ++it) {
+        // todo load into cvars for UI
+
+        std::string numericValueString;
+        if (mSpoilerfileSettingNameToEnum.count(it.key())) {
+            RandomizerSettingKey index = mSpoilerfileSettingNameToEnum[it.key()];
+            // this is annoying but the same strings are used in different orders
+            // and i don't want the spoilerfile to just have numbers instead of
+            // human readable settings values so it'll have to do for now
+            switch (index) {
+                case RSK_LOGIC_RULES:
+                    if (it.value() == "Glitchless") {
+                        mOptions[index].SetSelectedIndex(RO_LOGIC_GLITCHLESS);
+                    } else if (it.value() == "No Logic") {
+                        mOptions[index].SetSelectedIndex(RO_LOGIC_NO_LOGIC);
+                    }
+                    break;
+                case RSK_FOREST:
+                    if (it.value() == "Closed") {
+                        mOptions[index].SetSelectedIndex(RO_FOREST_CLOSED);
+                    } else if (it.value() == "Open") {
+                        mOptions[index].SetSelectedIndex(RO_FOREST_OPEN);
+                    } else if (it.value() == "Closed Deku") {
+                        mOptions[index].SetSelectedIndex(RO_FOREST_CLOSED_DEKU);
+                    }
+                    break;
+                case RSK_KAK_GATE:
+                    if (it.value() == "Closed") {
+                        mOptions[index].SetSelectedIndex(RO_KAK_GATE_CLOSED);
+                    } else if (it.value() == "Open") {
+                        mOptions[index].SetSelectedIndex(RO_KAK_GATE_OPEN);
+                    }
+                    break;
+                case RSK_DOOR_OF_TIME:
+                    if (it.value() == "Open") {
+                        mOptions[index].SetSelectedIndex(RO_DOOROFTIME_OPEN);
+                    } else if (it.value() == "Song only") {
+                        mOptions[index].SetSelectedIndex(RO_DOOROFTIME_SONGONLY);
+                    } else if (it.value() == "Closed") {
+                        mOptions[index].SetSelectedIndex(RO_DOOROFTIME_CLOSED);
+                    }
+                    break;
+                case RSK_ZORAS_FOUNTAIN:
+                    if (it.value() == "Closed") {
+                        mOptions[index].SetSelectedIndex(RO_ZF_CLOSED);
+                    } else if (it.value() == "Closed as child") {
+                        mOptions[index].SetSelectedIndex(RO_ZF_CLOSED_CHILD);
+                    } else if (it.value() == "Open") {
+                        mOptions[index].SetSelectedIndex(RO_ZF_OPEN);
+                    }
+                    break;
+                case RSK_STARTING_AGE:
+                    if (it.value() == "Child") {
+                        mOptions[index].SetSelectedIndex(RO_AGE_CHILD);
+                    } else if (it.value() == "Adult") {
+                        mOptions[index].SetSelectedIndex(RO_AGE_ADULT);
+                    }
+                    break;
+                case RSK_GERUDO_FORTRESS:
+                    if (it.value() == "Normal") {
+                        mOptions[index].SetSelectedIndex(RO_GF_NORMAL);
+                    } else if (it.value() == "Fast") {
+                        mOptions[index].SetSelectedIndex(RO_GF_FAST);
+                    } else if (it.value() == "Open") {
+                        mOptions[index].SetSelectedIndex(RO_GF_OPEN);
+                    }
+                    break;
+                case RSK_RAINBOW_BRIDGE:
+                    if (it.value() == "Vanilla") {
+                        mOptions[index].SetSelectedIndex(RO_BRIDGE_VANILLA);
+                    } else if (it.value() == "Always open") {
+                        mOptions[index].SetSelectedIndex(RO_BRIDGE_ALWAYS_OPEN);
+                    } else if (it.value() == "Stones") {
+                        mOptions[index].SetSelectedIndex(RO_BRIDGE_STONES);
+                    } else if (it.value() == "Medallions") {
+                        mOptions[index].SetSelectedIndex(RO_BRIDGE_MEDALLIONS);
+                    } else if (it.value() == "Dungeon rewards") {
+                        mOptions[index].SetSelectedIndex(RO_BRIDGE_DUNGEON_REWARDS);
+                    } else if (it.value() == "Dungeons") {
+                        mOptions[index].SetSelectedIndex(RO_BRIDGE_DUNGEONS);
+                    } else if (it.value() == "Tokens") {
+                        mOptions[index].SetSelectedIndex(RO_BRIDGE_TOKENS);
+                    } else if (it.value() == "Greg") {
+                        mOptions[index].SetSelectedIndex(RO_BRIDGE_GREG);
+                    }
+                    break;
+                case RSK_BRIDGE_OPTIONS:
+                    if (it.value() == "Standard Rewards") {
+                        mOptions[index].SetSelectedIndex(RO_BRIDGE_STANDARD_REWARD);
+                    } else if (it.value() == "Greg as Reward") {
+                        mOptions[index].SetSelectedIndex(RO_BRIDGE_GREG_REWARD);
+                    } else if (it.value() == "Greg as Wildcard") {
+                        mOptions[index].SetSelectedIndex(RO_BRIDGE_WILDCARD_REWARD);
+                    }
+                    break;
+                case RSK_LACS_OPTIONS:
+                    if (it.value() == "Standard Reward") {
+                        mOptions[index].SetSelectedIndex(RO_LACS_STANDARD_REWARD);
+                    } else if (it.value() == "Greg as Reward") {
+                        mOptions[index].SetSelectedIndex(RO_LACS_GREG_REWARD);
+                    } else if (it.value() == "Greg as Wildcard") {
+                        mOptions[index].SetSelectedIndex(RO_LACS_WILDCARD_REWARD);
+                    }
+                    break;
+                case RSK_DAMAGE_MULTIPLIER:
+                    if (it.value() == "x1/2") {
+                        mOptions[index].SetSelectedIndex(RO_DAMAGE_MULTIPLIER_HALF);
+                    } else if (it.value() == "x1") {
+                        mOptions[index].SetSelectedIndex(RO_DAMAGE_MULTIPLIER_DEFAULT);
+                    } else if (it.value() == "x2") {
+                        mOptions[index].SetSelectedIndex(RO_DAMAGE_MULTIPLIER_DOUBLE);
+                    } else if (it.value() == "x4") {
+                        mOptions[index].SetSelectedIndex(RO_DAMAGE_MULTIPLIER_QUADRUPLE);
+                    } else if (it.value() == "x8") {
+                        mOptions[index].SetSelectedIndex(RO_DAMAGE_MULTIPLIER_OCTUPLE);
+                    } else if (it.value() == "x16") {
+                        mOptions[index].SetSelectedIndex(RO_DAMAGE_MULTIPLIER_SEXDECUPLE);
+                    } else if (it.value() == "OHKO") {
+                        mOptions[index].SetSelectedIndex(RO_DAMAGE_MULTIPLIER_OHKO);
+                    }
+                    break;
+                case RSK_RAINBOW_BRIDGE_STONE_COUNT:
+                case RSK_RAINBOW_BRIDGE_MEDALLION_COUNT:
+                case RSK_RAINBOW_BRIDGE_REWARD_COUNT:
+                case RSK_RAINBOW_BRIDGE_DUNGEON_COUNT:
+                case RSK_RAINBOW_BRIDGE_TOKEN_COUNT:
+                case RSK_TRIAL_COUNT:
+                case RSK_LACS_STONE_COUNT:
+                case RSK_LACS_MEDALLION_COUNT:
+                case RSK_LACS_REWARD_COUNT:
+                case RSK_LACS_DUNGEON_COUNT:
+                case RSK_LACS_TOKEN_COUNT:
+                case RSK_KEYRINGS_RANDOM_COUNT:
+                case RSK_BIG_POE_COUNT:
+                case RSK_CUCCO_COUNT:
+                case RSK_STARTING_SKULLTULA_TOKEN:
+                case RSK_TRIFORCE_HUNT_PIECES_TOTAL:
+                case RSK_TRIFORCE_HUNT_PIECES_REQUIRED:
+                case RSK_STARTING_HEARTS:
+                    numericValueString = it.value();
+                    mOptions[index].SetSelectedIndex(std::stoi(numericValueString));
+                    break;
+                case RSK_GANONS_TRIALS:
+                    if (it.value() == "Skip") {
+                        mOptions[index].SetSelectedIndex(RO_GANONS_TRIALS_SKIP);
+                    } else if (it.value() == "Set Number") {
+                        mOptions[index].SetSelectedIndex(RO_GANONS_TRIALS_SET_NUMBER);
+                    } else if (it.value() == "Random Number") {
+                        mOptions[index].SetSelectedIndex(RO_GANONS_TRIALS_RANDOM_NUMBER);
+                    }
+                case RSK_SHOPSANITY:
+                    if (it.value() == "Off") {
+                        mOptions[index].SetSelectedIndex(RO_SHOPSANITY_OFF);
+                    } else if (it.value() == "0 Items") {
+                        mOptions[index].SetSelectedIndex(RO_SHOPSANITY_ZERO_ITEMS);
+                    } else if (it.value() == "1 Item") {
+                        mOptions[index].SetSelectedIndex(RO_SHOPSANITY_ONE_ITEM);
+                    } else if (it.value() == "2 Items") {
+                        mOptions[index].SetSelectedIndex(RO_SHOPSANITY_TWO_ITEMS);
+                    } else if (it.value() == "3 Items") {
+                        mOptions[index].SetSelectedIndex(RO_SHOPSANITY_THREE_ITEMS);
+                    } else if (it.value() == "4 Items") {
+                        mOptions[index].SetSelectedIndex(RO_SHOPSANITY_FOUR_ITEMS);
+                    } else if (it.value() == "Random") {
+                        mOptions[index].SetSelectedIndex(RO_SHOPSANITY_RANDOM);
+                    }
+                    break;
+                case RSK_SHOPSANITY_PRICES:
+                    if (it.value() == "Random") {
+                        mOptions[index].SetSelectedIndex(RO_SHOPSANITY_PRICE_BALANCED);
+                    } else if (it.value() == "Starter Wallet") {
+                        mOptions[index].SetSelectedIndex(RO_SHOPSANITY_PRICE_STARTER);
+                    } else if (it.value() == "Adult's Wallet") {
+                        mOptions[index].SetSelectedIndex(RO_SHOPSANITY_PRICE_ADULT);
+                    } else if (it.value() == "Giant's Wallet") {
+                        mOptions[index].SetSelectedIndex(RO_SHOPSANITY_PRICE_GIANT);
+                    } else if (it.value() == "Tycoon's Wallet") {
+                        mOptions[index].SetSelectedIndex(RO_SHOPSANITY_PRICE_TYCOON);
+                    }
+                case RSK_SHUFFLE_SCRUBS:
+                    if (it.value() == "Off") {
+                        mOptions[index].SetSelectedIndex(RO_SCRUBS_OFF);
+                    } else if (it.value() == "Affordable") {
+                        mOptions[index].SetSelectedIndex(RO_SCRUBS_AFFORDABLE);
+                    } else if (it.value() == "Expensive") {
+                        mOptions[index].SetSelectedIndex(RO_SCRUBS_EXPENSIVE);
+                    } else if (it.value() == "Random Prices") {
+                        mOptions[index].SetSelectedIndex(RO_SCRUBS_RANDOM);
+                    }
+                    break;
+                case RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD:
+                case RSK_SHUFFLE_COWS:
+                case RSK_SHUFFLE_ADULT_TRADE:
+                case RSK_SHUFFLE_MAGIC_BEANS:
+                case RSK_SHUFFLE_KOKIRI_SWORD:
+                case RSK_SHUFFLE_WEIRD_EGG:
+                case RSK_SHUFFLE_FROG_SONG_RUPEES:
+                case RSK_SHUFFLE_100_GS_REWARD:
+                case RSK_SHUFFLE_OCARINA:
+                case RSK_STARTING_DEKU_SHIELD:
+                case RSK_STARTING_KOKIRI_SWORD:
+                case RSK_STARTING_ZELDAS_LULLABY:
+                case RSK_STARTING_EPONAS_SONG:
+                case RSK_STARTING_SARIAS_SONG:
+                case RSK_STARTING_SUNS_SONG:
+                case RSK_STARTING_SONG_OF_TIME:
+                case RSK_STARTING_SONG_OF_STORMS:
+                case RSK_STARTING_MINUET_OF_FOREST:
+                case RSK_STARTING_BOLERO_OF_FIRE:
+                case RSK_STARTING_SERENADE_OF_WATER:
+                case RSK_STARTING_REQUIEM_OF_SPIRIT:
+                case RSK_STARTING_NOCTURNE_OF_SHADOW:
+                case RSK_STARTING_PRELUDE_OF_LIGHT:
+                case RSK_COMPLETE_MASK_QUEST:
+                case RSK_SKIP_SCARECROWS_SONG:
+                case RSK_ENABLE_GLITCH_CUTSCENES:
+                case RSK_SKULLS_SUNS_SONG:
+                case RSK_BLUE_FIRE_ARROWS:
+                case RSK_SUNLIGHT_ARROWS:
+                case RSK_BOMBCHUS_IN_LOGIC:
+                case RSK_TOT_ALTAR_HINT:
+                case RSK_LIGHT_ARROWS_HINT:
+                case RSK_DAMPES_DIARY_HINT:
+                case RSK_GREG_HINT:
+                case RSK_SARIA_HINT:
+                case RSK_FROGS_HINT:
+                case RSK_KAK_10_SKULLS_HINT:
+                case RSK_KAK_20_SKULLS_HINT:
+                case RSK_KAK_30_SKULLS_HINT:
+                case RSK_KAK_40_SKULLS_HINT:
+                case RSK_KAK_50_SKULLS_HINT:
+                case RSK_WARP_SONG_HINTS:
+                case RSK_SCRUB_TEXT_HINT:
+                case RSK_KEYRINGS_GERUDO_FORTRESS:
+                case RSK_KEYRINGS_FOREST_TEMPLE:
+                case RSK_KEYRINGS_FIRE_TEMPLE:
+                case RSK_KEYRINGS_WATER_TEMPLE:
+                case RSK_KEYRINGS_SHADOW_TEMPLE:
+                case RSK_KEYRINGS_SPIRIT_TEMPLE:
+                case RSK_KEYRINGS_BOTTOM_OF_THE_WELL:
+                case RSK_KEYRINGS_GTG:
+                case RSK_KEYRINGS_GANONS_CASTLE:
+                case RSK_SHUFFLE_ENTRANCES:
+                case RSK_SHUFFLE_OVERWORLD_ENTRANCES:
+                case RSK_SHUFFLE_GROTTO_ENTRANCES:
+                case RSK_SHUFFLE_OWL_DROPS:
+                case RSK_SHUFFLE_WARP_SONGS:
+                case RSK_SHUFFLE_OVERWORLD_SPAWNS:
+                case RSK_MIXED_ENTRANCE_POOLS:
+                case RSK_MIX_DUNGEON_ENTRANCES:
+                case RSK_MIX_OVERWORLD_ENTRANCES:
+                case RSK_MIX_INTERIOR_ENTRANCES:
+                case RSK_MIX_GROTTO_ENTRANCES:
+                case RSK_DECOUPLED_ENTRANCES:
+                case RSK_SHOPSANITY_PRICES_AFFORDABLE:
+                case RSK_ALL_LOCATIONS_REACHABLE:
+                case RSK_TRIFORCE_HUNT:
+                case RSK_MQ_DUNGEON_SET:
+                    if (it.value() == "Off") {
+                        mOptions[index].SetSelectedIndex(RO_GENERIC_OFF);
+                    } else if (it.value() == "On") {
+                        mOptions[index].SetSelectedIndex(RO_GENERIC_ON);
+                    }
+                    break;
+                case RSK_KEYRINGS:
+                    if (it.value() == "Off") {
+                        mOptions[index].SetSelectedIndex(RO_KEYRINGS_OFF);
+                    } else if (it.value() == "Random") {
+                        mOptions[index].SetSelectedIndex(RO_KEYRINGS_RANDOM);
+                    } else if (it.value() == "Count") {
+                        mOptions[index].SetSelectedIndex(RO_KEYRINGS_COUNT);
+                    } else if (it.value() == "Selection") {
+                        mOptions[index].SetSelectedIndex(RO_KEYRINGS_SELECTION);
+                    }
+                    break;
+                case RSK_SHUFFLE_MERCHANTS:
+                    if (it.value() == "Off") {
+                        mOptions[index].SetSelectedIndex(RO_SHUFFLE_MERCHANTS_OFF);
+                    } else if (it.value() == "On (No Hints)") {
+                        mOptions[index].SetSelectedIndex(RO_SHUFFLE_MERCHANTS_ON_NO_HINT);
+                    } else if (it.value() == "On (With Hints)") {
+                        mOptions[index].SetSelectedIndex(RO_SHUFFLE_MERCHANTS_ON_HINT);
+                    }
+                    break;
+                // Uses Ammo Drops option for now. "Off" not yet implemented
+                case RSK_ENABLE_BOMBCHU_DROPS:
+                    if (it.value() == "On") {
+                        mOptions[index].SetSelectedIndex(RO_AMMO_DROPS_ON);
+                    } else if (it.value() == "On + Bombchu") {
+                        mOptions[index].SetSelectedIndex(RO_AMMO_DROPS_ON_PLUS_BOMBCHU);
+                    } else if (it.value() == "Off") {
+                        mOptions[index].SetSelectedIndex(RO_AMMO_DROPS_OFF);
+                    }
+                    break;
+                case RSK_STARTING_OCARINA:
+                    if (it.value() == "Off") {
+                        mOptions[index].SetSelectedIndex(RO_STARTING_OCARINA_OFF);
+                    } else if (it.value() == "Fairy Ocarina") {
+                        mOptions[index].SetSelectedIndex(RO_STARTING_OCARINA_FAIRY);
+                    }
+                    break;
+                case RSK_ITEM_POOL:
+                    if (it.value() == "Plentiful") {
+                        mOptions[index].SetSelectedIndex(RO_ITEM_POOL_PLENTIFUL);
+                    } else if (it.value() == "Balanced") {
+                        mOptions[index].SetSelectedIndex(RO_ITEM_POOL_BALANCED);
+                    } else if (it.value() == "Scarce") {
+                        mOptions[index].SetSelectedIndex(RO_ITEM_POOL_SCARCE);
+                    } else if (it.value() == "Minimal") {
+                        mOptions[index].SetSelectedIndex(RO_ITEM_POOL_MINIMAL);
+                    }
+                    break;
+                case RSK_ICE_TRAPS:
+                    if (it.value() == "Off") {
+                        mOptions[index].SetSelectedIndex(RO_ICE_TRAPS_OFF);
+                    } else if (it.value() == "Normal") {
+                        mOptions[index].SetSelectedIndex(RO_ICE_TRAPS_NORMAL);
+                    } else if (it.value() == "Extra") {
+                        mOptions[index].SetSelectedIndex(RO_ICE_TRAPS_EXTRA);
+                    } else if (it.value() == "Mayhem") {
+                        mOptions[index].SetSelectedIndex(RO_ICE_TRAPS_MAYHEM);
+                    } else if (it.value() == "Onslaught") {
+                        mOptions[index].SetSelectedIndex(RO_ICE_TRAPS_ONSLAUGHT);
+                    }
+                    break;
+                case RSK_GOSSIP_STONE_HINTS:
+                    if (it.value() == "No Hints") {
+                        mOptions[index].SetSelectedIndex(RO_GOSSIP_STONES_NONE);
+                    } else if (it.value() == "Need Nothing") {
+                        mOptions[index].SetSelectedIndex(RO_GOSSIP_STONES_NEED_NOTHING);
+                    } else if (it.value() == "Mask of Truth") {
+                        mOptions[index].SetSelectedIndex(RO_GOSSIP_STONES_NEED_TRUTH);
+                    } else if (it.value() == "Stone of Agony") {
+                        mOptions[index].SetSelectedIndex(RO_GOSSIP_STONES_NEED_STONE);
+                    }
+                    break;
+                case RSK_HINT_CLARITY:
+                    if (it.value() == "Obscure") {
+                        mOptions[index].SetSelectedIndex(RO_HINT_CLARITY_OBSCURE);
+                    } else if (it.value() == "Ambiguous") {
+                        mOptions[index].SetSelectedIndex(RO_HINT_CLARITY_AMBIGUOUS);
+                    } else if (it.value() == "Clear") {
+                        mOptions[index].SetSelectedIndex(RO_HINT_CLARITY_CLEAR);
+                    }
+                    break;
+                case RSK_HINT_DISTRIBUTION:
+                    if (it.value() == "Useless") {
+                        mOptions[index].SetSelectedIndex(RO_HINT_DIST_USELESS);
+                    } else if (it.value() == "Balanced") {
+                        mOptions[index].SetSelectedIndex(RO_HINT_DIST_BALANCED);
+                    } else if (it.value() == "Strong") {
+                        mOptions[index].SetSelectedIndex(RO_HINT_DIST_STRONG);
+                    } else if (it.value() == "Very Strong") {
+                        mOptions[index].SetSelectedIndex(RO_HINT_DIST_VERY_STRONG);
+                    }
+                    break;
+                case RSK_GERUDO_KEYS:
+                    if (it.value() == "Vanilla") {
+                        mOptions[index].SetSelectedIndex(RO_GERUDO_KEYS_VANILLA);
+                    } else if (it.value() == "Any Dungeon") {
+                        mOptions[index].SetSelectedIndex(RO_GERUDO_KEYS_ANY_DUNGEON);
+                    } else if (it.value() == "Overworld") {
+                        mOptions[index].SetSelectedIndex(RO_GERUDO_KEYS_OVERWORLD);
+                    } else if (it.value() == "Anywhere") {
+                        mOptions[index].SetSelectedIndex(RO_GERUDO_KEYS_ANYWHERE);
+                    }
+                    break;
+                case RSK_KEYSANITY:
+                case RSK_BOSS_KEYSANITY:
+                case RSK_SHUFFLE_MAPANDCOMPASS:
+                    if (it.value() == "Start With") {
+                        mOptions[index].SetSelectedIndex(RO_DUNGEON_ITEM_LOC_STARTWITH);
+                    } else if (it.value() == "Vanilla") {
+                        mOptions[index].SetSelectedIndex(RO_DUNGEON_ITEM_LOC_VANILLA);
+                    } else if (it.value() == "Own Dungeon") {
+                        mOptions[index].SetSelectedIndex(RO_DUNGEON_ITEM_LOC_OWN_DUNGEON);
+                    } else if (it.value() == "Any Dungeon") {
+                        mOptions[index].SetSelectedIndex(RO_DUNGEON_ITEM_LOC_ANY_DUNGEON);
+                    } else if (it.value() == "Overworld") {
+                        mOptions[index].SetSelectedIndex(RO_DUNGEON_ITEM_LOC_OVERWORLD);
+                    } else if (it.value() == "Anywhere") {
+                        mOptions[index].SetSelectedIndex(RO_DUNGEON_ITEM_LOC_ANYWHERE);
+                    }
+                    break;
+                case RSK_GANONS_BOSS_KEY:
+                    if (it.value() == "Vanilla") {
+                        mOptions[index].SetSelectedIndex(RO_GANON_BOSS_KEY_VANILLA);
+                    } else if (it.value() == "Own dungeon") {
+                        mOptions[index].SetSelectedIndex(RO_GANON_BOSS_KEY_OWN_DUNGEON);
+                    } else if (it.value() == "Start with") {
+                        mOptions[index].SetSelectedIndex(RO_GANON_BOSS_KEY_STARTWITH);
+                    } else if (it.value() == "Any Dungeon") {
+                        mOptions[index].SetSelectedIndex(RO_GANON_BOSS_KEY_ANY_DUNGEON);
+                    } else if (it.value() == "Overworld") {
+                        mOptions[index].SetSelectedIndex(RO_GANON_BOSS_KEY_OVERWORLD);
+                    } else if (it.value() == "Anywhere") {
+                        mOptions[index].SetSelectedIndex(RO_GANON_BOSS_KEY_ANYWHERE);
+                    } else if (it.value() == "LACS-Vanilla") {
+                        mOptions[index].SetSelectedIndex(RO_GANON_BOSS_KEY_LACS_VANILLA);
+                    } else if (it.value() == "LACS-Stones") {
+                        mOptions[index].SetSelectedIndex(RO_GANON_BOSS_KEY_LACS_STONES);
+                    } else if (it.value() == "LACS-Medallions") {
+                        mOptions[index].SetSelectedIndex(RO_GANON_BOSS_KEY_LACS_MEDALLIONS);
+                    } else if (it.value() == "LACS-Rewards") {
+                        mOptions[index].SetSelectedIndex(RO_GANON_BOSS_KEY_LACS_REWARDS);
+                    } else if (it.value() == "LACS-Dungeons") {
+                        mOptions[index].SetSelectedIndex(RO_GANON_BOSS_KEY_LACS_DUNGEONS);
+                    } else if (it.value() == "LACS-Tokens") {
+                        mOptions[index].SetSelectedIndex(RO_GANON_BOSS_KEY_LACS_TOKENS);
+                    } else if (it.value() == "100 GS Reward") {
+                        mOptions[index].SetSelectedIndex(RO_GANON_BOSS_KEY_KAK_TOKENS);
+                    } else if (it.value() == "Triforce Hunt") {
+                        mOptions[index].SetSelectedIndex(RO_GANON_BOSS_KEY_TRIFORCE_HUNT);
+                    }
+                    break;
+                case RSK_MQ_DUNGEON_RANDOM:
+                    if (it.value() == "None") {
+                        mOptions[index].SetSelectedIndex(RO_MQ_DUNGEONS_NONE);
+                    } else if (it.value() == "Random Number") {
+                        mOptions[index].SetSelectedIndex(RO_MQ_DUNGEONS_RANDOM_NUMBER);
+                    } else if (it.value() == "Set Number") {
+                        mOptions[index].SetSelectedIndex(RO_MQ_DUNGEONS_SET_NUMBER);
+                    } else if (it.value() == "Selection Only") {
+                        mOptions[index].SetSelectedIndex(RO_MQ_DUNGEONS_SELECTION);
+                    }
+                    break;
+                case RSK_STARTING_CONSUMABLES:
+                case RSK_FULL_WALLETS:
+                    if (it.value() == "No") {
+                        mOptions[index].SetSelectedIndex(RO_GENERIC_NO);
+                    } else if (it.value() == "Yes") {
+                        mOptions[index].SetSelectedIndex(RO_GENERIC_YES);
+                    }
+                    break;
+                case RSK_SKIP_CHILD_ZELDA:
+                case RSK_SKIP_CHILD_STEALTH:
+                case RSK_SKIP_EPONA_RACE:
+                case RSK_SKIP_TOWER_ESCAPE:
+                    if (it.value() == "Don't Skip") {
+                        mOptions[index].SetSelectedIndex(RO_GENERIC_DONT_SKIP);
+                    } else if (it.value() == "Skip") {
+                        mOptions[index].SetSelectedIndex(RO_GENERIC_SKIP);
+                    }
+                    break;
+                case RSK_SHUFFLE_DUNGEON_REWARDS:
+                    if (it.value() == "End of dungeons") {
+                        mOptions[index].SetSelectedIndex(RO_DUNGEON_REWARDS_END_OF_DUNGEON);
+                    } else if (it.value() == "Any dungeon") {
+                        mOptions[index].SetSelectedIndex(RO_DUNGEON_REWARDS_ANY_DUNGEON);
+                    } else if (it.value() == "Overworld") {
+                        mOptions[index].SetSelectedIndex(RO_DUNGEON_REWARDS_OVERWORLD);
+                    } else if (it.value() == "Anywhere") {
+                        mOptions[index].SetSelectedIndex(RO_DUNGEON_REWARDS_ANYWHERE);
+                    }
+                    break;
+                case RSK_SHUFFLE_SONGS:
+                    if (it.value() == "Song locations") {
+                        mOptions[index].SetSelectedIndex(RO_SONG_SHUFFLE_SONG_LOCATIONS);
+                    } else if (it.value() == "Dungeon rewards") {
+                        mOptions[index].SetSelectedIndex(RO_SONG_SHUFFLE_DUNGEON_REWARDS);
+                    } else if (it.value() == "Anywhere") {
+                        mOptions[index].SetSelectedIndex(RO_SONG_SHUFFLE_ANYWHERE);
+                    }
+                    break;
+                case RSK_SHUFFLE_TOKENS:
+                    if (it.value() == "Off") {
+                        mOptions[index].SetSelectedIndex(RO_TOKENSANITY_OFF);
+                    } else if (it.value() == "Dungeons") {
+                        mOptions[index].SetSelectedIndex(RO_TOKENSANITY_DUNGEONS);
+                    } else if (it.value() == "Overworld") {
+                        mOptions[index].SetSelectedIndex(RO_TOKENSANITY_OVERWORLD);
+                    } else if (it.value() == "All Tokens") {
+                        mOptions[index].SetSelectedIndex(RO_TOKENSANITY_ALL);
+                    }
+                    break;
+                case RSK_LINKS_POCKET:
+                    if (it.value() == "Dungeon Reward") {
+                        mOptions[index].SetSelectedIndex(RO_LINKS_POCKET_DUNGEON_REWARD);
+                    } else if (it.value() == "Advancement") {
+                        mOptions[index].SetSelectedIndex(RO_LINKS_POCKET_ADVANCEMENT);
+                    } else if (it.value() == "Anything") {
+                        mOptions[index].SetSelectedIndex(RO_LINKS_POCKET_ANYTHING);
+                    } else if (it.value() == "Nothing") {
+                        mOptions[index].SetSelectedIndex(RO_LINKS_POCKET_NOTHING);
+                    }
+                    break;
+                case RSK_MQ_DUNGEON_COUNT:
+                    numericValueString = it.value();
+                    mOptions[index].SetSelectedIndex(std::stoi(numericValueString));
+                    break;
+                case RSK_SHUFFLE_DUNGEON_ENTRANCES:
+                    if (it.value() == "Off") {
+                        mOptions[index].SetSelectedIndex(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF);
+                    } else if (it.value() == "On") {
+                        mOptions[index].SetSelectedIndex(RO_DUNGEON_ENTRANCE_SHUFFLE_ON);
+                    } else if (it.value() == "On + Ganon") {
+                        mOptions[index].SetSelectedIndex(RO_DUNGEON_ENTRANCE_SHUFFLE_ON_PLUS_GANON);
+                    }
+                    break;
+                case RSK_SHUFFLE_BOSS_ENTRANCES:
+                    if (it.value() == "Off") {
+                        mOptions[index].SetSelectedIndex(RO_BOSS_ROOM_ENTRANCE_SHUFFLE_OFF);
+                    } else if (it.value() == "Age Restricted") {
+                        mOptions[index].SetSelectedIndex(RO_BOSS_ROOM_ENTRANCE_SHUFFLE_AGE_RESTRICTED);
+                    } else if (it.value() == "Full") {
+                        mOptions[index].SetSelectedIndex(RO_BOSS_ROOM_ENTRANCE_SHUFFLE_FULL);
+                    }
+                    break;
+                case RSK_SHUFFLE_INTERIOR_ENTRANCES:
+                    if (it.value() == "Off") {
+                        mOptions[index].SetSelectedIndex(RO_INTERIOR_ENTRANCE_SHUFFLE_OFF);
+                    } else if (it.value() == "Simple") {
+                        mOptions[index].SetSelectedIndex(RO_INTERIOR_ENTRANCE_SHUFFLE_SIMPLE);
+                    } else if (it.value() == "All") {
+                        mOptions[index].SetSelectedIndex(RO_INTERIOR_ENTRANCE_SHUFFLE_ALL);
+                    }
+                    break;
+                case RSK_SHUFFLE_CHEST_MINIGAME:
+                    if (it.value() == "Off") {
+                        mOptions[index].SetSelectedIndex(RO_CHEST_GAME_OFF);
+                    } else if (it.value() == "On (Separate)") {
+                        mOptions[index].SetSelectedIndex(RO_CHEST_GAME_SINGLE_KEYS);
+                    } else if (it.value() == "On (Pack)") {
+                        mOptions[index].SetSelectedIndex(RO_CHEST_GAME_PACK);
+                    }
+                    break;
+                case RSK_MQ_DEKU_TREE:
+                case RSK_MQ_DODONGOS_CAVERN:
+                case RSK_MQ_JABU_JABU:
+                case RSK_MQ_FOREST_TEMPLE:
+                case RSK_MQ_FIRE_TEMPLE:
+                case RSK_MQ_WATER_TEMPLE:
+                case RSK_MQ_SPIRIT_TEMPLE:
+                case RSK_MQ_SHADOW_TEMPLE:
+                case RSK_MQ_BOTTOM_OF_THE_WELL:
+                case RSK_MQ_ICE_CAVERN:
+                case RSK_MQ_GTG:
+                case RSK_MQ_GANONS_CASTLE:
+                    if (it.value() == "Vanilla") {
+                        mOptions[index].SetSelectedIndex(RO_MQ_SET_VANILLA);
+                    } else if (it.value() == "Master Quest") {
+                        mOptions[index].SetSelectedIndex(RO_MQ_SET_MQ);
+                    } else if (it.value() == "Random") {
+                        mOptions[index].SetSelectedIndex(RO_MQ_SET_RANDOM);
+                    }
+                    break;
+                default:
+                    SPDLOG_DEBUG("No string to enum conversion for option: %s", it.key());
+                    break;
+            }
+        }
+    }
+
+    nlohmann::json jsonExcludedLocations = spoilerFileJson["excludedLocations"];
+    auto ctx = Rando::Context::GetInstance();
+
+    ctx->AddExcludedOptions();
+    for (auto it = jsonExcludedLocations.begin(); it != jsonExcludedLocations.end(); it++) {
+        RandomizerCheck rc = ctx->mSpoilerfileCheckNameToEnum[it.value()];
+        ctx->GetItemLocation(rc)->GetExcludedOption()->SetSelectedIndex(RO_GENERIC_ON);
+    }
+
+    nlohmann::json enabledTricksJson = spoilerFileJson["enabledTricks"];
+    for (auto it = enabledTricksJson.begin(); it != enabledTricksJson.end(); it++) {
+        std::string numericValueString = it.value();
+        RandomizerTrick rt = (RandomizerTrick)std::stoi(numericValueString);
+        GetTrickOption(rt).SetSelectedIndex(RO_GENERIC_ON);
+    }
+}
+} // namespace Rando
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/settings.h b/soh/soh/Enhancements/randomizer/settings.h
new file mode 100644
index 000000000..fedd04ec2
--- /dev/null
+++ b/soh/soh/Enhancements/randomizer/settings.h
@@ -0,0 +1,49 @@
+#pragma once
+
+#include "option.h"
+#include "randomizerTypes.h"
+#include "3drando/spoiler_log.hpp"
+
+#include <array>
+#include <set>
+#include <unordered_map>
+#include <nlohmann/json.hpp>
+
+namespace Rando {
+class Settings {
+  public:
+    Settings();
+    void CreateOptions();
+    Option& Setting(RandomizerSettingKey key);
+    Option& GetTrickOption(RandomizerTrick key);
+    const std::array<Option, RSK_MAX>& GetAllOptions() const;
+    std::vector<Option*>& GetExcludeOptionsForGroup(SpoilerCollectionCheckGroup group);
+    const std::vector<std::vector<Option*>>& GetExcludeLocationsOptions() const;
+    RandoOptionStartingAge ResolvedStartingAge() const;
+    RandoOptionLACSCondition LACSCondition() const;
+    std::string GetHash() const;
+    const std::string& GetSeedString() const;
+    void SetSeedString(std::string seedString);
+    const uint32_t GetSeed() const;
+    void SetSeed(uint32_t seed);
+    void SetHash(std::string hash);
+    const std::array<OptionGroup, RSG_MAX>& GetOptionGroups();
+    const OptionGroup& GetOptionGroup(RandomizerSettingGroupKey key);
+    void UpdateSettings(std::unordered_map<RandomizerSettingKey, uint8_t> cvarSettings,
+                        std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks);
+    void ParseJson(nlohmann::json spoilerFileJson);
+    std::vector<Option*> VanillaLogicDefaults = {};
+
+  private:
+    std::array<Option, RSK_MAX> mOptions = {};
+    std::array<OptionGroup, RSG_MAX> mOptionGroups = {};
+    std::array<Option, RT_MAX> mTrickOptions;
+    std::vector<std::vector<Option*>> mExcludeLocationsOptionsGroups;
+    std::unordered_map<std::string, RandomizerSettingKey> mSpoilerfileSettingNameToEnum;
+    RandoOptionStartingAge mResolvedStartingAge;
+    RandoOptionLACSCondition mLACSCondition;
+    std::string mHash;
+    std::string mSeedString;
+    uint32_t mFinalSeed;
+};
+} // namespace Rando
diff --git a/soh/soh/Enhancements/randomizer/trial.cpp b/soh/soh/Enhancements/randomizer/trial.cpp
new file mode 100644
index 000000000..f07c19c5d
--- /dev/null
+++ b/soh/soh/Enhancements/randomizer/trial.cpp
@@ -0,0 +1,82 @@
+#include "trial.h"
+
+namespace Rando {
+TrialInfo::TrialInfo(const Text name_) : name(std::move(name_)) {}
+TrialInfo::TrialInfo() = default;
+TrialInfo::~TrialInfo() = default;
+
+Text TrialInfo::GetName() const {
+    return name;
+}
+
+bool TrialInfo::IsSkipped() const {
+    return skipped;
+}
+
+bool TrialInfo::IsRequired() const {
+    return !skipped;
+}
+
+void TrialInfo::SetAsRequired() {
+    skipped = false;
+}
+
+void TrialInfo::SetAsSkipped() {
+    skipped = true;
+}
+
+Trials::Trials() {
+    mTrials[FOREST_TRIAL] = TrialInfo(Text{"the Forest Trial", "l'épreuve de la Forêt", "la prueba del bosque"});
+    mTrials[FIRE_TRIAL] = TrialInfo(Text{"the Fire Trial",   "l'épreuve du Feu", "la prueba del fuego"});
+    mTrials[WATER_TRIAL] = TrialInfo(Text{"the Water Trial",  "l'épreuve de l'Eau", "la prueba del agua"});
+    mTrials[SPIRIT_TRIAL] = TrialInfo(Text{"the Spirit Trial", "l'épreuve de l'Esprit", "la prueba del espíritu"});
+    mTrials[SHADOW_TRIAL] = TrialInfo(Text{"the Shadow Trial", "l'épreuve de l'Ombre", "la prueba de las sombras"});
+    mTrials[LIGHT_TRIAL] = TrialInfo(Text{"the Light Trial",  "l'épreuve de la Lumière", "la prueba de la luz"});
+}
+Trials::~Trials() = default;
+
+TrialInfo* Trials::GetTrial(TrialKey key) {
+    return &mTrials[key];
+}
+
+void Trials::SkipAll() {
+    for (TrialInfo& trial : mTrials) {
+        trial.SetAsSkipped();
+    }
+}
+
+void Trials::RequireAll() {
+    for (TrialInfo& trial : mTrials) {
+        trial.SetAsRequired();
+    }
+}
+
+std::array<TrialInfo*, 6> Trials::GetTrialList() {
+    std::array<TrialInfo*, 6> trialList;
+    for (size_t i = 0; i < mTrials.size(); i++) {
+        trialList[i] = &mTrials[i];
+    }
+    return trialList;
+}
+
+size_t Trials::GetTrialListSize() {
+    return mTrials.size();
+}
+void Trials::ParseJson(nlohmann::json spoilerFileJson) {
+    try {
+        nlohmann::json trialsJson = spoilerFileJson["requiredTrials"];
+        for (auto it = trialsJson.begin(); it != trialsJson.end(); it++) {
+            std::string trialName = it.value().template get<std::string>();
+            for (auto& trial : mTrials) {
+                if (trial.GetName() == trialName) {
+                    trial.SetAsRequired();
+                } else {
+                    trial.SetAsSkipped();
+                }
+            }
+        }
+    } catch (const std::exception& e) {
+        throw e;
+    }
+}
+} // namespace Rando
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/trial.h b/soh/soh/Enhancements/randomizer/trial.h
new file mode 100644
index 000000000..54f33463b
--- /dev/null
+++ b/soh/soh/Enhancements/randomizer/trial.h
@@ -0,0 +1,47 @@
+#pragma once
+
+#include "3drando/text.hpp"
+
+#include <array>
+#include <nlohmann/json.hpp>
+
+namespace Rando {
+class TrialInfo {
+  public:
+    TrialInfo(const Text name_);
+    TrialInfo();
+    ~TrialInfo();
+
+    Text GetName() const;
+    bool IsSkipped() const;
+    bool IsRequired() const;
+    void SetAsRequired();
+    void SetAsSkipped();
+  private:
+    Text name;
+    bool skipped = true;
+};
+
+typedef enum {
+    LIGHT_TRIAL,
+    FOREST_TRIAL,
+    FIRE_TRIAL,
+    WATER_TRIAL,
+    SPIRIT_TRIAL,
+    SHADOW_TRIAL,
+} TrialKey;
+
+class Trials {
+  public:
+    Trials();
+    ~Trials();
+    TrialInfo* GetTrial(TrialKey key);
+    void SkipAll();
+    void RequireAll();
+    std::array<TrialInfo*, 6> GetTrialList();
+    size_t GetTrialListSize();
+    void ParseJson(nlohmann::json spoilerFileJson);
+  private:
+    std::array<TrialInfo, 6> mTrials;
+};
+}
\ No newline at end of file
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
index 1225c5270..506df3feb 100644
--- a/soh/soh/OTRGlobals.cpp
+++ b/soh/soh/OTRGlobals.cpp
@@ -41,6 +41,7 @@
 #include "Enhancements/randomizer/randomizer_check_tracker.h"
 #include "Enhancements/randomizer/3drando/random.hpp"
 #include "Enhancements/randomizer/static_data.h"
+#include "Enhancements/randomizer/dungeon.h"
 #include "Enhancements/gameplaystats.h"
 #include "Enhancements/n64_weird_frame_data.inc"
 #include "frame_interpolation.h"
@@ -295,6 +296,8 @@ OTRGlobals::OTRGlobals() {
 
     gSaveStateMgr = std::make_shared<SaveStateMgr>();
     gRandoContext = Rando::Context::CreateInstance();
+    gRandoContext->AddExcludedOptions();
+    gRandoContext->GetSettings()->CreateOptions();
     gRandomizer = std::make_shared<Randomizer>();
 
     hasMasterQuest = hasOriginal = false;
@@ -1144,10 +1147,11 @@ uint32_t IsSceneMasterQuest(s16 sceneNum) {
                 value = 1;
             } else {
                 value = 0;
-                if (IS_RANDO &&
-                    !OTRGlobals::Instance->gRandomizer->masterQuestDungeons.empty() &&
-                    OTRGlobals::Instance->gRandomizer->masterQuestDungeons.contains(sceneNum)) {
-                    value = 1;
+                if (IS_RANDO) {
+                    auto dungeon = OTRGlobals::Instance->gRandoContext->GetDungeons()->GetDungeonFromScene(sceneNum);
+                    if (dungeon != nullptr && dungeon->IsMQ()) {
+                        value = 1;
+                    }
                 }
             }
         }
@@ -1316,7 +1320,12 @@ extern "C" char* ResourceMgr_LoadIfDListByName(const char* filePath) {
 }
 
 extern "C" Sprite* GetSeedTexture(uint8_t index) {
-    return OTRGlobals::Instance->gRandomizer->GetSeedTexture(index);
+
+    return OTRGlobals::Instance->gRandoContext->GetSeedTexture(index);
+}
+
+extern "C" uint8_t GetSeedIconIndex(uint8_t index) {
+    return OTRGlobals::Instance->gRandoContext->hashIconIndexes[index];
 }
 
 extern "C" char* ResourceMgr_LoadPlayerAnimByName(const char* animPath) {
@@ -1938,44 +1947,28 @@ extern "C" int GetEquipNowMessage(char* buffer, char* src, const int maxBufferSi
     return 0;
 }
 
-extern "C" void Randomizer_LoadSettings(const char* spoilerFileName) {
-    OTRGlobals::Instance->gRandomizer->LoadRandomizerSettings(spoilerFileName);
+extern "C" void Randomizer_ParseSpoiler(const char* fileLoc) {
+    OTRGlobals::Instance->gRandoContext->ParseSpoiler(fileLoc, CVarGetInteger("gPlandoMode", 0));
 }
 
-extern "C" void Randomizer_LoadHintLocations(const char* spoilerFileName) {
-    OTRGlobals::Instance->gRandomizer->LoadHintLocations(spoilerFileName);
+extern "C" void Randomizer_LoadHintMessages() {
+    OTRGlobals::Instance->gRandomizer->LoadHintMessages();
 }
 
-extern "C" void Randomizer_LoadMerchantMessages(const char* spoilerFileName) {
-    OTRGlobals::Instance->gRandomizer->LoadMerchantMessages(spoilerFileName);
-}
-
-extern "C" void Randomizer_LoadRequiredTrials(const char* spoilerFileName) {
-    OTRGlobals::Instance->gRandomizer->LoadRequiredTrials(spoilerFileName);
-}
-
-extern "C" void Randomizer_LoadMasterQuestDungeons(const char* spoilerFileName) {
-    OTRGlobals::Instance->gRandomizer->LoadMasterQuestDungeons(spoilerFileName);
-}
-
-extern "C" void Randomizer_LoadItemLocations(const char* spoilerFileName, bool silent) {
-    OTRGlobals::Instance->gRandomizer->LoadItemLocations(spoilerFileName, silent);
+extern "C" void Randomizer_LoadMerchantMessages() {
+    OTRGlobals::Instance->gRandomizer->LoadMerchantMessages();
 }
 
 extern "C" bool Randomizer_IsTrialRequired(RandomizerInf trial) {
     return OTRGlobals::Instance->gRandomizer->IsTrialRequired(trial);
 }
 
-extern "C" void Randomizer_LoadEntranceOverrides(const char* spoilerFileName, bool silent) {
-    OTRGlobals::Instance->gRandomizer->LoadEntranceOverrides(spoilerFileName, silent);
-}
-
 extern "C" u32 SpoilerFileExists(const char* spoilerFileName) {
     return OTRGlobals::Instance->gRandomizer->SpoilerFileExists(spoilerFileName);
 }
 
 extern "C" u8 Randomizer_GetSettingValue(RandomizerSettingKey randoSettingKey) {
-    return OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(randoSettingKey);
+    return OTRGlobals::Instance->gRandoContext->GetOption(randoSettingKey).GetSelectedOptionIndex();
 }
 
 extern "C" RandomizerCheck Randomizer_GetCheckFromActor(s16 actorId, s16 sceneNum, s16 actorParams) {
@@ -2023,6 +2016,38 @@ extern "C" ItemObtainability Randomizer_GetItemObtainabilityFromRandomizerCheck(
     return OTRGlobals::Instance->gRandomizer->GetItemObtainabilityFromRandomizerCheck(randomizerCheck);
 }
 
+extern "C" void Randomizer_GenerateSeed() {
+    std::string seed = "";
+    if (OTRGlobals::Instance->gRandoContext->IsSpoilerLoaded()) {
+        seed = OTRGlobals::Instance->gRandoContext->GetSettings()->GetSeedString();
+    }
+    GenerateRandomizer(seed);
+}
+
+extern "C" uint8_t Randomizer_IsSeedGenerated() {
+    return OTRGlobals::Instance->gRandoContext->IsSeedGenerated() ? 1 : 0;
+}
+
+extern "C" void Randomizer_SetSeedGenerated(bool seedGenerated) {
+    OTRGlobals::Instance->gRandoContext->SetSeedGenerated(seedGenerated);
+}
+
+extern "C" uint8_t Randomizer_IsSpoilerLoaded() {
+    return OTRGlobals::Instance->gRandoContext->IsSpoilerLoaded() ? 1 : 0;
+}
+
+extern "C" void Randomizer_SetSpoilerLoaded(bool spoilerLoaded) {
+    OTRGlobals::Instance->gRandoContext->SetSpoilerLoaded(spoilerLoaded);
+}
+
+extern "C" uint8_t Randomizer_IsPlandoLoaded() {
+    return OTRGlobals::Instance->gRandoContext->IsPlandoLoaded() ? 1 : 0;
+}
+
+extern "C" void Randomizer_SetPlandoLoaded(bool plandoLoaded) {
+    OTRGlobals::Instance->gRandoContext->SetPlandoLoaded(plandoLoaded);
+}
+
 CustomMessage Randomizer_GetCustomGetItemMessage(Player* player) {
     s16 giid;
     if (player->getItemEntry.objectId != OBJECT_INVALID) {
@@ -2057,7 +2082,7 @@ extern "C" int CustomMessage_RetrieveIfExists(PlayState* play) {
                 messageEntry = Randomizer_GetCustomGetItemMessage(player);
             }
         } else if (textId == TEXT_ITEM_DUNGEON_MAP || textId == TEXT_ITEM_COMPASS) {
-            if (DUNGEON_ITEMS_CAN_BE_OUTSIDE_DUNGEON(RSK_STARTING_MAPS_COMPASSES)) {
+            if (DUNGEON_ITEMS_CAN_BE_OUTSIDE_DUNGEON(RSK_SHUFFLE_MAPANDCOMPASS)) {
                 if (textId == TEXT_ITEM_DUNGEON_MAP) {
                     messageEntry = OTRGlobals::Instance->gRandomizer->GetMapGetItemMessageWithHint(player->getItemEntry);
                 } else {
diff --git a/soh/soh/OTRGlobals.h b/soh/soh/OTRGlobals.h
index 5bb88c11e..c9a6d3732 100644
--- a/soh/soh/OTRGlobals.h
+++ b/soh/soh/OTRGlobals.h
@@ -127,24 +127,28 @@ void* getN64WeirdFrame(s32 i);
 int GetEquipNowMessage(char* buffer, char* src, const int maxBufferSize);
 u32 SpoilerFileExists(const char* spoilerFileName);
 Sprite* GetSeedTexture(uint8_t index);
-void Randomizer_LoadSettings(const char* spoilerFileName);
+uint8_t GetSeedIconIndex(uint8_t index);
 u8 Randomizer_GetSettingValue(RandomizerSettingKey randoSettingKey);
 RandomizerCheck Randomizer_GetCheckFromActor(s16 actorId, s16 sceneNum, s16 actorParams);
 ScrubIdentity Randomizer_IdentifyScrub(s32 sceneNum, s32 actorParams, s32 respawnData);
 ShopItemIdentity Randomizer_IdentifyShopItem(s32 sceneNum, u8 slotIndex);
 CowIdentity Randomizer_IdentifyCow(s32 sceneNum, s32 posX, s32 posZ);
-void Randomizer_LoadHintLocations(const char* spoilerFileName);
-void Randomizer_LoadMerchantMessages(const char* spoilerFileName);
-void Randomizer_LoadRequiredTrials(const char* spoilerFileName);
-void Randomizer_LoadMasterQuestDungeons(const char* spoilerFileName);
-void Randomizer_LoadItemLocations(const char* spoilerFileName, bool silent);
-void Randomizer_LoadEntranceOverrides(const char* spoilerFileName, bool silent);
+void Randomizer_ParseSpoiler(const char* fileLoc);
+void Randomizer_LoadHintMessages();
+void Randomizer_LoadMerchantMessages();
 bool Randomizer_IsTrialRequired(RandomizerInf trial);
 GetItemEntry Randomizer_GetItemFromActor(s16 actorId, s16 sceneNum, s16 actorParams, GetItemID ogId);
 GetItemEntry Randomizer_GetItemFromActorWithoutObtainabilityCheck(s16 actorId, s16 sceneNum, s16 actorParams, GetItemID ogId);
 GetItemEntry Randomizer_GetItemFromKnownCheck(RandomizerCheck randomizerCheck, GetItemID ogId);
 GetItemEntry Randomizer_GetItemFromKnownCheckWithoutObtainabilityCheck(RandomizerCheck randomizerCheck, GetItemID ogId);
 ItemObtainability Randomizer_GetItemObtainabilityFromRandomizerCheck(RandomizerCheck randomizerCheck);
+void Randomizer_GenerateSeed();
+uint8_t Randomizer_IsSeedGenerated();
+void Randomizer_SetSeedGenerated(bool seedGenerated);
+uint8_t Randomizer_IsSpoilerLoaded();
+void Randomizer_SetSpoilerLoaded(bool spoilerLoaded);
+uint8_t Randomizer_IsPlandoLoaded();
+void Randomizer_SetPlandoLoaded(bool plandoLoaded);
 int CustomMessage_RetrieveIfExists(PlayState* play);
 void Overlay_DisplayText(float duration, const char* text);
 void Overlay_DisplayText_Seconds(int seconds, const char* text);
diff --git a/soh/soh/SaveManager.cpp b/soh/soh/SaveManager.cpp
index 235a7bd5f..a3ce45d29 100644
--- a/soh/soh/SaveManager.cpp
+++ b/soh/soh/SaveManager.cpp
@@ -1,6 +1,10 @@
 #include "SaveManager.h"
 #include "OTRGlobals.h"
 #include "Enhancements/game-interactor/GameInteractor.h"
+#include "Enhancements/randomizer/context.h"
+#include "Enhancements/randomizer/entrance.h"
+#include "Enhancements/randomizer/dungeon.h"
+#include "Enhancements/randomizer/trial.h"
 #include "soh/util.h"
 
 #include "z64.h"
@@ -61,7 +65,8 @@ SaveManager::SaveManager() {
 
     AddLoadFunction("randomizer", 1, LoadRandomizerVersion1);
     AddLoadFunction("randomizer", 2, LoadRandomizerVersion2);
-    AddSaveFunction("randomizer", 2, SaveRandomizer, true, SECTION_PARENT_NONE);
+    AddLoadFunction("randomizer", 3, LoadRandomizerVersion3);
+    AddSaveFunction("randomizer", 3, SaveRandomizer, true, SECTION_PARENT_NONE);
 
     AddInitFunction(InitFileImpl);
 
@@ -92,47 +97,65 @@ SaveManager::SaveManager() {
 }
 
 void SaveManager::LoadRandomizerVersion1() {
-    for (int i = 0; i < ARRAY_COUNT(gSaveContext.itemLocations); i++) {
+    auto randoContext = Rando::Context::GetInstance();
+    RandomizerCheck location = RC_UNKNOWN_CHECK;
+    for (int i = 0; i < RC_MAX; i++) {
+        SaveManager::Instance->LoadData("check" + std::to_string(i), location);
         SaveManager::Instance->LoadStruct("get" + std::to_string(i), [&]() {
-            SaveManager::Instance->LoadData("rgID", gSaveContext.itemLocations[i].get.rgID);
-            SaveManager::Instance->LoadData("fakeRgID", gSaveContext.itemLocations[i].get.fakeRgID);
-            SaveManager::Instance->LoadCharArray("trickName", gSaveContext.itemLocations[i].get.trickName,
-                                                 MAX_TRICK_NAME_SIZE);
+            SaveManager::Instance->LoadData("rgID", randoContext->GetItemLocation(location)->RefPlacedItem());
+            if (randoContext->GetItemLocation(location)->GetPlacedRandomizerGet() == RG_ICE_TRAP) {
+                randoContext->overrides[location].SetLocation(location);
+                SaveManager::Instance->LoadData("fakeRgID", randoContext->overrides[location].RefLooksLike());
+                SaveManager::Instance->LoadData("trickName", randoContext->overrides[location].GetTrickName().english);
+                SaveManager::Instance->LoadData("trickName", randoContext->overrides[location].GetTrickName().french);
+            }
         });
-        SaveManager::Instance->LoadData("check" + std::to_string(i), gSaveContext.itemLocations[i].check);
     }
 
-    for (int i = 0; i < ARRAY_COUNT(gSaveContext.seedIcons); i++) {
-        SaveManager::Instance->LoadData("seed" + std::to_string(i), gSaveContext.seedIcons[i]);
+    for (int i = 0; i < randoContext->hashIconIndexes.size(); i++) {
+        SaveManager::Instance->LoadData("seed" + std::to_string(i), randoContext->hashIconIndexes[i]);
     }
 
-    for (int i = 0; i < ARRAY_COUNT(gSaveContext.randoSettings); i++) {
-        SaveManager::Instance->LoadData("sk" + std::to_string(i), gSaveContext.randoSettings[i].key);
-        SaveManager::Instance->LoadData("sv" + std::to_string(i), gSaveContext.randoSettings[i].value);
+    for (int i = 0; i < RSK_MAX; i++) {
+        int key, value;
+        SaveManager::Instance->LoadData("sk" + std::to_string(i), key);
+        SaveManager::Instance->LoadData("sv" + std::to_string(i), value);
+        randoContext->GetOption(RandomizerSettingKey(key)).SetSelectedIndex(value);
     }
 
-    for (int i = 0; i < ARRAY_COUNT(gSaveContext.hintLocations); i++) {
-        SaveManager::Instance->LoadData("hc" + std::to_string(i), gSaveContext.hintLocations[i].check);
-        for (int j = 0; j < ARRAY_COUNT(gSaveContext.hintLocations[i].hintText); j++) {
-            SaveManager::Instance->LoadData("ht" + std::to_string(i) + "-" + std::to_string(j), gSaveContext.hintLocations[i].hintText[j]);
+    for (int i = 0; i < 50; i++) {
+        RandomizerCheck check;
+        char hintText[200];
+        SaveManager::Instance->LoadData("hc" + std::to_string(i), check);
+        for (int j = 0; j < ARRAY_COUNT(hintText); j++) {
+            SaveManager::Instance->LoadData("ht" + std::to_string(i) + "-" + std::to_string(j), hintText[j]);
         }
+        randoContext->AddHint(RandomizerHintKey(check - RC_COLOSSUS_GOSSIP_STONE + 1), Text(hintText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text());
     }
 
-    for (int i = 0; i < ARRAY_COUNT(gSaveContext.childAltarText); i++) {
-        SaveManager::Instance->LoadData("cat" + std::to_string(i), gSaveContext.childAltarText[i]);
+    char childAltarText[250];
+    for (int i = 0; i < ARRAY_COUNT(childAltarText); i++) {
+        SaveManager::Instance->LoadData("cat" + std::to_string(i), childAltarText[i]);
     }
+    randoContext->AddHint(RH_ALTAR_CHILD, Text(childAltarText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text());
 
-    for (int i = 0; i < ARRAY_COUNT(gSaveContext.adultAltarText); i++) {
-        SaveManager::Instance->LoadData("aat" + std::to_string(i), gSaveContext.adultAltarText[i]);
+    char adultAltarText[750];
+    for (int i = 0; i < ARRAY_COUNT(adultAltarText); i++) {
+        SaveManager::Instance->LoadData("aat" + std::to_string(i), adultAltarText[i]);
     }
+    randoContext->AddHint(RH_ALTAR_ADULT, Text(adultAltarText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text());
 
-    for (int i = 0; i < ARRAY_COUNT(gSaveContext.ganonHintText); i++) {
-        SaveManager::Instance->LoadData("ght" + std::to_string(i), gSaveContext.ganonHintText[i]);
+    char ganonHintText[150];
+    for (int i = 0; i < ARRAY_COUNT(ganonHintText); i++) {
+        SaveManager::Instance->LoadData("ght" + std::to_string(i), ganonHintText[i]);
     }
+    randoContext->AddHint(RH_GANONDORF_HINT, Text(ganonHintText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text());
 
-    for (int i = 0; i < ARRAY_COUNT(gSaveContext.ganonText); i++) {
-        SaveManager::Instance->LoadData("gt" + std::to_string(i), gSaveContext.ganonText[i]);
+    char ganonText[250];
+    for (int i = 0; i < ARRAY_COUNT(ganonText); i++) {
+        SaveManager::Instance->LoadData("gt" + std::to_string(i), ganonText[i]);
     }
+    randoContext->AddHint(RH_GANONDORF_NOHINT, Text(ganonText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text());
 
     SaveManager::Instance->LoadData("adultTradeItems", gSaveContext.adultTradeItems);
 
@@ -140,14 +163,12 @@ void SaveManager::LoadRandomizerVersion1() {
 
     SaveManager::Instance->LoadData("pendingIceTrapCount", gSaveContext.pendingIceTrapCount);
 
-    std::shared_ptr<Randomizer> randomizer = OTRGlobals::Instance->gRandomizer;
 
-    randomizer->LoadRandomizerSettings("");
     size_t merchantPricesSize = 0;
-    if (randomizer->GetRandoSettingValue(RSK_SHUFFLE_SCRUBS) != RO_SCRUBS_OFF) {
+    if (randoContext->GetOption(RSK_SHUFFLE_SCRUBS).Is(RO_SCRUBS_OFF)) {
         merchantPricesSize += NUM_SCRUBS;
     }
-    if (randomizer->GetRandoSettingValue(RSK_SHOPSANITY) != RO_SHOPSANITY_OFF) {
+    if (randoContext->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_OFF)) {
         merchantPricesSize += NUM_SHOP_ITEMS;
     }
 
@@ -157,84 +178,107 @@ void SaveManager::LoadRandomizerVersion1() {
             SaveManager::Instance->LoadData("check", rc);
             uint32_t price;
             SaveManager::Instance->LoadData("price", price);
-            randomizer->merchantPrices[rc] = price;
+            randoContext->GetItemLocation(rc)->SetCustomPrice(price);
         });
     });
 }
 
 void SaveManager::LoadRandomizerVersion2() {
+    auto randoContext = Rando::Context::GetInstance();
     SaveManager::Instance->LoadArray("itemLocations", RC_MAX, [&](size_t i) {
-        gSaveContext.itemLocations[i].check = RandomizerCheck(i);
         SaveManager::Instance->LoadStruct("", [&]() {
-            SaveManager::Instance->LoadData("rgID", gSaveContext.itemLocations[i].get.rgID);
-            SaveManager::Instance->LoadData("fakeRgID", gSaveContext.itemLocations[i].get.fakeRgID);
-            SaveManager::Instance->LoadCharArray("trickName", gSaveContext.itemLocations[i].get.trickName,
-                                                 MAX_TRICK_NAME_SIZE);
+            SaveManager::Instance->LoadData("rgID", randoContext->GetItemLocation(i)->RefPlacedItem());
+            RandomizerGet rg = RG_NONE;
+            SaveManager::Instance->LoadData("fakeRgID", rg, RG_NONE);
+            if (rg != RG_NONE) {
+                randoContext->overrides[static_cast<RandomizerCheck>(i)] = Rando::ItemOverride(static_cast<RandomizerCheck>(i), rg);
+                SaveManager::Instance->LoadData("trickName", randoContext->overrides[static_cast<RandomizerCheck>(i)].GetTrickName().english);
+                SaveManager::Instance->LoadData("trickName", randoContext->overrides[static_cast<RandomizerCheck>(i)].GetTrickName().french);
+            }
         });
     });
 
-    SaveManager::Instance->LoadArray("entrances", ARRAY_COUNT(gSaveContext.entranceOverrides), [&](size_t i) {
+    auto entranceCtx = randoContext->GetEntranceShuffler();
+    SaveManager::Instance->LoadArray("entrances", ARRAY_COUNT(entranceCtx->entranceOverrides), [&](size_t i) {
         SaveManager::Instance->LoadStruct("", [&]() {
-            SaveManager::Instance->LoadData("index", gSaveContext.entranceOverrides[i].index);
-            SaveManager::Instance->LoadData("destination", gSaveContext.entranceOverrides[i].destination);
-            SaveManager::Instance->LoadData("blueWarp", gSaveContext.entranceOverrides[i].blueWarp);
-            SaveManager::Instance->LoadData("override", gSaveContext.entranceOverrides[i].override);
-            SaveManager::Instance->LoadData("overrideDestination", gSaveContext.entranceOverrides[i].overrideDestination);
+            SaveManager::Instance->LoadData("index", entranceCtx->entranceOverrides[i].index);
+            SaveManager::Instance->LoadData("destination", entranceCtx->entranceOverrides[i].destination);
+            SaveManager::Instance->LoadData("blueWarp", entranceCtx->entranceOverrides[i].blueWarp);
+            SaveManager::Instance->LoadData("override", entranceCtx->entranceOverrides[i].override);
+            SaveManager::Instance->LoadData("overrideDestination", entranceCtx->entranceOverrides[i].overrideDestination);
         });
     });
 
-    SaveManager::Instance->LoadArray("seed", ARRAY_COUNT(gSaveContext.seedIcons), [&](size_t i) {
-        SaveManager::Instance->LoadData("", gSaveContext.seedIcons[i]);
+    SaveManager::Instance->LoadArray("seed", randoContext->hashIconIndexes.size(), [&](size_t i) {
+        SaveManager::Instance->LoadData("", randoContext->hashIconIndexes[i]);
     });
 
     std::string inputSeed;
-    SaveManager::Instance->LoadCharArray("inputSeed", gSaveContext.inputSeed, ARRAY_COUNT(gSaveContext.inputSeed));
+    SaveManager::Instance->LoadData("inputSeed", inputSeed);
+    randoContext->GetSettings()->SetSeedString(inputSeed);
 
-    SaveManager::Instance->LoadData("finalSeed", gSaveContext.finalSeed);
+    uint32_t finalSeed;
+    SaveManager::Instance->LoadData("finalSeed", finalSeed);
+    randoContext->GetSettings()->SetSeed(finalSeed);
 
     SaveManager::Instance->LoadArray("randoSettings", RSK_MAX, [&](size_t i) {
-        gSaveContext.randoSettings[i].key = RandomizerSettingKey(i);
-        SaveManager::Instance->LoadData("", gSaveContext.randoSettings[i].value);
+        int value = 0;
+        SaveManager::Instance->LoadData("", value);
+        randoContext->GetOption(RandomizerSettingKey(i)).SetSelectedIndex(value);
     });
 
-    SaveManager::Instance->LoadArray("hintLocations", ARRAY_COUNT(gSaveContext.hintLocations), [&](size_t i) {
+    SaveManager::Instance->LoadArray("hintLocations", RH_ZR_OPEN_GROTTO_GOSSIP_STONE + 1, [&](size_t i) {
         SaveManager::Instance->LoadStruct("", [&]() {
-            SaveManager::Instance->LoadData("check", gSaveContext.hintLocations[i].check);
-            SaveManager::Instance->LoadCharArray("hintText", gSaveContext.hintLocations[i].hintText,
-                                                 ARRAY_COUNT(gSaveContext.hintLocations[i].hintText));
+            RandomizerCheck rc = RC_UNKNOWN_CHECK;
+            SaveManager::Instance->LoadData("check", rc);
+            std::string hintText;
+            SaveManager::Instance->LoadData("hintText", hintText);
+            randoContext->AddHint(RandomizerHintKey(rc - RC_COLOSSUS_GOSSIP_STONE + 1), Text(hintText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text());
         });
     });
 
-    SaveManager::Instance->LoadCharArray("childAltarText", gSaveContext.childAltarText,
-                                         ARRAY_COUNT(gSaveContext.childAltarText));
-    SaveManager::Instance->LoadCharArray("adultAltarText", gSaveContext.adultAltarText,
-                                         ARRAY_COUNT(gSaveContext.adultAltarText));
-
-    SaveManager::Instance->LoadCharArray("ganonHintText", gSaveContext.ganonHintText,
-                                         ARRAY_COUNT(gSaveContext.ganonHintText));
-    SaveManager::Instance->LoadCharArray("ganonText", gSaveContext.ganonText, ARRAY_COUNT(gSaveContext.ganonText));
-
-    SaveManager::Instance->LoadCharArray("dampeText", gSaveContext.dampeText, ARRAY_COUNT(gSaveContext.dampeText));
-
-    SaveManager::Instance->LoadCharArray("gregHintText", gSaveContext.gregHintText,
-                                         ARRAY_COUNT(gSaveContext.gregHintText));
-
-    SaveManager::Instance->LoadCharArray("sheikText", gSaveContext.sheikText, ARRAY_COUNT(gSaveContext.sheikText));
-
-    SaveManager::Instance->LoadCharArray("sariaText", gSaveContext.sariaText, ARRAY_COUNT(gSaveContext.sariaText));
-
-    SaveManager::Instance->LoadCharArray("warpMinuetText", gSaveContext.warpMinuetText,
-                                         ARRAY_COUNT(gSaveContext.warpMinuetText));
-    SaveManager::Instance->LoadCharArray("warpBoleroText", gSaveContext.warpBoleroText,
-                                         ARRAY_COUNT(gSaveContext.warpBoleroText));
-    SaveManager::Instance->LoadCharArray("warpSerenadeText", gSaveContext.warpSerenadeText,
-                                         ARRAY_COUNT(gSaveContext.warpSerenadeText));
-    SaveManager::Instance->LoadCharArray("warpRequiemText", gSaveContext.warpRequiemText,
-                                         ARRAY_COUNT(gSaveContext.warpRequiemText));
-    SaveManager::Instance->LoadCharArray("warpNocturneText", gSaveContext.warpNocturneText,
-                                         ARRAY_COUNT(gSaveContext.warpNocturneText));
-    SaveManager::Instance->LoadCharArray("warpPreludeText", gSaveContext.warpPreludeText,
-                                         ARRAY_COUNT(gSaveContext.warpPreludeText));
+    std::string childAltarText;
+    SaveManager::Instance->LoadData("childAltarText", childAltarText);
+    randoContext->AddHint(RH_ALTAR_CHILD, Text(childAltarText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text());
+    std::string adultAltarText;
+    SaveManager::Instance->LoadData("adultAltarText", adultAltarText);
+    randoContext->AddHint(RH_ALTAR_ADULT, Text(adultAltarText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text());
+    std::string ganonHintText;
+    SaveManager::Instance->LoadData("ganonHintText", ganonHintText);
+    randoContext->AddHint(RH_GANONDORF_HINT, Text(ganonHintText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text());
+    std::string ganonText;
+    SaveManager::Instance->LoadData("ganonText", ganonText);
+    randoContext->AddHint(RH_GANONDORF_NOHINT, Text(ganonText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text());
+    std::string dampeText;
+    SaveManager::Instance->LoadData("dampeText", dampeText);
+    randoContext->AddHint(RH_DAMPES_DIARY, Text(dampeText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text());
+    std::string gregHintText;
+    SaveManager::Instance->LoadData("gregHintText", gregHintText);
+    randoContext->AddHint(RH_GREG_RUPEE, Text(gregHintText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text());
+    std::string sheikText;
+    SaveManager::Instance->LoadData("sheikText", sheikText);
+    randoContext->AddHint(RH_SHEIK_LIGHT_ARROWS, Text(sheikText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text());
+    std::string sariaText;
+    SaveManager::Instance->LoadData("sariaText", sariaText);
+    randoContext->AddHint(RH_SARIA, Text(sariaText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text());
+    std::string warpMinuetText;
+    SaveManager::Instance->LoadData("warpMinuetText", warpMinuetText);
+    randoContext->AddHint(RH_MINUET_WARP_LOC, Text(warpMinuetText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text(warpMinuetText));
+    std::string warpBoleroText;
+    SaveManager::Instance->LoadData("warpBoleroText", warpBoleroText);
+    randoContext->AddHint(RH_BOLERO_WARP_LOC, Text(warpBoleroText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text(warpBoleroText));
+    std::string warpSerenadeText;
+    SaveManager::Instance->LoadData("warpSerenadeText", warpSerenadeText);
+    randoContext->AddHint(RH_SERENADE_WARP_LOC, Text(warpSerenadeText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text(warpSerenadeText));
+    std::string warpRequiemText;
+    SaveManager::Instance->LoadData("warpRequiemText", warpRequiemText);
+    randoContext->AddHint(RH_REQUIEM_WARP_LOC, Text(warpRequiemText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text(warpRequiemText));
+    std::string warpNocturneText;
+    SaveManager::Instance->LoadData("warpNocturneText", warpNocturneText);
+    randoContext->AddHint(RH_NOCTURNE_WARP_LOC, Text(warpNocturneText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text(warpNocturneText));
+    std::string warpPreludeText;
+    SaveManager::Instance->LoadData("warpPreludeText", warpPreludeText);
+    randoContext->AddHint(RH_PRELUDE_WARP_LOC, Text(warpPreludeText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text(warpPreludeText));
 
     SaveManager::Instance->LoadData("adultTradeItems", gSaveContext.adultTradeItems);
 
@@ -244,8 +288,6 @@ void SaveManager::LoadRandomizerVersion2() {
 
     std::shared_ptr<Randomizer> randomizer = OTRGlobals::Instance->gRandomizer;
 
-    randomizer->LoadRandomizerSettings("");
-
     size_t merchantPricesSize = 0;
     SaveManager::Instance->LoadData("merchantPricesSize", merchantPricesSize);
 
@@ -255,76 +297,194 @@ void SaveManager::LoadRandomizerVersion2() {
             SaveManager::Instance->LoadData("check", rc);
             uint32_t price;
             SaveManager::Instance->LoadData("price", price);
-            randomizer->merchantPrices[rc] = price;
+            randoContext->GetItemLocation(rc)->SetCustomPrice(price);
         });
     });
 
-    SaveManager::Instance->LoadData("masterQuestDungeonCount", gSaveContext.mqDungeonCount, (uint8_t)0);
+    size_t mqDungeonCount;
+    SaveManager::Instance->LoadData("masterQuestDungeonCount", mqDungeonCount, (size_t)0);
 
-    OTRGlobals::Instance->gRandomizer->masterQuestDungeons.clear();
-    SaveManager::Instance->LoadArray("masterQuestDungeons", gSaveContext.mqDungeonCount, [&](size_t i) {
+    randoContext->GetDungeons()->ClearAllMQ();
+    SaveManager::Instance->LoadArray("masterQuestDungeons", mqDungeonCount, [&](size_t i) {
         uint16_t scene;
         SaveManager::Instance->LoadData("", scene);
-        randomizer->masterQuestDungeons.emplace(scene);
+        randoContext->GetDungeons()->GetDungeonFromScene(SceneID(scene))->SetMQ();
+    });
+}
+
+void SaveManager::LoadRandomizerVersion3() {
+    auto randoContext = Rando::Context::GetInstance();
+    SaveManager::Instance->LoadArray("itemLocations", RC_MAX, [&](size_t i) {
+        SaveManager::Instance->LoadStruct("", [&]() {
+            SaveManager::Instance->LoadData("rgID", randoContext->GetItemLocation(i)->RefPlacedItem());
+            RandomizerGet rg = RG_NONE;
+            SaveManager::Instance->LoadData("fakeRgID", rg, RG_NONE);
+            if (rg != RG_NONE) {
+                randoContext->overrides[static_cast<RandomizerCheck>(i)] =
+                    Rando::ItemOverride(static_cast<RandomizerCheck>(i), rg);
+                SaveManager::Instance->LoadStruct("trickName", [&]() {
+                    SaveManager::Instance->LoadData(
+                        "english", randoContext->overrides[static_cast<RandomizerCheck>(i)].GetTrickName().english);
+                    SaveManager::Instance->LoadData(
+                        "french", randoContext->overrides[static_cast<RandomizerCheck>(i)].GetTrickName().french);
+                });
+            }
+            uint16_t price = 0; 
+            SaveManager::Instance->LoadData("price", price, (uint16_t)0);
+            if (price > 0) {
+                // Technically an item with a custom price (scrub/shopsanity) could have
+                // a 0 rupee price, meaning it would not be loaded after the first save and
+                // disappear from the save file. However, this is fine, as the default price on
+                // all ItemLocations is 0 anyway.
+                randoContext->GetItemLocation(i)->SetCustomPrice(price);
+            }
+        });
+    });
+
+    auto entranceCtx = randoContext->GetEntranceShuffler();
+    SaveManager::Instance->LoadArray("entrances", ARRAY_COUNT(entranceCtx->entranceOverrides), [&](size_t i) {
+        SaveManager::Instance->LoadStruct("", [&]() {
+            SaveManager::Instance->LoadData("index", entranceCtx->entranceOverrides[i].index);
+            SaveManager::Instance->LoadData("destination", entranceCtx->entranceOverrides[i].destination);
+            SaveManager::Instance->LoadData("blueWarp", entranceCtx->entranceOverrides[i].blueWarp);
+            SaveManager::Instance->LoadData("override", entranceCtx->entranceOverrides[i].override);
+            SaveManager::Instance->LoadData("overrideDestination",
+                                            entranceCtx->entranceOverrides[i].overrideDestination);
+        });
+    });
+
+    SaveManager::Instance->LoadArray("seed", randoContext->hashIconIndexes.size(), [&](size_t i) {
+        SaveManager::Instance->LoadData("", randoContext->hashIconIndexes[i]);
+    });
+
+    std::string inputSeed;
+    SaveManager::Instance->LoadData("inputSeed", inputSeed);
+    randoContext->GetSettings()->SetSeedString(inputSeed);
+
+    uint32_t finalSeed;
+    SaveManager::Instance->LoadData("finalSeed", finalSeed);
+    randoContext->GetSettings()->SetSeed(finalSeed);
+
+    SaveManager::Instance->LoadArray("randoSettings", RSK_MAX, [&](size_t i) {
+        int value = 0;
+        SaveManager::Instance->LoadData("", value);
+        randoContext->GetOption(RandomizerSettingKey(i)).SetSelectedIndex(value);
+    });
+
+    SaveManager::Instance->LoadArray("hintLocations", RH_MAX, [&](size_t i) {
+        SaveManager::Instance->LoadStruct("", [&]() {
+            RandomizerHintKey rhk = RH_NONE;
+            SaveManager::Instance->LoadData("hintKey", rhk);
+            std::string english, french;
+            SaveManager::Instance->LoadStruct("hintText", [&]() {
+                SaveManager::Instance->LoadData("english", english);
+                SaveManager::Instance->LoadData("french", french);
+                // TODO: German Hint Translations
+            });
+            RandomizerCheck rc = RC_UNKNOWN_CHECK;
+            SaveManager::Instance->LoadData("hintedCheck", rc);
+            HintType ht = HINT_TYPE_STATIC;
+            SaveManager::Instance->LoadData("hintType", ht);
+            std::string englishRegion, frenchRegion;
+            SaveManager::Instance->LoadStruct("hintedRegion", [&]() {
+                SaveManager::Instance->LoadData("english", englishRegion);
+                SaveManager::Instance->LoadData("french", frenchRegion);
+            });
+            randoContext->AddHint(rhk, Text(english, french, english), rc, ht, Text(englishRegion, frenchRegion, englishRegion));
+        });
+    });
+
+    SaveManager::Instance->LoadData("adultTradeItems", gSaveContext.adultTradeItems);
+
+    SaveManager::Instance->LoadData("triforcePiecesCollected", gSaveContext.triforcePiecesCollected);
+
+    SaveManager::Instance->LoadData("pendingIceTrapCount", gSaveContext.pendingIceTrapCount);
+
+    std::shared_ptr<Randomizer> randomizer = OTRGlobals::Instance->gRandomizer;
+
+    size_t mqDungeonCount;
+    SaveManager::Instance->LoadData("masterQuestDungeonCount", mqDungeonCount, (size_t)0);
+
+    randoContext->GetDungeons()->ClearAllMQ();
+    SaveManager::Instance->LoadArray("masterQuestDungeons", mqDungeonCount, [&](size_t i) {
+        size_t dungeonId;
+        SaveManager::Instance->LoadData("", dungeonId);
+        randoContext->GetDungeon(dungeonId)->SetMQ();
+    });
+
+    randoContext->GetTrials()->SkipAll();
+    SaveManager::Instance->LoadArray("requiredTrials", randoContext->GetOption(RSK_TRIAL_COUNT).GetSelectedOptionIndex()+1, [&](size_t i) {
+        size_t trialId;
+        SaveManager::Instance->LoadData("", trialId);
+        randoContext->GetTrial(trialId)->SetAsRequired();
     });
 }
 
 void SaveManager::SaveRandomizer(SaveContext* saveContext, int sectionID, bool fullSave) {
 
     if(saveContext->questId != QUEST_RANDOMIZER) return;
+    auto randoContext = Rando::Context::GetInstance();
 
     SaveManager::Instance->SaveArray("itemLocations", RC_MAX, [&](size_t i) {
         SaveManager::Instance->SaveStruct("", [&]() {
-            SaveManager::Instance->SaveData("rgID", saveContext->itemLocations[i].get.rgID);
-            SaveManager::Instance->SaveData("fakeRgID", saveContext->itemLocations[i].get.fakeRgID);
-            SaveManager::Instance->SaveData("trickName", saveContext->itemLocations[i].get.trickName);
+            SaveManager::Instance->SaveData("rgID", randoContext->GetItemLocation(i)->GetPlacedRandomizerGet());
+            if (randoContext->GetItemLocation(i)->GetPlacedRandomizerGet() == RG_ICE_TRAP) {
+                SaveManager::Instance->SaveData("fakeRgID", randoContext->overrides[static_cast<RandomizerCheck>(i)].LooksLike());
+                SaveManager::Instance->SaveStruct("trickName", [&]() {
+                    SaveManager::Instance->SaveData("english", randoContext->overrides[static_cast<RandomizerCheck>(i)].GetTrickName().GetEnglish());
+                    SaveManager::Instance->SaveData("french", randoContext->overrides[static_cast<RandomizerCheck>(i)].GetTrickName().GetFrench());
+                    // TODO: German (trick names don't have german translations yet)
+                });
+            }
+            if (randoContext->GetItemLocation(i)->HasCustomPrice()) {
+                SaveManager::Instance->SaveData("price", randoContext->GetItemLocation(i)->GetPrice());
+            }
         });
     });
 
-    SaveManager::Instance->SaveArray("entrances", ARRAY_COUNT(saveContext->entranceOverrides), [&](size_t i) {
+    auto entranceCtx = randoContext->GetEntranceShuffler();
+    SaveManager::Instance->SaveArray("entrances", ARRAY_COUNT(entranceCtx->entranceOverrides), [&](size_t i) {
         SaveManager::Instance->SaveStruct("", [&]() {
-            SaveManager::Instance->SaveData("index", saveContext->entranceOverrides[i].index);
-            SaveManager::Instance->SaveData("destination", saveContext->entranceOverrides[i].destination);
-            SaveManager::Instance->SaveData("blueWarp", saveContext->entranceOverrides[i].blueWarp);
-            SaveManager::Instance->SaveData("override", saveContext->entranceOverrides[i].override);
-            SaveManager::Instance->SaveData("overrideDestination", saveContext->entranceOverrides[i].overrideDestination);
+            SaveManager::Instance->SaveData("index", entranceCtx->entranceOverrides[i].index);
+            SaveManager::Instance->SaveData("destination", entranceCtx->entranceOverrides[i].destination);
+            SaveManager::Instance->SaveData("blueWarp", entranceCtx->entranceOverrides[i].blueWarp);
+            SaveManager::Instance->SaveData("override", entranceCtx->entranceOverrides[i].override);
+            SaveManager::Instance->SaveData("overrideDestination", entranceCtx->entranceOverrides[i].overrideDestination);
         });
     });
 
-    SaveManager::Instance->SaveArray("seed", ARRAY_COUNT(saveContext->seedIcons), [&](size_t i) {
-        SaveManager::Instance->SaveData("", saveContext->seedIcons[i]);
+    SaveManager::Instance->SaveArray("seed", randoContext->hashIconIndexes.size(), [&](size_t i) {
+        SaveManager::Instance->SaveData("", randoContext->hashIconIndexes[i]);
     });
 
-    SaveManager::Instance->SaveData("inputSeed", saveContext->inputSeed);
+    SaveManager::Instance->SaveData("inputSeed", randoContext->GetSettings()->GetSeedString());
 
-    SaveManager::Instance->SaveData("finalSeed", saveContext->finalSeed);
+    SaveManager::Instance->SaveData("finalSeed", randoContext->GetSettings()->GetSeed());
 
     SaveManager::Instance->SaveArray("randoSettings", RSK_MAX, [&](size_t i) {
-        SaveManager::Instance->SaveData("", saveContext->randoSettings[i].value);
+        SaveManager::Instance->SaveData("", randoContext->GetOption((RandomizerSettingKey(i))).GetSelectedOptionIndex());
     });
 
-    SaveManager::Instance->SaveArray("hintLocations", ARRAY_COUNT(saveContext->hintLocations), [&](size_t i) {
+    SaveManager::Instance->SaveArray("hintLocations", RH_MAX, [&](size_t i) {
         SaveManager::Instance->SaveStruct("", [&]() {
-            SaveManager::Instance->SaveData("check", saveContext->hintLocations[i].check);
-            SaveManager::Instance->SaveData("hintText", saveContext->hintLocations[i].hintText);
+            auto hint = randoContext->GetHint(RandomizerHintKey(i));
+            SaveManager::Instance->SaveData("hintKey", RandomizerHintKey(i));
+            SaveManager::Instance->SaveStruct("hintText", [&]() {
+                SaveManager::Instance->SaveData("english", hint->GetText().GetEnglish());
+                SaveManager::Instance->SaveData("french", hint->GetText().GetFrench());
+                SaveManager::Instance->SaveData("german", hint->GetText().GetEnglish());
+                // TODO: German Translation of hints
+            });
+            SaveManager::Instance->SaveData("hintedCheck", hint->GetHintedLocation());
+            SaveManager::Instance->SaveData("hintType", hint->GetHintType());
+            SaveManager::Instance->SaveStruct("hintedRegion", [&]() {
+                SaveManager::Instance->SaveData("english", hint->GetHintedRegionText().GetEnglish());
+                SaveManager::Instance->SaveData("french", hint->GetHintedRegionText().GetFrench());
+                SaveManager::Instance->SaveData("german", hint->GetHintedRegionText().GetEnglish());
+            });
         });
     });
 
-    SaveManager::Instance->SaveData("childAltarText", saveContext->childAltarText);
-    SaveManager::Instance->SaveData("adultAltarText", saveContext->adultAltarText);
-    SaveManager::Instance->SaveData("ganonHintText", saveContext->ganonHintText);
-    SaveManager::Instance->SaveData("ganonText", saveContext->ganonText);
-    SaveManager::Instance->SaveData("dampeText", saveContext->dampeText);
-    SaveManager::Instance->SaveData("gregHintText", saveContext->gregHintText);
-    SaveManager::Instance->SaveData("sheikText", saveContext->sheikText);
-    SaveManager::Instance->SaveData("sariaText", saveContext->sariaText);
-    SaveManager::Instance->SaveData("warpMinuetText", saveContext->warpMinuetText);
-    SaveManager::Instance->SaveData("warpBoleroText", saveContext->warpBoleroText);
-    SaveManager::Instance->SaveData("warpSerenadeText", saveContext->warpSerenadeText);
-    SaveManager::Instance->SaveData("warpRequiemText", saveContext->warpRequiemText);
-    SaveManager::Instance->SaveData("warpNocturneText", saveContext->warpNocturneText);
-    SaveManager::Instance->SaveData("warpPreludeText", saveContext->warpPreludeText);
-
     SaveManager::Instance->SaveData("adultTradeItems", saveContext->adultTradeItems);
 
     SaveManager::Instance->SaveData("triforcePiecesCollected", saveContext->triforcePiecesCollected);
@@ -333,27 +493,18 @@ void SaveManager::SaveRandomizer(SaveContext* saveContext, int sectionID, bool f
 
     std::shared_ptr<Randomizer> randomizer = OTRGlobals::Instance->gRandomizer;
 
-    std::vector<std::pair<RandomizerCheck, u16>> merchantPrices;
-    for (const auto & [ check, price ] : randomizer->merchantPrices) {
-        merchantPrices.push_back(std::make_pair(check, price));
-    }
+    SaveManager::Instance->SaveData("masterQuestDungeonCount", randoContext->GetDungeons()->CountMQ());
 
-    SaveManager::Instance->SaveData("merchantPricesSize", merchantPrices.size());
-    SaveManager::Instance->SaveArray("merchantPrices", merchantPrices.size(), [&](size_t i) {
-        SaveManager::Instance->SaveStruct("", [&]() {
-            SaveManager::Instance->SaveData("check", merchantPrices[i].first);
-            SaveManager::Instance->SaveData("price", merchantPrices[i].second);
-        });
+    SaveManager::Instance->SaveArray("masterQuestDungeons", randoContext->GetDungeons()->GetDungeonListSize(), [&](size_t i) {
+        if (randoContext->GetDungeon(i)->IsMQ()) {
+            SaveManager::Instance->SaveData("", i);
+        }
     });
 
-    SaveManager::Instance->SaveData("masterQuestDungeonCount", saveContext->mqDungeonCount);
-
-    std::vector<uint16_t> masterQuestDungeons;
-    for (const auto scene : randomizer->masterQuestDungeons) {
-        masterQuestDungeons.push_back(scene);
-    }
-    SaveManager::Instance->SaveArray("masterQuestDungeons", masterQuestDungeons.size(), [&](size_t i) {
-        SaveManager::Instance->SaveData("", masterQuestDungeons[i]);
+    SaveManager::Instance->SaveArray("requiredTrials", randoContext->GetTrials()->GetTrialListSize(), [&](size_t i) {
+        if (randoContext->GetTrial(i)->IsRequired()) {
+            SaveManager::Instance->SaveData("", i);
+        }
     });
 }
 
@@ -436,17 +587,18 @@ void SaveManager::InitMeta(int fileNum) {
     fileMetaInfo[fileNum].gregFound = Flags_GetRandomizerInf(RAND_INF_GREG_FOUND);
     fileMetaInfo[fileNum].defense = gSaveContext.inventory.defenseHearts;
     fileMetaInfo[fileNum].health = gSaveContext.health;
+    auto randoContext = Rando::Context::GetInstance();
 
-    for (int i = 0; i < ARRAY_COUNT(fileMetaInfo[fileNum].seedHash); i++) {
-        fileMetaInfo[fileNum].seedHash[i] = gSaveContext.seedIcons[i];
+        for (int i = 0; i < ARRAY_COUNT(fileMetaInfo[fileNum].seedHash); i++) {
+        fileMetaInfo[fileNum].seedHash[i] = randoContext->hashIconIndexes[i];
     }
 
     fileMetaInfo[fileNum].randoSave = IS_RANDO;
     // If the file is marked as a Master Quest file or if we're randomized and have at least one master quest dungeon, we need the mq otr.
-    fileMetaInfo[fileNum].requiresMasterQuest = IS_MASTER_QUEST || (IS_RANDO && gSaveContext.mqDungeonCount > 0);
+    fileMetaInfo[fileNum].requiresMasterQuest = IS_MASTER_QUEST || (IS_RANDO && randoContext->GetDungeons()->CountMQ() > 0);
     // If the file is not marked as Master Quest, it could still theoretically be a rando save with all 12 MQ dungeons, in which case
     // we don't actually require a vanilla OTR.
-    fileMetaInfo[fileNum].requiresOriginal = !IS_MASTER_QUEST && (!IS_RANDO || gSaveContext.mqDungeonCount < 12);
+    fileMetaInfo[fileNum].requiresOriginal = !IS_MASTER_QUEST && (!IS_RANDO || randoContext->GetDungeons()->CountMQ() < 12);
 
     fileMetaInfo[fileNum].buildVersionMajor = gSaveContext.sohStats.buildVersionMajor;
     fileMetaInfo[fileNum].buildVersionMinor = gSaveContext.sohStats.buildVersionMinor;
diff --git a/soh/soh/SaveManager.h b/soh/soh/SaveManager.h
index 892aec923..0c094eb2b 100644
--- a/soh/soh/SaveManager.h
+++ b/soh/soh/SaveManager.h
@@ -157,6 +157,7 @@ class SaveManager {
 
     static void LoadRandomizerVersion1();
     static void LoadRandomizerVersion2();
+    static void LoadRandomizerVersion3();
     static void SaveRandomizer(SaveContext* saveContext, int sectionID, bool fullSave);
 
     static void LoadBaseVersion1();
diff --git a/soh/soh/SohMenuBar.cpp b/soh/soh/SohMenuBar.cpp
index 2a52006a4..25bbe5e06 100644
--- a/soh/soh/SohMenuBar.cpp
+++ b/soh/soh/SohMenuBar.cpp
@@ -1472,6 +1472,14 @@ extern std::shared_ptr<CheckTracker::CheckTrackerSettingsWindow> mCheckTrackerSe
 
 void DrawRandomizerMenu() {
     if (ImGui::BeginMenu("Randomizer")) {
+        UIWidgets::EnhancementCheckbox("Plando Mode", "gPlandoMode");
+        UIWidgets::Tooltip(
+            "When dropping a spoiler file on the game window, parse the full spoiler file instead of just the "
+            "necessary "
+            "parts to regenerate a seed.\n\nKeep in mind if you do this, all custom text will only be available in the "
+            "language present in the spoilerfile. You can use this to edit a previously generated spoilerfile that has "
+            "been edited with custom hint text and item locations. May be useful for debugging.");
+        UIWidgets::PaddedSeparator();
         ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(12.0f, 6.0f));
         ImGui::PushStyleVar(ImGuiStyleVar_ButtonTextAlign, ImVec2(0, 0));
         ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0f);
diff --git a/soh/src/code/z_sram.c b/soh/src/code/z_sram.c
index 057460b62..753dd1c02 100644
--- a/soh/src/code/z_sram.c
+++ b/soh/src/code/z_sram.c
@@ -221,8 +221,7 @@ void Sram_InitSave(FileChooseContext* fileChooseCtx) {
 
     gSaveContext.n64ddFlag = fileChooseCtx->n64ddFlag;
 
-    if (fileChooseCtx->questType[fileChooseCtx->buttonIndex] == QUEST_RANDOMIZER &&
-        strnlen(CVarGetString("gSpoilerLog", ""), 1) != 0) {
+    if (Randomizer_IsSeedGenerated()) {
         gSaveContext.questId = QUEST_RANDOMIZER;
 
         Randomizer_InitSaveFile();
diff --git a/soh/src/overlays/gamestates/ovl_file_choose/file_choose.h b/soh/src/overlays/gamestates/ovl_file_choose/file_choose.h
index d77517996..59d251584 100644
--- a/soh/src/overlays/gamestates/ovl_file_choose/file_choose.h
+++ b/soh/src/overlays/gamestates/ovl_file_choose/file_choose.h
@@ -65,6 +65,7 @@ typedef enum {
     CM_BOSS_RUSH_MENU,
     CM_START_BOSS_RUSH_MENU,
     CM_BOSS_RUSH_TO_QUEST,
+    CM_GENERATE_SEED,
 } ConfigMode;
 
 typedef enum {
diff --git a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
index 5de6df23d..da695e231 100644
--- a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
+++ b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
@@ -671,13 +671,6 @@ static void DrawMoreInfo(FileChooseContext* this, s16 fileIndex, u8 alpha) {
 void Sram_InitDebugSave(void);
 void Sram_InitBossRushSave();
 
-u8 hasRandomizerQuest() {
-    if (strnlen(CVarGetString("gSpoilerLog", ""), 1) != 0) {
-        return 1;
-    }
-    return 0;
-}
-
 void FileChoose_DrawTextureI8(GraphicsContext* gfxCtx, const void* texture, s16 texWidth, s16 texHeight, s16 rectLeft, s16 rectTop,
                          s16 rectWidth, s16 rectHeight, s16 dsdx, s16 dtdy) {
     OPEN_DISPS(gfxCtx);
@@ -953,17 +946,15 @@ void SpriteDraw(FileChooseContext* this, Sprite* sprite, int left, int top, int
     CLOSE_DISPS(this->state.gfxCtx);
 }
 
-bool fileSelectSpoilerFileLoaded = false;
 
 void DrawSeedHashSprites(FileChooseContext* this) {
     OPEN_DISPS(this->state.gfxCtx);
     gDPPipeSync(POLY_OPA_DISP++);
     gDPSetCombineMode(POLY_OPA_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
 
-    // Draw icons on the main menu, when a rando file is selected, and when quest selection is set to rando
-    if ((this->configMode == CM_MAIN_MENU &&
-        (this->selectMode != SM_CONFIRM_FILE || Save_GetSaveMetaInfo(this->selectedFileIndex)->randoSave == 1)) ||
-        (this->configMode == CM_QUEST_MENU && this->questType[this->buttonIndex] == QUEST_RANDOMIZER)) {
+    // Draw icons on the main menu, when a rando file is selected, and on name entry when quest selection is set to rando
+    if (this->configMode == CM_MAIN_MENU &&
+         (this->selectMode != SM_CONFIRM_FILE || Save_GetSaveMetaInfo(this->selectedFileIndex)->randoSave == 1)) {
 
         if (this->fileInfoAlpha[this->selectedFileIndex] > 0) {
             // Use file info alpha to match fading
@@ -972,30 +963,32 @@ void DrawSeedHashSprites(FileChooseContext* this) {
             u16 xStart = 64;
             // Draw Seed Icons for specific file
             for (unsigned int i = 0; i < 5; i++) {
-                if (Save_GetSaveMetaInfo(this->selectedFileIndex)->randoSave == 1) {
-                    SpriteLoad(this, GetSeedTexture(Save_GetSaveMetaInfo(this->selectedFileIndex)->seedHash[i]));
-                    SpriteDraw(this, GetSeedTexture(Save_GetSaveMetaInfo(this->selectedFileIndex)->seedHash[i]),
-                                xStart + (40 * i), 10, 24, 24);
-                }
+                SpriteLoad(this, GetSeedTexture(Save_GetSaveMetaInfo(this->selectedFileIndex)->seedHash[i]));
+                SpriteDraw(this, GetSeedTexture(Save_GetSaveMetaInfo(this->selectedFileIndex)->seedHash[i]),
+                            xStart + (40 * i), 10, 24, 24);
             }
         }
+    }
 
+    // Draw Seed Icons for spoiler log:
+    // 1. On Name Entry if a rando seed has been generated
+    // 2. On Quest Menu if a spoiler has been dropped and the Randomizer quest option is currently hovered.
+    if ((Randomizer_IsSeedGenerated() ||
+            (strnlen(CVarGetString("gSpoilerLog", ""), 1) != 0 && Randomizer_IsSpoilerLoaded())) &&
+        ((this->configMode == CM_NAME_ENTRY && gSaveContext.questId == QUEST_RANDOMIZER) ||
+        (this->configMode == CM_QUEST_MENU && this->questType[this->buttonIndex] == QUEST_RANDOMIZER))) {
         // Fade top seed icons based on main menu fade and if save supports rando
-        u8 alpha = MAX(this->optionButtonAlpha, Save_GetSaveMetaInfo(this->selectedFileIndex)->randoSave == 1 ? 0xFF : 0);
+        u8 alpha =
+            MAX(this->optionButtonAlpha, Save_GetSaveMetaInfo(this->selectedFileIndex)->randoSave == 1 ? 0xFF : 0);
         if (alpha >= 200) {
             alpha = 0xFF;
         }
 
         gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 0xFF, 0xFF, 0xFF, alpha);
-
-        // Draw Seed Icons for spoiler log
-        if (this->configMode == CM_QUEST_MENU && this->questType[this->buttonIndex] == QUEST_RANDOMIZER &&
-            strnlen(CVarGetString("gSpoilerLog", ""), 1) != 0 && fileSelectSpoilerFileLoaded) {
-            u16 xStart = 64;
-            for (unsigned int i = 0; i < 5; i++) {
-                SpriteLoad(this, GetSeedTexture(gSaveContext.seedIcons[i]));
-                SpriteDraw(this, GetSeedTexture(gSaveContext.seedIcons[i]), xStart + (40 * i), 10, 24, 24);
-            }
+        u16 xStart = 64;
+        for (unsigned int i = 0; i < 5; i++) {
+            SpriteLoad(this, GetSeedTexture(GetSeedIconIndex(i)));
+            SpriteDraw(this, GetSeedTexture(GetSeedIconIndex(i)), xStart + (40 * i), 10, 24, 24);
         }
     }
 
@@ -1012,7 +1005,7 @@ void FileChoose_UpdateRandomizer() {
             func_800F5E18(SEQ_PLAYER_BGM_MAIN, NA_BGM_HORSE, 0, 7, 1);
             return;
     } else if (CVarGetInteger("gRandoGenerating", 0) == 0 && generating) {
-            if (SpoilerFileExists(CVarGetString("gSpoilerLog", ""))) {
+            if (SpoilerFileExists(CVarGetString("gSpoilerLog", "")) || Randomizer_IsSeedGenerated()) {
                 Audio_PlayFanfare(NA_BGM_HORSE_GOAL);
             } else {
                 func_80078884(NA_SE_SY_OCARINA_ERROR);
@@ -1026,31 +1019,15 @@ void FileChoose_UpdateRandomizer() {
 
     if (!SpoilerFileExists(CVarGetString("gSpoilerLog", ""))) {
             CVarSetString("gSpoilerLog", "");
-            fileSelectSpoilerFileLoaded = false;
     }
 
-    if ((CVarGetInteger("gNewFileDropped", 0) != 0) || (CVarGetInteger("gNewSeedGenerated", 0) != 0) ||
-        (!fileSelectSpoilerFileLoaded && SpoilerFileExists(CVarGetString("gSpoilerLog", "")))) {
-            if (CVarGetInteger("gNewFileDropped", 0) != 0) {
-            CVarSetString("gSpoilerLog", CVarGetString("gDroppedFile", "None"));
-            }
-            bool silent = true;
-            if ((CVarGetInteger("gNewFileDropped", 0) != 0) || (CVarGetInteger("gNewSeedGenerated", 0) != 0)) {
-            silent = false;
-            }
+    if ((CVarGetInteger("gNewFileDropped", 0) != 0)) {
+            CVarSetString("gSpoilerLog", CVarGetString("gDroppedFile", ""));
             CVarSetInteger("gNewSeedGenerated", 0);
             CVarSetInteger("gNewFileDropped", 0);
             CVarSetString("gDroppedFile", "");
-            fileSelectSpoilerFileLoaded = false;
             const char* fileLoc = CVarGetString("gSpoilerLog", "");
-            Randomizer_LoadSettings(fileLoc);
-            Randomizer_LoadHintLocations(fileLoc);
-            Randomizer_LoadRequiredTrials(fileLoc);
-            Randomizer_LoadItemLocations(fileLoc, silent);
-            Randomizer_LoadMerchantMessages(fileLoc);
-            Randomizer_LoadMasterQuestDungeons(fileLoc);
-            Randomizer_LoadEntranceOverrides(fileLoc, silent);
-            fileSelectSpoilerFileLoaded = true;
+            Randomizer_ParseSpoiler(fileLoc);
     }
 }
 
@@ -1300,8 +1277,10 @@ void FileChoose_UpdateQuestMenu(GameState* thisx) {
             this->prevConfigMode = this->configMode;
             this->configMode = CM_ROTATE_TO_BOSS_RUSH_MENU;
             return;
-        } else if (this->questType[this->buttonIndex] == QUEST_RANDOMIZER && !hasRandomizerQuest()) {
-            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
+        } else if (this->questType[this->buttonIndex] == QUEST_RANDOMIZER) {
+            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
+            this->prevConfigMode = this->configMode;
+            this->configMode = CM_GENERATE_SEED;
         } else {
             Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
             osSyncPrintf("Selected Dungeon Quest: %d\n", IS_MASTER_QUEST);
@@ -1330,6 +1309,33 @@ void FileChoose_UpdateQuestMenu(GameState* thisx) {
     }
 }
 
+void FileChoose_GenerateRandoSeed(GameState* thisx) {
+    FileChooseContext* this = (FileChooseContext*)thisx;
+    FileChoose_UpdateRandomizer();
+    if (Randomizer_IsSeedGenerated() || Randomizer_IsPlandoLoaded()) {
+        static u8 emptyName[] = { 0x3E, 0x3E, 0x3E, 0x3E, 0x3E, 0x3E, 0x3E, 0x3E };
+        static u8 linkName[] = { 0x15, 0x2C, 0x31, 0x2E, 0x3E, 0x3E, 0x3E, 0x3E };
+        this->prevConfigMode = this->configMode;
+        this->configMode = CM_ROTATE_TO_NAME_ENTRY;
+        this->logoAlpha = 0;
+        CVarSetInteger("gOnFileSelectNameEntry", 1);
+        this->kbdButton = FS_KBD_BTN_NONE;
+        this->charPage = FS_CHAR_PAGE_ENG;
+        this->kbdX = 0;
+        this->kbdY = 0;
+        this->charIndex = 0;
+        this->charBgAlpha = 0;
+        this->newFileNameCharCount = CVarGetInteger("gLinkDefaultName", 0) ? 4 : 0;
+        this->nameEntryBoxPosX = 120;
+        this->nameEntryBoxAlpha = 0;
+        memcpy(Save_GetSaveMetaInfo(this->buttonIndex)->playerName,
+               CVarGetInteger("gLinkDefaultName", 0) ? &linkName : &emptyName, 8);
+        return;
+    } else {
+        Randomizer_GenerateSeed();
+    }
+}
+
 static s8 sLastBossRushOptionIndex = -1;
 static s8 sLastBossRushOptionValue = -1;
 
@@ -1562,6 +1568,7 @@ static void (*gConfigModeUpdateFuncs[])(GameState*) = {
     FileChoose_RotateToMain,       FileChoose_RotateToQuest,
     FileChoose_RotateToBossRush,   FileChoose_UpdateBossRushMenu,
     FileChoose_StartBossRushMenu,  FileChoose_RotateToQuest,
+    FileChoose_GenerateRandoSeed,
 };
 
 /**
@@ -2161,6 +2168,7 @@ void FileChoose_DrawWindowContents(GameState* thisx) {
         case CM_QUEST_TO_MAIN:
         case CM_NAME_ENTRY_TO_QUEST_MENU:
         case CM_ROTATE_TO_BOSS_RUSH_MENU:
+        case CM_GENERATE_SEED:
             tex = FileChoose_GetQuestChooseTitleTexName(gSaveContext.language);
             break;
         case CM_BOSS_RUSH_MENU:
@@ -2174,6 +2182,7 @@ void FileChoose_DrawWindowContents(GameState* thisx) {
     }
 
     OPEN_DISPS(this->state.gfxCtx);
+    DrawSeedHashSprites(this);
 
     // draw title label
     gDPPipeSync(POLY_OPA_DISP++);
@@ -2189,32 +2198,34 @@ void FileChoose_DrawWindowContents(GameState* thisx) {
 
     // draw next title label
     if ((this->configMode == CM_QUEST_MENU) || (this->configMode == CM_START_QUEST_MENU) || 
-        this->configMode == CM_NAME_ENTRY_TO_QUEST_MENU) {
+        this->configMode == CM_NAME_ENTRY_TO_QUEST_MENU || this->configMode == CM_GENERATE_SEED) {
         // draw control stick prompts.
-        Gfx_SetupDL_39Opa(this->state.gfxCtx);
-        gDPSetCombineMode(POLY_OPA_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
-        gDPLoadTextureBlock(POLY_OPA_DISP++, gArrowCursorTex, G_IM_FMT_IA, G_IM_SIZ_8b, 16, 24, 0,
-                            G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 4, G_TX_NOMASK, G_TX_NOLOD,
-                            G_TX_NOLOD);
-        FileChoose_DrawTextRec(this->state.gfxCtx, this->stickLeftPrompt.arrowColorR,
-                                this->stickLeftPrompt.arrowColorG, this->stickLeftPrompt.arrowColorB,
-                                this->stickLeftPrompt.arrowColorA, this->stickLeftPrompt.arrowTexX,
-                                this->stickLeftPrompt.arrowTexY, this->stickLeftPrompt.z, 0, 0, -1.0f, 1.0f);
-        FileChoose_DrawTextRec(this->state.gfxCtx, this->stickRightPrompt.arrowColorR,
-                                this->stickRightPrompt.arrowColorG, this->stickRightPrompt.arrowColorB,
-                                this->stickRightPrompt.arrowColorA, this->stickRightPrompt.arrowTexX,
-                                this->stickRightPrompt.arrowTexY, this->stickRightPrompt.z, 0, 0, 1.0f, 1.0f);
-        gDPLoadTextureBlock(POLY_OPA_DISP++, gControlStickTex, G_IM_FMT_IA, G_IM_SIZ_8b, 16, 16, 0,
-                            G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 4, G_TX_NOMASK, G_TX_NOLOD,
-                            G_TX_NOLOD);
-        FileChoose_DrawTextRec(this->state.gfxCtx, this->stickLeftPrompt.stickColorR,
-                                this->stickLeftPrompt.stickColorG, this->stickLeftPrompt.stickColorB,
-                                this->stickLeftPrompt.stickColorA, this->stickLeftPrompt.stickTexX,
-                                this->stickLeftPrompt.stickTexY, this->stickLeftPrompt.z, 0, 0, -1.0f, 1.0f);
-        FileChoose_DrawTextRec(this->state.gfxCtx, this->stickRightPrompt.stickColorR,
-                                this->stickRightPrompt.stickColorG, this->stickRightPrompt.stickColorB,
-                                this->stickRightPrompt.stickColorA, this->stickRightPrompt.stickTexX,
-                                this->stickRightPrompt.stickTexY, this->stickRightPrompt.z, 0, 0, 1.0f, 1.0f);
+        if (this->configMode != CM_GENERATE_SEED) {
+            Gfx_SetupDL_39Opa(this->state.gfxCtx);
+            gDPSetCombineMode(POLY_OPA_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
+            gDPLoadTextureBlock(POLY_OPA_DISP++, gArrowCursorTex, G_IM_FMT_IA, G_IM_SIZ_8b, 16, 24, 0,
+                                G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 4, G_TX_NOMASK, G_TX_NOLOD,
+                                G_TX_NOLOD);
+            FileChoose_DrawTextRec(this->state.gfxCtx, this->stickLeftPrompt.arrowColorR,
+                                    this->stickLeftPrompt.arrowColorG, this->stickLeftPrompt.arrowColorB,
+                                    this->stickLeftPrompt.arrowColorA, this->stickLeftPrompt.arrowTexX,
+                                    this->stickLeftPrompt.arrowTexY, this->stickLeftPrompt.z, 0, 0, -1.0f, 1.0f);
+            FileChoose_DrawTextRec(this->state.gfxCtx, this->stickRightPrompt.arrowColorR,
+                                    this->stickRightPrompt.arrowColorG, this->stickRightPrompt.arrowColorB,
+                                    this->stickRightPrompt.arrowColorA, this->stickRightPrompt.arrowTexX,
+                                    this->stickRightPrompt.arrowTexY, this->stickRightPrompt.z, 0, 0, 1.0f, 1.0f);
+            gDPLoadTextureBlock(POLY_OPA_DISP++, gControlStickTex, G_IM_FMT_IA, G_IM_SIZ_8b, 16, 16, 0,
+                                G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 4, G_TX_NOMASK, G_TX_NOLOD,
+                                G_TX_NOLOD);
+            FileChoose_DrawTextRec(this->state.gfxCtx, this->stickLeftPrompt.stickColorR,
+                                    this->stickLeftPrompt.stickColorG, this->stickLeftPrompt.stickColorB,
+                                    this->stickLeftPrompt.stickColorA, this->stickLeftPrompt.stickTexX,
+                                    this->stickLeftPrompt.stickTexY, this->stickLeftPrompt.z, 0, 0, -1.0f, 1.0f);
+            FileChoose_DrawTextRec(this->state.gfxCtx, this->stickRightPrompt.stickColorR,
+                                    this->stickRightPrompt.stickColorG, this->stickRightPrompt.stickColorB,
+                                    this->stickRightPrompt.stickColorA, this->stickRightPrompt.stickTexX,
+                                    this->stickRightPrompt.stickTexY, this->stickRightPrompt.z, 0, 0, 1.0f, 1.0f);
+        }
         switch (this->questType[this->buttonIndex]) {
             case QUEST_NORMAL:
             default:
@@ -2233,11 +2244,10 @@ void FileChoose_DrawWindowContents(GameState* thisx) {
                 break;
             
             case QUEST_RANDOMIZER:
-                DrawSeedHashSprites(this);
-                if (hasRandomizerQuest()) {
-                    gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, this->logoAlpha);
+                if (this->configMode == CM_GENERATE_SEED) {
+                    gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, this->logoAlpha / 2);
                 } else {
-                    gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 0x40, 0x40, 0x40, this->logoAlpha);
+                    gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, this->logoAlpha);
                 }
                 FileChoose_DrawTextureI8(this->state.gfxCtx, gTitleTheLegendOfTextTex, 72, 8, 156, 108, 72, 8, 1024, 1024);
                 FileChoose_DrawTextureI8(this->state.gfxCtx, gTitleOcarinaOfTimeTMTextTex, 96, 8, 154, 163, 96, 8, 1024, 1024);
@@ -2658,7 +2668,8 @@ void FileChoose_ConfigModeDraw(GameState* thisx) {
     // draw quest menu
     if ((this->configMode == CM_QUEST_MENU) || (this->configMode == CM_ROTATE_TO_QUEST_MENU) || 
         (this->configMode == CM_ROTATE_TO_NAME_ENTRY) || this->configMode == CM_QUEST_TO_MAIN ||
-        this->configMode == CM_NAME_ENTRY_TO_QUEST_MENU || this->configMode == CM_ROTATE_TO_BOSS_RUSH_MENU) {
+        this->configMode == CM_NAME_ENTRY_TO_QUEST_MENU || this->configMode == CM_ROTATE_TO_BOSS_RUSH_MENU ||
+        this->configMode == CM_GENERATE_SEED) {
         // window
         gDPPipeSync(POLY_OPA_DISP++);
         gDPSetCombineMode(POLY_OPA_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
@@ -2964,13 +2975,8 @@ void FileChoose_LoadGame(GameState* thisx) {
 
     this->state.running = false;
 
-    Randomizer_LoadSettings("");
-    Randomizer_LoadHintLocations("");
-    Randomizer_LoadItemLocations("", true);
-    Randomizer_LoadRequiredTrials("");
-    Randomizer_LoadMerchantMessages("");
-    Randomizer_LoadMasterQuestDungeons("");
-    Randomizer_LoadEntranceOverrides("", true);
+    Randomizer_LoadHintMessages();
+    Randomizer_LoadMerchantMessages();
 
     gSaveContext.respawn[0].entranceIndex = -1;
     gSaveContext.respawnFlag = 0;
@@ -3182,25 +3188,25 @@ void FileChoose_DrawRandoSaveVersionWarning(GameState* thisx) {
 
 static const char* noRandoGeneratedText[] = {
     // English
-    "No Randomizer seed currently available.\nGenerate one in the Randomizer Settings"
+    "Open Randomizer Settings to change your settings,\nthen press A to generate a new seed"
 #if defined(__WIIU__) || defined(__SWITCH__)
     ".",
 #else
     ",\nor drop a spoiler log on the game window.",
 #endif
     // German
-    "No Randomizer seed currently available.\nGenerate one in the Randomizer Settings"
+    "Open Randomizer Settings to change your settings,\nthen press A to generate a new seed"
 #if defined(__WIIU__) || defined(__SWITCH__)
     ".",
 #else
     ",\nor drop a spoiler log on the game window.",
 #endif
     // French
-    "Aucune Seed de Randomizer actuellement disponible.\nGénérez-en une dans les \"Randomizer Settings\""
+    "Ouvrez le menu \"Randomizer Settings\" pour modifier\nvos paramètres, appuyez sur A pour générer\nune nouvelle seed"
 #if (defined(__WIIU__) || defined(__SWITCH__))
     "."
 #else
-    "\nou glissez un spoilerlog sur la fenêtre du jeu."
+    " ou glissez un spoilerlog sur la\nfenêtre du jeu."
 #endif
 };
 
@@ -3210,7 +3216,7 @@ void FileChoose_DrawNoRandoGeneratedWarning(GameState* thisx) {
     OPEN_DISPS(this->state.gfxCtx);
 
     // Draw rando seed warning when build version doesn't match for Major or Minor number
-    if (this->configMode == CM_QUEST_MENU && this->questType[this->buttonIndex] == QUEST_RANDOMIZER && !hasRandomizerQuest()) {
+    if (this->configMode == CM_QUEST_MENU && this->questType[this->buttonIndex] == QUEST_RANDOMIZER && !(Randomizer_IsSeedGenerated() || Randomizer_IsSpoilerLoaded())) {
         uint8_t textAlpha = 225;
         uint8_t textboxAlpha = 170;
         float textboxScale = 0.7f;
@@ -3223,12 +3229,18 @@ void FileChoose_DrawNoRandoGeneratedWarning(GameState* thisx) {
         uint16_t textboxWidth = 256 * textboxScale;
         uint16_t textboxHeight = 64 * textboxScale;
         uint8_t leftOffset = 72;
-        uint8_t bottomOffset = 84;
+        uint8_t bottomOffset = 132;
         uint8_t textVerticalOffset;
 #if defined(__WIIU__) || defined(__SWITCH__)
-        textVerticalOffset = 127; // 2 lines
+        textVerticalOffset = 80; // 2 lines
+        if (gSaveContext.language == LANGUAGE_FRA) {
+            textVerticalOffset = 75; // 3 lines
+        }
 #else
-        textVerticalOffset = 122; // 3 lines
+        textVerticalOffset = 75; // 3 lines
+        if (gSaveContext.language == LANGUAGE_FRA) {
+            textVerticalOffset = 70; // 4 lines
+        }
 #endif
 
         Gfx_SetupDL_39Opa(this->state.gfxCtx);
@@ -3664,7 +3676,6 @@ void FileChoose_Init(GameState* thisx) {
     this->questType[0] = MIN_QUEST;
     this->questType[1] = MIN_QUEST;
     this->questType[2] = MIN_QUEST;
-    fileSelectSpoilerFileLoaded = false;
     isFastFileIdIncompatible = 0;
     CVarSetInteger("gOnFileSelectNameEntry", 0);
 
diff --git a/soh/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c b/soh/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c
index 377c23eb3..67c8c4de9 100644
--- a/soh/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c
+++ b/soh/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c
@@ -375,6 +375,7 @@ void FileChoose_DrawNameEntry(GameState* thisx) {
                     this->newFileNameCharCount = 0;
                     if (this->prevConfigMode == CM_QUEST_MENU) {
                         this->configMode = CM_NAME_ENTRY_TO_QUEST_MENU;
+                        Randomizer_SetSeedGenerated(false);
                     } else {
                         this->configMode = CM_NAME_ENTRY_TO_MAIN;
                     }
@@ -457,6 +458,9 @@ void FileChoose_DrawNameEntry(GameState* thisx) {
                             this->configMode = CM_NAME_ENTRY_TO_MAIN;
                             CVarSetInteger("gOnFileSelectNameEntry", 0);
                             CVarSetInteger("gNewFileDropped", 0);
+                            Randomizer_SetSeedGenerated(false);
+                            Randomizer_SetSpoilerLoaded(false);
+                            Randomizer_SetPlandoLoaded(false);
                             this->nameBoxAlpha[this->buttonIndex] = this->nameAlpha[this->buttonIndex] = 200;
                             this->connectorAlpha[this->buttonIndex] = 255;
                             func_800AA000(300.0f, 0xB4, 0x14, 0x64);

From 4f9ce252e760049a0e17b0b046ffc6ec1ecf09a0 Mon Sep 17 00:00:00 2001
From: Christopher Leggett <chris@leggett.dev>
Date: Thu, 16 Nov 2023 15:48:32 -0500
Subject: [PATCH 029/230] Fixes a potential crash with saves made on older
 commit.

I had an Off By One Bug in a previous commit, and saves made on that commit ended up crashing on boot due to attempting to access a negative index of an array. Added a bounds check to prevent attempting to load that data.
---
 soh/soh/SaveManager.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/soh/soh/SaveManager.cpp b/soh/soh/SaveManager.cpp
index a3ce45d29..10e35ae2f 100644
--- a/soh/soh/SaveManager.cpp
+++ b/soh/soh/SaveManager.cpp
@@ -231,9 +231,11 @@ void SaveManager::LoadRandomizerVersion2() {
         SaveManager::Instance->LoadStruct("", [&]() {
             RandomizerCheck rc = RC_UNKNOWN_CHECK;
             SaveManager::Instance->LoadData("check", rc);
-            std::string hintText;
-            SaveManager::Instance->LoadData("hintText", hintText);
-            randoContext->AddHint(RandomizerHintKey(rc - RC_COLOSSUS_GOSSIP_STONE + 1), Text(hintText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text());
+            if (rc != RC_UNKNOWN_CHECK) {
+                std::string hintText;
+                SaveManager::Instance->LoadData("hintText", hintText);
+                randoContext->AddHint(RandomizerHintKey(rc - RC_COLOSSUS_GOSSIP_STONE + 1), Text(hintText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text());
+            }
         });
     });
 

From ae715bdc15e07e7de8ccbf052b0537bf7f401d8c Mon Sep 17 00:00:00 2001
From: Ralphie Morell <stratomaster64@gmail.com>
Date: Fri, 17 Nov 2023 16:35:37 -0500
Subject: [PATCH 030/230] put boss souls back on the menu

---
 .../randomizer/3drando/item_pool.cpp          | 22 +++++-----
 .../Enhancements/randomizer/3drando/logic.cpp |  5 ++-
 .../Enhancements/randomizer/3drando/shops.cpp | 18 ++++-----
 soh/soh/Enhancements/randomizer/draw.cpp      | 40 +++++++++----------
 .../Enhancements/randomizer/randomizer.cpp    |  2 +-
 soh/soh/Enhancements/randomizer/settings.cpp  | 11 +++++
 6 files changed, 55 insertions(+), 43 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
index b2a629bc8..46d039f9b 100644
--- a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
@@ -829,7 +829,7 @@ void GenerateItemPool() {
     ctx->PlaceItemInLocation(RC_KAK_100_GOLD_SKULLTULA_REWARD, RG_HUGE_RUPEE, false, true);
   }
 
-  if (ShuffleBossSouls.IsNot(BOSSSOULS_OFF)) {
+  if (ctx->GetOption(RSK_SHUFFLE_BOSS_SOULS)) {
     AddItemToMainPool(RG_GOHMA_SOUL);
     AddItemToMainPool(RG_KING_DODONGO_SOUL);
     AddItemToMainPool(RG_BARINADE_SOUL);
@@ -839,17 +839,17 @@ void GenerateItemPool() {
     AddItemToMainPool(RG_BONGO_BONGO_SOUL);
     AddItemToMainPool(RG_TWINROVA_SOUL);
 
-    IceTrapModels.push_back(0xE0);
-    IceTrapModels.push_back(0xE1);
-    IceTrapModels.push_back(0xE2);
-    IceTrapModels.push_back(0xE3);
-    IceTrapModels.push_back(0xE4);
-    IceTrapModels.push_back(0xE5);
-    IceTrapModels.push_back(0xE6);
-    IceTrapModels.push_back(0xE7);
-    if (ShuffleBossSouls.Is(BOSSSOULS_ON_PLUS_GANON)) {
+    ctx->possibleIceTrapModels.push_back(RG_GOHMA_SOUL);
+    ctx->possibleIceTrapModels.push_back(RG_KING_DODONGO_SOUL);
+    ctx->possibleIceTrapModels.push_back(RG_BARINADE_SOUL);
+    ctx->possibleIceTrapModels.push_back(RG_PHANTOM_GANON_SOUL);
+    ctx->possibleIceTrapModels.push_back(RG_VOLVAGIA_SOUL);
+    ctx->possibleIceTrapModels.push_back(RG_MORPHA_SOUL);
+    ctx->possibleIceTrapModels.push_back(RG_BONGO_BONGO_SOUL);
+    ctx->possibleIceTrapModels.push_back(RG_TWINROVA_SOUL);
+    if (ctx->GetOption(RSK_SHUFFLE_BOSS_SOULS).Is(RO_BOSS_SOULS_ON_PLUS_GANON)) {
       AddItemToMainPool(RG_GANON_SOUL);
-      IceTrapModels.push_back(0xE8);
+      ctx->possibleIceTrapModels.push_back(RG_GANON_SOUL);
     }
   }
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/logic.cpp b/soh/soh/Enhancements/randomizer/3drando/logic.cpp
index 38382c542..3376b1e80 100644
--- a/soh/soh/Enhancements/randomizer/3drando/logic.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/logic.cpp
@@ -477,7 +477,8 @@ namespace Logic {
   }
 
   bool HasBossSoul(RandomizerGet itemName) {
-    if (ShuffleBossSouls.Is(BOSSSOULS_OFF)) {
+    auto ctx = Rando::Context::GetInstance();
+    if (!ctx->GetOption(RSK_SHUFFLE_BOSS_SOULS)) {
       return true;
     }
     switch(itemName) {
@@ -498,7 +499,7 @@ namespace Logic {
       case RG_TWINROVA_SOUL:
         return CanSummonTwinrova; break;
       case RG_GANON_SOUL:
-        return ShuffleBossSouls.Is(BOSSSOULS_ON_PLUS_GANON) ? CanSummonGanon : true;
+        return ctx->GetOption(RSK_SHUFFLE_BOSS_SOULS).Is(RO_BOSS_SOULS_ON_PLUS_GANON) ? CanSummonGanon : true;
         break;
       default: break;
     }
diff --git a/soh/soh/Enhancements/randomizer/3drando/shops.cpp b/soh/soh/Enhancements/randomizer/3drando/shops.cpp
index 68319b74c..8e2206966 100644
--- a/soh/soh/Enhancements/randomizer/3drando/shops.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/shops.cpp
@@ -703,39 +703,39 @@ void InitTrickNames() {
      Text{"Piece of Cheese", "Morceau de Fromage", "Piece of Cheese"},
      Text{"Triforce Shard", "Éclat de Triforce", "Triforce Shard"},
      Text{"Shiny Rock", "Caiiloux Brillant", "Shiny Rock"}};
-  trickNameTable[0xE0] = {
+  trickNameTable[RG_GOHMA_SOUL] = {
      Text{"Spider Sense", "", ""},
      Text{"Deku Spirit", "", ""},
      Text("Ghost of Ghoma", "", "")};
-  trickNameTable[0xE1] = {
+  trickNameTable[RG_KING_DODONGO_SOUL] = {
      Text{"Lizard Soul", "", ""},
      Text{"Regal Remains", "", ""},
      Text{"Dodongo's Core", "", ""}};
-  trickNameTable[0xE2] = {
+  trickNameTable[RG_BARINADE_SOUL] = {
      Text{"Parasitic Poltergeist", "", ""},
      Text{"Jabu Insides", "", ""},
      Text{"Barinade Bacteria", "", ""}};
-  trickNameTable[0xE3] = {
+  trickNameTable[RG_PHANTOM_GANON_SOUL] = {
      Text{"Bigger Poe", "", ""},
      Text{"Sacred Forest Pine Tree", "", ""},
      Text{"Ganon's Phantom", "", ""}};
-  trickNameTable[0xE4] = {
+  trickNameTable[RG_VOLVAGIA_SOUL] = {
      Text{"Dragon Roast", "", ""},
      Text{"Hot n' Ready", "", ""},
      Text{"Volvagia's Vitality", "", ""}};
-  trickNameTable[0xE5] = {
+  trickNameTable[RG_MORPHA_SOUL] = {
      Text{"Dihydrogen Monoxide", "", ""},
      Text{"Morpha Molecules", "", ""},
      Text{"Wet Stuff", "", ""}};
-  trickNameTable[0xE6] = {
+  trickNameTable[RG_BONGO_BONGO_SOUL] = {
      Text{"Shadow Soul", "", ""},
      Text{"Dark Essence", "", ""},
      Text{"Bongo Bongo's Bongo", "", ""}};
-  trickNameTable[0xE7] = {
+  trickNameTable[RG_TWINROVA_SOUL] = {
      Text{"Sandy Ashes", "", ""},
      Text{"Spiritual Spirit", "", ""},
      Text{"Twin Rovers", "", ""}};
-  trickNameTable[0xE8] = {
+  trickNameTable[RG_GANON_SOUL] = {
      Text{"Pure Evil", "", ""},
      Text{"Ganon's Ghost", "", ""},
      Text{"Pork", "", ""}};
diff --git a/soh/soh/Enhancements/randomizer/draw.cpp b/soh/soh/Enhancements/randomizer/draw.cpp
index a8dc5abd1..6c6a4fd55 100644
--- a/soh/soh/Enhancements/randomizer/draw.cpp
+++ b/soh/soh/Enhancements/randomizer/draw.cpp
@@ -278,8 +278,6 @@ extern "C" void Randomizer_DrawTriforcePieceGI(PlayState* play, GetItemEntry get
     }
     CLOSE_DISPS(play->state.gfxCtx);
 }
-// TODO get custom model for boss souls
-
 
 extern "C" void Randomizer_DrawBossSoul(PlayState* play, GetItemEntry* getItemEntry) {
     s16 slot = getItemEntry->getItemId - RG_GOHMA_SOUL;
@@ -293,7 +291,7 @@ extern "C" void Randomizer_DrawBossSoul(PlayState* play, GetItemEntry* getItemEn
         { 126, 16, 177 },  // Bongo Bongo
         { 222, 158, 47 },  // Twinrova
         { 80, 80, 80 },    // Ganon/Dorf
-    };
+    }; 
     OPEN_DISPS(play->state.gfxCtx);
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
@@ -306,23 +304,25 @@ extern "C" void Randomizer_DrawBossSoul(PlayState* play, GetItemEntry* getItemEn
     }
     gSPDisplayList(POLY_XLU_DISP++, (Gfx*)gBossSoulSkullDL);
     
-    Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-    gSPSegment(POLY_XLU_DISP++, 8, (uintptr_t)Gfx_TwoTexScroll(
-        play->state.gfxCtx, 0, 0 * (play->state.frames * 0),
-        0 * (play->state.frames * 0), 16, 32, 1, 1 * (play->state.frames * 1),
-        -1 * (play->state.frames * 8), 16, 32
-    ));
-    Matrix_Push();
-    Matrix_Translate(0.0f, -70.0f, 0.0f, MTXMODE_APPLY);
-    Matrix_Scale(5.0f, 5.0f, 5.0f, MTXMODE_APPLY);
-    Matrix_ReplaceRotation(&play->billboardMtxF);
-    gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
-    gDPSetGrayscaleColor(POLY_XLU_DISP++, flameColors[slot][0], flameColors[slot][1], flameColors[slot][2], 255);
-    gSPGrayscale(POLY_XLU_DISP++, true);
-    gSPDisplayList(POLY_XLU_DISP++, (Gfx*)gGiBlueFireFlameDL);
-    gSPGrayscale(POLY_XLU_DISP++, false);
-    Matrix_Pop();
+    if (slot >= 0) {
+        Gfx_SetupDL_25Xlu(play->state.gfxCtx);
+        gSPSegment(POLY_XLU_DISP++, 8, (uintptr_t)Gfx_TwoTexScroll(
+            play->state.gfxCtx, 0, 0 * (play->state.frames * 0),
+            0 * (play->state.frames * 0), 16, 32, 1, 1 * (play->state.frames * 1),
+            -1 * (play->state.frames * 8), 16, 32
+        ));
+        Matrix_Push();
+        Matrix_Translate(0.0f, -70.0f, 0.0f, MTXMODE_APPLY);
+        Matrix_Scale(5.0f, 5.0f, 5.0f, MTXMODE_APPLY);
+        Matrix_ReplaceRotation(&play->billboardMtxF);
+        gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
+                  G_MTX_MODELVIEW | G_MTX_LOAD);
+        gDPSetGrayscaleColor(POLY_XLU_DISP++, flameColors[slot][0], flameColors[slot][1], flameColors[slot][2], 255);
+        gSPGrayscale(POLY_XLU_DISP++, true);
+        gSPDisplayList(POLY_XLU_DISP++, (Gfx*)gGiBlueFireFlameDL);
+        gSPGrayscale(POLY_XLU_DISP++, false);
+        Matrix_Pop();
+    }
 
     CLOSE_DISPS(play->state.gfxCtx);
 
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index e1e36ed19..11e260cbe 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -2848,7 +2848,7 @@ void RandomizerSettingsWindow::DrawElement() {
 
                 // Shuffle Boss Souls
                 // Forces players to find a boss's soul before defeating them in their lair.
-                ImGui::Text("%s", Settings::ShuffleBossSouls.GetName().c_str());
+                ImGui::Text("%s", ctx->GetOption(RSK_SHUFFLE_BOSS_SOULS).GetName().c_str());
                 UIWidgets::InsertHelpHoverText("Shuffles 8 boss souls (one for each blue warp dungeon). A boss will not appear until you collect its respective soul."
                 "\n\"On + Ganon\" will also hide Ganon and Ganondorf behind a boss soul.");
                 UIWidgets::EnhancementCombobox("gRandomizeShuffleBossSouls", randoShuffleBossSouls, RO_BOSS_SOULS_OFF);
diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
index 12deeba6b..ec4595f01 100644
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -106,6 +106,7 @@ void Settings::CreateOptions() {
     mOptions[RSK_SHUFFLE_ADULT_TRADE] = Option::Bool("Shuffle Adult Trade");
     mOptions[RSK_SHUFFLE_CHEST_MINIGAME] = Option::U8("Shuffle Chest Minigame", {"Off", "On (Separate)", "On (Pack)"});
     mOptions[RSK_SHUFFLE_100_GS_REWARD] = Option::Bool("Shuffle 100 GS Reward");
+    mOptions[RSK_SHUFFLE_BOSS_SOULS] = Option::U8("Shuffle Boss Souls", {"Off", "On", "On + Ganon"});
     mOptions[RSK_SHUFFLE_MAPANDCOMPASS] = Option::U8("Maps/Compasses", {"Start With", "Vanilla", "Own Dungeon", "Any Dungeon", "Overworld", "Anywhere"}, OptionCategory::Setting, RO_DUNGEON_ITEM_LOC_OWN_DUNGEON);
     mOptions[RSK_KEYSANITY] = Option::U8("Small Keys", {"Start With", "Vanilla", "Own Dungeon", "Any Dungeon", "Overworld", "Anywhere"}, OptionCategory::Setting, RO_DUNGEON_ITEM_LOC_OWN_DUNGEON);
     mOptions[RSK_GERUDO_KEYS] = Option::U8("Gerudo Fortress Keys", {"Vanilla", "Any Dungeon", "Overworld", "Anywhere"});
@@ -616,6 +617,7 @@ void Settings::CreateOptions() {
         &mOptions[RSK_SHUFFLE_ADULT_TRADE],
         &mOptions[RSK_SHUFFLE_CHEST_MINIGAME],
         &mOptions[RSK_SHUFFLE_100_GS_REWARD],
+        &mOptions[RSK_SHUFFLE_BOSS_SOULS],
     });
     mOptionGroups[RSG_SHUFFLE_DUNGEON_ITEMS] = OptionGroup("Shuffle Dungeon Items", {
         &mOptions[RSK_SHUFFLE_MAPANDCOMPASS],
@@ -821,6 +823,7 @@ void Settings::CreateOptions() {
         { "Shuffle Settings:Shuffle Frog Song Rupees", RSK_SHUFFLE_FROG_SONG_RUPEES },
         { "Shuffle Settings:Shuffle Merchants", RSK_SHUFFLE_MERCHANTS },
         { "Shuffle Settings:Shuffle 100 GS Reward", RSK_SHUFFLE_100_GS_REWARD },
+        { "Shuffle Settings:Shuffle Boss Souls", RSK_SHUFFLE_BOSS_SOULS },
         { "Start with Deku Shield", RSK_STARTING_DEKU_SHIELD },
         { "Start with Kokiri Sword", RSK_STARTING_KOKIRI_SWORD },
         { "Start with Fairy Ocarina", RSK_STARTING_OCARINA },
@@ -1520,6 +1523,14 @@ void Settings::ParseJson(nlohmann::json spoilerFileJson) {
                         mOptions[index].SetSelectedIndex(RO_AMMO_DROPS_OFF);
                     }
                     break;
+                case RSK_SHUFFLE_BOSS_SOULS:
+                    if (it.value() == "Off") {
+                        mOptions[index].SetSelectedIndex(RO_BOSS_SOULS_OFF);
+                    } else if (it.value() == "On") {
+                        mOptions[index].SetSelectedIndex(RO_BOSS_SOULS_ON);
+                    } else if (it.value() == "On + Ganon") {
+                        mOptions[index].SetSelectedIndex(RO_BOSS_SOULS_ON_PLUS_GANON);
+                    }
                 case RSK_STARTING_OCARINA:
                     if (it.value() == "Off") {
                         mOptions[index].SetSelectedIndex(RO_STARTING_OCARINA_OFF);

From 1cc3201c190fbad0b1eebd40a1c8d79a7457d463 Mon Sep 17 00:00:00 2001
From: Christopher Leggett <chris@leggett.dev>
Date: Tue, 5 Dec 2023 19:03:36 -0500
Subject: [PATCH 031/230] Develop rando tidy up (#3425)

* Fixes some IDE warnings/linter-suggestions in context.*

Most of these come from CLion Nova. Some of these may be controversial, such as the if-init-statement related ones. Most of them should not be controversial though, like replacing C-style casts with static casts.

* Fixes IDE warnings/Linter suggestions in option.*

* Fixes some IDE warnings/linter suggestions.

Left a few about "Template Arguments can be deduced", and a "Redundant static_cast" for the sake of clarity.

* Fixes some IDE warnings/linter suggestions in item.*

* Fixes some IDE warnings/linter suggestions in location.*

* Fixes some IDE warnings/linter suggestions in item_location.*

* Fixes some IDE warnings/linter suggestions in item_override.*

* Fixes some IDE warnings/linter suggestions in dungeon.*

* Fixes some IDE warnings/linter suggestions in trial.*

* Use std::ranges::generate rather than manually looping.

* Fixes a typo

* Changes a TODO comment with more info.

Previously this TODO statement was a question of whether or not we ever want to not output a spoiler log. Eventually we may want different amounts or types of data to be output when generating a seed according to certain settings. For instance, maybe we want a human-readable spoiler log, that has item locations and hint content without the formatting info. Maybe we want a "Plandomizer File", which is that but the hint strings include formatting info so that the formatting/colors can be changed, and eventually we may want to let cosmetic info be specified in there as well. Or maybe we just want a Race/Patch file that just has the seed and settings, for Race files we could also specify non-rando settings that should be locked to certain values. Or maybe want one of each. All of that is stuff that should at least start being handled at the location of this TODO statement.

* Fixes a scope issue Windows didn't catch

* Removes std::ranges::generate as apparently AppleClang can't do it.

* Removes std::ranges::any_of as apparently AppleClang can't do it.

* Re-adds what I thought was an unused include.

* An attempt to fix the macos construct_at error
---
 .../Enhancements/randomizer/3drando/hints.cpp |   6 +-
 .../randomizer/3drando/playthrough.cpp        |   3 +-
 soh/soh/Enhancements/randomizer/context.cpp   | 247 ++++++++----------
 soh/soh/Enhancements/randomizer/context.h     |  42 +--
 soh/soh/Enhancements/randomizer/dungeon.cpp   |  61 ++---
 soh/soh/Enhancements/randomizer/dungeon.h     |  14 +-
 soh/soh/Enhancements/randomizer/item.cpp      |  89 ++++---
 soh/soh/Enhancements/randomizer/item.h        |  26 +-
 .../Enhancements/randomizer/item_location.cpp |  42 +--
 .../Enhancements/randomizer/item_location.h   |  14 +-
 .../Enhancements/randomizer/item_override.cpp |  23 +-
 .../Enhancements/randomizer/item_override.h   |  12 +-
 soh/soh/Enhancements/randomizer/location.cpp  |  70 ++---
 soh/soh/Enhancements/randomizer/location.h    | 172 ++++++------
 soh/soh/Enhancements/randomizer/option.cpp    |  46 ++--
 soh/soh/Enhancements/randomizer/option.h      |  10 +-
 soh/soh/Enhancements/randomizer/settings.cpp  | 102 ++++----
 soh/soh/Enhancements/randomizer/settings.h    |  14 +-
 soh/soh/Enhancements/randomizer/trial.cpp     |  28 +-
 soh/soh/Enhancements/randomizer/trial.h       |   4 +-
 20 files changed, 516 insertions(+), 509 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.cpp b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
index 3892c70d9..9007c25d1 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hints.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
@@ -152,7 +152,7 @@ Text AutoFormatHintText(Text unformattedHintText) {
   for (int i = 0; i < LANGUAGE_MAX; i++) {
     std::string textStr = unformattedHintText.GetForLanguage(i);
     // RANDOTODO: don't just make manual exceptions
-    bool needsAutomaicNewlines = true;
+    bool needsAutomaticNewlines = true;
     if (textStr == "Erreur 0x69a504:&Traduction manquante^C'est de la faute à Purple Hato!&J'vous jure!" ||
       textStr == "Mon très cher @:&Viens vite au château, je t'ai préparé&un délicieux gâteau...^À bientôt, Princesse Zelda" ||
       textStr == "What about Zelda makes you think&she'd be a better ruler than I?^I saved Lon Lon Ranch,&fed the hungry,&and my castle floats." ||
@@ -163,10 +163,10 @@ Text AutoFormatHintText(Text unformattedHintText) {
       textStr == "Oh! It's @.&I was expecting someone called Sheik.&Do you know what happened to them?" ||
       textStr == "Ah, c'est @.&J'attendais un certain Sheik.&Tu sais ce qui lui est arrivé?" ||
       textStr == "They say \"Forgive me, but-^Your script will not be used.&....After all...^The one writing the rest of the script...&will be me.\"") {
-    needsAutomaicNewlines = false;
+    needsAutomaticNewlines = false;
   }
 
-    if (needsAutomaicNewlines) {
+    if (needsAutomaticNewlines) {
         // insert newlines either manually or when encountering a '&'
         constexpr size_t lineLength = 34;
         size_t lastNewline = 0;
diff --git a/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp b/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
index 8dfa38d7e..4beb5f07f 100644
--- a/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
@@ -59,7 +59,8 @@ int Playthrough_Init(uint32_t seed, std::unordered_map<RandomizerSettingKey, uin
     GenerateHash();
     WriteIngameSpoilerLog();
 
-    if (/*Settings::GenerateSpoilerLog TODO: do we ever not want to write a spoiler log?*/ true) {
+    if (true) {
+        //TODO: Handle different types of file output (i.e. Spoiler Log, Plando Template, Patch Files, Race Files, etc.)
         // write logs
         printf("\x1b[11;10HWriting Spoiler Log...");
         if (SpoilerLog_Write(cvarSettings[RSK_LANGUAGE])) {
diff --git a/soh/soh/Enhancements/randomizer/context.cpp b/soh/soh/Enhancements/randomizer/context.cpp
index f85ed3ec3..a403d766e 100644
--- a/soh/soh/Enhancements/randomizer/context.cpp
+++ b/soh/soh/Enhancements/randomizer/context.cpp
@@ -14,7 +14,6 @@
 
 namespace Rando {
 std::weak_ptr<Context> Context::mContext;
-
 Context::Context() {
     for (auto& location : StaticData::GetLocationTable()) {
         mSpoilerfileCheckNameToEnum[location.GetName()] = location.GetRandomizerCheck();
@@ -25,8 +24,9 @@ Context::Context() {
     for (auto& item : StaticData::GetItemTable()) {
         // Easiest way to filter out all the empty values from the array, since we still technically want the 0/RG_NONE
         // entry
-        if (item.GetName().english.empty())
+        if (item.GetName().english.empty()) {
             continue;
+        }
         mSpoilerfileGetNameToEnum[item.GetName().english] = item.GetRandomizerGet();
         mSpoilerfileGetNameToEnum[item.GetName().french] = item.GetRandomizerGet();
     }
@@ -46,8 +46,9 @@ Context::Context() {
         { "Named Item", HINT_TYPE_NAMED_ITEM },
         { "Random", HINT_TYPE_RANDOM }
     };
+
     for (int i = 0; i < RC_MAX; i++) {
-        itemLocationTable[i] = ItemLocation((RandomizerCheck)i);
+        itemLocationTable[i] = ItemLocation(static_cast<RandomizerCheck>(i));
     }
     mEntranceShuffler = std::make_shared<EntranceShuffler>();
     mDungeons = std::make_shared<Dungeons>();
@@ -68,27 +69,27 @@ std::shared_ptr<Context> Context::GetInstance() {
     return mContext.lock();
 }
 
-Hint* Context::GetHint(RandomizerHintKey hintKey) {
+Hint* Context::GetHint(const RandomizerHintKey hintKey) {
     return &hintTable[hintKey];
 }
 
-void Context::AddHint(RandomizerHintKey hintId, Text text, RandomizerCheck hintedLocation, HintType hintType,
-                      Text hintedRegion) {
+void Context::AddHint(const RandomizerHintKey hintId, const Text& text, const RandomizerCheck hintedLocation, const HintType hintType,
+                      const Text& hintedRegion) {
     hintTable[hintId] = Hint(text, hintedLocation, hintType, hintedRegion);
     GetItemLocation(hintedLocation)->SetHintKey(hintId);
 }
 
-ItemLocation* Context::GetItemLocation(RandomizerCheck locKey) {
-    return &(itemLocationTable[locKey]);
+ItemLocation* Context::GetItemLocation(const RandomizerCheck locKey) {
+    return &itemLocationTable[locKey];
 }
 
 ItemLocation* Context::GetItemLocation(size_t locKey) {
-    return &(itemLocationTable[static_cast<RandomizerCheck>(locKey)]);
+    return &itemLocationTable[static_cast<RandomizerCheck>(locKey)];
 }
 
-void Context::PlaceItemInLocation(RandomizerCheck locKey, RandomizerGet item, bool applyEffectImmediately,
-                                  bool setHidden) {
-    auto loc = GetItemLocation(locKey);
+void Context::PlaceItemInLocation(const RandomizerCheck locKey, const RandomizerGet item, const bool applyEffectImmediately,
+                                  const bool setHidden) {
+    const auto loc = GetItemLocation(locKey);
     SPDLOG_DEBUG("\n");
     SPDLOG_DEBUG(StaticData::RetrieveItem(item).GetName().GetEnglish());
     SPDLOG_DEBUG(" placed at ");
@@ -96,19 +97,19 @@ void Context::PlaceItemInLocation(RandomizerCheck locKey, RandomizerGet item, bo
     SPDLOG_DEBUG("\n\n");
 
     if (applyEffectImmediately || mSettings->Setting(RSK_LOGIC_RULES).Is(RO_LOGIC_GLITCHLESS) || mSettings->Setting(RSK_LOGIC_RULES).Is(RO_LOGIC_VANILLA)) {
-        Rando::StaticData::RetrieveItem(item).ApplyEffect();
+        StaticData::RetrieveItem(item).ApplyEffect();
     }
 
     // TODO? Show Progress
 
     // If we're placing a non-shop item in a shop location, we want to record it for custom messages
     if (StaticData::RetrieveItem(item).GetItemType() != ITEMTYPE_SHOP &&
-        Rando::StaticData::GetLocation(locKey)->IsCategory(Category::cShop)) {
-        int index = TransformShopIndex(GetShopIndex(locKey));
-        NonShopItems[index].Name = Rando::StaticData::RetrieveItem(item).GetName();
+        StaticData::GetLocation(locKey)->IsCategory(Category::cShop)) {
+        const int index = TransformShopIndex(GetShopIndex(locKey));
+        NonShopItems[index].Name = StaticData::RetrieveItem(item).GetName();
         NonShopItems[index].Repurchaseable =
-            Rando::StaticData::RetrieveItem(item).GetItemType() == ITEMTYPE_REFILL ||
-            Rando::StaticData::RetrieveItem(item).GetHintKey() == RHT_PROGRESSIVE_BOMBCHUS;
+            StaticData::RetrieveItem(item).GetItemType() == ITEMTYPE_REFILL ||
+            StaticData::RetrieveItem(item).GetHintKey() == RHT_PROGRESSIVE_BOMBCHUS;
     }
 
     loc->SetPlacedItem(item);
@@ -117,7 +118,7 @@ void Context::PlaceItemInLocation(RandomizerCheck locKey, RandomizerGet item, bo
     }
 }
 
-void Context::AddLocation(RandomizerCheck loc, std::vector<RandomizerCheck>* destination) {
+void Context::AddLocation(const RandomizerCheck loc, std::vector<RandomizerCheck>* destination) {
     if (destination == nullptr) {
         destination = &allLocations;
     }
@@ -140,23 +141,23 @@ void Context::GenerateLocationPool() {
     }
     AddLocations(StaticData::overworldLocations);
 
-    for (auto dungeon : mDungeons->GetDungeonList()) {
+    for (const auto dungeon : mDungeons->GetDungeonList()) {
         AddLocations(dungeon->GetDungeonLocations());
     }
 }
 
 void Context::AddExcludedOptions() {
     AddLocations(StaticData::overworldLocations, &everyPossibleLocation);
-    for (auto dungeon : mDungeons->GetDungeonList()) {
+    for (const auto dungeon : mDungeons->GetDungeonList()) {
         AddLocations(dungeon->GetEveryLocation(), &everyPossibleLocation);
     }
-    for (RandomizerCheck rc : everyPossibleLocation) {
+    for (const RandomizerCheck rc : everyPossibleLocation) {
         GetItemLocation(rc)->AddExcludeOption();
     }
 }
 
 std::vector<RandomizerCheck> Context::GetLocations(const std::vector<RandomizerCheck>& locationPool,
-                                                   Category categoryInclude, Category categoryExclude) {
+                                                   const Category categoryInclude, const Category categoryExclude) {
     std::vector<RandomizerCheck> locationsInCategory;
     for (RandomizerCheck locKey : locationPool) {
         if (StaticData::GetLocation(locKey)->IsCategory(categoryInclude) &&
@@ -168,25 +169,25 @@ std::vector<RandomizerCheck> Context::GetLocations(const std::vector<RandomizerC
 }
 
 void Context::ItemReset() {
-    for (RandomizerCheck il : allLocations) {
+    for (const RandomizerCheck il : allLocations) {
         GetItemLocation(il)->ResetVariables();
     }
 
-    for (RandomizerCheck il : Rando::StaticData::dungeonRewardLocations) {
+    for (const RandomizerCheck il : StaticData::dungeonRewardLocations) {
         GetItemLocation(il)->ResetVariables();
     }
 }
 
 void Context::LocationReset() {
-    for (RandomizerCheck il : allLocations) {
+    for (const RandomizerCheck il : allLocations) {
         GetItemLocation(il)->RemoveFromPool();
     }
 
-    for (RandomizerCheck il : Rando::StaticData::dungeonRewardLocations) {
+    for (const RandomizerCheck il : StaticData::dungeonRewardLocations) {
         GetItemLocation(il)->RemoveFromPool();
     }
 
-    for (RandomizerCheck il : Rando::StaticData::gossipStoneLocations) {
+    for (const RandomizerCheck il : StaticData::gossipStoneLocations) {
         GetItemLocation(il)->RemoveFromPool();
     }
 
@@ -194,18 +195,18 @@ void Context::LocationReset() {
 }
 
 void Context::HintReset() {
-    for (RandomizerCheck il : Rando::StaticData::gossipStoneLocations) {
+    for (const RandomizerCheck il : StaticData::gossipStoneLocations) {
         GetItemLocation(il)->ResetVariables();
-        GetHint((RandomizerHintKey)(il - RC_COLOSSUS_GOSSIP_STONE + 1))->ResetVariables();
+        GetHint(static_cast<RandomizerHintKey>(il - RC_COLOSSUS_GOSSIP_STONE + 1))->ResetVariables();
     }
 }
 
 void Context::CreateItemOverrides() {
     SPDLOG_DEBUG("NOW CREATING OVERRIDES\n\n");
     for (RandomizerCheck locKey : allLocations) {
-        auto loc = Rando::StaticData::GetLocation(locKey);
-        auto itemLoc = GetItemLocation(locKey);
+        const auto loc = StaticData::GetLocation(locKey);
         // If this is an ice trap, store the disguise model in iceTrapModels
+        const auto itemLoc = GetItemLocation(locKey);
         if (itemLoc->GetPlacedRandomizerGet() == RG_ICE_TRAP) {
             ItemOverride val(locKey, RandomElement(possibleIceTrapModels));
             iceTrapModels[locKey] = val.LooksLike();
@@ -225,32 +226,32 @@ void Context::CreateItemOverrides() {
     SPDLOG_DEBUG(std::to_string(overrides.size()));
 }
 
-bool Context::IsSeedGenerated() {
+bool Context::IsSeedGenerated() const {
     return mSeedGenerated;
 }
 
-void Context::SetSeedGenerated(bool seedGenerated) {
+void Context::SetSeedGenerated(const bool seedGenerated) {
     mSeedGenerated = seedGenerated;
 }
 
-bool Context::IsSpoilerLoaded() {
+bool Context::IsSpoilerLoaded() const {
     return mSpoilerLoaded;
 }
 
-void Context::SetSpoilerLoaded(bool spoilerLoaded) {
+void Context::SetSpoilerLoaded(const bool spoilerLoaded) {
     mSpoilerLoaded = spoilerLoaded;
 }
 
-bool Context::IsPlandoLoaded() {
+bool Context::IsPlandoLoaded() const {
     return mPlandoLoaded;
 }
 
-void Context::SetPlandoLoaded(bool plandoLoaded) {
+void Context::SetPlandoLoaded(const bool plandoLoaded) {
     mPlandoLoaded = plandoLoaded;
 }
 
-GetItemEntry Context::GetFinalGIEntry(RandomizerCheck rc, bool checkObtainability, GetItemID ogItemId) {
-    auto itemLoc = GetItemLocation(rc);
+GetItemEntry Context::GetFinalGIEntry(const RandomizerCheck rc, const bool checkObtainability, const GetItemID ogItemId) {
+    const auto itemLoc = GetItemLocation(rc);
     if (itemLoc->GetPlacedRandomizerGet() == RG_NONE) {
         if (ogItemId != GI_NONE) {
             return ItemTableManager::Instance->RetrieveItemEntry(MOD_NONE, ogItemId);
@@ -264,7 +265,7 @@ GetItemEntry Context::GetFinalGIEntry(RandomizerCheck rc, bool checkObtainabilit
     }
     GetItemEntry giEntry = itemLoc->GetPlacedItem().GetGIEntry_Copy();
     if (overrides.contains(rc)) {
-        auto fakeGiEntry = StaticData::RetrieveItem(overrides[rc].LooksLike()).GetGIEntry();
+        const auto fakeGiEntry = StaticData::RetrieveItem(overrides[rc].LooksLike()).GetGIEntry();
         giEntry.gid = fakeGiEntry->gid;
         giEntry.gi = fakeGiEntry->gi;
         giEntry.drawItemId = fakeGiEntry->drawItemId;
@@ -286,14 +287,12 @@ std::string sanitize(std::string stringValue) {
     }
 
     // Removes others.
-    stringValue.erase(std::remove_if(stringValue.begin(), stringValue.end(),
-                                     [](char const c) { return '\n' == c || '\r' == c || '\0' == c || '\x1A' == c; }),
-                      stringValue.end());
+    std::erase_if(stringValue, [](char const c) { return '\n' == c || '\r' == c || '\0' == c || '\x1A' == c; });
 
     return stringValue;
 }
 
-void Context::ParseSpoiler(const char* spoilerFileName, bool plandoMode) {
+void Context::ParseSpoiler(const char* spoilerFileName, const bool plandoMode) {
     std::ifstream spoilerFileStream(sanitize(spoilerFileName));
     if (!spoilerFileStream) {
         return;
@@ -316,8 +315,8 @@ void Context::ParseSpoiler(const char* spoilerFileName, bool plandoMode) {
         }
         mSpoilerLoaded = true;
         mSeedGenerated = false;
-    } catch (std::exception& e) {
-        throw e;
+    } catch (...) {
+        throw;
     }
 }
 
@@ -338,117 +337,103 @@ void Context::ParseItemLocationsJson(nlohmann::json spoilerFileJson) {
             nlohmann::json itemJson = *it;
             for (auto itemit = itemJson.begin(); itemit != itemJson.end(); ++itemit) {
                 if (itemit.key() == "item") {
-                    itemLocationTable[rc].SetPlacedItem(mSpoilerfileGetNameToEnum[itemit.value().template get<std::string>()]);
+                    itemLocationTable[rc].SetPlacedItem(mSpoilerfileGetNameToEnum[itemit.value().get<std::string>()]);
                 } else if (itemit.key() == "price") {
-                    itemLocationTable[rc].SetCustomPrice(itemit.value().template get<uint16_t>());
+                    itemLocationTable[rc].SetCustomPrice(itemit.value().get<uint16_t>());
                 } else if (itemit.key() == "model") {
-                    overrides[rc] = ItemOverride(rc, mSpoilerfileGetNameToEnum[itemit.value().template get<std::string>()]);
+                    overrides[rc] = ItemOverride(rc, mSpoilerfileGetNameToEnum[itemit.value().get<std::string>()]);
                 } else if (itemit.key() == "trickName") {
-                    overrides[rc].SetTrickName(Text(itemit.value().template get<std::string>()));
+                    overrides[rc].SetTrickName(Text(itemit.value().get<std::string>()));
                 }
             }
         } else {
-            itemLocationTable[rc].SetPlacedItem(mSpoilerfileGetNameToEnum[it.value().template get<std::string>()]);
+            itemLocationTable[rc].SetPlacedItem(mSpoilerfileGetNameToEnum[it.value().get<std::string>()]);
         }
     }
 }
 
-std::string AltarIconString(char iconChar) {
-    std::string iconString = "";
+std::string AltarIconString(const char iconChar) {
+    std::string iconString;
+    iconString += '\x13';
     switch (iconChar) {
         case '0':
             // Kokiri Emerald
-            iconString += 0x13;
-            iconString += 0x6C;
+            iconString += '\x6C';
             break;
         case '1':
             // Goron Ruby
-            iconString += 0x13;
-            iconString += 0x6D;
+            iconString += '\x6D';
             break;
         case '2':
             // Zora Sapphire
-            iconString += 0x13;
-            iconString += 0x6E;
+            iconString += '\x6E';
             break;
         case '3':
             // Forest Medallion
-            iconString += 0x13;
-            iconString += 0x66;
+            iconString += '\x66';
             break;
         case '4':
             // Fire Medallion
-            iconString += 0x13;
-            iconString += 0x67;
+            iconString += '\x67';
             break;
         case '5':
             // Water Medallion
-            iconString += 0x13;
-            iconString += 0x68;
+            iconString += '\x68';
             break;
         case '6':
             // Spirit Medallion
-            iconString += 0x13;
-            iconString += 0x69;
+            iconString += '\x69';
             break;
         case '7':
             // Shadow Medallion
-            iconString += 0x13;
-            iconString += 0x6A;
+            iconString += '\x6A';
             break;
         case '8':
             // Light Medallion
-            iconString += 0x13;
-            iconString += 0x6B;
+            iconString += '\x6B';
             break;
         case 'o':
             // Open DOT (master sword)
-            iconString += 0x13;
-            iconString += 0x3C;
+            iconString += '\x3C';
             break;
         case 'c':
             // Closed DOT (fairy ocarina)
-            iconString += 0x13;
-            iconString += 0x07;
+            iconString += '\x07';
             break;
         case 'i':
             // Intended DOT (oot)
-            iconString += 0x13;
-            iconString += 0x08;
+            iconString += '\x08';
             break;
         case 'l':
             // Light Arrow (for bridge reqs)
-            iconString += 0x13;
-            iconString += 0x12;
+            iconString += '\x12';
             break;
         case 'b':
             // Boss Key (ganon boss key location)
-            iconString += 0x13;
-            iconString += 0x74;
+            iconString += '\x74';
             break;
         case 'L':
             // Bow with Light Arrow
-            iconString += 0x13;
-            iconString += 0x3A;
+            iconString += '\x3A';
             break;
         case 'k':
             // Kokiri Tunic
-            iconString += 0x13;
-            iconString += 0x41;
+            iconString += '\x41';
+            break;
+        default:
             break;
     }
     return iconString;
 }
 
-std::string FormatJsonHintText(std::string jsonHint) {
+std::string FormatJsonHintText(const std::string& jsonHint) {
     std::string formattedHintMessage = jsonHint;
 
     // add icons to altar text
-    for (char iconChar : { '0', '1', '2', '3', '4', '5', '6', '7', '8', 'o', 'c', 'i', 'l', 'b', 'L', 'k' }) {
+    for (const char iconChar : { '0', '1', '2', '3', '4', '5', '6', '7', '8', 'o', 'c', 'i', 'l', 'b', 'L', 'k' }) {
         std::string textToReplace = "$";
         textToReplace += iconChar;
-        size_t start_pos = formattedHintMessage.find(textToReplace);
-        if (!(start_pos == std::string::npos)) {
+        if (const size_t start_pos = formattedHintMessage.find(textToReplace); start_pos != std::string::npos) {
             std::string iconString = AltarIconString(iconChar);
             formattedHintMessage.replace(start_pos, textToReplace.length(), iconString);
         }
@@ -458,69 +443,69 @@ std::string FormatJsonHintText(std::string jsonHint) {
 
 void Context::ParseHintJson(nlohmann::json spoilerFileJson) {
     // Child Altar
-    std::string childAltarJsonText = spoilerFileJson["childAltar"]["hintText"].template get<std::string>();
+    std::string childAltarJsonText = spoilerFileJson["childAltar"]["hintText"].get<std::string>();
     std::string formattedChildAltarText = FormatJsonHintText(childAltarJsonText);
     AddHint(RH_ALTAR_CHILD, Text(formattedChildAltarText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text());
     mEmeraldLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["childAltar"]["rewards"]["emeraldLoc"]];
     mRubyLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["childAltar"]["rewards"]["rubyLoc"]];
     mSapphireLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["childAltar"]["rewards"]["sapphireLoc"]];
     // Adult Altar
-    std::string adultAltarJsonText = spoilerFileJson["adultAltar"]["hintText"].template get<std::string>();
+    std::string adultAltarJsonText = spoilerFileJson["adultAltar"]["hintText"].get<std::string>();
     std::string formattedAdultAltarText = FormatJsonHintText(adultAltarJsonText);
     AddHint(RH_ALTAR_ADULT, Text(formattedAdultAltarText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text());
-    mForestMedallionLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["forestMedallionLoc"].template get<std::string>()];
-    mFireMedallionLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["fireMedallionLoc"].template get<std::string>()];
-    mWaterMedallionLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["waterMedallionLoc"].template get<std::string>()];
-    mShadowMedallionLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["shadowMedallionLoc"].template get<std::string>()];
-    mSpiritMedallionLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["spiritMedallionLoc"].template get<std::string>()];
-    mLightMedallionLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["lightMedallionLoc"].template get<std::string>()];
+    mForestMedallionLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["forestMedallionLoc"].get<std::string>()];
+    mFireMedallionLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["fireMedallionLoc"].get<std::string>()];
+    mWaterMedallionLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["waterMedallionLoc"].get<std::string>()];
+    mShadowMedallionLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["shadowMedallionLoc"].get<std::string>()];
+    mSpiritMedallionLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["spiritMedallionLoc"].get<std::string>()];
+    mLightMedallionLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["lightMedallionLoc"].get<std::string>()];
     // Ganondorf and Sheik Light Arrow Hints
-    std::string ganonHintText = FormatJsonHintText(spoilerFileJson["ganonHintText"].template get<std::string>());
-    RandomizerCheck lightArrowLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["lightArrowHintLoc"].template get<std::string>()];
-    std::string lightArrowRegion = spoilerFileJson["lightArrowHintRegion"].template get<std::string>();
+    std::string ganonHintText = FormatJsonHintText(spoilerFileJson["ganonHintText"].get<std::string>());
+    RandomizerCheck lightArrowLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["lightArrowHintLoc"].get<std::string>()];
+    std::string lightArrowRegion = spoilerFileJson["lightArrowHintRegion"].get<std::string>();
     AddHint(RH_GANONDORF_HINT, Text(ganonHintText), lightArrowLoc, HINT_TYPE_STATIC, Text(lightArrowRegion));
-    std::string sheikText = FormatJsonHintText(spoilerFileJson["sheikText"].template get<std::string>());
+    std::string sheikText = FormatJsonHintText(spoilerFileJson["sheikText"].get<std::string>());
     AddHint(RH_SHEIK_LIGHT_ARROWS, Text(sheikText), lightArrowLoc, HINT_TYPE_STATIC, lightArrowRegion);
-    std::string ganonText = FormatJsonHintText(spoilerFileJson["ganonText"].template get<std::string>());
+    std::string ganonText = FormatJsonHintText(spoilerFileJson["ganonText"].get<std::string>());
     AddHint(RH_GANONDORF_NOHINT, Text(ganonText), RC_UNKNOWN_CHECK, HINT_TYPE_JUNK, Text());
     // Dampe Hookshot Hint
-    std::string dampeText = FormatJsonHintText(spoilerFileJson["dampeText"].template get<std::string>());
-    std::string dampeRegion = spoilerFileJson["dampeRegion"].template get<std::string>();
-    RandomizerCheck dampeHintLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["dampeHintLoc"].template get<std::string>()];
+    std::string dampeText = FormatJsonHintText(spoilerFileJson["dampeText"].get<std::string>());
+    std::string dampeRegion = spoilerFileJson["dampeRegion"].get<std::string>();
+    RandomizerCheck dampeHintLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["dampeHintLoc"].get<std::string>()];
     AddHint(RH_DAMPES_DIARY, Text(dampeText), dampeHintLoc, HINT_TYPE_STATIC, Text(dampeRegion));
     // Greg Hint
-    std::string gregText = FormatJsonHintText(spoilerFileJson["gregText"].template get<std::string>());
-    std::string gregRegion = spoilerFileJson["gregRegion"].template get<std::string>();
-    RandomizerCheck gregLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["gregLoc"].template get<std::string>()];
+    std::string gregText = FormatJsonHintText(spoilerFileJson["gregText"].get<std::string>());
+    std::string gregRegion = spoilerFileJson["gregRegion"].get<std::string>();
+    RandomizerCheck gregLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["gregLoc"].get<std::string>()];
     AddHint(RH_GREG_RUPEE, Text(gregText), gregLoc, HINT_TYPE_STATIC, Text(gregRegion));
     // Saria Magic Hint
-    std::string sariaText = FormatJsonHintText(spoilerFileJson["sariaText"].template get<std::string>());
-    std::string sariaRegion = spoilerFileJson["sariaRegion"].template get<std::string>();
-    RandomizerCheck sariaHintLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["sariaHintLoc"].template get<std::string>()];
+    std::string sariaText = FormatJsonHintText(spoilerFileJson["sariaText"].get<std::string>());
+    std::string sariaRegion = spoilerFileJson["sariaRegion"].get<std::string>();
+    RandomizerCheck sariaHintLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["sariaHintLoc"].get<std::string>()];
     AddHint(RH_SARIA, Text(sariaText), sariaHintLoc, HINT_TYPE_STATIC, Text(sariaRegion));
     // Warp Songs
-    std::string warpMinuetText = FormatJsonHintText(spoilerFileJson["warpMinuetText"].template get<std::string>());
+    std::string warpMinuetText = FormatJsonHintText(spoilerFileJson["warpMinuetText"].get<std::string>());
     AddHint(RH_MINUET_WARP_LOC, Text(warpMinuetText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text(warpMinuetText));
-    std::string warpBoleroText = FormatJsonHintText(spoilerFileJson["warpBoleroText"].template get<std::string>());
+    std::string warpBoleroText = FormatJsonHintText(spoilerFileJson["warpBoleroText"].get<std::string>());
     AddHint(RH_BOLERO_WARP_LOC, Text(warpBoleroText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text(warpBoleroText));
-    std::string warpSerenadeText = FormatJsonHintText(spoilerFileJson["warpSerenadeText"].template get<std::string>());
+    std::string warpSerenadeText = FormatJsonHintText(spoilerFileJson["warpSerenadeText"].get<std::string>());
     AddHint(RH_SERENADE_WARP_LOC, Text(warpSerenadeText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text(warpSerenadeText));
-    std::string warpRequiemText = FormatJsonHintText(spoilerFileJson["warpRequiemText"].template get<std::string>());
+    std::string warpRequiemText = FormatJsonHintText(spoilerFileJson["warpRequiemText"].get<std::string>());
     AddHint(RH_REQUIEM_WARP_LOC, Text(warpRequiemText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text(warpRequiemText));
-    std::string warpNocturneText = FormatJsonHintText(spoilerFileJson["warpNocturneText"].template get<std::string>());
+    std::string warpNocturneText = FormatJsonHintText(spoilerFileJson["warpNocturneText"].get<std::string>());
     AddHint(RH_NOCTURNE_WARP_LOC, Text(warpNocturneText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text(warpNocturneText));
-    std::string warpPreludeText = FormatJsonHintText(spoilerFileJson["warpPreludeText"].template get<std::string>());
+    std::string warpPreludeText = FormatJsonHintText(spoilerFileJson["warpPreludeText"].get<std::string>());
     AddHint(RH_PRELUDE_WARP_LOC, Text(warpPreludeText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text(warpPreludeText));
     // Gossip Stones
     nlohmann::json hintsJson = spoilerFileJson["hints"];
-    for (auto it = hintsJson.begin(); it != hintsJson.end(); it++) {
+    for (auto it = hintsJson.begin(); it != hintsJson.end(); ++it) {
         RandomizerCheck gossipStoneLoc = mSpoilerfileCheckNameToEnum[it.key()];
         nlohmann::json hintInfo = it.value();
-        std::string hintText = FormatJsonHintText(hintInfo["hint"].template get<std::string>());
-        HintType hintType = mSpoilerfileHintTypeNameToEnum[hintInfo["type"].template get<std::string>()];
+        std::string hintText = FormatJsonHintText(hintInfo["hint"].get<std::string>());
+        HintType hintType = mSpoilerfileHintTypeNameToEnum[hintInfo["type"].get<std::string>()];
         RandomizerCheck hintedLocation = mSpoilerfileCheckNameToEnum[hintInfo["location"]];
-        std::string hintedArea = hintInfo["area"].template get<std::string>();
-        AddHint(RandomizerHintKey(gossipStoneLoc - RC_COLOSSUS_GOSSIP_STONE + 1), Text(hintText), hintedLocation, hintType, hintedArea);
+        std::string hintedArea = hintInfo["area"].get<std::string>();
+        AddHint(static_cast<RandomizerHintKey>(gossipStoneLoc - RC_COLOSSUS_GOSSIP_STONE + 1), Text(hintText), hintedLocation, hintType, hintedArea);
     }
 }
 
@@ -528,7 +513,7 @@ std::shared_ptr<Settings> Context::GetSettings() {
     return mSettings;
 }
 
-const std::shared_ptr<EntranceShuffler> Context::GetEntranceShuffler() {
+std::shared_ptr<EntranceShuffler> Context::GetEntranceShuffler() {
     return mEntranceShuffler;
 }
 
@@ -536,27 +521,27 @@ std::shared_ptr<Dungeons> Context::GetDungeons() {
     return mDungeons;
 }
 
-DungeonInfo* Context::GetDungeon(size_t key) {
-    return mDungeons->GetDungeon(DungeonKey(key));
+DungeonInfo* Context::GetDungeon(size_t key) const {
+    return mDungeons->GetDungeon(static_cast<DungeonKey>(key));
 }
 
 std::shared_ptr<Trials> Context::GetTrials() {
     return mTrials;
 }
 
-TrialInfo* Context::GetTrial(size_t key) {
-    return mTrials->GetTrial(TrialKey(key));
+TrialInfo* Context::GetTrial(size_t key) const {
+    return mTrials->GetTrial(static_cast<TrialKey>(key));
 }
 
-Sprite* Context::GetSeedTexture(uint8_t index) {
+Sprite* Context::GetSeedTexture(const uint8_t index) {
     return &gSeedTextures[index];
 }
 
-Rando::Option& Context::GetOption(RandomizerSettingKey key) {
+Option& Context::GetOption(const RandomizerSettingKey key) const {
     return mSettings->Setting(key);
 }
 
-Rando::Option& Context::GetTrickOption(RandomizerTrick key) {
+Option& Context::GetTrickOption(const RandomizerTrick key) const {
     return mSettings->GetTrickOption(key);
 }
 } // namespace Rando
diff --git a/soh/soh/Enhancements/randomizer/context.h b/soh/soh/Enhancements/randomizer/context.h
index 4d7e07eee..90f62eaac 100644
--- a/soh/soh/Enhancements/randomizer/context.h
+++ b/soh/soh/Enhancements/randomizer/context.h
@@ -33,8 +33,8 @@ class Context {
     static std::shared_ptr<Context> CreateInstance();
     static std::shared_ptr<Context> GetInstance();
     Hint* GetHint(RandomizerHintKey hintKey);
-    void AddHint(RandomizerHintKey hintId, Text text, RandomizerCheck hintedLocation, HintType hintType,
-                 Text hintedRegion);
+    void AddHint(RandomizerHintKey hintId, const Text& text, RandomizerCheck hintedLocation, HintType hintType,
+                 const Text& hintedRegion);
     ItemLocation* GetItemLocation(RandomizerCheck locKey);
     ItemLocation* GetItemLocation(size_t locKey);
     void PlaceItemInLocation(RandomizerCheck locKey, RandomizerGet item, bool applyEffectImmediately = false,
@@ -44,28 +44,28 @@ class Context {
     template <typename Container>
     void AddLocations(const Container& locations, std::vector<RandomizerCheck>* destination = nullptr);
     void GenerateLocationPool();
-    std::vector<RandomizerCheck> GetLocations(const std::vector<RandomizerCheck>& locationPool,
+    static std::vector<RandomizerCheck> GetLocations(const std::vector<RandomizerCheck>& locationPool,
                                               Category categoryInclude, Category categoryExclude = Category::cNull);
     void AddExcludedOptions();
     void LocationReset();
     void ItemReset();
     void HintReset();
     void CreateItemOverrides();
-    bool IsSeedGenerated();
+    bool IsSeedGenerated() const;
     void SetSeedGenerated(bool seedGenerated = true);
-    bool IsSpoilerLoaded();
+    bool IsSpoilerLoaded() const;
     void SetSpoilerLoaded(bool spoilerLoaded = true);
-    bool IsPlandoLoaded();
+    bool IsPlandoLoaded() const;
     void SetPlandoLoaded(bool plandoLoaded = true);
     std::shared_ptr<Settings> GetSettings();
-    const std::shared_ptr<EntranceShuffler> GetEntranceShuffler();
+    std::shared_ptr<EntranceShuffler> GetEntranceShuffler();
     std::shared_ptr<Dungeons> GetDungeons();
-    DungeonInfo* GetDungeon(size_t key);
+    DungeonInfo* GetDungeon(size_t key) const;
     std::shared_ptr<Trials> GetTrials();
-    TrialInfo* GetTrial(size_t key);
-    Sprite* GetSeedTexture(uint8_t index);
-    Option& GetOption(RandomizerSettingKey key);
-    Option& GetTrickOption(RandomizerTrick key);
+    TrialInfo* GetTrial(size_t key) const;
+    static Sprite* GetSeedTexture(uint8_t index);
+    Option& GetOption(RandomizerSettingKey key) const;
+    Option& GetTrickOption(RandomizerTrick key) const;
     GetItemEntry GetFinalGIEntry(RandomizerCheck rc, bool checkObtainability = true, GetItemID ogItemId = GI_NONE);
     void ParseSpoiler(const char* spoilerFileName, bool plandoMode);
     void ParseHashIconIndexesJson(nlohmann::json spoilerFileJson);
@@ -87,15 +87,15 @@ class Context {
     std::unordered_map<std::string, RandomizerGet> mSpoilerfileGetNameToEnum;
     std::unordered_map<std::string, HintType> mSpoilerfileHintTypeNameToEnum;
     std::array<Hint, RH_MAX> hintTable = {};
-    RandomizerCheck mEmeraldLoc;
-    RandomizerCheck mRubyLoc;
-    RandomizerCheck mSapphireLoc;
-    RandomizerCheck mForestMedallionLoc;
-    RandomizerCheck mFireMedallionLoc;
-    RandomizerCheck mWaterMedallionLoc;
-    RandomizerCheck mShadowMedallionLoc;
-    RandomizerCheck mSpiritMedallionLoc;
-    RandomizerCheck mLightMedallionLoc;
+    RandomizerCheck mEmeraldLoc = RC_UNKNOWN_CHECK;
+    RandomizerCheck mRubyLoc = RC_UNKNOWN_CHECK;
+    RandomizerCheck mSapphireLoc = RC_UNKNOWN_CHECK;
+    RandomizerCheck mForestMedallionLoc = RC_UNKNOWN_CHECK;
+    RandomizerCheck mFireMedallionLoc = RC_UNKNOWN_CHECK;
+    RandomizerCheck mWaterMedallionLoc = RC_UNKNOWN_CHECK;
+    RandomizerCheck mShadowMedallionLoc = RC_UNKNOWN_CHECK;
+    RandomizerCheck mSpiritMedallionLoc = RC_UNKNOWN_CHECK;
+    RandomizerCheck mLightMedallionLoc = RC_UNKNOWN_CHECK;
     std::array<ItemLocation, RC_MAX> itemLocationTable = {};
     std::shared_ptr<Settings> mSettings;
     std::shared_ptr<EntranceShuffler> mEntranceShuffler;
diff --git a/soh/soh/Enhancements/randomizer/dungeon.cpp b/soh/soh/Enhancements/randomizer/dungeon.cpp
index 6b05efe48..ad600b594 100644
--- a/soh/soh/Enhancements/randomizer/dungeon.cpp
+++ b/soh/soh/Enhancements/randomizer/dungeon.cpp
@@ -5,17 +5,18 @@
 #include "context.h"
 
 namespace Rando {
-DungeonInfo::DungeonInfo(std::string name_, RandomizerHintTextKey hintKey_, RandomizerGet map_, RandomizerGet compass_,
-                         RandomizerGet smallKey_, RandomizerGet keyRing_, RandomizerGet bossKey_,
-                         uint8_t vanillaKeyCount_, uint8_t mqKeyCount_, std::vector<RandomizerCheck> vanillaLocations_,
-                         std::vector<RandomizerCheck> mqLocations_, std::vector<RandomizerCheck> sharedLocations_,
-                         std::vector<RandomizerCheck> bossRoomLocations_)
+DungeonInfo::DungeonInfo(std::string name_, const RandomizerHintTextKey hintKey_, const RandomizerGet map_,
+    const RandomizerGet compass_, const RandomizerGet smallKey_, const RandomizerGet keyRing_,
+    const RandomizerGet bossKey_, const uint8_t vanillaKeyCount_, const uint8_t mqKeyCount_,
+    std::vector<RandomizerCheck> vanillaLocations_, std::vector<RandomizerCheck> mqLocations_,
+    std::vector<RandomizerCheck> sharedLocations_, std::vector<RandomizerCheck> bossRoomLocations_)
     : name(std::move(name_)), hintKey(hintKey_), map(map_), compass(compass_), smallKey(smallKey_), keyRing(keyRing_),
       bossKey(bossKey_), vanillaKeyCount(vanillaKeyCount_), mqKeyCount(mqKeyCount_),
       vanillaLocations(std::move(vanillaLocations_)), mqLocations(std::move(mqLocations_)),
       sharedLocations(std::move(sharedLocations_)), bossRoomLocations(std::move(bossRoomLocations_)) {
 }
-DungeonInfo::DungeonInfo() = default;
+DungeonInfo::DungeonInfo() : hintKey(RHT_NONE), map(RG_NONE), compass(RG_NONE), smallKey(RG_NONE), keyRing(RG_NONE),
+    bossKey(RG_NONE) {}
 DungeonInfo::~DungeonInfo() = default;
 
 const std::string& DungeonInfo::GetName() const {
@@ -51,7 +52,7 @@ bool DungeonInfo::IsVanilla() const {
 }
 
 uint8_t DungeonInfo::GetSmallKeyCount() const {
-    return (masterQuest) ? mqKeyCount : vanillaKeyCount;
+    return masterQuest ? mqKeyCount : vanillaKeyCount;
 }
 
 RandomizerHintTextKey DungeonInfo::GetHintKey() const {
@@ -78,52 +79,52 @@ RandomizerGet DungeonInfo::GetBossKey() const {
     return bossKey;
 }
 
-void DungeonInfo::PlaceVanillaMap() {
+void DungeonInfo::PlaceVanillaMap() const {
     if (map == RG_NONE) {
         return;
     }
 
     auto dungeonLocations = GetDungeonLocations();
-    auto mapLocation = FilterFromPool(dungeonLocations, [](const RandomizerCheck loc) {
+    const auto mapLocation = FilterFromPool(dungeonLocations, [](const RandomizerCheck loc) {
         return StaticData::GetLocation(loc)->IsCategory(Category::cVanillaMap);
     })[0];
     Context::GetInstance()->PlaceItemInLocation(mapLocation, map);
 }
 
-void DungeonInfo::PlaceVanillaCompass() {
+void DungeonInfo::PlaceVanillaCompass() const {
     if (compass == RG_NONE) {
         return;
     }
 
     auto dungeonLocations = GetDungeonLocations();
-    auto compassLocation = FilterFromPool(dungeonLocations, [](const RandomizerCheck loc) {
+    const auto compassLocation = FilterFromPool(dungeonLocations, [](const RandomizerCheck loc) {
         return StaticData::GetLocation(loc)->IsCategory(Category::cVanillaCompass);
     })[0];
     Context::GetInstance()->PlaceItemInLocation(compassLocation, compass);
 }
 
-void DungeonInfo::PlaceVanillaBossKey() {
+void DungeonInfo::PlaceVanillaBossKey() const {
     if (bossKey == RG_NONE || bossKey == RG_GANONS_CASTLE_BOSS_KEY) {
         return;
     }
 
     auto dungeonLocations = GetDungeonLocations();
-    auto bossKeyLocation = FilterFromPool(dungeonLocations, [](const RandomizerCheck loc) {
+    const auto bossKeyLocation = FilterFromPool(dungeonLocations, [](const RandomizerCheck loc) {
         return StaticData::GetLocation(loc)->IsCategory(Category::cVanillaBossKey);
     })[0];
     Context::GetInstance()->PlaceItemInLocation(bossKeyLocation, bossKey);
 }
 
-void DungeonInfo::PlaceVanillaSmallKeys() {
+void DungeonInfo::PlaceVanillaSmallKeys() const {
     if (smallKey == RG_NONE) {
         return;
     }
 
     auto dungeonLocations = GetDungeonLocations();
-    auto smallKeyLocations = FilterFromPool(dungeonLocations, [](const RandomizerCheck loc) {
+    const auto smallKeyLocations = FilterFromPool(dungeonLocations, [](const RandomizerCheck loc) {
         return StaticData::GetLocation(loc)->IsCategory(Category::cVanillaSmallKey);
     });
-    for (auto location : smallKeyLocations) {
+    for (const auto location : smallKeyLocations) {
         Context::GetInstance()->PlaceItemInLocation(location, smallKey);
     }
 }
@@ -701,11 +702,11 @@ Dungeons::Dungeons() {
 
 Dungeons::~Dungeons() = default;
 
-DungeonInfo* Dungeons::GetDungeon(DungeonKey key) {
+DungeonInfo* Dungeons::GetDungeon(const DungeonKey key) {
     return &dungeonList[key];
 }
 
-DungeonInfo* Dungeons::GetDungeonFromScene(uint16_t scene) {
+DungeonInfo* Dungeons::GetDungeonFromScene(const uint16_t scene) {
     switch (scene) {
         case SCENE_DEKU_TREE:
             return &dungeonList[DEKU_TREE];
@@ -753,31 +754,27 @@ void Dungeons::ClearAllMQ() {
 }
 
 std::array<DungeonInfo*, 12> Dungeons::GetDungeonList() {
-    std::array<DungeonInfo*, 12> dungeonList_;
+    std::array<DungeonInfo*, 12> dungeonList_{};
     for (size_t i = 0; i < dungeonList.size(); i++) {
         dungeonList_[i] = &dungeonList[i];
     }
     return dungeonList_;
 }
 
-size_t Dungeons::GetDungeonListSize() {
+size_t Dungeons::GetDungeonListSize() const {
     return dungeonList.size();
 }
 void Dungeons::ParseJson(nlohmann::json spoilerFileJson) {
-    try {
-        nlohmann::json mqDungeonsJson = spoilerFileJson["masterQuestDungeons"];
-        for (auto it = mqDungeonsJson.begin(); it != mqDungeonsJson.end(); it++) {
-            std::string dungeonName = it.value().template get<std::string>();
-            for (auto& dungeon : dungeonList) {
-                if (dungeon.GetName() == dungeonName) {
-                    dungeon.SetMQ();
-                } else {
-                    dungeon.ClearMQ();
-                }
+    nlohmann::json mqDungeonsJson = spoilerFileJson["masterQuestDungeons"];
+    for (auto it = mqDungeonsJson.begin(); it != mqDungeonsJson.end(); ++it) {
+        std::string dungeonName = it.value().get<std::string>();
+        for (auto& dungeon : dungeonList) {
+            if (dungeon.GetName() == dungeonName) {
+                dungeon.SetMQ();
+            } else {
+                dungeon.ClearMQ();
             }
         }
-    } catch (const std::exception& e) {
-        throw e;
     }
 }
 } // namespace Rando
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/dungeon.h b/soh/soh/Enhancements/randomizer/dungeon.h
index e52f7b39b..068c2ea40 100644
--- a/soh/soh/Enhancements/randomizer/dungeon.h
+++ b/soh/soh/Enhancements/randomizer/dungeon.h
@@ -33,10 +33,10 @@ class DungeonInfo {
     RandomizerGet GetMap() const;
     RandomizerGet GetCompass() const;
     RandomizerGet GetBossKey() const;
-    void PlaceVanillaMap();
-    void PlaceVanillaCompass();
-    void PlaceVanillaBossKey();
-    void PlaceVanillaSmallKeys();
+    void PlaceVanillaMap() const;
+    void PlaceVanillaCompass() const;
+    void PlaceVanillaBossKey() const;
+    void PlaceVanillaSmallKeys() const;
     std::vector<RandomizerCheck> GetDungeonLocations() const;
     std::vector<RandomizerCheck> GetEveryLocation() const;
 
@@ -48,8 +48,8 @@ class DungeonInfo {
     RandomizerGet smallKey;
     RandomizerGet keyRing;
     RandomizerGet bossKey;
-    uint8_t vanillaKeyCount;
-    uint8_t mqKeyCount;
+    uint8_t vanillaKeyCount{};
+    uint8_t mqKeyCount{};
     bool masterQuest = false;
     bool hasKeyRing = false;
     std::vector<RandomizerCheck> vanillaLocations;
@@ -88,7 +88,7 @@ class Dungeons {
     /// function from either here or the Context class.
     /// @return 
     std::array<DungeonInfo*, 12> GetDungeonList();
-    size_t GetDungeonListSize();
+    size_t GetDungeonListSize() const;
     void ParseJson(nlohmann::json spoilerFileJson);
   private:
     std::array<DungeonInfo, 12> dungeonList;
diff --git a/soh/soh/Enhancements/randomizer/item.cpp b/soh/soh/Enhancements/randomizer/item.cpp
index 7fcb48d65..d62d4863c 100644
--- a/soh/soh/Enhancements/randomizer/item.cpp
+++ b/soh/soh/Enhancements/randomizer/item.cpp
@@ -2,7 +2,6 @@
 #include "item_location.h"
 
 #include "3drando/logic.hpp"
-#include "3drando/random.hpp"
 #include "3drando/item_pool.hpp"
 #include "z64item.h"
 #include "variables.h"
@@ -10,53 +9,53 @@
 #include "../../OTRGlobals.h"
 
 namespace Rando {
-Item::Item(RandomizerGet randomizerGet_, Text name_, ItemType type_, int16_t getItemId_, bool advancement_,
-                     bool* logicVar_, RandomizerHintTextKey hintKey_, uint16_t itemId_, uint16_t objectId_, uint16_t gid_,
-                     uint16_t textId_, uint16_t field_, int16_t chestAnimation_, GetItemCategory category_,
-                     uint16_t modIndex_, bool progressive_, uint16_t price_)
+Item::Item() : randomizerGet(RG_NONE), type(ITEMTYPE_ITEM), getItemId(GI_NONE), advancement(false), hintKey(RHT_NONE),
+               progressive(false), price(0) {}
+Item::Item(const RandomizerGet randomizerGet_, Text name_, const ItemType type_, const int16_t getItemId_,
+           const bool advancement_, bool* logicVar_, const RandomizerHintTextKey hintKey_, const uint16_t itemId_,
+           const uint16_t objectId_, const uint16_t gid_, const uint16_t textId_, const uint16_t field_,
+           const int16_t chestAnimation_, const GetItemCategory category_, const uint16_t modIndex_,
+           const bool progressive_, const uint16_t price_)
     : randomizerGet(randomizerGet_), name(std::move(name_)), type(type_), getItemId(getItemId_),
       advancement(advancement_), logicVar(logicVar_), hintKey(hintKey_), progressive(progressive_), price(price_) {
     if (modIndex_ == MOD_RANDOMIZER || getItemId > 0x7D) {
-        giEntry = std::shared_ptr<GetItemEntry>(
-            new GetItemEntry(GET_ITEM(itemId_, objectId_, gid_, textId_, field_, chestAnimation_, category_, modIndex_,
-                                      (int16_t)randomizerGet_)));
+        giEntry = std::make_shared<GetItemEntry>(GetItemEntry{itemId_, field_, static_cast<int16_t>((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_, objectId_, modIndex_, static_cast<int16_t>(randomizerGet_), gid_, true, ITEM_FROM_NPC, category_, NULL});
     } else {
-        giEntry = std::shared_ptr<GetItemEntry>(new GetItemEntry(
-            GET_ITEM(itemId_, objectId_, gid_, textId_, field_, chestAnimation_, category_, modIndex_, getItemId_)));
+        giEntry = std::make_shared<GetItemEntry>(GetItemEntry{itemId_, field_, static_cast<int16_t>((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_, objectId_, modIndex_, getItemId_, gid_, true, ITEM_FROM_NPC, category_, NULL});
     }
 }
 
-Item::Item(RandomizerGet randomizerGet_, Text name_, ItemType type_, int16_t getItemId_, bool advancement_,
-                     uint8_t* logicVar_, RandomizerHintTextKey hintKey_, uint16_t itemId_, uint16_t objectId_, uint16_t gid_,
-                     uint16_t textId_, uint16_t field_, int16_t chestAnimation_, GetItemCategory category_,
-                     uint16_t modIndex_, bool progressive_, uint16_t price_)
+Item::Item(const RandomizerGet randomizerGet_, Text name_, const ItemType type_, const int16_t getItemId_,
+           const bool advancement_, uint8_t* logicVar_, const RandomizerHintTextKey hintKey_, const uint16_t itemId_,
+           const uint16_t objectId_, const uint16_t gid_, const uint16_t textId_, const uint16_t field_,
+           const int16_t chestAnimation_, const GetItemCategory category_, const uint16_t modIndex_,
+           const bool progressive_, const uint16_t price_)
     : randomizerGet(randomizerGet_), name(std::move(name_)), type(type_), getItemId(getItemId_),
       advancement(advancement_), logicVar(logicVar_), hintKey(hintKey_), progressive(progressive_), price(price_) {
     if (modIndex_ == MOD_RANDOMIZER || getItemId > 0x7D) {
-        giEntry = std::shared_ptr<GetItemEntry>(
-            new GetItemEntry(GET_ITEM(itemId_, objectId_, gid_, textId_, field_, chestAnimation_, category_, modIndex_,
-                                      (int16_t)randomizerGet_)));
+        giEntry = std::make_shared<GetItemEntry>(GetItemEntry{itemId_, field_, static_cast<int16_t>((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_, objectId_, modIndex_, static_cast<int16_t>(randomizerGet_), gid_, true, ITEM_FROM_NPC, category_, NULL});
     } else {
-        giEntry = std::shared_ptr<GetItemEntry>(new GetItemEntry(
-            GET_ITEM(itemId_, objectId_, gid_, textId_, field_, chestAnimation_, category_, modIndex_, getItemId_)));
+        giEntry = std::make_shared<GetItemEntry>(GetItemEntry{itemId_, field_, static_cast<int16_t>((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_, objectId_, modIndex_, getItemId_, gid_, true, ITEM_FROM_NPC, category_, NULL});
     }
 }
 
-Item::Item(RandomizerGet randomizerGet_, Text name_, ItemType type_, int getItemId_, bool advancement_,
-                     bool* logicVar_, RandomizerHintTextKey hintKey_, bool progressive_, uint16_t price_)
+Item::Item(const RandomizerGet randomizerGet_, Text name_, const ItemType type_, const int16_t getItemId_,
+           const bool advancement_, bool* logicVar_, const RandomizerHintTextKey hintKey_, const bool progressive_,
+           const uint16_t price_)
     : randomizerGet(randomizerGet_), name(std::move(name_)), type(type_), getItemId(getItemId_),
       advancement(advancement_), logicVar(logicVar_), hintKey(hintKey_), progressive(progressive_), price(price_) {
 }
 
-Item::Item(RandomizerGet randomizerGet_, Text name_, ItemType type_, int getItemId_, bool advancement_,
-                     uint8_t* logicVar_, RandomizerHintTextKey hintKey_, bool progressive_, uint16_t price_)
+Item::Item(const RandomizerGet randomizerGet_, Text name_, const ItemType type_, const int16_t getItemId_,
+           const bool advancement_, uint8_t* logicVar_, const RandomizerHintTextKey hintKey_, const bool progressive_,
+           const uint16_t price_)
     : randomizerGet(randomizerGet_), name(std::move(name_)), type(type_), getItemId(getItemId_),
       advancement(advancement_), logicVar(logicVar_), hintKey(hintKey_), progressive(progressive_), price(price_) {
 }
 
     Item::~Item() = default;
 
-void Item::ApplyEffect() {
+void Item::ApplyEffect() const {
     // If this is a key ring, logically add as many keys as we could need
     if (RHT_FOREST_TEMPLE_KEY_RING <= hintKey && hintKey <= RHT_GANONS_CASTLE_KEY_RING) {
         *std::get<uint8_t*>(logicVar) += 10;
@@ -70,7 +69,7 @@ void Item::ApplyEffect() {
     Logic::UpdateHelpers();
 }
 
-void Item::UndoEffect() {
+void Item::UndoEffect() const {
     if (RHT_FOREST_TEMPLE_KEY_RING <= hintKey && hintKey <= RHT_GANONS_CASTLE_KEY_RING) {
         *std::get<uint8_t*>(logicVar) -= 10;
     } else {
@@ -99,7 +98,7 @@ ItemType Item::GetItemType() const {
     return type;
 }
 
-RandomizerGet Item::GetRandomizerGet() {
+RandomizerGet Item::GetRandomizerGet() const {
     return randomizerGet;
 }
 
@@ -107,12 +106,12 @@ uint16_t Item::GetPrice() const {
     return price;
 }
 
-std::shared_ptr<GetItemEntry> Item::GetGIEntry() const {
+std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursion)
     if (giEntry != nullptr) {
         return giEntry;
     }
     RandomizerGet actual = RG_NONE;
-    u8 numWallets =
+    const u8 numWallets =
         OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHOPSANITY) > RO_SHOPSANITY_ZERO_ITEMS ? 3 : 2;
     switch (randomizerGet) {
         case RG_PROGRESSIVE_STICK_UPGRADE:
@@ -125,6 +124,8 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const {
                 case 3:
                     actual = RG_DEKU_STICK_CAPACITY_30;
                     break;
+                default:
+                    break;
             }
             break;
         case RG_PROGRESSIVE_NUT_UPGRADE:
@@ -137,6 +138,8 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const {
                 case 3:
                     actual = RG_DEKU_NUT_CAPACITY_40;
                     break;
+                default:
+                    break;
             }
             break;
         case RG_PROGRESSIVE_BOMB_BAG:
@@ -151,6 +154,8 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const {
                 case 3:
                     actual = RG_BIGGEST_BOMB_BAG;
                     break;
+                default:
+                    break;
             }
             break;
         case RG_PROGRESSIVE_BOW:
@@ -165,6 +170,8 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const {
                 case 3:
                     actual = RG_BIGGEST_QUIVER;
                     break;
+                default:
+                    break;
             }
             break;
         case RG_PROGRESSIVE_SLINGSHOT:
@@ -179,6 +186,8 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const {
                 case 3:
                     actual = RG_BIGGEST_BULLET_BAG;
                     break;
+                default:
+                    break;
             }
             break;
         case RG_PROGRESSIVE_OCARINA:
@@ -190,6 +199,8 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const {
                 case ITEM_OCARINA_TIME:
                     actual = RG_OCARINA_OF_TIME;
                     break;
+                default:
+                    break;
             }
             break;
         case RG_PROGRESSIVE_HOOKSHOT:
@@ -201,6 +212,8 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const {
                 case ITEM_LONGSHOT:
                     actual = RG_LONGSHOT;
                     break;
+                default:
+                    break;
             }
             break;
         case RG_PROGRESSIVE_STRENGTH:
@@ -215,6 +228,8 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const {
                 case 3:
                     actual = RG_GOLDEN_GAUNTLETS;
                     break;
+                default:
+                    break;
             }
             break;
         case RG_PROGRESSIVE_WALLET:
@@ -229,6 +244,8 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const {
                 case 3:
                     actual = numWallets == 3 ? RG_TYCOON_WALLET : RG_GIANT_WALLET;
                     break;
+                default:
+                    break;
             }
             break;
         case RG_PROGRESSIVE_SCALE:
@@ -240,6 +257,8 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const {
                 case 2:
                     actual = RG_GOLDEN_SCALE;
                     break;
+                default:
+                    break;
             }
             break;
         case RG_PROGRESSIVE_MAGIC_METER:
@@ -251,6 +270,8 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const {
                 case 2:
                     actual = RG_MAGIC_DOUBLE;
                     break;
+                default:
+                    break;
             }
             break;
         case RG_PROGRESSIVE_GORONSWORD: // todo progressive?
@@ -260,14 +281,14 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const {
             actual = RG_NONE;
             break;
     }
-    return Rando::StaticData::RetrieveItem(actual).GetGIEntry();
+    return StaticData::RetrieveItem(actual).GetGIEntry();
 }
 
 GetItemEntry Item::GetGIEntry_Copy() const {
     return *GetGIEntry();
 }
 
-void Item::SetPrice(uint16_t price_) {
+void Item::SetPrice(const uint16_t price_) {
     price = price_;
 }
 
@@ -275,7 +296,7 @@ void Item::SetAsPlaythrough() {
     playthrough = true;
 }
 
-void Item::SetCustomDrawFunc(CustomDrawFunc drawFunc) {
+void Item::SetCustomDrawFunc(const CustomDrawFunc drawFunc) const {
     giEntry->drawFunc = drawFunc;
 }
 
@@ -290,7 +311,7 @@ bool Item::IsBottleItem() const {
 }
 
 bool Item::IsMajorItem() const {
-    auto ctx = Rando::Context::GetInstance();
+    const auto ctx = Context::GetInstance();
     if (type == ITEMTYPE_TOKEN) {
         return ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_TOKENS) || ctx->GetSettings()->LACSCondition() == RO_LACS_TOKENS;
     }
@@ -300,7 +321,7 @@ bool Item::IsMajorItem() const {
         return false;
     }
 
-    if (type == ITEMTYPE_DUNGEONREWARD && (ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_END_OF_DUNGEON))) {
+    if (type == ITEMTYPE_DUNGEONREWARD && ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_END_OF_DUNGEON)) {
         return false;
     }
 
@@ -322,7 +343,7 @@ bool Item::IsMajorItem() const {
         return false;
     }
 
-    if ((type == ITEMTYPE_BOSSKEY && getItemId != 0xAD) &&
+    if (type == ITEMTYPE_BOSSKEY && getItemId != 0xAD &&
         (ctx->GetOption(RSK_BOSS_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_VANILLA) || ctx->GetOption(RSK_BOSS_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_OWN_DUNGEON))) {
         return false;
     }
diff --git a/soh/soh/Enhancements/randomizer/item.h b/soh/soh/Enhancements/randomizer/item.h
index 3a8d9dd65..cfb99a593 100644
--- a/soh/soh/Enhancements/randomizer/item.h
+++ b/soh/soh/Enhancements/randomizer/item.h
@@ -28,36 +28,36 @@ enum ItemType {
 namespace Rando {
 class Item {
   public:
-    Item() = default;
+    Item();
     Item(RandomizerGet randomizerGet_, Text name_, ItemType type_, int16_t getItemId_, bool advancement_,
                      bool* logicVar_, RandomizerHintTextKey hintKey_, uint16_t itemId_, uint16_t objectId_, uint16_t gid_,
                      uint16_t textId_, uint16_t field_, int16_t chestAnimation_, GetItemCategory category_,
-                     uint16_t modIndex_, bool progressive = false, uint16_t price_ = 0);
+                     uint16_t modIndex_, bool progressive_ = false, uint16_t price_ = 0);
     Item(RandomizerGet randomizerGet_, Text name_, ItemType type_, int16_t getItemId_, bool advancement_,
               uint8_t* logicVar_, RandomizerHintTextKey hintKey_, uint16_t itemId_, uint16_t objectId_, uint16_t gid_,
               uint16_t textId_, uint16_t field_, int16_t chestAnimation_, GetItemCategory category_, uint16_t modIndex_,
-              bool progressive = false, uint16_t price_ = 0);
-    Item(RandomizerGet randomizerGet_, Text name_, ItemType type_, int getItemId_, bool advancement_,
-              bool* logicVar_, RandomizerHintTextKey hintKey_, bool progressive = false, uint16_t price = 0);
-    Item(RandomizerGet randomizerGet_, Text name_, ItemType type_, int getItemId_, bool advancement_,
-              uint8_t* logicVar_, RandomizerHintTextKey hintKey_, bool progressive = false, uint16_t price = 0);
+              bool progressive_ = false, uint16_t price_ = 0);
+    Item(RandomizerGet randomizerGet_, Text name_, ItemType type_, int16_t getItemId_, bool advancement_,
+              bool* logicVar_, RandomizerHintTextKey hintKey_, bool progressive_ = false, uint16_t price_ = 0);
+    Item(RandomizerGet randomizerGet_, Text name_, ItemType type_, int16_t getItemId_, bool advancement_,
+              uint8_t* logicVar_, RandomizerHintTextKey hintKey_, bool progressive_ = false, uint16_t price_ = 0);
     ~Item();
 
-    void ApplyEffect();
-    void UndoEffect();
+    void ApplyEffect() const;
+    void UndoEffect() const;
 
     
     const Text& GetName() const;
     bool IsAdvancement() const;
     int GetItemID() const;
     ItemType GetItemType() const;
-    RandomizerGet GetRandomizerGet();
+    RandomizerGet GetRandomizerGet() const;
     uint16_t GetPrice() const;
     std::shared_ptr<GetItemEntry> GetGIEntry() const;
     GetItemEntry GetGIEntry_Copy() const;
     void SetPrice(uint16_t price_);
     void SetAsPlaythrough();
-    void SetCustomDrawFunc(CustomDrawFunc);
+    void SetCustomDrawFunc(CustomDrawFunc) const;
     bool IsPlaythrough() const;
     bool IsBottleItem() const;
     bool IsMajorItem() const;
@@ -74,9 +74,9 @@ class Item {
     bool advancement;
     std::variant<bool*, uint8_t*> logicVar;
     RandomizerHintTextKey hintKey;
-    bool progressive = false;
+    bool progressive;
     uint16_t price;
     bool playthrough = false;
-   std::shared_ptr<GetItemEntry> giEntry = nullptr;
+   std::shared_ptr<GetItemEntry> giEntry;
 };
 }
diff --git a/soh/soh/Enhancements/randomizer/item_location.cpp b/soh/soh/Enhancements/randomizer/item_location.cpp
index 388378d3b..f17bfb6e0 100644
--- a/soh/soh/Enhancements/randomizer/item_location.cpp
+++ b/soh/soh/Enhancements/randomizer/item_location.cpp
@@ -2,7 +2,8 @@
 #include "context.h"
 
 namespace Rando {
-ItemLocation::ItemLocation(RandomizerCheck rc_) : rc(rc_) {}
+ItemLocation::ItemLocation() : rc(RC_UNKNOWN_CHECK) {}
+ItemLocation::ItemLocation(const RandomizerCheck rc_) : rc(rc_) {}
 
 RandomizerCheck ItemLocation::GetRandomizerCheck() const {
     return rc;
@@ -21,7 +22,7 @@ void ItemLocation::RemoveFromPool() {
 }
 
 const Item& ItemLocation::GetPlacedItem() const {
-    return Rando::StaticData::RetrieveItem(placedItem);
+    return StaticData::RetrieveItem(placedItem);
 }
 
 RandomizerGet& ItemLocation::RefPlacedItem() {
@@ -29,7 +30,7 @@ RandomizerGet& ItemLocation::RefPlacedItem() {
 }
 
 const Text& ItemLocation::GetPlacedItemName() const {
-    return Rando::StaticData::RetrieveItem(placedItem).GetName();
+    return StaticData::RetrieveItem(placedItem).GetName();
 }
 
 RandomizerGet ItemLocation::GetPlacedRandomizerGet() const {
@@ -50,7 +51,7 @@ void ItemLocation::SaveDelayedItem () {
     delayedItem = RG_NONE;
 }
 
-void ItemLocation::SetParentRegion(RandomizerRegion region) {
+void ItemLocation::SetParentRegion(const RandomizerRegion region) {
     parentRegion = region;
 }
 
@@ -59,21 +60,21 @@ RandomizerRegion ItemLocation::GetParentRegionKey() const {
 }
 
 void ItemLocation::PlaceVanillaItem() {
-    placedItem = Rando::StaticData::GetLocation(rc)->GetVanillaItem();
+    placedItem = StaticData::GetLocation(rc)->GetVanillaItem();
 }
 
-void ItemLocation::ApplyPlacedItemEffect() {
-    Rando::StaticData::RetrieveItem(placedItem).ApplyEffect();
+void ItemLocation::ApplyPlacedItemEffect() const {
+    StaticData::RetrieveItem(placedItem).ApplyEffect();
 }
 
 uint16_t ItemLocation::GetPrice() const {
     if (StaticData::RetrieveItem(placedItem).GetItemType() == ITEMTYPE_SHOP) {
-        return Rando::StaticData::RetrieveItem(placedItem).GetPrice();
+        return StaticData::RetrieveItem(placedItem).GetPrice();
     }
     return price;
 }
 
-void ItemLocation::SetPrice(uint16_t price_) {
+void ItemLocation::SetPrice(const uint16_t price_) {
     if (hasCustomPrice) {
         return;
     }
@@ -84,7 +85,7 @@ bool ItemLocation::HasCustomPrice() const {
     return hasCustomPrice;
 }
 
-void ItemLocation::SetCustomPrice(uint16_t price_) {
+void ItemLocation::SetCustomPrice(const uint16_t price_) {
     price = price_;
     hasCustomPrice = true;
 }
@@ -109,7 +110,7 @@ RandomizerHintKey ItemLocation::GetHintKey() const {
     return hintedBy;
 }
 
-void ItemLocation::SetHintKey(RandomizerHintKey hintKey) {
+void ItemLocation::SetHintKey(const RandomizerHintKey hintKey) {
     hintedBy = hintKey;
 } 
 
@@ -125,38 +126,37 @@ bool ItemLocation::IsExcluded() const {
     return excludedOption.Value<bool>();
 }
 
-Rando::Option* ItemLocation::GetExcludedOption() {
+Option* ItemLocation::GetExcludedOption() {
     return &excludedOption;
 }
 
 void ItemLocation::AddExcludeOption() {
-    const std::string name = StaticData::GetLocation(rc)->GetName();
-    if (name.length() < 23) {
-        excludedOption = Rando::Option::Bool(name, {"Include", "Exclude"});
+    if (const std::string name = StaticData::GetLocation(rc)->GetName(); name.length() < 23) {
+        excludedOption = Option::Bool(name, {"Include", "Exclude"});
     } else {
-        size_t lastSpace = name.rfind(' ', 23);
+        const size_t lastSpace = name.rfind(' ', 23);
         std::string settingText = name;
         settingText.replace(lastSpace, 1, "\n ");
 
-        excludedOption = Rando::Option::Bool(settingText, {"Include", "Exclude"});
+        excludedOption = Option::Bool(settingText, {"Include", "Exclude"});
     }
     // RANDOTODO: this without string compares and loops
     bool alreadyAdded = false;
-    Rando::Location* loc = StaticData::GetLocation(rc);
-    for (const Rando::Option* location : Rando::Context::GetInstance()->GetSettings()->GetExcludeOptionsForGroup(loc->GetCollectionCheckGroup())) {
+    const Location* loc = StaticData::GetLocation(rc);
+    for (const Option* location : Context::GetInstance()->GetSettings()->GetExcludeOptionsForGroup(loc->GetCollectionCheckGroup())) {
         if (location->GetName() == excludedOption.GetName()) {
             alreadyAdded = true;
         }
     }
     if (!alreadyAdded) {
-        Rando::Context::GetInstance()->GetSettings()->GetExcludeOptionsForGroup(loc->GetCollectionCheckGroup()).push_back(&excludedOption);
+        Context::GetInstance()->GetSettings()->GetExcludeOptionsForGroup(loc->GetCollectionCheckGroup()).push_back(&excludedOption);
     }
 }
 
 bool ItemLocation::IsVisible() const {
     return visibleInImGui;
 }
-void ItemLocation::SetVisible(bool visibleInImGui_) {
+void ItemLocation::SetVisible(const bool visibleInImGui_) {
     visibleInImGui = visibleInImGui_;
 
 }
diff --git a/soh/soh/Enhancements/randomizer/item_location.h b/soh/soh/Enhancements/randomizer/item_location.h
index bb07f67d6..c9d470c9f 100644
--- a/soh/soh/Enhancements/randomizer/item_location.h
+++ b/soh/soh/Enhancements/randomizer/item_location.h
@@ -8,8 +8,8 @@
 namespace Rando {
 class ItemLocation {
   public:
-    ItemLocation() = default;
-    ItemLocation(RandomizerCheck rc);
+    ItemLocation();
+    explicit ItemLocation(RandomizerCheck rc_);
     RandomizerCheck GetRandomizerCheck() const;
     bool IsAddedToPool() const;
     void AddToPool();
@@ -17,13 +17,13 @@ class ItemLocation {
     const Item& GetPlacedItem() const;
     const Text& GetPlacedItemName() const;
     RandomizerGet GetPlacedRandomizerGet() const;
-    void SetPlacedItem(const RandomizerGet item);
+    void SetPlacedItem(RandomizerGet item);
     RandomizerGet& RefPlacedItem();
-    void SetDelayedItem(const RandomizerGet item);
+    void SetDelayedItem(RandomizerGet item);
     RandomizerRegion GetParentRegionKey() const;
     void SetParentRegion (RandomizerRegion region);
     void PlaceVanillaItem();
-    void ApplyPlacedItemEffect();
+    void ApplyPlacedItemEffect() const;
     void SaveDelayedItem();
     uint16_t GetPrice() const;
     void SetPrice(uint16_t price_);
@@ -39,14 +39,14 @@ class ItemLocation {
     bool IsExcluded() const;
     void AddExcludeOption();
     Option* GetExcludedOption();
-    void SetHidden(const bool hidden_);
+    void SetHidden(bool hidden_);
     bool IsVisible() const;
     void SetVisible(bool visibleInImGui_);
     void ResetVariables();
 
   private:
     RandomizerCheck rc;
-    RandomizerHintKey hintedBy;
+    RandomizerHintKey hintedBy = RH_NONE;
     bool hintedAt = false;
     bool isHintable = false;
     bool addedToPool = false;
diff --git a/soh/soh/Enhancements/randomizer/item_override.cpp b/soh/soh/Enhancements/randomizer/item_override.cpp
index b9ef2fd78..58789c579 100644
--- a/soh/soh/Enhancements/randomizer/item_override.cpp
+++ b/soh/soh/Enhancements/randomizer/item_override.cpp
@@ -1,30 +1,33 @@
 #include "item_override.h"
 
+#include <utility>
+
 namespace Rando {
-ItemOverride::ItemOverride(RandomizerCheck location_, RandomizerGet looksLike_)
-    : location(location_), looksLike(looksLike_) {};
+ItemOverride::ItemOverride() : mLocation(RC_UNKNOWN_CHECK), mLooksLike(RG_NONE) {}
+ItemOverride::ItemOverride(const RandomizerCheck location, const RandomizerGet looksLike)
+    : mLocation(location), mLooksLike(looksLike) {}
 
 RandomizerCheck ItemOverride::GetLocation() const {
-    return location;
+    return mLocation;
 }
 
-void ItemOverride::SetLocation(RandomizerCheck location_) {
-    location = location_;
+void ItemOverride::SetLocation(const RandomizerCheck location) {
+    mLocation = location;
 }
 
 RandomizerGet ItemOverride::LooksLike() const {
-    return looksLike;
+    return mLooksLike;
 }
 
 RandomizerGet& ItemOverride::RefLooksLike() {
-    return looksLike;
+    return mLooksLike;
 }
 
 Text& ItemOverride::GetTrickName() {
-    return trickName;
+    return mTrickName;
 }
 
-void ItemOverride::SetTrickName(Text trickName_) {
-    trickName = trickName_;
+void ItemOverride::SetTrickName(Text trickName) {
+    mTrickName = std::move(trickName);
 }
 } // namespace Rando
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/item_override.h b/soh/soh/Enhancements/randomizer/item_override.h
index c073d9e2f..98a1f3d42 100644
--- a/soh/soh/Enhancements/randomizer/item_override.h
+++ b/soh/soh/Enhancements/randomizer/item_override.h
@@ -7,17 +7,17 @@ namespace Rando {
 /// @brief Class representing overrides of individual items. Used for trick names and models for ice traps.
 class ItemOverride {
   public:
-    ItemOverride() = default;
-    ItemOverride(RandomizerCheck location_, RandomizerGet looksLike_);
+    ItemOverride();
+    ItemOverride(RandomizerCheck location, RandomizerGet looksLike);
     RandomizerCheck GetLocation() const;
-    void SetLocation(RandomizerCheck);
+    void SetLocation(RandomizerCheck location);
     RandomizerGet LooksLike() const;
     RandomizerGet& RefLooksLike();
     Text& GetTrickName();
     void SetTrickName (Text trickName);
   private:
-    RandomizerCheck location;
-    RandomizerGet looksLike;
-    Text trickName;
+    RandomizerCheck mLocation;
+    RandomizerGet mLooksLike;
+    Text mTrickName;
 };
 } // namespace Rando
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/location.cpp b/soh/soh/Enhancements/randomizer/location.cpp
index 3f518ae43..a0783f4ad 100644
--- a/soh/soh/Enhancements/randomizer/location.cpp
+++ b/soh/soh/Enhancements/randomizer/location.cpp
@@ -35,7 +35,7 @@ int32_t Rando::Location::GetActorParams() const {
 }
 
 SceneID Rando::Location::GetScene() const {
-    return (SceneID)scene;
+    return static_cast<SceneID>(scene);
 }
 
 uint8_t Rando::Location::GetFlag() const {
@@ -78,7 +78,7 @@ bool Rando::Location::IsOverworld() const {
 }
 
 bool Rando::Location::IsShop() const {
-    return (scene >= SCENE_BAZAAR && scene <= SCENE_BOMBCHU_SHOP);
+    return scene >= SCENE_BAZAAR && scene <= SCENE_BOMBCHU_SHOP;
 }
 
 bool Rando::Location::IsVanillaCompletion() const {
@@ -103,9 +103,9 @@ Rando::Location Rando::Location::Base(RandomizerCheck rc, RandomizerCheckQuest q
                                       const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
                                       std::vector<Category>&& categories, SpoilerCollectionCheck collectionCheck,
                                       SpoilerCollectionCheckGroup collectionCheckGroup, bool isVanillaCompletion_) {
-    return Location(rc, quest_, checkType_, area_, LocationType::Base, actorId_, scene_, actorParams_, flag_,
+    return {rc, quest_, checkType_, area_, LocationType::Base, actorId_, scene_, actorParams_, flag_,
                     std::move(shortName_), std::move(spoilerName_), hintKey, vanillaItem, std::move(categories),
-                    isVanillaCompletion_, collectionCheck, collectionCheckGroup);
+                    isVanillaCompletion_, collectionCheck, collectionCheckGroup};
 }
 
 Rando::Location Rando::Location::Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
@@ -114,11 +114,11 @@ Rando::Location Rando::Location::Chest(RandomizerCheck rc, RandomizerCheckQuest
                                        std::string&& spoilerName_, const RandomizerHintTextKey hintKey,
                                        const RandomizerGet vanillaItem, std::vector<Category>&& categories,
                                        SpoilerCollectionCheckGroup collectionCheckGroup, bool isVanillaCompletion_) {
-    return Location(rc, quest_, checkType_, area_, LocationType::Chest, actorId_, scene_, actorParams_, flag_,
+    return {rc, quest_, checkType_, area_, LocationType::Chest, actorId_, scene_, actorParams_, flag_,
                     std::move(shortName_), std::move(spoilerName_), hintKey, vanillaItem, std::move(categories),
                     isVanillaCompletion_,
-                    SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_CHEST, scene_, flag_),
-                    collectionCheckGroup);
+                    SpoilerCollectionCheck(SPOILER_CHK_CHEST, scene_, flag_),
+                    collectionCheckGroup};
 }
 
 Rando::Location Rando::Location::Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
@@ -128,9 +128,9 @@ Rando::Location Rando::Location::Chest(RandomizerCheck rc, RandomizerCheckQuest
                                        const RandomizerGet vanillaItem, std::vector<Category>&& categories,
                                        SpoilerCollectionCheck collectionCheck,
                                        SpoilerCollectionCheckGroup collectionCheckGroup, bool isVanillaCompletion_) {
-    return Location(rc, quest_, checkType_, area_, LocationType::Chest, actorId_, scene_, actorParams_, flag_,
+    return {rc, quest_, checkType_, area_, LocationType::Chest, actorId_, scene_, actorParams_, flag_,
                     std::move(shortName_), std::move(spoilerName_), hintKey, vanillaItem, std::move(categories),
-                    isVanillaCompletion_, collectionCheck, collectionCheckGroup);
+                    isVanillaCompletion_, collectionCheck, collectionCheckGroup};
 }
 
 Rando::Location Rando::Location::Collectable(
@@ -138,11 +138,11 @@ Rando::Location Rando::Location::Collectable(
     ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
     std::string&& spoilerName_, const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
     std::vector<Category>&& categories, SpoilerCollectionCheckGroup collectionCheckGroup, bool isVanillaCompletion_) {
-    return Location(rc, quest_, checkType_, area_, LocationType::Collectable, actorId_, scene_, actorParams_, flag_,
+    return {rc, quest_, checkType_, area_, LocationType::Collectable, actorId_, scene_, actorParams_, flag_,
                     std::move(shortName_), std::move(spoilerName_), hintKey, vanillaItem, std::move(categories),
                     isVanillaCompletion_,
-                    SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_COLLECTABLE, scene_, flag_),
-                    collectionCheckGroup);
+                    SpoilerCollectionCheck(SPOILER_CHK_COLLECTABLE, scene_, flag_),
+                    collectionCheckGroup};
 }
 
 Rando::Location Rando::Location::Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_,
@@ -150,14 +150,14 @@ Rando::Location Rando::Location::Collectable(RandomizerCheck rc, RandomizerCheck
                                              ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_,
                                              std::string&& shortName_, std::string&& spoilerName_,
                                              const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
-                                             std::vector<Category>&& categories, uint8_t collectFlag_,
+                                             std::vector<Category>&& categories, const uint8_t collectFlag_,
                                              SpoilerCollectionCheckGroup collectionCheckGroup,
                                              bool isVanillaCompletion_) {
-    return Location(rc, quest_, checkType_, area_, LocationType::Collectable, actorId_, scene_, actorParams_, flag_,
+    return {rc, quest_, checkType_, area_, LocationType::Collectable, actorId_, scene_, actorParams_, flag_,
                     std::move(shortName_), std::move(spoilerName_), hintKey, vanillaItem, std::move(categories),
                     isVanillaCompletion_,
-                    SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_COLLECTABLE, scene_, collectFlag_),
-                    collectionCheckGroup);
+                    SpoilerCollectionCheck(SPOILER_CHK_COLLECTABLE, scene_, collectFlag_),
+                    collectionCheckGroup};
 }
 
 Rando::Location Rando::Location::Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_,
@@ -168,9 +168,9 @@ Rando::Location Rando::Location::Collectable(RandomizerCheck rc, RandomizerCheck
                                              std::vector<Category>&& categories, SpoilerCollectionCheck collectionCheck,
                                              SpoilerCollectionCheckGroup collectionCheckGroup,
                                              bool isVanillaCompletion_) {
-    return Location(rc, quest_, checkType_, area_, LocationType::Collectable, actorId_, scene_, actorParams_, flag_,
+    return {rc, quest_, checkType_, area_, LocationType::Collectable, actorId_, scene_, actorParams_, flag_,
                     std::move(shortName_), std::move(spoilerName_), hintKey, vanillaItem, std::move(categories),
-                    isVanillaCompletion_, collectionCheck, collectionCheckGroup);
+                    isVanillaCompletion_, collectionCheck, collectionCheckGroup};
 }
 
 Rando::Location Rando::Location::GSToken(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
@@ -178,23 +178,23 @@ Rando::Location Rando::Location::GSToken(RandomizerCheck rc, RandomizerCheckQues
                                          std::string&& spoilerName_, const RandomizerHintTextKey hintKey,
                                          std::vector<Category>&& categories,
                                          SpoilerCollectionCheckGroup collectionCheckGroup, bool isVanillaCompletion_) {
-    return Location(rc, quest_, RCTYPE_SKULL_TOKEN, area_, LocationType::GSToken, ACTOR_EN_SI, scene_, actorParams_,
+    return {rc, quest_, RCTYPE_SKULL_TOKEN, area_, LocationType::GSToken, ACTOR_EN_SI, scene_, actorParams_,
                     flag_, std::move(shortName_), std::move(spoilerName_), hintKey, RG_GOLD_SKULLTULA_TOKEN,
                     std::move(categories), isVanillaCompletion_,
-                    SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_GOLD_SKULLTULA, scene_, flag_),
-                    collectionCheckGroup);
+                    SpoilerCollectionCheck(SPOILER_CHK_GOLD_SKULLTULA, scene_, flag_),
+                    collectionCheckGroup};
 }
 
 Rando::Location Rando::Location::GSToken(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
                                          uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
                                          std::string&& spoilerName_, const RandomizerHintTextKey hintKey,
-                                         std::vector<Category>&& categories, uint8_t skullScene_,
+                                         std::vector<Category>&& categories, const uint8_t skullScene_,
                                          SpoilerCollectionCheckGroup collectionCheckGroup, bool isVanillaCompletion_) {
-    return Location(rc, quest_, RCTYPE_SKULL_TOKEN, area_, LocationType::GSToken, ACTOR_EN_SI, scene_, actorParams_,
+    return {rc, quest_, RCTYPE_SKULL_TOKEN, area_, LocationType::GSToken, ACTOR_EN_SI, scene_, actorParams_,
                     flag_, std::move(shortName_), std::move(spoilerName_), hintKey, RG_GOLD_SKULLTULA_TOKEN,
                     std::move(categories), isVanillaCompletion_,
-                    SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_GOLD_SKULLTULA, skullScene_, flag_),
-                    collectionCheckGroup);
+                    SpoilerCollectionCheck(SPOILER_CHK_GOLD_SKULLTULA, skullScene_, flag_),
+                    collectionCheckGroup};
 }
 
 Rando::Location Rando::Location::GrottoScrub(RandomizerCheck rc, RandomizerCheckQuest quest_,
@@ -205,9 +205,9 @@ Rando::Location Rando::Location::GrottoScrub(RandomizerCheck rc, RandomizerCheck
                                              std::vector<Category>&& categories, SpoilerCollectionCheck collectionCheck,
                                              SpoilerCollectionCheckGroup collectionCheckGroup,
                                              bool isVanillaCompletion_) {
-    return Location(rc, quest_, checkType_, area_, LocationType::GrottoScrub, actorId_, scene_, actorParams_, flag_,
+    return {rc, quest_, checkType_, area_, LocationType::GrottoScrub, actorId_, scene_, actorParams_, flag_,
                     std::move(shortName_), std::move(spoilerName_), hintKey, vanillaItem, std::move(categories),
-                    isVanillaCompletion_, collectionCheck, collectionCheckGroup);
+                    isVanillaCompletion_, collectionCheck, collectionCheckGroup};
 }
 
 Rando::Location Rando::Location::Delayed(RandomizerCheck rc, RandomizerCheckQuest quest_,
@@ -217,9 +217,9 @@ Rando::Location Rando::Location::Delayed(RandomizerCheck rc, RandomizerCheckQues
                                          const RandomizerGet vanillaItem, std::vector<Category>&& categories,
                                          SpoilerCollectionCheck collectionCheck,
                                          SpoilerCollectionCheckGroup collectionCheckGroup, bool isVanillaCompletion_) {
-    return Location(rc, quest_, checkType_, area_, LocationType::Delayed, actorId_, scene_, actorParams_, flag_,
+    return {rc, quest_, checkType_, area_, LocationType::Delayed, actorId_, scene_, actorParams_, flag_,
                     std::move(shortName_), std::move(spoilerName_), hintKey, vanillaItem, std::move(categories),
-                    isVanillaCompletion_, collectionCheck, collectionCheckGroup);
+                    isVanillaCompletion_, collectionCheck, collectionCheckGroup};
 }
 
 Rando::Location Rando::Location::Reward(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
@@ -229,9 +229,9 @@ Rando::Location Rando::Location::Reward(RandomizerCheck rc, RandomizerCheckQuest
                                         const RandomizerGet vanillaItem, std::vector<Category>&& categories,
                                         SpoilerCollectionCheck collectionCheck,
                                         SpoilerCollectionCheckGroup collectionCheckGroup, bool isVanillaCompletion_) {
-    return Location(rc, quest_, checkType_, area_, LocationType::TempleReward, actorId_, scene_, actorParams_, flag_,
+    return {rc, quest_, checkType_, area_, LocationType::TempleReward, actorId_, scene_, actorParams_, flag_,
                     std::move(shortName_), std::move(spoilerName_), hintKey, vanillaItem, std::move(categories),
-                    isVanillaCompletion_, collectionCheck, collectionCheckGroup);
+                    isVanillaCompletion_, collectionCheck, collectionCheckGroup};
 }
 
 Rando::Location Rando::Location::OtherHint(RandomizerCheck rc, RandomizerCheckQuest quest_,
@@ -239,15 +239,15 @@ Rando::Location Rando::Location::OtherHint(RandomizerCheck rc, RandomizerCheckQu
                                            uint8_t scene_,
                                            std::string&& shortName_, std::string&& spoilerName_,
                                            bool isVanillaCompletion_) {
-    return Location(rc, quest_, checkType_, area_, LocationType::OtherHint, actorId_, scene_, 0x00, 0x00,
-                    std::move(shortName_), std::move(spoilerName_), RHT_NONE, RG_NONE, {}, isVanillaCompletion_);
+    return {rc, quest_, checkType_, area_, LocationType::OtherHint, actorId_, scene_, 0x00, 0x00,
+                    std::move(shortName_), std::move(spoilerName_), RHT_NONE, RG_NONE, {}, isVanillaCompletion_};
 }
 
 Rando::Location Rando::Location::HintStone(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
                                            uint8_t scene_, int32_t actorParams_, uint8_t flag_,
                                            std::string&& shortName_, std::string&& spoilerName_,
                                            std::vector<Category>&& categories, bool isVanillaCompletion_) {
-    return Location(rc, quest_, RCTYPE_GOSSIP_STONE, area_, LocationType::Base, ACTOR_EN_GS, scene_, actorParams_, flag_,
+    return {rc, quest_, RCTYPE_GOSSIP_STONE, area_, LocationType::Base, ACTOR_EN_GS, scene_, actorParams_, flag_,
                     std::move(shortName_), std::move(spoilerName_), RHT_NONE, RG_NONE, std::move(categories),
-                    isVanillaCompletion_);
+                    isVanillaCompletion_};
 }
diff --git a/soh/soh/Enhancements/randomizer/location.h b/soh/soh/Enhancements/randomizer/location.h
index 4fb077b90..cd6e88f32 100644
--- a/soh/soh/Enhancements/randomizer/location.h
+++ b/soh/soh/Enhancements/randomizer/location.h
@@ -1,12 +1,12 @@
 #pragma once
 
+#include <utility>
 #include <vector>
 
 #include "3drando/spoiler_log.hpp"
 #include "3drando/category.hpp"
 #include "3drando/hints.hpp"
 
-#include "z64item.h"
 #include "randomizerTypes.h"
 #include "z64actor_enum.h"
 #include "z64scene.h"
@@ -14,86 +14,85 @@
 namespace Rando {
 class SpoilerCollectionCheck {
   public:
-    SpoilerCollectionCheckType type = SpoilerCollectionCheckType::SPOILER_CHK_NONE;
+    SpoilerCollectionCheckType type = SPOILER_CHK_NONE;
     uint8_t scene = 0;
     uint8_t flag = 0;
 
-    SpoilerCollectionCheck() {
-    }
-    SpoilerCollectionCheck(SpoilerCollectionCheckType type_, uint8_t scene_, uint8_t flag_)
+    SpoilerCollectionCheck() = default;
+    SpoilerCollectionCheck(const SpoilerCollectionCheckType type_, const uint8_t scene_, const uint8_t flag_)
         : type(type_), scene(scene_), flag(flag_) {
     }
 
     static auto None() {
-        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_NONE, 0x00, 0x00);
+        return SpoilerCollectionCheck(SPOILER_CHK_NONE, 0x00, 0x00);
     }
 
     static auto AlwaysCollected() {
-        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_ALWAYS_COLLECTED, 0x00, 0x00);
+        return SpoilerCollectionCheck(SPOILER_CHK_ALWAYS_COLLECTED, 0x00, 0x00);
     }
 
-    static auto ItemGetInf(uint8_t slot) {
-        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_ITEM_GET_INF, 0x00, slot);
+    static auto ItemGetInf(const uint8_t slot) {
+        return SpoilerCollectionCheck(SPOILER_CHK_ITEM_GET_INF, 0x00, slot);
     }
 
-    static auto EventChkInf(uint8_t flag) {
-        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_EVENT_CHK_INF, 0xFF, flag);
+    static auto EventChkInf(const uint8_t flag) {
+        return SpoilerCollectionCheck(SPOILER_CHK_EVENT_CHK_INF, 0xFF, flag);
     }
 
-    static auto InfTable(uint8_t offset, uint8_t bit) {
-        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_INF_TABLE, offset, bit);
+    static auto InfTable(const uint8_t offset, const uint8_t bit) {
+        return SpoilerCollectionCheck(SPOILER_CHK_INF_TABLE, offset, bit);
     }
 
-    static auto Collectable(uint8_t scene, uint8_t flag) {
-        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_COLLECTABLE, scene, flag);
+    static auto Collectable(const uint8_t scene, const uint8_t flag) {
+        return SpoilerCollectionCheck(SPOILER_CHK_COLLECTABLE, scene, flag);
     }
 
-    static auto Chest(uint8_t scene, uint8_t flag) {
-        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_CHEST, scene, flag);
+    static auto Chest(const uint8_t scene, const uint8_t flag) {
+        return SpoilerCollectionCheck(SPOILER_CHK_CHEST, scene, flag);
     }
 
-    static auto Cow(uint8_t scene, uint8_t flag) {
-        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_COW, scene, flag);
+    static auto Cow(const uint8_t scene, const uint8_t flag) {
+        return SpoilerCollectionCheck(SPOILER_CHK_COW, scene, flag);
     }
 
-    static auto Fishing(uint8_t bit) {
-        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_MINIGAME, 0x00, bit);
+    static auto Fishing(const uint8_t bit) {
+        return SpoilerCollectionCheck(SPOILER_CHK_MINIGAME, 0x00, bit);
     }
 
-    static auto Scrub(uint8_t scene, uint8_t bit) {
-        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_SCRUB, scene, bit);
+    static auto Scrub(const uint8_t scene, const uint8_t bit) {
+        return SpoilerCollectionCheck(SPOILER_CHK_SCRUB, scene, bit);
     }
 
     static auto GerudoToken() {
-        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_GERUDO_MEMBERSHIP_CARD, 0x00, 0x00);
+        return SpoilerCollectionCheck(SPOILER_CHK_GERUDO_MEMBERSHIP_CARD, 0x00, 0x00);
     }
 
     static auto BigPoePoints() {
-        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_POE_POINTS, 0x00, 0x00);
+        return SpoilerCollectionCheck(SPOILER_CHK_POE_POINTS, 0x00, 0x00);
     }
 
-    static auto Gravedigger(uint8_t scene, uint8_t flag) {
-        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_GRAVEDIGGER, scene, flag);
+    static auto Gravedigger(const uint8_t scene, const uint8_t flag) {
+        return SpoilerCollectionCheck(SPOILER_CHK_GRAVEDIGGER, scene, flag);
     }
 
-    static auto ShopItem(uint8_t scene, uint8_t itemSlot) {
-        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_SHOP_ITEM, scene, itemSlot);
+    static auto ShopItem(const uint8_t scene, const uint8_t itemSlot) {
+        return SpoilerCollectionCheck(SPOILER_CHK_SHOP_ITEM, scene, itemSlot);
     }
 
-    static auto MagicBeans(uint8_t scene, uint8_t flag) {
-        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_MAGIC_BEANS, scene, flag);
+    static auto MagicBeans(const uint8_t scene, const uint8_t flag) {
+        return SpoilerCollectionCheck(SPOILER_CHK_MAGIC_BEANS, scene, flag);
     }
 
     static auto MasterSword() {
-        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_MASTER_SWORD, 0x00, 0x00);
+        return SpoilerCollectionCheck(SPOILER_CHK_MASTER_SWORD, 0x00, 0x00);
     }
 
-    static auto Merchant(int8_t scene, uint8_t flag) {
-        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_MERCHANT, scene, flag);
+    static auto Merchant(const int8_t scene, const uint8_t flag) {
+        return SpoilerCollectionCheck(SPOILER_CHK_MERCHANT, scene, flag);
     }
 
-    static auto RandomizerInf(int8_t scene, uint8_t flag) {
-        return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_RANDOMIZER_INF, scene, flag);
+    static auto RandomizerInf(const int8_t scene, const uint8_t flag) {
+        return SpoilerCollectionCheck(SPOILER_CHK_RANDOMIZER_INF, scene, flag);
     }
 };
 
@@ -111,16 +110,19 @@ enum class LocationType {
 
 class Location {
   public:
-    Location() = default;
-    Location(RandomizerCheck rc_, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
-             RandomizerCheckArea area_, LocationType locationType_, ActorID actorId_, uint8_t scene_,
-             int32_t actorParams_, uint8_t flag_, std::string shortName_, std::string spoilerName_,
-             RandomizerHintTextKey hintKey_, RandomizerGet vanillaItem_, std::vector<Category> categories_,
-             bool isVanillaCompletion_ = false, SpoilerCollectionCheck collectionCheck_ = SpoilerCollectionCheck(),
-             SpoilerCollectionCheckGroup collectionCheckGroup_ = SpoilerCollectionCheckGroup::GROUP_NO_GROUP)
+    Location() : rc(RC_UNKNOWN_CHECK), quest(RCQUEST_BOTH), checkType(RCTYPE_STANDARD), area(RCAREA_INVALID),
+                 locationType(LocationType::Base), actorId(ACTOR_ID_MAX), scene(SCENE_ID_MAX), actorParams(0),
+                 flag(0), hintKey(RHT_NONE), vanillaItem(RG_NONE), isVanillaCompletion(false),
+                 collectionCheck(SpoilerCollectionCheck()), collectionCheckGroup(GROUP_NO_GROUP) {}
+    Location(const RandomizerCheck rc_, const RandomizerCheckQuest quest_, const RandomizerCheckType checkType_,
+             const RandomizerCheckArea area_, const LocationType locationType_, const ActorID actorId_, const uint8_t scene_,
+             const int32_t actorParams_, const uint8_t flag_, std::string shortName_, std::string spoilerName_,
+             const RandomizerHintTextKey hintKey_, const RandomizerGet vanillaItem_, std::vector<Category> categories_,
+             const bool isVanillaCompletion_ = false, const SpoilerCollectionCheck collectionCheck_ = SpoilerCollectionCheck(),
+             const SpoilerCollectionCheckGroup collectionCheckGroup_ = GROUP_NO_GROUP)
         : rc(rc_), quest(quest_), checkType(checkType_), area(area_), locationType(locationType_), actorId(actorId_),
           scene(scene_), actorParams(actorParams_), flag(flag_), shortName(std::move(shortName_)),
-          spoilerName(spoilerName_), hintKey(hintKey_), vanillaItem(vanillaItem_), categories(std::move(categories_)),
+          spoilerName(std::move(spoilerName_)), hintKey(hintKey_), vanillaItem(vanillaItem_), categories(std::move(categories_)),
           isVanillaCompletion(isVanillaCompletion_), collectionCheck(collectionCheck_),
           collectionCheckGroup(collectionCheckGroup_) {
     }
@@ -150,60 +152,60 @@ class Location {
     RandomizerGet GetVanillaItem() const;
 
     static Location Base(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
-                         RandomizerCheckArea area_, ActorID actorId_, uint8_t scene, int32_t actorParams_,
+                         RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_, int32_t actorParams_,
                          uint8_t flag_, std::string&& shortName_, std::string&& spoilerName_,
-                         const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
+                         RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
                          std::vector<Category>&& categories,
                          SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(),
-                         SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP,
+                         SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
                          bool isVanillaCompletion_ = false);
 
     static Location
     Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_,
-          ActorID actorId_, uint8_t scene, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
-          std::string&& spoilerName_, const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
+          ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
+          std::string&& spoilerName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
           std::vector<Category>&& categories,
-          SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP,
+          SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
           bool isVanillaCompletion_ = false);
 
     static Location
     Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_,
-          ActorID actorId_, uint8_t scene, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
-          std::string&& spoilerName_, const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
+          ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
+          std::string&& spoilerName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
           std::vector<Category>&& categories, SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(),
-          SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP,
+          SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
           bool isVanillaCompletion_ = false);
 
     static Location
     Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
-                RandomizerCheckArea area_, ActorID actorId_, uint8_t scene, int32_t actorParams_, uint8_t flag_,
-                std::string&& shortName_, std::string&& spoilerName_, const RandomizerHintTextKey hintKey,
-                const RandomizerGet vanillaItem, std::vector<Category>&& categories,
-                SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP,
+                RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_,
+                std::string&& shortName_, std::string&& spoilerName_, RandomizerHintTextKey hintKey,
+                RandomizerGet vanillaItem, std::vector<Category>&& categories,
+                SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
                 bool isVanillaCompletion_ = false);
 
     static Location
     Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
-                RandomizerCheckArea area_, ActorID actorId_, uint8_t scene, int32_t actorParams_, uint8_t flag_,
-                std::string&& shortName_, std::string&& spoilerName_, const RandomizerHintTextKey hintKey,
-                const RandomizerGet vanillaItem, std::vector<Category>&& categories, uint8_t collectFlag_,
-                SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP,
+                RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_,
+                std::string&& shortName_, std::string&& spoilerName_, RandomizerHintTextKey hintKey,
+                RandomizerGet vanillaItem, std::vector<Category>&& categories, uint8_t collectFlag_,
+                SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
                 bool isVanillaCompletion_ = false);
 
     static Location
     Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
-                RandomizerCheckArea area_, ActorID actorId_, uint8_t scene, int32_t actorParams_, uint8_t flag_,
-                std::string&& shortName_, std::string&& spoilerName_, const RandomizerHintTextKey hintKey,
-                const RandomizerGet vanillaItem, std::vector<Category>&& categories,
+                RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_,
+                std::string&& shortName_, std::string&& spoilerName_, RandomizerHintTextKey hintKey,
+                RandomizerGet vanillaItem, std::vector<Category>&& categories,
                 SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(),
-                SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP,
+                SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
                 bool isVanillaCompletion_ = false);
 
     static Location
     GSToken(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
-            uint8_t scene, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
-            std::string&& spoilerName_, const RandomizerHintTextKey hintKey, std::vector<Category>&& categories,
-            SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP,
+            uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
+            std::string&& spoilerName_, RandomizerHintTextKey hintKey, std::vector<Category>&& categories,
+            SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
             bool isVanillaCompletion_ = true);
 
     /// @brief For certain scenes, the sceneId and the "Scene" in spoiler collection check later used to check the
@@ -227,40 +229,40 @@ class Location {
     static Location
     GSToken(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
             uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
-            std::string&& spoilerName_, const RandomizerHintTextKey hintKey, std::vector<Category>&& categories,
+            std::string&& spoilerName_, RandomizerHintTextKey hintKey, std::vector<Category>&& categories,
             uint8_t skullScene_,
-            SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP,
+            SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
             bool isVanillaCompletion_ = true);
 
     static Location
     GrottoScrub(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
-                RandomizerCheckArea area_, ActorID actorId_, uint8_t scene, int32_t actorParams_, uint8_t flag_,
-                std::string&& shortName_, std::string&& spoilerName_, const RandomizerHintTextKey hintKey,
-                const RandomizerGet vanillaItem, std::vector<Category>&& categories,
+                RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_,
+                std::string&& shortName_, std::string&& spoilerName_, RandomizerHintTextKey hintKey,
+                RandomizerGet vanillaItem, std::vector<Category>&& categories,
                 SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(),
-                SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP,
+                SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
                 bool isVanillaCompletion_ = false);
 
     static Location
     Delayed(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_,
-            ActorID actorId_, uint8_t scene, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
-            std::string&& spoilerName_, const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
+            ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
+            std::string&& spoilerName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
             std::vector<Category>&& categories, SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(),
-            SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP,
+            SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
             bool isVanillaCompletion_ = false);
 
     static Location
     Reward(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_,
-           ActorID actorId_, uint8_t scene, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
-           std::string&& spoilerName_, const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
+           ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
+           std::string&& spoilerName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
            std::vector<Category>&& categories, SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(),
-           SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP, bool isVanillaCompletion_ = false);
+           SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP, bool isVanillaCompletion_ = false);
 
     static Location OtherHint(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
-                              RandomizerCheckArea area_, ActorID actorId_, uint8_t scene,
+                              RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_,
                               std::string&& shortName_, std::string&& spoilerName_, bool isVanillaCompletion_ = false);
 
-    static Location HintStone(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_, uint8_t scene,
+    static Location HintStone(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_, uint8_t scene_,
                               int32_t actorParams_, uint8_t flag_, std::string&& shortName_, std::string&& spoilerName_,
                               std::vector<Category>&& categories, bool isVanillaCompletion_ = false);
 
@@ -277,10 +279,10 @@ class Location {
     bool checked = false;
     std::string shortName;
     std::string spoilerName;
-    RandomizerHintTextKey hintKey = RHT_NONE;
-    RandomizerGet vanillaItem = RG_NONE;
+    RandomizerHintTextKey hintKey;
+    RandomizerGet vanillaItem;
     std::vector<Category> categories;
-    bool isVanillaCompletion = false;
+    bool isVanillaCompletion;
     SpoilerCollectionCheck collectionCheck;
     SpoilerCollectionCheckGroup collectionCheckGroup;
     bool isHintable = false;
diff --git a/soh/soh/Enhancements/randomizer/option.cpp b/soh/soh/Enhancements/randomizer/option.cpp
index fb20fe086..a692ef712 100644
--- a/soh/soh/Enhancements/randomizer/option.cpp
+++ b/soh/soh/Enhancements/randomizer/option.cpp
@@ -1,26 +1,25 @@
 #include "option.h"
 
 namespace Rando {
-Option Option::Bool(std::string name_, std::vector<std::string> options_, OptionCategory category_,
-                    uint8_t defaultOption_, bool defaultHidden_) {
-    return Option(false, std::move(name_), std::move(options_), category_, defaultOption_, defaultHidden_);
+Option Option::Bool(std::string name_, std::vector<std::string> options_, const OptionCategory category_,
+                    const uint8_t defaultOption_, const bool defaultHidden_) {
+    return {false, std::move(name_), std::move(options_), category_, defaultOption_, defaultHidden_};
 }
 
-Option Option::U8(std::string name_, std::vector<std::string> options_, OptionCategory category_,
-                  uint8_t defaultOption_, bool defaultHidden_) {
-    return Option(uint8_t(0), std::move(name_), std::move(options_), category_, defaultOption_, defaultHidden_);
+Option Option::U8(std::string name_, std::vector<std::string> options_, const OptionCategory category_,
+                  const uint8_t defaultOption_, const bool defaultHidden_) {
+    return {static_cast<uint8_t>(0), std::move(name_), std::move(options_), category_, defaultOption_, defaultHidden_};
 }
 
 Option Option::LogicTrick(std::string name_) {
-    return Option(false, std::move(name_), { "Disabled", "Enabled" }, OptionCategory::Setting, 0, 0);
+    return Option(false, std::move(name_), { "Disabled", "Enabled" }, OptionCategory::Setting, 0, false);
 }
 
 Option::operator bool() const {
     if (std::holds_alternative<bool>(var)) {
         return Value<bool>();
-    } else {
-        return Value<uint8_t>() != 0;
     }
+    return Value<uint8_t>() != 0;
 }
 
 size_t Option::GetOptionCount() const {
@@ -56,7 +55,7 @@ void Option::RestoreDelayedOption() {
     SetVariable();
 }
 
-void Option::SetSelectedIndex(size_t idx) {
+void Option::SetSelectedIndex(const size_t idx) {
     selectedOption = idx;
     if (selectedOption >= options.size()) {
         selectedOption = 0;
@@ -76,20 +75,20 @@ bool Option::IsHidden() const {
     return hidden;
 }
 
-bool Option::IsCategory(OptionCategory category) const {
+bool Option::IsCategory(const OptionCategory category) const {
     return category == this->category;
 }
 
-Option::Option(uint8_t var_, std::string name_, std::vector<std::string> options_, OptionCategory category_,
-               uint8_t defaultOption_, bool defaultHidden_)
+Option::Option(uint8_t var_, std::string name_, std::vector<std::string> options_, const OptionCategory category_,
+               const uint8_t defaultOption_, const bool defaultHidden_)
     : var(var_), name(std::move(name_)), options(std::move(options_)), category(category_),
       defaultOption(defaultOption_), defaultHidden(defaultHidden_) {
     selectedOption = defaultOption;
     hidden = defaultHidden;
     SetVariable();
 }
-Option::Option(bool var_, std::string name_, std::vector<std::string> options_, OptionCategory category_,
-               uint8_t defaultOption_, bool defaultHidden_)
+Option::Option(bool var_, std::string name_, std::vector<std::string> options_, const OptionCategory category_,
+               const uint8_t defaultOption_, const bool defaultHidden_)
     : var(var_), name(std::move(name_)), options(std::move(options_)), category(category_),
       defaultOption(defaultOption_), defaultHidden(defaultHidden_) {
     selectedOption = defaultOption;
@@ -97,25 +96,24 @@ Option::Option(bool var_, std::string name_, std::vector<std::string> options_,
     SetVariable();
 }
 
-OptionGroup::OptionGroup(std::string name, std::vector<Option*> options, OptionGroupType groupType, bool printInSpoiler,
-                         OptionGroupType containsType)
+OptionGroup::OptionGroup(std::string name, std::vector<Option*> options, const OptionGroupType groupType,
+                         const bool printInSpoiler, const OptionGroupType containsType)
     : mName(std::move(name)), mOptions(std::move(options)), mGroupType(groupType), mPrintInSpoiler(printInSpoiler),
       mContainsType(containsType) {
 }
 
-OptionGroup::OptionGroup(std::string name, std::vector<OptionGroup*> subGroups, OptionGroupType groupType,
-                         bool printInSpoiler, OptionGroupType containsType)
+OptionGroup::OptionGroup(std::string name, std::vector<OptionGroup*> subGroups, const OptionGroupType groupType,
+                         const bool printInSpoiler, const OptionGroupType containsType)
     : mName(std::move(name)), mSubGroups(std::move(subGroups)), mGroupType(groupType), mPrintInSpoiler(printInSpoiler),
       mContainsType(containsType) {
 }
 
-OptionGroup OptionGroup::SubGroup(std::string name, std::vector<Option*> options, bool printInSpoiler) {
-    return OptionGroup(std::move(name), std::move(options), OptionGroupType::SUBGROUP, printInSpoiler);
+OptionGroup OptionGroup::SubGroup(std::string name, std::vector<Option*> options, const bool printInSpoiler) {
+    return {std::move(name), std::move(options), OptionGroupType::SUBGROUP, printInSpoiler};
 }
 
-OptionGroup OptionGroup::SubGroup(std::string name, std::vector<OptionGroup*> subGroups, bool printInSpoiler) {
-    return OptionGroup(std::move(name), std::move(subGroups), OptionGroupType::SUBGROUP, printInSpoiler,
-                       OptionGroupType::SUBGROUP);
+OptionGroup OptionGroup::SubGroup(std::string name, std::vector<OptionGroup*> subGroups, const bool printInSpoiler) {
+    return {std::move(name), std::move(subGroups), OptionGroupType::SUBGROUP, printInSpoiler, OptionGroupType::SUBGROUP};
 }
 
 const std::string& OptionGroup::GetName() const {
diff --git a/soh/soh/Enhancements/randomizer/option.h b/soh/soh/Enhancements/randomizer/option.h
index a610282b6..aff38c714 100644
--- a/soh/soh/Enhancements/randomizer/option.h
+++ b/soh/soh/Enhancements/randomizer/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <string>
 #include <vector>
 #include <variant>
@@ -19,8 +19,8 @@ class Option {
                        OptionCategory category_ = OptionCategory::Setting, uint8_t defaultOption_ = 0,
                        bool defaultHidden_ = false);
     static Option U8(std::string name_, std::vector<std::string> options_,
-                     OptionCategory category_ = OptionCategory::Setting, uint8_t defaultOption = 0,
-                     bool defaultHidden = false);
+                     OptionCategory category_ = OptionCategory::Setting, uint8_t defaultOption_ = 0,
+                     bool defaultHidden_ = false);
     static Option LogicTrick(std::string name_);
 
     template <typename T> T Value() const {
@@ -65,7 +65,7 @@ class Option {
     uint8_t selectedOption = 0;
     uint8_t delayedOption = 0;
     bool hidden = false;
-    OptionCategory category;
+    OptionCategory category = OptionCategory::Setting;
     uint8_t defaultOption = false;
     bool defaultHidden = false;
 };
@@ -94,7 +94,7 @@ class OptionGroup {
     std::vector<Option*> mOptions;
     std::vector<OptionGroup*> mSubGroups;
     OptionGroupType mGroupType = OptionGroupType::DEFAULT;
-    bool mPrintInSpoiler;
+    bool mPrintInSpoiler = true;
     OptionGroupType mContainsType = OptionGroupType::DEFAULT;
 };
 } // namespace Rando
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
index ec4595f01..65c98e251 100644
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -5,25 +5,27 @@
 
 #include <spdlog/spdlog.h>
 
+#include <utility>
+
 namespace Rando {
-std::vector<std::string> NumOpts(int min, int max, int step = 1, std::string textBefore = {}, std::string textAfter = {}) {
+std::vector<std::string> NumOpts(const int min, const int max, const int step = 1, const std::string& textBefore = {}, const std::string& textAfter = {}) {
     std::vector<std::string> options;
     options.reserve((max - min) / step + 1);
     for (int i = min; i <= max; i += step) {
-        options.push_back(textBefore + std::to_string(i) + textAfter);
+        options.push_back(textBefore + std::to_string(i) += textAfter);
     }
     return options;
 }
 
-std::vector<std::string> MultiVecOpts(std::vector<std::vector<std::string>> optionsVector) {
+std::vector<std::string> MultiVecOpts(const std::vector<std::vector<std::string>>& optionsVector) {
     uint32_t totalSize = 0;
-    for (auto vector: optionsVector) {
+    for (const auto& vector: optionsVector) {
         totalSize += vector.size();
     }
     std::vector<std::string> options;
     options.reserve(totalSize);
-    for (auto vector : optionsVector) {
-        for (auto op : vector) {
+    for (const auto& vector : optionsVector) {
+        for (const auto& op : vector) {
             options.push_back(op);
         }
     }
@@ -708,7 +710,7 @@ void Settings::CreateOptions() {
     // TODO: For some reason this group and only this group is an ambiguous constructor call, despite
     // the initializer list only having Option* in it. For now explictly declare and initialize
     // a vector of Option* and construct the group with that.
-    std::vector<Option*> itemPoolOptions = {&mOptions[RSK_ITEM_POOL], &mOptions[RSK_ICE_TRAPS]};
+    const std::vector<Option*> itemPoolOptions = {&mOptions[RSK_ITEM_POOL], &mOptions[RSK_ICE_TRAPS]};
     mOptionGroups[RSG_ITEM_POOL] = OptionGroup("Item Pool Settings", itemPoolOptions);
     // TODO: Progressive Goron Sword, Remove Double Defense
     mOptionGroups[RSG_EXCLUDES_KOKIRI_FOREST] = OptionGroup::SubGroup("Kokiri Forest", mExcludeLocationsOptionsGroups[GROUP_KOKIRI_FOREST], false);
@@ -928,11 +930,11 @@ void Settings::CreateOptions() {
     };
 }
 
-Option& Settings::Setting(RandomizerSettingKey key) {
+Option& Settings::Setting(const RandomizerSettingKey key) {
     return mOptions[key];
 }
 
-Option& Settings::GetTrickOption(RandomizerTrick key) {
+Option& Settings::GetTrickOption(const RandomizerTrick key) {
     return mTrickOptions[key];
 }
 
@@ -940,7 +942,7 @@ const std::array<Option, RSK_MAX>& Settings::GetAllOptions() const {
     return mOptions;
 }
 
-std::vector<Option *>& Settings::GetExcludeOptionsForGroup(SpoilerCollectionCheckGroup group) {
+std::vector<Option *>& Settings::GetExcludeOptionsForGroup(const SpoilerCollectionCheckGroup group) {
     return mExcludeLocationsOptionsGroups[group];
 }
 
@@ -961,7 +963,7 @@ std::string Settings::GetHash() const {
 }
 
 void Settings::SetHash(std::string hash) {
-    mHash = hash;
+    mHash = std::move(hash);
 }
 
 const std::string& Settings::GetSeedString() const {
@@ -969,14 +971,14 @@ const std::string& Settings::GetSeedString() const {
 }
 
 void Settings::SetSeedString(std::string seedString) {
-    mSeedString = seedString;
+    mSeedString = std::move(seedString);
 }
 
-const uint32_t Settings::GetSeed() const {
+uint32_t Settings::GetSeed() const {
     return mFinalSeed;
 }
 
-void Settings::SetSeed(uint32_t seed) {
+void Settings::SetSeed(const uint32_t seed) {
     mFinalSeed = seed;
 }
 
@@ -984,12 +986,12 @@ const std::array<OptionGroup, RSG_MAX>& Settings::GetOptionGroups() {
     return mOptionGroups;
 }
 
-const OptionGroup& Settings::GetOptionGroup(RandomizerSettingGroupKey key) {
+const OptionGroup& Settings::GetOptionGroup(const RandomizerSettingGroupKey key) {
     return mOptionGroups[key];
 }
 
-void Settings::UpdateSettings(std::unordered_map<RandomizerSettingKey, uint8_t> cvarSettings, std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks) {
-    auto ctx = Rando::Context::GetInstance();
+void Settings::UpdateSettings(std::unordered_map<RandomizerSettingKey, uint8_t> cvarSettings, const std::set<RandomizerCheck>& excludedLocations, const std::set<RandomizerTrick>& enabledTricks) {
+    const auto ctx = Context::GetInstance();
     if (!ctx->IsSpoilerLoaded()) {
         // If we've loaded a spoiler file, the settings have already been populated, so we
         // only need to do things like resolve the starting age or determine MQ dungeons.
@@ -1004,6 +1006,9 @@ void Settings::UpdateSettings(std::unordered_map<RandomizerSettingKey, uint8_t>
             case RO_LOGIC_NO_LOGIC:
                 mOptions[RSK_LOGIC_RULES].SetSelectedIndex(RO_LOGIC_NO_LOGIC);
                 break;
+            default:
+                mOptions[RSK_LOGIC_RULES].SetSelectedIndex(RO_LOGIC_GLITCHLESS);
+                break;
         }
         
         // if we skip child zelda, we start with zelda's letter, and malon starts
@@ -1031,16 +1036,15 @@ void Settings::UpdateSettings(std::unordered_map<RandomizerSettingKey, uint8_t>
         // the ImGui slider can't go down to 0 (the first index aka 1 big poe).
         mOptions[RSK_BIG_POE_COUNT].SetSelectedIndex(cvarSettings[RSK_BIG_POE_COUNT] - 1);
         ctx->AddExcludedOptions();
-        for (auto locationKey : ctx->everyPossibleLocation) {
-            auto location = ctx->GetItemLocation(locationKey);
-            if (excludedLocations.count(location->GetRandomizerCheck())) {
+        for (const auto locationKey : ctx->everyPossibleLocation) {
+            if (const auto location = ctx->GetItemLocation(locationKey); excludedLocations.contains(location->GetRandomizerCheck())) {
                 location->GetExcludedOption()->SetSelectedIndex(1);
             } else {
                 location->GetExcludedOption()->SetSelectedIndex(0);
             }
         }
         // Tricks
-        for (auto randomizerTrick : enabledTricks) {
+        for (const auto randomizerTrick : enabledTricks) {
             mTrickOptions[randomizerTrick].SetSelectedIndex(1);
         }
     }
@@ -1049,8 +1053,8 @@ void Settings::UpdateSettings(std::unordered_map<RandomizerSettingKey, uint8_t>
     // ShuffleChestMinigame.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_CHEST_MINIGAME]);
     //TODO: RandomizeAllSettings(true) when implementing the ability to randomize the options themselves.
     std::array<DungeonInfo*, 12> dungeons = ctx->GetDungeons()->GetDungeonList();
-    std::array<bool, 12> dungeonModesKnown;
-    std::vector<Option*> dungeonOptions = {
+    std::array<bool, 12> dungeonModesKnown{};
+    const std::vector<Option*> dungeonOptions = {
         &mOptions[RSK_MQ_DEKU_TREE],
         &mOptions[RSK_MQ_DODONGOS_CAVERN],
         &mOptions[RSK_MQ_JABU_JABU],
@@ -1064,13 +1068,13 @@ void Settings::UpdateSettings(std::unordered_map<RandomizerSettingKey, uint8_t>
         &mOptions[RSK_MQ_GTG],
         &mOptions[RSK_MQ_GANONS_CASTLE]
     };
-    uint8_t mqSet = mOptions[RSK_MQ_DUNGEON_COUNT].Value<uint8_t>();
+    auto mqSet = mOptions[RSK_MQ_DUNGEON_COUNT].Value<uint8_t>();
     if (mOptions[RSK_MQ_DUNGEON_RANDOM].Is(RO_MQ_DUNGEONS_SELECTION)) {
         mqSet = 0;
     }
-    uint8_t dungeonCount = 0;
     std::vector<uint8_t> randMQOption = {};
     if (mOptions[RSK_MQ_DUNGEON_SET]) {
+        uint8_t dungeonCount = 0;
         for (size_t i = 0; i < dungeons.size(); i++) {
             dungeons[i]->ClearMQ();
             dungeonModesKnown[i] = true;
@@ -1083,11 +1087,13 @@ void Settings::UpdateSettings(std::unordered_map<RandomizerSettingKey, uint8_t>
                     randMQOption.push_back(i);
                     dungeonModesKnown[i] = false;
                     break;
+                default:
+                    break;
             }
         }
         Shuffle(randMQOption);
         if (mOptions[RSK_MQ_DUNGEON_RANDOM].Is(RO_MQ_DUNGEONS_RANDOM_NUMBER)) {
-            mqSet = dungeonCount + Random(0, randMQOption.size() + 1);
+            mqSet = dungeonCount + Random(0, static_cast<int>(randMQOption.size()) + 1);
         }
         for (uint8_t i = 0; dungeonCount < mqSet; i++) {
             if (i > randMQOption.size()) {
@@ -1101,12 +1107,12 @@ void Settings::UpdateSettings(std::unordered_map<RandomizerSettingKey, uint8_t>
         }
     } else {
         Shuffle(dungeons);
-        for (size_t i = 0; i < dungeons.size(); i++) {
-            dungeons[i]->ClearMQ();
+        for (const auto dungeon : dungeons) {
+            dungeon->ClearMQ();
         }
-        bool allDungeonModesKnown = mqSet == 0 || mqSet == dungeons.size();
-        for (uint8_t i = 0; i < sizeof(dungeonModesKnown); ++i) {
-            dungeonModesKnown[i] = allDungeonModesKnown;
+        const bool allDungeonModesKnown = mqSet == 0 || mqSet == dungeons.size();
+        for (bool & i : dungeonModesKnown) {
+            i = allDungeonModesKnown;
         }
         if (mOptions[RSK_MQ_DUNGEON_RANDOM].Is(RO_MQ_DUNGEONS_RANDOM_NUMBER)) {
             mqSet = Random(0, 13);
@@ -1117,11 +1123,11 @@ void Settings::UpdateSettings(std::unordered_map<RandomizerSettingKey, uint8_t>
     }
 
     // Set key ring for each dungeon
-    for (size_t i = 0; i < dungeons.size(); i++) {
-        dungeons[i]->ClearKeyRing();
+    for (const auto dungeon : dungeons) {
+        dungeon->ClearKeyRing();
     }
 
-    std::vector<Option*> keyRingOptions = {
+    const std::vector<Option*> keyRingOptions = {
         &mOptions[RSK_KEYRINGS_FOREST_TEMPLE],
         &mOptions[RSK_KEYRINGS_FIRE_TEMPLE],
         &mOptions[RSK_KEYRINGS_WATER_TEMPLE],
@@ -1139,7 +1145,7 @@ void Settings::UpdateSettings(std::unordered_map<RandomizerSettingKey, uint8_t>
             if (mOptions[RSK_GERUDO_FORTRESS].Is(RO_GF_NORMAL) && mOptions[RSK_GERUDO_KEYS].IsNot(RO_GERUDO_KEYS_VANILLA)) {
                 keyrings.push_back(&mOptions[RSK_KEYRINGS_GERUDO_FORTRESS]);
             }
-            int keyRingCount = mOptions[RSK_KEYRINGS].Is(RO_KEYRINGS_COUNT) ? mOptions[RSK_KEYRINGS_RANDOM_COUNT].Value<uint8_t>() : Random(0, keyrings.size());
+            const uint32_t keyRingCount = mOptions[RSK_KEYRINGS].Is(RO_KEYRINGS_COUNT) ? mOptions[RSK_KEYRINGS_RANDOM_COUNT].Value<uint8_t>() : Random(0, static_cast<int>(keyrings.size()));
             Shuffle(keyrings);
             for (size_t i = 0; i < keyRingCount; i++) {
                 keyrings[i]->SetSelectedIndex(RO_GENERIC_ON);
@@ -1172,11 +1178,11 @@ void Settings::UpdateSettings(std::unordered_map<RandomizerSettingKey, uint8_t>
     }
     auto trials = ctx->GetTrials()->GetTrialList();
     Shuffle(trials);
-    for (auto& trial : trials) {
+    for (const auto trial : trials) {
         trial->SetAsSkipped();
     }
     if (mOptions[RSK_GANONS_TRIALS].Is(RO_GANONS_TRIALS_RANDOM_NUMBER)) {
-        mOptions[RSK_TRIAL_COUNT].SetSelectedIndex(Random(0, mOptions[RSK_TRIAL_COUNT].GetOptionCount()));
+        mOptions[RSK_TRIAL_COUNT].SetSelectedIndex(Random(0, static_cast<int>(mOptions[RSK_TRIAL_COUNT].GetOptionCount())));
     }
     for (uint8_t i = 0; i < mOptions[RSK_TRIAL_COUNT].Value<uint8_t>(); i++) {
         trials[i]->SetAsRequired();
@@ -1190,8 +1196,7 @@ void Settings::UpdateSettings(std::unordered_map<RandomizerSettingKey, uint8_t>
     }
 
     if (mOptions[RSK_STARTING_AGE].Is(RO_AGE_RANDOM)) {
-        int choice = Random(0, 2);
-        if (choice == 0) {
+        if (const uint32_t choice = Random(0, 2); choice == 0) {
             mResolvedStartingAge = RO_AGE_CHILD;
         } else {
             mResolvedStartingAge = RO_AGE_ADULT;
@@ -1226,19 +1231,18 @@ void Settings::UpdateSettings(std::unordered_map<RandomizerSettingKey, uint8_t>
     }
 }
 void Settings::ParseJson(nlohmann::json spoilerFileJson) {
-    mSeedString = spoilerFileJson["seed"].template get<std::string>();
+    mSeedString = spoilerFileJson["seed"].get<std::string>();
     mFinalSeed = spoilerFileJson["finalSeed"].get<uint32_t>();
     nlohmann::json settingsJson = spoilerFileJson["settings"];
     for (auto it = settingsJson.begin(); it != settingsJson.end(); ++it) {
         // todo load into cvars for UI
 
-        std::string numericValueString;
-        if (mSpoilerfileSettingNameToEnum.count(it.key())) {
-            RandomizerSettingKey index = mSpoilerfileSettingNameToEnum[it.key()];
+        if (mSpoilerfileSettingNameToEnum.contains(it.key())) {
+            std::string numericValueString;
             // this is annoying but the same strings are used in different orders
             // and i don't want the spoilerfile to just have numbers instead of
             // human readable settings values so it'll have to do for now
-            switch (index) {
+            switch (const RandomizerSettingKey index = mSpoilerfileSettingNameToEnum[it.key()]) {
                 case RSK_LOGIC_RULES:
                     if (it.value() == "Glitchless") {
                         mOptions[index].SetSelectedIndex(RO_LOGIC_GLITCHLESS);
@@ -1791,18 +1795,18 @@ void Settings::ParseJson(nlohmann::json spoilerFileJson) {
     }
 
     nlohmann::json jsonExcludedLocations = spoilerFileJson["excludedLocations"];
-    auto ctx = Rando::Context::GetInstance();
+    const auto ctx = Context::GetInstance();
 
     ctx->AddExcludedOptions();
-    for (auto it = jsonExcludedLocations.begin(); it != jsonExcludedLocations.end(); it++) {
-        RandomizerCheck rc = ctx->mSpoilerfileCheckNameToEnum[it.value()];
+    for (auto it = jsonExcludedLocations.begin(); it != jsonExcludedLocations.end(); ++it) {
+        const RandomizerCheck rc = ctx->mSpoilerfileCheckNameToEnum[it.value()];
         ctx->GetItemLocation(rc)->GetExcludedOption()->SetSelectedIndex(RO_GENERIC_ON);
     }
 
     nlohmann::json enabledTricksJson = spoilerFileJson["enabledTricks"];
-    for (auto it = enabledTricksJson.begin(); it != enabledTricksJson.end(); it++) {
+    for (auto it = enabledTricksJson.begin(); it != enabledTricksJson.end(); ++it) {
         std::string numericValueString = it.value();
-        RandomizerTrick rt = (RandomizerTrick)std::stoi(numericValueString);
+        const auto rt = static_cast<RandomizerTrick>(std::stoi(numericValueString));
         GetTrickOption(rt).SetSelectedIndex(RO_GENERIC_ON);
     }
 }
diff --git a/soh/soh/Enhancements/randomizer/settings.h b/soh/soh/Enhancements/randomizer/settings.h
index fedd04ec2..b84dacad5 100644
--- a/soh/soh/Enhancements/randomizer/settings.h
+++ b/soh/soh/Enhancements/randomizer/settings.h
@@ -24,26 +24,26 @@ class Settings {
     std::string GetHash() const;
     const std::string& GetSeedString() const;
     void SetSeedString(std::string seedString);
-    const uint32_t GetSeed() const;
+    uint32_t GetSeed() const;
     void SetSeed(uint32_t seed);
     void SetHash(std::string hash);
     const std::array<OptionGroup, RSG_MAX>& GetOptionGroups();
     const OptionGroup& GetOptionGroup(RandomizerSettingGroupKey key);
     void UpdateSettings(std::unordered_map<RandomizerSettingKey, uint8_t> cvarSettings,
-                        std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks);
+                        const std::set<RandomizerCheck>& excludedLocations, const std::set<RandomizerTrick>& enabledTricks);
     void ParseJson(nlohmann::json spoilerFileJson);
     std::vector<Option*> VanillaLogicDefaults = {};
 
   private:
     std::array<Option, RSK_MAX> mOptions = {};
     std::array<OptionGroup, RSG_MAX> mOptionGroups = {};
-    std::array<Option, RT_MAX> mTrickOptions;
-    std::vector<std::vector<Option*>> mExcludeLocationsOptionsGroups;
+    std::array<Option, RT_MAX> mTrickOptions = {};
+    std::vector<std::vector<Option*>> mExcludeLocationsOptionsGroups = {};
     std::unordered_map<std::string, RandomizerSettingKey> mSpoilerfileSettingNameToEnum;
-    RandoOptionStartingAge mResolvedStartingAge;
-    RandoOptionLACSCondition mLACSCondition;
+    RandoOptionStartingAge mResolvedStartingAge =  RO_AGE_CHILD;
+    RandoOptionLACSCondition mLACSCondition = RO_LACS_VANILLA;
     std::string mHash;
     std::string mSeedString;
-    uint32_t mFinalSeed;
+    uint32_t mFinalSeed = 0;
 };
 } // namespace Rando
diff --git a/soh/soh/Enhancements/randomizer/trial.cpp b/soh/soh/Enhancements/randomizer/trial.cpp
index f07c19c5d..d3fc99951 100644
--- a/soh/soh/Enhancements/randomizer/trial.cpp
+++ b/soh/soh/Enhancements/randomizer/trial.cpp
@@ -1,7 +1,7 @@
 #include "trial.h"
 
 namespace Rando {
-TrialInfo::TrialInfo(const Text name_) : name(std::move(name_)) {}
+TrialInfo::TrialInfo(Text name_) : name(std::move(name_)) {}
 TrialInfo::TrialInfo() = default;
 TrialInfo::~TrialInfo() = default;
 
@@ -35,7 +35,7 @@ Trials::Trials() {
 }
 Trials::~Trials() = default;
 
-TrialInfo* Trials::GetTrial(TrialKey key) {
+TrialInfo* Trials::GetTrial(const TrialKey key) {
     return &mTrials[key];
 }
 
@@ -52,31 +52,27 @@ void Trials::RequireAll() {
 }
 
 std::array<TrialInfo*, 6> Trials::GetTrialList() {
-    std::array<TrialInfo*, 6> trialList;
+    std::array<TrialInfo*, 6> trialList{};
     for (size_t i = 0; i < mTrials.size(); i++) {
         trialList[i] = &mTrials[i];
     }
     return trialList;
 }
 
-size_t Trials::GetTrialListSize() {
+size_t Trials::GetTrialListSize() const {
     return mTrials.size();
 }
 void Trials::ParseJson(nlohmann::json spoilerFileJson) {
-    try {
-        nlohmann::json trialsJson = spoilerFileJson["requiredTrials"];
-        for (auto it = trialsJson.begin(); it != trialsJson.end(); it++) {
-            std::string trialName = it.value().template get<std::string>();
-            for (auto& trial : mTrials) {
-                if (trial.GetName() == trialName) {
-                    trial.SetAsRequired();
-                } else {
-                    trial.SetAsSkipped();
-                }
+    nlohmann::json trialsJson = spoilerFileJson["requiredTrials"];
+    for (auto it = trialsJson.begin(); it != trialsJson.end(); ++it) {
+        std::string trialName = it.value().get<std::string>();
+        for (auto& trial : mTrials) {
+            if (trial.GetName() == trialName) {
+                trial.SetAsRequired();
+            } else {
+                trial.SetAsSkipped();
             }
         }
-    } catch (const std::exception& e) {
-        throw e;
     }
 }
 } // namespace Rando
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/trial.h b/soh/soh/Enhancements/randomizer/trial.h
index 54f33463b..9e282f45d 100644
--- a/soh/soh/Enhancements/randomizer/trial.h
+++ b/soh/soh/Enhancements/randomizer/trial.h
@@ -8,7 +8,7 @@
 namespace Rando {
 class TrialInfo {
   public:
-    TrialInfo(const Text name_);
+    explicit TrialInfo(Text name_);
     TrialInfo();
     ~TrialInfo();
 
@@ -39,7 +39,7 @@ class Trials {
     void SkipAll();
     void RequireAll();
     std::array<TrialInfo*, 6> GetTrialList();
-    size_t GetTrialListSize();
+    size_t GetTrialListSize() const;
     void ParseJson(nlohmann::json spoilerFileJson);
   private:
     std::array<TrialInfo, 6> mTrials;

From c5790d9284645133766cc368606bd23a7e6d3b53 Mon Sep 17 00:00:00 2001
From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Date: Thu, 7 Dec 2023 23:11:44 +0000
Subject: [PATCH 032/230] Move Barren handling to before hint generation, Add
 RandomizerArea enum and other cleanups (#3339)

* Initial wothCandidates change, pushed early foreseeing conflicts

* Implement better barren handling, waiting on #3205

* pls save next time VS code

* Finish implementation of barren and randomizer area refactor

* Apply function changes to develop merge

* Fix double default decleration issue

* change some var types for uniformity

* Fix post merge differences to the point of building and generating randos

* Address reviews

* address more reviews
---
 .../Enhancements/randomizer/3drando/fill.cpp  | 161 +++--
 .../Enhancements/randomizer/3drando/fill.hpp  |   2 +-
 .../randomizer/3drando/hint_list.cpp          |  49 ++
 .../randomizer/3drando/hint_list.hpp          |   1 +
 .../Enhancements/randomizer/3drando/hints.cpp | 593 +++++++-----------
 .../Enhancements/randomizer/3drando/hints.hpp |  32 +-
 .../randomizer/3drando/location_access.cpp    |  26 +-
 .../randomizer/3drando/location_access.hpp    |  11 +-
 .../locacc_bottom_of_the_well.cpp             |   8 +-
 .../location_access/locacc_castle_town.cpp    |  50 +-
 .../location_access/locacc_death_mountain.cpp |  44 +-
 .../location_access/locacc_deku_tree.cpp      |  44 +-
 .../locacc_dodongos_cavern.cpp                |  60 +-
 .../location_access/locacc_fire_temple.cpp    |  88 +--
 .../location_access/locacc_forest_temple.cpp  |  82 +--
 .../location_access/locacc_ganons_castle.cpp  |  36 +-
 .../locacc_gerudo_training_grounds.cpp        |  34 +-
 .../location_access/locacc_gerudo_valley.cpp  |  38 +-
 .../location_access/locacc_hyrule_field.cpp   |  40 +-
 .../location_access/locacc_ice_cavern.cpp     |  14 +-
 .../locacc_jabujabus_belly.cpp                |  48 +-
 .../location_access/locacc_kakariko.cpp       |  52 +-
 .../location_access/locacc_lost_woods.cpp     |  44 +-
 .../location_access/locacc_shadow_temple.cpp  |  32 +-
 .../location_access/locacc_spirit_temple.cpp  |  42 +-
 .../location_access/locacc_water_temple.cpp   |  70 +--
 .../location_access/locacc_zoras_domain.cpp   |  24 +-
 .../Enhancements/randomizer/3drando/logic.cpp |  16 +-
 .../Enhancements/randomizer/3drando/logic.hpp |   6 +-
 .../Enhancements/randomizer/3drando/menu.cpp  |   2 +-
 .../randomizer/3drando/playthrough.cpp        |   1 -
 .../Enhancements/randomizer/3drando/shops.cpp |  14 +-
 .../randomizer/3drando/spoiler_log.cpp        |  46 +-
 soh/soh/Enhancements/randomizer/context.cpp   |  98 ++-
 soh/soh/Enhancements/randomizer/context.h     |   7 +-
 soh/soh/Enhancements/randomizer/dungeon.cpp   |  32 +-
 soh/soh/Enhancements/randomizer/dungeon.h     |   6 +-
 soh/soh/Enhancements/randomizer/entrance.cpp  |  12 +-
 soh/soh/Enhancements/randomizer/hint.cpp      |  23 +-
 soh/soh/Enhancements/randomizer/hint.h        |  12 +-
 soh/soh/Enhancements/randomizer/item.cpp      |   4 +
 soh/soh/Enhancements/randomizer/item.h        |   1 +
 soh/soh/Enhancements/randomizer/item_list.cpp |  12 +-
 .../Enhancements/randomizer/item_location.cpp |  35 +-
 .../Enhancements/randomizer/item_location.h   |  15 +-
 .../Enhancements/randomizer/location_list.cpp | 310 ++++-----
 .../Enhancements/randomizer/randomizer.cpp    |  16 +-
 .../Enhancements/randomizer/randomizerTypes.h |  66 +-
 soh/soh/SaveManager.cpp                       |  57 +-
 49 files changed, 1314 insertions(+), 1202 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/fill.cpp b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
index 3effc3840..26cd3691e 100644
--- a/soh/soh/Enhancements/randomizer/3drando/fill.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
@@ -203,10 +203,28 @@ std::vector<RandomizerCheck> GetAllEmptyLocations() {
     });
 }
 
+bool IsBombchus(RandomizerGet item, bool includeShops = false){
+  return (item >= RG_BOMBCHU_5 && item <= RG_BOMBCHU_DROP) || item == RG_PROGRESSIVE_BOMBCHUS || 
+    (includeShops && (item == RG_BUY_BOMBCHU_10 || item == RG_BUY_BOMBCHU_20));
+}
+
+bool IsBeatableWithout(RandomizerCheck excludedCheck, bool replaceItem, RandomizerGet ignore = RG_NONE){ //RANDOTODO make excludCheck an ItemLocation
+  auto ctx = Rando::Context::GetInstance();
+  RandomizerGet copy = ctx->GetItemLocation(excludedCheck)->GetPlacedRandomizerGet(); //Copy out item
+  ctx->GetItemLocation(excludedCheck)->SetPlacedItem(RG_NONE); //Write in empty item
+  ctx->playthroughBeatable = false;
+  LogicReset();
+  GetAccessibleLocations(ctx->allLocations, SearchMode::CheckBeatable, ignore); //Check if game is still beatable
+  if (replaceItem){
+    ctx->GetItemLocation(excludedCheck)->SetPlacedItem(copy); //Immediately put item back
+  }
+  return ctx->playthroughBeatable;
+}
+
 //This function will return a vector of ItemLocations that are accessible with
 //where items have been placed so far within the world. The allowedLocations argument
 //specifies the pool of locations that we're trying to search for an accessible location in
-std::vector<RandomizerCheck> GetAccessibleLocations(const std::vector<RandomizerCheck>& allowedLocations, SearchMode mode /* = SearchMode::ReachabilitySearch*/, std::string ignore /*= ""*/, bool checkPoeCollectorAccess /*= false*/, bool checkOtherEntranceAccess /*= false*/) {
+std::vector<RandomizerCheck> GetAccessibleLocations(const std::vector<RandomizerCheck>& allowedLocations, SearchMode mode /* = SearchMode::ReachabilitySearch*/, RandomizerGet ignore /* = RG_NONE*/, bool checkPoeCollectorAccess /*= false*/, bool checkOtherEntranceAccess /*= false*/) {
     auto ctx = Rando::Context::GetInstance();
     std::vector<RandomizerCheck> accessibleLocations;
     // Reset all access to begin a new search
@@ -230,7 +248,7 @@ std::vector<RandomizerCheck> GetAccessibleLocations(const std::vector<Randomizer
   int gsCount = 0;
   const int maxGsCount = mode == SearchMode::GeneratePlaythrough ? GetMaxGSCount() : 0; //If generating playthrough want the max that's possibly useful, else doesn't matter
   bool bombchusFound = false;
-  std::vector<std::string> buyIgnores;
+  std::vector<std::variant<bool*, uint8_t*>> buyIgnores;
 
   //Variables for search
   std::vector<Rando::ItemLocation*> newItemLocations;
@@ -324,30 +342,30 @@ std::vector<RandomizerCheck> GetAccessibleLocations(const std::vector<Randomizer
           LocationAccess& locPair = area->locations[k];
           RandomizerCheck loc = locPair.GetLocation();
           Rando::ItemLocation* location = ctx->GetItemLocation(loc);
+          RandomizerGet locItem = location->GetPlacedRandomizerGet();
 
           if (!location->IsAddedToPool() && locPair.ConditionsMet()) {
 
             location->AddToPool();
 
-            if (location->GetPlacedRandomizerGet() == RG_NONE) {
+            if (locItem == RG_NONE) {
               accessibleLocations.push_back(loc); //Empty location, consider for placement
             } else {
               //If ignore has a value, we want to check if the item location should be considered or not
               //This is necessary due to the below preprocessing for playthrough generation
-              if (ignore != "") {
+              if (ignore != RG_NONE) {
                 ItemType type = location->GetPlacedItem().GetItemType();
-                std::string itemName(location->GetPlacedItemName().GetEnglish());
                 //If we want to ignore tokens, only add if not a token
-                if (ignore == "Tokens" && type != ITEMTYPE_TOKEN) {
+                if (ignore == RG_GOLD_SKULLTULA_TOKEN && type != ITEMTYPE_TOKEN) {
                   newItemLocations.push_back(location);
                 }
                 //If we want to ignore bombchus, only add if bombchu is not in the name
-                else if (ignore == "Bombchus" && itemName.find("Bombchu") == std::string::npos) {
+                else if (IsBombchus(ignore) && IsBombchus(locItem, true)) {
                   newItemLocations.push_back(location);
                 }
-                //We want to ignore a specific Buy item name
-                else if (ignore != "Tokens" && ignore != "Bombchus") {
-                  if ((type == ITEMTYPE_SHOP && ignore != GetShopItemBaseName(itemName)) || type != ITEMTYPE_SHOP) {
+                //We want to ignore a specific Buy item. Buy items with different RandomizerGets are recognised by a shared GetLogicVar
+                else if (ignore != RG_GOLD_SKULLTULA_TOKEN && IsBombchus(ignore)) {
+                  if ((type == ITEMTYPE_SHOP && Rando::StaticData::GetItemTable()[ignore].GetLogicVar() != location->GetPlacedItem().GetLogicVar()) || type != ITEMTYPE_SHOP) {
                     newItemLocations.push_back(location);
                   }
                 }
@@ -364,8 +382,7 @@ std::vector<RandomizerCheck> GetAccessibleLocations(const std::vector<Randomizer
               //Item is an advancement item, figure out if it should be added to this sphere
               if (!ctx->playthroughBeatable && location->GetPlacedItem().IsAdvancement()) {
                 ItemType type = location->GetPlacedItem().GetItemType();
-                std::string itemName(location->GetPlacedItemName().GetEnglish());
-                bool bombchus = itemName.find("Bombchu") != std::string::npos; //Is a bombchu location
+                bool bombchus = IsBombchus(locItem, true); //Is a bombchu location
 
                 //Decide whether to exclude this location
                 //This preprocessing is done to reduce the amount of searches performed in PareDownPlaythrough
@@ -389,7 +406,7 @@ std::vector<RandomizerCheck> GetAccessibleLocations(const std::vector<Randomizer
                 // TODO: Reimplement Ammo Drops setting
                 else if (/*AmmoDrops.IsNot(AMMODROPS_NONE) &&*/ !(bombchus && bombchusFound) && type == ITEMTYPE_SHOP) {
                   //Only check each buy item once
-                  std::string buyItem = GetShopItemBaseName(itemName);
+                  auto buyItem = location->GetPlacedItem().GetLogicVar();
                   //Buy item not in list to ignore, add it to list and write to playthrough
                   if (std::find(buyIgnores.begin(), buyIgnores.end(), buyItem) == buyIgnores.end()) {
                     exclude = false;
@@ -466,6 +483,39 @@ static void GeneratePlaythrough() {
     GetAccessibleLocations(ctx->allLocations, SearchMode::GeneratePlaythrough);
 }
 
+RandomizerArea LookForExternalArea(Area* curRegion, std::vector<RandomizerRegion> alreadyChecked){//RANDOTODO curREGION
+  for (auto& entrance : curRegion->entrances) {
+    RandomizerArea otherArea = entrance->GetParentRegion()->GetArea();
+    if(otherArea != RA_NONE){
+      return otherArea;
+      //if the area hasn't already been checked, check it
+    } else if (std::find(alreadyChecked.begin(), alreadyChecked.end(), entrance->GetParentRegionKey()) == alreadyChecked.end()) {
+      alreadyChecked.push_back(entrance->GetParentRegionKey());
+      RandomizerArea passdown = LookForExternalArea(entrance->GetParentRegion(), alreadyChecked);
+      if(passdown != RA_NONE){
+        return passdown;
+      }
+    }
+  }
+  return RA_NONE;
+}
+
+void SetAreas(){
+  auto ctx = Rando::Context::GetInstance();
+//RANDOTODO give entrances an enum like RandomizerCheck, the give them all areas here, the use those areas to not need to recursivly find ItemLocation areas
+  for (int c = 0; c < RR_MARKER_AREAS_END; c++) {
+    Area region = areaTable[c];
+    RandomizerArea area = region.GetArea();
+    if (area == RA_NONE) {
+      std::vector<RandomizerRegion> alreadyChecked = {(RandomizerRegion)c};
+      area = LookForExternalArea(&region, alreadyChecked);
+    }
+    for (auto& loc : region.locations){
+      ctx->GetItemLocation(loc.GetLocation())->SetArea(area);
+    }
+  }
+}
+
 //Remove unnecessary items from playthrough by removing their location, and checking if game is still beatable
 //To reduce searches, some preprocessing is done in playthrough generation to avoid adding obviously unnecessary items
 static void PareDownPlaythrough() {
@@ -478,37 +528,22 @@ static void PareDownPlaythrough() {
     std::vector<RandomizerCheck> sphere = ctx->playthroughLocations.at(i);
     for (int j = sphere.size() - 1; j >= 0; j--) {
       RandomizerCheck loc = sphere.at(j);
-      RandomizerGet copy = ctx->GetItemLocation(loc)->GetPlacedRandomizerGet(); //Copy out item
-      ctx->GetItemLocation(loc)->SetPlacedItem(RG_NONE); //Write in empty item
-      ctx->playthroughBeatable = false;
-      LogicReset();
+      RandomizerGet locGet = ctx->GetItemLocation(loc)->GetPlacedRandomizerGet();
 
-      std::string ignore = "";
-      if (Rando::StaticData::RetrieveItem(copy).GetItemType() == ITEMTYPE_TOKEN) {
-        ignore = "Tokens";
+      RandomizerGet ignore = RG_NONE;
+      if (locGet == RG_GOLD_SKULLTULA_TOKEN || IsBombchus(locGet, true)
+        || Rando::StaticData::RetrieveItem(locGet).GetItemType() == ITEMTYPE_SHOP) {
+        ignore = locGet;
       }
-      else if (Rando::StaticData::RetrieveItem(copy).GetName().GetEnglish().find("Bombchu") != std::string::npos) {
-        ignore = "Bombchus";
-      }
-      else if (Rando::StaticData::RetrieveItem(copy).GetItemType() == ITEMTYPE_SHOP) {
-        ignore = GetShopItemBaseName(Rando::StaticData::RetrieveItem(copy).GetName().GetEnglish());
-      }
-
-      GetAccessibleLocations(ctx->allLocations, SearchMode::CheckBeatable, ignore); //Check if game is still beatable
 
       //Playthrough is still beatable without this item, therefore it can be removed from playthrough section.
-      if (ctx->playthroughBeatable) {
-        // Uncomment to print playthrough deletion log in citra
-        //  std::string itemname(Rando::StaticData::RetrieveItem(copy).GetName().GetEnglish());
-        //  std::string locationname(GetLocation(loc)->GetName());
-        //  std::string removallog = itemname + " at " + locationname + " removed from playthrough";
-        //  CitraPrint(removallog);
+      if (IsBeatableWithout(loc, false, ignore)) {
         ctx->playthroughLocations[i].erase(ctx->playthroughLocations[i].begin() + j);
-        ctx->GetItemLocation(loc)->SetDelayedItem(copy); //Game is still beatable, don't add back until later
+        ctx->GetItemLocation(loc)->SetDelayedItem(locGet); //Game is still beatable, don't add back until later
         toAddBackItem.push_back(loc);
       }
       else {
-        ctx->GetItemLocation(loc)->SetPlacedItem(copy); //Immediately put item back so game is beatable again
+        ctx->GetItemLocation(loc)->SetPlacedItem(locGet); //Immediately put item back so game is beatable again
       }
     }
   }
@@ -526,43 +561,50 @@ static void PareDownPlaythrough() {
   }
 }
 
-//Very similar to PareDownPlaythrough except it creates the list of Way of the Hero items
+//Very similar to PareDownPlaythrough except it sets WotH candidacy of Way of the Hero items
 //Way of the Hero items are more specific than playthrough items in that they are items which *must*
 // be obtained to logically be able to complete the seed, rather than playthrough items which
 // are just possible items you *can* collect to complete the seed.
 static void CalculateWotH() {
   auto ctx = Rando::Context::GetInstance();
-  //First copy locations from the 2-dimensional playthroughLocations into the 1-dimensional wothLocations
   //size - 1 so Triforce is not counted
   for (size_t i = 0; i < ctx->playthroughLocations.size() - 1; i++) {
     for (size_t j = 0; j < ctx->playthroughLocations[i].size(); j++) {
-      if (ctx->GetItemLocation(ctx->playthroughLocations[i][j])->IsHintable()) {
-        ctx->wothLocations.push_back(ctx->playthroughLocations[i][j]);
+      //If removing this item and no other item caused the game to become unbeatable, then it is strictly necessary, so add it
+      if (ctx->GetItemLocation(ctx->playthroughLocations[i][j])->IsHintable() 
+          && IsBeatableWithout(ctx->playthroughLocations[i][j], true)) {
+        ctx->GetItemLocation(ctx->playthroughLocations[i][j])->SetWothCandidate();
       }
     }
   }
-
-  //Now go through and check each location, seeing if it is strictly necessary for game completion
-  for (int i = ctx->wothLocations.size() - 1; i >= 0; i--) {
-    RandomizerCheck loc = ctx->wothLocations[i];
-    RandomizerGet copy = ctx->GetItemLocation(loc)->GetPlacedRandomizerGet(); //Copy out item
-    ctx->GetItemLocation(loc)->SetPlacedItem(RG_NONE); //Write in empty item
-    ctx->playthroughBeatable = false;
-    LogicReset();
-    GetAccessibleLocations(ctx->allLocations, SearchMode::CheckBeatable); //Check if game is still beatable
-    ctx->GetItemLocation(loc)->SetPlacedItem(copy); //Immediately put item back
-    //If removing this item and no other item caused the game to become unbeatable, then it is strictly necessary, so keep it
-    //Else, delete from wothLocations
-    if (ctx->playthroughBeatable) {
-      ctx->wothLocations.erase(ctx->wothLocations.begin() + i);
-    }
-  }
-
   ctx->playthroughBeatable = true;
   LogicReset();
   GetAccessibleLocations(ctx->allLocations);
 }
 
+//Calculate barren locations and assign Barren Candidacy to all locations inside those areas
+static void CalculateBarren() {
+  auto ctx = Rando::Context::GetInstance();
+  std::array<bool, RA_MAX> IsBarren = {true};
+
+  for (RandomizerCheck loc : ctx->allLocations) {
+  Rando::ItemLocation* itemLoc = ctx->GetItemLocation(loc);
+  RandomizerArea locArea = itemLoc->GetArea();
+  // If a location has a major item or is a way of the hero location, it is not barren
+  if (IsBarren[locArea] == true && locArea > RA_LINKS_POCKET && (itemLoc->GetPlacedItem().IsMajorItem() || itemLoc->IsWothCandidate())) {
+    IsBarren[locArea] = false;
+  } 
+  }
+
+  for (RandomizerCheck loc : ctx->allLocations) {
+    Rando::ItemLocation* itemLoc = ctx->GetItemLocation(loc);
+    if (IsBarren[itemLoc->GetArea()]){
+      itemLoc->SetBarrenCandidate();
+    }
+  }
+
+}
+
 //Will place things completely randomly, no logic checks are performed
 static void FastFill(std::vector<RandomizerGet> items, std::vector<RandomizerCheck> locations, bool endOnItemsEmpty = false) {
   auto ctx = Rando::Context::GetInstance();
@@ -791,7 +833,7 @@ static void RandomizeOwnDungeon(const Rando::DungeonInfo* dungeon) {
   // This accounts for boss room shuffle so that own dungeon items can be placed
   // in the shuffled boss room
   std::vector<RandomizerCheck> dungeonLocations = FilterFromPool(ctx->allLocations, [dungeon, ctx](const auto loc) {
-    return GetHintRegionHintKey(ctx->GetItemLocation(loc)->GetParentRegionKey()) == dungeon->GetHintKey();
+    return ctx->GetItemLocation(loc)->GetArea() == dungeon->GetArea();
   });
 
   //filter out locations that may be required to have songs placed at them
@@ -964,7 +1006,6 @@ int Fill() {
     //showItemProgress = false;
     ctx->playthroughLocations.clear();
     ctx->GetEntranceShuffler()->playthroughEntrances.clear();
-    ctx->wothLocations.clear();
     AreaTable_Init(); //Reset the world graph to intialize the proper locations
     ctx->ItemReset(); //Reset shops incase of shopsanity random
     ctx->GenerateLocationPool();
@@ -1096,8 +1137,10 @@ int Fill() {
     if(ctx->playthroughBeatable && !placementFailure) {
       printf("Done");
       printf("\x1b[9;10HCalculating Playthrough...");
+      SetAreas();
       PareDownPlaythrough();
       CalculateWotH();
+      CalculateBarren(); 
       printf("Done");
       ctx->CreateItemOverrides();
       ctx->GetEntranceShuffler()->CreateEntranceOverrides();
diff --git a/soh/soh/Enhancements/randomizer/3drando/fill.hpp b/soh/soh/Enhancements/randomizer/3drando/fill.hpp
index 0a9f1fab2..2dd6c21c8 100644
--- a/soh/soh/Enhancements/randomizer/3drando/fill.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/fill.hpp
@@ -24,6 +24,6 @@ int Fill();
 std::vector<RandomizerCheck> GetEmptyLocations(std::vector<RandomizerCheck> allowedLocations);
 
 std::vector<RandomizerCheck> GetAccessibleLocations(const std::vector<RandomizerCheck>& allowedLocations,
-                                             SearchMode mode = SearchMode::ReachabilitySearch, std::string ignore = "",
+                                             SearchMode mode = SearchMode::ReachabilitySearch, RandomizerGet ignore = RG_NONE,
                                              bool checkPoeCollectorAccess = false,
                                              bool checkOtherEntranceAccess = false);
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
index 4931c147d..718e4716d 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
@@ -1064,6 +1064,11 @@ void HintTable_Init() {
               /*spanish*/ "el exterior del Castillo de Ganon" },
     });
 
+    hintTable[RHT_CASTLE_GROUNDS] = HintText::Exclude({
+        // obscure text
+        Text{ "the Castle Grounds", /*french*/ "le Château d'Hyrule", /*spanish*/ "" },
+    });
+
     hintTable[RHT_KAKARIKO_VILLAGE] = HintText::Exclude({
         // obscure text
         Text{ "Kakariko Village", /*french*/ "le Village Cocorico", /*spanish*/ "Kakariko" },
@@ -3298,6 +3303,46 @@ int32_t TokensRequiredBySettings() {
     return tokens;
 }
 
+std::array<RandomizerHintTextKey, RA_MAX> AreaHintTextKeys = {
+    RHT_NONE,
+    RHT_LINKS_POCKET,
+    RHT_KOKIRI_FOREST,
+    RHT_THE_LOST_WOODS,
+    RHT_SACRED_FOREST_MEADOW,
+    RHT_HYRULE_FIELD,
+    RHT_LAKE_HYLIA,
+    RHT_GERUDO_VALLEY,
+    RHT_GERUDO_FORTRESS,
+    RHT_HAUNTED_WASTELAND,
+    RHT_DESERT_COLOSSUS,
+    RHT_THE_MARKET,
+    RHT_TEMPLE_OF_TIME,
+    RHT_HYRULE_CASTLE,
+    RHT_OUTSIDE_GANONS_CASTLE,
+    RHT_CASTLE_GROUNDS,
+    RHT_KAKARIKO_VILLAGE,
+    RHT_THE_GRAVEYARD,
+    RHT_DEATH_MOUNTAIN_TRAIL,
+    RHT_GORON_CITY,
+    RHT_DEATH_MOUNTAIN_CRATER,
+    RHT_ZORAS_RIVER,
+    RHT_ZORAS_DOMAIN,
+    RHT_ZORAS_FOUNTAIN,
+    RHT_LON_LON_RANCH,
+    RHT_DEKU_TREE,
+    RHT_DODONGOS_CAVERN,
+    RHT_JABU_JABUS_BELLY,
+    RHT_FOREST_TEMPLE,
+    RHT_FIRE_TEMPLE,
+    RHT_WATER_TEMPLE,
+    RHT_SPIRIT_TEMPLE,
+    RHT_SHADOW_TEMPLE,
+    RHT_BOTTOM_OF_THE_WELL,
+    RHT_ICE_CAVERN,
+    RHT_GERUDO_TRAINING_GROUND,
+    RHT_GANONS_CASTLE
+};
+
 std::array<ConditionalAlwaysHint, 10> conditionalAlwaysHints = {
     std::make_pair(RC_MARKET_10_BIG_POES,
                    []() {
@@ -3339,6 +3384,10 @@ const HintText& Hint(const RandomizerHintTextKey hintKey) {
     return hintTable[hintKey];
 }
 
+const HintText& Hint(const RandomizerArea area) {
+    return hintTable[AreaHintTextKeys[area]];
+}
+
 std::vector<HintText> GetHintCategory(HintCategory category) {
 
     std::vector<HintText> hintsInCategory = {};
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list.hpp b/soh/soh/Enhancements/randomizer/3drando/hint_list.hpp
index 1850c1990..69e66e6db 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list.hpp
@@ -8,6 +8,7 @@ extern std::array<HintText, RHT_MAX> hintTable;
 
 void HintTable_Init();
 const HintText& Hint(const RandomizerHintTextKey hintKey);
+const HintText& Hint(const RandomizerArea area);
 std::vector<HintText> GetHintCategory(HintCategory category);
 
 void HintTable_Init_Item();
diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.cpp b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
index 9007c25d1..f7650b249 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hints.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
@@ -47,103 +47,102 @@ std::array<std::string, HINT_TYPE_MAX> hintTypeNames = {
     "WotH",
     "Barren",
     "Entrance",
-    "Always",
-    "Sometimes",
-    "Song",
-    "Overworld",
-    "Dungeon",
-    "Named Item",
-    "Random",
+    "Item Area",
+    "Item Location",
     "Junk"
 };
 
-constexpr std::array<HintSetting, 4> hintSettingTable{{
+bool FilterWotHLocations(RandomizerCheck loc){
+  auto ctx = Rando::Context::GetInstance();
+  return ctx->GetItemLocation(loc)->IsWothCandidate();
+}
+
+bool FilterBarrenLocations(RandomizerCheck loc){
+  auto ctx = Rando::Context::GetInstance();
+  return ctx->GetItemLocation(loc)->IsBarrenCandidate();
+}
+
+bool FilterSongLocations(RandomizerCheck loc){
+  auto ctx = Rando::Context::GetInstance();
+  return Rando::StaticData::GetLocation(loc)->IsCategory(Category::cSong);
+}
+
+bool FilterOverworldLocations(RandomizerCheck loc){
+  auto ctx = Rando::Context::GetInstance();
+  return Rando::StaticData::GetLocation(loc)->IsOverworld();
+}
+
+bool FilterDungeonLocations(RandomizerCheck loc){
+  auto ctx = Rando::Context::GetInstance();
+  return Rando::StaticData::GetLocation(loc)->IsDungeon();
+}
+
+bool FilterGoodItems(RandomizerCheck loc){
+  auto ctx = Rando::Context::GetInstance();
+  return ctx->GetItemLocation(loc)->GetPlacedItem().IsMajorItem();
+}
+
+bool NoFilter(RandomizerCheck loc){
+  return true;
+}
+
+const std::array<HintSetting, 4> hintSettingTable{{
   // Useless hints
   {
-    .dungeonsWothLimit = 2,
-    .dungeonsBarrenLimit = 1,
-    .namedItemsRequired = false,
-    .distTable = {{
-      {.type = HINT_TYPE_STATIC,    .weight =  0, .fixed = 0, .copies = 0},
-      {.type = HINT_TYPE_TRIAL,     .weight =  0, .fixed = 0, .copies = 0},
-      {.type = HINT_TYPE_WOTH,      .weight =  0, .fixed = 0, .copies = 0},
-      {.type = HINT_TYPE_BARREN,    .weight =  0, .fixed = 0, .copies = 0},
-      {.type = HINT_TYPE_ENTRANCE,  .weight =  0, .fixed = 0, .copies = 0},
-      {.type = HINT_TYPE_ALWAYS,    .weight =  0, .fixed = 0, .copies = 0},
-      {.type = HINT_TYPE_SOMETIMES, .weight =  0, .fixed = 0, .copies = 0},
-      {.type = HINT_TYPE_SONG,      .weight =  0, .fixed = 0, .copies = 0},
-      {.type = HINT_TYPE_OVERWORLD, .weight =  0, .fixed = 0, .copies = 0},
-      {.type = HINT_TYPE_DUNGEON,   .weight =  0, .fixed = 0, .copies = 0},
-      {.type = HINT_TYPE_NAMED_ITEM,.weight =  0, .fixed = 0, .copies = 0},
-      {.type = HINT_TYPE_RANDOM,    .weight =  0, .fixed = 0, .copies = 0},
-      {.type = HINT_TYPE_JUNK,      .weight =  1, .fixed = 0, .copies = 1},
-    }},
+    .alwaysCopies = 0,
+    .trialCopies = 0,
+    .junkWeight = 1, //RANDOTODO when the hint pool is not implicitly an itemLocations, handle junk like other hint types
+    .distTable = {} /*RANDOTODO Instead of loading a function into this, 
+    apply this filter on all possible hintables in advance and then filter by what is acually in the seed at the start of generation.
+    This allows the distTable to hold the current status in hint generation (reducing potential doubled work) and
+    will make handling custom hint pools easier later*/
   },
-
   // Balanced hints
   {
-    .dungeonsWothLimit = 2,
-    .dungeonsBarrenLimit = 1,
-    .namedItemsRequired = true,
-    .distTable = {{
-      {.type = HINT_TYPE_STATIC,    .weight =  0, .fixed = 0, .copies = 0},
-      {.type = HINT_TYPE_TRIAL,     .weight =  0, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_WOTH,      .weight =  7, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_BARREN,    .weight =  4, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_ENTRANCE,  .weight =  0, .fixed = 0, .copies = 1}, //not yet implemented, should be 6 weight
-      {.type = HINT_TYPE_ALWAYS,    .weight =  0, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_SOMETIMES, .weight =  0, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_SONG,      .weight =  2, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_OVERWORLD, .weight =  4, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_DUNGEON,   .weight =  3, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_NAMED_ITEM,.weight = 10, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_RANDOM,    .weight = 12, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_JUNK,      .weight =  6, .fixed = 0, .copies = 1}, //Junk is hardcoded to 1 copy to avoid fill in issues, this setting is ignored
-    }},
+    .alwaysCopies = 1,
+    .trialCopies = 1,
+    .junkWeight = 6,
+    .distTable = {
+      {"WotH",       HINT_TYPE_WOTH,          7,  0, 1, FilterWotHLocations,      2},
+      {"Barren",     HINT_TYPE_BARREN,        4,  0, 1, FilterBarrenLocations,    1},
+      //("Entrance",   HINT_TYPE_ENTRANCE,      6,  0, 1), //not yet implemented
+      {"Song",       HINT_TYPE_ITEM_LOCATION, 2,  0, 1, FilterSongLocations},
+      {"Overworld",  HINT_TYPE_ITEM_LOCATION, 4,  0, 1, FilterOverworldLocations},
+      {"Dungeon",    HINT_TYPE_ITEM_LOCATION, 3,  0, 1, FilterDungeonLocations},
+      {"Named Item", HINT_TYPE_ITEM_AREA,    10,  0, 1, FilterGoodItems},
+      {"Random"    , HINT_TYPE_ITEM_AREA,    12,  0, 1, NoFilter}
+    } 
   },
-
   // Strong hints
   {
-    .dungeonsWothLimit = 2,
-    .dungeonsBarrenLimit = 1,
-    .namedItemsRequired = true,
-    .distTable = {{
-      {.type = HINT_TYPE_STATIC,    .weight =  0, .fixed = 0, .copies = 0},
-      {.type = HINT_TYPE_TRIAL,     .weight =  0, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_WOTH,      .weight = 12, .fixed = 0, .copies = 2},
-      {.type = HINT_TYPE_BARREN,    .weight = 12, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_ENTRANCE,  .weight =  0, .fixed = 0, .copies = 1}, //not yet implemented, should be 4 weight
-      {.type = HINT_TYPE_ALWAYS,    .weight =  0, .fixed = 0, .copies = 2},
-      {.type = HINT_TYPE_SOMETIMES, .weight =  0, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_SONG,      .weight =  4, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_OVERWORLD, .weight =  6, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_DUNGEON,   .weight =  6, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_NAMED_ITEM,.weight =  8, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_RANDOM,    .weight =  8, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_JUNK,      .weight =  0, .fixed = 0, .copies = 1},
-    }},
+    .alwaysCopies = 2,
+    .trialCopies = 1,
+    .junkWeight = 0,
+    .distTable = {
+      {"WotH",       HINT_TYPE_WOTH,         12, 0, 2, FilterWotHLocations,      2},
+      {"Barren",     HINT_TYPE_BARREN,       12, 0, 1, FilterBarrenLocations,    1},
+      //{"Entrance",   HINT_TYPE_ENTRANCE,      4, 0, 1}, //not yet implemented
+      {"Song",       HINT_TYPE_ITEM_LOCATION, 4, 0, 1, FilterSongLocations},
+      {"Overworld",  HINT_TYPE_ITEM_LOCATION, 6, 0, 1, FilterOverworldLocations},
+      {"Dungeon",    HINT_TYPE_ITEM_LOCATION, 6, 0, 1, FilterDungeonLocations},
+      {"Named Item", HINT_TYPE_ITEM_AREA,     8, 0, 1, FilterGoodItems},
+      {"Random"    , HINT_TYPE_ITEM_AREA,     8, 0, 1, NoFilter},
+    },
   },
-
   // Very strong hints
   {
-    .dungeonsWothLimit = 40,
-    .dungeonsBarrenLimit = 40,
-    .namedItemsRequired = true,
-    .distTable = {{
-      {.type = HINT_TYPE_STATIC,    .weight =  0, .fixed = 0, .copies = 0},
-      {.type = HINT_TYPE_TRIAL,     .weight =  0, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_WOTH,      .weight = 15, .fixed = 0, .copies = 2},
-      {.type = HINT_TYPE_BARREN,    .weight = 15, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_ENTRANCE,  .weight =  0, .fixed = 0, .copies = 1}, //not yet implemented, should be 10 weight
-      {.type = HINT_TYPE_ALWAYS,    .weight =  0, .fixed = 0, .copies = 2},
-      {.type = HINT_TYPE_SOMETIMES, .weight =  0, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_SONG,      .weight =  2, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_OVERWORLD, .weight =  7, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_DUNGEON,   .weight =  7, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_NAMED_ITEM,.weight =  5, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_RANDOM,    .weight =  0, .fixed = 0, .copies = 1},
-      {.type = HINT_TYPE_JUNK,      .weight =  0, .fixed = 0, .copies = 1},
-    }},
+    .alwaysCopies = 2,
+    .trialCopies = 1,
+    .junkWeight = 0,
+    .distTable = {
+      {"WotH",       HINT_TYPE_WOTH,         15, 0, 2, FilterWotHLocations},
+      {"Barren",     HINT_TYPE_BARREN,       15, 0, 1, FilterBarrenLocations},
+      //{"Entrance",   HINT_TYPE_ENTRANCE,     10, 0, 1}, //not yet implemented
+      {"Song",       HINT_TYPE_ITEM_LOCATION, 2, 0, 1, FilterSongLocations},
+      {"Overworld",  HINT_TYPE_ITEM_LOCATION, 7, 0, 1, FilterOverworldLocations},
+      {"Dungeon",    HINT_TYPE_ITEM_LOCATION, 7, 0, 1, FilterDungeonLocations},
+      {"Named Item", HINT_TYPE_ITEM_AREA,     5, 0, 1, FilterGoodItems},
+    },
   },
 }};
 
@@ -304,51 +303,6 @@ std::string GetSariaHintLoc() {
   return sariaHintLoc;
 }
 
-Area* GetHintRegion(const RandomizerRegion area) {
-
-  std::vector<RandomizerRegion> alreadyChecked = {};
-  std::vector<RandomizerRegion> spotQueue = {area};
-
-  while (!spotQueue.empty()) {
-    RandomizerRegion region = spotQueue.back();
-    alreadyChecked.push_back(region);
-    spotQueue.pop_back();
-
-    if (AreaTable(region)->hintKey != RHT_NONE) {
-      return AreaTable(region);
-    }
-
-    //add unchecked entrances to spot queue
-    bool checked = false;
-    for (auto& entrance : AreaTable(region)->entrances) {
-      for (RandomizerRegion checkedEntrance : alreadyChecked) {
-        if (entrance->GetParentRegionKey() == checkedEntrance) {
-          checked = true;
-          break;
-        }
-      }
-
-      if (!checked) {
-        spotQueue.insert(spotQueue.begin(), entrance->GetParentRegionKey());
-      }
-    }
-  }
-
-  return AreaTable(RR_NONE);
-}
-
-RandomizerHintTextKey GetHintRegionHintKey(const RandomizerRegion area) {
-    return GetHintRegion(area)->hintKey;
-}
-
-uint32_t GetHintRegionuint32_t(const RandomizerRegion area) {
-  return GetHintRegion(area)->hintKey;
-}
-
-uint32_t GetLocationRegionuint32_t(const RandomizerCheck location) {
-  return GetHintRegion(Rando::Context::GetInstance()->GetItemLocation(location)->GetParentRegionKey())->hintKey;
-}
-
 static std::vector<RandomizerCheck> GetEmptyGossipStones() {
   auto emptyGossipStones = GetEmptyLocations(Rando::StaticData::gossipStoneLocations);
   return emptyGossipStones;
@@ -371,7 +325,7 @@ static std::vector<RandomizerCheck> GetAccessibleGossipStones(const RandomizerCh
 
 bool IsReachableWithout(std::vector<RandomizerCheck> locsToCheck, RandomizerCheck excludedCheck, bool resetAfter = true){
   //temporarily remove the hinted location's item, and then perform a
-  //reachability search for this check
+  //reachability search for this check RANDOTODO convert excludedCheck to an ItemLocation
   auto ctx = Rando::Context::GetInstance();
   RandomizerGet originalItem = ctx->GetItemLocation(excludedCheck)->GetPlacedRandomizerGet();
   ctx->GetItemLocation(excludedCheck)->SetPlacedItem(RG_NONE);
@@ -388,29 +342,40 @@ bool IsReachableWithout(std::vector<RandomizerCheck> locsToCheck, RandomizerChec
   return true;
 }
 
-static void SetAllInRegionAsHinted(RandomizerHintTextKey region, std::vector<RandomizerCheck> locations){
+static void SetAllInRegionAsHinted(RandomizerArea area, std::vector<RandomizerCheck> locations){
   auto ctx = Rando::Context::GetInstance();
-  std::vector<RandomizerCheck> locsInRegion = FilterFromPool(locations, [region, ctx](const RandomizerCheck loc){
-                                        return GetHintRegion(ctx->GetItemLocation(loc)->GetParentRegionKey())->hintKey == region;
+  std::vector<RandomizerCheck> locsInRegion = FilterFromPool(locations, [area, ctx](const RandomizerCheck loc){
+                                        return ctx->GetItemLocation(loc)->GetArea() == area;
                                       });
   for(RandomizerCheck loc: locsInRegion){
     ctx->GetItemLocation(loc)->SetAsHinted();
   }
 }
 
-static void AddHint(Text hint, const RandomizerCheck gossipStone, const std::vector<uint8_t>& colors = {}, HintType hintType = HINT_TYPE_NAMED_ITEM, const RandomizerCheck hintedLocation = RC_UNKNOWN_CHECK) {
+static void AddGossipStoneHint(Text hint, 
+                                const RandomizerCheck gossipStone,
+                                const std::vector<uint8_t>& colors,
+                                HintType hintType,
+                                std::string distributionName,
+                                const RandomizerCheck hintedLocation) {
   //save hints as dummy items for writing to the spoiler log
   //NewItem(gossipStone, Item{RG_HINT, hint, ITEMTYPE_EVENT, GI_RUPEE_BLUE_LOSE, false, &noVariable, NONE});
   //GetLocation(gossipStone)->SetPlacedItem(gossipStone);
 
   auto ctx = Rando::Context::GetInstance();
-  ctx->AddHint((RandomizerHintKey)((gossipStone - RC_COLOSSUS_GOSSIP_STONE) + 1), AutoFormatHintText(hint), hintedLocation, hintType, GetHintRegion(ctx->GetItemLocation(hintedLocation)->GetParentRegionKey())->GetHint().GetText());
-  ctx->GetItemLocation(gossipStone)->SetPlacedItem(RG_HINT);
+  ctx->AddHint((RandomizerHintKey)((gossipStone - RC_COLOSSUS_GOSSIP_STONE) + 1), AutoFormatHintText(hint), hintedLocation, hintType, distributionName, ctx->GetItemLocation(hintedLocation)->GetArea());
+  ctx->GetItemLocation(gossipStone)->SetPlacedItem(RG_HINT); //RANDOTODO, better gossip stone to location to hint key system
 }
 
-static void AddHintCopies(uint8_t copies, Text hint, std::vector<uint8_t> colours, HintType type, RandomizerCheck location = RC_UNKNOWN_CHECK, RandomizerCheck firstStone = RC_UNKNOWN_CHECK){
+static void AddGossipStoneHintCopies(uint8_t copies, 
+                                      Text hint, 
+                                      std::vector<uint8_t> colours, 
+                                      HintType type, 
+                                      std::string distributionName,
+                                      RandomizerCheck location = RC_UNKNOWN_CHECK, 
+                                      RandomizerCheck firstStone = RC_UNKNOWN_CHECK){
   if (firstStone != RC_UNKNOWN_CHECK && copies > 0){
-      AddHint(hint, firstStone, colours, type, location);
+      AddGossipStoneHint(hint, firstStone, colours, type, distributionName, location);
       copies -= 1;
   }
   for(int c=0; c<copies; c++){
@@ -422,12 +387,11 @@ static void AddHintCopies(uint8_t copies, Text hint, std::vector<uint8_t> colour
     }
     auto gossipStone = RandomElement(gossipStones, false);
 
-    AddHint(hint, gossipStone, colours, type, location);
+    AddGossipStoneHint(hint, gossipStone, colours, type, distributionName, location);
   }
 }
 
-
-static bool CreateHint(RandomizerCheck hintedLocation, uint8_t copies, HintType type){
+static bool CreateHint(RandomizerCheck hintedLocation, uint8_t copies, HintType type, std::string distributionName){
   auto ctx = Rando::Context::GetInstance();
   //get a gossip stone accessible without the hinted item
   std::vector<RandomizerCheck> gossipStoneLocations;
@@ -443,30 +407,31 @@ static bool CreateHint(RandomizerCheck hintedLocation, uint8_t copies, HintType
   //make hint text
   Text finalHint;
   Text prefix = ::Hint(RHT_PREFIX).GetText();
-  std::vector<uint8_t> colours = {QM_GREEN, QM_RED};
+  std::vector<uint8_t> colours;
   if (type == HINT_TYPE_WOTH){
-    Text regionText = GetHintRegion(ctx->GetItemLocation(hintedLocation)->GetParentRegionKey())->GetHint().GetText();
-    finalHint = prefix + "%r#" + regionText + "#%w" + ::Hint(RHT_WAY_OF_THE_HERO).GetText();
+    Text areaText = ::Hint(ctx->GetItemLocation(hintedLocation)->GetArea()).GetText();
+    finalHint = prefix + "%r#" + areaText + "#%w" + ::Hint(RHT_WAY_OF_THE_HERO).GetText();
     colours = {QM_LBLUE};
   }
   else if(type == HINT_TYPE_BARREN){
-    Text regionText = GetHintRegion(ctx->GetItemLocation(hintedLocation)->GetParentRegionKey())->GetHint().GetText();
-    finalHint = prefix + ::Hint(RHT_PLUNDERING).GetText() + "%r#" + regionText + "#%w" + ::Hint(RHT_FOOLISH).GetText();
+    Text areaText = ::Hint(ctx->GetItemLocation(hintedLocation)->GetArea()).GetText();
+    finalHint = prefix + ::Hint(RHT_PLUNDERING).GetText() + "%r#" + areaText + "#%w" + ::Hint(RHT_FOOLISH).GetText();
     colours = {QM_PINK};
   }
   else {
     Text itemText = ctx->GetItemLocation(hintedLocation)->GetPlacedItem().GetHint().GetText();
-    if (type >= HINT_TYPE_ALWAYS && type < HINT_TYPE_NAMED_ITEM){
+    if (type == HINT_TYPE_ITEM_LOCATION){
       Text locationText = Rando::StaticData::GetLocation(hintedLocation)->GetHint()->GetText();
       finalHint = prefix + "%r" + locationText + " %g#"+itemText+"#%w.";
+      colours = {QM_GREEN, QM_RED};
     }
-    else if (type == HINT_TYPE_NAMED_ITEM || type == HINT_TYPE_RANDOM){
-      Text regionText = GetHintRegion(ctx->GetItemLocation(hintedLocation)->GetParentRegionKey())->GetHint().GetText();
-      // RANDOTODO: reconsider dungeon vs non-dungeon item location hints when boss shuffle mixed pools happens
+    else if (type == HINT_TYPE_ITEM_AREA){
+      Text areaText = ::Hint(ctx->GetItemLocation(hintedLocation)->GetArea()).GetText();
       if (Rando::StaticData::GetLocation(hintedLocation)->IsDungeon()) {
-        finalHint = prefix+"%r#"+regionText+"#%w "+::Hint(RHT_HOARDS).GetText()+" %g#"+itemText+"#%w.";
+        finalHint = prefix+"%r#"+areaText+"#%w "+::Hint(RHT_HOARDS).GetText()+" %g#"+itemText+"#%w.";
+        colours = {QM_GREEN, QM_RED};
       } else {
-        finalHint = prefix+"%r#"+itemText+"#%w "+::Hint(RHT_CAN_BE_FOUND_AT).GetText()+" %g#"+regionText+"#%w.";
+        finalHint = prefix+"%r#"+itemText+"#%w "+::Hint(RHT_CAN_BE_FOUND_AT).GetText()+" %g#"+areaText+"#%w.";
         colours = {QM_RED, QM_GREEN};
       }
     }
@@ -482,13 +447,16 @@ static bool CreateHint(RandomizerCheck hintedLocation, uint8_t copies, HintType
   SPDLOG_DEBUG(finalHint.english);
   SPDLOG_DEBUG("\n\n");
 
-  AddHintCopies(copies, finalHint, colours, type, hintedLocation, gossipStone);
+  AddGossipStoneHintCopies(copies, finalHint, colours, type, distributionName, hintedLocation, gossipStone);
 
   return true;
 }
 
 
-static RandomizerCheck CreateRandomHint(std::vector<RandomizerCheck>& possibleHintLocations, uint8_t copies, HintType type) {
+static RandomizerCheck CreateRandomHint(std::vector<RandomizerCheck>& possibleHintLocations, 
+                                        uint8_t copies,
+                                        HintType type,
+                                        std::string distributionName) {
   auto ctx = Rando::Context::GetInstance();
 
   //return if there aren't any hintable locations or gossip stones available
@@ -514,103 +482,75 @@ static RandomizerCheck CreateRandomHint(std::vector<RandomizerCheck>& possibleHi
     SPDLOG_DEBUG(ctx->GetItemLocation(hintedLocation)->GetPlacedItemName().GetEnglish());
     SPDLOG_DEBUG("\n");
 
-    placed = CreateHint(hintedLocation, copies, type);
+    placed = CreateHint(hintedLocation, copies, type, distributionName);
   }
   if (type == HINT_TYPE_BARREN){
-     SetAllInRegionAsHinted(GetHintRegion(ctx->GetItemLocation(hintedLocation)->GetParentRegionKey())->hintKey, possibleHintLocations);
+     SetAllInRegionAsHinted(ctx->GetItemLocation(hintedLocation)->GetArea(), possibleHintLocations);
   }
   return hintedLocation;
 }
 
-static std::vector<RandomizerCheck> FilterHintability(std::vector<RandomizerCheck>& locations, const bool goodItemsOnly = false, const bool dungeonsOK = true){
+static std::vector<RandomizerCheck> FilterHintability(std::vector<RandomizerCheck>& locations, 
+                                                      std::function<bool(RandomizerCheck)> extraFilter = NoFilter){
   auto ctx = Rando::Context::GetInstance();
-  return FilterFromPool(locations, [goodItemsOnly, dungeonsOK, ctx](const RandomizerCheck loc) {
-    return ctx->GetItemLocation(loc)->IsHintable() && !(ctx->GetItemLocation(loc)->IsHintedAt()) && 
-    (!goodItemsOnly || ctx->GetItemLocation(loc)->GetPlacedItem().IsMajorItem()) && (dungeonsOK || Rando::StaticData::GetLocation(loc)->IsOverworld());
+  return FilterFromPool(locations, [extraFilter, ctx](const RandomizerCheck loc) {
+    return ctx->GetItemLocation(loc)->IsHintable() && !(ctx->GetItemLocation(loc)->IsHintedAt()
+    && extraFilter(loc));
   });
 }
 
-static void CreateJunkHint() {
-  //duplicate junk hints are possible for now
-  const HintText junkHint = RandomElement(GetHintCategory(HintCategory::Junk));
-  Text hint = junkHint.GetText();
+static void CreateJunkHints(uint8_t numHints) {
+  for(uint8_t c = 0; c < numHints; c++){
+    //duplicate junk hints are possible for now
+    const HintText junkHint = RandomElement(GetHintCategory(HintCategory::Junk));
+    Text hint = junkHint.GetText();
 
-  SPDLOG_DEBUG("\tMessage: ");
-  SPDLOG_DEBUG(hint.english);
-  SPDLOG_DEBUG("\n\n");
+    SPDLOG_DEBUG("\tMessage: ");
+    SPDLOG_DEBUG(hint.english);
+    SPDLOG_DEBUG("\n\n");
 
-  AddHintCopies(1, hint, {QM_PINK}, HINT_TYPE_JUNK);
-}
-
-static std::vector<RandomizerCheck> CalculateBarrenRegions() {
-  auto ctx = Rando::Context::GetInstance();
-  std::vector<RandomizerCheck> barrenLocations = {};
-  std::vector<RandomizerCheck> potentiallyUsefulLocations = {};
-
-  for (RandomizerCheck loc : ctx->allLocations) {
-    // If a location has a major item or is a way of the hero location, it is not barren
-    if (ctx->GetItemLocation(loc)->GetPlacedItem().IsMajorItem() || ElementInContainer(loc, ctx->wothLocations)) {
-      AddElementsToPool(potentiallyUsefulLocations, std::vector{loc});
-    } else {
-      // Link's Pocket & Triforce Hunt "reward" shouldn't be considered for barren areas because it's clear what
-      // they have to a player.
-      if (loc != RC_LINKS_POCKET && loc != RC_TRIFORCE_COMPLETED) { 
-        AddElementsToPool(barrenLocations, std::vector{loc});
-      }
-    }
+    AddGossipStoneHintCopies(1, hint, {QM_PINK}, HINT_TYPE_JUNK, "Junk");
   }
-
-  // Leave only locations at barren regions in the list
-  auto finalBarrenLocations = FilterFromPool(barrenLocations, [&potentiallyUsefulLocations](RandomizerCheck loc){
-    for (RandomizerCheck usefulLoc : potentiallyUsefulLocations) {
-      uint32_t barrenKey = GetLocationRegionuint32_t(loc);
-      uint32_t usefulKey = GetLocationRegionuint32_t(usefulLoc);
-      if (barrenKey == usefulKey) {
-        return false;
-      }
-    }
-    return true;
-  });
-
-  return finalBarrenLocations;
 }
 
 static void CreateTrialHints(uint8_t copies) {
-  auto ctx = Rando::Context::GetInstance();
+  if (copies > 0) {
+    auto ctx = Rando::Context::GetInstance();
   Text prefix = ::Hint(RHT_PREFIX).GetText();
-    //six trials
-  if (ctx->GetOption(RSK_GANONS_TRIALS).IsNot(RO_GANONS_TRIALS_SKIP) && ctx->GetOption(RSK_TRIAL_COUNT).Is(6)) {
-    AddHintCopies(copies, prefix + ::Hint(RHT_SIX_TRIALS).GetText(), {QM_PINK}, HINT_TYPE_TRIAL);
-    //zero trials
-  } else if (ctx->GetOption(RSK_GANONS_TRIALS).IsNot(RO_GANONS_TRIALS_SKIP) && ctx->GetOption(RSK_TRIAL_COUNT).Is(0)) {
-    AddHintCopies(copies, prefix + ::Hint(RHT_ZERO_TRIALS).GetText(), {QM_YELLOW}, HINT_TYPE_TRIAL);
-    //4 or 5 required trials
-  } else if (ctx->GetOption(RSK_TRIAL_COUNT).Is(5) || ctx->GetOption(RSK_TRIAL_COUNT).Is(4)) {
-    //get skipped trials
-    std::vector<TrialInfo*> trials = {};
-    auto trialList = ctx->GetTrials()->GetTrialList();
+      //six trials
+    if (ctx->GetOption(RSK_GANONS_TRIALS).IsNot(RO_GANONS_TRIALS_SKIP) && ctx->GetOption(RSK_TRIAL_COUNT).Is(6)) {
+      AddGossipStoneHintCopies(copies, prefix + ::Hint(RHT_SIX_TRIALS).GetText(), {QM_PINK}, HINT_TYPE_TRIAL, "Trial");
+      //zero trials
+    } else if (ctx->GetOption(RSK_GANONS_TRIALS).IsNot(RO_GANONS_TRIALS_SKIP) && ctx->GetOption(RSK_TRIAL_COUNT).Is(0)) {
+      AddGossipStoneHintCopies(copies, prefix + ::Hint(RHT_ZERO_TRIALS).GetText(), {QM_YELLOW}, HINT_TYPE_TRIAL, "Trial");
+      //4 or 5 required trials
+    } else if (ctx->GetOption(RSK_TRIAL_COUNT).Is(5) || ctx->GetOption(RSK_TRIAL_COUNT).Is(4)) {
+      //get skipped trials
+      std::vector<TrialInfo*> trials = {};
+      auto trialList = ctx->GetTrials()->GetTrialList();
     trials.assign(trialList.begin(), trialList.end());
-    auto skippedTrials = FilterFromPool(trials, [](TrialInfo* trial){return trial->IsSkipped();});
+      auto skippedTrials = FilterFromPool(trials, [](TrialInfo* trial){return trial->IsSkipped();});
 
-    //create a hint for each skipped trial
-    for (auto& trial : skippedTrials) {
-      //make hint
-      auto hint = prefix+"#"+trial->GetName()+"#"+::Hint(RHT_FOUR_TO_FIVE_TRIALS).GetText();
-      AddHintCopies(copies, hint, {QM_YELLOW}, HINT_TYPE_TRIAL);
-    }
-    //1 to 3 trials
-  } else if (ctx->GetOption(RSK_TRIAL_COUNT).Value<uint8_t>() >= 1 && ctx->GetOption(RSK_TRIAL_COUNT).Value<uint8_t>() <= 3) {
-    //get requried trials
-    std::vector<TrialInfo*> trials = {};
-    auto trialList = ctx->GetTrials()->GetTrialList();
+      //create a hint for each skipped trial
+      for (auto& trial : skippedTrials) {
+        //make hint
+        auto hint = prefix+"#"+trial->GetName()+"#"+::Hint(RHT_FOUR_TO_FIVE_TRIALS).GetText();
+        AddGossipStoneHintCopies(copies, hint, {QM_YELLOW}, HINT_TYPE_TRIAL, "Trial");
+      }
+      //1 to 3 trials
+    } else if (ctx->GetOption(RSK_TRIAL_COUNT).Value<uint8_t>() >= 1 && ctx->GetOption(RSK_TRIAL_COUNT).Value<uint8_t>() <= 3) {
+      //get requried trials
+      std::vector<TrialInfo*> trials = {};
+      auto trialList = ctx->GetTrials()->GetTrialList();
     trials.assign(trialList.begin(), trialList.end());
-    auto requiredTrials = FilterFromPool(trials, [](TrialInfo* trial){return trial->IsRequired();});
+      auto requiredTrials = FilterFromPool(trials, [](TrialInfo* trial){return trial->IsRequired();});
 
-    //create a hint for each required trial
-    for (auto& trial : requiredTrials) {
-      //make hint
-      auto hint = prefix+"#"+trial->GetName()+"#"+::Hint(RHT_ONE_TO_THREE_TRIALS).GetText();
-      AddHintCopies(copies, hint, {QM_PINK}, HINT_TYPE_TRIAL);
+      //create a hint for each required trial
+      for (auto& trial : requiredTrials) {
+        //make hint
+        auto hint = prefix+"#"+trial->GetName()+"#"+::Hint(RHT_ONE_TO_THREE_TRIALS).GetText();
+        AddGossipStoneHintCopies(copies, hint, {QM_PINK}, HINT_TYPE_TRIAL, "Trial");
+      }
     }
   }
 }
@@ -623,7 +563,8 @@ void CreateGanonAndSheikText() {
     auto lightArrowLocation = FilterFromPool(ctx->allLocations, [ctx](const RandomizerCheck loc) {
       return ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == RG_LIGHT_ARROWS;
     });
-    Text lightArrowArea = GetHintRegion(ctx->GetItemLocation(lightArrowLocation[0])->GetParentRegionKey())->GetHint().GetText();
+    RandomizerArea lightArrowArea = ctx->GetItemLocation(lightArrowLocation[0])->GetArea();
+    Text LightArrowAreaText = ::Hint(lightArrowArea).GetText();
     std::vector<RandomizerCheck> locsToCheck = {RC_GANONDORF_HINT};
 
     //If there is no light arrow location, it was in the player's inventory at the start
@@ -632,7 +573,7 @@ void CreateGanonAndSheikText() {
       ganonHintText = hint.GetText()+::Hint(RHT_YOUR_POCKET).GetText();
       lightArrowHintLoc = "Link's Pocket";
     } else {
-      ganonHintText = hint.GetText() + "%r" + lightArrowArea + "%w";
+      ganonHintText = hint.GetText() + "%r" + LightArrowAreaText + "%w";
       lightArrowHintLoc = Rando::StaticData::GetLocation(lightArrowLocation[0])->GetName();
     }
     ganonHintText = ganonHintText + "!";
@@ -641,7 +582,7 @@ void CreateGanonAndSheikText() {
     auto masterSwordLocation = FilterFromPool(ctx->allLocations, [ctx](const RandomizerCheck loc) {
       return ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == RG_MASTER_SWORD;
     });
-    Text masterSwordArea = GetHintRegion(ctx->GetItemLocation(masterSwordLocation[0])->GetParentRegionKey())->GetHint().GetText();
+    Text masterSwordArea = ::Hint(ctx->GetItemLocation(masterSwordLocation[0])->GetArea()).GetText();
 
     if (ctx->GetOption(RSK_SHUFFLE_MASTER_SWORD)) {
       // Add second text box
@@ -657,10 +598,10 @@ void CreateGanonAndSheikText() {
     }
 
     //CreateMessageFromTextObject(0x70CC, 0, 2, 3, AddColorsAndFormat(ganonHintText));
-    ctx->AddHint(RH_GANONDORF_HINT, AutoFormatHintText(ganonHintText), lightArrowLocation[0], HINT_TYPE_STATIC, GetHintRegion(ctx->GetItemLocation(lightArrowLocation[0])->GetParentRegionKey())->GetHint().GetText());
+    ctx->AddHint(RH_GANONDORF_HINT, AutoFormatHintText(ganonHintText), lightArrowLocation[0], HINT_TYPE_STATIC, "Static", lightArrowArea);
 
     if(!ctx->GetOption(RSK_TRIAL_COUNT).Is(0)){
-      sheikText = ::Hint(RHT_SHEIK_LIGHT_ARROW_HINT).GetText() + lightArrowArea + "%w.";
+      sheikText = ::Hint(RHT_SHEIK_LIGHT_ARROW_HINT).GetText() + LightArrowAreaText + "%w.";
       locsToCheck = {RC_GANONDORF_HINT, RC_SHEIK_HINT_GC, RC_SHEIK_HINT_MQ_GC};
 
       if (ctx->GetOption(RSK_SHUFFLE_MASTER_SWORD)) {
@@ -671,11 +612,11 @@ void CreateGanonAndSheikText() {
     if (IsReachableWithout(locsToCheck, lightArrowLocation[0], true)) {
       ctx->GetItemLocation(lightArrowLocation[0])->SetAsHinted();
     }
-    ctx->AddHint(RH_SHEIK_LIGHT_ARROWS, AutoFormatHintText(sheikText), lightArrowLocation[0], HINT_TYPE_STATIC, lightArrowArea);
+    ctx->AddHint(RH_SHEIK_LIGHT_ARROWS, AutoFormatHintText(sheikText), lightArrowLocation[0], HINT_TYPE_STATIC, "Static", lightArrowArea);
 
     if (ctx->GetOption(RSK_SHUFFLE_MASTER_SWORD)) {
       if (IsReachableWithout(locsToCheck, masterSwordLocation[0], true)) {
-        ctx->GetItemLocation(masterSwordLocation[0])->SetHintKey(RH_GANONDORF_HINT);
+        ctx->GetItemLocation(masterSwordLocation[0])->AddHintedBy(RH_GANONDORF_HINT);
         ctx->GetItemLocation(masterSwordLocation[0])->SetAsHinted();
       }
     }
@@ -698,7 +639,7 @@ static Text BuildDungeonRewardText(const RandomizerGet itemKey, bool isChild) {
 
     // RANDOTODO implement colors for locations
     return Text() + rewardString +
-           GetHintRegion(ctx->GetItemLocation(location)->GetParentRegionKey())->GetHint().GetText().Capitalize() +
+           ::Hint(ctx->GetItemLocation(location)->GetArea()).GetText().Capitalize() +
            "...^";
 }
 
@@ -836,7 +777,7 @@ void CreateAltarText() {
   } else {
     childAltarText = BuildDoorOfTimeText();
   }
-  ctx->AddHint(RH_ALTAR_CHILD, childAltarText, RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text());
+  ctx->AddHint(RH_ALTAR_CHILD, childAltarText, RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static");
 
   //CreateMessageFromTextObject(0x7040, 0, 2, 3, AddColorsAndFormat(childAltarText, {QM_GREEN, QM_RED, QM_BLUE}));
 
@@ -868,7 +809,7 @@ void CreateAltarText() {
   //End
   ::Hint(RHT_ADULT_ALTAR_TEXT_END).GetText();
   //CreateMessageFromTextObject(0x7088, 0, 2, 3, AddColorsAndFormat(adultAltarText, {QM_RED, QM_YELLOW, QM_GREEN, QM_RED, QM_BLUE, QM_YELLOW, QM_PINK, QM_RED, QM_RED, QM_RED, QM_RED}));
-  ctx->AddHint(RH_ALTAR_ADULT, adultAltarText, RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text());
+  ctx->AddHint(RH_ALTAR_ADULT, adultAltarText, RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static");
 }
 
 void CreateMerchantsHints() {
@@ -888,7 +829,7 @@ void CreateMerchantsHints() {
                                  ::Hint(RHT_CARPET_SALESMAN_DIALOG_SECOND).GetText();
     Text carpetSalesmanTextTwo = ::Hint(RHT_CARPET_SALESMAN_DIALOG_THIRD).GetText() + carpetSalesmanItemClearText +
                                  ::Hint(RHT_CARPET_SALESMAN_DIALOG_FOURTH).GetText();
-
+    
     // CreateMessageFromTextObject(0x9120, 0, 2, 3, AddColorsAndFormat(medigoronText, { QM_RED, QM_GREEN }));
     // CreateMessageFromTextObject(0x9121, 0, 2, 3, AddColorsAndFormat(grannyText, { QM_RED, QM_GREEN }));
     // CreateMessageFromTextObject(0x6077, 0, 2, 3, AddColorsAndFormat(carpetSalesmanTextOne, { QM_RED, QM_GREEN }));
@@ -911,17 +852,16 @@ void CreateSpecialItemHint(uint32_t item, RandomizerHintKey hintKey, std::vector
       ctx->GetItemLocation(location)->SetAsHinted();
     }
     
-    Text area = GetHintRegion(ctx->GetItemLocation(location)->GetParentRegionKey())->GetHint().GetText();
-    textLoc = ::Hint(text1).GetText() + area + ::Hint(text2).GetText();
+    RandomizerArea area = ctx->GetItemLocation(location)->GetArea();
+    textLoc = ::Hint(text1).GetText() + ::Hint(area).GetText() + ::Hint(text2).GetText();
     nameLoc = Rando::StaticData::GetLocation(location)->GetName();
-    ctx->AddHint(hintKey, AutoFormatHintText(textLoc), location, HINT_TYPE_STATIC, area);
+    ctx->AddHint(hintKey, AutoFormatHintText(textLoc), location, HINT_TYPE_STATIC, "Static", area);
   } else {
     textLoc = Text();
     nameLoc = "";
   }
 }
 
-
 void CreateWarpSongTexts() {
   auto ctx = Rando::Context::GetInstance();
   if (!ctx->GetOption(RSK_WARP_SONG_HINTS)) {
@@ -937,47 +877,42 @@ void CreateWarpSongTexts() {
   auto warpSongEntrances = GetShuffleableEntrances(EntranceType::WarpSong, false);
 
   for (auto entrance : warpSongEntrances) {
-    Text resolvedHint;
-    // Start with entrance location text
-    auto region = entrance->GetConnectedRegion()->regionName;
-    resolvedHint = Text{"","",""} + region;
-
-    auto destination = entrance->GetConnectedRegion()->GetHint().GetText();
-    // Prefer hint location when available
-    if (destination.GetEnglish() != "No Hint") {
-      resolvedHint = destination;
+    auto destination = entrance->GetConnectedRegion()->GetArea();
+    Text resolvedHint = ::Hint(destination).GetText();
+    // If no Hint Area, use Region text
+    if (destination == RA_NONE) {
+      resolvedHint = Text{"","",""} + entrance->GetConnectedRegion()->regionName;
     }
 
     switch (entrance->GetIndex()) {
-      case 0x0600: // minuet
+      case 0x0600: // minuet RANDOTODO make an entrance enum and use it here
         warpMinuetText = resolvedHint;
-        ctx->AddHint(RH_MINUET_WARP_LOC, resolvedHint, RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, resolvedHint);
+        ctx->AddHint(RH_MINUET_WARP_LOC, resolvedHint, RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", destination);
         break;
       case 0x04F6: // bolero
         warpBoleroText = resolvedHint;
-        ctx->AddHint(RH_BOLERO_WARP_LOC, resolvedHint, RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, resolvedHint);
+        ctx->AddHint(RH_BOLERO_WARP_LOC, resolvedHint, RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", destination);
         break;
       case 0x0604: // serenade
         warpSerenadeText = resolvedHint;
-        ctx->AddHint(RH_SERENADE_WARP_LOC, resolvedHint, RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, resolvedHint);
+        ctx->AddHint(RH_SERENADE_WARP_LOC, resolvedHint, RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", destination);
         break;
       case 0x01F1: // requiem
         warpRequiemText = resolvedHint;
-        ctx->AddHint(RH_REQUIEM_WARP_LOC, resolvedHint, RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, resolvedHint);
+        ctx->AddHint(RH_REQUIEM_WARP_LOC, resolvedHint, RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", destination);
         break;
       case 0x0568: // nocturne
           warpNocturneText = resolvedHint;
-          ctx->AddHint(RH_NOCTURNE_WARP_LOC, resolvedHint, RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, resolvedHint);
+          ctx->AddHint(RH_NOCTURNE_WARP_LOC, resolvedHint, RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", destination);
           break;
       case 0x05F4: // prelude
         warpPreludeText = resolvedHint;
-        ctx->AddHint(RH_PRELUDE_WARP_LOC, resolvedHint, RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, resolvedHint);
+        ctx->AddHint(RH_PRELUDE_WARP_LOC, resolvedHint, RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", destination);
         break;
     }
   }
 }
 
-
 int32_t getRandomWeight(int32_t totalWeight){
   if (totalWeight <= 1){
     return 1;
@@ -985,11 +920,8 @@ int32_t getRandomWeight(int32_t totalWeight){
   return Random(1,totalWeight);
 }
 
-
-static void DistrabuteHints(std::array<uint8_t, HINT_TYPE_MAX>& selected, uint8_t stoneCount, std::array<HintDistributionSetting, (int)HINT_TYPE_MAX> distTable, bool addFixed = true){
-  int32_t totalWeight = 0;
-
-  distTable[HINT_TYPE_JUNK].copies = 1; //Junk is hardcoded to 1 copy to avoid fill in issues
+static void DistributeHints(std::vector<uint8_t>& selected, size_t stoneCount, std::vector<HintDistributionSetting> distTable, uint8_t junkWieght, bool addFixed = true){
+  int32_t totalWeight = junkWieght;
 
   for (HintDistributionSetting setting: distTable){
     totalWeight += setting.weight;
@@ -998,102 +930,68 @@ static void DistrabuteHints(std::array<uint8_t, HINT_TYPE_MAX>& selected, uint8_
       stoneCount -= setting.fixed * setting.copies;
     }
   }
-
   int32_t currentWeight = getRandomWeight(totalWeight);
   while(stoneCount > 0 && totalWeight > 0){
-    for (uint8_t hintType = 0; hintType < HINT_TYPE_MAX; hintType++){
-      currentWeight -= distTable[hintType].weight;
+    for (uint8_t distribution = 0; distribution < distTable.size(); distribution++){
+      currentWeight -= distTable[distribution].weight;
       if (currentWeight <= 0){
-        if (stoneCount >= distTable[hintType].copies){
-          selected[hintType] += 1;
-          stoneCount -= distTable[hintType].copies;
+        if (stoneCount >= distTable[distribution].copies){
+          selected[distribution] += 1;
+          stoneCount -= distTable[distribution].copies;
           break;
         }
         else {
-          totalWeight -= distTable[hintType].weight;
-          distTable[hintType].weight = 0;
+          totalWeight -= distTable[distribution].weight;
+          distTable[distribution].weight = 0;
           break;
         }
       }
     }
+    //if there's still weight, then it's junk
+    if (currentWeight > 0){
+      selected[selected.size()-1] += 1;
+      stoneCount -= 1;
+    }
     currentWeight = getRandomWeight(totalWeight);
   }
   //if stones are left, assign junk
   if (stoneCount > 0){
-    selected[HINT_TYPE_JUNK] += stoneCount;
+    selected[selected.size()-1] += stoneCount;
   }
 }
 
-
-uint8_t PlaceHints(std::array<uint8_t, HINT_TYPE_MAX>& selectedHints,
-                std::array<HintDistributionSetting, (int)HINT_TYPE_MAX>& distTable, 
-                uint8_t* remainingDungeonWothHints,
-                uint8_t* remainingDungeonBarrenHints){
-
-  std::vector<RandomizerCheck> blankList = {};
+uint8_t PlaceHints(std::vector<uint8_t>& selectedHints,
+                std::vector<HintDistributionSetting>& distTable){
   auto ctx = Rando::Context::GetInstance();
-
-  std::array<std::vector<RandomizerCheck>, HINT_TYPE_MAX> hintTypePools = {
-      blankList, //static, should not happen
-      blankList, //trial, should not happen
-      ctx->wothLocations, //woth
-      CalculateBarrenRegions(), //Barren
-      blankList, //enternce, not yet implemented
-      blankList, // always, should not happen
-      FilterFromPool(ctx->allLocations, [](const RandomizerCheck loc){return Rando::StaticData::GetLocation(loc)->GetHint()->GetType() == HintCategory::Sometimes;}), //sometimes
-      FilterFromPool(ctx->allLocations, [](const RandomizerCheck loc){return Rando::StaticData::GetLocation(loc)->IsCategory(Category::cSong);}), //songs
-      FilterFromPool(ctx->allLocations, [](const RandomizerCheck loc){return Rando::StaticData::GetLocation(loc)->IsOverworld();}), //overworld
-      FilterFromPool(ctx->allLocations, [](const RandomizerCheck loc){return Rando::StaticData::GetLocation(loc)->IsDungeon();}), //dungeon
-      ctx->allLocations, //Named item
-      ctx->allLocations, //random
-      blankList //junk, irrelevent
-  };
-
-  for (uint8_t hintType = 0; hintType < HINT_TYPE_MAX; hintType++){
-    for (uint8_t numHint = 0; numHint < selectedHints[hintType]; numHint++){
+  uint8_t curSlot = 0;
+  for (HintDistributionSetting distribution : distTable){
+    std::vector<RandomizerCheck> hintTypePool = FilterHintability(ctx->allLocations, distribution.filter);
+    for (uint8_t numHint = 0; numHint < selectedHints[curSlot]; numHint++){
 
       SPDLOG_DEBUG("Attempting to make hint of type: ");
-      SPDLOG_DEBUG(hintTypeNames[hintType]);
+      SPDLOG_DEBUG(hintTypeNames[static_cast<int>(distribution.type)]);
       SPDLOG_DEBUG("\n");
 
       RandomizerCheck hintedLocation = RC_UNKNOWN_CHECK;
 
-      //create the appropriate hint for the type
-      if (hintType == HINT_TYPE_JUNK){
-        CreateJunkHint();
+      hintedLocation = CreateRandomHint(hintTypePool, distribution.copies, distribution.type, distribution.name);
+      if (hintedLocation == RC_UNKNOWN_CHECK){ //if hint failed to place
+        uint8_t hintsToRemove = (selectedHints[curSlot] - numHint) * distribution.copies;
+        selectedHints[curSlot] = 0;
+        distTable[curSlot].copies = 0;
+        return hintsToRemove;
       }
-      else{
-        hintTypePools[hintType] = FilterHintability(hintTypePools[hintType], (hintType == HINT_TYPE_NAMED_ITEM));
-        hintedLocation = CreateRandomHint(hintTypePools[hintType], distTable[hintType].copies, (HintType)hintType);
-        if (hintedLocation == RC_UNKNOWN_CHECK){ //if hint failed to place
-          uint8_t hintsToRemove = (selectedHints[hintType] - numHint) * distTable[hintType].copies;
-          selectedHints[hintType] = 0; //RANDOTODO is there a better way to filter out things hinted between hintTypePools creation and now
-          distTable[hintType].weight = 0;
-          return hintsToRemove;
+      if(Rando::StaticData::GetLocation(hintedLocation)->IsDungeon()){
+        distribution.dungeonLimit -= 1;
+        if (distribution.dungeonLimit == 0){
+          FilterFromPool(hintTypePool, FilterOverworldLocations);
         }
       }
-
-      switch(hintType){
-        case HINT_TYPE_WOTH:
-          if (Rando::StaticData::GetLocation(hintedLocation)->IsDungeon()){
-            *remainingDungeonWothHints -= 1;
-            if (*remainingDungeonWothHints <= 0){
-              hintTypePools[hintType] = FilterHintability(hintTypePools[hintType], false, false);
-            }
-          }
-          break;
-        case HINT_TYPE_BARREN:
-          if (Rando::StaticData::GetLocation(hintedLocation)->IsDungeon()){
-            *remainingDungeonBarrenHints -= 1;
-            if (*remainingDungeonBarrenHints <= 0){
-              hintTypePools[hintType] = FilterHintability(hintTypePools[hintType], false, false);
-            }
-          }
-          break;
-      }
     }
-    selectedHints[hintType] = 0;
+    selectedHints[curSlot] = 0;
+    curSlot += 1;
   }
+  CreateJunkHints(selectedHints[selectedHints.size() - 1]);
   return 0;
 }
 
@@ -1101,10 +999,7 @@ void CreateStoneHints() {
   auto ctx = Rando::Context::GetInstance();
   SPDLOG_DEBUG("\nNOW CREATING HINTS\n");
   const HintSetting& hintSetting = hintSettingTable[ctx->GetOption(RSK_HINT_DISTRIBUTION).Value<uint8_t>()];
-  std::array<HintDistributionSetting, (int)HINT_TYPE_MAX> distTable = hintSetting.distTable;
-
-  uint8_t* remainingDungeonWothHints = new uint8_t(hintSetting.dungeonsWothLimit);
-  uint8_t* remainingDungeonBarrenHints = new uint8_t(hintSetting.dungeonsBarrenLimit);
+  std::vector<HintDistributionSetting> distTable = hintSetting.distTable;
 
   // Apply Special hint exclusions with no requirements
   if (ctx->GetOption(RSK_KAK_10_SKULLS_HINT)){
@@ -1130,8 +1025,7 @@ void CreateStoneHints() {
   }
 
   // Add 'always' location hints
-  auto alwaysCopies = distTable[static_cast<int>(HINT_TYPE_ALWAYS)].copies;
-  if (alwaysCopies > 0) {
+  if (hintSetting.alwaysCopies > 0) {
       // Only filter locations that had a random item placed at them (e.g. don't get cow locations if shuffle cows is
       // off)
       auto alwaysHintLocations = FilterFromPool(ctx->allLocations, [ctx](const RandomizerCheck loc) {
@@ -1150,24 +1044,25 @@ void CreateStoneHints() {
       }
 
     for (RandomizerCheck location : alwaysHintLocations) {
-      CreateHint(location, alwaysCopies, HINT_TYPE_ALWAYS);
+      CreateHint(location, hintSetting.alwaysCopies, HINT_TYPE_ITEM_LOCATION, "Always");
     }
   }
 
   //Add 'trial' location hints
-  auto trialCopies = distTable[static_cast<int>(HINT_TYPE_TRIAL)].copies;
-  if (trialCopies > 0) {
-    CreateTrialHints(trialCopies);
-  }
+  CreateTrialHints(hintSetting.trialCopies);
 
-  uint8_t totalStones = GetEmptyGossipStones().size();
-  std::array<uint8_t, HINT_TYPE_MAX> selectedHints = {};
-  DistrabuteHints(selectedHints, totalStones, distTable);
+  size_t totalStones = GetEmptyGossipStones().size();
+  std::vector<uint8_t> selectedHints = {};
+  for (uint8_t c=0; c < distTable.size(); c++){
+    selectedHints.push_back(0);
+  }
+  selectedHints.push_back(0);
+  DistributeHints(selectedHints, totalStones, distTable, hintSetting.junkWeight);
 
   while(totalStones != 0){
-    totalStones = PlaceHints(selectedHints, distTable, remainingDungeonWothHints, remainingDungeonBarrenHints);
+    totalStones = PlaceHints(selectedHints, distTable);
     if (totalStones != 0){
-      DistrabuteHints(selectedHints, totalStones, distTable, false);
+      DistributeHints(selectedHints, totalStones, distTable, hintSetting.junkWeight, false);
     }
   }
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.hpp b/soh/soh/Enhancements/randomizer/3drando/hints.hpp
index eb9b9fd05..d38dbf244 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hints.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hints.hpp
@@ -8,19 +8,36 @@
 #include "random.hpp"
 #include <functional>
 struct HintDistributionSetting {
+  std::string name;
   HintType type;
-  size_t weight;
+  uint32_t weight;
   uint8_t fixed;
   uint8_t copies;
+  std::function<bool(RandomizerCheck)> filter;
+  uint8_t dungeonLimit;
+
+  HintDistributionSetting(std::string _name, 
+                          HintType _type, 
+                          uint32_t _weight, 
+                          uint8_t _fixed, 
+                          uint8_t _copies, 
+                          std::function<bool(RandomizerCheck)> _filter,
+                          uint8_t _dungeonLimit = 40){
+    name = _name;
+    type = _type;
+    weight = _weight;
+    fixed = _fixed;
+    copies = _copies;
+    filter = _filter;
+    dungeonLimit = _dungeonLimit;
+  }
 };
 
 struct HintSetting {
-  using DistributionTable = std::array<HintDistributionSetting, static_cast<int>(HINT_TYPE_MAX)>;
-
-  uint8_t dungeonsWothLimit;
-  uint8_t dungeonsBarrenLimit;
-  bool namedItemsRequired;
-  DistributionTable distTable;
+  uint8_t alwaysCopies;
+  uint8_t trialCopies;
+  uint8_t junkWeight;
+  std::vector<HintDistributionSetting> distTable;
 };
 
 enum class HintCategory {
@@ -197,7 +214,6 @@ extern std::array<DungeonHintInfo, 10> dungeonInfoData;
 
 extern std::array<ConditionalAlwaysHint, 10> conditionalAlwaysHints;
 
-extern RandomizerHintTextKey GetHintRegionHintKey(const RandomizerRegion area);
 extern void CreateAllHints();
 extern void CreateWarpSongTexts();
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
index 50d53f698..c4d1ec400 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
@@ -86,14 +86,14 @@ bool LocationAccess::CanBuy() const {
 }
 
 Area::Area() = default;
-Area::Area(std::string regionName_, std::string scene_, RandomizerHintTextKey hintKey_,
+Area::Area(std::string regionName_, std::string scene_, RandomizerArea area,
          bool timePass_,
          std::vector<EventAccess> events_,
          std::vector<LocationAccess> locations_,
          std::list<Rando::Entrance> exits_)
   : regionName(std::move(regionName_)),
     scene(std::move(scene_)),
-    hintKey(hintKey_),
+    area(area),
     timePass(timePass_),
     events(std::move(events_)),
     locations(std::move(locations_)),
@@ -254,10 +254,10 @@ void AreaTable_Init() {
   randoCtx = Context::GetInstance();
   //Clear the array from any previous playthrough attempts. This is important so that
   //locations which appear in both MQ and Vanilla dungeons don't get set in both areas.
-  areaTable.fill(Area("Invalid Area", "Invalid Area", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {}));
+  areaTable.fill(Area("Invalid Area", "Invalid Area", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {}));
 
                        //name, scene, hint text,                       events, locations, exits
-  areaTable[RR_ROOT] = Area("Root", "", RHT_LINKS_POCKET, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_ROOT] = Area("Root", "", RA_LINKS_POCKET, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_LINKS_POCKET,       {[]{return true;}}),
                   LocationAccess(RC_TRIFORCE_COMPLETED, {[]{return CanCompleteTriforce;}}),
@@ -267,7 +267,7 @@ void AreaTable_Init() {
                   Entrance(RR_ROOT_EXITS, {[]{return true;}})
   });
 
-  areaTable[RR_ROOT_EXITS] = Area("Root Exits", "", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_ROOT_EXITS] = Area("Root Exits", "", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_CHILD_SPAWN,             {[]{return IsChild;}}),
                   Entrance(RR_ADULT_SPAWN,             {[]{return IsAdult;}}),
@@ -279,42 +279,42 @@ void AreaTable_Init() {
                   Entrance(RR_PRELUDE_OF_LIGHT_WARP,   {[]{return CanPlay(PreludeOfLight)   && CanLeaveForest;}}),
   });
 
-  areaTable[RR_CHILD_SPAWN] = Area("Child Spawn", "", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_CHILD_SPAWN] = Area("Child Spawn", "", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_KF_LINKS_HOUSE, {[]{return true;}}),
   });
 
-  areaTable[RR_ADULT_SPAWN] = Area("Adult Spawn", "", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_ADULT_SPAWN] = Area("Adult Spawn", "", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_TEMPLE_OF_TIME, {[]{return true;}}),
   });
 
-  areaTable[RR_MINUET_OF_FOREST_WARP] = Area("Minuet of Forest Warp", "", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_MINUET_OF_FOREST_WARP] = Area("Minuet of Forest Warp", "", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_SACRED_FOREST_MEADOW, {[]{return true;}}),
   });
 
-  areaTable[RR_BOLERO_OF_FIRE_WARP] = Area("Bolero of Fire Warp", "", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_BOLERO_OF_FIRE_WARP] = Area("Bolero of Fire Warp", "", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DMC_CENTRAL_LOCAL, {[]{return true;}}),
   });
 
-  areaTable[RR_SERENADE_OF_WATER_WARP] = Area("Serenade of Water Warp", "", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_SERENADE_OF_WATER_WARP] = Area("Serenade of Water Warp", "", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_LAKE_HYLIA, {[]{return true;}}),
   });
 
-  areaTable[RR_REQUIEM_OF_SPIRIT_WARP] = Area("Requiem of Spirit Warp", "", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_REQUIEM_OF_SPIRIT_WARP] = Area("Requiem of Spirit Warp", "", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DESERT_COLOSSUS, {[]{return true;}}),
   });
 
-  areaTable[RR_NOCTURNE_OF_SHADOW_WARP] = Area("Nocturne of Shadow Warp", "", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_NOCTURNE_OF_SHADOW_WARP] = Area("Nocturne of Shadow Warp", "", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_GRAVEYARD_WARP_PAD_REGION, {[]{return true;}}),
   });
 
-  areaTable[RR_PRELUDE_OF_LIGHT_WARP] = Area("Prelude of Light Warp", "", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_PRELUDE_OF_LIGHT_WARP] = Area("Prelude of Light Warp", "", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_TEMPLE_OF_TIME, {[]{return true;}}),
   });
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access.hpp b/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
index aadc8d0b2..f5a3af7e5 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
@@ -7,6 +7,7 @@
 #include "logic.hpp"
 #include "hint_list.hpp"
 #include "fill.hpp"
+#include "../randomizerTypes.h"
 #include "../context.h"
 
 typedef bool (*ConditionFn)();
@@ -121,7 +122,7 @@ namespace Rando {
 class Area {
 public:
     Area();
-    Area(std::string regionName_, std::string scene_, RandomizerHintTextKey hintKey_,
+    Area(std::string regionName_, std::string scene_, RandomizerArea area,
          bool timePass_,
          std::vector<EventAccess> events_,
          std::vector<LocationAccess> locations_,
@@ -130,8 +131,8 @@ public:
 
     std::string regionName;
     std::string scene;
-    RandomizerHintTextKey     hintKey;
-    bool        timePass;
+    RandomizerArea area;
+    bool timePass;
     std::vector<EventAccess> events;
     std::vector<LocationAccess> locations;
     std::list<Rando::Entrance> exits;
@@ -181,8 +182,8 @@ public:
     //Check to see if an exit can be access as both ages at both times of day
     bool CheckAllAccess(RandomizerRegion exitKey);
 
-    const HintText& GetHint() const {
-      return Hint(hintKey);
+    RandomizerArea GetArea() const{
+        return area;
     }
 
     //Here checks conditional access based on whether or not both ages have
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_bottom_of_the_well.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_bottom_of_the_well.cpp
index b9499ff23..39fbc9b35 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_bottom_of_the_well.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_bottom_of_the_well.cpp
@@ -10,7 +10,7 @@ void AreaTable_Init_BottomOfTheWell() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[RR_BOTTOM_OF_THE_WELL_ENTRYWAY] = Area("Bottom of the Well Entryway", "Bottom of the Well", RHT_BOTTOM_OF_THE_WELL, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_BOTTOM_OF_THE_WELL_ENTRYWAY] = Area("Bottom of the Well Entryway", "Bottom of the Well", RA_BOTTOM_OF_THE_WELL, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_BOTTOM_OF_THE_WELL_MAIN_AREA,    {[]{return randoCtx->GetDungeon(Rando::BOTTOM_OF_THE_WELL)->IsVanilla() && IsChild && (CanChildAttack || Nuts);}}),
                   Entrance(RR_BOTTOM_OF_THE_WELL_MQ_PERIMETER, {[]{return randoCtx->GetDungeon(Rando::BOTTOM_OF_THE_WELL)->IsMQ()      && IsChild;}}),
@@ -21,7 +21,7 @@ void AreaTable_Init_BottomOfTheWell() {
   |     VANILLA DUNGEON      |
   ---------------------------*/
   if (randoCtx->GetDungeon(Rando::BOTTOM_OF_THE_WELL)->IsVanilla()) {
-  areaTable[RR_BOTTOM_OF_THE_WELL_MAIN_AREA] = Area("Bottom of the Well Main Area", "Bottom of the Well", RHT_BOTTOM_OF_THE_WELL, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_BOTTOM_OF_THE_WELL_MAIN_AREA] = Area("Bottom of the Well Main Area", "Bottom of the Well", RA_BOTTOM_OF_THE_WELL, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&StickPot, {[]{return true;}}),
                   EventAccess(&NutPot,   {[]{return true;}}),
@@ -54,7 +54,7 @@ void AreaTable_Init_BottomOfTheWell() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (randoCtx->GetDungeon(Rando::BOTTOM_OF_THE_WELL)->IsMQ()) {
-  areaTable[RR_BOTTOM_OF_THE_WELL_MQ_PERIMETER] = Area("Bottom of the Well MQ Perimeter", "Bottom of the Well", RHT_BOTTOM_OF_THE_WELL, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_BOTTOM_OF_THE_WELL_MQ_PERIMETER] = Area("Bottom of the Well MQ Perimeter", "Bottom of the Well", RA_BOTTOM_OF_THE_WELL, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   //EventAccess(&WallFairy, {[]{return WallFairy || Slingshot;}}),
   }, {
@@ -71,7 +71,7 @@ void AreaTable_Init_BottomOfTheWell() {
                     //Trick: CanPlay(ZeldasLullaby) || (LogicBotWMQPits && HasExplosives)
   });
 
-  areaTable[RR_BOTTOM_OF_THE_WELL_MQ_MIDDLE] = Area("Bottom of the Well MQ Middle", "Bottom of the Well", RHT_BOTTOM_OF_THE_WELL, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_BOTTOM_OF_THE_WELL_MQ_MIDDLE] = Area("Bottom of the Well MQ Middle", "Bottom of the Well", RA_BOTTOM_OF_THE_WELL, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_BOTTOM_OF_THE_WELL_MQ_MAP_CHEST,                        {[]{return true;}}),
                   LocationAccess(RC_BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST,              {[]{return HasExplosives && SmallKeys(RR_BOTTOM_OF_THE_WELL, 2);}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
index dd4f942de..53109e684 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
@@ -6,14 +6,14 @@ using namespace Logic;
 using namespace Rando;
 
 void AreaTable_Init_CastleTown() {
-  areaTable[RR_MARKET_ENTRANCE] = Area("Market Entrance", "Market Entrance", RHT_THE_MARKET, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_MARKET_ENTRANCE] = Area("Market Entrance", "Market Entrance", RA_THE_MARKET, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_HYRULE_FIELD,       {[]{return IsAdult || AtDay;}}),
                   Entrance(RR_THE_MARKET,         {[]{return true;}}),
                   Entrance(RR_MARKET_GUARD_HOUSE, {[]{return true;}}),
   });
 
-  areaTable[RR_THE_MARKET] = Area("Market", "Market", RHT_THE_MARKET, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_THE_MARKET] = Area("Market", "Market", RA_THE_MARKET, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_MARKET_ENTRANCE,            {[]{return true;}}),
                   Entrance(RR_TOT_ENTRANCE,               {[]{return true;}}),
@@ -27,7 +27,7 @@ void AreaTable_Init_CastleTown() {
                   Entrance(RR_MARKET_BACK_ALLEY,          {[]{return IsChild;}}),
   });
 
-  areaTable[RR_MARKET_BACK_ALLEY] = Area("Market Back Alley", "Market", RHT_THE_MARKET, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_MARKET_BACK_ALLEY] = Area("Market Back Alley", "Market", RA_THE_MARKET, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_THE_MARKET,                 {[]{return true;}}),
                   Entrance(RR_MARKET_BOMBCHU_SHOP,        {[]{return AtNight;}}),
@@ -35,7 +35,7 @@ void AreaTable_Init_CastleTown() {
                   Entrance(RR_MARKET_MAN_IN_GREEN_HOUSE,  {[]{return AtNight;}}),
   });
 
-  areaTable[RR_TOT_ENTRANCE] = Area("ToT Entrance", "ToT Entrance", RHT_THE_MARKET, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_TOT_ENTRANCE] = Area("ToT Entrance", "ToT Entrance", RA_THE_MARKET, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&GossipStoneFairy, {[]{return GossipStoneFairy || CanSummonGossipFairyWithoutSuns;}}),
                 }, {
@@ -50,7 +50,7 @@ void AreaTable_Init_CastleTown() {
                   Entrance(RR_TEMPLE_OF_TIME, {[]{return true;}}),
   });
 
-  areaTable[RR_TEMPLE_OF_TIME] = Area("Temple of Time", "Temple of Time", RHT_TEMPLE_OF_TIME, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_TEMPLE_OF_TIME] = Area("Temple of Time", "Temple of Time", RA_TEMPLE_OF_TIME, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_TOT_LIGHT_ARROWS_CUTSCENE, {[]{return IsAdult && CanTriggerLACS;}}),
                   LocationAccess(RC_ALTAR_HINT_CHILD, {[]{return IsChild;}}),
@@ -61,7 +61,7 @@ void AreaTable_Init_CastleTown() {
                   Entrance(RR_TOT_BEYOND_DOOR_OF_TIME, {[]{return randoCtx->GetOption(RSK_DOOR_OF_TIME).Is(RO_DOOROFTIME_OPEN) || (CanPlay(SongOfTime) && (randoCtx->GetOption(RSK_DOOR_OF_TIME).Is(RO_DOOROFTIME_SONGONLY) || (HasAllStones && OcarinaOfTime)));}}),
   });
 
-  areaTable[RR_TOT_BEYOND_DOOR_OF_TIME] = Area("Beyond Door of Time", "Beyond Door of Time", RHT_TEMPLE_OF_TIME, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_TOT_BEYOND_DOOR_OF_TIME] = Area("Beyond Door of Time", "Beyond Door of Time", RA_TEMPLE_OF_TIME, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   //EventAccess(&TimeTravel, {[]{return true;}}),
                 }, {
@@ -73,14 +73,14 @@ void AreaTable_Init_CastleTown() {
                   Entrance(RR_TEMPLE_OF_TIME, {[]{return true;}}),
   });
 
-  areaTable[RR_CASTLE_GROUNDS] = Area("Castle Grounds", "Castle Grounds", RHT_CASTLE_GROUNDS, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_CASTLE_GROUNDS] = Area("Castle Grounds", "Castle Grounds", RA_CASTLE_GROUNDS, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_THE_MARKET,            {[]{return true;}}),
                   Entrance(RR_HYRULE_CASTLE_GROUNDS, {[]{return IsChild;}}),
                   Entrance(RR_GANONS_CASTLE_GROUNDS, {[]{return IsAdult;}}),
   });
 
-  areaTable[RR_HYRULE_CASTLE_GROUNDS] = Area("Hyrule Castle Grounds", "Castle Grounds", RHT_HYRULE_CASTLE, DAY_NIGHT_CYCLE, {
+  areaTable[RR_HYRULE_CASTLE_GROUNDS] = Area("Hyrule Castle Grounds", "Castle Grounds", RA_HYRULE_CASTLE, DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&GossipStoneFairy, {[]{return GossipStoneFairy || CanSummonGossipFairy;}}),
                   EventAccess(&ButterflyFairy,   {[]{return ButterflyFairy   || CanUse(RG_STICKS);}}),
@@ -99,7 +99,7 @@ void AreaTable_Init_CastleTown() {
                   Entrance(RR_HC_STORMS_GROTTO,        {[]{return CanOpenStormGrotto;}}),
   });
 
-  areaTable[RR_HC_GARDEN] = Area("HC Garden", "Castle Grounds", RHT_HYRULE_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_HC_GARDEN] = Area("HC Garden", "Castle Grounds", RA_HYRULE_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                 }, {
                   //Locations
@@ -110,7 +110,7 @@ void AreaTable_Init_CastleTown() {
                   Entrance(RR_HYRULE_CASTLE_GROUNDS, {[]{return true;}}),
   });
 
-  areaTable[RR_HC_GREAT_FAIRY_FOUNTAIN] = Area("HC Great Fairy Fountain", "HC Great Fairy Fountain", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_HC_GREAT_FAIRY_FOUNTAIN] = Area("HC Great Fairy Fountain", "HC Great Fairy Fountain", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_HC_GREAT_FAIRY_REWARD, {[]{return CanPlay(ZeldasLullaby);}}),
                 }, {
@@ -118,7 +118,7 @@ void AreaTable_Init_CastleTown() {
                   Entrance(RR_CASTLE_GROUNDS, {[]{return true;}}),
   });
 
-  areaTable[RR_HC_STORMS_GROTTO] = Area("HC Storms Grotto", "HC Storms Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_HC_STORMS_GROTTO] = Area("HC Storms Grotto", "HC Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&NutPot,           {[]{return NutPot           || CanBlastOrSmash;}}),
                   EventAccess(&GossipStoneFairy, {[]{return GossipStoneFairy || (CanBlastOrSmash && CanSummonGossipFairy);}}),
@@ -132,7 +132,7 @@ void AreaTable_Init_CastleTown() {
                   Entrance(RR_CASTLE_GROUNDS, {[]{return true;}}),
   });
 
-  areaTable[RR_GANONS_CASTLE_GROUNDS] = Area("Ganon's Castle Grounds", "Castle Grounds", RHT_OUTSIDE_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_GROUNDS] = Area("Ganon's Castle Grounds", "Castle Grounds", RA_OUTSIDE_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   EventAccess(&BuiltRainbowBridge, {[]{return CanBuildRainbowBridge;}}),
                 }, {
                   //Locations                                   //the terrain was lowered such that you can't get this GS with a simple sword slash
@@ -145,7 +145,7 @@ void AreaTable_Init_CastleTown() {
                   Entrance(RR_GANONS_CASTLE_LEDGE,      {[]{return BuiltRainbowBridge;}}),
   });
 
-  areaTable[RR_OGC_GREAT_FAIRY_FOUNTAIN] = Area("OGC Great Fairy Fountain", "OGC Great Fairy Fountain", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_OGC_GREAT_FAIRY_FOUNTAIN] = Area("OGC Great Fairy Fountain", "OGC Great Fairy Fountain", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_OGC_GREAT_FAIRY_REWARD, {[]{return CanPlay(ZeldasLullaby);}}),
                 }, {
@@ -153,20 +153,20 @@ void AreaTable_Init_CastleTown() {
                   Entrance(RR_CASTLE_GROUNDS, {[]{return true;}}),
   });
 
-  areaTable[RR_CASTLE_GROUNDS_FROM_GANONS_CASTLE] = Area("Castle Grounds From Ganon's Castle", "Castle Grounds From Ganon's Castle", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_CASTLE_GROUNDS_FROM_GANONS_CASTLE] = Area("Castle Grounds From Ganon's Castle", "Castle Grounds From Ganon's Castle", RA_CASTLE_GROUNDS, NO_DAY_NIGHT_CYCLE, {}, {}, {
     // Exits
     Entrance(RR_HYRULE_CASTLE_GROUNDS, { [] { return IsChild; }}),
     Entrance(RR_GANONS_CASTLE_LEDGE, { [] { return IsAdult; }}),
   });
 
-  areaTable[RR_GANONS_CASTLE_LEDGE] = Area("Ganon's Castle Ledge", "OGC Ganon's Castle Ledge", RHT_OUTSIDE_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE,
+  areaTable[RR_GANONS_CASTLE_LEDGE] = Area("Ganon's Castle Ledge", "OGC Ganon's Castle Ledge", RA_OUTSIDE_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE,
   {}, {}, {
     // Exits
     Entrance(RR_GANONS_CASTLE_GROUNDS, {[]{return BuiltRainbowBridge;}}),
     Entrance(RR_GANONS_CASTLE_ENTRYWAY, {[]{return IsAdult;}}),
   });
 
-  areaTable[RR_MARKET_GUARD_HOUSE] = Area("Market Guard House", "Market Guard House", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_MARKET_GUARD_HOUSE] = Area("Market Guard House", "Market Guard House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_MARKET_10_BIG_POES,    {[]{return IsAdult && BigPoeKill;}}),
                   LocationAccess(RC_MARKET_GS_GUARD_HOUSE, {[]{return IsChild;}}),
@@ -175,7 +175,7 @@ void AreaTable_Init_CastleTown() {
                   Entrance(RR_MARKET_ENTRANCE, {[]{return true;}}),
   });
 
-  areaTable[RR_MARKET_BAZAAR] = Area("Market Bazaar", "Market Bazaar", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_MARKET_BAZAAR] = Area("Market Bazaar", "Market Bazaar", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_MARKET_BAZAAR_ITEM_1, {[]{return true;}}),
                   LocationAccess(RC_MARKET_BAZAAR_ITEM_2, {[]{return true;}}),
@@ -190,7 +190,7 @@ void AreaTable_Init_CastleTown() {
                   Entrance(RR_THE_MARKET, {[]{return true;}}),
   });
 
-  areaTable[RR_MARKET_MASK_SHOP] = Area("Market Mask Shop", "Market Mask Shop", RHT_NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_MARKET_MASK_SHOP] = Area("Market Mask Shop", "Market Mask Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&SkullMask,   {[]{return SkullMask   || (ZeldasLetter && (randoCtx->GetOption(RSK_COMPLETE_MASK_QUEST) ||  ChildCanAccess(RR_KAKARIKO_VILLAGE)));}}),
                   EventAccess(&MaskOfTruth, {[]{return MaskOfTruth || (SkullMask && (randoCtx->GetOption(RSK_COMPLETE_MASK_QUEST) || (ChildCanAccess(RR_THE_LOST_WOODS) && CanPlay(SariasSong) && AreaTable(RR_THE_GRAVEYARD)->childDay && ChildCanAccess(RR_HYRULE_FIELD) && HasAllStones)));}}),
@@ -199,7 +199,7 @@ void AreaTable_Init_CastleTown() {
                   Entrance(RR_THE_MARKET, {[]{return true;}}),
   });
 
-  areaTable[RR_MARKET_SHOOTING_GALLERY] = Area("Market Shooting Gallery", "Market Shooting Gallery", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_MARKET_SHOOTING_GALLERY] = Area("Market Shooting Gallery", "Market Shooting Gallery", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_MARKET_SHOOTING_GALLERY_REWARD, {[]{return IsChild;}}),
                 }, {
@@ -207,7 +207,7 @@ void AreaTable_Init_CastleTown() {
                   Entrance(RR_THE_MARKET, {[]{return true;}}),
   });
 
-  areaTable[RR_MARKET_BOMBCHU_BOWLING] = Area("Market Bombchu Bowling", "Market Bombchu Bowling", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_MARKET_BOMBCHU_BOWLING] = Area("Market Bombchu Bowling", "Market Bombchu Bowling", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,  {[]{return CanPlayBowling;}}),
                   LocationAccess(RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE, {[]{return CanPlayBowling;}}),
@@ -217,7 +217,7 @@ void AreaTable_Init_CastleTown() {
                   Entrance(RR_THE_MARKET, {[]{return true;}}),
   });
 
-  areaTable[RR_MARKET_POTION_SHOP] = Area("Market Potion Shop", "Market Potion Shop", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_MARKET_POTION_SHOP] = Area("Market Potion Shop", "Market Potion Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_MARKET_POTION_SHOP_ITEM_1, {[]{return true;}}),
                   LocationAccess(RC_MARKET_POTION_SHOP_ITEM_2, {[]{return true;}}),
@@ -232,7 +232,7 @@ void AreaTable_Init_CastleTown() {
                   Entrance(RR_THE_MARKET, {[]{return true;}}),
   });
 
-  areaTable[RR_MARKET_TREASURE_CHEST_GAME] = Area("Market Treasure Chest Game", "Market Treasure Chest Game", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_MARKET_TREASURE_CHEST_GAME] = Area("Market Treasure Chest Game", "Market Treasure Chest Game", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_GREG_HINT, {[]{return true;}}),
                   LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_REWARD, {[]{return (CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 6)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1));}}),
@@ -246,7 +246,7 @@ void AreaTable_Init_CastleTown() {
                   Entrance(RR_THE_MARKET, {[]{return true;}}),
   });
 
-  areaTable[RR_MARKET_BOMBCHU_SHOP] = Area("Market Bombchu Shop", "Market Bombchu Shop", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_MARKET_BOMBCHU_SHOP] = Area("Market Bombchu Shop", "Market Bombchu Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_MARKET_BOMBCHU_SHOP_ITEM_1, {[]{return true;}}),
                   LocationAccess(RC_MARKET_BOMBCHU_SHOP_ITEM_2, {[]{return true;}}),
@@ -261,7 +261,7 @@ void AreaTable_Init_CastleTown() {
                   Entrance(RR_MARKET_BACK_ALLEY, {[]{return true;}}),
   });
 
-  areaTable[RR_MARKET_DOG_LADY_HOUSE] = Area("Market Dog Lady House", "Market Dog Lady House", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_MARKET_DOG_LADY_HOUSE] = Area("Market Dog Lady House", "Market Dog Lady House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_MARKET_LOST_DOG, {[]{return IsChild && AtNight;}}),
                 }, {
@@ -269,7 +269,7 @@ void AreaTable_Init_CastleTown() {
                   Entrance(RR_MARKET_BACK_ALLEY, {[]{return true;}}),
   });
 
-  areaTable[RR_MARKET_MAN_IN_GREEN_HOUSE] = Area("Market Man in Green House", "Market Man in Green House", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_MARKET_MAN_IN_GREEN_HOUSE] = Area("Market Man in Green House", "Market Man in Green House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_MARKET_BACK_ALLEY, {[]{return true;}}),
   });
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
index ced34dcd9..3858ef5c7 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
@@ -7,7 +7,7 @@ using namespace Rando;
 
 void AreaTable_Init_DeathMountain() {
   auto ctx = Rando::Context::GetInstance();
-  areaTable[RR_DEATH_MOUNTAIN_TRAIL] = Area("Death Mountain", "Death Mountain", RHT_DEATH_MOUNTAIN_TRAIL, DAY_NIGHT_CYCLE, {
+  areaTable[RR_DEATH_MOUNTAIN_TRAIL] = Area("Death Mountain", "Death Mountain", RA_DEATH_MOUNTAIN_TRAIL, DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&BeanPlantFairy, {[]{return BeanPlantFairy || (CanPlantBean(RR_DEATH_MOUNTAIN_TRAIL) && CanPlay(SongOfStorms) && (HasExplosives || GoronBracelet));}}),
                 }, {
@@ -26,7 +26,7 @@ void AreaTable_Init_DeathMountain() {
                   Entrance(RR_DMT_STORMS_GROTTO,        {[]{return CanOpenStormGrotto;}}),
   });
 
-  areaTable[RR_DEATH_MOUNTAIN_SUMMIT] = Area("Death Mountain Summit", "Death Mountain", RHT_DEATH_MOUNTAIN_TRAIL, DAY_NIGHT_CYCLE, {
+  areaTable[RR_DEATH_MOUNTAIN_SUMMIT] = Area("Death Mountain Summit", "Death Mountain", RA_DEATH_MOUNTAIN_TRAIL, DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&PrescriptionAccess, {[]{return PrescriptionAccess || (IsAdult && (BrokenSwordAccess || BrokenSword));}}),
                   EventAccess(&GossipStoneFairy,   {[]{return GossipStoneFairy   || CanSummonGossipFairy;}}),
@@ -47,12 +47,12 @@ void AreaTable_Init_DeathMountain() {
                   Entrance(RR_DMT_GREAT_FAIRY_FOUNTAIN, {[]{return Here(RR_DEATH_MOUNTAIN_SUMMIT, []{return CanBlastOrSmash;});}}),
   });
 
-  areaTable[RR_DMT_OWL_FLIGHT] = Area("DMT Owl Flight", "Death Mountain", RHT_DEATH_MOUNTAIN_TRAIL, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DMT_OWL_FLIGHT] = Area("DMT Owl Flight", "Death Mountain", RA_DEATH_MOUNTAIN_TRAIL, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_KAK_IMPAS_ROOFTOP, {[]{return true;}}),
   });
 
-  areaTable[RR_DMT_COW_GROTTO] = Area("DMT Cow Grotto", "DMT Cow Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DMT_COW_GROTTO] = Area("DMT Cow Grotto", "DMT Cow Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_DMT_COW_GROTTO_COW, {[]{return CanPlay(EponasSong);}}),
                 }, {
@@ -61,7 +61,7 @@ void AreaTable_Init_DeathMountain() {
 
   });
 
-  areaTable[RR_DMT_STORMS_GROTTO] = Area("DMT Storms Grotto", "DMT Storms Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+  areaTable[RR_DMT_STORMS_GROTTO] = Area("DMT Storms Grotto", "DMT Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LocationAccess(RC_DMT_STORMS_GROTTO_CHEST,        {[]{return true;}}),
                   LocationAccess(RC_DMT_STORMS_GROTTO_GOSSIP_STONE, {[]{return true;}}),
@@ -70,7 +70,7 @@ void AreaTable_Init_DeathMountain() {
                   Entrance(RR_DEATH_MOUNTAIN_TRAIL, {[]{return true;}}),
   });
 
-  areaTable[RR_DMT_GREAT_FAIRY_FOUNTAIN] = Area("DMT Great Fairy Fountain", "DMT Great Fairy Fountain", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DMT_GREAT_FAIRY_FOUNTAIN] = Area("DMT Great Fairy Fountain", "DMT Great Fairy Fountain", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_DMT_GREAT_FAIRY_REWARD, {[]{return CanPlay(ZeldasLullaby);}}),
                 }, {
@@ -78,7 +78,7 @@ void AreaTable_Init_DeathMountain() {
                   Entrance(RR_DEATH_MOUNTAIN_SUMMIT, {[]{return true;}}),
   });
 
-  areaTable[RR_GORON_CITY] = Area("Goron City", "Goron City", RHT_GORON_CITY, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GORON_CITY] = Area("Goron City", "Goron City", RA_GORON_CITY, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&GossipStoneFairy,          {[]{return GossipStoneFairy          || CanSummonGossipFairyWithoutSuns;}}),
                   EventAccess(&StickPot,                  {[]{return StickPot                  || IsChild;}}),
@@ -109,7 +109,7 @@ void AreaTable_Init_DeathMountain() {
                   Entrance(RR_GC_GROTTO_PLATFORM,   {[]{return IsAdult && ((CanPlay(SongOfTime) && ((EffectiveHealth > 2) || CanUse(RG_GORON_TUNIC) || CanUse(RG_LONGSHOT) || CanUse(RG_NAYRUS_LOVE))) || (EffectiveHealth > 1 && CanUse(RG_GORON_TUNIC) && CanUse(RG_HOOKSHOT)) || (CanUse(RG_NAYRUS_LOVE) && CanUse(RG_HOOKSHOT)) || (EffectiveHealth > 2 && CanUse(RG_HOOKSHOT) && randoCtx->GetTrickOption(RT_GC_GROTTO)));}}),
   });
 
-  areaTable[RR_GC_WOODS_WARP] = Area("GC Woods Warp", "Goron City", RHT_GORON_CITY, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GC_WOODS_WARP] = Area("GC Woods Warp", "Goron City", RA_GORON_CITY, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&GCWoodsWarpOpen, {[]{return GCWoodsWarpOpen || (CanBlastOrSmash || CanUse(RG_DINS_FIRE));}}),
                 }, {}, {
@@ -118,7 +118,7 @@ void AreaTable_Init_DeathMountain() {
                   Entrance(RR_THE_LOST_WOODS, {[]{return true;}}),
   });
 
-  areaTable[RR_GC_DARUNIAS_CHAMBER] = Area("GC Darunias Chamber", "Goron City", RHT_GORON_CITY, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GC_DARUNIAS_CHAMBER] = Area("GC Darunias Chamber", "Goron City", RA_GORON_CITY, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&GoronCityChildFire, {[]{return GoronCityChildFire || (IsChild && CanUse(RG_STICKS));}}),
                 }, {
@@ -130,13 +130,13 @@ void AreaTable_Init_DeathMountain() {
                   Entrance(RR_DMC_LOWER_LOCAL, {[]{return IsAdult;}}),
   });
 
-  areaTable[RR_GC_GROTTO_PLATFORM] = Area("GC Grotto Platform", "Goron City", RHT_GORON_CITY, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_GC_GROTTO_PLATFORM] = Area("GC Grotto Platform", "Goron City", RA_GORON_CITY, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_GC_GROTTO,  {[]{return true;}}),
                   Entrance(RR_GORON_CITY, {[]{return EffectiveHealth > 2 || CanUse(RG_GORON_TUNIC) || CanUse(RG_NAYRUS_LOVE) || ((IsChild || CanPlay(SongOfTime)) && CanUse(RG_LONGSHOT));}}),
   });
 
-  areaTable[RR_GC_SHOP] = Area("GC Shop", "GC Shop", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GC_SHOP] = Area("GC Shop", "GC Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_GC_SHOP_ITEM_1, {[]{return true;}}),
                   LocationAccess(RC_GC_SHOP_ITEM_2, {[]{return true;}}),
@@ -151,7 +151,7 @@ void AreaTable_Init_DeathMountain() {
                   Entrance(RR_GORON_CITY, {[]{return true;}}),
   });
 
-  areaTable[RR_GC_GROTTO] = Area("GC Grotto", "GC Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GC_GROTTO] = Area("GC Grotto", "GC Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_GC_DEKU_SCRUB_GROTTO_LEFT,   {[]{return CanStunDeku;}}),
                   LocationAccess(RC_GC_DEKU_SCRUB_GROTTO_RIGHT,  {[]{return CanStunDeku;}}),
@@ -161,14 +161,14 @@ void AreaTable_Init_DeathMountain() {
                   Entrance(RR_GC_GROTTO_PLATFORM, {[]{return true;}}),
   });
 
-  areaTable[RR_DMC_UPPER_NEARBY] = Area("DMC Upper Nearby", "Death Mountain Crater", RHT_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DMC_UPPER_NEARBY] = Area("DMC Upper Nearby", "Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DMC_UPPER_LOCAL,       {[]{return FireTimer >= 48;}}),
                   Entrance(RR_DEATH_MOUNTAIN_SUMMIT, {[]{return true;}}),
                   Entrance(RR_DMC_UPPER_GROTTO,      {[]{return Here(RR_DMC_UPPER_NEARBY, []{return CanBlastOrSmash && (FireTimer >= 8 || Hearts >= 3);});}})
   });
 
-  areaTable[RR_DMC_UPPER_LOCAL] = Area("DMC Upper Local", "Death Mountain Crater", RHT_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DMC_UPPER_LOCAL] = Area("DMC Upper Local", "Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&GossipStoneFairy, {[]{return GossipStoneFairy || (HasExplosives && CanSummonGossipFairyWithoutSuns && (FireTimer >= 16 || Hearts >= 3));}}),
                 }, {
@@ -184,7 +184,7 @@ void AreaTable_Init_DeathMountain() {
                   Entrance(RR_DMC_LOWER_NEARBY,         {[]{return false;}}),
   });
 
-  areaTable[RR_DMC_LADDER_AREA_NEARBY] = Area("DMC Ladder Area Nearby", "Death Mountain Crater", RHT_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DMC_LADDER_AREA_NEARBY] = Area("DMC Ladder Area Nearby", "Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_DMC_DEKU_SCRUB, {[]{return IsChild && CanStunDeku;}}),
                 }, {
@@ -193,7 +193,7 @@ void AreaTable_Init_DeathMountain() {
                   Entrance(RR_DMC_LOWER_NEARBY, {[]{return Hearts >= 3 && (CanUse(RG_HOVER_BOOTS) || (randoCtx->GetTrickOption(RT_DMC_BOULDER_JS) && IsAdult && CanUse(RG_MEGATON_HAMMER)) || (randoCtx->GetTrickOption(RT_DMC_BOULDER_SKIP) && IsAdult));}}),
   });
 
-  areaTable[RR_DMC_LOWER_NEARBY] = Area("DMC Lower Nearby", "Death Mountain Crater", RHT_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DMC_LOWER_NEARBY] = Area("DMC Lower Nearby", "Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DMC_LOWER_LOCAL,          {[]{return FireTimer >= 48;}}),
                   Entrance(RR_GC_DARUNIAS_CHAMBER,      {[]{return true;}}),
@@ -201,7 +201,7 @@ void AreaTable_Init_DeathMountain() {
                   Entrance(RR_DMC_HAMMER_GROTTO,        {[]{return IsAdult && CanUse(RG_MEGATON_HAMMER);}}),
   });
 
-  areaTable[RR_DMC_LOWER_LOCAL] = Area("DMC Lower Local", "Death Mountain Crater", RHT_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DMC_LOWER_LOCAL] = Area("DMC Lower Local", "Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DMC_LOWER_NEARBY,       {[]{return true;}}),
                   Entrance(RR_DMC_LADDER_AREA_NEARBY, {[]{return FireTimer >= 8 || Hearts >= 3;}}),
@@ -209,7 +209,7 @@ void AreaTable_Init_DeathMountain() {
                   Entrance(RR_DMC_CENTRAL_LOCAL,      {[]{return (CanUse(RG_HOVER_BOOTS) || CanUse(RG_HOOKSHOT) || (IsAdult && CanShield && randoCtx->GetTrickOption(RT_DMC_BOLERO_JUMP))) && FireTimer >= 24;}}),
   });
 
-  areaTable[RR_DMC_CENTRAL_NEARBY] = Area("DMC Central Nearby", "Death Mountain Crater", RHT_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DMC_CENTRAL_NEARBY] = Area("DMC Central Nearby", "Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_DMC_VOLCANO_FREESTANDING_POH, {[]{return IsAdult && Hearts >= 3 && (CanPlantBean(RR_DMC_CENTRAL_LOCAL) || (randoCtx->GetTrickOption(RT_DMC_HOVER_BEAN_POH) && HoverBoots));}}),
                   LocationAccess(RC_SHEIK_IN_CRATER,              {[]{return IsAdult && (FireTimer >= 8 || Hearts >= 3);}}),
@@ -218,7 +218,7 @@ void AreaTable_Init_DeathMountain() {
                   Entrance(RR_DMC_CENTRAL_LOCAL, {[]{return FireTimer >= 48;}}),
   });
 
-  areaTable[RR_DMC_CENTRAL_LOCAL] = Area("DMC Central Local", "Death Mountain Crater", RHT_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DMC_CENTRAL_LOCAL] = Area("DMC Central Local", "Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&BeanPlantFairy, {[]{return BeanPlantFairy || (CanPlantBean(RR_DMC_CENTRAL_LOCAL) && CanPlay(SongOfStorms));}}),
                 }, {
@@ -232,7 +232,7 @@ void AreaTable_Init_DeathMountain() {
                   Entrance(RR_FIRE_TEMPLE_ENTRYWAY, {[]{return (IsChild && Hearts >= 3 && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).IsNot(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF)) || (IsAdult && FireTimer >= 24);}}),
   });
 
-  areaTable[RR_DMC_GREAT_FAIRY_FOUNTAIN] = Area("DMC Great Fairy Fountain", "DMC Great Fairy Fountain", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DMC_GREAT_FAIRY_FOUNTAIN] = Area("DMC Great Fairy Fountain", "DMC Great Fairy Fountain", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_DMC_GREAT_FAIRY_REWARD, {[]{return CanPlay(ZeldasLullaby);}}),
                 }, {
@@ -240,7 +240,7 @@ void AreaTable_Init_DeathMountain() {
                   Entrance(RR_DMC_LOWER_LOCAL, {[]{return true;}}),
   });
 
-  areaTable[RR_DMC_UPPER_GROTTO] = Area("DMC Upper Grotto", "DMC Upper Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+  areaTable[RR_DMC_UPPER_GROTTO] = Area("DMC Upper Grotto", "DMC Upper Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LocationAccess(RC_DMC_UPPER_GROTTO_CHEST,        {[]{return true;}}),
                   LocationAccess(RC_DMC_UPPER_GROTTO_GOSSIP_STONE, {[]{return true;}}),
@@ -249,7 +249,7 @@ void AreaTable_Init_DeathMountain() {
                   Entrance(RR_DMC_UPPER_LOCAL, {[]{return true;}}),
   });
 
-  areaTable[RR_DMC_HAMMER_GROTTO] = Area("DMC Hammer Grotto", "DMC Hammer Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DMC_HAMMER_GROTTO] = Area("DMC Hammer Grotto", "DMC Hammer Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_DMC_DEKU_SCRUB_GROTTO_LEFT,   {[]{return CanStunDeku;}}),
                   LocationAccess(RC_DMC_DEKU_SCRUB_GROTTO_RIGHT,  {[]{return CanStunDeku;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp
index c1bc935a7..77459619f 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp
@@ -10,7 +10,7 @@ void AreaTable_Init_DekuTree() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[RR_DEKU_TREE_ENTRYWAY] = Area("Deku Tree Entryway", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DEKU_TREE_ENTRYWAY] = Area("Deku Tree Entryway", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DEKU_TREE_LOBBY,      {[]{return randoCtx->GetDungeon(DEKU_TREE)->IsVanilla();}}),
                   Entrance(RR_DEKU_TREE_MQ_LOBBY,   {[]{return randoCtx->GetDungeon(DEKU_TREE)->IsMQ();}}),
@@ -21,7 +21,7 @@ void AreaTable_Init_DekuTree() {
   |     VANILLA DUNGEON      |
   ---------------------------*/
   if (randoCtx->GetDungeon(DEKU_TREE)->IsVanilla()) {
-  areaTable[RR_DEKU_TREE_LOBBY] = Area("Deku Tree Lobby", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DEKU_TREE_LOBBY] = Area("Deku Tree Lobby", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_BOOMERANG));}}),
                   EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_MEGATON_HAMMER) || HasExplosives || CanUse(RG_DINS_FIRE));}}),
@@ -38,13 +38,13 @@ void AreaTable_Init_DekuTree() {
                   Entrance(RR_DEKU_TREE_BOSS_ENTRYWAY,     {[]{return false;}}),
   });
 
-  areaTable[RR_DEKU_TREE_2F_MIDDLE_ROOM] = Area("Deku Tree 2F Middle Room", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DEKU_TREE_2F_MIDDLE_ROOM] = Area("Deku Tree 2F Middle Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DEKU_TREE_LOBBY,         {[]{return Here(RR_DEKU_TREE_2F_MIDDLE_ROOM, []{return HasShield || CanUse(RG_MEGATON_HAMMER);});}}),
                   Entrance(RR_DEKU_TREE_SLINGSHOT_ROOM,{[]{return Here(RR_DEKU_TREE_2F_MIDDLE_ROOM, []{return HasShield || CanUse(RG_MEGATON_HAMMER);});}}),
   });
 
-  areaTable[RR_DEKU_TREE_SLINGSHOT_ROOM] = Area("Deku Tree Slingshot Room", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DEKU_TREE_SLINGSHOT_ROOM] = Area("Deku Tree Slingshot Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_DEKU_TREE_SLINGSHOT_CHEST,           {[]{return true;}}),
                   LocationAccess(RC_DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST, {[]{return true;}}),
@@ -53,7 +53,7 @@ void AreaTable_Init_DekuTree() {
                   Entrance(RR_DEKU_TREE_2F_MIDDLE_ROOM, {[]{return CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_HOVER_BOOTS);}}),
   });
 
-  areaTable[RR_DEKU_TREE_COMPASS_ROOM] = Area("Deku Tree Compass Room", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DEKU_TREE_COMPASS_ROOM] = Area("Deku Tree Compass Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_BOOMERANG));}}),
                   EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_MEGATON_HAMMER) || HasExplosives || CanUse(RG_DINS_FIRE));}}),
@@ -68,7 +68,7 @@ void AreaTable_Init_DekuTree() {
                   Entrance(RR_DEKU_TREE_BOSS_ENTRYWAY, {[]{return false;}}),
   });
 
-  areaTable[RR_DEKU_TREE_BASEMENT_LOWER] = Area("Deku Tree Basement Lower", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DEKU_TREE_BASEMENT_LOWER] = Area("Deku Tree Basement Lower", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || Boomerang);}}),
                   EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_MEGATON_HAMMER) || HasExplosives || CanUse(RG_DINS_FIRE));},
@@ -86,19 +86,19 @@ void AreaTable_Init_DekuTree() {
                   Entrance(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM,   {[]{return false;}}),
   });
 
-  areaTable[RR_DEKU_TREE_BASEMENT_SCRUB_ROOM] = Area("Deku Tree Basement Scrub Room", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DEKU_TREE_BASEMENT_SCRUB_ROOM] = Area("Deku Tree Basement Scrub Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DEKU_TREE_BASEMENT_LOWER,      {[]{return true;}}),
                   Entrance(RR_DEKU_TREE_BASEMENT_WATER_ROOM, {[]{return Here(RR_DEKU_TREE_BASEMENT_SCRUB_ROOM, []{return CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW);});}}),
   });
 
-  areaTable[RR_DEKU_TREE_BASEMENT_WATER_ROOM] = Area("Deku Tree Basement Water Room", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DEKU_TREE_BASEMENT_WATER_ROOM] = Area("Deku Tree Basement Water Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DEKU_TREE_BASEMENT_SCRUB_ROOM, {[]{return true;}}),
                   Entrance(RR_DEKU_TREE_BASEMENT_TORCH_ROOM, {[]{return true;}}),
   });
 
-  areaTable[RR_DEKU_TREE_BASEMENT_TORCH_ROOM] = Area("Deku Tree Basement Torch Room", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DEKU_TREE_BASEMENT_TORCH_ROOM] = Area("Deku Tree Basement Torch Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_BOOMERANG));}}),
                   EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_MEGATON_HAMMER) || HasExplosives || CanUse(RG_DINS_FIRE));}}),
@@ -108,7 +108,7 @@ void AreaTable_Init_DekuTree() {
                   Entrance(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, {[]{return Here(RR_DEKU_TREE_BASEMENT_TORCH_ROOM, []{return HasFireSourceWithTorch || CanUse(RG_FAIRY_BOW);});}}),
   });
 
-  areaTable[RR_DEKU_TREE_BASEMENT_BACK_LOBBY] = Area("Deku Tree Basement Back Lobby", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DEKU_TREE_BASEMENT_BACK_LOBBY] = Area("Deku Tree Basement Back Lobby", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_BOOMERANG));}}),
                   EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (Here(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, []{return HasFireSourceWithTorch || CanUse(RG_FAIRY_BOW);}) &&
@@ -121,7 +121,7 @@ void AreaTable_Init_DekuTree() {
                   Entrance(RR_DEKU_TREE_BASEMENT_UPPER,      {[]{return Here(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, []{return HasFireSourceWithTorch || CanUse(RG_FAIRY_BOW);}) && IsChild;}}),
   });
 
-  areaTable[RR_DEKU_TREE_BASEMENT_BACK_ROOM] = Area("Deku Tree Basement Back Room", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DEKU_TREE_BASEMENT_BACK_ROOM] = Area("Deku Tree Basement Back Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_DEKU_TREE_GS_BASEMENT_BACK_ROOM, {[]{return HookshotOrBoomerang;}}),
                 }, {
@@ -129,7 +129,7 @@ void AreaTable_Init_DekuTree() {
                   Entrance(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, {[]{return true;}}),
   });
 
-  areaTable[RR_DEKU_TREE_BASEMENT_UPPER] = Area("Deku Tree Basement Upper", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DEKU_TREE_BASEMENT_UPPER] = Area("Deku Tree Basement Upper", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_BOOMERANG));}}),
                   EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_MEGATON_HAMMER) || HasExplosives || CanUse(RG_DINS_FIRE));}}),
@@ -140,7 +140,7 @@ void AreaTable_Init_DekuTree() {
                   Entrance(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM,   {[]{return Here(RR_DEKU_TREE_BASEMENT_UPPER, []{return HasFireSourceWithTorch || (randoCtx->GetTrickOption(RT_DEKU_B1_BOW_WEBS) && IsAdult && CanUse(RG_FAIRY_BOW));});}}),
   });
 
-  areaTable[RR_DEKU_TREE_OUTSIDE_BOSS_ROOM] = Area("Deku Tree Outside Boss Room", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DEKU_TREE_OUTSIDE_BOSS_ROOM] = Area("Deku Tree Outside Boss Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DEKU_TREE_BASEMENT_UPPER, {[]{return true;}}),
                   Entrance(RR_DEKU_TREE_BOSS_ENTRYWAY,  {[]{return Here(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM, []{return HasShield;});}}),
@@ -151,7 +151,7 @@ void AreaTable_Init_DekuTree() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (randoCtx->GetDungeon(DEKU_TREE)->IsMQ()) {
-  areaTable[RR_DEKU_TREE_MQ_LOBBY] = Area("Deku Tree MQ Lobby", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DEKU_TREE_MQ_LOBBY] = Area("Deku Tree MQ Lobby", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_BOOMERANG));}}),
                   EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_MEGATON_HAMMER) || HasExplosives || CanUse(RG_DINS_FIRE));}}),
@@ -172,7 +172,7 @@ void AreaTable_Init_DekuTree() {
                   Entrance(RR_DEKU_TREE_MQ_BASEMENT_LEDGE,            {[]{return randoCtx->GetTrickOption(RT_DEKU_B1_SKIP) || Here(RR_DEKU_TREE_MQ_LOBBY, []{return IsAdult;});}}),
   });
 
-  areaTable[RR_DEKU_TREE_MQ_COMPASS_ROOM] = Area("Deku Tree MQ Compass Room", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DEKU_TREE_MQ_COMPASS_ROOM] = Area("Deku Tree MQ Compass Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_DEKU_TREE_MQ_COMPASS_CHEST,   {[]{return true;}}),
                   LocationAccess(RC_DEKU_TREE_MQ_GS_COMPASS_ROOM, {[]{return HookshotOrBoomerang &&
@@ -184,7 +184,7 @@ void AreaTable_Init_DekuTree() {
                   Entrance(RR_DEKU_TREE_MQ_LOBBY, {[]{return true;}}),
   });
 
-  areaTable[RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_FRONT] = Area("Deku Tree MQ Basement Water Room Front", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_FRONT] = Area("Deku Tree MQ Basement Water Room Front", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST, {[]{return true;}}),
   }, {
@@ -194,7 +194,7 @@ void AreaTable_Init_DekuTree() {
                   Entrance(RR_DEKU_TREE_MQ_LOBBY,                    {[]{return true;}}),
   });
 
-  areaTable[RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK] = Area("Deku Tree MQ Basement Water Room Front", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK] = Area("Deku Tree MQ Basement Water Room Front", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST, {[]{return CanPlay(SongOfTime);}}),
   }, {
@@ -206,7 +206,7 @@ void AreaTable_Init_DekuTree() {
                   Entrance(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_FRONT, {[]{return true;}}),
   });
 
-  areaTable[RR_DEKU_TREE_MQ_BASEMENT_BACK_ROOM] = Area("Deku Tree MQ Basement Back Room", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DEKU_TREE_MQ_BASEMENT_BACK_ROOM] = Area("Deku Tree MQ Basement Back Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM, {[]{return (IsAdult && CanUse(RG_LONGSHOT)) || (CanPlay(SongOfTime) && HookshotOrBoomerang);}}),
                   LocationAccess(RC_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM,   {[]{return HasFireSourceWithTorch && HookshotOrBoomerang;}}),
@@ -216,7 +216,7 @@ void AreaTable_Init_DekuTree() {
                   Entrance(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK, {[]{return (IsChild && CanUse(RG_KOKIRI_SWORD)) || CanUseProjectile || (Nuts && (IsChild && CanUse(RG_STICKS)));}}),
   });
 
-  areaTable[RR_DEKU_TREE_MQ_BASEMENT_LEDGE] = Area("Deku Tree MQ Basement Ledge", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DEKU_TREE_MQ_BASEMENT_LEDGE] = Area("Deku Tree MQ Basement Ledge", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_DEKU_TREE_MQ_DEKU_SCRUB, {[]{return CanStunDeku;}}),
   }, {
@@ -228,7 +228,7 @@ void AreaTable_Init_DekuTree() {
   });
 
     areaTable[RR_DEKU_TREE_MQ_OUTSIDE_BOSS_ROOM] =
-            Area("Deku Tree MQ Outside Boss Room", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {},
+            Area("Deku Tree MQ Outside Boss Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {},
                  {
                      // Exits
                      Entrance(RR_DEKU_TREE_MQ_BASEMENT_LEDGE, { [] { return true; } }),
@@ -241,7 +241,7 @@ void AreaTable_Init_DekuTree() {
     |         BOSS ROOM         |
     ---------------------------*/
     areaTable[RR_DEKU_TREE_BOSS_ENTRYWAY] =
-        Area("Deku Tree Boss Entryway", "Deku Tree", RHT_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {},
+        Area("Deku Tree Boss Entryway", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {},
              {
                  // Exits
                  Entrance(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM, { [] { return randoCtx->GetDungeon(DEKU_TREE)->IsVanilla(); } }),
@@ -250,7 +250,7 @@ void AreaTable_Init_DekuTree() {
              });
 
     areaTable[RR_DEKU_TREE_BOSS_ROOM] =
-        Area("Deku Tree Boss Room", "Deku Tree", RHT_NONE, NO_DAY_NIGHT_CYCLE,
+        Area("Deku Tree Boss Room", "Deku Tree", RA_NONE, NO_DAY_NIGHT_CYCLE,
              {
                  // Events
                  EventAccess(&DekuTreeClear, { [] {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp
index b758be53e..8730e672b 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp
@@ -10,7 +10,7 @@ void AreaTable_Init_DodongosCavern() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[RR_DODONGOS_CAVERN_ENTRYWAY] = Area("Dodongos Cavern Entryway", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_ENTRYWAY] = Area("Dodongos Cavern Entryway", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_BEGINNING,    {[]{return randoCtx->GetDungeon(DODONGOS_CAVERN)->IsVanilla();}}),
                   Entrance(RR_DODONGOS_CAVERN_MQ_BEGINNING, {[]{return randoCtx->GetDungeon(DODONGOS_CAVERN)->IsMQ();}}),
@@ -21,13 +21,13 @@ void AreaTable_Init_DodongosCavern() {
   |     VANILLA DUNGEON      |
   ---------------------------*/
   if (randoCtx->GetDungeon(DODONGOS_CAVERN)->IsVanilla()) {
-  areaTable[RR_DODONGOS_CAVERN_BEGINNING] = Area("Dodongos Cavern Beginning", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_BEGINNING] = Area("Dodongos Cavern Beginning", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_ENTRYWAY, {[]{return true;}}),
                   Entrance(RR_DODONGOS_CAVERN_LOBBY,    {[]{return Here(RR_DODONGOS_CAVERN_BEGINNING, []{return CanBlastOrSmash || GoronBracelet;});}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_LOBBY] = Area("Dodongos Cavern Lobby", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DODONGOS_CAVERN_LOBBY] = Area("Dodongos Cavern Lobby", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&GossipStoneFairy, {[]{return GossipStoneFairy || (CanSummonGossipFairy && Here(RR_DODONGOS_CAVERN_LOBBY, []{return CanBlastOrSmash || GoronBracelet;}));}}),
                 }, {
@@ -46,13 +46,13 @@ void AreaTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_BOSS_ENTRYWAY,{[]{return false;}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_LOBBY_SWITCH] = Area("Dodongos Cavern Lobby Switch", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_LOBBY_SWITCH] = Area("Dodongos Cavern Lobby Switch", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_LOBBY,        {[]{return true;}}),
                   Entrance(RR_DODONGOS_CAVERN_DODONGO_ROOM, {[]{return true;}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_SE_CORRIDOR] = Area("Dodongos Cavern SE Corridor", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_SE_CORRIDOR] = Area("Dodongos Cavern SE Corridor", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_DODONGOS_CAVERN_GS_SCARECROW, {[]{return CanUse(RG_SCARECROW) || (IsAdult && CanUse(RG_LONGSHOT)) || (randoCtx->GetTrickOption(RT_DC_SCARECROW_GS) && (CanAdultAttack || CanChildAttack));}}),
                 }, {
@@ -62,7 +62,7 @@ void AreaTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_NEAR_LOWER_LIZALFOS, {[]{return true;}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_SE_ROOM] = Area("Dodongos Cavern SE Room", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_SE_ROOM] = Area("Dodongos Cavern SE Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS, {[]{return CanAdultAttack || CanChildAttack;}}),
                 }, {
@@ -70,13 +70,13 @@ void AreaTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_SE_CORRIDOR, {[]{return true;}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_NEAR_LOWER_LIZALFOS] = Area("Dodongos Cavern Near Lower Lizalfos", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_NEAR_LOWER_LIZALFOS] = Area("Dodongos Cavern Near Lower Lizalfos", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_SE_CORRIDOR,    {[]{return true;}}),
                   Entrance(RR_DODONGOS_CAVERN_LOWER_LIZALFOS, {[]{return true;}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_LOWER_LIZALFOS] = Area("Dodongos Cavern Lower Lizalfos", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_LOWER_LIZALFOS] = Area("Dodongos Cavern Lower Lizalfos", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_NEAR_LOWER_LIZALFOS, {[]{return Here(RR_DODONGOS_CAVERN_LOWER_LIZALFOS, []{return CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_STICKS) || CanUse(RG_KOKIRI_SWORD) ||
                     CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_MEGATON_HAMMER) || HasExplosives;});}}),
@@ -84,14 +84,14 @@ void AreaTable_Init_DodongosCavern() {
                     CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_MEGATON_HAMMER) || HasExplosives;});}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_DODONGO_ROOM] = Area("Dodongos Cavern Dodongo Room", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_DODONGO_ROOM] = Area("Dodongos Cavern Dodongo Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_LOBBY_SWITCH,      {[]{return HasFireSourceWithTorch;}}),
                   Entrance(RR_DODONGOS_CAVERN_LOWER_LIZALFOS,    {[]{return true;}}),
                   Entrance(RR_DODONGOS_CAVERN_NEAR_DODONGO_ROOM, {[]{return Here(RR_DODONGOS_CAVERN_DODONGO_ROOM, []{return CanBlastOrSmash || GoronBracelet;});}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_NEAR_DODONGO_ROOM] = Area("Dodongos Cavern Near Dodongo Room", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_NEAR_DODONGO_ROOM] = Area("Dodongos Cavern Near Dodongo Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS, {[]{return CanStunDeku;}}),
                 }, {
@@ -99,14 +99,14 @@ void AreaTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_DODONGO_ROOM, {[]{return true;}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_STAIRS_LOWER] = Area("Dodongos Cavern Stairs Lower", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_STAIRS_LOWER] = Area("Dodongos Cavern Stairs Lower", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_LOBBY,        {[]{return true;}}),
                   Entrance(RR_DODONGOS_CAVERN_STAIRS_UPPER, {[]{return HasExplosives || GoronBracelet || CanUse(RG_DINS_FIRE) || (randoCtx->GetTrickOption(RT_DC_STAIRCASE) && CanUse(RG_FAIRY_BOW));}}),
                   Entrance(RR_DODONGOS_CAVERN_COMPASS_ROOM, {[]{return Here(RR_DODONGOS_CAVERN_STAIRS_LOWER, []{return CanBlastOrSmash || GoronBracelet;});}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_STAIRS_UPPER] = Area("Dodongos Cavern Stairs Upper", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_STAIRS_UPPER] = Area("Dodongos Cavern Stairs Upper", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS, {[]{return Here(RR_DODONGOS_CAVERN_FAR_BRIDGE, []{return HookshotOrBoomerang;}) || CanUse(RG_LONGSHOT);}}),
                   LocationAccess(RC_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS,  {[]{return IsAdult || CanChildAttack || (HasAccessTo(RR_DODONGOS_CAVERN_STAIRS_LOWER) && CanUse(RG_LONGSHOT) && randoCtx->GetTrickOption(RT_DC_VINES_GS));}}),
@@ -116,7 +116,7 @@ void AreaTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_ARMOS_ROOM,   {[]{return true;}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_COMPASS_ROOM] = Area("Dodongos Cavern Compass Room", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_COMPASS_ROOM] = Area("Dodongos Cavern Compass Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_DODONGOS_CAVERN_COMPASS_CHEST, {[]{return true;}}),
                 }, {
@@ -124,13 +124,13 @@ void AreaTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_STAIRS_LOWER, {[]{return CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_MEGATON_HAMMER) || HasExplosives || GoronBracelet;}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_ARMOS_ROOM] = Area("Dodongos Cavern Armos Room", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_ARMOS_ROOM] = Area("Dodongos Cavern Armos Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_STAIRS_UPPER,    {[]{return true;}}),
                   Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER, {[]{return true;}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER] = Area("Dodongos Cavern Bomb Room Lower", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER] = Area("Dodongos Cavern Bomb Room Lower", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST, {[]{return true;}}),
                 }, {
@@ -140,7 +140,7 @@ void AreaTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_UPPER,      {[]{return (IsAdult && randoCtx->GetTrickOption(RT_DC_JUMP)) || CanUse(RG_HOVER_BOOTS) || (IsAdult && CanUse(RG_LONGSHOT));}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_2F_SIDE_ROOM] = Area("Dodongos Cavern 2F Side Room", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_2F_SIDE_ROOM] = Area("Dodongos Cavern 2F Side Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,  {[]{return CanStunDeku;}}),
                   LocationAccess(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT, {[]{return CanStunDeku;}}),
@@ -149,13 +149,13 @@ void AreaTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER, {[]{return true;}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_FIRST_SLINGSHOT_ROOM] = Area("Dodongos Cavern First Slingshot Room", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_FIRST_SLINGSHOT_ROOM] = Area("Dodongos Cavern First Slingshot Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER, {[]{return true;}}),
                   Entrance(RR_DODONGOS_CAVERN_UPPER_LIZALFOS,  {[]{return CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || randoCtx->GetTrickOption(RT_DC_SLINGSHOT_SKIP);}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_UPPER_LIZALFOS] = Area("Dodongos Cavern Upper Lizalfos", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_UPPER_LIZALFOS] = Area("Dodongos Cavern Upper Lizalfos", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_LOWER_LIZALFOS,        {[]{return true;}}),
                   Entrance(RR_DODONGOS_CAVERN_FIRST_SLINGSHOT_ROOM,  {[]{return Here(RR_DODONGOS_CAVERN_LOWER_LIZALFOS, []{return CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_STICKS) || CanUse(RG_KOKIRI_SWORD) || 
@@ -164,13 +164,13 @@ void AreaTable_Init_DodongosCavern() {
                     CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_MEGATON_HAMMER) || HasExplosives;});}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_SECOND_SLINGSHOT_ROOM] = Area("Dodongos Cavern Second Slingshot Room", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_SECOND_SLINGSHOT_ROOM] = Area("Dodongos Cavern Second Slingshot Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_UPPER_LIZALFOS,  {[]{return true;}}),
                   Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_UPPER, {[]{return CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || randoCtx->GetTrickOption(RT_DC_SLINGSHOT_SKIP);}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_BOMB_ROOM_UPPER] = Area("Dodongos Cavern Bomb Room Upper", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_BOMB_ROOM_UPPER] = Area("Dodongos Cavern Bomb Room Upper", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_DODONGOS_CAVERN_BOMB_BAG_CHEST, {[]{return true;}}),
                 }, {
@@ -180,7 +180,7 @@ void AreaTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_FAR_BRIDGE,            {[]{return true;}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_FAR_BRIDGE] = Area("Dodongos Cavern Far Bridge", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_FAR_BRIDGE] = Area("Dodongos Cavern Far Bridge", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST, {[]{return Here(RR_DODONGOS_CAVERN_FAR_BRIDGE, []{return CanBlastOrSmash;});}}),
                 }, {
@@ -189,7 +189,7 @@ void AreaTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_UPPER, {[]{return true;}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_BOSS_AREA] = Area("Dodongos Cavern Boss Area", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DODONGOS_CAVERN_BOSS_AREA] = Area("Dodongos Cavern Boss Area", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FairyPot, {[]{return true;}}),
                 }, {}, {
@@ -199,7 +199,7 @@ void AreaTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_BOSS_ENTRYWAY, {[]{return true;}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_BACK_ROOM] = Area("Dodongos Cavern Back Room", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_BACK_ROOM] = Area("Dodongos Cavern Back Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_DODONGOS_CAVERN_GS_BACK_ROOM, {[]{return CanAdultAttack || CanChildAttack;}}),
                 }, {
@@ -212,13 +212,13 @@ void AreaTable_Init_DodongosCavern() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (randoCtx->GetDungeon(DODONGOS_CAVERN)->IsMQ()) {
-  areaTable[RR_DODONGOS_CAVERN_MQ_BEGINNING] = Area("Dodongos Cavern MQ Beginning", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_MQ_BEGINNING] = Area("Dodongos Cavern MQ Beginning", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_ENTRYWAY, {[]{return true;}}),
                   Entrance(RR_DODONGOS_CAVERN_MQ_LOBBY, {[]{return Here(RR_DODONGOS_CAVERN_MQ_BEGINNING, []{return CanBlastOrSmash || GoronBracelet;});}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_MQ_LOBBY] = Area("Dodongos Cavern MQ Lobby", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DODONGOS_CAVERN_MQ_LOBBY] = Area("Dodongos Cavern MQ Lobby", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&DekuBabaSticks,   {[]{return DekuBabaSticks || (IsAdult || KokiriSword || Boomerang);}}),
                   EventAccess(&GossipStoneFairy, {[]{return GossipStoneFairy || CanSummonGossipFairy;}}),
@@ -244,7 +244,7 @@ void AreaTable_Init_DodongosCavern() {
                     //Trick: HasExplosives || (LogicDCMQEyes && GoronBracelet && (IsAdult || LogicDCMQChildBack) && ((IsChild && CanUse(RG_STICKS)) || CanUse(RG_DINS_FIRE) || (IsAdult && (LogicDCJump || Hammer || HoverBoots || Hookshot))))
   });
 
-  areaTable[RR_DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE] = Area("Dodongos Cavern MQ Lower Right Side", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE] = Area("Dodongos Cavern MQ Lower Right Side", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS, {[]{return CanStunDeku;}}),
   }, {
@@ -254,7 +254,7 @@ void AreaTable_Init_DodongosCavern() {
                                                                                 IsChild && CanUse(RG_FAIRY_SLINGSHOT);}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_MQ_BOMB_BAG_AREA] = Area("Dodongos Cavern MQ Bomb Bag Area", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_MQ_BOMB_BAG_AREA] = Area("Dodongos Cavern MQ Bomb Bag Area", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST, {[]{return true;}}),
                   LocationAccess(RC_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM,  {[]{return (Here(RR_DODONGOS_CAVERN_MQ_BOMB_BAG_AREA, []{return IsAdult && CanUse(RG_FAIRY_BOW);}) ||  GoronBracelet || CanUse(RG_DINS_FIRE) || HasExplosives) && HookshotOrBoomerang;}}),
@@ -263,7 +263,7 @@ void AreaTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE, {[]{return true;}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_MQ_BOSS_AREA] = Area("Dodongos Cavern MQ BossArea", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DODONGOS_CAVERN_MQ_BOSS_AREA] = Area("Dodongos Cavern MQ BossArea", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FairyPot,            {[]{return true;}}),
   }, {
@@ -280,7 +280,7 @@ void AreaTable_Init_DodongosCavern() {
     |         BOSS ROOM         |
     ---------------------------*/
     areaTable[RR_DODONGOS_CAVERN_BOSS_ENTRYWAY] =
-        Area("Dodongos Cavern Boss Entryway", "Dodongos Cavern", RHT_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {},
+        Area("Dodongos Cavern Boss Entryway", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {},
              {
                  // Exits
                  Entrance(RR_DODONGOS_CAVERN_BOSS_AREA, { [] { return randoCtx->GetDungeon(DODONGOS_CAVERN)->IsVanilla(); } }),
@@ -289,7 +289,7 @@ void AreaTable_Init_DodongosCavern() {
              });
 
     areaTable[RR_DODONGOS_CAVERN_BOSS_ROOM] =
-        Area("Dodongos Cavern Boss Room", "Dodongos Cavern", RHT_NONE, NO_DAY_NIGHT_CYCLE,
+        Area("Dodongos Cavern Boss Room", "Dodongos Cavern", RA_NONE, NO_DAY_NIGHT_CYCLE,
              {
                  // Events
                  EventAccess(&DodongosCavernClear,
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp
index df3ddbbf0..6744ea651 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp
@@ -10,7 +10,7 @@ void AreaTable_Init_FireTemple() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[RR_FIRE_TEMPLE_ENTRYWAY] = Area("Fire Temple Entryway", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_ENTRYWAY] = Area("Fire Temple Entryway", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_FIRST_ROOM, {[]{return randoCtx->GetDungeon(FIRE_TEMPLE)->IsVanilla();}}),
                   Entrance(RR_FIRE_TEMPLE_MQ_LOWER,   {[]{return randoCtx->GetDungeon(FIRE_TEMPLE)->IsMQ();}}),
@@ -21,7 +21,7 @@ void AreaTable_Init_FireTemple() {
   |     VANILLA DUNGEON      |
   ---------------------------*/
   if (randoCtx->GetDungeon(FIRE_TEMPLE)->IsVanilla()) {
-  areaTable[RR_FIRE_TEMPLE_FIRST_ROOM] = Area("Fire Temple First Room", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_FIRST_ROOM] = Area("Fire Temple First Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                 }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_ENTRYWAY,       {[]{return true;}}),
@@ -31,7 +31,7 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM,  {[]{return SmallKeys(RR_FIRE_TEMPLE, 2) && FireTimer >= 24;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_NEAR_BOSS_ROOM] = Area("Fire Temple Near Boss Room", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FIRE_TEMPLE_NEAR_BOSS_ROOM] = Area("Fire Temple Near Boss Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FairyPot, {[]{return FairyPot || (CanUse(RG_HOVER_BOOTS) || CanUse(RG_HOOKSHOT));}}),
                 }, {
@@ -43,13 +43,13 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_BOSS_ENTRYWAY, {[]{return BossKeyFireTemple && ((IsAdult && randoCtx->GetTrickOption(RT_FIRE_BOSS_DOOR_JUMP)) || CanUse(RG_HOVER_BOOTS) || Here(RR_FIRE_TEMPLE_FIRE_MAZE_UPPER, []{return CanUse(RG_MEGATON_HAMMER);}));}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_LOOP_ENEMIES] = Area("Fire Temple Loop Enemies", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_LOOP_ENEMIES] = Area("Fire Temple Loop Enemies", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_FIRST_ROOM, {[]{return SmallKeys(RR_FIRE_TEMPLE, 8) || !IsKeysanity;}}),
                   Entrance(RR_FIRE_TEMPLE_LOOP_TILES, {[]{return Here(RR_FIRE_TEMPLE_LOOP_ENEMIES, []{return CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_MEGATON_HAMMER);});}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_LOOP_TILES] = Area("Fire Temple Loop Tiles", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_LOOP_TILES] = Area("Fire Temple Loop Tiles", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_FIRE_TEMPLE_GS_BOSS_KEY_LOOP, {[]{return CanAdultAttack || CanChildAttack;}}),
                 }, {
@@ -58,7 +58,7 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_LOOP_FLARE_DANCER, {[]{return true;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_LOOP_FLARE_DANCER] = Area("Fire Temple Loop Flare Dancer", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_LOOP_FLARE_DANCER] = Area("Fire Temple Loop Flare Dancer", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_FIRE_TEMPLE_FLARE_DANCER_CHEST, {[]{return (HasExplosives || CanUse(RG_MEGATON_HAMMER)) && IsAdult;}}),
                 }, {
@@ -68,7 +68,7 @@ void AreaTable_Init_FireTemple() {
                    CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_BOOMERANG)));});}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_LOOP_HAMMER_SWITCH] = Area("Fire Temple Loop Hammer Switch", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FIRE_TEMPLE_LOOP_HAMMER_SWITCH] = Area("Fire Temple Loop Hammer Switch", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FireLoopSwitch, {[]{return FireLoopSwitch || CanUse(RG_MEGATON_HAMMER);}}),
                 }, {}, {
@@ -77,7 +77,7 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_LOOP_GORON_ROOM,   {[]{return FireLoopSwitch;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_LOOP_GORON_ROOM] = Area("Fire Temple Loop Goron Room", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_LOOP_GORON_ROOM] = Area("Fire Temple Loop Goron Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_FIRE_TEMPLE_BOSS_KEY_CHEST, {[]{return true;}}),
                 }, {
@@ -86,13 +86,13 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_LOOP_EXIT,          {[]{return FireLoopSwitch;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_LOOP_EXIT] = Area("Fire Temple Loop Exit", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_LOOP_EXIT] = Area("Fire Temple Loop Exit", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_FIRST_ROOM,      {[]{return true;}}),
                   Entrance(RR_FIRE_TEMPLE_LOOP_GORON_ROOM, {[]{return FireLoopSwitch;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_BIG_LAVA_ROOM] = Area("Fire Temple Big Lava Room", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_BIG_LAVA_ROOM] = Area("Fire Temple Big Lava Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_FIRST_ROOM,                {[]{return SmallKeys(RR_FIRE_TEMPLE, 2);}}),
                   Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_GORON, {[]{return true;}}),
@@ -101,7 +101,7 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_FIRE_PILLAR_ROOM,          {[]{return SmallKeys(RR_FIRE_TEMPLE, 3);}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_GORON] = Area("Fire Temple Big Lava Room North Goron", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_GORON] = Area("Fire Temple Big Lava Room North Goron", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST, {[]{return true;}}),
                 }, {
@@ -109,7 +109,7 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM, {[]{return true;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_TILES] = Area("Fire Temple Big Lava Room North Tiles", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_TILES] = Area("Fire Temple Big Lava Room North Tiles", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM, {[]{return CanAdultAttack || HookshotOrBoomerang;}}),
                 }, {
@@ -117,7 +117,7 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM, {[]{return true;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_BIG_LAVA_ROOM_SOUTH_GORON] = Area("Fire Temple Big Lava Room South Goron", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_BIG_LAVA_ROOM_SOUTH_GORON] = Area("Fire Temple Big Lava Room South Goron", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST, {[]{return true;}}),
                 }, {
@@ -125,13 +125,13 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM, {[]{return true;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_FIRE_PILLAR_ROOM] = Area("Fire Temple Fire Pillar Room", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_FIRE_PILLAR_ROOM] = Area("Fire Temple Fire Pillar Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM, {[]{return SmallKeys(RR_FIRE_TEMPLE, 3);}}),
                   Entrance(RR_FIRE_TEMPLE_SHORTCUT_ROOM, {[]{return FireTimer >= 56 && SmallKeys(RR_FIRE_TEMPLE, 4);}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_SHORTCUT_ROOM] = Area("Fire Temple Shortcut Room", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_SHORTCUT_ROOM] = Area("Fire Temple Shortcut Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST, {[]{return Here(RR_FIRE_TEMPLE_SHORTCUT_CLIMB, []{return true;});}}),
                 }, {
@@ -141,13 +141,13 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER, {[]{return IsAdult && (GoronBracelet || randoCtx->GetTrickOption(RT_FIRE_STRENGTH)) && (HasExplosives || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_SLINGSHOT));}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_SHORTCUT_CLIMB] = Area("Fire Temple Shortcut Climb", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_SHORTCUT_CLIMB] = Area("Fire Temple Shortcut Climb", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_SHORTCUT_ROOM,      {[]{return true;}}),
                   Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_UPPER, {[]{return true;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER] = Area("Fire Temple Boulder Maze Lower", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER] = Area("Fire Temple Boulder Maze Lower", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST, {[]{return true;}}),
                   LocationAccess(RC_FIRE_TEMPLE_GS_BOULDER_MAZE,          {[]{return HasExplosives && (IsAdult || HookshotOrBoomerang);}}),
@@ -159,7 +159,7 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_UPPER,           {[]{return false;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER_SIDE_ROOM] = Area("Fire Temple Boulder Maze Lower Side Room", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER_SIDE_ROOM] = Area("Fire Temple Boulder Maze Lower Side Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST, {[]{return true;}}),
                 }, {
@@ -167,7 +167,7 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER, {[]{return true;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_EAST_CENTRAL_ROOM] = Area("Fire Temple East Central Room", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_EAST_CENTRAL_ROOM] = Area("Fire Temple East Central Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM,      {[]{return CanTakeDamage;}}),
                   Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER, {[]{return SmallKeys(RR_FIRE_TEMPLE, 5, 8);}}),
@@ -175,7 +175,7 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_MAP_AREA,           {[]{return CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW);}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_FIRE_WALL_CHASE] = Area("Fire Temple Fire Wall Chase", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_FIRE_WALL_CHASE] = Area("Fire Temple Fire Wall Chase", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_EAST_CENTRAL_ROOM,  {[]{return FireTimer >= 24 && SmallKeys(RR_FIRE_TEMPLE, 6, 8);}}),
                   Entrance(RR_FIRE_TEMPLE_MAP_AREA,           {[]{return IsAdult;}}),
@@ -183,7 +183,7 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_CORRIDOR,           {[]{return FireTimer >= 24 && IsAdult && SmallKeys(RR_FIRE_TEMPLE, 7);}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_MAP_AREA] = Area("Fire Temple Map Area", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_MAP_AREA] = Area("Fire Temple Map Area", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_FIRE_TEMPLE_MAP_CHEST, {[]{return true;}}),
                 }, {
@@ -191,7 +191,7 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_EAST_CENTRAL_ROOM, {[]{return true;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_BOULDER_MAZE_UPPER] = Area("Fire Temple Boulder Maze Upper", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_BOULDER_MAZE_UPPER] = Area("Fire Temple Boulder Maze Upper", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST, {[]{return true;}}),
                 }, {
@@ -202,7 +202,7 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_SCARECROW_ROOM,     {[]{return CanUse(RG_SCARECROW) || (randoCtx->GetTrickOption(RT_FIRE_SCARECROW) && IsAdult && CanUse(RG_LONGSHOT));}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_SCARECROW_ROOM] = Area("Fire Temple Scarecrow Room", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_SCARECROW_ROOM] = Area("Fire Temple Scarecrow Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_FIRE_TEMPLE_GS_SCARECROW_CLIMB, {[]{return CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOOMERANG) || HasExplosives || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_DINS_FIRE);}}),
                 }, {
@@ -211,7 +211,7 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_EAST_PEAK,          {[]{return true;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_EAST_PEAK] = Area("Fire Temple East Peak", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_EAST_PEAK] = Area("Fire Temple East Peak", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_FIRE_TEMPLE_SCARECROW_CHEST,  {[]{return true;}}),
                   LocationAccess(RC_FIRE_TEMPLE_GS_SCARECROW_TOP, {[]{return CanUseProjectile;}}),
@@ -221,13 +221,13 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_EAST_CENTRAL_ROOM, {[]{return CanTakeDamage;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_CORRIDOR] = Area("Fire Temple Corridor", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_CORRIDOR] = Area("Fire Temple Corridor", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_FIRE_WALL_CHASE, {[]{return SmallKeys(RR_FIRE_TEMPLE, 7);}}),
                   Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_ROOM,  {[]{return true;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_FIRE_MAZE_ROOM] = Area("Fire Temple Fire Maze Room", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_FIRE_MAZE_ROOM] = Area("Fire Temple Fire Maze Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_CORRIDOR,            {[]{return true;}}),
                   Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_UPPER,     {[]{return CanUse(RG_HOVER_BOOTS);}}),
@@ -236,14 +236,14 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_LATE_FIRE_MAZE,      {[]{return randoCtx->GetTrickOption(RT_FIRE_FLAME_MAZE) || false;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_FIRE_MAZE_UPPER] = Area("Fire Temple Fire Maze Upper", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_FIRE_MAZE_UPPER] = Area("Fire Temple Fire Maze Upper", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_NEAR_BOSS_ROOM,     {[]{return CanUse(RG_MEGATON_HAMMER);}}),
                   Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_ROOM,     {[]{return true;}}),
                   Entrance(RR_FIRE_TEMPLE_WEST_CENTRAL_UPPER, {[]{return CanUse(RG_MEGATON_HAMMER);}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_FIRE_MAZE_SIDE_ROOM] = Area("Fire Temple Fire Maze Side Room", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_FIRE_MAZE_SIDE_ROOM] = Area("Fire Temple Fire Maze Side Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_FIRE_TEMPLE_COMPASS_CHEST, {[]{return true;}}),
                 }, {
@@ -251,7 +251,7 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_ROOM, {[]{return true;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_WEST_CENTRAL_LOWER] = Area("Fire Temple West Central Lower", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_WEST_CENTRAL_LOWER] = Area("Fire Temple West Central Lower", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_FIRE_TEMPLE_HIGHEST_GORON_CHEST, {[]{return Here(RR_FIRE_TEMPLE_WEST_CENTRAL_UPPER, []{return (CanPlay(SongOfTime) || randoCtx->GetTrickOption(RT_RUSTED_SWITCHES)) && CanUse(RG_MEGATON_HAMMER);});}}),
                 }, {
@@ -261,21 +261,21 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_LATE_FIRE_MAZE,     {[]{return true;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_WEST_CENTRAL_UPPER] = Area("Fire Temple West Central Upper", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_WEST_CENTRAL_UPPER] = Area("Fire Temple West Central Upper", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_BOSS_ENTRYWAY,      {[]{return false;}}),
                   Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_UPPER,    {[]{return true;}}),
                   Entrance(RR_FIRE_TEMPLE_WEST_CENTRAL_LOWER, {[]{return true;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_LATE_FIRE_MAZE] = Area("Fire Temple Late Fire Maze", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_LATE_FIRE_MAZE] = Area("Fire Temple Late Fire Maze", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_ROOM,     {[]{return false;}}),
                   Entrance(RR_FIRE_TEMPLE_WEST_CENTRAL_LOWER, {[]{return true;}}),
                   Entrance(RR_FIRE_TEMPLE_UPPER_FLARE_DANCER, {[]{return HasExplosives;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_UPPER_FLARE_DANCER] = Area("Fire Temple Upper Flare Dancer", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_UPPER_FLARE_DANCER] = Area("Fire Temple Upper Flare Dancer", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_LATE_FIRE_MAZE, {[]{return Here(RR_FIRE_TEMPLE_UPPER_FLARE_DANCER, []{return CanUse(RG_MEGATON_HAMMER) || CanUse(RG_HOOKSHOT) || (HasExplosives && ((CanUse(RG_KOKIRI_SWORD)) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) ||
                    CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_BOOMERANG)));});}}),
@@ -283,13 +283,13 @@ void AreaTable_Init_FireTemple() {
                    CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOOMERANG)));});}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_WEST_CLIMB] = Area("Fire Temple West Climb", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_WEST_CLIMB] = Area("Fire Temple West Climb", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_UPPER_FLARE_DANCER, {[]{return true;}}),
                   Entrance(RR_FIRE_TEMPLE_WEST_PEAK,          {[]{return CanUseProjectile;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_WEST_PEAK] = Area("Fire Temple West Peak", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_WEST_PEAK] = Area("Fire Temple West Peak", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_FIRE_TEMPLE_MEGATON_HAMMER_CHEST, {[]{return true;}}),
                 }, {
@@ -299,12 +299,12 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_HAMMER_RETURN_PATH, {[]{return CanUse(RG_MEGATON_HAMMER);}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_HAMMER_RETURN_PATH] = Area("Fire Temple Hammer Return Path", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_HAMMER_RETURN_PATH] = Area("Fire Temple Hammer Return Path", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_ABOVE_FIRE_MAZE, {[]{return CanUse(RG_MEGATON_HAMMER);}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_ABOVE_FIRE_MAZE] = Area("Fire Temple Above Fire Maze", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_ABOVE_FIRE_MAZE] = Area("Fire Temple Above Fire Maze", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_HAMMER_RETURN_PATH, {[]{return true;}}),
                   Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_UPPER,    {[]{return CanUse(RG_MEGATON_HAMMER);}}),
@@ -315,7 +315,7 @@ void AreaTable_Init_FireTemple() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (randoCtx->GetDungeon(FIRE_TEMPLE)->IsMQ()) {
-  areaTable[RR_FIRE_TEMPLE_MQ_LOWER] = Area("Fire Temple MQ Lower", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_MQ_LOWER] = Area("Fire Temple MQ Lower", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST, {[]{return CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || Bombs || CanUse(RG_DINS_FIRE);}}),
                   LocationAccess(RC_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST,     {[]{return IsAdult && (randoCtx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS) || CanUse(RG_GORON_TUNIC)) && (((CanUse(RG_HOVER_BOOTS) || (randoCtx->GetTrickOption(RT_FIRE_MQ_NEAR_BOSS) && CanUse(RG_FAIRY_BOW))) && HasFireSource) || (CanUse(RG_HOOKSHOT) && CanUse(RG_FIRE_ARROWS) || (CanUse(RG_DINS_FIRE) && ((randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_OHKO) && randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_QUADRUPLE) && randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_OCTUPLE) && randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_SEXDECUPLE)) || CanUse(RG_GORON_TUNIC) || CanUse(RG_FAIRY_BOW) || CanUse(RG_LONGSHOT)))));}}),
@@ -328,7 +328,7 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM,     {[]{return IsAdult && FireTimer >= 24 && CanUse(RG_MEGATON_HAMMER);}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_MQ_LOWER_LOCKED_DOOR] = Area("Fire Temple MQ Lower Locked Door", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FIRE_TEMPLE_MQ_LOWER_LOCKED_DOOR] = Area("Fire Temple MQ Lower Locked Door", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FairyPot, {[]{return true;}}),
   }, {
@@ -337,7 +337,7 @@ void AreaTable_Init_FireTemple() {
                   LocationAccess(RC_FIRE_TEMPLE_MQ_MAP_CHEST,            {[]{return IsAdult && CanUse(RG_MEGATON_HAMMER);}}),
   }, {});
 
-  areaTable[RR_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM] = Area("Fire Temple MQ Big Lava Room", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM] = Area("Fire Temple MQ Big Lava Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FairyPot, {[]{return FairyPot || (HasFireSource && (Bow || randoCtx->GetTrickOption(RT_FIRE_MQ_BK_CHEST)) && IsAdult && (CanUse(RG_HOOKSHOT) || randoCtx->GetTrickOption(RT_FIRE_SOT)));}}),
                     //Trick: HasFireSource && (Bow || LogicFireMQBKChest) && IsAdult && (CanUse(RG_HOOKSHOT) || LogicFireSongOfTime)
@@ -354,7 +354,7 @@ void AreaTable_Init_FireTemple() {
                     //Trick: IsAdult && CanUse(RG_GORON_TUNIC) && SmallKeys(RR_FIRE_TEMPLE, 2) && (HasFireSource || (LogicFireMQClimb && HoverBoots))
   });
 
-  areaTable[RR_FIRE_TEMPLE_MQ_LOWER_MAZE] = Area("Fire Temple MQ Lower Maze", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_MQ_LOWER_MAZE] = Area("Fire Temple MQ Lower Maze", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST,     {[]{return CanUse(RG_MASTER_SWORD) || CanUse(RG_KOKIRI_SWORD) || CanUse(RG_BIGGORON_SWORD);}}),
                   LocationAccess(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST, {[]{return HasExplosives && (randoCtx->GetTrickOption(RT_FIRE_MQ_MAZE_SIDE_ROOM) || HasAccessTo(RR_FIRE_TEMPLE_MQ_UPPER_MAZE));}}),
@@ -365,7 +365,7 @@ void AreaTable_Init_FireTemple() {
                     //Trick: (IsAdult && ((HasExplosives && CanUse(RG_HOOKSHOT)) || (LogicFireMQMazeHovers && CanUse(RG_HOVER_BOOTS)))) || LogicFireMQMazeJump
   });
 
-  areaTable[RR_FIRE_TEMPLE_MQ_UPPER_MAZE] = Area("Fire Temple MQ Upper Maze", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FIRE_TEMPLE_MQ_UPPER_MAZE] = Area("Fire Temple MQ Upper Maze", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   //EventAccess(&WallFairy, {[]{return WallFairy || (IsAdult && (((CanPlay(SongOfTime) && CanUse(RG_HOOKSHOT) && HasExplosives) || CanUse(RG_LONGSHOT))));}}),
                   EventAccess(&FairyPot,  {[]{return SmallKeys(RR_FIRE_TEMPLE, 3);}}),
@@ -379,7 +379,7 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_MQ_UPPER, {[]{return SmallKeys(RR_FIRE_TEMPLE, 3) && IsAdult && ((CanUse(RG_FAIRY_BOW) && CanUse(RG_HOOKSHOT)) || CanUse(RG_FIRE_ARROWS));}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_MQ_UPPER] = Area("Fire Temple MQ Upper", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_MQ_UPPER] = Area("Fire Temple MQ Upper", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_FIRE_TEMPLE_MQ_FREESTANDING_KEY,            {[]{return ((CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOOMERANG)) && CanUse(RG_HOOKSHOT)) || randoCtx->GetTrickOption(RT_FIRE_MQ_FLAME_MAZE);}}),
                     //Trick: (IsAdult && CanUse(RG_HOOKSHOT)) || LogicFireMQFlameMaze
@@ -397,7 +397,7 @@ void AreaTable_Init_FireTemple() {
     |         BOSS ROOM         |
     ---------------------------*/
     areaTable[RR_FIRE_TEMPLE_BOSS_ENTRYWAY] =
-        Area("Fire Temple Boss Entryway", "Fire Temple", RHT_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
+        Area("Fire Temple Boss Entryway", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
              {
                  // Exits
                  Entrance(RR_FIRE_TEMPLE_NEAR_BOSS_ROOM, { [] { return randoCtx->GetDungeon(FIRE_TEMPLE)->IsVanilla() && false; } }),
@@ -406,7 +406,7 @@ void AreaTable_Init_FireTemple() {
              });
 
     areaTable[RR_FIRE_TEMPLE_BOSS_ROOM] =
-        Area("Fire Temple Boss Room", "Fire Temple", RHT_NONE, NO_DAY_NIGHT_CYCLE,
+        Area("Fire Temple Boss Room", "Fire Temple", RA_NONE, NO_DAY_NIGHT_CYCLE,
              {
                  // Events
                  EventAccess(&FireTempleClear,
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp
index 285f759dc..8c5bb0ff6 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp
@@ -10,7 +10,7 @@ void AreaTable_Init_ForestTemple() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[RR_FOREST_TEMPLE_ENTRYWAY] = Area("Forest Temple Entryway", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FOREST_TEMPLE_ENTRYWAY] = Area("Forest Temple Entryway", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_FIRST_ROOM, {[]{return randoCtx->GetDungeon(FOREST_TEMPLE)->IsVanilla();}}),
                   Entrance(RR_FOREST_TEMPLE_MQ_LOBBY,   {[]{return randoCtx->GetDungeon(FOREST_TEMPLE)->IsMQ();}}),
@@ -21,7 +21,7 @@ void AreaTable_Init_ForestTemple() {
   |     VANILLA DUNGEON      |
   ---------------------------*/
   if (randoCtx->GetDungeon(FOREST_TEMPLE)->IsVanilla()) {
-  areaTable[RR_FOREST_TEMPLE_FIRST_ROOM] = Area("Forest Temple First Room", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_FIRST_ROOM] = Area("Forest Temple First Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_FOREST_TEMPLE_FIRST_ROOM_CHEST, {[]{return true;}}),
                   LocationAccess(RC_FOREST_TEMPLE_GS_FIRST_ROOM,    {[]{return (IsAdult && Bombs) || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_BOOMERANG) || CanUse(RG_FAIRY_SLINGSHOT) || HasBombchus || CanUse(RG_DINS_FIRE) || (randoCtx->GetTrickOption(RT_FOREST_FIRST_GS) && (CanJumpslash || (IsChild && Bombs)));}}),
@@ -31,13 +31,13 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_SOUTH_CORRIDOR, {[]{return true;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_SOUTH_CORRIDOR] = Area("Forest Temple South Corridor", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FOREST_TEMPLE_SOUTH_CORRIDOR] = Area("Forest Temple South Corridor", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_FIRST_ROOM, {[]{return true;}}),
                   Entrance(RR_FOREST_TEMPLE_LOBBY,      {[]{return CanAdultAttack || CanChildAttack || Nuts;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_LOBBY] = Area("Forest Temple Lobby", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_LOBBY] = Area("Forest Temple Lobby", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&ForestTempleMeg, {[]{return ForestTempleMeg || (ForestTempleJoelle && ForestTempleBeth && ForestTempleAmy && CanUse(RG_FAIRY_BOW));}}),
                 }, {
@@ -55,13 +55,13 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_BOSS_ENTRYWAY,     {[]{return false;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_NORTH_CORRIDOR] = Area("Forest Temple North Corridor", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FOREST_TEMPLE_NORTH_CORRIDOR] = Area("Forest Temple North Corridor", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_LOBBY,         {[]{return true;}}),
                   Entrance(RR_FOREST_TEMPLE_LOWER_STALFOS, {[]{return true;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_LOWER_STALFOS] = Area("Forest Temple Lower Stalfos", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_LOWER_STALFOS] = Area("Forest Temple Lower Stalfos", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FairyPot, {[]{return true;}}),
                 }, {
@@ -72,7 +72,7 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_NORTH_CORRIDOR, {[]{return true;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_NW_OUTDOORS_LOWER] = Area("Forest Temple NW Outdoors Lower", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_NW_OUTDOORS_LOWER] = Area("Forest Temple NW Outdoors Lower", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_BOOMERANG));}}),
                   EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_MEGATON_HAMMER) || HasExplosives || CanUse(RG_DINS_FIRE));}}),
@@ -88,7 +88,7 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_BOSS_ENTRYWAY,     {[]{return false;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER] = Area("Forest Temple NW Outdoors Upper", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER] = Area("Forest Temple NW Outdoors Upper", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_BOOMERANG));}}),
                   EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_MEGATON_HAMMER) || HasExplosives || CanUse(RG_DINS_FIRE));}}),
@@ -100,7 +100,7 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_BLOCK_PUSH_ROOM,      {[]{return true;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_NE_OUTDOORS_LOWER] = Area("Forest Temple NE Outdoors Lower", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_NE_OUTDOORS_LOWER] = Area("Forest Temple NE Outdoors Lower", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_BOOMERANG));}}),
                   EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_MEGATON_HAMMER) || HasExplosives || CanUse(RG_DINS_FIRE));}}),
@@ -116,7 +116,7 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_FALLING_ROOM,      {[]{return false;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER] = Area("Forest Temple NE Outdoors Upper", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER] = Area("Forest Temple NE Outdoors Upper", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_BOOMERANG));}}),
                   EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_MEGATON_HAMMER) || HasExplosives || CanUse(RG_DINS_FIRE));}}),
@@ -127,7 +127,7 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_FALLING_ROOM,      {[]{return randoCtx->GetTrickOption(RT_FOREST_DOORFRAME) && CanJumpslash && CanUse(RG_HOVER_BOOTS) && CanUse(RG_SCARECROW);}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_MAP_ROOM] = Area("Forest Temple Map Room", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_MAP_ROOM] = Area("Forest Temple Map Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_FOREST_TEMPLE_MAP_CHEST, {[]{return Here(RR_FOREST_TEMPLE_MAP_ROOM, []{return HasExplosives || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_FAIRY_BOW) || ((CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT)) && (Nuts || HookshotOrBoomerang || CanShield));});}}),
                 }, {
@@ -136,7 +136,7 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER, {[]{return Here(RR_FOREST_TEMPLE_MAP_ROOM, []{return HasExplosives || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_FAIRY_BOW) || ((CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT)) && (Nuts || HookshotOrBoomerang || CanShield));});}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_SEWER] = Area("Forest Temple Sewer", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_SEWER] = Area("Forest Temple Sewer", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_FOREST_TEMPLE_WELL_CHEST, {[]{return HasAccessTo(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER);}}),
                 }, {
@@ -145,12 +145,12 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_NE_OUTDOORS_LOWER, {[]{return true;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_BELOW_BOSS_KEY_CHEST] = Area("Forest Temple Below Boss Key Chest", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FOREST_TEMPLE_BELOW_BOSS_KEY_CHEST] = Area("Forest Temple Below Boss Key Chest", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER, {[]{return Here(RR_FOREST_TEMPLE_BELOW_BOSS_KEY_CHEST, []{return HasExplosives || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_FAIRY_BOW) || ((CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT)) && (Nuts || HookshotOrBoomerang || CanShield));});}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_FLOORMASTER_ROOM] = Area("Forest Temple Floormaster Room", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_FLOORMASTER_ROOM] = Area("Forest Temple Floormaster Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_FOREST_TEMPLE_FLOORMASTER_CHEST, {[]{return CanAdultDamage || CanChildDamage;}}),
                 }, {
@@ -158,13 +158,13 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER, {[]{return true;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_WEST_CORRIDOR] = Area("Forest Temple West Corridor", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FOREST_TEMPLE_WEST_CORRIDOR] = Area("Forest Temple West Corridor", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_LOBBY,           {[]{return SmallKeys(RR_FOREST_TEMPLE, 1, 5);}}),
                   Entrance(RR_FOREST_TEMPLE_BLOCK_PUSH_ROOM, {[]{return CanAdultAttack || CanChildAttack || Nuts;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_BLOCK_PUSH_ROOM] = Area("Forest Temple Block Push Room", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_BLOCK_PUSH_ROOM] = Area("Forest Temple Block Push Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_FOREST_TEMPLE_EYE_SWITCH_CHEST, {[]{return GoronBracelet && (CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT));}}),
                 }, {
@@ -175,13 +175,13 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_NW_CORRIDOR_STRAIGHTENED, {[]{return (CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT)) && GoronBracelet && SmallKeys(RR_FOREST_TEMPLE, 2);}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_NW_CORRIDOR_TWISTED] = Area("Forest Temple NW Corridor Twisted", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FOREST_TEMPLE_NW_CORRIDOR_TWISTED] = Area("Forest Temple NW Corridor Twisted", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_BLOCK_PUSH_ROOM, {[]{return SmallKeys(RR_FOREST_TEMPLE, 2);}}),
                   Entrance(RR_FOREST_TEMPLE_RED_POE_ROOM,    {[]{return SmallKeys(RR_FOREST_TEMPLE, 3);}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_NW_CORRIDOR_STRAIGHTENED] = Area("Forest Temple NW Corridor Straightened", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_NW_CORRIDOR_STRAIGHTENED] = Area("Forest Temple NW Corridor Straightened", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_FOREST_TEMPLE_BOSS_KEY_CHEST, {[]{return true;}}),
                 }, {
@@ -190,7 +190,7 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_BLOCK_PUSH_ROOM,      {[]{return SmallKeys(RR_FOREST_TEMPLE, 2);}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_RED_POE_ROOM] = Area("Forest Temple Red Poe Room", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_RED_POE_ROOM] = Area("Forest Temple Red Poe Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&ForestTempleJoelle, {[]{return ForestTempleJoelle || CanUse(RG_FAIRY_BOW);}}),
                 }, {
@@ -202,7 +202,7 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_UPPER_STALFOS,       {[]{return true;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_UPPER_STALFOS] = Area("Forest Temple Upper Stalfos", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_UPPER_STALFOS] = Area("Forest Temple Upper Stalfos", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_FOREST_TEMPLE_BOW_CHEST, {[]{return CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_MEGATON_HAMMER);}}),
                 }, {
@@ -211,7 +211,7 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_BLUE_POE_ROOM, {[]{return CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_MEGATON_HAMMER);}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_BLUE_POE_ROOM] = Area("Forest Temple Blue Poe Room", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_BLUE_POE_ROOM] = Area("Forest Temple Blue Poe Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&ForestTempleBeth, {[]{return ForestTempleBeth || CanUse(RG_FAIRY_BOW);}}),
                 }, {
@@ -223,25 +223,25 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_NE_CORRIDOR_STRAIGHTENED, {[]{return SmallKeys(RR_FOREST_TEMPLE, 4);}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_NE_CORRIDOR_STRAIGHTENED] = Area("Forest Temple NE Corridor Straightened", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FOREST_TEMPLE_NE_CORRIDOR_STRAIGHTENED] = Area("Forest Temple NE Corridor Straightened", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_BLUE_POE_ROOM,   {[]{return SmallKeys(RR_FOREST_TEMPLE, 4);}}),
                   Entrance(RR_FOREST_TEMPLE_FROZEN_EYE_ROOM, {[]{return SmallKeys(RR_FOREST_TEMPLE, 5);}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_NE_CORRIDOR_TWISTED] = Area("Forest Temple NE Corridor Twisted", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FOREST_TEMPLE_NE_CORRIDOR_TWISTED] = Area("Forest Temple NE Corridor Twisted", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_FROZEN_EYE_ROOM, {[]{return SmallKeys(RR_FOREST_TEMPLE, 5);}}),
                   Entrance(RR_FOREST_TEMPLE_FALLING_ROOM,    {[]{return true;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_FROZEN_EYE_ROOM] = Area("Forest Temple Frozen Eye Room", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FOREST_TEMPLE_FROZEN_EYE_ROOM] = Area("Forest Temple Frozen Eye Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_NE_CORRIDOR_STRAIGHTENED, {[]{return SmallKeys(RR_FOREST_TEMPLE, 5);}}),
                   Entrance(RR_FOREST_TEMPLE_NE_CORRIDOR_TWISTED,      {[]{return SmallKeys(RR_FOREST_TEMPLE, 5) && (CanUse(RG_FAIRY_BOW) || CanUse(RG_DINS_FIRE));}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_FALLING_ROOM] = Area("Forest Temple Falling Room", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_FALLING_ROOM] = Area("Forest Temple Falling Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST, {[]{return true;}}),
                 }, {
@@ -250,7 +250,7 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_GREEN_POE_ROOM,    {[]{return true;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_GREEN_POE_ROOM] = Area("Forest Temple Green Poe Room", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_GREEN_POE_ROOM] = Area("Forest Temple Green Poe Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&ForestTempleAmy, {[]{return ForestTempleAmy || CanUse(RG_FAIRY_BOW);}}),
                 }, {}, {
@@ -259,13 +259,13 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_EAST_CORRIDOR, {[]{return ForestTempleAmy;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_EAST_CORRIDOR] = Area("Forest Temple East Corridor", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FOREST_TEMPLE_EAST_CORRIDOR] = Area("Forest Temple East Corridor", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_LOBBY,          {[]{return CanAdultAttack || CanChildAttack || Nuts;}}),
                   Entrance(RR_FOREST_TEMPLE_GREEN_POE_ROOM, {[]{return CanAdultAttack || CanChildAttack || Nuts;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_BOSS_REGION] = Area("Forest Temple Boss Region", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_BOSS_REGION] = Area("Forest Temple Boss Region", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_FOREST_TEMPLE_BASEMENT_CHEST, {[]{return true;}}),
                   LocationAccess(RC_FOREST_TEMPLE_GS_BASEMENT,    {[]{return HookshotOrBoomerang;}}),
@@ -280,7 +280,7 @@ void AreaTable_Init_ForestTemple() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (randoCtx->GetDungeon(FOREST_TEMPLE)->IsMQ()) {
-  areaTable[RR_FOREST_TEMPLE_MQ_LOBBY] = Area("Forest Temple MQ Lobby", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_MQ_LOBBY] = Area("Forest Temple MQ Lobby", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST, {[]{return CanJumpslash || Bombs || CanUse(RG_STICKS) || Nuts || HookshotOrBoomerang || CanUse(RG_DINS_FIRE) || KokiriSword || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOVER_BOOTS);}}),
                   LocationAccess(RC_FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY, {[]{return HookshotOrBoomerang;}}),
@@ -290,7 +290,7 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_MQ_CENTRAL_AREA, {[]{return SmallKeys(RR_FOREST_TEMPLE, 1) && (CanAdultAttack || CanChildAttack || Nuts);}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_MQ_CENTRAL_AREA] = Area("Forest Temple MQ Central Area", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_MQ_CENTRAL_AREA] = Area("Forest Temple MQ Central Area", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FairyPot, {[]{return true;}}),
   }, {
@@ -308,7 +308,7 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_MQ_BOSS_REGION,        {[]{return ForestTempleJoAndBeth && ForestTempleAmyAndMeg;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_MQ_AFTER_BLOCK_PUZZLE] = Area("Forest Temple MQ After Block Puzzle", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_MQ_AFTER_BLOCK_PUZZLE] = Area("Forest Temple MQ After Block Puzzle", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_FOREST_TEMPLE_MQ_BOSS_KEY_CHEST, {[]{return SmallKeys(RR_FOREST_TEMPLE, 3);}}),
   }, {
@@ -319,7 +319,7 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_MQ_NW_OUTDOORS,   {[]{return SmallKeys(RR_FOREST_TEMPLE, 2);}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_MQ_OUTDOOR_LEDGE] = Area("Forest Temple MQ Outdoor Ledge", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_MQ_OUTDOOR_LEDGE] = Area("Forest Temple MQ Outdoor Ledge", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_FOREST_TEMPLE_MQ_REDEAD_CHEST, {[]{return CanJumpslash;}}),
   }, {
@@ -327,7 +327,7 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_MQ_NW_OUTDOORS, {[]{return true;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_MQ_NW_OUTDOORS] = Area("Forest Temple MQ NW Outdoors", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_MQ_NW_OUTDOORS] = Area("Forest Temple MQ NW Outdoors", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD, {[]{return CanAdultAttack || CanChildAttack;}}),
   }, {
@@ -337,7 +337,7 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_MQ_OUTDOORS_TOP_LEDGES, {[]{return IsAdult && CanUse(RG_FIRE_ARROWS);}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_MQ_NE_OUTDOORS] = Area("Forest Temple MQ NE Outdoors", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_MQ_NE_OUTDOORS] = Area("Forest Temple MQ NE Outdoors", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_BOOMERANG));}}),
                   EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_MEGATON_HAMMER) || HasExplosives || CanUse(RG_DINS_FIRE));}}),
@@ -352,7 +352,7 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_MQ_NE_OUTDOORS_LEDGE,   {[]{return IsAdult && CanUse(RG_LONGSHOT);}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_MQ_OUTDOORS_TOP_LEDGES] = Area("Forest Temple MQ Outdoors Top Ledges", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_MQ_OUTDOORS_TOP_LEDGES] = Area("Forest Temple MQ Outdoors Top Ledges", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST, {[]{return true;}}),
   }, {
@@ -362,7 +362,7 @@ void AreaTable_Init_ForestTemple() {
                     //Trick: LogicForestOutdoorsLedge && IsAdult && CanUse(RG_HOVER_BOOTS)
   });
 
-  areaTable[RR_FOREST_TEMPLE_MQ_NE_OUTDOORS_LEDGE] = Area("Forest Temple MQ NE Outdoors Ledge", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_MQ_NE_OUTDOORS_LEDGE] = Area("Forest Temple MQ NE Outdoors Ledge", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST, {[]{return true;}}),
   }, {
@@ -371,7 +371,7 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_MQ_FALLING_ROOM, {[]{return CanPlay(SongOfTime);}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_MQ_BOW_REGION] = Area("Forest Temple MQ Bow Region", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_MQ_BOW_REGION] = Area("Forest Temple MQ Bow Region", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&ForestTempleJoAndBeth, {[]{return ForestTempleJoAndBeth || (IsAdult && CanUse(RG_FAIRY_BOW));}}),
   }, {
@@ -384,7 +384,7 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_MQ_FALLING_ROOM, {[]{return SmallKeys(RR_FOREST_TEMPLE, 5) && ((IsAdult && CanUse(RG_FAIRY_BOW)) || CanUse(RG_DINS_FIRE));}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_MQ_FALLING_ROOM] = Area("Forest Temple MQ Falling Room", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_MQ_FALLING_ROOM] = Area("Forest Temple MQ Falling Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&ForestTempleAmyAndMeg, {[]{return ForestTempleAmyAndMeg || (IsAdult && CanUse(RG_FAIRY_BOW) && SmallKeys(RR_FOREST_TEMPLE, 6));}}),
   }, {
@@ -395,7 +395,7 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_MQ_NE_OUTDOORS_LEDGE, {[]{return true;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_MQ_BOSS_REGION] = Area("Forest Temple MQ Boss Region", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_MQ_BOSS_REGION] = Area("Forest Temple MQ Boss Region", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_FOREST_TEMPLE_MQ_BASEMENT_CHEST,   {[]{return true;}}),
   }, {
@@ -408,7 +408,7 @@ void AreaTable_Init_ForestTemple() {
     |         BOSS ROOM         |
     ---------------------------*/
     areaTable[RR_FOREST_TEMPLE_BOSS_ENTRYWAY] =
-        Area("Forest Temple Boss Entryway", "Forest Temple", RHT_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
+        Area("Forest Temple Boss Entryway", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
              {
                  // Exits
                  Entrance(RR_FOREST_TEMPLE_BOSS_REGION, { [] { return randoCtx->GetDungeon(FOREST_TEMPLE)->IsVanilla() && false; } }),
@@ -417,7 +417,7 @@ void AreaTable_Init_ForestTemple() {
              });
 
     areaTable[RR_FOREST_TEMPLE_BOSS_ROOM] = Area(
-        "Forest Temple Boss Room", "Forest Temple", RHT_NONE, NO_DAY_NIGHT_CYCLE,
+        "Forest Temple Boss Room", "Forest Temple", RA_NONE, NO_DAY_NIGHT_CYCLE,
         {
             // Events
             EventAccess(&ForestTempleClear, { [] {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
index 52c4b378b..ee8a08a44 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
@@ -11,7 +11,7 @@ void AreaTable_Init_GanonsCastle() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[RR_GANONS_CASTLE_ENTRYWAY] = Area("Ganon's Castle Entryway", "Ganon's Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_GANONS_CASTLE_ENTRYWAY] = Area("Ganon's Castle Entryway", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_GANONS_CASTLE_LOBBY,    {[]{return randoCtx->GetDungeon(GANONS_CASTLE)->IsVanilla();}}),
                   Entrance(RR_GANONS_CASTLE_MQ_LOBBY, {[]{return randoCtx->GetDungeon(GANONS_CASTLE)->IsMQ();}}),
@@ -22,7 +22,7 @@ void AreaTable_Init_GanonsCastle() {
   |     VANILLA DUNGEON      |
   ---------------------------*/
   if (randoCtx->GetDungeon(GANONS_CASTLE)->IsVanilla()) {
-  areaTable[RR_GANONS_CASTLE_LOBBY] = Area("Ganon's Castle Lobby", "Ganon's Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GANONS_CASTLE_LOBBY] = Area("Ganon's Castle Lobby", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_SHEIK_HINT_GC,  {[]{return true;}}), 
                 }, {
@@ -43,7 +43,7 @@ void AreaTable_Init_GanonsCastle() {
                   Entrance(RR_GANONS_CASTLE_DEKU_SCRUBS,  {[]{return randoCtx->GetTrickOption(RT_LENS_GANON) || CanUse(RG_LENS_OF_TRUTH);}}),
   });
 
-  areaTable[RR_GANONS_CASTLE_DEKU_SCRUBS] = Area("Ganon's Castle Deku Scrubs", "Ganon's Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_DEKU_SCRUBS] = Area("Ganon's Castle Deku Scrubs", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FreeFairies, {[]{return true;}}),
                 }, {
@@ -54,7 +54,7 @@ void AreaTable_Init_GanonsCastle() {
                   LocationAccess(RC_GANONS_CASTLE_DEKU_SCRUB_LEFT,         {[]{return CanStunDeku;}}),
   }, {});
 
-  areaTable[RR_GANONS_CASTLE_FOREST_TRIAL] = Area("Ganon's Castle Forest Trial", "Ganon's Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_FOREST_TRIAL] = Area("Ganon's Castle Forest Trial", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&ForestTrialClear, {[]{return CanUse(RG_LIGHT_ARROWS) && (FireArrows || DinsFire);}}),
                 }, {
@@ -62,12 +62,12 @@ void AreaTable_Init_GanonsCastle() {
                   LocationAccess(RC_GANONS_CASTLE_FOREST_TRIAL_CHEST, {[]{return CanAdultDamage || CanChildDamage;}}),
   }, {});
 
-  areaTable[RR_GANONS_CASTLE_FIRE_TRIAL] = Area("Ganon's Castle Fire Trial", "Ganon's Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_FIRE_TRIAL] = Area("Ganon's Castle Fire Trial", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FireTrialClear, {[]{return CanUse(RG_GORON_TUNIC) && CanUse(RG_GOLDEN_GAUNTLETS) && CanUse(RG_LIGHT_ARROWS) && CanUse(RG_LONGSHOT);}}),
   }, {}, {});
 
-  areaTable[RR_GANONS_CASTLE_WATER_TRIAL] = Area("Ganon's Castle Water Trial", "Ganon's Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_WATER_TRIAL] = Area("Ganon's Castle Water Trial", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&BlueFireAccess,  {[]{return BlueFireAccess || HasBottle;}}),
                   EventAccess(&FairyPot,        {[]{return FairyPot || BlueFire;}}),
@@ -78,7 +78,7 @@ void AreaTable_Init_GanonsCastle() {
                   LocationAccess(RC_GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST, {[]{return true;}}),
   }, {});
 
-  areaTable[RR_GANONS_CASTLE_SHADOW_TRIAL] = Area("Ganon's Castle Shadow Trial", "Ganon's Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_SHADOW_TRIAL] = Area("Ganon's Castle Shadow Trial", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&ShadowTrialClear, {[]{return CanUse(RG_LIGHT_ARROWS) && CanUse(RG_MEGATON_HAMMER) && ((FireArrows && (randoCtx->GetTrickOption(RT_LENS_GANON) || CanUse(RG_LENS_OF_TRUTH))) || (CanUse(RG_LONGSHOT) && (CanUse(RG_HOVER_BOOTS) || (DinsFire && (randoCtx->GetTrickOption(RT_LENS_GANON) || CanUse(RG_LENS_OF_TRUTH))))));}}),
                 }, {
@@ -87,7 +87,7 @@ void AreaTable_Init_GanonsCastle() {
                   LocationAccess(RC_GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST, {[]{return CanUse(RG_FIRE_ARROWS) || (CanUse(RG_LONGSHOT) && (CanUse(RG_HOVER_BOOTS) || CanUse(RG_DINS_FIRE)));}}),
   }, {});
 
-  areaTable[RR_GANONS_CASTLE_SPIRIT_TRIAL] = Area("Ganon's Castle Spirit Trial", "Ganon's Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_SPIRIT_TRIAL] = Area("Ganon's Castle Spirit Trial", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&NutPot,           {[]{return NutPot || (((randoCtx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) && CanJumpslash) || CanUse(RG_HOOKSHOT)) && HasBombchus && CanUse(RG_FAIRY_BOW) && (CanUse(RG_MIRROR_SHIELD) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && CanUse(RG_LIGHT_ARROWS))));}}),
                   EventAccess(&SpiritTrialClear, {[]{return CanUse(RG_LIGHT_ARROWS) && (CanUse(RG_MIRROR_SHIELD) || randoCtx->GetOption(RSK_SUNLIGHT_ARROWS)) && HasBombchus && ((randoCtx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) && CanJumpslash) || CanUse(RG_HOOKSHOT));}}),
@@ -97,7 +97,7 @@ void AreaTable_Init_GanonsCastle() {
                   LocationAccess(RC_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST,      {[]{return (randoCtx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) || CanUse(RG_HOOKSHOT)) && HasBombchus && (randoCtx->GetTrickOption(RT_LENS_GANON) || CanUse(RG_LENS_OF_TRUTH));}}),
   }, {});
 
-  areaTable[RR_GANONS_CASTLE_LIGHT_TRIAL] = Area("Ganon's Castle Light Trial", "Ganon's Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_LIGHT_TRIAL] = Area("Ganon's Castle Light Trial", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&LightTrialClear, {[]{return CanUse(RG_LIGHT_ARROWS) && CanUse(RG_HOOKSHOT) && SmallKeys(RR_GANONS_CASTLE, 2) && (randoCtx->GetTrickOption(RT_LENS_GANON) || CanUse(RG_LENS_OF_TRUTH));}}),
                 }, {
@@ -113,7 +113,7 @@ void AreaTable_Init_GanonsCastle() {
   }, {});
   }
 
-  areaTable[RR_GANONS_CASTLE_TOWER] = Area("Ganon's Castle Tower", "Ganons Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GANONS_CASTLE_TOWER] = Area("Ganon's Castle Tower", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_GANONS_TOWER_BOSS_KEY_CHEST, {[]{return CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD);}}),
                   LocationAccess(RC_GANONDORF_HINT,              {[]{return BossKeyGanonsCastle && (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD));}}),
@@ -124,7 +124,7 @@ void AreaTable_Init_GanonsCastle() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (randoCtx->GetDungeon(GANONS_CASTLE)->IsMQ()) {
-  areaTable[RR_GANONS_CASTLE_MQ_LOBBY] = Area("Ganon's Castle MQ Lobby", "Ganons Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GANONS_CASTLE_MQ_LOBBY] = Area("Ganon's Castle MQ Lobby", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_SHEIK_HINT_MQ_GC,  {[]{return true;}}),
                 }, {
@@ -145,7 +145,7 @@ void AreaTable_Init_GanonsCastle() {
                   Entrance(RR_GANONS_CASTLE_MQ_DEKU_SCRUBS,  {[]{return randoCtx->GetTrickOption(RT_LENS_GANON_MQ) || CanUse(RG_LENS_OF_TRUTH);}}),
   });
 
-  areaTable[RR_GANONS_CASTLE_MQ_DEKU_SCRUBS] = Area("Ganon's Castle MQ Deku Scrubs", "Ganon's Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_MQ_DEKU_SCRUBS] = Area("Ganon's Castle MQ Deku Scrubs", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FreeFairies, {[]{return true;}}),
   }, {
@@ -157,7 +157,7 @@ void AreaTable_Init_GanonsCastle() {
                   LocationAccess(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,        {[]{return CanStunDeku;}}),
   }, {});
 
-  areaTable[RR_GANONS_CASTLE_MQ_FOREST_TRIAL] = Area("Ganon's Castle MQ Forest Trial", "Ganons Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_MQ_FOREST_TRIAL] = Area("Ganon's Castle MQ Forest Trial", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&ForestTrialClear, {[]{return IsAdult && CanUse(RG_LIGHT_ARROWS) && (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) && CanPlay(SongOfTime);}}),
   }, {
@@ -167,13 +167,13 @@ void AreaTable_Init_GanonsCastle() {
                   LocationAccess(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY,        {[]{return (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) && HookshotOrBoomerang;}}),
   }, {});
 
-  areaTable[RR_GANONS_CASTLE_MQ_FIRE_TRIAL] = Area("Ganon's Castle MQ Fire Trial", "Ganons Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_MQ_FIRE_TRIAL] = Area("Ganon's Castle MQ Fire Trial", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FireTrialClear, {[]{return CanUse(RG_GORON_TUNIC) && CanUse(RG_GOLDEN_GAUNTLETS) && CanUse(RG_LIGHT_ARROWS) && (CanUse(RG_LONGSHOT) || HoverBoots || (randoCtx->GetTrickOption(RT_GANON_MQ_FIRE_TRIAL) && CanUse(RG_HOOKSHOT)));}}),
                     //Trick: CanUse(RG_GORON_TUNIC) && CanUse(RG_GOLDEN_GAUNTLETS) && CanUse(RG_LIGHT_ARROWS) && (CanUse(RG_LONGSHOT) || HoverBoots || (LogicFireTrialMQ && CanUse(RG_HOOKSHOT)))
   }, {}, {});
 
-  areaTable[RR_GANONS_CASTLE_MQ_WATER_TRIAL] = Area("Ganon's Castle MQ Water Trial", "Ganons Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_MQ_WATER_TRIAL] = Area("Ganon's Castle MQ Water Trial", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&WaterTrialClear, {[]{return BlueFire && IsAdult && CanUse(RG_LIGHT_ARROWS) && SmallKeys(RR_GANONS_CASTLE, 3);}}),
                   EventAccess(&BlueFireAccess,  {[]{return BlueFireAccess || (HasBottle && CanJumpslash);}}),
@@ -182,7 +182,7 @@ void AreaTable_Init_GanonsCastle() {
                   LocationAccess(RC_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST, {[]{return BlueFire;}}),
   }, {});
 
-  areaTable[RR_GANONS_CASTLE_MQ_SHADOW_TRIAL] = Area("Ganon's Castle MQ Shadow Trial", "Ganons Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_MQ_SHADOW_TRIAL] = Area("Ganon's Castle MQ Shadow Trial", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&ShadowTrialClear, {[]{return IsAdult && CanUse(RG_LIGHT_ARROWS) && (randoCtx->GetTrickOption(RT_LENS_GANON_MQ) || CanUse(RG_LENS_OF_TRUTH)) && (HoverBoots || (Hookshot && (HasFireSource || randoCtx->GetTrickOption(RT_GANON_MQ_SHADOW_TRIAL))));}}),
                     //Trick: IsAdult && CanUse(RG_LIGHT_ARROWS) && (LogicLensCastleMQ || CanUse(RG_LENS_OF_TRUTH)) && (HoverBoots || (Hookshot && (HasFireSource || LogicShadowTrialMQ)))
@@ -193,7 +193,7 @@ void AreaTable_Init_GanonsCastle() {
                     //Trick: IsAdult && Bow && (LogicLensCastleMQ || CanUse(RG_LENS_OF_TRUTH)) && (HoverBoots || (Hookshot && (HasFireSource || LogicShadowTrialMQ)))
   }, {});
 
-  areaTable[RR_GANONS_CASTLE_MQ_SPIRIT_TRIAL] = Area("Ganon's Castle MQ Spirit Castle", "Ganons Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_MQ_SPIRIT_TRIAL] = Area("Ganon's Castle MQ Spirit Castle", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&SpiritTrialClear, {[]{return IsAdult && CanUse(RG_LIGHT_ARROWS) && Hammer && HasBombchus && ((FireArrows && MirrorShield) || randoCtx->GetOption(RSK_SUNLIGHT_ARROWS));}}),
                   EventAccess(&NutPot,           {[]{return NutPot || (Hammer && HasBombchus && IsAdult && ((CanUse(RG_FIRE_ARROWS) && MirrorShield) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && CanUse(RG_LIGHT_ARROWS))));}}),
@@ -207,7 +207,7 @@ void AreaTable_Init_GanonsCastle() {
                   LocationAccess(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST,    {[]{return IsAdult && Hammer && HasBombchus && ((CanUse(RG_FIRE_ARROWS) && CanUse(RG_MIRROR_SHIELD)) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && CanUse(RG_LIGHT_ARROWS)));}}),
   }, {});
 
-  areaTable[RR_GANONS_CASTLE_MQ_LIGHT_TRIAL] = Area("Ganon's Castle MQ Light Trial", "Ganons Castle", RHT_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_MQ_LIGHT_TRIAL] = Area("Ganon's Castle MQ Light Trial", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&LightTrialClear, {[]{return IsAdult && (CanUse(RG_MASTER_SWORD) || CanUse(RG_KOKIRI_SWORD) || CanUse(RG_BIGGORON_SWORD)) && CanUse(RG_LIGHT_ARROWS) && SmallKeys(RR_GANONS_CASTLE, 3) && (randoCtx->GetTrickOption(RT_LENS_GANON_MQ) || CanUse(RG_LENS_OF_TRUTH)) && (Hookshot || randoCtx->GetTrickOption(RT_GANON_MQ_LIGHT_TRIAL));}}),
                     //Trick: IsAdult && CanUse(RG_LIGHT_ARROWS) && SmallKeys(RR_GANONS_CASTLE, 3) && (LogicLensCastleMQ || CanUse(RG_LENS_OF_TRUTH)) && (Hookshot || LogicLightTrialMQ)
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp
index 2412dbfce..46c5eeae6 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp
@@ -10,7 +10,7 @@ void AreaTable_Init_GerudoTrainingGrounds() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_ENTRYWAY] = Area("Gerudo Training Grounds Entryway", "Gerudo Training Grounds", RHT_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_ENTRYWAY] = Area("Gerudo Training Grounds Entryway", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_LOBBY,    {[]{return randoCtx->GetDungeon(GERUDO_TRAINING_GROUNDS)->IsVanilla();}}),
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_LOBBY, {[]{return randoCtx->GetDungeon(GERUDO_TRAINING_GROUNDS)->IsMQ();}}),
@@ -21,7 +21,7 @@ void AreaTable_Init_GerudoTrainingGrounds() {
   |     VANILLA DUNGEON      |
   ---------------------------*/
   if (randoCtx->GetDungeon(GERUDO_TRAINING_GROUNDS)->IsVanilla()) {
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_LOBBY] = Area("Gerudo Training Grounds Lobby", "Gerudo Training Grounds", RHT_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_LOBBY] = Area("Gerudo Training Grounds Lobby", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST,  {[]{return CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT);}}),
                   LocationAccess(RC_GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST, {[]{return CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT);}}),
@@ -35,7 +35,7 @@ void AreaTable_Init_GerudoTrainingGrounds() {
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE,     {[]{return true;}}),
   });
 
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE] = Area("Gerudo Training Grounds Central Maze", "Gerudo Training Grounds", RHT_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE] = Area("Gerudo Training Grounds Central Maze", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST,   {[]{return SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 3) && (randoCtx->GetTrickOption(RT_LENS_GTG) || CanUse(RG_LENS_OF_TRUTH));}}),
                   LocationAccess(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST,  {[]{return SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 4);}}),
@@ -47,7 +47,7 @@ void AreaTable_Init_GerudoTrainingGrounds() {
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE_RIGHT, {[]{return SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 9);}}),
   });
 
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE_RIGHT] = Area("Gerudo Training Grounds Central Maze Right", "Gerudo Training Grounds", RHT_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE_RIGHT] = Area("Gerudo Training Grounds Central Maze Right", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_CENTRAL_CHEST, {[]{return true;}}),
                   LocationAccess(RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_SIDE_CHEST,    {[]{return true;}}),
@@ -58,7 +58,7 @@ void AreaTable_Init_GerudoTrainingGrounds() {
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_LAVA_ROOM,   {[]{return true;}}),
   });
 
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_LAVA_ROOM] = Area("Gerudo Training Grounds Lava Room", "Gerudo Training Grounds", RHT_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_LAVA_ROOM] = Area("Gerudo Training Grounds Lava Room", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST, {[]{return CanUse(RG_HOOKSHOT) && CanPlay(SongOfTime) && IronBoots && WaterTimer >= 24;}}),
                 }, {
@@ -67,7 +67,7 @@ void AreaTable_Init_GerudoTrainingGrounds() {
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_HAMMER_ROOM,        {[]{return CanUse(RG_LONGSHOT)  || (CanUse(RG_HOVER_BOOTS) && CanUse(RG_HOOKSHOT));}}),
   });
 
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_HAMMER_ROOM] = Area("Gerudo Training Grounds Hammer Room", "Gerudo Training Grounds", RHT_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_HAMMER_ROOM] = Area("Gerudo Training Grounds Hammer Room", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST,  {[]{return CanAdultAttack || CanChildAttack;}}),
                   LocationAccess(RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST, {[]{return CanUse(RG_MEGATON_HAMMER) || (CanTakeDamage && randoCtx->GetTrickOption(RT_FLAMING_CHESTS));}}),
@@ -77,7 +77,7 @@ void AreaTable_Init_GerudoTrainingGrounds() {
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_LAVA_ROOM,        {[]{return true;}}),
   });
 
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_EYE_STATUE_LOWER] = Area("Gerudo Training Grounds Eye Statue Lower", "Gerudo Training Grounds", RHT_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_EYE_STATUE_LOWER] = Area("Gerudo Training Grounds Eye Statue Lower", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_GERUDO_TRAINING_GROUND_EYE_STATUE_CHEST, {[]{return CanUse(RG_FAIRY_BOW);}}),
                 }, {
@@ -85,7 +85,7 @@ void AreaTable_Init_GerudoTrainingGrounds() {
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_HAMMER_ROOM, {[]{return true;}}),
   });
 
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_EYE_STATUE_UPPER] = Area("Gerudo Training Grounds Eye Statue Upper", "Gerudo Training Grounds", RHT_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_EYE_STATUE_UPPER] = Area("Gerudo Training Grounds Eye Statue Upper", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_GERUDO_TRAINING_GROUND_NEAR_SCARECROW_CHEST, {[]{return CanUse(RG_FAIRY_BOW);}}),
                 }, {
@@ -93,7 +93,7 @@ void AreaTable_Init_GerudoTrainingGrounds() {
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_EYE_STATUE_LOWER, {[]{return true;}}),
   });
 
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_ROOM] = Area("Gerudo Training Grounds Heavy Block Room", "Gerudo Training Grounds", RHT_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_ROOM] = Area("Gerudo Training Grounds Heavy Block Room", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST, {[]{return CanJumpslash;}}),
                 }, {
@@ -102,7 +102,7 @@ void AreaTable_Init_GerudoTrainingGrounds() {
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_LIKE_LIKE_ROOM,   {[]{return (randoCtx->GetTrickOption(RT_LENS_GTG) || CanUse(RG_LENS_OF_TRUTH)) && (CanUse(RG_HOOKSHOT) || (randoCtx->GetTrickOption(RT_GTG_FAKE_WALL) && CanUse(RG_HOVER_BOOTS))) && CanUse(RG_SILVER_GAUNTLETS);}}),
   });
 
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_LIKE_LIKE_ROOM] = Area("Gerudo Training Grounds Like Like Room", "Gerudo Training Grounds", RHT_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_LIKE_LIKE_ROOM] = Area("Gerudo Training Grounds Like Like Room", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST,  {[]{return CanJumpslash;}}),
                   LocationAccess(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST, {[]{return CanJumpslash;}}),
@@ -115,7 +115,7 @@ void AreaTable_Init_GerudoTrainingGrounds() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (randoCtx->GetDungeon(GERUDO_TRAINING_GROUNDS)->IsMQ()) {
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_LOBBY] = Area("Gerudo Training Grounds MQ Lobby", "Gerudo Training Grounds", RHT_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_LOBBY] = Area("Gerudo Training Grounds MQ Lobby", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST,       {[]{return true;}}),
                   LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST,      {[]{return true;}}),
@@ -130,7 +130,7 @@ void AreaTable_Init_GerudoTrainingGrounds() {
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_RIGHT_SIDE, {[]{return Here(RR_GERUDO_TRAINING_GROUNDS_MQ_LOBBY, []{return (IsAdult && CanUse(RG_FAIRY_BOW)) || (IsChild && CanUse(RG_FAIRY_SLINGSHOT));});}}),
   });
 
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_RIGHT_SIDE] = Area("Gerudo Training Grounds MQ Right Side", "Gerudo Training Grounds", RHT_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_RIGHT_SIDE] = Area("Gerudo Training Grounds MQ Right Side", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   //EventAccess(&WallFairy, {[]{return WallFairy || (IsAdult && CanUse(RG_FAIRY_BOW));}}),
   }, {
@@ -141,12 +141,12 @@ void AreaTable_Init_GerudoTrainingGrounds() {
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER, {[]{return (Bow || (CanUse(RG_LONGSHOT) && HasFireSource)) && CanUse(RG_HOVER_BOOTS) && IsAdult && (CanUse(RG_MASTER_SWORD) || CanUse(RG_KOKIRI_SWORD) || CanUse(RG_BIGGORON_SWORD));}}),
   });
 
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER] = Area("Gerudo Training Grounds MQ Underwater", "Gerudo Training Grounds", RHT_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER] = Area("Gerudo Training Grounds MQ Underwater", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST, {[]{return HasFireSource && IsAdult && CanUse(RG_IRON_BOOTS) && WaterTimer >= 24 && CanTakeDamage;}}),
   }, {});
 
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_LEFT_SIDE] = Area("Gerudo Training Grounds MQ Left Side", "Gerudo Training Grounds", RHT_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_LEFT_SIDE] = Area("Gerudo Training Grounds MQ Left Side", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST, {[]{return CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || HasExplosives;}}),
   }, {
@@ -155,7 +155,7 @@ void AreaTable_Init_GerudoTrainingGrounds() {
                     //Trick: (IsAdult && CanUse(RG_LONGSHOT)) || LogicGtgMQWithoutHookshot || (LogicGtgMQWithHookshot && IsAdult && CanUse(RG_HOOKSHOT))
   });
 
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_STALFOS_ROOM] = Area("Gerudo Training Grounds MQ Stalfos Room", "Gerudo Training Grounds", RHT_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_STALFOS_ROOM] = Area("Gerudo Training Grounds MQ Stalfos Room", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&BlueFireAccess,  {[]{return BlueFireAccess || HasBottle;}}),
   }, {
@@ -168,7 +168,7 @@ void AreaTable_Init_GerudoTrainingGrounds() {
                     //Trick: IsAdult && (LogicLensGtgMQ || CanUse(RG_LENS_OF_TRUTH)) && BlueFire && (CanPlay(SongOfTime) || (LogicGtgFakeWall && IsAdult && CanUse(RG_HOVER_BOOTS)))
   });
 
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_BACK_AREAS] = Area("Gerudo Training Grounds MQ Back Areas", "Gerudo Training Grounds", RHT_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_BACK_AREAS] = Area("Gerudo Training Grounds MQ Back Areas", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_EYE_STATUE_CHEST,          {[]{return CanUse(RG_FAIRY_BOW);}}),
                   LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_SECOND_IRON_KNUCKLE_CHEST, {[]{return CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD);}}),
@@ -179,7 +179,7 @@ void AreaTable_Init_GerudoTrainingGrounds() {
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_RIGHT_SIDE,         {[]{return CanUse(RG_LONGSHOT);}}),
   });
 
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_CENTRAL_MAZE_RIGHT] = Area("Gerudo Training Grounds MQ Central Maze Right", "Gerudo Training Grounds", RHT_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_CENTRAL_MAZE_RIGHT] = Area("Gerudo Training Grounds MQ Central Maze Right", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_CENTRAL_CHEST, {[]{return true;}}),
                   LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_SIDE_CHEST,    {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
index 568b7f028..906169b2d 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
@@ -6,7 +6,7 @@ using namespace Logic;
 using namespace Rando;
 
 void AreaTable_Init_GerudoValley() {
-  areaTable[RR_GERUDO_VALLEY] = Area("Gerudo Valley", "Gerudo Valley", RHT_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {
+  areaTable[RR_GERUDO_VALLEY] = Area("Gerudo Valley", "Gerudo Valley", RA_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&BugRock, {[]{return BugRock || IsChild;}}),
                 }, {
@@ -21,7 +21,7 @@ void AreaTable_Init_GerudoValley() {
                   Entrance(RR_GV_FORTRESS_SIDE,  {[]{return (IsAdult && (CanRideEpona || CanUse(RG_LONGSHOT) || randoCtx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_OPEN) || CarpenterRescue)) || (IsChild && CanUse(RG_HOOKSHOT));}}),
   });
 
-  areaTable[RR_GV_UPPER_STREAM] = Area("GV Upper Stream", "Gerudo Valley", RHT_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {
+  areaTable[RR_GV_UPPER_STREAM] = Area("GV Upper Stream", "Gerudo Valley", RA_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&GossipStoneFairy, {[]{return GossipStoneFairy || CanSummonGossipFairy;}}),
                   EventAccess(&BeanPlantFairy,   {[]{return BeanPlantFairy   || (CanPlantBean(RR_GV_UPPER_STREAM) && CanPlay(SongOfStorms));}}),
@@ -36,19 +36,19 @@ void AreaTable_Init_GerudoValley() {
                   Entrance(RR_GV_LOWER_STREAM, {[]{return true;}}),
   });
 
-  areaTable[RR_GV_LOWER_STREAM] = Area("GV Lower Stream", "Gerudo Valley", RHT_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_GV_LOWER_STREAM] = Area("GV Lower Stream", "Gerudo Valley", RA_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_LAKE_HYLIA, {[]{return true;}}),
   });
 
-  areaTable[RR_GV_GROTTO_LEDGE] = Area("GV Grotto Ledge", "Gerudo Valley", RHT_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_GV_GROTTO_LEDGE] = Area("GV Grotto Ledge", "Gerudo Valley", RA_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_GV_LOWER_STREAM,   {[]{return true;}}),
                   Entrance(RR_GV_OCTOROK_GROTTO, {[]{return CanUse(RG_SILVER_GAUNTLETS);}}),
                   Entrance(RR_GV_CRATE_LEDGE,    {[]{return CanUse(RG_LONGSHOT);}}),
   });
 
-  areaTable[RR_GV_CRATE_LEDGE] = Area("GV Crate Ledge", "Gerudo Valley", RHT_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GV_CRATE_LEDGE] = Area("GV Crate Ledge", "Gerudo Valley", RA_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_GV_CRATE_FREESTANDING_POH, {[]{return true;}}),
                 }, {
@@ -56,7 +56,7 @@ void AreaTable_Init_GerudoValley() {
                   Entrance(RR_GV_LOWER_STREAM, {[]{return true;}}),
   });
 
-  areaTable[RR_GV_FORTRESS_SIDE] = Area("GV Fortress Side", "Gerudo Valley", RHT_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {
+  areaTable[RR_GV_FORTRESS_SIDE] = Area("GV Fortress Side", "Gerudo Valley", RA_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&BrokenSwordAccess, {[]{return IsAdult && (PoachersSawAccess || PoachersSaw);}}),
                 }, {
@@ -75,17 +75,17 @@ void AreaTable_Init_GerudoValley() {
                   Entrance(RR_GV_CRATE_LEDGE, {[]{return false;}}),
   });
 
-  areaTable[RR_GV_CARPENTER_TENT] = Area("GV Carpenter Tent", "GV Carpenter Tent", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_GV_CARPENTER_TENT] = Area("GV Carpenter Tent", "GV Carpenter Tent", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_GV_FORTRESS_SIDE, {[]{return true;}}),
   });
 
-  areaTable[RR_GV_OCTOROK_GROTTO] = Area("GV Octorok Grotto", "GV Octorok Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_GV_OCTOROK_GROTTO] = Area("GV Octorok Grotto", "GV Octorok Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_GV_GROTTO_LEDGE, {[]{return true;}}),
   });
 
-  areaTable[RR_GV_STORMS_GROTTO] = Area("GV Storms Grotto", "GV Storms Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GV_STORMS_GROTTO] = Area("GV Storms Grotto", "GV Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_GV_DEKU_SCRUB_GROTTO_REAR,  {[]{return CanStunDeku;}}),
                   LocationAccess(RC_GV_DEKU_SCRUB_GROTTO_FRONT, {[]{return CanStunDeku;}}),
@@ -94,7 +94,7 @@ void AreaTable_Init_GerudoValley() {
                   Entrance(RR_GV_FORTRESS_SIDE, {[]{return true;}}),
   });
 
-  areaTable[RR_GERUDO_FORTRESS] = Area("Gerudo Fortress", "Gerudo Fortress", RHT_GERUDO_FORTRESS, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GERUDO_FORTRESS] = Area("Gerudo Fortress", "Gerudo Fortress", RA_GERUDO_FORTRESS, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&CarpenterRescue, {[]{return CanFinishGerudoFortress;}}),
                   EventAccess(&GF_GateOpen,     {[]{return IsAdult && GerudoToken;}}),
@@ -119,7 +119,7 @@ void AreaTable_Init_GerudoValley() {
                   Entrance(RR_GF_STORMS_GROTTO,                 {[]{return IsAdult && CanOpenStormGrotto;}}),
   });
 
-  areaTable[RR_GF_OUTSIDE_GATE] = Area("GF Outside Gate", "Gerudo Fortress", RHT_GERUDO_FORTRESS, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GF_OUTSIDE_GATE] = Area("GF Outside Gate", "Gerudo Fortress", RA_GERUDO_FORTRESS, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&GF_GateOpen, {[]{return IsAdult && GerudoToken && (randoCtx->GetOption(RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD) || randoCtx->GetOption(RSK_SHUFFLE_OVERWORLD_ENTRANCES) /*|| ShuffleSpecialIndoorEntrances*/);}}),
                 }, {}, {
@@ -128,7 +128,7 @@ void AreaTable_Init_GerudoValley() {
                   Entrance(RR_WASTELAND_NEAR_FORTRESS, {[]{return true;}}),
   });
 
-  areaTable[RR_GF_STORMS_GROTTO] = Area("GF Storms Grotto", "GF Storms Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GF_STORMS_GROTTO] = Area("GF Storms Grotto", "GF Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FreeFairies, {[]{return true;}}),
                 }, {}, {
@@ -136,13 +136,13 @@ void AreaTable_Init_GerudoValley() {
                   Entrance(RR_GERUDO_FORTRESS, {[]{return true;}}),
   });
 
-  areaTable[RR_WASTELAND_NEAR_FORTRESS] = Area("Wasteland Near Fortress", "Haunted Wasteland", RHT_HAUNTED_WASTELAND, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WASTELAND_NEAR_FORTRESS] = Area("Wasteland Near Fortress", "Haunted Wasteland", RA_HAUNTED_WASTELAND, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_GF_OUTSIDE_GATE,   {[]{return true;}}),
                   Entrance(RR_HAUNTED_WASTELAND, {[]{return CanUse(RG_HOVER_BOOTS) || CanUse(RG_LONGSHOT) || randoCtx->GetTrickOption(RT_HW_CROSSING);}}),
   });
 
-  areaTable[RR_HAUNTED_WASTELAND] = Area("Haunted Wasteland", "Haunted Wasteland", RHT_HAUNTED_WASTELAND, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_HAUNTED_WASTELAND] = Area("Haunted Wasteland", "Haunted Wasteland", RA_HAUNTED_WASTELAND, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FairyPot, {[]{return true;}}),
                   EventAccess(&NutPot,   {[]{return true;}}),
@@ -157,13 +157,13 @@ void AreaTable_Init_GerudoValley() {
                   Entrance(RR_WASTELAND_NEAR_FORTRESS, {[]{return CanUse(RG_HOVER_BOOTS) || CanUse(RG_LONGSHOT) || randoCtx->GetTrickOption(RT_HW_CROSSING);}}),
   });
 
-  areaTable[RR_WASTELAND_NEAR_COLOSSUS] = Area("Wasteland Near Colossus", "Haunted Wasteland", RHT_HAUNTED_WASTELAND, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WASTELAND_NEAR_COLOSSUS] = Area("Wasteland Near Colossus", "Haunted Wasteland", RA_HAUNTED_WASTELAND, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DESERT_COLOSSUS,   {[]{return true;}}),
                   Entrance(RR_HAUNTED_WASTELAND, {[]{return randoCtx->GetTrickOption(RT_HW_REVERSE) || false;}}),
   });
 
-  areaTable[RR_DESERT_COLOSSUS] = Area("Desert Colossus", "Desert Colossus", RHT_DESERT_COLOSSUS, DAY_NIGHT_CYCLE, {
+  areaTable[RR_DESERT_COLOSSUS] = Area("Desert Colossus", "Desert Colossus", RA_DESERT_COLOSSUS, DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FairyPond, {[]{return FairyPond || CanPlay(SongOfStorms);}}),
                   EventAccess(&BugRock,   {[]{return true;}}),
@@ -182,7 +182,7 @@ void AreaTable_Init_GerudoValley() {
                   Entrance(RR_COLOSSUS_GROTTO,               {[]{return CanUse(RG_SILVER_GAUNTLETS);}}),
   });
 
-  areaTable[RR_DESERT_COLOSSUS_FROM_SPIRIT_ENTRYWAY] = Area("Desert Colossus From Spirit Entryway", "Desert Colossus", RHT_DESERT_COLOSSUS, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DESERT_COLOSSUS_FROM_SPIRIT_ENTRYWAY] = Area("Desert Colossus From Spirit Entryway", "Desert Colossus", RA_DESERT_COLOSSUS, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_SHEIK_AT_COLOSSUS, {[]{return true;}}),
                 }, {
@@ -190,7 +190,7 @@ void AreaTable_Init_GerudoValley() {
                   Entrance(RR_DESERT_COLOSSUS, {[]{return true;}}),
   });
 
-  areaTable[RR_COLOSSUS_GREAT_FAIRY_FOUNTAIN] = Area("Colossus Great Fairy Fountain", "Colossus Great Fairy Fountain", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_COLOSSUS_GREAT_FAIRY_FOUNTAIN] = Area("Colossus Great Fairy Fountain", "Colossus Great Fairy Fountain", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_COLOSSUS_GREAT_FAIRY_REWARD, {[]{return CanPlay(ZeldasLullaby);}}),
                 }, {
@@ -198,7 +198,7 @@ void AreaTable_Init_GerudoValley() {
                   Entrance(RR_DESERT_COLOSSUS, {[]{return true;}}),
   });
 
-  areaTable[RR_COLOSSUS_GROTTO] = Area("Colossus Grotto", "Colossus Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_COLOSSUS_GROTTO] = Area("Colossus Grotto", "Colossus Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,  {[]{return CanStunDeku;}}),
                   LocationAccess(RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT, {[]{return CanStunDeku;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
index cf7438e5e..b43a5c6ae 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
@@ -6,7 +6,7 @@ using namespace Logic;
 using namespace Rando;
 
 void AreaTable_Init_HyruleField() {
-  areaTable[RR_HYRULE_FIELD] = Area("Hyrule Field", "Hyrule Field", RHT_HYRULE_FIELD, DAY_NIGHT_CYCLE, {
+  areaTable[RR_HYRULE_FIELD] = Area("Hyrule Field", "Hyrule Field", RA_HYRULE_FIELD, DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&BigPoeKill, {[]{return CanUse(RG_FAIRY_BOW) && CanRideEpona && HasBottle;}}),
                 }, {
@@ -32,7 +32,7 @@ void AreaTable_Init_HyruleField() {
                   Entrance(RR_HF_TEKTITE_GROTTO,      {[]{return CanOpenBombGrotto;}}),
   });
 
-  areaTable[RR_HF_SOUTHEAST_GROTTO] = Area("HF Southeast Grotto", "HF Southeast Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+  areaTable[RR_HF_SOUTHEAST_GROTTO] = Area("HF Southeast Grotto", "HF Southeast Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LocationAccess(RC_HF_SOUTHEAST_GROTTO_CHEST,        {[]{return true;}}),
                   LocationAccess(RC_HF_SOUTHEAST_GOSSIP_STONE, {[]{return true;}}),
@@ -41,7 +41,7 @@ void AreaTable_Init_HyruleField() {
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
   });
 
-  areaTable[RR_HF_OPEN_GROTTO] = Area("HF Open Grotto", "HF Open Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+  areaTable[RR_HF_OPEN_GROTTO] = Area("HF Open Grotto", "HF Open Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LocationAccess(RC_HF_OPEN_GROTTO_CHEST,        {[]{return true;}}),
                   LocationAccess(RC_HF_OPEN_GROTTO_GOSSIP_STONE, {[]{return true;}}),
@@ -50,7 +50,7 @@ void AreaTable_Init_HyruleField() {
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
   });
 
-  areaTable[RR_HF_INSIDE_FENCE_GROTTO] = Area("HF Inside Fence Grotto", "HF Inside Fence Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_HF_INSIDE_FENCE_GROTTO] = Area("HF Inside Fence Grotto", "HF Inside Fence Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_HF_DEKU_SCRUB_GROTTO, {[]{return CanStunDeku;}}),
                 }, {
@@ -58,7 +58,7 @@ void AreaTable_Init_HyruleField() {
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
   });
 
-  areaTable[RR_HF_COW_GROTTO] = Area("HF Cow Grotto", "HF Cow Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+  areaTable[RR_HF_COW_GROTTO] = Area("HF Cow Grotto", "HF Cow Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LocationAccess(RC_HF_GS_COW_GROTTO,           {[]{return HasFireSource && HookshotOrBoomerang;}}),
                   LocationAccess(RC_HF_COW_GROTTO_COW,          {[]{return HasFireSource && CanPlay(EponasSong);}}),
@@ -68,7 +68,7 @@ void AreaTable_Init_HyruleField() {
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
   });
 
-  areaTable[RR_HF_NEAR_MARKET_GROTTO] = Area("HF Near Market Grotto", "HF Near Market Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+  areaTable[RR_HF_NEAR_MARKET_GROTTO] = Area("HF Near Market Grotto", "HF Near Market Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LocationAccess(RC_HF_NEAR_MARKET_GROTTO_CHEST,        {[]{return true;}}),
                   LocationAccess(RC_HF_NEAR_MARKET_GOSSIP_STONE, {[]{return true;}}),
@@ -77,7 +77,7 @@ void AreaTable_Init_HyruleField() {
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
   });
 
-  areaTable[RR_HF_FAIRY_GROTTO] = Area("HF Fairy Grotto", "HF Fairy Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_HF_FAIRY_GROTTO] = Area("HF Fairy Grotto", "HF Fairy Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FreeFairies, {[]{return true;}}),
                 }, {}, {
@@ -85,7 +85,7 @@ void AreaTable_Init_HyruleField() {
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
   });
 
-  areaTable[RR_HF_NEAR_KAK_GROTTO] = Area("HF Near Kak Grotto", "HF Near Kak Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_HF_NEAR_KAK_GROTTO] = Area("HF Near Kak Grotto", "HF Near Kak Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_HF_GS_NEAR_KAK_GROTTO, {[]{return HookshotOrBoomerang;}}),
                 }, {
@@ -93,7 +93,7 @@ void AreaTable_Init_HyruleField() {
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
   });
 
-  areaTable[RR_HF_TEKTITE_GROTTO] = Area("HF Tektite Grotto", "HF Tektite Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_HF_TEKTITE_GROTTO] = Area("HF Tektite Grotto", "HF Tektite Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_HF_TEKTITE_GROTTO_FREESTANDING_POH, {[]{return ProgressiveScale >= 2 || CanUse(RG_IRON_BOOTS);}}),
                 }, {
@@ -101,7 +101,7 @@ void AreaTable_Init_HyruleField() {
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
   });
 
-  areaTable[RR_LAKE_HYLIA] = Area("Lake Hylia", "Lake Hylia", RHT_LAKE_HYLIA, DAY_NIGHT_CYCLE, {
+  areaTable[RR_LAKE_HYLIA] = Area("Lake Hylia", "Lake Hylia", RA_LAKE_HYLIA, DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&GossipStoneFairy, {[]{return GossipStoneFairy || CanSummonGossipFairy;}}),
                   EventAccess(&BeanPlantFairy,   {[]{return BeanPlantFairy   || (CanPlantBean(RR_LAKE_HYLIA) && CanPlay(SongOfStorms));}}),
@@ -132,18 +132,18 @@ void AreaTable_Init_HyruleField() {
                   Entrance(RR_LH_GROTTO,             {[]{return true;}}),
   });
 
-  areaTable[RR_LH_FISHING_ISLAND] = Area("LH Fishing Island", "Lake Hylia", RHT_LAKE_HYLIA, DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_LH_FISHING_ISLAND] = Area("LH Fishing Island", "Lake Hylia", RA_LAKE_HYLIA, DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_LAKE_HYLIA,      {[]{return true;}}),
                   Entrance(RR_LH_FISHING_HOLE, {[]{return true;}}),
   });
 
-  areaTable[RR_LH_OWL_FLIGHT] = Area("LH Owl Flight", "Lake Hylia", RHT_LAKE_HYLIA, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_LH_OWL_FLIGHT] = Area("LH Owl Flight", "Lake Hylia", RA_LAKE_HYLIA, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
   });
 
-  areaTable[RR_LH_LAB] = Area("LH Lab", "LH Lab", RHT_NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_LH_LAB] = Area("LH Lab", "LH Lab", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&EyedropsAccess, {[]{return EyedropsAccess || (IsAdult && (EyeballFrogAccess || (EyeballFrog && DisableTradeRevert)));}}),
                 }, {
@@ -156,7 +156,7 @@ void AreaTable_Init_HyruleField() {
                   Entrance(RR_LAKE_HYLIA, {[]{return true;}}),
   });
 
-  areaTable[RR_LH_FISHING_HOLE] = Area("LH Fishing Hole", "LH Fishing Hole", RHT_NONE, DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_LH_FISHING_HOLE] = Area("LH Fishing Hole", "LH Fishing Hole", RA_NONE, DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_LH_CHILD_FISHING, {[]{return IsChild;}}),
                   LocationAccess(RC_LH_ADULT_FISHING, {[]{return IsAdult;}}),
@@ -165,7 +165,7 @@ void AreaTable_Init_HyruleField() {
                   Entrance(RR_LH_FISHING_ISLAND, {[]{return true;}}),
   });
 
-  areaTable[RR_LH_GROTTO] = Area("LH Grotto", "LH Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_LH_GROTTO] = Area("LH Grotto", "LH Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_LH_DEKU_SCRUB_GROTTO_LEFT,   {[]{return CanStunDeku;}}),
                   LocationAccess(RC_LH_DEKU_SCRUB_GROTTO_RIGHT,  {[]{return CanStunDeku;}}),
@@ -175,7 +175,7 @@ void AreaTable_Init_HyruleField() {
                   Entrance(RR_LAKE_HYLIA, {[]{return true;}}),
   });
 
-  areaTable[RR_LON_LON_RANCH] = Area("Lon Lon Ranch", "Lon Lon Ranch", RHT_LON_LON_RANCH, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_LON_LON_RANCH] = Area("Lon Lon Ranch", "Lon Lon Ranch", RA_LON_LON_RANCH, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&Epona,    {[]{return Epona    || (CanPlay(EponasSong) && IsAdult && AtDay);}}),
                   EventAccess(&LinksCow, {[]{return LinksCow || (CanPlay(EponasSong) && IsAdult && AtDay);}}),
@@ -195,7 +195,7 @@ void AreaTable_Init_HyruleField() {
                   Entrance(RR_LLR_GROTTO,       {[]{return IsChild;}}),
   });
 
-  areaTable[RR_LLR_TALONS_HOUSE] = Area("LLR Talons House", "LLR Talons House", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_LLR_TALONS_HOUSE] = Area("LLR Talons House", "LLR Talons House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_LLR_TALONS_CHICKENS, {[]{return IsChild && AtDay && ZeldasLetter;}}),
                 }, {
@@ -203,7 +203,7 @@ void AreaTable_Init_HyruleField() {
                   Entrance(RR_LON_LON_RANCH, {[]{return true;}}),
   });
 
-  areaTable[RR_LLR_STABLES] = Area("LLR Stables", "LLR Stables", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_LLR_STABLES] = Area("LLR Stables", "LLR Stables", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_LLR_STABLES_LEFT_COW,  {[]{return CanPlay(EponasSong);}}),
                   LocationAccess(RC_LLR_STABLES_RIGHT_COW, {[]{return CanPlay(EponasSong);}}),
@@ -212,7 +212,7 @@ void AreaTable_Init_HyruleField() {
                   Entrance(RR_LON_LON_RANCH, {[]{return true;}}),
   });
 
-  areaTable[RR_LLR_TOWER] = Area("LLR Tower", "LLR Tower", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_LLR_TOWER] = Area("LLR Tower", "LLR Tower", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_LLR_FREESTANDING_POH, {[]{return IsChild;}}),
                   LocationAccess(RC_LLR_TOWER_LEFT_COW,   {[]{return CanPlay(EponasSong);}}),
@@ -222,7 +222,7 @@ void AreaTable_Init_HyruleField() {
                   Entrance(RR_LON_LON_RANCH, {[]{return true;}}),
   });
 
-  areaTable[RR_LLR_GROTTO] = Area("LLR Grotto", "LLR Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_LLR_GROTTO] = Area("LLR Grotto", "LLR Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_LLR_DEKU_SCRUB_GROTTO_LEFT,   {[]{return CanStunDeku;}}),
                   LocationAccess(RC_LLR_DEKU_SCRUB_GROTTO_RIGHT,  {[]{return CanStunDeku;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp
index 3cbbd94e3..06ffb5b71 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp
@@ -10,7 +10,7 @@ void AreaTable_Init_IceCavern() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[RR_ICE_CAVERN_ENTRYWAY] = Area("Ice Cavern Entryway", "Ice Cavern", RHT_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_ICE_CAVERN_ENTRYWAY] = Area("Ice Cavern Entryway", "Ice Cavern", RA_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_ICE_CAVERN_BEGINNING,    {[]{return randoCtx->GetDungeon(ICE_CAVERN)->IsVanilla();}}),
                   Entrance(RR_ICE_CAVERN_MQ_BEGINNING, {[]{return randoCtx->GetDungeon(ICE_CAVERN)->IsMQ() && CanUseProjectile;}}),
@@ -21,13 +21,13 @@ void AreaTable_Init_IceCavern() {
   |     VANILLA DUNGEON      |
   ---------------------------*/
   if (randoCtx->GetDungeon(ICE_CAVERN)->IsVanilla()) {
-  areaTable[RR_ICE_CAVERN_BEGINNING] = Area("Ice Cavern Beginning", "Ice Cavern", RHT_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_ICE_CAVERN_BEGINNING] = Area("Ice Cavern Beginning", "Ice Cavern", RA_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_ICE_CAVERN_ENTRYWAY, {[]{return true;}}),
                   Entrance(RR_ICE_CAVERN_MAIN,     {[]{return Here(RR_ICE_CAVERN_BEGINNING, []{return (CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) || CanUse(RG_MEGATON_HAMMER) || HasExplosives || CanUse(RG_HOOKSHOT) || CanUse(RG_DINS_FIRE);});}}),
   });
 
-  areaTable[RR_ICE_CAVERN_MAIN] = Area("Ice Cavern", "Ice Cavern", RHT_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_ICE_CAVERN_MAIN] = Area("Ice Cavern", "Ice Cavern", RA_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&BlueFireAccess, {[]{return BlueFireAccess || (IsAdult && HasBottle);}}),
                 }, {
@@ -47,7 +47,7 @@ void AreaTable_Init_IceCavern() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (randoCtx->GetDungeon(ICE_CAVERN)->IsMQ()) {
-  areaTable[RR_ICE_CAVERN_MQ_BEGINNING] = Area("Ice Cavern MQ Beginning", "Ice Cavern", RHT_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_ICE_CAVERN_MQ_BEGINNING] = Area("Ice Cavern MQ Beginning", "Ice Cavern", RA_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FairyPot, {[]{return true;}}),
   }, {}, {
@@ -58,7 +58,7 @@ void AreaTable_Init_IceCavern() {
                   Entrance(RR_ICE_CAVERN_MQ_IRON_BOOTS_REGION, {[]{return BlueFire;}}),
   });
 
-  areaTable[RR_ICE_CAVERN_MQ_MAP_ROOM] = Area("Ice Cavern MQ Map Room", "Ice Cavern", RHT_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_ICE_CAVERN_MQ_MAP_ROOM] = Area("Ice Cavern MQ Map Room", "Ice Cavern", RA_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&BlueFireAccess,  {[]{return BlueFireAccess || (HasBottle && CanJumpslash);}}),
   }, {
@@ -66,7 +66,7 @@ void AreaTable_Init_IceCavern() {
                   LocationAccess(RC_ICE_CAVERN_MQ_MAP_CHEST, {[]{return BlueFire && (CanJumpslash || CanUse(RG_MEGATON_HAMMER) || HasExplosives || CanUseProjectile);}}),
   }, {});
 
-  areaTable[RR_ICE_CAVERN_MQ_IRON_BOOTS_REGION] = Area("Ice Cavern MQ Iron Boots Region", "Ice Cavern", RHT_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_ICE_CAVERN_MQ_IRON_BOOTS_REGION] = Area("Ice Cavern MQ Iron Boots Region", "Ice Cavern", RA_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_ICE_CAVERN_MQ_IRON_BOOTS_CHEST, {[]{return IsAdult && (CanJumpslash || CanUse(RG_MEGATON_HAMMER));}}),
                   LocationAccess(RC_SHEIK_IN_ICE_CAVERN,            {[]{return IsAdult && (CanJumpslash || CanUse(RG_MEGATON_HAMMER));}}),
@@ -75,7 +75,7 @@ void AreaTable_Init_IceCavern() {
                     //Tricks: (CanUse(RG_SCARECROW) || (HoverBoots && CanUse(RG_LONGSHOT)) || LogicIceMQScarecrow) && IsAdult
   }, {});
 
-  areaTable[RR_ICE_CAVERN_MQ_COMPASS_ROOM] = Area("Ice Cavern MQ Compass Room", "Ice Cavern", RHT_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_ICE_CAVERN_MQ_COMPASS_ROOM] = Area("Ice Cavern MQ Compass Room", "Ice Cavern", RA_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_ICE_CAVERN_MQ_COMPASS_CHEST,    {[]{return true;}}),
                   LocationAccess(RC_ICE_CAVERN_MQ_FREESTANDING_POH, {[]{return HasExplosives;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp
index 32bba0660..19f52d6bd 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp
@@ -10,7 +10,7 @@ void AreaTable_Init_JabuJabusBelly() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[RR_JABU_JABUS_BELLY_ENTRYWAY] = Area("Jabu Jabus Belly Entryway", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_ENTRYWAY] = Area("Jabu Jabus Belly Entryway", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_BEGINNING,    {[]{return randoCtx->GetDungeon(JABU_JABUS_BELLY)->IsVanilla();}}),
                   Entrance(RR_JABU_JABUS_BELLY_MQ_BEGINNING, {[]{return randoCtx->GetDungeon(JABU_JABUS_BELLY)->IsMQ();}}),
@@ -21,13 +21,13 @@ void AreaTable_Init_JabuJabusBelly() {
   |     VANILLA DUNGEON      |
   ---------------------------*/
   if (randoCtx->GetDungeon(JABU_JABUS_BELLY)->IsVanilla()) {
-  areaTable[RR_JABU_JABUS_BELLY_BEGINNING] = Area("Jabu Jabus Belly Beginning", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_BEGINNING] = Area("Jabu Jabus Belly Beginning", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_ENTRYWAY,    {[]{return true;}}),
                   Entrance(RR_JABU_JABUS_BELLY_LIFT_MIDDLE, {[]{return CanUseProjectile;}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_LIFT_MIDDLE] = Area("Jabu Jabus Belly Lift Middle", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_LIFT_MIDDLE] = Area("Jabu Jabus Belly Lift Middle", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_BEGINNING,      {[]{return true;}}),
                   Entrance(RR_JABU_JABUS_BELLY_MAIN_UPPER,     {[]{return true;}}),
@@ -35,7 +35,7 @@ void AreaTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_NEAR_BOSS_ROOM, {[]{return HasAccessTo(RR_JABU_JABUS_BELLY_LIFT_UPPER) || (randoCtx->GetTrickOption(RT_JABU_BOSS_HOVER) && IsAdult && CanUse(RG_HOVER_BOOTS));}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_MAIN_UPPER] = Area("Jabu Jabus Belly Main Upper", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_MAIN_UPPER] = Area("Jabu Jabus Belly Main Upper", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_LIFT_MIDDLE,     {[]{return true;}}),
                   Entrance(RR_JABU_JABUS_BELLY_MAIN_LOWER,      {[]{return true;}}),
@@ -43,7 +43,7 @@ void AreaTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_BIGOCTO_ROOM,    {[]{return Here(RR_JABU_JABUS_BELLY_GREEN_TENTACLE, []{return CanUse(RG_BOOMERANG);});}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_MAIN_LOWER] = Area("Jabu Jabus Belly Main Lower", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_MAIN_LOWER] = Area("Jabu Jabus Belly Main Lower", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER, {[]{return HookshotOrBoomerang;}}),
                   LocationAccess(RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER, {[]{return HookshotOrBoomerang;}}),
@@ -54,7 +54,7 @@ void AreaTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_LOWER_SIDE_ROOM,  {[]{return true;}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_SHABOMB_CORRIDOR] = Area("Jabu Jabus Belly Shabomb Corridor", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_JABU_JABUS_BELLY_SHABOMB_CORRIDOR] = Area("Jabu Jabus Belly Shabomb Corridor", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FairyPot, {[]{return true;}}),
                 }, {
@@ -66,7 +66,7 @@ void AreaTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_LIFT_LOWER, {[]{return CanUseProjectile;}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_LOWER_SIDE_ROOM] = Area("Jabu Jabus Belly Lower Side Room", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_JABU_JABUS_BELLY_LOWER_SIDE_ROOM] = Area("Jabu Jabus Belly Lower Side Room", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FairyPot, {[]{return FairyPot || (CanUse(RG_BOOMERANG) || CanUse(RG_HOVER_BOOTS));}}),
                 }, {}, {
@@ -74,7 +74,7 @@ void AreaTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_MAIN_LOWER, {[]{return true;}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_LIFT_LOWER] = Area("Jabu Jabus Belly Lift Lower", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_LIFT_LOWER] = Area("Jabu Jabus Belly Lift Lower", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_JABU_JABUS_BELLY_DEKU_SCRUB, {[]{return (IsChild || CanDive || randoCtx->GetTrickOption(RT_JABU_ALCOVE_JUMP_DIVE) || CanUse(RG_IRON_BOOTS)) && CanStunDeku;}}),
                 }, {
@@ -83,7 +83,7 @@ void AreaTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_LIFT_MIDDLE,      {[]{return true;}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_FORKED_CORRIDOR] = Area("Jabu Jabus Belly Forked Corridor", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_FORKED_CORRIDOR] = Area("Jabu Jabus Belly Forked Corridor", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_MAIN_UPPER,     {[]{return true;}}),
                   Entrance(RR_JABU_JABUS_BELLY_BOOMERANG_ROOM, {[]{return true;}}),
@@ -93,7 +93,7 @@ void AreaTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_GREEN_TENTACLE, {[]{return Here(RR_JABU_JABUS_BELLY_BLUE_TENTACLE, []{return CanUse(RG_BOOMERANG);});}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_BOOMERANG_ROOM] = Area("Jabu Jabus Belly Boomerang Room", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_BOOMERANG_ROOM] = Area("Jabu Jabus Belly Boomerang Room", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_JABU_JABUS_BELLY_BOOMERANG_CHEST, {[]{return true;}}),
                 }, {
@@ -101,7 +101,7 @@ void AreaTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_FORKED_CORRIDOR, {[]{return true;}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_MAP_ROOM] = Area("Jabu Jabus Belly Map Room", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_MAP_ROOM] = Area("Jabu Jabus Belly Map Room", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_JABU_JABUS_BELLY_MAP_CHEST, {[]{return CanUse(RG_BOOMERANG);}}),
                 }, {
@@ -109,7 +109,7 @@ void AreaTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_FORKED_CORRIDOR, {[]{return true;}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_COMPASS_ROOM] = Area("Jabu Jabus Belly Compass Room", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_COMPASS_ROOM] = Area("Jabu Jabus Belly Compass Room", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_JABU_JABUS_BELLY_COMPASS_CHEST, {[]{return CanAdultAttack || CanChildAttack;}}),
                 }, {
@@ -117,23 +117,23 @@ void AreaTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_FORKED_CORRIDOR, {[]{return true;}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_BLUE_TENTACLE] = Area("Jabu Jabus Belly Blue Tentacle", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_BLUE_TENTACLE] = Area("Jabu Jabus Belly Blue Tentacle", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_FORKED_CORRIDOR, {[]{return Here(RR_JABU_JABUS_BELLY_BLUE_TENTACLE, []{return CanUse(RG_BOOMERANG);});}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_GREEN_TENTACLE] = Area("Jabu Jabus Belly Green Tentacle", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_GREEN_TENTACLE] = Area("Jabu Jabus Belly Green Tentacle", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_FORKED_CORRIDOR, {[]{return Here(RR_JABU_JABUS_BELLY_GREEN_TENTACLE, []{return CanUse(RG_BOOMERANG);});}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_BIGOCTO_ROOM] = Area("Jabu Jabus Belly Bigocto Room", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_BIGOCTO_ROOM] = Area("Jabu Jabus Belly Bigocto Room", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_MAIN_LOWER,    {[]{return true;}}),
                   Entrance(RR_JABU_JABUS_BELLY_ABOVE_BIGOCTO, {[]{return Here(RR_JABU_JABUS_BELLY_BIGOCTO_ROOM, []{return (CanUse(RG_BOOMERANG) || Nuts) && (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_STICKS));});}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_ABOVE_BIGOCTO] = Area("Jabu Jabus Belly Above Bigocto", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_JABU_JABUS_BELLY_ABOVE_BIGOCTO] = Area("Jabu Jabus Belly Above Bigocto", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FairyPot, {[]{return true;}}),
                   EventAccess(&NutPot,   {[]{return true;}}),
@@ -142,13 +142,13 @@ void AreaTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_LIFT_UPPER, {[]{return CanUse(RG_BOOMERANG);}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_LIFT_UPPER] = Area("Jabu Jabus Belly Lift Upper", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_LIFT_UPPER] = Area("Jabu Jabus Belly Lift Upper", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_LIFT_MIDDLE, {[]{return true;}}),
                   Entrance(RR_JABU_JABUS_BELLY_LIFT_LOWER,  {[]{return true;}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_NEAR_BOSS_ROOM] = Area("Jabu Jabus Belly Near Boss Room", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_NEAR_BOSS_ROOM] = Area("Jabu Jabus Belly Near Boss Room", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_JABU_JABUS_BELLY_GS_NEAR_BOSS, {[]{return CanAdultAttack || CanChildAttack;}}),
                 }, {
@@ -162,7 +162,7 @@ void AreaTable_Init_JabuJabusBelly() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (randoCtx->GetDungeon(JABU_JABUS_BELLY)->IsMQ()) {
-  areaTable[RR_JABU_JABUS_BELLY_MQ_BEGINNING] = Area("Jabu Jabus Belly MQ Beginning", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_JABU_JABUS_BELLY_MQ_BEGINNING] = Area("Jabu Jabus Belly MQ Beginning", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&NutPot, {[]{return true;}}),
   }, {
@@ -175,7 +175,7 @@ void AreaTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_MQ_MAIN,  {[]{return Here(RR_JABU_JABUS_BELLY_MQ_BEGINNING, []{return IsChild && CanUse(RG_FAIRY_SLINGSHOT);});}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_MQ_MAIN] = Area("Jabu Jabus Belly MQ Main", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_MQ_MAIN] = Area("Jabu Jabus Belly MQ Main", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST,      {[]{return true;}}),
                   LocationAccess(RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST,      {[]{return (IsAdult && (CanUse(RG_HOVER_BOOTS) || CanUse(RG_HOOKSHOT))) || ChildCanAccess(RR_JABU_JABUS_BELLY_MQ_BOSS_AREA);}}),
@@ -192,7 +192,7 @@ void AreaTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_MQ_DEPTHS,    {[]{return HasExplosives && IsChild && CanUse(RG_BOOMERANG);}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_MQ_DEPTHS] = Area("Jabu Jabus Belly MQ Depths", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_MQ_DEPTHS] = Area("Jabu Jabus Belly MQ Depths", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST, {[]{return true;}}),
                   LocationAccess(RC_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM,          {[]{return Sticks || CanUse(RG_DINS_FIRE);}}),
@@ -203,7 +203,7 @@ void AreaTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_MQ_BOSS_AREA, {[]{return Sticks || (CanUse(RG_DINS_FIRE) && KokiriSword);}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_MQ_BOSS_AREA] = Area("Jabu Jabus Belly MQ Boss Area", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_JABU_JABUS_BELLY_MQ_BOSS_AREA] = Area("Jabu Jabus Belly MQ Boss Area", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FairyPot, {[]{return true;}}),
   }, {
@@ -222,7 +222,7 @@ void AreaTable_Init_JabuJabusBelly() {
     |         BOSS ROOM         |
     ---------------------------*/
     areaTable[RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY] =
-        Area("Jabu Jabus Belly Boss Entryway", "Jabu Jabus Belly", RHT_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {},
+        Area("Jabu Jabus Belly Boss Entryway", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {},
              {
                  // Exits
                  Entrance(RR_JABU_JABUS_BELLY_NEAR_BOSS_ROOM, { [] { return randoCtx->GetDungeon(JABU_JABUS_BELLY)->IsVanilla(); } }),
@@ -231,7 +231,7 @@ void AreaTable_Init_JabuJabusBelly() {
              });
 
     areaTable[RR_JABU_JABUS_BELLY_BOSS_ROOM] =
-        Area("Jabu Jabus Belly Boss Room", "Jabu Jabus Belly", RHT_NONE, NO_DAY_NIGHT_CYCLE,
+        Area("Jabu Jabus Belly Boss Room", "Jabu Jabus Belly", RA_NONE, NO_DAY_NIGHT_CYCLE,
              {
                  // Events //todo: add pot kill trick
                  EventAccess(&JabuJabusBellyClear,
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
index 47176d0fd..19c5aa8b0 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
@@ -6,7 +6,7 @@ using namespace Logic;
 using namespace Rando;
 
 void AreaTable_Init_Kakariko() {
-  areaTable[RR_KAKARIKO_VILLAGE] = Area("Kakariko Village", "Kakariko Village", RHT_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_KAKARIKO_VILLAGE] = Area("Kakariko Village", "Kakariko Village", RA_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&CojiroAccess,            {[]{return CojiroAccess || (IsAdult && WakeUpAdultTalon);}}),
                   EventAccess(&BugRock,                 {[]{return true;}}),
@@ -41,13 +41,13 @@ void AreaTable_Init_Kakariko() {
                   Entrance(RR_KAK_BEHIND_GATE,             {[]{return IsAdult || (KakarikoVillageGateOpen);}}),
   });
 
-  areaTable[RR_KAK_IMPAS_LEDGE] = Area("Kak Impas Ledge", "Kakariko Village", RHT_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_KAK_IMPAS_LEDGE] = Area("Kak Impas Ledge", "Kakariko Village", RA_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_KAK_IMPAS_HOUSE_BACK, {[]{return true;}}),
                   Entrance(RR_KAKARIKO_VILLAGE,     {[]{return true;}}),
   });
 
-  areaTable[RR_KAK_IMPAS_ROOFTOP] = Area("Kak Impas Rooftop", "Kakariko Village", RHT_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KAK_IMPAS_ROOFTOP] = Area("Kak Impas Rooftop", "Kakariko Village", RA_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_KAK_GS_ABOVE_IMPAS_HOUSE, {[]{return IsAdult && AtNight && CanGetNightTimeGS && (CanJumpslash || CanUseProjectile);}}),
                 }, {
@@ -56,7 +56,7 @@ void AreaTable_Init_Kakariko() {
                   Entrance(RR_KAKARIKO_VILLAGE, {[]{return true;}}),
   });
 
-  areaTable[RR_KAK_ROOFTOP] = Area("Kak Rooftop", "Kakariko Village", RHT_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KAK_ROOFTOP] = Area("Kak Rooftop", "Kakariko Village", RA_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_KAK_MAN_ON_ROOF, {[]{return true;}}),
                 }, {
@@ -64,7 +64,7 @@ void AreaTable_Init_Kakariko() {
                   Entrance(RR_KAK_BACKYARD, {[]{return true;}}),
   });
 
-  areaTable[RR_KAK_BACKYARD] = Area("Kak Backyard", "Kakariko Village", RHT_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_KAK_BACKYARD] = Area("Kak Backyard", "Kakariko Village", RA_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_KAKARIKO_VILLAGE,          {[]{return true;}}),
                   Entrance(RR_KAK_OPEN_GROTTO,           {[]{return true;}}),
@@ -72,7 +72,7 @@ void AreaTable_Init_Kakariko() {
                   Entrance(RR_KAK_POTION_SHOP_BACK,      {[]{return IsAdult && AtDay;}}),
   });
 
-  areaTable[RR_KAK_CARPENTER_BOSS_HOUSE] = Area("Kak Carpenter Boss House", "Kak Carpenter Boss House", RHT_NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_KAK_CARPENTER_BOSS_HOUSE] = Area("Kak Carpenter Boss House", "Kak Carpenter Boss House", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&WakeUpAdultTalon, {[]{return WakeUpAdultTalon || (IsAdult && PocketEgg);}}),
                 }, {}, {
@@ -80,7 +80,7 @@ void AreaTable_Init_Kakariko() {
                   Entrance(RR_KAKARIKO_VILLAGE, {[]{return true;}}),
   });
 
-  areaTable[RR_KAK_HOUSE_OF_SKULLTULA] = Area("Kak House of Skulltula", "Kak House of Skulltula", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KAK_HOUSE_OF_SKULLTULA] = Area("Kak House of Skulltula", "Kak House of Skulltula", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_KAK_10_GOLD_SKULLTULA_REWARD, {[]{return GoldSkulltulaTokens >= 10;}}),
                   LocationAccess(RC_KAK_20_GOLD_SKULLTULA_REWARD, {[]{return GoldSkulltulaTokens >= 20;}}),
@@ -93,13 +93,13 @@ void AreaTable_Init_Kakariko() {
                   Entrance(RR_KAKARIKO_VILLAGE, {[]{return true;}}),
   });
 
-  areaTable[RR_KAK_IMPAS_HOUSE] = Area("Kak Impas House", "Kak Impas House", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_KAK_IMPAS_HOUSE] = Area("Kak Impas House", "Kak Impas House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_KAK_IMPAS_HOUSE_NEAR_COW, {[]{return true;}}),
                   Entrance(RR_KAKARIKO_VILLAGE,         {[]{return true;}}),
   });
 
-  areaTable[RR_KAK_IMPAS_HOUSE_BACK] = Area("Kak Impas House Back", "Kak Impas House", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KAK_IMPAS_HOUSE_BACK] = Area("Kak Impas House Back", "Kak Impas House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_KAK_IMPAS_HOUSE_FREESTANDING_POH, {[]{return true;}}),
                 }, {
@@ -108,12 +108,12 @@ void AreaTable_Init_Kakariko() {
                   Entrance(RR_KAK_IMPAS_HOUSE_NEAR_COW, {[]{return true;}}),
   });
 
-  areaTable[RR_KAK_IMPAS_HOUSE_NEAR_COW] = Area("Kak Impas House Near Cow", "Kak Impas House", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KAK_IMPAS_HOUSE_NEAR_COW] = Area("Kak Impas House Near Cow", "Kak Impas House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_KAK_IMPAS_HOUSE_COW, {[]{return CanPlay(EponasSong);}}),
   }, {});
 
-  areaTable[RR_KAK_WINDMILL] = Area("Kak Windmill", "Windmill and Dampes Grave", RHT_NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_KAK_WINDMILL] = Area("Kak Windmill", "Windmill and Dampes Grave", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&DrainWell, {[]{return DrainWell || (IsChild && CanPlay(SongOfStorms));}}),
                 }, {
@@ -126,7 +126,7 @@ void AreaTable_Init_Kakariko() {
                   Entrance(RR_KAKARIKO_VILLAGE, {[]{return true;}}),
   });
 
-  areaTable[RR_KAK_BAZAAR] = Area("Kak Bazaar", "Kak Bazaar", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KAK_BAZAAR] = Area("Kak Bazaar", "Kak Bazaar", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_KAK_BAZAAR_ITEM_1, {[]{return true;}}),
                   LocationAccess(RC_KAK_BAZAAR_ITEM_2, {[]{return true;}}),
@@ -141,7 +141,7 @@ void AreaTable_Init_Kakariko() {
                   Entrance(RR_KAKARIKO_VILLAGE, {[]{return true;}}),
   });
 
-  areaTable[RR_KAK_SHOOTING_GALLERY] = Area("Kak Shooting Gallery", "Kak Shooting Gallery", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KAK_SHOOTING_GALLERY] = Area("Kak Shooting Gallery", "Kak Shooting Gallery", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_KAK_SHOOTING_GALLERY_REWARD, {[]{return IsAdult && Bow;}}),
                 }, {
@@ -149,7 +149,7 @@ void AreaTable_Init_Kakariko() {
                   Entrance(RR_KAKARIKO_VILLAGE, {[]{return true;}}),
   });
 
-  areaTable[RR_KAK_POTION_SHOP_FRONT] = Area("Kak Potion Shop Front", "Kak Potion Shop", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KAK_POTION_SHOP_FRONT] = Area("Kak Potion Shop Front", "Kak Potion Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_KAK_POTION_SHOP_ITEM_1, {[]{return IsAdult;}}),
                   LocationAccess(RC_KAK_POTION_SHOP_ITEM_2, {[]{return IsAdult;}}),
@@ -165,14 +165,14 @@ void AreaTable_Init_Kakariko() {
                   Entrance(RR_KAK_POTION_SHOP_BACK, {[]{return IsAdult;}}),
   });
 
-  areaTable[RR_KAK_POTION_SHOP_BACK] = Area("Kak Potion Shop Back", "Kak Potion Shop", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_KAK_POTION_SHOP_BACK] = Area("Kak Potion Shop Back", "Kak Potion Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_KAK_BACKYARD,          {[]{return IsAdult;}}),
                   Entrance(RR_KAK_POTION_SHOP_FRONT, {[]{return true;}}),
   });
 
   areaTable[RR_KAK_ODD_POTION_BUILDING] =
-      Area("Kak Granny's Potion Shop", "Kak Granny's Potion Shop", RHT_NONE, NO_DAY_NIGHT_CYCLE, {
+      Area("Kak Granny's Potion Shop", "Kak Granny's Potion Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {
           
                // Events
                EventAccess(&OddPoulticeAccess, { [] {
@@ -188,7 +188,7 @@ void AreaTable_Init_Kakariko() {
                Entrance(RR_KAK_BACKYARD, { [] { return true; } }),
            });
 
-  areaTable[RR_KAK_REDEAD_GROTTO] = Area("Kak Redead Grotto", "Kak Redead Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KAK_REDEAD_GROTTO] = Area("Kak Redead Grotto", "Kak Redead Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_KAK_REDEAD_GROTTO_CHEST, {[]{return CanUse(RG_STICKS) || CanUse(RG_KOKIRI_SWORD) || CanUse(RG_DINS_FIRE) || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD);}}),
                 }, {
@@ -196,7 +196,7 @@ void AreaTable_Init_Kakariko() {
                   Entrance(RR_KAKARIKO_VILLAGE, {[]{return true;}}),
   });
 
-  areaTable[RR_KAK_OPEN_GROTTO] = Area("Kak Open Grotto", "Kak Open Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+  areaTable[RR_KAK_OPEN_GROTTO] = Area("Kak Open Grotto", "Kak Open Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LocationAccess(RC_KAK_OPEN_GROTTO_CHEST,        {[]{return true;}}),
                   LocationAccess(RC_KAK_OPEN_GROTTO_GOSSIP_STONE, {[]{return true;}}),
@@ -205,7 +205,7 @@ void AreaTable_Init_Kakariko() {
                   Entrance(RR_KAK_BACKYARD, {[]{return true;}}),
   });
 
-  areaTable[RR_THE_GRAVEYARD] = Area("The Graveyard", "The Graveyard", RHT_THE_GRAVEYARD, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_THE_GRAVEYARD] = Area("The Graveyard", "The Graveyard", RA_THE_GRAVEYARD, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&ButterflyFairy, {[]{return ButterflyFairy || (CanUse(RG_STICKS) && AtDay);}}),
                   EventAccess(&BeanPlantFairy, {[]{return BeanPlantFairy || (CanPlantBean(RR_THE_GRAVEYARD) && CanPlay(SongOfStorms));}}),
@@ -227,7 +227,7 @@ void AreaTable_Init_Kakariko() {
                   Entrance(RR_GRAVEYARD_WARP_PAD_REGION,    {[]{return false;}}),
   });
 
-  areaTable[RR_GRAVEYARD_SHIELD_GRAVE] = Area("Graveyard Shield Grave", "Graveyard Shield Grave", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GRAVEYARD_SHIELD_GRAVE] = Area("Graveyard Shield Grave", "Graveyard Shield Grave", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_GRAVEYARD_SHIELD_GRAVE_CHEST, {[]{return true;}}),
                   //Free Fairies
@@ -236,7 +236,7 @@ void AreaTable_Init_Kakariko() {
                   Entrance(RR_THE_GRAVEYARD, {[]{return true;}}),
   });
 
-  areaTable[RR_GRAVEYARD_HEART_PIECE_GRAVE] = Area("Graveyard Heart Piece Grave", "Graveyard Heart Piece Grave", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GRAVEYARD_HEART_PIECE_GRAVE] = Area("Graveyard Heart Piece Grave", "Graveyard Heart Piece Grave", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_GRAVEYARD_HEART_PIECE_GRAVE_CHEST, {[]{return CanPlay(SunsSong);}}),
                 }, {
@@ -244,7 +244,7 @@ void AreaTable_Init_Kakariko() {
                   Entrance(RR_THE_GRAVEYARD, {[]{return true;}}),
   });
 
-  areaTable[RR_GRAVEYARD_COMPOSERS_GRAVE] = Area("Graveyard Composers Grave", "Graveyard Composers Grave", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GRAVEYARD_COMPOSERS_GRAVE] = Area("Graveyard Composers Grave", "Graveyard Composers Grave", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST, {[]{return HasFireSource;}}),
                   LocationAccess(RC_SONG_FROM_ROYAL_FAMILYS_TOMB,       {[]{return CanUseProjectile || CanJumpslash || CanUse(RG_MEGATON_HAMMER);}}),
@@ -253,7 +253,7 @@ void AreaTable_Init_Kakariko() {
                   Entrance(RR_THE_GRAVEYARD, {[]{return true;}}),
   });
 
-  areaTable[RR_GRAVEYARD_DAMPES_GRAVE] = Area("Graveyard Dampes Grave", "Windmill and Dampes Grave", RHT_NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GRAVEYARD_DAMPES_GRAVE] = Area("Graveyard Dampes Grave", "Windmill and Dampes Grave", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&NutPot,               {[]{return true;}}),
                   EventAccess(&DampesWindmillAccess, {[]{return DampesWindmillAccess || (IsAdult && CanPlay(SongOfTime));}}),
@@ -267,7 +267,7 @@ void AreaTable_Init_Kakariko() {
                   Entrance(RR_KAK_WINDMILL,  {[]{return IsAdult && CanPlay(SongOfTime);}}),
   });
 
-  areaTable[RR_GRAVEYARD_DAMPES_HOUSE] = Area("Graveyard Dampes House", "Graveyard Dampes House", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GRAVEYARD_DAMPES_HOUSE] = Area("Graveyard Dampes House", "Graveyard Dampes House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_DAMPE_HINT, {[]{return IsAdult;}}),
                 }, {
@@ -275,7 +275,7 @@ void AreaTable_Init_Kakariko() {
                   Entrance(RR_THE_GRAVEYARD, {[]{return true;}}),
   });
 
-  areaTable[RR_GRAVEYARD_WARP_PAD_REGION] = Area("Graveyard Warp Pad Region", "Graveyard", RHT_THE_GRAVEYARD, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GRAVEYARD_WARP_PAD_REGION] = Area("Graveyard Warp Pad Region", "Graveyard", RA_THE_GRAVEYARD, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&GossipStoneFairy, {[]{return GossipStoneFairy || CanSummonGossipFairyWithoutSuns;}}),
                 }, {
@@ -287,7 +287,7 @@ void AreaTable_Init_Kakariko() {
                   Entrance(RR_SHADOW_TEMPLE_ENTRYWAY,    {[]{return CanUse(RG_DINS_FIRE) || (randoCtx->GetTrickOption(RT_GY_SHADOW_FIRE_ARROWS) && IsAdult && CanUse(RG_FIRE_ARROWS));}}),
   });
 
-  areaTable[RR_KAK_BEHIND_GATE] = Area("Kak Behind Gate", "Kakariko Village", RHT_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_KAK_BEHIND_GATE] = Area("Kak Behind Gate", "Kakariko Village", RA_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_KAKARIKO_VILLAGE,     {[]{return IsAdult || randoCtx->GetTrickOption(RT_VISIBLE_COLLISION) || KakarikoVillageGateOpen || randoCtx->GetOption(RSK_KAK_GATE).Is(RO_KAK_GATE_OPEN);}}),
                   Entrance(RR_DEATH_MOUNTAIN_TRAIL, {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
index 94699a271..8605d2e4b 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
@@ -6,7 +6,7 @@ using namespace Logic;
 using namespace Rando;
 
 void AreaTable_Init_LostWoods() {
-  areaTable[RR_KOKIRI_FOREST] = Area("Kokiri Forest", "Kokiri Forest", RHT_KOKIRI_FOREST, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_KOKIRI_FOREST] = Area("Kokiri Forest", "Kokiri Forest", RA_KOKIRI_FOREST, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&BeanPlantFairy,           {[]{return BeanPlantFairy   || (CanPlantBean(RR_KOKIRI_FOREST) && CanPlay(SongOfStorms));}}),
                   EventAccess(&GossipStoneFairy,         {[]{return GossipStoneFairy || CanSummonGossipFairyWithoutSuns;}}),
@@ -32,7 +32,7 @@ void AreaTable_Init_LostWoods() {
                   Entrance(RR_KF_STORMS_GROTTO,      {[]{return CanOpenStormGrotto;}}),
   });
 
-  areaTable[RR_KF_OUTSIDE_DEKU_TREE] = Area("KF Outside Deku Tree", "Kokiri Forest", RHT_KOKIRI_FOREST, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_KF_OUTSIDE_DEKU_TREE] = Area("KF Outside Deku Tree", "Kokiri Forest", RA_KOKIRI_FOREST, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&DekuBabaSticks,           {[]{return DekuBabaSticks || ((IsAdult && (CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_KOKIRI_SWORD)) && !randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES)) || (IsChild && (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BOOMERANG))));}}),
                   EventAccess(&DekuBabaNuts,             {[]{return DekuBabaNuts   || ((IsAdult && (CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_KOKIRI_SWORD)) && !randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES)) || (IsChild && (CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT) || HasExplosives || CanUse(RG_DINS_FIRE))));}}),
@@ -47,7 +47,7 @@ void AreaTable_Init_LostWoods() {
                   Entrance(RR_KOKIRI_FOREST,      {[]{return IsAdult || randoCtx->GetOption(RSK_FOREST).Is(RO_FOREST_OPEN) || ShowedMidoSwordAndShield;}}),
   });
 
-  areaTable[RR_KF_LINKS_HOUSE] = Area("KF Link's House", "KF Link's House", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KF_LINKS_HOUSE] = Area("KF Link's House", "KF Link's House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_KF_LINKS_HOUSE_COW, {[]{return IsAdult && CanPlay(EponasSong) && LinksCow;}}),
                 }, {
@@ -55,7 +55,7 @@ void AreaTable_Init_LostWoods() {
                   Entrance(RR_KOKIRI_FOREST, {[]{return true;}})
   });
 
-  areaTable[RR_KF_MIDOS_HOUSE] = Area("KF Mido's House", "KF Mido's House", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KF_MIDOS_HOUSE] = Area("KF Mido's House", "KF Mido's House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_KF_MIDOS_TOP_LEFT_CHEST,     {[]{return true;}}),
                   LocationAccess(RC_KF_MIDOS_TOP_RIGHT_CHEST,    {[]{return true;}}),
@@ -66,22 +66,22 @@ void AreaTable_Init_LostWoods() {
                   Entrance(RR_KOKIRI_FOREST, {[]{return true;}}),
   });
 
-  areaTable[RR_KF_SARIAS_HOUSE] = Area("KF Saria's House", "KF Saria's House", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_KF_SARIAS_HOUSE] = Area("KF Saria's House", "KF Saria's House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_KOKIRI_FOREST, {[]{return true;}}),
   });
 
-  areaTable[RR_KF_HOUSE_OF_TWINS] = Area("KF House of Twins", "KF House of Twins", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_KF_HOUSE_OF_TWINS] = Area("KF House of Twins", "KF House of Twins", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_KOKIRI_FOREST, {[]{return true;}}),
   });
 
-  areaTable[RR_KF_KNOW_IT_ALL_HOUSE] = Area("KF Know It All House", "KF Know It All House", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_KF_KNOW_IT_ALL_HOUSE] = Area("KF Know It All House", "KF Know It All House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_KOKIRI_FOREST, {[]{return true;}}),
   });
 
-  areaTable[RR_KF_KOKIRI_SHOP] = Area("KF Kokiri Shop", "KF Kokiri Shop", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KF_KOKIRI_SHOP] = Area("KF Kokiri Shop", "KF Kokiri Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_KF_SHOP_ITEM_1, {[]{return true;}}),
                   LocationAccess(RC_KF_SHOP_ITEM_2, {[]{return true;}}),
@@ -96,7 +96,7 @@ void AreaTable_Init_LostWoods() {
                   Entrance(RR_KOKIRI_FOREST, {[]{return true;}}),
   });
 
-  areaTable[RR_KF_STORMS_GROTTO] = Area("KF Storms Grotto", "KF Storms Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+  areaTable[RR_KF_STORMS_GROTTO] = Area("KF Storms Grotto", "KF Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LocationAccess(RC_KF_STORMS_GROTTO_CHEST,        {[]{return true;}}),
                   LocationAccess(RC_KF_STORMS_GOSSIP_STONE, {[]{return true;}}),
@@ -105,12 +105,12 @@ void AreaTable_Init_LostWoods() {
                   Entrance(RR_KOKIRI_FOREST, {[]{return true;}})
   });
 
-  areaTable[RR_LW_FOREST_EXIT] = Area("LW Forest Exit", "Lost Woods", RHT_THE_LOST_WOODS, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_LW_FOREST_EXIT] = Area("LW Forest Exit", "Lost Woods", RA_THE_LOST_WOODS, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_KOKIRI_FOREST, {[]{return true;}})
   });
 
-  areaTable[RR_THE_LOST_WOODS] = Area("Lost Woods", "Lost Woods", RHT_THE_LOST_WOODS, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_THE_LOST_WOODS] = Area("Lost Woods", "Lost Woods", RA_THE_LOST_WOODS, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&OddMushroomAccess, {[]{return OddMushroomAccess || (IsAdult && (CojiroAccess || Cojiro));}}),
                   EventAccess(&PoachersSawAccess, {[]{return PoachersSawAccess || (IsAdult && OddPoulticeAccess);}}),
@@ -137,7 +137,7 @@ void AreaTable_Init_LostWoods() {
                   Entrance(RR_LW_NEAR_SHORTCUTS_GROTTO, {[]{return Here(RR_THE_LOST_WOODS, []{return CanBlastOrSmash;});}}),
   });
 
-  areaTable[RR_LW_BEYOND_MIDO] = Area("LW Beyond Mido", "Lost Woods", RHT_THE_LOST_WOODS, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_LW_BEYOND_MIDO] = Area("LW Beyond Mido", "Lost Woods", RA_THE_LOST_WOODS, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&ButterflyFairy, {[]{return ButterflyFairy || CanUse(RG_STICKS);}}),
                 }, {
@@ -155,7 +155,7 @@ void AreaTable_Init_LostWoods() {
                   Entrance(RR_LW_SCRUBS_GROTTO, {[]{return Here(RR_LW_BEYOND_MIDO, []{return CanBlastOrSmash;});}}),
   });
 
-  areaTable[RR_LW_NEAR_SHORTCUTS_GROTTO] = Area("LW Near Shortcuts Grotto", "LW Near Shortcuts Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+  areaTable[RR_LW_NEAR_SHORTCUTS_GROTTO] = Area("LW Near Shortcuts Grotto", "LW Near Shortcuts Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LocationAccess(RC_LW_NEAR_SHORTCUTS_GROTTO_CHEST,        {[]{return true;}}),
                   LocationAccess(RC_LW_NEAR_SHORTCUTS_GOSSIP_STONE, {[]{return true;}}),
@@ -164,7 +164,7 @@ void AreaTable_Init_LostWoods() {
                   Entrance(RR_THE_LOST_WOODS, {[]{return true;}}),
   });
 
-  areaTable[RR_DEKU_THEATER] = Area("Deku Theater", "Deku Theater", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DEKU_THEATER] = Area("Deku Theater", "Deku Theater", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_DEKU_THEATER_SKULL_MASK,    {[]{return IsChild && SkullMask;}}),
                   LocationAccess(RC_DEKU_THEATER_MASK_OF_TRUTH, {[]{return IsChild && MaskOfTruth;}}),
@@ -173,7 +173,7 @@ void AreaTable_Init_LostWoods() {
                   Entrance(RR_LW_BEYOND_MIDO, {[]{return true;}}),
   });
 
-  areaTable[RR_LW_SCRUBS_GROTTO] = Area("LW Scrubs Grotto", "LW Scrubs Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_LW_SCRUBS_GROTTO] = Area("LW Scrubs Grotto", "LW Scrubs Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_LW_DEKU_SCRUB_GROTTO_REAR,  {[]{return CanStunDeku;}}),
                   LocationAccess(RC_LW_DEKU_SCRUB_GROTTO_FRONT, {[]{return CanStunDeku;}}),
@@ -182,14 +182,14 @@ void AreaTable_Init_LostWoods() {
                   Entrance(RR_LW_BEYOND_MIDO, {[]{return true;}}),
   });
 
-  areaTable[RR_SFM_ENTRYWAY] = Area("SFM Entryway", "Sacred Forest Meadow", RHT_SACRED_FOREST_MEADOW, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_SFM_ENTRYWAY] = Area("SFM Entryway", "Sacred Forest Meadow", RA_SACRED_FOREST_MEADOW, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_LW_BEYOND_MIDO,       {[]{return true;}}),
                   Entrance(RR_SACRED_FOREST_MEADOW, {[]{return CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_DINS_FIRE) || CanUse(RG_MEGATON_HAMMER);}}),
                   Entrance(RR_SFM_WOLFOS_GROTTO,    {[]{return CanOpenBombGrotto;}}),
   });
 
-  areaTable[RR_SACRED_FOREST_MEADOW] = Area("Sacred Forest Meadow", "Sacred Forest Meadow", RHT_SACRED_FOREST_MEADOW, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_SACRED_FOREST_MEADOW] = Area("Sacred Forest Meadow", "Sacred Forest Meadow", RA_SACRED_FOREST_MEADOW, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&GossipStoneFairy, {[]{return GossipStoneFairy || CanSummonGossipFairyWithoutSuns;}}),
                 }, {
@@ -208,7 +208,7 @@ void AreaTable_Init_LostWoods() {
                   Entrance(RR_SFM_STORMS_GROTTO,      {[]{return CanOpenStormGrotto;}}),
   });
 
-  areaTable[RR_SFM_FAIRY_GROTTO] = Area("SFM Fairy Grotto", "SFM Fairy Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_SFM_FAIRY_GROTTO] = Area("SFM Fairy Grotto", "SFM Fairy Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FreeFairies, {[]{return true;}}),
                 }, {}, {
@@ -216,7 +216,7 @@ void AreaTable_Init_LostWoods() {
                   Entrance(RR_SACRED_FOREST_MEADOW, {[]{return true;}}),
   });
 
-  areaTable[RR_SFM_WOLFOS_GROTTO] = Area("SFM Wolfos Grotto", "SFM Wolfos Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SFM_WOLFOS_GROTTO] = Area("SFM Wolfos Grotto", "SFM Wolfos Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_SFM_WOLFOS_GROTTO_CHEST, {[]{return IsAdult || Slingshot || Sticks || KokiriSword || CanUse(RG_DINS_FIRE) || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD);}}),
                 }, {
@@ -224,7 +224,7 @@ void AreaTable_Init_LostWoods() {
                   Entrance(RR_SFM_ENTRYWAY, {[]{return true;}}),
   });
 
-  areaTable[RR_SFM_STORMS_GROTTO] = Area("SFM Storms Grotto", "SFM Storms Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SFM_STORMS_GROTTO] = Area("SFM Storms Grotto", "SFM Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_SFM_DEKU_SCRUB_GROTTO_REAR,  {[]{return CanStunDeku;}}),
                   LocationAccess(RC_SFM_DEKU_SCRUB_GROTTO_FRONT, {[]{return CanStunDeku;}}),
@@ -233,7 +233,7 @@ void AreaTable_Init_LostWoods() {
                   Entrance(RR_SACRED_FOREST_MEADOW, {[]{return true;}}),
   });
 
-  areaTable[RR_LW_BRIDGE_FROM_FOREST] = Area("LW Bridge From Forest", "Lost Woods", RHT_THE_LOST_WOODS, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_LW_BRIDGE_FROM_FOREST] = Area("LW Bridge From Forest", "Lost Woods", RA_THE_LOST_WOODS, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_LW_GIFT_FROM_SARIA, {[]{return true;}}),
                 }, {
@@ -241,7 +241,7 @@ void AreaTable_Init_LostWoods() {
                   Entrance(RR_LW_BRIDGE, {[]{return true;}}),
   });
 
-  areaTable[RR_LW_BRIDGE] = Area("LW Bridge", "Lost Woods", RHT_THE_LOST_WOODS, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_LW_BRIDGE] = Area("LW Bridge", "Lost Woods", RA_THE_LOST_WOODS, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_KOKIRI_FOREST,  {[]{return true;}}),
                   Entrance(RR_HYRULE_FIELD,   {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp
index addde6403..430525051 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp
@@ -10,7 +10,7 @@ void AreaTable_Init_ShadowTemple() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[RR_SHADOW_TEMPLE_ENTRYWAY] = Area("Shadow Temple Entryway", "Shadow Temple", RHT_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_SHADOW_TEMPLE_ENTRYWAY] = Area("Shadow Temple Entryway", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_SHADOW_TEMPLE_BEGINNING,    {[]{return randoCtx->GetDungeon(SHADOW_TEMPLE)->IsVanilla() && (randoCtx->GetTrickOption(RT_LENS_SHADOW) || CanUse(RG_LENS_OF_TRUTH)) && (CanUse(RG_HOVER_BOOTS) || CanUse(RG_HOOKSHOT));}}),
                   Entrance(RR_SHADOW_TEMPLE_MQ_BEGINNING, {[]{return randoCtx->GetDungeon(SHADOW_TEMPLE)->IsMQ()    && (randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ) || CanUse(RG_LENS_OF_TRUTH)) && (CanUse(RG_HOVER_BOOTS) || CanUse(RG_HOOKSHOT));}}),
@@ -21,7 +21,7 @@ void AreaTable_Init_ShadowTemple() {
   |     VANILLA DUNGEON      |
   ---------------------------*/
   if (randoCtx->GetDungeon(SHADOW_TEMPLE)->IsVanilla()) {
-  areaTable[RR_SHADOW_TEMPLE_BEGINNING] = Area("Shadow Temple Beginning", "Shadow Temple", RHT_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_SHADOW_TEMPLE_BEGINNING] = Area("Shadow Temple Beginning", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&NutPot, {[]{return true;}}),
                 }, {
@@ -34,7 +34,7 @@ void AreaTable_Init_ShadowTemple() {
                   Entrance(RR_SHADOW_TEMPLE_FIRST_BEAMOS, {[]{return CanUse(RG_HOVER_BOOTS);}}),
   });
 
-  areaTable[RR_SHADOW_TEMPLE_FIRST_BEAMOS] = Area("Shadow Temple First Beamos", "Shadow Temple", RHT_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_SHADOW_TEMPLE_FIRST_BEAMOS] = Area("Shadow Temple First Beamos", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FairyPot, {[]{return true;}}), //This fairy pot is only on 3DS
                 }, {
@@ -48,7 +48,7 @@ void AreaTable_Init_ShadowTemple() {
                   Entrance(RR_SHADOW_TEMPLE_BEYOND_BOAT, {[]{return false;}}),
   });
 
-  areaTable[RR_SHADOW_TEMPLE_HUGE_PIT] = Area("Shadow Temple Huge Pit", "Shadow Temple", RHT_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SHADOW_TEMPLE_HUGE_PIT] = Area("Shadow Temple Huge Pit", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST,   {[]{return CanJumpslash;}}),
                   LocationAccess(RC_SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST, {[]{return CanJumpslash;}}),
@@ -65,7 +65,7 @@ void AreaTable_Init_ShadowTemple() {
                   Entrance(RR_SHADOW_TEMPLE_WIND_TUNNEL, {[]{return ((randoCtx->GetTrickOption(RT_LENS_SHADOW_PLATFORM) && randoCtx->GetTrickOption(RT_LENS_SHADOW)) || CanUse(RG_LENS_OF_TRUTH)) && Hookshot && SmallKeys(RR_SHADOW_TEMPLE, 3, 4);}}),
   });
 
-  areaTable[RR_SHADOW_TEMPLE_WIND_TUNNEL] = Area("Shadow Temple Wind Tunnel", "Shadow Temple", RHT_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SHADOW_TEMPLE_WIND_TUNNEL] = Area("Shadow Temple Wind Tunnel", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_SHADOW_TEMPLE_WIND_HINT_CHEST,         {[]{return true;}}),
                   LocationAccess(RC_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST,  {[]{return CanJumpslash;}}),
@@ -76,7 +76,7 @@ void AreaTable_Init_ShadowTemple() {
                   Entrance(RR_SHADOW_TEMPLE_BEYOND_BOAT, {[]{return CanJumpslash && CanPlay(ZeldasLullaby) && SmallKeys(RR_SHADOW_TEMPLE, 4, 5);}}),
   });
 
-  areaTable[RR_SHADOW_TEMPLE_BEYOND_BOAT] = Area("Shadow Temple Beyond Boat", "Shadow Temple", RHT_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SHADOW_TEMPLE_BEYOND_BOAT] = Area("Shadow Temple Beyond Boat", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST,      {[]{return CanUse(RG_DINS_FIRE);}}),
                   LocationAccess(RC_SHADOW_TEMPLE_BOSS_KEY_CHEST,              {[]{return CanUse(RG_DINS_FIRE);}}),
@@ -92,7 +92,7 @@ void AreaTable_Init_ShadowTemple() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (randoCtx->GetDungeon(SHADOW_TEMPLE)->IsMQ()) {
-  areaTable[RR_SHADOW_TEMPLE_MQ_BEGINNING] = Area("Shadow Temple MQ Beginning", "Shadow Temple", RHT_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_SHADOW_TEMPLE_MQ_BEGINNING] = Area("Shadow Temple MQ Beginning", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_SHADOW_TEMPLE_ENTRYWAY,          {[]{return true;}}),
                   Entrance(RR_SHADOW_TEMPLE_MQ_FIRST_BEAMOS,   {[]{return IsAdult && (CanUse(RG_FIRE_ARROWS) || HoverBoots || (randoCtx->GetTrickOption(RT_SHADOW_MQ_GAP) && CanUse(RG_LONGSHOT)));}}),
@@ -100,13 +100,13 @@ void AreaTable_Init_ShadowTemple() {
                   Entrance(RR_SHADOW_TEMPLE_MQ_DEAD_HAND_AREA, {[]{return HasExplosives && SmallKeys(RR_SHADOW_TEMPLE, 6);}}),
   });
 
-  areaTable[RR_SHADOW_TEMPLE_MQ_DEAD_HAND_AREA] = Area("Shadow Temple MQ Dead Hand Area", "Shadow Temple", RHT_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SHADOW_TEMPLE_MQ_DEAD_HAND_AREA] = Area("Shadow Temple MQ Dead Hand Area", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_SHADOW_TEMPLE_MQ_COMPASS_CHEST,     {[]{return CanJumpslash;}}),
                   LocationAccess(RC_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST, {[]{return CanJumpslash && CanPlay(SongOfTime) && IsAdult && CanUse(RG_FAIRY_BOW);}}),
   }, {});
 
-  areaTable[RR_SHADOW_TEMPLE_MQ_FIRST_BEAMOS] = Area("Shadow Temple MQ First Beamos", "Shadow Temple", RHT_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SHADOW_TEMPLE_MQ_FIRST_BEAMOS] = Area("Shadow Temple MQ First Beamos", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_SHADOW_TEMPLE_MQ_MAP_CHEST,                 {[]{return CanAdultAttack || Nuts;}}),
                   LocationAccess(RC_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST,        {[]{return CanJumpslash;}}),
@@ -116,7 +116,7 @@ void AreaTable_Init_ShadowTemple() {
                   Entrance(RR_SHADOW_TEMPLE_MQ_UPPER_HUGE_PIT, {[]{return HasExplosives && SmallKeys(RR_SHADOW_TEMPLE, 2);}}),
   });
 
-  areaTable[RR_SHADOW_TEMPLE_MQ_UPPER_HUGE_PIT] = Area("Shadow Temple MQ Upper Huge Pit", "Shadow Temple", RHT_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SHADOW_TEMPLE_MQ_UPPER_HUGE_PIT] = Area("Shadow Temple MQ Upper Huge Pit", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST,   {[]{return CanPlay(SongOfTime) || (randoCtx->GetTrickOption(RT_SHADOW_MQ_INVISIBLE_BLADES) && randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_OHKO));}}),
                     //Trick: CanPlay(SongOfTime) || (LogicShadowMQInvisibleBlades && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO))
@@ -128,7 +128,7 @@ void AreaTable_Init_ShadowTemple() {
                     //Trick: HasFireSource || LogicShadowMQHugePit
   });
 
-  areaTable[RR_SHADOW_TEMPLE_MQ_LOWER_HUGE_PIT] = Area("Shadow Temple MQ Lower Huge Pit", "Shadow Temple", RHT_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SHADOW_TEMPLE_MQ_LOWER_HUGE_PIT] = Area("Shadow Temple MQ Lower Huge Pit", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST,  {[]{return IsAdult && CanUse(RG_LONGSHOT);}}),
                   LocationAccess(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST,  {[]{return true;}}),
@@ -143,7 +143,7 @@ void AreaTable_Init_ShadowTemple() {
                   Entrance(RR_SHADOW_TEMPLE_MQ_WIND_TUNNEL, {[]{return HoverBoots && ((randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ) && randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ_PLATFORM)) || CanUse(RG_LENS_OF_TRUTH)) && Hookshot && SmallKeys(RR_SHADOW_TEMPLE, 4);}}),
   });
 
-  areaTable[RR_SHADOW_TEMPLE_MQ_WIND_TUNNEL] = Area("Shadow Temple MQ Wind Tunnel", "Shadow Temple", RHT_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_SHADOW_TEMPLE_MQ_WIND_TUNNEL] = Area("Shadow Temple MQ Wind Tunnel", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&NutPot, {[]{return true;}}),
   }, {
@@ -158,7 +158,7 @@ void AreaTable_Init_ShadowTemple() {
                   Entrance(RR_SHADOW_TEMPLE_MQ_BEYOND_BOAT, {[]{return CanPlay(ZeldasLullaby) && SmallKeys(RR_SHADOW_TEMPLE, 5);}}),
   });
 
-  areaTable[RR_SHADOW_TEMPLE_MQ_BEYOND_BOAT] = Area("Shadow Temple MQ Beyond Boat", "Shadow Temple", RHT_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SHADOW_TEMPLE_MQ_BEYOND_BOAT] = Area("Shadow Temple MQ Beyond Boat", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_SHADOW_TEMPLE_MQ_GS_AFTER_SHIP,  {[]{return true;}}),
                   LocationAccess(RC_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS,   {[]{return Bow || (randoCtx->GetTrickOption(RT_SHADOW_STATUE) && HasBombchus);}}),
@@ -168,7 +168,7 @@ void AreaTable_Init_ShadowTemple() {
                   Entrance(RR_SHADOW_TEMPLE_BOSS_ENTRYWAY,     {[]{return (CanUse(RG_FAIRY_BOW) || (randoCtx->GetTrickOption(RT_SHADOW_STATUE) && HasBombchus)) && CanUse(RG_HOVER_BOOTS) && BossKeyShadowTemple;}}),
   });
 
-  areaTable[RR_SHADOW_TEMPLE_MQ_INVISIBLE_MAZE] = Area("Shadow Temple MQ Invisible Maze", "Shadow Temple", RHT_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SHADOW_TEMPLE_MQ_INVISIBLE_MAZE] = Area("Shadow Temple MQ Invisible Maze", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST, {[]{return CanUse(RG_DINS_FIRE) && SmallKeys(RR_SHADOW_TEMPLE, 6);}}),
                   LocationAccess(RC_SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST,         {[]{return CanUse(RG_DINS_FIRE) && SmallKeys(RR_SHADOW_TEMPLE, 6);}}),
@@ -182,7 +182,7 @@ void AreaTable_Init_ShadowTemple() {
     |         BOSS ROOM         |
     ---------------------------*/
     areaTable[RR_SHADOW_TEMPLE_BOSS_ENTRYWAY] =
-        Area("Shadow Temple Boss Entryway", "Shadow Temple", RHT_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
+        Area("Shadow Temple Boss Entryway", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
              {
                  // Exits
                  Entrance(RR_SHADOW_TEMPLE_BEYOND_BOAT, { [] { return randoCtx->GetDungeon(SHADOW_TEMPLE)->IsVanilla() && false; } }),
@@ -191,7 +191,7 @@ void AreaTable_Init_ShadowTemple() {
              });
 
     areaTable[RR_SHADOW_TEMPLE_BOSS_ROOM] =
-        Area("Shadow Temple Boss Room", "Shadow Temple", RHT_NONE, NO_DAY_NIGHT_CYCLE,
+        Area("Shadow Temple Boss Room", "Shadow Temple", RA_NONE, NO_DAY_NIGHT_CYCLE,
              {
                  // Events
                  EventAccess(&ShadowTempleClear, { [] {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp
index 35efc3135..e186b7ffb 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp
@@ -10,7 +10,7 @@ void AreaTable_Init_SpiritTemple() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[RR_SPIRIT_TEMPLE_ENTRYWAY] = Area("Spirit Temple Entryway", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_ENTRYWAY] = Area("Spirit Temple Entryway", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_SPIRIT_TEMPLE_LOBBY,                  {[]{return randoCtx->GetDungeon(SPIRIT_TEMPLE)->IsVanilla();}}),
                   Entrance(RR_SPIRIT_TEMPLE_MQ_LOBBY,               {[]{return randoCtx->GetDungeon(SPIRIT_TEMPLE)->IsMQ();}}),
@@ -21,14 +21,14 @@ void AreaTable_Init_SpiritTemple() {
   |     VANILLA DUNGEON      |
   ---------------------------*/
   if (randoCtx->GetDungeon(SPIRIT_TEMPLE)->IsVanilla()) {
-  areaTable[RR_SPIRIT_TEMPLE_LOBBY] = Area("Spirit Temple Lobby", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_LOBBY] = Area("Spirit Temple Lobby", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_SPIRIT_TEMPLE_ENTRYWAY,    {[]{return true;}}),
                   Entrance(RR_SPIRIT_TEMPLE_CHILD,       {[]{return IsChild;}}),
                   Entrance(RR_SPIRIT_TEMPLE_EARLY_ADULT, {[]{return CanUse(RG_SILVER_GAUNTLETS);}}),
   });
 
-  areaTable[RR_SPIRIT_TEMPLE_CHILD] = Area("Child Spirit Temple", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_SPIRIT_TEMPLE_CHILD] = Area("Child Spirit Temple", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&NutCrate, {[]{return true;}}),
                 }, {
@@ -41,7 +41,7 @@ void AreaTable_Init_SpiritTemple() {
                   Entrance(RR_SPIRIT_TEMPLE_CHILD_CLIMB, {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 1);}}),
   });
 
-  areaTable[RR_SPIRIT_TEMPLE_CHILD_CLIMB] = Area("Child Spirit Temple Climb", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_CHILD_CLIMB] = Area("Child Spirit Temple Climb", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST, {[]{return HasProjectile(HasProjectileAge::Both) || ((SmallKeys(RR_SPIRIT_TEMPLE, 3) || (SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && CanUse(RG_SILVER_GAUNTLETS) && HasProjectile(HasProjectileAge::Adult)) || (SmallKeys(RR_SPIRIT_TEMPLE, 5) && IsChild && HasProjectile(HasProjectileAge::Child));}}),
                   LocationAccess(RC_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST,  {[]{return HasProjectile(HasProjectileAge::Both) || ((SmallKeys(RR_SPIRIT_TEMPLE, 3) || (SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && CanUse(RG_SILVER_GAUNTLETS) && HasProjectile(HasProjectileAge::Adult)) || (SmallKeys(RR_SPIRIT_TEMPLE, 5) && IsChild && HasProjectile(HasProjectileAge::Child));}}),
@@ -54,7 +54,7 @@ void AreaTable_Init_SpiritTemple() {
                   Entrance(RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER, {[]{return HasExplosives || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && CanUse(RG_LIGHT_ARROWS));}}),
   });
 
-  areaTable[RR_SPIRIT_TEMPLE_EARLY_ADULT] = Area("Early Adult Spirit Temple", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_EARLY_ADULT] = Area("Early Adult Spirit Temple", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_SPIRIT_TEMPLE_COMPASS_CHEST,            {[]{return CanUse(RG_HOOKSHOT) && CanPlay(ZeldasLullaby);}}),
                   LocationAccess(RC_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST,  {[]{return (CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOOMERANG) || HasBombchus || (Bombs && IsAdult && randoCtx->GetTrickOption(RT_SPIRIT_LOWER_ADULT_SWITCH))) && (CanUse(RG_HOVER_BOOTS) || CanJumpslash);}}),
@@ -66,7 +66,7 @@ void AreaTable_Init_SpiritTemple() {
                   Entrance(RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER, {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 1);}}),
   });
 
-  areaTable[RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER] = Area("Spirit Temple Central Chamber", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER] = Area("Spirit Temple Central Chamber", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_SPIRIT_TEMPLE_MAP_CHEST,                    {[]{return ((HasExplosives || SmallKeys(RR_SPIRIT_TEMPLE, 3) || (SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) &&
 
@@ -103,7 +103,7 @@ void AreaTable_Init_SpiritTemple() {
                   Entrance(RR_SPIRIT_TEMPLE_CHILD_CLIMB,                {[]{return true;}}),
   });
 
-  areaTable[RR_SPIRIT_TEMPLE_OUTDOOR_HANDS] = Area("Spirit Temple Outdoor Hands", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_OUTDOOR_HANDS] = Area("Spirit Temple Outdoor Hands", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST, {[]{return (SmallKeys(RR_SPIRIT_TEMPLE, 3) && Longshot && HasExplosives) || SmallKeys(RR_SPIRIT_TEMPLE, 5);}}),
                   LocationAccess(RC_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST,    {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 4) && CanUse(RG_SILVER_GAUNTLETS) && HasExplosives;}}),
@@ -112,7 +112,7 @@ void AreaTable_Init_SpiritTemple() {
                   Entrance(RR_DESERT_COLOSSUS, {[]{return (IsChild && SmallKeys(RR_SPIRIT_TEMPLE, 5)) || (CanUse(RG_SILVER_GAUNTLETS) && ((SmallKeys(RR_SPIRIT_TEMPLE, 3) && HasExplosives) || SmallKeys(RR_SPIRIT_TEMPLE, 5)));}}),
   });
 
-  areaTable[RR_SPIRIT_TEMPLE_BEYOND_CENTRAL_LOCKED_DOOR] = Area("Spirit Temple Beyond Central Locked Door", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_BEYOND_CENTRAL_LOCKED_DOOR] = Area("Spirit Temple Beyond Central Locked Door", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST,         {[]{return (MirrorShield || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && CanUse(RG_LIGHT_ARROWS))) && HasExplosives;}}),
                   LocationAccess(RC_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST,  {[]{return (randoCtx->GetTrickOption(RT_LENS_SPIRIT) || CanUse(RG_LENS_OF_TRUTH)) && HasExplosives;}}),
@@ -122,7 +122,7 @@ void AreaTable_Init_SpiritTemple() {
                   Entrance(RR_SPIRIT_TEMPLE_BEYOND_FINAL_LOCKED_DOOR, {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 5) && (randoCtx->GetTrickOption(RT_SPIRIT_WALL) || CanUse(RG_LONGSHOT) || HasBombchus || ((Bombs || Nuts || CanUse(RG_DINS_FIRE)) && (Bow || CanUse(RG_HOOKSHOT) || Hammer)));}}),
   });
 
-  areaTable[RR_SPIRIT_TEMPLE_BEYOND_FINAL_LOCKED_DOOR] = Area("Spirit Temple Beyond Final Locked Door", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_BEYOND_FINAL_LOCKED_DOOR] = Area("Spirit Temple Beyond Final Locked Door", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_SPIRIT_TEMPLE_BOSS_KEY_CHEST, {[]{return CanPlay(ZeldasLullaby) && ((CanTakeDamage && randoCtx->GetTrickOption(RT_FLAMING_CHESTS)) || (Bow && Hookshot));}}),
                   LocationAccess(RC_SPIRIT_TEMPLE_TOPMOST_CHEST,  {[]{return (MirrorShield && CanAdultAttack) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && CanUse(RG_LIGHT_ARROWS));}}),
@@ -132,7 +132,7 @@ void AreaTable_Init_SpiritTemple() {
   });
 
   areaTable[RR_SPIRIT_TEMPLE_INSIDE_STATUE_HEAD] =
-            Area("Spirit Temple Inside Statue Head", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
+            Area("Spirit Temple Inside Statue Head", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
                  {
                      // Exits
                      Entrance(RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER, { [] { return true; } }),
@@ -144,7 +144,7 @@ void AreaTable_Init_SpiritTemple() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (randoCtx->GetDungeon(SPIRIT_TEMPLE)->IsMQ()) {
-  areaTable[RR_SPIRIT_TEMPLE_MQ_LOBBY] = Area("Spirit Temple MQ Lobby", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_MQ_LOBBY] = Area("Spirit Temple MQ Lobby", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST, {[]{return true;}}),
                   LocationAccess(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST,  {[]{return Here(RR_SPIRIT_TEMPLE_MQ_LOBBY, []{return CanBlastOrSmash;}) && ((IsChild && CanUse(RG_FAIRY_SLINGSHOT)) || (IsAdult && CanUse(RG_FAIRY_BOW)));}}),
@@ -156,7 +156,7 @@ void AreaTable_Init_SpiritTemple() {
                   Entrance(RR_SPIRIT_TEMPLE_MQ_ADULT, {[]{return HasBombchus && IsAdult && CanUse(RG_LONGSHOT) && CanUse(RG_SILVER_GAUNTLETS);}}),
   });
 
-  areaTable[RR_SPIRIT_TEMPLE_MQ_CHILD] = Area("Spirit Temple MQ Child", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_SPIRIT_TEMPLE_MQ_CHILD] = Area("Spirit Temple MQ Child", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FairyPot, {[]{return FairyPot || (KokiriSword && HasBombchus && Slingshot);}}),
   }, {
@@ -171,7 +171,7 @@ void AreaTable_Init_SpiritTemple() {
                   Entrance(RR_SPIRIT_TEMPLE_MQ_SHARED, {[]{return HasBombchus && SmallKeys(RR_SPIRIT_TEMPLE, 2);}}),
   });
 
-  areaTable[RR_SPIRIT_TEMPLE_MQ_ADULT] = Area("Spirit Temple MQ Adult", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_MQ_ADULT] = Area("Spirit Temple MQ Adult", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST,     {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 7);}}),
                   LocationAccess(RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST,   {[]{return CanPlay(ZeldasLullaby) && (CanJumpslash || CanUse(RG_HOVER_BOOTS));}}),
@@ -190,7 +190,7 @@ void AreaTable_Init_SpiritTemple() {
                   Entrance(RR_SPIRIT_TEMPLE_MQ_MIRROR_SHIELD_HAND, {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 5) && CanPlay(SongOfTime) && CanJumpslash && (randoCtx->GetTrickOption(RT_LENS_SPIRIT_MQ) || CanUse(RG_LENS_OF_TRUTH));}}),
   });
 
-  areaTable[RR_SPIRIT_TEMPLE_MQ_SHARED] = Area("Spirit Temple MQ Shared", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_MQ_SHARED] = Area("Spirit Temple MQ Shared", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST, {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 6);}}),
                   LocationAccess(RC_SPIRIT_TEMPLE_MQ_COMPASS_CHEST,           {[]{return (IsChild && CanUse(RG_FAIRY_SLINGSHOT) && SmallKeys(RR_SPIRIT_TEMPLE, 7)) || (IsAdult && CanUse(RG_FAIRY_BOW)) || (Bow && Slingshot);}}),
@@ -206,7 +206,7 @@ void AreaTable_Init_SpiritTemple() {
                     //Trick: (SmallKeys(RR_SPIRIT_TEMPLE, 7) && (CanPlay(SongOfTime) || LogicSpiritMQSunBlockSoT || IsAdult)) || (SmallKeys(RR_SPIRIT_TEMPLE, 4) && CanPlay(SongOfTime) && (LogicLensSpiritMQ || CanUse(RG_LENS_OF_TRUTH)) && IsAdult)
   });
 
-  areaTable[RR_SPIRIT_TEMPLE_MQ_LOWER_ADULT] = Area("Spirit Temple MQ Lower Adult", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_MQ_LOWER_ADULT] = Area("Spirit Temple MQ Lower Adult", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST,          {[]{return true;}}),
                   LocationAccess(RC_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST,        {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 7) && Hammer && Ocarina && SongOfTime && EponasSong && SunsSong && SongOfStorms && ZeldasLullaby;}}),
@@ -215,7 +215,7 @@ void AreaTable_Init_SpiritTemple() {
                   LocationAccess(RC_SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM,           {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 7) && Hammer && Ocarina && SongOfTime && EponasSong && SunsSong && SongOfStorms && ZeldasLullaby;}}),
   }, {});
 
-  areaTable[RR_SPIRIT_TEMPLE_MQ_BOSS_AREA] = Area("Spirit Temple MQ Boss Area", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_MQ_BOSS_AREA] = Area("Spirit Temple MQ Boss Area", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST, {[]{return randoCtx->GetTrickOption(RT_LENS_SPIRIT_MQ) || CanUse(RG_LENS_OF_TRUTH);}}),
   }, {
@@ -224,19 +224,19 @@ void AreaTable_Init_SpiritTemple() {
   });
 
   areaTable[RR_SPIRIT_TEMPLE_MQ_INSIDE_STATUE_HEAD] =
-            Area("Spirit Temple MQ Inside Statue Head", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
+            Area("Spirit Temple MQ Inside Statue Head", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
                  {
                      // Exits
                      Entrance(RR_SPIRIT_TEMPLE_MQ_SHARED, { [] { return true; } }),
                      Entrance(RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY, { [] { return BossKeySpiritTemple; } }),
                  });
 
-  areaTable[RR_SPIRIT_TEMPLE_MQ_MIRROR_SHIELD_HAND] = Area("Spirit Temple MQ Mirror Shield Hand", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_MQ_MIRROR_SHIELD_HAND] = Area("Spirit Temple MQ Mirror Shield Hand", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST, {[]{return true;}}),
   }, {});
 
-  areaTable[RR_SPIRIT_TEMPLE_MQ_SILVER_GAUNTLETS_HAND] = Area("Spirit Temple MQ Silver Gauntlets Hand", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_MQ_SILVER_GAUNTLETS_HAND] = Area("Spirit Temple MQ Silver Gauntlets Hand", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST, {[]{return true;}}),
   }, {});
@@ -246,7 +246,7 @@ void AreaTable_Init_SpiritTemple() {
     |         BOSS ROOM         |
     ---------------------------*/
     areaTable[RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY] = Area(
-        "Spirit Temple Boss Entryway", "Spirit Temple", RHT_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
+        "Spirit Temple Boss Entryway", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
         {
             // Exits
             Entrance(RR_SPIRIT_TEMPLE_INSIDE_STATUE_HEAD, { [] { return randoCtx->GetDungeon(SPIRIT_TEMPLE)->IsVanilla() && false; } }),
@@ -255,7 +255,7 @@ void AreaTable_Init_SpiritTemple() {
         });
 
     areaTable[RR_SPIRIT_TEMPLE_BOSS_ROOM] = Area(
-        "Spirit Temple Boss Room", "Spirit Temple", RHT_NONE, NO_DAY_NIGHT_CYCLE,
+        "Spirit Temple Boss Room", "Spirit Temple", RA_NONE, NO_DAY_NIGHT_CYCLE,
         {
             // Events
             EventAccess(&SpiritTempleClear, { [] {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp
index 75255a4d4..8ba6e23df 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp
@@ -10,7 +10,7 @@ void AreaTable_Init_WaterTemple() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[RR_WATER_TEMPLE_ENTRYWAY] = Area("Water Temple Entryway", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_ENTRYWAY] = Area("Water Temple Entryway", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_LOBBY,    {[]{return randoCtx->GetDungeon(WATER_TEMPLE)->IsVanilla();}}),
                   Entrance(RR_WATER_TEMPLE_MQ_LOBBY, {[]{return randoCtx->GetDungeon(WATER_TEMPLE)->IsMQ();}}),
@@ -22,7 +22,7 @@ void AreaTable_Init_WaterTemple() {
   ---------------------------*/
   if (randoCtx->GetDungeon(WATER_TEMPLE)->IsVanilla()) {
   //Water Temple logic currently assumes that the locked door leading to the upper water raising location is unlocked from the start
-  areaTable[RR_WATER_TEMPLE_LOBBY] = Area("Water Temple Lobby", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_LOBBY] = Area("Water Temple Lobby", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_ENTRYWAY,              {[]{return true;}}),
                   Entrance(RR_WATER_TEMPLE_EAST_LOWER,            {[]{return WaterTempleLow || ((randoCtx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS) || CanUse(RG_ZORA_TUNIC)) && (CanUse(RG_IRON_BOOTS) || (CanUse(RG_LONGSHOT) && randoCtx->GetTrickOption(RT_WATER_LONGSHOT_TORCH))));}}),
@@ -39,7 +39,7 @@ void AreaTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_PRE_BOSS_ROOM,         {[]{return WaterTempleHigh && CanUse(RG_LONGSHOT);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_EAST_LOWER] = Area("Water Temple East Lower", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_WATER_TEMPLE_EAST_LOWER] = Area("Water Temple East Lower", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&WaterTempleLow, {[]{return WaterTempleLow || CanPlay(ZeldasLullaby);}}),
                 }, {}, {
@@ -50,7 +50,7 @@ void AreaTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_TORCH_ROOM,   {[]{return WaterTempleLow && (HasFireSourceWithTorch || CanUse(RG_FAIRY_BOW));}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_MAP_ROOM] = Area("Water Temple Map Room", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_MAP_ROOM] = Area("Water Temple Map Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_WATER_TEMPLE_MAP_CHEST, {[]{return (MagicMeter && CanUse(RG_KOKIRI_SWORD)) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_HOOKSHOT);}}),
                 }, {
@@ -58,7 +58,7 @@ void AreaTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_EAST_LOWER, {[]{return (MagicMeter && CanUse(RG_KOKIRI_SWORD)) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_HOOKSHOT);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_CRACKED_WALL] = Area("Water Temple Cracked Wall", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_CRACKED_WALL] = Area("Water Temple Cracked Wall", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_WATER_TEMPLE_CRACKED_WALL_CHEST, {[]{return HasExplosives;}}),
                 }, {
@@ -66,7 +66,7 @@ void AreaTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_EAST_LOWER, {[]{return true;}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_TORCH_ROOM] = Area("Water Temple Torch Room", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_TORCH_ROOM] = Area("Water Temple Torch Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_WATER_TEMPLE_TORCHES_CHEST, {[]{return (MagicMeter && CanUse(RG_KOKIRI_SWORD)) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_HOOKSHOT);}}),
                 }, {
@@ -74,13 +74,13 @@ void AreaTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_EAST_LOWER, {[]{return (MagicMeter && CanUse(RG_KOKIRI_SWORD)) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_HOOKSHOT);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_NORTH_LOWER] = Area("Water Temple North Lower", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_NORTH_LOWER] = Area("Water Temple North Lower", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_LOBBY,          {[]{return true;}}),
                   Entrance(RR_WATER_TEMPLE_BOULDERS_LOWER, {[]{return (CanUse(RG_LONGSHOT) || (randoCtx->GetTrickOption(RT_WATER_BK_REGION) && CanUse(RG_HOVER_BOOTS))) && SmallKeys(RR_WATER_TEMPLE, 4);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_BOULDERS_LOWER] = Area("Water Temple Boulders Lower", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_BOULDERS_LOWER] = Area("Water Temple Boulders Lower", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST, {[]{return CanUse(RG_LONGSHOT) || Here(RR_WATER_TEMPLE_BOULDERS_UPPER, []{return (IsAdult && HookshotOrBoomerang) || (CanUse(RG_IRON_BOOTS) && CanUse(RG_HOOKSHOT));});}}),
                 }, {
@@ -90,26 +90,26 @@ void AreaTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_BOULDERS_UPPER, {[]{return (IsAdult && (CanUse(RG_HOVER_BOOTS) || randoCtx->GetTrickOption(RT_WATER_NORTH_BASEMENT_LEDGE_JUMP))) || (CanUse(RG_HOVER_BOOTS) && CanUse(RG_IRON_BOOTS));}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_BLOCK_ROOM] = Area("Water Temple Block Room", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_BLOCK_ROOM] = Area("Water Temple Block Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_BOULDERS_LOWER, {[]{return (GoronBracelet && HasExplosives) || CanUse(RG_HOOKSHOT);}}),
                   Entrance(RR_WATER_TEMPLE_JETS_ROOM,      {[]{return (GoronBracelet && HasExplosives) || (CanUse(RG_HOOKSHOT) && CanUse(RG_HOVER_BOOTS));}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_JETS_ROOM] = Area("Water Temple Jets Room", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_JETS_ROOM] = Area("Water Temple Jets Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_BLOCK_ROOM,     {[]{return CanUse(RG_HOOKSHOT);}}),
                   Entrance(RR_WATER_TEMPLE_BOULDERS_UPPER, {[]{return true;}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_BOULDERS_UPPER] = Area("Water Temple Boulders Upper", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_BOULDERS_UPPER] = Area("Water Temple Boulders Upper", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_BOULDERS_LOWER, {[]{return true;}}),
                   Entrance(RR_WATER_TEMPLE_JETS_ROOM,      {[]{return IsAdult;}}),
                   Entrance(RR_WATER_TEMPLE_BOSS_KEY_ROOM,  {[]{return (CanUse(RG_IRON_BOOTS) || (IsAdult && randoCtx->GetTrickOption(RT_WATER_BK_JUMP_DIVE))) && SmallKeys(RR_WATER_TEMPLE, 5);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_BOSS_KEY_ROOM] = Area("Water Temple Boss Key Room", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_WATER_TEMPLE_BOSS_KEY_ROOM] = Area("Water Temple Boss Key Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FairyPot, {[]{return true;}}),
                 }, {
@@ -120,7 +120,7 @@ void AreaTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_BOULDERS_UPPER, {[]{return (CanUse(RG_IRON_BOOTS) || (IsAdult && randoCtx->GetTrickOption(RT_WATER_BK_JUMP_DIVE)) || IsChild || CanDive) && SmallKeys(RR_WATER_TEMPLE, 5);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_SOUTH_LOWER] = Area("Water Temple South Lower", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_SOUTH_LOWER] = Area("Water Temple South Lower", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_WATER_TEMPLE_GS_BEHIND_GATE, {[]{return (CanJumpslash || CanUse(RG_MEGATON_HAMMER)) && (CanUse(RG_HOOKSHOT) || (IsAdult && CanUse(RG_HOVER_BOOTS)));}}),
                 }, {
@@ -128,13 +128,13 @@ void AreaTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_LOBBY, {[]{return CanUse(RG_IRON_BOOTS);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_WEST_LOWER] = Area("Water Temple West Lower", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_WEST_LOWER] = Area("Water Temple West Lower", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_LOBBY,       {[]{return CanUse(RG_HOOKSHOT) && CanUse(RG_IRON_BOOTS) && GoronBracelet;}}),
                   Entrance(RR_WATER_TEMPLE_DRAGON_ROOM, {[]{return CanJumpslash || CanUseProjectile;}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_DRAGON_ROOM] = Area("Water Temple Dragon Room", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_DRAGON_ROOM] = Area("Water Temple Dragon Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_WATER_TEMPLE_DRAGON_CHEST, {[]{return (CanUse(RG_HOOKSHOT) && CanUse(RG_IRON_BOOTS)) || (((IsAdult && randoCtx->GetTrickOption(RT_WATER_ADULT_DRAGON) && (CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_BOW) || HasBombchus)) || (IsChild && randoCtx->GetTrickOption(RT_WATER_CHILD_DRAGON) && (CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOOMERANG) || HasBombchus))) && (CanDive || CanUse(RG_IRON_BOOTS))) ||
                                                                        Here(RR_WATER_TEMPLE_RIVER, []{return IsAdult && CanUse(RG_FAIRY_BOW) && ((randoCtx->GetTrickOption(RT_WATER_ADULT_DRAGON) && (CanDive || CanUse(RG_IRON_BOOTS))) || randoCtx->GetTrickOption(RT_WATER_DRAGON_JUMP_DIVE));});}}),
@@ -143,14 +143,14 @@ void AreaTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_WEST_LOWER, {[]{return true;}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_CENTRAL_PILLAR_LOWER] = Area("Water Temple Central Pillar Lower", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_CENTRAL_PILLAR_LOWER] = Area("Water Temple Central Pillar Lower", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_LOBBY,                   {[]{return SmallKeys(RR_WATER_TEMPLE, 5);}}),
                   Entrance(RR_WATER_TEMPLE_CENTRAL_PILLAR_UPPER,    {[]{return CanUse(RG_HOOKSHOT);}}),
                   Entrance(RR_WATER_TEMPLE_CENTRAL_PILLAR_BASEMENT, {[]{return WaterTempleMiddle && CanUse(RG_IRON_BOOTS) && WaterTimer >= 40;}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_CENTRAL_PILLAR_UPPER] = Area("Water Temple Central Pillar Upper", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_WATER_TEMPLE_CENTRAL_PILLAR_UPPER] = Area("Water Temple Central Pillar Upper", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&WaterTempleMiddle, {[]{return WaterTempleMiddle || CanPlay(ZeldasLullaby);}}),
                 }, {
@@ -162,7 +162,7 @@ void AreaTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_CENTRAL_PILLAR_LOWER, {[]{return true;}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_CENTRAL_PILLAR_BASEMENT] = Area("Water Temple Central Pillar Basement", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_CENTRAL_PILLAR_BASEMENT] = Area("Water Temple Central Pillar Basement", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_WATER_TEMPLE_CENTRAL_PILLAR_CHEST, {[]{return CanUse(RG_HOOKSHOT) && CanUse(RG_IRON_BOOTS) && WaterTimer >= 40;}}),
                 }, {
@@ -170,7 +170,7 @@ void AreaTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_CENTRAL_PILLAR_LOWER, {[]{return CanUse(RG_IRON_BOOTS) && WaterTimer >= 16;}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_EAST_MIDDLE] = Area("Water Temple East Middle", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_EAST_MIDDLE] = Area("Water Temple East Middle", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_WATER_TEMPLE_COMPASS_CHEST, {[]{return CanUseProjectile;}}),
                 }, {
@@ -178,13 +178,13 @@ void AreaTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_LOBBY, {[]{return CanUse(RG_IRON_BOOTS);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_WEST_MIDDLE] = Area("Water Temple West Middle", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_WEST_MIDDLE] = Area("Water Temple West Middle", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_LOBBY,      {[]{return true;}}),
                   Entrance(RR_WATER_TEMPLE_HIGH_WATER, {[]{return CanUseProjectile;}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_HIGH_WATER] = Area("Water Temple High Water", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_WATER_TEMPLE_HIGH_WATER] = Area("Water Temple High Water", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&WaterTempleHigh, {[]{return WaterTempleHigh || CanPlay(ZeldasLullaby);}}),
                 }, {}, {
@@ -192,7 +192,7 @@ void AreaTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_LOBBY, {[]{return true;}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_BLOCK_CORRIDOR] = Area("Water Temple Block Corridor", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_BLOCK_CORRIDOR] = Area("Water Temple Block Corridor", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST, {[]{return GoronBracelet && (WaterTempleLow || WaterTempleMiddle);}}),
                 }, {
@@ -200,7 +200,7 @@ void AreaTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_LOBBY, {[]{return CanUse(RG_HOOKSHOT);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_FALLING_PLATFORM_ROOM] = Area("Water Temple Falling Platform Room", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_FALLING_PLATFORM_ROOM] = Area("Water Temple Falling Platform Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM, {[]{return CanUse(RG_LONGSHOT) || (randoCtx->GetTrickOption(RT_WATER_RANG_FALLING_PLATFORM_GS) && IsChild && CanUse(RG_BOOMERANG)) || (randoCtx->GetTrickOption(RT_WATER_HOOKSHOT_FALLING_PLATFORM_GS) && IsAdult && CanUse(RG_HOOKSHOT));}}),
                 }, {
@@ -209,19 +209,19 @@ void AreaTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_DRAGON_PILLARS_ROOM, {[]{return CanUse(RG_HOOKSHOT) && SmallKeys(RR_WATER_TEMPLE, 5);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_DRAGON_PILLARS_ROOM] = Area("Water Temple Dragon Pillars Room", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_DRAGON_PILLARS_ROOM] = Area("Water Temple Dragon Pillars Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_FALLING_PLATFORM_ROOM, {[]{return CanUseProjectile;}}),
                   Entrance(RR_WATER_TEMPLE_DARK_LINK_ROOM,        {[]{return CanUse(RG_HOOKSHOT);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_DARK_LINK_ROOM] = Area("Water Temple Dark Link Room", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_DARK_LINK_ROOM] = Area("Water Temple Dark Link Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_DRAGON_PILLARS_ROOM, {[]{return CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD);}}),
                   Entrance(RR_WATER_TEMPLE_LONGSHOT_ROOM,       {[]{return CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_LONGSHOT_ROOM] = Area("Water Temple Longshot Room", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_LONGSHOT_ROOM] = Area("Water Temple Longshot Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_WATER_TEMPLE_LONGSHOT_CHEST, {[]{return true;}}),
                 }, {
@@ -230,7 +230,7 @@ void AreaTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_RIVER,          {[]{return IsChild || CanPlay(SongOfTime);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_RIVER] = Area("Water Temple River", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_RIVER] = Area("Water Temple River", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_WATER_TEMPLE_RIVER_CHEST, {[]{return (CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW)) && (IsAdult || CanUse(RG_HOVER_BOOTS) || CanUse(RG_HOOKSHOT));}}),
                   LocationAccess(RC_WATER_TEMPLE_GS_RIVER,    {[]{return (CanUse(RG_IRON_BOOTS) && CanUse(RG_HOOKSHOT)) || (randoCtx->GetTrickOption(RT_WATER_RIVER_GS) && CanUse(RG_LONGSHOT));}}),
@@ -239,7 +239,7 @@ void AreaTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_DRAGON_ROOM, {[]{return (CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW)) && (IsAdult || CanUse(RG_HOVER_BOOTS) || CanUse(RG_HOOKSHOT));}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_PRE_BOSS_ROOM] = Area("Water Temple Pre Boss Room", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_WATER_TEMPLE_PRE_BOSS_ROOM] = Area("Water Temple Pre Boss Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FairyPot, {[]{return true;}}),
                 }, {}, {
@@ -253,7 +253,7 @@ void AreaTable_Init_WaterTemple() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (randoCtx->GetDungeon(WATER_TEMPLE)->IsMQ()) {
-  areaTable[RR_WATER_TEMPLE_MQ_LOBBY] = Area("Water Temple MQ Lobby", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_MQ_LOBBY] = Area("Water Temple MQ Lobby", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_ENTRYWAY,            {[]{return true;}}),
                   Entrance(RR_WATER_TEMPLE_MQ_DIVE,             {[]{return IsAdult && WaterTimer >= 24 && CanUse(RG_IRON_BOOTS);}}),
@@ -261,7 +261,7 @@ void AreaTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_BOSS_ENTRYWAY,       {[]{return BossKeyWaterTemple && IsAdult && CanJumpslash && CanUse(RG_LONGSHOT);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_MQ_DIVE] = Area("Water Temple MQ Dive", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_MQ_DIVE] = Area("Water Temple MQ Dive", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_WATER_TEMPLE_MQ_MAP_CHEST,            {[]{return HasFireSource && IsAdult && CanUse(RG_HOOKSHOT);}}),
                   LocationAccess(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST, {[]{return IsAdult && CanUse(RG_ZORA_TUNIC) && CanUse(RG_HOOKSHOT) && ((randoCtx->GetTrickOption(RT_WATER_MQ_CENTRAL_PILLAR) && CanUse(RG_FIRE_ARROWS)) || (CanUse(RG_DINS_FIRE) && CanPlay(SongOfTime)));}}),
@@ -271,7 +271,7 @@ void AreaTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_MQ_LOWERED_WATER_LEVELS, {[]{return CanPlay(ZeldasLullaby);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_MQ_LOWERED_WATER_LEVELS] = Area("Water Temple MQ Lowered Water Levels", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_MQ_LOWERED_WATER_LEVELS] = Area("Water Temple MQ Lowered Water Levels", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_WATER_TEMPLE_MQ_COMPASS_CHEST,                {[]{return ((IsAdult && CanUse(RG_FAIRY_BOW)) || CanUse(RG_DINS_FIRE) || Here(RR_WATER_TEMPLE_MQ_LOBBY, []{return IsChild && CanUse(RG_STICKS) && HasExplosives;})) &&
                     (CanJumpslash || CanUseProjectile);}}),
@@ -280,7 +280,7 @@ void AreaTable_Init_WaterTemple() {
                   LocationAccess(RC_WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH, {[]{return IsAdult && CanUse(RG_LONGSHOT);}}),
   }, {});
 
-  areaTable[RR_WATER_TEMPLE_MQ_DARK_LINK_REGION] = Area("Water Temple MQ Dark Link Region", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_WATER_TEMPLE_MQ_DARK_LINK_REGION] = Area("Water Temple MQ Dark Link Region", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FairyPot, {[]{return true;}}),
                   EventAccess(&NutPot,   {[]{return true;}}),
@@ -293,7 +293,7 @@ void AreaTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_MQ_BASEMENT_GATED_AREAS, {[]{return IsAdult && WaterTimer >= 24 && CanUse(RG_DINS_FIRE) && CanUse(RG_IRON_BOOTS);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_MQ_BASEMENT_GATED_AREAS] = Area("Water Temple MQ Basement Gated Areas", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_MQ_BASEMENT_GATED_AREAS] = Area("Water Temple MQ Basement Gated Areas", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_WATER_TEMPLE_MQ_FREESTANDING_KEY,         {[]{return HoverBoots || CanUse(RG_SCARECROW) || randoCtx->GetTrickOption(RT_WATER_NORTH_BASEMENT_LEDGE_JUMP);}}),
                   LocationAccess(RC_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH,     {[]{return CanUse(RG_FIRE_ARROWS) && (HoverBoots || CanUse(RG_SCARECROW));}}),
@@ -306,7 +306,7 @@ void AreaTable_Init_WaterTemple() {
     |         BOSS ROOM         |
     ---------------------------*/
     areaTable[RR_WATER_TEMPLE_BOSS_ENTRYWAY] =
-        Area("Water Temple Boss Entryway", "Water Temple", RHT_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
+        Area("Water Temple Boss Entryway", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
              {
                  // Exits
                  Entrance(RR_WATER_TEMPLE_PRE_BOSS_ROOM, { [] { return randoCtx->GetDungeon(WATER_TEMPLE)->IsVanilla() && false; } }),
@@ -315,7 +315,7 @@ void AreaTable_Init_WaterTemple() {
              });
 
     areaTable[RR_WATER_TEMPLE_BOSS_ROOM] = Area(
-        "Water Temple Boss Room", "Water Temple", RHT_NONE, NO_DAY_NIGHT_CYCLE,
+        "Water Temple Boss Room", "Water Temple", RA_NONE, NO_DAY_NIGHT_CYCLE,
         {
             // Events
             EventAccess(&WaterTempleClear, { [] {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
index a6f49c4b3..8db912cb9 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
@@ -6,7 +6,7 @@ using namespace Logic;
 using namespace Rando;
 
 void AreaTable_Init_ZorasDomain() {
-  areaTable[RR_ZR_FRONT] = Area("ZR Front", "Zora River", RHT_ZORAS_RIVER, DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_ZR_FRONT] = Area("ZR Front", "Zora River", RA_ZORAS_RIVER, DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_ZR_GS_TREE, {[]{return IsChild && CanChildAttack;}}),
                 }, {
@@ -15,7 +15,7 @@ void AreaTable_Init_ZorasDomain() {
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
   });
 
-  areaTable[RR_ZORAS_RIVER] = Area("Zora River", "Zora River", RHT_ZORAS_RIVER, DAY_NIGHT_CYCLE, {
+  areaTable[RR_ZORAS_RIVER] = Area("Zora River", "Zora River", RA_ZORAS_RIVER, DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&GossipStoneFairy, {[]{return GossipStoneFairy || CanSummonGossipFairy;}}),
                   EventAccess(&BeanPlantFairy,   {[]{return BeanPlantFairy   || (CanPlantBean(RR_ZORAS_RIVER) && CanPlay(SongOfStorms));}}),
@@ -48,13 +48,13 @@ void AreaTable_Init_ZorasDomain() {
                   Entrance(RR_ZR_BEHIND_WATERFALL, {[]{return CanPlay(ZeldasLullaby) || (IsChild && randoCtx->GetTrickOption(RT_ZR_CUCCO)) || (IsAdult && CanUse(RG_HOVER_BOOTS) && randoCtx->GetTrickOption(RT_ZR_HOVERS));}}),
   });
 
-  areaTable[RR_ZR_BEHIND_WATERFALL] = Area("ZR Behind Waterfall", "Zora River", RHT_ZORAS_RIVER, DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_ZR_BEHIND_WATERFALL] = Area("ZR Behind Waterfall", "Zora River", RA_ZORAS_RIVER, DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_ZORAS_RIVER,  {[]{return true;}}),
                   Entrance(RR_ZORAS_DOMAIN, {[]{return true;}}),
   });
 
-  areaTable[RR_ZR_OPEN_GROTTO] = Area("ZR Open Grotto", "ZR Open Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+  areaTable[RR_ZR_OPEN_GROTTO] = Area("ZR Open Grotto", "ZR Open Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LocationAccess(RC_ZR_OPEN_GROTTO_CHEST,        {[]{return true;}}),
                   LocationAccess(RC_ZR_OPEN_GROTTO_GOSSIP_STONE, {[]{return true;}}),
@@ -63,7 +63,7 @@ void AreaTable_Init_ZorasDomain() {
                   Entrance(RR_ZORAS_RIVER, {[]{return true;}}),
   });
 
-  areaTable[RR_ZR_FAIRY_GROTTO] = Area("ZR Fairy Grotto", "ZR Fairy Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_ZR_FAIRY_GROTTO] = Area("ZR Fairy Grotto", "ZR Fairy Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Event
                   EventAccess(&FreeFairies, {[]{return true;}}),
                 }, {}, {
@@ -71,7 +71,7 @@ void AreaTable_Init_ZorasDomain() {
                   Entrance(RR_ZORAS_RIVER, {[]{return true;}}),
   });
 
-  areaTable[RR_ZR_STORMS_GROTTO] = Area("ZR Storms Grotto", "ZR Storms Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_ZR_STORMS_GROTTO] = Area("ZR Storms Grotto", "ZR Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_ZR_DEKU_SCRUB_GROTTO_REAR,  {[]{return CanStunDeku;}}),
                   LocationAccess(RC_ZR_DEKU_SCRUB_GROTTO_FRONT, {[]{return CanStunDeku;}}),
@@ -80,7 +80,7 @@ void AreaTable_Init_ZorasDomain() {
                   Entrance(RR_ZORAS_RIVER, {[]{return true;}}),
   });
 
-  areaTable[RR_ZORAS_DOMAIN] = Area("Zoras Domain", "Zoras Domain", RHT_ZORAS_DOMAIN, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_ZORAS_DOMAIN] = Area("Zoras Domain", "Zoras Domain", RA_ZORAS_DOMAIN, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&EyeballFrogAccess, {[]{return EyeballFrogAccess || (IsAdult && KingZoraThawed && (Eyedrops || EyeballFrog || Prescription || PrescriptionAccess));}}),
                   EventAccess(&GossipStoneFairy,  {[]{return GossipStoneFairy  || CanSummonGossipFairyWithoutSuns;}}),
@@ -106,13 +106,13 @@ void AreaTable_Init_ZorasDomain() {
                   Entrance(RR_ZD_STORMS_GROTTO,    {[]{return CanOpenStormGrotto;}}),
   });
 
-  areaTable[RR_ZD_BEHIND_KING_ZORA] = Area("ZD Behind King Zora", "Zoras Domain", RHT_ZORAS_DOMAIN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_ZD_BEHIND_KING_ZORA] = Area("ZD Behind King Zora", "Zoras Domain", RA_ZORAS_DOMAIN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_ZORAS_DOMAIN,   {[]{return DeliverLetter || randoCtx->GetOption(RSK_ZORAS_FOUNTAIN).Is(RO_ZF_OPEN) || (randoCtx->GetOption(RSK_ZORAS_FOUNTAIN).Is(RO_ZF_CLOSED_CHILD) && IsAdult);}}),
                   Entrance(RR_ZORAS_FOUNTAIN, {[]{return true;}}),
   });
 
-  areaTable[RR_ZD_SHOP] = Area("ZD Shop", "ZD Shop", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_ZD_SHOP] = Area("ZD Shop", "ZD Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_ZD_SHOP_ITEM_1, {[]{return true;}}),
                   LocationAccess(RC_ZD_SHOP_ITEM_2, {[]{return true;}}),
@@ -127,7 +127,7 @@ void AreaTable_Init_ZorasDomain() {
                   Entrance(RR_ZORAS_DOMAIN, {[]{return true;}}),
   });
 
-  areaTable[RR_ZD_STORMS_GROTTO] = Area("ZD Storms Grotto", "ZD Storms Grotto", RHT_NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_ZD_STORMS_GROTTO] = Area("ZD Storms Grotto", "ZD Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&FreeFairies, {[]{return true;}}),
                 }, {}, {
@@ -135,7 +135,7 @@ void AreaTable_Init_ZorasDomain() {
                   Entrance(RR_ZORAS_DOMAIN, {[]{return true;}}),
   });
 
-  areaTable[RR_ZORAS_FOUNTAIN] = Area("Zoras Fountain", "Zoras Fountain", RHT_ZORAS_FOUNTAIN, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_ZORAS_FOUNTAIN] = Area("Zoras Fountain", "Zoras Fountain", RA_ZORAS_FOUNTAIN, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&GossipStoneFairy, {[]{return GossipStoneFairy || CanSummonGossipFairyWithoutSuns;}}),
                   EventAccess(&ButterflyFairy,   {[]{return ButterflyFairy   || (CanUse(RG_STICKS) && AtDay);}}),
@@ -156,7 +156,7 @@ void AreaTable_Init_ZorasDomain() {
                   Entrance(RR_ZF_GREAT_FAIRY_FOUNTAIN,   {[]{return HasExplosives;}}),
   });
 
-  areaTable[RR_ZF_GREAT_FAIRY_FOUNTAIN] = Area("ZF Great Fairy Fountain", "ZF Great Fairy Fountain", RHT_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_ZF_GREAT_FAIRY_FOUNTAIN] = Area("ZF Great Fairy Fountain", "ZF Great Fairy Fountain", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_ZF_GREAT_FAIRY_REWARD, {[]{return CanPlay(ZeldasLullaby);}}),
                 }, {
diff --git a/soh/soh/Enhancements/randomizer/3drando/logic.cpp b/soh/soh/Enhancements/randomizer/3drando/logic.cpp
index 3376b1e80..709f49cc4 100644
--- a/soh/soh/Enhancements/randomizer/3drando/logic.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/logic.cpp
@@ -194,13 +194,11 @@ namespace Logic {
   bool BombchuDrop      = false;
   bool AmmoCanDrop      = false;
 
-  bool BuyBombchus10    = false;
-  bool BuyBombchus20    = false;
+  bool BuyBombchus      = false;
   bool BuySeed          = false;
   bool BuyArrow         = false;
   bool BuyBomb          = false;
-  bool BuyGPotion       = false;
-  bool BuyBPotion       = false;
+  bool BuyMagicPotion        = false;
   bool MagicRefill      = false;
 
   uint8_t   PieceOfHeart     = 0;
@@ -542,7 +540,7 @@ namespace Logic {
     Slingshot       = (ProgressiveBulletBag >= 1) && (BuySeed || AmmoCanDrop);
     Ocarina         = ProgressiveOcarina    >= 1;
     OcarinaOfTime   = ProgressiveOcarina    >= 2;
-    MagicMeter      = (ProgressiveMagic     >= 1) && (AmmoCanDrop || (HasBottle && (BuyGPotion || BuyBPotion)));
+    MagicMeter      = (ProgressiveMagic     >= 1) && (AmmoCanDrop || (HasBottle && (BuyMagicPotion)));
     BombBag         = (ProgressiveBombBag   >= 1) && (BuyBomb || AmmoCanDrop);
     Hookshot        = ProgressiveHookshot   >= 1;
     Longshot        = ProgressiveHookshot   >= 2;
@@ -579,7 +577,7 @@ namespace Logic {
     FoundBombchus   = (BombchuDrop || Bombchus || Bombchus5 || Bombchus10 || Bombchus20);
     CanPlayBowling  = (ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && FoundBombchus) || (!ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && BombBag);
     // TODO: Implement Ammo Drop Setting in place of bombchu drops
-    HasBombchus     = (BuyBombchus10 || BuyBombchus20 || (ctx->GetOption(RSK_ENABLE_BOMBCHU_DROPS).Is(RO_AMMO_DROPS_ON_PLUS_BOMBCHU) && FoundBombchus));
+    HasBombchus     = (BuyBombchus || (ctx->GetOption(RSK_ENABLE_BOMBCHU_DROPS).Is(RO_AMMO_DROPS_ON_PLUS_BOMBCHU) && FoundBombchus));
 
     HasExplosives =  Bombs || (ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && HasBombchus);
 
@@ -967,13 +965,11 @@ namespace Logic {
      FairyPond        = false;
      BombchuDrop      = false;
 
-     BuyBombchus10    = false;
-     BuyBombchus20    = false;
+     BuyBombchus      = false;
      BuySeed          = false;
      BuyArrow         = false;
      BuyBomb          = false;
-     BuyGPotion       = false;
-     BuyBPotion       = false;
+     BuyMagicPotion        = false;
      MagicRefill      = false;
 
      PieceOfHeart     = 0;
diff --git a/soh/soh/Enhancements/randomizer/3drando/logic.hpp b/soh/soh/Enhancements/randomizer/3drando/logic.hpp
index 4452b3715..2477f9902 100644
--- a/soh/soh/Enhancements/randomizer/3drando/logic.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/logic.hpp
@@ -189,12 +189,10 @@ extern bool FreeFairies;
 extern bool FairyPond;
 extern bool BombchuDrop;
 
-extern bool BuyBombchus10;
-extern bool BuyBombchus20;
+extern bool BuyBombchus;
 extern bool BuyArrow;
 extern bool BuyBomb;
-extern bool BuyGPotion;
-extern bool BuyBPotion;
+extern bool BuyMagicPotion;
 extern bool BuySeed;
 extern bool MagicRefill;
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/menu.cpp b/soh/soh/Enhancements/randomizer/3drando/menu.cpp
index f6131cd87..9356ceeda 100644
--- a/soh/soh/Enhancements/randomizer/3drando/menu.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/menu.cpp
@@ -51,7 +51,7 @@ std::string GenerateRandomizer(std::unordered_map<RandomizerSettingKey, uint8_t>
         if (ret == -1) { // Failed to generate after 5 tries
             printf("\n\nFailed to generate after 5 tries.\nPress B to go back to the menu.\nA different seed might be "
                    "successful.");
-            SPDLOG_DEBUG("\nRANDOMIZATION FAILED COMPLETELY. PLZ FIX\n");
+            SPDLOG_DEBUG("\nRANDOMIZATION FAILED COMPLETELY. PLZ FIX\n");//RANDOTODO print seed for reproduction purposes
             return "";
         } else {
             printf("\n\nError %d with fill.\nPress Select to exit or B to go back to the menu.\n", ret);
diff --git a/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp b/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
index 4beb5f07f..79e752521 100644
--- a/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
@@ -79,7 +79,6 @@ int Playthrough_Init(uint32_t seed, std::unordered_map<RandomizerSettingKey, uin
     }
 
     ctx->playthroughLocations.clear();
-    ctx->wothLocations.clear();
     ctx->playthroughBeatable = false;
 
     return 1;
diff --git a/soh/soh/Enhancements/randomizer/3drando/shops.cpp b/soh/soh/Enhancements/randomizer/3drando/shops.cpp
index 8e2206966..973bacaa4 100644
--- a/soh/soh/Enhancements/randomizer/3drando/shops.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/shops.cpp
@@ -35,9 +35,9 @@ std::vector<RandomizerGet> GetMinVanillaShopItems(int total_replaced) {
     RG_BUY_HYLIAN_SHIELD,
     RG_BUY_GORON_TUNIC,
     RG_BUY_ZORA_TUNIC,
-    RG_BUY_DEKU_NUT_5,
-    RG_BUY_DEKU_NUT_5,
-    RG_BUY_DEKU_NUT_10,
+    RG_BUY_DEKU_NUTS_5,
+    RG_BUY_DEKU_NUTS_5,
+    RG_BUY_DEKU_NUTS_10,
     RG_BUY_DEKU_STICK_1,
     RG_BUY_DEKU_STICK_1,
     RG_BUY_DEKU_SEEDS_30,
@@ -68,7 +68,7 @@ std::vector<RandomizerGet> GetMinVanillaShopItems(int total_replaced) {
     RG_BUY_BLUE_FIRE,
     RG_BUY_FISH,
     RG_BUY_BOMBCHU_10,
-    RG_BUY_DEKU_NUT_5,
+    RG_BUY_DEKU_NUTS_5,
     RG_BUY_ARROWS_10,
     RG_BUY_BOMBCHU_20,
     RG_BUY_BOMBS_535,
@@ -76,9 +76,9 @@ std::vector<RandomizerGet> GetMinVanillaShopItems(int total_replaced) {
     //^First 40 items: Exist on shopsanity 3 or less
     RG_BUY_BOMBS_30,
     RG_BUY_BOMBCHU_20,
-    RG_BUY_DEKU_NUT_5,
+    RG_BUY_DEKU_NUTS_5,
     RG_BUY_ARROWS_10,
-    RG_BUY_DEKU_NUT_5,
+    RG_BUY_DEKU_NUTS_5,
     RG_BUY_ARROWS_30,
     RG_BUY_RED_POTION_40,
     RG_BUY_FISH,
@@ -87,7 +87,7 @@ std::vector<RandomizerGet> GetMinVanillaShopItems(int total_replaced) {
     RG_BUY_ARROWS_30,
     RG_BUY_RED_POTION_50,
     RG_BUY_ARROWS_30,
-    RG_BUY_DEKU_NUT_5,
+    RG_BUY_DEKU_NUTS_5,
     RG_BUY_ARROWS_50,
     RG_BUY_ARROWS_50,
     RG_BUY_GREEN_POTION,
diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
index f28f8b3c3..6561951a0 100644
--- a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
@@ -540,19 +540,6 @@ static void WriteShuffledEntrances() {
   }
 }
 
-// Writes the WOTH locations to the spoiler log, if there are any.
-static void WriteWayOfTheHeroLocation(tinyxml2::XMLDocument& spoilerLog) {
-    auto parentNode = spoilerLog.NewElement("way-of-the-hero-locations");
-
-    for (const RandomizerCheck key : Rando::Context::GetInstance()->wothLocations) {
-        // WriteLocation(parentNode, key, true);
-    }
-
-    if (!parentNode->NoChildren()) {
-        spoilerLog.RootElement()->InsertEndChild(parentNode);
-    }
-}
-
 std::string AutoFormatHintTextString(std::string unformattedHintTextString) {
   std::string textStr = unformattedHintTextString;
 
@@ -705,7 +692,7 @@ static void WriteHints(int language) {
     if (ctx->GetOption(RSK_LIGHT_ARROWS_HINT)){
       jsonData["ganonHintText"] = ganonHintText;
       jsonData["lightArrowHintLoc"] = GetLightArrowHintLoc();
-      jsonData["lightArrowRegion"] = ctx->GetHint(RH_GANONDORF_HINT)->GetHintedRegion();
+      jsonData["lightArrowArea"] = ::Hint(ctx->GetHint(RH_GANONDORF_HINT)->GetHintedArea()).GetText().GetEnglish();
       jsonData["masterSwordHintLoc"] = GetMasterSwordHintLoc();
       if (!ctx->GetOption(RSK_TRIAL_COUNT).Is(0)) {
           jsonData["sheikText"] = sheikText;
@@ -714,23 +701,23 @@ static void WriteHints(int language) {
     if (ctx->GetOption(RSK_DAMPES_DIARY_HINT)){
       jsonData["dampeText"] = dampesText;
       jsonData["dampeHintLoc"] = GetDampeHintLoc();
-      jsonData["dampeRegion"] = ctx->GetHint(RH_DAMPES_DIARY)->GetHintedRegion();
+      jsonData["dampeRegion"] = ::Hint(ctx->GetHint(RH_DAMPES_DIARY)->GetHintedArea()).GetText().GetEnglish();
     }
     if (ctx->GetOption(RSK_GREG_HINT)){
       jsonData["gregText"] = gregText;
       jsonData["gregLoc"] = GetGregHintLoc();
-      jsonData["gregRegion"] = ctx->GetHint(RH_GREG_RUPEE)->GetHintedRegion();
+      jsonData["gregRegion"] = ::Hint(ctx->GetHint(RH_GREG_RUPEE)->GetHintedArea()).GetText().GetEnglish();
     }
     if (ctx->GetOption(RSK_SARIA_HINT)){
       jsonData["sariaText"] = sariaText;
       jsonData["sariaHintLoc"] = GetSariaHintLoc();
-      jsonData["sariaRegion"] = ctx->GetHint(RH_SARIA)->GetHintedRegion();
+      jsonData["sariaRegion"] = ::Hint(ctx->GetHint(RH_SARIA)->GetHintedArea()).GetText().GetEnglish();
     }
 
     if (ctx->GetOption(RSK_GOSSIP_STONE_HINTS).Is(RO_GOSSIP_STONES_NONE)) {
         return;
     }
-    for (const RandomizerCheck key : Rando::StaticData::gossipStoneLocations) {
+    for (const RandomizerCheck key : Rando::StaticData::gossipStoneLocations) { //RANDOTODO should be merged with static hints, iterate over hint keys
         Rando::Hint* hint = ctx->GetHint((RandomizerHintKey)(key - RC_COLOSSUS_GOSSIP_STONE + 1));
         Rando::ItemLocation* hintedLocation = ctx->GetItemLocation(hint->GetHintedLocation());
         std::string hintTextString;
@@ -746,18 +733,17 @@ static void WriteHints(int language) {
 
         HintType hintType = hint->GetHintType();
 
-        std::string textStr = hintTextString;
-        jsonData["hints"][Rando::StaticData::GetLocation(key)->GetName()]["hint"] = textStr;
-        jsonData["hints"][Rando::StaticData::GetLocation(key)->GetName()]["type"] = hintTypeNames[(int)hintType];
-        if ((hintType >= HINT_TYPE_ALWAYS && hintType < HINT_TYPE_JUNK) || hintType == HINT_TYPE_WOTH) {
-            jsonData["hints"][Rando::StaticData::GetLocation(key)->GetName()]["item"] = hintedLocation->GetPlacedItemName().GetEnglish();
-            if (hintType != HINT_TYPE_NAMED_ITEM) {
-                jsonData["hints"][Rando::StaticData::GetLocation(key)->GetName()]["location"] =
-                    Rando::StaticData::GetLocation(hintedLocation->GetRandomizerCheck())->GetName();
-            }
+         std::string textStr = hintTextString;
+        std::string name = Rando::StaticData::GetLocation(key)->GetName();
+        jsonData["hints"][name]["hint"] = textStr;
+        jsonData["hints"][name]["distribution"] = hint->GetDistribution();
+        jsonData["hints"][name]["type"] = hintTypeNames[(int)hintType];
+        if (hintType == HINT_TYPE_ITEM_LOCATION || hintType == HINT_TYPE_ITEM_AREA || hintType == HINT_TYPE_WOTH) {
+            jsonData["hints"][name]["item"] = hintedLocation->GetPlacedItemName().GetEnglish();
+            jsonData["hints"][name]["location"] = Rando::StaticData::GetLocation(hintedLocation->GetRandomizerCheck())->GetName();
         }
         if (hintType != HINT_TYPE_TRIAL && hintType != HINT_TYPE_JUNK) {
-            jsonData["hints"][Rando::StaticData::GetLocation(key)->GetName()]["area"] = hint->GetHintedRegion(); //RANDOTODO find elegent way to capitalise this
+            jsonData["hints"][name]["area"] = ::Hint(hint->GetHintedArea()).GetText().Capitalize().GetEnglish();
         }
     }
 }
@@ -849,11 +835,9 @@ const char* SpoilerLog_Write(int language) {
     WriteMasterQuestDungeons(spoilerLog);
     WriteRequiredTrials();
     WritePlaythrough();
-    //WriteWayOfTheHeroLocation(spoilerLog);
 
     ctx->playthroughLocations.clear();
     ctx->playthroughBeatable = false;
-    ctx->wothLocations.clear();
 
     WriteHints(language);
     WriteShuffledEntrances();
@@ -865,7 +849,7 @@ const char* SpoilerLog_Write(int language) {
 
     std::string jsonString = jsonData.dump(4);
     std::ostringstream fileNameStream;
-    for (int i = 0; i < ctx->hashIconIndexes.size(); i ++) {
+    for (uint8_t i = 0; i < ctx->hashIconIndexes.size(); i ++) {
         if (i) {
             fileNameStream << '-';
         }
diff --git a/soh/soh/Enhancements/randomizer/context.cpp b/soh/soh/Enhancements/randomizer/context.cpp
index a403d766e..b9420ace4 100644
--- a/soh/soh/Enhancements/randomizer/context.cpp
+++ b/soh/soh/Enhancements/randomizer/context.cpp
@@ -30,21 +30,56 @@ Context::Context() {
         mSpoilerfileGetNameToEnum[item.GetName().english] = item.GetRandomizerGet();
         mSpoilerfileGetNameToEnum[item.GetName().french] = item.GetRandomizerGet();
     }
+
     mSpoilerfileHintTypeNameToEnum = {
+        { "Static", HINT_TYPE_STATIC },
         { "Trial", HINT_TYPE_TRIAL },
-        { "Always", HINT_TYPE_ALWAYS },
         { "WotH", HINT_TYPE_WOTH },
         { "Barren", HINT_TYPE_BARREN },
         { "Entrance", HINT_TYPE_ENTRANCE },
-        { "Sometimes", HINT_TYPE_SOMETIMES },
-        { "Random", HINT_TYPE_RANDOM },
-        { "Static", HINT_TYPE_STATIC },
-        { "Song", HINT_TYPE_SONG },
-        { "Overworld", HINT_TYPE_OVERWORLD },
-        { "Dungeon", HINT_TYPE_DUNGEON },
+        { "Item Area", HINT_TYPE_ITEM_AREA },
+        { "Item Location", HINT_TYPE_ITEM_LOCATION },
         { "Junk", HINT_TYPE_JUNK },
-        { "Named Item", HINT_TYPE_NAMED_ITEM },
-        { "Random", HINT_TYPE_RANDOM }
+    };
+    
+    mSpoilerfileAreaNameToEnum = {
+        {"No Hint", RA_NONE},
+        {"Link's Pocket", RA_LINKS_POCKET},
+        {"Kokiri Forest", RA_KOKIRI_FOREST},
+        {"The Lost Woods", RA_THE_LOST_WOODS},
+        {"Sacred Forest Meadow", RA_SACRED_FOREST_MEADOW},
+        {"Hyrule Field", RA_HYRULE_FIELD},
+        {"Lake Hylia", RA_LAKE_HYLIA},
+        {"Gerudo Valley", RA_GERUDO_VALLEY},
+        {"Gerudo Fortress", RA_GERUDO_FORTRESS},
+        {"Haunted Wasteland", RA_HAUNTED_WASTELAND},
+        {"Desert Colossus", RA_DESERT_COLOSSUS},
+        {"The Market", RA_THE_MARKET},
+        {"Temple of Time", RA_TEMPLE_OF_TIME},
+        {"Hyrule Castle", RA_HYRULE_CASTLE},
+        {"Outside Ganon's Castle", RA_OUTSIDE_GANONS_CASTLE},
+        {"Castle Grounds", RA_CASTLE_GROUNDS},
+        {"Kakariko Village", RA_KAKARIKO_VILLAGE},
+        {"the Graveyard", RA_THE_GRAVEYARD},
+        {"Death Mountain Trail", RA_DEATH_MOUNTAIN_TRAIL},
+        {"Goron City", RA_GORON_CITY},
+        {"Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER},
+        {"Zora's River", RA_ZORAS_RIVER},
+        {"Zora's Domain", RA_ZORAS_DOMAIN},
+        {"Zora's Fountain", RA_ZORAS_FOUNTAIN},
+        {"Lon Lon Ranch", RA_LON_LON_RANCH},
+        {"Deku Tree", RA_DEKU_TREE},
+        {"Dodongo's Cavern", RA_DODONGOS_CAVERN},
+        {"Jabu-Jabu's Belly", RA_JABU_JABUS_BELLY},
+        {"Forest Temple", RA_FOREST_TEMPLE},
+        {"Fire Temple", RA_FIRE_TEMPLE},
+        {"Water Temple", RA_WATER_TEMPLE},
+        {"Spirit Temple", RA_SPIRIT_TEMPLE},
+        {"Shadow Temple", RA_SHADOW_TEMPLE},
+        {"Bottom of the Well", RA_BOTTOM_OF_THE_WELL},
+        {"Ice Cavern", RA_ICE_CAVERN},
+        {"Gerudo training Grounds", RA_GERUDO_TRAINING_GROUND},
+        {"Inside Ganon's Castle", RA_GANONS_CASTLE},
     };
 
     for (int i = 0; i < RC_MAX; i++) {
@@ -56,6 +91,10 @@ Context::Context() {
     mSettings = std::make_shared<Settings>();
 }
 
+RandomizerArea Context::GetAreaFromString(std::string str) {
+    return mSpoilerfileAreaNameToEnum[str];
+}
+
 std::shared_ptr<Context> Context::CreateInstance() {
     if (mContext.expired()) {
         auto instance = std::make_shared<Context>();
@@ -74,9 +113,9 @@ Hint* Context::GetHint(const RandomizerHintKey hintKey) {
 }
 
 void Context::AddHint(const RandomizerHintKey hintId, const Text& text, const RandomizerCheck hintedLocation, const HintType hintType,
-                      const Text& hintedRegion) {
-    hintTable[hintId] = Hint(text, hintedLocation, hintType, hintedRegion);
-    GetItemLocation(hintedLocation)->SetHintKey(hintId);
+                      std::string distributionName, RandomizerArea hintedArea) {
+    hintTable[hintId] = Hint(text, hintedLocation, hintType, distributionName, hintedArea);
+    GetItemLocation(hintedLocation)->AddHintedBy(hintId);
 }
 
 ItemLocation* Context::GetItemLocation(const RandomizerCheck locKey) {
@@ -445,57 +484,64 @@ void Context::ParseHintJson(nlohmann::json spoilerFileJson) {
     // Child Altar
     std::string childAltarJsonText = spoilerFileJson["childAltar"]["hintText"].get<std::string>();
     std::string formattedChildAltarText = FormatJsonHintText(childAltarJsonText);
-    AddHint(RH_ALTAR_CHILD, Text(formattedChildAltarText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text());
+    AddHint(RH_ALTAR_CHILD, Text(formattedChildAltarText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static");
     mEmeraldLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["childAltar"]["rewards"]["emeraldLoc"]];
     mRubyLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["childAltar"]["rewards"]["rubyLoc"]];
     mSapphireLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["childAltar"]["rewards"]["sapphireLoc"]];
+
     // Adult Altar
     std::string adultAltarJsonText = spoilerFileJson["adultAltar"]["hintText"].get<std::string>();
     std::string formattedAdultAltarText = FormatJsonHintText(adultAltarJsonText);
-    AddHint(RH_ALTAR_ADULT, Text(formattedAdultAltarText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text());
+    AddHint(RH_ALTAR_ADULT, Text(formattedAdultAltarText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static");
     mForestMedallionLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["forestMedallionLoc"].get<std::string>()];
     mFireMedallionLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["fireMedallionLoc"].get<std::string>()];
     mWaterMedallionLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["waterMedallionLoc"].get<std::string>()];
     mShadowMedallionLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["shadowMedallionLoc"].get<std::string>()];
     mSpiritMedallionLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["spiritMedallionLoc"].get<std::string>()];
     mLightMedallionLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["lightMedallionLoc"].get<std::string>()];
+    
     // Ganondorf and Sheik Light Arrow Hints
     std::string ganonHintText = FormatJsonHintText(spoilerFileJson["ganonHintText"].get<std::string>());
     RandomizerCheck lightArrowLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["lightArrowHintLoc"].get<std::string>()];
     std::string lightArrowRegion = spoilerFileJson["lightArrowHintRegion"].get<std::string>();
-    AddHint(RH_GANONDORF_HINT, Text(ganonHintText), lightArrowLoc, HINT_TYPE_STATIC, Text(lightArrowRegion));
+    AddHint(RH_GANONDORF_HINT, Text(ganonHintText), lightArrowLoc, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[lightArrowRegion]);
     std::string sheikText = FormatJsonHintText(spoilerFileJson["sheikText"].get<std::string>());
     AddHint(RH_SHEIK_LIGHT_ARROWS, Text(sheikText), lightArrowLoc, HINT_TYPE_STATIC, lightArrowRegion);
     std::string ganonText = FormatJsonHintText(spoilerFileJson["ganonText"].get<std::string>());
-    AddHint(RH_GANONDORF_NOHINT, Text(ganonText), RC_UNKNOWN_CHECK, HINT_TYPE_JUNK, Text());
+    AddHint(RH_GANONDORF_NOHINT, Text(ganonText), RC_UNKNOWN_CHECK, HINT_TYPE_JUNK, "Static", RA_GANONS_CASTLE);
+    
     // Dampe Hookshot Hint
     std::string dampeText = FormatJsonHintText(spoilerFileJson["dampeText"].get<std::string>());
     std::string dampeRegion = spoilerFileJson["dampeRegion"].get<std::string>();
     RandomizerCheck dampeHintLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["dampeHintLoc"].get<std::string>()];
-    AddHint(RH_DAMPES_DIARY, Text(dampeText), dampeHintLoc, HINT_TYPE_STATIC, Text(dampeRegion));
+    AddHint(RH_DAMPES_DIARY, Text(dampeText), dampeHintLoc, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[dampeRegion]);
+    
     // Greg Hint
     std::string gregText = FormatJsonHintText(spoilerFileJson["gregText"].get<std::string>());
     std::string gregRegion = spoilerFileJson["gregRegion"].get<std::string>();
     RandomizerCheck gregLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["gregLoc"].get<std::string>()];
-    AddHint(RH_GREG_RUPEE, Text(gregText), gregLoc, HINT_TYPE_STATIC, Text(gregRegion));
+    AddHint(RH_GREG_RUPEE, Text(gregText), gregLoc, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[gregRegion]);
+    
     // Saria Magic Hint
     std::string sariaText = FormatJsonHintText(spoilerFileJson["sariaText"].get<std::string>());
     std::string sariaRegion = spoilerFileJson["sariaRegion"].get<std::string>();
     RandomizerCheck sariaHintLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["sariaHintLoc"].get<std::string>()];
-    AddHint(RH_SARIA, Text(sariaText), sariaHintLoc, HINT_TYPE_STATIC, Text(sariaRegion));
+    AddHint(RH_SARIA, Text(sariaText), sariaHintLoc, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[sariaRegion]);
+    
     // Warp Songs
-    std::string warpMinuetText = FormatJsonHintText(spoilerFileJson["warpMinuetText"].get<std::string>());
-    AddHint(RH_MINUET_WARP_LOC, Text(warpMinuetText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text(warpMinuetText));
+    std::string warpMinuetText = FormatJsonHintText(spoilerFileJson["warpMinuetText"].get<std::string>()); //RANDOTODO fall back for if location is used
+    AddHint(RH_MINUET_WARP_LOC, Text(warpMinuetText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[warpMinuetText]);
     std::string warpBoleroText = FormatJsonHintText(spoilerFileJson["warpBoleroText"].get<std::string>());
-    AddHint(RH_BOLERO_WARP_LOC, Text(warpBoleroText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text(warpBoleroText));
+    AddHint(RH_BOLERO_WARP_LOC, Text(warpBoleroText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[warpBoleroText]);
     std::string warpSerenadeText = FormatJsonHintText(spoilerFileJson["warpSerenadeText"].get<std::string>());
-    AddHint(RH_SERENADE_WARP_LOC, Text(warpSerenadeText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text(warpSerenadeText));
+    AddHint(RH_SERENADE_WARP_LOC, Text(warpSerenadeText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[warpSerenadeText]);
     std::string warpRequiemText = FormatJsonHintText(spoilerFileJson["warpRequiemText"].get<std::string>());
-    AddHint(RH_REQUIEM_WARP_LOC, Text(warpRequiemText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text(warpRequiemText));
+    AddHint(RH_REQUIEM_WARP_LOC, Text(warpRequiemText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[warpRequiemText]);
     std::string warpNocturneText = FormatJsonHintText(spoilerFileJson["warpNocturneText"].get<std::string>());
-    AddHint(RH_NOCTURNE_WARP_LOC, Text(warpNocturneText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text(warpNocturneText));
+    AddHint(RH_NOCTURNE_WARP_LOC, Text(warpNocturneText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[warpNocturneText]);
     std::string warpPreludeText = FormatJsonHintText(spoilerFileJson["warpPreludeText"].get<std::string>());
-    AddHint(RH_PRELUDE_WARP_LOC, Text(warpPreludeText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text(warpPreludeText));
+    AddHint(RH_PRELUDE_WARP_LOC, Text(warpPreludeText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[warpPreludeText]);
+    
     // Gossip Stones
     nlohmann::json hintsJson = spoilerFileJson["hints"];
     for (auto it = hintsJson.begin(); it != hintsJson.end(); ++it) {
diff --git a/soh/soh/Enhancements/randomizer/context.h b/soh/soh/Enhancements/randomizer/context.h
index 90f62eaac..4cbe26383 100644
--- a/soh/soh/Enhancements/randomizer/context.h
+++ b/soh/soh/Enhancements/randomizer/context.h
@@ -33,8 +33,8 @@ class Context {
     static std::shared_ptr<Context> CreateInstance();
     static std::shared_ptr<Context> GetInstance();
     Hint* GetHint(RandomizerHintKey hintKey);
-    void AddHint(RandomizerHintKey hintId, const Text& text, RandomizerCheck hintedLocation, HintType hintType,
-                 const Text& hintedRegion);
+    void AddHint(RandomizerHintKey hintId, const Text& text, RandomizerCheck hintedLocation, HintType hintType, std::string distributionName,
+                 RandomizerArea hintedArea = RA_NONE);
     ItemLocation* GetItemLocation(RandomizerCheck locKey);
     ItemLocation* GetItemLocation(size_t locKey);
     void PlaceItemInLocation(RandomizerCheck locKey, RandomizerGet item, bool applyEffectImmediately = false,
@@ -74,18 +74,19 @@ class Context {
     std::map<RandomizerCheck, ItemOverride> overrides = {};
     std::vector<std::vector<RandomizerCheck>> playthroughLocations = {};
     std::vector<RandomizerCheck> everyPossibleLocation = {};
-    std::vector<RandomizerCheck> wothLocations = {};
     std::vector<RandomizerGet> possibleIceTrapModels = {};
     std::unordered_map<RandomizerCheck, RandomizerGet> iceTrapModels = {};
     std::array<uint8_t, 5> hashIconIndexes = {};
     std::unordered_map<std::string, RandomizerCheck> mSpoilerfileCheckNameToEnum;
     bool playthroughBeatable = false;
     bool allLocationsReachable = false;
+    RandomizerArea GetAreaFromString(std::string str);
 
   private:
     static std::weak_ptr<Context> mContext;
     std::unordered_map<std::string, RandomizerGet> mSpoilerfileGetNameToEnum;
     std::unordered_map<std::string, HintType> mSpoilerfileHintTypeNameToEnum;
+    std::unordered_map<std::string, RandomizerArea> mSpoilerfileAreaNameToEnum;
     std::array<Hint, RH_MAX> hintTable = {};
     RandomizerCheck mEmeraldLoc = RC_UNKNOWN_CHECK;
     RandomizerCheck mRubyLoc = RC_UNKNOWN_CHECK;
diff --git a/soh/soh/Enhancements/randomizer/dungeon.cpp b/soh/soh/Enhancements/randomizer/dungeon.cpp
index ad600b594..8453c938b 100644
--- a/soh/soh/Enhancements/randomizer/dungeon.cpp
+++ b/soh/soh/Enhancements/randomizer/dungeon.cpp
@@ -7,11 +7,11 @@
 namespace Rando {
 DungeonInfo::DungeonInfo(std::string name_, const RandomizerHintTextKey hintKey_, const RandomizerGet map_,
     const RandomizerGet compass_, const RandomizerGet smallKey_, const RandomizerGet keyRing_,
-    const RandomizerGet bossKey_, const uint8_t vanillaKeyCount_, const uint8_t mqKeyCount_,
+    const RandomizerGet bossKey_, RandomizerArea area_, const uint8_t vanillaKeyCount_, const uint8_t mqKeyCount_,
     std::vector<RandomizerCheck> vanillaLocations_, std::vector<RandomizerCheck> mqLocations_,
     std::vector<RandomizerCheck> sharedLocations_, std::vector<RandomizerCheck> bossRoomLocations_)
     : name(std::move(name_)), hintKey(hintKey_), map(map_), compass(compass_), smallKey(smallKey_), keyRing(keyRing_),
-      bossKey(bossKey_), vanillaKeyCount(vanillaKeyCount_), mqKeyCount(mqKeyCount_),
+      bossKey(bossKey_), area(area_), vanillaKeyCount(vanillaKeyCount_), mqKeyCount(mqKeyCount_),
       vanillaLocations(std::move(vanillaLocations_)), mqLocations(std::move(mqLocations_)),
       sharedLocations(std::move(sharedLocations_)), bossRoomLocations(std::move(bossRoomLocations_)) {
 }
@@ -59,6 +59,10 @@ RandomizerHintTextKey DungeonInfo::GetHintKey() const {
     return hintKey;
 }
 
+RandomizerArea DungeonInfo::GetArea() const {
+    return area;
+}
+
 RandomizerGet DungeonInfo::GetSmallKey() const {
     return smallKey;
 }
@@ -148,7 +152,7 @@ std::vector<RandomizerCheck> DungeonInfo::GetEveryLocation() const {
 
 Dungeons::Dungeons() {
     dungeonList[DEKU_TREE] =
-        DungeonInfo("Deku Tree", RHT_DEKU_TREE, RG_DEKU_TREE_MAP, RG_DEKU_TREE_COMPASS, RG_NONE, RG_NONE, RG_NONE, 0, 0,
+        DungeonInfo("Deku Tree", RHT_DEKU_TREE, RG_DEKU_TREE_MAP, RG_DEKU_TREE_COMPASS, RG_NONE, RG_NONE, RG_NONE, RA_DEKU_TREE, 0, 0,
                     {
                         // Vanilla Locations
                         RC_DEKU_TREE_MAP_CHEST,
@@ -184,7 +188,7 @@ Dungeons::Dungeons() {
                         RC_QUEEN_GOHMA,
                     });
     dungeonList[DODONGOS_CAVERN] = DungeonInfo("Dodongo's Cavern", RHT_DODONGOS_CAVERN, RG_DODONGOS_CAVERN_MAP,
-                                               RG_DODONGOS_CAVERN_COMPASS, RG_NONE, RG_NONE, RG_NONE, 0, 0,
+                                               RG_DODONGOS_CAVERN_COMPASS, RG_NONE, RG_NONE, RG_NONE, RA_DODONGOS_CAVERN, 0, 0,
                                                {
                                                    // Vanilla Locations
                                                    RC_DODONGOS_CAVERN_MAP_CHEST,
@@ -228,7 +232,7 @@ Dungeons::Dungeons() {
                                                    RC_KING_DODONGO,
                                                });
     dungeonList[JABU_JABUS_BELLY] = DungeonInfo("Jabu Jabu's Belly", RHT_JABU_JABUS_BELLY, RG_JABU_JABUS_BELLY_MAP,
-                                                RG_JABU_JABUS_BELLY_COMPASS, RG_NONE, RG_NONE, RG_NONE, 0, 0,
+                                                RG_JABU_JABUS_BELLY_COMPASS, RG_NONE, RG_NONE, RG_NONE, RA_JABU_JABUS_BELLY, 0, 0,
                                                 {
                                                     // Vanilla Locations
                                                     RC_JABU_JABUS_BELLY_MAP_CHEST,
@@ -267,7 +271,7 @@ Dungeons::Dungeons() {
                                                 });
     dungeonList[FOREST_TEMPLE] =
         DungeonInfo("Forest Temple", RHT_FOREST_TEMPLE, RG_FOREST_TEMPLE_MAP, RG_FOREST_TEMPLE_COMPASS,
-                    RG_FOREST_TEMPLE_SMALL_KEY, RG_FOREST_TEMPLE_KEY_RING, RG_FOREST_TEMPLE_BOSS_KEY, 5, 6,
+                    RG_FOREST_TEMPLE_SMALL_KEY, RG_FOREST_TEMPLE_KEY_RING, RG_FOREST_TEMPLE_BOSS_KEY, RA_FOREST_TEMPLE, 5, 6,
                     {
                         // Vanilla Locations
                         RC_FOREST_TEMPLE_FIRST_ROOM_CHEST,
@@ -317,7 +321,7 @@ Dungeons::Dungeons() {
                     });
     dungeonList[FIRE_TEMPLE] =
         DungeonInfo("Fire Temple", RHT_FIRE_TEMPLE, RG_FIRE_TEMPLE_MAP, RG_FIRE_TEMPLE_COMPASS,
-                    RG_FIRE_TEMPLE_SMALL_KEY, RG_FIRE_TEMPLE_KEY_RING, RG_FIRE_TEMPLE_BOSS_KEY, 8, 5,
+                    RG_FIRE_TEMPLE_SMALL_KEY, RG_FIRE_TEMPLE_KEY_RING, RG_FIRE_TEMPLE_BOSS_KEY, RA_FIRE_TEMPLE, 8, 5,
                     {
                         // Vanilla Locations
                         RC_FIRE_TEMPLE_NEAR_BOSS_CHEST,
@@ -368,7 +372,7 @@ Dungeons::Dungeons() {
                     });
     dungeonList[WATER_TEMPLE] =
         DungeonInfo("Water Temple", RHT_WATER_TEMPLE, RG_WATER_TEMPLE_MAP, RG_WATER_TEMPLE_COMPASS,
-                    RG_WATER_TEMPLE_SMALL_KEY, RG_WATER_TEMPLE_KEY_RING, RG_WATER_TEMPLE_BOSS_KEY, 6, 2,
+                    RG_WATER_TEMPLE_SMALL_KEY, RG_WATER_TEMPLE_KEY_RING, RG_WATER_TEMPLE_BOSS_KEY, RA_WATER_TEMPLE, 6, 2,
                     {
                         // Vanilla Locations
                         RC_WATER_TEMPLE_MAP_CHEST,
@@ -409,7 +413,7 @@ Dungeons::Dungeons() {
                     });
     dungeonList[SPIRIT_TEMPLE] =
         DungeonInfo("Spirit Temple", RHT_SPIRIT_TEMPLE, RG_SPIRIT_TEMPLE_MAP, RG_SPIRIT_TEMPLE_COMPASS,
-                    RG_SPIRIT_TEMPLE_SMALL_KEY, RG_SPIRIT_TEMPLE_KEY_RING, RG_SPIRIT_TEMPLE_BOSS_KEY, 5, 7,
+                    RG_SPIRIT_TEMPLE_SMALL_KEY, RG_SPIRIT_TEMPLE_KEY_RING, RG_SPIRIT_TEMPLE_BOSS_KEY, RA_SPIRIT_TEMPLE, 5, 7,
                     {
                         // Vanilla Locations
                         RC_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST,
@@ -475,7 +479,7 @@ Dungeons::Dungeons() {
                     });
     dungeonList[SHADOW_TEMPLE] =
         DungeonInfo("Shadow Temple", RHT_SHADOW_TEMPLE, RG_SHADOW_TEMPLE_MAP, RG_SHADOW_TEMPLE_COMPASS,
-                    RG_SHADOW_TEMPLE_SMALL_KEY, RG_SHADOW_TEMPLE_KEY_RING, RG_SHADOW_TEMPLE_BOSS_KEY, 5, 6,
+                    RG_SHADOW_TEMPLE_SMALL_KEY, RG_SHADOW_TEMPLE_KEY_RING, RG_SHADOW_TEMPLE_BOSS_KEY, RA_SHADOW_TEMPLE, 5, 6,
                     {
                         // Vanilla Locations
                         RC_SHADOW_TEMPLE_MAP_CHEST,
@@ -537,7 +541,7 @@ Dungeons::Dungeons() {
                     });
     dungeonList[BOTTOM_OF_THE_WELL] = DungeonInfo(
         "Bottom of the Well", RHT_BOTTOM_OF_THE_WELL, RG_BOTTOM_OF_THE_WELL_MAP, RG_BOTTOM_OF_THE_WELL_COMPASS,
-        RG_BOTTOM_OF_THE_WELL_SMALL_KEY, RG_BOTTOM_OF_THE_WELL_KEY_RING, RG_NONE, 3, 2,
+        RG_BOTTOM_OF_THE_WELL_SMALL_KEY, RG_BOTTOM_OF_THE_WELL_KEY_RING, RG_NONE, RA_BOTTOM_OF_THE_WELL, 3, 2,
         {
             // Vanilla Locations
             RC_BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST,
@@ -571,7 +575,7 @@ Dungeons::Dungeons() {
         },
         {}, {});
     dungeonList[ICE_CAVERN] = DungeonInfo("Ice Cavern", RHT_ICE_CAVERN, RG_ICE_CAVERN_MAP, RG_ICE_CAVERN_COMPASS,
-                                          RG_NONE, RG_NONE, RG_NONE, 0, 0,
+                                          RG_NONE, RG_NONE, RG_NONE, RA_ICE_CAVERN, 0, 0,
                                           {
                                               // Vanilla Locations
                                               RC_ICE_CAVERN_MAP_CHEST,
@@ -599,7 +603,7 @@ Dungeons::Dungeons() {
                                           {});
     dungeonList[GERUDO_TRAINING_GROUNDS] =
         DungeonInfo("Gerudo Training Grounds", RHT_GERUDO_TRAINING_GROUND, RG_NONE, RG_NONE,
-                    RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, RG_GERUDO_TRAINING_GROUNDS_KEY_RING, RG_NONE, 9, 3,
+                    RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, RG_GERUDO_TRAINING_GROUNDS_KEY_RING, RG_NONE, RA_GERUDO_TRAINING_GROUND, 9, 3,
                     {
                         // Vanilla Locations
                         RC_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST,
@@ -648,7 +652,7 @@ Dungeons::Dungeons() {
                     {}, {});
     dungeonList[GANONS_CASTLE] =
         DungeonInfo("Ganon's Castle", RHT_GANONS_CASTLE, RG_NONE, RG_NONE, RG_GANONS_CASTLE_SMALL_KEY,
-                    RG_GANONS_CASTLE_KEY_RING, RG_GANONS_CASTLE_BOSS_KEY, 2, 3,
+                    RG_GANONS_CASTLE_KEY_RING, RG_GANONS_CASTLE_BOSS_KEY, RA_GANONS_CASTLE, 2, 3,
                     {
                         // Vanilla Locations
                         RC_GANONS_CASTLE_FOREST_TRIAL_CHEST,
diff --git a/soh/soh/Enhancements/randomizer/dungeon.h b/soh/soh/Enhancements/randomizer/dungeon.h
index 068c2ea40..a2338441d 100644
--- a/soh/soh/Enhancements/randomizer/dungeon.h
+++ b/soh/soh/Enhancements/randomizer/dungeon.h
@@ -11,8 +11,8 @@ namespace Rando {
 class DungeonInfo {
   public:
     DungeonInfo(std::string name_, RandomizerHintTextKey hintKey_, RandomizerGet map_, RandomizerGet compass_,
-                RandomizerGet smallKey_, RandomizerGet keyRing_, RandomizerGet bossKey_, uint8_t vanillaKeyCount_,
-                uint8_t mqKeyCount_, std::vector<RandomizerCheck> vanillaLocations_,
+                RandomizerGet smallKey_, RandomizerGet keyRing_, RandomizerGet bossKey_, RandomizerArea area_, 
+                uint8_t vanillaKeyCount_, uint8_t mqKeyCount_, std::vector<RandomizerCheck> vanillaLocations_,
                 std::vector<RandomizerCheck> mqLocations_, std::vector<RandomizerCheck> sharedLocations_,
                 std::vector<RandomizerCheck> bossRoomLocations_);
     DungeonInfo();
@@ -28,6 +28,7 @@ class DungeonInfo {
     bool IsVanilla() const;
     uint8_t GetSmallKeyCount() const;
     RandomizerHintTextKey GetHintKey() const;
+    RandomizerArea GetArea() const;
     RandomizerGet GetSmallKey() const;
     RandomizerGet GetKeyRing() const;
     RandomizerGet GetMap() const;
@@ -43,6 +44,7 @@ class DungeonInfo {
   private:
     std::string name;
     RandomizerHintTextKey hintKey;
+    RandomizerArea area;
     RandomizerGet map;
     RandomizerGet compass;
     RandomizerGet smallKey;
diff --git a/soh/soh/Enhancements/randomizer/entrance.cpp b/soh/soh/Enhancements/randomizer/entrance.cpp
index 766ca38cc..0e32631b5 100644
--- a/soh/soh/Enhancements/randomizer/entrance.cpp
+++ b/soh/soh/Enhancements/randomizer/entrance.cpp
@@ -459,7 +459,7 @@ static bool ValidateWorld(Entrance* entrancePlaced) {
     // Conditions will be checked during the search and any that fail will be figured out
     // afterwards
     Logic::LogicReset();
-    GetAccessibleLocations({}, SearchMode::ValidateWorld, "", checkPoeCollectorAccess, checkOtherEntranceAccess);
+    GetAccessibleLocations({}, SearchMode::ValidateWorld, RG_NONE, checkPoeCollectorAccess, checkOtherEntranceAccess);
 
     if (!ctx->GetOption(RSK_DECOUPLED_ENTRANCES)) {
         // Unless entrances are decoupled, we don't want the player to end up through certain entrances as the wrong age
@@ -521,10 +521,10 @@ static bool ValidateWorld(Entrance* entrancePlaced) {
         // When cows are shuffled, ensure both Impa's House entrances are in the same hint area because the cow is
         // reachable from both sides
         if (ctx->GetOption(RSK_SHUFFLE_COWS)) {
-            auto impasHouseFrontHintRegion = GetHintRegionHintKey(RR_KAK_IMPAS_HOUSE);
-            auto impasHouseBackHintRegion = GetHintRegionHintKey(RR_KAK_IMPAS_HOUSE_BACK);
-            if (impasHouseFrontHintRegion != RHT_NONE && impasHouseBackHintRegion != RHT_NONE &&
-                impasHouseBackHintRegion != RHT_LINKS_POCKET && impasHouseFrontHintRegion != RHT_LINKS_POCKET &&
+            auto impasHouseFrontHintRegion = areaTable[RR_KAK_IMPAS_HOUSE].GetArea();
+            auto impasHouseBackHintRegion = areaTable[RR_KAK_IMPAS_HOUSE_BACK].GetArea();
+            if (impasHouseFrontHintRegion != RA_NONE && impasHouseBackHintRegion != RA_NONE &&
+                impasHouseBackHintRegion != RA_LINKS_POCKET && impasHouseFrontHintRegion != RA_LINKS_POCKET &&
                 impasHouseBackHintRegion != impasHouseFrontHintRegion) {
                 auto message = "Kak Impas House entrances are not in the same hint area\n";
                 SPDLOG_DEBUG(message);
@@ -805,7 +805,7 @@ bool EntranceShuffler::PlaceOtherImpasHouseEntrance(std::vector<Entrance*> entra
         // If the entrance is already connected or it doesn't have the same hint region as the already placed impas
         // house entrance, then don't try to use it
         if (entrance->GetConnectedRegionKey() != RR_NONE ||
-            (GetHintRegionHintKey(otherImpaRegion) != GetHintRegionHintKey(entrance->GetParentRegionKey()))) {
+            (areaTable[otherImpaRegion].GetArea() != areaTable[entrance->GetParentRegionKey()].GetArea())) {
             continue;
         }
         // If the placement succeeds, we return true
diff --git a/soh/soh/Enhancements/randomizer/hint.cpp b/soh/soh/Enhancements/randomizer/hint.cpp
index a6af0afd6..3827c40f8 100644
--- a/soh/soh/Enhancements/randomizer/hint.cpp
+++ b/soh/soh/Enhancements/randomizer/hint.cpp
@@ -3,9 +3,9 @@
 namespace Rando {
 Hint::Hint() : text(std::move(Text())) {}
 Hint::Hint(Text text_): text(std::move(text_)) {}
-Hint::Hint(Text text_, RandomizerCheck hintedLocation_, HintType hintType_, Text hintedRegion_)
+Hint::Hint(Text text_, RandomizerCheck hintedLocation_, HintType hintType_, std::string distributionName_, RandomizerArea hintedArea_)
     : text(std::move(text_)), hintedLocation(hintedLocation_), hintType(hintType_),
-      hintedRegion(std::move(hintedRegion_)) {
+      hintedArea(hintedArea_), distribution(std::move(distributionName_)) {
 }
 
 const Text& Hint::GetText() const {
@@ -28,17 +28,22 @@ HintType Hint::GetHintType() {
     return hintType;
 }
 
-void Hint::SetHintedRegion(Text region) {
-    hintedRegion = region;
+void Hint::SetHintedArea(RandomizerArea area) {
+    hintedArea = area;
 }
 
-std::string Hint::GetHintedRegion() {
-    return hintedRegion.GetEnglish();
+RandomizerArea Hint::GetHintedArea() {
+    return hintedArea;
+}
+
+void Hint::SetDistribution(std::string distributionName) {
+    distribution = distributionName;
+}
+
+const std::string& Hint::GetDistribution() {
+    return distribution;
 }
 
-const Text& Hint::GetHintedRegionText() {
-    return hintedRegion;
-};
 
 void Hint::ResetVariables() {
     hintedLocation = RC_UNKNOWN_CHECK;
diff --git a/soh/soh/Enhancements/randomizer/hint.h b/soh/soh/Enhancements/randomizer/hint.h
index fe97611ce..4b76cd691 100644
--- a/soh/soh/Enhancements/randomizer/hint.h
+++ b/soh/soh/Enhancements/randomizer/hint.h
@@ -8,15 +8,16 @@ class Hint {
     public:
     Hint();
     Hint(Text text_);
-    Hint(Text text_, RandomizerCheck hintedLocation_, HintType hintType_, Text hintedRegion_);
+    Hint(Text text_, RandomizerCheck hintedLocation_, HintType hintType_, std::string distributionName_, RandomizerArea hintedArea_);
     const Text& GetText() const;
     RandomizerCheck GetHintedLocation();
     void SetHintedLocation (RandomizerCheck location);
     HintType GetHintType();
     void SetHintType (HintType type);
-    std::string GetHintedRegion();
-    const Text& GetHintedRegionText();
-    void SetHintedRegion (Text region);
+    RandomizerArea GetHintedArea();
+    void SetHintedArea (RandomizerArea area);
+    const std::string& GetDistribution();
+    void SetDistribution (std::string distribution);
     void ResetVariables();
     bool IsAddedToPool();
     void AddToPool();
@@ -25,7 +26,8 @@ class Hint {
     Text text = Text();
     RandomizerCheck hintedLocation = RC_UNKNOWN_CHECK;
     HintType hintType = HINT_TYPE_STATIC;
-    Text hintedRegion = Text();
+    RandomizerArea hintedArea = RA_NONE;
+    std::string distribution = "";
     bool addedToPool = false;
 };
 }
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/item.cpp b/soh/soh/Enhancements/randomizer/item.cpp
index d62d4863c..4fdc2ad72 100644
--- a/soh/soh/Enhancements/randomizer/item.cpp
+++ b/soh/soh/Enhancements/randomizer/item.cpp
@@ -98,6 +98,10 @@ ItemType Item::GetItemType() const {
     return type;
 }
 
+std::variant<bool*, uint8_t*> Item::GetLogicVar() const {
+    return logicVar;
+}
+
 RandomizerGet Item::GetRandomizerGet() const {
     return randomizerGet;
 }
diff --git a/soh/soh/Enhancements/randomizer/item.h b/soh/soh/Enhancements/randomizer/item.h
index cfb99a593..d1610a7bc 100644
--- a/soh/soh/Enhancements/randomizer/item.h
+++ b/soh/soh/Enhancements/randomizer/item.h
@@ -51,6 +51,7 @@ class Item {
     bool IsAdvancement() const;
     int GetItemID() const;
     ItemType GetItemType() const;
+    std::variant<bool*, uint8_t*> GetLogicVar() const;
     RandomizerGet GetRandomizerGet() const;
     uint16_t GetPrice() const;
     std::shared_ptr<GetItemEntry> GetGIEntry() const;
diff --git a/soh/soh/Enhancements/randomizer/item_list.cpp b/soh/soh/Enhancements/randomizer/item_list.cpp
index e2311cdf7..45151e99c 100644
--- a/soh/soh/Enhancements/randomizer/item_list.cpp
+++ b/soh/soh/Enhancements/randomizer/item_list.cpp
@@ -209,24 +209,24 @@ void Rando::StaticData::InitItemTable() {
     itemTable[RG_TREASURE_GAME_HEART] =                 Item(RG_TREASURE_GAME_HEART,              Text{ "Piece of Heart (WINNER)", "Quart de Coeur (Chasse-aux-Trésors)", "Herzstück (Schatztruhen-Minispiel)" },   ITEMTYPE_ITEM,              GI_HEART_PIECE_WIN, true,  &Logic::PieceOfHeart,        RHT_TREASURE_GAME_HEART,    ITEM_HEART_PIECE_2,             OBJECT_GI_HEARTS,       GID_HEART_PIECE,    0xFA,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
     itemTable[RG_TREASURE_GAME_GREEN_RUPEE] =           Item(RG_TREASURE_GAME_GREEN_RUPEE,        Text{ "Green Rupee (LOSER)", "Rubis Vert (Chasse-aux-Trésors)", "Grüne Rupie (Schatztruhe-Minispiel)" },          ITEMTYPE_ITEM,              GI_RUPEE_GREEN_LOSE,false, &Logic::noVariable,          RHT_TREASURE_GAME_GREEN_RUPEE,ITEM_RUPEE_GREEN,             OBJECT_GI_RUPY,         GID_RUPEE_GREEN,    0xF4,                        0x00, CHEST_ANIM_SHORT, ITEM_CATEGORY_MAJOR,  MOD_NONE);
     // Shop
-    itemTable[RG_BUY_DEKU_NUT_5] =                      Item(RG_BUY_DEKU_NUT_5,                   Text{ "Buy Deku Nut (5)", "Acheter: Noix Mojo (5)", "Deku-Nuss kaufen (5)" },                                     ITEMTYPE_SHOP,              GI_NUTS_5_2,        true,  &Logic::Nuts,                RHT_DEKU_NUTS_5,            ITEM_NUTS_5,                    OBJECT_GI_NUTS,         GID_NUTS,           0x34,                        0x0C, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 15);
+    itemTable[RG_BUY_DEKU_NUTS_5] =                     Item(RG_BUY_DEKU_NUTS_5,                  Text{ "Buy Deku Nut (5)", "Acheter: Noix Mojo (5)", "Deku-Nuss kaufen (5)" },                                     ITEMTYPE_SHOP,              GI_NUTS_5_2,        true,  &Logic::Nuts,                RHT_DEKU_NUTS_5,            ITEM_NUTS_5,                    OBJECT_GI_NUTS,         GID_NUTS,           0x34,                        0x0C, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 15);
     itemTable[RG_BUY_ARROWS_30] =                       Item(RG_BUY_ARROWS_30,                    Text{ "Buy Arrows (30)", "Acheter: Flèches (30)", "Pfeile kaufen (30)" },                                         ITEMTYPE_SHOP,              GI_ARROWS_MEDIUM,   true,  &Logic::BuyArrow,            RHT_ARROWS_30,              ITEM_ARROWS_MEDIUM,             OBJECT_GI_ARROW,        GID_ARROWS_MEDIUM,  0xE6,                        0x49, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 60);
     itemTable[RG_BUY_ARROWS_50] =                       Item(RG_BUY_ARROWS_50,                    Text{ "Buy Arrows (50)", "Acheter: Flèches (50)", "Pfeile kaufen (50)" },                                         ITEMTYPE_SHOP,              GI_ARROWS_LARGE,    true,  &Logic::BuyArrow,            RHT_ARROWS_30,              ITEM_ARROWS_LARGE,              OBJECT_GI_ARROW,        GID_ARROWS_LARGE,   0xE6,                        0x4A, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 90);
     itemTable[RG_BUY_BOMBS_525] =                       Item(RG_BUY_BOMBS_525,                    Text{ "Buy Bombs (5) [25]", "Acheter: Bombes (5) [25]", "Bomben kaufen (5) [25]" },                               ITEMTYPE_SHOP,              GI_BOMBS_5,         true,  &Logic::BuyBomb,             RHT_BOMBS_5,                ITEM_BOMBS_5,                   OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 25);
-    itemTable[RG_BUY_DEKU_NUT_10] =                     Item(RG_BUY_DEKU_NUT_10,                  Text{ "Buy Deku Nut (10)", "Acheter: Noix Mojo (10)", "Deku-Nuss kaufen (10)" },                                  ITEMTYPE_SHOP,              GI_NUTS_10,         true,  &Logic::Nuts,                RHT_DEKU_NUTS_10,           ITEM_NUTS_10,                   OBJECT_GI_NUTS,         GID_NUTS,           0x34,                        0x0C, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
+    itemTable[RG_BUY_DEKU_NUTS_10] =                    Item(RG_BUY_DEKU_NUTS_10,                 Text{ "Buy Deku Nut (10)", "Acheter: Noix Mojo (10)", "Deku-Nuss kaufen (10)" },                                  ITEMTYPE_SHOP,              GI_NUTS_10,         true,  &Logic::Nuts,                RHT_DEKU_NUTS_10,           ITEM_NUTS_10,                   OBJECT_GI_NUTS,         GID_NUTS,           0x34,                        0x0C, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
     itemTable[RG_BUY_DEKU_STICK_1] =                    Item(RG_BUY_DEKU_STICK_1,                 Text{ "Buy Deku Stick (1)", "Acheter: Bâton Mojo (1)", "Deku-Stick kaufen (1)" },                                 ITEMTYPE_SHOP,              GI_STICKS_1,        true,  &Logic::Sticks,              RHT_DEKU_STICK_1,           ITEM_STICK,                     OBJECT_GI_STICK,        GID_STICK,          0x37,                        0x0D, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 10);
     itemTable[RG_BUY_BOMBS_10] =                        Item(RG_BUY_BOMBS_10,                     Text{ "Buy Bombs (10)", "Acheter: Bombes (10)", "Bomben kaufen (10)" },                                           ITEMTYPE_SHOP,              GI_BOMBS_10,        true,  &Logic::BuyBomb,             RHT_BOMBS_10,               ITEM_BOMBS_10,                  OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 50);
     itemTable[RG_BUY_FISH] =                            Item(RG_BUY_FISH,                         Text{ "Buy Fish", "Acheter: Poisson", "Fisch kaufen" },                                                           ITEMTYPE_SHOP,              GI_FISH,            true,  &Logic::FishAccess,          RHT_BOTTLE_WITH_FISH,       ITEM_FISH,                      OBJECT_GI_FISH,         GID_FISH,           0x47,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 200);
     itemTable[RG_BUY_RED_POTION_30] =                   Item(RG_BUY_RED_POTION_30,                Text{ "Buy Red Potion [30]", "Acheter: Potion Rouge [30]", "Rotes Elixier kaufen [30]" },                         ITEMTYPE_SHOP,              GI_POTION_RED,      false, &Logic::noVariable,          RHT_BOTTLE_WITH_RED_POTION, ITEM_POTION_RED,                OBJECT_GI_LIQUID,       GID_POTION_RED,     0x43,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
-    itemTable[RG_BUY_GREEN_POTION] =                    Item(RG_BUY_GREEN_POTION,                 Text{ "Buy Green Potion", "Acheter: Potion Verte", "Grünes Elixier kaufen" },                                     ITEMTYPE_SHOP,              GI_POTION_GREEN,    true,  &Logic::BuyGPotion,          RHT_BOTTLE_WITH_GREEN_POTION,ITEM_POTION_GREEN,             OBJECT_GI_LIQUID,       GID_POTION_GREEN,   0x44,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
-    itemTable[RG_BUY_BLUE_POTION] =                     Item(RG_BUY_BLUE_POTION,                  Text{ "Buy Blue Potion", "Acheter: Potion Bleue", "Blaues Elixier kaufen" },                                      ITEMTYPE_SHOP,              GI_POTION_BLUE,     true,  &Logic::BuyBPotion,          RHT_BOTTLE_WITH_BLUE_POTION,ITEM_POTION_BLUE,               OBJECT_GI_LIQUID,       GID_POTION_BLUE,    0x45,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 100);
+    itemTable[RG_BUY_GREEN_POTION] =                    Item(RG_BUY_GREEN_POTION,                 Text{ "Buy Green Potion", "Acheter: Potion Verte", "Grünes Elixier kaufen" },                                     ITEMTYPE_SHOP,              GI_POTION_GREEN,    true,  &Logic::BuyMagicPotion,          RHT_BOTTLE_WITH_GREEN_POTION,ITEM_POTION_GREEN,             OBJECT_GI_LIQUID,       GID_POTION_GREEN,   0x44,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
+    itemTable[RG_BUY_BLUE_POTION] =                     Item(RG_BUY_BLUE_POTION,                  Text{ "Buy Blue Potion", "Acheter: Potion Bleue", "Blaues Elixier kaufen" },                                      ITEMTYPE_SHOP,              GI_POTION_BLUE,     true,  &Logic::BuyMagicPotion,          RHT_BOTTLE_WITH_BLUE_POTION,ITEM_POTION_BLUE,               OBJECT_GI_LIQUID,       GID_POTION_BLUE,    0x45,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 100);
     itemTable[RG_BUY_HYLIAN_SHIELD] =                   Item(RG_BUY_HYLIAN_SHIELD,                Text{ "Buy Hylian Shield", "Acheter: Bouclier Hylien", "Hylianischer Schild kaufen" },                            ITEMTYPE_SHOP,              GI_SHIELD_HYLIAN,   true,  &Logic::HylianShield,        RHT_HYLIAN_SHIELD,          ITEM_SHIELD_HYLIAN,             OBJECT_GI_SHIELD_2,     GID_SHIELD_HYLIAN,  0x4D,                        0xA0, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE, false, 80);
     itemTable[RG_BUY_DEKU_SHIELD] =                     Item(RG_BUY_DEKU_SHIELD,                  Text{ "Buy Deku Shield", "Acheter: Bouclier Mojo", "Deku-Schild kaufen" },                                        ITEMTYPE_SHOP,              GI_SHIELD_DEKU,     true,  &Logic::DekuShield,          RHT_DEKU_SHIELD,            ITEM_SHIELD_DEKU,               OBJECT_GI_SHIELD_1,     GID_SHIELD_DEKU,    0x4C,                        0xA0, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE, false, 40);
     itemTable[RG_BUY_GORON_TUNIC] =                     Item(RG_BUY_GORON_TUNIC,                  Text{ "Buy Goron Tunic", "Acheter: Tunique Goron", "Goronen-Tunika kaufen" },                                     ITEMTYPE_SHOP,              GI_TUNIC_GORON,     true,  &Logic::GoronTunic,          RHT_GORON_TUNIC,            ITEM_TUNIC_GORON,               OBJECT_GI_CLOTHES,      GID_TUNIC_GORON,    0x50,                        0xA0, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE, false, 200);
     itemTable[RG_BUY_ZORA_TUNIC] =                      Item(RG_BUY_ZORA_TUNIC,                   Text{ "Buy Zora Tunic", "Acheter: Tunique Zora", "Zora-Tunika kaufen" },                                          ITEMTYPE_SHOP,              GI_TUNIC_ZORA,      true,  &Logic::ZoraTunic,           RHT_ZORA_TUNIC,             ITEM_TUNIC_ZORA,                OBJECT_GI_CLOTHES,      GID_TUNIC_ZORA,     0x51,                        0xA0, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE, false, 300);
     itemTable[RG_BUY_HEART] =                           Item(RG_BUY_HEART,                        Text{ "Buy Heart", "Acheter: Coeur de Vie", "Herz kaufen" },                                                      ITEMTYPE_SHOP,              GI_HEART,           false, &Logic::noVariable,          RHT_RECOVERY_HEART,         ITEM_HEART,                     OBJECT_GI_HEART,        GID_HEART,          0x55,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 10);
-    itemTable[RG_BUY_BOMBCHU_10] =                      Item(RG_BUY_BOMBCHU_10,                   Text{ "Buy Bombchu (10)", "Acheter: Missiles (10)", "Bomchu kaufen (10)" },                                       ITEMTYPE_SHOP,              GI_BOMBCHUS_10,     true,  &Logic::BuyBombchus10,       RHT_BOMBCHU_10,             ITEM_BOMBCHU,                   OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 99);
-    itemTable[RG_BUY_BOMBCHU_20] =                      Item(RG_BUY_BOMBCHU_20,                   Text{ "Buy Bombchu (20)", "Acheter: Missiles (20)", "Bomchu kaufen (20)" },                                       ITEMTYPE_SHOP,              GI_BOMBCHUS_20,     true,  &Logic::BuyBombchus20,       RHT_BOMBCHU_20,             ITEM_BOMBCHUS_20,               OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 180);
+    itemTable[RG_BUY_BOMBCHU_10] =                      Item(RG_BUY_BOMBCHU_10,                   Text{ "Buy Bombchu (10)", "Acheter: Missiles (10)", "Bomchu kaufen (10)" },                                       ITEMTYPE_SHOP,              GI_BOMBCHUS_10,     true,  &Logic::BuyBombchus,         RHT_BOMBCHU_10,             ITEM_BOMBCHU,                   OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 99);
+    itemTable[RG_BUY_BOMBCHU_20] =                      Item(RG_BUY_BOMBCHU_20,                   Text{ "Buy Bombchu (20)", "Acheter: Missiles (20)", "Bomchu kaufen (20)" },                                       ITEMTYPE_SHOP,              GI_BOMBCHUS_20,     true,  &Logic::BuyBombchus,         RHT_BOMBCHU_20,             ITEM_BOMBCHUS_20,               OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 180);
     itemTable[RG_BUY_DEKU_SEEDS_30] =                   Item(RG_BUY_DEKU_SEEDS_30,                Text{ "Buy Deku Seeds (30)", "Acheter: Graines Mojo (30)", "Deku-Samen kaufen (30)" },                            ITEMTYPE_SHOP,              GI_SEEDS_30,        true,  &Logic::BuySeed,             RHT_DEKU_SEEDS_30,          ITEM_SEEDS_30,                  OBJECT_GI_SEED,         GID_SEEDS,          0xDC,                        0x50, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
     itemTable[RG_SOLD_OUT] =                            Item(RG_SOLD_OUT,                         Text{ "Sold Out", "Rupture de stock", "Ausverkauft" },                                                            ITEMTYPE_SHOP,              RG_SOLD_OUT,        false, &Logic::noVariable,          RHT_NONE, false, 0);
     itemTable[RG_BUY_BLUE_FIRE] =                       Item(RG_BUY_BLUE_FIRE,                    Text{ "Buy Blue Fire", "Acheter: Flamme Bleue", "Blaues Feuer kaufen" },                                          ITEMTYPE_SHOP,              GI_BLUE_FIRE,       true,  &Logic::BlueFireAccess,      RHT_BOTTLE_WITH_BLUE_FIRE,  ITEM_BLUE_FIRE,                 OBJECT_GI_FIRE,         GID_BLUE_FIRE,      0x5D,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 300);
diff --git a/soh/soh/Enhancements/randomizer/item_location.cpp b/soh/soh/Enhancements/randomizer/item_location.cpp
index f17bfb6e0..468a01ec1 100644
--- a/soh/soh/Enhancements/randomizer/item_location.cpp
+++ b/soh/soh/Enhancements/randomizer/item_location.cpp
@@ -59,6 +59,14 @@ RandomizerRegion ItemLocation::GetParentRegionKey() const {
     return parentRegion;
 }
 
+void ItemLocation::SetArea(RandomizerArea newArea) {
+    area = newArea;
+}
+
+RandomizerArea ItemLocation::GetArea() const {
+    return area;
+}
+
 void ItemLocation::PlaceVanillaItem() {
     placedItem = StaticData::GetLocation(rc)->GetVanillaItem();
 }
@@ -106,12 +114,12 @@ void ItemLocation::SetAsHinted() {
     hintedAt = true;
 }
 
-RandomizerHintKey ItemLocation::GetHintKey() const {
+const std::vector<RandomizerHintKey>& ItemLocation::GetHintedBy() const {
     return hintedBy;
 }
 
-void ItemLocation::SetHintKey(const RandomizerHintKey hintKey) {
-    hintedBy = hintKey;
+void ItemLocation::AddHintedBy(const RandomizerHintKey hintKey) {
+    hintedBy.push_back(hintKey);
 } 
 
 bool ItemLocation::IsHidden() const {
@@ -161,15 +169,34 @@ void ItemLocation::SetVisible(const bool visibleInImGui_) {
 
 }
 
+bool ItemLocation::IsWothCandidate() const {
+    return wothCandidate;
+}
+
+void ItemLocation::SetWothCandidate() {
+    wothCandidate = true;
+}
+
+bool ItemLocation::IsBarrenCandidate() const {
+    return barrenCandidate;
+}
+
+void ItemLocation::SetBarrenCandidate() {
+    barrenCandidate = true;
+}
+
 void ItemLocation::ResetVariables() {
     addedToPool = false;
     placedItem = RG_NONE;
     delayedItem = RG_NONE;
     isHintable = false;
     hintedAt = false;
-    hintedBy = RH_NONE;
+    hintedBy = {};
     price = 0;
     hasCustomPrice = false;
     hidden = false;
+    wothCandidate = false;
+    barrenCandidate = false;
+    area = RA_NONE;
 }
 }
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/item_location.h b/soh/soh/Enhancements/randomizer/item_location.h
index c9d470c9f..79ceaec01 100644
--- a/soh/soh/Enhancements/randomizer/item_location.h
+++ b/soh/soh/Enhancements/randomizer/item_location.h
@@ -22,6 +22,8 @@ class ItemLocation {
     void SetDelayedItem(RandomizerGet item);
     RandomizerRegion GetParentRegionKey() const;
     void SetParentRegion (RandomizerRegion region);
+    RandomizerArea GetArea() const;
+    void SetArea (RandomizerArea region);
     void PlaceVanillaItem();
     void ApplyPlacedItemEffect() const;
     void SaveDelayedItem();
@@ -33,8 +35,8 @@ class ItemLocation {
     void SetAsHintable();
     bool IsHintedAt() const;
     void SetAsHinted();
-    RandomizerHintKey GetHintKey() const;
-    void SetHintKey(RandomizerHintKey hintKey);
+    const std::vector<RandomizerHintKey>& GetHintedBy() const;
+    void AddHintedBy(RandomizerHintKey hintKey);
     bool IsHidden() const;
     bool IsExcluded() const;
     void AddExcludeOption();
@@ -42,11 +44,15 @@ class ItemLocation {
     void SetHidden(bool hidden_);
     bool IsVisible() const;
     void SetVisible(bool visibleInImGui_);
+    bool IsWothCandidate() const;
+    void SetWothCandidate();
+    bool IsBarrenCandidate() const;
+    void SetBarrenCandidate();
     void ResetVariables();
 
   private:
     RandomizerCheck rc;
-    RandomizerHintKey hintedBy = RH_NONE;
+    std::vector<RandomizerHintKey> hintedBy = {};
     bool hintedAt = false;
     bool isHintable = false;
     bool addedToPool = false;
@@ -55,8 +61,11 @@ class ItemLocation {
     Option excludedOption = Option::Bool(StaticData::GetLocation(rc)->GetName(), {"Include", "Exclude"});
     uint16_t price = 0;
     RandomizerRegion parentRegion = RR_NONE;
+    RandomizerArea area = RA_NONE;
     bool hasCustomPrice = false;
     bool hidden = false;
     bool visibleInImGui = false;
+    bool wothCandidate = false;
+    bool barrenCandidate = false;
 };
 } // namespace Rando
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/location_list.cpp b/soh/soh/Enhancements/randomizer/location_list.cpp
index 1747f1790..be78d8acf 100644
--- a/soh/soh/Enhancements/randomizer/location_list.cpp
+++ b/soh/soh/Enhancements/randomizer/location_list.cpp
@@ -546,172 +546,172 @@ using namespace Rando;
 
 void Rando::StaticData::InitLocationTable() {
     // clang-format off
-    locationTable[RC_UNKNOWN_CHECK] =                               Location::Base(RC_UNKNOWN_CHECK,                        RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_INVALID,         ACTOR_ID_MAX,         SCENE_ID_MAX,                     0x00,                         0x00, "Invalid Location",                  "Invalid Location",                     RHT_NONE,                                RG_NONE,                  {},                                                                           SpoilerCollectionCheck::None());
-    //            Randomizer Check                                                 Randomizer Check                         Quest         Type                Area                    Actor ID              Scene ID                          Params                        Flags Short Name                            Spoiler Name                           Hint Text Key                            Vanilla Item              Categories                 Spoiler Collection Check                           Collection Check Group                             Vanilla Progression
+    locationTable[RC_UNKNOWN_CHECK] =                               Location::Base(RC_UNKNOWN_CHECK,                        RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_INVALID,         ACTOR_ID_MAX,         SCENE_ID_MAX,                     0x00,                         0x00, "Invalid Location",                  "Invalid Location",                     RHT_NONE,                                 RG_NONE,                     {},                                                                           SpoilerCollectionCheck::None());
+    //            Randomizer Check                                                 Randomizer Check                         Quest         Type                Area                    Actor ID              Scene ID                          Params                        Flags Short Name                            Spoiler Name                           Hint Text Key                             Vanilla Item                 Categories                 Spoiler Collection Check                           Collection Check Group                             Vanilla Progression
     // Kokiri Forest
-    locationTable[RC_KF_KOKIRI_SWORD_CHEST] =                      Location::Chest(RC_KF_KOKIRI_SWORD_CHEST,                RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KOKIRI_FOREST,   ACTOR_EN_BOX,         SCENE_KOKIRI_FOREST,              1248,                         0x00, "Kokiri Sword Chest",                "KF Kokiri Sword Chest",                RHT_KF_KOKIRI_SWORD_CHEST,               RG_KOKIRI_SWORD,          {},                                                                           SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST,  true);
-    locationTable[RC_KF_MIDOS_TOP_LEFT_CHEST] =                    Location::Chest(RC_KF_MIDOS_TOP_LEFT_CHEST,              RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KOKIRI_FOREST,   ACTOR_EN_BOX,         SCENE_MIDOS_HOUSE,                22944,                        0x00, "Mido Top Left Chest",               "KF Mido Top Left Chest",               RHT_KF_MIDOS_TOP_LEFT_CHEST,             RG_BLUE_RUPEE,            {},                                                                           SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_MIDOS_TOP_RIGHT_CHEST] =                   Location::Chest(RC_KF_MIDOS_TOP_RIGHT_CHEST,             RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KOKIRI_FOREST,   ACTOR_EN_BOX,         SCENE_MIDOS_HOUSE,                22945,                        0x01, "Mido Top Right Chest",              "KF Mido Top Right Chest",              RHT_KF_MIDOS_TOP_RIGHT_CHEST,            RG_BLUE_RUPEE,            {},                                                                           SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_MIDOS_BOTTOM_LEFT_CHEST] =                 Location::Chest(RC_KF_MIDOS_BOTTOM_LEFT_CHEST,           RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KOKIRI_FOREST,   ACTOR_EN_BOX,         SCENE_MIDOS_HOUSE,                22914,                        0x02, "Mido Bottom Left Chest",            "KF Mido Bottom Left Chest",            RHT_KF_MIDOS_BOTTOM_LEFT_CHEST,          RG_GREG_RUPEE,            {},                                                                           SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_MIDOS_BOTTOM_RIGHT_CHEST] =                Location::Chest(RC_KF_MIDOS_BOTTOM_RIGHT_CHEST,          RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KOKIRI_FOREST,   ACTOR_EN_BOX,         SCENE_MIDOS_HOUSE,                22787,                        0x03, "Mido Bottom Right Chest",           "KF Mido Bottom Right Chest",           RHT_KF_MIDOS_BOTTOM_RIGHT_CHEST,         RG_RECOVERY_HEART,        {},                                                                           SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_STORMS_GROTTO_CHEST] =                     Location::Chest(RC_KF_STORMS_GROTTO_CHEST,               RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KOKIRI_FOREST,   ACTOR_EN_BOX,         SCENE_GROTTOS,                    22988,                        0x0C, "Storms Grotto Chest",               "KF Storms Grotto Chest",               RHT_KF_STORMS_GROTTO_CHEST,              RG_RED_RUPEE,             {},                                                                           SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_KOKIRI_SWORD_CHEST] =                      Location::Chest(RC_KF_KOKIRI_SWORD_CHEST,                RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KOKIRI_FOREST,   ACTOR_EN_BOX,         SCENE_KOKIRI_FOREST,              1248,                         0x00, "Kokiri Sword Chest",                "KF Kokiri Sword Chest",                RHT_KF_KOKIRI_SWORD_CHEST,                RG_KOKIRI_SWORD,             {},                                                                           SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST,  true);
+    locationTable[RC_KF_MIDOS_TOP_LEFT_CHEST] =                    Location::Chest(RC_KF_MIDOS_TOP_LEFT_CHEST,              RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KOKIRI_FOREST,   ACTOR_EN_BOX,         SCENE_MIDOS_HOUSE,                22944,                        0x00, "Mido Top Left Chest",               "KF Mido Top Left Chest",               RHT_KF_MIDOS_TOP_LEFT_CHEST,              RG_BLUE_RUPEE,               {},                                                                           SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_MIDOS_TOP_RIGHT_CHEST] =                   Location::Chest(RC_KF_MIDOS_TOP_RIGHT_CHEST,             RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KOKIRI_FOREST,   ACTOR_EN_BOX,         SCENE_MIDOS_HOUSE,                22945,                        0x01, "Mido Top Right Chest",              "KF Mido Top Right Chest",              RHT_KF_MIDOS_TOP_RIGHT_CHEST,             RG_BLUE_RUPEE,               {},                                                                           SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_MIDOS_BOTTOM_LEFT_CHEST] =                 Location::Chest(RC_KF_MIDOS_BOTTOM_LEFT_CHEST,           RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KOKIRI_FOREST,   ACTOR_EN_BOX,         SCENE_MIDOS_HOUSE,                22914,                        0x02, "Mido Bottom Left Chest",            "KF Mido Bottom Left Chest",            RHT_KF_MIDOS_BOTTOM_LEFT_CHEST,           RG_GREG_RUPEE,               {},                                                                           SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_MIDOS_BOTTOM_RIGHT_CHEST] =                Location::Chest(RC_KF_MIDOS_BOTTOM_RIGHT_CHEST,          RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KOKIRI_FOREST,   ACTOR_EN_BOX,         SCENE_MIDOS_HOUSE,                22787,                        0x03, "Mido Bottom Right Chest",           "KF Mido Bottom Right Chest",           RHT_KF_MIDOS_BOTTOM_RIGHT_CHEST,          RG_RECOVERY_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_STORMS_GROTTO_CHEST] =                     Location::Chest(RC_KF_STORMS_GROTTO_CHEST,               RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KOKIRI_FOREST,   ACTOR_EN_BOX,         SCENE_GROTTOS,                    22988,                        0x0C, "Storms Grotto Chest",               "KF Storms Grotto Chest",               RHT_KF_STORMS_GROTTO_CHEST,               RG_RED_RUPEE,                {},                                                                           SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
     // Lost Woods
-    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_CHEST] =             Location::Chest(RC_LW_NEAR_SHORTCUTS_GROTTO_CHEST,       RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LOST_WOODS,      ACTOR_EN_BOX,         SCENE_GROTTOS,                    22964,                        0x14, "Near Shortcuts Grotto Chest",       "LW Near Shortcuts Grotto Chest",       RHT_KF_STORMS_GROTTO_CHEST,              RG_RED_RUPEE,             {},                                                                           SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_LW_SKULL_KID] =                                Location::Base(RC_LW_SKULL_KID,                         RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LOST_WOODS,      ACTOR_ID_MAX,         SCENE_LOST_WOODS,                 0x00,                         0x3E, "Skull Kid",                         "LW Skull Kid",                         RHT_LW_SKULL_KID,                        RG_PIECE_OF_HEART,        {},                        SpoilerCollectionCheck::ItemGetInf(30),            SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,     true);
-    locationTable[RC_LW_TRADE_COJIRO] =                             Location::Base(RC_LW_TRADE_COJIRO,                      RCQUEST_BOTH, RCTYPE_ADULT_TRADE, RCAREA_LOST_WOODS,      ACTOR_ID_MAX,         SCENE_LOST_WOODS,                 0x00,                         0x1F, "Trade Cojiro",                      "LW Trade Cojiro",                      RHT_LW_TRADE_COJIRO,                     RG_ODD_MUSHROOM,          { Category::cAdultTrade }, SpoilerCollectionCheck::RandomizerInf(0x5B, 0x1F), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,     true);
-    locationTable[RC_LW_TRADE_ODD_POTION] =                         Location::Base(RC_LW_TRADE_ODD_POTION,                  RCQUEST_BOTH, RCTYPE_ADULT_TRADE, RCAREA_LOST_WOODS,      ACTOR_ID_MAX,         SCENE_LOST_WOODS,                 0x00,                         0x21, "Trade Odd Potion",                  "LW Trade Odd Potion",                  RHT_LW_TRADE_COJIRO,                     RG_POACHERS_SAW,          { Category::cAdultTrade }, SpoilerCollectionCheck::ItemGetInf(57),            SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,     true);
-    locationTable[RC_LW_OCARINA_MEMORY_GAME] =                      Location::Base(RC_LW_OCARINA_MEMORY_GAME,               RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LOST_WOODS,      ACTOR_ID_MAX,         SCENE_LOST_WOODS,                 0x00,                         0x21, "Ocarina Memory Game",               "LW Ocarina Memory Game",               RHT_LW_OCARINA_MEMORY_GAME,              RG_PIECE_OF_HEART,        {},                        SpoilerCollectionCheck::ItemGetInf(31),            SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,     true);
-    locationTable[RC_LW_TARGET_IN_WOODS] =                          Location::Base(RC_LW_TARGET_IN_WOODS,                   RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LOST_WOODS,      ACTOR_ID_MAX,         SCENE_LOST_WOODS,                 0x00,                         0x60, "Target in Woods",                   "LW Target in Woods",                   RHT_LW_TARGET_IN_WOODS,                  RG_PROGRESSIVE_SLINGSHOT, {},                        SpoilerCollectionCheck::ItemGetInf(21),            SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,     true);
-    locationTable[RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT] =       Location::Base(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT,RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_LOST_WOODS,      ACTOR_EN_DNS,         SCENE_LOST_WOODS,                 0x00,                         0x30, "Deku Scrub Near Deku Theater Right","LW Deku Scrub Near Deku Theater Right",RHT_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT,RG_BUY_DEKU_NUT_5,       { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x5B, 0x01),         SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT] =        Location::Base(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT, RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_LOST_WOODS,      ACTOR_EN_DNS,         SCENE_LOST_WOODS,                 0x01,                         0x31, "Deku Scrub Near Deku Theater Left", "LW Deku Scrub Near Deku Theater Left", RHT_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT,RG_BUY_DEKU_STICK_1,      { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x5B, 0x02),         SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[RC_LW_DEKU_SCRUB_NEAR_BRIDGE] =                   Location::Base(RC_LW_DEKU_SCRUB_NEAR_BRIDGE,            RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_LOST_WOODS,      ACTOR_EN_DNS,         SCENE_LOST_WOODS,                 0x09,                         0x77, "Deku Scrub Near Bridge",            "LW Deku Scrub Near Bridge",            RHT_LW_DEKU_SCRUB_NEAR_BRIDGE,           RG_PROGRESSIVE_STICK_UPGRADE,{ Category::cDekuScrub, Category::cDekuScrubUpgrades }, SpoilerCollectionCheck::Scrub(0x5B, 0x0A), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS, true);
-    locationTable[RC_LW_DEKU_SCRUB_GROTTO_REAR] =            Location::GrottoScrub(RC_LW_DEKU_SCRUB_GROTTO_REAR,            RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_LOST_WOODS,      ACTOR_EN_DNS,         SCENE_GROTTOS,                    TWO_ACTOR_PARAMS(0x03, 0xF5), 0x33, "Deku Scrub Grotto Rear",            "LW Deku Scrub Grotto Rear",            RHT_LW_DEKU_SCRUB_GROTTO_REAR,           RG_BUY_DEKU_SEEDS_30,     { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x1F, 0x04),         SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[RC_LW_DEKU_SCRUB_GROTTO_FRONT] =           Location::GrottoScrub(RC_LW_DEKU_SCRUB_GROTTO_FRONT,           RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_LOST_WOODS,      ACTOR_EN_DNS,         SCENE_GROTTOS,                    TWO_ACTOR_PARAMS(0x0A, 0xF5), 0x79, "Deku Scrub Grotto Front",           "LW Deku Scrub Grotto Front",           RHT_LW_DEKU_SCRUB_GROTTO_FRONT,          RG_PROGRESSIVE_NUT_UPGRADE,{ Category::cDekuScrub, Category::cDekuScrubUpgrades }, SpoilerCollectionCheck::Scrub(0x1F, 0x0B), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[RC_DEKU_THEATER_SKULL_MASK] =                     Location::Base(RC_DEKU_THEATER_SKULL_MASK,              RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LOST_WOODS,      ACTOR_ID_MAX,         SCENE_GROTTOS,                    0x00,                         0x77, "Deku Theater Skull Mask",           "Deku Theater Skull Mask",              RHT_DEKU_THEATER_SKULL_MASK,             RG_PROGRESSIVE_STICK_UPGRADE,{},                     SpoilerCollectionCheck::Chest(0x3E, 0x1F),         SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,     true);
-    locationTable[RC_DEKU_THEATER_MASK_OF_TRUTH] =                  Location::Base(RC_DEKU_THEATER_MASK_OF_TRUTH,           RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LOST_WOODS,      ACTOR_ID_MAX,         SCENE_GROTTOS,                    0x00,                         0x7A, "Deku Theater Mask of Truth",        "Deku Theater Mask of Truth",           RHT_DEKU_THEATER_MASK_OF_TRUTH,          RG_PROGRESSIVE_NUT_UPGRADE,{},                       SpoilerCollectionCheck::Chest(0x3E, 0x1E),         SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,     true);
+    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_CHEST] =             Location::Chest(RC_LW_NEAR_SHORTCUTS_GROTTO_CHEST,       RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LOST_WOODS,      ACTOR_EN_BOX,         SCENE_GROTTOS,                    22964,                        0x14, "Near Shortcuts Grotto Chest",       "LW Near Shortcuts Grotto Chest",       RHT_KF_STORMS_GROTTO_CHEST,               RG_RED_RUPEE,                {},                                                                           SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_LW_SKULL_KID] =                                Location::Base(RC_LW_SKULL_KID,                         RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LOST_WOODS,      ACTOR_ID_MAX,         SCENE_LOST_WOODS,                 0x00,                         0x3E, "Skull Kid",                         "LW Skull Kid",                         RHT_LW_SKULL_KID,                         RG_PIECE_OF_HEART,           {},                        SpoilerCollectionCheck::ItemGetInf(30),            SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,     true);
+    locationTable[RC_LW_TRADE_COJIRO] =                             Location::Base(RC_LW_TRADE_COJIRO,                      RCQUEST_BOTH, RCTYPE_ADULT_TRADE, RCAREA_LOST_WOODS,      ACTOR_ID_MAX,         SCENE_LOST_WOODS,                 0x00,                         0x1F, "Trade Cojiro",                      "LW Trade Cojiro",                      RHT_LW_TRADE_COJIRO,                      RG_ODD_MUSHROOM,             { Category::cAdultTrade }, SpoilerCollectionCheck::RandomizerInf(0x5B, 0x1F), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,     true);
+    locationTable[RC_LW_TRADE_ODD_POTION] =                         Location::Base(RC_LW_TRADE_ODD_POTION,                  RCQUEST_BOTH, RCTYPE_ADULT_TRADE, RCAREA_LOST_WOODS,      ACTOR_ID_MAX,         SCENE_LOST_WOODS,                 0x00,                         0x21, "Trade Odd Potion",                  "LW Trade Odd Potion",                  RHT_LW_TRADE_COJIRO,                      RG_POACHERS_SAW,             { Category::cAdultTrade }, SpoilerCollectionCheck::ItemGetInf(57),            SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,     true);
+    locationTable[RC_LW_OCARINA_MEMORY_GAME] =                      Location::Base(RC_LW_OCARINA_MEMORY_GAME,               RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LOST_WOODS,      ACTOR_ID_MAX,         SCENE_LOST_WOODS,                 0x00,                         0x21, "Ocarina Memory Game",               "LW Ocarina Memory Game",               RHT_LW_OCARINA_MEMORY_GAME,               RG_PIECE_OF_HEART,           {},                        SpoilerCollectionCheck::ItemGetInf(31),            SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,     true);
+    locationTable[RC_LW_TARGET_IN_WOODS] =                          Location::Base(RC_LW_TARGET_IN_WOODS,                   RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LOST_WOODS,      ACTOR_ID_MAX,         SCENE_LOST_WOODS,                 0x00,                         0x60, "Target in Woods",                   "LW Target in Woods",                   RHT_LW_TARGET_IN_WOODS,                   RG_PROGRESSIVE_SLINGSHOT,    {},                        SpoilerCollectionCheck::ItemGetInf(21),            SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,     true);
+    locationTable[RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT] =       Location::Base(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT,RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_LOST_WOODS,      ACTOR_EN_DNS,         SCENE_LOST_WOODS,                 0x00,                         0x30, "Deku Scrub Near Deku Theater Right","LW Deku Scrub Near Deku Theater Right",RHT_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT,RG_BUY_DEKU_NUTS_5,          { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x5B, 0x01),         SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT] =        Location::Base(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT, RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_LOST_WOODS,      ACTOR_EN_DNS,         SCENE_LOST_WOODS,                 0x01,                         0x31, "Deku Scrub Near Deku Theater Left", "LW Deku Scrub Near Deku Theater Left", RHT_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT, RG_BUY_DEKU_STICK_1,         { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x5B, 0x02),         SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_LW_DEKU_SCRUB_NEAR_BRIDGE] =                   Location::Base(RC_LW_DEKU_SCRUB_NEAR_BRIDGE,            RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_LOST_WOODS,      ACTOR_EN_DNS,         SCENE_LOST_WOODS,                 0x09,                         0x77, "Deku Scrub Near Bridge",            "LW Deku Scrub Near Bridge",            RHT_LW_DEKU_SCRUB_NEAR_BRIDGE,            RG_PROGRESSIVE_STICK_UPGRADE,{ Category::cDekuScrub, Category::cDekuScrubUpgrades }, SpoilerCollectionCheck::Scrub(0x5B, 0x0A), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS, true);
+    locationTable[RC_LW_DEKU_SCRUB_GROTTO_REAR] =            Location::GrottoScrub(RC_LW_DEKU_SCRUB_GROTTO_REAR,            RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_LOST_WOODS,      ACTOR_EN_DNS,         SCENE_GROTTOS,                    TWO_ACTOR_PARAMS(0x03, 0xF5), 0x33, "Deku Scrub Grotto Rear",            "LW Deku Scrub Grotto Rear",            RHT_LW_DEKU_SCRUB_GROTTO_REAR,            RG_BUY_DEKU_SEEDS_30,        { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x1F, 0x04),         SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_LW_DEKU_SCRUB_GROTTO_FRONT] =           Location::GrottoScrub(RC_LW_DEKU_SCRUB_GROTTO_FRONT,           RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_LOST_WOODS,      ACTOR_EN_DNS,         SCENE_GROTTOS,                    TWO_ACTOR_PARAMS(0x0A, 0xF5), 0x79, "Deku Scrub Grotto Front",           "LW Deku Scrub Grotto Front",           RHT_LW_DEKU_SCRUB_GROTTO_FRONT,           RG_PROGRESSIVE_NUT_UPGRADE,  { Category::cDekuScrub, Category::cDekuScrubUpgrades }, SpoilerCollectionCheck::Scrub(0x1F, 0x0B), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_DEKU_THEATER_SKULL_MASK] =                     Location::Base(RC_DEKU_THEATER_SKULL_MASK,              RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LOST_WOODS,      ACTOR_ID_MAX,         SCENE_GROTTOS,                    0x00,                         0x77, "Deku Theater Skull Mask",           "Deku Theater Skull Mask",              RHT_DEKU_THEATER_SKULL_MASK,              RG_PROGRESSIVE_STICK_UPGRADE,{},                     SpoilerCollectionCheck::Chest(0x3E, 0x1F),         SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,     true);
+    locationTable[RC_DEKU_THEATER_MASK_OF_TRUTH] =                  Location::Base(RC_DEKU_THEATER_MASK_OF_TRUTH,           RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LOST_WOODS,      ACTOR_ID_MAX,         SCENE_GROTTOS,                    0x00,                         0x7A, "Deku Theater Mask of Truth",        "Deku Theater Mask of Truth",           RHT_DEKU_THEATER_MASK_OF_TRUTH,           RG_PROGRESSIVE_NUT_UPGRADE,  {},                       SpoilerCollectionCheck::Chest(0x3E, 0x1E),         SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,     true);
     // Sacred Forest Meadow
-    locationTable[RC_SFM_WOLFOS_GROTTO_CHEST] =                    Location::Chest(RC_SFM_WOLFOS_GROTTO_CHEST,              RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_SACRED_FOREST_MEADOW, ACTOR_EN_BOX,    SCENE_GROTTOS,                    31409,                        0x11, "Wolfos Grotto Chest",               "SFM Wolfos Grotto Chest",              RHT_SFM_WOLFOS_GROTTO_CHEST,             RG_PURPLE_RUPEE,          {},                                                                           SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[RC_SFM_DEKU_SCRUB_GROTTO_REAR] =           Location::GrottoScrub(RC_SFM_DEKU_SCRUB_GROTTO_REAR,           RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_SACRED_FOREST_MEADOW, ACTOR_EN_DNS,    SCENE_GROTTOS,                    TWO_ACTOR_PARAMS(0x07, 0xEE), 0x39, "Deku Scrub Grotto Rear",            "SFM Deku Scrub Grotto Rear",           RHT_SFM_DEKU_SCRUB_GROTTO_REAR,          RG_BUY_RED_POTION_30,     { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x18, 0x08),         SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[RC_SFM_DEKU_SCRUB_GROTTO_FRONT] =          Location::GrottoScrub(RC_SFM_DEKU_SCRUB_GROTTO_FRONT,          RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_SACRED_FOREST_MEADOW, ACTOR_EN_DNS,    SCENE_GROTTOS,                    TWO_ACTOR_PARAMS(0x08, 0xEE), 0x3A, "Deku Scrub Grotto Front",           "SFM Deku Scrub Grotto Front",          RHT_SFM_DEKU_SCRUB_GROTTO_FRONT,         RG_BUY_GREEN_POTION,      { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x18, 0x09),         SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_SFM_WOLFOS_GROTTO_CHEST] =                    Location::Chest(RC_SFM_WOLFOS_GROTTO_CHEST,              RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_SACRED_FOREST_MEADOW, ACTOR_EN_BOX,    SCENE_GROTTOS,                    31409,                        0x11, "Wolfos Grotto Chest",               "SFM Wolfos Grotto Chest",              RHT_SFM_WOLFOS_GROTTO_CHEST,              RG_PURPLE_RUPEE,             {},                                                                           SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_SFM_DEKU_SCRUB_GROTTO_REAR] =           Location::GrottoScrub(RC_SFM_DEKU_SCRUB_GROTTO_REAR,           RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_SACRED_FOREST_MEADOW, ACTOR_EN_DNS,    SCENE_GROTTOS,                    TWO_ACTOR_PARAMS(0x07, 0xEE), 0x39, "Deku Scrub Grotto Rear",            "SFM Deku Scrub Grotto Rear",           RHT_SFM_DEKU_SCRUB_GROTTO_REAR,           RG_BUY_RED_POTION_30,        { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x18, 0x08),         SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_SFM_DEKU_SCRUB_GROTTO_FRONT] =          Location::GrottoScrub(RC_SFM_DEKU_SCRUB_GROTTO_FRONT,          RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_SACRED_FOREST_MEADOW, ACTOR_EN_DNS,    SCENE_GROTTOS,                    TWO_ACTOR_PARAMS(0x08, 0xEE), 0x3A, "Deku Scrub Grotto Front",           "SFM Deku Scrub Grotto Front",          RHT_SFM_DEKU_SCRUB_GROTTO_FRONT,          RG_BUY_GREEN_POTION,         { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x18, 0x09),         SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
     // Hyrule Field
-    locationTable[RC_HF_SOUTHEAST_GROTTO_CHEST] =                  Location::Chest(RC_HF_SOUTHEAST_GROTTO_CHEST,            RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_HYRULE_FIELD,    ACTOR_EN_BOX,         SCENE_GROTTOS,                    22978,                        0x02, "Southeast Grotto Chest",            "HF Southeast Grotto Chest",            RHT_HF_SOUTHEAST_GROTTO_CHEST,           RG_RED_RUPEE,             {},                                                                           SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[RC_HF_OPEN_GROTTO_CHEST] =                       Location::Chest(RC_HF_OPEN_GROTTO_CHEST,                 RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_HYRULE_FIELD,    ACTOR_EN_BOX,         SCENE_GROTTOS,                    22947,                        0x03, "Open Grotto Chest",                 "HF Open Grotto Chest",                 RHT_HF_OPEN_GROTTO_CHEST,                RG_BLUE_RUPEE,            {},                                                                           SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[RC_HF_NEAR_MARKET_GROTTO_CHEST] =                Location::Chest(RC_HF_NEAR_MARKET_GROTTO_CHEST,          RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_HYRULE_FIELD,    ACTOR_EN_BOX,         SCENE_GROTTOS,                    22944,                        0x00, "Near Market Grotto Chest",          "HF Near Market Grotto Chest",          RHT_HF_NEAR_MARKET_GROTTO_CHEST,         RG_BLUE_RUPEE,            {},                                                                           SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[RC_HF_OCARINA_OF_TIME_ITEM] =                     Location::Base(RC_HF_OCARINA_OF_TIME_ITEM,              RCQUEST_BOTH, RCTYPE_OCARINA,     RCAREA_HYRULE_FIELD,    ACTOR_ID_MAX,         SCENE_HYRULE_FIELD,               0x00,                         0x0C, "Ocarina of Time Item",              "HF Ocarina of Time Item",              RHT_HF_OCARINA_OF_TIME_ITEM,             RG_PROGRESSIVE_OCARINA,   {},                        SpoilerCollectionCheck::EventChkInf(0x43),         SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[RC_HF_TEKTITE_GROTTO_FREESTANDING_POH] =   Location::Collectable(RC_HF_TEKTITE_GROTTO_FREESTANDING_POH,   RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_HYRULE_FIELD,    ACTOR_EN_ITEM00,      SCENE_GROTTOS,                    262,                          0x01, "Tektite Grotto Freestanding PoH",   "HF Tektite Grotto Freestanding PoH",   RHT_HF_TEKTITE_GROTTO_FREESTANDING_POH,  RG_PIECE_OF_HEART,        {},                                                                           SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD,   true);
-    locationTable[RC_HF_DEKU_SCRUB_GROTTO] =                 Location::GrottoScrub(RC_HF_DEKU_SCRUB_GROTTO,                 RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_HYRULE_FIELD,    ACTOR_EN_DNS,         SCENE_GROTTOS,                    TWO_ACTOR_PARAMS(0x02, 0xE6), 0x3E, "Deku Scrub Grotto",                 "HF Deku Scrub Grotto",                 RHT_HF_DEKU_SCRUB_GROTTO,                RG_PIECE_OF_HEART,        { Category::cDekuScrub, Category::cDekuScrubUpgrades }, SpoilerCollectionCheck::Scrub(0x10, 0x03), SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD, true);
+    locationTable[RC_HF_SOUTHEAST_GROTTO_CHEST] =                  Location::Chest(RC_HF_SOUTHEAST_GROTTO_CHEST,            RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_HYRULE_FIELD,    ACTOR_EN_BOX,         SCENE_GROTTOS,                    22978,                        0x02, "Southeast Grotto Chest",            "HF Southeast Grotto Chest",            RHT_HF_SOUTHEAST_GROTTO_CHEST,            RG_RED_RUPEE,                {},                                                                           SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_HF_OPEN_GROTTO_CHEST] =                       Location::Chest(RC_HF_OPEN_GROTTO_CHEST,                 RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_HYRULE_FIELD,    ACTOR_EN_BOX,         SCENE_GROTTOS,                    22947,                        0x03, "Open Grotto Chest",                 "HF Open Grotto Chest",                 RHT_HF_OPEN_GROTTO_CHEST,                 RG_BLUE_RUPEE,               {},                                                                           SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_HF_NEAR_MARKET_GROTTO_CHEST] =                Location::Chest(RC_HF_NEAR_MARKET_GROTTO_CHEST,          RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_HYRULE_FIELD,    ACTOR_EN_BOX,         SCENE_GROTTOS,                    22944,                        0x00, "Near Market Grotto Chest",          "HF Near Market Grotto Chest",          RHT_HF_NEAR_MARKET_GROTTO_CHEST,          RG_BLUE_RUPEE,               {},                                                                           SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_HF_OCARINA_OF_TIME_ITEM] =                     Location::Base(RC_HF_OCARINA_OF_TIME_ITEM,              RCQUEST_BOTH, RCTYPE_OCARINA,     RCAREA_HYRULE_FIELD,    ACTOR_ID_MAX,         SCENE_HYRULE_FIELD,               0x00,                         0x0C, "Ocarina of Time Item",              "HF Ocarina of Time Item",              RHT_HF_OCARINA_OF_TIME_ITEM,              RG_PROGRESSIVE_OCARINA,      {},                        SpoilerCollectionCheck::EventChkInf(0x43),         SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_HF_TEKTITE_GROTTO_FREESTANDING_POH] =   Location::Collectable(RC_HF_TEKTITE_GROTTO_FREESTANDING_POH,   RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_HYRULE_FIELD,    ACTOR_EN_ITEM00,      SCENE_GROTTOS,                    262,                          0x01, "Tektite Grotto Freestanding PoH",   "HF Tektite Grotto Freestanding PoH",   RHT_HF_TEKTITE_GROTTO_FREESTANDING_POH,   RG_PIECE_OF_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD,   true);
+    locationTable[RC_HF_DEKU_SCRUB_GROTTO] =                 Location::GrottoScrub(RC_HF_DEKU_SCRUB_GROTTO,                 RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_HYRULE_FIELD,    ACTOR_EN_DNS,         SCENE_GROTTOS,                    TWO_ACTOR_PARAMS(0x02, 0xE6), 0x3E, "Deku Scrub Grotto",                 "HF Deku Scrub Grotto",                 RHT_HF_DEKU_SCRUB_GROTTO,                 RG_PIECE_OF_HEART,           { Category::cDekuScrub, Category::cDekuScrubUpgrades }, SpoilerCollectionCheck::Scrub(0x10, 0x03), SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD, true);
     // Lake Hylia
-    locationTable[RC_LH_CHILD_FISHING] =                            Location::Base(RC_LH_CHILD_FISHING,                     RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LAKE_HYLIA,      ACTOR_ID_MAX,         SCENE_FISHING_POND,               0x00,                         0x3E, "Child Fishing",                     "LH Child Fishing",                     RHT_LH_CHILD_FISHING,                    RG_PIECE_OF_HEART,        {}, SpoilerCollectionCheck::RandomizerInf(SCENE_FISHING_POND, RAND_INF_CHILD_FISHING), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA, true);
-    locationTable[RC_LH_ADULT_FISHING] =                            Location::Base(RC_LH_ADULT_FISHING,                     RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LAKE_HYLIA,      ACTOR_ID_MAX,         SCENE_FISHING_POND,               0x00,                         0x38, "Adult Fishing",                     "LH Adult Fishing",                     RHT_LH_ADULT_FISHING,                    RG_PROGRESSIVE_SCALE,     {}, SpoilerCollectionCheck::RandomizerInf(SCENE_FISHING_POND, RAND_INF_ADULT_FISHING), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA, true);
-    locationTable[RC_LH_LAB_DIVE] =                                 Location::Base(RC_LH_LAB_DIVE,                          RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LAKE_HYLIA,      ACTOR_ID_MAX,         SCENE_LAKESIDE_LABORATORY,        0x00,                         0x3E, "Lab Dive",                          "LH Lab Dive",                          RHT_LH_LAB_DIVE,                         RG_PIECE_OF_HEART,        {},                        SpoilerCollectionCheck::ItemGetInf(24),            SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,     true);
-    locationTable[RC_LH_TRADE_FROG] =                               Location::Base(RC_LH_TRADE_FROG,                        RCQUEST_BOTH, RCTYPE_ADULT_TRADE, RCAREA_LAKE_HYLIA,      ACTOR_ID_MAX,         SCENE_LAKESIDE_LABORATORY,        0x00,                         0x25, "Lab Trade Eyeball Frog",            "LH Lab Trade Eyeball Frog",            RHT_LH_TRADE_FROG,                       RG_EYEDROPS,              { Category::cAdultTrade }, SpoilerCollectionCheck::RandomizerInf(0x38, 0x1F), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,     true);
-    locationTable[RC_LH_UNDERWATER_ITEM] =                          Location::Base(RC_LH_UNDERWATER_ITEM,                   RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LAKE_HYLIA,      ACTOR_ID_MAX,         SCENE_LAKE_HYLIA,                 0x00,                         0x15, "Underwater Item",                   "LH Underwater Item",                   RHT_LH_UNDERWATER_ITEM,                  RG_RUTOS_LETTER,          {},                        SpoilerCollectionCheck::EventChkInf(0x31),         SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,     true);
-    locationTable[RC_LH_SUN] =                                      Location::Base(RC_LH_SUN,                               RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LAKE_HYLIA,      ACTOR_ID_MAX,         SCENE_LAKE_HYLIA,                 0x00,                         0x58, "Sun",                               "LH Sun",                               RHT_LH_SUN,                              RG_FIRE_ARROWS,           {},                        SpoilerCollectionCheck::Chest(0x57, 0x1F),         SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,     true);
-    locationTable[RC_LH_FREESTANDING_POH] =                  Location::Collectable(RC_LH_FREESTANDING_POH,                  RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LAKE_HYLIA,      ACTOR_EN_ITEM00,      SCENE_LAKE_HYLIA,                 7686,                         0x1E, "Freestanding PoH",                  "LH Freestanding PoH",                  RHT_LH_FREESTANDING_POH,                 RG_PIECE_OF_HEART,        {},                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,     true);
-    locationTable[RC_LH_DEKU_SCRUB_GROTTO_LEFT] =            Location::GrottoScrub(RC_LH_DEKU_SCRUB_GROTTO_LEFT,            RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_LAKE_HYLIA,      ACTOR_EN_DNS,         SCENE_GROTTOS,                    TWO_ACTOR_PARAMS(0x00, 0xEF), 0x30, "Deku Scrub Grotto Left",            "LH Deku Scrub Grotto Left",            RHT_LH_DEKU_SCRUB_GROTTO_LEFT,           RG_BUY_DEKU_NUT_5,        { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x19, 0x01),         SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_DEKU_SCRUB_GROTTO_RIGHT] =           Location::GrottoScrub(RC_LH_DEKU_SCRUB_GROTTO_RIGHT,           RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_LAKE_HYLIA,      ACTOR_EN_DNS,         SCENE_GROTTOS,                    TWO_ACTOR_PARAMS(0x05, 0xEF), 0x37, "Deku Scrub Grotto Right",           "LH Deku Scrub Grotto Right",           RHT_LH_DEKU_SCRUB_GROTTO_RIGHT,          RG_BUY_BOMBS_535,         { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x19, 0x06),         SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_DEKU_SCRUB_GROTTO_CENTER] =          Location::GrottoScrub(RC_LH_DEKU_SCRUB_GROTTO_CENTER,          RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_LAKE_HYLIA,      ACTOR_EN_DNS,         SCENE_GROTTOS,                    TWO_ACTOR_PARAMS(0x03, 0xEF), 0x33, "Deku Scrub Grotto Center",          "LH Deku Scrub Grotto Center",          RHT_LH_DEKU_SCRUB_GROTTO_CENTER,         RG_BUY_DEKU_SEEDS_30,     { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x19, 0x04),         SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISHING] =                            Location::Base(RC_LH_CHILD_FISHING,                     RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LAKE_HYLIA,      ACTOR_ID_MAX,         SCENE_FISHING_POND,               0x00,                         0x3E, "Child Fishing",                     "LH Child Fishing",                     RHT_LH_CHILD_FISHING,                     RG_PIECE_OF_HEART,           {}, SpoilerCollectionCheck::RandomizerInf(SCENE_FISHING_POND, RAND_INF_CHILD_FISHING), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA, true);
+    locationTable[RC_LH_ADULT_FISHING] =                            Location::Base(RC_LH_ADULT_FISHING,                     RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LAKE_HYLIA,      ACTOR_ID_MAX,         SCENE_FISHING_POND,               0x00,                         0x38, "Adult Fishing",                     "LH Adult Fishing",                     RHT_LH_ADULT_FISHING,                     RG_PROGRESSIVE_SCALE,        {}, SpoilerCollectionCheck::RandomizerInf(SCENE_FISHING_POND, RAND_INF_ADULT_FISHING), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA, true);
+    locationTable[RC_LH_LAB_DIVE] =                                 Location::Base(RC_LH_LAB_DIVE,                          RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LAKE_HYLIA,      ACTOR_ID_MAX,         SCENE_LAKESIDE_LABORATORY,        0x00,                         0x3E, "Lab Dive",                          "LH Lab Dive",                          RHT_LH_LAB_DIVE,                          RG_PIECE_OF_HEART,           {},                        SpoilerCollectionCheck::ItemGetInf(24),            SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,     true);
+    locationTable[RC_LH_TRADE_FROG] =                               Location::Base(RC_LH_TRADE_FROG,                        RCQUEST_BOTH, RCTYPE_ADULT_TRADE, RCAREA_LAKE_HYLIA,      ACTOR_ID_MAX,         SCENE_LAKESIDE_LABORATORY,        0x00,                         0x25, "Lab Trade Eyeball Frog",            "LH Lab Trade Eyeball Frog",            RHT_LH_TRADE_FROG,                        RG_EYEDROPS,                 { Category::cAdultTrade }, SpoilerCollectionCheck::RandomizerInf(0x38, 0x1F), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,     true);
+    locationTable[RC_LH_UNDERWATER_ITEM] =                          Location::Base(RC_LH_UNDERWATER_ITEM,                   RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LAKE_HYLIA,      ACTOR_ID_MAX,         SCENE_LAKE_HYLIA,                 0x00,                         0x15, "Underwater Item",                   "LH Underwater Item",                   RHT_LH_UNDERWATER_ITEM,                   RG_RUTOS_LETTER,             {},                        SpoilerCollectionCheck::EventChkInf(0x31),         SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,     true);
+    locationTable[RC_LH_SUN] =                                      Location::Base(RC_LH_SUN,                               RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LAKE_HYLIA,      ACTOR_ID_MAX,         SCENE_LAKE_HYLIA,                 0x00,                         0x58, "Sun",                               "LH Sun",                               RHT_LH_SUN,                               RG_FIRE_ARROWS,              {},                        SpoilerCollectionCheck::Chest(0x57, 0x1F),         SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,     true);
+    locationTable[RC_LH_FREESTANDING_POH] =                  Location::Collectable(RC_LH_FREESTANDING_POH,                  RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LAKE_HYLIA,      ACTOR_EN_ITEM00,      SCENE_LAKE_HYLIA,                 7686,                         0x1E, "Freestanding PoH",                  "LH Freestanding PoH",                  RHT_LH_FREESTANDING_POH,                  RG_PIECE_OF_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,     true);
+    locationTable[RC_LH_DEKU_SCRUB_GROTTO_LEFT] =            Location::GrottoScrub(RC_LH_DEKU_SCRUB_GROTTO_LEFT,            RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_LAKE_HYLIA,      ACTOR_EN_DNS,         SCENE_GROTTOS,                    TWO_ACTOR_PARAMS(0x00, 0xEF), 0x30, "Deku Scrub Grotto Left",            "LH Deku Scrub Grotto Left",            RHT_LH_DEKU_SCRUB_GROTTO_LEFT,            RG_BUY_DEKU_NUTS_5,          { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x19, 0x01),         SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_DEKU_SCRUB_GROTTO_RIGHT] =           Location::GrottoScrub(RC_LH_DEKU_SCRUB_GROTTO_RIGHT,           RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_LAKE_HYLIA,      ACTOR_EN_DNS,         SCENE_GROTTOS,                    TWO_ACTOR_PARAMS(0x05, 0xEF), 0x37, "Deku Scrub Grotto Right",           "LH Deku Scrub Grotto Right",           RHT_LH_DEKU_SCRUB_GROTTO_RIGHT,           RG_BUY_BOMBS_535,            { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x19, 0x06),         SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_DEKU_SCRUB_GROTTO_CENTER] =          Location::GrottoScrub(RC_LH_DEKU_SCRUB_GROTTO_CENTER,          RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_LAKE_HYLIA,      ACTOR_EN_DNS,         SCENE_GROTTOS,                    TWO_ACTOR_PARAMS(0x03, 0xEF), 0x33, "Deku Scrub Grotto Center",          "LH Deku Scrub Grotto Center",          RHT_LH_DEKU_SCRUB_GROTTO_CENTER,          RG_BUY_DEKU_SEEDS_30,        { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x19, 0x04),         SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
     // Gerudo Valley
-    locationTable[RC_GV_CHEST] =                                   Location::Chest(RC_GV_CHEST,                             RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GERUDO_VALLEY,   ACTOR_EN_BOX,         SCENE_GERUDO_VALLEY,              23200,                        0x00, "Chest",                             "GV Chest",                             RHT_GV_CHEST,                            RG_PURPLE_RUPEE,          {},                                                                           SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[RC_GV_TRADE_SAW] =                                Location::Base(RC_GV_TRADE_SAW,                         RCQUEST_BOTH, RCTYPE_ADULT_TRADE, RCAREA_GERUDO_VALLEY,   ACTOR_ID_MAX,         SCENE_GERUDO_VALLEY,              0x00,                         0x22, "Trade Saw",                         "GV Trade Saw",                         RHT_GV_TRADE_SAW,                        RG_BROKEN_SWORD,          { Category::cAdultTrade }, SpoilerCollectionCheck::RandomizerInf(0x5A, 0x1F), SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
-    locationTable[RC_GV_WATERFALL_FREESTANDING_POH] =        Location::Collectable(RC_GV_WATERFALL_FREESTANDING_POH,        RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GERUDO_VALLEY,   ACTOR_EN_ITEM00,      SCENE_GERUDO_VALLEY,              262,                          0x01, "Waterfall Freestanding PoH",        "GV Waterfall Freestanding PoH",        RHT_GV_WATERFALL_FREESTANDING_POH,       RG_PIECE_OF_HEART,        {},                                                                           SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
-    locationTable[RC_GV_CRATE_FREESTANDING_POH] =            Location::Collectable(RC_GV_CRATE_FREESTANDING_POH,            RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GERUDO_VALLEY,   ACTOR_EN_ITEM00,      SCENE_GERUDO_VALLEY,              518,                          0x02, "Crate Freestanding PoH",            "GV Crate Freestanding PoH",            RHT_GV_CRATE_FREESTANDING_POH,           RG_PIECE_OF_HEART,        {},                                                                           SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
-    locationTable[RC_GV_DEKU_SCRUB_GROTTO_REAR] =            Location::GrottoScrub(RC_GV_DEKU_SCRUB_GROTTO_REAR,            RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_GERUDO_VALLEY,   ACTOR_EN_DNS,         SCENE_GROTTOS,                    TWO_ACTOR_PARAMS(0x07, 0xF0), 0x39, "Deku Scrub Grotto Rear",            "GV Deku Scrub Grotto Rear",            RHT_GV_DEKU_SCRUB_GROTTO_FRONT,          RG_BUY_GREEN_POTION,      { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x1A, 0x09),         SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[RC_GV_DEKU_SCRUB_GROTTO_FRONT] =           Location::GrottoScrub(RC_GV_DEKU_SCRUB_GROTTO_FRONT,           RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_GERUDO_VALLEY,   ACTOR_EN_DNS,         SCENE_GROTTOS,                    TWO_ACTOR_PARAMS(0x08, 0xF0), 0x3A, "Deku Scrub Grotto Front",           "GV Deku Scrub Grotto Front",           RHT_GV_DEKU_SCRUB_GROTTO_FRONT,          RG_BUY_GREEN_POTION,      { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x1A, 0x09),         SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_GV_CHEST] =                                   Location::Chest(RC_GV_CHEST,                             RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GERUDO_VALLEY,   ACTOR_EN_BOX,         SCENE_GERUDO_VALLEY,              23200,                        0x00, "Chest",                             "GV Chest",                             RHT_GV_CHEST,                             RG_PURPLE_RUPEE,             {},                                                                           SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_GV_TRADE_SAW] =                                Location::Base(RC_GV_TRADE_SAW,                         RCQUEST_BOTH, RCTYPE_ADULT_TRADE, RCAREA_GERUDO_VALLEY,   ACTOR_ID_MAX,         SCENE_GERUDO_VALLEY,              0x00,                         0x22, "Trade Saw",                         "GV Trade Saw",                         RHT_GV_TRADE_SAW,                         RG_BROKEN_SWORD,             { Category::cAdultTrade }, SpoilerCollectionCheck::RandomizerInf(0x5A, 0x1F), SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
+    locationTable[RC_GV_WATERFALL_FREESTANDING_POH] =        Location::Collectable(RC_GV_WATERFALL_FREESTANDING_POH,        RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GERUDO_VALLEY,   ACTOR_EN_ITEM00,      SCENE_GERUDO_VALLEY,              262,                          0x01, "Waterfall Freestanding PoH",        "GV Waterfall Freestanding PoH",        RHT_GV_WATERFALL_FREESTANDING_POH,        RG_PIECE_OF_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
+    locationTable[RC_GV_CRATE_FREESTANDING_POH] =            Location::Collectable(RC_GV_CRATE_FREESTANDING_POH,            RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GERUDO_VALLEY,   ACTOR_EN_ITEM00,      SCENE_GERUDO_VALLEY,              518,                          0x02, "Crate Freestanding PoH",            "GV Crate Freestanding PoH",            RHT_GV_CRATE_FREESTANDING_POH,            RG_PIECE_OF_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
+    locationTable[RC_GV_DEKU_SCRUB_GROTTO_REAR] =            Location::GrottoScrub(RC_GV_DEKU_SCRUB_GROTTO_REAR,            RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_GERUDO_VALLEY,   ACTOR_EN_DNS,         SCENE_GROTTOS,                    TWO_ACTOR_PARAMS(0x07, 0xF0), 0x39, "Deku Scrub Grotto Rear",            "GV Deku Scrub Grotto Rear",            RHT_GV_DEKU_SCRUB_GROTTO_FRONT,           RG_BUY_GREEN_POTION,         { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x1A, 0x09),         SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_GV_DEKU_SCRUB_GROTTO_FRONT] =           Location::GrottoScrub(RC_GV_DEKU_SCRUB_GROTTO_FRONT,           RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_GERUDO_VALLEY,   ACTOR_EN_DNS,         SCENE_GROTTOS,                    TWO_ACTOR_PARAMS(0x08, 0xF0), 0x3A, "Deku Scrub Grotto Front",           "GV Deku Scrub Grotto Front",           RHT_GV_DEKU_SCRUB_GROTTO_FRONT,           RG_BUY_GREEN_POTION,         { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x1A, 0x09),         SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
     // Gerudo Fortress
-    locationTable[RC_GF_CHEST] =                                   Location::Chest(RC_GF_CHEST,                             RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GERUDO_FORTRESS, ACTOR_EN_BOX,         SCENE_GERUDOS_FORTRESS,           1984,                         0x00, "Chest",                             "GF Chest",                             RHT_GF_CHEST,                            RG_PIECE_OF_HEART,        {},                                                                           SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
-    locationTable[RC_GF_HBA_1000_POINTS] =                          Location::Base(RC_GF_HBA_1000_POINTS,                   RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GERUDO_FORTRESS, ACTOR_ID_MAX,         SCENE_GERUDOS_FORTRESS,           0x00,                         0x3E, "GF HBA 1000 Points",                "GF HBA 1000 Points",                   RHT_GF_HBA_1000_POINTS,                  RG_PIECE_OF_HEART,        {},                        SpoilerCollectionCheck::InfTable(0x19, 0x08),      SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
-    locationTable[RC_GF_HBA_1500_POINTS] =                          Location::Base(RC_GF_HBA_1500_POINTS,                   RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GERUDO_FORTRESS, ACTOR_ID_MAX,         SCENE_GERUDOS_FORTRESS,           0x00,                         0x30, "GF HBA 1500 Points",                "GF HBA 1500 Points",                   RHT_GF_HBA_1500_POINTS,                  RG_PROGRESSIVE_BOW,       {},                        SpoilerCollectionCheck::ItemGetInf(7),             SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
+    locationTable[RC_GF_CHEST] =                                   Location::Chest(RC_GF_CHEST,                             RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GERUDO_FORTRESS, ACTOR_EN_BOX,         SCENE_GERUDOS_FORTRESS,           1984,                         0x00, "Chest",                             "GF Chest",                             RHT_GF_CHEST,                             RG_PIECE_OF_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
+    locationTable[RC_GF_HBA_1000_POINTS] =                          Location::Base(RC_GF_HBA_1000_POINTS,                   RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GERUDO_FORTRESS, ACTOR_ID_MAX,         SCENE_GERUDOS_FORTRESS,           0x00,                         0x3E, "GF HBA 1000 Points",                "GF HBA 1000 Points",                   RHT_GF_HBA_1000_POINTS,                   RG_PIECE_OF_HEART,           {},                        SpoilerCollectionCheck::InfTable(0x19, 0x08),      SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
+    locationTable[RC_GF_HBA_1500_POINTS] =                          Location::Base(RC_GF_HBA_1500_POINTS,                   RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GERUDO_FORTRESS, ACTOR_ID_MAX,         SCENE_GERUDOS_FORTRESS,           0x00,                         0x30, "GF HBA 1500 Points",                "GF HBA 1500 Points",                   RHT_GF_HBA_1500_POINTS,                   RG_PROGRESSIVE_BOW,          {},                        SpoilerCollectionCheck::ItemGetInf(7),             SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
     // RandoTodo: Do we replace these with the RC_HIDEOUT keys or keep these?
-    locationTable[RC_GF_GERUDO_MEMBERSHIP_CARD] =                   Location::Base(RC_GF_GERUDO_MEMBERSHIP_CARD,            RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GERUDO_FORTRESS, ACTOR_ID_MAX,         SCENE_THIEVES_HIDEOUT,            0x00,                         0x3A, "GF Gerudo Membership Card",         "GF Gerudo Membership Card",            RHT_GF_GERUDO_MEMBERSHIP_CARD,           RG_GERUDO_MEMBERSHIP_CARD,{},                        SpoilerCollectionCheck::GerudoToken(),             SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
-    locationTable[RC_GF_NORTH_F1_CARPENTER] =                Location::Collectable(RC_GF_NORTH_F1_CARPENTER,                RCQUEST_BOTH, RCTYPE_GF_KEY,      RCAREA_GERUDO_FORTRESS, ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,            3089,                         0x0C, "GF North F1 Carpenter",             "GF North F1 Carpenter",                RHT_GF_NORTH_F1_CARPENTER,               RG_GERUDO_FORTRESS_SMALL_KEY,{ Category::cVanillaGFSmallKey },                                          SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
-    locationTable[RC_GF_NORTH_F2_CARPENTER] =                Location::Collectable(RC_GF_NORTH_F2_CARPENTER,                RCQUEST_BOTH, RCTYPE_GF_KEY,      RCAREA_GERUDO_FORTRESS, ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,            2577,                         0x0A, "GF North F2 Carpenter",             "GF North F2 Carpenter",                RHT_GF_NORTH_F2_CARPENTER,               RG_GERUDO_FORTRESS_SMALL_KEY,{ Category::cVanillaGFSmallKey },                                          SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
-    locationTable[RC_GF_SOUTH_F1_CARPENTER] =                Location::Collectable(RC_GF_SOUTH_F1_CARPENTER,                RCQUEST_BOTH, RCTYPE_GF_KEY,      RCAREA_GERUDO_FORTRESS, ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,            3601,                         0x0E, "GF South F1 Carpenter",             "GF South F1 Carpenter",                RHT_GF_SOUTH_F1_CARPENTER,               RG_GERUDO_FORTRESS_SMALL_KEY,{ Category::cVanillaGFSmallKey },                                          SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
-    locationTable[RC_GF_SOUTH_F2_CARPENTER] =                Location::Collectable(RC_GF_SOUTH_F2_CARPENTER,                RCQUEST_BOTH, RCTYPE_GF_KEY,      RCAREA_GERUDO_FORTRESS, ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,            3857,                         0x0F, "GF South F2 Carpenter",             "GF South F2 Carpenter",                RHT_GF_SOUTH_F2_CARPENTER,               RG_GERUDO_FORTRESS_SMALL_KEY,{ Category::cVanillaGFSmallKey },                                          SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
+    locationTable[RC_GF_GERUDO_MEMBERSHIP_CARD] =                   Location::Base(RC_GF_GERUDO_MEMBERSHIP_CARD,            RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GERUDO_FORTRESS, ACTOR_ID_MAX,         SCENE_THIEVES_HIDEOUT,            0x00,                         0x3A, "GF Gerudo Membership Card",         "GF Gerudo Membership Card",            RHT_GF_GERUDO_MEMBERSHIP_CARD,            RG_GERUDO_MEMBERSHIP_CARD,   {},                        SpoilerCollectionCheck::GerudoToken(),             SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
+    locationTable[RC_GF_NORTH_F1_CARPENTER] =                Location::Collectable(RC_GF_NORTH_F1_CARPENTER,                RCQUEST_BOTH, RCTYPE_GF_KEY,      RCAREA_GERUDO_FORTRESS, ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,            3089,                         0x0C, "GF North F1 Carpenter",             "GF North F1 Carpenter",                RHT_GF_NORTH_F1_CARPENTER,                RG_GERUDO_FORTRESS_SMALL_KEY,{ Category::cVanillaGFSmallKey },                                          SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
+    locationTable[RC_GF_NORTH_F2_CARPENTER] =                Location::Collectable(RC_GF_NORTH_F2_CARPENTER,                RCQUEST_BOTH, RCTYPE_GF_KEY,      RCAREA_GERUDO_FORTRESS, ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,            2577,                         0x0A, "GF North F2 Carpenter",             "GF North F2 Carpenter",                RHT_GF_NORTH_F2_CARPENTER,                RG_GERUDO_FORTRESS_SMALL_KEY,{ Category::cVanillaGFSmallKey },                                          SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
+    locationTable[RC_GF_SOUTH_F1_CARPENTER] =                Location::Collectable(RC_GF_SOUTH_F1_CARPENTER,                RCQUEST_BOTH, RCTYPE_GF_KEY,      RCAREA_GERUDO_FORTRESS, ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,            3601,                         0x0E, "GF South F1 Carpenter",             "GF South F1 Carpenter",                RHT_GF_SOUTH_F1_CARPENTER,                RG_GERUDO_FORTRESS_SMALL_KEY,{ Category::cVanillaGFSmallKey },                                          SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
+    locationTable[RC_GF_SOUTH_F2_CARPENTER] =                Location::Collectable(RC_GF_SOUTH_F2_CARPENTER,                RCQUEST_BOTH, RCTYPE_GF_KEY,      RCAREA_GERUDO_FORTRESS, ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,            3857,                         0x0F, "GF South F2 Carpenter",             "GF South F2 Carpenter",                RHT_GF_SOUTH_F2_CARPENTER,                RG_GERUDO_FORTRESS_SMALL_KEY,{ Category::cVanillaGFSmallKey },                                          SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
     // Haunted Wasteland
-    locationTable[RC_WASTELAND_CHEST] =                            Location::Chest(RC_WASTELAND_CHEST,                      RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_WASTELAND,             ACTOR_EN_BOX,    SCENE_HAUNTED_WASTELAND,         -30048,                       0x00, "Chest",                             "Wasteland Chest",                      RHT_WASTELAND_CHEST,                     RG_PURPLE_RUPEE,          {},                                                                           SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[RC_WASTELAND_BOMBCHU_SALESMAN] =                  Location::Base(RC_WASTELAND_BOMBCHU_SALESMAN,           RCQUEST_BOTH, RCTYPE_MERCHANT,    RCAREA_WASTELAND,             ACTOR_ID_MAX,    SCENE_HAUNTED_WASTELAND,         0x00,                         0x03, "Carpet Salesman",                   "Wasteland Carpet Salesman",            RHT_WASTELAND_BOMBCHU_SALESMAN,          RG_BOMBCHU_10,            { Category::cMerchant },   SpoilerCollectionCheck::Merchant(0x5E, 0x86),      SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_WASTELAND_CHEST] =                            Location::Chest(RC_WASTELAND_CHEST,                      RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_WASTELAND,             ACTOR_EN_BOX,    SCENE_HAUNTED_WASTELAND,         -30048,                       0x00, "Chest",                             "Wasteland Chest",                      RHT_WASTELAND_CHEST,                      RG_PURPLE_RUPEE,             {},                                                                           SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_WASTELAND_BOMBCHU_SALESMAN] =                  Location::Base(RC_WASTELAND_BOMBCHU_SALESMAN,           RCQUEST_BOTH, RCTYPE_MERCHANT,    RCAREA_WASTELAND,             ACTOR_ID_MAX,    SCENE_HAUNTED_WASTELAND,         0x00,                         0x03, "Carpet Salesman",                   "Wasteland Carpet Salesman",            RHT_WASTELAND_BOMBCHU_SALESMAN,           RG_BOMBCHU_10,               { Category::cMerchant },   SpoilerCollectionCheck::Merchant(0x5E, 0x86),      SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
     // Desert Colossus
-    locationTable[RC_COLOSSUS_FREESTANDING_POH] =            Location::Collectable(RC_COLOSSUS_FREESTANDING_POH,            RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_DESERT_COLOSSUS,       ACTOR_EN_ITEM00, SCENE_DESERT_COLOSSUS,           3334,                         0x0D, "Freestanding PoH",                  "Colossus Freestanding PoH",            RHT_COLOSSUS_FREESTANDING_POH,           RG_PIECE_OF_HEART,        {},                                                                           SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
-    locationTable[RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR] =      Location::GrottoScrub(RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,      RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_DESERT_COLOSSUS,       ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x07, 0xFD), 0x39, "Deku Scrub Grotto Rear",            "Colossus Deku Scrub Grotto Rear",      RHT_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,     RG_BUY_RED_POTION_30,     { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x27, 0x08),         SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT] =     Location::GrottoScrub(RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT,     RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_DESERT_COLOSSUS,       ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x08, 0xFD), 0x3A, "Deku Scrub Grotto Front",           "Colossus Deku Scrub Grotto Front",     RHT_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT,    RG_BUY_GREEN_POTION,      { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x27, 0x09),         SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_COLOSSUS_FREESTANDING_POH] =            Location::Collectable(RC_COLOSSUS_FREESTANDING_POH,            RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_DESERT_COLOSSUS,       ACTOR_EN_ITEM00, SCENE_DESERT_COLOSSUS,           3334,                         0x0D, "Freestanding PoH",                  "Colossus Freestanding PoH",            RHT_COLOSSUS_FREESTANDING_POH,            RG_PIECE_OF_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
+    locationTable[RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR] =      Location::GrottoScrub(RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,      RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_DESERT_COLOSSUS,       ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x07, 0xFD), 0x39, "Deku Scrub Grotto Rear",            "Colossus Deku Scrub Grotto Rear",      RHT_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,      RG_BUY_RED_POTION_30,        { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x27, 0x08),         SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT] =     Location::GrottoScrub(RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT,     RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_DESERT_COLOSSUS,       ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x08, 0xFD), 0x3A, "Deku Scrub Grotto Front",           "Colossus Deku Scrub Grotto Front",     RHT_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT,     RG_BUY_GREEN_POTION,         { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x27, 0x09),         SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
     // Market
-    locationTable[RC_MARKET_TREASURE_CHEST_GAME_REWARD] =          Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_REWARD,    RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_MARKET,                ACTOR_EN_BOX,    SCENE_TREASURE_BOX_SHOP,         0x00,                         0x0A, "Treasure Chest Game Reward",        "MK Treasure Chest Game Reward",        RHT_MARKET_TREASURE_CHEST_GAME_REWARD,   RG_TREASURE_GAME_HEART,   {},                        SpoilerCollectionCheck::ItemGetInf(19),            SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,  true);
-    locationTable[RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE] =          Location::Base(RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,   RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_MARKET,                ACTOR_ID_MAX,    SCENE_BOMBCHU_BOWLING_ALLEY,     0x00,                         0x33, "Bombchu Bowling First Prize",       "MK Bombchu Bowling First Prize",       RHT_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,  RG_PROGRESSIVE_BOMB_BAG,  {},                        SpoilerCollectionCheck::ItemGetInf(25),            SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,  true);
-    locationTable[RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE] =         Location::Base(RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE,  RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_MARKET,                ACTOR_ID_MAX,    SCENE_BOMBCHU_BOWLING_ALLEY,     0x00,                         0x3E, "Bombchu Bowling Second Prize",      "MK Bombchu Bowling Second Prize",      RHT_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE, RG_PIECE_OF_HEART,        {},                        SpoilerCollectionCheck::ItemGetInf(26),            SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,  true);
-    locationTable[RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS] =             Location::Base(RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS,      RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_MARKET,                ACTOR_ID_MAX,    SCENE_BOMBCHU_BOWLING_ALLEY,     0x00,                         0x00, "Bombchu Bowling Bombchus",          "MK Bombchu Bowling Bombchus",          RHT_MARKET_BOMBCHU_BOWLING_BOMBCHUS,     RG_BOMBCHU_DROP,          {},                        SpoilerCollectionCheck::None(),                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_LOST_DOG] =                             Location::Base(RC_MARKET_LOST_DOG,                      RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_MARKET,                ACTOR_ID_MAX,    SCENE_DOG_LADY_HOUSE,            0x00,                         0x3E, "Lost Dog",                          "MK Lost Dog",                          RHT_MARKET_LOST_DOG,                     RG_PIECE_OF_HEART,        {},                        SpoilerCollectionCheck::InfTable(0x19, 0x09),      SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,  true);
-    locationTable[RC_MARKET_SHOOTING_GALLERY_REWARD] =              Location::Base(RC_MARKET_SHOOTING_GALLERY_REWARD,       RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_MARKET,                ACTOR_ID_MAX,    SCENE_SHOOTING_GALLERY,          0x00,                         0x60, "Shooting Gallery",                  "MK Shooting Gallery",                  RHT_MARKET_SHOOTING_GALLERY_REWARD,      RG_PROGRESSIVE_SLINGSHOT, {},                        SpoilerCollectionCheck::ItemGetInf(5),             SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,  true);
-    locationTable[RC_MARKET_10_BIG_POES] =                          Location::Base(RC_MARKET_10_BIG_POES,                   RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_MARKET,                ACTOR_ID_MAX,    SCENE_MARKET_GUARD_HOUSE,        0x00,                         0x0F, "10 Big Poes",                       "MK 10 Big Poes",                       RHT_MARKET_10_BIG_POES,                  RG_EMPTY_BOTTLE,          {},                        SpoilerCollectionCheck::RandomizerInf(SCENE_MARKET_GUARD_HOUSE, RAND_INF_10_BIG_POES), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE, true);
-    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_1] =          Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_1,    RCQUEST_BOTH, RCTYPE_CHEST_GAME,  RCAREA_MARKET,                ACTOR_EN_BOX,    SCENE_TREASURE_BOX_SHOP,         0x00,                         0x01, "Chest Game First Room Chest",       "MK Chest Game First Room Chest",       RHT_MARKET_TREASURE_CHEST_GAME_ITEM_1,   RG_TREASURE_GAME_SMALL_KEY,{ Category::cChestMinigame },                                                SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_2] =          Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_2,    RCQUEST_BOTH, RCTYPE_CHEST_GAME,  RCAREA_MARKET,                ACTOR_EN_BOX,    SCENE_TREASURE_BOX_SHOP,         0x00,                         0x03, "Chest Game Second Room Chest",      "MK Chest Game Second Room Chest",      RHT_MARKET_TREASURE_CHEST_GAME_ITEM_2,   RG_TREASURE_GAME_SMALL_KEY,{ Category::cChestMinigame },                                                SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_3] =          Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_3,    RCQUEST_BOTH, RCTYPE_CHEST_GAME,  RCAREA_MARKET,                ACTOR_EN_BOX,    SCENE_TREASURE_BOX_SHOP,         0x00,                         0x05, "Chest Game Third Room Chest",       "MK Chest Game Third Room Chest",       RHT_MARKET_TREASURE_CHEST_GAME_ITEM_3,   RG_TREASURE_GAME_SMALL_KEY,{ Category::cChestMinigame },                                                SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_4] =          Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_4,    RCQUEST_BOTH, RCTYPE_CHEST_GAME,  RCAREA_MARKET,                ACTOR_EN_BOX,    SCENE_TREASURE_BOX_SHOP,         0x00,                         0x07, "Chest Game Fourth Room Chest",      "MK Chest Game Fourth Room Chest",      RHT_MARKET_TREASURE_CHEST_GAME_ITEM_4,   RG_TREASURE_GAME_SMALL_KEY,{ Category::cChestMinigame },                                                SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_5] =          Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_5,    RCQUEST_BOTH, RCTYPE_CHEST_GAME,  RCAREA_MARKET,                ACTOR_EN_BOX,    SCENE_TREASURE_BOX_SHOP,         0x00,                         0x09, "Chest Game Fifth Room Chest",       "MK Chest Game Fifth Room Chest",       RHT_MARKET_TREASURE_CHEST_GAME_ITEM_5,   RG_TREASURE_GAME_SMALL_KEY,{ Category::cChestMinigame },                                                SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_REWARD] =          Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_REWARD,    RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_MARKET,                ACTOR_EN_BOX,    SCENE_TREASURE_BOX_SHOP,         0x00,                         0x0A, "Treasure Chest Game Reward",        "MK Treasure Chest Game Reward",        RHT_MARKET_TREASURE_CHEST_GAME_REWARD,    RG_TREASURE_GAME_HEART,      {},                        SpoilerCollectionCheck::ItemGetInf(19),            SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,  true);
+    locationTable[RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE] =          Location::Base(RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,   RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_MARKET,                ACTOR_ID_MAX,    SCENE_BOMBCHU_BOWLING_ALLEY,     0x00,                         0x33, "Bombchu Bowling First Prize",       "MK Bombchu Bowling First Prize",       RHT_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,   RG_PROGRESSIVE_BOMB_BAG,     {},                        SpoilerCollectionCheck::ItemGetInf(25),            SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,  true);
+    locationTable[RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE] =         Location::Base(RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE,  RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_MARKET,                ACTOR_ID_MAX,    SCENE_BOMBCHU_BOWLING_ALLEY,     0x00,                         0x3E, "Bombchu Bowling Second Prize",      "MK Bombchu Bowling Second Prize",      RHT_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE,  RG_PIECE_OF_HEART,           {},                        SpoilerCollectionCheck::ItemGetInf(26),            SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,  true);
+    locationTable[RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS] =             Location::Base(RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS,      RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_MARKET,                ACTOR_ID_MAX,    SCENE_BOMBCHU_BOWLING_ALLEY,     0x00,                         0x00, "Bombchu Bowling Bombchus",          "MK Bombchu Bowling Bombchus",          RHT_MARKET_BOMBCHU_BOWLING_BOMBCHUS,      RG_BOMBCHU_DROP,             {},                        SpoilerCollectionCheck::None(),                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_LOST_DOG] =                             Location::Base(RC_MARKET_LOST_DOG,                      RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_MARKET,                ACTOR_ID_MAX,    SCENE_DOG_LADY_HOUSE,            0x00,                         0x3E, "Lost Dog",                          "MK Lost Dog",                          RHT_MARKET_LOST_DOG,                      RG_PIECE_OF_HEART,           {},                        SpoilerCollectionCheck::InfTable(0x19, 0x09),      SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,  true);
+    locationTable[RC_MARKET_SHOOTING_GALLERY_REWARD] =              Location::Base(RC_MARKET_SHOOTING_GALLERY_REWARD,       RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_MARKET,                ACTOR_ID_MAX,    SCENE_SHOOTING_GALLERY,          0x00,                         0x60, "Shooting Gallery",                  "MK Shooting Gallery",                  RHT_MARKET_SHOOTING_GALLERY_REWARD,       RG_PROGRESSIVE_SLINGSHOT,    {},                        SpoilerCollectionCheck::ItemGetInf(5),             SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,  true);
+    locationTable[RC_MARKET_10_BIG_POES] =                          Location::Base(RC_MARKET_10_BIG_POES,                   RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_MARKET,                ACTOR_ID_MAX,    SCENE_MARKET_GUARD_HOUSE,        0x00,                         0x0F, "10 Big Poes",                       "MK 10 Big Poes",                       RHT_MARKET_10_BIG_POES,                   RG_EMPTY_BOTTLE,             {},                        SpoilerCollectionCheck::RandomizerInf(SCENE_MARKET_GUARD_HOUSE, RAND_INF_10_BIG_POES), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE, true);
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_1] =          Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_1,    RCQUEST_BOTH, RCTYPE_CHEST_GAME,  RCAREA_MARKET,                ACTOR_EN_BOX,    SCENE_TREASURE_BOX_SHOP,         0x00,                         0x01, "Chest Game First Room Chest",       "MK Chest Game First Room Chest",       RHT_MARKET_TREASURE_CHEST_GAME_ITEM_1,    RG_TREASURE_GAME_SMALL_KEY,  { Category::cChestMinigame },                                                SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_2] =          Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_2,    RCQUEST_BOTH, RCTYPE_CHEST_GAME,  RCAREA_MARKET,                ACTOR_EN_BOX,    SCENE_TREASURE_BOX_SHOP,         0x00,                         0x03, "Chest Game Second Room Chest",      "MK Chest Game Second Room Chest",      RHT_MARKET_TREASURE_CHEST_GAME_ITEM_2,    RG_TREASURE_GAME_SMALL_KEY,  { Category::cChestMinigame },                                                SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_3] =          Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_3,    RCQUEST_BOTH, RCTYPE_CHEST_GAME,  RCAREA_MARKET,                ACTOR_EN_BOX,    SCENE_TREASURE_BOX_SHOP,         0x00,                         0x05, "Chest Game Third Room Chest",       "MK Chest Game Third Room Chest",       RHT_MARKET_TREASURE_CHEST_GAME_ITEM_3,    RG_TREASURE_GAME_SMALL_KEY,  { Category::cChestMinigame },                                                SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_4] =          Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_4,    RCQUEST_BOTH, RCTYPE_CHEST_GAME,  RCAREA_MARKET,                ACTOR_EN_BOX,    SCENE_TREASURE_BOX_SHOP,         0x00,                         0x07, "Chest Game Fourth Room Chest",      "MK Chest Game Fourth Room Chest",      RHT_MARKET_TREASURE_CHEST_GAME_ITEM_4,    RG_TREASURE_GAME_SMALL_KEY,  { Category::cChestMinigame },                                                SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_5] =          Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_5,    RCQUEST_BOTH, RCTYPE_CHEST_GAME,  RCAREA_MARKET,                ACTOR_EN_BOX,    SCENE_TREASURE_BOX_SHOP,         0x00,                         0x09, "Chest Game Fifth Room Chest",       "MK Chest Game Fifth Room Chest",       RHT_MARKET_TREASURE_CHEST_GAME_ITEM_5,    RG_TREASURE_GAME_SMALL_KEY,  { Category::cChestMinigame },                                                SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
     // Hyrule Castle
-    locationTable[RC_HC_MALON_EGG] =                                Location::Base(RC_HC_MALON_EGG,                         RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_HYRULE_CASTLE,         ACTOR_ID_MAX,    SCENE_HYRULE_CASTLE,             0x00,                         0x47, "Malon Egg",                         "HC Malon Egg",                         RHT_HC_MALON_EGG,                        RG_WEIRD_EGG,             {},                        SpoilerCollectionCheck::EventChkInf(0x12),         SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,  true);
-    locationTable[RC_HC_ZELDAS_LETTER] =                            Location::Base(RC_HC_ZELDAS_LETTER,                     RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_HYRULE_CASTLE,         ACTOR_ID_MAX,    SCENE_CASTLE_COURTYARD_ZELDA,    0x00,                         0x0B, "Zeldas Letter",                     "HC Zeldas Letter",                     RHT_HC_ZELDAS_LETTER,                    RG_ZELDAS_LETTER,         {},                        SpoilerCollectionCheck::EventChkInf(0x40),         SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,  true);
+    locationTable[RC_HC_MALON_EGG] =                                Location::Base(RC_HC_MALON_EGG,                         RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_HYRULE_CASTLE,         ACTOR_ID_MAX,    SCENE_HYRULE_CASTLE,             0x00,                         0x47, "Malon Egg",                         "HC Malon Egg",                         RHT_HC_MALON_EGG,                         RG_WEIRD_EGG,                {},                        SpoilerCollectionCheck::EventChkInf(0x12),         SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,  true);
+    locationTable[RC_HC_ZELDAS_LETTER] =                            Location::Base(RC_HC_ZELDAS_LETTER,                     RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_HYRULE_CASTLE,         ACTOR_ID_MAX,    SCENE_CASTLE_COURTYARD_ZELDA,    0x00,                         0x0B, "Zeldas Letter",                     "HC Zeldas Letter",                     RHT_HC_ZELDAS_LETTER,                     RG_ZELDAS_LETTER,            {},                        SpoilerCollectionCheck::EventChkInf(0x40),         SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,  true);
     // Kakariko
-    locationTable[RC_KAK_REDEAD_GROTTO_CHEST] =                    Location::Chest(RC_KAK_REDEAD_GROTTO_CHEST,              RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_EN_BOX,    SCENE_GROTTOS,                   31434,                        0x0A, "Redead Grotto Chest",               "Kak Redead Grotto Chest",              RHT_KAK_REDEAD_GROTTO_CHEST,              RG_HUGE_RUPEE,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_OPEN_GROTTO_CHEST] =                      Location::Chest(RC_KAK_OPEN_GROTTO_CHEST,                RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_EN_BOX,    SCENE_GROTTOS,                   22984,                        0x08, "Open Grotto Chest",                 "Kak Open Grotto Chest",                RHT_KAK_OPEN_GROTTO_CHEST,                RG_RED_RUPEE,            {},                                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_10_GOLD_SKULLTULA_REWARD] =                Location::Base(RC_KAK_10_GOLD_SKULLTULA_REWARD,         RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_HOUSE_OF_SKULLTULA,        0x00,                         0x45, "10 Gold Skulltula Reward",          "Kak 10 Gold Skulltula Reward",         RHT_KAK_10_GOLD_SKULLTULA_REWARD,         RG_PROGRESSIVE_WALLET,   {},                        SpoilerCollectionCheck::EventChkInf(0xDA),         SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
-    locationTable[RC_KAK_20_GOLD_SKULLTULA_REWARD] =                Location::Base(RC_KAK_20_GOLD_SKULLTULA_REWARD,         RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_HOUSE_OF_SKULLTULA,        0x00,                         0x39, "20 Gold Skulltula Reward",          "Kak 20 Gold Skulltula Reward",         RHT_KAK_20_GOLD_SKULLTULA_REWARD,         RG_STONE_OF_AGONY,       {},                        SpoilerCollectionCheck::EventChkInf(0xDB),         SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
-    locationTable[RC_KAK_30_GOLD_SKULLTULA_REWARD] =                Location::Base(RC_KAK_30_GOLD_SKULLTULA_REWARD,         RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_HOUSE_OF_SKULLTULA,        0x00,                         0x46, "30 Gold Skulltula Reward",          "Kak 30 Gold Skulltula Reward",         RHT_KAK_30_GOLD_SKULLTULA_REWARD,         RG_PROGRESSIVE_WALLET,   {},                        SpoilerCollectionCheck::EventChkInf(0xDC),         SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
-    locationTable[RC_KAK_40_GOLD_SKULLTULA_REWARD] =                Location::Base(RC_KAK_40_GOLD_SKULLTULA_REWARD,         RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_HOUSE_OF_SKULLTULA,        0x00,                         0x03, "40 Gold Skulltula Reward",          "Kak 40 Gold Skulltula Reward",         RHT_KAK_40_GOLD_SKULLTULA_REWARD,         RG_BOMBCHU_10,           {},                        SpoilerCollectionCheck::EventChkInf(0xDD),         SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_50_GOLD_SKULLTULA_REWARD] =                Location::Base(RC_KAK_50_GOLD_SKULLTULA_REWARD,         RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_HOUSE_OF_SKULLTULA,        0x00,                         0x3E, "50 Gold Skulltula Reward",          "Kak 50 Gold Skulltula Reward",         RHT_KAK_50_GOLD_SKULLTULA_REWARD,         RG_PIECE_OF_HEART,       {},                        SpoilerCollectionCheck::EventChkInf(0xDE),         SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
-    locationTable[RC_KAK_100_GOLD_SKULLTULA_REWARD] =               Location::Base(RC_KAK_100_GOLD_SKULLTULA_REWARD,        RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_HOUSE_OF_SKULLTULA,        0x00,                         0x3E, "100 Gold Skulltula Reward",         "Kak 100 Gold Skulltula Reward",        RHT_KAK_100_GOLD_SKULLTULA_REWARD,        RG_HUGE_RUPEE,           {},                        SpoilerCollectionCheck::RandomizerInf(SCENE_HOUSE_OF_SKULLTULA, RAND_INF_KAK_100_GOLD_SKULLTULA_REWARD), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_MAN_ON_ROOF] =                             Location::Base(RC_KAK_MAN_ON_ROOF,                      RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_KAKARIKO_VILLAGE,          0x00,                         0x3E, "Man on Roof",                       "Kak Man on Roof",                      RHT_KAK_MAN_ON_ROOF,                      RG_PIECE_OF_HEART,       {},                        SpoilerCollectionCheck::ItemGetInf(29),            SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
-    locationTable[RC_KAK_SHOOTING_GALLERY_REWARD] =                 Location::Base(RC_KAK_SHOOTING_GALLERY_REWARD,          RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_SHOOTING_GALLERY,          0x00,                         0x30, "Shooting Gallery Reward",           "Kak Shooting Gallery Reward",          RHT_KAK_SHOOTING_GALLERY_REWARD,          RG_PROGRESSIVE_BOW,      {},                        SpoilerCollectionCheck::Chest(0x42, 0x1F),         SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
-    locationTable[RC_KAK_TRADE_ODD_MUSHROOM] =                      Location::Base(RC_KAK_TRADE_ODD_MUSHROOM,               RCQUEST_BOTH, RCTYPE_ADULT_TRADE, RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_POTION_SHOP_GRANNY,        0x00,                         0x20, "Trade Odd Mushroom",                "Kak Trade Odd Mushroom",               RHT_KAK_TRADE_ODD_MUSHROOM,               RG_ODD_POTION,           { Category::cAdultTrade }, SpoilerCollectionCheck::ItemGetInf(56),            SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
-    locationTable[RC_KAK_GRANNYS_SHOP] =                            Location::Base(RC_KAK_GRANNYS_SHOP,                     RCQUEST_BOTH, RCTYPE_MERCHANT,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_POTION_SHOP_GRANNY,        0x00,                         0x4E, "Granny's Shop",                     "Kak Granny's Shop",                    RHT_KAK_GRANNYS_SHOP,                     RG_BUY_BLUE_POTION,      {},                        SpoilerCollectionCheck::RandomizerInf(SCENE_POTION_SHOP_GRANNY, RAND_INF_MERCHANTS_GRANNYS_SHOP), SpoilerCollectionCheckGroup::GROUP_KAKARIKO, true);
-    locationTable[RC_KAK_ANJU_AS_ADULT] =                           Location::Base(RC_KAK_ANJU_AS_ADULT,                    RCQUEST_BOTH, RCTYPE_ADULT_TRADE, RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_KAKARIKO_VILLAGE,          0x00,                         0x1D, "Anju as Adult",                     "Kak Anju as Adult",                    RHT_KAK_ANJU_AS_ADULT,                    RG_CLAIM_CHECK,          {},                        SpoilerCollectionCheck::ItemGetInf(36),            SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
-    locationTable[RC_KAK_ANJU_AS_CHILD] =                           Location::Base(RC_KAK_ANJU_AS_CHILD,                    RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_KAKARIKO_VILLAGE,          0x00,                         0x0F, "Anju as Child",                     "Kak Anju as Child",                    RHT_KAK_ANJU_AS_CHILD,                    RG_EMPTY_BOTTLE,         {},                        SpoilerCollectionCheck::ItemGetInf(4),             SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
-    locationTable[RC_KAK_TRADE_POCKET_CUCCO] =                      Location::Base(RC_KAK_TRADE_POCKET_CUCCO,               RCQUEST_BOTH, RCTYPE_ADULT_TRADE, RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_KAKARIKO_VILLAGE,          0x00,                         0x0E, "Trade Pocket Cucco",                "Kak Trade Pocket Cucco",               RHT_KAK_TRADE_POCKET_CUCCO,               RG_COJIRO,               { Category::cAdultTrade }, SpoilerCollectionCheck::ItemGetInf(38),            SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
-    locationTable[RC_KAK_IMPAS_HOUSE_FREESTANDING_POH] =     Location::Collectable(RC_KAK_IMPAS_HOUSE_FREESTANDING_POH,     RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_EN_ITEM00, SCENE_IMPAS_HOUSE,               262,                          0x01, "Impas House Freestanding PoH",      "Kak Impas House Freestanding PoH",     RHT_KAK_IMPAS_HOUSE_FREESTANDING_POH,     RG_PIECE_OF_HEART,       {},                                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
-    locationTable[RC_KAK_WINDMILL_FREESTANDING_POH] =        Location::Collectable(RC_KAK_WINDMILL_FREESTANDING_POH,        RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_EN_ITEM00, SCENE_WINDMILL_AND_DAMPES_GRAVE, 262,                          0x01, "Windmill Freestanding PoH",         "Kak Windmill Freestanding PoH",        RHT_KAK_WINDMILL_FREESTANDING_POH,        RG_PIECE_OF_HEART,       {},                                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
+    locationTable[RC_KAK_REDEAD_GROTTO_CHEST] =                    Location::Chest(RC_KAK_REDEAD_GROTTO_CHEST,              RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_EN_BOX,    SCENE_GROTTOS,                   31434,                        0x0A, "Redead Grotto Chest",               "Kak Redead Grotto Chest",              RHT_KAK_REDEAD_GROTTO_CHEST,              RG_HUGE_RUPEE,               {},                                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_OPEN_GROTTO_CHEST] =                      Location::Chest(RC_KAK_OPEN_GROTTO_CHEST,                RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_EN_BOX,    SCENE_GROTTOS,                   22984,                        0x08, "Open Grotto Chest",                 "Kak Open Grotto Chest",                RHT_KAK_OPEN_GROTTO_CHEST,                RG_RED_RUPEE,                {},                                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_10_GOLD_SKULLTULA_REWARD] =                Location::Base(RC_KAK_10_GOLD_SKULLTULA_REWARD,         RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_HOUSE_OF_SKULLTULA,        0x00,                         0x45, "10 Gold Skulltula Reward",          "Kak 10 Gold Skulltula Reward",         RHT_KAK_10_GOLD_SKULLTULA_REWARD,         RG_PROGRESSIVE_WALLET,       {},                        SpoilerCollectionCheck::EventChkInf(0xDA),         SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
+    locationTable[RC_KAK_20_GOLD_SKULLTULA_REWARD] =                Location::Base(RC_KAK_20_GOLD_SKULLTULA_REWARD,         RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_HOUSE_OF_SKULLTULA,        0x00,                         0x39, "20 Gold Skulltula Reward",          "Kak 20 Gold Skulltula Reward",         RHT_KAK_20_GOLD_SKULLTULA_REWARD,         RG_STONE_OF_AGONY,           {},                        SpoilerCollectionCheck::EventChkInf(0xDB),         SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
+    locationTable[RC_KAK_30_GOLD_SKULLTULA_REWARD] =                Location::Base(RC_KAK_30_GOLD_SKULLTULA_REWARD,         RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_HOUSE_OF_SKULLTULA,        0x00,                         0x46, "30 Gold Skulltula Reward",          "Kak 30 Gold Skulltula Reward",         RHT_KAK_30_GOLD_SKULLTULA_REWARD,         RG_PROGRESSIVE_WALLET,       {},                        SpoilerCollectionCheck::EventChkInf(0xDC),         SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
+    locationTable[RC_KAK_40_GOLD_SKULLTULA_REWARD] =                Location::Base(RC_KAK_40_GOLD_SKULLTULA_REWARD,         RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_HOUSE_OF_SKULLTULA,        0x00,                         0x03, "40 Gold Skulltula Reward",          "Kak 40 Gold Skulltula Reward",         RHT_KAK_40_GOLD_SKULLTULA_REWARD,         RG_BOMBCHU_10,               {},                        SpoilerCollectionCheck::EventChkInf(0xDD),         SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_50_GOLD_SKULLTULA_REWARD] =                Location::Base(RC_KAK_50_GOLD_SKULLTULA_REWARD,         RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_HOUSE_OF_SKULLTULA,        0x00,                         0x3E, "50 Gold Skulltula Reward",          "Kak 50 Gold Skulltula Reward",         RHT_KAK_50_GOLD_SKULLTULA_REWARD,         RG_PIECE_OF_HEART,           {},                        SpoilerCollectionCheck::EventChkInf(0xDE),         SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
+    locationTable[RC_KAK_100_GOLD_SKULLTULA_REWARD] =               Location::Base(RC_KAK_100_GOLD_SKULLTULA_REWARD,        RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_HOUSE_OF_SKULLTULA,        0x00,                         0x3E, "100 Gold Skulltula Reward",         "Kak 100 Gold Skulltula Reward",        RHT_KAK_100_GOLD_SKULLTULA_REWARD,        RG_HUGE_RUPEE,               {},                        SpoilerCollectionCheck::RandomizerInf(SCENE_HOUSE_OF_SKULLTULA, RAND_INF_KAK_100_GOLD_SKULLTULA_REWARD), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_MAN_ON_ROOF] =                             Location::Base(RC_KAK_MAN_ON_ROOF,                      RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_KAKARIKO_VILLAGE,          0x00,                         0x3E, "Man on Roof",                       "Kak Man on Roof",                      RHT_KAK_MAN_ON_ROOF,                      RG_PIECE_OF_HEART,           {},                        SpoilerCollectionCheck::ItemGetInf(29),            SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
+    locationTable[RC_KAK_SHOOTING_GALLERY_REWARD] =                 Location::Base(RC_KAK_SHOOTING_GALLERY_REWARD,          RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_SHOOTING_GALLERY,          0x00,                         0x30, "Shooting Gallery Reward",           "Kak Shooting Gallery Reward",          RHT_KAK_SHOOTING_GALLERY_REWARD,          RG_PROGRESSIVE_BOW,          {},                        SpoilerCollectionCheck::Chest(0x42, 0x1F),         SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
+    locationTable[RC_KAK_TRADE_ODD_MUSHROOM] =                      Location::Base(RC_KAK_TRADE_ODD_MUSHROOM,               RCQUEST_BOTH, RCTYPE_ADULT_TRADE, RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_POTION_SHOP_GRANNY,        0x00,                         0x20, "Trade Odd Mushroom",                "Kak Trade Odd Mushroom",               RHT_KAK_TRADE_ODD_MUSHROOM,               RG_ODD_POTION,               { Category::cAdultTrade }, SpoilerCollectionCheck::ItemGetInf(56),            SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
+    locationTable[RC_KAK_GRANNYS_SHOP] =                            Location::Base(RC_KAK_GRANNYS_SHOP,                     RCQUEST_BOTH, RCTYPE_MERCHANT,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_POTION_SHOP_GRANNY,        0x00,                         0x4E, "Granny's Shop",                     "Kak Granny's Shop",                    RHT_KAK_GRANNYS_SHOP,                     RG_BUY_BLUE_POTION,          {},                        SpoilerCollectionCheck::RandomizerInf(SCENE_POTION_SHOP_GRANNY, RAND_INF_MERCHANTS_GRANNYS_SHOP), SpoilerCollectionCheckGroup::GROUP_KAKARIKO, true);
+    locationTable[RC_KAK_ANJU_AS_ADULT] =                           Location::Base(RC_KAK_ANJU_AS_ADULT,                    RCQUEST_BOTH, RCTYPE_ADULT_TRADE, RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_KAKARIKO_VILLAGE,          0x00,                         0x1D, "Anju as Adult",                     "Kak Anju as Adult",                    RHT_KAK_ANJU_AS_ADULT,                    RG_CLAIM_CHECK,              {},                        SpoilerCollectionCheck::ItemGetInf(36),            SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
+    locationTable[RC_KAK_ANJU_AS_CHILD] =                           Location::Base(RC_KAK_ANJU_AS_CHILD,                    RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_KAKARIKO_VILLAGE,          0x00,                         0x0F, "Anju as Child",                     "Kak Anju as Child",                    RHT_KAK_ANJU_AS_CHILD,                    RG_EMPTY_BOTTLE,             {},                        SpoilerCollectionCheck::ItemGetInf(4),             SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
+    locationTable[RC_KAK_TRADE_POCKET_CUCCO] =                      Location::Base(RC_KAK_TRADE_POCKET_CUCCO,               RCQUEST_BOTH, RCTYPE_ADULT_TRADE, RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_KAKARIKO_VILLAGE,          0x00,                         0x0E, "Trade Pocket Cucco",                "Kak Trade Pocket Cucco",               RHT_KAK_TRADE_POCKET_CUCCO,               RG_COJIRO,                   { Category::cAdultTrade }, SpoilerCollectionCheck::ItemGetInf(38),            SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
+    locationTable[RC_KAK_IMPAS_HOUSE_FREESTANDING_POH] =     Location::Collectable(RC_KAK_IMPAS_HOUSE_FREESTANDING_POH,     RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_EN_ITEM00, SCENE_IMPAS_HOUSE,               262,                          0x01, "Impas House Freestanding PoH",      "Kak Impas House Freestanding PoH",     RHT_KAK_IMPAS_HOUSE_FREESTANDING_POH,     RG_PIECE_OF_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
+    locationTable[RC_KAK_WINDMILL_FREESTANDING_POH] =        Location::Collectable(RC_KAK_WINDMILL_FREESTANDING_POH,        RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_EN_ITEM00, SCENE_WINDMILL_AND_DAMPES_GRAVE, 262,                          0x01, "Windmill Freestanding PoH",         "Kak Windmill Freestanding PoH",        RHT_KAK_WINDMILL_FREESTANDING_POH,        RG_PIECE_OF_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
     // Graveyard
-    locationTable[RC_GRAVEYARD_SHIELD_GRAVE_CHEST] =               Location::Chest(RC_GRAVEYARD_SHIELD_GRAVE_CHEST,         RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GRAVEYARD,             ACTOR_EN_BOX,    SCENE_GRAVE_WITH_FAIRYS_FOUNTAIN,21824,                        0x00, "Shield Grave Chest",                "GY Shield Grave Chest",                RHT_GRAVEYARD_SHIELD_GRAVE_CHEST,         RG_HYLIAN_SHIELD,        {},                                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_GRAVEYARD_HEART_PIECE_GRAVE_CHEST] =          Location::Chest(RC_GRAVEYARD_HEART_PIECE_GRAVE_CHEST,    RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GRAVEYARD,             ACTOR_EN_BOX,    SCENE_REDEAD_GRAVE,              -22592,                       0x00, "Heart Piece Grave Chest",           "GY Heart Piece Grave Chest",           RHT_GRAVEYARD_HEART_PIECE_GRAVE_CHEST,    RG_PIECE_OF_HEART,       {},                                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
-    locationTable[RC_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST] =         Location::Chest(RC_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST,   RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GRAVEYARD,             ACTOR_EN_BOX,    SCENE_ROYAL_FAMILYS_TOMB,        -32736,                       0x00, "Composers Grave Chest",             "GY Composers Grave Chest",             RHT_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST,   RG_BOMBS_5,              {},                                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_GRAVEYARD_HOOKSHOT_CHEST] =                   Location::Chest(RC_GRAVEYARD_HOOKSHOT_CHEST,             RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GRAVEYARD,             ACTOR_EN_BOX,    SCENE_WINDMILL_AND_DAMPES_GRAVE, 4352,                         0x00, "Hookshot Chest",                    "GY Hookshot Chest",                    RHT_GRAVEYARD_HOOKSHOT_CHEST,             RG_PROGRESSIVE_HOOKSHOT, {},                                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
-    locationTable[RC_GRAVEYARD_FREESTANDING_POH] =           Location::Collectable(RC_GRAVEYARD_FREESTANDING_POH,           RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GRAVEYARD,             ACTOR_EN_ITEM00, SCENE_GRAVEYARD,                 1030,                         0x04, "Freestanding PoH",                  "GY Freestanding PoH",                  RHT_GRAVEYARD_FREESTANDING_POH,           RG_PIECE_OF_HEART,       {},                                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
-    locationTable[RC_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH] =Location::Collectable(RC_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH,RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GRAVEYARD,             ACTOR_EN_ITEM00, SCENE_WINDMILL_AND_DAMPES_GRAVE, 1798,                         0x07, "Dampe Race Freestanding PoH",       "GY Dampe Race Freestanding PoH",       RHT_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH,RG_PIECE_OF_HEART,       {},                                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
-    locationTable[RC_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR] =    Location::Collectable(RC_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR,    RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GRAVEYARD,             ACTOR_EN_ITEM00, SCENE_GRAVEYARD,                 7942,                         0x08, "Dampe Gravedigging Tour",           "GY Dampe Gravedigging Tour",           RHT_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR,    RG_PIECE_OF_HEART,       {},                        SpoilerCollectionCheck::Gravedigger(0x53, 0x1F),   SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
+    locationTable[RC_GRAVEYARD_SHIELD_GRAVE_CHEST] =               Location::Chest(RC_GRAVEYARD_SHIELD_GRAVE_CHEST,         RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GRAVEYARD,             ACTOR_EN_BOX,    SCENE_GRAVE_WITH_FAIRYS_FOUNTAIN,21824,                        0x00, "Shield Grave Chest",                "GY Shield Grave Chest",                RHT_GRAVEYARD_SHIELD_GRAVE_CHEST,         RG_HYLIAN_SHIELD,            {},                                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_GRAVEYARD_HEART_PIECE_GRAVE_CHEST] =          Location::Chest(RC_GRAVEYARD_HEART_PIECE_GRAVE_CHEST,    RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GRAVEYARD,             ACTOR_EN_BOX,    SCENE_REDEAD_GRAVE,              -22592,                       0x00, "Heart Piece Grave Chest",           "GY Heart Piece Grave Chest",           RHT_GRAVEYARD_HEART_PIECE_GRAVE_CHEST,    RG_PIECE_OF_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
+    locationTable[RC_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST] =         Location::Chest(RC_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST,   RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GRAVEYARD,             ACTOR_EN_BOX,    SCENE_ROYAL_FAMILYS_TOMB,        -32736,                       0x00, "Composers Grave Chest",             "GY Composers Grave Chest",             RHT_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST,   RG_BOMBS_5,                  {},                                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_GRAVEYARD_HOOKSHOT_CHEST] =                   Location::Chest(RC_GRAVEYARD_HOOKSHOT_CHEST,             RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GRAVEYARD,             ACTOR_EN_BOX,    SCENE_WINDMILL_AND_DAMPES_GRAVE, 4352,                         0x00, "Hookshot Chest",                    "GY Hookshot Chest",                    RHT_GRAVEYARD_HOOKSHOT_CHEST,             RG_PROGRESSIVE_HOOKSHOT,     {},                                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
+    locationTable[RC_GRAVEYARD_FREESTANDING_POH] =           Location::Collectable(RC_GRAVEYARD_FREESTANDING_POH,           RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GRAVEYARD,             ACTOR_EN_ITEM00, SCENE_GRAVEYARD,                 1030,                         0x04, "Freestanding PoH",                  "GY Freestanding PoH",                  RHT_GRAVEYARD_FREESTANDING_POH,           RG_PIECE_OF_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
+    locationTable[RC_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH] =Location::Collectable(RC_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH,RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GRAVEYARD,             ACTOR_EN_ITEM00, SCENE_WINDMILL_AND_DAMPES_GRAVE, 1798,                         0x07, "Dampe Race Freestanding PoH",       "GY Dampe Race Freestanding PoH",       RHT_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH,RG_PIECE_OF_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
+    locationTable[RC_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR] =    Location::Collectable(RC_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR,    RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GRAVEYARD,             ACTOR_EN_ITEM00, SCENE_GRAVEYARD,                 7942,                         0x08, "Dampe Gravedigging Tour",           "GY Dampe Gravedigging Tour",           RHT_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR,    RG_PIECE_OF_HEART,           {},                        SpoilerCollectionCheck::Gravedigger(0x53, 0x1F),   SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
     // Death Mountain
-    locationTable[RC_DMT_CHEST] =                                  Location::Chest(RC_DMT_CHEST,                            RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_DEATH_MOUNTAIN_TRAIL,  ACTOR_EN_BOX,    SCENE_DEATH_MOUNTAIN_TRAIL,      23201,                        0x01, "Chest",                             "DMT Chest",                            RHT_DMT_CHEST,                            RG_PURPLE_RUPEE,         {},                                                                           SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMT_STORMS_GROTTO_CHEST] =                    Location::Chest(RC_DMT_STORMS_GROTTO_CHEST,              RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_DEATH_MOUNTAIN_TRAIL,  ACTOR_EN_BOX,    SCENE_GROTTOS,                   23255,                        0x17, "Storms Grotto Chest",               "DMT Storms Grotto Chest",              RHT_DMT_STORMS_GROTTO_CHEST,              RG_HUGE_RUPEE,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMT_TRADE_BROKEN_SWORD] =                      Location::Base(RC_DMT_TRADE_BROKEN_SWORD,               RCQUEST_BOTH, RCTYPE_ADULT_TRADE, RCAREA_DEATH_MOUNTAIN_TRAIL,  ACTOR_ID_MAX,    SCENE_DEATH_MOUNTAIN_TRAIL,      0x00,                         0x23, "Trade Broken Sword",                "DMT Trade Broken Sword",               RHT_DMT_TRADE_BROKEN_SWORD,               RG_PRESCRIPTION,         { Category::cAdultTrade }, SpoilerCollectionCheck::RandomizerInf(0x60, 0x1D), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN, true);
-    locationTable[RC_DMT_TRADE_EYEDROPS] =                          Location::Base(RC_DMT_TRADE_EYEDROPS,                   RCQUEST_BOTH, RCTYPE_ADULT_TRADE, RCAREA_DEATH_MOUNTAIN_TRAIL,  ACTOR_ID_MAX,    SCENE_DEATH_MOUNTAIN_TRAIL,      0x00,                         0x26, "Trade Eyedrops",                    "DMT Trade Eyedrops",                   RHT_DMT_TRADE_EYEDROPS,                   RG_CLAIM_CHECK,          { Category::cAdultTrade }, SpoilerCollectionCheck::RandomizerInf(0x60, 0x1E), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN, true);
-    locationTable[RC_DMT_TRADE_CLAIM_CHECK] =                       Location::Base(RC_DMT_TRADE_CLAIM_CHECK,                RCQUEST_BOTH, RCTYPE_ADULT_TRADE, RCAREA_DEATH_MOUNTAIN_TRAIL,  ACTOR_ID_MAX,    SCENE_DEATH_MOUNTAIN_TRAIL,      0x00,                         0x57, "Trade Claim Check",                 "DMT Trade Claim Check",                RHT_DMT_TRADE_CLAIM_CHECK,                RG_BIGGORON_SWORD,       {},                        SpoilerCollectionCheck::Chest(0x60, 0x1F),         SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN, true);
-    locationTable[RC_DMT_FREESTANDING_POH] =                 Location::Collectable(RC_DMT_FREESTANDING_POH,                 RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_DEATH_MOUNTAIN_TRAIL,  ACTOR_EN_ITEM00, SCENE_DEATH_MOUNTAIN_TRAIL,      7686,                         0x1E, "Freestanding PoH",                  "DMT Freestanding PoH",                 RHT_DMT_FREESTANDING_POH,                 RG_PIECE_OF_HEART,       {},                                                                           SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN, true);
+    locationTable[RC_DMT_CHEST] =                                  Location::Chest(RC_DMT_CHEST,                            RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_DEATH_MOUNTAIN_TRAIL,  ACTOR_EN_BOX,    SCENE_DEATH_MOUNTAIN_TRAIL,      23201,                        0x01, "Chest",                             "DMT Chest",                            RHT_DMT_CHEST,                            RG_PURPLE_RUPEE,             {},                                                                           SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMT_STORMS_GROTTO_CHEST] =                    Location::Chest(RC_DMT_STORMS_GROTTO_CHEST,              RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_DEATH_MOUNTAIN_TRAIL,  ACTOR_EN_BOX,    SCENE_GROTTOS,                   23255,                        0x17, "Storms Grotto Chest",               "DMT Storms Grotto Chest",              RHT_DMT_STORMS_GROTTO_CHEST,              RG_HUGE_RUPEE,               {},                                                                           SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMT_TRADE_BROKEN_SWORD] =                      Location::Base(RC_DMT_TRADE_BROKEN_SWORD,               RCQUEST_BOTH, RCTYPE_ADULT_TRADE, RCAREA_DEATH_MOUNTAIN_TRAIL,  ACTOR_ID_MAX,    SCENE_DEATH_MOUNTAIN_TRAIL,      0x00,                         0x23, "Trade Broken Sword",                "DMT Trade Broken Sword",               RHT_DMT_TRADE_BROKEN_SWORD,               RG_PRESCRIPTION,             { Category::cAdultTrade }, SpoilerCollectionCheck::RandomizerInf(0x60, 0x1D), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN, true);
+    locationTable[RC_DMT_TRADE_EYEDROPS] =                          Location::Base(RC_DMT_TRADE_EYEDROPS,                   RCQUEST_BOTH, RCTYPE_ADULT_TRADE, RCAREA_DEATH_MOUNTAIN_TRAIL,  ACTOR_ID_MAX,    SCENE_DEATH_MOUNTAIN_TRAIL,      0x00,                         0x26, "Trade Eyedrops",                    "DMT Trade Eyedrops",                   RHT_DMT_TRADE_EYEDROPS,                   RG_CLAIM_CHECK,              { Category::cAdultTrade }, SpoilerCollectionCheck::RandomizerInf(0x60, 0x1E), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN, true);
+    locationTable[RC_DMT_TRADE_CLAIM_CHECK] =                       Location::Base(RC_DMT_TRADE_CLAIM_CHECK,                RCQUEST_BOTH, RCTYPE_ADULT_TRADE, RCAREA_DEATH_MOUNTAIN_TRAIL,  ACTOR_ID_MAX,    SCENE_DEATH_MOUNTAIN_TRAIL,      0x00,                         0x57, "Trade Claim Check",                 "DMT Trade Claim Check",                RHT_DMT_TRADE_CLAIM_CHECK,                RG_BIGGORON_SWORD,           {},                        SpoilerCollectionCheck::Chest(0x60, 0x1F),         SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN, true);
+    locationTable[RC_DMT_FREESTANDING_POH] =                 Location::Collectable(RC_DMT_FREESTANDING_POH,                 RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_DEATH_MOUNTAIN_TRAIL,  ACTOR_EN_ITEM00, SCENE_DEATH_MOUNTAIN_TRAIL,      7686,                         0x1E, "Freestanding PoH",                  "DMT Freestanding PoH",                 RHT_DMT_FREESTANDING_POH,                 RG_PIECE_OF_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN, true);
     // Goron City
-    locationTable[RC_GC_MAZE_LEFT_CHEST] =                         Location::Chest(RC_GC_MAZE_LEFT_CHEST,                   RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GORON_CITY,            ACTOR_EN_BOX,    SCENE_GORON_CITY,                23232,                        0x00, "Maze Left Chest",                   "GC Maze Left Chest",                   RHT_GC_MAZE_LEFT_CHEST,                   RG_HUGE_RUPEE,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_MAZE_RIGHT_CHEST] =                        Location::Chest(RC_GC_MAZE_RIGHT_CHEST,                  RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GORON_CITY,            ACTOR_EN_BOX,    SCENE_GORON_CITY,                23201,                        0x01, "Maze Right Chest",                  "GC Maze Right Chest",                  RHT_GC_MAZE_RIGHT_CHEST,                  RG_PURPLE_RUPEE,         {},                                                                           SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_MAZE_CENTER_CHEST] =                       Location::Chest(RC_GC_MAZE_CENTER_CHEST,                 RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GORON_CITY,            ACTOR_EN_BOX,    SCENE_GORON_CITY,                23202,                        0x02, "Maze Center Chest",                 "GC Maze Center Chest",                 RHT_GC_MAZE_CENTER_CHEST,                 RG_PURPLE_RUPEE,         {},                                                                           SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_ROLLING_GORON_AS_CHILD] =                   Location::Base(RC_GC_ROLLING_GORON_AS_CHILD,            RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GORON_CITY,            ACTOR_ID_MAX,    SCENE_GORON_CITY,                0x00,                         0x34, "Rolling Goron as Child",            "GC Rolling Goron as Child",            RHT_GC_ROLLING_GORON_AS_CHILD,            RG_PROGRESSIVE_BOMB_BAG, {},                        SpoilerCollectionCheck::InfTable(0x11, 0x06),      SpoilerCollectionCheckGroup::GROUP_GORON_CITY,     true);
-    locationTable[RC_GC_ROLLING_GORON_AS_ADULT] =                   Location::Base(RC_GC_ROLLING_GORON_AS_ADULT,            RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GORON_CITY,            ACTOR_ID_MAX,    SCENE_GORON_CITY,                0x00,                         0x2C, "Rolling Goron as Adult",            "GC Rolling Goron as Adult",            RHT_GC_ROLLING_GORON_AS_ADULT,            RG_GORON_TUNIC,          {},                        SpoilerCollectionCheck::InfTable(0x10, 0x01),      SpoilerCollectionCheckGroup::GROUP_GORON_CITY,     true);
-    locationTable[RC_GC_DARUNIAS_JOY] =                             Location::Base(RC_GC_DARUNIAS_JOY,                      RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GORON_CITY,            ACTOR_ID_MAX,    SCENE_GORON_CITY,                0x00,                         0x54, "Darunias Joy",                      "GC Darunias Joy",                      RHT_GC_DARUNIAS_JOY,                      RG_PROGRESSIVE_STRENGTH, {},                        SpoilerCollectionCheck::Chest(0x62, 0x1E),         SpoilerCollectionCheckGroup::GROUP_GORON_CITY,     true);
-    locationTable[RC_GC_POT_FREESTANDING_POH] =              Location::Collectable(RC_GC_POT_FREESTANDING_POH,              RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GORON_CITY,            ACTOR_EN_ITEM00, SCENE_GORON_CITY,                7942,                         0x1F, "Pot Freestanding PoH",              "GC Pot Freestanding PoH",              RHT_GC_POT_FREESTANDING_POH,              RG_PIECE_OF_HEART,       {},                                                                           SpoilerCollectionCheckGroup::GROUP_GORON_CITY,     true);
-    locationTable[RC_GC_DEKU_SCRUB_GROTTO_LEFT] =            Location::GrottoScrub(RC_GC_DEKU_SCRUB_GROTTO_LEFT,            RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_GORON_CITY,            ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x00, 0xFB), 0x30, "Deku Scrub Grotto Left",            "GC Deku Scrub Grotto Left",            RHT_GC_DEKU_SCRUB_GROTTO_LEFT,            RG_BUY_DEKU_NUT_5,       { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x25, 0x01),         SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_DEKU_SCRUB_GROTTO_RIGHT] =           Location::GrottoScrub(RC_GC_DEKU_SCRUB_GROTTO_RIGHT,           RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_GORON_CITY,            ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x05, 0xFB), 0x37, "Deku Scrub Grotto Right",           "GC Deku Scrub Grotto Right",           RHT_GC_DEKU_SCRUB_GROTTO_RIGHT,           RG_BUY_BOMBS_535,        { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x25, 0x06),         SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_DEKU_SCRUB_GROTTO_CENTER] =          Location::GrottoScrub(RC_GC_DEKU_SCRUB_GROTTO_CENTER,          RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_GORON_CITY,            ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x03, 0xFB), 0x33, "Deku Scrub Grotto Center",          "GC Deku Scrub Grotto Center",          RHT_GC_DEKU_SCRUB_GROTTO_CENTER,          RG_BUY_ARROWS_30,        { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x25, 0x04),         SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_MEDIGORON] =                                Location::Base(RC_GC_MEDIGORON,                         RCQUEST_BOTH, RCTYPE_MERCHANT,    RCAREA_GORON_CITY,            ACTOR_ID_MAX,    SCENE_GORON_CITY,                0x00,                         0x51, "Medigoron",                         "GC Medigoron",                         RHT_GC_MEDIGORON,                         RG_GIANTS_KNIFE,         { Category::cMerchant },   SpoilerCollectionCheck::Merchant(0x62, 0x87),      SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_MAZE_LEFT_CHEST] =                         Location::Chest(RC_GC_MAZE_LEFT_CHEST,                   RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GORON_CITY,            ACTOR_EN_BOX,    SCENE_GORON_CITY,                23232,                        0x00, "Maze Left Chest",                   "GC Maze Left Chest",                   RHT_GC_MAZE_LEFT_CHEST,                   RG_HUGE_RUPEE,               {},                                                                           SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_MAZE_RIGHT_CHEST] =                        Location::Chest(RC_GC_MAZE_RIGHT_CHEST,                  RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GORON_CITY,            ACTOR_EN_BOX,    SCENE_GORON_CITY,                23201,                        0x01, "Maze Right Chest",                  "GC Maze Right Chest",                  RHT_GC_MAZE_RIGHT_CHEST,                  RG_PURPLE_RUPEE,             {},                                                                           SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_MAZE_CENTER_CHEST] =                       Location::Chest(RC_GC_MAZE_CENTER_CHEST,                 RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GORON_CITY,            ACTOR_EN_BOX,    SCENE_GORON_CITY,                23202,                        0x02, "Maze Center Chest",                 "GC Maze Center Chest",                 RHT_GC_MAZE_CENTER_CHEST,                 RG_PURPLE_RUPEE,             {},                                                                           SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_ROLLING_GORON_AS_CHILD] =                   Location::Base(RC_GC_ROLLING_GORON_AS_CHILD,            RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GORON_CITY,            ACTOR_ID_MAX,    SCENE_GORON_CITY,                0x00,                         0x34, "Rolling Goron as Child",            "GC Rolling Goron as Child",            RHT_GC_ROLLING_GORON_AS_CHILD,            RG_PROGRESSIVE_BOMB_BAG,     {},                        SpoilerCollectionCheck::InfTable(0x11, 0x06),      SpoilerCollectionCheckGroup::GROUP_GORON_CITY,     true);
+    locationTable[RC_GC_ROLLING_GORON_AS_ADULT] =                   Location::Base(RC_GC_ROLLING_GORON_AS_ADULT,            RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GORON_CITY,            ACTOR_ID_MAX,    SCENE_GORON_CITY,                0x00,                         0x2C, "Rolling Goron as Adult",            "GC Rolling Goron as Adult",            RHT_GC_ROLLING_GORON_AS_ADULT,            RG_GORON_TUNIC,              {},                        SpoilerCollectionCheck::InfTable(0x10, 0x01),      SpoilerCollectionCheckGroup::GROUP_GORON_CITY,     true);
+    locationTable[RC_GC_DARUNIAS_JOY] =                             Location::Base(RC_GC_DARUNIAS_JOY,                      RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GORON_CITY,            ACTOR_ID_MAX,    SCENE_GORON_CITY,                0x00,                         0x54, "Darunias Joy",                      "GC Darunias Joy",                      RHT_GC_DARUNIAS_JOY,                      RG_PROGRESSIVE_STRENGTH,     {},                        SpoilerCollectionCheck::Chest(0x62, 0x1E),         SpoilerCollectionCheckGroup::GROUP_GORON_CITY,     true);
+    locationTable[RC_GC_POT_FREESTANDING_POH] =              Location::Collectable(RC_GC_POT_FREESTANDING_POH,              RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GORON_CITY,            ACTOR_EN_ITEM00, SCENE_GORON_CITY,                7942,                         0x1F, "Pot Freestanding PoH",              "GC Pot Freestanding PoH",              RHT_GC_POT_FREESTANDING_POH,              RG_PIECE_OF_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_GORON_CITY,     true);
+    locationTable[RC_GC_DEKU_SCRUB_GROTTO_LEFT] =            Location::GrottoScrub(RC_GC_DEKU_SCRUB_GROTTO_LEFT,            RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_GORON_CITY,            ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x00, 0xFB), 0x30, "Deku Scrub Grotto Left",            "GC Deku Scrub Grotto Left",            RHT_GC_DEKU_SCRUB_GROTTO_LEFT,            RG_BUY_DEKU_NUTS_5,          { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x25, 0x01),         SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_DEKU_SCRUB_GROTTO_RIGHT] =           Location::GrottoScrub(RC_GC_DEKU_SCRUB_GROTTO_RIGHT,           RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_GORON_CITY,            ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x05, 0xFB), 0x37, "Deku Scrub Grotto Right",           "GC Deku Scrub Grotto Right",           RHT_GC_DEKU_SCRUB_GROTTO_RIGHT,           RG_BUY_BOMBS_535,            { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x25, 0x06),         SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_DEKU_SCRUB_GROTTO_CENTER] =          Location::GrottoScrub(RC_GC_DEKU_SCRUB_GROTTO_CENTER,          RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_GORON_CITY,            ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x03, 0xFB), 0x33, "Deku Scrub Grotto Center",          "GC Deku Scrub Grotto Center",          RHT_GC_DEKU_SCRUB_GROTTO_CENTER,          RG_BUY_ARROWS_30,            { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x25, 0x04),         SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_MEDIGORON] =                                Location::Base(RC_GC_MEDIGORON,                         RCQUEST_BOTH, RCTYPE_MERCHANT,    RCAREA_GORON_CITY,            ACTOR_ID_MAX,    SCENE_GORON_CITY,                0x00,                         0x51, "Medigoron",                         "GC Medigoron",                         RHT_GC_MEDIGORON,                         RG_GIANTS_KNIFE,             { Category::cMerchant },   SpoilerCollectionCheck::Merchant(0x62, 0x87),      SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
     // Death Mountain Crater
-    locationTable[RC_DMC_UPPER_GROTTO_CHEST] =                     Location::Chest(RC_DMC_UPPER_GROTTO_CHEST,               RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_DEATH_MOUNTAIN_CRATER, ACTOR_EN_BOX,    SCENE_GROTTOS,                   23802,                        0x1A, "Upper Grotto Chest",                "DMC Upper Grotto Chest",               RHT_DMC_UPPER_GROTTO_CHEST,               RG_BOMBS_20,             {},                                                                           SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMC_WALL_FREESTANDING_POH] =            Location::Collectable(RC_DMC_WALL_FREESTANDING_POH,            RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_DEATH_MOUNTAIN_CRATER, ACTOR_EN_ITEM00, SCENE_DEATH_MOUNTAIN_CRATER,     518,                          0x02, "Wall Freestanding PoH",             "DMC Wall Freestanding PoH",            RHT_DMC_WALL_FREESTANDING_POH,            RG_PIECE_OF_HEART,       {},                                                                           SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN, true);
-    locationTable[RC_DMC_VOLCANO_FREESTANDING_POH] =         Location::Collectable(RC_DMC_VOLCANO_FREESTANDING_POH,         RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_DEATH_MOUNTAIN_CRATER, ACTOR_EN_ITEM00, SCENE_DEATH_MOUNTAIN_CRATER,     2054,                         0x08, "Volcano Freestanding PoH",          "DMC Volcano Freestanding PoH",         RHT_DMC_WALL_FREESTANDING_POH,            RG_PIECE_OF_HEART,       {},                                                                           SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN, true);
-    locationTable[RC_DMC_DEKU_SCRUB] =                              Location::Base(RC_DMC_DEKU_SCRUB,                       RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_DEATH_MOUNTAIN_CRATER, ACTOR_EN_DNS,    SCENE_DEATH_MOUNTAIN_CRATER,     0x05,                         0x37, "Deku Scrub",                        "DMC Deku Scrub",                       RHT_DMC_DEKU_SCRUB,                       RG_BUY_BOMBS_535,        { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x61, 0x06),         SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMC_DEKU_SCRUB_GROTTO_LEFT] =           Location::GrottoScrub(RC_DMC_DEKU_SCRUB_GROTTO_LEFT,           RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_DEATH_MOUNTAIN_CRATER, ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x00, 0xF9), 0x30, "Deku Scrub Grotto Left",            "DMC Deku Scrub Grotto Left",           RHT_DMC_DEKU_SCRUB_GROTTO_LEFT,           RG_BUY_DEKU_NUT_5,       { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x23, 0x01),         SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMC_DEKU_SCRUB_GROTTO_RIGHT] =          Location::GrottoScrub(RC_DMC_DEKU_SCRUB_GROTTO_RIGHT,          RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_DEATH_MOUNTAIN_CRATER, ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x05, 0xF9), 0x37, "Deku Scrub Grotto Right",           "DMC Deku Scrub Grotto Right",          RHT_DMC_DEKU_SCRUB_GROTTO_RIGHT,          RG_BUY_BOMBS_535,        { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x23, 0x06),         SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMC_DEKU_SCRUB_GROTTO_CENTER] =         Location::GrottoScrub(RC_DMC_DEKU_SCRUB_GROTTO_CENTER,         RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_DEATH_MOUNTAIN_CRATER, ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x03, 0xF9), 0x33, "Deku Scrub Grotto Center",          "DMC Deku Scrub Grotto Center",         RHT_DMC_DEKU_SCRUB_GROTTO_CENTER,         RG_BUY_ARROWS_30,        { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x23, 0x04),         SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMC_UPPER_GROTTO_CHEST] =                     Location::Chest(RC_DMC_UPPER_GROTTO_CHEST,               RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_DEATH_MOUNTAIN_CRATER, ACTOR_EN_BOX,    SCENE_GROTTOS,                   23802,                        0x1A, "Upper Grotto Chest",                "DMC Upper Grotto Chest",               RHT_DMC_UPPER_GROTTO_CHEST,               RG_BOMBS_20,                 {},                                                                           SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMC_WALL_FREESTANDING_POH] =            Location::Collectable(RC_DMC_WALL_FREESTANDING_POH,            RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_DEATH_MOUNTAIN_CRATER, ACTOR_EN_ITEM00, SCENE_DEATH_MOUNTAIN_CRATER,     518,                          0x02, "Wall Freestanding PoH",             "DMC Wall Freestanding PoH",            RHT_DMC_WALL_FREESTANDING_POH,            RG_PIECE_OF_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN, true);
+    locationTable[RC_DMC_VOLCANO_FREESTANDING_POH] =         Location::Collectable(RC_DMC_VOLCANO_FREESTANDING_POH,         RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_DEATH_MOUNTAIN_CRATER, ACTOR_EN_ITEM00, SCENE_DEATH_MOUNTAIN_CRATER,     2054,                         0x08, "Volcano Freestanding PoH",          "DMC Volcano Freestanding PoH",         RHT_DMC_WALL_FREESTANDING_POH,            RG_PIECE_OF_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN, true);
+    locationTable[RC_DMC_DEKU_SCRUB] =                              Location::Base(RC_DMC_DEKU_SCRUB,                       RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_DEATH_MOUNTAIN_CRATER, ACTOR_EN_DNS,    SCENE_DEATH_MOUNTAIN_CRATER,     0x05,                         0x37, "Deku Scrub",                        "DMC Deku Scrub",                       RHT_DMC_DEKU_SCRUB,                       RG_BUY_BOMBS_535,            { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x61, 0x06),         SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMC_DEKU_SCRUB_GROTTO_LEFT] =           Location::GrottoScrub(RC_DMC_DEKU_SCRUB_GROTTO_LEFT,           RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_DEATH_MOUNTAIN_CRATER, ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x00, 0xF9), 0x30, "Deku Scrub Grotto Left",            "DMC Deku Scrub Grotto Left",           RHT_DMC_DEKU_SCRUB_GROTTO_LEFT,           RG_BUY_DEKU_NUTS_5,          { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x23, 0x01),         SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMC_DEKU_SCRUB_GROTTO_RIGHT] =          Location::GrottoScrub(RC_DMC_DEKU_SCRUB_GROTTO_RIGHT,          RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_DEATH_MOUNTAIN_CRATER, ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x05, 0xF9), 0x37, "Deku Scrub Grotto Right",           "DMC Deku Scrub Grotto Right",          RHT_DMC_DEKU_SCRUB_GROTTO_RIGHT,          RG_BUY_BOMBS_535,            { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x23, 0x06),         SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMC_DEKU_SCRUB_GROTTO_CENTER] =         Location::GrottoScrub(RC_DMC_DEKU_SCRUB_GROTTO_CENTER,         RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_DEATH_MOUNTAIN_CRATER, ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x03, 0xF9), 0x33, "Deku Scrub Grotto Center",          "DMC Deku Scrub Grotto Center",         RHT_DMC_DEKU_SCRUB_GROTTO_CENTER,         RG_BUY_ARROWS_30,            { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x23, 0x04),         SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
     // Zoras River
-    locationTable[RC_ZR_OPEN_GROTTO_CHEST] =                       Location::Chest(RC_ZR_OPEN_GROTTO_CHEST,                 RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_ZORAS_RIVER,           ACTOR_EN_BOX,    SCENE_GROTTOS,                   22985,                        0x09, "Open Grotto Chest",                 "ZR Open Grotto Chest",                 RHT_ZR_OPEN_GROTTO_CHEST,                 RG_RED_RUPEE,            {},                                                                           SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZR_MAGIC_BEAN_SALESMAN] =                      Location::Base(RC_ZR_MAGIC_BEAN_SALESMAN,               RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_ZORAS_RIVER,           ACTOR_ID_MAX,    SCENE_ZORAS_RIVER,               0x00,                         0x16, "Magic Bean Salesman",               "ZR Magic Bean Salesman",               RHT_ZR_MAGIC_BEAN_SALESMAN,               RG_MAGIC_BEAN,           {},                        SpoilerCollectionCheck::MagicBeans(0x54, 0x01),    SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,    true);
-    locationTable[RC_ZR_FROGS_ZELDAS_LULLABY] =                     Location::Base(RC_ZR_FROGS_ZELDAS_LULLABY,              RCQUEST_BOTH, RCTYPE_FROG_SONG,   RCAREA_ZORAS_RIVER,           ACTOR_EN_FR,     SCENE_ZORAS_RIVER,               0x00,                         0x3E, "Frogs Zelda's Lullaby",             "ZR Frogs Zelda's Lullaby",             RHT_ZR_FROGS_ZELDAS_LULLABY,              RG_PURPLE_RUPEE,         {},                        SpoilerCollectionCheck::EventChkInf(0xD1),         SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZR_FROGS_EPONAS_SONG] =                        Location::Base(RC_ZR_FROGS_EPONAS_SONG,                 RCQUEST_BOTH, RCTYPE_FROG_SONG,   RCAREA_ZORAS_RIVER,           ACTOR_EN_FR,     SCENE_ZORAS_RIVER,               0x00,                         0x3E, "Frogs Epona's Song",                "ZR Frogs Epona's Song",                RHT_ZR_FROGS_EPONAS_SONG,                 RG_PURPLE_RUPEE,         {},                        SpoilerCollectionCheck::EventChkInf(0xD2),         SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZR_FROGS_SARIAS_SONG] =                        Location::Base(RC_ZR_FROGS_SARIAS_SONG,                 RCQUEST_BOTH, RCTYPE_FROG_SONG,   RCAREA_ZORAS_RIVER,           ACTOR_EN_FR,     SCENE_ZORAS_RIVER,               0x00,                         0x3E, "Frogs Saria's Song",                "ZR Frogs Saria's Song",                RHT_ZR_FROGS_SARIAS_SONG,                 RG_PURPLE_RUPEE,         {},                        SpoilerCollectionCheck::EventChkInf(0xD4),         SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZR_FROGS_SUNS_SONG] =                          Location::Base(RC_ZR_FROGS_SUNS_SONG,                   RCQUEST_BOTH, RCTYPE_FROG_SONG,   RCAREA_ZORAS_RIVER,           ACTOR_EN_FR,     SCENE_ZORAS_RIVER,               0x00,                         0x3E, "Frogs Sun's Song",                  "ZR Frogs Sun's Song",                  RHT_ZR_FROGS_SUNS_SONG,                   RG_PURPLE_RUPEE,         {},                        SpoilerCollectionCheck::EventChkInf(0xD3),         SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZR_FROGS_SONG_OF_TIME] =                       Location::Base(RC_ZR_FROGS_SONG_OF_TIME,                RCQUEST_BOTH, RCTYPE_FROG_SONG,   RCAREA_ZORAS_RIVER,           ACTOR_EN_FR,     SCENE_ZORAS_RIVER,               0x00,                         0x3E, "Frogs Song of Time",                "ZR Frogs Song of Time",                RHT_ZR_FROGS_SONG_OF_TIME,                RG_PURPLE_RUPEE,         {},                        SpoilerCollectionCheck::EventChkInf(0xD5),         SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZR_FROGS_IN_THE_RAIN] =                        Location::Base(RC_ZR_FROGS_IN_THE_RAIN,                 RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_ZORAS_RIVER,           ACTOR_EN_FR,     SCENE_ZORAS_RIVER,               0x00,                         0x3E, "Frogs in the Rain",                 "ZR Frogs in the Rain",                 RHT_ZR_FROGS_IN_THE_RAIN,                 RG_PIECE_OF_HEART,       {},                        SpoilerCollectionCheck::EventChkInf(0xD6),         SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,    true);
-    locationTable[RC_ZR_FROGS_OCARINA_GAME] =                       Location::Base(RC_ZR_FROGS_OCARINA_GAME,                RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_ZORAS_RIVER,           ACTOR_EN_FR,     SCENE_ZORAS_RIVER,               0x00,                         0x76, "Frogs Ocarina Game",                "ZR Frogs Ocarina Game",                RHT_ZR_FROGS_OCARINA_GAME,                RG_PIECE_OF_HEART,       {},                        SpoilerCollectionCheck::EventChkInf(0xD0),         SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,    true);
-    locationTable[RC_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH] = Location::Collectable(RC_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH, RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_ZORAS_RIVER,           ACTOR_EN_ITEM00, SCENE_ZORAS_RIVER,               1030,                         0x04, "Near Open Grotto Freestanding PoH", "ZR Near Open Grotto Freestanding PoH", RHT_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH, RG_PIECE_OF_HEART,       {},                                                                           SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,    true);
-    locationTable[RC_ZR_NEAR_DOMAIN_FREESTANDING_POH] =      Location::Collectable(RC_ZR_NEAR_DOMAIN_FREESTANDING_POH,      RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_ZORAS_RIVER,           ACTOR_EN_ITEM00, SCENE_ZORAS_RIVER,               2822,                         0x0B, "Near Domain Freestanding PoH",      "ZR Near Domain Freestanding PoH",      RHT_ZR_NEAR_DOMAIN_FREESTANDING_POH,      RG_PIECE_OF_HEART,       {},                                                                           SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,    true);
-    locationTable[RC_ZR_DEKU_SCRUB_GROTTO_REAR] =            Location::GrottoScrub(RC_ZR_DEKU_SCRUB_GROTTO_REAR,            RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_ZORAS_RIVER,           ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x07, 0xEB), 0x39, "Deku Scrub Grotto Rear",            "ZR Deku Scrub Grotto Rear",            RHT_ZR_DEKU_SCRUB_GROTTO_REAR,            RG_BUY_RED_POTION_30,    { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x15, 0x08),         SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZR_DEKU_SCRUB_GROTTO_FRONT] =           Location::GrottoScrub(RC_ZR_DEKU_SCRUB_GROTTO_FRONT,           RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_ZORAS_RIVER,           ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x08, 0xEB), 0x3A, "Deku Scrub Grotto Front",           "ZR Deku Scrub Grotto Front",           RHT_ZR_DEKU_SCRUB_GROTTO_FRONT,           RG_BUY_GREEN_POTION,     { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x15, 0x09),         SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZR_OPEN_GROTTO_CHEST] =                       Location::Chest(RC_ZR_OPEN_GROTTO_CHEST,                 RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_ZORAS_RIVER,           ACTOR_EN_BOX,    SCENE_GROTTOS,                   22985,                        0x09, "Open Grotto Chest",                 "ZR Open Grotto Chest",                 RHT_ZR_OPEN_GROTTO_CHEST,                 RG_RED_RUPEE,                {},                                                                           SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZR_MAGIC_BEAN_SALESMAN] =                      Location::Base(RC_ZR_MAGIC_BEAN_SALESMAN,               RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_ZORAS_RIVER,           ACTOR_ID_MAX,    SCENE_ZORAS_RIVER,               0x00,                         0x16, "Magic Bean Salesman",               "ZR Magic Bean Salesman",               RHT_ZR_MAGIC_BEAN_SALESMAN,               RG_MAGIC_BEAN,               {},                        SpoilerCollectionCheck::MagicBeans(0x54, 0x01),    SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,    true);
+    locationTable[RC_ZR_FROGS_ZELDAS_LULLABY] =                     Location::Base(RC_ZR_FROGS_ZELDAS_LULLABY,              RCQUEST_BOTH, RCTYPE_FROG_SONG,   RCAREA_ZORAS_RIVER,           ACTOR_EN_FR,     SCENE_ZORAS_RIVER,               0x00,                         0x3E, "Frogs Zelda's Lullaby",             "ZR Frogs Zelda's Lullaby",             RHT_ZR_FROGS_ZELDAS_LULLABY,              RG_PURPLE_RUPEE,             {},                        SpoilerCollectionCheck::EventChkInf(0xD1),         SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZR_FROGS_EPONAS_SONG] =                        Location::Base(RC_ZR_FROGS_EPONAS_SONG,                 RCQUEST_BOTH, RCTYPE_FROG_SONG,   RCAREA_ZORAS_RIVER,           ACTOR_EN_FR,     SCENE_ZORAS_RIVER,               0x00,                         0x3E, "Frogs Epona's Song",                "ZR Frogs Epona's Song",                RHT_ZR_FROGS_EPONAS_SONG,                 RG_PURPLE_RUPEE,             {},                        SpoilerCollectionCheck::EventChkInf(0xD2),         SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZR_FROGS_SARIAS_SONG] =                        Location::Base(RC_ZR_FROGS_SARIAS_SONG,                 RCQUEST_BOTH, RCTYPE_FROG_SONG,   RCAREA_ZORAS_RIVER,           ACTOR_EN_FR,     SCENE_ZORAS_RIVER,               0x00,                         0x3E, "Frogs Saria's Song",                "ZR Frogs Saria's Song",                RHT_ZR_FROGS_SARIAS_SONG,                 RG_PURPLE_RUPEE,             {},                        SpoilerCollectionCheck::EventChkInf(0xD4),         SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZR_FROGS_SUNS_SONG] =                          Location::Base(RC_ZR_FROGS_SUNS_SONG,                   RCQUEST_BOTH, RCTYPE_FROG_SONG,   RCAREA_ZORAS_RIVER,           ACTOR_EN_FR,     SCENE_ZORAS_RIVER,               0x00,                         0x3E, "Frogs Sun's Song",                  "ZR Frogs Sun's Song",                  RHT_ZR_FROGS_SUNS_SONG,                   RG_PURPLE_RUPEE,             {},                        SpoilerCollectionCheck::EventChkInf(0xD3),         SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZR_FROGS_SONG_OF_TIME] =                       Location::Base(RC_ZR_FROGS_SONG_OF_TIME,                RCQUEST_BOTH, RCTYPE_FROG_SONG,   RCAREA_ZORAS_RIVER,           ACTOR_EN_FR,     SCENE_ZORAS_RIVER,               0x00,                         0x3E, "Frogs Song of Time",                "ZR Frogs Song of Time",                RHT_ZR_FROGS_SONG_OF_TIME,                RG_PURPLE_RUPEE,             {},                        SpoilerCollectionCheck::EventChkInf(0xD5),         SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZR_FROGS_IN_THE_RAIN] =                        Location::Base(RC_ZR_FROGS_IN_THE_RAIN,                 RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_ZORAS_RIVER,           ACTOR_EN_FR,     SCENE_ZORAS_RIVER,               0x00,                         0x3E, "Frogs in the Rain",                 "ZR Frogs in the Rain",                 RHT_ZR_FROGS_IN_THE_RAIN,                 RG_PIECE_OF_HEART,           {},                        SpoilerCollectionCheck::EventChkInf(0xD6),         SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,    true);
+    locationTable[RC_ZR_FROGS_OCARINA_GAME] =                       Location::Base(RC_ZR_FROGS_OCARINA_GAME,                RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_ZORAS_RIVER,           ACTOR_EN_FR,     SCENE_ZORAS_RIVER,               0x00,                         0x76, "Frogs Ocarina Game",                "ZR Frogs Ocarina Game",                RHT_ZR_FROGS_OCARINA_GAME,                RG_PIECE_OF_HEART,           {},                        SpoilerCollectionCheck::EventChkInf(0xD0),         SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,    true);
+    locationTable[RC_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH] = Location::Collectable(RC_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH, RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_ZORAS_RIVER,           ACTOR_EN_ITEM00, SCENE_ZORAS_RIVER,               1030,                         0x04, "Near Open Grotto Freestanding PoH", "ZR Near Open Grotto Freestanding PoH", RHT_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH, RG_PIECE_OF_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,    true);
+    locationTable[RC_ZR_NEAR_DOMAIN_FREESTANDING_POH] =      Location::Collectable(RC_ZR_NEAR_DOMAIN_FREESTANDING_POH,      RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_ZORAS_RIVER,           ACTOR_EN_ITEM00, SCENE_ZORAS_RIVER,               2822,                         0x0B, "Near Domain Freestanding PoH",      "ZR Near Domain Freestanding PoH",      RHT_ZR_NEAR_DOMAIN_FREESTANDING_POH,      RG_PIECE_OF_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,    true);
+    locationTable[RC_ZR_DEKU_SCRUB_GROTTO_REAR] =            Location::GrottoScrub(RC_ZR_DEKU_SCRUB_GROTTO_REAR,            RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_ZORAS_RIVER,           ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x07, 0xEB), 0x39, "Deku Scrub Grotto Rear",            "ZR Deku Scrub Grotto Rear",            RHT_ZR_DEKU_SCRUB_GROTTO_REAR,            RG_BUY_RED_POTION_30,        { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x15, 0x08),         SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZR_DEKU_SCRUB_GROTTO_FRONT] =           Location::GrottoScrub(RC_ZR_DEKU_SCRUB_GROTTO_FRONT,           RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_ZORAS_RIVER,           ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x08, 0xEB), 0x3A, "Deku Scrub Grotto Front",           "ZR Deku Scrub Grotto Front",           RHT_ZR_DEKU_SCRUB_GROTTO_FRONT,           RG_BUY_GREEN_POTION,         { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x15, 0x09),         SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
     // Zoras Domain
-    locationTable[RC_ZD_CHEST] =                                   Location::Chest(RC_ZD_CHEST,                             RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_ZORAS_DOMAIN,          ACTOR_EN_BOX,    SCENE_ZORAS_DOMAIN,              -18496,                       0x00, "Chest",                             "ZD Chest",                             RHT_ZD_CHEST,                             RG_PIECE_OF_HEART,       {},                                                                           SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,   true);
-    locationTable[RC_ZD_DIVING_MINIGAME] =                          Location::Base(RC_ZD_DIVING_MINIGAME,                   RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_ZORAS_DOMAIN,          ACTOR_ID_MAX,    SCENE_ZORAS_DOMAIN,              0x00,                         0x37, "Diving Minigame",                   "ZD Diving Minigame",                   RHT_ZD_DIVING_MINIGAME,                   RG_PROGRESSIVE_SCALE,    {},                         SpoilerCollectionCheck::EventChkInf(0x38),        SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,   true);
-    locationTable[RC_ZD_KING_ZORA_THAWED] =                         Location::Base(RC_ZD_KING_ZORA_THAWED,                  RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_ZORAS_DOMAIN,          ACTOR_ID_MAX,    SCENE_ZORAS_DOMAIN,              0x00,                         0x2D, "King Zora Thawed",                  "ZD King Zora Thawed",                  RHT_ZD_KING_ZORA_THAWED,                  RG_ZORA_TUNIC,           {},                         SpoilerCollectionCheck::InfTable(0x13, 0x01),     SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,   true);
-    locationTable[RC_ZD_TRADE_PRESCRIPTION] =                       Location::Base(RC_ZD_TRADE_PRESCRIPTION,                RCQUEST_BOTH, RCTYPE_ADULT_TRADE, RCAREA_ZORAS_DOMAIN,          ACTOR_ID_MAX,    SCENE_ZORAS_DOMAIN,              0x00,                         0x24, "Trade Prescription",                "ZD Trade Prescription",                RHT_ZD_TRADE_PRESCRIPTION,                RG_EYEBALL_FROG,         { Category::cAdultTrade },  SpoilerCollectionCheck::Chest(0x58, 0x1F),        SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,   true);
+    locationTable[RC_ZD_CHEST] =                                   Location::Chest(RC_ZD_CHEST,                             RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_ZORAS_DOMAIN,          ACTOR_EN_BOX,    SCENE_ZORAS_DOMAIN,              -18496,                       0x00, "Chest",                             "ZD Chest",                             RHT_ZD_CHEST,                             RG_PIECE_OF_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,   true);
+    locationTable[RC_ZD_DIVING_MINIGAME] =                          Location::Base(RC_ZD_DIVING_MINIGAME,                   RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_ZORAS_DOMAIN,          ACTOR_ID_MAX,    SCENE_ZORAS_DOMAIN,              0x00,                         0x37, "Diving Minigame",                   "ZD Diving Minigame",                   RHT_ZD_DIVING_MINIGAME,                   RG_PROGRESSIVE_SCALE,        {},                        SpoilerCollectionCheck::EventChkInf(0x38),        SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,   true);
+    locationTable[RC_ZD_KING_ZORA_THAWED] =                         Location::Base(RC_ZD_KING_ZORA_THAWED,                  RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_ZORAS_DOMAIN,          ACTOR_ID_MAX,    SCENE_ZORAS_DOMAIN,              0x00,                         0x2D, "King Zora Thawed",                  "ZD King Zora Thawed",                  RHT_ZD_KING_ZORA_THAWED,                  RG_ZORA_TUNIC,               {},                        SpoilerCollectionCheck::InfTable(0x13, 0x01),     SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,   true);
+    locationTable[RC_ZD_TRADE_PRESCRIPTION] =                       Location::Base(RC_ZD_TRADE_PRESCRIPTION,                RCQUEST_BOTH, RCTYPE_ADULT_TRADE, RCAREA_ZORAS_DOMAIN,          ACTOR_ID_MAX,    SCENE_ZORAS_DOMAIN,              0x00,                         0x24, "Trade Prescription",                "ZD Trade Prescription",                RHT_ZD_TRADE_PRESCRIPTION,                RG_EYEBALL_FROG,             { Category::cAdultTrade }, SpoilerCollectionCheck::Chest(0x58, 0x1F),        SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,   true);
     // Zora's Fountain
-    locationTable[RC_ZF_ICEBERC_FREESTANDING_POH] =          Location::Collectable(RC_ZF_ICEBERC_FREESTANDING_POH,          RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_ZORAS_FOUNTAIN,        ACTOR_EN_ITEM00, SCENE_ZORAS_FOUNTAIN,            262,                          0x01, "Iceberg Freestanding PoH",          "ZF Iceberg Freestanding PoH",          RHT_ZF_ICEBERG_FREESTANDING_POH,          RG_PIECE_OF_HEART,       {},                                                                           SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,   true);
-    locationTable[RC_ZF_BOTTOM_FREESTANDING_POH] =           Location::Collectable(RC_ZF_BOTTOM_FREESTANDING_POH,           RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_ZORAS_FOUNTAIN,        ACTOR_EN_ITEM00, SCENE_ZORAS_FOUNTAIN,            5126,                         0x14, "Bottom Freestanding PoH",           "ZF Bottom Freestanding PoH",           RHT_ZF_BOTTOM_FREESTANDING_POH,           RG_PIECE_OF_HEART,       {},                                                                           SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,   true);
+    locationTable[RC_ZF_ICEBERC_FREESTANDING_POH] =          Location::Collectable(RC_ZF_ICEBERC_FREESTANDING_POH,          RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_ZORAS_FOUNTAIN,        ACTOR_EN_ITEM00, SCENE_ZORAS_FOUNTAIN,            262,                          0x01, "Iceberg Freestanding PoH",          "ZF Iceberg Freestanding PoH",          RHT_ZF_ICEBERG_FREESTANDING_POH,          RG_PIECE_OF_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,   true);
+    locationTable[RC_ZF_BOTTOM_FREESTANDING_POH] =           Location::Collectable(RC_ZF_BOTTOM_FREESTANDING_POH,           RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_ZORAS_FOUNTAIN,        ACTOR_EN_ITEM00, SCENE_ZORAS_FOUNTAIN,            5126,                         0x14, "Bottom Freestanding PoH",           "ZF Bottom Freestanding PoH",           RHT_ZF_BOTTOM_FREESTANDING_POH,           RG_PIECE_OF_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,   true);
     // Lon Lon Ranch
-    locationTable[RC_LLR_TALONS_CHICKENS] =                         Location::Base(RC_LLR_TALONS_CHICKENS,                  RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LON_LON_RANCH,         ACTOR_ID_MAX,    SCENE_LON_LON_BUILDINGS,         0x00,                         0x14, "Talons Chickens",                   "LLR Talons Chickens",                  RHT_LLR_TALONS_CHICKENS,                  RG_BOTTLE_WITH_MILK,     {},                         SpoilerCollectionCheck::ItemGetInf(10),           SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH,  true);
-    locationTable[RC_LLR_FREESTANDING_POH] =                 Location::Collectable(RC_LLR_FREESTANDING_POH,                 RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LON_LON_RANCH,         ACTOR_EN_ITEM00, SCENE_LON_LON_BUILDINGS,         262,                          0x01, "Freestanding PoH",                  "LLR Freestanding PoH",                 RHT_LLR_FREESTANDING_POH,                 RG_PIECE_OF_HEART,       {},                                                                           SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH,  true);
-    locationTable[RC_LLR_DEKU_SCRUB_GROTTO_LEFT] =           Location::GrottoScrub(RC_LLR_DEKU_SCRUB_GROTTO_LEFT,           RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_LON_LON_RANCH,         ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x00, 0xFC), 0x30, "Deku Scrub Grotto Left",            "LLR Deku Scrub Grotto Left",           RHT_LLR_DEKU_SCRUB_GROTTO_LEFT,           RG_BUY_DEKU_NUT_5,       { Category::cDekuScrub },   SpoilerCollectionCheck::Scrub(0x26, 0x01),        SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
-    locationTable[RC_LLR_DEKU_SCRUB_GROTTO_RIGHT] =          Location::GrottoScrub(RC_LLR_DEKU_SCRUB_GROTTO_RIGHT,          RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_LON_LON_RANCH,         ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x05, 0xFC), 0x37, "Deku Scrub Grotto Right",           "LLR Deku Scrub Grotto Right",          RHT_LLR_DEKU_SCRUB_GROTTO_RIGHT,          RG_BUY_BOMBS_535,        { Category::cDekuScrub },   SpoilerCollectionCheck::Scrub(0x26, 0x06),        SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
-    locationTable[RC_LLR_DEKU_SCRUB_GROTTO_CENTER] =         Location::GrottoScrub(RC_LLR_DEKU_SCRUB_GROTTO_CENTER,         RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_LON_LON_RANCH,         ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x03, 0xFC), 0x33, "Deku Scrub Grotto Center",          "LLR Deku Scrub Grotto Center",         RHT_LLR_DEKU_SCRUB_GROTTO_CENTER,         RG_BUY_DEKU_SEEDS_30,    { Category::cDekuScrub },   SpoilerCollectionCheck::Scrub(0x26, 0x04),        SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
+    locationTable[RC_LLR_TALONS_CHICKENS] =                         Location::Base(RC_LLR_TALONS_CHICKENS,                  RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LON_LON_RANCH,         ACTOR_ID_MAX,    SCENE_LON_LON_BUILDINGS,         0x00,                         0x14, "Talons Chickens",                   "LLR Talons Chickens",                  RHT_LLR_TALONS_CHICKENS,                  RG_BOTTLE_WITH_MILK,         {},                        SpoilerCollectionCheck::ItemGetInf(10),           SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH,  true);
+    locationTable[RC_LLR_FREESTANDING_POH] =                 Location::Collectable(RC_LLR_FREESTANDING_POH,                 RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LON_LON_RANCH,         ACTOR_EN_ITEM00, SCENE_LON_LON_BUILDINGS,         262,                          0x01, "Freestanding PoH",                  "LLR Freestanding PoH",                 RHT_LLR_FREESTANDING_POH,                 RG_PIECE_OF_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH,  true);
+    locationTable[RC_LLR_DEKU_SCRUB_GROTTO_LEFT] =           Location::GrottoScrub(RC_LLR_DEKU_SCRUB_GROTTO_LEFT,           RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_LON_LON_RANCH,         ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x00, 0xFC), 0x30, "Deku Scrub Grotto Left",            "LLR Deku Scrub Grotto Left",           RHT_LLR_DEKU_SCRUB_GROTTO_LEFT,           RG_BUY_DEKU_NUTS_5,          { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x26, 0x01),        SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
+    locationTable[RC_LLR_DEKU_SCRUB_GROTTO_RIGHT] =          Location::GrottoScrub(RC_LLR_DEKU_SCRUB_GROTTO_RIGHT,          RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_LON_LON_RANCH,         ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x05, 0xFC), 0x37, "Deku Scrub Grotto Right",           "LLR Deku Scrub Grotto Right",          RHT_LLR_DEKU_SCRUB_GROTTO_RIGHT,          RG_BUY_BOMBS_535,            { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x26, 0x06),        SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
+    locationTable[RC_LLR_DEKU_SCRUB_GROTTO_CENTER] =         Location::GrottoScrub(RC_LLR_DEKU_SCRUB_GROTTO_CENTER,         RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_LON_LON_RANCH,         ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x03, 0xFC), 0x33, "Deku Scrub Grotto Center",          "LLR Deku Scrub Grotto Center",         RHT_LLR_DEKU_SCRUB_GROTTO_CENTER,         RG_BUY_DEKU_SEEDS_30,        { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x26, 0x04),        SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
 
     // Dungeons
     //            Randomizer Check                                             Randomizer Check                           Quest            Type                Area              Actor ID      Scene ID         Params Flags Short Name                       Spoiler Name                              Hint Text Key                               Vanilla Item              Categories                     Spoiler Collection Check                   Collection Check Group                                Vanilla Progression
@@ -741,7 +741,7 @@ void Rando::StaticData::InitLocationTable() {
     locationTable[RC_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST] =                 Location::Chest(RC_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST,                  RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_DODONGOS_CAVERN, ACTOR_EN_BOX, SCENE_DODONGOS_CAVERN,      22982, 0x06, "Bomb Flower Platform Chest",                  "Dodongos Cavern Bomb Flower Platform Chest",               RHT_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST,                  RG_RED_RUPEE,               {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
     locationTable[RC_DODONGOS_CAVERN_BOMB_BAG_CHEST] =                             Location::Chest(RC_DODONGOS_CAVERN_BOMB_BAG_CHEST,                              RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_DODONGOS_CAVERN, ACTOR_EN_BOX, SCENE_DODONGOS_CAVERN,      1604,  0x04, "Bomb Bag Chest",                              "Dodongos Cavern Bomb Bag Chest",                           RHT_DODONGOS_CAVERN_BOMB_BAG_CHEST,                              RG_PROGRESSIVE_BOMB_BAG,    {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN, true);
     locationTable[RC_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST] =                        Location::Chest(RC_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST,                         RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_DODONGOS_CAVERN, ACTOR_EN_BOX, SCENE_DODONGOS_CAVERN,      21802, 0x0A, "End Of Bridge Chest",                         "Dodongos Cavern End Of Bridge Chest",                      RHT_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST,                         RG_DEKU_SHIELD,             {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT] =               Location::Base(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,               RCQUEST_VANILLA, RCTYPE_SCRUB,       RCAREA_DODONGOS_CAVERN, ACTOR_EN_DNS, SCENE_DODONGOS_CAVERN,      0x00,  0x30, "Deku Scrub Near Bomb Bag Left",               "Dodongos Cavern Deku Scrub Near Bomb Bag Left",            RHT_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,               RG_BUY_DEKU_NUT_5,          { Category::cDekuScrub },      SpoilerCollectionCheck::Scrub(0x01, 0x01), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT] =               Location::Base(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,               RCQUEST_VANILLA, RCTYPE_SCRUB,       RCAREA_DODONGOS_CAVERN, ACTOR_EN_DNS, SCENE_DODONGOS_CAVERN,      0x00,  0x30, "Deku Scrub Near Bomb Bag Left",               "Dodongos Cavern Deku Scrub Near Bomb Bag Left",            RHT_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,               RG_BUY_DEKU_NUTS_5,         { Category::cDekuScrub },      SpoilerCollectionCheck::Scrub(0x01, 0x01), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
     locationTable[RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS] =          Location::Base(RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS,          RCQUEST_VANILLA, RCTYPE_SCRUB,       RCAREA_DODONGOS_CAVERN, ACTOR_EN_DNS, SCENE_DODONGOS_CAVERN,      0x01,  0x31, "Deku Scrub Side Room Near Dodongos",          "Dodongos Cavern Deku Scrub Side Room Near Dodongos",       RHT_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS,          RG_BUY_DEKU_STICK_1,        { Category::cDekuScrub },      SpoilerCollectionCheck::Scrub(0x01, 0x02), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
     locationTable[RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT] =              Location::Base(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT,              RCQUEST_VANILLA, RCTYPE_SCRUB,       RCAREA_DODONGOS_CAVERN, ACTOR_EN_DNS, SCENE_DODONGOS_CAVERN,      0x03,  0x33, "Deku Scrub Near Bomb Bag Right",              "Dodongos Cavern Deku Scrub Near Bomb Bag Right",           RHT_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT,              RG_BUY_DEKU_SEEDS_30,       { Category::cDekuScrub },      SpoilerCollectionCheck::Scrub(0x01, 0x04), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
     locationTable[RC_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY] =                            Location::Base(RC_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY,                            RCQUEST_VANILLA, RCTYPE_SCRUB,       RCAREA_DODONGOS_CAVERN, ACTOR_EN_DNS, SCENE_DODONGOS_CAVERN,      0x04,  0x34, "Deku Scrub Lobby",                            "Dodongos Cavern Deku Scrub Lobby",                         RHT_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY,                            RG_BUY_DEKU_SHIELD,         { Category::cDekuScrub },      SpoilerCollectionCheck::Scrub(0x01, 0x05), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
@@ -762,7 +762,7 @@ void Rando::StaticData::InitLocationTable() {
     locationTable[RC_JABU_JABUS_BELLY_MAP_CHEST] =                       Location::Chest(RC_JABU_JABUS_BELLY_MAP_CHEST,                       RCQUEST_VANILLA, RCTYPE_MAP_COMPASS, RCAREA_JABU_JABUS_BELLY, ACTOR_EN_BOX, SCENE_JABU_JABU, 6178,   0x02, "Map Chest",                       "Jabu Jabus Belly Map Chest",                       RHT_JABU_JABUS_BELLY_MAP_CHEST,                       RG_JABU_JABUS_BELLY_MAP,     { Category::cVanillaMap },                                                SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY, true);
     locationTable[RC_JABU_JABUS_BELLY_COMPASS_CHEST] =                   Location::Chest(RC_JABU_JABUS_BELLY_COMPASS_CHEST,                   RCQUEST_VANILLA, RCTYPE_MAP_COMPASS, RCAREA_JABU_JABUS_BELLY, ACTOR_EN_BOX, SCENE_JABU_JABU, -18428, 0x04, "Compass Chest",                   "Jabu Jabus Belly Compass Chest",                   RHT_JABU_JABUS_BELLY_COMPASS_CHEST,                   RG_JABU_JABUS_BELLY_COMPASS, { Category::cVanillaCompass },                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY, true);
     locationTable[RC_JABU_JABUS_BELLY_BOOMERANG_CHEST] =                 Location::Chest(RC_JABU_JABUS_BELLY_BOOMERANG_CHEST,                 RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_JABU_JABUS_BELLY, ACTOR_EN_BOX, SCENE_JABU_JABU, 4289,   0x01, "Boomerang Chest",                 "Jabu Jabus Belly Boomerang Chest",                 RHT_JABU_JABUS_BELLY_BOOMERANG_CHEST,                 RG_BOOMERANG,                {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY, true);
-    locationTable[RC_JABU_JABUS_BELLY_DEKU_SCRUB] =                      Location::Base(RC_JABU_JABUS_BELLY_DEKU_SCRUB,                       RCQUEST_VANILLA, RCTYPE_SCRUB,       RCAREA_JABU_JABUS_BELLY, ACTOR_EN_DNS, SCENE_JABU_JABU, 0x00,   0x30, "Deku Scrub",                      "Jabu Jabus Belly Deku Scrub",                      RHT_JABU_JABUS_BELLY_DEKU_SCRUB,                      RG_BUY_DEKU_NUT_5,           { Category::cDekuScrub },      SpoilerCollectionCheck::Scrub(0x02, 0x01), SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_DEKU_SCRUB] =                      Location::Base(RC_JABU_JABUS_BELLY_DEKU_SCRUB,                       RCQUEST_VANILLA, RCTYPE_SCRUB,       RCAREA_JABU_JABUS_BELLY, ACTOR_EN_DNS, SCENE_JABU_JABU, 0x00,   0x30, "Deku Scrub",                      "Jabu Jabus Belly Deku Scrub",                      RHT_JABU_JABUS_BELLY_DEKU_SCRUB,                      RG_BUY_DEKU_NUTS_5,          { Category::cDekuScrub },      SpoilerCollectionCheck::Scrub(0x02, 0x01), SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
     // Jabu-Jabu's Belly MQ
     locationTable[RC_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST] =        Location::Chest(RC_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST,        RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_JABU_JABUS_BELLY, ACTOR_EN_BOX, SCENE_JABU_JABU, -32699, 0x05, "MQ First Room Side Chest",        "Jabu Jabus Belly MQ First Room Side Chest",        RHT_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST,        RG_DEKU_NUTS_5,              {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
     locationTable[RC_JABU_JABUS_BELLY_MQ_MAP_CHEST] =                    Location::Chest(RC_JABU_JABUS_BELLY_MQ_MAP_CHEST,                    RCQUEST_MQ,      RCTYPE_MAP_COMPASS, RCAREA_JABU_JABUS_BELLY, ACTOR_EN_BOX, SCENE_JABU_JABU, -18397, 0x03, "MQ Map Chest",                    "Jabu Jabus Belly MQ Map Chest",                    RHT_JABU_JABUS_BELLY_MQ_MAP_CHEST,                    RG_JABU_JABUS_BELLY_MAP,     { Category::cVanillaMap },                                                SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY, true);
@@ -1055,7 +1055,7 @@ void Rando::StaticData::InitLocationTable() {
     locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST] =             Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST,             RCQUEST_MQ,      RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, 20586,  0x0A, "MQ Spirit Trial First Chest",             "Ganon's Castle MQ Spirit Trial First Chest",             RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST,             RG_BOMBCHU_10,              {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
     locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST] =         Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST,         RCQUEST_MQ,      RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, 26964,  0x14, "MQ Spirit Trial Invisible Chest",         "Ganon's Castle MQ Spirit Trial Invisible Chest",         RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST,         RG_ARROWS_10,               {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
     locationTable[RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY] =        Location::Collectable(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY,  RCQUEST_MQ,      RCTYPE_SMALL_KEY,      RCAREA_GANONS_CASTLE, ACTOR_EN_ITEM00, SCENE_INSIDE_GANONS_CASTLE, 273,    0x01, "MQ Forest Trial Freestanding Key",        "Ganon's Castle MQ Forest Trial Freestanding Key",        RHT_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY,        RG_GANONS_CASTLE_SMALL_KEY, { Category::cVanillaSmallKey },                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE, true);
-    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT] =                     Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,                      RCQUEST_MQ,      RCTYPE_SCRUB,          RCAREA_GANONS_CASTLE, ACTOR_EN_DNS,    SCENE_INSIDE_GANONS_CASTLE, 0x00,   0x30, "MQ Deku Scrub Right",                     "Ganon's Castle MQ Deku Scrub Right",                     RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,                     RG_BUY_DEKU_NUT_5,          { Category::cDekuScrub },       SpoilerCollectionCheck::Scrub(0x0D, 0x01), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT] =                     Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,                      RCQUEST_MQ,      RCTYPE_SCRUB,          RCAREA_GANONS_CASTLE, ACTOR_EN_DNS,    SCENE_INSIDE_GANONS_CASTLE, 0x00,   0x30, "MQ Deku Scrub Right",                     "Ganon's Castle MQ Deku Scrub Right",                     RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,                     RG_BUY_DEKU_NUTS_5,         { Category::cDekuScrub },       SpoilerCollectionCheck::Scrub(0x0D, 0x01), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
     locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT] =               Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,                RCQUEST_MQ,      RCTYPE_SCRUB,          RCAREA_GANONS_CASTLE, ACTOR_EN_DNS,    SCENE_INSIDE_GANONS_CASTLE, 0x05,   0x37, "MQ Deku Scrub Center-Left",               "Ganon's Castle MQ Deku Scrub Center-Left",               RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,               RG_BUY_BOMBS_535,           { Category::cDekuScrub },       SpoilerCollectionCheck::Scrub(0x0D, 0x06), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
     locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER] =                    Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,                     RCQUEST_MQ,      RCTYPE_SCRUB,          RCAREA_GANONS_CASTLE, ACTOR_EN_DNS,    SCENE_INSIDE_GANONS_CASTLE, 0x03,   0x33, "MQ Deku Scrub Center",                    "Ganon's Castle MQ Deku Scrub Center",                    RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,                    RG_BUY_ARROWS_30,           { Category::cDekuScrub },       SpoilerCollectionCheck::Scrub(0x0D, 0x04), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
     locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT] =              Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT,               RCQUEST_MQ,      RCTYPE_SCRUB,          RCAREA_GANONS_CASTLE, ACTOR_EN_DNS,    SCENE_INSIDE_GANONS_CASTLE, 0x07,   0x39, "MQ Deku Scrub Center-Right",              "Ganon's Castle MQ Deku Scrub Center-Right",              RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT,              RG_BUY_RED_POTION_30,       { Category::cDekuScrub },       SpoilerCollectionCheck::Scrub(0x0D, 0x08), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
@@ -1300,8 +1300,8 @@ void Rando::StaticData::InitLocationTable() {
     //            Randomizer Check                                 Randomizer Check               Quest         Type         Area                       Actor ID        Scene ID                    Params Flags Short Name            Spoiler Name              Hint Text Key                   Vanilla Item           Categories           Spoiler Collection Check                   Spoiler Collection Check Group
     // Kokiri Forest
     locationTable[RC_KF_SHOP_ITEM_1] =              Location::Base(RC_KF_SHOP_ITEM_1,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KOKIRI_FOREST,      ACTOR_EN_GIRLA, SCENE_KOKIRI_SHOP,          0x00, 0x00, "Shop Item 1",         "KF Shop Item 1",         RHT_KF_SHOP_ITEM_1,             RG_BUY_DEKU_SHIELD,    { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2D, 0), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_SHOP_ITEM_2] =              Location::Base(RC_KF_SHOP_ITEM_2,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KOKIRI_FOREST,      ACTOR_EN_GIRLA, SCENE_KOKIRI_SHOP,          0x01, 0x01, "Shop Item 2",         "KF Shop Item 2",         RHT_KF_SHOP_ITEM_2,             RG_BUY_DEKU_NUT_5,     { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2D, 1), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_SHOP_ITEM_3] =              Location::Base(RC_KF_SHOP_ITEM_3,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KOKIRI_FOREST,      ACTOR_EN_GIRLA, SCENE_KOKIRI_SHOP,          0x02, 0x02, "Shop Item 3",         "KF Shop Item 3",         RHT_KF_SHOP_ITEM_3,             RG_BUY_DEKU_NUT_10,    { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2D, 2), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_SHOP_ITEM_2] =              Location::Base(RC_KF_SHOP_ITEM_2,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KOKIRI_FOREST,      ACTOR_EN_GIRLA, SCENE_KOKIRI_SHOP,          0x01, 0x01, "Shop Item 2",         "KF Shop Item 2",         RHT_KF_SHOP_ITEM_2,             RG_BUY_DEKU_NUTS_5,    { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2D, 1), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_SHOP_ITEM_3] =              Location::Base(RC_KF_SHOP_ITEM_3,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KOKIRI_FOREST,      ACTOR_EN_GIRLA, SCENE_KOKIRI_SHOP,          0x02, 0x02, "Shop Item 3",         "KF Shop Item 3",         RHT_KF_SHOP_ITEM_3,             RG_BUY_DEKU_NUTS_10,   { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2D, 2), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
     locationTable[RC_KF_SHOP_ITEM_4] =              Location::Base(RC_KF_SHOP_ITEM_4,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KOKIRI_FOREST,      ACTOR_EN_GIRLA, SCENE_KOKIRI_SHOP,          0x03, 0x03, "Shop Item 4",         "KF Shop Item 4",         RHT_KF_SHOP_ITEM_4,             RG_BUY_DEKU_STICK_1,   { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2D, 3), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
     locationTable[RC_KF_SHOP_ITEM_5] =              Location::Base(RC_KF_SHOP_ITEM_5,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KOKIRI_FOREST,      ACTOR_EN_GIRLA, SCENE_KOKIRI_SHOP,          0x04, 0x04, "Shop Item 5",         "KF Shop Item 5",         RHT_KF_SHOP_ITEM_5,             RG_BUY_DEKU_SEEDS_30,  { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2D, 4), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
     locationTable[RC_KF_SHOP_ITEM_6] =              Location::Base(RC_KF_SHOP_ITEM_6,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KOKIRI_FOREST,      ACTOR_EN_GIRLA, SCENE_KOKIRI_SHOP,          0x05, 0x05, "Shop Item 6",         "KF Shop Item 6",         RHT_KF_SHOP_ITEM_6,             RG_BUY_ARROWS_10,      { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2D, 5), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
@@ -1313,13 +1313,13 @@ void Rando::StaticData::InitLocationTable() {
     locationTable[RC_KAK_POTION_SHOP_ITEM_2] =      Location::Base(RC_KAK_POTION_SHOP_ITEM_2,     RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_POTION_SHOP_KAKARIKO, 0x01, 0x31, "Potion Shop Item 2",  "Kak Potion Shop Item 2", RHT_KAK_POTION_SHOP_ITEM_2,     RG_BUY_BLUE_FIRE,      { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x30, 1), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
     locationTable[RC_KAK_POTION_SHOP_ITEM_3] =      Location::Base(RC_KAK_POTION_SHOP_ITEM_3,     RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_POTION_SHOP_KAKARIKO, 0x02, 0x32, "Potion Shop Item 3",  "Kak Potion Shop Item 3", RHT_KAK_POTION_SHOP_ITEM_3,     RG_BUY_RED_POTION_30,  { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x30, 2), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
     locationTable[RC_KAK_POTION_SHOP_ITEM_4] =      Location::Base(RC_KAK_POTION_SHOP_ITEM_4,     RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_POTION_SHOP_KAKARIKO, 0x03, 0x33, "Potion Shop Item 4",  "Kak Potion Shop Item 4", RHT_KAK_POTION_SHOP_ITEM_4,     RG_BUY_FAIRYS_SPIRIT,  { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x30, 3), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_POTION_SHOP_ITEM_5] =      Location::Base(RC_KAK_POTION_SHOP_ITEM_5,     RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_POTION_SHOP_KAKARIKO, 0x04, 0x34, "Potion Shop Item 5",  "Kak Potion Shop Item 5", RHT_KAK_POTION_SHOP_ITEM_5,     RG_BUY_DEKU_NUT_5,     { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x30, 4), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_POTION_SHOP_ITEM_5] =      Location::Base(RC_KAK_POTION_SHOP_ITEM_5,     RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_POTION_SHOP_KAKARIKO, 0x04, 0x34, "Potion Shop Item 5",  "Kak Potion Shop Item 5", RHT_KAK_POTION_SHOP_ITEM_5,     RG_BUY_DEKU_NUTS_5,     { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x30, 4), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
     locationTable[RC_KAK_POTION_SHOP_ITEM_6] =      Location::Base(RC_KAK_POTION_SHOP_ITEM_6,     RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_POTION_SHOP_KAKARIKO, 0x05, 0x35, "Potion Shop Item 6",  "Kak Potion Shop Item 6", RHT_KAK_POTION_SHOP_ITEM_6,     RG_BUY_BOTTLE_BUG,     { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x30, 5), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
     locationTable[RC_KAK_POTION_SHOP_ITEM_7] =      Location::Base(RC_KAK_POTION_SHOP_ITEM_7,     RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_POTION_SHOP_KAKARIKO, 0x06, 0x36, "Potion Shop Item 7",  "Kak Potion Shop Item 7", RHT_KAK_POTION_SHOP_ITEM_7,     RG_BUY_POE,            { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x30, 6), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
     locationTable[RC_KAK_POTION_SHOP_ITEM_8] =      Location::Base(RC_KAK_POTION_SHOP_ITEM_8,     RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_POTION_SHOP_KAKARIKO, 0x07, 0x37, "Potion Shop Item 8",  "Kak Potion Shop Item 8", RHT_KAK_POTION_SHOP_ITEM_8,     RG_BUY_FISH,           { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x30, 7), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
     locationTable[RC_KAK_BAZAAR_ITEM_1] =           Location::Base(RC_KAK_BAZAAR_ITEM_1,          RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_TEST01,               0x00, 0x38, "Bazaar Item 1",       "Kak Bazaar Item 1",      RHT_KAK_BAZAAR_ITEM_1,          RG_BUY_HYLIAN_SHIELD,  { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x33, 0), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
     locationTable[RC_KAK_BAZAAR_ITEM_2] =           Location::Base(RC_KAK_BAZAAR_ITEM_2,          RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_TEST01,               0x01, 0x39, "Bazaar Item 2",       "Kak Bazaar Item 2",      RHT_KAK_BAZAAR_ITEM_2,          RG_BUY_BOMBS_535,      { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x33, 1), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_BAZAAR_ITEM_3] =           Location::Base(RC_KAK_BAZAAR_ITEM_3,          RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_TEST01,               0x02, 0x3A, "Bazaar Item 3",       "Kak Bazaar Item 3",      RHT_KAK_BAZAAR_ITEM_3,          RG_BUY_DEKU_NUT_5,     { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x33, 2), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_BAZAAR_ITEM_3] =           Location::Base(RC_KAK_BAZAAR_ITEM_3,          RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_TEST01,               0x02, 0x3A, "Bazaar Item 3",       "Kak Bazaar Item 3",      RHT_KAK_BAZAAR_ITEM_3,          RG_BUY_DEKU_NUTS_5,     { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x33, 2), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
     locationTable[RC_KAK_BAZAAR_ITEM_4] =           Location::Base(RC_KAK_BAZAAR_ITEM_4,          RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_TEST01,               0x03, 0x3B, "Bazaar Item 4",       "Kak Bazaar Item 4",      RHT_KAK_BAZAAR_ITEM_4,          RG_BUY_HEART,          { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x33, 3), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
     locationTable[RC_KAK_BAZAAR_ITEM_5] =           Location::Base(RC_KAK_BAZAAR_ITEM_5,          RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_TEST01,               0x04, 0x3C, "Bazaar Item 5",       "Kak Bazaar Item 5",      RHT_KAK_BAZAAR_ITEM_5,          RG_BUY_ARROWS_10,      { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x33, 4), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
     locationTable[RC_KAK_BAZAAR_ITEM_6] =           Location::Base(RC_KAK_BAZAAR_ITEM_6,          RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_TEST01,               0x05, 0x3D, "Bazaar Item 6",       "Kak Bazaar Item 6",      RHT_KAK_BAZAAR_ITEM_6,          RG_BUY_ARROWS_50,      { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x33, 5), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
@@ -1339,13 +1339,13 @@ void Rando::StaticData::InitLocationTable() {
     locationTable[RC_MARKET_POTION_SHOP_ITEM_2] =   Location::Base(RC_MARKET_POTION_SHOP_ITEM_2,  RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_POTION_SHOP_MARKET,   0x01, 0x31, "Potion Shop Item 2",  "MK Potion Shop Item 2",  RHT_MARKET_POTION_SHOP_ITEM_2,  RG_BUY_BLUE_FIRE,      { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x31, 1), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
     locationTable[RC_MARKET_POTION_SHOP_ITEM_3] =   Location::Base(RC_MARKET_POTION_SHOP_ITEM_3,  RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_POTION_SHOP_MARKET,   0x02, 0x32, "Potion Shop Item 3",  "MK Potion Shop Item 3",  RHT_MARKET_POTION_SHOP_ITEM_3,  RG_BUY_RED_POTION_30,  { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x31, 2), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
     locationTable[RC_MARKET_POTION_SHOP_ITEM_4] =   Location::Base(RC_MARKET_POTION_SHOP_ITEM_4,  RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_POTION_SHOP_MARKET,   0x03, 0x33, "Potion Shop Item 4",  "MK Potion Shop Item 4",  RHT_MARKET_POTION_SHOP_ITEM_4,  RG_BUY_FAIRYS_SPIRIT,  { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x31, 3), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_POTION_SHOP_ITEM_5] =   Location::Base(RC_MARKET_POTION_SHOP_ITEM_5,  RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_POTION_SHOP_MARKET,   0x04, 0x34, "Potion Shop Item 5",  "MK Potion Shop Item 5",  RHT_MARKET_POTION_SHOP_ITEM_5,  RG_BUY_DEKU_NUT_5,     { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x31, 4), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_POTION_SHOP_ITEM_5] =   Location::Base(RC_MARKET_POTION_SHOP_ITEM_5,  RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_POTION_SHOP_MARKET,   0x04, 0x34, "Potion Shop Item 5",  "MK Potion Shop Item 5",  RHT_MARKET_POTION_SHOP_ITEM_5,  RG_BUY_DEKU_NUTS_5,    { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x31, 4), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
     locationTable[RC_MARKET_POTION_SHOP_ITEM_6] =   Location::Base(RC_MARKET_POTION_SHOP_ITEM_6,  RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_POTION_SHOP_MARKET,   0x05, 0x35, "Potion Shop Item 6",  "MK Potion Shop Item 6",  RHT_MARKET_POTION_SHOP_ITEM_6,  RG_BUY_BOTTLE_BUG,     { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x31, 5), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
     locationTable[RC_MARKET_POTION_SHOP_ITEM_7] =   Location::Base(RC_MARKET_POTION_SHOP_ITEM_7,  RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_POTION_SHOP_MARKET,   0x06, 0x36, "Potion Shop Item 7",  "MK Potion Shop Item 7",  RHT_MARKET_POTION_SHOP_ITEM_7,  RG_BUY_POE,            { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x31, 6), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
     locationTable[RC_MARKET_POTION_SHOP_ITEM_8] =   Location::Base(RC_MARKET_POTION_SHOP_ITEM_8,  RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_POTION_SHOP_MARKET,   0x07, 0x37, "Potion Shop Item 8",  "MK Potion Shop Item 8",  RHT_MARKET_POTION_SHOP_ITEM_8,  RG_BUY_FISH,           { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x31, 7), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
     locationTable[RC_MARKET_BAZAAR_ITEM_1] =        Location::Base(RC_MARKET_BAZAAR_ITEM_1,       RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_BAZAAR,               0x00, 0x30, "Bazaar Item 1",       "MK Bazaar Item 1",       RHT_MARKET_BAZAAR_ITEM_1,       RG_BUY_HYLIAN_SHIELD,  { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2C, 0), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
     locationTable[RC_MARKET_BAZAAR_ITEM_2] =        Location::Base(RC_MARKET_BAZAAR_ITEM_2,       RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_BAZAAR,               0x01, 0x31, "Bazaar Item 2",       "MK Bazaar Item 2",       RHT_MARKET_BAZAAR_ITEM_2,       RG_BUY_BOMBS_535,      { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2C, 1), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BAZAAR_ITEM_3] =        Location::Base(RC_MARKET_BAZAAR_ITEM_3,       RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_BAZAAR,               0x02, 0x32, "Bazaar Item 3",       "MK Bazaar Item 3",       RHT_MARKET_BAZAAR_ITEM_3,       RG_BUY_DEKU_NUT_5,     { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2C, 2), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BAZAAR_ITEM_3] =        Location::Base(RC_MARKET_BAZAAR_ITEM_3,       RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_BAZAAR,               0x02, 0x32, "Bazaar Item 3",       "MK Bazaar Item 3",       RHT_MARKET_BAZAAR_ITEM_3,       RG_BUY_DEKU_NUTS_5,    { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2C, 2), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
     locationTable[RC_MARKET_BAZAAR_ITEM_4] =        Location::Base(RC_MARKET_BAZAAR_ITEM_4,       RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_BAZAAR,               0x03, 0x33, "Bazaar Item 4",       "MK Bazaar Item 4",       RHT_MARKET_BAZAAR_ITEM_4,       RG_BUY_HEART,          { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2C, 3), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
     locationTable[RC_MARKET_BAZAAR_ITEM_5] =        Location::Base(RC_MARKET_BAZAAR_ITEM_5,       RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_BAZAAR,               0x04, 0x34, "Bazaar Item 5",       "MK Bazaar Item 5",       RHT_MARKET_BAZAAR_ITEM_5,       RG_BUY_ARROWS_10,      { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2C, 4), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
     locationTable[RC_MARKET_BAZAAR_ITEM_6] =        Location::Base(RC_MARKET_BAZAAR_ITEM_6,       RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_BAZAAR,               0x05, 0x35, "Bazaar Item 6",       "MK Bazaar Item 6",       RHT_MARKET_BAZAAR_ITEM_6,       RG_BUY_ARROWS_50,      { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2C, 5), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
@@ -1357,7 +1357,7 @@ void Rando::StaticData::InitLocationTable() {
     locationTable[RC_ZD_SHOP_ITEM_2] =              Location::Base(RC_ZD_SHOP_ITEM_2,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_ZORAS_DOMAIN,       ACTOR_EN_GIRLA, SCENE_ZORA_SHOP,            0x01, 0x31, "Shop Item 2",         "ZD Shop Item 2",         RHT_ZD_SHOP_ITEM_2,             RG_BUY_ARROWS_10,      { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2F, 1), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
     locationTable[RC_ZD_SHOP_ITEM_3] =              Location::Base(RC_ZD_SHOP_ITEM_3,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_ZORAS_DOMAIN,       ACTOR_EN_GIRLA, SCENE_ZORA_SHOP,            0x02, 0x32, "Shop Item 3",         "ZD Shop Item 3",         RHT_ZD_SHOP_ITEM_3,             RG_BUY_HEART,          { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2F, 2), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
     locationTable[RC_ZD_SHOP_ITEM_4] =              Location::Base(RC_ZD_SHOP_ITEM_4,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_ZORAS_DOMAIN,       ACTOR_EN_GIRLA, SCENE_ZORA_SHOP,            0x03, 0x33, "Shop Item 4",         "ZD Shop Item 4",         RHT_ZD_SHOP_ITEM_4,             RG_BUY_ARROWS_30,      { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2F, 3), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZD_SHOP_ITEM_5] =              Location::Base(RC_ZD_SHOP_ITEM_5,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_ZORAS_DOMAIN,       ACTOR_EN_GIRLA, SCENE_ZORA_SHOP,            0x04, 0x34, "Shop Item 5",         "ZD Shop Item 5",         RHT_ZD_SHOP_ITEM_5,             RG_BUY_DEKU_NUT_5,     { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2F, 4), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZD_SHOP_ITEM_5] =              Location::Base(RC_ZD_SHOP_ITEM_5,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_ZORAS_DOMAIN,       ACTOR_EN_GIRLA, SCENE_ZORA_SHOP,            0x04, 0x34, "Shop Item 5",         "ZD Shop Item 5",         RHT_ZD_SHOP_ITEM_5,             RG_BUY_DEKU_NUTS_5,    { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2F, 4), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
     locationTable[RC_ZD_SHOP_ITEM_6] =              Location::Base(RC_ZD_SHOP_ITEM_6,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_ZORAS_DOMAIN,       ACTOR_EN_GIRLA, SCENE_ZORA_SHOP,            0x05, 0x35, "Shop Item 6",         "ZD Shop Item 6",         RHT_ZD_SHOP_ITEM_6,             RG_BUY_ARROWS_50,      { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2F, 5), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
     locationTable[RC_ZD_SHOP_ITEM_7] =              Location::Base(RC_ZD_SHOP_ITEM_7,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_ZORAS_DOMAIN,       ACTOR_EN_GIRLA, SCENE_ZORA_SHOP,            0x06, 0x36, "Shop Item 7",         "ZD Shop Item 7",         RHT_ZD_SHOP_ITEM_7,             RG_BUY_FISH,           { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2F, 6), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
     locationTable[RC_ZD_SHOP_ITEM_8] =              Location::Base(RC_ZD_SHOP_ITEM_8,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_ZORAS_DOMAIN,       ACTOR_EN_GIRLA, SCENE_ZORA_SHOP,            0x07, 0x37, "Shop Item 8",         "ZD Shop Item 8",         RHT_ZD_SHOP_ITEM_8,             RG_BUY_RED_POTION_50,  { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2F, 7), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index 11e260cbe..8b0c3cca5 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -361,11 +361,11 @@ void Randomizer::LoadHintMessages() {
 
 // Reference soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.h
 std::unordered_map<RandomizerGet, EnGirlAShopItem> randomizerGetToEnGirlShopItem = {
-    { RG_BUY_DEKU_NUT_5,    SI_DEKU_NUTS_5 },
+    { RG_BUY_DEKU_NUTS_5,   SI_DEKU_NUTS_5 },
     { RG_BUY_ARROWS_30,     SI_ARROWS_30 },
     { RG_BUY_ARROWS_50,     SI_ARROWS_50 },
     { RG_BUY_BOMBS_525,     SI_BOMBS_5_R25 },
-    { RG_BUY_DEKU_NUT_10,   SI_DEKU_NUTS_10 },
+    { RG_BUY_DEKU_NUTS_10,  SI_DEKU_NUTS_10 },
     { RG_BUY_DEKU_STICK_1,  SI_DEKU_STICK },
     { RG_BUY_BOMBS_10,      SI_BOMBS_10 },
     { RG_BUY_FISH,          SI_FISH },
@@ -825,8 +825,8 @@ ItemObtainability Randomizer::GetItemObtainabilityFromRandomizerGet(RandomizerGe
         case RG_DEKU_STICK_1:
         case RG_TREASURE_GAME_HEART:
         case RG_TREASURE_GAME_GREEN_RUPEE:
-        case RG_BUY_DEKU_NUT_5:
-        case RG_BUY_DEKU_NUT_10:
+        case RG_BUY_DEKU_NUTS_5:
+        case RG_BUY_DEKU_NUTS_10:
         case RG_BUY_DEKU_STICK_1:
         case RG_BUY_HEART:
         case RG_TRIFORCE_PIECE:
@@ -1118,10 +1118,10 @@ GetItemID Randomizer::GetItemIdFromRandomizerGet(RandomizerGet randoGet, GetItem
             return GI_HEART_CONTAINER;
         
         case RG_DEKU_NUTS_5:
-        case RG_BUY_DEKU_NUT_5:
+        case RG_BUY_DEKU_NUTS_5:
             return GI_NUTS_5;
         case RG_DEKU_NUTS_10:
-        case RG_BUY_DEKU_NUT_10:
+        case RG_BUY_DEKU_NUTS_10:
             return GI_NUTS_10;
         case RG_DEKU_STICK_1:
         case RG_BUY_DEKU_STICK_1:
@@ -1219,11 +1219,11 @@ bool Randomizer::IsItemVanilla(RandomizerGet randoGet) {
         case RG_BLUE_POTION_REFILL:
         case RG_TREASURE_GAME_HEART:
         case RG_TREASURE_GAME_GREEN_RUPEE:
-        case RG_BUY_DEKU_NUT_5:
+        case RG_BUY_DEKU_NUTS_5:
         case RG_BUY_ARROWS_30:
         case RG_BUY_ARROWS_50:
         case RG_BUY_BOMBS_525:
-        case RG_BUY_DEKU_NUT_10:
+        case RG_BUY_DEKU_NUTS_10:
         case RG_BUY_DEKU_STICK_1:
         case RG_BUY_BOMBS_10:
         case RG_BUY_FISH:
diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h
index 26464522c..c91d0633b 100644
--- a/soh/soh/Enhancements/randomizer/randomizerTypes.h
+++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@@ -31,22 +31,57 @@ typedef enum {
 } RandomizerCheckStatus;
 
 typedef enum {
-HINT_TYPE_STATIC,
+    HINT_TYPE_STATIC,
     HINT_TYPE_TRIAL,
     HINT_TYPE_WOTH, // Way of the Hero
     HINT_TYPE_BARREN,
     HINT_TYPE_ENTRANCE,
-    HINT_TYPE_ALWAYS,
-    HINT_TYPE_SOMETIMES,
-    HINT_TYPE_SONG,
-    HINT_TYPE_OVERWORLD,
-    HINT_TYPE_DUNGEON,
-    HINT_TYPE_NAMED_ITEM,
-    HINT_TYPE_RANDOM,
+    HINT_TYPE_ITEM_AREA,
+    HINT_TYPE_ITEM_LOCATION,
     HINT_TYPE_JUNK,
     HINT_TYPE_MAX
 } HintType;
 
+typedef enum {
+    RA_NONE,
+    RA_LINKS_POCKET,
+    RA_KOKIRI_FOREST,
+    RA_THE_LOST_WOODS,
+    RA_SACRED_FOREST_MEADOW,
+    RA_HYRULE_FIELD,
+    RA_LAKE_HYLIA,
+    RA_GERUDO_VALLEY,
+    RA_GERUDO_FORTRESS,
+    RA_HAUNTED_WASTELAND,
+    RA_DESERT_COLOSSUS,
+    RA_THE_MARKET,
+    RA_TEMPLE_OF_TIME,
+    RA_HYRULE_CASTLE,
+    RA_OUTSIDE_GANONS_CASTLE,
+    RA_CASTLE_GROUNDS,
+    RA_KAKARIKO_VILLAGE,
+    RA_THE_GRAVEYARD,
+    RA_DEATH_MOUNTAIN_TRAIL,
+    RA_GORON_CITY,
+    RA_DEATH_MOUNTAIN_CRATER,
+    RA_ZORAS_RIVER,
+    RA_ZORAS_DOMAIN,
+    RA_ZORAS_FOUNTAIN,
+    RA_LON_LON_RANCH,
+    RA_DEKU_TREE,
+    RA_DODONGOS_CAVERN,
+    RA_JABU_JABUS_BELLY,
+    RA_FOREST_TEMPLE,
+    RA_FIRE_TEMPLE,
+    RA_WATER_TEMPLE,
+    RA_SPIRIT_TEMPLE,
+    RA_SHADOW_TEMPLE,
+    RA_BOTTOM_OF_THE_WELL,
+    RA_ICE_CAVERN,
+    RA_GERUDO_TRAINING_GROUND,
+    RA_GANONS_CASTLE,
+    RA_MAX
+} RandomizerArea;
 
 // Check types based on main settings
 typedef enum {
@@ -1782,11 +1817,11 @@ typedef enum {
     RG_BLUE_POTION_REFILL,
     RG_TREASURE_GAME_HEART,
     RG_TREASURE_GAME_GREEN_RUPEE,
-    RG_BUY_DEKU_NUT_5,
+    RG_BUY_DEKU_NUTS_5,
     RG_BUY_ARROWS_30,
     RG_BUY_ARROWS_50,
     RG_BUY_BOMBS_525,
-    RG_BUY_DEKU_NUT_10,
+    RG_BUY_DEKU_NUTS_10,
     RG_BUY_DEKU_STICK_1,
     RG_BUY_BOMBS_10,
     RG_BUY_FISH,
@@ -1883,8 +1918,8 @@ typedef enum {
     RH_KF_STORMS_GROTTO_GOSSIP_STONE,
     RH_KAK_OPEN_GROTTO_GOSSIP_STONE,
     RH_LH_LAB_GOSSIP_STONE,
-    RH_LH_GOSSIP_STONE_SOUTHEAST,
-    RH_LH_GOSSIP_STONE_SOUTHWEST,
+    RH_LH_SOUTHEAST_GOSSIP_STONE,
+    RH_LH_SOUTHWEST_GOSSIP_STONE,
     RH_LW_GOSSIP_STONE,
     RH_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE,
     RH_SFM_MAZE_GOSSIP_STONE_LOWER,
@@ -2969,11 +3004,11 @@ typedef enum {
     RHT_BLUE_POTION_REFILL,
     RHT_TREASURE_GAME_HEART,
     RHT_TREASURE_GAME_GREEN_RUPEE,
-    RHT_BUY_DEKU_NUT_5,
+    RHT_BUY_DEKU_NUTS_5,
     RHT_BUY_ARROWS_30,
     RHT_BUY_ARROWS_50,
     RHT_BUY_BOMBS_525,
-    RHT_BUY_DEKU_NUT_10,
+    RHT_BUY_DEKU_NUTS_10,
     RHT_BUY_DEKU_STICK_1,
     RHT_BUY_BOMBS_10,
     RHT_BUY_FISH,
@@ -3066,9 +3101,9 @@ typedef enum {
     RHT_DESERT_COLOSSUS,
     RHT_THE_MARKET,
     RHT_TEMPLE_OF_TIME,
-    RHT_CASTLE_GROUNDS,
     RHT_HYRULE_CASTLE,
     RHT_OUTSIDE_GANONS_CASTLE,
+    RHT_CASTLE_GROUNDS,
     RHT_KAKARIKO_VILLAGE,
     RHT_THE_GRAVEYARD,
     RHT_DEATH_MOUNTAIN_TRAIL,
@@ -3245,6 +3280,7 @@ typedef enum {
     RHT_MAX
 } RandomizerHintTextKey;
 
+
 typedef struct {
     RandomizerGet rgID;
     RandomizerGet fakeRgID;
diff --git a/soh/soh/SaveManager.cpp b/soh/soh/SaveManager.cpp
index 10e35ae2f..5a10b0a0c 100644
--- a/soh/soh/SaveManager.cpp
+++ b/soh/soh/SaveManager.cpp
@@ -112,7 +112,7 @@ void SaveManager::LoadRandomizerVersion1() {
         });
     }
 
-    for (int i = 0; i < randoContext->hashIconIndexes.size(); i++) {
+    for (uint32_t i = 0; i < randoContext->hashIconIndexes.size(); i++) {
         SaveManager::Instance->LoadData("seed" + std::to_string(i), randoContext->hashIconIndexes[i]);
     }
 
@@ -130,32 +130,32 @@ void SaveManager::LoadRandomizerVersion1() {
         for (int j = 0; j < ARRAY_COUNT(hintText); j++) {
             SaveManager::Instance->LoadData("ht" + std::to_string(i) + "-" + std::to_string(j), hintText[j]);
         }
-        randoContext->AddHint(RandomizerHintKey(check - RC_COLOSSUS_GOSSIP_STONE + 1), Text(hintText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text());
+        randoContext->AddHint(RandomizerHintKey(check - RC_COLOSSUS_GOSSIP_STONE + 1), Text(hintText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static");
     }
 
     char childAltarText[250];
     for (int i = 0; i < ARRAY_COUNT(childAltarText); i++) {
         SaveManager::Instance->LoadData("cat" + std::to_string(i), childAltarText[i]);
     }
-    randoContext->AddHint(RH_ALTAR_CHILD, Text(childAltarText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text());
+    randoContext->AddHint(RH_ALTAR_CHILD, Text(childAltarText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static");
 
     char adultAltarText[750];
     for (int i = 0; i < ARRAY_COUNT(adultAltarText); i++) {
         SaveManager::Instance->LoadData("aat" + std::to_string(i), adultAltarText[i]);
     }
-    randoContext->AddHint(RH_ALTAR_ADULT, Text(adultAltarText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text());
+    randoContext->AddHint(RH_ALTAR_ADULT, Text(adultAltarText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static");
 
     char ganonHintText[150];
     for (int i = 0; i < ARRAY_COUNT(ganonHintText); i++) {
         SaveManager::Instance->LoadData("ght" + std::to_string(i), ganonHintText[i]);
     }
-    randoContext->AddHint(RH_GANONDORF_HINT, Text(ganonHintText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text());
+    randoContext->AddHint(RH_GANONDORF_HINT, Text(ganonHintText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static");
 
     char ganonText[250];
     for (int i = 0; i < ARRAY_COUNT(ganonText); i++) {
         SaveManager::Instance->LoadData("gt" + std::to_string(i), ganonText[i]);
     }
-    randoContext->AddHint(RH_GANONDORF_NOHINT, Text(ganonText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text());
+    randoContext->AddHint(RH_GANONDORF_NOHINT, Text(ganonText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static");
 
     SaveManager::Instance->LoadData("adultTradeItems", gSaveContext.adultTradeItems);
 
@@ -234,53 +234,53 @@ void SaveManager::LoadRandomizerVersion2() {
             if (rc != RC_UNKNOWN_CHECK) {
                 std::string hintText;
                 SaveManager::Instance->LoadData("hintText", hintText);
-                randoContext->AddHint(RandomizerHintKey(rc - RC_COLOSSUS_GOSSIP_STONE + 1), Text(hintText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text());
+                randoContext->AddHint(RandomizerHintKey(rc - RC_COLOSSUS_GOSSIP_STONE + 1), Text(hintText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static");
             }
         });
     });
 
     std::string childAltarText;
     SaveManager::Instance->LoadData("childAltarText", childAltarText);
-    randoContext->AddHint(RH_ALTAR_CHILD, Text(childAltarText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text());
+    randoContext->AddHint(RH_ALTAR_CHILD, Text(childAltarText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static");
     std::string adultAltarText;
     SaveManager::Instance->LoadData("adultAltarText", adultAltarText);
-    randoContext->AddHint(RH_ALTAR_ADULT, Text(adultAltarText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text());
+    randoContext->AddHint(RH_ALTAR_ADULT, Text(adultAltarText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static");
     std::string ganonHintText;
     SaveManager::Instance->LoadData("ganonHintText", ganonHintText);
-    randoContext->AddHint(RH_GANONDORF_HINT, Text(ganonHintText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text());
+    randoContext->AddHint(RH_GANONDORF_HINT, Text(ganonHintText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static");
     std::string ganonText;
     SaveManager::Instance->LoadData("ganonText", ganonText);
-    randoContext->AddHint(RH_GANONDORF_NOHINT, Text(ganonText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text());
+    randoContext->AddHint(RH_GANONDORF_NOHINT, Text(ganonText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static");
     std::string dampeText;
     SaveManager::Instance->LoadData("dampeText", dampeText);
-    randoContext->AddHint(RH_DAMPES_DIARY, Text(dampeText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text());
+    randoContext->AddHint(RH_DAMPES_DIARY, Text(dampeText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static");
     std::string gregHintText;
     SaveManager::Instance->LoadData("gregHintText", gregHintText);
-    randoContext->AddHint(RH_GREG_RUPEE, Text(gregHintText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text());
+    randoContext->AddHint(RH_GREG_RUPEE, Text(gregHintText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static");
     std::string sheikText;
     SaveManager::Instance->LoadData("sheikText", sheikText);
-    randoContext->AddHint(RH_SHEIK_LIGHT_ARROWS, Text(sheikText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text());
+    randoContext->AddHint(RH_SHEIK_LIGHT_ARROWS, Text(sheikText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static");
     std::string sariaText;
     SaveManager::Instance->LoadData("sariaText", sariaText);
-    randoContext->AddHint(RH_SARIA, Text(sariaText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text());
+    randoContext->AddHint(RH_SARIA, Text(sariaText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static");
     std::string warpMinuetText;
     SaveManager::Instance->LoadData("warpMinuetText", warpMinuetText);
-    randoContext->AddHint(RH_MINUET_WARP_LOC, Text(warpMinuetText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text(warpMinuetText));
+    randoContext->AddHint(RH_MINUET_WARP_LOC, Text(warpMinuetText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", randoContext->GetAreaFromString(warpMinuetText));
     std::string warpBoleroText;
     SaveManager::Instance->LoadData("warpBoleroText", warpBoleroText);
-    randoContext->AddHint(RH_BOLERO_WARP_LOC, Text(warpBoleroText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text(warpBoleroText));
+    randoContext->AddHint(RH_BOLERO_WARP_LOC, Text(warpBoleroText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", randoContext->GetAreaFromString(warpBoleroText));
     std::string warpSerenadeText;
     SaveManager::Instance->LoadData("warpSerenadeText", warpSerenadeText);
-    randoContext->AddHint(RH_SERENADE_WARP_LOC, Text(warpSerenadeText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text(warpSerenadeText));
+    randoContext->AddHint(RH_SERENADE_WARP_LOC, Text(warpSerenadeText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", randoContext->GetAreaFromString(warpSerenadeText));
     std::string warpRequiemText;
     SaveManager::Instance->LoadData("warpRequiemText", warpRequiemText);
-    randoContext->AddHint(RH_REQUIEM_WARP_LOC, Text(warpRequiemText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text(warpRequiemText));
+    randoContext->AddHint(RH_REQUIEM_WARP_LOC, Text(warpRequiemText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", randoContext->GetAreaFromString(warpRequiemText));
     std::string warpNocturneText;
     SaveManager::Instance->LoadData("warpNocturneText", warpNocturneText);
-    randoContext->AddHint(RH_NOCTURNE_WARP_LOC, Text(warpNocturneText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text(warpNocturneText));
+    randoContext->AddHint(RH_NOCTURNE_WARP_LOC, Text(warpNocturneText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", randoContext->GetAreaFromString(warpNocturneText));
     std::string warpPreludeText;
     SaveManager::Instance->LoadData("warpPreludeText", warpPreludeText);
-    randoContext->AddHint(RH_PRELUDE_WARP_LOC, Text(warpPreludeText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, Text(warpPreludeText));
+    randoContext->AddHint(RH_PRELUDE_WARP_LOC, Text(warpPreludeText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", randoContext->GetAreaFromString(warpPreludeText));
 
     SaveManager::Instance->LoadData("adultTradeItems", gSaveContext.adultTradeItems);
 
@@ -387,12 +387,9 @@ void SaveManager::LoadRandomizerVersion3() {
             SaveManager::Instance->LoadData("hintedCheck", rc);
             HintType ht = HINT_TYPE_STATIC;
             SaveManager::Instance->LoadData("hintType", ht);
-            std::string englishRegion, frenchRegion;
-            SaveManager::Instance->LoadStruct("hintedRegion", [&]() {
-                SaveManager::Instance->LoadData("english", englishRegion);
-                SaveManager::Instance->LoadData("french", frenchRegion);
-            });
-            randoContext->AddHint(rhk, Text(english, french, english), rc, ht, Text(englishRegion, frenchRegion, englishRegion));
+            RandomizerArea savedArea;
+            SaveManager::Instance->LoadData("hintedArea", savedArea);
+            randoContext->AddHint(rhk, Text(english, french, english), rc, ht, "Unknown", savedArea);//RANDOTODO, maybe store and load distrabution, but it's a string...
         });
     });
 
@@ -479,11 +476,7 @@ void SaveManager::SaveRandomizer(SaveContext* saveContext, int sectionID, bool f
             });
             SaveManager::Instance->SaveData("hintedCheck", hint->GetHintedLocation());
             SaveManager::Instance->SaveData("hintType", hint->GetHintType());
-            SaveManager::Instance->SaveStruct("hintedRegion", [&]() {
-                SaveManager::Instance->SaveData("english", hint->GetHintedRegionText().GetEnglish());
-                SaveManager::Instance->SaveData("french", hint->GetHintedRegionText().GetFrench());
-                SaveManager::Instance->SaveData("german", hint->GetHintedRegionText().GetEnglish());
-            });
+            SaveManager::Instance->SaveData("hintedArea", hint->GetHintedArea());
         });
     });
 

From 65d893bc8598a65662c73b45ba003c90725f8706 Mon Sep 17 00:00:00 2001
From: Christopher Leggett <chris@leggett.dev>
Date: Fri, 8 Dec 2023 13:07:27 -0500
Subject: [PATCH 033/230] Fix a seed gen bug surrounding new area enum (#3497)

* Fix a seed gen bug surrounding new area enum

* Sets areas after shuffling entrances.
---
 soh/soh/Enhancements/randomizer/3drando/fill.cpp        | 2 +-
 soh/soh/Enhancements/randomizer/3drando/playthrough.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/fill.cpp b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
index 26cd3691e..1785dd05b 100644
--- a/soh/soh/Enhancements/randomizer/3drando/fill.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
@@ -1026,6 +1026,7 @@ int Fill() {
       }
       printf("\x1b[7;32HDone");
     }
+    SetAreas();
     //erase temporary shop items
     FilterAndEraseFromPool(ItemPool, [](const auto item) { return Rando::StaticData::RetrieveItem(item).GetItemType() == ITEMTYPE_SHOP; });
 
@@ -1137,7 +1138,6 @@ int Fill() {
     if(ctx->playthroughBeatable && !placementFailure) {
       printf("Done");
       printf("\x1b[9;10HCalculating Playthrough...");
-      SetAreas();
       PareDownPlaythrough();
       CalculateWotH();
       CalculateBarren(); 
diff --git a/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp b/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
index 79e752521..15c5736e6 100644
--- a/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
@@ -30,7 +30,7 @@ int Playthrough_Init(uint32_t seed, std::unordered_map<RandomizerSettingKey, uin
     std::string settingsStr;
     for (const Rando::OptionGroup& optionGroup : ctx->GetSettings()->GetOptionGroups()) {
         // don't go through non-menus
-        if (optionGroup.GetContainsType() != Rando::OptionGroupType::SUBGROUP) {
+        if (optionGroup.GetContainsType() == Rando::OptionGroupType::SUBGROUP) {
             continue;
         }
 

From 4925abdd677e5a656f86fabd4229c90c05060030 Mon Sep 17 00:00:00 2001
From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Date: Sun, 10 Dec 2023 02:55:59 +0000
Subject: [PATCH 034/230] Fill in textId List (#3499)

---
 .../custom-message/CustomMessageTypes.h       | 142 +++++++++++++-----
 .../Enhancements/randomizer/randomizer.cpp    |   4 +-
 soh/soh/OTRGlobals.cpp                        |  16 +-
 3 files changed, 114 insertions(+), 48 deletions(-)

diff --git a/soh/soh/Enhancements/custom-message/CustomMessageTypes.h b/soh/soh/Enhancements/custom-message/CustomMessageTypes.h
index 1f043211e..238f06b1e 100644
--- a/soh/soh/Enhancements/custom-message/CustomMessageTypes.h
+++ b/soh/soh/Enhancements/custom-message/CustomMessageTypes.h
@@ -1,58 +1,126 @@
 #pragma once
 
 typedef enum {
-    TEXT_CURSED_SKULLTULA_PEOPLE = 0x22,
-    TEXT_SARIAS_SONG_FACE_TO_FACE= 0x160,
-    TEXT_SARIAS_SONG_FOREST_SOUNDS = 0x161,
-    TEXT_SARIAS_SONG_FOREST_TEMPLE = 0x16A,
-    TEXT_SARIA_SFM = 0x10AD,
-    TEXT_ITEM_KEY_SMALL = 0x60,
-    TEXT_ITEM_DUNGEON_MAP = 0x66,
-    TEXT_ITEM_COMPASS = 0x67,
-    TEXT_ITEM_KEY_BOSS = 0xC7,
-    TEXT_DAMPES_DIARY = 0x5003,
-    TEXT_CHEST_GAME_PROCEED = 0x704C,
-    TEXT_BUY_BOMBCHU_10_PROMPT = 0x8C,
-    TEXT_BUY_BOMBCHU_10_DESC = 0xBC,
-    TEXT_GS_NO_FREEZE = 0xB4,
-    TEXT_GS_FREEZE = 0xB5,
-    TEXT_RANDOMIZER_CUSTOM_ITEM = 0xF8,
+    TEXT_CURSED_SKULLTULA_PEOPLE = 0x0022,
+    TEXT_ITEM_KEY_SMALL = 0x0060,
+    TEXT_ITEM_DUNGEON_MAP = 0x0066,
+    TEXT_CHEST_GAME_REAL_GAMBLER = 0x006E,
+    TEXT_ITEM_COMPASS = 0x0067,
+    TEXT_CHEST_GAME_THANKS_A_LOT = 0x0084,
+    TEXT_BUY_BOMBCHU_10_PROMPT = 0x008C,
+    TEXT_GS_NO_FREEZE = 0x00B4,
+    TEXT_GS_FREEZE = 0x00B5,
+    TEXT_BUY_BOMBCHU_10_DESC = 0x00BC,
+    TEXT_HEART_PIECE = 0x00C2,
+    TEXT_HEART_CONTAINER = 0x00C6,
+    TEXT_ITEM_KEY_BOSS = 0x00C7,
+    TEXT_BLUE_RUPEE = 0x00CC,
+    TEXT_RED_RUPEE = 0x00F0,
+    TEXT_PURPLE_RUPEE = 0x00F1,
+    TEXT_HUGE_RUPEE = 0x00F2,
+    TEXT_RANDOMIZER_CUSTOM_ITEM = 0x00F8,
+    TEXT_NAVI_DEKU_TREE_SUMMONS = 0x0140,
+    TEXT_NAVI_CMON_BE_BRAVE = 0x0141,
+    TEXT_NAVI_VISIT_THE_PRINCESS = 0x0142,
+    TEXT_NAVI_FIND_MALONS_FATHER = 0x0143,
+    TEXT_NAVI_FIND_THE_PRINCESS = 0x0144,
+    TEXT_NAVI_WHAT_WOULD_SARIA_SAY = 0x0145,
+    TEXT_NAVI_IMPA_SAID_DEATH_MOUNTAIN = 0x0146,
+    TEXT_NAVI_USE_BOMB_FLOWER = 0x0147,
+    TEXT_NAVI_FAIRY_LIVES_ON_DEATH_MOUNTAIN = 0x0148,
+    TEXT_NAVI_SARIA_KNOWS_ABOUT_STONES = 0x0149,
+    TEXT_NAVI_RUTO_INSIDE_JABUS_BELLY = 0x014A,
+    TEXT_NAVI_COLLECTED_THREE_STONES = 0x014B,
+    TEXT_NAVI_THREW_SOMETHING_IN_MOAT = 0x014C,
+    TEXT_NAVI_CHECK_TEMPLE_OF_TIME = 0x014D,
+    TEXT_NAVI_SHOULD_WE_BELIEVE_SHEIK = 0x014E,
+    TEXT_UNUSED_014F = 0x014F,
+    TEXT_NAVI_WHATS_GOING_ON_IN_FOREST = 0x0150,
+    TEXT_NAVI_CLOUD_OVER_DEATH_MOUNTAIN = 0x0151,
+    TEXT_NAVI_ARTIC_WIND_IS_BLOWING = 0x0152,
+    TEXT_NAVI_IRON_BOOTS_WEIGH_A_TON = 0x0153,
+    TEXT_NAVI_LOOK_FOR_SOMONE_WHO_KNOWS = 0x0154,
+    TEXT_NAVI_IT_CAME_OUT_OF_THE_WELL = 0x0155,
+    TEXT_NAVI_WHO_BUILT_THE_SPIRIT_TEMPLE = 0x0156,
+    TEXT_NAVI_HAVE_YOU_EVER_PLAYED_NOCTURNE = 0x0157,
+    TEXT_NAVI_WHERE_GANONDORF_WAS_BORN = 0x0158,
+    TEXT_UNUSED_0159 = 0x0159,
+    TEXT_NAVI_EQUIP_THE_SILVER_GAUNTLETS = 0x015A,
+    TEXT_NAVI_WHO_IS_WAITING_FOR_US = 0x015B,
+    TEXT_NAVI_SAVE_PRINCESS_ZELDA = 0x015C,
+    TEXT_UNUSED_015D = 0x015D,
+    TEXT_UNUSED_015E = 0x015E,
+    TEXT_NAVI_TRY_TO_KEEP_MOVING = 0x015F,
+    TEXT_SARIAS_SONG_FACE_TO_FACE = 0x0160,
+    TEXT_SARIAS_SONG_FOREST_SOUNDS = 0x0161,
+    TEXT_SARIAS_SONG_MR_DARUNIA = 0x0162,
+    TEXT_SARIAS_SONG_SPIRITUAL_WATER = 0x0163,
+    TEXT_SARIAS_SONG_SPIRITUAL_FIRE = 0x0164,
+    TEXT_SARIAS_SONG_DREAD_CASTLE = 0x0165,
+    TEXT_SARIAS_SONG_DIFFERENT_OCARINA = 0x0166,
+    TEXT_SARIAS_SONG_EYES_DARKNESS_STORM = 0x0167,
+    TEXT_SARIAS_SONG_DESERT_GODDESS = 0x0168,
+    TEXT_SARIAS_SONG_TEMPLES = 0x0169,
+    TEXT_SARIAS_SONG_FOREST_TEMPLE = 0x016A,
+    TEXT_SARIAS_SONG_GLAD_NOW = 0x016B,
+    TEXT_SARIAS_SONG_IMPRISON_GANONDORF = 0x016C,
+    TEXT_SARIAS_SONG_CHANNELING_POWER = 0x016D,
+    TEXT_LAKE_HYLIA_WATER_SWITCH_NAVI = 0x01B3, // 0x1yy for Navi msg range
+    TEXT_FROGS_UNDERWATER = 0x022E,
+    TEXT_LAKE_HYLIA_WATER_SWITCH_SIGN = 0x0346, // 0x3yy for cuttable sign range
+    TEXT_WARP_MINUET_OF_FOREST = 0x088D,
+    TEXT_WARP_BOLERO_OF_FIRE = 0x088E,
+    TEXT_WARP_SERENADE_OF_WATER = 0x088F,
+    TEXT_WARP_REQUIEM_OF_SPIRIT = 0x0890,
+    TEXT_WARP_NOCTURNE_OF_SHADOW = 0x0891,
+    TEXT_WARP_PRELUDE_OF_LIGHT = 0x0892,
     TEXT_SCRUB_POH = 0x10A2,
+    TEXT_SARIA_SFM = 0x10AD,
     TEXT_SCRUB_STICK_UPGRADE = 0x10DC,
     TEXT_SCRUB_NUT_UPGRADE = 0x10DD,
     TEXT_RANDOMIZER_GOSSIP_STONE_HINTS = 0x2053,
-    TEXT_ALTAR_CHILD = 0x7040,
-    TEXT_ALTAR_ADULT = 0x7088,
-    TEXT_GANONDORF = 0x70CC,
-    TEXT_GANONDORF_NOHINT = 0x70CD,
-    TEXT_HEART_CONTAINER = 0xC6,
-    TEXT_HEART_PIECE = 0xC2,
-    TEXT_BLUE_RUPEE = 0xCC,
-    TEXT_RED_RUPEE = 0xF0,
-    TEXT_PURPLE_RUPEE = 0xF1,
-    TEXT_HUGE_RUPEE = 0xF2,
-    TEXT_FROGS_UNDERWATER = 0x22E,
-    TEXT_BEAN_SALESMAN = 0x405E,
     TEXT_MEDIGORON = 0x304C,
+    TEXT_FIRE_TEMPLE_GORON_OWE_YOU_BIG_TIME = 0x3052,
+    TEXT_FIRE_TEMPLE_GORON_FALLING_DOORS_SECRET = 0x3069,
+    TEXT_FIRE_TEMPLE_GORON_FIRE_SECRET = 0x306A,
+    TEXT_FIRE_TEMPLE_GORON_FLAME_DANCER_SECRET = 0x306B,
+    TEXT_FIRE_TEMPLE_GORON_SWITCH_SECRET = 0x306C,
+    TEXT_FIRE_TEMPLE_GORON_OCARINA_SECRET = 0x306D,
+    TEXT_FIRE_TEMPLE_GORON_PILLAR_SECRET = 0x306E,
+    TEXT_FIRE_TEMPLE_GORON_HIDDEN_DOOR_SECRET = 0x306F,
+    TEXT_FIRE_TEMPLE_GORON_SOUNDS_DIFFERENT_SECRET = 0x3070,
+    TEXT_BEAN_SALESMAN_BUY_FOR_10 = 0x405E,
+    TEXT_BEAN_SALESMAN_BUY_FOR_20 = 0x405F,
+    TEXT_BEAN_SALESMAN_BUY_FOR_30 = 0x4060,
+    TEXT_BEAN_SALESMAN_BUY_FOR_40 = 0x4061,
+    TEXT_BEAN_SALESMAN_BUY_FOR_50 = 0x4062,
+    TEXT_BEAN_SALESMAN_BUY_FOR_60 = 0x4063,
+    TEXT_BEAN_SALESMAN_BUY_FOR_70 = 0x4064,
+    TEXT_BEAN_SALESMAN_BUY_FOR_80 = 0x4065,
+    TEXT_BEAN_SALESMAN_BUY_FOR_90 = 0x4066,
+    TEXT_BEAN_SALESMAN_BUY_FOR_100 = 0x4067,
+    TEXT_BEAN_SALESMAN_OH_WELL = 0x4068,
+    TEXT_BEAN_SALESMAN_NOT_ENOUGH_MONEY = 0x4069,
+    TEXT_BEAN_SALESMAN_SET_A_BEAN_TO_C = 0x406A,
+    TEXT_BEAN_SALESMAN_SOLD_OUT = 0x406B,
+    TEXT_BEAN_SALESMAN_WANT_TO_PLANT = 0x406C,
+    TEXT_DAMPES_DIARY = 0x5003,
     TEXT_GRANNYS_SHOP = 0x500C,
     TEXT_CARPET_SALESMAN_1 = 0x6077,
     TEXT_CARPET_SALESMAN_2 = 0x6078,
     TEXT_MARKET_GUARD_NIGHT = 0x7003,
     TEXT_SHEIK_NEED_HOOK = 0x700F,
     TEXT_SHEIK_HAVE_HOOK = 0x7010,
+    TEXT_ALTAR_CHILD = 0x7040,
+    TEXT_CHEST_GAME_PROCEED = 0x704C,
+    TEXT_ALTAR_ADULT = 0x7088,
+    TEXT_GANONDORF = 0x70CC,
+    TEXT_GANONDORF_NOHINT = 0x70CD,
     TEXT_SCRUB_RANDOM = 0x9000,
     TEXT_SCRUB_RANDOM_FREE = 0x9001,
     TEXT_SHOP_ITEM_RANDOM = 0x9100,
     TEXT_SHOP_ITEM_RANDOM_CONFIRM = 0x9101,
-    TEXT_WARP_MINUET_OF_FOREST = 0x88D,
-    TEXT_WARP_BOLERO_OF_FIRE = 0x88E,
-    TEXT_WARP_SERENADE_OF_WATER = 0x88F,
-    TEXT_WARP_REQUIEM_OF_SPIRIT = 0x890,
-    TEXT_WARP_NOCTURNE_OF_SHADOW = 0x891,
-    TEXT_WARP_PRELUDE_OF_LIGHT = 0x892,
-    TEXT_WARP_RANDOM_REPLACED_TEXT = 0x9200,
-    TEXT_LAKE_HYLIA_WATER_SWITCH_SIGN = 0x346, // 0x3yy for cuttable sign range
-    TEXT_LAKE_HYLIA_WATER_SWITCH_NAVI = 0x1B3, // 0x1yy for Navi msg range
+    TEXT_WARP_RANDOM_REPLACED_TEXT = 0x9200
 } TextIDs;
 
 #ifdef __cplusplus
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index 8b0c3cca5..079a14e51 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -340,7 +340,7 @@ void Randomizer::LoadHintMessages() {
             "Des grenouilles se trouvant&sous l'eau vous fixent attentivement,&tenant fermement&%g{{item}}%w.", TEXTBOX_TYPE_BLUE)
         );
         CustomMessageManager::Instance->CreateMessage(
-            Randomizer::randoMiscHintsTableID, TEXT_SARIAS_SONG_FOREST_SOUNDS,
+            Randomizer::randoMiscHintsTableID, TEXT_SARIAS_SONG_FACE_TO_FACE,
             CustomMessage("{{message}}", "{{message}}", "{{message}}", TEXTBOX_TYPE_BLUE)
         );
 
@@ -406,7 +406,7 @@ void Randomizer::LoadMerchantMessages() {
             "\x12\x38\x82" "Aufgeben! Ich verkaufe dir einen&%g{{item}}%w&für %r{{price}} Rubine%w!\x07\x10\xA3",
             "\x12\x38\x82" "J'abandonne! Tu veux bien m'acheter&un %g{{item}}%w?&Ça fera %r{{price}} Rubis%w!\x07\x10\xA3"));
     CustomMessageManager::Instance->CreateMessage(
-        Randomizer::merchantMessageTableID, TEXT_BEAN_SALESMAN,
+        Randomizer::merchantMessageTableID, TEXT_BEAN_SALESMAN_BUY_FOR_10,
         CustomMessage("I tried to be a %rmagic bean%w salesman,&but it turns out my marketing skills&weren't worth "
             "beans!^Anyway, want to buy my&%gmysterious item%w for 60 Rupees?\x1B&%gYes&No%w",
             "Möchten Sie einen geheimnisvollen&Gegenstand für 60 Rubine?\x1B&%gJa&Nein%w",
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
index 506df3feb..e4a5d7511 100644
--- a/soh/soh/OTRGlobals.cpp
+++ b/soh/soh/OTRGlobals.cpp
@@ -2172,11 +2172,11 @@ extern "C" int CustomMessage_RetrieveIfExists(PlayState* play) {
                    textId == TEXT_HUGE_RUPEE)) {
             messageEntry = Randomizer::GetRupeeMessage(textId);
             // In rando, replace Navi's general overworld hints with rando-related gameplay tips
-        } else if (CVarGetInteger("gRandoRelevantNavi", 1) && textId >= 0x0140 && textId <= 0x015F) {
+        } else if (CVarGetInteger("gRandoRelevantNavi", 1) && textId >= TEXT_NAVI_DEKU_TREE_SUMMONS && textId <= TEXT_NAVI_TRY_TO_KEEP_MOVING) {
             u16 naviTextId = Random(0, NUM_NAVI_MESSAGES);
             messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::NaviRandoMessageTableID, naviTextId);
-        } else if (Randomizer_GetSettingValue(RSK_SHUFFLE_MAGIC_BEANS) && textId == TEXT_BEAN_SALESMAN) {
-            messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::merchantMessageTableID, TEXT_BEAN_SALESMAN);
+        } else if (Randomizer_GetSettingValue(RSK_SHUFFLE_MAGIC_BEANS) && textId == TEXT_BEAN_SALESMAN_BUY_FOR_10) {
+            messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::merchantMessageTableID, TEXT_BEAN_SALESMAN_BUY_FOR_10);
         } else if (Randomizer_GetSettingValue(RSK_SHUFFLE_MERCHANTS) != RO_SHUFFLE_MERCHANTS_OFF && (textId == TEXT_MEDIGORON ||
           (textId == TEXT_GRANNYS_SHOP && !Flags_GetRandomizerInf(RAND_INF_MERCHANTS_GRANNYS_SHOP) &&
                     (Randomizer_GetSettingValue(RSK_SHUFFLE_ADULT_TRADE) || INV_CONTENT(ITEM_CLAIM_CHECK) == ITEM_CLAIM_CHECK)) ||
@@ -2204,7 +2204,7 @@ extern "C" int CustomMessage_RetrieveIfExists(PlayState* play) {
             messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::randoMiscHintsTableID, TEXT_DAMPES_DIARY);
         } else if (play->sceneNum == SCENE_TREASURE_BOX_SHOP &&
                    Randomizer_GetSettingValue(RSK_GREG_HINT) &&
-                   (textId == 0x704C || textId == 0x6E || textId == 0x84)) {
+                   (textId == TEXT_CHEST_GAME_PROCEED || textId == TEXT_CHEST_GAME_REAL_GAMBLER || textId == TEXT_CHEST_GAME_THANKS_A_LOT)) {
             messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::randoMiscHintsTableID, TEXT_CHEST_GAME_PROCEED);
         } else if (Randomizer_GetSettingValue(RSK_SHUFFLE_WARP_SONGS) &&
                    (textId >= TEXT_WARP_MINUET_OF_FOREST && textId <= TEXT_WARP_PRELUDE_OF_LIGHT)) {
@@ -2216,11 +2216,9 @@ extern "C" int CustomMessage_RetrieveIfExists(PlayState* play) {
             messageEntry = OTRGlobals::Instance->gRandomizer->GetGoronMessage(choice);
         } else if (Randomizer_GetSettingValue(RSK_FROGS_HINT) && textId == TEXT_FROGS_UNDERWATER) {
             messageEntry = OTRGlobals::Instance->gRandomizer->GetFrogsMessage(textId);
-        } else if (Randomizer_GetSettingValue(RSK_SARIA_HINT)) {
-            if ((gPlayState->sceneNum == SCENE_SACRED_FOREST_MEADOW && textId == TEXT_SARIA_SFM) || textId == TEXT_SARIAS_SONG_FOREST_SOUNDS ||
-                textId == TEXT_SARIAS_SONG_FOREST_TEMPLE) {
-                messageEntry = OTRGlobals::Instance->gRandomizer->GetSariaMessage(textId);
-            }
+        } else if (Randomizer_GetSettingValue(RSK_SARIA_HINT) &&
+        (gPlayState->sceneNum == SCENE_SACRED_FOREST_MEADOW && textId == TEXT_SARIA_SFM) || (textId >= TEXT_SARIAS_SONG_FACE_TO_FACE && textId <= TEXT_SARIAS_SONG_CHANNELING_POWER)) {
+            messageEntry = OTRGlobals::Instance->gRandomizer->GetSariaMessage(textId);
         }
     }
     if (textId == TEXT_GS_NO_FREEZE || textId == TEXT_GS_FREEZE) {

From dad4ae00957e4960556f7f0cce94a3354105708b Mon Sep 17 00:00:00 2001
From: Christopher Leggett <chris@leggett.dev>
Date: Sun, 10 Dec 2023 11:20:47 -0500
Subject: [PATCH 035/230] Rando settings streamline and auto render (#3391)

* Removes cvarSettings map.

Options now link with CVar names directly. So instead of passing the
cvarSettings map, the Option class can check a corresponding CVar
if a cvarName was provided during construction. Of note, it does not
automatically sync the Option selected index with the CVar value, as
we would not want this to happen in all cases, for example when dragging
a spoiler file, we don't want to overwrite all the CVars with the Options
from the spoiler file. Currently all Options are set to the value of the CVar
they are linked to right before generating a new seed, unless a spoiler file
has been dropped in which case those settings are used instead.

* Early version of ImGui Render function

Currently only the slider variant. Will allow for auto rendering of options
in ImGui, with tooltips and automatic display of the values in each Option's
options array while keeping the CVars at the selected index, preventing
Off By One Errors.

* Implementation of Checkbox and Combobox rendering.

Currently only in use for a couple of items, future commit will implement for all
options.

* Auto-render entire first tab of Randomizer Settings

* Switch remaining tabs to auto-render

* Implements disabling options

* Cleanup/Documentation

* Auto-render entire table columns

* Implement OptionGroup rendering for "Sections"

* Automates the rendering of tables in the Settings window.

With the exception of the Locations and Tricks tabs, those are special
and will need a lot more work.

* Adds ability for option groups to have descriptions,

These descriptions will automatically display as tooltips in ImGui,
if the widget container type accounts for it.

* Fix as many IDE warnings as possible in option.h/cpp

Trying out CLion Nova, and it highlighted some things I decided to fix, some from CLion itself and some from CLang-Tidy. Oddly, it didn't like a conversion from size_t to int whether I left it implicit or added a static_cast, so I guess that warning is staying.

* Fixes some simple bugs

* fix another small oopsie

* Fixes parsing some of the option changes

Specifically we went from storing the actual value in the CVar to storing an index, meaning sliders that started with 1 now have the index offset by 1. This is currently only Big Poe Count, Triforce Hunt total/required, and starting hearts. Everything else either already started at 0, or in the case of LACS/Bridge counts, we were starting the sliders at 1 but they would have always worked at 0 according to the 3drando logic.

* Fix bug with status of skip child stealth

* Renames the Settings::Setting function to GetOption

* Add `Settings` pointer as a member of `RandomizerSettingsWindow`.

* Replaces ctx->GetOption with direct access to mOptions

This is equivalent, the access through ctx in this case was completely unnecessary and a muscle-memory mistake on my part.

* Implements a few IDE/Linter suggestions
---
 .../Enhancements/randomizer/3drando/menu.cpp  |    6 +-
 .../Enhancements/randomizer/3drando/menu.hpp  |    2 +-
 .../randomizer/3drando/playthrough.cpp        |   10 +-
 .../randomizer/3drando/playthrough.hpp        |    4 +-
 .../randomizer/3drando/rando_main.cpp         |    4 +-
 .../randomizer/3drando/rando_main.hpp         |    4 +-
 .../randomizer/3drando/spoiler_log.cpp        |   18 +-
 .../randomizer/3drando/spoiler_log.hpp        |    2 +-
 soh/soh/Enhancements/randomizer/context.cpp   |    7 +-
 .../Enhancements/randomizer/item_location.cpp |    4 +-
 .../Enhancements/randomizer/item_location.h   |    2 +-
 soh/soh/Enhancements/randomizer/option.cpp    |  323 ++-
 soh/soh/Enhancements/randomizer/option.h      |  402 +++-
 .../randomizer/option_descriptions.cpp        |  523 +++++
 .../Enhancements/randomizer/randomizer.cpp    | 1792 +----------------
 .../Enhancements/randomizer/randomizerTypes.h |   20 +
 .../randomizer/randomizer_settings_window.h   |   12 +-
 soh/soh/Enhancements/randomizer/settings.cpp  | 1012 ++++++++--
 soh/soh/Enhancements/randomizer/settings.h    |  147 +-
 19 files changed, 2277 insertions(+), 2017 deletions(-)
 create mode 100644 soh/soh/Enhancements/randomizer/option_descriptions.cpp

diff --git a/soh/soh/Enhancements/randomizer/3drando/menu.cpp b/soh/soh/Enhancements/randomizer/3drando/menu.cpp
index 9356ceeda..e01098c7d 100644
--- a/soh/soh/Enhancements/randomizer/3drando/menu.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/menu.cpp
@@ -21,7 +21,7 @@ std::vector<std::string> presetEntries;
 Rando::Option* currentSetting;
 } // namespace
 
-std::string GenerateRandomizer(std::unordered_map<RandomizerSettingKey, uint8_t> cvarSettings, std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks,
+std::string GenerateRandomizer(std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks,
     std::string seedString) {
     auto ctx = Rando::Context::GetInstance();
 
@@ -38,7 +38,7 @@ std::string GenerateRandomizer(std::unordered_map<RandomizerSettingKey, uint8_t>
         } catch (std::out_of_range &e) {
             count = 1;
         }
-        Playthrough::Playthrough_Repeat(cvarSettings, excludedLocations, enabledTricks, count);
+        Playthrough::Playthrough_Repeat(excludedLocations, enabledTricks, count);
         return "";
     }
 
@@ -46,7 +46,7 @@ std::string GenerateRandomizer(std::unordered_map<RandomizerSettingKey, uint8_t>
     uint32_t seedHash = boost::hash_32<std::string>{}(ctx->GetSettings()->GetSeedString());
     ctx->GetSettings()->SetSeed(seedHash & 0xFFFFFFFF);
 
-    int ret = Playthrough::Playthrough_Init(ctx->GetSettings()->GetSeed(), cvarSettings, excludedLocations, enabledTricks);
+    int ret = Playthrough::Playthrough_Init(ctx->GetSettings()->GetSeed(), excludedLocations, enabledTricks);
     if (ret < 0) {
         if (ret == -1) { // Failed to generate after 5 tries
             printf("\n\nFailed to generate after 5 tries.\nPress B to go back to the menu.\nA different seed might be "
diff --git a/soh/soh/Enhancements/randomizer/3drando/menu.hpp b/soh/soh/Enhancements/randomizer/3drando/menu.hpp
index 8079ab2e9..77228e835 100644
--- a/soh/soh/Enhancements/randomizer/3drando/menu.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/menu.hpp
@@ -25,4 +25,4 @@
 // #define CYAN    "\x1b[36m"
 // #define WHITE   "\x1b[37m"
 
-std::string GenerateRandomizer(std::unordered_map<RandomizerSettingKey, uint8_t> cvarSetting, std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks, std::string seedInput);
\ No newline at end of file
+std::string GenerateRandomizer(std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks, std::string seedInput);
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp b/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
index 15c5736e6..68200f470 100644
--- a/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
@@ -13,7 +13,7 @@
 
 namespace Playthrough {
 
-int Playthrough_Init(uint32_t seed, std::unordered_map<RandomizerSettingKey, uint8_t> cvarSettings, std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks) {
+int Playthrough_Init(uint32_t seed, std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks) {
     // initialize the RNG with just the seed incase any settings need to be
     // resolved to something random
     Random_Init(seed);
@@ -25,7 +25,7 @@ int Playthrough_Init(uint32_t seed, std::unordered_map<RandomizerSettingKey, uin
     ctx->HintReset();
     Areas::AccessReset();
 
-    ctx->GetSettings()->UpdateSettings(cvarSettings, excludedLocations, enabledTricks);
+    ctx->GetSettings()->FinalizeSettings(excludedLocations, enabledTricks);
     // once the settings have been finalized turn them into a string for hashing
     std::string settingsStr;
     for (const Rando::OptionGroup& optionGroup : ctx->GetSettings()->GetOptionGroups()) {
@@ -63,7 +63,7 @@ int Playthrough_Init(uint32_t seed, std::unordered_map<RandomizerSettingKey, uin
         //TODO: Handle different types of file output (i.e. Spoiler Log, Plando Template, Patch Files, Race Files, etc.)
         // write logs
         printf("\x1b[11;10HWriting Spoiler Log...");
-        if (SpoilerLog_Write(cvarSettings[RSK_LANGUAGE])) {
+        if (SpoilerLog_Write()) {
             printf("Done");
         } else {
             printf("Failed");
@@ -85,7 +85,7 @@ int Playthrough_Init(uint32_t seed, std::unordered_map<RandomizerSettingKey, uin
 }
 
 // used for generating a lot of seeds at once
-int Playthrough_Repeat(std::unordered_map<RandomizerSettingKey, uint8_t> cvarSettings, std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks, int count /*= 1*/) {
+int Playthrough_Repeat(std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks, int count /*= 1*/) {
     printf("\x1b[0;0HGENERATING %d SEEDS", count);
     auto ctx = Rando::Context::GetInstance();
     uint32_t repeatedSeed = 0;
@@ -95,7 +95,7 @@ int Playthrough_Repeat(std::unordered_map<RandomizerSettingKey, uint8_t> cvarSet
         ctx->GetSettings()->SetSeed(repeatedSeed % 0xFFFFFFFF);
         //CitraPrint("testing seed: " + std::to_string(Settings::seed));
         ClearProgress();
-        Playthrough_Init(ctx->GetSettings()->GetSeed(), cvarSettings, excludedLocations, enabledTricks);
+        Playthrough_Init(ctx->GetSettings()->GetSeed(), excludedLocations, enabledTricks);
         printf("\x1b[15;15HSeeds Generated: %d\n", i + 1);
     }
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/playthrough.hpp b/soh/soh/Enhancements/randomizer/3drando/playthrough.hpp
index 9b59b8f5e..1dbbc7842 100644
--- a/soh/soh/Enhancements/randomizer/3drando/playthrough.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/playthrough.hpp
@@ -4,6 +4,6 @@
 #include "../context.h"
 
 namespace Playthrough {
-    int Playthrough_Init(uint32_t seed, std::unordered_map<RandomizerSettingKey, uint8_t> cvarSettings, std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks);
-    int Playthrough_Repeat(std::unordered_map<RandomizerSettingKey, uint8_t> cvarSettings, std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks, int count = 1);
+    int Playthrough_Init(uint32_t seed, std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks);
+    int Playthrough_Repeat(std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks, int count = 1);
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/rando_main.cpp b/soh/soh/Enhancements/randomizer/3drando/rando_main.cpp
index 2c2ea3158..833a6fc42 100644
--- a/soh/soh/Enhancements/randomizer/3drando/rando_main.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/rando_main.cpp
@@ -10,14 +10,14 @@
 #include <Context.h>
 #include <libultraship/libultra/types.h>
 
-void RandoMain::GenerateRando(std::unordered_map<RandomizerSettingKey, u8> cvarSettings, std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks,
+void RandoMain::GenerateRando(std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks,
     std::string seedString) {
     HintTable_Init();
 
     // std::string settingsFileName = "./randomizer/latest_settings.json";
     // CVarSetString("gLoadedPreset", settingsFileName.c_str());
 
-    std::string fileName = LUS::Context::GetPathRelativeToAppDirectory(GenerateRandomizer(cvarSettings, excludedLocations, enabledTricks, seedString).c_str());
+    std::string fileName = LUS::Context::GetPathRelativeToAppDirectory(GenerateRandomizer(excludedLocations, enabledTricks, seedString).c_str());
 
     CVarSave();
     CVarLoad();
diff --git a/soh/soh/Enhancements/randomizer/3drando/rando_main.hpp b/soh/soh/Enhancements/randomizer/3drando/rando_main.hpp
index 54ebdf6f8..8ac22069b 100644
--- a/soh/soh/Enhancements/randomizer/3drando/rando_main.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/rando_main.hpp
@@ -1,5 +1,7 @@
 #pragma once
 #include "soh/Enhancements/randomizer/item.h"
+
+#include <set>
 namespace RandoMain {
-void GenerateRando(std::unordered_map<RandomizerSettingKey, uint8_t> cvarSettings, std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks, std::string seedInput);
+void GenerateRando(std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks, std::string seedInput);
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
index 6561951a0..6c9f83ab1 100644
--- a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
@@ -598,7 +598,7 @@ Rando::ItemLocation* GetItemLocation(RandomizerGet item) {
 }
 
 // Writes the hints to the spoiler log, if they are enabled.
-static void WriteHints(int language) {
+static void WriteHints() {
     auto ctx = Rando::Context::GetInstance();
     std::string unformattedGanonText;
     std::string unformattedGanonHintText;
@@ -607,7 +607,7 @@ static void WriteHints(int language) {
     std::string unformattedSheikText;
     std::string unformattedSariaText;
 
-    switch (language) {
+    switch (ctx->GetOption(RSK_LANGUAGE).GetSelectedOptionIndex()) {
         case 0:
         default:
             unformattedGanonText = GetGanonText().GetEnglish();
@@ -721,7 +721,7 @@ static void WriteHints(int language) {
         Rando::Hint* hint = ctx->GetHint((RandomizerHintKey)(key - RC_COLOSSUS_GOSSIP_STONE + 1));
         Rando::ItemLocation* hintedLocation = ctx->GetItemLocation(hint->GetHintedLocation());
         std::string hintTextString;
-        switch (language) {
+        switch (ctx->GetOption(RSK_LANGUAGE).GetSelectedOptionIndex()) {
             case 0:
             default:
                 hintTextString = hint->GetText().GetEnglish();
@@ -748,13 +748,13 @@ static void WriteHints(int language) {
     }
 }
 
-static void WriteAllLocations(int language) {
+static void WriteAllLocations() {
     auto ctx = Rando::Context::GetInstance();
     for (const RandomizerCheck key : ctx->allLocations) {
         Rando::ItemLocation* location = ctx->GetItemLocation(key);
         std::string placedItemName;
 
-        switch (language) {
+        switch (ctx->GetOption(RSK_LANGUAGE).GetSelectedOptionIndex()) {
           case 0:
           default:
             placedItemName = location->GetPlacedItemName().english;
@@ -785,7 +785,7 @@ static void WriteAllLocations(int language) {
         }
 
         if (location->GetPlacedRandomizerGet() == RG_ICE_TRAP) {
-          switch (language) {
+          switch (ctx->GetOption(RSK_LANGUAGE).GetSelectedOptionIndex()) {
               case 0:
               default:
                   jsonData["locations"][Rando::StaticData::GetLocation(location->GetRandomizerCheck())->GetName()]["model"] =
@@ -804,7 +804,7 @@ static void WriteAllLocations(int language) {
     }
 }
 
-const char* SpoilerLog_Write(int language) {
+const char* SpoilerLog_Write() {
     auto ctx = Rando::Context::GetInstance();
     auto spoilerLog = tinyxml2::XMLDocument(false);
     spoilerLog.InsertEndChild(spoilerLog.NewDeclaration());
@@ -839,9 +839,9 @@ const char* SpoilerLog_Write(int language) {
     ctx->playthroughLocations.clear();
     ctx->playthroughBeatable = false;
 
-    WriteHints(language);
+    WriteHints();
     WriteShuffledEntrances();
-    WriteAllLocations(language);
+    WriteAllLocations();
 
     if (!std::filesystem::exists(LUS::Context::GetPathRelativeToAppDirectory("Randomizer"))) {
         std::filesystem::create_directory(LUS::Context::GetPathRelativeToAppDirectory("Randomizer"));
diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.hpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.hpp
index 622c15814..8ad3212f8 100644
--- a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.hpp
@@ -111,5 +111,5 @@ const RandomizerHash& GetRandomizerHash();
 
 void WriteIngameSpoilerLog();
 
-const char* SpoilerLog_Write(int language);
+const char* SpoilerLog_Write();
 const SpoilerData& GetSpoilerData();
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/context.cpp b/soh/soh/Enhancements/randomizer/context.cpp
index b9420ace4..945f62a57 100644
--- a/soh/soh/Enhancements/randomizer/context.cpp
+++ b/soh/soh/Enhancements/randomizer/context.cpp
@@ -14,6 +14,7 @@
 
 namespace Rando {
 std::weak_ptr<Context> Context::mContext;
+
 Context::Context() {
     for (auto& location : StaticData::GetLocationTable()) {
         mSpoilerfileCheckNameToEnum[location.GetName()] = location.GetRandomizerCheck();
@@ -135,7 +136,7 @@ void Context::PlaceItemInLocation(const RandomizerCheck locKey, const Randomizer
     SPDLOG_DEBUG(StaticData::GetLocation(locKey)->GetName());
     SPDLOG_DEBUG("\n\n");
 
-    if (applyEffectImmediately || mSettings->Setting(RSK_LOGIC_RULES).Is(RO_LOGIC_GLITCHLESS) || mSettings->Setting(RSK_LOGIC_RULES).Is(RO_LOGIC_VANILLA)) {
+    if (applyEffectImmediately || mSettings->GetOption(RSK_LOGIC_RULES).Is(RO_LOGIC_GLITCHLESS) || mSettings->GetOption(RSK_LOGIC_RULES).Is(RO_LOGIC_VANILLA)) {
         StaticData::RetrieveItem(item).ApplyEffect();
     }
 
@@ -175,7 +176,7 @@ void Context::AddLocations(const Container& locations, std::vector<RandomizerChe
 void Context::GenerateLocationPool() {
     allLocations.clear();
     AddLocation(RC_LINKS_POCKET);
-    if (mSettings->Setting(RSK_TRIFORCE_HUNT)) {
+    if (mSettings->GetOption(RSK_TRIFORCE_HUNT)) {
         AddLocation(RC_TRIFORCE_COMPLETED);
     }
     AddLocations(StaticData::overworldLocations);
@@ -584,7 +585,7 @@ Sprite* Context::GetSeedTexture(const uint8_t index) {
 }
 
 Option& Context::GetOption(const RandomizerSettingKey key) const {
-    return mSettings->Setting(key);
+    return mSettings->GetOption(key);
 }
 
 Option& Context::GetTrickOption(const RandomizerTrick key) const {
diff --git a/soh/soh/Enhancements/randomizer/item_location.cpp b/soh/soh/Enhancements/randomizer/item_location.cpp
index 468a01ec1..323c6159b 100644
--- a/soh/soh/Enhancements/randomizer/item_location.cpp
+++ b/soh/soh/Enhancements/randomizer/item_location.cpp
@@ -140,13 +140,13 @@ Option* ItemLocation::GetExcludedOption() {
 
 void ItemLocation::AddExcludeOption() {
     if (const std::string name = StaticData::GetLocation(rc)->GetName(); name.length() < 23) {
-        excludedOption = Option::Bool(name, {"Include", "Exclude"});
+        excludedOption = Option::Bool(name, {"Include", "Exclude"}, OptionCategory::Setting, "", "", WidgetType::Checkbox, RO_LOCATION_INCLUDE);
     } else {
         const size_t lastSpace = name.rfind(' ', 23);
         std::string settingText = name;
         settingText.replace(lastSpace, 1, "\n ");
 
-        excludedOption = Option::Bool(settingText, {"Include", "Exclude"});
+        excludedOption = Option::Bool(settingText, {"Include", "Exclude"}, OptionCategory::Setting, "", "", WidgetType::Checkbox, RO_LOCATION_INCLUDE);
     }
     // RANDOTODO: this without string compares and loops
     bool alreadyAdded = false;
diff --git a/soh/soh/Enhancements/randomizer/item_location.h b/soh/soh/Enhancements/randomizer/item_location.h
index 79ceaec01..a4b60a5d3 100644
--- a/soh/soh/Enhancements/randomizer/item_location.h
+++ b/soh/soh/Enhancements/randomizer/item_location.h
@@ -58,7 +58,7 @@ class ItemLocation {
     bool addedToPool = false;
     RandomizerGet placedItem = RG_NONE;
     RandomizerGet delayedItem = RG_NONE;
-    Option excludedOption = Option::Bool(StaticData::GetLocation(rc)->GetName(), {"Include", "Exclude"});
+    Option excludedOption = Option::Bool(StaticData::GetLocation(rc)->GetName(), {"Include", "Exclude"}, OptionCategory::Setting, "", "", WidgetType::Checkbox, RO_LOCATION_INCLUDE);
     uint16_t price = 0;
     RandomizerRegion parentRegion = RR_NONE;
     RandomizerArea area = RA_NONE;
diff --git a/soh/soh/Enhancements/randomizer/option.cpp b/soh/soh/Enhancements/randomizer/option.cpp
index a692ef712..a7b4340c9 100644
--- a/soh/soh/Enhancements/randomizer/option.cpp
+++ b/soh/soh/Enhancements/randomizer/option.cpp
@@ -1,18 +1,33 @@
 #include "option.h"
+#include "libultraship/bridge.h"
+#include <Context.h>
+#include <ImGui/imgui.h>
+#include "soh/UIWidgets.hpp"
 
 namespace Rando {
 Option Option::Bool(std::string name_, std::vector<std::string> options_, const OptionCategory category_,
-                    const uint8_t defaultOption_, const bool defaultHidden_) {
-    return {false, std::move(name_), std::move(options_), category_, defaultOption_, defaultHidden_};
+                    std::string cvarName_, std::string description_, WidgetType widgetType_, const uint8_t defaultOption_,
+                    const bool defaultHidden_, int imFlags_) {
+    return {false, std::move(name_), std::move(options_), category_, std::move(cvarName_), std::move(description_),
+                  widgetType_, defaultOption_, defaultHidden_, imFlags_};
+}
+
+Option Option::Bool(std::string name_, std::string cvarName_, std::string description_, const int imFlags_,
+    const WidgetType widgetType_, const bool defaultOption_) {
+    return Option(false, std::move(name_), {"Off", "On"}, OptionCategory::Setting, std::move(cvarName_),
+                  std::move(description_), widgetType_, defaultOption_, false, imFlags_);
 }
 
 Option Option::U8(std::string name_, std::vector<std::string> options_, const OptionCategory category_,
-                  const uint8_t defaultOption_, const bool defaultHidden_) {
-    return {static_cast<uint8_t>(0), std::move(name_), std::move(options_), category_, defaultOption_, defaultHidden_};
+                  std::string cvarName_, std::string description_, WidgetType widgetType_, const uint8_t defaultOption_,
+                  const bool defaultHidden_, int imFlags_) {
+    return {static_cast<uint8_t>(0), std::move(name_), std::move(options_), category_, std::move(cvarName_),
+                  std::move(description_), widgetType_, defaultOption_, defaultHidden_, imFlags_};
 }
 
 Option Option::LogicTrick(std::string name_) {
-    return Option(false, std::move(name_), { "Disabled", "Enabled" }, OptionCategory::Setting, 0, false);
+    return Option(false, std::move(name_), { "Disabled", "Enabled" }, OptionCategory::Setting, "",
+                  "", WidgetType::Checkbox, 0, false, IMFLAG_NONE);
 }
 
 Option::operator bool() const {
@@ -38,6 +53,10 @@ const std::string& Option::GetSelectedOptionText() const {
     return options[selectedOption];
 }
 
+const std::string& Option::GetCVarName() const {
+    return cvarName;
+}
+
 void Option::SetVariable() {
     if (std::holds_alternative<bool>(var)) {
         var.emplace<bool>(selectedOption != 0);
@@ -46,6 +65,18 @@ void Option::SetVariable() {
     }
 }
 
+void Option::SetCVar() const {
+    if (!cvarName.empty()) {
+        CVarSetInteger(cvarName.c_str(), GetSelectedOptionIndex());
+    }
+}
+
+void Option::SetFromCVar() {
+    if (!cvarName.empty()) {
+        SetSelectedIndex(CVarGetInteger(cvarName.c_str(), defaultOption));
+    }
+}
+
 void Option::SetDelayedOption() {
     delayedOption = selectedOption;
 }
@@ -75,45 +106,221 @@ bool Option::IsHidden() const {
     return hidden;
 }
 
+void Option::ChangeOptions(std::vector<std::string> opts) {
+    if (selectedOption >= opts.size()) {
+        selectedOption = opts.size() - 1;
+    }
+    options = std::move(opts);
+}
+
+void Option::Enable() {
+    disabled = false;
+}
+
+void Option::Disable(std::string text, const UIWidgets::CheckboxGraphics graphic) {
+    if (!disabled || disabledText != text || disabledGraphic != graphic) {
+        disabled = true;
+        disabledText = std::move(text);
+        disabledGraphic = graphic;
+    }
+}
+
 bool Option::IsCategory(const OptionCategory category) const {
     return category == this->category;
 }
 
-Option::Option(uint8_t var_, std::string name_, std::vector<std::string> options_, const OptionCategory category_,
-               const uint8_t defaultOption_, const bool defaultHidden_)
+bool Option::RenderImGui() const {
+    bool changed = false;
+    ImGui::BeginGroup();
+    switch (widgetType) {
+        case WidgetType::Checkbox:
+            changed = RenderCheckbox();
+            break;
+        case WidgetType::Combobox:
+            changed = RenderCombobox();
+            break;
+        case WidgetType::Slider:
+            changed = RenderSlider();
+            break;
+    }
+    UIWidgets::Spacer(0);
+    ImGui::EndGroup();
+    return changed;
+}
+
+bool Option::HasFlag(const int imFlag_) const {
+    return imFlag_ & imFlags;
+}
+
+void Option::AddFlag(const int imFlag_) {
+    imFlags |= imFlag_;
+}
+
+void Option::SetFlag(const int imFlag_) {
+    imFlags = imFlag_;
+}
+
+void Option::RemoveFlag(const int imFlag_) {
+    imFlags &= ~imFlag_;
+}
+
+Option::Option(uint8_t var_, std::string name_, std::vector<std::string> options_, OptionCategory category_,
+               std::string cvarName_, std::string description_, WidgetType widgetType_, uint8_t defaultOption_,
+               bool defaultHidden_, int imFlags_)
     : var(var_), name(std::move(name_)), options(std::move(options_)), category(category_),
-      defaultOption(defaultOption_), defaultHidden(defaultHidden_) {
+      cvarName(std::move(cvarName_)), description(std::move(description_)), widgetType(widgetType_),
+      defaultOption(defaultOption_), defaultHidden(defaultHidden_), imFlags(imFlags_) {
     selectedOption = defaultOption;
     hidden = defaultHidden;
     SetVariable();
 }
 Option::Option(bool var_, std::string name_, std::vector<std::string> options_, const OptionCategory category_,
-               const uint8_t defaultOption_, const bool defaultHidden_)
+               std::string cvarName_, std::string description_, WidgetType widgetType_, const uint8_t defaultOption_,
+               const bool defaultHidden_, int imFlags_)
     : var(var_), name(std::move(name_)), options(std::move(options_)), category(category_),
-      defaultOption(defaultOption_), defaultHidden(defaultHidden_) {
+      cvarName(std::move(cvarName_)), description(std::move(description_)), widgetType(widgetType_),
+      defaultOption(defaultOption_), defaultHidden(defaultHidden_), imFlags(imFlags_) {
     selectedOption = defaultOption;
     hidden = defaultHidden;
     SetVariable();
 }
 
+bool Option::RenderCheckbox() const {
+    bool changed = false;
+    if (disabled) {
+        UIWidgets::DisableComponent(ImGui::GetStyle().Alpha * 0.5f);
+    }
+    bool val = static_cast<bool>(CVarGetInteger(cvarName.c_str(), defaultOption));
+    if (CustomCheckbox(name.c_str(), &val, disabled, disabledGraphic)) {
+        CVarSetInteger(cvarName.c_str(), val);
+        changed = true;
+        LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
+    }
+    if (!description.empty()) {
+        UIWidgets::InsertHelpHoverText(description.c_str());
+    }
+    if (disabled) {
+        UIWidgets::ReEnableComponent(disabledText.c_str());
+    }
+    return changed;
+}
+
+bool Option::RenderCombobox() const {
+    bool changed = false;
+    if (disabled) {
+        UIWidgets::DisableComponent(ImGui::GetStyle().Alpha * 0.5f);
+    }
+    ImGui::Text("%s", name.c_str());
+    uint8_t selected = CVarGetInteger(cvarName.c_str(), defaultOption);
+    if (selected >= options.size()) {
+        selected--;
+        CVarSetInteger(cvarName.c_str(), selected);
+        changed = true;
+        LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
+    }
+    if (!description.empty()) {
+        UIWidgets::InsertHelpHoverText(description.c_str());
+    }
+    ImGui::BeginGroup();
+    const std::string comboName = std::string("##") + std::string(cvarName);
+    if (ImGui::BeginCombo(comboName.c_str(), options[selected].c_str())) {
+        for (size_t i = 0; i < options.size(); i++) {
+            if (!options[i].empty()) {
+                if (ImGui::Selectable(options[i].c_str(), i == selected)) {
+                    CVarSetInteger(cvarName.c_str(), static_cast<int>(i));
+                    changed = true;
+                    selected = i;
+                    LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
+                }
+            }
+        }
+        ImGui::EndCombo();
+    }
+    ImGui::EndGroup();
+    if (disabled) {
+        UIWidgets::ReEnableComponent(disabledText.c_str());
+    }
+    return changed;
+}
+
+bool Option::RenderSlider() const {
+    bool changed = false;
+    int val = CVarGetInteger(cvarName.c_str(), defaultOption);
+    if (val >= options.size()) {
+        val--;
+        changed = true;
+    }
+    if (disabled) {
+        UIWidgets::DisableComponent(ImGui::GetStyle().Alpha * 0.5f);
+    }
+    const std::string formatName = name + ": %s";
+    ImGui::Text(formatName.c_str(), options[val].c_str());
+    if (!description.empty()) {
+        UIWidgets::InsertHelpHoverText(description.c_str());
+    }
+    UIWidgets::Spacer(0);
+    ImGui::BeginGroup();
+    const std::string MinusBTNName = " - ##" + cvarName;
+    if (ImGui::Button(MinusBTNName.c_str())) {
+        val--;
+        changed = true;
+    }
+    ImGui::SameLine();
+    ImGui::SetCursorPosX(ImGui::GetCursorPosX() - 7.0f);
+    ImGui::PushItemWidth(std::min(ImGui::GetContentRegionAvail().x - 30.0f, 260.0f));
+    const std::string id = "##Slider" + cvarName;
+    if (ImGui::SliderInt(id.c_str(), &val, 0, static_cast<int>(options.size()) - 1, "", ImGuiSliderFlags_AlwaysClamp)) {
+        changed = true;
+    }
+    ImGui::PopItemWidth();
+    const std::string PlusBTNName = " + ##" + cvarName;
+    ImGui::SameLine();
+    ImGui::SetCursorPosX(ImGui::GetCursorPosX() - 7.0f);
+    if (ImGui::Button(PlusBTNName.c_str())) {
+        val++;
+        changed = true;
+    }
+    ImGui::EndGroup();
+    if (disabled) {
+        UIWidgets::ReEnableComponent(disabledText.c_str());
+    }
+    if (val < 0) {
+        val = 0;
+        changed = true;
+    }
+    if (val > options.size() - 1) {
+        val = static_cast<int>(options.size() - 1);
+        changed = true;
+    }
+    if (changed) {
+        CVarSetInteger(cvarName.c_str(), val);
+        LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
+    }
+    return changed;
+}
+
 OptionGroup::OptionGroup(std::string name, std::vector<Option*> options, const OptionGroupType groupType,
-                         const bool printInSpoiler, const OptionGroupType containsType)
+                         const bool printInSpoiler, const WidgetContainerType containerType, std::string description)
     : mName(std::move(name)), mOptions(std::move(options)), mGroupType(groupType), mPrintInSpoiler(printInSpoiler),
-      mContainsType(containsType) {
+      mContainerType(containerType), mDescription(std::move(description)) {
 }
 
 OptionGroup::OptionGroup(std::string name, std::vector<OptionGroup*> subGroups, const OptionGroupType groupType,
-                         const bool printInSpoiler, const OptionGroupType containsType)
+                         const bool printInSpoiler, const WidgetContainerType containerType, std::string description)
     : mName(std::move(name)), mSubGroups(std::move(subGroups)), mGroupType(groupType), mPrintInSpoiler(printInSpoiler),
-      mContainsType(containsType) {
+      mContainsType(OptionGroupType::SUBGROUP), mContainerType(containerType), mDescription(std::move(description)) {
 }
 
-OptionGroup OptionGroup::SubGroup(std::string name, std::vector<Option*> options, const bool printInSpoiler) {
-    return {std::move(name), std::move(options), OptionGroupType::SUBGROUP, printInSpoiler};
+OptionGroup OptionGroup::SubGroup(std::string name, std::vector<Option*> options, const bool printInSpoiler,
+                                  const WidgetContainerType containerType, std::string description) {
+    return {std::move(name), std::move(options), OptionGroupType::SUBGROUP, printInSpoiler, containerType,
+                       std::move(description)};
 }
 
-OptionGroup OptionGroup::SubGroup(std::string name, std::vector<OptionGroup*> subGroups, const bool printInSpoiler) {
-    return {std::move(name), std::move(subGroups), OptionGroupType::SUBGROUP, printInSpoiler, OptionGroupType::SUBGROUP};
+OptionGroup OptionGroup::SubGroup(std::string name, std::vector<OptionGroup*> subGroups, const bool printInSpoiler,
+                                  const WidgetContainerType containerType, std::string description) {
+    return {std::move(name), std::move(subGroups), OptionGroupType::SUBGROUP, printInSpoiler, containerType,
+                       std::move(description)};
 }
 
 const std::string& OptionGroup::GetName() const {
@@ -139,4 +346,84 @@ OptionGroupType OptionGroup::GetGroupType() const {
 OptionGroupType OptionGroup::GetContainsType() const {
     return mContainsType;
 }
+
+WidgetContainerType OptionGroup::GetContainerType() const {
+    return mContainerType;
+}
+
+const std::string& OptionGroup::GetDescription() const {
+    return mDescription;
+}
+
+bool OptionGroup::RenderImGui() const { // NOLINT(*-no-recursion)
+    ImGuiWindow* window = ImGui::GetCurrentWindow();
+    bool changed = false;
+    if (mContainerType == WidgetContainerType::TABLE) {
+        if (ImGui::BeginTable(mName.c_str(), static_cast<int>(mSubGroups.size()), ImGuiTableFlags_BordersH | ImGuiTableFlags_BordersV)) {
+            for (const auto column : mSubGroups) {
+                if (column->GetContainerType() == WidgetContainerType::COLUMN) {
+                    ImGui::TableSetupColumn(column->GetName().c_str(), ImGuiTableColumnFlags_WidthStretch, 200.0f);
+                }
+            }
+            ImGui::PushItemFlag(ImGuiItemFlags_NoNav, true);
+            ImGui::TableNextRow(ImGuiTableRowFlags_Headers);
+            for (int i = 0; i < mSubGroups.size(); i++) {
+                ImGui::TableSetColumnIndex(i);
+                ImGui::TableHeader(mSubGroups[i]->GetName().c_str());
+                if (!mSubGroups[i]->GetDescription().empty()) {
+                    UIWidgets::SetLastItemHoverText(mSubGroups[i]->GetDescription().c_str());
+                }
+            }
+            ImGui::PopItemFlag();
+            ImGui::TableNextRow();
+        }
+    }
+    if (mContainerType == WidgetContainerType::SECTION && !mName.empty()) {
+        UIWidgets::PaddedSeparator();
+        ImGui::Text("%s", mName.c_str());
+        if (!mDescription.empty()) {
+            UIWidgets::InsertHelpHoverText(mDescription.c_str());
+        }
+        UIWidgets::PaddedSeparator();
+    }
+    if (mContainerType == WidgetContainerType::COLUMN) {
+        ImGui::TableNextColumn();
+        window->DC.CurrLineTextBaseOffset = 0.0f;
+        ImGui::BeginChild(mName.c_str(), ImVec2(0, -8));
+        ImGui::PushItemWidth(-FLT_MIN);
+    }
+    if (mContainsType == OptionGroupType::SUBGROUP) {
+        for (const auto optionGroup : mSubGroups) {
+            if (optionGroup->RenderImGui()) {
+                changed = true;
+            }
+        }
+    } else {
+        for (const auto option : mOptions) {
+            if (option->IsHidden()) {
+                continue;
+            }
+            if (option->HasFlag(IMFLAG_INDENT)) {
+                ImGui::Indent();
+            }
+            // If any options changed, changed will end up being true
+            if (option->RenderImGui()) {
+                changed = true;
+            }
+            if (option->HasFlag(IMFLAG_UNINDENT)) {
+                ImGui::Unindent();
+            }
+            if (option->HasFlag(IMFLAG_SEPARATOR_BOTTOM)) {
+                UIWidgets::PaddedSeparator();
+            }
+        }
+    }
+    if (mContainerType == WidgetContainerType::COLUMN) {
+        ImGui::EndChild();
+    }
+    if (mContainerType == WidgetContainerType::TABLE) {
+        ImGui::EndTable();
+    }
+    return changed;
+}
 } // namespace Rando
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/option.h b/soh/soh/Enhancements/randomizer/option.h
index aff38c714..8e0fd0713 100644
--- a/soh/soh/Enhancements/randomizer/option.h
+++ b/soh/soh/Enhancements/randomizer/option.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "soh/UIWidgets.hpp"
+
 #include <cstdint>
 #include <string>
 #include <vector>
@@ -7,26 +9,136 @@
 #include <type_traits>
 
 namespace Rando {
-enum class OptionCategory {
-    Setting,
-    Toggle,
+enum ImGuiMenuFlags {
+  IMFLAG_NONE = 0,
+  IMFLAG_SEPARATOR_BOTTOM = 1 << 0, /** Adds a padded separator below the widget. */
+  IMFLAG_SEPARATOR_TOP = 1 << 1, /** Adds a padded separator above the widget. */
+  IMFLAG_INDENT = 1 << 2, /** Indents this widget and all proceeding widgets. */
+  IMFLAG_UNINDENT = 1 << 3, /** Unindents this widget and all proceeding widgets. */
 };
 
+/**
+ * @brief Affects how options are handled when writing a spoiler/patch file
+ */
+enum class OptionCategory {
+    Setting, /** An option that typically affects the logic/item pool/etc. of the seed. Typically gets written out to the spoiler file. */
+    Toggle, /** An option that typically affects other options rather than affecting the seed directly. i.e. A toggle for randomizing the values of other options. */
+};
+
+/**
+ * @brief Controls how this option is rendered in the menu.
+ */
+enum class WidgetType {
+  Checkbox, /** Default for Bools, not compatible if options.size() > 2. */
+  Combobox, /** Default for U8s, works with U8s and Bools. */
+  Slider, /** Compatible with U8s. If constructed with NumOpts, consider using this. Technically can be used for Bool or non-NumOpts options but it would be a bit weird semantically. */
+};
+
+/**
+ * @brief A class describing the state of a single option/setting, such as its name,
+ * options, current value, whether or not it is interactable in the menu, or the CVar,
+ * it is linked to.
+ */
 class Option {
   public:
     Option() = default;
+
+    /**
+     * @brief Constructs a boolean option. This overload of this function typically requires more
+     * options to be specified rather than left as default.
+     *
+     * @param name_ The name of the option. Appears in the spoiler/patch file.
+     * @param options_ A vector of value names for this Option. This vector should have a size of 2.
+     * The name corresponding to the selected index for this option will be printed to the spoiler/patch file.
+     * @param category_ The desired `OptionCategory` for this option.
+     * @param cvarName_ The name ofthe CVar this option should correspond with. Set as an empty string to not
+     * link to any Cvar.
+     * @param description_ A description of what this option affects. Will be rendered in a toolip in ImGui.
+     * Can be left as an empty string if desired, no tooltip will be rendered.
+     * @param widgetType_ What type of widget should be rendered. Should probably be `Checkbox` but technically
+     * `Combobox` or `Slider` would render and function correctly.
+     * @param defaultOption_ The default index that should be selected.
+     * @param defaultHidden_ Whether or not to display the option (can be changed at runtime later).
+     * @param imFlags_ (see ImGuiMenuFlags type) flags that can modify how this option is rendered.
+     * @return Option
+     */
     static Option Bool(std::string name_, std::vector<std::string> options_ = { "Off", "On" },
-                       OptionCategory category_ = OptionCategory::Setting, uint8_t defaultOption_ = 0,
-                       bool defaultHidden_ = false);
+                       OptionCategory category_ = OptionCategory::Setting, std::string cvarName_ = "",
+                       std::string description_ = "", WidgetType widgetType_ = WidgetType::Checkbox,
+                       uint8_t defaultOption_ = 0, bool defaultHidden_ = false, int imFlags_ = IMFLAG_SEPARATOR_BOTTOM);
+
+    /**
+     * @brief Constructs a boolean option. This constructor was added later for convenience so that a cvarName
+     * could be specified without needing to fill in options that were previously left at default in
+     * existing calls to the other overload of this function. The options vector will be { "Off", "On" }
+     * when using this overload. If you want your option to have different value names, use the other overload.
+     *
+     * @param name_ The name of the option. Appears in the spoiler/patch file.
+     * @param cvarName_ The name of the CVar this option should correspond with. Set as an empty string to not
+     * link to any CVar.
+     * @param description_ A description of what this option affects. Will be rendered in a tooltip in ImGui.
+     * Can be left as an empty string if desired, no tooltip will be rendered.
+     * @param imFlags_ (see ImGuiMenuFlags type) flags that can modify how this option is rendered.
+     * @param widgetType_ What type of widget should be rendered. Should probably be `Checkbox` but technically
+     * `Combobox` or `Slider` would render and function correctly.
+     * @param defaultOption_ The defaulted selected index for this Option.
+     * @return Option
+     */
+    static Option Bool(std::string name_, std::string cvarName_, std::string description_ = "",
+                       int imFlags_ = IMFLAG_SEPARATOR_BOTTOM, WidgetType widgetType_ = WidgetType::Checkbox,
+                       bool defaultOption_ = false);
+
+    /**
+     * @brief Constructs a U8 Option.
+     *
+     * @param name_ The name of this Option. Appears in the spoiler/patch file.
+     * @param options_ A vector of value names for this Option. The name corresponding to the selected
+     * index for this option will be printed to the spoiler/patch file.
+     * @param category_ The desired `OptionCategory` for this option.
+     * @param cvarName_ The name ofthe CVar this option should correspond with. Set as an empty string to not
+     * link to any Cvar.
+     * @param description_ A description of what this option affects. Will be rendered in a toolip in ImGui.
+     * Can be left as an empty string if desired, no tooltip will be rendered.
+     * @param widgetType_ What type of widget should be rendered. Defaults to `Combobox`, but if you use NumOpts
+     * to make the `options_` vector you should probably set this to `Slider`. `Slider` will technically work for
+     * any value of `options_` but may be odd/unclear semantically speaking.
+     * This should not be set for `Checkbox` if options_ has more than 2 values.
+     * @param defaultOption_ The default index that should be selected.
+     * @param defaultHidden_ Whether or not to display the option (can be changed at runtime later).
+     * @param imFlags_ (see ImGuiMenuFlags type) flags that can modify how this option is rendered.
+     * @return Option
+     */
     static Option U8(std::string name_, std::vector<std::string> options_,
-                     OptionCategory category_ = OptionCategory::Setting, uint8_t defaultOption_ = 0,
-                     bool defaultHidden_ = false);
+                     OptionCategory category_ = OptionCategory::Setting, std::string cvarName_ = "",
+                     std::string description_ = "", WidgetType widgetType_ = WidgetType::Combobox,
+                     uint8_t defaultOption_ = 0, bool defaultHidden_ = false, int imFlags_ = IMFLAG_SEPARATOR_BOTTOM);
+
+    /**
+     * @brief A convenience function for constructing the Option for a trick.
+     *
+     * @param name_ The name of the trick. Appears in the spoiler/patch file.
+     * @return Option
+     */
     static Option LogicTrick(std::string name_);
 
+    /**
+     * @brief Gets the selected index or boolean value of the Option.
+     *
+     * @tparam T uint8_t or bool, depending on how the option was constructed.
+     * @return T
+     */
     template <typename T> T Value() const {
         return std::get<T>(var);
     }
 
+    /**
+     * @brief Determines if the value/selected index of this Option matches the provided value.
+     *
+     * @tparam T uint8_t, bool, or an enum (which will be cast to uint8_t).
+     * @param other The value to compare.
+     * @return true
+     * @return false
+     */
     template <typename T> bool Is(T other) const {
         static_assert(std::is_integral_v<T> || std::is_enum_v<T>, "T must be an integral type or an enum.");
         if constexpr ((std::is_integral_v<T> && !std::is_same_v<bool, T>) || std::is_enum_v<T>) {
@@ -36,29 +148,170 @@ class Option {
         }
     }
 
+    /**
+     * @brief Determines if the value/selected index of this Option does not match the provided value.
+     *
+     * @tparam T uint8_t, book, or an enum (which will be cast to uint8_t).
+     * @param other The value to compare.
+     * @return true
+     * @return false
+     */
     template <typename T> bool IsNot(T other) const {
         return !Is(other);
     }
 
+    /**
+     * @brief Allows the option to be used as a boolean value directly.
+     *
+     * @return true
+     * @return false
+     */
     explicit operator bool() const;
+
+    /**
+     * @brief Get the size of the options array.
+     *
+     * @return size_t
+     */
     size_t GetOptionCount() const;
+
+    /**
+     * @brief Get the name of the Option.
+     *
+     * @return const std::string&
+     */
     const std::string& GetName() const;
+
+    /**
+     * @brief Get the value name corresponding to the selected index.
+     *
+     * @return const std::string&
+     */
     const std::string& GetSelectedOptionText() const;
+
+    /**
+     * @brief Get the CVar name for this Option.
+     *
+     * @return const std::string&
+     */
+    const std::string& GetCVarName() const;
+
+    /**
+     * @brief Get the selected index for this Option.
+     *
+     * @return uint8_t
+     */
     uint8_t GetSelectedOptionIndex() const;
+
+    /**
+     * @brief Sets the variable to the currently selected index for this Option.
+     */
     void SetVariable();
+
+    /**
+     * @brief Sets the CVar corresponding to the property `cvarName` equal to the value
+     * of the property `selectedValue`.
+    */
+    void SetCVar() const;
+
+    /**
+     * @brief Sets the value of property `selectedValue` equal to the CVar corresponding
+     * to the property `cvarName`.
+    */
+    void SetFromCVar();
+
+    /**
+     * @brief Set the delayedOption to the currently selected index so it can be restored later.
+     */
     void SetDelayedOption();
+
+    /**
+     * @brief Restores the delayedOption back to the selected index.
+     */
     void RestoreDelayedOption();
+
+    /**
+     * @brief Set the selected index for this Option. Also calls `SetVariable()`.
+     *
+     * @param idx the index to set as the selected index.
+     */
     void SetSelectedIndex(size_t idx);
+
+    /**
+     * @brief Hides this Option in the menu. (Not currently being used afaik, we prefer to
+     * display all the Options and visually disable the ones that aren't applicable.)
+     */
     void Hide();
+
+    /**
+     * @brief Shows this Option in the menu if it was previously hidden.
+     */
     void Unhide();
+
+    /**
+     * @brief Whether or not this Option is currently hidden.
+     *
+     * @return true
+     * @return false
+     */
+
     bool IsHidden() const;
+    /**
+     * @brief Replaces the `options` vector for this Option with a new one.
+     * If the new vector is smaller than the old one and the current selected
+     * index is out of range, this function changes the selected index to the
+     * last index of the new vector.
+     *
+     * @param opts The new vector of options.
+     */
+    void ChangeOptions(std::vector<std::string> opts);
+
+    /**
+     * @brief Enables interaction with this option.
+     *
+     * "Enable" in this context refers to the ability to change the option in the
+     * settings menu. The actual value of the option is not decided by whether or not
+     * the option is "Enabled".
+    */
+    void Enable();
+
+    /**
+     * @brief Disables interaction with this option.
+     *
+     * "Disable" in this context refers to the ability to change the option in the
+     * settings menu. The actual value of the option is not decided by whether or not
+     * the option is "Disabled".
+     *
+     * @param text The tooltip text explaining why the option is disabled.
+     * @param graphic What graphic to display in a disabled checkbox. Defaults to an
+     * "X" symbol.
+     */
+    void Disable(std::string text, UIWidgets::CheckboxGraphics graphic = UIWidgets::CheckboxGraphics::Cross);
     bool IsCategory(OptionCategory category) const;
 
+    /**
+     * @brief Automatically renders a widget for this option in ImGui, based on the various
+     * properties of this Option. Typically, Bool options are rendered as Checkboxes and
+     * U8 options are rendered as Comboboxes, but this can be overriden during construction with
+     * the `widgetType` property.
+     */
+    bool RenderImGui() const;
+
+    bool HasFlag(int imFlag_) const;
+    void AddFlag(int imFlag_);
+    void SetFlag(int imFlag_);
+    void RemoveFlag(int imFlag_);
+
   private:
     Option(uint8_t var_, std::string name_, std::vector<std::string> options_, OptionCategory category_,
-           uint8_t defaultOption_, bool defaultHidden_);
+           std::string cvarName_, std::string description_, WidgetType widgetType_, uint8_t defaultOption_,
+           bool defaultHidden_, int imFlags_);
     Option(bool var_, std::string name_, std::vector<std::string> options_, OptionCategory category_,
-           uint8_t defaultOption_, bool defaultHidden_);
+           std::string cvarName_, std::string description_, WidgetType widgetType_, uint8_t defaultOption_,
+           bool defaultHidden_, int imFlags_);
+    bool RenderCheckbox() const;
+    bool RenderCombobox() const;
+    bool RenderSlider() const;
     std::variant<bool, uint8_t> var;
     std::string name;
     std::vector<std::string> options;
@@ -66,8 +319,15 @@ class Option {
     uint8_t delayedOption = 0;
     bool hidden = false;
     OptionCategory category = OptionCategory::Setting;
+    std::string cvarName;
+    std::string description;
+    WidgetType widgetType = WidgetType::Checkbox;
     uint8_t defaultOption = false;
     bool defaultHidden = false;
+    int imFlags = IMFLAG_NONE;
+    bool disabled = false;
+    UIWidgets::CheckboxGraphics disabledGraphic = UIWidgets::CheckboxGraphics::Cross;
+    std::string disabledText;
 };
 
 enum class OptionGroupType {
@@ -75,20 +335,134 @@ enum class OptionGroupType {
     SUBGROUP,
 };
 
+enum class WidgetContainerType {
+  BASIC, /** Barebones container, just lists the options within. */
+  SECTION, /** Similar to Barebones, but has a header with the section name. */
+  COLUMN, /** Signifies the container should be the start of new column within a table. */
+  TABLE, /** Signifies the container is a table (should contain other subgroups with type column)*/
+  TABBED, /** Signifies this container's contents should be contained within a tabbed interface. */
+};
+
 class OptionGroup {
   public:
     OptionGroup() = default;
-    OptionGroup(std::string name, std::vector<Option*> options, OptionGroupType groupType = OptionGroupType::DEFAULT, bool printInSpoiler = true, OptionGroupType containsType = OptionGroupType::DEFAULT);
-    OptionGroup(std::string name, std::vector<OptionGroup*> subGroups, OptionGroupType groupType = OptionGroupType::DEFAULT, bool printInSpoiler = true, OptionGroupType containsType = OptionGroupType::SUBGROUP);
-    static OptionGroup SubGroup(std::string name, std::vector<Option*> options, bool printInSpoiler = true);
-    static OptionGroup SubGroup(std::string name, std::vector<OptionGroup*> subGroups, bool printInSpoiler = true);
+
+    /**
+     * @brief Construct a new Option Group containing a list of `Option` pointers.
+     *
+     * @param name The name of this Option Group. Appears in the spoiler/patch file in front each option it contains.
+     * @param options A vector of Option pointers
+     * @param groupType `DEFAULT` if this group is not contained within any other groups, `SUBGROUP` if it is a
+     * subgroup of another group.
+     * @param printInSpoiler Whether or not to print the contents of this group to the spoiler/patch file.
+     * @param containerType Specifies the type of container this widget should render as in ImGui.
+     * @param description A description that can appear in a tooltip in ImGui.
+     */
+    OptionGroup(std::string name, std::vector<Option*> options, OptionGroupType groupType = OptionGroupType::DEFAULT,
+                bool printInSpoiler = true, WidgetContainerType containerType = WidgetContainerType::BASIC,
+                std::string description = "");
+
+    /**
+     * @brief Construct a new Option Group containing a list of `OptionGroup` pointers.
+     *
+     * @param name The name of this option group. Appears in the spoiler/patch file.
+     * @param subGroups A vector of OptionGroup pointers that will be subgroups of this group.
+     * @param groupType `DEFAULT` if this group is not contained within any other groups, `SUBGROUP` if it is a
+     * subgroup of another group.
+     * @param printInSpoiler Whether or not to print the contents of this group to spoiler/patch file.
+     * @param containerType Specifies the type of container this widget should render as in ImGui.
+     * @param description A description that can appear in a tooltip in ImGui.
+     */
+    OptionGroup(std::string name, std::vector<OptionGroup*> subGroups, OptionGroupType groupType = OptionGroupType::DEFAULT,
+                bool printInSpoiler = true, WidgetContainerType containerType = WidgetContainerType::BASIC,
+                std::string description = "");
+
+    /**
+     * @brief Convenience function for constructing an OptionGroup of groupType `SUBGROUP` with
+     * containsType of `DEFAULT` (contains `Option`s).
+     *
+     * @param name The name of this option group. Appears in the spoiler/patch file.
+     * @param options A vector of Option pointers.
+     * @param printInSpoiler Whether or not to print the options of this group to the spoiler/patch file.
+     * @param containerType Specifies the type of container this widget should render as in ImGui.
+     * @param description A description that can appear in a tooltip in ImGui.
+     * @return OptionGroup
+     */
+    static OptionGroup SubGroup(std::string name, std::vector<Option*> options, bool printInSpoiler = true,
+                                WidgetContainerType containerType = WidgetContainerType::BASIC,
+                                std::string description = "");
+
+    /**
+     * @brief Convenience function for constructing an OptionGroup of groupType `SUBGROUP` with
+     * containsType of `SUBGROUP` (contains other `OptionGroup`s)
+     *
+     * @param name The name of this option group. Appears in the spoiler/patch file.
+     * @param subGroups A vector of OptionGroup pointers.
+     * @param printInSpoiler Whether or not to print the options of this group to the spoiler/patch file.
+     * @param containerType Specifies the type of container this widget should render as in ImGui.
+     * @param description A description that can appear in a tooltip in ImGui.
+     * @return OptionGroup
+     */
+    static OptionGroup SubGroup(std::string name, std::vector<OptionGroup*> subGroups, bool printInSpoiler = true,
+                                WidgetContainerType containerType = WidgetContainerType::BASIC,
+                                std::string description = "");
+
+    /**
+     * @brief Get the name of the OptionGroup.
+     *
+     * @return const std::string&
+     */
     const std::string& GetName() const;
+
+    /**
+     * @brief Get the list of `Option`s contained within this `OptionGroup`.
+     *
+     * @return const std::vector<Option*>&
+     */
     const std::vector<Option*>& GetOptions() const;
+
+    /**
+     * @brief Get the list of `OptionGroup`s contained within this `OptionGroup`.
+     *
+     * @return const std::vector<OptionGroup*>&
+     */
     const std::vector<OptionGroup*>& GetSubGroups() const;
+
+    /**
+     * @brief Returns whether or not this `OptionGroup`'s contents should be printed to the
+     * spoiler/patch file.
+     *
+     * @return true
+     * @return false
+     */
     bool PrintInSpoiler() const;
+
+    /**
+     * @brief Get the Group Type of this `OptionGroup`. `DEFAULT` means this group is not contained
+     * within any other groups, while `SUBGROUP` means that it is contained within at least one other.
+     * `OptionGroup`.
+     *
+     * @return OptionGroupType
+     */
     OptionGroupType GetGroupType() const;
+
+    /**
+     * @brief Get the type of values contained in this `OptionGroup`. `DEFAULT` means this group contains
+     * `Options`, and `SUBGROUP` means this group contains other `OptionGroup`s.
+     *
+     * @return OptionGroupType
+     */
     OptionGroupType GetContainsType() const;
 
+    WidgetContainerType GetContainerType() const;
+
+    const std::string& GetDescription() const;
+
+    /**
+     * @brief Renders all of the options contained within this `OptionGroup` in the ImGui menu.
+     */
+    bool RenderImGui() const;
+
   private:
     std::string mName;
     std::vector<Option*> mOptions;
@@ -96,5 +470,7 @@ class OptionGroup {
     OptionGroupType mGroupType = OptionGroupType::DEFAULT;
     bool mPrintInSpoiler = true;
     OptionGroupType mContainsType = OptionGroupType::DEFAULT;
+    WidgetContainerType mContainerType = WidgetContainerType::BASIC;
+    std::string mDescription;
 };
 } // namespace Rando
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/option_descriptions.cpp b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
new file mode 100644
index 000000000..83f8b12a0
--- /dev/null
+++ b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
@@ -0,0 +1,523 @@
+#include "settings.h"
+
+namespace Rando {
+void Settings::CreateOptionDescriptions() {
+    mOptionDescriptions[RSK_FOREST] = "Closed - Kokiri sword & shield are required to access "
+                                      "the Deku Tree, and completing the Deku Tree is required to "
+                                      "access the Hyrule Field exit.\n"
+                                      "\n"
+                                      "Closed Deku - Kokiri boy no longer blocks the path to Hyrule "
+                                      "Field but Mido still requires the Kokiri sword and Deku shield "
+                                      "to access the tree.\n"
+                                      "\n"
+                                      "Open - Mido no longer blocks the path to the Deku Tree. Kokiri "
+                                      "boy no longer blocks the path out of the forest.";
+    mOptionDescriptions[RSK_KAK_GATE] = "Closed - The gate will remain closed until Zelda's letter "
+                                        "is shown to the guard.\n"
+                                        "\n"
+                                        "Open - The gate is always open. The happy mask shop "
+                                        "will open immediately after obtaining Zelda's letter.";
+    mOptionDescriptions[RSK_DOOR_OF_TIME] = "Closed - The Ocarina of Time, the Song of Time and all "
+                                            "three spiritual stones are required to open the Door of Time.\n"
+                                            "\n"
+                                            "Song only - Play the Song of Time in front of the Door of "
+                                            "Time to open it.\n"
+                                            "\n"
+                                            "Open - The Door of Time is permanently open with no requirements.";
+    mOptionDescriptions[RSK_ZORAS_FOUNTAIN] = "Closed - King Zora obstructs the way to Zora's Fountain. "
+                                              "Ruto's letter must be shown as child Link in order to move "
+                                              "him in both time periods.\n"
+                                              "\n"
+                                              "Closed as child - Ruto's Letter is only required to move King Zora "
+                                              "as child Link. Zora's Fountain starts open as adult.\n"
+                                              "\n"
+                                              "Open - King Zora has already mweeped out of the way in both "
+                                              "time periods. Ruto's Letter is removed from the item pool.";
+    mOptionDescriptions[RSK_STARTING_AGE] =
+        "Choose which age Link will start as.\n\n"
+        "Starting as adult means you start with the Master Sword in your inventory.\n"
+        "The child option is forcefully set if it would conflict with other options.";
+    mOptionDescriptions[RSK_GERUDO_FORTRESS] = "Sets the amount of carpenters required to repair the bridge "
+                                               "in Gerudo Valley.\n"
+                                               "\n"
+                                               "Normal - All 4 carpenters are required to be saved.\n"
+                                               "\n"
+                                               "Fast - Only the bottom left carpenter requires rescuing.\n"
+                                               "\n"
+                                               "Open - The bridge is repaired from the start.\n"
+                                               "\n"
+                                               "Only \"Normal\" is compatible with Gerudo Fortress Key Rings.";
+    mOptionDescriptions[RSK_RAINBOW_BRIDGE] =
+        "Alters the requirements to open the bridge to Ganon's Castle.\n"
+        "\n"
+        "Vanilla - Obtain the Shadow Medallion, Spirit Medallion and Light Arrows.\n"
+        "\n"
+        "Always open - No requirements.\n"
+        "\n"
+        "Stones - Obtain the specified amount of spiritual stones.\n"
+        "\n"
+        "Medallions - Obtain the specified amount of medallions.\n"
+        "\n"
+        "Dungeon rewards - Obtain the specified total sum of spiritual "
+        "stones or medallions.\n"
+        "\n"
+        "Dungeons - Complete the specified amount of dungeons. Dungeons "
+        "are considered complete after stepping in to the blue warp after "
+        "the boss.\n"
+        "\n"
+        "Tokens - Obtain the specified amount of Skulltula tokens.\n"
+        "\n"
+        "Greg - Find Greg the Green Rupee.";
+    mOptionDescriptions[RSK_BRIDGE_OPTIONS] =
+        "Standard Rewards - Greg does not change logic, Greg does not help open the bridge, max "
+        "number of rewards on slider does not change.\n"
+        "\n"
+        "Greg as Reward - Greg does change logic (can be part of expected path for opening "
+        "bridge), Greg helps open bridge, max number of rewards on slider increases by 1 to "
+        "account for Greg. \n"
+        "\n"
+        "Greg as Wildcard - Greg does not change logic, Greg helps open the bridge, max number of "
+        "rewards on slider does not change.";
+    mOptionDescriptions[RSK_GANONS_TRIALS] =
+        "Sets the number of Ganon's Trials required to dispel the barrier.\n"
+        "\n"
+        "Skip - No Trials are required and the barrier is already dispelled.\n"
+        "\n"
+        "Set Number - Select a number of trials that will be required from the"
+        "slider below. Which specific trials you need to complete will be random.\n"
+        "\n"
+        "Random Number - A Random number and set of trials will be required.";
+    mOptionDescriptions[RSK_TRIAL_COUNT] = "Set the number of trials required to enter Ganon's Tower.";
+    mOptionDescriptions[RSK_MQ_DUNGEON_RANDOM] =
+        "Sets the number of Master Quest Dungeons that are shuffled into the pool.\n"
+        "\n"
+        "None - All Dungeons will be their Vanilla versions.\n"
+        "\n"
+        "Set Number - Select a number of dungeons that will be their Master Quest versions "
+        "using the slider below. Which dungeons are set to be the Master Quest variety will be random.\n"
+        "\n"
+        "Random Number - A Random number and set of dungeons will be their Master Quest varieties.\n"
+        "\n"
+        "Selection Only - Specify which dungeons are Vanilla or Master Quest.";
+    mOptionDescriptions[RSK_MQ_DUNGEON_SET] =
+                "Choose specific Dungeons to be Master Quest or Vanilla.\n"
+                "\n"
+                "If Master Quest Dungeons is set to Set Number or Random, the dungeons chosen "
+                "to be Master Quest here will count towards that total. Any Dungeons set to Vanilla "
+                "here will be guaranteed to be Vanilla. If Set Number is higher than the amount of dungeons "
+                "set to either MQ or Random here, you will have fewer MQ Dungeons than the number you "
+                "set.";
+    mOptionDescriptions[RSK_TRIFORCE_HUNT] =
+        "Pieces of the Triforce of Courage have been scattered across the world. Find them all to finish the game!\n\n"
+        "When the required amount of pieces have been found, the game is saved and Ganon's Boss key is given "
+        "to you when you load back into the game if you desire to beat Ganon afterwards.\n\n"
+        "Keep in mind Ganon might not be logically beatable when \"All Locations Reachable\" is turned off.";
+    mOptionDescriptions[RSK_TRIFORCE_HUNT_PIECES_TOTAL] =
+        "The amount of Triforce pieces that will be placed in the world. "
+        "Keep in mind seed generation can fail if more pieces are placed than there are junk items in the item pool.";
+    mOptionDescriptions[RSK_TRIFORCE_HUNT_PIECES_REQUIRED] = "The amount of Triforce pieces required to win the game.";
+    mOptionDescriptions[RSK_SHUFFLE_DUNGEON_ENTRANCES] =
+        "Shuffle the pool of dungeon entrances, including Bottom of the Well, Ice Cavern and Gerudo Training Grounds.\n"
+        "\n"
+        "Shuffling Ganon's Castle can be enabled separately.\n"
+        "\n"
+        "Additionally, the entrances of Deku Tree, Fire Temple, Bottom of the Well and Gerudo Training Ground are "
+        "opened for both child and adult.\n"
+        "\n"
+        "- Deku Tree will be open for adult after Mido has seen child Link with a sword and shield.\n"
+        "- Bottom of the Well will be open for adult after playing Song of Storms to the Windmill guy as child.\n"
+        "- Gerudo Training Ground will be open for child after adult has paid to open the gate once.";
+    mOptionDescriptions[RSK_SHUFFLE_BOSS_ENTRANCES] =
+        "Shuffle the pool of dungeon boss entrances. This affects the boss rooms of all stone and medallion dungeons.\n"
+        "\n"
+        "Age Restricted - Shuffle the entrances of child and adult boss rooms separately.\n"
+        "\n"
+        "Full - Shuffle the entrances of all boss rooms together. Child may be expected to defeat Phantom Ganon and/or "
+        "Bongo Bongo.";
+    mOptionDescriptions[RSK_SHUFFLE_OVERWORLD_ENTRANCES] =
+        "Shuffle the pool of Overworld entrances, which corresponds to almost all loading zones between overworld "
+        "areas.\n"
+        "\n"
+        "Some entrances are unshuffled to avoid issues:\n"
+        "- Hyrule Castle Courtyard and Garden entrance\n"
+        "- Both Market Back Alley entrances\n"
+        "- Gerudo Valley to Lake Hylia (unless entrances are decoupled)";
+    mOptionDescriptions[RSK_SHUFFLE_INTERIOR_ENTRANCES] =
+        "Shuffle the pool of interior entrances which contains most Houses and all Great Fairies.\n"
+        "\n"
+        "All - An extended version of 'Simple' with some extra places:\n"
+        "- Windmill\n"
+        "- Link's House\n"
+        "- Temple of Time\n"
+        "- Kakariko Potion Shop";
+    mOptionDescriptions[RSK_SHUFFLE_GROTTO_ENTRANCES] =
+        "Shuffle the pool of grotto entrances, including all graves, small Fairy fountains and the Deku Theatre.";
+    mOptionDescriptions[RSK_SHUFFLE_OWL_DROPS] = "Randomize where Kaepora Gaebora (the Owl) drops you at when you talk "
+                                                 "to him at Lake Hylia or at the top of Death Mountain Trail.";
+    mOptionDescriptions[RSK_SHUFFLE_WARP_SONGS] = "Randomize where each of the 6 warp songs leads to.";
+    mOptionDescriptions[RSK_SHUFFLE_OVERWORLD_SPAWNS] =
+        "Randomize where you start as Child or Adult when loading a save in the Overworld. This "
+        "means you may not necessarily spawn inside Link's House or Temple of Time.\n"
+        "\n"
+        "This stays consistent after saving and loading the game again.\n"
+        "\n"
+        "Keep in mind you may need to temporarily disable the \"Remember Save Location\" time saver to "
+        "be able use the spawn positions, especially if they are the only logical way to get to certain areas.";
+    mOptionDescriptions[RSK_DECOUPLED_ENTRANCES] =
+        "Decouple entrances when shuffling them. This means you are no longer guaranteed "
+        "to end up back where you came from when you go back through an entrance.\n"
+        "\n"
+        "This also adds the one-way entrance from Gerudo Valley to Lake Hylia in the pool of "
+        "overworld entrances when they are shuffled.";
+    mOptionDescriptions[RSK_MIXED_ENTRANCE_POOLS] =
+        "Shuffle entrances into a mixed pool instead of separate ones.\n"
+        "\n"
+        "For example, enabling the settings to shuffle grotto, dungeon, and overworld entrances and "
+        "selecting grotto and dungeon entrances here will allow a dungeon to be inside a grotto or "
+        "vice versa, while overworld entrances are shuffled in their own separate pool and indoors stay vanilla.";
+    mOptionDescriptions[RSK_MIX_DUNGEON_ENTRANCES] = "Dungeon entrances will be part of the mixed pool";
+    mOptionDescriptions[RSK_MIX_OVERWORLD_ENTRANCES] = "Overworld entrances will be part of the mixed pool";
+    mOptionDescriptions[RSK_MIX_INTERIOR_ENTRANCES] = "Interior entrances will be part of the mixed pool";
+    mOptionDescriptions[RSK_MIX_GROTTO_ENTRANCES] = "Grotto entrances will be part of the mixed pool";
+    mOptionDescriptions[RSK_SHUFFLE_SONGS] =
+        "Song locations - Songs will only appear at locations that normally teach songs.\n"
+        "\n"
+        "Dungeon rewards - Songs appear after beating a major dungeon boss.\n"
+        "The 4 remaining songs are located at:\n"
+        "  - Zelda's lullaby location\n"
+        "  - Ice Cavern's Serenade of Water location\n"
+        "  - Bottom of the Well Lens of Truth location\n"
+        "  - Gerudo Training Ground's Ice Arrows location\n"
+        "\n"
+        "Anywhere - Songs can appear at any location.";
+    mOptionDescriptions[RSK_SHUFFLE_TOKENS] = "Shuffles Golden Skulltula Tokens into the item pool. This means "
+                                              "Golden Skulltulas can contain other items as well.\n"
+                                              "\n"
+                                              "Off - GS tokens will not be shuffled.\n"
+                                              "\n"
+                                              "Dungeons - Only shuffle GS tokens that are within dungeons.\n"
+                                              "\n"
+                                              "Overworld - Only shuffle GS tokens that are outside of dungeons.\n"
+                                              "\n"
+                                              "All Tokens - Shuffle all 100 GS tokens.";
+    mOptionDescriptions[RSK_SKULLS_SUNS_SONG] = "All Golden Skulltulas that require nighttime to appear will only be "
+                                                "expected to be collected after getting Sun's Song.";
+    mOptionDescriptions[RSK_SHUFFLE_KOKIRI_SWORD] =
+        "Shuffles the Kokiri Sword into the item pool.\n"
+        "\n"
+        "This will require the use of sticks until the Kokiri Sword is found.";
+    mOptionDescriptions[RSK_SHUFFLE_MASTER_SWORD] =
+        "Shuffles the Master Sword into the item pool.\n"
+        "\n"
+        "Adult Link will start with a second free item instead of the Master Sword.\n"
+        "If you haven't found the Master Sword before facing Ganon, you won't receive it during the fight.";
+    mOptionDescriptions[RSK_SHUFFLE_OCARINA] =
+        "Enabling this shuffles the Fairy Ocarina and the Ocarina of Time into the item pool.\n"
+        "\n"
+        "This will require finding an Ocarina before being able to play songs.";
+    mOptionDescriptions[RSK_SHUFFLE_WEIRD_EGG] = "Shuffles the Weird Egg from Malon in to the item pool. Enabling "
+                                                 "\"Skip Child Zelda\" disables this feature.\n"
+                                                 "\n"
+                                                 "The Weird Egg is required to unlock several events:\n"
+                                                 "  - Zelda's Lullaby from Impa\n"
+                                                 "  - Saria's song in Sacred Forest Meadow\n"
+                                                 "  - Epona's song and chicken minigame at Lon Lon Ranch\n"
+                                                 "  - Zelda's letter for Kakariko gate (if set to closed)\n"
+                                                 "  - Happy Mask Shop sidequest\n";
+    mOptionDescriptions[RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD] =
+        "Shuffles the Gerudo Membership Card into the item pool.\n"
+        "\n"
+        "The Gerudo Card is required to enter the Gerudo Training Grounds, opening "
+        "the gate to Haunted Wasteland and the Horseback Archery minigame.";
+    mOptionDescriptions[RSK_SHOPSANITY] = "Off - All shop items will be the same as vanilla.\n"
+                                          "\n"
+                                          "0 Items - Vanilla shop items will be shuffled among different shops.\n"
+                                          "\n"
+                                          "1-4 Items - Vanilla shop items will be shuffled among different shops, and "
+                                          "each shop will contain 1-4 non-vanilla shop items.\n"
+                                          "\n"
+                                          "Random - Vanilla shop items will be shuffled among different shops, and "
+                                          "each shop will contain a random number(1-4) of non-vanilla shop items.\n";
+    mOptionDescriptions[RSK_SHOPSANITY_PRICES] =
+        "Balanced - The default randomization. Shop prices for shopsanity items will range between 0 to 300 rupees, "
+        "with a bias towards values slightly below the middle of the range, in multiples of 5.\n "
+        "\n"
+        "X Wallet - Randomized between 5 and the wallet's max size, in multiples of 5";
+    mOptionDescriptions[RSK_SHOPSANITY_PRICES_AFFORDABLE] =
+        "Affordable prices per tier: starter = 10, adult = 105, giant = 205, tycoon = 505\n\n"
+        "Use this to enable wallet tier locking, but make shop items not as expensive as they could be.";
+    mOptionDescriptions[RSK_SHUFFLE_SCRUBS] =
+        "Off - Scrubs will not be shuffled. The 3 Scrubs that give one-time items in the vanilla game "
+        "(PoH, Deku Nut capacity, and Deku Stick capacity) will have random items.\n"
+        "\n"
+        "Affordable - Scrubs will be shuffled and their item will cost 10 rupees.\n"
+        "\n"
+        "Expensive - Scrubs will be shuffled and their item will cost the vanilla price.\n"
+        "\n"
+        "Random - Scrubs will be shuffled and their item will cost will be between 0-95 rupees.\n";
+    mOptionDescriptions[RSK_SHUFFLE_COWS] =
+        "Cows give a randomized item from the pool upon performing Epona's Song in front of them.";
+    mOptionDescriptions[RSK_SHUFFLE_MAGIC_BEANS] =
+        "Enabling this adds a pack of 10 beans to the item pool and changes the Magic Bean "
+        "Salesman to sell a random item at a price of 60 rupees.";
+    mOptionDescriptions[RSK_SHUFFLE_MERCHANTS] =
+        "Enabling this changes Medigoron, Granny and the Carpet Salesman to sell a random item "
+        "once at a high price (100 for Granny, 200 for the others).\n"
+        "A Giant's Knife and a pack of Bombchus will be added to the item pool, and "
+        "one of the bottles will contain a Blue Potion.\n\n"
+        "On (no hints) - Salesmen will be included but won't tell you what you'll get.\n"
+        "On (with hints) - Salesmen will be included and you'll know what you're buying.\n"
+        "\n"
+        "Granny's item will only be offered after you have traded in the Odd Mushroom when Shuffle Adult Trade is on. "
+        "Otherwise when off, you will need to have found the Claim Check to buy her item (simulating the trade quest "
+        "is complete).";
+    mOptionDescriptions[RSK_SHUFFLE_FROG_SONG_RUPEES] = "Shuffles 5 Purple Rupees into to the item pool, and allows\n"
+                                                        "you to earn items by playing songs at the Frog Choir.\n"
+                                                        "\n"
+                                                        "This setting does not effect the item earned from playing\n"
+                                                        "the Song of Storms and the frog song minigame.";
+    mOptionDescriptions[RSK_SHUFFLE_ADULT_TRADE] =
+        "Adds all of the adult trade quest items into the pool, each of which "
+        "can be traded for a unique reward.\n"
+        "\n"
+        "You will be able to choose which of your owned adult trade items is visible "
+        "in the inventory by selecting the item with A and using the control stick or "
+        "D-pad.\n"
+        "\n"
+        "If disabled, only the Claim Check will be found in the pool.";
+    mOptionDescriptions[RSK_SHUFFLE_100_GS_REWARD] =
+        "Shuffle the item the cursed rich man in the House of Skulltula gives when you "
+        "have collected all 100 Gold Skulltula Tokens.\n"
+        "\n"
+        "You can still talk to him multiple times to get Huge Rupees.";
+    mOptionDescriptions[RSK_SHUFFLE_DUNGEON_REWARDS] =
+        "Shuffles the location of spiritual stones and medallions.\n"
+        "\n"
+        "End of dungeons - Spiritual stones and medallions will be given as rewards "
+        "for beating major dungeons. Link will always start with one stone or medallion.\n"
+        "\n"
+        "Any dungeon - Spiritual stones and medallions can be found inside any dungeon.\n"
+        "\n"
+        "Overworld - Spiritual stones and medallions can only be found outside of dungeons.\n"
+        "\n"
+        "Anywhere - Spiritual stones and medallions can appear anywhere.";
+    mOptionDescriptions[RSK_SHUFFLE_MAPANDCOMPASS] =
+        "Start with - You will start with Maps & Compasses from all dungeons.\n"
+        "\n"
+        "Vanilla - Maps & Compasses will appear in their vanilla locations.\n"
+        "\n"
+        "Own dungeon - Maps & Compasses can only appear in their respective dungeon.\n"
+        "\n"
+        "Any dungeon - Maps & Compasses can only appear inside of any dungon.\n"
+        "\n"
+        "Overworld - Maps & Compasses can only appear outside of dungeons.\n"
+        "\n"
+        "Anywhere - Maps & Compasses can appear anywhere in the world.";
+    mOptionDescriptions[RSK_KEYSANITY] =
+        "Start with - You will start with all Small Keys from all dungeons.\n"
+        "\n"
+        "Vanilla - Small Keys will appear in their vanilla locations. "
+        "You start with 3 keys in Spirit Temple MQ because the vanilla key layout is not beatable in logic.\n"
+        "\n"
+        "Own dungeon - Small Keys can only appear in their respective dungeon. "
+        "If Fire Temple is not a Master Quest dungeon, the door to the Boss Key chest will be unlocked.\n"
+        "\n"
+        "Any dungeon - Small Keys can only appear inside of any dungon.\n"
+        "\n"
+        "Overworld - Small Keys can only appear outside of dungeons.\n"
+        "\n"
+        "Anywhere - Small Keys can appear anywhere in the world.";
+    mOptionDescriptions[RSK_KEYRINGS] =
+        "Keyrings will replace all small keys from a particular dungeon with a single keyring that awards all keys for "
+        "it's associated dungeon\n"
+        "\n"
+        "Off - No dungeons will have their keys replaced with keyrings.\n"
+        "\n"
+        "Random - A random amount of dungeons(0-8 or 9) will have their keys replaced with keyrings.\n"
+        "\n"
+        "Count - A specified amount of randomly selected dungeons will have their keys replaced with keyrings.\n"
+        "\n"
+        "Selection - Hand select which dungeons will have their keys replaced with keyrings.\n"
+        "\n"
+        "Selecting key ring for dungeons will have no effect if Small Keys are set to Start With or Vanilla.\n"
+        "\n"
+        "If Gerudo Fortress Carpenters is set to Normal, and Gerudo Fortress Keys is set to anything "
+        "other than Vanilla, then the maximum amount of Key Rings that can be selected by Random or "
+        "Count will be 9. Otherwise, the maximum amount of Key Rings will be 8.";
+    mOptionDescriptions[RSK_GERUDO_KEYS] = "Vanilla - Thieve's Hideout Keys will appear in their vanilla locations.\n"
+                                           "\n"
+                                           "Any dungeon - Thieve's Hideout Keys can only appear inside of any dungon.\n"
+                                           "\n"
+                                           "Overworld - Thieve's Hideout Keys can only appear outside of dungeons.\n"
+                                           "\n"
+                                           "Anywhere - Thieve's Hideout Keys can appear anywhere in the world.";
+    mOptionDescriptions[RSK_BOSS_KEYSANITY] = "Start with - You will start with Boss keys from all dungeons.\n"
+                                              "\n"
+                                              "Vanilla - Boss Keys will appear in their vanilla locations.\n"
+                                              "\n"
+                                              "Own dungeon - Boss Keys can only appear in their respective dungeon.\n"
+                                              "\n"
+                                              "Any dungeon - Boss Keys can only appear inside of any dungon.\n"
+                                              "\n"
+                                              "Overworld - Boss Keys can only appear outside of dungeons.\n"
+                                              "\n"
+                                              "Anywhere - Boss Keys can appear anywhere in the world.";
+    mOptionDescriptions[RSK_GANONS_BOSS_KEY] =
+        "Vanilla - Ganon's Boss Key will appear in the vanilla location.\n"
+        "\n"
+        "Own dungeon - Ganon's Boss Key can appear anywhere inside Ganon's Castle.\n"
+        "\n"
+        "Start with - Places Ganon's Boss Key in your starting inventory."
+        "\n"
+        "Any dungeon - Ganon's Boss Key Key can only appear inside of any dungon.\n"
+        "\n"
+        "Overworld - Ganon's Boss Key Key can only appear outside of dungeons.\n"
+        "\n"
+        "Anywhere - Ganon's Boss Key Key can appear anywhere in the world.\n"
+        "\n"
+        "LACS - These settings put the boss key on the Light Arrow Cutscene location, from Zelda in Temple of Time as "
+        "adult, with differing requirements:\n"
+        "- Vanilla: Obtain the Shadow Medallion and Spirit Medallion\n"
+        "- Stones: Obtain the specified amount of spiritual stones.\n"
+        "- Medallions: Obtain the specified amount of medallions.\n"
+        "- Dungeon rewards: Obtain the specified total sum of spiritual stones or medallions.\n"
+        "- Dungeons: Complete the specified amount of dungeons. Dungeons are considered complete after stepping in to "
+        "the blue warp after the boss.\n"
+        "- Tokens: Obtain the specified amount of Skulltula tokens.\n"
+        "\n"
+        "100 GS Reward - Ganon's Boss Key will be awarded by the cursed rich man after you collect 100 Gold Skulltula "
+        "Tokens.";
+    mOptionDescriptions[RSK_LACS_OPTIONS] =
+        "Standard Rewards - Greg does not change logic, Greg does not help obtain GBK, max "
+        "number of rewards on slider does not change.\n"
+        "\n"
+        "Greg as Reward - Greg does change logic (can be part of expected path for obtaining "
+        "GBK), Greg helps obtain GBK, max number of rewards on slider increases by 1 to "
+        "account for Greg. \n"
+        "\n"
+        "Greg as Wildcard - Greg does not change logic, Greg helps obtain GBK, max number of "
+        "rewards on slider does not change.";
+    mOptionDescriptions[RSK_CUCCO_COUNT] = "The amount of cuccos needed to claim the reward from Anju the cucco lady";
+    mOptionDescriptions[RSK_BIG_POE_COUNT] = "The Poe collector will give a reward for turning in this many Big Poes.";
+    mOptionDescriptions[RSK_SKIP_CHILD_STEALTH] =
+        "The crawlspace into Hyrule Castle goes straight to Zelda, skipping the guards.";
+    mOptionDescriptions[RSK_SKIP_CHILD_ZELDA] =
+        "Start with Zelda's Letter and the item Impa would normally give you and skip the sequence up "
+        "until after meeting Zelda. Disables the ability to shuffle Weird Egg.";
+    mOptionDescriptions[RSK_SKIP_EPONA_RACE] = "Epona can be summoned with Epona's Song without needing to race Ingo.";
+    mOptionDescriptions[RSK_SKIP_TOWER_ESCAPE] =
+        "The tower escape sequence between Ganondorf and Ganon will be skipped.";
+    mOptionDescriptions[RSK_COMPLETE_MASK_QUEST] =
+        "Once the happy mask shop is opened, all masks will be available to be borrowed.";
+    mOptionDescriptions[RSK_SKIP_SCARECROWS_SONG] =
+        "Start with the ability to summon Pierre the scarecrow. Pulling out an ocarina in the usual locations will "
+        "automatically summon him.";
+    mOptionDescriptions[RSK_ITEM_POOL] = "Sets how many major items appear in the item pool.\n"
+                                         "\n"
+                                         "Plentiful - Extra major items are added to the pool.\n"
+                                         "\n"
+                                         "Balanced - Original item pool.\n"
+                                         "\n"
+                                         "Scarce - Some excess items are removed, including health upgrades.\n"
+                                         "\n"
+                                         "Minimal - Most excess items are removed.";
+    mOptionDescriptions[RSK_ICE_TRAPS] = "Sets how many items are replaced by ice traps.\n"
+                                         "\n"
+                                         "Off - No ice traps.\n"
+                                         "\n"
+                                         "Normal - Only Ice Traps from the base item pool are shuffled in.\n"
+                                         "\n"
+                                         "Extra - Chance to replace added junk items with additional ice traps.\n"
+                                         "\n"
+                                         "Mayhem - All added junk items will be Ice Traps.\n"
+                                         "\n"
+                                         "Onslaught - All junk items will be replaced by Ice Traps, even those "
+                                         "in the base pool.";
+    mOptionDescriptions[RSK_GOSSIP_STONE_HINTS] =
+        "Allows Gossip Stones to provide hints on item locations. Hints mentioning "
+        "\"Way of the Hero\" indicate a location that holds an item required to beat "
+        "the seed.\n"
+        "\n"
+        "No hints - No hints will be given at all.\n"
+        "\n"
+        "Need Nothing - Hints are always available from Gossip Stones.\n"
+        "\n"
+        "Need Stone of Agony - Hints are only available after obtaining the Stone of Agony.\n"
+        "\n"
+        "Need Mask of Truth - Hints are only available whilst wearing the Mask of Truth.\n";
+    mOptionDescriptions[RSK_HINT_CLARITY] =
+        "Sets the difficulty of hints.\n"
+        "\n"
+        "Obscure - Hints are unique for each item, but the writing may be cryptic.\n"
+        "Ex: Kokiri Sword > a butter knife\n"
+        "\n"
+        "Ambiguous - Hints are clearly written, but may refer to more than one item.\n"
+        "Ex: Kokiri Sword > a sword\n"
+        "\n"
+        "Clear - Hints are clearly written and are unique for each item.\n"
+        "Ex: Kokiri Sword > the Kokiri Sword";
+    mOptionDescriptions[RSK_HINT_DISTRIBUTION] = "Sets how many hints will be useful.\n"
+                                                 "\n"
+                                                 "Useless - Only junk hints.\n"
+                                                 "\n"
+                                                 "Balanced - Recommended hint spread.\n"
+                                                 "\n"
+                                                 "Strong - More useful hints.\n"
+                                                 "\n"
+                                                 "Very Strong - Many powerful hints.";
+    mOptionDescriptions[RSK_TOT_ALTAR_HINT] =
+        "Reading the Temple of Time altar as child will tell you the locations of the Spiritual Stones.\n"
+        "Reading the Temple of Time altar as adult will tell you the locations of the Medallions, as well as the "
+        "conditions for building the Rainbow Bridge and getting the Boss Key for Ganon's Castle.";
+    mOptionDescriptions[RSK_LIGHT_ARROWS_HINT] =
+        "Talking to Ganondorf in his boss room or Sheik inside Ganon's Castle (when trials are enabled) will tell you "
+        "the location of the Light Arrows."
+        "If this option is enabled and Ganondorf is reachable without Light Arrows, Gossip Stones will never hint the "
+        "Light Arrows.";
+    mOptionDescriptions[RSK_DAMPES_DIARY_HINT] =
+        "Reading the diary of Dampé the gravekeeper as adult will tell you the location of one of the Hookshots.";
+    mOptionDescriptions[RSK_GREG_HINT] =
+        "Talking to the chest game owner after buying a key will tell you the location of Greg the Green Rupee.";
+    mOptionDescriptions[RSK_SARIA_HINT] = "Talking to Saria either in person or through Saria's Song will tell you the "
+                                          "location of a progressive magic meter.";
+    mOptionDescriptions[RSK_FROGS_HINT] = "Standing near the pedestal for the frogs in Zora's River will tell you the "
+                                          "reward for the frogs' ocarina game.";
+    mOptionDescriptions[RSK_WARP_SONG_HINTS] = "Standing near the pedestal for the frogs in Zora's River will tell you "
+                                               "the reward for the frogs' ocarina game.";
+    mOptionDescriptions[RSK_SCRUB_TEXT_HINT] = "Business scrubs will reveal the identity of what they're selling.";
+    mOptionDescriptions[RSK_FULL_WALLETS] = "Start with a full wallet. All wallet upgrades come filled with rupees.";
+    mOptionDescriptions[RSK_BOMBCHUS_IN_LOGIC] =
+        "Bombchus are properly considered in logic.\n"
+        "\n"
+        "The first Bombchu pack will always be 20, and subsequent packs will be "
+        "5 or 10 based on how many you have.\n"
+        "Once found, they can be replenished at the Bombchu shop.\n"
+        "\n"
+        "Bombchu Bowling is opened by obtaining Bombchus.";
+    mOptionDescriptions[RSK_ENABLE_BOMBCHU_DROPS] = "Once you obtain bombchus for the first time, refills can be found "
+                                                    "in bushes and other places where bomb drops can normally spawn.";
+    mOptionDescriptions[RSK_BLUE_FIRE_ARROWS] =
+        "Ice Arrows act like Blue Fire, making them able to melt red ice. "
+        "Item placement logic will respect this option, so it might be required to use this to progress.";
+    mOptionDescriptions[RSK_LIGHT_ARROWS_HINT] =
+        "Light Arrows can be used to light up the sun switches instead of using the Mirror Shield. "
+        "Item placement logic will respect this option, so it might be required to use this to progress.";
+    mOptionDescriptions[RSK_LOGIC_RULES] =
+        "Glitchless - No glitches are required, but may require some minor tricks. Additional tricks may be enabled "
+        "and disabled below.\n"
+        "\n"
+        //"Glitched - Glitches may be required to beat the game. You can disable and enable glitches below.\n"
+        //"\n"
+        "No logic - Item placement is completely random. MAY BE IMPOSSIBLE TO BEAT.";
+    mOptionDescriptions[RSK_ALL_LOCATIONS_REACHABLE] = "When this options is enabled, the randomizer will "
+                                                       "guarantee that every item is obtainable and every "
+                                                       "location is reachable. When disabled, only "
+                                                       "required items and locations to beat the game "
+                                                       "will be guaranteed reachable.";
+    mOptionDescriptions[RSK_ENABLE_GLITCH_CUTSCENES] =
+        "The cutscenes of the Poes in Forest Temple and Darunia in Fire Temple will not be skipped. "
+        "These cutscenes are only useful for glitched gameplay and can be safely skipped otherwise.";
+    mOptionDescriptions[RSK_SHUFFLE_BOSS_SOULS] = "Shuffles 8 boss souls (one for each blue warp dungeon). A boss will not appear until you collect its respective soul."
+                "\n\"On + Ganon\" will also hide Ganon and Ganondorf behind a boss soul.";
+}
+} // namespace Rando
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index 079a14e51..6d1d76e30 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -1642,198 +1642,8 @@ std::thread randoThread;
 void GenerateRandomizerImgui(std::string seed = "") {
     CVarSetInteger("gRandoGenerating", 1);
     CVarSave();
-
-    std::unordered_map<RandomizerSettingKey, u8> cvarSettings;
-    cvarSettings[RSK_LOGIC_RULES] = CVarGetInteger("gRandomizeLogicRules", RO_LOGIC_GLITCHLESS);
-    cvarSettings[RSK_ALL_LOCATIONS_REACHABLE] = CVarGetInteger("gRandomizeAllLocationsReachable", RO_GENERIC_ON);
-    cvarSettings[RSK_FOREST] = CVarGetInteger("gRandomizeForest", RO_FOREST_CLOSED);
-    cvarSettings[RSK_KAK_GATE] = CVarGetInteger("gRandomizeKakarikoGate", RO_KAK_GATE_CLOSED);
-    cvarSettings[RSK_DOOR_OF_TIME] = CVarGetInteger("gRandomizeDoorOfTime", RO_DOOROFTIME_CLOSED);
-    cvarSettings[RSK_ZORAS_FOUNTAIN] = CVarGetInteger("gRandomizeZorasFountain", 0);
-    cvarSettings[RSK_STARTING_AGE] = CVarGetInteger("gRandomizeStartingAge", RO_AGE_CHILD);
-    cvarSettings[RSK_GERUDO_FORTRESS] = CVarGetInteger("gRandomizeGerudoFortress", RO_GF_NORMAL);
-    cvarSettings[RSK_RAINBOW_BRIDGE] = CVarGetInteger("gRandomizeRainbowBridge", RO_BRIDGE_VANILLA);
-    cvarSettings[RSK_RAINBOW_BRIDGE_STONE_COUNT] = CVarGetInteger("gRandomizeStoneCount", 3);
-    cvarSettings[RSK_RAINBOW_BRIDGE_MEDALLION_COUNT] = CVarGetInteger("gRandomizeMedallionCount", 6);
-    cvarSettings[RSK_RAINBOW_BRIDGE_REWARD_COUNT] = CVarGetInteger("gRandomizeRewardCount", 9);
-    cvarSettings[RSK_RAINBOW_BRIDGE_DUNGEON_COUNT] = CVarGetInteger("gRandomizeDungeonCount", 8);
-    cvarSettings[RSK_RAINBOW_BRIDGE_TOKEN_COUNT] = CVarGetInteger("gRandomizeTokenCount", 100);
-    cvarSettings[RSK_BRIDGE_OPTIONS] = CVarGetInteger("gRandomizeBridgeRewardOptions", 0);
-    cvarSettings[RSK_GANONS_TRIALS] = CVarGetInteger("gRandomizeGanonTrial", RO_GANONS_TRIALS_SET_NUMBER);
-    cvarSettings[RSK_TRIAL_COUNT] = CVarGetInteger("gRandomizeGanonTrialCount", 6);
-    cvarSettings[RSK_STARTING_OCARINA] = CVarGetInteger("gRandomizeStartingOcarina", 0);
-    cvarSettings[RSK_SHUFFLE_OCARINA] = CVarGetInteger("gRandomizeShuffleOcarinas", 0) ||
-                                        CVarGetInteger("gRandomizeStartingOcarina", 0);
-    cvarSettings[RSK_STARTING_KOKIRI_SWORD] = CVarGetInteger("gRandomizeStartingKokiriSword", 0);
-    cvarSettings[RSK_SHUFFLE_KOKIRI_SWORD] = CVarGetInteger("gRandomizeShuffleKokiriSword", 0) ||
-                                             CVarGetInteger("gRandomizeStartingKokiriSword", 0);
-    cvarSettings[RSK_SHUFFLE_MASTER_SWORD] = CVarGetInteger("gRandomizeShuffleMasterSword", 0);
-    cvarSettings[RSK_STARTING_DEKU_SHIELD] = CVarGetInteger("gRandomizeStartingDekuShield", 0);
-    cvarSettings[RSK_STARTING_ZELDAS_LULLABY] = CVarGetInteger("gRandomizeStartingZeldasLullaby", 0);
-    cvarSettings[RSK_STARTING_EPONAS_SONG] = CVarGetInteger("gRandomizeStartingEponasSong", 0);
-    cvarSettings[RSK_STARTING_SARIAS_SONG] = CVarGetInteger("gRandomizeStartingSariasSong", 0);
-    cvarSettings[RSK_STARTING_SUNS_SONG] = CVarGetInteger("gRandomizeStartingSunsSong", 0);
-    cvarSettings[RSK_STARTING_SONG_OF_TIME] = CVarGetInteger("gRandomizeStartingSongOfTime", 0);
-    cvarSettings[RSK_STARTING_SONG_OF_STORMS] = CVarGetInteger("gRandomizeStartingSongOfStorms", 0);
-    cvarSettings[RSK_STARTING_MINUET_OF_FOREST] = CVarGetInteger("gRandomizeStartingMinuetOfForest", 0);
-    cvarSettings[RSK_STARTING_BOLERO_OF_FIRE] = CVarGetInteger("gRandomizeStartingBoleroOfFire", 0);
-    cvarSettings[RSK_STARTING_SERENADE_OF_WATER] = CVarGetInteger("gRandomizeStartingSerenadeOfWater", 0);
-    cvarSettings[RSK_STARTING_REQUIEM_OF_SPIRIT] = CVarGetInteger("gRandomizeStartingRequiemOfSpirit", 0);
-    cvarSettings[RSK_STARTING_NOCTURNE_OF_SHADOW] = CVarGetInteger("gRandomizeStartingNocturneOfShadow", 0);
-    cvarSettings[RSK_STARTING_PRELUDE_OF_LIGHT] = CVarGetInteger("gRandomizeStartingPreludeOfLight", 0);
-    cvarSettings[RSK_STARTING_SKULLTULA_TOKEN] = CVarGetInteger("gRandomizeStartingSkulltulaToken", 0);
-    cvarSettings[RSK_SHUFFLE_MAPANDCOMPASS] = CVarGetInteger("gRandomizeStartingMapsCompasses", RO_DUNGEON_ITEM_LOC_OWN_DUNGEON);
-    cvarSettings[RSK_SHUFFLE_DUNGEON_REWARDS] = CVarGetInteger("gRandomizeShuffleDungeonReward", RO_DUNGEON_REWARDS_END_OF_DUNGEON);
-    cvarSettings[RSK_SHUFFLE_SONGS] = CVarGetInteger("gRandomizeShuffleSongs", RO_SONG_SHUFFLE_SONG_LOCATIONS);
-    cvarSettings[RSK_SHUFFLE_TOKENS] = CVarGetInteger("gRandomizeShuffleTokens", RO_TOKENSANITY_OFF);
-    cvarSettings[RSK_SHOPSANITY] = CVarGetInteger("gRandomizeShopsanity", RO_SHOPSANITY_OFF);
-    cvarSettings[RSK_SHOPSANITY_PRICES] = CVarGetInteger("gRandomizeShopsanityPrices", RO_SHOPSANITY_PRICE_BALANCED);
-    cvarSettings[RSK_SHOPSANITY_PRICES_AFFORDABLE] = CVarGetInteger("gRandomizeShopsanityPricesAffordable", RO_SHOPSANITY_OFF);
-    cvarSettings[RSK_SHUFFLE_SCRUBS] = CVarGetInteger("gRandomizeShuffleScrubs", RO_SCRUBS_OFF);
-    cvarSettings[RSK_SHUFFLE_COWS] = CVarGetInteger("gRandomizeShuffleCows", 0);
-    cvarSettings[RSK_SHUFFLE_ADULT_TRADE] = CVarGetInteger("gRandomizeShuffleAdultTrade", 0);
-    cvarSettings[RSK_SHUFFLE_MAGIC_BEANS] = CVarGetInteger("gRandomizeShuffleBeans", 0);
-    cvarSettings[RSK_SHUFFLE_MERCHANTS] = CVarGetInteger("gRandomizeShuffleMerchants", RO_SHUFFLE_MERCHANTS_OFF);
-    cvarSettings[RSK_SHUFFLE_100_GS_REWARD] = CVarGetInteger("gRandomizeShuffle100GSReward", RO_GENERIC_OFF);
-    cvarSettings[RSK_SHUFFLE_BOSS_SOULS] = CVarGetInteger("gRandomizeShuffleBossSouls", RO_BOSS_SOULS_OFF);
-    cvarSettings[RSK_ENABLE_BOMBCHU_DROPS] = CVarGetInteger("gRandomizeEnableBombchuDrops", 0);
-    cvarSettings[RSK_BOMBCHUS_IN_LOGIC] = CVarGetInteger("gRandomizeBombchusInLogic", 0);
-    cvarSettings[RSK_SKIP_CHILD_ZELDA] = CVarGetInteger("gRandomizeSkipChildZelda", 0);
-
-    // if we skip child zelda, we start with zelda's letter, and malon starts
-    // at the ranch, so we should *not* shuffle the weird egg
-    cvarSettings[RSK_SHUFFLE_WEIRD_EGG] = ((CVarGetInteger("gRandomizeSkipChildZelda", 0) == 0) &&
-                                            CVarGetInteger("gRandomizeShuffleWeirdEgg", 0));
-    cvarSettings[RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD] = CVarGetInteger("gRandomizeShuffleGerudoToken", 0);
-    cvarSettings[RSK_SHUFFLE_FROG_SONG_RUPEES] = CVarGetInteger("gRandomizeShuffleFrogSongRupees", 0);
-    cvarSettings[RSK_ITEM_POOL] = CVarGetInteger("gRandomizeItemPool", RO_ITEM_POOL_BALANCED);
-    cvarSettings[RSK_ICE_TRAPS] = CVarGetInteger("gRandomizeIceTraps", RO_ICE_TRAPS_NORMAL);
-    cvarSettings[RSK_TOT_ALTAR_HINT] = CVarGetInteger("gRandomizeAltarHint", RO_GENERIC_ON);
-    cvarSettings[RSK_LIGHT_ARROWS_HINT] = CVarGetInteger("gRandomizeLAHint", RO_GENERIC_ON);
-    cvarSettings[RSK_DAMPES_DIARY_HINT] = CVarGetInteger("gRandomizeDampeHint", RO_GENERIC_OFF);
-    cvarSettings[RSK_GREG_HINT] = CVarGetInteger("gRandomizeGregHint", RO_GENERIC_OFF);
-    cvarSettings[RSK_SARIA_HINT] = CVarGetInteger("gRandomizeSariaHint", RO_GENERIC_OFF);
-    cvarSettings[RSK_FROGS_HINT] = CVarGetInteger("gRandomizeFrogsHint", RO_GENERIC_OFF);
-    cvarSettings[RSK_WARP_SONG_HINTS] = CVarGetInteger("gRandomizeWarpSongText", RO_GENERIC_ON);
-    cvarSettings[RSK_SCRUB_TEXT_HINT] = CVarGetInteger("gRandomizeScrubText", RO_GENERIC_OFF);
-    cvarSettings[RSK_KAK_10_SKULLS_HINT] = CVarGetInteger("gRandomize10GSHint", RO_GENERIC_OFF);
-    cvarSettings[RSK_KAK_20_SKULLS_HINT] = CVarGetInteger("gRandomize20GSHint", RO_GENERIC_OFF);
-    cvarSettings[RSK_KAK_30_SKULLS_HINT] = CVarGetInteger("gRandomize30GSHint", RO_GENERIC_OFF);
-    cvarSettings[RSK_KAK_40_SKULLS_HINT] = CVarGetInteger("gRandomize40GSHint", RO_GENERIC_OFF);
-    cvarSettings[RSK_KAK_50_SKULLS_HINT] = CVarGetInteger("gRandomize50GSHint", RO_GENERIC_OFF);
-    cvarSettings[RSK_GOSSIP_STONE_HINTS] = CVarGetInteger("gRandomizeGossipStoneHints", RO_GOSSIP_STONES_NEED_NOTHING);
-    cvarSettings[RSK_HINT_CLARITY] = CVarGetInteger("gRandomizeHintClarity", RO_HINT_CLARITY_CLEAR);
-    cvarSettings[RSK_HINT_DISTRIBUTION] = CVarGetInteger("gRandomizeHintDistribution", RO_HINT_DIST_BALANCED);
-    cvarSettings[RSK_BLUE_FIRE_ARROWS] = CVarGetInteger("gRandomizeBlueFireArrows", 0);
-    cvarSettings[RSK_SUNLIGHT_ARROWS] = CVarGetInteger("gRandomizeSunlightArrows", 0);
-    cvarSettings[RSK_KEYSANITY] = CVarGetInteger("gRandomizeKeysanity", RO_DUNGEON_ITEM_LOC_OWN_DUNGEON);
-    cvarSettings[RSK_GERUDO_KEYS] = CVarGetInteger("gRandomizeGerudoKeys", RO_GERUDO_KEYS_VANILLA);
-    cvarSettings[RSK_KEYRINGS] = CVarGetInteger("gRandomizeShuffleKeyRings", RO_KEYRINGS_OFF);
-    int maxKeyringCount = (CVarGetInteger("gRandomizeGerudoFortress", RO_GF_NORMAL) == RO_GF_NORMAL &&
-                       CVarGetInteger("gRandomizeGerudoKeys", RO_GERUDO_KEYS_VANILLA) != RO_GERUDO_KEYS_VANILLA) ? 9 : 8;
-    cvarSettings[RSK_KEYRINGS_RANDOM_COUNT] = std::min(CVarGetInteger("gRandomizeShuffleKeyRingsRandomCount", maxKeyringCount), maxKeyringCount);
-    // Don't allow this to be on if Gerudo Fortress Carpenters is anything other than Normal
-    cvarSettings[RSK_KEYRINGS_GERUDO_FORTRESS] =
-        (CVarGetInteger("gRandomizeGerudoFortress", RO_GF_NORMAL) == RO_GF_NORMAL &&
-         CVarGetInteger("gRandomizeGerudoKeys", RO_GERUDO_KEYS_VANILLA) != RO_GERUDO_KEYS_VANILLA)
-            ? CVarGetInteger("gRandomizeShuffleKeyRingsGerudoFortress", RO_GENERIC_OFF) : RO_GENERIC_OFF;
-    cvarSettings[RSK_KEYRINGS_FOREST_TEMPLE] = CVarGetInteger("gRandomizeShuffleKeyRingsForestTemple", 0);
-    cvarSettings[RSK_KEYRINGS_FIRE_TEMPLE] = CVarGetInteger("gRandomizeShuffleKeyRingsFireTemple", 0);
-    cvarSettings[RSK_KEYRINGS_WATER_TEMPLE] = CVarGetInteger("gRandomizeShuffleKeyRingsWaterTemple", 0);
-    cvarSettings[RSK_KEYRINGS_SPIRIT_TEMPLE] = CVarGetInteger("gRandomizeShuffleKeyRingsSpiritTemple", 0);
-    cvarSettings[RSK_KEYRINGS_SHADOW_TEMPLE] = CVarGetInteger("gRandomizeShuffleKeyRingsShadowTemple", 0);
-    cvarSettings[RSK_KEYRINGS_BOTTOM_OF_THE_WELL] = CVarGetInteger("gRandomizeShuffleKeyRingsBottomOfTheWell", 0);
-    cvarSettings[RSK_KEYRINGS_GTG] = CVarGetInteger("gRandomizeShuffleKeyRingsGTG", 0);
-    cvarSettings[RSK_KEYRINGS_GANONS_CASTLE] = CVarGetInteger("gRandomizeShuffleKeyRingsGanonsCastle", 0);
-    cvarSettings[RSK_BOSS_KEYSANITY] = CVarGetInteger("gRandomizeBossKeysanity", RO_DUNGEON_ITEM_LOC_OWN_DUNGEON);
-    cvarSettings[RSK_GANONS_BOSS_KEY] = CVarGetInteger("gRandomizeShuffleGanonBossKey", RO_GANON_BOSS_KEY_VANILLA);
-    cvarSettings[RSK_LACS_STONE_COUNT] = CVarGetInteger("gRandomizeLacsStoneCount", 3);
-    cvarSettings[RSK_LACS_MEDALLION_COUNT] = CVarGetInteger("gRandomizeLacsMedallionCount", 6);
-    cvarSettings[RSK_LACS_REWARD_COUNT] = CVarGetInteger("gRandomizeLacsRewardCount", 9);
-    cvarSettings[RSK_LACS_DUNGEON_COUNT] = CVarGetInteger("gRandomizeLacsDungeonCount", 8);
-    cvarSettings[RSK_LACS_TOKEN_COUNT] = CVarGetInteger("gRandomizeLacsTokenCount", 100);
-    cvarSettings[RSK_LACS_OPTIONS] = CVarGetInteger("gRandomizeLacsRewardOptions", 0);
-    cvarSettings[RSK_STARTING_CONSUMABLES] = CVarGetInteger("gRandomizeStartingConsumables", 0);
-    cvarSettings[RSK_FULL_WALLETS] = CVarGetInteger("gRandomizeFullWallets", 0);
-    
-    // RANDOTODO implement chest minigame shuffle with keysanity
-    cvarSettings[RSK_SHUFFLE_CHEST_MINIGAME] = false;
-
-    cvarSettings[RSK_LANGUAGE] = CVarGetInteger("gLanguages", 0);
-
-    cvarSettings[RSK_CUCCO_COUNT] = CVarGetInteger("gRandomizeCuccosToReturn", 7);
-    cvarSettings[RSK_BIG_POE_COUNT] = CVarGetInteger("gRandomizeBigPoeTargetCount", 10);
-
-    // If we skip child zelda, skip child stealth is pointless, so this needs to be reflected in the spoiler log
-    cvarSettings[RSK_SKIP_CHILD_STEALTH] = !CVarGetInteger("gRandomizeSkipChildZelda", 0) && CVarGetInteger("gRandomizeSkipChildStealth", 0);
-
-    cvarSettings[RSK_SKIP_EPONA_RACE] = CVarGetInteger("gRandomizeSkipEponaRace", 0);
-    cvarSettings[RSK_SKIP_TOWER_ESCAPE] = CVarGetInteger("gRandomizeSkipTowerEscape", 0);
-    cvarSettings[RSK_COMPLETE_MASK_QUEST] = CVarGetInteger("gRandomizeCompleteMaskQuest", 0);
-    cvarSettings[RSK_SKIP_SCARECROWS_SONG] = CVarGetInteger("gRandomizeSkipScarecrowsSong", 0);
-    cvarSettings[RSK_ENABLE_GLITCH_CUTSCENES] = CVarGetInteger("gRandomizeEnableGlitchCutscenes", 0);
-
-    cvarSettings[RSK_SKULLS_SUNS_SONG] = CVarGetInteger("gRandomizeGsExpectSunsSong", 0);
-    // Link's Pocket has to have a dungeon reward if the other rewards are shuffled to end of dungeon.
-    cvarSettings[RSK_LINKS_POCKET] = CVarGetInteger("gRandomizeShuffleDungeonReward", RO_DUNGEON_REWARDS_END_OF_DUNGEON) != RO_DUNGEON_REWARDS_END_OF_DUNGEON ? 
-                                        CVarGetInteger("gRandomizeLinksPocket", RO_LINKS_POCKET_DUNGEON_REWARD) : RO_LINKS_POCKET_DUNGEON_REWARD;
-
-    if (OTRGlobals::Instance->HasMasterQuest() && OTRGlobals::Instance->HasOriginal()) {
-        // If both OTRs are loaded.
-        cvarSettings[RSK_MQ_DUNGEON_RANDOM] = CVarGetInteger("gRandomizeMqDungeons", RO_MQ_DUNGEONS_NONE);
-        cvarSettings[RSK_MQ_DUNGEON_COUNT] = CVarGetInteger("gRandomizeMqDungeonCount", 12);
-    } else if (OTRGlobals::Instance->HasMasterQuest()) {
-        // If only Master Quest is loaded.
-        cvarSettings[RSK_MQ_DUNGEON_RANDOM] = RO_MQ_DUNGEONS_SET_NUMBER;
-        cvarSettings[RSK_MQ_DUNGEON_COUNT] = 12;
-    } else {
-        // If only Original Quest is loaded.
-        cvarSettings[RSK_MQ_DUNGEON_RANDOM] = RO_MQ_DUNGEONS_NONE;
-        cvarSettings[RSK_MQ_DUNGEON_COUNT] = 0;
-    }
-
-    cvarSettings[RSK_TRIFORCE_HUNT] = CVarGetInteger("gRandomizeTriforceHunt", 0);
-    cvarSettings[RSK_TRIFORCE_HUNT_PIECES_TOTAL] = CVarGetInteger("gRandomizeTriforceHuntTotalPieces", 30);
-    cvarSettings[RSK_TRIFORCE_HUNT_PIECES_REQUIRED] = CVarGetInteger("gRandomizeTriforceHuntRequiredPieces", 20);
-    
-    cvarSettings[RSK_MQ_DEKU_TREE] = CVarGetInteger("gRandomizeMqDungeonsDekuTree", RO_MQ_SET_VANILLA);
-    cvarSettings[RSK_MQ_DODONGOS_CAVERN] = CVarGetInteger("gRandomizeMqDungeonsDodongosCavern", RO_MQ_SET_VANILLA);
-    cvarSettings[RSK_MQ_JABU_JABU] = CVarGetInteger("gRandomizeMqDungeonsJabuJabu", RO_MQ_SET_VANILLA);
-    cvarSettings[RSK_MQ_FOREST_TEMPLE] = CVarGetInteger("gRandomizeMqDungeonsForestTemple", RO_MQ_SET_VANILLA);
-    cvarSettings[RSK_MQ_FIRE_TEMPLE] = CVarGetInteger("gRandomizeMqDungeonsFireTemple", RO_MQ_SET_VANILLA);
-    cvarSettings[RSK_MQ_WATER_TEMPLE] = CVarGetInteger("gRandomizeMqDungeonsWaterTemple", RO_MQ_SET_VANILLA);
-    cvarSettings[RSK_MQ_SPIRIT_TEMPLE] = CVarGetInteger("gRandomizeMqDungeonsSpiritTemple", RO_MQ_SET_VANILLA);
-    cvarSettings[RSK_MQ_SHADOW_TEMPLE] = CVarGetInteger("gRandomizeMqDungeonsShadowTemple", RO_MQ_SET_VANILLA);
-    cvarSettings[RSK_MQ_BOTTOM_OF_THE_WELL] = CVarGetInteger("gRandomizeMqDungeonsBottomOfTheWell", RO_MQ_SET_VANILLA);
-    cvarSettings[RSK_MQ_ICE_CAVERN] = CVarGetInteger("gRandomizeMqDungeonsIceCavern", RO_MQ_SET_VANILLA);
-    cvarSettings[RSK_MQ_GTG] = CVarGetInteger("gRandomizeMqDungeonsGTG", RO_MQ_SET_VANILLA);
-    cvarSettings[RSK_MQ_GANONS_CASTLE] = CVarGetInteger("gRandomizeMqDungeonsGanonsCastle", RO_MQ_SET_VANILLA);
-
-    // Enable if any of the entrance rando options are enabled.
-    cvarSettings[RSK_SHUFFLE_ENTRANCES] = CVarGetInteger("gRandomizeShuffleDungeonsEntrances", RO_DUNGEON_ENTRANCE_SHUFFLE_OFF) ||
-                                          CVarGetInteger("gRandomizeShuffleBossEntrances", RO_BOSS_ROOM_ENTRANCE_SHUFFLE_OFF) ||
-                                          CVarGetInteger("gRandomizeShuffleOverworldEntrances", RO_GENERIC_OFF) ||
-                                          CVarGetInteger("gRandomizeShuffleInteriorsEntrances", RO_INTERIOR_ENTRANCE_SHUFFLE_OFF) ||
-                                          CVarGetInteger("gRandomizeShuffleGrottosEntrances", RO_GENERIC_OFF) ||
-                                          CVarGetInteger("gRandomizeShuffleOwlDrops", RO_GENERIC_OFF) ||
-                                          CVarGetInteger("gRandomizeShuffleWarpSongs", RO_GENERIC_OFF) ||
-                                          CVarGetInteger("gRandomizeShuffleOverworldSpawns", RO_GENERIC_OFF);
-
-    cvarSettings[RSK_SHUFFLE_DUNGEON_ENTRANCES] = CVarGetInteger("gRandomizeShuffleDungeonsEntrances", RO_DUNGEON_ENTRANCE_SHUFFLE_OFF);
-    cvarSettings[RSK_SHUFFLE_BOSS_ENTRANCES] = CVarGetInteger("gRandomizeShuffleBossEntrances", RO_BOSS_ROOM_ENTRANCE_SHUFFLE_OFF);
-    cvarSettings[RSK_SHUFFLE_OVERWORLD_ENTRANCES] = CVarGetInteger("gRandomizeShuffleOverworldEntrances", RO_GENERIC_OFF);
-    cvarSettings[RSK_SHUFFLE_INTERIOR_ENTRANCES] = CVarGetInteger("gRandomizeShuffleInteriorsEntrances", RO_INTERIOR_ENTRANCE_SHUFFLE_OFF);
-    cvarSettings[RSK_SHUFFLE_GROTTO_ENTRANCES] = CVarGetInteger("gRandomizeShuffleGrottosEntrances", RO_GENERIC_OFF);
-    cvarSettings[RSK_SHUFFLE_OWL_DROPS] = CVarGetInteger("gRandomizeShuffleOwlDrops", RO_GENERIC_OFF);
-    cvarSettings[RSK_SHUFFLE_WARP_SONGS] = CVarGetInteger("gRandomizeShuffleWarpSongs", RO_GENERIC_OFF);
-    cvarSettings[RSK_SHUFFLE_OVERWORLD_SPAWNS] = CVarGetInteger("gRandomizeShuffleOverworldSpawns", RO_GENERIC_OFF);
-    cvarSettings[RSK_MIXED_ENTRANCE_POOLS] = CVarGetInteger("gRandomizeMixedEntrances", RO_GENERIC_OFF);
-    cvarSettings[RSK_MIX_DUNGEON_ENTRANCES] = CVarGetInteger("gRandomizeMixDungeons", RO_GENERIC_OFF);
-    cvarSettings[RSK_MIX_OVERWORLD_ENTRANCES] = CVarGetInteger("gRandomizeMixOverworld", RO_GENERIC_OFF);
-    cvarSettings[RSK_MIX_INTERIOR_ENTRANCES] = CVarGetInteger("gRandomizeMixInteriors", RO_GENERIC_OFF);
-    cvarSettings[RSK_MIX_GROTTO_ENTRANCES] = CVarGetInteger("gRandomizeMixGrottos", RO_GENERIC_OFF);
-    cvarSettings[RSK_DECOUPLED_ENTRANCES] = CVarGetInteger("gRandomizeDecoupleEntrances", RO_GENERIC_OFF);
-
+    auto ctx = Rando::Context::GetInstance();
+    ctx->GetSettings()->SetAllFromCVar();
     // todo: this efficently when we build out cvar array support
     std::set<RandomizerCheck> excludedLocations;
     std::stringstream excludedLocationStringStream(CVarGetString("gRandomizeExcludedLocations", ""));
@@ -1856,7 +1666,6 @@ void GenerateRandomizerImgui(std::string seed = "") {
     RandomizerCheckObjects::UpdateImGuiVisibility();
 
     // Remove excludes for locations that are no longer allowed to be excluded
-    auto ctx = Rando::Context::GetInstance();
     for (auto& location : Rando::StaticData::GetLocationTable()) {
         auto elfound = excludedLocations.find(location.GetRandomizerCheck());
         if (!ctx->GetItemLocation(location.GetRandomizerCheck())->IsVisible() && elfound != excludedLocations.end()) {
@@ -1864,7 +1673,7 @@ void GenerateRandomizerImgui(std::string seed = "") {
         }
     }
 
-    RandoMain::GenerateRando(cvarSettings, excludedLocations, enabledTricks, seed);
+    RandoMain::GenerateRando(excludedLocations, enabledTricks, seed);
 
     CVarSetInteger("gRandoGenerating", 0);
     CVarSave();
@@ -1892,73 +1701,6 @@ void RandomizerSettingsWindow::DrawElement() {
         randoThread.join();
     }
 
-    // Randomizer settings
-    // Logic Settings
-    static const char* randoLogicRules[2] = { "Glitchless", "No logic" };
-
-    // Open Settings
-    static const char* randoForest[3] = { "Closed", "Closed Deku", "Open" };
-    static const char* randoKakarikoGate[2] = { "Closed", "Open" };
-    static const char* randoDoorOfTime[3] = { "Closed", "Song only", "Open" };
-    static const char* randoZorasFountain[3] = { "Closed", "Closed as child", "Open" };
-    static const char* randoGerudoFortress[3] = { "Normal", "Fast", "Open" };
-    static const char* randoRainbowBridge[8] = { "Vanilla", "Always open", "Stones", "Medallions",
-                                          "Dungeon rewards", "Dungeons", "Tokens", "Greg" };
-    static const char* randoBridgeRewardOptions[3] = { "Standard Rewards", "Greg as Reward", "Greg as Wildcard" };
-    static const char* randoGanonsTrial[3] = { "Skip", "Set Number", "Random Number" };
-    static const char* randoMqDungeons[4] = { "None", "Set Number", "Random Number", "Selection Only" };
-    static const char* randoMqDungeonOptions[3] = {"Vanilla", "Master Quest", "Random"};
-
-    // World Settings
-    static const char* randoStartingAge[3] = { "Child", "Adult", "Random" };
-    static const char* randoShuffleDungeonsEntrances[3] = { "Off", "On", "On + Ganon" };
-    static const char* randoShuffleBossEntrances[3] = { "Off", "Age Restricted", "Full" };
-    static const char* randoShuffleInteriorsEntrances[3] = { "Off", "Simple", "All" };
-    static const char* randoBombchusInLogic[2] = { "Off", "On" };
-    static const char* randoAmmoDrops[3] = { "On + Bombchu", "Off", "On" };
-    static const char* randoHeartDropsAndRefills[4] = { "On", "No Drop", "No Refill", "Off" };
-
-    // Shuffle Settings
-    static const char* randoShuffleDungeonRewards[4] = { "End of dungeons", "Any dungeon", "Overworld", "Anywhere" };
-    static const char* randoLinksPocket[4] = { "Dungeon Reward", "Advancement", "Anything", "Nothing" };
-    static const char* randoShuffleSongs[3] = { "Song Locations", "Dungeon Rewards", "Anywhere" };
-    static const char* randoShopsanity[7] = { "Off", "0 Items", "1 Item", "2 Items", "3 Items", "4 Items", "Random" };
-    static const char* randoShopsanityPrices[5] = { "Balanced", "Starter Wallet", "Adult Wallet", "Giant's Wallet", "Tycoon's Wallet" };
-    static const char* randoTokensanity[4] = { "Off", "Dungeons", "Overworld", "All Tokens" };
-    static const char* randoShuffleScrubs[4] = { "Off", "Affordable", "Expensive", "Random Prices" };
-    static const char* randoShuffleMerchants[3] = { "Off", "On (no hints)", "On (with hints)" };
-    static const char* randoShuffleBossSouls[3] = { "Off", "On", "On + Ganon"};
-
-    // Shuffle Dungeon Items Settings
-    static const char* randoShuffleMapsAndCompasses[6] = { "Start With",  "Vanilla",   "Own Dungeon",
-                                                    "Any Dungeon", "Overworld", "Anywhere" };
-    static const char* randoShuffleSmallKeys[6] = { "Start With",  "Vanilla",   "Own Dungeon",
-                                             "Any Dungeon", "Overworld", "Anywhere" };
-    static const char* randoShuffleGerudoFortressKeys[4] = { "Vanilla", "Any Dungeon", "Overworld", "Anywhere" };
-    static const char* randoShuffleBossKeys[6] = { "Start With",  "Vanilla",   "Own Dungeon",
-                                            "Any Dungeon", "Overworld", "Anywhere" };
-    static const char* randoShuffleGanonsBossKey[13] = {"Vanilla", "Own dungeon", "Start with", 
-                                                "Any Dungeon", "Overworld", "Anywhere", 
-                                                "LACS-Vanilla", "LACS-Stones", "LACS-Medallions", 
-                                                "LACS-Rewards", "LACS-Dungeons", "LACS-Tokens",
-                                                "100 GS Reward"};
-    static const char* randoLACSRewardOptions[3] = { "Standard Reward", "Greg as Reward", "Greg as Wildcard" };
-    static const char* randoShuffleKeyRings[4] = { "Off", "Random", "Count", "Selection" };
-
-    // Misc Settings
-    static const char* randoGossipStoneHints[4] = { "No Hints", "Need Nothing", "Mask of Truth", "Stone of Agony" };
-    static const char* randoHintClarity[3] = { "Obscure", "Ambiguous", "Clear" };
-    static const char* randoHintDistribution[4] = { "Useless", "Balanced", "Strong", "Very Strong" };
-    static const char* randoStartingTime[2] = { "Day", "Night" };
-    static const char* randoRandomTrapDamage[3] = { "Basic", "Advanced", "Off" };
-
-    // Item Pool Settings
-    static const char* randoItemPool[4] = { "Plentiful", "Balanced", "Scarce", "Minimal" };
-    static const char* randoIceTraps[5] = { "Off", "Normal", "Extra", "Mayhem", "Onslaught" };
-
-    static int maxKeyringCount;
-    static bool disableGFKeyring = false;
-
     ImGui::SetNextWindowSize(ImVec2(920, 600), ImGuiCond_FirstUseEver);
     if (!ImGui::Begin("Randomizer Editor", &mIsVisible, ImGuiWindowFlags_NoFocusOnAppearing)) {
         ImGui::End();
@@ -2013,567 +1755,8 @@ void RandomizerSettingsWindow::DrawElement() {
     if (ImGui::BeginTabBar("Randomizer Settings", ImGuiTabBarFlags_NoCloseWithMiddleMouseButton)) {
         if (ImGui::BeginTabItem("World")) {
             ImGui::PushStyleVar(ImGuiStyleVar_CellPadding, cellPadding);
-            if (ImGui::BeginTable("tableRandoWorld", 3, ImGuiTableFlags_BordersH | ImGuiTableFlags_BordersV)) {
-                ImGui::TableSetupColumn("Area Access", ImGuiTableColumnFlags_WidthStretch, 200.0f);
-                ImGui::TableSetupColumn("World Settings", ImGuiTableColumnFlags_WidthStretch, 200.0f);
-                ImGui::TableSetupColumn("Shuffle Entrances", ImGuiTableColumnFlags_WidthStretch, 200.0f);
-                ImGui::PushItemFlag(ImGuiItemFlags_Disabled, true);
-                ImGui::TableHeadersRow();
-                ImGui::PopItemFlag();
-                ImGui::TableNextRow();
-
-                // COLUMN 1 - Area Access
-                ImGui::TableNextColumn();
-                window->DC.CurrLineTextBaseOffset = 0.0f;
-                ImGui::BeginChild("ChildOpenSettings", ImVec2(0, -8));
-                ImGui::PushItemWidth(-FLT_MIN);
-
-                // Forest
-                ImGui::Text("%s", ctx->GetOption(RSK_FOREST).GetName().c_str());
-                UIWidgets::InsertHelpHoverText(
-                    "Closed - Kokiri sword & shield are required to access "
-                    "the Deku Tree, and completing the Deku Tree is required to "
-                    "access the Hyrule Field exit.\n"
-                    "\n"
-                    "Closed Deku - Kokiri boy no longer blocks the path to Hyrule "
-                    "Field but Mido still requires the Kokiri sword and Deku shield "
-                    "to access the tree.\n"
-                    "\n"
-                    "Open - Mido no longer blocks the path to the Deku Tree. Kokiri "
-                    "boy no longer blocks the path out of the forest."
-                );
-                UIWidgets::EnhancementCombobox("gRandomizeForest", randoForest, RO_FOREST_CLOSED);
-
-                UIWidgets::PaddedSeparator();
-
-                // Kakariko Gate
-                ImGui::Text("%s", ctx->GetOption(RSK_KAK_GATE).GetName().c_str());
-                UIWidgets::InsertHelpHoverText(
-                    "Closed - The gate will remain closed until Zelda's letter "
-                    "is shown to the guard.\n"
-                    "\n"
-                    "Open - The gate is always open. The happy mask shop "
-                    "will open immediately after obtaining Zelda's letter."
-                );
-                UIWidgets::EnhancementCombobox("gRandomizeKakarikoGate", randoKakarikoGate, RO_KAK_GATE_CLOSED);
-
-                UIWidgets::PaddedSeparator();
-
-                // Door of Time
-                ImGui::Text("%s", ctx->GetOption(RSK_DOOR_OF_TIME).GetName().c_str());
-                UIWidgets::InsertHelpHoverText(
-                    "Closed - The Ocarina of Time, the Song of Time and all "
-                    "three spiritual stones are required to open the Door of Time.\n"
-                    "\n"
-                    "Song only - Play the Song of Time in front of the Door of "
-                    "Time to open it.\n"
-                    "\n"
-                    "Open - The Door of Time is permanently open with no requirements."
-                );
-                UIWidgets::EnhancementCombobox("gRandomizeDoorOfTime", randoDoorOfTime, RO_DOOROFTIME_CLOSED);
-
-                UIWidgets::PaddedSeparator();
-
-                // Zora's Fountain
-                ImGui::Text("%s", ctx->GetOption(RSK_ZORAS_FOUNTAIN).GetName().c_str());
-                UIWidgets::InsertHelpHoverText(
-                    "Closed - King Zora obstructs the way to Zora's Fountain. "
-                    "Ruto's letter must be shown as child Link in order to move "
-                    "him in both time periods.\n"
-                    "\n"
-                    "Closed as child - Ruto's Letter is only required to move King Zora "
-                    "as child Link. Zora's Fountain starts open as adult.\n"
-                    "\n"
-                    "Open - King Zora has already mweeped out of the way in both "
-                    "time periods. Ruto's Letter is removed from the item pool."
-                );
-                UIWidgets::EnhancementCombobox("gRandomizeZorasFountain", randoZorasFountain, RO_ZF_CLOSED);
-
-                UIWidgets::PaddedSeparator();
-
-                ImGui::EndChild();
-
-                // COLUMN 2 - World Settings
-                ImGui::TableNextColumn();
-                window->DC.CurrLineTextBaseOffset = 0.0f;
-                ImGui::BeginChild("ChildMiscWorldSettings", ImVec2(0,-8));
-                ImGui::PushItemWidth(-FLT_MIN);
-
-                //Starting Age
-                //Disabled when Forest is set to Closed or under very specific conditions
-                bool disableRandoStartingAge = CVarGetInteger("gRandomizeForest", RO_FOREST_CLOSED) == RO_FOREST_CLOSED || 
-                    ((CVarGetInteger("gRandomizeDoorOfTime", RO_DOOROFTIME_CLOSED) == RO_DOOROFTIME_CLOSED) &&
-                    (CVarGetInteger("gRandomizeShuffleOcarinas", RO_GENERIC_OFF) == RO_GENERIC_OFF)); // closed door of time with ocarina shuffle off
-
-                static const char* disableRandoStartingAgeText = "This option is disabled due to other options making the game unbeatable.";
-                ImGui::Text("%s", ctx->GetOption(RSK_STARTING_AGE).GetName().c_str());
-                UIWidgets::InsertHelpHoverText(
-                    "Choose which age Link will start as.\n\n"
-                    "Starting as adult means you start with the Master Sword in your inventory.\n"
-                    "The child option is forcefully set if it would conflict with other options."
-                );
-                UIWidgets::EnhancementCombobox("gRandomizeStartingAge", randoStartingAge, RO_AGE_CHILD, disableRandoStartingAge, disableRandoStartingAgeText, RO_AGE_CHILD);
-
-                UIWidgets::PaddedSeparator();
-
-                // Gerudo Fortress
-                ImGui::Text("Gerudo Fortress Carpenters");
-                UIWidgets::InsertHelpHoverText(
-                    "Sets the amount of carpenters required to repair the bridge "
-                    "in Gerudo Valley.\n"
-                    "\n"
-                    "Normal - All 4 carpenters are required to be saved.\n"
-                    "\n"
-                    "Fast - Only the bottom left carpenter requires rescuing.\n"
-                    "\n"
-                    "Open - The bridge is repaired from the start.\n"
-                    "\n"
-                    "Only \"Normal\" is compatible with Gerudo Fortress Key Rings."
-                );
-                UIWidgets::EnhancementCombobox("gRandomizeGerudoFortress", randoGerudoFortress, RO_GF_NORMAL);
-
-                UIWidgets::PaddedSeparator();
-
-                // Rainbow Bridge
-                ImGui::Text("Rainbow Bridge Requirements");
-                UIWidgets::InsertHelpHoverText(
-                    "Alters the requirements to open the bridge to Ganon's Castle.\n"
-                    "\n"
-                    "Vanilla - Obtain the Shadow Medallion, Spirit Medallion and Light Arrows.\n"
-                    "\n"
-                    "Always open - No requirements.\n"
-                    "\n"
-                    "Stones - Obtain the specified amount of spiritual stones.\n"
-                    "\n"
-                    "Medallions - Obtain the specified amount of medallions.\n"
-                    "\n"
-                    "Dungeon rewards - Obtain the specified total sum of spiritual "
-                    "stones or medallions.\n"
-                    "\n"
-                    "Dungeons - Complete the specified amount of dungeons. Dungeons "
-                    "are considered complete after stepping in to the blue warp after "
-                    "the boss.\n"
-                    "\n"
-                    "Tokens - Obtain the specified amount of Skulltula tokens.\n"
-                    "\n"
-                    "Greg - Find Greg the Green Rupee."
-                );
-
-                UIWidgets::EnhancementCombobox("gRandomizeRainbowBridge", randoRainbowBridge, RO_BRIDGE_VANILLA);
-                ImGui::PopItemWidth();
-                switch (CVarGetInteger("gRandomizeRainbowBridge", RO_BRIDGE_VANILLA)) {
-                    case RO_BRIDGE_ALWAYS_OPEN:
-                        break;
-                    case RO_BRIDGE_VANILLA:
-                        break;
-                    case RO_BRIDGE_STONES:
-                         ImGui::Text("Reward Options");
-                        UIWidgets::InsertHelpHoverText(
-                            "Standard Rewards - Greg does not change logic, Greg does not help open the bridge, max "
-                            "number of rewards on slider does not change.\n"
-                            "\n"
-                            "Greg as Reward - Greg does change logic (can be part of expected path for opening "
-                            "bridge), Greg helps open bridge, max number of rewards on slider increases by 1 to "
-                            "account for Greg. \n"
-                            "\n"
-                            "Greg as Wildcard - Greg does not change logic, Greg helps open the bridge, max number of "
-                            "rewards on slider does not change.");
-
-                        UIWidgets::EnhancementCombobox("gRandomizeBridgeRewardOptions", randoBridgeRewardOptions, RO_BRIDGE_STANDARD_REWARD);
-                        switch (CVarGetInteger("gRandomizeBridgeRewardOptions", RO_BRIDGE_STANDARD_REWARD)) {
-                            case RO_BRIDGE_STANDARD_REWARD:
-                                UIWidgets::PaddedEnhancementSliderInt("Stone Count: %d", "##RandoStoneCount",
-                                                                "gRandomizeStoneCount", 1, 3, "", 3, true, true, false);
-                                break;
-                            case RO_BRIDGE_GREG_REWARD:
-                                UIWidgets::PaddedEnhancementSliderInt("Stone Count: %d", "##RandoStoneCount",
-                                                                "gRandomizeStoneCount", 1, 4, "", 4, true, true, false);
-                                break;
-                            case RO_BRIDGE_WILDCARD_REWARD:
-                                UIWidgets::PaddedEnhancementSliderInt("Stone Count: %d", "##RandoStoneCount",
-                                                                "gRandomizeStoneCount", 1, 3, "", 3, true, true, false);
-                                break;
-                        }
-                        break;
-                    case RO_BRIDGE_MEDALLIONS:
-                        ImGui::Text("Reward Options");
-                        UIWidgets::InsertHelpHoverText(
-                            "Standard Rewards - Greg does not change logic, Greg does not help open the bridge, max "
-                            "number of rewards on slider does not change.\n"
-                            "\n"
-                            "Greg as Reward - Greg does change logic (can be part of expected path for opening "
-                            "bridge), Greg helps open bridge, max number of rewards on slider increases by 1 to "
-                            "account for Greg. \n"
-                            "\n"
-                            "Greg as Wildcard - Greg does not change logic, Greg helps open the bridge, max number of "
-                            "rewards on slider does not change.");
-
-                        UIWidgets::EnhancementCombobox("gRandomizeBridgeRewardOptions", randoBridgeRewardOptions, RO_BRIDGE_STANDARD_REWARD);
-                        switch (CVarGetInteger("gRandomizeBridgeRewardOptions", RO_BRIDGE_STANDARD_REWARD)) {
-                            case RO_BRIDGE_STANDARD_REWARD:
-                                UIWidgets::PaddedEnhancementSliderInt("Medallion Count: %d", "##RandoMedallionCount",
-                                                                "gRandomizeMedallionCount", 1, 6, "", 6, true, true, false);
-                                break;
-                            case RO_BRIDGE_GREG_REWARD:
-                                UIWidgets::PaddedEnhancementSliderInt("Medallion Count: %d", "##RandoMedallionCount",
-                                                                "gRandomizeMedallionCount", 1, 7, "", 7, true, true, false);
-                                break;
-                            case RO_BRIDGE_WILDCARD_REWARD:
-                                UIWidgets::PaddedEnhancementSliderInt("Medallion Count: %d", "##RandoMedallionCount",
-                                                                "gRandomizeMedallionCount", 1, 6, "", 6, true, true, false);
-                                break;
-                        }
-                        break;
-                    case RO_BRIDGE_DUNGEON_REWARDS:
-                        ImGui::Text("Reward Options");
-                        UIWidgets::InsertHelpHoverText(
-                            "Standard Rewards - Greg does not change logic, Greg does not help open the bridge, max "
-                            "number of rewards on slider does not change.\n"
-                            "\n"
-                            "Greg as Reward - Greg does change logic (can be part of expected path for opening "
-                            "bridge), Greg helps open bridge, max number of rewards on slider increases by 1 to "
-                            "account for Greg. \n"
-                            "\n"
-                            "Greg as Wildcard - Greg does not change logic, Greg helps open the bridge, max number of "
-                            "rewards on slider does not change.");
-
-                        UIWidgets::EnhancementCombobox("gRandomizeBridgeRewardOptions", randoBridgeRewardOptions, RO_BRIDGE_STANDARD_REWARD);
-                        switch (CVarGetInteger("gRandomizeBridgeRewardOptions", RO_BRIDGE_STANDARD_REWARD)) {
-                            case RO_BRIDGE_STANDARD_REWARD:
-                                UIWidgets::PaddedEnhancementSliderInt("Reward Count: %d", "##RandoRewardCount",
-                                                                "gRandomizeRewardCount", 1, 9, "", 9, true, true, false);
-                                break;
-                            case RO_BRIDGE_GREG_REWARD:
-                                UIWidgets::PaddedEnhancementSliderInt("Reward Count: %d", "##RandoRewardCount",
-                                                                "gRandomizeRewardCount", 1, 10, "", 10, true, true, false);
-                                break;
-                            case RO_BRIDGE_WILDCARD_REWARD:
-                                UIWidgets::PaddedEnhancementSliderInt("Reward Count: %d", "##RandoRewardCount",
-                                                                "gRandomizeRewardCount", 1, 9, "", 9, true, true, false);
-
-                                break;
-                        }
-                        break;
-                    case RO_BRIDGE_DUNGEONS:
-                        ImGui::Text("Reward Options");
-                        UIWidgets::InsertHelpHoverText(
-                            "Standard Rewards - Greg does not change logic, Greg does not help open the bridge, max "
-                            "number of rewards on slider does not change.\n"
-                            "\n"
-                            "Greg as Reward - Greg does change logic (can be part of expected path for opening "
-                            "bridge), Greg helps open bridge, max number of rewards on slider increases by 1 to "
-                            "account for Greg. \n"
-                            "\n"
-                            "Greg as Wildcard - Greg does not change logic, Greg helps open the bridge, max number of "
-                            "rewards on slider does not change.");
-
-                        UIWidgets::EnhancementCombobox("gRandomizeBridgeRewardOptions", randoBridgeRewardOptions, RO_BRIDGE_STANDARD_REWARD);
-                        switch (CVarGetInteger("gRandomizeBridgeRewardOptions", RO_BRIDGE_STANDARD_REWARD)) {
-                            case RO_BRIDGE_STANDARD_REWARD:
-                                UIWidgets::PaddedEnhancementSliderInt("Dungeon Count: %d", "##RandoDungeonCount",
-                                                                "gRandomizeDungeonCount", 1, 8, "", 8, true, true, false);
-                                break;
-                            case RO_BRIDGE_GREG_REWARD:
-                                UIWidgets::PaddedEnhancementSliderInt("Dungeon Count: %d", "##RandoDungeonCount",
-                                                                "gRandomizeDungeonCount", 1, 9, "", 9, true, true, false);
-                                break;
-                            case RO_BRIDGE_WILDCARD_REWARD:
-                                UIWidgets::PaddedEnhancementSliderInt("Dungeon Count: %d", "##RandoDungeonCount",
-                                                                "gRandomizeDungeonCount", 1, 8, "", 8, true, true, false);
-                                break;
-                        }
-                        break;
-                    case RO_BRIDGE_TOKENS:
-                        UIWidgets::PaddedEnhancementSliderInt("Token Count: %d", "##RandoTokenCount",
-                                                        "gRandomizeTokenCount", 1, 100, "", 100, true, true, false);
-                        break;
-                    case RO_BRIDGE_GREG:
-                        break;
-                }
-
-                UIWidgets::PaddedSeparator();
-
-                // Ganon's Trials
-                ImGui::PushItemWidth(-FLT_MIN);
-                ImGui::Text("Ganon's Trials");
-                UIWidgets::InsertHelpHoverText(
-                    "Sets the number of Ganon's Trials required to dispel the barrier.\n"
-                    "\n"
-                    "Skip - No Trials are required and the barrier is already dispelled.\n"
-                    "\n"
-                    "Set Number - Select a number of trials that will be required from the"
-                    "slider below. Which specific trials you need to complete will be random.\n"
-                    "\n"
-                    "Random Number - A Random number and set of trials will be required."
-                );
-                UIWidgets::EnhancementCombobox("gRandomizeGanonTrial", randoGanonsTrial, RO_GANONS_TRIALS_SET_NUMBER);
-                ImGui::PopItemWidth();
-                if (CVarGetInteger("gRandomizeGanonTrial", RO_GANONS_TRIALS_SET_NUMBER) == RO_GANONS_TRIALS_SET_NUMBER) {
-                    UIWidgets::PaddedEnhancementSliderInt("Ganon's Trial Count: %d", "##RandoTrialCount",
-                                                    "gRandomizeGanonTrialCount", 1, 6, "", 6, true, true, false);
-                    UIWidgets::InsertHelpHoverText("Set the number of trials required to enter Ganon's Tower.");
-                }
-
-                UIWidgets::PaddedSeparator();
-
-                // Master Quest Dungeons
-                if (OTRGlobals::Instance->HasMasterQuest() && OTRGlobals::Instance->HasOriginal()) {
-                    ImGui::PushItemWidth(-FLT_MIN);
-                    ImGui::Text("Master Quest Dungeons");
-                    UIWidgets::InsertHelpHoverText(
-                        "Sets the number of Master Quest Dungeons that are shuffled into the pool.\n"
-                        "\n"
-                        "None - All Dungeons will be their Vanilla versions.\n"
-                        "\n"
-                        "Set Number - Select a number of dungeons that will be their Master Quest versions "
-                        "using the slider below. Which dungeons are set to be the Master Quest variety will be random.\n"
-                        "\n"
-                        "Random Number - A Random number and set of dungeons will be their Master Quest varieties.\n"
-                        "\n"
-                        "Selection Only - Specify which dungeons are Vanilla or Master Quest."
-                    );
-                    UIWidgets::EnhancementCombobox("gRandomizeMqDungeons", randoMqDungeons, RO_MQ_DUNGEONS_NONE);
-                    ImGui::PopItemWidth();
-                    if (CVarGetInteger("gRandomizeMqDungeons", RO_MQ_DUNGEONS_NONE) == RO_MQ_DUNGEONS_SET_NUMBER) {
-                        UIWidgets::PaddedEnhancementSliderInt(
-                            "Master Quest Dungeon Count: %d", "##RandoMqDungeonCount", "gRandomizeMqDungeonCount", 1,
-                            12, "", CVarGetInteger("gRandomizeMqDungeonCount", 12), true, true, false);
-                    }
-                    if (CVarGetInteger("gRandomizeMqDungeons", RO_MQ_DUNGEONS_NONE) != RO_MQ_DUNGEONS_NONE) {
-                        UIWidgets::EnhancementCheckbox(
-                            ctx->GetOption(RSK_MQ_DUNGEON_SET).GetName().c_str(), "gRandomizeMqDungeonsSelection",
-                            CVarGetInteger("gRandomizeMqDungeons", RO_MQ_DUNGEONS_NONE) == RO_MQ_DUNGEONS_SELECTION,
-                            "This option is enabled because Master Quest Dungeons is set to Selection Only",
-                            UIWidgets::CheckboxGraphics::Checkmark);
-                        UIWidgets::InsertHelpHoverText(
-                            "Choose specific Dungeons to be Master Quest or Vanilla.\n"
-                            "\n"
-                            "If Master Quest Dungeons is set to Set Number or Random, the dungeons chosen "
-                            "to be Master Quest here will count towards that total. Any Dungeons set to Vanilla "
-                            "here will be guaranteed to be Vanilla. If Set Number is higher than the amount of dungeons "
-                            "set to either MQ or Random here, you will have fewer MQ Dungeons than the number you "
-                            "set.");
-                        if (CVarGetInteger("gRandomizeMqDungeonsSelection", RO_GENERIC_OFF) == RO_GENERIC_ON) {
-                            UIWidgets::PaddedText("Deku Tree", true, false);
-                            UIWidgets::EnhancementCombobox("gRandomizeMqDungeonsDekuTree", randoMqDungeonOptions, RO_MQ_SET_VANILLA);
-                            UIWidgets::PaddedText("Dodongo's Cavern", true, false);
-                            UIWidgets::EnhancementCombobox("gRandomizeMqDungeonsDodongosCavern", randoMqDungeonOptions, RO_MQ_SET_VANILLA);
-                            UIWidgets::PaddedText("Jabu Jabu's Belly", true, false);
-                            UIWidgets::EnhancementCombobox("gRandomizeMqDungeonsJabuJabu", randoMqDungeonOptions, RO_MQ_SET_VANILLA);
-                            UIWidgets::PaddedText("Forest Temple", true, false);
-                            UIWidgets::EnhancementCombobox("gRandomizeMqDungeonsForestTemple", randoMqDungeonOptions, RO_MQ_SET_VANILLA);
-                            UIWidgets::PaddedText("Fire Temple", true, false);
-                            UIWidgets::EnhancementCombobox("gRandomizeMqDungeonsFireTemple", randoMqDungeonOptions, RO_MQ_SET_VANILLA);
-                            UIWidgets::PaddedText("Water Temple", true, false);
-                            UIWidgets::EnhancementCombobox("gRandomizeMqDungeonsWaterTemple", randoMqDungeonOptions, RO_MQ_SET_VANILLA);
-                            UIWidgets::PaddedText("Spirit Temple", true, false);
-                            UIWidgets::EnhancementCombobox("gRandomizeMqDungeonsSpiritTemple", randoMqDungeonOptions, RO_MQ_SET_VANILLA);
-                            UIWidgets::PaddedText("Shadow Temple", true, false);
-                            UIWidgets::EnhancementCombobox("gRandomizeMqDungeonsShadowTemple", randoMqDungeonOptions, RO_MQ_SET_VANILLA);
-                            UIWidgets::PaddedText("Bottom of the Well", true, false);
-                            UIWidgets::EnhancementCombobox("gRandomizeMqDungeonsBottomOfTheWell", randoMqDungeonOptions, RO_MQ_SET_VANILLA);
-                            UIWidgets::PaddedText("Ice Cavern", true, false);
-                            UIWidgets::EnhancementCombobox("gRandomizeMqDungeonsIceCavern", randoMqDungeonOptions, RO_MQ_SET_VANILLA);
-                            UIWidgets::PaddedText("Gerudo Training Grounds", true, false);
-                            UIWidgets::EnhancementCombobox("gRandomizeMqDungeonsGTG", randoMqDungeonOptions, RO_MQ_SET_VANILLA);
-                            UIWidgets::PaddedText("Ganon's Castle", true, false);
-                            UIWidgets::EnhancementCombobox("gRandomizeMqDungeonsGanonsCastle", randoMqDungeonOptions, RO_MQ_SET_VANILLA);
-                        }
-                    }
-
-                    UIWidgets::PaddedSeparator();
-                }
-
-                // Triforce Hunt
-                UIWidgets::EnhancementCheckbox("Triforce Hunt", "gRandomizeTriforceHunt");
-                UIWidgets::InsertHelpHoverText(
-                    "Pieces of the Triforce of Courage have been scattered across the world. Find them all to finish the game!\n\n"
-                    "When the required amount of pieces have been found, the game is saved and Ganon's Boss key is given "
-                    "to you when you load back into the game if you desire to beat Ganon afterwards.\n\n"
-                    "Keep in mind Ganon might not be logically beatable when \"All Locations Reachable\" is turned off."
-                );
-
-                if (CVarGetInteger("gRandomizeTriforceHunt", 0)) {
-                    // Triforce Hunt (total pieces)
-                    UIWidgets::Spacer(0);
-                    int totalPieces = CVarGetInteger("gRandomizeTriforceHuntTotalPieces", 30);
-                    ImGui::Text("Triforce Pieces in the world: %d", totalPieces);
-                    UIWidgets::InsertHelpHoverText(
-                        "The amount of Triforce pieces that will be placed in the world. "
-                        "Keep in mind seed generation can fail if more pieces are placed than there are junk items in the item pool."
-                    );
-                    ImGui::SameLine();
-                    UIWidgets::EnhancementSliderInt("", "##TriforceHuntTotalPieces", "gRandomizeTriforceHuntTotalPieces", 1, 100, "", 30);
-
-                    // Triforce Hunt (required pieces)
-                    int requiredPieces = CVarGetInteger("gRandomizeTriforceHuntRequiredPieces", 20);
-                    ImGui::Text("Triforce Pieces to win: %d", requiredPieces);
-                    UIWidgets::InsertHelpHoverText(
-                        "The amount of Triforce pieces required to win the game."
-                    );
-                    ImGui::SameLine();
-                    UIWidgets::EnhancementSliderInt("", "##TriforceHuntRequiredPieces", "gRandomizeTriforceHuntRequiredPieces", 1, totalPieces, "", 20);
-                }
-
-                UIWidgets::PaddedSeparator();
-
-                ImGui::EndChild();
-
-                // COLUMN 3 - Shuffle Entrances
-                ImGui::TableNextColumn();
-                window->DC.CurrLineTextBaseOffset = 0.0f;
-                ImGui::BeginChild("ChildShuffleEntrances", ImVec2(0, -8));
-                ImGui::PushItemWidth(-FLT_MIN);
-
-                // Shuffle Dungeon Entrances
-                ImGui::Text("Shuffle Dungeon Entrances");
-                UIWidgets::InsertHelpHoverText(
-                    "Shuffle the pool of dungeon entrances, including Bottom of the Well, Ice Cavern and Gerudo Training Grounds.\n"
-                    "\n"
-                    "Shuffling Ganon's Castle can be enabled separately.\n"
-                    "\n"
-                    "Additionally, the entrances of Deku Tree, Fire Temple, Bottom of the Well and Gerudo Training Ground are opened for both child and adult.\n"
-                    "\n"
-                    "- Deku Tree will be open for adult after Mido has seen child Link with a sword and shield.\n"
-                    "- Bottom of the Well will be open for adult after playing Song of Storms to the Windmill guy as child.\n"
-                    "- Gerudo Training Ground will be open for child after adult has paid to open the gate once."
-                );
-                UIWidgets::EnhancementCombobox("gRandomizeShuffleDungeonsEntrances", randoShuffleDungeonsEntrances, RO_DUNGEON_ENTRANCE_SHUFFLE_OFF);
-
-                UIWidgets::PaddedSeparator();
-
-                // Shuffle Boss Entrances
-                ImGui::Text("Shuffle Boss Entrances");
-                UIWidgets::InsertHelpHoverText(
-                    "Shuffle the pool of dungeon boss entrances. This affects the boss rooms of all stone and medallion dungeons.\n"
-                    "\n"
-                    "Age Restricted - Shuffle the entrances of child and adult boss rooms separately.\n"
-                    "\n"
-                    "Full - Shuffle the entrances of all boss rooms together. Child may be expected to defeat Phantom Ganon and/or Bongo Bongo."
-                );
-                UIWidgets::EnhancementCombobox("gRandomizeShuffleBossEntrances", randoShuffleBossEntrances, RO_BOSS_ROOM_ENTRANCE_SHUFFLE_OFF);
-
-                UIWidgets::PaddedSeparator();
-
-                // Shuffle Overworld Entrances
-                UIWidgets::EnhancementCheckbox("Shuffle Overworld Entrances", "gRandomizeShuffleOverworldEntrances");
-                UIWidgets::InsertHelpHoverText(
-                    "Shuffle the pool of Overworld entrances, which corresponds to almost all loading zones between overworld areas.\n"
-                    "\n"
-                    "Some entrances are unshuffled to avoid issues:\n"
-                    "- Hyrule Castle Courtyard and Garden entrance\n"
-                    "- Both Market Back Alley entrances\n"
-                    "- Gerudo Valley to Lake Hylia (unless entrances are decoupled)"
-                );
-
-                UIWidgets::PaddedSeparator();
-
-                // Shuffle Interior Entrances
-                ImGui::Text("Shuffle Interior Entrances");
-                UIWidgets::InsertHelpHoverText(
-                    "Shuffle the pool of interior entrances which contains most Houses and all Great Fairies.\n"
-                    "\n"
-                    "All - An extended version of 'Simple' with some extra places:\n"
-                    "- Windmill\n"
-                    "- Link's House\n"
-                    "- Temple of Time\n"
-                    "- Kakariko Potion Shop"
-                );
-                UIWidgets::EnhancementCombobox("gRandomizeShuffleInteriorsEntrances", randoShuffleInteriorsEntrances, RO_INTERIOR_ENTRANCE_SHUFFLE_OFF);
-
-                UIWidgets::PaddedSeparator();
-
-                // Shuffle Grotto Entrances
-                UIWidgets::EnhancementCheckbox("Shuffle Grotto Entrances", "gRandomizeShuffleGrottosEntrances");
-                UIWidgets::InsertHelpHoverText(
-                    "Shuffle the pool of grotto entrances, including all graves, small Fairy fountains and the Deku Theatre."
-                );
-
-                UIWidgets::PaddedSeparator();
-
-                // Shuffle Owl Drops
-                UIWidgets::EnhancementCheckbox("Shuffle Owl Drops", "gRandomizeShuffleOwlDrops");
-                UIWidgets::InsertHelpHoverText(
-                    "Randomize where Kaepora Gaebora (the Owl) drops you at when you talk "
-                    "to him at Lake Hylia or at the top of Death Mountain Trail."
-                );
-
-                UIWidgets::PaddedSeparator();
-
-                // Shuffle Warp Songs
-                UIWidgets::EnhancementCheckbox("Shuffle Warp Songs", "gRandomizeShuffleWarpSongs");
-                UIWidgets::InsertHelpHoverText(
-                    "Randomize where each of the 6 warp songs leads to."
-                );
-
-                UIWidgets::PaddedSeparator();
-
-                // Shuffle Overworld Spawns
-                UIWidgets::EnhancementCheckbox("Shuffle Overworld Spawns", "gRandomizeShuffleOverworldSpawns");
-                UIWidgets::InsertHelpHoverText(
-                    "Randomize where you start as Child or Adult when loading a save in the Overworld. This "
-                    "means you may not necessarily spawn inside Link's House or Temple of Time.\n"
-                    "\n"
-                    "This stays consistent after saving and loading the game again.\n"
-                    "\n"
-                    "Keep in mind you may need to temporarily disable the \"Remember Save Location\" time saver to "
-                    "be able use the spawn positions, especially if they are the only logical way to get to certain areas."
-                );
-
-                UIWidgets::PaddedSeparator();
-
-                // Decouple Entrances
-                UIWidgets::EnhancementCheckbox("Decouple Entrances", "gRandomizeDecoupleEntrances");
-                UIWidgets::InsertHelpHoverText(
-                    "Decouple entrances when shuffling them. This means you are no longer guaranteed "
-                    "to end up back where you came from when you go back through an entrance.\n"
-                    "\n"
-                    "This also adds the one-way entrance from Gerudo Valley to Lake Hylia in the pool of "
-                    "overworld entrances when they are shuffled."
-                );
-
-                UIWidgets::PaddedSeparator();
-
-                // Mixed Entrance Pools
-                UIWidgets::EnhancementCheckbox("Mixed Entrance Pools", "gRandomizeMixedEntrances");
-                UIWidgets::InsertHelpHoverText(
-                    "Shuffle entrances into a mixed pool instead of separate ones.\n"
-                    "\n"
-                    "For example, enabling the settings to shuffle grotto, dungeon, and overworld entrances and "
-                    "selecting grotto and dungeon entrances here will allow a dungeon to be inside a grotto or "
-                    "vice versa, while overworld entrances are shuffled in their own separate pool and indoors stay vanilla."
-                );
-
-                if (CVarGetInteger("gRandomizeMixedEntrances", RO_GENERIC_OFF)) {
-                    if (CVarGetInteger("gRandomizeShuffleDungeonsEntrances", RO_GENERIC_OFF)) {
-                        UIWidgets::Spacer(0);
-                        ImGui::SetCursorPosX(20);
-                        UIWidgets::EnhancementCheckbox("Mix Dungeons", "gRandomizeMixDungeons");
-                        UIWidgets::InsertHelpHoverText("Dungeon entrances will be part of the mixed pool");
-                    }
-                    if (CVarGetInteger("gRandomizeShuffleOverworldEntrances", RO_GENERIC_OFF)) {
-                        UIWidgets::Spacer(0);
-                        ImGui::SetCursorPosX(20);
-                        UIWidgets::EnhancementCheckbox("Mix Overworld", "gRandomizeMixOverworld");
-                        UIWidgets::InsertHelpHoverText("Overworld entrances will be part of the mixed pool");
-                    }
-                    if (CVarGetInteger("gRandomizeShuffleInteriorsEntrances", RO_GENERIC_OFF)) {
-                        UIWidgets::Spacer(0);
-                        ImGui::SetCursorPosX(20);
-                        UIWidgets::EnhancementCheckbox("Mix Interiors", "gRandomizeMixInteriors");
-                        UIWidgets::InsertHelpHoverText("Interior entrances will be part of the mixed pool");
-                    }
-                    if (CVarGetInteger("gRandomizeShuffleGrottosEntrances", RO_GENERIC_OFF)) {
-                        UIWidgets::Spacer(0);
-                        ImGui::SetCursorPosX(20);
-                        UIWidgets::EnhancementCheckbox("Mix Grottos", "gRandomizeMixGrottos");
-                        UIWidgets::InsertHelpHoverText("Grotto entrances will be part of the mixed pool");
-                    }
-                }
-
-                ImGui::PopItemWidth();
-                ImGui::EndChild();
-                ImGui::EndTable();
+            if (mSettings->GetOptionGroup(RSG_WORLD_IMGUI_TABLE).RenderImGui()) {
+                mNeedsUpdate = true;
             }
             ImGui::PopStyleVar(1);
             ImGui::EndTabItem();
@@ -2581,594 +1764,8 @@ void RandomizerSettingsWindow::DrawElement() {
 
         if (ImGui::BeginTabItem("Items")) {
             ImGui::PushStyleVar(ImGuiStyleVar_CellPadding, cellPadding);
-            if (ImGui::BeginTable("tableRandoStartingInventory", 3, ImGuiTableFlags_BordersH | ImGuiTableFlags_BordersV)) {
-                ImGui::TableSetupColumn("Shuffle Items", ImGuiTableColumnFlags_WidthStretch, 200.0f);
-                ImGui::TableSetupColumn("Shuffle NPCs & Merchants", ImGuiTableColumnFlags_WidthStretch, 200.0f);
-                ImGui::TableSetupColumn("Shuffle Dungeon Items", ImGuiTableColumnFlags_WidthStretch, 200.0f);
-                ImGui::PushItemFlag(ImGuiItemFlags_Disabled, true);
-                ImGui::TableHeadersRow();
-                ImGui::PopItemFlag();
-                ImGui::TableNextRow();
-
-                // COLUMN 1 - Shuffle Items
-                ImGui::TableNextColumn();
-                window->DC.CurrLineTextBaseOffset = 0.0f;
-                ImGui::BeginChild("ChildShuffleItems", ImVec2(0, -8));
-                ImGui::PushItemWidth(-FLT_MIN);
-
-                // Shuffle Songs
-                ImGui::Text("%s", ctx->GetOption(RSK_SHUFFLE_SONGS).GetName().c_str());
-                UIWidgets::InsertHelpHoverText(
-                    "Song locations - Songs will only appear at locations that normally teach songs.\n"
-                    "\n"
-                    "Dungeon rewards - Songs appear after beating a major dungeon boss.\n"
-                    "The 4 remaining songs are located at:\n"
-                    "  - Zelda's lullaby location\n"
-                    "  - Ice Cavern's Serenade of Water location\n"
-                    "  - Bottom of the Well Lens of Truth location\n"
-                    "  - Gerudo Training Ground's Ice Arrows location\n"
-                    "\n"
-                    "Anywhere - Songs can appear at any location."
-                );
-                UIWidgets::EnhancementCombobox("gRandomizeShuffleSongs", randoShuffleSongs, RO_SONG_SHUFFLE_SONG_LOCATIONS);
-
-                UIWidgets::PaddedSeparator();
-
-                // Shuffle Tokens
-                ImGui::Text("%s", ctx->GetOption(RSK_SHUFFLE_TOKENS).GetName().c_str());
-                UIWidgets::InsertHelpHoverText(
-                    "Shuffles Golden Skulltula Tokens into the item pool. This means "
-                    "Golden Skulltulas can contain other items as well.\n"
-                    "\n"
-                    "Off - GS tokens will not be shuffled.\n"
-                    "\n"
-                    "Dungeons - Only shuffle GS tokens that are within dungeons.\n"
-                    "\n"
-                    "Overworld - Only shuffle GS tokens that are outside of dungeons.\n"
-                    "\n"
-                    "All Tokens - Shuffle all 100 GS tokens."
-                );
-                UIWidgets::EnhancementCombobox("gRandomizeShuffleTokens", randoTokensanity, RO_TOKENSANITY_OFF);
-
-                UIWidgets::PaddedEnhancementCheckbox("Nighttime GS expect Sun's Song", "gRandomizeGsExpectSunsSong", true, false);
-                UIWidgets::InsertHelpHoverText(
-                    "All Golden Skulltulas that require nighttime to appear will only be "
-                    "expected to be collected after getting Sun's Song."
-                );
-
-                UIWidgets::PaddedSeparator();
-
-                // Shuffle Kokiri Sword
-                // Disabled when Start with Kokiri Sword is active
-                bool disableShuffleKokiriSword = CVarGetInteger("gRandomizeStartingKokiriSword", 0);
-                static const char* disableShuffleKokiriSwordText = "This option is disabled because \"Start with Kokiri Sword\" is enabled.";
-                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_SHUFFLE_KOKIRI_SWORD).GetName().c_str(), "gRandomizeShuffleKokiriSword",
-                                                disableShuffleKokiriSword, disableShuffleKokiriSwordText);
-                UIWidgets::InsertHelpHoverText(
-                    "Shuffles the Kokiri Sword into the item pool.\n"
-                    "\n"
-                    "This will require the use of sticks until the Kokiri Sword is found."
-                );
-
-                UIWidgets::PaddedSeparator();
-
-                //Shuffle Master Sword
-                //RANDOTODO: Disable when Start with Master Sword is active
-                // bool disableShuffleMasterSword = CvarGetInteger("gRandomizeStartingMasterSword", 0);
-                // static const char* disableShuffleMasterSwordText = "This option is disabled because \"Start with Master Sword\" is enabled.";
-                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_SHUFFLE_MASTER_SWORD).GetName().c_str(), "gRandomizeShuffleMasterSword");
-                UIWidgets::InsertHelpHoverText(
-                    "Shuffles the Master Sword into the item pool.\n"
-                    "\n"
-                    "Adult Link will start with a second free item instead of the Master Sword.\n"
-                    "If you haven't found the Master Sword before facing Ganon, you won't receive it during the fight."
-                );
-
-                UIWidgets::PaddedSeparator();
-
-                // Shuffle Ocarinas
-                // Disabled when Start with Ocarina is active
-                bool disableShuffleOcarinas = CVarGetInteger("gRandomizeStartingOcarina", 0);
-                static const char* disableShuffleOcarinasText = "This option is disabled because \"Start with Fairy Ocarina\" is enabled.";
-                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_SHUFFLE_OCARINA).GetName().c_str(), "gRandomizeShuffleOcarinas",
-                                              disableShuffleOcarinas, disableShuffleOcarinasText);
-                UIWidgets::InsertHelpHoverText(
-                    "Enabling this shuffles the Fairy Ocarina and the Ocarina of Time into the item pool.\n"
-                    "\n"
-                    "This will require finding an Ocarina before being able to play songs."
-                );
-
-                UIWidgets::PaddedSeparator();
-
-                // Shuffle Weird Egg
-                // Disabled when Skip Child Zelda is active
-                bool disableShuffleWeirdEgg = CVarGetInteger("gRandomizeSkipChildZelda", 0);
-                static const char* disableShuffleWeirdEggText = "This option is disabled because \"Skip Child Zelda\" is enabled.";
-                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_SHUFFLE_WEIRD_EGG).GetName().c_str(), "gRandomizeShuffleWeirdEgg",
-                                              disableShuffleWeirdEgg, disableShuffleWeirdEggText);
-                UIWidgets::InsertHelpHoverText(
-                    "Shuffles the Weird Egg from Malon in to the item pool. Enabling "
-                    "\"Skip Child Zelda\" disables this feature.\n"
-                    "\n"
-                    "The Weird Egg is required to unlock several events:\n"
-                    "  - Zelda's Lullaby from Impa\n"
-                    "  - Saria's song in Sacred Forest Meadow\n"
-                    "  - Epona's song and chicken minigame at Lon Lon Ranch\n"
-                    "  - Zelda's letter for Kakariko gate (if set to closed)\n"
-                    "  - Happy Mask Shop sidequest\n"
-                );
-
-                UIWidgets::PaddedSeparator();
-
-                // Shuffle Gerudo Membership Card
-                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD).GetName().c_str(), "gRandomizeShuffleGerudoToken");
-                UIWidgets::InsertHelpHoverText(
-                    "Shuffles the Gerudo Membership Card into the item pool.\n"
-                    "\n"
-                    "The Gerudo Card is required to enter the Gerudo Training Grounds, opening "
-                    "the gate to Haunted Wasteland and the Horseback Archery minigame."
-                );
-
-                UIWidgets::PaddedSeparator();
-
-                ImGui::PopItemWidth();
-                ImGui::EndChild();
-
-                // COLUMN 2 - Shuffle NPCs & Merchants
-                ImGui::TableNextColumn();
-                window->DC.CurrLineTextBaseOffset = 0.0f;
-                ImGui::BeginChild("ChildShuffleNpcs", ImVec2(0, -8));
-                ImGui::PushItemWidth(-FLT_MIN);
-
-                // Shopsanity
-                ImGui::Text("%s", ctx->GetOption(RSK_SHOPSANITY).GetName().c_str());
-                UIWidgets::InsertHelpHoverText(
-                    "Off - All shop items will be the same as vanilla.\n"
-                    "\n"
-                    "0 Items - Vanilla shop items will be shuffled among different shops.\n"
-                    "\n"
-                    "1-4 Items - Vanilla shop items will be shuffled among different shops, and each shop will contain 1-4 non-vanilla shop items.\n"
-                    "\n"
-                    "Random - Vanilla shop items will be shuffled among different shops, and each shop will contain a random number(1-4) of non-vanilla shop items.\n"
-                );
-                UIWidgets::EnhancementCombobox("gRandomizeShopsanity", randoShopsanity, RO_SHOPSANITY_OFF);
-
-                // Shopsanity Prices
-                switch (CVarGetInteger("gRandomizeShopsanity", RO_SHOPSANITY_OFF)) {
-                    case RO_SHOPSANITY_OFF:
-                    case RO_SHOPSANITY_ZERO_ITEMS: // no need to show it if there aren't shop slots in the pool
-                        break;
-                    default:
-                        ImGui::Text("%s", ctx->GetOption(RSK_SHOPSANITY_PRICES).GetName().c_str());
-                        UIWidgets::InsertHelpHoverText(
-                            "Balanced - The default randomization. Shop prices for shopsanity items will range between 0 to 300 rupees, "
-                            "with a bias towards values slightly below the middle of the range, in multiples of 5.\n "
-                            "\n"
-                            "X Wallet - Randomized between 5 and the wallet's max size, in multiples of 5"
-                        );
-                        UIWidgets::EnhancementCombobox("gRandomizeShopsanityPrices", randoShopsanityPrices, RO_SHOPSANITY_PRICE_BALANCED);
-                        UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_SHOPSANITY_PRICES_AFFORDABLE).GetName().c_str(), "gRandomizeShopsanityPricesAffordable",
-                            CVarGetInteger("gRandomizeShopsanityPrices", RO_SHOPSANITY_PRICE_BALANCED) == RO_SHOPSANITY_PRICE_BALANCED,
-                            "This can only apply to a wallet range.");
-                        UIWidgets::InsertHelpHoverText("Random selection between the selected wallet tier's affordable price and the affordable prices of the preceding wallet tiers.\n\n"
-                            "Affordable prices per tier: starter = 10, adult = 105, giant = 205, tycoon = 505\n\n"
-                            "Use this to enable wallet tier locking, but make shop items not as expensive as they could be.");
-                }
-
-                UIWidgets::PaddedSeparator();
-
-                // Shuffle Scrubs
-                ImGui::Text("%s", ctx->GetOption(RSK_SHUFFLE_SCRUBS).GetName().c_str());
-                UIWidgets::InsertHelpHoverText(
-                    "Off - Scrubs will not be shuffled. The 3 Scrubs that give one-time items in the vanilla game "
-                    "(PoH, Deku Nut capacity, and Deku Stick capacity) will have random items.\n"
-                    "\n"
-                    "Affordable - Scrubs will be shuffled and their item will cost 10 rupees.\n"
-                    "\n"
-                    "Expensive - Scrubs will be shuffled and their item will cost the vanilla price.\n"
-                    "\n"
-                    "Random - Scrubs will be shuffled and their item will cost will be between 0-95 rupees.\n");
-                UIWidgets::EnhancementCombobox("gRandomizeShuffleScrubs", randoShuffleScrubs, RO_SCRUBS_OFF);
-
-                UIWidgets::PaddedSeparator();
-
-                // Shuffle Cows
-                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_SHUFFLE_COWS).GetName().c_str(), "gRandomizeShuffleCows");
-                UIWidgets::InsertHelpHoverText("Cows give a randomized item from the pool upon performing Epona's Song in front of them.");
-
-                UIWidgets::PaddedSeparator();
-
-                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_SHUFFLE_MAGIC_BEANS).GetName().c_str(), "gRandomizeShuffleBeans");
-                UIWidgets::InsertHelpHoverText(
-                    "Enabling this adds a pack of 10 beans to the item pool and changes the Magic Bean "
-                    "Salesman to sell a random item at a price of 60 rupees."
-                );
-
-                UIWidgets::PaddedSeparator();
-
-                // Shuffle Merchants
-                ImGui::Text("%s", ctx->GetOption(RSK_SHUFFLE_MERCHANTS).GetName().c_str());
-                UIWidgets::InsertHelpHoverText(
-                    "Enabling this changes Medigoron, Granny and the Carpet Salesman to sell a random item "
-                    "once at a high price (100 for Granny, 200 for the others).\n"
-                    "A Giant's Knife and a pack of Bombchus will be added to the item pool, and "
-                    "one of the bottles will contain a Blue Potion.\n\n"
-                    "On (no hints) - Salesmen will be included but won't tell you what you'll get.\n"
-                    "On (with hints) - Salesmen will be included and you'll know what you're buying.\n"
-                    "\n"
-                    "Granny's item will only be offered after you have traded in the Odd Mushroom when Shuffle Adult Trade is on. "
-                    "Otherwise when off, you will need to have found the Claim Check to buy her item (simulating the trade quest is complete)."
-                );
-                UIWidgets::EnhancementCombobox("gRandomizeShuffleMerchants", randoShuffleMerchants, RO_SHUFFLE_MERCHANTS_OFF);
-
-                UIWidgets::PaddedSeparator();
-
-                // Shuffle Frog Song Rupees
-                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_SHUFFLE_FROG_SONG_RUPEES).GetName().c_str(), "gRandomizeShuffleFrogSongRupees");
-                UIWidgets::InsertHelpHoverText(
-                    "Shuffles 5 Purple Rupees into to the item pool, and allows\n"
-                    "you to earn items by playing songs at the Frog Choir.\n"
-                    "\n"
-                    "This setting does not effect the item earned from playing\n"
-                    "the Song of Storms and the frog song minigame."
-                );
-
-                UIWidgets::PaddedSeparator();
-
-                // Shuffle Adult Trade Quest
-                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE).GetName().c_str(), "gRandomizeShuffleAdultTrade");
-                UIWidgets::InsertHelpHoverText(
-                    "Adds all of the adult trade quest items into the pool, each of which "
-                    "can be traded for a unique reward.\n"
-                    "\n"
-                    "You will be able to choose which of your owned adult trade items is visible "
-                    "in the inventory by selecting the item with A and using the control stick or "
-                    "D-pad.\n"
-                    "\n"
-                    "If disabled, only the Claim Check will be found in the pool."
-                );
-
-                UIWidgets::PaddedSeparator();
-
-                // Shuffle 100 GS Reward
-                // Forcefully enabled if Ganon's Boss Key is on the cursed man
-                bool forceEnable100GSShuffle =
-                    (CVarGetInteger("gRandomizeShuffleGanonBossKey", RO_GANON_BOSS_KEY_VANILLA) == RO_GANON_BOSS_KEY_KAK_TOKENS);
-                static const char* disable100GSRewardText = "This option is forcefully enabled because \"Ganon's Boss Key\" is set to \"100 GS Reward.\"";
-                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_SHUFFLE_100_GS_REWARD).GetName().c_str(), "gRandomizeShuffle100GSReward",
-                    forceEnable100GSShuffle, disable100GSRewardText, UIWidgets::CheckboxGraphics::Checkmark);
-                UIWidgets::InsertHelpHoverText(
-                    "Shuffle the item the cursed rich man in the House of Skulltula gives when you "
-                    "have collected all 100 Gold Skulltula Tokens.\n"
-                    "\n"
-                    "You can still talk to him multiple times to get Huge Rupees."
-                );
-
-                UIWidgets::PaddedSeparator();
-
-                // Shuffle Boss Souls
-                // Forces players to find a boss's soul before defeating them in their lair.
-                ImGui::Text("%s", ctx->GetOption(RSK_SHUFFLE_BOSS_SOULS).GetName().c_str());
-                UIWidgets::InsertHelpHoverText("Shuffles 8 boss souls (one for each blue warp dungeon). A boss will not appear until you collect its respective soul."
-                "\n\"On + Ganon\" will also hide Ganon and Ganondorf behind a boss soul.");
-                UIWidgets::EnhancementCombobox("gRandomizeShuffleBossSouls", randoShuffleBossSouls, RO_BOSS_SOULS_OFF);
-
-                UIWidgets::PaddedSeparator();
-
-                ImGui::PopItemWidth();
-                ImGui::EndChild();
-
-                // COLUMN 3 - Shuffle Dungeon Items
-                ImGui::TableNextColumn();
-                window->DC.CurrLineTextBaseOffset = 0.0f;
-                ImGui::BeginChild("ChildShuffleDungeonItems", ImVec2(0, -8));
-                ImGui::PushItemWidth(-FLT_MIN);
-
-                // Shuffle Dungeon Rewards
-                ImGui::Text("%s", ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).GetName().c_str());
-                UIWidgets::InsertHelpHoverText(
-                    "Shuffles the location of spiritual stones and medallions.\n"
-                    "\n"
-                    "End of dungeons - Spiritual stones and medallions will be given as rewards "
-                    "for beating major dungeons. Link will always start with one stone or medallion.\n"
-                    "\n"
-                    "Any dungeon - Spiritual stones and medallions can be found inside any dungeon.\n"
-                    "\n"
-                    "Overworld - Spiritual stones and medallions can only be found outside of dungeons.\n"
-                    "\n"
-                    "Anywhere - Spiritual stones and medallions can appear anywhere."
-                );
-                UIWidgets::EnhancementCombobox("gRandomizeShuffleDungeonReward", randoShuffleDungeonRewards, RO_DUNGEON_REWARDS_END_OF_DUNGEON);
-
-                UIWidgets::PaddedSeparator();
-
-                // Maps & Compasses
-                ImGui::Text("%s", ctx->GetOption(RSK_SHUFFLE_MAPANDCOMPASS).GetName().c_str());
-                UIWidgets::InsertHelpHoverText(
-                    "Start with - You will start with Maps & Compasses from all dungeons.\n"
-                    "\n"
-                    "Vanilla - Maps & Compasses will appear in their vanilla locations.\n"
-                    "\n"
-                    "Own dungeon - Maps & Compasses can only appear in their respective dungeon.\n"
-                    "\n"
-                    "Any dungeon - Maps & Compasses can only appear inside of any dungon.\n"
-                    "\n"
-                    "Overworld - Maps & Compasses can only appear outside of dungeons.\n"
-                    "\n"
-                    "Anywhere - Maps & Compasses can appear anywhere in the world."
-                );
-                UIWidgets::EnhancementCombobox("gRandomizeStartingMapsCompasses", randoShuffleMapsAndCompasses, RO_DUNGEON_ITEM_LOC_OWN_DUNGEON);
-
-                UIWidgets::PaddedSeparator();
-
-                // Keysanity
-                ImGui::Text("%s", ctx->GetOption(RSK_KEYSANITY).GetName().c_str());
-                UIWidgets::InsertHelpHoverText(
-                    "Start with - You will start with all Small Keys from all dungeons.\n"
-                    "\n"
-                    "Vanilla - Small Keys will appear in their vanilla locations. "
-                    "You start with 3 keys in Spirit Temple MQ because the vanilla key layout is not beatable in logic.\n"
-                    "\n"
-                    "Own dungeon - Small Keys can only appear in their respective dungeon. "
-                    "If Fire Temple is not a Master Quest dungeon, the door to the Boss Key chest will be unlocked.\n"
-                    "\n"
-                    "Any dungeon - Small Keys can only appear inside of any dungon.\n"
-                    "\n"
-                    "Overworld - Small Keys can only appear outside of dungeons.\n"
-                    "\n"
-                    "Anywhere - Small Keys can appear anywhere in the world."
-                );
-                UIWidgets::EnhancementCombobox("gRandomizeKeysanity", randoShuffleSmallKeys, RO_DUNGEON_ITEM_LOC_OWN_DUNGEON);
-
-                UIWidgets::PaddedSeparator();
-
-                 // Key Rings
-                ImGui::Text("%s", ctx->GetOption(RSK_KEYRINGS).GetName().c_str());
-                UIWidgets::InsertHelpHoverText(
-                    "Keyrings will replace all small keys from a particular dungeon with a single keyring that awards all keys for it's associated dungeon\n"
-                    "\n"
-                    "Off - No dungeons will have their keys replaced with keyrings.\n"
-                    "\n"
-                    "Random - A random amount of dungeons(0-8 or 9) will have their keys replaced with keyrings.\n"
-                    "\n"
-                    "Count - A specified amount of randomly selected dungeons will have their keys replaced with keyrings.\n"
-                    "\n"
-                    "Selection - Hand select which dungeons will have their keys replaced with keyrings.\n"
-                    "\n"
-                    "Selecting key ring for dungeons will have no effect if Small Keys are set to Start With or Vanilla.\n"
-                    "\n"
-                    "If Gerudo Fortress Carpenters is set to Normal, and Gerudo Fortress Keys is set to anything "
-                    "other than Vanilla, then the maximum amount of Key Rings that can be selected by Random or "
-                    "Count will be 9. Otherwise, the maximum amount of Key Rings will be 8."
-                );
-                UIWidgets::EnhancementCombobox("gRandomizeShuffleKeyRings", randoShuffleKeyRings, RO_KEYRINGS_OFF);
-                ImGui::PopItemWidth();
-                switch (CVarGetInteger("gRandomizeShuffleKeyRings", RO_KEYRINGS_OFF)) {
-                    case RO_KEYRINGS_COUNT:
-                        maxKeyringCount = (CVarGetInteger("gRandomizeGerudoFortress", RO_GF_NORMAL) == RO_GF_NORMAL &&
-                                            CVarGetInteger("gRandomizeGerudoKeys", RO_GERUDO_KEYS_VANILLA) != RO_GERUDO_KEYS_VANILLA) ? 9 : 8;
-                        UIWidgets::PaddedEnhancementSliderInt("Key Ring Count: %d",
-                                                              "##RandomizeShuffleKeyRingsRandomCount",
-                                                              "gRandomizeShuffleKeyRingsRandomCount", 1,
-                                                              maxKeyringCount, "", maxKeyringCount, true, true, false);
-                        break;
-                    case RO_KEYRINGS_SELECTION:
-                        disableGFKeyring =
-                            CVarGetInteger("gRandomizeGerudoFortress", RO_GF_NORMAL) != RO_GF_NORMAL || CVarGetInteger("gRandomizeGerudoKeys", RO_GERUDO_KEYS_VANILLA) == RO_GERUDO_KEYS_VANILLA;
-                        UIWidgets::EnhancementCheckbox("Gerudo Fortress##RandomizeShuffleKeyRings", "gRandomizeShuffleKeyRingsGerudoFortress",
-                            disableGFKeyring, "Disabled because the currently selected Gerudo Fortress Carpenters\n setting and/or Gerudo Fortress Keys setting is incompatible with \nhaving a Gerudo Fortress keyring.");
-                        UIWidgets::EnhancementCheckbox("Forest Temple##RandomizeShuffleKeyRings", "gRandomizeShuffleKeyRingsForestTemple");
-                        UIWidgets::EnhancementCheckbox("Fire Temple##RandomizeShuffleKeyRings", "gRandomizeShuffleKeyRingsFireTemple");
-                        UIWidgets::EnhancementCheckbox("Water Temple##RandomizeShuffleKeyRings", "gRandomizeShuffleKeyRingsWaterTemple");
-                        UIWidgets::EnhancementCheckbox("Spirit Temple##RandomizeShuffleKeyRings", "gRandomizeShuffleKeyRingsSpiritTemple");
-                        UIWidgets::EnhancementCheckbox("Shadow Temple##RandomizeShuffleKeyRings", "gRandomizeShuffleKeyRingsShadowTemple");
-                        UIWidgets::EnhancementCheckbox("Bottom of the Well##RandomizeShuffleKeyRings", "gRandomizeShuffleKeyRingsBottomOfTheWell");
-                        UIWidgets::EnhancementCheckbox("Gerudo Training Grounds##RandomizeShuffleKeyRings", "gRandomizeShuffleKeyRingsGTG");
-                        UIWidgets::EnhancementCheckbox("Ganon's Castle##RandomizeShuffleKeyRings", "gRandomizeShuffleKeyRingsGanonsCastle");
-                        break;
-                    default:
-                        break;
-                }
-                ImGui::PushItemWidth(-FLT_MIN);
-
-                UIWidgets::PaddedSeparator();
-
-                // Gerudo Keys
-                ImGui::Text("%s", ctx->GetOption(RSK_GERUDO_KEYS).GetName().c_str());
-                UIWidgets::InsertHelpHoverText(
-                    "Vanilla - Thieve's Hideout Keys will appear in their vanilla locations.\n"
-                    "\n"
-                    "Any dungeon - Thieve's Hideout Keys can only appear inside of any dungon.\n"
-                    "\n"
-                    "Overworld - Thieve's Hideout Keys can only appear outside of dungeons.\n"
-                    "\n"
-                    "Anywhere - Thieve's Hideout Keys can appear anywhere in the world."
-                );
-                UIWidgets::EnhancementCombobox("gRandomizeGerudoKeys", randoShuffleGerudoFortressKeys, RO_GERUDO_KEYS_VANILLA);
-
-                UIWidgets::PaddedSeparator();
-
-                // Boss Keysanity
-                ImGui::Text("%s", ctx->GetOption(RSK_BOSS_KEYSANITY).GetName().c_str());
-                UIWidgets::InsertHelpHoverText(
-                    "Start with - You will start with Boss keys from all dungeons.\n"
-                    "\n"
-                    "Vanilla - Boss Keys will appear in their vanilla locations.\n"
-                    "\n"
-                    "Own dungeon - Boss Keys can only appear in their respective dungeon.\n"
-                    "\n"
-                    "Any dungeon - Boss Keys can only appear inside of any dungon.\n"
-                    "\n"
-                    "Overworld - Boss Keys can only appear outside of dungeons.\n"
-                    "\n"
-                    "Anywhere - Boss Keys can appear anywhere in the world."
-                );
-                UIWidgets::EnhancementCombobox("gRandomizeBossKeysanity", randoShuffleBossKeys, RO_DUNGEON_ITEM_LOC_OWN_DUNGEON);
-
-                UIWidgets::PaddedSeparator();
-
-                // Ganon's Boss Key
-                ImGui::Text("%s", ctx->GetOption(RSK_GANONS_BOSS_KEY).GetName().c_str());
-                UIWidgets::InsertHelpHoverText(
-                    "Vanilla - Ganon's Boss Key will appear in the vanilla location.\n"
-                    "\n"
-                    "Own dungeon - Ganon's Boss Key can appear anywhere inside Ganon's Castle.\n"
-                    "\n"
-                    "Start with - Places Ganon's Boss Key in your starting inventory."
-                    "\n"
-                    "Any dungeon - Ganon's Boss Key Key can only appear inside of any dungon.\n"
-                    "\n"
-                    "Overworld - Ganon's Boss Key Key can only appear outside of dungeons.\n"
-                    "\n"
-                    "Anywhere - Ganon's Boss Key Key can appear anywhere in the world.\n"
-                    "\n"
-                    "LACS - These settings put the boss key on the Light Arrow Cutscene location, from Zelda in Temple of Time as adult, with differing requirements:\n"
-                    "- Vanilla: Obtain the Shadow Medallion and Spirit Medallion\n"
-                    "- Stones: Obtain the specified amount of spiritual stones.\n"
-                    "- Medallions: Obtain the specified amount of medallions.\n"
-                    "- Dungeon rewards: Obtain the specified total sum of spiritual stones or medallions.\n"
-                    "- Dungeons: Complete the specified amount of dungeons. Dungeons are considered complete after stepping in to the blue warp after the boss.\n"
-                    "- Tokens: Obtain the specified amount of Skulltula tokens.\n"
-                    "\n"
-                    "100 GS Reward - Ganon's Boss Key will be awarded by the cursed rich man after you collect 100 Gold Skulltula Tokens."
-                );
-                bool disableGBK = CVarGetInteger("gRandomizeTriforceHunt", 0);
-                static const char* disableGBKText = "This option is disabled because Triforce Hunt is enabled. Ganon's Boss key\nwill instead be given to you after Triforce Hunt completion.";
-                UIWidgets::EnhancementCombobox("gRandomizeShuffleGanonBossKey", randoShuffleGanonsBossKey,
-                                               RO_GANON_BOSS_KEY_VANILLA, disableGBK, disableGBKText,
-                                               RO_GANON_BOSS_KEY_VANILLA);
-                ImGui::PopItemWidth();
-                switch (CVarGetInteger("gRandomizeShuffleGanonBossKey", RO_GANON_BOSS_KEY_VANILLA)) {
-                    case RO_GANON_BOSS_KEY_LACS_STONES:
-                        ImGui::Text("Reward Options");
-                        UIWidgets::InsertHelpHoverText(
-                            "Standard Rewards - Greg does not change logic, Greg does not help obtain GBK, max "
-                            "number of rewards on slider does not change.\n"
-                            "\n"
-                            "Greg as Reward - Greg does change logic (can be part of expected path for obtaining "
-                            "GBK), Greg helps obtain GBK, max number of rewards on slider increases by 1 to "
-                            "account for Greg. \n"
-                            "\n"
-                            "Greg as Wildcard - Greg does not change logic, Greg helps obtain GBK, max number of "
-                            "rewards on slider does not change.");
-
-                        UIWidgets::EnhancementCombobox("gRandomizeLacsRewardOptions", randoLACSRewardOptions, RO_LACS_STANDARD_REWARD);
-                        switch (CVarGetInteger("gRandomizeLacsRewardOptions", RO_LACS_STANDARD_REWARD)) {
-                            case RO_LACS_STANDARD_REWARD:
-                                UIWidgets::PaddedEnhancementSliderInt("Stone Count: %d", "##RandoLacsStoneCount", 
-                                                            "gRandomizeLacsStoneCount", 1, 3, "", 3, true, true, false);
-                                break;
-                            case RO_LACS_GREG_REWARD:
-                                UIWidgets::PaddedEnhancementSliderInt("Stone Count: %d", "##RandoLacsStoneCount", 
-                                                            "gRandomizeLacsStoneCount", 1, 4, "", 4, true, true, false);
-                                break;
-                            case RO_LACS_WILDCARD_REWARD:
-                                UIWidgets::PaddedEnhancementSliderInt("Stone Count: %d", "##RandoLacsStoneCount", 
-                                                            "gRandomizeLacsStoneCount", 1, 3, "", 3, true, true, false);
-                                break;
-                        }
-                        break;
-                    case RO_GANON_BOSS_KEY_LACS_MEDALLIONS:
-                        ImGui::Text("Reward Options");
-                        UIWidgets::InsertHelpHoverText(
-                            "Standard Rewards - Greg does not change logic, Greg does not help obtain GBK, max "
-                            "number of rewards on slider does not change.\n"
-                            "\n"
-                            "Greg as Reward - Greg does change logic (can be part of expected path for obtaining "
-                            "GBK), Greg helps obtain GBK, max number of rewards on slider increases by 1 to "
-                            "account for Greg. \n"
-                            "\n"
-                            "Greg as Wildcard - Greg does not change logic, Greg helps obtain GBK, max number of "
-                            "rewards on slider does not change.");
-
-                        UIWidgets::EnhancementCombobox("gRandomizeLacsRewardOptions", randoLACSRewardOptions, RO_LACS_STANDARD_REWARD);
-                        switch (CVarGetInteger("gRandomizeLacsRewardOptions", RO_LACS_STANDARD_REWARD)) {
-                            case RO_LACS_STANDARD_REWARD:
-                                UIWidgets::PaddedEnhancementSliderInt("Medallion Count: %d", "##RandoLacsMedallionCount", 
-                                                            "gRandomizeLacsMedallionCount", 1, 6, "", 6, true, true, false);
-                                break;
-                            case RO_LACS_GREG_REWARD:
-                                UIWidgets::PaddedEnhancementSliderInt("Medallion Count: %d", "##RandoLacsMedallionCount", 
-                                                            "gRandomizeLacsMedallionCount", 1, 7, "", 7, true, true, false);
-                                break;
-                            case RO_LACS_WILDCARD_REWARD:
-                                UIWidgets::PaddedEnhancementSliderInt("Medallion Count: %d", "##RandoLacsMedallionCount", 
-                                                            "gRandomizeLacsMedallionCount", 1, 6, "", 6, true, true, false);
-                                break;
-                        }
-                        break;
-                    case RO_GANON_BOSS_KEY_LACS_REWARDS:
-                        ImGui::Text("Reward Options");
-                        UIWidgets::InsertHelpHoverText(
-                            "Standard Rewards - Greg does not change logic, Greg does not help obtain GBK, max "
-                            "number of rewards on slider does not change.\n"
-                            "\n"
-                            "Greg as Reward - Greg does change logic (can be part of expected path for obtaining "
-                            "GBK), Greg helps obtain GBK, max number of rewards on slider increases by 1 to "
-                            "account for Greg. \n"
-                            "\n"
-                            "Greg as Wildcard - Greg does not change logic, Greg helps obtain GBK, max number of "
-                            "rewards on slider does not change.");
-
-                        UIWidgets::EnhancementCombobox("gRandomizeLacsRewardOptions", randoLACSRewardOptions, RO_LACS_STANDARD_REWARD);
-                        switch (CVarGetInteger("gRandomizeLacsRewardOptions", RO_LACS_STANDARD_REWARD)) {
-                            case RO_LACS_STANDARD_REWARD:
-                                UIWidgets::PaddedEnhancementSliderInt("Reward Count: %d", "##RandoLacsRewardCount", 
-                                                            "gRandomizeLacsRewardCount", 1, 9, "", 9, true, true, false);
-                                break;
-                            case RO_LACS_GREG_REWARD:
-                                UIWidgets::PaddedEnhancementSliderInt("Reward Count: %d", "##RandoLacsRewardCount", 
-                                                            "gRandomizeLacsRewardCount", 1, 10, "", 10, true, true, false);
-                                break;
-                            case RO_LACS_WILDCARD_REWARD:
-                                UIWidgets::PaddedEnhancementSliderInt("Reward Count: %d", "##RandoLacsRewardCount", 
-                                                            "gRandomizeLacsRewardCount", 1, 9, "", 9, true, true, false);
-                                break;
-                        }
-                        break;
-                    case RO_GANON_BOSS_KEY_LACS_DUNGEONS:
-                        ImGui::Text("Reward Options");
-                        UIWidgets::InsertHelpHoverText(
-                            "Standard Rewards - Greg does not change logic, Greg does not help obtain GBK, max "
-                            "number of rewards on slider does not change.\n"
-                            "\n"
-                            "Greg as Reward - Greg does change logic (can be part of expected path for obtaining "
-                            "GBK), Greg helps obtain GBK, max number of rewards on slider increases by 1 to "
-                            "account for Greg. \n"
-                            "\n"
-                            "Greg as Wildcard - Greg does not change logic, Greg helps obtain GBK, max number of "
-                            "rewards on slider does not change.");
-
-                        UIWidgets::EnhancementCombobox("gRandomizeLacsRewardOptions", randoLACSRewardOptions, RO_LACS_STANDARD_REWARD);
-                        switch (CVarGetInteger("gRandomizeLacsRewardOptions", RO_LACS_STANDARD_REWARD)) {
-                            case RO_LACS_STANDARD_REWARD:
-                                UIWidgets::PaddedEnhancementSliderInt("Dungeon Count: %d", "##RandoLacsDungeonCount", 
-                                                            "gRandomizeLacsDungeonCount", 1, 8, "", 8, true, true, false);
-                                break;
-                            case RO_LACS_GREG_REWARD:
-                                UIWidgets::PaddedEnhancementSliderInt("Dungeon Count: %d", "##RandoLacsDungeonCount", 
-                                                            "gRandomizeLacsDungeonCount", 1, 9, "", 9, true, true, false);
-                                break;
-                            case RO_LACS_WILDCARD_REWARD:
-                                UIWidgets::PaddedEnhancementSliderInt("Dungeon Count: %d", "##RandoLacsDungeonCount", 
-                                                            "gRandomizeLacsDungeonCount", 1, 8, "", 8, true, true, false);
-                                break;
-                        }
-                        break;
-                    case RO_GANON_BOSS_KEY_LACS_TOKENS:
-                        UIWidgets::PaddedEnhancementSliderInt("Token Count: %d", "##RandoLacsTokenCount",
-                                                        "gRandomizeLacsTokenCount", 1, 100, "", 100, true, true, false);
-                        break;
-                    default:
-                        break;
-                }
-                ImGui::PushItemWidth(-FLT_MIN);
-
-                UIWidgets::PaddedSeparator();
-
-                ImGui::PopItemWidth();
-                ImGui::EndChild();
-                ImGui::EndTable();
+            if (mSettings->GetOptionGroup(RSG_ITEMS_IMGUI_TABLE).RenderImGui()) {
+                mNeedsUpdate = true;
             }
             ImGui::PopStyleVar(1);
             ImGui::EndTabItem();
@@ -3176,269 +1773,8 @@ void RandomizerSettingsWindow::DrawElement() {
 
         if (ImGui::BeginTabItem("Gameplay")) {
             ImGui::PushStyleVar(ImGuiStyleVar_CellPadding, cellPadding);
-            if (ImGui::BeginTable("tableRandoGameplay", 3, ImGuiTableFlags_BordersH | ImGuiTableFlags_BordersV)) {
-                ImGui::TableSetupColumn("Timesavers", ImGuiTableColumnFlags_WidthStretch, 200.0f);
-                ImGui::TableSetupColumn("Item Pool & Hints", ImGuiTableColumnFlags_WidthStretch, 200.0f);
-                ImGui::TableSetupColumn("Additional Features", ImGuiTableColumnFlags_WidthStretch, 200.0f);
-                ImGui::PushItemFlag(ImGuiItemFlags_Disabled, true);
-                ImGui::TableHeadersRow();
-                ImGui::PopItemFlag();
-                ImGui::TableNextRow();
-
-                // COLUMN 1 - TIME SAVERS
-                ImGui::TableNextColumn();
-                window->DC.CurrLineTextBaseOffset = 0.0f;
-                ImGui::BeginChild("ChildTimeSavers", ImVec2(0, -8));
-
-                // Cuccos to return
-                int cuccos = CVarGetInteger("gRandomizeCuccosToReturn", 7);
-                ImGui::Text("Cuccos to return: %d", cuccos);
-                UIWidgets::InsertHelpHoverText("The amount of cuccos needed to claim the reward from Anju the cucco lady");
-                ImGui::SameLine();
-                UIWidgets::EnhancementSliderInt("", "##RandoCuccosToReturn", "gRandomizeCuccosToReturn", 0, 7, "", 7);
-                UIWidgets::PaddedSeparator();
-
-                // Big Poe Target Count
-                int poes = CVarGetInteger("gRandomizeBigPoeTargetCount", 10);
-                ImGui::Text("Big Poe Target Count: %d", poes);
-                UIWidgets::InsertHelpHoverText("The Poe collector will give a reward for turning in this many Big Poes.");
-                ImGui::SameLine();
-                UIWidgets::EnhancementSliderInt("", "##RandoBigPoeTargetCount", "gRandomizeBigPoeTargetCount", 1, 10, "", 10);
-                UIWidgets::PaddedSeparator();
-
-                // Skip child stealth
-                // Disabled when Skip Child Zelda is active
-                bool disableChildStealth = CVarGetInteger("gRandomizeSkipChildZelda", 0);
-                static const char* disableChildStealthText = "This option is disabled because \"Skip Child Zelda\" is enabled";
-                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_SKIP_CHILD_STEALTH).GetName().c_str(), "gRandomizeSkipChildStealth", disableChildStealth, disableChildStealthText);
-                UIWidgets::InsertHelpHoverText("The crawlspace into Hyrule Castle goes straight to Zelda, skipping the guards.");
-
-                UIWidgets::PaddedSeparator();
-
-                // Skip child zelda
-                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_SKIP_CHILD_ZELDA).GetName().c_str(), "gRandomizeSkipChildZelda");
-                UIWidgets::InsertHelpHoverText("Start with Zelda's Letter and the item Impa would normally give you and skip the sequence up "
-                                    "until after meeting Zelda. Disables the ability to shuffle Weird Egg.");
-
-                UIWidgets::PaddedSeparator();
-
-                // Skip Epona race
-                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_SKIP_EPONA_RACE).GetName().c_str(), "gRandomizeSkipEponaRace");
-                UIWidgets::InsertHelpHoverText("Epona can be summoned with Epona's Song without needing to race Ingo.");
-
-                UIWidgets::PaddedSeparator();
-
-                // Skip tower escape
-                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_SKIP_TOWER_ESCAPE).GetName().c_str(), "gRandomizeSkipTowerEscape");
-                UIWidgets::InsertHelpHoverText("The tower escape sequence between Ganondorf and Ganon will be skipped.");
-
-                UIWidgets::PaddedSeparator();
-
-                // Complete mask quest
-                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_COMPLETE_MASK_QUEST).GetName().c_str(), "gRandomizeCompleteMaskQuest");
-                UIWidgets::InsertHelpHoverText("Once the happy mask shop is opened, all masks will be available to be borrowed.");
-
-                UIWidgets::PaddedSeparator();
-
-                // Skip Scarecrow Song
-                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_SKIP_SCARECROWS_SONG).GetName().c_str(), "gRandomizeSkipScarecrowsSong");
-                UIWidgets::InsertHelpHoverText(
-                    "Start with the ability to summon Pierre the scarecrow. Pulling out an ocarina in the usual locations will automatically summon him."
-                );
-
-                UIWidgets::PaddedSeparator();
-
-                ImGui::EndChild();
-
-                // COLUMN 2 - Item Pool & Hint Settings
-                ImGui::TableNextColumn();
-                window->DC.CurrLineTextBaseOffset = 0.0f;
-                ImGui::BeginChild("ChildItemPoolHintSettings", ImVec2(0, -8));
-                ImGui::PushItemWidth(-FLT_MIN);
-
-                // Item Pool Settings
-                ImGui::Text("%s", ctx->GetOption(RSK_ITEM_POOL).GetName().c_str());
-                UIWidgets::InsertHelpHoverText(
-                    "Sets how many major items appear in the item pool.\n"
-                    "\n"
-                    "Plentiful - Extra major items are added to the pool.\n"
-                    "\n"
-                    "Balanced - Original item pool.\n"
-                    "\n"
-                    "Scarce - Some excess items are removed, including health upgrades.\n"
-                    "\n"
-                    "Minimal - Most excess items are removed."
-                );
-                UIWidgets::EnhancementCombobox("gRandomizeItemPool", randoItemPool, RO_ITEM_POOL_BALANCED);
-                UIWidgets::PaddedSeparator();
-
-                // Ice Traps
-                ImGui::Text("%s", ctx->GetOption(RSK_ICE_TRAPS).GetName().c_str());
-                UIWidgets::InsertHelpHoverText(
-                    "Sets how many items are replaced by ice traps.\n"
-                    "\n"
-                    "Off - No ice traps.\n"
-                    "\n"
-                    "Normal - Only Ice Traps from the base item pool are shuffled in.\n"
-                    "\n"
-                    "Extra - Chance to replace added junk items with additional ice traps.\n"
-                    "\n"
-                    "Mayhem - All added junk items will be Ice Traps.\n"
-                    "\n"
-                    "Onslaught - All junk items will be replaced by Ice Traps, even those "
-                    "in the base pool."
-                );
-                UIWidgets::EnhancementCombobox("gRandomizeIceTraps", randoIceTraps, RO_ICE_TRAPS_NORMAL);
-
-                UIWidgets::PaddedSeparator();
-
-                // Gossip Stone Hints
-                ImGui::Text("%s", ctx->GetOption(RSK_GOSSIP_STONE_HINTS).GetName().c_str());
-                UIWidgets::InsertHelpHoverText(
-                    "Allows Gossip Stones to provide hints on item locations. Hints mentioning "
-                    "\"Way of the Hero\" indicate a location that holds an item required to beat "
-                    "the seed.\n"
-                    "\n"
-                    "No hints - No hints will be given at all.\n"
-                    "\n"
-                    "Need Nothing - Hints are always available from Gossip Stones.\n"
-                    "\n"
-                    "Need Stone of Agony - Hints are only available after obtaining the Stone of Agony.\n"
-                    "\n"
-                    "Need Mask of Truth - Hints are only available whilst wearing the Mask of Truth.\n");
-                UIWidgets::EnhancementCombobox("gRandomizeGossipStoneHints", randoGossipStoneHints, RO_GOSSIP_STONES_NEED_NOTHING);
-                if (CVarGetInteger("gRandomizeGossipStoneHints", RO_GOSSIP_STONES_NEED_NOTHING) != RO_GOSSIP_STONES_NONE) {
-                    // Hint Clarity
-                    UIWidgets::Spacer(0);
-                    ImGui::Indent();
-                    ImGui::Text("%s", ctx->GetOption(RSK_HINT_CLARITY).GetName().c_str());
-                    UIWidgets::InsertHelpHoverText(
-                        "Sets the difficulty of hints.\n"
-                        "\n"
-                        "Obscure - Hints are unique for each item, but the writing may be cryptic.\n"
-                        "Ex: Kokiri Sword > a butter knife\n"
-                        "\n"
-                        "Ambiguous - Hints are clearly written, but may refer to more than one item.\n"
-                        "Ex: Kokiri Sword > a sword\n"
-                        "\n"
-                        "Clear - Hints are clearly written and are unique for each item.\n"
-                        "Ex: Kokiri Sword > the Kokiri Sword"
-                    );
-                    UIWidgets::EnhancementCombobox("gRandomizeHintClarity", randoHintClarity, RO_HINT_CLARITY_CLEAR);
-
-                    // Hint Distribution
-                    UIWidgets::Spacer(0);
-                    ImGui::Text("%s", ctx->GetOption(RSK_HINT_DISTRIBUTION).GetName().c_str());
-                    UIWidgets::InsertHelpHoverText(
-                        "Sets how many hints will be useful.\n"
-                        "\n"
-                        "Useless - Only junk hints.\n"
-                        "\n"
-                        "Balanced - Recommended hint spread.\n"
-                        "\n"
-                        "Strong - More useful hints.\n"
-                        "\n"
-                        "Very Strong - Many powerful hints."
-                    );
-                    UIWidgets::EnhancementCombobox("gRandomizeHintDistribution", randoHintDistribution, RO_HINT_DIST_BALANCED);
-                    ImGui::Unindent();
-                }
-
-                UIWidgets::PaddedSeparator();
-                
-                //Extra Hints
-                ImGui::Text("Extra Hints");
-                UIWidgets::InsertHelpHoverText(
-                    "This setting adds some hints at locations other than Gossip Stones.\n\n"
-                    "House of Skulltula: # - Talking to a cursed House of Skulltula resident will tell you the reward they will give you for obtaining that many tokens."
-                );
-                
-                ImGui::Indent();
-                //Altar, Light Arrows, and Warp Songs are enabled by default
-                UIWidgets::PaddedEnhancementCheckbox("Altar Text", "gRandomizeAltarHint", true, false, false, "", UIWidgets::CheckboxGraphics::Cross, true);
-                UIWidgets::InsertHelpHoverText("Reading the Temple of Time altar as child will tell you the locations of the Spiritual Stones.\n"
-                    "Reading the Temple of Time altar as adult will tell you the locations of the Medallions, as well as the conditions for building the Rainbow Bridge and getting the Boss Key for Ganon's Castle.");
-                UIWidgets::PaddedEnhancementCheckbox("Light Arrows", "gRandomizeLAHint", true, false, false, "", UIWidgets::CheckboxGraphics::Cross, true);
-                UIWidgets::InsertHelpHoverText("Talking to Ganondorf in his boss room or Sheik inside Ganon's Castle (when trials are enabled) will tell you the location of the Light Arrows."
-                "If this option is enabled and Ganondorf is reachable without Light Arrows, Gossip Stones will never hint the Light Arrows.");
-                UIWidgets::PaddedEnhancementCheckbox("Dampe's Diary (Hookshot)", "gRandomizeDampeHint", true, false);
-                UIWidgets::InsertHelpHoverText("Reading the diary of Dampé the gravekeeper as adult will tell you the location of one of the Hookshots.");
-                UIWidgets::PaddedEnhancementCheckbox("Greg the Green Rupee", "gRandomizeGregHint", true, false);
-                UIWidgets::InsertHelpHoverText("Talking to the chest game owner after buying a key will tell you the location of Greg the Green Rupee.");
-                UIWidgets::PaddedEnhancementCheckbox("Saria (Magic)", "gRandomizeSariaHint", true, false);
-                UIWidgets::InsertHelpHoverText("Talking to Saria either in person or through Saria's Song will tell you the location of a progressive magic meter.");
-                UIWidgets::PaddedEnhancementCheckbox("Frog Ocarina Game", "gRandomizeFrogsHint", true, false);
-                UIWidgets::InsertHelpHoverText("Standing near the pedestal for the frogs in Zora's River will tell you the reward for the frogs' ocarina game.");
-                UIWidgets::PaddedEnhancementCheckbox("Warp Song text", "gRandomizeWarpSongText", true, false, !CVarGetInteger("gRandomizeShuffleWarpSongs", RO_GENERIC_OFF),
-                 "This option is disabled since warp songs are not shuffled.", UIWidgets::CheckboxGraphics::Cross, true);
-                UIWidgets::InsertHelpHoverText("Playing a warp song will tell you where it leads. (If warp song destinations are vanilla, this is always enabled.)");
-                UIWidgets::PaddedEnhancementCheckbox("Scrub Item text", "gRandomizeScrubText", true, false, false, "", UIWidgets::CheckboxGraphics::Cross, false);
-                UIWidgets::InsertHelpHoverText("Business scrubs will reveal the identity of what they're selling.");
-                UIWidgets::PaddedEnhancementCheckbox("House of Skulltula: 10", "gRandomize10GSHint", true, false);
-                UIWidgets::PaddedEnhancementCheckbox("House of Skulltula: 20", "gRandomize20GSHint", true, false);
-                UIWidgets::PaddedEnhancementCheckbox("House of Skulltula: 30", "gRandomize30GSHint", true, false);                
-                UIWidgets::PaddedEnhancementCheckbox("House of Skulltula: 40", "gRandomize40GSHint", true, false);
-                UIWidgets::PaddedEnhancementCheckbox("House of Skulltula: 50", "gRandomize50GSHint", true, false);
-                ImGui::Unindent();
-
-
-                UIWidgets::PaddedSeparator();
-
-                ImGui::PopItemWidth();
-                ImGui::EndChild();
-
-                // COLUMN 3 - Additional Features
-                ImGui::TableNextColumn();
-                window->DC.CurrLineTextBaseOffset = 0.0f;
-                ImGui::BeginChild("ChildAdditionalFeatures", ImVec2(0, -8));
-                ImGui::PushItemWidth(-FLT_MIN);
-
-                UIWidgets::EnhancementCheckbox("Full Wallets", "gRandomizeFullWallets");
-                UIWidgets::InsertHelpHoverText("Start with a full wallet. All wallet upgrades come filled with rupees.");
-
-                UIWidgets::PaddedSeparator();
-
-                // Bombchus in Logic
-                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC).GetName().c_str(), "gRandomizeBombchusInLogic");
-                UIWidgets::InsertHelpHoverText(
-                    "Bombchus are properly considered in logic.\n"
-                    "\n"
-                    "The first Bombchu pack will always be 20, and subsequent packs will be "
-                    "5 or 10 based on how many you have.\n"
-                    "Once found, they can be replenished at the Bombchu shop.\n"
-                    "\n"
-                    "Bombchu Bowling is opened by obtaining Bombchus."
-                );
-
-                UIWidgets::PaddedSeparator();
-
-                // Enable Bombchu Drops
-                UIWidgets::EnhancementCheckbox("Enable Bombchu Drops", "gRandomizeEnableBombchuDrops");
-                UIWidgets::InsertHelpHoverText(
-                    "Once you obtain bombchus for the first time, refills can be found in bushes and other places where bomb drops can normally spawn."
-                );
-
-                UIWidgets::PaddedSeparator();
-
-                UIWidgets::EnhancementCheckbox("Blue Fire Arrows", "gRandomizeBlueFireArrows");
-                UIWidgets::InsertHelpHoverText(
-                    "Ice Arrows act like Blue Fire, making them able to melt red ice. "
-                    "Item placement logic will respect this option, so it might be required to use this to progress."
-                );
-
-                UIWidgets::PaddedSeparator();
-
-                UIWidgets::EnhancementCheckbox("Sunlight Arrows", "gRandomizeSunlightArrows");
-                UIWidgets::InsertHelpHoverText(
-                    "Light Arrows can be used to light up the sun switches instead of using the Mirror Shield. "
-                    "Item placement logic will respect this option, so it might be required to use this to progress."
-                );
-
-                UIWidgets::PaddedSeparator();
-
-                ImGui::PopItemWidth();
-                ImGui::EndChild();
-                ImGui::EndTable();
+            if (mSettings->GetOptionGroup(RSG_GAMEPLAY_IMGUI_TABLE).RenderImGui()) {
+                mNeedsUpdate = true;
             }
             ImGui::PopStyleVar(1);
             ImGui::EndTabItem();
@@ -3589,35 +1925,22 @@ void RandomizerSettingsWindow::DrawElement() {
                 ImGui::TableNextRow();
                 ImGui::TableNextColumn();
                 ImGui::PushItemWidth(170.0);
-                ImGui::Text("Logic Rules");
-                UIWidgets::InsertHelpHoverText(
-                    "Glitchless - No glitches are required, but may require some minor tricks. Additional tricks may be enabled and disabled below.\n"
-                    "\n"
-                    //"Glitched - Glitches may be required to beat the game. You can disable and enable glitches below.\n"
-                    //"\n"
-                    "No logic - Item placement is completely random. MAY BE IMPOSSIBLE TO BEAT."
-                );
-                UIWidgets::EnhancementCombobox("gRandomizeLogicRules", randoLogicRules, RO_LOGIC_GLITCHLESS);
+                if (mSettings->GetOption(RSK_LOGIC_RULES).RenderImGui()) {
+                    mNeedsUpdate = true;
+                }
                 if (CVarGetInteger("gRandomizeLogicRules", RO_LOGIC_GLITCHLESS) != RO_LOGIC_NO_LOGIC) {
                     ImGui::SameLine();
-                    UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_ALL_LOCATIONS_REACHABLE).GetName().c_str(), "gRandomizeAllLocationsReachable", false, "", UIWidgets::CheckboxGraphics::Cross, RO_GENERIC_ON);
-                    UIWidgets::InsertHelpHoverText(
-                        "When this options is enabled, the randomizer will "
-                        "guarantee that every item is obtainable and every "
-                        "location is reachable. When disabled, only "
-                        "required items and locations to beat the game "
-                        "will be guaranteed reachable."
-                    );
+                    if (mSettings->GetOption(RSK_ALL_LOCATIONS_REACHABLE).RenderImGui()) {
+                        mNeedsUpdate = true;
+                    }
                 }
 
                 UIWidgets::PaddedSeparator();
 
                 // Enable Glitch-Useful Cutscenes
-                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_ENABLE_GLITCH_CUTSCENES).GetName().c_str(), "gRandomizeEnableGlitchCutscenes");
-                UIWidgets::InsertHelpHoverText(
-                    "The cutscenes of the Poes in Forest Temple and Darunia in Fire Temple will not be skipped. "
-                    "These cutscenes are only useful for glitched gameplay and can be safely skipped otherwise.");
-
+                if (mSettings->GetOption(RSK_ENABLE_GLITCH_CUTSCENES).RenderImGui()) {
+                    mNeedsUpdate = true;
+                }
                 ImGui::PopItemWidth();
                 ImGui::EndTable();
             }
@@ -4002,73 +2325,8 @@ void RandomizerSettingsWindow::DrawElement() {
 
         if (ImGui::BeginTabItem("Starting Inventory")) {
             ImGui::PushStyleVar(ImGuiStyleVar_CellPadding, cellPadding);
-            if (ImGui::BeginTable("tableRandoStartingInventory", 3, ImGuiTableFlags_BordersH | ImGuiTableFlags_BordersV)) {
-                ImGui::TableSetupColumn("Starting Equipment", ImGuiTableColumnFlags_WidthStretch, 200.0f);
-                ImGui::TableSetupColumn("Starting Items", ImGuiTableColumnFlags_WidthStretch, 200.0f);
-                ImGui::TableSetupColumn("Starting Songs", ImGuiTableColumnFlags_WidthStretch, 200.0f);
-                ImGui::PushItemFlag(ImGuiItemFlags_Disabled, true);
-                ImGui::TableHeadersRow();
-                ImGui::PopItemFlag();
-                ImGui::TableNextRow();
-
-                // COLUMN 1 - STARTING EQUIPMENT
-                ImGui::TableNextColumn();
-                window->DC.CurrLineTextBaseOffset = 0.0f;
-                ImGui::BeginChild("ChildStartingEquipment", ImVec2(0, -8));
-                // Don't display this option if Dungeon Rewards are Shuffled to End of Dungeon.
-                // TODO: Show this but disabled when we have options for disabled Comboboxes.
-                if (CVarGetInteger("gRandomizeShuffleDungeonReward", RO_DUNGEON_REWARDS_END_OF_DUNGEON) != RO_DUNGEON_REWARDS_END_OF_DUNGEON) {
-                    ImGui::Text("%s", ctx->GetOption(RSK_LINKS_POCKET).GetName().c_str());
-                    UIWidgets::EnhancementCombobox("gRandomizeLinksPocket", randoLinksPocket, RO_LINKS_POCKET_DUNGEON_REWARD);
-                    UIWidgets::PaddedSeparator();
-                }
-
-                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_STARTING_KOKIRI_SWORD).GetName().c_str(), "gRandomizeStartingKokiriSword");
-                UIWidgets::PaddedSeparator();
-                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_STARTING_DEKU_SHIELD).GetName().c_str(), "gRandomizeStartingDekuShield");
-
-                UIWidgets::PaddedSeparator();
-
-                ImGui::EndChild();
-
-                // COLUMN 2 - STARTING ITEMS
-                ImGui::TableNextColumn();
-                window->DC.CurrLineTextBaseOffset = 0.0f;
-                ImGui::BeginChild("ChildStartingItems", ImVec2(0, -8));
-
-                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_STARTING_OCARINA).GetName().c_str(), "gRandomizeStartingOcarina");
-                UIWidgets::PaddedSeparator();
-                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_STARTING_CONSUMABLES).GetName().c_str(), "gRandomizeStartingConsumables");
-                UIWidgets::PaddedSeparator();
-                UIWidgets::EnhancementSliderInt("Gold Skulltula Tokens: %d", "##RandoStartingSkulltulaToken", "gRandomizeStartingSkulltulaToken", 0, 100, "", 0);
-                UIWidgets::PaddedSeparator();
-
-                ImGui::EndChild();
-
-                // COLUMN 3 - STARTING SONGS
-                ImGui::TableNextColumn();
-                window->DC.CurrLineTextBaseOffset = 0.0f;
-                ImGui::BeginChild("ChildStartingSongs", ImVec2(0, -8));
-                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_STARTING_ZELDAS_LULLABY).GetName().c_str(), "gRandomizeStartingZeldasLullaby");
-                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_STARTING_EPONAS_SONG).GetName().c_str(), "gRandomizeStartingEponasSong");
-                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_STARTING_SARIAS_SONG).GetName().c_str(), "gRandomizeStartingSariasSong");
-                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_STARTING_SUNS_SONG).GetName().c_str(), "gRandomizeStartingSunsSong");
-                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_STARTING_SONG_OF_TIME).GetName().c_str(), "gRandomizeStartingSongOfTime");
-                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_STARTING_SONG_OF_STORMS).GetName().c_str(), "gRandomizeStartingSongOfStorms");
-                UIWidgets::PaddedSeparator();
-
-                ImGui::Text("Warp Songs");
-                UIWidgets::PaddedSeparator();
-                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_STARTING_MINUET_OF_FOREST).GetName().c_str(), "gRandomizeStartingMinuetOfForest");
-                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_STARTING_BOLERO_OF_FIRE).GetName().c_str(), "gRandomizeStartingBoleroOfFire");
-                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_STARTING_SERENADE_OF_WATER).GetName().c_str(), "gRandomizeStartingSerenadeOfWater");
-                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_STARTING_REQUIEM_OF_SPIRIT).GetName().c_str(), "gRandomizeStartingRequiemOfSpirit");
-                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_STARTING_NOCTURNE_OF_SHADOW).GetName().c_str(), "gRandomizeStartingNocturneOfShadow");
-                UIWidgets::EnhancementCheckbox(ctx->GetOption(RSK_STARTING_PRELUDE_OF_LIGHT).GetName().c_str(), "gRandomizeStartingPreludeOfLight");
-                UIWidgets::PaddedSeparator();
-
-                ImGui::EndChild();
-                ImGui::EndTable();
+            if (mSettings->GetOptionGroup(RSG_STARTING_INVENTORY_IMGUI_TABLE).RenderImGui()) {
+                mNeedsUpdate = true;
             }
             ImGui::PopStyleVar(1);
             ImGui::EndTabItem();
@@ -4083,6 +2341,12 @@ void RandomizerSettingsWindow::DrawElement() {
     ImGui::End();
 }
 
+void RandomizerSettingsWindow::UpdateElement() {
+    if (mNeedsUpdate) {
+        mSettings->UpdateOptionProperties();
+    }
+}
+
 CustomMessage Randomizer::GetWarpSongMessage(u16 textId, bool mysterious) {
     CustomMessage messageEntry = CustomMessageManager::Instance->RetrieveMessage(
         Randomizer::hintMessageTableID, TEXT_WARP_RANDOM_REPLACED_TEXT);
@@ -4981,7 +3245,7 @@ void Randomizer::CreateCustomMessages() {
         GIMESSAGE_UNTRANSLATED(RG_BONGO_BONGO_SOUL, ITEM_BIG_POE, "You found the soul for %pBongo&Bongo%w!"),
         GIMESSAGE_UNTRANSLATED(RG_TWINROVA_SOUL, ITEM_BIG_POE, "You found the soul for %yTwinrova%w!"),
         GIMESSAGE_UNTRANSLATED(RG_GANON_SOUL, ITEM_BIG_POE, "You found the soul for %cGanon%w!"),
-        
+
     }};
     CreateGetItemMessages(&getItemMessages);
     CreateRupeeMessages();
@@ -5004,6 +3268,8 @@ class ExtendedVanillaTableInvalidItemIdException: public std::exception {
 };
 
 void RandomizerSettingsWindow::InitElement() {
+    mSettings = Rando::Context::GetInstance()->GetSettings();
     Randomizer::CreateCustomMessages();
     seedString = (char*)calloc(MAX_SEED_STRING_SIZE, sizeof(char));
+    Rando::Context::GetInstance()->GetSettings()->UpdateOptionProperties();
 }
diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h
index c91d0633b..52a86f649 100644
--- a/soh/soh/Enhancements/randomizer/randomizerTypes.h
+++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@@ -3317,6 +3317,26 @@ typedef enum {
     RSG_EXCLUDES,
     RSG_TRICKS,
     RSG_GLITCHES,
+    RSG_AREA_ACCESS_IMGUI,
+    RSG_WORLD_IMGUI,
+    RSG_SHUFFLE_ENTRANCES_IMGUI,
+    RSG_WORLD_IMGUI_TABLE,
+    RSG_SHUFFLE_ITEMS_IMGUI,
+    RSG_SHUFFLE_NPCS_IMGUI,
+    RSG_SHUFFLE_DUNGEON_ITEMS_IMGUI,
+    RSG_ITEMS_IMGUI_TABLE,
+    RSG_TIMESAVERS_IMGUI,
+    RSG_ITEM_POOL_HINTS_IMGUI,
+    RSG_EXTRA_HINTS_IMGUI,
+    RSG_ITEM_POOL_HINTS_IMGUI_COLUMN,
+    RSG_ADDITIONAL_FEATURES_IMGUI,
+    RSG_GAMEPLAY_IMGUI_TABLE,
+    RSG_STARTING_EQUIPMENT_IMGUI,
+    RSG_STARTING_ITEMS_IMGUI,
+    RSG_STARTING_NORMAL_SONGS_IMGUI,
+    RSG_STARTING_WARP_SONGS_IMGUI,
+    RSG_STARTING_SONGS_IMGUI,
+    RSG_STARTING_INVENTORY_IMGUI_TABLE,
     RSG_OPEN,
     RSG_WORLD,
     RSG_SHUFFLE,
diff --git a/soh/soh/Enhancements/randomizer/randomizer_settings_window.h b/soh/soh/Enhancements/randomizer/randomizer_settings_window.h
index bbb55ca3c..01ce3b083 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_settings_window.h
+++ b/soh/soh/Enhancements/randomizer/randomizer_settings_window.h
@@ -1,10 +1,18 @@
 #include <libultraship/libultraship.h>
 
+namespace Rando {
+class Settings;
+}
+
 class RandomizerSettingsWindow : public LUS::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
 
     void InitElement() override;
     void DrawElement() override;
-    void UpdateElement() override {};
-};
\ No newline at end of file
+    void UpdateElement() override;
+
+  private:
+    bool mNeedsUpdate = false;
+    std::shared_ptr<Rando::Settings> mSettings;
+};
diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
index 65c98e251..114f2201a 100644
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -3,6 +3,8 @@
 #include "dungeon.h"
 #include "context.h"
 
+#include "soh/OTRGlobals.h"
+
 #include <spdlog/spdlog.h>
 
 #include <utility>
@@ -36,157 +38,160 @@ Settings::Settings() : mExcludeLocationsOptionsGroups(SPOILER_COLLECTION_GROUP_C
 }
 
 void Settings::CreateOptions() {
-    //clang-format off
-    mOptions[RSK_FOREST] = Option::U8("Forest", {"Closed", "Closed Deku", "Open"}, OptionCategory::Setting, RO_FOREST_CLOSED);
-    mOptions[RSK_KAK_GATE] = Option::U8("Kakariko Gate", {"Close", "Open"});
-    mOptions[RSK_DOOR_OF_TIME] = Option::U8("Door of Time", {"Closed", "Song only", "Open"});
-    mOptions[RSK_ZORAS_FOUNTAIN] = Option::U8("Zora's Fountain", {"Closed", "Closed as child", "Open"});
-    mOptions[RSK_GERUDO_FORTRESS] = Option::U8("Gerudo Fortress", {"Normal", "Fast", "Open"});
-    mOptions[RSK_RAINBOW_BRIDGE] = Option::U8("Rainbow Bridge", {"Vanilla", "Always open", "Stones", "Medallions", "Dungeons", "Tokens", "Greg"}, OptionCategory::Setting, RO_BRIDGE_VANILLA);
-    mOptions[RSK_RAINBOW_BRIDGE_STONE_COUNT] = Option::U8("Stone Count", {NumOpts(0, 4)}, OptionCategory::Setting, 1, true);
-    mOptions[RSK_RAINBOW_BRIDGE_MEDALLION_COUNT] = Option::U8("Medallion Count", {NumOpts(0, 7)}, OptionCategory::Setting, 1, true);
-    mOptions[RSK_RAINBOW_BRIDGE_REWARD_COUNT] = Option::U8("Reward Count", {NumOpts(0, 10)}, OptionCategory::Setting, 1, true);
-    mOptions[RSK_RAINBOW_BRIDGE_DUNGEON_COUNT] = Option::U8("Dungeon Count", {NumOpts(0, 9)}, OptionCategory::Setting, 1, true);
-    mOptions[RSK_RAINBOW_BRIDGE_TOKEN_COUNT] = Option::U8("Token Count", {NumOpts(0, 100)}, OptionCategory::Setting, 1, true);
-    mOptions[RSK_BRIDGE_OPTIONS] = Option::U8("Bridge Reward Options", {"Standard Rewards", "Greg as Reward", "Greg as Wildcard"});
-    mOptions[RSK_GANONS_TRIALS] = Option::U8("Ganon's Trials", {"Skip", "Set Number", "Random Number"}, OptionCategory::Setting, RO_GANONS_TRIALS_SKIP);
-    mOptions[RSK_TRIAL_COUNT] = Option::U8("Ganon's Trials Count", {NumOpts(1, 6)}, OptionCategory::Setting, 1, true);
-    mOptions[RSK_STARTING_AGE] = Option::U8("Starting Age", {"Child", "Adult", "Random"}, OptionCategory::Setting, RO_AGE_CHILD);
+    CreateOptionDescriptions();
+    // clang-format off
+    mOptions[RSK_FOREST] = Option::U8("Forest", {"Closed", "Closed Deku", "Open"}, OptionCategory::Setting, "gRandomizeForest", mOptionDescriptions[RSK_FOREST], WidgetType::Combobox, RO_FOREST_CLOSED);
+    mOptions[RSK_KAK_GATE] = Option::U8("Kakariko Gate", {"Close", "Open"}, OptionCategory::Setting, "gRandomizeKakarikoGate", mOptionDescriptions[RSK_KAK_GATE]);
+    mOptions[RSK_DOOR_OF_TIME] = Option::U8("Door of Time", {"Closed", "Song only", "Open"}, OptionCategory::Setting, "gRandomizeDoorOfTime", mOptionDescriptions[RSK_DOOR_OF_TIME], WidgetType::Combobox);
+    mOptions[RSK_ZORAS_FOUNTAIN] = Option::U8("Zora's Fountain", {"Closed", "Closed as child", "Open"}, OptionCategory::Setting, "gRandomizeZorasFountain", mOptionDescriptions[RSK_ZORAS_FOUNTAIN]);
+    mOptions[RSK_GERUDO_FORTRESS] = Option::U8("Gerudo Fortress", {"Normal", "Fast", "Open"}, OptionCategory::Setting, "gRandomizeGerudoFortress", mOptionDescriptions[RSK_GERUDO_FORTRESS]);
+    mOptions[RSK_RAINBOW_BRIDGE] = Option::U8("Rainbow Bridge", {"Vanilla", "Always open", "Stones", "Medallions", "Dungeon rewards", "Dungeons", "Tokens", "Greg"}, OptionCategory::Setting, "gRandomizeRainbowBridge", mOptionDescriptions[RSK_RAINBOW_BRIDGE], WidgetType::Combobox, RO_BRIDGE_VANILLA, false, IMFLAG_NONE);
+    mOptions[RSK_RAINBOW_BRIDGE_STONE_COUNT] = Option::U8("Stone Count", {NumOpts(0, 4)}, OptionCategory::Setting, "gRandomizeStoneCount", "", WidgetType::Slider, 3, true);
+    mOptions[RSK_RAINBOW_BRIDGE_MEDALLION_COUNT] = Option::U8("Medallion Count", {NumOpts(0, 7)}, OptionCategory::Setting, "gRandomizeMedallionCount", "", WidgetType::Slider, 6, true);
+    mOptions[RSK_RAINBOW_BRIDGE_REWARD_COUNT] = Option::U8("Reward Count", {NumOpts(0, 10)}, OptionCategory::Setting, "gRandomizeRewardCount", "", WidgetType::Slider, 9, true);
+    mOptions[RSK_RAINBOW_BRIDGE_DUNGEON_COUNT] = Option::U8("Dungeon Count", {NumOpts(0, 9)}, OptionCategory::Setting, "gRandomizeDungeonCount", "", WidgetType::Slider, 8, true);
+    mOptions[RSK_RAINBOW_BRIDGE_TOKEN_COUNT] = Option::U8("Token Count", {NumOpts(0, 100)}, OptionCategory::Setting, "gRandomizeTokenCount", "", WidgetType::Slider, 100, true);
+    mOptions[RSK_BRIDGE_OPTIONS] = Option::U8("Bridge Reward Options", {"Standard Rewards", "Greg as Reward", "Greg as Wildcard"}, OptionCategory::Setting, "gRandomizeBridgeRewardOptions", mOptionDescriptions[RSK_BRIDGE_OPTIONS], WidgetType::Combobox, RO_BRIDGE_STANDARD_REWARD, false, IMFLAG_NONE);
+    mOptions[RSK_GANONS_TRIALS] = Option::U8("Ganon's Trials", {"Skip", "Set Number", "Random Number"}, OptionCategory::Setting, "gRandomizeGanonTrial", mOptionDescriptions[RSK_GANONS_TRIALS], WidgetType::Combobox, RO_GANONS_TRIALS_SET_NUMBER);
+    mOptions[RSK_TRIAL_COUNT] = Option::U8("Ganon's Trials Count", {NumOpts(0, 6)}, OptionCategory::Setting, "gRandomizeGanonTrialCount", mOptionDescriptions[RSK_TRIAL_COUNT], WidgetType::Slider, 6, true);
+    mOptions[RSK_STARTING_AGE] = Option::U8("Starting Age", {"Child", "Adult", "Random"}, OptionCategory::Setting, "gRandomizeStartingAge", mOptionDescriptions[RSK_STARTING_AGE], WidgetType::Combobox, RO_AGE_CHILD);
     mOptions[RSK_SHUFFLE_ENTRANCES] = Option::Bool("Shuffle Entrances");
-    mOptions[RSK_SHUFFLE_DUNGEON_ENTRANCES] = Option::U8("Dungeon Entrances", {"Off", "On", "On + Ganon"});
-    mOptions[RSK_SHUFFLE_BOSS_ENTRANCES] = Option::U8("Boss Entrances", {"Off", "Age Restricted", "Full"});
-    mOptions[RSK_SHUFFLE_OVERWORLD_ENTRANCES] = Option::Bool("Overworld Entrances");
-    mOptions[RSK_SHUFFLE_INTERIOR_ENTRANCES] = Option::U8("Interior Entrances", {"Off", "Simple", "All"});
-    mOptions[RSK_SHUFFLE_GROTTO_ENTRANCES] = Option::Bool("Grottos Entrances");
-    mOptions[RSK_SHUFFLE_OWL_DROPS] = Option::Bool("Owl Drops");
-    mOptions[RSK_SHUFFLE_WARP_SONGS] = Option::Bool("Warp Songs");
-    mOptions[RSK_SHUFFLE_OVERWORLD_SPAWNS] = Option::Bool("Overworld Spawns");
-    mOptions[RSK_MIXED_ENTRANCE_POOLS] = Option::Bool("Mixed Entrance Pools");
-    mOptions[RSK_MIX_DUNGEON_ENTRANCES] = Option::Bool("Mix Dungeons");
-    mOptions[RSK_MIX_OVERWORLD_ENTRANCES] = Option::Bool("Mix Overworld");
-    mOptions[RSK_MIX_INTERIOR_ENTRANCES] = Option::Bool("Mix Interiors");
-    mOptions[RSK_MIX_GROTTO_ENTRANCES] = Option::Bool("Mix Grottos");
-    mOptions[RSK_DECOUPLED_ENTRANCES] = Option::Bool("Decouple Entrances");
-    mOptions[RSK_BOMBCHUS_IN_LOGIC] = Option::Bool("Bombchus in Logic");
-    mOptions[RSK_ENABLE_BOMBCHU_DROPS] = Option::U8("Bombchu Drops", {"No", "Yes"});
+    mOptions[RSK_SHUFFLE_DUNGEON_ENTRANCES] = Option::U8("Dungeon Entrances", {"Off", "On", "On + Ganon"}, OptionCategory::Setting, "gRandomizeShuffleDungeonsEntrances", mOptionDescriptions[RSK_SHUFFLE_DUNGEON_ENTRANCES], WidgetType::Combobox, RO_DUNGEON_ENTRANCE_SHUFFLE_OFF);
+    mOptions[RSK_SHUFFLE_BOSS_ENTRANCES] = Option::U8("Boss Entrances", {"Off", "Age Restricted", "Full"}, OptionCategory::Setting, "gRandomizeShuffleBossEntrances", mOptionDescriptions[RSK_SHUFFLE_BOSS_ENTRANCES], WidgetType::Combobox, RO_BOSS_ROOM_ENTRANCE_SHUFFLE_OFF);
+    mOptions[RSK_SHUFFLE_OVERWORLD_ENTRANCES] = Option::Bool("Overworld Entrances", "gRandomizeShuffleOverworldEntrances", mOptionDescriptions[RSK_SHUFFLE_OVERWORLD_ENTRANCES]);
+    mOptions[RSK_SHUFFLE_INTERIOR_ENTRANCES] = Option::U8("Interior Entrances", {"Off", "Simple", "All"}, OptionCategory::Setting, "gRandomizeShuffleInteriorsEntrances", mOptionDescriptions[RSK_SHUFFLE_INTERIOR_ENTRANCES], WidgetType::Combobox, RO_INTERIOR_ENTRANCE_SHUFFLE_OFF);
+    mOptions[RSK_SHUFFLE_GROTTO_ENTRANCES] = Option::Bool("Grottos Entrances", "gRandomizeShuffleGrottosEntrances", mOptionDescriptions[RSK_SHUFFLE_GROTTO_ENTRANCES]);
+    mOptions[RSK_SHUFFLE_OWL_DROPS] = Option::Bool("Owl Drops", "gRandomizeShuffleOwlDrops", mOptionDescriptions[RSK_SHUFFLE_OWL_DROPS]);
+    mOptions[RSK_SHUFFLE_WARP_SONGS] = Option::Bool("Warp Songs", "gRandomizeShuffleWarpSongs", mOptionDescriptions[RSK_SHUFFLE_WARP_SONGS]);
+    mOptions[RSK_SHUFFLE_OVERWORLD_SPAWNS] = Option::Bool("Overworld Spawns", "gRandomizeShuffleOverworldSpanws", mOptionDescriptions[RSK_SHUFFLE_OVERWORLD_SPAWNS]);
+    mOptions[RSK_MIXED_ENTRANCE_POOLS] = Option::Bool("Mixed Entrance Pools", "gRandomizeMixedEntrances", mOptionDescriptions[RSK_MIXED_ENTRANCE_POOLS]);
+    mOptions[RSK_MIX_DUNGEON_ENTRANCES] = Option::Bool("Mix Dungeons", "gRandomizeMixDungeons", mOptionDescriptions[RSK_MIX_DUNGEON_ENTRANCES], IMFLAG_NONE);
+    mOptions[RSK_MIX_OVERWORLD_ENTRANCES] = Option::Bool("Mix Overworld", "gRandomizeMixOverworld", mOptionDescriptions[RSK_MIX_OVERWORLD_ENTRANCES], IMFLAG_NONE);
+    mOptions[RSK_MIX_INTERIOR_ENTRANCES] = Option::Bool("Mix Interiors", "gRandomizeMixInteriors", mOptionDescriptions[RSK_MIX_INTERIOR_ENTRANCES], IMFLAG_NONE);
+    mOptions[RSK_MIX_GROTTO_ENTRANCES] = Option::Bool("Mix Grottos", "gRandomizeMixGrottos", mOptionDescriptions[RSK_MIX_GROTTO_ENTRANCES]);
+    mOptions[RSK_DECOUPLED_ENTRANCES] = Option::Bool("Decouple Entrances", "gRandomizeDecoupleEntrances", mOptionDescriptions[RSK_DECOUPLED_ENTRANCES]);
+    mOptions[RSK_BOMBCHUS_IN_LOGIC] = Option::Bool("Bombchus in Logic", "gRandomizeBombchusInLogic", mOptionDescriptions[RSK_BOMBCHUS_IN_LOGIC]);
+    mOptions[RSK_ENABLE_BOMBCHU_DROPS] = Option::U8("Bombchu Drops", {"No", "Yes"}, OptionCategory::Setting, "gRandomizeEnableBombchuDrops", mOptionDescriptions[RSK_ENABLE_BOMBCHU_DROPS], WidgetType::Combobox, RO_AMMO_DROPS_ON);
     // TODO: AmmoDrops and/or HeartDropRefill, combine with/separate Ammo Drops from Bombchu Drops?
-    mOptions[RSK_TRIFORCE_HUNT] = Option::Bool("Triforce Hunt");
-    mOptions[RSK_TRIFORCE_HUNT_PIECES_TOTAL] = Option::U8("Triforce Hunt Total Pieces", {NumOpts(0, 100)});
-    mOptions[RSK_TRIFORCE_HUNT_PIECES_REQUIRED] = Option::U8("Triforce Hunt Required Pieces", {NumOpts(0, 100)});
-    mOptions[RSK_MQ_DUNGEON_RANDOM] = Option::U8("MQ Dungeon Setting", {"None", "Set Number", "Random", "Selection Only"});
-    mOptions[RSK_MQ_DUNGEON_COUNT] = Option::U8("MQ Dungeon Count", {NumOpts(0, 12)});
-    mOptions[RSK_MQ_DUNGEON_SET] = Option::Bool("Set Dungeon Quests");
-    mOptions[RSK_MQ_DEKU_TREE] = Option::U8("Deku Tree", {"Vanilla", "Master Quest", "Random"});
-    mOptions[RSK_MQ_DODONGOS_CAVERN] = Option::U8("Dodongo's Cavern", {"Vanilla", "Master Quest", "Random"});
-    mOptions[RSK_MQ_JABU_JABU] = Option::U8("Jabu-Jabu's Belly", {"Vanilla", "Master Quest", "Random"});
-    mOptions[RSK_MQ_FOREST_TEMPLE] = Option::U8("Forest Temple", {"Vanilla", "Master Quest", "Random"});
-    mOptions[RSK_MQ_FIRE_TEMPLE] = Option::U8("Fire Temple", {"Vanilla", "Master Quest", "Random"});
-    mOptions[RSK_MQ_WATER_TEMPLE] = Option::U8("Water Temple", {"Vanilla", "Master Quest", "Random"});
-    mOptions[RSK_MQ_SPIRIT_TEMPLE] = Option::U8("Spirit Temple", {"Vanilla", "Master Quest", "Random"});
-    mOptions[RSK_MQ_SHADOW_TEMPLE] = Option::U8("Shadow Temple", {"Vanilla", "Master Quest", "Random"});
-    mOptions[RSK_MQ_BOTTOM_OF_THE_WELL] = Option::U8("Bottom of the Well", {"Vanilla", "Master Quest", "Random"});
-    mOptions[RSK_MQ_ICE_CAVERN] = Option::U8("Ice Cavern", {"Vanilla", "Master Quest", "Random"});
-    mOptions[RSK_MQ_GTG] = Option::U8("Gerudo Training Grounds", {"Vanilla", "Master Quest", "Random"});
-    mOptions[RSK_MQ_GANONS_CASTLE] = Option::U8("Ganon's Castle", {"Vanilla", "Master Quest", "Random"});
-    mOptions[RSK_SHUFFLE_DUNGEON_REWARDS] = Option::U8("Shuffle Dungeon Rewards", {"End of Dungeons", "Any Dungeon", "Overworld", "Anywhere"});
-    mOptions[RSK_LINKS_POCKET] = Option::U8("Link's Pocket", {"Dungeon Reward", "Advancement", "Anything", "Nothing"});
-    mOptions[RSK_SHUFFLE_SONGS] = Option::U8("Shuffle Songs", {"Song Locations", "Dungeon Rewards", "Anywhere"});
-    mOptions[RSK_SHOPSANITY] = Option::U8("Shopsanity", {"Off", "0 Items", "1 Item", "2 Items", "3 Items", "4 Items", "Random"});
-    mOptions[RSK_SHOPSANITY_PRICES] = Option::U8("Shopsanity Prices", {"Balanced", "Starting Wallet", "Adult Wallet", "Giant's Wallet", "Tycoon's Wallet"});
-    mOptions[RSK_SHOPSANITY_PRICES_AFFORDABLE] = Option::Bool("Affordable Prices"); // TODO: Can this be added as a selection for above option?
-    mOptions[RSK_SHUFFLE_TOKENS] = Option::U8("Tokensanity", {"Off", "Dungeons", "Overworld", "All Tokens"});
-    mOptions[RSK_SHUFFLE_SCRUBS] = Option::U8("Scrub Shuffle", {"Off", "Affordable", "Expensive", "Random Prices"});
-    mOptions[RSK_SHUFFLE_COWS] = Option::Bool("Shuffle Cows");
-    mOptions[RSK_SHUFFLE_KOKIRI_SWORD] = Option::Bool("Shuffle Kokiri Sword");
-    mOptions[RSK_SHUFFLE_MASTER_SWORD] = Option::Bool("Shuffle Master Sword");
-    mOptions[RSK_SHUFFLE_OCARINA] = Option::Bool("Shuffle Ocarinas");
-    mOptions[RSK_SHUFFLE_WEIRD_EGG] = Option::Bool("Shuffle Weird Egg");
-    mOptions[RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD] = Option::Bool("Shuffle Gerudo Membership Card");
-    mOptions[RSK_SHUFFLE_MAGIC_BEANS] = Option::Bool("Shuffle Magic Beans");
-    mOptions[RSK_SHUFFLE_MERCHANTS] = Option::U8("Shuffle Merchants", {"Off", "On (No Hints)", "On (With Hints)"});
-    mOptions[RSK_SHUFFLE_FROG_SONG_RUPEES] = Option::Bool("Shuffle Frog Song Rupees");
-    mOptions[RSK_SHUFFLE_ADULT_TRADE] = Option::Bool("Shuffle Adult Trade");
+    mOptions[RSK_TRIFORCE_HUNT] = Option::Bool("Triforce Hunt", "gRandomizeTriforceHunt", mOptionDescriptions[RSK_TRIFORCE_HUNT], IMFLAG_NONE);
+    mOptions[RSK_TRIFORCE_HUNT_PIECES_TOTAL] = Option::U8("Triforce Hunt Total Pieces", {NumOpts(1, 100)}, OptionCategory::Setting, "gRandomizeTriforceHuntTotalPieces", mOptionDescriptions[RSK_TRIFORCE_HUNT_PIECES_TOTAL], WidgetType::Slider, 29, false, IMFLAG_NONE);
+    mOptions[RSK_TRIFORCE_HUNT_PIECES_REQUIRED] = Option::U8("Triforce Hunt Required Pieces", {NumOpts(1, 100)}, OptionCategory::Setting, "gRandomizeTriforceHuntRequiredPieces", mOptionDescriptions[RSK_TRIFORCE_HUNT_PIECES_REQUIRED], WidgetType::Slider, 19);
+    mOptions[RSK_MQ_DUNGEON_RANDOM] = Option::U8("MQ Dungeon Setting", {"None", "Set Number", "Random", "Selection Only"}, OptionCategory::Setting, "gRandomizeMqDungeons", mOptionDescriptions[RSK_MQ_DUNGEON_RANDOM], WidgetType::Combobox, RO_MQ_DUNGEONS_NONE, true, IMFLAG_NONE);
+    mOptions[RSK_MQ_DUNGEON_COUNT] = Option::U8("MQ Dungeon Count", {NumOpts(0, 12)}, OptionCategory::Setting, "gRandomizeMqDungeonCount", "", WidgetType::Slider, 12, true, IMFLAG_NONE);
+    mOptions[RSK_MQ_DUNGEON_SET] = Option::Bool("Set Dungeon Quests", {"Off", "On"}, OptionCategory::Setting, "gRandomizeMqDungeonsSelection", mOptionDescriptions[RSK_MQ_DUNGEON_SET], WidgetType::Checkbox, false, false, IMFLAG_NONE);
+    mOptions[RSK_MQ_DEKU_TREE] = Option::U8("Deku Tree", {"Vanilla", "Master Quest", "Random"}, OptionCategory::Setting, "gRandomizeMqDungeonsDekuTree", "", WidgetType::Combobox, RO_MQ_SET_VANILLA, false, IMFLAG_NONE);
+    mOptions[RSK_MQ_DODONGOS_CAVERN] = Option::U8("Dodongo's Cavern", {"Vanilla", "Master Quest", "Random"}, OptionCategory::Setting, "gRandomizeMqDungeonsDodongosCavern", "", WidgetType::Combobox, RO_MQ_SET_VANILLA, false, IMFLAG_NONE);
+    mOptions[RSK_MQ_JABU_JABU] = Option::U8("Jabu-Jabu's Belly", {"Vanilla", "Master Quest", "Random"}, OptionCategory::Setting, "gRandomizeMqDungeonsJabuJabu", "", WidgetType::Combobox, RO_MQ_SET_VANILLA, false, IMFLAG_NONE);
+    mOptions[RSK_MQ_FOREST_TEMPLE] = Option::U8("Forest Temple", {"Vanilla", "Master Quest", "Random"}, OptionCategory::Setting, "gRandomizeMqDungeonsForestTemple", "", WidgetType::Combobox, RO_MQ_SET_VANILLA, false, IMFLAG_NONE);
+    mOptions[RSK_MQ_FIRE_TEMPLE] = Option::U8("Fire Temple", {"Vanilla", "Master Quest", "Random"}, OptionCategory::Setting, "gRandomizeMqDungeonsFireTemple", "", WidgetType::Combobox, RO_MQ_SET_VANILLA, false, IMFLAG_NONE);
+    mOptions[RSK_MQ_WATER_TEMPLE] = Option::U8("Water Temple", {"Vanilla", "Master Quest", "Random"}, OptionCategory::Setting, "gRandomizeMqDungeonsWaterTemple", "", WidgetType::Combobox, RO_MQ_SET_VANILLA, false, IMFLAG_NONE);
+    mOptions[RSK_MQ_SPIRIT_TEMPLE] = Option::U8("Spirit Temple", {"Vanilla", "Master Quest", "Random"}, OptionCategory::Setting, "gRandomizeMqDungeonsSpiritTemple", "", WidgetType::Combobox, RO_MQ_SET_VANILLA, false, IMFLAG_NONE);
+    mOptions[RSK_MQ_SHADOW_TEMPLE] = Option::U8("Shadow Temple", {"Vanilla", "Master Quest", "Random"}, OptionCategory::Setting, "gRandomizeMqDungeonsShadowTemple", "", WidgetType::Combobox, RO_MQ_SET_VANILLA, false, IMFLAG_NONE);
+    mOptions[RSK_MQ_BOTTOM_OF_THE_WELL] = Option::U8("Bottom of the Well", {"Vanilla", "Master Quest", "Random"}, OptionCategory::Setting, "gRandomizeMqDungeonsBottomOfTheWell", "", WidgetType::Combobox, RO_MQ_SET_VANILLA, false, IMFLAG_NONE);
+    mOptions[RSK_MQ_ICE_CAVERN] = Option::U8("Ice Cavern", {"Vanilla", "Master Quest", "Random"}, OptionCategory::Setting, "gRandomizeMqDungeonsIceCavern", "", WidgetType::Combobox, RO_MQ_SET_VANILLA, false, IMFLAG_NONE);
+    mOptions[RSK_MQ_GTG] = Option::U8("Gerudo Training Grounds", {"Vanilla", "Master Quest", "Random"}, OptionCategory::Setting, "gRandomizeMqDungeonsGTG", "", WidgetType::Combobox, RO_MQ_SET_VANILLA, false, IMFLAG_NONE);
+    mOptions[RSK_MQ_GANONS_CASTLE] = Option::U8("Ganon's Castle", {"Vanilla", "Master Quest", "Random"}, OptionCategory::Setting, "gRandomizeMqDungeonsGanonsCastle", "", WidgetType::Combobox, RO_MQ_SET_VANILLA);
+    mOptions[RSK_SHUFFLE_DUNGEON_REWARDS] = Option::U8("Shuffle Dungeon Rewards", {"End of Dungeons", "Any Dungeon", "Overworld", "Anywhere"}, OptionCategory::Setting, "gRandomizeShuffleDungeonReward", mOptionDescriptions[RSK_SHUFFLE_DUNGEON_REWARDS], WidgetType::Combobox, RO_DUNGEON_REWARDS_END_OF_DUNGEON);
+    mOptions[RSK_LINKS_POCKET] = Option::U8("Link's Pocket", {"Dungeon Reward", "Advancement", "Anything", "Nothing"}, OptionCategory::Setting, "gRandomizeLinksPocket", "", WidgetType::Combobox, RO_LINKS_POCKET_DUNGEON_REWARD, true);
+    mOptions[RSK_SHUFFLE_SONGS] = Option::U8("Shuffle Songs", {"Song Locations", "Dungeon Rewards", "Anywhere"}, OptionCategory::Setting, "gRandomizeShuffleSongs", mOptionDescriptions[RSK_SHUFFLE_SONGS], WidgetType::Combobox, RO_SONG_SHUFFLE_SONG_LOCATIONS);
+    mOptions[RSK_SHOPSANITY] = Option::U8("Shopsanity", {"Off", "0 Items", "1 Item", "2 Items", "3 Items", "4 Items", "Random"}, OptionCategory::Setting, "gRandomizeShopsanity", mOptionDescriptions[RSK_SHOPSANITY], WidgetType::Combobox, RO_SHOPSANITY_OFF);
+    mOptions[RSK_SHOPSANITY_PRICES] = Option::U8("Shopsanity Prices", {"Balanced", "Starting Wallet", "Adult Wallet", "Giant's Wallet", "Tycoon's Wallet"}, OptionCategory::Setting, "gRandomizeShopsanityPrices", mOptionDescriptions[RSK_SHOPSANITY_PRICES], WidgetType::Combobox, RO_SHOPSANITY_PRICE_BALANCED, false, IMFLAG_NONE);
+    mOptions[RSK_SHOPSANITY_PRICES_AFFORDABLE] = Option::Bool("Affordable Prices", "gRandomizeShopsanityPricesAffordable", mOptionDescriptions[RSK_SHOPSANITY_PRICES_AFFORDABLE]);
+    mOptions[RSK_SHUFFLE_TOKENS] = Option::U8("Tokensanity", {"Off", "Dungeons", "Overworld", "All Tokens"}, OptionCategory::Setting, "gRandomizeShuffleTokens", mOptionDescriptions[RSK_SHUFFLE_TOKENS], WidgetType::Combobox, RO_TOKENSANITY_OFF);
+    mOptions[RSK_SHUFFLE_SCRUBS] = Option::U8("Scrub Shuffle", {"Off", "Affordable", "Expensive", "Random Prices"}, OptionCategory::Setting, "gRandomizeShuffleScrubs", mOptionDescriptions[RSK_SHUFFLE_SCRUBS], WidgetType::Combobox, RO_SCRUBS_OFF);
+    mOptions[RSK_SHUFFLE_COWS] = Option::Bool("Shuffle Cows", "gRandomizeShuffleCows", mOptionDescriptions[RSK_SHUFFLE_COWS]);
+    mOptions[RSK_SHUFFLE_KOKIRI_SWORD] = Option::Bool("Shuffle Kokiri Sword", "gRandomizeShuffleKokiriSword", mOptionDescriptions[RSK_SHUFFLE_KOKIRI_SWORD]);
+    mOptions[RSK_SHUFFLE_MASTER_SWORD] = Option::Bool("Shuffle Master Sword", "gRandomizeShuffleMasterSword", mOptionDescriptions[RSK_SHUFFLE_MASTER_SWORD]);
+    mOptions[RSK_SHUFFLE_OCARINA] = Option::Bool("Shuffle Ocarinas", "gRandomizeShuffleOcarinas", mOptionDescriptions[RSK_SHUFFLE_OCARINA]);
+    mOptions[RSK_SHUFFLE_WEIRD_EGG] = Option::Bool("Shuffle Weird Egg", "gRandomizeShuffleWeirdEgg", mOptionDescriptions[RSK_SHUFFLE_WEIRD_EGG]);
+    mOptions[RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD] = Option::Bool("Shuffle Gerudo Membership Card", "gRandomizeShuffleGerudoToken", mOptionDescriptions[RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD]);
+    mOptions[RSK_SHUFFLE_MAGIC_BEANS] = Option::Bool("Shuffle Magic Beans", "gRandomizeShuffleBeans", mOptionDescriptions[RSK_SHUFFLE_MAGIC_BEANS]);
+    mOptions[RSK_SHUFFLE_MERCHANTS] = Option::U8("Shuffle Merchants", {"Off", "On (No Hints)", "On (With Hints)"}, OptionCategory::Setting, "gRandomizeShuffleMerchants", mOptionDescriptions[RSK_SHUFFLE_MERCHANTS], WidgetType::Combobox, RO_SHUFFLE_MERCHANTS_OFF);
+    mOptions[RSK_SHUFFLE_FROG_SONG_RUPEES] = Option::Bool("Shuffle Frog Song Rupees", "gRandomizeShuffleFrogSongRupees", mOptionDescriptions[RSK_SHUFFLE_FROG_SONG_RUPEES]);
+    mOptions[RSK_SHUFFLE_ADULT_TRADE] = Option::Bool("Shuffle Adult Trade", "gRandomizeShuffleAdultTrade", mOptionDescriptions[RSK_SHUFFLE_ADULT_TRADE]);
     mOptions[RSK_SHUFFLE_CHEST_MINIGAME] = Option::U8("Shuffle Chest Minigame", {"Off", "On (Separate)", "On (Pack)"});
-    mOptions[RSK_SHUFFLE_100_GS_REWARD] = Option::Bool("Shuffle 100 GS Reward");
-    mOptions[RSK_SHUFFLE_BOSS_SOULS] = Option::U8("Shuffle Boss Souls", {"Off", "On", "On + Ganon"});
-    mOptions[RSK_SHUFFLE_MAPANDCOMPASS] = Option::U8("Maps/Compasses", {"Start With", "Vanilla", "Own Dungeon", "Any Dungeon", "Overworld", "Anywhere"}, OptionCategory::Setting, RO_DUNGEON_ITEM_LOC_OWN_DUNGEON);
-    mOptions[RSK_KEYSANITY] = Option::U8("Small Keys", {"Start With", "Vanilla", "Own Dungeon", "Any Dungeon", "Overworld", "Anywhere"}, OptionCategory::Setting, RO_DUNGEON_ITEM_LOC_OWN_DUNGEON);
-    mOptions[RSK_GERUDO_KEYS] = Option::U8("Gerudo Fortress Keys", {"Vanilla", "Any Dungeon", "Overworld", "Anywhere"});
-    mOptions[RSK_BOSS_KEYSANITY] = Option::U8("Boss Keys", {"Start With", "Vanilla", "Own Dungeon", "Any Dungeon", "Overworld", "Anywhere"}, OptionCategory::Setting, RO_DUNGEON_ITEM_LOC_OWN_DUNGEON);
-    mOptions[RSK_GANONS_BOSS_KEY] = Option::U8("Ganon's Boss Key", {"Vanilla", "Own Dungeon", "Start With", "Any Dungeon", "Overworld", "Anywhere", "LACS-Vanilla", "LACS-Stones", "LACS-Medallions", "LACS-Rewards", "LACS-Dungeons", "LACS-Tokens", "Triforce Hunt"}, OptionCategory::Setting, RO_GANON_BOSS_KEY_VANILLA);
-    mOptions[RSK_LACS_STONE_COUNT] = Option::U8("Stone Count", {NumOpts(0, 4)}, OptionCategory::Setting, 1, true);
-    mOptions[RSK_LACS_MEDALLION_COUNT] = Option::U8("Medallion Count", {NumOpts(0, 7)}, OptionCategory::Setting, 1, true);
-    mOptions[RSK_LACS_REWARD_COUNT] = Option::U8("Reward Count", {NumOpts(0, 10)}, OptionCategory::Setting, 1, true);
-    mOptions[RSK_LACS_DUNGEON_COUNT] = Option::U8("Dungeon Count", {NumOpts(0, 9)}, OptionCategory::Setting, 1, true);
-    mOptions[RSK_LACS_TOKEN_COUNT] = Option::U8("Token Count", {NumOpts(0, 100)}, OptionCategory::Setting, 1, true);
-    mOptions[RSK_LACS_OPTIONS] = Option::U8("LACS Reward Options", {"Standard Reward", "Greg as Reward", "Greg as Wildcard"});
-    mOptions[RSK_KEYRINGS] = Option::U8("Key Rings", {"Off", "Random", "Count", "Selection"});
-    mOptions[RSK_KEYRINGS_RANDOM_COUNT] = Option::U8("Keyring Dungeon Count", {NumOpts(0, 9)}, OptionCategory::Setting, 1);
-    mOptions[RSK_KEYRINGS_GERUDO_FORTRESS] = Option::Bool("Gerudo Fortress");
-    mOptions[RSK_KEYRINGS_FOREST_TEMPLE] = Option::Bool("Forest Temple");
-    mOptions[RSK_KEYRINGS_FIRE_TEMPLE] = Option::Bool("Fire Temple");
-    mOptions[RSK_KEYRINGS_WATER_TEMPLE] = Option::Bool("Water Temple");
-    mOptions[RSK_KEYRINGS_SPIRIT_TEMPLE] = Option::Bool("Spirit Temple");
-    mOptions[RSK_KEYRINGS_SHADOW_TEMPLE] = Option::Bool("Shadow Temple");
-    mOptions[RSK_KEYRINGS_BOTTOM_OF_THE_WELL] = Option::Bool("Bottom of the Well");
-    mOptions[RSK_KEYRINGS_GTG] = Option::Bool("Gerudo Training Grounds");
-    mOptions[RSK_KEYRINGS_GANONS_CASTLE] = Option::Bool("Ganon's Castle");
-    mOptions[RSK_SKIP_CHILD_STEALTH] = Option::Bool("Skip Child Stealth", {"Don't Skip", "Skip"}, OptionCategory::Setting, RO_GENERIC_SKIP);
-    mOptions[RSK_SKIP_CHILD_ZELDA] = Option::Bool("Skip Child Zelda", {"Don't Skip", "Skip"}, OptionCategory::Setting, RO_GENERIC_DONT_SKIP);
-    mOptions[RSK_SKIP_TOWER_ESCAPE] = Option::Bool("Skip Tower Escape", {"Don't Skip", "Skip"});
-    mOptions[RSK_SKIP_EPONA_RACE] = Option::Bool("Skip Epona Race", {"Don't Skip", "Skip"});
-    mOptions[RSK_SKIP_SCARECROWS_SONG] = Option::Bool("Skip Scarecrow's Song");
-    mOptions[RSK_BIG_POE_COUNT] = Option::U8("Big Poe Target Count", {NumOpts(1, 10)});
-    mOptions[RSK_CUCCO_COUNT] = Option::U8("Cuccos to return", {NumOpts(0, 7)});
-    mOptions[RSK_COMPLETE_MASK_QUEST] = Option::Bool("Complete Mask Quest");
-    mOptions[RSK_ENABLE_GLITCH_CUTSCENES] = Option::Bool("Enable Glitch-Useful Cutscenes");
-    mOptions[RSK_GOSSIP_STONE_HINTS] = Option::U8("Gossip Stone Hints", {"No Hints", "Need Nothing", "Mask of Truth", "Stone of Agony"}, OptionCategory::Setting, RO_GOSSIP_STONES_NEED_NOTHING);
-    mOptions[RSK_HINT_CLARITY] = Option::U8("Hint Clarity", {"Obscure", "Ambiguous", "Clear"});
-    mOptions[RSK_HINT_DISTRIBUTION] = Option::U8("Hint Distribution", {"Useless", "Balanced", "Strong", "Very Strong"}, OptionCategory::Setting, RO_HINT_DIST_BALANCED);
-    mOptions[RSK_TOT_ALTAR_HINT] = Option::Bool("ToT Altar Hint", {"Off", "On"}, OptionCategory::Setting, RO_GENERIC_ON);
-    mOptions[RSK_LIGHT_ARROWS_HINT] = Option::Bool("Light Arrow Hint", {"Off", "On"}, OptionCategory::Setting, RO_GENERIC_ON);
-    mOptions[RSK_DAMPES_DIARY_HINT] = Option::Bool("Dampe's Diary Hint");
-    mOptions[RSK_GREG_HINT] = Option::Bool("Greg the Green Rupee Hint");
-    mOptions[RSK_SARIA_HINT] = Option::Bool("Saria's Hint");
-    mOptions[RSK_FROGS_HINT] = Option::Bool("Frog Ocarina Game Hint");
-    mOptions[RSK_WARP_SONG_HINTS] = Option::Bool("Warp Song Hints");
-    mOptions[RSK_KAK_10_SKULLS_HINT] = Option::Bool("10 GS Hint");
-    mOptions[RSK_KAK_20_SKULLS_HINT] = Option::Bool("20 GS Hint");
-    mOptions[RSK_KAK_30_SKULLS_HINT] = Option::Bool("30 GS Hint");
-    mOptions[RSK_KAK_40_SKULLS_HINT] = Option::Bool("40 GS Hint");
-    mOptions[RSK_KAK_50_SKULLS_HINT] = Option::Bool("50 GS Hint");
-    mOptions[RSK_SCRUB_TEXT_HINT] = Option::Bool("Scrub Hint Text");
+    mOptions[RSK_SHUFFLE_100_GS_REWARD] = Option::Bool("Shuffle 100 GS Reward", "gRandomizeShuffle100GSReward", mOptionDescriptions[RSK_SHUFFLE_100_GS_REWARD], IMFLAG_SEPARATOR_BOTTOM, WidgetType::Checkbox, RO_GENERIC_OFF);
+    mOptions[RSK_SHUFFLE_BOSS_SOULS] = Option::U8("Shuffle Boss Souls", {"Off", "On", "On + Ganon"}, OptionCategory::Setting, "gRandomizeShuffleBossSouls", mOptionDescriptions[RSK_SHUFFLE_BOSS_SOULS], WidgetType::Combobox);
+    mOptions[RSK_SHUFFLE_MAPANDCOMPASS] = Option::U8("Maps/Compasses", {"Start With", "Vanilla", "Own Dungeon", "Any Dungeon", "Overworld", "Anywhere"}, OptionCategory::Setting, "gRandomizeStartingMapsCompasses", mOptionDescriptions[RSK_SHUFFLE_MAPANDCOMPASS], WidgetType::Combobox, RO_DUNGEON_ITEM_LOC_OWN_DUNGEON);
+    mOptions[RSK_KEYSANITY] = Option::U8("Small Keys", {"Start With", "Vanilla", "Own Dungeon", "Any Dungeon", "Overworld", "Anywhere"}, OptionCategory::Setting, "gRandomizeKeysanity", mOptionDescriptions[RSK_KEYSANITY], WidgetType::Combobox, RO_DUNGEON_ITEM_LOC_OWN_DUNGEON);
+    mOptions[RSK_GERUDO_KEYS] = Option::U8("Gerudo Fortress Keys", {"Vanilla", "Any Dungeon", "Overworld", "Anywhere"}, OptionCategory::Setting, "gRandomizeGerudoKeys", mOptionDescriptions[RSK_GERUDO_KEYS], WidgetType::Combobox, RO_GERUDO_KEYS_VANILLA);
+    mOptions[RSK_BOSS_KEYSANITY] = Option::U8("Boss Keys", {"Start With", "Vanilla", "Own Dungeon", "Any Dungeon", "Overworld", "Anywhere"}, OptionCategory::Setting, "gRandomizeBossKeysanity", mOptionDescriptions[RSK_BOSS_KEYSANITY], WidgetType::Combobox, RO_DUNGEON_ITEM_LOC_OWN_DUNGEON);
+    mOptions[RSK_GANONS_BOSS_KEY] = Option::U8("Ganon's Boss Key", {"Vanilla", "Own Dungeon", "Start With", "Any Dungeon", "Overworld", "Anywhere", "LACS-Vanilla", "LACS-Stones", "LACS-Medallions", "LACS-Rewards", "LACS-Dungeons", "LACS-Tokens", "Triforce Hunt"}, OptionCategory::Setting, "gRandomizeShuffleGanonBossKey", mOptionDescriptions[RSK_GANONS_BOSS_KEY], WidgetType::Combobox, RO_GANON_BOSS_KEY_VANILLA);
+    mOptions[RSK_LACS_STONE_COUNT] = Option::U8("Stone Count", {NumOpts(0, 4)}, OptionCategory::Setting, "gRandomizeLacsStoneCount", "", WidgetType::Slider, 3, true);
+    mOptions[RSK_LACS_MEDALLION_COUNT] = Option::U8("Medallion Count", {NumOpts(0, 7)}, OptionCategory::Setting, "gRandomizeLacsMedallionCount", "", WidgetType::Slider, 6, true);
+    mOptions[RSK_LACS_REWARD_COUNT] = Option::U8("Reward Count", {NumOpts(0, 10)}, OptionCategory::Setting, "gRandomizeLacsRewardCount", "", WidgetType::Slider, 9, true);
+    mOptions[RSK_LACS_DUNGEON_COUNT] = Option::U8("Dungeon Count", {NumOpts(0, 9)}, OptionCategory::Setting, "gRandomizeLacsDungeonCount", "", WidgetType::Slider, 8, true);
+    mOptions[RSK_LACS_TOKEN_COUNT] = Option::U8("Token Count", {NumOpts(0, 100)}, OptionCategory::Setting, "gRandomizeLacsTokenCount", "", WidgetType::Slider, 100, true);
+    mOptions[RSK_LACS_OPTIONS] = Option::U8("LACS Reward Options", {"Standard Reward", "Greg as Reward", "Greg as Wildcard"}, OptionCategory::Setting, "gRandomizeLacsRewardOptions", "", WidgetType::Combobox, RO_LACS_STANDARD_REWARD);
+    mOptions[RSK_KEYRINGS] = Option::U8("Key Rings", {"Off", "Random", "Count", "Selection"}, OptionCategory::Setting, "gRandomizeShuffleKeyRings", mOptionDescriptions[RSK_KEYRINGS], WidgetType::Combobox, RO_KEYRINGS_OFF);
+    mOptions[RSK_KEYRINGS_RANDOM_COUNT] = Option::U8("Keyring Dungeon Count", {NumOpts(0, 9)}, OptionCategory::Setting, "gRandomizeShuffleKeyRingsRandomCount", "", WidgetType::Slider, 8);
+    mOptions[RSK_KEYRINGS_GERUDO_FORTRESS] = Option::Bool("Gerudo Fortress", "gRandomizeShuffleKeyRingsGerudoFortress", "", IMFLAG_NONE);
+    mOptions[RSK_KEYRINGS_FOREST_TEMPLE] = Option::Bool("Forest Temple", "gRandomizeShuffleKeyRingsForestTemple", "", IMFLAG_NONE);
+    mOptions[RSK_KEYRINGS_FIRE_TEMPLE] = Option::Bool("Fire Temple", "gRandomizeShuffleKeyRingsFireTemple", "", IMFLAG_NONE);
+    mOptions[RSK_KEYRINGS_WATER_TEMPLE] = Option::Bool("Water Temple", "gRandomizeShuffleKeyRingsWaterTemple", "", IMFLAG_NONE);
+    mOptions[RSK_KEYRINGS_SPIRIT_TEMPLE] = Option::Bool("Spirit Temple", "gRandomizeShuffleKeyRingsSpiritTemple", "", IMFLAG_NONE);
+    mOptions[RSK_KEYRINGS_SHADOW_TEMPLE] = Option::Bool("Shadow Temple", "gRandomizeShuffleKeyRingsShadowTemple", "", IMFLAG_NONE);
+    mOptions[RSK_KEYRINGS_BOTTOM_OF_THE_WELL] = Option::Bool("Bottom of the Well", "gRandomizeShuffleKeyRingsBottomOfTheWell", "", IMFLAG_NONE);
+    mOptions[RSK_KEYRINGS_GTG] = Option::Bool("Gerudo Training Grounds", "gRandomizeShuffleKeyRingsGTG", "", IMFLAG_NONE);
+    mOptions[RSK_KEYRINGS_GANONS_CASTLE] = Option::Bool("Ganon's Castle", "gRandomizeShuffleKeyRingsGanonsCastle");
+    mOptions[RSK_SKIP_CHILD_STEALTH] = Option::Bool("Skip Child Stealth", {"Don't Skip", "Skip"}, OptionCategory::Setting, "gRandomizeSkipChildZelda", mOptionDescriptions[RSK_SKIP_CHILD_STEALTH], WidgetType::Checkbox, RO_GENERIC_DONT_SKIP);
+    mOptions[RSK_SKIP_CHILD_ZELDA] = Option::Bool("Skip Child Zelda", {"Don't Skip", "Skip"}, OptionCategory::Setting, "gRandomizeSkipChildZelda", mOptionDescriptions[RSK_SKIP_CHILD_ZELDA], WidgetType::Checkbox, RO_GENERIC_DONT_SKIP);
+    mOptions[RSK_SKIP_TOWER_ESCAPE] = Option::Bool("Skip Tower Escape", {"Don't Skip", "Skip"}, OptionCategory::Setting, "gRandomizeSkipTowerEscape", mOptionDescriptions[RSK_SKIP_TOWER_ESCAPE], WidgetType::Checkbox, RO_GENERIC_DONT_SKIP);
+    mOptions[RSK_SKIP_EPONA_RACE] = Option::Bool("Skip Epona Race", {"Don't Skip", "Skip"}, OptionCategory::Setting, "gRandomizeSkipEponaRace", mOptionDescriptions[RSK_SKIP_EPONA_RACE], WidgetType::Checkbox, RO_GENERIC_DONT_SKIP);
+    mOptions[RSK_SKIP_SCARECROWS_SONG] = Option::Bool("Skip Scarecrow's Song", "gRandomizeSkipScarecrowsSong", mOptionDescriptions[RSK_SKIP_SCARECROWS_SONG]);
+    mOptions[RSK_BIG_POE_COUNT] = Option::U8("Big Poe Target Count", {NumOpts(1, 10)}, OptionCategory::Setting, "gRandomizeBigPoeTargetCount", mOptionDescriptions[RSK_BIG_POE_COUNT], WidgetType::Slider, 9);
+    mOptions[RSK_CUCCO_COUNT] = Option::U8("Cuccos to return", {NumOpts(0, 7)}, OptionCategory::Setting, "gRandomizeCuccosToReturn", mOptionDescriptions[RSK_CUCCO_COUNT], WidgetType::Slider, 7);
+    mOptions[RSK_COMPLETE_MASK_QUEST] = Option::Bool("Complete Mask Quest", "gRandomizeCompleteMaskQuest", mOptionDescriptions[RSK_COMPLETE_MASK_QUEST]);
+    mOptions[RSK_ENABLE_GLITCH_CUTSCENES] = Option::Bool("Enable Glitch-Useful Cutscenes", "gRandomizeEnableGlitchCutscenes", mOptionDescriptions[RSK_ENABLE_GLITCH_CUTSCENES]);
+    mOptions[RSK_GOSSIP_STONE_HINTS] = Option::U8("Gossip Stone Hints", {"No Hints", "Need Nothing", "Mask of Truth", "Stone of Agony"}, OptionCategory::Setting, "gRandomizeGossipStoneHints", mOptionDescriptions[RSK_GOSSIP_STONE_HINTS], WidgetType::Combobox, RO_GOSSIP_STONES_NEED_NOTHING, false, IMFLAG_NONE);
+    mOptions[RSK_HINT_CLARITY] = Option::U8("Hint Clarity", {"Obscure", "Ambiguous", "Clear"}, OptionCategory::Setting, "gRandomizeHintClarity", mOptionDescriptions[RSK_HINT_CLARITY], WidgetType::Combobox, RO_HINT_CLARITY_CLEAR, true, IMFLAG_INDENT);
+    mOptions[RSK_HINT_DISTRIBUTION] = Option::U8("Hint Distribution", {"Useless", "Balanced", "Strong", "Very Strong"}, OptionCategory::Setting, "gRandomizeHintDistribution", mOptionDescriptions[RSK_HINT_DISTRIBUTION], WidgetType::Combobox, RO_HINT_DIST_BALANCED, true, IMFLAG_UNINDENT);
+    mOptions[RSK_TOT_ALTAR_HINT] = Option::Bool("ToT Altar Hint", {"Off", "On"}, OptionCategory::Setting, "gRandomizeAltarHint", mOptionDescriptions[RSK_TOT_ALTAR_HINT], WidgetType::Checkbox, RO_GENERIC_ON, false, IMFLAG_INDENT);
+    mOptions[RSK_LIGHT_ARROWS_HINT] = Option::Bool("Light Arrow Hint", {"Off", "On"}, OptionCategory::Setting, "gRandomizeLAHint", mOptionDescriptions[RSK_LIGHT_ARROWS_HINT], WidgetType::Checkbox, RO_GENERIC_ON, false, IMFLAG_NONE);
+    mOptions[RSK_DAMPES_DIARY_HINT] = Option::Bool("Dampe's Diary Hint", "gRandomizeDampeHint", mOptionDescriptions[RSK_DAMPES_DIARY_HINT], IMFLAG_NONE);
+    mOptions[RSK_GREG_HINT] = Option::Bool("Greg the Green Rupee Hint", "gRandomizeGregHint", mOptionDescriptions[RSK_GREG_HINT], IMFLAG_NONE);
+    mOptions[RSK_SARIA_HINT] = Option::Bool("Saria's Hint", "gRandomizeSariaHint", mOptionDescriptions[RSK_SARIA_HINT], IMFLAG_NONE);
+    mOptions[RSK_FROGS_HINT] = Option::Bool("Frog Ocarina Game Hint", "gRandomizeFrogsHint", mOptionDescriptions[RSK_FROGS_HINT], IMFLAG_NONE);
+    mOptions[RSK_WARP_SONG_HINTS] = Option::Bool("Warp Song Hints", "gRandomizeWarpSongText", mOptionDescriptions[RSK_WARP_SONG_HINTS], IMFLAG_NONE, WidgetType::Checkbox, RO_GENERIC_ON);
+    mOptions[RSK_KAK_10_SKULLS_HINT] = Option::Bool("10 GS Hint", "gRandomize10GSHint", "", IMFLAG_NONE);
+    mOptions[RSK_KAK_20_SKULLS_HINT] = Option::Bool("20 GS Hint", "gRandomize20GSHint", "", IMFLAG_NONE);
+    mOptions[RSK_KAK_30_SKULLS_HINT] = Option::Bool("30 GS Hint", "gRandomize30GSHint", "", IMFLAG_NONE);
+    mOptions[RSK_KAK_40_SKULLS_HINT] = Option::Bool("40 GS Hint", "gRandomize40GSHint", "", IMFLAG_NONE);
+    mOptions[RSK_KAK_50_SKULLS_HINT] = Option::Bool("50 GS Hint", "gRandomize50GSHint");
+    mOptions[RSK_SCRUB_TEXT_HINT] = Option::Bool("Scrub Hint Text", "gRandomizeScrubText", mOptionDescriptions[RSK_SCRUB_TEXT_HINT], IMFLAG_NONE);
     // TODO: Compasses show rewards/woth, maps show dungeon mode
-    mOptions[RSK_BLUE_FIRE_ARROWS] = Option::Bool("Blue Fire Arrows");
-    mOptions[RSK_SUNLIGHT_ARROWS] = Option::Bool("Sunlight Arrows");
-    mOptions[RSK_ITEM_POOL] = Option::U8("Item Pool", {"Plentiful", "Balanced", "Scarce", "Minimal"}, OptionCategory::Setting, RO_ITEM_POOL_BALANCED);
-    mOptions[RSK_ICE_TRAPS] = Option::U8("Ice Traps", {"Off", "Normal", "Extra", "Mayhem", "Onslaught"}, OptionCategory::Setting, RO_ICE_TRAPS_NORMAL);
+    mOptions[RSK_BLUE_FIRE_ARROWS] = Option::Bool("Blue Fire Arrows", "gRandomizeBlueFireArrows", mOptionDescriptions[RSK_BLUE_FIRE_ARROWS]);
+    mOptions[RSK_SUNLIGHT_ARROWS] = Option::Bool("Sunlight Arrows", "gRandomizeSunlightArrows", mOptionDescriptions[RSK_SUNLIGHT_ARROWS]);
+    mOptions[RSK_ITEM_POOL] = Option::U8("Item Pool", {"Plentiful", "Balanced", "Scarce", "Minimal"}, OptionCategory::Setting, "gRandomizeItemPool", mOptionDescriptions[RSK_ITEM_POOL], WidgetType::Combobox, RO_ITEM_POOL_BALANCED);
+    mOptions[RSK_ICE_TRAPS] = Option::U8("Ice Traps", {"Off", "Normal", "Extra", "Mayhem", "Onslaught"}, OptionCategory::Setting, "gRandomizeIceTraps", mOptionDescriptions[RSK_ICE_TRAPS], WidgetType::Combobox, RO_ICE_TRAPS_NORMAL);
     // TODO: Remove Double Defense, Progressive Goron Sword
-    mOptions[RSK_STARTING_OCARINA] = Option::U8("Start with Ocarina", {"Off", "Fairy Ocarina", "Ocarina of Time"});
-    mOptions[RSK_STARTING_DEKU_SHIELD] = Option::Bool("Start with Deku Shield");
-    mOptions[RSK_STARTING_KOKIRI_SWORD] = Option::Bool("Start with Kokiri Sword");
-    mOptions[RSK_STARTING_MASTER_SWORD] = Option::Bool("Start with Master Sword");
-    mOptions[RSK_STARTING_CONSUMABLES] = Option::Bool("Start with Consumables", {"No", "Yes"});
-    mOptions[RSK_FULL_WALLETS] = Option::Bool("Full Wallets", {"No", "Yes"});
-    mOptions[RSK_STARTING_ZELDAS_LULLABY] = Option::Bool("Start with Zelda's Lullaby");
-    mOptions[RSK_STARTING_EPONAS_SONG] = Option::Bool("Start with Epona's Song");
-    mOptions[RSK_STARTING_SARIAS_SONG] = Option::Bool("Start with Epona's Song");
-    mOptions[RSK_STARTING_SUNS_SONG] = Option::Bool("Start with Sun's Song");
-    mOptions[RSK_STARTING_SONG_OF_TIME] = Option::Bool("Start with Song of Time");
-    mOptions[RSK_STARTING_SONG_OF_STORMS] = Option::Bool("Start with Song of Storms");
-    mOptions[RSK_STARTING_MINUET_OF_FOREST] = Option::Bool("Start with Minuet of Forest");
-    mOptions[RSK_STARTING_BOLERO_OF_FIRE] = Option::Bool("Start with Bolero of Fire");
-    mOptions[RSK_STARTING_SERENADE_OF_WATER] = Option::Bool("Start with Serenade of Water");
-    mOptions[RSK_STARTING_REQUIEM_OF_SPIRIT] = Option::Bool("Start with Requiem of Spirit");
-    mOptions[RSK_STARTING_NOCTURNE_OF_SHADOW] = Option::Bool("Start with Nocturne of Shadow");
-    mOptions[RSK_STARTING_PRELUDE_OF_LIGHT] = Option::Bool("Start with Prelude of Light");
-    mOptions[RSK_STARTING_SKULLTULA_TOKEN] = Option::U8("Gold Skulltula Tokens", {NumOpts(0, 100)});
-    mOptions[RSK_STARTING_HEARTS] = Option::U8("Hearts", {NumOpts(1, 20)}, OptionCategory::Setting, 2);
+    mOptions[RSK_STARTING_OCARINA] = Option::U8("Start with Ocarina", {"Off", "Fairy Ocarina", "Ocarina of Time"}, OptionCategory::Setting, "gRandomizeStartingOcarina", "", WidgetType::Combobox, RO_STARTING_OCARINA_OFF);
+    mOptions[RSK_STARTING_DEKU_SHIELD] = Option::Bool("Start with Deku Shield", "gRandomizeStartingDekuShield");
+    mOptions[RSK_STARTING_KOKIRI_SWORD] = Option::Bool("Start with Kokiri Sword", "gRandomizeStartingKokiriSword");
+    mOptions[RSK_STARTING_MASTER_SWORD] = Option::Bool("Start with Master Sword", "gRandomizeStartingMasterSword");
+    mOptions[RSK_STARTING_CONSUMABLES] = Option::Bool("Start with Consumables", {"No", "Yes"}, OptionCategory::Setting, "gRandomizeStartingConsumables", "", WidgetType::Checkbox, RO_GENERIC_OFF);
+    mOptions[RSK_FULL_WALLETS] = Option::Bool("Full Wallets", {"No", "Yes"}, OptionCategory::Setting, "gRandomizeFullWallets", mOptionDescriptions[RSK_FULL_WALLETS], WidgetType::Checkbox, RO_GENERIC_OFF);
+    mOptions[RSK_STARTING_ZELDAS_LULLABY] = Option::Bool("Start with Zelda's Lullaby", "gRandomizeStartingZeldasLullaby", "", IMFLAG_NONE);
+    mOptions[RSK_STARTING_EPONAS_SONG] = Option::Bool("Start with Epona's Song", "gRandomizeStartingEponasSong", "", IMFLAG_NONE);
+    mOptions[RSK_STARTING_SARIAS_SONG] = Option::Bool("Start with Epona's Song", "gRandomizeStartingSariasSong", "", IMFLAG_NONE);
+    mOptions[RSK_STARTING_SUNS_SONG] = Option::Bool("Start with Sun's Song", "gRandomizeStartingSunsSong", "", IMFLAG_NONE);
+    mOptions[RSK_STARTING_SONG_OF_TIME] = Option::Bool("Start with Song of Time", "gRandomizeStartingSongOfTime", "", IMFLAG_NONE);
+    mOptions[RSK_STARTING_SONG_OF_STORMS] = Option::Bool("Start with Song of Storms", "gRandomizeStartingSongOfStorms", "", IMFLAG_NONE);
+    mOptions[RSK_STARTING_MINUET_OF_FOREST] = Option::Bool("Start with Minuet of Forest", "gRandomizeStartingMinuetOfForest", "", IMFLAG_NONE);
+    mOptions[RSK_STARTING_BOLERO_OF_FIRE] = Option::Bool("Start with Bolero of Fire", "gRandomizeStartingBoleroOfFire", "", IMFLAG_NONE);
+    mOptions[RSK_STARTING_SERENADE_OF_WATER] = Option::Bool("Start with Serenade of Water", "gRandomizeStartingSerenadeOfWater", "", IMFLAG_NONE);
+    mOptions[RSK_STARTING_REQUIEM_OF_SPIRIT] = Option::Bool("Start with Requiem of Spirit", "gRandomizeStartingRequiemOfSpirit", "", IMFLAG_NONE);
+    mOptions[RSK_STARTING_NOCTURNE_OF_SHADOW] = Option::Bool("Start with Nocturne of Shadow", "gRandomizeStartingNocturneOfShadow", "", IMFLAG_NONE);
+    mOptions[RSK_STARTING_PRELUDE_OF_LIGHT] = Option::Bool("Start with Prelude of Light", "gRandomizeStartingPreludeOfLight");
+    mOptions[RSK_STARTING_SKULLTULA_TOKEN] = Option::U8("Gold Skulltula Tokens", {NumOpts(0, 100)}, OptionCategory::Setting, "", "gRandomizeStartingSkulltulaToken", WidgetType::Slider);
+    mOptions[RSK_STARTING_HEARTS] = Option::U8("Hearts", {NumOpts(1, 20)}, OptionCategory::Setting, "", "", WidgetType::Slider, 2);
     // TODO: Remainder of Starting Items
-    mOptions[RSK_LOGIC_RULES] = Option::U8("Logic", {"Glitchless", "Glitched", "No Logic", "Vanilla"});
-    mOptions[RSK_ALL_LOCATIONS_REACHABLE] = Option::Bool("All Locations Reachable", {"Off", "On"}, OptionCategory::Setting, RO_GENERIC_ON);
-    mOptions[RSK_SKULLS_SUNS_SONG] = Option::Bool("Night Skulltula's Expect Sun's Song");
-    mOptions[RSK_DAMAGE_MULTIPLIER] = Option::U8("Damage Multiplier", {"x1/2", "x1", "x2", "x4", "x8", "x16", "OHKO"}, OptionCategory::Setting, RO_DAMAGE_MULTIPLIER_DEFAULT);
+    mOptions[RSK_LOGIC_RULES] = Option::U8("Logic", {"Glitchless", "Glitched", "No Logic", "Vanilla"}, OptionCategory::Setting, "gRandomizeLogicRules", mOptionDescriptions[RSK_LOGIC_RULES], WidgetType::Combobox, RO_LOGIC_GLITCHLESS);
+    mOptions[RSK_ALL_LOCATIONS_REACHABLE] = Option::Bool("All Locations Reachable", {"Off", "On"}, OptionCategory::Setting, "gRandomizeAllLocationsReachable", mOptionDescriptions[RSK_ALL_LOCATIONS_REACHABLE], WidgetType::Checkbox, RO_GENERIC_ON);
+    mOptions[RSK_SKULLS_SUNS_SONG] = Option::Bool("Night Skulltula's Expect Sun's Song", "gRandomizeGsExpectSunsSong", mOptionDescriptions[RSK_SKULLS_SUNS_SONG]);
+    mOptions[RSK_DAMAGE_MULTIPLIER] = Option::U8("Damage Multiplier", {"x1/2", "x1", "x2", "x4", "x8", "x16", "OHKO"}, OptionCategory::Setting, "", "", WidgetType::Slider, RO_DAMAGE_MULTIPLIER_DEFAULT);
+
+    mOptions[RSK_LANGUAGE] = Option::U8("Language", {"English", "German", "French"}, OptionCategory::Setting, "gLanguages", "", WidgetType::Combobox, LANGUAGE_ENG);
     // clang-format on
 
     mExcludeLocationsOptionsGroups.reserve(SPOILER_COLLECTION_GROUP_COUNT);
@@ -543,6 +548,201 @@ void Settings::CreateOptions() {
         &mTrickOptions[RT_GANON_MQ_LIGHT_TRIAL],
     }, false);
     // TODO: Glitches
+    mOptionGroups[RSG_AREA_ACCESS_IMGUI] = OptionGroup::SubGroup("Area Access", {
+        &mOptions[RSK_FOREST],
+        &mOptions[RSK_KAK_GATE],
+        &mOptions[RSK_DOOR_OF_TIME],
+        &mOptions[RSK_ZORAS_FOUNTAIN],
+    }, false, WidgetContainerType::COLUMN);
+    mOptionGroups[RSG_WORLD_IMGUI] = OptionGroup::SubGroup("World Settings", {
+        &mOptions[RSK_STARTING_AGE],
+        &mOptions[RSK_GERUDO_FORTRESS],
+        &mOptions[RSK_RAINBOW_BRIDGE],
+        &mOptions[RSK_BRIDGE_OPTIONS],
+        &mOptions[RSK_RAINBOW_BRIDGE_STONE_COUNT],
+        &mOptions[RSK_RAINBOW_BRIDGE_MEDALLION_COUNT],
+        &mOptions[RSK_RAINBOW_BRIDGE_REWARD_COUNT],
+        &mOptions[RSK_RAINBOW_BRIDGE_DUNGEON_COUNT],
+        &mOptions[RSK_RAINBOW_BRIDGE_TOKEN_COUNT],
+        &mOptions[RSK_GANONS_TRIALS],
+        &mOptions[RSK_TRIAL_COUNT],
+        &mOptions[RSK_MQ_DUNGEON_RANDOM],
+        &mOptions[RSK_MQ_DUNGEON_COUNT],
+        &mOptions[RSK_MQ_DUNGEON_SET],
+        &mOptions[RSK_MQ_DEKU_TREE],
+        &mOptions[RSK_MQ_DODONGOS_CAVERN],
+        &mOptions[RSK_MQ_JABU_JABU],
+        &mOptions[RSK_MQ_FOREST_TEMPLE],
+        &mOptions[RSK_MQ_FIRE_TEMPLE],
+        &mOptions[RSK_MQ_WATER_TEMPLE],
+        &mOptions[RSK_MQ_SPIRIT_TEMPLE],
+        &mOptions[RSK_MQ_SHADOW_TEMPLE],
+        &mOptions[RSK_MQ_BOTTOM_OF_THE_WELL],
+        &mOptions[RSK_MQ_ICE_CAVERN],
+        &mOptions[RSK_MQ_GTG],
+        &mOptions[RSK_MQ_GANONS_CASTLE],
+        &mOptions[RSK_TRIFORCE_HUNT],
+        &mOptions[RSK_TRIFORCE_HUNT_PIECES_TOTAL],
+        &mOptions[RSK_TRIFORCE_HUNT_PIECES_REQUIRED]
+    }, false, WidgetContainerType::COLUMN);
+    mOptionGroups[RSG_SHUFFLE_ENTRANCES_IMGUI] = OptionGroup::SubGroup("Shuffle Entrances", {
+        &mOptions[RSK_SHUFFLE_DUNGEON_ENTRANCES],
+        &mOptions[RSK_SHUFFLE_BOSS_ENTRANCES],
+        &mOptions[RSK_SHUFFLE_OVERWORLD_ENTRANCES],
+        &mOptions[RSK_SHUFFLE_INTERIOR_ENTRANCES],
+        &mOptions[RSK_SHUFFLE_GROTTO_ENTRANCES],
+        &mOptions[RSK_SHUFFLE_OWL_DROPS],
+        &mOptions[RSK_SHUFFLE_WARP_SONGS],
+        &mOptions[RSK_SHUFFLE_OVERWORLD_SPAWNS],
+        &mOptions[RSK_DECOUPLED_ENTRANCES],
+        &mOptions[RSK_MIXED_ENTRANCE_POOLS],
+        &mOptions[RSK_MIX_DUNGEON_ENTRANCES],
+        &mOptions[RSK_MIX_OVERWORLD_ENTRANCES],
+        &mOptions[RSK_MIX_INTERIOR_ENTRANCES],
+        &mOptions[RSK_MIX_GROTTO_ENTRANCES]
+    }, false, WidgetContainerType::COLUMN);
+    mOptionGroups[RSG_WORLD_IMGUI_TABLE] = OptionGroup::SubGroup("World", {
+        &mOptionGroups[RSG_AREA_ACCESS_IMGUI],
+        &mOptionGroups[RSG_WORLD_IMGUI],
+        &mOptionGroups[RSG_SHUFFLE_ENTRANCES_IMGUI],
+    }, false, WidgetContainerType::TABLE);
+    mOptionGroups[RSG_SHUFFLE_ITEMS_IMGUI] = OptionGroup::SubGroup("Shuffle Items", {
+        &mOptions[RSK_SHUFFLE_SONGS],
+        &mOptions[RSK_SHUFFLE_TOKENS],
+        &mOptions[RSK_SKULLS_SUNS_SONG],
+        &mOptions[RSK_SHUFFLE_KOKIRI_SWORD],
+        &mOptions[RSK_SHUFFLE_MASTER_SWORD],
+        &mOptions[RSK_SHUFFLE_OCARINA],
+        &mOptions[RSK_SHUFFLE_WEIRD_EGG],
+        &mOptions[RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD]
+    }, false, WidgetContainerType::COLUMN);
+    mOptionGroups[RSG_SHUFFLE_NPCS_IMGUI] = OptionGroup::SubGroup("Shuffle NPCs & Merchants", {
+        &mOptions[RSK_SHOPSANITY],
+        &mOptions[RSK_SHOPSANITY_PRICES],
+        &mOptions[RSK_SHOPSANITY_PRICES_AFFORDABLE],
+        &mOptions[RSK_SHUFFLE_SCRUBS],
+        &mOptions[RSK_SHUFFLE_COWS],
+        &mOptions[RSK_SHUFFLE_MAGIC_BEANS],
+        &mOptions[RSK_SHUFFLE_MERCHANTS],
+        &mOptions[RSK_SHUFFLE_ADULT_TRADE],
+        &mOptions[RSK_SHUFFLE_100_GS_REWARD],
+        &mOptions[RSK_SHUFFLE_BOSS_SOULS],
+    }, false, WidgetContainerType::COLUMN);
+    mOptionGroups[RSG_SHUFFLE_DUNGEON_ITEMS_IMGUI] = OptionGroup::SubGroup("Shuffle Dungeon Items", {
+        &mOptions[RSK_SHUFFLE_MAPANDCOMPASS],
+        &mOptions[RSK_KEYSANITY],
+        &mOptions[RSK_GERUDO_KEYS],
+        &mOptions[RSK_BOSS_KEYSANITY],
+        &mOptions[RSK_GANONS_BOSS_KEY],
+        &mOptions[RSK_LACS_STONE_COUNT],
+        &mOptions[RSK_LACS_MEDALLION_COUNT],
+        &mOptions[RSK_LACS_DUNGEON_COUNT],
+        &mOptions[RSK_LACS_REWARD_COUNT],
+        &mOptions[RSK_LACS_TOKEN_COUNT],
+        &mOptions[RSK_LACS_OPTIONS],
+        &mOptions[RSK_KEYRINGS],
+        &mOptions[RSK_KEYRINGS_RANDOM_COUNT],
+        &mOptions[RSK_KEYRINGS_GERUDO_FORTRESS],
+        &mOptions[RSK_KEYRINGS_FOREST_TEMPLE],
+        &mOptions[RSK_KEYRINGS_FIRE_TEMPLE],
+        &mOptions[RSK_KEYRINGS_WATER_TEMPLE],
+        &mOptions[RSK_KEYRINGS_SPIRIT_TEMPLE],
+        &mOptions[RSK_KEYRINGS_SHADOW_TEMPLE],
+        &mOptions[RSK_KEYRINGS_BOTTOM_OF_THE_WELL],
+        &mOptions[RSK_KEYRINGS_GTG],
+        &mOptions[RSK_KEYRINGS_GANONS_CASTLE],
+    }, false, WidgetContainerType::COLUMN);
+    mOptionGroups[RSG_ITEMS_IMGUI_TABLE] = OptionGroup::SubGroup("Items", {
+        &mOptionGroups[RSG_SHUFFLE_ITEMS_IMGUI],
+        &mOptionGroups[RSG_SHUFFLE_NPCS_IMGUI],
+        &mOptionGroups[RSG_SHUFFLE_DUNGEON_ITEMS_IMGUI],
+    }, false, WidgetContainerType::TABLE);
+    mOptionGroups[RSG_TIMESAVERS_IMGUI] = OptionGroup::SubGroup("Timesavers", {
+        &mOptions[RSK_CUCCO_COUNT],
+        &mOptions[RSK_BIG_POE_COUNT],
+        &mOptions[RSK_SKIP_CHILD_STEALTH],
+        &mOptions[RSK_SKIP_CHILD_ZELDA],
+        &mOptions[RSK_SKIP_EPONA_RACE],
+        &mOptions[RSK_SKIP_TOWER_ESCAPE],
+        &mOptions[RSK_COMPLETE_MASK_QUEST],
+        &mOptions[RSK_SKIP_SCARECROWS_SONG]
+    }, false, WidgetContainerType::COLUMN);
+    mOptionGroups[RSG_ITEM_POOL_HINTS_IMGUI] = OptionGroup::SubGroup("", {
+        &mOptions[RSK_ITEM_POOL],
+        &mOptions[RSK_ICE_TRAPS],
+        &mOptions[RSK_GOSSIP_STONE_HINTS],
+        &mOptions[RSK_HINT_CLARITY],
+        &mOptions[RSK_HINT_DISTRIBUTION],
+    }, false, WidgetContainerType::SECTION);
+    mOptionGroups[RSG_EXTRA_HINTS_IMGUI] = OptionGroup::SubGroup("Extra Hints", {
+        &mOptions[RSK_TOT_ALTAR_HINT],
+        &mOptions[RSK_LIGHT_ARROWS_HINT],
+        &mOptions[RSK_DAMPES_DIARY_HINT],
+        &mOptions[RSK_GREG_HINT],
+        &mOptions[RSK_SARIA_HINT],
+        &mOptions[RSK_FROGS_HINT],
+        &mOptions[RSK_WARP_SONG_HINTS],
+        &mOptions[RSK_SCRUB_TEXT_HINT],
+        &mOptions[RSK_KAK_10_SKULLS_HINT],
+        &mOptions[RSK_KAK_20_SKULLS_HINT],
+        &mOptions[RSK_KAK_30_SKULLS_HINT],
+        &mOptions[RSK_KAK_40_SKULLS_HINT],
+        &mOptions[RSK_KAK_50_SKULLS_HINT]
+    }, false, WidgetContainerType::SECTION, "This setting adds some hints at locations other than Gossip Stones.\n\n"
+                    "House of Skulltula: # - Talking to a cursed House of Skulltula resident will tell you the reward"
+                    "they will give you for obtaining that many tokens.");
+    mOptionGroups[RSG_ITEM_POOL_HINTS_IMGUI_COLUMN] = OptionGroup::SubGroup("Item Pool & Hints", std::initializer_list<OptionGroup*>{
+        &mOptionGroups[RSG_ITEM_POOL_HINTS_IMGUI],
+        &mOptionGroups[RSG_EXTRA_HINTS_IMGUI],
+    }, false, WidgetContainerType::COLUMN);
+    mOptionGroups[RSG_ADDITIONAL_FEATURES_IMGUI] = OptionGroup::SubGroup("Additional Features", {
+        &mOptions[RSK_FULL_WALLETS],
+        &mOptions[RSK_BOMBCHUS_IN_LOGIC],
+        &mOptions[RSK_ENABLE_BOMBCHU_DROPS],
+        &mOptions[RSK_BLUE_FIRE_ARROWS],
+        &mOptions[RSK_SUNLIGHT_ARROWS]
+    }, false, WidgetContainerType::COLUMN);
+    mOptionGroups[RSG_GAMEPLAY_IMGUI_TABLE] = OptionGroup::SubGroup("Gameplay", {
+        &mOptionGroups[RSG_TIMESAVERS_IMGUI],
+        &mOptionGroups[RSG_ITEM_POOL_HINTS_IMGUI_COLUMN],
+        &mOptionGroups[RSG_ADDITIONAL_FEATURES_IMGUI]
+    }, false, WidgetContainerType::TABLE);
+    mOptionGroups[RSG_STARTING_EQUIPMENT_IMGUI] = OptionGroup::SubGroup("Starting Equipment", {
+        &mOptions[RSK_LINKS_POCKET],
+        &mOptions[RSK_STARTING_KOKIRI_SWORD],
+        &mOptions[RSK_STARTING_MASTER_SWORD],
+        &mOptions[RSK_STARTING_DEKU_SHIELD]
+    }, false, WidgetContainerType::COLUMN);
+    mOptionGroups[RSG_STARTING_ITEMS_IMGUI] = OptionGroup::SubGroup("Starting Items", {
+        &mOptions[RSK_STARTING_OCARINA],
+        &mOptions[RSK_STARTING_CONSUMABLES],
+        &mOptions[RSK_STARTING_SKULLTULA_TOKEN],
+    }, false, WidgetContainerType::COLUMN);
+    mOptionGroups[RSG_STARTING_NORMAL_SONGS_IMGUI] = OptionGroup::SubGroup("Normal Songs", {
+        &mOptions[RSK_STARTING_ZELDAS_LULLABY],
+        &mOptions[RSK_STARTING_EPONAS_SONG],
+        &mOptions[RSK_STARTING_SARIAS_SONG],
+        &mOptions[RSK_STARTING_SUNS_SONG],
+        &mOptions[RSK_STARTING_SONG_OF_TIME],
+        &mOptions[RSK_STARTING_SONG_OF_STORMS],
+    }, false, WidgetContainerType::SECTION);
+    mOptionGroups[RSG_STARTING_WARP_SONGS_IMGUI] = OptionGroup::SubGroup("Warp Songs", {
+        &mOptions[RSK_STARTING_MINUET_OF_FOREST],
+        &mOptions[RSK_STARTING_BOLERO_OF_FIRE],
+        &mOptions[RSK_STARTING_SERENADE_OF_WATER],
+        &mOptions[RSK_STARTING_REQUIEM_OF_SPIRIT],
+        &mOptions[RSK_STARTING_NOCTURNE_OF_SHADOW],
+        &mOptions[RSK_STARTING_PRELUDE_OF_LIGHT]
+    }, false, WidgetContainerType::SECTION);
+    mOptionGroups[RSG_STARTING_SONGS_IMGUI] = OptionGroup::SubGroup("Starting Songs", std::initializer_list<OptionGroup*>({
+        &mOptionGroups[RSG_STARTING_NORMAL_SONGS_IMGUI],
+        &mOptionGroups[RSG_STARTING_WARP_SONGS_IMGUI],
+    }), false, WidgetContainerType::COLUMN);
+    mOptionGroups[RSG_STARTING_INVENTORY_IMGUI_TABLE] = OptionGroup::SubGroup("Starting Inventory", {
+        &mOptionGroups[RSG_STARTING_EQUIPMENT_IMGUI],
+        &mOptionGroups[RSG_STARTING_ITEMS_IMGUI],
+        &mOptionGroups[RSG_STARTING_SONGS_IMGUI]
+    }, false, WidgetContainerType::TABLE);
     mOptionGroups[RSG_OPEN] = OptionGroup("Open Settings", {
         &mOptions[RSK_FOREST],
         &mOptions[RSK_KAK_GATE],
@@ -707,11 +907,10 @@ void Settings::CreateOptions() {
         &mOptions[RSK_BLUE_FIRE_ARROWS],
         &mOptions[RSK_SUNLIGHT_ARROWS],
     });
-    // TODO: For some reason this group and only this group is an ambiguous constructor call, despite
-    // the initializer list only having Option* in it. For now explictly declare and initialize
-    // a vector of Option* and construct the group with that.
-    const std::vector<Option*> itemPoolOptions = {&mOptions[RSK_ITEM_POOL], &mOptions[RSK_ICE_TRAPS]};
-    mOptionGroups[RSG_ITEM_POOL] = OptionGroup("Item Pool Settings", itemPoolOptions);
+    mOptionGroups[RSG_ITEM_POOL] = OptionGroup("Item Pool Settings", std::initializer_list<Option*>({
+        &mOptions[RSK_ITEM_POOL],
+        &mOptions[RSK_ICE_TRAPS]
+    }));
     // TODO: Progressive Goron Sword, Remove Double Defense
     mOptionGroups[RSG_EXCLUDES_KOKIRI_FOREST] = OptionGroup::SubGroup("Kokiri Forest", mExcludeLocationsOptionsGroups[GROUP_KOKIRI_FOREST], false);
     mOptionGroups[RSG_EXCLUDES_LOST_WOODS] = OptionGroup::SubGroup("Lost Woods", mExcludeLocationsOptionsGroups[GROUP_LOST_WOODS], false);
@@ -930,7 +1129,7 @@ void Settings::CreateOptions() {
     };
 }
 
-Option& Settings::Setting(const RandomizerSettingKey key) {
+Option& Settings::GetOption(const RandomizerSettingKey key) {
     return mOptions[key];
 }
 
@@ -990,51 +1189,482 @@ const OptionGroup& Settings::GetOptionGroup(const RandomizerSettingGroupKey key)
     return mOptionGroups[key];
 }
 
-void Settings::UpdateSettings(std::unordered_map<RandomizerSettingKey, uint8_t> cvarSettings, const std::set<RandomizerCheck>& excludedLocations, const std::set<RandomizerTrick>& enabledTricks) {
-    const auto ctx = Context::GetInstance();
+void Settings::SetAllFromCVar() {
+    for (auto& option : mOptions) {
+        option.SetFromCVar();
+    }
+}
+
+void Settings::UpdateOptionProperties() {
+    // Starting Age - Disabled when Forest is set to Closed or under very specific conditions
+    if (CVarGetInteger("gRandomizeForest", RO_FOREST_CLOSED) == RO_FOREST_CLOSED ||
+        (CVarGetInteger("gRandomizeDoorOfTime", RO_DOOROFTIME_CLOSED) == RO_DOOROFTIME_CLOSED &&
+        CVarGetInteger("gRandomizeShuffleOcarinas", RO_GENERIC_OFF) == RO_GENERIC_OFF)) /* closed door of time with ocarina shuffle off */ {
+        mOptions[RSK_STARTING_AGE].Disable("This option is disabled due to other optionos making the game unbeatable");
+    } else {
+        mOptions[RSK_STARTING_AGE].Enable();
+    }
+    // Default to hiding bridge opts and the extra sliders.
+    mOptions[RSK_RAINBOW_BRIDGE].AddFlag(IMFLAG_SEPARATOR_BOTTOM);
+    mOptions[RSK_BRIDGE_OPTIONS].Hide();
+    mOptions[RSK_RAINBOW_BRIDGE_STONE_COUNT].Hide();
+    mOptions[RSK_RAINBOW_BRIDGE_MEDALLION_COUNT].Hide();
+    mOptions[RSK_RAINBOW_BRIDGE_REWARD_COUNT].Hide();
+    mOptions[RSK_RAINBOW_BRIDGE_DUNGEON_COUNT].Hide();
+    mOptions[RSK_RAINBOW_BRIDGE_TOKEN_COUNT].Hide();
+    const uint8_t bridgeOpt = CVarGetInteger("gRandomizeBridgeRewardOptions", RO_BRIDGE_STANDARD_REWARD);
+    switch (CVarGetInteger("gRandomizeRainbowBridge", RO_BRIDGE_VANILLA)) {
+        case RO_BRIDGE_STONES:
+            // Show Bridge Options and Stone Count slider
+            mOptions[RSK_RAINBOW_BRIDGE].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
+            mOptions[RSK_BRIDGE_OPTIONS].Unhide();
+            mOptions[RSK_RAINBOW_BRIDGE_STONE_COUNT].Unhide();
+            if (bridgeOpt == RO_BRIDGE_GREG_REWARD) {
+                if (mOptions[RSK_RAINBOW_BRIDGE_STONE_COUNT].GetOptionCount() == 4) {
+                    mOptions[RSK_RAINBOW_BRIDGE_STONE_COUNT].ChangeOptions(NumOpts(0, 4));
+                }
+            } else {
+                if (mOptions[RSK_RAINBOW_BRIDGE_STONE_COUNT].GetOptionCount() == 5) {
+                    mOptions[RSK_RAINBOW_BRIDGE_STONE_COUNT].ChangeOptions(NumOpts(0, 3));
+                }
+            }
+            break;
+        case RO_BRIDGE_MEDALLIONS:
+            // Show Bridge Options and Medallion Count Slider
+            mOptions[RSK_RAINBOW_BRIDGE].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
+            mOptions[RSK_BRIDGE_OPTIONS].Unhide();
+            mOptions[RSK_RAINBOW_BRIDGE_REWARD_COUNT].Unhide();
+            if (bridgeOpt == RO_BRIDGE_GREG_REWARD) {
+                if (mOptions[RSK_RAINBOW_BRIDGE_MEDALLION_COUNT].GetOptionCount() == 7) {
+                    mOptions[RSK_RAINBOW_BRIDGE_MEDALLION_COUNT].ChangeOptions(NumOpts(0, 7));
+                }
+            } else {
+                if (mOptions[RSK_RAINBOW_BRIDGE_MEDALLION_COUNT].GetOptionCount() == 8) {
+                    mOptions[RSK_RAINBOW_BRIDGE_MEDALLION_COUNT].ChangeOptions(NumOpts(0, 6));
+                }
+            }
+            break;
+        case RO_BRIDGE_DUNGEON_REWARDS:
+            // Show Bridge Options and Dungeon Reward Count Slider
+            mOptions[RSK_RAINBOW_BRIDGE].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
+            mOptions[RSK_BRIDGE_OPTIONS].Unhide();
+            mOptions[RSK_RAINBOW_BRIDGE_REWARD_COUNT].Unhide();
+            if (bridgeOpt == RO_BRIDGE_GREG_REWARD) {
+                if (mOptions[RSK_RAINBOW_BRIDGE_REWARD_COUNT].GetOptionCount() == 10) {
+                    mOptions[RSK_RAINBOW_BRIDGE_REWARD_COUNT].ChangeOptions(NumOpts(0, 10));
+                }
+            } else {
+                if (mOptions[RSK_RAINBOW_BRIDGE_REWARD_COUNT].GetOptionCount() == 11) {
+                    mOptions[RSK_RAINBOW_BRIDGE_REWARD_COUNT].ChangeOptions(NumOpts(0, 9));
+                }
+            }
+            break;
+        case RO_BRIDGE_DUNGEONS:
+            // Show Bridge Options and Dungeon Count Slider
+            mOptions[RSK_RAINBOW_BRIDGE].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
+            mOptions[RSK_BRIDGE_OPTIONS].Unhide();
+            mOptions[RSK_RAINBOW_BRIDGE_DUNGEON_COUNT].Unhide();
+            if (bridgeOpt == RO_BRIDGE_GREG_REWARD) {
+                if (mOptions[RSK_RAINBOW_BRIDGE_DUNGEON_COUNT].GetOptionCount() == 9) {
+                    mOptions[RSK_RAINBOW_BRIDGE_DUNGEON_COUNT].ChangeOptions(NumOpts(0, 9));
+                }
+            } else {
+                if (mOptions[RSK_RAINBOW_BRIDGE_DUNGEON_COUNT].GetOptionCount() == 10) {
+                    mOptions[RSK_RAINBOW_BRIDGE_DUNGEON_COUNT].ChangeOptions(NumOpts(0, 8));
+                }
+            }
+            break;
+        case RO_BRIDGE_TOKENS:
+            // Show token count slider (not bridge options)
+            mOptions[RSK_RAINBOW_BRIDGE].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
+            mOptions[RSK_BRIDGE_OPTIONS].Hide();
+            mOptions[RSK_RAINBOW_BRIDGE_TOKEN_COUNT].Unhide();
+            break;
+        default:
+            break;
+    }
+    // Only show the trial count slider if Trials is set to Set Number
+    if (CVarGetInteger("gRandomizeGanonTrial", RO_GANONS_TRIALS_SKIP) == RO_GANONS_TRIALS_SET_NUMBER) {
+        mOptions[RSK_GANONS_TRIALS].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
+        mOptions[RSK_TRIAL_COUNT].Unhide();
+    } else {
+        mOptions[RSK_GANONS_TRIALS].AddFlag(IMFLAG_SEPARATOR_BOTTOM);
+        mOptions[RSK_TRIAL_COUNT].Hide();
+    }
+    // Don't show any MQ options if both quests aren't available
+    if (!(OTRGlobals::Instance->HasMasterQuest() && OTRGlobals::Instance->HasOriginal())) {
+        mOptions[RSK_MQ_DUNGEON_RANDOM].Hide();
+        mOptions[RSK_MQ_DUNGEON_COUNT].Hide();
+        mOptions[RSK_MQ_DUNGEON_SET].Hide();
+        mOptions[RSK_MQ_DEKU_TREE].Hide();
+        mOptions[RSK_MQ_DODONGOS_CAVERN].Hide();
+        mOptions[RSK_MQ_JABU_JABU].Hide();
+        mOptions[RSK_MQ_FOREST_TEMPLE].Hide();
+        mOptions[RSK_MQ_FIRE_TEMPLE].Hide();
+        mOptions[RSK_MQ_WATER_TEMPLE].Hide();
+        mOptions[RSK_MQ_SPIRIT_TEMPLE].Hide();
+        mOptions[RSK_MQ_SHADOW_TEMPLE].Hide();
+        mOptions[RSK_MQ_BOTTOM_OF_THE_WELL].Hide();
+        mOptions[RSK_MQ_ICE_CAVERN].Hide();
+        mOptions[RSK_MQ_GTG].Hide();
+        mOptions[RSK_MQ_GANONS_CASTLE].Hide();
+    } else {
+        // If any MQ Options are available, show the MQ Dungeon Randomization Combobox
+        mOptions[RSK_MQ_DUNGEON_RANDOM].Unhide();
+        switch(CVarGetInteger("gRandomizeMqDungeons", RO_MQ_DUNGEONS_NONE)) {
+            // If No MQ Dungeons, add a separator after the combobx and hide
+            // the count slider and the toggle for individual dungeon selections.
+            case RO_MQ_DUNGEONS_NONE:
+                mOptions[RSK_MQ_DUNGEON_RANDOM].AddFlag(IMFLAG_SEPARATOR_BOTTOM);
+                mOptions[RSK_MQ_DUNGEON_COUNT].Hide();
+                mOptions[RSK_MQ_DUNGEON_SET].Hide();
+                break;
+            // If Set Number, remove the separator and show both the count slider and the
+            // individual dungeon selection toggle.
+            case RO_MQ_DUNGEONS_SET_NUMBER:
+                mOptions[RSK_MQ_DUNGEON_RANDOM].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
+                mOptions[RSK_MQ_DUNGEON_COUNT].Unhide();
+                mOptions[RSK_MQ_DUNGEON_SET].Unhide();
+                break;
+            // else if random number or selection only, remove the separator and only show
+            // the individual dungeon selection toggle.
+            case RO_MQ_DUNGEONS_RANDOM_NUMBER:
+            case RO_MQ_DUNGEONS_SELECTION:
+                mOptions[RSK_MQ_DUNGEON_RANDOM].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
+                mOptions[RSK_MQ_DUNGEON_COUNT].Hide();
+                mOptions[RSK_MQ_DUNGEON_SET].Unhide();
+                break;
+            default:
+                break;
+        }
+        // Controls whether or not to show the selectors for individual dungeons.
+        if (CVarGetInteger("gRandomizeMqDungeons", RO_MQ_DUNGEONS_NONE) != RO_MQ_DUNGEONS_NONE &&
+            CVarGetInteger("gRandomizeMqDungeonsSelection", RO_GENERIC_OFF) == RO_GENERIC_ON) {
+            // if showing the dungeon selectors, remove the separator after the Set Dungeons checkbox.
+            mOptions[RSK_MQ_DUNGEON_SET].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
+            mOptions[RSK_MQ_DEKU_TREE].Unhide();
+            mOptions[RSK_MQ_DODONGOS_CAVERN].Unhide();
+            mOptions[RSK_MQ_JABU_JABU].Unhide();
+            mOptions[RSK_MQ_FOREST_TEMPLE].Unhide();
+            mOptions[RSK_MQ_FIRE_TEMPLE].Unhide();
+            mOptions[RSK_MQ_WATER_TEMPLE].Unhide();
+            mOptions[RSK_MQ_SPIRIT_TEMPLE].Unhide();
+            mOptions[RSK_MQ_SHADOW_TEMPLE].Unhide();
+            mOptions[RSK_MQ_BOTTOM_OF_THE_WELL].Unhide();
+            mOptions[RSK_MQ_ICE_CAVERN].Unhide();
+            mOptions[RSK_MQ_GTG].Unhide();
+            mOptions[RSK_MQ_GANONS_CASTLE].Unhide();
+        } else {
+            // If those are not shown, add a separator after the Set Dungeons checkbox.
+            mOptions[RSK_MQ_DUNGEON_SET].AddFlag(IMFLAG_SEPARATOR_BOTTOM);
+            mOptions[RSK_MQ_DEKU_TREE].Hide();
+            mOptions[RSK_MQ_DODONGOS_CAVERN].Hide();
+            mOptions[RSK_MQ_JABU_JABU].Hide();
+            mOptions[RSK_MQ_FOREST_TEMPLE].Hide();
+            mOptions[RSK_MQ_FIRE_TEMPLE].Hide();
+            mOptions[RSK_MQ_WATER_TEMPLE].Hide();
+            mOptions[RSK_MQ_SPIRIT_TEMPLE].Hide();
+            mOptions[RSK_MQ_SHADOW_TEMPLE].Hide();
+            mOptions[RSK_MQ_BOTTOM_OF_THE_WELL].Hide();
+            mOptions[RSK_MQ_ICE_CAVERN].Hide();
+            mOptions[RSK_MQ_GTG].Hide();
+            mOptions[RSK_MQ_GANONS_CASTLE].Hide();
+        }
+    }
+    // Disable interaction with Set Dungeons checkbox if MQ Dungeon Randomization is set to Selection Only.
+    if (CVarGetInteger("gRandomizeMqDungeons", RO_MQ_DUNGEONS_NONE) == RO_MQ_DUNGEONS_SELECTION) {
+        mOptions[RSK_MQ_DUNGEON_SET].Disable("This option is force-enabled because Master Quest Dungeons is set to Selection Only", UIWidgets::CheckboxGraphics::Checkmark);
+    } else {
+        mOptions[RSK_MQ_DUNGEON_SET].Enable();
+    }
+    // Remove the pieces required/total sliders and add a separator after Tirforce Hunt if Triforce Hunt is off
+    if (CVarGetInteger("gRandomizeTriforceHunt", RO_GENERIC_OFF) == RO_GENERIC_OFF) {
+        mOptions[RSK_TRIFORCE_HUNT_PIECES_REQUIRED].Hide();
+        mOptions[RSK_TRIFORCE_HUNT_PIECES_TOTAL].Hide();
+        mOptions[RSK_TRIFORCE_HUNT].AddFlag(IMFLAG_SEPARATOR_BOTTOM);
+    } else {
+        mOptions[RSK_TRIFORCE_HUNT_PIECES_REQUIRED].Unhide();
+        mOptions[RSK_TRIFORCE_HUNT_PIECES_TOTAL].Unhide();
+        mOptions[RSK_TRIFORCE_HUNT].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
+    }
+    // Update triforce pieces required to be capped at the current value for pieces total.
+    const uint8_t triforceTotal = CVarGetInteger("gRandomizeTriforceHuntTotalPieces", 30);
+    if (mOptions[RSK_TRIFORCE_HUNT_PIECES_REQUIRED].GetOptionCount() != triforceTotal + 1) {
+        mOptions[RSK_TRIFORCE_HUNT_PIECES_REQUIRED].ChangeOptions(NumOpts(1, triforceTotal + 1));
+    }
+    // Show mixed entrance pool options if mixed entrance pools are enabled at all.
+    if (CVarGetInteger("gRandomizeMixedEntrances", RO_GENERIC_OFF)) {
+        mOptions[RSK_MIXED_ENTRANCE_POOLS].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
+        mOptions[RSK_MIX_DUNGEON_ENTRANCES].Unhide();
+        mOptions[RSK_MIX_OVERWORLD_ENTRANCES].Unhide();
+        mOptions[RSK_MIX_INTERIOR_ENTRANCES].Unhide();
+        mOptions[RSK_MIX_GROTTO_ENTRANCES].Unhide();
+    } else {
+        mOptions[RSK_MIXED_ENTRANCE_POOLS].AddFlag(IMFLAG_SEPARATOR_BOTTOM);
+        mOptions[RSK_MIX_DUNGEON_ENTRANCES].Hide();
+        mOptions[RSK_MIX_OVERWORLD_ENTRANCES].Hide();
+        mOptions[RSK_MIX_INTERIOR_ENTRANCES].Hide();
+        mOptions[RSK_MIX_GROTTO_ENTRANCES].Hide();
+    }
+    // Shuffle Kokiri Sword - Disabled when Start with Kokiri Sword is active
+    if (CVarGetInteger("gRandomizeStartingKokiriSword", RO_GENERIC_OFF)) {
+        mOptions[RSK_SHUFFLE_KOKIRI_SWORD].Disable("This option is disabled because \"Start with Kokiri Sword\" is enabled.");
+    } else {
+        mOptions[RSK_SHUFFLE_KOKIRI_SWORD].Enable();
+    }
+    // Shuffle Master Sword - Disabled when Start with Master Sword is active
+    if (CVarGetInteger("gRandomizeStartingMasterSword", RO_GENERIC_OFF)) {
+        mOptions[RSK_SHUFFLE_MASTER_SWORD].Disable("This option is disabled because \"Start with Master Sword\" is enabled");
+    } else {
+        mOptions[RSK_SHUFFLE_MASTER_SWORD].Enable();
+    }
+    // Shuffle Ocarinas - Disabled when Start with Ocarina is active
+    if (CVarGetInteger("gRandomizeStartingOcarina", RO_STARTING_OCARINA_OFF)) {
+        mOptions[RSK_SHUFFLE_OCARINA].Disable("This option is disabled because \"Start with Fairy Ocarina\" is enabled.");
+    } else {
+        mOptions[RSK_SHUFFLE_OCARINA].Enable();
+    }
+    // Shuffle Weird Egg - Disabled when Skip Child Zelda is active
+    if (CVarGetInteger("gRandomizeSkipChildZelda", RO_GENERIC_DONT_SKIP)) {
+        mOptions[RSK_SHUFFLE_WEIRD_EGG].Disable("This option is disabled because \"Skip Child Zelda\" is enabled.");
+    } else {
+        mOptions[RSK_SHUFFLE_WEIRD_EGG].Enable();
+    }
+    // Hide shopsanity prices if shopsanity is off or zero
+    switch (CVarGetInteger("gRandomizeShopsanity", RO_SHOPSANITY_OFF)) {
+        case RO_SHOPSANITY_OFF:
+        case RO_SHOPSANITY_ZERO_ITEMS:
+            mOptions[RSK_SHOPSANITY].AddFlag(IMFLAG_SEPARATOR_BOTTOM);
+            mOptions[RSK_SHOPSANITY_PRICES].Hide();
+            mOptions[RSK_SHOPSANITY_PRICES_AFFORDABLE].Hide();
+            break;
+        default:
+            mOptions[RSK_SHOPSANITY].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
+            mOptions[RSK_SHOPSANITY_PRICES].Unhide();
+            mOptions[RSK_SHOPSANITY_PRICES_AFFORDABLE].Unhide();
+            break;
+    }
+    // Shuffle 100 GS Reward - Force-Enabled if Ganon's Boss Key is on the 100 GS Reward
+    if (CVarGetInteger("gRandomizeShuffleGanonBossKey", RO_GANON_BOSS_KEY_VANILLA) == RO_GANON_BOSS_KEY_KAK_TOKENS) {
+        mOptions[RSK_SHUFFLE_100_GS_REWARD].Disable("This option is force-enabled because \"Ganon's Boss Key\" is set to \"100 GS Reward.\"", UIWidgets::CheckboxGraphics::Checkmark);
+    } else {
+        mOptions[RSK_SHUFFLE_100_GS_REWARD].Enable();
+    }
+    // Default state for Keyrings GUI
+    mOptions[RSK_KEYRINGS].AddFlag(IMFLAG_SEPARATOR_BOTTOM);
+    mOptions[RSK_KEYRINGS_RANDOM_COUNT].Hide();
+    mOptions[RSK_KEYRINGS_GERUDO_FORTRESS].Hide();
+    mOptions[RSK_KEYRINGS_FOREST_TEMPLE].Hide();
+    mOptions[RSK_KEYRINGS_FIRE_TEMPLE].Hide();
+    mOptions[RSK_KEYRINGS_WATER_TEMPLE].Hide();
+    mOptions[RSK_KEYRINGS_SPIRIT_TEMPLE].Hide();
+    mOptions[RSK_KEYRINGS_SHADOW_TEMPLE].Hide();
+    mOptions[RSK_KEYRINGS_BOTTOM_OF_THE_WELL].Hide();
+    mOptions[RSK_KEYRINGS_GTG].Hide();
+    mOptions[RSK_KEYRINGS_GANONS_CASTLE].Hide();
+    switch (CVarGetInteger("gRandomizeShuffleKeyRings", RO_KEYRINGS_OFF)) {
+        case RO_KEYRINGS_COUNT:
+            // Show count slider.
+            mOptions[RSK_KEYRINGS].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
+            mOptions[RSK_KEYRINGS_RANDOM_COUNT].Unhide();
+            break;
+        case RO_KEYRINGS_SELECTION:
+            // Show checkboxes for each dungeon with keys.
+            mOptions[RSK_KEYRINGS].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
+            mOptions[RSK_KEYRINGS_GERUDO_FORTRESS].Unhide();
+            mOptions[RSK_KEYRINGS_FOREST_TEMPLE].Unhide();
+            mOptions[RSK_KEYRINGS_FIRE_TEMPLE].Unhide();
+            mOptions[RSK_KEYRINGS_WATER_TEMPLE].Unhide();
+            mOptions[RSK_KEYRINGS_SPIRIT_TEMPLE].Unhide();
+            mOptions[RSK_KEYRINGS_SHADOW_TEMPLE].Unhide();
+            mOptions[RSK_KEYRINGS_BOTTOM_OF_THE_WELL].Unhide();
+            mOptions[RSK_KEYRINGS_GTG].Unhide();
+            mOptions[RSK_KEYRINGS_GANONS_CASTLE].Unhide();
+        default:
+            break;
+    }
+    const uint8_t maxKeyringCount = (CVarGetInteger("gRandomizeGerudoFortress", RO_GF_NORMAL) == RO_GF_NORMAL &&
+                               CVarGetInteger("gRandomizeGerudoKeys", RO_GERUDO_KEYS_VANILLA) != RO_GERUDO_KEYS_VANILLA) ? 9 : 8;
+    if (mOptions[RSK_KEYRINGS_RANDOM_COUNT].GetOptionCount() != maxKeyringCount + 1) {
+        mOptions[RSK_KEYRINGS_RANDOM_COUNT].ChangeOptions(NumOpts(0, maxKeyringCount));
+    }
+    if (CVarGetInteger("gRandomizeGerudoFortress", RO_GF_NORMAL) != RO_GF_NORMAL ||
+        CVarGetInteger("gRandomizeGerudoKeys", RO_GERUDO_KEYS_VANILLA) == RO_GERUDO_KEYS_VANILLA) {
+        mOptions[RSK_KEYRINGS_GERUDO_FORTRESS].Disable("Disabled because the currently selected Gerudo Fortress Carpenters\n"
+            "setting and/or Gerudo Fortress Keys setting is incompatible with\n"
+            "having a Gerudo Fortress Keyring.");
+    } else {
+        mOptions[RSK_KEYRINGS_GERUDO_FORTRESS].Enable();
+    }
+    if (CVarGetInteger("gRandomizeTriforceHunt", RO_GENERIC_OFF)) {
+        mOptions[RSK_GANONS_BOSS_KEY].Disable("This option is disabled because Triforcce Hunt is enabled."
+            "Ganon's Boss key\nwill instead be given to you after Triforce Hunt completion.");
+    } else {
+        mOptions[RSK_GANONS_BOSS_KEY].Enable();
+    }
+    mOptions[RSK_GANONS_BOSS_KEY].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
+    mOptions[RSK_LACS_OPTIONS].Hide();
+    mOptions[RSK_LACS_STONE_COUNT].Hide();
+    mOptions[RSK_LACS_MEDALLION_COUNT].Hide();
+    mOptions[RSK_LACS_REWARD_COUNT].Hide();
+    mOptions[RSK_LACS_DUNGEON_COUNT].Hide();
+    mOptions[RSK_LACS_TOKEN_COUNT].Hide();
+    const uint8_t lacsOpts = CVarGetInteger("gRandomizeLacsRewardOptions", RO_LACS_STANDARD_REWARD);
+    switch (CVarGetInteger("gRandomizeShuffleGanonBossKey", RO_GANON_BOSS_KEY_VANILLA)) {
+        case RO_GANON_BOSS_KEY_LACS_STONES:
+            mOptions[RSK_LACS_OPTIONS].Unhide();
+            mOptions[RSK_LACS_STONE_COUNT].Unhide();
+            if (lacsOpts == RO_LACS_GREG_REWARD) {
+                if (mOptions[RSK_LACS_STONE_COUNT].GetOptionCount() == 4) {
+                    mOptions[RSK_LACS_STONE_COUNT].ChangeOptions(NumOpts(0, 4));
+                }
+            } else {
+                if (mOptions[RSK_LACS_STONE_COUNT].GetOptionCount() == 5) {
+                    mOptions[RSK_LACS_STONE_COUNT].ChangeOptions(NumOpts(0, 3));
+                }
+            }
+            break;
+        case RO_GANON_BOSS_KEY_LACS_MEDALLIONS:
+            mOptions[RSK_LACS_OPTIONS].Unhide();
+            mOptions[RSK_LACS_MEDALLION_COUNT].Unhide();
+            if (lacsOpts == RO_LACS_GREG_REWARD) {
+                if (mOptions[RSK_LACS_MEDALLION_COUNT].GetOptionCount() == 7) {
+                    mOptions[RSK_LACS_MEDALLION_COUNT].ChangeOptions(NumOpts(0, 7));
+                }
+            } else {
+                if (mOptions[RSK_LACS_MEDALLION_COUNT].GetOptionCount() == 8) {
+                    mOptions[RSK_LACS_MEDALLION_COUNT].ChangeOptions(NumOpts(0, 6));
+                }
+            }
+            break;
+        case RO_GANON_BOSS_KEY_LACS_REWARDS:
+            mOptions[RSK_LACS_OPTIONS].Unhide();
+            mOptions[RSK_LACS_REWARD_COUNT].Unhide();
+            if (lacsOpts == RO_LACS_GREG_REWARD) {
+                if (mOptions[RSK_LACS_REWARD_COUNT].GetOptionCount() == 10) {
+                    mOptions[RSK_LACS_REWARD_COUNT].ChangeOptions(NumOpts(0, 10));
+                }
+            } else {
+                if (mOptions[RSK_LACS_REWARD_COUNT].GetOptionCount() == 11) {
+                    mOptions[RSK_LACS_REWARD_COUNT].ChangeOptions(NumOpts(0, 9));
+                }
+            }
+            break;
+        case RO_GANON_BOSS_KEY_LACS_DUNGEONS:
+            mOptions[RSK_LACS_OPTIONS].Unhide();
+            mOptions[RSK_LACS_DUNGEON_COUNT].Unhide();
+            if (lacsOpts == RO_LACS_GREG_REWARD) {
+                if (mOptions[RSK_LACS_DUNGEON_COUNT].GetOptionCount() == 9) {
+                    mOptions[RSK_LACS_DUNGEON_COUNT].ChangeOptions(NumOpts(0, 9));
+                }
+            } else {
+                if (mOptions[RSK_LACS_DUNGEON_COUNT].GetOptionCount() == 10) {
+                    mOptions[RSK_LACS_DUNGEON_COUNT].ChangeOptions(NumOpts(0, 8));
+                }
+            }
+            break;
+        case RO_GANON_BOSS_KEY_LACS_TOKENS:
+            mOptions[RSK_LACS_TOKEN_COUNT].Unhide();
+            break;
+        default:
+            mOptions[RSK_GANONS_BOSS_KEY].AddFlag(IMFLAG_SEPARATOR_BOTTOM);
+            break;
+    }
+    // Skip Child Stealth - Disabled when Skip Child Zelda is active
+    if (CVarGetInteger("gRandomizeSkipChildZelda", RO_GENERIC_DONT_SKIP)) {
+        mOptions[RSK_SKIP_CHILD_STEALTH].Disable("This option is disabled because \"Skip Child Zelda\" is enabled.");
+    } else {
+        mOptions[RSK_SKIP_CHILD_STEALTH].Enable();
+    }
+    if (CVarGetInteger("gRandomizeGossipStoneHints", RO_GOSSIP_STONES_NEED_NOTHING) == RO_GOSSIP_STONES_NONE) {
+        mOptions[RSK_HINT_CLARITY].Hide();
+        mOptions[RSK_HINT_DISTRIBUTION].Hide();
+    } else {
+        mOptions[RSK_HINT_CLARITY].Unhide();
+        mOptions[RSK_HINT_DISTRIBUTION].Unhide();
+    }
+    // Link's Pocket - Disabled when Dungeon Rewards are shuffled to End of Dungeon
+    if (CVarGetInteger("gRandomizeShuffleDungeonReward", RO_DUNGEON_REWARDS_END_OF_DUNGEON) == RO_DUNGEON_REWARDS_END_OF_DUNGEON) {
+        mOptions[RSK_LINKS_POCKET].Disable("This option is disabled because \"Dungeon Rewards\" are shuffled to \"End of Dungeons\".");
+    } else {
+        mOptions[RSK_LINKS_POCKET].Enable();
+    }
+}
+
+void Settings::FinalizeSettings(const std::set<RandomizerCheck>& excludedLocations, const std::set<RandomizerTrick>& enabledTricks) {
+    const auto ctx = Rando::Context::GetInstance();
     if (!ctx->IsSpoilerLoaded()) {
         // If we've loaded a spoiler file, the settings have already been populated, so we
         // only need to do things like resolve the starting age or determine MQ dungeons.
         // Any logic dependent on cvarSettings should go in this if statement
-        for (auto [key, value] : cvarSettings) {
-            mOptions[key].SetSelectedIndex(value);
-        }
-        switch (cvarSettings[RSK_LOGIC_RULES]) {
-            case RO_LOGIC_GLITCHLESS:
-                mOptions[RSK_LOGIC_RULES].SetSelectedIndex(RO_LOGIC_GLITCHLESS);
-                break;
-            case RO_LOGIC_NO_LOGIC:
-                mOptions[RSK_LOGIC_RULES].SetSelectedIndex(RO_LOGIC_NO_LOGIC);
-                break;
-            default:
-                mOptions[RSK_LOGIC_RULES].SetSelectedIndex(RO_LOGIC_GLITCHLESS);
-                break;
-        }
         
         // if we skip child zelda, we start with zelda's letter, and malon starts
         // at the ranch, so we should *not* shuffle the weird egg
-        if (cvarSettings[RSK_SKIP_CHILD_ZELDA]) {
-            mOptions[RSK_SKIP_CHILD_ZELDA].SetSelectedIndex(true);
-            mOptions[RSK_SHUFFLE_WEIRD_EGG].SetSelectedIndex(0);
-        } else {
-            mOptions[RSK_SKIP_CHILD_ZELDA].SetSelectedIndex(false);
-            mOptions[RSK_SHUFFLE_WEIRD_EGG].SetSelectedIndex(cvarSettings[RSK_SHUFFLE_WEIRD_EGG]);
-        }
-        // Force 100 GS Shuffle if that's where Ganon's Boss Key is
-        if (cvarSettings[RSK_GANONS_BOSS_KEY] == RO_GANON_BOSS_KEY_KAK_TOKENS) {
-            mOptions[RSK_SHUFFLE_100_GS_REWARD].SetSelectedIndex(1);
-        } else {
-            mOptions[RSK_SHUFFLE_100_GS_REWARD].SetSelectedIndex(cvarSettings[RSK_SHUFFLE_100_GS_REWARD]);
+        if (mOptions[RSK_SKIP_CHILD_ZELDA]) {
+            mOptions[RSK_SHUFFLE_WEIRD_EGG].SetSelectedIndex(RO_GENERIC_OFF);
         }
 
-        if (cvarSettings[RSK_TRIFORCE_HUNT]) {
-            mOptions[RSK_GANONS_BOSS_KEY].SetSelectedIndex(RO_GANON_BOSS_KEY_TRIFORCE_HUNT);
-        } else {
-            mOptions[RSK_GANONS_BOSS_KEY].SetSelectedIndex(cvarSettings[RSK_GANONS_BOSS_KEY]);
+        // With certain access settings, the seed is only beatable if Starting Age is set to Child.
+        if (mOptions[RSK_FOREST].Is(RO_FOREST_CLOSED) || (mOptions[RSK_DOOR_OF_TIME].Is(RO_DOOROFTIME_CLOSED) &&
+            !mOptions[RSK_SHUFFLE_OCARINA])) {
+            mOptions[RSK_STARTING_AGE].SetSelectedIndex(RO_AGE_CHILD);
         }
-        // ImGui has a slider which returns the actual number, which is off by one since
-        // the ImGui slider can't go down to 0 (the first index aka 1 big poe).
-        mOptions[RSK_BIG_POE_COUNT].SetSelectedIndex(cvarSettings[RSK_BIG_POE_COUNT] - 1);
+
+        if (mOptions[RSK_TRIFORCE_HUNT]) {
+            mOptions[RSK_GANONS_BOSS_KEY].SetSelectedIndex(RO_GANON_BOSS_KEY_TRIFORCE_HUNT);
+        }
+
+        // Force 100 GS Shuffle if that's where Ganon's Boss Key is
+        if (mOptions[RSK_GANONS_BOSS_KEY].Is(RO_GANON_BOSS_KEY_KAK_TOKENS)) {
+            mOptions[RSK_SHUFFLE_100_GS_REWARD].SetSelectedIndex(1);
+        }
+
+        // If we only have MQ, set all dungeons to MQ
+        if (OTRGlobals::Instance->HasMasterQuest() && !OTRGlobals::Instance->HasOriginal()) {
+            mOptions[RSK_MQ_DUNGEON_RANDOM].SetSelectedIndex(RO_MQ_DUNGEONS_SET_NUMBER);
+            mOptions[RSK_MQ_DUNGEON_COUNT].SetSelectedIndex(12);
+            mOptions[RSK_MQ_DUNGEON_SET].SetSelectedIndex(RO_GENERIC_OFF);
+        }
+
+        // If we don't have MQ, set all dungeons to Vanilla
+        if (OTRGlobals::Instance->HasOriginal() && !OTRGlobals::Instance->HasMasterQuest()) {
+            mOptions[RSK_MQ_DUNGEON_RANDOM].SetSelectedIndex(RO_MQ_DUNGEONS_NONE);
+        }
+
+        if (mOptions[RSK_MQ_DUNGEON_RANDOM].Is(RO_MQ_DUNGEONS_NONE)) {
+            mOptions[RSK_MQ_DUNGEON_COUNT].SetSelectedIndex(0);
+            mOptions[RSK_MQ_DUNGEON_SET].SetSelectedIndex(RO_GENERIC_OFF);
+        }
+
+        // TODO: Historically we have forced the shuffle settings off when we have the corresponding start
+        // with setting on, but 3drando doesn't seem to actually do that. It seems like you can both shuffle
+        // them in the pool and start with them.
+        if (mOptions[RSK_STARTING_KOKIRI_SWORD]) {
+            mOptions[RSK_SHUFFLE_KOKIRI_SWORD].SetSelectedIndex(RO_GENERIC_OFF);
+        }
+
+        if (mOptions[RSK_STARTING_MASTER_SWORD]) {
+            mOptions[RSK_SHUFFLE_MASTER_SWORD].SetSelectedIndex(RO_GENERIC_OFF);
+        }
+
+        if (mOptions[RSK_STARTING_OCARINA].IsNot(RO_STARTING_OCARINA_OFF)) {
+            mOptions[RSK_SHUFFLE_OCARINA].SetSelectedIndex(RO_GENERIC_OFF);
+        }
+
+        // If any of the individual shuffle settings are on, turn on the main Shuffle Entrances option
+        if (mOptions[RSK_SHUFFLE_DUNGEON_ENTRANCES].IsNot(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF)
+            || mOptions[RSK_SHUFFLE_BOSS_ENTRANCES].IsNot(RO_BOSS_ROOM_ENTRANCE_SHUFFLE_OFF)
+            || mOptions[RSK_SHUFFLE_OVERWORLD_ENTRANCES]
+            || mOptions[RSK_SHUFFLE_INTERIOR_ENTRANCES].IsNot(RO_INTERIOR_ENTRANCE_SHUFFLE_OFF)
+            || mOptions[RSK_SHUFFLE_GROTTO_ENTRANCES] || mOptions[RSK_SHUFFLE_OWL_DROPS]
+            || mOptions[RSK_SHUFFLE_WARP_SONGS] || mOptions[RSK_SHUFFLE_OVERWORLD_SPAWNS]) {
+            mOptions[RSK_SHUFFLE_ENTRANCES].SetSelectedIndex(RO_GENERIC_ON);
+        }
+
+        if (mOptions[RSK_SHUFFLE_DUNGEON_REWARDS].Is(RO_DUNGEON_REWARDS_END_OF_DUNGEON)) {
+            mOptions[RSK_LINKS_POCKET].SetSelectedIndex(RO_LINKS_POCKET_DUNGEON_REWARD);
+        }
+
         ctx->AddExcludedOptions();
         for (const auto locationKey : ctx->everyPossibleLocation) {
             if (const auto location = ctx->GetItemLocation(locationKey); excludedLocations.contains(location->GetRandomizerCheck())) {
@@ -1366,14 +1996,19 @@ void Settings::ParseJson(nlohmann::json spoilerFileJson) {
                 case RSK_LACS_DUNGEON_COUNT:
                 case RSK_LACS_TOKEN_COUNT:
                 case RSK_KEYRINGS_RANDOM_COUNT:
-                case RSK_BIG_POE_COUNT:
                 case RSK_CUCCO_COUNT:
                 case RSK_STARTING_SKULLTULA_TOKEN:
+                    numericValueString = it.value();
+                    mOptions[index].SetSelectedIndex(std::stoi(numericValueString));
+                    break;
+                // Same as the above section, but the indexes are off by one from the text
+                // (i.e. 10 Big Poes is index 9).
+                case RSK_BIG_POE_COUNT:
                 case RSK_TRIFORCE_HUNT_PIECES_TOTAL:
                 case RSK_TRIFORCE_HUNT_PIECES_REQUIRED:
                 case RSK_STARTING_HEARTS:
                     numericValueString = it.value();
-                    mOptions[index].SetSelectedIndex(std::stoi(numericValueString));
+                    mOptions[index].SetSelectedIndex(std::stoi(numericValueString) - 1);
                     break;
                 case RSK_GANONS_TRIALS:
                     if (it.value() == "Skip") {
@@ -1412,6 +2047,7 @@ void Settings::ParseJson(nlohmann::json spoilerFileJson) {
                     } else if (it.value() == "Tycoon's Wallet") {
                         mOptions[index].SetSelectedIndex(RO_SHOPSANITY_PRICE_TYCOON);
                     }
+                    break;
                 case RSK_SHUFFLE_SCRUBS:
                     if (it.value() == "Off") {
                         mOptions[index].SetSelectedIndex(RO_SCRUBS_OFF);
diff --git a/soh/soh/Enhancements/randomizer/settings.h b/soh/soh/Enhancements/randomizer/settings.h
index b84dacad5..3e60e7bfb 100644
--- a/soh/soh/Enhancements/randomizer/settings.h
+++ b/soh/soh/Enhancements/randomizer/settings.h
@@ -13,29 +13,170 @@ namespace Rando {
 class Settings {
   public:
     Settings();
+
+    /**
+     * @brief Creates the `Option` and `OptionGroup` objects. This happens after construction because certain
+     * other events in the codebase need to happen before all of the `Option`s can be created.
+     */
     void CreateOptions();
-    Option& Setting(RandomizerSettingKey key);
+
+    /**
+     * @brief Get a reference to the `Option` corresponding to the provided RandomizerSettingKey.
+     *
+     * @param key
+     * @return Option&
+     */
+    Option& GetOption(RandomizerSettingKey key);
+
+    /**
+     * @brief Get a reference to the `Option` corresponding to the provided RandomizerTrick key.
+     *
+     * @param key
+     * @return Option&
+     */
     Option& GetTrickOption(RandomizerTrick key);
+
+    /**
+     * @brief Returns a reference to the entire array of options.
+     *
+     * @return const std::array<Option, RSK_MAX>&
+     */
     const std::array<Option, RSK_MAX>& GetAllOptions() const;
+
+    /**
+     * @brief Get a list of Location Exclude `Option`s for the given
+     * SpoilerCollectionCheckGroup
+     *
+     * @param group
+     * @return std::vector<Option*>&
+     */
     std::vector<Option*>& GetExcludeOptionsForGroup(SpoilerCollectionCheckGroup group);
+
+    /**
+     * @brief Get a reference to all of the Exclude Location `Option` lists.
+     *
+     * @return const std::vector<std::vector<Option*>>&
+     */
     const std::vector<std::vector<Option*>>& GetExcludeLocationsOptions() const;
+
+    /**
+     * @brief Gets the resolved Starting Age. Represents the actual starting age when the
+     * RSK_STARTING_AGE option is set to Random.
+     *
+     * @return RandoOptionStartingAge
+     */
     RandoOptionStartingAge ResolvedStartingAge() const;
+
+    /**
+     * @brief Gets the resolved Light Arrow CutScene check condition.
+     * There is no direct option for this, it is inferred based on the value of a few other options.
+     *
+     * @return RandoOptionLACSCondition
+     */
     RandoOptionLACSCondition LACSCondition() const;
+
+    /**
+     * @brief Get the hash for the current seed.
+     *
+     * @return std::string
+     */
     std::string GetHash() const;
+
+    /**
+     * @brief Get the Seed String
+     *
+     * @return const std::string&
+     */
     const std::string& GetSeedString() const;
+
+    /**
+     * @brief Set the Seed String
+     *
+     * @param seedString
+     */
     void SetSeedString(std::string seedString);
+
+    /**
+     * @brief Get the Seed
+     *
+     * @return const uint32_t
+     */
     uint32_t GetSeed() const;
+
+    /**
+     * @brief Set the Seed
+     *
+     * @param seed
+     */
     void SetSeed(uint32_t seed);
+
+    /**
+     * @brief Set the Seed Hash for the current seed.
+     *
+     * @param hash
+     */
     void SetHash(std::string hash);
+
+    /**
+     * @brief Get the list of `OptionGroup`s.
+     *
+     * @return const std::array<OptionGroup, RSG_MAX>&
+     */
     const std::array<OptionGroup, RSG_MAX>& GetOptionGroups();
+
+    /**
+     * @brief Get the `OptionGroup` corresponding to the provided RandomizerSettingGroupKey
+     *
+     * @param key
+     * @return const OptionGroup&
+     */
     const OptionGroup& GetOptionGroup(RandomizerSettingGroupKey key);
-    void UpdateSettings(std::unordered_map<RandomizerSettingKey, uint8_t> cvarSettings,
-                        const std::set<RandomizerCheck>& excludedLocations, const std::set<RandomizerTrick>& enabledTricks);
+
+    /**
+     * @brief sets the `selectedOption` of all Options to the value of the CVar
+     * corresponding to their `cvarName`s.
+    */
+    void SetAllFromCVar();
+
+    /**
+     * @brief Updates various properties of options based on the value of other options.
+     * Used to update visibility, whether or not interaction is disabled, and what the
+     * actual option values are. Actually changing option values should be handled in
+     * `FinalizeSettings`
+     *
+     * For example, this function handles setting the maximum possible keyring count to 9
+     * when Gerudo's Fortress options are set such that a keyring is possible for that
+     * dungeon.
+    */
+    void UpdateOptionProperties();
+
+    /**
+     * @brief Runs before seed generation to ensure all options are compatible with each
+     * other and resolve options that have been set to random (such as random trial count,
+     * or starting age).
+     *
+     * @param excludedLocations Set of locations that should be forced to have junk items.
+     * @param enabledTricks Set of tricks that should be considered logically possible. Tricks
+     * are things that are possible to do in gameplay but are difficult, not intuitive or that
+     * require more extensive game knowledge, i.e. opening invisible chests without the Lens of Truth.
+    */
+    void FinalizeSettings(const std::set<RandomizerCheck>& excludedLocations, const std::set<RandomizerTrick>& enabledTricks);
+
+    /**
+     * @brief Parse Options from a JSON file.
+     *
+     * @param spoilerFileJson
+     */
     void ParseJson(nlohmann::json spoilerFileJson);
     std::vector<Option*> VanillaLogicDefaults = {};
 
   private:
+    /**
+     * @brief Create the list of description strings for `Option`s.
+     */
+    void CreateOptionDescriptions();
     std::array<Option, RSK_MAX> mOptions = {};
+    std::array<std::string, RSK_MAX> mOptionDescriptions = {};
     std::array<OptionGroup, RSG_MAX> mOptionGroups = {};
     std::array<Option, RT_MAX> mTrickOptions = {};
     std::vector<std::vector<Option*>> mExcludeLocationsOptionsGroups = {};

From 2ef978c7929a278684224f35057e60e2392e7c62 Mon Sep 17 00:00:00 2001
From: Christopher Leggett <chris@leggett.dev>
Date: Sun, 10 Dec 2023 14:00:31 -0500
Subject: [PATCH 036/230] Fixes some build errors resulting from merge.

---
 .../3drando/location_access/locacc_ganons_castle.cpp      | 6 +++---
 soh/soh/Enhancements/randomizer/item.cpp                  | 8 ++++----
 soh/soh/Enhancements/randomizer/option_descriptions.cpp   | 4 +++-
 soh/soh/Enhancements/randomizer/randomizer.cpp            | 5 ++---
 soh/soh/Enhancements/randomizer/randomizerTypes.h         | 2 ++
 .../Enhancements/randomizer/randomizer_check_tracker.cpp  | 4 ++--
 soh/soh/Enhancements/randomizer/settings.cpp              | 2 ++
 soh/src/code/z_sram.c                                     | 2 ++
 8 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
index 52721ad4d..c244dcb89 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
@@ -31,7 +31,7 @@ void AreaTable_Init_GanonsCastle() {
                   Entrance(RR_GANONS_CASTLE_MAIN,     {[]{return true;}}),
   });
 
-  areaTable[RR_GANONS_CASTLE_MAIN] = Area("Ganon's Castle Main", "Ganon's Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_GANONS_CASTLE_MAIN] = Area("Ganon's Castle Main", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_GANONS_CASTLE_LOBBY,        {[]{return true;}}),
                   Entrance(RR_GANONS_CASTLE_FOREST_TRIAL, {[]{return true;}}),
@@ -136,10 +136,10 @@ void AreaTable_Init_GanonsCastle() {
                 }, {
                   //Exits
                   Entrance(RR_GANONS_CASTLE_ENTRYWAY, {[]{return true;}}),
-                  Entrance(RR_GANONS_CASTLE_MQ_MAIN,  {[]{return (CanUse(RG_MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(MEGATON_HAMMER)) || ((HasExplosives || Nuts || CanUse(BOOMERANG)) && CanJumpslash);}}),
+                  Entrance(RR_GANONS_CASTLE_MQ_MAIN,  {[]{return (CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_MEGATON_HAMMER)) || ((HasExplosives || Nuts || CanUse(RG_BOOMERANG)) && CanJumpslash);}}),
   });
 
-  areaTable[RR_GANONS_CASTLE_MQ_MAIN] = Area("Ganon's Castle MQ Main", "Ganons Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_GANONS_CASTLE_MQ_MAIN] = Area("Ganon's Castle MQ Main", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_GANONS_CASTLE_MQ_LOBBY,        {[]{return true;}}),
                   Entrance(RR_GANONS_CASTLE_MQ_FOREST_TRIAL, {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/item.cpp b/soh/soh/Enhancements/randomizer/item.cpp
index 4fdc2ad72..d34929f76 100644
--- a/soh/soh/Enhancements/randomizer/item.cpp
+++ b/soh/soh/Enhancements/randomizer/item.cpp
@@ -19,9 +19,9 @@ Item::Item(const RandomizerGet randomizerGet_, Text name_, const ItemType type_,
     : randomizerGet(randomizerGet_), name(std::move(name_)), type(type_), getItemId(getItemId_),
       advancement(advancement_), logicVar(logicVar_), hintKey(hintKey_), progressive(progressive_), price(price_) {
     if (modIndex_ == MOD_RANDOMIZER || getItemId > 0x7D) {
-        giEntry = std::make_shared<GetItemEntry>(GetItemEntry{itemId_, field_, static_cast<int16_t>((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_, objectId_, modIndex_, static_cast<int16_t>(randomizerGet_), gid_, true, ITEM_FROM_NPC, category_, NULL});
+        giEntry = std::make_shared<GetItemEntry>(GetItemEntry{itemId_, field_, static_cast<int16_t>((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_, objectId_, modIndex_, TABLE_RANDOMIZER, static_cast<int16_t>(randomizerGet_), gid_, true, ITEM_FROM_NPC, category_, NULL});
     } else {
-        giEntry = std::make_shared<GetItemEntry>(GetItemEntry{itemId_, field_, static_cast<int16_t>((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_, objectId_, modIndex_, getItemId_, gid_, true, ITEM_FROM_NPC, category_, NULL});
+        giEntry = std::make_shared<GetItemEntry>(GetItemEntry{itemId_, field_, static_cast<int16_t>((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_, objectId_, modIndex_, TABLE_VANILLA, getItemId_, gid_, true, ITEM_FROM_NPC, category_, NULL});
     }
 }
 
@@ -33,9 +33,9 @@ Item::Item(const RandomizerGet randomizerGet_, Text name_, const ItemType type_,
     : randomizerGet(randomizerGet_), name(std::move(name_)), type(type_), getItemId(getItemId_),
       advancement(advancement_), logicVar(logicVar_), hintKey(hintKey_), progressive(progressive_), price(price_) {
     if (modIndex_ == MOD_RANDOMIZER || getItemId > 0x7D) {
-        giEntry = std::make_shared<GetItemEntry>(GetItemEntry{itemId_, field_, static_cast<int16_t>((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_, objectId_, modIndex_, static_cast<int16_t>(randomizerGet_), gid_, true, ITEM_FROM_NPC, category_, NULL});
+        giEntry = std::make_shared<GetItemEntry>(GetItemEntry{itemId_, field_, static_cast<int16_t>((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_, objectId_, modIndex_, TABLE_RANDOMIZER, static_cast<int16_t>(randomizerGet_), gid_, true, ITEM_FROM_NPC, category_, NULL});
     } else {
-        giEntry = std::make_shared<GetItemEntry>(GetItemEntry{itemId_, field_, static_cast<int16_t>((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_, objectId_, modIndex_, getItemId_, gid_, true, ITEM_FROM_NPC, category_, NULL});
+        giEntry = std::make_shared<GetItemEntry>(GetItemEntry{itemId_, field_, static_cast<int16_t>((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_, objectId_, modIndex_, TABLE_VANILLA, getItemId_, gid_, true, ITEM_FROM_NPC, category_, NULL});
     }
 }
 
diff --git a/soh/soh/Enhancements/randomizer/option_descriptions.cpp b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
index 83f8b12a0..22fc33f69 100644
--- a/soh/soh/Enhancements/randomizer/option_descriptions.cpp
+++ b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
@@ -508,7 +508,9 @@ void Settings::CreateOptionDescriptions() {
         "\n"
         //"Glitched - Glitches may be required to beat the game. You can disable and enable glitches below.\n"
         //"\n"
-        "No logic - Item placement is completely random. MAY BE IMPOSSIBLE TO BEAT.";
+        "No logic - Item placement is completely random. MAY BE IMPOSSIBLE TO BEAT.\n"
+        "\n"
+        "Vanilla - Places all items and dungeon rewards in their vanilla locations.";
     mOptionDescriptions[RSK_ALL_LOCATIONS_REACHABLE] = "When this options is enabled, the randomizer will "
                                                        "guarantee that every item is obtainable and every "
                                                        "location is reachable. When disabled, only "
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index 951f7eef8..3465e499b 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -1960,8 +1960,7 @@ void RandomizerSettingsWindow::DrawElement() {
                     mNeedsUpdate = true;
                 }
                 // RANDOTODO: Implement Disalbling of Options for Vanilla Logic
-                // RANDOTODO: UIWidgets::EnhancementCombobox("gRandomizeLogicRules", randoLogicRules, RO_LOGIC_GLITCHLESS);
-                if (CVarGetInteger("gRandomizeLogicRules", RO_LOGIC_GLITCHLESS) != RO_LOGIC_NO_LOGIC) {
+                if (CVarGetInteger("gRandomizeLogicRules", RO_LOGIC_GLITCHLESS) == RO_LOGIC_GLITCHLESS) {
                     ImGui::SameLine();
                     if (mSettings->GetOption(RSK_ALL_LOCATIONS_REACHABLE).RenderImGui()) {
                         mNeedsUpdate = true;
@@ -2513,7 +2512,7 @@ CustomMessage Randomizer::GetSheikMessage(s16 scene, u16 originalTextId) {
 }
 
 CustomMessage Randomizer::GetSariaMessage(u16 originalTextId) {
-    if (originalTextId == TEXT_SARIA_SFM || (originalTextId >= TEXT_SARIAS_SONG_TEXT_START && originalTextId <= TEXT_SARIAS_SONG_TEXT_END)) {
+    if (originalTextId == TEXT_SARIA_SFM || (originalTextId == TEXT_SARIAS_SONG_FOREST_SOUNDS && originalTextId == TEXT_SARIAS_SONG_FOREST_TEMPLE)) {
         CustomMessage messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::hintMessageTableID, TEXT_SARIAS_SONG_FACE_TO_FACE);
         CustomMessage messageEntry2 = messageEntry;
         std::string code = originalTextId == TEXT_SARIA_SFM ? "" : "\x0B";
diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h
index 83e9df012..b73430369 100644
--- a/soh/soh/Enhancements/randomizer/randomizerTypes.h
+++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@@ -607,6 +607,7 @@ typedef enum {
     RR_GERUDO_TRAINING_GROUNDS_MQ_CENTRAL_MAZE_RIGHT,
 
     RR_GANONS_CASTLE_LOBBY,
+    RR_GANONS_CASTLE_MAIN,
     RR_GANONS_CASTLE_DEKU_SCRUBS,
     RR_GANONS_CASTLE_FOREST_TRIAL,
     RR_GANONS_CASTLE_FIRE_TRIAL,
@@ -617,6 +618,7 @@ typedef enum {
     RR_GANONS_CASTLE_TOWER,
 
     RR_GANONS_CASTLE_MQ_LOBBY,
+    RR_GANONS_CASTLE_MQ_MAIN,
     RR_GANONS_CASTLE_MQ_DEKU_SCRUBS,
     RR_GANONS_CASTLE_MQ_FOREST_TRIAL,
     RR_GANONS_CASTLE_MQ_FIRE_TRIAL,
diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
index b66abc420..a510a420b 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
@@ -614,7 +614,7 @@ void CheckTrackerSceneFlagSet(int16_t sceneNum, int16_t flagType, int32_t flag)
         SetCheckCollected(RC_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR);
         return;
     }
-    for (auto& loc : Rando::StaticData::GetLocationTable) {
+    for (auto& loc : Rando::StaticData::GetLocationTable()) {
         if (!IsVisibleInCheckTracker(loc.GetRandomizerCheck())) {
             continue;
         }
@@ -709,7 +709,7 @@ void CheckTrackerFlagSet(int16_t flagType, int32_t flag) {
                scCheckType == SpoilerCollectionCheckType::SPOILER_CHK_SCRUB ||
                scCheckType == SpoilerCollectionCheckType::SPOILER_CHK_MASTER_SWORD ||
                scCheckType == SpoilerCollectionCheckType::SPOILER_CHK_RANDOMIZER_INF)) {
-            if (flag == OTRGlobals::Instance->gRandomizer->GetRandomizerInfFromCheck(rc)) {
+            if (flag == OTRGlobals::Instance->gRandomizer->GetRandomizerInfFromCheck(loc.GetRandomizerCheck())) {
                 SetCheckCollected(loc.GetRandomizerCheck());
                 return;
             }
diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
index 114f2201a..ea6ad2d23 100644
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -1878,6 +1878,8 @@ void Settings::ParseJson(nlohmann::json spoilerFileJson) {
                         mOptions[index].SetSelectedIndex(RO_LOGIC_GLITCHLESS);
                     } else if (it.value() == "No Logic") {
                         mOptions[index].SetSelectedIndex(RO_LOGIC_NO_LOGIC);
+                    } else if (it.value() == "Vanilla") {
+                        mOptions[index].SetSelectedIndex(RO_LOGIC_VANILLA);
                     }
                     break;
                 case RSK_FOREST:
diff --git a/soh/src/code/z_sram.c b/soh/src/code/z_sram.c
index 84d2d747a..9a132fa7e 100644
--- a/soh/src/code/z_sram.c
+++ b/soh/src/code/z_sram.c
@@ -239,6 +239,8 @@ void Sram_InitSave(FileChooseContext* fileChooseCtx) {
 
     gSaveContext.n64ddFlag = fileChooseCtx->n64ddFlag;
 
+    u8 currentQuest = fileChooseCtx->questType[fileChooseCtx->buttonIndex];
+
     if (Randomizer_IsSeedGenerated()) {
         gSaveContext.questId = QUEST_RANDOMIZER;
 

From bc49998e55caa4dd7563c64b2840c07136d074b9 Mon Sep 17 00:00:00 2001
From: Christopher Leggett <chris@leggett.dev>
Date: Sun, 10 Dec 2023 21:25:59 -0500
Subject: [PATCH 037/230] Reimplements ImGui Disable of options with Vanilla
 logic selected.

---
 soh/soh/Enhancements/randomizer/option.cpp   | 10 +++++
 soh/soh/Enhancements/randomizer/option.h     |  3 ++
 soh/soh/Enhancements/randomizer/settings.cpp | 42 ++++++++++++++++++++
 3 files changed, 55 insertions(+)

diff --git a/soh/soh/Enhancements/randomizer/option.cpp b/soh/soh/Enhancements/randomizer/option.cpp
index a7b4340c9..3cbc76b31 100644
--- a/soh/soh/Enhancements/randomizer/option.cpp
+++ b/soh/soh/Enhancements/randomizer/option.cpp
@@ -355,9 +355,18 @@ const std::string& OptionGroup::GetDescription() const {
     return mDescription;
 }
 
+void OptionGroup::Enable() {
+    mDisabled = false;
+}
+
+void OptionGroup::Disable() {
+    mDisabled = true;
+}
+
 bool OptionGroup::RenderImGui() const { // NOLINT(*-no-recursion)
     ImGuiWindow* window = ImGui::GetCurrentWindow();
     bool changed = false;
+    ImGui::BeginDisabled(mDisabled);
     if (mContainerType == WidgetContainerType::TABLE) {
         if (ImGui::BeginTable(mName.c_str(), static_cast<int>(mSubGroups.size()), ImGuiTableFlags_BordersH | ImGuiTableFlags_BordersV)) {
             for (const auto column : mSubGroups) {
@@ -424,6 +433,7 @@ bool OptionGroup::RenderImGui() const { // NOLINT(*-no-recursion)
     if (mContainerType == WidgetContainerType::TABLE) {
         ImGui::EndTable();
     }
+    ImGui::EndDisabled();
     return changed;
 }
 } // namespace Rando
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/option.h b/soh/soh/Enhancements/randomizer/option.h
index 8e0fd0713..ef0c0a2bb 100644
--- a/soh/soh/Enhancements/randomizer/option.h
+++ b/soh/soh/Enhancements/randomizer/option.h
@@ -462,6 +462,8 @@ class OptionGroup {
      * @brief Renders all of the options contained within this `OptionGroup` in the ImGui menu.
      */
     bool RenderImGui() const;
+    void Disable();
+    void Enable();
 
   private:
     std::string mName;
@@ -472,5 +474,6 @@ class OptionGroup {
     OptionGroupType mContainsType = OptionGroupType::DEFAULT;
     WidgetContainerType mContainerType = WidgetContainerType::BASIC;
     std::string mDescription;
+    bool mDisabled = false;
 };
 } // namespace Rando
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
index ea6ad2d23..118f86709 100644
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -1589,6 +1589,48 @@ void Settings::UpdateOptionProperties() {
     } else {
         mOptions[RSK_LINKS_POCKET].Enable();
     }
+
+    if (CVarGetInteger("gRandomizeLogicRules", RO_LOGIC_GLITCHLESS) == RO_LOGIC_VANILLA) {
+        mOptionGroups[RSG_AREA_ACCESS_IMGUI].Disable();
+        mOptions[RSK_STARTING_AGE].Disable("");
+        mOptions[RSK_GERUDO_FORTRESS].Disable("");
+        mOptions[RSK_RAINBOW_BRIDGE].Disable("");
+        mOptions[RSK_BRIDGE_OPTIONS].Disable("");
+        mOptions[RSK_RAINBOW_BRIDGE_STONE_COUNT].Disable("");
+        mOptions[RSK_RAINBOW_BRIDGE_MEDALLION_COUNT].Disable("");
+        mOptions[RSK_RAINBOW_BRIDGE_REWARD_COUNT].Disable("");
+        mOptions[RSK_RAINBOW_BRIDGE_DUNGEON_COUNT].Disable("");
+        mOptions[RSK_RAINBOW_BRIDGE_TOKEN_COUNT].Disable("");
+        mOptions[RSK_GANONS_TRIALS].Disable("");
+        mOptions[RSK_TRIAL_COUNT].Disable("");
+        mOptions[RSK_TRIFORCE_HUNT].Disable("");
+        mOptions[RSK_TRIFORCE_HUNT_PIECES_TOTAL].Disable("");
+        mOptions[RSK_TRIFORCE_HUNT_PIECES_REQUIRED].Disable("");
+        mOptionGroups[RSG_ITEMS_IMGUI_TABLE].Disable();
+        mOptionGroups[RSG_GAMEPLAY_IMGUI_TABLE].Disable();
+        mOptions[RSK_LINKS_POCKET].Disable("");
+        mOptions[RSK_STARTING_OCARINA].Disable("");
+    } else {
+        mOptionGroups[RSG_AREA_ACCESS_IMGUI].Enable();
+        mOptions[RSK_STARTING_AGE].Enable();
+        mOptions[RSK_GERUDO_FORTRESS].Enable();
+        mOptions[RSK_RAINBOW_BRIDGE].Enable();
+        mOptions[RSK_BRIDGE_OPTIONS].Enable();
+        mOptions[RSK_RAINBOW_BRIDGE_STONE_COUNT].Enable();
+        mOptions[RSK_RAINBOW_BRIDGE_MEDALLION_COUNT].Enable();
+        mOptions[RSK_RAINBOW_BRIDGE_REWARD_COUNT].Enable();
+        mOptions[RSK_RAINBOW_BRIDGE_DUNGEON_COUNT].Enable();
+        mOptions[RSK_RAINBOW_BRIDGE_TOKEN_COUNT].Enable();
+        mOptions[RSK_GANONS_TRIALS].Enable();
+        mOptions[RSK_TRIAL_COUNT].Enable();
+        mOptions[RSK_TRIFORCE_HUNT].Enable();
+        mOptions[RSK_TRIFORCE_HUNT_PIECES_TOTAL].Enable();
+        mOptions[RSK_TRIFORCE_HUNT_PIECES_REQUIRED].Enable();
+        mOptionGroups[RSG_ITEMS_IMGUI_TABLE].Enable();
+        mOptionGroups[RSG_GAMEPLAY_IMGUI_TABLE].Enable();
+        mOptions[RSK_LINKS_POCKET].Enable();
+        mOptions[RSK_STARTING_OCARINA].Enable();
+    }
 }
 
 void Settings::FinalizeSettings(const std::set<RandomizerCheck>& excludedLocations, const std::set<RandomizerTrick>& enabledTricks) {

From c7c29034ebdcdb18faf47ae1b24a809ab3ae3782 Mon Sep 17 00:00:00 2001
From: Christopher Leggett <chris@leggett.dev>
Date: Mon, 11 Dec 2023 12:19:57 -0500
Subject: [PATCH 038/230] Fixes crash from attempted nullptr access.

---
 soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
index a510a420b..3a7e2e4fb 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
@@ -694,7 +694,8 @@ void CheckTrackerFlagSet(int16_t flagType, int32_t flag) {
     for (auto& loc : Rando::StaticData::GetLocationTable()) {
         if ((!IS_RANDO && ((loc.GetQuest() == RCQUEST_MQ && !IS_MASTER_QUEST) ||
                            (loc.GetQuest() == RCQUEST_VANILLA && IS_MASTER_QUEST))) ||
-            (IS_RANDO && ((OTRGlobals::Instance->gRandoContext->GetDungeons()->GetDungeonFromScene(loc.GetScene())->IsMQ() &&
+            (IS_RANDO && !(OTRGlobals::Instance->gRandoContext->GetDungeons()->GetDungeonFromScene(loc.GetScene()) == nullptr) &&
+                ((OTRGlobals::Instance->gRandoContext->GetDungeons()->GetDungeonFromScene(loc.GetScene())->IsMQ() &&
                                 loc.GetQuest() == RCQUEST_VANILLA) ||
                           OTRGlobals::Instance->gRandoContext->GetDungeons()->GetDungeonFromScene(loc.GetScene())->IsVanilla() &&
                                 loc.GetQuest() == RCQUEST_MQ))) {

From 674645ef142de90207c3c3079d36c5cd738f1174 Mon Sep 17 00:00:00 2001
From: Christopher Leggett <chris@leggett.dev>
Date: Tue, 12 Dec 2023 18:51:26 -0500
Subject: [PATCH 039/230] Fixes some miscellaneous issues for Switch builds.

---
 soh/soh/Enhancements/randomizer/context.cpp        | 14 ++++++++++++++
 soh/soh/Enhancements/randomizer/context.h          |  2 ++
 soh/soh/OTRGlobals.cpp                             |  3 +++
 soh/soh/SaveManager.cpp                            | 13 ++++++-------
 .../gamestates/ovl_file_choose/z_file_choose.c     |  3 ++-
 5 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/context.cpp b/soh/soh/Enhancements/randomizer/context.cpp
index 945f62a57..b76dafb95 100644
--- a/soh/soh/Enhancements/randomizer/context.cpp
+++ b/soh/soh/Enhancements/randomizer/context.cpp
@@ -127,6 +127,20 @@ ItemLocation* Context::GetItemLocation(size_t locKey) {
     return &itemLocationTable[static_cast<RandomizerCheck>(locKey)];
 }
 
+ItemOverride& Context::GetItemOverride(RandomizerCheck locKey) {
+    if (!overrides.contains(locKey)) {
+        overrides.emplace(locKey, ItemOverride());
+    }
+    return overrides.at(locKey);
+}
+
+ItemOverride& Context::GetItemOverride(size_t locKey) {
+    if (!overrides.contains(static_cast<RandomizerCheck>(locKey))) {
+        overrides.emplace(static_cast<RandomizerCheck>(locKey), ItemOverride());
+    }
+    return overrides.at(static_cast<RandomizerCheck>(locKey));
+}
+
 void Context::PlaceItemInLocation(const RandomizerCheck locKey, const RandomizerGet item, const bool applyEffectImmediately,
                                   const bool setHidden) {
     const auto loc = GetItemLocation(locKey);
diff --git a/soh/soh/Enhancements/randomizer/context.h b/soh/soh/Enhancements/randomizer/context.h
index 4cbe26383..63e64cb7d 100644
--- a/soh/soh/Enhancements/randomizer/context.h
+++ b/soh/soh/Enhancements/randomizer/context.h
@@ -37,6 +37,8 @@ class Context {
                  RandomizerArea hintedArea = RA_NONE);
     ItemLocation* GetItemLocation(RandomizerCheck locKey);
     ItemLocation* GetItemLocation(size_t locKey);
+    ItemOverride& GetItemOverride(RandomizerCheck locKey);
+    ItemOverride& GetItemOverride(size_t locKey);
     void PlaceItemInLocation(RandomizerCheck locKey, RandomizerGet item, bool applyEffectImmediately = false,
                              bool setHidden = false);
     std::vector<RandomizerCheck> allLocations;
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
index bb1e6e871..449e50574 100644
--- a/soh/soh/OTRGlobals.cpp
+++ b/soh/soh/OTRGlobals.cpp
@@ -2355,6 +2355,9 @@ extern "C" GetItemEntry ItemTable_Retrieve(int16_t getItemID) {
 }
 
 extern "C" GetItemEntry ItemTable_RetrieveEntry(s16 tableID, s16 getItemID) {
+    if (tableID == MOD_RANDOMIZER) {
+        return Rando::StaticData::RetrieveItem(static_cast<RandomizerGet>(getItemID)).GetGIEntry_Copy();
+    }
     return ItemTableManager::Instance->RetrieveItemEntry(tableID, getItemID);
 }
 
diff --git a/soh/soh/SaveManager.cpp b/soh/soh/SaveManager.cpp
index e050c5fb8..d6f573e65 100644
--- a/soh/soh/SaveManager.cpp
+++ b/soh/soh/SaveManager.cpp
@@ -331,13 +331,12 @@ void SaveManager::LoadRandomizerVersion3() {
             RandomizerGet rg = RG_NONE;
             SaveManager::Instance->LoadData("fakeRgID", rg, RG_NONE);
             if (rg != RG_NONE) {
-                randoContext->overrides[static_cast<RandomizerCheck>(i)] =
-                    Rando::ItemOverride(static_cast<RandomizerCheck>(i), rg);
+                randoContext->overrides.emplace(static_cast<RandomizerCheck>(i), Rando::ItemOverride(static_cast<RandomizerCheck>(i), rg));
                 SaveManager::Instance->LoadStruct("trickName", [&]() {
                     SaveManager::Instance->LoadData(
-                        "english", randoContext->overrides[static_cast<RandomizerCheck>(i)].GetTrickName().english);
+                        "english", randoContext->GetItemOverride(i).GetTrickName().english);
                     SaveManager::Instance->LoadData(
-                        "french", randoContext->overrides[static_cast<RandomizerCheck>(i)].GetTrickName().french);
+                        "french", randoContext->GetItemOverride(i).GetTrickName().french);
                 });
             }
             uint16_t price = 0; 
@@ -437,10 +436,10 @@ void SaveManager::SaveRandomizer(SaveContext* saveContext, int sectionID, bool f
         SaveManager::Instance->SaveStruct("", [&]() {
             SaveManager::Instance->SaveData("rgID", randoContext->GetItemLocation(i)->GetPlacedRandomizerGet());
             if (randoContext->GetItemLocation(i)->GetPlacedRandomizerGet() == RG_ICE_TRAP) {
-                SaveManager::Instance->SaveData("fakeRgID", randoContext->overrides[static_cast<RandomizerCheck>(i)].LooksLike());
+                SaveManager::Instance->SaveData("fakeRgID", randoContext->GetItemOverride(i).LooksLike());
                 SaveManager::Instance->SaveStruct("trickName", [&]() {
-                    SaveManager::Instance->SaveData("english", randoContext->overrides[static_cast<RandomizerCheck>(i)].GetTrickName().GetEnglish());
-                    SaveManager::Instance->SaveData("french", randoContext->overrides[static_cast<RandomizerCheck>(i)].GetTrickName().GetFrench());
+                    SaveManager::Instance->SaveData("english", randoContext->GetItemOverride(i).GetTrickName().GetEnglish());
+                    SaveManager::Instance->SaveData("french", randoContext->GetItemOverride(i).GetTrickName().GetFrench());
                     // TODO: German (trick names don't have german translations yet)
                 });
             }
diff --git a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
index b6998d2b4..3a8da0b39 100644
--- a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
+++ b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
@@ -1336,7 +1336,8 @@ void FileChoose_GenerateRandoSeed(GameState* thisx) {
         memcpy(Save_GetSaveMetaInfo(this->buttonIndex)->playerName,
                CVarGetInteger("gLinkDefaultName", 0) ? &linkName : &emptyName, 8);
         return;
-    } else {
+    }
+    if (!generating) {
         Randomizer_GenerateSeed();
     }
 }

From 9740ccc59ba409f4d6ff78795ea5976c09a1662a Mon Sep 17 00:00:00 2001
From: Malkierian <malkierian@gmail.com>
Date: Thu, 14 Dec 2023 15:12:43 -0700
Subject: [PATCH 040/230] Fix Gravedigging Tour rando check. (#3524)

---
 soh/soh/Enhancements/randomizer/location_list.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/soh/soh/Enhancements/randomizer/location_list.cpp b/soh/soh/Enhancements/randomizer/location_list.cpp
index be78d8acf..2e3122cb8 100644
--- a/soh/soh/Enhancements/randomizer/location_list.cpp
+++ b/soh/soh/Enhancements/randomizer/location_list.cpp
@@ -656,7 +656,7 @@ void Rando::StaticData::InitLocationTable() {
     locationTable[RC_GRAVEYARD_HOOKSHOT_CHEST] =                   Location::Chest(RC_GRAVEYARD_HOOKSHOT_CHEST,             RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GRAVEYARD,             ACTOR_EN_BOX,    SCENE_WINDMILL_AND_DAMPES_GRAVE, 4352,                         0x00, "Hookshot Chest",                    "GY Hookshot Chest",                    RHT_GRAVEYARD_HOOKSHOT_CHEST,             RG_PROGRESSIVE_HOOKSHOT,     {},                                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
     locationTable[RC_GRAVEYARD_FREESTANDING_POH] =           Location::Collectable(RC_GRAVEYARD_FREESTANDING_POH,           RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GRAVEYARD,             ACTOR_EN_ITEM00, SCENE_GRAVEYARD,                 1030,                         0x04, "Freestanding PoH",                  "GY Freestanding PoH",                  RHT_GRAVEYARD_FREESTANDING_POH,           RG_PIECE_OF_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
     locationTable[RC_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH] =Location::Collectable(RC_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH,RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GRAVEYARD,             ACTOR_EN_ITEM00, SCENE_WINDMILL_AND_DAMPES_GRAVE, 1798,                         0x07, "Dampe Race Freestanding PoH",       "GY Dampe Race Freestanding PoH",       RHT_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH,RG_PIECE_OF_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
-    locationTable[RC_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR] =    Location::Collectable(RC_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR,    RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GRAVEYARD,             ACTOR_EN_ITEM00, SCENE_GRAVEYARD,                 7942,                         0x08, "Dampe Gravedigging Tour",           "GY Dampe Gravedigging Tour",           RHT_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR,    RG_PIECE_OF_HEART,           {},                        SpoilerCollectionCheck::Gravedigger(0x53, 0x1F),   SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
+    locationTable[RC_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR] =    Location::Collectable(RC_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR,    RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GRAVEYARD,             ACTOR_EN_ITEM00, SCENE_GRAVEYARD,                 6406,                         0x08, "Dampe Gravedigging Tour",           "GY Dampe Gravedigging Tour",           RHT_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR,    RG_PIECE_OF_HEART,           {},                        SpoilerCollectionCheck::Gravedigger(0x53, 0x1F),   SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
     // Death Mountain
     locationTable[RC_DMT_CHEST] =                                  Location::Chest(RC_DMT_CHEST,                            RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_DEATH_MOUNTAIN_TRAIL,  ACTOR_EN_BOX,    SCENE_DEATH_MOUNTAIN_TRAIL,      23201,                        0x01, "Chest",                             "DMT Chest",                            RHT_DMT_CHEST,                            RG_PURPLE_RUPEE,             {},                                                                           SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
     locationTable[RC_DMT_STORMS_GROTTO_CHEST] =                    Location::Chest(RC_DMT_STORMS_GROTTO_CHEST,              RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_DEATH_MOUNTAIN_TRAIL,  ACTOR_EN_BOX,    SCENE_GROTTOS,                   23255,                        0x17, "Storms Grotto Chest",               "DMT Storms Grotto Chest",              RHT_DMT_STORMS_GROTTO_CHEST,              RG_HUGE_RUPEE,               {},                                                                           SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);

From d99cd52eeaa50c60e859fa5c9f21f06b2e968c0d Mon Sep 17 00:00:00 2001
From: Jordan Gilbreath <3819183+jordanpg@users.noreply.github.com>
Date: Sun, 17 Dec 2023 19:02:47 -0500
Subject: [PATCH 041/230] add make sure disabled flag gets popped (#3532)

Co-authored-by: jordanpg <jordanpg@users.noreply.github.com>
---
 soh/soh/Enhancements/randomizer/randomizer.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index 3465e499b..cb228a0c2 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -1794,6 +1794,7 @@ void RandomizerSettingsWindow::DrawElement() {
                 mNeedsUpdate = true;
             }
             ImGui::PopStyleVar(1);
+            ImGui::EndDisabled();
             ImGui::EndTabItem();
         }
         ImGui::EndDisabled();

From 36e030e339ec35c6c3ced1f8c341ac5f88b9c50d Mon Sep 17 00:00:00 2001
From: Jordan Gilbreath <3819183+jordanpg@users.noreply.github.com>
Date: Sun, 17 Dec 2023 22:13:35 -0500
Subject: [PATCH 042/230] Reorder pop for #3532 (#3533)

* add make sure disabled flag gets popped

* reordering : ]

* what?

---------

Co-authored-by: jordanpg <jordanpg@users.noreply.github.com>
---
 soh/soh/Enhancements/randomizer/randomizer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index cb228a0c2..2d843be29 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -1793,8 +1793,8 @@ void RandomizerSettingsWindow::DrawElement() {
             if (mSettings->GetOptionGroup(RSG_ITEMS_IMGUI_TABLE).RenderImGui()) {
                 mNeedsUpdate = true;
             }
-            ImGui::PopStyleVar(1);
             ImGui::EndDisabled();
+            ImGui::PopStyleVar(1);
             ImGui::EndTabItem();
         }
         ImGui::EndDisabled();

From 4978c3b34fbe820b47f36210b0c54f76d0bfccba Mon Sep 17 00:00:00 2001
From: Christopher Leggett <chris@leggett.dev>
Date: Mon, 18 Dec 2023 17:31:17 -0500
Subject: [PATCH 043/230] Fix some bugs with settings (#3525)

* Fixes off by one errors for a few settings.

* Removes disable of shuffle options when starting with corresponding items.

* Junks checks when shuffle is off and start with is on.
---
 .../randomizer/3drando/item_pool.cpp          | 20 +++++--
 .../Enhancements/randomizer/3drando/logic.cpp |  2 +-
 soh/soh/Enhancements/randomizer/draw.cpp      |  2 +-
 .../Enhancements/randomizer/randomizer.cpp    |  2 +-
 .../Enhancements/randomizer/randomizerTypes.h |  1 +
 .../randomizer/randomizer_item_tracker.cpp    |  4 +-
 soh/soh/Enhancements/randomizer/savefile.cpp  |  2 +-
 soh/soh/Enhancements/randomizer/settings.cpp  | 53 +++++++------------
 soh/src/code/z_parameter.c                    |  2 +-
 soh/src/code/z_play.c                         |  2 +-
 10 files changed, 43 insertions(+), 47 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
index 46d039f9b..a2d2dbfe6 100644
--- a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
@@ -670,7 +670,7 @@ void GenerateItemPool() {
 
   if (ctx->GetOption(RSK_TRIFORCE_HUNT)) {
     ctx->possibleIceTrapModels.push_back(RG_TRIFORCE_PIECE);
-    AddItemToMainPool(RG_TRIFORCE_PIECE, ctx->GetOption(RSK_TRIFORCE_HUNT_PIECES_TOTAL).Value<uint8_t>());
+    AddItemToMainPool(RG_TRIFORCE_PIECE, (ctx->GetOption(RSK_TRIFORCE_HUNT_PIECES_TOTAL).Value<uint8_t>() + 1));
     ctx->PlaceItemInLocation(RC_TRIFORCE_COMPLETED, RG_TRIFORCE); // Win condition
     ctx->PlaceItemInLocation(RC_GANON, GetJunkItem(), false, true);
   } else {
@@ -685,14 +685,18 @@ void GenerateItemPool() {
     AddItemToMainPool(RG_KOKIRI_SWORD);
     ctx->possibleIceTrapModels.push_back(RG_KOKIRI_SWORD);
   } else {
-    ctx->PlaceItemInLocation(RC_KF_KOKIRI_SWORD_CHEST, RG_KOKIRI_SWORD, false, true);
+      if (!ctx->GetOption(RSK_STARTING_KOKIRI_SWORD)) {
+          ctx->PlaceItemInLocation(RC_KF_KOKIRI_SWORD_CHEST, RG_KOKIRI_SWORD, false, true);
+      }
   }
 
   if (ctx->GetOption(RSK_SHUFFLE_MASTER_SWORD)) {
     AddItemToMainPool(RG_MASTER_SWORD);
     ctx->possibleIceTrapModels.push_back(RG_MASTER_SWORD); //Master Sword without the GI enum
   } else {
-    ctx->PlaceItemInLocation(RC_TOT_MASTER_SWORD, RG_MASTER_SWORD, false, true);
+      if (!ctx->GetOption(RSK_STARTING_MASTER_SWORD)) {
+          ctx->PlaceItemInLocation(RC_TOT_MASTER_SWORD, RG_MASTER_SWORD, false, true);
+      }
   }
 
   if (ctx->GetOption(RSK_SHUFFLE_WEIRD_EGG)) {
@@ -709,8 +713,14 @@ void GenerateItemPool() {
     }
     ctx->possibleIceTrapModels.push_back(RG_PROGRESSIVE_OCARINA); //Progressive ocarina
   } else {
-    ctx->PlaceItemInLocation(RC_LW_GIFT_FROM_SARIA, RG_PROGRESSIVE_OCARINA, false, true);
-    ctx->PlaceItemInLocation(RC_HF_OCARINA_OF_TIME_ITEM, RG_PROGRESSIVE_OCARINA, false, true);
+      if (ctx->GetOption(RSK_STARTING_OCARINA).Is(RO_STARTING_OCARINA_OFF)) {
+          ctx->PlaceItemInLocation(RC_LW_GIFT_FROM_SARIA, RG_PROGRESSIVE_OCARINA, false, true);
+          ctx->PlaceItemInLocation(RC_HF_OCARINA_OF_TIME_ITEM, RG_PROGRESSIVE_OCARINA, false, true);
+      } else {
+          if (ctx->GetOption(RSK_STARTING_OCARINA).IsNot(RO_STARTING_OCARINA_TIME)) {
+              ctx->PlaceItemInLocation(RC_HF_OCARINA_OF_TIME_ITEM, RG_PROGRESSIVE_OCARINA, false, true);
+          }
+      }
   }
 
   if (ctx->GetOption(RSK_SHUFFLE_COWS)) {
diff --git a/soh/soh/Enhancements/randomizer/3drando/logic.cpp b/soh/soh/Enhancements/randomizer/3drando/logic.cpp
index 709f49cc4..99eb71da3 100644
--- a/soh/soh/Enhancements/randomizer/3drando/logic.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/logic.cpp
@@ -668,7 +668,7 @@ namespace Logic {
                      (ctx->GetSettings()->LACSCondition() == RO_LACS_REWARDS    && StoneCount + MedallionCount + (Greg && GregInLacsLogic ? 1 : 0) >= ctx->GetOption(RSK_LACS_REWARD_COUNT).Value<uint8_t>())  ||
                      (ctx->GetSettings()->LACSCondition() == RO_LACS_DUNGEONS   && DungeonCount + (Greg && GregInLacsLogic ? 1 : 0) >= ctx->GetOption(RSK_LACS_DUNGEON_COUNT).Value<uint8_t>())                ||
                      (ctx->GetSettings()->LACSCondition() == RO_LACS_TOKENS     && GoldSkulltulaTokens >= ctx->GetOption(RSK_LACS_TOKEN_COUNT).Value<uint8_t>());
-    CanCompleteTriforce = TriforcePieces >= ctx->GetOption(RSK_TRIFORCE_HUNT_PIECES_REQUIRED).Value<uint8_t>();
+    CanCompleteTriforce = TriforcePieces >= ctx->GetOption(RSK_TRIFORCE_HUNT_PIECES_REQUIRED).Value<uint8_t>() + 1;
   }
 
   bool SmallKeys(RandomizerRegion dungeon, uint8_t requiredAmount) {
diff --git a/soh/soh/Enhancements/randomizer/draw.cpp b/soh/soh/Enhancements/randomizer/draw.cpp
index 5c3b32585..43f7129ab 100644
--- a/soh/soh/Enhancements/randomizer/draw.cpp
+++ b/soh/soh/Enhancements/randomizer/draw.cpp
@@ -240,7 +240,7 @@ extern "C" void Randomizer_DrawTriforcePieceGI(PlayState* play, GetItemEntry get
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
 
     uint8_t current = gSaveContext.triforcePiecesCollected;
-    uint8_t required = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIFORCE_HUNT_PIECES_REQUIRED);
+    uint8_t required = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIFORCE_HUNT_PIECES_REQUIRED) + 1;
 
     Matrix_Scale(triforcePieceScale, triforcePieceScale, triforcePieceScale, MTXMODE_APPLY);
 
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index 2d843be29..3de001e15 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -2722,7 +2722,7 @@ void CreateTriforcePieceMessages() {
 CustomMessage Randomizer::GetTriforcePieceMessage() {
     // Item is only given after the textbox, so reflect that inside the textbox.
     uint8_t current = gSaveContext.triforcePiecesCollected + 1;
-    uint8_t required = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIFORCE_HUNT_PIECES_REQUIRED);
+    uint8_t required = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIFORCE_HUNT_PIECES_REQUIRED) + 1;
     uint8_t remaining = required - current;
     float percentageCollected = (float)current / (float)required;
     uint8_t messageIndex;
diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h
index b73430369..14954fe11 100644
--- a/soh/soh/Enhancements/randomizer/randomizerTypes.h
+++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@@ -3749,6 +3749,7 @@ typedef enum {
 typedef enum {
     RO_STARTING_OCARINA_OFF,
     RO_STARTING_OCARINA_FAIRY,
+    RO_STARTING_OCARINA_TIME,
 } RandoOptionStartingOcarina;
 
 //Item Pool Settings
diff --git a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
index e5e633e74..535e9b4ad 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
@@ -528,8 +528,8 @@ void DrawItemCount(ItemTrackerItem item) {
         std::string currentString = "";
         std::string requiredString = "";
         std::string maxString = "";
-        uint8_t piecesRequired = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIFORCE_HUNT_PIECES_REQUIRED);
-        uint8_t piecesTotal = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIFORCE_HUNT_PIECES_TOTAL);
+        uint8_t piecesRequired = (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIFORCE_HUNT_PIECES_REQUIRED) + 1);
+        uint8_t piecesTotal = (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIFORCE_HUNT_PIECES_TOTAL) + 1);
         ImU32 currentColor = gSaveContext.triforcePiecesCollected >= piecesRequired ? IM_COL_GREEN : IM_COL_WHITE;
         ImU32 maxColor = IM_COL_GREEN;
         int32_t trackerTriforcePieceNumberDisplayMode = CVarGetInteger("gItemTrackerTriforcePieceTrack", TRIFORCE_PIECE_COLLECTED_REQUIRED_MAX);
diff --git a/soh/soh/Enhancements/randomizer/savefile.cpp b/soh/soh/Enhancements/randomizer/savefile.cpp
index f535a0a20..b82c7a0d1 100644
--- a/soh/soh/Enhancements/randomizer/savefile.cpp
+++ b/soh/soh/Enhancements/randomizer/savefile.cpp
@@ -357,7 +357,7 @@ extern "C" void Randomizer_InitSaveFile() {
         Flags_SetRandomizerInf(RAND_INF_TOT_MASTER_SWORD);
     }
 
-    HIGH_SCORE(HS_POE_POINTS) = 1000 - (100 * Randomizer_GetSettingValue(RSK_BIG_POE_COUNT));
+    HIGH_SCORE(HS_POE_POINTS) = 1000 - (100 * (Randomizer_GetSettingValue(RSK_BIG_POE_COUNT) + 1));
 
     if (Randomizer_GetSettingValue(RSK_SKIP_EPONA_RACE)) {
         Flags_SetEventChkInf(EVENTCHKINF_EPONA_OBTAINED);
diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
index 118f86709..bcda40dcc 100644
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -1406,24 +1406,6 @@ void Settings::UpdateOptionProperties() {
         mOptions[RSK_MIX_INTERIOR_ENTRANCES].Hide();
         mOptions[RSK_MIX_GROTTO_ENTRANCES].Hide();
     }
-    // Shuffle Kokiri Sword - Disabled when Start with Kokiri Sword is active
-    if (CVarGetInteger("gRandomizeStartingKokiriSword", RO_GENERIC_OFF)) {
-        mOptions[RSK_SHUFFLE_KOKIRI_SWORD].Disable("This option is disabled because \"Start with Kokiri Sword\" is enabled.");
-    } else {
-        mOptions[RSK_SHUFFLE_KOKIRI_SWORD].Enable();
-    }
-    // Shuffle Master Sword - Disabled when Start with Master Sword is active
-    if (CVarGetInteger("gRandomizeStartingMasterSword", RO_GENERIC_OFF)) {
-        mOptions[RSK_SHUFFLE_MASTER_SWORD].Disable("This option is disabled because \"Start with Master Sword\" is enabled");
-    } else {
-        mOptions[RSK_SHUFFLE_MASTER_SWORD].Enable();
-    }
-    // Shuffle Ocarinas - Disabled when Start with Ocarina is active
-    if (CVarGetInteger("gRandomizeStartingOcarina", RO_STARTING_OCARINA_OFF)) {
-        mOptions[RSK_SHUFFLE_OCARINA].Disable("This option is disabled because \"Start with Fairy Ocarina\" is enabled.");
-    } else {
-        mOptions[RSK_SHUFFLE_OCARINA].Enable();
-    }
     // Shuffle Weird Egg - Disabled when Skip Child Zelda is active
     if (CVarGetInteger("gRandomizeSkipChildZelda", RO_GENERIC_DONT_SKIP)) {
         mOptions[RSK_SHUFFLE_WEIRD_EGG].Disable("This option is disabled because \"Skip Child Zelda\" is enabled.");
@@ -1497,7 +1479,7 @@ void Settings::UpdateOptionProperties() {
         mOptions[RSK_KEYRINGS_GERUDO_FORTRESS].Enable();
     }
     if (CVarGetInteger("gRandomizeTriforceHunt", RO_GENERIC_OFF)) {
-        mOptions[RSK_GANONS_BOSS_KEY].Disable("This option is disabled because Triforcce Hunt is enabled."
+        mOptions[RSK_GANONS_BOSS_KEY].Disable("This option is disabled because Triforce Hunt is enabled."
             "Ganon's Boss key\nwill instead be given to you after Triforce Hunt completion.");
     } else {
         mOptions[RSK_GANONS_BOSS_KEY].Enable();
@@ -1678,21 +1660,6 @@ void Settings::FinalizeSettings(const std::set<RandomizerCheck>& excludedLocatio
             mOptions[RSK_MQ_DUNGEON_SET].SetSelectedIndex(RO_GENERIC_OFF);
         }
 
-        // TODO: Historically we have forced the shuffle settings off when we have the corresponding start
-        // with setting on, but 3drando doesn't seem to actually do that. It seems like you can both shuffle
-        // them in the pool and start with them.
-        if (mOptions[RSK_STARTING_KOKIRI_SWORD]) {
-            mOptions[RSK_SHUFFLE_KOKIRI_SWORD].SetSelectedIndex(RO_GENERIC_OFF);
-        }
-
-        if (mOptions[RSK_STARTING_MASTER_SWORD]) {
-            mOptions[RSK_SHUFFLE_MASTER_SWORD].SetSelectedIndex(RO_GENERIC_OFF);
-        }
-
-        if (mOptions[RSK_STARTING_OCARINA].IsNot(RO_STARTING_OCARINA_OFF)) {
-            mOptions[RSK_SHUFFLE_OCARINA].SetSelectedIndex(RO_GENERIC_OFF);
-        }
-
         // If any of the individual shuffle settings are on, turn on the main Shuffle Entrances option
         if (mOptions[RSK_SHUFFLE_DUNGEON_ENTRANCES].IsNot(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF)
             || mOptions[RSK_SHUFFLE_BOSS_ENTRANCES].IsNot(RO_BOSS_ROOM_ENTRANCE_SHUFFLE_OFF)
@@ -1719,6 +1686,24 @@ void Settings::FinalizeSettings(const std::set<RandomizerCheck>& excludedLocatio
         for (const auto randomizerTrick : enabledTricks) {
             mTrickOptions[randomizerTrick].SetSelectedIndex(1);
         }
+        if (!mOptions[RSK_SHUFFLE_KOKIRI_SWORD]) {
+            if (mOptions[RSK_STARTING_KOKIRI_SWORD]) {
+                ctx->GetItemLocation(RC_KF_KOKIRI_SWORD_CHEST)->GetExcludedOption()->SetSelectedIndex(1);
+            }
+        }
+        if (!mOptions[RSK_SHUFFLE_MASTER_SWORD]) {
+            if (mOptions[RSK_STARTING_MASTER_SWORD]) {
+                ctx->GetItemLocation(RC_MASTER_SWORD_PEDESTAL)->GetExcludedOption()->SetSelectedIndex(1);
+            }
+        }
+        if (!mOptions[RSK_SHUFFLE_OCARINA]) {
+            if (mOptions[RSK_STARTING_OCARINA].IsNot(RO_STARTING_OCARINA_OFF)) {
+                ctx->GetItemLocation(RC_LW_GIFT_FROM_SARIA)->GetExcludedOption()->SetSelectedIndex(1);
+                if (mOptions[RSK_STARTING_OCARINA].Is(RO_STARTING_OCARINA_TIME)) {
+                    ctx->GetItemLocation(RC_HF_OCARINA_OF_TIME_ITEM)->GetExcludedOption()->SetSelectedIndex(1);
+                }
+            }
+        }
     }
 
     // RANDOTODO implement chest shuffle with keysanity
diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c
index 67405d226..e9626c068 100644
--- a/soh/src/code/z_parameter.c
+++ b/soh/src/code/z_parameter.c
@@ -2612,7 +2612,7 @@ u16 Randomizer_Item_Give(PlayState* play, GetItemEntry giEntry) {
         GameInteractor_SetTriforceHuntPieceGiven(true);
 
         // Teleport to credits when goal is reached.
-        if (gSaveContext.triforcePiecesCollected == Randomizer_GetSettingValue(RSK_TRIFORCE_HUNT_PIECES_REQUIRED)) {
+        if (gSaveContext.triforcePiecesCollected == (Randomizer_GetSettingValue(RSK_TRIFORCE_HUNT_PIECES_REQUIRED) + 1)) {
             gSaveContext.sohStats.itemTimestamp[TIMESTAMP_TRIFORCE_COMPLETED] = GAMEPLAYSTAT_TOTAL_TIME;
             gSaveContext.sohStats.gameComplete = 1;
             Flags_SetRandomizerInf(RAND_INF_GRANT_GANONS_BOSSKEY);
diff --git a/soh/src/code/z_play.c b/soh/src/code/z_play.c
index d6c84e355..f9b3e7cf4 100644
--- a/soh/src/code/z_play.c
+++ b/soh/src/code/z_play.c
@@ -2362,7 +2362,7 @@ void Play_PerformSave(PlayState* play) {
 
         uint8_t triforceHuntCompleted =
             IS_RANDO &&
-            gSaveContext.triforcePiecesCollected == Randomizer_GetSettingValue(RSK_TRIFORCE_HUNT_PIECES_REQUIRED) &&
+            gSaveContext.triforcePiecesCollected == (Randomizer_GetSettingValue(RSK_TRIFORCE_HUNT_PIECES_REQUIRED) + 1) &&
             Randomizer_GetSettingValue(RSK_TRIFORCE_HUNT);
         if (CVarGetInteger("gAutosave", AUTOSAVE_OFF) != AUTOSAVE_OFF || triforceHuntCompleted) {
             Overlay_DisplayText(3.0f, "Game Saved");

From bb4fb221880801352f92eae89af23c931e085eba Mon Sep 17 00:00:00 2001
From: Christopher Leggett <chris@leggett.dev>
Date: Mon, 18 Dec 2023 17:31:29 -0500
Subject: [PATCH 044/230] Fixes error noise when seed generation fails (#3527)

---
 .../Enhancements/randomizer/3drando/menu.cpp  | 35 +++++++------------
 .../Enhancements/randomizer/3drando/menu.hpp  |  2 +-
 .../randomizer/3drando/rando_main.cpp         |  3 +-
 3 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/menu.cpp b/soh/soh/Enhancements/randomizer/3drando/menu.cpp
index e01098c7d..adc0a9040 100644
--- a/soh/soh/Enhancements/randomizer/3drando/menu.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/menu.cpp
@@ -21,28 +21,28 @@ std::vector<std::string> presetEntries;
 Rando::Option* currentSetting;
 } // namespace
 
-std::string GenerateRandomizer(std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks,
-    std::string seedString) {
-    auto ctx = Rando::Context::GetInstance();
+bool GenerateRandomizer(std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks,
+    std::string seedInput) {
+    const auto ctx = Rando::Context::GetInstance();
 
     srand(time(NULL));
     // if a blank seed was entered, make a random one
-    if (seedString.empty()) {
-        seedString = std::to_string(rand() % 0xFFFFFFFF);
-    } else if (seedString.rfind("seed_testing_count", 0) == 0 && seedString.length() > 18) {
+    if (seedInput.empty()) {
+        seedInput = std::to_string(rand() % 0xFFFFFFFF);
+    } else if (seedInput.rfind("seed_testing_count", 0) == 0 && seedInput.length() > 18) {
         int count;
         try {
-            count = std::stoi(seedString.substr(18), nullptr);
+            count = std::stoi(seedInput.substr(18), nullptr);
         } catch (std::invalid_argument &e) {
             count = 1;
         } catch (std::out_of_range &e) {
             count = 1;
         }
         Playthrough::Playthrough_Repeat(excludedLocations, enabledTricks, count);
-        return "";
+        return false; // TODO: Not sure if this is correct but I don't think we support this functionality yet anyway.
     }
 
-    ctx->GetSettings()->SetSeedString(seedString);
+    ctx->GetSettings()->SetSeedString(seedInput);
     uint32_t seedHash = boost::hash_32<std::string>{}(ctx->GetSettings()->GetSeedString());
     ctx->GetSettings()->SetSeed(seedHash & 0xFFFFFFFF);
 
@@ -52,10 +52,10 @@ std::string GenerateRandomizer(std::set<RandomizerCheck> excludedLocations, std:
             printf("\n\nFailed to generate after 5 tries.\nPress B to go back to the menu.\nA different seed might be "
                    "successful.");
             SPDLOG_DEBUG("\nRANDOMIZATION FAILED COMPLETELY. PLZ FIX\n");//RANDOTODO print seed for reproduction purposes
-            return "";
+            return false;
         } else {
             printf("\n\nError %d with fill.\nPress Select to exit or B to go back to the menu.\n", ret);
-            return "";
+            return false;
         }
     }
 
@@ -66,16 +66,5 @@ std::string GenerateRandomizer(std::set<RandomizerCheck> excludedLocations, std:
         }
         ctx->GetOption(RSK_KEYSANITY).RestoreDelayedOption();
     }
-    std::ostringstream fileNameStream;
-    for (int i = 0; i < ctx->hashIconIndexes.size(); i++) {
-        if (i) {
-            fileNameStream << '-';
-        }
-        if (ctx->hashIconIndexes[i] < 10) {
-            fileNameStream << '0';
-        }
-        fileNameStream << std::to_string(ctx->hashIconIndexes[i]);
-    }
-    std::string fileName = fileNameStream.str();
-    return "./Randomizer/" + fileName + ".json";
+    return true;
 }
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/3drando/menu.hpp b/soh/soh/Enhancements/randomizer/3drando/menu.hpp
index 77228e835..f9393d90e 100644
--- a/soh/soh/Enhancements/randomizer/3drando/menu.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/menu.hpp
@@ -25,4 +25,4 @@
 // #define CYAN    "\x1b[36m"
 // #define WHITE   "\x1b[37m"
 
-std::string GenerateRandomizer(std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks, std::string seedInput);
\ No newline at end of file
+bool GenerateRandomizer(std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks, std::string seedInput);
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/3drando/rando_main.cpp b/soh/soh/Enhancements/randomizer/3drando/rando_main.cpp
index 833a6fc42..0de9cd8e9 100644
--- a/soh/soh/Enhancements/randomizer/3drando/rando_main.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/rando_main.cpp
@@ -17,11 +17,10 @@ void RandoMain::GenerateRando(std::set<RandomizerCheck> excludedLocations, std::
     // std::string settingsFileName = "./randomizer/latest_settings.json";
     // CVarSetString("gLoadedPreset", settingsFileName.c_str());
 
-    std::string fileName = LUS::Context::GetPathRelativeToAppDirectory(GenerateRandomizer(excludedLocations, enabledTricks, seedString).c_str());
+    Rando::Context::GetInstance()->SetSeedGenerated(GenerateRandomizer(excludedLocations, enabledTricks, seedString));
 
     CVarSave();
     CVarLoad();
-    Rando::Context::GetInstance()->SetSeedGenerated();
     Rando::Context::GetInstance()->SetSpoilerLoaded(false);
     Rando::Context::GetInstance()->SetPlandoLoaded(false);
 }
\ No newline at end of file

From 7f961abd8dedbf9349e153f9d4d45f9b547fbe9c Mon Sep 17 00:00:00 2001
From: Christopher Leggett <chris@leggett.dev>
Date: Wed, 20 Dec 2023 16:51:48 -0500
Subject: [PATCH 045/230] Fixes missing options and some incorrect disabling
 logic (#3545)

---
 soh/soh/Enhancements/randomizer/option.cpp   |   2 -
 soh/soh/Enhancements/randomizer/settings.cpp | 297 +++++++++----------
 2 files changed, 148 insertions(+), 151 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/option.cpp b/soh/soh/Enhancements/randomizer/option.cpp
index 3cbc76b31..f26a379d0 100644
--- a/soh/soh/Enhancements/randomizer/option.cpp
+++ b/soh/soh/Enhancements/randomizer/option.cpp
@@ -221,7 +221,6 @@ bool Option::RenderCombobox() const {
     if (!description.empty()) {
         UIWidgets::InsertHelpHoverText(description.c_str());
     }
-    ImGui::BeginGroup();
     const std::string comboName = std::string("##") + std::string(cvarName);
     if (ImGui::BeginCombo(comboName.c_str(), options[selected].c_str())) {
         for (size_t i = 0; i < options.size(); i++) {
@@ -236,7 +235,6 @@ bool Option::RenderCombobox() const {
         }
         ImGui::EndCombo();
     }
-    ImGui::EndGroup();
     if (disabled) {
         UIWidgets::ReEnableComponent(disabledText.c_str());
     }
diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
index bcda40dcc..68a65a605 100644
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -92,7 +92,7 @@ void Settings::CreateOptions() {
     mOptions[RSK_MQ_GTG] = Option::U8("Gerudo Training Grounds", {"Vanilla", "Master Quest", "Random"}, OptionCategory::Setting, "gRandomizeMqDungeonsGTG", "", WidgetType::Combobox, RO_MQ_SET_VANILLA, false, IMFLAG_NONE);
     mOptions[RSK_MQ_GANONS_CASTLE] = Option::U8("Ganon's Castle", {"Vanilla", "Master Quest", "Random"}, OptionCategory::Setting, "gRandomizeMqDungeonsGanonsCastle", "", WidgetType::Combobox, RO_MQ_SET_VANILLA);
     mOptions[RSK_SHUFFLE_DUNGEON_REWARDS] = Option::U8("Shuffle Dungeon Rewards", {"End of Dungeons", "Any Dungeon", "Overworld", "Anywhere"}, OptionCategory::Setting, "gRandomizeShuffleDungeonReward", mOptionDescriptions[RSK_SHUFFLE_DUNGEON_REWARDS], WidgetType::Combobox, RO_DUNGEON_REWARDS_END_OF_DUNGEON);
-    mOptions[RSK_LINKS_POCKET] = Option::U8("Link's Pocket", {"Dungeon Reward", "Advancement", "Anything", "Nothing"}, OptionCategory::Setting, "gRandomizeLinksPocket", "", WidgetType::Combobox, RO_LINKS_POCKET_DUNGEON_REWARD, true);
+    mOptions[RSK_LINKS_POCKET] = Option::U8("Link's Pocket", {"Dungeon Reward", "Advancement", "Anything", "Nothing"}, OptionCategory::Setting, "gRandomizeLinksPocket", "", WidgetType::Combobox, RO_LINKS_POCKET_DUNGEON_REWARD);
     mOptions[RSK_SHUFFLE_SONGS] = Option::U8("Shuffle Songs", {"Song Locations", "Dungeon Rewards", "Anywhere"}, OptionCategory::Setting, "gRandomizeShuffleSongs", mOptionDescriptions[RSK_SHUFFLE_SONGS], WidgetType::Combobox, RO_SONG_SHUFFLE_SONG_LOCATIONS);
     mOptions[RSK_SHOPSANITY] = Option::U8("Shopsanity", {"Off", "0 Items", "1 Item", "2 Items", "3 Items", "4 Items", "Random"}, OptionCategory::Setting, "gRandomizeShopsanity", mOptionDescriptions[RSK_SHOPSANITY], WidgetType::Combobox, RO_SHOPSANITY_OFF);
     mOptions[RSK_SHOPSANITY_PRICES] = Option::U8("Shopsanity Prices", {"Balanced", "Starting Wallet", "Adult Wallet", "Giant's Wallet", "Tycoon's Wallet"}, OptionCategory::Setting, "gRandomizeShopsanityPrices", mOptionDescriptions[RSK_SHOPSANITY_PRICES], WidgetType::Combobox, RO_SHOPSANITY_PRICE_BALANCED, false, IMFLAG_NONE);
@@ -629,6 +629,7 @@ void Settings::CreateOptions() {
         &mOptions[RSK_SHUFFLE_BOSS_SOULS],
     }, false, WidgetContainerType::COLUMN);
     mOptionGroups[RSG_SHUFFLE_DUNGEON_ITEMS_IMGUI] = OptionGroup::SubGroup("Shuffle Dungeon Items", {
+        &mOptions[RSK_SHUFFLE_DUNGEON_REWARDS],
         &mOptions[RSK_SHUFFLE_MAPANDCOMPASS],
         &mOptions[RSK_KEYSANITY],
         &mOptions[RSK_GERUDO_KEYS],
@@ -1196,14 +1197,6 @@ void Settings::SetAllFromCVar() {
 }
 
 void Settings::UpdateOptionProperties() {
-    // Starting Age - Disabled when Forest is set to Closed or under very specific conditions
-    if (CVarGetInteger("gRandomizeForest", RO_FOREST_CLOSED) == RO_FOREST_CLOSED ||
-        (CVarGetInteger("gRandomizeDoorOfTime", RO_DOOROFTIME_CLOSED) == RO_DOOROFTIME_CLOSED &&
-        CVarGetInteger("gRandomizeShuffleOcarinas", RO_GENERIC_OFF) == RO_GENERIC_OFF)) /* closed door of time with ocarina shuffle off */ {
-        mOptions[RSK_STARTING_AGE].Disable("This option is disabled due to other optionos making the game unbeatable");
-    } else {
-        mOptions[RSK_STARTING_AGE].Enable();
-    }
     // Default to hiding bridge opts and the extra sliders.
     mOptions[RSK_RAINBOW_BRIDGE].AddFlag(IMFLAG_SEPARATOR_BOTTOM);
     mOptions[RSK_BRIDGE_OPTIONS].Hide();
@@ -1212,85 +1205,154 @@ void Settings::UpdateOptionProperties() {
     mOptions[RSK_RAINBOW_BRIDGE_REWARD_COUNT].Hide();
     mOptions[RSK_RAINBOW_BRIDGE_DUNGEON_COUNT].Hide();
     mOptions[RSK_RAINBOW_BRIDGE_TOKEN_COUNT].Hide();
-    const uint8_t bridgeOpt = CVarGetInteger("gRandomizeBridgeRewardOptions", RO_BRIDGE_STANDARD_REWARD);
-    switch (CVarGetInteger("gRandomizeRainbowBridge", RO_BRIDGE_VANILLA)) {
-        case RO_BRIDGE_STONES:
-            // Show Bridge Options and Stone Count slider
-            mOptions[RSK_RAINBOW_BRIDGE].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
-            mOptions[RSK_BRIDGE_OPTIONS].Unhide();
-            mOptions[RSK_RAINBOW_BRIDGE_STONE_COUNT].Unhide();
-            if (bridgeOpt == RO_BRIDGE_GREG_REWARD) {
-                if (mOptions[RSK_RAINBOW_BRIDGE_STONE_COUNT].GetOptionCount() == 4) {
-                    mOptions[RSK_RAINBOW_BRIDGE_STONE_COUNT].ChangeOptions(NumOpts(0, 4));
-                }
-            } else {
-                if (mOptions[RSK_RAINBOW_BRIDGE_STONE_COUNT].GetOptionCount() == 5) {
-                    mOptions[RSK_RAINBOW_BRIDGE_STONE_COUNT].ChangeOptions(NumOpts(0, 3));
-                }
-            }
-            break;
-        case RO_BRIDGE_MEDALLIONS:
-            // Show Bridge Options and Medallion Count Slider
-            mOptions[RSK_RAINBOW_BRIDGE].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
-            mOptions[RSK_BRIDGE_OPTIONS].Unhide();
-            mOptions[RSK_RAINBOW_BRIDGE_REWARD_COUNT].Unhide();
-            if (bridgeOpt == RO_BRIDGE_GREG_REWARD) {
-                if (mOptions[RSK_RAINBOW_BRIDGE_MEDALLION_COUNT].GetOptionCount() == 7) {
-                    mOptions[RSK_RAINBOW_BRIDGE_MEDALLION_COUNT].ChangeOptions(NumOpts(0, 7));
-                }
-            } else {
-                if (mOptions[RSK_RAINBOW_BRIDGE_MEDALLION_COUNT].GetOptionCount() == 8) {
-                    mOptions[RSK_RAINBOW_BRIDGE_MEDALLION_COUNT].ChangeOptions(NumOpts(0, 6));
-                }
-            }
-            break;
-        case RO_BRIDGE_DUNGEON_REWARDS:
-            // Show Bridge Options and Dungeon Reward Count Slider
-            mOptions[RSK_RAINBOW_BRIDGE].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
-            mOptions[RSK_BRIDGE_OPTIONS].Unhide();
-            mOptions[RSK_RAINBOW_BRIDGE_REWARD_COUNT].Unhide();
-            if (bridgeOpt == RO_BRIDGE_GREG_REWARD) {
-                if (mOptions[RSK_RAINBOW_BRIDGE_REWARD_COUNT].GetOptionCount() == 10) {
-                    mOptions[RSK_RAINBOW_BRIDGE_REWARD_COUNT].ChangeOptions(NumOpts(0, 10));
-                }
-            } else {
-                if (mOptions[RSK_RAINBOW_BRIDGE_REWARD_COUNT].GetOptionCount() == 11) {
-                    mOptions[RSK_RAINBOW_BRIDGE_REWARD_COUNT].ChangeOptions(NumOpts(0, 9));
-                }
-            }
-            break;
-        case RO_BRIDGE_DUNGEONS:
-            // Show Bridge Options and Dungeon Count Slider
-            mOptions[RSK_RAINBOW_BRIDGE].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
-            mOptions[RSK_BRIDGE_OPTIONS].Unhide();
-            mOptions[RSK_RAINBOW_BRIDGE_DUNGEON_COUNT].Unhide();
-            if (bridgeOpt == RO_BRIDGE_GREG_REWARD) {
-                if (mOptions[RSK_RAINBOW_BRIDGE_DUNGEON_COUNT].GetOptionCount() == 9) {
-                    mOptions[RSK_RAINBOW_BRIDGE_DUNGEON_COUNT].ChangeOptions(NumOpts(0, 9));
-                }
-            } else {
-                if (mOptions[RSK_RAINBOW_BRIDGE_DUNGEON_COUNT].GetOptionCount() == 10) {
-                    mOptions[RSK_RAINBOW_BRIDGE_DUNGEON_COUNT].ChangeOptions(NumOpts(0, 8));
-                }
-            }
-            break;
-        case RO_BRIDGE_TOKENS:
-            // Show token count slider (not bridge options)
-            mOptions[RSK_RAINBOW_BRIDGE].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
-            mOptions[RSK_BRIDGE_OPTIONS].Hide();
-            mOptions[RSK_RAINBOW_BRIDGE_TOKEN_COUNT].Unhide();
-            break;
-        default:
-            break;
-    }
-    // Only show the trial count slider if Trials is set to Set Number
-    if (CVarGetInteger("gRandomizeGanonTrial", RO_GANONS_TRIALS_SKIP) == RO_GANONS_TRIALS_SET_NUMBER) {
-        mOptions[RSK_GANONS_TRIALS].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
-        mOptions[RSK_TRIAL_COUNT].Unhide();
+    if (CVarGetInteger("gRandomizeLogicRules", RO_LOGIC_GLITCHLESS) == RO_LOGIC_VANILLA) {
+        mOptionGroups[RSG_AREA_ACCESS_IMGUI].Disable();
+        mOptions[RSK_STARTING_AGE].Disable("");
+        mOptions[RSK_GERUDO_FORTRESS].Disable("");
+        mOptions[RSK_RAINBOW_BRIDGE].Disable("");
+        mOptions[RSK_BRIDGE_OPTIONS].Disable("");
+        mOptions[RSK_RAINBOW_BRIDGE_STONE_COUNT].Disable("");
+        mOptions[RSK_RAINBOW_BRIDGE_MEDALLION_COUNT].Disable("");
+        mOptions[RSK_RAINBOW_BRIDGE_REWARD_COUNT].Disable("");
+        mOptions[RSK_RAINBOW_BRIDGE_DUNGEON_COUNT].Disable("");
+        mOptions[RSK_RAINBOW_BRIDGE_TOKEN_COUNT].Disable("");
+        mOptions[RSK_GANONS_TRIALS].Disable("");
+        mOptions[RSK_TRIAL_COUNT].Disable("");
+        mOptions[RSK_TRIFORCE_HUNT].Disable("");
+        mOptions[RSK_TRIFORCE_HUNT_PIECES_TOTAL].Disable("");
+        mOptions[RSK_TRIFORCE_HUNT_PIECES_REQUIRED].Disable("");
+        mOptionGroups[RSG_ITEMS_IMGUI_TABLE].Disable();
+        mOptionGroups[RSG_GAMEPLAY_IMGUI_TABLE].Disable();
+        mOptions[RSK_LINKS_POCKET].Disable("");
+        mOptions[RSK_STARTING_OCARINA].Disable("");
     } else {
-        mOptions[RSK_GANONS_TRIALS].AddFlag(IMFLAG_SEPARATOR_BOTTOM);
-        mOptions[RSK_TRIAL_COUNT].Hide();
+        mOptionGroups[RSG_AREA_ACCESS_IMGUI].Enable();
+        // Starting Age - Disabled when Forest is set to Closed or under very specific conditions
+        if (CVarGetInteger("gRandomizeForest", RO_FOREST_CLOSED) == RO_FOREST_CLOSED ||
+            (CVarGetInteger("gRandomizeDoorOfTime", RO_DOOROFTIME_CLOSED) == RO_DOOROFTIME_CLOSED &&
+            CVarGetInteger("gRandomizeShuffleOcarinas", RO_GENERIC_OFF) == RO_GENERIC_OFF)) /* closed door of time with ocarina shuffle off */ {
+            mOptions[RSK_STARTING_AGE].Disable("This option is disabled due to other optionos making the game unbeatable");
+        } else {
+            mOptions[RSK_STARTING_AGE].Enable();
+        }
+        mOptions[RSK_GERUDO_FORTRESS].Enable();
+        mOptions[RSK_RAINBOW_BRIDGE].Enable();
+        mOptions[RSK_BRIDGE_OPTIONS].Enable();
+        mOptions[RSK_RAINBOW_BRIDGE_STONE_COUNT].Enable();
+        mOptions[RSK_RAINBOW_BRIDGE_MEDALLION_COUNT].Enable();
+        mOptions[RSK_RAINBOW_BRIDGE_REWARD_COUNT].Enable();
+        mOptions[RSK_RAINBOW_BRIDGE_DUNGEON_COUNT].Enable();
+        mOptions[RSK_RAINBOW_BRIDGE_TOKEN_COUNT].Enable();
+        const uint8_t bridgeOpt = CVarGetInteger("gRandomizeBridgeRewardOptions", RO_BRIDGE_STANDARD_REWARD);
+        switch (CVarGetInteger("gRandomizeRainbowBridge", RO_BRIDGE_VANILLA)) {
+            case RO_BRIDGE_STONES:
+                // Show Bridge Options and Stone Count slider
+                mOptions[RSK_RAINBOW_BRIDGE].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
+                mOptions[RSK_BRIDGE_OPTIONS].Unhide();
+                mOptions[RSK_RAINBOW_BRIDGE_STONE_COUNT].Unhide();
+                if (bridgeOpt == RO_BRIDGE_GREG_REWARD) {
+                    if (mOptions[RSK_RAINBOW_BRIDGE_STONE_COUNT].GetOptionCount() == 4) {
+                        mOptions[RSK_RAINBOW_BRIDGE_STONE_COUNT].ChangeOptions(NumOpts(0, 4));
+                    }
+                } else {
+                    if (mOptions[RSK_RAINBOW_BRIDGE_STONE_COUNT].GetOptionCount() == 5) {
+                        mOptions[RSK_RAINBOW_BRIDGE_STONE_COUNT].ChangeOptions(NumOpts(0, 3));
+                    }
+                }
+                break;
+            case RO_BRIDGE_MEDALLIONS:
+                // Show Bridge Options and Medallion Count Slider
+                mOptions[RSK_RAINBOW_BRIDGE].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
+                mOptions[RSK_BRIDGE_OPTIONS].Unhide();
+                mOptions[RSK_RAINBOW_BRIDGE_REWARD_COUNT].Unhide();
+                if (bridgeOpt == RO_BRIDGE_GREG_REWARD) {
+                    if (mOptions[RSK_RAINBOW_BRIDGE_MEDALLION_COUNT].GetOptionCount() == 7) {
+                        mOptions[RSK_RAINBOW_BRIDGE_MEDALLION_COUNT].ChangeOptions(NumOpts(0, 7));
+                    }
+                } else {
+                    if (mOptions[RSK_RAINBOW_BRIDGE_MEDALLION_COUNT].GetOptionCount() == 8) {
+                        mOptions[RSK_RAINBOW_BRIDGE_MEDALLION_COUNT].ChangeOptions(NumOpts(0, 6));
+                    }
+                }
+                break;
+            case RO_BRIDGE_DUNGEON_REWARDS:
+                // Show Bridge Options and Dungeon Reward Count Slider
+                mOptions[RSK_RAINBOW_BRIDGE].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
+                mOptions[RSK_BRIDGE_OPTIONS].Unhide();
+                mOptions[RSK_RAINBOW_BRIDGE_REWARD_COUNT].Unhide();
+                if (bridgeOpt == RO_BRIDGE_GREG_REWARD) {
+                    if (mOptions[RSK_RAINBOW_BRIDGE_REWARD_COUNT].GetOptionCount() == 10) {
+                        mOptions[RSK_RAINBOW_BRIDGE_REWARD_COUNT].ChangeOptions(NumOpts(0, 10));
+                    }
+                } else {
+                    if (mOptions[RSK_RAINBOW_BRIDGE_REWARD_COUNT].GetOptionCount() == 11) {
+                        mOptions[RSK_RAINBOW_BRIDGE_REWARD_COUNT].ChangeOptions(NumOpts(0, 9));
+                    }
+                }
+                break;
+            case RO_BRIDGE_DUNGEONS:
+                // Show Bridge Options and Dungeon Count Slider
+                mOptions[RSK_RAINBOW_BRIDGE].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
+                mOptions[RSK_BRIDGE_OPTIONS].Unhide();
+                mOptions[RSK_RAINBOW_BRIDGE_DUNGEON_COUNT].Unhide();
+                if (bridgeOpt == RO_BRIDGE_GREG_REWARD) {
+                    if (mOptions[RSK_RAINBOW_BRIDGE_DUNGEON_COUNT].GetOptionCount() == 9) {
+                        mOptions[RSK_RAINBOW_BRIDGE_DUNGEON_COUNT].ChangeOptions(NumOpts(0, 9));
+                    }
+                } else {
+                    if (mOptions[RSK_RAINBOW_BRIDGE_DUNGEON_COUNT].GetOptionCount() == 10) {
+                        mOptions[RSK_RAINBOW_BRIDGE_DUNGEON_COUNT].ChangeOptions(NumOpts(0, 8));
+                    }
+                }
+                break;
+            case RO_BRIDGE_TOKENS:
+                // Show token count slider (not bridge options)
+                mOptions[RSK_RAINBOW_BRIDGE].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
+                mOptions[RSK_BRIDGE_OPTIONS].Hide();
+                mOptions[RSK_RAINBOW_BRIDGE_TOKEN_COUNT].Unhide();
+                break;
+            default:
+                break;
+        }
+        mOptions[RSK_GANONS_TRIALS].Enable();
+        mOptions[RSK_TRIAL_COUNT].Enable();
+        // Only show the trial count slider if Trials is set to Set Number
+        if (CVarGetInteger("gRandomizeGanonTrial", RO_GANONS_TRIALS_SKIP) == RO_GANONS_TRIALS_SET_NUMBER) {
+            mOptions[RSK_GANONS_TRIALS].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
+            mOptions[RSK_TRIAL_COUNT].Unhide();
+        } else {
+            mOptions[RSK_GANONS_TRIALS].AddFlag(IMFLAG_SEPARATOR_BOTTOM);
+            mOptions[RSK_TRIAL_COUNT].Hide();
+        }
+        mOptions[RSK_TRIFORCE_HUNT].Enable();
+        mOptions[RSK_TRIFORCE_HUNT_PIECES_TOTAL].Enable();
+        mOptions[RSK_TRIFORCE_HUNT_PIECES_REQUIRED].Enable();
+        // Remove the pieces required/total sliders and add a separator after Tirforce Hunt if Triforce Hunt is off
+        if (CVarGetInteger("gRandomizeTriforceHunt", RO_GENERIC_OFF) == RO_GENERIC_OFF) {
+            mOptions[RSK_TRIFORCE_HUNT_PIECES_REQUIRED].Hide();
+            mOptions[RSK_TRIFORCE_HUNT_PIECES_TOTAL].Hide();
+            mOptions[RSK_TRIFORCE_HUNT].AddFlag(IMFLAG_SEPARATOR_BOTTOM);
+        } else {
+            mOptions[RSK_TRIFORCE_HUNT_PIECES_REQUIRED].Unhide();
+            mOptions[RSK_TRIFORCE_HUNT_PIECES_TOTAL].Unhide();
+            mOptions[RSK_TRIFORCE_HUNT].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
+        }
+        // Update triforce pieces required to be capped at the current value for pieces total.
+        const uint8_t triforceTotal = CVarGetInteger("gRandomizeTriforceHuntTotalPieces", 30);
+        if (mOptions[RSK_TRIFORCE_HUNT_PIECES_REQUIRED].GetOptionCount() != triforceTotal + 1) {
+            mOptions[RSK_TRIFORCE_HUNT_PIECES_REQUIRED].ChangeOptions(NumOpts(1, triforceTotal + 1));
+        }
+        mOptionGroups[RSG_ITEMS_IMGUI_TABLE].Enable();
+        mOptionGroups[RSG_GAMEPLAY_IMGUI_TABLE].Enable();
+        // Link's Pocket - Disabled when Dungeon Rewards are shuffled to End of Dungeon
+        if (CVarGetInteger("gRandomizeShuffleDungeonReward", RO_DUNGEON_REWARDS_END_OF_DUNGEON) == RO_DUNGEON_REWARDS_END_OF_DUNGEON) {
+            mOptions[RSK_LINKS_POCKET].Disable("This option is disabled because \"Dungeon Rewards\" are shuffled to \"End of Dungeons\".");
+        } else {
+            mOptions[RSK_LINKS_POCKET].Enable();
+        }
+        mOptions[RSK_STARTING_OCARINA].Enable();
     }
+
     // Don't show any MQ options if both quests aren't available
     if (!(OTRGlobals::Instance->HasMasterQuest() && OTRGlobals::Instance->HasOriginal())) {
         mOptions[RSK_MQ_DUNGEON_RANDOM].Hide();
@@ -1377,21 +1439,6 @@ void Settings::UpdateOptionProperties() {
     } else {
         mOptions[RSK_MQ_DUNGEON_SET].Enable();
     }
-    // Remove the pieces required/total sliders and add a separator after Tirforce Hunt if Triforce Hunt is off
-    if (CVarGetInteger("gRandomizeTriforceHunt", RO_GENERIC_OFF) == RO_GENERIC_OFF) {
-        mOptions[RSK_TRIFORCE_HUNT_PIECES_REQUIRED].Hide();
-        mOptions[RSK_TRIFORCE_HUNT_PIECES_TOTAL].Hide();
-        mOptions[RSK_TRIFORCE_HUNT].AddFlag(IMFLAG_SEPARATOR_BOTTOM);
-    } else {
-        mOptions[RSK_TRIFORCE_HUNT_PIECES_REQUIRED].Unhide();
-        mOptions[RSK_TRIFORCE_HUNT_PIECES_TOTAL].Unhide();
-        mOptions[RSK_TRIFORCE_HUNT].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
-    }
-    // Update triforce pieces required to be capped at the current value for pieces total.
-    const uint8_t triforceTotal = CVarGetInteger("gRandomizeTriforceHuntTotalPieces", 30);
-    if (mOptions[RSK_TRIFORCE_HUNT_PIECES_REQUIRED].GetOptionCount() != triforceTotal + 1) {
-        mOptions[RSK_TRIFORCE_HUNT_PIECES_REQUIRED].ChangeOptions(NumOpts(1, triforceTotal + 1));
-    }
     // Show mixed entrance pool options if mixed entrance pools are enabled at all.
     if (CVarGetInteger("gRandomizeMixedEntrances", RO_GENERIC_OFF)) {
         mOptions[RSK_MIXED_ENTRANCE_POOLS].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
@@ -1565,54 +1612,6 @@ void Settings::UpdateOptionProperties() {
         mOptions[RSK_HINT_CLARITY].Unhide();
         mOptions[RSK_HINT_DISTRIBUTION].Unhide();
     }
-    // Link's Pocket - Disabled when Dungeon Rewards are shuffled to End of Dungeon
-    if (CVarGetInteger("gRandomizeShuffleDungeonReward", RO_DUNGEON_REWARDS_END_OF_DUNGEON) == RO_DUNGEON_REWARDS_END_OF_DUNGEON) {
-        mOptions[RSK_LINKS_POCKET].Disable("This option is disabled because \"Dungeon Rewards\" are shuffled to \"End of Dungeons\".");
-    } else {
-        mOptions[RSK_LINKS_POCKET].Enable();
-    }
-
-    if (CVarGetInteger("gRandomizeLogicRules", RO_LOGIC_GLITCHLESS) == RO_LOGIC_VANILLA) {
-        mOptionGroups[RSG_AREA_ACCESS_IMGUI].Disable();
-        mOptions[RSK_STARTING_AGE].Disable("");
-        mOptions[RSK_GERUDO_FORTRESS].Disable("");
-        mOptions[RSK_RAINBOW_BRIDGE].Disable("");
-        mOptions[RSK_BRIDGE_OPTIONS].Disable("");
-        mOptions[RSK_RAINBOW_BRIDGE_STONE_COUNT].Disable("");
-        mOptions[RSK_RAINBOW_BRIDGE_MEDALLION_COUNT].Disable("");
-        mOptions[RSK_RAINBOW_BRIDGE_REWARD_COUNT].Disable("");
-        mOptions[RSK_RAINBOW_BRIDGE_DUNGEON_COUNT].Disable("");
-        mOptions[RSK_RAINBOW_BRIDGE_TOKEN_COUNT].Disable("");
-        mOptions[RSK_GANONS_TRIALS].Disable("");
-        mOptions[RSK_TRIAL_COUNT].Disable("");
-        mOptions[RSK_TRIFORCE_HUNT].Disable("");
-        mOptions[RSK_TRIFORCE_HUNT_PIECES_TOTAL].Disable("");
-        mOptions[RSK_TRIFORCE_HUNT_PIECES_REQUIRED].Disable("");
-        mOptionGroups[RSG_ITEMS_IMGUI_TABLE].Disable();
-        mOptionGroups[RSG_GAMEPLAY_IMGUI_TABLE].Disable();
-        mOptions[RSK_LINKS_POCKET].Disable("");
-        mOptions[RSK_STARTING_OCARINA].Disable("");
-    } else {
-        mOptionGroups[RSG_AREA_ACCESS_IMGUI].Enable();
-        mOptions[RSK_STARTING_AGE].Enable();
-        mOptions[RSK_GERUDO_FORTRESS].Enable();
-        mOptions[RSK_RAINBOW_BRIDGE].Enable();
-        mOptions[RSK_BRIDGE_OPTIONS].Enable();
-        mOptions[RSK_RAINBOW_BRIDGE_STONE_COUNT].Enable();
-        mOptions[RSK_RAINBOW_BRIDGE_MEDALLION_COUNT].Enable();
-        mOptions[RSK_RAINBOW_BRIDGE_REWARD_COUNT].Enable();
-        mOptions[RSK_RAINBOW_BRIDGE_DUNGEON_COUNT].Enable();
-        mOptions[RSK_RAINBOW_BRIDGE_TOKEN_COUNT].Enable();
-        mOptions[RSK_GANONS_TRIALS].Enable();
-        mOptions[RSK_TRIAL_COUNT].Enable();
-        mOptions[RSK_TRIFORCE_HUNT].Enable();
-        mOptions[RSK_TRIFORCE_HUNT_PIECES_TOTAL].Enable();
-        mOptions[RSK_TRIFORCE_HUNT_PIECES_REQUIRED].Enable();
-        mOptionGroups[RSG_ITEMS_IMGUI_TABLE].Enable();
-        mOptionGroups[RSG_GAMEPLAY_IMGUI_TABLE].Enable();
-        mOptions[RSK_LINKS_POCKET].Enable();
-        mOptions[RSK_STARTING_OCARINA].Enable();
-    }
 }
 
 void Settings::FinalizeSettings(const std::set<RandomizerCheck>& excludedLocations, const std::set<RandomizerTrick>& enabledTricks) {

From f74ba3c1da51079c893fc8046c841084fb256861 Mon Sep 17 00:00:00 2001
From: Christopher Leggett <chris@leggett.dev>
Date: Tue, 26 Dec 2023 09:57:59 -0500
Subject: [PATCH 046/230] develop-rando: File Select Fixes (#3734)

* Fixes pressing B on name entry after randomizer quest.

* Reverts to auto parsing previous spoiler file.

Also includes an option to press L to automatically gen a fresh seed. It still does regenerate the old spoiler to regen the hints in the user's current language, but it will now automatically do this instead of requiring dragging and dropping the spoiler every time.

* Fixes bug causing rando settings to come from CVars instead of a spoiler file when a spoiler is dropped/imported on boot.

* Pressing Generate Randomizer in ImGui doesn't use loaded spoilerfile.

* Adds tooltip to Generate Randomizer ImGui Button.
---
 .../randomizer/3drando/rando_main.cpp         |  1 -
 .../randomizer/3drando/spoiler_log.cpp        |  2 +
 soh/soh/Enhancements/randomizer/context.cpp   |  2 +-
 .../Enhancements/randomizer/randomizer.cpp    |  7 ++-
 .../ovl_file_choose/z_file_choose.c           | 50 +++++++++++--------
 .../ovl_file_choose/z_file_nameset_PAL.c      |  4 +-
 6 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/rando_main.cpp b/soh/soh/Enhancements/randomizer/3drando/rando_main.cpp
index 0de9cd8e9..349995177 100644
--- a/soh/soh/Enhancements/randomizer/3drando/rando_main.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/rando_main.cpp
@@ -21,6 +21,5 @@ void RandoMain::GenerateRando(std::set<RandomizerCheck> excludedLocations, std::
 
     CVarSave();
     CVarLoad();
-    Rando::Context::GetInstance()->SetSpoilerLoaded(false);
     Rando::Context::GetInstance()->SetPlandoLoaded(false);
 }
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
index 6c9f83ab1..1ef83c7ef 100644
--- a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
@@ -864,6 +864,8 @@ const char* SpoilerLog_Write() {
     jsonFile << std::setw(4) << jsonString << std::endl;
     jsonFile.close();
 
+    CVarSetString("gSpoilerLog", (std::string("./Randomizer/") + fileName + std::string(".json")).c_str());
+
     // Note: probably shouldn't return this without making sure this string is stored somewhere, but
     // this return value is currently only used in playthrough.cpp as a true/false. Even if the pointer
     // is no longer valid it would still not be nullptr if the spoilerfile was written, so it works but
diff --git a/soh/soh/Enhancements/randomizer/context.cpp b/soh/soh/Enhancements/randomizer/context.cpp
index b76dafb95..8f4a4b25e 100644
--- a/soh/soh/Enhancements/randomizer/context.cpp
+++ b/soh/soh/Enhancements/randomizer/context.cpp
@@ -370,7 +370,7 @@ void Context::ParseSpoiler(const char* spoilerFileName, const bool plandoMode) {
         mSpoilerLoaded = true;
         mSeedGenerated = false;
     } catch (...) {
-        throw;
+        LUSLOG_ERROR("Failed to load Spoiler File: %s", spoilerFileName);
     }
 }
 
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index 3de001e15..882bd4c23 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -1659,7 +1659,10 @@ void GenerateRandomizerImgui(std::string seed = "") {
     CVarSetInteger("gRandoGenerating", 1);
     CVarSave();
     auto ctx = Rando::Context::GetInstance();
-    ctx->GetSettings()->SetAllFromCVar();
+    if (!ctx->IsSpoilerLoaded()) {
+        // We use the settings from the spoiler rather than CVars.
+        ctx->GetSettings()->SetAllFromCVar();
+    }
     // todo: this efficently when we build out cvar array support
     std::set<RandomizerCheck> excludedLocations;
     std::stringstream excludedLocationStringStream(CVarGetString("gRandomizeExcludedLocations", ""));
@@ -1755,8 +1758,10 @@ void RandomizerSettingsWindow::DrawElement() {
     UIWidgets::Spacer(0);
     ImGui::BeginDisabled(CVarGetInteger("gRandomizerDontGenerateSpoiler", 0) && gSaveContext.gameMode != GAMEMODE_FILE_SELECT);
     if (ImGui::Button("Generate Randomizer")) {
+        ctx->SetSpoilerLoaded(false);
         GenerateRandomizer(CVarGetInteger("gRandoManualSeedEntry", 0) ? seedString : "");
     }
+    UIWidgets::Tooltip("You can also press L on the Quest Select screen to generate a new seed");
     ImGui::EndDisabled();
 
     UIWidgets::Spacer(0);
diff --git a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
index 3a8da0b39..feb2e5553 100644
--- a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
+++ b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
@@ -974,9 +974,9 @@ void DrawSeedHashSprites(FileChooseContext* this) {
     // Draw Seed Icons for spoiler log:
     // 1. On Name Entry if a rando seed has been generated
     // 2. On Quest Menu if a spoiler has been dropped and the Randomizer quest option is currently hovered.
-    if ((Randomizer_IsSeedGenerated() ||
-            (strnlen(CVarGetString("gSpoilerLog", ""), 1) != 0 && Randomizer_IsSpoilerLoaded())) &&
+    if ((Randomizer_IsSeedGenerated() || Randomizer_IsSpoilerLoaded()) &&
         ((this->configMode == CM_NAME_ENTRY && gSaveContext.questId == QUEST_RANDOMIZER) ||
+        (this->configMode == CM_GENERATE_SEED && Randomizer_IsSpoilerLoaded()) ||
         (this->configMode == CM_QUEST_MENU && this->questType[this->buttonIndex] == QUEST_RANDOMIZER))) {
         // Fade top seed icons based on main menu fade and if save supports rando
         u8 alpha =
@@ -999,6 +999,7 @@ void DrawSeedHashSprites(FileChooseContext* this) {
 }
 
 u8 generating;
+bool fileSelectSpoilerFileLoaded = false;
 
 void FileChoose_UpdateRandomizer() {
     if (CVarGetInteger("gRandoGenerating", 0) != 0 && generating == 0) {
@@ -1006,7 +1007,7 @@ void FileChoose_UpdateRandomizer() {
             func_800F5E18(SEQ_PLAYER_BGM_MAIN, NA_BGM_HORSE, 0, 7, 1);
             return;
     } else if (CVarGetInteger("gRandoGenerating", 0) == 0 && generating) {
-            if (SpoilerFileExists(CVarGetString("gSpoilerLog", "")) || Randomizer_IsSeedGenerated()) {
+            if (Randomizer_IsSeedGenerated()) {
                 Audio_PlayFanfare(NA_BGM_HORSE_GOAL);
             } else {
                 func_80078884(NA_SE_SY_OCARINA_ERROR);
@@ -1022,13 +1023,16 @@ void FileChoose_UpdateRandomizer() {
             CVarSetString("gSpoilerLog", "");
     }
 
-    if ((CVarGetInteger("gNewFileDropped", 0) != 0)) {
-            CVarSetString("gSpoilerLog", CVarGetString("gDroppedFile", ""));
-            CVarSetInteger("gNewSeedGenerated", 0);
+    if (CVarGetInteger("gNewFileDropped", 0) != 0 || !(Randomizer_IsSeedGenerated() || Randomizer_IsSpoilerLoaded()) &&
+        SpoilerFileExists(CVarGetString("gSpoilerLog", "")) && !fileSelectSpoilerFileLoaded) {
+            const char* fileLoc = CVarGetString("gSpoilerLog", "");
+            if (CVarGetInteger("gNewFileDropped", 0) != 0) {
+                CVarSetString("gSpoilerLog", CVarGetString("gDroppedFile", ""));
+            }
             CVarSetInteger("gNewFileDropped", 0);
             CVarSetString("gDroppedFile", "");
-            const char* fileLoc = CVarGetString("gSpoilerLog", "");
             Randomizer_ParseSpoiler(fileLoc);
+            fileSelectSpoilerFileLoaded = true;
 
             if (SpoilerFileExists(CVarGetString("gSpoilerLog", "")) && CVarGetInteger("gRandomizerDontGenerateSpoiler", 0)) {
                 remove(fileLoc);
@@ -1274,6 +1278,14 @@ void FileChoose_UpdateQuestMenu(GameState* thisx) {
         GameInteractor_ExecuteOnUpdateFileQuestSelection(this->questType[this->buttonIndex]);
     }
 
+    if (CHECK_BTN_ALL(input->press.button, BTN_L)) {
+        if (this->questType[this->buttonIndex] == QUEST_RANDOMIZER) {
+            Randomizer_SetSpoilerLoaded(false);
+            this->prevConfigMode = this->configMode;
+            this->configMode = CM_GENERATE_SEED;
+        }
+    }
+
     if (CHECK_BTN_ALL(input->press.button, BTN_A)) {
         gSaveContext.questId = this->questType[this->buttonIndex];
 
@@ -1318,6 +1330,10 @@ void FileChoose_GenerateRandoSeed(GameState* thisx) {
     FileChooseContext* this = (FileChooseContext*)thisx;
     FileChoose_UpdateRandomizer();
     if (Randomizer_IsSeedGenerated() || Randomizer_IsPlandoLoaded()) {
+        Audio_PlayFanfare(NA_BGM_HORSE_GOAL);
+        func_800F5E18(SEQ_PLAYER_BGM_MAIN, NA_BGM_FILE_SELECT, 0, 7, 1);
+        generating = 0;
+        Randomizer_SetSpoilerLoaded(true);
         static u8 emptyName[] = { 0x3E, 0x3E, 0x3E, 0x3E, 0x3E, 0x3E, 0x3E, 0x3E };
         static u8 linkName[] = { 0x15, 0x2C, 0x31, 0x2E, 0x3E, 0x3E, 0x3E, 0x3E };
         this->prevConfigMode = this->configMode;
@@ -3190,25 +3206,25 @@ void FileChoose_DrawRandoSaveVersionWarning(GameState* thisx) {
 
 static const char* noRandoGeneratedText[] = {
     // English
-    "Open Randomizer Settings to change your settings,\nthen press A to generate a new seed"
+    "No Randomizer seed currently available.\nGenerate one in the Randomizer Settings"
 #if defined(__WIIU__) || defined(__SWITCH__)
     ".",
 #else
     ",\nor drop a spoiler log on the game window.",
 #endif
     // German
-    "Open Randomizer Settings to change your settings,\nthen press A to generate a new seed"
+    "No Randomizer seed currently available.\nGenerate one in the Randomizer Settings"
 #if defined(__WIIU__) || defined(__SWITCH__)
     ".",
 #else
     ",\nor drop a spoiler log on the game window.",
 #endif
     // French
-    "Ouvrez le menu \"Randomizer Settings\" pour modifier\nvos paramètres, appuyez sur A pour générer\nune nouvelle seed"
+    "Aucune Seed de Randomizer actuellement disponible.\nGénérez-en une dans les \"Randomizer Settings\""
 #if (defined(__WIIU__) || defined(__SWITCH__))
     "."
 #else
-    " ou glissez un spoilerlog sur la\nfenêtre du jeu."
+    "\nou glissez un spoilerlog sur la fenêtre du jeu."
 #endif
 };
 
@@ -3231,18 +3247,12 @@ void FileChoose_DrawNoRandoGeneratedWarning(GameState* thisx) {
         uint16_t textboxWidth = 256 * textboxScale;
         uint16_t textboxHeight = 64 * textboxScale;
         uint8_t leftOffset = 72;
-        uint8_t bottomOffset = 132;
+        uint8_t bottomOffset = 84;
         uint8_t textVerticalOffset;
 #if defined(__WIIU__) || defined(__SWITCH__)
-        textVerticalOffset = 80; // 2 lines
-        if (gSaveContext.language == LANGUAGE_FRA) {
-            textVerticalOffset = 75; // 3 lines
-        }
+        textVerticalOffset = 127; // 2 lines
 #else
-        textVerticalOffset = 75; // 3 lines
-        if (gSaveContext.language == LANGUAGE_FRA) {
-            textVerticalOffset = 70; // 4 lines
-        }
+        textVerticalOffset = 122; // 3 lines
 #endif
 
         Gfx_SetupDL_39Opa(this->state.gfxCtx);
diff --git a/soh/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c b/soh/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c
index 67c8c4de9..0a346c266 100644
--- a/soh/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c
+++ b/soh/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c
@@ -373,7 +373,7 @@ void FileChoose_DrawNameEntry(GameState* thisx) {
 
                 if (this->newFileNameCharCount < 0) {
                     this->newFileNameCharCount = 0;
-                    if (this->prevConfigMode == CM_QUEST_MENU) {
+                    if (this->prevConfigMode == CM_QUEST_MENU || this->prevConfigMode == CM_GENERATE_SEED) {
                         this->configMode = CM_NAME_ENTRY_TO_QUEST_MENU;
                         Randomizer_SetSeedGenerated(false);
                     } else {
@@ -459,8 +459,6 @@ void FileChoose_DrawNameEntry(GameState* thisx) {
                             CVarSetInteger("gOnFileSelectNameEntry", 0);
                             CVarSetInteger("gNewFileDropped", 0);
                             Randomizer_SetSeedGenerated(false);
-                            Randomizer_SetSpoilerLoaded(false);
-                            Randomizer_SetPlandoLoaded(false);
                             this->nameBoxAlpha[this->buttonIndex] = this->nameAlpha[this->buttonIndex] = 200;
                             this->connectorAlpha[this->buttonIndex] = 255;
                             func_800AA000(300.0f, 0xB4, 0x14, 0x64);

From e731380e2863cd8d04264fa739e3ce2911d4ef98 Mon Sep 17 00:00:00 2001
From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Date: Tue, 26 Dec 2023 14:58:19 +0000
Subject: [PATCH 047/230] Fix various randomiser setting bugs (#3742)

* Fix various randomiser setting bugs

* Fix shuffle entrences metasetting getting locked on per savefile after an entrance rando seed is generated once
---
 soh/soh/Enhancements/randomizer/settings.cpp | 20 +++++++++++++++-----
 soh/soh/Enhancements/randomizer/settings.h   |  5 +++++
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
index 68a65a605..f32c981af 100644
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -41,7 +41,7 @@ void Settings::CreateOptions() {
     CreateOptionDescriptions();
     // clang-format off
     mOptions[RSK_FOREST] = Option::U8("Forest", {"Closed", "Closed Deku", "Open"}, OptionCategory::Setting, "gRandomizeForest", mOptionDescriptions[RSK_FOREST], WidgetType::Combobox, RO_FOREST_CLOSED);
-    mOptions[RSK_KAK_GATE] = Option::U8("Kakariko Gate", {"Close", "Open"}, OptionCategory::Setting, "gRandomizeKakarikoGate", mOptionDescriptions[RSK_KAK_GATE]);
+    mOptions[RSK_KAK_GATE] = Option::U8("Kakariko Gate", {"Closed", "Open"}, OptionCategory::Setting, "gRandomizeKakarikoGate", mOptionDescriptions[RSK_KAK_GATE]);
     mOptions[RSK_DOOR_OF_TIME] = Option::U8("Door of Time", {"Closed", "Song only", "Open"}, OptionCategory::Setting, "gRandomizeDoorOfTime", mOptionDescriptions[RSK_DOOR_OF_TIME], WidgetType::Combobox);
     mOptions[RSK_ZORAS_FOUNTAIN] = Option::U8("Zora's Fountain", {"Closed", "Closed as child", "Open"}, OptionCategory::Setting, "gRandomizeZorasFountain", mOptionDescriptions[RSK_ZORAS_FOUNTAIN]);
     mOptions[RSK_GERUDO_FORTRESS] = Option::U8("Gerudo Fortress", {"Normal", "Fast", "Open"}, OptionCategory::Setting, "gRandomizeGerudoFortress", mOptionDescriptions[RSK_GERUDO_FORTRESS]);
@@ -134,7 +134,7 @@ void Settings::CreateOptions() {
     mOptions[RSK_KEYRINGS_BOTTOM_OF_THE_WELL] = Option::Bool("Bottom of the Well", "gRandomizeShuffleKeyRingsBottomOfTheWell", "", IMFLAG_NONE);
     mOptions[RSK_KEYRINGS_GTG] = Option::Bool("Gerudo Training Grounds", "gRandomizeShuffleKeyRingsGTG", "", IMFLAG_NONE);
     mOptions[RSK_KEYRINGS_GANONS_CASTLE] = Option::Bool("Ganon's Castle", "gRandomizeShuffleKeyRingsGanonsCastle");
-    mOptions[RSK_SKIP_CHILD_STEALTH] = Option::Bool("Skip Child Stealth", {"Don't Skip", "Skip"}, OptionCategory::Setting, "gRandomizeSkipChildZelda", mOptionDescriptions[RSK_SKIP_CHILD_STEALTH], WidgetType::Checkbox, RO_GENERIC_DONT_SKIP);
+    mOptions[RSK_SKIP_CHILD_STEALTH] = Option::Bool("Skip Child Stealth", {"Don't Skip", "Skip"}, OptionCategory::Setting, "gRandomizeSkipChildStealth", mOptionDescriptions[RSK_SKIP_CHILD_STEALTH], WidgetType::Checkbox, RO_GENERIC_DONT_SKIP);
     mOptions[RSK_SKIP_CHILD_ZELDA] = Option::Bool("Skip Child Zelda", {"Don't Skip", "Skip"}, OptionCategory::Setting, "gRandomizeSkipChildZelda", mOptionDescriptions[RSK_SKIP_CHILD_ZELDA], WidgetType::Checkbox, RO_GENERIC_DONT_SKIP);
     mOptions[RSK_SKIP_TOWER_ESCAPE] = Option::Bool("Skip Tower Escape", {"Don't Skip", "Skip"}, OptionCategory::Setting, "gRandomizeSkipTowerEscape", mOptionDescriptions[RSK_SKIP_TOWER_ESCAPE], WidgetType::Checkbox, RO_GENERIC_DONT_SKIP);
     mOptions[RSK_SKIP_EPONA_RACE] = Option::Bool("Skip Epona Race", {"Don't Skip", "Skip"}, OptionCategory::Setting, "gRandomizeSkipEponaRace", mOptionDescriptions[RSK_SKIP_EPONA_RACE], WidgetType::Checkbox, RO_GENERIC_DONT_SKIP);
@@ -173,7 +173,7 @@ void Settings::CreateOptions() {
     mOptions[RSK_FULL_WALLETS] = Option::Bool("Full Wallets", {"No", "Yes"}, OptionCategory::Setting, "gRandomizeFullWallets", mOptionDescriptions[RSK_FULL_WALLETS], WidgetType::Checkbox, RO_GENERIC_OFF);
     mOptions[RSK_STARTING_ZELDAS_LULLABY] = Option::Bool("Start with Zelda's Lullaby", "gRandomizeStartingZeldasLullaby", "", IMFLAG_NONE);
     mOptions[RSK_STARTING_EPONAS_SONG] = Option::Bool("Start with Epona's Song", "gRandomizeStartingEponasSong", "", IMFLAG_NONE);
-    mOptions[RSK_STARTING_SARIAS_SONG] = Option::Bool("Start with Epona's Song", "gRandomizeStartingSariasSong", "", IMFLAG_NONE);
+    mOptions[RSK_STARTING_SARIAS_SONG] = Option::Bool("Start with Saria's Song", "gRandomizeStartingSariasSong", "", IMFLAG_NONE);
     mOptions[RSK_STARTING_SUNS_SONG] = Option::Bool("Start with Sun's Song", "gRandomizeStartingSunsSong", "", IMFLAG_NONE);
     mOptions[RSK_STARTING_SONG_OF_TIME] = Option::Bool("Start with Song of Time", "gRandomizeStartingSongOfTime", "", IMFLAG_NONE);
     mOptions[RSK_STARTING_SONG_OF_STORMS] = Option::Bool("Start with Song of Storms", "gRandomizeStartingSongOfStorms", "", IMFLAG_NONE);
@@ -624,6 +624,7 @@ void Settings::CreateOptions() {
         &mOptions[RSK_SHUFFLE_COWS],
         &mOptions[RSK_SHUFFLE_MAGIC_BEANS],
         &mOptions[RSK_SHUFFLE_MERCHANTS],
+        &mOptions[RSK_SHUFFLE_FROG_SONG_RUPEES],
         &mOptions[RSK_SHUFFLE_ADULT_TRADE],
         &mOptions[RSK_SHUFFLE_100_GS_REWARD],
         &mOptions[RSK_SHUFFLE_BOSS_SOULS],
@@ -1138,6 +1139,12 @@ Option& Settings::GetTrickOption(const RandomizerTrick key) {
     return mTrickOptions[key];
 }
 
+void Settings::ResetTrickOptions() {
+    for (int count = 0; count < RT_MAX; count++){
+        mTrickOptions[count].SetSelectedIndex(0); //RANDOTODO this can probably be done better
+    };
+}
+
 const std::array<Option, RSK_MAX>& Settings::GetAllOptions() const {
     return mOptions;
 }
@@ -1231,7 +1238,7 @@ void Settings::UpdateOptionProperties() {
         if (CVarGetInteger("gRandomizeForest", RO_FOREST_CLOSED) == RO_FOREST_CLOSED ||
             (CVarGetInteger("gRandomizeDoorOfTime", RO_DOOROFTIME_CLOSED) == RO_DOOROFTIME_CLOSED &&
             CVarGetInteger("gRandomizeShuffleOcarinas", RO_GENERIC_OFF) == RO_GENERIC_OFF)) /* closed door of time with ocarina shuffle off */ {
-            mOptions[RSK_STARTING_AGE].Disable("This option is disabled due to other optionos making the game unbeatable");
+            mOptions[RSK_STARTING_AGE].Disable("This option is disabled due to other options making the game unbeatable");
         } else {
             mOptions[RSK_STARTING_AGE].Enable();
         }
@@ -1264,7 +1271,7 @@ void Settings::UpdateOptionProperties() {
                 // Show Bridge Options and Medallion Count Slider
                 mOptions[RSK_RAINBOW_BRIDGE].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
                 mOptions[RSK_BRIDGE_OPTIONS].Unhide();
-                mOptions[RSK_RAINBOW_BRIDGE_REWARD_COUNT].Unhide();
+                mOptions[RSK_RAINBOW_BRIDGE_MEDALLION_COUNT].Unhide();
                 if (bridgeOpt == RO_BRIDGE_GREG_REWARD) {
                     if (mOptions[RSK_RAINBOW_BRIDGE_MEDALLION_COUNT].GetOptionCount() == 7) {
                         mOptions[RSK_RAINBOW_BRIDGE_MEDALLION_COUNT].ChangeOptions(NumOpts(0, 7));
@@ -1667,6 +1674,8 @@ void Settings::FinalizeSettings(const std::set<RandomizerCheck>& excludedLocatio
             || mOptions[RSK_SHUFFLE_GROTTO_ENTRANCES] || mOptions[RSK_SHUFFLE_OWL_DROPS]
             || mOptions[RSK_SHUFFLE_WARP_SONGS] || mOptions[RSK_SHUFFLE_OVERWORLD_SPAWNS]) {
             mOptions[RSK_SHUFFLE_ENTRANCES].SetSelectedIndex(RO_GENERIC_ON);
+        } else {
+            mOptions[RSK_SHUFFLE_ENTRANCES].SetSelectedIndex(RO_GENERIC_OFF);
         }
 
         if (mOptions[RSK_SHUFFLE_DUNGEON_REWARDS].Is(RO_DUNGEON_REWARDS_END_OF_DUNGEON)) {
@@ -1682,6 +1691,7 @@ void Settings::FinalizeSettings(const std::set<RandomizerCheck>& excludedLocatio
             }
         }
         // Tricks
+        ResetTrickOptions();
         for (const auto randomizerTrick : enabledTricks) {
             mTrickOptions[randomizerTrick].SetSelectedIndex(1);
         }
diff --git a/soh/soh/Enhancements/randomizer/settings.h b/soh/soh/Enhancements/randomizer/settings.h
index 3e60e7bfb..90c45e698 100644
--- a/soh/soh/Enhancements/randomizer/settings.h
+++ b/soh/soh/Enhancements/randomizer/settings.h
@@ -36,6 +36,11 @@ class Settings {
      */
     Option& GetTrickOption(RandomizerTrick key);
 
+    /**
+     * @brief Reset all RandomizerTrick keys.
+     */
+    void ResetTrickOptions();
+
     /**
      * @brief Returns a reference to the entire array of options.
      *

From c860f7a73af9466c678f39258beaa46cd92ff550 Mon Sep 17 00:00:00 2001
From: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>
Date: Thu, 28 Dec 2023 20:19:23 +0100
Subject: [PATCH 048/230] Rando: Shuffle Ocarina Buttons (Rando V3) (#3735)

* Shuffle Ocarina Buttons

* Address review

* Add trick names

* Temporarily remove the ocarina button ice trap models

* Update soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp

Fix lost closing brackets from merge resolution.

---------

Co-authored-by: Christopher Leggett <chris@leggett.dev>
---
 .../object_ocarina_a_button/gOcarinaAButtonDL |  16 ++
 .../gOcarinaAButtonDL_tri_0                   |  94 ++++++
 .../gOcarinaAButtonDL_tri_1                   |  19 ++
 .../gOcarinaAButtonDL_vtx_0                   | 268 ++++++++++++++++++
 .../gOcarinaAButtonDL_vtx_1                   |  33 +++
 .../gOcarinaAButtonDL_vtx_cull                |  10 +
 ...inaAButtonDL_f3dlite_ocarina_A_button_edge |  21 ++
 ...AButtonDL_f3dlite_ocarina_A_button_surface |  21 ++
 .../objects/object_ocarina_a_button/noise_tex | Bin 0 -> 1116 bytes
 .../gOcarinaCDownButtonDL                     |  16 ++
 .../gOcarinaCDownButtonDL_tri_0               |  93 ++++++
 .../gOcarinaCDownButtonDL_tri_1               |  29 ++
 .../gOcarinaCDownButtonDL_vtx_0               | 243 ++++++++++++++++
 .../gOcarinaCDownButtonDL_vtx_1               |  59 ++++
 .../gOcarinaCDownButtonDL_vtx_cull            |  10 +
 ...DownButtonDL_f3dlite_ocarina_C_button_edge |  21 ++
 ...nButtonDL_f3dlite_ocarina_C_button_surface |  21 ++
 .../object_ocarina_c_down_button/noise_tex    | Bin 0 -> 1116 bytes
 .../gOcarinaCLeftButtonDL                     |  16 ++
 .../gOcarinaCLeftButtonDL_tri_0               |  28 ++
 .../gOcarinaCLeftButtonDL_tri_1               |  94 ++++++
 .../gOcarinaCLeftButtonDL_vtx_0               |  60 ++++
 .../gOcarinaCLeftButtonDL_vtx_1               | 244 ++++++++++++++++
 .../gOcarinaCLeftButtonDL_vtx_cull            |  10 +
 ...LeftButtonDL_f3dlite_ocarina_C_button_edge |  21 ++
 ...tButtonDL_f3dlite_ocarina_C_button_surface |  21 ++
 .../object_ocarina_c_left_button/noise_tex    | Bin 0 -> 1116 bytes
 .../gOcarinaCRightButtonDL                    |  16 ++
 .../gOcarinaCRightButtonDL_tri_0              |  28 ++
 .../gOcarinaCRightButtonDL_tri_1              |  93 ++++++
 .../gOcarinaCRightButtonDL_vtx_0              |  60 ++++
 .../gOcarinaCRightButtonDL_vtx_1              | 242 ++++++++++++++++
 .../gOcarinaCRightButtonDL_vtx_cull           |  10 +
 ...ightButtonDL_f3dlite_ocarina_C_button_edge |  21 ++
 ...tButtonDL_f3dlite_ocarina_C_button_surface |  21 ++
 .../object_ocarina_c_right_button/noise_tex   | Bin 0 -> 1116 bytes
 .../gOcarinaCUpButtonDL                       |  16 ++
 .../gOcarinaCUpButtonDL_tri_0                 |  29 ++
 .../gOcarinaCUpButtonDL_tri_1                 |  97 +++++++
 .../gOcarinaCUpButtonDL_vtx_0                 |  62 ++++
 .../gOcarinaCUpButtonDL_vtx_1                 | 251 ++++++++++++++++
 .../gOcarinaCUpButtonDL_vtx_cull              |  10 +
 ...aCUpButtonDL_f3dlite_ocarina_C_button_edge |  21 ++
 ...pButtonDL_f3dlite_ocarina_C_button_surface |  21 ++
 .../object_ocarina_c_up_button/noise_tex      | Bin 0 -> 1116 bytes
 soh/assets/soh_assets.h                       |  15 +
 soh/include/z64save.h                         |   2 +-
 .../Enhancements/debugger/debugSaveEditor.h   |   8 +-
 .../3drando/hint_list/hint_list_item.cpp      |  55 ++++
 .../randomizer/3drando/item_pool.cpp          |  15 +
 .../randomizer/3drando/location_access.cpp    |  14 +-
 .../locacc_bottom_of_the_well.cpp             |  12 +-
 .../location_access/locacc_castle_town.cpp    |   8 +-
 .../location_access/locacc_death_mountain.cpp |  21 +-
 .../location_access/locacc_deku_tree.cpp      |   8 +-
 .../locacc_dodongos_cavern.cpp                |   2 +-
 .../location_access/locacc_fire_temple.cpp    |  14 +-
 .../location_access/locacc_forest_temple.cpp  |  12 +-
 .../location_access/locacc_ganons_castle.cpp  |   8 +-
 .../locacc_gerudo_training_grounds.cpp        |   8 +-
 .../location_access/locacc_gerudo_valley.cpp  |   8 +-
 .../location_access/locacc_hyrule_field.cpp   |  20 +-
 .../location_access/locacc_ice_cavern.cpp     |   4 +-
 .../locacc_jabujabus_belly.cpp                |   6 +-
 .../location_access/locacc_kakariko.cpp       |  14 +-
 .../location_access/locacc_lost_woods.cpp     |  24 +-
 .../location_access/locacc_shadow_temple.cpp  |  16 +-
 .../location_access/locacc_spirit_temple.cpp  |  40 +--
 .../location_access/locacc_water_temple.cpp   |  14 +-
 .../location_access/locacc_zoras_domain.cpp   |  20 +-
 .../Enhancements/randomizer/3drando/logic.cpp | 128 ++++++---
 .../Enhancements/randomizer/3drando/logic.hpp |   8 +-
 .../Enhancements/randomizer/3drando/shops.cpp |  23 ++
 soh/soh/Enhancements/randomizer/draw.cpp      |  64 +++++
 soh/soh/Enhancements/randomizer/draw.h        |   1 +
 soh/soh/Enhancements/randomizer/item_list.cpp |  11 +
 .../randomizer/option_descriptions.cpp        |   7 +-
 .../Enhancements/randomizer/randomizer.cpp    |  47 ++-
 .../Enhancements/randomizer/randomizerTypes.h |  11 +
 .../Enhancements/randomizer/randomizer_inf.h  |   6 +
 .../randomizer/randomizer_item_tracker.cpp    |  74 +++++
 soh/soh/Enhancements/randomizer/savefile.cpp  |   8 +
 soh/soh/Enhancements/randomizer/settings.cpp  |   5 +
 soh/src/code/code_800EC960.c                  |  10 +-
 soh/src/code/z_parameter.c                    |   7 +
 .../actors/ovl_En_Kakasi2/z_en_kakasi2.c      |  11 +-
 .../ovl_kaleido_scope/z_kaleido_collect.c     |  18 ++
 87 files changed, 3088 insertions(+), 185 deletions(-)
 create mode 100644 soh/assets/custom/objects/object_ocarina_a_button/gOcarinaAButtonDL
 create mode 100644 soh/assets/custom/objects/object_ocarina_a_button/gOcarinaAButtonDL_tri_0
 create mode 100644 soh/assets/custom/objects/object_ocarina_a_button/gOcarinaAButtonDL_tri_1
 create mode 100644 soh/assets/custom/objects/object_ocarina_a_button/gOcarinaAButtonDL_vtx_0
 create mode 100644 soh/assets/custom/objects/object_ocarina_a_button/gOcarinaAButtonDL_vtx_1
 create mode 100644 soh/assets/custom/objects/object_ocarina_a_button/gOcarinaAButtonDL_vtx_cull
 create mode 100644 soh/assets/custom/objects/object_ocarina_a_button/mat_gOcarinaAButtonDL_f3dlite_ocarina_A_button_edge
 create mode 100644 soh/assets/custom/objects/object_ocarina_a_button/mat_gOcarinaAButtonDL_f3dlite_ocarina_A_button_surface
 create mode 100644 soh/assets/custom/objects/object_ocarina_a_button/noise_tex
 create mode 100644 soh/assets/custom/objects/object_ocarina_c_down_button/gOcarinaCDownButtonDL
 create mode 100644 soh/assets/custom/objects/object_ocarina_c_down_button/gOcarinaCDownButtonDL_tri_0
 create mode 100644 soh/assets/custom/objects/object_ocarina_c_down_button/gOcarinaCDownButtonDL_tri_1
 create mode 100644 soh/assets/custom/objects/object_ocarina_c_down_button/gOcarinaCDownButtonDL_vtx_0
 create mode 100644 soh/assets/custom/objects/object_ocarina_c_down_button/gOcarinaCDownButtonDL_vtx_1
 create mode 100644 soh/assets/custom/objects/object_ocarina_c_down_button/gOcarinaCDownButtonDL_vtx_cull
 create mode 100644 soh/assets/custom/objects/object_ocarina_c_down_button/mat_gOcarinaCDownButtonDL_f3dlite_ocarina_C_button_edge
 create mode 100644 soh/assets/custom/objects/object_ocarina_c_down_button/mat_gOcarinaCDownButtonDL_f3dlite_ocarina_C_button_surface
 create mode 100644 soh/assets/custom/objects/object_ocarina_c_down_button/noise_tex
 create mode 100644 soh/assets/custom/objects/object_ocarina_c_left_button/gOcarinaCLeftButtonDL
 create mode 100644 soh/assets/custom/objects/object_ocarina_c_left_button/gOcarinaCLeftButtonDL_tri_0
 create mode 100644 soh/assets/custom/objects/object_ocarina_c_left_button/gOcarinaCLeftButtonDL_tri_1
 create mode 100644 soh/assets/custom/objects/object_ocarina_c_left_button/gOcarinaCLeftButtonDL_vtx_0
 create mode 100644 soh/assets/custom/objects/object_ocarina_c_left_button/gOcarinaCLeftButtonDL_vtx_1
 create mode 100644 soh/assets/custom/objects/object_ocarina_c_left_button/gOcarinaCLeftButtonDL_vtx_cull
 create mode 100644 soh/assets/custom/objects/object_ocarina_c_left_button/mat_gOcarinaCLeftButtonDL_f3dlite_ocarina_C_button_edge
 create mode 100644 soh/assets/custom/objects/object_ocarina_c_left_button/mat_gOcarinaCLeftButtonDL_f3dlite_ocarina_C_button_surface
 create mode 100644 soh/assets/custom/objects/object_ocarina_c_left_button/noise_tex
 create mode 100644 soh/assets/custom/objects/object_ocarina_c_right_button/gOcarinaCRightButtonDL
 create mode 100644 soh/assets/custom/objects/object_ocarina_c_right_button/gOcarinaCRightButtonDL_tri_0
 create mode 100644 soh/assets/custom/objects/object_ocarina_c_right_button/gOcarinaCRightButtonDL_tri_1
 create mode 100644 soh/assets/custom/objects/object_ocarina_c_right_button/gOcarinaCRightButtonDL_vtx_0
 create mode 100644 soh/assets/custom/objects/object_ocarina_c_right_button/gOcarinaCRightButtonDL_vtx_1
 create mode 100644 soh/assets/custom/objects/object_ocarina_c_right_button/gOcarinaCRightButtonDL_vtx_cull
 create mode 100644 soh/assets/custom/objects/object_ocarina_c_right_button/mat_gOcarinaCRightButtonDL_f3dlite_ocarina_C_button_edge
 create mode 100644 soh/assets/custom/objects/object_ocarina_c_right_button/mat_gOcarinaCRightButtonDL_f3dlite_ocarina_C_button_surface
 create mode 100644 soh/assets/custom/objects/object_ocarina_c_right_button/noise_tex
 create mode 100644 soh/assets/custom/objects/object_ocarina_c_up_button/gOcarinaCUpButtonDL
 create mode 100644 soh/assets/custom/objects/object_ocarina_c_up_button/gOcarinaCUpButtonDL_tri_0
 create mode 100644 soh/assets/custom/objects/object_ocarina_c_up_button/gOcarinaCUpButtonDL_tri_1
 create mode 100644 soh/assets/custom/objects/object_ocarina_c_up_button/gOcarinaCUpButtonDL_vtx_0
 create mode 100644 soh/assets/custom/objects/object_ocarina_c_up_button/gOcarinaCUpButtonDL_vtx_1
 create mode 100644 soh/assets/custom/objects/object_ocarina_c_up_button/gOcarinaCUpButtonDL_vtx_cull
 create mode 100644 soh/assets/custom/objects/object_ocarina_c_up_button/mat_gOcarinaCUpButtonDL_f3dlite_ocarina_C_button_edge
 create mode 100644 soh/assets/custom/objects/object_ocarina_c_up_button/mat_gOcarinaCUpButtonDL_f3dlite_ocarina_C_button_surface
 create mode 100644 soh/assets/custom/objects/object_ocarina_c_up_button/noise_tex

diff --git a/soh/assets/custom/objects/object_ocarina_a_button/gOcarinaAButtonDL b/soh/assets/custom/objects/object_ocarina_a_button/gOcarinaAButtonDL
new file mode 100644
index 000000000..0e068a1b2
--- /dev/null
+++ b/soh/assets/custom/objects/object_ocarina_a_button/gOcarinaAButtonDL
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<ClearGeometryMode G_LIGHTING="1" />
+	<LoadVertices Path="objects/object_ocarina_a_button/gOcarinaAButtonDL_vtx_cull" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
+	<CullDisplayList Start="0" End="7"/>
+	<CallDisplayList Path="objects/object_ocarina_a_button/mat_gOcarinaAButtonDL_f3dlite_ocarina_A_button_edge"/>
+	<CallDisplayList Path="objects/object_ocarina_a_button/gOcarinaAButtonDL_tri_0"/>
+	<CallDisplayList Path="objects/object_ocarina_a_button/mat_gOcarinaAButtonDL_f3dlite_ocarina_A_button_surface"/>
+	<CallDisplayList Path="objects/object_ocarina_a_button/gOcarinaAButtonDL_tri_1"/>
+	<PipeSync/>
+	<SetGeometryMode G_LIGHTING="1" />
+	<ClearGeometryMode G_TEXTURE_GEN="1" />
+	<SetCombineLERP A0="G_CCMUX_0" B0="G_CCMUX_0" C0="G_CCMUX_0" D0="G_CCMUX_SHADE" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_ENVIRONMENT" A1="G_CCMUX_0" B1="G_CCMUX_0" C1="G_CCMUX_0" D1="G_CCMUX_SHADE" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_ENVIRONMENT"/>
+	<Texture S="65535" T="65535" Level="0" Tile="0" On="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_ocarina_a_button/gOcarinaAButtonDL_tri_0 b/soh/assets/custom/objects/object_ocarina_a_button/gOcarinaAButtonDL_tri_0
new file mode 100644
index 000000000..39f541204
--- /dev/null
+++ b/soh/assets/custom/objects/object_ocarina_a_button/gOcarinaAButtonDL_tri_0
@@ -0,0 +1,94 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_ocarina_a_button/gOcarinaAButtonDL_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="0" V02="3" Flag0="0" V10="4" V11="5" V12="0" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="6" V11="8" V12="9" Flag1="0"/>
+	<Triangles2 V00="9" V01="8" V02="10" Flag0="0" V10="9" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="12" V11="14" V12="15" Flag1="0"/>
+	<Triangles2 V00="16" V01="12" V02="15" Flag0="0" V10="16" V11="17" V12="12" Flag1="0"/>
+	<Triangles2 V00="18" V01="19" V02="20" Flag0="0" V10="18" V11="20" V12="21" Flag1="0"/>
+	<Triangles2 V00="20" V01="22" V02="21" Flag0="0" V10="22" V11="23" V12="21" Flag1="0"/>
+	<Triangles2 V00="24" V01="23" V02="22" Flag0="0" V10="21" V11="23" V12="25" Flag1="0"/>
+	<Triangles2 V00="25" V01="23" V02="26" Flag0="0" V10="25" V11="26" V12="27" Flag1="0"/>
+	<Triangles2 V00="18" V01="25" V02="27" Flag0="0" V10="18" V11="28" V12="25" Flag1="0"/>
+	<Triangles2 V00="18" V01="21" V02="28" Flag0="0" V10="29" V11="30" V12="31" Flag1="0"/>
+	<LoadVertices Path="objects/object_ocarina_a_button/gOcarinaAButtonDL_vtx_0" VertexBufferIndex="0" VertexOffset="32" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="2" V11="1" V12="3" Flag1="0"/>
+	<Triangles2 V00="2" V01="3" V02="4" Flag0="0" V10="5" V11="6" V12="7" Flag1="0"/>
+	<Triangles2 V00="5" V01="7" V02="8" Flag0="0" V10="9" V11="8" V12="7" Flag1="0"/>
+	<Triangles2 V00="9" V01="10" V02="8" Flag0="0" V10="11" V11="12" V12="13" Flag1="0"/>
+	<Triangles2 V00="11" V01="13" V02="14" Flag0="0" V10="15" V11="14" V12="13" Flag1="0"/>
+	<Triangles2 V00="15" V01="16" V02="14" Flag0="0" V10="17" V11="18" V12="19" Flag1="0"/>
+	<Triangles2 V00="17" V01="19" V02="20" Flag0="0" V10="20" V11="19" V12="21" Flag1="0"/>
+	<Triangles2 V00="20" V01="21" V02="22" Flag0="0" V10="23" V11="24" V12="25" Flag1="0"/>
+	<Triangles2 V00="23" V01="25" V02="26" Flag0="0" V10="27" V11="26" V12="25" Flag1="0"/>
+	<Triangles2 V00="27" V01="28" V02="26" Flag0="0" V10="29" V11="30" V12="31" Flag1="0"/>
+	<LoadVertices Path="objects/object_ocarina_a_button/gOcarinaAButtonDL_vtx_0" VertexBufferIndex="0" VertexOffset="64" Count="30"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="0" V01="3" V02="4" Flag0="0" V10="5" V11="6" V12="7" Flag1="0"/>
+	<Triangles2 V00="5" V01="8" V02="6" Flag0="0" V10="9" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="9" V01="11" V02="12" Flag0="0" V10="8" V11="13" V12="14" Flag1="0"/>
+	<Triangles2 V00="8" V01="15" V02="13" Flag0="0" V10="16" V11="17" V12="18" Flag1="0"/>
+	<Triangles2 V00="16" V01="18" V02="19" Flag0="0" V10="15" V11="20" V12="21" Flag1="0"/>
+	<Triangles2 V00="15" V01="22" V02="20" Flag0="0" V10="23" V11="24" V12="25" Flag1="0"/>
+	<Triangles2 V00="23" V01="25" V02="26" Flag0="0" V10="22" V11="27" V12="28" Flag1="0"/>
+	<Triangle1 V00="22" V01="29" V02="27"/>
+	<LoadVertices Path="objects/object_ocarina_a_button/gOcarinaAButtonDL_vtx_0" VertexBufferIndex="0" VertexOffset="94" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="4" V11="7" V12="5" Flag1="0"/>
+	<Triangles2 V00="8" V01="9" V02="10" Flag0="0" V10="8" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="7" V01="12" V02="13" Flag0="0" V10="7" V11="14" V12="12" Flag1="0"/>
+	<Triangles2 V00="15" V01="16" V02="17" Flag0="0" V10="15" V11="17" V12="18" Flag1="0"/>
+	<Triangles2 V00="14" V01="19" V02="20" Flag0="0" V10="14" V11="21" V12="19" Flag1="0"/>
+	<Triangles2 V00="22" V01="23" V02="24" Flag0="0" V10="22" V11="24" V12="25" Flag1="0"/>
+	<Triangles2 V00="21" V01="26" V02="27" Flag0="0" V10="21" V11="28" V12="26" Flag1="0"/>
+	<Triangle1 V00="29" V01="30" V02="31"/>
+	<LoadVertices Path="objects/object_ocarina_a_button/gOcarinaAButtonDL_vtx_0" VertexBufferIndex="0" VertexOffset="126" Count="30"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="3" V01="5" V02="6" Flag0="0" V10="7" V11="8" V12="9" Flag1="0"/>
+	<Triangles2 V00="7" V01="9" V02="10" Flag0="0" V10="11" V11="12" V12="13" Flag1="0"/>
+	<Triangles2 V00="11" V01="9" V02="12" Flag0="0" V10="14" V11="15" V12="16" Flag1="0"/>
+	<Triangles2 V00="14" V01="16" V02="17" Flag0="0" V10="18" V11="19" V12="20" Flag1="0"/>
+	<Triangles2 V00="18" V01="20" V02="21" Flag0="0" V10="22" V11="23" V12="24" Flag1="0"/>
+	<Triangles2 V00="22" V01="24" V02="25" Flag0="0" V10="26" V11="27" V12="28" Flag1="0"/>
+	<Triangle1 V00="26" V01="28" V02="29"/>
+	<LoadVertices Path="objects/object_ocarina_a_button/gOcarinaAButtonDL_vtx_0" VertexBufferIndex="0" VertexOffset="156" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="4" V11="6" V12="7" Flag1="0"/>
+	<Triangles2 V00="8" V01="9" V02="10" Flag0="0" V10="8" V11="10" V12="2" Flag1="0"/>
+	<Triangles2 V00="11" V01="12" V02="13" Flag0="0" V10="11" V11="13" V12="14" Flag1="0"/>
+	<Triangles2 V00="15" V01="16" V02="17" Flag0="0" V10="15" V11="17" V12="10" Flag1="0"/>
+	<Triangles2 V00="18" V01="19" V02="20" Flag0="0" V10="18" V11="20" V12="21" Flag1="0"/>
+	<Triangles2 V00="22" V01="23" V02="24" Flag0="0" V10="22" V11="24" V12="17" Flag1="0"/>
+	<Triangles2 V00="25" V01="26" V02="27" Flag0="0" V10="25" V11="27" V12="28" Flag1="0"/>
+	<Triangles2 V00="29" V01="30" V02="31" Flag0="0" V10="29" V11="31" V12="24" Flag1="0"/>
+	<LoadVertices Path="objects/object_ocarina_a_button/gOcarinaAButtonDL_vtx_0" VertexBufferIndex="0" VertexOffset="188" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="4" V11="6" V12="7" Flag1="0"/>
+	<Triangles2 V00="8" V01="9" V02="10" Flag0="0" V10="8" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="12" V11="14" V12="6" Flag1="0"/>
+	<Triangles2 V00="15" V01="16" V02="17" Flag0="0" V10="15" V11="17" V12="18" Flag1="0"/>
+	<Triangles2 V00="19" V01="20" V02="21" Flag0="0" V10="19" V11="21" V12="14" Flag1="0"/>
+	<Triangles2 V00="22" V01="23" V02="24" Flag0="0" V10="22" V11="21" V12="23" Flag1="0"/>
+	<Triangles2 V00="25" V01="26" V02="27" Flag0="0" V10="25" V11="27" V12="28" Flag1="0"/>
+	<Triangle1 V00="29" V01="30" V02="31"/>
+	<LoadVertices Path="objects/object_ocarina_a_button/gOcarinaAButtonDL_vtx_0" VertexBufferIndex="0" VertexOffset="220" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="1" V11="3" V12="4" Flag1="0"/>
+	<Triangles2 V00="1" V01="5" V02="3" Flag0="0" V10="6" V11="7" V12="8" Flag1="0"/>
+	<Triangles2 V00="6" V01="9" V02="7" Flag0="0" V10="6" V11="10" V12="9" Flag1="0"/>
+	<Triangles2 V00="6" V01="11" V02="10" Flag0="0" V10="12" V11="13" V12="5" Flag1="0"/>
+	<Triangles2 V00="12" V01="5" V02="0" Flag0="0" V10="14" V11="15" V12="16" Flag1="0"/>
+	<Triangles2 V00="14" V01="16" V02="17" Flag0="0" V10="18" V11="14" V12="17" Flag1="0"/>
+	<Triangles2 V00="18" V01="17" V02="19" Flag0="0" V10="19" V11="20" V12="18" Flag1="0"/>
+	<Triangles2 V00="19" V01="21" V02="20" Flag0="0" V10="22" V11="23" V12="24" Flag1="0"/>
+	<Triangles2 V00="22" V01="24" V02="16" Flag0="0" V10="25" V11="26" V12="27" Flag1="0"/>
+	<Triangles2 V00="25" V01="28" V02="26" Flag0="0" V10="28" V11="29" V12="30" Flag1="0"/>
+	<Triangle1 V00="28" V01="31" V02="29"/>
+	<LoadVertices Path="objects/object_ocarina_a_button/gOcarinaAButtonDL_vtx_0" VertexBufferIndex="0" VertexOffset="252" Count="14"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="4" V11="7" V12="5" Flag1="0"/>
+	<Triangles2 V00="4" V01="8" V02="7" Flag0="0" V10="4" V11="9" V12="8" Flag1="0"/>
+	<Triangles2 V00="10" V01="11" V02="12" Flag0="0" V10="10" V11="12" V12="13" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_ocarina_a_button/gOcarinaAButtonDL_tri_1 b/soh/assets/custom/objects/object_ocarina_a_button/gOcarinaAButtonDL_tri_1
new file mode 100644
index 000000000..8b223d8e3
--- /dev/null
+++ b/soh/assets/custom/objects/object_ocarina_a_button/gOcarinaAButtonDL_tri_1
@@ -0,0 +1,19 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_ocarina_a_button/gOcarinaAButtonDL_vtx_1" VertexBufferIndex="0" VertexOffset="0" Count="31"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="3" V02="5" Flag0="0" V10="6" V11="5" V12="7" Flag1="0"/>
+	<Triangles2 V00="5" V01="8" V02="7" Flag0="0" V10="7" V11="9" V12="6" Flag1="0"/>
+	<Triangles2 V00="7" V01="10" V02="9" Flag0="0" V10="7" V11="11" V12="10" Flag1="0"/>
+	<Triangles2 V00="10" V01="12" V02="9" Flag0="0" V10="10" V11="13" V12="12" Flag1="0"/>
+	<Triangles2 V00="12" V01="14" V02="9" Flag0="0" V10="15" V11="14" V12="12" Flag1="0"/>
+	<Triangles2 V00="15" V01="12" V02="3" Flag0="0" V10="12" V11="16" V12="3" Flag1="0"/>
+	<Triangles2 V00="15" V01="3" V02="17" Flag0="0" V10="3" V11="18" V12="17" Flag1="0"/>
+	<Triangles2 V00="6" V01="18" V02="3" Flag0="0" V10="17" V11="19" V12="15" Flag1="0"/>
+	<Triangles2 V00="19" V01="20" V02="15" Flag0="0" V10="21" V11="22" V12="23" Flag1="0"/>
+	<Triangles2 V00="21" V01="23" V02="24" Flag0="0" V10="23" V11="25" V12="24" Flag1="0"/>
+	<Triangles2 V00="24" V01="26" V02="21" Flag0="0" V10="24" V11="27" V12="26" Flag1="0"/>
+	<Triangles2 V00="24" V01="28" V02="27" Flag0="0" V10="27" V11="29" V12="26" Flag1="0"/>
+	<Triangle1 V00="26" V01="30" V02="21"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_ocarina_a_button/gOcarinaAButtonDL_vtx_0 b/soh/assets/custom/objects/object_ocarina_a_button/gOcarinaAButtonDL_vtx_0
new file mode 100644
index 000000000..266582a03
--- /dev/null
+++ b/soh/assets/custom/objects/object_ocarina_a_button/gOcarinaAButtonDL_vtx_0
@@ -0,0 +1,268 @@
+<Vertex Version="0">
+	<Vtx X="-10" Y="-23" Z="3" S="-529" T="495" R="123" G="246" B="30" A="255"/>
+	<Vtx X="-10" Y="-23" Z="2" S="-529" T="495" R="127" G="245" B="0" A="255"/>
+	<Vtx X="-6" Y="23" Z="2" S="-426" T="495" R="127" G="245" B="0" A="255"/>
+	<Vtx X="-6" Y="23" Z="3" S="-426" T="495" R="123" G="246" B="30" A="255"/>
+	<Vtx X="-6" Y="24" Z="5" S="-426" T="495" R="114" G="246" B="55" A="255"/>
+	<Vtx X="-10" Y="-24" Z="5" S="-529" T="495" R="114" G="246" B="55" A="255"/>
+	<Vtx X="-3" Y="-23" Z="2" S="188" T="495" R="0" G="127" B="0" A="255"/>
+	<Vtx X="-10" Y="-23" Z="2" S="-529" T="495" R="0" G="127" B="0" A="255"/>
+	<Vtx X="-10" Y="-23" Z="3" S="-529" T="495" R="0" G="125" B="22" A="255"/>
+	<Vtx X="-3" Y="-23" Z="3" S="188" T="495" R="0" G="125" B="21" A="255"/>
+	<Vtx X="-10" Y="-24" Z="5" S="-529" T="495" R="0" G="121" B="39" A="255"/>
+	<Vtx X="-2" Y="-24" Z="5" S="188" T="495" R="0" G="121" B="39" A="255"/>
+	<Vtx X="1" Y="-7" Z="4" S="291" T="495" R="125" G="8" B="21" A="255"/>
+	<Vtx X="1" Y="-7" Z="2" S="291" T="495" R="127" G="8" B="0" A="255"/>
+	<Vtx X="0" Y="12" Z="2" S="393" T="495" R="127" G="8" B="0" A="255"/>
+	<Vtx X="0" Y="12" Z="4" S="393" T="495" R="127" G="8" B="5" A="255"/>
+	<Vtx X="0" Y="7" Z="5" S="368" T="495" R="117" G="8" B="48" A="255"/>
+	<Vtx X="1" Y="-7" Z="5" S="293" T="495" R="117" G="8" B="48" A="255"/>
+	<Vtx X="-10" Y="-23" Z="2" S="-529" T="495" R="0" G="0" B="127" A="255"/>
+	<Vtx X="-3" Y="-23" Z="2" S="188" T="495" R="0" G="0" B="127" A="255"/>
+	<Vtx X="-2" Y="-13" Z="2" S="86" T="495" R="0" G="0" B="127" A="255"/>
+	<Vtx X="1" Y="-7" Z="2" S="291" T="495" R="0" G="0" B="127" A="255"/>
+	<Vtx X="2" Y="-13" Z="2" S="-17" T="495" R="0" G="0" B="127" A="255"/>
+	<Vtx X="10" Y="-23" Z="2" S="-221" T="495" R="0" G="0" B="127" A="255"/>
+	<Vtx X="3" Y="-23" Z="2" S="-119" T="495" R="0" G="0" B="127" A="255"/>
+	<Vtx X="0" Y="12" Z="2" S="393" T="495" R="0" G="0" B="127" A="255"/>
+	<Vtx X="5" Y="23" Z="2" S="-324" T="495" R="0" G="0" B="127" A="255"/>
+	<Vtx X="-6" Y="23" Z="2" S="-426" T="495" R="0" G="0" B="127" A="255"/>
+	<Vtx X="-1" Y="-7" Z="2" S="495" T="495" R="0" G="0" B="127" A="255"/>
+	<Vtx X="5" Y="23" Z="2" S="-324" T="495" R="129" G="245" B="0" A="255"/>
+	<Vtx X="10" Y="-23" Z="2" S="-221" T="495" R="129" G="245" B="0" A="255"/>
+	<Vtx X="10" Y="-23" Z="3" S="-221" T="495" R="133" G="245" B="30" A="255"/>
+	<Vtx X="5" Y="23" Z="2" S="-324" T="495" R="129" G="245" B="0" A="255"/>
+	<Vtx X="10" Y="-23" Z="3" S="-221" T="495" R="133" G="245" B="30" A="255"/>
+	<Vtx X="5" Y="23" Z="3" S="-324" T="495" R="133" G="245" B="30" A="255"/>
+	<Vtx X="10" Y="-24" Z="5" S="-221" T="495" R="142" G="246" B="55" A="255"/>
+	<Vtx X="6" Y="24" Z="5" S="-324" T="495" R="142" G="246" B="55" A="255"/>
+	<Vtx X="-2" Y="-13" Z="2" S="86" T="495" R="129" G="11" B="0" A="255"/>
+	<Vtx X="-3" Y="-23" Z="2" S="188" T="495" R="129" G="11" B="0" A="255"/>
+	<Vtx X="-3" Y="-23" Z="3" S="188" T="495" R="132" G="11" B="26" A="255"/>
+	<Vtx X="-2" Y="-13" Z="3" S="86" T="495" R="131" G="11" B="21" A="255"/>
+	<Vtx X="-2" Y="-24" Z="5" S="188" T="495" R="139" G="10" B="48" A="255"/>
+	<Vtx X="-1" Y="-14" Z="5" S="90" T="495" R="139" G="10" B="48" A="255"/>
+	<Vtx X="0" Y="12" Z="2" S="393" T="495" R="129" G="9" B="0" A="255"/>
+	<Vtx X="-1" Y="-7" Z="2" S="495" T="495" R="129" G="9" B="0" A="255"/>
+	<Vtx X="-1" Y="-7" Z="4" S="495" T="495" R="131" G="9" B="21" A="255"/>
+	<Vtx X="0" Y="12" Z="4" S="393" T="495" R="129" G="9" B="5" A="255"/>
+	<Vtx X="-1" Y="-7" Z="5" S="494" T="495" R="139" G="8" B="48" A="255"/>
+	<Vtx X="0" Y="7" Z="5" S="418" T="495" R="139" G="8" B="48" A="255"/>
+	<Vtx X="10" Y="-23" Z="2" S="-221" T="495" R="0" G="127" B="0" A="255"/>
+	<Vtx X="3" Y="-23" Z="2" S="-119" T="495" R="0" G="127" B="0" A="255"/>
+	<Vtx X="3" Y="-23" Z="3" S="-119" T="495" R="0" G="125" B="21" A="255"/>
+	<Vtx X="10" Y="-23" Z="3" S="-221" T="495" R="0" G="125" B="22" A="255"/>
+	<Vtx X="2" Y="-24" Z="5" S="-119" T="495" R="0" G="121" B="39" A="255"/>
+	<Vtx X="10" Y="-24" Z="5" S="-221" T="495" R="0" G="121" B="39" A="255"/>
+	<Vtx X="2" Y="-13" Z="2" S="-17" T="495" R="0" G="127" B="0" A="255"/>
+	<Vtx X="-2" Y="-13" Z="2" S="86" T="495" R="0" G="127" B="0" A="255"/>
+	<Vtx X="-2" Y="-13" Z="3" S="86" T="495" R="0" G="125" B="21" A="255"/>
+	<Vtx X="2" Y="-13" Z="3" S="-17" T="495" R="0" G="125" B="21" A="255"/>
+	<Vtx X="-1" Y="-14" Z="5" S="73" T="495" R="0" G="118" B="48" A="255"/>
+	<Vtx X="1" Y="-14" Z="5" S="-4" T="495" R="0" G="118" B="48" A="255"/>
+	<Vtx X="3" Y="-23" Z="3" S="-119" T="495" R="124" G="12" B="26" A="255"/>
+	<Vtx X="3" Y="-23" Z="2" S="-119" T="495" R="126" G="12" B="0" A="255"/>
+	<Vtx X="2" Y="-13" Z="2" S="-17" T="495" R="126" G="12" B="0" A="255"/>
+	<Vtx X="3" Y="-23" Z="3" S="-119" T="495" R="124" G="12" B="26" A="255"/>
+	<Vtx X="2" Y="-13" Z="2" S="-17" T="495" R="126" G="12" B="0" A="255"/>
+	<Vtx X="2" Y="-13" Z="3" S="-17" T="495" R="125" G="12" B="21" A="255"/>
+	<Vtx X="1" Y="-14" Z="5" S="-21" T="495" R="117" G="11" B="48" A="255"/>
+	<Vtx X="2" Y="-24" Z="5" S="-119" T="495" R="117" G="11" B="48" A="255"/>
+	<Vtx X="0" Y="34" Z="5" S="-273" T="27" R="0" G="28" B="124" A="255"/>
+	<Vtx X="22" Y="30" Z="4" S="-131" T="40" R="27" G="37" B="119" A="255"/>
+	<Vtx X="0" Y="37" Z="4" S="-270" T="-5" R="0" G="46" B="118" A="255"/>
+	<Vtx X="20" Y="27" Z="5" S="-148" T="67" R="16" G="22" B="124" A="255"/>
+	<Vtx X="0" Y="37" Z="4" S="493" T="-529" R="36" G="112" B="48" A="255"/>
+	<Vtx X="22" Y="30" Z="4" S="395" T="-529" R="36" G="112" B="48" A="255"/>
+	<Vtx X="23" Y="32" Z="0" S="393" T="-273" R="36" G="112" B="48" A="255"/>
+	<Vtx X="0" Y="39" Z="0" S="495" T="-273" R="36" G="112" B="48" A="255"/>
+	<Vtx X="36" Y="12" Z="4" S="-41" T="161" R="44" G="14" B="118" A="255"/>
+	<Vtx X="22" Y="30" Z="4" S="-126" T="43" R="27" G="37" B="119" A="255"/>
+	<Vtx X="32" Y="10" Z="5" S="-70" T="174" R="27" G="8" B="124" A="255"/>
+	<Vtx X="22" Y="30" Z="4" S="391" T="-529" R="95" G="69" B="48" A="255"/>
+	<Vtx X="36" Y="12" Z="4" S="293" T="-529" R="95" G="69" B="48" A="255"/>
+	<Vtx X="37" Y="12" Z="0" S="291" T="-273" R="95" G="69" B="48" A="255"/>
+	<Vtx X="23" Y="32" Z="0" S="393" T="-273" R="95" G="69" B="48" A="255"/>
+	<Vtx X="36" Y="-11" Z="4" S="-39" T="311" R="42" G="242" B="119" A="255"/>
+	<Vtx X="36" Y="12" Z="4" S="-39" T="167" R="44" G="14" B="118" A="255"/>
+	<Vtx X="32" Y="-10" Z="5" S="-70" T="299" R="26" G="249" B="124" A="255"/>
+	<Vtx X="36" Y="12" Z="4" S="289" T="-529" R="118" G="0" B="48" A="255"/>
+	<Vtx X="36" Y="-11" Z="4" S="191" T="-529" R="118" G="0" B="48" A="255"/>
+	<Vtx X="37" Y="-12" Z="0" S="188" T="-273" R="118" G="0" B="48" A="255"/>
+	<Vtx X="37" Y="12" Z="0" S="291" T="-273" R="118" G="0" B="48" A="255"/>
+	<Vtx X="22" Y="-31" Z="4" S="-128" T="438" R="29" G="220" B="118" A="255"/>
+	<Vtx X="36" Y="-11" Z="4" S="-40" T="317" R="42" G="242" B="119" A="255"/>
+	<Vtx X="18" Y="-29" Z="5" S="-158" T="420" R="15" G="231" B="124" A="255"/>
+	<Vtx X="36" Y="-11" Z="4" S="187" T="-529" R="94" G="188" B="53" A="255"/>
+	<Vtx X="22" Y="-31" Z="4" S="86" T="-529" R="94" G="188" B="53" A="255"/>
+	<Vtx X="23" Y="-32" Z="0" S="86" T="-273" R="94" G="188" B="53" A="255"/>
+	<Vtx X="37" Y="-12" Z="0" S="188" T="-273" R="94" G="188" B="53" A="255"/>
+	<Vtx X="18" Y="-29" Z="5" S="-158" T="420" R="15" G="231" B="124" A="255"/>
+	<Vtx X="0" Y="-38" Z="4" S="-270" T="484" R="0" G="203" B="116" A="255"/>
+	<Vtx X="22" Y="-31" Z="4" S="-134" T="440" R="29" G="220" B="118" A="255"/>
+	<Vtx X="0" Y="-34" Z="5" S="-273" T="457" R="0" G="224" B="123" A="255"/>
+	<Vtx X="22" Y="-31" Z="4" S="81" T="-529" R="37" G="142" B="42" A="255"/>
+	<Vtx X="0" Y="-38" Z="4" S="-15" T="-529" R="37" G="142" B="42" A="255"/>
+	<Vtx X="0" Y="-39" Z="0" S="-17" T="-273" R="37" G="142" B="42" A="255"/>
+	<Vtx X="23" Y="-32" Z="0" S="86" T="-273" R="37" G="142" B="42" A="255"/>
+	<Vtx X="-22" Y="-31" Z="4" S="-411" T="440" R="227" G="220" B="118" A="255"/>
+	<Vtx X="0" Y="-38" Z="4" S="-275" T="484" R="0" G="203" B="116" A="255"/>
+	<Vtx X="-18" Y="-29" Z="5" S="-387" T="420" R="241" G="231" B="124" A="255"/>
+	<Vtx X="0" Y="-38" Z="4" S="-18" T="-529" R="219" G="142" B="42" A="255"/>
+	<Vtx X="-22" Y="-31" Z="4" S="-114" T="-529" R="219" G="142" B="42" A="255"/>
+	<Vtx X="-23" Y="-32" Z="0" S="-119" T="-273" R="219" G="142" B="42" A="255"/>
+	<Vtx X="0" Y="-39" Z="0" S="-17" T="-273" R="219" G="142" B="42" A="255"/>
+	<Vtx X="-36" Y="-11" Z="4" S="-505" T="317" R="214" G="242" B="119" A="255"/>
+	<Vtx X="-22" Y="-31" Z="4" S="-417" T="438" R="227" G="220" B="118" A="255"/>
+	<Vtx X="-32" Y="-10" Z="5" S="-475" T="299" R="230" G="249" B="124" A="255"/>
+	<Vtx X="-22" Y="-31" Z="4" S="-119" T="-529" R="162" G="188" B="53" A="255"/>
+	<Vtx X="-36" Y="-11" Z="4" S="-220" T="-529" R="162" G="188" B="53" A="255"/>
+	<Vtx X="-37" Y="-12" Z="0" S="-221" T="-273" R="162" G="188" B="53" A="255"/>
+	<Vtx X="-23" Y="-32" Z="0" S="-119" T="-273" R="162" G="188" B="53" A="255"/>
+	<Vtx X="-36" Y="12" Z="4" S="-506" T="167" R="212" G="14" B="118" A="255"/>
+	<Vtx X="-36" Y="-11" Z="4" S="-506" T="311" R="214" G="242" B="119" A="255"/>
+	<Vtx X="-32" Y="10" Z="5" S="-475" T="174" R="229" G="8" B="124" A="255"/>
+	<Vtx X="-36" Y="-11" Z="4" S="-224" T="-529" R="138" G="0" B="48" A="255"/>
+	<Vtx X="-36" Y="12" Z="4" S="-322" T="-529" R="138" G="0" B="48" A="255"/>
+	<Vtx X="-37" Y="12" Z="0" S="-324" T="-273" R="138" G="0" B="48" A="255"/>
+	<Vtx X="-36" Y="-11" Z="4" S="-224" T="-529" R="138" G="0" B="48" A="255"/>
+	<Vtx X="-37" Y="12" Z="0" S="-324" T="-273" R="138" G="0" B="48" A="255"/>
+	<Vtx X="-37" Y="-12" Z="0" S="-221" T="-273" R="138" G="0" B="48" A="255"/>
+	<Vtx X="0" Y="39" Z="0" S="-529" T="-273" R="220" G="112" B="48" A="255"/>
+	<Vtx X="-23" Y="32" Z="0" S="-426" T="-273" R="220" G="112" B="48" A="255"/>
+	<Vtx X="-22" Y="30" Z="4" S="-428" T="-529" R="220" G="112" B="48" A="255"/>
+	<Vtx X="0" Y="37" Z="4" S="-526" T="-529" R="220" G="112" B="48" A="255"/>
+	<Vtx X="0" Y="37" Z="4" S="-275" T="-5" R="0" G="46" B="118" A="255"/>
+	<Vtx X="-22" Y="30" Z="4" S="-414" T="40" R="229" G="37" B="119" A="255"/>
+	<Vtx X="-20" Y="27" Z="5" S="-397" T="67" R="240" G="22" B="124" A="255"/>
+	<Vtx X="0" Y="34" Z="5" S="-273" T="27" R="0" G="28" B="124" A="255"/>
+	<Vtx X="-32" Y="10" Z="5" S="-475" T="174" R="229" G="8" B="124" A="255"/>
+	<Vtx X="-22" Y="30" Z="4" S="-419" T="43" R="229" G="37" B="119" A="255"/>
+	<Vtx X="-36" Y="12" Z="4" S="-504" T="161" R="212" G="14" B="118" A="255"/>
+	<Vtx X="-36" Y="12" Z="4" S="-326" T="-529" R="161" G="69" B="48" A="255"/>
+	<Vtx X="-22" Y="30" Z="4" S="-424" T="-529" R="161" G="69" B="48" A="255"/>
+	<Vtx X="-23" Y="32" Z="0" S="-426" T="-273" R="161" G="69" B="48" A="255"/>
+	<Vtx X="-37" Y="12" Z="0" S="-324" T="-273" R="161" G="69" B="48" A="255"/>
+	<Vtx X="0" Y="39" Z="0" S="495" T="-273" R="36" G="112" B="208" A="255"/>
+	<Vtx X="23" Y="32" Z="0" S="393" T="-273" R="36" G="112" B="208" A="255"/>
+	<Vtx X="22" Y="30" Z="-4" S="395" T="-17" R="36" G="112" B="208" A="255"/>
+	<Vtx X="0" Y="37" Z="-4" S="493" T="-17" R="36" G="112" B="208" A="255"/>
+	<Vtx X="0" Y="37" Z="-4" S="242" T="-5" R="0" G="46" B="138" A="255"/>
+	<Vtx X="22" Y="30" Z="-4" S="381" T="40" R="27" G="37" B="137" A="255"/>
+	<Vtx X="20" Y="27" Z="-5" S="364" T="67" R="16" G="22" B="132" A="255"/>
+	<Vtx X="0" Y="34" Z="-5" S="239" T="27" R="0" G="28" B="132" A="255"/>
+	<Vtx X="23" Y="32" Z="0" S="393" T="-273" R="95" G="69" B="208" A="255"/>
+	<Vtx X="37" Y="12" Z="0" S="291" T="-273" R="95" G="69" B="208" A="255"/>
+	<Vtx X="36" Y="12" Z="-4" S="293" T="-17" R="95" G="69" B="208" A="255"/>
+	<Vtx X="22" Y="30" Z="-4" S="391" T="-17" R="95" G="69" B="208" A="255"/>
+	<Vtx X="22" Y="30" Z="-4" S="386" T="43" R="27" G="37" B="137" A="255"/>
+	<Vtx X="36" Y="12" Z="-4" S="471" T="161" R="44" G="14" B="138" A="255"/>
+	<Vtx X="32" Y="10" Z="-5" S="442" T="174" R="27" G="8" B="132" A="255"/>
+	<Vtx X="20" Y="27" Z="-5" S="364" T="67" R="16" G="22" B="132" A="255"/>
+	<Vtx X="37" Y="12" Z="0" S="291" T="-273" R="118" G="0" B="208" A="255"/>
+	<Vtx X="37" Y="-12" Z="0" S="188" T="-273" R="118" G="0" B="208" A="255"/>
+	<Vtx X="36" Y="-12" Z="-4" S="190" T="-17" R="118" G="0" B="208" A="255"/>
+	<Vtx X="36" Y="12" Z="-4" S="289" T="-17" R="118" G="0" B="208" A="255"/>
+	<Vtx X="36" Y="12" Z="-4" S="473" T="167" R="44" G="14" B="138" A="255"/>
+	<Vtx X="36" Y="-12" Z="-4" S="473" T="312" R="44" G="242" B="138" A="255"/>
+	<Vtx X="32" Y="-10" Z="-5" S="442" T="305" R="27" G="248" B="132" A="255"/>
+	<Vtx X="37" Y="-12" Z="0" S="188" T="-273" R="95" G="187" B="208" A="255"/>
+	<Vtx X="23" Y="-32" Z="0" S="86" T="-273" R="95" G="187" B="208" A="255"/>
+	<Vtx X="22" Y="-30" Z="-4" S="88" T="-17" R="95" G="187" B="208" A="255"/>
+	<Vtx X="36" Y="-12" Z="-4" S="186" T="-17" R="95" G="187" B="208" A="255"/>
+	<Vtx X="36" Y="-12" Z="-4" S="471" T="318" R="44" G="242" B="138" A="255"/>
+	<Vtx X="22" Y="-30" Z="-4" S="386" T="436" R="27" G="219" B="137" A="255"/>
+	<Vtx X="20" Y="-27" Z="-5" S="364" T="412" R="16" G="234" B="132" A="255"/>
+	<Vtx X="23" Y="-32" Z="0" S="86" T="-273" R="36" G="144" B="208" A="255"/>
+	<Vtx X="0" Y="-39" Z="0" S="-17" T="-273" R="36" G="144" B="208" A="255"/>
+	<Vtx X="0" Y="-37" Z="-4" S="-14" T="-17" R="36" G="144" B="208" A="255"/>
+	<Vtx X="22" Y="-30" Z="-4" S="84" T="-17" R="36" G="144" B="208" A="255"/>
+	<Vtx X="22" Y="-30" Z="-4" S="381" T="439" R="27" G="219" B="137" A="255"/>
+	<Vtx X="0" Y="-37" Z="-4" S="242" T="484" R="0" G="210" B="138" A="255"/>
+	<Vtx X="0" Y="-34" Z="-5" S="239" T="452" R="0" G="228" B="132" A="255"/>
+	<Vtx X="0" Y="-39" Z="0" S="-17" T="-273" R="220" G="144" B="208" A="255"/>
+	<Vtx X="-23" Y="-32" Z="0" S="-119" T="-273" R="220" G="144" B="208" A="255"/>
+	<Vtx X="-22" Y="-30" Z="-4" S="-117" T="-17" R="220" G="144" B="208" A="255"/>
+	<Vtx X="0" Y="-37" Z="-4" S="-19" T="-17" R="220" G="144" B="208" A="255"/>
+	<Vtx X="0" Y="-37" Z="-4" S="237" T="484" R="0" G="210" B="138" A="255"/>
+	<Vtx X="-22" Y="-30" Z="-4" S="98" T="439" R="229" G="219" B="137" A="255"/>
+	<Vtx X="-20" Y="-27" Z="-5" S="115" T="412" R="240" G="234" B="132" A="255"/>
+	<Vtx X="-23" Y="-32" Z="0" S="-119" T="-273" R="161" G="187" B="208" A="255"/>
+	<Vtx X="-37" Y="-12" Z="0" S="-221" T="-273" R="161" G="187" B="208" A="255"/>
+	<Vtx X="-36" Y="-12" Z="-4" S="-219" T="-17" R="161" G="187" B="208" A="255"/>
+	<Vtx X="-22" Y="-30" Z="-4" S="-121" T="-17" R="161" G="187" B="208" A="255"/>
+	<Vtx X="-22" Y="-30" Z="-4" S="93" T="436" R="229" G="219" B="137" A="255"/>
+	<Vtx X="-36" Y="-12" Z="-4" S="8" T="318" R="212" G="242" B="138" A="255"/>
+	<Vtx X="-32" Y="-10" Z="-5" S="37" T="305" R="229" G="248" B="132" A="255"/>
+	<Vtx X="-20" Y="-27" Z="-5" S="115" T="412" R="240" G="234" B="132" A="255"/>
+	<Vtx X="-37" Y="-12" Z="0" S="-221" T="-273" R="138" G="0" B="208" A="255"/>
+	<Vtx X="-37" Y="12" Z="0" S="-324" T="-273" R="138" G="0" B="208" A="255"/>
+	<Vtx X="-36" Y="12" Z="-4" S="-322" T="-17" R="138" G="0" B="208" A="255"/>
+	<Vtx X="-36" Y="-12" Z="-4" S="-223" T="-17" R="138" G="0" B="208" A="255"/>
+	<Vtx X="-36" Y="-12" Z="-4" S="6" T="312" R="212" G="242" B="138" A="255"/>
+	<Vtx X="-36" Y="12" Z="-4" S="6" T="167" R="212" G="14" B="138" A="255"/>
+	<Vtx X="-32" Y="10" Z="-5" S="37" T="174" R="229" G="8" B="132" A="255"/>
+	<Vtx X="-37" Y="12" Z="0" S="-324" T="-273" R="161" G="69" B="208" A="255"/>
+	<Vtx X="-23" Y="32" Z="0" S="-426" T="-273" R="161" G="69" B="208" A="255"/>
+	<Vtx X="-22" Y="30" Z="-4" S="-424" T="-17" R="161" G="69" B="208" A="255"/>
+	<Vtx X="-36" Y="12" Z="-4" S="-326" T="-17" R="161" G="69" B="208" A="255"/>
+	<Vtx X="-36" Y="12" Z="-4" S="8" T="161" R="212" G="14" B="138" A="255"/>
+	<Vtx X="-22" Y="30" Z="-4" S="93" T="43" R="229" G="37" B="137" A="255"/>
+	<Vtx X="-20" Y="27" Z="-5" S="115" T="67" R="240" G="22" B="132" A="255"/>
+	<Vtx X="0" Y="34" Z="-5" S="239" T="27" R="0" G="28" B="132" A="255"/>
+	<Vtx X="-22" Y="30" Z="-4" S="98" T="40" R="229" G="37" B="137" A="255"/>
+	<Vtx X="0" Y="37" Z="-4" S="237" T="-5" R="0" G="46" B="138" A="255"/>
+	<Vtx X="0" Y="37" Z="-4" S="-526" T="-17" R="220" G="112" B="208" A="255"/>
+	<Vtx X="-22" Y="30" Z="-4" S="-428" T="-17" R="220" G="112" B="208" A="255"/>
+	<Vtx X="-23" Y="32" Z="0" S="-426" T="-273" R="220" G="112" B="208" A="255"/>
+	<Vtx X="0" Y="39" Z="0" S="-529" T="-273" R="220" G="112" B="208" A="255"/>
+	<Vtx X="0" Y="-6" Z="5" S="-273" T="276" R="237" G="239" B="124" A="255"/>
+	<Vtx X="0" Y="7" Z="5" S="-274" T="193" R="208" G="3" B="118" A="255"/>
+	<Vtx X="-1" Y="-7" Z="5" S="-281" T="281" R="208" G="3" B="118" A="255"/>
+	<Vtx X="0" Y="-6" Z="5" S="-273" T="276" R="237" G="239" B="124" A="255"/>
+	<Vtx X="0" Y="-4" Z="5" S="-272" T="262" R="0" G="3" B="127" A="255"/>
+	<Vtx X="0" Y="7" Z="5" S="-274" T="193" R="208" G="3" B="118" A="255"/>
+	<Vtx X="1" Y="-7" Z="5" S="-264" T="281" R="48" G="3" B="118" A="255"/>
+	<Vtx X="0" Y="7" Z="5" S="-270" T="193" R="48" G="3" B="118" A="255"/>
+	<Vtx X="0" Y="-6" Z="5" S="-271" T="276" R="19" G="239" B="124" A="255"/>
+	<Vtx X="-1" Y="-7" Z="4" S="495" T="495" R="0" G="131" B="21" A="255"/>
+	<Vtx X="1" Y="-7" Z="5" S="317" T="495" R="0" G="138" B="48" A="255"/>
+	<Vtx X="-1" Y="-7" Z="5" S="469" T="495" R="0" G="138" B="48" A="255"/>
+	<Vtx X="1" Y="-7" Z="4" S="291" T="495" R="0" G="131" B="21" A="255"/>
+	<Vtx X="1" Y="-7" Z="2" S="291" T="495" R="0" G="129" B="0" A="255"/>
+	<Vtx X="-1" Y="-7" Z="2" S="495" T="495" R="0" G="129" B="0" A="255"/>
+	<Vtx X="-1" Y="-7" Z="5" S="-279" T="283" R="0" G="208" B="118" A="255"/>
+	<Vtx X="1" Y="-7" Z="5" S="-266" T="283" R="0" G="208" B="118" A="255"/>
+	<Vtx X="6" Y="24" Z="5" S="-239" T="93" R="235" G="228" B="122" A="255"/>
+	<Vtx X="10" Y="-24" Z="5" S="-211" T="386" R="213" G="252" B="119" A="255"/>
+	<Vtx X="12" Y="-24" Z="5" S="-199" T="394" R="250" G="5" B="127" A="255"/>
+	<Vtx X="7" Y="25" Z="5" S="-228" T="83" R="244" G="244" B="126" A="255"/>
+	<Vtx X="-6" Y="24" Z="5" S="-308" T="93" R="21" G="229" B="122" A="255"/>
+	<Vtx X="-7" Y="25" Z="5" S="-318" T="83" R="12" G="244" B="126" A="255"/>
+	<Vtx X="-10" Y="-24" Z="5" S="-334" T="386" R="43" G="253" B="120" A="255"/>
+	<Vtx X="-12" Y="-24" Z="5" S="-346" T="394" R="6" G="5" B="127" A="255"/>
+	<Vtx X="10" Y="-24" Z="5" S="-211" T="386" R="0" G="60" B="112" A="255"/>
+	<Vtx X="2" Y="-24" Z="5" S="-256" T="386" R="0" G="60" B="112" A="255"/>
+	<Vtx X="1" Y="-24" Z="5" S="-265" T="394" R="14" G="15" B="125" A="255"/>
+	<Vtx X="-1" Y="-24" Z="5" S="-280" T="394" R="242" G="15" B="125" A="255"/>
+	<Vtx X="-1" Y="-14" Z="5" S="-283" T="327" R="231" G="27" B="122" A="255"/>
+	<Vtx X="-2" Y="-24" Z="5" S="-289" T="386" R="208" G="4" B="118" A="255"/>
+	<Vtx X="0" Y="-15" Z="5" S="-274" T="334" R="238" G="20" B="124" A="255"/>
+	<Vtx X="1" Y="-14" Z="5" S="-265" T="324" R="25" G="27" B="122" A="255"/>
+	<Vtx X="-1" Y="-14" Z="5" S="-281" T="324" R="231" G="27" B="122" A="255"/>
+	<Vtx X="0" Y="-15" Z="5" S="-271" T="334" R="18" G="20" B="124" A="255"/>
+	<Vtx X="-2" Y="-24" Z="5" S="-289" T="386" R="0" G="60" B="112" A="255"/>
+	<Vtx X="-10" Y="-24" Z="5" S="-334" T="386" R="0" G="60" B="112" A="255"/>
+	<Vtx X="-12" Y="-24" Z="5" S="-346" T="394" R="6" G="5" B="127" A="255"/>
+	<Vtx X="-1" Y="-24" Z="5" S="-280" T="394" R="242" G="15" B="125" A="255"/>
+	<Vtx X="-6" Y="23" Z="3" S="-426" T="495" R="0" G="132" B="27" A="255"/>
+	<Vtx X="6" Y="24" Z="5" S="-324" T="495" R="0" G="138" B="48" A="255"/>
+	<Vtx X="-6" Y="24" Z="5" S="-426" T="495" R="0" G="138" B="48" A="255"/>
+	<Vtx X="5" Y="23" Z="3" S="-324" T="495" R="0" G="132" B="27" A="255"/>
+	<Vtx X="5" Y="23" Z="2" S="-324" T="495" R="0" G="129" B="0" A="255"/>
+	<Vtx X="-6" Y="23" Z="2" S="-426" T="495" R="0" G="129" B="0" A="255"/>
+	<Vtx X="2" Y="-24" Z="5" S="-256" T="386" R="48" G="4" B="118" A="255"/>
+	<Vtx X="1" Y="-14" Z="5" S="-262" T="327" R="25" G="27" B="122" A="255"/>
+	<Vtx X="0" Y="-15" Z="5" S="-271" T="334" R="18" G="20" B="124" A="255"/>
+	<Vtx X="1" Y="-24" Z="5" S="-265" T="394" R="14" G="15" B="125" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_ocarina_a_button/gOcarinaAButtonDL_vtx_1 b/soh/assets/custom/objects/object_ocarina_a_button/gOcarinaAButtonDL_vtx_1
new file mode 100644
index 000000000..dfcc8cc0d
--- /dev/null
+++ b/soh/assets/custom/objects/object_ocarina_a_button/gOcarinaAButtonDL_vtx_1
@@ -0,0 +1,33 @@
+<Vertex Version="0">
+	<Vtx X="0" Y="-4" Z="5" S="-144" T="-9" R="0" G="3" B="127" A="255"/>
+	<Vtx X="0" Y="-6" Z="5" S="-145" T="5" R="237" G="239" B="124" A="255"/>
+	<Vtx X="0" Y="-6" Z="5" S="-143" T="5" R="19" G="239" B="124" A="255"/>
+	<Vtx X="18" Y="-29" Z="5" S="-29" T="148" R="15" G="231" B="124" A="255"/>
+	<Vtx X="32" Y="-10" Z="5" S="58" T="28" R="26" G="249" B="124" A="255"/>
+	<Vtx X="32" Y="10" Z="5" S="58" T="-98" R="27" G="8" B="124" A="255"/>
+	<Vtx X="7" Y="25" Z="5" S="-100" T="-188" R="244" G="244" B="126" A="255"/>
+	<Vtx X="0" Y="34" Z="5" S="-144" T="-245" R="0" G="28" B="124" A="255"/>
+	<Vtx X="20" Y="27" Z="5" S="-19" T="-204" R="16" G="22" B="124" A="255"/>
+	<Vtx X="-7" Y="25" Z="5" S="-190" T="-188" R="12" G="244" B="126" A="255"/>
+	<Vtx X="-32" Y="10" Z="5" S="-346" T="-98" R="229" G="8" B="124" A="255"/>
+	<Vtx X="-20" Y="27" Z="5" S="-269" T="-204" R="240" G="22" B="124" A="255"/>
+	<Vtx X="-18" Y="-29" Z="5" S="-259" T="148" R="241" G="231" B="124" A="255"/>
+	<Vtx X="-32" Y="-10" Z="5" S="-346" T="28" R="230" G="249" B="124" A="255"/>
+	<Vtx X="-12" Y="-24" Z="5" S="-217" T="122" R="6" G="5" B="127" A="255"/>
+	<Vtx X="-1" Y="-24" Z="5" S="-151" T="122" R="242" G="15" B="125" A="255"/>
+	<Vtx X="0" Y="-34" Z="5" S="-144" T="185" R="0" G="224" B="123" A="255"/>
+	<Vtx X="1" Y="-24" Z="5" S="-137" T="122" R="14" G="15" B="125" A="255"/>
+	<Vtx X="12" Y="-24" Z="5" S="-71" T="122" R="250" G="5" B="127" A="255"/>
+	<Vtx X="0" Y="-15" Z="5" S="-143" T="63" R="18" G="20" B="124" A="255"/>
+	<Vtx X="0" Y="-15" Z="5" S="-146" T="63" R="238" G="20" B="124" A="255"/>
+	<Vtx X="-32" Y="10" Z="-5" S="166" T="-98" R="229" G="8" B="132" A="255"/>
+	<Vtx X="-20" Y="27" Z="-5" S="243" T="-204" R="240" G="22" B="132" A="255"/>
+	<Vtx X="0" Y="34" Z="-5" S="368" T="-245" R="0" G="28" B="132" A="255"/>
+	<Vtx X="32" Y="10" Z="-5" S="570" T="-98" R="27" G="8" B="132" A="255"/>
+	<Vtx X="20" Y="27" Z="-5" S="493" T="-204" R="16" G="22" B="132" A="255"/>
+	<Vtx X="-20" Y="-27" Z="-5" S="243" T="140" R="240" G="234" B="132" A="255"/>
+	<Vtx X="20" Y="-27" Z="-5" S="493" T="140" R="16" G="234" B="132" A="255"/>
+	<Vtx X="32" Y="-10" Z="-5" S="570" T="34" R="27" G="248" B="132" A="255"/>
+	<Vtx X="0" Y="-34" Z="-5" S="368" T="181" R="0" G="228" B="132" A="255"/>
+	<Vtx X="-32" Y="-10" Z="-5" S="166" T="34" R="229" G="248" B="132" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_ocarina_a_button/gOcarinaAButtonDL_vtx_cull b/soh/assets/custom/objects/object_ocarina_a_button/gOcarinaAButtonDL_vtx_cull
new file mode 100644
index 000000000..38adb91be
--- /dev/null
+++ b/soh/assets/custom/objects/object_ocarina_a_button/gOcarinaAButtonDL_vtx_cull
@@ -0,0 +1,10 @@
+<Vertex Version="0">
+	<Vtx X="-37" Y="-39" Z="-5" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-37" Y="-39" Z="5" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-37" Y="39" Z="5" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-37" Y="39" Z="-5" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="37" Y="-39" Z="-5" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="37" Y="-39" Z="5" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="37" Y="39" Z="5" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="37" Y="39" Z="-5" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_ocarina_a_button/mat_gOcarinaAButtonDL_f3dlite_ocarina_A_button_edge b/soh/assets/custom/objects/object_ocarina_a_button/mat_gOcarinaAButtonDL_f3dlite_ocarina_A_button_edge
new file mode 100644
index 000000000..45ceb1d42
--- /dev/null
+++ b/soh/assets/custom/objects/object_ocarina_a_button/mat_gOcarinaAButtonDL_f3dlite_ocarina_A_button_edge
@@ -0,0 +1,21 @@
+<DisplayList Version="0">
+	<PipeSync/>
+	<SetCombineLERP A0="G_CCMUX_TEXEL0" B0="G_CCMUX_0" C0="G_CCMUX_SHADE" D0="G_CCMUX_0" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_1" A1="G_CCMUX_COMBINED" B1="G_CCMUX_0" C1="G_CCMUX_PRIMITIVE" D1="G_CCMUX_0" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_COMBINED"/>
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="1" G_CULL_BACK="1" G_FOG="1" G_LIGHTING="1" G_TEXTURE_GEN="1" G_SHADING_SMOOTH="1"  />
+
+	<SetOtherMode Cmd="G_SETOTHERMODE_H" Sft="4" Length="20" G_AD_NOISE="1" G_CD_MAGICSQ="1" G_CK_NONE="1" G_TC_FILT="1" G_TF_BILERP="1" G_TL_TILE="1" G_TD_CLAMP="1" G_TP_PERSP="1" G_CYC_2CYCLE="1" G_PM_NPRIMITIVE="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_L" Sft="0" Length="32" G_AC_NONE="1" G_ZS_PIXEL="1" G_RM_FOG_SHADE_A="1" G_RM_AA_ZB_OPA_SURF2="1" />
+	<Texture S="1984" T="1984" Level="0" Tile="0" On="1"/>
+	<SetTextureLUT Mode="G_TT_NONE"/>
+	<TileSync/>
+	<SetTextureImage Path="objects/object_ocarina_a_button/noise_tex" Format="G_IM_FMT_I" Size="G_IM_SIZ_8b_LOAD_BLOCK" Width="1"/>
+	<SetTile Format="G_IM_FMT_I" Size="G_IM_SIZ_8b_LOAD_BLOCK" Line="0" TMem="0" Tile="7" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="511" Dxt="512"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_I" Size="G_IM_SIZ_8b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="124" Lrt="124"/>
+	<SetPrimColor M="0" L="0" R="90" G="90" B="255" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_ocarina_a_button/mat_gOcarinaAButtonDL_f3dlite_ocarina_A_button_surface b/soh/assets/custom/objects/object_ocarina_a_button/mat_gOcarinaAButtonDL_f3dlite_ocarina_A_button_surface
new file mode 100644
index 000000000..0ed7292b8
--- /dev/null
+++ b/soh/assets/custom/objects/object_ocarina_a_button/mat_gOcarinaAButtonDL_f3dlite_ocarina_A_button_surface
@@ -0,0 +1,21 @@
+<DisplayList Version="0">
+	<PipeSync/>
+	<SetCombineLERP A0="G_CCMUX_TEXEL0" B0="G_CCMUX_0" C0="G_CCMUX_SHADE" D0="G_CCMUX_0" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_1" A1="G_CCMUX_COMBINED" B1="G_CCMUX_0" C1="G_CCMUX_PRIMITIVE" D1="G_CCMUX_0" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_COMBINED"/>
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="1" G_CULL_BACK="1" G_FOG="1" G_LIGHTING="1" G_TEXTURE_GEN="1" G_SHADING_SMOOTH="1"  />
+
+	<SetOtherMode Cmd="G_SETOTHERMODE_H" Sft="4" Length="20" G_AD_NOISE="1" G_CD_MAGICSQ="1" G_CK_NONE="1" G_TC_FILT="1" G_TF_BILERP="1" G_TL_TILE="1" G_TD_CLAMP="1" G_TP_PERSP="1" G_CYC_2CYCLE="1" G_PM_NPRIMITIVE="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_L" Sft="0" Length="32" G_AC_NONE="1" G_ZS_PIXEL="1" G_RM_FOG_SHADE_A="1" G_RM_AA_ZB_OPA_SURF2="1" />
+	<Texture S="2621" T="1311" Level="0" Tile="0" On="1"/>
+	<SetTextureLUT Mode="G_TT_NONE"/>
+	<TileSync/>
+	<SetTextureImage Path="objects/object_ocarina_a_button/noise_tex" Format="G_IM_FMT_I" Size="G_IM_SIZ_8b_LOAD_BLOCK" Width="1"/>
+	<SetTile Format="G_IM_FMT_I" Size="G_IM_SIZ_8b_LOAD_BLOCK" Line="0" TMem="0" Tile="7" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="511" Dxt="512"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_I" Size="G_IM_SIZ_8b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="124" Lrt="124"/>
+	<SetPrimColor M="0" L="0" R="60" G="60" B="170" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_ocarina_a_button/noise_tex b/soh/assets/custom/objects/object_ocarina_a_button/noise_tex
new file mode 100644
index 0000000000000000000000000000000000000000..aaf4e331f15f797a3b1122b58c57b3767e66bc0f
GIT binary patch
literal 1116
zcma)5S&rmH5G^FcIk*X5eDlKxBf5LKx?JV<zND9QdQWd<yUM%Ec1`sZ(=$CnVgPXg
zj=~kV0y%;M5K<^Y%E*X}_g=16tJM$Re*fJUB>w&9uYY}ZlKyY|id266pZ|L)_-3^t
z{^e>VIz`u(`^dKQ%g2w`bDu%x{^r%I8%i=wg`pMy&>oT`wvAwTeqNf)RT*l1cl(+W
z4O3wm5FDBuCz%Uiv0TQ&*Cj#VNy!7F8h~R}KQ9uT<sn4bc%G_I6GT;0xy}7XAc0Xl
z9EM4G%%b!-&hwC40w?Q+Os^j}O=W1^_ib-q*JV+41F@s8a3Ua`shwm1mN7#QI_dF{
zC3#gJ4`q&_A_E=pJ4Q7D!zjqoEu1AT@}e}suH(73Ws=D>qZsmTyW<5x_pt+H9l4&R
zNV*$EuA#8o9Vc?s{bsv;)Pm5GMBTP6z|sQ5v2V)EX1(5QHV?AIOLmqzz`$u>%G@KX
zAm1U#Q1`b#-cdY`0zWyHA&UB`uvJOq1z;j%s@!gUchADQtBSnLBiuZ{ObIeINsvAl
zKp>GPf~X&wGE1T`oqzfLxlOSLfeJL;gpe$uxkXczdF&C0F2DWpa%!p~b}e0&RKxLI
z%T231NzwpnD1Z9&={oddS76r=ISB@l@A&(Ji`>A~6jZ+b`Tf)mbH67OcwTj)5Scc{
zK!pLxobvMFI`+$@k4zv-0AY+25fE@S6z$W{&&H?oX}(_jP*+sLjS^qu9wmr;+rj%{
zAEy-|@BH@CVH4;m%+kORMa{#BXIWla6lGO6!#wp(?ire4hv`1{96uqtA;^bi)3$9t
zo$9i#W2i_9OzJvM;xx4+nwI?IFm%JTj73}=LclXD2+J}FLmcRYNZGH3zUij9O&r(N
zIC{GkOwTb52m2bcW%RfiySf=qM4ckHqqfwB78L>#iUN&&l-#mE4Q;=iy9hjP)*G6p
zcAUU-vK4wNFT$)pja`3!_q^mt=2&vXvP9&Xrb8$zFlv{%J+_yZm#3OgWf__(%K$o#
zDT@+s;Ci{tRaQ>d>(W(+JVHPr6kC2^iS&+v`RR%Lt01bUX&g>t6B|4yh?4GjP~1K+
zRyjYNyVUUyr+Hf5EKR78{fMr0WJ>e{hl<lY9%I`(zIpc(8Bw{y=JoB(-A*<Qg`xfd
D(@X%Y

literal 0
HcmV?d00001

diff --git a/soh/assets/custom/objects/object_ocarina_c_down_button/gOcarinaCDownButtonDL b/soh/assets/custom/objects/object_ocarina_c_down_button/gOcarinaCDownButtonDL
new file mode 100644
index 000000000..0bcb32168
--- /dev/null
+++ b/soh/assets/custom/objects/object_ocarina_c_down_button/gOcarinaCDownButtonDL
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<ClearGeometryMode G_LIGHTING="1" />
+	<LoadVertices Path="objects/object_ocarina_c_down_button/gOcarinaCDownButtonDL_vtx_cull" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
+	<CullDisplayList Start="0" End="7"/>
+	<CallDisplayList Path="objects/object_ocarina_c_down_button/mat_gOcarinaCDownButtonDL_f3dlite_ocarina_C_button_edge"/>
+	<CallDisplayList Path="objects/object_ocarina_c_down_button/gOcarinaCDownButtonDL_tri_0"/>
+	<CallDisplayList Path="objects/object_ocarina_c_down_button/mat_gOcarinaCDownButtonDL_f3dlite_ocarina_C_button_surface"/>
+	<CallDisplayList Path="objects/object_ocarina_c_down_button/gOcarinaCDownButtonDL_tri_1"/>
+	<PipeSync/>
+	<SetGeometryMode G_LIGHTING="1" />
+	<ClearGeometryMode G_TEXTURE_GEN="1" />
+	<SetCombineLERP A0="G_CCMUX_0" B0="G_CCMUX_0" C0="G_CCMUX_0" D0="G_CCMUX_SHADE" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_ENVIRONMENT" A1="G_CCMUX_0" B1="G_CCMUX_0" C1="G_CCMUX_0" D1="G_CCMUX_SHADE" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_ENVIRONMENT"/>
+	<Texture S="65535" T="65535" Level="0" Tile="0" On="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_ocarina_c_down_button/gOcarinaCDownButtonDL_tri_0 b/soh/assets/custom/objects/object_ocarina_c_down_button/gOcarinaCDownButtonDL_tri_0
new file mode 100644
index 000000000..825b236e8
--- /dev/null
+++ b/soh/assets/custom/objects/object_ocarina_c_down_button/gOcarinaCDownButtonDL_tri_0
@@ -0,0 +1,93 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_ocarina_c_down_button/gOcarinaCDownButtonDL_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="0" V02="3" Flag0="0" V10="4" V11="5" V12="0" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="6" V11="8" V12="9" Flag1="0"/>
+	<Triangles2 V00="10" V01="6" V02="9" Flag0="0" V10="10" V11="11" V12="6" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="12" V11="14" V12="15" Flag1="0"/>
+	<Triangles2 V00="16" V01="15" V02="14" Flag0="0" V10="16" V11="17" V12="15" Flag1="0"/>
+	<Triangles2 V00="18" V01="7" V02="19" Flag0="0" V10="18" V11="19" V12="20" Flag1="0"/>
+	<Triangles2 V00="20" V01="19" V02="11" Flag0="0" V10="20" V11="11" V12="21" Flag1="0"/>
+	<Triangles2 V00="22" V01="1" V02="23" Flag0="0" V10="22" V11="23" V12="24" Flag1="0"/>
+	<Triangles2 V00="5" V01="24" V02="23" Flag0="0" V10="5" V11="25" V12="24" Flag1="0"/>
+	<Triangles2 V00="26" V01="27" V02="28" Flag0="0" V10="26" V11="28" V12="29" Flag1="0"/>
+	<Triangles2 V00="29" V01="28" V02="30" Flag0="0" V10="29" V11="30" V12="31" Flag1="0"/>
+	<LoadVertices Path="objects/object_ocarina_c_down_button/gOcarinaCDownButtonDL_vtx_0" VertexBufferIndex="0" VertexOffset="32" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="3" V01="2" V02="4" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="6" V11="8" V12="9" Flag1="0"/>
+	<Triangles2 V00="9" V01="8" V02="10" Flag0="0" V10="9" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="12" V11="15" V12="13" Flag1="0"/>
+	<Triangles2 V00="16" V01="17" V02="18" Flag0="0" V10="16" V11="18" V12="19" Flag1="0"/>
+	<Triangles2 V00="15" V01="20" V02="21" Flag0="0" V10="15" V11="22" V12="20" Flag1="0"/>
+	<Triangles2 V00="23" V01="24" V02="25" Flag0="0" V10="23" V11="25" V12="18" Flag1="0"/>
+	<Triangles2 V00="22" V01="26" V02="27" Flag0="0" V10="22" V11="28" V12="26" Flag1="0"/>
+	<Triangles2 V00="29" V01="30" V02="31" Flag0="0" V10="29" V11="31" V12="25" Flag1="0"/>
+	<LoadVertices Path="objects/object_ocarina_c_down_button/gOcarinaCDownButtonDL_vtx_0" VertexBufferIndex="0" VertexOffset="64" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="3" V12="1" Flag1="0"/>
+	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="4" V11="6" V12="7" Flag1="0"/>
+	<Triangles2 V00="3" V01="8" V02="9" Flag0="0" V10="3" V11="10" V12="8" Flag1="0"/>
+	<Triangles2 V00="11" V01="12" V02="13" Flag0="0" V10="11" V11="13" V12="6" Flag1="0"/>
+	<Triangles2 V00="10" V01="14" V02="15" Flag0="0" V10="10" V11="16" V12="14" Flag1="0"/>
+	<Triangles2 V00="17" V01="18" V02="19" Flag0="0" V10="17" V11="19" V12="13" Flag1="0"/>
+	<Triangles2 V00="16" V01="20" V02="21" Flag0="0" V10="16" V11="22" V12="20" Flag1="0"/>
+	<Triangles2 V00="23" V01="24" V02="25" Flag0="0" V10="23" V11="25" V12="19" Flag1="0"/>
+	<Triangles2 V00="22" V01="26" V02="27" Flag0="0" V10="22" V11="28" V12="26" Flag1="0"/>
+	<Triangles2 V00="29" V01="30" V02="31" Flag0="0" V10="29" V11="31" V12="25" Flag1="0"/>
+	<LoadVertices Path="objects/object_ocarina_c_down_button/gOcarinaCDownButtonDL_vtx_0" VertexBufferIndex="0" VertexOffset="96" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="4" V11="6" V12="7" Flag1="0"/>
+	<Triangles2 V00="8" V01="9" V02="10" Flag0="0" V10="8" V11="6" V12="9" Flag1="0"/>
+	<Triangles2 V00="11" V01="12" V02="1" Flag0="0" V10="11" V11="1" V12="13" Flag1="0"/>
+	<Triangles2 V00="14" V01="15" V02="16" Flag0="0" V10="14" V11="16" V12="17" Flag1="0"/>
+	<Triangles2 V00="18" V01="19" V02="20" Flag0="0" V10="18" V11="20" V12="21" Flag1="0"/>
+	<Triangles2 V00="22" V01="23" V02="24" Flag0="0" V10="22" V11="24" V12="25" Flag1="0"/>
+	<Triangles2 V00="26" V01="27" V02="28" Flag0="0" V10="26" V11="28" V12="20" Flag1="0"/>
+	<Triangle1 V00="29" V01="30" V02="31"/>
+	<LoadVertices Path="objects/object_ocarina_c_down_button/gOcarinaCDownButtonDL_vtx_0" VertexBufferIndex="0" VertexOffset="128" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="3" V01="5" V02="6" Flag0="0" V10="7" V11="8" V12="9" Flag1="0"/>
+	<Triangles2 V00="7" V01="9" V02="10" Flag0="0" V10="11" V11="12" V12="13" Flag1="0"/>
+	<Triangles2 V00="11" V01="13" V02="5" Flag0="0" V10="14" V11="15" V12="16" Flag1="0"/>
+	<Triangles2 V00="14" V01="16" V02="17" Flag0="0" V10="18" V11="19" V12="20" Flag1="0"/>
+	<Triangles2 V00="18" V01="20" V02="13" Flag0="0" V10="21" V11="22" V12="23" Flag1="0"/>
+	<Triangles2 V00="21" V01="23" V02="24" Flag0="0" V10="25" V11="26" V12="27" Flag1="0"/>
+	<Triangles2 V00="25" V01="27" V02="20" Flag0="0" V10="28" V11="29" V12="30" Flag1="0"/>
+	<Triangle1 V00="28" V01="30" V02="31"/>
+	<LoadVertices Path="objects/object_ocarina_c_down_button/gOcarinaCDownButtonDL_vtx_0" VertexBufferIndex="0" VertexOffset="160" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="4" V11="6" V12="7" Flag1="0"/>
+	<Triangles2 V00="8" V01="9" V02="10" Flag0="0" V10="8" V11="10" V12="2" Flag1="0"/>
+	<Triangles2 V00="11" V01="12" V02="13" Flag0="0" V10="11" V11="13" V12="14" Flag1="0"/>
+	<Triangles2 V00="15" V01="16" V02="17" Flag0="0" V10="15" V11="17" V12="10" Flag1="0"/>
+	<Triangles2 V00="18" V01="19" V02="20" Flag0="0" V10="18" V11="17" V12="19" Flag1="0"/>
+	<Triangles2 V00="21" V01="22" V02="23" Flag0="0" V10="21" V11="23" V12="24" Flag1="0"/>
+	<Triangles2 V00="25" V01="26" V02="27" Flag0="0" V10="25" V11="28" V12="26" Flag1="0"/>
+	<Triangles2 V00="25" V01="29" V02="28" Flag0="0" V10="25" V11="30" V12="29" Flag1="0"/>
+	<Triangle1 V00="28" V01="29" V02="31"/>
+	<LoadVertices Path="objects/object_ocarina_c_down_button/gOcarinaCDownButtonDL_vtx_0" VertexBufferIndex="0" VertexOffset="192" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="2" V11="1" V12="3" Flag1="0"/>
+	<Triangles2 V00="2" V01="3" V02="4" Flag0="0" V10="4" V11="3" V12="5" Flag1="0"/>
+	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="7" V11="4" V12="6" Flag1="0"/>
+	<Triangles2 V00="7" V01="8" V02="4" Flag0="0" V10="2" V11="4" V12="8" Flag1="0"/>
+	<Triangles2 V00="2" V01="8" V02="9" Flag0="0" V10="0" V11="2" V12="9" Flag1="0"/>
+	<Triangles2 V00="0" V01="9" V02="10" Flag0="0" V10="11" V11="12" V12="13" Flag1="0"/>
+	<Triangles2 V00="11" V01="13" V02="14" Flag0="0" V10="15" V11="11" V12="14" Flag1="0"/>
+	<Triangles2 V00="15" V01="14" V02="16" Flag0="0" V10="16" V11="17" V12="15" Flag1="0"/>
+	<Triangles2 V00="16" V01="18" V02="17" Flag0="0" V10="19" V11="17" V12="18" Flag1="0"/>
+	<Triangles2 V00="19" V01="18" V02="20" Flag0="0" V10="21" V11="19" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="20" V02="22" Flag0="0" V10="23" V11="21" V12="22" Flag1="0"/>
+	<Triangles2 V00="23" V01="22" V02="24" Flag0="0" V10="24" V11="25" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="26" V02="25" Flag0="0" V10="26" V11="27" V12="25" Flag1="0"/>
+	<Triangles2 V00="26" V01="28" V02="27" Flag0="0" V10="29" V11="30" V12="31" Flag1="0"/>
+	<LoadVertices Path="objects/object_ocarina_c_down_button/gOcarinaCDownButtonDL_vtx_0" VertexBufferIndex="0" VertexOffset="224" Count="17"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="1" V12="0" Flag1="0"/>
+	<Triangles2 V00="3" V01="4" V02="1" Flag0="0" V10="5" V11="6" V12="7" Flag1="0"/>
+	<Triangles2 V00="5" V01="7" V02="8" Flag0="0" V10="8" V11="9" V12="5" Flag1="0"/>
+	<Triangles2 V00="8" V01="10" V02="9" Flag0="0" V10="11" V11="9" V12="10" Flag1="0"/>
+	<Triangles2 V00="11" V01="10" V02="12" Flag0="0" V10="13" V11="11" V12="12" Flag1="0"/>
+	<Triangles2 V00="13" V01="12" V02="14" Flag0="0" V10="14" V11="15" V12="13" Flag1="0"/>
+	<Triangle1 V00="14" V01="16" V02="15"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_ocarina_c_down_button/gOcarinaCDownButtonDL_tri_1 b/soh/assets/custom/objects/object_ocarina_c_down_button/gOcarinaCDownButtonDL_tri_1
new file mode 100644
index 000000000..8b7f7ff56
--- /dev/null
+++ b/soh/assets/custom/objects/object_ocarina_c_down_button/gOcarinaCDownButtonDL_tri_1
@@ -0,0 +1,29 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_ocarina_c_down_button/gOcarinaCDownButtonDL_vtx_1" VertexBufferIndex="0" VertexOffset="0" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="3" V02="5" Flag0="0" V10="5" V11="7" V12="6" Flag1="0"/>
+	<Triangles2 V00="5" V01="8" V02="7" Flag0="0" V10="7" V11="9" V12="6" Flag1="0"/>
+	<Triangles2 V00="10" V01="11" V02="12" Flag0="0" V10="13" V11="10" V12="12" Flag1="0"/>
+	<Triangles2 V00="12" V01="14" V02="13" Flag0="0" V10="12" V11="15" V12="14" Flag1="0"/>
+	<Triangles2 V00="14" V01="16" V02="13" Flag0="0" V10="17" V11="1" V12="18" Flag1="0"/>
+	<Triangles2 V00="18" V01="1" V02="19" Flag0="0" V10="20" V11="21" V12="22" Flag1="0"/>
+	<Triangles2 V00="20" V01="22" V02="23" Flag0="0" V10="22" V11="24" V12="23" Flag1="0"/>
+	<Triangles2 V00="25" V01="20" V02="23" Flag0="0" V10="26" V11="25" V12="23" Flag1="0"/>
+	<Triangles2 V00="26" V01="23" V02="27" Flag0="0" V10="27" V11="28" V12="26" Flag1="0"/>
+	<Triangles2 V00="27" V01="29" V02="28" Flag0="0" V10="27" V11="30" V12="29" Flag1="0"/>
+	<Triangle1 V00="29" V01="31" V02="28"/>
+	<LoadVertices Path="objects/object_ocarina_c_down_button/gOcarinaCDownButtonDL_vtx_1" VertexBufferIndex="0" VertexOffset="32" Count="25"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="3" V12="1" Flag1="0"/>
+	<Triangles2 V00="0" V01="4" V02="3" Flag0="0" V10="5" V11="3" V12="4" Flag1="0"/>
+	<Triangles2 V00="5" V01="4" V02="6" Flag0="0" V10="4" V11="7" V12="6" Flag1="0"/>
+	<Triangles2 V00="6" V01="8" V02="5" Flag0="0" V10="6" V11="9" V12="8" Flag1="0"/>
+	<Triangles2 V00="6" V01="10" V02="9" Flag0="0" V10="6" V11="11" V12="10" Flag1="0"/>
+	<Triangles2 V00="6" V01="12" V02="11" Flag0="0" V10="11" V11="13" V12="10" Flag1="0"/>
+	<Triangles2 V00="9" V01="14" V02="8" Flag0="0" V10="15" V11="16" V12="17" Flag1="0"/>
+	<Triangles2 V00="15" V01="17" V02="18" Flag0="0" V10="17" V11="19" V12="18" Flag1="0"/>
+	<Triangles2 V00="18" V01="20" V02="15" Flag0="0" V10="18" V11="21" V12="20" Flag1="0"/>
+	<Triangles2 V00="18" V01="22" V02="21" Flag0="0" V10="21" V11="23" V12="20" Flag1="0"/>
+	<Triangle1 V00="20" V01="24" V02="15"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_ocarina_c_down_button/gOcarinaCDownButtonDL_vtx_0 b/soh/assets/custom/objects/object_ocarina_c_down_button/gOcarinaCDownButtonDL_vtx_0
new file mode 100644
index 000000000..f3d8371d4
--- /dev/null
+++ b/soh/assets/custom/objects/object_ocarina_c_down_button/gOcarinaCDownButtonDL_vtx_0
@@ -0,0 +1,243 @@
+<Vertex Version="0">
+	<Vtx X="-22" Y="12" Z="2" S="-135" T="-49" R="2" G="250" B="127" A="255"/>
+	<Vtx X="-22" Y="12" Z="2" S="-145" T="-49" R="159" G="17" B="81" A="255"/>
+	<Vtx X="-19" Y="16" Z="2" S="-145" T="-17" R="197" G="79" B="81" A="255"/>
+	<Vtx X="-19" Y="16" Z="2" S="-135" T="-17" R="5" G="255" B="127" A="255"/>
+	<Vtx X="-19" Y="17" Z="4" S="-245" T="-17" R="49" G="191" B="97" A="255"/>
+	<Vtx X="-23" Y="12" Z="4" S="-245" T="-49" R="80" G="241" B="98" A="255"/>
+	<Vtx X="-2" Y="-27" Z="2" S="-135" T="-239" R="2" G="6" B="127" A="255"/>
+	<Vtx X="-2" Y="-27" Z="2" S="-145" T="-239" R="215" G="166" B="79" A="255"/>
+	<Vtx X="-6" Y="-23" Z="2" S="-145" T="-215" R="179" G="204" B="86" A="255"/>
+	<Vtx X="-6" Y="-23" Z="2" S="-135" T="-215" R="244" G="248" B="126" A="255"/>
+	<Vtx X="-7" Y="-24" Z="4" S="-245" T="-215" R="73" G="48" B="92" A="255"/>
+	<Vtx X="-3" Y="-28" Z="4" S="-245" T="-239" R="32" G="72" B="100" A="255"/>
+	<Vtx X="20" Y="6" Z="2" S="111" T="-74" R="88" G="226" B="86" A="255"/>
+	<Vtx X="6" Y="-23" Z="2" S="111" T="-215" R="77" G="204" B="86" A="255"/>
+	<Vtx X="6" Y="-23" Z="2" S="102" T="-215" R="12" G="248" B="126" A="255"/>
+	<Vtx X="20" Y="6" Z="2" S="102" T="-74" R="15" G="254" B="126" A="255"/>
+	<Vtx X="7" Y="-24" Z="4" S="212" T="-215" R="183" G="48" B="92" A="255"/>
+	<Vtx X="21" Y="6" Z="4" S="212" T="-74" R="174" G="28" B="93" A="255"/>
+	<Vtx X="2" Y="-27" Z="2" S="-145" T="-273" R="41" G="166" B="79" A="255"/>
+	<Vtx X="-2" Y="-27" Z="2" S="-135" T="-239" R="2" G="6" B="127" A="255"/>
+	<Vtx X="2" Y="-27" Z="2" S="-135" T="-273" R="254" G="6" B="127" A="255"/>
+	<Vtx X="3" Y="-28" Z="4" S="-245" T="-273" R="224" G="72" B="100" A="255"/>
+	<Vtx X="-20" Y="6" Z="2" S="-145" T="-74" R="168" G="226" B="86" A="255"/>
+	<Vtx X="-22" Y="12" Z="2" S="-135" T="-49" R="2" G="250" B="127" A="255"/>
+	<Vtx X="-20" Y="6" Z="2" S="-135" T="-74" R="241" G="254" B="126" A="255"/>
+	<Vtx X="-21" Y="6" Z="4" S="-245" T="-73" R="82" G="28" B="93" A="255"/>
+	<Vtx X="19" Y="16" Z="2" S="111" T="-17" R="59" G="79" B="81" A="255"/>
+	<Vtx X="22" Y="12" Z="2" S="111" T="-49" R="97" G="17" B="81" A="255"/>
+	<Vtx X="22" Y="12" Z="2" S="102" T="-49" R="254" G="250" B="127" A="255"/>
+	<Vtx X="19" Y="16" Z="2" S="102" T="-17" R="251" G="255" B="127" A="255"/>
+	<Vtx X="23" Y="12" Z="4" S="212" T="-49" R="176" G="241" B="98" A="255"/>
+	<Vtx X="19" Y="17" Z="4" S="212" T="-17" R="207" G="191" B="97" A="255"/>
+	<Vtx X="6" Y="-23" Z="2" S="111" T="-215" R="77" G="204" B="86" A="255"/>
+	<Vtx X="2" Y="-27" Z="2" S="111" T="-273" R="41" G="166" B="79" A="255"/>
+	<Vtx X="2" Y="-27" Z="2" S="102" T="-273" R="254" G="6" B="127" A="255"/>
+	<Vtx X="6" Y="-23" Z="2" S="102" T="-215" R="12" G="248" B="126" A="255"/>
+	<Vtx X="3" Y="-28" Z="4" S="212" T="-273" R="224" G="72" B="100" A="255"/>
+	<Vtx X="7" Y="-24" Z="4" S="212" T="-215" R="183" G="48" B="92" A="255"/>
+	<Vtx X="22" Y="12" Z="2" S="111" T="-49" R="97" G="17" B="81" A="255"/>
+	<Vtx X="20" Y="6" Z="2" S="111" T="-74" R="88" G="226" B="86" A="255"/>
+	<Vtx X="20" Y="6" Z="2" S="102" T="-74" R="15" G="254" B="126" A="255"/>
+	<Vtx X="22" Y="12" Z="2" S="102" T="-49" R="254" G="250" B="127" A="255"/>
+	<Vtx X="21" Y="6" Z="4" S="212" T="-73" R="174" G="28" B="93" A="255"/>
+	<Vtx X="23" Y="12" Z="4" S="212" T="-49" R="176" G="241" B="98" A="255"/>
+	<Vtx X="0" Y="34" Z="5" S="-273" T="27" R="0" G="28" B="124" A="255"/>
+	<Vtx X="22" Y="30" Z="4" S="-129" T="40" R="56" G="76" B="85" A="255"/>
+	<Vtx X="0" Y="37" Z="4" S="-270" T="-5" R="0" G="93" B="87" A="255"/>
+	<Vtx X="21" Y="27" Z="5" S="-142" T="69" R="18" G="23" B="124" A="255"/>
+	<Vtx X="0" Y="37" Z="4" S="493" T="-529" R="0" G="93" B="87" A="255"/>
+	<Vtx X="22" Y="30" Z="4" S="394" T="-529" R="56" G="76" B="85" A="255"/>
+	<Vtx X="23" Y="32" Z="0" S="393" T="-273" R="74" G="103" B="255" A="255"/>
+	<Vtx X="0" Y="39" Z="0" S="495" T="-273" R="0" G="127" B="0" A="255"/>
+	<Vtx X="35" Y="12" Z="4" S="-42" T="159" R="88" G="29" B="87" A="255"/>
+	<Vtx X="22" Y="30" Z="4" S="-125" T="44" R="56" G="76" B="85" A="255"/>
+	<Vtx X="32" Y="12" Z="5" S="-73" T="164" R="27" G="11" B="124" A="255"/>
+	<Vtx X="22" Y="30" Z="4" S="390" T="-529" R="56" G="76" B="85" A="255"/>
+	<Vtx X="35" Y="12" Z="4" S="295" T="-529" R="88" G="29" B="87" A="255"/>
+	<Vtx X="37" Y="12" Z="0" S="291" T="-273" R="121" G="38" B="0" A="255"/>
+	<Vtx X="35" Y="-12" Z="4" S="-39" T="314" R="87" G="228" B="88" A="255"/>
+	<Vtx X="35" Y="12" Z="4" S="-39" T="164" R="88" G="29" B="87" A="255"/>
+	<Vtx X="32" Y="-11" Z="5" S="-73" T="309" R="25" G="247" B="124" A="255"/>
+	<Vtx X="35" Y="12" Z="4" S="291" T="-529" R="88" G="29" B="87" A="255"/>
+	<Vtx X="35" Y="-12" Z="4" S="190" T="-529" R="87" G="228" B="88" A="255"/>
+	<Vtx X="37" Y="-12" Z="0" S="188" T="-273" R="121" G="218" B="1" A="255"/>
+	<Vtx X="32" Y="-11" Z="5" S="-73" T="309" R="25" G="247" B="124" A="255"/>
+	<Vtx X="22" Y="-30" Z="4" S="-126" T="436" R="54" G="181" B="87" A="255"/>
+	<Vtx X="35" Y="-12" Z="4" S="-41" T="319" R="87" G="228" B="88" A="255"/>
+	<Vtx X="20" Y="-27" Z="5" S="-148" T="412" R="16" G="234" B="124" A="255"/>
+	<Vtx X="35" Y="-12" Z="4" S="185" T="-529" R="87" G="228" B="88" A="255"/>
+	<Vtx X="22" Y="-30" Z="4" S="88" T="-529" R="54" G="181" B="87" A="255"/>
+	<Vtx X="23" Y="-32" Z="0" S="86" T="-273" R="75" G="153" B="0" A="255"/>
+	<Vtx X="37" Y="-12" Z="0" S="188" T="-273" R="121" G="218" B="1" A="255"/>
+	<Vtx X="0" Y="-37" Z="4" S="-270" T="484" R="0" G="163" B="87" A="255"/>
+	<Vtx X="22" Y="-30" Z="4" S="-131" T="439" R="54" G="181" B="87" A="255"/>
+	<Vtx X="0" Y="-34" Z="5" S="-273" T="452" R="0" G="228" B="124" A="255"/>
+	<Vtx X="22" Y="-30" Z="4" S="84" T="-529" R="54" G="181" B="87" A="255"/>
+	<Vtx X="0" Y="-37" Z="4" S="-14" T="-529" R="0" G="163" B="87" A="255"/>
+	<Vtx X="0" Y="-39" Z="0" S="-17" T="-273" R="0" G="129" B="0" A="255"/>
+	<Vtx X="-22" Y="-30" Z="4" S="-414" T="439" R="202" G="181" B="87" A="255"/>
+	<Vtx X="0" Y="-37" Z="4" S="-275" T="484" R="0" G="163" B="87" A="255"/>
+	<Vtx X="-20" Y="-27" Z="5" S="-397" T="412" R="240" G="234" B="124" A="255"/>
+	<Vtx X="0" Y="-37" Z="4" S="-19" T="-529" R="0" G="163" B="87" A="255"/>
+	<Vtx X="-22" Y="-30" Z="4" S="-117" T="-529" R="202" G="181" B="87" A="255"/>
+	<Vtx X="-23" Y="-32" Z="0" S="-119" T="-273" R="181" G="153" B="0" A="255"/>
+	<Vtx X="-35" Y="-12" Z="4" S="-504" T="319" R="169" G="228" B="88" A="255"/>
+	<Vtx X="-22" Y="-30" Z="4" S="-419" T="436" R="202" G="181" B="87" A="255"/>
+	<Vtx X="-32" Y="-11" Z="5" S="-472" T="309" R="231" G="247" B="124" A="255"/>
+	<Vtx X="-22" Y="-30" Z="4" S="-121" T="-529" R="202" G="181" B="87" A="255"/>
+	<Vtx X="-35" Y="-12" Z="4" S="-218" T="-529" R="169" G="228" B="88" A="255"/>
+	<Vtx X="-37" Y="-12" Z="0" S="-221" T="-273" R="135" G="218" B="1" A="255"/>
+	<Vtx X="-35" Y="12" Z="4" S="-506" T="164" R="168" G="29" B="87" A="255"/>
+	<Vtx X="-35" Y="-12" Z="4" S="-506" T="314" R="169" G="228" B="88" A="255"/>
+	<Vtx X="-32" Y="12" Z="5" S="-472" T="164" R="229" G="11" B="124" A="255"/>
+	<Vtx X="-35" Y="-12" Z="4" S="-223" T="-529" R="169" G="228" B="88" A="255"/>
+	<Vtx X="-35" Y="12" Z="4" S="-324" T="-529" R="168" G="29" B="87" A="255"/>
+	<Vtx X="-37" Y="12" Z="0" S="-324" T="-273" R="135" G="38" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="0" S="-529" T="-273" R="0" G="127" B="0" A="255"/>
+	<Vtx X="-23" Y="32" Z="0" S="-426" T="-273" R="182" G="103" B="255" A="255"/>
+	<Vtx X="-22" Y="30" Z="4" S="-427" T="-529" R="200" G="76" B="85" A="255"/>
+	<Vtx X="0" Y="37" Z="4" S="-526" T="-529" R="0" G="93" B="87" A="255"/>
+	<Vtx X="0" Y="37" Z="4" S="-275" T="-5" R="0" G="93" B="87" A="255"/>
+	<Vtx X="-22" Y="30" Z="4" S="-416" T="40" R="200" G="76" B="85" A="255"/>
+	<Vtx X="-21" Y="27" Z="5" S="-403" T="69" R="238" G="23" B="124" A="255"/>
+	<Vtx X="0" Y="34" Z="5" S="-273" T="27" R="0" G="28" B="124" A="255"/>
+	<Vtx X="-32" Y="12" Z="5" S="-472" T="164" R="229" G="11" B="124" A="255"/>
+	<Vtx X="-22" Y="30" Z="4" S="-420" T="44" R="200" G="76" B="85" A="255"/>
+	<Vtx X="-35" Y="12" Z="4" S="-503" T="159" R="168" G="29" B="87" A="255"/>
+	<Vtx X="-35" Y="12" Z="4" S="-328" T="-529" R="168" G="29" B="87" A="255"/>
+	<Vtx X="-22" Y="30" Z="4" S="-423" T="-529" R="200" G="76" B="85" A="255"/>
+	<Vtx X="-37" Y="12" Z="0" S="-324" T="-273" R="135" G="38" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="0" S="495" T="-273" R="0" G="127" B="0" A="255"/>
+	<Vtx X="23" Y="32" Z="0" S="393" T="-273" R="74" G="103" B="255" A="255"/>
+	<Vtx X="22" Y="30" Z="-4" S="395" T="-17" R="54" G="75" B="169" A="255"/>
+	<Vtx X="0" Y="37" Z="-4" S="493" T="-17" R="0" G="93" B="169" A="255"/>
+	<Vtx X="0" Y="37" Z="-4" S="242" T="-5" R="0" G="93" B="169" A="255"/>
+	<Vtx X="22" Y="30" Z="-4" S="381" T="40" R="54" G="75" B="169" A="255"/>
+	<Vtx X="20" Y="27" Z="-5" S="364" T="67" R="16" G="22" B="132" A="255"/>
+	<Vtx X="0" Y="34" Z="-5" S="239" T="27" R="0" G="28" B="132" A="255"/>
+	<Vtx X="23" Y="32" Z="0" S="393" T="-273" R="74" G="103" B="255" A="255"/>
+	<Vtx X="37" Y="12" Z="0" S="291" T="-273" R="121" G="38" B="0" A="255"/>
+	<Vtx X="36" Y="12" Z="-4" S="293" T="-17" R="88" G="28" B="169" A="255"/>
+	<Vtx X="22" Y="30" Z="-4" S="391" T="-17" R="54" G="75" B="169" A="255"/>
+	<Vtx X="22" Y="30" Z="-4" S="386" T="43" R="54" G="75" B="169" A="255"/>
+	<Vtx X="36" Y="12" Z="-4" S="471" T="161" R="88" G="28" B="169" A="255"/>
+	<Vtx X="32" Y="10" Z="-5" S="442" T="174" R="27" G="8" B="132" A="255"/>
+	<Vtx X="37" Y="12" Z="0" S="291" T="-273" R="121" G="38" B="0" A="255"/>
+	<Vtx X="37" Y="-12" Z="0" S="188" T="-273" R="121" G="218" B="1" A="255"/>
+	<Vtx X="36" Y="-12" Z="-4" S="190" T="-17" R="88" G="228" B="169" A="255"/>
+	<Vtx X="37" Y="12" Z="0" S="291" T="-273" R="121" G="38" B="0" A="255"/>
+	<Vtx X="36" Y="-12" Z="-4" S="190" T="-17" R="88" G="228" B="169" A="255"/>
+	<Vtx X="36" Y="12" Z="-4" S="289" T="-17" R="88" G="28" B="169" A="255"/>
+	<Vtx X="36" Y="12" Z="-4" S="473" T="167" R="88" G="28" B="169" A="255"/>
+	<Vtx X="36" Y="-12" Z="-4" S="473" T="312" R="88" G="228" B="169" A="255"/>
+	<Vtx X="32" Y="-10" Z="-5" S="442" T="305" R="27" G="248" B="132" A="255"/>
+	<Vtx X="32" Y="10" Z="-5" S="442" T="174" R="27" G="8" B="132" A="255"/>
+	<Vtx X="37" Y="-12" Z="0" S="188" T="-273" R="121" G="218" B="1" A="255"/>
+	<Vtx X="23" Y="-32" Z="0" S="86" T="-273" R="75" G="153" B="0" A="255"/>
+	<Vtx X="22" Y="-30" Z="-4" S="88" T="-17" R="54" G="181" B="169" A="255"/>
+	<Vtx X="36" Y="-12" Z="-4" S="186" T="-17" R="88" G="228" B="169" A="255"/>
+	<Vtx X="36" Y="-12" Z="-4" S="471" T="318" R="88" G="228" B="169" A="255"/>
+	<Vtx X="22" Y="-30" Z="-4" S="386" T="436" R="54" G="181" B="169" A="255"/>
+	<Vtx X="20" Y="-27" Z="-5" S="364" T="412" R="16" G="234" B="132" A="255"/>
+	<Vtx X="23" Y="-32" Z="0" S="86" T="-273" R="75" G="153" B="0" A="255"/>
+	<Vtx X="0" Y="-39" Z="0" S="-17" T="-273" R="0" G="129" B="0" A="255"/>
+	<Vtx X="0" Y="-37" Z="-4" S="-14" T="-17" R="0" G="163" B="169" A="255"/>
+	<Vtx X="22" Y="-30" Z="-4" S="84" T="-17" R="54" G="181" B="169" A="255"/>
+	<Vtx X="22" Y="-30" Z="-4" S="381" T="439" R="54" G="181" B="169" A="255"/>
+	<Vtx X="0" Y="-37" Z="-4" S="242" T="484" R="0" G="163" B="169" A="255"/>
+	<Vtx X="0" Y="-34" Z="-5" S="239" T="452" R="0" G="228" B="132" A="255"/>
+	<Vtx X="0" Y="-39" Z="0" S="-17" T="-273" R="0" G="129" B="0" A="255"/>
+	<Vtx X="-23" Y="-32" Z="0" S="-119" T="-273" R="181" G="153" B="0" A="255"/>
+	<Vtx X="-22" Y="-30" Z="-4" S="-117" T="-17" R="202" G="181" B="169" A="255"/>
+	<Vtx X="0" Y="-37" Z="-4" S="-19" T="-17" R="0" G="163" B="169" A="255"/>
+	<Vtx X="0" Y="-37" Z="-4" S="237" T="484" R="0" G="163" B="169" A="255"/>
+	<Vtx X="-22" Y="-30" Z="-4" S="98" T="439" R="202" G="181" B="169" A="255"/>
+	<Vtx X="-20" Y="-27" Z="-5" S="115" T="412" R="240" G="234" B="132" A="255"/>
+	<Vtx X="-23" Y="-32" Z="0" S="-119" T="-273" R="181" G="153" B="0" A="255"/>
+	<Vtx X="-37" Y="-12" Z="0" S="-221" T="-273" R="135" G="218" B="1" A="255"/>
+	<Vtx X="-36" Y="-12" Z="-4" S="-219" T="-17" R="168" G="228" B="169" A="255"/>
+	<Vtx X="-22" Y="-30" Z="-4" S="-121" T="-17" R="202" G="181" B="169" A="255"/>
+	<Vtx X="-22" Y="-30" Z="-4" S="93" T="436" R="202" G="181" B="169" A="255"/>
+	<Vtx X="-36" Y="-12" Z="-4" S="8" T="318" R="168" G="228" B="169" A="255"/>
+	<Vtx X="-32" Y="-10" Z="-5" S="37" T="305" R="229" G="248" B="132" A="255"/>
+	<Vtx X="-20" Y="-27" Z="-5" S="115" T="412" R="240" G="234" B="132" A="255"/>
+	<Vtx X="-37" Y="-12" Z="0" S="-221" T="-273" R="135" G="218" B="1" A="255"/>
+	<Vtx X="-37" Y="12" Z="0" S="-324" T="-273" R="135" G="38" B="0" A="255"/>
+	<Vtx X="-36" Y="12" Z="-4" S="-322" T="-17" R="168" G="28" B="169" A="255"/>
+	<Vtx X="-36" Y="-12" Z="-4" S="-223" T="-17" R="168" G="228" B="169" A="255"/>
+	<Vtx X="-36" Y="-12" Z="-4" S="6" T="312" R="168" G="228" B="169" A="255"/>
+	<Vtx X="-36" Y="12" Z="-4" S="6" T="167" R="168" G="28" B="169" A="255"/>
+	<Vtx X="-32" Y="10" Z="-5" S="37" T="174" R="229" G="8" B="132" A="255"/>
+	<Vtx X="-37" Y="12" Z="0" S="-324" T="-273" R="135" G="38" B="0" A="255"/>
+	<Vtx X="-23" Y="32" Z="0" S="-426" T="-273" R="182" G="103" B="255" A="255"/>
+	<Vtx X="-22" Y="30" Z="-4" S="-424" T="-17" R="202" G="75" B="169" A="255"/>
+	<Vtx X="-36" Y="12" Z="-4" S="-326" T="-17" R="168" G="28" B="169" A="255"/>
+	<Vtx X="-36" Y="12" Z="-4" S="8" T="161" R="168" G="28" B="169" A="255"/>
+	<Vtx X="-22" Y="30" Z="-4" S="93" T="43" R="202" G="75" B="169" A="255"/>
+	<Vtx X="-20" Y="27" Z="-5" S="115" T="67" R="240" G="22" B="132" A="255"/>
+	<Vtx X="0" Y="34" Z="-5" S="239" T="27" R="0" G="28" B="132" A="255"/>
+	<Vtx X="-22" Y="30" Z="-4" S="98" T="40" R="202" G="75" B="169" A="255"/>
+	<Vtx X="0" Y="37" Z="-4" S="237" T="-5" R="0" G="93" B="169" A="255"/>
+	<Vtx X="0" Y="37" Z="-4" S="-526" T="-17" R="0" G="93" B="169" A="255"/>
+	<Vtx X="-22" Y="30" Z="-4" S="-428" T="-17" R="202" G="75" B="169" A="255"/>
+	<Vtx X="-23" Y="32" Z="0" S="-426" T="-273" R="182" G="103" B="255" A="255"/>
+	<Vtx X="0" Y="39" Z="0" S="-529" T="-273" R="0" G="127" B="0" A="255"/>
+	<Vtx X="-19" Y="16" Z="2" S="-145" T="-26" R="5" G="255" B="127" A="255"/>
+	<Vtx X="-13" Y="19" Z="4" S="-81" T="84" R="11" G="169" B="92" A="255"/>
+	<Vtx X="-19" Y="17" Z="4" S="-145" T="84" R="49" G="191" B="97" A="255"/>
+	<Vtx X="-13" Y="18" Z="2" S="-81" T="-26" R="255" G="14" B="126" A="255"/>
+	<Vtx X="-13" Y="18" Z="2" S="-81" T="-17" R="244" G="93" B="86" A="255"/>
+	<Vtx X="-19" Y="16" Z="2" S="-145" T="-17" R="197" G="79" B="81" A="255"/>
+	<Vtx X="0" Y="18" Z="2" S="-17" T="-17" R="0" G="90" B="90" A="255"/>
+	<Vtx X="-13" Y="18" Z="2" S="-81" T="-26" R="255" G="14" B="126" A="255"/>
+	<Vtx X="0" Y="18" Z="2" S="-17" T="-17" R="0" G="90" B="90" A="255"/>
+	<Vtx X="0" Y="18" Z="2" S="-17" T="-26" R="0" G="24" B="125" A="255"/>
+	<Vtx X="13" Y="18" Z="2" S="47" T="-17" R="12" G="93" B="86" A="255"/>
+	<Vtx X="13" Y="18" Z="2" S="47" T="-26" R="1" G="14" B="126" A="255"/>
+	<Vtx X="19" Y="16" Z="2" S="111" T="-17" R="59" G="79" B="81" A="255"/>
+	<Vtx X="19" Y="16" Z="2" S="111" T="-26" R="251" G="255" B="127" A="255"/>
+	<Vtx X="19" Y="17" Z="4" S="111" T="84" R="207" G="191" B="97" A="255"/>
+	<Vtx X="13" Y="19" Z="4" S="47" T="84" R="245" G="169" B="92" A="255"/>
+	<Vtx X="0" Y="19" Z="4" S="-17" T="84" R="0" G="166" B="90" A="255"/>
+	<Vtx X="-13" Y="19" Z="4" S="-81" T="84" R="11" G="169" B="92" A="255"/>
+	<Vtx X="23" Y="12" Z="4" S="-136" T="164" R="176" G="241" B="98" A="255"/>
+	<Vtx X="21" Y="6" Z="4" S="-143" T="200" R="174" G="28" B="93" A="255"/>
+	<Vtx X="24" Y="6" Z="5" S="-123" T="203" R="234" G="7" B="125" A="255"/>
+	<Vtx X="25" Y="12" Z="5" S="-115" T="164" R="239" G="254" B="126" A="255"/>
+	<Vtx X="19" Y="17" Z="4" S="-153" T="137" R="207" G="191" B="97" A="255"/>
+	<Vtx X="21" Y="19" Z="5" S="-142" T="120" R="242" G="237" B="125" A="255"/>
+	<Vtx X="13" Y="19" Z="4" S="-189" T="127" R="245" G="169" B="92" A="255"/>
+	<Vtx X="14" Y="21" Z="5" S="-187" T="108" R="253" G="232" B="125" A="255"/>
+	<Vtx X="0" Y="19" Z="4" S="-273" T="127" R="0" G="166" B="90" A="255"/>
+	<Vtx X="0" Y="21" Z="5" S="-273" T="108" R="0" G="232" B="125" A="255"/>
+	<Vtx X="-13" Y="19" Z="4" S="-356" T="127" R="11" G="169" B="92" A="255"/>
+	<Vtx X="-14" Y="21" Z="5" S="-358" T="108" R="3" G="232" B="125" A="255"/>
+	<Vtx X="-19" Y="17" Z="4" S="-392" T="137" R="49" G="191" B="97" A="255"/>
+	<Vtx X="-21" Y="19" Z="5" S="-403" T="120" R="14" G="237" B="125" A="255"/>
+	<Vtx X="-23" Y="12" Z="4" S="-409" T="164" R="80" G="241" B="98" A="255"/>
+	<Vtx X="-25" Y="12" Z="5" S="-430" T="164" R="17" G="254" B="126" A="255"/>
+	<Vtx X="-21" Y="6" Z="4" S="-402" T="200" R="82" G="28" B="93" A="255"/>
+	<Vtx X="-24" Y="6" Z="5" S="-422" T="203" R="22" G="7" B="125" A="255"/>
+	<Vtx X="-6" Y="-23" Z="2" S="-135" T="-215" R="244" G="248" B="126" A="255"/>
+	<Vtx X="-21" Y="6" Z="4" S="-245" T="-74" R="82" G="28" B="93" A="255"/>
+	<Vtx X="-7" Y="-24" Z="4" S="-245" T="-215" R="73" G="48" B="92" A="255"/>
+	<Vtx X="-6" Y="-23" Z="2" S="-135" T="-215" R="244" G="248" B="126" A="255"/>
+	<Vtx X="-20" Y="6" Z="2" S="-135" T="-74" R="241" G="254" B="126" A="255"/>
+	<Vtx X="-21" Y="6" Z="4" S="-245" T="-74" R="82" G="28" B="93" A="255"/>
+	<Vtx X="-6" Y="-23" Z="2" S="-145" T="-215" R="179" G="204" B="86" A="255"/>
+	<Vtx X="-20" Y="6" Z="2" S="-145" T="-74" R="168" G="226" B="86" A="255"/>
+	<Vtx X="-7" Y="-24" Z="4" S="-310" T="385" R="73" G="48" B="92" A="255"/>
+	<Vtx X="-21" Y="6" Z="4" S="-402" T="201" R="82" G="28" B="93" A="255"/>
+	<Vtx X="-24" Y="6" Z="5" S="-422" T="203" R="22" G="7" B="125" A="255"/>
+	<Vtx X="-8" Y="-25" Z="5" S="-326" T="396" R="20" G="13" B="125" A="255"/>
+	<Vtx X="-3" Y="-28" Z="4" S="-286" T="412" R="32" G="72" B="100" A="255"/>
+	<Vtx X="-4" Y="-30" Z="5" S="-295" T="431" R="9" G="20" B="125" A="255"/>
+	<Vtx X="3" Y="-28" Z="4" S="-259" T="412" R="224" G="72" B="100" A="255"/>
+	<Vtx X="4" Y="-30" Z="5" S="-250" T="431" R="247" G="20" B="125" A="255"/>
+	<Vtx X="7" Y="-24" Z="4" S="-235" T="385" R="183" G="48" B="92" A="255"/>
+	<Vtx X="8" Y="-25" Z="5" S="-219" T="396" R="236" G="13" B="125" A="255"/>
+	<Vtx X="21" Y="6" Z="4" S="-143" T="201" R="174" G="28" B="93" A="255"/>
+	<Vtx X="24" Y="6" Z="5" S="-123" T="203" R="234" G="7" B="125" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_ocarina_c_down_button/gOcarinaCDownButtonDL_vtx_1 b/soh/assets/custom/objects/object_ocarina_c_down_button/gOcarinaCDownButtonDL_vtx_1
new file mode 100644
index 000000000..682f39ebb
--- /dev/null
+++ b/soh/assets/custom/objects/object_ocarina_c_down_button/gOcarinaCDownButtonDL_vtx_1
@@ -0,0 +1,59 @@
+<Vertex Version="0">
+	<Vtx X="-2" Y="-27" Z="2" S="-16" T="-511" R="215" G="166" B="79" A="255"/>
+	<Vtx X="0" Y="-22" Z="2" S="16" T="-480" R="0" G="0" B="127" A="255"/>
+	<Vtx X="-6" Y="-23" Z="2" S="8" T="-488" R="179" G="204" B="86" A="255"/>
+	<Vtx X="-20" Y="6" Z="2" S="-16" T="-345" R="168" G="226" B="86" A="255"/>
+	<Vtx X="-6" Y="-23" Z="2" S="-16" T="-487" R="179" G="204" B="86" A="255"/>
+	<Vtx X="0" Y="-22" Z="2" S="-16" T="-480" R="0" G="0" B="127" A="255"/>
+	<Vtx X="-22" Y="12" Z="2" S="-7" T="-317" R="159" G="17" B="81" A="255"/>
+	<Vtx X="-13" Y="18" Z="2" S="48" T="-288" R="244" G="93" B="86" A="255"/>
+	<Vtx X="0" Y="18" Z="2" S="48" T="-288" R="0" G="90" B="90" A="255"/>
+	<Vtx X="-19" Y="16" Z="2" S="16" T="-296" R="197" G="79" B="81" A="255"/>
+	<Vtx X="19" Y="16" Z="2" S="112" T="-296" R="59" G="79" B="81" A="255"/>
+	<Vtx X="13" Y="18" Z="2" S="112" T="-288" R="12" G="93" B="86" A="255"/>
+	<Vtx X="0" Y="18" Z="2" S="112" T="-288" R="0" G="90" B="90" A="255"/>
+	<Vtx X="22" Y="12" Z="2" S="112" T="-317" R="97" G="17" B="81" A="255"/>
+	<Vtx X="6" Y="-23" Z="2" S="141" T="-487" R="77" G="204" B="86" A="255"/>
+	<Vtx X="0" Y="-22" Z="2" S="112" T="-480" R="0" G="0" B="127" A="255"/>
+	<Vtx X="20" Y="6" Z="2" S="112" T="-345" R="88" G="226" B="86" A="255"/>
+	<Vtx X="6" Y="-23" Z="2" S="13" T="-487" R="77" G="204" B="86" A="255"/>
+	<Vtx X="2" Y="-27" Z="2" S="2" T="-508" R="41" G="166" B="79" A="255"/>
+	<Vtx X="-2" Y="-27" Z="2" S="2" T="-508" R="215" G="166" B="79" A="255"/>
+	<Vtx X="-24" Y="6" Z="5" S="-293" T="-68" R="22" G="7" B="125" A="255"/>
+	<Vtx X="-25" Y="12" Z="5" S="-301" T="-108" R="17" G="254" B="126" A="255"/>
+	<Vtx X="-32" Y="12" Z="5" S="-343" T="-108" R="229" G="11" B="124" A="255"/>
+	<Vtx X="-20" Y="-27" Z="5" S="-269" T="140" R="240" G="234" B="124" A="255"/>
+	<Vtx X="-32" Y="-11" Z="5" S="-343" T="38" R="231" G="247" B="124" A="255"/>
+	<Vtx X="-8" Y="-25" Z="5" S="-197" T="124" R="20" G="13" B="125" A="255"/>
+	<Vtx X="-4" Y="-30" Z="5" S="-166" T="160" R="9" G="20" B="125" A="255"/>
+	<Vtx X="0" Y="-34" Z="5" S="-144" T="181" R="0" G="228" B="124" A="255"/>
+	<Vtx X="4" Y="-30" Z="5" S="-122" T="160" R="247" G="20" B="125" A="255"/>
+	<Vtx X="32" Y="-11" Z="5" S="55" T="38" R="25" G="247" B="124" A="255"/>
+	<Vtx X="20" Y="-27" Z="5" S="-19" T="140" R="16" G="234" B="124" A="255"/>
+	<Vtx X="8" Y="-25" Z="5" S="-91" T="124" R="236" G="13" B="125" A="255"/>
+	<Vtx X="32" Y="-11" Z="5" S="55" T="38" R="25" G="247" B="124" A="255"/>
+	<Vtx X="24" Y="6" Z="5" S="5" T="-68" R="234" G="7" B="125" A="255"/>
+	<Vtx X="8" Y="-25" Z="5" S="-91" T="124" R="236" G="13" B="125" A="255"/>
+	<Vtx X="25" Y="12" Z="5" S="13" T="-108" R="239" G="254" B="126" A="255"/>
+	<Vtx X="32" Y="12" Z="5" S="55" T="-108" R="27" G="11" B="124" A="255"/>
+	<Vtx X="21" Y="19" Z="5" S="-14" T="-152" R="242" G="237" B="125" A="255"/>
+	<Vtx X="0" Y="34" Z="5" S="-144" T="-245" R="0" G="28" B="124" A="255"/>
+	<Vtx X="21" Y="27" Z="5" S="-13" T="-202" R="18" G="23" B="124" A="255"/>
+	<Vtx X="14" Y="21" Z="5" S="-58" T="-164" R="253" G="232" B="125" A="255"/>
+	<Vtx X="-14" Y="21" Z="5" S="-230" T="-164" R="3" G="232" B="125" A="255"/>
+	<Vtx X="-21" Y="19" Z="5" S="-274" T="-152" R="14" G="237" B="125" A="255"/>
+	<Vtx X="-32" Y="12" Z="5" S="-343" T="-108" R="229" G="11" B="124" A="255"/>
+	<Vtx X="-21" Y="27" Z="5" S="-275" T="-202" R="238" G="23" B="124" A="255"/>
+	<Vtx X="-25" Y="12" Z="5" S="-301" T="-108" R="17" G="254" B="126" A="255"/>
+	<Vtx X="0" Y="21" Z="5" S="-144" T="-164" R="0" G="232" B="125" A="255"/>
+	<Vtx X="-32" Y="10" Z="-5" S="166" T="-98" R="229" G="8" B="132" A="255"/>
+	<Vtx X="-20" Y="27" Z="-5" S="243" T="-204" R="240" G="22" B="132" A="255"/>
+	<Vtx X="0" Y="34" Z="-5" S="368" T="-245" R="0" G="28" B="132" A="255"/>
+	<Vtx X="32" Y="10" Z="-5" S="570" T="-98" R="27" G="8" B="132" A="255"/>
+	<Vtx X="20" Y="27" Z="-5" S="493" T="-204" R="16" G="22" B="132" A="255"/>
+	<Vtx X="-20" Y="-27" Z="-5" S="243" T="140" R="240" G="234" B="132" A="255"/>
+	<Vtx X="20" Y="-27" Z="-5" S="493" T="140" R="16" G="234" B="132" A="255"/>
+	<Vtx X="32" Y="-10" Z="-5" S="570" T="34" R="27" G="248" B="132" A="255"/>
+	<Vtx X="0" Y="-34" Z="-5" S="368" T="181" R="0" G="228" B="132" A="255"/>
+	<Vtx X="-32" Y="-10" Z="-5" S="166" T="34" R="229" G="248" B="132" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_ocarina_c_down_button/gOcarinaCDownButtonDL_vtx_cull b/soh/assets/custom/objects/object_ocarina_c_down_button/gOcarinaCDownButtonDL_vtx_cull
new file mode 100644
index 000000000..38adb91be
--- /dev/null
+++ b/soh/assets/custom/objects/object_ocarina_c_down_button/gOcarinaCDownButtonDL_vtx_cull
@@ -0,0 +1,10 @@
+<Vertex Version="0">
+	<Vtx X="-37" Y="-39" Z="-5" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-37" Y="-39" Z="5" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-37" Y="39" Z="5" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-37" Y="39" Z="-5" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="37" Y="-39" Z="-5" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="37" Y="-39" Z="5" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="37" Y="39" Z="5" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="37" Y="39" Z="-5" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_ocarina_c_down_button/mat_gOcarinaCDownButtonDL_f3dlite_ocarina_C_button_edge b/soh/assets/custom/objects/object_ocarina_c_down_button/mat_gOcarinaCDownButtonDL_f3dlite_ocarina_C_button_edge
new file mode 100644
index 000000000..b741478fb
--- /dev/null
+++ b/soh/assets/custom/objects/object_ocarina_c_down_button/mat_gOcarinaCDownButtonDL_f3dlite_ocarina_C_button_edge
@@ -0,0 +1,21 @@
+<DisplayList Version="0">
+	<PipeSync/>
+	<SetCombineLERP A0="G_CCMUX_TEXEL0" B0="G_CCMUX_0" C0="G_CCMUX_SHADE" D0="G_CCMUX_0" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_1" A1="G_CCMUX_COMBINED" B1="G_CCMUX_0" C1="G_CCMUX_PRIMITIVE" D1="G_CCMUX_0" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_COMBINED"/>
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="1" G_CULL_BACK="1" G_FOG="1" G_LIGHTING="1" G_TEXTURE_GEN="1" G_SHADING_SMOOTH="1"  />
+
+	<SetOtherMode Cmd="G_SETOTHERMODE_H" Sft="4" Length="20" G_AD_NOISE="1" G_CD_MAGICSQ="1" G_CK_NONE="1" G_TC_FILT="1" G_TF_BILERP="1" G_TL_TILE="1" G_TD_CLAMP="1" G_TP_PERSP="1" G_CYC_2CYCLE="1" G_PM_NPRIMITIVE="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_L" Sft="0" Length="32" G_AC_NONE="1" G_ZS_PIXEL="1" G_RM_FOG_SHADE_A="1" G_RM_AA_ZB_OPA_SURF2="1" />
+	<Texture S="1984" T="1984" Level="0" Tile="0" On="1"/>
+	<SetTextureLUT Mode="G_TT_NONE"/>
+	<TileSync/>
+	<SetTextureImage Path="objects/object_ocarina_c_down_button/noise_tex" Format="G_IM_FMT_I" Size="G_IM_SIZ_8b_LOAD_BLOCK" Width="1"/>
+	<SetTile Format="G_IM_FMT_I" Size="G_IM_SIZ_8b_LOAD_BLOCK" Line="0" TMem="0" Tile="7" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="511" Dxt="512"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_I" Size="G_IM_SIZ_8b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="124" Lrt="124"/>
+	<SetPrimColor M="0" L="0" R="255" G="160" B="0" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_ocarina_c_down_button/mat_gOcarinaCDownButtonDL_f3dlite_ocarina_C_button_surface b/soh/assets/custom/objects/object_ocarina_c_down_button/mat_gOcarinaCDownButtonDL_f3dlite_ocarina_C_button_surface
new file mode 100644
index 000000000..9b7410f6f
--- /dev/null
+++ b/soh/assets/custom/objects/object_ocarina_c_down_button/mat_gOcarinaCDownButtonDL_f3dlite_ocarina_C_button_surface
@@ -0,0 +1,21 @@
+<DisplayList Version="0">
+	<PipeSync/>
+	<SetCombineLERP A0="G_CCMUX_TEXEL0" B0="G_CCMUX_0" C0="G_CCMUX_SHADE" D0="G_CCMUX_0" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_1" A1="G_CCMUX_COMBINED" B1="G_CCMUX_0" C1="G_CCMUX_PRIMITIVE" D1="G_CCMUX_0" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_COMBINED"/>
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="1" G_CULL_BACK="1" G_FOG="1" G_LIGHTING="1" G_TEXTURE_GEN="1" G_SHADING_SMOOTH="1"  />
+
+	<SetOtherMode Cmd="G_SETOTHERMODE_H" Sft="4" Length="20" G_AD_NOISE="1" G_CD_MAGICSQ="1" G_CK_NONE="1" G_TC_FILT="1" G_TF_BILERP="1" G_TL_TILE="1" G_TD_CLAMP="1" G_TP_PERSP="1" G_CYC_2CYCLE="1" G_PM_NPRIMITIVE="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_L" Sft="0" Length="32" G_AC_NONE="1" G_ZS_PIXEL="1" G_RM_FOG_SHADE_A="1" G_RM_AA_ZB_OPA_SURF2="1" />
+	<Texture S="2621" T="1311" Level="0" Tile="0" On="1"/>
+	<SetTextureLUT Mode="G_TT_NONE"/>
+	<TileSync/>
+	<SetTextureImage Path="objects/object_ocarina_c_down_button/noise_tex" Format="G_IM_FMT_I" Size="G_IM_SIZ_8b_LOAD_BLOCK" Width="1"/>
+	<SetTile Format="G_IM_FMT_I" Size="G_IM_SIZ_8b_LOAD_BLOCK" Line="0" TMem="0" Tile="7" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="511" Dxt="512"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_I" Size="G_IM_SIZ_8b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="124" Lrt="124"/>
+	<SetPrimColor M="0" L="0" R="170" G="107" B="0" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_ocarina_c_down_button/noise_tex b/soh/assets/custom/objects/object_ocarina_c_down_button/noise_tex
new file mode 100644
index 0000000000000000000000000000000000000000..aaf4e331f15f797a3b1122b58c57b3767e66bc0f
GIT binary patch
literal 1116
zcma)5S&rmH5G^FcIk*X5eDlKxBf5LKx?JV<zND9QdQWd<yUM%Ec1`sZ(=$CnVgPXg
zj=~kV0y%;M5K<^Y%E*X}_g=16tJM$Re*fJUB>w&9uYY}ZlKyY|id266pZ|L)_-3^t
z{^e>VIz`u(`^dKQ%g2w`bDu%x{^r%I8%i=wg`pMy&>oT`wvAwTeqNf)RT*l1cl(+W
z4O3wm5FDBuCz%Uiv0TQ&*Cj#VNy!7F8h~R}KQ9uT<sn4bc%G_I6GT;0xy}7XAc0Xl
z9EM4G%%b!-&hwC40w?Q+Os^j}O=W1^_ib-q*JV+41F@s8a3Ua`shwm1mN7#QI_dF{
zC3#gJ4`q&_A_E=pJ4Q7D!zjqoEu1AT@}e}suH(73Ws=D>qZsmTyW<5x_pt+H9l4&R
zNV*$EuA#8o9Vc?s{bsv;)Pm5GMBTP6z|sQ5v2V)EX1(5QHV?AIOLmqzz`$u>%G@KX
zAm1U#Q1`b#-cdY`0zWyHA&UB`uvJOq1z;j%s@!gUchADQtBSnLBiuZ{ObIeINsvAl
zKp>GPf~X&wGE1T`oqzfLxlOSLfeJL;gpe$uxkXczdF&C0F2DWpa%!p~b}e0&RKxLI
z%T231NzwpnD1Z9&={oddS76r=ISB@l@A&(Ji`>A~6jZ+b`Tf)mbH67OcwTj)5Scc{
zK!pLxobvMFI`+$@k4zv-0AY+25fE@S6z$W{&&H?oX}(_jP*+sLjS^qu9wmr;+rj%{
zAEy-|@BH@CVH4;m%+kORMa{#BXIWla6lGO6!#wp(?ire4hv`1{96uqtA;^bi)3$9t
zo$9i#W2i_9OzJvM;xx4+nwI?IFm%JTj73}=LclXD2+J}FLmcRYNZGH3zUij9O&r(N
zIC{GkOwTb52m2bcW%RfiySf=qM4ckHqqfwB78L>#iUN&&l-#mE4Q;=iy9hjP)*G6p
zcAUU-vK4wNFT$)pja`3!_q^mt=2&vXvP9&Xrb8$zFlv{%J+_yZm#3OgWf__(%K$o#
zDT@+s;Ci{tRaQ>d>(W(+JVHPr6kC2^iS&+v`RR%Lt01bUX&g>t6B|4yh?4GjP~1K+
zRyjYNyVUUyr+Hf5EKR78{fMr0WJ>e{hl<lY9%I`(zIpc(8Bw{y=JoB(-A*<Qg`xfd
D(@X%Y

literal 0
HcmV?d00001

diff --git a/soh/assets/custom/objects/object_ocarina_c_left_button/gOcarinaCLeftButtonDL b/soh/assets/custom/objects/object_ocarina_c_left_button/gOcarinaCLeftButtonDL
new file mode 100644
index 000000000..be037cfe2
--- /dev/null
+++ b/soh/assets/custom/objects/object_ocarina_c_left_button/gOcarinaCLeftButtonDL
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<ClearGeometryMode G_LIGHTING="1" />
+	<LoadVertices Path="objects/object_ocarina_c_left_button/gOcarinaCLeftButtonDL_vtx_cull" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
+	<CullDisplayList Start="0" End="7"/>
+	<CallDisplayList Path="objects/object_ocarina_c_left_button/mat_gOcarinaCLeftButtonDL_f3dlite_ocarina_C_button_surface"/>
+	<CallDisplayList Path="objects/object_ocarina_c_left_button/gOcarinaCLeftButtonDL_tri_0"/>
+	<CallDisplayList Path="objects/object_ocarina_c_left_button/mat_gOcarinaCLeftButtonDL_f3dlite_ocarina_C_button_edge"/>
+	<CallDisplayList Path="objects/object_ocarina_c_left_button/gOcarinaCLeftButtonDL_tri_1"/>
+	<PipeSync/>
+	<SetGeometryMode G_LIGHTING="1" />
+	<ClearGeometryMode G_TEXTURE_GEN="1" />
+	<SetCombineLERP A0="G_CCMUX_0" B0="G_CCMUX_0" C0="G_CCMUX_0" D0="G_CCMUX_SHADE" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_ENVIRONMENT" A1="G_CCMUX_0" B1="G_CCMUX_0" C1="G_CCMUX_0" D1="G_CCMUX_SHADE" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_ENVIRONMENT"/>
+	<Texture S="65535" T="65535" Level="0" Tile="0" On="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_ocarina_c_left_button/gOcarinaCLeftButtonDL_tri_0 b/soh/assets/custom/objects/object_ocarina_c_left_button/gOcarinaCLeftButtonDL_tri_0
new file mode 100644
index 000000000..bda98fe0a
--- /dev/null
+++ b/soh/assets/custom/objects/object_ocarina_c_left_button/gOcarinaCLeftButtonDL_tri_0
@@ -0,0 +1,28 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_ocarina_c_left_button/gOcarinaCLeftButtonDL_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="3" V01="5" V02="6" Flag0="0" V10="5" V11="7" V12="6" Flag1="0"/>
+	<Triangles2 V00="6" V01="8" V02="3" Flag0="0" V10="8" V11="9" V12="3" Flag1="0"/>
+	<Triangles2 V00="10" V01="11" V02="12" Flag0="0" V10="13" V11="10" V12="12" Flag1="0"/>
+	<Triangles2 V00="12" V01="14" V02="13" Flag0="0" V10="12" V11="15" V12="14" Flag1="0"/>
+	<Triangles2 V00="14" V01="16" V02="13" Flag0="0" V10="17" V11="1" V12="18" Flag1="0"/>
+	<Triangles2 V00="18" V01="1" V02="3" Flag0="0" V10="19" V11="20" V12="21" Flag1="0"/>
+	<Triangles2 V00="22" V01="21" V02="20" Flag0="0" V10="22" V11="20" V12="23" Flag1="0"/>
+	<Triangles2 V00="22" V01="23" V02="24" Flag0="0" V10="25" V11="22" V12="24" Flag1="0"/>
+	<Triangles2 V00="24" V01="26" V02="25" Flag0="0" V10="26" V11="27" V12="25" Flag1="0"/>
+	<Triangles2 V00="27" V01="28" V02="25" Flag0="0" V10="28" V11="29" V12="25" Flag1="0"/>
+	<Triangles2 V00="30" V01="29" V02="28" Flag0="0" V10="30" V11="28" V12="31" Flag1="0"/>
+	<LoadVertices Path="objects/object_ocarina_c_left_button/gOcarinaCLeftButtonDL_vtx_0" VertexBufferIndex="0" VertexOffset="32" Count="26"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="0" V02="3" Flag0="0" V10="4" V11="3" V12="5" Flag1="0"/>
+	<Triangles2 V00="5" V01="6" V02="4" Flag0="0" V10="5" V11="7" V12="6" Flag1="0"/>
+	<Triangles2 V00="7" V01="8" V02="6" Flag0="0" V10="7" V11="9" V12="8" Flag1="0"/>
+	<Triangles2 V00="8" V01="10" V02="6" Flag0="0" V10="10" V11="11" V12="6" Flag1="0"/>
+	<Triangles2 V00="4" V01="12" V02="0" Flag0="0" V10="13" V11="14" V12="15" Flag1="0"/>
+	<Triangles2 V00="16" V01="17" V02="18" Flag0="0" V10="16" V11="18" V12="19" Flag1="0"/>
+	<Triangles2 V00="18" V01="20" V02="19" Flag0="0" V10="19" V11="21" V12="16" Flag1="0"/>
+	<Triangles2 V00="19" V01="22" V02="21" Flag0="0" V10="19" V11="23" V12="22" Flag1="0"/>
+	<Triangles2 V00="22" V01="24" V02="21" Flag0="0" V10="21" V11="25" V12="16" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_ocarina_c_left_button/gOcarinaCLeftButtonDL_tri_1 b/soh/assets/custom/objects/object_ocarina_c_left_button/gOcarinaCLeftButtonDL_tri_1
new file mode 100644
index 000000000..937dd564d
--- /dev/null
+++ b/soh/assets/custom/objects/object_ocarina_c_left_button/gOcarinaCLeftButtonDL_tri_1
@@ -0,0 +1,94 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_ocarina_c_left_button/gOcarinaCLeftButtonDL_vtx_1" VertexBufferIndex="0" VertexOffset="0" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="2" V01="4" V02="3" Flag0="0" V10="2" V11="5" V12="4" Flag1="0"/>
+	<Triangles2 V00="5" V01="6" V02="4" Flag0="0" V10="5" V11="7" V12="6" Flag1="0"/>
+	<Triangles2 V00="4" V01="6" V02="8" Flag0="0" V10="4" V11="8" V12="9" Flag1="0"/>
+	<Triangles2 V00="9" V01="3" V02="4" Flag0="0" V10="9" V11="10" V12="3" Flag1="0"/>
+	<Triangles2 V00="11" V01="12" V02="13" Flag0="0" V10="11" V11="13" V12="14" Flag1="0"/>
+	<Triangles2 V00="15" V01="14" V02="13" Flag0="0" V10="15" V11="16" V12="14" Flag1="0"/>
+	<Triangles2 V00="7" V01="17" V02="18" Flag0="0" V10="7" V11="18" V12="19" Flag1="0"/>
+	<Triangles2 V00="19" V01="18" V02="20" Flag0="0" V10="19" V11="20" V12="8" Flag1="0"/>
+	<Triangles2 V00="21" V01="22" V02="23" Flag0="0" V10="21" V11="23" V12="24" Flag1="0"/>
+	<Triangles2 V00="25" V01="24" V02="23" Flag0="0" V10="25" V11="26" V12="24" Flag1="0"/>
+	<Triangles2 V00="27" V01="21" V02="28" Flag0="0" V10="27" V11="28" V12="29" Flag1="0"/>
+	<Triangles2 V00="26" V01="29" V02="28" Flag0="0" V10="26" V11="30" V12="29" Flag1="0"/>
+	<Triangle1 V00="30" V01="31" V02="29"/>
+	<LoadVertices Path="objects/object_ocarina_c_left_button/gOcarinaCLeftButtonDL_vtx_1" VertexBufferIndex="0" VertexOffset="32" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="2" Flag1="0"/>
+	<Triangles2 V00="3" V01="5" V02="4" Flag0="0" V10="6" V11="7" V12="8" Flag1="0"/>
+	<Triangles2 V00="6" V01="8" V02="9" Flag0="0" V10="6" V11="9" V12="10" Flag1="0"/>
+	<Triangles2 V00="6" V01="10" V02="11" Flag0="0" V10="12" V11="3" V12="13" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="1" V11="14" V12="13" Flag1="0"/>
+	<Triangles2 V00="1" V01="15" V02="14" Flag0="0" V10="16" V11="17" V12="18" Flag1="0"/>
+	<Triangles2 V00="16" V01="18" V02="19" Flag0="0" V10="19" V11="18" V12="20" Flag1="0"/>
+	<Triangles2 V00="19" V01="20" V02="21" Flag0="0" V10="22" V11="23" V12="24" Flag1="0"/>
+	<Triangles2 V00="22" V01="24" V02="25" Flag0="0" V10="25" V11="24" V12="26" Flag1="0"/>
+	<Triangles2 V00="25" V01="26" V02="27" Flag0="0" V10="23" V11="28" V12="29" Flag1="0"/>
+	<Triangles2 V00="23" V01="29" V02="30" Flag0="0" V10="30" V11="29" V12="31" Flag1="0"/>
+	<Triangle1 V00="30" V01="31" V02="26"/>
+	<LoadVertices Path="objects/object_ocarina_c_left_button/gOcarinaCLeftButtonDL_vtx_1" VertexBufferIndex="0" VertexOffset="64" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="4" V11="6" V12="7" Flag1="0"/>
+	<Triangles2 V00="8" V01="4" V02="7" Flag0="0" V10="8" V11="7" V12="9" Flag1="0"/>
+	<Triangles2 V00="9" V01="10" V02="8" Flag0="0" V10="9" V11="11" V12="10" Flag1="0"/>
+	<Triangles2 V00="11" V01="12" V02="10" Flag0="0" V10="11" V11="13" V12="12" Flag1="0"/>
+	<Triangles2 V00="13" V01="14" V02="12" Flag0="0" V10="13" V11="15" V12="14" Flag1="0"/>
+	<Triangles2 V00="15" V01="16" V02="14" Flag0="0" V10="15" V11="17" V12="16" Flag1="0"/>
+	<Triangles2 V00="18" V01="19" V02="20" Flag0="0" V10="18" V11="20" V12="21" Flag1="0"/>
+	<Triangles2 V00="22" V01="18" V02="21" Flag0="0" V10="22" V11="21" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="22" V02="23" Flag0="0" V10="24" V11="23" V12="25" Flag1="0"/>
+	<Triangles2 V00="26" V01="24" V02="25" Flag0="0" V10="26" V11="25" V12="27" Flag1="0"/>
+	<Triangles2 V00="28" V01="26" V02="27" Flag0="0" V10="28" V11="27" V12="29" Flag1="0"/>
+	<Triangles2 V00="29" V01="30" V02="28" Flag0="0" V10="29" V11="6" V12="30" Flag1="0"/>
+	<Triangle1 V00="17" V01="20" V02="31"/>
+	<LoadVertices Path="objects/object_ocarina_c_left_button/gOcarinaCLeftButtonDL_vtx_1" VertexBufferIndex="0" VertexOffset="96" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="3" V01="5" V02="6" Flag0="0" V10="7" V11="8" V12="9" Flag1="0"/>
+	<Triangles2 V00="7" V01="9" V02="10" Flag0="0" V10="4" V11="11" V12="12" Flag1="0"/>
+	<Triangles2 V00="4" V01="12" V02="13" Flag0="0" V10="14" V11="15" V12="16" Flag1="0"/>
+	<Triangles2 V00="14" V01="16" V02="9" Flag0="0" V10="11" V11="17" V12="18" Flag1="0"/>
+	<Triangles2 V00="11" V01="18" V02="19" Flag0="0" V10="20" V11="21" V12="22" Flag1="0"/>
+	<Triangles2 V00="20" V01="22" V02="16" Flag0="0" V10="17" V11="23" V12="24" Flag1="0"/>
+	<Triangles2 V00="17" V01="24" V02="25" Flag0="0" V10="26" V11="27" V12="28" Flag1="0"/>
+	<Triangles2 V00="26" V01="28" V02="22" Flag0="0" V10="23" V11="29" V12="30" Flag1="0"/>
+	<Triangle1 V00="23" V01="30" V02="31"/>
+	<LoadVertices Path="objects/object_ocarina_c_left_button/gOcarinaCLeftButtonDL_vtx_1" VertexBufferIndex="0" VertexOffset="128" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="4" V11="6" V12="7" Flag1="0"/>
+	<Triangles2 V00="8" V01="9" V02="10" Flag0="0" V10="8" V11="10" V12="2" Flag1="0"/>
+	<Triangles2 V00="5" V01="11" V02="12" Flag0="0" V10="5" V11="12" V12="13" Flag1="0"/>
+	<Triangles2 V00="14" V01="15" V02="16" Flag0="0" V10="14" V11="16" V12="10" Flag1="0"/>
+	<Triangles2 V00="11" V01="17" V02="18" Flag0="0" V10="11" V11="18" V12="19" Flag1="0"/>
+	<Triangles2 V00="20" V01="21" V02="22" Flag0="0" V10="20" V11="22" V12="16" Flag1="0"/>
+	<Triangles2 V00="23" V01="24" V02="25" Flag0="0" V10="23" V11="25" V12="26" Flag1="0"/>
+	<Triangles2 V00="27" V01="28" V02="29" Flag0="0" V10="27" V11="29" V12="30" Flag1="0"/>
+	<Triangle1 V00="17" V01="29" V02="31"/>
+	<LoadVertices Path="objects/object_ocarina_c_left_button/gOcarinaCLeftButtonDL_vtx_1" VertexBufferIndex="0" VertexOffset="160" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="3" V01="5" V02="6" Flag0="0" V10="7" V11="8" V12="9" Flag1="0"/>
+	<Triangles2 V00="7" V01="9" V02="10" Flag0="0" V10="11" V11="12" V12="13" Flag1="0"/>
+	<Triangles2 V00="11" V01="13" V02="14" Flag0="0" V10="15" V11="16" V12="17" Flag1="0"/>
+	<Triangles2 V00="15" V01="17" V02="18" Flag0="0" V10="19" V11="20" V12="21" Flag1="0"/>
+	<Triangles2 V00="19" V01="21" V02="13" Flag0="0" V10="22" V11="23" V12="24" Flag1="0"/>
+	<Triangles2 V00="22" V01="24" V02="25" Flag0="0" V10="26" V11="27" V12="28" Flag1="0"/>
+	<Triangles2 V00="26" V01="28" V02="21" Flag0="0" V10="29" V11="30" V12="31" Flag1="0"/>
+	<LoadVertices Path="objects/object_ocarina_c_left_button/gOcarinaCLeftButtonDL_vtx_1" VertexBufferIndex="0" VertexOffset="192" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="3" V01="5" V02="6" Flag0="0" V10="7" V11="8" V12="9" Flag1="0"/>
+	<Triangles2 V00="7" V01="9" V02="10" Flag0="0" V10="11" V11="12" V12="13" Flag1="0"/>
+	<Triangles2 V00="11" V01="13" V02="5" Flag0="0" V10="14" V11="15" V12="16" Flag1="0"/>
+	<Triangles2 V00="14" V01="16" V02="17" Flag0="0" V10="18" V11="19" V12="20" Flag1="0"/>
+	<Triangles2 V00="18" V01="20" V02="13" Flag0="0" V10="21" V11="22" V12="23" Flag1="0"/>
+	<Triangles2 V00="21" V01="23" V02="24" Flag0="0" V10="25" V11="26" V12="27" Flag1="0"/>
+	<Triangles2 V00="25" V01="27" V02="20" Flag0="0" V10="28" V11="29" V12="30" Flag1="0"/>
+	<Triangle1 V00="28" V01="30" V02="31"/>
+	<LoadVertices Path="objects/object_ocarina_c_left_button/gOcarinaCLeftButtonDL_vtx_1" VertexBufferIndex="0" VertexOffset="224" Count="18"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="4" V11="6" V12="7" Flag1="0"/>
+	<Triangles2 V00="8" V01="9" V02="10" Flag0="0" V10="8" V11="10" V12="2" Flag1="0"/>
+	<Triangles2 V00="11" V01="10" V02="12" Flag0="0" V10="11" V11="12" V12="13" Flag1="0"/>
+	<Triangles2 V00="14" V01="15" V02="16" Flag0="0" V10="14" V11="16" V12="17" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_ocarina_c_left_button/gOcarinaCLeftButtonDL_vtx_0 b/soh/assets/custom/objects/object_ocarina_c_left_button/gOcarinaCLeftButtonDL_vtx_0
new file mode 100644
index 000000000..e84ec9046
--- /dev/null
+++ b/soh/assets/custom/objects/object_ocarina_c_left_button/gOcarinaCLeftButtonDL_vtx_0
@@ -0,0 +1,60 @@
+<Vertex Version="0">
+	<Vtx X="-23" Y="-6" Z="2" S="13" T="-487" R="204" G="179" B="86" A="255"/>
+	<Vtx X="-22" Y="0" Z="2" S="16" T="-480" R="0" G="0" B="127" A="255"/>
+	<Vtx X="-27" Y="-2" Z="2" S="15" T="-482" R="166" G="215" B="79" A="255"/>
+	<Vtx X="-23" Y="6" Z="2" S="-16" T="-487" R="204" G="77" B="86" A="255"/>
+	<Vtx X="-22" Y="0" Z="2" S="112" T="-288" R="0" G="0" B="127" A="255"/>
+	<Vtx X="18" Y="0" Z="2" S="112" T="-288" R="90" G="0" B="90" A="255"/>
+	<Vtx X="16" Y="19" Z="2" S="-16" T="-360" R="79" G="59" B="81" A="255"/>
+	<Vtx X="18" Y="13" Z="2" S="-16" T="-416" R="93" G="12" B="86" A="255"/>
+	<Vtx X="12" Y="22" Z="2" S="-7" T="-317" R="17" G="97" B="81" A="255"/>
+	<Vtx X="6" Y="20" Z="2" S="-16" T="-345" R="226" G="88" B="86" A="255"/>
+	<Vtx X="16" Y="-19" Z="2" S="204" T="-296" R="79" G="197" B="81" A="255"/>
+	<Vtx X="18" Y="-13" Z="2" S="176" T="-288" R="93" G="244" B="86" A="255"/>
+	<Vtx X="18" Y="0" Z="2" S="112" T="-480" R="90" G="0" B="90" A="255"/>
+	<Vtx X="12" Y="-22" Z="2" S="217" T="-317" R="17" G="159" B="81" A="255"/>
+	<Vtx X="-23" Y="-6" Z="2" S="141" T="-288" R="204" G="179" B="86" A="255"/>
+	<Vtx X="-22" Y="0" Z="2" S="112" T="-480" R="0" G="0" B="127" A="255"/>
+	<Vtx X="6" Y="-20" Z="2" S="211" T="-307" R="226" G="168" B="86" A="255"/>
+	<Vtx X="-27" Y="-2" Z="2" S="2" T="-508" R="166" G="215" B="79" A="255"/>
+	<Vtx X="-27" Y="2" Z="2" S="-16" T="-511" R="166" G="41" B="79" A="255"/>
+	<Vtx X="21" Y="-11" Z="5" S="-12" T="39" R="230" G="2" B="124" A="255"/>
+	<Vtx X="18" Y="-22" Z="5" S="-31" T="107" R="243" G="11" B="126" A="255"/>
+	<Vtx X="20" Y="-27" Z="5" S="-15" T="137" R="17" G="234" B="124" A="255"/>
+	<Vtx X="0" Y="-34" Z="5" S="-146" T="180" R="0" G="229" B="124" A="255"/>
+	<Vtx X="13" Y="-25" Z="5" S="-61" T="125" R="252" G="21" B="125" A="255"/>
+	<Vtx X="5" Y="-23" Z="5" S="-112" T="115" R="8" G="23" B="125" A="255"/>
+	<Vtx X="-33" Y="-9" Z="5" S="-352" T="26" R="226" G="249" B="123" A="255"/>
+	<Vtx X="-25" Y="-8" Z="5" S="-300" T="21" R="13" G="20" B="125" A="255"/>
+	<Vtx X="-30" Y="-4" Z="5" S="-332" T="-7" R="22" G="11" B="125" A="255"/>
+	<Vtx X="-30" Y="5" Z="5" S="-332" T="-61" R="14" G="248" B="126" A="255"/>
+	<Vtx X="-33" Y="8" Z="5" S="-352" T="-82" R="226" G="5" B="123" A="255"/>
+	<Vtx X="-19" Y="28" Z="5" S="-262" T="-206" R="242" G="22" B="124" A="255"/>
+	<Vtx X="-26" Y="8" Z="5" S="-309" T="-80" R="13" G="238" B="125" A="255"/>
+	<Vtx X="-19" Y="28" Z="5" S="-262" T="-206" R="242" G="22" B="124" A="255"/>
+	<Vtx X="-26" Y="8" Z="5" S="-309" T="-80" R="13" G="238" B="125" A="255"/>
+	<Vtx X="5" Y="23" Z="5" S="-112" T="-179" R="8" G="233" B="125" A="255"/>
+	<Vtx X="13" Y="25" Z="5" S="-65" T="-189" R="252" G="233" B="125" A="255"/>
+	<Vtx X="20" Y="27" Z="5" S="-19" T="-204" R="16" G="22" B="124" A="255"/>
+	<Vtx X="19" Y="21" Z="5" S="-25" T="-164" R="238" G="242" B="125" A="255"/>
+	<Vtx X="32" Y="10" Z="5" S="58" T="-98" R="27" G="8" B="124" A="255"/>
+	<Vtx X="21" Y="14" Z="5" S="-12" T="-118" R="232" G="253" B="125" A="255"/>
+	<Vtx X="21" Y="-11" Z="5" S="-12" T="39" R="230" G="2" B="124" A="255"/>
+	<Vtx X="21" Y="0" Z="5" S="-12" T="-32" R="232" G="0" B="125" A="255"/>
+	<Vtx X="20" Y="-27" Z="5" S="-15" T="137" R="17" G="234" B="124" A="255"/>
+	<Vtx X="32" Y="-11" Z="5" S="58" T="36" R="27" G="247" B="124" A="255"/>
+	<Vtx X="0" Y="34" Z="5" S="-144" T="-245" R="0" G="28" B="124" A="255"/>
+	<Vtx X="-33" Y="-9" Z="5" S="-352" T="26" R="226" G="249" B="123" A="255"/>
+	<Vtx X="-20" Y="-27" Z="5" S="-269" T="140" R="240" G="234" B="124" A="255"/>
+	<Vtx X="0" Y="-34" Z="5" S="-146" T="180" R="0" G="229" B="124" A="255"/>
+	<Vtx X="-32" Y="10" Z="-5" S="166" T="-98" R="229" G="8" B="132" A="255"/>
+	<Vtx X="-20" Y="27" Z="-5" S="243" T="-204" R="240" G="22" B="132" A="255"/>
+	<Vtx X="0" Y="34" Z="-5" S="368" T="-245" R="0" G="28" B="132" A="255"/>
+	<Vtx X="32" Y="10" Z="-5" S="570" T="-98" R="27" G="8" B="132" A="255"/>
+	<Vtx X="20" Y="27" Z="-5" S="493" T="-204" R="16" G="22" B="132" A="255"/>
+	<Vtx X="-20" Y="-27" Z="-5" S="243" T="140" R="240" G="234" B="132" A="255"/>
+	<Vtx X="20" Y="-27" Z="-5" S="493" T="140" R="16" G="234" B="132" A="255"/>
+	<Vtx X="32" Y="-10" Z="-5" S="570" T="34" R="27" G="248" B="132" A="255"/>
+	<Vtx X="0" Y="-34" Z="-5" S="368" T="181" R="0" G="228" B="132" A="255"/>
+	<Vtx X="-32" Y="-10" Z="-5" S="166" T="34" R="229" G="248" B="132" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_ocarina_c_left_button/gOcarinaCLeftButtonDL_vtx_1 b/soh/assets/custom/objects/object_ocarina_c_left_button/gOcarinaCLeftButtonDL_vtx_1
new file mode 100644
index 000000000..fd2bf7af9
--- /dev/null
+++ b/soh/assets/custom/objects/object_ocarina_c_left_button/gOcarinaCLeftButtonDL_vtx_1
@@ -0,0 +1,244 @@
+<Vertex Version="0">
+	<Vtx X="-27" Y="2" Z="2" S="-135" T="-239" R="13" G="9" B="126" A="255"/>
+	<Vtx X="-27" Y="2" Z="2" S="-145" T="-239" R="166" G="41" B="79" A="255"/>
+	<Vtx X="-23" Y="6" Z="2" S="-145" T="-215" R="204" G="77" B="86" A="255"/>
+	<Vtx X="-23" Y="6" Z="2" S="-135" T="-215" R="243" G="11" B="126" A="255"/>
+	<Vtx X="6" Y="20" Z="2" S="-135" T="-74" R="252" G="13" B="126" A="255"/>
+	<Vtx X="6" Y="20" Z="2" S="-145" T="-74" R="226" G="88" B="86" A="255"/>
+	<Vtx X="12" Y="22" Z="2" S="-135" T="-49" R="0" G="253" B="127" A="255"/>
+	<Vtx X="12" Y="22" Z="2" S="-145" T="-49" R="17" G="97" B="81" A="255"/>
+	<Vtx X="12" Y="23" Z="4" S="-245" T="-49" R="242" G="177" B="98" A="255"/>
+	<Vtx X="6" Y="21" Z="4" S="-245" T="-74" R="28" G="173" B="92" A="255"/>
+	<Vtx X="-24" Y="6" Z="4" S="-245" T="-215" R="47" G="185" B="94" A="255"/>
+	<Vtx X="18" Y="-13" Z="2" S="47" T="-17" R="93" G="244" B="86" A="255"/>
+	<Vtx X="16" Y="-19" Z="2" S="111" T="-17" R="79" G="197" B="81" A="255"/>
+	<Vtx X="16" Y="-19" Z="2" S="111" T="-26" R="244" G="247" B="126" A="255"/>
+	<Vtx X="18" Y="-13" Z="2" S="47" T="-26" R="12" G="7" B="126" A="255"/>
+	<Vtx X="17" Y="-20" Z="4" S="111" T="84" R="188" G="48" B="96" A="255"/>
+	<Vtx X="19" Y="-13" Z="4" S="47" T="84" R="165" G="12" B="88" A="255"/>
+	<Vtx X="16" Y="19" Z="2" S="-145" T="-17" R="79" G="59" B="81" A="255"/>
+	<Vtx X="16" Y="19" Z="2" S="-135" T="-17" R="254" G="254" B="127" A="255"/>
+	<Vtx X="12" Y="22" Z="2" S="-135" T="-49" R="0" G="253" B="127" A="255"/>
+	<Vtx X="17" Y="20" Z="4" S="-245" T="-17" R="191" G="208" B="98" A="255"/>
+	<Vtx X="-23" Y="-6" Z="2" S="111" T="-215" R="204" G="179" B="86" A="255"/>
+	<Vtx X="-27" Y="-2" Z="2" S="111" T="-273" R="166" G="215" B="79" A="255"/>
+	<Vtx X="-27" Y="-2" Z="2" S="102" T="-273" R="12" G="253" B="126" A="255"/>
+	<Vtx X="-23" Y="-6" Z="2" S="102" T="-215" R="248" G="244" B="126" A="255"/>
+	<Vtx X="-28" Y="-3" Z="4" S="212" T="-273" R="76" G="33" B="96" A="255"/>
+	<Vtx X="-24" Y="-7" Z="4" S="212" T="-215" R="48" G="73" B="92" A="255"/>
+	<Vtx X="6" Y="-20" Z="2" S="111" T="-74" R="226" G="168" B="86" A="255"/>
+	<Vtx X="-23" Y="-6" Z="2" S="102" T="-215" R="248" G="244" B="126" A="255"/>
+	<Vtx X="6" Y="-20" Z="2" S="102" T="-74" R="252" G="243" B="126" A="255"/>
+	<Vtx X="6" Y="-21" Z="4" S="212" T="-74" R="28" G="83" B="92" A="255"/>
+	<Vtx X="12" Y="-22" Z="2" S="102" T="-49" R="5" G="2" B="127" A="255"/>
+	<Vtx X="6" Y="-21" Z="4" S="212" T="-74" R="28" G="83" B="92" A="255"/>
+	<Vtx X="12" Y="-23" Z="4" S="212" T="-49" R="243" G="77" B="100" A="255"/>
+	<Vtx X="12" Y="-22" Z="2" S="102" T="-49" R="5" G="2" B="127" A="255"/>
+	<Vtx X="12" Y="-22" Z="2" S="111" T="-49" R="17" G="159" B="81" A="255"/>
+	<Vtx X="6" Y="-20" Z="2" S="102" T="-74" R="252" G="243" B="126" A="255"/>
+	<Vtx X="6" Y="-20" Z="2" S="111" T="-74" R="226" G="168" B="86" A="255"/>
+	<Vtx X="-27" Y="-2" Z="2" S="-135" T="-236" R="12" G="253" B="126" A="255"/>
+	<Vtx X="-27" Y="-2" Z="2" S="-145" T="-239" R="166" G="215" B="79" A="255"/>
+	<Vtx X="-27" Y="2" Z="2" S="-145" T="-239" R="166" G="41" B="79" A="255"/>
+	<Vtx X="-27" Y="2" Z="2" S="-135" T="-236" R="13" G="9" B="126" A="255"/>
+	<Vtx X="-28" Y="3" Z="4" S="-245" T="-273" R="75" G="225" B="98" A="255"/>
+	<Vtx X="-28" Y="-3" Z="4" S="-245" T="-273" R="76" G="33" B="96" A="255"/>
+	<Vtx X="16" Y="-19" Z="2" S="111" T="-17" R="79" G="197" B="81" A="255"/>
+	<Vtx X="12" Y="-22" Z="2" S="102" T="-49" R="5" G="2" B="127" A="255"/>
+	<Vtx X="16" Y="-19" Z="2" S="102" T="-17" R="244" G="247" B="126" A="255"/>
+	<Vtx X="17" Y="-20" Z="4" S="212" T="-17" R="188" G="48" B="96" A="255"/>
+	<Vtx X="18" Y="0" Z="2" S="-17" T="-17" R="90" G="0" B="90" A="255"/>
+	<Vtx X="18" Y="-13" Z="2" S="-17" T="-17" R="93" G="244" B="86" A="255"/>
+	<Vtx X="18" Y="-13" Z="2" S="-17" T="-26" R="12" G="7" B="126" A="255"/>
+	<Vtx X="18" Y="0" Z="2" S="-17" T="-26" R="24" G="0" B="125" A="255"/>
+	<Vtx X="19" Y="-13" Z="4" S="-17" T="84" R="165" G="12" B="88" A="255"/>
+	<Vtx X="19" Y="0" Z="4" S="-17" T="84" R="166" G="0" B="90" A="255"/>
+	<Vtx X="16" Y="19" Z="2" S="-145" T="-17" R="79" G="59" B="81" A="255"/>
+	<Vtx X="18" Y="13" Z="2" S="-81" T="-17" R="93" G="12" B="86" A="255"/>
+	<Vtx X="18" Y="13" Z="2" S="-81" T="-26" R="14" G="1" B="126" A="255"/>
+	<Vtx X="16" Y="19" Z="2" S="-145" T="-26" R="254" G="254" B="127" A="255"/>
+	<Vtx X="19" Y="13" Z="4" S="-81" T="84" R="169" G="245" B="92" A="255"/>
+	<Vtx X="17" Y="20" Z="4" S="-145" T="84" R="191" G="208" B="98" A="255"/>
+	<Vtx X="18" Y="0" Z="2" S="-81" T="-17" R="90" G="0" B="90" A="255"/>
+	<Vtx X="18" Y="0" Z="2" S="-81" T="-26" R="24" G="0" B="125" A="255"/>
+	<Vtx X="18" Y="13" Z="2" S="-81" T="-26" R="14" G="1" B="126" A="255"/>
+	<Vtx X="19" Y="0" Z="4" S="-81" T="84" R="166" G="0" B="90" A="255"/>
+	<Vtx X="-27" Y="2" Z="2" S="-135" T="-239" R="13" G="9" B="126" A="255"/>
+	<Vtx X="-23" Y="6" Z="2" S="-135" T="-215" R="243" G="11" B="126" A="255"/>
+	<Vtx X="-24" Y="6" Z="4" S="-245" T="-217" R="47" G="185" B="94" A="255"/>
+	<Vtx X="-28" Y="3" Z="4" S="-245" T="-239" R="75" G="225" B="98" A="255"/>
+	<Vtx X="-28" Y="3" Z="4" S="-445" T="226" R="75" G="225" B="98" A="255"/>
+	<Vtx X="-24" Y="6" Z="4" S="-420" T="204" R="47" G="185" B="94" A="255"/>
+	<Vtx X="-26" Y="8" Z="5" S="-438" T="191" R="13" G="238" B="125" A="255"/>
+	<Vtx X="-30" Y="5" Z="5" S="-460" T="210" R="14" G="248" B="126" A="255"/>
+	<Vtx X="-28" Y="-3" Z="4" S="-445" T="253" R="76" G="33" B="96" A="255"/>
+	<Vtx X="-30" Y="-4" Z="5" S="-460" T="265" R="22" G="11" B="125" A="255"/>
+	<Vtx X="-24" Y="-7" Z="4" S="-418" T="277" R="48" G="73" B="92" A="255"/>
+	<Vtx X="-25" Y="-8" Z="5" S="-429" T="293" R="13" G="20" B="125" A="255"/>
+	<Vtx X="6" Y="-21" Z="4" S="-234" T="369" R="28" G="83" B="92" A="255"/>
+	<Vtx X="5" Y="-23" Z="5" S="-240" T="387" R="8" G="23" B="125" A="255"/>
+	<Vtx X="12" Y="-23" Z="4" S="-197" T="376" R="243" G="77" B="100" A="255"/>
+	<Vtx X="13" Y="-25" Z="5" S="-189" T="397" R="252" G="21" B="125" A="255"/>
+	<Vtx X="17" Y="-20" Z="4" S="-170" T="360" R="188" G="48" B="96" A="255"/>
+	<Vtx X="18" Y="-22" Z="5" S="-159" T="379" R="243" G="11" B="126" A="255"/>
+	<Vtx X="19" Y="0" Z="4" S="-160" T="239" R="166" G="0" B="90" A="255"/>
+	<Vtx X="19" Y="-13" Z="4" S="-160" T="319" R="165" G="12" B="88" A="255"/>
+	<Vtx X="21" Y="-11" Z="5" S="-141" T="310" R="230" G="2" B="124" A="255"/>
+	<Vtx X="21" Y="0" Z="5" S="-141" T="239" R="232" G="0" B="125" A="255"/>
+	<Vtx X="19" Y="13" Z="4" S="-160" T="156" R="169" G="245" B="92" A="255"/>
+	<Vtx X="21" Y="14" Z="5" S="-141" T="154" R="232" G="253" B="125" A="255"/>
+	<Vtx X="17" Y="20" Z="4" S="-170" T="120" R="191" G="208" B="98" A="255"/>
+	<Vtx X="19" Y="21" Z="5" S="-153" T="108" R="238" G="242" B="125" A="255"/>
+	<Vtx X="12" Y="23" Z="4" S="-197" T="103" R="242" G="177" B="98" A="255"/>
+	<Vtx X="13" Y="25" Z="5" S="-193" T="83" R="252" G="233" B="125" A="255"/>
+	<Vtx X="6" Y="21" Z="4" S="-234" T="110" R="28" G="173" B="92" A="255"/>
+	<Vtx X="5" Y="23" Z="5" S="-240" T="92" R="8" G="233" B="125" A="255"/>
+	<Vtx X="-24" Y="6" Z="4" S="-418" T="202" R="47" G="185" B="94" A="255"/>
+	<Vtx X="19" Y="-13" Z="4" S="-160" T="323" R="165" G="12" B="88" A="255"/>
+	<Vtx X="18" Y="-22" Z="5" S="-159" T="379" R="243" G="11" B="126" A="255"/>
+	<Vtx X="19" Y="-13" Z="4" S="-160" T="323" R="165" G="12" B="88" A="255"/>
+	<Vtx X="17" Y="-20" Z="4" S="-170" T="359" R="188" G="48" B="96" A="255"/>
+	<Vtx X="0" Y="34" Z="5" S="-273" T="27" R="0" G="28" B="124" A="255"/>
+	<Vtx X="20" Y="27" Z="5" S="-148" T="67" R="16" G="22" B="124" A="255"/>
+	<Vtx X="22" Y="30" Z="4" S="-131" T="40" R="54" G="75" B="87" A="255"/>
+	<Vtx X="0" Y="37" Z="4" S="-270" T="-5" R="0" G="93" B="87" A="255"/>
+	<Vtx X="0" Y="37" Z="4" S="493" T="-529" R="0" G="93" B="87" A="255"/>
+	<Vtx X="22" Y="30" Z="4" S="395" T="-529" R="54" G="75" B="87" A="255"/>
+	<Vtx X="23" Y="32" Z="0" S="393" T="-273" R="75" G="103" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="0" S="495" T="-273" R="0" G="127" B="0" A="255"/>
+	<Vtx X="32" Y="10" Z="5" S="-70" T="174" R="27" G="8" B="124" A="255"/>
+	<Vtx X="36" Y="12" Z="4" S="-41" T="161" R="88" G="28" B="87" A="255"/>
+	<Vtx X="22" Y="30" Z="4" S="-126" T="43" R="54" G="75" B="87" A="255"/>
+	<Vtx X="22" Y="30" Z="4" S="391" T="-529" R="54" G="75" B="87" A="255"/>
+	<Vtx X="36" Y="12" Z="4" S="293" T="-529" R="88" G="28" B="87" A="255"/>
+	<Vtx X="37" Y="12" Z="0" S="291" T="-273" R="121" G="39" B="0" A="255"/>
+	<Vtx X="32" Y="-11" Z="5" S="-70" T="308" R="27" G="247" B="124" A="255"/>
+	<Vtx X="36" Y="-12" Z="4" S="-39" T="313" R="89" G="227" B="86" A="255"/>
+	<Vtx X="36" Y="12" Z="4" S="-39" T="167" R="88" G="28" B="87" A="255"/>
+	<Vtx X="36" Y="12" Z="4" S="289" T="-529" R="88" G="28" B="87" A="255"/>
+	<Vtx X="36" Y="-12" Z="4" S="190" T="-529" R="89" G="227" B="86" A="255"/>
+	<Vtx X="37" Y="-12" Z="0" S="188" T="-273" R="121" G="217" B="0" A="255"/>
+	<Vtx X="20" Y="-27" Z="5" S="-144" T="409" R="17" G="234" B="124" A="255"/>
+	<Vtx X="22" Y="-30" Z="4" S="-126" T="435" R="55" G="181" B="87" A="255"/>
+	<Vtx X="36" Y="-12" Z="4" S="-41" T="318" R="89" G="227" B="86" A="255"/>
+	<Vtx X="36" Y="-12" Z="4" S="186" T="-529" R="89" G="227" B="86" A="255"/>
+	<Vtx X="22" Y="-30" Z="4" S="89" T="-529" R="55" G="181" B="87" A="255"/>
+	<Vtx X="23" Y="-32" Z="0" S="86" T="-273" R="74" G="153" B="0" A="255"/>
+	<Vtx X="0" Y="-34" Z="5" S="-275" T="451" R="0" G="229" B="124" A="255"/>
+	<Vtx X="0" Y="-37" Z="4" S="-270" T="484" R="0" G="164" B="88" A="255"/>
+	<Vtx X="22" Y="-30" Z="4" S="-130" T="439" R="55" G="181" B="87" A="255"/>
+	<Vtx X="22" Y="-30" Z="4" S="85" T="-529" R="55" G="181" B="87" A="255"/>
+	<Vtx X="0" Y="-37" Z="4" S="-15" T="-529" R="0" G="164" B="88" A="255"/>
+	<Vtx X="0" Y="-39" Z="0" S="-17" T="-273" R="0" G="129" B="0" A="255"/>
+	<Vtx X="23" Y="-32" Z="0" S="86" T="-273" R="74" G="153" B="0" A="255"/>
+	<Vtx X="0" Y="-34" Z="5" S="-275" T="451" R="0" G="229" B="124" A="255"/>
+	<Vtx X="-20" Y="-27" Z="5" S="-397" T="412" R="240" G="234" B="124" A="255"/>
+	<Vtx X="-22" Y="-30" Z="4" S="-414" T="439" R="202" G="181" B="87" A="255"/>
+	<Vtx X="0" Y="-37" Z="4" S="-276" T="484" R="0" G="164" B="88" A="255"/>
+	<Vtx X="0" Y="-37" Z="4" S="-19" T="-529" R="0" G="164" B="88" A="255"/>
+	<Vtx X="-22" Y="-30" Z="4" S="-117" T="-529" R="202" G="181" B="87" A="255"/>
+	<Vtx X="-23" Y="-32" Z="0" S="-119" T="-273" R="181" G="153" B="0" A="255"/>
+	<Vtx X="-33" Y="-9" Z="5" S="-481" T="297" R="226" G="249" B="123" A="255"/>
+	<Vtx X="-36" Y="-11" Z="4" S="-506" T="315" R="165" G="227" B="84" A="255"/>
+	<Vtx X="-22" Y="-30" Z="4" S="-419" T="436" R="202" G="181" B="87" A="255"/>
+	<Vtx X="-22" Y="-30" Z="4" S="-121" T="-529" R="202" G="181" B="87" A="255"/>
+	<Vtx X="-36" Y="-11" Z="4" S="-221" T="-529" R="165" G="227" B="84" A="255"/>
+	<Vtx X="-37" Y="-12" Z="0" S="-221" T="-273" R="135" G="216" B="255" A="255"/>
+	<Vtx X="-33" Y="8" Z="5" S="-481" T="189" R="226" G="5" B="123" A="255"/>
+	<Vtx X="-36" Y="11" Z="4" S="-506" T="171" R="166" G="27" B="86" A="255"/>
+	<Vtx X="-36" Y="-11" Z="4" S="-506" T="310" R="165" G="227" B="84" A="255"/>
+	<Vtx X="-36" Y="-11" Z="4" S="-225" T="-529" R="165" G="227" B="84" A="255"/>
+	<Vtx X="-36" Y="11" Z="4" S="-319" T="-529" R="166" G="27" B="86" A="255"/>
+	<Vtx X="-37" Y="12" Z="0" S="-324" T="-273" R="136" G="41" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="0" S="-529" T="-273" R="0" G="127" B="0" A="255"/>
+	<Vtx X="-23" Y="32" Z="0" S="-426" T="-273" R="181" G="103" B="1" A="255"/>
+	<Vtx X="-22" Y="30" Z="4" S="-430" T="-529" R="203" G="74" B="89" A="255"/>
+	<Vtx X="0" Y="37" Z="4" S="-526" T="-529" R="0" G="93" B="87" A="255"/>
+	<Vtx X="0" Y="37" Z="4" S="-275" T="-5" R="0" G="93" B="87" A="255"/>
+	<Vtx X="-22" Y="30" Z="4" S="-412" T="39" R="203" G="74" B="89" A="255"/>
+	<Vtx X="-19" Y="28" Z="5" S="-391" T="65" R="242" G="22" B="124" A="255"/>
+	<Vtx X="0" Y="34" Z="5" S="-273" T="27" R="0" G="28" B="124" A="255"/>
+	<Vtx X="-22" Y="30" Z="4" S="-418" T="42" R="203" G="74" B="89" A="255"/>
+	<Vtx X="-33" Y="8" Z="5" S="-481" T="189" R="226" G="5" B="123" A="255"/>
+	<Vtx X="-22" Y="30" Z="4" S="-418" T="42" R="203" G="74" B="89" A="255"/>
+	<Vtx X="-36" Y="11" Z="4" S="-506" T="164" R="166" G="27" B="86" A="255"/>
+	<Vtx X="-36" Y="11" Z="4" S="-324" T="-529" R="166" G="27" B="86" A="255"/>
+	<Vtx X="-22" Y="30" Z="4" S="-425" T="-529" R="203" G="74" B="89" A="255"/>
+	<Vtx X="-23" Y="32" Z="0" S="-426" T="-273" R="181" G="103" B="1" A="255"/>
+	<Vtx X="-37" Y="12" Z="0" S="-324" T="-273" R="136" G="41" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="0" S="495" T="-273" R="0" G="127" B="0" A="255"/>
+	<Vtx X="23" Y="32" Z="0" S="393" T="-273" R="75" G="103" B="0" A="255"/>
+	<Vtx X="22" Y="30" Z="-4" S="395" T="-17" R="54" G="75" B="169" A="255"/>
+	<Vtx X="0" Y="37" Z="-4" S="493" T="-17" R="0" G="93" B="169" A="255"/>
+	<Vtx X="0" Y="37" Z="-4" S="242" T="-5" R="0" G="93" B="169" A="255"/>
+	<Vtx X="22" Y="30" Z="-4" S="381" T="40" R="54" G="75" B="169" A="255"/>
+	<Vtx X="20" Y="27" Z="-5" S="364" T="67" R="16" G="22" B="132" A="255"/>
+	<Vtx X="0" Y="34" Z="-5" S="239" T="27" R="0" G="28" B="132" A="255"/>
+	<Vtx X="23" Y="32" Z="0" S="393" T="-273" R="75" G="103" B="0" A="255"/>
+	<Vtx X="37" Y="12" Z="0" S="291" T="-273" R="121" G="39" B="0" A="255"/>
+	<Vtx X="36" Y="12" Z="-4" S="293" T="-17" R="88" G="28" B="169" A="255"/>
+	<Vtx X="22" Y="30" Z="-4" S="391" T="-17" R="54" G="75" B="169" A="255"/>
+	<Vtx X="22" Y="30" Z="-4" S="386" T="43" R="54" G="75" B="169" A="255"/>
+	<Vtx X="36" Y="12" Z="-4" S="471" T="161" R="88" G="28" B="169" A="255"/>
+	<Vtx X="32" Y="10" Z="-5" S="442" T="174" R="27" G="8" B="132" A="255"/>
+	<Vtx X="37" Y="12" Z="0" S="291" T="-273" R="121" G="39" B="0" A="255"/>
+	<Vtx X="37" Y="-12" Z="0" S="188" T="-273" R="121" G="217" B="0" A="255"/>
+	<Vtx X="36" Y="-12" Z="-4" S="190" T="-17" R="88" G="228" B="169" A="255"/>
+	<Vtx X="36" Y="12" Z="-4" S="289" T="-17" R="88" G="28" B="169" A="255"/>
+	<Vtx X="36" Y="12" Z="-4" S="473" T="167" R="88" G="28" B="169" A="255"/>
+	<Vtx X="36" Y="-12" Z="-4" S="473" T="312" R="88" G="228" B="169" A="255"/>
+	<Vtx X="32" Y="-10" Z="-5" S="442" T="305" R="27" G="248" B="132" A="255"/>
+	<Vtx X="37" Y="-12" Z="0" S="188" T="-273" R="121" G="217" B="0" A="255"/>
+	<Vtx X="23" Y="-32" Z="0" S="86" T="-273" R="74" G="153" B="0" A="255"/>
+	<Vtx X="22" Y="-30" Z="-4" S="88" T="-17" R="54" G="181" B="169" A="255"/>
+	<Vtx X="37" Y="-12" Z="0" S="188" T="-273" R="121" G="217" B="0" A="255"/>
+	<Vtx X="22" Y="-30" Z="-4" S="88" T="-17" R="54" G="181" B="169" A="255"/>
+	<Vtx X="36" Y="-12" Z="-4" S="186" T="-17" R="88" G="228" B="169" A="255"/>
+	<Vtx X="36" Y="-12" Z="-4" S="471" T="318" R="88" G="228" B="169" A="255"/>
+	<Vtx X="22" Y="-30" Z="-4" S="386" T="436" R="54" G="181" B="169" A="255"/>
+	<Vtx X="20" Y="-27" Z="-5" S="364" T="412" R="16" G="234" B="132" A="255"/>
+	<Vtx X="32" Y="-10" Z="-5" S="442" T="305" R="27" G="248" B="132" A="255"/>
+	<Vtx X="23" Y="-32" Z="0" S="86" T="-273" R="74" G="153" B="0" A="255"/>
+	<Vtx X="0" Y="-39" Z="0" S="-17" T="-273" R="0" G="129" B="0" A="255"/>
+	<Vtx X="0" Y="-37" Z="-4" S="-14" T="-17" R="0" G="163" B="169" A="255"/>
+	<Vtx X="22" Y="-30" Z="-4" S="84" T="-17" R="54" G="181" B="169" A="255"/>
+	<Vtx X="22" Y="-30" Z="-4" S="381" T="439" R="54" G="181" B="169" A="255"/>
+	<Vtx X="0" Y="-37" Z="-4" S="242" T="484" R="0" G="163" B="169" A="255"/>
+	<Vtx X="0" Y="-34" Z="-5" S="239" T="452" R="0" G="228" B="132" A="255"/>
+	<Vtx X="0" Y="-39" Z="0" S="-17" T="-273" R="0" G="129" B="0" A="255"/>
+	<Vtx X="-23" Y="-32" Z="0" S="-119" T="-273" R="181" G="153" B="0" A="255"/>
+	<Vtx X="-22" Y="-30" Z="-4" S="-117" T="-17" R="202" G="181" B="169" A="255"/>
+	<Vtx X="0" Y="-37" Z="-4" S="-19" T="-17" R="0" G="163" B="169" A="255"/>
+	<Vtx X="0" Y="-37" Z="-4" S="237" T="484" R="0" G="163" B="169" A="255"/>
+	<Vtx X="-22" Y="-30" Z="-4" S="98" T="439" R="202" G="181" B="169" A="255"/>
+	<Vtx X="-20" Y="-27" Z="-5" S="115" T="412" R="240" G="234" B="132" A="255"/>
+	<Vtx X="-23" Y="-32" Z="0" S="-119" T="-273" R="181" G="153" B="0" A="255"/>
+	<Vtx X="-37" Y="-12" Z="0" S="-221" T="-273" R="135" G="216" B="255" A="255"/>
+	<Vtx X="-36" Y="-12" Z="-4" S="-219" T="-17" R="168" G="228" B="169" A="255"/>
+	<Vtx X="-22" Y="-30" Z="-4" S="-121" T="-17" R="202" G="181" B="169" A="255"/>
+	<Vtx X="-22" Y="-30" Z="-4" S="93" T="436" R="202" G="181" B="169" A="255"/>
+	<Vtx X="-36" Y="-12" Z="-4" S="8" T="318" R="168" G="228" B="169" A="255"/>
+	<Vtx X="-32" Y="-10" Z="-5" S="37" T="305" R="229" G="248" B="132" A="255"/>
+	<Vtx X="-37" Y="-12" Z="0" S="-221" T="-273" R="135" G="216" B="255" A="255"/>
+	<Vtx X="-37" Y="12" Z="0" S="-324" T="-273" R="136" G="41" B="0" A="255"/>
+	<Vtx X="-36" Y="12" Z="-4" S="-322" T="-17" R="168" G="28" B="169" A="255"/>
+	<Vtx X="-36" Y="-12" Z="-4" S="-223" T="-17" R="168" G="228" B="169" A="255"/>
+	<Vtx X="-36" Y="-12" Z="-4" S="6" T="312" R="168" G="228" B="169" A="255"/>
+	<Vtx X="-36" Y="12" Z="-4" S="6" T="167" R="168" G="28" B="169" A="255"/>
+	<Vtx X="-32" Y="10" Z="-5" S="37" T="174" R="229" G="8" B="132" A="255"/>
+	<Vtx X="-32" Y="-10" Z="-5" S="37" T="305" R="229" G="248" B="132" A="255"/>
+	<Vtx X="-37" Y="12" Z="0" S="-324" T="-273" R="136" G="41" B="0" A="255"/>
+	<Vtx X="-23" Y="32" Z="0" S="-426" T="-273" R="181" G="103" B="1" A="255"/>
+	<Vtx X="-22" Y="30" Z="-4" S="-424" T="-17" R="202" G="75" B="169" A="255"/>
+	<Vtx X="-36" Y="12" Z="-4" S="-326" T="-17" R="168" G="28" B="169" A="255"/>
+	<Vtx X="-36" Y="12" Z="-4" S="8" T="161" R="168" G="28" B="169" A="255"/>
+	<Vtx X="-22" Y="30" Z="-4" S="93" T="43" R="202" G="75" B="169" A="255"/>
+	<Vtx X="-20" Y="27" Z="-5" S="115" T="67" R="240" G="22" B="132" A="255"/>
+	<Vtx X="0" Y="34" Z="-5" S="239" T="27" R="0" G="28" B="132" A="255"/>
+	<Vtx X="-22" Y="30" Z="-4" S="98" T="40" R="202" G="75" B="169" A="255"/>
+	<Vtx X="0" Y="37" Z="-4" S="237" T="-5" R="0" G="93" B="169" A="255"/>
+	<Vtx X="0" Y="37" Z="-4" S="-526" T="-17" R="0" G="93" B="169" A="255"/>
+	<Vtx X="-22" Y="30" Z="-4" S="-428" T="-17" R="202" G="75" B="169" A="255"/>
+	<Vtx X="-23" Y="32" Z="0" S="-426" T="-273" R="181" G="103" B="1" A="255"/>
+	<Vtx X="0" Y="39" Z="0" S="-529" T="-273" R="0" G="127" B="0" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_ocarina_c_left_button/gOcarinaCLeftButtonDL_vtx_cull b/soh/assets/custom/objects/object_ocarina_c_left_button/gOcarinaCLeftButtonDL_vtx_cull
new file mode 100644
index 000000000..38adb91be
--- /dev/null
+++ b/soh/assets/custom/objects/object_ocarina_c_left_button/gOcarinaCLeftButtonDL_vtx_cull
@@ -0,0 +1,10 @@
+<Vertex Version="0">
+	<Vtx X="-37" Y="-39" Z="-5" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-37" Y="-39" Z="5" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-37" Y="39" Z="5" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-37" Y="39" Z="-5" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="37" Y="-39" Z="-5" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="37" Y="-39" Z="5" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="37" Y="39" Z="5" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="37" Y="39" Z="-5" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_ocarina_c_left_button/mat_gOcarinaCLeftButtonDL_f3dlite_ocarina_C_button_edge b/soh/assets/custom/objects/object_ocarina_c_left_button/mat_gOcarinaCLeftButtonDL_f3dlite_ocarina_C_button_edge
new file mode 100644
index 000000000..5bef84867
--- /dev/null
+++ b/soh/assets/custom/objects/object_ocarina_c_left_button/mat_gOcarinaCLeftButtonDL_f3dlite_ocarina_C_button_edge
@@ -0,0 +1,21 @@
+<DisplayList Version="0">
+	<PipeSync/>
+	<SetCombineLERP A0="G_CCMUX_TEXEL0" B0="G_CCMUX_0" C0="G_CCMUX_SHADE" D0="G_CCMUX_0" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_1" A1="G_CCMUX_COMBINED" B1="G_CCMUX_0" C1="G_CCMUX_PRIMITIVE" D1="G_CCMUX_0" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_COMBINED"/>
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="1" G_CULL_BACK="1" G_FOG="1" G_LIGHTING="1" G_TEXTURE_GEN="1" G_SHADING_SMOOTH="1"  />
+
+	<SetOtherMode Cmd="G_SETOTHERMODE_H" Sft="4" Length="20" G_AD_NOISE="1" G_CD_MAGICSQ="1" G_CK_NONE="1" G_TC_FILT="1" G_TF_BILERP="1" G_TL_TILE="1" G_TD_CLAMP="1" G_TP_PERSP="1" G_CYC_2CYCLE="1" G_PM_NPRIMITIVE="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_L" Sft="0" Length="32" G_AC_NONE="1" G_ZS_PIXEL="1" G_RM_FOG_SHADE_A="1" G_RM_AA_ZB_OPA_SURF2="1" />
+	<Texture S="1984" T="1984" Level="0" Tile="0" On="1"/>
+	<SetTextureLUT Mode="G_TT_NONE"/>
+	<TileSync/>
+	<SetTextureImage Path="objects/object_ocarina_c_left_button/noise_tex" Format="G_IM_FMT_I" Size="G_IM_SIZ_8b_LOAD_BLOCK" Width="1"/>
+	<SetTile Format="G_IM_FMT_I" Size="G_IM_SIZ_8b_LOAD_BLOCK" Line="0" TMem="0" Tile="7" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="511" Dxt="512"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_I" Size="G_IM_SIZ_8b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="124" Lrt="124"/>
+	<SetPrimColor M="0" L="0" R="255" G="160" B="0" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_ocarina_c_left_button/mat_gOcarinaCLeftButtonDL_f3dlite_ocarina_C_button_surface b/soh/assets/custom/objects/object_ocarina_c_left_button/mat_gOcarinaCLeftButtonDL_f3dlite_ocarina_C_button_surface
new file mode 100644
index 000000000..2d1b57f5b
--- /dev/null
+++ b/soh/assets/custom/objects/object_ocarina_c_left_button/mat_gOcarinaCLeftButtonDL_f3dlite_ocarina_C_button_surface
@@ -0,0 +1,21 @@
+<DisplayList Version="0">
+	<PipeSync/>
+	<SetCombineLERP A0="G_CCMUX_TEXEL0" B0="G_CCMUX_0" C0="G_CCMUX_SHADE" D0="G_CCMUX_0" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_1" A1="G_CCMUX_COMBINED" B1="G_CCMUX_0" C1="G_CCMUX_PRIMITIVE" D1="G_CCMUX_0" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_COMBINED"/>
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="1" G_CULL_BACK="1" G_FOG="1" G_LIGHTING="1" G_TEXTURE_GEN="1" G_SHADING_SMOOTH="1"  />
+
+	<SetOtherMode Cmd="G_SETOTHERMODE_H" Sft="4" Length="20" G_AD_NOISE="1" G_CD_MAGICSQ="1" G_CK_NONE="1" G_TC_FILT="1" G_TF_BILERP="1" G_TL_TILE="1" G_TD_CLAMP="1" G_TP_PERSP="1" G_CYC_2CYCLE="1" G_PM_NPRIMITIVE="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_L" Sft="0" Length="32" G_AC_NONE="1" G_ZS_PIXEL="1" G_RM_FOG_SHADE_A="1" G_RM_AA_ZB_OPA_SURF2="1" />
+	<Texture S="2621" T="1311" Level="0" Tile="0" On="1"/>
+	<SetTextureLUT Mode="G_TT_NONE"/>
+	<TileSync/>
+	<SetTextureImage Path="objects/object_ocarina_c_left_button/noise_tex" Format="G_IM_FMT_I" Size="G_IM_SIZ_8b_LOAD_BLOCK" Width="1"/>
+	<SetTile Format="G_IM_FMT_I" Size="G_IM_SIZ_8b_LOAD_BLOCK" Line="0" TMem="0" Tile="7" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="511" Dxt="512"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_I" Size="G_IM_SIZ_8b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="124" Lrt="124"/>
+	<SetPrimColor M="0" L="0" R="170" G="107" B="0" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_ocarina_c_left_button/noise_tex b/soh/assets/custom/objects/object_ocarina_c_left_button/noise_tex
new file mode 100644
index 0000000000000000000000000000000000000000..aaf4e331f15f797a3b1122b58c57b3767e66bc0f
GIT binary patch
literal 1116
zcma)5S&rmH5G^FcIk*X5eDlKxBf5LKx?JV<zND9QdQWd<yUM%Ec1`sZ(=$CnVgPXg
zj=~kV0y%;M5K<^Y%E*X}_g=16tJM$Re*fJUB>w&9uYY}ZlKyY|id266pZ|L)_-3^t
z{^e>VIz`u(`^dKQ%g2w`bDu%x{^r%I8%i=wg`pMy&>oT`wvAwTeqNf)RT*l1cl(+W
z4O3wm5FDBuCz%Uiv0TQ&*Cj#VNy!7F8h~R}KQ9uT<sn4bc%G_I6GT;0xy}7XAc0Xl
z9EM4G%%b!-&hwC40w?Q+Os^j}O=W1^_ib-q*JV+41F@s8a3Ua`shwm1mN7#QI_dF{
zC3#gJ4`q&_A_E=pJ4Q7D!zjqoEu1AT@}e}suH(73Ws=D>qZsmTyW<5x_pt+H9l4&R
zNV*$EuA#8o9Vc?s{bsv;)Pm5GMBTP6z|sQ5v2V)EX1(5QHV?AIOLmqzz`$u>%G@KX
zAm1U#Q1`b#-cdY`0zWyHA&UB`uvJOq1z;j%s@!gUchADQtBSnLBiuZ{ObIeINsvAl
zKp>GPf~X&wGE1T`oqzfLxlOSLfeJL;gpe$uxkXczdF&C0F2DWpa%!p~b}e0&RKxLI
z%T231NzwpnD1Z9&={oddS76r=ISB@l@A&(Ji`>A~6jZ+b`Tf)mbH67OcwTj)5Scc{
zK!pLxobvMFI`+$@k4zv-0AY+25fE@S6z$W{&&H?oX}(_jP*+sLjS^qu9wmr;+rj%{
zAEy-|@BH@CVH4;m%+kORMa{#BXIWla6lGO6!#wp(?ire4hv`1{96uqtA;^bi)3$9t
zo$9i#W2i_9OzJvM;xx4+nwI?IFm%JTj73}=LclXD2+J}FLmcRYNZGH3zUij9O&r(N
zIC{GkOwTb52m2bcW%RfiySf=qM4ckHqqfwB78L>#iUN&&l-#mE4Q;=iy9hjP)*G6p
zcAUU-vK4wNFT$)pja`3!_q^mt=2&vXvP9&Xrb8$zFlv{%J+_yZm#3OgWf__(%K$o#
zDT@+s;Ci{tRaQ>d>(W(+JVHPr6kC2^iS&+v`RR%Lt01bUX&g>t6B|4yh?4GjP~1K+
zRyjYNyVUUyr+Hf5EKR78{fMr0WJ>e{hl<lY9%I`(zIpc(8Bw{y=JoB(-A*<Qg`xfd
D(@X%Y

literal 0
HcmV?d00001

diff --git a/soh/assets/custom/objects/object_ocarina_c_right_button/gOcarinaCRightButtonDL b/soh/assets/custom/objects/object_ocarina_c_right_button/gOcarinaCRightButtonDL
new file mode 100644
index 000000000..9d41daa33
--- /dev/null
+++ b/soh/assets/custom/objects/object_ocarina_c_right_button/gOcarinaCRightButtonDL
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<ClearGeometryMode G_LIGHTING="1" />
+	<LoadVertices Path="objects/object_ocarina_c_right_button/gOcarinaCRightButtonDL_vtx_cull" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
+	<CullDisplayList Start="0" End="7"/>
+	<CallDisplayList Path="objects/object_ocarina_c_right_button/mat_gOcarinaCRightButtonDL_f3dlite_ocarina_C_button_surface"/>
+	<CallDisplayList Path="objects/object_ocarina_c_right_button/gOcarinaCRightButtonDL_tri_0"/>
+	<CallDisplayList Path="objects/object_ocarina_c_right_button/mat_gOcarinaCRightButtonDL_f3dlite_ocarina_C_button_edge"/>
+	<CallDisplayList Path="objects/object_ocarina_c_right_button/gOcarinaCRightButtonDL_tri_1"/>
+	<PipeSync/>
+	<SetGeometryMode G_LIGHTING="1" />
+	<ClearGeometryMode G_TEXTURE_GEN="1" />
+	<SetCombineLERP A0="G_CCMUX_0" B0="G_CCMUX_0" C0="G_CCMUX_0" D0="G_CCMUX_SHADE" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_ENVIRONMENT" A1="G_CCMUX_0" B1="G_CCMUX_0" C1="G_CCMUX_0" D1="G_CCMUX_SHADE" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_ENVIRONMENT"/>
+	<Texture S="65535" T="65535" Level="0" Tile="0" On="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_ocarina_c_right_button/gOcarinaCRightButtonDL_tri_0 b/soh/assets/custom/objects/object_ocarina_c_right_button/gOcarinaCRightButtonDL_tri_0
new file mode 100644
index 000000000..f008c7abc
--- /dev/null
+++ b/soh/assets/custom/objects/object_ocarina_c_right_button/gOcarinaCRightButtonDL_tri_0
@@ -0,0 +1,28 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_ocarina_c_right_button/gOcarinaCRightButtonDL_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="3" V02="5" Flag0="0" V10="5" V11="7" V12="6" Flag1="0"/>
+	<Triangles2 V00="5" V01="8" V02="7" Flag0="0" V10="7" V11="9" V12="6" Flag1="0"/>
+	<Triangles2 V00="10" V01="11" V02="12" Flag0="0" V10="13" V11="10" V12="12" Flag1="0"/>
+	<Triangles2 V00="12" V01="14" V02="13" Flag0="0" V10="12" V11="15" V12="14" Flag1="0"/>
+	<Triangles2 V00="14" V01="16" V02="13" Flag0="0" V10="17" V11="1" V12="18" Flag1="0"/>
+	<Triangles2 V00="18" V01="1" V02="8" Flag0="0" V10="19" V11="20" V12="21" Flag1="0"/>
+	<Triangles2 V00="22" V01="21" V02="20" Flag0="0" V10="22" V11="20" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="22" V02="23" Flag0="0" V10="24" V11="23" V12="25" Flag1="0"/>
+	<Triangles2 V00="25" V01="26" V02="24" Flag0="0" V10="26" V11="27" V12="24" Flag1="0"/>
+	<Triangles2 V00="27" V01="28" V02="24" Flag0="0" V10="27" V11="29" V12="28" Flag1="0"/>
+	<Triangles2 V00="30" V01="28" V02="29" Flag0="0" V10="30" V11="29" V12="31" Flag1="0"/>
+	<LoadVertices Path="objects/object_ocarina_c_right_button/gOcarinaCRightButtonDL_vtx_0" VertexBufferIndex="0" VertexOffset="32" Count="26"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="1" V11="3" V12="2" Flag1="0"/>
+	<Triangles2 V00="0" V01="2" V02="4" Flag0="0" V10="5" V11="0" V12="4" Flag1="0"/>
+	<Triangles2 V00="5" V01="4" V02="6" Flag0="0" V10="6" V11="7" V12="5" Flag1="0"/>
+	<Triangles2 V00="7" V01="8" V02="5" Flag0="0" V10="7" V11="9" V12="8" Flag1="0"/>
+	<Triangles2 V00="9" V01="10" V02="8" Flag0="0" V10="10" V11="11" V12="8" Flag1="0"/>
+	<Triangles2 V00="5" V01="12" V02="0" Flag0="0" V10="13" V11="14" V12="15" Flag1="0"/>
+	<Triangles2 V00="16" V01="17" V02="18" Flag0="0" V10="16" V11="18" V12="19" Flag1="0"/>
+	<Triangles2 V00="18" V01="20" V02="19" Flag0="0" V10="19" V11="21" V12="16" Flag1="0"/>
+	<Triangles2 V00="19" V01="22" V02="21" Flag0="0" V10="19" V11="23" V12="22" Flag1="0"/>
+	<Triangles2 V00="22" V01="24" V02="21" Flag0="0" V10="21" V11="25" V12="16" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_ocarina_c_right_button/gOcarinaCRightButtonDL_tri_1 b/soh/assets/custom/objects/object_ocarina_c_right_button/gOcarinaCRightButtonDL_tri_1
new file mode 100644
index 000000000..1767f6fe3
--- /dev/null
+++ b/soh/assets/custom/objects/object_ocarina_c_right_button/gOcarinaCRightButtonDL_tri_1
@@ -0,0 +1,93 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_ocarina_c_right_button/gOcarinaCRightButtonDL_vtx_1" VertexBufferIndex="0" VertexOffset="0" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="0" V02="3" Flag0="0" V10="4" V11="5" V12="0" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="6" V11="8" V12="9" Flag1="0"/>
+	<Triangles2 V00="6" V01="9" V02="10" Flag0="0" V10="6" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="12" V11="14" V12="15" Flag1="0"/>
+	<Triangles2 V00="15" V01="14" V02="16" Flag0="0" V10="15" V11="16" V12="17" Flag1="0"/>
+	<Triangles2 V00="18" V01="19" V02="20" Flag0="0" V10="18" V11="20" V12="21" Flag1="0"/>
+	<Triangles2 V00="22" V01="21" V02="20" Flag0="0" V10="22" V11="23" V12="21" Flag1="0"/>
+	<Triangles2 V00="24" V01="18" V02="25" Flag0="0" V10="24" V11="25" V12="26" Flag1="0"/>
+	<Triangles2 V00="26" V01="25" V02="27" Flag0="0" V10="26" V11="27" V12="28" Flag1="0"/>
+	<Triangles2 V00="29" V01="12" V02="30" Flag0="0" V10="29" V11="30" V12="31" Flag1="0"/>
+	<Triangle1 V00="31" V01="30" V02="17"/>
+	<LoadVertices Path="objects/object_ocarina_c_right_button/gOcarinaCRightButtonDL_vtx_1" VertexBufferIndex="0" VertexOffset="32" Count="30"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="2" V11="3" V12="0" Flag1="0"/>
+	<Triangles2 V00="2" V01="4" V02="3" Flag0="0" V10="5" V11="0" V12="3" Flag1="0"/>
+	<Triangles2 V00="5" V01="6" V02="0" Flag0="0" V10="7" V11="8" V12="9" Flag1="0"/>
+	<Triangles2 V00="7" V01="9" V02="10" Flag0="0" V10="11" V11="7" V12="10" Flag1="0"/>
+	<Triangles2 V00="11" V01="12" V02="7" Flag0="0" V10="13" V11="14" V12="15" Flag1="0"/>
+	<Triangles2 V00="13" V01="15" V02="16" Flag0="0" V10="16" V11="15" V12="17" Flag1="0"/>
+	<Triangles2 V00="16" V01="17" V02="18" Flag0="0" V10="18" V11="17" V12="19" Flag1="0"/>
+	<Triangles2 V00="18" V01="19" V02="20" Flag0="0" V10="18" V11="20" V12="21" Flag1="0"/>
+	<Triangles2 V00="18" V01="21" V02="22" Flag0="0" V10="16" V11="18" V12="23" Flag1="0"/>
+	<Triangles2 V00="16" V01="23" V02="24" Flag0="0" V10="24" V11="13" V12="16" Flag1="0"/>
+	<Triangles2 V00="24" V01="25" V02="13" Flag0="0" V10="26" V11="9" V12="27" Flag1="0"/>
+	<Triangles2 V00="26" V01="27" V02="28" Flag0="0" V10="26" V11="28" V12="29" Flag1="0"/>
+	<Triangle1 V00="26" V01="29" V02="11"/>
+	<LoadVertices Path="objects/object_ocarina_c_right_button/gOcarinaCRightButtonDL_vtx_1" VertexBufferIndex="0" VertexOffset="62" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="3" V12="1" Flag1="0"/>
+	<Triangles2 V00="0" V01="4" V02="3" Flag0="0" V10="0" V11="5" V12="4" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="6" V11="9" V12="7" Flag1="0"/>
+	<Triangles2 V00="10" V01="7" V02="9" Flag0="0" V10="10" V11="9" V12="11" Flag1="0"/>
+	<Triangles2 V00="11" V01="12" V02="10" Flag0="0" V10="11" V11="13" V12="12" Flag1="0"/>
+	<Triangles2 V00="13" V01="14" V02="12" Flag0="0" V10="13" V11="15" V12="14" Flag1="0"/>
+	<Triangles2 V00="16" V01="14" V02="15" Flag0="0" V10="16" V11="15" V12="17" Flag1="0"/>
+	<Triangles2 V00="17" V01="18" V02="16" Flag0="0" V10="17" V11="19" V12="18" Flag1="0"/>
+	<Triangles2 V00="20" V01="21" V02="18" Flag0="0" V10="20" V11="22" V12="21" Flag1="0"/>
+	<Triangles2 V00="22" V01="23" V02="21" Flag0="0" V10="22" V11="24" V12="23" Flag1="0"/>
+	<Triangles2 V00="25" V01="23" V02="24" Flag0="0" V10="25" V11="24" V12="26" Flag1="0"/>
+	<Triangles2 V00="27" V01="25" V02="26" Flag0="0" V10="27" V11="26" V12="28" Flag1="0"/>
+	<Triangles2 V00="28" V01="29" V02="27" Flag0="0" V10="28" V11="30" V12="29" Flag1="0"/>
+	<Triangle1 V00="30" V01="31" V02="29"/>
+	<LoadVertices Path="objects/object_ocarina_c_right_button/gOcarinaCRightButtonDL_vtx_1" VertexBufferIndex="0" VertexOffset="94" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="2" V12="4" Flag1="0"/>
+	<Triangles2 V00="3" V01="4" V02="5" Flag0="0" V10="6" V11="7" V12="8" Flag1="0"/>
+	<Triangles2 V00="6" V01="8" V02="9" Flag0="0" V10="10" V11="11" V12="12" Flag1="0"/>
+	<Triangles2 V00="10" V01="12" V02="13" Flag0="0" V10="7" V11="14" V12="15" Flag1="0"/>
+	<Triangles2 V00="7" V01="15" V02="16" Flag0="0" V10="17" V11="18" V12="19" Flag1="0"/>
+	<Triangles2 V00="17" V01="19" V02="12" Flag0="0" V10="14" V11="20" V12="21" Flag1="0"/>
+	<Triangles2 V00="14" V01="21" V02="22" Flag0="0" V10="23" V11="24" V12="25" Flag1="0"/>
+	<Triangles2 V00="23" V01="25" V02="19" Flag0="0" V10="20" V11="26" V12="27" Flag1="0"/>
+	<Triangles2 V00="20" V01="27" V02="28" Flag0="0" V10="29" V11="30" V12="31" Flag1="0"/>
+	<Triangle1 V00="29" V01="31" V02="25"/>
+	<LoadVertices Path="objects/object_ocarina_c_right_button/gOcarinaCRightButtonDL_vtx_1" VertexBufferIndex="0" VertexOffset="126" Count="30"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="4" V11="6" V12="7" Flag1="0"/>
+	<Triangles2 V00="1" V01="8" V02="9" Flag0="0" V10="1" V11="9" V12="10" Flag1="0"/>
+	<Triangles2 V00="11" V01="12" V02="13" Flag0="0" V10="11" V11="13" V12="6" Flag1="0"/>
+	<Triangles2 V00="8" V01="14" V02="15" Flag0="0" V10="8" V11="15" V12="16" Flag1="0"/>
+	<Triangles2 V00="17" V01="18" V02="19" Flag0="0" V10="17" V11="19" V12="13" Flag1="0"/>
+	<Triangles2 V00="14" V01="20" V02="21" Flag0="0" V10="14" V11="21" V12="22" Flag1="0"/>
+	<Triangles2 V00="23" V01="24" V02="25" Flag0="0" V10="23" V11="25" V12="19" Flag1="0"/>
+	<Triangles2 V00="26" V01="27" V02="28" Flag0="0" V10="26" V11="28" V12="29" Flag1="0"/>
+	<LoadVertices Path="objects/object_ocarina_c_right_button/gOcarinaCRightButtonDL_vtx_1" VertexBufferIndex="0" VertexOffset="156" Count="30"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="2" V02="5" Flag0="0" V10="4" V11="5" V12="6" Flag1="0"/>
+	<Triangles2 V00="7" V01="8" V02="9" Flag0="0" V10="7" V11="9" V12="10" Flag1="0"/>
+	<Triangles2 V00="11" V01="12" V02="13" Flag0="0" V10="11" V11="13" V12="14" Flag1="0"/>
+	<Triangles2 V00="15" V01="16" V02="17" Flag0="0" V10="15" V11="17" V12="18" Flag1="0"/>
+	<Triangles2 V00="19" V01="20" V02="21" Flag0="0" V10="19" V11="21" V12="22" Flag1="0"/>
+	<Triangles2 V00="23" V01="24" V02="25" Flag0="0" V10="23" V11="25" V12="17" Flag1="0"/>
+	<Triangles2 V00="26" V01="27" V02="28" Flag0="0" V10="26" V11="28" V12="29" Flag1="0"/>
+	<LoadVertices Path="objects/object_ocarina_c_right_button/gOcarinaCRightButtonDL_vtx_1" VertexBufferIndex="0" VertexOffset="186" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="4" V11="6" V12="7" Flag1="0"/>
+	<Triangles2 V00="8" V01="9" V02="10" Flag0="0" V10="8" V11="10" V12="2" Flag1="0"/>
+	<Triangles2 V00="11" V01="12" V02="13" Flag0="0" V10="11" V11="13" V12="14" Flag1="0"/>
+	<Triangles2 V00="15" V01="16" V02="17" Flag0="0" V10="15" V11="17" V12="10" Flag1="0"/>
+	<Triangles2 V00="18" V01="19" V02="20" Flag0="0" V10="18" V11="20" V12="21" Flag1="0"/>
+	<Triangles2 V00="22" V01="23" V02="24" Flag0="0" V10="22" V11="24" V12="17" Flag1="0"/>
+	<Triangles2 V00="25" V01="26" V02="27" Flag0="0" V10="25" V11="27" V12="28" Flag1="0"/>
+	<Triangles2 V00="29" V01="30" V02="31" Flag0="0" V10="29" V11="31" V12="24" Flag1="0"/>
+	<LoadVertices Path="objects/object_ocarina_c_right_button/gOcarinaCRightButtonDL_vtx_1" VertexBufferIndex="0" VertexOffset="218" Count="22"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="4" V11="6" V12="7" Flag1="0"/>
+	<Triangles2 V00="8" V01="9" V02="10" Flag0="0" V10="8" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="12" V11="14" V12="6" Flag1="0"/>
+	<Triangles2 V00="15" V01="14" V02="16" Flag0="0" V10="15" V11="16" V12="17" Flag1="0"/>
+	<Triangles2 V00="18" V01="19" V02="20" Flag0="0" V10="18" V11="20" V12="21" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_ocarina_c_right_button/gOcarinaCRightButtonDL_vtx_0 b/soh/assets/custom/objects/object_ocarina_c_right_button/gOcarinaCRightButtonDL_vtx_0
new file mode 100644
index 000000000..f3039179f
--- /dev/null
+++ b/soh/assets/custom/objects/object_ocarina_c_right_button/gOcarinaCRightButtonDL_vtx_0
@@ -0,0 +1,60 @@
+<Vertex Version="0">
+	<Vtx X="23" Y="6" Z="2" S="13" T="-487" R="52" G="77" B="86" A="255"/>
+	<Vtx X="22" Y="0" Z="2" S="16" T="-480" R="0" G="0" B="127" A="255"/>
+	<Vtx X="27" Y="2" Z="2" S="15" T="-482" R="90" G="41" B="79" A="255"/>
+	<Vtx X="-16" Y="-19" Z="2" S="-16" T="-360" R="177" G="197" B="81" A="255"/>
+	<Vtx X="-12" Y="-22" Z="2" S="-7" T="-317" R="239" G="159" B="81" A="255"/>
+	<Vtx X="-6" Y="-20" Z="2" S="-16" T="-345" R="30" G="168" B="86" A="255"/>
+	<Vtx X="-18" Y="-13" Z="2" S="-16" T="-416" R="163" G="244" B="86" A="255"/>
+	<Vtx X="22" Y="0" Z="2" S="112" T="-288" R="0" G="0" B="127" A="255"/>
+	<Vtx X="23" Y="-6" Z="2" S="-16" T="-487" R="52" G="179" B="86" A="255"/>
+	<Vtx X="-18" Y="0" Z="2" S="112" T="-288" R="166" G="0" B="90" A="255"/>
+	<Vtx X="-16" Y="19" Z="2" S="204" T="-296" R="177" G="59" B="81" A="255"/>
+	<Vtx X="-18" Y="13" Z="2" S="176" T="-288" R="163" G="12" B="86" A="255"/>
+	<Vtx X="-18" Y="0" Z="2" S="112" T="-480" R="166" G="0" B="90" A="255"/>
+	<Vtx X="-12" Y="22" Z="2" S="217" T="-317" R="239" G="97" B="81" A="255"/>
+	<Vtx X="23" Y="6" Z="2" S="141" T="-288" R="52" G="77" B="86" A="255"/>
+	<Vtx X="22" Y="0" Z="2" S="112" T="-480" R="0" G="0" B="127" A="255"/>
+	<Vtx X="-6" Y="20" Z="2" S="211" T="-307" R="30" G="88" B="86" A="255"/>
+	<Vtx X="27" Y="2" Z="2" S="2" T="-508" R="90" G="41" B="79" A="255"/>
+	<Vtx X="27" Y="-2" Z="2" S="-16" T="-511" R="90" G="215" B="79" A="255"/>
+	<Vtx X="26" Y="8" Z="5" S="21" T="-80" R="243" G="238" B="125" A="255"/>
+	<Vtx X="30" Y="5" Z="5" S="44" T="-61" R="242" G="248" B="126" A="255"/>
+	<Vtx X="33" Y="8" Z="5" S="64" T="-82" R="30" G="5" B="123" A="255"/>
+	<Vtx X="33" Y="-9" Z="5" S="64" T="26" R="30" G="249" B="123" A="255"/>
+	<Vtx X="30" Y="-4" Z="5" S="44" T="-7" R="234" G="11" B="125" A="255"/>
+	<Vtx X="20" Y="-27" Z="5" S="-19" T="140" R="16" G="234" B="124" A="255"/>
+	<Vtx X="25" Y="-8" Z="5" S="12" T="21" R="243" G="20" B="125" A="255"/>
+	<Vtx X="-5" Y="-23" Z="5" S="-176" T="115" R="248" G="23" B="125" A="255"/>
+	<Vtx X="-13" Y="-25" Z="5" S="-227" T="125" R="4" G="21" B="125" A="255"/>
+	<Vtx X="-20" Y="-27" Z="5" S="-273" T="137" R="239" G="234" B="124" A="255"/>
+	<Vtx X="-18" Y="-22" Z="5" S="-257" T="107" R="13" G="11" B="126" A="255"/>
+	<Vtx X="-32" Y="-11" Z="5" S="-346" T="36" R="229" G="247" B="124" A="255"/>
+	<Vtx X="-21" Y="-11" Z="5" S="-276" T="39" R="26" G="2" B="124" A="255"/>
+	<Vtx X="-32" Y="-11" Z="5" S="-346" T="36" R="229" G="247" B="124" A="255"/>
+	<Vtx X="-21" Y="-11" Z="5" S="-276" T="39" R="26" G="2" B="124" A="255"/>
+	<Vtx X="-21" Y="14" Z="5" S="-276" T="-118" R="24" G="253" B="125" A="255"/>
+	<Vtx X="-21" Y="0" Z="5" S="-276" T="-32" R="24" G="0" B="125" A="255"/>
+	<Vtx X="-19" Y="21" Z="5" S="-263" T="-164" R="18" G="242" B="125" A="255"/>
+	<Vtx X="-20" Y="27" Z="5" S="-269" T="-204" R="240" G="22" B="124" A="255"/>
+	<Vtx X="-13" Y="25" Z="5" S="-223" T="-189" R="4" G="233" B="125" A="255"/>
+	<Vtx X="-5" Y="23" Z="5" S="-176" T="-179" R="248" G="233" B="125" A="255"/>
+	<Vtx X="0" Y="34" Z="5" S="-144" T="-245" R="0" G="28" B="124" A="255"/>
+	<Vtx X="26" Y="8" Z="5" S="21" T="-80" R="243" G="238" B="125" A="255"/>
+	<Vtx X="33" Y="8" Z="5" S="64" T="-82" R="30" G="5" B="123" A="255"/>
+	<Vtx X="19" Y="28" Z="5" S="-26" T="-206" R="14" G="22" B="124" A="255"/>
+	<Vtx X="-32" Y="10" Z="5" S="-346" T="-98" R="229" G="8" B="124" A="255"/>
+	<Vtx X="-20" Y="-27" Z="5" S="-273" T="137" R="239" G="234" B="124" A="255"/>
+	<Vtx X="0" Y="-34" Z="5" S="-142" T="180" R="0" G="229" B="124" A="255"/>
+	<Vtx X="20" Y="-27" Z="5" S="-19" T="140" R="16" G="234" B="124" A="255"/>
+	<Vtx X="-32" Y="10" Z="-5" S="166" T="-98" R="229" G="8" B="132" A="255"/>
+	<Vtx X="-20" Y="27" Z="-5" S="243" T="-204" R="240" G="22" B="132" A="255"/>
+	<Vtx X="0" Y="34" Z="-5" S="368" T="-245" R="0" G="28" B="132" A="255"/>
+	<Vtx X="32" Y="10" Z="-5" S="570" T="-98" R="27" G="8" B="132" A="255"/>
+	<Vtx X="20" Y="27" Z="-5" S="493" T="-204" R="16" G="22" B="132" A="255"/>
+	<Vtx X="-20" Y="-27" Z="-5" S="243" T="140" R="240" G="234" B="132" A="255"/>
+	<Vtx X="20" Y="-27" Z="-5" S="493" T="140" R="16" G="234" B="132" A="255"/>
+	<Vtx X="32" Y="-10" Z="-5" S="570" T="34" R="27" G="248" B="132" A="255"/>
+	<Vtx X="0" Y="-34" Z="-5" S="368" T="181" R="0" G="228" B="132" A="255"/>
+	<Vtx X="-32" Y="-10" Z="-5" S="166" T="34" R="229" G="248" B="132" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_ocarina_c_right_button/gOcarinaCRightButtonDL_vtx_1 b/soh/assets/custom/objects/object_ocarina_c_right_button/gOcarinaCRightButtonDL_vtx_1
new file mode 100644
index 000000000..1c79e5a86
--- /dev/null
+++ b/soh/assets/custom/objects/object_ocarina_c_right_button/gOcarinaCRightButtonDL_vtx_1
@@ -0,0 +1,242 @@
+<Vertex Version="0">
+	<Vtx X="-18" Y="0" Z="2" S="-17" T="-26" R="232" G="0" B="125" A="255"/>
+	<Vtx X="-18" Y="0" Z="2" S="-17" T="-17" R="166" G="0" B="90" A="255"/>
+	<Vtx X="-18" Y="13" Z="2" S="-17" T="-17" R="163" G="12" B="86" A="255"/>
+	<Vtx X="-18" Y="13" Z="2" S="-17" T="-26" R="242" G="1" B="126" A="255"/>
+	<Vtx X="-19" Y="13" Z="4" S="-17" T="84" R="87" G="245" B="92" A="255"/>
+	<Vtx X="-19" Y="0" Z="4" S="-17" T="84" R="90" G="0" B="90" A="255"/>
+	<Vtx X="-16" Y="19" Z="2" S="102" T="-17" R="2" G="254" B="127" A="255"/>
+	<Vtx X="-16" Y="19" Z="2" S="111" T="-17" R="177" G="59" B="81" A="255"/>
+	<Vtx X="-12" Y="22" Z="2" S="111" T="-49" R="239" G="97" B="81" A="255"/>
+	<Vtx X="-12" Y="22" Z="2" S="102" T="-49" R="0" G="253" B="127" A="255"/>
+	<Vtx X="-12" Y="23" Z="4" S="212" T="-49" R="14" G="177" B="98" A="255"/>
+	<Vtx X="-17" Y="20" Z="4" S="212" T="-17" R="65" G="208" B="98" A="255"/>
+	<Vtx X="-12" Y="-22" Z="2" S="-145" T="-49" R="239" G="159" B="81" A="255"/>
+	<Vtx X="-16" Y="-19" Z="2" S="-145" T="-17" R="177" G="197" B="81" A="255"/>
+	<Vtx X="-16" Y="-19" Z="2" S="-135" T="-17" R="12" G="247" B="126" A="255"/>
+	<Vtx X="-12" Y="-22" Z="2" S="-135" T="-49" R="251" G="2" B="127" A="255"/>
+	<Vtx X="-17" Y="-20" Z="4" S="-245" T="-17" R="68" G="48" B="96" A="255"/>
+	<Vtx X="-12" Y="-23" Z="4" S="-245" T="-49" R="13" G="77" B="100" A="255"/>
+	<Vtx X="27" Y="-2" Z="2" S="-145" T="-239" R="90" G="215" B="79" A="255"/>
+	<Vtx X="23" Y="-6" Z="2" S="-145" T="-215" R="52" G="179" B="86" A="255"/>
+	<Vtx X="23" Y="-6" Z="2" S="-135" T="-215" R="8" G="244" B="126" A="255"/>
+	<Vtx X="27" Y="-2" Z="2" S="-135" T="-239" R="244" G="253" B="126" A="255"/>
+	<Vtx X="24" Y="-7" Z="4" S="-245" T="-215" R="208" G="73" B="92" A="255"/>
+	<Vtx X="28" Y="-3" Z="4" S="-245" T="-239" R="180" G="33" B="96" A="255"/>
+	<Vtx X="27" Y="2" Z="2" S="-145" T="-239" R="90" G="41" B="79" A="255"/>
+	<Vtx X="27" Y="-2" Z="2" S="-135" T="-236" R="244" G="253" B="126" A="255"/>
+	<Vtx X="27" Y="2" Z="2" S="-135" T="-236" R="243" G="9" B="126" A="255"/>
+	<Vtx X="28" Y="-3" Z="4" S="-245" T="-273" R="180" G="33" B="96" A="255"/>
+	<Vtx X="28" Y="3" Z="4" S="-245" T="-273" R="181" G="225" B="98" A="255"/>
+	<Vtx X="-6" Y="-20" Z="2" S="-145" T="-74" R="30" G="168" B="86" A="255"/>
+	<Vtx X="-12" Y="-22" Z="2" S="-135" T="-49" R="251" G="2" B="127" A="255"/>
+	<Vtx X="-6" Y="-20" Z="2" S="-135" T="-74" R="4" G="243" B="126" A="255"/>
+	<Vtx X="-6" Y="-20" Z="2" S="-135" T="-74" R="4" G="243" B="126" A="255"/>
+	<Vtx X="-12" Y="-23" Z="4" S="-245" T="-49" R="13" G="77" B="100" A="255"/>
+	<Vtx X="-6" Y="-21" Z="4" S="-245" T="-74" R="228" G="83" B="92" A="255"/>
+	<Vtx X="23" Y="-6" Z="2" S="-135" T="-215" R="8" G="244" B="126" A="255"/>
+	<Vtx X="24" Y="-7" Z="4" S="-245" T="-215" R="208" G="73" B="92" A="255"/>
+	<Vtx X="23" Y="-6" Z="2" S="-145" T="-215" R="52" G="179" B="86" A="255"/>
+	<Vtx X="-6" Y="-20" Z="2" S="-145" T="-74" R="30" G="168" B="86" A="255"/>
+	<Vtx X="-16" Y="-19" Z="2" S="-145" T="-26" R="12" G="247" B="126" A="255"/>
+	<Vtx X="-16" Y="-19" Z="2" S="-145" T="-17" R="177" G="197" B="81" A="255"/>
+	<Vtx X="-18" Y="-13" Z="2" S="-81" T="-17" R="163" G="244" B="86" A="255"/>
+	<Vtx X="-18" Y="-13" Z="2" S="-81" T="-26" R="244" G="7" B="126" A="255"/>
+	<Vtx X="-19" Y="-13" Z="4" S="-81" T="84" R="91" G="12" B="88" A="255"/>
+	<Vtx X="-17" Y="-20" Z="4" S="-145" T="84" R="68" G="48" B="96" A="255"/>
+	<Vtx X="-12" Y="22" Z="2" S="102" T="-49" R="0" G="253" B="127" A="255"/>
+	<Vtx X="-12" Y="22" Z="2" S="111" T="-49" R="239" G="97" B="81" A="255"/>
+	<Vtx X="-6" Y="20" Z="2" S="111" T="-74" R="30" G="88" B="86" A="255"/>
+	<Vtx X="-6" Y="20" Z="2" S="102" T="-74" R="4" G="13" B="126" A="255"/>
+	<Vtx X="23" Y="6" Z="2" S="111" T="-215" R="52" G="77" B="86" A="255"/>
+	<Vtx X="23" Y="6" Z="2" S="102" T="-215" R="13" G="11" B="126" A="255"/>
+	<Vtx X="27" Y="2" Z="2" S="111" T="-273" R="90" G="41" B="79" A="255"/>
+	<Vtx X="27" Y="2" Z="2" S="102" T="-273" R="243" G="9" B="126" A="255"/>
+	<Vtx X="28" Y="3" Z="4" S="212" T="-273" R="181" G="225" B="98" A="255"/>
+	<Vtx X="24" Y="6" Z="4" S="212" T="-219" R="209" G="185" B="94" A="255"/>
+	<Vtx X="24" Y="6" Z="4" S="212" T="-215" R="209" G="185" B="94" A="255"/>
+	<Vtx X="-6" Y="21" Z="4" S="212" T="-74" R="228" G="173" B="92" A="255"/>
+	<Vtx X="-12" Y="23" Z="4" S="212" T="-49" R="14" G="177" B="98" A="255"/>
+	<Vtx X="-18" Y="-13" Z="2" S="-81" T="-26" R="244" G="7" B="126" A="255"/>
+	<Vtx X="-18" Y="0" Z="2" S="-81" T="-17" R="166" G="0" B="90" A="255"/>
+	<Vtx X="-18" Y="0" Z="2" S="-81" T="-26" R="232" G="0" B="125" A="255"/>
+	<Vtx X="-19" Y="0" Z="4" S="-81" T="84" R="90" G="0" B="90" A="255"/>
+	<Vtx X="-18" Y="13" Z="2" S="47" T="-26" R="242" G="1" B="126" A="255"/>
+	<Vtx X="-17" Y="20" Z="4" S="111" T="84" R="65" G="208" B="98" A="255"/>
+	<Vtx X="-19" Y="13" Z="4" S="47" T="84" R="87" G="245" B="92" A="255"/>
+	<Vtx X="-16" Y="19" Z="2" S="111" T="-26" R="2" G="254" B="127" A="255"/>
+	<Vtx X="-16" Y="19" Z="2" S="111" T="-17" R="177" G="59" B="81" A="255"/>
+	<Vtx X="-18" Y="13" Z="2" S="47" T="-17" R="163" G="12" B="86" A="255"/>
+	<Vtx X="-19" Y="-13" Z="4" S="-385" T="319" R="91" G="12" B="88" A="255"/>
+	<Vtx X="-21" Y="0" Z="5" S="-404" T="239" R="24" G="0" B="125" A="255"/>
+	<Vtx X="-21" Y="-11" Z="5" S="-404" T="310" R="26" G="2" B="124" A="255"/>
+	<Vtx X="-19" Y="0" Z="4" S="-385" T="239" R="90" G="0" B="90" A="255"/>
+	<Vtx X="-21" Y="14" Z="5" S="-404" T="154" R="24" G="253" B="125" A="255"/>
+	<Vtx X="-19" Y="13" Z="4" S="-385" T="156" R="87" G="245" B="92" A="255"/>
+	<Vtx X="-19" Y="21" Z="5" S="-392" T="108" R="18" G="242" B="125" A="255"/>
+	<Vtx X="-17" Y="20" Z="4" S="-375" T="120" R="65" G="208" B="98" A="255"/>
+	<Vtx X="-13" Y="25" Z="5" S="-352" T="83" R="4" G="233" B="125" A="255"/>
+	<Vtx X="-12" Y="23" Z="4" S="-348" T="103" R="14" G="177" B="98" A="255"/>
+	<Vtx X="-5" Y="23" Z="5" S="-305" T="92" R="248" G="233" B="125" A="255"/>
+	<Vtx X="-6" Y="21" Z="4" S="-311" T="110" R="228" G="173" B="92" A="255"/>
+	<Vtx X="26" Y="8" Z="5" S="-107" T="191" R="243" G="238" B="125" A="255"/>
+	<Vtx X="24" Y="6" Z="4" S="-127" T="202" R="209" G="185" B="94" A="255"/>
+	<Vtx X="24" Y="6" Z="4" S="-125" T="204" R="209" G="185" B="94" A="255"/>
+	<Vtx X="30" Y="5" Z="5" S="-85" T="210" R="242" G="248" B="126" A="255"/>
+	<Vtx X="28" Y="3" Z="4" S="-100" T="226" R="181" G="225" B="98" A="255"/>
+	<Vtx X="30" Y="-4" Z="5" S="-85" T="265" R="234" G="11" B="125" A="255"/>
+	<Vtx X="28" Y="-3" Z="4" S="-100" T="253" R="180" G="33" B="96" A="255"/>
+	<Vtx X="25" Y="-8" Z="5" S="-116" T="293" R="243" G="20" B="125" A="255"/>
+	<Vtx X="24" Y="-7" Z="4" S="-127" T="277" R="208" G="73" B="92" A="255"/>
+	<Vtx X="-5" Y="-23" Z="5" S="-305" T="387" R="248" G="23" B="125" A="255"/>
+	<Vtx X="-6" Y="-21" Z="4" S="-311" T="369" R="228" G="83" B="92" A="255"/>
+	<Vtx X="-13" Y="-25" Z="5" S="-356" T="397" R="4" G="21" B="125" A="255"/>
+	<Vtx X="-12" Y="-23" Z="4" S="-348" T="376" R="13" G="77" B="100" A="255"/>
+	<Vtx X="-18" Y="-22" Z="5" S="-386" T="379" R="13" G="11" B="126" A="255"/>
+	<Vtx X="-12" Y="-23" Z="4" S="-348" T="376" R="13" G="77" B="100" A="255"/>
+	<Vtx X="-17" Y="-20" Z="4" S="-375" T="360" R="68" G="48" B="96" A="255"/>
+	<Vtx X="-18" Y="-22" Z="5" S="-386" T="379" R="13" G="11" B="126" A="255"/>
+	<Vtx X="-21" Y="-11" Z="5" S="-404" T="310" R="26" G="2" B="124" A="255"/>
+	<Vtx X="-17" Y="-20" Z="4" S="-375" T="359" R="68" G="48" B="96" A="255"/>
+	<Vtx X="-19" Y="-13" Z="4" S="-385" T="323" R="91" G="12" B="88" A="255"/>
+	<Vtx X="0" Y="34" Z="5" S="-273" T="27" R="0" G="28" B="124" A="255"/>
+	<Vtx X="19" Y="28" Z="5" S="-154" T="65" R="14" G="22" B="124" A="255"/>
+	<Vtx X="22" Y="30" Z="4" S="-133" T="39" R="53" G="74" B="89" A="255"/>
+	<Vtx X="0" Y="37" Z="4" S="-270" T="-5" R="0" G="93" B="87" A="255"/>
+	<Vtx X="0" Y="37" Z="4" S="493" T="-529" R="0" G="93" B="87" A="255"/>
+	<Vtx X="22" Y="30" Z="4" S="396" T="-529" R="53" G="74" B="89" A="255"/>
+	<Vtx X="23" Y="32" Z="0" S="393" T="-273" R="75" G="103" B="1" A="255"/>
+	<Vtx X="0" Y="39" Z="0" S="495" T="-273" R="0" G="127" B="0" A="255"/>
+	<Vtx X="33" Y="8" Z="5" S="-64" T="189" R="30" G="5" B="123" A="255"/>
+	<Vtx X="36" Y="11" Z="4" S="-39" T="164" R="90" G="27" B="86" A="255"/>
+	<Vtx X="22" Y="30" Z="4" S="-127" T="42" R="53" G="74" B="89" A="255"/>
+	<Vtx X="22" Y="30" Z="4" S="392" T="-529" R="53" G="74" B="89" A="255"/>
+	<Vtx X="36" Y="11" Z="4" S="291" T="-529" R="90" G="27" B="86" A="255"/>
+	<Vtx X="37" Y="12" Z="0" S="291" T="-273" R="120" G="41" B="0" A="255"/>
+	<Vtx X="33" Y="-9" Z="5" S="-64" T="297" R="30" G="249" B="123" A="255"/>
+	<Vtx X="36" Y="-11" Z="4" S="-39" T="310" R="91" G="227" B="84" A="255"/>
+	<Vtx X="36" Y="11" Z="4" S="-39" T="171" R="90" G="27" B="86" A="255"/>
+	<Vtx X="36" Y="11" Z="4" S="286" T="-529" R="90" G="27" B="86" A="255"/>
+	<Vtx X="36" Y="-11" Z="4" S="192" T="-529" R="91" G="227" B="84" A="255"/>
+	<Vtx X="37" Y="-12" Z="0" S="188" T="-273" R="121" G="216" B="255" A="255"/>
+	<Vtx X="20" Y="-27" Z="5" S="-148" T="412" R="16" G="234" B="124" A="255"/>
+	<Vtx X="22" Y="-30" Z="4" S="-126" T="436" R="54" G="181" B="87" A="255"/>
+	<Vtx X="36" Y="-11" Z="4" S="-39" T="315" R="91" G="227" B="84" A="255"/>
+	<Vtx X="36" Y="-11" Z="4" S="188" T="-529" R="91" G="227" B="84" A="255"/>
+	<Vtx X="22" Y="-30" Z="4" S="88" T="-529" R="54" G="181" B="87" A="255"/>
+	<Vtx X="23" Y="-32" Z="0" S="86" T="-273" R="75" G="153" B="0" A="255"/>
+	<Vtx X="20" Y="-27" Z="5" S="-148" T="412" R="16" G="234" B="124" A="255"/>
+	<Vtx X="0" Y="-34" Z="5" S="-270" T="451" R="0" G="229" B="124" A="255"/>
+	<Vtx X="0" Y="-37" Z="4" S="-269" T="484" R="0" G="164" B="88" A="255"/>
+	<Vtx X="22" Y="-30" Z="4" S="-131" T="439" R="54" G="181" B="87" A="255"/>
+	<Vtx X="22" Y="-30" Z="4" S="84" T="-529" R="54" G="181" B="87" A="255"/>
+	<Vtx X="0" Y="-37" Z="4" S="-14" T="-529" R="0" G="164" B="88" A="255"/>
+	<Vtx X="0" Y="-39" Z="0" S="-17" T="-273" R="0" G="129" B="0" A="255"/>
+	<Vtx X="23" Y="-32" Z="0" S="86" T="-273" R="75" G="153" B="0" A="255"/>
+	<Vtx X="-20" Y="-27" Z="5" S="-401" T="409" R="239" G="234" B="124" A="255"/>
+	<Vtx X="-22" Y="-30" Z="4" S="-415" T="439" R="201" G="181" B="87" A="255"/>
+	<Vtx X="0" Y="-37" Z="4" S="-275" T="484" R="0" G="164" B="88" A="255"/>
+	<Vtx X="0" Y="-37" Z="4" S="-18" T="-529" R="0" G="164" B="88" A="255"/>
+	<Vtx X="-22" Y="-30" Z="4" S="-118" T="-529" R="201" G="181" B="87" A="255"/>
+	<Vtx X="-23" Y="-32" Z="0" S="-119" T="-273" R="182" G="153" B="0" A="255"/>
+	<Vtx X="-32" Y="-11" Z="5" S="-475" T="308" R="229" G="247" B="124" A="255"/>
+	<Vtx X="-36" Y="-12" Z="4" S="-504" T="318" R="167" G="227" B="86" A="255"/>
+	<Vtx X="-22" Y="-30" Z="4" S="-420" T="435" R="201" G="181" B="87" A="255"/>
+	<Vtx X="-22" Y="-30" Z="4" S="-122" T="-529" R="201" G="181" B="87" A="255"/>
+	<Vtx X="-36" Y="-12" Z="4" S="-219" T="-529" R="167" G="227" B="86" A="255"/>
+	<Vtx X="-37" Y="-12" Z="0" S="-221" T="-273" R="135" G="217" B="0" A="255"/>
+	<Vtx X="-32" Y="10" Z="5" S="-475" T="174" R="229" G="8" B="124" A="255"/>
+	<Vtx X="-36" Y="12" Z="4" S="-506" T="167" R="168" G="28" B="87" A="255"/>
+	<Vtx X="-36" Y="-12" Z="4" S="-506" T="313" R="167" G="227" B="86" A="255"/>
+	<Vtx X="-36" Y="-12" Z="4" S="-223" T="-529" R="167" G="227" B="86" A="255"/>
+	<Vtx X="-36" Y="12" Z="4" S="-322" T="-529" R="168" G="28" B="87" A="255"/>
+	<Vtx X="-37" Y="12" Z="0" S="-324" T="-273" R="135" G="39" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="0" S="-529" T="-273" R="0" G="127" B="0" A="255"/>
+	<Vtx X="-23" Y="32" Z="0" S="-426" T="-273" R="181" G="103" B="0" A="255"/>
+	<Vtx X="-22" Y="30" Z="4" S="-428" T="-529" R="202" G="75" B="87" A="255"/>
+	<Vtx X="0" Y="37" Z="4" S="-526" T="-529" R="0" G="93" B="87" A="255"/>
+	<Vtx X="0" Y="37" Z="4" S="-275" T="-5" R="0" G="93" B="87" A="255"/>
+	<Vtx X="-22" Y="30" Z="4" S="-414" T="40" R="202" G="75" B="87" A="255"/>
+	<Vtx X="-20" Y="27" Z="5" S="-397" T="67" R="240" G="22" B="124" A="255"/>
+	<Vtx X="0" Y="34" Z="5" S="-273" T="27" R="0" G="28" B="124" A="255"/>
+	<Vtx X="-32" Y="10" Z="5" S="-475" T="174" R="229" G="8" B="124" A="255"/>
+	<Vtx X="-22" Y="30" Z="4" S="-419" T="43" R="202" G="75" B="87" A="255"/>
+	<Vtx X="-36" Y="12" Z="4" S="-504" T="161" R="168" G="28" B="87" A="255"/>
+	<Vtx X="-36" Y="12" Z="4" S="-326" T="-529" R="168" G="28" B="87" A="255"/>
+	<Vtx X="-22" Y="30" Z="4" S="-424" T="-529" R="202" G="75" B="87" A="255"/>
+	<Vtx X="-23" Y="32" Z="0" S="-426" T="-273" R="181" G="103" B="0" A="255"/>
+	<Vtx X="-37" Y="12" Z="0" S="-324" T="-273" R="135" G="39" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="0" S="495" T="-273" R="0" G="127" B="0" A="255"/>
+	<Vtx X="23" Y="32" Z="0" S="393" T="-273" R="75" G="103" B="1" A="255"/>
+	<Vtx X="22" Y="30" Z="-4" S="395" T="-17" R="54" G="75" B="169" A="255"/>
+	<Vtx X="0" Y="37" Z="-4" S="493" T="-17" R="0" G="93" B="169" A="255"/>
+	<Vtx X="0" Y="37" Z="-4" S="242" T="-5" R="0" G="93" B="169" A="255"/>
+	<Vtx X="22" Y="30" Z="-4" S="381" T="40" R="54" G="75" B="169" A="255"/>
+	<Vtx X="20" Y="27" Z="-5" S="364" T="67" R="16" G="22" B="132" A="255"/>
+	<Vtx X="0" Y="34" Z="-5" S="239" T="27" R="0" G="28" B="132" A="255"/>
+	<Vtx X="23" Y="32" Z="0" S="393" T="-273" R="75" G="103" B="1" A="255"/>
+	<Vtx X="37" Y="12" Z="0" S="291" T="-273" R="120" G="41" B="0" A="255"/>
+	<Vtx X="36" Y="12" Z="-4" S="293" T="-17" R="88" G="28" B="169" A="255"/>
+	<Vtx X="22" Y="30" Z="-4" S="391" T="-17" R="54" G="75" B="169" A="255"/>
+	<Vtx X="22" Y="30" Z="-4" S="386" T="43" R="54" G="75" B="169" A="255"/>
+	<Vtx X="36" Y="12" Z="-4" S="471" T="161" R="88" G="28" B="169" A="255"/>
+	<Vtx X="32" Y="10" Z="-5" S="442" T="174" R="27" G="8" B="132" A="255"/>
+	<Vtx X="37" Y="12" Z="0" S="291" T="-273" R="120" G="41" B="0" A="255"/>
+	<Vtx X="37" Y="-12" Z="0" S="188" T="-273" R="121" G="216" B="255" A="255"/>
+	<Vtx X="36" Y="-12" Z="-4" S="190" T="-17" R="88" G="228" B="169" A="255"/>
+	<Vtx X="36" Y="12" Z="-4" S="289" T="-17" R="88" G="28" B="169" A="255"/>
+	<Vtx X="36" Y="12" Z="-4" S="473" T="167" R="88" G="28" B="169" A="255"/>
+	<Vtx X="36" Y="-12" Z="-4" S="473" T="312" R="88" G="228" B="169" A="255"/>
+	<Vtx X="32" Y="-10" Z="-5" S="442" T="305" R="27" G="248" B="132" A="255"/>
+	<Vtx X="32" Y="10" Z="-5" S="442" T="174" R="27" G="8" B="132" A="255"/>
+	<Vtx X="37" Y="-12" Z="0" S="188" T="-273" R="121" G="216" B="255" A="255"/>
+	<Vtx X="23" Y="-32" Z="0" S="86" T="-273" R="75" G="153" B="0" A="255"/>
+	<Vtx X="22" Y="-30" Z="-4" S="88" T="-17" R="54" G="181" B="169" A="255"/>
+	<Vtx X="36" Y="-12" Z="-4" S="186" T="-17" R="88" G="228" B="169" A="255"/>
+	<Vtx X="36" Y="-12" Z="-4" S="471" T="318" R="88" G="228" B="169" A="255"/>
+	<Vtx X="22" Y="-30" Z="-4" S="386" T="436" R="54" G="181" B="169" A="255"/>
+	<Vtx X="20" Y="-27" Z="-5" S="364" T="412" R="16" G="234" B="132" A="255"/>
+	<Vtx X="23" Y="-32" Z="0" S="86" T="-273" R="75" G="153" B="0" A="255"/>
+	<Vtx X="0" Y="-39" Z="0" S="-17" T="-273" R="0" G="129" B="0" A="255"/>
+	<Vtx X="0" Y="-37" Z="-4" S="-14" T="-17" R="0" G="163" B="169" A="255"/>
+	<Vtx X="22" Y="-30" Z="-4" S="84" T="-17" R="54" G="181" B="169" A="255"/>
+	<Vtx X="22" Y="-30" Z="-4" S="381" T="439" R="54" G="181" B="169" A="255"/>
+	<Vtx X="0" Y="-37" Z="-4" S="242" T="484" R="0" G="163" B="169" A="255"/>
+	<Vtx X="0" Y="-34" Z="-5" S="239" T="452" R="0" G="228" B="132" A="255"/>
+	<Vtx X="0" Y="-39" Z="0" S="-17" T="-273" R="0" G="129" B="0" A="255"/>
+	<Vtx X="-23" Y="-32" Z="0" S="-119" T="-273" R="182" G="153" B="0" A="255"/>
+	<Vtx X="-22" Y="-30" Z="-4" S="-117" T="-17" R="202" G="181" B="169" A="255"/>
+	<Vtx X="0" Y="-37" Z="-4" S="-19" T="-17" R="0" G="163" B="169" A="255"/>
+	<Vtx X="0" Y="-37" Z="-4" S="237" T="484" R="0" G="163" B="169" A="255"/>
+	<Vtx X="-22" Y="-30" Z="-4" S="98" T="439" R="202" G="181" B="169" A="255"/>
+	<Vtx X="-20" Y="-27" Z="-5" S="115" T="412" R="240" G="234" B="132" A="255"/>
+	<Vtx X="-23" Y="-32" Z="0" S="-119" T="-273" R="182" G="153" B="0" A="255"/>
+	<Vtx X="-37" Y="-12" Z="0" S="-221" T="-273" R="135" G="217" B="0" A="255"/>
+	<Vtx X="-36" Y="-12" Z="-4" S="-219" T="-17" R="168" G="228" B="169" A="255"/>
+	<Vtx X="-22" Y="-30" Z="-4" S="-121" T="-17" R="202" G="181" B="169" A="255"/>
+	<Vtx X="-22" Y="-30" Z="-4" S="93" T="436" R="202" G="181" B="169" A="255"/>
+	<Vtx X="-36" Y="-12" Z="-4" S="8" T="318" R="168" G="228" B="169" A="255"/>
+	<Vtx X="-32" Y="-10" Z="-5" S="37" T="305" R="229" G="248" B="132" A="255"/>
+	<Vtx X="-37" Y="-12" Z="0" S="-221" T="-273" R="135" G="217" B="0" A="255"/>
+	<Vtx X="-37" Y="12" Z="0" S="-324" T="-273" R="135" G="39" B="0" A="255"/>
+	<Vtx X="-36" Y="12" Z="-4" S="-322" T="-17" R="168" G="28" B="169" A="255"/>
+	<Vtx X="-36" Y="-12" Z="-4" S="-223" T="-17" R="168" G="228" B="169" A="255"/>
+	<Vtx X="-36" Y="-12" Z="-4" S="6" T="312" R="168" G="228" B="169" A="255"/>
+	<Vtx X="-36" Y="12" Z="-4" S="6" T="167" R="168" G="28" B="169" A="255"/>
+	<Vtx X="-32" Y="10" Z="-5" S="37" T="174" R="229" G="8" B="132" A="255"/>
+	<Vtx X="-32" Y="-10" Z="-5" S="37" T="305" R="229" G="248" B="132" A="255"/>
+	<Vtx X="-37" Y="12" Z="0" S="-324" T="-273" R="135" G="39" B="0" A="255"/>
+	<Vtx X="-23" Y="32" Z="0" S="-426" T="-273" R="181" G="103" B="0" A="255"/>
+	<Vtx X="-22" Y="30" Z="-4" S="-424" T="-17" R="202" G="75" B="169" A="255"/>
+	<Vtx X="-36" Y="12" Z="-4" S="-326" T="-17" R="168" G="28" B="169" A="255"/>
+	<Vtx X="-36" Y="12" Z="-4" S="8" T="161" R="168" G="28" B="169" A="255"/>
+	<Vtx X="-22" Y="30" Z="-4" S="93" T="43" R="202" G="75" B="169" A="255"/>
+	<Vtx X="-20" Y="27" Z="-5" S="115" T="67" R="240" G="22" B="132" A="255"/>
+	<Vtx X="0" Y="34" Z="-5" S="239" T="27" R="0" G="28" B="132" A="255"/>
+	<Vtx X="-22" Y="30" Z="-4" S="98" T="40" R="202" G="75" B="169" A="255"/>
+	<Vtx X="0" Y="37" Z="-4" S="237" T="-5" R="0" G="93" B="169" A="255"/>
+	<Vtx X="0" Y="37" Z="-4" S="-526" T="-17" R="0" G="93" B="169" A="255"/>
+	<Vtx X="-22" Y="30" Z="-4" S="-428" T="-17" R="202" G="75" B="169" A="255"/>
+	<Vtx X="-23" Y="32" Z="0" S="-426" T="-273" R="181" G="103" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="0" S="-529" T="-273" R="0" G="127" B="0" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_ocarina_c_right_button/gOcarinaCRightButtonDL_vtx_cull b/soh/assets/custom/objects/object_ocarina_c_right_button/gOcarinaCRightButtonDL_vtx_cull
new file mode 100644
index 000000000..38adb91be
--- /dev/null
+++ b/soh/assets/custom/objects/object_ocarina_c_right_button/gOcarinaCRightButtonDL_vtx_cull
@@ -0,0 +1,10 @@
+<Vertex Version="0">
+	<Vtx X="-37" Y="-39" Z="-5" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-37" Y="-39" Z="5" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-37" Y="39" Z="5" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-37" Y="39" Z="-5" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="37" Y="-39" Z="-5" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="37" Y="-39" Z="5" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="37" Y="39" Z="5" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="37" Y="39" Z="-5" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_ocarina_c_right_button/mat_gOcarinaCRightButtonDL_f3dlite_ocarina_C_button_edge b/soh/assets/custom/objects/object_ocarina_c_right_button/mat_gOcarinaCRightButtonDL_f3dlite_ocarina_C_button_edge
new file mode 100644
index 000000000..1cb97f9e3
--- /dev/null
+++ b/soh/assets/custom/objects/object_ocarina_c_right_button/mat_gOcarinaCRightButtonDL_f3dlite_ocarina_C_button_edge
@@ -0,0 +1,21 @@
+<DisplayList Version="0">
+	<PipeSync/>
+	<SetCombineLERP A0="G_CCMUX_TEXEL0" B0="G_CCMUX_0" C0="G_CCMUX_SHADE" D0="G_CCMUX_0" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_1" A1="G_CCMUX_COMBINED" B1="G_CCMUX_0" C1="G_CCMUX_PRIMITIVE" D1="G_CCMUX_0" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_COMBINED"/>
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="1" G_CULL_BACK="1" G_FOG="1" G_LIGHTING="1" G_TEXTURE_GEN="1" G_SHADING_SMOOTH="1"  />
+
+	<SetOtherMode Cmd="G_SETOTHERMODE_H" Sft="4" Length="20" G_AD_NOISE="1" G_CD_MAGICSQ="1" G_CK_NONE="1" G_TC_FILT="1" G_TF_BILERP="1" G_TL_TILE="1" G_TD_CLAMP="1" G_TP_PERSP="1" G_CYC_2CYCLE="1" G_PM_NPRIMITIVE="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_L" Sft="0" Length="32" G_AC_NONE="1" G_ZS_PIXEL="1" G_RM_FOG_SHADE_A="1" G_RM_AA_ZB_OPA_SURF2="1" />
+	<Texture S="1984" T="1984" Level="0" Tile="0" On="1"/>
+	<SetTextureLUT Mode="G_TT_NONE"/>
+	<TileSync/>
+	<SetTextureImage Path="objects/object_ocarina_c_right_button/noise_tex" Format="G_IM_FMT_I" Size="G_IM_SIZ_8b_LOAD_BLOCK" Width="1"/>
+	<SetTile Format="G_IM_FMT_I" Size="G_IM_SIZ_8b_LOAD_BLOCK" Line="0" TMem="0" Tile="7" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="511" Dxt="512"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_I" Size="G_IM_SIZ_8b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="124" Lrt="124"/>
+	<SetPrimColor M="0" L="0" R="255" G="160" B="0" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_ocarina_c_right_button/mat_gOcarinaCRightButtonDL_f3dlite_ocarina_C_button_surface b/soh/assets/custom/objects/object_ocarina_c_right_button/mat_gOcarinaCRightButtonDL_f3dlite_ocarina_C_button_surface
new file mode 100644
index 000000000..70fc9e85d
--- /dev/null
+++ b/soh/assets/custom/objects/object_ocarina_c_right_button/mat_gOcarinaCRightButtonDL_f3dlite_ocarina_C_button_surface
@@ -0,0 +1,21 @@
+<DisplayList Version="0">
+	<PipeSync/>
+	<SetCombineLERP A0="G_CCMUX_TEXEL0" B0="G_CCMUX_0" C0="G_CCMUX_SHADE" D0="G_CCMUX_0" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_1" A1="G_CCMUX_COMBINED" B1="G_CCMUX_0" C1="G_CCMUX_PRIMITIVE" D1="G_CCMUX_0" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_COMBINED"/>
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="1" G_CULL_BACK="1" G_FOG="1" G_LIGHTING="1" G_TEXTURE_GEN="1" G_SHADING_SMOOTH="1"  />
+
+	<SetOtherMode Cmd="G_SETOTHERMODE_H" Sft="4" Length="20" G_AD_NOISE="1" G_CD_MAGICSQ="1" G_CK_NONE="1" G_TC_FILT="1" G_TF_BILERP="1" G_TL_TILE="1" G_TD_CLAMP="1" G_TP_PERSP="1" G_CYC_2CYCLE="1" G_PM_NPRIMITIVE="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_L" Sft="0" Length="32" G_AC_NONE="1" G_ZS_PIXEL="1" G_RM_FOG_SHADE_A="1" G_RM_AA_ZB_OPA_SURF2="1" />
+	<Texture S="2621" T="1311" Level="0" Tile="0" On="1"/>
+	<SetTextureLUT Mode="G_TT_NONE"/>
+	<TileSync/>
+	<SetTextureImage Path="objects/object_ocarina_c_right_button/noise_tex" Format="G_IM_FMT_I" Size="G_IM_SIZ_8b_LOAD_BLOCK" Width="1"/>
+	<SetTile Format="G_IM_FMT_I" Size="G_IM_SIZ_8b_LOAD_BLOCK" Line="0" TMem="0" Tile="7" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="511" Dxt="512"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_I" Size="G_IM_SIZ_8b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="124" Lrt="124"/>
+	<SetPrimColor M="0" L="0" R="170" G="107" B="0" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_ocarina_c_right_button/noise_tex b/soh/assets/custom/objects/object_ocarina_c_right_button/noise_tex
new file mode 100644
index 0000000000000000000000000000000000000000..aaf4e331f15f797a3b1122b58c57b3767e66bc0f
GIT binary patch
literal 1116
zcma)5S&rmH5G^FcIk*X5eDlKxBf5LKx?JV<zND9QdQWd<yUM%Ec1`sZ(=$CnVgPXg
zj=~kV0y%;M5K<^Y%E*X}_g=16tJM$Re*fJUB>w&9uYY}ZlKyY|id266pZ|L)_-3^t
z{^e>VIz`u(`^dKQ%g2w`bDu%x{^r%I8%i=wg`pMy&>oT`wvAwTeqNf)RT*l1cl(+W
z4O3wm5FDBuCz%Uiv0TQ&*Cj#VNy!7F8h~R}KQ9uT<sn4bc%G_I6GT;0xy}7XAc0Xl
z9EM4G%%b!-&hwC40w?Q+Os^j}O=W1^_ib-q*JV+41F@s8a3Ua`shwm1mN7#QI_dF{
zC3#gJ4`q&_A_E=pJ4Q7D!zjqoEu1AT@}e}suH(73Ws=D>qZsmTyW<5x_pt+H9l4&R
zNV*$EuA#8o9Vc?s{bsv;)Pm5GMBTP6z|sQ5v2V)EX1(5QHV?AIOLmqzz`$u>%G@KX
zAm1U#Q1`b#-cdY`0zWyHA&UB`uvJOq1z;j%s@!gUchADQtBSnLBiuZ{ObIeINsvAl
zKp>GPf~X&wGE1T`oqzfLxlOSLfeJL;gpe$uxkXczdF&C0F2DWpa%!p~b}e0&RKxLI
z%T231NzwpnD1Z9&={oddS76r=ISB@l@A&(Ji`>A~6jZ+b`Tf)mbH67OcwTj)5Scc{
zK!pLxobvMFI`+$@k4zv-0AY+25fE@S6z$W{&&H?oX}(_jP*+sLjS^qu9wmr;+rj%{
zAEy-|@BH@CVH4;m%+kORMa{#BXIWla6lGO6!#wp(?ire4hv`1{96uqtA;^bi)3$9t
zo$9i#W2i_9OzJvM;xx4+nwI?IFm%JTj73}=LclXD2+J}FLmcRYNZGH3zUij9O&r(N
zIC{GkOwTb52m2bcW%RfiySf=qM4ckHqqfwB78L>#iUN&&l-#mE4Q;=iy9hjP)*G6p
zcAUU-vK4wNFT$)pja`3!_q^mt=2&vXvP9&Xrb8$zFlv{%J+_yZm#3OgWf__(%K$o#
zDT@+s;Ci{tRaQ>d>(W(+JVHPr6kC2^iS&+v`RR%Lt01bUX&g>t6B|4yh?4GjP~1K+
zRyjYNyVUUyr+Hf5EKR78{fMr0WJ>e{hl<lY9%I`(zIpc(8Bw{y=JoB(-A*<Qg`xfd
D(@X%Y

literal 0
HcmV?d00001

diff --git a/soh/assets/custom/objects/object_ocarina_c_up_button/gOcarinaCUpButtonDL b/soh/assets/custom/objects/object_ocarina_c_up_button/gOcarinaCUpButtonDL
new file mode 100644
index 000000000..36b1ff7a2
--- /dev/null
+++ b/soh/assets/custom/objects/object_ocarina_c_up_button/gOcarinaCUpButtonDL
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<ClearGeometryMode G_LIGHTING="1" />
+	<LoadVertices Path="objects/object_ocarina_c_up_button/gOcarinaCUpButtonDL_vtx_cull" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
+	<CullDisplayList Start="0" End="7"/>
+	<CallDisplayList Path="objects/object_ocarina_c_up_button/mat_gOcarinaCUpButtonDL_f3dlite_ocarina_C_button_surface"/>
+	<CallDisplayList Path="objects/object_ocarina_c_up_button/gOcarinaCUpButtonDL_tri_0"/>
+	<CallDisplayList Path="objects/object_ocarina_c_up_button/mat_gOcarinaCUpButtonDL_f3dlite_ocarina_C_button_edge"/>
+	<CallDisplayList Path="objects/object_ocarina_c_up_button/gOcarinaCUpButtonDL_tri_1"/>
+	<PipeSync/>
+	<SetGeometryMode G_LIGHTING="1" />
+	<ClearGeometryMode G_TEXTURE_GEN="1" />
+	<SetCombineLERP A0="G_CCMUX_0" B0="G_CCMUX_0" C0="G_CCMUX_0" D0="G_CCMUX_SHADE" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_ENVIRONMENT" A1="G_CCMUX_0" B1="G_CCMUX_0" C1="G_CCMUX_0" D1="G_CCMUX_SHADE" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_ENVIRONMENT"/>
+	<Texture S="65535" T="65535" Level="0" Tile="0" On="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_ocarina_c_up_button/gOcarinaCUpButtonDL_tri_0 b/soh/assets/custom/objects/object_ocarina_c_up_button/gOcarinaCUpButtonDL_tri_0
new file mode 100644
index 000000000..f46f7c565
--- /dev/null
+++ b/soh/assets/custom/objects/object_ocarina_c_up_button/gOcarinaCUpButtonDL_tri_0
@@ -0,0 +1,29 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_ocarina_c_up_button/gOcarinaCUpButtonDL_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="3" V01="5" V02="6" Flag0="0" V10="5" V11="7" V12="6" Flag1="0"/>
+	<Triangles2 V00="6" V01="8" V02="3" Flag0="0" V10="8" V11="9" V12="3" Flag1="0"/>
+	<Triangles2 V00="10" V01="11" V02="12" Flag0="0" V10="13" V11="10" V12="12" Flag1="0"/>
+	<Triangles2 V00="12" V01="14" V02="13" Flag0="0" V10="12" V11="15" V12="14" Flag1="0"/>
+	<Triangles2 V00="14" V01="16" V02="13" Flag0="0" V10="17" V11="1" V12="18" Flag1="0"/>
+	<Triangles2 V00="18" V01="1" V02="19" Flag0="0" V10="20" V11="21" V12="22" Flag1="0"/>
+	<Triangles2 V00="22" V01="21" V02="23" Flag0="0" V10="24" V11="22" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="23" V02="25" Flag0="0" V10="26" V11="24" V12="25" Flag1="0"/>
+	<Triangles2 V00="25" V01="27" V02="26" Flag0="0" V10="27" V11="28" V12="26" Flag1="0"/>
+	<Triangles2 V00="28" V01="29" V02="26" Flag0="0" V10="29" V11="30" V12="26" Flag1="0"/>
+	<Triangle1 V00="30" V01="29" V02="31"/>
+	<LoadVertices Path="objects/object_ocarina_c_up_button/gOcarinaCUpButtonDL_vtx_0" VertexBufferIndex="0" VertexOffset="32" Count="28"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="2" V01="4" V02="3" Flag0="0" V10="0" V11="3" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="0" V02="5" Flag0="0" V10="6" V11="5" V12="7" Flag1="0"/>
+	<Triangles2 V00="7" V01="8" V02="6" Flag0="0" V10="8" V11="9" V12="6" Flag1="0"/>
+	<Triangles2 V00="9" V01="10" V02="6" Flag0="0" V10="9" V11="11" V12="10" Flag1="0"/>
+	<Triangles2 V00="11" V01="12" V02="10" Flag0="0" V10="12" V11="13" V12="10" Flag1="0"/>
+	<Triangles2 V00="0" V01="14" V02="1" Flag0="0" V10="15" V11="16" V12="17" Flag1="0"/>
+	<Triangles2 V00="18" V01="19" V02="20" Flag0="0" V10="18" V11="20" V12="21" Flag1="0"/>
+	<Triangles2 V00="20" V01="22" V02="21" Flag0="0" V10="21" V11="23" V12="18" Flag1="0"/>
+	<Triangles2 V00="21" V01="24" V02="23" Flag0="0" V10="21" V11="25" V12="24" Flag1="0"/>
+	<Triangles2 V00="24" V01="26" V02="23" Flag0="0" V10="23" V11="27" V12="18" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_ocarina_c_up_button/gOcarinaCUpButtonDL_tri_1 b/soh/assets/custom/objects/object_ocarina_c_up_button/gOcarinaCUpButtonDL_tri_1
new file mode 100644
index 000000000..80954ffe2
--- /dev/null
+++ b/soh/assets/custom/objects/object_ocarina_c_up_button/gOcarinaCUpButtonDL_tri_1
@@ -0,0 +1,97 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_ocarina_c_up_button/gOcarinaCUpButtonDL_vtx_1" VertexBufferIndex="0" VertexOffset="0" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="3" V01="2" V02="4" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="3" V01="6" V02="0" Flag0="0" V10="6" V11="3" V12="7" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="1" V11="9" V12="10" Flag1="0"/>
+	<Triangles2 V00="1" V01="10" V02="11" Flag0="0" V10="11" V11="10" V12="12" Flag1="0"/>
+	<Triangles2 V00="11" V01="12" V02="4" Flag0="0" V10="13" V11="14" V12="15" Flag1="0"/>
+	<Triangles2 V00="13" V01="15" V02="16" Flag0="0" V10="16" V11="15" V12="17" Flag1="0"/>
+	<Triangles2 V00="16" V01="17" V02="18" Flag0="0" V10="19" V11="20" V12="21" Flag1="0"/>
+	<Triangles2 V00="19" V01="21" V02="22" Flag0="0" V10="23" V11="19" V12="22" Flag1="0"/>
+	<Triangles2 V00="23" V01="24" V02="19" Flag0="0" V10="9" V11="25" V12="26" Flag1="0"/>
+	<Triangles2 V00="9" V01="26" V02="27" Flag0="0" V10="27" V11="26" V12="28" Flag1="0"/>
+	<Triangles2 V00="27" V01="28" V02="12" Flag0="0" V10="29" V11="20" V12="30" Flag1="0"/>
+	<Triangle1 V00="29" V01="30" V02="31"/>
+	<LoadVertices Path="objects/object_ocarina_c_up_button/gOcarinaCUpButtonDL_vtx_1" VertexBufferIndex="0" VertexOffset="32" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="3" V12="1" Flag1="0"/>
+	<Triangles2 V00="4" V01="1" V02="3" Flag0="0" V10="4" V11="3" V12="5" Flag1="0"/>
+	<Triangles2 V00="5" V01="6" V02="4" Flag0="0" V10="5" V11="7" V12="6" Flag1="0"/>
+	<Triangles2 V00="8" V01="4" V02="6" Flag0="0" V10="8" V11="9" V12="4" Flag1="0"/>
+	<Triangles2 V00="9" V01="1" V02="4" Flag0="0" V10="9" V11="10" V12="1" Flag1="0"/>
+	<Triangles2 V00="11" V01="8" V02="6" Flag0="0" V10="11" V11="6" V12="12" Flag1="0"/>
+	<Triangles2 V00="13" V01="12" V02="6" Flag0="0" V10="13" V11="14" V12="12" Flag1="0"/>
+	<Triangles2 V00="15" V01="16" V02="17" Flag0="0" V10="15" V11="17" V12="18" Flag1="0"/>
+	<Triangles2 V00="15" V01="18" V02="19" Flag0="0" V10="15" V11="19" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="22" V02="23" Flag0="0" V10="21" V11="23" V12="24" Flag1="0"/>
+	<Triangles2 V00="21" V01="24" V02="25" Flag0="0" V10="21" V11="25" V12="26" Flag1="0"/>
+	<Triangles2 V00="27" V01="28" V02="29" Flag0="0" V10="27" V11="29" V12="30" Flag1="0"/>
+	<Triangle1 V00="31" V01="30" V02="29"/>
+	<LoadVertices Path="objects/object_ocarina_c_up_button/gOcarinaCUpButtonDL_vtx_1" VertexBufferIndex="0" VertexOffset="64" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="3" V01="5" V02="6" Flag0="0" V10="7" V11="3" V12="6" Flag1="0"/>
+	<Triangles2 V00="7" V01="6" V02="8" Flag0="0" V10="8" V11="9" V12="7" Flag1="0"/>
+	<Triangles2 V00="8" V01="10" V02="9" Flag0="0" V10="11" V11="9" V12="10" Flag1="0"/>
+	<Triangles2 V00="11" V01="10" V02="12" Flag0="0" V10="12" V11="13" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="14" V02="13" Flag0="0" V10="14" V11="15" V12="13" Flag1="0"/>
+	<Triangles2 V00="14" V01="16" V02="15" Flag0="0" V10="17" V11="15" V12="16" Flag1="0"/>
+	<Triangles2 V00="17" V01="16" V02="18" Flag0="0" V10="18" V11="19" V12="17" Flag1="0"/>
+	<Triangles2 V00="18" V01="20" V02="19" Flag0="0" V10="21" V11="22" V12="5" Flag1="0"/>
+	<Triangles2 V00="21" V01="23" V02="22" Flag0="0" V10="23" V11="24" V12="22" Flag1="0"/>
+	<Triangles2 V00="23" V01="25" V02="24" Flag0="0" V10="25" V11="26" V12="24" Flag1="0"/>
+	<Triangles2 V00="25" V01="27" V02="26" Flag0="0" V10="28" V11="26" V12="27" Flag1="0"/>
+	<Triangles2 V00="28" V01="27" V02="29" Flag0="0" V10="29" V11="30" V12="28" Flag1="0"/>
+	<Triangle1 V00="29" V01="31" V02="30"/>
+	<LoadVertices Path="objects/object_ocarina_c_up_button/gOcarinaCUpButtonDL_vtx_1" VertexBufferIndex="0" VertexOffset="96" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="4" V11="6" V12="7" Flag1="0"/>
+	<Triangles2 V00="6" V01="8" V02="7" Flag0="0" V10="6" V11="9" V12="8" Flag1="0"/>
+	<Triangles2 V00="10" V01="11" V02="12" Flag0="0" V10="10" V11="12" V12="13" Flag1="0"/>
+	<Triangles2 V00="14" V01="15" V02="16" Flag0="0" V10="14" V11="16" V12="17" Flag1="0"/>
+	<Triangles2 V00="11" V01="18" V02="19" Flag0="0" V10="11" V11="19" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="22" V02="23" Flag0="0" V10="21" V11="23" V12="16" Flag1="0"/>
+	<Triangles2 V00="18" V01="24" V02="25" Flag0="0" V10="18" V11="25" V12="26" Flag1="0"/>
+	<Triangles2 V00="27" V01="28" V02="29" Flag0="0" V10="27" V11="29" V12="23" Flag1="0"/>
+	<Triangle1 V00="24" V01="30" V02="31"/>
+	<LoadVertices Path="objects/object_ocarina_c_up_button/gOcarinaCUpButtonDL_vtx_1" VertexBufferIndex="0" VertexOffset="128" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="3" V01="5" V02="6" Flag0="0" V10="7" V11="8" V12="9" Flag1="0"/>
+	<Triangles2 V00="7" V01="9" V02="10" Flag0="0" V10="11" V11="12" V12="13" Flag1="0"/>
+	<Triangles2 V00="11" V01="13" V02="5" Flag0="0" V10="8" V11="14" V12="15" Flag1="0"/>
+	<Triangles2 V00="8" V01="15" V02="16" Flag0="0" V10="17" V11="18" V12="19" Flag1="0"/>
+	<Triangles2 V00="17" V01="19" V02="13" Flag0="0" V10="14" V11="20" V12="21" Flag1="0"/>
+	<Triangles2 V00="14" V01="21" V02="22" Flag0="0" V10="23" V11="24" V12="25" Flag1="0"/>
+	<Triangles2 V00="23" V01="25" V02="19" Flag0="0" V10="20" V11="26" V12="27" Flag1="0"/>
+	<Triangles2 V00="20" V01="27" V02="28" Flag0="0" V10="29" V11="30" V12="31" Flag1="0"/>
+	<Triangle1 V00="29" V01="31" V02="25"/>
+	<LoadVertices Path="objects/object_ocarina_c_up_button/gOcarinaCUpButtonDL_vtx_1" VertexBufferIndex="0" VertexOffset="160" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="4" V11="6" V12="7" Flag1="0"/>
+	<Triangles2 V00="8" V01="6" V02="9" Flag0="0" V10="8" V11="9" V12="10" Flag1="0"/>
+	<Triangles2 V00="11" V01="12" V02="1" Flag0="0" V10="11" V11="1" V12="13" Flag1="0"/>
+	<Triangles2 V00="14" V01="15" V02="16" Flag0="0" V10="14" V11="16" V12="17" Flag1="0"/>
+	<Triangles2 V00="18" V01="19" V02="20" Flag0="0" V10="18" V11="20" V12="21" Flag1="0"/>
+	<Triangles2 V00="22" V01="23" V02="24" Flag0="0" V10="22" V11="24" V12="25" Flag1="0"/>
+	<Triangles2 V00="26" V01="27" V02="28" Flag0="0" V10="26" V11="28" V12="20" Flag1="0"/>
+	<Triangle1 V00="29" V01="30" V02="31"/>
+	<LoadVertices Path="objects/object_ocarina_c_up_button/gOcarinaCUpButtonDL_vtx_1" VertexBufferIndex="0" VertexOffset="192" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="3" V01="5" V02="6" Flag0="0" V10="7" V11="8" V12="9" Flag1="0"/>
+	<Triangles2 V00="7" V01="9" V02="10" Flag0="0" V10="11" V11="12" V12="13" Flag1="0"/>
+	<Triangles2 V00="11" V01="13" V02="5" Flag0="0" V10="14" V11="15" V12="16" Flag1="0"/>
+	<Triangles2 V00="14" V01="16" V02="17" Flag0="0" V10="18" V11="19" V12="20" Flag1="0"/>
+	<Triangles2 V00="18" V01="20" V02="13" Flag0="0" V10="21" V11="22" V12="23" Flag1="0"/>
+	<Triangles2 V00="21" V01="23" V02="24" Flag0="0" V10="25" V11="26" V12="27" Flag1="0"/>
+	<Triangles2 V00="25" V01="27" V02="20" Flag0="0" V10="28" V11="29" V12="30" Flag1="0"/>
+	<Triangle1 V00="28" V01="30" V02="31"/>
+	<LoadVertices Path="objects/object_ocarina_c_up_button/gOcarinaCUpButtonDL_vtx_1" VertexBufferIndex="0" VertexOffset="224" Count="25"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="4" V11="6" V12="7" Flag1="0"/>
+	<Triangles2 V00="8" V01="9" V02="10" Flag0="0" V10="8" V11="10" V12="2" Flag1="0"/>
+	<Triangles2 V00="11" V01="12" V02="13" Flag0="0" V10="11" V11="13" V12="14" Flag1="0"/>
+	<Triangles2 V00="15" V01="16" V02="17" Flag0="0" V10="15" V11="17" V12="10" Flag1="0"/>
+	<Triangles2 V00="18" V01="17" V02="19" Flag0="0" V10="18" V11="19" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="22" V02="23" Flag0="0" V10="21" V11="23" V12="24" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_ocarina_c_up_button/gOcarinaCUpButtonDL_vtx_0 b/soh/assets/custom/objects/object_ocarina_c_up_button/gOcarinaCUpButtonDL_vtx_0
new file mode 100644
index 000000000..a35cf324a
--- /dev/null
+++ b/soh/assets/custom/objects/object_ocarina_c_up_button/gOcarinaCUpButtonDL_vtx_0
@@ -0,0 +1,62 @@
+<Vertex Version="0">
+	<Vtx X="2" Y="27" Z="2" S="-16" T="-511" R="41" G="90" B="79" A="255"/>
+	<Vtx X="0" Y="22" Z="2" S="16" T="-480" R="0" G="0" B="127" A="255"/>
+	<Vtx X="6" Y="23" Z="2" S="8" T="-488" R="77" G="52" B="86" A="255"/>
+	<Vtx X="0" Y="22" Z="2" S="-16" T="-480" R="0" G="0" B="127" A="255"/>
+	<Vtx X="0" Y="-18" Z="2" S="48" T="-288" R="0" G="166" B="90" A="255"/>
+	<Vtx X="13" Y="-18" Z="2" S="48" T="-288" R="12" G="163" B="86" A="255"/>
+	<Vtx X="22" Y="-12" Z="2" S="-7" T="-317" R="97" G="239" B="81" A="255"/>
+	<Vtx X="19" Y="-16" Z="2" S="16" T="-296" R="59" G="177" B="81" A="255"/>
+	<Vtx X="20" Y="-6" Z="2" S="-16" T="-345" R="88" G="30" B="86" A="255"/>
+	<Vtx X="6" Y="23" Z="2" S="-16" T="-487" R="77" G="52" B="86" A="255"/>
+	<Vtx X="-19" Y="-16" Z="2" S="112" T="-296" R="197" G="177" B="81" A="255"/>
+	<Vtx X="-13" Y="-18" Z="2" S="112" T="-288" R="244" G="163" B="86" A="255"/>
+	<Vtx X="0" Y="-18" Z="2" S="112" T="-288" R="0" G="166" B="90" A="255"/>
+	<Vtx X="-22" Y="-12" Z="2" S="112" T="-317" R="159" G="239" B="81" A="255"/>
+	<Vtx X="-6" Y="23" Z="2" S="141" T="-487" R="179" G="52" B="86" A="255"/>
+	<Vtx X="0" Y="22" Z="2" S="112" T="-480" R="0" G="0" B="127" A="255"/>
+	<Vtx X="-20" Y="-6" Z="2" S="112" T="-345" R="168" G="30" B="86" A="255"/>
+	<Vtx X="-6" Y="23" Z="2" S="13" T="-487" R="179" G="52" B="86" A="255"/>
+	<Vtx X="-2" Y="27" Z="2" S="2" T="-508" R="215" G="90" B="79" A="255"/>
+	<Vtx X="2" Y="27" Z="2" S="2" T="-508" R="41" G="90" B="79" A="255"/>
+	<Vtx X="-4" Y="30" Z="5" S="-166" T="-224" R="9" G="236" B="125" A="255"/>
+	<Vtx X="0" Y="30" Z="5" S="-146" T="-224" R="0" G="232" B="125" A="255"/>
+	<Vtx X="0" Y="34" Z="5" S="-145" T="-245" R="0" G="28" B="124" A="255"/>
+	<Vtx X="4" Y="30" Z="5" S="-122" T="-224" R="247" G="236" B="125" A="255"/>
+	<Vtx X="20" Y="27" Z="5" S="-19" T="-203" R="16" G="22" B="124" A="255"/>
+	<Vtx X="8" Y="25" Z="5" S="-91" T="-188" R="236" G="243" B="125" A="255"/>
+	<Vtx X="32" Y="-12" Z="5" S="58" T="41" R="28" G="245" B="123" A="255"/>
+	<Vtx X="23" Y="-5" Z="5" S="3" T="0" R="233" G="248" B="125" A="255"/>
+	<Vtx X="25" Y="-12" Z="5" S="12" T="42" R="231" G="3" B="124" A="255"/>
+	<Vtx X="20" Y="-20" Z="5" S="-19" T="92" R="247" G="15" B="126" A="255"/>
+	<Vtx X="22" Y="-26" Z="5" S="-8" T="133" R="19" G="234" B="124" A="255"/>
+	<Vtx X="15" Y="-21" Z="5" S="-49" T="100" R="253" G="22" B="125" A="255"/>
+	<Vtx X="-20" Y="-27" Z="5" S="-269" T="140" R="240" G="234" B="124" A="255"/>
+	<Vtx X="22" Y="-26" Z="5" S="-8" T="133" R="19" G="234" B="124" A="255"/>
+	<Vtx X="15" Y="-21" Z="5" S="-49" T="100" R="253" G="22" B="125" A="255"/>
+	<Vtx X="-14" Y="-21" Z="5" S="-230" T="100" R="3" G="24" B="125" A="255"/>
+	<Vtx X="0" Y="-21" Z="5" S="-144" T="100" R="0" G="24" B="125" A="255"/>
+	<Vtx X="-21" Y="-19" Z="5" S="-276" T="87" R="14" G="18" B="125" A="255"/>
+	<Vtx X="-32" Y="-10" Z="5" S="-346" T="34" R="229" G="248" B="124" A="255"/>
+	<Vtx X="-25" Y="-13" Z="5" S="-301" T="47" R="23" G="4" B="125" A="255"/>
+	<Vtx X="-23" Y="-5" Z="5" S="-291" T="0" R="23" G="248" B="125" A="255"/>
+	<Vtx X="-8" Y="25" Z="5" S="-197" T="-188" R="20" G="243" B="125" A="255"/>
+	<Vtx X="-32" Y="10" Z="5" S="-346" T="-98" R="229" G="8" B="124" A="255"/>
+	<Vtx X="-4" Y="30" Z="5" S="-166" T="-224" R="9" G="236" B="125" A="255"/>
+	<Vtx X="0" Y="34" Z="5" S="-145" T="-245" R="0" G="28" B="124" A="255"/>
+	<Vtx X="-20" Y="27" Z="5" S="-269" T="-205" R="240" G="23" B="124" A="255"/>
+	<Vtx X="-1" Y="-33" Z="5" S="-149" T="179" R="255" G="229" B="124" A="255"/>
+	<Vtx X="32" Y="-12" Z="5" S="58" T="41" R="28" G="245" B="123" A="255"/>
+	<Vtx X="32" Y="10" Z="5" S="58" T="-98" R="27" G="8" B="124" A="255"/>
+	<Vtx X="20" Y="27" Z="5" S="-19" T="-203" R="16" G="22" B="124" A="255"/>
+	<Vtx X="-32" Y="10" Z="-5" S="166" T="-98" R="229" G="8" B="132" A="255"/>
+	<Vtx X="-20" Y="27" Z="-5" S="243" T="-204" R="240" G="22" B="132" A="255"/>
+	<Vtx X="0" Y="34" Z="-5" S="368" T="-245" R="0" G="28" B="132" A="255"/>
+	<Vtx X="32" Y="10" Z="-5" S="570" T="-98" R="27" G="8" B="132" A="255"/>
+	<Vtx X="20" Y="27" Z="-5" S="493" T="-204" R="16" G="22" B="132" A="255"/>
+	<Vtx X="-20" Y="-27" Z="-5" S="243" T="140" R="240" G="234" B="132" A="255"/>
+	<Vtx X="20" Y="-27" Z="-5" S="493" T="140" R="16" G="234" B="132" A="255"/>
+	<Vtx X="32" Y="-10" Z="-5" S="570" T="34" R="27" G="248" B="132" A="255"/>
+	<Vtx X="0" Y="-34" Z="-5" S="368" T="181" R="0" G="228" B="132" A="255"/>
+	<Vtx X="-32" Y="-10" Z="-5" S="166" T="34" R="229" G="248" B="132" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_ocarina_c_up_button/gOcarinaCUpButtonDL_vtx_1 b/soh/assets/custom/objects/object_ocarina_c_up_button/gOcarinaCUpButtonDL_vtx_1
new file mode 100644
index 000000000..09a4018d3
--- /dev/null
+++ b/soh/assets/custom/objects/object_ocarina_c_up_button/gOcarinaCUpButtonDL_vtx_1
@@ -0,0 +1,251 @@
+<Vertex Version="0">
+	<Vtx X="-2" Y="27" Z="2" S="-145" T="-273" R="215" G="90" B="79" A="255"/>
+	<Vtx X="2" Y="27" Z="2" S="-145" T="-239" R="41" G="90" B="79" A="255"/>
+	<Vtx X="2" Y="27" Z="2" S="-135" T="-239" R="254" G="250" B="127" A="255"/>
+	<Vtx X="0" Y="27" Z="2" S="-135" T="-259" R="0" G="24" B="125" A="255"/>
+	<Vtx X="3" Y="28" Z="4" S="-245" T="-239" R="224" G="184" B="100" A="255"/>
+	<Vtx X="0" Y="28" Z="4" S="-245" T="-259" R="0" G="166" B="90" A="255"/>
+	<Vtx X="-2" Y="27" Z="2" S="-135" T="-273" R="2" G="250" B="127" A="255"/>
+	<Vtx X="0" Y="28" Z="4" S="-245" T="-259" R="0" G="166" B="90" A="255"/>
+	<Vtx X="-3" Y="28" Z="4" S="-245" T="-273" R="32" G="184" B="100" A="255"/>
+	<Vtx X="6" Y="23" Z="2" S="-145" T="-215" R="77" G="52" B="86" A="255"/>
+	<Vtx X="6" Y="23" Z="2" S="-135" T="-215" R="12" G="8" B="126" A="255"/>
+	<Vtx X="2" Y="27" Z="2" S="-135" T="-239" R="254" G="250" B="127" A="255"/>
+	<Vtx X="7" Y="24" Z="4" S="-245" T="-215" R="183" G="208" B="92" A="255"/>
+	<Vtx X="22" Y="-12" Z="2" S="-145" T="-49" R="97" G="239" B="81" A="255"/>
+	<Vtx X="19" Y="-16" Z="2" S="-145" T="-17" R="59" G="177" B="81" A="255"/>
+	<Vtx X="19" Y="-16" Z="2" S="-135" T="-17" R="244" G="252" B="126" A="255"/>
+	<Vtx X="22" Y="-12" Z="2" S="-135" T="-49" R="252" G="8" B="127" A="255"/>
+	<Vtx X="19" Y="-17" Z="4" S="-245" T="-17" R="205" G="65" B="97" A="255"/>
+	<Vtx X="23" Y="-12" Z="4" S="-245" T="-49" R="173" G="16" B="95" A="255"/>
+	<Vtx X="-19" Y="-16" Z="2" S="102" T="-17" R="2" G="2" B="127" A="255"/>
+	<Vtx X="-19" Y="-16" Z="2" S="111" T="-17" R="197" G="177" B="81" A="255"/>
+	<Vtx X="-22" Y="-12" Z="2" S="111" T="-49" R="159" G="239" B="81" A="255"/>
+	<Vtx X="-22" Y="-12" Z="2" S="102" T="-49" R="3" G="0" B="127" A="255"/>
+	<Vtx X="-23" Y="-12" Z="4" S="212" T="-49" R="79" G="14" B="98" A="255"/>
+	<Vtx X="-20" Y="-17" Z="4" S="212" T="-17" R="48" G="65" B="98" A="255"/>
+	<Vtx X="20" Y="-6" Z="2" S="-145" T="-74" R="88" G="30" B="86" A="255"/>
+	<Vtx X="20" Y="-6" Z="2" S="-135" T="-74" R="13" G="4" B="126" A="255"/>
+	<Vtx X="6" Y="23" Z="2" S="-135" T="-215" R="12" G="8" B="126" A="255"/>
+	<Vtx X="21" Y="-6" Z="4" S="-245" T="-74" R="173" G="228" B="92" A="255"/>
+	<Vtx X="-13" Y="-18" Z="2" S="47" T="-17" R="244" G="163" B="86" A="255"/>
+	<Vtx X="-19" Y="-16" Z="2" S="111" T="-26" R="2" G="2" B="127" A="255"/>
+	<Vtx X="-13" Y="-18" Z="2" S="47" T="-26" R="255" G="242" B="126" A="255"/>
+	<Vtx X="-20" Y="-17" Z="4" S="111" T="84" R="48" G="65" B="98" A="255"/>
+	<Vtx X="-13" Y="-18" Z="2" S="47" T="-26" R="255" G="242" B="126" A="255"/>
+	<Vtx X="-19" Y="-16" Z="2" S="111" T="-26" R="2" G="2" B="127" A="255"/>
+	<Vtx X="-13" Y="-19" Z="4" S="47" T="84" R="11" G="87" B="92" A="255"/>
+	<Vtx X="0" Y="-18" Z="2" S="-17" T="-26" R="0" G="232" B="125" A="255"/>
+	<Vtx X="0" Y="-19" Z="4" S="-17" T="84" R="0" G="90" B="90" A="255"/>
+	<Vtx X="13" Y="-18" Z="2" S="-81" T="-26" R="6" G="241" B="126" A="255"/>
+	<Vtx X="14" Y="-19" Z="4" S="-81" T="84" R="245" G="85" B="94" A="255"/>
+	<Vtx X="13" Y="-18" Z="2" S="-81" T="-17" R="12" G="163" B="86" A="255"/>
+	<Vtx X="0" Y="-18" Z="2" S="-17" T="-17" R="0" G="166" B="90" A="255"/>
+	<Vtx X="-13" Y="-18" Z="2" S="47" T="-17" R="244" G="163" B="86" A="255"/>
+	<Vtx X="19" Y="-16" Z="2" S="-145" T="-17" R="59" G="177" B="81" A="255"/>
+	<Vtx X="19" Y="-16" Z="2" S="-145" T="-26" R="244" G="252" B="126" A="255"/>
+	<Vtx X="14" Y="-19" Z="4" S="-84" T="84" R="245" G="85" B="94" A="255"/>
+	<Vtx X="19" Y="-17" Z="4" S="-144" T="84" R="205" G="65" B="97" A="255"/>
+	<Vtx X="-22" Y="-12" Z="2" S="102" T="-49" R="3" G="0" B="127" A="255"/>
+	<Vtx X="-22" Y="-12" Z="2" S="111" T="-49" R="159" G="239" B="81" A="255"/>
+	<Vtx X="-20" Y="-6" Z="2" S="111" T="-74" R="168" G="30" B="86" A="255"/>
+	<Vtx X="-20" Y="-6" Z="2" S="102" T="-74" R="243" G="4" B="126" A="255"/>
+	<Vtx X="-21" Y="-6" Z="4" S="212" T="-74" R="83" G="228" B="92" A="255"/>
+	<Vtx X="-23" Y="-12" Z="4" S="212" T="-49" R="79" G="14" B="98" A="255"/>
+	<Vtx X="-6" Y="23" Z="2" S="102" T="-215" R="244" G="8" B="126" A="255"/>
+	<Vtx X="-6" Y="23" Z="2" S="111" T="-215" R="179" G="52" B="86" A="255"/>
+	<Vtx X="-2" Y="27" Z="2" S="111" T="-273" R="215" G="90" B="79" A="255"/>
+	<Vtx X="-2" Y="27" Z="2" S="102" T="-273" R="2" G="250" B="127" A="255"/>
+	<Vtx X="-3" Y="28" Z="4" S="212" T="-273" R="32" G="184" B="100" A="255"/>
+	<Vtx X="-7" Y="24" Z="4" S="212" T="-215" R="73" G="208" B="92" A="255"/>
+	<Vtx X="20" Y="-6" Z="2" S="-145" T="-74" R="88" G="30" B="86" A="255"/>
+	<Vtx X="22" Y="-12" Z="2" S="-145" T="-49" R="97" G="239" B="81" A="255"/>
+	<Vtx X="22" Y="-12" Z="2" S="-135" T="-49" R="252" G="8" B="127" A="255"/>
+	<Vtx X="20" Y="-6" Z="2" S="-135" T="-74" R="13" G="4" B="126" A="255"/>
+	<Vtx X="23" Y="-12" Z="4" S="-245" T="-49" R="173" G="16" B="95" A="255"/>
+	<Vtx X="23" Y="-12" Z="4" S="-245" T="-49" R="173" G="16" B="95" A="255"/>
+	<Vtx X="21" Y="-6" Z="4" S="-245" T="-74" R="173" G="228" B="92" A="255"/>
+	<Vtx X="20" Y="-6" Z="2" S="-135" T="-74" R="13" G="4" B="126" A="255"/>
+	<Vtx X="-3" Y="28" Z="4" S="-286" T="67" R="32" G="184" B="100" A="255"/>
+	<Vtx X="0" Y="28" Z="4" S="-275" T="67" R="0" G="166" B="90" A="255"/>
+	<Vtx X="0" Y="30" Z="5" S="-275" T="48" R="0" G="232" B="125" A="255"/>
+	<Vtx X="-4" Y="30" Z="5" S="-295" T="48" R="9" G="236" B="125" A="255"/>
+	<Vtx X="-7" Y="24" Z="4" S="-310" T="94" R="73" G="208" B="92" A="255"/>
+	<Vtx X="-8" Y="25" Z="5" S="-326" T="83" R="20" G="243" B="125" A="255"/>
+	<Vtx X="-21" Y="-6" Z="4" S="-402" T="278" R="83" G="228" B="92" A="255"/>
+	<Vtx X="-23" Y="-5" Z="5" S="-420" T="272" R="23" G="248" B="125" A="255"/>
+	<Vtx X="-23" Y="-12" Z="4" S="-409" T="315" R="79" G="14" B="98" A="255"/>
+	<Vtx X="-25" Y="-13" Z="5" S="-429" T="319" R="23" G="4" B="125" A="255"/>
+	<Vtx X="-20" Y="-17" Z="4" S="-392" T="342" R="48" G="65" B="98" A="255"/>
+	<Vtx X="-21" Y="-19" Z="5" S="-404" T="359" R="14" G="18" B="125" A="255"/>
+	<Vtx X="-13" Y="-19" Z="4" S="-356" T="352" R="11" G="87" B="92" A="255"/>
+	<Vtx X="-14" Y="-21" Z="5" S="-358" T="371" R="3" G="24" B="125" A="255"/>
+	<Vtx X="0" Y="-19" Z="4" S="-273" T="352" R="0" G="90" B="90" A="255"/>
+	<Vtx X="0" Y="-21" Z="5" S="-273" T="371" R="0" G="24" B="125" A="255"/>
+	<Vtx X="14" Y="-19" Z="4" S="-189" T="352" R="245" G="85" B="94" A="255"/>
+	<Vtx X="15" Y="-21" Z="5" S="-178" T="371" R="253" G="22" B="125" A="255"/>
+	<Vtx X="0" Y="28" Z="4" S="-275" T="67" R="0" G="166" B="90" A="255"/>
+	<Vtx X="4" Y="30" Z="5" S="-250" T="48" R="247" G="236" B="125" A="255"/>
+	<Vtx X="3" Y="28" Z="4" S="-259" T="67" R="224" G="184" B="100" A="255"/>
+	<Vtx X="8" Y="25" Z="5" S="-219" T="83" R="236" G="243" B="125" A="255"/>
+	<Vtx X="7" Y="24" Z="4" S="-235" T="94" R="183" G="208" B="92" A="255"/>
+	<Vtx X="23" Y="-5" Z="5" S="-125" T="272" R="233" G="248" B="125" A="255"/>
+	<Vtx X="21" Y="-6" Z="4" S="-143" T="278" R="173" G="228" B="92" A="255"/>
+	<Vtx X="25" Y="-12" Z="5" S="-117" T="314" R="231" G="3" B="124" A="255"/>
+	<Vtx X="23" Y="-12" Z="4" S="-136" T="315" R="173" G="16" B="95" A="255"/>
+	<Vtx X="20" Y="-20" Z="5" S="-147" T="363" R="247" G="15" B="126" A="255"/>
+	<Vtx X="19" Y="-17" Z="4" S="-153" T="342" R="205" G="65" B="97" A="255"/>
+	<Vtx X="15" Y="-21" Z="5" S="-178" T="371" R="253" G="22" B="125" A="255"/>
+	<Vtx X="20" Y="-20" Z="5" S="-147" T="363" R="247" G="15" B="126" A="255"/>
+	<Vtx X="19" Y="-17" Z="4" S="-153" T="342" R="205" G="65" B="97" A="255"/>
+	<Vtx X="14" Y="-19" Z="4" S="-188" T="352" R="245" G="85" B="94" A="255"/>
+	<Vtx X="-7" Y="24" Z="4" S="212" T="-215" R="73" G="208" B="92" A="255"/>
+	<Vtx X="-21" Y="-6" Z="4" S="212" T="-74" R="83" G="228" B="92" A="255"/>
+	<Vtx X="-20" Y="-6" Z="2" S="102" T="-74" R="243" G="4" B="126" A="255"/>
+	<Vtx X="-6" Y="23" Z="2" S="102" T="-215" R="244" G="8" B="126" A="255"/>
+	<Vtx X="-6" Y="23" Z="2" S="111" T="-215" R="179" G="52" B="86" A="255"/>
+	<Vtx X="-20" Y="-6" Z="2" S="111" T="-74" R="168" G="30" B="86" A="255"/>
+	<Vtx X="0" Y="34" Z="5" S="-274" T="27" R="0" G="28" B="124" A="255"/>
+	<Vtx X="20" Y="27" Z="5" S="-147" T="68" R="16" G="22" B="124" A="255"/>
+	<Vtx X="22" Y="30" Z="4" S="-131" T="40" R="54" G="75" B="87" A="255"/>
+	<Vtx X="0" Y="37" Z="4" S="-270" T="-5" R="0" G="93" B="87" A="255"/>
+	<Vtx X="0" Y="37" Z="4" S="494" T="-529" R="0" G="93" B="87" A="255"/>
+	<Vtx X="22" Y="30" Z="4" S="395" T="-529" R="54" G="75" B="87" A="255"/>
+	<Vtx X="23" Y="32" Z="0" S="393" T="-273" R="75" G="103" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="0" S="495" T="-273" R="0" G="127" B="0" A="255"/>
+	<Vtx X="32" Y="10" Z="5" S="-70" T="174" R="27" G="8" B="124" A="255"/>
+	<Vtx X="36" Y="12" Z="4" S="-41" T="161" R="88" G="28" B="87" A="255"/>
+	<Vtx X="22" Y="30" Z="4" S="-126" T="43" R="54" G="75" B="87" A="255"/>
+	<Vtx X="22" Y="30" Z="4" S="391" T="-529" R="54" G="75" B="87" A="255"/>
+	<Vtx X="36" Y="12" Z="4" S="293" T="-529" R="88" G="28" B="87" A="255"/>
+	<Vtx X="37" Y="12" Z="0" S="291" T="-273" R="121" G="39" B="0" A="255"/>
+	<Vtx X="32" Y="-12" Z="5" S="-70" T="313" R="28" G="245" B="123" A="255"/>
+	<Vtx X="36" Y="-12" Z="4" S="-39" T="315" R="90" G="226" B="85" A="255"/>
+	<Vtx X="36" Y="12" Z="4" S="-39" T="167" R="88" G="28" B="87" A="255"/>
+	<Vtx X="36" Y="12" Z="4" S="289" T="-529" R="88" G="28" B="87" A="255"/>
+	<Vtx X="36" Y="-12" Z="4" S="189" T="-529" R="90" G="226" B="85" A="255"/>
+	<Vtx X="37" Y="-12" Z="0" S="188" T="-273" R="121" G="218" B="255" A="255"/>
+	<Vtx X="22" Y="-26" Z="5" S="-137" T="404" R="19" G="234" B="124" A="255"/>
+	<Vtx X="23" Y="-30" Z="4" S="-124" T="433" R="56" G="181" B="86" A="255"/>
+	<Vtx X="32" Y="-12" Z="5" S="-70" T="313" R="28" G="245" B="123" A="255"/>
+	<Vtx X="23" Y="-30" Z="4" S="-124" T="433" R="56" G="181" B="86" A="255"/>
+	<Vtx X="36" Y="-12" Z="4" S="-42" T="319" R="90" G="226" B="85" A="255"/>
+	<Vtx X="36" Y="-12" Z="4" S="185" T="-529" R="90" G="226" B="85" A="255"/>
+	<Vtx X="23" Y="-30" Z="4" S="90" T="-529" R="56" G="181" B="86" A="255"/>
+	<Vtx X="23" Y="-32" Z="0" S="86" T="-273" R="73" G="152" B="0" A="255"/>
+	<Vtx X="37" Y="-12" Z="0" S="188" T="-273" R="121" G="218" B="255" A="255"/>
+	<Vtx X="22" Y="-26" Z="5" S="-137" T="404" R="19" G="234" B="124" A="255"/>
+	<Vtx X="-1" Y="-33" Z="5" S="-278" T="450" R="255" G="229" B="124" A="255"/>
+	<Vtx X="0" Y="-37" Z="4" S="-271" T="485" R="0" G="165" B="89" A="255"/>
+	<Vtx X="23" Y="-30" Z="4" S="-128" T="438" R="56" G="181" B="86" A="255"/>
+	<Vtx X="23" Y="-30" Z="4" S="86" T="-529" R="56" G="181" B="86" A="255"/>
+	<Vtx X="0" Y="-37" Z="4" S="-15" T="-529" R="0" G="165" B="89" A="255"/>
+	<Vtx X="0" Y="-39" Z="0" S="-17" T="-273" R="0" G="129" B="1" A="255"/>
+	<Vtx X="-20" Y="-27" Z="5" S="-397" T="412" R="240" G="234" B="124" A="255"/>
+	<Vtx X="-22" Y="-30" Z="4" S="-414" T="439" R="202" G="181" B="87" A="255"/>
+	<Vtx X="0" Y="-37" Z="4" S="-277" T="484" R="0" G="165" B="89" A="255"/>
+	<Vtx X="0" Y="-37" Z="4" S="-20" T="-529" R="0" G="165" B="89" A="255"/>
+	<Vtx X="-22" Y="-30" Z="4" S="-117" T="-529" R="202" G="181" B="87" A="255"/>
+	<Vtx X="-23" Y="-32" Z="0" S="-119" T="-273" R="181" G="153" B="0" A="255"/>
+	<Vtx X="-32" Y="-10" Z="5" S="-475" T="305" R="229" G="248" B="124" A="255"/>
+	<Vtx X="-36" Y="-12" Z="4" S="-504" T="318" R="168" G="228" B="87" A="255"/>
+	<Vtx X="-22" Y="-30" Z="4" S="-419" T="436" R="202" G="181" B="87" A="255"/>
+	<Vtx X="-22" Y="-30" Z="4" S="-121" T="-529" R="202" G="181" B="87" A="255"/>
+	<Vtx X="-36" Y="-12" Z="4" S="-219" T="-529" R="168" G="228" B="87" A="255"/>
+	<Vtx X="-37" Y="-12" Z="0" S="-221" T="-273" R="135" G="217" B="0" A="255"/>
+	<Vtx X="-32" Y="10" Z="5" S="-475" T="174" R="229" G="8" B="124" A="255"/>
+	<Vtx X="-36" Y="12" Z="4" S="-506" T="167" R="168" G="28" B="87" A="255"/>
+	<Vtx X="-36" Y="-12" Z="4" S="-506" T="312" R="168" G="228" B="87" A="255"/>
+	<Vtx X="-36" Y="-12" Z="4" S="-223" T="-529" R="168" G="228" B="87" A="255"/>
+	<Vtx X="-36" Y="12" Z="4" S="-322" T="-529" R="168" G="28" B="87" A="255"/>
+	<Vtx X="-37" Y="12" Z="0" S="-324" T="-273" R="135" G="39" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="0" S="-529" T="-273" R="0" G="127" B="0" A="255"/>
+	<Vtx X="-23" Y="32" Z="0" S="-426" T="-273" R="181" G="103" B="0" A="255"/>
+	<Vtx X="-22" Y="30" Z="4" S="-428" T="-529" R="202" G="75" B="87" A="255"/>
+	<Vtx X="0" Y="37" Z="4" S="-526" T="-529" R="0" G="93" B="87" A="255"/>
+	<Vtx X="0" Y="37" Z="4" S="-276" T="-5" R="0" G="93" B="87" A="255"/>
+	<Vtx X="-22" Y="30" Z="4" S="-414" T="40" R="202" G="75" B="87" A="255"/>
+	<Vtx X="-20" Y="27" Z="5" S="-397" T="67" R="240" G="23" B="124" A="255"/>
+	<Vtx X="0" Y="34" Z="5" S="-274" T="27" R="0" G="28" B="124" A="255"/>
+	<Vtx X="-32" Y="10" Z="5" S="-475" T="174" R="229" G="8" B="124" A="255"/>
+	<Vtx X="-22" Y="30" Z="4" S="-419" T="43" R="202" G="75" B="87" A="255"/>
+	<Vtx X="-36" Y="12" Z="4" S="-504" T="161" R="168" G="28" B="87" A="255"/>
+	<Vtx X="-36" Y="12" Z="4" S="-326" T="-529" R="168" G="28" B="87" A="255"/>
+	<Vtx X="-22" Y="30" Z="4" S="-424" T="-529" R="202" G="75" B="87" A="255"/>
+	<Vtx X="-37" Y="12" Z="0" S="-324" T="-273" R="135" G="39" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="0" S="495" T="-273" R="0" G="127" B="0" A="255"/>
+	<Vtx X="23" Y="32" Z="0" S="393" T="-273" R="75" G="103" B="0" A="255"/>
+	<Vtx X="22" Y="30" Z="-4" S="395" T="-17" R="54" G="75" B="169" A="255"/>
+	<Vtx X="0" Y="37" Z="-4" S="493" T="-17" R="0" G="93" B="169" A="255"/>
+	<Vtx X="0" Y="37" Z="-4" S="242" T="-5" R="0" G="93" B="169" A="255"/>
+	<Vtx X="22" Y="30" Z="-4" S="381" T="40" R="54" G="75" B="169" A="255"/>
+	<Vtx X="20" Y="27" Z="-5" S="364" T="67" R="16" G="22" B="132" A="255"/>
+	<Vtx X="0" Y="34" Z="-5" S="239" T="27" R="0" G="28" B="132" A="255"/>
+	<Vtx X="23" Y="32" Z="0" S="393" T="-273" R="75" G="103" B="0" A="255"/>
+	<Vtx X="37" Y="12" Z="0" S="291" T="-273" R="121" G="39" B="0" A="255"/>
+	<Vtx X="36" Y="12" Z="-4" S="293" T="-17" R="88" G="28" B="169" A="255"/>
+	<Vtx X="22" Y="30" Z="-4" S="391" T="-17" R="54" G="75" B="169" A="255"/>
+	<Vtx X="22" Y="30" Z="-4" S="386" T="43" R="54" G="75" B="169" A="255"/>
+	<Vtx X="36" Y="12" Z="-4" S="471" T="161" R="88" G="28" B="169" A="255"/>
+	<Vtx X="32" Y="10" Z="-5" S="442" T="174" R="27" G="8" B="132" A="255"/>
+	<Vtx X="37" Y="12" Z="0" S="291" T="-273" R="121" G="39" B="0" A="255"/>
+	<Vtx X="37" Y="-12" Z="0" S="188" T="-273" R="121" G="218" B="255" A="255"/>
+	<Vtx X="36" Y="-12" Z="-4" S="190" T="-17" R="88" G="228" B="169" A="255"/>
+	<Vtx X="37" Y="12" Z="0" S="291" T="-273" R="121" G="39" B="0" A="255"/>
+	<Vtx X="36" Y="-12" Z="-4" S="190" T="-17" R="88" G="228" B="169" A="255"/>
+	<Vtx X="36" Y="12" Z="-4" S="289" T="-17" R="88" G="28" B="169" A="255"/>
+	<Vtx X="36" Y="12" Z="-4" S="473" T="167" R="88" G="28" B="169" A="255"/>
+	<Vtx X="36" Y="-12" Z="-4" S="473" T="312" R="88" G="228" B="169" A="255"/>
+	<Vtx X="32" Y="-10" Z="-5" S="442" T="305" R="27" G="248" B="132" A="255"/>
+	<Vtx X="32" Y="10" Z="-5" S="442" T="174" R="27" G="8" B="132" A="255"/>
+	<Vtx X="37" Y="-12" Z="0" S="188" T="-273" R="121" G="218" B="255" A="255"/>
+	<Vtx X="23" Y="-32" Z="0" S="86" T="-273" R="73" G="152" B="0" A="255"/>
+	<Vtx X="22" Y="-30" Z="-4" S="88" T="-17" R="54" G="181" B="169" A="255"/>
+	<Vtx X="36" Y="-12" Z="-4" S="186" T="-17" R="88" G="228" B="169" A="255"/>
+	<Vtx X="36" Y="-12" Z="-4" S="471" T="318" R="88" G="228" B="169" A="255"/>
+	<Vtx X="22" Y="-30" Z="-4" S="386" T="436" R="54" G="181" B="169" A="255"/>
+	<Vtx X="20" Y="-27" Z="-5" S="364" T="412" R="16" G="234" B="132" A="255"/>
+	<Vtx X="23" Y="-32" Z="0" S="86" T="-273" R="73" G="152" B="0" A="255"/>
+	<Vtx X="0" Y="-39" Z="0" S="-17" T="-273" R="0" G="129" B="1" A="255"/>
+	<Vtx X="0" Y="-37" Z="-4" S="-14" T="-17" R="0" G="163" B="169" A="255"/>
+	<Vtx X="22" Y="-30" Z="-4" S="84" T="-17" R="54" G="181" B="169" A="255"/>
+	<Vtx X="22" Y="-30" Z="-4" S="381" T="439" R="54" G="181" B="169" A="255"/>
+	<Vtx X="0" Y="-37" Z="-4" S="242" T="484" R="0" G="163" B="169" A="255"/>
+	<Vtx X="0" Y="-34" Z="-5" S="239" T="452" R="0" G="228" B="132" A="255"/>
+	<Vtx X="0" Y="-39" Z="0" S="-17" T="-273" R="0" G="129" B="1" A="255"/>
+	<Vtx X="-23" Y="-32" Z="0" S="-119" T="-273" R="181" G="153" B="0" A="255"/>
+	<Vtx X="-22" Y="-30" Z="-4" S="-117" T="-17" R="202" G="181" B="169" A="255"/>
+	<Vtx X="0" Y="-37" Z="-4" S="-19" T="-17" R="0" G="163" B="169" A="255"/>
+	<Vtx X="0" Y="-37" Z="-4" S="237" T="484" R="0" G="163" B="169" A="255"/>
+	<Vtx X="-22" Y="-30" Z="-4" S="98" T="439" R="202" G="181" B="169" A="255"/>
+	<Vtx X="-20" Y="-27" Z="-5" S="115" T="412" R="240" G="234" B="132" A="255"/>
+	<Vtx X="-23" Y="-32" Z="0" S="-119" T="-273" R="181" G="153" B="0" A="255"/>
+	<Vtx X="-37" Y="-12" Z="0" S="-221" T="-273" R="135" G="217" B="0" A="255"/>
+	<Vtx X="-36" Y="-12" Z="-4" S="-219" T="-17" R="168" G="228" B="169" A="255"/>
+	<Vtx X="-22" Y="-30" Z="-4" S="-121" T="-17" R="202" G="181" B="169" A="255"/>
+	<Vtx X="-22" Y="-30" Z="-4" S="93" T="436" R="202" G="181" B="169" A="255"/>
+	<Vtx X="-36" Y="-12" Z="-4" S="8" T="318" R="168" G="228" B="169" A="255"/>
+	<Vtx X="-32" Y="-10" Z="-5" S="37" T="305" R="229" G="248" B="132" A="255"/>
+	<Vtx X="-20" Y="-27" Z="-5" S="115" T="412" R="240" G="234" B="132" A="255"/>
+	<Vtx X="-37" Y="-12" Z="0" S="-221" T="-273" R="135" G="217" B="0" A="255"/>
+	<Vtx X="-37" Y="12" Z="0" S="-324" T="-273" R="135" G="39" B="0" A="255"/>
+	<Vtx X="-36" Y="12" Z="-4" S="-322" T="-17" R="168" G="28" B="169" A="255"/>
+	<Vtx X="-36" Y="-12" Z="-4" S="-223" T="-17" R="168" G="228" B="169" A="255"/>
+	<Vtx X="-36" Y="-12" Z="-4" S="6" T="312" R="168" G="228" B="169" A="255"/>
+	<Vtx X="-36" Y="12" Z="-4" S="6" T="167" R="168" G="28" B="169" A="255"/>
+	<Vtx X="-32" Y="10" Z="-5" S="37" T="174" R="229" G="8" B="132" A="255"/>
+	<Vtx X="-37" Y="12" Z="0" S="-324" T="-273" R="135" G="39" B="0" A="255"/>
+	<Vtx X="-23" Y="32" Z="0" S="-426" T="-273" R="181" G="103" B="0" A="255"/>
+	<Vtx X="-22" Y="30" Z="-4" S="-424" T="-17" R="202" G="75" B="169" A="255"/>
+	<Vtx X="-36" Y="12" Z="-4" S="-326" T="-17" R="168" G="28" B="169" A="255"/>
+	<Vtx X="-36" Y="12" Z="-4" S="8" T="161" R="168" G="28" B="169" A="255"/>
+	<Vtx X="-22" Y="30" Z="-4" S="93" T="43" R="202" G="75" B="169" A="255"/>
+	<Vtx X="-20" Y="27" Z="-5" S="115" T="67" R="240" G="22" B="132" A="255"/>
+	<Vtx X="0" Y="34" Z="-5" S="239" T="27" R="0" G="28" B="132" A="255"/>
+	<Vtx X="-22" Y="30" Z="-4" S="98" T="40" R="202" G="75" B="169" A="255"/>
+	<Vtx X="0" Y="37" Z="-4" S="237" T="-5" R="0" G="93" B="169" A="255"/>
+	<Vtx X="0" Y="37" Z="-4" S="-526" T="-17" R="0" G="93" B="169" A="255"/>
+	<Vtx X="-22" Y="30" Z="-4" S="-428" T="-17" R="202" G="75" B="169" A="255"/>
+	<Vtx X="-23" Y="32" Z="0" S="-426" T="-273" R="181" G="103" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="0" S="-529" T="-273" R="0" G="127" B="0" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_ocarina_c_up_button/gOcarinaCUpButtonDL_vtx_cull b/soh/assets/custom/objects/object_ocarina_c_up_button/gOcarinaCUpButtonDL_vtx_cull
new file mode 100644
index 000000000..38adb91be
--- /dev/null
+++ b/soh/assets/custom/objects/object_ocarina_c_up_button/gOcarinaCUpButtonDL_vtx_cull
@@ -0,0 +1,10 @@
+<Vertex Version="0">
+	<Vtx X="-37" Y="-39" Z="-5" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-37" Y="-39" Z="5" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-37" Y="39" Z="5" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-37" Y="39" Z="-5" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="37" Y="-39" Z="-5" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="37" Y="-39" Z="5" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="37" Y="39" Z="5" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="37" Y="39" Z="-5" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_ocarina_c_up_button/mat_gOcarinaCUpButtonDL_f3dlite_ocarina_C_button_edge b/soh/assets/custom/objects/object_ocarina_c_up_button/mat_gOcarinaCUpButtonDL_f3dlite_ocarina_C_button_edge
new file mode 100644
index 000000000..301ec9fc4
--- /dev/null
+++ b/soh/assets/custom/objects/object_ocarina_c_up_button/mat_gOcarinaCUpButtonDL_f3dlite_ocarina_C_button_edge
@@ -0,0 +1,21 @@
+<DisplayList Version="0">
+	<PipeSync/>
+	<SetCombineLERP A0="G_CCMUX_TEXEL0" B0="G_CCMUX_0" C0="G_CCMUX_SHADE" D0="G_CCMUX_0" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_1" A1="G_CCMUX_COMBINED" B1="G_CCMUX_0" C1="G_CCMUX_PRIMITIVE" D1="G_CCMUX_0" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_COMBINED"/>
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="1" G_CULL_BACK="1" G_FOG="1" G_LIGHTING="1" G_TEXTURE_GEN="1" G_SHADING_SMOOTH="1"  />
+
+	<SetOtherMode Cmd="G_SETOTHERMODE_H" Sft="4" Length="20" G_AD_NOISE="1" G_CD_MAGICSQ="1" G_CK_NONE="1" G_TC_FILT="1" G_TF_BILERP="1" G_TL_TILE="1" G_TD_CLAMP="1" G_TP_PERSP="1" G_CYC_2CYCLE="1" G_PM_NPRIMITIVE="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_L" Sft="0" Length="32" G_AC_NONE="1" G_ZS_PIXEL="1" G_RM_FOG_SHADE_A="1" G_RM_AA_ZB_OPA_SURF2="1" />
+	<Texture S="1984" T="1984" Level="0" Tile="0" On="1"/>
+	<SetTextureLUT Mode="G_TT_NONE"/>
+	<TileSync/>
+	<SetTextureImage Path="objects/object_ocarina_c_up_button/noise_tex" Format="G_IM_FMT_I" Size="G_IM_SIZ_8b_LOAD_BLOCK" Width="1"/>
+	<SetTile Format="G_IM_FMT_I" Size="G_IM_SIZ_8b_LOAD_BLOCK" Line="0" TMem="0" Tile="7" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="511" Dxt="512"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_I" Size="G_IM_SIZ_8b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="124" Lrt="124"/>
+	<SetPrimColor M="0" L="0" R="255" G="160" B="0" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_ocarina_c_up_button/mat_gOcarinaCUpButtonDL_f3dlite_ocarina_C_button_surface b/soh/assets/custom/objects/object_ocarina_c_up_button/mat_gOcarinaCUpButtonDL_f3dlite_ocarina_C_button_surface
new file mode 100644
index 000000000..a9a701d15
--- /dev/null
+++ b/soh/assets/custom/objects/object_ocarina_c_up_button/mat_gOcarinaCUpButtonDL_f3dlite_ocarina_C_button_surface
@@ -0,0 +1,21 @@
+<DisplayList Version="0">
+	<PipeSync/>
+	<SetCombineLERP A0="G_CCMUX_TEXEL0" B0="G_CCMUX_0" C0="G_CCMUX_SHADE" D0="G_CCMUX_0" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_1" A1="G_CCMUX_COMBINED" B1="G_CCMUX_0" C1="G_CCMUX_PRIMITIVE" D1="G_CCMUX_0" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_COMBINED"/>
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="1" G_CULL_BACK="1" G_FOG="1" G_LIGHTING="1" G_TEXTURE_GEN="1" G_SHADING_SMOOTH="1"  />
+
+	<SetOtherMode Cmd="G_SETOTHERMODE_H" Sft="4" Length="20" G_AD_NOISE="1" G_CD_MAGICSQ="1" G_CK_NONE="1" G_TC_FILT="1" G_TF_BILERP="1" G_TL_TILE="1" G_TD_CLAMP="1" G_TP_PERSP="1" G_CYC_2CYCLE="1" G_PM_NPRIMITIVE="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_L" Sft="0" Length="32" G_AC_NONE="1" G_ZS_PIXEL="1" G_RM_FOG_SHADE_A="1" G_RM_AA_ZB_OPA_SURF2="1" />
+	<Texture S="2621" T="1311" Level="0" Tile="0" On="1"/>
+	<SetTextureLUT Mode="G_TT_NONE"/>
+	<TileSync/>
+	<SetTextureImage Path="objects/object_ocarina_c_up_button/noise_tex" Format="G_IM_FMT_I" Size="G_IM_SIZ_8b_LOAD_BLOCK" Width="1"/>
+	<SetTile Format="G_IM_FMT_I" Size="G_IM_SIZ_8b_LOAD_BLOCK" Line="0" TMem="0" Tile="7" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="511" Dxt="512"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_I" Size="G_IM_SIZ_8b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="124" Lrt="124"/>
+	<SetPrimColor M="0" L="0" R="170" G="107" B="0" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_ocarina_c_up_button/noise_tex b/soh/assets/custom/objects/object_ocarina_c_up_button/noise_tex
new file mode 100644
index 0000000000000000000000000000000000000000..aaf4e331f15f797a3b1122b58c57b3767e66bc0f
GIT binary patch
literal 1116
zcma)5S&rmH5G^FcIk*X5eDlKxBf5LKx?JV<zND9QdQWd<yUM%Ec1`sZ(=$CnVgPXg
zj=~kV0y%;M5K<^Y%E*X}_g=16tJM$Re*fJUB>w&9uYY}ZlKyY|id266pZ|L)_-3^t
z{^e>VIz`u(`^dKQ%g2w`bDu%x{^r%I8%i=wg`pMy&>oT`wvAwTeqNf)RT*l1cl(+W
z4O3wm5FDBuCz%Uiv0TQ&*Cj#VNy!7F8h~R}KQ9uT<sn4bc%G_I6GT;0xy}7XAc0Xl
z9EM4G%%b!-&hwC40w?Q+Os^j}O=W1^_ib-q*JV+41F@s8a3Ua`shwm1mN7#QI_dF{
zC3#gJ4`q&_A_E=pJ4Q7D!zjqoEu1AT@}e}suH(73Ws=D>qZsmTyW<5x_pt+H9l4&R
zNV*$EuA#8o9Vc?s{bsv;)Pm5GMBTP6z|sQ5v2V)EX1(5QHV?AIOLmqzz`$u>%G@KX
zAm1U#Q1`b#-cdY`0zWyHA&UB`uvJOq1z;j%s@!gUchADQtBSnLBiuZ{ObIeINsvAl
zKp>GPf~X&wGE1T`oqzfLxlOSLfeJL;gpe$uxkXczdF&C0F2DWpa%!p~b}e0&RKxLI
z%T231NzwpnD1Z9&={oddS76r=ISB@l@A&(Ji`>A~6jZ+b`Tf)mbH67OcwTj)5Scc{
zK!pLxobvMFI`+$@k4zv-0AY+25fE@S6z$W{&&H?oX}(_jP*+sLjS^qu9wmr;+rj%{
zAEy-|@BH@CVH4;m%+kORMa{#BXIWla6lGO6!#wp(?ire4hv`1{96uqtA;^bi)3$9t
zo$9i#W2i_9OzJvM;xx4+nwI?IFm%JTj73}=LclXD2+J}FLmcRYNZGH3zUij9O&r(N
zIC{GkOwTb52m2bcW%RfiySf=qM4ckHqqfwB78L>#iUN&&l-#mE4Q;=iy9hjP)*G6p
zcAUU-vK4wNFT$)pja`3!_q^mt=2&vXvP9&Xrb8$zFlv{%J+_yZm#3OgWf__(%K$o#
zDT@+s;Ci{tRaQ>d>(W(+JVHPr6kC2^iS&+v`RR%Lt01bUX&g>t6B|4yh?4GjP~1K+
zRyjYNyVUUyr+Hf5EKR78{fMr0WJ>e{hl<lY9%I`(zIpc(8Bw{y=JoB(-A*<Qg`xfd
D(@X%Y

literal 0
HcmV?d00001

diff --git a/soh/assets/soh_assets.h b/soh/assets/soh_assets.h
index 16a2f5cd0..8765522b7 100644
--- a/soh/assets/soh_assets.h
+++ b/soh/assets/soh_assets.h
@@ -44,6 +44,21 @@ static const ALIGN_ASSET(2) char gTitleRandomizerSubtitleTex[] = dgTitleRandomiz
 #define dgTitleBossRushSubtitleTex "__OTR__objects/object_mag/gTitleBossRushSubtitleTex"
 static const ALIGN_ASSET(2) char gTitleBossRushSubtitleTex[] = dgTitleBossRushSubtitleTex;
 
+#define dgOcarinaAButtonDL "__OTR__objects/object_ocarina_a_button/gOcarinaAButtonDL"
+static const ALIGN_ASSET(2) char gOcarinaAButtonDL[] = dgOcarinaAButtonDL;
+
+#define dgOcarinaCLeftButtonDL "__OTR__objects/object_ocarina_c_left_button/gOcarinaCLeftButtonDL"
+static const ALIGN_ASSET(2) char gOcarinaCLeftButtonDL[] = dgOcarinaCLeftButtonDL;
+
+#define dgOcarinaCRightButtonDL "__OTR__objects/object_ocarina_c_right_button/gOcarinaCRightButtonDL"
+static const ALIGN_ASSET(2) char gOcarinaCRightButtonDL[] = dgOcarinaCRightButtonDL;
+
+#define dgOcarinaCUpButtonDL "__OTR__objects/object_ocarina_c_up_button/gOcarinaCUpButtonDL"
+static const ALIGN_ASSET(2) char gOcarinaCUpButtonDL[] = dgOcarinaCUpButtonDL;
+
+#define dgOcarinaCDownButtonDL "__OTR__objects/object_ocarina_c_down_button/gOcarinaCDownButtonDL"
+static const ALIGN_ASSET(2) char gOcarinaCDownButtonDL[] = dgOcarinaCDownButtonDL;
+
 #define dgTriforcePiece0DL "__OTR__objects/object_triforce_piece_0/gTriforcePiece0DL"
 static const ALIGN_ASSET(2) char gTriforcePiece0DL[] = dgTriforcePiece0DL;
 
diff --git a/soh/include/z64save.h b/soh/include/z64save.h
index 7f7189b5f..1e853568a 100644
--- a/soh/include/z64save.h
+++ b/soh/include/z64save.h
@@ -283,7 +283,7 @@ typedef struct {
     // #endregion
     // #region SOH [Randomizer]
     // Upstream TODO: Move these to their own struct or name to more obviously specific to Randomizer
-    /*        */ u16 randomizerInf[10];
+    /*        */ u16 randomizerInf[11];
     /*        */ u8 mqDungeonCount;
     /*        */ u16 adultTradeItems;
     /*        */ u8 triforcePiecesCollected;
diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.h b/soh/soh/Enhancements/debugger/debugSaveEditor.h
index 582b896b0..dec733f3e 100644
--- a/soh/soh/Enhancements/debugger/debugSaveEditor.h
+++ b/soh/soh/Enhancements/debugger/debugSaveEditor.h
@@ -348,7 +348,7 @@ const std::vector<FlagTable> flagTables = {
         { 0x24, "Market Crowd Text Randomizer" },
         { 0x30, "Entered the Market" },
     } },
-   { "Randomizer Inf Flags", RANDOMIZER_INF, 0x09, {
+    { "Randomizer Inf Flags", RANDOMIZER_INF, 0x0A, {
         { RAND_INF_DUNGEONS_DONE_DEKU_TREE, "DUNGEONS_DONE_DEKU_TREE" },
         { RAND_INF_DUNGEONS_DONE_DODONGOS_CAVERN, "DUNGEONS_DONE_DODONGOS_CAVERN" },
         { RAND_INF_DUNGEONS_DONE_JABU_JABUS_BELLY, "DUNGEONS_DONE_JABU_JABUS_BELLY" },
@@ -516,6 +516,12 @@ const std::vector<FlagTable> flagTables = {
         { RAND_INF_TWINROVA_SOUL, "RAND_INF_TWINROVA_SOUL" },
         { RAND_INF_GANON_SOUL, "RAND_INF_GANON_SOUL" },
         { RAND_INF_GRANT_GANONS_BOSSKEY, "RAND_INF_GRANT_GANONS_BOSSKEY" },
+
+        { RAND_INF_HAS_OCARINA_A, "RAND_INF_HAS_OCARINA_A"},
+        { RAND_INF_HAS_OCARINA_C_UP, "RAND_INF_HAS_OCARINA_C_UP" },
+        { RAND_INF_HAS_OCARINA_C_DOWN, "RAND_INF_HAS_OCARINA_C_DOWN" },
+        { RAND_INF_HAS_OCARINA_C_LEFT, "RAND_INF_HAS_OCARINA_C_LEFT"},
+        { RAND_INF_HAS_OCARINA_C_RIGHT, "RAND_INF_HAS_OCARINA_C_RIGHT"},
     } },
 };
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp
index 0e460a024..8fd0625bc 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp
@@ -2047,6 +2047,61 @@ void HintTable_Init_Item() {
                       Text{"the soul of Ganon", "", ""}}
      );
 
+    hintTable[RHT_OCARINA_A_BUTTON] = HintText::Item({
+                      //obscure text
+                      Text{"a musical letter", /*french*/"une lettre musicale", /*spanish*/"una letra musical"},
+                    }, {
+                      //ambiguous text
+                      Text{"something melodic", /*french*/"quelque chose de mélodieux", /*spanish*/"algo melódico"}
+                    }, {
+                      //clear text
+                      Text{"an Ocarina A Button", /*french*/"la Touche A de l'Ocarina", /*spanish*/"un botón A de Ocarina"}}
+     );
+
+    hintTable[RHT_OCARINA_C_UP_BUTTON] = HintText::Item({
+                      //obscure text
+                      Text{"a high tone", /*french*/"une tonalité élevée", /*spanish*/"un tono alto"},
+                    }, {
+                      //ambiguous text
+                      Text{"something melodic", /*french*/"quelque chose de mélodieux", /*spanish*/"algo melódico"}
+                    }, {
+                      //clear text
+                      Text{"an Ocarina C Up Button", /*french*/"la Touche C-Haut de l'Ocarina", /*spanish*/"un botón C superior de Ocarina"}}
+     );
+
+    hintTable[RHT_OCARINA_C_DOWN_BUTTON] = HintText::Item({
+                      //obscure text
+                      Text{"a low tone", /*french*/"une tonalité basse", /*spanish*/"un tono bajo"},
+                    }, {
+                      //ambiguous text
+                      Text{"something melodic", /*french*/"quelque chose de mélodieux", /*spanish*/"algo melódico"}
+                    }, {
+                      //clear text
+                      Text{"an Ocarina C Down Button", /*french*/"la Touche C-Bas de l'Ocarina", /*spanish*/"un botón C inferior de Ocarina"}}
+     );
+
+    hintTable[RHT_OCARINA_C_LEFT_BUTTON] = HintText::Item({
+                      //obscure text
+                      Text{"a leftward tone", /*french*/"une tonalité vers la gauche", /*spanish*/"un tono hacia la izquierda"},
+                    }, {
+                      //ambiguous text
+                      Text{"something melodic", /*french*/"quelque chose de mélodieux", /*spanish*/"algo melódico"}
+                    }, {
+                      //clear text
+                      Text{"an Ocarina C Left Button", /*french*/"la Touche C-Gauche de l'Ocarina", /*spanish*/"un botón C izquierdo de Ocarina"}}
+     );
+
+    hintTable[RHT_OCARINA_C_RIGHT_BUTTON] = HintText::Item({
+                      //obscure text
+                      Text{"a rightward tone", /*french*/"une tonalité vers la droite", /*spanish*/"un tono hacia la derecha"},
+                    }, {
+                      //ambiguous text
+                      Text{"something melodic", /*french*/"quelque chose de mélodieux", /*spanish*/"algo melódico"}
+                    }, {
+                      //clear text
+                      Text{"an Ocarina C Right Button", /*french*/"la Touche C-Droit de l'Ocarina", /*spanish*/"un botón C derecho de Ocarina"}}
+     );
+
     hintTable[RHT_EPONA] = HintText::Item({
                        //obscure text
                        Text{"a horse",              /*french*/"un fidèle destrier", /*spanish*/"una yegua"},
diff --git a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
index a2d2dbfe6..2248bcd15 100644
--- a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
@@ -723,6 +723,21 @@ void GenerateItemPool() {
       }
   }
 
+  if (ctx->GetOption(RSK_SHUFFLE_OCARINA_BUTTONS)) {
+    AddItemToMainPool(RG_OCARINA_A_BUTTON);
+    AddItemToMainPool(RG_OCARINA_C_UP_BUTTON);
+    AddItemToMainPool(RG_OCARINA_C_DOWN_BUTTON);
+    AddItemToMainPool(RG_OCARINA_C_LEFT_BUTTON);
+    AddItemToMainPool(RG_OCARINA_C_RIGHT_BUTTON);
+
+    //TODO: Re-add when custom models work with ice traps
+    //ctx->possibleIceTrapModels.push_back(RG_OCARINA_A_BUTTON);
+    //ctx->possibleIceTrapModels.push_back(RG_OCARINA_C_UP_BUTTON);
+    //ctx->possibleIceTrapModels.push_back(RG_OCARINA_C_DOWN_BUTTON);
+    //ctx->possibleIceTrapModels.push_back(RG_OCARINA_C_LEFT_BUTTON);
+    //ctx->possibleIceTrapModels.push_back(RG_OCARINA_C_RIGHT_BUTTON);
+  }
+
   if (ctx->GetOption(RSK_SHUFFLE_COWS)) {
     //9 total cow locations
     for (uint8_t i = 0; i < 9; i++) {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
index c4d1ec400..ea1508c29 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
@@ -261,7 +261,7 @@ void AreaTable_Init() {
                   //Locations
                   LocationAccess(RC_LINKS_POCKET,       {[]{return true;}}),
                   LocationAccess(RC_TRIFORCE_COMPLETED, {[]{return CanCompleteTriforce;}}),
-                  LocationAccess(RC_SARIA_SONG_HINT,    {[]{return CanPlay(SariasSong);}}),
+                  LocationAccess(RC_SARIA_SONG_HINT,    {[]{return CanUse(RG_SARIAS_SONG);}}),
                 }, {
                   //Exits
                   Entrance(RR_ROOT_EXITS, {[]{return true;}})
@@ -271,12 +271,12 @@ void AreaTable_Init() {
                   //Exits
                   Entrance(RR_CHILD_SPAWN,             {[]{return IsChild;}}),
                   Entrance(RR_ADULT_SPAWN,             {[]{return IsAdult;}}),
-                  Entrance(RR_MINUET_OF_FOREST_WARP,   {[]{return CanPlay(MinuetOfForest);}}),
-                  Entrance(RR_BOLERO_OF_FIRE_WARP,     {[]{return CanPlay(BoleroOfFire)     && CanLeaveForest;}}),
-                  Entrance(RR_SERENADE_OF_WATER_WARP,  {[]{return CanPlay(SerenadeOfWater)  && CanLeaveForest;}}),
-                  Entrance(RR_NOCTURNE_OF_SHADOW_WARP, {[]{return CanPlay(NocturneOfShadow) && CanLeaveForest;}}),
-                  Entrance(RR_REQUIEM_OF_SPIRIT_WARP,  {[]{return CanPlay(RequiemOfSpirit)  && CanLeaveForest;}}),
-                  Entrance(RR_PRELUDE_OF_LIGHT_WARP,   {[]{return CanPlay(PreludeOfLight)   && CanLeaveForest;}}),
+                  Entrance(RR_MINUET_OF_FOREST_WARP,   {[]{return CanUse(RG_MINUET_OF_FOREST);}}),
+                  Entrance(RR_BOLERO_OF_FIRE_WARP,     {[]{return CanUse(RG_BOLERO_OF_FIRE)     && CanLeaveForest;}}),
+                  Entrance(RR_SERENADE_OF_WATER_WARP,  {[]{return CanUse(RG_SERENADE_OF_WATER)  && CanLeaveForest;}}),
+                  Entrance(RR_NOCTURNE_OF_SHADOW_WARP, {[]{return CanUse(RG_NOCTURNE_OF_SHADOW) && CanLeaveForest;}}),
+                  Entrance(RR_REQUIEM_OF_SPIRIT_WARP,  {[]{return CanUse(RG_REQUIEM_OF_SPIRIT)  && CanLeaveForest;}}),
+                  Entrance(RR_PRELUDE_OF_LIGHT_WARP,   {[]{return CanUse(RG_PRELUDE_OF_LIGHT)   && CanLeaveForest;}}),
   });
 
   areaTable[RR_CHILD_SPAWN] = Area("Child Spawn", "", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_bottom_of_the_well.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_bottom_of_the_well.cpp
index 39fbc9b35..caed2e6f4 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_bottom_of_the_well.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_bottom_of_the_well.cpp
@@ -34,10 +34,10 @@ void AreaTable_Init_BottomOfTheWell() {
                   LocationAccess(RC_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST,       {[]{return randoCtx->GetTrickOption(RT_LENS_BOTW) || CanUse(RG_LENS_OF_TRUTH);}}),
                   LocationAccess(RC_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST,     {[]{return (randoCtx->GetTrickOption(RT_LENS_BOTW) || CanUse(RG_LENS_OF_TRUTH)) && HasExplosives;}}),
                   LocationAccess(RC_BOTTOM_OF_THE_WELL_FREESTANDING_KEY,             {[]{return Sticks || CanUse(RG_DINS_FIRE);}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST,          {[]{return CanPlay(ZeldasLullaby) && (KokiriSword || (Sticks && randoCtx->GetTrickOption(RT_BOTW_CHILD_DEADHAND)));}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST,              {[]{return CanPlay(ZeldasLullaby) && (randoCtx->GetTrickOption(RT_LENS_BOTW) || CanUse(RG_LENS_OF_TRUTH));}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST,       {[]{return CanPlay(ZeldasLullaby);}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST,        {[]{return CanPlay(ZeldasLullaby);}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST,          {[]{return CanUse(RG_ZELDAS_LULLABY) && (KokiriSword || (Sticks && randoCtx->GetTrickOption(RT_BOTW_CHILD_DEADHAND)));}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST,              {[]{return CanUse(RG_ZELDAS_LULLABY) && (randoCtx->GetTrickOption(RT_LENS_BOTW) || CanUse(RG_LENS_OF_TRUTH));}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST,       {[]{return CanUse(RG_ZELDAS_LULLABY);}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST,        {[]{return CanUse(RG_ZELDAS_LULLABY);}}),
                   LocationAccess(RC_BOTTOM_OF_THE_WELL_MAP_CHEST,                    {[]{return HasExplosives || (((SmallKeys(RR_BOTTOM_OF_THE_WELL, 3) && (randoCtx->GetTrickOption(RT_LENS_BOTW) || CanUse(RG_LENS_OF_TRUTH))) || CanUse(RG_DINS_FIRE) || (Sticks && randoCtx->GetTrickOption(RT_BOTW_BASEMENT))) && GoronBracelet);}}),
                   LocationAccess(RC_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST,             {[]{return SmallKeys(RR_BOTTOM_OF_THE_WELL, 3) && (randoCtx->GetTrickOption(RT_LENS_BOTW) || CanUse(RG_LENS_OF_TRUTH));}}),
                   LocationAccess(RC_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST,              {[]{return SmallKeys(RR_BOTTOM_OF_THE_WELL, 3) && (randoCtx->GetTrickOption(RT_LENS_BOTW) || CanUse(RG_LENS_OF_TRUTH));}}),
@@ -67,8 +67,8 @@ void AreaTable_Init_BottomOfTheWell() {
   }, {
                   //Exits
                   Entrance(RR_BOTTOM_OF_THE_WELL_ENTRYWAY,  {[]{return true;}}),
-                  Entrance(RR_BOTTOM_OF_THE_WELL_MQ_MIDDLE, {[]{return CanPlay(ZeldasLullaby) || (randoCtx->GetTrickOption(RT_BOTW_MQ_PITS) && HasExplosives);}}),
-                    //Trick: CanPlay(ZeldasLullaby) || (LogicBotWMQPits && HasExplosives)
+                  Entrance(RR_BOTTOM_OF_THE_WELL_MQ_MIDDLE, {[]{return CanUse(RG_ZELDAS_LULLABY) || (randoCtx->GetTrickOption(RT_BOTW_MQ_PITS) && HasExplosives);}}),
+                    //Trick: CanUse(RG_ZELDAS_LULLABY) || (LogicBotWMQPits && HasExplosives)
   });
 
   areaTable[RR_BOTTOM_OF_THE_WELL_MQ_MIDDLE] = Area("Bottom of the Well MQ Middle", "Bottom of the Well", RA_BOTTOM_OF_THE_WELL, NO_DAY_NIGHT_CYCLE, {}, {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
index 53109e684..fa3ad407c 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
@@ -58,7 +58,7 @@ void AreaTable_Init_CastleTown() {
                 }, {
                   //Exits
                   Entrance(RR_TOT_ENTRANCE,            {[]{return true;}}),
-                  Entrance(RR_TOT_BEYOND_DOOR_OF_TIME, {[]{return randoCtx->GetOption(RSK_DOOR_OF_TIME).Is(RO_DOOROFTIME_OPEN) || (CanPlay(SongOfTime) && (randoCtx->GetOption(RSK_DOOR_OF_TIME).Is(RO_DOOROFTIME_SONGONLY) || (HasAllStones && OcarinaOfTime)));}}),
+                  Entrance(RR_TOT_BEYOND_DOOR_OF_TIME, {[]{return randoCtx->GetOption(RSK_DOOR_OF_TIME).Is(RO_DOOROFTIME_OPEN) || (CanUse(RG_SONG_OF_TIME) && (randoCtx->GetOption(RSK_DOOR_OF_TIME).Is(RO_DOOROFTIME_SONGONLY) || (HasAllStones && OcarinaOfTime)));}}),
   });
 
   areaTable[RR_TOT_BEYOND_DOOR_OF_TIME] = Area("Beyond Door of Time", "Beyond Door of Time", RA_TEMPLE_OF_TIME, NO_DAY_NIGHT_CYCLE, {
@@ -112,7 +112,7 @@ void AreaTable_Init_CastleTown() {
 
   areaTable[RR_HC_GREAT_FAIRY_FOUNTAIN] = Area("HC Great Fairy Fountain", "HC Great Fairy Fountain", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_HC_GREAT_FAIRY_REWARD, {[]{return CanPlay(ZeldasLullaby);}}),
+                  LocationAccess(RC_HC_GREAT_FAIRY_REWARD, {[]{return CanUse(RG_ZELDAS_LULLABY);}}),
                 }, {
                   //Exits
                   Entrance(RR_CASTLE_GROUNDS, {[]{return true;}}),
@@ -147,7 +147,7 @@ void AreaTable_Init_CastleTown() {
 
   areaTable[RR_OGC_GREAT_FAIRY_FOUNTAIN] = Area("OGC Great Fairy Fountain", "OGC Great Fairy Fountain", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_OGC_GREAT_FAIRY_REWARD, {[]{return CanPlay(ZeldasLullaby);}}),
+                  LocationAccess(RC_OGC_GREAT_FAIRY_REWARD, {[]{return CanUse(RG_ZELDAS_LULLABY);}}),
                 }, {
                   //Exits
                   Entrance(RR_CASTLE_GROUNDS, {[]{return true;}}),
@@ -193,7 +193,7 @@ void AreaTable_Init_CastleTown() {
   areaTable[RR_MARKET_MASK_SHOP] = Area("Market Mask Shop", "Market Mask Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&SkullMask,   {[]{return SkullMask   || (ZeldasLetter && (randoCtx->GetOption(RSK_COMPLETE_MASK_QUEST) ||  ChildCanAccess(RR_KAKARIKO_VILLAGE)));}}),
-                  EventAccess(&MaskOfTruth, {[]{return MaskOfTruth || (SkullMask && (randoCtx->GetOption(RSK_COMPLETE_MASK_QUEST) || (ChildCanAccess(RR_THE_LOST_WOODS) && CanPlay(SariasSong) && AreaTable(RR_THE_GRAVEYARD)->childDay && ChildCanAccess(RR_HYRULE_FIELD) && HasAllStones)));}}),
+                  EventAccess(&MaskOfTruth, {[]{return MaskOfTruth || (SkullMask && (randoCtx->GetOption(RSK_COMPLETE_MASK_QUEST) || (ChildCanAccess(RR_THE_LOST_WOODS) && CanUse(RG_SARIAS_SONG) && AreaTable(RR_THE_GRAVEYARD)->childDay && ChildCanAccess(RR_HYRULE_FIELD) && HasAllStones)));}}),
                 }, {}, {
                   //Exits
                   Entrance(RR_THE_MARKET, {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
index d77ba0b8c..480f40103 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
@@ -9,7 +9,7 @@ void AreaTable_Init_DeathMountain() {
   auto ctx = Rando::Context::GetInstance();
   areaTable[RR_DEATH_MOUNTAIN_TRAIL] = Area("Death Mountain", "Death Mountain", RA_DEATH_MOUNTAIN_TRAIL, DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&BeanPlantFairy, {[]{return BeanPlantFairy || (CanPlantBean(RR_DEATH_MOUNTAIN_TRAIL) && CanPlay(SongOfStorms) && (HasExplosives || GoronBracelet));}}),
+                  EventAccess(&BeanPlantFairy, {[]{return BeanPlantFairy || (CanPlantBean(RR_DEATH_MOUNTAIN_TRAIL) && CanUse(RG_SONG_OF_STORMS) && (HasExplosives || GoronBracelet));}}),
                 }, {
                   //Locations
                   LocationAccess(RC_DMT_CHEST,                    {[]{return CanBlastOrSmash || (randoCtx->GetTrickOption(RT_DMT_BOMBABLE) && IsChild && GoronBracelet);}}),
@@ -54,7 +54,7 @@ void AreaTable_Init_DeathMountain() {
 
   areaTable[RR_DMT_COW_GROTTO] = Area("DMT Cow Grotto", "DMT Cow Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DMT_COW_GROTTO_COW, {[]{return CanPlay(EponasSong);}}),
+                  LocationAccess(RC_DMT_COW_GROTTO_COW, {[]{return CanUse(RG_EPONAS_SONG);}}),
                 }, {
                   //Exits
                   Entrance(RR_DEATH_MOUNTAIN_SUMMIT, {[]{return true;}}),
@@ -72,7 +72,7 @@ void AreaTable_Init_DeathMountain() {
 
   areaTable[RR_DMT_GREAT_FAIRY_FOUNTAIN] = Area("DMT Great Fairy Fountain", "DMT Great Fairy Fountain", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DMT_GREAT_FAIRY_REWARD, {[]{return CanPlay(ZeldasLullaby);}}),
+                  LocationAccess(RC_DMT_GREAT_FAIRY_REWARD, {[]{return CanUse(RG_ZELDAS_LULLABY);}}),
                 }, {
                   //Exits
                   Entrance(RR_DEATH_MOUNTAIN_SUMMIT, {[]{return true;}}),
@@ -85,7 +85,7 @@ void AreaTable_Init_DeathMountain() {
                   EventAccess(&BugRock,                   {[]{return BugRock                   || (CanBlastOrSmash || CanUse(RG_SILVER_GAUNTLETS));}}),
                   EventAccess(&GoronCityChildFire,        {[]{return GoronCityChildFire        || (IsChild && CanUse(RG_DINS_FIRE));}}),
                   EventAccess(&GCWoodsWarpOpen,           {[]{return GCWoodsWarpOpen           || (CanBlastOrSmash || CanUse(RG_DINS_FIRE) || CanUse(RG_FAIRY_BOW) || GoronBracelet || GoronCityChildFire);}}),
-                  EventAccess(&GCDaruniasDoorOpenChild,   {[]{return GCDaruniasDoorOpenChild   || (IsChild && CanPlay(ZeldasLullaby));}}),
+                  EventAccess(&GCDaruniasDoorOpenChild,   {[]{return GCDaruniasDoorOpenChild   || (IsChild && CanUse(RG_ZELDAS_LULLABY));}}),
                   EventAccess(&StopGCRollingGoronAsAdult, {[]{return StopGCRollingGoronAsAdult || (IsAdult && (GoronBracelet || HasExplosives || Bow || (randoCtx->GetTrickOption(RT_GC_LINK_GORON_DINS) && CanUse(RG_DINS_FIRE))));}}),
                 }, {
                   //Locations
@@ -106,9 +106,8 @@ void AreaTable_Init_DeathMountain() {
                   Entrance(RR_GC_WOODS_WARP,        {[]{return GCWoodsWarpOpen;}}),
                   Entrance(RR_GC_SHOP,              {[]{return (IsAdult && StopGCRollingGoronAsAdult) || (IsChild && (CanBlastOrSmash || GoronBracelet || GoronCityChildFire || CanUse(RG_FAIRY_BOW)));}}),
                   Entrance(RR_GC_DARUNIAS_CHAMBER,  {[]{return (IsAdult && StopGCRollingGoronAsAdult) || (IsChild && GCDaruniasDoorOpenChild);}}),
-                  Entrance(RR_GC_GROTTO_PLATFORM,   {[]{return IsAdult && ((CanPlay(SongOfTime) && ((EffectiveHealth > 2) || CanUse(RG_GORON_TUNIC) || CanUse(RG_LONGSHOT) || CanUse(RG_NAYRUS_LOVE))) || (EffectiveHealth > 1 && CanUse(RG_GORON_TUNIC) && CanUse(RG_HOOKSHOT)) || (CanUse(RG_NAYRUS_LOVE) && CanUse(RG_HOOKSHOT)) || (EffectiveHealth > 2 && CanUse(RG_HOOKSHOT) && randoCtx->GetTrickOption(RT_GC_GROTTO)));}}),
-  });
-
+                  Entrance(RR_GC_GROTTO_PLATFORM,   {[]{return IsAdult && ((CanUse(RG_SONG_OF_TIME) && ((EffectiveHealth > 2) || CanUse(RG_GORON_TUNIC) || CanUse(RG_LONGSHOT) || CanUse(RG_NAYRUS_LOVE))) || (EffectiveHealth > 1 && CanUse(RG_GORON_TUNIC) && CanUse(RG_HOOKSHOT)) || (CanUse(RG_NAYRUS_LOVE) && CanUse(RG_HOOKSHOT)) || (EffectiveHealth > 2 && CanUse(RG_HOOKSHOT) && randoCtx->GetTrickOption(RT_GC_GROTTO)));}}),
+    });
   areaTable[RR_GC_WOODS_WARP] = Area("GC Woods Warp", "Goron City", RA_GORON_CITY, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&GCWoodsWarpOpen, {[]{return GCWoodsWarpOpen || (CanBlastOrSmash || CanUse(RG_DINS_FIRE));}}),
@@ -123,7 +122,7 @@ void AreaTable_Init_DeathMountain() {
                   EventAccess(&GoronCityChildFire, {[]{return GoronCityChildFire || (IsChild && CanUse(RG_STICKS));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_GC_DARUNIAS_JOY, {[]{return IsChild && CanPlay(SariasSong);}}),
+                  LocationAccess(RC_GC_DARUNIAS_JOY, {[]{return IsChild && CanUse(RG_SARIAS_SONG);}}),
                 }, {
                   //Exits
                   Entrance(RR_GORON_CITY,      {[]{return true;}}),
@@ -133,7 +132,7 @@ void AreaTable_Init_DeathMountain() {
   areaTable[RR_GC_GROTTO_PLATFORM] = Area("GC Grotto Platform", "Goron City", RA_GORON_CITY, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_GC_GROTTO,  {[]{return true;}}),
-                  Entrance(RR_GORON_CITY, {[]{return EffectiveHealth > 2 || CanUse(RG_GORON_TUNIC) || CanUse(RG_NAYRUS_LOVE) || ((IsChild || CanPlay(SongOfTime)) && CanUse(RG_LONGSHOT));}}),
+                  Entrance(RR_GORON_CITY, {[]{return EffectiveHealth > 2 || CanUse(RG_GORON_TUNIC) || CanUse(RG_NAYRUS_LOVE) || ((IsChild || CanUse(RG_SONG_OF_TIME)) && CanUse(RG_LONGSHOT));}}),
   });
 
   areaTable[RR_GC_SHOP] = Area("GC Shop", "GC Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -220,7 +219,7 @@ void AreaTable_Init_DeathMountain() {
 
   areaTable[RR_DMC_CENTRAL_LOCAL] = Area("DMC Central Local", "Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&BeanPlantFairy, {[]{return BeanPlantFairy || (CanPlantBean(RR_DMC_CENTRAL_LOCAL) && CanPlay(SongOfStorms));}}),
+                  EventAccess(&BeanPlantFairy, {[]{return BeanPlantFairy || (CanPlantBean(RR_DMC_CENTRAL_LOCAL) && CanUse(RG_SONG_OF_STORMS));}}),
                 }, {
                   //Locations
                   LocationAccess(RC_DMC_GS_BEAN_PATCH, {[]{return (FireTimer >= 8 || Hearts >= 3) && CanPlantBugs && CanChildAttack;}}),
@@ -234,7 +233,7 @@ void AreaTable_Init_DeathMountain() {
 
   areaTable[RR_DMC_GREAT_FAIRY_FOUNTAIN] = Area("DMC Great Fairy Fountain", "DMC Great Fairy Fountain", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DMC_GREAT_FAIRY_REWARD, {[]{return CanPlay(ZeldasLullaby);}}),
+                  LocationAccess(RC_DMC_GREAT_FAIRY_REWARD, {[]{return CanUse(RG_ZELDAS_LULLABY);}}),
                 }, {
                   //Exits
                   Entrance(RR_DMC_LOWER_LOCAL, {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp
index 77459619f..5c502cd08 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp
@@ -177,8 +177,8 @@ void AreaTable_Init_DekuTree() {
                   LocationAccess(RC_DEKU_TREE_MQ_COMPASS_CHEST,   {[]{return true;}}),
                   LocationAccess(RC_DEKU_TREE_MQ_GS_COMPASS_ROOM, {[]{return HookshotOrBoomerang &&
                                                                                Here(RR_DEKU_TREE_MQ_COMPASS_ROOM, []{return HasBombchus ||
-                                                                               (Bombs && (CanPlay(SongOfTime) || IsAdult)) ||
-                                                                               (IsAdult && CanUse(RG_MEGATON_HAMMER) && (CanPlay(SongOfTime) || randoCtx->GetTrickOption(RT_DEKU_MQ_COMPASS_GS)));});}}),
+                                                                               (Bombs && (CanUse(RG_SONG_OF_TIME) || IsAdult)) ||
+                                                                               (IsAdult && CanUse(RG_MEGATON_HAMMER) && (CanUse(RG_SONG_OF_TIME) || randoCtx->GetTrickOption(RT_DEKU_MQ_COMPASS_GS)));});}}),
   }, {
                   //Exits
                   Entrance(RR_DEKU_TREE_MQ_LOBBY, {[]{return true;}}),
@@ -196,7 +196,7 @@ void AreaTable_Init_DekuTree() {
 
   areaTable[RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK] = Area("Deku Tree MQ Basement Water Room Front", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST, {[]{return CanPlay(SongOfTime);}}),
+                  LocationAccess(RC_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST, {[]{return CanUse(RG_SONG_OF_TIME);}}),
   }, {
                   //Exits
                   Entrance(RR_DEKU_TREE_MQ_BASEMENT_BACK_ROOM,        {[]{return Here(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK, []{return (IsChild && CanUse(RG_STICKS)) || CanUse(RG_DINS_FIRE) ||
@@ -208,7 +208,7 @@ void AreaTable_Init_DekuTree() {
 
   areaTable[RR_DEKU_TREE_MQ_BASEMENT_BACK_ROOM] = Area("Deku Tree MQ Basement Back Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM, {[]{return (IsAdult && CanUse(RG_LONGSHOT)) || (CanPlay(SongOfTime) && HookshotOrBoomerang);}}),
+                  LocationAccess(RC_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM, {[]{return (IsAdult && CanUse(RG_LONGSHOT)) || (CanUse(RG_SONG_OF_TIME) && HookshotOrBoomerang);}}),
                   LocationAccess(RC_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM,   {[]{return HasFireSourceWithTorch && HookshotOrBoomerang;}}),
   }, {
                   //Exits
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp
index 8730e672b..b17600633 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp
@@ -228,7 +228,7 @@ void AreaTable_Init_DodongosCavern() {
                   LocationAccess(RC_DODONGOS_CAVERN_MQ_COMPASS_CHEST,              {[]{return CanAdultAttack || CanChildAttack || Nuts;}}),
                   LocationAccess(RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST,          {[]{return (IsChild && CanUse(RG_STICKS)) || HasFireSource;}}),
                   LocationAccess(RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST,    {[]{return CanBlastOrSmash || (IsChild && CanUse(RG_STICKS)) || CanUse(RG_DINS_FIRE) || (IsAdult && (randoCtx->GetTrickOption(RT_DC_JUMP) || HoverBoots || Hookshot));}}),
-                  LocationAccess(RC_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM, {[]{return CanPlay(SongOfTime) && (CanChildAttack || CanAdultAttack);}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM, {[]{return CanUse(RG_SONG_OF_TIME) && (CanChildAttack || CanAdultAttack);}}),
                   LocationAccess(RC_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM,             {[]{return (IsChild && CanUse(RG_STICKS)) || HasFireSource;}}),
                   LocationAccess(RC_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM,           {[]{return CanBlastOrSmash;}}),
                   LocationAccess(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,      {[]{return CanStunDeku;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp
index 6744ea651..afb1b64be 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp
@@ -96,7 +96,7 @@ void AreaTable_Init_FireTemple() {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_FIRST_ROOM,                {[]{return SmallKeys(RR_FIRE_TEMPLE, 2);}}),
                   Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_GORON, {[]{return true;}}),
-                  Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_TILES, {[]{return IsAdult && (CanPlay(SongOfTime) || randoCtx->GetTrickOption(RT_FIRE_SOT));}}),
+                  Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_TILES, {[]{return IsAdult && (CanUse(RG_SONG_OF_TIME) || randoCtx->GetTrickOption(RT_FIRE_SOT));}}),
                   Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM_SOUTH_GORON, {[]{return IsAdult && HasExplosives;}}),
                   Entrance(RR_FIRE_TEMPLE_FIRE_PILLAR_ROOM,          {[]{return SmallKeys(RR_FIRE_TEMPLE, 3);}}),
   });
@@ -253,11 +253,11 @@ void AreaTable_Init_FireTemple() {
 
   areaTable[RR_FIRE_TEMPLE_WEST_CENTRAL_LOWER] = Area("Fire Temple West Central Lower", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FIRE_TEMPLE_HIGHEST_GORON_CHEST, {[]{return Here(RR_FIRE_TEMPLE_WEST_CENTRAL_UPPER, []{return (CanPlay(SongOfTime) || randoCtx->GetTrickOption(RT_RUSTED_SWITCHES)) && CanUse(RG_MEGATON_HAMMER);});}}),
+                  LocationAccess(RC_FIRE_TEMPLE_HIGHEST_GORON_CHEST, {[]{return Here(RR_FIRE_TEMPLE_WEST_CENTRAL_UPPER, []{return (CanUse(RG_SONG_OF_TIME) || randoCtx->GetTrickOption(RT_RUSTED_SWITCHES)) && CanUse(RG_MEGATON_HAMMER);});}}),
                 }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_ROOM,     {[]{return SmallKeys(RR_FIRE_TEMPLE, 8);}}),
-                  Entrance(RR_FIRE_TEMPLE_WEST_CENTRAL_UPPER, {[]{return IsAdult && CanPlay(SongOfTime);}}),
+                  Entrance(RR_FIRE_TEMPLE_WEST_CENTRAL_UPPER, {[]{return IsAdult && CanUse(RG_SONG_OF_TIME);}}),
                   Entrance(RR_FIRE_TEMPLE_LATE_FIRE_MAZE,     {[]{return true;}}),
   });
 
@@ -367,13 +367,13 @@ void AreaTable_Init_FireTemple() {
 
   areaTable[RR_FIRE_TEMPLE_MQ_UPPER_MAZE] = Area("Fire Temple MQ Upper Maze", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  //EventAccess(&WallFairy, {[]{return WallFairy || (IsAdult && (((CanPlay(SongOfTime) && CanUse(RG_HOOKSHOT) && HasExplosives) || CanUse(RG_LONGSHOT))));}}),
+                  //EventAccess(&WallFairy, {[]{return WallFairy || (IsAdult && (((CanUse(RG_SONG_OF_TIME) && CanUse(RG_HOOKSHOT) && HasExplosives) || CanUse(RG_LONGSHOT))));}}),
                   EventAccess(&FairyPot,  {[]{return SmallKeys(RR_FIRE_TEMPLE, 3);}}),
   }, {
                   //Locations
                   LocationAccess(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST, {[]{return true;}}),
                   LocationAccess(RC_FIRE_TEMPLE_MQ_COMPASS_CHEST,             {[]{return HasExplosives;}}),
-                  LocationAccess(RC_FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE,          {[]{return IsAdult && ((CanPlay(SongOfTime) && CanUse(RG_HOOKSHOT) && HasExplosives) || CanUse(RG_LONGSHOT));}}),
+                  LocationAccess(RC_FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE,          {[]{return IsAdult && ((CanUse(RG_SONG_OF_TIME) && CanUse(RG_HOOKSHOT) && HasExplosives) || CanUse(RG_LONGSHOT));}}),
   }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_MQ_UPPER, {[]{return SmallKeys(RR_FIRE_TEMPLE, 3) && IsAdult && ((CanUse(RG_FAIRY_BOW) && CanUse(RG_HOOKSHOT)) || CanUse(RG_FIRE_ARROWS));}}),
@@ -385,8 +385,8 @@ void AreaTable_Init_FireTemple() {
                     //Trick: (IsAdult && CanUse(RG_HOOKSHOT)) || LogicFireMQFlameMaze
                   LocationAccess(RC_FIRE_TEMPLE_MQ_CHEST_ON_FIRE,               {[]{return ((IsAdult && CanUse(RG_HOOKSHOT)) || randoCtx->GetTrickOption(RT_FIRE_MQ_FLAME_MAZE)) && SmallKeys(RR_FIRE_TEMPLE, 4);}}),
                     //Trick: ((IsAdult && CanUse(RG_HOOKSHOT)) || LogicFireMQFlameMaze) && SmallKeys(RR_FIRE_TEMPLE, 4)
-                  LocationAccess(RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM, {[]{return CanPlay(SongOfTime) || HoverBoots || randoCtx->GetTrickOption(RT_FIRE_MQ_FLAME_MAZE);}}),
-                    //Trick: CanPlay(SongOfTime) || HoverBoots || LogicFireMQFlameMaze
+                  LocationAccess(RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM, {[]{return CanUse(RG_SONG_OF_TIME) || HoverBoots || randoCtx->GetTrickOption(RT_FIRE_MQ_FLAME_MAZE);}}),
+                    //Trick: CanUse(RG_SONG_OF_TIME) || HoverBoots || LogicFireMQFlameMaze
                   LocationAccess(RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER,    {[]{return HasExplosives;}}),
                   LocationAccess(RC_FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE,     {[]{return (IsAdult && CanUse(RG_HOOKSHOT) && SmallKeys(RR_FIRE_TEMPLE, 5)) || (randoCtx->GetTrickOption(RT_FIRE_MQ_ABOVE_MAZE_GS) && IsAdult && CanUse(RG_LONGSHOT));}}),
                     //Trick: (IsAdult && CanUse(RG_HOOKSHOT) && SmallKeys(RR_FIRE_TEMPLE, 5)) || (LogicFireMQAboveMazeGS && IsAdult && CanUse(RG_LONGSHOT))
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp
index 8c5bb0ff6..98022ed82 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp
@@ -47,7 +47,7 @@ void AreaTable_Init_ForestTemple() {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_SOUTH_CORRIDOR,    {[]{return true;}}),
                   Entrance(RR_FOREST_TEMPLE_NORTH_CORRIDOR,    {[]{return true;}}),
-                  Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_LOWER, {[]{return CanPlay(SongOfTime) || IsChild;}}),
+                  Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_LOWER, {[]{return CanUse(RG_SONG_OF_TIME) || IsChild;}}),
                   Entrance(RR_FOREST_TEMPLE_NE_OUTDOORS_LOWER, {[]{return CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT);}}),
                   Entrance(RR_FOREST_TEMPLE_WEST_CORRIDOR,     {[]{return SmallKeys(RR_FOREST_TEMPLE, 1, 5);}}),
                   Entrance(RR_FOREST_TEMPLE_EAST_CORRIDOR,     {[]{return false;}}),
@@ -81,7 +81,7 @@ void AreaTable_Init_ForestTemple() {
                   LocationAccess(RC_FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD, {[]{return CanUse(RG_LONGSHOT) || Here(RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER, []{return HookshotOrBoomerang;});}}),
                 }, {
                   //Exits
-                  Entrance(RR_FOREST_TEMPLE_LOBBY,             {[]{return CanPlay(SongOfTime);}}),
+                  Entrance(RR_FOREST_TEMPLE_LOBBY,             {[]{return CanUse(RG_SONG_OF_TIME);}}),
                   Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER, {[]{return false;}}),
                   Entrance(RR_FOREST_TEMPLE_MAP_ROOM,          {[]{return true;}}),
                   Entrance(RR_FOREST_TEMPLE_SEWER,             {[]{return GoldScale || CanUse(RG_IRON_BOOTS) || HasAccessTo(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER);}}),
@@ -295,7 +295,7 @@ void AreaTable_Init_ForestTemple() {
                   EventAccess(&FairyPot, {[]{return true;}}),
   }, {
                   //Locations
-                  LocationAccess(RC_FOREST_TEMPLE_MQ_WOLFOS_CHEST,       {[]{return (CanPlay(SongOfTime) || IsChild) && (CanJumpslash || CanUse(RG_DINS_FIRE) || CanUse(RG_STICKS) || CanUse(RG_FAIRY_SLINGSHOT) || KokiriSword);}}),
+                  LocationAccess(RC_FOREST_TEMPLE_MQ_WOLFOS_CHEST,       {[]{return (CanUse(RG_SONG_OF_TIME) || IsChild) && (CanJumpslash || CanUse(RG_DINS_FIRE) || CanUse(RG_STICKS) || CanUse(RG_FAIRY_SLINGSHOT) || KokiriSword);}}),
                   LocationAccess(RC_FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM, {[]{return CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_MEGATON_HAMMER);}}),
   }, {
                   //Exits
@@ -344,11 +344,11 @@ void AreaTable_Init_ForestTemple() {
   }, {
                   //Locations
                   LocationAccess(RC_FOREST_TEMPLE_MQ_WELL_CHEST,                 {[]{return (IsAdult && CanUse(RG_FAIRY_BOW)) || (IsChild && CanUse(RG_FAIRY_SLINGSHOT));}}),
-                  LocationAccess(RC_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD, {[]{return HookshotOrBoomerang || (IsAdult && CanUse(RG_FIRE_ARROWS) && (CanPlay(SongOfTime) || (CanUse(RG_HOVER_BOOTS) && randoCtx->GetTrickOption(RT_FOREST_DOORFRAME))));}}),
+                  LocationAccess(RC_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD, {[]{return HookshotOrBoomerang || (IsAdult && CanUse(RG_FIRE_ARROWS) && (CanUse(RG_SONG_OF_TIME) || (CanUse(RG_HOVER_BOOTS) && randoCtx->GetTrickOption(RT_FOREST_DOORFRAME))));}}),
                   LocationAccess(RC_FOREST_TEMPLE_MQ_GS_WELL,                    {[]{return (IsAdult && ((CanUse(RG_IRON_BOOTS) && CanUse(RG_HOOKSHOT)) || CanUse(RG_FAIRY_BOW))) || (IsChild && CanUse(RG_FAIRY_SLINGSHOT));}}),
   }, {
                   //Exits
-                  Entrance(RR_FOREST_TEMPLE_MQ_OUTDOORS_TOP_LEDGES, {[]{return IsAdult && CanUse(RG_HOOKSHOT) && (CanUse(RG_LONGSHOT) || CanUse(RG_HOVER_BOOTS) || CanPlay(SongOfTime));}}),
+                  Entrance(RR_FOREST_TEMPLE_MQ_OUTDOORS_TOP_LEDGES, {[]{return IsAdult && CanUse(RG_HOOKSHOT) && (CanUse(RG_LONGSHOT) || CanUse(RG_HOVER_BOOTS) || CanUse(RG_SONG_OF_TIME));}}),
                   Entrance(RR_FOREST_TEMPLE_MQ_NE_OUTDOORS_LEDGE,   {[]{return IsAdult && CanUse(RG_LONGSHOT);}}),
   });
 
@@ -368,7 +368,7 @@ void AreaTable_Init_ForestTemple() {
   }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_MQ_NE_OUTDOORS,  {[]{return true;}}),
-                  Entrance(RR_FOREST_TEMPLE_MQ_FALLING_ROOM, {[]{return CanPlay(SongOfTime);}}),
+                  Entrance(RR_FOREST_TEMPLE_MQ_FALLING_ROOM, {[]{return CanUse(RG_SONG_OF_TIME);}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_MQ_BOW_REGION] = Area("Forest Temple MQ Bow Region", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
index c244dcb89..a89738e4a 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
@@ -89,7 +89,7 @@ void AreaTable_Init_GanonsCastle() {
                   EventAccess(&ShadowTrialClear, {[]{return CanUse(RG_LIGHT_ARROWS) && CanUse(RG_MEGATON_HAMMER) && ((FireArrows && (randoCtx->GetTrickOption(RT_LENS_GANON) || CanUse(RG_LENS_OF_TRUTH))) || (CanUse(RG_LONGSHOT) && (CanUse(RG_HOVER_BOOTS) || (DinsFire && (randoCtx->GetTrickOption(RT_LENS_GANON) || CanUse(RG_LENS_OF_TRUTH))))));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST,            {[]{return CanUse(RG_FIRE_ARROWS) || CanUse(RG_HOOKSHOT) || CanUse(RG_HOVER_BOOTS) || CanPlay(SongOfTime) || IsChild;}}),
+                  LocationAccess(RC_GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST,            {[]{return CanUse(RG_FIRE_ARROWS) || CanUse(RG_HOOKSHOT) || CanUse(RG_HOVER_BOOTS) || CanUse(RG_SONG_OF_TIME) || IsChild;}}),
                   LocationAccess(RC_GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST, {[]{return CanUse(RG_FIRE_ARROWS) || (CanUse(RG_LONGSHOT) && (CanUse(RG_HOVER_BOOTS) || CanUse(RG_DINS_FIRE)));}}),
   }, {});
 
@@ -115,7 +115,7 @@ void AreaTable_Init_GanonsCastle() {
                   LocationAccess(RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST,      {[]{return true;}}),
                   LocationAccess(RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST,       {[]{return true;}}),
                   LocationAccess(RC_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST, {[]{return randoCtx->GetTrickOption(RT_LENS_GANON) || CanUse(RG_LENS_OF_TRUTH);}}),
-                  LocationAccess(RC_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST,           {[]{return CanPlay(ZeldasLullaby) && SmallKeys(RR_GANONS_CASTLE, 1);}}),
+                  LocationAccess(RC_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST,           {[]{return CanUse(RG_ZELDAS_LULLABY) && SmallKeys(RR_GANONS_CASTLE, 1);}}),
   }, {});
   }
 
@@ -171,7 +171,7 @@ void AreaTable_Init_GanonsCastle() {
 
   areaTable[RR_GANONS_CASTLE_MQ_FOREST_TRIAL] = Area("Ganon's Castle MQ Forest Trial", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&ForestTrialClear, {[]{return IsAdult && CanUse(RG_LIGHT_ARROWS) && (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) && CanPlay(SongOfTime);}}),
+                  EventAccess(&ForestTrialClear, {[]{return IsAdult && CanUse(RG_LIGHT_ARROWS) && (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) && CanUse(RG_SONG_OF_TIME);}}),
   }, {
                   //Locations
                   LocationAccess(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST,        {[]{return (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) && (CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT));}}),
@@ -225,7 +225,7 @@ void AreaTable_Init_GanonsCastle() {
                     //Trick: IsAdult && CanUse(RG_LIGHT_ARROWS) && SmallKeys(RR_GANONS_CASTLE, 3) && (LogicLensCastleMQ || CanUse(RG_LENS_OF_TRUTH)) && (Hookshot || LogicLightTrialMQ)
   }, {
                   //Locations
-                  LocationAccess(RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST, {[]{return (CanUse(RG_MASTER_SWORD) || CanUse(RG_KOKIRI_SWORD) || CanUse(RG_BIGGORON_SWORD)) && CanPlay(ZeldasLullaby);}}),
+                  LocationAccess(RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST, {[]{return (CanUse(RG_MASTER_SWORD) || CanUse(RG_KOKIRI_SWORD) || CanUse(RG_BIGGORON_SWORD)) && CanUse(RG_ZELDAS_LULLABY);}}),
   }, {});
   }
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp
index 46c5eeae6..fab92a5b6 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp
@@ -60,10 +60,10 @@ void AreaTable_Init_GerudoTrainingGrounds() {
 
   areaTable[RR_GERUDO_TRAINING_GROUNDS_LAVA_ROOM] = Area("Gerudo Training Grounds Lava Room", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST, {[]{return CanUse(RG_HOOKSHOT) && CanPlay(SongOfTime) && IronBoots && WaterTimer >= 24;}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST, {[]{return CanUse(RG_HOOKSHOT) && CanUse(RG_SONG_OF_TIME) && IronBoots && WaterTimer >= 24;}}),
                 }, {
                   //Exits
-                  Entrance(RR_GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE_RIGHT, {[]{return CanPlay(SongOfTime) || IsChild;}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE_RIGHT, {[]{return CanUse(RG_SONG_OF_TIME) || IsChild;}}),
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_HAMMER_ROOM,        {[]{return CanUse(RG_LONGSHOT)  || (CanUse(RG_HOVER_BOOTS) && CanUse(RG_HOOKSHOT));}}),
   });
 
@@ -164,8 +164,8 @@ void AreaTable_Init_GerudoTrainingGrounds() {
                   LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_HEAVY_BLOCK_CHEST,        {[]{return CanUse(RG_SILVER_GAUNTLETS) && (CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD));}}),
   }, {
                   //Exits
-                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_BACK_AREAS, {[]{return IsAdult && (CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) && (randoCtx->GetTrickOption(RT_LENS_GTG_MQ) || CanUse(RG_LENS_OF_TRUTH)) && BlueFire && (CanPlay(SongOfTime) || (randoCtx->GetTrickOption(RT_GTG_FAKE_WALL) && IsAdult && CanUse(RG_HOVER_BOOTS)));}}),
-                    //Trick: IsAdult && (LogicLensGtgMQ || CanUse(RG_LENS_OF_TRUTH)) && BlueFire && (CanPlay(SongOfTime) || (LogicGtgFakeWall && IsAdult && CanUse(RG_HOVER_BOOTS)))
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_BACK_AREAS, {[]{return IsAdult && (CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) && (randoCtx->GetTrickOption(RT_LENS_GTG_MQ) || CanUse(RG_LENS_OF_TRUTH)) && BlueFire && (CanUse(RG_SONG_OF_TIME) || (randoCtx->GetTrickOption(RT_GTG_FAKE_WALL) && IsAdult && CanUse(RG_HOVER_BOOTS)));}}),
+                    //Trick: IsAdult && (LogicLensGtgMQ || CanUse(RG_LENS_OF_TRUTH)) && BlueFire && (CanUse(RG_SONG_OF_TIME) || (LogicGtgFakeWall && IsAdult && CanUse(RG_HOVER_BOOTS)))
   });
 
   areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_BACK_AREAS] = Area("Gerudo Training Grounds MQ Back Areas", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
index 906169b2d..350cdf703 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
@@ -24,12 +24,12 @@ void AreaTable_Init_GerudoValley() {
   areaTable[RR_GV_UPPER_STREAM] = Area("GV Upper Stream", "Gerudo Valley", RA_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&GossipStoneFairy, {[]{return GossipStoneFairy || CanSummonGossipFairy;}}),
-                  EventAccess(&BeanPlantFairy,   {[]{return BeanPlantFairy   || (CanPlantBean(RR_GV_UPPER_STREAM) && CanPlay(SongOfStorms));}}),
+                  EventAccess(&BeanPlantFairy,   {[]{return BeanPlantFairy   || (CanPlantBean(RR_GV_UPPER_STREAM) && CanUse(RG_SONG_OF_STORMS));}}),
                 }, {
                   //Locations
                   LocationAccess(RC_GV_WATERFALL_FREESTANDING_POH, {[]{return true;}}),
                   LocationAccess(RC_GV_GS_BEAN_PATCH,              {[]{return CanPlantBugs && CanChildAttack;}}),
-                  LocationAccess(RC_GV_COW,                        {[]{return IsChild && CanPlay(EponasSong);}}),
+                  LocationAccess(RC_GV_COW,                        {[]{return IsChild && CanUse(RG_EPONAS_SONG);}}),
                   LocationAccess(RC_GV_GOSSIP_STONE,               {[]{return true;}}),
                 }, {
                   //Exits
@@ -165,7 +165,7 @@ void AreaTable_Init_GerudoValley() {
 
   areaTable[RR_DESERT_COLOSSUS] = Area("Desert Colossus", "Desert Colossus", RA_DESERT_COLOSSUS, DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&FairyPond, {[]{return FairyPond || CanPlay(SongOfStorms);}}),
+                  EventAccess(&FairyPond, {[]{return FairyPond || CanUse(RG_SONG_OF_STORMS);}}),
                   EventAccess(&BugRock,   {[]{return true;}}),
                 }, {
                   //Locations
@@ -192,7 +192,7 @@ void AreaTable_Init_GerudoValley() {
 
   areaTable[RR_COLOSSUS_GREAT_FAIRY_FOUNTAIN] = Area("Colossus Great Fairy Fountain", "Colossus Great Fairy Fountain", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_COLOSSUS_GREAT_FAIRY_REWARD, {[]{return CanPlay(ZeldasLullaby);}}),
+                  LocationAccess(RC_COLOSSUS_GREAT_FAIRY_REWARD, {[]{return CanUse(RG_ZELDAS_LULLABY);}}),
                 }, {
                   //Exits
                   Entrance(RR_DESERT_COLOSSUS, {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
index b43a5c6ae..9259846fb 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
@@ -61,7 +61,7 @@ void AreaTable_Init_HyruleField() {
   areaTable[RR_HF_COW_GROTTO] = Area("HF Cow Grotto", "HF Cow Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LocationAccess(RC_HF_GS_COW_GROTTO,           {[]{return HasFireSource && HookshotOrBoomerang;}}),
-                  LocationAccess(RC_HF_COW_GROTTO_COW,          {[]{return HasFireSource && CanPlay(EponasSong);}}),
+                  LocationAccess(RC_HF_COW_GROTTO_COW,          {[]{return HasFireSource && CanUse(RG_EPONAS_SONG);}}),
                   LocationAccess(RC_HF_COW_GROTTO_GOSSIP_STONE, {[]{return HasFireSource;}}),
                 }, {
                   //Exits
@@ -104,11 +104,11 @@ void AreaTable_Init_HyruleField() {
   areaTable[RR_LAKE_HYLIA] = Area("Lake Hylia", "Lake Hylia", RA_LAKE_HYLIA, DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&GossipStoneFairy, {[]{return GossipStoneFairy || CanSummonGossipFairy;}}),
-                  EventAccess(&BeanPlantFairy,   {[]{return BeanPlantFairy   || (CanPlantBean(RR_LAKE_HYLIA) && CanPlay(SongOfStorms));}}),
+                  EventAccess(&BeanPlantFairy,   {[]{return BeanPlantFairy   || (CanPlantBean(RR_LAKE_HYLIA) && CanUse(RG_SONG_OF_STORMS));}}),
                   EventAccess(&ButterflyFairy,   {[]{return ButterflyFairy   || CanUse(RG_STICKS);}}),
                   EventAccess(&BugShrub,         {[]{return BugShrub         || (IsChild && CanCutShrubs);}}),
-                  EventAccess(&ChildScarecrow,   {[]{return ChildScarecrow   || (IsChild && Ocarina);}}),
-                  EventAccess(&AdultScarecrow,   {[]{return AdultScarecrow   || (IsAdult && Ocarina);}}),
+                  EventAccess(&ChildScarecrow,   {[]{return ChildScarecrow   || (IsChild && Ocarina && OcarinaButtons >= 2);}}),
+                  EventAccess(&AdultScarecrow,   {[]{return AdultScarecrow   || (IsAdult && Ocarina && OcarinaButtons >= 2);}}),
                 }, {
                   //Locations
                   LocationAccess(RC_LH_UNDERWATER_ITEM,        {[]{return IsChild && CanDive;}}),
@@ -177,8 +177,8 @@ void AreaTable_Init_HyruleField() {
 
   areaTable[RR_LON_LON_RANCH] = Area("Lon Lon Ranch", "Lon Lon Ranch", RA_LON_LON_RANCH, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&Epona,    {[]{return Epona    || (CanPlay(EponasSong) && IsAdult && AtDay);}}),
-                  EventAccess(&LinksCow, {[]{return LinksCow || (CanPlay(EponasSong) && IsAdult && AtDay);}}),
+                  EventAccess(&Epona,    {[]{return Epona    || (CanUse(RG_EPONAS_SONG) && IsAdult && AtDay);}}),
+                  EventAccess(&LinksCow, {[]{return LinksCow || (CanUse(RG_EPONAS_SONG) && IsAdult && AtDay);}}),
                 }, {
                   //Locations
                   LocationAccess(RC_SONG_FROM_MALON,     {[]{return IsChild && ZeldasLetter && Ocarina && AtDay;}}),
@@ -205,8 +205,8 @@ void AreaTable_Init_HyruleField() {
 
   areaTable[RR_LLR_STABLES] = Area("LLR Stables", "LLR Stables", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_LLR_STABLES_LEFT_COW,  {[]{return CanPlay(EponasSong);}}),
-                  LocationAccess(RC_LLR_STABLES_RIGHT_COW, {[]{return CanPlay(EponasSong);}}),
+                  LocationAccess(RC_LLR_STABLES_LEFT_COW,  {[]{return CanUse(RG_EPONAS_SONG);}}),
+                  LocationAccess(RC_LLR_STABLES_RIGHT_COW, {[]{return CanUse(RG_EPONAS_SONG);}}),
                 }, {
                   //Exits
                   Entrance(RR_LON_LON_RANCH, {[]{return true;}}),
@@ -215,8 +215,8 @@ void AreaTable_Init_HyruleField() {
   areaTable[RR_LLR_TOWER] = Area("LLR Tower", "LLR Tower", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_LLR_FREESTANDING_POH, {[]{return IsChild;}}),
-                  LocationAccess(RC_LLR_TOWER_LEFT_COW,   {[]{return CanPlay(EponasSong);}}),
-                  LocationAccess(RC_LLR_TOWER_RIGHT_COW,  {[]{return CanPlay(EponasSong);}}),
+                  LocationAccess(RC_LLR_TOWER_LEFT_COW,   {[]{return CanUse(RG_EPONAS_SONG);}}),
+                  LocationAccess(RC_LLR_TOWER_RIGHT_COW,  {[]{return CanUse(RG_EPONAS_SONG);}}),
                 }, {
                   //Exits
                   Entrance(RR_LON_LON_RANCH, {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp
index d3c1629be..60dfee3ba 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp
@@ -79,8 +79,8 @@ void AreaTable_Init_IceCavern() {
                   //Locations
                   LocationAccess(RC_ICE_CAVERN_MQ_COMPASS_CHEST,    {[]{return true;}}),
                   LocationAccess(RC_ICE_CAVERN_MQ_FREESTANDING_POH, {[]{return HasExplosives;}}),
-                  LocationAccess(RC_ICE_CAVERN_MQ_GS_RED_ICE,       {[]{return CanPlay(SongOfTime) || randoCtx->GetTrickOption(RT_ICE_MQ_RED_ICE_GS);}}),
-                    //Trick: CanPlay(SongOfTime) || LogicIceMQRedIceGS
+                  LocationAccess(RC_ICE_CAVERN_MQ_GS_RED_ICE,       {[]{return CanUse(RG_SONG_OF_TIME) || randoCtx->GetTrickOption(RT_ICE_MQ_RED_ICE_GS);}}),
+                    //Trick: CanUse(RG_SONG_OF_TIME) || LogicIceMQRedIceGS
   }, {});
   }
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp
index 19f52d6bd..64ba1d5bb 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp
@@ -184,8 +184,8 @@ void AreaTable_Init_JabuJabusBelly() {
                   LocationAccess(RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST, {[]{return true;}}),
                   LocationAccess(RC_JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST,   {[]{return true;}}),
                   LocationAccess(RC_JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST,              {[]{return true;}}),
-                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM,      {[]{return CanPlay(SongOfTime) || (randoCtx->GetTrickOption(RT_JABU_MQ_SOT_GS) && IsChild && CanUse(RG_BOOMERANG));}}),
-                    //Trick: CanPlay(SongOfTime) || (LogicJabuMQSoTGS && IsChild && CanUse(RG_BOOMERANG))
+                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM,      {[]{return CanUse(RG_SONG_OF_TIME) || (randoCtx->GetTrickOption(RT_JABU_MQ_SOT_GS) && IsChild && CanUse(RG_BOOMERANG));}}),
+                    //Trick: CanUse(RG_SONG_OF_TIME) || (LogicJabuMQSoTGS && IsChild && CanUse(RG_BOOMERANG))
   }, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_MQ_BEGINNING, {[]{return true;}}),
@@ -208,7 +208,7 @@ void AreaTable_Init_JabuJabusBelly() {
                   EventAccess(&FairyPot, {[]{return true;}}),
   }, {
                   //Locations
-                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_COW,             {[]{return CanPlay(EponasSong);}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_COW,             {[]{return CanUse(RG_EPONAS_SONG);}}),
                   LocationAccess(RC_JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST, {[]{return true;}}),
                   LocationAccess(RC_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS,    {[]{return true;}}),
   }, {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
index 19c5aa8b0..e56caa1c8 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
@@ -110,12 +110,12 @@ void AreaTable_Init_Kakariko() {
 
   areaTable[RR_KAK_IMPAS_HOUSE_NEAR_COW] = Area("Kak Impas House Near Cow", "Kak Impas House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_KAK_IMPAS_HOUSE_COW, {[]{return CanPlay(EponasSong);}}),
+                  LocationAccess(RC_KAK_IMPAS_HOUSE_COW, {[]{return CanUse(RG_EPONAS_SONG);}}),
   }, {});
 
   areaTable[RR_KAK_WINDMILL] = Area("Kak Windmill", "Windmill and Dampes Grave", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&DrainWell, {[]{return DrainWell || (IsChild && CanPlay(SongOfStorms));}}),
+                  EventAccess(&DrainWell, {[]{return DrainWell || (IsChild && CanUse(RG_SONG_OF_STORMS));}}),
                 }, {
                   //Locations
                   LocationAccess(RC_KAK_WINDMILL_FREESTANDING_POH, {[]{return CanUse(RG_BOOMERANG) || DampesWindmillAccess || (IsAdult && randoCtx->GetTrickOption(RT_KAK_ADULT_WINDMILL_POH)) || (IsChild && CanJumpslash && randoCtx->GetTrickOption(RT_KAK_CHILD_WINDMILL_POH));}}),
@@ -208,7 +208,7 @@ void AreaTable_Init_Kakariko() {
   areaTable[RR_THE_GRAVEYARD] = Area("The Graveyard", "The Graveyard", RA_THE_GRAVEYARD, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&ButterflyFairy, {[]{return ButterflyFairy || (CanUse(RG_STICKS) && AtDay);}}),
-                  EventAccess(&BeanPlantFairy, {[]{return BeanPlantFairy || (CanPlantBean(RR_THE_GRAVEYARD) && CanPlay(SongOfStorms));}}),
+                  EventAccess(&BeanPlantFairy, {[]{return BeanPlantFairy || (CanPlantBean(RR_THE_GRAVEYARD) && CanUse(RG_SONG_OF_STORMS));}}),
                   EventAccess(&BugRock,        {[]{return true;}}),
                 }, {
                   //Locations
@@ -219,7 +219,7 @@ void AreaTable_Init_Kakariko() {
                 }, {
                   //Exits
                   Entrance(RR_GRAVEYARD_SHIELD_GRAVE,       {[]{return IsAdult || AtNight;}}),
-                  Entrance(RR_GRAVEYARD_COMPOSERS_GRAVE,    {[]{return CanPlay(ZeldasLullaby);}}),
+                  Entrance(RR_GRAVEYARD_COMPOSERS_GRAVE,    {[]{return CanUse(RG_ZELDAS_LULLABY);}}),
                   Entrance(RR_GRAVEYARD_HEART_PIECE_GRAVE,  {[]{return IsAdult || AtNight;}}),
                   Entrance(RR_GRAVEYARD_DAMPES_GRAVE,       {[]{return IsAdult;}}),
                   Entrance(RR_GRAVEYARD_DAMPES_HOUSE,       {[]{return IsAdult || AtDampeTime;}}), //TODO: This needs to be handled
@@ -238,7 +238,7 @@ void AreaTable_Init_Kakariko() {
 
   areaTable[RR_GRAVEYARD_HEART_PIECE_GRAVE] = Area("Graveyard Heart Piece Grave", "Graveyard Heart Piece Grave", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_GRAVEYARD_HEART_PIECE_GRAVE_CHEST, {[]{return CanPlay(SunsSong);}}),
+                  LocationAccess(RC_GRAVEYARD_HEART_PIECE_GRAVE_CHEST, {[]{return CanUse(RG_SUNS_SONG);}}),
                 }, {
                   //Exits
                   Entrance(RR_THE_GRAVEYARD, {[]{return true;}}),
@@ -256,7 +256,7 @@ void AreaTable_Init_Kakariko() {
   areaTable[RR_GRAVEYARD_DAMPES_GRAVE] = Area("Graveyard Dampes Grave", "Windmill and Dampes Grave", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&NutPot,               {[]{return true;}}),
-                  EventAccess(&DampesWindmillAccess, {[]{return DampesWindmillAccess || (IsAdult && CanPlay(SongOfTime));}}),
+                  EventAccess(&DampesWindmillAccess, {[]{return DampesWindmillAccess || (IsAdult && CanUse(RG_SONG_OF_TIME));}}),
                 }, {
                   //Locations
                   LocationAccess(RC_GRAVEYARD_HOOKSHOT_CHEST,              {[]{return true;}}),
@@ -264,7 +264,7 @@ void AreaTable_Init_Kakariko() {
                 }, {
                   //Exits
                   Entrance(RR_THE_GRAVEYARD, {[]{return true;}}),
-                  Entrance(RR_KAK_WINDMILL,  {[]{return IsAdult && CanPlay(SongOfTime);}}),
+                  Entrance(RR_KAK_WINDMILL,  {[]{return IsAdult && CanUse(RG_SONG_OF_TIME);}}),
   });
 
   areaTable[RR_GRAVEYARD_DAMPES_HOUSE] = Area("Graveyard Dampes House", "Graveyard Dampes House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
index 8605d2e4b..f66644061 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
@@ -8,13 +8,13 @@ using namespace Rando;
 void AreaTable_Init_LostWoods() {
   areaTable[RR_KOKIRI_FOREST] = Area("Kokiri Forest", "Kokiri Forest", RA_KOKIRI_FOREST, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&BeanPlantFairy,           {[]{return BeanPlantFairy   || (CanPlantBean(RR_KOKIRI_FOREST) && CanPlay(SongOfStorms));}}),
+                  EventAccess(&BeanPlantFairy,           {[]{return BeanPlantFairy   || (CanPlantBean(RR_KOKIRI_FOREST) && CanUse(RG_SONG_OF_STORMS));}}),
                   EventAccess(&GossipStoneFairy,         {[]{return GossipStoneFairy || CanSummonGossipFairyWithoutSuns;}}),
                   EventAccess(&ShowedMidoSwordAndShield, {[]{return ShowedMidoSwordAndShield || (IsChild && KokiriSword && DekuShield);}}),
                 }, {
                   //Locations
                   LocationAccess(RC_KF_KOKIRI_SWORD_CHEST,   {[]{return IsChild;}}),
-                  LocationAccess(RC_KF_GS_KNOW_IT_ALL_HOUSE, {[]{return IsChild && CanChildAttack && AtNight && (/*TODO: HasNightStart ||*/ CanLeaveForest || CanPlay(SunsSong)) && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_KF_GS_KNOW_IT_ALL_HOUSE, {[]{return IsChild && CanChildAttack && AtNight && (/*TODO: HasNightStart ||*/ CanLeaveForest || CanUse(RG_SUNS_SONG)) && CanGetNightTimeGS;}}),
                   LocationAccess(RC_KF_GS_BEAN_PATCH,        {[]{return CanPlantBugs && CanChildAttack;}}),
                   LocationAccess(RC_KF_GS_HOUSE_OF_TWINS,    {[]{return IsAdult && AtNight && (HookshotOrBoomerang || (randoCtx->GetTrickOption(RT_KF_ADULT_GS) && CanUse(RG_HOVER_BOOTS))) && CanGetNightTimeGS;}}),
                   LocationAccess(RC_KF_GOSSIP_STONE,         {[]{return true;}}),
@@ -49,7 +49,7 @@ void AreaTable_Init_LostWoods() {
 
   areaTable[RR_KF_LINKS_HOUSE] = Area("KF Link's House", "KF Link's House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_KF_LINKS_HOUSE_COW, {[]{return IsAdult && CanPlay(EponasSong) && LinksCow;}}),
+                  LocationAccess(RC_KF_LINKS_HOUSE_COW, {[]{return IsAdult && CanUse(RG_EPONAS_SONG) && LinksCow;}}),
                 }, {
                   //Exits
                   Entrance(RR_KOKIRI_FOREST, {[]{return true;}})
@@ -115,14 +115,22 @@ void AreaTable_Init_LostWoods() {
                   EventAccess(&OddMushroomAccess, {[]{return OddMushroomAccess || (IsAdult && (CojiroAccess || Cojiro));}}),
                   EventAccess(&PoachersSawAccess, {[]{return PoachersSawAccess || (IsAdult && OddPoulticeAccess);}}),
                   EventAccess(&GossipStoneFairy,  {[]{return GossipStoneFairy  || CanSummonGossipFairyWithoutSuns;}}),
-                  EventAccess(&BeanPlantFairy,    {[]{return BeanPlantFairy    || CanPlay(SongOfStorms);}}),
+                  EventAccess(&BeanPlantFairy,    {[]{return BeanPlantFairy    || CanUse(RG_SONG_OF_STORMS);}}),
                   EventAccess(&BugShrub,          {[]{return IsChild && CanCutShrubs;}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_LW_SKULL_KID,                 {[]{return IsChild && CanPlay(SariasSong);}}),
+                  LocationAccess(RC_LW_SKULL_KID,                 {[]{return IsChild && CanUse(RG_SARIAS_SONG);}}),
                   LocationAccess(RC_LW_TRADE_COJIRO,              {[]{return IsAdult && Cojiro;}}),
                   LocationAccess(RC_LW_TRADE_ODD_POTION,        {[]{return IsAdult && OddPoultice && Cojiro;}}),
-                  LocationAccess(RC_LW_OCARINA_MEMORY_GAME,       {[]{return IsChild && Ocarina;}}),
+                                                                                                //all 5 buttons are logically required for memory game
+                                                                                                //because the chances of being able to beat it
+                                                                                                //every time you attempt it are as follows:
+                                                                                                //0 or 1 button(s) => 0%
+                                                                                                //2 buttons        => 0.15625%
+                                                                                                //3 buttons        => 3.75%
+                                                                                                //4 buttons        => 25.3125%
+                                                                                                //5 buttons        => 100%
+                  LocationAccess(RC_LW_OCARINA_MEMORY_GAME,       {[]{return IsChild && Ocarina && OcarinaButtons >= 5;}}),
                   LocationAccess(RC_LW_TARGET_IN_WOODS,           {[]{return IsChild && CanUse(RG_FAIRY_SLINGSHOT);}}),
                   LocationAccess(RC_LW_DEKU_SCRUB_NEAR_BRIDGE,    {[]{return IsChild && CanStunDeku;}}),
                   LocationAccess(RC_LW_GS_BEAN_PATCH_NEAR_BRIDGE, {[]{return CanPlantBugs && CanChildAttack;}}),
@@ -133,7 +141,7 @@ void AreaTable_Init_LostWoods() {
                   Entrance(RR_GC_WOODS_WARP,            {[]{return true;}}),
                   Entrance(RR_LW_BRIDGE,                {[]{return CanLeaveForest && ((IsAdult && (CanPlantBean(RR_THE_LOST_WOODS) || randoCtx->GetTrickOption(RT_LW_BRIDGE))) || CanUse(RG_HOVER_BOOTS) || CanUse(RG_LONGSHOT));}}),
                   Entrance(RR_ZORAS_RIVER,              {[]{return CanLeaveForest && (CanDive || CanUse(RG_IRON_BOOTS));}}),
-                  Entrance(RR_LW_BEYOND_MIDO,           {[]{return IsChild || CanPlay(SariasSong) || randoCtx->GetTrickOption(RT_LW_MIDO_BACKFLIP);}}),
+                  Entrance(RR_LW_BEYOND_MIDO,           {[]{return IsChild || CanUse(RG_SARIAS_SONG) || randoCtx->GetTrickOption(RT_LW_MIDO_BACKFLIP);}}),
                   Entrance(RR_LW_NEAR_SHORTCUTS_GROTTO, {[]{return Here(RR_THE_LOST_WOODS, []{return CanBlastOrSmash;});}}),
   });
 
@@ -149,7 +157,7 @@ void AreaTable_Init_LostWoods() {
                 }, {
                   //Exits
                   Entrance(RR_LW_FOREST_EXIT,   {[]{return true;}}),
-                  Entrance(RR_THE_LOST_WOODS,   {[]{return IsChild || CanPlay(SariasSong);}}),
+                  Entrance(RR_THE_LOST_WOODS,   {[]{return IsChild || CanUse(RG_SARIAS_SONG);}}),
                   Entrance(RR_SFM_ENTRYWAY,     {[]{return true;}}),
                   Entrance(RR_DEKU_THEATER,     {[]{return true;}}),
                   Entrance(RR_LW_SCRUBS_GROTTO, {[]{return Here(RR_LW_BEYOND_MIDO, []{return CanBlastOrSmash;});}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp
index 430525051..d63d4ba5d 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp
@@ -73,7 +73,7 @@ void AreaTable_Init_ShadowTemple() {
                   LocationAccess(RC_SHADOW_TEMPLE_GS_NEAR_SHIP,            {[]{return CanUse(RG_LONGSHOT) && SmallKeys(RR_SHADOW_TEMPLE, 4, 5);}}),
                 }, {
                   //Exits
-                  Entrance(RR_SHADOW_TEMPLE_BEYOND_BOAT, {[]{return CanJumpslash && CanPlay(ZeldasLullaby) && SmallKeys(RR_SHADOW_TEMPLE, 4, 5);}}),
+                  Entrance(RR_SHADOW_TEMPLE_BEYOND_BOAT, {[]{return CanJumpslash && CanUse(RG_ZELDAS_LULLABY) && SmallKeys(RR_SHADOW_TEMPLE, 4, 5);}}),
   });
 
   areaTable[RR_SHADOW_TEMPLE_BEYOND_BOAT] = Area("Shadow Temple Beyond Boat", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -103,7 +103,7 @@ void AreaTable_Init_ShadowTemple() {
   areaTable[RR_SHADOW_TEMPLE_MQ_DEAD_HAND_AREA] = Area("Shadow Temple MQ Dead Hand Area", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_SHADOW_TEMPLE_MQ_COMPASS_CHEST,     {[]{return CanJumpslash;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST, {[]{return CanJumpslash && CanPlay(SongOfTime) && IsAdult && CanUse(RG_FAIRY_BOW);}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST, {[]{return CanJumpslash && CanUse(RG_SONG_OF_TIME) && IsAdult && CanUse(RG_FAIRY_BOW);}}),
   }, {});
 
   areaTable[RR_SHADOW_TEMPLE_MQ_FIRST_BEAMOS] = Area("Shadow Temple MQ First Beamos", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -118,10 +118,10 @@ void AreaTable_Init_ShadowTemple() {
 
   areaTable[RR_SHADOW_TEMPLE_MQ_UPPER_HUGE_PIT] = Area("Shadow Temple MQ Upper Huge Pit", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST,   {[]{return CanPlay(SongOfTime) || (randoCtx->GetTrickOption(RT_SHADOW_MQ_INVISIBLE_BLADES) && randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_OHKO));}}),
-                    //Trick: CanPlay(SongOfTime) || (LogicShadowMQInvisibleBlades && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO))
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST, {[]{return CanPlay(SongOfTime) || (randoCtx->GetTrickOption(RT_SHADOW_MQ_INVISIBLE_BLADES) && randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_OHKO));}}),
-                    //Trick: CanPlay(SongOfTime) || (LogicShadowMQInvisibleBlades && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO))
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST,   {[]{return CanUse(RG_SONG_OF_TIME) || (randoCtx->GetTrickOption(RT_SHADOW_MQ_INVISIBLE_BLADES) && randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_OHKO));}}),
+                    //Trick: CanUse(RG_SONG_OF_TIME) || (LogicShadowMQInvisibleBlades && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO))
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST, {[]{return CanUse(RG_SONG_OF_TIME) || (randoCtx->GetTrickOption(RT_SHADOW_MQ_INVISIBLE_BLADES) && randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_OHKO));}}),
+                    //Trick: CanUse(RG_SONG_OF_TIME) || (LogicShadowMQInvisibleBlades && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO))
   }, {
                   //Exits
                   Entrance(RR_SHADOW_TEMPLE_MQ_LOWER_HUGE_PIT, {[]{return HasFireSource || randoCtx->GetTrickOption(RT_SHADOW_MQ_HUGE_PIT);}}),
@@ -155,7 +155,7 @@ void AreaTable_Init_ShadowTemple() {
                   LocationAccess(RC_SHADOW_TEMPLE_MQ_GS_AFTER_WIND,           {[]{return true;}}),
   }, {
                   //Exits
-                  Entrance(RR_SHADOW_TEMPLE_MQ_BEYOND_BOAT, {[]{return CanPlay(ZeldasLullaby) && SmallKeys(RR_SHADOW_TEMPLE, 5);}}),
+                  Entrance(RR_SHADOW_TEMPLE_MQ_BEYOND_BOAT, {[]{return CanUse(RG_ZELDAS_LULLABY) && SmallKeys(RR_SHADOW_TEMPLE, 5);}}),
   });
 
   areaTable[RR_SHADOW_TEMPLE_MQ_BEYOND_BOAT] = Area("Shadow Temple MQ Beyond Boat", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -164,7 +164,7 @@ void AreaTable_Init_ShadowTemple() {
                   LocationAccess(RC_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS,   {[]{return Bow || (randoCtx->GetTrickOption(RT_SHADOW_STATUE) && HasBombchus);}}),
   }, {
                   //Exits
-                  Entrance(RR_SHADOW_TEMPLE_MQ_INVISIBLE_MAZE, {[]{return Bow && CanPlay(SongOfTime) && IsAdult && CanUse(RG_LONGSHOT);}}),
+                  Entrance(RR_SHADOW_TEMPLE_MQ_INVISIBLE_MAZE, {[]{return Bow && CanUse(RG_SONG_OF_TIME) && IsAdult && CanUse(RG_LONGSHOT);}}),
                   Entrance(RR_SHADOW_TEMPLE_BOSS_ENTRYWAY,     {[]{return (CanUse(RG_FAIRY_BOW) || (randoCtx->GetTrickOption(RT_SHADOW_STATUE) && HasBombchus)) && CanUse(RG_HOVER_BOOTS) && BossKeyShadowTemple;}}),
   });
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp
index e186b7ffb..a3eca03bb 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp
@@ -56,11 +56,11 @@ void AreaTable_Init_SpiritTemple() {
 
   areaTable[RR_SPIRIT_TEMPLE_EARLY_ADULT] = Area("Early Adult Spirit Temple", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SPIRIT_TEMPLE_COMPASS_CHEST,            {[]{return CanUse(RG_HOOKSHOT) && CanPlay(ZeldasLullaby);}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_COMPASS_CHEST,            {[]{return CanUse(RG_HOOKSHOT) && CanUse(RG_ZELDAS_LULLABY);}}),
                   LocationAccess(RC_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST,  {[]{return (CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOOMERANG) || HasBombchus || (Bombs && IsAdult && randoCtx->GetTrickOption(RT_SPIRIT_LOWER_ADULT_SWITCH))) && (CanUse(RG_HOVER_BOOTS) || CanJumpslash);}}),
                   LocationAccess(RC_SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST,  {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 3);}}),
                   LocationAccess(RC_SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST, {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 3);}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_GS_BOULDER_ROOM,          {[]{return CanPlay(SongOfTime) && (Bow || Hookshot || HasBombchus || (Bombs && randoCtx->GetTrickOption(RT_SPIRIT_LOWER_ADULT_SWITCH)));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_GS_BOULDER_ROOM,          {[]{return CanUse(RG_SONG_OF_TIME) && (Bow || Hookshot || HasBombchus || (Bombs && randoCtx->GetTrickOption(RT_SPIRIT_LOWER_ADULT_SWITCH)));}}),
                 }, {
                   //Exits
                   Entrance(RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER, {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 1);}}),
@@ -85,8 +85,8 @@ void AreaTable_Init_SpiritTemple() {
                                                                                             (SmallKeys(RR_SPIRIT_TEMPLE, 3) &&
                                                                                                 (CanUse(RG_FIRE_ARROWS) || (randoCtx->GetTrickOption(RT_SPIRIT_SUN_CHEST) && Bow)) &&
                                                                                                 CanUse(RG_SILVER_GAUNTLETS));}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST,       {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 3) && CanUse(RG_SILVER_GAUNTLETS) && CanPlay(ZeldasLullaby);}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST,  {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 3) && CanUse(RG_SILVER_GAUNTLETS) && CanPlay(ZeldasLullaby) && (Hookshot || HoverBoots || randoCtx->GetTrickOption(RT_SPIRIT_LOBBY_JUMP));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST,       {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 3) && CanUse(RG_SILVER_GAUNTLETS) && CanUse(RG_ZELDAS_LULLABY);}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST,  {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 3) && CanUse(RG_SILVER_GAUNTLETS) && CanUse(RG_ZELDAS_LULLABY) && (Hookshot || HoverBoots || randoCtx->GetTrickOption(RT_SPIRIT_LOBBY_JUMP));}}),
                   LocationAccess(RC_SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM, {[]{return (HasExplosives && Boomerang && Hookshot) ||
                                                                                             (CanUse(RG_BOOMERANG) && SmallKeys(RR_SPIRIT_TEMPLE, 5) && HasExplosives) ||
                                                                                             (Hookshot && CanUse(RG_SILVER_GAUNTLETS) &&
@@ -124,7 +124,7 @@ void AreaTable_Init_SpiritTemple() {
 
   areaTable[RR_SPIRIT_TEMPLE_BEYOND_FINAL_LOCKED_DOOR] = Area("Spirit Temple Beyond Final Locked Door", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SPIRIT_TEMPLE_BOSS_KEY_CHEST, {[]{return CanPlay(ZeldasLullaby) && ((CanTakeDamage && randoCtx->GetTrickOption(RT_FLAMING_CHESTS)) || (Bow && Hookshot));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_BOSS_KEY_CHEST, {[]{return CanUse(RG_ZELDAS_LULLABY) && ((CanTakeDamage && randoCtx->GetTrickOption(RT_FLAMING_CHESTS)) || (Bow && Hookshot));}}),
                   LocationAccess(RC_SPIRIT_TEMPLE_TOPMOST_CHEST,  {[]{return (MirrorShield && CanAdultAttack) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && CanUse(RG_LIGHT_ARROWS));}}),
   }, {
                   //Exits
@@ -164,8 +164,8 @@ void AreaTable_Init_SpiritTemple() {
                   LocationAccess(RC_SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST,  {[]{return Here(RR_SPIRIT_TEMPLE_MQ_ADULT, []{return SmallKeys(RR_SPIRIT_TEMPLE, 7) && Hammer;});}}),
                   LocationAccess(RC_SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST,       {[]{return KokiriSword && HasBombchus && Slingshot && CanUse(RG_DINS_FIRE);}}),
                   LocationAccess(RC_SPIRIT_TEMPLE_MQ_MAP_CHEST,                  {[]{return KokiriSword || Bombs;}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST, {[]{return HasBombchus && SmallKeys(RR_SPIRIT_TEMPLE, 7) && Slingshot && (CanUse(RG_DINS_FIRE) || (Here(RR_SPIRIT_TEMPLE_MQ_ADULT, []{return IsAdult && (CanUse(RG_FIRE_ARROWS) || (randoCtx->GetTrickOption(RT_SPIRIT_MQ_FROZEN_EYE) && CanUse(RG_FAIRY_BOW) && CanPlay(SongOfTime)));})));}}),
-                    //Trick: HasBombchus && SmallKeys(RR_SPIRIT_TEMPLE, 7) && Slingshot && (CanUse(RG_DINS_FIRE) || (SPIRIT_TEMPLE_MQ_ADULT.Adult() && IsAdult && (CanUse(RG_FIRE_ARROWS) || (LogicSpiritMQFrozenEye && CanUse(RG_FAIRY_BOW) && CanPlay(SongOfTime)))))
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST, {[]{return HasBombchus && SmallKeys(RR_SPIRIT_TEMPLE, 7) && Slingshot && (CanUse(RG_DINS_FIRE) || (Here(RR_SPIRIT_TEMPLE_MQ_ADULT, []{return IsAdult && (CanUse(RG_FIRE_ARROWS) || (randoCtx->GetTrickOption(RT_SPIRIT_MQ_FROZEN_EYE) && CanUse(RG_FAIRY_BOW) && CanUse(RG_SONG_OF_TIME)));})));}}),
+                    //Trick: HasBombchus && SmallKeys(RR_SPIRIT_TEMPLE, 7) && Slingshot && (CanUse(RG_DINS_FIRE) || (SPIRIT_TEMPLE_MQ_ADULT.Adult() && IsAdult && (CanUse(RG_FIRE_ARROWS) || (LogicSpiritMQFrozenEye && CanUse(RG_FAIRY_BOW) && CanUse(RG_SONG_OF_TIME)))))
   }, {
                   //Exits
                   Entrance(RR_SPIRIT_TEMPLE_MQ_SHARED, {[]{return HasBombchus && SmallKeys(RR_SPIRIT_TEMPLE, 2);}}),
@@ -174,11 +174,11 @@ void AreaTable_Init_SpiritTemple() {
   areaTable[RR_SPIRIT_TEMPLE_MQ_ADULT] = Area("Spirit Temple MQ Adult", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST,     {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 7);}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST,   {[]{return CanPlay(ZeldasLullaby) && (CanJumpslash || CanUse(RG_HOVER_BOOTS));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST,   {[]{return CanUse(RG_ZELDAS_LULLABY) && (CanJumpslash || CanUse(RG_HOVER_BOOTS));}}),
                   LocationAccess(RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST, {[]{return (randoCtx->GetTrickOption(RT_LENS_SPIRIT_MQ) || CanUse(RG_LENS_OF_TRUTH));}}),
                   LocationAccess(RC_SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST,           {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 5);}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST,          {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 5) && CanPlay(SongOfTime);}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST,              {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 5) && CanPlay(SongOfTime) && (MirrorShield || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && CanUse(RG_LIGHT_ARROWS)));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST,          {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 5) && CanUse(RG_SONG_OF_TIME);}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST,              {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 5) && CanUse(RG_SONG_OF_TIME) && (MirrorShield || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && CanUse(RG_LIGHT_ARROWS)));}}),
                   LocationAccess(RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST,   {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 7);}}),
                   LocationAccess(RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH,  {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 7);}}),
   }, {
@@ -186,24 +186,24 @@ void AreaTable_Init_SpiritTemple() {
                   Entrance(RR_SPIRIT_TEMPLE_MQ_LOWER_ADULT,        {[]{return MirrorShield && IsAdult && (CanUse(RG_FIRE_ARROWS) || (randoCtx->GetTrickOption(RT_SPIRIT_MQ_LOWER_ADULT) && CanUse(RG_DINS_FIRE) && Bow));}}),
                     //Trick: MirrorShield && IsAdult && (CanUse(RG_FIRE_ARROWS) || (LogicSpiritMQLowerAdult && CanUse(RG_DINS_FIRE) && Bow))
                   Entrance(RR_SPIRIT_TEMPLE_MQ_SHARED,             {[]{return true;}}),
-                  Entrance(RR_SPIRIT_TEMPLE_MQ_BOSS_AREA,          {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 6) && CanPlay(ZeldasLullaby) && Hammer;}}),
-                  Entrance(RR_SPIRIT_TEMPLE_MQ_MIRROR_SHIELD_HAND, {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 5) && CanPlay(SongOfTime) && CanJumpslash && (randoCtx->GetTrickOption(RT_LENS_SPIRIT_MQ) || CanUse(RG_LENS_OF_TRUTH));}}),
+                  Entrance(RR_SPIRIT_TEMPLE_MQ_BOSS_AREA,          {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 6) && CanUse(RG_ZELDAS_LULLABY) && Hammer;}}),
+                  Entrance(RR_SPIRIT_TEMPLE_MQ_MIRROR_SHIELD_HAND, {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 5) && CanUse(RG_SONG_OF_TIME) && CanJumpslash && (randoCtx->GetTrickOption(RT_LENS_SPIRIT_MQ) || CanUse(RG_LENS_OF_TRUTH));}}),
   });
 
   areaTable[RR_SPIRIT_TEMPLE_MQ_SHARED] = Area("Spirit Temple MQ Shared", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST, {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 6);}}),
                   LocationAccess(RC_SPIRIT_TEMPLE_MQ_COMPASS_CHEST,           {[]{return (IsChild && CanUse(RG_FAIRY_SLINGSHOT) && SmallKeys(RR_SPIRIT_TEMPLE, 7)) || (IsAdult && CanUse(RG_FAIRY_BOW)) || (Bow && Slingshot);}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST,    {[]{return CanPlay(SongOfTime) || randoCtx->GetTrickOption(RT_SPIRIT_MQ_SUN_BLOCK_SOT) || IsAdult;}}),
-                    //Trick: CanPlay(SongOfTime) || LogicSpiritMQSunBlockSoT || IsAdult
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM,       {[]{return (randoCtx->GetTrickOption(RT_SPIRIT_MQ_SUN_BLOCK_GS) && Boomerang && (CanPlay(SongOfTime) || randoCtx->GetTrickOption(RT_SPIRIT_MQ_SUN_BLOCK_SOT))) || IsAdult;}}),
-                    //Trick: (LogicSpiritMQSunBlockGS && Boomerang && (CanPlay(SongOfTime) || LogicSpiritMQSunBlockSoT)) || IsAdult
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST,    {[]{return CanUse(RG_SONG_OF_TIME) || randoCtx->GetTrickOption(RT_SPIRIT_MQ_SUN_BLOCK_SOT) || IsAdult;}}),
+                    //Trick: CanUse(RG_SONG_OF_TIME) || LogicSpiritMQSunBlockSoT || IsAdult
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM,       {[]{return (randoCtx->GetTrickOption(RT_SPIRIT_MQ_SUN_BLOCK_GS) && Boomerang && (CanUse(RG_SONG_OF_TIME) || randoCtx->GetTrickOption(RT_SPIRIT_MQ_SUN_BLOCK_SOT))) || IsAdult;}}),
+                    //Trick: (LogicSpiritMQSunBlockGS && Boomerang && (CanUse(RG_SONG_OF_TIME) || LogicSpiritMQSunBlockSoT)) || IsAdult
    }, {
                   //Exits
-                  Entrance(RR_SPIRIT_TEMPLE_MQ_SILVER_GAUNTLETS_HAND, {[]{return (SmallKeys(RR_SPIRIT_TEMPLE, 7) && (CanPlay(SongOfTime) || randoCtx->GetTrickOption(RT_SPIRIT_MQ_SUN_BLOCK_SOT) || IsAdult)) || (SmallKeys(RR_SPIRIT_TEMPLE, 4) && CanPlay(SongOfTime) && CanJumpslash && (randoCtx->GetTrickOption(RT_LENS_SPIRIT_MQ) || CanUse(RG_LENS_OF_TRUTH)));}}),
-                    //Trick: (SmallKeys(RR_SPIRIT_TEMPLE, 7) && (CanPlay(SongOfTime) || LogicSpiritMQSunBlockSoT || IsAdult)) || (SmallKeys(RR_SPIRIT_TEMPLE, 4) && CanPlay(SongOfTime) && (LogicLensSpiritMQ || CanUse(RG_LENS_OF_TRUTH)))
-                  Entrance(RR_DESERT_COLOSSUS,                        {[]{return (SmallKeys(RR_SPIRIT_TEMPLE, 7) && (CanPlay(SongOfTime) || randoCtx->GetTrickOption(RT_SPIRIT_MQ_SUN_BLOCK_SOT) || IsAdult)) || (SmallKeys(RR_SPIRIT_TEMPLE, 4) && CanPlay(SongOfTime) && CanJumpslash && (randoCtx->GetTrickOption(RT_LENS_SPIRIT_MQ) || CanUse(RG_LENS_OF_TRUTH)) && IsAdult);}}),
-                    //Trick: (SmallKeys(RR_SPIRIT_TEMPLE, 7) && (CanPlay(SongOfTime) || LogicSpiritMQSunBlockSoT || IsAdult)) || (SmallKeys(RR_SPIRIT_TEMPLE, 4) && CanPlay(SongOfTime) && (LogicLensSpiritMQ || CanUse(RG_LENS_OF_TRUTH)) && IsAdult)
+                  Entrance(RR_SPIRIT_TEMPLE_MQ_SILVER_GAUNTLETS_HAND, {[]{return (SmallKeys(RR_SPIRIT_TEMPLE, 7) && (CanUse(RG_SONG_OF_TIME) || randoCtx->GetTrickOption(RT_SPIRIT_MQ_SUN_BLOCK_SOT) || IsAdult)) || (SmallKeys(RR_SPIRIT_TEMPLE, 4) && CanUse(RG_SONG_OF_TIME) && CanJumpslash && (randoCtx->GetTrickOption(RT_LENS_SPIRIT_MQ) || CanUse(RG_LENS_OF_TRUTH)));}}),
+                    //Trick: (SmallKeys(RR_SPIRIT_TEMPLE, 7) && (CanUse(RG_SONG_OF_TIME) || LogicSpiritMQSunBlockSoT || IsAdult)) || (SmallKeys(RR_SPIRIT_TEMPLE, 4) && CanUse(RG_SONG_OF_TIME) && (LogicLensSpiritMQ || CanUse(RG_LENS_OF_TRUTH)))
+                  Entrance(RR_DESERT_COLOSSUS,                        {[]{return (SmallKeys(RR_SPIRIT_TEMPLE, 7) && (CanUse(RG_SONG_OF_TIME) || randoCtx->GetTrickOption(RT_SPIRIT_MQ_SUN_BLOCK_SOT) || IsAdult)) || (SmallKeys(RR_SPIRIT_TEMPLE, 4) && CanUse(RG_SONG_OF_TIME) && CanJumpslash && (randoCtx->GetTrickOption(RT_LENS_SPIRIT_MQ) || CanUse(RG_LENS_OF_TRUTH)) && IsAdult);}}),
+                    //Trick: (SmallKeys(RR_SPIRIT_TEMPLE, 7) && (CanUse(RG_SONG_OF_TIME) || LogicSpiritMQSunBlockSoT || IsAdult)) || (SmallKeys(RR_SPIRIT_TEMPLE, 4) && CanUse(RG_SONG_OF_TIME) && (LogicLensSpiritMQ || CanUse(RG_LENS_OF_TRUTH)) && IsAdult)
   });
 
   areaTable[RR_SPIRIT_TEMPLE_MQ_LOWER_ADULT] = Area("Spirit Temple MQ Lower Adult", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp
index 8ba6e23df..fac3affa2 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp
@@ -41,7 +41,7 @@ void AreaTable_Init_WaterTemple() {
 
   areaTable[RR_WATER_TEMPLE_EAST_LOWER] = Area("Water Temple East Lower", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&WaterTempleLow, {[]{return WaterTempleLow || CanPlay(ZeldasLullaby);}}),
+                  EventAccess(&WaterTempleLow, {[]{return WaterTempleLow || CanUse(RG_ZELDAS_LULLABY);}}),
                 }, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_LOBBY,        {[]{return WaterTempleLow || ((randoCtx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS) || CanUse(RG_ZORA_TUNIC)) && CanUse(RG_IRON_BOOTS));}}),
@@ -152,7 +152,7 @@ void AreaTable_Init_WaterTemple() {
 
   areaTable[RR_WATER_TEMPLE_CENTRAL_PILLAR_UPPER] = Area("Water Temple Central Pillar Upper", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&WaterTempleMiddle, {[]{return WaterTempleMiddle || CanPlay(ZeldasLullaby);}}),
+                  EventAccess(&WaterTempleMiddle, {[]{return WaterTempleMiddle || CanUse(RG_ZELDAS_LULLABY);}}),
                 }, {
                   //Locations
                   LocationAccess(RC_WATER_TEMPLE_GS_CENTRAL_PILLAR, {[]{return CanUse(RG_LONGSHOT) || (((randoCtx->GetTrickOption(RT_WATER_FW_CENTRAL_GS) && CanUse(RG_FARORES_WIND) && (CanUse(RG_FAIRY_BOW) || CanUse(RG_DINS_FIRE) || SmallKeys(RR_WATER_TEMPLE, 5))) || (randoCtx->GetTrickOption(RT_WATER_IRONS_CENTRAL_GS) && CanUse(RG_IRON_BOOTS) && ((CanUse(RG_HOOKSHOT) && CanUse(RG_FAIRY_BOW)) || (CanUse(RG_DINS_FIRE))))) && WaterTempleHigh && HookshotOrBoomerang);}}),
@@ -186,7 +186,7 @@ void AreaTable_Init_WaterTemple() {
 
   areaTable[RR_WATER_TEMPLE_HIGH_WATER] = Area("Water Temple High Water", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&WaterTempleHigh, {[]{return WaterTempleHigh || CanPlay(ZeldasLullaby);}}),
+                  EventAccess(&WaterTempleHigh, {[]{return WaterTempleHigh || CanUse(RG_ZELDAS_LULLABY);}}),
                 }, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_LOBBY, {[]{return true;}}),
@@ -227,7 +227,7 @@ void AreaTable_Init_WaterTemple() {
                 }, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_DARK_LINK_ROOM, {[]{return true;}}),
-                  Entrance(RR_WATER_TEMPLE_RIVER,          {[]{return IsChild || CanPlay(SongOfTime);}}),
+                  Entrance(RR_WATER_TEMPLE_RIVER,          {[]{return IsChild || CanUse(RG_SONG_OF_TIME);}}),
   });
 
   areaTable[RR_WATER_TEMPLE_RIVER] = Area("Water Temple River", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -264,11 +264,11 @@ void AreaTable_Init_WaterTemple() {
   areaTable[RR_WATER_TEMPLE_MQ_DIVE] = Area("Water Temple MQ Dive", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_WATER_TEMPLE_MQ_MAP_CHEST,            {[]{return HasFireSource && IsAdult && CanUse(RG_HOOKSHOT);}}),
-                  LocationAccess(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST, {[]{return IsAdult && CanUse(RG_ZORA_TUNIC) && CanUse(RG_HOOKSHOT) && ((randoCtx->GetTrickOption(RT_WATER_MQ_CENTRAL_PILLAR) && CanUse(RG_FIRE_ARROWS)) || (CanUse(RG_DINS_FIRE) && CanPlay(SongOfTime)));}}),
-                    //Trick: IsAdult && CanUse(RG_ZORA_TUNIC) && CanUse(RG_HOOKSHOT) && ((LogicWaterMQCentralPillar && CanUse(RG_FIRE_ARROWS)) || (CanUse(RG_DINS_FIRE) && CanPlay(SongOfTime)))
+                  LocationAccess(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST, {[]{return IsAdult && CanUse(RG_ZORA_TUNIC) && CanUse(RG_HOOKSHOT) && ((randoCtx->GetTrickOption(RT_WATER_MQ_CENTRAL_PILLAR) && CanUse(RG_FIRE_ARROWS)) || (CanUse(RG_DINS_FIRE) && CanUse(RG_SONG_OF_TIME)));}}),
+                    //Trick: IsAdult && CanUse(RG_ZORA_TUNIC) && CanUse(RG_HOOKSHOT) && ((LogicWaterMQCentralPillar && CanUse(RG_FIRE_ARROWS)) || (CanUse(RG_DINS_FIRE) && CanUse(RG_SONG_OF_TIME)))
   }, {
                   //Exits
-                  Entrance(RR_WATER_TEMPLE_MQ_LOWERED_WATER_LEVELS, {[]{return CanPlay(ZeldasLullaby);}}),
+                  Entrance(RR_WATER_TEMPLE_MQ_LOWERED_WATER_LEVELS, {[]{return CanUse(RG_ZELDAS_LULLABY);}}),
   });
 
   areaTable[RR_WATER_TEMPLE_MQ_LOWERED_WATER_LEVELS] = Area("Water Temple MQ Lowered Water Levels", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
index 8db912cb9..6c9dbead6 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
@@ -18,19 +18,19 @@ void AreaTable_Init_ZorasDomain() {
   areaTable[RR_ZORAS_RIVER] = Area("Zora River", "Zora River", RA_ZORAS_RIVER, DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&GossipStoneFairy, {[]{return GossipStoneFairy || CanSummonGossipFairy;}}),
-                  EventAccess(&BeanPlantFairy,   {[]{return BeanPlantFairy   || (CanPlantBean(RR_ZORAS_RIVER) && CanPlay(SongOfStorms));}}),
+                  EventAccess(&BeanPlantFairy,   {[]{return BeanPlantFairy   || (CanPlantBean(RR_ZORAS_RIVER) && CanUse(RG_SONG_OF_STORMS));}}),
                   EventAccess(&ButterflyFairy,   {[]{return ButterflyFairy   || CanUse(RG_STICKS);}}),
                   EventAccess(&BugShrub,         {[]{return BugShrub         || CanCutShrubs;}}),
                 }, {
                   //Locations
                   LocationAccess(RC_ZR_MAGIC_BEAN_SALESMAN,               {[]{return IsChild;}}),
-                  LocationAccess(RC_ZR_FROGS_OCARINA_GAME,                {[]{return IsChild && CanPlay(ZeldasLullaby) && CanPlay(SariasSong) && CanPlay(SunsSong) && CanPlay(EponasSong) && CanPlay(SongOfTime) && CanPlay(SongOfStorms);}}),
-                  LocationAccess(RC_ZR_FROGS_IN_THE_RAIN,                 {[]{return IsChild && CanPlay(SongOfStorms);}}),
-                  LocationAccess(RC_ZR_FROGS_ZELDAS_LULLABY,              {[]{return IsChild && CanPlay(ZeldasLullaby);}}),
-                  LocationAccess(RC_ZR_FROGS_EPONAS_SONG,                 {[]{return IsChild && CanPlay(EponasSong);}}),
-                  LocationAccess(RC_ZR_FROGS_SARIAS_SONG,                 {[]{return IsChild && CanPlay(SariasSong);}}),
-                  LocationAccess(RC_ZR_FROGS_SUNS_SONG,                   {[]{return IsChild && CanPlay(SunsSong);}}),
-                  LocationAccess(RC_ZR_FROGS_SONG_OF_TIME,                {[]{return IsChild && CanPlay(SongOfTime);}}),
+                  LocationAccess(RC_ZR_FROGS_OCARINA_GAME,                {[]{return IsChild && CanUse(RG_ZELDAS_LULLABY) && CanUse(RG_SARIAS_SONG) && CanUse(RG_SUNS_SONG) && CanUse(RG_EPONAS_SONG) && CanUse(RG_SONG_OF_TIME) && CanUse(RG_SONG_OF_STORMS);}}),
+                  LocationAccess(RC_ZR_FROGS_IN_THE_RAIN,                 {[]{return IsChild && CanUse(RG_SONG_OF_STORMS);}}),
+                  LocationAccess(RC_ZR_FROGS_ZELDAS_LULLABY,              {[]{return IsChild && CanUse(RG_ZELDAS_LULLABY);}}),
+                  LocationAccess(RC_ZR_FROGS_EPONAS_SONG,                 {[]{return IsChild && CanUse(RG_EPONAS_SONG);}}),
+                  LocationAccess(RC_ZR_FROGS_SARIAS_SONG,                 {[]{return IsChild && CanUse(RG_SARIAS_SONG);}}),
+                  LocationAccess(RC_ZR_FROGS_SUNS_SONG,                   {[]{return IsChild && CanUse(RG_SUNS_SONG);}}),
+                  LocationAccess(RC_ZR_FROGS_SONG_OF_TIME,                {[]{return IsChild && CanUse(RG_SONG_OF_TIME);}}),
                   LocationAccess(RC_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH, {[]{return IsChild || CanUse(RG_HOVER_BOOTS) || (IsAdult && randoCtx->GetTrickOption(RT_ZR_LOWER));}}),
                   LocationAccess(RC_ZR_NEAR_DOMAIN_FREESTANDING_POH,      {[]{return IsChild || CanUse(RG_HOVER_BOOTS) || (IsAdult && randoCtx->GetTrickOption(RT_ZR_UPPER));}}),
                   LocationAccess(RC_ZR_GS_LADDER,                         {[]{return IsChild && AtNight && CanChildAttack && CanGetNightTimeGS;}}),
@@ -45,7 +45,7 @@ void AreaTable_Init_ZorasDomain() {
                   Entrance(RR_ZR_FAIRY_GROTTO,     {[]{return Here(RR_ZORAS_RIVER, []{return CanBlastOrSmash;});}}),
                   Entrance(RR_THE_LOST_WOODS,      {[]{return CanDive || CanUse(RG_IRON_BOOTS);}}),
                   Entrance(RR_ZR_STORMS_GROTTO,    {[]{return CanOpenStormGrotto;}}),
-                  Entrance(RR_ZR_BEHIND_WATERFALL, {[]{return CanPlay(ZeldasLullaby) || (IsChild && randoCtx->GetTrickOption(RT_ZR_CUCCO)) || (IsAdult && CanUse(RG_HOVER_BOOTS) && randoCtx->GetTrickOption(RT_ZR_HOVERS));}}),
+                  Entrance(RR_ZR_BEHIND_WATERFALL, {[]{return CanUse(RG_ZELDAS_LULLABY) || (IsChild && randoCtx->GetTrickOption(RT_ZR_CUCCO)) || (IsAdult && CanUse(RG_HOVER_BOOTS) && randoCtx->GetTrickOption(RT_ZR_HOVERS));}}),
   });
 
   areaTable[RR_ZR_BEHIND_WATERFALL] = Area("ZR Behind Waterfall", "Zora River", RA_ZORAS_RIVER, DAY_NIGHT_CYCLE, {}, {}, {
@@ -158,7 +158,7 @@ void AreaTable_Init_ZorasDomain() {
 
   areaTable[RR_ZF_GREAT_FAIRY_FOUNTAIN] = Area("ZF Great Fairy Fountain", "ZF Great Fairy Fountain", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_ZF_GREAT_FAIRY_REWARD, {[]{return CanPlay(ZeldasLullaby);}}),
+                  LocationAccess(RC_ZF_GREAT_FAIRY_REWARD, {[]{return CanUse(RG_ZELDAS_LULLABY);}}),
                 }, {
                   //Exits
                   Entrance(RR_ZORAS_FOUNTAIN, {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/logic.cpp b/soh/soh/Enhancements/randomizer/3drando/logic.cpp
index 99eb71da3..120c385bf 100644
--- a/soh/soh/Enhancements/randomizer/3drando/logic.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/logic.cpp
@@ -241,6 +241,12 @@ namespace Logic {
   bool Fairy            = false;
   bool BottleWithBigPoe = false;
 
+  bool OcarinaAButton      = false;
+  bool OcarinaCLeftButton  = false;
+  bool OcarinaCRightButton = false;
+  bool OcarinaCUpButton    = false;
+  bool OcarinaCDownButton  = false;
+
   bool FoundBombchus    = false;
   bool CanPlayBowling   = false;
   bool HasBombchus      = false;
@@ -273,6 +279,7 @@ namespace Logic {
   bool HookshotOrBoomerang = false;
   bool CanGetNightTimeGS   = false;
 
+  uint8_t   OcarinaButtons  = 0;
   uint8_t   BaseHearts      = 0;
   uint8_t   Hearts          = 0;
   uint8_t   Multiplier      = 0;
@@ -380,10 +387,6 @@ namespace Logic {
   bool BuyDekuShieldPast        = false;
   bool TimeTravelPast           = false;
 
-  bool CanPlay(bool song) {
-    return Ocarina && song;
-  }
-
   static bool IsMagicItem(RandomizerGet item) {
     return item == RG_DINS_FIRE    ||
            item == RG_FARORES_WIND ||
@@ -398,35 +401,51 @@ namespace Logic {
   }
 
   bool HasItem(RandomizerGet itemName) {
-    return (itemName == RG_DINS_FIRE         && DinsFire)        ||
-           (itemName == RG_FARORES_WIND      && FaroresWind)     ||
-           (itemName == RG_NAYRUS_LOVE       && NayrusLove)      ||
-           (itemName == RG_LENS_OF_TRUTH     && LensOfTruth)     ||
-           (itemName == RG_FAIRY_BOW               && Bow)             ||
-           (itemName == RG_MEGATON_HAMMER    && Hammer)          ||
-           (itemName == RG_IRON_BOOTS        && IronBoots)       ||
-           (itemName == RG_HOVER_BOOTS       && HoverBoots)      ||
-           (itemName == RG_HOOKSHOT          && Hookshot)        ||
-           (itemName == RG_LONGSHOT          && Longshot)        ||
-           (itemName == RG_SILVER_GAUNTLETS  && SilverGauntlets) ||
-           (itemName == RG_GOLDEN_GAUNTLETS  && GoldenGauntlets) ||
-           (itemName == RG_GORON_TUNIC       && GoronTunic)      ||
-           (itemName == RG_ZORA_TUNIC        && ZoraTunic)       ||
-           (itemName == RG_SCARECROW         && Scarecrow)       ||
-           (itemName == RG_DISTANT_SCARECROW && DistantScarecrow)||
-           (itemName == RG_HYLIAN_SHIELD     && HylianShield)    ||
-           (itemName == RG_MIRROR_SHIELD     && MirrorShield)    ||
-           (itemName == RG_MASTER_SWORD      && MasterSword)     ||
-           (itemName == RG_BIGGORON_SWORD    && BiggoronSword)   ||
-           (itemName == RG_FAIRY_SLINGSHOT         && Slingshot)       ||
-           (itemName == RG_BOOMERANG         && Boomerang)       ||
-           (itemName == RG_KOKIRI_SWORD      && KokiriSword)     ||
-           (itemName == RG_STICKS            && Sticks)          ||
-           (itemName == RG_DEKU_SHIELD       && DekuShield)      ||
-           (itemName == RG_FIRE_ARROWS       && FireArrows)      ||
-           (itemName == RG_ICE_ARROWS        && IceArrows)       ||
-           (itemName == RG_LIGHT_ARROWS      && LightArrows);
-
+    return (itemName == RG_DINS_FIRE              && DinsFire)            ||
+           (itemName == RG_FARORES_WIND           && FaroresWind)         ||
+           (itemName == RG_NAYRUS_LOVE            && NayrusLove)          ||
+           (itemName == RG_LENS_OF_TRUTH          && LensOfTruth)         ||
+           (itemName == RG_FAIRY_BOW              && Bow)                 ||
+           (itemName == RG_MEGATON_HAMMER         && Hammer)              ||
+           (itemName == RG_IRON_BOOTS             && IronBoots)           ||
+           (itemName == RG_HOVER_BOOTS            && HoverBoots)          ||
+           (itemName == RG_HOOKSHOT               && Hookshot)            ||
+           (itemName == RG_LONGSHOT               && Longshot)            ||
+           (itemName == RG_SILVER_GAUNTLETS       && SilverGauntlets)     ||
+           (itemName == RG_GOLDEN_GAUNTLETS       && GoldenGauntlets)     ||
+           (itemName == RG_GORON_TUNIC            && GoronTunic)          ||
+           (itemName == RG_ZORA_TUNIC             && ZoraTunic)           ||
+           (itemName == RG_SCARECROW              && Scarecrow)           ||
+           (itemName == RG_DISTANT_SCARECROW      && DistantScarecrow)    ||
+           (itemName == RG_HYLIAN_SHIELD          && HylianShield)        ||
+           (itemName == RG_MIRROR_SHIELD          && MirrorShield)        ||
+           (itemName == RG_MASTER_SWORD           && MasterSword)         ||
+           (itemName == RG_BIGGORON_SWORD         && BiggoronSword)       ||
+           (itemName == RG_FAIRY_SLINGSHOT        && Slingshot)           ||
+           (itemName == RG_BOOMERANG              && Boomerang)           ||
+           (itemName == RG_KOKIRI_SWORD           && KokiriSword)         ||
+           (itemName == RG_STICKS                 && Sticks)              ||
+           (itemName == RG_DEKU_SHIELD            && DekuShield)          ||
+           (itemName == RG_FIRE_ARROWS            && FireArrows)          ||
+           (itemName == RG_ICE_ARROWS             && IceArrows)           ||
+           (itemName == RG_LIGHT_ARROWS           && LightArrows)         ||
+           (itemName == RG_OCARINA_A_BUTTON       && OcarinaAButton)      ||
+           (itemName == RG_OCARINA_C_LEFT_BUTTON  && OcarinaCLeftButton)  ||
+           (itemName == RG_OCARINA_C_RIGHT_BUTTON && OcarinaCRightButton) ||
+           (itemName == RG_OCARINA_C_DOWN_BUTTON  && OcarinaCDownButton)  ||
+           (itemName == RG_OCARINA_C_UP_BUTTON    && OcarinaCUpButton)    ||
+           (itemName == RG_ZELDAS_LULLABY         && ZeldasLullaby)       ||
+           (itemName == RG_EPONAS_SONG            && EponasSong)          ||
+           (itemName == RG_SARIAS_SONG            && SariasSong)          ||
+           (itemName == RG_SUNS_SONG              && SunsSong)            ||
+           (itemName == RG_SONG_OF_TIME           && SongOfTime)          ||
+           (itemName == RG_SONG_OF_STORMS         && SongOfStorms)        ||
+           (itemName == RG_MINUET_OF_FOREST       && MinuetOfForest)      ||
+           (itemName == RG_BOLERO_OF_FIRE         && BoleroOfFire)        ||
+           (itemName == RG_SERENADE_OF_WATER      && SerenadeOfWater)     ||
+           (itemName == RG_REQUIEM_OF_SPIRIT      && RequiemOfSpirit)     ||
+           (itemName == RG_NOCTURNE_OF_SHADOW     && NocturneOfShadow)    ||
+           (itemName == RG_PRELUDE_OF_LIGHT       && PreludeOfLight);
   }
 
   //Can the passed in item be used?
@@ -461,6 +480,20 @@ namespace Logic {
       case RG_STICKS:            return IsChild;// || StickAsAdult;
       case RG_DEKU_SHIELD:       return IsChild;// || DekuShieldAsAdult;
 
+      // Songs
+      case RG_ZELDAS_LULLABY:     return Ocarina && OcarinaCLeftButton && OcarinaCRightButton && OcarinaCUpButton;
+      case RG_EPONAS_SONG:        return Ocarina && OcarinaCLeftButton && OcarinaCRightButton && OcarinaCUpButton;
+      case RG_SARIAS_SONG:        return Ocarina && OcarinaCLeftButton && OcarinaCRightButton && OcarinaCDownButton;
+      case RG_SUNS_SONG:          return Ocarina && OcarinaCRightButton && OcarinaCUpButton && OcarinaCDownButton;
+      case RG_SONG_OF_TIME:       return Ocarina && OcarinaAButton && OcarinaCRightButton && OcarinaCDownButton;
+      case RG_SONG_OF_STORMS:     return Ocarina && OcarinaAButton && OcarinaCUpButton && OcarinaCDownButton;
+      case RG_MINUET_OF_FOREST:   return Ocarina && OcarinaAButton && OcarinaCLeftButton && OcarinaCRightButton && OcarinaCUpButton;
+      case RG_BOLERO_OF_FIRE:     return Ocarina && OcarinaAButton && OcarinaCRightButton && OcarinaCDownButton;
+      case RG_SERENADE_OF_WATER:  return Ocarina && OcarinaAButton && OcarinaCLeftButton && OcarinaCRightButton && OcarinaCDownButton;
+      case RG_REQUIEM_OF_SPIRIT:  return Ocarina && OcarinaAButton && OcarinaCRightButton && OcarinaCDownButton;
+      case RG_NOCTURNE_OF_SHADOW: return Ocarina && OcarinaAButton && OcarinaCLeftButton && OcarinaCRightButton && OcarinaCDownButton;
+      case RG_PRELUDE_OF_LIGHT:   return Ocarina && OcarinaCLeftButton && OcarinaCRightButton && OcarinaCUpButton;
+
       // Magic items
       default: return MagicMeter && (IsMagicItem(itemName) || (IsMagicArrow(itemName) && CanUse(RG_FAIRY_BOW)));
     }
@@ -535,6 +568,11 @@ namespace Logic {
   //Updates all logic helpers. Should be called whenever a non-helper is changed
   void UpdateHelpers() {
     auto ctx = Rando::Context::GetInstance();
+    OcarinaButtons  = (OcarinaAButton ? 1 : 0) +
+                      (OcarinaCLeftButton ? 1 : 0) +
+                      (OcarinaCRightButton ? 1 : 0) +
+                      (OcarinaCUpButton ? 1 : 0) +
+                      (OcarinaCDownButton ? 1 : 0);
     NumBottles      = ((NoBottles) ? 0 : (Bottles + ((DeliverLetter) ? 1 : 0)));
     HasBottle       = NumBottles >= 1;
     Slingshot       = (ProgressiveBulletBag >= 1) && (BuySeed || AmmoCanDrop);
@@ -553,9 +591,10 @@ namespace Logic {
     AdultsWallet    = ProgressiveWallet     >= 1;
     BiggoronSword   = BiggoronSword || ProgressiveGiantKnife >= 2;
 
-    ScarecrowSong    = ScarecrowSong || ctx->GetOption(RSK_SKIP_SCARECROWS_SONG) || (ChildScarecrow && AdultScarecrow);
-    Scarecrow        = Hookshot && CanPlay(ScarecrowSong);
-    DistantScarecrow = Longshot && CanPlay(ScarecrowSong);
+    //you need at least 2 buttons for scarecrow song
+    ScarecrowSong    = ScarecrowSong || (ctx->GetOption(RSK_SKIP_SCARECROWS_SONG) && Ocarina && OcarinaButtons >= 2) || (ChildScarecrow && AdultScarecrow);
+    Scarecrow        = Hookshot && ScarecrowSong;
+    DistantScarecrow = Longshot && ScarecrowSong;
 
     //Drop Access
     DekuStickDrop = StickPot || DekuBabaSticks;
@@ -607,9 +646,9 @@ namespace Logic {
     CanDive         = ProgressiveScale >= 1;
     CanLeaveForest  = ctx->GetOption(RSK_FOREST).IsNot(RO_FOREST_CLOSED) || IsAdult || DekuTreeClear || ctx->GetOption(RSK_SHUFFLE_INTERIOR_ENTRANCES) || ctx->GetOption(RSK_SHUFFLE_OVERWORLD_ENTRANCES);
     CanPlantBugs    = IsChild && Bugs;
-    CanRideEpona    = IsAdult && Epona && CanPlay(EponasSong);
-    CanSummonGossipFairy            = Ocarina && (ZeldasLullaby || EponasSong || SongOfTime || SunsSong);
-    CanSummonGossipFairyWithoutSuns = Ocarina && (ZeldasLullaby || EponasSong || SongOfTime);
+    CanRideEpona    = IsAdult && Epona && CanUse(RG_EPONAS_SONG);
+    CanSummonGossipFairyWithoutSuns = CanUse(RG_ZELDAS_LULLABY) || CanUse(RG_EPONAS_SONG) || CanUse(RG_SONG_OF_TIME);
+    CanSummonGossipFairy            = CanSummonGossipFairyWithoutSuns || CanUse(RG_SUNS_SONG);
     Hearts          = BaseHearts + HeartContainer + (PieceOfHeart >> 2);
     EffectiveHealth = ((Hearts << (2 + DoubleDefense)) >> Multiplier) + ((Hearts << (2 + DoubleDefense)) % (1 << Multiplier) > 0); //Number of half heart hits to die, ranges from 1 to 160
     FireTimer       = CanUse(RG_GORON_TUNIC) ? 255 : (ctx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS)) ? (Hearts * 8) : 0;
@@ -620,9 +659,9 @@ namespace Logic {
     CanTakeDamageTwice  = (Fairy && NumBottles >= 2) || ((EffectiveHealth == 2) && (CanUse(RG_NAYRUS_LOVE) || Fairy)) || (EffectiveHealth > 2);
     //CanPlantBean        = IsChild && (MagicBean || MagicBeanPack);
     CanOpenBombGrotto   = CanBlastOrSmash       && (ShardOfAgony || ctx->GetTrickOption(RT_GROTTOS_WITHOUT_AGONY));
-    CanOpenStormGrotto  = CanPlay(SongOfStorms) && (ShardOfAgony || ctx->GetTrickOption(RT_GROTTOS_WITHOUT_AGONY));
+    CanOpenStormGrotto  = CanUse(RG_SONG_OF_STORMS) && (ShardOfAgony || ctx->GetTrickOption(RT_GROTTOS_WITHOUT_AGONY));
     HookshotOrBoomerang = CanUse(RG_HOOKSHOT) || CanUse(RG_BOOMERANG);
-    CanGetNightTimeGS   = (CanPlay(SunsSong) || !ctx->GetOption(RSK_SKULLS_SUNS_SONG));
+    CanGetNightTimeGS   = (CanUse(RG_SUNS_SONG) || !ctx->GetOption(RSK_SKULLS_SUNS_SONG));
 
     GuaranteeTradePath     = ctx->GetOption(RSK_SHUFFLE_INTERIOR_ENTRANCES) || ctx->GetOption(RSK_SHUFFLE_OVERWORLD_ENTRANCES) || ctx->GetTrickOption(RT_DMT_BOLERO_BIGGORON) || CanBlastOrSmash || StopGCRollingGoronAsAdult;
   //GuaranteeHint          = (hints == "Mask" && MaskofTruth) || (hints == "Agony") || (hints != "Mask" && hints != "Agony");
@@ -885,6 +924,13 @@ namespace Logic {
      GregInBridgeLogic = false;
      GregInLacsLogic = false;
 
+     //Ocarina C Buttons
+     OcarinaAButton = ctx->GetOption(RSK_SHUFFLE_OCARINA_BUTTONS).Is(true) ? 0 : 1;
+     OcarinaCLeftButton = ctx->GetOption(RSK_SHUFFLE_OCARINA_BUTTONS).Is(true) ? 0 : 1;
+     OcarinaCRightButton = ctx->GetOption(RSK_SHUFFLE_OCARINA_BUTTONS).Is(true) ? 0 : 1;
+     OcarinaCUpButton = ctx->GetOption(RSK_SHUFFLE_OCARINA_BUTTONS).Is(true) ? 0 : 1;
+     OcarinaCDownButton = ctx->GetOption(RSK_SHUFFLE_OCARINA_BUTTONS).Is(true) ? 0 : 1;
+
      //Progressive Items
      ProgressiveBulletBag  = 0;
      ProgressiveBombBag    = 0;
diff --git a/soh/soh/Enhancements/randomizer/3drando/logic.hpp b/soh/soh/Enhancements/randomizer/3drando/logic.hpp
index 2477f9902..63f7b9fa3 100644
--- a/soh/soh/Enhancements/randomizer/3drando/logic.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/logic.hpp
@@ -200,6 +200,12 @@ extern uint8_t PieceOfHeart;
 extern uint8_t HeartContainer;
 extern bool DoubleDefense;
 
+extern bool OcarinaAButton;
+extern bool OcarinaCLeftButton;
+extern bool OcarinaCRightButton;
+extern bool OcarinaCUpButton;
+extern bool OcarinaCDownButton;
+
 /* --- HELPERS --- */
 /* These are used to simplify reading the logic, but need to be updated
 /  every time a base value is updated.                       */
@@ -266,6 +272,7 @@ extern bool HookshotOrBoomerang;
 extern bool CanGetNightTimeGS;
 extern bool BigPoeKill;
 
+extern uint8_t OcarinaButtons;
 extern uint8_t BaseHearts;
 extern uint8_t Hearts;
 extern uint8_t Multiplier;
@@ -376,7 +383,6 @@ enum class GlitchDifficulty {
 };
 
 void UpdateHelpers();
-bool CanPlay(bool song);
 bool CanUse(RandomizerGet itemName);
 bool HasProjectile(HasProjectileAge age);
 bool HasBossSoul(RandomizerGet itemName);
diff --git a/soh/soh/Enhancements/randomizer/3drando/shops.cpp b/soh/soh/Enhancements/randomizer/3drando/shops.cpp
index 973bacaa4..9ca6a25ea 100644
--- a/soh/soh/Enhancements/randomizer/3drando/shops.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/shops.cpp
@@ -740,6 +740,29 @@ void InitTrickNames() {
      Text{"Ganon's Ghost", "", ""},
      Text{"Pork", "", ""}};
 
+  trickNameTable[RG_OCARINA_A_BUTTON] = {
+     Text{"Ocarina J Button", "", ""},
+     Text{"Ocarina Ayy Button", "", ""},
+     Text{"Ocarina A Trigger", "", ""} };
+  trickNameTable[RG_OCARINA_C_UP_BUTTON] = {
+     Text{"Ocarina C North Button", "", ""},
+     Text{"Ocarina C App Button", "", ""},
+     Text{"Ocarina Sup Button", "", ""} };
+  trickNameTable[RG_OCARINA_C_DOWN_BUTTON] = {
+     Text{"Ocarina C South Button", "", ""},
+     Text{"Ocarina Z Down Button", "", ""},
+     Text{"Ocarina See Down Button", "", ""},
+     Text{"Ocarina C Dawn Button", "", ""} };
+  trickNameTable[RG_OCARINA_C_LEFT_BUTTON] = {
+     Text{"Ocarina C West Button", "", ""},
+     Text{"Ocarina Sea Left Button", "", ""},
+     Text{"Ocarina C Lift Button", "", ""},
+     Text{"Ocarina Rewind Button", "", ""} };
+  trickNameTable[RG_OCARINA_C_RIGHT_BUTTON] = {
+     Text{"Ocarina C East Button", "", ""},
+     Text{"Ocarina C Wright Button", "", ""},
+     Text{"Overworld C Right Button", "", ""} };
+
 /*
   //Names for individual upgrades, in case progressive names are replaced
   trickNameTable[GI_HOOKSHOT] = {
diff --git a/soh/soh/Enhancements/randomizer/draw.cpp b/soh/soh/Enhancements/randomizer/draw.cpp
index 43f7129ab..1730c7fc7 100644
--- a/soh/soh/Enhancements/randomizer/draw.cpp
+++ b/soh/soh/Enhancements/randomizer/draw.cpp
@@ -14,6 +14,7 @@
 #include "objects/object_toki_objects/object_toki_objects.h"
 #include "objects/gameplay_field_keep/gameplay_field_keep.h"
 #include "soh_assets.h"
+#include "soh/Enhancements/cosmetics/cosmeticsTypes.h"
 
 extern "C" {
 extern SaveContext gSaveContext;
@@ -327,3 +328,66 @@ extern "C" void Randomizer_DrawBossSoul(PlayState* play, GetItemEntry* getItemEn
     CLOSE_DISPS(play->state.gfxCtx);
 
 }
+
+extern "C" void Randomizer_DrawOcarinaButton(PlayState* play, GetItemEntry* getItemEntry) {
+    Color_RGB8 aButtonColor = { 80, 150, 255 };
+    if (CVarGetInteger("gCosmetics.Hud_AButton.Changed", 0)) {
+        aButtonColor = CVarGetColor24("gCosmetics.Hud_AButton.Value", aButtonColor);
+    } else if (CVarGetInteger("gCosmetics.DefaultColorScheme", COLORSCHEME_N64) == COLORSCHEME_GAMECUBE) {
+        aButtonColor = { 80, 255, 150 };
+    }
+
+    Color_RGB8 cButtonsColor = { 255, 255, 50 };
+    if (CVarGetInteger("gCosmetics.Hud_CButtons.Changed", 0)) {
+        cButtonsColor = CVarGetColor24("gCosmetics.Hud_CButtons.Value", cButtonsColor);
+    }
+    Color_RGB8 cUpButtonColor = cButtonsColor;
+    if (CVarGetInteger("gCosmetics.Hud_CUpButton.Changed", 0)) {
+        cUpButtonColor = CVarGetColor24("gCosmetics.Hud_CUpButton.Value", cUpButtonColor);
+    }
+    Color_RGB8 cDownButtonColor = cButtonsColor;
+    if (CVarGetInteger("gCosmetics.Hud_CDownButton.Changed", 0)) {
+        cDownButtonColor = CVarGetColor24("gCosmetics.Hud_CDownButton.Value", cDownButtonColor);
+    }
+    Color_RGB8 cLeftButtonColor = cButtonsColor;
+    if (CVarGetInteger("gCosmetics.Hud_CLeftButton.Changed", 0)) {
+        cLeftButtonColor = CVarGetColor24("gCosmetics.Hud_CLeftButton.Value", cLeftButtonColor);
+    }
+    Color_RGB8 cRightButtonColor = cButtonsColor;
+    if (CVarGetInteger("gCosmetics.Hud_CRightButton.Changed", 0)) {
+        cRightButtonColor = CVarGetColor24("gCosmetics.Hud_CRightButton.Value", cRightButtonColor);
+    }
+
+    s16 slot = getItemEntry->getItemId - RG_OCARINA_A_BUTTON;
+
+    Gfx* dLists[] = {
+        (Gfx*)gOcarinaAButtonDL,
+        (Gfx*)gOcarinaCUpButtonDL,
+        (Gfx*)gOcarinaCDownButtonDL,
+        (Gfx*)gOcarinaCLeftButtonDL,
+        (Gfx*)gOcarinaCRightButtonDL,
+    };
+
+    Color_RGB8 colors[] = {
+        aButtonColor,
+        cUpButtonColor,
+        cDownButtonColor,
+        cLeftButtonColor,
+        cRightButtonColor,
+    };
+
+    OPEN_DISPS(play->state.gfxCtx);
+
+    Gfx_SetupDL_25Xlu(play->state.gfxCtx);
+
+    gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__), G_MTX_MODELVIEW | G_MTX_LOAD);
+
+    gDPSetGrayscaleColor(POLY_XLU_DISP++, colors[slot].r, colors[slot].g, colors[slot].b, 255);
+    gSPGrayscale(POLY_XLU_DISP++, true);
+
+    gSPDisplayList(POLY_XLU_DISP++, dLists[slot]);
+
+    gSPGrayscale(POLY_XLU_DISP++, false);
+
+    CLOSE_DISPS(play->state.gfxCtx);
+}
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/draw.h b/soh/soh/Enhancements/randomizer/draw.h
index dcf146c28..b2f88e3da 100644
--- a/soh/soh/Enhancements/randomizer/draw.h
+++ b/soh/soh/Enhancements/randomizer/draw.h
@@ -17,6 +17,7 @@ void Randomizer_DrawDoubleDefense(PlayState* play, GetItemEntry* getItemEntry);
 void Randomizer_DrawMasterSword(PlayState* play, GetItemEntry* getItemEntry);
 void Randomizer_DrawTriforcePiece(PlayState* play, GetItemEntry getItemEntry);
 void Randomizer_DrawTriforcePieceGI(PlayState* play, GetItemEntry getItemEntry);
+void Randomizer_DrawOcarinaButton(PlayState* play, GetItemEntry* getItemEntry);
 #ifdef __cplusplus
 };
 #endif
diff --git a/soh/soh/Enhancements/randomizer/item_list.cpp b/soh/soh/Enhancements/randomizer/item_list.cpp
index 45151e99c..246e1248c 100644
--- a/soh/soh/Enhancements/randomizer/item_list.cpp
+++ b/soh/soh/Enhancements/randomizer/item_list.cpp
@@ -259,6 +259,17 @@ void Rando::StaticData::InitItemTable() {
     itemTable[RG_GANON_SOUL] =                          Item(RG_GANON_SOUL,                      Text{ "Ganon's Soul", "", "" },                                                                                    ITEMTYPE_ITEM,              0xE8,               true,  &Logic::CanSummonGanon,      RHT_GANON_SOUL,             RG_GANON_SOUL,                  OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_GANON_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
 
+    itemTable[RG_OCARINA_A_BUTTON] =                    Item(RG_OCARINA_A_BUTTON,                Text{ "Ocarina A Button", "Touche A de l'Ocarina", "Botón A de Ocarina" },                                         ITEMTYPE_ITEM,              GI_MAP,             true,  &Logic::OcarinaAButton,      RHT_OCARINA_A_BUTTON,       RG_OCARINA_A_BUTTON,            OBJECT_GI_MAP,          GID_STONE_OF_AGONY, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_OCARINA_A_BUTTON].SetCustomDrawFunc(Randomizer_DrawOcarinaButton);
+    itemTable[RG_OCARINA_C_UP_BUTTON] =                 Item(RG_OCARINA_C_UP_BUTTON,             Text{ "Ocarina C Up Button", "Touche C-Haut de l'Ocarina", "Botón C superior de Ocarina" },                        ITEMTYPE_ITEM,              GI_MAP,             true,  &Logic::OcarinaCUpButton,    RHT_OCARINA_C_UP_BUTTON,    RG_OCARINA_C_UP_BUTTON,         OBJECT_GI_MAP,          GID_STONE_OF_AGONY, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_OCARINA_C_UP_BUTTON].SetCustomDrawFunc(Randomizer_DrawOcarinaButton);
+    itemTable[RG_OCARINA_C_DOWN_BUTTON] =               Item(RG_OCARINA_C_DOWN_BUTTON,           Text{ "Ocarina C Down Button", "Touche C-Bas de l'Ocarina", "Botón C inferior de Ocarina" },                       ITEMTYPE_ITEM,              GI_MAP,             true,  &Logic::OcarinaCDownButton,  RHT_OCARINA_C_DOWN_BUTTON,  RG_OCARINA_C_DOWN_BUTTON,       OBJECT_GI_MAP,          GID_STONE_OF_AGONY, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_OCARINA_C_DOWN_BUTTON].SetCustomDrawFunc(Randomizer_DrawOcarinaButton);
+    itemTable[RG_OCARINA_C_LEFT_BUTTON] =               Item(RG_OCARINA_C_LEFT_BUTTON,           Text{ "Ocarina C Left Button", "Touche C-Gauche de l'Ocarina", "Botón C izquierdo de Ocarina" },                   ITEMTYPE_ITEM,              GI_MAP,             true,  &Logic::OcarinaCLeftButton,  RHT_OCARINA_C_LEFT_BUTTON,  RG_OCARINA_C_LEFT_BUTTON,       OBJECT_GI_MAP,          GID_STONE_OF_AGONY, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_OCARINA_C_LEFT_BUTTON].SetCustomDrawFunc(Randomizer_DrawOcarinaButton);
+    itemTable[RG_OCARINA_C_RIGHT_BUTTON] =              Item(RG_OCARINA_C_RIGHT_BUTTON,          Text{ "Ocarina C Right Button", "Touche C-Droit de l'Ocarina", "Botón C derecho de Ocarina" },                     ITEMTYPE_ITEM,              GI_MAP,             true,  &Logic::OcarinaCRightButton, RHT_OCARINA_C_RIGHT_BUTTON, RG_OCARINA_C_RIGHT_BUTTON,      OBJECT_GI_MAP,          GID_STONE_OF_AGONY, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_OCARINA_C_RIGHT_BUTTON].SetCustomDrawFunc(Randomizer_DrawOcarinaButton);
+
     itemTable[RG_TRIFORCE] =                            Item(RG_TRIFORCE,                         Text{ "Triforce", "Triforce", "Triforce" },                                                                       ITEMTYPE_EVENT,             RG_TRIFORCE,        false, &Logic::noVariable,          RHT_NONE);
     itemTable[RG_HINT] =                                Item(RG_HINT,                             Text{ "Hint", "Indice", "Hinweis" },                                                                              ITEMTYPE_EVENT,             RG_HINT,            false, &Logic::noVariable,          RHT_NONE);
     // Individual stages of progressive items (only here for GetItemEntry purposes, not for use in seed gen)
diff --git a/soh/soh/Enhancements/randomizer/option_descriptions.cpp b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
index 22fc33f69..85e5affe8 100644
--- a/soh/soh/Enhancements/randomizer/option_descriptions.cpp
+++ b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
@@ -215,6 +215,10 @@ void Settings::CreateOptionDescriptions() {
         "Enabling this shuffles the Fairy Ocarina and the Ocarina of Time into the item pool.\n"
         "\n"
         "This will require finding an Ocarina before being able to play songs.";
+    mOptionDescriptions[RSK_SHUFFLE_OCARINA_BUTTONS] =
+        "Enabling this shuffles the Ocarina buttons into the item pool.\n"
+        "\n"
+        "This will require finding the buttons before being able to use them in songs.";
     mOptionDescriptions[RSK_SHUFFLE_WEIRD_EGG] = "Shuffles the Weird Egg from Malon in to the item pool. Enabling "
                                                  "\"Skip Child Zelda\" disables this feature.\n"
                                                  "\n"
@@ -411,7 +415,8 @@ void Settings::CreateOptionDescriptions() {
         "Once the happy mask shop is opened, all masks will be available to be borrowed.";
     mOptionDescriptions[RSK_SKIP_SCARECROWS_SONG] =
         "Start with the ability to summon Pierre the scarecrow. Pulling out an ocarina in the usual locations will "
-        "automatically summon him.";
+        "automatically summon him.\n"
+        "With \"Shuffle Ocarina Buttons\" enabled, you'll need at least two ocarina buttons to summon him.";
     mOptionDescriptions[RSK_ITEM_POOL] = "Sets how many major items appear in the item pool.\n"
                                          "\n"
                                          "Plentiful - Extra major items are added to the pool.\n"
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index b2316d638..3efa3a141 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -822,6 +822,18 @@ ItemObtainability Randomizer::GetItemObtainabilityFromRandomizerGet(RandomizerGe
         case RG_LIGHT_MEDALLION:
             return !CHECK_QUEST_ITEM(QUEST_MEDALLION_LIGHT) ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE;
 
+        // Ocarina Buttons
+        case RG_OCARINA_A_BUTTON:
+            return Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_A) ? CANT_OBTAIN_ALREADY_HAVE : CAN_OBTAIN;
+        case RG_OCARINA_C_LEFT_BUTTON:
+            return Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_LEFT) ? CANT_OBTAIN_ALREADY_HAVE : CAN_OBTAIN;
+        case RG_OCARINA_C_RIGHT_BUTTON:
+            return Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_RIGHT) ? CANT_OBTAIN_ALREADY_HAVE : CAN_OBTAIN;
+        case RG_OCARINA_C_UP_BUTTON:
+            return Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_UP) ? CANT_OBTAIN_ALREADY_HAVE : CAN_OBTAIN;
+        case RG_OCARINA_C_DOWN_BUTTON:
+            return Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_DOWN) ? CANT_OBTAIN_ALREADY_HAVE : CAN_OBTAIN;
+
         case RG_RECOVERY_HEART:
         case RG_GREEN_RUPEE:
         case RG_GREG_RUPEE:
@@ -1144,6 +1156,19 @@ GetItemID Randomizer::GetItemIdFromRandomizerGet(RandomizerGet randoGet, GetItem
             return GI_HEART_PIECE_WIN;
         case RG_TREASURE_GAME_GREEN_RUPEE:
             return GI_RUPEE_GREEN_LOSE;
+        
+        //Ocarina Buttons
+        case RG_OCARINA_A_BUTTON:
+            return (GetItemID)RG_OCARINA_A_BUTTON;
+        case RG_OCARINA_C_LEFT_BUTTON:
+            return (GetItemID)RG_OCARINA_C_LEFT_BUTTON;
+        case RG_OCARINA_C_RIGHT_BUTTON:
+            return (GetItemID)RG_OCARINA_C_RIGHT_BUTTON;
+        case RG_OCARINA_C_UP_BUTTON:
+            return (GetItemID)RG_OCARINA_C_UP_BUTTON;
+        case RG_OCARINA_C_DOWN_BUTTON:
+            return (GetItemID)RG_OCARINA_C_DOWN_BUTTON;
+
         default:
             if (!IsItemVanilla(randoGet)) {
                 return (GetItemID)randoGet;
@@ -3043,7 +3068,7 @@ CustomMessage Randomizer::GetGoronMessage(u16 index) {
 void Randomizer::CreateCustomMessages() {
     // RANDTODO: Translate into french and german and replace GIMESSAGE_UNTRANSLATED
     // with GIMESSAGE(getItemID, itemID, english, german, french).
-    const std::array<GetItemMessage, 66> getItemMessages = {{
+    const std::array<GetItemMessage, 71> getItemMessages = {{
         GIMESSAGE(RG_GREG_RUPEE, ITEM_MASK_GORON, 
 			"You found %gGreg%w!",
 			"%gGreg%w! Du hast ihn wirklich gefunden!",
@@ -3289,6 +3314,26 @@ void Randomizer::CreateCustomMessages() {
         GIMESSAGE_UNTRANSLATED(RG_TWINROVA_SOUL, ITEM_BIG_POE, "You found the soul for %yTwinrova%w!"),
         GIMESSAGE_UNTRANSLATED(RG_GANON_SOUL, ITEM_BIG_POE, "You found the soul for %cGanon%w!"),
 
+        GIMESSAGE(RG_OCARINA_A_BUTTON, ITEM_OCARINA_TIME,
+            "You got the %b\x9f%r button for the&Ocarina%w! You can now use it&while playing songs!",
+			"Der %b\x9f%r Knopf%w!&Du kannst ihn nun zum Spielen&von Liedern auf der %rOkarina%w&verwenden!",
+			"Vous trouvez la %rtouche %b\x9f%r de&l'Ocarina%w! Vous pouvez&maintenant l'utiliser lorsque&vous en jouez!"),
+        GIMESSAGE(RG_OCARINA_C_LEFT_BUTTON, ITEM_OCARINA_TIME,
+            "You got the %y\xa7%r button for the&Ocarina%w! You can now use it&while playing songs!",
+			"Der %y\xa7%r Knopf%w!&Du kannst ihn nun zum Spielen&von Liedern auf der %rOkarina%w&verwenden!",
+			"Vous trouvez la %rtouche %y\xa7%r de&l'Ocarina%w! Vous pouvez&maintenant l'utiliser lorsque&vous en jouez!"),
+        GIMESSAGE(RG_OCARINA_C_RIGHT_BUTTON, ITEM_OCARINA_TIME,
+            "You got the %y\xa8%r button for the&Ocarina%w! You can now use it&while playing songs!",
+			"Der %y\xa8%r Knopf%w!&Du kannst ihn nun zum Spielen&von Liedern auf der %rOkarina%w&verwenden!",
+			"Vous trouvez la %rtouche %y\xa8%r de&l'Ocarina%w! Vous pouvez&maintenant l'utiliser lorsque&vous en jouez!"),
+        GIMESSAGE(RG_OCARINA_C_UP_BUTTON, ITEM_OCARINA_TIME,
+            "You got the %y\xa5%r button for the&Ocarina%w! You can now use it&while playing songs!",
+			"Der %y\xa5%r Knopf%w!&Du kannst ihn nun zum Spielen&von Liedern auf der %rOkarina%w&verwenden!",
+			"Vous trouvez la %rtouche %y\xa5%r de&l'Ocarina%w! Vous pouvez&maintenant l'utiliser lorsque&vous en jouez!"),
+        GIMESSAGE(RG_OCARINA_C_DOWN_BUTTON, ITEM_OCARINA_TIME,
+            "You got the %y\xa6%r button for the&Ocarina%w! You can now use it&while playing songs!",
+			"Der %y\xa6%r Knopf%w!&Du kannst ihn nun zum Spielen&von Liedern auf der %rOkarina%w&verwenden!",
+			"Vous trouvez la %rtouche %y\xa6%r de&l'Ocarina%w! Vous pouvez&maintenant l'utiliser lorsque&vous en jouez!"),
     }};
     CreateGetItemMessages(&getItemMessages);
     CreateRupeeMessages();
diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h
index 14954fe11..95845883f 100644
--- a/soh/soh/Enhancements/randomizer/randomizerTypes.h
+++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@@ -1867,6 +1867,11 @@ typedef enum {
     RG_BONGO_BONGO_SOUL,
     RG_TWINROVA_SOUL,
     RG_GANON_SOUL,
+    RG_OCARINA_A_BUTTON,
+    RG_OCARINA_C_UP_BUTTON,
+    RG_OCARINA_C_DOWN_BUTTON,
+    RG_OCARINA_C_LEFT_BUTTON,
+    RG_OCARINA_C_RIGHT_BUTTON,
     RG_HINT,
     RG_TYCOON_WALLET,
     RG_FAIRY_OCARINA,
@@ -3080,6 +3085,11 @@ typedef enum {
     RHT_BONGO_BONGO_SOUL,
     RHT_TWINROVA_SOUL,
     RHT_GANON_SOUL,
+    RHT_OCARINA_A_BUTTON,
+    RHT_OCARINA_C_UP_BUTTON,
+    RHT_OCARINA_C_DOWN_BUTTON,
+    RHT_OCARINA_C_LEFT_BUTTON,
+    RHT_OCARINA_C_RIGHT_BUTTON,
     RHT_EPONA,
     // Entrances
     RHT_DESERT_COLOSSUS_TO_COLOSSUS_GROTTO,
@@ -3382,6 +3392,7 @@ typedef enum {
     RSK_TRIAL_COUNT,
     RSK_STARTING_OCARINA,
     RSK_SHUFFLE_OCARINA,
+    RSK_SHUFFLE_OCARINA_BUTTONS,
     RSK_STARTING_DEKU_SHIELD,
     RSK_STARTING_KOKIRI_SWORD,
     RSK_STARTING_MASTER_SWORD,
diff --git a/soh/soh/Enhancements/randomizer/randomizer_inf.h b/soh/soh/Enhancements/randomizer/randomizer_inf.h
index 472523b7c..39f84ba2a 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_inf.h
+++ b/soh/soh/Enhancements/randomizer/randomizer_inf.h
@@ -171,6 +171,12 @@ typedef enum {
     RAND_INF_TWINROVA_SOUL,
     RAND_INF_GANON_SOUL,
 
+    RAND_INF_HAS_OCARINA_A,
+    RAND_INF_HAS_OCARINA_C_UP,
+    RAND_INF_HAS_OCARINA_C_DOWN,
+    RAND_INF_HAS_OCARINA_C_LEFT,
+    RAND_INF_HAS_OCARINA_C_RIGHT,
+
     // If you add anything to this list, you need to update the size of randomizerInf in z64save.h to be ceil(RAND_INF_MAX / 16)
 
     RAND_INF_MAX,
diff --git a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
index 535e9b4ad..3d4177c59 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
@@ -98,6 +98,16 @@ std::vector<ItemTrackerItem> bossSoulItems = {
     ITEM_TRACKER_ITEM_CUSTOM(RG_GANON_SOUL, ITEM_BIG_POE, ITEM_BOTTLE, 0, DrawItem ),
 };
 
+std::vector<ItemTrackerItem> ocarinaButtonItems = {
+    //Hack for right now, just gonna draw ocarina buttons as ocarinas.
+    //Will replace with other macro once we have a custom texture
+    ITEM_TRACKER_ITEM_CUSTOM(RG_OCARINA_A_BUTTON, ITEM_OCARINA_TIME, ITEM_OCARINA_TIME, 0, DrawItem ),
+    ITEM_TRACKER_ITEM_CUSTOM(RG_OCARINA_C_UP_BUTTON, ITEM_OCARINA_TIME, ITEM_OCARINA_TIME, 0, DrawItem ),
+    ITEM_TRACKER_ITEM_CUSTOM(RG_OCARINA_C_DOWN_BUTTON, ITEM_OCARINA_TIME, ITEM_OCARINA_TIME, 0, DrawItem ),
+    ITEM_TRACKER_ITEM_CUSTOM(RG_OCARINA_C_LEFT_BUTTON, ITEM_OCARINA_TIME, ITEM_OCARINA_TIME, 0, DrawItem ),
+    ITEM_TRACKER_ITEM_CUSTOM(RG_OCARINA_C_RIGHT_BUTTON, ITEM_OCARINA_TIME, ITEM_OCARINA_TIME, 0, DrawItem ),
+};
+
 std::vector<ItemTrackerDungeon> itemTrackerDungeonsWithMapsHorizontal = {
     { SCENE_DEKU_TREE, { ITEM_DUNGEON_MAP, ITEM_COMPASS } },
     { SCENE_DODONGOS_CAVERN, { ITEM_DUNGEON_MAP, ITEM_COMPASS } },
@@ -180,6 +190,14 @@ std::map<uint16_t, std::string> itemTrackerBossShortNames = {
     { RG_GANON_SOUL, "GANON"},
 };
 
+std::map<uint16_t, std::string> itemTrackerOcarinaButtonShortNames = {
+    { RG_OCARINA_A_BUTTON, "A" },
+    { RG_OCARINA_C_UP_BUTTON, "C-U" },
+    { RG_OCARINA_C_DOWN_BUTTON, "C-D" },
+    { RG_OCARINA_C_LEFT_BUTTON, "C-L"},
+    { RG_OCARINA_C_RIGHT_BUTTON, "C-R"},
+};
+
 std::vector<ItemTrackerItem> dungeonItems = {};
 
 std::unordered_map<uint32_t, ItemTrackerItem> actualItemTrackerItemMap = {
@@ -682,6 +700,32 @@ void DrawItem(ItemTrackerItem item) {
                 
             itemName = "Ganon's Soul";
             break;
+
+        case RG_OCARINA_A_BUTTON:
+            actualItemId = item.id;
+            hasItem = Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_A);
+            itemName = "Ocarina A Button";
+            break;
+        case RG_OCARINA_C_UP_BUTTON:
+            actualItemId = item.id;
+            hasItem = Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_UP);
+            itemName = "Ocarina C Up Button";
+            break;
+        case RG_OCARINA_C_DOWN_BUTTON:
+            actualItemId = item.id;
+            hasItem = Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_DOWN);
+            itemName = "Ocarina C Down Button";
+            break;
+        case RG_OCARINA_C_LEFT_BUTTON:
+            actualItemId = item.id;
+            hasItem = Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_LEFT);
+            itemName = "Ocarina C Left Button";
+            break;
+        case RG_OCARINA_C_RIGHT_BUTTON:
+            actualItemId = item.id;
+            hasItem = Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_RIGHT);
+            itemName = "Ocarina C Right Button";
+            break;
     }
 
     if (GameInteractor::IsSaveLoaded() && (hasItem && item.id != actualItemId && actualItemTrackerItemMap.find(actualItemId) != actualItemTrackerItemMap.end())) {
@@ -704,6 +748,15 @@ void DrawItem(ItemTrackerItem item) {
         ImGui::PopStyleColor();
     }
 
+    if (item.id >= RG_OCARINA_A_BUTTON && item.id <= RG_OCARINA_C_RIGHT_BUTTON) {
+        ImVec2 p = ImGui::GetCursorScreenPos();
+        std::string ocarinaButtonName = itemTrackerOcarinaButtonShortNames[item.id];
+        ImGui::SetCursorScreenPos(ImVec2(p.x + (iconSize / 2) - (ImGui::CalcTextSize(ocarinaButtonName.c_str()).x / 2), p.y - (iconSize + 13)));
+        ImGui::PushStyleColor(ImGuiCol_Text, IM_COL_WHITE);
+        ImGui::Text("%s", ocarinaButtonName.c_str());
+        ImGui::PopStyleColor();
+    }
+
     ImGui::EndGroup();
 
     if (itemName == "") {
@@ -1050,6 +1103,17 @@ void UpdateVectors() {
         mainWindowItems.insert(mainWindowItems.end(), bossSoulItems.begin(), bossSoulItems.end());
     }
 
+    //If we're adding ocarina buttons to the main window...
+    if (CVarGetInteger("gItemTrackerOcarinaButtonsDisplayType", SECTION_DISPLAY_HIDDEN) == SECTION_DISPLAY_MAIN_WINDOW) {
+        //...add empty items on the main window to get the buttons on their own row. (Too many to sit with Greg/Triforce pieces/boss souls)
+        while (mainWindowItems.size() % 6) {
+            mainWindowItems.push_back(ITEM_TRACKER_ITEM(ITEM_NONE, 0, DrawItem));
+        }
+
+        //Add ocarina buttons
+        mainWindowItems.insert(mainWindowItems.end(), ocarinaButtonItems.begin(), ocarinaButtonItems.end());
+    }
+
     shouldUpdateVectors = false;
 }
 
@@ -1156,6 +1220,12 @@ void ItemTrackerWindow::DrawElement() {
             EndFloatingWindows();
         }
 
+        if (CVarGetInteger("gItemTrackerOcarinaButtonsDisplayType", SECTION_DISPLAY_HIDDEN) == SECTION_DISPLAY_SEPARATE) {
+            BeginFloatingWindows("Ocarina Button Tracker");
+            DrawItemsInRows(ocarinaButtonItems);
+            EndFloatingWindows();
+        }
+
         if (CVarGetInteger("gItemTrackerNotesDisplayType", SECTION_DISPLAY_HIDDEN) == SECTION_DISPLAY_SEPARATE && CVarGetInteger("gItemTrackerDisplayType", TRACKER_DISPLAY_ALWAYS) == TRACKER_DISPLAY_ALWAYS) {
             ImGui::SetNextWindowSize(ImVec2(400,300), ImGuiCond_FirstUseEver);
             BeginFloatingWindows("Personal Notes", ImGuiWindowFlags_NoFocusOnAppearing);
@@ -1299,6 +1369,10 @@ void ItemTrackerSettingsWindow::DrawElement() {
         shouldUpdateVectors = true;
     }
 
+    if (UIWidgets::LabeledRightAlignedEnhancementCombobox("Ocarina Buttons", "gItemTrackerOcarinaButtonsDisplayType", displayTypes, SECTION_DISPLAY_HIDDEN)) {
+        shouldUpdateVectors = true;
+    }
+
     if (CVarGetInteger("gItemTrackerDisplayType", TRACKER_DISPLAY_ALWAYS) == TRACKER_DISPLAY_ALWAYS) {
         if (UIWidgets::LabeledRightAlignedEnhancementCombobox("Personal notes", "gItemTrackerNotesDisplayType", displayTypes, SECTION_DISPLAY_HIDDEN)) {
             shouldUpdateVectors = true;
diff --git a/soh/soh/Enhancements/randomizer/savefile.cpp b/soh/soh/Enhancements/randomizer/savefile.cpp
index b82c7a0d1..833778348 100644
--- a/soh/soh/Enhancements/randomizer/savefile.cpp
+++ b/soh/soh/Enhancements/randomizer/savefile.cpp
@@ -293,6 +293,14 @@ extern "C" void Randomizer_InitSaveFile() {
         Flags_SetInfTable(INFTABLE_SPOKE_TO_DARUNIA_IN_FIRE_TEMPLE); // Darunia in Fire Temple
     }
 
+    if (Randomizer_GetSettingValue(RSK_SHUFFLE_OCARINA_BUTTONS) == RO_GENERIC_OFF) {
+        Flags_SetRandomizerInf(RAND_INF_HAS_OCARINA_A);
+        Flags_SetRandomizerInf(RAND_INF_HAS_OCARINA_C_LEFT);
+        Flags_SetRandomizerInf(RAND_INF_HAS_OCARINA_C_RIGHT);
+        Flags_SetRandomizerInf(RAND_INF_HAS_OCARINA_C_UP);
+        Flags_SetRandomizerInf(RAND_INF_HAS_OCARINA_C_DOWN);
+    }
+
     // Give Link's pocket item
     GiveLinksPocketItem();
 
diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
index f32c981af..7215415e2 100644
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -103,6 +103,7 @@ void Settings::CreateOptions() {
     mOptions[RSK_SHUFFLE_KOKIRI_SWORD] = Option::Bool("Shuffle Kokiri Sword", "gRandomizeShuffleKokiriSword", mOptionDescriptions[RSK_SHUFFLE_KOKIRI_SWORD]);
     mOptions[RSK_SHUFFLE_MASTER_SWORD] = Option::Bool("Shuffle Master Sword", "gRandomizeShuffleMasterSword", mOptionDescriptions[RSK_SHUFFLE_MASTER_SWORD]);
     mOptions[RSK_SHUFFLE_OCARINA] = Option::Bool("Shuffle Ocarinas", "gRandomizeShuffleOcarinas", mOptionDescriptions[RSK_SHUFFLE_OCARINA]);
+    mOptions[RSK_SHUFFLE_OCARINA_BUTTONS] = Option::Bool("Shuffle Ocarina Buttons", "gRandomizeShuffleOcarinaButtons", mOptionDescriptions[RSK_SHUFFLE_OCARINA_BUTTONS]);
     mOptions[RSK_SHUFFLE_WEIRD_EGG] = Option::Bool("Shuffle Weird Egg", "gRandomizeShuffleWeirdEgg", mOptionDescriptions[RSK_SHUFFLE_WEIRD_EGG]);
     mOptions[RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD] = Option::Bool("Shuffle Gerudo Membership Card", "gRandomizeShuffleGerudoToken", mOptionDescriptions[RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD]);
     mOptions[RSK_SHUFFLE_MAGIC_BEANS] = Option::Bool("Shuffle Magic Beans", "gRandomizeShuffleBeans", mOptionDescriptions[RSK_SHUFFLE_MAGIC_BEANS]);
@@ -613,6 +614,7 @@ void Settings::CreateOptions() {
         &mOptions[RSK_SHUFFLE_KOKIRI_SWORD],
         &mOptions[RSK_SHUFFLE_MASTER_SWORD],
         &mOptions[RSK_SHUFFLE_OCARINA],
+        &mOptions[RSK_SHUFFLE_OCARINA_BUTTONS],
         &mOptions[RSK_SHUFFLE_WEIRD_EGG],
         &mOptions[RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD]
     }, false, WidgetContainerType::COLUMN);
@@ -813,6 +815,7 @@ void Settings::CreateOptions() {
         &mOptions[RSK_SHUFFLE_COWS],
         &mOptions[RSK_SHUFFLE_KOKIRI_SWORD],
         &mOptions[RSK_SHUFFLE_OCARINA],
+        &mOptions[RSK_SHUFFLE_OCARINA_BUTTONS],
         &mOptions[RSK_SHUFFLE_WEIRD_EGG],
         &mOptions[RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD],
         &mOptions[RSK_SHUFFLE_MAGIC_BEANS],
@@ -1018,6 +1021,7 @@ void Settings::CreateOptions() {
         { "Shuffle Settings:Shuffle Cows", RSK_SHUFFLE_COWS },
         { "Shuffle Settings:Tokensanity", RSK_SHUFFLE_TOKENS },
         { "Shuffle Settings:Shuffle Ocarinas", RSK_SHUFFLE_OCARINA },
+        { "Shuffle Settings:Shuffle Ocarina Buttons", RSK_SHUFFLE_OCARINA_BUTTONS },
         { "Shuffle Settings:Shuffle Adult Trade", RSK_SHUFFLE_ADULT_TRADE },
         { "Shuffle Settings:Shuffle Magic Beans", RSK_SHUFFLE_MAGIC_BEANS },
         { "Shuffle Settings:Shuffle Kokiri Sword", RSK_SHUFFLE_KOKIRI_SWORD },
@@ -2106,6 +2110,7 @@ void Settings::ParseJson(nlohmann::json spoilerFileJson) {
                 case RSK_SHUFFLE_FROG_SONG_RUPEES:
                 case RSK_SHUFFLE_100_GS_REWARD:
                 case RSK_SHUFFLE_OCARINA:
+                case RSK_SHUFFLE_OCARINA_BUTTONS:
                 case RSK_STARTING_DEKU_SHIELD:
                 case RSK_STARTING_KOKIRI_SWORD:
                 case RSK_STARTING_ZELDAS_LULLABY:
diff --git a/soh/src/code/code_800EC960.c b/soh/src/code/code_800EC960.c
index f2f72885d..c1528ec88 100644
--- a/soh/src/code/code_800EC960.c
+++ b/soh/src/code/code_800EC960.c
@@ -1626,23 +1626,23 @@ void func_800ED458(s32 arg0) {
         }
 
         Audio_OcaUpdateBtnMap(customControls, dpad, rStick);
-        if (D_8016BA18 & sOcarinaD4BtnMap) {
+        if (D_8016BA18 & sOcarinaD4BtnMap && (!IS_RANDO || Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_A))) {
             osSyncPrintf("Presss NA_KEY_D4 %08x\n", sOcarinaD4BtnMap);
             sCurOcarinaBtnVal = 2;
             sCurOcarinaBtnIdx = 0;
-        } else if (D_8016BA18 & sOcarinaF4BtnMap) {
+        } else if (D_8016BA18 & sOcarinaF4BtnMap && (!IS_RANDO || Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_DOWN))) {
             osSyncPrintf("Presss NA_KEY_F4 %08x\n", sOcarinaF4BtnMap);
             sCurOcarinaBtnVal = 5;
             sCurOcarinaBtnIdx = 1;
-        } else if (D_8016BA18 & sOcarinaA4BtnMap) {
+        } else if (D_8016BA18 & sOcarinaA4BtnMap && (!IS_RANDO || Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_RIGHT))) {
             osSyncPrintf("Presss NA_KEY_A4 %08x\n", sOcarinaA4BtnMap);
             sCurOcarinaBtnVal = 9;
             sCurOcarinaBtnIdx = 2;
-        } else if (D_8016BA18 & sOcarinaB4BtnMap) {
+        } else if (D_8016BA18 & sOcarinaB4BtnMap && (!IS_RANDO || Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_LEFT))) {
             osSyncPrintf("Presss NA_KEY_B4 %08x\n", sOcarinaA4BtnMap);
             sCurOcarinaBtnVal = 0xB;
             sCurOcarinaBtnIdx = 3;
-        } else if (D_8016BA18 & sOcarinaD5BtnMap) {
+        } else if (D_8016BA18 & sOcarinaD5BtnMap && (!IS_RANDO || Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_UP))) {
             osSyncPrintf("Presss NA_KEY_D5 %08x\n", sOcarinaD5BtnMap);
             sCurOcarinaBtnVal = 0xE;
             sCurOcarinaBtnIdx = 4;
diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c
index 802abc951..141dbaf6a 100644
--- a/soh/src/code/z_parameter.c
+++ b/soh/src/code/z_parameter.c
@@ -2664,6 +2664,13 @@ u16 Randomizer_Item_Give(PlayState* play, GetItemEntry giEntry) {
         return Return_Item_Entry(giEntry, RG_NONE);
     }
 
+    if (item >= RG_OCARINA_A_BUTTON && item <= RG_OCARINA_C_RIGHT_BUTTON) {
+        u8 index = item - RG_OCARINA_A_BUTTON;
+        Flags_SetRandomizerInf(RAND_INF_HAS_OCARINA_A + index);
+
+        return Return_Item_Entry(giEntry, RG_NONE);
+    }
+
     temp = gSaveContext.inventory.items[slot];
     osSyncPrintf("Item_Register(%d)=%d  %d\n", slot, item, temp);
     INV_CONTENT(item) = item;
diff --git a/soh/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c b/soh/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c
index 0a118916b..fe09f4e2b 100644
--- a/soh/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c
+++ b/soh/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c
@@ -117,7 +117,16 @@ void func_80A90264(EnKakasi2* this, PlayState* play) {
 
     this->unk_194++;
     
-    bool skipScarecrow = play->msgCtx.msgMode == MSGMODE_OCARINA_PLAYING &&
+    int ocarinaButtonCount = 0;
+    for (int i = RAND_INF_HAS_OCARINA_A; i <= RAND_INF_HAS_OCARINA_C_DOWN; i++) {
+        if (Flags_GetRandomizerInf(i)) {
+            ocarinaButtonCount++;
+        }
+    }
+
+    bool hasTwoOcarinaButtons = !IS_RANDO || ocarinaButtonCount >= 2;
+
+    bool skipScarecrow = hasTwoOcarinaButtons && play->msgCtx.msgMode == MSGMODE_OCARINA_PLAYING &&
                             ((CVarGetInteger("gSkipScarecrow", 0) && gSaveContext.scarecrowSpawnSongSet) ||
                             (IS_RANDO && Randomizer_GetSettingValue(RSK_SKIP_SCARECROWS_SONG)));
 
diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c
index 987c004a0..78b5ee32f 100644
--- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c
+++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c
@@ -12,6 +12,9 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) {
     } else if (CVarGetInteger("gCosmetics.DefaultColorScheme", COLORSCHEME_N64) == COLORSCHEME_GAMECUBE) {
         aButtonColor = (Color_RGB8){ 80, 255, 150 };
     }
+    if (IS_RANDO && !Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_A)) {
+        aButtonColor = (Color_RGB8){ 191, 191, 191 };
+    }
 
     Color_RGB8 cButtonsColor = {255, 255, 50};
     if (CVarGetInteger("gCosmetics.Hud_CButtons.Changed", 0)) {
@@ -21,18 +24,33 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) {
     if (CVarGetInteger("gCosmetics.Hud_CUpButton.Changed", 0)) {
         cUpButtonColor = CVarGetColor24("gCosmetics.Hud_CUpButton.Value", cUpButtonColor);
     }
+    if (IS_RANDO && !Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_UP)) {
+        cUpButtonColor = (Color_RGB8){ 191, 191, 191 };
+    }
+
     Color_RGB8 cDownButtonColor = cButtonsColor;
     if (CVarGetInteger("gCosmetics.Hud_CDownButton.Changed", 0)) {
         cDownButtonColor = CVarGetColor24("gCosmetics.Hud_CDownButton.Value", cDownButtonColor);
     }
+    if (IS_RANDO && !Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_DOWN)) {
+        cDownButtonColor = (Color_RGB8){ 191, 191, 191 };
+    }
+
     Color_RGB8 cLeftButtonColor = cButtonsColor;
     if (CVarGetInteger("gCosmetics.Hud_CLeftButton.Changed", 0)) {
         cLeftButtonColor = CVarGetColor24("gCosmetics.Hud_CLeftButton.Value", cLeftButtonColor);
     }
+    if (IS_RANDO && !Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_LEFT)) {
+        cLeftButtonColor = (Color_RGB8){ 191, 191, 191 };
+    }
+
     Color_RGB8 cRightButtonColor = cButtonsColor;
     if (CVarGetInteger("gCosmetics.Hud_CRightButton.Changed", 0)) {
         cRightButtonColor = CVarGetColor24("gCosmetics.Hud_CRightButton.Value", cRightButtonColor);
     }
+    if (IS_RANDO && !Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_RIGHT)) {
+        cRightButtonColor = (Color_RGB8){ 191, 191, 191 };
+    }
 
     static s16 D_8082A070[][4] = {
         { 255, 0, 0, 255 },

From 8cb06d2d5d50ba989d54efc9d2ce90152e3169fb Mon Sep 17 00:00:00 2001
From: Christopher Leggett <chris@leggett.dev>
Date: Sat, 30 Dec 2023 12:09:46 -0500
Subject: [PATCH 049/230] Fixes some "seed bleed" instances (#3766)

* Should fix seed bleed between multiple saves and loaded spoilers by resetting the Rando::Context before loading a save.

* Only reset for rando saves.
---
 soh/soh/SaveManager.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/soh/soh/SaveManager.cpp b/soh/soh/SaveManager.cpp
index d6f573e65..1c3698e88 100644
--- a/soh/soh/SaveManager.cpp
+++ b/soh/soh/SaveManager.cpp
@@ -2721,6 +2721,11 @@ extern "C" void Save_SaveGlobal(void) {
 }
 
 extern "C" void Save_LoadFile(void) {
+    if (gSaveContext.questId == QUEST_RANDOMIZER) {
+        // Reset rando context for rando saves.
+        OTRGlobals::Instance->gRandoContext.reset();
+        OTRGlobals::Instance->gRandoContext = Rando::Context::CreateInstance();
+    }
     SaveManager::Instance->LoadFile(gSaveContext.fileNum);
 }
 

From dbb1e60734f320a58330d022904296c4010fc498 Mon Sep 17 00:00:00 2001
From: Christopher Leggett <chris@leggett.dev>
Date: Sat, 30 Dec 2023 12:10:31 -0500
Subject: [PATCH 050/230] Fixes some Spoiler Parsing Bugs (#3759)

* Fixes bug causing dropped spoiler not to be parsed.

* Fixes bugs with parsing enabled tricks

* Fixes bugs with parsing excluded locations.

* Fixes bugs parsing the Bombchu Drops setting
---
 .../Enhancements/randomizer/3drando/logic.cpp |   2 +-
 .../randomizer/3drando/spoiler_log.cpp        |   2 +-
 soh/soh/Enhancements/randomizer/context.cpp   |   2 +
 .../Enhancements/randomizer/randomizerTypes.h |   4 +-
 soh/soh/Enhancements/randomizer/settings.cpp  | 383 +++++++++---------
 soh/soh/Enhancements/randomizer/settings.h    |   1 +
 .../ovl_file_choose/z_file_choose.c           |   2 +-
 7 files changed, 203 insertions(+), 193 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/logic.cpp b/soh/soh/Enhancements/randomizer/3drando/logic.cpp
index 120c385bf..bd6508b69 100644
--- a/soh/soh/Enhancements/randomizer/3drando/logic.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/logic.cpp
@@ -616,7 +616,7 @@ namespace Logic {
     FoundBombchus   = (BombchuDrop || Bombchus || Bombchus5 || Bombchus10 || Bombchus20);
     CanPlayBowling  = (ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && FoundBombchus) || (!ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && BombBag);
     // TODO: Implement Ammo Drop Setting in place of bombchu drops
-    HasBombchus     = (BuyBombchus || (ctx->GetOption(RSK_ENABLE_BOMBCHU_DROPS).Is(RO_AMMO_DROPS_ON_PLUS_BOMBCHU) && FoundBombchus));
+    HasBombchus     = (BuyBombchus || (ctx->GetOption(RSK_ENABLE_BOMBCHU_DROPS).Is(RO_AMMO_DROPS_ON/*_PLUS_BOMBCHU*/) && FoundBombchus));
 
     HasExplosives =  Bombs || (ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && HasBombchus);
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
index 1ef83c7ef..fb5b6e591 100644
--- a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
@@ -437,7 +437,7 @@ static void WriteEnabledTricks(tinyxml2::XMLDocument& spoilerLog) {
     if (setting->GetSelectedOptionIndex() != RO_GENERIC_ON/* || !setting->IsCategory(OptionCategory::Setting)*/) {
       continue;
     }
-    jsonData["enabledTricks"].push_back(RemoveLineBreaks(RandomizerTricks::GetRTName((RandomizerTrick)std::stoi(setting->GetName()))).c_str());
+    jsonData["enabledTricks"].push_back(RemoveLineBreaks(setting->GetName()).c_str());
     //auto node = parentNode->InsertNewChildElement("trick");
     //node->SetAttribute("name", RemoveLineBreaks(setting->GetName()).c_str());
   }
diff --git a/soh/soh/Enhancements/randomizer/context.cpp b/soh/soh/Enhancements/randomizer/context.cpp
index 8f4a4b25e..8c2d02dab 100644
--- a/soh/soh/Enhancements/randomizer/context.cpp
+++ b/soh/soh/Enhancements/randomizer/context.cpp
@@ -16,6 +16,8 @@ namespace Rando {
 std::weak_ptr<Context> Context::mContext;
 
 Context::Context() {
+    StaticData::InitItemTable();
+    StaticData::InitLocationTable();
     for (auto& location : StaticData::GetLocationTable()) {
         mSpoilerfileCheckNameToEnum[location.GetName()] = location.GetRandomizerCheck();
     }
diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h
index 95845883f..9cb8d9ef5 100644
--- a/soh/soh/Enhancements/randomizer/randomizerTypes.h
+++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@@ -3641,9 +3641,9 @@ typedef enum {
 
 //Ammo drop settings (on, "on+bombchu", off)
 typedef enum {
-    RO_AMMO_DROPS_ON,
-    RO_AMMO_DROPS_ON_PLUS_BOMBCHU,
     RO_AMMO_DROPS_OFF,
+    //RO_AMMO_DROPS_ON_PLUS_BOMBCHU,
+    RO_AMMO_DROPS_ON,
 } RandoOptionAmmoDrops;
 
 typedef enum {
diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
index 7215415e2..d858bb567 100644
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -197,177 +197,177 @@ void Settings::CreateOptions() {
 
     mExcludeLocationsOptionsGroups.reserve(SPOILER_COLLECTION_GROUP_COUNT);
 
-    mTrickOptions[RT_VISIBLE_COLLISION] = Option::LogicTrick(std::to_string(RT_VISIBLE_COLLISION));
-    mTrickOptions[RT_GROTTOS_WITHOUT_AGONY] = Option::LogicTrick(std::to_string(RT_GROTTOS_WITHOUT_AGONY));
-    mTrickOptions[RT_FEWER_TUNIC_REQUIREMENTS] = Option::LogicTrick(std::to_string(RT_FEWER_TUNIC_REQUIREMENTS));
-    mTrickOptions[RT_RUSTED_SWITCHES] = Option::LogicTrick(std::to_string(RT_RUSTED_SWITCHES));
-    mTrickOptions[RT_FLAMING_CHESTS] = Option::LogicTrick(std::to_string(RT_FLAMING_CHESTS));
-    mTrickOptions[RT_BUNNY_HOOD_JUMPS] = Option::LogicTrick(std::to_string(RT_BUNNY_HOOD_JUMPS));
-    mTrickOptions[RT_DAMAGE_BOOST_SIMPLE] = Option::LogicTrick(std::to_string(RT_DAMAGE_BOOST_SIMPLE));
-    mTrickOptions[RT_HOVER_BOOST_SIMPLE] = Option::LogicTrick(std::to_string(RT_HOVER_BOOST_SIMPLE));
-    mTrickOptions[RT_KF_ADULT_GS] = Option::LogicTrick(std::to_string(RT_KF_ADULT_GS));
-    mTrickOptions[RT_LW_BRIDGE] = Option::LogicTrick(std::to_string(RT_LW_BRIDGE));
-    mTrickOptions[RT_LW_MIDO_BACKFLIP] = Option::LogicTrick(std::to_string(RT_LW_MIDO_BACKFLIP));
-    mTrickOptions[RT_LW_GS_BEAN] = Option::LogicTrick(std::to_string(RT_LW_GS_BEAN));
-    mTrickOptions[RT_HC_STORMS_GS] = Option::LogicTrick(std::to_string(RT_HC_STORMS_GS));
-    mTrickOptions[RT_KAK_MAN_ON_ROOF] = Option::LogicTrick(std::to_string(RT_KAK_MAN_ON_ROOF));
-    mTrickOptions[RT_KAK_TOWER_GS] = Option::LogicTrick(std::to_string(RT_KAK_TOWER_GS));
-    mTrickOptions[RT_KAK_ADULT_WINDMILL_POH] = Option::LogicTrick(std::to_string(RT_KAK_ADULT_WINDMILL_POH));
-    mTrickOptions[RT_KAK_CHILD_WINDMILL_POH] = Option::LogicTrick(std::to_string(RT_KAK_CHILD_WINDMILL_POH));
-    mTrickOptions[RT_KAK_ROOFTOP_GS] = Option::LogicTrick(std::to_string(RT_KAK_ROOFTOP_GS));
-    mTrickOptions[RT_GY_POH] = Option::LogicTrick(std::to_string(RT_GY_POH));
-    mTrickOptions[RT_GY_CHILD_DAMPE_RACE_POH] = Option::LogicTrick(std::to_string(RT_GY_CHILD_DAMPE_RACE_POH));
-    mTrickOptions[RT_GY_SHADOW_FIRE_ARROWS] = Option::LogicTrick(std::to_string(RT_GY_SHADOW_FIRE_ARROWS));
-    mTrickOptions[RT_DMT_SOIL_GS] = Option::LogicTrick(std::to_string(RT_DMT_SOIL_GS));
-    mTrickOptions[RT_DMT_BOMBABLE] = Option::LogicTrick(std::to_string(RT_DMT_BOMBABLE));
-    mTrickOptions[RT_DMT_HOOKSHOT_LOWER_GS] = Option::LogicTrick(std::to_string(RT_DMT_HOOKSHOT_LOWER_GS));
-    mTrickOptions[RT_DMT_HOVERS_LOWER_GS] = Option::LogicTrick(std::to_string(RT_DMT_HOVERS_LOWER_GS));
-    mTrickOptions[RT_DMT_BEAN_LOWER_GS] = Option::LogicTrick(std::to_string(RT_DMT_BEAN_LOWER_GS));
-    mTrickOptions[RT_DMT_JS_LOWER_GS] = Option::LogicTrick(std::to_string(RT_DMT_JS_LOWER_GS));
-    mTrickOptions[RT_DMT_CLIMB_HOVERS] = Option::LogicTrick(std::to_string(RT_DMT_CLIMB_HOVERS));
-    mTrickOptions[RT_DMT_UPPER_GS] = Option::LogicTrick(std::to_string(RT_DMT_UPPER_GS));
-    mTrickOptions[RT_DMT_BOLERO_BIGGORON] = Option::LogicTrick(std::to_string(RT_DMT_BOLERO_BIGGORON));
-    mTrickOptions[RT_GC_POT] = Option::LogicTrick(std::to_string(RT_GC_POT));
-    mTrickOptions[RT_GC_POT_STRENGTH] = Option::LogicTrick(std::to_string(RT_GC_POT_STRENGTH));
-    mTrickOptions[RT_GC_ROLLING_STRENGTH] = Option::LogicTrick(std::to_string(RT_GC_ROLLING_STRENGTH));
-    mTrickOptions[RT_GC_LEFTMOST] = Option::LogicTrick(std::to_string(RT_GC_LEFTMOST));
-    mTrickOptions[RT_GC_GROTTO] = Option::LogicTrick(std::to_string(RT_GC_GROTTO));
-    mTrickOptions[RT_GC_LINK_GORON_DINS] = Option::LogicTrick(std::to_string(RT_GC_LINK_GORON_DINS));
-    mTrickOptions[RT_DMC_HOVER_BEAN_POH] = Option::LogicTrick(std::to_string(RT_DMC_HOVER_BEAN_POH));
-    mTrickOptions[RT_DMC_BOLERO_JUMP] = Option::LogicTrick(std::to_string(RT_DMC_BOLERO_JUMP));
-    mTrickOptions[RT_DMC_BOULDER_JS] = Option::LogicTrick(std::to_string(RT_DMC_BOULDER_JS));
-    mTrickOptions[RT_DMC_BOULDER_SKIP] = Option::LogicTrick(std::to_string(RT_DMC_BOULDER_SKIP));
-    mTrickOptions[RT_ZR_LOWER] = Option::LogicTrick(std::to_string(RT_ZR_LOWER));
-    mTrickOptions[RT_ZR_UPPER] = Option::LogicTrick(std::to_string(RT_ZR_UPPER));
-    mTrickOptions[RT_ZR_HOVERS] = Option::LogicTrick(std::to_string(RT_ZR_HOVERS));
-    mTrickOptions[RT_ZR_CUCCO] = Option::LogicTrick(std::to_string(RT_ZR_CUCCO));
-    mTrickOptions[RT_ZD_KING_ZORA_SKIP] = Option::LogicTrick(std::to_string(RT_ZD_KING_ZORA_SKIP));
-    mTrickOptions[RT_ZD_GS] = Option::LogicTrick(std::to_string(RT_ZD_GS));
-    mTrickOptions[RT_LH_LAB_WALL_GS] = Option::LogicTrick(std::to_string(RT_LH_LAB_WALL_GS));
-    mTrickOptions[RT_LH_LAB_DIVING] = Option::LogicTrick(std::to_string(RT_LH_LAB_DIVING));
-    mTrickOptions[RT_LH_WATER_HOOKSHOT] = Option::LogicTrick(std::to_string(RT_LH_WATER_HOOKSHOT));
-    mTrickOptions[RT_GV_CRATE_HOVERS] = Option::LogicTrick(std::to_string(RT_GV_CRATE_HOVERS));
-    mTrickOptions[RT_GF_KITCHEN] = Option::LogicTrick(std::to_string(RT_GF_KITCHEN));
-    mTrickOptions[RT_GF_JUMP] = Option::LogicTrick(std::to_string(RT_GF_JUMP));
-    mTrickOptions[RT_HW_BUNNY_CROSSING] = Option::LogicTrick(std::to_string(RT_HW_BUNNY_CROSSING));
-    mTrickOptions[RT_HW_CROSSING] = Option::LogicTrick(std::to_string(RT_HW_CROSSING));
-    mTrickOptions[RT_LENS_HW] = Option::LogicTrick(std::to_string(RT_LENS_HW));
-    mTrickOptions[RT_HW_REVERSE] = Option::LogicTrick(std::to_string(RT_HW_REVERSE));
-    mTrickOptions[RT_COLOSSUS_GS] = Option::LogicTrick(std::to_string(RT_COLOSSUS_GS));
-    mTrickOptions[RT_DEKU_BASEMENT_GS] = Option::LogicTrick(std::to_string(RT_DEKU_BASEMENT_GS));
-    mTrickOptions[RT_DEKU_B1_SKIP] = Option::LogicTrick(std::to_string(RT_DEKU_B1_SKIP));
-    mTrickOptions[RT_DEKU_B1_BOW_WEBS] = Option::LogicTrick(std::to_string(RT_DEKU_B1_BOW_WEBS));
-    mTrickOptions[RT_DEKU_MQ_COMPASS_GS] = Option::LogicTrick(std::to_string(RT_DEKU_MQ_COMPASS_GS));
-    mTrickOptions[RT_DEKU_MQ_LOG] = Option::LogicTrick(std::to_string(RT_DEKU_MQ_LOG));
-    mTrickOptions[RT_DC_SCARECROW_GS] = Option::LogicTrick(std::to_string(RT_DC_SCARECROW_GS));
-    mTrickOptions[RT_DC_VINES_GS] = Option::LogicTrick(std::to_string(RT_DC_VINES_GS));
-    mTrickOptions[RT_DC_STAIRCASE] = Option::LogicTrick(std::to_string(RT_DC_STAIRCASE));
-    mTrickOptions[RT_DC_SLINGSHOT_SKIP] = Option::LogicTrick(std::to_string(RT_DC_SLINGSHOT_SKIP));
-    mTrickOptions[RT_DC_SCRUB_ROOM] = Option::LogicTrick(std::to_string(RT_DC_SCRUB_ROOM));
-    mTrickOptions[RT_DC_JUMP] = Option::LogicTrick(std::to_string(RT_DC_JUMP));
-    mTrickOptions[RT_DC_HAMMER_FLOOR] = Option::LogicTrick(std::to_string(RT_DC_HAMMER_FLOOR));
-    mTrickOptions[RT_DC_MQ_CHILD_BOMBS] = Option::LogicTrick(std::to_string(RT_DC_MQ_CHILD_BOMBS));
-    mTrickOptions[RT_DC_MQ_CHILD_EYES] = Option::LogicTrick(std::to_string(RT_DC_MQ_CHILD_EYES));
-    mTrickOptions[RT_DC_MQ_ADULT_EYES] = Option::LogicTrick(std::to_string(RT_DC_MQ_ADULT_EYES));
-    mTrickOptions[RT_JABU_ALCOVE_JUMP_DIVE] = Option::LogicTrick(std::to_string(RT_JABU_ALCOVE_JUMP_DIVE));
-    mTrickOptions[RT_JABU_BOSS_HOVER] = Option::LogicTrick(std::to_string(RT_JABU_BOSS_HOVER));
-    mTrickOptions[RT_JABU_NEAR_BOSS_RANGED] = Option::LogicTrick(std::to_string(RT_JABU_NEAR_BOSS_RANGED));
-    mTrickOptions[RT_JABU_NEAR_BOSS_EXPLOSIVES] = Option::LogicTrick(std::to_string(RT_JABU_NEAR_BOSS_EXPLOSIVES));
-    mTrickOptions[RT_LENS_JABU_MQ] = Option::LogicTrick(std::to_string(RT_LENS_JABU_MQ));
-    mTrickOptions[RT_JABU_MQ_RANG_JUMP] = Option::LogicTrick(std::to_string(RT_JABU_MQ_RANG_JUMP));
-    mTrickOptions[RT_JABU_MQ_SOT_GS] = Option::LogicTrick(std::to_string(RT_JABU_MQ_SOT_GS));
-    mTrickOptions[RT_LENS_BOTW] = Option::LogicTrick(std::to_string(RT_LENS_BOTW));
-    mTrickOptions[RT_BOTW_CHILD_DEADHAND] = Option::LogicTrick(std::to_string(RT_BOTW_CHILD_DEADHAND));
-    mTrickOptions[RT_BOTW_BASEMENT] = Option::LogicTrick(std::to_string(RT_BOTW_BASEMENT));
-    mTrickOptions[RT_BOTW_MQ_PITS] = Option::LogicTrick(std::to_string(RT_BOTW_MQ_PITS));
-    mTrickOptions[RT_BOTW_MQ_DEADHAND_KEY] = Option::LogicTrick(std::to_string(RT_BOTW_MQ_DEADHAND_KEY));
-    mTrickOptions[RT_FOREST_FIRST_GS] = Option::LogicTrick(std::to_string(RT_FOREST_FIRST_GS));
-    mTrickOptions[RT_FOREST_OUTDOORS_EAST_GS] = Option::LogicTrick(std::to_string(RT_FOREST_OUTDOORS_EAST_GS));
-    mTrickOptions[RT_FOREST_VINES] = Option::LogicTrick(std::to_string(RT_FOREST_VINES));
-    mTrickOptions[RT_FOREST_OUTDOORS_LEDGE] = Option::LogicTrick(std::to_string(RT_FOREST_OUTDOORS_LEDGE));
-    mTrickOptions[RT_FOREST_DOORFRAME] = Option::LogicTrick(std::to_string(RT_FOREST_DOORFRAME));
-    mTrickOptions[RT_FOREST_OUTSIDE_BACKDOOR] = Option::LogicTrick(std::to_string(RT_FOREST_OUTSIDE_BACKDOOR));
-    mTrickOptions[RT_FOREST_MQ_WELL_SWIM] = Option::LogicTrick(std::to_string(RT_FOREST_MQ_WELL_SWIM));
-    mTrickOptions[RT_FOREST_MQ_BLOCK_PUZZLE] = Option::LogicTrick(std::to_string(RT_FOREST_MQ_BLOCK_PUZZLE));
-    mTrickOptions[RT_FOREST_MQ_JS_HALLWAY_SWITCH] = Option::LogicTrick(std::to_string(RT_FOREST_MQ_JS_HALLWAY_SWITCH));
-    mTrickOptions[RT_FOREST_MQ_HOOKSHOT_HALLWAY_SWITCH] = Option::LogicTrick(std::to_string(RT_FOREST_MQ_HOOKSHOT_HALLWAY_SWITCH));
-    mTrickOptions[RT_FOREST_MQ_RANG_HALLWAY_SWITCH] = Option::LogicTrick(std::to_string(RT_FOREST_MQ_RANG_HALLWAY_SWITCH));
-    mTrickOptions[RT_FIRE_BOSS_DOOR_JUMP] = Option::LogicTrick(std::to_string(RT_FIRE_BOSS_DOOR_JUMP));
-    mTrickOptions[RT_FIRE_SOT] = Option::LogicTrick(std::to_string(RT_FIRE_SOT));
-    mTrickOptions[RT_FIRE_STRENGTH] = Option::LogicTrick(std::to_string(RT_FIRE_STRENGTH));
-    mTrickOptions[RT_FIRE_SCARECROW] = Option::LogicTrick(std::to_string(RT_FIRE_SCARECROW));
-    mTrickOptions[RT_FIRE_FLAME_MAZE] = Option::LogicTrick(std::to_string(RT_FIRE_FLAME_MAZE));
-    mTrickOptions[RT_FIRE_MQ_NEAR_BOSS] = Option::LogicTrick(std::to_string(RT_FIRE_MQ_NEAR_BOSS));
-    mTrickOptions[RT_FIRE_MQ_BLOCKED_CHEST] = Option::LogicTrick(std::to_string(RT_FIRE_MQ_BLOCKED_CHEST));
-    mTrickOptions[RT_FIRE_MQ_BK_CHEST] = Option::LogicTrick(std::to_string(RT_FIRE_MQ_BK_CHEST));
-    mTrickOptions[RT_FIRE_MQ_CLIMB] = Option::LogicTrick(std::to_string(RT_FIRE_MQ_CLIMB));
-    mTrickOptions[RT_FIRE_MQ_MAZE_SIDE_ROOM] = Option::LogicTrick(std::to_string(RT_FIRE_MQ_MAZE_SIDE_ROOM));
-    mTrickOptions[RT_FIRE_MQ_MAZE_HOVERS] = Option::LogicTrick(std::to_string(RT_FIRE_MQ_MAZE_HOVERS));
-    mTrickOptions[RT_FIRE_MQ_MAZE_JUMP] = Option::LogicTrick(std::to_string(RT_FIRE_MQ_MAZE_JUMP));
-    mTrickOptions[RT_FIRE_MQ_ABOVE_MAZE_GS] = Option::LogicTrick(std::to_string(RT_FIRE_MQ_ABOVE_MAZE_GS));
-    mTrickOptions[RT_FIRE_MQ_FLAME_MAZE] = Option::LogicTrick(std::to_string(RT_FIRE_MQ_FLAME_MAZE));
-    mTrickOptions[RT_WATER_LONGSHOT_TORCH] = Option::LogicTrick(std::to_string(RT_WATER_LONGSHOT_TORCH));
-    mTrickOptions[RT_WATER_CRACKED_WALL_HOVERS] = Option::LogicTrick(std::to_string(RT_WATER_CRACKED_WALL_HOVERS));
-    mTrickOptions[RT_WATER_CRACKED_WALL] = Option::LogicTrick(std::to_string(RT_WATER_CRACKED_WALL));
-    mTrickOptions[RT_WATER_BK_REGION] = Option::LogicTrick(std::to_string(RT_WATER_BK_REGION));
-    mTrickOptions[RT_WATER_NORTH_BASEMENT_LEDGE_JUMP] = Option::LogicTrick(std::to_string(RT_WATER_NORTH_BASEMENT_LEDGE_JUMP));
-    mTrickOptions[RT_WATER_BK_JUMP_DIVE] = Option::LogicTrick(std::to_string(RT_WATER_BK_JUMP_DIVE));
-    mTrickOptions[RT_WATER_FW_CENTRAL_GS] = Option::LogicTrick(std::to_string(RT_WATER_FW_CENTRAL_GS));
-    mTrickOptions[RT_WATER_IRONS_CENTRAL_GS] = Option::LogicTrick(std::to_string(RT_WATER_IRONS_CENTRAL_GS));
-    mTrickOptions[RT_WATER_CENTRAL_BOW] = Option::LogicTrick(std::to_string(RT_WATER_CENTRAL_BOW));
-    mTrickOptions[RT_WATER_HOOKSHOT_FALLING_PLATFORM_GS] = Option::LogicTrick(std::to_string(RT_WATER_HOOKSHOT_FALLING_PLATFORM_GS));
-    mTrickOptions[RT_WATER_RANG_FALLING_PLATFORM_GS] = Option::LogicTrick(std::to_string(RT_WATER_RANG_FALLING_PLATFORM_GS));
-    mTrickOptions[RT_WATER_RIVER_GS] = Option::LogicTrick(std::to_string(RT_WATER_RIVER_GS));
-    mTrickOptions[RT_WATER_DRAGON_JUMP_DIVE] = Option::LogicTrick(std::to_string(RT_WATER_DRAGON_JUMP_DIVE));
-    mTrickOptions[RT_WATER_ADULT_DRAGON] = Option::LogicTrick(std::to_string(RT_WATER_ADULT_DRAGON));
-    mTrickOptions[RT_WATER_CHILD_DRAGON] = Option::LogicTrick(std::to_string(RT_WATER_CHILD_DRAGON));
-    mTrickOptions[RT_WATER_MQ_CENTRAL_PILLAR] = Option::LogicTrick(std::to_string(RT_WATER_MQ_CENTRAL_PILLAR));
-    mTrickOptions[RT_WATER_MQ_LOCKED_GS] = Option::LogicTrick(std::to_string(RT_WATER_MQ_LOCKED_GS));
-    mTrickOptions[RT_LENS_SHADOW] = Option::LogicTrick(std::to_string(RT_LENS_SHADOW));
-    mTrickOptions[RT_LENS_SHADOW_PLATFORM] = Option::LogicTrick(std::to_string(RT_LENS_SHADOW_PLATFORM));
-    mTrickOptions[RT_LENS_BONGO] = Option::LogicTrick(std::to_string(RT_LENS_BONGO));
-    mTrickOptions[RT_SHADOW_UMBRELLA] = Option::LogicTrick(std::to_string(RT_SHADOW_UMBRELLA));
-    mTrickOptions[RT_SHADOW_UMBRELLA_GS] = Option::LogicTrick(std::to_string(RT_SHADOW_UMBRELLA_GS));
-    mTrickOptions[RT_SHADOW_FREESTANDING_KEY] = Option::LogicTrick(std::to_string(RT_SHADOW_FREESTANDING_KEY));
-    mTrickOptions[RT_SHADOW_STATUE] = Option::LogicTrick(std::to_string(RT_SHADOW_STATUE));
-    mTrickOptions[RT_SHADOW_BONGO] = Option::LogicTrick(std::to_string(RT_SHADOW_BONGO));
-    mTrickOptions[RT_LENS_SHADOW_MQ] = Option::LogicTrick(std::to_string(RT_LENS_SHADOW_MQ));
-    mTrickOptions[RT_LENS_SHADOW_MQ_INVISIBLE_BLADES] = Option::LogicTrick(std::to_string(RT_LENS_SHADOW_MQ_INVISIBLE_BLADES));
-    mTrickOptions[RT_LENS_SHADOW_MQ_PLATFORM] = Option::LogicTrick(std::to_string(RT_LENS_SHADOW_MQ_PLATFORM));
-    mTrickOptions[RT_LENS_SHADOW_MQ_DEADHAND] = Option::LogicTrick(std::to_string(RT_LENS_SHADOW_MQ_DEADHAND));
-    mTrickOptions[RT_SHADOW_MQ_GAP] = Option::LogicTrick(std::to_string(RT_SHADOW_MQ_GAP));
-    mTrickOptions[RT_SHADOW_MQ_INVISIBLE_BLADES] = Option::LogicTrick(std::to_string(RT_SHADOW_MQ_INVISIBLE_BLADES));
-    mTrickOptions[RT_SHADOW_MQ_HUGE_PIT] = Option::LogicTrick(std::to_string(RT_SHADOW_MQ_HUGE_PIT));
-    mTrickOptions[RT_SHADOW_MQ_WINDY_WALKWAY] = Option::LogicTrick(std::to_string(RT_SHADOW_MQ_WINDY_WALKWAY));
-    mTrickOptions[RT_LENS_SPIRIT] = Option::LogicTrick(std::to_string(RT_LENS_SPIRIT));
-    mTrickOptions[RT_SPIRIT_CHILD_CHU] = Option::LogicTrick(std::to_string(RT_SPIRIT_CHILD_CHU));
-    mTrickOptions[RT_SPIRIT_LOBBY_GS] = Option::LogicTrick(std::to_string(RT_SPIRIT_LOBBY_GS));
-    mTrickOptions[RT_SPIRIT_LOWER_ADULT_SWITCH] = Option::LogicTrick(std::to_string(RT_SPIRIT_LOWER_ADULT_SWITCH));
-    mTrickOptions[RT_SPIRIT_LOBBY_JUMP] = Option::LogicTrick(std::to_string(RT_SPIRIT_LOBBY_JUMP));
-    mTrickOptions[RT_SPIRIT_PLATFORM_HOOKSHOT] = Option::LogicTrick(std::to_string(RT_SPIRIT_PLATFORM_HOOKSHOT));
-    mTrickOptions[RT_SPIRIT_MAP_CHEST] = Option::LogicTrick(std::to_string(RT_SPIRIT_MAP_CHEST));
-    mTrickOptions[RT_SPIRIT_SUN_CHEST] = Option::LogicTrick(std::to_string(RT_SPIRIT_SUN_CHEST));
-    mTrickOptions[RT_SPIRIT_WALL] = Option::LogicTrick(std::to_string(RT_SPIRIT_WALL));
-    mTrickOptions[RT_LENS_SPIRIT_MQ] = Option::LogicTrick(std::to_string(RT_LENS_SPIRIT_MQ));
-    mTrickOptions[RT_SPIRIT_MQ_SUN_BLOCK_SOT] = Option::LogicTrick(std::to_string(RT_SPIRIT_MQ_SUN_BLOCK_SOT));
-    mTrickOptions[RT_SPIRIT_MQ_SUN_BLOCK_GS] = Option::LogicTrick(std::to_string(RT_SPIRIT_MQ_SUN_BLOCK_GS));
-    mTrickOptions[RT_SPIRIT_MQ_LOWER_ADULT] = Option::LogicTrick(std::to_string(RT_SPIRIT_MQ_LOWER_ADULT));
-    mTrickOptions[RT_SPIRIT_MQ_FROZEN_EYE] = Option::LogicTrick(std::to_string(RT_SPIRIT_MQ_FROZEN_EYE));
-    mTrickOptions[RT_ICE_BLOCK_GS] = Option::LogicTrick(std::to_string(RT_ICE_BLOCK_GS));
-    mTrickOptions[RT_ICE_MQ_RED_ICE_GS] = Option::LogicTrick(std::to_string(RT_ICE_MQ_RED_ICE_GS));
-    mTrickOptions[RT_ICE_MQ_SCARECROW] = Option::LogicTrick(std::to_string(RT_ICE_MQ_SCARECROW));
-    mTrickOptions[RT_LENS_GTG] = Option::LogicTrick(std::to_string(RT_LENS_GTG));
-    mTrickOptions[RT_GTG_WITHOUT_HOOKSHOT] = Option::LogicTrick(std::to_string(RT_GTG_WITHOUT_HOOKSHOT));
-    mTrickOptions[RT_GTG_FAKE_WALL] = Option::LogicTrick(std::to_string(RT_GTG_FAKE_WALL));
-    mTrickOptions[RT_LENS_GTG_MQ] = Option::LogicTrick(std::to_string(RT_LENS_GTG_MQ));
-    mTrickOptions[RT_GTG_MQ_WITH_HOOKSHOT] = Option::LogicTrick(std::to_string(RT_GTG_MQ_WITH_HOOKSHOT));
-    mTrickOptions[RT_GTG_MQ_WIHTOUT_HOOKSHOT] = Option::LogicTrick(std::to_string(RT_GTG_MQ_WIHTOUT_HOOKSHOT));
-    mTrickOptions[RT_LENS_GANON] = Option::LogicTrick(std::to_string(RT_LENS_GANON));
-    mTrickOptions[RT_GANON_SPIRIT_TRIAL_HOOKSHOT] = Option::LogicTrick(std::to_string(RT_GANON_SPIRIT_TRIAL_HOOKSHOT));
-    mTrickOptions[RT_LENS_GANON_MQ] = Option::LogicTrick(std::to_string(RT_LENS_GANON_MQ));
-    mTrickOptions[RT_GANON_MQ_FIRE_TRIAL] = Option::LogicTrick(std::to_string(RT_GANON_MQ_FIRE_TRIAL));
-    mTrickOptions[RT_GANON_MQ_SHADOW_TRIAL] = Option::LogicTrick(std::to_string(RT_GANON_MQ_SHADOW_TRIAL));
-    mTrickOptions[RT_GANON_MQ_LIGHT_TRIAL] = Option::LogicTrick(std::to_string(RT_GANON_MQ_LIGHT_TRIAL));
+    mTrickOptions[RT_VISIBLE_COLLISION] = Option::LogicTrick("Pass Through Visible One-Way Collision");
+    mTrickOptions[RT_GROTTOS_WITHOUT_AGONY] = Option::LogicTrick("Hidden Grottos without Stone of Agony");
+    mTrickOptions[RT_FEWER_TUNIC_REQUIREMENTS] = Option::LogicTrick("Fewer Tunic Requirements");
+    mTrickOptions[RT_RUSTED_SWITCHES] = Option::LogicTrick("Hammer Rusted Switches Through Walls");
+    mTrickOptions[RT_FLAMING_CHESTS] = Option::LogicTrick("Flaming Chests");
+    mTrickOptions[RT_BUNNY_HOOD_JUMPS] = Option::LogicTrick("Bunny Hood Jumps");
+    mTrickOptions[RT_DAMAGE_BOOST_SIMPLE] = Option::LogicTrick("Simple damage boosts");
+    mTrickOptions[RT_HOVER_BOOST_SIMPLE] = Option::LogicTrick("Simple hover boosts");
+    mTrickOptions[RT_KF_ADULT_GS] = Option::LogicTrick("Adult Kokiri Forest GS with Hover Boots");
+    mTrickOptions[RT_LW_BRIDGE] = Option::LogicTrick("Jump onto the Lost Woods Bridge as Adult with Nothing");
+    mTrickOptions[RT_LW_MIDO_BACKFLIP] = Option::LogicTrick("Backflip over Mido as Adult");
+    mTrickOptions[RT_LW_GS_BEAN] = Option::LogicTrick("Lost Woods Adult GS without Bean");
+    mTrickOptions[RT_HC_STORMS_GS] = Option::LogicTrick("Hyrule Castle Storms Grotto GS with Just Boomerang");
+    mTrickOptions[RT_KAK_MAN_ON_ROOF] = Option::LogicTrick("Man on Roof without Hookshot");
+    mTrickOptions[RT_KAK_TOWER_GS] = Option::LogicTrick("Kakariko Tower GS with Jump Slash");
+    mTrickOptions[RT_KAK_ADULT_WINDMILL_POH] = Option::LogicTrick("Windmill PoH as Adult with Nothing");
+    mTrickOptions[RT_KAK_CHILD_WINDMILL_POH] = Option::LogicTrick("Windmill PoH as Child with Precise Jump Slash");
+    mTrickOptions[RT_KAK_ROOFTOP_GS] = Option::LogicTrick("Kakariko Rooftop GS with Hover Boots");
+    mTrickOptions[RT_GY_POH] = Option::LogicTrick("Graveyard Freestanding PoH with Boomerang");
+    mTrickOptions[RT_GY_CHILD_DAMPE_RACE_POH] = Option::LogicTrick("Second Dampe Race as Child");
+    mTrickOptions[RT_GY_SHADOW_FIRE_ARROWS] = Option::LogicTrick("Shadow Temple Entry with Fire Arrows");
+    mTrickOptions[RT_DMT_SOIL_GS] = Option::LogicTrick("Death Mountain Trail Soil GS without Destroying Boulder");
+    mTrickOptions[RT_DMT_BOMBABLE] = Option::LogicTrick("Death Mountain Trail Chest with Strength");
+    mTrickOptions[RT_DMT_HOOKSHOT_LOWER_GS] = Option::LogicTrick("Death Mountain Trail Lower Red Rock GS with Hookshot");
+    mTrickOptions[RT_DMT_HOVERS_LOWER_GS] = Option::LogicTrick("Death Mountain Trail Lower Red Rock GS with Hover Boots");
+    mTrickOptions[RT_DMT_BEAN_LOWER_GS] = Option::LogicTrick("Death Mountain Trail Lower Red Rock GS with Magic Bean");
+    mTrickOptions[RT_DMT_JS_LOWER_GS] = Option::LogicTrick("Death Mountain Trail Lower Red Rock GS with Jump Slash");
+    mTrickOptions[RT_DMT_CLIMB_HOVERS] = Option::LogicTrick("Death Mountain Trail Climb with Hover Boots");
+    mTrickOptions[RT_DMT_UPPER_GS] = Option::LogicTrick("Death Mountain Trail Upper Red Rock GS without Hammer");
+    mTrickOptions[RT_DMT_BOLERO_BIGGORON] = Option::LogicTrick("Deliver Eye Drops with Bolero of Fire");
+    mTrickOptions[RT_GC_POT] = Option::LogicTrick("Goron City Spinning Pot PoH with Bombchu");
+    mTrickOptions[RT_GC_POT_STRENGTH] = Option::LogicTrick("Goron City Spinning Pot PoH with Strength");
+    mTrickOptions[RT_GC_ROLLING_STRENGTH] = Option::LogicTrick("Rolling Goron (Hot Rodder Goron) as Child with Strength");
+    mTrickOptions[RT_GC_LEFTMOST] = Option::LogicTrick("Goron City Maze Left Chest with Hover Boots");
+    mTrickOptions[RT_GC_GROTTO] = Option::LogicTrick("Goron City Grotto with Hookshot While Taking Damage");
+    mTrickOptions[RT_GC_LINK_GORON_DINS] = Option::LogicTrick("Stop Link the Goron with Din\'s Fire");
+    mTrickOptions[RT_DMC_HOVER_BEAN_POH] = Option::LogicTrick("Crater\'s Bean PoH with Hover Boots");
+    mTrickOptions[RT_DMC_BOLERO_JUMP] = Option::LogicTrick("Death Mountain Crater Jump to Bolero");
+    mTrickOptions[RT_DMC_BOULDER_JS] = Option::LogicTrick("Death Mountain Crater Upper to Lower with Hammer");
+    mTrickOptions[RT_DMC_BOULDER_SKIP] = Option::LogicTrick("Death Mountain Crater Upper to Lower Boulder Skip");
+    mTrickOptions[RT_ZR_LOWER] = Option::LogicTrick("Zora\'s River Lower Freestanding PoH as Adult with Nothing");
+    mTrickOptions[RT_ZR_UPPER] = Option::LogicTrick("Zora\'s River Upper Freestanding PoH as Adult with Nothing");
+    mTrickOptions[RT_ZR_HOVERS] = Option::LogicTrick("Zora\'s Domain Entry with Hover Boots");
+    mTrickOptions[RT_ZR_CUCCO] = Option::LogicTrick("Zora\'s Domain Entry with Cucco");
+    mTrickOptions[RT_ZD_KING_ZORA_SKIP] = Option::LogicTrick("Skip King Zora as Adult with Nothing");
+    mTrickOptions[RT_ZD_GS] = Option::LogicTrick("Zora\'s Domain GS with No Additional Items");
+    mTrickOptions[RT_LH_LAB_WALL_GS] = Option::LogicTrick("Lake Hylia Lab Wall GS with Jump Slash");
+    mTrickOptions[RT_LH_LAB_DIVING] = Option::LogicTrick("Lake Hylia Lab Dive without Gold Scale");
+    mTrickOptions[RT_LH_WATER_HOOKSHOT] = Option::LogicTrick("Water Temple Entry without Iron Boots using Hookshot");
+    mTrickOptions[RT_GV_CRATE_HOVERS] = Option::LogicTrick("Gerudo Valley Crate PoH as Adult with Hover Boots");
+    mTrickOptions[RT_GF_KITCHEN] = Option::LogicTrick("Thieves\' Hideout \"Kitchen\" with No Additional Items");
+    mTrickOptions[RT_GF_JUMP] = Option::LogicTrick("Gerudo\'s Fortress Ledge Jumps");
+    mTrickOptions[RT_HW_BUNNY_CROSSING] = Option::LogicTrick("Wasteland Crossing with Bunny Hood");
+    mTrickOptions[RT_HW_CROSSING] = Option::LogicTrick("Wasteland Crossing without Hover Boots or Longshot");
+    mTrickOptions[RT_LENS_HW] = Option::LogicTrick("Lensless Wasteland");
+    mTrickOptions[RT_HW_REVERSE] = Option::LogicTrick("Reverse Wasteland");
+    mTrickOptions[RT_COLOSSUS_GS] = Option::LogicTrick("Colossus Hill GS with Hookshot");
+    mTrickOptions[RT_DEKU_BASEMENT_GS] = Option::LogicTrick("Deku Tree Basement Vines GS with Jump Slash");
+    mTrickOptions[RT_DEKU_B1_SKIP] = Option::LogicTrick("Deku Tree Basement without Slingshot");
+    mTrickOptions[RT_DEKU_B1_BOW_WEBS] = Option::LogicTrick("Deku Tree Basement Web to Gohma with Bow");
+    mTrickOptions[RT_DEKU_MQ_COMPASS_GS] = Option::LogicTrick("Deku Tree MQ Compass Room GS Boulders with Just Hammer");
+    mTrickOptions[RT_DEKU_MQ_LOG] = Option::LogicTrick("Deku Tree MQ Roll Under the Spiked Log");
+    mTrickOptions[RT_DC_SCARECROW_GS] = Option::LogicTrick("Dodongo\'s Cavern Scarecrow GS with Armos Statue");
+    mTrickOptions[RT_DC_VINES_GS] = Option::LogicTrick("Dodongo\'s Cavern Vines GS from Below with Longshot");
+    mTrickOptions[RT_DC_STAIRCASE] = Option::LogicTrick("Dodongo\'s Cavern Staircase with Bow");
+    mTrickOptions[RT_DC_SLINGSHOT_SKIP] = Option::LogicTrick("Dodongo\'s Cavern Child Slingshot Skips");
+    mTrickOptions[RT_DC_SCRUB_ROOM] = Option::LogicTrick("Dodongo\'s Cavern Two Scrub Room with Strength");
+    mTrickOptions[RT_DC_JUMP] = Option::LogicTrick("Dodongo\'s Cavern Spike Trap Room Jump without Hover Boots");
+    mTrickOptions[RT_DC_HAMMER_FLOOR] = Option::LogicTrick("Dodongo\'s Cavern Smash the Boss Lobby Floor");
+    mTrickOptions[RT_DC_MQ_CHILD_BOMBS] = Option::LogicTrick("Dodongo\'s Cavern MQ Early Bomb Bag Area as Child");
+    mTrickOptions[RT_DC_MQ_CHILD_EYES] = Option::LogicTrick("Dodongo\'s Cavern MQ Light the Eyes with Strength as Child");
+    mTrickOptions[RT_DC_MQ_ADULT_EYES] = Option::LogicTrick("Dodongo\'s Cavern MQ Light the Eyes with Strength as Adult");
+    mTrickOptions[RT_JABU_ALCOVE_JUMP_DIVE] = Option::LogicTrick("Jabu Underwater Alcove as Adult with Jump Dive");
+    mTrickOptions[RT_JABU_BOSS_HOVER] = Option::LogicTrick("Jabu Near Boss Room with Hover Boots");
+    mTrickOptions[RT_JABU_NEAR_BOSS_RANGED] = Option::LogicTrick("Jabu Near Boss Ceiling Switch/GS without Boomerang or Explosives");
+    mTrickOptions[RT_JABU_NEAR_BOSS_EXPLOSIVES] = Option::LogicTrick("Jabu Near Boss Ceiling Switch with Explosives");
+    mTrickOptions[RT_LENS_JABU_MQ] = Option::LogicTrick("Jabu MQ without Lens of Truth");
+    mTrickOptions[RT_JABU_MQ_RANG_JUMP] = Option::LogicTrick("Jabu MQ Compass Chest with Boomerang");
+    mTrickOptions[RT_JABU_MQ_SOT_GS] = Option::LogicTrick("Jabu MQ Song of Time Block GS with Boomerang");
+    mTrickOptions[RT_LENS_BOTW] = Option::LogicTrick("Bottom of the Well without Lens of Truth");
+    mTrickOptions[RT_BOTW_CHILD_DEADHAND] = Option::LogicTrick("Child Dead Hand without Kokiri Sword");
+    mTrickOptions[RT_BOTW_BASEMENT] = Option::LogicTrick("Bottom of the Well Map Chest with Strength & Sticks");
+    mTrickOptions[RT_BOTW_MQ_PITS] = Option::LogicTrick("Bottom of the Well MQ Jump Over the Pits");
+    mTrickOptions[RT_BOTW_MQ_DEADHAND_KEY] = Option::LogicTrick("Bottom of the Well MQ Dead Hand Freestanding Key with Boomerang");
+    mTrickOptions[RT_FOREST_FIRST_GS] = Option::LogicTrick("Forest Temple First Room GS with Difficult-to-Use Weapons");
+    mTrickOptions[RT_FOREST_OUTDOORS_EAST_GS] = Option::LogicTrick("Forest Temple East Courtyard GS with Boomerang");
+    mTrickOptions[RT_FOREST_VINES] = Option::LogicTrick("Forest Temple East Courtyard Vines with Hookshot");
+    mTrickOptions[RT_FOREST_OUTDOORS_LEDGE] = Option::LogicTrick("Forest Temple NE Outdoors Ledge with Hover Boots");
+    mTrickOptions[RT_FOREST_DOORFRAME] = Option::LogicTrick("Forest Temple East Courtyard Door Frame with Hover Boots");
+    mTrickOptions[RT_FOREST_OUTSIDE_BACKDOOR] = Option::LogicTrick("Forest Temple Outside Backdoor with Jump Slash");
+    mTrickOptions[RT_FOREST_MQ_WELL_SWIM] = Option::LogicTrick("Swim Through Forest Temple MQ Well with Hookshot");
+    mTrickOptions[RT_FOREST_MQ_BLOCK_PUZZLE] = Option::LogicTrick("Skip Forest Temple MQ Block Puzzle with Bombchu");
+    mTrickOptions[RT_FOREST_MQ_JS_HALLWAY_SWITCH] = Option::LogicTrick("Forest Temple MQ Twisted Hallway Switch with Jump Slash");
+    mTrickOptions[RT_FOREST_MQ_HOOKSHOT_HALLWAY_SWITCH] = Option::LogicTrick("Forest Temple MQ Twisted Hallway Switch with Hookshot");
+    mTrickOptions[RT_FOREST_MQ_RANG_HALLWAY_SWITCH] = Option::LogicTrick("Forest Temple MQ Twisted Hallway Switch with Boomerang");
+    mTrickOptions[RT_FIRE_BOSS_DOOR_JUMP] = Option::LogicTrick("Fire Temple Boss Door without Hover Boots or Pillar");
+    mTrickOptions[RT_FIRE_SOT] = Option::LogicTrick("Fire Temple Song of Time Room GS without Song of Time");
+    mTrickOptions[RT_FIRE_STRENGTH] = Option::LogicTrick("Fire Temple Climb without Strength");
+    mTrickOptions[RT_FIRE_SCARECROW] = Option::LogicTrick("Fire Temple East Tower without Scarecrow\'s Song");
+    mTrickOptions[RT_FIRE_FLAME_MAZE] = Option::LogicTrick("Fire Temple Flame Wall Maze Skip");
+    mTrickOptions[RT_FIRE_MQ_NEAR_BOSS] = Option::LogicTrick("Fire Temple MQ Chest Near Boss without Breaking Crate");
+    mTrickOptions[RT_FIRE_MQ_BLOCKED_CHEST] = Option::LogicTrick("Fire Temple MQ Big Lava Room Blocked Door without Hookshot");
+    mTrickOptions[RT_FIRE_MQ_BK_CHEST] = Option::LogicTrick("Fire Temple MQ Boss Key Chest without Bow");
+    mTrickOptions[RT_FIRE_MQ_CLIMB] = Option::LogicTrick("Fire Temple MQ Climb without Fire Source");
+    mTrickOptions[RT_FIRE_MQ_MAZE_SIDE_ROOM] = Option::LogicTrick("Fire Temple MQ Lizalfos Maze Side Room without Box");
+    mTrickOptions[RT_FIRE_MQ_MAZE_HOVERS] = Option::LogicTrick("Fire Temple MQ Lower to Upper Lizalfos Maze with Hover Boots");
+    mTrickOptions[RT_FIRE_MQ_MAZE_JUMP] = Option::LogicTrick("Fire Temple MQ Lower to Upper Lizalfos Maze with Precise Jump");
+    mTrickOptions[RT_FIRE_MQ_ABOVE_MAZE_GS] = Option::LogicTrick("Fire Temple MQ Above Flame Wall Maze GS from Below with Longshot");
+    mTrickOptions[RT_FIRE_MQ_FLAME_MAZE] = Option::LogicTrick("Fire Temple MQ Flame Wall Maze Skip");
+    mTrickOptions[RT_WATER_LONGSHOT_TORCH] = Option::LogicTrick("Water Temple Torch Longshot");
+    mTrickOptions[RT_WATER_CRACKED_WALL_HOVERS] = Option::LogicTrick("Water Temple Cracked Wall with Hover Boots");
+    mTrickOptions[RT_WATER_CRACKED_WALL] = Option::LogicTrick("Water Temple Cracked Wall with No Additional Items");
+    mTrickOptions[RT_WATER_BK_REGION] = Option::LogicTrick("Water Temple Boss Key Region with Hover Boots");
+    mTrickOptions[RT_WATER_NORTH_BASEMENT_LEDGE_JUMP] = Option::LogicTrick("Water Temple North Basement Ledge with Precise Jump");
+    mTrickOptions[RT_WATER_BK_JUMP_DIVE] = Option::LogicTrick("Water Temple Boss Key Jump Dive");
+    mTrickOptions[RT_WATER_FW_CENTRAL_GS] = Option::LogicTrick("Water Temple Central Pillar GS with Farore\'s Wind");
+    mTrickOptions[RT_WATER_IRONS_CENTRAL_GS] = Option::LogicTrick("Water Temple Central Pillar GS with Iron Boots");
+    mTrickOptions[RT_WATER_CENTRAL_BOW] = Option::LogicTrick("Water Temple Central Bow Target without Longshot or Hover Boots");
+    mTrickOptions[RT_WATER_HOOKSHOT_FALLING_PLATFORM_GS] = Option::LogicTrick("Water Temple Falling Platform Room GS with Hookshot");
+    mTrickOptions[RT_WATER_RANG_FALLING_PLATFORM_GS] = Option::LogicTrick("Water Temple Falling Platform Room GS with Boomerang");
+    mTrickOptions[RT_WATER_RIVER_GS] = Option::LogicTrick("Water Temple River GS without Iron Boots");
+    mTrickOptions[RT_WATER_DRAGON_JUMP_DIVE] = Option::LogicTrick("Water Temple Dragon Statue Jump Dive");
+    mTrickOptions[RT_WATER_ADULT_DRAGON] = Option::LogicTrick("Water Temple Dragon Statue Switch from Above the Water as Adult");
+    mTrickOptions[RT_WATER_CHILD_DRAGON] = Option::LogicTrick("Water Temple Dragon Statue Switch from Above the Water as Child");
+    mTrickOptions[RT_WATER_MQ_CENTRAL_PILLAR] = Option::LogicTrick("Water Temple MQ Central Pillar with Fire Arrows");
+    mTrickOptions[RT_WATER_MQ_LOCKED_GS] = Option::LogicTrick("Water Temple MQ North Basement GS without Small Key");
+    mTrickOptions[RT_LENS_SHADOW] = Option::LogicTrick("Shadow Temple Stationary Objects without Lens of Truth");
+    mTrickOptions[RT_LENS_SHADOW_PLATFORM] = Option::LogicTrick("Shadow Temple Invisible Moving Platform without Lens of Truth");
+    mTrickOptions[RT_LENS_BONGO] = Option::LogicTrick("Shadow Temple Bongo Bongo without Lens of Truth");
+    mTrickOptions[RT_SHADOW_UMBRELLA] = Option::LogicTrick("Shadow Temple Stone Umbrella Skip");
+    mTrickOptions[RT_SHADOW_UMBRELLA_GS] = Option::LogicTrick("Shadow Temple Falling Spikes GS with Hover Boots");
+    mTrickOptions[RT_SHADOW_FREESTANDING_KEY] = Option::LogicTrick("Shadow Temple Freestanding Key with Bombchu");
+    mTrickOptions[RT_SHADOW_STATUE] = Option::LogicTrick("Shadow Temple River Statue with Bombchu");
+    mTrickOptions[RT_SHADOW_BONGO] = Option::LogicTrick("Shadow Temple Bongo Bongo without projectiles");
+    mTrickOptions[RT_LENS_SHADOW_MQ] = Option::LogicTrick("Shadow Temple MQ Stationary Objects without Lens of Truth");
+    mTrickOptions[RT_LENS_SHADOW_MQ_INVISIBLE_BLADES] = Option::LogicTrick("Shadow Temple MQ Invisible Blades Silver Rupees without Lens of Truth");
+    mTrickOptions[RT_LENS_SHADOW_MQ_PLATFORM] = Option::LogicTrick("Shadow Temple MQ Invisible Moving Platform without Lens of Truth");
+    mTrickOptions[RT_LENS_SHADOW_MQ_DEADHAND] = Option::LogicTrick("Shadow Temple MQ 2nd Dead Hand without Lens of Truth");
+    mTrickOptions[RT_SHADOW_MQ_GAP] = Option::LogicTrick("Shadow Temple MQ Truth Spinner Gap with Longshot");
+    mTrickOptions[RT_SHADOW_MQ_INVISIBLE_BLADES] = Option::LogicTrick("Shadow Temple MQ Invisible Blades without Song of Time");
+    mTrickOptions[RT_SHADOW_MQ_HUGE_PIT] = Option::LogicTrick("Shadow Temple MQ Lower Huge Pit without Fire Source");
+    mTrickOptions[RT_SHADOW_MQ_WINDY_WALKWAY] = Option::LogicTrick("Shadow Temple MQ Windy Walkway Reverse without Hover Boots");
+    mTrickOptions[RT_LENS_SPIRIT] = Option::LogicTrick("Spirit Temple without Lens of Truth");
+    mTrickOptions[RT_SPIRIT_CHILD_CHU] = Option::LogicTrick("Spirit Temple Child Side Bridge with Bombchu");
+    mTrickOptions[RT_SPIRIT_LOBBY_GS] = Option::LogicTrick("Spirit Temple Main Room GS with Boomerang");
+    mTrickOptions[RT_SPIRIT_LOWER_ADULT_SWITCH] = Option::LogicTrick("Spirit Temple Lower Adult Switch with Bombs");
+    mTrickOptions[RT_SPIRIT_LOBBY_JUMP] = Option::LogicTrick("Spirit Temple Main Room Jump from Hands to Upper Ledges");
+    mTrickOptions[RT_SPIRIT_PLATFORM_HOOKSHOT] = Option::LogicTrick("Spirit Temple Main Room Hookshot to Boss Platform");
+    mTrickOptions[RT_SPIRIT_MAP_CHEST] = Option::LogicTrick("Spirit Temple Map Chest with Bow");
+    mTrickOptions[RT_SPIRIT_SUN_CHEST] = Option::LogicTrick("Spirit Temple Sun Block Room Chest with Bow");
+    mTrickOptions[RT_SPIRIT_WALL] = Option::LogicTrick("Spirit Temple Shifting Wall with No Additional Items");
+    mTrickOptions[RT_LENS_SPIRIT_MQ] = Option::LogicTrick("Spirit Temple MQ without Lens of Truth");
+    mTrickOptions[RT_SPIRIT_MQ_SUN_BLOCK_SOT] = Option::LogicTrick("Spirit Temple MQ Sun Block Room as Child without Song of Time");
+    mTrickOptions[RT_SPIRIT_MQ_SUN_BLOCK_GS] = Option::LogicTrick("Spirit Temple MQ Sun Block Room GS with Boomerang");
+    mTrickOptions[RT_SPIRIT_MQ_LOWER_ADULT] = Option::LogicTrick("Spirit Temple MQ Lower Adult without Fire Arrows");
+    mTrickOptions[RT_SPIRIT_MQ_FROZEN_EYE] = Option::LogicTrick("Spirit Temple MQ Frozen Eye Switch without Fire");
+    mTrickOptions[RT_ICE_BLOCK_GS] = Option::LogicTrick("Ice Cavern Block Room GS with Hover Boots");
+    mTrickOptions[RT_ICE_MQ_RED_ICE_GS] = Option::LogicTrick("Ice Cavern MQ Red Ice GS without Song of Time");
+    mTrickOptions[RT_ICE_MQ_SCARECROW] = Option::LogicTrick("Ice Cavern MQ Scarecrow GS with No Additional Items");
+    mTrickOptions[RT_LENS_GTG] = Option::LogicTrick("Gerudo Training Ground without Lens of Truth");
+    mTrickOptions[RT_GTG_WITHOUT_HOOKSHOT] = Option::LogicTrick("Gerudo Training Ground Left Side Silver Rupees without Hookshot");
+    mTrickOptions[RT_GTG_FAKE_WALL] = Option::LogicTrick("Reach Gerudo Training Ground Fake Wall Ledge with Hover Boots");
+    mTrickOptions[RT_LENS_GTG_MQ] = Option::LogicTrick("Gerudo Training Ground MQ without Lens of Truth");
+    mTrickOptions[RT_GTG_MQ_WITH_HOOKSHOT] = Option::LogicTrick("Gerudo Training Ground MQ Left Side Silver Rupees with Hookshot");
+    mTrickOptions[RT_GTG_MQ_WIHTOUT_HOOKSHOT] = Option::LogicTrick("Gerudo Training Ground MQ Left Side Silver Rupees without Hookshot");
+    mTrickOptions[RT_LENS_GANON] = Option::LogicTrick("Ganon\'s Castle without Lens of Truth");
+    mTrickOptions[RT_GANON_SPIRIT_TRIAL_HOOKSHOT] = Option::LogicTrick("Spirit Trial without Hookshot");
+    mTrickOptions[RT_LENS_GANON_MQ] = Option::LogicTrick("Ganon\'s Castle MQ without Lens of Truth");
+    mTrickOptions[RT_GANON_MQ_FIRE_TRIAL] = Option::LogicTrick("Fire Trial MQ with Hookshot");
+    mTrickOptions[RT_GANON_MQ_SHADOW_TRIAL] = Option::LogicTrick("Shadow Trial MQ Torch with Bow");
+    mTrickOptions[RT_GANON_MQ_LIGHT_TRIAL] = Option::LogicTrick("Light Trial MQ without Hookshot");
 
     mOptionGroups[RSG_LOGIC] = OptionGroup::SubGroup("Logic Options", {
         &mOptions[RSK_LOGIC_RULES],
@@ -548,6 +548,11 @@ void Settings::CreateOptions() {
         &mTrickOptions[RT_GANON_MQ_SHADOW_TRIAL],
         &mTrickOptions[RT_GANON_MQ_LIGHT_TRIAL],
     }, false);
+    int i = 0;
+    for (const auto trick : mOptionGroups[RSG_TRICKS].GetOptions()) {
+        mTrickNameToEnum[std::string(trick->GetName())] = static_cast<RandomizerTrick>(i);
+        i++;
+    }
     // TODO: Glitches
     mOptionGroups[RSG_AREA_ACCESS_IMGUI] = OptionGroup::SubGroup("Area Access", {
         &mOptions[RSK_FOREST],
@@ -1686,18 +1691,20 @@ void Settings::FinalizeSettings(const std::set<RandomizerCheck>& excludedLocatio
             mOptions[RSK_LINKS_POCKET].SetSelectedIndex(RO_LINKS_POCKET_DUNGEON_REWARD);
         }
 
-        ctx->AddExcludedOptions();
-        for (const auto locationKey : ctx->everyPossibleLocation) {
-            if (const auto location = ctx->GetItemLocation(locationKey); excludedLocations.contains(location->GetRandomizerCheck())) {
-                location->GetExcludedOption()->SetSelectedIndex(1);
-            } else {
-                location->GetExcludedOption()->SetSelectedIndex(0);
+        if (!ctx->IsSpoilerLoaded()) {
+            ctx->AddExcludedOptions();
+            for (const auto locationKey : ctx->everyPossibleLocation) {
+                if (const auto location = ctx->GetItemLocation(locationKey); excludedLocations.contains(location->GetRandomizerCheck())) {
+                    location->GetExcludedOption()->SetSelectedIndex(1);
+                } else {
+                    location->GetExcludedOption()->SetSelectedIndex(0);
+                }
+            }
+            // Tricks
+            ResetTrickOptions();
+            for (const auto randomizerTrick : enabledTricks) {
+                mTrickOptions[randomizerTrick].SetSelectedIndex(1);
             }
-        }
-        // Tricks
-        ResetTrickOptions();
-        for (const auto randomizerTrick : enabledTricks) {
-            mTrickOptions[randomizerTrick].SetSelectedIndex(1);
         }
         if (!mOptions[RSK_SHUFFLE_KOKIRI_SWORD]) {
             if (mOptions[RSK_STARTING_KOKIRI_SWORD]) {
@@ -2197,12 +2204,13 @@ void Settings::ParseJson(nlohmann::json spoilerFileJson) {
                     }
                     break;
                 // Uses Ammo Drops option for now. "Off" not yet implemented
+                // TODO: Change to Ammo Drops
                 case RSK_ENABLE_BOMBCHU_DROPS:
-                    if (it.value() == "On") {
+                    if (it.value() == "Yes") {
                         mOptions[index].SetSelectedIndex(RO_AMMO_DROPS_ON);
-                    } else if (it.value() == "On + Bombchu") {
-                        mOptions[index].SetSelectedIndex(RO_AMMO_DROPS_ON_PLUS_BOMBCHU);
-                    } else if (it.value() == "Off") {
+                    // } else if (it.value() == "On + Bombchu") {
+                    //     mOptions[index].SetSelectedIndex(RO_AMMO_DROPS_ON_PLUS_BOMBCHU);
+                    } else if (it.value() == "No") {
                         mOptions[index].SetSelectedIndex(RO_AMMO_DROPS_OFF);
                     }
                     break;
@@ -2484,8 +2492,7 @@ void Settings::ParseJson(nlohmann::json spoilerFileJson) {
 
     nlohmann::json enabledTricksJson = spoilerFileJson["enabledTricks"];
     for (auto it = enabledTricksJson.begin(); it != enabledTricksJson.end(); ++it) {
-        std::string numericValueString = it.value();
-        const auto rt = static_cast<RandomizerTrick>(std::stoi(numericValueString));
+        const RandomizerTrick rt = mTrickNameToEnum[it.value()];
         GetTrickOption(rt).SetSelectedIndex(RO_GENERIC_ON);
     }
 }
diff --git a/soh/soh/Enhancements/randomizer/settings.h b/soh/soh/Enhancements/randomizer/settings.h
index 90c45e698..fbd2adacc 100644
--- a/soh/soh/Enhancements/randomizer/settings.h
+++ b/soh/soh/Enhancements/randomizer/settings.h
@@ -191,5 +191,6 @@ class Settings {
     std::string mHash;
     std::string mSeedString;
     uint32_t mFinalSeed = 0;
+    std::unordered_map<std::string, RandomizerTrick> mTrickNameToEnum;
 };
 } // namespace Rando
diff --git a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
index 194395d3b..ac7d2aa29 100644
--- a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
+++ b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
@@ -1025,10 +1025,10 @@ void FileChoose_UpdateRandomizer() {
 
     if (CVarGetInteger("gRandomizerNewFileDropped", 0) != 0 || !(Randomizer_IsSeedGenerated() || Randomizer_IsSpoilerLoaded()) &&
         SpoilerFileExists(CVarGetString("gSpoilerLog", "")) && !fileSelectSpoilerFileLoaded) {
-            const char* fileLoc = CVarGetString("gSpoilerLog", "");
             if (CVarGetInteger("gRandomizerNewFileDropped", 0) != 0) {
                 CVarSetString("gSpoilerLog", CVarGetString("gRandomizerDroppedFile", ""));
             }
+            const char* fileLoc = CVarGetString("gSpoilerLog", "");
             CVarSetInteger("gRandomizerNewFileDropped", 0);
             CVarSetString("gRandomizerDroppedFile", "");
             Randomizer_ParseSpoiler(fileLoc);

From c9907ed5fc823a31394730ae41b3bc5f5ad4086d Mon Sep 17 00:00:00 2001
From: Christopher Leggett <chris@leggett.dev>
Date: Sat, 30 Dec 2023 12:10:50 -0500
Subject: [PATCH 051/230] Allows rendering custom models as Ice Traps in
 GetItem Animations. (#3760)

---
 soh/soh/Enhancements/randomizer/3drando/item_pool.cpp | 10 +++++-----
 soh/soh/Enhancements/randomizer/draw.cpp              |  2 +-
 soh/soh/Enhancements/randomizer/item.cpp              |  8 ++++----
 soh/src/code/z_player_lib.c                           |  6 +++++-
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
index 2248bcd15..c4fad91eb 100644
--- a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
@@ -731,11 +731,11 @@ void GenerateItemPool() {
     AddItemToMainPool(RG_OCARINA_C_RIGHT_BUTTON);
 
     //TODO: Re-add when custom models work with ice traps
-    //ctx->possibleIceTrapModels.push_back(RG_OCARINA_A_BUTTON);
-    //ctx->possibleIceTrapModels.push_back(RG_OCARINA_C_UP_BUTTON);
-    //ctx->possibleIceTrapModels.push_back(RG_OCARINA_C_DOWN_BUTTON);
-    //ctx->possibleIceTrapModels.push_back(RG_OCARINA_C_LEFT_BUTTON);
-    //ctx->possibleIceTrapModels.push_back(RG_OCARINA_C_RIGHT_BUTTON);
+    ctx->possibleIceTrapModels.push_back(RG_OCARINA_A_BUTTON);
+    ctx->possibleIceTrapModels.push_back(RG_OCARINA_C_UP_BUTTON);
+    ctx->possibleIceTrapModels.push_back(RG_OCARINA_C_DOWN_BUTTON);
+    ctx->possibleIceTrapModels.push_back(RG_OCARINA_C_LEFT_BUTTON);
+    ctx->possibleIceTrapModels.push_back(RG_OCARINA_C_RIGHT_BUTTON);
   }
 
   if (ctx->GetOption(RSK_SHUFFLE_COWS)) {
diff --git a/soh/soh/Enhancements/randomizer/draw.cpp b/soh/soh/Enhancements/randomizer/draw.cpp
index 1730c7fc7..a66d6b43d 100644
--- a/soh/soh/Enhancements/randomizer/draw.cpp
+++ b/soh/soh/Enhancements/randomizer/draw.cpp
@@ -358,7 +358,7 @@ extern "C" void Randomizer_DrawOcarinaButton(PlayState* play, GetItemEntry* getI
         cRightButtonColor = CVarGetColor24("gCosmetics.Hud_CRightButton.Value", cRightButtonColor);
     }
 
-    s16 slot = getItemEntry->getItemId - RG_OCARINA_A_BUTTON;
+    s16 slot = getItemEntry->drawItemId - RG_OCARINA_A_BUTTON;
 
     Gfx* dLists[] = {
         (Gfx*)gOcarinaAButtonDL,
diff --git a/soh/soh/Enhancements/randomizer/item.cpp b/soh/soh/Enhancements/randomizer/item.cpp
index d34929f76..9ad4be326 100644
--- a/soh/soh/Enhancements/randomizer/item.cpp
+++ b/soh/soh/Enhancements/randomizer/item.cpp
@@ -19,9 +19,9 @@ Item::Item(const RandomizerGet randomizerGet_, Text name_, const ItemType type_,
     : randomizerGet(randomizerGet_), name(std::move(name_)), type(type_), getItemId(getItemId_),
       advancement(advancement_), logicVar(logicVar_), hintKey(hintKey_), progressive(progressive_), price(price_) {
     if (modIndex_ == MOD_RANDOMIZER || getItemId > 0x7D) {
-        giEntry = std::make_shared<GetItemEntry>(GetItemEntry{itemId_, field_, static_cast<int16_t>((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_, objectId_, modIndex_, TABLE_RANDOMIZER, static_cast<int16_t>(randomizerGet_), gid_, true, ITEM_FROM_NPC, category_, NULL});
+        giEntry = std::make_shared<GetItemEntry>(GetItemEntry{itemId_, field_, static_cast<int16_t>((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_, objectId_, modIndex_, TABLE_RANDOMIZER, static_cast<int16_t>(randomizerGet_), gid_, true, ITEM_FROM_NPC, category_, static_cast<uint16_t>(randomizerGet_), MOD_RANDOMIZER, NULL});
     } else {
-        giEntry = std::make_shared<GetItemEntry>(GetItemEntry{itemId_, field_, static_cast<int16_t>((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_, objectId_, modIndex_, TABLE_VANILLA, getItemId_, gid_, true, ITEM_FROM_NPC, category_, NULL});
+        giEntry = std::make_shared<GetItemEntry>(GetItemEntry{itemId_, field_, static_cast<int16_t>((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_, objectId_, modIndex_, TABLE_VANILLA, getItemId_, gid_, true, ITEM_FROM_NPC, category_, itemId_, modIndex_, NULL});
     }
 }
 
@@ -33,9 +33,9 @@ Item::Item(const RandomizerGet randomizerGet_, Text name_, const ItemType type_,
     : randomizerGet(randomizerGet_), name(std::move(name_)), type(type_), getItemId(getItemId_),
       advancement(advancement_), logicVar(logicVar_), hintKey(hintKey_), progressive(progressive_), price(price_) {
     if (modIndex_ == MOD_RANDOMIZER || getItemId > 0x7D) {
-        giEntry = std::make_shared<GetItemEntry>(GetItemEntry{itemId_, field_, static_cast<int16_t>((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_, objectId_, modIndex_, TABLE_RANDOMIZER, static_cast<int16_t>(randomizerGet_), gid_, true, ITEM_FROM_NPC, category_, NULL});
+        giEntry = std::make_shared<GetItemEntry>(GetItemEntry{itemId_, field_, static_cast<int16_t>((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_, objectId_, modIndex_, TABLE_RANDOMIZER, static_cast<int16_t>(randomizerGet_), gid_, true, ITEM_FROM_NPC, category_, static_cast<uint16_t>(randomizerGet_), modIndex_, NULL});
     } else {
-        giEntry = std::make_shared<GetItemEntry>(GetItemEntry{itemId_, field_, static_cast<int16_t>((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_, objectId_, modIndex_, TABLE_VANILLA, getItemId_, gid_, true, ITEM_FROM_NPC, category_, NULL});
+        giEntry = std::make_shared<GetItemEntry>(GetItemEntry{itemId_, field_, static_cast<int16_t>((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_, objectId_, modIndex_, TABLE_VANILLA, getItemId_, gid_, true, ITEM_FROM_NPC, category_, itemId_, modIndex_, NULL});
     }
 }
 
diff --git a/soh/src/code/z_player_lib.c b/soh/src/code/z_player_lib.c
index b9a66c90e..9df23f794 100644
--- a/soh/src/code/z_player_lib.c
+++ b/soh/src/code/z_player_lib.c
@@ -1508,7 +1508,11 @@ void Player_DrawGetItemIceTrap(PlayState* play, Player* this, Vec3f* refPos, s32
         Matrix_RotateZYX(0, play->gameplayFrames * 1000, 0, MTXMODE_APPLY);
         Matrix_Scale(0.2f, 0.2f, 0.2f, MTXMODE_APPLY);
         // Draw fake item model.
-        GetItem_Draw(play, drawIdPlusOne - 1);
+        if (this->getItemEntry.drawFunc != NULL) {
+            this->getItemEntry.drawFunc(play, &this->getItemEntry);
+        } else {
+            GetItem_Draw(play, drawIdPlusOne - 1);
+        }
     }
 
     CLOSE_DISPS(play->state.gfxCtx);

From 944a4c2e46f042edcbb2116471efcb8eeb9d52fe Mon Sep 17 00:00:00 2001
From: Jordan Gilbreath <3819183+jordanpg@users.noreply.github.com>
Date: Mon, 1 Jan 2024 20:20:34 -0500
Subject: [PATCH 052/230] Fix settings persistence across sessions (#3779)

Co-authored-by: jordanpg <jordanpg@users.noreply.github.com>
---
 soh/soh/SaveManager.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/soh/soh/SaveManager.cpp b/soh/soh/SaveManager.cpp
index 1c3698e88..79e9a043c 100644
--- a/soh/soh/SaveManager.cpp
+++ b/soh/soh/SaveManager.cpp
@@ -2725,6 +2725,8 @@ extern "C" void Save_LoadFile(void) {
         // Reset rando context for rando saves.
         OTRGlobals::Instance->gRandoContext.reset();
         OTRGlobals::Instance->gRandoContext = Rando::Context::CreateInstance();
+        OTRGlobals::Instance->gRandoContext->AddExcludedOptions();
+        OTRGlobals::Instance->gRandoContext->GetSettings()->CreateOptions();
     }
     SaveManager::Instance->LoadFile(gSaveContext.fileNum);
 }

From 46abda83d25553f3601d4ae9c3f4fa8df1d1b33f Mon Sep 17 00:00:00 2001
From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Date: Tue, 2 Jan 2024 21:23:33 +0000
Subject: [PATCH 053/230] probably fix glaring hint issues (#3752)

---
 .../Enhancements/randomizer/3drando/fill.cpp  | 19 ++++++++++---------
 .../randomizer/3drando/hint_list.cpp          |  2 +-
 .../Enhancements/randomizer/3drando/hints.cpp |  7 ++++---
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/fill.cpp b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
index 6b09c4c24..0c5f2a5ea 100644
--- a/soh/soh/Enhancements/randomizer/3drando/fill.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
@@ -572,7 +572,7 @@ static void CalculateWotH() {
     for (size_t j = 0; j < ctx->playthroughLocations[i].size(); j++) {
       //If removing this item and no other item caused the game to become unbeatable, then it is strictly necessary, so add it
       if (ctx->GetItemLocation(ctx->playthroughLocations[i][j])->IsHintable() 
-          && IsBeatableWithout(ctx->playthroughLocations[i][j], true)) {
+          && !(IsBeatableWithout(ctx->playthroughLocations[i][j], true))) {
         ctx->GetItemLocation(ctx->playthroughLocations[i][j])->SetWothCandidate();
       }
     }
@@ -585,20 +585,21 @@ static void CalculateWotH() {
 //Calculate barren locations and assign Barren Candidacy to all locations inside those areas
 static void CalculateBarren() {
   auto ctx = Rando::Context::GetInstance();
-  std::array<bool, RA_MAX> IsBarren = {true};
+  std::array<bool, RA_MAX> NotBarren = {}; //I would invert this but the "initialise all as true" syntax wasn't working
 
   for (RandomizerCheck loc : ctx->allLocations) {
-  Rando::ItemLocation* itemLoc = ctx->GetItemLocation(loc);
-  RandomizerArea locArea = itemLoc->GetArea();
-  // If a location has a major item or is a way of the hero location, it is not barren
-  if (IsBarren[locArea] == true && locArea > RA_LINKS_POCKET && (itemLoc->GetPlacedItem().IsMajorItem() || itemLoc->IsWothCandidate())) {
-    IsBarren[locArea] = false;
-  } 
+    Rando::ItemLocation* itemLoc = ctx->GetItemLocation(loc);
+    RandomizerArea locArea = itemLoc->GetArea();
+    bool test = (itemLoc->GetPlacedItem().IsMajorItem() || itemLoc->IsWothCandidate());
+    // If a location has a major item or is a way of the hero location, it is not barren
+    if (NotBarren[locArea] == false && locArea > RA_LINKS_POCKET && (itemLoc->GetPlacedItem().IsMajorItem() || itemLoc->IsWothCandidate())) {
+      NotBarren[locArea] = true;
+    } 
   }
 
   for (RandomizerCheck loc : ctx->allLocations) {
     Rando::ItemLocation* itemLoc = ctx->GetItemLocation(loc);
-    if (IsBarren[itemLoc->GetArea()]){
+    if (!NotBarren[itemLoc->GetArea()]){
       itemLoc->SetBarrenCandidate();
     }
   }
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
index 718e4716d..6b0901d56 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
@@ -1060,7 +1060,7 @@ void HintTable_Init() {
 
     hintTable[RHT_OUTSIDE_GANONS_CASTLE] = HintText::Exclude({
         // obscure text
-        Text{ "outside Ganon's Castle", /*french*/ "les alentours du Château&de Ganon",
+        Text{ "outside Ganon's Castle", /*french*/ "les alentours du Château de Ganon",
               /*spanish*/ "el exterior del Castillo de Ganon" },
     });
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.cpp b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
index f7650b249..0ceb3fecc 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hints.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
@@ -494,8 +494,8 @@ static std::vector<RandomizerCheck> FilterHintability(std::vector<RandomizerChec
                                                       std::function<bool(RandomizerCheck)> extraFilter = NoFilter){
   auto ctx = Rando::Context::GetInstance();
   return FilterFromPool(locations, [extraFilter, ctx](const RandomizerCheck loc) {
-    return ctx->GetItemLocation(loc)->IsHintable() && !(ctx->GetItemLocation(loc)->IsHintedAt()
-    && extraFilter(loc));
+    return ctx->GetItemLocation(loc)->IsHintable() && !(ctx->GetItemLocation(loc)->IsHintedAt())
+    && extraFilter(loc);
   });
 }
 
@@ -1033,7 +1033,8 @@ void CreateStoneHints() {
                   // If we have Rainbow Bridge set to Greg, add a hint for where Greg is
                   (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_GREG) &&
                    ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == RG_GREG_RUPEE)) &&
-                 ctx->GetItemLocation(loc)->IsHintable() && !(ctx->GetItemLocation(loc)->IsHintedAt());
+                  ctx->GetItemLocation(loc)->IsHintable() &&
+                  !(ctx->GetOption(RSK_GREG_HINT) && (IsReachableWithout({RC_GREG_HINT}, loc, true)));
       });
 
       for (auto& hint : conditionalAlwaysHints) {

From 96353c0b3b0d9370f44f3c1f3733aef000f881c8 Mon Sep 17 00:00:00 2001
From: Christopher Leggett <chris@leggett.dev>
Date: Tue, 2 Jan 2024 17:19:56 -0500
Subject: [PATCH 054/230] Fixes Pre-Clearing of Ganon's Trials. (#3783)

---
 soh/soh/Enhancements/randomizer/randomizer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index 3efa3a141..a7ba16c49 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -493,7 +493,7 @@ void Randomizer::LoadMerchantMessages() {
 }
 
 bool Randomizer::IsTrialRequired(RandomizerInf trial) {
-    return Rando::Context::GetInstance()->GetTrial(trial - RAND_INF_TRIALS_DONE_LIGHT_TRIAL);
+    return Rando::Context::GetInstance()->GetTrial(trial - RAND_INF_TRIALS_DONE_LIGHT_TRIAL)->IsRequired();
 }
 
 GetItemEntry Randomizer::GetItemFromActor(s16 actorId, s16 sceneNum, s16 actorParams, GetItemID ogItemId,

From 7e2a13e7d8611ed65b0d05015c005966af7600a1 Mon Sep 17 00:00:00 2001
From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Date: Thu, 4 Jan 2024 20:49:10 +0000
Subject: [PATCH 055/230] Quickfix giants knife counting as a kokiri sword
 (#3802)

---
 soh/soh/Enhancements/randomizer/item_list.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/soh/soh/Enhancements/randomizer/item_list.cpp b/soh/soh/Enhancements/randomizer/item_list.cpp
index 246e1248c..fc7696815 100644
--- a/soh/soh/Enhancements/randomizer/item_list.cpp
+++ b/soh/soh/Enhancements/randomizer/item_list.cpp
@@ -14,7 +14,7 @@ void Rando::StaticData::InitItemTable() {
     itemTable[RG_KOKIRI_SWORD] =                        Item(RG_KOKIRI_SWORD,                     Text{ "Kokiri Sword", "Épée Kokiri", "Kokiri-Schwert" },                                                          ITEMTYPE_ITEM,              GI_SWORD_KOKIRI,    true,  &Logic::KokiriSword,         RHT_KOKIRI_SWORD,           ITEM_SWORD_KOKIRI,              OBJECT_GI_SWORD_1,      GID_SWORD_KOKIRI,   0xA4,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
     itemTable[RG_MASTER_SWORD] =                        Item(RG_MASTER_SWORD,                     Text{ "Master Sword", "Épée de Legende", "Espada Master"},                                                        ITEMTYPE_ITEM,              0xE0,               true,  &Logic::MasterSword,         RHT_MASTER_SWORD,           ITEM_SWORD_MASTER,              OBJECT_TOKI_OBJECTS,    GID_SWORD_BGS,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_MASTER_SWORD].SetCustomDrawFunc(Randomizer_DrawMasterSword);
-    itemTable[RG_GIANTS_KNIFE] =                        Item(RG_GIANTS_KNIFE,                     Text{ "Giant's Knife", "Lame des Géants", "Messer des Riesen" },                                                  ITEMTYPE_ITEM,              GI_SWORD_KNIFE,     true,  &Logic::KokiriSword,         RHT_GIANTS_KNIFE,           ITEM_SWORD_BGS,                 OBJECT_GI_LONGSWORD,    GID_SWORD_BGS,      0x4B,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_GIANTS_KNIFE] =                        Item(RG_GIANTS_KNIFE,                     Text{ "Giant's Knife", "Lame des Géants", "Messer des Riesen" },                                                  ITEMTYPE_ITEM,              GI_SWORD_KNIFE,     true,  &Logic::noVariable,          RHT_GIANTS_KNIFE,           ITEM_SWORD_BGS,                 OBJECT_GI_LONGSWORD,    GID_SWORD_BGS,      0x4B,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
     itemTable[RG_BIGGORON_SWORD] =                      Item(RG_BIGGORON_SWORD,                   Text{ "Biggoron's Sword", "Épée de Biggoron", "Biggoron-Schwert" },                                               ITEMTYPE_ITEM,              GI_SWORD_BGS,       true,  &Logic::BiggoronSword,       RHT_BIGGORON_SWORD,         ITEM_SWORD_BGS,                 OBJECT_GI_LONGSWORD,    GID_SWORD_BGS,      0x0C,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
     itemTable[RG_DEKU_SHIELD] =                         Item(RG_DEKU_SHIELD,                      Text{ "Deku Shield", "Bouclier Mojo", "Deku-Schild" },                                                            ITEMTYPE_ITEM,              GI_SHIELD_DEKU,     false, &Logic::noVariable,          RHT_DEKU_SHIELD,            ITEM_SHIELD_DEKU,               OBJECT_GI_SHIELD_1,     GID_SHIELD_DEKU,    0x4C,                        0xA0, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
     itemTable[RG_HYLIAN_SHIELD] =                       Item(RG_HYLIAN_SHIELD,                    Text{ "Hylian Shield", "Bouclier Hylien", "Hylia-Schild" },                                                       ITEMTYPE_ITEM,              GI_SHIELD_HYLIAN,   false, &Logic::noVariable,          RHT_HYLIAN_SHIELD,          ITEM_SHIELD_HYLIAN,             OBJECT_GI_SHIELD_2,     GID_SHIELD_HYLIAN,  0x4D,                        0xA0, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);

From 4d2ca299403873b3ed24888a83f04c44f1e72bd1 Mon Sep 17 00:00:00 2001
From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Date: Fri, 5 Jan 2024 20:19:23 +0000
Subject: [PATCH 056/230] Quickfix skip trials setting (#3800)

* quickfix skip trials setting

* Change to set trial count to 0 when skipping
---
 soh/soh/Enhancements/randomizer/settings.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
index d858bb567..64705c31a 100644
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -1853,12 +1853,15 @@ void Settings::FinalizeSettings(const std::set<RandomizerCheck>& excludedLocatio
             ctx->GetDungeon(GANONS_CASTLE)->SetKeyRing();
         }
     }
+
     auto trials = ctx->GetTrials()->GetTrialList();
     Shuffle(trials);
     for (const auto trial : trials) {
         trial->SetAsSkipped();
     }
-    if (mOptions[RSK_GANONS_TRIALS].Is(RO_GANONS_TRIALS_RANDOM_NUMBER)) {
+    if(mOptions[RSK_GANONS_TRIALS].Is(RO_GANONS_TRIALS_SKIP)){
+        mOptions[RSK_TRIAL_COUNT].SetSelectedIndex(0);
+    } else if(mOptions[RSK_GANONS_TRIALS].Is(RO_GANONS_TRIALS_RANDOM_NUMBER)) {
         mOptions[RSK_TRIAL_COUNT].SetSelectedIndex(Random(0, static_cast<int>(mOptions[RSK_TRIAL_COUNT].GetOptionCount())));
     }
     for (uint8_t i = 0; i < mOptions[RSK_TRIAL_COUNT].Value<uint8_t>(); i++) {

From 8b8f11d72e327a871e695d41e021bceca1f67e11 Mon Sep 17 00:00:00 2001
From: Christopher Leggett <chris@leggett.dev>
Date: Sat, 6 Jan 2024 11:07:19 -0500
Subject: [PATCH 057/230] Consolidation of Trick Settings data (#3798)

* Adds TrickOption subclass and fills in extra info.

Fills in the extra info from randomizer_tricks.cpp that other Options don't have (hence the subclass for Tricks specifically).

* Uses new definitions of tricks in ImGui menu.

* Removes randomizer_tricks.cpp/h

* Adds new tricks.cpp/h to hold some static data and functions.

* Refactors Tricks namespace into a class with only static memebers and functions.

* Fixes bug with Trick Tag system.
---
 .../randomizer/3drando/spoiler_log.cpp        |   3 +-
 soh/soh/Enhancements/randomizer/context.cpp   |   4 +-
 soh/soh/Enhancements/randomizer/context.h     |   2 +-
 soh/soh/Enhancements/randomizer/option.cpp    |  33 ++
 soh/soh/Enhancements/randomizer/option.h      |  64 ++-
 .../Enhancements/randomizer/randomizer.cpp    | 381 ++++++++---------
 soh/soh/Enhancements/randomizer/randomizer.h  |   1 -
 .../randomizer/randomizer_tricks.cpp          | 392 ------------------
 .../randomizer/randomizer_tricks.h            |  87 ----
 soh/soh/Enhancements/randomizer/settings.cpp  | 370 +++++++++--------
 soh/soh/Enhancements/randomizer/settings.h    |   5 +-
 soh/soh/Enhancements/randomizer/tricks.cpp    |  58 +++
 soh/soh/Enhancements/randomizer/tricks.h      |  85 ++++
 13 files changed, 609 insertions(+), 876 deletions(-)
 delete mode 100644 soh/soh/Enhancements/randomizer/randomizer_tricks.cpp
 delete mode 100644 soh/soh/Enhancements/randomizer/randomizer_tricks.h
 create mode 100644 soh/soh/Enhancements/randomizer/tricks.cpp
 create mode 100644 soh/soh/Enhancements/randomizer/tricks.h

diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
index fb5b6e591..55192e7c5 100644
--- a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
@@ -10,7 +10,6 @@
 #include "utils.hpp"
 #include "shops.hpp"
 #include "hints.hpp"
-#include "../randomizer_tricks.h"
 #include "pool_functions.hpp"
 #include "soh/Enhancements/randomizer/randomizer_check_objects.h"
 #include <nlohmann/json.hpp>
@@ -31,6 +30,8 @@
 
 #include <Context.h>
 
+#include "consolevariablebridge.h"
+
 using json = nlohmann::ordered_json;
 using namespace Rando;
 
diff --git a/soh/soh/Enhancements/randomizer/context.cpp b/soh/soh/Enhancements/randomizer/context.cpp
index 8c2d02dab..834692190 100644
--- a/soh/soh/Enhancements/randomizer/context.cpp
+++ b/soh/soh/Enhancements/randomizer/context.cpp
@@ -12,6 +12,8 @@
 #include <fstream>
 #include <spdlog/spdlog.h>
 
+#include "luslog.h"
+
 namespace Rando {
 std::weak_ptr<Context> Context::mContext;
 
@@ -604,7 +606,7 @@ Option& Context::GetOption(const RandomizerSettingKey key) const {
     return mSettings->GetOption(key);
 }
 
-Option& Context::GetTrickOption(const RandomizerTrick key) const {
+TrickOption& Context::GetTrickOption(const RandomizerTrick key) const {
     return mSettings->GetTrickOption(key);
 }
 } // namespace Rando
diff --git a/soh/soh/Enhancements/randomizer/context.h b/soh/soh/Enhancements/randomizer/context.h
index 63e64cb7d..ccea76d98 100644
--- a/soh/soh/Enhancements/randomizer/context.h
+++ b/soh/soh/Enhancements/randomizer/context.h
@@ -67,7 +67,7 @@ class Context {
     TrialInfo* GetTrial(size_t key) const;
     static Sprite* GetSeedTexture(uint8_t index);
     Option& GetOption(RandomizerSettingKey key) const;
-    Option& GetTrickOption(RandomizerTrick key) const;
+    TrickOption& GetTrickOption(RandomizerTrick key) const;
     GetItemEntry GetFinalGIEntry(RandomizerCheck rc, bool checkObtainability = true, GetItemID ogItemId = GI_NONE);
     void ParseSpoiler(const char* spoilerFileName, bool plandoMode);
     void ParseHashIconIndexesJson(nlohmann::json spoilerFileJson);
diff --git a/soh/soh/Enhancements/randomizer/option.cpp b/soh/soh/Enhancements/randomizer/option.cpp
index f26a379d0..950fa96cf 100644
--- a/soh/soh/Enhancements/randomizer/option.cpp
+++ b/soh/soh/Enhancements/randomizer/option.cpp
@@ -45,6 +45,10 @@ const std::string& Option::GetName() const {
     return name;
 }
 
+const std::string& Option::GetDescription() const {
+    return description;
+}
+
 uint8_t Option::GetSelectedOptionIndex() const {
     return selectedOption;
 }
@@ -297,6 +301,35 @@ bool Option::RenderSlider() const {
     return changed;
 }
 
+TrickOption::TrickOption(const RandomizerCheckQuest quest_, const RandomizerArea area_, std::set<Tricks::Tag> tags_, const bool glitch_, const std::string& name_, std::string description_) :
+    Option(false, name_, {"Disabled", "Enabled"}, OptionCategory::Setting, "",
+        std::move(description_), WidgetType::Checkbox, 0, false, IMFLAG_NONE),
+    mQuest(quest_), mArea(area_), mTags(std::move(tags_)), mGlitch(glitch_) {}
+
+TrickOption TrickOption::LogicTrick(RandomizerCheckQuest quest_, RandomizerArea area_, std::set<Tricks::Tag> tags_, bool glitch_, const std::string& name_, std::string description_) {
+    return {quest_, area_, std::move(tags_), glitch_, name_, std::move(description_)};
+}
+
+RandomizerCheckQuest TrickOption::GetQuest() const {
+    return mQuest;
+}
+
+RandomizerArea TrickOption::GetArea() const {
+    return mArea;
+}
+
+bool TrickOption::IsGlitch() const {
+    return mGlitch;
+}
+
+bool TrickOption::HasTag(const Tricks::Tag tag) const {
+    return mTags.contains(tag);
+}
+
+const std::set<Tricks::Tag>& TrickOption::GetTags() const {
+    return mTags;
+}
+
 OptionGroup::OptionGroup(std::string name, std::vector<Option*> options, const OptionGroupType groupType,
                          const bool printInSpoiler, const WidgetContainerType containerType, std::string description)
     : mName(std::move(name)), mOptions(std::move(options)), mGroupType(groupType), mPrintInSpoiler(printInSpoiler),
diff --git a/soh/soh/Enhancements/randomizer/option.h b/soh/soh/Enhancements/randomizer/option.h
index ef0c0a2bb..8ec4a32b1 100644
--- a/soh/soh/Enhancements/randomizer/option.h
+++ b/soh/soh/Enhancements/randomizer/option.h
@@ -3,11 +3,15 @@
 #include "soh/UIWidgets.hpp"
 
 #include <cstdint>
+#include <set>
 #include <string>
 #include <vector>
 #include <variant>
 #include <type_traits>
 
+#include "randomizerTypes.h"
+#include "tricks.h"
+
 namespace Rando {
 enum ImGuiMenuFlags {
   IMFLAG_NONE = 0,
@@ -181,6 +185,7 @@ class Option {
      * @return const std::string&
      */
     const std::string& GetName() const;
+    const std::string& GetDescription() const;
 
     /**
      * @brief Get the value name corresponding to the selected index.
@@ -302,13 +307,15 @@ class Option {
     void SetFlag(int imFlag_);
     void RemoveFlag(int imFlag_);
 
-  private:
+protected:
     Option(uint8_t var_, std::string name_, std::vector<std::string> options_, OptionCategory category_,
            std::string cvarName_, std::string description_, WidgetType widgetType_, uint8_t defaultOption_,
            bool defaultHidden_, int imFlags_);
     Option(bool var_, std::string name_, std::vector<std::string> options_, OptionCategory category_,
            std::string cvarName_, std::string description_, WidgetType widgetType_, uint8_t defaultOption_,
            bool defaultHidden_, int imFlags_);
+
+  private:
     bool RenderCheckbox() const;
     bool RenderCombobox() const;
     bool RenderSlider() const;
@@ -330,6 +337,61 @@ class Option {
     std::string disabledText;
 };
 
+class TrickOption : public Option {
+public:
+    TrickOption() = default;
+    /**
+     * @brief A convenience function for constructing the Option for a trick.
+     *
+     * @param quest_ MQ, Vanilla, or Both.
+     * @param area_ The area the trick is relevant for.
+     * @param tags_ The set of RandomizerTrickTags for this trick.
+     * @param glitch_ Whether or not this trick is a glitch.
+     * @param name_ The name of the trick. Appears in the spoiler/patch file.
+     * @param description_ A brief description of the trick.
+     * @return Option
+     */
+    static TrickOption LogicTrick(RandomizerCheckQuest quest_, RandomizerArea area_, std::set<Tricks::Tag> tags_, bool glitch_, const std::string& name_, std::string description_);
+
+    /**
+     * @brief Retrieve the quest type this trick is relevant for.
+     *
+     * @return RandomizerCheckQuest
+     */
+    RandomizerCheckQuest GetQuest() const;
+
+    /**
+     * @brief Get the Area this trick is used in
+     *
+     * @return RandomizerArea
+     */
+    RandomizerArea GetArea() const;
+
+    /**
+     * @brief Get whether or not this Trick is considered a glitch.
+     *
+     * @return true or false
+     */
+    bool IsGlitch() const;
+
+    /**
+     * @brief Check if this Trick has the given tag
+     *
+     * @param tag the RandomizerTrickTag to check for
+     * @return true or false
+     */
+    bool HasTag(Tricks::Tag tag) const;
+
+    const std::set<Tricks::Tag>& GetTags() const;
+
+private:
+    TrickOption(RandomizerCheckQuest quest_, RandomizerArea area_, std::set<Tricks::Tag> tags_, bool glitch_, const std::string& name_, std::string description_);
+    RandomizerCheckQuest mQuest;
+    RandomizerArea mArea;
+    std::set<Tricks::Tag> mTags;
+    bool mGlitch;
+};
+
 enum class OptionGroupType {
     DEFAULT,
     SUBGROUP,
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index a7ba16c49..840c474a1 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -22,7 +22,6 @@
 #include "../../../src/overlays/actors/ovl_En_GirlA/z_en_girla.h"
 #include <stdexcept>
 #include "randomizer_check_objects.h"
-#include "randomizer_tricks.h"
 #include "randomizer_check_tracker.h"
 #include <sstream>
 #include <tuple>
@@ -36,6 +35,7 @@
 #include "entrance.h"
 #include "dungeon.h"
 #include "trial.h"
+#include "settings.h"
 #include "soh/util.h"
 
 extern "C" uint32_t ResourceMgr_IsGameMasterQuest();
@@ -271,17 +271,6 @@ bool Randomizer::SpoilerFileExists(const char* spoilerFileName) {
 #pragma GCC pop_options
 #pragma optimize("", on)
 
-void DrawTagChips(const std::vector<RandomizerTrickTag> &rtTags) {
-    for (auto rtTag : rtTags) {
-        ImGui::SameLine();
-        ImGui::BeginDisabled();
-        ImGui::PushStyleColor(ImGuiCol_Button, RandomizerTricks::GetRTTagColor(rtTag));
-        ImGui::SmallButton(RandomizerTricks::GetRTTagName(rtTag).c_str());
-        ImGui::PopStyleColor();
-        ImGui::EndDisabled();
-    }
-}
-
 void Randomizer::LoadHintMessages() {
     auto ctx = Rando::Context::GetInstance();
 
@@ -2011,95 +2000,93 @@ void RandomizerSettingsWindow::DrawElement() {
             ImGui::BeginDisabled(CVarGetInteger("gRandomizeLogicRules", RO_LOGIC_GLITCHLESS) == RO_LOGIC_VANILLA);
 
             // Tricks
-            static std::unordered_map<RandomizerTrickArea, bool> areaTreeDisabled {
-                {RTAREA_GENERAL, true},
-                {RTAREA_KOKIRI_FOREST, true},
-                {RTAREA_LOST_WOODS, true},
-                {RTAREA_SACRED_FOREST_MEADOW, true},
-                {RTAREA_HYRULE_FIELD, true},
-                {RTAREA_LAKE_HYLIA, true},
-                {RTAREA_GERUDO_VALLEY, true},
-                {RTAREA_GERUDO_FORTRESS, true},
-                {RTAREA_WASTELAND, true},
-                {RTAREA_DESERT_COLOSSUS, true},
-                {RTAREA_MARKET, true},
-                {RTAREA_HYRULE_CASTLE, true},
-                {RTAREA_KAKARIKO_VILLAGE, true},
-                {RTAREA_GRAVEYARD, true},
-                {RTAREA_DEATH_MOUNTAIN_TRAIL, true},
-                {RTAREA_GORON_CITY, true},
-                {RTAREA_DEATH_MOUNTAIN_CRATER, true},
-                {RTAREA_ZORAS_RIVER, true},
-                {RTAREA_ZORAS_DOMAIN, true},
-                {RTAREA_ZORAS_FOUNTAIN, true},
-                {RTAREA_LON_LON_RANCH, true},
-                {RTAREA_DEKU_TREE, true},
-                {RTAREA_DODONGOS_CAVERN, true},
-                {RTAREA_JABU_JABUS_BELLY, true},
-                {RTAREA_FOREST_TEMPLE, true},
-                {RTAREA_FIRE_TEMPLE, true},
-                {RTAREA_WATER_TEMPLE, true},
-                {RTAREA_SPIRIT_TEMPLE, true},
-                {RTAREA_SHADOW_TEMPLE, true},
-                {RTAREA_BOTTOM_OF_THE_WELL, true},
-                {RTAREA_ICE_CAVERN, true},
-                {RTAREA_GERUDO_TRAINING_GROUND, true},
-                {RTAREA_GANONS_CASTLE, true}
+            static std::unordered_map<RandomizerArea, bool> areaTreeDisabled {
+                {RA_NONE, true},
+                {RA_KOKIRI_FOREST, true},
+                {RA_THE_LOST_WOODS, true},
+                {RA_SACRED_FOREST_MEADOW, true},
+                {RA_HYRULE_FIELD, true},
+                {RA_LAKE_HYLIA, true},
+                {RA_GERUDO_VALLEY, true},
+                {RA_GERUDO_FORTRESS, true},
+                {RA_HAUNTED_WASTELAND, true},
+                {RA_DESERT_COLOSSUS, true},
+                {RA_THE_MARKET, true},
+                {RA_HYRULE_CASTLE, true},
+                {RA_KAKARIKO_VILLAGE, true},
+                {RA_THE_GRAVEYARD, true},
+                {RA_DEATH_MOUNTAIN_TRAIL, true},
+                {RA_GORON_CITY, true},
+                {RA_DEATH_MOUNTAIN_CRATER, true},
+                {RA_ZORAS_RIVER, true},
+                {RA_ZORAS_DOMAIN, true},
+                {RA_ZORAS_FOUNTAIN, true},
+                {RA_LON_LON_RANCH, true},
+                {RA_DEKU_TREE, true},
+                {RA_DODONGOS_CAVERN, true},
+                {RA_JABU_JABUS_BELLY, true},
+                {RA_FOREST_TEMPLE, true},
+                {RA_FIRE_TEMPLE, true},
+                {RA_WATER_TEMPLE, true},
+                {RA_SPIRIT_TEMPLE, true},
+                {RA_SHADOW_TEMPLE, true},
+                {RA_BOTTOM_OF_THE_WELL, true},
+                {RA_ICE_CAVERN, true},
+                {RA_GERUDO_TRAINING_GROUND, true},
+                {RA_GANONS_CASTLE, true}
             };
-            static std::unordered_map<RandomizerTrickArea, bool> areaTreeEnabled {
-                {RTAREA_GENERAL, true},
-                {RTAREA_KOKIRI_FOREST, true},
-                {RTAREA_LOST_WOODS, true},
-                {RTAREA_SACRED_FOREST_MEADOW, true},
-                {RTAREA_HYRULE_FIELD, true},
-                {RTAREA_LAKE_HYLIA, true},
-                {RTAREA_GERUDO_VALLEY, true},
-                {RTAREA_GERUDO_FORTRESS, true},
-                {RTAREA_WASTELAND, true},
-                {RTAREA_DESERT_COLOSSUS, true},
-                {RTAREA_MARKET, true},
-                {RTAREA_HYRULE_CASTLE, true},
-                {RTAREA_KAKARIKO_VILLAGE, true},
-                {RTAREA_GRAVEYARD, true},
-                {RTAREA_DEATH_MOUNTAIN_TRAIL, true},
-                {RTAREA_GORON_CITY, true},
-                {RTAREA_DEATH_MOUNTAIN_CRATER, true},
-                {RTAREA_ZORAS_RIVER, true},
-                {RTAREA_ZORAS_DOMAIN, true},
-                {RTAREA_ZORAS_FOUNTAIN, true},
-                {RTAREA_LON_LON_RANCH, true},
-                {RTAREA_DEKU_TREE, true},
-                {RTAREA_DODONGOS_CAVERN, true},
-                {RTAREA_JABU_JABUS_BELLY, true},
-                {RTAREA_FOREST_TEMPLE, true},
-                {RTAREA_FIRE_TEMPLE, true},
-                {RTAREA_WATER_TEMPLE, true},
-                {RTAREA_SPIRIT_TEMPLE, true},
-                {RTAREA_SHADOW_TEMPLE, true},
-                {RTAREA_BOTTOM_OF_THE_WELL, true},
-                {RTAREA_ICE_CAVERN, true},
-                {RTAREA_GERUDO_TRAINING_GROUND, true},
-                {RTAREA_GANONS_CASTLE, true}
+            static std::unordered_map<RandomizerArea, bool> areaTreeEnabled {
+                {RA_NONE, true},
+                {RA_KOKIRI_FOREST, true},
+                {RA_THE_LOST_WOODS, true},
+                {RA_SACRED_FOREST_MEADOW, true},
+                {RA_HYRULE_FIELD, true},
+                {RA_LAKE_HYLIA, true},
+                {RA_GERUDO_VALLEY, true},
+                {RA_GERUDO_FORTRESS, true},
+                {RA_HAUNTED_WASTELAND, true},
+                {RA_DESERT_COLOSSUS, true},
+                {RA_THE_MARKET, true},
+                {RA_HYRULE_CASTLE, true},
+                {RA_KAKARIKO_VILLAGE, true},
+                {RA_THE_GRAVEYARD, true},
+                {RA_DEATH_MOUNTAIN_TRAIL, true},
+                {RA_GORON_CITY, true},
+                {RA_DEATH_MOUNTAIN_CRATER, true},
+                {RA_ZORAS_RIVER, true},
+                {RA_ZORAS_DOMAIN, true},
+                {RA_ZORAS_FOUNTAIN, true},
+                {RA_LON_LON_RANCH, true},
+                {RA_DEKU_TREE, true},
+                {RA_DODONGOS_CAVERN, true},
+                {RA_JABU_JABUS_BELLY, true},
+                {RA_FOREST_TEMPLE, true},
+                {RA_FIRE_TEMPLE, true},
+                {RA_WATER_TEMPLE, true},
+                {RA_SPIRIT_TEMPLE, true},
+                {RA_SHADOW_TEMPLE, true},
+                {RA_BOTTOM_OF_THE_WELL, true},
+                {RA_ICE_CAVERN, true},
+                {RA_GERUDO_TRAINING_GROUND, true},
+                {RA_GANONS_CASTLE, true}
             };
 
-            static std::unordered_map<RandomizerTrickTag, bool> showTag {
-                {RTTAG_NOVICE,true},
-                {RTTAG_INTERMEDIATE,true},
-                {RTTAG_ADVANCED,true},
-                {RTTAG_EXPERT,true},
-                {RTTAG_EXTREME,true}
+            static std::unordered_map<Rando::Tricks::Tag, bool> showTag {
+                {Rando::Tricks::Tag::NOVICE,true},
+                {Rando::Tricks::Tag::INTERMEDIATE,true},
+                {Rando::Tricks::Tag::ADVANCED,true},
+                {Rando::Tricks::Tag::EXPERT,true},
+                {Rando::Tricks::Tag::EXTREME,true}
             };
             static ImGuiTextFilter trickSearch;
             trickSearch.Draw("Filter (inc,-exc)", 490.0f);
             if (CVarGetInteger("gRandomizeLogicRules", RO_LOGIC_GLITCHLESS) != RO_LOGIC_NO_LOGIC) {
                 ImGui::SameLine();
                 if (ImGui::Button("Disable All")) {
-                    for (auto [rtArea, rtObjects] : RandomizerTricks::GetAllRTObjectsByArea()) {
-                        for (auto [randomizerTrick, rtObject] : rtObjects) {
-                            auto etfound = enabledTricks.find(randomizerTrick);
-                            if (!rtObject.rtGlitch && etfound != enabledTricks.end()) {
-                                enabledTricks.erase(etfound);
-                            }
+                    for (int i = 0; i < RT_MAX; i++) {
+                        auto etfound = enabledTricks.find(static_cast<RandomizerTrick>(i));
+                        if (!ctx->GetTrickOption(static_cast<RandomizerTrick>(i)).IsGlitch() && etfound != enabledTricks.end()) {
+                            enabledTricks.erase(etfound);
                         }
                     }
                     std::string enabledTrickString = "";
@@ -2112,11 +2099,9 @@ void RandomizerSettingsWindow::DrawElement() {
                 }
                 ImGui::SameLine();
                 if (ImGui::Button("Enable All")) {
-                    for (auto [rtArea, rtObjects] : RandomizerTricks::GetAllRTObjectsByArea()) {
-                        for (auto [randomizerTrick, rtObject] : rtObjects) {
-                            if (!rtObject.rtGlitch && !enabledTricks.count(rtObject.rt)) {
-                                enabledTricks.insert(randomizerTrick);
-                            }
+                    for (int i = 0; i < RT_MAX; i++) {
+                        if (!ctx->GetTrickOption(static_cast<RandomizerTrick>(i)).IsGlitch() && !enabledTricks.count(static_cast<RandomizerTrick>(i))) {
+                            enabledTricks.insert(static_cast<RandomizerTrick>(i));
                         }
                     }
                     std::string enabledTrickString = "";
@@ -2131,8 +2116,8 @@ void RandomizerSettingsWindow::DrawElement() {
             if (ImGui::BeginTable("trickTags", showTag.size(), ImGuiTableFlags_Resizable | ImGuiTableFlags_NoSavedSettings | ImGuiTableFlags_Borders)) {  
                 for (auto [rtTag, isShown] : showTag) {
                     ImGui::TableNextColumn();
-                    ImGui::PushStyleColor(ImGuiCol_Header, RandomizerTricks::GetRTTagColor(rtTag));
-                    ImGui::Selectable(RandomizerTricks::GetRTTagName(rtTag).c_str(), &showTag[rtTag]);
+                    ImGui::PushStyleColor(ImGuiCol_Header, Rando::Tricks::GetRTTagColor(rtTag));
+                    ImGui::Selectable(Rando::Tricks::GetRTTagName(rtTag).c_str(), &showTag[rtTag]);
                     ImGui::PopStyleColor(1);
                 }
                 ImGui::EndTable();
@@ -2153,47 +2138,33 @@ void RandomizerSettingsWindow::DrawElement() {
                     window->DC.CurrLineTextBaseOffset = 0.0f;
                     
                     if (ImGui::Button("Collapse All##disabled")) {
-                        for (auto [rtArea, rtObjects] : RandomizerTricks::GetAllRTObjectsByArea()) {
-                            bool hasTricks = false;
-                            for (auto [randomizerTrick, rtObject] : rtObjects) {
-                                if (rtObject.visibleInImgui &&
-                                    !enabledTricks.count(rtObject.rt) &&
-                                    !rtObject.rtGlitch) {
-
-                                    hasTricks = true;
-                                    break;
-                                }
-                            }
-                            if (hasTricks) {
-                                areaTreeDisabled[rtArea] = false;
+                        for (int i = 0; i < RT_MAX; i++) {
+                            auto option = mSettings->GetTrickOption(static_cast<RandomizerTrick>(i));
+                            if (!option.IsHidden() && !enabledTricks.count(static_cast<RandomizerTrick>(i)) &&
+                                !option.IsGlitch()) {
+                                areaTreeDisabled[option.GetArea()] = false;
                             }
                         }
                     }
                     ImGui::SameLine();
                     if (ImGui::Button("Open All##disabled")) {
-                        for (auto [rtArea, rtObjects] : RandomizerTricks::GetAllRTObjectsByArea()) {
-                            bool hasTricks = false;
-                            for (auto [randomizerTrick, rtObject] : rtObjects) {
-                                if (rtObject.visibleInImgui &&
-                                    !enabledTricks.count(rtObject.rt) &&
-                                    !rtObject.rtGlitch) {
-
-                                    hasTricks = true;
-                                    break;
-                                }
-                            }
-                            if (hasTricks) {
-                                areaTreeDisabled[rtArea] = true;
+                        for (int i = 0; i < RT_MAX; i++) {
+                            auto option = mSettings->GetTrickOption(static_cast<RandomizerTrick>(i));
+                            if (option.IsHidden() && !enabledTricks.count(static_cast<RandomizerTrick>(i)) &&
+                                !option.IsGlitch()) {
+                                areaTreeDisabled[option.GetArea()] = false;
                             }
                         }
                     }
                     ImGui::SameLine();
                     if (ImGui::Button("Enable Visible")) {
-                        for (auto [rtArea, rtObjects] : RandomizerTricks::GetAllRTObjectsByArea()) {
-                            for (auto [randomizerTrick, rtObject] : rtObjects) {
-                                if (!rtObject.rtGlitch && !enabledTricks.count(rtObject.rt) && trickSearch.PassFilter(rtObject.rtShortName.c_str()) && areaTreeDisabled[rtArea] && RandomizerTricks::CheckRTTags(showTag, *rtObject.rtTags)) {
-                                    enabledTricks.insert(randomizerTrick);
-                                }
+                        for (int i = 0; i < RT_MAX; i++) {
+                            auto option = mSettings->GetTrickOption(static_cast<RandomizerTrick>(i));
+                            if (!option.IsGlitch() && !enabledTricks.count(static_cast<RandomizerTrick>(i)) &&
+                                trickSearch.PassFilter(option.GetName().c_str()) &&
+                                areaTreeDisabled[option.GetArea()] &&
+                                Rando::Tricks::CheckRTTags(showTag, option.GetTags())) {
+                                enabledTricks.insert(static_cast<RandomizerTrick>(i));
                             }
                         }
                         std::string enabledTrickString = "";
@@ -2207,31 +2178,30 @@ void RandomizerSettingsWindow::DrawElement() {
                     
                     ImGui::BeginChild("ChildTricksDisabled", ImVec2(0, -8), false, ImGuiWindowFlags_HorizontalScrollbar);
 
-                    for (auto [rtArea, rtObjects] : RandomizerTricks::GetAllRTObjectsByArea()) {
+                    for (auto [area, trickIds] : mSettings->mTricksByArea) {
                         bool hasTricks = false;
-                        for (auto [randomizerTrick, rtObject] : rtObjects) {
-                            if (rtObject.visibleInImgui &&
-                                trickSearch.PassFilter(rtObject.rtShortName.c_str()) &&
-                                !enabledTricks.count(rtObject.rt) &&
-                                RandomizerTricks::CheckRTTags(showTag, *rtObject.rtTags) &&
-                                !rtObject.rtGlitch) {
-
+                        for (auto rt : trickIds) {
+                            auto option = mSettings->GetTrickOption(rt);
+                            if (!option.IsHidden() && trickSearch.PassFilter(option.GetName().c_str()) &&
+                                !enabledTricks.count(rt) && Rando::Tricks::CheckRTTags(showTag, option.GetTags()) &&
+                                !option.IsGlitch()) {
                                 hasTricks = true;
                                 break;
                             }
                         }
                         if (hasTricks) {
-                            ImGui::TreeNodeSetOpen(ImGui::GetID(RandomizerTricks::GetRTAreaName(rtArea).c_str()), areaTreeDisabled[rtArea]);
+                            ImGui::TreeNodeSetOpen(ImGui::GetID(Rando::Tricks::GetRTAreaName(area).c_str()), areaTreeDisabled[area]);
                             ImGui::SetNextItemOpen(true, ImGuiCond_Once);
-                            if (ImGui::TreeNode(RandomizerTricks::GetRTAreaName(rtArea).c_str())) {
-                                for (auto [randomizerTrick, rtObject] : rtObjects) {
-                                    if (rtObject.visibleInImgui &&
-                                        trickSearch.PassFilter(rtObject.rtShortName.c_str()) &&
-                                        !enabledTricks.count(rtObject.rt) &&
-                                        RandomizerTricks::CheckRTTags(showTag, *rtObject.rtTags) &&
-                                        !rtObject.rtGlitch) {
-                                        if (ImGui::ArrowButton(std::to_string(rtObject.rt).c_str(), ImGuiDir_Right)) {
-                                            enabledTricks.insert(rtObject.rt);
+                            if (ImGui::TreeNode(Rando::Tricks::GetRTAreaName(area).c_str())) {
+                                for (auto rt : trickIds) {
+                                    auto option = mSettings->GetTrickOption(rt);
+                                    if (!option.IsHidden() && trickSearch.PassFilter(option.GetName().c_str()) &&
+                                        !enabledTricks.count(rt) && Rando::Tricks::CheckRTTags(showTag, option.GetTags()) &&
+                                        !option.IsGlitch()) {
+                                        ImGui::TreeNodeSetOpen(ImGui::GetID(Rando::Tricks::GetRTAreaName(option.GetArea()).c_str()), areaTreeDisabled[option.GetArea()]);
+                                        ImGui::SetNextItemOpen(true, ImGuiCond_Once);
+                                        if (ImGui::ArrowButton(std::to_string(rt).c_str(), ImGuiDir_Right)) {
+                                            enabledTricks.insert(rt);
                                             std::string enabledTrickString = "";
                                             for (auto enabledTrickIt : enabledTricks) {
                                                 enabledTrickString += std::to_string(enabledTrickIt);
@@ -2240,16 +2210,16 @@ void RandomizerSettingsWindow::DrawElement() {
                                             CVarSetString("gRandomizeEnabledTricks", enabledTrickString.c_str());
                                             LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
                                         }
-                                        DrawTagChips(*rtObject.rtTags);
+                                        Rando::Tricks::DrawTagChips(option.GetTags());
                                         ImGui::SameLine();
-                                        ImGui::Text("%s", rtObject.rtShortName.c_str());
-                                        UIWidgets::InsertHelpHoverText(rtObject.rtDesc.c_str());
+                                        ImGui::Text("%s", option.GetName().c_str());
+                                        UIWidgets::InsertHelpHoverText(option.GetDescription().c_str());
                                     }
                                 }
-                                areaTreeDisabled[rtArea] = true;
+                                areaTreeDisabled[area] = true;
                                 ImGui::TreePop();
                             } else {
-                                areaTreeDisabled[rtArea] = false;
+                                areaTreeDisabled[area] = false;
                             }
                         }
                     }
@@ -2262,48 +2232,33 @@ void RandomizerSettingsWindow::DrawElement() {
                     window->DC.CurrLineTextBaseOffset = 0.0f;
 
                     if (ImGui::Button("Collapse All##enabled")) {
-                        for (auto [rtArea, rtObjects] : RandomizerTricks::GetAllRTObjectsByArea()) {
-                            bool hasTricks = false;
-                            for (auto [randomizerTrick, rtObject] : rtObjects) {
-                                if (rtObject.visibleInImgui && 
-                                    enabledTricks.count(rtObject.rt) && 
-                                    !rtObject.rtGlitch) {
-
-                                    hasTricks = true;
-                                    break;
-                                }
-                            }
-                            if (hasTricks) {
-                                areaTreeEnabled[rtArea] = false;
+                        for (int i = 0; i < RT_MAX; i++) {
+                            auto option = mSettings->GetTrickOption(static_cast<RandomizerTrick>(i));
+                            if (!option.IsHidden() && enabledTricks.count(static_cast<RandomizerTrick>(i)) &&
+                                !option.IsGlitch()) {
+                                areaTreeDisabled[option.GetArea()] = false;
                             }
                         }
                     }
                     ImGui::SameLine();
                     if (ImGui::Button("Open All##enabled")) {
-                        for (auto [rtArea, rtObjects] : RandomizerTricks::GetAllRTObjectsByArea()) {
-                            bool hasTricks = false;
-                            for (auto [randomizerTrick, rtObject] : rtObjects) {
-                                if (rtObject.visibleInImgui && 
-                                    enabledTricks.count(rtObject.rt) && 
-                                    !rtObject.rtGlitch) {
-
-                                    hasTricks = true;
-                                    break;
-                                }
-                            }
-                            if (hasTricks) {
-                                areaTreeEnabled[rtArea] = true;
+                        for (int i = 0; i < RT_MAX; i++) {
+                            auto option = mSettings->GetTrickOption(static_cast<RandomizerTrick>(i));
+                            if (option.IsHidden() && enabledTricks.count(static_cast<RandomizerTrick>(i)) &&
+                                !option.IsGlitch()) {
+                                areaTreeDisabled[option.GetArea()] = false;
                             }
                         }
                     }
                     ImGui::SameLine();
                     if (ImGui::Button("Disable Visible")) {
-                        for (auto [rtArea, rtObjects] : RandomizerTricks::GetAllRTObjectsByArea()) {
-                            for (auto [randomizerTrick, rtObject] : rtObjects) {
-                                auto etfound = enabledTricks.find(randomizerTrick);
-                                if (!rtObject.rtGlitch && etfound != enabledTricks.end() && trickSearch.PassFilter(rtObject.rtShortName.c_str()) && areaTreeEnabled[rtArea] && RandomizerTricks::CheckRTTags(showTag, *rtObject.rtTags)) {
-                                    enabledTricks.erase(etfound);
-                                }
+                        for (int i = 0; i < RT_MAX; i++) {
+                            auto option = mSettings->GetTrickOption(static_cast<RandomizerTrick>(i));
+                            if (!option.IsGlitch() && enabledTricks.count(static_cast<RandomizerTrick>(i)) &&
+                                trickSearch.PassFilter(option.GetName().c_str()) &&
+                                areaTreeEnabled[option.GetArea()] &&
+                                Rando::Tricks::CheckRTTags(showTag, option.GetTags())) {
+                                enabledTricks.insert(static_cast<RandomizerTrick>(i));
                             }
                         }
                         std::string enabledTrickString = "";
@@ -2317,54 +2272,52 @@ void RandomizerSettingsWindow::DrawElement() {
                     
                     ImGui::BeginChild("ChildTricksEnabled", ImVec2(0, -8), false, ImGuiWindowFlags_HorizontalScrollbar);
 
-                    for (auto [rtArea, rtObjects] : RandomizerTricks::GetAllRTObjectsByArea()) {
+                    for (auto [area, trickIds] : mSettings->mTricksByArea) {
                         bool hasTricks = false;
-                        for (auto [randomizerTrick, rtObject] : rtObjects) {
-                            if (rtObject.visibleInImgui &&
-                                trickSearch.PassFilter(rtObject.rtShortName.c_str()) &&
-                                enabledTricks.count(rtObject.rt) &&
-                                RandomizerTricks::CheckRTTags(showTag, *rtObject.rtTags) &&
-                                !rtObject.rtGlitch) {
-
+                        for (auto rt : trickIds) {
+                            auto option = mSettings->GetTrickOption(rt);
+                            if (!option.IsHidden() && trickSearch.PassFilter(option.GetName().c_str()) &&
+                                enabledTricks.count(rt) && Rando::Tricks::CheckRTTags(showTag, option.GetTags()) &&
+                                !option.IsGlitch()) {
                                 hasTricks = true;
                                 break;
                             }
                         }
                         if (hasTricks) {
-                            ImGui::TreeNodeSetOpen(ImGui::GetID(RandomizerTricks::GetRTAreaName(rtArea).c_str()), areaTreeEnabled[rtArea]);
+                            ImGui::TreeNodeSetOpen(ImGui::GetID(Rando::Tricks::GetRTAreaName(area).c_str()), areaTreeDisabled[area]);
                             ImGui::SetNextItemOpen(true, ImGuiCond_Once);
-                            if (ImGui::TreeNode(RandomizerTricks::GetRTAreaName(rtArea).c_str())) {
-                                for (auto [randomizerTrick, rtObject] : rtObjects) {
-                                    auto etfound = enabledTricks.find(rtObject.rt);
-                                    if (rtObject.visibleInImgui &&
-                                        trickSearch.PassFilter(rtObject.rtShortName.c_str()) &&
-                                        etfound != enabledTricks.end() &&
-                                        RandomizerTricks::CheckRTTags(showTag, *rtObject.rtTags) &&
-                                        !rtObject.rtGlitch) {
-                                        
-                                        if (ImGui::ArrowButton(std::to_string(rtObject.rt).c_str(), ImGuiDir_Left)) {
-                                            enabledTricks.erase(etfound);
+                            if (ImGui::TreeNode(Rando::Tricks::GetRTAreaName(area).c_str())) {
+                                for (auto rt : trickIds) {
+                                    auto option = mSettings->GetTrickOption(rt);
+                                    if (!option.IsHidden() && trickSearch.PassFilter(option.GetName().c_str()) &&
+                                        enabledTricks.count(rt) && Rando::Tricks::CheckRTTags(showTag, option.GetTags()) &&
+                                        !option.IsGlitch()) {
+                                        ImGui::TreeNodeSetOpen(ImGui::GetID(Rando::Tricks::GetRTAreaName(option.GetArea()).c_str()), areaTreeDisabled[option.GetArea()]);
+                                        ImGui::SetNextItemOpen(true, ImGuiCond_Once);
+                                        if (ImGui::ArrowButton(std::to_string(rt).c_str(), ImGuiDir_Left)) {
+                                            enabledTricks.insert(rt);
                                             std::string enabledTrickString = "";
                                             for (auto enabledTrickIt : enabledTricks) {
                                                 enabledTrickString += std::to_string(enabledTrickIt);
                                                 enabledTrickString += ",";
-                                            }
-                                            CVarSetString("gRandomizeEnabledTricks", enabledTrickString.c_str());
-                                            LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
                                         }
-                                        DrawTagChips(*rtObject.rtTags);
-                                        ImGui::SameLine();
-                                        ImGui::Text("%s", rtObject.rtShortName.c_str());
-                                        UIWidgets::InsertHelpHoverText(rtObject.rtDesc.c_str());
+                                        CVarSetString("gRandomizeEnabledTricks", enabledTrickString.c_str());
+                                        LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
+                                    }
+                                    Rando::Tricks::DrawTagChips(option.GetTags());
+                                    ImGui::SameLine();
+                                    ImGui::Text("%s", option.GetName().c_str());
+                                    UIWidgets::InsertHelpHoverText(option.GetDescription().c_str());
                                     }
                                 }
-                                areaTreeEnabled[rtArea] = true;
+                                areaTreeEnabled[area] = true;
                                 ImGui::TreePop();
                             } else {
-                                areaTreeEnabled[rtArea] = false;
+                                areaTreeEnabled[area] = false;
                             }
                         }
                     }
+
                     ImGui::EndChild();
                 } else {
                     ImGui::TableNextColumn();
diff --git a/soh/soh/Enhancements/randomizer/randomizer.h b/soh/soh/Enhancements/randomizer/randomizer.h
index 9dab10b99..b188cd421 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.h
+++ b/soh/soh/Enhancements/randomizer/randomizer.h
@@ -10,7 +10,6 @@
 #include "context.h"
 #include <soh/Enhancements/randomizer/randomizerTypes.h>
 #include "soh/Enhancements/randomizer/randomizer_check_objects.h"
-#include "soh/Enhancements/randomizer/randomizer_tricks.h"
 #include <soh/Enhancements/custom-message/CustomMessageManager.h>
 #include "soh/Enhancements/item-tables/ItemTableTypes.h"
 
diff --git a/soh/soh/Enhancements/randomizer/randomizer_tricks.cpp b/soh/soh/Enhancements/randomizer/randomizer_tricks.cpp
deleted file mode 100644
index 8a397f840..000000000
--- a/soh/soh/Enhancements/randomizer/randomizer_tricks.cpp
+++ /dev/null
@@ -1,392 +0,0 @@
-#include "randomizer_tricks.h"
-#include <map>
-#include <string>
-#include <libultraship/bridge.h>
-#include "z64.h"
-
-//Difficulty base tag vectors:
-std::vector<RandomizerTrickTag> noviceBase{RTTAG_NOVICE};
-std::vector<RandomizerTrickTag> intermediateBase{RTTAG_INTERMEDIATE};
-std::vector<RandomizerTrickTag> advancedBase{RTTAG_ADVANCED};
-std::vector<RandomizerTrickTag> expertBase{RTTAG_EXPERT};
-std::vector<RandomizerTrickTag> extremeBase{RTTAG_EXTREME};
-
-// Trick names and descriptions obtained from https://github.com/OoTRandomizer/OoT-Randomizer/blob/Dev/SettingsList.py with additions and edits
-// Difficulties initially decided on personal opinions, will be updated based on community feedback. todo: update glitch difficulties
-// Novice - if you were told X is possible, then you would be likely be able to do it either first time or it is something easily repeatable without any setup
-// Intermediate - may take a few attempts or a small setup to achieve, or is an easily repeatable trick with a small frame window
-// Advanced - may have a tight time window to achieve, have a long setup, or small frame window to perform
-// Expert - typically a series of small frame windows or longer setups, likely to require buffering
-// Extreme - this may require several frame perfect tricks, long setups or heavy reliance on environment to perform
-// Experimental - not implemented; these tricks may let you put the game into a softlockable state
-// Please see https://www.youtube.com/playlist?list=PLqsXSioZwQyoa23_27l5NZq5IZdKRi5Sm for reference on performing several of these tricks
-//            RandomizerTrick,                              RTVORMQ,         RTAREA,                         rt_tags                     rt_glitch (is it a glitch)                 "Short name", "Description"
-std::unordered_map<RandomizerTrick, RandomizerTrickObject> rtObjects = {
-    RT_OBJECT(RT_ACUTE_ANGLE_CLIP,                          RTVORMQ_BOTH,    RTAREA_GENERAL,                &advancedBase,               true,                                      "Acute angle clip", "Enables locations requiring jumpslash clips through walls which meet at an acute angle."),
-    RT_OBJECT(RT_ADVANCED_CLIPS,                            RTVORMQ_BOTH,    RTAREA_GENERAL,                &advancedBase,               true,                                      "Advanced clips", "Enables locations requiring clips through walls and objects requiring precise jumps or other tricks."),
-    RT_OBJECT(RT_BLANK_A,                                   RTVORMQ_BOTH,    RTAREA_GENERAL,                &advancedBase,               true,                                      "Blank A", "Enables locations requiring blank A button; NOTE: this requires the 'Quick Putaway' restoration."),
-    RT_OBJECT(RT_DOOM_JUMP,                                 RTVORMQ_BOTH,    RTAREA_GENERAL,                &advancedBase,               true,                                      "Doom Jump", "Enables locations requiring doom jumps."),
-    RT_OBJECT(RT_EPG,                                       RTVORMQ_BOTH,    RTAREA_GENERAL,                &advancedBase,               true,                                      "EPG", "Enables locations requiring use of the Entrance Point Glitch."),
-    RT_OBJECT(RT_EQUIP_SWAP,                                RTVORMQ_BOTH,    RTAREA_GENERAL,                &advancedBase,               true,                                      "Equip Swap", "Enables locations requiring use of equip swap; NOTE: this may expect the 'Allow cursor to be over any slot' enhancement to be turned off."),
-    RT_OBJECT(RT_EQUIP_SWAP_EXPECTS_DINS,                   RTVORMQ_BOTH,    RTAREA_GENERAL,                &advancedBase,               true,                                      "Equip Swap Require's Din's Fire", "Enables locations requiring use of equip swap once din's fire is found."),
-    RT_OBJECT(RT_FLAME_STORAGE,                             RTVORMQ_BOTH,    RTAREA_GENERAL,                &advancedBase,               true,                                      "Flame Storage", "Enables locations requiring flame storage."),
-    RT_OBJECT(RT_GROUND_CLIP,                               RTVORMQ_BOTH,    RTAREA_GENERAL,                &advancedBase,               true,                                      "Ground Clip", "Enables locations requiring ground clips."),
-    RT_OBJECT(RT_GROUND_JUMP,                               RTVORMQ_BOTH,    RTAREA_GENERAL,                &advancedBase,               true,                                      "Ground Jump", "Enables locations requiring ground jumps."),
-    RT_OBJECT(RT_HESS,                                      RTVORMQ_BOTH,    RTAREA_GENERAL,                &advancedBase,               true,                                      "HESS", "Enables locations requiring a Hyper Extended Super Slide."),
-    RT_OBJECT(RT_HOOKSHOT_CLIP,                             RTVORMQ_BOTH,    RTAREA_GENERAL,                &advancedBase,               true,                                      "Hookshot Clip", "Enables locations requiring hookshot clips."),
-    RT_OBJECT(RT_HOOKSHOT_JUMP,                             RTVORMQ_BOTH,    RTAREA_GENERAL,                &advancedBase,               true,                                      "Hookshot Jump", "Enables locations requiring hookshot jumps."),
-    RT_OBJECT(RT_ISG,                                       RTVORMQ_BOTH,    RTAREA_GENERAL,                &advancedBase,               true,                                      "ISG", "Enables locations requiring use of the infinite sword glitch."),
-    RT_OBJECT(RT_VISIBLE_COLLISION,                         RTVORMQ_BOTH,    RTAREA_GENERAL,                &noviceBase,                 false,                                     "Pass Through Visible One-Way Collision", "Allows climbing through the platform to reach Impa's House Back as adult with no items and going through the Kakariko Village Gate as child when coming from the Mountain Trail side."),
-    RT_OBJECT(RT_GROTTOS_WITHOUT_AGONY,                     RTVORMQ_BOTH,    RTAREA_GENERAL,                &noviceBase,                 false,                                     "Hidden Grottos without Stone of Agony", "Allows entering hidden grottos without the Stone of Agony."),
-    RT_OBJECT(RT_FEWER_TUNIC_REQUIREMENTS,                  RTVORMQ_BOTH,    RTAREA_GENERAL,                &intermediateBase,           false,                                     "Fewer Tunic Requirements", "Allows the following possible without Tunics:\n- Enter Water Temple. The area below the center pillar still requires Zora Tunic. Applies to MQ also.\n- Enter Fire Temple. Volvagia still requires Goron tunic. Applies to MQ also, and includes child access to first floor with dungeon shuffle."),
-    RT_OBJECT(RT_RUSTED_SWITCHES,                           RTVORMQ_BOTH,    RTAREA_GENERAL,                &noviceBase,                 false,                                     "Hammer Rusted Switches Through Walls", "Applies to: - Fire Temple Highest Goron Chest. - MQ Fire Temple Lizalfos Maze. - MQ Spirit Trial."),
-    RT_OBJECT(RT_FLAMING_CHESTS,                            RTVORMQ_BOTH,    RTAREA_GENERAL,                &intermediateBase,           false,                                     "Flaming Chests", "The chests encircled in flames in Gerudo Training Grounds and in Spirit Temple can be opened by running into the flames while Link is invincible after taking damage."),
-    //RT_OBJECT(RT_BUNNY_HOOD_JUMPS,                        RTVORMQ_BOTH,    RTAREA_GENERAL,                &advancedBase,               false,                                     "Bunny Hood Jumps", "Allows reaching locations using Bunny Hood's extended jumps."),
-    //RT_OBJECT(RT_DAMAGE_BOOST_SIMPLE,                     RTVORMQ_BOTH,    RTAREA_GENERAL,                &advancedBase,               false,                                     "Simple damage boosts", "Allows damage boosts to reach Hyrule Castle guards, the bomb bag area in DC and the Gerudo Valley crate Piece of Heart. Can be combined with \"Simple hover boosts\" for reaching far distances."),
-    //RT_OBJECT(RT_HOVER_BOOST_SIMPLE,                      RTVORMQ_BOTH,    RTAREA_GENERAL,                &advancedBase,               false,                                     "Simple hover boosts", "Allows equipping of hover boots when link is moving at high speeds to extend distance covered. Can be combined with \"Simple damage boosts\" for greater uses."),
-    RT_OBJECT(RT_KF_ADULT_GS,                               RTVORMQ_BOTH,    RTAREA_KOKIRI_FOREST,          &noviceBase,                 false,                                     "Adult Kokiri Forest GS with Hover Boots", "Can be obtained without Hookshot by using the Hover Boots off of one of the roots."),
-    RT_OBJECT(RT_LW_BRIDGE,                                 RTVORMQ_BOTH,    RTAREA_LOST_WOODS,             &expertBase,                 false,                                     "Jump onto the Lost Woods Bridge as Adult with Nothing", "With very precise movement it's possible for adult to jump onto the bridge without needing Longshot, Hover Boots, or Bean."),
-    RT_OBJECT(RT_LW_MIDO_BACKFLIP,                          RTVORMQ_BOTH,    RTAREA_LOST_WOODS,             &noviceBase,                 false,                                     "Backflip over Mido as Adult", "With a specific position and angle, you can backflip over Mido."),
-    RT_OBJECT(RT_LW_GS_BEAN,                                RTVORMQ_BOTH,    RTAREA_LOST_WOODS,             &intermediateBase,           false,                                     "Lost Woods Adult GS without Bean", "You can collect the token with a precise Hookshot use, as long as you can kill the Skulltula somehow first. It can be killed using Longshot, Bow, Bombchus or Din's Fire."),
-    RT_OBJECT(RT_HC_STORMS_GS,                              RTVORMQ_BOTH,    RTAREA_HYRULE_CASTLE,          &intermediateBase,           false,                                     "Hyrule Castle Storms Grotto GS with Just Boomerang", "With precise throws, the Boomerang alone can kill the Skulltula and collect the token, without first needing to blow up the wall."),
-    RT_OBJECT(RT_KAK_MAN_ON_ROOF,                           RTVORMQ_BOTH,    RTAREA_KAKARIKO_VILLAGE,       &noviceBase,                 false,                                     "Man on Roof without Hookshot", "Can be reached by side-hopping off the watchtower as either age, or by jumping onto the potion shop's roof from the ledge as adult."),
-    RT_OBJECT(RT_KAK_TOWER_GS,                              RTVORMQ_BOTH,    RTAREA_KAKARIKO_VILLAGE,       &intermediateBase,           false,                                     "Kakariko Tower GS with Jump Slash", "Climb the tower as high as you can without touching the Gold Skulltula, then let go and jump slash immediately. By jump-slashing from as low on the ladder as possible to still hit the Skulltula, this trick can be done without taking fall damage."),
-    RT_OBJECT(RT_KAK_ADULT_WINDMILL_POH,                    RTVORMQ_BOTH,    RTAREA_KAKARIKO_VILLAGE,       &noviceBase,                 false,                                     "Windmill PoH as Adult with Nothing", "Can jump up to the spinning platform from below as adult."),
-    //RT_OBJECT(RT_KAK_CHILD_WINDMILL_POH,                  RTVORMQ_BOTH,    RTAREA_KAKARIKO_VILLAGE,       &extremeBase,                false,                                     "Windmill PoH as Child with Precise Jump Slash", "Can jump up to the spinning platform from below as child with a precise jumpslash timed with the platforms rotation."),
-    RT_OBJECT(RT_KAK_ROOFTOP_GS,                            RTVORMQ_BOTH,    RTAREA_KAKARIKO_VILLAGE,       &advancedBase,               false,                                     "Kakariko Rooftop GS with Hover Boots", "Take the Hover Boots from the entrance to Impa's House over to the rooftop of Skulltula House. From there, a precise Hover Boots backwalk with backflip can be used to get onto a hill above the side of the village. And then from there you can Hover onto Impa's rooftop to kill the Skulltula and backflip into the token."),
-    RT_OBJECT(RT_GY_POH,                                    RTVORMQ_BOTH,    RTAREA_GRAVEYARD,              &intermediateBase,           false,                                     "Graveyard Freestanding PoH with Boomerang", "Using a precise moving setup you can obtain the Piece of Heart by having the Boomerang interact with it along the return path."),
-    RT_OBJECT(RT_GY_CHILD_DAMPE_RACE_POH,                   RTVORMQ_BOTH,    RTAREA_GRAVEYARD,              &noviceBase,                 false,                                     "Second Dampe Race as Child", "It is possible to complete the second dampe race as child in under a minute, but it is a strict time limit."),
-    RT_OBJECT(RT_GY_SHADOW_FIRE_ARROWS,                     RTVORMQ_BOTH,    RTAREA_GRAVEYARD,              &expertBase,                 false,                                     "Shadow Temple Entry with Fire Arrows", "It is possible to light all of the torches to open the Shadow Temple entrance with just Fire Arrows, but you must be very quick, precise, and strategic with how you take your shots."),
-    RT_OBJECT(RT_DMT_SOIL_GS,                               RTVORMQ_BOTH,    RTAREA_DEATH_MOUNTAIN_TRAIL,   &intermediateBase,           false,                                     "Death Mountain Trail Soil GS without Destroying Boulder", "Bugs will go into the soft soil even while the boulder is still blocking the entrance. Then, using a precise moving setup you can kill the Gold Skulltula and obtain the token by having the Boomerang interact with it along the return path."),
-    RT_OBJECT(RT_DMT_BOMBABLE,                              RTVORMQ_BOTH,    RTAREA_DEATH_MOUNTAIN_TRAIL,   &intermediateBase,           false,                                     "Death Mountain Trail Chest with Strength", "Child Link can blow up the wall using a nearby bomb flower. You must backwalk with the flower and then quickly throw it toward the wall."),
-    RT_OBJECT(RT_DMT_HOOKSHOT_LOWER_GS,                     RTVORMQ_BOTH,    RTAREA_DEATH_MOUNTAIN_TRAIL,   &intermediateBase,           false,                                     "Death Mountain Trail Lower Red Rock GS with Hookshot", "After killing the Skulltula, the token can be fished out of the rock without needing to destroy it, by using the Hookshot in the correct way."),
-    RT_OBJECT(RT_DMT_HOVERS_LOWER_GS,                       RTVORMQ_BOTH,    RTAREA_DEATH_MOUNTAIN_TRAIL,   &advancedBase,               false,                                     "Death Mountain Trail Lower Red Rock GS with Hover Boots", "After killing the Skulltula, the token can be collected without needing to destroy the rock by backflipping down onto it with the Hover Boots. First use the Hover Boots to stand on a nearby fence, and go for the Skulltula Token from there."),
-    RT_OBJECT(RT_DMT_BEAN_LOWER_GS,                         RTVORMQ_BOTH,    RTAREA_DEATH_MOUNTAIN_TRAIL,   &expertBase,                 false,                                     "Death Mountain Trail Lower Red Rock GS with Magic Bean", "After killing the Skulltula, the token can be collected without needing to destroy the rock by jumping down onto it from the bean plant, midflight, with precise timing and positioning."),
-    RT_OBJECT(RT_DMT_JS_LOWER_GS,                           RTVORMQ_BOTH,    RTAREA_DEATH_MOUNTAIN_TRAIL,   &intermediateBase,           false,                                     "Death Mountain Trail Lower Red Rock GS with Jump Slash", "After killing the Skulltula, the token can be collected without needing to destroy the rock by jump slashing from a precise angle."),
-    RT_OBJECT(RT_DMT_CLIMB_HOVERS,                          RTVORMQ_BOTH,    RTAREA_DEATH_MOUNTAIN_TRAIL,   &advancedBase,               false,                                     "Death Mountain Trail Climb with Hover Boots", "It is possible to use the Hover Boots to bypass needing to destroy the boulders blocking the path to the top of Death Mountain."),
-    RT_OBJECT(RT_DMT_UPPER_GS,                              RTVORMQ_BOTH,    RTAREA_DEATH_MOUNTAIN_TRAIL,   &noviceBase,                 false,                                     "Death Mountain Trail Upper Red Rock GS without Hammer", "After killing the Skulltula, the token can be collected by backflipping into the rock at the correct angle."),
-    //RT_OBJECT(RT_DMT_BOLERO_BIGGORON,                     RTVORMQ_BOTH,    RTAREA_DEATH_MOUNTAIN_TRAIL,   &intermediateBase,           false,                                     "Deliver Eye Drops with Bolero of Fire", "Playing a warp song normally causes a trade item to spoil immediately, however, it is possible use Bolero to reach Biggoron and still deliver the Eye Drops before they spoil. If you do not wear the Goron Tunic, the heat timer inside the crater will override the trade item\'s timer. When you exit to Death Mountain Trail you will have one second to show the Eye Drops before they expire. You can get extra time to show the Eye Drops if you warp immediately upon receiving them. If you don't have many hearts, you may have to reset the heat timer by quickly dipping in and out of Darunia\'s chamber or quickly equipping and unequipping the Goron Tunic. This trick does not apply if \"Randomize Warp Song Destinations\" is enabled, or if the settings are such that trade items do not need to be delivered within a time limit."),
-    RT_OBJECT(RT_GC_POT,                                    RTVORMQ_BOTH,    RTAREA_GORON_CITY,             &advancedBase,               false,                                     "Goron City Spinning Pot PoH with Bombchu", "A Bombchu can be used to stop the spinning pot, but it can be quite finicky to get it to work."),
-    RT_OBJECT(RT_GC_POT_STRENGTH,                           RTVORMQ_BOTH,    RTAREA_GORON_CITY,             &intermediateBase,           false,                                     "Goron City Spinning Pot PoH with Strength", "Allows for stopping the Goron City Spinning Pot using a bomb flower alone, requiring strength in lieu of inventory explosives."),
-    RT_OBJECT(RT_GC_ROLLING_STRENGTH,                       RTVORMQ_BOTH,    RTAREA_GORON_CITY,             &intermediateBase,           false,                                     "Rolling Goron (Hot Rodder Goron) as Child with Strength", "Use the bombflower on the stairs or near Medigoron. Timing is tight, especially without backwalking."),
-    RT_OBJECT(RT_GC_LINK_GORON_DINS,                        RTVORMQ_BOTH,    RTAREA_GORON_CITY,             &noviceBase,                 false,                                     "Stop Link the Goron with Din\'s Fire","The timing is quite awkward."),
-    RT_OBJECT(RT_GC_LEFTMOST,                               RTVORMQ_BOTH,    RTAREA_GORON_CITY,             &advancedBase,               false,                                     "Goron City Maze Left Chest with Hover Boots", "A precise backwalk starting from on top of the crate and ending with a precisely-timed backflip can reach this chest without needing either the Hammer or Silver Gauntlets."),
-    RT_OBJECT(RT_GC_GROTTO,                                 RTVORMQ_BOTH,    RTAREA_GORON_CITY,             &advancedBase,               false,                                     "Goron City Grotto with Hookshot While Taking Damage", "It is possible to reach the Goron City Grotto by quickly using the Hookshot while in the midst of taking damage from the lava floor."),
-    RT_OBJECT(RT_DMC_HOVER_BEAN_POH,                        RTVORMQ_BOTH,    RTAREA_DEATH_MOUNTAIN_CRATER,  &noviceBase,                 false,                                     "Crater\'s Bean PoH with Hover Boots", "Hover from the base of the bridge near Goron City and walk up the very steep slope."),
-    RT_OBJECT(RT_DMC_BOLERO_JUMP,                           RTVORMQ_BOTH,    RTAREA_DEATH_MOUNTAIN_CRATER,  &extremeBase,                false,                                     "Death Mountain Crater Jump to Bolero", "As Adult , using a shield to drop a pot while you have the perfect speed and position, the pot can push you that little extra distance you need to jump across the gap in the bridge."),
-    RT_OBJECT(RT_DMC_BOULDER_JS,                            RTVORMQ_BOTH,    RTAREA_DEATH_MOUNTAIN_CRATER,  &noviceBase,                 false,                                     "Death Mountain Crater Upper to Lower with Hammer", "With the Hammer, you can jump slash the rock twice in the same jump in order to destroy it before you fall into the lava."),
-    RT_OBJECT(RT_DMC_BOULDER_SKIP,                          RTVORMQ_BOTH,    RTAREA_DEATH_MOUNTAIN_CRATER,  &intermediateBase,           false,                                     "Death Mountain Crater Upper to Lower Boulder Skip", "As adult, With careful positioning, you can jump to the ledge where the boulder is, then use repeated ledge grabs to shimmy to a climbable ledge. This trick supersedes \"Death Mountain Crater Upper to Lower with Hammer\"."),
-    RT_OBJECT(RT_ZR_LOWER,                                  RTVORMQ_BOTH,    RTAREA_ZORAS_RIVER,            &intermediateBase,           false,                                     "Zora\'s River Lower Freestanding PoH as Adult with Nothing", "Adult can reach this PoH with a precise jump, no Hover Boots required."),
-    RT_OBJECT(RT_ZR_UPPER,                                  RTVORMQ_BOTH,    RTAREA_ZORAS_RIVER,            &intermediateBase,           false,                                     "Zora\'s River Upper Freestanding PoH as Adult with Nothing", "Adult can reach this PoH with a precise jump, no Hover Boots required."),
-    RT_OBJECT(RT_ZR_CUCCO,                                  RTVORMQ_BOTH,    RTAREA_ZORAS_RIVER,            &noviceBase,                 false,                                     "Zora\'s Domain Entry with Cucco", "You can fly behind the waterfall with a Cucco as child."),
-    RT_OBJECT(RT_ZR_HOVERS,                                 RTVORMQ_BOTH,    RTAREA_ZORAS_RIVER,            &noviceBase,                 false,                                     "Zora\'s Domain Entry with Hover Boots", "Can hover behind the waterfall as adult."),
-    RT_OBJECT(RT_ZD_KING_ZORA_SKIP,                         RTVORMQ_BOTH,    RTAREA_ZORAS_DOMAIN,           &intermediateBase,           false,                                     "Skip King Zora as Adult with Nothing", "With a precise jump as adult, it is possible to get on the fence next to King Zora from the front to access Zora's Fountain."),
-    RT_OBJECT(RT_ZD_GS,                                     RTVORMQ_BOTH,    RTAREA_ZORAS_DOMAIN,           &intermediateBase,           false,                                     "Zora\'s Domain GS with No Additional Items", "A precise jump slash can kill the Skulltula and recoil back onto the top of the frozen waterfall. To kill it, the logic normally guarantees one of Hookshot, Bow, or Magic."),
-    RT_OBJECT(RT_LH_LAB_WALL_GS,                            RTVORMQ_BOTH,    RTAREA_LAKE_HYLIA,             &noviceBase,                 false,                                     "Lake Hylia Lab Wall GS with Jump Slash", "The jump slash to actually collect the token is somewhat precise."),
-    RT_OBJECT(RT_LH_LAB_DIVING,                             RTVORMQ_BOTH,    RTAREA_LAKE_HYLIA,             &noviceBase,                 false,                                     "Lake Hylia Lab Dive without Gold Scale", "Remove the Iron Boots in the midst of Hookshotting the underwater crate."),
-    RT_OBJECT(RT_LH_WATER_HOOKSHOT,                         RTVORMQ_BOTH,    RTAREA_LAKE_HYLIA,             &intermediateBase,           false,                                     "Water Temple Entry without Iron Boots using Hookshot", "When entering Water Temple using Gold Scale instead of Iron Boots, the Longshot is usually used to be able to hit the switch and open the gate. But, by standing in a particular spot, the switch can be hit with only the reach of the Hookshot."),
-    RT_OBJECT(RT_GV_CRATE_HOVERS,                           RTVORMQ_BOTH,    RTAREA_GERUDO_VALLEY,          &intermediateBase,           false,                                     "Gerudo Valley Crate PoH as Adult with Hover Boots", "From the far side of Gerudo Valley, a precise Hover Boots movement and jump-slash recoil can allow adult to reach the ledge with the crate PoH without needing Longshot. You will take fall damage."),
-    RT_OBJECT(RT_GF_KITCHEN,                                RTVORMQ_BOTH,    RTAREA_GERUDO_FORTRESS,        &noviceBase,                 false,                                     "Thieves\' Hideout \"Kitchen\" with No Additional Items", "Allows passing through the kitchen by avoiding being seen by the guards. The logic normally guarantees Bow or Hookshot to stun them from a distance, or Hover Boots to cross the room without needing to deal with the guards."),
-    RT_OBJECT(RT_GF_JUMP,                                   RTVORMQ_BOTH,    RTAREA_GERUDO_FORTRESS,        &noviceBase,                 false,                                     "Gerudo\'s Fortress Ledge Jumps", "Adult can jump onto the top roof of the fortress without going through the interior of the hideout."),
-    //RT_OBJECT(RT_HW_BUNNY_CROSSING,                       RTVORMQ_BOTH,    RTAREA_WASTELAND,              &noviceBase,                 false,                                     "Wasteland Crossing with Bunny Hood","You can beat the quicksand by using the increased speed of the Bunny Hood. Note that jumping to the carpet merchant as child typically requires a fairly precise jump slash."),
-    RT_OBJECT(RT_HW_CROSSING,                               RTVORMQ_BOTH,    RTAREA_WASTELAND,              &intermediateBase,           false,                                     "Wasteland Crossing without Hover Boots or Longshot", "You can beat the quicksand by backwalking across it in a specific way. Note that jumping to the carpet merchant as child typically requires a fairly precise jump slash."),
-    RT_OBJECT(RT_LENS_HW,                                   RTVORMQ_BOTH,    RTAREA_WASTELAND,              &intermediateBase,           false,                                     "Lensless Wasteland", "By memorizing the path, you can travel through the Wasteland without using the Lens of Truth to see the Poe. The equivalent trick for going in reverse through the Wasteland is \"Reverse Wasteland\"."),
-    RT_OBJECT(RT_HW_REVERSE,                                RTVORMQ_BOTH,    RTAREA_WASTELAND,              &intermediateBase,           false,                                     "Reverse Wasteland", "By memorizing the path, you can travel through the Wasteland in reverse. Note that jumping to the carpet merchant as child typically requires a fairly precise jump slash. The equivalent trick for going forward through the Wasteland is \"Lensless Wasteland\". To cross the river of sand with no additional items, be sure to also enable \"Wasteland Crossing without Hover Boots or Longshot\". Unless all overworld entrances are randomized, child Link will not be expected to do anything at Gerudo's Fortress."),
-    RT_OBJECT(RT_COLOSSUS_GS,                               RTVORMQ_BOTH,    RTAREA_DESERT_COLOSSUS,        &noviceBase,                 false,                                     "Colossus Hill GS with Hookshot", "Somewhat precise. If you kill enough Leevers you can get enough of a break to take some time to aim more carefully."),
-    RT_OBJECT(RT_DEKU_BASEMENT_GS,                          RTVORMQ_VANILLA, RTAREA_DEKU_TREE,              &noviceBase,                 false,                                     "Deku Tree Basement Vines GS with Jump Slash", "Can be defeated by doing a precise jump slash."),
-    RT_OBJECT(RT_DEKU_B1_SKIP,                              RTVORMQ_BOTH,    RTAREA_DEKU_TREE,              &intermediateBase,           false,                                     "Deku Tree Basement without Slingshot", "A precise jump can be used to skip needing to use the Slingshot to go around B1 of the Deku Tree. If used with the \"Closed Forest\" setting, a Slingshot will not be guaranteed to exist somewhere inside the Forest. This trick applies to both Vanilla and Master Quest."),
-    RT_OBJECT(RT_DEKU_B1_BOW_WEBS,                          RTVORMQ_VANILLA, RTAREA_DEKU_TREE,              &noviceBase,                 false,                                     "Deku Tree Basement Web to Gohma with Bow", "All spider web walls in the Deku Tree basement can be burnt as adult with just a bow by shooting through torches. This trick only applies to the circular web leading to Gohma; the two vertical webs are always in logic. Backflip onto the chest near the torch at the bottom of the vine wall. With precise positioning you can shoot through the torch to the right edge of the circular web. This allows completion of adult Deku Tree with no fire source."),
-    RT_OBJECT(RT_DEKU_MQ_COMPASS_GS,                        RTVORMQ_MQ,      RTAREA_DEKU_TREE,              &noviceBase,                 false,                                     "Deku Tree MQ Compass Room GS Boulders with Just Hammer", "Climb to the top of the vines, then let go and jump slash immediately to destroy the boulders using the Hammer, without needing to spawn a Song of Time block."),
-    RT_OBJECT(RT_DEKU_MQ_LOG,                               RTVORMQ_MQ,      RTAREA_DEKU_TREE,              &noviceBase,                 false,                                     "Deku Tree MQ Roll Under the Spiked Log", "You can get past the spiked log by rolling to briefly shrink your hitbox. As adult, the timing is a bit more precise."),
-    RT_OBJECT(RT_DC_SCARECROW_GS,                           RTVORMQ_VANILLA, RTAREA_DODONGOS_CAVERN,        &noviceBase,                 false,                                     "Dodongo\'s Cavern Scarecrow GS with Armos Statue", "You can jump off an Armos Statue to reach the alcove with the Gold Skulltula. It takes quite a long time to pull the statue the entire way. The jump to the alcove can be a bit picky when done as child."),
-    RT_OBJECT(RT_DC_VINES_GS,                               RTVORMQ_VANILLA, RTAREA_DODONGOS_CAVERN,        &noviceBase,                 false,                                     "Dodongo\'s Cavern Vines GS from Below with Longshot", "The vines upon which this Skulltula rests are one- sided collision. You can use the Longshot to get it from below, by shooting it through the vines, bypassing the need to lower the staircase."),
-    RT_OBJECT(RT_DC_STAIRCASE,                              RTVORMQ_VANILLA, RTAREA_DODONGOS_CAVERN,        &noviceBase,                 false,                                     "Dodongo\'s Cavern Staircase with Bow", "The Bow can be used to knock down the stairs with two well-timed shots."),
-    RT_OBJECT(RT_DC_SLINGSHOT_SKIP,                         RTVORMQ_VANILLA, RTAREA_DODONGOS_CAVERN,        &expertBase,                 false,                                     "Dodongo\'s Cavern Child Slingshot Skips", "With precise platforming, child can cross the platforms while the flame circles are there. When enabling this trick, it's recommended that you also enable the Adult variant: \"Dodongo's Cavern Spike Trap Room Jump without Hover Boots\"."),
-    RT_OBJECT(RT_DC_SCRUB_ROOM,                             RTVORMQ_VANILLA, RTAREA_DODONGOS_CAVERN,        &noviceBase,                 false,                                     "Dodongo\'s Cavern Two Scrub Room with Strength", "With help from a conveniently-positioned block, Adult can quickly carry a bomb flower over to destroy the mud wall blocking the room with two Deku Scrubs."),
-    RT_OBJECT(RT_DC_JUMP,                                   RTVORMQ_BOTH,    RTAREA_DODONGOS_CAVERN,        &noviceBase,                 false,                                     "Dodongo\'s Cavern Spike Trap Room Jump without Hover Boots", "The jump is adult Link only. Applies to both Vanilla and MQ."),
-    RT_OBJECT(RT_DC_HAMMER_FLOOR,                           RTVORMQ_BOTH,    RTAREA_DODONGOS_CAVERN,        &noviceBase,                 false,                                     "Dodongo\'s Cavern Smash the Boss Lobby Floor", "The bombable floor before King Dodongo can be destroyed with Hammer if hit in the very center. This is only relevant with Shuffle Boss Entrances or if Dodongo's Cavern is MQ and either variant of \"Dodongo's Cavern MQ Light the Eyes with Strength\" is on."),
-    RT_OBJECT(RT_DC_MQ_CHILD_BOMBS,                         RTVORMQ_MQ,      RTAREA_DODONGOS_CAVERN,        &advancedBase,               false,                                     "Dodongo\'s Cavern MQ Early Bomb Bag Area as Child", "With a precise jump slash from above, you can reach the Bomb Bag area as only child without needing a Slingshot. You will take fall damage."),
-    RT_OBJECT(RT_DC_MQ_CHILD_EYES,                          RTVORMQ_MQ,      RTAREA_DODONGOS_CAVERN,        &expertBase,                 false,                                     "Dodongo\'s Cavern MQ Light the Eyes with Strength as Child", "If you move very quickly, it is possible to use the bomb flower at the top of the room to light the eyes. To perform this trick as child is significantly more difficult than adult. The player is also expected to complete the DC back area without explosives, including getting past the Armos wall to the switch for the boss door."),
-    RT_OBJECT(RT_DC_MQ_ADULT_EYES,                          RTVORMQ_MQ,      RTAREA_DODONGOS_CAVERN,        &advancedBase,               false,                                     "Dodongo\'s Cavern MQ Light the Eyes with Strength as Adult", "If you move very quickly, it is possible to use the bomb flower at the top of the room to light the eyes."),
-    RT_OBJECT(RT_JABU_ALCOVE_JUMP_DIVE,                     RTVORMQ_BOTH,    RTAREA_JABU_JABUS_BELLY,       &noviceBase,                 false,                                     "Jabu Underwater Alcove as Adult with Jump Dive", "Standing above the underwater tunnel leading to the scrub, jump down and swim through the tunnel. This allows adult to access the alcove with no Scale or Iron Boots. In vanilla Jabu, this alcove has a business scrub. In MQ Jabu, it has the compass chest and a door switch for the main floor."),
-    RT_OBJECT(RT_JABU_BOSS_HOVER,                           RTVORMQ_VANILLA, RTAREA_JABU_JABUS_BELLY,       &intermediateBase,           false,                                     "Jabu Near Boss Room with Hover Boots", "A box for the blue switch can be carried over by backwalking with one while the elevator is at its peak. Alternatively, you can skip transporting a box by quickly rolling from the switch and opening the door before it closes. However, the timing for this is very tight."),
-    RT_OBJECT(RT_JABU_NEAR_BOSS_RANGED,                     RTVORMQ_BOTH,    RTAREA_JABU_JABUS_BELLY,       &noviceBase,                 false,                                     "Jabu Near Boss Ceiling Switch/GS without Boomerang or Explosives", "Vanilla Jabu: From near the entrance into the room, you can hit the switch that opens the door to the boss room using a precisely-aimed use of the Slingshot, Bow, or Longshot. As well, if you climb to the top of the vines you can stand on the right edge of the platform and shoot around the glass. From this distance, even the Hookshot can reach the switch. This trick is only relevant if \"Shuffle Boss Entrances\" is enabled. MQ Jabu: A Gold Skulltula Token can be collected with the Hookshot or Longshot using the same methods as hitting the switch in vanilla. This MQ trick is not currently relevant in logic."),
-    RT_OBJECT(RT_JABU_NEAR_BOSS_EXPLOSIVES,                 RTVORMQ_VANILLA, RTAREA_JABU_JABUS_BELLY,       &intermediateBase,           false,                                     "Jabu Near Boss Ceiling Switch with Explosives", "You can hit the switch that opens the door to the boss room using a precisely-aimed Bombchu. Also, using the Hover Boots, adult can throw a Bomb at the switch. This trick is only relevant if \"Shuffle Boss Entrances\" is enabled."),
-    RT_OBJECT(RT_LENS_JABU_MQ,                              RTVORMQ_MQ,      RTAREA_JABU_JABUS_BELLY,       &noviceBase,                 false,                                     "Jabu MQ without Lens of Truth", "Removes the requirements for the Lens of Truth in Jabu MQ."),
-    //RT_OBJECT(RT_JABU_MQ_RANG_JUMP,                       RTVORMQ_MQ,      RTAREA_JABU_JABUS_BELLY,       &advancedBase,               false,                                     "Jabu MQ Compass Chest with Boomerang", "Boomerang can reach the cow switch to spawn the chest by targeting the cow, jumping off of the ledge where the chest spawns, and throwing the Boomerang in midair. This is only relevant with Jabu Jabu's Belly dungeon shortcuts enabled."),
-    RT_OBJECT(RT_JABU_MQ_SOT_GS,                            RTVORMQ_MQ,      RTAREA_JABU_JABUS_BELLY,       &intermediateBase,           false,                                     "Jabu MQ Song of Time Block GS with Boomerang", "Allow the Boomerang to return to you through the Song of Time block to grab the token."),
-    RT_OBJECT(RT_LENS_BOTW,                                 RTVORMQ_VANILLA, RTAREA_BOTTOM_OF_THE_WELL,     &noviceBase,                 false,                                     "Bottom of the Well without Lens of Truth", "Removes the requirements for the Lens of Truth in Bottom of the Well."),
-    RT_OBJECT(RT_BOTW_CHILD_DEADHAND,                       RTVORMQ_BOTH,    RTAREA_BOTTOM_OF_THE_WELL,     &noviceBase,                 false,                                     "Child Dead Hand without Kokiri Sword", "Requires 9 sticks or 5 jump slashes."),
-    RT_OBJECT(RT_BOTW_BASEMENT,                             RTVORMQ_VANILLA, RTAREA_BOTTOM_OF_THE_WELL,     &noviceBase,                 false,                                     "Bottom of the Well Map Chest with Strength & Sticks", "The chest in the basement can be reached with strength by doing a jump slash with a lit stick to access the bomb flowers."),
-    RT_OBJECT(RT_BOTW_MQ_PITS,                              RTVORMQ_MQ,      RTAREA_BOTTOM_OF_THE_WELL,     &noviceBase,                 false,                                     "Bottom of the Well MQ Jump Over the Pits", "While the pits in Bottom of the Well don't allow you to jump just by running straight at them, you can still get over them by side-hopping or backflipping across. With explosives, this allows you to access the central areas without Zelda's Lullaby. With Zelda's Lullaby, it allows you to access the west inner room without explosives."),
-    RT_OBJECT(RT_BOTW_MQ_DEADHAND_KEY,                      RTVORMQ_MQ,      RTAREA_BOTTOM_OF_THE_WELL,     &noviceBase,                 false,                                     "Bottom of the Well MQ Dead Hand Freestanding Key with Boomerang", "Boomerang can fish the item out of the rubble without needing explosives to blow it up."),
-    RT_OBJECT(RT_FOREST_FIRST_GS,                           RTVORMQ_VANILLA, RTAREA_FOREST_TEMPLE,          &noviceBase,                 false,                                     "Forest Temple First Room GS with Difficult-to-Use Weapons", "Allows killing this Skulltula with Sword or Sticks by jump slashing it as you let go from the vines. You can avoid taking fall damage by recoiling onto the tree. Also allows killing it as Child with a Bomb throw. It's much more difficult to use a Bomb as child due to Child Link's shorter height."),
-    RT_OBJECT(RT_FOREST_OUTDOORS_EAST_GS,                   RTVORMQ_VANILLA, RTAREA_FOREST_TEMPLE,          &noviceBase,                 false,                                     "Forest Temple East Courtyard GS with Boomerang", "Precise Boomerang throws can allow child to kill the Skulltula and collect the token."),
-    RT_OBJECT(RT_FOREST_VINES,                              RTVORMQ_BOTH,    RTAREA_FOREST_TEMPLE,          &noviceBase,                 false,                                     "Forest Temple East Courtyard Vines with Hookshot", "The vines in Forest Temple leading to where the well drain switch is in the standard form can be barely reached with just the Hookshot. Applies to MQ also."),
-    RT_OBJECT(RT_FOREST_OUTDOORS_LEDGE,                     RTVORMQ_BOTH,    RTAREA_FOREST_TEMPLE,          &noviceBase,                 false,                                     "Forest Temple NE Outdoors Ledge with Hover Boots", "With precise Hover Boots movement you can fall down to this ledge from upper balconies. If done precisely enough, it is not necessary to take fall damage. In MQ, this skips a Longshot requirement. In Vanilla, this can skip a Hookshot requirement in entrance randomizer."),
-    RT_OBJECT(RT_FOREST_DOORFRAME,                          RTVORMQ_BOTH,    RTAREA_FOREST_TEMPLE,          &advancedBase,               false,                                     "Forest Temple East Courtyard Door Frame with Hover Boots", "A precise Hover Boots movement from the upper balconies in this courtyard can be used to get on top of the door frame. Applies to both Vanilla and Master Quest. In Vanilla, from on top the door frame you can summon Pierre, allowing you to access the falling ceiling room early. In Master Quest, this allows you to obtain the GS on the door frame as adult without Hookshot or Song of Time."),
-    RT_OBJECT(RT_FOREST_OUTSIDE_BACKDOOR,                   RTVORMQ_BOTH,    RTAREA_FOREST_TEMPLE,          &advancedBase,               false,                                     "Forest Temple Outside Backdoor with Jump Slash", "A jump slash recoil can be used to reach the ledge in the block puzzle room that leads to the west courtyard. This skips a potential Hover Boots requirement in vanilla, and it can sometimes apply in MQ as well. This trick can be performed as both ages."),
-    RT_OBJECT(RT_FOREST_MQ_WELL_SWIM,                       RTVORMQ_MQ,      RTAREA_FOREST_TEMPLE,          &advancedBase,               false,                                     "Swim Through Forest Temple MQ Well with Hookshot", "Shoot the vines in the well as low and as far to the right as possible, and then immediately swim under the ceiling to the right. This can only be required if Forest Temple is in its Master Quest form."),
-    RT_OBJECT(RT_FOREST_MQ_BLOCK_PUZZLE,                    RTVORMQ_MQ,      RTAREA_FOREST_TEMPLE,          &noviceBase,                 false,                                     "Skip Forest Temple MQ Block Puzzle with Bombchu", "Send the Bombchu straight up the center of the wall directly to the left upon entering the room."),
-    RT_OBJECT(RT_FOREST_MQ_JS_HALLWAY_SWITCH,               RTVORMQ_MQ,      RTAREA_FOREST_TEMPLE,          &noviceBase,                 false,                                     "Forest Temple MQ Twisted Hallway Switch with Jump Slash", "The switch to twist the hallway can be hit with a jump slash through the glass block. To get in front of the switch, either use the Hover Boots or hit the shortcut switch at the top of the room and jump from the glass blocks that spawn. Sticks can be used as child, but the Kokiri Sword is too short to reach through the glass."),
-    //RT_OBJECT(RT_FOREST_MQ_HOOKSHOT_HALLWAY_SWITCH,       RTVORMQ_MQ,      RTAREA_FOREST_TEMPLE,          &intermediateBase,           false,                                     "Forest Temple MQ Twisted Hallway Switch with Hookshot", "There's a very small gap between the glass block and the wall. Through that gap you can hookshot the target on the ceiling."),
-    RT_OBJECT(RT_FOREST_MQ_RANG_HALLWAY_SWITCH,             RTVORMQ_MQ,      RTAREA_FOREST_TEMPLE,          &intermediateBase,           false,                                     "Forest Temple MQ Twisted Hallway Switch with Boomerang", "The Boomerang can return to Link through walls, allowing child to hit the hallway switch. This can be used to allow adult to pass through later, or in conjuction with \"Forest Temple Outside Backdoor with Jump Slash\"."),
-    RT_OBJECT(RT_FIRE_BOSS_DOOR_JUMP,                       RTVORMQ_BOTH,    RTAREA_FIRE_TEMPLE,            &noviceBase,                 false,                                     "Fire Temple Boss Door without Hover Boots or Pillar", "The Fire Temple Boss Door can be reached as adult with a precise jump. You must be touching the side wall of the room so that Link will grab the ledge from farther away than is normally possible."),
-    RT_OBJECT(RT_FIRE_SOT,                                  RTVORMQ_VANILLA, RTAREA_FIRE_TEMPLE,            &intermediateBase,           false,                                     "Fire Temple Song of Time Room GS without Song of Time", "A precise jump can be used to reach this room."),
-    RT_OBJECT(RT_FIRE_STRENGTH,                             RTVORMQ_VANILLA, RTAREA_FIRE_TEMPLE,            &intermediateBase,           false,                                     "Fire Temple Climb without Strength", "A precise jump can be used to skip pushing the block."),
-    RT_OBJECT(RT_FIRE_SCARECROW,                            RTVORMQ_VANILLA, RTAREA_FIRE_TEMPLE,            &expertBase,                 false,                                     "Fire Temple East Tower without Scarecrow\'s Song", "Also known as \"Pixelshot\". The Longshot can reach the target on the elevator itself, allowing you to skip needing to spawn the scarecrow."),
-    RT_OBJECT(RT_FIRE_FLAME_MAZE,                           RTVORMQ_VANILLA, RTAREA_FIRE_TEMPLE,            &intermediateBase,           false,                                     "Fire Temple Flame Wall Maze Skip", "If you move quickly you can sneak past the edge of a flame wall before it can rise up to block you. To do it without taking damage is more precise. Allows you to progress without needing either a Small Key or Hover Boots."),
-    RT_OBJECT(RT_FIRE_MQ_NEAR_BOSS,                         RTVORMQ_MQ,      RTAREA_FIRE_TEMPLE,            &noviceBase,                 false,                                     "Fire Temple MQ Chest Near Boss without Breaking Crate", "The hitbox for the torch extends a bit outside of the crate. Shoot a flaming arrow at the side of the crate to light the torch without needing to get over there and break the crate."),
-    RT_OBJECT(RT_FIRE_MQ_BLOCKED_CHEST,                     RTVORMQ_MQ,      RTAREA_FIRE_TEMPLE,            &intermediateBase,           false,                                     "Fire Temple MQ Big Lava Room Blocked Door without Hookshot", "There is a gap between the hitboxes of the flame wall in the big lava room. If you know where this gap is located, you can jump through it and skip needing to use the Hookshot. To do this without taking damage is more precise."),
-    RT_OBJECT(RT_FIRE_MQ_BK_CHEST,                          RTVORMQ_MQ,      RTAREA_FIRE_TEMPLE,            &intermediateBase,           false,                                     "Fire Temple MQ Boss Key Chest without Bow", "It is possible to light both of the timed torches to unbar the door to the boss key chest's room with just Din's Fire if you move very quickly between the two torches. It is also possible to unbar the door with just Din's by abusing an oversight in the way the game counts how many torches have been lit."),
-    RT_OBJECT(RT_FIRE_MQ_CLIMB,                             RTVORMQ_MQ,      RTAREA_FIRE_TEMPLE,            &noviceBase,                 false,                                     "Fire Temple MQ Climb without Fire Source", "You can use the Hover Boots to hover around to the climbable wall, skipping the need to use a fire source and spawn a Hookshot target."),
-    RT_OBJECT(RT_FIRE_MQ_MAZE_SIDE_ROOM,                    RTVORMQ_MQ,      RTAREA_FIRE_TEMPLE,            &noviceBase,                 false,                                     "Fire Temple MQ Lizalfos Maze Side Room without Box", "You can walk from the blue switch to the door and quickly open the door before the bars reclose. This skips needing to reach the upper sections of the maze to get a box to place on the switch."),
-    RT_OBJECT(RT_FIRE_MQ_MAZE_HOVERS,                       RTVORMQ_MQ,      RTAREA_FIRE_TEMPLE,            &noviceBase,                 false,                                     "Fire Temple MQ Lower to Upper Lizalfos Maze with Hover Boots", "Use the Hover Boots off of a crate to climb to the upper maze without needing to spawn and use the Hookshot targets."),
-    RT_OBJECT(RT_FIRE_MQ_MAZE_JUMP,                         RTVORMQ_MQ,      RTAREA_FIRE_TEMPLE,            &intermediateBase,           false,                                     "Fire Temple MQ Lower to Upper Lizalfos Maze with Precise Jump", "A precise jump off of a crate can be used to climb to the upper maze without needing to spawn and use the Hookshot targets. This trick supersedes both \"Fire Temple MQ Lower to Upper Lizalfos Maze with Hover Boots\" and \"Fire Temple MQ Lizalfos Maze Side Room without Box\"."),
-    RT_OBJECT(RT_FIRE_MQ_ABOVE_MAZE_GS,                     RTVORMQ_MQ,      RTAREA_FIRE_TEMPLE,            &intermediateBase,/*todo*/   false,                                     "Fire Temple MQ Above Flame Wall Maze GS from Below with Longshot", "The floor of the room that contains this Skulltula is only solid from above. From the maze below, the Longshot can be shot through the ceiling to obtain the token with two fewer small keys than normal."),
-    RT_OBJECT(RT_FIRE_MQ_FLAME_MAZE,                        RTVORMQ_MQ,      RTAREA_FIRE_TEMPLE,            &intermediateBase,           false,                                     "Fire Temple MQ Flame Wall Maze Skip", "If you move quickly you can sneak past the edge of a flame wall before it can rise up to block you. To do it without taking damage is more precise. Allows you to reach the side room GS without needing Song of Time or Hover Boots. If either of \"Fire Temple MQ Lower to Upper Lizalfos Maze with Hover Boots\" or \"with Precise Jump\" are enabled, this also allows you to progress deeper into the dungeon without Hookshot."),
-    RT_OBJECT(RT_WATER_LONGSHOT_TORCH,                      RTVORMQ_VANILLA, RTAREA_WATER_TEMPLE,           &noviceBase,                 false,                                     "Water Temple Torch Longshot", "Stand on the eastern side of the central pillar and longshot the torches on the bottom level. Swim through the corridor and float up to the top level. This allows access to this area and lower water levels without Iron Boots. The majority of the tricks that allow you to skip Iron Boots in the Water Temple are not going to be relevant unless this trick is first enabled."),
-    RT_OBJECT(RT_WATER_CRACKED_WALL_HOVERS,                 RTVORMQ_VANILLA, RTAREA_WATER_TEMPLE,           &noviceBase,                 false,                                     "Water Temple Cracked Wall with Hover Boots", "With a midair side-hop while wearing the Hover Boots, you can reach the cracked wall without needing to raise the water up to the middle level."),
-    RT_OBJECT(RT_WATER_CRACKED_WALL,                        RTVORMQ_VANILLA, RTAREA_WATER_TEMPLE,           &intermediateBase,           false,                                     "Water Temple Cracked Wall with No Additional Items", "A precise jump slash (among other methods) will get you to the cracked wall without needing the Hover Boots or to raise the water to the middle level. This trick supersedes \"Water Temple Cracked Wall with Hover Boots\"."),
-    RT_OBJECT(RT_WATER_BK_REGION,                           RTVORMQ_VANILLA, RTAREA_WATER_TEMPLE,           &intermediateBase,           false,                                     "Water Temple Boss Key Region with Hover Boots", "With precise Hover Boots movement it is possible to reach the boss key chest's region without needing the Longshot. It is not necessary to take damage from the spikes. The Gold Skulltula Token in the following room can also be obtained with just the Hover Boots."),
-    RT_OBJECT(RT_WATER_NORTH_BASEMENT_LEDGE_JUMP,           RTVORMQ_BOTH,    RTAREA_WATER_TEMPLE,           &intermediateBase,           false,                                     "Water Temple North Basement Ledge with Precise Jump", "In the northern basement there's a ledge from where, in vanilla Water Temple, boulders roll out into the room. Normally to jump directly to this ledge logically requires the Hover Boots, but with precise jump, it can be done without them. This trick applies to both Vanilla and Master Quest."),
-    RT_OBJECT(RT_WATER_BK_JUMP_DIVE,                        RTVORMQ_VANILLA, RTAREA_WATER_TEMPLE,           &noviceBase,                 false,                                     "Water Temple Boss Key Jump Dive", "Stand on the very edge of the raised corridor leading from the push block room to the rolling boulder corridor. Face the gold skulltula on the waterfall and jump over the boulder corridor floor into the pool of water, swimming right once underwater. This allows access to the boss key room without Iron boots."),
-    RT_OBJECT(RT_WATER_FW_CENTRAL_GS,                       RTVORMQ_VANILLA, RTAREA_WATER_TEMPLE,           &noviceBase,                 false,                                     "Water Temple Central Pillar GS with Farore\'s Wind", "If you set Farore's Wind inside the central pillar and then return to that warp point after raising the water to the highest level, you can obtain this Skulltula Token with Hookshot or Boomerang."), 
-    RT_OBJECT(RT_WATER_IRONS_CENTRAL_GS,                    RTVORMQ_VANILLA, RTAREA_WATER_TEMPLE,           &noviceBase,                 false,                                     "Water Temple Central Pillar GS with Iron Boots", "After opening the middle water level door into the central pillar, the door will stay unbarred so long as you do not leave the room -- even if you were to raise the water up to the highest level. With the Iron Boots to go through the door after the water has been raised, you can obtain the Skulltula Token with the Hookshot."), 
-    RT_OBJECT(RT_WATER_CENTRAL_BOW,                         RTVORMQ_VANILLA, RTAREA_WATER_TEMPLE,           &advancedBase,               false,                                     "Water Temple Central Bow Target without Longshot or Hover Boots", "A very precise Bow shot can hit the eye switch from the floor above. Then, you can jump down into the hallway and make through it before the gate closes. It can also be done as child, using the Slingshot instead of the Bow."),
-    RT_OBJECT(RT_WATER_HOOKSHOT_FALLING_PLATFORM_GS,        RTVORMQ_VANILLA, RTAREA_WATER_TEMPLE,           &noviceBase,                 false,                                     "Water Temple Falling Platform Room GS with Hookshot", "If you stand on the very edge of the platform, this Gold Skulltula can be obtained with only the Hookshot."),
-    RT_OBJECT(RT_WATER_RANG_FALLING_PLATFORM_GS,            RTVORMQ_VANILLA, RTAREA_WATER_TEMPLE,           &intermediateBase,           false,                                     "Water Temple Falling Platform Room GS with Boomerang", "If you stand on the very edge of the platform, this Gold Skulltula can be obtained with only the Boomerang."),
-    RT_OBJECT(RT_WATER_RIVER_GS,                            RTVORMQ_VANILLA, RTAREA_WATER_TEMPLE,           &intermediateBase,           false,                                     "Water Temple River GS without Iron Boots", "Standing on the exposed ground toward the end of the river, a precise Longshot use can obtain the token. The Longshot cannot normally reach far enough to kill the Skulltula, however. You'll first have to find some other way of killing it."),
-    RT_OBJECT(RT_WATER_DRAGON_JUMP_DIVE,                    RTVORMQ_BOTH,    RTAREA_WATER_TEMPLE,           &noviceBase,                 false,                                     "Water Temple Dragon Statue Jump Dive", "If you come into the dragon statue room from the serpent river, you can jump down from above and get into the tunnel without needing either Iron Boots or a Scale. This trick applies to both Vanilla and Master Quest. In Vanilla, you must shoot the switch from above with the Bow, and then quickly get through the tunnel before the gate closes."),
-    RT_OBJECT(RT_WATER_ADULT_DRAGON,                        RTVORMQ_VANILLA, RTAREA_WATER_TEMPLE,           &noviceBase,                 false,                                     "Water Temple Dragon Statue Switch from Above the Water as Adult", "Normally you need both Hookshot and Iron Boots to hit the switch and swim through the tunnel to get to the chest. But by hitting the switch from dry land, using one of Bombchus, Hookshot, or Bow, it is possible to skip one or both of those requirements. After the gate has been opened, besides just using the Iron Boots, a well-timed dive with at least the Silver Scale could be used to swim through the tunnel. If coming from the serpent river, a jump dive can also be used to get into the tunnel."),
-    RT_OBJECT(RT_WATER_CHILD_DRAGON,                        RTVORMQ_VANILLA, RTAREA_WATER_TEMPLE,           &advancedBase,               false,                                     "Water Temple Dragon Statue Switch from Above the Water as Child", "It is possible for child to hit the switch from dry land using one of Bombchus, Slingshot or Boomerang. Then, to get to the chest, child can dive through the tunnel using at least the Silver Scale. The timing and positioning of this dive needs to be perfect to actually make it under the gate, and it all needs to be done very quickly to be able to get through before the gate closes. Be sure to enable \"Water Temple Dragon Statue Switch from Above the Water as Adult\" for adult's variant of this trick."),
-    RT_OBJECT(RT_WATER_MQ_CENTRAL_PILLAR,                   RTVORMQ_MQ,      RTAREA_WATER_TEMPLE,           &noviceBase,                 false,                                     "Water Temple MQ Central Pillar with Fire Arrows", "Slanted torches have misleading hitboxes. Whenever you see a slanted torch jutting out of the wall, you can expect most or all of its hitbox is actually on the other side that wall. This can make slanted torches very finicky to light when using arrows. The torches in the central pillar of MQ Water Temple are a particularly egregious example. Logic normally expects Din's Fire and Song of Time."),
-    RT_OBJECT(RT_WATER_MQ_LOCKED_GS,                        RTVORMQ_MQ,      RTAREA_WATER_TEMPLE,           &noviceBase,                 false,                                     "Water Temple MQ North Basement GS without Small Key", "There is an invisible Hookshot target that can be used to get over the gate that blocks you from going to this Skulltula early, skipping a small key as well as needing Hovers or Scarecrow to reach the locked door."),
-    RT_OBJECT(RT_LENS_SHADOW,                               RTVORMQ_VANILLA, RTAREA_SHADOW_TEMPLE,          &noviceBase,                 false,                                     "Shadow Temple Stationary Objects without Lens of Truth", "Removes the requirements for the Lens of Truth in Shadow Temple for most areas in the dungeon except for crossing the moving platform in the huge pit room and for fighting Bongo Bongo."),
-    RT_OBJECT(RT_LENS_SHADOW_PLATFORM,                      RTVORMQ_VANILLA, RTAREA_SHADOW_TEMPLE,          &noviceBase,                 false,                                     "Shadow Temple Invisible Moving Platform without Lens of Truth", "Removes the requirements for the Lens of Truth in Shadow Temple to cross the invisible moving platform in the huge pit room in either direction."),
-    RT_OBJECT(RT_LENS_BONGO,                                RTVORMQ_BOTH,    RTAREA_SHADOW_TEMPLE,          &noviceBase,                 false,                                     "Shadow Temple Bongo Bongo without Lens of Truth", "Bongo Bongo can be defeated without the use of Lens of Truth, as the hands give a pretty good idea of where the eye is."),
-    RT_OBJECT(RT_SHADOW_UMBRELLA,                           RTVORMQ_BOTH,    RTAREA_SHADOW_TEMPLE,          &expertBase,                 false,                                     "Shadow Temple Stone Umbrella Skip", "A very precise Hover Boots movement from off of the lower chest can get you on top of the crushing spikes without needing to pull the block. Applies to both Vanilla and Master Quest."), 
-    RT_OBJECT(RT_SHADOW_UMBRELLA_GS,                        RTVORMQ_BOTH,    RTAREA_SHADOW_TEMPLE,          &expertBase,                 false,                                     "Shadow Temple Falling Spikes GS with Hover Boots", "After killing the Skulltula, a very precise Hover Boots movement from off of the lower chest can get you on top of the crushing spikes without needing to pull the block. From there, another very precise Hover Boots movement can be used to obtain the token without needing the Hookshot. Applies to both Vanilla and Master Quest. For obtaining the chests in this room with just Hover Boots, be sure to enable \"Shadow Temple Stone Umbrella Skip\"."),       
-    RT_OBJECT(RT_SHADOW_FREESTANDING_KEY,                   RTVORMQ_VANILLA, RTAREA_SHADOW_TEMPLE,          &noviceBase,                 false,                                     "Shadow Temple Freestanding Key with Bombchu", "Release the Bombchu with good timing so that it explodes near the bottom of the pot."),
-    RT_OBJECT(RT_SHADOW_STATUE,                             RTVORMQ_BOTH,    RTAREA_SHADOW_TEMPLE,          &intermediateBase,           false,                                     "Shadow Temple River Statue with Bombchu", "By sending a Bombchu around the edge of the gorge, you can knock down the statue without needing a Bow. Applies in both vanilla and MQ Shadow."),
-    RT_OBJECT(RT_SHADOW_BONGO,                              RTVORMQ_BOTH,    RTAREA_SHADOW_TEMPLE,          &intermediateBase,           false,                                     "Shadow Temple Bongo Bongo without projectiles", "Using precise sword slashes, Bongo Bongo can be defeated without using projectiles. This is only relevant in conjunction with Shadow Temple dungeon shortcuts or shuffled boss entrances."),
-    RT_OBJECT(RT_LENS_SHADOW_MQ,                            RTVORMQ_MQ,      RTAREA_SHADOW_TEMPLE,          &noviceBase,                 false,                                     "Shadow Temple MQ Stationary Objects without Lens of Truth", "Removes the requirements for the Lens of Truth in Shadow Temple MQ for most areas in the dungeon. See \"Shadow Temple MQ Invisible Moving Platform without Lens of Truth\", \"Shadow Temple MQ Invisible Blades Silver Rupees without Lens of Truth\", \"Shadow Temple MQ 2nd Dead Hand without Lens of Truth\", and \"Shadow Temple Bongo Bongo without Lens of Truth\" for exceptions."),
-    RT_OBJECT(RT_LENS_SHADOW_MQ_INVISIBLE_BLADES,           RTVORMQ_MQ,      RTAREA_SHADOW_TEMPLE,          &noviceBase,                 false,                                     "Shadow Temple MQ Invisible Blades Silver Rupees without Lens of Truth", "Removes the requirement for the Lens of Truth or Nayru's Love in Shadow Temple MQ for the Invisible Blades room silver rupee collection."),
-    RT_OBJECT(RT_LENS_SHADOW_MQ_PLATFORM,                   RTVORMQ_MQ,      RTAREA_SHADOW_TEMPLE,          &noviceBase,                 false,                                     "Shadow Temple MQ Invisible Moving Platform without Lens of Truth", "Removes the requirements for the Lens of Truth in Shadow Temple MQ to cross the invisible moving platform in the huge pit room in either direction."),
-    RT_OBJECT(RT_LENS_SHADOW_MQ_DEADHAND,                   RTVORMQ_MQ,      RTAREA_SHADOW_TEMPLE,          &noviceBase,                 false,                                     "Shadow Temple MQ 2nd Dead Hand without Lens of Truth", "Dead Hand spawns in a random spot within the room. Having Lens removes the hassle of having to comb the room looking for his spawn location."),
-    RT_OBJECT(RT_SHADOW_MQ_GAP,                             RTVORMQ_MQ,      RTAREA_SHADOW_TEMPLE,          &intermediateBase,           false,                                     "Shadow Temple MQ Truth Spinner Gap with Longshot", "You can Longshot a torch and jump-slash recoil onto the tongue. It works best if you Longshot the right torch from the left side of the room."),
-    RT_OBJECT(RT_SHADOW_MQ_INVISIBLE_BLADES,                RTVORMQ_MQ,      RTAREA_SHADOW_TEMPLE,          &intermediateBase,           false,                                     "Shadow Temple MQ Invisible Blades without Song of Time", "The Like Like can be used to boost you into the silver rupee or recovery hearts that normally require Song of Time. This cannot be performed on OHKO since the Like Like does not boost you high enough if you die."),
-    RT_OBJECT(RT_SHADOW_MQ_HUGE_PIT,                        RTVORMQ_MQ,      RTAREA_SHADOW_TEMPLE,          &intermediateBase,           false,                                     "Shadow Temple MQ Lower Huge Pit without Fire Source", "Normally a frozen eye switch spawns some platforms that you can use to climb down, but there's actually a small piece of ground that you can stand on that you can just jump down to."),
-    //RT_OBJECT(RT_SHADOW_MQ_WINDY_WALKWAY,                 RTVORMQ_MQ,      RTAREA_SHADOW_TEMPLE,          &intermediateBase, todo      false,                                     "Shadow Temple MQ Windy Walkway Reverse without Hover Boots", "With shadow dungeon shortcuts enabled, it is possible to jump from the alcove in the windy hallway to the middle platform. There are two methods: wait out the fan opposite the door and hold forward, or jump to the right to be pushed by the fan there towards the platform ledge. Note that jumps of this distance are inconsistent, but still possible."),
-    RT_OBJECT(RT_LENS_SPIRIT,                               RTVORMQ_VANILLA, RTAREA_SPIRIT_TEMPLE,          &noviceBase,                 false,                                     "Spirit Temple without Lens of Truth", "Removes the requirements for the Lens of Truth in Spirit Temple."),
-    RT_OBJECT(RT_SPIRIT_CHILD_CHU,                          RTVORMQ_VANILLA, RTAREA_SPIRIT_TEMPLE,          &noviceBase,                 false,                                     "Spirit Temple Child Side Bridge with Bombchu", "A carefully-timed Bombchu can hit the switch."),
-    RT_OBJECT(RT_SPIRIT_LOBBY_GS,                           RTVORMQ_VANILLA, RTAREA_SPIRIT_TEMPLE,          &noviceBase,                 false,                                     "Spirit Temple Main Room GS with Boomerang", "Standing on the highest part of the arm of the statue, a precise Boomerang throw can kill and obtain this Gold Skulltula. You must throw the Boomerang slightly off to the side so that it curves into the Skulltula, as aiming directly at it will clank off of the wall in front."),
-    RT_OBJECT(RT_SPIRIT_LOWER_ADULT_SWITCH,                 RTVORMQ_VANILLA, RTAREA_SPIRIT_TEMPLE,          &advancedBase,               false,                                     "Spirit Temple Lower Adult Switch with Bombs", "A bomb can be used to hit the switch on the ceiling, but it must be thrown from a particular distance away and with precise timing."),
-    RT_OBJECT(RT_SPIRIT_LOBBY_JUMP,                         RTVORMQ_BOTH,    RTAREA_SPIRIT_TEMPLE,          &intermediateBase,           false,                                     "Spirit Temple Main Room Jump from Hands to Upper Ledges", "A precise jump to obtain the following as adult without needing one of Hover Boots, or Hookshot (in vanilla) or Song of Time (in MQ): - Spirit Temple Statue Room Northeast Chest - Spirit Temple GS Lobby - Spirit Temple MQ Central Chamber Top Left Pot (Left) - Spirit Temple MQ Central Chamber Top Left Pot (Right)"),
-    //RT_OBJECT(RT_SPIRIT_PLATFORM_HOOKSHOT,                RTVORMQ_VANILLA, RTAREA_SPIRIT_TEMPLE,          &intermediateBase,           false,                                     "Spirit Temple Main Room Hookshot to Boss Platform", "Precise hookshot aiming at the platform chains can be used to reach the boss platform from the middle landings. Using a jump slash immediately after reaching a chain makes aiming more lenient. Relevant only when Spirit Temple boss shortcuts are on."),
-    RT_OBJECT(RT_SPIRIT_MAP_CHEST,                          RTVORMQ_VANILLA, RTAREA_SPIRIT_TEMPLE,          &noviceBase,                 false,                                     "Spirit Temple Map Chest with Bow", "To get a line of sight from the upper torch to the map chest torches, you must pull an Armos statue all the way up the stairs."),
-    RT_OBJECT(RT_SPIRIT_SUN_CHEST,                          RTVORMQ_VANILLA, RTAREA_SPIRIT_TEMPLE,          &advancedBase,               false,                                     "Spirit Temple Sun Block Room Chest with Bow", "Using the blocks in the room as platforms you can get lines of sight to all three torches. The timer on the torches is quite short so you must move quickly in order to light all three."),
-    RT_OBJECT(RT_SPIRIT_WALL,                               RTVORMQ_VANILLA, RTAREA_SPIRIT_TEMPLE,          &intermediateBase,           false,                                     "Spirit Temple Shifting Wall with No Additional Items", "Logic normally guarantees a way of dealing with both the Beamos and the Walltula before climbing the wall."),
-    RT_OBJECT(RT_LENS_SPIRIT_MQ,                            RTVORMQ_MQ,      RTAREA_SPIRIT_TEMPLE,          &noviceBase,                 false,                                     "Spirit Temple MQ without Lens of Truth", "Removes the requirements for the Lens of Truth in Spirit Temple MQ."),
-    RT_OBJECT(RT_SPIRIT_MQ_SUN_BLOCK_SOT,                   RTVORMQ_MQ,      RTAREA_SPIRIT_TEMPLE,          &intermediateBase,           false,                                     "Spirit Temple MQ Sun Block Room as Child without Song of Time", "While adult can easily jump directly to the switch that unbars the door to the sun block room, child Link cannot make the jump without spawning a Song of Time block to jump from. You can skip this by throwing the crate down onto the switch from above, which does unbar the door, however the crate immediately breaks, so you must move quickly to get through the door before it closes back up."),
-    RT_OBJECT(RT_SPIRIT_MQ_SUN_BLOCK_GS,                    RTVORMQ_MQ,      RTAREA_SPIRIT_TEMPLE,          &intermediateBase,           false,                                     "Spirit Temple MQ Sun Block Room GS with Boomerang", "Throw the Boomerang in such a way that it curves through the side of the glass block to hit the Gold Skulltula."),
-    RT_OBJECT(RT_SPIRIT_MQ_LOWER_ADULT,                     RTVORMQ_MQ,      RTAREA_SPIRIT_TEMPLE,          &intermediateBase,           false,                                     "Spirit Temple MQ Lower Adult without Fire Arrows", "By standing in a precise position it is possible to light two of the torches with a single use of Din\'s Fire. This saves enough time to be able to light all three torches with only Din\'s."),
-    RT_OBJECT(RT_SPIRIT_MQ_FROZEN_EYE,                      RTVORMQ_MQ,      RTAREA_SPIRIT_TEMPLE,          &noviceBase,                 false,                                     "Spirit Temple MQ Frozen Eye Switch without Fire", "You can melt the ice by shooting an arrow through a torch. The only way to find a line of sight for this shot is to first spawn a Song of Time block, and then stand on the very edge of it."),
-    RT_OBJECT(RT_ICE_BLOCK_GS,                              RTVORMQ_VANILLA, RTAREA_ICE_CAVERN,             &intermediateBase,           false,                                     "Ice Cavern Block Room GS with Hover Boots", "The Hover Boots can be used to get in front of the Skulltula to kill it with a jump slash. Then, the Hover Boots can again be used to obtain the Token, all without Hookshot or Boomerang."),
-    RT_OBJECT(RT_ICE_MQ_RED_ICE_GS,                         RTVORMQ_MQ,      RTAREA_ICE_CAVERN,             &intermediateBase,           false,                                     "Ice Cavern MQ Red Ice GS without Song of Time", "If you side-hop into the perfect position, you can briefly stand on the platform with the red ice just long enough to dump some blue fire."),
-    RT_OBJECT(RT_ICE_MQ_SCARECROW,                          RTVORMQ_MQ,      RTAREA_ICE_CAVERN,             &intermediateBase,  /*todo*/ false,                                     "Ice Cavern MQ Scarecrow GS with No Additional Items", "As adult a precise jump can be used to reach this alcove."),
-    RT_OBJECT(RT_LENS_GTG,                                  RTVORMQ_VANILLA, RTAREA_GERUDO_TRAINING_GROUND, &noviceBase,                 false,                                     "Gerudo Training Ground without Lens of Truth", "Removes the requirements for the Lens of Truth in Gerudo Training Ground."),
-    RT_OBJECT(RT_GTG_WITHOUT_HOOKSHOT,                      RTVORMQ_VANILLA, RTAREA_GERUDO_TRAINING_GROUND, &intermediateBase,           false,                                     "Gerudo Training Ground Left Side Silver Rupees without Hookshot", "After collecting the rest of the silver rupees in the room, you can reach the final silver rupee on the ceiling by being pulled up into it after getting grabbed by the Wallmaster. Then, you must also reach the exit of the room without the use of the Hookshot. If you move quickly you can sneak past the edge of a flame wall before it can rise up to block you. To do so without taking damage is more precise."),
-    RT_OBJECT(RT_GTG_FAKE_WALL,                             RTVORMQ_BOTH,    RTAREA_GERUDO_TRAINING_GROUND, &noviceBase,                 false,                                     "Reach Gerudo Training Ground Fake Wall Ledge with Hover Boots", "A precise Hover Boots use from the top of the chest can allow you to grab the ledge without needing the usual requirements. In Master Quest, this always skips a Song of Time requirement. In Vanilla, this skips a Hookshot requirement, but is only relevant if \"Gerudo Training Ground Left Side Silver Rupees without Hookshot\" is enabled."),
-    RT_OBJECT(RT_LENS_GTG_MQ,                               RTVORMQ_MQ,      RTAREA_GERUDO_TRAINING_GROUND, &noviceBase,                 false,                                     "Gerudo Training Ground MQ without Lens of Truth", "Removes the requirements for the Lens of Truth in Gerudo Training Ground MQ."),
-    RT_OBJECT(RT_GTG_MQ_WITH_HOOKSHOT,                      RTVORMQ_MQ,      RTAREA_GERUDO_TRAINING_GROUND, &noviceBase,                 false,                                     "Gerudo Training Ground MQ Left Side Silver Rupees with Hookshot", "The highest silver rupee can be obtained by hookshotting the target and then immediately jump slashing toward the rupee."),
-    RT_OBJECT(RT_GTG_MQ_WIHTOUT_HOOKSHOT,                   RTVORMQ_MQ,      RTAREA_GERUDO_TRAINING_GROUND, &intermediateBase,           false,                                     "Gerudo Training Ground MQ Left Side Silver Rupees without Hookshot", "After collecting the rest of the silver rupees in the room, you can reach the final silver rupee on the ceiling by being pulled up into it after getting grabbed by the Wallmaster. The Wallmaster will not track you to directly underneath the rupee. You should take the last step to be under the rupee after the Wallmaster has begun its attempt to grab you. Also included with this trick is that fact that the switch that unbars the door to the final chest of GTG can be hit without a projectile, using a precise jump slash. This trick supersedes \"Gerudo Training Ground MQ Left Side Silver Rupees with Hookshot\"."),
-    RT_OBJECT(RT_LENS_GANON,                                RTVORMQ_VANILLA, RTAREA_GANONS_CASTLE,          &noviceBase,                 false,                                     "Ganon\'s Castle without Lens of Truth", "Removes the requirements for the Lens of Truth in Ganon's Castle."),
-    RT_OBJECT(RT_GANON_SPIRIT_TRIAL_HOOKSHOT,               RTVORMQ_VANILLA, RTAREA_GANONS_CASTLE,          &noviceBase,                 false,                                     "Spirit Trial without Hookshot", "The highest rupee can be obtained as either age by performing a precise jump and a well-timed jumpslash off of an Armos."),
-    RT_OBJECT(RT_LENS_GANON_MQ,                             RTVORMQ_MQ,      RTAREA_GANONS_CASTLE,          &noviceBase,                 false,                                     "Ganon\'s Castle MQ without Lens of Truth", "Removes the requirements for the Lens of Truth in Ganon's Castle MQ."),
-    RT_OBJECT(RT_GANON_MQ_FIRE_TRIAL,                       RTVORMQ_MQ,      RTAREA_GANONS_CASTLE,          &advancedBase,  /*todo*/     false,                                     "Fire Trial MQ with Hookshot", "It's possible to hook the target at the end of fire trial with just Hookshot, but it requires precise aim and perfect positioning. The main difficulty comes from getting on the very corner of the obelisk without falling into the lava."),
-    RT_OBJECT(RT_GANON_MQ_SHADOW_TRIAL,                     RTVORMQ_MQ,      RTAREA_GANONS_CASTLE,          &noviceBase,                 false,                                     "Shadow Trial MQ Torch with Bow", "You can light the torch in this room without a fire source by shooting an arrow through the lit torch at the beginning of the room. Because the room is so dark and the unlit torch is so far away, it can be difficult to aim the shot correctly."),
-    RT_OBJECT(RT_GANON_MQ_LIGHT_TRIAL,                      RTVORMQ_MQ,      RTAREA_GANONS_CASTLE,          &intermediateBase,  /*todo*/ false,                                     "Light Trial MQ without Hookshot", "If you move quickly you can sneak past the edge of a flame wall before it can rise up to block you. In this case to do it without taking damage is especially precise.")
-};
-
-std::unordered_map<RandomizerTrickArea, std::string> rtAreaNames = {
-    { RTAREA_GENERAL, "General Tricks"},
-    //{ RTAREA_BK_SKIPS, "Boss Key Skips"},
-    { RTAREA_KOKIRI_FOREST, "Kokiri Forest"},
-    { RTAREA_LOST_WOODS, "Lost Woods"},
-    { RTAREA_SACRED_FOREST_MEADOW, "Sacred Forest Meadow"},
-    { RTAREA_HYRULE_FIELD, "Hyrule Field"},
-    { RTAREA_LAKE_HYLIA, "Lake Hylia"},
-    { RTAREA_GERUDO_VALLEY, "Gerudo Valley"},
-    { RTAREA_GERUDO_FORTRESS, "Gerudo Fortress"},
-    { RTAREA_WASTELAND, "Haunted Wasteland"},   
-    { RTAREA_DESERT_COLOSSUS, "Desert Colossus"},
-    { RTAREA_MARKET, "Hyrule Market"},
-    { RTAREA_HYRULE_CASTLE, "Hyrule Castle"},
-    { RTAREA_KAKARIKO_VILLAGE, "Kakariko Village"},    
-    { RTAREA_GRAVEYARD, "Graveyard"},
-    { RTAREA_DEATH_MOUNTAIN_TRAIL, "Death Mountain Trail"},
-    { RTAREA_GORON_CITY, "Goron City"},
-    { RTAREA_DEATH_MOUNTAIN_CRATER, "Death Mountain Crater"},
-    { RTAREA_ZORAS_RIVER, "Zora's River"},
-    { RTAREA_ZORAS_DOMAIN, "Zora's Domain"},
-    { RTAREA_ZORAS_FOUNTAIN, "Zora's Fountain"},
-    { RTAREA_LON_LON_RANCH, "Lon Lon Ranch"},
-    { RTAREA_DEKU_TREE, "Deku Tree"},
-    { RTAREA_DODONGOS_CAVERN, "Dodongo's Cavern"},
-    { RTAREA_JABU_JABUS_BELLY, "Jabu Jabu's Belly"},    
-    { RTAREA_FOREST_TEMPLE, "Forest Temple"},    
-    { RTAREA_FIRE_TEMPLE, "Fire Temple"},    
-    { RTAREA_WATER_TEMPLE, "Water Temple"},
-    { RTAREA_SPIRIT_TEMPLE, "Spirit Temple"},
-    { RTAREA_SHADOW_TEMPLE, "Shadow Temple"},
-    { RTAREA_BOTTOM_OF_THE_WELL, "Bottom of the Well"},
-    { RTAREA_ICE_CAVERN, "Ice Cavern"},
-    { RTAREA_GERUDO_TRAINING_GROUND, "Gerudo Training Grounds"},
-    { RTAREA_GANONS_CASTLE, "Ganon's Castle"},
-    { RTAREA_INVALID, "Invalid"},
-};
-
-std::unordered_map<RandomizerTrickTag, std::string> rtTagNames = {
-    {RTTAG_NOVICE, "Novice"},
-    {RTTAG_INTERMEDIATE, "Intermediate"},
-    {RTTAG_ADVANCED, "Advanced"},
-    {RTTAG_EXPERT, "Expert"},
-    {RTTAG_EXTREME, "Extreme"},
-    /*{RTTAG_LENS, "Lens"},
-    {RTTAG_BKSKIP, "Boss Key Skip"},
-    {RTTAG_EXPERIMENTAL, "Experimental"}*/
-};
-
-std::unordered_map<RandomizerTrickArea, std::unordered_map<RandomizerTrick, RandomizerTrickObject>> rtObjectsByArea = {};
-
-std::unordered_map<RandomizerTrick, RandomizerTrickObject> RandomizerTricks::GetAllRTObjects() {
-    return rtObjects;
-}
-
-std::unordered_map<RandomizerTrickArea, std::unordered_map<RandomizerTrick,RandomizerTrickObject>> RandomizerTricks::GetAllRTObjectsByArea() {
-    if (rtObjectsByArea.size() == 0) {
-        for (auto& [randomizerTrick, rtObject] : rtObjects) {
-            rtObjectsByArea[rtObject.rtArea][randomizerTrick] = rtObject;
-        }
-    }
-
-    return rtObjectsByArea;
-}
-
-std::string RandomizerTricks::GetRTAreaName(RandomizerTrickArea area) {
-    return rtAreaNames[area];
-}
-
-std::string RandomizerTricks::GetRTTagName(RandomizerTrickTag tag) {
-    return rtTagNames[tag];
-}
-
-std::string RandomizerTricks::GetRTName(RandomizerTrick trick) {
-    return rtObjects[trick].rtShortName;
-}
-
-ImVec4 RandomizerTricks::GetRTAreaColor(RandomizerTrickArea area) {
-    switch (area) {
-        case RTAREA_GENERAL:
-            return ImVec4(0.4f,0.4f,0.4f,1.0f);
-        case RTAREA_KOKIRI_FOREST:
-            return ImVec4(0.3f,0.6f,0.0f,1.0f);
-        case RTAREA_LOST_WOODS:
-            return ImVec4(0.0f,0.6f,0.0f,1.0f);
-        case RTAREA_SACRED_FOREST_MEADOW:
-            return ImVec4(0.0f,0.6f,0.2f,1.0f);
-        case RTAREA_HYRULE_FIELD:
-            return ImVec4(0.5f,1.0f,0.2f,1.0f);
-        case RTAREA_LAKE_HYLIA:
-            return ImVec4(0.0f,0.2f,1.0f,1.0f);
-        case RTAREA_GERUDO_VALLEY:
-            return ImVec4(0.6f,0.6f,0.15f,1.0f);
-        case RTAREA_GERUDO_FORTRESS:
-            return ImVec4(0.6f,0.5f,0.2f,1.0f);
-        case RTAREA_WASTELAND:
-            return ImVec4(0.7f,0.6f,0.3f,1.0f);
-        case RTAREA_DESERT_COLOSSUS:
-            return ImVec4(0.5f,0.5f,0.3f,1.0f);
-        case RTAREA_MARKET:
-            return ImVec4(0.6f,0.6f,0.6f,1.0f);
-        case RTAREA_HYRULE_CASTLE:
-            return ImVec4(0.5f,0.5f,0.5f,1.0f);
-        case RTAREA_KAKARIKO_VILLAGE:
-            return ImVec4(0.8f,0.4f,0.25f,1.0f);
-        case RTAREA_GRAVEYARD:
-            return ImVec4(0.5f,0.0f,1.0f,1.0f);
-        case RTAREA_DEATH_MOUNTAIN_TRAIL:
-            return ImVec4(0.8f,0.3f,0.1f,1.0f);
-        case RTAREA_GORON_CITY:
-            return ImVec4(0.75f,0.60f,0.18f,1.0f);
-        case RTAREA_DEATH_MOUNTAIN_CRATER:
-            return ImVec4(1.0f,0.0f,0.0f,1.0f);
-        case RTAREA_ZORAS_RIVER:
-            return ImVec4(0.0f,0.5f,0.7f,1.0f);
-        case RTAREA_ZORAS_DOMAIN:
-            return ImVec4(0.0f,0.5f,0.5f,1.0f);
-        case RTAREA_ZORAS_FOUNTAIN:
-            return ImVec4(0.0f,0.6f,0.75f,1.0f);
-        case RTAREA_LON_LON_RANCH:
-            return ImVec4(0.4f,0.25f,0.1f,1.0f);
-        case RTAREA_DEKU_TREE:
-            return ImVec4(0.2f,0.65f,0.3f,1.0f);
-        case RTAREA_DODONGOS_CAVERN:
-            return ImVec4(0.88f,0.07f,0.37f,1.0f);
-        case RTAREA_JABU_JABUS_BELLY:
-            return ImVec4(0.06f,0.32f,0.73f,1.0f);
-        case RTAREA_FOREST_TEMPLE:
-            return ImVec4(0.1f,0.55f,0.1f,1.0f);
-        case RTAREA_FIRE_TEMPLE:
-            return ImVec4(1.0f,0.4f,0.0f,1.0f);
-        case RTAREA_WATER_TEMPLE:
-            return ImVec4(0.0f,0.0f,1.0f,1.0f);
-        case RTAREA_SPIRIT_TEMPLE:
-            return ImVec4(0.7f,0.35f,0.0f,1.0f);
-        case RTAREA_SHADOW_TEMPLE:
-            return ImVec4(0.45f,0.0f,0.45f,1.0f);
-        case RTAREA_BOTTOM_OF_THE_WELL:
-            return ImVec4(0.7f,0.05f,1.0f,1.0f);
-        case RTAREA_ICE_CAVERN:
-            return ImVec4(0.0f,0.65f,0.65f,1.0f);
-        case RTAREA_GERUDO_TRAINING_GROUND:
-            return ImVec4(0.65f,0.57f,0.0f,1.0f);
-        case RTAREA_GANONS_CASTLE:
-            return ImVec4(0.2f,0.0f,0.4f,1.0f);
-        default:
-            return ImVec4(0.1f,0.1f,0.1f,1.0f);
-    }
-}
-
-ImVec4 RandomizerTricks::GetRTTagColor(RandomizerTrickTag tag) {
-    switch(tag) {
-        case RTTAG_NOVICE:
-            return ImVec4(0.09f,0.55f,0.37f,1.0f);
-        case RTTAG_INTERMEDIATE:
-            return ImVec4(0.95f,0.52f,0.0f,1.0f);
-        case RTTAG_ADVANCED:
-            return ImVec4(0.0f,0.29f,0.71f,1.0f);
-        case RTTAG_EXPERT:
-            return ImVec4(0.53f,0.05f,0.14f,1.0f);
-        case RTTAG_EXTREME:
-            return ImVec4(0.27f,0.0f,0.27f,1.0f);
-        default:
-            return ImVec4(0.5f,0.5f,0.5f,1.0f);
-        /*case RTTAG_LENS:
-            return ImVec4(.f,.f,.f,1.0f);
-        case RTTAG_BKSKIP:
-            return ImVec4(.f,.f,.f,1.0f);
-        case RTTAG_EXPERIMENTAL:
-            return ImVec4(.f,.f,.f,1.0f);*/
-    }
-}
-
-bool RandomizerTricks::CheckRTTags(std::unordered_map<RandomizerTrickTag, bool> &showTag, const std::vector<RandomizerTrickTag> &rtTags) {
-    for (auto rtTag : rtTags) {
-        if (showTag[rtTag]) {
-            return true;
-        }
-    }
-    return false;
-}
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/randomizer_tricks.h b/soh/soh/Enhancements/randomizer/randomizer_tricks.h
deleted file mode 100644
index 6fb4a4341..000000000
--- a/soh/soh/Enhancements/randomizer/randomizer_tricks.h
+++ /dev/null
@@ -1,87 +0,0 @@
-#pragma once
-#include "randomizerTypes.h"
-#include <string>
-#include <unordered_map>
-#include <vector>
-#include <libultraship/libultraship.h>
-
-typedef enum {
-    RTAREA_GENERAL,
-    //RTAREA_BK_SKIPS,
-    RTAREA_KOKIRI_FOREST,
-    RTAREA_LOST_WOODS,
-    RTAREA_SACRED_FOREST_MEADOW,
-    RTAREA_HYRULE_FIELD,
-    RTAREA_LAKE_HYLIA,
-    RTAREA_GERUDO_VALLEY,
-    RTAREA_GERUDO_FORTRESS,
-    RTAREA_WASTELAND,
-    RTAREA_DESERT_COLOSSUS,
-    RTAREA_MARKET,
-    RTAREA_HYRULE_CASTLE,
-    RTAREA_KAKARIKO_VILLAGE,
-    RTAREA_GRAVEYARD,
-    RTAREA_DEATH_MOUNTAIN_TRAIL,
-    RTAREA_GORON_CITY,
-    RTAREA_DEATH_MOUNTAIN_CRATER,
-    RTAREA_ZORAS_RIVER,
-    RTAREA_ZORAS_DOMAIN,
-    RTAREA_ZORAS_FOUNTAIN,
-    RTAREA_LON_LON_RANCH,
-    RTAREA_DEKU_TREE,
-    RTAREA_DODONGOS_CAVERN,
-    RTAREA_JABU_JABUS_BELLY,
-    RTAREA_FOREST_TEMPLE,
-    RTAREA_FIRE_TEMPLE,
-    RTAREA_WATER_TEMPLE,
-    RTAREA_SPIRIT_TEMPLE,
-    RTAREA_SHADOW_TEMPLE,
-    RTAREA_BOTTOM_OF_THE_WELL,
-    RTAREA_ICE_CAVERN,
-    RTAREA_GERUDO_TRAINING_GROUND,
-    RTAREA_GANONS_CASTLE,
-    RTAREA_INVALID
-} RandomizerTrickArea;
-
-typedef enum {
-    RTVORMQ_VANILLA,
-    RTVORMQ_MQ,
-    RTVORMQ_BOTH
-} RandomizerTrickVanillaOrMQ;
-
-typedef enum {
-    RTTAG_NOVICE,
-    RTTAG_INTERMEDIATE,
-    RTTAG_ADVANCED,
-    RTTAG_EXPERT,
-    RTTAG_EXTREME,
-    /*RTTAG_LENS,
-    RTTAG_BKSKIP
-    RTTAG_EXPERIMENTAL*/
-} RandomizerTrickTag;
-
-//todo tags
-#define RT_OBJECT(rt, rt_v_or_mq, rt_area, rt_tags, rt_glitch, rt_shortname, rt_desc) \
-    { rt, {rt, rt_v_or_mq, rt_area, rt_tags, rt_glitch, true, rt_shortname, rt_desc} }
-
-typedef struct {
-    RandomizerTrick rt;
-    RandomizerTrickVanillaOrMQ vOrMQ;
-    RandomizerTrickArea rtArea;
-    std::vector<RandomizerTrickTag> *rtTags;
-    bool rtGlitch;
-    bool visibleInImgui;
-    std::string rtShortName;
-    std::string rtDesc;
-} RandomizerTrickObject;
-
-namespace RandomizerTricks {
-    std::unordered_map<RandomizerTrick, RandomizerTrickObject> GetAllRTObjects();
-    std::unordered_map<RandomizerTrickArea, std::unordered_map<RandomizerTrick,RandomizerTrickObject>> GetAllRTObjectsByArea();
-    std::string GetRTAreaName(RandomizerTrickArea area);
-    std::string GetRTTagName(RandomizerTrickTag tag);
-    std::string GetRTName(RandomizerTrick trick);
-    ImVec4 GetRTAreaColor(RandomizerTrickArea area);
-    ImVec4 GetRTTagColor(RandomizerTrickTag tag);
-    bool CheckRTTags(std::unordered_map<RandomizerTrickTag, bool> &showTag, const std::vector<RandomizerTrickTag> &rtTags);
-}
diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
index 64705c31a..40f47c78b 100644
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -9,6 +9,8 @@
 
 #include <utility>
 
+#include "consolevariablebridge.h"
+
 namespace Rando {
 std::vector<std::string> NumOpts(const int min, const int max, const int step = 1, const std::string& textBefore = {}, const std::string& textAfter = {}) {
     std::vector<std::string> options;
@@ -197,177 +199,191 @@ void Settings::CreateOptions() {
 
     mExcludeLocationsOptionsGroups.reserve(SPOILER_COLLECTION_GROUP_COUNT);
 
-    mTrickOptions[RT_VISIBLE_COLLISION] = Option::LogicTrick("Pass Through Visible One-Way Collision");
-    mTrickOptions[RT_GROTTOS_WITHOUT_AGONY] = Option::LogicTrick("Hidden Grottos without Stone of Agony");
-    mTrickOptions[RT_FEWER_TUNIC_REQUIREMENTS] = Option::LogicTrick("Fewer Tunic Requirements");
-    mTrickOptions[RT_RUSTED_SWITCHES] = Option::LogicTrick("Hammer Rusted Switches Through Walls");
-    mTrickOptions[RT_FLAMING_CHESTS] = Option::LogicTrick("Flaming Chests");
-    mTrickOptions[RT_BUNNY_HOOD_JUMPS] = Option::LogicTrick("Bunny Hood Jumps");
-    mTrickOptions[RT_DAMAGE_BOOST_SIMPLE] = Option::LogicTrick("Simple damage boosts");
-    mTrickOptions[RT_HOVER_BOOST_SIMPLE] = Option::LogicTrick("Simple hover boosts");
-    mTrickOptions[RT_KF_ADULT_GS] = Option::LogicTrick("Adult Kokiri Forest GS with Hover Boots");
-    mTrickOptions[RT_LW_BRIDGE] = Option::LogicTrick("Jump onto the Lost Woods Bridge as Adult with Nothing");
-    mTrickOptions[RT_LW_MIDO_BACKFLIP] = Option::LogicTrick("Backflip over Mido as Adult");
-    mTrickOptions[RT_LW_GS_BEAN] = Option::LogicTrick("Lost Woods Adult GS without Bean");
-    mTrickOptions[RT_HC_STORMS_GS] = Option::LogicTrick("Hyrule Castle Storms Grotto GS with Just Boomerang");
-    mTrickOptions[RT_KAK_MAN_ON_ROOF] = Option::LogicTrick("Man on Roof without Hookshot");
-    mTrickOptions[RT_KAK_TOWER_GS] = Option::LogicTrick("Kakariko Tower GS with Jump Slash");
-    mTrickOptions[RT_KAK_ADULT_WINDMILL_POH] = Option::LogicTrick("Windmill PoH as Adult with Nothing");
-    mTrickOptions[RT_KAK_CHILD_WINDMILL_POH] = Option::LogicTrick("Windmill PoH as Child with Precise Jump Slash");
-    mTrickOptions[RT_KAK_ROOFTOP_GS] = Option::LogicTrick("Kakariko Rooftop GS with Hover Boots");
-    mTrickOptions[RT_GY_POH] = Option::LogicTrick("Graveyard Freestanding PoH with Boomerang");
-    mTrickOptions[RT_GY_CHILD_DAMPE_RACE_POH] = Option::LogicTrick("Second Dampe Race as Child");
-    mTrickOptions[RT_GY_SHADOW_FIRE_ARROWS] = Option::LogicTrick("Shadow Temple Entry with Fire Arrows");
-    mTrickOptions[RT_DMT_SOIL_GS] = Option::LogicTrick("Death Mountain Trail Soil GS without Destroying Boulder");
-    mTrickOptions[RT_DMT_BOMBABLE] = Option::LogicTrick("Death Mountain Trail Chest with Strength");
-    mTrickOptions[RT_DMT_HOOKSHOT_LOWER_GS] = Option::LogicTrick("Death Mountain Trail Lower Red Rock GS with Hookshot");
-    mTrickOptions[RT_DMT_HOVERS_LOWER_GS] = Option::LogicTrick("Death Mountain Trail Lower Red Rock GS with Hover Boots");
-    mTrickOptions[RT_DMT_BEAN_LOWER_GS] = Option::LogicTrick("Death Mountain Trail Lower Red Rock GS with Magic Bean");
-    mTrickOptions[RT_DMT_JS_LOWER_GS] = Option::LogicTrick("Death Mountain Trail Lower Red Rock GS with Jump Slash");
-    mTrickOptions[RT_DMT_CLIMB_HOVERS] = Option::LogicTrick("Death Mountain Trail Climb with Hover Boots");
-    mTrickOptions[RT_DMT_UPPER_GS] = Option::LogicTrick("Death Mountain Trail Upper Red Rock GS without Hammer");
-    mTrickOptions[RT_DMT_BOLERO_BIGGORON] = Option::LogicTrick("Deliver Eye Drops with Bolero of Fire");
-    mTrickOptions[RT_GC_POT] = Option::LogicTrick("Goron City Spinning Pot PoH with Bombchu");
-    mTrickOptions[RT_GC_POT_STRENGTH] = Option::LogicTrick("Goron City Spinning Pot PoH with Strength");
-    mTrickOptions[RT_GC_ROLLING_STRENGTH] = Option::LogicTrick("Rolling Goron (Hot Rodder Goron) as Child with Strength");
-    mTrickOptions[RT_GC_LEFTMOST] = Option::LogicTrick("Goron City Maze Left Chest with Hover Boots");
-    mTrickOptions[RT_GC_GROTTO] = Option::LogicTrick("Goron City Grotto with Hookshot While Taking Damage");
-    mTrickOptions[RT_GC_LINK_GORON_DINS] = Option::LogicTrick("Stop Link the Goron with Din\'s Fire");
-    mTrickOptions[RT_DMC_HOVER_BEAN_POH] = Option::LogicTrick("Crater\'s Bean PoH with Hover Boots");
-    mTrickOptions[RT_DMC_BOLERO_JUMP] = Option::LogicTrick("Death Mountain Crater Jump to Bolero");
-    mTrickOptions[RT_DMC_BOULDER_JS] = Option::LogicTrick("Death Mountain Crater Upper to Lower with Hammer");
-    mTrickOptions[RT_DMC_BOULDER_SKIP] = Option::LogicTrick("Death Mountain Crater Upper to Lower Boulder Skip");
-    mTrickOptions[RT_ZR_LOWER] = Option::LogicTrick("Zora\'s River Lower Freestanding PoH as Adult with Nothing");
-    mTrickOptions[RT_ZR_UPPER] = Option::LogicTrick("Zora\'s River Upper Freestanding PoH as Adult with Nothing");
-    mTrickOptions[RT_ZR_HOVERS] = Option::LogicTrick("Zora\'s Domain Entry with Hover Boots");
-    mTrickOptions[RT_ZR_CUCCO] = Option::LogicTrick("Zora\'s Domain Entry with Cucco");
-    mTrickOptions[RT_ZD_KING_ZORA_SKIP] = Option::LogicTrick("Skip King Zora as Adult with Nothing");
-    mTrickOptions[RT_ZD_GS] = Option::LogicTrick("Zora\'s Domain GS with No Additional Items");
-    mTrickOptions[RT_LH_LAB_WALL_GS] = Option::LogicTrick("Lake Hylia Lab Wall GS with Jump Slash");
-    mTrickOptions[RT_LH_LAB_DIVING] = Option::LogicTrick("Lake Hylia Lab Dive without Gold Scale");
-    mTrickOptions[RT_LH_WATER_HOOKSHOT] = Option::LogicTrick("Water Temple Entry without Iron Boots using Hookshot");
-    mTrickOptions[RT_GV_CRATE_HOVERS] = Option::LogicTrick("Gerudo Valley Crate PoH as Adult with Hover Boots");
-    mTrickOptions[RT_GF_KITCHEN] = Option::LogicTrick("Thieves\' Hideout \"Kitchen\" with No Additional Items");
-    mTrickOptions[RT_GF_JUMP] = Option::LogicTrick("Gerudo\'s Fortress Ledge Jumps");
-    mTrickOptions[RT_HW_BUNNY_CROSSING] = Option::LogicTrick("Wasteland Crossing with Bunny Hood");
-    mTrickOptions[RT_HW_CROSSING] = Option::LogicTrick("Wasteland Crossing without Hover Boots or Longshot");
-    mTrickOptions[RT_LENS_HW] = Option::LogicTrick("Lensless Wasteland");
-    mTrickOptions[RT_HW_REVERSE] = Option::LogicTrick("Reverse Wasteland");
-    mTrickOptions[RT_COLOSSUS_GS] = Option::LogicTrick("Colossus Hill GS with Hookshot");
-    mTrickOptions[RT_DEKU_BASEMENT_GS] = Option::LogicTrick("Deku Tree Basement Vines GS with Jump Slash");
-    mTrickOptions[RT_DEKU_B1_SKIP] = Option::LogicTrick("Deku Tree Basement without Slingshot");
-    mTrickOptions[RT_DEKU_B1_BOW_WEBS] = Option::LogicTrick("Deku Tree Basement Web to Gohma with Bow");
-    mTrickOptions[RT_DEKU_MQ_COMPASS_GS] = Option::LogicTrick("Deku Tree MQ Compass Room GS Boulders with Just Hammer");
-    mTrickOptions[RT_DEKU_MQ_LOG] = Option::LogicTrick("Deku Tree MQ Roll Under the Spiked Log");
-    mTrickOptions[RT_DC_SCARECROW_GS] = Option::LogicTrick("Dodongo\'s Cavern Scarecrow GS with Armos Statue");
-    mTrickOptions[RT_DC_VINES_GS] = Option::LogicTrick("Dodongo\'s Cavern Vines GS from Below with Longshot");
-    mTrickOptions[RT_DC_STAIRCASE] = Option::LogicTrick("Dodongo\'s Cavern Staircase with Bow");
-    mTrickOptions[RT_DC_SLINGSHOT_SKIP] = Option::LogicTrick("Dodongo\'s Cavern Child Slingshot Skips");
-    mTrickOptions[RT_DC_SCRUB_ROOM] = Option::LogicTrick("Dodongo\'s Cavern Two Scrub Room with Strength");
-    mTrickOptions[RT_DC_JUMP] = Option::LogicTrick("Dodongo\'s Cavern Spike Trap Room Jump without Hover Boots");
-    mTrickOptions[RT_DC_HAMMER_FLOOR] = Option::LogicTrick("Dodongo\'s Cavern Smash the Boss Lobby Floor");
-    mTrickOptions[RT_DC_MQ_CHILD_BOMBS] = Option::LogicTrick("Dodongo\'s Cavern MQ Early Bomb Bag Area as Child");
-    mTrickOptions[RT_DC_MQ_CHILD_EYES] = Option::LogicTrick("Dodongo\'s Cavern MQ Light the Eyes with Strength as Child");
-    mTrickOptions[RT_DC_MQ_ADULT_EYES] = Option::LogicTrick("Dodongo\'s Cavern MQ Light the Eyes with Strength as Adult");
-    mTrickOptions[RT_JABU_ALCOVE_JUMP_DIVE] = Option::LogicTrick("Jabu Underwater Alcove as Adult with Jump Dive");
-    mTrickOptions[RT_JABU_BOSS_HOVER] = Option::LogicTrick("Jabu Near Boss Room with Hover Boots");
-    mTrickOptions[RT_JABU_NEAR_BOSS_RANGED] = Option::LogicTrick("Jabu Near Boss Ceiling Switch/GS without Boomerang or Explosives");
-    mTrickOptions[RT_JABU_NEAR_BOSS_EXPLOSIVES] = Option::LogicTrick("Jabu Near Boss Ceiling Switch with Explosives");
-    mTrickOptions[RT_LENS_JABU_MQ] = Option::LogicTrick("Jabu MQ without Lens of Truth");
-    mTrickOptions[RT_JABU_MQ_RANG_JUMP] = Option::LogicTrick("Jabu MQ Compass Chest with Boomerang");
-    mTrickOptions[RT_JABU_MQ_SOT_GS] = Option::LogicTrick("Jabu MQ Song of Time Block GS with Boomerang");
-    mTrickOptions[RT_LENS_BOTW] = Option::LogicTrick("Bottom of the Well without Lens of Truth");
-    mTrickOptions[RT_BOTW_CHILD_DEADHAND] = Option::LogicTrick("Child Dead Hand without Kokiri Sword");
-    mTrickOptions[RT_BOTW_BASEMENT] = Option::LogicTrick("Bottom of the Well Map Chest with Strength & Sticks");
-    mTrickOptions[RT_BOTW_MQ_PITS] = Option::LogicTrick("Bottom of the Well MQ Jump Over the Pits");
-    mTrickOptions[RT_BOTW_MQ_DEADHAND_KEY] = Option::LogicTrick("Bottom of the Well MQ Dead Hand Freestanding Key with Boomerang");
-    mTrickOptions[RT_FOREST_FIRST_GS] = Option::LogicTrick("Forest Temple First Room GS with Difficult-to-Use Weapons");
-    mTrickOptions[RT_FOREST_OUTDOORS_EAST_GS] = Option::LogicTrick("Forest Temple East Courtyard GS with Boomerang");
-    mTrickOptions[RT_FOREST_VINES] = Option::LogicTrick("Forest Temple East Courtyard Vines with Hookshot");
-    mTrickOptions[RT_FOREST_OUTDOORS_LEDGE] = Option::LogicTrick("Forest Temple NE Outdoors Ledge with Hover Boots");
-    mTrickOptions[RT_FOREST_DOORFRAME] = Option::LogicTrick("Forest Temple East Courtyard Door Frame with Hover Boots");
-    mTrickOptions[RT_FOREST_OUTSIDE_BACKDOOR] = Option::LogicTrick("Forest Temple Outside Backdoor with Jump Slash");
-    mTrickOptions[RT_FOREST_MQ_WELL_SWIM] = Option::LogicTrick("Swim Through Forest Temple MQ Well with Hookshot");
-    mTrickOptions[RT_FOREST_MQ_BLOCK_PUZZLE] = Option::LogicTrick("Skip Forest Temple MQ Block Puzzle with Bombchu");
-    mTrickOptions[RT_FOREST_MQ_JS_HALLWAY_SWITCH] = Option::LogicTrick("Forest Temple MQ Twisted Hallway Switch with Jump Slash");
-    mTrickOptions[RT_FOREST_MQ_HOOKSHOT_HALLWAY_SWITCH] = Option::LogicTrick("Forest Temple MQ Twisted Hallway Switch with Hookshot");
-    mTrickOptions[RT_FOREST_MQ_RANG_HALLWAY_SWITCH] = Option::LogicTrick("Forest Temple MQ Twisted Hallway Switch with Boomerang");
-    mTrickOptions[RT_FIRE_BOSS_DOOR_JUMP] = Option::LogicTrick("Fire Temple Boss Door without Hover Boots or Pillar");
-    mTrickOptions[RT_FIRE_SOT] = Option::LogicTrick("Fire Temple Song of Time Room GS without Song of Time");
-    mTrickOptions[RT_FIRE_STRENGTH] = Option::LogicTrick("Fire Temple Climb without Strength");
-    mTrickOptions[RT_FIRE_SCARECROW] = Option::LogicTrick("Fire Temple East Tower without Scarecrow\'s Song");
-    mTrickOptions[RT_FIRE_FLAME_MAZE] = Option::LogicTrick("Fire Temple Flame Wall Maze Skip");
-    mTrickOptions[RT_FIRE_MQ_NEAR_BOSS] = Option::LogicTrick("Fire Temple MQ Chest Near Boss without Breaking Crate");
-    mTrickOptions[RT_FIRE_MQ_BLOCKED_CHEST] = Option::LogicTrick("Fire Temple MQ Big Lava Room Blocked Door without Hookshot");
-    mTrickOptions[RT_FIRE_MQ_BK_CHEST] = Option::LogicTrick("Fire Temple MQ Boss Key Chest without Bow");
-    mTrickOptions[RT_FIRE_MQ_CLIMB] = Option::LogicTrick("Fire Temple MQ Climb without Fire Source");
-    mTrickOptions[RT_FIRE_MQ_MAZE_SIDE_ROOM] = Option::LogicTrick("Fire Temple MQ Lizalfos Maze Side Room without Box");
-    mTrickOptions[RT_FIRE_MQ_MAZE_HOVERS] = Option::LogicTrick("Fire Temple MQ Lower to Upper Lizalfos Maze with Hover Boots");
-    mTrickOptions[RT_FIRE_MQ_MAZE_JUMP] = Option::LogicTrick("Fire Temple MQ Lower to Upper Lizalfos Maze with Precise Jump");
-    mTrickOptions[RT_FIRE_MQ_ABOVE_MAZE_GS] = Option::LogicTrick("Fire Temple MQ Above Flame Wall Maze GS from Below with Longshot");
-    mTrickOptions[RT_FIRE_MQ_FLAME_MAZE] = Option::LogicTrick("Fire Temple MQ Flame Wall Maze Skip");
-    mTrickOptions[RT_WATER_LONGSHOT_TORCH] = Option::LogicTrick("Water Temple Torch Longshot");
-    mTrickOptions[RT_WATER_CRACKED_WALL_HOVERS] = Option::LogicTrick("Water Temple Cracked Wall with Hover Boots");
-    mTrickOptions[RT_WATER_CRACKED_WALL] = Option::LogicTrick("Water Temple Cracked Wall with No Additional Items");
-    mTrickOptions[RT_WATER_BK_REGION] = Option::LogicTrick("Water Temple Boss Key Region with Hover Boots");
-    mTrickOptions[RT_WATER_NORTH_BASEMENT_LEDGE_JUMP] = Option::LogicTrick("Water Temple North Basement Ledge with Precise Jump");
-    mTrickOptions[RT_WATER_BK_JUMP_DIVE] = Option::LogicTrick("Water Temple Boss Key Jump Dive");
-    mTrickOptions[RT_WATER_FW_CENTRAL_GS] = Option::LogicTrick("Water Temple Central Pillar GS with Farore\'s Wind");
-    mTrickOptions[RT_WATER_IRONS_CENTRAL_GS] = Option::LogicTrick("Water Temple Central Pillar GS with Iron Boots");
-    mTrickOptions[RT_WATER_CENTRAL_BOW] = Option::LogicTrick("Water Temple Central Bow Target without Longshot or Hover Boots");
-    mTrickOptions[RT_WATER_HOOKSHOT_FALLING_PLATFORM_GS] = Option::LogicTrick("Water Temple Falling Platform Room GS with Hookshot");
-    mTrickOptions[RT_WATER_RANG_FALLING_PLATFORM_GS] = Option::LogicTrick("Water Temple Falling Platform Room GS with Boomerang");
-    mTrickOptions[RT_WATER_RIVER_GS] = Option::LogicTrick("Water Temple River GS without Iron Boots");
-    mTrickOptions[RT_WATER_DRAGON_JUMP_DIVE] = Option::LogicTrick("Water Temple Dragon Statue Jump Dive");
-    mTrickOptions[RT_WATER_ADULT_DRAGON] = Option::LogicTrick("Water Temple Dragon Statue Switch from Above the Water as Adult");
-    mTrickOptions[RT_WATER_CHILD_DRAGON] = Option::LogicTrick("Water Temple Dragon Statue Switch from Above the Water as Child");
-    mTrickOptions[RT_WATER_MQ_CENTRAL_PILLAR] = Option::LogicTrick("Water Temple MQ Central Pillar with Fire Arrows");
-    mTrickOptions[RT_WATER_MQ_LOCKED_GS] = Option::LogicTrick("Water Temple MQ North Basement GS without Small Key");
-    mTrickOptions[RT_LENS_SHADOW] = Option::LogicTrick("Shadow Temple Stationary Objects without Lens of Truth");
-    mTrickOptions[RT_LENS_SHADOW_PLATFORM] = Option::LogicTrick("Shadow Temple Invisible Moving Platform without Lens of Truth");
-    mTrickOptions[RT_LENS_BONGO] = Option::LogicTrick("Shadow Temple Bongo Bongo without Lens of Truth");
-    mTrickOptions[RT_SHADOW_UMBRELLA] = Option::LogicTrick("Shadow Temple Stone Umbrella Skip");
-    mTrickOptions[RT_SHADOW_UMBRELLA_GS] = Option::LogicTrick("Shadow Temple Falling Spikes GS with Hover Boots");
-    mTrickOptions[RT_SHADOW_FREESTANDING_KEY] = Option::LogicTrick("Shadow Temple Freestanding Key with Bombchu");
-    mTrickOptions[RT_SHADOW_STATUE] = Option::LogicTrick("Shadow Temple River Statue with Bombchu");
-    mTrickOptions[RT_SHADOW_BONGO] = Option::LogicTrick("Shadow Temple Bongo Bongo without projectiles");
-    mTrickOptions[RT_LENS_SHADOW_MQ] = Option::LogicTrick("Shadow Temple MQ Stationary Objects without Lens of Truth");
-    mTrickOptions[RT_LENS_SHADOW_MQ_INVISIBLE_BLADES] = Option::LogicTrick("Shadow Temple MQ Invisible Blades Silver Rupees without Lens of Truth");
-    mTrickOptions[RT_LENS_SHADOW_MQ_PLATFORM] = Option::LogicTrick("Shadow Temple MQ Invisible Moving Platform without Lens of Truth");
-    mTrickOptions[RT_LENS_SHADOW_MQ_DEADHAND] = Option::LogicTrick("Shadow Temple MQ 2nd Dead Hand without Lens of Truth");
-    mTrickOptions[RT_SHADOW_MQ_GAP] = Option::LogicTrick("Shadow Temple MQ Truth Spinner Gap with Longshot");
-    mTrickOptions[RT_SHADOW_MQ_INVISIBLE_BLADES] = Option::LogicTrick("Shadow Temple MQ Invisible Blades without Song of Time");
-    mTrickOptions[RT_SHADOW_MQ_HUGE_PIT] = Option::LogicTrick("Shadow Temple MQ Lower Huge Pit without Fire Source");
-    mTrickOptions[RT_SHADOW_MQ_WINDY_WALKWAY] = Option::LogicTrick("Shadow Temple MQ Windy Walkway Reverse without Hover Boots");
-    mTrickOptions[RT_LENS_SPIRIT] = Option::LogicTrick("Spirit Temple without Lens of Truth");
-    mTrickOptions[RT_SPIRIT_CHILD_CHU] = Option::LogicTrick("Spirit Temple Child Side Bridge with Bombchu");
-    mTrickOptions[RT_SPIRIT_LOBBY_GS] = Option::LogicTrick("Spirit Temple Main Room GS with Boomerang");
-    mTrickOptions[RT_SPIRIT_LOWER_ADULT_SWITCH] = Option::LogicTrick("Spirit Temple Lower Adult Switch with Bombs");
-    mTrickOptions[RT_SPIRIT_LOBBY_JUMP] = Option::LogicTrick("Spirit Temple Main Room Jump from Hands to Upper Ledges");
-    mTrickOptions[RT_SPIRIT_PLATFORM_HOOKSHOT] = Option::LogicTrick("Spirit Temple Main Room Hookshot to Boss Platform");
-    mTrickOptions[RT_SPIRIT_MAP_CHEST] = Option::LogicTrick("Spirit Temple Map Chest with Bow");
-    mTrickOptions[RT_SPIRIT_SUN_CHEST] = Option::LogicTrick("Spirit Temple Sun Block Room Chest with Bow");
-    mTrickOptions[RT_SPIRIT_WALL] = Option::LogicTrick("Spirit Temple Shifting Wall with No Additional Items");
-    mTrickOptions[RT_LENS_SPIRIT_MQ] = Option::LogicTrick("Spirit Temple MQ without Lens of Truth");
-    mTrickOptions[RT_SPIRIT_MQ_SUN_BLOCK_SOT] = Option::LogicTrick("Spirit Temple MQ Sun Block Room as Child without Song of Time");
-    mTrickOptions[RT_SPIRIT_MQ_SUN_BLOCK_GS] = Option::LogicTrick("Spirit Temple MQ Sun Block Room GS with Boomerang");
-    mTrickOptions[RT_SPIRIT_MQ_LOWER_ADULT] = Option::LogicTrick("Spirit Temple MQ Lower Adult without Fire Arrows");
-    mTrickOptions[RT_SPIRIT_MQ_FROZEN_EYE] = Option::LogicTrick("Spirit Temple MQ Frozen Eye Switch without Fire");
-    mTrickOptions[RT_ICE_BLOCK_GS] = Option::LogicTrick("Ice Cavern Block Room GS with Hover Boots");
-    mTrickOptions[RT_ICE_MQ_RED_ICE_GS] = Option::LogicTrick("Ice Cavern MQ Red Ice GS without Song of Time");
-    mTrickOptions[RT_ICE_MQ_SCARECROW] = Option::LogicTrick("Ice Cavern MQ Scarecrow GS with No Additional Items");
-    mTrickOptions[RT_LENS_GTG] = Option::LogicTrick("Gerudo Training Ground without Lens of Truth");
-    mTrickOptions[RT_GTG_WITHOUT_HOOKSHOT] = Option::LogicTrick("Gerudo Training Ground Left Side Silver Rupees without Hookshot");
-    mTrickOptions[RT_GTG_FAKE_WALL] = Option::LogicTrick("Reach Gerudo Training Ground Fake Wall Ledge with Hover Boots");
-    mTrickOptions[RT_LENS_GTG_MQ] = Option::LogicTrick("Gerudo Training Ground MQ without Lens of Truth");
-    mTrickOptions[RT_GTG_MQ_WITH_HOOKSHOT] = Option::LogicTrick("Gerudo Training Ground MQ Left Side Silver Rupees with Hookshot");
-    mTrickOptions[RT_GTG_MQ_WIHTOUT_HOOKSHOT] = Option::LogicTrick("Gerudo Training Ground MQ Left Side Silver Rupees without Hookshot");
-    mTrickOptions[RT_LENS_GANON] = Option::LogicTrick("Ganon\'s Castle without Lens of Truth");
-    mTrickOptions[RT_GANON_SPIRIT_TRIAL_HOOKSHOT] = Option::LogicTrick("Spirit Trial without Hookshot");
-    mTrickOptions[RT_LENS_GANON_MQ] = Option::LogicTrick("Ganon\'s Castle MQ without Lens of Truth");
-    mTrickOptions[RT_GANON_MQ_FIRE_TRIAL] = Option::LogicTrick("Fire Trial MQ with Hookshot");
-    mTrickOptions[RT_GANON_MQ_SHADOW_TRIAL] = Option::LogicTrick("Shadow Trial MQ Torch with Bow");
-    mTrickOptions[RT_GANON_MQ_LIGHT_TRIAL] = Option::LogicTrick("Light Trial MQ without Hookshot");
+    mTrickOptions[RT_ACUTE_ANGLE_CLIP] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED}, true, "Acute angle clip", "Enables locations requiring jumpslash clips through walls which meet at an acute angle.");
+    mTrickOptions[RT_ADVANCED_CLIPS] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED}, true, "Advanced clips", "Enables locations requiring clips through walls and objects requiring precise jumps or other tricks.");
+    mTrickOptions[RT_BLANK_A] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED}, true, "Blank A", "Enables locations requiring blank A button; NOTE: this requires the 'Quick Putaway' restoration.");
+    mTrickOptions[RT_DOOM_JUMP] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED}, true, "Doom Jump", "Enables locations requiring doom jumps.");
+    mTrickOptions[RT_EPG] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED}, true, "EPG", "Enables locations requiring use of the Entrance Point Glitch.");
+    mTrickOptions[RT_EQUIP_SWAP] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED}, true, "Equip Swap", "Enables locations requiring use of equip swap; NOTE: this may expect the 'Allow cursor to be over any slot' enhancement to be turned off.");
+    mTrickOptions[RT_EQUIP_SWAP_EXPECTS_DINS] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED}, true, "Equip Swap Require's Din's Fire", "Enables locations requiring use of equip swap once din's fire is found.");
+    mTrickOptions[RT_FLAME_STORAGE] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED}, true, "Flame Storage", "Enables locations requiring flame storage.");
+    mTrickOptions[RT_GROUND_CLIP] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED}, true, "Ground Clip", "Enables locations requiring ground clips.");
+    mTrickOptions[RT_GROUND_JUMP] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED}, true, "Ground Jump", "Enables locations requiring ground jumps.");
+    mTrickOptions[RT_HESS] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED}, true, "HESS", "Enables locations requiring a Hyper Extended Super Slide.");
+    mTrickOptions[RT_HOOKSHOT_CLIP] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED}, true, "Hookshot Clip", "Enables locations requiring hookshot clips.");
+    mTrickOptions[RT_HOOKSHOT_JUMP] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED}, true, "Hookshot Jump", "Enables locations requiring hookshot jumps.");
+    mTrickOptions[RT_ISG] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED}, true, "ISG", "Enables locations requiring use of the infinite sword glitch.");
+    mTrickOptions[RT_VISIBLE_COLLISION] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_NONE, {Tricks::Tag::NOVICE}, false, "Pass Through Visible One-Way Collision", "Allows climbing through the platform to reach Impa's House Back as adult with no items and going through the Kakariko Village Gate as child when coming from the Mountain Trail side.");
+    mTrickOptions[RT_GROTTOS_WITHOUT_AGONY] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_NONE, {Tricks::Tag::NOVICE}, false, "Hidden Grottos without Stone of Agony", "Allows entering hidden grottos without the Stone of Agony.");
+    mTrickOptions[RT_FEWER_TUNIC_REQUIREMENTS] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_NONE, {Tricks::Tag::INTERMEDIATE}, false, "Fewer Tunic Requirements", "Allows the following possible without Tunics:\n- Enter Water Temple. The area below the center pillar still requires Zora Tunic. Applies to MQ also.\n- Enter Fire Temple. Volvagia still requires Goron tunic. Applies to MQ also, and includes child access to first floor with dungeon shuffle.");
+    mTrickOptions[RT_RUSTED_SWITCHES] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_NONE, {Tricks::Tag::NOVICE}, false, "Hammer Rusted Switches Through Walls", "Applies to: - Fire Temple Highest Goron Chest. - MQ Fire Temple Lizalfos Maze. - MQ Spirit Trial.");
+    mTrickOptions[RT_FLAMING_CHESTS] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_NONE, {Tricks::Tag::INTERMEDIATE}, false, "Flaming Chests", "The chests encircled in flames in Gerudo Training Grounds and in Spirit Temple can be opened by running into the flames while Link is invincible after taking damage.");
+    // mTrickOptions[RT_BUNNY_HOOD_JUMPS] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED}, false, "Bunny Hood Jumps", "Allows reaching locations using Bunny Hood's extended jumps.");
+    // mTrickOptions[RT_DAMAGE_BOOST_SIMPLE] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED}, false, "Simple damage boosts", "Allows damage boosts to reach Hyrule Castle guards, the bomb bag area in DC and the Gerudo Valley crate Piece of Heart. Can be combined with \"Simple hover boosts\" for reaching far distances.");
+    // mTrickOptions[RT_HOVER_BOOST_SIMPLE] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED}, false, "Simple hover boosts", "Allows equipping of hover boots when link is moving at high speeds to extend distance covered. Can be combined with \"Simple damage boosts\" for greater uses.");
+    mTrickOptions[RT_KF_ADULT_GS] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_KOKIRI_FOREST, {Tricks::Tag::NOVICE}, false, "Adult Kokiri Forest GS with Hover Boots", "Can be obtained without Hookshot by using the Hover Boots off of one of the roots.");
+    mTrickOptions[RT_LW_BRIDGE] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_THE_LOST_WOODS, {Tricks::Tag::EXPERT}, false, "Jump onto the Lost Woods Bridge as Adult with Nothing", "With very precise movement it's possible for adult to jump onto the bridge without needing Longshot, Hover Boots, or Bean.");
+    mTrickOptions[RT_LW_MIDO_BACKFLIP] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_THE_LOST_WOODS, {Tricks::Tag::NOVICE}, false, "Backflip over Mido as Adult", "With a specific position and angle, you can backflip over Mido.");
+    mTrickOptions[RT_LW_GS_BEAN] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_THE_LOST_WOODS, {Tricks::Tag::INTERMEDIATE}, false, "Lost Woods Adult GS without Bean", "You can collect the token with a precise Hookshot use, as long as you can kill the Skulltula somehow first. It can be killed using Longshot, Bow, Bombchus or Din's Fire.");
+    mTrickOptions[RT_HC_STORMS_GS] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_HYRULE_CASTLE, {Tricks::Tag::INTERMEDIATE}, false, "Hyrule Castle Storms Grotto GS with Just Boomerang", "With precise throws, the Boomerang alone can kill the Skulltula and collect the token, without first needing to blow up the wall.");
+    mTrickOptions[RT_KAK_MAN_ON_ROOF] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_KAKARIKO_VILLAGE, {Tricks::Tag::NOVICE}, false, "Man on Roof without Hookshot", "Can be reached by side-hopping off the watchtower as either age, or by jumping onto the potion shop's roof from the ledge as adult.");
+    mTrickOptions[RT_KAK_TOWER_GS] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_KAKARIKO_VILLAGE, {Tricks::Tag::INTERMEDIATE}, false, "Kakariko Tower GS with Jump Slash", "Climb the tower as high as you can without touching the Gold Skulltula, then let go and jump slash immediately. By jump-slashing from as low on the ladder as possible to still hit the Skulltula, this trick can be done without taking fall damage.");
+    mTrickOptions[RT_KAK_ADULT_WINDMILL_POH] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_KAKARIKO_VILLAGE, {Tricks::Tag::NOVICE}, false, "Windmill PoH as Adult with Nothing", "Can jump up to the spinning platform from below as adult.");
+    // mTrickOptions[RT_KAK_CHILD_WINDMILL_POH] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_KAKARIKO_VILLAGE, {Tricks::Tag::EXTREME}, false, "Windmill PoH as Child with Precise Jump Slash", "Can jump up to the spinning platform from below as child with a precise jumpslash timed with the platforms rotation.");
+    mTrickOptions[RT_KAK_ROOFTOP_GS] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_KAKARIKO_VILLAGE, {Tricks::Tag::ADVANCED}, false, "Kakariko Rooftop GS with Hover Boots", "Take the Hover Boots from the entrance to Impa's House over to the rooftop of Skulltula House. From there, a precise Hover Boots backwalk with backflip can be used to get onto a hill above the side of the village. And then from there you can Hover onto Impa's rooftop to kill the Skulltula and backflip into the token.");
+    mTrickOptions[RT_GY_POH] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_THE_GRAVEYARD, {Tricks::Tag::INTERMEDIATE}, false, "Graveyard Freestanding PoH with Boomerang", "Using a precise moving setup you can obtain the Piece of Heart by having the Boomerang interact with it along the return path.");
+    mTrickOptions[RT_GY_CHILD_DAMPE_RACE_POH] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_THE_GRAVEYARD, {Tricks::Tag::NOVICE}, false, "Second Dampe Race as Child", "It is possible to complete the second dampe race as child in under a minute, but it is a strict time limit.");
+    mTrickOptions[RT_GY_SHADOW_FIRE_ARROWS] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_THE_GRAVEYARD, {Tricks::Tag::EXPERT}, false, "Shadow Temple Entry with Fire Arrows", "It is possible to light all of the torches to open the Shadow Temple entrance with just Fire Arrows, but you must be very quick, precise, and strategic with how you take your shots.");
+    mTrickOptions[RT_DMT_SOIL_GS] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_DEATH_MOUNTAIN_TRAIL, {Tricks::Tag::INTERMEDIATE}, false, "Death Mountain Trail Soil GS without Destroying Boulder", "Bugs will go into the soft soil even while the boulder is still blocking the entrance. Then, using a precise moving setup you can kill the Gold Skulltula and obtain the token by having the Boomerang interact with it along the return path.");
+    mTrickOptions[RT_DMT_BOMBABLE] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_DEATH_MOUNTAIN_TRAIL, {Tricks::Tag::INTERMEDIATE}, false, "Death Mountain Trail Chest with Strength", "Child Link can blow up the wall using a nearby bomb flower. You must backwalk with the flower and then quickly throw it toward the wall.");
+    mTrickOptions[RT_DMT_HOOKSHOT_LOWER_GS] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_DEATH_MOUNTAIN_TRAIL, {Tricks::Tag::INTERMEDIATE}, false, "Death Mountain Trail Lower Red Rock GS with Hookshot", "After killing the Skulltula, the token can be fished out of the rock without needing to destroy it, by using the Hookshot in the correct way.");
+    mTrickOptions[RT_DMT_HOVERS_LOWER_GS] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_DEATH_MOUNTAIN_TRAIL, {Tricks::Tag::ADVANCED}, false, "Death Mountain Trail Lower Red Rock GS with Hover Boots", "After killing the Skulltula, the token can be collected without needing to destroy the rock by backflipping down onto it with the Hover Boots. First use the Hover Boots to stand on a nearby fence, and go for the Skulltula Token from there.");
+    mTrickOptions[RT_DMT_BEAN_LOWER_GS] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_DEATH_MOUNTAIN_TRAIL, {Tricks::Tag::EXPERT}, false, "Death Mountain Trail Lower Red Rock GS with Magic Bean", "After killing the Skulltula, the token can be collected without needing to destroy the rock by jumping down onto it from the bean plant, midflight, with precise timing and positioning.");
+    mTrickOptions[RT_DMT_JS_LOWER_GS] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_DEATH_MOUNTAIN_TRAIL, {Tricks::Tag::INTERMEDIATE}, false, "Death Mountain Trail Lower Red Rock GS with Jump Slash", "After killing the Skulltula, the token can be collected without needing to destroy the rock by jump slashing from a precise angle.");
+    mTrickOptions[RT_DMT_CLIMB_HOVERS] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_DEATH_MOUNTAIN_TRAIL, {Tricks::Tag::ADVANCED}, false, "Death Mountain Trail Climb with Hover Boots", "It is possible to use the Hover Boots to bypass needing to destroy the boulders blocking the path to the top of Death Mountain.");
+    mTrickOptions[RT_DMT_UPPER_GS] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_DEATH_MOUNTAIN_TRAIL, {Tricks::Tag::NOVICE}, false, "Death Mountain Trail Upper Red Rock GS without Hammer", "After killing the Skulltula, the token can be collected by backflipping into the rock at the correct angle.");
+    // mTrickOptions[RT_DMT_BOLERO_BIGGORON] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_DEATH_MOUNTAIN_TRAIL, {Tricks::Tag::INTERMEDIATE}, false, "Deliver Eye Drops with Bolero of Fire", "Playing a warp song normally causes a trade item to spoil immediately, however, it is possible use Bolero to reach Biggoron and still deliver the Eye Drops before they spoil. If you do not wear the Goron Tunic, the heat timer inside the crater will override the trade item\'s timer. When you exit to Death Mountain Trail you will have one second to show the Eye Drops before they expire. You can get extra time to show the Eye Drops if you warp immediately upon receiving them. If you don't have many hearts, you may have to reset the heat timer by quickly dipping in and out of Darunia\'s chamber or quickly equipping and unequipping the Goron Tunic. This trick does not apply if \"Randomize Warp Song Destinations\" is enabled, or if the settings are such that trade items do not need to be delivered within a time limit.");
+    mTrickOptions[RT_GC_POT] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_GORON_CITY, {Tricks::Tag::ADVANCED}, false, "Goron City Spinning Pot PoH with Bombchu", "A Bombchu can be used to stop the spinning pot, but it can be quite finicky to get it to work.");
+    mTrickOptions[RT_GC_POT_STRENGTH] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_GORON_CITY, {Tricks::Tag::INTERMEDIATE}, false, "Goron City Spinning Pot PoH with Strength", "Allows for stopping the Goron City Spinning Pot using a bomb flower alone, requiring strength in lieu of inventory explosives.");
+    mTrickOptions[RT_GC_ROLLING_STRENGTH] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_GORON_CITY, {Tricks::Tag::INTERMEDIATE}, false, "Rolling Goron (Hot Rodder Goron) as Child with Strength", "Use the bombflower on the stairs or near Medigoron. Timing is tight, especially without backwalking.");
+    mTrickOptions[RT_GC_LEFTMOST] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_GORON_CITY, {Tricks::Tag::ADVANCED}, false, "Goron City Maze Left Chest with Hover Boots", "A precise backwalk starting from on top of the crate and ending with a precisely-timed backflip can reach this chest without needing either the Hammer or Silver Gauntlets.");
+    mTrickOptions[RT_GC_GROTTO] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_GORON_CITY, {Tricks::Tag::ADVANCED}, false, "Goron City Grotto with Hookshot While Taking Damage", "It is possible to reach the Goron City Grotto by quickly using the Hookshot while in the midst of taking damage from the lava floor.");
+    mTrickOptions[RT_GC_LINK_GORON_DINS] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_GORON_CITY, {Tricks::Tag::NOVICE}, false, "Stop Link the Goron with Din\'s Fire", "The timing is quite awkward.");
+    mTrickOptions[RT_DMC_HOVER_BEAN_POH] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_DEATH_MOUNTAIN_CRATER, {Tricks::Tag::NOVICE}, false, "Crater\'s Bean PoH with Hover Boots", "Hover from the base of the bridge near Goron City and walk up the very steep slope.");
+    mTrickOptions[RT_DMC_BOLERO_JUMP] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_DEATH_MOUNTAIN_CRATER, {Tricks::Tag::EXTREME}, false, "Death Mountain Crater Jump to Bolero", "As Adult , using a shield to drop a pot while you have the perfect speed and position, the pot can push you that little extra distance you need to jump across the gap in the bridge.");
+    mTrickOptions[RT_DMC_BOULDER_JS] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_DEATH_MOUNTAIN_CRATER, {Tricks::Tag::NOVICE}, false, "Death Mountain Crater Upper to Lower with Hammer", "With the Hammer, you can jump slash the rock twice in the same jump in order to destroy it before you fall into the lava.");
+    mTrickOptions[RT_DMC_BOULDER_SKIP] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_DEATH_MOUNTAIN_CRATER, {Tricks::Tag::INTERMEDIATE}, false, "Death Mountain Crater Upper to Lower Boulder Skip", "As adult, With careful positioning, you can jump to the ledge where the boulder is, then use repeated ledge grabs to shimmy to a climbable ledge. This trick supersedes \"Death Mountain Crater Upper to Lower with Hammer\".");
+    mTrickOptions[RT_ZR_LOWER] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_ZORAS_RIVER, {Tricks::Tag::INTERMEDIATE}, false, "Zora\'s River Lower Freestanding PoH as Adult with Nothing", "Adult can reach this PoH with a precise jump, no Hover Boots required.");
+    mTrickOptions[RT_ZR_UPPER] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_ZORAS_RIVER, {Tricks::Tag::INTERMEDIATE}, false, "Zora\'s River Upper Freestanding PoH as Adult with Nothing", "Adult can reach this PoH with a precise jump, no Hover Boots required.");
+    mTrickOptions[RT_ZR_HOVERS] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_ZORAS_RIVER, {Tricks::Tag::NOVICE}, false, "Zora\'s Domain Entry with Hover Boots", "Can hover behind the waterfall as adult.");
+    mTrickOptions[RT_ZR_CUCCO] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_ZORAS_RIVER, {Tricks::Tag::NOVICE}, false, "Zora\'s Domain Entry with Cucco", "You can fly behind the waterfall with a Cucco as child.");
+    mTrickOptions[RT_ZD_KING_ZORA_SKIP] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_ZORAS_DOMAIN, {Tricks::Tag::INTERMEDIATE}, false, "Skip King Zora as Adult with Nothing", "With a precise jump as adult, it is possible to get on the fence next to King Zora from the front to access Zora's Fountain.");
+    mTrickOptions[RT_ZD_GS] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_ZORAS_DOMAIN, {Tricks::Tag::INTERMEDIATE}, false, "Zora\'s Domain GS with No Additional Items", "A precise jump slash can kill the Skulltula and recoil back onto the top of the frozen waterfall. To kill it, the logic normally guarantees one of Hookshot, Bow, or Magic.");
+    mTrickOptions[RT_LH_LAB_WALL_GS] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_LAKE_HYLIA, {Tricks::Tag::NOVICE}, false, "Lake Hylia Lab Wall GS with Jump Slash", "The jump slash to actually collect the token is somewhat precise.");
+    mTrickOptions[RT_LH_LAB_DIVING] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_LAKE_HYLIA, {Tricks::Tag::NOVICE}, false, "Lake Hylia Lab Dive without Gold Scale", "Remove the Iron Boots in the midst of Hookshotting the underwater crate.");
+    mTrickOptions[RT_LH_WATER_HOOKSHOT] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_LAKE_HYLIA, {Tricks::Tag::INTERMEDIATE}, false, "Water Temple Entry without Iron Boots using Hookshot", "When entering Water Temple using Gold Scale instead of Iron Boots, the Longshot is usually used to be able to hit the switch and open the gate. But, by standing in a particular spot, the switch can be hit with only the reach of the Hookshot.");
+    mTrickOptions[RT_GV_CRATE_HOVERS] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_GERUDO_VALLEY, {Tricks::Tag::INTERMEDIATE}, false, "Gerudo Valley Crate PoH as Adult with Hover Boots", "From the far side of Gerudo Valley, a precise Hover Boots movement and jump-slash recoil can allow adult to reach the ledge with the crate PoH without needing Longshot. You will take fall damage.");
+    mTrickOptions[RT_GF_KITCHEN] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_GERUDO_FORTRESS, {Tricks::Tag::NOVICE}, false, "Thieves\' Hideout \"Kitchen\" with No Additional Items", "Allows passing through the kitchen by avoiding being seen by the guards. The logic normally guarantees Bow or Hookshot to stun them from a distance, or Hover Boots to cross the room without needing to deal with the guards.");
+    mTrickOptions[RT_GF_JUMP] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_GERUDO_FORTRESS, {Tricks::Tag::NOVICE}, false, "Gerudo\'s Fortress Ledge Jumps", "Adult can jump onto the top roof of the fortress without going through the interior of the hideout.");
+    // mTrickOptions[RT_HW_BUNNY_CROSSING] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_HAUNTED_WASTELAND, {Tricks::Tag::NOVICE}, false, "Wasteland Crossing with Bunny Hood", "You can beat the quicksand by using the increased speed of the Bunny Hood. Note that jumping to the carpet merchant as child typically requires a fairly precise jump slash.");
+    mTrickOptions[RT_HW_CROSSING] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_HAUNTED_WASTELAND, {Tricks::Tag::INTERMEDIATE}, false, "Wasteland Crossing without Hover Boots or Longshot", "You can beat the quicksand by backwalking across it in a specific way. Note that jumping to the carpet merchant as child typically requires a fairly precise jump slash.");
+    mTrickOptions[RT_LENS_HW] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_HAUNTED_WASTELAND, {Tricks::Tag::INTERMEDIATE}, false, "Lensless Wasteland", "By memorizing the path, you can travel through the Wasteland without using the Lens of Truth to see the Poe. The equivalent trick for going in reverse through the Wasteland is \"Reverse Wasteland\".");
+    mTrickOptions[RT_HW_REVERSE] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_HAUNTED_WASTELAND, {Tricks::Tag::INTERMEDIATE}, false, "Reverse Wasteland", "By memorizing the path, you can travel through the Wasteland in reverse. Note that jumping to the carpet merchant as child typically requires a fairly precise jump slash. The equivalent trick for going forward through the Wasteland is \"Lensless Wasteland\". To cross the river of sand with no additional items, be sure to also enable \"Wasteland Crossing without Hover Boots or Longshot\". Unless all overworld entrances are randomized, child Link will not be expected to do anything at Gerudo's Fortress.");
+    mTrickOptions[RT_COLOSSUS_GS] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_DESERT_COLOSSUS, {Tricks::Tag::NOVICE}, false, "Colossus Hill GS with Hookshot", "Somewhat precise. If you kill enough Leevers you can get enough of a break to take some time to aim more carefully.");
+    mTrickOptions[RT_DEKU_BASEMENT_GS] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_DEKU_TREE, {Tricks::Tag::NOVICE}, false, "Deku Tree Basement Vines GS with Jump Slash", "Can be defeated by doing a precise jump slash.");
+    mTrickOptions[RT_DEKU_B1_SKIP] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_DEKU_TREE, {Tricks::Tag::INTERMEDIATE}, false, "Deku Tree Basement without Slingshot", "A precise jump can be used to skip needing to use the Slingshot to go around B1 of the Deku Tree. If used with the \"Closed Forest\" setting, a Slingshot will not be guaranteed to exist somewhere inside the Forest. This trick applies to both Vanilla and Master Quest.");
+    mTrickOptions[RT_DEKU_B1_BOW_WEBS] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_DEKU_TREE, {Tricks::Tag::NOVICE}, false, "Deku Tree Basement Web to Gohma with Bow", "All spider web walls in the Deku Tree basement can be burnt as adult with just a bow by shooting through torches. This trick only applies to the circular web leading to Gohma; the two vertical webs are always in logic. Backflip onto the chest near the torch at the bottom of the vine wall. With precise positioning you can shoot through the torch to the right edge of the circular web. This allows completion of adult Deku Tree with no fire source.");
+    mTrickOptions[RT_DEKU_MQ_COMPASS_GS] = TrickOption::LogicTrick(RCQUEST_MQ, RA_DEKU_TREE, {Tricks::Tag::NOVICE}, false, "Deku Tree MQ Compass Room GS Boulders with Just Hammer", "Climb to the top of the vines, then let go and jump slash immediately to destroy the boulders using the Hammer, without needing to spawn a Song of Time block.");
+    mTrickOptions[RT_DEKU_MQ_LOG] = TrickOption::LogicTrick(RCQUEST_MQ, RA_DEKU_TREE, {Tricks::Tag::NOVICE}, false, "Deku Tree MQ Roll Under the Spiked Log", "You can get past the spiked log by rolling to briefly shrink your hitbox. As adult, the timing is a bit more precise.");
+    mTrickOptions[RT_DC_SCARECROW_GS] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_DODONGOS_CAVERN, {Tricks::Tag::NOVICE}, false, "Dodongo\'s Cavern Scarecrow GS with Armos Statue", "You can jump off an Armos Statue to reach the alcove with the Gold Skulltula. It takes quite a long time to pull the statue the entire way. The jump to the alcove can be a bit picky when done as child.");
+    mTrickOptions[RT_DC_VINES_GS] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_DODONGOS_CAVERN, {Tricks::Tag::NOVICE}, false, "Dodongo\'s Cavern Vines GS from Below with Longshot", "The vines upon which this Skulltula rests are one- sided collision. You can use the Longshot to get it from below, by shooting it through the vines, bypassing the need to lower the staircase.");
+    mTrickOptions[RT_DC_STAIRCASE] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_DODONGOS_CAVERN, {Tricks::Tag::NOVICE}, false, "Dodongo\'s Cavern Staircase with Bow", "The Bow can be used to knock down the stairs with two well-timed shots.");
+    mTrickOptions[RT_DC_SLINGSHOT_SKIP] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_DODONGOS_CAVERN, {Tricks::Tag::EXPERT}, false, "Dodongo\'s Cavern Child Slingshot Skips", "With precise platforming, child can cross the platforms while the flame circles are there. When enabling this trick, it's recommended that you also enable the Adult variant: \"Dodongo's Cavern Spike Trap Room Jump without Hover Boots\".");
+    mTrickOptions[RT_DC_SCRUB_ROOM] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_DODONGOS_CAVERN, {Tricks::Tag::NOVICE}, false, "Dodongo\'s Cavern Two Scrub Room with Strength", "With help from a conveniently-positioned block, Adult can quickly carry a bomb flower over to destroy the mud wall blocking the room with two Deku Scrubs.");
+    mTrickOptions[RT_DC_JUMP] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_DODONGOS_CAVERN, {Tricks::Tag::NOVICE}, false, "Dodongo\'s Cavern Spike Trap Room Jump without Hover Boots", "The jump is adult Link only. Applies to both Vanilla and MQ.");
+    mTrickOptions[RT_DC_HAMMER_FLOOR] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_DODONGOS_CAVERN, {Tricks::Tag::NOVICE}, false, "Dodongo\'s Cavern Smash the Boss Lobby Floor", "The bombable floor before King Dodongo can be destroyed with Hammer if hit in the very center. This is only relevant with Shuffle Boss Entrances or if Dodongo's Cavern is MQ and either variant of \"Dodongo's Cavern MQ Light the Eyes with Strength\" is on.");
+    mTrickOptions[RT_DC_MQ_CHILD_BOMBS] = TrickOption::LogicTrick(RCQUEST_MQ, RA_DODONGOS_CAVERN, {Tricks::Tag::ADVANCED}, false, "Dodongo\'s Cavern MQ Early Bomb Bag Area as Child", "With a precise jump slash from above, you can reach the Bomb Bag area as only child without needing a Slingshot. You will take fall damage.");
+    mTrickOptions[RT_DC_MQ_CHILD_EYES] = TrickOption::LogicTrick(RCQUEST_MQ, RA_DODONGOS_CAVERN, {Tricks::Tag::EXPERT}, false, "Dodongo\'s Cavern MQ Light the Eyes with Strength as Child", "If you move very quickly, it is possible to use the bomb flower at the top of the room to light the eyes. To perform this trick as child is significantly more difficult than adult. The player is also expected to complete the DC back area without explosives, including getting past the Armos wall to the switch for the boss door.");
+    mTrickOptions[RT_DC_MQ_ADULT_EYES] = TrickOption::LogicTrick(RCQUEST_MQ, RA_DODONGOS_CAVERN, {Tricks::Tag::ADVANCED}, false, "Dodongo\'s Cavern MQ Light the Eyes with Strength as Adult", "If you move very quickly, it is possible to use the bomb flower at the top of the room to light the eyes.");
+    mTrickOptions[RT_JABU_ALCOVE_JUMP_DIVE] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_JABU_JABUS_BELLY, {Tricks::Tag::NOVICE}, false, "Jabu Underwater Alcove as Adult with Jump Dive", "Standing above the underwater tunnel leading to the scrub, jump down and swim through the tunnel. This allows adult to access the alcove with no Scale or Iron Boots. In vanilla Jabu, this alcove has a business scrub. In MQ Jabu, it has the compass chest and a door switch for the main floor.");
+    mTrickOptions[RT_JABU_BOSS_HOVER] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_JABU_JABUS_BELLY, {Tricks::Tag::INTERMEDIATE}, false, "Jabu Near Boss Room with Hover Boots", "A box for the blue switch can be carried over by backwalking with one while the elevator is at its peak. Alternatively, you can skip transporting a box by quickly rolling from the switch and opening the door before it closes. However, the timing for this is very tight.");
+    mTrickOptions[RT_JABU_NEAR_BOSS_RANGED] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_JABU_JABUS_BELLY, {Tricks::Tag::NOVICE}, false, "Jabu Near Boss Ceiling Switch/GS without Boomerang or Explosives", "Vanilla Jabu: From near the entrance into the room, you can hit the switch that opens the door to the boss room using a precisely-aimed use of the Slingshot, Bow, or Longshot. As well, if you climb to the top of the vines you can stand on the right edge of the platform and shoot around the glass. From this distance, even the Hookshot can reach the switch. This trick is only relevant if \"Shuffle Boss Entrances\" is enabled. MQ Jabu: A Gold Skulltula Token can be collected with the Hookshot or Longshot using the same methods as hitting the switch in vanilla. This MQ trick is not currently relevant in logic.");
+    mTrickOptions[RT_JABU_NEAR_BOSS_EXPLOSIVES] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_JABU_JABUS_BELLY, {Tricks::Tag::INTERMEDIATE}, false, "Jabu Near Boss Ceiling Switch with Explosives", "You can hit the switch that opens the door to the boss room using a precisely-aimed Bombchu. Also, using the Hover Boots, adult can throw a Bomb at the switch. This trick is only relevant if \"Shuffle Boss Entrances\" is enabled.");
+    mTrickOptions[RT_LENS_JABU_MQ] = TrickOption::LogicTrick(RCQUEST_MQ, RA_JABU_JABUS_BELLY, {Tricks::Tag::NOVICE}, false, "Jabu MQ without Lens of Truth", "Removes the requirements for the Lens of Truth in Jabu MQ.");
+    // mTrickOptions[RT_JABU_MQ_RANG_JUMP] = TrickOption::LogicTrick(RCQUEST_MQ, RA_JABU_JABUS_BELLY, {Tricks::Tag::ADVANCED}, false, "Jabu MQ Compass Chest with Boomerang", "Boomerang can reach the cow switch to spawn the chest by targeting the cow, jumping off of the ledge where the chest spawns, and throwing the Boomerang in midair. This is only relevant with Jabu Jabu's Belly dungeon shortcuts enabled.");
+    mTrickOptions[RT_JABU_MQ_SOT_GS] = TrickOption::LogicTrick(RCQUEST_MQ, RA_JABU_JABUS_BELLY, {Tricks::Tag::INTERMEDIATE}, false, "Jabu MQ Song of Time Block GS with Boomerang", "Allow the Boomerang to return to you through the Song of Time block to grab the token.");
+    mTrickOptions[RT_LENS_BOTW] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_BOTTOM_OF_THE_WELL, {Tricks::Tag::NOVICE}, false, "Bottom of the Well without Lens of Truth", "Removes the requirements for the Lens of Truth in Bottom of the Well.");
+    mTrickOptions[RT_BOTW_CHILD_DEADHAND] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_BOTTOM_OF_THE_WELL, {Tricks::Tag::NOVICE}, false, "Child Dead Hand without Kokiri Sword", "Requires 9 sticks or 5 jump slashes.");
+    mTrickOptions[RT_BOTW_BASEMENT] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_BOTTOM_OF_THE_WELL, {Tricks::Tag::NOVICE}, false, "Bottom of the Well Map Chest with Strength & Sticks", "The chest in the basement can be reached with strength by doing a jump slash with a lit stick to access the bomb flowers.");
+    mTrickOptions[RT_BOTW_MQ_PITS] = TrickOption::LogicTrick(RCQUEST_MQ, RA_BOTTOM_OF_THE_WELL, {Tricks::Tag::NOVICE}, false, "Bottom of the Well MQ Jump Over the Pits", "While the pits in Bottom of the Well don't allow you to jump just by running straight at them, you can still get over them by side-hopping or backflipping across. With explosives, this allows you to access the central areas without Zelda's Lullaby. With Zelda's Lullaby, it allows you to access the west inner room without explosives.");
+    mTrickOptions[RT_BOTW_MQ_DEADHAND_KEY] = TrickOption::LogicTrick(RCQUEST_MQ, RA_BOTTOM_OF_THE_WELL, {Tricks::Tag::NOVICE}, false, "Bottom of the Well MQ Dead Hand Freestanding Key with Boomerang", "Boomerang can fish the item out of the rubble without needing explosives to blow it up.");
+    mTrickOptions[RT_FOREST_FIRST_GS] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_FOREST_TEMPLE, {Tricks::Tag::NOVICE}, false, "Forest Temple First Room GS with Difficult-to-Use Weapons", "Allows killing this Skulltula with Sword or Sticks by jump slashing it as you let go from the vines. You can avoid taking fall damage by recoiling onto the tree. Also allows killing it as Child with a Bomb throw. It's much more difficult to use a Bomb as child due to Child Link's shorter height.");
+    mTrickOptions[RT_FOREST_OUTDOORS_EAST_GS] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_FOREST_TEMPLE, {Tricks::Tag::NOVICE}, false, "Forest Temple East Courtyard GS with Boomerang", "Precise Boomerang throws can allow child to kill the Skulltula and collect the token.");
+    mTrickOptions[RT_FOREST_VINES] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_FOREST_TEMPLE, {Tricks::Tag::NOVICE}, false, "Forest Temple East Courtyard Vines with Hookshot", "The vines in Forest Temple leading to where the well drain switch is in the standard form can be barely reached with just the Hookshot. Applies to MQ also.");
+    mTrickOptions[RT_FOREST_OUTDOORS_LEDGE] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_FOREST_TEMPLE, {Tricks::Tag::NOVICE}, false, "Forest Temple NE Outdoors Ledge with Hover Boots", "With precise Hover Boots movement you can fall down to this ledge from upper balconies. If done precisely enough, it is not necessary to take fall damage. In MQ, this skips a Longshot requirement. In Vanilla, this can skip a Hookshot requirement in entrance randomizer.");
+    mTrickOptions[RT_FOREST_DOORFRAME] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_FOREST_TEMPLE, {Tricks::Tag::ADVANCED}, false, "Forest Temple East Courtyard Door Frame with Hover Boots", "A precise Hover Boots movement from the upper balconies in this courtyard can be used to get on top of the door frame. Applies to both Vanilla and Master Quest. In Vanilla, from on top the door frame you can summon Pierre, allowing you to access the falling ceiling room early. In Master Quest, this allows you to obtain the GS on the door frame as adult without Hookshot or Song of Time.");
+    mTrickOptions[RT_FOREST_OUTSIDE_BACKDOOR] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_FOREST_TEMPLE, {Tricks::Tag::ADVANCED}, false, "Forest Temple Outside Backdoor with Jump Slash", "A jump slash recoil can be used to reach the ledge in the block puzzle room that leads to the west courtyard. This skips a potential Hover Boots requirement in vanilla, and it can sometimes apply in MQ as well. This trick can be performed as both ages.");
+    mTrickOptions[RT_FOREST_MQ_WELL_SWIM] = TrickOption::LogicTrick(RCQUEST_MQ, RA_FOREST_TEMPLE, {Tricks::Tag::ADVANCED}, false, "Swim Through Forest Temple MQ Well with Hookshot", "Shoot the vines in the well as low and as far to the right as possible, and then immediately swim under the ceiling to the right. This can only be required if Forest Temple is in its Master Quest form.");
+    mTrickOptions[RT_FOREST_MQ_BLOCK_PUZZLE] = TrickOption::LogicTrick(RCQUEST_MQ, RA_FOREST_TEMPLE, {Tricks::Tag::NOVICE}, false, "Skip Forest Temple MQ Block Puzzle with Bombchu", "Send the Bombchu straight up the center of the wall directly to the left upon entering the room.");
+    mTrickOptions[RT_FOREST_MQ_JS_HALLWAY_SWITCH] = TrickOption::LogicTrick(RCQUEST_MQ, RA_FOREST_TEMPLE, {Tricks::Tag::NOVICE}, false, "Forest Temple MQ Twisted Hallway Switch with Jump Slash", "The switch to twist the hallway can be hit with a jump slash through the glass block. To get in front of the switch, either use the Hover Boots or hit the shortcut switch at the top of the room and jump from the glass blocks that spawn. Sticks can be used as child, but the Kokiri Sword is too short to reach through the glass.");
+    // mTrickOptions[RT_FOREST_MQ_HOOKSHOT_HALLWAY_SWITCH] = TrickOption::LogicTrick(RCQUEST_MQ, RA_FOREST_TEMPLE, {Tricks::Tag::INTERMEDIATE}, false, "Forest Temple MQ Twisted Hallway Switch with Hookshot", "There's a very small gap between the glass block and the wall. Through that gap you can hookshot the target on the ceiling.");
+    mTrickOptions[RT_FOREST_MQ_RANG_HALLWAY_SWITCH] = TrickOption::LogicTrick(RCQUEST_MQ, RA_FOREST_TEMPLE, {Tricks::Tag::INTERMEDIATE}, false, "Forest Temple MQ Twisted Hallway Switch with Boomerang", "The Boomerang can return to Link through walls, allowing child to hit the hallway switch. This can be used to allow adult to pass through later, or in conjuction with \"Forest Temple Outside Backdoor with Jump Slash\".");
+    mTrickOptions[RT_FIRE_BOSS_DOOR_JUMP] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_FIRE_TEMPLE, {Tricks::Tag::NOVICE}, false, "Fire Temple Boss Door without Hover Boots or Pillar", "The Fire Temple Boss Door can be reached as adult with a precise jump. You must be touching the side wall of the room so that Link will grab the ledge from farther away than is normally possible.");
+    mTrickOptions[RT_FIRE_SOT] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_FIRE_TEMPLE, {Tricks::Tag::INTERMEDIATE}, false, "Fire Temple Song of Time Room GS without Song of Time", "A precise jump can be used to reach this room.");
+    mTrickOptions[RT_FIRE_STRENGTH] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_FIRE_TEMPLE, {Tricks::Tag::INTERMEDIATE}, false, "Fire Temple Climb without Strength", "A precise jump can be used to skip pushing the block.");
+    mTrickOptions[RT_FIRE_SCARECROW] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_FIRE_TEMPLE, {Tricks::Tag::EXPERT}, false, "Fire Temple East Tower without Scarecrow\'s Song", "Also known as \"Pixelshot\". The Longshot can reach the target on the elevator itself, allowing you to skip needing to spawn the scarecrow.");
+    mTrickOptions[RT_FIRE_FLAME_MAZE] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_FIRE_TEMPLE, {Tricks::Tag::INTERMEDIATE}, false, "Fire Temple Flame Wall Maze Skip", "If you move quickly you can sneak past the edge of a flame wall before it can rise up to block you. To do it without taking damage is more precise. Allows you to progress without needing either a Small Key or Hover Boots.");
+    mTrickOptions[RT_FIRE_MQ_NEAR_BOSS] = TrickOption::LogicTrick(RCQUEST_MQ, RA_FIRE_TEMPLE, {Tricks::Tag::NOVICE}, false, "Fire Temple MQ Chest Near Boss without Breaking Crate", "The hitbox for the torch extends a bit outside of the crate. Shoot a flaming arrow at the side of the crate to light the torch without needing to get over there and break the crate.");
+    mTrickOptions[RT_FIRE_MQ_BLOCKED_CHEST] = TrickOption::LogicTrick(RCQUEST_MQ, RA_FIRE_TEMPLE, {Tricks::Tag::INTERMEDIATE}, false, "Fire Temple MQ Big Lava Room Blocked Door without Hookshot", "There is a gap between the hitboxes of the flame wall in the big lava room. If you know where this gap is located, you can jump through it and skip needing to use the Hookshot. To do this without taking damage is more precise.");
+    mTrickOptions[RT_FIRE_MQ_BK_CHEST] = TrickOption::LogicTrick(RCQUEST_MQ, RA_FIRE_TEMPLE, {Tricks::Tag::INTERMEDIATE}, false, "Fire Temple MQ Boss Key Chest without Bow", "It is possible to light both of the timed torches to unbar the door to the boss key chest's room with just Din's Fire if you move very quickly between the two torches. It is also possible to unbar the door with just Din's by abusing an oversight in the way the game counts how many torches have been lit.");
+    mTrickOptions[RT_FIRE_MQ_CLIMB] = TrickOption::LogicTrick(RCQUEST_MQ, RA_FIRE_TEMPLE, {Tricks::Tag::NOVICE}, false, "Fire Temple MQ Climb without Fire Source", "You can use the Hover Boots to hover around to the climbable wall, skipping the need to use a fire source and spawn a Hookshot target.");
+    mTrickOptions[RT_FIRE_MQ_MAZE_SIDE_ROOM] = TrickOption::LogicTrick(RCQUEST_MQ, RA_FIRE_TEMPLE, {Tricks::Tag::NOVICE}, false, "Fire Temple MQ Lizalfos Maze Side Room without Box", "You can walk from the blue switch to the door and quickly open the door before the bars reclose. This skips needing to reach the upper sections of the maze to get a box to place on the switch.");
+    mTrickOptions[RT_FIRE_MQ_MAZE_HOVERS] = TrickOption::LogicTrick(RCQUEST_MQ, RA_FIRE_TEMPLE, {Tricks::Tag::NOVICE}, false, "Fire Temple MQ Lower to Upper Lizalfos Maze with Hover Boots", "Use the Hover Boots off of a crate to climb to the upper maze without needing to spawn and use the Hookshot targets.");
+    mTrickOptions[RT_FIRE_MQ_MAZE_JUMP] = TrickOption::LogicTrick(RCQUEST_MQ, RA_FIRE_TEMPLE, {Tricks::Tag::INTERMEDIATE}, false, "Fire Temple MQ Lower to Upper Lizalfos Maze with Precise Jump", "A precise jump off of a crate can be used to climb to the upper maze without needing to spawn and use the Hookshot targets. This trick supersedes both \"Fire Temple MQ Lower to Upper Lizalfos Maze with Hover Boots\" and \"Fire Temple MQ Lizalfos Maze Side Room without Box\".");
+    mTrickOptions[RT_FIRE_MQ_ABOVE_MAZE_GS] = TrickOption::LogicTrick(RCQUEST_MQ, RA_FIRE_TEMPLE, {Tricks::Tag::INTERMEDIATE}, false, "Fire Temple MQ Above Flame Wall Maze GS from Below with Longshot", "The floor of the room that contains this Skulltula is only solid from above. From the maze below, the Longshot can be shot through the ceiling to obtain the token with two fewer small keys than normal.");
+    mTrickOptions[RT_FIRE_MQ_FLAME_MAZE] = TrickOption::LogicTrick(RCQUEST_MQ, RA_FIRE_TEMPLE, {Tricks::Tag::INTERMEDIATE}, false, "Fire Temple MQ Flame Wall Maze Skip", "If you move quickly you can sneak past the edge of a flame wall before it can rise up to block you. To do it without taking damage is more precise. Allows you to reach the side room GS without needing Song of Time or Hover Boots. If either of \"Fire Temple MQ Lower to Upper Lizalfos Maze with Hover Boots\" or \"with Precise Jump\" are enabled, this also allows you to progress deeper into the dungeon without Hookshot.");
+    mTrickOptions[RT_WATER_LONGSHOT_TORCH] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_WATER_TEMPLE, {Tricks::Tag::NOVICE}, false, "Water Temple Torch Longshot", "Stand on the eastern side of the central pillar and longshot the torches on the bottom level. Swim through the corridor and float up to the top level. This allows access to this area and lower water levels without Iron Boots. The majority of the tricks that allow you to skip Iron Boots in the Water Temple are not going to be relevant unless this trick is first enabled.");
+    mTrickOptions[RT_WATER_CRACKED_WALL_HOVERS] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_WATER_TEMPLE, {Tricks::Tag::NOVICE}, false, "Water Temple Cracked Wall with Hover Boots", "With a midair side-hop while wearing the Hover Boots, you can reach the cracked wall without needing to raise the water up to the middle level.");
+    mTrickOptions[RT_WATER_CRACKED_WALL] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_WATER_TEMPLE, {Tricks::Tag::INTERMEDIATE}, false, "Water Temple Cracked Wall with No Additional Items", "A precise jump slash (among other methods) will get you to the cracked wall without needing the Hover Boots or to raise the water to the middle level. This trick supersedes \"Water Temple Cracked Wall with Hover Boots\".");
+    mTrickOptions[RT_WATER_BK_REGION] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_WATER_TEMPLE, {Tricks::Tag::INTERMEDIATE}, false, "Water Temple Boss Key Region with Hover Boots", "With precise Hover Boots movement it is possible to reach the boss key chest's region without needing the Longshot. It is not necessary to take damage from the spikes. The Gold Skulltula Token in the following room can also be obtained with just the Hover Boots.");
+    mTrickOptions[RT_WATER_NORTH_BASEMENT_LEDGE_JUMP] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_WATER_TEMPLE, {Tricks::Tag::INTERMEDIATE}, false, "Water Temple North Basement Ledge with Precise Jump", "In the northern basement there's a ledge from where, in vanilla Water Temple, boulders roll out into the room. Normally to jump directly to this ledge logically requires the Hover Boots, but with precise jump, it can be done without them. This trick applies to both Vanilla and Master Quest.");
+    mTrickOptions[RT_WATER_BK_JUMP_DIVE] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_WATER_TEMPLE, {Tricks::Tag::NOVICE}, false, "Water Temple Boss Key Jump Dive", "Stand on the very edge of the raised corridor leading from the push block room to the rolling boulder corridor. Face the gold skulltula on the waterfall and jump over the boulder corridor floor into the pool of water, swimming right once underwater. This allows access to the boss key room without Iron boots.");
+    mTrickOptions[RT_WATER_FW_CENTRAL_GS] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_WATER_TEMPLE, {Tricks::Tag::NOVICE}, false, "Water Temple Central Pillar GS with Farore\'s Wind", "If you set Farore's Wind inside the central pillar and then return to that warp point after raising the water to the highest level, you can obtain this Skulltula Token with Hookshot or Boomerang.");
+    mTrickOptions[RT_WATER_IRONS_CENTRAL_GS] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_WATER_TEMPLE, {Tricks::Tag::NOVICE}, false, "Water Temple Central Pillar GS with Iron Boots", "After opening the middle water level door into the central pillar, the door will stay unbarred so long as you do not leave the room -- even if you were to raise the water up to the highest level. With the Iron Boots to go through the door after the water has been raised, you can obtain the Skulltula Token with the Hookshot.");
+    mTrickOptions[RT_WATER_CENTRAL_BOW] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_WATER_TEMPLE, {Tricks::Tag::ADVANCED}, false, "Water Temple Central Bow Target without Longshot or Hover Boots", "A very precise Bow shot can hit the eye switch from the floor above. Then, you can jump down into the hallway and make through it before the gate closes. It can also be done as child, using the Slingshot instead of the Bow.");
+    mTrickOptions[RT_WATER_HOOKSHOT_FALLING_PLATFORM_GS] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_WATER_TEMPLE, {Tricks::Tag::NOVICE}, false, "Water Temple Falling Platform Room GS with Hookshot", "If you stand on the very edge of the platform, this Gold Skulltula can be obtained with only the Hookshot.");
+    mTrickOptions[RT_WATER_RANG_FALLING_PLATFORM_GS] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_WATER_TEMPLE, {Tricks::Tag::INTERMEDIATE}, false, "Water Temple Falling Platform Room GS with Boomerang", "If you stand on the very edge of the platform, this Gold Skulltula can be obtained with only the Boomerang.");
+    mTrickOptions[RT_WATER_RIVER_GS] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_WATER_TEMPLE, {Tricks::Tag::INTERMEDIATE}, false, "Water Temple River GS without Iron Boots", "Standing on the exposed ground toward the end of the river, a precise Longshot use can obtain the token. The Longshot cannot normally reach far enough to kill the Skulltula, however. You'll first have to find some other way of killing it.");
+    mTrickOptions[RT_WATER_DRAGON_JUMP_DIVE] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_WATER_TEMPLE, {Tricks::Tag::NOVICE}, false, "Water Temple Dragon Statue Jump Dive", "If you come into the dragon statue room from the serpent river, you can jump down from above and get into the tunnel without needing either Iron Boots or a Scale. This trick applies to both Vanilla and Master Quest. In Vanilla, you must shoot the switch from above with the Bow, and then quickly get through the tunnel before the gate closes.");
+    mTrickOptions[RT_WATER_ADULT_DRAGON] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_WATER_TEMPLE, {Tricks::Tag::NOVICE}, false, "Water Temple Dragon Statue Switch from Above the Water as Adult", "Normally you need both Hookshot and Iron Boots to hit the switch and swim through the tunnel to get to the chest. But by hitting the switch from dry land, using one of Bombchus, Hookshot, or Bow, it is possible to skip one or both of those requirements. After the gate has been opened, besides just using the Iron Boots, a well-timed dive with at least the Silver Scale could be used to swim through the tunnel. If coming from the serpent river, a jump dive can also be used to get into the tunnel.");
+    mTrickOptions[RT_WATER_CHILD_DRAGON] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_WATER_TEMPLE, {Tricks::Tag::ADVANCED}, false, "Water Temple Dragon Statue Switch from Above the Water as Child", "It is possible for child to hit the switch from dry land using one of Bombchus, Slingshot or Boomerang. Then, to get to the chest, child can dive through the tunnel using at least the Silver Scale. The timing and positioning of this dive needs to be perfect to actually make it under the gate, and it all needs to be done very quickly to be able to get through before the gate closes. Be sure to enable \"Water Temple Dragon Statue Switch from Above the Water as Adult\" for adult's variant of this trick.");
+    mTrickOptions[RT_WATER_MQ_CENTRAL_PILLAR] = TrickOption::LogicTrick(RCQUEST_MQ, RA_WATER_TEMPLE, {Tricks::Tag::NOVICE}, false, "Water Temple MQ Central Pillar with Fire Arrows", "Slanted torches have misleading hitboxes. Whenever you see a slanted torch jutting out of the wall, you can expect most or all of its hitbox is actually on the other side that wall. This can make slanted torches very finicky to light when using arrows. The torches in the central pillar of MQ Water Temple are a particularly egregious example. Logic normally expects Din's Fire and Song of Time.");
+    mTrickOptions[RT_WATER_MQ_LOCKED_GS] = TrickOption::LogicTrick(RCQUEST_MQ, RA_WATER_TEMPLE, {Tricks::Tag::NOVICE}, false, "Water Temple MQ North Basement GS without Small Key", "There is an invisible Hookshot target that can be used to get over the gate that blocks you from going to this Skulltula early, skipping a small key as well as needing Hovers or Scarecrow to reach the locked door.");
+    mTrickOptions[RT_LENS_SHADOW] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_SHADOW_TEMPLE, {Tricks::Tag::NOVICE}, false, "Shadow Temple Stationary Objects without Lens of Truth", "Removes the requirements for the Lens of Truth in Shadow Temple for most areas in the dungeon except for crossing the moving platform in the huge pit room and for fighting Bongo Bongo.");
+    mTrickOptions[RT_LENS_SHADOW_PLATFORM] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_SHADOW_TEMPLE, {Tricks::Tag::NOVICE}, false, "Shadow Temple Invisible Moving Platform without Lens of Truth", "Removes the requirements for the Lens of Truth in Shadow Temple to cross the invisible moving platform in the huge pit room in either direction.");
+    mTrickOptions[RT_LENS_BONGO] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_SHADOW_TEMPLE, {Tricks::Tag::NOVICE}, false, "Shadow Temple Bongo Bongo without Lens of Truth", "Bongo Bongo can be defeated without the use of Lens of Truth, as the hands give a pretty good idea of where the eye is.");
+    mTrickOptions[RT_SHADOW_UMBRELLA] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_SHADOW_TEMPLE, {Tricks::Tag::EXPERT}, false, "Shadow Temple Stone Umbrella Skip", "A very precise Hover Boots movement from off of the lower chest can get you on top of the crushing spikes without needing to pull the block. Applies to both Vanilla and Master Quest.");
+    mTrickOptions[RT_SHADOW_UMBRELLA_GS] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_SHADOW_TEMPLE, {Tricks::Tag::EXPERT}, false, "Shadow Temple Falling Spikes GS with Hover Boots", "After killing the Skulltula, a very precise Hover Boots movement from off of the lower chest can get you on top of the crushing spikes without needing to pull the block. From there, another very precise Hover Boots movement can be used to obtain the token without needing the Hookshot. Applies to both Vanilla and Master Quest. For obtaining the chests in this room with just Hover Boots, be sure to enable \"Shadow Temple Stone Umbrella Skip\".");
+    mTrickOptions[RT_SHADOW_FREESTANDING_KEY] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_SHADOW_TEMPLE, {Tricks::Tag::NOVICE}, false, "Shadow Temple Freestanding Key with Bombchu", "Release the Bombchu with good timing so that it explodes near the bottom of the pot.");
+    mTrickOptions[RT_SHADOW_STATUE] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_SHADOW_TEMPLE, {Tricks::Tag::INTERMEDIATE}, false, "Shadow Temple River Statue with Bombchu", "By sending a Bombchu around the edge of the gorge, you can knock down the statue without needing a Bow. Applies in both vanilla and MQ Shadow.");
+    mTrickOptions[RT_SHADOW_BONGO] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_SHADOW_TEMPLE, {Tricks::Tag::INTERMEDIATE}, false, "Shadow Temple Bongo Bongo without projectiles", "Using precise sword slashes, Bongo Bongo can be defeated without using projectiles. This is only relevant in conjunction with Shadow Temple dungeon shortcuts or shuffled boss entrances.");
+    mTrickOptions[RT_LENS_SHADOW_MQ] = TrickOption::LogicTrick(RCQUEST_MQ, RA_SHADOW_TEMPLE, {Tricks::Tag::NOVICE}, false, "Shadow Temple MQ Stationary Objects without Lens of Truth", "Removes the requirements for the Lens of Truth in Shadow Temple MQ for most areas in the dungeon. See \"Shadow Temple MQ Invisible Moving Platform without Lens of Truth\", \"Shadow Temple MQ Invisible Blades Silver Rupees without Lens of Truth\", \"Shadow Temple MQ 2nd Dead Hand without Lens of Truth\", and \"Shadow Temple Bongo Bongo without Lens of Truth\" for exceptions.");
+    mTrickOptions[RT_LENS_SHADOW_MQ_INVISIBLE_BLADES] = TrickOption::LogicTrick(RCQUEST_MQ, RA_SHADOW_TEMPLE, {Tricks::Tag::NOVICE}, false, "Shadow Temple MQ Invisible Blades Silver Rupees without Lens of Truth", "Removes the requirement for the Lens of Truth or Nayru's Love in Shadow Temple MQ for the Invisible Blades room silver rupee collection.");
+    mTrickOptions[RT_LENS_SHADOW_MQ_PLATFORM] = TrickOption::LogicTrick(RCQUEST_MQ, RA_SHADOW_TEMPLE, {Tricks::Tag::NOVICE}, false, "Shadow Temple MQ Invisible Moving Platform without Lens of Truth", "Removes the requirements for the Lens of Truth in Shadow Temple MQ to cross the invisible moving platform in the huge pit room in either direction.");
+    mTrickOptions[RT_LENS_SHADOW_MQ_DEADHAND] = TrickOption::LogicTrick(RCQUEST_MQ, RA_SHADOW_TEMPLE, {Tricks::Tag::NOVICE}, false, "Shadow Temple MQ 2nd Dead Hand without Lens of Truth", "Dead Hand spawns in a random spot within the room. Having Lens removes the hassle of having to comb the room looking for his spawn location.");
+    mTrickOptions[RT_SHADOW_MQ_GAP] = TrickOption::LogicTrick(RCQUEST_MQ, RA_SHADOW_TEMPLE, {Tricks::Tag::INTERMEDIATE}, false, "Shadow Temple MQ Truth Spinner Gap with Longshot", "You can Longshot a torch and jump-slash recoil onto the tongue. It works best if you Longshot the right torch from the left side of the room.");
+    mTrickOptions[RT_SHADOW_MQ_INVISIBLE_BLADES] = TrickOption::LogicTrick(RCQUEST_MQ, RA_SHADOW_TEMPLE, {Tricks::Tag::INTERMEDIATE}, false, "Shadow Temple MQ Invisible Blades without Song of Time", "The Like Like can be used to boost you into the silver rupee or recovery hearts that normally require Song of Time. This cannot be performed on OHKO since the Like Like does not boost you high enough if you die.");
+    mTrickOptions[RT_SHADOW_MQ_HUGE_PIT] = TrickOption::LogicTrick(RCQUEST_MQ, RA_SHADOW_TEMPLE, {Tricks::Tag::INTERMEDIATE}, false, "Shadow Temple MQ Lower Huge Pit without Fire Source", "Normally a frozen eye switch spawns some platforms that you can use to climb down, but there's actually a small piece of ground that you can stand on that you can just jump down to.");
+    // mTrickOptions[RT_SHADOW_MQ_WINDY_WALKWAY] = TrickOption::LogicTrick(RCQUEST_MQ, RA_SHADOW_TEMPLE, {Tricks::Tag::INTERMEDIATE}, false, "Shadow Temple MQ Windy Walkway Reverse without Hover Boots", "With shadow dungeon shortcuts enabled, it is possible to jump from the alcove in the windy hallway to the middle platform. There are two methods: wait out the fan opposite the door and hold forward, or jump to the right to be pushed by the fan there towards the platform ledge. Note that jumps of this distance are inconsistent, but still possible.");
+    mTrickOptions[RT_LENS_SPIRIT] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_SPIRIT_TEMPLE, {Tricks::Tag::NOVICE}, false, "Spirit Temple without Lens of Truth", "Removes the requirements for the Lens of Truth in Spirit Temple.");
+    mTrickOptions[RT_SPIRIT_CHILD_CHU] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_SPIRIT_TEMPLE, {Tricks::Tag::NOVICE}, false, "Spirit Temple Child Side Bridge with Bombchu", "A carefully-timed Bombchu can hit the switch.");
+    mTrickOptions[RT_SPIRIT_LOBBY_GS] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_SPIRIT_TEMPLE, {Tricks::Tag::NOVICE}, false, "Spirit Temple Main Room GS with Boomerang", "Standing on the highest part of the arm of the statue, a precise Boomerang throw can kill and obtain this Gold Skulltula. You must throw the Boomerang slightly off to the side so that it curves into the Skulltula, as aiming directly at it will clank off of the wall in front.");
+    mTrickOptions[RT_SPIRIT_LOWER_ADULT_SWITCH] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_SPIRIT_TEMPLE, {Tricks::Tag::ADVANCED}, false, "Spirit Temple Lower Adult Switch with Bombs", "A bomb can be used to hit the switch on the ceiling, but it must be thrown from a particular distance away and with precise timing.");
+    mTrickOptions[RT_SPIRIT_LOBBY_JUMP] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_SPIRIT_TEMPLE, {Tricks::Tag::INTERMEDIATE}, false, "Spirit Temple Main Room Jump from Hands to Upper Ledges", "A precise jump to obtain the following as adult without needing one of Hover Boots, or Hookshot (in vanilla) or Song of Time (in MQ): - Spirit Temple Statue Room Northeast Chest - Spirit Temple GS Lobby - Spirit Temple MQ Central Chamber Top Left Pot (Left) - Spirit Temple MQ Central Chamber Top Left Pot (Right)");
+    // mTrickOptions[RT_SPIRIT_PLATFORM_HOOKSHOT] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_SPIRIT_TEMPLE, {Tricks::Tag::INTERMEDIATE}, false, "Spirit Temple Main Room Hookshot to Boss Platform", "Precise hookshot aiming at the platform chains can be used to reach the boss platform from the middle landings. Using a jump slash immediately after reaching a chain makes aiming more lenient. Relevant only when Spirit Temple boss shortcuts are on.");
+    mTrickOptions[RT_SPIRIT_MAP_CHEST] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_SPIRIT_TEMPLE, {Tricks::Tag::NOVICE}, false, "Spirit Temple Map Chest with Bow", "To get a line of sight from the upper torch to the map chest torches, you must pull an Armos statue all the way up the stairs.");
+    mTrickOptions[RT_SPIRIT_SUN_CHEST] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_SPIRIT_TEMPLE, {Tricks::Tag::ADVANCED}, false, "Spirit Temple Sun Block Room Chest with Bow", "Using the blocks in the room as platforms you can get lines of sight to all three torches. The timer on the torches is quite short so you must move quickly in order to light all three.");
+    mTrickOptions[RT_SPIRIT_WALL] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_SPIRIT_TEMPLE, {Tricks::Tag::INTERMEDIATE}, false, "Spirit Temple Shifting Wall with No Additional Items", "Logic normally guarantees a way of dealing with both the Beamos and the Walltula before climbing the wall.");
+    mTrickOptions[RT_LENS_SPIRIT_MQ] = TrickOption::LogicTrick(RCQUEST_MQ, RA_SPIRIT_TEMPLE, {Tricks::Tag::NOVICE}, false, "Spirit Temple MQ without Lens of Truth", "Removes the requirements for the Lens of Truth in Spirit Temple MQ.");
+    mTrickOptions[RT_SPIRIT_MQ_SUN_BLOCK_SOT] = TrickOption::LogicTrick(RCQUEST_MQ, RA_SPIRIT_TEMPLE, {Tricks::Tag::INTERMEDIATE}, false, "Spirit Temple MQ Sun Block Room as Child without Song of Time", "While adult can easily jump directly to the switch that unbars the door to the sun block room, child Link cannot make the jump without spawning a Song of Time block to jump from. You can skip this by throwing the crate down onto the switch from above, which does unbar the door, however the crate immediately breaks, so you must move quickly to get through the door before it closes back up.");
+    mTrickOptions[RT_SPIRIT_MQ_SUN_BLOCK_GS] = TrickOption::LogicTrick(RCQUEST_MQ, RA_SPIRIT_TEMPLE, {Tricks::Tag::INTERMEDIATE}, false, "Spirit Temple MQ Sun Block Room GS with Boomerang", "Throw the Boomerang in such a way that it curves through the side of the glass block to hit the Gold Skulltula.");
+    mTrickOptions[RT_SPIRIT_MQ_LOWER_ADULT] = TrickOption::LogicTrick(RCQUEST_MQ, RA_SPIRIT_TEMPLE, {Tricks::Tag::INTERMEDIATE}, false, "Spirit Temple MQ Lower Adult without Fire Arrows", "By standing in a precise position it is possible to light two of the torches with a single use of Din\'s Fire. This saves enough time to be able to light all three torches with only Din\'s.");
+    mTrickOptions[RT_SPIRIT_MQ_FROZEN_EYE] = TrickOption::LogicTrick(RCQUEST_MQ, RA_SPIRIT_TEMPLE, {Tricks::Tag::NOVICE}, false, "Spirit Temple MQ Frozen Eye Switch without Fire", "You can melt the ice by shooting an arrow through a torch. The only way to find a line of sight for this shot is to first spawn a Song of Time block, and then stand on the very edge of it.");
+    mTrickOptions[RT_ICE_BLOCK_GS] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_SPIRIT_TEMPLE, {Tricks::Tag::INTERMEDIATE}, false, "Ice Cavern Block Room GS with Hover Boots", "The Hover Boots can be used to get in front of the Skulltula to kill it with a jump slash. Then, the Hover Boots can again be used to obtain the Token, all without Hookshot or Boomerang.");
+    mTrickOptions[RT_ICE_MQ_RED_ICE_GS] = TrickOption::LogicTrick(RCQUEST_MQ, RA_SPIRIT_TEMPLE, {Tricks::Tag::INTERMEDIATE}, false, "Ice Cavern MQ Red Ice GS without Song of Time", "If you side-hop into the perfect position, you can briefly stand on the platform with the red ice just long enough to dump some blue fire.");
+    mTrickOptions[RT_ICE_MQ_SCARECROW] = TrickOption::LogicTrick(RCQUEST_MQ, RA_SPIRIT_TEMPLE, {Tricks::Tag::INTERMEDIATE}, false, "Ice Cavern MQ Scarecrow GS with No Additional Items", "As adult a precise jump can be used to reach this alcove.");
+    mTrickOptions[RT_LENS_GTG] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_GERUDO_TRAINING_GROUND, {Tricks::Tag::NOVICE}, false, "Gerudo Training Ground without Lens of Truth", "Removes the requirements for the Lens of Truth in Gerudo Training Ground.");
+    mTrickOptions[RT_GTG_WITHOUT_HOOKSHOT] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_GERUDO_TRAINING_GROUND, {Tricks::Tag::INTERMEDIATE}, false, "Gerudo Training Ground Left Side Silver Rupees without Hookshot", "After collecting the rest of the silver rupees in the room, you can reach the final silver rupee on the ceiling by being pulled up into it after getting grabbed by the Wallmaster. Then, you must also reach the exit of the room without the use of the Hookshot. If you move quickly you can sneak past the edge of a flame wall before it can rise up to block you. To do so without taking damage is more precise.");
+    mTrickOptions[RT_GTG_FAKE_WALL] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_GERUDO_TRAINING_GROUND, {Tricks::Tag::NOVICE}, false, "Reach Gerudo Training Ground Fake Wall Ledge with Hover Boots", "A precise Hover Boots use from the top of the chest can allow you to grab the ledge without needing the usual requirements. In Master Quest, this always skips a Song of Time requirement. In Vanilla, this skips a Hookshot requirement, but is only relevant if \"Gerudo Training Ground Left Side Silver Rupees without Hookshot\" is enabled.");
+    mTrickOptions[RT_LENS_GTG_MQ] = TrickOption::LogicTrick(RCQUEST_MQ, RA_GERUDO_TRAINING_GROUND, {Tricks::Tag::NOVICE}, false, "Gerudo Training Ground MQ without Lens of Truth", "Removes the requirements for the Lens of Truth in Gerudo Training Ground MQ.");
+    mTrickOptions[RT_GTG_MQ_WITH_HOOKSHOT] = TrickOption::LogicTrick(RCQUEST_MQ, RA_GERUDO_TRAINING_GROUND, {Tricks::Tag::NOVICE}, false, "Gerudo Training Ground MQ Left Side Silver Rupees with Hookshot", "The highest silver rupee can be obtained by hookshotting the target and then immediately jump slashing toward the rupee.");
+    mTrickOptions[RT_GTG_MQ_WIHTOUT_HOOKSHOT] = TrickOption::LogicTrick(RCQUEST_MQ, RA_GERUDO_TRAINING_GROUND, {Tricks::Tag::INTERMEDIATE}, false, "Gerudo Training Ground MQ Left Side Silver Rupees without Hookshot", "After collecting the rest of the silver rupees in the room, you can reach the final silver rupee on the ceiling by being pulled up into it after getting grabbed by the Wallmaster. The Wallmaster will not track you to directly underneath the rupee. You should take the last step to be under the rupee after the Wallmaster has begun its attempt to grab you. Also included with this trick is that fact that the switch that unbars the door to the final chest of GTG can be hit without a projectile, using a precise jump slash. This trick supersedes \"Gerudo Training Ground MQ Left Side Silver Rupees with Hookshot\".");
+    mTrickOptions[RT_LENS_GANON] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_GANONS_CASTLE, {Tricks::Tag::NOVICE}, false, "Ganon\'s Castle without Lens of Truth", "Removes the requirements for the Lens of Truth in Ganon's Castle.");
+    mTrickOptions[RT_GANON_SPIRIT_TRIAL_HOOKSHOT] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_GANONS_CASTLE, {Tricks::Tag::NOVICE}, false, "Spirit Trial without Hookshot", "The highest rupee can be obtained as either age by performing a precise jump and a well-timed jumpslash off of an Armos.");
+    mTrickOptions[RT_LENS_GANON_MQ] = TrickOption::LogicTrick(RCQUEST_MQ, RA_GANONS_CASTLE, {Tricks::Tag::NOVICE}, false, "Ganon\'s Castle MQ without Lens of Truth", "Removes the requirements for the Lens of Truth in Ganon's Castle MQ.");
+    mTrickOptions[RT_GANON_MQ_FIRE_TRIAL] = TrickOption::LogicTrick(RCQUEST_MQ, RA_GANONS_CASTLE, {Tricks::Tag::ADVANCED}, false, "Fire Trial MQ with Hookshot", "It's possible to hook the target at the end of fire trial with just Hookshot, but it requires precise aim and perfect positioning. The main difficulty comes from getting on the very corner of the obelisk without falling into the lava.");
+    mTrickOptions[RT_GANON_MQ_SHADOW_TRIAL] = TrickOption::LogicTrick(RCQUEST_MQ, RA_GANONS_CASTLE, {Tricks::Tag::NOVICE}, false, "Shadow Trial MQ Torch with Bow", "You can light the torch in this room without a fire source by shooting an arrow through the lit torch at the beginning of the room. Because the room is so dark and the unlit torch is so far away, it can be difficult to aim the shot correctly.");
+    mTrickOptions[RT_GANON_MQ_LIGHT_TRIAL] = TrickOption::LogicTrick(RCQUEST_MQ, RA_GANONS_CASTLE, {Tricks::Tag::INTERMEDIATE}, false, "Light Trial MQ without Hookshot", "If you move quickly you can sneak past the edge of a flame wall before it can rise up to block you. In this case to do it without taking damage is especially precise.");
 
     mOptionGroups[RSG_LOGIC] = OptionGroup::SubGroup("Logic Options", {
         &mOptions[RSK_LOGIC_RULES],
@@ -548,10 +564,12 @@ void Settings::CreateOptions() {
         &mTrickOptions[RT_GANON_MQ_SHADOW_TRIAL],
         &mTrickOptions[RT_GANON_MQ_LIGHT_TRIAL],
     }, false);
-    int i = 0;
-    for (const auto trick : mOptionGroups[RSG_TRICKS].GetOptions()) {
-        mTrickNameToEnum[std::string(trick->GetName())] = static_cast<RandomizerTrick>(i);
-        i++;
+    for (int i = 0; i < RT_MAX; i++) {
+        auto& trick = mTrickOptions[i];
+        if (!trick.GetName().empty()) {
+            mTrickNameToEnum[std::string(trick.GetName())] = static_cast<RandomizerTrick>(i);
+        }
+        mTricksByArea[trick.GetArea()].push_back(static_cast<RandomizerTrick>(i));
     }
     // TODO: Glitches
     mOptionGroups[RSG_AREA_ACCESS_IMGUI] = OptionGroup::SubGroup("Area Access", {
@@ -1144,7 +1162,7 @@ Option& Settings::GetOption(const RandomizerSettingKey key) {
     return mOptions[key];
 }
 
-Option& Settings::GetTrickOption(const RandomizerTrick key) {
+TrickOption& Settings::GetTrickOption(const RandomizerTrick key) {
     return mTrickOptions[key];
 }
 
diff --git a/soh/soh/Enhancements/randomizer/settings.h b/soh/soh/Enhancements/randomizer/settings.h
index fbd2adacc..d0eb43d5e 100644
--- a/soh/soh/Enhancements/randomizer/settings.h
+++ b/soh/soh/Enhancements/randomizer/settings.h
@@ -34,7 +34,7 @@ class Settings {
      * @param key
      * @return Option&
      */
-    Option& GetTrickOption(RandomizerTrick key);
+    TrickOption& GetTrickOption(RandomizerTrick key);
 
     /**
      * @brief Reset all RandomizerTrick keys.
@@ -174,6 +174,7 @@ class Settings {
      */
     void ParseJson(nlohmann::json spoilerFileJson);
     std::vector<Option*> VanillaLogicDefaults = {};
+    std::map<RandomizerArea, std::vector<RandomizerTrick>> mTricksByArea = {};
 
   private:
     /**
@@ -183,7 +184,7 @@ class Settings {
     std::array<Option, RSK_MAX> mOptions = {};
     std::array<std::string, RSK_MAX> mOptionDescriptions = {};
     std::array<OptionGroup, RSG_MAX> mOptionGroups = {};
-    std::array<Option, RT_MAX> mTrickOptions = {};
+    std::array<TrickOption, RT_MAX> mTrickOptions = {};
     std::vector<std::vector<Option*>> mExcludeLocationsOptionsGroups = {};
     std::unordered_map<std::string, RandomizerSettingKey> mSpoilerfileSettingNameToEnum;
     RandoOptionStartingAge mResolvedStartingAge =  RO_AGE_CHILD;
diff --git a/soh/soh/Enhancements/randomizer/tricks.cpp b/soh/soh/Enhancements/randomizer/tricks.cpp
new file mode 100644
index 000000000..8172f2a55
--- /dev/null
+++ b/soh/soh/Enhancements/randomizer/tricks.cpp
@@ -0,0 +1,58 @@
+#include "tricks.h"
+
+
+namespace Rando {
+    const std::string& Tricks::GetRTAreaName(const RandomizerArea area) {
+        return rtAreaNames.at(area);
+    }
+
+    bool Tricks::CheckRTTags(const std::unordered_map<Tag, bool> &showTag, const std::set<Tag> &rtTags) {
+        if (rtTags.empty()) {
+            return false;
+        }
+        for (auto rtTag : rtTags) {
+            if (!showTag.at(rtTag)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    std::string Tricks::GetRTTagName(const Tag tag) {
+        return rtTagNames.at(tag);
+    }
+
+    ImVec4 Tricks::GetRTTagColor(const Tag tag) {
+        switch(tag) {
+            case Tag::NOVICE:
+                return {0.09f,0.55f,0.37f,1.0f};
+            case Tag::INTERMEDIATE:
+                return {0.95f,0.52f,0.0f,1.0f};
+            case Tag::ADVANCED:
+                return {0.0f,0.29f,0.71f,1.0f};
+            case Tag::EXPERT:
+                return {0.53f,0.05f,0.14f,1.0f};
+            case Tag::EXTREME:
+                return {0.27f,0.0f,0.27f,1.0f};
+            default:
+                return {0.5f,0.5f,0.5f,1.0f};
+            /*case RTTAG_LENS:
+                return ImVec4(.f,.f,.f,1.0f);
+            case RTTAG_BKSKIP:
+                return ImVec4(.f,.f,.f,1.0f);
+            case RTTAG_EXPERIMENTAL:
+                return ImVec4(.f,.f,.f,1.0f);*/
+        }
+    }
+
+    void Tricks::DrawTagChips(const std::set<Tag> &rtTags) {
+        for (const auto rtTag : rtTags) {
+            ImGui::SameLine();
+            ImGui::BeginDisabled();
+            ImGui::PushStyleColor(ImGuiCol_Button, GetRTTagColor(rtTag));
+            ImGui::SmallButton(GetRTTagName(rtTag).c_str());
+            ImGui::PopStyleColor();
+            ImGui::EndDisabled();
+        }
+    }
+}
diff --git a/soh/soh/Enhancements/randomizer/tricks.h b/soh/soh/Enhancements/randomizer/tricks.h
new file mode 100644
index 000000000..c473d5e3b
--- /dev/null
+++ b/soh/soh/Enhancements/randomizer/tricks.h
@@ -0,0 +1,85 @@
+#ifndef TRICKS_H
+#define TRICKS_H
+
+#include <imgui.h>
+#include <set>
+
+#include "randomizerTypes.h"
+
+#include <unordered_map>
+#include <string>
+
+
+namespace Rando {
+    class Tricks {
+    public:
+        enum class Tag {
+            NOVICE,
+            INTERMEDIATE,
+            ADVANCED,
+            EXPERT,
+            EXTREME,
+            /*LENS,
+             *BKSKIP,
+             *EXPERIMENTAL*/
+        };
+
+        static const std::string& GetRTAreaName(RandomizerArea area);
+        static bool CheckRTTags(const std::unordered_map<Tag, bool> &showTag, const std::set<Tag> &rtTags);
+        static std::string GetRTTagName(Tag tag);
+        static ImVec4 GetRTTagColor(Tag tag);
+        static void DrawTagChips(const std::set<Tag> &rtTags);
+    private:
+        inline static const std::unordered_map<RandomizerArea, std::string> rtAreaNames = {
+            { RA_NONE, "General Tricks"},
+            //{ RTAREA_BK_SKIPS, "Boss Key Skips"},
+            { RA_KOKIRI_FOREST, "Kokiri Forest"},
+            { RA_THE_LOST_WOODS, "Lost Woods"},
+            { RA_SACRED_FOREST_MEADOW, "Sacred Forest Meadow"},
+            { RA_HYRULE_FIELD, "Hyrule Field"},
+            { RA_LAKE_HYLIA, "Lake Hylia"},
+            { RA_GERUDO_VALLEY, "Gerudo Valley"},
+            { RA_GERUDO_FORTRESS, "Gerudo Fortress"},
+            { RA_HAUNTED_WASTELAND, "Haunted Wasteland"},
+            { RA_DESERT_COLOSSUS, "Desert Colossus"},
+            { RA_THE_MARKET, "Hyrule Market"},
+            { RA_HYRULE_CASTLE, "Hyrule Castle"},
+            { RA_KAKARIKO_VILLAGE, "Kakariko Village"},
+            { RA_THE_GRAVEYARD, "Graveyard"},
+            { RA_DEATH_MOUNTAIN_TRAIL, "Death Mountain Trail"},
+            { RA_GORON_CITY, "Goron City"},
+            { RA_DEATH_MOUNTAIN_CRATER, "Death Mountain Crater"},
+            { RA_ZORAS_RIVER, "Zora's River"},
+            { RA_ZORAS_DOMAIN, "Zora's Domain"},
+            { RA_ZORAS_FOUNTAIN, "Zora's Fountain"},
+            { RA_LON_LON_RANCH, "Lon Lon Ranch"},
+            { RA_DEKU_TREE, "Deku Tree"},
+            { RA_DODONGOS_CAVERN, "Dodongo's Cavern"},
+            { RA_JABU_JABUS_BELLY, "Jabu Jabu's Belly"},
+            { RA_FOREST_TEMPLE, "Forest Temple"},
+            { RA_FIRE_TEMPLE, "Fire Temple"},
+            { RA_WATER_TEMPLE, "Water Temple"},
+            { RA_SPIRIT_TEMPLE, "Spirit Temple"},
+            { RA_SHADOW_TEMPLE, "Shadow Temple"},
+            { RA_BOTTOM_OF_THE_WELL, "Bottom of the Well"},
+            { RA_ICE_CAVERN, "Ice Cavern"},
+            { RA_GERUDO_TRAINING_GROUND, "Gerudo Training Grounds"},
+            { RA_GANONS_CASTLE, "Ganon's Castle"},
+            { RA_MAX, "Invalid"},
+        };
+
+        inline static const std::unordered_map<Tag, std::string> rtTagNames = {
+            {Tag::NOVICE, "Novice"},
+            {Tag::INTERMEDIATE, "Intermediate"},
+            {Tag::ADVANCED, "Advanced"},
+            {Tag::EXPERT, "Expert"},
+            {Tag::EXTREME, "Extreme"},
+            /*{Rando::Tag::LENS, "Lens"},
+            {Rando::Tag::BKSKIP, "Boss Key Skip"},
+            {Rando::Tag::EXPERIMENTAL, "Experimental"}*/
+        };
+    };
+}
+
+
+#endif //TRICKS_H

From 80e6e899a828aefcd166a2e09dc7bb3730dd81f3 Mon Sep 17 00:00:00 2001
From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Date: Sat, 6 Jan 2024 16:08:06 +0000
Subject: [PATCH 058/230] Fix other hints not getting reset (#3811)

---
 soh/soh/Enhancements/randomizer/context.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/soh/soh/Enhancements/randomizer/context.cpp b/soh/soh/Enhancements/randomizer/context.cpp
index 834692190..82a001024 100644
--- a/soh/soh/Enhancements/randomizer/context.cpp
+++ b/soh/soh/Enhancements/randomizer/context.cpp
@@ -249,7 +249,9 @@ void Context::LocationReset() {
         GetItemLocation(il)->RemoveFromPool();
     }
 
-    GetItemLocation(RC_GANONDORF_HINT)->RemoveFromPool();
+    for (const RandomizerCheck il : StaticData::otherHintLocations) {
+        GetItemLocation(il)->RemoveFromPool();
+    }
 }
 
 void Context::HintReset() {

From 1669393277387e924979c0bcd603bb4f14c238d6 Mon Sep 17 00:00:00 2001
From: Christopher Leggett <chris@leggett.dev>
Date: Sat, 6 Jan 2024 13:52:03 -0500
Subject: [PATCH 059/230] Fixes a regression in creating settings string.
 (#3813)

---
 soh/soh/Enhancements/randomizer/3drando/playthrough.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp b/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
index 25b1a9ed7..bc833af12 100644
--- a/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
@@ -37,7 +37,9 @@ int Playthrough_Init(uint32_t seed, std::set<RandomizerCheck> excludedLocations,
 
         for (Rando::Option* option : optionGroup.GetOptions()) {
             if (option->IsCategory(Rando::OptionCategory::Setting)) {
-                settingsStr += option->GetSelectedOptionText();
+                if (option->GetOptionCount() > 0) {
+                    settingsStr += option->GetSelectedOptionText();
+                }
             }
         }
     }

From 63413e8159aebcb7886dae21b9870307c202c2b5 Mon Sep 17 00:00:00 2001
From: Christopher Leggett <chris@leggett.dev>
Date: Mon, 8 Jan 2024 09:37:10 -0500
Subject: [PATCH 060/230] Explicitly clears the entire ItemLocations array.
 (#3820)

---
 soh/soh/Enhancements/randomizer/3drando/menu.cpp | 1 +
 soh/soh/Enhancements/randomizer/context.cpp      | 6 ++++++
 soh/soh/Enhancements/randomizer/context.h        | 1 +
 3 files changed, 8 insertions(+)

diff --git a/soh/soh/Enhancements/randomizer/3drando/menu.cpp b/soh/soh/Enhancements/randomizer/3drando/menu.cpp
index adc0a9040..752984032 100644
--- a/soh/soh/Enhancements/randomizer/3drando/menu.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/menu.cpp
@@ -46,6 +46,7 @@ bool GenerateRandomizer(std::set<RandomizerCheck> excludedLocations, std::set<Ra
     uint32_t seedHash = boost::hash_32<std::string>{}(ctx->GetSettings()->GetSeedString());
     ctx->GetSettings()->SetSeed(seedHash & 0xFFFFFFFF);
 
+    ctx->ClearItemLocations();
     int ret = Playthrough::Playthrough_Init(ctx->GetSettings()->GetSeed(), excludedLocations, enabledTricks);
     if (ret < 0) {
         if (ret == -1) { // Failed to generate after 5 tries
diff --git a/soh/soh/Enhancements/randomizer/context.cpp b/soh/soh/Enhancements/randomizer/context.cpp
index 82a001024..3c3e72f35 100644
--- a/soh/soh/Enhancements/randomizer/context.cpp
+++ b/soh/soh/Enhancements/randomizer/context.cpp
@@ -226,6 +226,12 @@ std::vector<RandomizerCheck> Context::GetLocations(const std::vector<RandomizerC
     return locationsInCategory;
 }
 
+void Context::ClearItemLocations() {
+    for (int i = 0; i < itemLocationTable.size(); i++) {
+        GetItemLocation(static_cast<RandomizerCheck>(i))->ResetVariables();
+    }
+}
+
 void Context::ItemReset() {
     for (const RandomizerCheck il : allLocations) {
         GetItemLocation(il)->ResetVariables();
diff --git a/soh/soh/Enhancements/randomizer/context.h b/soh/soh/Enhancements/randomizer/context.h
index ccea76d98..d477ef3eb 100644
--- a/soh/soh/Enhancements/randomizer/context.h
+++ b/soh/soh/Enhancements/randomizer/context.h
@@ -50,6 +50,7 @@ class Context {
                                               Category categoryInclude, Category categoryExclude = Category::cNull);
     void AddExcludedOptions();
     void LocationReset();
+    void ClearItemLocations();
     void ItemReset();
     void HintReset();
     void CreateItemOverrides();

From b96df0b64234894cd3db0d3d556a90ad304c1689 Mon Sep 17 00:00:00 2001
From: Christopher Leggett <chris@leggett.dev>
Date: Mon, 8 Jan 2024 09:37:24 -0500
Subject: [PATCH 061/230] Fixes parsing of spoiler files in plando mode.
 (#3823)

It was specifically failing on Hints because of changes to the spoiler output that were not reflected in the parsing code.
---
 soh/soh/Enhancements/randomizer/context.cpp | 78 +++++++++++++--------
 soh/soh/SaveManager.cpp                     |  2 +-
 soh/src/code/z_sram.c                       |  2 +-
 3 files changed, 51 insertions(+), 31 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/context.cpp b/soh/soh/Enhancements/randomizer/context.cpp
index 3c3e72f35..515d5f029 100644
--- a/soh/soh/Enhancements/randomizer/context.cpp
+++ b/soh/soh/Enhancements/randomizer/context.cpp
@@ -530,44 +530,64 @@ void Context::ParseHintJson(nlohmann::json spoilerFileJson) {
     // Ganondorf and Sheik Light Arrow Hints
     std::string ganonHintText = FormatJsonHintText(spoilerFileJson["ganonHintText"].get<std::string>());
     RandomizerCheck lightArrowLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["lightArrowHintLoc"].get<std::string>()];
-    std::string lightArrowRegion = spoilerFileJson["lightArrowHintRegion"].get<std::string>();
+    std::string lightArrowRegion = spoilerFileJson["lightArrowArea"].get<std::string>();
     AddHint(RH_GANONDORF_HINT, Text(ganonHintText), lightArrowLoc, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[lightArrowRegion]);
-    std::string sheikText = FormatJsonHintText(spoilerFileJson["sheikText"].get<std::string>());
-    AddHint(RH_SHEIK_LIGHT_ARROWS, Text(sheikText), lightArrowLoc, HINT_TYPE_STATIC, lightArrowRegion);
+    if (spoilerFileJson.contains("sheikText")) {
+        std::string sheikText = FormatJsonHintText(spoilerFileJson["sheikText"].get<std::string>());
+        AddHint(RH_SHEIK_LIGHT_ARROWS, Text(sheikText), lightArrowLoc, HINT_TYPE_STATIC, lightArrowRegion);
+    }
     std::string ganonText = FormatJsonHintText(spoilerFileJson["ganonText"].get<std::string>());
     AddHint(RH_GANONDORF_NOHINT, Text(ganonText), RC_UNKNOWN_CHECK, HINT_TYPE_JUNK, "Static", RA_GANONS_CASTLE);
     
     // Dampe Hookshot Hint
-    std::string dampeText = FormatJsonHintText(spoilerFileJson["dampeText"].get<std::string>());
-    std::string dampeRegion = spoilerFileJson["dampeRegion"].get<std::string>();
-    RandomizerCheck dampeHintLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["dampeHintLoc"].get<std::string>()];
-    AddHint(RH_DAMPES_DIARY, Text(dampeText), dampeHintLoc, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[dampeRegion]);
+    if (spoilerFileJson.contains("dampeText")) {
+        std::string dampeText = FormatJsonHintText(spoilerFileJson["dampeText"].get<std::string>());
+        std::string dampeRegion = spoilerFileJson["dampeRegion"].get<std::string>();
+        RandomizerCheck dampeHintLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["dampeHintLoc"].get<std::string>()];
+        AddHint(RH_DAMPES_DIARY, Text(dampeText), dampeHintLoc, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[dampeRegion]);
+    }
     
     // Greg Hint
-    std::string gregText = FormatJsonHintText(spoilerFileJson["gregText"].get<std::string>());
-    std::string gregRegion = spoilerFileJson["gregRegion"].get<std::string>();
-    RandomizerCheck gregLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["gregLoc"].get<std::string>()];
-    AddHint(RH_GREG_RUPEE, Text(gregText), gregLoc, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[gregRegion]);
+    if (spoilerFileJson.contains("gregText")) {
+        std::string gregText = FormatJsonHintText(spoilerFileJson["gregText"].get<std::string>());
+        std::string gregRegion = spoilerFileJson["gregRegion"].get<std::string>();
+        RandomizerCheck gregLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["gregLoc"].get<std::string>()];
+        AddHint(RH_GREG_RUPEE, Text(gregText), gregLoc, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[gregRegion]);
+    }
     
     // Saria Magic Hint
-    std::string sariaText = FormatJsonHintText(spoilerFileJson["sariaText"].get<std::string>());
-    std::string sariaRegion = spoilerFileJson["sariaRegion"].get<std::string>();
-    RandomizerCheck sariaHintLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["sariaHintLoc"].get<std::string>()];
-    AddHint(RH_SARIA, Text(sariaText), sariaHintLoc, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[sariaRegion]);
+    if (spoilerFileJson.contains("sariaText")) {
+        std::string sariaText = FormatJsonHintText(spoilerFileJson["sariaText"].get<std::string>());
+        std::string sariaRegion = spoilerFileJson["sariaRegion"].get<std::string>();
+        RandomizerCheck sariaHintLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["sariaHintLoc"].get<std::string>()];
+        AddHint(RH_SARIA, Text(sariaText), sariaHintLoc, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[sariaRegion]);
+    }
     
     // Warp Songs
-    std::string warpMinuetText = FormatJsonHintText(spoilerFileJson["warpMinuetText"].get<std::string>()); //RANDOTODO fall back for if location is used
-    AddHint(RH_MINUET_WARP_LOC, Text(warpMinuetText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[warpMinuetText]);
-    std::string warpBoleroText = FormatJsonHintText(spoilerFileJson["warpBoleroText"].get<std::string>());
-    AddHint(RH_BOLERO_WARP_LOC, Text(warpBoleroText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[warpBoleroText]);
-    std::string warpSerenadeText = FormatJsonHintText(spoilerFileJson["warpSerenadeText"].get<std::string>());
-    AddHint(RH_SERENADE_WARP_LOC, Text(warpSerenadeText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[warpSerenadeText]);
-    std::string warpRequiemText = FormatJsonHintText(spoilerFileJson["warpRequiemText"].get<std::string>());
-    AddHint(RH_REQUIEM_WARP_LOC, Text(warpRequiemText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[warpRequiemText]);
-    std::string warpNocturneText = FormatJsonHintText(spoilerFileJson["warpNocturneText"].get<std::string>());
-    AddHint(RH_NOCTURNE_WARP_LOC, Text(warpNocturneText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[warpNocturneText]);
-    std::string warpPreludeText = FormatJsonHintText(spoilerFileJson["warpPreludeText"].get<std::string>());
-    AddHint(RH_PRELUDE_WARP_LOC, Text(warpPreludeText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[warpPreludeText]);
+    if (spoilerFileJson.contains("warpMinuetText")) {
+        std::string warpMinuetText = FormatJsonHintText(spoilerFileJson["warpMinuetText"].get<std::string>()); //RANDOTODO fall back for if location is used
+        AddHint(RH_MINUET_WARP_LOC, Text(warpMinuetText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[warpMinuetText]);
+    }
+    if (spoilerFileJson.contains("warpBoleroText")) {
+        std::string warpBoleroText = FormatJsonHintText(spoilerFileJson["warpBoleroText"].get<std::string>());
+        AddHint(RH_BOLERO_WARP_LOC, Text(warpBoleroText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[warpBoleroText]);
+    }
+    if (spoilerFileJson.contains("warpSerenadeText")) {
+        std::string warpSerenadeText = FormatJsonHintText(spoilerFileJson["warpSerenadeText"].get<std::string>());
+        AddHint(RH_SERENADE_WARP_LOC, Text(warpSerenadeText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[warpSerenadeText]);
+    }
+    if (spoilerFileJson.contains("warpRequiemText")) {
+        std::string warpRequiemText = FormatJsonHintText(spoilerFileJson["warpRequiemText"].get<std::string>());
+        AddHint(RH_REQUIEM_WARP_LOC, Text(warpRequiemText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[warpRequiemText]);
+    }
+    if (spoilerFileJson.contains("warpNocturneText")) {
+        std::string warpNocturneText = FormatJsonHintText(spoilerFileJson["warpNocturneText"].get<std::string>());
+        AddHint(RH_NOCTURNE_WARP_LOC, Text(warpNocturneText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[warpNocturneText]);
+    }
+    if (spoilerFileJson.contains("warpPreludeText")) {
+        std::string warpPreludeText = FormatJsonHintText(spoilerFileJson["warpPreludeText"].get<std::string>());
+        AddHint(RH_PRELUDE_WARP_LOC, Text(warpPreludeText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[warpPreludeText]);
+    }
     
     // Gossip Stones
     nlohmann::json hintsJson = spoilerFileJson["hints"];
@@ -576,8 +596,8 @@ void Context::ParseHintJson(nlohmann::json spoilerFileJson) {
         nlohmann::json hintInfo = it.value();
         std::string hintText = FormatJsonHintText(hintInfo["hint"].get<std::string>());
         HintType hintType = mSpoilerfileHintTypeNameToEnum[hintInfo["type"].get<std::string>()];
-        RandomizerCheck hintedLocation = mSpoilerfileCheckNameToEnum[hintInfo["location"]];
-        std::string hintedArea = hintInfo["area"].get<std::string>();
+        RandomizerCheck hintedLocation = hintInfo.contains("location") ? mSpoilerfileCheckNameToEnum[hintInfo["location"]] : RC_UNKNOWN_CHECK;
+        std::string hintedArea = hintInfo.contains("area") ? hintInfo["area"].get<std::string>() : "";
         AddHint(static_cast<RandomizerHintKey>(gossipStoneLoc - RC_COLOSSUS_GOSSIP_STONE + 1), Text(hintText), hintedLocation, hintType, hintedArea);
     }
 }
diff --git a/soh/soh/SaveManager.cpp b/soh/soh/SaveManager.cpp
index 79e9a043c..328d24be7 100644
--- a/soh/soh/SaveManager.cpp
+++ b/soh/soh/SaveManager.cpp
@@ -2723,7 +2723,7 @@ extern "C" void Save_SaveGlobal(void) {
 extern "C" void Save_LoadFile(void) {
     if (gSaveContext.questId == QUEST_RANDOMIZER) {
         // Reset rando context for rando saves.
-        OTRGlobals::Instance->gRandoContext.reset();
+          OTRGlobals::Instance->gRandoContext.reset();
         OTRGlobals::Instance->gRandoContext = Rando::Context::CreateInstance();
         OTRGlobals::Instance->gRandoContext->AddExcludedOptions();
         OTRGlobals::Instance->gRandoContext->GetSettings()->CreateOptions();
diff --git a/soh/src/code/z_sram.c b/soh/src/code/z_sram.c
index 9a132fa7e..002e95987 100644
--- a/soh/src/code/z_sram.c
+++ b/soh/src/code/z_sram.c
@@ -241,7 +241,7 @@ void Sram_InitSave(FileChooseContext* fileChooseCtx) {
 
     u8 currentQuest = fileChooseCtx->questType[fileChooseCtx->buttonIndex];
 
-    if (Randomizer_IsSeedGenerated()) {
+    if (Randomizer_IsSeedGenerated() || Randomizer_IsPlandoLoaded()) {
         gSaveContext.questId = QUEST_RANDOMIZER;
 
         Randomizer_InitSaveFile();

From 467ee7ad124f5e32fa573e1f0b92dc24918a9598 Mon Sep 17 00:00:00 2001
From: Malkierian <malkierian@gmail.com>
Date: Mon, 8 Jan 2024 07:39:15 -0700
Subject: [PATCH 062/230] Logic class (#3812)

* Convert `Rando::Logic` to a class.

* Readd `LogicReset` as `Logic::Reset` for resetting logic mid-generation-cycle to allow seed generation to actually work.

* Change `IsChild` and `IsAdult` to `CanBe` variants.

* Make it buildable.

* First LogicVar class.

* Revert CanBe changes to Is (adult & child) as I'm no longer sure that it's a good one.

* Update soh/soh/OTRGlobals.cpp

Use existing gRandoContext reference.

Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>

* Conflict resolution cleanup (plus removing SaveContext references).

---------

Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>
---
 .../Enhancements/randomizer/3drando/fill.cpp  |   30 +-
 .../Enhancements/randomizer/3drando/hints.cpp |    8 +-
 .../randomizer/3drando/location_access.cpp    |   85 +-
 .../randomizer/3drando/location_access.hpp    |   31 +-
 .../locacc_bottom_of_the_well.cpp             |   66 +-
 .../location_access/locacc_castle_town.cpp    |  120 +-
 .../location_access/locacc_death_mountain.cpp |  167 ++-
 .../location_access/locacc_deku_tree.cpp      |  140 +-
 .../locacc_dodongos_cavern.cpp                |  136 +-
 .../location_access/locacc_fire_temple.cpp    |  198 ++-
 .../location_access/locacc_forest_temple.cpp  |  212 ++-
 .../location_access/locacc_ganons_castle.cpp  |  162 ++-
 .../locacc_gerudo_training_grounds.cpp        |  106 +-
 .../location_access/locacc_gerudo_valley.cpp  |  118 +-
 .../location_access/locacc_hyrule_field.cpp   |  122 +-
 .../location_access/locacc_ice_cavern.cpp     |   52 +-
 .../locacc_jabujabus_belly.cpp                |   82 +-
 .../location_access/locacc_kakariko.cpp       |  150 ++-
 .../location_access/locacc_lost_woods.cpp     |  114 +-
 .../location_access/locacc_shadow_temple.cpp  |  136 +-
 .../location_access/locacc_spirit_temple.cpp  |  210 ++-
 .../location_access/locacc_water_temple.cpp   |  182 ++-
 .../location_access/locacc_zoras_domain.cpp   |  112 +-
 .../Enhancements/randomizer/3drando/logic.cpp | 1164 -----------------
 .../Enhancements/randomizer/3drando/logic.hpp |  394 ------
 .../randomizer/3drando/playthrough.cpp        |    4 +-
 .../randomizer/3drando/starting_inventory.cpp |    1 +
 soh/soh/Enhancements/randomizer/context.cpp   |   26 +-
 soh/soh/Enhancements/randomizer/context.h     |    6 +
 soh/soh/Enhancements/randomizer/entrance.cpp  |   32 +-
 soh/soh/Enhancements/randomizer/item.cpp      |    7 +-
 soh/soh/Enhancements/randomizer/item_list.cpp |  472 +++----
 .../Enhancements/randomizer/item_location.cpp |    3 +
 soh/soh/Enhancements/randomizer/logic.cpp     |  825 ++++++++++++
 soh/soh/Enhancements/randomizer/logic.h       |  425 ++++++
 soh/soh/OTRGlobals.cpp                        |    1 +
 36 files changed, 2884 insertions(+), 3215 deletions(-)
 delete mode 100644 soh/soh/Enhancements/randomizer/3drando/logic.cpp
 delete mode 100644 soh/soh/Enhancements/randomizer/3drando/logic.hpp
 create mode 100644 soh/soh/Enhancements/randomizer/logic.cpp
 create mode 100644 soh/soh/Enhancements/randomizer/logic.h

diff --git a/soh/soh/Enhancements/randomizer/3drando/fill.cpp b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
index 0c5f2a5ea..8536c1d17 100644
--- a/soh/soh/Enhancements/randomizer/3drando/fill.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
@@ -5,7 +5,6 @@
 #include "../context.h"
 #include "item_pool.hpp"
 #include "location_access.hpp"
-#include "logic.hpp"
 #include "random.hpp"
 #include "spoiler_log.hpp"
 #include "starting_inventory.hpp"
@@ -22,7 +21,6 @@
 #include <spdlog/spdlog.h>
 
 using namespace CustomMessages;
-using namespace Logic;
 using namespace Rando;
 
 static bool placementFailure = false;
@@ -59,19 +57,19 @@ static bool UpdateToDAccess(Entrance* entrance, SearchMode mode) {
   Area* parent = entrance->GetParentRegion();
   Area* connection = entrance->GetConnectedRegion();
 
-  if (!connection->childDay && parent->childDay && entrance->CheckConditionAtAgeTime(Logic::IsChild, AtDay)) {
+  if (!connection->childDay && parent->childDay && entrance->CheckConditionAtAgeTime(logic->IsChild, logic->AtDay)) {
     connection->childDay = true;
     ageTimePropogated = true;
   }
-  if (!connection->childNight && parent->childNight && entrance->CheckConditionAtAgeTime(Logic::IsChild, AtNight)) {
+  if (!connection->childNight && parent->childNight && entrance->CheckConditionAtAgeTime(logic->IsChild, logic->AtNight)) {
     connection->childNight = true;
     ageTimePropogated = true;
   }
-  if (!connection->adultDay && parent->adultDay && entrance->CheckConditionAtAgeTime(IsAdult, AtDay)) {
+  if (!connection->adultDay && parent->adultDay && entrance->CheckConditionAtAgeTime(logic->IsAdult, logic->AtDay)) {
     connection->adultDay = true;
     ageTimePropogated = true;
   }
-  if (!connection->adultNight && parent->adultNight && entrance->CheckConditionAtAgeTime(IsAdult, AtNight)) {
+  if (!connection->adultNight && parent->adultNight && entrance->CheckConditionAtAgeTime(logic->IsAdult, logic->AtNight)) {
     connection->adultNight = true;
     ageTimePropogated = true;
   }
@@ -109,7 +107,7 @@ static void ValidateWorldChecks(SearchMode& mode, bool checkPoeCollectorAccess,
         !checkOtherEntranceAccess) {
        mode = SearchMode::PoeCollectorAccess;
        ApplyStartingInventory();
-       Logic::NoBottles = true;
+       logic->NoBottles = true;
     }
   }
   // Condition for validating Poe Collector Access
@@ -118,7 +116,7 @@ static void ValidateWorldChecks(SearchMode& mode, bool checkPoeCollectorAccess,
       std::vector<RandomizerGet> itemsToPlace =
           FilterFromPool(ItemPool, [](const auto i) { return Rando::StaticData::RetrieveItem(i).IsAdvancement(); });
     for (RandomizerGet unplacedItem : itemsToPlace) {
-      Rando::StaticData::RetrieveItem(unplacedItem).ApplyEffect();
+       Rando::StaticData::RetrieveItem(unplacedItem).ApplyEffect();
     }
     // Reset access as the non-starting age
     if (ctx->GetSettings()->ResolvedStartingAge() == RO_AGE_CHILD) {
@@ -134,7 +132,7 @@ static void ValidateWorldChecks(SearchMode& mode, bool checkPoeCollectorAccess,
     }
     mode = SearchMode::AllLocationsReachable;
   } else {
-    Logic::NoBottles = false;
+    logic->NoBottles = false;
   }
 }
 
@@ -213,7 +211,7 @@ bool IsBeatableWithout(RandomizerCheck excludedCheck, bool replaceItem, Randomiz
   RandomizerGet copy = ctx->GetItemLocation(excludedCheck)->GetPlacedRandomizerGet(); //Copy out item
   ctx->GetItemLocation(excludedCheck)->SetPlacedItem(RG_NONE); //Write in empty item
   ctx->playthroughBeatable = false;
-  LogicReset();
+  logic->Reset();
   GetAccessibleLocations(ctx->allLocations, SearchMode::CheckBeatable, ignore); //Check if game is still beatable
   if (replaceItem){
     ctx->GetItemLocation(excludedCheck)->SetPlacedItem(copy); //Immediately put item back
@@ -479,7 +477,7 @@ std::vector<RandomizerCheck> GetAccessibleLocations(const std::vector<Randomizer
 static void GeneratePlaythrough() {
     auto ctx = Rando::Context::GetInstance();
     ctx->playthroughBeatable = false;
-    LogicReset();
+    logic->Reset();
     GetAccessibleLocations(ctx->allLocations, SearchMode::GeneratePlaythrough);
 }
 
@@ -528,7 +526,7 @@ static void PareDownPlaythrough() {
     std::vector<RandomizerCheck> sphere = ctx->playthroughLocations.at(i);
     for (int j = sphere.size() - 1; j >= 0; j--) {
       RandomizerCheck loc = sphere.at(j);
-      RandomizerGet locGet = ctx->GetItemLocation(loc)->GetPlacedRandomizerGet();
+      RandomizerGet locGet = ctx->GetItemLocation(loc)->GetPlacedRandomizerGet(); //Copy out item
 
       RandomizerGet ignore = RG_NONE;
       if (locGet == RG_GOLD_SKULLTULA_TOKEN || IsBombchus(locGet, true)
@@ -578,7 +576,7 @@ static void CalculateWotH() {
     }
   }
   ctx->playthroughBeatable = true;
-  LogicReset();
+  logic->Reset();
   GetAccessibleLocations(ctx->allLocations);
 }
 
@@ -681,7 +679,7 @@ static void AssumedFill(const std::vector<RandomizerGet>& items, const std::vect
             itemsToPlace.pop_back();
 
             // assume we have all unplaced items
-            LogicReset();
+            logic->Reset();
             for (RandomizerGet unplacedItem : itemsToPlace) {
                 Rando::StaticData::RetrieveItem(unplacedItem).ApplyEffect();
             }
@@ -731,7 +729,7 @@ static void AssumedFill(const std::vector<RandomizerGet>& items, const std::vect
             // If the game is beatable, then we can stop placing items with logic.
             if (!ctx->GetOption(RSK_ALL_LOCATIONS_REACHABLE)) {
                 ctx->playthroughBeatable = false;
-                LogicReset();
+                logic->Reset();
                 GetAccessibleLocations(ctx->allLocations, SearchMode::CheckBeatable);
                 if (ctx->playthroughBeatable) {
                     SPDLOG_DEBUG("Game beatable, now placing items randomly. " + std::to_string(itemsToPlace.size()) +
@@ -1161,7 +1159,7 @@ int Fill() {
     if(retries < 4) {
       SPDLOG_DEBUG("\nGOT STUCK. RETRYING...\n");
       Areas::ResetAllLocations();
-      LogicReset();
+      logic->Reset();
       ClearProgress();
     }
     retries++;
diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.cpp b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
index 0ceb3fecc..3eab983c9 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hints.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
@@ -2,7 +2,6 @@
 
 #include "custom_messages.hpp"
 #include "item_pool.hpp"
-#include "logic.hpp"
 #include "random.hpp"
 #include "spoiler_log.hpp"
 #include "fill.hpp"
@@ -16,7 +15,6 @@
 #include "pool_functions.hpp"
 
 using namespace CustomMessages;
-using namespace Logic;
 using namespace Rando;
 
 const Text& HintText::GetText() const {
@@ -315,7 +313,7 @@ static std::vector<RandomizerCheck> GetAccessibleGossipStones(const RandomizerCh
   RandomizerGet originalItem = ctx->GetItemLocation(hintedLocation)->GetPlacedRandomizerGet();
   ctx->GetItemLocation(hintedLocation)->SetPlacedItem(RG_NONE);
 
-  LogicReset();
+  ctx->GetLogic()->Reset();
   auto accessibleGossipStones = GetAccessibleLocations(Rando::StaticData::gossipStoneLocations);
   //Give the item back to the location
   ctx->GetItemLocation(hintedLocation)->SetPlacedItem(originalItem);
@@ -329,12 +327,12 @@ bool IsReachableWithout(std::vector<RandomizerCheck> locsToCheck, RandomizerChec
   auto ctx = Rando::Context::GetInstance();
   RandomizerGet originalItem = ctx->GetItemLocation(excludedCheck)->GetPlacedRandomizerGet();
   ctx->GetItemLocation(excludedCheck)->SetPlacedItem(RG_NONE);
-  LogicReset();
+  ctx->GetLogic()->Reset();
   const auto rechableWithout = GetAccessibleLocations(locsToCheck);
   ctx->GetItemLocation(excludedCheck)->SetPlacedItem(originalItem);
   if (resetAfter){
     //if resetAfter is on, reset logic we are done
-    LogicReset();
+    ctx->GetLogic()->Reset();
   }
   if (rechableWithout.empty()) {
     return false;
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
index ea1508c29..f2749bca4 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
@@ -4,36 +4,27 @@
 #include "../static_data.h"
 #include "../context.h"
 #include "item_pool.hpp"
-#include "logic.hpp"
 #include "spoiler_log.hpp"
 #include "../trial.h"
 #include "../entrance.h"
 
 #include <fstream>
-#include <iostream>
-
-using namespace Logic;
 
 //generic grotto event list
-std::vector<EventAccess> grottoEvents = {
-  EventAccess(&GossipStoneFairy, {[]{return GossipStoneFairy || CanSummonGossipFairy;}}),
-  EventAccess(&ButterflyFairy,   {[]{return ButterflyFairy   || (CanUse(RG_STICKS));}}),
-  EventAccess(&BugShrub,         {[]{return CanCutShrubs;}}),
-  EventAccess(&LoneFish,         {[]{return true;}}),
-};
+std::vector<EventAccess> grottoEvents;
 
 //set the logic to be a specific age and time of day and see if the condition still holds
 bool LocationAccess::CheckConditionAtAgeTime(bool& age, bool& time) const {
 
-  IsChild = false;
-  IsAdult = false;
-  AtDay   = false;
-  AtNight = false;
+  logic->IsChild = false;
+  logic->IsAdult = false;
+  logic->AtDay   = false;
+  logic->AtNight = false;
 
   time = true;
   age = true;
 
-  UpdateHelpers();
+  logic->UpdateHelpers();
   return GetConditionsMet();
 }
 
@@ -42,10 +33,10 @@ bool LocationAccess::ConditionsMet() const {
   Area* parentRegion = AreaTable(Rando::Context::GetInstance()->GetItemLocation(location)->GetParentRegionKey());
   bool conditionsMet = false;
 
-  if ((parentRegion->childDay   && CheckConditionAtAgeTime(IsChild, AtDay))   ||
-      (parentRegion->childNight && CheckConditionAtAgeTime(IsChild, AtNight)) ||
-      (parentRegion->adultDay   && CheckConditionAtAgeTime(IsAdult, AtDay))   ||
-      (parentRegion->adultNight && CheckConditionAtAgeTime(IsAdult, AtNight))) {
+  if ((parentRegion->childDay   && CheckConditionAtAgeTime(logic->IsChild, logic->AtDay))   ||
+      (parentRegion->childNight && CheckConditionAtAgeTime(logic->IsChild, logic->AtNight)) ||
+      (parentRegion->adultDay   && CheckConditionAtAgeTime(logic->IsAdult, logic->AtDay))   ||
+      (parentRegion->adultNight && CheckConditionAtAgeTime(logic->IsAdult, logic->AtNight))) {
         conditionsMet = true;
   }
 
@@ -62,11 +53,11 @@ bool LocationAccess::CanBuy() const {
   //Check if wallet is large enough to buy item
   bool SufficientWallet = true;
   if (ctx->GetItemLocation(location)->GetPrice() > 500) {
-    SufficientWallet = ProgressiveWallet >= 3;
+    SufficientWallet = logic->ProgressiveWallet >= 3;
   } else if (ctx->GetItemLocation(location)->GetPrice() > 200) {
-    SufficientWallet = ProgressiveWallet >= 2;
+    SufficientWallet = logic->ProgressiveWallet >= 2;
   } else if (ctx->GetItemLocation(location)->GetPrice() > 99) {
-    SufficientWallet = ProgressiveWallet >= 1;
+    SufficientWallet = logic->ProgressiveWallet >= 1;
   }
 
   bool OtherCondition = true;
@@ -74,12 +65,12 @@ bool LocationAccess::CanBuy() const {
   //Need bottle to buy bottle items, only logically relevant bottle items included here
   if (placed == RG_BUY_BLUE_FIRE || placed == RG_BUY_BOTTLE_BUG || placed == RG_BUY_FISH ||
       placed == RG_BUY_FAIRYS_SPIRIT) {
-      OtherCondition = HasBottle;
+      OtherCondition = logic->HasBottle;
   }
   // If bombchus in logic, need to have found chus to buy; if not just need bomb bag
   else if (placed == RG_BUY_BOMBCHU_10 || placed == RG_BUY_BOMBCHU_20) {
       OtherCondition =
-          (!ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && Bombs) || (ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && FoundBombchus);
+          (!ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->Bombs) || (ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->FoundBombchus);
   }
 
   return SufficientWallet && OtherCondition;
@@ -126,10 +117,10 @@ bool Area::UpdateEvents(SearchMode mode) {
       continue;
     }
 
-    if ((childDay   && event.CheckConditionAtAgeTime(IsChild, AtDay))    ||
-        (childNight && event.CheckConditionAtAgeTime(IsChild, AtNight))  ||
-        (adultDay   && event.CheckConditionAtAgeTime(IsAdult, AtDay))    ||
-        (adultNight && event.CheckConditionAtAgeTime(IsAdult, AtNight))) {
+    if ((childDay   && event.CheckConditionAtAgeTime(logic->IsChild, logic->AtDay))    ||
+        (childNight && event.CheckConditionAtAgeTime(logic->IsChild, logic->AtNight))  ||
+        (adultDay   && event.CheckConditionAtAgeTime(logic->IsAdult, logic->AtDay))    ||
+        (adultNight && event.CheckConditionAtAgeTime(logic->IsAdult, logic->AtNight))) {
           event.EventOccurred();
           eventsUpdated = true;
     }
@@ -169,7 +160,7 @@ Rando::Entrance* Area::GetExit(RandomizerRegion exitToReturn) {
 }
 
 bool Area::CanPlantBeanCheck() const {
-  return (Logic::MagicBean || Logic::MagicBeanPack) && BothAgesCheck();
+  return (logic->MagicBean || logic->MagicBeanPack) && BothAgesCheck();
 }
 
 bool Area::AllAccountedFor() const {
@@ -201,10 +192,10 @@ bool Area::CheckAllAccess(const RandomizerRegion exitKey) {
 
   for (Rando::Entrance& exit : exits) {
     if (exit.GetConnectedRegionKey() == exitKey) {
-      return exit.CheckConditionAtAgeTime(Logic::IsChild, Logic::AtDay)   &&
-             exit.CheckConditionAtAgeTime(Logic::IsChild, Logic::AtNight) &&
-             exit.CheckConditionAtAgeTime(Logic::IsAdult, Logic::AtDay)   &&
-             exit.CheckConditionAtAgeTime(Logic::IsAdult, Logic::AtNight);
+      return exit.CheckConditionAtAgeTime(logic->IsChild, logic->AtDay)   &&
+             exit.CheckConditionAtAgeTime(logic->IsChild, logic->AtNight) &&
+             exit.CheckConditionAtAgeTime(logic->IsAdult, logic->AtDay)   &&
+             exit.CheckConditionAtAgeTime(logic->IsAdult, logic->AtNight);
     }
   }
   return false;
@@ -248,10 +239,18 @@ bool HasAccessTo(const RandomizerRegion area) {
 }
 
 std::shared_ptr<Rando::Context> randoCtx;
+std::shared_ptr<Rando::Logic> logic;
 
 void AreaTable_Init() {
   using namespace Rando;
   randoCtx = Context::GetInstance();
+  logic = randoCtx->GetLogic();
+  grottoEvents = {
+      EventAccess(&logic->GossipStoneFairy, { [] { return logic->GossipStoneFairy || logic->CanSummonGossipFairy; } }),
+      EventAccess(&logic->ButterflyFairy, { [] { return logic->ButterflyFairy || (logic->CanUse(RG_STICKS)); } }),
+      EventAccess(&logic->BugShrub, { [] { return logic->CanCutShrubs; } }),
+      EventAccess(&logic->LoneFish, { [] { return true; } }),
+  };
   //Clear the array from any previous playthrough attempts. This is important so that
   //locations which appear in both MQ and Vanilla dungeons don't get set in both areas.
   areaTable.fill(Area("Invalid Area", "Invalid Area", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {}));
@@ -260,8 +259,8 @@ void AreaTable_Init() {
   areaTable[RR_ROOT] = Area("Root", "", RA_LINKS_POCKET, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_LINKS_POCKET,       {[]{return true;}}),
-                  LocationAccess(RC_TRIFORCE_COMPLETED, {[]{return CanCompleteTriforce;}}),
-                  LocationAccess(RC_SARIA_SONG_HINT,    {[]{return CanUse(RG_SARIAS_SONG);}}),
+                  LocationAccess(RC_TRIFORCE_COMPLETED, {[]{return logic->CanCompleteTriforce;}}),
+                  LocationAccess(RC_SARIA_SONG_HINT,    {[]{return logic->CanUse(RG_SARIAS_SONG);}}),
                 }, {
                   //Exits
                   Entrance(RR_ROOT_EXITS, {[]{return true;}})
@@ -269,14 +268,14 @@ void AreaTable_Init() {
 
   areaTable[RR_ROOT_EXITS] = Area("Root Exits", "", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_CHILD_SPAWN,             {[]{return IsChild;}}),
-                  Entrance(RR_ADULT_SPAWN,             {[]{return IsAdult;}}),
-                  Entrance(RR_MINUET_OF_FOREST_WARP,   {[]{return CanUse(RG_MINUET_OF_FOREST);}}),
-                  Entrance(RR_BOLERO_OF_FIRE_WARP,     {[]{return CanUse(RG_BOLERO_OF_FIRE)     && CanLeaveForest;}}),
-                  Entrance(RR_SERENADE_OF_WATER_WARP,  {[]{return CanUse(RG_SERENADE_OF_WATER)  && CanLeaveForest;}}),
-                  Entrance(RR_NOCTURNE_OF_SHADOW_WARP, {[]{return CanUse(RG_NOCTURNE_OF_SHADOW) && CanLeaveForest;}}),
-                  Entrance(RR_REQUIEM_OF_SPIRIT_WARP,  {[]{return CanUse(RG_REQUIEM_OF_SPIRIT)  && CanLeaveForest;}}),
-                  Entrance(RR_PRELUDE_OF_LIGHT_WARP,   {[]{return CanUse(RG_PRELUDE_OF_LIGHT)   && CanLeaveForest;}}),
+                  Entrance(RR_CHILD_SPAWN,             {[]{return logic->IsChild;}}),
+                  Entrance(RR_ADULT_SPAWN,             {[]{return logic->IsAdult;}}),
+                  Entrance(RR_MINUET_OF_FOREST_WARP,   {[]{return logic->CanUse(RG_MINUET_OF_FOREST);}}),
+                  Entrance(RR_BOLERO_OF_FIRE_WARP,     {[]{return logic->CanUse(RG_BOLERO_OF_FIRE)     && logic->CanLeaveForest;}}),
+                  Entrance(RR_SERENADE_OF_WATER_WARP,  {[]{return logic->CanUse(RG_SERENADE_OF_WATER)  && logic->CanLeaveForest;}}),
+                  Entrance(RR_NOCTURNE_OF_SHADOW_WARP, {[]{return logic->CanUse(RG_NOCTURNE_OF_SHADOW) && logic->CanLeaveForest;}}),
+                  Entrance(RR_REQUIEM_OF_SPIRIT_WARP,  {[]{return logic->CanUse(RG_REQUIEM_OF_SPIRIT)  && logic->CanLeaveForest;}}),
+                  Entrance(RR_PRELUDE_OF_LIGHT_WARP,   {[]{return logic->CanUse(RG_PRELUDE_OF_LIGHT)   && logic->CanLeaveForest;}}),
   });
 
   areaTable[RR_CHILD_SPAWN] = Area("Child Spawn", "", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access.hpp b/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
index f5a3af7e5..8d36e7eaf 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
@@ -4,16 +4,17 @@
 #include <vector>
 #include <list>
 
-#include "logic.hpp"
 #include "hint_list.hpp"
 #include "fill.hpp"
 #include "../randomizerTypes.h"
 #include "../context.h"
+#include "../logic.h"
 
 typedef bool (*ConditionFn)();
 
 // I hate this but every alternative I can think of right now is worse
 extern std::shared_ptr<Rando::Context> randoCtx;
+extern std::shared_ptr<Rando::Logic> logic;
 
 class EventAccess {
 public:
@@ -45,15 +46,15 @@ public:
 
     bool CheckConditionAtAgeTime(bool& age, bool& time) {
 
-      Logic::IsChild = false;
-      Logic::IsAdult = false;
-      Logic::AtDay   = false;
-      Logic::AtNight = false;
+      logic->IsChild = false;
+      logic->IsAdult = false;
+      logic->AtDay   = false;
+      logic->AtNight = false;
 
       time = true;
       age = true;
 
-      Logic::UpdateHelpers();
+      logic->UpdateHelpers();
       return ConditionsMet();
     }
 
@@ -193,21 +194,21 @@ public:
     bool HereCheck(ConditionFn condition) {
 
       //store current age variables
-      bool pastAdult = Logic::IsAdult;
-      bool pastChild = Logic::IsChild;
+      bool pastAdult = logic->IsAdult;
+      bool pastChild = logic->IsChild;
 
       //set age access as this areas ages
-      Logic::IsChild = Child();
-      Logic::IsAdult = Adult();
+      logic->IsChild = Child();
+      logic->IsAdult = Adult();
 
       //update helpers and check condition as well as having at least child or adult access
-      Logic::UpdateHelpers();
-      bool hereVal = condition() && (Logic::IsAdult || Logic::IsChild);
+      logic->UpdateHelpers();
+      bool hereVal = condition() && (logic->IsAdult || logic->IsChild);
 
       //set back age variables
-      Logic::IsChild = pastChild;
-      Logic::IsAdult = pastAdult;
-      Logic::UpdateHelpers();
+      logic->IsChild = pastChild;
+      logic->IsAdult = pastAdult;
+      logic->UpdateHelpers();
 
       return hereVal;
     }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_bottom_of_the_well.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_bottom_of_the_well.cpp
index caed2e6f4..47afc1244 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_bottom_of_the_well.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_bottom_of_the_well.cpp
@@ -1,9 +1,7 @@
 #include "../location_access.hpp"
-#include "../logic.hpp"
 #include "../../entrance.h"
 #include "../../dungeon.h"
 
-using namespace Logic;
 using namespace Rando;
 
 void AreaTable_Init_BottomOfTheWell() {
@@ -12,8 +10,8 @@ void AreaTable_Init_BottomOfTheWell() {
   ---------------------------*/
   areaTable[RR_BOTTOM_OF_THE_WELL_ENTRYWAY] = Area("Bottom of the Well Entryway", "Bottom of the Well", RA_BOTTOM_OF_THE_WELL, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_BOTTOM_OF_THE_WELL_MAIN_AREA,    {[]{return randoCtx->GetDungeon(Rando::BOTTOM_OF_THE_WELL)->IsVanilla() && IsChild && (CanChildAttack || Nuts);}}),
-                  Entrance(RR_BOTTOM_OF_THE_WELL_MQ_PERIMETER, {[]{return randoCtx->GetDungeon(Rando::BOTTOM_OF_THE_WELL)->IsMQ()      && IsChild;}}),
+                  Entrance(RR_BOTTOM_OF_THE_WELL_MAIN_AREA,    {[]{return randoCtx->GetDungeon(Rando::BOTTOM_OF_THE_WELL)->IsVanilla() && logic->IsChild && (logic->CanChildAttack || logic->Nuts);}}),
+                  Entrance(RR_BOTTOM_OF_THE_WELL_MQ_PERIMETER, {[]{return randoCtx->GetDungeon(Rando::BOTTOM_OF_THE_WELL)->IsMQ()      && logic->IsChild;}}),
                   Entrance(RR_KAKARIKO_VILLAGE,                {[]{return true;}}),
   });
 
@@ -23,27 +21,27 @@ void AreaTable_Init_BottomOfTheWell() {
   if (randoCtx->GetDungeon(Rando::BOTTOM_OF_THE_WELL)->IsVanilla()) {
   areaTable[RR_BOTTOM_OF_THE_WELL_MAIN_AREA] = Area("Bottom of the Well Main Area", "Bottom of the Well", RA_BOTTOM_OF_THE_WELL, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&StickPot, {[]{return true;}}),
-                  EventAccess(&NutPot,   {[]{return true;}}),
+                  EventAccess(&logic->StickPot, {[]{return true;}}),
+                  EventAccess(&logic->NutPot,   {[]{return true;}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST,   {[]{return randoCtx->GetTrickOption(RT_LENS_BOTW) || CanUse(RG_LENS_OF_TRUTH);}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST,  {[]{return HasExplosives;}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST, {[]{return randoCtx->GetTrickOption(RT_LENS_BOTW) || CanUse(RG_LENS_OF_TRUTH);}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_COMPASS_CHEST,                {[]{return randoCtx->GetTrickOption(RT_LENS_BOTW) || CanUse(RG_LENS_OF_TRUTH);}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST,       {[]{return randoCtx->GetTrickOption(RT_LENS_BOTW) || CanUse(RG_LENS_OF_TRUTH);}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST,     {[]{return (randoCtx->GetTrickOption(RT_LENS_BOTW) || CanUse(RG_LENS_OF_TRUTH)) && HasExplosives;}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_FREESTANDING_KEY,             {[]{return Sticks || CanUse(RG_DINS_FIRE);}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST,          {[]{return CanUse(RG_ZELDAS_LULLABY) && (KokiriSword || (Sticks && randoCtx->GetTrickOption(RT_BOTW_CHILD_DEADHAND)));}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST,              {[]{return CanUse(RG_ZELDAS_LULLABY) && (randoCtx->GetTrickOption(RT_LENS_BOTW) || CanUse(RG_LENS_OF_TRUTH));}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST,       {[]{return CanUse(RG_ZELDAS_LULLABY);}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST,        {[]{return CanUse(RG_ZELDAS_LULLABY);}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_MAP_CHEST,                    {[]{return HasExplosives || (((SmallKeys(RR_BOTTOM_OF_THE_WELL, 3) && (randoCtx->GetTrickOption(RT_LENS_BOTW) || CanUse(RG_LENS_OF_TRUTH))) || CanUse(RG_DINS_FIRE) || (Sticks && randoCtx->GetTrickOption(RT_BOTW_BASEMENT))) && GoronBracelet);}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST,             {[]{return SmallKeys(RR_BOTTOM_OF_THE_WELL, 3) && (randoCtx->GetTrickOption(RT_LENS_BOTW) || CanUse(RG_LENS_OF_TRUTH));}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST,              {[]{return SmallKeys(RR_BOTTOM_OF_THE_WELL, 3) && (randoCtx->GetTrickOption(RT_LENS_BOTW) || CanUse(RG_LENS_OF_TRUTH));}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM,           {[]{return Boomerang && (randoCtx->GetTrickOption(RT_LENS_BOTW) || CanUse(RG_LENS_OF_TRUTH)) && SmallKeys(RR_BOTTOM_OF_THE_WELL, 3);}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM,           {[]{return Boomerang && (randoCtx->GetTrickOption(RT_LENS_BOTW) || CanUse(RG_LENS_OF_TRUTH)) && SmallKeys(RR_BOTTOM_OF_THE_WELL, 3);}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE,            {[]{return SmallKeys(RR_BOTTOM_OF_THE_WELL, 3) && (randoCtx->GetTrickOption(RT_LENS_BOTW) || CanUse(RG_LENS_OF_TRUTH)) && Boomerang;}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST,   {[]{return randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH);}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST,  {[]{return logic->HasExplosives;}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST, {[]{return randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH);}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_COMPASS_CHEST,                {[]{return randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH);}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST,       {[]{return randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH);}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST,     {[]{return (randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->HasExplosives;}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_FREESTANDING_KEY,             {[]{return logic->Sticks || logic->CanUse(RG_DINS_FIRE);}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST,          {[]{return logic->CanUse(RG_ZELDAS_LULLABY) && (logic->KokiriSword || (logic->Sticks && randoCtx->GetTrickOption(RT_BOTW_CHILD_DEADHAND)));}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST,              {[]{return logic->CanUse(RG_ZELDAS_LULLABY) && (randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH));}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST,       {[]{return logic->CanUse(RG_ZELDAS_LULLABY);}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST,        {[]{return logic->CanUse(RG_ZELDAS_LULLABY);}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_MAP_CHEST,                    {[]{return logic->HasExplosives || (((logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 3) && (randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH))) || logic->CanUse(RG_DINS_FIRE) || (logic->Sticks && randoCtx->GetTrickOption(RT_BOTW_BASEMENT))) && logic->GoronBracelet);}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST,             {[]{return logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 3) && (randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH));}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST,              {[]{return logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 3) && (randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH));}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM,           {[]{return logic->Boomerang && (randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 3);}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM,           {[]{return logic->Boomerang && (randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 3);}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE,            {[]{return logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 3) && (randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->Boomerang;}}),
                 }, {
                   //Exits
                   Entrance(RR_BOTTOM_OF_THE_WELL_ENTRYWAY, {[]{return true;}}),
@@ -56,28 +54,28 @@ void AreaTable_Init_BottomOfTheWell() {
   if (randoCtx->GetDungeon(Rando::BOTTOM_OF_THE_WELL)->IsMQ()) {
   areaTable[RR_BOTTOM_OF_THE_WELL_MQ_PERIMETER] = Area("Bottom of the Well MQ Perimeter", "Bottom of the Well", RA_BOTTOM_OF_THE_WELL, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  //EventAccess(&WallFairy, {[]{return WallFairy || Slingshot;}}),
+                  //EventAccess(&WallFairy, {[]{return WallFairy || logic->Slingshot;}}),
   }, {
                   //Locations
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST,              {[]{return KokiriSword || (Sticks && randoCtx->GetTrickOption(RT_BOTW_CHILD_DEADHAND));}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY, {[]{return HasExplosives || (randoCtx->GetTrickOption(RT_BOTW_MQ_DEADHAND_KEY) && Boomerang);}}),
-                    //Trick: HasExplosives || (LogicBotWMQDeadHandKey && Boomerang)
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT,                {[]{return CanChildAttack;}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM,             {[]{return CanChildAttack && SmallKeys(RR_BOTTOM_OF_THE_WELL, 2);}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST,              {[]{return logic->KokiriSword || (logic->Sticks && randoCtx->GetTrickOption(RT_BOTW_CHILD_DEADHAND));}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY, {[]{return logic->HasExplosives || (randoCtx->GetTrickOption(RT_BOTW_MQ_DEADHAND_KEY) && logic->Boomerang);}}),
+                    //Trick: logic->HasExplosives || (LogicBotWMQDeadHandKey && logic->Boomerang)
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT,                {[]{return logic->CanChildAttack;}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM,             {[]{return logic->CanChildAttack && logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 2);}}),
   }, {
                   //Exits
                   Entrance(RR_BOTTOM_OF_THE_WELL_ENTRYWAY,  {[]{return true;}}),
-                  Entrance(RR_BOTTOM_OF_THE_WELL_MQ_MIDDLE, {[]{return CanUse(RG_ZELDAS_LULLABY) || (randoCtx->GetTrickOption(RT_BOTW_MQ_PITS) && HasExplosives);}}),
-                    //Trick: CanUse(RG_ZELDAS_LULLABY) || (LogicBotWMQPits && HasExplosives)
+                  Entrance(RR_BOTTOM_OF_THE_WELL_MQ_MIDDLE, {[]{return logic->CanUse(RG_ZELDAS_LULLABY) || (randoCtx->GetTrickOption(RT_BOTW_MQ_PITS) && logic->HasExplosives);}}),
+                    //Trick: logic->CanUse(RG_ZELDAS_LULLABY) || (LogicBotWMQPits && logic->HasExplosives)
   });
 
   areaTable[RR_BOTTOM_OF_THE_WELL_MQ_MIDDLE] = Area("Bottom of the Well MQ Middle", "Bottom of the Well", RA_BOTTOM_OF_THE_WELL, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_BOTTOM_OF_THE_WELL_MQ_MAP_CHEST,                        {[]{return true;}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST,              {[]{return HasExplosives && SmallKeys(RR_BOTTOM_OF_THE_WELL, 2);}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST,              {[]{return logic->HasExplosives && logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 2);}}),
                   LocationAccess(RC_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY, {[]{return true;}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM,               {[]{return CanChildAttack && (randoCtx->GetTrickOption(RT_BOTW_MQ_PITS) || HasExplosives);}}),
-                    //Trick: CanChildAttack && (LogicBotWMQPits || HasExplosives)
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM,               {[]{return logic->CanChildAttack && (randoCtx->GetTrickOption(RT_BOTW_MQ_PITS) || logic->HasExplosives);}}),
+                    //Trick: logic->CanChildAttack && (LogicBotWMQPits || logic->HasExplosives)
   }, {
                   //Exits
                   Entrance(RR_BOTTOM_OF_THE_WELL_MQ_PERIMETER, {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
index fa3ad407c..3b3f3c3ac 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
@@ -1,14 +1,12 @@
 #include "../location_access.hpp"
-#include "../logic.hpp"
 #include "../../entrance.h"
 
-using namespace Logic;
 using namespace Rando;
 
 void AreaTable_Init_CastleTown() {
   areaTable[RR_MARKET_ENTRANCE] = Area("Market Entrance", "Market Entrance", RA_THE_MARKET, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_HYRULE_FIELD,       {[]{return IsAdult || AtDay;}}),
+                  Entrance(RR_HYRULE_FIELD,       {[]{return logic->IsAdult || logic->AtDay;}}),
                   Entrance(RR_THE_MARKET,         {[]{return true;}}),
                   Entrance(RR_MARKET_GUARD_HOUSE, {[]{return true;}}),
   });
@@ -18,26 +16,26 @@ void AreaTable_Init_CastleTown() {
                   Entrance(RR_MARKET_ENTRANCE,            {[]{return true;}}),
                   Entrance(RR_TOT_ENTRANCE,               {[]{return true;}}),
                   Entrance(RR_CASTLE_GROUNDS,             {[]{return true;}}),
-                  Entrance(RR_MARKET_BAZAAR,              {[]{return IsChild && AtDay;}}),
-                  Entrance(RR_MARKET_MASK_SHOP,           {[]{return IsChild && AtDay;}}),
-                  Entrance(RR_MARKET_SHOOTING_GALLERY,    {[]{return IsChild && AtDay;}}),
-                  Entrance(RR_MARKET_BOMBCHU_BOWLING,     {[]{return IsChild;}}),
-                  Entrance(RR_MARKET_TREASURE_CHEST_GAME, {[]{return IsChild && AtNight;}}),
-                  Entrance(RR_MARKET_POTION_SHOP,         {[]{return IsChild && AtDay;}}),
-                  Entrance(RR_MARKET_BACK_ALLEY,          {[]{return IsChild;}}),
+                  Entrance(RR_MARKET_BAZAAR,              {[]{return logic->IsChild && logic->AtDay;}}),
+                  Entrance(RR_MARKET_MASK_SHOP,           {[]{return logic->IsChild && logic->AtDay;}}),
+                  Entrance(RR_MARKET_SHOOTING_GALLERY,    {[]{return logic->IsChild && logic->AtDay;}}),
+                  Entrance(RR_MARKET_BOMBCHU_BOWLING,     {[]{return logic->IsChild;}}),
+                  Entrance(RR_MARKET_TREASURE_CHEST_GAME, {[]{return logic->IsChild && logic->AtNight;}}),
+                  Entrance(RR_MARKET_POTION_SHOP,         {[]{return logic->IsChild && logic->AtDay;}}),
+                  Entrance(RR_MARKET_BACK_ALLEY,          {[]{return logic->IsChild;}}),
   });
 
   areaTable[RR_MARKET_BACK_ALLEY] = Area("Market Back Alley", "Market", RA_THE_MARKET, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_THE_MARKET,                 {[]{return true;}}),
-                  Entrance(RR_MARKET_BOMBCHU_SHOP,        {[]{return AtNight;}}),
+                  Entrance(RR_MARKET_BOMBCHU_SHOP,        {[]{return logic->AtNight;}}),
                   Entrance(RR_MARKET_DOG_LADY_HOUSE,      {[]{return true;}}),
-                  Entrance(RR_MARKET_MAN_IN_GREEN_HOUSE,  {[]{return AtNight;}}),
+                  Entrance(RR_MARKET_MAN_IN_GREEN_HOUSE,  {[]{return logic->AtNight;}}),
   });
 
   areaTable[RR_TOT_ENTRANCE] = Area("ToT Entrance", "ToT Entrance", RA_THE_MARKET, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&GossipStoneFairy, {[]{return GossipStoneFairy || CanSummonGossipFairyWithoutSuns;}}),
+                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CanSummonGossipFairyWithoutSuns;}}),
                 }, {
                   //Locations
                   LocationAccess(RC_TOT_LEFT_GOSSIP_STONE,         {[]{return true;}}),
@@ -52,22 +50,22 @@ void AreaTable_Init_CastleTown() {
 
   areaTable[RR_TEMPLE_OF_TIME] = Area("Temple of Time", "Temple of Time", RA_TEMPLE_OF_TIME, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_TOT_LIGHT_ARROWS_CUTSCENE, {[]{return IsAdult && CanTriggerLACS;}}),
-                  LocationAccess(RC_ALTAR_HINT_CHILD, {[]{return IsChild;}}),
-                  LocationAccess(RC_ALTAR_HINT_ADULT, {[]{return IsAdult;}}),
+                  LocationAccess(RC_TOT_LIGHT_ARROWS_CUTSCENE, {[]{return logic->IsAdult && logic->CanTriggerLACS;}}),
+                  LocationAccess(RC_ALTAR_HINT_CHILD, {[]{return logic->IsChild;}}),
+                  LocationAccess(RC_ALTAR_HINT_ADULT, {[]{return logic->IsAdult;}}),
                 }, {
                   //Exits
                   Entrance(RR_TOT_ENTRANCE,            {[]{return true;}}),
-                  Entrance(RR_TOT_BEYOND_DOOR_OF_TIME, {[]{return randoCtx->GetOption(RSK_DOOR_OF_TIME).Is(RO_DOOROFTIME_OPEN) || (CanUse(RG_SONG_OF_TIME) && (randoCtx->GetOption(RSK_DOOR_OF_TIME).Is(RO_DOOROFTIME_SONGONLY) || (HasAllStones && OcarinaOfTime)));}}),
+                  Entrance(RR_TOT_BEYOND_DOOR_OF_TIME, {[]{return randoCtx->GetOption(RSK_DOOR_OF_TIME).Is(RO_DOOROFTIME_OPEN) || (logic->CanUse(RG_SONG_OF_TIME) && (randoCtx->GetOption(RSK_DOOR_OF_TIME).Is(RO_DOOROFTIME_SONGONLY) || (logic->HasAllStones && logic->OcarinaOfTime)));}}),
   });
 
   areaTable[RR_TOT_BEYOND_DOOR_OF_TIME] = Area("Beyond Door of Time", "Beyond Door of Time", RA_TEMPLE_OF_TIME, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  //EventAccess(&TimeTravel, {[]{return true;}}),
+                  //EventAccess(&logic->TimeTravel, {[]{return true;}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_TOT_MASTER_SWORD, {[]{return IsAdult;}}),
-                  LocationAccess(RC_SHEIK_AT_TEMPLE, {[]{return ForestMedallion && IsAdult;}}),
+                  LocationAccess(RC_TOT_MASTER_SWORD, {[]{return logic->IsAdult;}}),
+                  LocationAccess(RC_SHEIK_AT_TEMPLE, {[]{return logic->ForestMedallion && logic->IsAdult;}}),
                 }, {
                   //Exits
                   Entrance(RR_TEMPLE_OF_TIME, {[]{return true;}}),
@@ -76,27 +74,27 @@ void AreaTable_Init_CastleTown() {
   areaTable[RR_CASTLE_GROUNDS] = Area("Castle Grounds", "Castle Grounds", RA_CASTLE_GROUNDS, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_THE_MARKET,            {[]{return true;}}),
-                  Entrance(RR_HYRULE_CASTLE_GROUNDS, {[]{return IsChild;}}),
-                  Entrance(RR_GANONS_CASTLE_GROUNDS, {[]{return IsAdult;}}),
+                  Entrance(RR_HYRULE_CASTLE_GROUNDS, {[]{return logic->IsChild;}}),
+                  Entrance(RR_GANONS_CASTLE_GROUNDS, {[]{return logic->IsAdult;}}),
   });
 
   areaTable[RR_HYRULE_CASTLE_GROUNDS] = Area("Hyrule Castle Grounds", "Castle Grounds", RA_HYRULE_CASTLE, DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&GossipStoneFairy, {[]{return GossipStoneFairy || CanSummonGossipFairy;}}),
-                  EventAccess(&ButterflyFairy,   {[]{return ButterflyFairy   || CanUse(RG_STICKS);}}),
-                  EventAccess(&BugRock,          {[]{return true;}}),
+                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CanSummonGossipFairy;}}),
+                  EventAccess(&logic->ButterflyFairy,   {[]{return logic->ButterflyFairy   || logic->CanUse(RG_STICKS);}}),
+                  EventAccess(&logic->BugRock,          {[]{return true;}}),
                 }, {
                   //Locations
                   LocationAccess(RC_HC_MALON_EGG,              {[]{return true;}}),
-                  LocationAccess(RC_HC_GS_TREE,                {[]{return CanChildAttack;}}),
+                  LocationAccess(RC_HC_GS_TREE,                {[]{return logic->CanChildAttack;}}),
                   LocationAccess(RC_HC_MALON_GOSSIP_STONE,     {[]{return true;}}),
                   LocationAccess(RC_HC_ROCK_WALL_GOSSIP_STONE, {[]{return true;}}),
                 }, {
                   //Exits
                   Entrance(RR_CASTLE_GROUNDS,          {[]{return true;}}),
-                  Entrance(RR_HC_GARDEN,               {[]{return WeirdEgg || !randoCtx->GetOption(RSK_SHUFFLE_WEIRD_EGG);}}),
-                  Entrance(RR_HC_GREAT_FAIRY_FOUNTAIN, {[]{return CanBlastOrSmash;}}),
-                  Entrance(RR_HC_STORMS_GROTTO,        {[]{return CanOpenStormGrotto;}}),
+                  Entrance(RR_HC_GARDEN,               {[]{return logic->WeirdEgg || !randoCtx->GetOption(RSK_SHUFFLE_WEIRD_EGG);}}),
+                  Entrance(RR_HC_GREAT_FAIRY_FOUNTAIN, {[]{return logic->CanBlastOrSmash;}}),
+                  Entrance(RR_HC_STORMS_GROTTO,        {[]{return logic->CanOpenStormGrotto;}}),
   });
 
   areaTable[RR_HC_GARDEN] = Area("HC Garden", "Castle Grounds", RA_HYRULE_CASTLE, NO_DAY_NIGHT_CYCLE, {
@@ -112,7 +110,7 @@ void AreaTable_Init_CastleTown() {
 
   areaTable[RR_HC_GREAT_FAIRY_FOUNTAIN] = Area("HC Great Fairy Fountain", "HC Great Fairy Fountain", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_HC_GREAT_FAIRY_REWARD, {[]{return CanUse(RG_ZELDAS_LULLABY);}}),
+                  LocationAccess(RC_HC_GREAT_FAIRY_REWARD, {[]{return logic->CanUse(RG_ZELDAS_LULLABY);}}),
                 }, {
                   //Exits
                   Entrance(RR_CASTLE_GROUNDS, {[]{return true;}}),
@@ -120,34 +118,34 @@ void AreaTable_Init_CastleTown() {
 
   areaTable[RR_HC_STORMS_GROTTO] = Area("HC Storms Grotto", "HC Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&NutPot,           {[]{return NutPot           || CanBlastOrSmash;}}),
-                  EventAccess(&GossipStoneFairy, {[]{return GossipStoneFairy || (CanBlastOrSmash && CanSummonGossipFairy);}}),
-                  EventAccess(&WanderingBugs,    {[]{return WanderingBugs    || CanBlastOrSmash;}}),
+                  EventAccess(&logic->NutPot,           {[]{return logic->NutPot           || logic->CanBlastOrSmash;}}),
+                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || (logic->CanBlastOrSmash && logic->CanSummonGossipFairy);}}),
+                  EventAccess(&logic->WanderingBugs,    {[]{return logic->WanderingBugs    || logic->CanBlastOrSmash;}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_HC_GS_STORMS_GROTTO,           {[]{return (CanBlastOrSmash && HookshotOrBoomerang) || (Boomerang && randoCtx->GetTrickOption(RT_HC_STORMS_GS));}}),
-                  LocationAccess(RC_HC_STORMS_GROTTO_GOSSIP_STONE, {[]{return CanBlastOrSmash;}}),
+                  LocationAccess(RC_HC_GS_STORMS_GROTTO,           {[]{return (logic->CanBlastOrSmash && logic->HookshotOrBoomerang) || (logic->Boomerang && randoCtx->GetTrickOption(RT_HC_STORMS_GS));}}),
+                  LocationAccess(RC_HC_STORMS_GROTTO_GOSSIP_STONE, {[]{return logic->CanBlastOrSmash;}}),
                 }, {
                   //Exits
                   Entrance(RR_CASTLE_GROUNDS, {[]{return true;}}),
   });
 
   areaTable[RR_GANONS_CASTLE_GROUNDS] = Area("Ganon's Castle Grounds", "Castle Grounds", RA_OUTSIDE_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
-                  EventAccess(&BuiltRainbowBridge, {[]{return CanBuildRainbowBridge;}}),
+                  EventAccess(&logic->BuiltRainbowBridge, {[]{return logic->CanBuildRainbowBridge;}}),
                 }, {
                   //Locations                                   //the terrain was lowered such that you can't get this GS with a simple sword slash
-                  LocationAccess(RC_OGC_GS, {[]{return CanJumpslash || CanUseProjectile
-                  || (CanShield && CanUse(RG_MEGATON_HAMMER)) || CanUse(RG_DINS_FIRE);}}),
+                  LocationAccess(RC_OGC_GS, {[]{return logic->CanJumpslash || logic->CanUseProjectile
+                  || (logic->CanShield && logic->CanUse(RG_MEGATON_HAMMER)) || logic->CanUse(RG_DINS_FIRE);}}),
                 }, {
                   //Exits
-                  Entrance(RR_CASTLE_GROUNDS,           {[]{return AtNight;}}),
-                  Entrance(RR_OGC_GREAT_FAIRY_FOUNTAIN, {[]{return CanUse(RG_GOLDEN_GAUNTLETS) && AtNight;}}),
-                  Entrance(RR_GANONS_CASTLE_LEDGE,      {[]{return BuiltRainbowBridge;}}),
+                  Entrance(RR_CASTLE_GROUNDS,           {[]{return logic->AtNight;}}),
+                  Entrance(RR_OGC_GREAT_FAIRY_FOUNTAIN, {[]{return logic->CanUse(RG_GOLDEN_GAUNTLETS) && logic->AtNight;}}),
+                  Entrance(RR_GANONS_CASTLE_LEDGE,      {[]{return logic->BuiltRainbowBridge;}}),
   });
 
   areaTable[RR_OGC_GREAT_FAIRY_FOUNTAIN] = Area("OGC Great Fairy Fountain", "OGC Great Fairy Fountain", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_OGC_GREAT_FAIRY_REWARD, {[]{return CanUse(RG_ZELDAS_LULLABY);}}),
+                  LocationAccess(RC_OGC_GREAT_FAIRY_REWARD, {[]{return logic->CanUse(RG_ZELDAS_LULLABY);}}),
                 }, {
                   //Exits
                   Entrance(RR_CASTLE_GROUNDS, {[]{return true;}}),
@@ -155,21 +153,21 @@ void AreaTable_Init_CastleTown() {
 
   areaTable[RR_CASTLE_GROUNDS_FROM_GANONS_CASTLE] = Area("Castle Grounds From Ganon's Castle", "Castle Grounds From Ganon's Castle", RA_CASTLE_GROUNDS, NO_DAY_NIGHT_CYCLE, {}, {}, {
     // Exits
-    Entrance(RR_HYRULE_CASTLE_GROUNDS, { [] { return IsChild; }}),
-    Entrance(RR_GANONS_CASTLE_LEDGE, { [] { return IsAdult; }}),
+    Entrance(RR_HYRULE_CASTLE_GROUNDS, { [] { return logic->IsChild; }}),
+    Entrance(RR_GANONS_CASTLE_LEDGE, { [] { return logic->IsAdult; }}),
   });
 
   areaTable[RR_GANONS_CASTLE_LEDGE] = Area("Ganon's Castle Ledge", "OGC Ganon's Castle Ledge", RA_OUTSIDE_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE,
   {}, {}, {
     // Exits
-    Entrance(RR_GANONS_CASTLE_GROUNDS, {[]{return BuiltRainbowBridge;}}),
-    Entrance(RR_GANONS_CASTLE_ENTRYWAY, {[]{return IsAdult;}}),
+    Entrance(RR_GANONS_CASTLE_GROUNDS, {[]{return logic->BuiltRainbowBridge;}}),
+    Entrance(RR_GANONS_CASTLE_ENTRYWAY, {[]{return logic->IsAdult;}}),
   });
 
   areaTable[RR_MARKET_GUARD_HOUSE] = Area("Market Guard House", "Market Guard House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_MARKET_10_BIG_POES,    {[]{return IsAdult && BigPoeKill;}}),
-                  LocationAccess(RC_MARKET_GS_GUARD_HOUSE, {[]{return IsChild;}}),
+                  LocationAccess(RC_MARKET_10_BIG_POES,    {[]{return logic->IsAdult && logic->BigPoeKill;}}),
+                  LocationAccess(RC_MARKET_GS_GUARD_HOUSE, {[]{return logic->IsChild;}}),
                 }, {
                   //Exits
                   Entrance(RR_MARKET_ENTRANCE, {[]{return true;}}),
@@ -192,8 +190,8 @@ void AreaTable_Init_CastleTown() {
 
   areaTable[RR_MARKET_MASK_SHOP] = Area("Market Mask Shop", "Market Mask Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&SkullMask,   {[]{return SkullMask   || (ZeldasLetter && (randoCtx->GetOption(RSK_COMPLETE_MASK_QUEST) ||  ChildCanAccess(RR_KAKARIKO_VILLAGE)));}}),
-                  EventAccess(&MaskOfTruth, {[]{return MaskOfTruth || (SkullMask && (randoCtx->GetOption(RSK_COMPLETE_MASK_QUEST) || (ChildCanAccess(RR_THE_LOST_WOODS) && CanUse(RG_SARIAS_SONG) && AreaTable(RR_THE_GRAVEYARD)->childDay && ChildCanAccess(RR_HYRULE_FIELD) && HasAllStones)));}}),
+                  EventAccess(&logic->SkullMask,   {[]{return logic->SkullMask   || (logic->ZeldasLetter && (randoCtx->GetOption(RSK_COMPLETE_MASK_QUEST) ||  ChildCanAccess(RR_KAKARIKO_VILLAGE)));}}),
+                  EventAccess(&logic->MaskOfTruth, {[]{return logic->MaskOfTruth || (logic->SkullMask && (randoCtx->GetOption(RSK_COMPLETE_MASK_QUEST) || (ChildCanAccess(RR_THE_LOST_WOODS) && logic->CanUse(RG_SARIAS_SONG) && AreaTable(RR_THE_GRAVEYARD)->childDay && ChildCanAccess(RR_HYRULE_FIELD) && logic->HasAllStones)));}}),
                 }, {}, {
                   //Exits
                   Entrance(RR_THE_MARKET, {[]{return true;}}),
@@ -201,7 +199,7 @@ void AreaTable_Init_CastleTown() {
 
   areaTable[RR_MARKET_SHOOTING_GALLERY] = Area("Market Shooting Gallery", "Market Shooting Gallery", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_MARKET_SHOOTING_GALLERY_REWARD, {[]{return IsChild;}}),
+                  LocationAccess(RC_MARKET_SHOOTING_GALLERY_REWARD, {[]{return logic->IsChild;}}),
                 }, {
                   //Exits
                   Entrance(RR_THE_MARKET, {[]{return true;}}),
@@ -209,9 +207,9 @@ void AreaTable_Init_CastleTown() {
 
   areaTable[RR_MARKET_BOMBCHU_BOWLING] = Area("Market Bombchu Bowling", "Market Bombchu Bowling", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,  {[]{return CanPlayBowling;}}),
-                  LocationAccess(RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE, {[]{return CanPlayBowling;}}),
-                  LocationAccess(RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS,     {[]{return CanPlayBowling;}}),
+                  LocationAccess(RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,  {[]{return logic->CanPlayBowling;}}),
+                  LocationAccess(RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE, {[]{return logic->CanPlayBowling;}}),
+                  LocationAccess(RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS,     {[]{return logic->CanPlayBowling;}}),
                 }, {
                   //Exits
                   Entrance(RR_THE_MARKET, {[]{return true;}}),
@@ -235,12 +233,12 @@ void AreaTable_Init_CastleTown() {
   areaTable[RR_MARKET_TREASURE_CHEST_GAME] = Area("Market Treasure Chest Game", "Market Treasure Chest Game", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_GREG_HINT, {[]{return true;}}),
-                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_REWARD, {[]{return (CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 6)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1));}}),
-                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_1, {[]{return (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME));}}),
-                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_2, {[]{return (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 2)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME));}}),
-                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_3, {[]{return (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 3)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME));}}),
-                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_4, {[]{return (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 4)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME));}}),
-                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_5, {[]{return (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 5)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME));}}),
+                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_REWARD, {[]{return (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 6)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1));}}),
+                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_1, {[]{return (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME));}}),
+                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_2, {[]{return (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 2)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME));}}),
+                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_3, {[]{return (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 3)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME));}}),
+                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_4, {[]{return (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 4)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME));}}),
+                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_5, {[]{return (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 5)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME));}}),
                 }, {
                   //Exits
                   Entrance(RR_THE_MARKET, {[]{return true;}}),
@@ -263,7 +261,7 @@ void AreaTable_Init_CastleTown() {
 
   areaTable[RR_MARKET_DOG_LADY_HOUSE] = Area("Market Dog Lady House", "Market Dog Lady House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_MARKET_LOST_DOG, {[]{return IsChild && AtNight;}}),
+                  LocationAccess(RC_MARKET_LOST_DOG, {[]{return logic->IsChild && logic->AtNight;}}),
                 }, {
                   //Exits
                   Entrance(RR_MARKET_BACK_ALLEY, {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
index 480f40103..213b04695 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
@@ -1,50 +1,48 @@
 #include "../location_access.hpp"
-#include "../logic.hpp"
 #include "../../entrance.h"
 
-using namespace Logic;
 using namespace Rando;
 
 void AreaTable_Init_DeathMountain() {
   auto ctx = Rando::Context::GetInstance();
   areaTable[RR_DEATH_MOUNTAIN_TRAIL] = Area("Death Mountain", "Death Mountain", RA_DEATH_MOUNTAIN_TRAIL, DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&BeanPlantFairy, {[]{return BeanPlantFairy || (CanPlantBean(RR_DEATH_MOUNTAIN_TRAIL) && CanUse(RG_SONG_OF_STORMS) && (HasExplosives || GoronBracelet));}}),
+                  EventAccess(&logic->BeanPlantFairy, {[]{return logic->BeanPlantFairy || (CanPlantBean(RR_DEATH_MOUNTAIN_TRAIL) && logic->CanUse(RG_SONG_OF_STORMS) && (logic->HasExplosives || logic->GoronBracelet));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_DMT_CHEST,                    {[]{return CanBlastOrSmash || (randoCtx->GetTrickOption(RT_DMT_BOMBABLE) && IsChild && GoronBracelet);}}),
-                  LocationAccess(RC_DMT_FREESTANDING_POH,         {[]{return CanTakeDamage || CanUse(RG_HOVER_BOOTS) || (IsAdult && CanPlantBean(RR_DEATH_MOUNTAIN_TRAIL) && (HasExplosives || GoronBracelet));}}),
-                  LocationAccess(RC_DMT_GS_BEAN_PATCH,            {[]{return CanPlantBugs && (HasExplosives || GoronBracelet || (randoCtx->GetTrickOption(RT_DMT_SOIL_GS) && (CanTakeDamage || CanUse(RG_HOVER_BOOTS)) && CanUse(RG_BOOMERANG)));}}),
-                  LocationAccess(RC_DMT_GS_NEAR_KAK,              {[]{return CanBlastOrSmash;}}),
-                  LocationAccess(RC_DMT_GS_ABOVE_DODONGOS_CAVERN, {[]{return IsAdult && AtNight && (CanUse(RG_MEGATON_HAMMER) || (randoCtx->GetTrickOption(RT_DMT_HOOKSHOT_LOWER_GS) && CanUse(RG_HOOKSHOT)) || (randoCtx->GetTrickOption(RT_DMT_BEAN_LOWER_GS) && CanPlantBean(RR_DEATH_MOUNTAIN_TRAIL)) || (randoCtx->GetTrickOption(RT_DMT_HOVERS_LOWER_GS) && CanUse(RG_HOVER_BOOTS)) || randoCtx->GetTrickOption(RT_DMT_JS_LOWER_GS)) && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_DMT_CHEST,                    {[]{return logic->CanBlastOrSmash || (randoCtx->GetTrickOption(RT_DMT_BOMBABLE) && logic->IsChild && logic->GoronBracelet);}}),
+                  LocationAccess(RC_DMT_FREESTANDING_POH,         {[]{return logic->CanTakeDamage || logic->CanUse(RG_HOVER_BOOTS) || (logic->IsAdult && CanPlantBean(RR_DEATH_MOUNTAIN_TRAIL) && (logic->HasExplosives || logic->GoronBracelet));}}),
+                  LocationAccess(RC_DMT_GS_BEAN_PATCH,            {[]{return logic->CanPlantBugs && (logic->HasExplosives || logic->GoronBracelet || (randoCtx->GetTrickOption(RT_DMT_SOIL_GS) && (logic->CanTakeDamage || logic->CanUse(RG_HOVER_BOOTS)) && logic->CanUse(RG_BOOMERANG)));}}),
+                  LocationAccess(RC_DMT_GS_NEAR_KAK,              {[]{return logic->CanBlastOrSmash;}}),
+                  LocationAccess(RC_DMT_GS_ABOVE_DODONGOS_CAVERN, {[]{return logic->IsAdult && logic->AtNight && (logic->CanUse(RG_MEGATON_HAMMER) || (randoCtx->GetTrickOption(RT_DMT_HOOKSHOT_LOWER_GS) && logic->CanUse(RG_HOOKSHOT)) || (randoCtx->GetTrickOption(RT_DMT_BEAN_LOWER_GS) && CanPlantBean(RR_DEATH_MOUNTAIN_TRAIL)) || (randoCtx->GetTrickOption(RT_DMT_HOVERS_LOWER_GS) && logic->CanUse(RG_HOVER_BOOTS)) || randoCtx->GetTrickOption(RT_DMT_JS_LOWER_GS)) && logic->CanGetNightTimeGS;}}),
                 }, {
                   //Exits
                   Entrance(RR_KAK_BEHIND_GATE,          {[]{return true;}}),
                   Entrance(RR_GORON_CITY,               {[]{return true;}}),
-                  Entrance(RR_DEATH_MOUNTAIN_SUMMIT,    {[]{return Here(RR_DEATH_MOUNTAIN_TRAIL, []{return CanBlastOrSmash;}) || (IsAdult && ((CanPlantBean(RR_DEATH_MOUNTAIN_TRAIL) && GoronBracelet) || (HoverBoots && randoCtx->GetTrickOption(RT_DMT_CLIMB_HOVERS))));}}),
-                  Entrance(RR_DODONGOS_CAVERN_ENTRYWAY, {[]{return HasExplosives || GoronBracelet || IsAdult;}}),
-                  Entrance(RR_DMT_STORMS_GROTTO,        {[]{return CanOpenStormGrotto;}}),
+                  Entrance(RR_DEATH_MOUNTAIN_SUMMIT,    {[]{return Here(RR_DEATH_MOUNTAIN_TRAIL, []{return logic->CanBlastOrSmash;}) || (logic->IsAdult && ((CanPlantBean(RR_DEATH_MOUNTAIN_TRAIL) && logic->GoronBracelet) || (logic->HoverBoots && randoCtx->GetTrickOption(RT_DMT_CLIMB_HOVERS))));}}),
+                  Entrance(RR_DODONGOS_CAVERN_ENTRYWAY, {[]{return logic->HasExplosives || logic->GoronBracelet || logic->IsAdult;}}),
+                  Entrance(RR_DMT_STORMS_GROTTO,        {[]{return logic->CanOpenStormGrotto;}}),
   });
 
   areaTable[RR_DEATH_MOUNTAIN_SUMMIT] = Area("Death Mountain Summit", "Death Mountain", RA_DEATH_MOUNTAIN_TRAIL, DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&PrescriptionAccess, {[]{return PrescriptionAccess || (IsAdult && (BrokenSwordAccess || BrokenSword));}}),
-                  EventAccess(&GossipStoneFairy,   {[]{return GossipStoneFairy   || CanSummonGossipFairy;}}),
-                  EventAccess(&BugRock,            {[]{return BugRock            || IsChild;}}),
+                  EventAccess(&logic->PrescriptionAccess, {[]{return logic->PrescriptionAccess || (logic->IsAdult && (logic->BrokenSwordAccess || logic->BrokenSword));}}),
+                  EventAccess(&logic->GossipStoneFairy,   {[]{return logic->GossipStoneFairy   || logic->CanSummonGossipFairy;}}),
+                  EventAccess(&logic->BugRock,            {[]{return logic->BugRock            || logic->IsChild;}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_DMT_TRADE_BROKEN_SWORD,    {[]{return IsAdult && BrokenSword;}}),
-                  LocationAccess(RC_DMT_TRADE_EYEDROPS,        {[]{return IsAdult && Eyedrops;}}),
-                  LocationAccess(RC_DMT_TRADE_CLAIM_CHECK,     {[]{return IsAdult && ClaimCheck;}}),
-                  LocationAccess(RC_DMT_GS_FALLING_ROCKS_PATH, {[]{return IsAdult && AtNight && (CanUse(RG_MEGATON_HAMMER) || randoCtx->GetTrickOption(RT_DMT_UPPER_GS)) && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_DMT_TRADE_BROKEN_SWORD,    {[]{return logic->IsAdult && logic->BrokenSword;}}),
+                  LocationAccess(RC_DMT_TRADE_EYEDROPS,        {[]{return logic->IsAdult && logic->Eyedrops;}}),
+                  LocationAccess(RC_DMT_TRADE_CLAIM_CHECK,     {[]{return logic->IsAdult && logic->ClaimCheck;}}),
+                  LocationAccess(RC_DMT_GS_FALLING_ROCKS_PATH, {[]{return logic->IsAdult && logic->AtNight && (logic->CanUse(RG_MEGATON_HAMMER) || randoCtx->GetTrickOption(RT_DMT_UPPER_GS)) && logic->CanGetNightTimeGS;}}),
                   LocationAccess(RC_DMT_GOSSIP_STONE,          {[]{return true;}}),
                 }, {
                   //Exits
                   Entrance(RR_DEATH_MOUNTAIN_TRAIL,     {[]{return true;}}),
                   Entrance(RR_DMC_UPPER_LOCAL,          {[]{return true;}}),
-                  Entrance(RR_DMT_OWL_FLIGHT,           {[]{return IsChild;}}),
-                  Entrance(RR_DMT_COW_GROTTO,           {[]{return Here(RR_DEATH_MOUNTAIN_SUMMIT, []{return CanBlastOrSmash;});}}),
-                  Entrance(RR_DMT_GREAT_FAIRY_FOUNTAIN, {[]{return Here(RR_DEATH_MOUNTAIN_SUMMIT, []{return CanBlastOrSmash;});}}),
+                  Entrance(RR_DMT_OWL_FLIGHT,           {[]{return logic->IsChild;}}),
+                  Entrance(RR_DMT_COW_GROTTO,           {[]{return Here(RR_DEATH_MOUNTAIN_SUMMIT, []{return logic->CanBlastOrSmash;});}}),
+                  Entrance(RR_DMT_GREAT_FAIRY_FOUNTAIN, {[]{return Here(RR_DEATH_MOUNTAIN_SUMMIT, []{return logic->CanBlastOrSmash;});}}),
   });
 
   areaTable[RR_DMT_OWL_FLIGHT] = Area("DMT Owl Flight", "Death Mountain", RA_DEATH_MOUNTAIN_TRAIL, NO_DAY_NIGHT_CYCLE, {}, {}, {
@@ -54,7 +52,7 @@ void AreaTable_Init_DeathMountain() {
 
   areaTable[RR_DMT_COW_GROTTO] = Area("DMT Cow Grotto", "DMT Cow Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DMT_COW_GROTTO_COW, {[]{return CanUse(RG_EPONAS_SONG);}}),
+                  LocationAccess(RC_DMT_COW_GROTTO_COW, {[]{return logic->CanUse(RG_EPONAS_SONG);}}),
                 }, {
                   //Exits
                   Entrance(RR_DEATH_MOUNTAIN_SUMMIT, {[]{return true;}}),
@@ -72,7 +70,7 @@ void AreaTable_Init_DeathMountain() {
 
   areaTable[RR_DMT_GREAT_FAIRY_FOUNTAIN] = Area("DMT Great Fairy Fountain", "DMT Great Fairy Fountain", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DMT_GREAT_FAIRY_REWARD, {[]{return CanUse(RG_ZELDAS_LULLABY);}}),
+                  LocationAccess(RC_DMT_GREAT_FAIRY_REWARD, {[]{return logic->CanUse(RG_ZELDAS_LULLABY);}}),
                 }, {
                   //Exits
                   Entrance(RR_DEATH_MOUNTAIN_SUMMIT, {[]{return true;}}),
@@ -80,59 +78,60 @@ void AreaTable_Init_DeathMountain() {
 
   areaTable[RR_GORON_CITY] = Area("Goron City", "Goron City", RA_GORON_CITY, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&GossipStoneFairy,          {[]{return GossipStoneFairy          || CanSummonGossipFairyWithoutSuns;}}),
-                  EventAccess(&StickPot,                  {[]{return StickPot                  || IsChild;}}),
-                  EventAccess(&BugRock,                   {[]{return BugRock                   || (CanBlastOrSmash || CanUse(RG_SILVER_GAUNTLETS));}}),
-                  EventAccess(&GoronCityChildFire,        {[]{return GoronCityChildFire        || (IsChild && CanUse(RG_DINS_FIRE));}}),
-                  EventAccess(&GCWoodsWarpOpen,           {[]{return GCWoodsWarpOpen           || (CanBlastOrSmash || CanUse(RG_DINS_FIRE) || CanUse(RG_FAIRY_BOW) || GoronBracelet || GoronCityChildFire);}}),
-                  EventAccess(&GCDaruniasDoorOpenChild,   {[]{return GCDaruniasDoorOpenChild   || (IsChild && CanUse(RG_ZELDAS_LULLABY));}}),
-                  EventAccess(&StopGCRollingGoronAsAdult, {[]{return StopGCRollingGoronAsAdult || (IsAdult && (GoronBracelet || HasExplosives || Bow || (randoCtx->GetTrickOption(RT_GC_LINK_GORON_DINS) && CanUse(RG_DINS_FIRE))));}}),
+                  EventAccess(&logic->GossipStoneFairy,          {[]{return logic->GossipStoneFairy          || logic->CanSummonGossipFairyWithoutSuns;}}),
+                  EventAccess(&logic->StickPot,                  {[]{return logic->StickPot                  || logic->IsChild;}}),
+                  EventAccess(&logic->BugRock,                   {[]{return logic->BugRock                   || (logic->CanBlastOrSmash || logic->CanUse(RG_SILVER_GAUNTLETS));}}),
+                  EventAccess(&logic->GoronCityChildFire,        {[]{return logic->GoronCityChildFire        || (logic->IsChild && logic->CanUse(RG_DINS_FIRE));}}),
+                  EventAccess(&logic->GCWoodsWarpOpen,           {[]{return logic->GCWoodsWarpOpen           || (logic->CanBlastOrSmash || logic->CanUse(RG_DINS_FIRE) || logic->CanUse(RG_FAIRY_BOW) || logic->GoronBracelet || logic->GoronCityChildFire);}}),
+                  EventAccess(&logic->GCDaruniasDoorOpenChild,   {[]{return logic->GCDaruniasDoorOpenChild   || (logic->IsChild && logic->CanUse(RG_ZELDAS_LULLABY));}}),
+                  EventAccess(&logic->StopGCRollingGoronAsAdult, {[]{return logic->StopGCRollingGoronAsAdult || (logic->IsAdult && (logic->GoronBracelet || logic->HasExplosives || logic->Bow || (randoCtx->GetTrickOption(RT_GC_LINK_GORON_DINS) && logic->CanUse(RG_DINS_FIRE))));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_GC_MAZE_LEFT_CHEST,        {[]{return CanUse(RG_MEGATON_HAMMER) || CanUse(RG_SILVER_GAUNTLETS) || (randoCtx->GetTrickOption(RT_GC_LEFTMOST) && HasExplosives && CanUse(RG_HOVER_BOOTS));}}),
-                  LocationAccess(RC_GC_MAZE_CENTER_CHEST,      {[]{return CanBlastOrSmash  || CanUse(RG_SILVER_GAUNTLETS);}}),
-                  LocationAccess(RC_GC_MAZE_RIGHT_CHEST,       {[]{return CanBlastOrSmash  || CanUse(RG_SILVER_GAUNTLETS);}}),
-                  LocationAccess(RC_GC_POT_FREESTANDING_POH,   {[]{return IsChild && GoronCityChildFire && (Bombs || (GoronBracelet && randoCtx->GetTrickOption(RT_GC_POT_STRENGTH)) || (HasBombchus && randoCtx->GetTrickOption(RT_GC_POT)));}}),
-                  LocationAccess(RC_GC_ROLLING_GORON_AS_CHILD, {[]{return IsChild && (HasExplosives || (GoronBracelet && randoCtx->GetTrickOption(RT_GC_ROLLING_STRENGTH)));}}),
-                  LocationAccess(RC_GC_ROLLING_GORON_AS_ADULT, {[]{return StopGCRollingGoronAsAdult;}}),
-                  LocationAccess(RC_GC_GS_BOULDER_MAZE,        {[]{return IsChild && CanBlastOrSmash;}}),
-                  LocationAccess(RC_GC_GS_CENTER_PLATFORM,     {[]{return CanAdultAttack;}}),
-                  LocationAccess(RC_GC_MEDIGORON,              {[]{return IsAdult && AdultsWallet && (CanBlastOrSmash || GoronBracelet);}}),
-                  LocationAccess(RC_GC_MAZE_GOSSIP_STONE,      {[]{return CanBlastOrSmash || CanUse(RG_SILVER_GAUNTLETS);}}),
-                  LocationAccess(RC_GC_MEDIGORON_GOSSIP_STONE, {[]{return CanBlastOrSmash || GoronBracelet;}}),
+                  LocationAccess(RC_GC_MAZE_LEFT_CHEST,        {[]{return logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_SILVER_GAUNTLETS) || (randoCtx->GetTrickOption(RT_GC_LEFTMOST) && logic->HasExplosives && logic->CanUse(RG_HOVER_BOOTS));}}),
+                  LocationAccess(RC_GC_MAZE_CENTER_CHEST,      {[]{return logic->CanBlastOrSmash  || logic->CanUse(RG_SILVER_GAUNTLETS);}}),
+                  LocationAccess(RC_GC_MAZE_RIGHT_CHEST,       {[]{return logic->CanBlastOrSmash  || logic->CanUse(RG_SILVER_GAUNTLETS);}}),
+                  LocationAccess(RC_GC_POT_FREESTANDING_POH,   {[]{return logic->IsChild && logic->GoronCityChildFire && (logic->Bombs || (logic->GoronBracelet && randoCtx->GetTrickOption(RT_GC_POT_STRENGTH)) || (logic->HasBombchus && randoCtx->GetTrickOption(RT_GC_POT)));}}),
+                  LocationAccess(RC_GC_ROLLING_GORON_AS_CHILD, {[]{return logic->IsChild && (logic->HasExplosives || (logic->GoronBracelet && randoCtx->GetTrickOption(RT_GC_ROLLING_STRENGTH)));}}),
+                  LocationAccess(RC_GC_ROLLING_GORON_AS_ADULT, {[]{return logic->StopGCRollingGoronAsAdult;}}),
+                  LocationAccess(RC_GC_GS_BOULDER_MAZE,        {[]{return logic->IsChild && logic->CanBlastOrSmash;}}),
+                  LocationAccess(RC_GC_GS_CENTER_PLATFORM,     {[]{return logic->CanAdultAttack;}}),
+                  LocationAccess(RC_GC_MEDIGORON,              {[]{return logic->IsAdult && logic->AdultsWallet && (logic->CanBlastOrSmash || logic->GoronBracelet);}}),
+                  LocationAccess(RC_GC_MAZE_GOSSIP_STONE,      {[]{return logic->CanBlastOrSmash || logic->CanUse(RG_SILVER_GAUNTLETS);}}),
+                  LocationAccess(RC_GC_MEDIGORON_GOSSIP_STONE, {[]{return logic->CanBlastOrSmash || logic->GoronBracelet;}}),
                 }, {
                   //Exits
                   Entrance(RR_DEATH_MOUNTAIN_TRAIL, {[]{return true;}}),
-                  Entrance(RR_GC_WOODS_WARP,        {[]{return GCWoodsWarpOpen;}}),
-                  Entrance(RR_GC_SHOP,              {[]{return (IsAdult && StopGCRollingGoronAsAdult) || (IsChild && (CanBlastOrSmash || GoronBracelet || GoronCityChildFire || CanUse(RG_FAIRY_BOW)));}}),
-                  Entrance(RR_GC_DARUNIAS_CHAMBER,  {[]{return (IsAdult && StopGCRollingGoronAsAdult) || (IsChild && GCDaruniasDoorOpenChild);}}),
-                  Entrance(RR_GC_GROTTO_PLATFORM,   {[]{return IsAdult && ((CanUse(RG_SONG_OF_TIME) && ((EffectiveHealth > 2) || CanUse(RG_GORON_TUNIC) || CanUse(RG_LONGSHOT) || CanUse(RG_NAYRUS_LOVE))) || (EffectiveHealth > 1 && CanUse(RG_GORON_TUNIC) && CanUse(RG_HOOKSHOT)) || (CanUse(RG_NAYRUS_LOVE) && CanUse(RG_HOOKSHOT)) || (EffectiveHealth > 2 && CanUse(RG_HOOKSHOT) && randoCtx->GetTrickOption(RT_GC_GROTTO)));}}),
-    });
+                  Entrance(RR_GC_WOODS_WARP,        {[]{return logic->GCWoodsWarpOpen;}}),
+                  Entrance(RR_GC_SHOP,              {[]{return (logic->IsAdult && logic->StopGCRollingGoronAsAdult) || (logic->IsChild && (logic->CanBlastOrSmash || logic->GoronBracelet || logic->GoronCityChildFire || logic->CanUse(RG_FAIRY_BOW)));}}),
+                  Entrance(RR_GC_DARUNIAS_CHAMBER,  {[]{return (logic->IsAdult && logic->StopGCRollingGoronAsAdult) || (logic->IsChild && logic->GCDaruniasDoorOpenChild);}}),
+                  Entrance(RR_GC_GROTTO_PLATFORM,   {[]{return logic->IsAdult && ((logic->CanUse(RG_SONG_OF_TIME) && ((logic->EffectiveHealth > 2) || logic->CanUse(RG_GORON_TUNIC) || logic->CanUse(RG_LONGSHOT) || logic->CanUse(RG_NAYRUS_LOVE))) || (logic->EffectiveHealth > 1 && logic->CanUse(RG_GORON_TUNIC) && logic->CanUse(RG_HOOKSHOT)) || (logic->CanUse(RG_NAYRUS_LOVE) && logic->CanUse(RG_HOOKSHOT)) || (logic->EffectiveHealth > 2 && logic->CanUse(RG_HOOKSHOT) && randoCtx->GetTrickOption(RT_GC_GROTTO)));}}),
+  });
+
   areaTable[RR_GC_WOODS_WARP] = Area("GC Woods Warp", "Goron City", RA_GORON_CITY, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&GCWoodsWarpOpen, {[]{return GCWoodsWarpOpen || (CanBlastOrSmash || CanUse(RG_DINS_FIRE));}}),
+                  EventAccess(&logic->GCWoodsWarpOpen, {[]{return logic->GCWoodsWarpOpen || (logic->CanBlastOrSmash || logic->CanUse(RG_DINS_FIRE));}}),
                 }, {}, {
                   //Exits
-                  Entrance(RR_GORON_CITY,     {[]{return CanLeaveForest && GCWoodsWarpOpen;}}),
+                  Entrance(RR_GORON_CITY,     {[]{return logic->CanLeaveForest && logic->GCWoodsWarpOpen;}}),
                   Entrance(RR_THE_LOST_WOODS, {[]{return true;}}),
   });
 
   areaTable[RR_GC_DARUNIAS_CHAMBER] = Area("GC Darunias Chamber", "Goron City", RA_GORON_CITY, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&GoronCityChildFire, {[]{return GoronCityChildFire || (IsChild && CanUse(RG_STICKS));}}),
+                  EventAccess(&logic->GoronCityChildFire, {[]{return logic->GoronCityChildFire || (logic->IsChild && logic->CanUse(RG_STICKS));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_GC_DARUNIAS_JOY, {[]{return IsChild && CanUse(RG_SARIAS_SONG);}}),
+                  LocationAccess(RC_GC_DARUNIAS_JOY, {[]{return logic->IsChild && logic->CanUse(RG_SARIAS_SONG);}}),
                 }, {
                   //Exits
                   Entrance(RR_GORON_CITY,      {[]{return true;}}),
-                  Entrance(RR_DMC_LOWER_LOCAL, {[]{return IsAdult;}}),
+                  Entrance(RR_DMC_LOWER_LOCAL, {[]{return logic->IsAdult;}}),
   });
 
   areaTable[RR_GC_GROTTO_PLATFORM] = Area("GC Grotto Platform", "Goron City", RA_GORON_CITY, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_GC_GROTTO,  {[]{return true;}}),
-                  Entrance(RR_GORON_CITY, {[]{return EffectiveHealth > 2 || CanUse(RG_GORON_TUNIC) || CanUse(RG_NAYRUS_LOVE) || ((IsChild || CanUse(RG_SONG_OF_TIME)) && CanUse(RG_LONGSHOT));}}),
+                  Entrance(RR_GORON_CITY, {[]{return logic->EffectiveHealth > 2 || logic->CanUse(RG_GORON_TUNIC) || logic->CanUse(RG_NAYRUS_LOVE) || ((logic->IsChild || logic->CanUse(RG_SONG_OF_TIME)) && logic->CanUse(RG_LONGSHOT));}}),
   });
 
   areaTable[RR_GC_SHOP] = Area("GC Shop", "GC Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -152,9 +151,9 @@ void AreaTable_Init_DeathMountain() {
 
   areaTable[RR_GC_GROTTO] = Area("GC Grotto", "GC Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_GC_DEKU_SCRUB_GROTTO_LEFT,   {[]{return CanStunDeku;}}),
-                  LocationAccess(RC_GC_DEKU_SCRUB_GROTTO_RIGHT,  {[]{return CanStunDeku;}}),
-                  LocationAccess(RC_GC_DEKU_SCRUB_GROTTO_CENTER, {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_GC_DEKU_SCRUB_GROTTO_LEFT,   {[]{return logic->CanStunDeku;}}),
+                  LocationAccess(RC_GC_DEKU_SCRUB_GROTTO_RIGHT,  {[]{return logic->CanStunDeku;}}),
+                  LocationAccess(RC_GC_DEKU_SCRUB_GROTTO_CENTER, {[]{return logic->CanStunDeku;}}),
                 }, {
                   //Exits
                   Entrance(RR_GC_GROTTO_PLATFORM, {[]{return true;}}),
@@ -162,78 +161,78 @@ void AreaTable_Init_DeathMountain() {
 
   areaTable[RR_DMC_UPPER_NEARBY] = Area("DMC Upper Nearby", "Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_DMC_UPPER_LOCAL,       {[]{return FireTimer >= 48;}}),
+                  Entrance(RR_DMC_UPPER_LOCAL,       {[]{return logic->FireTimer >= 48;}}),
                   Entrance(RR_DEATH_MOUNTAIN_SUMMIT, {[]{return true;}}),
-                  Entrance(RR_DMC_UPPER_GROTTO,      {[]{return Here(RR_DMC_UPPER_NEARBY, []{return CanBlastOrSmash && (FireTimer >= 8 || Hearts >= 3);});}})
+                  Entrance(RR_DMC_UPPER_GROTTO,      {[]{return Here(RR_DMC_UPPER_NEARBY, []{return logic->CanBlastOrSmash && (logic->FireTimer >= 8 || logic->Hearts >= 3);});}})
   });
 
   areaTable[RR_DMC_UPPER_LOCAL] = Area("DMC Upper Local", "Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&GossipStoneFairy, {[]{return GossipStoneFairy || (HasExplosives && CanSummonGossipFairyWithoutSuns && (FireTimer >= 16 || Hearts >= 3));}}),
+                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || (logic->HasExplosives && logic->CanSummonGossipFairyWithoutSuns && (logic->FireTimer >= 16 || logic->Hearts >= 3));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_DMC_WALL_FREESTANDING_POH, {[]{return FireTimer >= 16 || Hearts >= 3;}}),
-                  LocationAccess(RC_DMC_GS_CRATE,              {[]{return (FireTimer >= 8 || Hearts >= 3) && IsChild && CanChildAttack;}}),
-                  LocationAccess(RC_DMC_GOSSIP_STONE,          {[]{return HasExplosives && (FireTimer >= 16 || Hearts >= 3);}}),
+                  LocationAccess(RC_DMC_WALL_FREESTANDING_POH, {[]{return logic->FireTimer >= 16 || logic->Hearts >= 3;}}),
+                  LocationAccess(RC_DMC_GS_CRATE,              {[]{return (logic->FireTimer >= 8 || logic->Hearts >= 3) && logic->IsChild && logic->CanChildAttack;}}),
+                  LocationAccess(RC_DMC_GOSSIP_STONE,          {[]{return logic->HasExplosives && (logic->FireTimer >= 16 || logic->Hearts >= 3);}}),
                 }, {
                   //Exits
                   Entrance(RR_DMC_UPPER_NEARBY,         {[]{return true;}}),
-                  Entrance(RR_DMC_LADDER_AREA_NEARBY,   {[]{return FireTimer >= 16 || Hearts >= 3;}}),
-                  Entrance(RR_DMC_CENTRAL_NEARBY,       {[]{return IsAdult && CanUse(RG_GORON_TUNIC) && CanUse(RG_DISTANT_SCARECROW) && ((EffectiveHealth > 2) || (Fairy && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).IsNot(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF)) || CanUse(RG_NAYRUS_LOVE));}}),
+                  Entrance(RR_DMC_LADDER_AREA_NEARBY,   {[]{return logic->FireTimer >= 16 || logic->Hearts >= 3;}}),
+                  Entrance(RR_DMC_CENTRAL_NEARBY,       {[]{return logic->IsAdult && logic->CanUse(RG_GORON_TUNIC) && logic->CanUse(RG_DISTANT_SCARECROW) && ((logic->EffectiveHealth > 2) || (logic->Fairy && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).IsNot(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF)) || logic->CanUse(RG_NAYRUS_LOVE));}}),
                   Entrance(RR_DMC_LOWER_NEARBY,         {[]{return false;}}),
   });
 
   areaTable[RR_DMC_LADDER_AREA_NEARBY] = Area("DMC Ladder Area Nearby", "Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DMC_DEKU_SCRUB, {[]{return IsChild && CanStunDeku;}}),
+                  LocationAccess(RC_DMC_DEKU_SCRUB, {[]{return logic->IsChild && logic->CanStunDeku;}}),
                 }, {
                   //Exits
-                  Entrance(RR_DMC_UPPER_NEARBY, {[]{return Hearts >= 3;}}),
-                  Entrance(RR_DMC_LOWER_NEARBY, {[]{return Hearts >= 3 && (CanUse(RG_HOVER_BOOTS) || (randoCtx->GetTrickOption(RT_DMC_BOULDER_JS) && IsAdult && CanUse(RG_MEGATON_HAMMER)) || (randoCtx->GetTrickOption(RT_DMC_BOULDER_SKIP) && IsAdult));}}),
+                  Entrance(RR_DMC_UPPER_NEARBY, {[]{return logic->Hearts >= 3;}}),
+                  Entrance(RR_DMC_LOWER_NEARBY, {[]{return logic->Hearts >= 3 && (logic->CanUse(RG_HOVER_BOOTS) || (randoCtx->GetTrickOption(RT_DMC_BOULDER_JS) && logic->IsAdult && logic->CanUse(RG_MEGATON_HAMMER)) || (randoCtx->GetTrickOption(RT_DMC_BOULDER_SKIP) && logic->IsAdult));}}),
   });
 
   areaTable[RR_DMC_LOWER_NEARBY] = Area("DMC Lower Nearby", "Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_DMC_LOWER_LOCAL,          {[]{return FireTimer >= 48;}}),
+                  Entrance(RR_DMC_LOWER_LOCAL,          {[]{return logic->FireTimer >= 48;}}),
                   Entrance(RR_GC_DARUNIAS_CHAMBER,      {[]{return true;}}),
-                  Entrance(RR_DMC_GREAT_FAIRY_FOUNTAIN, {[]{return CanUse(RG_MEGATON_HAMMER);}}),
-                  Entrance(RR_DMC_HAMMER_GROTTO,        {[]{return IsAdult && CanUse(RG_MEGATON_HAMMER);}}),
+                  Entrance(RR_DMC_GREAT_FAIRY_FOUNTAIN, {[]{return logic->CanUse(RG_MEGATON_HAMMER);}}),
+                  Entrance(RR_DMC_HAMMER_GROTTO,        {[]{return logic->IsAdult && logic->CanUse(RG_MEGATON_HAMMER);}}),
   });
 
   areaTable[RR_DMC_LOWER_LOCAL] = Area("DMC Lower Local", "Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DMC_LOWER_NEARBY,       {[]{return true;}}),
-                  Entrance(RR_DMC_LADDER_AREA_NEARBY, {[]{return FireTimer >= 8 || Hearts >= 3;}}),
-                  Entrance(RR_DMC_CENTRAL_NEARBY,     {[]{return (CanUse(RG_HOVER_BOOTS) || CanUse(RG_HOOKSHOT)) && (FireTimer >= 8 || Hearts >= 3);}}),
-                  Entrance(RR_DMC_CENTRAL_LOCAL,      {[]{return (CanUse(RG_HOVER_BOOTS) || CanUse(RG_HOOKSHOT) || (IsAdult && CanShield && randoCtx->GetTrickOption(RT_DMC_BOLERO_JUMP))) && FireTimer >= 24;}}),
+                  Entrance(RR_DMC_LADDER_AREA_NEARBY, {[]{return logic->FireTimer >= 8 || logic->Hearts >= 3;}}),
+                  Entrance(RR_DMC_CENTRAL_NEARBY,     {[]{return (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT)) && (logic->FireTimer >= 8 || logic->Hearts >= 3);}}),
+                  Entrance(RR_DMC_CENTRAL_LOCAL,      {[]{return (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT) || (logic->IsAdult && logic->CanShield && randoCtx->GetTrickOption(RT_DMC_BOLERO_JUMP))) && logic->FireTimer >= 24;}}),
   });
 
   areaTable[RR_DMC_CENTRAL_NEARBY] = Area("DMC Central Nearby", "Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DMC_VOLCANO_FREESTANDING_POH, {[]{return IsAdult && Hearts >= 3 && (CanPlantBean(RR_DMC_CENTRAL_LOCAL) || (randoCtx->GetTrickOption(RT_DMC_HOVER_BEAN_POH) && HoverBoots));}}),
-                  LocationAccess(RC_SHEIK_IN_CRATER,              {[]{return IsAdult && (FireTimer >= 8 || Hearts >= 3);}}),
+                  LocationAccess(RC_DMC_VOLCANO_FREESTANDING_POH, {[]{return logic->IsAdult && logic->Hearts >= 3 && (CanPlantBean(RR_DMC_CENTRAL_LOCAL) || (randoCtx->GetTrickOption(RT_DMC_HOVER_BEAN_POH) && logic->HoverBoots));}}),
+                  LocationAccess(RC_SHEIK_IN_CRATER,              {[]{return logic->IsAdult && (logic->FireTimer >= 8 || logic->Hearts >= 3);}}),
                 }, {
                   //Exits
-                  Entrance(RR_DMC_CENTRAL_LOCAL, {[]{return FireTimer >= 48;}}),
+                  Entrance(RR_DMC_CENTRAL_LOCAL, {[]{return logic->FireTimer >= 48;}}),
   });
 
   areaTable[RR_DMC_CENTRAL_LOCAL] = Area("DMC Central Local", "Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&BeanPlantFairy, {[]{return BeanPlantFairy || (CanPlantBean(RR_DMC_CENTRAL_LOCAL) && CanUse(RG_SONG_OF_STORMS));}}),
+                  EventAccess(&logic->BeanPlantFairy, {[]{return logic->BeanPlantFairy || (CanPlantBean(RR_DMC_CENTRAL_LOCAL) && logic->CanUse(RG_SONG_OF_STORMS));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_DMC_GS_BEAN_PATCH, {[]{return (FireTimer >= 8 || Hearts >= 3) && CanPlantBugs && CanChildAttack;}}),
+                  LocationAccess(RC_DMC_GS_BEAN_PATCH, {[]{return (logic->FireTimer >= 8 || logic->Hearts >= 3) && logic->CanPlantBugs && logic->CanChildAttack;}}),
                 }, {
                   //Exits
                   Entrance(RR_DMC_CENTRAL_NEARBY,   {[]{return true;}}),
-                  Entrance(RR_DMC_LOWER_NEARBY,     {[]{return (IsAdult && CanPlantBean(RR_DMC_CENTRAL_LOCAL)) || CanUse(RG_HOVER_BOOTS) || CanUse(RG_HOOKSHOT);}}),
-                  Entrance(RR_DMC_UPPER_NEARBY,     {[]{return IsAdult && CanPlantBean(RR_DMC_CENTRAL_LOCAL);}}),
-                  Entrance(RR_FIRE_TEMPLE_ENTRYWAY, {[]{return (IsChild && Hearts >= 3 && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).IsNot(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF)) || (IsAdult && FireTimer >= 24);}}),
+                  Entrance(RR_DMC_LOWER_NEARBY,     {[]{return (logic->IsAdult && CanPlantBean(RR_DMC_CENTRAL_LOCAL)) || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT);}}),
+                  Entrance(RR_DMC_UPPER_NEARBY,     {[]{return logic->IsAdult && CanPlantBean(RR_DMC_CENTRAL_LOCAL);}}),
+                  Entrance(RR_FIRE_TEMPLE_ENTRYWAY, {[]{return (logic->IsChild && logic->Hearts >= 3 && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).IsNot(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF)) || (logic->IsAdult && logic->FireTimer >= 24);}}),
   });
 
   areaTable[RR_DMC_GREAT_FAIRY_FOUNTAIN] = Area("DMC Great Fairy Fountain", "DMC Great Fairy Fountain", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DMC_GREAT_FAIRY_REWARD, {[]{return CanUse(RG_ZELDAS_LULLABY);}}),
+                  LocationAccess(RC_DMC_GREAT_FAIRY_REWARD, {[]{return logic->CanUse(RG_ZELDAS_LULLABY);}}),
                 }, {
                   //Exits
                   Entrance(RR_DMC_LOWER_LOCAL, {[]{return true;}}),
@@ -250,9 +249,9 @@ void AreaTable_Init_DeathMountain() {
 
   areaTable[RR_DMC_HAMMER_GROTTO] = Area("DMC Hammer Grotto", "DMC Hammer Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DMC_DEKU_SCRUB_GROTTO_LEFT,   {[]{return CanStunDeku;}}),
-                  LocationAccess(RC_DMC_DEKU_SCRUB_GROTTO_RIGHT,  {[]{return CanStunDeku;}}),
-                  LocationAccess(RC_DMC_DEKU_SCRUB_GROTTO_CENTER, {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_DMC_DEKU_SCRUB_GROTTO_LEFT,   {[]{return logic->CanStunDeku;}}),
+                  LocationAccess(RC_DMC_DEKU_SCRUB_GROTTO_RIGHT,  {[]{return logic->CanStunDeku;}}),
+                  LocationAccess(RC_DMC_DEKU_SCRUB_GROTTO_CENTER, {[]{return logic->CanStunDeku;}}),
                 }, {
                   //Exits
                   Entrance(RR_DMC_LOWER_LOCAL, {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp
index 5c502cd08..4c27646f2 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp
@@ -1,9 +1,7 @@
 #include "../location_access.hpp"
-#include "../logic.hpp"
 #include "../../entrance.h"
 #include "../../dungeon.h"
 
-using namespace Logic;
 using namespace Rando;
 
 void AreaTable_Init_DekuTree() {
@@ -23,8 +21,8 @@ void AreaTable_Init_DekuTree() {
   if (randoCtx->GetDungeon(DEKU_TREE)->IsVanilla()) {
   areaTable[RR_DEKU_TREE_LOBBY] = Area("Deku Tree Lobby", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_BOOMERANG));}}),
-                  EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_MEGATON_HAMMER) || HasExplosives || CanUse(RG_DINS_FIRE));}}),
+                  EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
+                  EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUse(RG_DINS_FIRE));}}),
                 }, {
                   //Locations
                   LocationAccess(RC_DEKU_TREE_MAP_CHEST, {[]{return true;}}),
@@ -33,15 +31,15 @@ void AreaTable_Init_DekuTree() {
                   Entrance(RR_DEKU_TREE_ENTRYWAY,          {[]{return true;}}),
                   Entrance(RR_DEKU_TREE_2F_MIDDLE_ROOM,    {[]{return true;}}),
                   Entrance(RR_DEKU_TREE_COMPASS_ROOM,      {[]{return true;}}),
-                  Entrance(RR_DEKU_TREE_BASEMENT_LOWER,    {[]{return Here(RR_DEKU_TREE_LOBBY, []{return CanAdultAttack || CanChildAttack || Nuts;});}}),
+                  Entrance(RR_DEKU_TREE_BASEMENT_LOWER,    {[]{return Here(RR_DEKU_TREE_LOBBY, []{return logic->CanAdultAttack || logic->CanChildAttack || logic->Nuts;});}}),
                   Entrance(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM, {[]{return false;}}),
                   Entrance(RR_DEKU_TREE_BOSS_ENTRYWAY,     {[]{return false;}}),
   });
 
   areaTable[RR_DEKU_TREE_2F_MIDDLE_ROOM] = Area("Deku Tree 2F Middle Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_DEKU_TREE_LOBBY,         {[]{return Here(RR_DEKU_TREE_2F_MIDDLE_ROOM, []{return HasShield || CanUse(RG_MEGATON_HAMMER);});}}),
-                  Entrance(RR_DEKU_TREE_SLINGSHOT_ROOM,{[]{return Here(RR_DEKU_TREE_2F_MIDDLE_ROOM, []{return HasShield || CanUse(RG_MEGATON_HAMMER);});}}),
+                  Entrance(RR_DEKU_TREE_LOBBY,         {[]{return Here(RR_DEKU_TREE_2F_MIDDLE_ROOM, []{return logic->HasShield || logic->CanUse(RG_MEGATON_HAMMER);});}}),
+                  Entrance(RR_DEKU_TREE_SLINGSHOT_ROOM,{[]{return Here(RR_DEKU_TREE_2F_MIDDLE_ROOM, []{return logic->HasShield || logic->CanUse(RG_MEGATON_HAMMER);});}}),
   });
 
   areaTable[RR_DEKU_TREE_SLINGSHOT_ROOM] = Area("Deku Tree Slingshot Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -50,46 +48,46 @@ void AreaTable_Init_DekuTree() {
                   LocationAccess(RC_DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(RR_DEKU_TREE_2F_MIDDLE_ROOM, {[]{return CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_HOVER_BOOTS);}}),
+                  Entrance(RR_DEKU_TREE_2F_MIDDLE_ROOM, {[]{return logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_HOVER_BOOTS);}}),
   });
 
   areaTable[RR_DEKU_TREE_COMPASS_ROOM] = Area("Deku Tree Compass Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_BOOMERANG));}}),
-                  EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_MEGATON_HAMMER) || HasExplosives || CanUse(RG_DINS_FIRE));}}),
+                  EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
+                  EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUse(RG_DINS_FIRE));}}),
                 }, {
                   //Locations
                   LocationAccess(RC_DEKU_TREE_COMPASS_CHEST,           {[]{return true;}}),
                   LocationAccess(RC_DEKU_TREE_COMPASS_ROOM_SIDE_CHEST, {[]{return true;}}),
-                  LocationAccess(RC_DEKU_TREE_GS_COMPASS_ROOM,         {[]{return CanAdultAttack || CanChildAttack;}}),
+                  LocationAccess(RC_DEKU_TREE_GS_COMPASS_ROOM,         {[]{return logic->CanAdultAttack || logic->CanChildAttack;}}),
                 }, {
                   //Exits
-                  Entrance(RR_DEKU_TREE_LOBBY,     {[]{return HasFireSourceWithTorch || CanUse(RG_FAIRY_BOW);}}),
+                  Entrance(RR_DEKU_TREE_LOBBY,     {[]{return logic->HasFireSourceWithTorch || logic->CanUse(RG_FAIRY_BOW);}}),
                   Entrance(RR_DEKU_TREE_BOSS_ENTRYWAY, {[]{return false;}}),
   });
 
   areaTable[RR_DEKU_TREE_BASEMENT_LOWER] = Area("Deku Tree Basement Lower", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || Boomerang);}}),
-                  EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_MEGATON_HAMMER) || HasExplosives || CanUse(RG_DINS_FIRE));},
-                                    /*Glitched*/[]{return CanUse(RG_MEGATON_HAMMER);}}),
+                  EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->Boomerang);}}),
+                  EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUse(RG_DINS_FIRE));},
+                                    /*Glitched*/[]{return logic->CanUse(RG_MEGATON_HAMMER);}}),
                 }, {
                   //Locations
                   LocationAccess(RC_DEKU_TREE_BASEMENT_CHEST,    {[]{return true;}}),
-                  LocationAccess(RC_DEKU_TREE_GS_BASEMENT_GATE,  {[]{return CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOOMERANG) || HasExplosives || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_DINS_FIRE);}}),
-                  LocationAccess(RC_DEKU_TREE_GS_BASEMENT_VINES, {[]{return CanUseProjectile || CanUse(RG_DINS_FIRE) || (randoCtx->GetTrickOption(RT_DEKU_MQ_COMPASS_GS) && CanJumpslash);}}),
+                  LocationAccess(RC_DEKU_TREE_GS_BASEMENT_GATE,  {[]{return logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG) || logic->HasExplosives || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_DINS_FIRE);}}),
+                  LocationAccess(RC_DEKU_TREE_GS_BASEMENT_VINES, {[]{return logic->CanUseProjectile || logic->CanUse(RG_DINS_FIRE) || (randoCtx->GetTrickOption(RT_DEKU_MQ_COMPASS_GS) && logic->CanJumpslash);}}),
                 }, {
                   //Exits
                   Entrance(RR_DEKU_TREE_LOBBY,               {[]{return true;}}),
-                  Entrance(RR_DEKU_TREE_BASEMENT_SCRUB_ROOM, {[]{return Here(RR_DEKU_TREE_BASEMENT_LOWER, []{return HasFireSourceWithTorch || CanUse(RG_FAIRY_BOW);});}}),
-                  Entrance(RR_DEKU_TREE_BASEMENT_UPPER,      {[]{return IsAdult || randoCtx->GetTrickOption(RT_DEKU_B1_SKIP) || HasAccessTo(RR_DEKU_TREE_BASEMENT_UPPER);}}),
+                  Entrance(RR_DEKU_TREE_BASEMENT_SCRUB_ROOM, {[]{return Here(RR_DEKU_TREE_BASEMENT_LOWER, []{return logic->HasFireSourceWithTorch || logic->CanUse(RG_FAIRY_BOW);});}}),
+                  Entrance(RR_DEKU_TREE_BASEMENT_UPPER,      {[]{return logic->IsAdult || randoCtx->GetTrickOption(RT_DEKU_B1_SKIP) || HasAccessTo(RR_DEKU_TREE_BASEMENT_UPPER);}}),
                   Entrance(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM,   {[]{return false;}}),
   });
 
   areaTable[RR_DEKU_TREE_BASEMENT_SCRUB_ROOM] = Area("Deku Tree Basement Scrub Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DEKU_TREE_BASEMENT_LOWER,      {[]{return true;}}),
-                  Entrance(RR_DEKU_TREE_BASEMENT_WATER_ROOM, {[]{return Here(RR_DEKU_TREE_BASEMENT_SCRUB_ROOM, []{return CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW);});}}),
+                  Entrance(RR_DEKU_TREE_BASEMENT_WATER_ROOM, {[]{return Here(RR_DEKU_TREE_BASEMENT_SCRUB_ROOM, []{return logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW);});}}),
   });
 
   areaTable[RR_DEKU_TREE_BASEMENT_WATER_ROOM] = Area("Deku Tree Basement Water Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
@@ -100,30 +98,30 @@ void AreaTable_Init_DekuTree() {
 
   areaTable[RR_DEKU_TREE_BASEMENT_TORCH_ROOM] = Area("Deku Tree Basement Torch Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_BOOMERANG));}}),
-                  EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_MEGATON_HAMMER) || HasExplosives || CanUse(RG_DINS_FIRE));}}),
+                  EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
+                  EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUse(RG_DINS_FIRE));}}),
                 }, {}, {
                   //Exits
                   Entrance(RR_DEKU_TREE_BASEMENT_WATER_ROOM, {[]{return true;}}),
-                  Entrance(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, {[]{return Here(RR_DEKU_TREE_BASEMENT_TORCH_ROOM, []{return HasFireSourceWithTorch || CanUse(RG_FAIRY_BOW);});}}),
+                  Entrance(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, {[]{return Here(RR_DEKU_TREE_BASEMENT_TORCH_ROOM, []{return logic->HasFireSourceWithTorch || logic->CanUse(RG_FAIRY_BOW);});}}),
   });
 
   areaTable[RR_DEKU_TREE_BASEMENT_BACK_LOBBY] = Area("Deku Tree Basement Back Lobby", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_BOOMERANG));}}),
-                  EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (Here(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, []{return HasFireSourceWithTorch || CanUse(RG_FAIRY_BOW);}) &&
-                                                                            (CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_MEGATON_HAMMER) || HasExplosives || CanUse(RG_DINS_FIRE)));}}),
+                  EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
+                  EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (Here(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, []{return logic->HasFireSourceWithTorch || logic->CanUse(RG_FAIRY_BOW);}) &&
+                                                                            (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUse(RG_DINS_FIRE)));}}),
                 }, {}, {
                   //Exits
                   Entrance(RR_DEKU_TREE_BASEMENT_TORCH_ROOM, {[]{return true;}}),
-                  Entrance(RR_DEKU_TREE_BASEMENT_BACK_ROOM,  {[]{return Here(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, []{return HasFireSourceWithTorch || CanUse(RG_FAIRY_BOW);}) &&
-                                                                     Here(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, []{return CanBlastOrSmash;});}}),
-                  Entrance(RR_DEKU_TREE_BASEMENT_UPPER,      {[]{return Here(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, []{return HasFireSourceWithTorch || CanUse(RG_FAIRY_BOW);}) && IsChild;}}),
+                  Entrance(RR_DEKU_TREE_BASEMENT_BACK_ROOM,  {[]{return Here(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, []{return logic->HasFireSourceWithTorch || logic->CanUse(RG_FAIRY_BOW);}) &&
+                                                                     Here(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, []{return logic->CanBlastOrSmash;});}}),
+                  Entrance(RR_DEKU_TREE_BASEMENT_UPPER,      {[]{return Here(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, []{return logic->HasFireSourceWithTorch || logic->CanUse(RG_FAIRY_BOW);}) && logic->IsChild;}}),
   });
 
   areaTable[RR_DEKU_TREE_BASEMENT_BACK_ROOM] = Area("Deku Tree Basement Back Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DEKU_TREE_GS_BASEMENT_BACK_ROOM, {[]{return HookshotOrBoomerang;}}),
+                  LocationAccess(RC_DEKU_TREE_GS_BASEMENT_BACK_ROOM, {[]{return logic->HookshotOrBoomerang;}}),
                 }, {
                   //Exits
                   Entrance(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, {[]{return true;}}),
@@ -131,19 +129,19 @@ void AreaTable_Init_DekuTree() {
 
   areaTable[RR_DEKU_TREE_BASEMENT_UPPER] = Area("Deku Tree Basement Upper", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_BOOMERANG));}}),
-                  EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_MEGATON_HAMMER) || HasExplosives || CanUse(RG_DINS_FIRE));}}),
+                  EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
+                  EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUse(RG_DINS_FIRE));}}),
                 }, {}, {
                   //Exits
                   Entrance(RR_DEKU_TREE_BASEMENT_LOWER,      {[]{return true;}}),
-                  Entrance(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, {[]{return IsChild;}}),
-                  Entrance(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM,   {[]{return Here(RR_DEKU_TREE_BASEMENT_UPPER, []{return HasFireSourceWithTorch || (randoCtx->GetTrickOption(RT_DEKU_B1_BOW_WEBS) && IsAdult && CanUse(RG_FAIRY_BOW));});}}),
+                  Entrance(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, {[]{return logic->IsChild;}}),
+                  Entrance(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM,   {[]{return Here(RR_DEKU_TREE_BASEMENT_UPPER, []{return logic->HasFireSourceWithTorch || (randoCtx->GetTrickOption(RT_DEKU_B1_BOW_WEBS) && logic->IsAdult && logic->CanUse(RG_FAIRY_BOW));});}}),
   });
 
   areaTable[RR_DEKU_TREE_OUTSIDE_BOSS_ROOM] = Area("Deku Tree Outside Boss Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DEKU_TREE_BASEMENT_UPPER, {[]{return true;}}),
-                  Entrance(RR_DEKU_TREE_BOSS_ENTRYWAY,  {[]{return Here(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM, []{return HasShield;});}}),
+                  Entrance(RR_DEKU_TREE_BOSS_ENTRYWAY,  {[]{return Here(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM, []{return logic->HasShield;});}}),
   });
   }
 
@@ -153,32 +151,32 @@ void AreaTable_Init_DekuTree() {
   if (randoCtx->GetDungeon(DEKU_TREE)->IsMQ()) {
   areaTable[RR_DEKU_TREE_MQ_LOBBY] = Area("Deku Tree MQ Lobby", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_BOOMERANG));}}),
-                  EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_MEGATON_HAMMER) || HasExplosives || CanUse(RG_DINS_FIRE));}}),
+                  EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
+                  EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUse(RG_DINS_FIRE));}}),
   }, {
                   //Locations
                   LocationAccess(RC_DEKU_TREE_MQ_MAP_CHEST,                 {[]{return true;}}),
-                  LocationAccess(RC_DEKU_TREE_MQ_SLINGSHOT_CHEST,           {[]{return CanAdultAttack || CanChildAttack;}}),
-                  LocationAccess(RC_DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST, {[]{return HasFireSourceWithTorch || (IsAdult && CanUse(RG_FAIRY_BOW));}}),
-                  LocationAccess(RC_DEKU_TREE_MQ_BASEMENT_CHEST,            {[]{return HasFireSourceWithTorch || (IsAdult && CanUse(RG_FAIRY_BOW));}}),
-                  LocationAccess(RC_DEKU_TREE_MQ_GS_LOBBY,                  {[]{return CanAdultAttack || CanChildAttack;}}),
+                  LocationAccess(RC_DEKU_TREE_MQ_SLINGSHOT_CHEST,           {[]{return logic->CanAdultAttack || logic->CanChildAttack;}}),
+                  LocationAccess(RC_DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST, {[]{return logic->HasFireSourceWithTorch || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW));}}),
+                  LocationAccess(RC_DEKU_TREE_MQ_BASEMENT_CHEST,            {[]{return logic->HasFireSourceWithTorch || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW));}}),
+                  LocationAccess(RC_DEKU_TREE_MQ_GS_LOBBY,                  {[]{return logic->CanAdultAttack || logic->CanChildAttack;}}),
   }, {
                   //Exits
                   Entrance(RR_DEKU_TREE_ENTRYWAY,                     {[]{return true;}}),
-                  Entrance(RR_DEKU_TREE_MQ_COMPASS_ROOM,              {[]{return Here(RR_DEKU_TREE_MQ_LOBBY, []{return (IsChild && CanUse(RG_FAIRY_SLINGSHOT)) || (IsAdult && CanUse(RG_FAIRY_BOW));}) &&
-                                                                               Here(RR_DEKU_TREE_MQ_LOBBY, []{return HasFireSourceWithTorch || (IsAdult && CanUse(RG_FAIRY_BOW));});}}),
-                  Entrance(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_FRONT, {[]{return Here(RR_DEKU_TREE_MQ_LOBBY, []{return (IsChild && CanUse(RG_FAIRY_SLINGSHOT)) || (IsAdult && CanUse(RG_FAIRY_BOW));}) &&
-                                                                               Here(RR_DEKU_TREE_MQ_LOBBY, []{return HasFireSourceWithTorch;});}}),
-                  Entrance(RR_DEKU_TREE_MQ_BASEMENT_LEDGE,            {[]{return randoCtx->GetTrickOption(RT_DEKU_B1_SKIP) || Here(RR_DEKU_TREE_MQ_LOBBY, []{return IsAdult;});}}),
+                  Entrance(RR_DEKU_TREE_MQ_COMPASS_ROOM,              {[]{return Here(RR_DEKU_TREE_MQ_LOBBY, []{return (logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT)) || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW));}) &&
+                                                                               Here(RR_DEKU_TREE_MQ_LOBBY, []{return logic->HasFireSourceWithTorch || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW));});}}),
+                  Entrance(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_FRONT, {[]{return Here(RR_DEKU_TREE_MQ_LOBBY, []{return (logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT)) || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW));}) &&
+                                                                               Here(RR_DEKU_TREE_MQ_LOBBY, []{return logic->HasFireSourceWithTorch;});}}),
+                  Entrance(RR_DEKU_TREE_MQ_BASEMENT_LEDGE,            {[]{return randoCtx->GetTrickOption(RT_DEKU_B1_SKIP) || Here(RR_DEKU_TREE_MQ_LOBBY, []{return logic->IsAdult;});}}),
   });
 
   areaTable[RR_DEKU_TREE_MQ_COMPASS_ROOM] = Area("Deku Tree MQ Compass Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_DEKU_TREE_MQ_COMPASS_CHEST,   {[]{return true;}}),
-                  LocationAccess(RC_DEKU_TREE_MQ_GS_COMPASS_ROOM, {[]{return HookshotOrBoomerang &&
-                                                                               Here(RR_DEKU_TREE_MQ_COMPASS_ROOM, []{return HasBombchus ||
-                                                                               (Bombs && (CanUse(RG_SONG_OF_TIME) || IsAdult)) ||
-                                                                               (IsAdult && CanUse(RG_MEGATON_HAMMER) && (CanUse(RG_SONG_OF_TIME) || randoCtx->GetTrickOption(RT_DEKU_MQ_COMPASS_GS)));});}}),
+                  LocationAccess(RC_DEKU_TREE_MQ_GS_COMPASS_ROOM, {[]{return logic->HookshotOrBoomerang &&
+                                                                               Here(RR_DEKU_TREE_MQ_COMPASS_ROOM, []{return logic->HasBombchus ||
+                                                                               (logic->Bombs && (logic->CanUse(RG_SONG_OF_TIME) || logic->IsAdult)) ||
+                                                                               (logic->IsAdult && logic->CanUse(RG_MEGATON_HAMMER) && (logic->CanUse(RG_SONG_OF_TIME) || randoCtx->GetTrickOption(RT_DEKU_MQ_COMPASS_GS)));});}}),
   }, {
                   //Exits
                   Entrance(RR_DEKU_TREE_MQ_LOBBY, {[]{return true;}}),
@@ -189,42 +187,42 @@ void AreaTable_Init_DekuTree() {
                   LocationAccess(RC_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST, {[]{return true;}}),
   }, {
                   //Exits
-                  Entrance(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK, {[]{return randoCtx->GetTrickOption(RT_DEKU_MQ_LOG) ||  (IsChild && (DekuShield || HylianShield)) ||
-                                                                             (IsAdult && (CanUse(RG_LONGSHOT) || (CanUse(RG_HOOKSHOT) && CanUse(RG_IRON_BOOTS))));}}),
+                  Entrance(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK, {[]{return randoCtx->GetTrickOption(RT_DEKU_MQ_LOG) ||  (logic->IsChild && (logic->DekuShield || logic->HylianShield)) ||
+                                                                             (logic->IsAdult && (logic->CanUse(RG_LONGSHOT) || (logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_IRON_BOOTS))));}}),
                   Entrance(RR_DEKU_TREE_MQ_LOBBY,                    {[]{return true;}}),
   });
 
   areaTable[RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK] = Area("Deku Tree MQ Basement Water Room Front", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST, {[]{return CanUse(RG_SONG_OF_TIME);}}),
+                  LocationAccess(RC_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST, {[]{return logic->CanUse(RG_SONG_OF_TIME);}}),
   }, {
                   //Exits
-                  Entrance(RR_DEKU_TREE_MQ_BASEMENT_BACK_ROOM,        {[]{return Here(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK, []{return (IsChild && CanUse(RG_STICKS)) || CanUse(RG_DINS_FIRE) ||
-                                                                               Here(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_FRONT, []{return IsAdult && CanUse(RG_FIRE_ARROWS);});}) &&
-                                                                                 Here(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK, []{return CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) ||
-                                                                                  CanUseProjectile || (Nuts && CanUse(RG_STICKS));});}}),
+                  Entrance(RR_DEKU_TREE_MQ_BASEMENT_BACK_ROOM,        {[]{return Here(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK, []{return (logic->IsChild && logic->CanUse(RG_STICKS)) || logic->CanUse(RG_DINS_FIRE) ||
+                                                                               Here(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_FRONT, []{return logic->IsAdult && logic->CanUse(RG_FIRE_ARROWS);});}) &&
+                                                                                 Here(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK, []{return logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) ||
+                                                                                  logic->CanUseProjectile || (logic->Nuts && logic->CanUse(RG_STICKS));});}}),
                   Entrance(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_FRONT, {[]{return true;}}),
   });
 
   areaTable[RR_DEKU_TREE_MQ_BASEMENT_BACK_ROOM] = Area("Deku Tree MQ Basement Back Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM, {[]{return (IsAdult && CanUse(RG_LONGSHOT)) || (CanUse(RG_SONG_OF_TIME) && HookshotOrBoomerang);}}),
-                  LocationAccess(RC_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM,   {[]{return HasFireSourceWithTorch && HookshotOrBoomerang;}}),
+                  LocationAccess(RC_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM, {[]{return (logic->IsAdult && logic->CanUse(RG_LONGSHOT)) || (logic->CanUse(RG_SONG_OF_TIME) && logic->HookshotOrBoomerang);}}),
+                  LocationAccess(RC_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM,   {[]{return logic->HasFireSourceWithTorch && logic->HookshotOrBoomerang;}}),
   }, {
                   //Exits
-                  Entrance(RR_DEKU_TREE_MQ_BASEMENT_LEDGE,           {[]{return IsChild;}}),
-                  Entrance(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK, {[]{return (IsChild && CanUse(RG_KOKIRI_SWORD)) || CanUseProjectile || (Nuts && (IsChild && CanUse(RG_STICKS)));}}),
+                  Entrance(RR_DEKU_TREE_MQ_BASEMENT_LEDGE,           {[]{return logic->IsChild;}}),
+                  Entrance(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK, {[]{return (logic->IsChild && logic->CanUse(RG_KOKIRI_SWORD)) || logic->CanUseProjectile || (logic->Nuts && (logic->IsChild && logic->CanUse(RG_STICKS)));}}),
   });
 
   areaTable[RR_DEKU_TREE_MQ_BASEMENT_LEDGE] = Area("Deku Tree MQ Basement Ledge", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DEKU_TREE_MQ_DEKU_SCRUB, {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_DEKU_TREE_MQ_DEKU_SCRUB, {[]{return logic->CanStunDeku;}}),
   }, {
                   //Exits
-                  Entrance(RR_DEKU_TREE_MQ_BASEMENT_BACK_ROOM, {[]{return IsChild;}}),
+                  Entrance(RR_DEKU_TREE_MQ_BASEMENT_BACK_ROOM, {[]{return logic->IsChild;}}),
                   Entrance(RR_DEKU_TREE_MQ_LOBBY,              {[]{return true;}}),
                   Entrance(RR_DEKU_TREE_MQ_OUTSIDE_BOSS_ROOM,
-                         { [] { return Here(RR_DEKU_TREE_MQ_BASEMENT_LEDGE, [] { return HasFireSourceWithTorch; }); } }),
+                         { [] { return Here(RR_DEKU_TREE_MQ_BASEMENT_LEDGE, [] { return logic->HasFireSourceWithTorch; }); } }),
   });
 
     areaTable[RR_DEKU_TREE_MQ_OUTSIDE_BOSS_ROOM] =
@@ -233,7 +231,7 @@ void AreaTable_Init_DekuTree() {
                      // Exits
                      Entrance(RR_DEKU_TREE_MQ_BASEMENT_LEDGE, { [] { return true; } }),
                      Entrance(RR_DEKU_TREE_BOSS_ENTRYWAY,
-                              { [] { return Here(RR_DEKU_TREE_MQ_BASEMENT_LEDGE, [] { return HasShield; }); } }),
+                              { [] { return Here(RR_DEKU_TREE_MQ_BASEMENT_LEDGE, [] { return logic->HasShield; }); } }),
                  });
   }
 
@@ -253,16 +251,16 @@ void AreaTable_Init_DekuTree() {
         Area("Deku Tree Boss Room", "Deku Tree", RA_NONE, NO_DAY_NIGHT_CYCLE,
              {
                  // Events
-                 EventAccess(&DekuTreeClear, { [] {
-                                                  return DekuTreeClear || (HasBossSoul(RG_GOHMA_SOUL) && 
-                                                         (CanJumpslash && (Nuts || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) ||
-                                                                           HookshotOrBoomerang)));
+                 EventAccess(&logic->DekuTreeClear, { [] {
+                                                  return logic->DekuTreeClear || (logic->HasBossSoul(RG_GOHMA_SOUL) && 
+                                                         (logic->CanJumpslash && (logic->Nuts || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) ||
+                                                                           logic->HookshotOrBoomerang)));
                                               }}),
              },
              {
                  // Locations
-                 LocationAccess(RC_QUEEN_GOHMA, { [] { return DekuTreeClear; } }),
-                 LocationAccess(RC_DEKU_TREE_QUEEN_GOHMA_HEART, { [] { return DekuTreeClear; } }),
+                 LocationAccess(RC_QUEEN_GOHMA, { [] { return logic->DekuTreeClear; } }),
+                 LocationAccess(RC_DEKU_TREE_QUEEN_GOHMA_HEART, { [] { return logic->DekuTreeClear; } }),
              },
              {
                  // Exits
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp
index b17600633..86850b38d 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp
@@ -1,9 +1,7 @@
 #include "../location_access.hpp"
-#include "../logic.hpp"
 #include "../../entrance.h"
 #include "../../dungeon.h"
 
-using namespace Logic;
 using namespace Rando;
 
 void AreaTable_Init_DodongosCavern() {
@@ -24,25 +22,25 @@ void AreaTable_Init_DodongosCavern() {
   areaTable[RR_DODONGOS_CAVERN_BEGINNING] = Area("Dodongos Cavern Beginning", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_ENTRYWAY, {[]{return true;}}),
-                  Entrance(RR_DODONGOS_CAVERN_LOBBY,    {[]{return Here(RR_DODONGOS_CAVERN_BEGINNING, []{return CanBlastOrSmash || GoronBracelet;});}}),
+                  Entrance(RR_DODONGOS_CAVERN_LOBBY,    {[]{return Here(RR_DODONGOS_CAVERN_BEGINNING, []{return logic->CanBlastOrSmash || logic->GoronBracelet;});}}),
   });
 
   areaTable[RR_DODONGOS_CAVERN_LOBBY] = Area("Dodongos Cavern Lobby", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&GossipStoneFairy, {[]{return GossipStoneFairy || (CanSummonGossipFairy && Here(RR_DODONGOS_CAVERN_LOBBY, []{return CanBlastOrSmash || GoronBracelet;}));}}),
+                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || (logic->CanSummonGossipFairy && Here(RR_DODONGOS_CAVERN_LOBBY, []{return logic->CanBlastOrSmash || logic->GoronBracelet;}));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_DODONGOS_CAVERN_MAP_CHEST,        {[]{return Here(RR_DODONGOS_CAVERN_LOBBY, []{return CanBlastOrSmash || GoronBracelet;});}}),
-                  LocationAccess(RC_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY, {[]{return CanStunDeku || GoronBracelet;}}),
-                  LocationAccess(RC_DODONGOS_CAVERN_GOSSIP_STONE,     {[]{return Here(RR_DODONGOS_CAVERN_LOBBY, []{return CanBlastOrSmash || GoronBracelet;});}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_MAP_CHEST,        {[]{return Here(RR_DODONGOS_CAVERN_LOBBY, []{return logic->CanBlastOrSmash || logic->GoronBracelet;});}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY, {[]{return logic->CanStunDeku || logic->GoronBracelet;}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_GOSSIP_STONE,     {[]{return Here(RR_DODONGOS_CAVERN_LOBBY, []{return logic->CanBlastOrSmash || logic->GoronBracelet;});}}),
                 }, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_BEGINNING,    {[]{return true;}}),
-                  Entrance(RR_DODONGOS_CAVERN_LOBBY_SWITCH, {[]{return IsAdult;}}),
-                  Entrance(RR_DODONGOS_CAVERN_SE_CORRIDOR,  {[]{return Here(RR_DODONGOS_CAVERN_LOBBY, []{return CanBlastOrSmash || GoronBracelet;});}}),
+                  Entrance(RR_DODONGOS_CAVERN_LOBBY_SWITCH, {[]{return logic->IsAdult;}}),
+                  Entrance(RR_DODONGOS_CAVERN_SE_CORRIDOR,  {[]{return Here(RR_DODONGOS_CAVERN_LOBBY, []{return logic->CanBlastOrSmash || logic->GoronBracelet;});}}),
                   Entrance(RR_DODONGOS_CAVERN_STAIRS_LOWER, {[]{return HasAccessTo(RR_DODONGOS_CAVERN_LOBBY_SWITCH);}}),
                   Entrance(RR_DODONGOS_CAVERN_FAR_BRIDGE,   {[]{return HasAccessTo(RR_DODONGOS_CAVERN_FAR_BRIDGE);}}),
-                  Entrance(RR_DODONGOS_CAVERN_BOSS_AREA,    {[]{return Here(RR_DODONGOS_CAVERN_FAR_BRIDGE, []{return HasExplosives;});}}),
+                  Entrance(RR_DODONGOS_CAVERN_BOSS_AREA,    {[]{return Here(RR_DODONGOS_CAVERN_FAR_BRIDGE, []{return logic->HasExplosives;});}}),
                   Entrance(RR_DODONGOS_CAVERN_BOSS_ENTRYWAY,{[]{return false;}}),
   });
 
@@ -54,17 +52,17 @@ void AreaTable_Init_DodongosCavern() {
 
   areaTable[RR_DODONGOS_CAVERN_SE_CORRIDOR] = Area("Dodongos Cavern SE Corridor", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DODONGOS_CAVERN_GS_SCARECROW, {[]{return CanUse(RG_SCARECROW) || (IsAdult && CanUse(RG_LONGSHOT)) || (randoCtx->GetTrickOption(RT_DC_SCARECROW_GS) && (CanAdultAttack || CanChildAttack));}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_GS_SCARECROW, {[]{return logic->CanUse(RG_SCARECROW) || (logic->IsAdult && logic->CanUse(RG_LONGSHOT)) || (randoCtx->GetTrickOption(RT_DC_SCARECROW_GS) && (logic->CanAdultAttack || logic->CanChildAttack));}}),
                 }, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_LOBBY,               {[]{return true;}}),
-                  Entrance(RR_DODONGOS_CAVERN_SE_ROOM,             {[]{return Here(RR_DODONGOS_CAVERN_SE_CORRIDOR, []{return CanBlastOrSmash || CanAdultAttack || CanChildAttack || (CanTakeDamage && CanShield);});}}),
+                  Entrance(RR_DODONGOS_CAVERN_SE_ROOM,             {[]{return Here(RR_DODONGOS_CAVERN_SE_CORRIDOR, []{return logic->CanBlastOrSmash || logic->CanAdultAttack || logic->CanChildAttack || (logic->CanTakeDamage && logic->CanShield);});}}),
                   Entrance(RR_DODONGOS_CAVERN_NEAR_LOWER_LIZALFOS, {[]{return true;}}),
   });
 
   areaTable[RR_DODONGOS_CAVERN_SE_ROOM] = Area("Dodongos Cavern SE Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS, {[]{return CanAdultAttack || CanChildAttack;}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS, {[]{return logic->CanAdultAttack || logic->CanChildAttack;}}),
                 }, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_SE_CORRIDOR, {[]{return true;}}),
@@ -78,22 +76,22 @@ void AreaTable_Init_DodongosCavern() {
 
   areaTable[RR_DODONGOS_CAVERN_LOWER_LIZALFOS] = Area("Dodongos Cavern Lower Lizalfos", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_DODONGOS_CAVERN_NEAR_LOWER_LIZALFOS, {[]{return Here(RR_DODONGOS_CAVERN_LOWER_LIZALFOS, []{return CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_STICKS) || CanUse(RG_KOKIRI_SWORD) ||
-                    CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_MEGATON_HAMMER) || HasExplosives;});}}),
-                  Entrance(RR_DODONGOS_CAVERN_DODONGO_ROOM,        {[]{return Here(RR_DODONGOS_CAVERN_LOWER_LIZALFOS, []{return CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_STICKS) || CanUse(RG_KOKIRI_SWORD) || 
-                    CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_MEGATON_HAMMER) || HasExplosives;});}}),
+                  Entrance(RR_DODONGOS_CAVERN_NEAR_LOWER_LIZALFOS, {[]{return Here(RR_DODONGOS_CAVERN_LOWER_LIZALFOS, []{return logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_STICKS) || logic->CanUse(RG_KOKIRI_SWORD) ||
+                    logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives;});}}),
+                  Entrance(RR_DODONGOS_CAVERN_DODONGO_ROOM,        {[]{return Here(RR_DODONGOS_CAVERN_LOWER_LIZALFOS, []{return logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_STICKS) || logic->CanUse(RG_KOKIRI_SWORD) || 
+                    logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives;});}}),
   });
 
   areaTable[RR_DODONGOS_CAVERN_DODONGO_ROOM] = Area("Dodongos Cavern Dodongo Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_DODONGOS_CAVERN_LOBBY_SWITCH,      {[]{return HasFireSourceWithTorch;}}),
+                  Entrance(RR_DODONGOS_CAVERN_LOBBY_SWITCH,      {[]{return logic->HasFireSourceWithTorch;}}),
                   Entrance(RR_DODONGOS_CAVERN_LOWER_LIZALFOS,    {[]{return true;}}),
-                  Entrance(RR_DODONGOS_CAVERN_NEAR_DODONGO_ROOM, {[]{return Here(RR_DODONGOS_CAVERN_DODONGO_ROOM, []{return CanBlastOrSmash || GoronBracelet;});}}),
+                  Entrance(RR_DODONGOS_CAVERN_NEAR_DODONGO_ROOM, {[]{return Here(RR_DODONGOS_CAVERN_DODONGO_ROOM, []{return logic->CanBlastOrSmash || logic->GoronBracelet;});}}),
   });
 
   areaTable[RR_DODONGOS_CAVERN_NEAR_DODONGO_ROOM] = Area("Dodongos Cavern Near Dodongo Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS, {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS, {[]{return logic->CanStunDeku;}}),
                 }, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_DODONGO_ROOM, {[]{return true;}}),
@@ -102,14 +100,14 @@ void AreaTable_Init_DodongosCavern() {
   areaTable[RR_DODONGOS_CAVERN_STAIRS_LOWER] = Area("Dodongos Cavern Stairs Lower", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_LOBBY,        {[]{return true;}}),
-                  Entrance(RR_DODONGOS_CAVERN_STAIRS_UPPER, {[]{return HasExplosives || GoronBracelet || CanUse(RG_DINS_FIRE) || (randoCtx->GetTrickOption(RT_DC_STAIRCASE) && CanUse(RG_FAIRY_BOW));}}),
-                  Entrance(RR_DODONGOS_CAVERN_COMPASS_ROOM, {[]{return Here(RR_DODONGOS_CAVERN_STAIRS_LOWER, []{return CanBlastOrSmash || GoronBracelet;});}}),
+                  Entrance(RR_DODONGOS_CAVERN_STAIRS_UPPER, {[]{return logic->HasExplosives || logic->GoronBracelet || logic->CanUse(RG_DINS_FIRE) || (randoCtx->GetTrickOption(RT_DC_STAIRCASE) && logic->CanUse(RG_FAIRY_BOW));}}),
+                  Entrance(RR_DODONGOS_CAVERN_COMPASS_ROOM, {[]{return Here(RR_DODONGOS_CAVERN_STAIRS_LOWER, []{return logic->CanBlastOrSmash || logic->GoronBracelet;});}}),
   });
 
   areaTable[RR_DODONGOS_CAVERN_STAIRS_UPPER] = Area("Dodongos Cavern Stairs Upper", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS, {[]{return Here(RR_DODONGOS_CAVERN_FAR_BRIDGE, []{return HookshotOrBoomerang;}) || CanUse(RG_LONGSHOT);}}),
-                  LocationAccess(RC_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS,  {[]{return IsAdult || CanChildAttack || (HasAccessTo(RR_DODONGOS_CAVERN_STAIRS_LOWER) && CanUse(RG_LONGSHOT) && randoCtx->GetTrickOption(RT_DC_VINES_GS));}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS, {[]{return Here(RR_DODONGOS_CAVERN_FAR_BRIDGE, []{return logic->HookshotOrBoomerang;}) || logic->CanUse(RG_LONGSHOT);}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS,  {[]{return logic->IsAdult || logic->CanChildAttack || (HasAccessTo(RR_DODONGOS_CAVERN_STAIRS_LOWER) && logic->CanUse(RG_LONGSHOT) && randoCtx->GetTrickOption(RT_DC_VINES_GS));}}),
                 }, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_STAIRS_LOWER, {[]{return true;}}),
@@ -121,7 +119,7 @@ void AreaTable_Init_DodongosCavern() {
                   LocationAccess(RC_DODONGOS_CAVERN_COMPASS_CHEST, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(RR_DODONGOS_CAVERN_STAIRS_LOWER, {[]{return CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_MEGATON_HAMMER) || HasExplosives || GoronBracelet;}}),
+                  Entrance(RR_DODONGOS_CAVERN_STAIRS_LOWER, {[]{return logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->GoronBracelet;}}),
   });
 
   areaTable[RR_DODONGOS_CAVERN_ARMOS_ROOM] = Area("Dodongos Cavern Armos Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
@@ -135,15 +133,15 @@ void AreaTable_Init_DodongosCavern() {
                   LocationAccess(RC_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(RR_DODONGOS_CAVERN_2F_SIDE_ROOM,         {[]{return Here(RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER, []{return CanBlastOrSmash || (randoCtx->GetTrickOption(RT_DC_SCRUB_ROOM) && GoronBracelet);});}}),
-                  Entrance(RR_DODONGOS_CAVERN_FIRST_SLINGSHOT_ROOM, {[]{return Here(RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER, []{return CanBlastOrSmash || GoronBracelet;});}}),
-                  Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_UPPER,      {[]{return (IsAdult && randoCtx->GetTrickOption(RT_DC_JUMP)) || CanUse(RG_HOVER_BOOTS) || (IsAdult && CanUse(RG_LONGSHOT));}}),
+                  Entrance(RR_DODONGOS_CAVERN_2F_SIDE_ROOM,         {[]{return Here(RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER, []{return logic->CanBlastOrSmash || (randoCtx->GetTrickOption(RT_DC_SCRUB_ROOM) && logic->GoronBracelet);});}}),
+                  Entrance(RR_DODONGOS_CAVERN_FIRST_SLINGSHOT_ROOM, {[]{return Here(RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER, []{return logic->CanBlastOrSmash || logic->GoronBracelet;});}}),
+                  Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_UPPER,      {[]{return (logic->IsAdult && randoCtx->GetTrickOption(RT_DC_JUMP)) || logic->CanUse(RG_HOVER_BOOTS) || (logic->IsAdult && logic->CanUse(RG_LONGSHOT));}}),
   });
 
   areaTable[RR_DODONGOS_CAVERN_2F_SIDE_ROOM] = Area("Dodongos Cavern 2F Side Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,  {[]{return CanStunDeku;}}),
-                  LocationAccess(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT, {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,  {[]{return logic->CanStunDeku;}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT, {[]{return logic->CanStunDeku;}}),
                 }, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER, {[]{return true;}}),
@@ -152,22 +150,22 @@ void AreaTable_Init_DodongosCavern() {
   areaTable[RR_DODONGOS_CAVERN_FIRST_SLINGSHOT_ROOM] = Area("Dodongos Cavern First Slingshot Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER, {[]{return true;}}),
-                  Entrance(RR_DODONGOS_CAVERN_UPPER_LIZALFOS,  {[]{return CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || randoCtx->GetTrickOption(RT_DC_SLINGSHOT_SKIP);}}),
+                  Entrance(RR_DODONGOS_CAVERN_UPPER_LIZALFOS,  {[]{return logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || randoCtx->GetTrickOption(RT_DC_SLINGSHOT_SKIP);}}),
   });
 
   areaTable[RR_DODONGOS_CAVERN_UPPER_LIZALFOS] = Area("Dodongos Cavern Upper Lizalfos", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_LOWER_LIZALFOS,        {[]{return true;}}),
-                  Entrance(RR_DODONGOS_CAVERN_FIRST_SLINGSHOT_ROOM,  {[]{return Here(RR_DODONGOS_CAVERN_LOWER_LIZALFOS, []{return CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_STICKS) || CanUse(RG_KOKIRI_SWORD) || 
-                    CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_MEGATON_HAMMER) || HasExplosives;});}}),
-                  Entrance(RR_DODONGOS_CAVERN_SECOND_SLINGSHOT_ROOM, {[]{return Here(RR_DODONGOS_CAVERN_LOWER_LIZALFOS, []{return CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_STICKS) || CanUse(RG_KOKIRI_SWORD) || 
-                    CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_MEGATON_HAMMER) || HasExplosives;});}}),
+                  Entrance(RR_DODONGOS_CAVERN_FIRST_SLINGSHOT_ROOM,  {[]{return Here(RR_DODONGOS_CAVERN_LOWER_LIZALFOS, []{return logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_STICKS) || logic->CanUse(RG_KOKIRI_SWORD) || 
+                    logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives;});}}),
+                  Entrance(RR_DODONGOS_CAVERN_SECOND_SLINGSHOT_ROOM, {[]{return Here(RR_DODONGOS_CAVERN_LOWER_LIZALFOS, []{return logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_STICKS) || logic->CanUse(RG_KOKIRI_SWORD) || 
+                    logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives;});}}),
   });
 
   areaTable[RR_DODONGOS_CAVERN_SECOND_SLINGSHOT_ROOM] = Area("Dodongos Cavern Second Slingshot Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_UPPER_LIZALFOS,  {[]{return true;}}),
-                  Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_UPPER, {[]{return CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || randoCtx->GetTrickOption(RT_DC_SLINGSHOT_SKIP);}}),
+                  Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_UPPER, {[]{return logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || randoCtx->GetTrickOption(RT_DC_SLINGSHOT_SKIP);}}),
   });
 
   areaTable[RR_DODONGOS_CAVERN_BOMB_ROOM_UPPER] = Area("Dodongos Cavern Bomb Room Upper", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
@@ -182,7 +180,7 @@ void AreaTable_Init_DodongosCavern() {
 
   areaTable[RR_DODONGOS_CAVERN_FAR_BRIDGE] = Area("Dodongos Cavern Far Bridge", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST, {[]{return Here(RR_DODONGOS_CAVERN_FAR_BRIDGE, []{return CanBlastOrSmash;});}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST, {[]{return Here(RR_DODONGOS_CAVERN_FAR_BRIDGE, []{return logic->CanBlastOrSmash;});}}),
                 }, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_LOBBY,           {[]{return true;}}),
@@ -191,17 +189,17 @@ void AreaTable_Init_DodongosCavern() {
 
   areaTable[RR_DODONGOS_CAVERN_BOSS_AREA] = Area("Dodongos Cavern Boss Area", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&FairyPot, {[]{return true;}}),
+                  EventAccess(&logic->FairyPot, {[]{return true;}}),
                 }, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_LOBBY, {[]{return true;}}),
-                  Entrance(RR_DODONGOS_CAVERN_BACK_ROOM, {[]{return Here(RR_DODONGOS_CAVERN_BOSS_AREA, []{return CanBlastOrSmash;});}}),
+                  Entrance(RR_DODONGOS_CAVERN_BACK_ROOM, {[]{return Here(RR_DODONGOS_CAVERN_BOSS_AREA, []{return logic->CanBlastOrSmash;});}}),
                   Entrance(RR_DODONGOS_CAVERN_BOSS_ENTRYWAY, {[]{return true;}}),
   });
 
   areaTable[RR_DODONGOS_CAVERN_BACK_ROOM] = Area("Dodongos Cavern Back Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DODONGOS_CAVERN_GS_BACK_ROOM, {[]{return CanAdultAttack || CanChildAttack;}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_GS_BACK_ROOM, {[]{return logic->CanAdultAttack || logic->CanChildAttack;}}),
                 }, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_BOSS_AREA, {[]{return true;}}),
@@ -215,49 +213,49 @@ void AreaTable_Init_DodongosCavern() {
   areaTable[RR_DODONGOS_CAVERN_MQ_BEGINNING] = Area("Dodongos Cavern MQ Beginning", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_ENTRYWAY, {[]{return true;}}),
-                  Entrance(RR_DODONGOS_CAVERN_MQ_LOBBY, {[]{return Here(RR_DODONGOS_CAVERN_MQ_BEGINNING, []{return CanBlastOrSmash || GoronBracelet;});}}),
+                  Entrance(RR_DODONGOS_CAVERN_MQ_LOBBY, {[]{return Here(RR_DODONGOS_CAVERN_MQ_BEGINNING, []{return logic->CanBlastOrSmash || logic->GoronBracelet;});}}),
   });
 
   areaTable[RR_DODONGOS_CAVERN_MQ_LOBBY] = Area("Dodongos Cavern MQ Lobby", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&DekuBabaSticks,   {[]{return DekuBabaSticks || (IsAdult || KokiriSword || Boomerang);}}),
-                  EventAccess(&GossipStoneFairy, {[]{return GossipStoneFairy || CanSummonGossipFairy;}}),
+                  EventAccess(&logic->DekuBabaSticks,   {[]{return logic->DekuBabaSticks || (logic->IsAdult || logic->KokiriSword || logic->Boomerang);}}),
+                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CanSummonGossipFairy;}}),
   }, {
                   //Locations
                   LocationAccess(RC_DODONGOS_CAVERN_MQ_MAP_CHEST,                  {[]{return true;}}),
-                  LocationAccess(RC_DODONGOS_CAVERN_MQ_COMPASS_CHEST,              {[]{return CanAdultAttack || CanChildAttack || Nuts;}}),
-                  LocationAccess(RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST,          {[]{return (IsChild && CanUse(RG_STICKS)) || HasFireSource;}}),
-                  LocationAccess(RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST,    {[]{return CanBlastOrSmash || (IsChild && CanUse(RG_STICKS)) || CanUse(RG_DINS_FIRE) || (IsAdult && (randoCtx->GetTrickOption(RT_DC_JUMP) || HoverBoots || Hookshot));}}),
-                  LocationAccess(RC_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM, {[]{return CanUse(RG_SONG_OF_TIME) && (CanChildAttack || CanAdultAttack);}}),
-                  LocationAccess(RC_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM,             {[]{return (IsChild && CanUse(RG_STICKS)) || HasFireSource;}}),
-                  LocationAccess(RC_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM,           {[]{return CanBlastOrSmash;}}),
-                  LocationAccess(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,      {[]{return CanStunDeku;}}),
-                  LocationAccess(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT,     {[]{return CanStunDeku;}}),
-                  LocationAccess(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,       {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_MQ_COMPASS_CHEST,              {[]{return logic->CanAdultAttack || logic->CanChildAttack || logic->Nuts;}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST,          {[]{return (logic->IsChild && logic->CanUse(RG_STICKS)) || logic->HasFireSource;}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST,    {[]{return logic->CanBlastOrSmash || (logic->IsChild && logic->CanUse(RG_STICKS)) || logic->CanUse(RG_DINS_FIRE) || (logic->IsAdult && (randoCtx->GetTrickOption(RT_DC_JUMP) || logic->HoverBoots || logic->Hookshot));}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM, {[]{return logic->CanUse(RG_SONG_OF_TIME) && (logic->CanChildAttack || logic->CanAdultAttack);}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM,             {[]{return (logic->IsChild && logic->CanUse(RG_STICKS)) || logic->HasFireSource;}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM,           {[]{return logic->CanBlastOrSmash;}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,      {[]{return logic->CanStunDeku;}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT,     {[]{return logic->CanStunDeku;}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,       {[]{return logic->CanStunDeku;}}),
                   LocationAccess(RC_DODONGOS_CAVERN_GOSSIP_STONE,                  {[]{return true;}}),
   }, {
                   //Exits
-                  Entrance(RR_DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE,  {[]{return Here(RR_DODONGOS_CAVERN_MQ_LOBBY, []{return CanBlastOrSmash || (((IsChild && CanUse(RG_STICKS)) || CanUse(RG_DINS_FIRE)) && CanTakeDamage);});}}),
-                  Entrance(RR_DODONGOS_CAVERN_MQ_BOMB_BAG_AREA,     {[]{return IsAdult || (Here(RR_DODONGOS_CAVERN_MQ_LOBBY, []{return IsAdult;}) && HasExplosives) || (randoCtx->GetTrickOption(RT_DC_MQ_CHILD_BOMBS) && CanJumpslash && CanTakeDamage);}}),
-                    //Trick: IsAdult || HasExplosives || (LogicDCMQChildBombs && (KokiriSword || Sticks) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO))
-                  Entrance(RR_DODONGOS_CAVERN_MQ_BOSS_AREA,         {[]{return HasExplosives || (GoronBracelet && ((IsAdult && randoCtx->GetTrickOption(RT_DC_MQ_ADULT_EYES)) || (IsChild && randoCtx->GetTrickOption(RT_DC_MQ_CHILD_EYES))) && ((IsChild && (CanUse(RG_STICKS))) || CanUse(RG_DINS_FIRE) || (IsAdult && (randoCtx->GetTrickOption(RT_DC_JUMP) || Hammer || HoverBoots || Hookshot))));}}), 
-                    //Trick: HasExplosives || (LogicDCMQEyes && GoronBracelet && (IsAdult || LogicDCMQChildBack) && ((IsChild && CanUse(RG_STICKS)) || CanUse(RG_DINS_FIRE) || (IsAdult && (LogicDCJump || Hammer || HoverBoots || Hookshot))))
+                  Entrance(RR_DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE,  {[]{return Here(RR_DODONGOS_CAVERN_MQ_LOBBY, []{return logic->CanBlastOrSmash || (((logic->IsChild && logic->CanUse(RG_STICKS)) || logic->CanUse(RG_DINS_FIRE)) && logic->CanTakeDamage);});}}),
+                  Entrance(RR_DODONGOS_CAVERN_MQ_BOMB_BAG_AREA,     {[]{return logic->IsAdult || (Here(RR_DODONGOS_CAVERN_MQ_LOBBY, []{return logic->IsAdult;}) && logic->HasExplosives) || (randoCtx->GetTrickOption(RT_DC_MQ_CHILD_BOMBS) && logic->CanJumpslash && logic->CanTakeDamage);}}),
+                    //Trick: logic->IsAdult || logic->HasExplosives || (LogicDCMQChildBombs && (logic->KokiriSword || logic->Sticks) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO))
+                  Entrance(RR_DODONGOS_CAVERN_MQ_BOSS_AREA,         {[]{return logic->HasExplosives || (logic->GoronBracelet && ((logic->IsAdult && randoCtx->GetTrickOption(RT_DC_MQ_ADULT_EYES)) || (logic->IsChild && randoCtx->GetTrickOption(RT_DC_MQ_CHILD_EYES))) && ((logic->IsChild && (logic->CanUse(RG_STICKS))) || logic->CanUse(RG_DINS_FIRE) || (logic->IsAdult && (randoCtx->GetTrickOption(RT_DC_JUMP) || logic->Hammer || logic->HoverBoots || logic->Hookshot))));}}), 
+                    //Trick: logic->HasExplosives || (LogicDCMQEyes && logic->GoronBracelet && (logic->IsAdult || LogicDCMQChildBack) && ((logic->IsChild && logic->CanUse(RG_STICKS)) || logic->CanUse(RG_DINS_FIRE) || (logic->IsAdult && (LogicDCJump || logic->Hammer || logic->HoverBoots || logic->Hookshot))))
   });
 
   areaTable[RR_DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE] = Area("Dodongos Cavern MQ Lower Right Side", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS, {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS, {[]{return logic->CanStunDeku;}}),
   }, {
                   //Exits
-                  Entrance(RR_DODONGOS_CAVERN_MQ_BOMB_BAG_AREA, {[]{return (Here(RR_DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE, []{return IsAdult && CanUse(RG_FAIRY_BOW);}) || GoronBracelet ||
-                                                                                CanUse(RG_DINS_FIRE) || HasExplosives) &&
-                                                                                IsChild && CanUse(RG_FAIRY_SLINGSHOT);}}),
+                  Entrance(RR_DODONGOS_CAVERN_MQ_BOMB_BAG_AREA, {[]{return (Here(RR_DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE, []{return logic->IsAdult && logic->CanUse(RG_FAIRY_BOW);}) || logic->GoronBracelet ||
+                                                                                logic->CanUse(RG_DINS_FIRE) || logic->HasExplosives) &&
+                                                                                logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT);}}),
   });
 
   areaTable[RR_DODONGOS_CAVERN_MQ_BOMB_BAG_AREA] = Area("Dodongos Cavern MQ Bomb Bag Area", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST, {[]{return true;}}),
-                  LocationAccess(RC_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM,  {[]{return (Here(RR_DODONGOS_CAVERN_MQ_BOMB_BAG_AREA, []{return IsAdult && CanUse(RG_FAIRY_BOW);}) ||  GoronBracelet || CanUse(RG_DINS_FIRE) || HasExplosives) && HookshotOrBoomerang;}}),
+                  LocationAccess(RC_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM,  {[]{return (Here(RR_DODONGOS_CAVERN_MQ_BOMB_BAG_AREA, []{return logic->IsAdult && logic->CanUse(RG_FAIRY_BOW);}) ||  logic->GoronBracelet || logic->CanUse(RG_DINS_FIRE) || logic->HasExplosives) && logic->HookshotOrBoomerang;}}),
   }, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE, {[]{return true;}}),
@@ -265,7 +263,7 @@ void AreaTable_Init_DodongosCavern() {
 
   areaTable[RR_DODONGOS_CAVERN_MQ_BOSS_AREA] = Area("Dodongos Cavern MQ BossArea", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&FairyPot,            {[]{return true;}}),
+                  EventAccess(&logic->FairyPot,            {[]{return true;}}),
   }, {
                   //Locations
                   LocationAccess(RC_DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST, {[]{return true;}}),
@@ -292,19 +290,19 @@ void AreaTable_Init_DodongosCavern() {
         Area("Dodongos Cavern Boss Room", "Dodongos Cavern", RA_NONE, NO_DAY_NIGHT_CYCLE,
              {
                  // Events
-                 EventAccess(&DodongosCavernClear,
+                 EventAccess(&logic->DodongosCavernClear,
                              { [] {
-                                  return DodongosCavernClear || (HasBossSoul(RG_KING_DODONGO_SOUL) &&
+                                  return logic->DodongosCavernClear || (logic->HasBossSoul(RG_KING_DODONGO_SOUL) &&
                                          (Here(RR_DODONGOS_CAVERN_BOSS_ROOM,
-                                               [] { return HasExplosives || (CanUse(RG_MEGATON_HAMMER) && randoCtx->GetTrickOption(RT_DC_HAMMER_FLOOR)); }) &&
-                                          (Bombs || GoronBracelet) && CanJumpslash)); /*todo add chu kill to tricks*/
+                                               [] { return logic->HasExplosives || (logic->CanUse(RG_MEGATON_HAMMER) && randoCtx->GetTrickOption(RT_DC_HAMMER_FLOOR)); }) &&
+                                          (logic->Bombs || logic->GoronBracelet) && logic->CanJumpslash)); /*todo add chu kill to tricks*/
                               }}),
              },
              {
                  // Locations
                  LocationAccess(RC_DODONGOS_CAVERN_BOSS_ROOM_CHEST, { [] { return true; } }),
-                 LocationAccess(RC_DODONGOS_CAVERN_KING_DODONGO_HEART, { [] { return DodongosCavernClear; } }),
-                 LocationAccess(RC_KING_DODONGO, { [] { return DodongosCavernClear; } }),
+                 LocationAccess(RC_DODONGOS_CAVERN_KING_DODONGO_HEART, { [] { return logic->DodongosCavernClear; } }),
+                 LocationAccess(RC_KING_DODONGO, { [] { return logic->DodongosCavernClear; } }),
              },
              {
                  // Exits
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp
index afb1b64be..858c2e81e 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp
@@ -1,9 +1,7 @@
 #include "../location_access.hpp"
-#include "../logic.hpp"
 #include "../../entrance.h"
 #include "../../dungeon.h"
 
-using namespace Logic;
 using namespace Rando;
 
 void AreaTable_Init_FireTemple() {
@@ -25,33 +23,33 @@ void AreaTable_Init_FireTemple() {
                 }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_ENTRYWAY,       {[]{return true;}}),
-                  Entrance(RR_FIRE_TEMPLE_NEAR_BOSS_ROOM, {[]{return FireTimer >= 24;}}),
-                  Entrance(RR_FIRE_TEMPLE_LOOP_ENEMIES,   {[]{return Here(RR_FIRE_TEMPLE_FIRST_ROOM, []{return CanUse(RG_MEGATON_HAMMER);}) && (SmallKeys(RR_FIRE_TEMPLE, 8) || !IsKeysanity);}}),
+                  Entrance(RR_FIRE_TEMPLE_NEAR_BOSS_ROOM, {[]{return logic->FireTimer >= 24;}}),
+                  Entrance(RR_FIRE_TEMPLE_LOOP_ENEMIES,   {[]{return Here(RR_FIRE_TEMPLE_FIRST_ROOM, []{return logic->CanUse(RG_MEGATON_HAMMER);}) && (logic->SmallKeys(RR_FIRE_TEMPLE, 8) || !logic->IsKeysanity);}}),
                   Entrance(RR_FIRE_TEMPLE_LOOP_EXIT,      {[]{return true;}}),
-                  Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM,  {[]{return SmallKeys(RR_FIRE_TEMPLE, 2) && FireTimer >= 24;}}),
+                  Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM,  {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 2) && logic->FireTimer >= 24;}}),
   });
 
   areaTable[RR_FIRE_TEMPLE_NEAR_BOSS_ROOM] = Area("Fire Temple Near Boss Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&FairyPot, {[]{return FairyPot || (CanUse(RG_HOVER_BOOTS) || CanUse(RG_HOOKSHOT));}}),
+                  EventAccess(&logic->FairyPot, {[]{return logic->FairyPot || (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT));}}),
                 }, {
                   //Locations
                   LocationAccess(RC_FIRE_TEMPLE_NEAR_BOSS_CHEST, {[]{return true;}}),
                 }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_FIRST_ROOM, {[]{return true;}}),
-                  Entrance(RR_FIRE_TEMPLE_BOSS_ENTRYWAY, {[]{return BossKeyFireTemple && ((IsAdult && randoCtx->GetTrickOption(RT_FIRE_BOSS_DOOR_JUMP)) || CanUse(RG_HOVER_BOOTS) || Here(RR_FIRE_TEMPLE_FIRE_MAZE_UPPER, []{return CanUse(RG_MEGATON_HAMMER);}));}}),
+                  Entrance(RR_FIRE_TEMPLE_BOSS_ENTRYWAY, {[]{return logic->BossKeyFireTemple && ((logic->IsAdult && randoCtx->GetTrickOption(RT_FIRE_BOSS_DOOR_JUMP)) || logic->CanUse(RG_HOVER_BOOTS) || Here(RR_FIRE_TEMPLE_FIRE_MAZE_UPPER, []{return logic->CanUse(RG_MEGATON_HAMMER);}));}}),
   });
 
   areaTable[RR_FIRE_TEMPLE_LOOP_ENEMIES] = Area("Fire Temple Loop Enemies", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_FIRE_TEMPLE_FIRST_ROOM, {[]{return SmallKeys(RR_FIRE_TEMPLE, 8) || !IsKeysanity;}}),
-                  Entrance(RR_FIRE_TEMPLE_LOOP_TILES, {[]{return Here(RR_FIRE_TEMPLE_LOOP_ENEMIES, []{return CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_MEGATON_HAMMER);});}}),
+                  Entrance(RR_FIRE_TEMPLE_FIRST_ROOM, {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 8) || !logic->IsKeysanity;}}),
+                  Entrance(RR_FIRE_TEMPLE_LOOP_TILES, {[]{return Here(RR_FIRE_TEMPLE_LOOP_ENEMIES, []{return logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER);});}}),
   });
 
   areaTable[RR_FIRE_TEMPLE_LOOP_TILES] = Area("Fire Temple Loop Tiles", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FIRE_TEMPLE_GS_BOSS_KEY_LOOP, {[]{return CanAdultAttack || CanChildAttack;}}),
+                  LocationAccess(RC_FIRE_TEMPLE_GS_BOSS_KEY_LOOP, {[]{return logic->CanAdultAttack || logic->CanChildAttack;}}),
                 }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_LOOP_ENEMIES,      {[]{return true;}}),
@@ -60,21 +58,21 @@ void AreaTable_Init_FireTemple() {
 
   areaTable[RR_FIRE_TEMPLE_LOOP_FLARE_DANCER] = Area("Fire Temple Loop Flare Dancer", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FIRE_TEMPLE_FLARE_DANCER_CHEST, {[]{return (HasExplosives || CanUse(RG_MEGATON_HAMMER)) && IsAdult;}}),
+                  LocationAccess(RC_FIRE_TEMPLE_FLARE_DANCER_CHEST, {[]{return (logic->HasExplosives || logic->CanUse(RG_MEGATON_HAMMER)) && logic->IsAdult;}}),
                 }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_LOOP_TILES,         {[]{return true;}}),
-                  Entrance(RR_FIRE_TEMPLE_LOOP_HAMMER_SWITCH, {[]{return Here(RR_FIRE_TEMPLE_LOOP_FLARE_DANCER, []{return CanUse(RG_MEGATON_HAMMER) || CanUse(RG_HOOKSHOT) || (HasExplosives && (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) ||
-                   CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_BOOMERANG)));});}}),
+                  Entrance(RR_FIRE_TEMPLE_LOOP_HAMMER_SWITCH, {[]{return Here(RR_FIRE_TEMPLE_LOOP_FLARE_DANCER, []{return logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_HOOKSHOT) || (logic->HasExplosives && (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) ||
+                   logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_BOOMERANG)));});}}),
   });
 
   areaTable[RR_FIRE_TEMPLE_LOOP_HAMMER_SWITCH] = Area("Fire Temple Loop Hammer Switch", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&FireLoopSwitch, {[]{return FireLoopSwitch || CanUse(RG_MEGATON_HAMMER);}}),
+                  EventAccess(&logic->FireLoopSwitch, {[]{return logic->FireLoopSwitch || logic->CanUse(RG_MEGATON_HAMMER);}}),
                 }, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_LOOP_FLARE_DANCER, {[]{return true;}}),
-                  Entrance(RR_FIRE_TEMPLE_LOOP_GORON_ROOM,   {[]{return FireLoopSwitch;}}),
+                  Entrance(RR_FIRE_TEMPLE_LOOP_GORON_ROOM,   {[]{return logic->FireLoopSwitch;}}),
   });
 
   areaTable[RR_FIRE_TEMPLE_LOOP_GORON_ROOM] = Area("Fire Temple Loop Goron Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -82,23 +80,23 @@ void AreaTable_Init_FireTemple() {
                   LocationAccess(RC_FIRE_TEMPLE_BOSS_KEY_CHEST, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(RR_FIRE_TEMPLE_LOOP_HAMMER_SWITCH, {[]{return FireLoopSwitch;}}),
-                  Entrance(RR_FIRE_TEMPLE_LOOP_EXIT,          {[]{return FireLoopSwitch;}}),
+                  Entrance(RR_FIRE_TEMPLE_LOOP_HAMMER_SWITCH, {[]{return logic->FireLoopSwitch;}}),
+                  Entrance(RR_FIRE_TEMPLE_LOOP_EXIT,          {[]{return logic->FireLoopSwitch;}}),
   });
 
   areaTable[RR_FIRE_TEMPLE_LOOP_EXIT] = Area("Fire Temple Loop Exit", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_FIRST_ROOM,      {[]{return true;}}),
-                  Entrance(RR_FIRE_TEMPLE_LOOP_GORON_ROOM, {[]{return FireLoopSwitch;}}),
+                  Entrance(RR_FIRE_TEMPLE_LOOP_GORON_ROOM, {[]{return logic->FireLoopSwitch;}}),
   });
 
   areaTable[RR_FIRE_TEMPLE_BIG_LAVA_ROOM] = Area("Fire Temple Big Lava Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_FIRE_TEMPLE_FIRST_ROOM,                {[]{return SmallKeys(RR_FIRE_TEMPLE, 2);}}),
+                  Entrance(RR_FIRE_TEMPLE_FIRST_ROOM,                {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 2);}}),
                   Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_GORON, {[]{return true;}}),
-                  Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_TILES, {[]{return IsAdult && (CanUse(RG_SONG_OF_TIME) || randoCtx->GetTrickOption(RT_FIRE_SOT));}}),
-                  Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM_SOUTH_GORON, {[]{return IsAdult && HasExplosives;}}),
-                  Entrance(RR_FIRE_TEMPLE_FIRE_PILLAR_ROOM,          {[]{return SmallKeys(RR_FIRE_TEMPLE, 3);}}),
+                  Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_TILES, {[]{return logic->IsAdult && (logic->CanUse(RG_SONG_OF_TIME) || randoCtx->GetTrickOption(RT_FIRE_SOT));}}),
+                  Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM_SOUTH_GORON, {[]{return logic->IsAdult && logic->HasExplosives;}}),
+                  Entrance(RR_FIRE_TEMPLE_FIRE_PILLAR_ROOM,          {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 3);}}),
   });
 
   areaTable[RR_FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_GORON] = Area("Fire Temple Big Lava Room North Goron", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -111,7 +109,7 @@ void AreaTable_Init_FireTemple() {
 
   areaTable[RR_FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_TILES] = Area("Fire Temple Big Lava Room North Tiles", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM, {[]{return CanAdultAttack || HookshotOrBoomerang;}}),
+                  LocationAccess(RC_FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM, {[]{return logic->CanAdultAttack || logic->HookshotOrBoomerang;}}),
                 }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM, {[]{return true;}}),
@@ -127,8 +125,8 @@ void AreaTable_Init_FireTemple() {
 
   areaTable[RR_FIRE_TEMPLE_FIRE_PILLAR_ROOM] = Area("Fire Temple Fire Pillar Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM, {[]{return SmallKeys(RR_FIRE_TEMPLE, 3);}}),
-                  Entrance(RR_FIRE_TEMPLE_SHORTCUT_ROOM, {[]{return FireTimer >= 56 && SmallKeys(RR_FIRE_TEMPLE, 4);}}),
+                  Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM, {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 3);}}),
+                  Entrance(RR_FIRE_TEMPLE_SHORTCUT_ROOM, {[]{return logic->FireTimer >= 56 && logic->SmallKeys(RR_FIRE_TEMPLE, 4);}}),
   });
 
   areaTable[RR_FIRE_TEMPLE_SHORTCUT_ROOM] = Area("Fire Temple Shortcut Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -136,9 +134,9 @@ void AreaTable_Init_FireTemple() {
                   LocationAccess(RC_FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST, {[]{return Here(RR_FIRE_TEMPLE_SHORTCUT_CLIMB, []{return true;});}}),
                 }, {
                   //Exits
-                  Entrance(RR_FIRE_TEMPLE_FIRE_PILLAR_ROOM,   {[]{return SmallKeys(RR_FIRE_TEMPLE, 4);}}),
+                  Entrance(RR_FIRE_TEMPLE_FIRE_PILLAR_ROOM,   {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 4);}}),
                   Entrance(RR_FIRE_TEMPLE_SHORTCUT_CLIMB,     {[]{return Here(RR_FIRE_TEMPLE_SHORTCUT_CLIMB, []{return true;});}}),
-                  Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER, {[]{return IsAdult && (GoronBracelet || randoCtx->GetTrickOption(RT_FIRE_STRENGTH)) && (HasExplosives || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_SLINGSHOT));}}),
+                  Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER, {[]{return logic->IsAdult && (logic->GoronBracelet || randoCtx->GetTrickOption(RT_FIRE_STRENGTH)) && (logic->HasExplosives || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_FAIRY_SLINGSHOT));}}),
   });
 
   areaTable[RR_FIRE_TEMPLE_SHORTCUT_CLIMB] = Area("Fire Temple Shortcut Climb", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
@@ -150,12 +148,12 @@ void AreaTable_Init_FireTemple() {
   areaTable[RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER] = Area("Fire Temple Boulder Maze Lower", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST, {[]{return true;}}),
-                  LocationAccess(RC_FIRE_TEMPLE_GS_BOULDER_MAZE,          {[]{return HasExplosives && (IsAdult || HookshotOrBoomerang);}}),
+                  LocationAccess(RC_FIRE_TEMPLE_GS_BOULDER_MAZE,          {[]{return logic->HasExplosives && (logic->IsAdult || logic->HookshotOrBoomerang);}}),
                 }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_SHORTCUT_ROOM,                {[]{return true;}}),
                   Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER_SIDE_ROOM, {[]{return true;}}),
-                  Entrance(RR_FIRE_TEMPLE_EAST_CENTRAL_ROOM,            {[]{return SmallKeys(RR_FIRE_TEMPLE, 5, 7);}}),
+                  Entrance(RR_FIRE_TEMPLE_EAST_CENTRAL_ROOM,            {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 5, 7);}}),
                   Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_UPPER,           {[]{return false;}}),
   });
 
@@ -169,18 +167,18 @@ void AreaTable_Init_FireTemple() {
 
   areaTable[RR_FIRE_TEMPLE_EAST_CENTRAL_ROOM] = Area("Fire Temple East Central Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM,      {[]{return CanTakeDamage;}}),
-                  Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER, {[]{return SmallKeys(RR_FIRE_TEMPLE, 5, 8);}}),
-                  Entrance(RR_FIRE_TEMPLE_FIRE_WALL_CHASE,    {[]{return SmallKeys(RR_FIRE_TEMPLE, 6, 8);}}),
-                  Entrance(RR_FIRE_TEMPLE_MAP_AREA,           {[]{return CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW);}}),
+                  Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM,      {[]{return logic->CanTakeDamage;}}),
+                  Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER, {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 5, 8);}}),
+                  Entrance(RR_FIRE_TEMPLE_FIRE_WALL_CHASE,    {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 6, 8);}}),
+                  Entrance(RR_FIRE_TEMPLE_MAP_AREA,           {[]{return logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW);}}),
   });
 
   areaTable[RR_FIRE_TEMPLE_FIRE_WALL_CHASE] = Area("Fire Temple Fire Wall Chase", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_FIRE_TEMPLE_EAST_CENTRAL_ROOM,  {[]{return FireTimer >= 24 && SmallKeys(RR_FIRE_TEMPLE, 6, 8);}}),
-                  Entrance(RR_FIRE_TEMPLE_MAP_AREA,           {[]{return IsAdult;}}),
-                  Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_UPPER, {[]{return FireTimer >= 24 && IsAdult;}}),
-                  Entrance(RR_FIRE_TEMPLE_CORRIDOR,           {[]{return FireTimer >= 24 && IsAdult && SmallKeys(RR_FIRE_TEMPLE, 7);}}),
+                  Entrance(RR_FIRE_TEMPLE_EAST_CENTRAL_ROOM,  {[]{return logic->FireTimer >= 24 && logic->SmallKeys(RR_FIRE_TEMPLE, 6, 8);}}),
+                  Entrance(RR_FIRE_TEMPLE_MAP_AREA,           {[]{return logic->IsAdult;}}),
+                  Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_UPPER, {[]{return logic->FireTimer >= 24 && logic->IsAdult;}}),
+                  Entrance(RR_FIRE_TEMPLE_CORRIDOR,           {[]{return logic->FireTimer >= 24 && logic->IsAdult && logic->SmallKeys(RR_FIRE_TEMPLE, 7);}}),
   });
 
   areaTable[RR_FIRE_TEMPLE_MAP_AREA] = Area("Fire Temple Map Area", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -196,15 +194,15 @@ void AreaTable_Init_FireTemple() {
                   LocationAccess(RC_FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(RR_FIRE_TEMPLE_SHORTCUT_CLIMB,     {[]{return HasExplosives;}}),
+                  Entrance(RR_FIRE_TEMPLE_SHORTCUT_CLIMB,     {[]{return logic->HasExplosives;}}),
                   Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER, {[]{return true;}}),
                   Entrance(RR_FIRE_TEMPLE_FIRE_WALL_CHASE,    {[]{return true;}}),
-                  Entrance(RR_FIRE_TEMPLE_SCARECROW_ROOM,     {[]{return CanUse(RG_SCARECROW) || (randoCtx->GetTrickOption(RT_FIRE_SCARECROW) && IsAdult && CanUse(RG_LONGSHOT));}}),
+                  Entrance(RR_FIRE_TEMPLE_SCARECROW_ROOM,     {[]{return logic->CanUse(RG_SCARECROW) || (randoCtx->GetTrickOption(RT_FIRE_SCARECROW) && logic->IsAdult && logic->CanUse(RG_LONGSHOT));}}),
   });
 
   areaTable[RR_FIRE_TEMPLE_SCARECROW_ROOM] = Area("Fire Temple Scarecrow Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FIRE_TEMPLE_GS_SCARECROW_CLIMB, {[]{return CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOOMERANG) || HasExplosives || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_DINS_FIRE);}}),
+                  LocationAccess(RC_FIRE_TEMPLE_GS_SCARECROW_CLIMB, {[]{return logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG) || logic->HasExplosives || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_DINS_FIRE);}}),
                 }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_UPPER, {[]{return true;}}),
@@ -214,33 +212,33 @@ void AreaTable_Init_FireTemple() {
   areaTable[RR_FIRE_TEMPLE_EAST_PEAK] = Area("Fire Temple East Peak", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_FIRE_TEMPLE_SCARECROW_CHEST,  {[]{return true;}}),
-                  LocationAccess(RC_FIRE_TEMPLE_GS_SCARECROW_TOP, {[]{return CanUseProjectile;}}),
+                  LocationAccess(RC_FIRE_TEMPLE_GS_SCARECROW_TOP, {[]{return logic->CanUseProjectile;}}),
                 }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_SCARECROW_ROOM,    {[]{return true;}}),
-                  Entrance(RR_FIRE_TEMPLE_EAST_CENTRAL_ROOM, {[]{return CanTakeDamage;}}),
+                  Entrance(RR_FIRE_TEMPLE_EAST_CENTRAL_ROOM, {[]{return logic->CanTakeDamage;}}),
   });
 
   areaTable[RR_FIRE_TEMPLE_CORRIDOR] = Area("Fire Temple Corridor", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_FIRE_TEMPLE_FIRE_WALL_CHASE, {[]{return SmallKeys(RR_FIRE_TEMPLE, 7);}}),
+                  Entrance(RR_FIRE_TEMPLE_FIRE_WALL_CHASE, {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 7);}}),
                   Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_ROOM,  {[]{return true;}}),
   });
 
   areaTable[RR_FIRE_TEMPLE_FIRE_MAZE_ROOM] = Area("Fire Temple Fire Maze Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_CORRIDOR,            {[]{return true;}}),
-                  Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_UPPER,     {[]{return CanUse(RG_HOVER_BOOTS);}}),
+                  Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_UPPER,     {[]{return logic->CanUse(RG_HOVER_BOOTS);}}),
                   Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_SIDE_ROOM, {[]{return true;}}),
-                  Entrance(RR_FIRE_TEMPLE_WEST_CENTRAL_LOWER,  {[]{return SmallKeys(RR_FIRE_TEMPLE, 8);}}),
+                  Entrance(RR_FIRE_TEMPLE_WEST_CENTRAL_LOWER,  {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 8);}}),
                   Entrance(RR_FIRE_TEMPLE_LATE_FIRE_MAZE,      {[]{return randoCtx->GetTrickOption(RT_FIRE_FLAME_MAZE) || false;}}),
   });
 
   areaTable[RR_FIRE_TEMPLE_FIRE_MAZE_UPPER] = Area("Fire Temple Fire Maze Upper", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_FIRE_TEMPLE_NEAR_BOSS_ROOM,     {[]{return CanUse(RG_MEGATON_HAMMER);}}),
+                  Entrance(RR_FIRE_TEMPLE_NEAR_BOSS_ROOM,     {[]{return logic->CanUse(RG_MEGATON_HAMMER);}}),
                   Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_ROOM,     {[]{return true;}}),
-                  Entrance(RR_FIRE_TEMPLE_WEST_CENTRAL_UPPER, {[]{return CanUse(RG_MEGATON_HAMMER);}}),
+                  Entrance(RR_FIRE_TEMPLE_WEST_CENTRAL_UPPER, {[]{return logic->CanUse(RG_MEGATON_HAMMER);}}),
   });
 
   areaTable[RR_FIRE_TEMPLE_FIRE_MAZE_SIDE_ROOM] = Area("Fire Temple Fire Maze Side Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -253,11 +251,11 @@ void AreaTable_Init_FireTemple() {
 
   areaTable[RR_FIRE_TEMPLE_WEST_CENTRAL_LOWER] = Area("Fire Temple West Central Lower", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FIRE_TEMPLE_HIGHEST_GORON_CHEST, {[]{return Here(RR_FIRE_TEMPLE_WEST_CENTRAL_UPPER, []{return (CanUse(RG_SONG_OF_TIME) || randoCtx->GetTrickOption(RT_RUSTED_SWITCHES)) && CanUse(RG_MEGATON_HAMMER);});}}),
+                  LocationAccess(RC_FIRE_TEMPLE_HIGHEST_GORON_CHEST, {[]{return Here(RR_FIRE_TEMPLE_WEST_CENTRAL_UPPER, []{return (logic->CanUse(RG_SONG_OF_TIME) || randoCtx->GetTrickOption(RT_RUSTED_SWITCHES)) && logic->CanUse(RG_MEGATON_HAMMER);});}}),
                 }, {
                   //Exits
-                  Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_ROOM,     {[]{return SmallKeys(RR_FIRE_TEMPLE, 8);}}),
-                  Entrance(RR_FIRE_TEMPLE_WEST_CENTRAL_UPPER, {[]{return IsAdult && CanUse(RG_SONG_OF_TIME);}}),
+                  Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_ROOM,     {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 8);}}),
+                  Entrance(RR_FIRE_TEMPLE_WEST_CENTRAL_UPPER, {[]{return logic->IsAdult && logic->CanUse(RG_SONG_OF_TIME);}}),
                   Entrance(RR_FIRE_TEMPLE_LATE_FIRE_MAZE,     {[]{return true;}}),
   });
 
@@ -272,21 +270,21 @@ void AreaTable_Init_FireTemple() {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_ROOM,     {[]{return false;}}),
                   Entrance(RR_FIRE_TEMPLE_WEST_CENTRAL_LOWER, {[]{return true;}}),
-                  Entrance(RR_FIRE_TEMPLE_UPPER_FLARE_DANCER, {[]{return HasExplosives;}}),
+                  Entrance(RR_FIRE_TEMPLE_UPPER_FLARE_DANCER, {[]{return logic->HasExplosives;}}),
   });
 
   areaTable[RR_FIRE_TEMPLE_UPPER_FLARE_DANCER] = Area("Fire Temple Upper Flare Dancer", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_FIRE_TEMPLE_LATE_FIRE_MAZE, {[]{return Here(RR_FIRE_TEMPLE_UPPER_FLARE_DANCER, []{return CanUse(RG_MEGATON_HAMMER) || CanUse(RG_HOOKSHOT) || (HasExplosives && ((CanUse(RG_KOKIRI_SWORD)) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) ||
-                   CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_BOOMERANG)));});}}),
-                  Entrance(RR_FIRE_TEMPLE_WEST_CLIMB,     {[]{return Here(RR_FIRE_TEMPLE_UPPER_FLARE_DANCER, []{return CanUse(RG_MEGATON_HAMMER) || CanUse(RG_HOOKSHOT) || (HasExplosives && ((CanUse(RG_KOKIRI_SWORD)) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) ||
-                   CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOOMERANG)));});}}),
+                  Entrance(RR_FIRE_TEMPLE_LATE_FIRE_MAZE, {[]{return Here(RR_FIRE_TEMPLE_UPPER_FLARE_DANCER, []{return logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_HOOKSHOT) || (logic->HasExplosives && ((logic->CanUse(RG_KOKIRI_SWORD)) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) ||
+                   logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_BOOMERANG)));});}}),
+                  Entrance(RR_FIRE_TEMPLE_WEST_CLIMB,     {[]{return Here(RR_FIRE_TEMPLE_UPPER_FLARE_DANCER, []{return logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_HOOKSHOT) || (logic->HasExplosives && ((logic->CanUse(RG_KOKIRI_SWORD)) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) ||
+                   logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG)));});}}),
   });
 
   areaTable[RR_FIRE_TEMPLE_WEST_CLIMB] = Area("Fire Temple West Climb", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_UPPER_FLARE_DANCER, {[]{return true;}}),
-                  Entrance(RR_FIRE_TEMPLE_WEST_PEAK,          {[]{return CanUseProjectile;}}),
+                  Entrance(RR_FIRE_TEMPLE_WEST_PEAK,          {[]{return logic->CanUseProjectile;}}),
   });
 
   areaTable[RR_FIRE_TEMPLE_WEST_PEAK] = Area("Fire Temple West Peak", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -294,20 +292,20 @@ void AreaTable_Init_FireTemple() {
                   LocationAccess(RC_FIRE_TEMPLE_MEGATON_HAMMER_CHEST, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(RR_FIRE_TEMPLE_WEST_CENTRAL_UPPER, {[]{return CanTakeDamage;}}),
+                  Entrance(RR_FIRE_TEMPLE_WEST_CENTRAL_UPPER, {[]{return logic->CanTakeDamage;}}),
                   Entrance(RR_FIRE_TEMPLE_WEST_CLIMB,         {[]{return true;}}),
-                  Entrance(RR_FIRE_TEMPLE_HAMMER_RETURN_PATH, {[]{return CanUse(RG_MEGATON_HAMMER);}}),
+                  Entrance(RR_FIRE_TEMPLE_HAMMER_RETURN_PATH, {[]{return logic->CanUse(RG_MEGATON_HAMMER);}}),
   });
 
   areaTable[RR_FIRE_TEMPLE_HAMMER_RETURN_PATH] = Area("Fire Temple Hammer Return Path", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_FIRE_TEMPLE_ABOVE_FIRE_MAZE, {[]{return CanUse(RG_MEGATON_HAMMER);}}),
+                  Entrance(RR_FIRE_TEMPLE_ABOVE_FIRE_MAZE, {[]{return logic->CanUse(RG_MEGATON_HAMMER);}}),
   });
 
   areaTable[RR_FIRE_TEMPLE_ABOVE_FIRE_MAZE] = Area("Fire Temple Above Fire Maze", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_HAMMER_RETURN_PATH, {[]{return true;}}),
-                  Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_UPPER,    {[]{return CanUse(RG_MEGATON_HAMMER);}}),
+                  Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_UPPER,    {[]{return logic->CanUse(RG_MEGATON_HAMMER);}}),
   });
   }
 
@@ -317,79 +315,79 @@ void AreaTable_Init_FireTemple() {
   if (randoCtx->GetDungeon(FIRE_TEMPLE)->IsMQ()) {
   areaTable[RR_FIRE_TEMPLE_MQ_LOWER] = Area("Fire Temple MQ Lower", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST, {[]{return CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || Bombs || CanUse(RG_DINS_FIRE);}}),
-                  LocationAccess(RC_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST,     {[]{return IsAdult && (randoCtx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS) || CanUse(RG_GORON_TUNIC)) && (((CanUse(RG_HOVER_BOOTS) || (randoCtx->GetTrickOption(RT_FIRE_MQ_NEAR_BOSS) && CanUse(RG_FAIRY_BOW))) && HasFireSource) || (CanUse(RG_HOOKSHOT) && CanUse(RG_FIRE_ARROWS) || (CanUse(RG_DINS_FIRE) && ((randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_OHKO) && randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_QUADRUPLE) && randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_OCTUPLE) && randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_SEXDECUPLE)) || CanUse(RG_GORON_TUNIC) || CanUse(RG_FAIRY_BOW) || CanUse(RG_LONGSHOT)))));}}),
-                    //Trick: IsAdult && (LogicFewerTunicRequirements || CanUse(RG_GORON_TUNIC)) && (((CanUse(RG_HOVER_BOOTS) || (LogicFireMQNearBoss && CanUse(RG_FAIRY_BOW))) && HasFireSource) || (CanUse(RG_HOOKSHOT) && CanUse(RG_FIRE_ARROWS) || (CanUse(RG_DINS_FIRE) && ((DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_QUADRUPLE) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OCTUPLE) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_SEXDECUPLE)) || CanUse(RG_GORON_TUNIC) || CanUse(RG_FAIRY_BOW) || CanUse(RG_LONGSHOT)))))
+                  LocationAccess(RC_FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST, {[]{return logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->Bombs || logic->CanUse(RG_DINS_FIRE);}}),
+                  LocationAccess(RC_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST,     {[]{return logic->IsAdult && (randoCtx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS) || logic->CanUse(RG_GORON_TUNIC)) && (((logic->CanUse(RG_HOVER_BOOTS) || (randoCtx->GetTrickOption(RT_FIRE_MQ_NEAR_BOSS) && logic->CanUse(RG_FAIRY_BOW))) && logic->HasFireSource) || (logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_FIRE_ARROWS) || (logic->CanUse(RG_DINS_FIRE) && ((randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_OHKO) && randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_QUADRUPLE) && randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_OCTUPLE) && randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_SEXDECUPLE)) || logic->CanUse(RG_GORON_TUNIC) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_LONGSHOT)))));}}),
+                    //Trick: logic->IsAdult && (LogicFewerTunicRequirements || logic->CanUse(RG_GORON_TUNIC)) && (((logic->CanUse(RG_HOVER_BOOTS) || (LogicFireMQNearBoss && logic->CanUse(RG_FAIRY_BOW))) && logic->HasFireSource) || (logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_FIRE_ARROWS) || (logic->CanUse(RG_DINS_FIRE) && ((DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_QUADRUPLE) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OCTUPLE) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_SEXDECUPLE)) || logic->CanUse(RG_GORON_TUNIC) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_LONGSHOT)))))
   }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_ENTRYWAY,             {[]{return true;}}),
-                  Entrance(RR_FIRE_TEMPLE_BOSS_ENTRYWAY,        {[]{return IsAdult && CanUse(RG_GORON_TUNIC) && CanUse(RG_MEGATON_HAMMER) && BossKeyFireTemple && ((HasFireSource && (randoCtx->GetTrickOption(RT_FIRE_BOSS_DOOR_JUMP) || HoverBoots)) || HasAccessTo(RR_FIRE_TEMPLE_MQ_UPPER));}}),
-                  Entrance(RR_FIRE_TEMPLE_MQ_LOWER_LOCKED_DOOR, {[]{return SmallKeys(RR_FIRE_TEMPLE, 5) && (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD));}}),
-                  Entrance(RR_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM,     {[]{return IsAdult && FireTimer >= 24 && CanUse(RG_MEGATON_HAMMER);}}),
+                  Entrance(RR_FIRE_TEMPLE_BOSS_ENTRYWAY,        {[]{return logic->IsAdult && logic->CanUse(RG_GORON_TUNIC) && logic->CanUse(RG_MEGATON_HAMMER) && logic->BossKeyFireTemple && ((logic->HasFireSource && (randoCtx->GetTrickOption(RT_FIRE_BOSS_DOOR_JUMP) || logic->HoverBoots)) || HasAccessTo(RR_FIRE_TEMPLE_MQ_UPPER));}}),
+                  Entrance(RR_FIRE_TEMPLE_MQ_LOWER_LOCKED_DOOR, {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 5) && (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD));}}),
+                  Entrance(RR_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM,     {[]{return logic->IsAdult && logic->FireTimer >= 24 && logic->CanUse(RG_MEGATON_HAMMER);}}),
   });
 
   areaTable[RR_FIRE_TEMPLE_MQ_LOWER_LOCKED_DOOR] = Area("Fire Temple MQ Lower Locked Door", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&FairyPot, {[]{return true;}}),
+                  EventAccess(&logic->FairyPot, {[]{return true;}}),
   }, {
                   //Locations
-                  LocationAccess(RC_FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST, {[]{return IsAdult && (CanUse(RG_MEGATON_HAMMER) || CanUse(RG_HOOKSHOT) || (HasExplosives && (CanUse(RG_MASTER_SWORD) || CanUse(RG_KOKIRI_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOOMERANG))));}}),
-                  LocationAccess(RC_FIRE_TEMPLE_MQ_MAP_CHEST,            {[]{return IsAdult && CanUse(RG_MEGATON_HAMMER);}}),
+                  LocationAccess(RC_FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST, {[]{return logic->IsAdult && (logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_HOOKSHOT) || (logic->HasExplosives && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG))));}}),
+                  LocationAccess(RC_FIRE_TEMPLE_MQ_MAP_CHEST,            {[]{return logic->IsAdult && logic->CanUse(RG_MEGATON_HAMMER);}}),
   }, {});
 
   areaTable[RR_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM] = Area("Fire Temple MQ Big Lava Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&FairyPot, {[]{return FairyPot || (HasFireSource && (Bow || randoCtx->GetTrickOption(RT_FIRE_MQ_BK_CHEST)) && IsAdult && (CanUse(RG_HOOKSHOT) || randoCtx->GetTrickOption(RT_FIRE_SOT)));}}),
-                    //Trick: HasFireSource && (Bow || LogicFireMQBKChest) && IsAdult && (CanUse(RG_HOOKSHOT) || LogicFireSongOfTime)
+                  EventAccess(&logic->FairyPot, {[]{return logic->FairyPot || (logic->HasFireSource && (logic->Bow || randoCtx->GetTrickOption(RT_FIRE_MQ_BK_CHEST)) && logic->IsAdult && (logic->CanUse(RG_HOOKSHOT) || randoCtx->GetTrickOption(RT_FIRE_SOT)));}}),
+                    //Trick: logic->HasFireSource && (logic->Bow || LogicFireMQBKChest) && logic->IsAdult && (logic->CanUse(RG_HOOKSHOT) || LogicFireSongOfTime)
   }, {
                   //Locations
-                  LocationAccess(RC_FIRE_TEMPLE_MQ_BOSS_KEY_CHEST,                   {[]{return HasFireSource && (Bow || randoCtx->GetTrickOption(RT_FIRE_MQ_BK_CHEST)) && IsAdult && CanUse(RG_HOOKSHOT);}}),
-                    //Trick: HasFireSource && (Bow || LogicFireMQBKChest) && IsAdult && CanUse(RG_HOOKSHOT)
-                  LocationAccess(RC_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST, {[]{return HasFireSource && HasExplosives && IsAdult && (CanUse(RG_HOOKSHOT) || randoCtx->GetTrickOption(RT_FIRE_MQ_BLOCKED_CHEST));}}),
-                    //Trick: HasFireSource && HasExplosives && IsAdult && (CanUse(RG_HOOKSHOT) || LogicFireMQBlockedChest)
+                  LocationAccess(RC_FIRE_TEMPLE_MQ_BOSS_KEY_CHEST,                   {[]{return logic->HasFireSource && (logic->Bow || randoCtx->GetTrickOption(RT_FIRE_MQ_BK_CHEST)) && logic->IsAdult && logic->CanUse(RG_HOOKSHOT);}}),
+                    //Trick: logic->HasFireSource && (logic->Bow || LogicFireMQBKChest) && logic->IsAdult && logic->CanUse(RG_HOOKSHOT)
+                  LocationAccess(RC_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST, {[]{return logic->HasFireSource && logic->HasExplosives && logic->IsAdult && (logic->CanUse(RG_HOOKSHOT) || randoCtx->GetTrickOption(RT_FIRE_MQ_BLOCKED_CHEST));}}),
+                    //Trick: logic->HasFireSource && logic->HasExplosives && logic->IsAdult && (logic->CanUse(RG_HOOKSHOT) || LogicFireMQBlockedChest)
                   LocationAccess(RC_FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR,       {[]{return true;}}),
   }, {
                   //Exits
-                  Entrance(RR_FIRE_TEMPLE_MQ_LOWER_MAZE, {[]{return IsAdult && CanUse(RG_GORON_TUNIC) && SmallKeys(RR_FIRE_TEMPLE, 2) && (HasFireSource || (randoCtx->GetTrickOption(RT_FIRE_MQ_CLIMB) && HoverBoots));}}),
-                    //Trick: IsAdult && CanUse(RG_GORON_TUNIC) && SmallKeys(RR_FIRE_TEMPLE, 2) && (HasFireSource || (LogicFireMQClimb && HoverBoots))
+                  Entrance(RR_FIRE_TEMPLE_MQ_LOWER_MAZE, {[]{return logic->IsAdult && logic->CanUse(RG_GORON_TUNIC) && logic->SmallKeys(RR_FIRE_TEMPLE, 2) && (logic->HasFireSource || (randoCtx->GetTrickOption(RT_FIRE_MQ_CLIMB) && logic->HoverBoots));}}),
+                    //Trick: logic->IsAdult && logic->CanUse(RG_GORON_TUNIC) && logic->SmallKeys(RR_FIRE_TEMPLE, 2) && (logic->HasFireSource || (LogicFireMQClimb && logic->HoverBoots))
   });
 
   areaTable[RR_FIRE_TEMPLE_MQ_LOWER_MAZE] = Area("Fire Temple MQ Lower Maze", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST,     {[]{return CanUse(RG_MASTER_SWORD) || CanUse(RG_KOKIRI_SWORD) || CanUse(RG_BIGGORON_SWORD);}}),
-                  LocationAccess(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST, {[]{return HasExplosives && (randoCtx->GetTrickOption(RT_FIRE_MQ_MAZE_SIDE_ROOM) || HasAccessTo(RR_FIRE_TEMPLE_MQ_UPPER_MAZE));}}),
-                    //Trick: HasExplosives && (LogicFireMQMazeSideRoom || FIRE_TEMPLE_MQ_UPPER_MAZE.Adult())
+                  LocationAccess(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST,     {[]{return logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BIGGORON_SWORD);}}),
+                  LocationAccess(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST, {[]{return logic->HasExplosives && (randoCtx->GetTrickOption(RT_FIRE_MQ_MAZE_SIDE_ROOM) || HasAccessTo(RR_FIRE_TEMPLE_MQ_UPPER_MAZE));}}),
+                    //Trick: logic->HasExplosives && (LogicFireMQMazeSideRoom || FIRE_TEMPLE_MQ_UPPER_MAZE.Adult())
    }, {
                   //Exits
-                  Entrance(RR_FIRE_TEMPLE_MQ_UPPER_MAZE, {[]{return (IsAdult && ((HasExplosives && CanUse(RG_HOOKSHOT)) || (randoCtx->GetTrickOption(RT_FIRE_MQ_MAZE_HOVERS) && CanUse(RG_HOVER_BOOTS)))) || randoCtx->GetTrickOption(RT_FIRE_MQ_MAZE_JUMP);}}),
-                    //Trick: (IsAdult && ((HasExplosives && CanUse(RG_HOOKSHOT)) || (LogicFireMQMazeHovers && CanUse(RG_HOVER_BOOTS)))) || LogicFireMQMazeJump
+                  Entrance(RR_FIRE_TEMPLE_MQ_UPPER_MAZE, {[]{return (logic->IsAdult && ((logic->HasExplosives && logic->CanUse(RG_HOOKSHOT)) || (randoCtx->GetTrickOption(RT_FIRE_MQ_MAZE_HOVERS) && logic->CanUse(RG_HOVER_BOOTS)))) || randoCtx->GetTrickOption(RT_FIRE_MQ_MAZE_JUMP);}}),
+                    //Trick: (logic->IsAdult && ((logic->HasExplosives && logic->CanUse(RG_HOOKSHOT)) || (LogicFireMQMazeHovers && logic->CanUse(RG_HOVER_BOOTS)))) || LogicFireMQMazeJump
   });
 
   areaTable[RR_FIRE_TEMPLE_MQ_UPPER_MAZE] = Area("Fire Temple MQ Upper Maze", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  //EventAccess(&WallFairy, {[]{return WallFairy || (IsAdult && (((CanUse(RG_SONG_OF_TIME) && CanUse(RG_HOOKSHOT) && HasExplosives) || CanUse(RG_LONGSHOT))));}}),
-                  EventAccess(&FairyPot,  {[]{return SmallKeys(RR_FIRE_TEMPLE, 3);}}),
+                  //EventAccess(&WallFairy, {[]{return WallFairy || (logic->IsAdult && (((logic->CanUse(RG_SONG_OF_TIME) && logic->CanUse(RG_HOOKSHOT) && logic->HasExplosives) || logic->CanUse(RG_LONGSHOT))));}}),
+                  EventAccess(&logic->FairyPot,  {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 3);}}),
   }, {
                   //Locations
                   LocationAccess(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST, {[]{return true;}}),
-                  LocationAccess(RC_FIRE_TEMPLE_MQ_COMPASS_CHEST,             {[]{return HasExplosives;}}),
-                  LocationAccess(RC_FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE,          {[]{return IsAdult && ((CanUse(RG_SONG_OF_TIME) && CanUse(RG_HOOKSHOT) && HasExplosives) || CanUse(RG_LONGSHOT));}}),
+                  LocationAccess(RC_FIRE_TEMPLE_MQ_COMPASS_CHEST,             {[]{return logic->HasExplosives;}}),
+                  LocationAccess(RC_FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE,          {[]{return logic->IsAdult && ((logic->CanUse(RG_SONG_OF_TIME) && logic->CanUse(RG_HOOKSHOT) && logic->HasExplosives) || logic->CanUse(RG_LONGSHOT));}}),
   }, {
                   //Exits
-                  Entrance(RR_FIRE_TEMPLE_MQ_UPPER, {[]{return SmallKeys(RR_FIRE_TEMPLE, 3) && IsAdult && ((CanUse(RG_FAIRY_BOW) && CanUse(RG_HOOKSHOT)) || CanUse(RG_FIRE_ARROWS));}}),
+                  Entrance(RR_FIRE_TEMPLE_MQ_UPPER, {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 3) && logic->IsAdult && ((logic->CanUse(RG_FAIRY_BOW) && logic->CanUse(RG_HOOKSHOT)) || logic->CanUse(RG_FIRE_ARROWS));}}),
   });
 
   areaTable[RR_FIRE_TEMPLE_MQ_UPPER] = Area("Fire Temple MQ Upper", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FIRE_TEMPLE_MQ_FREESTANDING_KEY,            {[]{return ((CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOOMERANG)) && CanUse(RG_HOOKSHOT)) || randoCtx->GetTrickOption(RT_FIRE_MQ_FLAME_MAZE);}}),
-                    //Trick: (IsAdult && CanUse(RG_HOOKSHOT)) || LogicFireMQFlameMaze
-                  LocationAccess(RC_FIRE_TEMPLE_MQ_CHEST_ON_FIRE,               {[]{return ((IsAdult && CanUse(RG_HOOKSHOT)) || randoCtx->GetTrickOption(RT_FIRE_MQ_FLAME_MAZE)) && SmallKeys(RR_FIRE_TEMPLE, 4);}}),
-                    //Trick: ((IsAdult && CanUse(RG_HOOKSHOT)) || LogicFireMQFlameMaze) && SmallKeys(RR_FIRE_TEMPLE, 4)
-                  LocationAccess(RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM, {[]{return CanUse(RG_SONG_OF_TIME) || HoverBoots || randoCtx->GetTrickOption(RT_FIRE_MQ_FLAME_MAZE);}}),
-                    //Trick: CanUse(RG_SONG_OF_TIME) || HoverBoots || LogicFireMQFlameMaze
-                  LocationAccess(RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER,    {[]{return HasExplosives;}}),
-                  LocationAccess(RC_FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE,     {[]{return (IsAdult && CanUse(RG_HOOKSHOT) && SmallKeys(RR_FIRE_TEMPLE, 5)) || (randoCtx->GetTrickOption(RT_FIRE_MQ_ABOVE_MAZE_GS) && IsAdult && CanUse(RG_LONGSHOT));}}),
-                    //Trick: (IsAdult && CanUse(RG_HOOKSHOT) && SmallKeys(RR_FIRE_TEMPLE, 5)) || (LogicFireMQAboveMazeGS && IsAdult && CanUse(RG_LONGSHOT))
+                  LocationAccess(RC_FIRE_TEMPLE_MQ_FREESTANDING_KEY,            {[]{return ((logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG)) && logic->CanUse(RG_HOOKSHOT)) || randoCtx->GetTrickOption(RT_FIRE_MQ_FLAME_MAZE);}}),
+                    //Trick: (logic->IsAdult && logic->CanUse(RG_HOOKSHOT)) || LogicFireMQFlameMaze
+                  LocationAccess(RC_FIRE_TEMPLE_MQ_CHEST_ON_FIRE,               {[]{return ((logic->IsAdult && logic->CanUse(RG_HOOKSHOT)) || randoCtx->GetTrickOption(RT_FIRE_MQ_FLAME_MAZE)) && logic->SmallKeys(RR_FIRE_TEMPLE, 4);}}),
+                    //Trick: ((logic->IsAdult && logic->CanUse(RG_HOOKSHOT)) || LogicFireMQFlameMaze) && logic->SmallKeys(RR_FIRE_TEMPLE, 4)
+                  LocationAccess(RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM, {[]{return logic->CanUse(RG_SONG_OF_TIME) || logic->HoverBoots || randoCtx->GetTrickOption(RT_FIRE_MQ_FLAME_MAZE);}}),
+                    //Trick: logic->CanUse(RG_SONG_OF_TIME) || logic->HoverBoots || LogicFireMQFlameMaze
+                  LocationAccess(RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER,    {[]{return logic->HasExplosives;}}),
+                  LocationAccess(RC_FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE,     {[]{return (logic->IsAdult && logic->CanUse(RG_HOOKSHOT) && logic->SmallKeys(RR_FIRE_TEMPLE, 5)) || (randoCtx->GetTrickOption(RT_FIRE_MQ_ABOVE_MAZE_GS) && logic->IsAdult && logic->CanUse(RG_LONGSHOT));}}),
+                    //Trick: (logic->IsAdult && logic->CanUse(RG_HOOKSHOT) && logic->SmallKeys(RR_FIRE_TEMPLE, 5)) || (LogicFireMQAboveMazeGS && logic->IsAdult && logic->CanUse(RG_LONGSHOT))
   }, {});
   }
 
@@ -409,13 +407,13 @@ void AreaTable_Init_FireTemple() {
         Area("Fire Temple Boss Room", "Fire Temple", RA_NONE, NO_DAY_NIGHT_CYCLE,
              {
                  // Events
-                 EventAccess(&FireTempleClear,
-                             { [] { return FireTempleClear || (HasBossSoul(RG_VOLVAGIA_SOUL) && (FireTimer >= 64 && CanUse(RG_MEGATON_HAMMER))); }}),
+                 EventAccess(&logic->FireTempleClear,
+                             { [] { return logic->FireTempleClear || (logic->HasBossSoul(RG_VOLVAGIA_SOUL) && (logic->FireTimer >= 64 && logic->CanUse(RG_MEGATON_HAMMER))); }}),
              },
              {
                  // Locations
-                 LocationAccess(RC_FIRE_TEMPLE_VOLVAGIA_HEART, { [] { return FireTempleClear; } }),
-                 LocationAccess(RC_VOLVAGIA, { [] { return FireTempleClear; } }),
+                 LocationAccess(RC_FIRE_TEMPLE_VOLVAGIA_HEART, { [] { return logic->FireTempleClear; } }),
+                 LocationAccess(RC_VOLVAGIA, { [] { return logic->FireTempleClear; } }),
              },
              {
                  // Exits
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp
index 98022ed82..1e464357f 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp
@@ -1,9 +1,7 @@
 #include "../location_access.hpp"
-#include "../logic.hpp"
 #include "../../entrance.h"
 #include "../../dungeon.h"
 
-using namespace Logic;
 using namespace Rando;
 
 void AreaTable_Init_ForestTemple() {
@@ -24,7 +22,7 @@ void AreaTable_Init_ForestTemple() {
   areaTable[RR_FOREST_TEMPLE_FIRST_ROOM] = Area("Forest Temple First Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_FOREST_TEMPLE_FIRST_ROOM_CHEST, {[]{return true;}}),
-                  LocationAccess(RC_FOREST_TEMPLE_GS_FIRST_ROOM,    {[]{return (IsAdult && Bombs) || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_BOOMERANG) || CanUse(RG_FAIRY_SLINGSHOT) || HasBombchus || CanUse(RG_DINS_FIRE) || (randoCtx->GetTrickOption(RT_FOREST_FIRST_GS) && (CanJumpslash || (IsChild && Bombs)));}}),
+                  LocationAccess(RC_FOREST_TEMPLE_GS_FIRST_ROOM,    {[]{return (logic->IsAdult && logic->Bombs) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_BOOMERANG) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->HasBombchus || logic->CanUse(RG_DINS_FIRE) || (randoCtx->GetTrickOption(RT_FOREST_FIRST_GS) && (logic->CanJumpslash || (logic->IsChild && logic->Bombs)));}}),
                 }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_ENTRYWAY,       {[]{return true;}}),
@@ -34,24 +32,24 @@ void AreaTable_Init_ForestTemple() {
   areaTable[RR_FOREST_TEMPLE_SOUTH_CORRIDOR] = Area("Forest Temple South Corridor", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_FIRST_ROOM, {[]{return true;}}),
-                  Entrance(RR_FOREST_TEMPLE_LOBBY,      {[]{return CanAdultAttack || CanChildAttack || Nuts;}}),
+                  Entrance(RR_FOREST_TEMPLE_LOBBY,      {[]{return logic->CanAdultAttack || logic->CanChildAttack || logic->Nuts;}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_LOBBY] = Area("Forest Temple Lobby", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&ForestTempleMeg, {[]{return ForestTempleMeg || (ForestTempleJoelle && ForestTempleBeth && ForestTempleAmy && CanUse(RG_FAIRY_BOW));}}),
+                  EventAccess(&logic->ForestTempleMeg, {[]{return logic->ForestTempleMeg || (logic->ForestTempleJoelle && logic->ForestTempleBeth && logic->ForestTempleAmy && logic->CanUse(RG_FAIRY_BOW));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_FOREST_TEMPLE_GS_LOBBY, {[]{return HookshotOrBoomerang;}}),
+                  LocationAccess(RC_FOREST_TEMPLE_GS_LOBBY, {[]{return logic->HookshotOrBoomerang;}}),
                 }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_SOUTH_CORRIDOR,    {[]{return true;}}),
                   Entrance(RR_FOREST_TEMPLE_NORTH_CORRIDOR,    {[]{return true;}}),
-                  Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_LOWER, {[]{return CanUse(RG_SONG_OF_TIME) || IsChild;}}),
-                  Entrance(RR_FOREST_TEMPLE_NE_OUTDOORS_LOWER, {[]{return CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT);}}),
-                  Entrance(RR_FOREST_TEMPLE_WEST_CORRIDOR,     {[]{return SmallKeys(RR_FOREST_TEMPLE, 1, 5);}}),
+                  Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_LOWER, {[]{return logic->CanUse(RG_SONG_OF_TIME) || logic->IsChild;}}),
+                  Entrance(RR_FOREST_TEMPLE_NE_OUTDOORS_LOWER, {[]{return logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT);}}),
+                  Entrance(RR_FOREST_TEMPLE_WEST_CORRIDOR,     {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 1, 5);}}),
                   Entrance(RR_FOREST_TEMPLE_EAST_CORRIDOR,     {[]{return false;}}),
-                  Entrance(RR_FOREST_TEMPLE_BOSS_REGION,       {[]{return ForestTempleMeg;}}),
+                  Entrance(RR_FOREST_TEMPLE_BOSS_REGION,       {[]{return logic->ForestTempleMeg;}}),
                   Entrance(RR_FOREST_TEMPLE_BOSS_ENTRYWAY,     {[]{return false;}}),
   });
 
@@ -63,10 +61,10 @@ void AreaTable_Init_ForestTemple() {
 
   areaTable[RR_FOREST_TEMPLE_LOWER_STALFOS] = Area("Forest Temple Lower Stalfos", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&FairyPot, {[]{return true;}}),
+                  EventAccess(&logic->FairyPot, {[]{return true;}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_FOREST_TEMPLE_FIRST_STALFOS_CHEST, {[]{return CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_MEGATON_HAMMER);}}),
+                  LocationAccess(RC_FOREST_TEMPLE_FIRST_STALFOS_CHEST, {[]{return logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER);}}),
                 }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_NORTH_CORRIDOR, {[]{return true;}}),
@@ -74,24 +72,24 @@ void AreaTable_Init_ForestTemple() {
 
   areaTable[RR_FOREST_TEMPLE_NW_OUTDOORS_LOWER] = Area("Forest Temple NW Outdoors Lower", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_BOOMERANG));}}),
-                  EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_MEGATON_HAMMER) || HasExplosives || CanUse(RG_DINS_FIRE));}}),
+                  EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
+                  EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUse(RG_DINS_FIRE));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD, {[]{return CanUse(RG_LONGSHOT) || Here(RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER, []{return HookshotOrBoomerang;});}}),
+                  LocationAccess(RC_FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD, {[]{return logic->CanUse(RG_LONGSHOT) || Here(RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER, []{return logic->HookshotOrBoomerang;});}}),
                 }, {
                   //Exits
-                  Entrance(RR_FOREST_TEMPLE_LOBBY,             {[]{return CanUse(RG_SONG_OF_TIME);}}),
+                  Entrance(RR_FOREST_TEMPLE_LOBBY,             {[]{return logic->CanUse(RG_SONG_OF_TIME);}}),
                   Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER, {[]{return false;}}),
                   Entrance(RR_FOREST_TEMPLE_MAP_ROOM,          {[]{return true;}}),
-                  Entrance(RR_FOREST_TEMPLE_SEWER,             {[]{return GoldScale || CanUse(RG_IRON_BOOTS) || HasAccessTo(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER);}}),
+                  Entrance(RR_FOREST_TEMPLE_SEWER,             {[]{return logic->GoldScale || logic->CanUse(RG_IRON_BOOTS) || HasAccessTo(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER);}}),
                   Entrance(RR_FOREST_TEMPLE_BOSS_ENTRYWAY,     {[]{return false;}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER] = Area("Forest Temple NW Outdoors Upper", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_BOOMERANG));}}),
-                  EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_MEGATON_HAMMER) || HasExplosives || CanUse(RG_DINS_FIRE));}}),
+                  EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
+                  EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUse(RG_DINS_FIRE));}}),
                 }, {}, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_LOWER,    {[]{return true;}}),
@@ -102,38 +100,38 @@ void AreaTable_Init_ForestTemple() {
 
   areaTable[RR_FOREST_TEMPLE_NE_OUTDOORS_LOWER] = Area("Forest Temple NE Outdoors Lower", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_BOOMERANG));}}),
-                  EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_MEGATON_HAMMER) || HasExplosives || CanUse(RG_DINS_FIRE));}}),
+                  EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
+                  EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUse(RG_DINS_FIRE));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST, {[]{return CanUse(RG_HOOKSHOT) || HasAccessTo(RR_FOREST_TEMPLE_FALLING_ROOM) || (HasAccessTo(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER) && IsAdult && randoCtx->GetTrickOption(RT_FOREST_OUTDOORS_LEDGE) && HoverBoots);}}),
-                  LocationAccess(RC_FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD,    {[]{return CanUse(RG_HOOKSHOT) || (randoCtx->GetTrickOption(RT_FOREST_OUTDOORS_EAST_GS) && CanUse(RG_BOOMERANG)) || Here(RR_FOREST_TEMPLE_FALLING_ROOM, []{return CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_DINS_FIRE) || HasExplosives;});}}),
+                  LocationAccess(RC_FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST, {[]{return logic->CanUse(RG_HOOKSHOT) || HasAccessTo(RR_FOREST_TEMPLE_FALLING_ROOM) || (HasAccessTo(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER) && logic->IsAdult && randoCtx->GetTrickOption(RT_FOREST_OUTDOORS_LEDGE) && logic->HoverBoots);}}),
+                  LocationAccess(RC_FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD,    {[]{return logic->CanUse(RG_HOOKSHOT) || (randoCtx->GetTrickOption(RT_FOREST_OUTDOORS_EAST_GS) && logic->CanUse(RG_BOOMERANG)) || Here(RR_FOREST_TEMPLE_FALLING_ROOM, []{return logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_DINS_FIRE) || logic->HasExplosives;});}}),
                 }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_LOBBY,             {[]{return true;}}),
-                  Entrance(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER, {[]{return CanUse(RG_LONGSHOT) || (randoCtx->GetTrickOption(RT_FOREST_VINES) && CanUse(RG_HOOKSHOT));}}),
-                  Entrance(RR_FOREST_TEMPLE_SEWER,             {[]{return GoldScale || CanUse(RG_IRON_BOOTS) || HasAccessTo(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER);}}),
+                  Entrance(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER, {[]{return logic->CanUse(RG_LONGSHOT) || (randoCtx->GetTrickOption(RT_FOREST_VINES) && logic->CanUse(RG_HOOKSHOT));}}),
+                  Entrance(RR_FOREST_TEMPLE_SEWER,             {[]{return logic->GoldScale || logic->CanUse(RG_IRON_BOOTS) || HasAccessTo(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER);}}),
                   Entrance(RR_FOREST_TEMPLE_FALLING_ROOM,      {[]{return false;}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER] = Area("Forest Temple NE Outdoors Upper", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_BOOMERANG));}}),
-                  EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_MEGATON_HAMMER) || HasExplosives || CanUse(RG_DINS_FIRE));}}),
+                  EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
+                  EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUse(RG_DINS_FIRE));}}),
                 }, {}, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_NE_OUTDOORS_LOWER, {[]{return true;}}),
                   Entrance(RR_FOREST_TEMPLE_MAP_ROOM,          {[]{return true;}}),
-                  Entrance(RR_FOREST_TEMPLE_FALLING_ROOM,      {[]{return randoCtx->GetTrickOption(RT_FOREST_DOORFRAME) && CanJumpslash && CanUse(RG_HOVER_BOOTS) && CanUse(RG_SCARECROW);}}),
+                  Entrance(RR_FOREST_TEMPLE_FALLING_ROOM,      {[]{return randoCtx->GetTrickOption(RT_FOREST_DOORFRAME) && logic->CanJumpslash && logic->CanUse(RG_HOVER_BOOTS) && logic->CanUse(RG_SCARECROW);}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_MAP_ROOM] = Area("Forest Temple Map Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FOREST_TEMPLE_MAP_CHEST, {[]{return Here(RR_FOREST_TEMPLE_MAP_ROOM, []{return HasExplosives || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_FAIRY_BOW) || ((CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT)) && (Nuts || HookshotOrBoomerang || CanShield));});}}),
+                  LocationAccess(RC_FOREST_TEMPLE_MAP_CHEST, {[]{return Here(RR_FOREST_TEMPLE_MAP_ROOM, []{return logic->HasExplosives || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_FAIRY_BOW) || ((logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT)) && (logic->Nuts || logic->HookshotOrBoomerang || logic->CanShield));});}}),
                 }, {
                   //Exits
-                  Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_LOWER, {[]{return Here(RR_FOREST_TEMPLE_MAP_ROOM, []{return HasExplosives || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_FAIRY_BOW) || ((CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT)) && (Nuts || HookshotOrBoomerang || CanShield));});}}),
-                  Entrance(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER, {[]{return Here(RR_FOREST_TEMPLE_MAP_ROOM, []{return HasExplosives || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_FAIRY_BOW) || ((CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT)) && (Nuts || HookshotOrBoomerang || CanShield));});}}),
+                  Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_LOWER, {[]{return Here(RR_FOREST_TEMPLE_MAP_ROOM, []{return logic->HasExplosives || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_FAIRY_BOW) || ((logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT)) && (logic->Nuts || logic->HookshotOrBoomerang || logic->CanShield));});}}),
+                  Entrance(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER, {[]{return Here(RR_FOREST_TEMPLE_MAP_ROOM, []{return logic->HasExplosives || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_FAIRY_BOW) || ((logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT)) && (logic->Nuts || logic->HookshotOrBoomerang || logic->CanShield));});}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_SEWER] = Area("Forest Temple Sewer", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -147,12 +145,12 @@ void AreaTable_Init_ForestTemple() {
 
   areaTable[RR_FOREST_TEMPLE_BELOW_BOSS_KEY_CHEST] = Area("Forest Temple Below Boss Key Chest", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER, {[]{return Here(RR_FOREST_TEMPLE_BELOW_BOSS_KEY_CHEST, []{return HasExplosives || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_FAIRY_BOW) || ((CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT)) && (Nuts || HookshotOrBoomerang || CanShield));});}}),
+                  Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER, {[]{return Here(RR_FOREST_TEMPLE_BELOW_BOSS_KEY_CHEST, []{return logic->HasExplosives || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_FAIRY_BOW) || ((logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT)) && (logic->Nuts || logic->HookshotOrBoomerang || logic->CanShield));});}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_FLOORMASTER_ROOM] = Area("Forest Temple Floormaster Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FOREST_TEMPLE_FLOORMASTER_CHEST, {[]{return CanAdultDamage || CanChildDamage;}}),
+                  LocationAccess(RC_FOREST_TEMPLE_FLOORMASTER_CHEST, {[]{return logic->CanAdultDamage || logic->CanChildDamage;}}),
                 }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER, {[]{return true;}}),
@@ -160,25 +158,25 @@ void AreaTable_Init_ForestTemple() {
 
   areaTable[RR_FOREST_TEMPLE_WEST_CORRIDOR] = Area("Forest Temple West Corridor", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_FOREST_TEMPLE_LOBBY,           {[]{return SmallKeys(RR_FOREST_TEMPLE, 1, 5);}}),
-                  Entrance(RR_FOREST_TEMPLE_BLOCK_PUSH_ROOM, {[]{return CanAdultAttack || CanChildAttack || Nuts;}}),
+                  Entrance(RR_FOREST_TEMPLE_LOBBY,           {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 1, 5);}}),
+                  Entrance(RR_FOREST_TEMPLE_BLOCK_PUSH_ROOM, {[]{return logic->CanAdultAttack || logic->CanChildAttack || logic->Nuts;}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_BLOCK_PUSH_ROOM] = Area("Forest Temple Block Push Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FOREST_TEMPLE_EYE_SWITCH_CHEST, {[]{return GoronBracelet && (CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT));}}),
+                  LocationAccess(RC_FOREST_TEMPLE_EYE_SWITCH_CHEST, {[]{return logic->GoronBracelet && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT));}}),
                 }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_WEST_CORRIDOR,            {[]{return true;}}),
-                  Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER,        {[]{return CanUse(RG_HOVER_BOOTS) || (randoCtx->GetTrickOption(RT_FOREST_OUTSIDE_BACKDOOR) && CanJumpslash && GoronBracelet);}}),
-                  Entrance(RR_FOREST_TEMPLE_NW_CORRIDOR_TWISTED,      {[]{return IsAdult && GoronBracelet && SmallKeys(RR_FOREST_TEMPLE, 2);}}),
-                  Entrance(RR_FOREST_TEMPLE_NW_CORRIDOR_STRAIGHTENED, {[]{return (CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT)) && GoronBracelet && SmallKeys(RR_FOREST_TEMPLE, 2);}}),
+                  Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER,        {[]{return logic->CanUse(RG_HOVER_BOOTS) || (randoCtx->GetTrickOption(RT_FOREST_OUTSIDE_BACKDOOR) && logic->CanJumpslash && logic->GoronBracelet);}}),
+                  Entrance(RR_FOREST_TEMPLE_NW_CORRIDOR_TWISTED,      {[]{return logic->IsAdult && logic->GoronBracelet && logic->SmallKeys(RR_FOREST_TEMPLE, 2);}}),
+                  Entrance(RR_FOREST_TEMPLE_NW_CORRIDOR_STRAIGHTENED, {[]{return (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT)) && logic->GoronBracelet && logic->SmallKeys(RR_FOREST_TEMPLE, 2);}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_NW_CORRIDOR_TWISTED] = Area("Forest Temple NW Corridor Twisted", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_FOREST_TEMPLE_BLOCK_PUSH_ROOM, {[]{return SmallKeys(RR_FOREST_TEMPLE, 2);}}),
-                  Entrance(RR_FOREST_TEMPLE_RED_POE_ROOM,    {[]{return SmallKeys(RR_FOREST_TEMPLE, 3);}}),
+                  Entrance(RR_FOREST_TEMPLE_BLOCK_PUSH_ROOM, {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 2);}}),
+                  Entrance(RR_FOREST_TEMPLE_RED_POE_ROOM,    {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 3);}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_NW_CORRIDOR_STRAIGHTENED] = Area("Forest Temple NW Corridor Straightened", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -187,58 +185,58 @@ void AreaTable_Init_ForestTemple() {
                 }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_BELOW_BOSS_KEY_CHEST, {[]{return true;}}),
-                  Entrance(RR_FOREST_TEMPLE_BLOCK_PUSH_ROOM,      {[]{return SmallKeys(RR_FOREST_TEMPLE, 2);}}),
+                  Entrance(RR_FOREST_TEMPLE_BLOCK_PUSH_ROOM,      {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 2);}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_RED_POE_ROOM] = Area("Forest Temple Red Poe Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&ForestTempleJoelle, {[]{return ForestTempleJoelle || CanUse(RG_FAIRY_BOW);}}),
+                  EventAccess(&logic->ForestTempleJoelle, {[]{return logic->ForestTempleJoelle || logic->CanUse(RG_FAIRY_BOW);}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_FOREST_TEMPLE_RED_POE_CHEST, {[]{return ForestTempleJoelle;}}),
+                  LocationAccess(RC_FOREST_TEMPLE_RED_POE_CHEST, {[]{return logic->ForestTempleJoelle;}}),
                 }, {
                   //Exits
-                  Entrance(RR_FOREST_TEMPLE_NW_CORRIDOR_TWISTED, {[]{return SmallKeys(RR_FOREST_TEMPLE, 3);}}),
+                  Entrance(RR_FOREST_TEMPLE_NW_CORRIDOR_TWISTED, {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 3);}}),
                   Entrance(RR_FOREST_TEMPLE_UPPER_STALFOS,       {[]{return true;}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_UPPER_STALFOS] = Area("Forest Temple Upper Stalfos", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FOREST_TEMPLE_BOW_CHEST, {[]{return CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_MEGATON_HAMMER);}}),
+                  LocationAccess(RC_FOREST_TEMPLE_BOW_CHEST, {[]{return logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER);}}),
                 }, {
                   //Exits
-                  Entrance(RR_FOREST_TEMPLE_RED_POE_ROOM,  {[]{return CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_MEGATON_HAMMER);}}),
-                  Entrance(RR_FOREST_TEMPLE_BLUE_POE_ROOM, {[]{return CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_MEGATON_HAMMER);}}),
+                  Entrance(RR_FOREST_TEMPLE_RED_POE_ROOM,  {[]{return logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER);}}),
+                  Entrance(RR_FOREST_TEMPLE_BLUE_POE_ROOM, {[]{return logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER);}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_BLUE_POE_ROOM] = Area("Forest Temple Blue Poe Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&ForestTempleBeth, {[]{return ForestTempleBeth || CanUse(RG_FAIRY_BOW);}}),
+                  EventAccess(&logic->ForestTempleBeth, {[]{return logic->ForestTempleBeth || logic->CanUse(RG_FAIRY_BOW);}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_FOREST_TEMPLE_BLUE_POE_CHEST, {[]{return ForestTempleBeth;}}),
+                  LocationAccess(RC_FOREST_TEMPLE_BLUE_POE_CHEST, {[]{return logic->ForestTempleBeth;}}),
                 }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_UPPER_STALFOS,            {[]{return true;}}),
-                  Entrance(RR_FOREST_TEMPLE_NE_CORRIDOR_STRAIGHTENED, {[]{return SmallKeys(RR_FOREST_TEMPLE, 4);}}),
+                  Entrance(RR_FOREST_TEMPLE_NE_CORRIDOR_STRAIGHTENED, {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 4);}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_NE_CORRIDOR_STRAIGHTENED] = Area("Forest Temple NE Corridor Straightened", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_FOREST_TEMPLE_BLUE_POE_ROOM,   {[]{return SmallKeys(RR_FOREST_TEMPLE, 4);}}),
-                  Entrance(RR_FOREST_TEMPLE_FROZEN_EYE_ROOM, {[]{return SmallKeys(RR_FOREST_TEMPLE, 5);}}),
+                  Entrance(RR_FOREST_TEMPLE_BLUE_POE_ROOM,   {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 4);}}),
+                  Entrance(RR_FOREST_TEMPLE_FROZEN_EYE_ROOM, {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 5);}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_NE_CORRIDOR_TWISTED] = Area("Forest Temple NE Corridor Twisted", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_FOREST_TEMPLE_FROZEN_EYE_ROOM, {[]{return SmallKeys(RR_FOREST_TEMPLE, 5);}}),
+                  Entrance(RR_FOREST_TEMPLE_FROZEN_EYE_ROOM, {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 5);}}),
                   Entrance(RR_FOREST_TEMPLE_FALLING_ROOM,    {[]{return true;}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_FROZEN_EYE_ROOM] = Area("Forest Temple Frozen Eye Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_FOREST_TEMPLE_NE_CORRIDOR_STRAIGHTENED, {[]{return SmallKeys(RR_FOREST_TEMPLE, 5);}}),
-                  Entrance(RR_FOREST_TEMPLE_NE_CORRIDOR_TWISTED,      {[]{return SmallKeys(RR_FOREST_TEMPLE, 5) && (CanUse(RG_FAIRY_BOW) || CanUse(RG_DINS_FIRE));}}),
+                  Entrance(RR_FOREST_TEMPLE_NE_CORRIDOR_STRAIGHTENED, {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 5);}}),
+                  Entrance(RR_FOREST_TEMPLE_NE_CORRIDOR_TWISTED,      {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 5) && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_DINS_FIRE));}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_FALLING_ROOM] = Area("Forest Temple Falling Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -252,27 +250,27 @@ void AreaTable_Init_ForestTemple() {
 
   areaTable[RR_FOREST_TEMPLE_GREEN_POE_ROOM] = Area("Forest Temple Green Poe Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&ForestTempleAmy, {[]{return ForestTempleAmy || CanUse(RG_FAIRY_BOW);}}),
+                  EventAccess(&logic->ForestTempleAmy, {[]{return logic->ForestTempleAmy || logic->CanUse(RG_FAIRY_BOW);}}),
                 }, {}, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_FALLING_ROOM,  {[]{return true;}}),
-                  Entrance(RR_FOREST_TEMPLE_EAST_CORRIDOR, {[]{return ForestTempleAmy;}}),
+                  Entrance(RR_FOREST_TEMPLE_EAST_CORRIDOR, {[]{return logic->ForestTempleAmy;}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_EAST_CORRIDOR] = Area("Forest Temple East Corridor", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_FOREST_TEMPLE_LOBBY,          {[]{return CanAdultAttack || CanChildAttack || Nuts;}}),
-                  Entrance(RR_FOREST_TEMPLE_GREEN_POE_ROOM, {[]{return CanAdultAttack || CanChildAttack || Nuts;}}),
+                  Entrance(RR_FOREST_TEMPLE_LOBBY,          {[]{return logic->CanAdultAttack || logic->CanChildAttack || logic->Nuts;}}),
+                  Entrance(RR_FOREST_TEMPLE_GREEN_POE_ROOM, {[]{return logic->CanAdultAttack || logic->CanChildAttack || logic->Nuts;}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_BOSS_REGION] = Area("Forest Temple Boss Region", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_FOREST_TEMPLE_BASEMENT_CHEST, {[]{return true;}}),
-                  LocationAccess(RC_FOREST_TEMPLE_GS_BASEMENT,    {[]{return HookshotOrBoomerang;}}),
+                  LocationAccess(RC_FOREST_TEMPLE_GS_BASEMENT,    {[]{return logic->HookshotOrBoomerang;}}),
                 }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_LOBBY,     {[]{return true;}}),
-                  Entrance(RR_FOREST_TEMPLE_BOSS_ENTRYWAY, {[]{return BossKeyForestTemple;}}),
+                  Entrance(RR_FOREST_TEMPLE_BOSS_ENTRYWAY, {[]{return logic->BossKeyForestTemple;}}),
   });
   }
 
@@ -282,46 +280,46 @@ void AreaTable_Init_ForestTemple() {
   if (randoCtx->GetDungeon(FOREST_TEMPLE)->IsMQ()) {
   areaTable[RR_FOREST_TEMPLE_MQ_LOBBY] = Area("Forest Temple MQ Lobby", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST, {[]{return CanJumpslash || Bombs || CanUse(RG_STICKS) || Nuts || HookshotOrBoomerang || CanUse(RG_DINS_FIRE) || KokiriSword || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOVER_BOOTS);}}),
-                  LocationAccess(RC_FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY, {[]{return HookshotOrBoomerang;}}),
+                  LocationAccess(RC_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST, {[]{return logic->CanJumpslash || logic->Bombs || logic->CanUse(RG_STICKS) || logic->Nuts || logic->HookshotOrBoomerang || logic->CanUse(RG_DINS_FIRE) || logic->KokiriSword || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOVER_BOOTS);}}),
+                  LocationAccess(RC_FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY, {[]{return logic->HookshotOrBoomerang;}}),
   }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_ENTRYWAY,        {[]{return true;}}),
-                  Entrance(RR_FOREST_TEMPLE_MQ_CENTRAL_AREA, {[]{return SmallKeys(RR_FOREST_TEMPLE, 1) && (CanAdultAttack || CanChildAttack || Nuts);}}),
+                  Entrance(RR_FOREST_TEMPLE_MQ_CENTRAL_AREA, {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 1) && (logic->CanAdultAttack || logic->CanChildAttack || logic->Nuts);}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_MQ_CENTRAL_AREA] = Area("Forest Temple MQ Central Area", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&FairyPot, {[]{return true;}}),
+                  EventAccess(&logic->FairyPot, {[]{return true;}}),
   }, {
                   //Locations
-                  LocationAccess(RC_FOREST_TEMPLE_MQ_WOLFOS_CHEST,       {[]{return (CanUse(RG_SONG_OF_TIME) || IsChild) && (CanJumpslash || CanUse(RG_DINS_FIRE) || CanUse(RG_STICKS) || CanUse(RG_FAIRY_SLINGSHOT) || KokiriSword);}}),
-                  LocationAccess(RC_FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM, {[]{return CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_MEGATON_HAMMER);}}),
+                  LocationAccess(RC_FOREST_TEMPLE_MQ_WOLFOS_CHEST,       {[]{return (logic->CanUse(RG_SONG_OF_TIME) || logic->IsChild) && (logic->CanJumpslash || logic->CanUse(RG_DINS_FIRE) || logic->CanUse(RG_STICKS) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->KokiriSword);}}),
+                  LocationAccess(RC_FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM, {[]{return logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER);}}),
   }, {
                   //Exits
-                  Entrance(RR_FOREST_TEMPLE_MQ_NW_OUTDOORS,        {[]{return CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT);}}),
-                  Entrance(RR_FOREST_TEMPLE_MQ_NE_OUTDOORS,        {[]{return CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT);}}), //This is as far as child can get
-                  Entrance(RR_FOREST_TEMPLE_MQ_AFTER_BLOCK_PUZZLE, {[]{return IsAdult && (GoronBracelet || (randoCtx->GetTrickOption(RT_FOREST_MQ_BLOCK_PUZZLE) && HasBombchus && IsAdult && CanUse(RG_HOOKSHOT)));}}),
-                    //Trick: IsAdult && (GoronBracelet || (LogicForestMQBlockPuzzle && HasBombchus && IsAdult && CanUse(RG_HOOKSHOT)))
-                  Entrance(RR_FOREST_TEMPLE_MQ_OUTDOOR_LEDGE,      {[]{return (randoCtx->GetTrickOption(RT_FOREST_MQ_JS_HALLWAY_SWITCH) && IsAdult && CanUse(RG_HOVER_BOOTS)) || (randoCtx->GetTrickOption(RT_FOREST_MQ_RANG_HALLWAY_SWITCH) && CanUse(RG_BOOMERANG)) || (randoCtx->GetTrickOption(RT_FOREST_MQ_HOOKSHOT_HALLWAY_SWITCH) && IsAdult && CanUse(RG_HOOKSHOT));}}),
-                    //Trick (Hookshot trick not added to either n64 or oot3d rando as of yet, to enable in SoH needs uncommenting in randomizer_tricks.cpp): (LogicForestMQHallwaySwitchJS && IsAdult && CanUse(RG_HOVER_BOOTS)) || (LogicForestMQHallwaySwitchHookshot && IsAdult && CanUse(RG_HOOKSHOT)) 
-                  Entrance(RR_FOREST_TEMPLE_MQ_BOSS_REGION,        {[]{return ForestTempleJoAndBeth && ForestTempleAmyAndMeg;}}),
+                  Entrance(RR_FOREST_TEMPLE_MQ_NW_OUTDOORS,        {[]{return logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT);}}),
+                  Entrance(RR_FOREST_TEMPLE_MQ_NE_OUTDOORS,        {[]{return logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT);}}), //This is as far as child can get
+                  Entrance(RR_FOREST_TEMPLE_MQ_AFTER_BLOCK_PUZZLE, {[]{return logic->IsAdult && (logic->GoronBracelet || (randoCtx->GetTrickOption(RT_FOREST_MQ_BLOCK_PUZZLE) && logic->HasBombchus && logic->IsAdult && logic->CanUse(RG_HOOKSHOT)));}}),
+                    //Trick: logic->IsAdult && (logic->GoronBracelet || (LogicForestMQBlockPuzzle && logic->HasBombchus && logic->IsAdult && logic->CanUse(RG_HOOKSHOT)))
+                  Entrance(RR_FOREST_TEMPLE_MQ_OUTDOOR_LEDGE,      {[]{return (randoCtx->GetTrickOption(RT_FOREST_MQ_JS_HALLWAY_SWITCH) && logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS)) || (randoCtx->GetTrickOption(RT_FOREST_MQ_RANG_HALLWAY_SWITCH) && logic->CanUse(RG_BOOMERANG)) || (randoCtx->GetTrickOption(RT_FOREST_MQ_HOOKSHOT_HALLWAY_SWITCH) && logic->IsAdult && logic->CanUse(RG_HOOKSHOT));}}),
+                    //Trick (logic->Hookshot trick not added to either n64 or oot3d rando as of yet, to enable in SoH needs uncommenting in randomizer_tricks.cpp): (LogicForestMQHallwaySwitchJS && logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS)) || (LogicForestMQHallwaySwitchHookshot && logic->IsAdult && logic->CanUse(RG_HOOKSHOT)) 
+                  Entrance(RR_FOREST_TEMPLE_MQ_BOSS_REGION,        {[]{return logic->ForestTempleJoAndBeth && logic->ForestTempleAmyAndMeg;}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_MQ_AFTER_BLOCK_PUZZLE] = Area("Forest Temple MQ After Block Puzzle", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FOREST_TEMPLE_MQ_BOSS_KEY_CHEST, {[]{return SmallKeys(RR_FOREST_TEMPLE, 3);}}),
+                  LocationAccess(RC_FOREST_TEMPLE_MQ_BOSS_KEY_CHEST, {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 3);}}),
   }, {
                   //Exits
-                  Entrance(RR_FOREST_TEMPLE_MQ_BOW_REGION,    {[]{return SmallKeys(RR_FOREST_TEMPLE, 4);}}),
-                  Entrance(RR_FOREST_TEMPLE_MQ_OUTDOOR_LEDGE, {[]{return  SmallKeys(RR_FOREST_TEMPLE, 3) || (randoCtx->GetTrickOption(RT_FOREST_MQ_JS_HALLWAY_SWITCH) && ((IsAdult && CanUse(RG_HOOKSHOT)) || (randoCtx->GetTrickOption(RT_FOREST_OUTSIDE_BACKDOOR) && (IsAdult || (IsChild && CanUse(RG_STICKS))))));}}),
-                    //Trick (Doing the hallway switch jumpslash as child requires sticks and has been added above): SmallKeys(RR_FOREST_TEMPLE, 3) || (LogicForestMQHallwaySwitchJS && ((IsAdult && CanUse(RG_HOOKSHOT)) || LogicForestOutsideBackdoor))
-                  Entrance(RR_FOREST_TEMPLE_MQ_NW_OUTDOORS,   {[]{return SmallKeys(RR_FOREST_TEMPLE, 2);}}),
+                  Entrance(RR_FOREST_TEMPLE_MQ_BOW_REGION,    {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 4);}}),
+                  Entrance(RR_FOREST_TEMPLE_MQ_OUTDOOR_LEDGE, {[]{return  logic->SmallKeys(RR_FOREST_TEMPLE, 3) || (randoCtx->GetTrickOption(RT_FOREST_MQ_JS_HALLWAY_SWITCH) && ((logic->IsAdult && logic->CanUse(RG_HOOKSHOT)) || (randoCtx->GetTrickOption(RT_FOREST_OUTSIDE_BACKDOOR) && (logic->IsAdult || (logic->IsChild && logic->CanUse(RG_STICKS))))));}}),
+                    //Trick (Doing the hallway switch jumpslash as child requires sticks and has been added above): logic->SmallKeys(RR_FOREST_TEMPLE, 3) || (LogicForestMQHallwaySwitchJS && ((logic->IsAdult && logic->CanUse(RG_HOOKSHOT)) || LogicForestOutsideBackdoor))
+                  Entrance(RR_FOREST_TEMPLE_MQ_NW_OUTDOORS,   {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 2);}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_MQ_OUTDOOR_LEDGE] = Area("Forest Temple MQ Outdoor Ledge", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FOREST_TEMPLE_MQ_REDEAD_CHEST, {[]{return CanJumpslash;}}),
+                  LocationAccess(RC_FOREST_TEMPLE_MQ_REDEAD_CHEST, {[]{return logic->CanJumpslash;}}),
   }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_MQ_NW_OUTDOORS, {[]{return true;}}),
@@ -329,27 +327,27 @@ void AreaTable_Init_ForestTemple() {
 
   areaTable[RR_FOREST_TEMPLE_MQ_NW_OUTDOORS] = Area("Forest Temple MQ NW Outdoors", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD, {[]{return CanAdultAttack || CanChildAttack;}}),
+                  LocationAccess(RC_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD, {[]{return logic->CanAdultAttack || logic->CanChildAttack;}}),
   }, {
                   //Exits
-                  Entrance(RR_FOREST_TEMPLE_MQ_NE_OUTDOORS,         {[]{return (IsAdult && (CanUse(RG_IRON_BOOTS) || CanUse(RG_LONGSHOT) || (randoCtx->GetTrickOption(RT_FOREST_MQ_WELL_SWIM) && CanUse(RG_HOOKSHOT)))) || ProgressiveScale >= 2;}}),
-                    //Trick: (IsAdult && (CanUse(RG_IRON_BOOTS) || CanUse(RG_LONGSHOT) || (LogicForestMQWellSwim && CanUse(RG_HOOKSHOT)))) || ProgressiveScale >= 2
-                  Entrance(RR_FOREST_TEMPLE_MQ_OUTDOORS_TOP_LEDGES, {[]{return IsAdult && CanUse(RG_FIRE_ARROWS);}}),
+                  Entrance(RR_FOREST_TEMPLE_MQ_NE_OUTDOORS,         {[]{return (logic->IsAdult && (logic->CanUse(RG_IRON_BOOTS) || logic->CanUse(RG_LONGSHOT) || (randoCtx->GetTrickOption(RT_FOREST_MQ_WELL_SWIM) && logic->CanUse(RG_HOOKSHOT)))) || logic->ProgressiveScale >= 2;}}),
+                    //Trick: (logic->IsAdult && (logic->CanUse(RG_IRON_BOOTS) || logic->CanUse(RG_LONGSHOT) || (LogicForestMQWellSwim && logic->CanUse(RG_HOOKSHOT)))) || logic->ProgressiveScale >= 2
+                  Entrance(RR_FOREST_TEMPLE_MQ_OUTDOORS_TOP_LEDGES, {[]{return logic->IsAdult && logic->CanUse(RG_FIRE_ARROWS);}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_MQ_NE_OUTDOORS] = Area("Forest Temple MQ NE Outdoors", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_BOOMERANG));}}),
-                  EventAccess(&DekuBabaNuts,   {[]{return DekuBabaNuts   || (CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_MEGATON_HAMMER) || HasExplosives || CanUse(RG_DINS_FIRE));}}),
+                  EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
+                  EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUse(RG_DINS_FIRE));}}),
   }, {
                   //Locations
-                  LocationAccess(RC_FOREST_TEMPLE_MQ_WELL_CHEST,                 {[]{return (IsAdult && CanUse(RG_FAIRY_BOW)) || (IsChild && CanUse(RG_FAIRY_SLINGSHOT));}}),
-                  LocationAccess(RC_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD, {[]{return HookshotOrBoomerang || (IsAdult && CanUse(RG_FIRE_ARROWS) && (CanUse(RG_SONG_OF_TIME) || (CanUse(RG_HOVER_BOOTS) && randoCtx->GetTrickOption(RT_FOREST_DOORFRAME))));}}),
-                  LocationAccess(RC_FOREST_TEMPLE_MQ_GS_WELL,                    {[]{return (IsAdult && ((CanUse(RG_IRON_BOOTS) && CanUse(RG_HOOKSHOT)) || CanUse(RG_FAIRY_BOW))) || (IsChild && CanUse(RG_FAIRY_SLINGSHOT));}}),
+                  LocationAccess(RC_FOREST_TEMPLE_MQ_WELL_CHEST,                 {[]{return (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW)) || (logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT));}}),
+                  LocationAccess(RC_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD, {[]{return logic->HookshotOrBoomerang || (logic->IsAdult && logic->CanUse(RG_FIRE_ARROWS) && (logic->CanUse(RG_SONG_OF_TIME) || (logic->CanUse(RG_HOVER_BOOTS) && randoCtx->GetTrickOption(RT_FOREST_DOORFRAME))));}}),
+                  LocationAccess(RC_FOREST_TEMPLE_MQ_GS_WELL,                    {[]{return (logic->IsAdult && ((logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_HOOKSHOT)) || logic->CanUse(RG_FAIRY_BOW))) || (logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT));}}),
   }, {
                   //Exits
-                  Entrance(RR_FOREST_TEMPLE_MQ_OUTDOORS_TOP_LEDGES, {[]{return IsAdult && CanUse(RG_HOOKSHOT) && (CanUse(RG_LONGSHOT) || CanUse(RG_HOVER_BOOTS) || CanUse(RG_SONG_OF_TIME));}}),
-                  Entrance(RR_FOREST_TEMPLE_MQ_NE_OUTDOORS_LEDGE,   {[]{return IsAdult && CanUse(RG_LONGSHOT);}}),
+                  Entrance(RR_FOREST_TEMPLE_MQ_OUTDOORS_TOP_LEDGES, {[]{return logic->IsAdult && logic->CanUse(RG_HOOKSHOT) && (logic->CanUse(RG_LONGSHOT) || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_SONG_OF_TIME));}}),
+                  Entrance(RR_FOREST_TEMPLE_MQ_NE_OUTDOORS_LEDGE,   {[]{return logic->IsAdult && logic->CanUse(RG_LONGSHOT);}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_MQ_OUTDOORS_TOP_LEDGES] = Area("Forest Temple MQ Outdoors Top Ledges", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -358,8 +356,8 @@ void AreaTable_Init_ForestTemple() {
   }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_MQ_NE_OUTDOORS,       {[]{return true;}}),
-                  Entrance(RR_FOREST_TEMPLE_MQ_NE_OUTDOORS_LEDGE, {[]{return randoCtx->GetTrickOption(RT_FOREST_OUTDOORS_LEDGE) && IsAdult && CanUse(RG_HOVER_BOOTS);}}),
-                    //Trick: LogicForestOutdoorsLedge && IsAdult && CanUse(RG_HOVER_BOOTS)
+                  Entrance(RR_FOREST_TEMPLE_MQ_NE_OUTDOORS_LEDGE, {[]{return randoCtx->GetTrickOption(RT_FOREST_OUTDOORS_LEDGE) && logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS);}}),
+                    //Trick: LogicForestOutdoorsLedge && logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS)
   });
 
   areaTable[RR_FOREST_TEMPLE_MQ_NE_OUTDOORS_LEDGE] = Area("Forest Temple MQ NE Outdoors Ledge", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -368,25 +366,25 @@ void AreaTable_Init_ForestTemple() {
   }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_MQ_NE_OUTDOORS,  {[]{return true;}}),
-                  Entrance(RR_FOREST_TEMPLE_MQ_FALLING_ROOM, {[]{return CanUse(RG_SONG_OF_TIME);}}),
+                  Entrance(RR_FOREST_TEMPLE_MQ_FALLING_ROOM, {[]{return logic->CanUse(RG_SONG_OF_TIME);}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_MQ_BOW_REGION] = Area("Forest Temple MQ Bow Region", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&ForestTempleJoAndBeth, {[]{return ForestTempleJoAndBeth || (IsAdult && CanUse(RG_FAIRY_BOW));}}),
+                  EventAccess(&logic->ForestTempleJoAndBeth, {[]{return logic->ForestTempleJoAndBeth || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW));}}),
   }, {
                   //Locations
-                  LocationAccess(RC_FOREST_TEMPLE_MQ_BOW_CHEST,     {[]{return CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_MEGATON_HAMMER);}}),
-                  LocationAccess(RC_FOREST_TEMPLE_MQ_MAP_CHEST,     {[]{return IsAdult && CanUse(RG_FAIRY_BOW);}}),
-                  LocationAccess(RC_FOREST_TEMPLE_MQ_COMPASS_CHEST, {[]{return IsAdult && CanUse(RG_FAIRY_BOW);}}),
+                  LocationAccess(RC_FOREST_TEMPLE_MQ_BOW_CHEST,     {[]{return logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER);}}),
+                  LocationAccess(RC_FOREST_TEMPLE_MQ_MAP_CHEST,     {[]{return logic->IsAdult && logic->CanUse(RG_FAIRY_BOW);}}),
+                  LocationAccess(RC_FOREST_TEMPLE_MQ_COMPASS_CHEST, {[]{return logic->IsAdult && logic->CanUse(RG_FAIRY_BOW);}}),
   }, {
                   //Exits
-                  Entrance(RR_FOREST_TEMPLE_MQ_FALLING_ROOM, {[]{return SmallKeys(RR_FOREST_TEMPLE, 5) && ((IsAdult && CanUse(RG_FAIRY_BOW)) || CanUse(RG_DINS_FIRE));}}),
+                  Entrance(RR_FOREST_TEMPLE_MQ_FALLING_ROOM, {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 5) && ((logic->IsAdult && logic->CanUse(RG_FAIRY_BOW)) || logic->CanUse(RG_DINS_FIRE));}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_MQ_FALLING_ROOM] = Area("Forest Temple MQ Falling Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&ForestTempleAmyAndMeg, {[]{return ForestTempleAmyAndMeg || (IsAdult && CanUse(RG_FAIRY_BOW) && SmallKeys(RR_FOREST_TEMPLE, 6));}}),
+                  EventAccess(&logic->ForestTempleAmyAndMeg, {[]{return logic->ForestTempleAmyAndMeg || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW) && logic->SmallKeys(RR_FOREST_TEMPLE, 6));}}),
   }, {
                   //Locations
                   LocationAccess(RC_FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST, {[]{return true;}}),
@@ -400,7 +398,7 @@ void AreaTable_Init_ForestTemple() {
                   LocationAccess(RC_FOREST_TEMPLE_MQ_BASEMENT_CHEST,   {[]{return true;}}),
   }, {
                   //Exits
-                  Entrance(RR_FOREST_TEMPLE_BOSS_ENTRYWAY, {[]{return BossKeyForestTemple;}}),
+                  Entrance(RR_FOREST_TEMPLE_BOSS_ENTRYWAY, {[]{return logic->BossKeyForestTemple;}}),
   });
   }
 
@@ -420,15 +418,15 @@ void AreaTable_Init_ForestTemple() {
         "Forest Temple Boss Room", "Forest Temple", RA_NONE, NO_DAY_NIGHT_CYCLE,
         {
             // Events
-            EventAccess(&ForestTempleClear, { [] {
-                return ForestTempleClear || (HasBossSoul(RG_PHANTOM_GANON_SOUL) && ((CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) &&
-                                             (CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT))));
+            EventAccess(&logic->ForestTempleClear, { [] {
+                return logic->ForestTempleClear || (logic->HasBossSoul(RG_PHANTOM_GANON_SOUL) && ((logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) &&
+                                             (logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT))));
             } }),
         },
         {
             // Locations
-            LocationAccess(RC_FOREST_TEMPLE_PHANTOM_GANON_HEART, { [] { return ForestTempleClear; } }),
-            LocationAccess(RC_PHANTOM_GANON, { [] { return ForestTempleClear; } }),
+            LocationAccess(RC_FOREST_TEMPLE_PHANTOM_GANON_HEART, { [] { return logic->ForestTempleClear; } }),
+            LocationAccess(RC_PHANTOM_GANON, { [] { return logic->ForestTempleClear; } }),
         },
         {
             // Exits
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
index a89738e4a..e91513b79 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
@@ -1,10 +1,8 @@
 #include "../location_access.hpp"
-#include "../logic.hpp"
 #include "../../entrance.h"
 #include "../../dungeon.h"
 #include "../../trial.h"
 
-using namespace Logic;
 using namespace Rando;
 
 void AreaTable_Init_GanonsCastle() {
@@ -24,60 +22,54 @@ void AreaTable_Init_GanonsCastle() {
   if (randoCtx->GetDungeon(GANONS_CASTLE)->IsVanilla()) {
   areaTable[RR_GANONS_CASTLE_LOBBY] = Area("Ganon's Castle Lobby", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SHEIK_HINT_GC,  {[]{return true;}}),
+                  LocationAccess(RC_SHEIK_HINT_GC,  {[]{return true;}}), 
                 }, {
                   //Exits
-                  Entrance(RR_GANONS_CASTLE_ENTRYWAY, {[]{return true;}}),
-                  Entrance(RR_GANONS_CASTLE_MAIN,     {[]{return true;}}),
-  });
-
-  areaTable[RR_GANONS_CASTLE_MAIN] = Area("Ganon's Castle Main", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
-                  //Exits
-                  Entrance(RR_GANONS_CASTLE_LOBBY,        {[]{return true;}}),
+                  Entrance(RR_GANONS_CASTLE_ENTRYWAY,     {[]{return true;}}),
                   Entrance(RR_GANONS_CASTLE_FOREST_TRIAL, {[]{return true;}}),
                   Entrance(RR_GANONS_CASTLE_FIRE_TRIAL,   {[]{return true;}}),
                   Entrance(RR_GANONS_CASTLE_WATER_TRIAL,  {[]{return true;}}),
                   Entrance(RR_GANONS_CASTLE_SHADOW_TRIAL, {[]{return true;}}),
                   Entrance(RR_GANONS_CASTLE_SPIRIT_TRIAL, {[]{return true;}}),
-                  Entrance(RR_GANONS_CASTLE_LIGHT_TRIAL,  {[]{return CanUse(RG_GOLDEN_GAUNTLETS);}}),
-                  Entrance(RR_GANONS_CASTLE_TOWER,        {[]{return (ForestTrialClear || randoCtx->GetTrial(Rando::FOREST_TRIAL)->IsSkipped()) &&
-                                                                         (FireTrialClear   || randoCtx->GetTrial(Rando::FIRE_TRIAL)->IsSkipped())   &&
-                                                                         (WaterTrialClear  || randoCtx->GetTrial(Rando::WATER_TRIAL)->IsSkipped())  &&
-                                                                         (ShadowTrialClear || randoCtx->GetTrial(Rando::SHADOW_TRIAL)->IsSkipped()) &&
-                                                                         (SpiritTrialClear || randoCtx->GetTrial(Rando::SPIRIT_TRIAL)->IsSkipped()) &&
-                                                                         (LightTrialClear  || randoCtx->GetTrial(Rando::LIGHT_TRIAL)->IsSkipped());}}),
-                  Entrance(RR_GANONS_CASTLE_DEKU_SCRUBS,  {[]{return randoCtx->GetTrickOption(RT_LENS_GANON) || CanUse(RG_LENS_OF_TRUTH);}}),
+                  Entrance(RR_GANONS_CASTLE_LIGHT_TRIAL,  {[]{return logic->CanUse(RG_GOLDEN_GAUNTLETS);}}),
+                  Entrance(RR_GANONS_CASTLE_TOWER,        {[]{return (logic->ForestTrialClear || randoCtx->GetTrial(Rando::FOREST_TRIAL)->IsSkipped()) &&
+                                                                         (logic->FireTrialClear   || randoCtx->GetTrial(Rando::FIRE_TRIAL)->IsSkipped())   &&
+                                                                         (logic->WaterTrialClear  || randoCtx->GetTrial(Rando::WATER_TRIAL)->IsSkipped())  &&
+                                                                         (logic->ShadowTrialClear || randoCtx->GetTrial(Rando::SHADOW_TRIAL)->IsSkipped()) &&
+                                                                         (logic->SpiritTrialClear || randoCtx->GetTrial(Rando::SPIRIT_TRIAL)->IsSkipped()) &&
+                                                                         (logic->LightTrialClear  || randoCtx->GetTrial(Rando::LIGHT_TRIAL)->IsSkipped());}}),
+                  Entrance(RR_GANONS_CASTLE_DEKU_SCRUBS,  {[]{return randoCtx->GetTrickOption(RT_LENS_GANON) || logic->CanUse(RG_LENS_OF_TRUTH);}}),
   });
 
   areaTable[RR_GANONS_CASTLE_DEKU_SCRUBS] = Area("Ganon's Castle Deku Scrubs", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&FreeFairies, {[]{return true;}}),
+                  EventAccess(&logic->FreeFairies, {[]{return true;}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,  {[]{return CanStunDeku;}}),
-                  LocationAccess(RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT, {[]{return CanStunDeku;}}),
-                  LocationAccess(RC_GANONS_CASTLE_DEKU_SCRUB_RIGHT,        {[]{return CanStunDeku;}}),
-                  LocationAccess(RC_GANONS_CASTLE_DEKU_SCRUB_LEFT,         {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,  {[]{return logic->CanStunDeku;}}),
+                  LocationAccess(RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT, {[]{return logic->CanStunDeku;}}),
+                  LocationAccess(RC_GANONS_CASTLE_DEKU_SCRUB_RIGHT,        {[]{return logic->CanStunDeku;}}),
+                  LocationAccess(RC_GANONS_CASTLE_DEKU_SCRUB_LEFT,         {[]{return logic->CanStunDeku;}}),
   }, {});
 
   areaTable[RR_GANONS_CASTLE_FOREST_TRIAL] = Area("Ganon's Castle Forest Trial", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&ForestTrialClear, {[]{return CanUse(RG_LIGHT_ARROWS) && (FireArrows || DinsFire);}}),
+                  EventAccess(&logic->ForestTrialClear, {[]{return logic->CanUse(RG_LIGHT_ARROWS) && (logic->FireArrows || logic->DinsFire);}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_GANONS_CASTLE_FOREST_TRIAL_CHEST, {[]{return CanAdultDamage || CanChildDamage;}}),
+                  LocationAccess(RC_GANONS_CASTLE_FOREST_TRIAL_CHEST, {[]{return logic->CanAdultDamage || logic->CanChildDamage;}}),
   }, {});
 
   areaTable[RR_GANONS_CASTLE_FIRE_TRIAL] = Area("Ganon's Castle Fire Trial", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&FireTrialClear, {[]{return CanUse(RG_GORON_TUNIC) && CanUse(RG_GOLDEN_GAUNTLETS) && CanUse(RG_LIGHT_ARROWS) && CanUse(RG_LONGSHOT);}}),
+                  EventAccess(&logic->FireTrialClear, {[]{return logic->CanUse(RG_GORON_TUNIC) && logic->CanUse(RG_GOLDEN_GAUNTLETS) && logic->CanUse(RG_LIGHT_ARROWS) && logic->CanUse(RG_LONGSHOT);}}),
   }, {}, {});
 
   areaTable[RR_GANONS_CASTLE_WATER_TRIAL] = Area("Ganon's Castle Water Trial", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&BlueFireAccess,  {[]{return BlueFireAccess || HasBottle;}}),
-                  EventAccess(&FairyPot,        {[]{return FairyPot || BlueFire;}}),
-                  EventAccess(&WaterTrialClear, {[]{return BlueFire && IsAdult && CanUse(RG_MEGATON_HAMMER) && CanUse(RG_LIGHT_ARROWS);}}),
+                  EventAccess(&logic->BlueFireAccess,  {[]{return logic->BlueFireAccess || logic->HasBottle;}}),
+                  EventAccess(&logic->FairyPot,        {[]{return logic->FairyPot || logic->BlueFire;}}),
+                  EventAccess(&logic->WaterTrialClear, {[]{return logic->BlueFire && logic->IsAdult && logic->CanUse(RG_MEGATON_HAMMER) && logic->CanUse(RG_LIGHT_ARROWS);}}),
                 }, {
                   //Locations
                   LocationAccess(RC_GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST,  {[]{return true;}}),
@@ -86,26 +78,26 @@ void AreaTable_Init_GanonsCastle() {
 
   areaTable[RR_GANONS_CASTLE_SHADOW_TRIAL] = Area("Ganon's Castle Shadow Trial", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&ShadowTrialClear, {[]{return CanUse(RG_LIGHT_ARROWS) && CanUse(RG_MEGATON_HAMMER) && ((FireArrows && (randoCtx->GetTrickOption(RT_LENS_GANON) || CanUse(RG_LENS_OF_TRUTH))) || (CanUse(RG_LONGSHOT) && (CanUse(RG_HOVER_BOOTS) || (DinsFire && (randoCtx->GetTrickOption(RT_LENS_GANON) || CanUse(RG_LENS_OF_TRUTH))))));}}),
+                  EventAccess(&logic->ShadowTrialClear, {[]{return logic->CanUse(RG_LIGHT_ARROWS) && logic->CanUse(RG_MEGATON_HAMMER) && ((logic->FireArrows && (randoCtx->GetTrickOption(RT_LENS_GANON) || logic->CanUse(RG_LENS_OF_TRUTH))) || (logic->CanUse(RG_LONGSHOT) && (logic->CanUse(RG_HOVER_BOOTS) || (logic->DinsFire && (randoCtx->GetTrickOption(RT_LENS_GANON) || logic->CanUse(RG_LENS_OF_TRUTH))))));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST,            {[]{return CanUse(RG_FIRE_ARROWS) || CanUse(RG_HOOKSHOT) || CanUse(RG_HOVER_BOOTS) || CanUse(RG_SONG_OF_TIME) || IsChild;}}),
-                  LocationAccess(RC_GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST, {[]{return CanUse(RG_FIRE_ARROWS) || (CanUse(RG_LONGSHOT) && (CanUse(RG_HOVER_BOOTS) || CanUse(RG_DINS_FIRE)));}}),
+                  LocationAccess(RC_GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST,            {[]{return logic->CanUse(RG_FIRE_ARROWS) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_SONG_OF_TIME) || logic->IsChild;}}),
+                  LocationAccess(RC_GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST, {[]{return logic->CanUse(RG_FIRE_ARROWS) || (logic->CanUse(RG_LONGSHOT) && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_DINS_FIRE)));}}),
   }, {});
 
   areaTable[RR_GANONS_CASTLE_SPIRIT_TRIAL] = Area("Ganon's Castle Spirit Trial", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&NutPot,           {[]{return NutPot || (((randoCtx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) && CanJumpslash) || CanUse(RG_HOOKSHOT)) && HasBombchus && CanUse(RG_FAIRY_BOW) && (CanUse(RG_MIRROR_SHIELD) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && CanUse(RG_LIGHT_ARROWS))));}}),
-                  EventAccess(&SpiritTrialClear, {[]{return CanUse(RG_LIGHT_ARROWS) && (CanUse(RG_MIRROR_SHIELD) || randoCtx->GetOption(RSK_SUNLIGHT_ARROWS)) && HasBombchus && ((randoCtx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) && CanJumpslash) || CanUse(RG_HOOKSHOT));}}),
+                  EventAccess(&logic->NutPot,           {[]{return logic->NutPot || (((randoCtx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) && logic->CanJumpslash) || logic->CanUse(RG_HOOKSHOT)) && logic->HasBombchus && logic->CanUse(RG_FAIRY_BOW) && (logic->CanUse(RG_MIRROR_SHIELD) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS))));}}),
+                  EventAccess(&logic->SpiritTrialClear, {[]{return logic->CanUse(RG_LIGHT_ARROWS) && (logic->CanUse(RG_MIRROR_SHIELD) || randoCtx->GetOption(RSK_SUNLIGHT_ARROWS)) && logic->HasBombchus && ((randoCtx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) && logic->CanJumpslash) || logic->CanUse(RG_HOOKSHOT));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST, {[]{return (randoCtx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) || CanUse(RG_HOOKSHOT)) && CanJumpslash;}}),
-                  LocationAccess(RC_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST,      {[]{return (randoCtx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) || CanUse(RG_HOOKSHOT)) && HasBombchus && (randoCtx->GetTrickOption(RT_LENS_GANON) || CanUse(RG_LENS_OF_TRUTH));}}),
+                  LocationAccess(RC_GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST, {[]{return (randoCtx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) || logic->CanUse(RG_HOOKSHOT)) && logic->CanJumpslash;}}),
+                  LocationAccess(RC_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST,      {[]{return (randoCtx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) || logic->CanUse(RG_HOOKSHOT)) && logic->HasBombchus && (randoCtx->GetTrickOption(RT_LENS_GANON) || logic->CanUse(RG_LENS_OF_TRUTH));}}),
   }, {});
 
   areaTable[RR_GANONS_CASTLE_LIGHT_TRIAL] = Area("Ganon's Castle Light Trial", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&LightTrialClear, {[]{return CanUse(RG_LIGHT_ARROWS) && CanUse(RG_HOOKSHOT) && SmallKeys(RR_GANONS_CASTLE, 2) && (randoCtx->GetTrickOption(RT_LENS_GANON) || CanUse(RG_LENS_OF_TRUTH));}}),
+                  EventAccess(&logic->LightTrialClear, {[]{return logic->CanUse(RG_LIGHT_ARROWS) && logic->CanUse(RG_HOOKSHOT) && logic->SmallKeys(RR_GANONS_CASTLE, 2) && (randoCtx->GetTrickOption(RT_LENS_GANON) || logic->CanUse(RG_LENS_OF_TRUTH));}}),
                 }, {
                   //Locations
                   LocationAccess(RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST,        {[]{return true;}}),
@@ -114,16 +106,16 @@ void AreaTable_Init_GanonsCastle() {
                   LocationAccess(RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST,       {[]{return true;}}),
                   LocationAccess(RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST,      {[]{return true;}}),
                   LocationAccess(RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST,       {[]{return true;}}),
-                  LocationAccess(RC_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST, {[]{return randoCtx->GetTrickOption(RT_LENS_GANON) || CanUse(RG_LENS_OF_TRUTH);}}),
-                  LocationAccess(RC_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST,           {[]{return CanUse(RG_ZELDAS_LULLABY) && SmallKeys(RR_GANONS_CASTLE, 1);}}),
+                  LocationAccess(RC_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST, {[]{return randoCtx->GetTrickOption(RT_LENS_GANON) || logic->CanUse(RG_LENS_OF_TRUTH);}}),
+                  LocationAccess(RC_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST,           {[]{return logic->CanUse(RG_ZELDAS_LULLABY) && logic->SmallKeys(RR_GANONS_CASTLE, 1);}}),
   }, {});
   }
 
   areaTable[RR_GANONS_CASTLE_TOWER] = Area("Ganon's Castle Tower", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_GANONS_TOWER_BOSS_KEY_CHEST, {[]{return CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD);}}),
-                  LocationAccess(RC_GANONDORF_HINT,              {[]{return BossKeyGanonsCastle && (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD));}}),
-                  LocationAccess(RC_GANON,                       {[]{return HasBossSoul(RG_GANON_SOUL) && BossKeyGanonsCastle && CanUse(RG_LIGHT_ARROWS) && CanUse(RG_MASTER_SWORD);}}),
+                  LocationAccess(RC_GANONS_TOWER_BOSS_KEY_CHEST, {[]{return logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD);}}),
+                  LocationAccess(RC_GANONDORF_HINT,              {[]{return logic->BossKeyGanonsCastle && (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD));}}),
+                  LocationAccess(RC_GANON,                       {[]{return logic->HasBossSoul(RG_GANON_SOUL) && logic->BossKeyGanonsCastle && logic->CanUse(RG_LIGHT_ARROWS) && logic->CanUse(RG_MASTER_SWORD);}}),
   }, {});
 
   /*---------------------------
@@ -135,97 +127,91 @@ void AreaTable_Init_GanonsCastle() {
                   LocationAccess(RC_SHEIK_HINT_MQ_GC,  {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(RR_GANONS_CASTLE_ENTRYWAY, {[]{return true;}}),
-                  Entrance(RR_GANONS_CASTLE_MQ_MAIN,  {[]{return (CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_MEGATON_HAMMER)) || ((HasExplosives || Nuts || CanUse(RG_BOOMERANG)) && CanJumpslash);}}),
-  });
-
-  areaTable[RR_GANONS_CASTLE_MQ_MAIN] = Area("Ganon's Castle MQ Main", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
-                  //Exits
-                  Entrance(RR_GANONS_CASTLE_MQ_LOBBY,        {[]{return true;}}),
+                  Entrance(RR_GANONS_CASTLE_ENTRYWAY,        {[]{return (logic->CanUse(RG_MASTER_SWORD) || (logic->HasExplosives || ((logic->Nuts || logic->Boomerang) && (logic->Sticks || logic->KokiriSword))));}}),
                   Entrance(RR_GANONS_CASTLE_MQ_FOREST_TRIAL, {[]{return true;}}),
                   Entrance(RR_GANONS_CASTLE_MQ_FIRE_TRIAL,   {[]{return true;}}),
                   Entrance(RR_GANONS_CASTLE_MQ_WATER_TRIAL,  {[]{return true;}}),
                   Entrance(RR_GANONS_CASTLE_MQ_SHADOW_TRIAL, {[]{return true;}}),
                   Entrance(RR_GANONS_CASTLE_MQ_SPIRIT_TRIAL, {[]{return true;}}),
-                  Entrance(RR_GANONS_CASTLE_MQ_LIGHT_TRIAL,  {[]{return CanUse(RG_GOLDEN_GAUNTLETS);}}),
-                  Entrance(RR_GANONS_CASTLE_TOWER,           {[]{return (ForestTrialClear || randoCtx->GetTrial(Rando::FOREST_TRIAL)->IsSkipped()) &&
-                                                                            (FireTrialClear   || randoCtx->GetTrial(Rando::FIRE_TRIAL)->IsSkipped())   &&
-                                                                            (WaterTrialClear  || randoCtx->GetTrial(Rando::WATER_TRIAL)->IsSkipped())  &&
-                                                                            (ShadowTrialClear || randoCtx->GetTrial(Rando::SHADOW_TRIAL)->IsSkipped()) &&
-                                                                            (SpiritTrialClear || randoCtx->GetTrial(Rando::SPIRIT_TRIAL)->IsSkipped()) &&
-                                                                            (LightTrialClear  || randoCtx->GetTrial(Rando::LIGHT_TRIAL)->IsSkipped());}}),
-                  Entrance(RR_GANONS_CASTLE_MQ_DEKU_SCRUBS,  {[]{return randoCtx->GetTrickOption(RT_LENS_GANON_MQ) || CanUse(RG_LENS_OF_TRUTH);}}),
+                  Entrance(RR_GANONS_CASTLE_MQ_LIGHT_TRIAL,  {[]{return logic->CanUse(RG_GOLDEN_GAUNTLETS);}}),
+                  Entrance(RR_GANONS_CASTLE_TOWER,           {[]{return (logic->ForestTrialClear || randoCtx->GetTrial(Rando::FOREST_TRIAL)->IsSkipped()) &&
+                                                                            (logic->FireTrialClear   || randoCtx->GetTrial(Rando::FIRE_TRIAL)->IsSkipped())   &&
+                                                                            (logic->WaterTrialClear  || randoCtx->GetTrial(Rando::WATER_TRIAL)->IsSkipped())  &&
+                                                                            (logic->ShadowTrialClear || randoCtx->GetTrial(Rando::SHADOW_TRIAL)->IsSkipped()) &&
+                                                                            (logic->SpiritTrialClear || randoCtx->GetTrial(Rando::SPIRIT_TRIAL)->IsSkipped()) &&
+                                                                            (logic->LightTrialClear  || randoCtx->GetTrial(Rando::LIGHT_TRIAL)->IsSkipped());}}),
+                  Entrance(RR_GANONS_CASTLE_MQ_DEKU_SCRUBS,  {[]{return randoCtx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH);}}),
   });
 
   areaTable[RR_GANONS_CASTLE_MQ_DEKU_SCRUBS] = Area("Ganon's Castle MQ Deku Scrubs", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&FreeFairies, {[]{return true;}}),
+                  EventAccess(&logic->FreeFairies, {[]{return true;}}),
   }, {
                   //Locations
-                  LocationAccess(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,  {[]{return CanStunDeku;}}),
-                  LocationAccess(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,       {[]{return CanStunDeku;}}),
-                  LocationAccess(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT, {[]{return CanStunDeku;}}),
-                  LocationAccess(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,         {[]{return CanStunDeku;}}),
-                  LocationAccess(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,        {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,  {[]{return logic->CanStunDeku;}}),
+                  LocationAccess(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,       {[]{return logic->CanStunDeku;}}),
+                  LocationAccess(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT, {[]{return logic->CanStunDeku;}}),
+                  LocationAccess(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,         {[]{return logic->CanStunDeku;}}),
+                  LocationAccess(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,        {[]{return logic->CanStunDeku;}}),
   }, {});
 
   areaTable[RR_GANONS_CASTLE_MQ_FOREST_TRIAL] = Area("Ganon's Castle MQ Forest Trial", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&ForestTrialClear, {[]{return IsAdult && CanUse(RG_LIGHT_ARROWS) && (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) && CanUse(RG_SONG_OF_TIME);}}),
+                  EventAccess(&logic->ForestTrialClear, {[]{return logic->IsAdult && logic->CanUse(RG_LIGHT_ARROWS) && (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && logic->CanUse(RG_SONG_OF_TIME);}}),
   }, {
                   //Locations
-                  LocationAccess(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST,        {[]{return (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) && (CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT));}}),
-                  LocationAccess(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST, {[]{return (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) && HasFireSource;}}),
-                  LocationAccess(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY,        {[]{return (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) && HookshotOrBoomerang;}}),
+                  LocationAccess(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST,        {[]{return (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT));}}),
+                  LocationAccess(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST, {[]{return (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && logic->HasFireSource;}}),
+                  LocationAccess(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY,        {[]{return (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && logic->HookshotOrBoomerang;}}),
   }, {});
 
   areaTable[RR_GANONS_CASTLE_MQ_FIRE_TRIAL] = Area("Ganon's Castle MQ Fire Trial", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&FireTrialClear, {[]{return CanUse(RG_GORON_TUNIC) && CanUse(RG_GOLDEN_GAUNTLETS) && CanUse(RG_LIGHT_ARROWS) && (CanUse(RG_LONGSHOT) || HoverBoots || (randoCtx->GetTrickOption(RT_GANON_MQ_FIRE_TRIAL) && CanUse(RG_HOOKSHOT)));}}),
-                    //Trick: CanUse(RG_GORON_TUNIC) && CanUse(RG_GOLDEN_GAUNTLETS) && CanUse(RG_LIGHT_ARROWS) && (CanUse(RG_LONGSHOT) || HoverBoots || (LogicFireTrialMQ && CanUse(RG_HOOKSHOT)))
+                  EventAccess(&logic->FireTrialClear, {[]{return logic->CanUse(RG_GORON_TUNIC) && logic->CanUse(RG_GOLDEN_GAUNTLETS) && logic->CanUse(RG_LIGHT_ARROWS) && (logic->CanUse(RG_LONGSHOT) || logic->HoverBoots || (randoCtx->GetTrickOption(RT_GANON_MQ_FIRE_TRIAL) && logic->CanUse(RG_HOOKSHOT)));}}),
+                    //Trick: logic->CanUse(RG_GORON_TUNIC) && logic->CanUse(RG_GOLDEN_GAUNTLETS) && logic->CanUse(RG_LIGHT_ARROWS) && (logic->CanUse(RG_LONGSHOT) || logic->HoverBoots || (LogicFireTrialMQ && logic->CanUse(RG_HOOKSHOT)))
   }, {}, {});
 
   areaTable[RR_GANONS_CASTLE_MQ_WATER_TRIAL] = Area("Ganon's Castle MQ Water Trial", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&WaterTrialClear, {[]{return BlueFire && IsAdult && CanUse(RG_LIGHT_ARROWS) && SmallKeys(RR_GANONS_CASTLE, 3);}}),
-                  EventAccess(&BlueFireAccess,  {[]{return BlueFireAccess || (HasBottle && CanJumpslash);}}),
+                  EventAccess(&logic->WaterTrialClear, {[]{return logic->BlueFire && logic->IsAdult && logic->CanUse(RG_LIGHT_ARROWS) && logic->SmallKeys(RR_GANONS_CASTLE, 3);}}),
+                  EventAccess(&logic->BlueFireAccess,  {[]{return logic->BlueFireAccess || (logic->HasBottle && logic->CanJumpslash);}}),
   }, {
                   //Locations
-                  LocationAccess(RC_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST, {[]{return BlueFire;}}),
+                  LocationAccess(RC_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST, {[]{return logic->BlueFire;}}),
   }, {});
 
   areaTable[RR_GANONS_CASTLE_MQ_SHADOW_TRIAL] = Area("Ganon's Castle MQ Shadow Trial", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&ShadowTrialClear, {[]{return IsAdult && CanUse(RG_LIGHT_ARROWS) && (randoCtx->GetTrickOption(RT_LENS_GANON_MQ) || CanUse(RG_LENS_OF_TRUTH)) && (HoverBoots || (Hookshot && (HasFireSource || randoCtx->GetTrickOption(RT_GANON_MQ_SHADOW_TRIAL))));}}),
-                    //Trick: IsAdult && CanUse(RG_LIGHT_ARROWS) && (LogicLensCastleMQ || CanUse(RG_LENS_OF_TRUTH)) && (HoverBoots || (Hookshot && (HasFireSource || LogicShadowTrialMQ)))
+                  EventAccess(&logic->ShadowTrialClear, {[]{return logic->IsAdult && logic->CanUse(RG_LIGHT_ARROWS) && (randoCtx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->HoverBoots || (logic->Hookshot && (logic->HasFireSource || randoCtx->GetTrickOption(RT_GANON_MQ_SHADOW_TRIAL))));}}),
+                    //Trick: logic->IsAdult && logic->CanUse(RG_LIGHT_ARROWS) && (LogicLensCastleMQ || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->HoverBoots || (logic->Hookshot && (logic->HasFireSource || LogicShadowTrialMQ)))
   }, {
                   //Locations
-                  LocationAccess(RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST, {[]{return IsAdult && ((Bow && (CanUse(RG_HOOKSHOT) || CanUse(RG_HOVER_BOOTS))) || (CanUse(RG_HOVER_BOOTS) && (randoCtx->GetTrickOption(RT_LENS_GANON_MQ) || CanUse(RG_LENS_OF_TRUTH)) && (HasExplosives || GoronBracelet || CanUse(RG_DINS_FIRE))));}}),
-                  LocationAccess(RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST,  {[]{return IsAdult && Bow && (randoCtx->GetTrickOption(RT_LENS_GANON_MQ) || CanUse(RG_LENS_OF_TRUTH)) && (HoverBoots || (Hookshot && (HasFireSource || randoCtx->GetTrickOption(RT_GANON_MQ_SHADOW_TRIAL))));}}),
-                    //Trick: IsAdult && Bow && (LogicLensCastleMQ || CanUse(RG_LENS_OF_TRUTH)) && (HoverBoots || (Hookshot && (HasFireSource || LogicShadowTrialMQ)))
+                  LocationAccess(RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST, {[]{return logic->IsAdult && ((logic->Bow && (logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_HOVER_BOOTS))) || (logic->CanUse(RG_HOVER_BOOTS) && (randoCtx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->HasExplosives || logic->GoronBracelet || logic->CanUse(RG_DINS_FIRE))));}}),
+                  LocationAccess(RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST,  {[]{return logic->IsAdult && logic->Bow && (randoCtx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->HoverBoots || (logic->Hookshot && (logic->HasFireSource || randoCtx->GetTrickOption(RT_GANON_MQ_SHADOW_TRIAL))));}}),
+                    //Trick: logic->IsAdult && logic->Bow && (LogicLensCastleMQ || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->HoverBoots || (logic->Hookshot && (logic->HasFireSource || LogicShadowTrialMQ)))
   }, {});
 
   areaTable[RR_GANONS_CASTLE_MQ_SPIRIT_TRIAL] = Area("Ganon's Castle MQ Spirit Castle", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&SpiritTrialClear, {[]{return IsAdult && CanUse(RG_LIGHT_ARROWS) && Hammer && HasBombchus && ((FireArrows && MirrorShield) || randoCtx->GetOption(RSK_SUNLIGHT_ARROWS));}}),
-                  EventAccess(&NutPot,           {[]{return NutPot || (Hammer && HasBombchus && IsAdult && ((CanUse(RG_FIRE_ARROWS) && MirrorShield) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && CanUse(RG_LIGHT_ARROWS))));}}),
+                  EventAccess(&logic->SpiritTrialClear, {[]{return logic->IsAdult && logic->CanUse(RG_LIGHT_ARROWS) && logic->Hammer && logic->HasBombchus && ((logic->FireArrows && logic->MirrorShield) || randoCtx->GetOption(RSK_SUNLIGHT_ARROWS));}}),
+                  EventAccess(&logic->NutPot,           {[]{return logic->NutPot || (logic->Hammer && logic->HasBombchus && logic->IsAdult && ((logic->CanUse(RG_FIRE_ARROWS) && logic->MirrorShield) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS))));}}),
   }, {
                   //Locations
-                  LocationAccess(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST,             {[]{return IsAdult && (Bow || randoCtx->GetTrickOption(RT_RUSTED_SWITCHES)) && Hammer;}}),
-                  LocationAccess(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST,         {[]{return IsAdult && (Bow || randoCtx->GetTrickOption(RT_RUSTED_SWITCHES)) && Hammer && HasBombchus && (randoCtx->GetTrickOption(RT_LENS_GANON_MQ) || CanUse(RG_LENS_OF_TRUTH));}}),
-                  LocationAccess(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST,    {[]{return IsAdult && Hammer && HasBombchus && ((CanUse(RG_FIRE_ARROWS) && CanUse(RG_MIRROR_SHIELD)) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && CanUse(RG_LIGHT_ARROWS)));}}),
-                  LocationAccess(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST,     {[]{return IsAdult && Hammer && HasBombchus && ((CanUse(RG_FIRE_ARROWS) && CanUse(RG_MIRROR_SHIELD)) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && CanUse(RG_LIGHT_ARROWS)));}}),
-                  LocationAccess(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST,  {[]{return IsAdult && Hammer && HasBombchus && ((CanUse(RG_FIRE_ARROWS) && CanUse(RG_MIRROR_SHIELD)) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && CanUse(RG_LIGHT_ARROWS)));}}),
-                  LocationAccess(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST,    {[]{return IsAdult && Hammer && HasBombchus && ((CanUse(RG_FIRE_ARROWS) && CanUse(RG_MIRROR_SHIELD)) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && CanUse(RG_LIGHT_ARROWS)));}}),
+                  LocationAccess(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST,             {[]{return logic->IsAdult && (logic->Bow || randoCtx->GetTrickOption(RT_RUSTED_SWITCHES)) && logic->Hammer;}}),
+                  LocationAccess(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST,         {[]{return logic->IsAdult && (logic->Bow || randoCtx->GetTrickOption(RT_RUSTED_SWITCHES)) && logic->Hammer && logic->HasBombchus && (randoCtx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH));}}),
+                  LocationAccess(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST,    {[]{return logic->IsAdult && logic->Hammer && logic->HasBombchus && ((logic->CanUse(RG_FIRE_ARROWS) && logic->CanUse(RG_MIRROR_SHIELD)) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS)));}}),
+                  LocationAccess(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST,     {[]{return logic->IsAdult && logic->Hammer && logic->HasBombchus && ((logic->CanUse(RG_FIRE_ARROWS) && logic->CanUse(RG_MIRROR_SHIELD)) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS)));}}),
+                  LocationAccess(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST,  {[]{return logic->IsAdult && logic->Hammer && logic->HasBombchus && ((logic->CanUse(RG_FIRE_ARROWS) && logic->CanUse(RG_MIRROR_SHIELD)) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS)));}}),
+                  LocationAccess(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST,    {[]{return logic->IsAdult && logic->Hammer && logic->HasBombchus && ((logic->CanUse(RG_FIRE_ARROWS) && logic->CanUse(RG_MIRROR_SHIELD)) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS)));}}),
   }, {});
 
   areaTable[RR_GANONS_CASTLE_MQ_LIGHT_TRIAL] = Area("Ganon's Castle MQ Light Trial", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&LightTrialClear, {[]{return IsAdult && (CanUse(RG_MASTER_SWORD) || CanUse(RG_KOKIRI_SWORD) || CanUse(RG_BIGGORON_SWORD)) && CanUse(RG_LIGHT_ARROWS) && SmallKeys(RR_GANONS_CASTLE, 3) && (randoCtx->GetTrickOption(RT_LENS_GANON_MQ) || CanUse(RG_LENS_OF_TRUTH)) && (Hookshot || randoCtx->GetTrickOption(RT_GANON_MQ_LIGHT_TRIAL));}}),
-                    //Trick: IsAdult && CanUse(RG_LIGHT_ARROWS) && SmallKeys(RR_GANONS_CASTLE, 3) && (LogicLensCastleMQ || CanUse(RG_LENS_OF_TRUTH)) && (Hookshot || LogicLightTrialMQ)
+                  EventAccess(&logic->LightTrialClear, {[]{return logic->IsAdult && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && logic->CanUse(RG_LIGHT_ARROWS) && logic->SmallKeys(RR_GANONS_CASTLE, 3) && (randoCtx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->Hookshot || randoCtx->GetTrickOption(RT_GANON_MQ_LIGHT_TRIAL));}}),
+                    //Trick: logic->IsAdult && logic->CanUse(RG_LIGHT_ARROWS) && logic->SmallKeys(RR_GANONS_CASTLE, 3) && (LogicLensCastleMQ || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->Hookshot || LogicLightTrialMQ)
   }, {
                   //Locations
-                  LocationAccess(RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST, {[]{return (CanUse(RG_MASTER_SWORD) || CanUse(RG_KOKIRI_SWORD) || CanUse(RG_BIGGORON_SWORD)) && CanUse(RG_ZELDAS_LULLABY);}}),
+                  LocationAccess(RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST, {[]{return (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && logic->CanUse(RG_ZELDAS_LULLABY);}}),
   }, {});
   }
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp
index fab92a5b6..f48bac91c 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp
@@ -1,9 +1,7 @@
 #include "../location_access.hpp"
-#include "../logic.hpp"
 #include "../../entrance.h"
 #include "../../dungeon.h"
 
-using namespace Logic;
 using namespace Rando;
 
 void AreaTable_Init_GerudoTrainingGrounds() {
@@ -23,28 +21,28 @@ void AreaTable_Init_GerudoTrainingGrounds() {
   if (randoCtx->GetDungeon(GERUDO_TRAINING_GROUNDS)->IsVanilla()) {
   areaTable[RR_GERUDO_TRAINING_GROUNDS_LOBBY] = Area("Gerudo Training Grounds Lobby", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST,  {[]{return CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT);}}),
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST, {[]{return CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT);}}),
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_STALFOS_CHEST,     {[]{return CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD);}}),
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_BEAMOS_CHEST,      {[]{return HasExplosives && (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD));}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST,  {[]{return logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT);}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST, {[]{return logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT);}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_STALFOS_CHEST,     {[]{return logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD);}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_BEAMOS_CHEST,      {[]{return logic->HasExplosives && (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD));}}),
                 }, {
                   //Exits
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_ENTRYWAY,         {[]{return true;}}),
-                  Entrance(RR_GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_ROOM, {[]{return (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) && (CanUse(RG_HOOKSHOT) || randoCtx->GetTrickOption(RT_GTG_WITHOUT_HOOKSHOT));}}),
-                  Entrance(RR_GERUDO_TRAINING_GROUNDS_LAVA_ROOM,        {[]{return Here(RR_GERUDO_TRAINING_GROUNDS_LOBBY, []{return (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) && HasExplosives;});}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_ROOM, {[]{return (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && (logic->CanUse(RG_HOOKSHOT) || randoCtx->GetTrickOption(RT_GTG_WITHOUT_HOOKSHOT));}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_LAVA_ROOM,        {[]{return Here(RR_GERUDO_TRAINING_GROUNDS_LOBBY, []{return (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && logic->HasExplosives;});}}),
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE,     {[]{return true;}}),
   });
 
   areaTable[RR_GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE] = Area("Gerudo Training Grounds Central Maze", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST,   {[]{return SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 3) && (randoCtx->GetTrickOption(RT_LENS_GTG) || CanUse(RG_LENS_OF_TRUTH));}}),
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST,  {[]{return SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 4);}}),
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_SECOND_CHEST, {[]{return SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 6);}}),
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_THIRD_CHEST,  {[]{return SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 7);}}),
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FINAL_CHEST,  {[]{return SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 9);}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST,   {[]{return logic->SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 3) && (randoCtx->GetTrickOption(RT_LENS_GTG) || logic->CanUse(RG_LENS_OF_TRUTH));}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST,  {[]{return logic->SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 4);}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_SECOND_CHEST, {[]{return logic->SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 6);}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_THIRD_CHEST,  {[]{return logic->SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 7);}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FINAL_CHEST,  {[]{return logic->SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 9);}}),
                 }, {
                   //Exits
-                  Entrance(RR_GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE_RIGHT, {[]{return SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 9);}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE_RIGHT, {[]{return logic->SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 9);}}),
   });
 
   areaTable[RR_GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE_RIGHT] = Area("Gerudo Training Grounds Central Maze Right", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
@@ -54,32 +52,32 @@ void AreaTable_Init_GerudoTrainingGrounds() {
                   LocationAccess(RC_GERUDO_TRAINING_GROUND_FREESTANDING_KEY,         {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(RR_GERUDO_TRAINING_GROUNDS_HAMMER_ROOM, {[]{return CanUse(RG_HOOKSHOT);}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_HAMMER_ROOM, {[]{return logic->CanUse(RG_HOOKSHOT);}}),
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_LAVA_ROOM,   {[]{return true;}}),
   });
 
   areaTable[RR_GERUDO_TRAINING_GROUNDS_LAVA_ROOM] = Area("Gerudo Training Grounds Lava Room", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST, {[]{return CanUse(RG_HOOKSHOT) && CanUse(RG_SONG_OF_TIME) && IronBoots && WaterTimer >= 24;}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST, {[]{return logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_SONG_OF_TIME) && logic->IronBoots && logic->WaterTimer >= 24;}}),
                 }, {
                   //Exits
-                  Entrance(RR_GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE_RIGHT, {[]{return CanUse(RG_SONG_OF_TIME) || IsChild;}}),
-                  Entrance(RR_GERUDO_TRAINING_GROUNDS_HAMMER_ROOM,        {[]{return CanUse(RG_LONGSHOT)  || (CanUse(RG_HOVER_BOOTS) && CanUse(RG_HOOKSHOT));}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE_RIGHT, {[]{return logic->CanUse(RG_SONG_OF_TIME) || logic->IsChild;}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_HAMMER_ROOM,        {[]{return logic->CanUse(RG_LONGSHOT)  || (logic->CanUse(RG_HOVER_BOOTS) && logic->CanUse(RG_HOOKSHOT));}}),
   });
 
   areaTable[RR_GERUDO_TRAINING_GROUNDS_HAMMER_ROOM] = Area("Gerudo Training Grounds Hammer Room", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST,  {[]{return CanAdultAttack || CanChildAttack;}}),
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST, {[]{return CanUse(RG_MEGATON_HAMMER) || (CanTakeDamage && randoCtx->GetTrickOption(RT_FLAMING_CHESTS));}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST,  {[]{return logic->CanAdultAttack || logic->CanChildAttack;}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST, {[]{return logic->CanUse(RG_MEGATON_HAMMER) || (logic->CanTakeDamage && randoCtx->GetTrickOption(RT_FLAMING_CHESTS));}}),
                 }, {
                   //Exits
-                  Entrance(RR_GERUDO_TRAINING_GROUNDS_EYE_STATUE_LOWER, {[]{return CanUse(RG_MEGATON_HAMMER) && CanUse(RG_FAIRY_BOW);}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_EYE_STATUE_LOWER, {[]{return logic->CanUse(RG_MEGATON_HAMMER) && logic->CanUse(RG_FAIRY_BOW);}}),
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_LAVA_ROOM,        {[]{return true;}}),
   });
 
   areaTable[RR_GERUDO_TRAINING_GROUNDS_EYE_STATUE_LOWER] = Area("Gerudo Training Grounds Eye Statue Lower", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_EYE_STATUE_CHEST, {[]{return CanUse(RG_FAIRY_BOW);}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_EYE_STATUE_CHEST, {[]{return logic->CanUse(RG_FAIRY_BOW);}}),
                 }, {
                   //Exits
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_HAMMER_ROOM, {[]{return true;}}),
@@ -87,7 +85,7 @@ void AreaTable_Init_GerudoTrainingGrounds() {
 
   areaTable[RR_GERUDO_TRAINING_GROUNDS_EYE_STATUE_UPPER] = Area("Gerudo Training Grounds Eye Statue Upper", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_NEAR_SCARECROW_CHEST, {[]{return CanUse(RG_FAIRY_BOW);}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_NEAR_SCARECROW_CHEST, {[]{return logic->CanUse(RG_FAIRY_BOW);}}),
                 }, {
                   //Exits
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_EYE_STATUE_LOWER, {[]{return true;}}),
@@ -95,19 +93,19 @@ void AreaTable_Init_GerudoTrainingGrounds() {
 
   areaTable[RR_GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_ROOM] = Area("Gerudo Training Grounds Heavy Block Room", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST, {[]{return CanJumpslash;}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST, {[]{return logic->CanJumpslash;}}),
                 }, {
                   //Exits
-                  Entrance(RR_GERUDO_TRAINING_GROUNDS_EYE_STATUE_UPPER, {[]{return (randoCtx->GetTrickOption(RT_LENS_GTG) || CanUse(RG_LENS_OF_TRUTH)) && (CanUse(RG_HOOKSHOT) || (randoCtx->GetTrickOption(RT_GTG_FAKE_WALL) && CanUse(RG_HOVER_BOOTS)));}}),
-                  Entrance(RR_GERUDO_TRAINING_GROUNDS_LIKE_LIKE_ROOM,   {[]{return (randoCtx->GetTrickOption(RT_LENS_GTG) || CanUse(RG_LENS_OF_TRUTH)) && (CanUse(RG_HOOKSHOT) || (randoCtx->GetTrickOption(RT_GTG_FAKE_WALL) && CanUse(RG_HOVER_BOOTS))) && CanUse(RG_SILVER_GAUNTLETS);}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_EYE_STATUE_UPPER, {[]{return (randoCtx->GetTrickOption(RT_LENS_GTG) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->CanUse(RG_HOOKSHOT) || (randoCtx->GetTrickOption(RT_GTG_FAKE_WALL) && logic->CanUse(RG_HOVER_BOOTS)));}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_LIKE_LIKE_ROOM,   {[]{return (randoCtx->GetTrickOption(RT_LENS_GTG) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->CanUse(RG_HOOKSHOT) || (randoCtx->GetTrickOption(RT_GTG_FAKE_WALL) && logic->CanUse(RG_HOVER_BOOTS))) && logic->CanUse(RG_SILVER_GAUNTLETS);}}),
   });
 
   areaTable[RR_GERUDO_TRAINING_GROUNDS_LIKE_LIKE_ROOM] = Area("Gerudo Training Grounds Like Like Room", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST,  {[]{return CanJumpslash;}}),
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST, {[]{return CanJumpslash;}}),
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_THIRD_CHEST,  {[]{return CanJumpslash;}}),
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FOURTH_CHEST, {[]{return CanJumpslash;}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST,  {[]{return logic->CanJumpslash;}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST, {[]{return logic->CanJumpslash;}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_THIRD_CHEST,  {[]{return logic->CanJumpslash;}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FOURTH_CHEST, {[]{return logic->CanJumpslash;}}),
   }, {});
   }
 
@@ -119,75 +117,75 @@ void AreaTable_Init_GerudoTrainingGrounds() {
                   //Locations
                   LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST,       {[]{return true;}}),
                   LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST,      {[]{return true;}}),
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_HIDDEN_CEILING_CHEST,   {[]{return randoCtx->GetTrickOption(RT_LENS_GTG_MQ) || CanUse(RG_LENS_OF_TRUTH);}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_HIDDEN_CEILING_CHEST,   {[]{return randoCtx->GetTrickOption(RT_LENS_GTG_MQ) || logic->CanUse(RG_LENS_OF_TRUTH);}}),
                   LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_FIRST_CHEST,  {[]{return true;}}),
                   LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_SECOND_CHEST, {[]{return true;}}),
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_THIRD_CHEST,  {[]{return SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 1);}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_THIRD_CHEST,  {[]{return logic->SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 1);}}),
   }, {
                   //Exits
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_ENTRYWAY,      {[]{return true;}}),
-                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_LEFT_SIDE,  {[]{return Here(RR_GERUDO_TRAINING_GROUNDS_MQ_LOBBY, []{return HasFireSource;});}}),
-                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_RIGHT_SIDE, {[]{return Here(RR_GERUDO_TRAINING_GROUNDS_MQ_LOBBY, []{return (IsAdult && CanUse(RG_FAIRY_BOW)) || (IsChild && CanUse(RG_FAIRY_SLINGSHOT));});}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_LEFT_SIDE,  {[]{return Here(RR_GERUDO_TRAINING_GROUNDS_MQ_LOBBY, []{return logic->HasFireSource;});}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_RIGHT_SIDE, {[]{return Here(RR_GERUDO_TRAINING_GROUNDS_MQ_LOBBY, []{return (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW)) || (logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT));});}}),
   });
 
   areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_RIGHT_SIDE] = Area("Gerudo Training Grounds MQ Right Side", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  //EventAccess(&WallFairy, {[]{return WallFairy || (IsAdult && CanUse(RG_FAIRY_BOW));}}),
+                  //EventAccess(&WallFairy, {[]{return WallFairy || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW));}}),
   }, {
                   //Locations
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_DINOLFOS_CHEST, {[]{return IsAdult && (CanUse(RG_MASTER_SWORD) || CanUse(RG_KOKIRI_SWORD) || CanUse(RG_BIGGORON_SWORD));}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_DINOLFOS_CHEST, {[]{return logic->IsAdult && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BIGGORON_SWORD));}}),
   }, {
                   //Exits
-                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER, {[]{return (Bow || (CanUse(RG_LONGSHOT) && HasFireSource)) && CanUse(RG_HOVER_BOOTS) && IsAdult && (CanUse(RG_MASTER_SWORD) || CanUse(RG_KOKIRI_SWORD) || CanUse(RG_BIGGORON_SWORD));}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER, {[]{return (logic->Bow || (logic->CanUse(RG_LONGSHOT) && logic->HasFireSource)) && logic->CanUse(RG_HOVER_BOOTS) && logic->IsAdult && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BIGGORON_SWORD));}}),
   });
 
   areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER] = Area("Gerudo Training Grounds MQ Underwater", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST, {[]{return HasFireSource && IsAdult && CanUse(RG_IRON_BOOTS) && WaterTimer >= 24 && CanTakeDamage;}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST, {[]{return logic->HasFireSource && logic->IsAdult && logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer >= 24 && logic->CanTakeDamage;}}),
   }, {});
 
   areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_LEFT_SIDE] = Area("Gerudo Training Grounds MQ Left Side", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST, {[]{return CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || HasExplosives;}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST, {[]{return logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->HasExplosives;}}),
   }, {
                   //Exits
-                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_STALFOS_ROOM, {[]{return (IsAdult && CanUse(RG_LONGSHOT)) || randoCtx->GetTrickOption(RT_GTG_MQ_WIHTOUT_HOOKSHOT) || (randoCtx->GetTrickOption(RT_GTG_MQ_WITH_HOOKSHOT) && IsAdult && CanUse(RG_HOOKSHOT));}}),
-                    //Trick: (IsAdult && CanUse(RG_LONGSHOT)) || LogicGtgMQWithoutHookshot || (LogicGtgMQWithHookshot && IsAdult && CanUse(RG_HOOKSHOT))
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_STALFOS_ROOM, {[]{return (logic->IsAdult && logic->CanUse(RG_LONGSHOT)) || randoCtx->GetTrickOption(RT_GTG_MQ_WIHTOUT_HOOKSHOT) || (randoCtx->GetTrickOption(RT_GTG_MQ_WITH_HOOKSHOT) && logic->IsAdult && logic->CanUse(RG_HOOKSHOT));}}),
+                    //Trick: (logic->IsAdult && logic->CanUse(RG_LONGSHOT)) || LogicGtgMQWithoutHookshot || (LogicGtgMQWithHookshot && logic->IsAdult && logic->CanUse(RG_HOOKSHOT))
   });
 
   areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_STALFOS_ROOM] = Area("Gerudo Training Grounds MQ Stalfos Room", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&BlueFireAccess,  {[]{return BlueFireAccess || HasBottle;}}),
+                  EventAccess(&logic->BlueFireAccess,  {[]{return logic->BlueFireAccess || logic->HasBottle;}}),
   }, {
                   //Locations
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_BEFORE_HEAVY_BLOCK_CHEST, {[]{return IsAdult && (CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD));}}),
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_HEAVY_BLOCK_CHEST,        {[]{return CanUse(RG_SILVER_GAUNTLETS) && (CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD));}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_BEFORE_HEAVY_BLOCK_CHEST, {[]{return logic->IsAdult && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD));}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_HEAVY_BLOCK_CHEST,        {[]{return logic->CanUse(RG_SILVER_GAUNTLETS) && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD));}}),
   }, {
                   //Exits
-                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_BACK_AREAS, {[]{return IsAdult && (CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) && (randoCtx->GetTrickOption(RT_LENS_GTG_MQ) || CanUse(RG_LENS_OF_TRUTH)) && BlueFire && (CanUse(RG_SONG_OF_TIME) || (randoCtx->GetTrickOption(RT_GTG_FAKE_WALL) && IsAdult && CanUse(RG_HOVER_BOOTS)));}}),
-                    //Trick: IsAdult && (LogicLensGtgMQ || CanUse(RG_LENS_OF_TRUTH)) && BlueFire && (CanUse(RG_SONG_OF_TIME) || (LogicGtgFakeWall && IsAdult && CanUse(RG_HOVER_BOOTS)))
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_BACK_AREAS, {[]{return logic->IsAdult && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && (randoCtx->GetTrickOption(RT_LENS_GTG_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->BlueFire && (logic->CanUse(RG_SONG_OF_TIME) || (randoCtx->GetTrickOption(RT_GTG_FAKE_WALL) && logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS)));}}),
+                    //Trick: logic->IsAdult && (LogicLensGtgMQ || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->BlueFire && (logic->CanUse(RG_SONG_OF_TIME) || (LogicGtgFakeWall && logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS)))
   });
 
   areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_BACK_AREAS] = Area("Gerudo Training Grounds MQ Back Areas", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_EYE_STATUE_CHEST,          {[]{return CanUse(RG_FAIRY_BOW);}}),
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_SECOND_IRON_KNUCKLE_CHEST, {[]{return CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD);}}),
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_FLAME_CIRCLE_CHEST,        {[]{return CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_BOW) || HasExplosives;}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_EYE_STATUE_CHEST,          {[]{return logic->CanUse(RG_FAIRY_BOW);}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_SECOND_IRON_KNUCKLE_CHEST, {[]{return logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD);}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_FLAME_CIRCLE_CHEST,        {[]{return logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->HasExplosives;}}),
   }, {
                   //Exits
-                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_CENTRAL_MAZE_RIGHT, {[]{return CanUse(RG_MEGATON_HAMMER);}}),
-                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_RIGHT_SIDE,         {[]{return CanUse(RG_LONGSHOT);}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_CENTRAL_MAZE_RIGHT, {[]{return logic->CanUse(RG_MEGATON_HAMMER);}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_RIGHT_SIDE,         {[]{return logic->CanUse(RG_LONGSHOT);}}),
   });
 
   areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_CENTRAL_MAZE_RIGHT] = Area("Gerudo Training Grounds MQ Central Maze Right", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_CENTRAL_CHEST, {[]{return true;}}),
                   LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_SIDE_CHEST,    {[]{return true;}}),
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_ICE_ARROWS_CHEST,         {[]{return SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 3);}}),
+                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_ICE_ARROWS_CHEST,         {[]{return logic->SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 3);}}),
   }, {
                   //Exits
-                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER,  {[]{return IsAdult && (CanUse(RG_LONGSHOT) || (CanUse(RG_HOOKSHOT) && Bow));}}),
-                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_RIGHT_SIDE,  {[]{return IsAdult && CanUse(RG_HOOKSHOT);}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER,  {[]{return logic->IsAdult && (logic->CanUse(RG_LONGSHOT) || (logic->CanUse(RG_HOOKSHOT) && logic->Bow));}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_RIGHT_SIDE,  {[]{return logic->IsAdult && logic->CanUse(RG_HOOKSHOT);}}),
   });
   }
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
index 350cdf703..2fd86634a 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
@@ -1,35 +1,33 @@
 #include "../location_access.hpp"
-#include "../logic.hpp"
 #include "../../entrance.h"
 
-using namespace Logic;
 using namespace Rando;
 
 void AreaTable_Init_GerudoValley() {
   areaTable[RR_GERUDO_VALLEY] = Area("Gerudo Valley", "Gerudo Valley", RA_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&BugRock, {[]{return BugRock || IsChild;}}),
+                  EventAccess(&logic->BugRock, {[]{return logic->BugRock || logic->IsChild;}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_GV_GS_SMALL_BRIDGE, {[]{return IsChild && HookshotOrBoomerang && AtNight && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_GV_GS_SMALL_BRIDGE, {[]{return logic->IsChild && logic->HookshotOrBoomerang && logic->AtNight && logic->CanGetNightTimeGS;}}),
                 }, {
                   //Exits
                   Entrance(RR_HYRULE_FIELD,      {[]{return true;}}),
                   Entrance(RR_GV_UPPER_STREAM,   {[]{return true;}}),
-                  Entrance(RR_GV_CRATE_LEDGE,    {[]{return IsChild || CanUse(RG_LONGSHOT);}}),
+                  Entrance(RR_GV_CRATE_LEDGE,    {[]{return logic->IsChild || logic->CanUse(RG_LONGSHOT);}}),
                   Entrance(RR_GV_GROTTO_LEDGE,   {[]{return true;}}),
-                  Entrance(RR_GV_FORTRESS_SIDE,  {[]{return (IsAdult && (CanRideEpona || CanUse(RG_LONGSHOT) || randoCtx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_OPEN) || CarpenterRescue)) || (IsChild && CanUse(RG_HOOKSHOT));}}),
+                  Entrance(RR_GV_FORTRESS_SIDE,  {[]{return (logic->IsAdult && (logic->CanRideEpona || logic->CanUse(RG_LONGSHOT) || randoCtx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_OPEN) || logic->CarpenterRescue)) || (logic->IsChild && logic->CanUse(RG_HOOKSHOT));}}),
   });
 
   areaTable[RR_GV_UPPER_STREAM] = Area("GV Upper Stream", "Gerudo Valley", RA_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&GossipStoneFairy, {[]{return GossipStoneFairy || CanSummonGossipFairy;}}),
-                  EventAccess(&BeanPlantFairy,   {[]{return BeanPlantFairy   || (CanPlantBean(RR_GV_UPPER_STREAM) && CanUse(RG_SONG_OF_STORMS));}}),
+                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CanSummonGossipFairy;}}),
+                  EventAccess(&logic->BeanPlantFairy,   {[]{return logic->BeanPlantFairy   || (CanPlantBean(RR_GV_UPPER_STREAM) && logic->CanUse(RG_SONG_OF_STORMS));}}),
                 }, {
                   //Locations
                   LocationAccess(RC_GV_WATERFALL_FREESTANDING_POH, {[]{return true;}}),
-                  LocationAccess(RC_GV_GS_BEAN_PATCH,              {[]{return CanPlantBugs && CanChildAttack;}}),
-                  LocationAccess(RC_GV_COW,                        {[]{return IsChild && CanUse(RG_EPONAS_SONG);}}),
+                  LocationAccess(RC_GV_GS_BEAN_PATCH,              {[]{return logic->CanPlantBugs && logic->CanChildAttack;}}),
+                  LocationAccess(RC_GV_COW,                        {[]{return logic->IsChild && logic->CanUse(RG_EPONAS_SONG);}}),
                   LocationAccess(RC_GV_GOSSIP_STONE,               {[]{return true;}}),
                 }, {
                   //Exits
@@ -44,8 +42,8 @@ void AreaTable_Init_GerudoValley() {
   areaTable[RR_GV_GROTTO_LEDGE] = Area("GV Grotto Ledge", "Gerudo Valley", RA_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_GV_LOWER_STREAM,   {[]{return true;}}),
-                  Entrance(RR_GV_OCTOROK_GROTTO, {[]{return CanUse(RG_SILVER_GAUNTLETS);}}),
-                  Entrance(RR_GV_CRATE_LEDGE,    {[]{return CanUse(RG_LONGSHOT);}}),
+                  Entrance(RR_GV_OCTOROK_GROTTO, {[]{return logic->CanUse(RG_SILVER_GAUNTLETS);}}),
+                  Entrance(RR_GV_CRATE_LEDGE,    {[]{return logic->CanUse(RG_LONGSHOT);}}),
   });
 
   areaTable[RR_GV_CRATE_LEDGE] = Area("GV Crate Ledge", "Gerudo Valley", RA_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {}, {
@@ -58,20 +56,20 @@ void AreaTable_Init_GerudoValley() {
 
   areaTable[RR_GV_FORTRESS_SIDE] = Area("GV Fortress Side", "Gerudo Valley", RA_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&BrokenSwordAccess, {[]{return IsAdult && (PoachersSawAccess || PoachersSaw);}}),
+                  EventAccess(&logic->BrokenSwordAccess, {[]{return logic->IsAdult && (logic->PoachersSawAccess || logic->PoachersSaw);}}),
                 }, {
                   //Locations                                       
-                  LocationAccess(RC_GV_CHEST,          {[]{return IsAdult && CanUse(RG_MEGATON_HAMMER);}}),
-                  LocationAccess(RC_GV_TRADE_SAW,      {[]{return IsAdult && PoachersSaw;}}),
-                  LocationAccess(RC_GV_GS_BEHIND_TENT, {[]{return IsAdult && HookshotOrBoomerang && AtNight && CanGetNightTimeGS;}}),
-                  LocationAccess(RC_GV_GS_PILLAR,      {[]{return IsAdult && HookshotOrBoomerang && AtNight && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_GV_CHEST,          {[]{return logic->IsAdult && logic->CanUse(RG_MEGATON_HAMMER);}}),
+                  LocationAccess(RC_GV_TRADE_SAW,      {[]{return logic->IsAdult && logic->PoachersSaw;}}),
+                  LocationAccess(RC_GV_GS_BEHIND_TENT, {[]{return logic->IsAdult && logic->HookshotOrBoomerang && logic->AtNight && logic->CanGetNightTimeGS;}}),
+                  LocationAccess(RC_GV_GS_PILLAR,      {[]{return logic->IsAdult && logic->HookshotOrBoomerang && logic->AtNight && logic->CanGetNightTimeGS;}}),
                 }, {
                   //Exits
                   Entrance(RR_GERUDO_FORTRESS,   {[]{return true;}}),
                   Entrance(RR_GV_UPPER_STREAM,   {[]{return true;}}),
-                  Entrance(RR_GERUDO_VALLEY,     {[]{return IsChild || CanRideEpona || CanUse(RG_LONGSHOT) || randoCtx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_OPEN) || CarpenterRescue;}}),
-                  Entrance(RR_GV_CARPENTER_TENT, {[]{return IsAdult;}}),
-                  Entrance(RR_GV_STORMS_GROTTO,  {[]{return IsAdult && CanOpenStormGrotto;}}),
+                  Entrance(RR_GERUDO_VALLEY,     {[]{return logic->IsChild || logic->CanRideEpona || logic->CanUse(RG_LONGSHOT) || randoCtx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_OPEN) || logic->CarpenterRescue;}}),
+                  Entrance(RR_GV_CARPENTER_TENT, {[]{return logic->IsAdult;}}),
+                  Entrance(RR_GV_STORMS_GROTTO,  {[]{return logic->IsAdult && logic->CanOpenStormGrotto;}}),
                   Entrance(RR_GV_CRATE_LEDGE, {[]{return false;}}),
   });
 
@@ -87,8 +85,8 @@ void AreaTable_Init_GerudoValley() {
 
   areaTable[RR_GV_STORMS_GROTTO] = Area("GV Storms Grotto", "GV Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_GV_DEKU_SCRUB_GROTTO_REAR,  {[]{return CanStunDeku;}}),
-                  LocationAccess(RC_GV_DEKU_SCRUB_GROTTO_FRONT, {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_GV_DEKU_SCRUB_GROTTO_REAR,  {[]{return logic->CanStunDeku;}}),
+                  LocationAccess(RC_GV_DEKU_SCRUB_GROTTO_FRONT, {[]{return logic->CanStunDeku;}}),
                 }, {
                   //Exits
                   Entrance(RR_GV_FORTRESS_SIDE, {[]{return true;}}),
@@ -96,41 +94,41 @@ void AreaTable_Init_GerudoValley() {
 
   areaTable[RR_GERUDO_FORTRESS] = Area("Gerudo Fortress", "Gerudo Fortress", RA_GERUDO_FORTRESS, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&CarpenterRescue, {[]{return CanFinishGerudoFortress;}}),
-                  EventAccess(&GF_GateOpen,     {[]{return IsAdult && GerudoToken;}}),
-                  EventAccess(&GtG_GateOpen,    {[]{return GtG_GateOpen || (IsAdult && GerudoToken);}}),
+                  EventAccess(&logic->CarpenterRescue, {[]{return logic->CanFinishGerudoFortress;}}),
+                  EventAccess(&logic->GF_GateOpen,     {[]{return logic->IsAdult && logic->GerudoToken;}}),
+                  EventAccess(&logic->GtG_GateOpen,    {[]{return logic->GtG_GateOpen || (logic->IsAdult && logic->GerudoToken);}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_GF_CHEST,              {[]{return CanUse(RG_HOVER_BOOTS) || (IsAdult && CanUse(RG_SCARECROW)) || CanUse(RG_LONGSHOT);}}),
-                  LocationAccess(RC_GF_HBA_1000_POINTS,    {[]{return GerudoToken && CanRideEpona && Bow && AtDay;}}),
-                  LocationAccess(RC_GF_HBA_1500_POINTS,    {[]{return GerudoToken && CanRideEpona && Bow && AtDay;}}),
-                  LocationAccess(RC_GF_NORTH_F1_CARPENTER, {[]{return  CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD);}}),
-                  LocationAccess(RC_GF_NORTH_F2_CARPENTER, {[]{return (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) && (GerudoToken || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_HOVER_BOOTS) || randoCtx->GetTrickOption(RT_GF_KITCHEN));}}),
-                  LocationAccess(RC_GF_SOUTH_F1_CARPENTER, {[]{return  CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD);}}),
-                  LocationAccess(RC_GF_SOUTH_F2_CARPENTER, {[]{return  CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD);}}),
-                  LocationAccess(RC_GF_GERUDO_MEMBERSHIP_CARD,       {[]{return CanFinishGerudoFortress;}}),
-                  LocationAccess(RC_GF_GS_ARCHERY_RANGE,   {[]{return IsAdult && HookshotOrBoomerang && GerudoToken && AtNight && CanGetNightTimeGS;}}),
-                  LocationAccess(RC_GF_GS_TOP_FLOOR,       {[]{return IsAdult && AtNight && (CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOOMERANG) || HasExplosives || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_DINS_FIRE)) && (GerudoToken || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_HOVER_BOOTS) || randoCtx->GetTrickOption(RT_GF_KITCHEN) || randoCtx->GetTrickOption(RT_GF_JUMP)) && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_GF_CHEST,              {[]{return logic->CanUse(RG_HOVER_BOOTS) || (logic->IsAdult && logic->CanUse(RG_SCARECROW)) || logic->CanUse(RG_LONGSHOT);}}),
+                  LocationAccess(RC_GF_HBA_1000_POINTS,    {[]{return logic->GerudoToken && logic->CanRideEpona && logic->Bow && logic->AtDay;}}),
+                  LocationAccess(RC_GF_HBA_1500_POINTS,    {[]{return logic->GerudoToken && logic->CanRideEpona && logic->Bow && logic->AtDay;}}),
+                  LocationAccess(RC_GF_NORTH_F1_CARPENTER, {[]{return  logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD);}}),
+                  LocationAccess(RC_GF_NORTH_F2_CARPENTER, {[]{return (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && (logic->GerudoToken || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_HOVER_BOOTS) || randoCtx->GetTrickOption(RT_GF_KITCHEN));}}),
+                  LocationAccess(RC_GF_SOUTH_F1_CARPENTER, {[]{return  logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD);}}),
+                  LocationAccess(RC_GF_SOUTH_F2_CARPENTER, {[]{return  logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD);}}),
+                  LocationAccess(RC_GF_GERUDO_MEMBERSHIP_CARD,       {[]{return logic->CanFinishGerudoFortress;}}),
+                  LocationAccess(RC_GF_GS_ARCHERY_RANGE,   {[]{return logic->IsAdult && logic->HookshotOrBoomerang && logic->GerudoToken && logic->AtNight && logic->CanGetNightTimeGS;}}),
+                  LocationAccess(RC_GF_GS_TOP_FLOOR,       {[]{return logic->IsAdult && logic->AtNight && (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG) || logic->HasExplosives || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_DINS_FIRE)) && (logic->GerudoToken || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_HOVER_BOOTS) || randoCtx->GetTrickOption(RT_GF_KITCHEN) || randoCtx->GetTrickOption(RT_GF_JUMP)) && logic->CanGetNightTimeGS;}}),
                 }, {
                   //Exits
                   Entrance(RR_GV_FORTRESS_SIDE,                 {[]{return true;}}),
-                  Entrance(RR_GF_OUTSIDE_GATE,                  {[]{return GF_GateOpen;}}),
-                  Entrance(RR_GERUDO_TRAINING_GROUNDS_ENTRYWAY, {[]{return GtG_GateOpen && (IsAdult || randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES));}}),
-                  Entrance(RR_GF_STORMS_GROTTO,                 {[]{return IsAdult && CanOpenStormGrotto;}}),
+                  Entrance(RR_GF_OUTSIDE_GATE,                  {[]{return logic->GF_GateOpen;}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_ENTRYWAY, {[]{return logic->GtG_GateOpen && (logic->IsAdult || randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES));}}),
+                  Entrance(RR_GF_STORMS_GROTTO,                 {[]{return logic->IsAdult && logic->CanOpenStormGrotto;}}),
   });
 
   areaTable[RR_GF_OUTSIDE_GATE] = Area("GF Outside Gate", "Gerudo Fortress", RA_GERUDO_FORTRESS, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&GF_GateOpen, {[]{return IsAdult && GerudoToken && (randoCtx->GetOption(RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD) || randoCtx->GetOption(RSK_SHUFFLE_OVERWORLD_ENTRANCES) /*|| ShuffleSpecialIndoorEntrances*/);}}),
+                  EventAccess(&logic->GF_GateOpen, {[]{return logic->IsAdult && logic->GerudoToken && (randoCtx->GetOption(RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD) || randoCtx->GetOption(RSK_SHUFFLE_OVERWORLD_ENTRANCES) /*|| ShuffleSpecialIndoorEntrances*/);}}),
                 }, {}, {
                   //Exits
-                  Entrance(RR_GERUDO_FORTRESS,         {[]{return (IsAdult && (Hookshot || !randoCtx->GetOption(RSK_SHUFFLE_OVERWORLD_ENTRANCES))) || GF_GateOpen;}}),
+                  Entrance(RR_GERUDO_FORTRESS,         {[]{return (logic->IsAdult && (logic->Hookshot || !randoCtx->GetOption(RSK_SHUFFLE_OVERWORLD_ENTRANCES))) || logic->GF_GateOpen;}}),
                   Entrance(RR_WASTELAND_NEAR_FORTRESS, {[]{return true;}}),
   });
 
   areaTable[RR_GF_STORMS_GROTTO] = Area("GF Storms Grotto", "GF Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&FreeFairies, {[]{return true;}}),
+                  EventAccess(&logic->FreeFairies, {[]{return true;}}),
                 }, {}, {
                   //Exits
                   Entrance(RR_GERUDO_FORTRESS, {[]{return true;}}),
@@ -139,22 +137,22 @@ void AreaTable_Init_GerudoValley() {
   areaTable[RR_WASTELAND_NEAR_FORTRESS] = Area("Wasteland Near Fortress", "Haunted Wasteland", RA_HAUNTED_WASTELAND, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_GF_OUTSIDE_GATE,   {[]{return true;}}),
-                  Entrance(RR_HAUNTED_WASTELAND, {[]{return CanUse(RG_HOVER_BOOTS) || CanUse(RG_LONGSHOT) || randoCtx->GetTrickOption(RT_HW_CROSSING);}}),
+                  Entrance(RR_HAUNTED_WASTELAND, {[]{return logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_LONGSHOT) || randoCtx->GetTrickOption(RT_HW_CROSSING);}}),
   });
 
   areaTable[RR_HAUNTED_WASTELAND] = Area("Haunted Wasteland", "Haunted Wasteland", RA_HAUNTED_WASTELAND, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&FairyPot, {[]{return true;}}),
-                  EventAccess(&NutPot,   {[]{return true;}}),
+                  EventAccess(&logic->FairyPot, {[]{return true;}}),
+                  EventAccess(&logic->NutPot,   {[]{return true;}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_WASTELAND_CHEST,            {[]{return HasFireSource;}}),
-                  LocationAccess(RC_WASTELAND_BOMBCHU_SALESMAN, {[]{return AdultsWallet && (CanJumpslash || CanUse(RG_HOVER_BOOTS)) ;}}),
-                  LocationAccess(RC_WASTELAND_GS,               {[]{return HookshotOrBoomerang;}}),
+                  LocationAccess(RC_WASTELAND_CHEST,            {[]{return logic->HasFireSource;}}),
+                  LocationAccess(RC_WASTELAND_BOMBCHU_SALESMAN, {[]{return logic->AdultsWallet && (logic->CanJumpslash || logic->CanUse(RG_HOVER_BOOTS)) ;}}),
+                  LocationAccess(RC_WASTELAND_GS,               {[]{return logic->HookshotOrBoomerang;}}),
                 }, {
                   //Exits
-                  Entrance(RR_WASTELAND_NEAR_COLOSSUS, {[]{return randoCtx->GetTrickOption(RT_LENS_HW) || CanUse(RG_LENS_OF_TRUTH);}}),
-                  Entrance(RR_WASTELAND_NEAR_FORTRESS, {[]{return CanUse(RG_HOVER_BOOTS) || CanUse(RG_LONGSHOT) || randoCtx->GetTrickOption(RT_HW_CROSSING);}}),
+                  Entrance(RR_WASTELAND_NEAR_COLOSSUS, {[]{return randoCtx->GetTrickOption(RT_LENS_HW) || logic->CanUse(RG_LENS_OF_TRUTH);}}),
+                  Entrance(RR_WASTELAND_NEAR_FORTRESS, {[]{return logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_LONGSHOT) || randoCtx->GetTrickOption(RT_HW_CROSSING);}}),
   });
 
   areaTable[RR_WASTELAND_NEAR_COLOSSUS] = Area("Wasteland Near Colossus", "Haunted Wasteland", RA_HAUNTED_WASTELAND, NO_DAY_NIGHT_CYCLE, {}, {}, {
@@ -165,21 +163,21 @@ void AreaTable_Init_GerudoValley() {
 
   areaTable[RR_DESERT_COLOSSUS] = Area("Desert Colossus", "Desert Colossus", RA_DESERT_COLOSSUS, DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&FairyPond, {[]{return FairyPond || CanUse(RG_SONG_OF_STORMS);}}),
-                  EventAccess(&BugRock,   {[]{return true;}}),
+                  EventAccess(&logic->FairyPond, {[]{return logic->FairyPond || logic->CanUse(RG_SONG_OF_STORMS);}}),
+                  EventAccess(&logic->BugRock,   {[]{return true;}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_COLOSSUS_FREESTANDING_POH, {[]{return IsAdult && CanPlantBean(RR_DESERT_COLOSSUS);}}),
-                  LocationAccess(RC_COLOSSUS_GS_BEAN_PATCH,    {[]{return CanPlantBugs && CanChildAttack;}}),
-                  LocationAccess(RC_COLOSSUS_GS_TREE,          {[]{return IsAdult && HookshotOrBoomerang && AtNight && CanGetNightTimeGS;}}),
-                  LocationAccess(RC_COLOSSUS_GS_HILL,          {[]{return IsAdult && AtNight && ((CanPlantBean(RR_DESERT_COLOSSUS) && CanAdultAttack) || CanUse(RG_LONGSHOT) || (randoCtx->GetTrickOption(RT_COLOSSUS_GS) && CanUse(RG_HOOKSHOT))) && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_COLOSSUS_FREESTANDING_POH, {[]{return logic->IsAdult && CanPlantBean(RR_DESERT_COLOSSUS);}}),
+                  LocationAccess(RC_COLOSSUS_GS_BEAN_PATCH,    {[]{return logic->CanPlantBugs && logic->CanChildAttack;}}),
+                  LocationAccess(RC_COLOSSUS_GS_TREE,          {[]{return logic->IsAdult && logic->HookshotOrBoomerang && logic->AtNight && logic->CanGetNightTimeGS;}}),
+                  LocationAccess(RC_COLOSSUS_GS_HILL,          {[]{return logic->IsAdult && logic->AtNight && ((CanPlantBean(RR_DESERT_COLOSSUS) && logic->CanAdultAttack) || logic->CanUse(RG_LONGSHOT) || (randoCtx->GetTrickOption(RT_COLOSSUS_GS) && logic->CanUse(RG_HOOKSHOT))) && logic->CanGetNightTimeGS;}}),
                   LocationAccess(RC_COLOSSUS_GOSSIP_STONE,     {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(RR_COLOSSUS_GREAT_FAIRY_FOUNTAIN, {[]{return HasExplosives;}}),
+                  Entrance(RR_COLOSSUS_GREAT_FAIRY_FOUNTAIN, {[]{return logic->HasExplosives;}}),
                   Entrance(RR_SPIRIT_TEMPLE_ENTRYWAY,        {[]{return true;}}),
                   Entrance(RR_WASTELAND_NEAR_COLOSSUS,       {[]{return true;}}),
-                  Entrance(RR_COLOSSUS_GROTTO,               {[]{return CanUse(RG_SILVER_GAUNTLETS);}}),
+                  Entrance(RR_COLOSSUS_GROTTO,               {[]{return logic->CanUse(RG_SILVER_GAUNTLETS);}}),
   });
 
   areaTable[RR_DESERT_COLOSSUS_FROM_SPIRIT_ENTRYWAY] = Area("Desert Colossus From Spirit Entryway", "Desert Colossus", RA_DESERT_COLOSSUS, NO_DAY_NIGHT_CYCLE, {}, {
@@ -192,7 +190,7 @@ void AreaTable_Init_GerudoValley() {
 
   areaTable[RR_COLOSSUS_GREAT_FAIRY_FOUNTAIN] = Area("Colossus Great Fairy Fountain", "Colossus Great Fairy Fountain", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_COLOSSUS_GREAT_FAIRY_REWARD, {[]{return CanUse(RG_ZELDAS_LULLABY);}}),
+                  LocationAccess(RC_COLOSSUS_GREAT_FAIRY_REWARD, {[]{return logic->CanUse(RG_ZELDAS_LULLABY);}}),
                 }, {
                   //Exits
                   Entrance(RR_DESERT_COLOSSUS, {[]{return true;}}),
@@ -200,8 +198,8 @@ void AreaTable_Init_GerudoValley() {
 
   areaTable[RR_COLOSSUS_GROTTO] = Area("Colossus Grotto", "Colossus Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,  {[]{return CanStunDeku;}}),
-                  LocationAccess(RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT, {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,  {[]{return logic->CanStunDeku;}}),
+                  LocationAccess(RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT, {[]{return logic->CanStunDeku;}}),
                 }, {
                   //Exits
                   Entrance(RR_DESERT_COLOSSUS, {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
index 9259846fb..61dc34ed0 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
@@ -1,18 +1,16 @@
 #include "../location_access.hpp"
-#include "../logic.hpp"
 #include "../../entrance.h"
 
-using namespace Logic;
 using namespace Rando;
 
 void AreaTable_Init_HyruleField() {
   areaTable[RR_HYRULE_FIELD] = Area("Hyrule Field", "Hyrule Field", RA_HYRULE_FIELD, DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&BigPoeKill, {[]{return CanUse(RG_FAIRY_BOW) && CanRideEpona && HasBottle;}}),
+                  EventAccess(&logic->BigPoeKill, {[]{return logic->CanUse(RG_FAIRY_BOW) && logic->CanRideEpona && logic->HasBottle;}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_HF_OCARINA_OF_TIME_ITEM,   {[]{return IsChild && HasAllStones;}}),
-                  LocationAccess(RC_SONG_FROM_OCARINA_OF_TIME, {[]{return IsChild && HasAllStones;}}),
+                  LocationAccess(RC_HF_OCARINA_OF_TIME_ITEM,   {[]{return logic->IsChild && logic->HasAllStones;}}),
+                  LocationAccess(RC_SONG_FROM_OCARINA_OF_TIME, {[]{return logic->IsChild && logic->HasAllStones;}}),
                 }, {
                   //Exits
                   Entrance(RR_LW_BRIDGE,              {[]{return true;}}),
@@ -22,14 +20,14 @@ void AreaTable_Init_HyruleField() {
                   Entrance(RR_KAKARIKO_VILLAGE,       {[]{return true;}}),
                   Entrance(RR_ZR_FRONT,               {[]{return true;}}),
                   Entrance(RR_LON_LON_RANCH,          {[]{return true;}}),
-                  Entrance(RR_HF_SOUTHEAST_GROTTO,    {[]{return Here(RR_HYRULE_FIELD, []{return CanBlastOrSmash;});}}),
+                  Entrance(RR_HF_SOUTHEAST_GROTTO,    {[]{return Here(RR_HYRULE_FIELD, []{return logic->CanBlastOrSmash;});}}),
                   Entrance(RR_HF_OPEN_GROTTO,         {[]{return true;}}),
-                  Entrance(RR_HF_INSIDE_FENCE_GROTTO, {[]{return CanOpenBombGrotto;}}),
-                  Entrance(RR_HF_COW_GROTTO,          {[]{return (CanUse(RG_MEGATON_HAMMER) || IsChild) && CanOpenBombGrotto;}}),
-                  Entrance(RR_HF_NEAR_MARKET_GROTTO,  {[]{return Here(RR_HYRULE_FIELD, []{return CanBlastOrSmash;});}}),
-                  Entrance(RR_HF_FAIRY_GROTTO,        {[]{return Here(RR_HYRULE_FIELD, []{return CanBlastOrSmash;});}}),
-                  Entrance(RR_HF_NEAR_KAK_GROTTO,     {[]{return CanOpenBombGrotto;}}),
-                  Entrance(RR_HF_TEKTITE_GROTTO,      {[]{return CanOpenBombGrotto;}}),
+                  Entrance(RR_HF_INSIDE_FENCE_GROTTO, {[]{return logic->CanOpenBombGrotto;}}),
+                  Entrance(RR_HF_COW_GROTTO,          {[]{return (logic->CanUse(RG_MEGATON_HAMMER) || logic->IsChild) && logic->CanOpenBombGrotto;}}),
+                  Entrance(RR_HF_NEAR_MARKET_GROTTO,  {[]{return Here(RR_HYRULE_FIELD, []{return logic->CanBlastOrSmash;});}}),
+                  Entrance(RR_HF_FAIRY_GROTTO,        {[]{return Here(RR_HYRULE_FIELD, []{return logic->CanBlastOrSmash;});}}),
+                  Entrance(RR_HF_NEAR_KAK_GROTTO,     {[]{return logic->CanOpenBombGrotto;}}),
+                  Entrance(RR_HF_TEKTITE_GROTTO,      {[]{return logic->CanOpenBombGrotto;}}),
   });
 
   areaTable[RR_HF_SOUTHEAST_GROTTO] = Area("HF Southeast Grotto", "HF Southeast Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
@@ -52,7 +50,7 @@ void AreaTable_Init_HyruleField() {
 
   areaTable[RR_HF_INSIDE_FENCE_GROTTO] = Area("HF Inside Fence Grotto", "HF Inside Fence Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_HF_DEKU_SCRUB_GROTTO, {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_HF_DEKU_SCRUB_GROTTO, {[]{return logic->CanStunDeku;}}),
                 }, {
                   //Exits
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
@@ -60,9 +58,9 @@ void AreaTable_Init_HyruleField() {
 
   areaTable[RR_HF_COW_GROTTO] = Area("HF Cow Grotto", "HF Cow Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
-                  LocationAccess(RC_HF_GS_COW_GROTTO,           {[]{return HasFireSource && HookshotOrBoomerang;}}),
-                  LocationAccess(RC_HF_COW_GROTTO_COW,          {[]{return HasFireSource && CanUse(RG_EPONAS_SONG);}}),
-                  LocationAccess(RC_HF_COW_GROTTO_GOSSIP_STONE, {[]{return HasFireSource;}}),
+                  LocationAccess(RC_HF_GS_COW_GROTTO,           {[]{return logic->HasFireSource && logic->HookshotOrBoomerang;}}),
+                  LocationAccess(RC_HF_COW_GROTTO_COW,          {[]{return logic->HasFireSource && logic->CanUse(RG_EPONAS_SONG);}}),
+                  LocationAccess(RC_HF_COW_GROTTO_GOSSIP_STONE, {[]{return logic->HasFireSource;}}),
                 }, {
                   //Exits
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
@@ -79,7 +77,7 @@ void AreaTable_Init_HyruleField() {
 
   areaTable[RR_HF_FAIRY_GROTTO] = Area("HF Fairy Grotto", "HF Fairy Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&FreeFairies, {[]{return true;}}),
+                  EventAccess(&logic->FreeFairies, {[]{return true;}}),
                 }, {}, {
                   //Exits
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
@@ -87,7 +85,7 @@ void AreaTable_Init_HyruleField() {
 
   areaTable[RR_HF_NEAR_KAK_GROTTO] = Area("HF Near Kak Grotto", "HF Near Kak Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_HF_GS_NEAR_KAK_GROTTO, {[]{return HookshotOrBoomerang;}}),
+                  LocationAccess(RC_HF_GS_NEAR_KAK_GROTTO, {[]{return logic->HookshotOrBoomerang;}}),
                 }, {
                   //Exits
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
@@ -95,7 +93,7 @@ void AreaTable_Init_HyruleField() {
 
   areaTable[RR_HF_TEKTITE_GROTTO] = Area("HF Tektite Grotto", "HF Tektite Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_HF_TEKTITE_GROTTO_FREESTANDING_POH, {[]{return ProgressiveScale >= 2 || CanUse(RG_IRON_BOOTS);}}),
+                  LocationAccess(RC_HF_TEKTITE_GROTTO_FREESTANDING_POH, {[]{return logic->ProgressiveScale >= 2 || logic->CanUse(RG_IRON_BOOTS);}}),
                 }, {
                   //Exits
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
@@ -103,32 +101,32 @@ void AreaTable_Init_HyruleField() {
 
   areaTable[RR_LAKE_HYLIA] = Area("Lake Hylia", "Lake Hylia", RA_LAKE_HYLIA, DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&GossipStoneFairy, {[]{return GossipStoneFairy || CanSummonGossipFairy;}}),
-                  EventAccess(&BeanPlantFairy,   {[]{return BeanPlantFairy   || (CanPlantBean(RR_LAKE_HYLIA) && CanUse(RG_SONG_OF_STORMS));}}),
-                  EventAccess(&ButterflyFairy,   {[]{return ButterflyFairy   || CanUse(RG_STICKS);}}),
-                  EventAccess(&BugShrub,         {[]{return BugShrub         || (IsChild && CanCutShrubs);}}),
-                  EventAccess(&ChildScarecrow,   {[]{return ChildScarecrow   || (IsChild && Ocarina && OcarinaButtons >= 2);}}),
-                  EventAccess(&AdultScarecrow,   {[]{return AdultScarecrow   || (IsAdult && Ocarina && OcarinaButtons >= 2);}}),
+                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CanSummonGossipFairy;}}),
+                  EventAccess(&logic->BeanPlantFairy,   {[]{return logic->BeanPlantFairy   || (CanPlantBean(RR_LAKE_HYLIA) && logic->CanUse(RG_SONG_OF_STORMS));}}),
+                  EventAccess(&logic->ButterflyFairy,   {[]{return logic->ButterflyFairy   || logic->CanUse(RG_STICKS);}}),
+                  EventAccess(&logic->BugShrub,         {[]{return logic->BugShrub         || (logic->IsChild && logic->CanCutShrubs);}}),
+                  EventAccess(&logic->ChildScarecrow,   {[]{return logic->ChildScarecrow   || (logic->IsChild && logic->Ocarina && logic->OcarinaButtons >= 2);}}),
+                  EventAccess(&logic->AdultScarecrow,   {[]{return logic->AdultScarecrow   || (logic->IsAdult && logic->Ocarina && logic->OcarinaButtons >= 2);}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_LH_UNDERWATER_ITEM,        {[]{return IsChild && CanDive;}}),
-                  LocationAccess(RC_LH_SUN,                    {[]{return IsAdult && WaterTempleClear && CanUse(RG_FAIRY_BOW);}}),
-                  LocationAccess(RC_LH_FREESTANDING_POH,       {[]{return IsAdult && (CanUse(RG_SCARECROW) || CanPlantBean(RR_LAKE_HYLIA));}}),
-                  LocationAccess(RC_LH_GS_BEAN_PATCH,          {[]{return CanPlantBugs && CanChildAttack;}}),
-                  LocationAccess(RC_LH_GS_LAB_WALL,            {[]{return IsChild && (HookshotOrBoomerang || (randoCtx->GetTrickOption(RT_LH_LAB_WALL_GS) && CanJumpslash)) && AtNight && CanGetNightTimeGS;}}),
-                  LocationAccess(RC_LH_GS_SMALL_ISLAND,        {[]{return IsChild && CanChildAttack && AtNight && CanGetNightTimeGS;}}),
-                  LocationAccess(RC_LH_GS_TREE,                {[]{return IsAdult && CanUse(RG_LONGSHOT) && AtNight && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_LH_UNDERWATER_ITEM,        {[]{return logic->IsChild && logic->CanDive;}}),
+                  LocationAccess(RC_LH_SUN,                    {[]{return logic->IsAdult && logic->WaterTempleClear && logic->CanUse(RG_FAIRY_BOW);}}),
+                  LocationAccess(RC_LH_FREESTANDING_POH,       {[]{return logic->IsAdult && (logic->CanUse(RG_SCARECROW) || CanPlantBean(RR_LAKE_HYLIA));}}),
+                  LocationAccess(RC_LH_GS_BEAN_PATCH,          {[]{return logic->CanPlantBugs && logic->CanChildAttack;}}),
+                  LocationAccess(RC_LH_GS_LAB_WALL,            {[]{return logic->IsChild && (logic->HookshotOrBoomerang || (randoCtx->GetTrickOption(RT_LH_LAB_WALL_GS) && logic->CanJumpslash)) && logic->AtNight && logic->CanGetNightTimeGS;}}),
+                  LocationAccess(RC_LH_GS_SMALL_ISLAND,        {[]{return logic->IsChild && logic->CanChildAttack && logic->AtNight && logic->CanGetNightTimeGS;}}),
+                  LocationAccess(RC_LH_GS_TREE,                {[]{return logic->IsAdult && logic->CanUse(RG_LONGSHOT) && logic->AtNight && logic->CanGetNightTimeGS;}}),
                   LocationAccess(RC_LH_LAB_GOSSIP_STONE,       {[]{return true;}}),
                   LocationAccess(RC_LH_SOUTHEAST_GOSSIP_STONE, {[]{return true;}}),
                   LocationAccess(RC_LH_SOUTHWEST_GOSSIP_STONE, {[]{return true;}}),
                 }, {
                   //Exits
                   Entrance(RR_HYRULE_FIELD,          {[]{return true;}}),
-                  Entrance(RR_ZORAS_DOMAIN,          {[]{return IsChild && (CanDive || CanUse(RG_IRON_BOOTS));}}),
-                  Entrance(RR_LH_OWL_FLIGHT,         {[]{return IsChild;}}),
-                  Entrance(RR_LH_FISHING_ISLAND,     {[]{return IsChild || CanUse(RG_SCARECROW) || CanPlantBean(RR_LAKE_HYLIA) || WaterTempleClear;}}),
+                  Entrance(RR_ZORAS_DOMAIN,          {[]{return logic->IsChild && (logic->CanDive || logic->CanUse(RG_IRON_BOOTS));}}),
+                  Entrance(RR_LH_OWL_FLIGHT,         {[]{return logic->IsChild;}}),
+                  Entrance(RR_LH_FISHING_ISLAND,     {[]{return logic->IsChild || logic->CanUse(RG_SCARECROW) || CanPlantBean(RR_LAKE_HYLIA) || logic->WaterTempleClear;}}),
                   Entrance(RR_LH_LAB,                {[]{return true;}}),
-                  Entrance(RR_WATER_TEMPLE_ENTRYWAY, {[]{return CanUse(RG_HOOKSHOT) && ((CanUse(RG_IRON_BOOTS) || (randoCtx->GetTrickOption(RT_LH_WATER_HOOKSHOT) && ProgressiveScale >= 2)) || (IsAdult && CanUse(RG_LONGSHOT) && ProgressiveScale >= 2));}}),
+                  Entrance(RR_WATER_TEMPLE_ENTRYWAY, {[]{return logic->CanUse(RG_HOOKSHOT) && ((logic->CanUse(RG_IRON_BOOTS) || (randoCtx->GetTrickOption(RT_LH_WATER_HOOKSHOT) && logic->ProgressiveScale >= 2)) || (logic->IsAdult && logic->CanUse(RG_LONGSHOT) && logic->ProgressiveScale >= 2));}}),
                   Entrance(RR_LH_GROTTO,             {[]{return true;}}),
   });
 
@@ -145,12 +143,12 @@ void AreaTable_Init_HyruleField() {
 
   areaTable[RR_LH_LAB] = Area("LH Lab", "LH Lab", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&EyedropsAccess, {[]{return EyedropsAccess || (IsAdult && (EyeballFrogAccess || (EyeballFrog && DisableTradeRevert)));}}),
+                  EventAccess(&logic->EyedropsAccess, {[]{return logic->EyedropsAccess || (logic->IsAdult && (logic->EyeballFrogAccess || (logic->EyeballFrog && logic->DisableTradeRevert)));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_LH_LAB_DIVE,     {[]{return ProgressiveScale >= 2 || (randoCtx->GetTrickOption(RT_LH_LAB_DIVING) && CanUse(RG_IRON_BOOTS) && CanUse(RG_HOOKSHOT));}}),
-                  LocationAccess(RC_LH_TRADE_FROG,   {[]{return IsAdult && EyeballFrog;}}),
-                  LocationAccess(RC_LH_GS_LAB_CRATE, {[]{return CanUse(RG_IRON_BOOTS) && CanUse(RG_HOOKSHOT);}}),
+                  LocationAccess(RC_LH_LAB_DIVE,     {[]{return logic->ProgressiveScale >= 2 || (randoCtx->GetTrickOption(RT_LH_LAB_DIVING) && logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_HOOKSHOT));}}),
+                  LocationAccess(RC_LH_TRADE_FROG,   {[]{return logic->IsAdult && logic->EyeballFrog;}}),
+                  LocationAccess(RC_LH_GS_LAB_CRATE, {[]{return logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_HOOKSHOT);}}),
                 }, {
                   //Exits
                   Entrance(RR_LAKE_HYLIA, {[]{return true;}}),
@@ -158,8 +156,8 @@ void AreaTable_Init_HyruleField() {
 
   areaTable[RR_LH_FISHING_HOLE] = Area("LH Fishing Hole", "LH Fishing Hole", RA_NONE, DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_LH_CHILD_FISHING, {[]{return IsChild;}}),
-                  LocationAccess(RC_LH_ADULT_FISHING, {[]{return IsAdult;}}),
+                  LocationAccess(RC_LH_CHILD_FISHING, {[]{return logic->IsChild;}}),
+                  LocationAccess(RC_LH_ADULT_FISHING, {[]{return logic->IsAdult;}}),
                 }, {
                   //Exits
                   Entrance(RR_LH_FISHING_ISLAND, {[]{return true;}}),
@@ -167,9 +165,9 @@ void AreaTable_Init_HyruleField() {
 
   areaTable[RR_LH_GROTTO] = Area("LH Grotto", "LH Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_LH_DEKU_SCRUB_GROTTO_LEFT,   {[]{return CanStunDeku;}}),
-                  LocationAccess(RC_LH_DEKU_SCRUB_GROTTO_RIGHT,  {[]{return CanStunDeku;}}),
-                  LocationAccess(RC_LH_DEKU_SCRUB_GROTTO_CENTER, {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_LH_DEKU_SCRUB_GROTTO_LEFT,   {[]{return logic->CanStunDeku;}}),
+                  LocationAccess(RC_LH_DEKU_SCRUB_GROTTO_RIGHT,  {[]{return logic->CanStunDeku;}}),
+                  LocationAccess(RC_LH_DEKU_SCRUB_GROTTO_CENTER, {[]{return logic->CanStunDeku;}}),
                 }, {
                   //Exits
                   Entrance(RR_LAKE_HYLIA, {[]{return true;}}),
@@ -177,27 +175,27 @@ void AreaTable_Init_HyruleField() {
 
   areaTable[RR_LON_LON_RANCH] = Area("Lon Lon Ranch", "Lon Lon Ranch", RA_LON_LON_RANCH, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&Epona,    {[]{return Epona    || (CanUse(RG_EPONAS_SONG) && IsAdult && AtDay);}}),
-                  EventAccess(&LinksCow, {[]{return LinksCow || (CanUse(RG_EPONAS_SONG) && IsAdult && AtDay);}}),
+                  EventAccess(&logic->Epona,    {[]{return logic->Epona    || (logic->CanUse(RG_EPONAS_SONG) && logic->IsAdult && logic->AtDay);}}),
+                  EventAccess(&logic->LinksCow, {[]{return logic->LinksCow || (logic->CanUse(RG_EPONAS_SONG) && logic->IsAdult && logic->AtDay);}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_SONG_FROM_MALON,     {[]{return IsChild && ZeldasLetter && Ocarina && AtDay;}}),
-                  LocationAccess(RC_LLR_GS_TREE,         {[]{return IsChild;}}),
-                  LocationAccess(RC_LLR_GS_RAIN_SHED,    {[]{return IsChild && AtNight && CanGetNightTimeGS;}}),
-                  LocationAccess(RC_LLR_GS_HOUSE_WINDOW, {[]{return IsChild && HookshotOrBoomerang && AtNight && CanGetNightTimeGS;}}),
-                  LocationAccess(RC_LLR_GS_BACK_WALL,    {[]{return IsChild && HookshotOrBoomerang && AtNight && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_SONG_FROM_MALON,     {[]{return logic->IsChild && logic->ZeldasLetter && logic->Ocarina && logic->AtDay;}}),
+                  LocationAccess(RC_LLR_GS_TREE,         {[]{return logic->IsChild;}}),
+                  LocationAccess(RC_LLR_GS_RAIN_SHED,    {[]{return logic->IsChild && logic->AtNight && logic->CanGetNightTimeGS;}}),
+                  LocationAccess(RC_LLR_GS_HOUSE_WINDOW, {[]{return logic->IsChild && logic->HookshotOrBoomerang && logic->AtNight && logic->CanGetNightTimeGS;}}),
+                  LocationAccess(RC_LLR_GS_BACK_WALL,    {[]{return logic->IsChild && logic->HookshotOrBoomerang && logic->AtNight && logic->CanGetNightTimeGS;}}),
                 }, {
                   //Exits
                   Entrance(RR_HYRULE_FIELD,     {[]{return true;}}),
                   Entrance(RR_LLR_TALONS_HOUSE, {[]{return true;}}),
                   Entrance(RR_LLR_STABLES,      {[]{return true;}}),
                   Entrance(RR_LLR_TOWER,        {[]{return true;}}),
-                  Entrance(RR_LLR_GROTTO,       {[]{return IsChild;}}),
+                  Entrance(RR_LLR_GROTTO,       {[]{return logic->IsChild;}}),
   });
 
   areaTable[RR_LLR_TALONS_HOUSE] = Area("LLR Talons House", "LLR Talons House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_LLR_TALONS_CHICKENS, {[]{return IsChild && AtDay && ZeldasLetter;}}),
+                  LocationAccess(RC_LLR_TALONS_CHICKENS, {[]{return logic->IsChild && logic->AtDay && logic->ZeldasLetter;}}),
                 }, {
                   //Exits
                   Entrance(RR_LON_LON_RANCH, {[]{return true;}}),
@@ -205,8 +203,8 @@ void AreaTable_Init_HyruleField() {
 
   areaTable[RR_LLR_STABLES] = Area("LLR Stables", "LLR Stables", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_LLR_STABLES_LEFT_COW,  {[]{return CanUse(RG_EPONAS_SONG);}}),
-                  LocationAccess(RC_LLR_STABLES_RIGHT_COW, {[]{return CanUse(RG_EPONAS_SONG);}}),
+                  LocationAccess(RC_LLR_STABLES_LEFT_COW,  {[]{return logic->CanUse(RG_EPONAS_SONG);}}),
+                  LocationAccess(RC_LLR_STABLES_RIGHT_COW, {[]{return logic->CanUse(RG_EPONAS_SONG);}}),
                 }, {
                   //Exits
                   Entrance(RR_LON_LON_RANCH, {[]{return true;}}),
@@ -214,9 +212,9 @@ void AreaTable_Init_HyruleField() {
 
   areaTable[RR_LLR_TOWER] = Area("LLR Tower", "LLR Tower", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_LLR_FREESTANDING_POH, {[]{return IsChild;}}),
-                  LocationAccess(RC_LLR_TOWER_LEFT_COW,   {[]{return CanUse(RG_EPONAS_SONG);}}),
-                  LocationAccess(RC_LLR_TOWER_RIGHT_COW,  {[]{return CanUse(RG_EPONAS_SONG);}}),
+                  LocationAccess(RC_LLR_FREESTANDING_POH, {[]{return logic->IsChild;}}),
+                  LocationAccess(RC_LLR_TOWER_LEFT_COW,   {[]{return logic->CanUse(RG_EPONAS_SONG);}}),
+                  LocationAccess(RC_LLR_TOWER_RIGHT_COW,  {[]{return logic->CanUse(RG_EPONAS_SONG);}}),
                 }, {
                   //Exits
                   Entrance(RR_LON_LON_RANCH, {[]{return true;}}),
@@ -224,9 +222,9 @@ void AreaTable_Init_HyruleField() {
 
   areaTable[RR_LLR_GROTTO] = Area("LLR Grotto", "LLR Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_LLR_DEKU_SCRUB_GROTTO_LEFT,   {[]{return CanStunDeku;}}),
-                  LocationAccess(RC_LLR_DEKU_SCRUB_GROTTO_RIGHT,  {[]{return CanStunDeku;}}),
-                  LocationAccess(RC_LLR_DEKU_SCRUB_GROTTO_CENTER, {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_LLR_DEKU_SCRUB_GROTTO_LEFT,   {[]{return logic->CanStunDeku;}}),
+                  LocationAccess(RC_LLR_DEKU_SCRUB_GROTTO_RIGHT,  {[]{return logic->CanStunDeku;}}),
+                  LocationAccess(RC_LLR_DEKU_SCRUB_GROTTO_CENTER, {[]{return logic->CanStunDeku;}}),
                 }, {
                   //Exits
                   Entrance(RR_LON_LON_RANCH, {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp
index 60dfee3ba..4e5827258 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp
@@ -1,9 +1,7 @@
 #include "../location_access.hpp"
-#include "../logic.hpp"
 #include "../../entrance.h"
 #include "../../dungeon.h"
 
-using namespace Logic;
 using namespace Rando;
 
 void AreaTable_Init_IceCavern() {
@@ -13,7 +11,7 @@ void AreaTable_Init_IceCavern() {
   areaTable[RR_ICE_CAVERN_ENTRYWAY] = Area("Ice Cavern Entryway", "Ice Cavern", RA_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_ICE_CAVERN_BEGINNING,    {[]{return randoCtx->GetDungeon(ICE_CAVERN)->IsVanilla();}}),
-                  Entrance(RR_ICE_CAVERN_MQ_BEGINNING, {[]{return randoCtx->GetDungeon(ICE_CAVERN)->IsMQ();}}),
+                  Entrance(RR_ICE_CAVERN_MQ_BEGINNING, {[]{return randoCtx->GetDungeon(ICE_CAVERN)->IsMQ() && logic->CanUseProjectile;}}),
                   Entrance(RR_ZORAS_FOUNTAIN,          {[]{return true;}}),
   });
 
@@ -24,22 +22,22 @@ void AreaTable_Init_IceCavern() {
   areaTable[RR_ICE_CAVERN_BEGINNING] = Area("Ice Cavern Beginning", "Ice Cavern", RA_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_ICE_CAVERN_ENTRYWAY, {[]{return true;}}),
-                  Entrance(RR_ICE_CAVERN_MAIN,     {[]{return Here(RR_ICE_CAVERN_BEGINNING, []{return (CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) || CanUse(RG_MEGATON_HAMMER) || HasExplosives || CanUse(RG_HOOKSHOT) || CanUse(RG_DINS_FIRE);});}}),
+                  Entrance(RR_ICE_CAVERN_MAIN,     {[]{return Here(RR_ICE_CAVERN_BEGINNING, []{return (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_DINS_FIRE);});}}),
   });
 
   areaTable[RR_ICE_CAVERN_MAIN] = Area("Ice Cavern", "Ice Cavern", RA_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&BlueFireAccess, {[]{return BlueFireAccess || (IsAdult && HasBottle);}}),
+                  EventAccess(&logic->BlueFireAccess, {[]{return logic->BlueFireAccess || (logic->IsAdult && logic->HasBottle);}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_ICE_CAVERN_MAP_CHEST,               {[]{return BlueFire && IsAdult;}}),
-                  LocationAccess(RC_ICE_CAVERN_COMPASS_CHEST,           {[]{return BlueFire;}}),
-                  LocationAccess(RC_ICE_CAVERN_IRON_BOOTS_CHEST,        {[]{return BlueFire && (CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_DINS_FIRE));}}),
-                  LocationAccess(RC_SHEIK_IN_ICE_CAVERN,                {[]{return BlueFire && (CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_DINS_FIRE)) && IsAdult;}}),
-                  LocationAccess(RC_ICE_CAVERN_FREESTANDING_POH,        {[]{return BlueFire;}}),
-                  LocationAccess(RC_ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM, {[]{return HookshotOrBoomerang;}}),
-                  LocationAccess(RC_ICE_CAVERN_GS_HEART_PIECE_ROOM,     {[]{return BlueFire && HookshotOrBoomerang;}}),
-                  LocationAccess(RC_ICE_CAVERN_GS_PUSH_BLOCK_ROOM,      {[]{return BlueFire && (HookshotOrBoomerang || (randoCtx->GetTrickOption(RT_ICE_BLOCK_GS) && IsAdult && CanUse(RG_HOVER_BOOTS)));}}),
+                  LocationAccess(RC_ICE_CAVERN_MAP_CHEST,               {[]{return logic->BlueFire && logic->IsAdult;}}),
+                  LocationAccess(RC_ICE_CAVERN_COMPASS_CHEST,           {[]{return logic->BlueFire;}}),
+                  LocationAccess(RC_ICE_CAVERN_IRON_BOOTS_CHEST,        {[]{return logic->BlueFire && (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_DINS_FIRE));}}),
+                  LocationAccess(RC_SHEIK_IN_ICE_CAVERN,                {[]{return logic->BlueFire && (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_DINS_FIRE)) && logic->IsAdult;}}),
+                  LocationAccess(RC_ICE_CAVERN_FREESTANDING_POH,        {[]{return logic->BlueFire;}}),
+                  LocationAccess(RC_ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM, {[]{return logic->HookshotOrBoomerang;}}),
+                  LocationAccess(RC_ICE_CAVERN_GS_HEART_PIECE_ROOM,     {[]{return logic->BlueFire && logic->HookshotOrBoomerang;}}),
+                  LocationAccess(RC_ICE_CAVERN_GS_PUSH_BLOCK_ROOM,      {[]{return logic->BlueFire && (logic->HookshotOrBoomerang || (randoCtx->GetTrickOption(RT_ICE_BLOCK_GS) && logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS)));}}),
   }, {});
   }
 
@@ -49,38 +47,38 @@ void AreaTable_Init_IceCavern() {
   if (randoCtx->GetDungeon(ICE_CAVERN)->IsMQ()) {
   areaTable[RR_ICE_CAVERN_MQ_BEGINNING] = Area("Ice Cavern MQ Beginning", "Ice Cavern", RA_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&FairyPot, {[]{return true;}}),
+                  EventAccess(&logic->FairyPot, {[]{return true;}}),
   }, {}, {
                   //Exits
                   Entrance(RR_ICE_CAVERN_ENTRYWAY,             {[]{return true;}}),
-                  Entrance(RR_ICE_CAVERN_MQ_MAP_ROOM,          {[]{return CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_DINS_FIRE) || (HasExplosives && (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_STICKS) || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW)));}}),
-                  Entrance(RR_ICE_CAVERN_MQ_COMPASS_ROOM,      {[]{return IsAdult && BlueFire;}}),
-                  Entrance(RR_ICE_CAVERN_MQ_IRON_BOOTS_REGION, {[]{return BlueFire;}}),
+                  Entrance(RR_ICE_CAVERN_MQ_MAP_ROOM,          {[]{return logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_DINS_FIRE) || (logic->HasExplosives && (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_STICKS) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW)));}}),
+                  Entrance(RR_ICE_CAVERN_MQ_COMPASS_ROOM,      {[]{return logic->IsAdult && logic->BlueFire;}}),
+                  Entrance(RR_ICE_CAVERN_MQ_IRON_BOOTS_REGION, {[]{return logic->BlueFire;}}),
   });
 
   areaTable[RR_ICE_CAVERN_MQ_MAP_ROOM] = Area("Ice Cavern MQ Map Room", "Ice Cavern", RA_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&BlueFireAccess,  {[]{return BlueFireAccess || (HasBottle && CanJumpslash);}}),
+                  EventAccess(&logic->BlueFireAccess,  {[]{return logic->BlueFireAccess || (logic->HasBottle && logic->CanJumpslash);}}),
   }, {
                   //Locations
-                  LocationAccess(RC_ICE_CAVERN_MQ_MAP_CHEST, {[]{return BlueFire && (CanJumpslash || CanUse(RG_MEGATON_HAMMER) || HasExplosives || CanUseProjectile);}}),
+                  LocationAccess(RC_ICE_CAVERN_MQ_MAP_CHEST, {[]{return logic->BlueFire && (logic->CanJumpslash || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUseProjectile);}}),
   }, {});
 
   areaTable[RR_ICE_CAVERN_MQ_IRON_BOOTS_REGION] = Area("Ice Cavern MQ Iron Boots Region", "Ice Cavern", RA_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_ICE_CAVERN_MQ_IRON_BOOTS_CHEST, {[]{return IsAdult && (CanJumpslash || CanUse(RG_MEGATON_HAMMER));}}),
-                  LocationAccess(RC_SHEIK_IN_ICE_CAVERN,            {[]{return IsAdult && (CanJumpslash || CanUse(RG_MEGATON_HAMMER));}}),
-                  LocationAccess(RC_ICE_CAVERN_MQ_GS_ICE_BLOCK,     {[]{return CanAdultAttack || CanChildAttack;}}),
-                  LocationAccess(RC_ICE_CAVERN_MQ_GS_SCARECROW,     {[]{return CanUse(RG_SCARECROW) || (HoverBoots && CanUse(RG_LONGSHOT)) || (randoCtx->GetTrickOption(RT_ICE_MQ_SCARECROW) && IsAdult);}}),
-                    //Tricks: (CanUse(RG_SCARECROW) || (HoverBoots && CanUse(RG_LONGSHOT)) || LogicIceMQScarecrow) && IsAdult
+                  LocationAccess(RC_ICE_CAVERN_MQ_IRON_BOOTS_CHEST, {[]{return logic->IsAdult && (logic->CanJumpslash || logic->CanUse(RG_MEGATON_HAMMER));}}),
+                  LocationAccess(RC_SHEIK_IN_ICE_CAVERN,            {[]{return logic->IsAdult && (logic->CanJumpslash || logic->CanUse(RG_MEGATON_HAMMER));}}),
+                  LocationAccess(RC_ICE_CAVERN_MQ_GS_ICE_BLOCK,     {[]{return logic->CanAdultAttack || logic->CanChildAttack;}}),
+                  LocationAccess(RC_ICE_CAVERN_MQ_GS_SCARECROW,     {[]{return logic->CanUse(RG_SCARECROW) || (logic->HoverBoots && logic->CanUse(RG_LONGSHOT)) || (randoCtx->GetTrickOption(RT_ICE_MQ_SCARECROW) && logic->IsAdult);}}),
+                    //Tricks: (logic->CanUse(RG_SCARECROW) || (logic->HoverBoots && logic->CanUse(RG_LONGSHOT)) || LogicIceMQScarecrow) && logic->IsAdult
   }, {});
 
   areaTable[RR_ICE_CAVERN_MQ_COMPASS_ROOM] = Area("Ice Cavern MQ Compass Room", "Ice Cavern", RA_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_ICE_CAVERN_MQ_COMPASS_CHEST,    {[]{return true;}}),
-                  LocationAccess(RC_ICE_CAVERN_MQ_FREESTANDING_POH, {[]{return HasExplosives;}}),
-                  LocationAccess(RC_ICE_CAVERN_MQ_GS_RED_ICE,       {[]{return CanUse(RG_SONG_OF_TIME) || randoCtx->GetTrickOption(RT_ICE_MQ_RED_ICE_GS);}}),
-                    //Trick: CanUse(RG_SONG_OF_TIME) || LogicIceMQRedIceGS
+                  LocationAccess(RC_ICE_CAVERN_MQ_FREESTANDING_POH, {[]{return logic->HasExplosives;}}),
+                  LocationAccess(RC_ICE_CAVERN_MQ_GS_RED_ICE,       {[]{return logic->CanUse(RG_SONG_OF_TIME) || randoCtx->GetTrickOption(RT_ICE_MQ_RED_ICE_GS);}}),
+                    //Trick: logic->CanUse(RG_SONG_OF_TIME) || LogicIceMQRedIceGS
   }, {});
   }
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp
index 64ba1d5bb..fe0fc3640 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp
@@ -1,9 +1,7 @@
 #include "../location_access.hpp"
-#include "../logic.hpp"
 #include "../../entrance.h"
 #include "../../dungeon.h"
 
-using namespace Logic;
 using namespace Rando;
 
 void AreaTable_Init_JabuJabusBelly() {
@@ -24,7 +22,7 @@ void AreaTable_Init_JabuJabusBelly() {
   areaTable[RR_JABU_JABUS_BELLY_BEGINNING] = Area("Jabu Jabus Belly Beginning", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_ENTRYWAY,    {[]{return true;}}),
-                  Entrance(RR_JABU_JABUS_BELLY_LIFT_MIDDLE, {[]{return CanUseProjectile;}}),
+                  Entrance(RR_JABU_JABUS_BELLY_LIFT_MIDDLE, {[]{return logic->CanUseProjectile;}}),
   });
 
   areaTable[RR_JABU_JABUS_BELLY_LIFT_MIDDLE] = Area("Jabu Jabus Belly Lift Middle", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
@@ -32,7 +30,7 @@ void AreaTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_BEGINNING,      {[]{return true;}}),
                   Entrance(RR_JABU_JABUS_BELLY_MAIN_UPPER,     {[]{return true;}}),
                   Entrance(RR_JABU_JABUS_BELLY_LIFT_LOWER,     {[]{return true;}}),
-                  Entrance(RR_JABU_JABUS_BELLY_NEAR_BOSS_ROOM, {[]{return HasAccessTo(RR_JABU_JABUS_BELLY_LIFT_UPPER) || (randoCtx->GetTrickOption(RT_JABU_BOSS_HOVER) && IsAdult && CanUse(RG_HOVER_BOOTS));}}),
+                  Entrance(RR_JABU_JABUS_BELLY_NEAR_BOSS_ROOM, {[]{return HasAccessTo(RR_JABU_JABUS_BELLY_LIFT_UPPER) || (randoCtx->GetTrickOption(RT_JABU_BOSS_HOVER) && logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS));}}),
   });
 
   areaTable[RR_JABU_JABUS_BELLY_MAIN_UPPER] = Area("Jabu Jabus Belly Main Upper", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
@@ -40,13 +38,13 @@ void AreaTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_LIFT_MIDDLE,     {[]{return true;}}),
                   Entrance(RR_JABU_JABUS_BELLY_MAIN_LOWER,      {[]{return true;}}),
                   Entrance(RR_JABU_JABUS_BELLY_FORKED_CORRIDOR, {[]{return true;}}),
-                  Entrance(RR_JABU_JABUS_BELLY_BIGOCTO_ROOM,    {[]{return Here(RR_JABU_JABUS_BELLY_GREEN_TENTACLE, []{return CanUse(RG_BOOMERANG);});}}),
+                  Entrance(RR_JABU_JABUS_BELLY_BIGOCTO_ROOM,    {[]{return Here(RR_JABU_JABUS_BELLY_GREEN_TENTACLE, []{return logic->CanUse(RG_BOOMERANG);});}}),
   });
 
   areaTable[RR_JABU_JABUS_BELLY_MAIN_LOWER] = Area("Jabu Jabus Belly Main Lower", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER, {[]{return HookshotOrBoomerang;}}),
-                  LocationAccess(RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER, {[]{return HookshotOrBoomerang;}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER, {[]{return logic->HookshotOrBoomerang;}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER, {[]{return logic->HookshotOrBoomerang;}}),
                 }, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_MAIN_UPPER,       {[]{return true;}}),
@@ -56,19 +54,19 @@ void AreaTable_Init_JabuJabusBelly() {
 
   areaTable[RR_JABU_JABUS_BELLY_SHABOMB_CORRIDOR] = Area("Jabu Jabus Belly Shabomb Corridor", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&FairyPot, {[]{return true;}}),
+                  EventAccess(&logic->FairyPot, {[]{return true;}}),
                 }, {
                   //Locations
                   LocationAccess(RC_JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM, {[]{return true;}}),
                 }, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_MAIN_LOWER, {[]{return true;}}),
-                  Entrance(RR_JABU_JABUS_BELLY_LIFT_LOWER, {[]{return CanUseProjectile;}}),
+                  Entrance(RR_JABU_JABUS_BELLY_LIFT_LOWER, {[]{return logic->CanUseProjectile;}}),
   });
 
   areaTable[RR_JABU_JABUS_BELLY_LOWER_SIDE_ROOM] = Area("Jabu Jabus Belly Lower Side Room", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&FairyPot, {[]{return FairyPot || (CanUse(RG_BOOMERANG) || CanUse(RG_HOVER_BOOTS));}}),
+                  EventAccess(&logic->FairyPot, {[]{return logic->FairyPot || (logic->CanUse(RG_BOOMERANG) || logic->CanUse(RG_HOVER_BOOTS));}}),
                 }, {}, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_MAIN_LOWER, {[]{return true;}}),
@@ -76,7 +74,7 @@ void AreaTable_Init_JabuJabusBelly() {
 
   areaTable[RR_JABU_JABUS_BELLY_LIFT_LOWER] = Area("Jabu Jabus Belly Lift Lower", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_JABU_JABUS_BELLY_DEKU_SCRUB, {[]{return (IsChild || CanDive || randoCtx->GetTrickOption(RT_JABU_ALCOVE_JUMP_DIVE) || CanUse(RG_IRON_BOOTS)) && CanStunDeku;}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_DEKU_SCRUB, {[]{return (logic->IsChild || logic->CanDive || randoCtx->GetTrickOption(RT_JABU_ALCOVE_JUMP_DIVE) || logic->CanUse(RG_IRON_BOOTS)) && logic->CanStunDeku;}}),
                 }, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_SHABOMB_CORRIDOR, {[]{return true;}}),
@@ -88,9 +86,9 @@ void AreaTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_MAIN_UPPER,     {[]{return true;}}),
                   Entrance(RR_JABU_JABUS_BELLY_BOOMERANG_ROOM, {[]{return true;}}),
                   Entrance(RR_JABU_JABUS_BELLY_MAP_ROOM,       {[]{return true;}}),
-                  Entrance(RR_JABU_JABUS_BELLY_COMPASS_ROOM,   {[]{return Here(RR_JABU_JABUS_BELLY_MAP_ROOM,      []{return CanUse(RG_BOOMERANG);});}}),
-                  Entrance(RR_JABU_JABUS_BELLY_BLUE_TENTACLE,  {[]{return Here(RR_JABU_JABUS_BELLY_MAP_ROOM,      []{return CanUse(RG_BOOMERANG);});}}),
-                  Entrance(RR_JABU_JABUS_BELLY_GREEN_TENTACLE, {[]{return Here(RR_JABU_JABUS_BELLY_BLUE_TENTACLE, []{return CanUse(RG_BOOMERANG);});}}),
+                  Entrance(RR_JABU_JABUS_BELLY_COMPASS_ROOM,   {[]{return Here(RR_JABU_JABUS_BELLY_MAP_ROOM,      []{return logic->CanUse(RG_BOOMERANG);});}}),
+                  Entrance(RR_JABU_JABUS_BELLY_BLUE_TENTACLE,  {[]{return Here(RR_JABU_JABUS_BELLY_MAP_ROOM,      []{return logic->CanUse(RG_BOOMERANG);});}}),
+                  Entrance(RR_JABU_JABUS_BELLY_GREEN_TENTACLE, {[]{return Here(RR_JABU_JABUS_BELLY_BLUE_TENTACLE, []{return logic->CanUse(RG_BOOMERANG);});}}),
   });
 
   areaTable[RR_JABU_JABUS_BELLY_BOOMERANG_ROOM] = Area("Jabu Jabus Belly Boomerang Room", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
@@ -103,7 +101,7 @@ void AreaTable_Init_JabuJabusBelly() {
 
   areaTable[RR_JABU_JABUS_BELLY_MAP_ROOM] = Area("Jabu Jabus Belly Map Room", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_JABU_JABUS_BELLY_MAP_CHEST, {[]{return CanUse(RG_BOOMERANG);}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_MAP_CHEST, {[]{return logic->CanUse(RG_BOOMERANG);}}),
                 }, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_FORKED_CORRIDOR, {[]{return true;}}),
@@ -111,7 +109,7 @@ void AreaTable_Init_JabuJabusBelly() {
 
   areaTable[RR_JABU_JABUS_BELLY_COMPASS_ROOM] = Area("Jabu Jabus Belly Compass Room", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_JABU_JABUS_BELLY_COMPASS_CHEST, {[]{return CanAdultAttack || CanChildAttack;}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_COMPASS_CHEST, {[]{return logic->CanAdultAttack || logic->CanChildAttack;}}),
                 }, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_FORKED_CORRIDOR, {[]{return true;}}),
@@ -119,27 +117,27 @@ void AreaTable_Init_JabuJabusBelly() {
 
   areaTable[RR_JABU_JABUS_BELLY_BLUE_TENTACLE] = Area("Jabu Jabus Belly Blue Tentacle", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_JABU_JABUS_BELLY_FORKED_CORRIDOR, {[]{return Here(RR_JABU_JABUS_BELLY_BLUE_TENTACLE, []{return CanUse(RG_BOOMERANG);});}}),
+                  Entrance(RR_JABU_JABUS_BELLY_FORKED_CORRIDOR, {[]{return Here(RR_JABU_JABUS_BELLY_BLUE_TENTACLE, []{return logic->CanUse(RG_BOOMERANG);});}}),
   });
 
   areaTable[RR_JABU_JABUS_BELLY_GREEN_TENTACLE] = Area("Jabu Jabus Belly Green Tentacle", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_JABU_JABUS_BELLY_FORKED_CORRIDOR, {[]{return Here(RR_JABU_JABUS_BELLY_GREEN_TENTACLE, []{return CanUse(RG_BOOMERANG);});}}),
+                  Entrance(RR_JABU_JABUS_BELLY_FORKED_CORRIDOR, {[]{return Here(RR_JABU_JABUS_BELLY_GREEN_TENTACLE, []{return logic->CanUse(RG_BOOMERANG);});}}),
   });
 
   areaTable[RR_JABU_JABUS_BELLY_BIGOCTO_ROOM] = Area("Jabu Jabus Belly Bigocto Room", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_MAIN_LOWER,    {[]{return true;}}),
-                  Entrance(RR_JABU_JABUS_BELLY_ABOVE_BIGOCTO, {[]{return Here(RR_JABU_JABUS_BELLY_BIGOCTO_ROOM, []{return (CanUse(RG_BOOMERANG) || Nuts) && (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_STICKS));});}}),
+                  Entrance(RR_JABU_JABUS_BELLY_ABOVE_BIGOCTO, {[]{return Here(RR_JABU_JABUS_BELLY_BIGOCTO_ROOM, []{return (logic->CanUse(RG_BOOMERANG) || logic->Nuts) && (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_STICKS));});}}),
   });
 
   areaTable[RR_JABU_JABUS_BELLY_ABOVE_BIGOCTO] = Area("Jabu Jabus Belly Above Bigocto", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&FairyPot, {[]{return true;}}),
-                  EventAccess(&NutPot,   {[]{return true;}}),
+                  EventAccess(&logic->FairyPot, {[]{return true;}}),
+                  EventAccess(&logic->NutPot,   {[]{return true;}}),
                 }, {}, {
                   //Exits
-                  Entrance(RR_JABU_JABUS_BELLY_LIFT_UPPER, {[]{return CanUse(RG_BOOMERANG);}}),
+                  Entrance(RR_JABU_JABUS_BELLY_LIFT_UPPER, {[]{return logic->CanUse(RG_BOOMERANG);}}),
   });
 
   areaTable[RR_JABU_JABUS_BELLY_LIFT_UPPER] = Area("Jabu Jabus Belly Lift Upper", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
@@ -150,11 +148,11 @@ void AreaTable_Init_JabuJabusBelly() {
 
   areaTable[RR_JABU_JABUS_BELLY_NEAR_BOSS_ROOM] = Area("Jabu Jabus Belly Near Boss Room", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_JABU_JABUS_BELLY_GS_NEAR_BOSS, {[]{return CanAdultAttack || CanChildAttack;}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_GS_NEAR_BOSS, {[]{return logic->CanAdultAttack || logic->CanChildAttack;}}),
                 }, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_LIFT_MIDDLE, {[]{return true;}}),
-                  Entrance(RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY, {[]{return CanUse(RG_BOOMERANG) || (randoCtx->GetTrickOption(RT_JABU_NEAR_BOSS_RANGED) && ((IsAdult && (CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_BOW))) || (IsChild && CanUse(RG_FAIRY_SLINGSHOT)))) || (randoCtx->GetTrickOption(RT_JABU_NEAR_BOSS_EXPLOSIVES) && (HasBombchus || (IsAdult && CanUse(RG_HOVER_BOOTS) && Bombs)));}}),
+                  Entrance(RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY, {[]{return logic->CanUse(RG_BOOMERANG) || (randoCtx->GetTrickOption(RT_JABU_NEAR_BOSS_RANGED) && ((logic->IsAdult && (logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_FAIRY_BOW))) || (logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT)))) || (randoCtx->GetTrickOption(RT_JABU_NEAR_BOSS_EXPLOSIVES) && (logic->HasBombchus || (logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS) && logic->Bombs)));}}),
   });
   }
 
@@ -164,57 +162,57 @@ void AreaTable_Init_JabuJabusBelly() {
   if (randoCtx->GetDungeon(JABU_JABUS_BELLY)->IsMQ()) {
   areaTable[RR_JABU_JABUS_BELLY_MQ_BEGINNING] = Area("Jabu Jabus Belly MQ Beginning", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&NutPot, {[]{return true;}}),
+                  EventAccess(&logic->NutPot, {[]{return true;}}),
   }, {
                   //Locations
-                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_MAP_CHEST,             {[]{return CanBlastOrSmash;}}),
-                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST, {[]{return IsChild && CanUse(RG_FAIRY_SLINGSHOT);}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_MAP_CHEST,             {[]{return logic->CanBlastOrSmash;}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST, {[]{return logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT);}}),
   }, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_ENTRYWAY, {[]{return true;}}),
-                  Entrance(RR_JABU_JABUS_BELLY_MQ_MAIN,  {[]{return Here(RR_JABU_JABUS_BELLY_MQ_BEGINNING, []{return IsChild && CanUse(RG_FAIRY_SLINGSHOT);});}}),
+                  Entrance(RR_JABU_JABUS_BELLY_MQ_MAIN,  {[]{return Here(RR_JABU_JABUS_BELLY_MQ_BEGINNING, []{return logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT);});}}),
   });
 
   areaTable[RR_JABU_JABUS_BELLY_MQ_MAIN] = Area("Jabu Jabus Belly MQ Main", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST,      {[]{return true;}}),
-                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST,      {[]{return (IsAdult && (CanUse(RG_HOVER_BOOTS) || CanUse(RG_HOOKSHOT))) || ChildCanAccess(RR_JABU_JABUS_BELLY_MQ_BOSS_AREA);}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST,      {[]{return (logic->IsAdult && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT))) || ChildCanAccess(RR_JABU_JABUS_BELLY_MQ_BOSS_AREA);}}),
                   LocationAccess(RC_JABU_JABUS_BELLY_MQ_COMPASS_CHEST,                {[]{return true;}}),
                   LocationAccess(RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST,    {[]{return true;}}),
                   LocationAccess(RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST, {[]{return true;}}),
                   LocationAccess(RC_JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST,   {[]{return true;}}),
                   LocationAccess(RC_JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST,              {[]{return true;}}),
-                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM,      {[]{return CanUse(RG_SONG_OF_TIME) || (randoCtx->GetTrickOption(RT_JABU_MQ_SOT_GS) && IsChild && CanUse(RG_BOOMERANG));}}),
-                    //Trick: CanUse(RG_SONG_OF_TIME) || (LogicJabuMQSoTGS && IsChild && CanUse(RG_BOOMERANG))
+                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM,      {[]{return logic->CanUse(RG_SONG_OF_TIME) || (randoCtx->GetTrickOption(RT_JABU_MQ_SOT_GS) && logic->IsChild && logic->CanUse(RG_BOOMERANG));}}),
+                    //Trick: logic->CanUse(RG_SONG_OF_TIME) || (LogicJabuMQSoTGS && logic->IsChild && logic->CanUse(RG_BOOMERANG))
   }, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_MQ_BEGINNING, {[]{return true;}}),
-                  Entrance(RR_JABU_JABUS_BELLY_MQ_DEPTHS,    {[]{return HasExplosives && IsChild && CanUse(RG_BOOMERANG);}}),
+                  Entrance(RR_JABU_JABUS_BELLY_MQ_DEPTHS,    {[]{return logic->HasExplosives && logic->IsChild && logic->CanUse(RG_BOOMERANG);}}),
   });
 
   areaTable[RR_JABU_JABUS_BELLY_MQ_DEPTHS] = Area("Jabu Jabus Belly MQ Depths", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST, {[]{return true;}}),
-                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM,          {[]{return Sticks || CanUse(RG_DINS_FIRE);}}),
-                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM,    {[]{return (randoCtx->GetTrickOption(RT_LENS_JABU_MQ) || CanUse(RG_LENS_OF_TRUTH)) || Here(RR_JABU_JABUS_BELLY_MQ_MAIN, []{return IsAdult && CanUse(RG_HOVER_BOOTS) && CanUse(RG_HOOKSHOT);});}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM,          {[]{return logic->Sticks || logic->CanUse(RG_DINS_FIRE);}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM,    {[]{return (randoCtx->GetTrickOption(RT_LENS_JABU_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) || Here(RR_JABU_JABUS_BELLY_MQ_MAIN, []{return logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS) && logic->CanUse(RG_HOOKSHOT);});}}),
   }, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_MQ_MAIN,      {[]{return true;}}),
-                  Entrance(RR_JABU_JABUS_BELLY_MQ_BOSS_AREA, {[]{return Sticks || (CanUse(RG_DINS_FIRE) && KokiriSword);}}),
+                  Entrance(RR_JABU_JABUS_BELLY_MQ_BOSS_AREA, {[]{return logic->Sticks || (logic->CanUse(RG_DINS_FIRE) && logic->KokiriSword);}}),
   });
 
   areaTable[RR_JABU_JABUS_BELLY_MQ_BOSS_AREA] = Area("Jabu Jabus Belly MQ Boss Area", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&FairyPot, {[]{return true;}}),
+                  EventAccess(&logic->FairyPot, {[]{return true;}}),
   }, {
                   //Locations
-                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_COW,             {[]{return CanUse(RG_EPONAS_SONG);}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_COW,             {[]{return logic->CanUse(RG_EPONAS_SONG);}}),
                   LocationAccess(RC_JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST, {[]{return true;}}),
                   LocationAccess(RC_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS,    {[]{return true;}}),
   }, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_MQ_MAIN, {[]{return true;}}),
-                  Entrance(RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY, {[]{return CanUse(RG_FAIRY_SLINGSHOT);}}),
+                  Entrance(RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY, {[]{return logic->CanUse(RG_FAIRY_SLINGSHOT);}}),
   });
   }
 
@@ -234,13 +232,13 @@ void AreaTable_Init_JabuJabusBelly() {
         Area("Jabu Jabus Belly Boss Room", "Jabu Jabus Belly", RA_NONE, NO_DAY_NIGHT_CYCLE,
              {
                  // Events //todo: add pot kill trick
-                 EventAccess(&JabuJabusBellyClear,
-                             { [] { return JabuJabusBellyClear || (HasBossSoul(RG_BARINADE_SOUL) && (CanUse(RG_BOOMERANG) && CanJumpslash)); } }),
+                 EventAccess(&logic->JabuJabusBellyClear,
+                             { [] { return logic->JabuJabusBellyClear || (logic->HasBossSoul(RG_BARINADE_SOUL) && (logic->CanUse(RG_BOOMERANG) && logic->CanJumpslash)); } }),
              },
              {
                  // Locations
-                 LocationAccess(RC_JABU_JABUS_BELLY_BARINADE_HEART, { [] { return JabuJabusBellyClear; } }),
-                 LocationAccess(RC_BARINADE, { [] { return JabuJabusBellyClear; } }),
+                 LocationAccess(RC_JABU_JABUS_BELLY_BARINADE_HEART, { [] { return logic->JabuJabusBellyClear; } }),
+                 LocationAccess(RC_BARINADE, { [] { return logic->JabuJabusBellyClear; } }),
              },
              {
                  // Exits
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
index e56caa1c8..14ec97cb6 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
@@ -1,27 +1,25 @@
 #include "../location_access.hpp"
-#include "../logic.hpp"
 #include "../../entrance.h"
 
-using namespace Logic;
 using namespace Rando;
 
 void AreaTable_Init_Kakariko() {
   areaTable[RR_KAKARIKO_VILLAGE] = Area("Kakariko Village", "Kakariko Village", RA_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&CojiroAccess,            {[]{return CojiroAccess || (IsAdult && WakeUpAdultTalon);}}),
-                  EventAccess(&BugRock,                 {[]{return true;}}),
-                  EventAccess(&KakarikoVillageGateOpen, {[]{return KakarikoVillageGateOpen || (IsChild && (ZeldasLetter || randoCtx->GetOption(RSK_KAK_GATE).Is(RO_KAK_GATE_OPEN)));}}),
+                  EventAccess(&logic->CojiroAccess,            {[]{return logic->CojiroAccess || (logic->IsAdult && logic->WakeUpAdultTalon);}}),
+                  EventAccess(&logic->BugRock,                 {[]{return true;}}),
+                  EventAccess(&logic->KakarikoVillageGateOpen, {[]{return logic->KakarikoVillageGateOpen || (logic->IsChild && (logic->ZeldasLetter || randoCtx->GetOption(RSK_KAK_GATE).Is(RO_KAK_GATE_OPEN)));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_SHEIK_IN_KAKARIKO,               {[]{return IsAdult && ForestMedallion && FireMedallion && WaterMedallion;}}),
-                  LocationAccess(RC_KAK_ANJU_AS_CHILD,               {[]{return IsChild && AtDay;}}),
-                  LocationAccess(RC_KAK_ANJU_AS_ADULT,               {[]{return IsAdult && AtDay;}}),
-                  LocationAccess(RC_KAK_TRADE_POCKET_CUCCO,          {[]{return IsAdult && AtDay && PocketEgg && WakeUpAdultTalon;}}),
-                  LocationAccess(RC_KAK_GS_HOUSE_UNDER_CONSTRUCTION, {[]{return IsChild && AtNight && CanGetNightTimeGS;}}),
-                  LocationAccess(RC_KAK_GS_SKULLTULA_HOUSE,          {[]{return IsChild && AtNight && CanGetNightTimeGS;}}),
-                  LocationAccess(RC_KAK_GS_GUARDS_HOUSE,             {[]{return IsChild && AtNight && CanGetNightTimeGS;}}),
-                  LocationAccess(RC_KAK_GS_TREE,                     {[]{return IsChild && AtNight && CanGetNightTimeGS;}}),
-                  LocationAccess(RC_KAK_GS_WATCHTOWER,               {[]{return IsChild && (Slingshot || HasBombchus || CanUse(RG_FAIRY_BOW) || CanUse(RG_LONGSHOT) || (randoCtx->GetTrickOption(RT_KAK_TOWER_GS) && CanJumpslash)) && AtNight && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_SHEIK_IN_KAKARIKO,               {[]{return logic->IsAdult && logic->ForestMedallion && logic->FireMedallion && logic->WaterMedallion;}}),
+                  LocationAccess(RC_KAK_ANJU_AS_CHILD,               {[]{return logic->IsChild && logic->AtDay;}}),
+                  LocationAccess(RC_KAK_ANJU_AS_ADULT,               {[]{return logic->IsAdult && logic->AtDay;}}),
+                  LocationAccess(RC_KAK_TRADE_POCKET_CUCCO,          {[]{return logic->IsAdult && logic->AtDay && logic->PocketEgg && logic->WakeUpAdultTalon;}}),
+                  LocationAccess(RC_KAK_GS_HOUSE_UNDER_CONSTRUCTION, {[]{return logic->IsChild && logic->AtNight && logic->CanGetNightTimeGS;}}),
+                  LocationAccess(RC_KAK_GS_SKULLTULA_HOUSE,          {[]{return logic->IsChild && logic->AtNight && logic->CanGetNightTimeGS;}}),
+                  LocationAccess(RC_KAK_GS_GUARDS_HOUSE,             {[]{return logic->IsChild && logic->AtNight && logic->CanGetNightTimeGS;}}),
+                  LocationAccess(RC_KAK_GS_TREE,                     {[]{return logic->IsChild && logic->AtNight && logic->CanGetNightTimeGS;}}),
+                  LocationAccess(RC_KAK_GS_WATCHTOWER,               {[]{return logic->IsChild && (logic->Slingshot || logic->HasBombchus || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_LONGSHOT) || (randoCtx->GetTrickOption(RT_KAK_TOWER_GS) && logic->CanJumpslash)) && logic->AtNight && logic->CanGetNightTimeGS;}}),
                 }, {
                   //Exits
                   Entrance(RR_HYRULE_FIELD,                {[]{return true;}}),
@@ -29,16 +27,16 @@ void AreaTable_Init_Kakariko() {
                   Entrance(RR_KAK_HOUSE_OF_SKULLTULA,      {[]{return true;}}),
                   Entrance(RR_KAK_IMPAS_HOUSE,             {[]{return true;}}),
                   Entrance(RR_KAK_WINDMILL,                {[]{return true;}}),
-                  Entrance(RR_KAK_BAZAAR,                  {[]{return IsAdult && AtDay;}}),
-                  Entrance(RR_KAK_SHOOTING_GALLERY,        {[]{return IsAdult && AtDay;}}),
-                  Entrance(RR_BOTTOM_OF_THE_WELL_ENTRYWAY, {[]{return DrainWell && (IsChild || randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).IsNot(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF));}}),
-                  Entrance(RR_KAK_POTION_SHOP_FRONT,       {[]{return AtDay || IsChild;}}),
-                  Entrance(RR_KAK_REDEAD_GROTTO,           {[]{return CanOpenBombGrotto;}}),
-                  Entrance(RR_KAK_IMPAS_LEDGE,             {[]{return (IsChild && AtDay) || CanUse(RG_HOOKSHOT) || (IsAdult && randoCtx->GetTrickOption(RT_VISIBLE_COLLISION));}}),
-                  Entrance(RR_KAK_ROOFTOP,                 {[]{return CanUse(RG_HOOKSHOT) || (randoCtx->GetTrickOption(RT_KAK_MAN_ON_ROOF) && (IsAdult || AtDay || Slingshot || HasBombchus || CanUse(RG_FAIRY_BOW) || CanUse(RG_LONGSHOT)));}}),
-                  Entrance(RR_KAK_IMPAS_ROOFTOP,           {[]{return CanUse(RG_HOOKSHOT) || (randoCtx->GetTrickOption(RT_KAK_ROOFTOP_GS) && CanUse(RG_HOVER_BOOTS));}}),
+                  Entrance(RR_KAK_BAZAAR,                  {[]{return logic->IsAdult && logic->AtDay;}}),
+                  Entrance(RR_KAK_SHOOTING_GALLERY,        {[]{return logic->IsAdult && logic->AtDay;}}),
+                  Entrance(RR_BOTTOM_OF_THE_WELL_ENTRYWAY, {[]{return logic->DrainWell && (logic->IsChild || randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).IsNot(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF));}}),
+                  Entrance(RR_KAK_POTION_SHOP_FRONT,       {[]{return logic->AtDay || logic->IsChild;}}),
+                  Entrance(RR_KAK_REDEAD_GROTTO,           {[]{return logic->CanOpenBombGrotto;}}),
+                  Entrance(RR_KAK_IMPAS_LEDGE,             {[]{return (logic->IsChild && logic->AtDay) || logic->CanUse(RG_HOOKSHOT) || (logic->IsAdult && randoCtx->GetTrickOption(RT_VISIBLE_COLLISION));}}),
+                  Entrance(RR_KAK_ROOFTOP,                 {[]{return logic->CanUse(RG_HOOKSHOT) || (randoCtx->GetTrickOption(RT_KAK_MAN_ON_ROOF) && (logic->IsAdult || logic->AtDay || logic->Slingshot || logic->HasBombchus || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_LONGSHOT)));}}),
+                  Entrance(RR_KAK_IMPAS_ROOFTOP,           {[]{return logic->CanUse(RG_HOOKSHOT) || (randoCtx->GetTrickOption(RT_KAK_ROOFTOP_GS) && logic->CanUse(RG_HOVER_BOOTS));}}),
                   Entrance(RR_THE_GRAVEYARD,               {[]{return true;}}),
-                  Entrance(RR_KAK_BEHIND_GATE,             {[]{return IsAdult || (KakarikoVillageGateOpen);}}),
+                  Entrance(RR_KAK_BEHIND_GATE,             {[]{return logic->IsAdult || (logic->KakarikoVillageGateOpen);}}),
   });
 
   areaTable[RR_KAK_IMPAS_LEDGE] = Area("Kak Impas Ledge", "Kakariko Village", RA_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {}, {}, {
@@ -49,7 +47,7 @@ void AreaTable_Init_Kakariko() {
 
   areaTable[RR_KAK_IMPAS_ROOFTOP] = Area("Kak Impas Rooftop", "Kakariko Village", RA_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_KAK_GS_ABOVE_IMPAS_HOUSE, {[]{return IsAdult && AtNight && CanGetNightTimeGS && (CanJumpslash || CanUseProjectile);}}),
+                  LocationAccess(RC_KAK_GS_ABOVE_IMPAS_HOUSE, {[]{return logic->IsAdult && logic->AtNight && logic->CanGetNightTimeGS && (logic->CanJumpslash || logic->CanUseProjectile);}}),
                 }, {
                   //Exits
                   Entrance(RR_KAK_IMPAS_LEDGE,  {[]{return true;}}),
@@ -68,13 +66,13 @@ void AreaTable_Init_Kakariko() {
                   //Exits
                   Entrance(RR_KAKARIKO_VILLAGE,          {[]{return true;}}),
                   Entrance(RR_KAK_OPEN_GROTTO,           {[]{return true;}}),
-                  Entrance(RR_KAK_ODD_POTION_BUILDING, {[]{return IsAdult;}}),
-                  Entrance(RR_KAK_POTION_SHOP_BACK,      {[]{return IsAdult && AtDay;}}),
+                  Entrance(RR_KAK_ODD_POTION_BUILDING, {[]{return logic->IsAdult;}}),
+                  Entrance(RR_KAK_POTION_SHOP_BACK,      {[]{return logic->IsAdult && logic->AtDay;}}),
   });
 
   areaTable[RR_KAK_CARPENTER_BOSS_HOUSE] = Area("Kak Carpenter Boss House", "Kak Carpenter Boss House", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&WakeUpAdultTalon, {[]{return WakeUpAdultTalon || (IsAdult && PocketEgg);}}),
+                  EventAccess(&logic->WakeUpAdultTalon, {[]{return logic->WakeUpAdultTalon || (logic->IsAdult && logic->PocketEgg);}}),
                 }, {}, {
                   //Exits
                   Entrance(RR_KAKARIKO_VILLAGE, {[]{return true;}}),
@@ -82,12 +80,12 @@ void AreaTable_Init_Kakariko() {
 
   areaTable[RR_KAK_HOUSE_OF_SKULLTULA] = Area("Kak House of Skulltula", "Kak House of Skulltula", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_KAK_10_GOLD_SKULLTULA_REWARD, {[]{return GoldSkulltulaTokens >= 10;}}),
-                  LocationAccess(RC_KAK_20_GOLD_SKULLTULA_REWARD, {[]{return GoldSkulltulaTokens >= 20;}}),
-                  LocationAccess(RC_KAK_30_GOLD_SKULLTULA_REWARD, {[]{return GoldSkulltulaTokens >= 30;}}),
-                  LocationAccess(RC_KAK_40_GOLD_SKULLTULA_REWARD, {[]{return GoldSkulltulaTokens >= 40;}}),
-                  LocationAccess(RC_KAK_50_GOLD_SKULLTULA_REWARD, {[]{return GoldSkulltulaTokens >= 50;}}),
-                  LocationAccess(RC_KAK_100_GOLD_SKULLTULA_REWARD, {[]{return GoldSkulltulaTokens >= 100;}})
+                  LocationAccess(RC_KAK_10_GOLD_SKULLTULA_REWARD, {[]{return logic->GoldSkulltulaTokens >= 10;}}),
+                  LocationAccess(RC_KAK_20_GOLD_SKULLTULA_REWARD, {[]{return logic->GoldSkulltulaTokens >= 20;}}),
+                  LocationAccess(RC_KAK_30_GOLD_SKULLTULA_REWARD, {[]{return logic->GoldSkulltulaTokens >= 30;}}),
+                  LocationAccess(RC_KAK_40_GOLD_SKULLTULA_REWARD, {[]{return logic->GoldSkulltulaTokens >= 40;}}),
+                  LocationAccess(RC_KAK_50_GOLD_SKULLTULA_REWARD, {[]{return logic->GoldSkulltulaTokens >= 50;}}),
+                  LocationAccess(RC_KAK_100_GOLD_SKULLTULA_REWARD, {[]{return logic->GoldSkulltulaTokens >= 100;}})
                 }, {
                   //Exits
                   Entrance(RR_KAKARIKO_VILLAGE, {[]{return true;}}),
@@ -110,17 +108,17 @@ void AreaTable_Init_Kakariko() {
 
   areaTable[RR_KAK_IMPAS_HOUSE_NEAR_COW] = Area("Kak Impas House Near Cow", "Kak Impas House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_KAK_IMPAS_HOUSE_COW, {[]{return CanUse(RG_EPONAS_SONG);}}),
+                  LocationAccess(RC_KAK_IMPAS_HOUSE_COW, {[]{return logic->CanUse(RG_EPONAS_SONG);}}),
   }, {});
 
   areaTable[RR_KAK_WINDMILL] = Area("Kak Windmill", "Windmill and Dampes Grave", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&DrainWell, {[]{return DrainWell || (IsChild && CanUse(RG_SONG_OF_STORMS));}}),
+                  EventAccess(&logic->DrainWell, {[]{return logic->DrainWell || (logic->IsChild && logic->CanUse(RG_SONG_OF_STORMS));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_KAK_WINDMILL_FREESTANDING_POH, {[]{return CanUse(RG_BOOMERANG) || DampesWindmillAccess || (IsAdult && randoCtx->GetTrickOption(RT_KAK_ADULT_WINDMILL_POH)) || (IsChild && CanJumpslash && randoCtx->GetTrickOption(RT_KAK_CHILD_WINDMILL_POH));}}),
+                  LocationAccess(RC_KAK_WINDMILL_FREESTANDING_POH, {[]{return logic->CanUse(RG_BOOMERANG) || logic->DampesWindmillAccess || (logic->IsAdult && randoCtx->GetTrickOption(RT_KAK_ADULT_WINDMILL_POH)) || (logic->IsChild && logic->CanJumpslash && randoCtx->GetTrickOption(RT_KAK_CHILD_WINDMILL_POH));}}),
                     //PoH as child not added to trick options yet (needs uncommenting in randomizer_tricks.cpp)
-                  LocationAccess(RC_SONG_FROM_WINDMILL,            {[]{return IsAdult && Ocarina;}}),
+                  LocationAccess(RC_SONG_FROM_WINDMILL,            {[]{return logic->IsAdult && logic->Ocarina;}}),
                 }, {
                   //Exits
                   Entrance(RR_KAKARIKO_VILLAGE, {[]{return true;}}),
@@ -143,7 +141,7 @@ void AreaTable_Init_Kakariko() {
 
   areaTable[RR_KAK_SHOOTING_GALLERY] = Area("Kak Shooting Gallery", "Kak Shooting Gallery", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_KAK_SHOOTING_GALLERY_REWARD, {[]{return IsAdult && Bow;}}),
+                  LocationAccess(RC_KAK_SHOOTING_GALLERY_REWARD, {[]{return logic->IsAdult && logic->Bow;}}),
                 }, {
                   //Exits
                   Entrance(RR_KAKARIKO_VILLAGE, {[]{return true;}}),
@@ -151,23 +149,23 @@ void AreaTable_Init_Kakariko() {
 
   areaTable[RR_KAK_POTION_SHOP_FRONT] = Area("Kak Potion Shop Front", "Kak Potion Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_KAK_POTION_SHOP_ITEM_1, {[]{return IsAdult;}}),
-                  LocationAccess(RC_KAK_POTION_SHOP_ITEM_2, {[]{return IsAdult;}}),
-                  LocationAccess(RC_KAK_POTION_SHOP_ITEM_3, {[]{return IsAdult;}}),
-                  LocationAccess(RC_KAK_POTION_SHOP_ITEM_4, {[]{return IsAdult;}}),
-                  LocationAccess(RC_KAK_POTION_SHOP_ITEM_5, {[]{return IsAdult;}}),
-                  LocationAccess(RC_KAK_POTION_SHOP_ITEM_6, {[]{return IsAdult;}}),
-                  LocationAccess(RC_KAK_POTION_SHOP_ITEM_7, {[]{return IsAdult;}}),
-                  LocationAccess(RC_KAK_POTION_SHOP_ITEM_8, {[]{return IsAdult;}}),
+                  LocationAccess(RC_KAK_POTION_SHOP_ITEM_1, {[]{return logic->IsAdult;}}),
+                  LocationAccess(RC_KAK_POTION_SHOP_ITEM_2, {[]{return logic->IsAdult;}}),
+                  LocationAccess(RC_KAK_POTION_SHOP_ITEM_3, {[]{return logic->IsAdult;}}),
+                  LocationAccess(RC_KAK_POTION_SHOP_ITEM_4, {[]{return logic->IsAdult;}}),
+                  LocationAccess(RC_KAK_POTION_SHOP_ITEM_5, {[]{return logic->IsAdult;}}),
+                  LocationAccess(RC_KAK_POTION_SHOP_ITEM_6, {[]{return logic->IsAdult;}}),
+                  LocationAccess(RC_KAK_POTION_SHOP_ITEM_7, {[]{return logic->IsAdult;}}),
+                  LocationAccess(RC_KAK_POTION_SHOP_ITEM_8, {[]{return logic->IsAdult;}}),
                 }, {
                   //Exits
                   Entrance(RR_KAKARIKO_VILLAGE,     {[]{return true;}}),
-                  Entrance(RR_KAK_POTION_SHOP_BACK, {[]{return IsAdult;}}),
+                  Entrance(RR_KAK_POTION_SHOP_BACK, {[]{return logic->IsAdult;}}),
   });
 
   areaTable[RR_KAK_POTION_SHOP_BACK] = Area("Kak Potion Shop Back", "Kak Potion Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_KAK_BACKYARD,          {[]{return IsAdult;}}),
+                  Entrance(RR_KAK_BACKYARD,          {[]{return logic->IsAdult;}}),
                   Entrance(RR_KAK_POTION_SHOP_FRONT, {[]{return true;}}),
   });
 
@@ -175,13 +173,13 @@ void AreaTable_Init_Kakariko() {
       Area("Kak Granny's Potion Shop", "Kak Granny's Potion Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {
           
                // Events
-               EventAccess(&OddPoulticeAccess, { [] {
-                   return OddPoulticeAccess || (IsAdult && (OddMushroomAccess || (OddMushroom && DisableTradeRevert)));
+               EventAccess(&logic->OddPoulticeAccess, { [] {
+                   return logic->OddPoulticeAccess || (logic->IsAdult && (logic->OddMushroomAccess || (logic->OddMushroom && logic->DisableTradeRevert)));
                } }),
            },
            {
-               LocationAccess(RC_KAK_TRADE_ODD_MUSHROOM, { [] { return IsAdult && OddMushroom; } }),
-               LocationAccess(RC_KAK_GRANNYS_SHOP, { [] { return IsAdult && OddMushroom && AdultsWallet; } }),
+               LocationAccess(RC_KAK_TRADE_ODD_MUSHROOM, { [] { return logic->IsAdult && logic->OddMushroom; } }),
+               LocationAccess(RC_KAK_GRANNYS_SHOP, { [] { return logic->IsAdult && logic->OddMushroom && logic->AdultsWallet; } }),
            },
            {
                // Exits
@@ -190,7 +188,7 @@ void AreaTable_Init_Kakariko() {
 
   areaTable[RR_KAK_REDEAD_GROTTO] = Area("Kak Redead Grotto", "Kak Redead Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_KAK_REDEAD_GROTTO_CHEST, {[]{return CanUse(RG_STICKS) || CanUse(RG_KOKIRI_SWORD) || CanUse(RG_DINS_FIRE) || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD);}}),
+                  LocationAccess(RC_KAK_REDEAD_GROTTO_CHEST, {[]{return logic->CanUse(RG_STICKS) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_DINS_FIRE) || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD);}}),
                 }, {
                   //Exits
                   Entrance(RR_KAKARIKO_VILLAGE, {[]{return true;}}),
@@ -207,22 +205,22 @@ void AreaTable_Init_Kakariko() {
 
   areaTable[RR_THE_GRAVEYARD] = Area("The Graveyard", "The Graveyard", RA_THE_GRAVEYARD, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&ButterflyFairy, {[]{return ButterflyFairy || (CanUse(RG_STICKS) && AtDay);}}),
-                  EventAccess(&BeanPlantFairy, {[]{return BeanPlantFairy || (CanPlantBean(RR_THE_GRAVEYARD) && CanUse(RG_SONG_OF_STORMS));}}),
-                  EventAccess(&BugRock,        {[]{return true;}}),
+                  EventAccess(&logic->ButterflyFairy, {[]{return logic->ButterflyFairy || (logic->CanUse(RG_STICKS) && logic->AtDay);}}),
+                  EventAccess(&logic->BeanPlantFairy, {[]{return logic->BeanPlantFairy || (CanPlantBean(RR_THE_GRAVEYARD) && logic->CanUse(RG_SONG_OF_STORMS));}}),
+                  EventAccess(&logic->BugRock,        {[]{return true;}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_GRAVEYARD_FREESTANDING_POH,        {[]{return (IsAdult && CanPlantBean(RR_THE_GRAVEYARD)) || CanUse(RG_LONGSHOT) || (randoCtx->GetTrickOption(RT_GY_POH) && CanUse(RG_BOOMERANG));}}),
-                  LocationAccess(RC_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR, {[]{return IsChild && AtNight;}}), //TODO: This needs to change
-                  LocationAccess(RC_GRAVEYARD_GS_WALL,                 {[]{return IsChild && HookshotOrBoomerang && AtNight && CanGetNightTimeGS;}}),
-                  LocationAccess(RC_GRAVEYARD_GS_BEAN_PATCH,           {[]{return CanPlantBugs && CanChildAttack;}}),
+                  LocationAccess(RC_GRAVEYARD_FREESTANDING_POH,        {[]{return (logic->IsAdult && CanPlantBean(RR_THE_GRAVEYARD)) || logic->CanUse(RG_LONGSHOT) || (randoCtx->GetTrickOption(RT_GY_POH) && logic->CanUse(RG_BOOMERANG));}}),
+                  LocationAccess(RC_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR, {[]{return logic->IsChild && logic->AtNight;}}), //TODO: This needs to change
+                  LocationAccess(RC_GRAVEYARD_GS_WALL,                 {[]{return logic->IsChild && logic->HookshotOrBoomerang && logic->AtNight && logic->CanGetNightTimeGS;}}),
+                  LocationAccess(RC_GRAVEYARD_GS_BEAN_PATCH,           {[]{return logic->CanPlantBugs && logic->CanChildAttack;}}),
                 }, {
                   //Exits
-                  Entrance(RR_GRAVEYARD_SHIELD_GRAVE,       {[]{return IsAdult || AtNight;}}),
-                  Entrance(RR_GRAVEYARD_COMPOSERS_GRAVE,    {[]{return CanUse(RG_ZELDAS_LULLABY);}}),
-                  Entrance(RR_GRAVEYARD_HEART_PIECE_GRAVE,  {[]{return IsAdult || AtNight;}}),
-                  Entrance(RR_GRAVEYARD_DAMPES_GRAVE,       {[]{return IsAdult;}}),
-                  Entrance(RR_GRAVEYARD_DAMPES_HOUSE,       {[]{return IsAdult || AtDampeTime;}}), //TODO: This needs to be handled
+                  Entrance(RR_GRAVEYARD_SHIELD_GRAVE,       {[]{return logic->IsAdult || logic->AtNight;}}),
+                  Entrance(RR_GRAVEYARD_COMPOSERS_GRAVE,    {[]{return logic->CanUse(RG_ZELDAS_LULLABY);}}),
+                  Entrance(RR_GRAVEYARD_HEART_PIECE_GRAVE,  {[]{return logic->IsAdult || logic->AtNight;}}),
+                  Entrance(RR_GRAVEYARD_DAMPES_GRAVE,       {[]{return logic->IsAdult;}}),
+                  Entrance(RR_GRAVEYARD_DAMPES_HOUSE,       {[]{return logic->IsAdult || logic->AtDampeTime;}}), //TODO: This needs to be handled
                   Entrance(RR_KAKARIKO_VILLAGE,             {[]{return true;}}),
                   Entrance(RR_GRAVEYARD_WARP_PAD_REGION,    {[]{return false;}}),
   });
@@ -238,7 +236,7 @@ void AreaTable_Init_Kakariko() {
 
   areaTable[RR_GRAVEYARD_HEART_PIECE_GRAVE] = Area("Graveyard Heart Piece Grave", "Graveyard Heart Piece Grave", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_GRAVEYARD_HEART_PIECE_GRAVE_CHEST, {[]{return CanUse(RG_SUNS_SONG);}}),
+                  LocationAccess(RC_GRAVEYARD_HEART_PIECE_GRAVE_CHEST, {[]{return logic->CanUse(RG_SUNS_SONG);}}),
                 }, {
                   //Exits
                   Entrance(RR_THE_GRAVEYARD, {[]{return true;}}),
@@ -246,8 +244,8 @@ void AreaTable_Init_Kakariko() {
 
   areaTable[RR_GRAVEYARD_COMPOSERS_GRAVE] = Area("Graveyard Composers Grave", "Graveyard Composers Grave", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST, {[]{return HasFireSource;}}),
-                  LocationAccess(RC_SONG_FROM_ROYAL_FAMILYS_TOMB,       {[]{return CanUseProjectile || CanJumpslash || CanUse(RG_MEGATON_HAMMER);}}),
+                  LocationAccess(RC_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST, {[]{return logic->HasFireSource;}}),
+                  LocationAccess(RC_SONG_FROM_ROYAL_FAMILYS_TOMB,       {[]{return logic->CanUseProjectile || logic->CanJumpslash || logic->CanUse(RG_MEGATON_HAMMER);}}),
                 }, {
                   //Exits
                   Entrance(RR_THE_GRAVEYARD, {[]{return true;}}),
@@ -255,21 +253,21 @@ void AreaTable_Init_Kakariko() {
 
   areaTable[RR_GRAVEYARD_DAMPES_GRAVE] = Area("Graveyard Dampes Grave", "Windmill and Dampes Grave", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&NutPot,               {[]{return true;}}),
-                  EventAccess(&DampesWindmillAccess, {[]{return DampesWindmillAccess || (IsAdult && CanUse(RG_SONG_OF_TIME));}}),
+                  EventAccess(&logic->NutPot,               {[]{return true;}}),
+                  EventAccess(&logic->DampesWindmillAccess, {[]{return logic->DampesWindmillAccess || (logic->IsAdult && logic->CanUse(RG_SONG_OF_TIME));}}),
                 }, {
                   //Locations
                   LocationAccess(RC_GRAVEYARD_HOOKSHOT_CHEST,              {[]{return true;}}),
-                  LocationAccess(RC_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH, {[]{return IsAdult || randoCtx->GetTrickOption(RT_GY_CHILD_DAMPE_RACE_POH);}}),
+                  LocationAccess(RC_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH, {[]{return logic->IsAdult || randoCtx->GetTrickOption(RT_GY_CHILD_DAMPE_RACE_POH);}}),
                 }, {
                   //Exits
                   Entrance(RR_THE_GRAVEYARD, {[]{return true;}}),
-                  Entrance(RR_KAK_WINDMILL,  {[]{return IsAdult && CanUse(RG_SONG_OF_TIME);}}),
+                  Entrance(RR_KAK_WINDMILL,  {[]{return logic->IsAdult && logic->CanUse(RG_SONG_OF_TIME);}}),
   });
 
   areaTable[RR_GRAVEYARD_DAMPES_HOUSE] = Area("Graveyard Dampes House", "Graveyard Dampes House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DAMPE_HINT, {[]{return IsAdult;}}),
+                  LocationAccess(RC_DAMPE_HINT, {[]{return logic->IsAdult;}}),
                 }, {
                   //Exits
                   Entrance(RR_THE_GRAVEYARD, {[]{return true;}}),
@@ -277,19 +275,19 @@ void AreaTable_Init_Kakariko() {
 
   areaTable[RR_GRAVEYARD_WARP_PAD_REGION] = Area("Graveyard Warp Pad Region", "Graveyard", RA_THE_GRAVEYARD, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&GossipStoneFairy, {[]{return GossipStoneFairy || CanSummonGossipFairyWithoutSuns;}}),
+                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CanSummonGossipFairyWithoutSuns;}}),
                 }, {
                   //Locations
                   LocationAccess(RC_GY_GOSSIP_STONE, {[]{return true;}}),
                 }, {
                   //Exits
                   Entrance(RR_THE_GRAVEYARD,             {[]{return true;}}),
-                  Entrance(RR_SHADOW_TEMPLE_ENTRYWAY,    {[]{return CanUse(RG_DINS_FIRE) || (randoCtx->GetTrickOption(RT_GY_SHADOW_FIRE_ARROWS) && IsAdult && CanUse(RG_FIRE_ARROWS));}}),
+                  Entrance(RR_SHADOW_TEMPLE_ENTRYWAY,    {[]{return logic->CanUse(RG_DINS_FIRE) || (randoCtx->GetTrickOption(RT_GY_SHADOW_FIRE_ARROWS) && logic->IsAdult && logic->CanUse(RG_FIRE_ARROWS));}}),
   });
 
   areaTable[RR_KAK_BEHIND_GATE] = Area("Kak Behind Gate", "Kakariko Village", RA_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_KAKARIKO_VILLAGE,     {[]{return IsAdult || randoCtx->GetTrickOption(RT_VISIBLE_COLLISION) || KakarikoVillageGateOpen || randoCtx->GetOption(RSK_KAK_GATE).Is(RO_KAK_GATE_OPEN);}}),
+                  Entrance(RR_KAKARIKO_VILLAGE,     {[]{return logic->IsAdult || randoCtx->GetTrickOption(RT_VISIBLE_COLLISION) || logic->KakarikoVillageGateOpen || randoCtx->GetOption(RSK_KAK_GATE).Is(RO_KAK_GATE_OPEN);}}),
                   Entrance(RR_DEATH_MOUNTAIN_TRAIL, {[]{return true;}}),
   });
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
index f66644061..244a3cfd5 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
@@ -1,22 +1,20 @@
 #include "../location_access.hpp"
-#include "../logic.hpp"
 #include "../../entrance.h"
 
-using namespace Logic;
 using namespace Rando;
 
 void AreaTable_Init_LostWoods() {
   areaTable[RR_KOKIRI_FOREST] = Area("Kokiri Forest", "Kokiri Forest", RA_KOKIRI_FOREST, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&BeanPlantFairy,           {[]{return BeanPlantFairy   || (CanPlantBean(RR_KOKIRI_FOREST) && CanUse(RG_SONG_OF_STORMS));}}),
-                  EventAccess(&GossipStoneFairy,         {[]{return GossipStoneFairy || CanSummonGossipFairyWithoutSuns;}}),
-                  EventAccess(&ShowedMidoSwordAndShield, {[]{return ShowedMidoSwordAndShield || (IsChild && KokiriSword && DekuShield);}}),
+                  EventAccess(&logic->BeanPlantFairy,           {[]{return logic->BeanPlantFairy   || (CanPlantBean(RR_KOKIRI_FOREST) && logic->CanUse(RG_SONG_OF_STORMS));}}),
+                  EventAccess(&logic->GossipStoneFairy,         {[]{return logic->GossipStoneFairy || logic->CanSummonGossipFairyWithoutSuns;}}),
+                  EventAccess(&logic->ShowedMidoSwordAndShield, {[]{return logic->ShowedMidoSwordAndShield || (logic->IsChild && logic->KokiriSword && logic->DekuShield);}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_KF_KOKIRI_SWORD_CHEST,   {[]{return IsChild;}}),
-                  LocationAccess(RC_KF_GS_KNOW_IT_ALL_HOUSE, {[]{return IsChild && CanChildAttack && AtNight && (/*TODO: HasNightStart ||*/ CanLeaveForest || CanUse(RG_SUNS_SONG)) && CanGetNightTimeGS;}}),
-                  LocationAccess(RC_KF_GS_BEAN_PATCH,        {[]{return CanPlantBugs && CanChildAttack;}}),
-                  LocationAccess(RC_KF_GS_HOUSE_OF_TWINS,    {[]{return IsAdult && AtNight && (HookshotOrBoomerang || (randoCtx->GetTrickOption(RT_KF_ADULT_GS) && CanUse(RG_HOVER_BOOTS))) && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_KF_KOKIRI_SWORD_CHEST,   {[]{return logic->IsChild;}}),
+                  LocationAccess(RC_KF_GS_KNOW_IT_ALL_HOUSE, {[]{return logic->IsChild && logic->CanChildAttack && logic->AtNight && (/*TODO: HasNightStart ||*/ logic->CanLeaveForest || logic->CanUse(RG_SUNS_SONG)) && logic->CanGetNightTimeGS;}}),
+                  LocationAccess(RC_KF_GS_BEAN_PATCH,        {[]{return logic->CanPlantBugs && logic->CanChildAttack;}}),
+                  LocationAccess(RC_KF_GS_HOUSE_OF_TWINS,    {[]{return logic->IsAdult && logic->AtNight && (logic->HookshotOrBoomerang || (randoCtx->GetTrickOption(RT_KF_ADULT_GS) && logic->CanUse(RG_HOVER_BOOTS))) && logic->CanGetNightTimeGS;}}),
                   LocationAccess(RC_KF_GOSSIP_STONE,         {[]{return true;}}),
                 }, {
                   //Exits
@@ -26,30 +24,30 @@ void AreaTable_Init_LostWoods() {
                   Entrance(RR_KF_HOUSE_OF_TWINS,     {[]{return true;}}),
                   Entrance(RR_KF_KNOW_IT_ALL_HOUSE,  {[]{return true;}}),
                   Entrance(RR_KF_KOKIRI_SHOP,        {[]{return true;}}),
-                  Entrance(RR_KF_OUTSIDE_DEKU_TREE,  {[]{return IsAdult || randoCtx->GetOption(RSK_FOREST).Is(RO_FOREST_OPEN) || ShowedMidoSwordAndShield;}}),
+                  Entrance(RR_KF_OUTSIDE_DEKU_TREE,  {[]{return logic->IsAdult || randoCtx->GetOption(RSK_FOREST).Is(RO_FOREST_OPEN) || logic->ShowedMidoSwordAndShield;}}),
                   Entrance(RR_THE_LOST_WOODS,        {[]{return true;}}),
-                  Entrance(RR_LW_BRIDGE_FROM_FOREST, {[]{return IsAdult || randoCtx->GetOption(RSK_FOREST).IsNot(RO_FOREST_CLOSED) || DekuTreeClear;}}),
-                  Entrance(RR_KF_STORMS_GROTTO,      {[]{return CanOpenStormGrotto;}}),
+                  Entrance(RR_LW_BRIDGE_FROM_FOREST, {[]{return logic->IsAdult || randoCtx->GetOption(RSK_FOREST).IsNot(RO_FOREST_CLOSED) || logic->DekuTreeClear;}}),
+                  Entrance(RR_KF_STORMS_GROTTO,      {[]{return logic->CanOpenStormGrotto;}}),
   });
 
   areaTable[RR_KF_OUTSIDE_DEKU_TREE] = Area("KF Outside Deku Tree", "Kokiri Forest", RA_KOKIRI_FOREST, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&DekuBabaSticks,           {[]{return DekuBabaSticks || ((IsAdult && (CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_KOKIRI_SWORD)) && !randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES)) || (IsChild && (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BOOMERANG))));}}),
-                  EventAccess(&DekuBabaNuts,             {[]{return DekuBabaNuts   || ((IsAdult && (CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_KOKIRI_SWORD)) && !randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES)) || (IsChild && (CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT) || HasExplosives || CanUse(RG_DINS_FIRE))));}}),
-                  EventAccess(&ShowedMidoSwordAndShield, {[]{return ShowedMidoSwordAndShield || (IsChild && KokiriSword && DekuShield);}}),
+                  EventAccess(&logic->DekuBabaSticks,           {[]{return logic->DekuBabaSticks || ((logic->IsAdult && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_KOKIRI_SWORD)) && !randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES)) || (logic->IsChild && (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BOOMERANG))));}}),
+                  EventAccess(&logic->DekuBabaNuts,             {[]{return logic->DekuBabaNuts   || ((logic->IsAdult && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_KOKIRI_SWORD)) && !randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES)) || (logic->IsChild && (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->HasExplosives || logic->CanUse(RG_DINS_FIRE))));}}),
+                  EventAccess(&logic->ShowedMidoSwordAndShield, {[]{return logic->ShowedMidoSwordAndShield || (logic->IsChild && logic->KokiriSword && logic->DekuShield);}}),
                 }, {
                   //Locations
                   LocationAccess(RC_KF_DEKU_TREE_LEFT_GOSSIP_STONE,  {[]{return true;}}),
                   LocationAccess(RC_KF_DEKU_TREE_RIGHT_GOSSIP_STONE, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(RR_DEKU_TREE_ENTRYWAY, {[]{return IsChild || (randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).IsNot(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF) && (randoCtx->GetOption(RSK_FOREST).Is(RO_FOREST_OPEN) || ShowedMidoSwordAndShield));}}),
-                  Entrance(RR_KOKIRI_FOREST,      {[]{return IsAdult || randoCtx->GetOption(RSK_FOREST).Is(RO_FOREST_OPEN) || ShowedMidoSwordAndShield;}}),
+                  Entrance(RR_DEKU_TREE_ENTRYWAY, {[]{return logic->IsChild || (randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).IsNot(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF) && (randoCtx->GetOption(RSK_FOREST).Is(RO_FOREST_OPEN) || logic->ShowedMidoSwordAndShield));}}),
+                  Entrance(RR_KOKIRI_FOREST,      {[]{return logic->IsAdult || randoCtx->GetOption(RSK_FOREST).Is(RO_FOREST_OPEN) || logic->ShowedMidoSwordAndShield;}}),
   });
 
   areaTable[RR_KF_LINKS_HOUSE] = Area("KF Link's House", "KF Link's House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_KF_LINKS_HOUSE_COW, {[]{return IsAdult && CanUse(RG_EPONAS_SONG) && LinksCow;}}),
+                  LocationAccess(RC_KF_LINKS_HOUSE_COW, {[]{return logic->IsAdult && logic->CanUse(RG_EPONAS_SONG) && logic->LinksCow;}}),
                 }, {
                   //Exits
                   Entrance(RR_KOKIRI_FOREST, {[]{return true;}})
@@ -112,16 +110,16 @@ void AreaTable_Init_LostWoods() {
 
   areaTable[RR_THE_LOST_WOODS] = Area("Lost Woods", "Lost Woods", RA_THE_LOST_WOODS, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&OddMushroomAccess, {[]{return OddMushroomAccess || (IsAdult && (CojiroAccess || Cojiro));}}),
-                  EventAccess(&PoachersSawAccess, {[]{return PoachersSawAccess || (IsAdult && OddPoulticeAccess);}}),
-                  EventAccess(&GossipStoneFairy,  {[]{return GossipStoneFairy  || CanSummonGossipFairyWithoutSuns;}}),
-                  EventAccess(&BeanPlantFairy,    {[]{return BeanPlantFairy    || CanUse(RG_SONG_OF_STORMS);}}),
-                  EventAccess(&BugShrub,          {[]{return IsChild && CanCutShrubs;}}),
+                  EventAccess(&logic->OddMushroomAccess, {[]{return logic->OddMushroomAccess || (logic->IsAdult && (logic->CojiroAccess || logic->Cojiro));}}),
+                  EventAccess(&logic->PoachersSawAccess, {[]{return logic->PoachersSawAccess || (logic->IsAdult && logic->OddPoulticeAccess);}}),
+                  EventAccess(&logic->GossipStoneFairy,  {[]{return logic->GossipStoneFairy  || logic->CanSummonGossipFairyWithoutSuns;}}),
+                  EventAccess(&logic->BeanPlantFairy,    {[]{return logic->BeanPlantFairy    || logic->CanUse(RG_SONG_OF_STORMS);}}),
+                  EventAccess(&logic->BugShrub,          {[]{return logic->IsChild && logic->CanCutShrubs;}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_LW_SKULL_KID,                 {[]{return IsChild && CanUse(RG_SARIAS_SONG);}}),
-                  LocationAccess(RC_LW_TRADE_COJIRO,              {[]{return IsAdult && Cojiro;}}),
-                  LocationAccess(RC_LW_TRADE_ODD_POTION,        {[]{return IsAdult && OddPoultice && Cojiro;}}),
+                  LocationAccess(RC_LW_SKULL_KID,                 {[]{return logic->IsChild && logic->CanUse(RG_SARIAS_SONG);}}),
+                  LocationAccess(RC_LW_TRADE_COJIRO,              {[]{return logic->IsAdult && logic->Cojiro;}}),
+                  LocationAccess(RC_LW_TRADE_ODD_POTION,        {[]{return logic->IsAdult && logic->OddPoultice && logic->Cojiro;}}),
                                                                                                 //all 5 buttons are logically required for memory game
                                                                                                 //because the chances of being able to beat it
                                                                                                 //every time you attempt it are as follows:
@@ -130,37 +128,37 @@ void AreaTable_Init_LostWoods() {
                                                                                                 //3 buttons        => 3.75%
                                                                                                 //4 buttons        => 25.3125%
                                                                                                 //5 buttons        => 100%
-                  LocationAccess(RC_LW_OCARINA_MEMORY_GAME,       {[]{return IsChild && Ocarina && OcarinaButtons >= 5;}}),
-                  LocationAccess(RC_LW_TARGET_IN_WOODS,           {[]{return IsChild && CanUse(RG_FAIRY_SLINGSHOT);}}),
-                  LocationAccess(RC_LW_DEKU_SCRUB_NEAR_BRIDGE,    {[]{return IsChild && CanStunDeku;}}),
-                  LocationAccess(RC_LW_GS_BEAN_PATCH_NEAR_BRIDGE, {[]{return CanPlantBugs && CanChildAttack;}}),
+                  LocationAccess(RC_LW_OCARINA_MEMORY_GAME,       {[]{return logic->IsChild && logic->Ocarina && logic->OcarinaButtons >= 5;}}),
+                  LocationAccess(RC_LW_TARGET_IN_WOODS,           {[]{return logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT);}}),
+                  LocationAccess(RC_LW_DEKU_SCRUB_NEAR_BRIDGE,    {[]{return logic->IsChild && logic->CanStunDeku;}}),
+                  LocationAccess(RC_LW_GS_BEAN_PATCH_NEAR_BRIDGE, {[]{return logic->CanPlantBugs && logic->CanChildAttack;}}),
                   LocationAccess(RC_LW_GOSSIP_STONE,              {[]{return true;}}),
                 }, {
                   //Exits
                   Entrance(RR_LW_FOREST_EXIT,           {[]{return true;}}),
                   Entrance(RR_GC_WOODS_WARP,            {[]{return true;}}),
-                  Entrance(RR_LW_BRIDGE,                {[]{return CanLeaveForest && ((IsAdult && (CanPlantBean(RR_THE_LOST_WOODS) || randoCtx->GetTrickOption(RT_LW_BRIDGE))) || CanUse(RG_HOVER_BOOTS) || CanUse(RG_LONGSHOT));}}),
-                  Entrance(RR_ZORAS_RIVER,              {[]{return CanLeaveForest && (CanDive || CanUse(RG_IRON_BOOTS));}}),
-                  Entrance(RR_LW_BEYOND_MIDO,           {[]{return IsChild || CanUse(RG_SARIAS_SONG) || randoCtx->GetTrickOption(RT_LW_MIDO_BACKFLIP);}}),
-                  Entrance(RR_LW_NEAR_SHORTCUTS_GROTTO, {[]{return Here(RR_THE_LOST_WOODS, []{return CanBlastOrSmash;});}}),
+                  Entrance(RR_LW_BRIDGE,                {[]{return logic->CanLeaveForest && ((logic->IsAdult && (CanPlantBean(RR_THE_LOST_WOODS) || randoCtx->GetTrickOption(RT_LW_BRIDGE))) || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_LONGSHOT));}}),
+                  Entrance(RR_ZORAS_RIVER,              {[]{return logic->CanLeaveForest && (logic->CanDive || logic->CanUse(RG_IRON_BOOTS));}}),
+                  Entrance(RR_LW_BEYOND_MIDO,           {[]{return logic->IsChild || logic->CanUse(RG_SARIAS_SONG) || randoCtx->GetTrickOption(RT_LW_MIDO_BACKFLIP);}}),
+                  Entrance(RR_LW_NEAR_SHORTCUTS_GROTTO, {[]{return Here(RR_THE_LOST_WOODS, []{return logic->CanBlastOrSmash;});}}),
   });
 
   areaTable[RR_LW_BEYOND_MIDO] = Area("LW Beyond Mido", "Lost Woods", RA_THE_LOST_WOODS, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&ButterflyFairy, {[]{return ButterflyFairy || CanUse(RG_STICKS);}}),
+                  EventAccess(&logic->ButterflyFairy, {[]{return logic->ButterflyFairy || logic->CanUse(RG_STICKS);}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT, {[]{return IsChild && CanStunDeku;}}),
-                  LocationAccess(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT,  {[]{return IsChild && CanStunDeku;}}),
-                  LocationAccess(RC_LW_GS_ABOVE_THEATER,                   {[]{return IsAdult && AtNight && ((CanPlantBean(RR_LW_BEYOND_MIDO) && CanAdultAttack) || (randoCtx->GetTrickOption(RT_LW_GS_BEAN) && CanUse(RG_HOOKSHOT) && (CanUse(RG_LONGSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT) || HasBombchus || CanUse(RG_DINS_FIRE)))) && CanGetNightTimeGS;}}),
-                  LocationAccess(RC_LW_GS_BEAN_PATCH_NEAR_THEATER,         {[]{return CanPlantBugs && (CanChildAttack || (randoCtx->GetOption(RSK_SHUFFLE_SCRUBS).Is(RO_SCRUBS_OFF) && DekuShield));}}),
+                  LocationAccess(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT, {[]{return logic->IsChild && logic->CanStunDeku;}}),
+                  LocationAccess(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT,  {[]{return logic->IsChild && logic->CanStunDeku;}}),
+                  LocationAccess(RC_LW_GS_ABOVE_THEATER,                   {[]{return logic->IsAdult && logic->AtNight && ((CanPlantBean(RR_LW_BEYOND_MIDO) && logic->CanAdultAttack) || (randoCtx->GetTrickOption(RT_LW_GS_BEAN) && logic->CanUse(RG_HOOKSHOT) && (logic->CanUse(RG_LONGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->HasBombchus || logic->CanUse(RG_DINS_FIRE)))) && logic->CanGetNightTimeGS;}}),
+                  LocationAccess(RC_LW_GS_BEAN_PATCH_NEAR_THEATER,         {[]{return logic->CanPlantBugs && (logic->CanChildAttack || (randoCtx->GetOption(RSK_SHUFFLE_SCRUBS).Is(RO_SCRUBS_OFF) && logic->DekuShield));}}),
                 }, {
                   //Exits
                   Entrance(RR_LW_FOREST_EXIT,   {[]{return true;}}),
-                  Entrance(RR_THE_LOST_WOODS,   {[]{return IsChild || CanUse(RG_SARIAS_SONG);}}),
+                  Entrance(RR_THE_LOST_WOODS,   {[]{return logic->IsChild || logic->CanUse(RG_SARIAS_SONG);}}),
                   Entrance(RR_SFM_ENTRYWAY,     {[]{return true;}}),
                   Entrance(RR_DEKU_THEATER,     {[]{return true;}}),
-                  Entrance(RR_LW_SCRUBS_GROTTO, {[]{return Here(RR_LW_BEYOND_MIDO, []{return CanBlastOrSmash;});}}),
+                  Entrance(RR_LW_SCRUBS_GROTTO, {[]{return Here(RR_LW_BEYOND_MIDO, []{return logic->CanBlastOrSmash;});}}),
   });
 
   areaTable[RR_LW_NEAR_SHORTCUTS_GROTTO] = Area("LW Near Shortcuts Grotto", "LW Near Shortcuts Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
@@ -174,8 +172,8 @@ void AreaTable_Init_LostWoods() {
 
   areaTable[RR_DEKU_THEATER] = Area("Deku Theater", "Deku Theater", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DEKU_THEATER_SKULL_MASK,    {[]{return IsChild && SkullMask;}}),
-                  LocationAccess(RC_DEKU_THEATER_MASK_OF_TRUTH, {[]{return IsChild && MaskOfTruth;}}),
+                  LocationAccess(RC_DEKU_THEATER_SKULL_MASK,    {[]{return logic->IsChild && logic->SkullMask;}}),
+                  LocationAccess(RC_DEKU_THEATER_MASK_OF_TRUTH, {[]{return logic->IsChild && logic->MaskOfTruth;}}),
                 }, {
                   //Exits
                   Entrance(RR_LW_BEYOND_MIDO, {[]{return true;}}),
@@ -183,8 +181,8 @@ void AreaTable_Init_LostWoods() {
 
   areaTable[RR_LW_SCRUBS_GROTTO] = Area("LW Scrubs Grotto", "LW Scrubs Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_LW_DEKU_SCRUB_GROTTO_REAR,  {[]{return CanStunDeku;}}),
-                  LocationAccess(RC_LW_DEKU_SCRUB_GROTTO_FRONT, {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_LW_DEKU_SCRUB_GROTTO_REAR,  {[]{return logic->CanStunDeku;}}),
+                  LocationAccess(RC_LW_DEKU_SCRUB_GROTTO_FRONT, {[]{return logic->CanStunDeku;}}),
                 }, {
                   //Exits
                   Entrance(RR_LW_BEYOND_MIDO, {[]{return true;}}),
@@ -193,32 +191,32 @@ void AreaTable_Init_LostWoods() {
   areaTable[RR_SFM_ENTRYWAY] = Area("SFM Entryway", "Sacred Forest Meadow", RA_SACRED_FOREST_MEADOW, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_LW_BEYOND_MIDO,       {[]{return true;}}),
-                  Entrance(RR_SACRED_FOREST_MEADOW, {[]{return CanJumpslash || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_DINS_FIRE) || CanUse(RG_MEGATON_HAMMER);}}),
-                  Entrance(RR_SFM_WOLFOS_GROTTO,    {[]{return CanOpenBombGrotto;}}),
+                  Entrance(RR_SACRED_FOREST_MEADOW, {[]{return logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_DINS_FIRE) || logic->CanUse(RG_MEGATON_HAMMER);}}),
+                  Entrance(RR_SFM_WOLFOS_GROTTO,    {[]{return logic->CanOpenBombGrotto;}}),
   });
 
   areaTable[RR_SACRED_FOREST_MEADOW] = Area("Sacred Forest Meadow", "Sacred Forest Meadow", RA_SACRED_FOREST_MEADOW, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&GossipStoneFairy, {[]{return GossipStoneFairy || CanSummonGossipFairyWithoutSuns;}}),
+                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CanSummonGossipFairyWithoutSuns;}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_SONG_FROM_SARIA,             {[]{return IsChild && ZeldasLetter;}}),
-                  LocationAccess(RC_SHEIK_IN_FOREST,             {[]{return IsAdult;}}),
-                  LocationAccess(RC_SFM_GS,                      {[]{return IsAdult && HookshotOrBoomerang && AtNight && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_SONG_FROM_SARIA,             {[]{return logic->IsChild && logic->ZeldasLetter;}}),
+                  LocationAccess(RC_SHEIK_IN_FOREST,             {[]{return logic->IsAdult;}}),
+                  LocationAccess(RC_SFM_GS,                      {[]{return logic->IsAdult && logic->HookshotOrBoomerang && logic->AtNight && logic->CanGetNightTimeGS;}}),
                   LocationAccess(RC_SFM_MAZE_LOWER_GOSSIP_STONE, {[]{return true;}}),
                   LocationAccess(RC_SFM_MAZE_UPPER_GOSSIP_STONE, {[]{return true;}}),
                   LocationAccess(RC_SFM_SARIA_GOSSIP_STONE,      {[]{return true;}}),
                 }, {
                   //Exits
                   Entrance(RR_SFM_ENTRYWAY,           {[]{return true;}}),
-                  Entrance(RR_FOREST_TEMPLE_ENTRYWAY, {[]{return CanUse(RG_HOOKSHOT);}}),
+                  Entrance(RR_FOREST_TEMPLE_ENTRYWAY, {[]{return logic->CanUse(RG_HOOKSHOT);}}),
                   Entrance(RR_SFM_FAIRY_GROTTO,       {[]{return true;}}),
-                  Entrance(RR_SFM_STORMS_GROTTO,      {[]{return CanOpenStormGrotto;}}),
+                  Entrance(RR_SFM_STORMS_GROTTO,      {[]{return logic->CanOpenStormGrotto;}}),
   });
 
   areaTable[RR_SFM_FAIRY_GROTTO] = Area("SFM Fairy Grotto", "SFM Fairy Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&FreeFairies, {[]{return true;}}),
+                  EventAccess(&logic->FreeFairies, {[]{return true;}}),
                 }, {}, {
                   //Exits
                   Entrance(RR_SACRED_FOREST_MEADOW, {[]{return true;}}),
@@ -226,7 +224,7 @@ void AreaTable_Init_LostWoods() {
 
   areaTable[RR_SFM_WOLFOS_GROTTO] = Area("SFM Wolfos Grotto", "SFM Wolfos Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SFM_WOLFOS_GROTTO_CHEST, {[]{return IsAdult || Slingshot || Sticks || KokiriSword || CanUse(RG_DINS_FIRE) || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD);}}),
+                  LocationAccess(RC_SFM_WOLFOS_GROTTO_CHEST, {[]{return logic->IsAdult || logic->Slingshot || logic->Sticks || logic->KokiriSword || logic->CanUse(RG_DINS_FIRE) || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD);}}),
                 }, {
                   //Exits
                   Entrance(RR_SFM_ENTRYWAY, {[]{return true;}}),
@@ -234,8 +232,8 @@ void AreaTable_Init_LostWoods() {
 
   areaTable[RR_SFM_STORMS_GROTTO] = Area("SFM Storms Grotto", "SFM Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SFM_DEKU_SCRUB_GROTTO_REAR,  {[]{return CanStunDeku;}}),
-                  LocationAccess(RC_SFM_DEKU_SCRUB_GROTTO_FRONT, {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_SFM_DEKU_SCRUB_GROTTO_REAR,  {[]{return logic->CanStunDeku;}}),
+                  LocationAccess(RC_SFM_DEKU_SCRUB_GROTTO_FRONT, {[]{return logic->CanStunDeku;}}),
                 }, {
                   //Exits
                   Entrance(RR_SACRED_FOREST_MEADOW, {[]{return true;}}),
@@ -253,6 +251,6 @@ void AreaTable_Init_LostWoods() {
                   //Exits
                   Entrance(RR_KOKIRI_FOREST,  {[]{return true;}}),
                   Entrance(RR_HYRULE_FIELD,   {[]{return true;}}),
-                  Entrance(RR_THE_LOST_WOODS, {[]{return CanUse(RG_LONGSHOT);}}),
+                  Entrance(RR_THE_LOST_WOODS, {[]{return logic->CanUse(RG_LONGSHOT);}}),
   });
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp
index d63d4ba5d..9a692e5c5 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp
@@ -1,9 +1,7 @@
 #include "../location_access.hpp"
-#include "../logic.hpp"
 #include "../../entrance.h"
 #include "../../dungeon.h"
 
-using namespace Logic;
 using namespace Rando;
 
 void AreaTable_Init_ShadowTemple() {
@@ -12,8 +10,8 @@ void AreaTable_Init_ShadowTemple() {
   ---------------------------*/
   areaTable[RR_SHADOW_TEMPLE_ENTRYWAY] = Area("Shadow Temple Entryway", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_SHADOW_TEMPLE_BEGINNING,    {[]{return randoCtx->GetDungeon(SHADOW_TEMPLE)->IsVanilla() && (randoCtx->GetTrickOption(RT_LENS_SHADOW) || CanUse(RG_LENS_OF_TRUTH)) && (CanUse(RG_HOVER_BOOTS) || CanUse(RG_HOOKSHOT));}}),
-                  Entrance(RR_SHADOW_TEMPLE_MQ_BEGINNING, {[]{return randoCtx->GetDungeon(SHADOW_TEMPLE)->IsMQ()    && (randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ) || CanUse(RG_LENS_OF_TRUTH)) && (CanUse(RG_HOVER_BOOTS) || CanUse(RG_HOOKSHOT));}}),
+                  Entrance(RR_SHADOW_TEMPLE_BEGINNING,    {[]{return randoCtx->GetDungeon(SHADOW_TEMPLE)->IsVanilla() && (randoCtx->GetTrickOption(RT_LENS_SHADOW) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT));}}),
+                  Entrance(RR_SHADOW_TEMPLE_MQ_BEGINNING, {[]{return randoCtx->GetDungeon(SHADOW_TEMPLE)->IsMQ()    && (randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT));}}),
                   Entrance(RR_GRAVEYARD_WARP_PAD_REGION,  {[]{return true;}}),
   });
 
@@ -23,68 +21,68 @@ void AreaTable_Init_ShadowTemple() {
   if (randoCtx->GetDungeon(SHADOW_TEMPLE)->IsVanilla()) {
   areaTable[RR_SHADOW_TEMPLE_BEGINNING] = Area("Shadow Temple Beginning", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&NutPot, {[]{return true;}}),
+                  EventAccess(&logic->NutPot, {[]{return true;}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_SHADOW_TEMPLE_MAP_CHEST,         {[]{return CanJumpslash;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_HOVER_BOOTS_CHEST, {[]{return (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD));}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MAP_CHEST,         {[]{return logic->CanJumpslash;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_HOVER_BOOTS_CHEST, {[]{return (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD));}}),
                 }, {
                   //Exits
                   Entrance(RR_SHADOW_TEMPLE_ENTRYWAY,     {[]{return true;}}),
-                  Entrance(RR_SHADOW_TEMPLE_FIRST_BEAMOS, {[]{return CanUse(RG_HOVER_BOOTS);}}),
+                  Entrance(RR_SHADOW_TEMPLE_FIRST_BEAMOS, {[]{return logic->CanUse(RG_HOVER_BOOTS);}}),
   });
 
   areaTable[RR_SHADOW_TEMPLE_FIRST_BEAMOS] = Area("Shadow Temple First Beamos", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&FairyPot, {[]{return true;}}), //This fairy pot is only on 3DS
+                  EventAccess(&logic->FairyPot, {[]{return true;}}), //This fairy pot is only on 3DS
                 }, {
                   //Locations
-                  LocationAccess(RC_SHADOW_TEMPLE_COMPASS_CHEST,            {[]{return CanJumpslash;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST, {[]{return CanUse(RG_HOVER_BOOTS) || CanUse(RG_HOOKSHOT);}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_COMPASS_CHEST,            {[]{return logic->CanJumpslash;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST, {[]{return logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT);}}),
                   LocationAccess(RC_SHADOW_TEMPLE_GS_NEAR_SHIP,             {[]{return false;}}),
                 }, {
                   //Exits
-                  Entrance(RR_SHADOW_TEMPLE_HUGE_PIT,    {[]{return HasExplosives && IsAdult && SmallKeys(RR_SHADOW_TEMPLE, 1, 2);}}),
+                  Entrance(RR_SHADOW_TEMPLE_HUGE_PIT,    {[]{return logic->HasExplosives && logic->IsAdult && logic->SmallKeys(RR_SHADOW_TEMPLE, 1, 2);}}),
                   Entrance(RR_SHADOW_TEMPLE_BEYOND_BOAT, {[]{return false;}}),
   });
 
   areaTable[RR_SHADOW_TEMPLE_HUGE_PIT] = Area("Shadow Temple Huge Pit", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST,   {[]{return CanJumpslash;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST, {[]{return CanJumpslash;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST,   {[]{return logic->CanJumpslash;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST, {[]{return logic->CanJumpslash;}}),
                   LocationAccess(RC_SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST,       {[]{return true;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST,       {[]{return (randoCtx->GetTrickOption(RT_SHADOW_UMBRELLA) && HoverBoots) || GoronBracelet;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST,      {[]{return (randoCtx->GetTrickOption(RT_SHADOW_UMBRELLA) && HoverBoots) || GoronBracelet;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST,           {[]{return SmallKeys(RR_SHADOW_TEMPLE, 2, 3) && ((randoCtx->GetTrickOption(RT_LENS_SHADOW_PLATFORM) && randoCtx->GetTrickOption(RT_LENS_SHADOW)) || CanUse(RG_LENS_OF_TRUTH));}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_FREESTANDING_KEY,                 {[]{return SmallKeys(RR_SHADOW_TEMPLE, 2, 3) && ((randoCtx->GetTrickOption(RT_LENS_SHADOW_PLATFORM) && randoCtx->GetTrickOption(RT_LENS_SHADOW)) || CanUse(RG_LENS_OF_TRUTH)) && Hookshot && (Bombs || GoronBracelet || (randoCtx->GetTrickOption(RT_SHADOW_FREESTANDING_KEY) && HasBombchus));}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM,                {[]{return CanJumpslash;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM,           {[]{return Hookshot || (randoCtx->GetTrickOption(RT_SHADOW_UMBRELLA_GS) && HoverBoots);}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_GS_SINGLE_GIANT_POT,              {[]{return SmallKeys(RR_SHADOW_TEMPLE, 2, 3) && ((randoCtx->GetTrickOption(RT_LENS_SHADOW_PLATFORM) && randoCtx->GetTrickOption(RT_LENS_SHADOW)) || CanUse(RG_LENS_OF_TRUTH)) && Hookshot;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST,       {[]{return (randoCtx->GetTrickOption(RT_SHADOW_UMBRELLA) && logic->HoverBoots) || logic->GoronBracelet;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST,      {[]{return (randoCtx->GetTrickOption(RT_SHADOW_UMBRELLA) && logic->HoverBoots) || logic->GoronBracelet;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST,           {[]{return logic->SmallKeys(RR_SHADOW_TEMPLE, 2, 3) && ((randoCtx->GetTrickOption(RT_LENS_SHADOW_PLATFORM) && randoCtx->GetTrickOption(RT_LENS_SHADOW)) || logic->CanUse(RG_LENS_OF_TRUTH));}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_FREESTANDING_KEY,                 {[]{return logic->SmallKeys(RR_SHADOW_TEMPLE, 2, 3) && ((randoCtx->GetTrickOption(RT_LENS_SHADOW_PLATFORM) && randoCtx->GetTrickOption(RT_LENS_SHADOW)) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->Hookshot && (logic->Bombs || logic->GoronBracelet || (randoCtx->GetTrickOption(RT_SHADOW_FREESTANDING_KEY) && logic->HasBombchus));}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM,                {[]{return logic->CanJumpslash;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM,           {[]{return logic->Hookshot || (randoCtx->GetTrickOption(RT_SHADOW_UMBRELLA_GS) && logic->HoverBoots);}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_GS_SINGLE_GIANT_POT,              {[]{return logic->SmallKeys(RR_SHADOW_TEMPLE, 2, 3) && ((randoCtx->GetTrickOption(RT_LENS_SHADOW_PLATFORM) && randoCtx->GetTrickOption(RT_LENS_SHADOW)) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->Hookshot;}}),
                 }, {
                   //Exits
-                  Entrance(RR_SHADOW_TEMPLE_WIND_TUNNEL, {[]{return ((randoCtx->GetTrickOption(RT_LENS_SHADOW_PLATFORM) && randoCtx->GetTrickOption(RT_LENS_SHADOW)) || CanUse(RG_LENS_OF_TRUTH)) && Hookshot && SmallKeys(RR_SHADOW_TEMPLE, 3, 4);}}),
+                  Entrance(RR_SHADOW_TEMPLE_WIND_TUNNEL, {[]{return ((randoCtx->GetTrickOption(RT_LENS_SHADOW_PLATFORM) && randoCtx->GetTrickOption(RT_LENS_SHADOW)) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->Hookshot && logic->SmallKeys(RR_SHADOW_TEMPLE, 3, 4);}}),
   });
 
   areaTable[RR_SHADOW_TEMPLE_WIND_TUNNEL] = Area("Shadow Temple Wind Tunnel", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_SHADOW_TEMPLE_WIND_HINT_CHEST,         {[]{return true;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST,  {[]{return CanJumpslash;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST,  {[]{return logic->CanJumpslash;}}),
                   LocationAccess(RC_SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST, {[]{return true;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_GS_NEAR_SHIP,            {[]{return CanUse(RG_LONGSHOT) && SmallKeys(RR_SHADOW_TEMPLE, 4, 5);}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_GS_NEAR_SHIP,            {[]{return logic->CanUse(RG_LONGSHOT) && logic->SmallKeys(RR_SHADOW_TEMPLE, 4, 5);}}),
                 }, {
                   //Exits
-                  Entrance(RR_SHADOW_TEMPLE_BEYOND_BOAT, {[]{return CanJumpslash && CanUse(RG_ZELDAS_LULLABY) && SmallKeys(RR_SHADOW_TEMPLE, 4, 5);}}),
+                  Entrance(RR_SHADOW_TEMPLE_BEYOND_BOAT, {[]{return logic->CanJumpslash && logic->CanUse(RG_ZELDAS_LULLABY) && logic->SmallKeys(RR_SHADOW_TEMPLE, 4, 5);}}),
   });
 
   areaTable[RR_SHADOW_TEMPLE_BEYOND_BOAT] = Area("Shadow Temple Beyond Boat", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST,      {[]{return CanUse(RG_DINS_FIRE);}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_BOSS_KEY_CHEST,              {[]{return CanUse(RG_DINS_FIRE);}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST, {[]{return CanJumpslash;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT,         {[]{return CanAdultAttack;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST,      {[]{return logic->CanUse(RG_DINS_FIRE);}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_BOSS_KEY_CHEST,              {[]{return logic->CanUse(RG_DINS_FIRE);}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST, {[]{return logic->CanJumpslash;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT,         {[]{return logic->CanAdultAttack;}}),
   }, {
                   //Exits
-                  Entrance(RR_SHADOW_TEMPLE_BOSS_ENTRYWAY, {[]{return (CanUse(RG_FAIRY_BOW) || CanUse(RG_DISTANT_SCARECROW) || (randoCtx->GetTrickOption(RT_SHADOW_STATUE) && HasBombchus)) && SmallKeys(RR_SHADOW_TEMPLE, 5) && CanUse(RG_HOVER_BOOTS) && BossKeyShadowTemple;}})
+                  Entrance(RR_SHADOW_TEMPLE_BOSS_ENTRYWAY, {[]{return (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_DISTANT_SCARECROW) || (randoCtx->GetTrickOption(RT_SHADOW_STATUE) && logic->HasBombchus)) && logic->SmallKeys(RR_SHADOW_TEMPLE, 5) && logic->CanUse(RG_HOVER_BOOTS) && logic->BossKeyShadowTemple;}})
   });
   }
 
@@ -95,85 +93,85 @@ void AreaTable_Init_ShadowTemple() {
   areaTable[RR_SHADOW_TEMPLE_MQ_BEGINNING] = Area("Shadow Temple MQ Beginning", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_SHADOW_TEMPLE_ENTRYWAY,          {[]{return true;}}),
-                  Entrance(RR_SHADOW_TEMPLE_MQ_FIRST_BEAMOS,   {[]{return IsAdult && (CanUse(RG_FIRE_ARROWS) || HoverBoots || (randoCtx->GetTrickOption(RT_SHADOW_MQ_GAP) && CanUse(RG_LONGSHOT)));}}),
-                    //Trick: IsAdult && (CanUse(RG_FIRE_ARROWS) || HoverBoots || (LogicShadowMQGap && CanUse(RG_LONGSHOT)))
-                  Entrance(RR_SHADOW_TEMPLE_MQ_DEAD_HAND_AREA, {[]{return HasExplosives && SmallKeys(RR_SHADOW_TEMPLE, 6);}}),
+                  Entrance(RR_SHADOW_TEMPLE_MQ_FIRST_BEAMOS,   {[]{return logic->IsAdult && (logic->CanUse(RG_FIRE_ARROWS) || logic->HoverBoots || (randoCtx->GetTrickOption(RT_SHADOW_MQ_GAP) && logic->CanUse(RG_LONGSHOT)));}}),
+                    //Trick: logic->IsAdult && (logic->CanUse(RG_FIRE_ARROWS) || logic->HoverBoots || (LogicShadowMQGap && logic->CanUse(RG_LONGSHOT)))
+                  Entrance(RR_SHADOW_TEMPLE_MQ_DEAD_HAND_AREA, {[]{return logic->HasExplosives && logic->SmallKeys(RR_SHADOW_TEMPLE, 6);}}),
   });
 
   areaTable[RR_SHADOW_TEMPLE_MQ_DEAD_HAND_AREA] = Area("Shadow Temple MQ Dead Hand Area", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_COMPASS_CHEST,     {[]{return CanJumpslash;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST, {[]{return CanJumpslash && CanUse(RG_SONG_OF_TIME) && IsAdult && CanUse(RG_FAIRY_BOW);}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_COMPASS_CHEST,     {[]{return logic->CanJumpslash;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST, {[]{return logic->CanJumpslash && logic->CanUse(RG_SONG_OF_TIME) && logic->IsAdult && logic->CanUse(RG_FAIRY_BOW);}}),
   }, {});
 
   areaTable[RR_SHADOW_TEMPLE_MQ_FIRST_BEAMOS] = Area("Shadow Temple MQ First Beamos", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_MAP_CHEST,                 {[]{return CanAdultAttack || Nuts;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST,        {[]{return CanJumpslash;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST, {[]{return CanAdultAttack || Nuts;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_MAP_CHEST,                 {[]{return logic->CanAdultAttack || logic->Nuts;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST,        {[]{return logic->CanJumpslash;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST, {[]{return logic->CanAdultAttack || logic->Nuts;}}),
   }, {
                   //Exits
-                  Entrance(RR_SHADOW_TEMPLE_MQ_UPPER_HUGE_PIT, {[]{return HasExplosives && SmallKeys(RR_SHADOW_TEMPLE, 2);}}),
+                  Entrance(RR_SHADOW_TEMPLE_MQ_UPPER_HUGE_PIT, {[]{return logic->HasExplosives && logic->SmallKeys(RR_SHADOW_TEMPLE, 2);}}),
   });
 
   areaTable[RR_SHADOW_TEMPLE_MQ_UPPER_HUGE_PIT] = Area("Shadow Temple MQ Upper Huge Pit", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST,   {[]{return CanUse(RG_SONG_OF_TIME) || (randoCtx->GetTrickOption(RT_SHADOW_MQ_INVISIBLE_BLADES) && randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_OHKO));}}),
-                    //Trick: CanUse(RG_SONG_OF_TIME) || (LogicShadowMQInvisibleBlades && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO))
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST, {[]{return CanUse(RG_SONG_OF_TIME) || (randoCtx->GetTrickOption(RT_SHADOW_MQ_INVISIBLE_BLADES) && randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_OHKO));}}),
-                    //Trick: CanUse(RG_SONG_OF_TIME) || (LogicShadowMQInvisibleBlades && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO))
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST,   {[]{return logic->CanUse(RG_SONG_OF_TIME) || (randoCtx->GetTrickOption(RT_SHADOW_MQ_INVISIBLE_BLADES) && randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_OHKO));}}),
+                    //Trick: logic->CanUse(RG_SONG_OF_TIME) || (LogicShadowMQInvisibleBlades && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO))
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST, {[]{return logic->CanUse(RG_SONG_OF_TIME) || (randoCtx->GetTrickOption(RT_SHADOW_MQ_INVISIBLE_BLADES) && randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_OHKO));}}),
+                    //Trick: logic->CanUse(RG_SONG_OF_TIME) || (LogicShadowMQInvisibleBlades && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO))
   }, {
                   //Exits
-                  Entrance(RR_SHADOW_TEMPLE_MQ_LOWER_HUGE_PIT, {[]{return HasFireSource || randoCtx->GetTrickOption(RT_SHADOW_MQ_HUGE_PIT);}}),
-                    //Trick: HasFireSource || LogicShadowMQHugePit
+                  Entrance(RR_SHADOW_TEMPLE_MQ_LOWER_HUGE_PIT, {[]{return logic->HasFireSource || randoCtx->GetTrickOption(RT_SHADOW_MQ_HUGE_PIT);}}),
+                    //Trick: logic->HasFireSource || LogicShadowMQHugePit
   });
 
   areaTable[RR_SHADOW_TEMPLE_MQ_LOWER_HUGE_PIT] = Area("Shadow Temple MQ Lower Huge Pit", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST,  {[]{return IsAdult && CanUse(RG_LONGSHOT);}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST,  {[]{return logic->IsAdult && logic->CanUse(RG_LONGSHOT);}}),
                   LocationAccess(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST,  {[]{return true;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST,  {[]{return (randoCtx->GetTrickOption(RT_SHADOW_UMBRELLA) && HoverBoots) || GoronBracelet;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST, {[]{return (randoCtx->GetTrickOption(RT_SHADOW_UMBRELLA) && HoverBoots) || GoronBracelet;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST,      {[]{return CanJumpslash && HoverBoots && SmallKeys(RR_SHADOW_TEMPLE, 3) && ((randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ) && randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ_PLATFORM)) || CanUse(RG_LENS_OF_TRUTH));}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST,          {[]{return (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) && HoverBoots && SmallKeys(RR_SHADOW_TEMPLE, 3) && Hookshot && ((randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ) &&
-                   randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ_INVISIBLE_BLADES) && randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ_PLATFORM)) || CanUse(RG_LENS_OF_TRUTH));}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM,      {[]{return Hookshot || (randoCtx->GetTrickOption(RT_SHADOW_UMBRELLA_GS) && HoverBoots);}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST,  {[]{return (randoCtx->GetTrickOption(RT_SHADOW_UMBRELLA) && logic->HoverBoots) || logic->GoronBracelet;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST, {[]{return (randoCtx->GetTrickOption(RT_SHADOW_UMBRELLA) && logic->HoverBoots) || logic->GoronBracelet;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST,      {[]{return logic->CanJumpslash && logic->HoverBoots && logic->SmallKeys(RR_SHADOW_TEMPLE, 3) && ((randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ) && randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ_PLATFORM)) || logic->CanUse(RG_LENS_OF_TRUTH));}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST,          {[]{return (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && logic->HoverBoots && logic->SmallKeys(RR_SHADOW_TEMPLE, 3) && logic->Hookshot && ((randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ) &&
+                   randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ_INVISIBLE_BLADES) && randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ_PLATFORM)) || logic->CanUse(RG_LENS_OF_TRUTH));}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM,      {[]{return logic->Hookshot || (randoCtx->GetTrickOption(RT_SHADOW_UMBRELLA_GS) && logic->HoverBoots);}}),
   }, {
                   //Exits
-                  Entrance(RR_SHADOW_TEMPLE_MQ_WIND_TUNNEL, {[]{return HoverBoots && ((randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ) && randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ_PLATFORM)) || CanUse(RG_LENS_OF_TRUTH)) && Hookshot && SmallKeys(RR_SHADOW_TEMPLE, 4);}}),
+                  Entrance(RR_SHADOW_TEMPLE_MQ_WIND_TUNNEL, {[]{return logic->HoverBoots && ((randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ) && randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ_PLATFORM)) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->Hookshot && logic->SmallKeys(RR_SHADOW_TEMPLE, 4);}}),
   });
 
   areaTable[RR_SHADOW_TEMPLE_MQ_WIND_TUNNEL] = Area("Shadow Temple MQ Wind Tunnel", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&NutPot, {[]{return true;}}),
+                  EventAccess(&logic->NutPot, {[]{return true;}}),
   }, {
                   //Locations
                   LocationAccess(RC_SHADOW_TEMPLE_MQ_WIND_HINT_CHEST,         {[]{return true;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST,  {[]{return CanJumpslash;}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST,  {[]{return logic->CanJumpslash;}}),
                   LocationAccess(RC_SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST, {[]{return true;}}),
                   LocationAccess(RC_SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM,       {[]{return true;}}),
                   LocationAccess(RC_SHADOW_TEMPLE_MQ_GS_AFTER_WIND,           {[]{return true;}}),
   }, {
                   //Exits
-                  Entrance(RR_SHADOW_TEMPLE_MQ_BEYOND_BOAT, {[]{return CanUse(RG_ZELDAS_LULLABY) && SmallKeys(RR_SHADOW_TEMPLE, 5);}}),
+                  Entrance(RR_SHADOW_TEMPLE_MQ_BEYOND_BOAT, {[]{return logic->CanUse(RG_ZELDAS_LULLABY) && logic->SmallKeys(RR_SHADOW_TEMPLE, 5);}}),
   });
 
   areaTable[RR_SHADOW_TEMPLE_MQ_BEYOND_BOAT] = Area("Shadow Temple MQ Beyond Boat", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_SHADOW_TEMPLE_MQ_GS_AFTER_SHIP,  {[]{return true;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS,   {[]{return Bow || (randoCtx->GetTrickOption(RT_SHADOW_STATUE) && HasBombchus);}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS,   {[]{return logic->Bow || (randoCtx->GetTrickOption(RT_SHADOW_STATUE) && logic->HasBombchus);}}),
   }, {
                   //Exits
-                  Entrance(RR_SHADOW_TEMPLE_MQ_INVISIBLE_MAZE, {[]{return Bow && CanUse(RG_SONG_OF_TIME) && IsAdult && CanUse(RG_LONGSHOT);}}),
-                  Entrance(RR_SHADOW_TEMPLE_BOSS_ENTRYWAY,     {[]{return (CanUse(RG_FAIRY_BOW) || (randoCtx->GetTrickOption(RT_SHADOW_STATUE) && HasBombchus)) && CanUse(RG_HOVER_BOOTS) && BossKeyShadowTemple;}}),
+                  Entrance(RR_SHADOW_TEMPLE_MQ_INVISIBLE_MAZE, {[]{return logic->Bow && logic->CanUse(RG_SONG_OF_TIME) && logic->IsAdult && logic->CanUse(RG_LONGSHOT);}}),
+                  Entrance(RR_SHADOW_TEMPLE_BOSS_ENTRYWAY,     {[]{return (logic->CanUse(RG_FAIRY_BOW) || (randoCtx->GetTrickOption(RT_SHADOW_STATUE) && logic->HasBombchus)) && logic->CanUse(RG_HOVER_BOOTS) && logic->BossKeyShadowTemple;}}),
   });
 
   areaTable[RR_SHADOW_TEMPLE_MQ_INVISIBLE_MAZE] = Area("Shadow Temple MQ Invisible Maze", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST, {[]{return CanUse(RG_DINS_FIRE) && SmallKeys(RR_SHADOW_TEMPLE, 6);}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST,         {[]{return CanUse(RG_DINS_FIRE) && SmallKeys(RR_SHADOW_TEMPLE, 6);}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST, {[]{return logic->CanUse(RG_DINS_FIRE) && logic->SmallKeys(RR_SHADOW_TEMPLE, 6);}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST,         {[]{return logic->CanUse(RG_DINS_FIRE) && logic->SmallKeys(RR_SHADOW_TEMPLE, 6);}}),
                   //below previously returned true
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST,      {[]{return CanUse(RG_LENS_OF_TRUTH) || randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ_DEADHAND);}}),
+                  LocationAccess(RC_SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST,      {[]{return logic->CanUse(RG_LENS_OF_TRUTH) || randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ_DEADHAND);}}),
                   LocationAccess(RC_SHADOW_TEMPLE_MQ_FREESTANDING_KEY,       {[]{return true;}}),
   }, {});
   }
@@ -194,17 +192,17 @@ void AreaTable_Init_ShadowTemple() {
         Area("Shadow Temple Boss Room", "Shadow Temple", RA_NONE, NO_DAY_NIGHT_CYCLE,
              {
                  // Events
-                 EventAccess(&ShadowTempleClear, { [] {
-                     return ShadowTempleClear || (HasBossSoul(RG_BONGO_BONGO_SOUL) &&
-                            ((CanUse(RG_LENS_OF_TRUTH) || randoCtx->GetTrickOption(RT_LENS_BONGO)) &&
-                             (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) &&
-                             (CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT) || randoCtx->GetTrickOption(RT_SHADOW_BONGO))));
+                 EventAccess(&logic->ShadowTempleClear, { [] {
+                     return logic->ShadowTempleClear || (logic->HasBossSoul(RG_BONGO_BONGO_SOUL) &&
+                            ((logic->CanUse(RG_LENS_OF_TRUTH) || randoCtx->GetTrickOption(RT_LENS_BONGO)) &&
+                             (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) &&
+                             (logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT) || randoCtx->GetTrickOption(RT_SHADOW_BONGO))));
                  } }),
              },
              {
                  // Locations
-                 LocationAccess(RC_SHADOW_TEMPLE_BONGO_BONGO_HEART, { [] { return ShadowTempleClear; } }),
-                 LocationAccess(RC_BONGO_BONGO, { [] { return ShadowTempleClear; } }),
+                 LocationAccess(RC_SHADOW_TEMPLE_BONGO_BONGO_HEART, { [] { return logic->ShadowTempleClear; } }),
+                 LocationAccess(RC_BONGO_BONGO, { [] { return logic->ShadowTempleClear; } }),
              },
              {
                  // Exits
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp
index a3eca03bb..4c27f5123 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp
@@ -1,9 +1,7 @@
 #include "../location_access.hpp"
-#include "../logic.hpp"
 #include "../../entrance.h"
 #include "../../dungeon.h"
 
-using namespace Logic;
 using namespace Rando;
 
 void AreaTable_Init_SpiritTemple() {
@@ -24,111 +22,111 @@ void AreaTable_Init_SpiritTemple() {
   areaTable[RR_SPIRIT_TEMPLE_LOBBY] = Area("Spirit Temple Lobby", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_SPIRIT_TEMPLE_ENTRYWAY,    {[]{return true;}}),
-                  Entrance(RR_SPIRIT_TEMPLE_CHILD,       {[]{return IsChild;}}),
-                  Entrance(RR_SPIRIT_TEMPLE_EARLY_ADULT, {[]{return CanUse(RG_SILVER_GAUNTLETS);}}),
+                  Entrance(RR_SPIRIT_TEMPLE_CHILD,       {[]{return logic->IsChild;}}),
+                  Entrance(RR_SPIRIT_TEMPLE_EARLY_ADULT, {[]{return logic->CanUse(RG_SILVER_GAUNTLETS);}}),
   });
 
   areaTable[RR_SPIRIT_TEMPLE_CHILD] = Area("Child Spirit Temple", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&NutCrate, {[]{return true;}}),
+                  EventAccess(&logic->NutCrate, {[]{return true;}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST,        {[]{return (Boomerang || Slingshot || (HasBombchus && randoCtx->GetTrickOption(RT_SPIRIT_CHILD_CHU))) && (HasExplosives || ((Nuts || Boomerang) && (Sticks || KokiriSword || Slingshot)));}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST, {[]{return (Boomerang || Slingshot || (HasBombchus && randoCtx->GetTrickOption(RT_SPIRIT_CHILD_CHU))) && (HasExplosives || ((Nuts || Boomerang) && (Sticks || KokiriSword || Slingshot))) && (Sticks || CanUse(RG_DINS_FIRE));}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_GS_METAL_FENCE,            {[]{return (Boomerang || Slingshot || (HasBombchus && randoCtx->GetTrickOption(RT_SPIRIT_CHILD_CHU))) && (HasExplosives || ((Nuts || Boomerang) && (Sticks || KokiriSword || Slingshot)));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST,        {[]{return (logic->Boomerang || logic->Slingshot || (logic->HasBombchus && randoCtx->GetTrickOption(RT_SPIRIT_CHILD_CHU))) && (logic->HasExplosives || ((logic->Nuts || logic->Boomerang) && (logic->Sticks || logic->KokiriSword || logic->Slingshot)));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST, {[]{return (logic->Boomerang || logic->Slingshot || (logic->HasBombchus && randoCtx->GetTrickOption(RT_SPIRIT_CHILD_CHU))) && (logic->HasExplosives || ((logic->Nuts || logic->Boomerang) && (logic->Sticks || logic->KokiriSword || logic->Slingshot))) && (logic->Sticks || logic->CanUse(RG_DINS_FIRE));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_GS_METAL_FENCE,            {[]{return (logic->Boomerang || logic->Slingshot || (logic->HasBombchus && randoCtx->GetTrickOption(RT_SPIRIT_CHILD_CHU))) && (logic->HasExplosives || ((logic->Nuts || logic->Boomerang) && (logic->Sticks || logic->KokiriSword || logic->Slingshot)));}}),
                 }, {
                   //Exits
-                  Entrance(RR_SPIRIT_TEMPLE_CHILD_CLIMB, {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 1);}}),
+                  Entrance(RR_SPIRIT_TEMPLE_CHILD_CLIMB, {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 1);}}),
   });
 
   areaTable[RR_SPIRIT_TEMPLE_CHILD_CLIMB] = Area("Child Spirit Temple Climb", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST, {[]{return HasProjectile(HasProjectileAge::Both) || ((SmallKeys(RR_SPIRIT_TEMPLE, 3) || (SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && CanUse(RG_SILVER_GAUNTLETS) && HasProjectile(HasProjectileAge::Adult)) || (SmallKeys(RR_SPIRIT_TEMPLE, 5) && IsChild && HasProjectile(HasProjectileAge::Child));}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST,  {[]{return HasProjectile(HasProjectileAge::Both) || ((SmallKeys(RR_SPIRIT_TEMPLE, 3) || (SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && CanUse(RG_SILVER_GAUNTLETS) && HasProjectile(HasProjectileAge::Adult)) || (SmallKeys(RR_SPIRIT_TEMPLE, 5) && IsChild && HasProjectile(HasProjectileAge::Child));}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM,    {[]{return HasProjectile(HasProjectileAge::Both) || CanUse(RG_DINS_FIRE) ||
-                                                                                      (CanTakeDamage && (CanJumpslash || HasProjectile(HasProjectileAge::Child))) ||
-                                                                                        (IsChild && SmallKeys(RR_SPIRIT_TEMPLE, 5) && HasProjectile(HasProjectileAge::Child)) ||
-                                                                                          ((SmallKeys(RR_SPIRIT_TEMPLE, 3) || (SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && CanUse(RG_SILVER_GAUNTLETS) && (HasProjectile(HasProjectileAge::Adult) || (CanTakeDamage && CanJumpslash)));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST, {[]{return logic->HasProjectile(HasProjectileAge::Both) || ((logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && logic->CanUse(RG_SILVER_GAUNTLETS) && logic->HasProjectile(HasProjectileAge::Adult)) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->IsChild && logic->HasProjectile(HasProjectileAge::Child));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST,  {[]{return logic->HasProjectile(HasProjectileAge::Both) || ((logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && logic->CanUse(RG_SILVER_GAUNTLETS) && logic->HasProjectile(HasProjectileAge::Adult)) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->IsChild && logic->HasProjectile(HasProjectileAge::Child));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM,    {[]{return logic->HasProjectile(HasProjectileAge::Both) || logic->CanUse(RG_DINS_FIRE) ||
+                                                                                      (logic->CanTakeDamage && (logic->CanJumpslash || logic->HasProjectile(HasProjectileAge::Child))) ||
+                                                                                        (logic->IsChild && logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->HasProjectile(HasProjectileAge::Child)) ||
+                                                                                          ((logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && logic->CanUse(RG_SILVER_GAUNTLETS) && (logic->HasProjectile(HasProjectileAge::Adult) || (logic->CanTakeDamage && logic->CanJumpslash)));}}),
                 }, {
                   //Exits
-                  Entrance(RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER, {[]{return HasExplosives || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && CanUse(RG_LIGHT_ARROWS));}}),
+                  Entrance(RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER, {[]{return logic->HasExplosives || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS));}}),
   });
 
   areaTable[RR_SPIRIT_TEMPLE_EARLY_ADULT] = Area("Early Adult Spirit Temple", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SPIRIT_TEMPLE_COMPASS_CHEST,            {[]{return CanUse(RG_HOOKSHOT) && CanUse(RG_ZELDAS_LULLABY);}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST,  {[]{return (CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOOMERANG) || HasBombchus || (Bombs && IsAdult && randoCtx->GetTrickOption(RT_SPIRIT_LOWER_ADULT_SWITCH))) && (CanUse(RG_HOVER_BOOTS) || CanJumpslash);}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST,  {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 3);}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST, {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 3);}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_GS_BOULDER_ROOM,          {[]{return CanUse(RG_SONG_OF_TIME) && (Bow || Hookshot || HasBombchus || (Bombs && randoCtx->GetTrickOption(RT_SPIRIT_LOWER_ADULT_SWITCH)));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_COMPASS_CHEST,            {[]{return logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_ZELDAS_LULLABY);}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST,  {[]{return (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG) || logic->HasBombchus || (logic->Bombs && logic->IsAdult && randoCtx->GetTrickOption(RT_SPIRIT_LOWER_ADULT_SWITCH))) && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanJumpslash);}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST,  {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 3);}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST, {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 3);}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_GS_BOULDER_ROOM,          {[]{return logic->CanUse(RG_SONG_OF_TIME) && (logic->Bow || logic->Hookshot || logic->HasBombchus || (logic->Bombs && randoCtx->GetTrickOption(RT_SPIRIT_LOWER_ADULT_SWITCH)));}}),
                 }, {
                   //Exits
-                  Entrance(RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER, {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 1);}}),
+                  Entrance(RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER, {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 1);}}),
   });
 
   areaTable[RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER] = Area("Spirit Temple Central Chamber", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SPIRIT_TEMPLE_MAP_CHEST,                    {[]{return ((HasExplosives || SmallKeys(RR_SPIRIT_TEMPLE, 3) || (SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) &&
+                  LocationAccess(RC_SPIRIT_TEMPLE_MAP_CHEST,                    {[]{return ((logic->HasExplosives || logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) &&
 
-                                                                                                (CanUse(RG_DINS_FIRE) ||
-                                                                                                    (((MagicMeter && FireArrows) || randoCtx->GetTrickOption(RT_SPIRIT_MAP_CHEST)) && Bow && Sticks))) ||
-                                                                                            (SmallKeys(RR_SPIRIT_TEMPLE, 5) && HasExplosives &&
-                                                                                                CanUse(RG_STICKS)) ||
-                                                                                            (SmallKeys(RR_SPIRIT_TEMPLE, 3) &&
-                                                                                                (CanUse(RG_FIRE_ARROWS) || (randoCtx->GetTrickOption(RT_SPIRIT_MAP_CHEST) && Bow)) &&
-                                                                                                CanUse(RG_SILVER_GAUNTLETS));}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST,         {[]{return ((HasExplosives || SmallKeys(RR_SPIRIT_TEMPLE, 3) || (SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) &&
-                                                                                                (CanUse(RG_DINS_FIRE) ||
-                                                                                                    (((MagicMeter && FireArrows) || randoCtx->GetTrickOption(RT_SPIRIT_SUN_CHEST)) && Bow && Sticks))) ||
-                                                                                            (SmallKeys(RR_SPIRIT_TEMPLE, 5) && HasExplosives &&
-                                                                                                CanUse(RG_STICKS)) ||
-                                                                                            (SmallKeys(RR_SPIRIT_TEMPLE, 3) &&
-                                                                                                (CanUse(RG_FIRE_ARROWS) || (randoCtx->GetTrickOption(RT_SPIRIT_SUN_CHEST) && Bow)) &&
-                                                                                                CanUse(RG_SILVER_GAUNTLETS));}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST,       {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 3) && CanUse(RG_SILVER_GAUNTLETS) && CanUse(RG_ZELDAS_LULLABY);}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST,  {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 3) && CanUse(RG_SILVER_GAUNTLETS) && CanUse(RG_ZELDAS_LULLABY) && (Hookshot || HoverBoots || randoCtx->GetTrickOption(RT_SPIRIT_LOBBY_JUMP));}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM, {[]{return (HasExplosives && Boomerang && Hookshot) ||
-                                                                                            (CanUse(RG_BOOMERANG) && SmallKeys(RR_SPIRIT_TEMPLE, 5) && HasExplosives) ||
-                                                                                            (Hookshot && CanUse(RG_SILVER_GAUNTLETS) &&
-                                                                                                (SmallKeys(RR_SPIRIT_TEMPLE, 3) ||
-                                                                                                    (SmallKeys(RR_SPIRIT_TEMPLE, 2) && Boomerang && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))));}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_GS_LOBBY,                     {[]{return ((HasExplosives || SmallKeys(RR_SPIRIT_TEMPLE, 3) || (SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) &&
-                                                                                                randoCtx->GetTrickOption(RT_SPIRIT_LOBBY_GS) && Boomerang && (Hookshot || HoverBoots || randoCtx->GetTrickOption(RT_SPIRIT_LOBBY_JUMP))) ||
-                                                                                            (randoCtx->GetTrickOption(RT_SPIRIT_LOBBY_GS) && SmallKeys(RR_SPIRIT_TEMPLE, 5) && HasExplosives && CanUse(RG_BOOMERANG)) ||
-                                                                                            (SmallKeys(RR_SPIRIT_TEMPLE, 3) && CanUse(RG_SILVER_GAUNTLETS) && (Hookshot || HoverBoots || randoCtx->GetTrickOption(RT_SPIRIT_LOBBY_JUMP)));}}),
+                                                                                                (logic->CanUse(RG_DINS_FIRE) ||
+                                                                                                    (((logic->MagicMeter && logic->FireArrows) || randoCtx->GetTrickOption(RT_SPIRIT_MAP_CHEST)) && logic->Bow && logic->Sticks))) ||
+                                                                                            (logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->HasExplosives &&
+                                                                                                logic->CanUse(RG_STICKS)) ||
+                                                                                            (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) &&
+                                                                                                (logic->CanUse(RG_FIRE_ARROWS) || (randoCtx->GetTrickOption(RT_SPIRIT_MAP_CHEST) && logic->Bow)) &&
+                                                                                                logic->CanUse(RG_SILVER_GAUNTLETS));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST,         {[]{return ((logic->HasExplosives || logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) &&
+                                                                                                (logic->CanUse(RG_DINS_FIRE) ||
+                                                                                                    (((logic->MagicMeter && logic->FireArrows) || randoCtx->GetTrickOption(RT_SPIRIT_SUN_CHEST)) && logic->Bow && logic->Sticks))) ||
+                                                                                            (logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->HasExplosives &&
+                                                                                                logic->CanUse(RG_STICKS)) ||
+                                                                                            (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) &&
+                                                                                                (logic->CanUse(RG_FIRE_ARROWS) || (randoCtx->GetTrickOption(RT_SPIRIT_SUN_CHEST) && logic->Bow)) &&
+                                                                                                logic->CanUse(RG_SILVER_GAUNTLETS));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST,       {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) && logic->CanUse(RG_SILVER_GAUNTLETS) && logic->CanUse(RG_ZELDAS_LULLABY);}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST,  {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) && logic->CanUse(RG_SILVER_GAUNTLETS) && logic->CanUse(RG_ZELDAS_LULLABY) && (logic->Hookshot || logic->HoverBoots || randoCtx->GetTrickOption(RT_SPIRIT_LOBBY_JUMP));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM, {[]{return (logic->HasExplosives && logic->Boomerang && logic->Hookshot) ||
+                                                                                            (logic->CanUse(RG_BOOMERANG) && logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->HasExplosives) ||
+                                                                                            (logic->Hookshot && logic->CanUse(RG_SILVER_GAUNTLETS) &&
+                                                                                                (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) ||
+                                                                                                    (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && logic->Boomerang && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_GS_LOBBY,                     {[]{return ((logic->HasExplosives || logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) &&
+                                                                                                randoCtx->GetTrickOption(RT_SPIRIT_LOBBY_GS) && logic->Boomerang && (logic->Hookshot || logic->HoverBoots || randoCtx->GetTrickOption(RT_SPIRIT_LOBBY_JUMP))) ||
+                                                                                            (randoCtx->GetTrickOption(RT_SPIRIT_LOBBY_GS) && logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->HasExplosives && logic->CanUse(RG_BOOMERANG)) ||
+                                                                                            (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) && logic->CanUse(RG_SILVER_GAUNTLETS) && (logic->Hookshot || logic->HoverBoots || randoCtx->GetTrickOption(RT_SPIRIT_LOBBY_JUMP)));}}),
                 }, {
                   //Exits
-                  Entrance(RR_SPIRIT_TEMPLE_OUTDOOR_HANDS,              {[]{return CanJumpslash || HasExplosives;}}),
-                  Entrance(RR_SPIRIT_TEMPLE_BEYOND_CENTRAL_LOCKED_DOOR, {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 4) && CanUse(RG_SILVER_GAUNTLETS);}}),
+                  Entrance(RR_SPIRIT_TEMPLE_OUTDOOR_HANDS,              {[]{return logic->CanJumpslash || logic->HasExplosives;}}),
+                  Entrance(RR_SPIRIT_TEMPLE_BEYOND_CENTRAL_LOCKED_DOOR, {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 4) && logic->CanUse(RG_SILVER_GAUNTLETS);}}),
                   Entrance(RR_SPIRIT_TEMPLE_CHILD_CLIMB,                {[]{return true;}}),
   });
 
   areaTable[RR_SPIRIT_TEMPLE_OUTDOOR_HANDS] = Area("Spirit Temple Outdoor Hands", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST, {[]{return (SmallKeys(RR_SPIRIT_TEMPLE, 3) && Longshot && HasExplosives) || SmallKeys(RR_SPIRIT_TEMPLE, 5);}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST,    {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 4) && CanUse(RG_SILVER_GAUNTLETS) && HasExplosives;}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST, {[]{return (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) && logic->Longshot && logic->HasExplosives) || logic->SmallKeys(RR_SPIRIT_TEMPLE, 5);}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST,    {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 4) && logic->CanUse(RG_SILVER_GAUNTLETS) && logic->HasExplosives;}}),
                 }, {
                   //Exits
-                  Entrance(RR_DESERT_COLOSSUS, {[]{return (IsChild && SmallKeys(RR_SPIRIT_TEMPLE, 5)) || (CanUse(RG_SILVER_GAUNTLETS) && ((SmallKeys(RR_SPIRIT_TEMPLE, 3) && HasExplosives) || SmallKeys(RR_SPIRIT_TEMPLE, 5)));}}),
+                  Entrance(RR_DESERT_COLOSSUS, {[]{return (logic->IsChild && logic->SmallKeys(RR_SPIRIT_TEMPLE, 5)) || (logic->CanUse(RG_SILVER_GAUNTLETS) && ((logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) && logic->HasExplosives) || logic->SmallKeys(RR_SPIRIT_TEMPLE, 5)));}}),
   });
 
   areaTable[RR_SPIRIT_TEMPLE_BEYOND_CENTRAL_LOCKED_DOOR] = Area("Spirit Temple Beyond Central Locked Door", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST,         {[]{return (MirrorShield || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && CanUse(RG_LIGHT_ARROWS))) && HasExplosives;}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST,  {[]{return (randoCtx->GetTrickOption(RT_LENS_SPIRIT) || CanUse(RG_LENS_OF_TRUTH)) && HasExplosives;}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST, {[]{return (randoCtx->GetTrickOption(RT_LENS_SPIRIT) || CanUse(RG_LENS_OF_TRUTH)) && HasExplosives;}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST,         {[]{return (logic->MirrorShield || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS))) && logic->HasExplosives;}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST,  {[]{return (randoCtx->GetTrickOption(RT_LENS_SPIRIT) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->HasExplosives;}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST, {[]{return (randoCtx->GetTrickOption(RT_LENS_SPIRIT) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->HasExplosives;}}),
                 }, {
                   //Exits
-                  Entrance(RR_SPIRIT_TEMPLE_BEYOND_FINAL_LOCKED_DOOR, {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 5) && (randoCtx->GetTrickOption(RT_SPIRIT_WALL) || CanUse(RG_LONGSHOT) || HasBombchus || ((Bombs || Nuts || CanUse(RG_DINS_FIRE)) && (Bow || CanUse(RG_HOOKSHOT) || Hammer)));}}),
+                  Entrance(RR_SPIRIT_TEMPLE_BEYOND_FINAL_LOCKED_DOOR, {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && (randoCtx->GetTrickOption(RT_SPIRIT_WALL) || logic->CanUse(RG_LONGSHOT) || logic->HasBombchus || ((logic->Bombs || logic->Nuts || logic->CanUse(RG_DINS_FIRE)) && (logic->Bow || logic->CanUse(RG_HOOKSHOT) || logic->Hammer)));}}),
   });
 
   areaTable[RR_SPIRIT_TEMPLE_BEYOND_FINAL_LOCKED_DOOR] = Area("Spirit Temple Beyond Final Locked Door", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SPIRIT_TEMPLE_BOSS_KEY_CHEST, {[]{return CanUse(RG_ZELDAS_LULLABY) && ((CanTakeDamage && randoCtx->GetTrickOption(RT_FLAMING_CHESTS)) || (Bow && Hookshot));}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_TOPMOST_CHEST,  {[]{return (MirrorShield && CanAdultAttack) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && CanUse(RG_LIGHT_ARROWS));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_BOSS_KEY_CHEST, {[]{return logic->CanUse(RG_ZELDAS_LULLABY) && ((logic->CanTakeDamage && randoCtx->GetTrickOption(RT_FLAMING_CHESTS)) || (logic->Bow && logic->Hookshot));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_TOPMOST_CHEST,  {[]{return (logic->MirrorShield && logic->CanAdultAttack) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS));}}),
   }, {
                   //Exits
-                  Entrance(RR_SPIRIT_TEMPLE_INSIDE_STATUE_HEAD, {[]{return MirrorShield && HasExplosives && Hookshot;}}),
+                  Entrance(RR_SPIRIT_TEMPLE_INSIDE_STATUE_HEAD, {[]{return logic->MirrorShield && logic->HasExplosives && logic->Hookshot;}}),
   });
 
   areaTable[RR_SPIRIT_TEMPLE_INSIDE_STATUE_HEAD] =
@@ -136,7 +134,7 @@ void AreaTable_Init_SpiritTemple() {
                  {
                      // Exits
                      Entrance(RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER, { [] { return true; } }),
-                     Entrance(RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY, { [] { return BossKeySpiritTemple; } }),
+                     Entrance(RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY, { [] { return logic->BossKeySpiritTemple; } }),
                  });
   }
 
@@ -147,80 +145,80 @@ void AreaTable_Init_SpiritTemple() {
   areaTable[RR_SPIRIT_TEMPLE_MQ_LOBBY] = Area("Spirit Temple MQ Lobby", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST, {[]{return true;}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST,  {[]{return Here(RR_SPIRIT_TEMPLE_MQ_LOBBY, []{return CanBlastOrSmash;}) && ((IsChild && CanUse(RG_FAIRY_SLINGSHOT)) || (IsAdult && CanUse(RG_FAIRY_BOW)));}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST, {[]{return HasBombchus || (IsAdult && (CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT))) || (IsChild && (CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOOMERANG)));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST,  {[]{return Here(RR_SPIRIT_TEMPLE_MQ_LOBBY, []{return logic->CanBlastOrSmash;}) && ((logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT)) || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW)));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST, {[]{return logic->HasBombchus || (logic->IsAdult && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT))) || (logic->IsChild && (logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG)));}}),
   }, {
                   //Exits
                   Entrance(RR_SPIRIT_TEMPLE_ENTRYWAY, {[]{return true;}}),
-                  Entrance(RR_SPIRIT_TEMPLE_MQ_CHILD, {[]{return IsChild;}}),
-                  Entrance(RR_SPIRIT_TEMPLE_MQ_ADULT, {[]{return HasBombchus && IsAdult && CanUse(RG_LONGSHOT) && CanUse(RG_SILVER_GAUNTLETS);}}),
+                  Entrance(RR_SPIRIT_TEMPLE_MQ_CHILD, {[]{return logic->IsChild;}}),
+                  Entrance(RR_SPIRIT_TEMPLE_MQ_ADULT, {[]{return logic->HasBombchus && logic->IsAdult && logic->CanUse(RG_LONGSHOT) && logic->CanUse(RG_SILVER_GAUNTLETS);}}),
   });
 
   areaTable[RR_SPIRIT_TEMPLE_MQ_CHILD] = Area("Spirit Temple MQ Child", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&FairyPot, {[]{return FairyPot || (KokiriSword && HasBombchus && Slingshot);}}),
+                  EventAccess(&logic->FairyPot, {[]{return logic->FairyPot || (logic->KokiriSword && logic->HasBombchus && logic->Slingshot);}}),
   }, {
                   //Locations
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST,  {[]{return Here(RR_SPIRIT_TEMPLE_MQ_ADULT, []{return SmallKeys(RR_SPIRIT_TEMPLE, 7) && Hammer;});}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST,       {[]{return KokiriSword && HasBombchus && Slingshot && CanUse(RG_DINS_FIRE);}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_MAP_CHEST,                  {[]{return KokiriSword || Bombs;}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST, {[]{return HasBombchus && SmallKeys(RR_SPIRIT_TEMPLE, 7) && Slingshot && (CanUse(RG_DINS_FIRE) || (Here(RR_SPIRIT_TEMPLE_MQ_ADULT, []{return IsAdult && (CanUse(RG_FIRE_ARROWS) || (randoCtx->GetTrickOption(RT_SPIRIT_MQ_FROZEN_EYE) && CanUse(RG_FAIRY_BOW) && CanUse(RG_SONG_OF_TIME)));})));}}),
-                    //Trick: HasBombchus && SmallKeys(RR_SPIRIT_TEMPLE, 7) && Slingshot && (CanUse(RG_DINS_FIRE) || (SPIRIT_TEMPLE_MQ_ADULT.Adult() && IsAdult && (CanUse(RG_FIRE_ARROWS) || (LogicSpiritMQFrozenEye && CanUse(RG_FAIRY_BOW) && CanUse(RG_SONG_OF_TIME)))))
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST,  {[]{return Here(RR_SPIRIT_TEMPLE_MQ_ADULT, []{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && logic->Hammer;});}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST,       {[]{return logic->KokiriSword && logic->HasBombchus && logic->Slingshot && logic->CanUse(RG_DINS_FIRE);}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_MAP_CHEST,                  {[]{return logic->KokiriSword || logic->Bombs;}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST, {[]{return logic->HasBombchus && logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && logic->Slingshot && (logic->CanUse(RG_DINS_FIRE) || (Here(RR_SPIRIT_TEMPLE_MQ_ADULT, []{return logic->IsAdult && (logic->CanUse(RG_FIRE_ARROWS) || (randoCtx->GetTrickOption(RT_SPIRIT_MQ_FROZEN_EYE) && logic->CanUse(RG_FAIRY_BOW) && logic->CanUse(RG_SONG_OF_TIME)));})));}}),
+                    //Trick: logic->HasBombchus && logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && logic->Slingshot && (logic->CanUse(RG_DINS_FIRE) || (SPIRIT_TEMPLE_MQ_ADULT.Adult() && logic->IsAdult && (logic->CanUse(RG_FIRE_ARROWS) || (LogicSpiritMQFrozenEye && logic->CanUse(RG_FAIRY_BOW) && logic->CanUse(RG_SONG_OF_TIME)))))
   }, {
                   //Exits
-                  Entrance(RR_SPIRIT_TEMPLE_MQ_SHARED, {[]{return HasBombchus && SmallKeys(RR_SPIRIT_TEMPLE, 2);}}),
+                  Entrance(RR_SPIRIT_TEMPLE_MQ_SHARED, {[]{return logic->HasBombchus && logic->SmallKeys(RR_SPIRIT_TEMPLE, 2);}}),
   });
 
   areaTable[RR_SPIRIT_TEMPLE_MQ_ADULT] = Area("Spirit Temple MQ Adult", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST,     {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 7);}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST,   {[]{return CanUse(RG_ZELDAS_LULLABY) && (CanJumpslash || CanUse(RG_HOVER_BOOTS));}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST, {[]{return (randoCtx->GetTrickOption(RT_LENS_SPIRIT_MQ) || CanUse(RG_LENS_OF_TRUTH));}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST,           {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 5);}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST,          {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 5) && CanUse(RG_SONG_OF_TIME);}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST,              {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 5) && CanUse(RG_SONG_OF_TIME) && (MirrorShield || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && CanUse(RG_LIGHT_ARROWS)));}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST,   {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 7);}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH,  {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 7);}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST,     {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 7);}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST,   {[]{return logic->CanUse(RG_ZELDAS_LULLABY) && (logic->CanJumpslash || logic->CanUse(RG_HOVER_BOOTS));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST, {[]{return (randoCtx->GetTrickOption(RT_LENS_SPIRIT_MQ) || logic->CanUse(RG_LENS_OF_TRUTH));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST,           {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 5);}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST,          {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->CanUse(RG_SONG_OF_TIME);}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST,              {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->CanUse(RG_SONG_OF_TIME) && (logic->MirrorShield || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS)));}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST,   {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 7);}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH,  {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 7);}}),
   }, {
                   //Exits
-                  Entrance(RR_SPIRIT_TEMPLE_MQ_LOWER_ADULT,        {[]{return MirrorShield && IsAdult && (CanUse(RG_FIRE_ARROWS) || (randoCtx->GetTrickOption(RT_SPIRIT_MQ_LOWER_ADULT) && CanUse(RG_DINS_FIRE) && Bow));}}),
-                    //Trick: MirrorShield && IsAdult && (CanUse(RG_FIRE_ARROWS) || (LogicSpiritMQLowerAdult && CanUse(RG_DINS_FIRE) && Bow))
+                  Entrance(RR_SPIRIT_TEMPLE_MQ_LOWER_ADULT,        {[]{return logic->MirrorShield && logic->IsAdult && (logic->CanUse(RG_FIRE_ARROWS) || (randoCtx->GetTrickOption(RT_SPIRIT_MQ_LOWER_ADULT) && logic->CanUse(RG_DINS_FIRE) && logic->Bow));}}),
+                    //Trick: logic->MirrorShield && logic->IsAdult && (logic->CanUse(RG_FIRE_ARROWS) || (LogicSpiritMQLowerAdult && logic->CanUse(RG_DINS_FIRE) && logic->Bow))
                   Entrance(RR_SPIRIT_TEMPLE_MQ_SHARED,             {[]{return true;}}),
-                  Entrance(RR_SPIRIT_TEMPLE_MQ_BOSS_AREA,          {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 6) && CanUse(RG_ZELDAS_LULLABY) && Hammer;}}),
-                  Entrance(RR_SPIRIT_TEMPLE_MQ_MIRROR_SHIELD_HAND, {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 5) && CanUse(RG_SONG_OF_TIME) && CanJumpslash && (randoCtx->GetTrickOption(RT_LENS_SPIRIT_MQ) || CanUse(RG_LENS_OF_TRUTH));}}),
+                  Entrance(RR_SPIRIT_TEMPLE_MQ_BOSS_AREA,          {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 6) && logic->CanUse(RG_ZELDAS_LULLABY) && logic->Hammer;}}),
+                  Entrance(RR_SPIRIT_TEMPLE_MQ_MIRROR_SHIELD_HAND, {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->CanUse(RG_SONG_OF_TIME) && logic->CanJumpslash && (randoCtx->GetTrickOption(RT_LENS_SPIRIT_MQ) || logic->CanUse(RG_LENS_OF_TRUTH));}}),
   });
 
   areaTable[RR_SPIRIT_TEMPLE_MQ_SHARED] = Area("Spirit Temple MQ Shared", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST, {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 6);}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_COMPASS_CHEST,           {[]{return (IsChild && CanUse(RG_FAIRY_SLINGSHOT) && SmallKeys(RR_SPIRIT_TEMPLE, 7)) || (IsAdult && CanUse(RG_FAIRY_BOW)) || (Bow && Slingshot);}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST,    {[]{return CanUse(RG_SONG_OF_TIME) || randoCtx->GetTrickOption(RT_SPIRIT_MQ_SUN_BLOCK_SOT) || IsAdult;}}),
-                    //Trick: CanUse(RG_SONG_OF_TIME) || LogicSpiritMQSunBlockSoT || IsAdult
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM,       {[]{return (randoCtx->GetTrickOption(RT_SPIRIT_MQ_SUN_BLOCK_GS) && Boomerang && (CanUse(RG_SONG_OF_TIME) || randoCtx->GetTrickOption(RT_SPIRIT_MQ_SUN_BLOCK_SOT))) || IsAdult;}}),
-                    //Trick: (LogicSpiritMQSunBlockGS && Boomerang && (CanUse(RG_SONG_OF_TIME) || LogicSpiritMQSunBlockSoT)) || IsAdult
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST, {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 6);}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_COMPASS_CHEST,           {[]{return (logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT) && logic->SmallKeys(RR_SPIRIT_TEMPLE, 7)) || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW)) || (logic->Bow && logic->Slingshot);}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST,    {[]{return logic->CanUse(RG_SONG_OF_TIME) || randoCtx->GetTrickOption(RT_SPIRIT_MQ_SUN_BLOCK_SOT) || logic->IsAdult;}}),
+                    //Trick: logic->CanUse(RG_SONG_OF_TIME) || LogicSpiritMQSunBlockSoT || logic->IsAdult
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM,       {[]{return (randoCtx->GetTrickOption(RT_SPIRIT_MQ_SUN_BLOCK_GS) && logic->Boomerang && (logic->CanUse(RG_SONG_OF_TIME) || randoCtx->GetTrickOption(RT_SPIRIT_MQ_SUN_BLOCK_SOT))) || logic->IsAdult;}}),
+                    //Trick: (LogicSpiritMQSunBlockGS && logic->Boomerang && (logic->CanUse(RG_SONG_OF_TIME) || LogicSpiritMQSunBlockSoT)) || logic->IsAdult
    }, {
                   //Exits
-                  Entrance(RR_SPIRIT_TEMPLE_MQ_SILVER_GAUNTLETS_HAND, {[]{return (SmallKeys(RR_SPIRIT_TEMPLE, 7) && (CanUse(RG_SONG_OF_TIME) || randoCtx->GetTrickOption(RT_SPIRIT_MQ_SUN_BLOCK_SOT) || IsAdult)) || (SmallKeys(RR_SPIRIT_TEMPLE, 4) && CanUse(RG_SONG_OF_TIME) && CanJumpslash && (randoCtx->GetTrickOption(RT_LENS_SPIRIT_MQ) || CanUse(RG_LENS_OF_TRUTH)));}}),
-                    //Trick: (SmallKeys(RR_SPIRIT_TEMPLE, 7) && (CanUse(RG_SONG_OF_TIME) || LogicSpiritMQSunBlockSoT || IsAdult)) || (SmallKeys(RR_SPIRIT_TEMPLE, 4) && CanUse(RG_SONG_OF_TIME) && (LogicLensSpiritMQ || CanUse(RG_LENS_OF_TRUTH)))
-                  Entrance(RR_DESERT_COLOSSUS,                        {[]{return (SmallKeys(RR_SPIRIT_TEMPLE, 7) && (CanUse(RG_SONG_OF_TIME) || randoCtx->GetTrickOption(RT_SPIRIT_MQ_SUN_BLOCK_SOT) || IsAdult)) || (SmallKeys(RR_SPIRIT_TEMPLE, 4) && CanUse(RG_SONG_OF_TIME) && CanJumpslash && (randoCtx->GetTrickOption(RT_LENS_SPIRIT_MQ) || CanUse(RG_LENS_OF_TRUTH)) && IsAdult);}}),
-                    //Trick: (SmallKeys(RR_SPIRIT_TEMPLE, 7) && (CanUse(RG_SONG_OF_TIME) || LogicSpiritMQSunBlockSoT || IsAdult)) || (SmallKeys(RR_SPIRIT_TEMPLE, 4) && CanUse(RG_SONG_OF_TIME) && (LogicLensSpiritMQ || CanUse(RG_LENS_OF_TRUTH)) && IsAdult)
+                  Entrance(RR_SPIRIT_TEMPLE_MQ_SILVER_GAUNTLETS_HAND, {[]{return (logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && (logic->CanUse(RG_SONG_OF_TIME) || randoCtx->GetTrickOption(RT_SPIRIT_MQ_SUN_BLOCK_SOT) || logic->IsAdult)) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 4) && logic->CanUse(RG_SONG_OF_TIME) && logic->CanJumpslash && (randoCtx->GetTrickOption(RT_LENS_SPIRIT_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)));}}),
+                    //Trick: (logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && (logic->CanUse(RG_SONG_OF_TIME) || LogicSpiritMQSunBlockSoT || logic->IsAdult)) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 4) && logic->CanUse(RG_SONG_OF_TIME) && (LogicLensSpiritMQ || logic->CanUse(RG_LENS_OF_TRUTH)))
+                  Entrance(RR_DESERT_COLOSSUS,                        {[]{return (logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && (logic->CanUse(RG_SONG_OF_TIME) || randoCtx->GetTrickOption(RT_SPIRIT_MQ_SUN_BLOCK_SOT) || logic->IsAdult)) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 4) && logic->CanUse(RG_SONG_OF_TIME) && logic->CanJumpslash && (randoCtx->GetTrickOption(RT_LENS_SPIRIT_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->IsAdult);}}),
+                    //Trick: (logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && (logic->CanUse(RG_SONG_OF_TIME) || LogicSpiritMQSunBlockSoT || logic->IsAdult)) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 4) && logic->CanUse(RG_SONG_OF_TIME) && (LogicLensSpiritMQ || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->IsAdult)
   });
 
   areaTable[RR_SPIRIT_TEMPLE_MQ_LOWER_ADULT] = Area("Spirit Temple MQ Lower Adult", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST,          {[]{return true;}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST,        {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 7) && Hammer && Ocarina && SongOfTime && EponasSong && SunsSong && SongOfStorms && ZeldasLullaby;}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST, {[]{return Hammer;}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST,        {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && logic->Hammer && logic->Ocarina && logic->SongOfTime && logic->EponasSong && logic->SunsSong && logic->SongOfStorms && logic->ZeldasLullaby;}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST, {[]{return logic->Hammer;}}),
                   LocationAccess(RC_SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM,             {[]{return true;}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM,           {[]{return SmallKeys(RR_SPIRIT_TEMPLE, 7) && Hammer && Ocarina && SongOfTime && EponasSong && SunsSong && SongOfStorms && ZeldasLullaby;}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM,           {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && logic->Hammer && logic->Ocarina && logic->SongOfTime && logic->EponasSong && logic->SunsSong && logic->SongOfStorms && logic->ZeldasLullaby;}}),
   }, {});
 
   areaTable[RR_SPIRIT_TEMPLE_MQ_BOSS_AREA] = Area("Spirit Temple MQ Boss Area", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST, {[]{return randoCtx->GetTrickOption(RT_LENS_SPIRIT_MQ) || CanUse(RG_LENS_OF_TRUTH);}}),
+                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST, {[]{return randoCtx->GetTrickOption(RT_LENS_SPIRIT_MQ) || logic->CanUse(RG_LENS_OF_TRUTH);}}),
   }, {
                   //Exits
-                  Entrance(RR_SPIRIT_TEMPLE_MQ_INSIDE_STATUE_HEAD, {[]{return MirrorShield && Hookshot;}}),
+                  Entrance(RR_SPIRIT_TEMPLE_MQ_INSIDE_STATUE_HEAD, {[]{return logic->MirrorShield && logic->Hookshot;}}),
   });
 
   areaTable[RR_SPIRIT_TEMPLE_MQ_INSIDE_STATUE_HEAD] =
@@ -228,7 +226,7 @@ void AreaTable_Init_SpiritTemple() {
                  {
                      // Exits
                      Entrance(RR_SPIRIT_TEMPLE_MQ_SHARED, { [] { return true; } }),
-                     Entrance(RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY, { [] { return BossKeySpiritTemple; } }),
+                     Entrance(RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY, { [] { return logic->BossKeySpiritTemple; } }),
                  });
 
   areaTable[RR_SPIRIT_TEMPLE_MQ_MIRROR_SHIELD_HAND] = Area("Spirit Temple MQ Mirror Shield Hand", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -258,15 +256,15 @@ void AreaTable_Init_SpiritTemple() {
         "Spirit Temple Boss Room", "Spirit Temple", RA_NONE, NO_DAY_NIGHT_CYCLE,
         {
             // Events
-            EventAccess(&SpiritTempleClear, { [] {
-                return SpiritTempleClear || (HasBossSoul(RG_TWINROVA_SOUL) && (CanUse(RG_MIRROR_SHIELD) &&
-                                             (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD))));
+            EventAccess(&logic->SpiritTempleClear, { [] {
+                return logic->SpiritTempleClear || (logic->HasBossSoul(RG_TWINROVA_SOUL) && (logic->CanUse(RG_MIRROR_SHIELD) &&
+                                             (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD))));
             } }),
         },
         {
             // Locations
-            LocationAccess(RC_SPIRIT_TEMPLE_TWINROVA_HEART, { [] { return SpiritTempleClear; } }),
-            LocationAccess(RC_TWINROVA, { [] { return SpiritTempleClear; } }),
+            LocationAccess(RC_SPIRIT_TEMPLE_TWINROVA_HEART, { [] { return logic->SpiritTempleClear; } }),
+            LocationAccess(RC_TWINROVA, { [] { return logic->SpiritTempleClear; } }),
         },
         {
             // Exits
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp
index fac3affa2..e4d6a4ab2 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp
@@ -1,9 +1,7 @@
 #include "../location_access.hpp"
-#include "../logic.hpp"
 #include "../../entrance.h"
 #include "../../dungeon.h"
 
-using namespace Logic;
 using namespace Rando;
 
 void AreaTable_Init_WaterTemple() {
@@ -25,42 +23,42 @@ void AreaTable_Init_WaterTemple() {
   areaTable[RR_WATER_TEMPLE_LOBBY] = Area("Water Temple Lobby", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_ENTRYWAY,              {[]{return true;}}),
-                  Entrance(RR_WATER_TEMPLE_EAST_LOWER,            {[]{return WaterTempleLow || ((randoCtx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS) || CanUse(RG_ZORA_TUNIC)) && (CanUse(RG_IRON_BOOTS) || (CanUse(RG_LONGSHOT) && randoCtx->GetTrickOption(RT_WATER_LONGSHOT_TORCH))));}}),
-                  Entrance(RR_WATER_TEMPLE_NORTH_LOWER,           {[]{return WaterTempleLow || ((randoCtx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS) || CanUse(RG_ZORA_TUNIC)) && CanUse(RG_IRON_BOOTS));}}),
-                  Entrance(RR_WATER_TEMPLE_SOUTH_LOWER,           {[]{return WaterTempleLow && HasExplosives && (CanDive || CanUse(RG_IRON_BOOTS)) && (randoCtx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS) || CanUse(RG_ZORA_TUNIC));}}),
-                  Entrance(RR_WATER_TEMPLE_WEST_LOWER,            {[]{return WaterTempleLow && GoronBracelet && (IsChild || CanDive || CanUse(RG_IRON_BOOTS)) && (randoCtx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS) || CanUse(RG_ZORA_TUNIC));}}),
-                  Entrance(RR_WATER_TEMPLE_CENTRAL_PILLAR_LOWER,  {[]{return WaterTempleLow && SmallKeys(RR_WATER_TEMPLE, 5);}}),
-                  Entrance(RR_WATER_TEMPLE_CENTRAL_PILLAR_UPPER,  {[]{return (WaterTempleLow || WaterTempleMiddle) && (HasFireSourceWithTorch || CanUse(RG_FAIRY_BOW));}}),
-                  Entrance(RR_WATER_TEMPLE_EAST_MIDDLE,           {[]{return (WaterTempleLow || WaterTempleMiddle || (CanUse(RG_IRON_BOOTS) && WaterTimer >= 16)) && CanUse(RG_HOOKSHOT);}}),
-                  Entrance(RR_WATER_TEMPLE_WEST_MIDDLE,           {[]{return WaterTempleMiddle;}}),
-                  Entrance(RR_WATER_TEMPLE_HIGH_WATER,            {[]{return IsAdult && (CanUse(RG_HOVER_BOOTS) || (randoCtx->GetTrickOption(RT_DAMAGE_BOOST) && Bombs && CanTakeDamage));}}),
-                  Entrance(RR_WATER_TEMPLE_BLOCK_CORRIDOR,        {[]{return (WaterTempleLow || WaterTempleMiddle) && (CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW)) && (CanUse(RG_LONGSHOT) || CanUse(RG_HOVER_BOOTS) || (randoCtx->GetTrickOption(RT_WATER_CENTRAL_BOW) && (IsAdult || WaterTempleMiddle)));}}),
-                  Entrance(RR_WATER_TEMPLE_FALLING_PLATFORM_ROOM, {[]{return WaterTempleHigh && SmallKeys(RR_WATER_TEMPLE, 4);}}),
-                  Entrance(RR_WATER_TEMPLE_PRE_BOSS_ROOM,         {[]{return WaterTempleHigh && CanUse(RG_LONGSHOT);}}),
+                  Entrance(RR_WATER_TEMPLE_EAST_LOWER,            {[]{return logic->WaterTempleLow || ((randoCtx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS) || logic->CanUse(RG_ZORA_TUNIC)) && (logic->CanUse(RG_IRON_BOOTS) || (logic->CanUse(RG_LONGSHOT) && randoCtx->GetTrickOption(RT_WATER_LONGSHOT_TORCH))));}}),
+                  Entrance(RR_WATER_TEMPLE_NORTH_LOWER,           {[]{return logic->WaterTempleLow || ((randoCtx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS) || logic->CanUse(RG_ZORA_TUNIC)) && logic->CanUse(RG_IRON_BOOTS));}}),
+                  Entrance(RR_WATER_TEMPLE_SOUTH_LOWER,           {[]{return logic->WaterTempleLow && logic->HasExplosives && (logic->CanDive || logic->CanUse(RG_IRON_BOOTS)) && (randoCtx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS) || logic->CanUse(RG_ZORA_TUNIC));}}),
+                  Entrance(RR_WATER_TEMPLE_WEST_LOWER,            {[]{return logic->WaterTempleLow && logic->GoronBracelet && (logic->IsChild || logic->CanDive || logic->CanUse(RG_IRON_BOOTS)) && (randoCtx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS) || logic->CanUse(RG_ZORA_TUNIC));}}),
+                  Entrance(RR_WATER_TEMPLE_CENTRAL_PILLAR_LOWER,  {[]{return logic->WaterTempleLow && logic->SmallKeys(RR_WATER_TEMPLE, 5);}}),
+                  Entrance(RR_WATER_TEMPLE_CENTRAL_PILLAR_UPPER,  {[]{return (logic->WaterTempleLow || logic->WaterTempleMiddle) && (logic->HasFireSourceWithTorch || logic->CanUse(RG_FAIRY_BOW));}}),
+                  Entrance(RR_WATER_TEMPLE_EAST_MIDDLE,           {[]{return (logic->WaterTempleLow || logic->WaterTempleMiddle || (logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer >= 16)) && logic->CanUse(RG_HOOKSHOT);}}),
+                  Entrance(RR_WATER_TEMPLE_WEST_MIDDLE,           {[]{return logic->WaterTempleMiddle;}}),
+                  Entrance(RR_WATER_TEMPLE_HIGH_WATER,            {[]{return logic->IsAdult && (logic->CanUse(RG_HOVER_BOOTS) || (randoCtx->GetTrickOption(RT_DAMAGE_BOOST) && logic->Bombs && logic->CanTakeDamage));}}),
+                  Entrance(RR_WATER_TEMPLE_BLOCK_CORRIDOR,        {[]{return (logic->WaterTempleLow || logic->WaterTempleMiddle) && (logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW)) && (logic->CanUse(RG_LONGSHOT) || logic->CanUse(RG_HOVER_BOOTS) || (randoCtx->GetTrickOption(RT_WATER_CENTRAL_BOW) && (logic->IsAdult || logic->WaterTempleMiddle)));}}),
+                  Entrance(RR_WATER_TEMPLE_FALLING_PLATFORM_ROOM, {[]{return logic->WaterTempleHigh && logic->SmallKeys(RR_WATER_TEMPLE, 4);}}),
+                  Entrance(RR_WATER_TEMPLE_PRE_BOSS_ROOM,         {[]{return logic->WaterTempleHigh && logic->CanUse(RG_LONGSHOT);}}),
   });
 
   areaTable[RR_WATER_TEMPLE_EAST_LOWER] = Area("Water Temple East Lower", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&WaterTempleLow, {[]{return WaterTempleLow || CanUse(RG_ZELDAS_LULLABY);}}),
+                  EventAccess(&logic->WaterTempleLow, {[]{return logic->WaterTempleLow || logic->CanUse(RG_ZELDAS_LULLABY);}}),
                 }, {}, {
                   //Exits
-                  Entrance(RR_WATER_TEMPLE_LOBBY,        {[]{return WaterTempleLow || ((randoCtx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS) || CanUse(RG_ZORA_TUNIC)) && CanUse(RG_IRON_BOOTS));}}),
-                  Entrance(RR_WATER_TEMPLE_MAP_ROOM,     {[]{return WaterTempleHigh;}}),
-                  Entrance(RR_WATER_TEMPLE_CRACKED_WALL, {[]{return WaterTempleMiddle || (WaterTempleHigh && WaterTempleLow && ((CanUse(RG_HOVER_BOOTS) && randoCtx->GetTrickOption(RT_WATER_CRACKED_WALL_HOVERS)) || randoCtx->GetTrickOption(RT_WATER_CRACKED_WALL)));}}),
-                  Entrance(RR_WATER_TEMPLE_TORCH_ROOM,   {[]{return WaterTempleLow && (HasFireSourceWithTorch || CanUse(RG_FAIRY_BOW));}}),
+                  Entrance(RR_WATER_TEMPLE_LOBBY,        {[]{return logic->WaterTempleLow || ((randoCtx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS) || logic->CanUse(RG_ZORA_TUNIC)) && logic->CanUse(RG_IRON_BOOTS));}}),
+                  Entrance(RR_WATER_TEMPLE_MAP_ROOM,     {[]{return logic->WaterTempleHigh;}}),
+                  Entrance(RR_WATER_TEMPLE_CRACKED_WALL, {[]{return logic->WaterTempleMiddle || (logic->WaterTempleHigh && logic->WaterTempleLow && ((logic->CanUse(RG_HOVER_BOOTS) && randoCtx->GetTrickOption(RT_WATER_CRACKED_WALL_HOVERS)) || randoCtx->GetTrickOption(RT_WATER_CRACKED_WALL)));}}),
+                  Entrance(RR_WATER_TEMPLE_TORCH_ROOM,   {[]{return logic->WaterTempleLow && (logic->HasFireSourceWithTorch || logic->CanUse(RG_FAIRY_BOW));}}),
   });
 
   areaTable[RR_WATER_TEMPLE_MAP_ROOM] = Area("Water Temple Map Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_WATER_TEMPLE_MAP_CHEST, {[]{return (MagicMeter && CanUse(RG_KOKIRI_SWORD)) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_HOOKSHOT);}}),
+                  LocationAccess(RC_WATER_TEMPLE_MAP_CHEST, {[]{return (logic->MagicMeter && logic->CanUse(RG_KOKIRI_SWORD)) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_HOOKSHOT);}}),
                 }, {
                   //Exits
-                  Entrance(RR_WATER_TEMPLE_EAST_LOWER, {[]{return (MagicMeter && CanUse(RG_KOKIRI_SWORD)) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_HOOKSHOT);}}),
+                  Entrance(RR_WATER_TEMPLE_EAST_LOWER, {[]{return (logic->MagicMeter && logic->CanUse(RG_KOKIRI_SWORD)) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_HOOKSHOT);}}),
   });
 
   areaTable[RR_WATER_TEMPLE_CRACKED_WALL] = Area("Water Temple Cracked Wall", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_WATER_TEMPLE_CRACKED_WALL_CHEST, {[]{return HasExplosives;}}),
+                  LocationAccess(RC_WATER_TEMPLE_CRACKED_WALL_CHEST, {[]{return logic->HasExplosives;}}),
                 }, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_EAST_LOWER, {[]{return true;}}),
@@ -68,76 +66,76 @@ void AreaTable_Init_WaterTemple() {
 
   areaTable[RR_WATER_TEMPLE_TORCH_ROOM] = Area("Water Temple Torch Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_WATER_TEMPLE_TORCHES_CHEST, {[]{return (MagicMeter && CanUse(RG_KOKIRI_SWORD)) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_HOOKSHOT);}}),
+                  LocationAccess(RC_WATER_TEMPLE_TORCHES_CHEST, {[]{return (logic->MagicMeter && logic->CanUse(RG_KOKIRI_SWORD)) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_HOOKSHOT);}}),
                 }, {
                   //Exits
-                  Entrance(RR_WATER_TEMPLE_EAST_LOWER, {[]{return (MagicMeter && CanUse(RG_KOKIRI_SWORD)) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_HOOKSHOT);}}),
+                  Entrance(RR_WATER_TEMPLE_EAST_LOWER, {[]{return (logic->MagicMeter && logic->CanUse(RG_KOKIRI_SWORD)) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_HOOKSHOT);}}),
   });
 
   areaTable[RR_WATER_TEMPLE_NORTH_LOWER] = Area("Water Temple North Lower", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_LOBBY,          {[]{return true;}}),
-                  Entrance(RR_WATER_TEMPLE_BOULDERS_LOWER, {[]{return (CanUse(RG_LONGSHOT) || (randoCtx->GetTrickOption(RT_WATER_BK_REGION) && CanUse(RG_HOVER_BOOTS))) && SmallKeys(RR_WATER_TEMPLE, 4);}}),
+                  Entrance(RR_WATER_TEMPLE_BOULDERS_LOWER, {[]{return (logic->CanUse(RG_LONGSHOT) || (randoCtx->GetTrickOption(RT_WATER_BK_REGION) && logic->CanUse(RG_HOVER_BOOTS))) && logic->SmallKeys(RR_WATER_TEMPLE, 4);}}),
   });
 
   areaTable[RR_WATER_TEMPLE_BOULDERS_LOWER] = Area("Water Temple Boulders Lower", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST, {[]{return CanUse(RG_LONGSHOT) || Here(RR_WATER_TEMPLE_BOULDERS_UPPER, []{return (IsAdult && HookshotOrBoomerang) || (CanUse(RG_IRON_BOOTS) && CanUse(RG_HOOKSHOT));});}}),
+                  LocationAccess(RC_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST, {[]{return logic->CanUse(RG_LONGSHOT) || Here(RR_WATER_TEMPLE_BOULDERS_UPPER, []{return (logic->IsAdult && logic->HookshotOrBoomerang) || (logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_HOOKSHOT));});}}),
                 }, {
                   //Exits
-                  Entrance(RR_WATER_TEMPLE_NORTH_LOWER,    {[]{return SmallKeys(RR_WATER_TEMPLE, 4);}}),
+                  Entrance(RR_WATER_TEMPLE_NORTH_LOWER,    {[]{return logic->SmallKeys(RR_WATER_TEMPLE, 4);}}),
                   Entrance(RR_WATER_TEMPLE_BLOCK_ROOM,     {[]{return true;}}),
-                  Entrance(RR_WATER_TEMPLE_BOULDERS_UPPER, {[]{return (IsAdult && (CanUse(RG_HOVER_BOOTS) || randoCtx->GetTrickOption(RT_WATER_NORTH_BASEMENT_LEDGE_JUMP))) || (CanUse(RG_HOVER_BOOTS) && CanUse(RG_IRON_BOOTS));}}),
+                  Entrance(RR_WATER_TEMPLE_BOULDERS_UPPER, {[]{return (logic->IsAdult && (logic->CanUse(RG_HOVER_BOOTS) || randoCtx->GetTrickOption(RT_WATER_NORTH_BASEMENT_LEDGE_JUMP))) || (logic->CanUse(RG_HOVER_BOOTS) && logic->CanUse(RG_IRON_BOOTS));}}),
   });
 
   areaTable[RR_WATER_TEMPLE_BLOCK_ROOM] = Area("Water Temple Block Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_WATER_TEMPLE_BOULDERS_LOWER, {[]{return (GoronBracelet && HasExplosives) || CanUse(RG_HOOKSHOT);}}),
-                  Entrance(RR_WATER_TEMPLE_JETS_ROOM,      {[]{return (GoronBracelet && HasExplosives) || (CanUse(RG_HOOKSHOT) && CanUse(RG_HOVER_BOOTS));}}),
+                  Entrance(RR_WATER_TEMPLE_BOULDERS_LOWER, {[]{return (logic->GoronBracelet && logic->HasExplosives) || logic->CanUse(RG_HOOKSHOT);}}),
+                  Entrance(RR_WATER_TEMPLE_JETS_ROOM,      {[]{return (logic->GoronBracelet && logic->HasExplosives) || (logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_HOVER_BOOTS));}}),
   });
 
   areaTable[RR_WATER_TEMPLE_JETS_ROOM] = Area("Water Temple Jets Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_WATER_TEMPLE_BLOCK_ROOM,     {[]{return CanUse(RG_HOOKSHOT);}}),
+                  Entrance(RR_WATER_TEMPLE_BLOCK_ROOM,     {[]{return logic->CanUse(RG_HOOKSHOT);}}),
                   Entrance(RR_WATER_TEMPLE_BOULDERS_UPPER, {[]{return true;}}),
   });
 
   areaTable[RR_WATER_TEMPLE_BOULDERS_UPPER] = Area("Water Temple Boulders Upper", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_BOULDERS_LOWER, {[]{return true;}}),
-                  Entrance(RR_WATER_TEMPLE_JETS_ROOM,      {[]{return IsAdult;}}),
-                  Entrance(RR_WATER_TEMPLE_BOSS_KEY_ROOM,  {[]{return (CanUse(RG_IRON_BOOTS) || (IsAdult && randoCtx->GetTrickOption(RT_WATER_BK_JUMP_DIVE))) && SmallKeys(RR_WATER_TEMPLE, 5);}}),
+                  Entrance(RR_WATER_TEMPLE_JETS_ROOM,      {[]{return logic->IsAdult;}}),
+                  Entrance(RR_WATER_TEMPLE_BOSS_KEY_ROOM,  {[]{return (logic->CanUse(RG_IRON_BOOTS) || (logic->IsAdult && randoCtx->GetTrickOption(RT_WATER_BK_JUMP_DIVE))) && logic->SmallKeys(RR_WATER_TEMPLE, 5);}}),
   });
 
   areaTable[RR_WATER_TEMPLE_BOSS_KEY_ROOM] = Area("Water Temple Boss Key Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&FairyPot, {[]{return true;}}),
+                  EventAccess(&logic->FairyPot, {[]{return true;}}),
                 }, {
                   //Locations
                   LocationAccess(RC_WATER_TEMPLE_BOSS_KEY_CHEST, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(RR_WATER_TEMPLE_BOULDERS_UPPER, {[]{return (CanUse(RG_IRON_BOOTS) || (IsAdult && randoCtx->GetTrickOption(RT_WATER_BK_JUMP_DIVE)) || IsChild || CanDive) && SmallKeys(RR_WATER_TEMPLE, 5);}}),
+                  Entrance(RR_WATER_TEMPLE_BOULDERS_UPPER, {[]{return (logic->CanUse(RG_IRON_BOOTS) || (logic->IsAdult && randoCtx->GetTrickOption(RT_WATER_BK_JUMP_DIVE)) || logic->IsChild || logic->CanDive) && logic->SmallKeys(RR_WATER_TEMPLE, 5);}}),
   });
 
   areaTable[RR_WATER_TEMPLE_SOUTH_LOWER] = Area("Water Temple South Lower", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_WATER_TEMPLE_GS_BEHIND_GATE, {[]{return (CanJumpslash || CanUse(RG_MEGATON_HAMMER)) && (CanUse(RG_HOOKSHOT) || (IsAdult && CanUse(RG_HOVER_BOOTS)));}}),
+                  LocationAccess(RC_WATER_TEMPLE_GS_BEHIND_GATE, {[]{return (logic->CanJumpslash || logic->CanUse(RG_MEGATON_HAMMER)) && (logic->CanUse(RG_HOOKSHOT) || (logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS)));}}),
                 }, {
                   //Exits
-                  Entrance(RR_WATER_TEMPLE_LOBBY, {[]{return CanUse(RG_IRON_BOOTS);}}),
+                  Entrance(RR_WATER_TEMPLE_LOBBY, {[]{return logic->CanUse(RG_IRON_BOOTS);}}),
   });
 
   areaTable[RR_WATER_TEMPLE_WEST_LOWER] = Area("Water Temple West Lower", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_WATER_TEMPLE_LOBBY,       {[]{return CanUse(RG_HOOKSHOT) && CanUse(RG_IRON_BOOTS) && GoronBracelet;}}),
-                  Entrance(RR_WATER_TEMPLE_DRAGON_ROOM, {[]{return CanJumpslash || CanUseProjectile;}}),
+                  Entrance(RR_WATER_TEMPLE_LOBBY,       {[]{return logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_IRON_BOOTS) && logic->GoronBracelet;}}),
+                  Entrance(RR_WATER_TEMPLE_DRAGON_ROOM, {[]{return logic->CanJumpslash || logic->CanUseProjectile;}}),
   });
 
   areaTable[RR_WATER_TEMPLE_DRAGON_ROOM] = Area("Water Temple Dragon Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_WATER_TEMPLE_DRAGON_CHEST, {[]{return (CanUse(RG_HOOKSHOT) && CanUse(RG_IRON_BOOTS)) || (((IsAdult && randoCtx->GetTrickOption(RT_WATER_ADULT_DRAGON) && (CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_BOW) || HasBombchus)) || (IsChild && randoCtx->GetTrickOption(RT_WATER_CHILD_DRAGON) && (CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOOMERANG) || HasBombchus))) && (CanDive || CanUse(RG_IRON_BOOTS))) ||
-                                                                       Here(RR_WATER_TEMPLE_RIVER, []{return IsAdult && CanUse(RG_FAIRY_BOW) && ((randoCtx->GetTrickOption(RT_WATER_ADULT_DRAGON) && (CanDive || CanUse(RG_IRON_BOOTS))) || randoCtx->GetTrickOption(RT_WATER_DRAGON_JUMP_DIVE));});}}),
+                  LocationAccess(RC_WATER_TEMPLE_DRAGON_CHEST, {[]{return (logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_IRON_BOOTS)) || (((logic->IsAdult && randoCtx->GetTrickOption(RT_WATER_ADULT_DRAGON) && (logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->HasBombchus)) || (logic->IsChild && randoCtx->GetTrickOption(RT_WATER_CHILD_DRAGON) && (logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG) || logic->HasBombchus))) && (logic->CanDive || logic->CanUse(RG_IRON_BOOTS))) ||
+                                                                       Here(RR_WATER_TEMPLE_RIVER, []{return logic->IsAdult && logic->CanUse(RG_FAIRY_BOW) && ((randoCtx->GetTrickOption(RT_WATER_ADULT_DRAGON) && (logic->CanDive || logic->CanUse(RG_IRON_BOOTS))) || randoCtx->GetTrickOption(RT_WATER_DRAGON_JUMP_DIVE));});}}),
                 }, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_WEST_LOWER, {[]{return true;}}),
@@ -145,17 +143,17 @@ void AreaTable_Init_WaterTemple() {
 
   areaTable[RR_WATER_TEMPLE_CENTRAL_PILLAR_LOWER] = Area("Water Temple Central Pillar Lower", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_WATER_TEMPLE_LOBBY,                   {[]{return SmallKeys(RR_WATER_TEMPLE, 5);}}),
-                  Entrance(RR_WATER_TEMPLE_CENTRAL_PILLAR_UPPER,    {[]{return CanUse(RG_HOOKSHOT);}}),
-                  Entrance(RR_WATER_TEMPLE_CENTRAL_PILLAR_BASEMENT, {[]{return WaterTempleMiddle && CanUse(RG_IRON_BOOTS) && WaterTimer >= 40;}}),
+                  Entrance(RR_WATER_TEMPLE_LOBBY,                   {[]{return logic->SmallKeys(RR_WATER_TEMPLE, 5);}}),
+                  Entrance(RR_WATER_TEMPLE_CENTRAL_PILLAR_UPPER,    {[]{return logic->CanUse(RG_HOOKSHOT);}}),
+                  Entrance(RR_WATER_TEMPLE_CENTRAL_PILLAR_BASEMENT, {[]{return logic->WaterTempleMiddle && logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer >= 40;}}),
   });
 
   areaTable[RR_WATER_TEMPLE_CENTRAL_PILLAR_UPPER] = Area("Water Temple Central Pillar Upper", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&WaterTempleMiddle, {[]{return WaterTempleMiddle || CanUse(RG_ZELDAS_LULLABY);}}),
+                  EventAccess(&logic->WaterTempleMiddle, {[]{return logic->WaterTempleMiddle || logic->CanUse(RG_ZELDAS_LULLABY);}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_WATER_TEMPLE_GS_CENTRAL_PILLAR, {[]{return CanUse(RG_LONGSHOT) || (((randoCtx->GetTrickOption(RT_WATER_FW_CENTRAL_GS) && CanUse(RG_FARORES_WIND) && (CanUse(RG_FAIRY_BOW) || CanUse(RG_DINS_FIRE) || SmallKeys(RR_WATER_TEMPLE, 5))) || (randoCtx->GetTrickOption(RT_WATER_IRONS_CENTRAL_GS) && CanUse(RG_IRON_BOOTS) && ((CanUse(RG_HOOKSHOT) && CanUse(RG_FAIRY_BOW)) || (CanUse(RG_DINS_FIRE))))) && WaterTempleHigh && HookshotOrBoomerang);}}),
+                  LocationAccess(RC_WATER_TEMPLE_GS_CENTRAL_PILLAR, {[]{return logic->CanUse(RG_LONGSHOT) || (((randoCtx->GetTrickOption(RT_WATER_FW_CENTRAL_GS) && logic->CanUse(RG_FARORES_WIND) && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_DINS_FIRE) || logic->SmallKeys(RR_WATER_TEMPLE, 5))) || (randoCtx->GetTrickOption(RT_WATER_IRONS_CENTRAL_GS) && logic->CanUse(RG_IRON_BOOTS) && ((logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_FAIRY_BOW)) || (logic->CanUse(RG_DINS_FIRE))))) && logic->WaterTempleHigh && logic->HookshotOrBoomerang);}}),
                 }, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_LOBBY,                {[]{return true;}}),
@@ -164,29 +162,29 @@ void AreaTable_Init_WaterTemple() {
 
   areaTable[RR_WATER_TEMPLE_CENTRAL_PILLAR_BASEMENT] = Area("Water Temple Central Pillar Basement", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_WATER_TEMPLE_CENTRAL_PILLAR_CHEST, {[]{return CanUse(RG_HOOKSHOT) && CanUse(RG_IRON_BOOTS) && WaterTimer >= 40;}}),
+                  LocationAccess(RC_WATER_TEMPLE_CENTRAL_PILLAR_CHEST, {[]{return logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer >= 40;}}),
                 }, {
                   //Exits
-                  Entrance(RR_WATER_TEMPLE_CENTRAL_PILLAR_LOWER, {[]{return CanUse(RG_IRON_BOOTS) && WaterTimer >= 16;}}),
+                  Entrance(RR_WATER_TEMPLE_CENTRAL_PILLAR_LOWER, {[]{return logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer >= 16;}}),
   });
 
   areaTable[RR_WATER_TEMPLE_EAST_MIDDLE] = Area("Water Temple East Middle", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_WATER_TEMPLE_COMPASS_CHEST, {[]{return CanUseProjectile;}}),
+                  LocationAccess(RC_WATER_TEMPLE_COMPASS_CHEST, {[]{return logic->CanUseProjectile;}}),
                 }, {
                   //Exits
-                  Entrance(RR_WATER_TEMPLE_LOBBY, {[]{return CanUse(RG_IRON_BOOTS);}}),
+                  Entrance(RR_WATER_TEMPLE_LOBBY, {[]{return logic->CanUse(RG_IRON_BOOTS);}}),
   });
 
   areaTable[RR_WATER_TEMPLE_WEST_MIDDLE] = Area("Water Temple West Middle", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_LOBBY,      {[]{return true;}}),
-                  Entrance(RR_WATER_TEMPLE_HIGH_WATER, {[]{return CanUseProjectile;}}),
+                  Entrance(RR_WATER_TEMPLE_HIGH_WATER, {[]{return logic->CanUseProjectile;}}),
   });
 
   areaTable[RR_WATER_TEMPLE_HIGH_WATER] = Area("Water Temple High Water", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&WaterTempleHigh, {[]{return WaterTempleHigh || CanUse(RG_ZELDAS_LULLABY);}}),
+                  EventAccess(&logic->WaterTempleHigh, {[]{return logic->WaterTempleHigh || logic->CanUse(RG_ZELDAS_LULLABY);}}),
                 }, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_LOBBY, {[]{return true;}}),
@@ -194,31 +192,31 @@ void AreaTable_Init_WaterTemple() {
 
   areaTable[RR_WATER_TEMPLE_BLOCK_CORRIDOR] = Area("Water Temple Block Corridor", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST, {[]{return GoronBracelet && (WaterTempleLow || WaterTempleMiddle);}}),
+                  LocationAccess(RC_WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST, {[]{return logic->GoronBracelet && (logic->WaterTempleLow || logic->WaterTempleMiddle);}}),
                 }, {
                   //Exits
-                  Entrance(RR_WATER_TEMPLE_LOBBY, {[]{return CanUse(RG_HOOKSHOT);}}),
+                  Entrance(RR_WATER_TEMPLE_LOBBY, {[]{return logic->CanUse(RG_HOOKSHOT);}}),
   });
 
   areaTable[RR_WATER_TEMPLE_FALLING_PLATFORM_ROOM] = Area("Water Temple Falling Platform Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM, {[]{return CanUse(RG_LONGSHOT) || (randoCtx->GetTrickOption(RT_WATER_RANG_FALLING_PLATFORM_GS) && IsChild && CanUse(RG_BOOMERANG)) || (randoCtx->GetTrickOption(RT_WATER_HOOKSHOT_FALLING_PLATFORM_GS) && IsAdult && CanUse(RG_HOOKSHOT));}}),
+                  LocationAccess(RC_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM, {[]{return logic->CanUse(RG_LONGSHOT) || (randoCtx->GetTrickOption(RT_WATER_RANG_FALLING_PLATFORM_GS) && logic->IsChild && logic->CanUse(RG_BOOMERANG)) || (randoCtx->GetTrickOption(RT_WATER_HOOKSHOT_FALLING_PLATFORM_GS) && logic->IsAdult && logic->CanUse(RG_HOOKSHOT));}}),
                 }, {
                   //Exits
-                  Entrance(RR_WATER_TEMPLE_LOBBY,               {[]{return CanUse(RG_HOOKSHOT) && SmallKeys(RR_WATER_TEMPLE, 4);}}),
-                  Entrance(RR_WATER_TEMPLE_DRAGON_PILLARS_ROOM, {[]{return CanUse(RG_HOOKSHOT) && SmallKeys(RR_WATER_TEMPLE, 5);}}),
+                  Entrance(RR_WATER_TEMPLE_LOBBY,               {[]{return logic->CanUse(RG_HOOKSHOT) && logic->SmallKeys(RR_WATER_TEMPLE, 4);}}),
+                  Entrance(RR_WATER_TEMPLE_DRAGON_PILLARS_ROOM, {[]{return logic->CanUse(RG_HOOKSHOT) && logic->SmallKeys(RR_WATER_TEMPLE, 5);}}),
   });
 
   areaTable[RR_WATER_TEMPLE_DRAGON_PILLARS_ROOM] = Area("Water Temple Dragon Pillars Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_WATER_TEMPLE_FALLING_PLATFORM_ROOM, {[]{return CanUseProjectile;}}),
-                  Entrance(RR_WATER_TEMPLE_DARK_LINK_ROOM,        {[]{return CanUse(RG_HOOKSHOT);}}),
+                  Entrance(RR_WATER_TEMPLE_FALLING_PLATFORM_ROOM, {[]{return logic->CanUseProjectile;}}),
+                  Entrance(RR_WATER_TEMPLE_DARK_LINK_ROOM,        {[]{return logic->CanUse(RG_HOOKSHOT);}}),
   });
 
   areaTable[RR_WATER_TEMPLE_DARK_LINK_ROOM] = Area("Water Temple Dark Link Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_WATER_TEMPLE_DRAGON_PILLARS_ROOM, {[]{return CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD);}}),
-                  Entrance(RR_WATER_TEMPLE_LONGSHOT_ROOM,       {[]{return CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD);}}),
+                  Entrance(RR_WATER_TEMPLE_DRAGON_PILLARS_ROOM, {[]{return logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD);}}),
+                  Entrance(RR_WATER_TEMPLE_LONGSHOT_ROOM,       {[]{return logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD);}}),
   });
 
   areaTable[RR_WATER_TEMPLE_LONGSHOT_ROOM] = Area("Water Temple Longshot Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -227,25 +225,25 @@ void AreaTable_Init_WaterTemple() {
                 }, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_DARK_LINK_ROOM, {[]{return true;}}),
-                  Entrance(RR_WATER_TEMPLE_RIVER,          {[]{return IsChild || CanUse(RG_SONG_OF_TIME);}}),
+                  Entrance(RR_WATER_TEMPLE_RIVER,          {[]{return logic->IsChild || logic->CanUse(RG_SONG_OF_TIME);}}),
   });
 
   areaTable[RR_WATER_TEMPLE_RIVER] = Area("Water Temple River", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_WATER_TEMPLE_RIVER_CHEST, {[]{return (CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW)) && (IsAdult || CanUse(RG_HOVER_BOOTS) || CanUse(RG_HOOKSHOT));}}),
-                  LocationAccess(RC_WATER_TEMPLE_GS_RIVER,    {[]{return (CanUse(RG_IRON_BOOTS) && CanUse(RG_HOOKSHOT)) || (randoCtx->GetTrickOption(RT_WATER_RIVER_GS) && CanUse(RG_LONGSHOT));}}),
+                  LocationAccess(RC_WATER_TEMPLE_RIVER_CHEST, {[]{return (logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW)) && (logic->IsAdult || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT));}}),
+                  LocationAccess(RC_WATER_TEMPLE_GS_RIVER,    {[]{return (logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_HOOKSHOT)) || (randoCtx->GetTrickOption(RT_WATER_RIVER_GS) && logic->CanUse(RG_LONGSHOT));}}),
                 }, {
                   //Exits
-                  Entrance(RR_WATER_TEMPLE_DRAGON_ROOM, {[]{return (CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW)) && (IsAdult || CanUse(RG_HOVER_BOOTS) || CanUse(RG_HOOKSHOT));}}),
+                  Entrance(RR_WATER_TEMPLE_DRAGON_ROOM, {[]{return (logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW)) && (logic->IsAdult || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT));}}),
   });
 
   areaTable[RR_WATER_TEMPLE_PRE_BOSS_ROOM] = Area("Water Temple Pre Boss Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&FairyPot, {[]{return true;}}),
+                  EventAccess(&logic->FairyPot, {[]{return true;}}),
                 }, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_LOBBY,     {[]{return true;}}),
-                  Entrance(RR_WATER_TEMPLE_BOSS_ENTRYWAY, {[]{return BossKeyWaterTemple;}}),
+                  Entrance(RR_WATER_TEMPLE_BOSS_ENTRYWAY, {[]{return logic->BossKeyWaterTemple;}}),
   });
   }
 
@@ -256,49 +254,49 @@ void AreaTable_Init_WaterTemple() {
   areaTable[RR_WATER_TEMPLE_MQ_LOBBY] = Area("Water Temple MQ Lobby", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_ENTRYWAY,            {[]{return true;}}),
-                  Entrance(RR_WATER_TEMPLE_MQ_DIVE,             {[]{return IsAdult && WaterTimer >= 24 && CanUse(RG_IRON_BOOTS);}}),
-                  Entrance(RR_WATER_TEMPLE_MQ_DARK_LINK_REGION, {[]{return SmallKeys(RR_WATER_TEMPLE, 1) && IsAdult && CanUse(RG_LONGSHOT) && CanJumpslash && Hearts > 0;}}),
-                  Entrance(RR_WATER_TEMPLE_BOSS_ENTRYWAY,       {[]{return BossKeyWaterTemple && IsAdult && CanJumpslash && CanUse(RG_LONGSHOT);}}),
+                  Entrance(RR_WATER_TEMPLE_MQ_DIVE,             {[]{return logic->IsAdult && logic->WaterTimer >= 24 && logic->CanUse(RG_IRON_BOOTS);}}),
+                  Entrance(RR_WATER_TEMPLE_MQ_DARK_LINK_REGION, {[]{return logic->SmallKeys(RR_WATER_TEMPLE, 1) && logic->IsAdult && logic->CanUse(RG_LONGSHOT) && logic->CanJumpslash && logic->Hearts > 0;}}),
+                  Entrance(RR_WATER_TEMPLE_BOSS_ENTRYWAY,       {[]{return logic->BossKeyWaterTemple && logic->IsAdult && logic->CanJumpslash && logic->CanUse(RG_LONGSHOT);}}),
   });
 
   areaTable[RR_WATER_TEMPLE_MQ_DIVE] = Area("Water Temple MQ Dive", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_WATER_TEMPLE_MQ_MAP_CHEST,            {[]{return HasFireSource && IsAdult && CanUse(RG_HOOKSHOT);}}),
-                  LocationAccess(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST, {[]{return IsAdult && CanUse(RG_ZORA_TUNIC) && CanUse(RG_HOOKSHOT) && ((randoCtx->GetTrickOption(RT_WATER_MQ_CENTRAL_PILLAR) && CanUse(RG_FIRE_ARROWS)) || (CanUse(RG_DINS_FIRE) && CanUse(RG_SONG_OF_TIME)));}}),
-                    //Trick: IsAdult && CanUse(RG_ZORA_TUNIC) && CanUse(RG_HOOKSHOT) && ((LogicWaterMQCentralPillar && CanUse(RG_FIRE_ARROWS)) || (CanUse(RG_DINS_FIRE) && CanUse(RG_SONG_OF_TIME)))
+                  LocationAccess(RC_WATER_TEMPLE_MQ_MAP_CHEST,            {[]{return logic->HasFireSource && logic->IsAdult && logic->CanUse(RG_HOOKSHOT);}}),
+                  LocationAccess(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST, {[]{return logic->IsAdult && logic->CanUse(RG_ZORA_TUNIC) && logic->CanUse(RG_HOOKSHOT) && ((randoCtx->GetTrickOption(RT_WATER_MQ_CENTRAL_PILLAR) && logic->CanUse(RG_FIRE_ARROWS)) || (logic->CanUse(RG_DINS_FIRE) && logic->CanUse(RG_SONG_OF_TIME)));}}),
+                    //Trick: logic->IsAdult && logic->CanUse(RG_ZORA_TUNIC) && logic->CanUse(RG_HOOKSHOT) && ((LogicWaterMQCentralPillar && logic->CanUse(RG_FIRE_ARROWS)) || (logic->CanUse(RG_DINS_FIRE) && logic->CanUse(RG_SONG_OF_TIME)))
   }, {
                   //Exits
-                  Entrance(RR_WATER_TEMPLE_MQ_LOWERED_WATER_LEVELS, {[]{return CanUse(RG_ZELDAS_LULLABY);}}),
+                  Entrance(RR_WATER_TEMPLE_MQ_LOWERED_WATER_LEVELS, {[]{return logic->CanUse(RG_ZELDAS_LULLABY);}}),
   });
 
   areaTable[RR_WATER_TEMPLE_MQ_LOWERED_WATER_LEVELS] = Area("Water Temple MQ Lowered Water Levels", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_WATER_TEMPLE_MQ_COMPASS_CHEST,                {[]{return ((IsAdult && CanUse(RG_FAIRY_BOW)) || CanUse(RG_DINS_FIRE) || Here(RR_WATER_TEMPLE_MQ_LOBBY, []{return IsChild && CanUse(RG_STICKS) && HasExplosives;})) &&
-                    (CanJumpslash || CanUseProjectile);}}),
-                  LocationAccess(RC_WATER_TEMPLE_MQ_LONGSHOT_CHEST,               {[]{return IsAdult && CanUse(RG_HOOKSHOT);}}),
-                  LocationAccess(RC_WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY,          {[]{return CanUse(RG_DINS_FIRE);}}),
-                  LocationAccess(RC_WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH, {[]{return IsAdult && CanUse(RG_LONGSHOT);}}),
+                  LocationAccess(RC_WATER_TEMPLE_MQ_COMPASS_CHEST,                {[]{return ((logic->IsAdult && logic->CanUse(RG_FAIRY_BOW)) || logic->CanUse(RG_DINS_FIRE) || Here(RR_WATER_TEMPLE_MQ_LOBBY, []{return logic->IsChild && logic->CanUse(RG_STICKS) && logic->HasExplosives;})) &&
+                    (logic->CanJumpslash || logic->CanUseProjectile);}}),
+                  LocationAccess(RC_WATER_TEMPLE_MQ_LONGSHOT_CHEST,               {[]{return logic->IsAdult && logic->CanUse(RG_HOOKSHOT);}}),
+                  LocationAccess(RC_WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY,          {[]{return logic->CanUse(RG_DINS_FIRE);}}),
+                  LocationAccess(RC_WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH, {[]{return logic->IsAdult && logic->CanUse(RG_LONGSHOT);}}),
   }, {});
 
   areaTable[RR_WATER_TEMPLE_MQ_DARK_LINK_REGION] = Area("Water Temple MQ Dark Link Region", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&FairyPot, {[]{return true;}}),
-                  EventAccess(&NutPot,   {[]{return true;}}),
+                  EventAccess(&logic->FairyPot, {[]{return true;}}),
+                  EventAccess(&logic->NutPot,   {[]{return true;}}),
   }, {
                   //Locations
-                  LocationAccess(RC_WATER_TEMPLE_MQ_BOSS_KEY_CHEST, {[]{return IsAdult && WaterTimer >= 24 && CanUse(RG_DINS_FIRE) && (randoCtx->GetTrickOption(RT_WATER_DRAGON_JUMP_DIVE) || CanDive || CanUse(RG_IRON_BOOTS));}}),
+                  LocationAccess(RC_WATER_TEMPLE_MQ_BOSS_KEY_CHEST, {[]{return logic->IsAdult && logic->WaterTimer >= 24 && logic->CanUse(RG_DINS_FIRE) && (randoCtx->GetTrickOption(RT_WATER_DRAGON_JUMP_DIVE) || logic->CanDive || logic->CanUse(RG_IRON_BOOTS));}}),
                   LocationAccess(RC_WATER_TEMPLE_MQ_GS_RIVER,       {[]{return true;}}),
   }, {
                   //Exits
-                  Entrance(RR_WATER_TEMPLE_MQ_BASEMENT_GATED_AREAS, {[]{return IsAdult && WaterTimer >= 24 && CanUse(RG_DINS_FIRE) && CanUse(RG_IRON_BOOTS);}}),
+                  Entrance(RR_WATER_TEMPLE_MQ_BASEMENT_GATED_AREAS, {[]{return logic->IsAdult && logic->WaterTimer >= 24 && logic->CanUse(RG_DINS_FIRE) && logic->CanUse(RG_IRON_BOOTS);}}),
   });
 
   areaTable[RR_WATER_TEMPLE_MQ_BASEMENT_GATED_AREAS] = Area("Water Temple MQ Basement Gated Areas", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_WATER_TEMPLE_MQ_FREESTANDING_KEY,         {[]{return HoverBoots || CanUse(RG_SCARECROW) || randoCtx->GetTrickOption(RT_WATER_NORTH_BASEMENT_LEDGE_JUMP);}}),
-                  LocationAccess(RC_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH,     {[]{return CanUse(RG_FIRE_ARROWS) && (HoverBoots || CanUse(RG_SCARECROW));}}),
-                  LocationAccess(RC_WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA, {[]{return randoCtx->GetTrickOption(RT_WATER_MQ_LOCKED_GS) || (SmallKeys(RR_WATER_TEMPLE, 2) && (HoverBoots || CanUse(RG_SCARECROW) || randoCtx->GetTrickOption(RT_WATER_NORTH_BASEMENT_LEDGE_JUMP)) && CanJumpslash);}}),
-                    //Trick: LogicWaterMQLockedGS || (SmallKeys(RR_WATER_TEMPLE, 2) && (HoverBoots || CanUse(RG_SCARECROW) || LogicWaterNorthBasementLedgeJump))
+                  LocationAccess(RC_WATER_TEMPLE_MQ_FREESTANDING_KEY,         {[]{return logic->HoverBoots || logic->CanUse(RG_SCARECROW) || randoCtx->GetTrickOption(RT_WATER_NORTH_BASEMENT_LEDGE_JUMP);}}),
+                  LocationAccess(RC_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH,     {[]{return logic->CanUse(RG_FIRE_ARROWS) && (logic->HoverBoots || logic->CanUse(RG_SCARECROW));}}),
+                  LocationAccess(RC_WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA, {[]{return randoCtx->GetTrickOption(RT_WATER_MQ_LOCKED_GS) || (logic->SmallKeys(RR_WATER_TEMPLE, 2) && (logic->HoverBoots || logic->CanUse(RG_SCARECROW) || randoCtx->GetTrickOption(RT_WATER_NORTH_BASEMENT_LEDGE_JUMP)) && logic->CanJumpslash);}}),
+                    //Trick: LogicWaterMQLockedGS || (logic->SmallKeys(RR_WATER_TEMPLE, 2) && (logic->HoverBoots || logic->CanUse(RG_SCARECROW) || LogicWaterNorthBasementLedgeJump))
   }, {});
   }
 
@@ -318,15 +316,15 @@ void AreaTable_Init_WaterTemple() {
         "Water Temple Boss Room", "Water Temple", RA_NONE, NO_DAY_NIGHT_CYCLE,
         {
             // Events
-            EventAccess(&WaterTempleClear, { [] {
-                return WaterTempleClear || (HasBossSoul(RG_MORPHA_SOUL) &&
-                       (CanUse(RG_HOOKSHOT) && (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD))));
+            EventAccess(&logic->WaterTempleClear, { [] {
+                return logic->WaterTempleClear || (logic->HasBossSoul(RG_MORPHA_SOUL) &&
+                       (logic->CanUse(RG_HOOKSHOT) && (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD))));
             } }),
         },
         {
             // Locations
-            LocationAccess(RC_WATER_TEMPLE_MORPHA_HEART, { [] { return WaterTempleClear; } }),
-            LocationAccess(RC_MORPHA, { [] { return WaterTempleClear; } }),
+            LocationAccess(RC_WATER_TEMPLE_MORPHA_HEART, { [] { return logic->WaterTempleClear; } }),
+            LocationAccess(RC_MORPHA, { [] { return logic->WaterTempleClear; } }),
         },
         {
             // Exits
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
index 6c9dbead6..7e786d4e6 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
@@ -1,51 +1,49 @@
 #include "../location_access.hpp"
-#include "../logic.hpp"
 #include "../../entrance.h"
 
-using namespace Logic;
 using namespace Rando;
 
 void AreaTable_Init_ZorasDomain() {
   areaTable[RR_ZR_FRONT] = Area("ZR Front", "Zora River", RA_ZORAS_RIVER, DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_ZR_GS_TREE, {[]{return IsChild && CanChildAttack;}}),
+                  LocationAccess(RC_ZR_GS_TREE, {[]{return logic->IsChild && logic->CanChildAttack;}}),
                 }, {
                   //Exits
-                  Entrance(RR_ZORAS_RIVER,  {[]{return IsAdult || CanBlastOrSmash;}}),
+                  Entrance(RR_ZORAS_RIVER,  {[]{return logic->IsAdult || logic->CanBlastOrSmash;}}),
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
   });
 
   areaTable[RR_ZORAS_RIVER] = Area("Zora River", "Zora River", RA_ZORAS_RIVER, DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&GossipStoneFairy, {[]{return GossipStoneFairy || CanSummonGossipFairy;}}),
-                  EventAccess(&BeanPlantFairy,   {[]{return BeanPlantFairy   || (CanPlantBean(RR_ZORAS_RIVER) && CanUse(RG_SONG_OF_STORMS));}}),
-                  EventAccess(&ButterflyFairy,   {[]{return ButterflyFairy   || CanUse(RG_STICKS);}}),
-                  EventAccess(&BugShrub,         {[]{return BugShrub         || CanCutShrubs;}}),
+                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CanSummonGossipFairy;}}),
+                  EventAccess(&logic->BeanPlantFairy,   {[]{return logic->BeanPlantFairy   || (CanPlantBean(RR_ZORAS_RIVER) && logic->CanUse(RG_SONG_OF_STORMS));}}),
+                  EventAccess(&logic->ButterflyFairy,   {[]{return logic->ButterflyFairy   || logic->CanUse(RG_STICKS);}}),
+                  EventAccess(&logic->BugShrub,         {[]{return logic->BugShrub         || logic->CanCutShrubs;}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_ZR_MAGIC_BEAN_SALESMAN,               {[]{return IsChild;}}),
-                  LocationAccess(RC_ZR_FROGS_OCARINA_GAME,                {[]{return IsChild && CanUse(RG_ZELDAS_LULLABY) && CanUse(RG_SARIAS_SONG) && CanUse(RG_SUNS_SONG) && CanUse(RG_EPONAS_SONG) && CanUse(RG_SONG_OF_TIME) && CanUse(RG_SONG_OF_STORMS);}}),
-                  LocationAccess(RC_ZR_FROGS_IN_THE_RAIN,                 {[]{return IsChild && CanUse(RG_SONG_OF_STORMS);}}),
-                  LocationAccess(RC_ZR_FROGS_ZELDAS_LULLABY,              {[]{return IsChild && CanUse(RG_ZELDAS_LULLABY);}}),
-                  LocationAccess(RC_ZR_FROGS_EPONAS_SONG,                 {[]{return IsChild && CanUse(RG_EPONAS_SONG);}}),
-                  LocationAccess(RC_ZR_FROGS_SARIAS_SONG,                 {[]{return IsChild && CanUse(RG_SARIAS_SONG);}}),
-                  LocationAccess(RC_ZR_FROGS_SUNS_SONG,                   {[]{return IsChild && CanUse(RG_SUNS_SONG);}}),
-                  LocationAccess(RC_ZR_FROGS_SONG_OF_TIME,                {[]{return IsChild && CanUse(RG_SONG_OF_TIME);}}),
-                  LocationAccess(RC_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH, {[]{return IsChild || CanUse(RG_HOVER_BOOTS) || (IsAdult && randoCtx->GetTrickOption(RT_ZR_LOWER));}}),
-                  LocationAccess(RC_ZR_NEAR_DOMAIN_FREESTANDING_POH,      {[]{return IsChild || CanUse(RG_HOVER_BOOTS) || (IsAdult && randoCtx->GetTrickOption(RT_ZR_UPPER));}}),
-                  LocationAccess(RC_ZR_GS_LADDER,                         {[]{return IsChild && AtNight && CanChildAttack && CanGetNightTimeGS;}}),
-                  LocationAccess(RC_ZR_GS_NEAR_RAISED_GROTTOS,            {[]{return IsAdult && HookshotOrBoomerang && AtNight && CanGetNightTimeGS;}}),
-                  LocationAccess(RC_ZR_GS_ABOVE_BRIDGE,                   {[]{return IsAdult && CanUse(RG_HOOKSHOT) && AtNight && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_ZR_MAGIC_BEAN_SALESMAN,               {[]{return logic->IsChild;}}),
+                  LocationAccess(RC_ZR_FROGS_OCARINA_GAME,                {[]{return logic->IsChild && logic->CanUse(RG_ZELDAS_LULLABY) && logic->CanUse(RG_SARIAS_SONG) && logic->CanUse(RG_SUNS_SONG) && logic->CanUse(RG_EPONAS_SONG) && logic->CanUse(RG_SONG_OF_TIME) && logic->CanUse(RG_SONG_OF_STORMS);}}),
+                  LocationAccess(RC_ZR_FROGS_IN_THE_RAIN,                 {[]{return logic->IsChild && logic->CanUse(RG_SONG_OF_STORMS);}}),
+                  LocationAccess(RC_ZR_FROGS_ZELDAS_LULLABY,              {[]{return logic->IsChild && logic->CanUse(RG_ZELDAS_LULLABY);}}),
+                  LocationAccess(RC_ZR_FROGS_EPONAS_SONG,                 {[]{return logic->IsChild && logic->CanUse(RG_EPONAS_SONG);}}),
+                  LocationAccess(RC_ZR_FROGS_SARIAS_SONG,                 {[]{return logic->IsChild && logic->CanUse(RG_SARIAS_SONG);}}),
+                  LocationAccess(RC_ZR_FROGS_SUNS_SONG,                   {[]{return logic->IsChild && logic->CanUse(RG_SUNS_SONG);}}),
+                  LocationAccess(RC_ZR_FROGS_SONG_OF_TIME,                {[]{return logic->IsChild && logic->CanUse(RG_SONG_OF_TIME);}}),
+                  LocationAccess(RC_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH, {[]{return logic->IsChild || logic->CanUse(RG_HOVER_BOOTS) || (logic->IsAdult && randoCtx->GetTrickOption(RT_ZR_LOWER));}}),
+                  LocationAccess(RC_ZR_NEAR_DOMAIN_FREESTANDING_POH,      {[]{return logic->IsChild || logic->CanUse(RG_HOVER_BOOTS) || (logic->IsAdult && randoCtx->GetTrickOption(RT_ZR_UPPER));}}),
+                  LocationAccess(RC_ZR_GS_LADDER,                         {[]{return logic->IsChild && logic->AtNight && logic->CanChildAttack && logic->CanGetNightTimeGS;}}),
+                  LocationAccess(RC_ZR_GS_NEAR_RAISED_GROTTOS,            {[]{return logic->IsAdult && logic->HookshotOrBoomerang && logic->AtNight && logic->CanGetNightTimeGS;}}),
+                  LocationAccess(RC_ZR_GS_ABOVE_BRIDGE,                   {[]{return logic->IsAdult && logic->CanUse(RG_HOOKSHOT) && logic->AtNight && logic->CanGetNightTimeGS;}}),
                   LocationAccess(RC_ZR_NEAR_GROTTOS_GOSSIP_STONE,         {[]{return true;}}),
                   LocationAccess(RC_ZR_NEAR_DOMAIN_GOSSIP_STONE,          {[]{return true;}}),
                 }, {
                   //Exits
                   Entrance(RR_ZR_FRONT,            {[]{return true;}}),
                   Entrance(RR_ZR_OPEN_GROTTO,      {[]{return true;}}),
-                  Entrance(RR_ZR_FAIRY_GROTTO,     {[]{return Here(RR_ZORAS_RIVER, []{return CanBlastOrSmash;});}}),
-                  Entrance(RR_THE_LOST_WOODS,      {[]{return CanDive || CanUse(RG_IRON_BOOTS);}}),
-                  Entrance(RR_ZR_STORMS_GROTTO,    {[]{return CanOpenStormGrotto;}}),
-                  Entrance(RR_ZR_BEHIND_WATERFALL, {[]{return CanUse(RG_ZELDAS_LULLABY) || (IsChild && randoCtx->GetTrickOption(RT_ZR_CUCCO)) || (IsAdult && CanUse(RG_HOVER_BOOTS) && randoCtx->GetTrickOption(RT_ZR_HOVERS));}}),
+                  Entrance(RR_ZR_FAIRY_GROTTO,     {[]{return Here(RR_ZORAS_RIVER, []{return logic->CanBlastOrSmash;});}}),
+                  Entrance(RR_THE_LOST_WOODS,      {[]{return logic->CanDive || logic->CanUse(RG_IRON_BOOTS);}}),
+                  Entrance(RR_ZR_STORMS_GROTTO,    {[]{return logic->CanOpenStormGrotto;}}),
+                  Entrance(RR_ZR_BEHIND_WATERFALL, {[]{return logic->CanUse(RG_ZELDAS_LULLABY) || (logic->IsChild && randoCtx->GetTrickOption(RT_ZR_CUCCO)) || (logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS) && randoCtx->GetTrickOption(RT_ZR_HOVERS));}}),
   });
 
   areaTable[RR_ZR_BEHIND_WATERFALL] = Area("ZR Behind Waterfall", "Zora River", RA_ZORAS_RIVER, DAY_NIGHT_CYCLE, {}, {}, {
@@ -65,7 +63,7 @@ void AreaTable_Init_ZorasDomain() {
 
   areaTable[RR_ZR_FAIRY_GROTTO] = Area("ZR Fairy Grotto", "ZR Fairy Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Event
-                  EventAccess(&FreeFairies, {[]{return true;}}),
+                  EventAccess(&logic->FreeFairies, {[]{return true;}}),
                 }, {}, {
                   //Exits
                   Entrance(RR_ZORAS_RIVER, {[]{return true;}}),
@@ -73,8 +71,8 @@ void AreaTable_Init_ZorasDomain() {
 
   areaTable[RR_ZR_STORMS_GROTTO] = Area("ZR Storms Grotto", "ZR Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_ZR_DEKU_SCRUB_GROTTO_REAR,  {[]{return CanStunDeku;}}),
-                  LocationAccess(RC_ZR_DEKU_SCRUB_GROTTO_FRONT, {[]{return CanStunDeku;}}),
+                  LocationAccess(RC_ZR_DEKU_SCRUB_GROTTO_REAR,  {[]{return logic->CanStunDeku;}}),
+                  LocationAccess(RC_ZR_DEKU_SCRUB_GROTTO_FRONT, {[]{return logic->CanStunDeku;}}),
                 }, {
                   //Exits
                   Entrance(RR_ZORAS_RIVER, {[]{return true;}}),
@@ -82,33 +80,33 @@ void AreaTable_Init_ZorasDomain() {
 
   areaTable[RR_ZORAS_DOMAIN] = Area("Zoras Domain", "Zoras Domain", RA_ZORAS_DOMAIN, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&EyeballFrogAccess, {[]{return EyeballFrogAccess || (IsAdult && KingZoraThawed && (Eyedrops || EyeballFrog || Prescription || PrescriptionAccess));}}),
-                  EventAccess(&GossipStoneFairy,  {[]{return GossipStoneFairy  || CanSummonGossipFairyWithoutSuns;}}),
-                  EventAccess(&NutPot,            {[]{return true;}}),
-                  EventAccess(&StickPot,          {[]{return StickPot          || IsChild;}}),
-                  EventAccess(&FishGroup,         {[]{return FishGroup         || IsChild;}}),
-                  EventAccess(&KingZoraThawed,    {[]{return KingZoraThawed    || (IsAdult     && BlueFire);}}),
-                  EventAccess(&DeliverLetter,     {[]{return DeliverLetter     || (RutosLetter && IsChild && randoCtx->GetOption(RSK_ZORAS_FOUNTAIN).IsNot(RO_ZF_OPEN));}}),
+                  EventAccess(&logic->EyeballFrogAccess, {[]{return logic->EyeballFrogAccess || (logic->IsAdult && logic->KingZoraThawed && (logic->Eyedrops || logic->EyeballFrog || logic->Prescription || logic->PrescriptionAccess));}}),
+                  EventAccess(&logic->GossipStoneFairy,  {[]{return logic->GossipStoneFairy  || logic->CanSummonGossipFairyWithoutSuns;}}),
+                  EventAccess(&logic->NutPot,            {[]{return true;}}),
+                  EventAccess(&logic->StickPot,          {[]{return logic->StickPot          || logic->IsChild;}}),
+                  EventAccess(&logic->FishGroup,         {[]{return logic->FishGroup         || logic->IsChild;}}),
+                  EventAccess(&logic->KingZoraThawed,    {[]{return logic->KingZoraThawed    || (logic->IsAdult     && logic->BlueFire);}}),
+                  EventAccess(&logic->DeliverLetter,     {[]{return logic->DeliverLetter     || (logic->RutosLetter && logic->IsChild && randoCtx->GetOption(RSK_ZORAS_FOUNTAIN).IsNot(RO_ZF_OPEN));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_ZD_DIVING_MINIGAME,     {[]{return IsChild;}}),
-                  LocationAccess(RC_ZD_CHEST,               {[]{return IsChild && CanUse(RG_STICKS);}}),
-                  LocationAccess(RC_ZD_KING_ZORA_THAWED,    {[]{return KingZoraThawed;}}),
-                  LocationAccess(RC_ZD_TRADE_PRESCRIPTION,  {[]{return KingZoraThawed && Prescription;}}),
-                  LocationAccess(RC_ZD_GS_FROZEN_WATERFALL, {[]{return IsAdult && AtNight && (HookshotOrBoomerang || CanUse(RG_FAIRY_SLINGSHOT) || Bow || (MagicMeter && (CanUse(RG_MASTER_SWORD) || CanUse(RG_KOKIRI_SWORD) || CanUse(RG_BIGGORON_SWORD))) || (randoCtx->GetTrickOption(RT_ZD_GS) && CanJumpslash)) && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_ZD_DIVING_MINIGAME,     {[]{return logic->IsChild;}}),
+                  LocationAccess(RC_ZD_CHEST,               {[]{return logic->IsChild && logic->CanUse(RG_STICKS);}}),
+                  LocationAccess(RC_ZD_KING_ZORA_THAWED,    {[]{return logic->KingZoraThawed;}}),
+                  LocationAccess(RC_ZD_TRADE_PRESCRIPTION,  {[]{return logic->KingZoraThawed && logic->Prescription;}}),
+                  LocationAccess(RC_ZD_GS_FROZEN_WATERFALL, {[]{return logic->IsAdult && logic->AtNight && (logic->HookshotOrBoomerang || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->Bow || (logic->MagicMeter && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BIGGORON_SWORD))) || (randoCtx->GetTrickOption(RT_ZD_GS) && logic->CanJumpslash)) && logic->CanGetNightTimeGS;}}),
                   LocationAccess(RC_ZD_GOSSIP_STONE,        {[]{return true;}}),
                 }, {
                   //Exits
                   Entrance(RR_ZR_BEHIND_WATERFALL, {[]{return true;}}),
-                  Entrance(RR_LAKE_HYLIA,          {[]{return IsChild && (CanDive || CanUse(RG_IRON_BOOTS));}}),
-                  Entrance(RR_ZD_BEHIND_KING_ZORA, {[]{return DeliverLetter || randoCtx->GetOption(RSK_ZORAS_FOUNTAIN).Is(RO_ZF_OPEN) || (randoCtx->GetOption(RSK_ZORAS_FOUNTAIN).Is(RO_ZF_CLOSED_CHILD) && IsAdult) || (randoCtx->GetTrickOption(RT_ZD_KING_ZORA_SKIP) && IsAdult);}}),
-                  Entrance(RR_ZD_SHOP,             {[]{return IsChild || BlueFire;}}),
-                  Entrance(RR_ZD_STORMS_GROTTO,    {[]{return CanOpenStormGrotto;}}),
+                  Entrance(RR_LAKE_HYLIA,          {[]{return logic->IsChild && (logic->CanDive || logic->CanUse(RG_IRON_BOOTS));}}),
+                  Entrance(RR_ZD_BEHIND_KING_ZORA, {[]{return logic->DeliverLetter || randoCtx->GetOption(RSK_ZORAS_FOUNTAIN).Is(RO_ZF_OPEN) || (randoCtx->GetOption(RSK_ZORAS_FOUNTAIN).Is(RO_ZF_CLOSED_CHILD) && logic->IsAdult) || (randoCtx->GetTrickOption(RT_ZD_KING_ZORA_SKIP) && logic->IsAdult);}}),
+                  Entrance(RR_ZD_SHOP,             {[]{return logic->IsChild || logic->BlueFire;}}),
+                  Entrance(RR_ZD_STORMS_GROTTO,    {[]{return logic->CanOpenStormGrotto;}}),
   });
 
   areaTable[RR_ZD_BEHIND_KING_ZORA] = Area("ZD Behind King Zora", "Zoras Domain", RA_ZORAS_DOMAIN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_ZORAS_DOMAIN,   {[]{return DeliverLetter || randoCtx->GetOption(RSK_ZORAS_FOUNTAIN).Is(RO_ZF_OPEN) || (randoCtx->GetOption(RSK_ZORAS_FOUNTAIN).Is(RO_ZF_CLOSED_CHILD) && IsAdult);}}),
+                  Entrance(RR_ZORAS_DOMAIN,   {[]{return logic->DeliverLetter || randoCtx->GetOption(RSK_ZORAS_FOUNTAIN).Is(RO_ZF_OPEN) || (randoCtx->GetOption(RSK_ZORAS_FOUNTAIN).Is(RO_ZF_CLOSED_CHILD) && logic->IsAdult);}}),
                   Entrance(RR_ZORAS_FOUNTAIN, {[]{return true;}}),
   });
 
@@ -129,7 +127,7 @@ void AreaTable_Init_ZorasDomain() {
 
   areaTable[RR_ZD_STORMS_GROTTO] = Area("ZD Storms Grotto", "ZD Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&FreeFairies, {[]{return true;}}),
+                  EventAccess(&logic->FreeFairies, {[]{return true;}}),
                 }, {}, {
                   //Exits
                   Entrance(RR_ZORAS_DOMAIN, {[]{return true;}}),
@@ -137,28 +135,28 @@ void AreaTable_Init_ZorasDomain() {
 
   areaTable[RR_ZORAS_FOUNTAIN] = Area("Zoras Fountain", "Zoras Fountain", RA_ZORAS_FOUNTAIN, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&GossipStoneFairy, {[]{return GossipStoneFairy || CanSummonGossipFairyWithoutSuns;}}),
-                  EventAccess(&ButterflyFairy,   {[]{return ButterflyFairy   || (CanUse(RG_STICKS) && AtDay);}}),
+                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CanSummonGossipFairyWithoutSuns;}}),
+                  EventAccess(&logic->ButterflyFairy,   {[]{return logic->ButterflyFairy   || (logic->CanUse(RG_STICKS) && logic->AtDay);}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_ZF_ICEBERC_FREESTANDING_POH, {[]{return IsAdult;}}),
-                  LocationAccess(RC_ZF_BOTTOM_FREESTANDING_POH,  {[]{return IsAdult && IronBoots && WaterTimer >= 24;}}),
-                  LocationAccess(RC_ZF_GS_TREE,                  {[]{return IsChild;}}),
-                  LocationAccess(RC_ZF_GS_ABOVE_THE_LOG,         {[]{return IsChild && HookshotOrBoomerang && AtNight && CanGetNightTimeGS;}}),
-                  LocationAccess(RC_ZF_GS_HIDDEN_CAVE,           {[]{return CanUse(RG_SILVER_GAUNTLETS) && CanBlastOrSmash && HookshotOrBoomerang && IsAdult && AtNight && CanGetNightTimeGS;}}),
+                  LocationAccess(RC_ZF_ICEBERC_FREESTANDING_POH, {[]{return logic->IsAdult;}}),
+                  LocationAccess(RC_ZF_BOTTOM_FREESTANDING_POH,  {[]{return logic->IsAdult && logic->IronBoots && logic->WaterTimer >= 24;}}),
+                  LocationAccess(RC_ZF_GS_TREE,                  {[]{return logic->IsChild;}}),
+                  LocationAccess(RC_ZF_GS_ABOVE_THE_LOG,         {[]{return logic->IsChild && logic->HookshotOrBoomerang && logic->AtNight && logic->CanGetNightTimeGS;}}),
+                  LocationAccess(RC_ZF_GS_HIDDEN_CAVE,           {[]{return logic->CanUse(RG_SILVER_GAUNTLETS) && logic->CanBlastOrSmash && logic->HookshotOrBoomerang && logic->IsAdult && logic->AtNight && logic->CanGetNightTimeGS;}}),
                   LocationAccess(RC_FAIRY_GOSSIP_STONE,       {[]{return true;}}),
                   LocationAccess(RC_JABU_GOSSIP_STONE,        {[]{return true;}}),
                 }, {
                   //Exits
                   Entrance(RR_ZD_BEHIND_KING_ZORA,       {[]{return true;}}),
-                  Entrance(RR_JABU_JABUS_BELLY_ENTRYWAY, {[]{return (IsChild && Fish);}}),
-                  Entrance(RR_ICE_CAVERN_ENTRYWAY,       {[]{return IsAdult;}}),
-                  Entrance(RR_ZF_GREAT_FAIRY_FOUNTAIN,   {[]{return HasExplosives;}}),
+                  Entrance(RR_JABU_JABUS_BELLY_ENTRYWAY, {[]{return (logic->IsChild && logic->Fish);}}),
+                  Entrance(RR_ICE_CAVERN_ENTRYWAY,       {[]{return logic->IsAdult;}}),
+                  Entrance(RR_ZF_GREAT_FAIRY_FOUNTAIN,   {[]{return logic->HasExplosives;}}),
   });
 
   areaTable[RR_ZF_GREAT_FAIRY_FOUNTAIN] = Area("ZF Great Fairy Fountain", "ZF Great Fairy Fountain", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_ZF_GREAT_FAIRY_REWARD, {[]{return CanUse(RG_ZELDAS_LULLABY);}}),
+                  LocationAccess(RC_ZF_GREAT_FAIRY_REWARD, {[]{return logic->CanUse(RG_ZELDAS_LULLABY);}}),
                 }, {
                   //Exits
                   Entrance(RR_ZORAS_FOUNTAIN, {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/logic.cpp b/soh/soh/Enhancements/randomizer/3drando/logic.cpp
deleted file mode 100644
index bd6508b69..000000000
--- a/soh/soh/Enhancements/randomizer/3drando/logic.cpp
+++ /dev/null
@@ -1,1164 +0,0 @@
-#include "logic.hpp"
-
-#include <algorithm>
-#include <cstdio>
-#include <string>
-#include <string_view>
-#include <vector>
-
-#include "../dungeon.h"
-#include "../context.h"
-
-namespace Logic {
-
-  bool noVariable    = false;
-
-  //Child item logic
-  bool KokiriSword   = false;
-  bool ZeldasLetter  = false;
-  bool WeirdEgg      = false;
-  bool HasBottle     = false;
-  bool Bombchus      = false;
-  bool Bombchus5     = false;
-  bool Bombchus10    = false;
-  bool Bombchus20    = false;
-  bool MagicBean     = false;
-  bool MagicBeanPack = false;
-  bool RutosLetter   = false;
-  bool Boomerang     = false;
-  bool DinsFire      = false;
-  bool FaroresWind   = false;
-  bool NayrusLove    = false;
-  bool LensOfTruth   = false;
-  bool ShardOfAgony  = false;
-  bool SkullMask     = false;
-  bool MaskOfTruth   = false;
-
-  //Adult logic
-  bool Hammer        = false;
-  bool IronBoots     = false;
-  bool HoverBoots    = false;
-  bool MirrorShield  = false;
-  bool GoronTunic    = false;
-  bool ZoraTunic     = false;
-  bool Epona         = false;
-  bool BigPoe        = false;
-  bool GerudoToken   = false;
-  bool FireArrows    = false;
-  bool IceArrows     = false;
-  bool LightArrows   = false;
-  bool MasterSword   = false;
-  bool BiggoronSword = false;
-
-  //Trade Quest
-  bool PocketEgg     = false;
-  bool Cojiro        = false;
-  bool OddMushroom   = false;
-  bool OddPoultice   = false;
-  bool PoachersSaw   = false;
-  bool BrokenSword   = false;
-  bool Prescription  = false;
-  bool EyeballFrog   = false;
-  bool Eyedrops      = false;
-  bool ClaimCheck    = false;
-
-  //Trade Quest Events
-  bool WakeUpAdultTalon   = false;
-  bool CojiroAccess       = false;
-  bool OddMushroomAccess  = false;
-  bool OddPoulticeAccess  = false;
-  bool PoachersSawAccess  = false;
-  bool BrokenSwordAccess  = false;
-  bool PrescriptionAccess = false;
-  bool EyeballFrogAccess  = false;
-  bool EyedropsAccess     = false;
-  bool DisableTradeRevert = false;
-
-  //Songs
-  bool ZeldasLullaby    = false;
-  bool SariasSong       = false;
-  bool SunsSong         = false;
-  bool SongOfStorms     = false;
-  bool EponasSong       = false;
-  bool SongOfTime       = false;
-  bool MinuetOfForest   = false;
-  bool BoleroOfFire     = false;
-  bool SerenadeOfWater  = false;
-  bool RequiemOfSpirit  = false;
-  bool NocturneOfShadow = false;
-  bool PreludeOfLight   = false;
-
-  //Stones and Meddallions
-  bool ForestMedallion = false;
-  bool FireMedallion   = false;
-  bool WaterMedallion  = false;
-  bool SpiritMedallion = false;
-  bool ShadowMedallion = false;
-  bool LightMedallion  = false;
-  bool KokiriEmerald   = false;
-  bool GoronRuby       = false;
-  bool ZoraSapphire    = false;
-
-  //Dungeon Clears
-  bool DekuTreeClear       = false;
-  bool DodongosCavernClear = false;
-  bool JabuJabusBellyClear = false;
-  bool ForestTempleClear   = false;
-  bool FireTempleClear     = false;
-  bool WaterTempleClear    = false;
-  bool SpiritTempleClear   = false;
-  bool ShadowTempleClear   = false;
-
-  //Trial Clears
-  bool ForestTrialClear = false;
-  bool FireTrialClear   = false;
-  bool WaterTrialClear  = false;
-  bool SpiritTrialClear = false;
-  bool ShadowTrialClear = false;
-  bool LightTrialClear  = false;
-
-  //Greg
-  bool Greg = false;
-  bool GregInBridgeLogic = false;
-  bool GregInLacsLogic = false;
-
-  //Progressive Items
-  uint8_t ProgressiveBulletBag  = 0;
-  uint8_t ProgressiveBombBag    = 0;
-  uint8_t ProgressiveMagic      = 0;
-  uint8_t ProgressiveScale      = 0;
-  uint8_t ProgressiveHookshot   = 0;
-  uint8_t ProgressiveBow        = 0;
-  uint8_t ProgressiveWallet     = 0;
-  uint8_t ProgressiveStrength   = 0;
-  uint8_t ProgressiveOcarina    = 0;
-  uint8_t ProgressiveGiantKnife = 0;
-
-  //Logical keysanity
-  bool IsKeysanity = false;
-
-  //Keys
-  uint8_t ForestTempleKeys          = 0;
-  uint8_t FireTempleKeys            = 0;
-  uint8_t WaterTempleKeys           = 0;
-  uint8_t SpiritTempleKeys          = 0;
-  uint8_t ShadowTempleKeys          = 0;
-  uint8_t GanonsCastleKeys          = 0;
-  uint8_t GerudoFortressKeys        = 0;
-  uint8_t GerudoTrainingGroundsKeys = 0;
-  uint8_t BottomOfTheWellKeys       = 0;
-  uint8_t TreasureGameKeys          = 0;
-
-  //Triforce Pieces
-  uint8_t TriforcePieces = 0;
-
-  //Boss Keys
-  bool BossKeyForestTemple = false;
-  bool BossKeyFireTemple   = false;
-  bool BossKeyWaterTemple  = false;
-  bool BossKeySpiritTemple = false;
-  bool BossKeyShadowTemple = false;
-  bool BossKeyGanonsCastle = false;
-
-  //Gold Skulltula Count
-  uint8_t GoldSkulltulaTokens = 0;
-
-  //Bottle Count
-  uint8_t   Bottles    = 0;
-  uint8_t   NumBottles = 0;
-  bool NoBottles  = false;
-
-  //Drops and Bottle Contents Access
-  bool DekuNutDrop      = false;
-  bool NutPot           = false;
-  bool NutCrate         = false;
-  bool DekuBabaNuts     = false;
-  bool DekuStickDrop    = false;
-  bool StickPot         = false;
-  bool DekuBabaSticks   = false;
-  bool BugsAccess       = false;
-  bool BugShrub         = false;
-  bool WanderingBugs    = false;
-  bool BugRock          = false;
-  bool BlueFireAccess   = false;
-  bool FishAccess       = false;
-  bool FishGroup        = false;
-  bool LoneFish         = false;
-  bool FairyAccess      = false;
-  bool GossipStoneFairy = false;
-  bool BeanPlantFairy   = false;
-  bool ButterflyFairy   = false;
-  bool FairyPot         = false;
-  bool FreeFairies      = false;
-  bool FairyPond        = false;
-  bool BombchuDrop      = false;
-  bool AmmoCanDrop      = false;
-
-  bool BuyBombchus      = false;
-  bool BuySeed          = false;
-  bool BuyArrow         = false;
-  bool BuyBomb          = false;
-  bool BuyMagicPotion        = false;
-  bool MagicRefill      = false;
-
-  uint8_t   PieceOfHeart     = 0;
-  uint8_t   HeartContainer   = 0;
-  bool DoubleDefense    = false;
-
-  /* --- HELPERS, EVENTS, AND LOCATION ACCESS --- */
-  /* These are used to simplify reading the logic, but need to be updated
-  /  every time a base value is updated.                       */
-
-  bool Slingshot        = false;
-  bool Ocarina          = false;
-  bool OcarinaOfTime    = false;
-  bool BombBag          = false;
-  bool MagicMeter       = false;
-  bool Hookshot         = false;
-  bool Longshot         = false;
-  bool Bow              = false;
-  bool GoronBracelet    = false;
-  bool SilverGauntlets  = false;
-  bool GoldenGauntlets  = false;
-  bool SilverScale      = false;
-  bool GoldScale        = false;
-  bool AdultsWallet     = false;
-
-  bool ChildScarecrow   = false;
-  bool AdultScarecrow   = false;
-  bool ScarecrowSong    = false;
-  bool Scarecrow        = false;
-  bool DistantScarecrow = false;
-
-  bool Bombs            = false;
-  bool DekuShield       = false;
-  bool HylianShield     = false;
-  bool Nuts             = false;
-  bool Sticks           = false;
-  bool Bugs             = false;
-  bool BlueFire         = false;
-  bool Fish             = false;
-  bool Fairy            = false;
-  bool BottleWithBigPoe = false;
-
-  bool OcarinaAButton      = false;
-  bool OcarinaCLeftButton  = false;
-  bool OcarinaCRightButton = false;
-  bool OcarinaCUpButton    = false;
-  bool OcarinaCDownButton  = false;
-
-  bool FoundBombchus    = false;
-  bool CanPlayBowling   = false;
-  bool HasBombchus      = false;
-  bool HasExplosives    = false;
-  bool HasBoots         = false;
-  bool IsChild          = false;
-  bool IsAdult          = false;
-  bool IsGlitched       = false;
-  bool CanBlastOrSmash  = false;
-  bool CanChildAttack   = false;
-  bool CanChildDamage   = false;
-  bool CanAdultAttack   = false;
-  bool CanAdultDamage   = false;
-  bool CanCutShrubs     = false;
-  bool CanDive          = false;
-  bool CanLeaveForest   = false;
-  bool CanPlantBugs     = false;
-  bool CanRideEpona     = false;
-  bool CanStunDeku      = false;
-  bool CanSummonGossipFairy = false;
-  bool CanSummonGossipFairyWithoutSuns = false;
-  bool NeedNayrusLove      = false;
-  bool CanSurviveDamage    = false;
-  bool CanTakeDamage       = false;
-  bool CanTakeDamageTwice  = false;
-  //bool CanPlantBean        = false;
-  bool CanOpenBombGrotto   = false;
-  bool CanOpenStormGrotto  = false;
-  bool BigPoeKill          = false;
-  bool HookshotOrBoomerang = false;
-  bool CanGetNightTimeGS   = false;
-
-  uint8_t   OcarinaButtons  = 0;
-  uint8_t   BaseHearts      = 0;
-  uint8_t   Hearts          = 0;
-  uint8_t   Multiplier      = 0;
-  uint8_t   EffectiveHealth = 0;
-  uint8_t   FireTimer       = 0;
-  uint8_t   WaterTimer      = 0;
-
-  bool GuaranteeTradePath     = false;
-  bool GuaranteeHint          = false;
-  bool HasFireSource          = false;
-  bool HasFireSourceWithTorch = false;
-
-  bool CanFinishGerudoFortress = false;
-
-  bool HasShield          = false;
-  bool CanShield          = false;
-  bool ChildShield        = false;
-  bool AdultReflectShield = false;
-  bool AdultShield        = false;
-  bool CanShieldFlick     = false;
-  bool CanJumpslash       = false;
-  bool CanUseProjectile   = false;
-  bool CanUseMagicArrow   = false;
-
-  //Bridge and LACS Requirements
-  uint8_t StoneCount              = 0;
-  uint8_t MedallionCount          = 0;
-  uint8_t DungeonCount            = 0;
-  bool HasAllStones          = false;
-  bool HasAllMedallions      = false;
-  bool CanBuildRainbowBridge = false;
-  bool BuiltRainbowBridge    = false;
-  bool CanTriggerLACS        = false;
-
-  //Other
-  bool AtDay         = false;
-  bool AtNight       = false;
-  uint8_t Age             = 0;
-  bool CanCompleteTriforce = false;
-
-  bool CanSummonGohma        = false;
-  bool CanSummonKingDodongo  = false;
-  bool CanSummonBarinade     = false;
-  bool CanSummonPhantomGanon = false;
-  bool CanSummonVolvagia     = false;
-  bool CanSummonMorpha       = false;
-  bool CanSummonBongoBongo   = false;
-  bool CanSummonTwinrova     = false;
-  bool CanSummonGanon        = false;
-
-  //Events
-  bool ShowedMidoSwordAndShield  = false;
-  bool CarpenterRescue           = false;
-  bool GF_GateOpen               = false;
-  bool GtG_GateOpen              = false;
-  bool DampesWindmillAccess      = false;
-  bool DrainWell                 = false;
-  bool GoronCityChildFire        = false;
-  bool GCWoodsWarpOpen           = false;
-  bool GCDaruniasDoorOpenChild   = false;
-  bool StopGCRollingGoronAsAdult = false;
-  bool WaterTempleLow            = false;
-  bool WaterTempleMiddle         = false;
-  bool WaterTempleHigh           = false;
-  bool KakarikoVillageGateOpen   = false;
-  bool KingZoraThawed            = false;
-  bool ForestTempleJoelle        = false;
-  bool ForestTempleBeth          = false;
-  bool ForestTempleJoAndBeth     = false;
-  bool ForestTempleAmy           = false;
-  bool ForestTempleMeg           = false;
-  bool ForestTempleAmyAndMeg     = false;
-  bool FireLoopSwitch            = false;
-  bool LinksCow                  = false;
-  bool AtDampeTime               = false;
-  bool DeliverLetter             = false;
-  bool TimeTravel                = false;
-
-  /* --- END OF HELPERS AND LOCATION ACCESS --- */
-
-  //Placement Tracking
-  uint8_t AddedProgressiveBulletBags = 0;
-  uint8_t AddedProgressiveBombBags   = 0;
-  uint8_t AddedProgressiveMagics     = 0;
-  uint8_t AddedProgressiveScales     = 0;
-  uint8_t AddedProgressiveHookshots  = 0;
-  uint8_t AddedProgressiveBows       = 0;
-  uint8_t AddedProgressiveWallets    = 0;
-  uint8_t AddedProgressiveStrengths  = 0;
-  uint8_t AddedProgressiveOcarinas   = 0;
-  uint8_t TokensInPool               = 0;
-
-  //Event checking past
-  bool DrainWellPast            = false;
-  bool DampesWindmillAccessPast = false;
-  bool DekuTreeClearPast        = false;
-  bool GoronRubyPast            = false;
-  bool ZoraSapphirePast         = false;
-  bool ForestTrialClearPast     = false;
-  bool FireTrialClearPast       = false;
-  bool WaterTrialClearPast      = false;
-  bool SpiritTrialClearPast     = false;
-  bool ShadowTrialClearPast     = false;
-  bool LightTrialClearPast      = false;
-  bool BuyDekuShieldPast        = false;
-  bool TimeTravelPast           = false;
-
-  static bool IsMagicItem(RandomizerGet item) {
-    return item == RG_DINS_FIRE    ||
-           item == RG_FARORES_WIND ||
-           item == RG_NAYRUS_LOVE  ||
-           item == RG_LENS_OF_TRUTH;
-  }
-
-  static bool IsMagicArrow(RandomizerGet item) {
-    return item == RG_FIRE_ARROWS ||
-           item == RG_ICE_ARROWS  ||
-           item == RG_LIGHT_ARROWS;
-  }
-
-  bool HasItem(RandomizerGet itemName) {
-    return (itemName == RG_DINS_FIRE              && DinsFire)            ||
-           (itemName == RG_FARORES_WIND           && FaroresWind)         ||
-           (itemName == RG_NAYRUS_LOVE            && NayrusLove)          ||
-           (itemName == RG_LENS_OF_TRUTH          && LensOfTruth)         ||
-           (itemName == RG_FAIRY_BOW              && Bow)                 ||
-           (itemName == RG_MEGATON_HAMMER         && Hammer)              ||
-           (itemName == RG_IRON_BOOTS             && IronBoots)           ||
-           (itemName == RG_HOVER_BOOTS            && HoverBoots)          ||
-           (itemName == RG_HOOKSHOT               && Hookshot)            ||
-           (itemName == RG_LONGSHOT               && Longshot)            ||
-           (itemName == RG_SILVER_GAUNTLETS       && SilverGauntlets)     ||
-           (itemName == RG_GOLDEN_GAUNTLETS       && GoldenGauntlets)     ||
-           (itemName == RG_GORON_TUNIC            && GoronTunic)          ||
-           (itemName == RG_ZORA_TUNIC             && ZoraTunic)           ||
-           (itemName == RG_SCARECROW              && Scarecrow)           ||
-           (itemName == RG_DISTANT_SCARECROW      && DistantScarecrow)    ||
-           (itemName == RG_HYLIAN_SHIELD          && HylianShield)        ||
-           (itemName == RG_MIRROR_SHIELD          && MirrorShield)        ||
-           (itemName == RG_MASTER_SWORD           && MasterSword)         ||
-           (itemName == RG_BIGGORON_SWORD         && BiggoronSword)       ||
-           (itemName == RG_FAIRY_SLINGSHOT        && Slingshot)           ||
-           (itemName == RG_BOOMERANG              && Boomerang)           ||
-           (itemName == RG_KOKIRI_SWORD           && KokiriSword)         ||
-           (itemName == RG_STICKS                 && Sticks)              ||
-           (itemName == RG_DEKU_SHIELD            && DekuShield)          ||
-           (itemName == RG_FIRE_ARROWS            && FireArrows)          ||
-           (itemName == RG_ICE_ARROWS             && IceArrows)           ||
-           (itemName == RG_LIGHT_ARROWS           && LightArrows)         ||
-           (itemName == RG_OCARINA_A_BUTTON       && OcarinaAButton)      ||
-           (itemName == RG_OCARINA_C_LEFT_BUTTON  && OcarinaCLeftButton)  ||
-           (itemName == RG_OCARINA_C_RIGHT_BUTTON && OcarinaCRightButton) ||
-           (itemName == RG_OCARINA_C_DOWN_BUTTON  && OcarinaCDownButton)  ||
-           (itemName == RG_OCARINA_C_UP_BUTTON    && OcarinaCUpButton)    ||
-           (itemName == RG_ZELDAS_LULLABY         && ZeldasLullaby)       ||
-           (itemName == RG_EPONAS_SONG            && EponasSong)          ||
-           (itemName == RG_SARIAS_SONG            && SariasSong)          ||
-           (itemName == RG_SUNS_SONG              && SunsSong)            ||
-           (itemName == RG_SONG_OF_TIME           && SongOfTime)          ||
-           (itemName == RG_SONG_OF_STORMS         && SongOfStorms)        ||
-           (itemName == RG_MINUET_OF_FOREST       && MinuetOfForest)      ||
-           (itemName == RG_BOLERO_OF_FIRE         && BoleroOfFire)        ||
-           (itemName == RG_SERENADE_OF_WATER      && SerenadeOfWater)     ||
-           (itemName == RG_REQUIEM_OF_SPIRIT      && RequiemOfSpirit)     ||
-           (itemName == RG_NOCTURNE_OF_SHADOW     && NocturneOfShadow)    ||
-           (itemName == RG_PRELUDE_OF_LIGHT       && PreludeOfLight);
-  }
-
-  //Can the passed in item be used?
-  bool CanUse(RandomizerGet itemName) {
-    if (!HasItem(itemName))
-      return false;
-
-    switch (itemName) {
-      // Adult items
-      // TODO: Uncomment those if we ever implement more item usability settings
-      case RG_FAIRY_BOW:               return IsAdult;// || BowAsChild;
-      case RG_MEGATON_HAMMER:    return IsAdult;// || HammerAsChild;
-      case RG_IRON_BOOTS:        return IsAdult;// || IronBootsAsChild;
-      case RG_HOVER_BOOTS:       return IsAdult;// || HoverBootsAsChild;
-      case RG_HOOKSHOT:          return IsAdult;// || HookshotAsChild;
-      case RG_LONGSHOT:          return IsAdult;// || HookshotAsChild;
-      case RG_SILVER_GAUNTLETS:  return IsAdult;
-      case RG_GOLDEN_GAUNTLETS:  return IsAdult;
-      case RG_GORON_TUNIC:       return IsAdult;// || GoronTunicAsChild;
-      case RG_ZORA_TUNIC:        return IsAdult;// || ZoraTunicAsChild;
-      case RG_SCARECROW:         return IsAdult;// || HookshotAsChild;
-      case RG_DISTANT_SCARECROW: return IsAdult;// || HookshotAsChild;
-      case RG_HYLIAN_SHIELD:     return IsAdult;
-      case RG_MIRROR_SHIELD:     return IsAdult;// || MirrorShieldAsChild;
-      case RG_MASTER_SWORD:      return IsAdult;// || MasterSwordAsChild;
-      case RG_BIGGORON_SWORD:    return IsAdult;// || BiggoronSwordAsChild;
-
-      // Child items
-      case RG_FAIRY_SLINGSHOT:         return IsChild;// || SlingshotAsAdult;
-      case RG_BOOMERANG:         return IsChild;// || BoomerangAsAdult;
-      case RG_KOKIRI_SWORD:      return IsChild;// || KokiriSwordAsAdult;
-      case RG_STICKS:            return IsChild;// || StickAsAdult;
-      case RG_DEKU_SHIELD:       return IsChild;// || DekuShieldAsAdult;
-
-      // Songs
-      case RG_ZELDAS_LULLABY:     return Ocarina && OcarinaCLeftButton && OcarinaCRightButton && OcarinaCUpButton;
-      case RG_EPONAS_SONG:        return Ocarina && OcarinaCLeftButton && OcarinaCRightButton && OcarinaCUpButton;
-      case RG_SARIAS_SONG:        return Ocarina && OcarinaCLeftButton && OcarinaCRightButton && OcarinaCDownButton;
-      case RG_SUNS_SONG:          return Ocarina && OcarinaCRightButton && OcarinaCUpButton && OcarinaCDownButton;
-      case RG_SONG_OF_TIME:       return Ocarina && OcarinaAButton && OcarinaCRightButton && OcarinaCDownButton;
-      case RG_SONG_OF_STORMS:     return Ocarina && OcarinaAButton && OcarinaCUpButton && OcarinaCDownButton;
-      case RG_MINUET_OF_FOREST:   return Ocarina && OcarinaAButton && OcarinaCLeftButton && OcarinaCRightButton && OcarinaCUpButton;
-      case RG_BOLERO_OF_FIRE:     return Ocarina && OcarinaAButton && OcarinaCRightButton && OcarinaCDownButton;
-      case RG_SERENADE_OF_WATER:  return Ocarina && OcarinaAButton && OcarinaCLeftButton && OcarinaCRightButton && OcarinaCDownButton;
-      case RG_REQUIEM_OF_SPIRIT:  return Ocarina && OcarinaAButton && OcarinaCRightButton && OcarinaCDownButton;
-      case RG_NOCTURNE_OF_SHADOW: return Ocarina && OcarinaAButton && OcarinaCLeftButton && OcarinaCRightButton && OcarinaCDownButton;
-      case RG_PRELUDE_OF_LIGHT:   return Ocarina && OcarinaCLeftButton && OcarinaCRightButton && OcarinaCUpButton;
-
-      // Magic items
-      default: return MagicMeter && (IsMagicItem(itemName) || (IsMagicArrow(itemName) && CanUse(RG_FAIRY_BOW)));
-    }
-  }
-
-  bool HasProjectile(HasProjectileAge age) {
-    return HasExplosives ||
-           (age == HasProjectileAge::Child  && (Slingshot || Boomerang)) ||
-           (age == HasProjectileAge::Adult  && (Hookshot  || Bow      )) ||
-           (age == HasProjectileAge::Both   && (Slingshot || Boomerang)  && (Hookshot || Bow)) ||
-           (age == HasProjectileAge::Either && (Slingshot || Boomerang   ||  Hookshot || Bow));
-  }
-
-  bool HasBossSoul(RandomizerGet itemName) {
-    auto ctx = Rando::Context::GetInstance();
-    if (!ctx->GetOption(RSK_SHUFFLE_BOSS_SOULS)) {
-      return true;
-    }
-    switch(itemName) {
-      case RG_GOHMA_SOUL:
-        return CanSummonGohma; break;
-      case RG_KING_DODONGO_SOUL:
-        return CanSummonKingDodongo; break;
-      case RG_BARINADE_SOUL:
-        return CanSummonBarinade; break;
-      case RG_PHANTOM_GANON_SOUL:
-        return CanSummonPhantomGanon; break;
-      case RG_VOLVAGIA_SOUL:
-        return CanSummonVolvagia; break;
-      case RG_MORPHA_SOUL:
-        return CanSummonMorpha; break;
-      case RG_BONGO_BONGO_SOUL:
-        return CanSummonBongoBongo; break;
-      case RG_TWINROVA_SOUL:
-        return CanSummonTwinrova; break;
-      case RG_GANON_SOUL:
-        return ctx->GetOption(RSK_SHUFFLE_BOSS_SOULS).Is(RO_BOSS_SOULS_ON_PLUS_GANON) ? CanSummonGanon : true;
-        break;
-      default: break;
-    }
-  }
-
-  uint8_t GetDifficultyValueFromString(Rando::Option& glitchOption) {
-    return 0;
-  }
-
-//todo rewrite glitch section
-
-  bool CanEquipSwap(RandomizerGet itemName) {
-    if (!HasItem(itemName))
-      return false;
-    
-    if (CanDoGlitch(GlitchType::EquipSwapDins) || CanDoGlitch(GlitchType::EquipSwap))
-      return true;
-
-    return false;
-  }
-
-  bool CanDoGlitch(GlitchType glitch) {
-    // TODO: Uncomment when glitches are implemented
-    switch(glitch) {
-      case GlitchType::EquipSwapDins:
-        return ((IsAdult && HasItem(RG_DINS_FIRE)) || (IsChild && (HasItem(RG_STICKS) || HasItem(RG_DINS_FIRE)))) && false;//GlitchEquipSwapDins;
-      case GlitchType::EquipSwap: // todo: add bunny hood to adult item equippable list and child trade item to child item equippable list
-        return ((IsAdult && (HasItem(RG_DINS_FIRE) || HasItem(RG_FARORES_WIND) || HasItem(RG_NAYRUS_LOVE))) || (IsChild && (HasItem(RG_STICKS) || HasItem(RG_FAIRY_SLINGSHOT) || HasItem(RG_BOOMERANG) || HasBottle || Nuts || Ocarina || HasItem(RG_LENS_OF_TRUTH) || HasExplosives || (MagicBean || MagicBeanPack) || HasItem(RG_DINS_FIRE) || HasItem(RG_FARORES_WIND) || HasItem(RG_NAYRUS_LOVE)))) && false;//GlitchEquipSwap;
-    }
-
-    //Shouldn't be reached
-    return false;
-  }
-
-  //Updates all logic helpers. Should be called whenever a non-helper is changed
-  void UpdateHelpers() {
-    auto ctx = Rando::Context::GetInstance();
-    OcarinaButtons  = (OcarinaAButton ? 1 : 0) +
-                      (OcarinaCLeftButton ? 1 : 0) +
-                      (OcarinaCRightButton ? 1 : 0) +
-                      (OcarinaCUpButton ? 1 : 0) +
-                      (OcarinaCDownButton ? 1 : 0);
-    NumBottles      = ((NoBottles) ? 0 : (Bottles + ((DeliverLetter) ? 1 : 0)));
-    HasBottle       = NumBottles >= 1;
-    Slingshot       = (ProgressiveBulletBag >= 1) && (BuySeed || AmmoCanDrop);
-    Ocarina         = ProgressiveOcarina    >= 1;
-    OcarinaOfTime   = ProgressiveOcarina    >= 2;
-    MagicMeter      = (ProgressiveMagic     >= 1) && (AmmoCanDrop || (HasBottle && (BuyMagicPotion)));
-    BombBag         = (ProgressiveBombBag   >= 1) && (BuyBomb || AmmoCanDrop);
-    Hookshot        = ProgressiveHookshot   >= 1;
-    Longshot        = ProgressiveHookshot   >= 2;
-    Bow             = (ProgressiveBow       >= 1) && (BuyArrow || AmmoCanDrop);
-    GoronBracelet   = ProgressiveStrength   >= 1;
-    SilverGauntlets = ProgressiveStrength   >= 2;
-    GoldenGauntlets = ProgressiveStrength   >= 3;
-    SilverScale     = ProgressiveScale      >= 1;
-    GoldScale       = ProgressiveScale      >= 2;
-    AdultsWallet    = ProgressiveWallet     >= 1;
-    BiggoronSword   = BiggoronSword || ProgressiveGiantKnife >= 2;
-
-    //you need at least 2 buttons for scarecrow song
-    ScarecrowSong    = ScarecrowSong || (ctx->GetOption(RSK_SKIP_SCARECROWS_SONG) && Ocarina && OcarinaButtons >= 2) || (ChildScarecrow && AdultScarecrow);
-    Scarecrow        = Hookshot && ScarecrowSong;
-    DistantScarecrow = Longshot && ScarecrowSong;
-
-    //Drop Access
-    DekuStickDrop = StickPot || DekuBabaSticks;
-    DekuNutDrop   = (NutPot  || NutCrate         || DekuBabaNuts) && AmmoCanDrop;
-    BugsAccess    = BugShrub || WanderingBugs    || BugRock;
-    FishAccess    = LoneFish || FishGroup;
-    FairyAccess   = FairyPot || GossipStoneFairy || BeanPlantFairy || ButterflyFairy || FreeFairies || FairyPond;
-
-
-    //refills
-    Bombs        = BombBag;
-    Nuts         = DekuNutDrop || Nuts;
-    Sticks       = DekuStickDrop || Sticks;
-    Bugs         = HasBottle && BugsAccess;
-    BlueFire     = (HasBottle && BlueFireAccess) || (ctx->GetOption(RSK_BLUE_FIRE_ARROWS) && CanUse(RG_ICE_ARROWS));
-    Fish         = HasBottle && FishAccess;
-    Fairy        = HasBottle && FairyAccess;
-
-    FoundBombchus   = (BombchuDrop || Bombchus || Bombchus5 || Bombchus10 || Bombchus20);
-    CanPlayBowling  = (ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && FoundBombchus) || (!ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && BombBag);
-    // TODO: Implement Ammo Drop Setting in place of bombchu drops
-    HasBombchus     = (BuyBombchus || (ctx->GetOption(RSK_ENABLE_BOMBCHU_DROPS).Is(RO_AMMO_DROPS_ON/*_PLUS_BOMBCHU*/) && FoundBombchus));
-
-    HasExplosives =  Bombs || (ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && HasBombchus);
-
-    HasBoots = IronBoots || HoverBoots;
-
-    //Unshuffled adult trade quest
-    Eyedrops     = Eyedrops     || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && ClaimCheck);
-    EyeballFrog  = EyeballFrog  || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && Eyedrops);
-    Prescription = Prescription || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && EyeballFrog);
-    BrokenSword  = BrokenSword  || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && Prescription);
-    PoachersSaw  = PoachersSaw  || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && BrokenSword);
-    OddPoultice  = OddPoultice  || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && PoachersSaw);
-    OddMushroom  = OddMushroom  || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && OddPoultice);
-    Cojiro       = Cojiro       || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && OddMushroom);
-    PocketEgg    = PocketEgg    || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && Cojiro);
-
-    // IsChild = Age == AGE_CHILD;
-    // IsAdult = Age == AGE_ADULT;
-
-    CanBlastOrSmash = HasExplosives || CanUse(RG_MEGATON_HAMMER);
-    CanChildAttack  = IsChild && (Slingshot || Boomerang || Sticks || KokiriSword || HasExplosives || CanUse(RG_DINS_FIRE) || CanUse(RG_MASTER_SWORD) || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_BIGGORON_SWORD));
-    CanChildDamage  = IsChild && (Slingshot ||              Sticks || KokiriSword || HasExplosives || CanUse(RG_DINS_FIRE) || CanUse(RG_MASTER_SWORD) || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_BIGGORON_SWORD));
-    CanAdultAttack  = IsAdult && (CanUse(RG_FAIRY_BOW) || CanUse(RG_BOOMERANG)       || CanUse(RG_STICKS) || CanUse(RG_KOKIRI_SWORD) || HasExplosives || CanUse(RG_DINS_FIRE) || MasterSword || Hammer || BiggoronSword || Hookshot);
-    CanAdultDamage  = IsAdult && (CanUse(RG_FAIRY_BOW) || CanUse(RG_STICKS)          || CanUse(RG_KOKIRI_SWORD) || HasExplosives || CanUse(RG_DINS_FIRE) || MasterSword || Hammer || BiggoronSword);
-    CanStunDeku     = CanAdultAttack || CanChildAttack || Nuts || HasShield;
-    CanCutShrubs    = CanUse(RG_KOKIRI_SWORD) || CanUse(RG_BOOMERANG) || HasExplosives || CanUse(RG_MASTER_SWORD) || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_BIGGORON_SWORD);
-    CanDive         = ProgressiveScale >= 1;
-    CanLeaveForest  = ctx->GetOption(RSK_FOREST).IsNot(RO_FOREST_CLOSED) || IsAdult || DekuTreeClear || ctx->GetOption(RSK_SHUFFLE_INTERIOR_ENTRANCES) || ctx->GetOption(RSK_SHUFFLE_OVERWORLD_ENTRANCES);
-    CanPlantBugs    = IsChild && Bugs;
-    CanRideEpona    = IsAdult && Epona && CanUse(RG_EPONAS_SONG);
-    CanSummonGossipFairyWithoutSuns = CanUse(RG_ZELDAS_LULLABY) || CanUse(RG_EPONAS_SONG) || CanUse(RG_SONG_OF_TIME);
-    CanSummonGossipFairy            = CanSummonGossipFairyWithoutSuns || CanUse(RG_SUNS_SONG);
-    Hearts          = BaseHearts + HeartContainer + (PieceOfHeart >> 2);
-    EffectiveHealth = ((Hearts << (2 + DoubleDefense)) >> Multiplier) + ((Hearts << (2 + DoubleDefense)) % (1 << Multiplier) > 0); //Number of half heart hits to die, ranges from 1 to 160
-    FireTimer       = CanUse(RG_GORON_TUNIC) ? 255 : (ctx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS)) ? (Hearts * 8) : 0;
-    WaterTimer      = CanUse(RG_ZORA_TUNIC) ? 255 : (ctx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS)) ? (Hearts * 8) : 0;
-    NeedNayrusLove      = (EffectiveHealth == 1);
-    CanSurviveDamage    = !NeedNayrusLove || CanUse(RG_NAYRUS_LOVE);
-    CanTakeDamage       = Fairy || CanSurviveDamage;
-    CanTakeDamageTwice  = (Fairy && NumBottles >= 2) || ((EffectiveHealth == 2) && (CanUse(RG_NAYRUS_LOVE) || Fairy)) || (EffectiveHealth > 2);
-    //CanPlantBean        = IsChild && (MagicBean || MagicBeanPack);
-    CanOpenBombGrotto   = CanBlastOrSmash       && (ShardOfAgony || ctx->GetTrickOption(RT_GROTTOS_WITHOUT_AGONY));
-    CanOpenStormGrotto  = CanUse(RG_SONG_OF_STORMS) && (ShardOfAgony || ctx->GetTrickOption(RT_GROTTOS_WITHOUT_AGONY));
-    HookshotOrBoomerang = CanUse(RG_HOOKSHOT) || CanUse(RG_BOOMERANG);
-    CanGetNightTimeGS   = (CanUse(RG_SUNS_SONG) || !ctx->GetOption(RSK_SKULLS_SUNS_SONG));
-
-    GuaranteeTradePath     = ctx->GetOption(RSK_SHUFFLE_INTERIOR_ENTRANCES) || ctx->GetOption(RSK_SHUFFLE_OVERWORLD_ENTRANCES) || ctx->GetTrickOption(RT_DMT_BOLERO_BIGGORON) || CanBlastOrSmash || StopGCRollingGoronAsAdult;
-  //GuaranteeHint          = (hints == "Mask" && MaskofTruth) || (hints == "Agony") || (hints != "Mask" && hints != "Agony");
-    HasFireSource          = CanUse(RG_DINS_FIRE) || CanUse(RG_FIRE_ARROWS);
-    HasFireSourceWithTorch = HasFireSource || CanUse(RG_STICKS);
-
-    //Gerudo Fortress
-    CanFinishGerudoFortress = (ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_NORMAL)    && GerudoFortressKeys >= 4 && (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) && (GerudoToken || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_HOVER_BOOTS) || ctx->GetTrickOption(RT_GF_KITCHEN))) ||
-                              (ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_FAST)      && GerudoFortressKeys >= 1 && (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD))) ||
-                              (ctx->GetOption(RSK_GERUDO_FORTRESS).IsNot(RO_GF_NORMAL) && ctx->GetOption(RSK_GERUDO_FORTRESS).IsNot(RO_GF_FAST));
-
-    HasShield          = CanUse(RG_HYLIAN_SHIELD) || CanUse(RG_DEKU_SHIELD); //Mirror shield can't reflect attacks
-    CanShield          = CanUse(RG_MIRROR_SHIELD) || HasShield;
-    ChildShield        = IsChild && CanUse(RG_DEKU_SHIELD); //hylian shield is not helpful for child
-    AdultReflectShield = IsAdult && CanUse(RG_HYLIAN_SHIELD); //Mirror shield can't reflect attacks
-    AdultShield        = IsAdult && (CanUse(RG_HYLIAN_SHIELD) || CanUse(RG_MIRROR_SHIELD));
-    CanShieldFlick     = ChildShield || AdultShield;
-    CanJumpslash       = CanUse(RG_STICKS) || CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD); // Not including hammer as hammer jump attacks can be weird
-    CanUseProjectile   = HasExplosives || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOOMERANG);
-    CanUseMagicArrow   = CanUse(RG_FIRE_ARROWS) || CanUse(RG_ICE_ARROWS) || CanUse(RG_LIGHT_ARROWS);
-
-    //Bridge and LACS Requirements
-    MedallionCount        = (ForestMedallion ? 1:0) + (FireMedallion ? 1:0) + (WaterMedallion ? 1:0) + (SpiritMedallion ? 1:0) + (ShadowMedallion ? 1:0) + (LightMedallion ? 1:0);
-    StoneCount            = (KokiriEmerald ? 1:0) + (GoronRuby ? 1:0) + (ZoraSapphire ? 1:0);
-    DungeonCount          = (DekuTreeClear ? 1:0) + (DodongosCavernClear ? 1:0) + (JabuJabusBellyClear ? 1:0) + (ForestTempleClear ? 1:0) + (FireTempleClear ? 1:0) + (WaterTempleClear ? 1:0) + (SpiritTempleClear ? 1:0) + (ShadowTempleClear ? 1:0);
-    HasAllStones          = StoneCount == 3;
-    HasAllMedallions      = MedallionCount == 6;
-    GregInBridgeLogic     = ctx->GetOption(RSK_BRIDGE_OPTIONS).Is(RO_BRIDGE_GREG);
-    GregInLacsLogic       = ctx->GetOption(RSK_LACS_OPTIONS).Is(RO_LACS_GREG_REWARD);
-
-    CanBuildRainbowBridge = ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_ALWAYS_OPEN)                                                                         ||
-                           (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_VANILLA)    && ShadowMedallion && SpiritMedallion && LightArrows)             ||
-                           (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_STONES)     && StoneCount + (Greg && GregInBridgeLogic ? 1 : 0) >= ctx->GetOption(RSK_RAINBOW_BRIDGE_STONE_COUNT).Value<uint8_t>())                    ||
-                           (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_MEDALLIONS) && MedallionCount + (Greg && GregInBridgeLogic ? 1 : 0) >= ctx->GetOption(RSK_RAINBOW_BRIDGE_MEDALLION_COUNT).Value<uint8_t>())            ||
-                           (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_DUNGEON_REWARDS)    && StoneCount + MedallionCount + (Greg && GregInBridgeLogic ? 1 : 0) >= ctx->GetOption(RSK_RAINBOW_BRIDGE_REWARD_COUNT).Value<uint8_t>())  ||
-                           (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_DUNGEONS)   && DungeonCount + (Greg && GregInBridgeLogic ? 1 : 0) >= ctx->GetOption(RSK_RAINBOW_BRIDGE_DUNGEON_COUNT).Value<uint8_t>())                ||
-                           (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_TOKENS)     && GoldSkulltulaTokens >= ctx->GetOption(RSK_RAINBOW_BRIDGE_TOKEN_COUNT).Value<uint8_t>()) ||
-                           (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_GREG)       && Greg);
-
-    CanTriggerLACS = (ctx->GetSettings()->LACSCondition() == RO_LACS_VANILLA    && ShadowMedallion && SpiritMedallion)                          ||
-                     (ctx->GetSettings()->LACSCondition() == RO_LACS_STONES     && StoneCount + (Greg && GregInLacsLogic ? 1 : 0) >= ctx->GetOption(RSK_LACS_STONE_COUNT).Value<uint8_t>())                    ||
-                     (ctx->GetSettings()->LACSCondition() == RO_LACS_MEDALLIONS && MedallionCount + (Greg && GregInLacsLogic ? 1 : 0) >= ctx->GetOption(RSK_LACS_MEDALLION_COUNT).Value<uint8_t>())            ||
-                     (ctx->GetSettings()->LACSCondition() == RO_LACS_REWARDS    && StoneCount + MedallionCount + (Greg && GregInLacsLogic ? 1 : 0) >= ctx->GetOption(RSK_LACS_REWARD_COUNT).Value<uint8_t>())  ||
-                     (ctx->GetSettings()->LACSCondition() == RO_LACS_DUNGEONS   && DungeonCount + (Greg && GregInLacsLogic ? 1 : 0) >= ctx->GetOption(RSK_LACS_DUNGEON_COUNT).Value<uint8_t>())                ||
-                     (ctx->GetSettings()->LACSCondition() == RO_LACS_TOKENS     && GoldSkulltulaTokens >= ctx->GetOption(RSK_LACS_TOKEN_COUNT).Value<uint8_t>());
-    CanCompleteTriforce = TriforcePieces >= ctx->GetOption(RSK_TRIFORCE_HUNT_PIECES_REQUIRED).Value<uint8_t>() + 1;
-  }
-
-  bool SmallKeys(RandomizerRegion dungeon, uint8_t requiredAmount) {
-    return SmallKeys(dungeon, requiredAmount, requiredAmount);
-  }
-
-  bool SmallKeys(RandomizerRegion dungeon, uint8_t requiredAmountGlitchless, uint8_t requiredAmountGlitched) {
-    switch (dungeon) {
-      case RR_FOREST_TEMPLE:
-        /*if (IsGlitched && (GetDifficultyValueFromString(GlitchHookshotJump_Boots) >= static_cast<uint8_t>(GlitchDifficulty::INTERMEDIATE) || GetDifficultyValueFromString(GlitchHoverBoost) >= static_cast<uint8_t>(GlitchDifficulty::NOVICE) ||
-                          (GetDifficultyValueFromString(GlitchHover) >= static_cast<uint8_t>(GlitchDifficulty::NOVICE) && GetDifficultyValueFromString(GlitchISG) >= static_cast<uint8_t>(GlitchDifficulty::INTERMEDIATE)))) {
-          return ForestTempleKeys >= requiredAmountGlitched;
-        }*/
-        return ForestTempleKeys >= requiredAmountGlitchless;
-
-      case RR_FIRE_TEMPLE:
-        /*if (IsGlitched && (GetDifficultyValueFromString(GlitchLedgeClip) >= static_cast<uint8_t>(GlitchDifficulty::INTERMEDIATE) || GetDifficultyValueFromString(GlitchHover) >= static_cast<uint8_t>(GlitchDifficulty::INTERMEDIATE))) {
-          return FireTempleKeys >= requiredAmountGlitched;
-        }*/
-        return FireTempleKeys >= requiredAmountGlitchless;
-
-      case RR_WATER_TEMPLE:
-        /*if (IsGlitched && (false)) {
-          return WaterTempleKeys >= requiredAmountGlitched;
-        }*/
-        return WaterTempleKeys >= requiredAmountGlitchless;
-
-      case RR_SPIRIT_TEMPLE:
-        /*if (IsGlitched && (false)) {
-          return SpiritTempleKeys >= requiredAmountGlitched;
-        }*/
-        return SpiritTempleKeys >= requiredAmountGlitchless;
-
-      case RR_SHADOW_TEMPLE:
-        /*if (IsGlitched && (GetDifficultyValueFromString(GlitchHookshotClip) >= static_cast<uint8_t>(GlitchDifficulty::NOVICE))) {
-          return ShadowTempleKeys >= requiredAmountGlitched;
-        }*/
-        return ShadowTempleKeys >= requiredAmountGlitchless;
-
-      case RR_BOTTOM_OF_THE_WELL:
-        /*if (IsGlitched && (false)) {
-          return BottomOfTheWellKeys >= requiredAmountGlitched;
-        }*/
-        return BottomOfTheWellKeys >= requiredAmountGlitchless;
-
-      case RR_GERUDO_TRAINING_GROUNDS:
-        /*if (IsGlitched && (false)) {
-          return GerudoTrainingGroundsKeys >= requiredAmountGlitched;
-        }*/
-        return GerudoTrainingGroundsKeys >= requiredAmountGlitchless;
-
-      case RR_GANONS_CASTLE:
-        /*if (IsGlitched && (false)) {
-          return GanonsCastleKeys >= requiredAmountGlitched;
-        }*/
-        return GanonsCastleKeys >= requiredAmountGlitchless;
-
-      case RR_MARKET_TREASURE_CHEST_GAME:
-        /*if (IsGlitched && (false)) {
-          return TreasureGameKeys >= requiredAmountGlitched;
-        }*/
-        return TreasureGameKeys >= requiredAmountGlitchless;
-
-      default:
-        return false;
-    }
-  }
-
-  bool EventsUpdated() {
-
-      if (DekuTreeClearPast        != DekuTreeClear        ||
-          GoronRubyPast            != GoronRuby            ||
-          ZoraSapphirePast         != ZoraSapphire         ||
-          ForestTrialClearPast     != ForestTrialClear     ||
-          FireTrialClearPast       != FireTrialClear       ||
-          WaterTrialClearPast      != WaterTrialClear      ||
-          ShadowTrialClearPast     != ShadowTrialClear     ||
-          SpiritTrialClearPast     != SpiritTrialClear     ||
-          LightTrialClearPast      != LightTrialClear      ||
-          DrainWellPast            != DrainWell            ||
-          DampesWindmillAccessPast != DampesWindmillAccess ||
-          TimeTravelPast           != TimeTravel) {
-            DekuTreeClearPast        = DekuTreeClear;
-            GoronRubyPast            = GoronRuby;
-            ZoraSapphirePast         = ZoraSapphire;
-            ForestTrialClearPast     = ForestTrialClear;
-            FireTrialClearPast       = FireTrialClear;
-            WaterTrialClearPast      = WaterTrialClear;
-            ShadowTrialClearPast     = ShadowTrialClear;
-            SpiritTrialClearPast     = SpiritTrialClear;
-            LightTrialClearPast      = LightTrialClear;
-            DrainWellPast            = DrainWell;
-            DampesWindmillAccessPast = DampesWindmillAccess;
-            return true;
-          }
-     return false;
-   }
-
-   //Reset All Logic to false
-   void LogicReset() {
-    auto ctx = Rando::Context::GetInstance();
-     //Settings-dependent variables
-     IsKeysanity = ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_ANYWHERE) || 
-                   ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_ANYWHERE) || 
-                   ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_ANYWHERE);
-     AmmoCanDrop = /*AmmoDrops.IsNot(AMMODROPS_NONE) TODO: AmmoDrop setting*/ true;
-
-     //Child item logic
-     KokiriSword   = false;
-     ZeldasLetter  = false;
-     WeirdEgg      = false;
-     HasBottle     = false;
-     Bombchus      = false;
-     Bombchus5     = false;
-     Bombchus10    = false;
-     Bombchus20    = false;
-     MagicBean     = false;
-     MagicBeanPack = false;
-     RutosLetter   = false;
-     Boomerang     = false;
-     DinsFire      = false;
-     FaroresWind   = false;
-     NayrusLove    = false;
-     LensOfTruth   = false;
-     ShardOfAgony  = false;
-     SkullMask     = false;
-     MaskOfTruth   = false;
-
-     //Adult logic
-     Hammer        = false;
-     IronBoots     = false;
-     HoverBoots    = false;
-     MirrorShield  = false;
-     GoronTunic    = false;
-     ZoraTunic     = false;
-     Epona         = false;
-     BigPoe        = false;
-     GerudoToken   = false;
-     FireArrows    = false;
-     IceArrows     = false;
-     LightArrows   = false;
-     MasterSword   = false;
-     BiggoronSword = false;
-
-     //Trade Quest
-     PocketEgg     = false;
-     Cojiro        = false;
-     OddMushroom   = false;
-     OddPoultice   = false;
-     PoachersSaw   = false;
-     BrokenSword   = false;
-     Prescription  = false;
-     EyeballFrog   = false;
-     Eyedrops      = false;
-     ClaimCheck    = false;
-
-     //Trade Quest Events
-     WakeUpAdultTalon   = false;
-     CojiroAccess       = false;
-     OddMushroomAccess  = false;
-     OddPoulticeAccess  = false;
-     PoachersSawAccess  = false;
-     BrokenSwordAccess  = false;
-     PrescriptionAccess = false;
-     EyeballFrogAccess  = false;
-     EyedropsAccess     = false;
-     DisableTradeRevert = false;
-
-     //Songs
-     ZeldasLullaby    = false;
-     SariasSong       = false;
-     SunsSong         = false;
-     SongOfStorms     = false;
-     EponasSong       = false;
-     SongOfTime       = false;
-     MinuetOfForest   = false;
-     BoleroOfFire     = false;
-     SerenadeOfWater  = false;
-     RequiemOfSpirit  = false;
-     NocturneOfShadow = false;
-     PreludeOfLight   = false;
-
-     //Stones and Meddallions
-     ForestMedallion = false;
-     FireMedallion   = false;
-     WaterMedallion  = false;
-     SpiritMedallion = false;
-     ShadowMedallion = false;
-     LightMedallion  = false;
-     KokiriEmerald   = false;
-     GoronRuby       = false;
-     ZoraSapphire    = false;
-
-     //Dungeon Clears
-     DekuTreeClear       = false;
-     DodongosCavernClear = false;
-     JabuJabusBellyClear = false;
-     ForestTempleClear   = false;
-     FireTempleClear     = false;
-     WaterTempleClear    = false;
-     SpiritTempleClear   = false;
-     ShadowTempleClear   = false;
-
-     //Trial Clears
-     ForestTrialClear = false;
-     FireTrialClear   = false;
-     WaterTrialClear  = false;
-     SpiritTrialClear = false;
-     ShadowTrialClear = false;
-     LightTrialClear  = false;
-
-     //Greg
-     Greg = false;
-     GregInBridgeLogic = false;
-     GregInLacsLogic = false;
-
-     //Ocarina C Buttons
-     OcarinaAButton = ctx->GetOption(RSK_SHUFFLE_OCARINA_BUTTONS).Is(true) ? 0 : 1;
-     OcarinaCLeftButton = ctx->GetOption(RSK_SHUFFLE_OCARINA_BUTTONS).Is(true) ? 0 : 1;
-     OcarinaCRightButton = ctx->GetOption(RSK_SHUFFLE_OCARINA_BUTTONS).Is(true) ? 0 : 1;
-     OcarinaCUpButton = ctx->GetOption(RSK_SHUFFLE_OCARINA_BUTTONS).Is(true) ? 0 : 1;
-     OcarinaCDownButton = ctx->GetOption(RSK_SHUFFLE_OCARINA_BUTTONS).Is(true) ? 0 : 1;
-
-     //Progressive Items
-     ProgressiveBulletBag  = 0;
-     ProgressiveBombBag    = 0;
-     ProgressiveMagic      = 0;
-     ProgressiveScale      = 0;
-     ProgressiveHookshot   = 0;
-     ProgressiveBow        = 0;
-     ProgressiveWallet     = 0;
-     ProgressiveStrength   = 0;
-     ProgressiveOcarina    = 0;
-     ProgressiveGiantKnife = 0;
-
-     //Keys
-     ForestTempleKeys          = 0;
-     //If not keysanity, start with 1 logical key to account for automatically unlocking the basement door in vanilla FiT
-     FireTempleKeys            = IsKeysanity || ctx->GetDungeon(Rando::FIRE_TEMPLE)->IsMQ() ? 0 : 1;
-     WaterTempleKeys           = 0;
-     SpiritTempleKeys          = 0;
-     ShadowTempleKeys          = 0;
-     GanonsCastleKeys          = 0;
-     GerudoFortressKeys        = 0;
-     GerudoTrainingGroundsKeys = 0;
-     BottomOfTheWellKeys       = 0;
-     TreasureGameKeys          = 0;
-
-     //Boss Keys
-     BossKeyForestTemple = 0;
-     BossKeyFireTemple   = 0;
-     BossKeyWaterTemple  = 0;
-     BossKeySpiritTemple = 0;
-     BossKeyShadowTemple = 0;
-     BossKeyGanonsCastle = 0;
-
-     //Gold Skulltula Count
-     GoldSkulltulaTokens = 0;
-
-     //Bottle Count
-     Bottles    = 0;
-     NumBottles = 0;
-     NoBottles  = false;
-
-     //Triforce Pieces
-     TriforcePieces = 0;
-
-     //Boss Souls
-     CanSummonGohma        = false;
-     CanSummonKingDodongo  = false;
-     CanSummonBarinade     = false;
-     CanSummonPhantomGanon = false;
-     CanSummonVolvagia     = false;
-     CanSummonMorpha       = false;
-     CanSummonBongoBongo   = false;
-     CanSummonTwinrova     = false;
-     CanSummonGanon        = false;
-
-     //Drops and Bottle Contents Access
-     DekuNutDrop      = false;
-     NutPot           = false;
-     NutCrate         = false;
-     DekuBabaNuts     = false;
-     DekuStickDrop    = false;
-     StickPot         = false;
-     DekuBabaSticks   = false;
-     BugsAccess       = false;
-     BugShrub         = false;
-     WanderingBugs    = false;
-     BugRock          = false;
-     BlueFireAccess   = false;
-     FishAccess       = false;
-     FishGroup        = false;
-     LoneFish         = false;
-     FairyAccess      = false;
-     GossipStoneFairy = false;
-     BeanPlantFairy   = false;
-     ButterflyFairy   = false;
-     FairyPot         = false;
-     FreeFairies      = false;
-     FairyPond        = false;
-     BombchuDrop      = false;
-
-     BuyBombchus      = false;
-     BuySeed          = false;
-     BuyArrow         = false;
-     BuyBomb          = false;
-     BuyMagicPotion        = false;
-     MagicRefill      = false;
-
-     PieceOfHeart     = 0;
-     HeartContainer   = 0;
-     DoubleDefense    = false;
-
-     /* --- HELPERS, EVENTS, AND LOCATION ACCESS --- */
-     /* These are used to simplify reading the logic, but need to be updated
-     /  every time a base value is updated.                       */
-
-     Slingshot        = false;
-     Ocarina          = false;
-     OcarinaOfTime    = false;
-     BombBag          = false;
-     MagicMeter       = false;
-     Hookshot         = false;
-     Longshot         = false;
-     Bow              = false;
-     GoronBracelet    = false;
-     SilverGauntlets  = false;
-     GoldenGauntlets  = false;
-     SilverScale      = false;
-     GoldScale        = false;
-     AdultsWallet     = false;
-
-     ChildScarecrow   = false;
-     AdultScarecrow   = false;
-     ScarecrowSong    = false;
-     Scarecrow        = false;
-     DistantScarecrow = false;
-
-     Bombs            = false;
-     DekuShield       = false;
-     HylianShield     = false;
-     Nuts             = false;
-     Sticks           = false;
-     Bugs             = false;
-     BlueFire         = false;
-     Fish             = false;
-     Fairy            = false;
-     BottleWithBigPoe = false;
-
-     FoundBombchus    = false;
-     CanPlayBowling   = false;
-     HasBombchus      = false;
-     HasExplosives    = false;
-     HasBoots         = false;
-     IsChild          = false;
-     IsAdult          = false;
-     IsGlitched       = ctx->GetOption(RSK_LOGIC_RULES).Is(RO_LOGIC_GLITCHED);
-     CanBlastOrSmash  = false;
-     CanChildAttack   = false;
-     CanChildDamage   = false;
-     CanCutShrubs     = false;
-     CanDive          = false;
-     CanLeaveForest   = false;
-     CanPlantBugs     = false;
-     CanRideEpona     = false;
-     CanStunDeku      = false;
-     CanSummonGossipFairy = false;
-     CanSummonGossipFairyWithoutSuns = false;
-     //CanPlantBean        = false;
-     CanOpenBombGrotto   = false;
-     CanOpenStormGrotto  = false;
-     BigPoeKill          = false;
-     HookshotOrBoomerang = false;
-
-     BaseHearts      = ctx->GetOption(RSK_STARTING_HEARTS).Value<uint8_t>() + 1;
-     Hearts          = 0;
-     Multiplier      = (ctx->GetOption(RSK_DAMAGE_MULTIPLIER).Value<uint8_t>() < 6) ? ctx->GetOption(RSK_DAMAGE_MULTIPLIER).Value<uint8_t>() : 10;
-     EffectiveHealth = 0;
-     FireTimer       = 0;
-     WaterTimer      = 0;
-
-     GuaranteeTradePath     = false;
-     GuaranteeHint          = false;
-     HasFireSource          = false;
-     HasFireSourceWithTorch = false;
-
-     CanFinishGerudoFortress = false;
-
-     HasShield          = false;
-     CanShield          = false;
-     ChildShield        = false;
-     AdultReflectShield = false;
-     AdultShield        = false;
-     CanShieldFlick     = false;
-     CanJumpslash       = false;
-     CanUseProjectile   = false;
-     CanUseMagicArrow   = false;
-
-     //Bridge Requirements
-     HasAllStones          = false;
-     HasAllMedallions      = false;
-     CanBuildRainbowBridge = false;
-     BuiltRainbowBridge    = false;
-     CanTriggerLACS        = false;
-
-     //Other
-     AtDay         = false;
-     AtNight       = false;
-     Age           = ctx->GetSettings()->ResolvedStartingAge();
-
-     //Events
-     ShowedMidoSwordAndShield  = false;
-     CarpenterRescue           = false;
-     GF_GateOpen               = false;
-     GtG_GateOpen              = false;
-     DampesWindmillAccess      = false;
-     DrainWell                 = false;
-     GoronCityChildFire        = false;
-     GCWoodsWarpOpen           = false;
-     GCDaruniasDoorOpenChild   = false;
-     StopGCRollingGoronAsAdult = false;
-     WaterTempleLow            = false;
-     WaterTempleMiddle         = false;
-     WaterTempleHigh           = false;
-     KakarikoVillageGateOpen   = false;
-     KingZoraThawed            = false;
-     ForestTempleJoelle        = false;
-     ForestTempleBeth          = false;
-     ForestTempleJoAndBeth     = false;
-     ForestTempleAmy           = false;
-     ForestTempleMeg           = false;
-     ForestTempleAmyAndMeg     = false;
-     FireLoopSwitch            = false;
-     LinksCow                  = false;
-     AtDampeTime               = false;
-     DeliverLetter             = false;
-     TimeTravel                = false;
-
-     DrainWellPast            = false;
-     DampesWindmillAccessPast = false;
-     DekuTreeClearPast        = false;
-     GoronRubyPast            = false;
-     ZoraSapphirePast         = false;
-     ForestTrialClearPast     = false;
-     FireTrialClearPast       = false;
-     WaterTrialClearPast      = false;
-     SpiritTrialClearPast     = false;
-     ShadowTrialClearPast     = false;
-     LightTrialClearPast      = false;
-     BuyDekuShieldPast        = false;
-     TimeTravelPast           = false;
-   }
-}
diff --git a/soh/soh/Enhancements/randomizer/3drando/logic.hpp b/soh/soh/Enhancements/randomizer/3drando/logic.hpp
deleted file mode 100644
index 63f7b9fa3..000000000
--- a/soh/soh/Enhancements/randomizer/3drando/logic.hpp
+++ /dev/null
@@ -1,394 +0,0 @@
-#pragma once
-
-#include "../randomizerTypes.h"
-#include <cstdint>
-
-namespace Logic {
-extern bool noVariable;
-
-// Child item logic
-extern bool KokiriSword;
-extern bool Slingshot;
-extern bool ZeldasLetter;
-extern bool WeirdEgg;
-extern bool HasBottle;
-extern bool BombBag;
-extern bool Bombchus;
-extern bool Bombchus5;
-extern bool Bombchus10;
-extern bool Bombchus20;
-extern bool MagicBean;
-extern bool MagicBeanPack;
-extern bool RutosLetter;
-extern bool Boomerang;
-extern bool DinsFire;
-extern bool FaroresWind;
-extern bool NayrusLove;
-extern bool LensOfTruth;
-extern bool ShardOfAgony;
-extern bool SkullMask;
-extern bool MaskOfTruth;
-
-// Adult logic
-extern bool Bow;
-extern bool Hammer;
-extern bool IronBoots;
-extern bool HoverBoots;
-extern bool MirrorShield;
-extern bool GoronTunic;
-extern bool ZoraTunic;
-extern bool Epona;
-extern bool BigPoe;
-extern bool GerudoToken;
-extern bool FireArrows;
-extern bool IceArrows;
-extern bool LightArrows;
-extern bool MasterSword;
-extern bool BiggoronSword;
-
-// Trade Quest
-extern bool PocketEgg;
-extern bool Cojiro;
-extern bool OddMushroom;
-extern bool OddPoultice;
-extern bool PoachersSaw;
-extern bool BrokenSword;
-extern bool Prescription;
-extern bool EyeballFrog;
-extern bool Eyedrops;
-extern bool ClaimCheck;
-
-// Trade Quest Events
-extern bool WakeUpAdultTalon;
-extern bool CojiroAccess;
-extern bool OddMushroomAccess;
-extern bool OddPoulticeAccess;
-extern bool PoachersSawAccess;
-extern bool BrokenSwordAccess;
-extern bool PrescriptionAccess;
-extern bool EyeballFrogAccess;
-extern bool EyedropsAccess;
-extern bool DisableTradeRevert;
-
-// Songs
-extern bool ZeldasLullaby;
-extern bool SariasSong;
-extern bool SunsSong;
-extern bool SongOfStorms;
-extern bool EponasSong;
-extern bool SongOfTime;
-extern bool MinuetOfForest;
-extern bool BoleroOfFire;
-extern bool SerenadeOfWater;
-extern bool RequiemOfSpirit;
-extern bool NocturneOfShadow;
-extern bool PreludeOfLight;
-
-// Stones and Meddallions
-extern bool ForestMedallion;
-extern bool FireMedallion;
-extern bool WaterMedallion;
-extern bool SpiritMedallion;
-extern bool ShadowMedallion;
-extern bool LightMedallion;
-extern bool KokiriEmerald;
-extern bool GoronRuby;
-extern bool ZoraSapphire;
-
-// Dungeon Clears
-extern bool DekuTreeClear;
-extern bool DodongosCavernClear;
-extern bool JabuJabusBellyClear;
-extern bool ForestTempleClear;
-extern bool FireTempleClear;
-extern bool WaterTempleClear;
-extern bool SpiritTempleClear;
-extern bool ShadowTempleClear;
-
-// Trial Clears
-extern bool ForestTrialClear;
-extern bool FireTrialClear;
-extern bool WaterTrialClear;
-extern bool SpiritTrialClear;
-extern bool ShadowTrialClear;
-extern bool LightTrialClear;
-
-//Greg
-extern bool Greg;
-extern bool GregInBridgeLogic;
-extern bool GregInLacsLogic;
-
-// Progression Items
-extern uint8_t ProgressiveBulletBag;
-extern uint8_t ProgressiveBombBag;
-extern uint8_t ProgressiveScale;
-extern uint8_t ProgressiveHookshot;
-extern uint8_t ProgressiveBow;
-extern uint8_t ProgressiveStrength;
-extern uint8_t ProgressiveWallet;
-extern uint8_t ProgressiveMagic;
-extern uint8_t ProgressiveOcarina;
-extern uint8_t ProgressiveGiantKnife;
-
-// Keysanity
-extern bool IsKeysanity;
-
-// Keys
-extern uint8_t ForestTempleKeys;
-extern uint8_t FireTempleKeys;
-extern uint8_t WaterTempleKeys;
-extern uint8_t SpiritTempleKeys;
-extern uint8_t ShadowTempleKeys;
-extern uint8_t BottomOfTheWellKeys;
-extern uint8_t GerudoTrainingGroundsKeys;
-extern uint8_t GerudoFortressKeys;
-extern uint8_t GanonsCastleKeys;
-extern uint8_t TreasureGameKeys;
-
-// Triforce Pieces
-extern uint8_t TriforcePieces;
-
-// Boss Keys
-extern bool BossKeyForestTemple;
-extern bool BossKeyFireTemple;
-extern bool BossKeyWaterTemple;
-extern bool BossKeySpiritTemple;
-extern bool BossKeyShadowTemple;
-extern bool BossKeyGanonsCastle;
-
-// Gold Skulltula Count
-extern uint8_t GoldSkulltulaTokens;
-
-// Bottle Count, with and without Ruto's Letter
-extern uint8_t Bottles;
-extern uint8_t NumBottles;
-extern bool NoBottles;
-
-// item and bottle drops
-extern bool DekuNutDrop;
-extern bool NutPot;
-extern bool NutCrate;
-extern bool DekuBabaNuts;
-extern bool DekuStickDrop;
-extern bool StickPot;
-extern bool DekuBabaSticks;
-extern bool BugsAccess;
-extern bool BugShrub;
-extern bool WanderingBugs;
-extern bool BugRock;
-extern bool BlueFireAccess;
-extern bool FishAccess;
-extern bool FishGroup;
-extern bool LoneFish;
-extern bool FairyAccess;
-extern bool GossipStoneFairy;
-extern bool BeanPlantFairy;
-extern bool ButterflyFairy;
-extern bool FairyPot;
-extern bool FreeFairies;
-extern bool FairyPond;
-extern bool BombchuDrop;
-
-extern bool BuyBombchus;
-extern bool BuyArrow;
-extern bool BuyBomb;
-extern bool BuyMagicPotion;
-extern bool BuySeed;
-extern bool MagicRefill;
-
-extern uint8_t PieceOfHeart;
-extern uint8_t HeartContainer;
-extern bool DoubleDefense;
-
-extern bool OcarinaAButton;
-extern bool OcarinaCLeftButton;
-extern bool OcarinaCRightButton;
-extern bool OcarinaCUpButton;
-extern bool OcarinaCDownButton;
-
-/* --- HELPERS --- */
-/* These are used to simplify reading the logic, but need to be updated
-/  every time a base value is updated.                       */
-
-extern bool Ocarina;
-extern bool OcarinaOfTime;
-extern bool MagicMeter;
-extern bool Hookshot;
-extern bool Longshot;
-extern bool GoronBracelet;
-extern bool SilverGauntlets;
-extern bool GoldenGauntlets;
-extern bool SilverScale;
-extern bool GoldScale;
-extern bool AdultsWallet;
-
-extern bool ChildScarecrow;
-extern bool AdultScarecrow;
-extern bool ScarecrowSong;
-extern bool Scarecrow;
-extern bool DistantScarecrow;
-
-extern bool Bombs;
-extern bool DekuShield;
-extern bool HylianShield;
-extern bool Nuts;
-extern bool Sticks;
-extern bool Bugs;
-extern bool BlueFire;
-extern bool Fish;
-extern bool Fairy;
-extern bool BottleWithBigPoe;
-
-extern bool Bombs;
-extern bool FoundBombchus;
-extern bool CanPlayBowling;
-extern bool HasBombchus;
-extern bool HasExplosives;
-extern bool HasBoots;
-extern bool IsChild;
-extern bool IsAdult;
-extern bool IsGlitched;
-extern bool CanBlastOrSmash;
-extern bool CanChildAttack;
-extern bool CanChildDamage;
-extern bool CanAdultAttack;
-extern bool CanAdultDamage;
-extern bool CanCutShrubs;
-extern bool CanDive;
-extern bool CanLeaveForest;
-extern bool CanPlantBugs;
-extern bool CanRideEpona;
-extern bool CanStunDeku;
-extern bool CanSummonGossipFairy;
-extern bool CanSummonGossipFairyWithoutSuns;
-extern bool NeedNayrusLove;
-extern bool CanSurviveDamage;
-extern bool CanTakeDamage;
-extern bool CanTakeDamageTwice;
-// extern bool CanPlantBean;
-extern bool CanOpenBombGrotto;
-extern bool CanOpenStormGrotto;
-extern bool HookshotOrBoomerang;
-extern bool CanGetNightTimeGS;
-extern bool BigPoeKill;
-
-extern uint8_t OcarinaButtons;
-extern uint8_t BaseHearts;
-extern uint8_t Hearts;
-extern uint8_t Multiplier;
-extern uint8_t EffectiveHealth;
-extern uint8_t FireTimer;
-extern uint8_t WaterTimer;
-
-extern bool GuaranteeTradePath;
-extern bool GuaranteeHint;
-extern bool HasFireSource;
-extern bool HasFireSourceWithTorch;
-
-// Gerudo Fortress
-extern bool CanFinishGerudoFortress;
-
-extern bool HasShield;
-extern bool CanShield;
-extern bool ChildShield;
-extern bool AdultReflectShield;
-extern bool AdultShield;
-extern bool CanShieldFlick;
-extern bool CanJumpslash;
-extern bool CanUseProjectile;
-extern bool CanUseMagicArrow;
-
-// Bridge Requirements
-extern bool HasAllStones;
-extern bool HasAllMedallions;
-extern bool CanBuildRainbowBridge;
-extern bool BuiltRainbowBridge;
-extern bool CanTriggerLACS;
-
-// Other
-extern bool AtDay;
-extern bool AtNight;
-extern bool LinksCow;
-extern uint8_t Age;
-extern bool CanCompleteTriforce;
-
-extern bool CanSummonGohma;
-extern bool CanSummonKingDodongo;
-extern bool CanSummonBarinade;
-extern bool CanSummonPhantomGanon;
-extern bool CanSummonVolvagia;
-extern bool CanSummonMorpha;
-extern bool CanSummonBongoBongo;
-extern bool CanSummonTwinrova;
-extern bool CanSummonGanon;
-
-// Events
-extern bool ShowedMidoSwordAndShield;
-extern bool CarpenterRescue;
-extern bool DampesWindmillAccess;
-extern bool GF_GateOpen;
-extern bool GtG_GateOpen;
-extern bool DrainWell;
-extern bool GoronCityChildFire;
-extern bool GCWoodsWarpOpen;
-extern bool GCDaruniasDoorOpenChild;
-extern bool StopGCRollingGoronAsAdult;
-extern bool WaterTempleLow;
-extern bool WaterTempleMiddle;
-extern bool WaterTempleHigh;
-extern bool KingZoraThawed;
-extern bool AtDampeTime;
-extern bool DeliverLetter;
-extern bool KakarikoVillageGateOpen;
-extern bool ForestTempleJoelle;
-extern bool ForestTempleBeth;
-extern bool ForestTempleJoAndBeth;
-extern bool ForestTempleAmy;
-extern bool ForestTempleMeg;
-extern bool ForestTempleAmyAndMeg;
-extern bool FireLoopSwitch;
-extern bool TimeTravel;
-
-/* --- END OF HELPERS --- */
-
-extern uint8_t AddedProgressiveBulletBags;
-extern uint8_t AddedProgressiveBombBags;
-extern uint8_t AddedProgressiveMagics;
-extern uint8_t AddedProgressiveScales;
-extern uint8_t AddedProgressiveHookshots;
-extern uint8_t AddedProgressiveBows;
-extern uint8_t AddedProgressiveWallets;
-extern uint8_t AddedProgressiveStrengths;
-extern uint8_t AddedProgressiveOcarinas;
-extern uint8_t TokensInPool;
-
-enum class HasProjectileAge {
-    Adult,
-    Child,
-    Both,
-    Either,
-};
-
-enum class GlitchType {
-    EquipSwapDins,
-    EquipSwap,
-};
-
-enum class GlitchDifficulty {
-    NOVICE = 1,
-    INTERMEDIATE,
-    ADVANCED,
-    EXPERT,
-    HERO,
-};
-
-void UpdateHelpers();
-bool CanUse(RandomizerGet itemName);
-bool HasProjectile(HasProjectileAge age);
-bool HasBossSoul(RandomizerGet itemName);
-bool SmallKeys(RandomizerRegion dungeon, uint8_t requiredAmount);
-bool SmallKeys(RandomizerRegion dungeon, uint8_t requiredAmountGlitchless, uint8_t requiredAmountGlitched);
-bool CanDoGlitch(GlitchType glitch);
-bool EventsUpdated();
-void LogicReset();
-} // namespace Logic
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp b/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
index bc833af12..7aef15aa5 100644
--- a/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
@@ -5,7 +5,6 @@
 #include "custom_messages.hpp"
 #include "fill.hpp"
 #include "location_access.hpp"
-#include "logic.hpp"
 #include "random.hpp"
 #include "spoiler_log.hpp"
 #include "soh/Enhancements/randomizer/randomizerTypes.h"
@@ -24,6 +23,7 @@ int Playthrough_Init(uint32_t seed, std::set<RandomizerCheck> excludedLocations,
     CustomMessages::ClearMessages();
     ctx->ItemReset();
     ctx->HintReset();
+    ctx->GetLogic()->Reset();
     Areas::AccessReset();
 
     ctx->GetSettings()->FinalizeSettings(excludedLocations, enabledTricks);
@@ -52,7 +52,7 @@ int Playthrough_Init(uint32_t seed, std::set<RandomizerCheck> excludedLocations,
     Random_Init(finalHash);
     ctx->GetSettings()->SetHash(std::to_string(finalHash));
 
-    Logic::UpdateHelpers();
+    ctx->GetLogic()->UpdateHelpers();
 
     if (ctx->GetOption(RSK_LOGIC_RULES).Is(RO_LOGIC_VANILLA)) {
         VanillaFill(); // Just place items in their vanilla locations
diff --git a/soh/soh/Enhancements/randomizer/3drando/starting_inventory.cpp b/soh/soh/Enhancements/randomizer/3drando/starting_inventory.cpp
index 95fe0460e..4d75129e7 100644
--- a/soh/soh/Enhancements/randomizer/3drando/starting_inventory.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/starting_inventory.cpp
@@ -2,6 +2,7 @@
 
 #include "../dungeon.h"
 #include "../context.h"
+#include "../logic.h"
 #include "pool_functions.hpp"
 #include "soh/Enhancements/randomizer/static_data.h"
 
diff --git a/soh/soh/Enhancements/randomizer/context.cpp b/soh/soh/Enhancements/randomizer/context.cpp
index 515d5f029..32a3c63fa 100644
--- a/soh/soh/Enhancements/randomizer/context.cpp
+++ b/soh/soh/Enhancements/randomizer/context.cpp
@@ -4,6 +4,7 @@
 #include "soh/Enhancements/item-tables/ItemTableManager.h"
 #include "3drando/shops.hpp"
 #include "dungeon.h"
+#include "logic.h"
 #include "trial.h"
 #include "entrance.h"
 #include "settings.h"
@@ -18,11 +19,6 @@ namespace Rando {
 std::weak_ptr<Context> Context::mContext;
 
 Context::Context() {
-    StaticData::InitItemTable();
-    StaticData::InitLocationTable();
-    for (auto& location : StaticData::GetLocationTable()) {
-        mSpoilerfileCheckNameToEnum[location.GetName()] = location.GetRandomizerCheck();
-    }
     mSpoilerfileCheckNameToEnum["Invalid Location"] = RC_UNKNOWN_CHECK;
     mSpoilerfileCheckNameToEnum["Link's Pocket"] = RC_LINKS_POCKET;
 
@@ -92,14 +88,23 @@ Context::Context() {
     }
     mEntranceShuffler = std::make_shared<EntranceShuffler>();
     mDungeons = std::make_shared<Dungeons>();
+    mLogic = std::make_shared<Logic>();
     mTrials = std::make_shared<Trials>();
     mSettings = std::make_shared<Settings>();
+    for (auto& location : StaticData::GetLocationTable()) {
+        mSpoilerfileCheckNameToEnum[location.GetName()] = location.GetRandomizerCheck();
+    }
 }
 
 RandomizerArea Context::GetAreaFromString(std::string str) {
     return mSpoilerfileAreaNameToEnum[str];
 }
 
+void Context::InitStaticData() {
+    StaticData::InitItemTable();
+    StaticData::InitLocationTable();
+}
+
 std::shared_ptr<Context> Context::CreateInstance() {
     if (mContext.expired()) {
         auto instance = std::make_shared<Context>();
@@ -618,6 +623,17 @@ DungeonInfo* Context::GetDungeon(size_t key) const {
     return mDungeons->GetDungeon(static_cast<DungeonKey>(key));
 }
 
+std::shared_ptr<Logic> Context::GetLogic() {
+    if (mLogic.get() == nullptr) {
+        mLogic = std::make_shared<Logic>();
+    }
+    return mLogic;
+}
+
+void Context::ResetLogic() {
+    mLogic->Reset();
+}
+
 std::shared_ptr<Trials> Context::GetTrials() {
     return mTrials;
 }
diff --git a/soh/soh/Enhancements/randomizer/context.h b/soh/soh/Enhancements/randomizer/context.h
index d477ef3eb..247bca68e 100644
--- a/soh/soh/Enhancements/randomizer/context.h
+++ b/soh/soh/Enhancements/randomizer/context.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "randomizerTypes.h"
+#include "z64save.h"
 #include "item_location.h"
 #include "item_override.h"
 #include "3drando/text.hpp"
@@ -21,6 +22,7 @@
  */
 namespace Rando {
 class EntranceShuffler;
+class Logic;
 class Settings;
 class Dungeons;
 class DungeonInfo;
@@ -32,6 +34,7 @@ class Context {
     Context();
     static std::shared_ptr<Context> CreateInstance();
     static std::shared_ptr<Context> GetInstance();
+    void InitStaticData();
     Hint* GetHint(RandomizerHintKey hintKey);
     void AddHint(RandomizerHintKey hintId, const Text& text, RandomizerCheck hintedLocation, HintType hintType, std::string distributionName,
                  RandomizerArea hintedArea = RA_NONE);
@@ -64,6 +67,8 @@ class Context {
     std::shared_ptr<EntranceShuffler> GetEntranceShuffler();
     std::shared_ptr<Dungeons> GetDungeons();
     DungeonInfo* GetDungeon(size_t key) const;
+    std::shared_ptr<Logic> GetLogic();
+    void ResetLogic();
     std::shared_ptr<Trials> GetTrials();
     TrialInfo* GetTrial(size_t key) const;
     static Sprite* GetSeedTexture(uint8_t index);
@@ -104,6 +109,7 @@ class Context {
     std::shared_ptr<Settings> mSettings;
     std::shared_ptr<EntranceShuffler> mEntranceShuffler;
     std::shared_ptr<Dungeons> mDungeons;
+    std::shared_ptr<Logic> mLogic;
     std::shared_ptr<Trials> mTrials;
     bool mSeedGenerated = false;
     bool mSpoilerLoaded = false;
diff --git a/soh/soh/Enhancements/randomizer/entrance.cpp b/soh/soh/Enhancements/randomizer/entrance.cpp
index 0e32631b5..ee9df1dc1 100644
--- a/soh/soh/Enhancements/randomizer/entrance.cpp
+++ b/soh/soh/Enhancements/randomizer/entrance.cpp
@@ -55,16 +55,16 @@ std::string Entrance::GetName() const {
 void Entrance::printAgeTimeAccess() {
     // CitraPrint("Name: ");
     // CitraPrint(name);
-    auto message = "Child Day:   " + std::to_string(CheckConditionAtAgeTime(Logic::IsChild, Logic::AtDay)) +
+    auto message = "Child Day:   " + std::to_string(CheckConditionAtAgeTime(logic->IsChild, logic->AtDay)) +
                    "\t"
                    "Child Night: " +
-                   std::to_string(CheckConditionAtAgeTime(Logic::IsChild, Logic::AtNight)) +
+                   std::to_string(CheckConditionAtAgeTime(logic->IsChild, logic->AtNight)) +
                    "\t"
                    "Adult Day:   " +
-                   std::to_string(CheckConditionAtAgeTime(Logic::IsAdult, Logic::AtDay)) +
+                   std::to_string(CheckConditionAtAgeTime(logic->IsAdult, logic->AtDay)) +
                    "\t"
                    "Adult Night: " +
-                   std::to_string(CheckConditionAtAgeTime(Logic::IsAdult, Logic::AtNight));
+                   std::to_string(CheckConditionAtAgeTime(logic->IsAdult, logic->AtNight));
     // CitraPrint(message);
 }
 
@@ -78,10 +78,10 @@ bool Entrance::ConditionsMet(bool allAgeTimes) const {
     }
 
     // check all possible day/night condition combinations
-    conditionsMet = (parent->childDay && CheckConditionAtAgeTime(Logic::IsChild, Logic::AtDay, allAgeTimes)) +
-                    (parent->childNight && CheckConditionAtAgeTime(Logic::IsChild, Logic::AtNight, allAgeTimes)) +
-                    (parent->adultDay && CheckConditionAtAgeTime(Logic::IsAdult, Logic::AtDay, allAgeTimes)) +
-                    (parent->adultNight && CheckConditionAtAgeTime(Logic::IsAdult, Logic::AtNight, allAgeTimes));
+    conditionsMet = (parent->childDay && CheckConditionAtAgeTime(logic->IsChild, logic->AtDay, allAgeTimes)) +
+                    (parent->childNight && CheckConditionAtAgeTime(logic->IsChild, logic->AtNight, allAgeTimes)) +
+                    (parent->adultDay && CheckConditionAtAgeTime(logic->IsAdult, logic->AtDay, allAgeTimes)) +
+                    (parent->adultNight && CheckConditionAtAgeTime(logic->IsAdult, logic->AtNight, allAgeTimes));
 
     return conditionsMet && (!allAgeTimes || conditionsMet == 4);
 }
@@ -93,15 +93,15 @@ uint32_t Entrance::Getuint32_t() const {
 // set the logic to be a specific age and time of day and see if the condition still holds
 bool Entrance::CheckConditionAtAgeTime(bool& age, bool& time, bool passAnyway) const {
 
-    Logic::IsChild = false;
-    Logic::IsAdult = false;
-    Logic::AtDay = false;
-    Logic::AtNight = false;
+    logic->IsChild = false;
+    logic->IsAdult = false;
+    logic->AtDay = false;
+    logic->AtNight = false;
 
     time = true;
     age = true;
 
-    Logic::UpdateHelpers();
+    logic->UpdateHelpers();
     return GetConditionsMet() && (connectedRegion != RR_NONE || passAnyway);
 }
 
@@ -458,7 +458,7 @@ static bool ValidateWorld(Entrance* entrancePlaced) {
     // Search the world to verify that all necessary conditions are still being held
     // Conditions will be checked during the search and any that fail will be figured out
     // afterwards
-    Logic::LogicReset();
+    ctx->GetLogic()->Reset();
     GetAccessibleLocations({}, SearchMode::ValidateWorld, RG_NONE, checkPoeCollectorAccess, checkOtherEntranceAccess);
 
     if (!ctx->GetOption(RSK_DECOUPLED_ENTRANCES)) {
@@ -754,7 +754,7 @@ static std::array<std::vector<Entrance*>, 2> SplitEntrancesByRequirements(std::v
     std::vector<Entrance*> restrictiveEntrances = {};
     std::vector<Entrance*> softEntrances = {};
 
-    Logic::LogicReset();
+    logic->Reset();
     // Apply the effects of all advancement items to search for entrance accessibility
     std::vector<RandomizerGet> items = FilterFromPool(
         ItemPool, [](const RandomizerGet i) { return Rando::StaticData::RetrieveItem(i).IsAdvancement(); });
@@ -1405,7 +1405,7 @@ int EntranceShuffler::ShuffleAllEntrances() {
                 BuildOneWayTargets(validTargetTypes, { std::make_pair(RR_PRELUDE_OF_LIGHT_WARP, RR_TEMPLE_OF_TIME) });
             // Owl Drops are only accessible as child, so targets should reflect that
             for (Entrance* target : oneWayTargetEntrancePools[poolType]) {
-                target->SetCondition([] { return Logic::IsChild; });
+                target->SetCondition([] { return logic->IsChild; });
             }
 
         } else if (poolType == EntranceType::Spawn) {
diff --git a/soh/soh/Enhancements/randomizer/item.cpp b/soh/soh/Enhancements/randomizer/item.cpp
index 9ad4be326..b571211e7 100644
--- a/soh/soh/Enhancements/randomizer/item.cpp
+++ b/soh/soh/Enhancements/randomizer/item.cpp
@@ -1,7 +1,8 @@
 #include "item.h"
 #include "item_location.h"
 
-#include "3drando/logic.hpp"
+#include "context.h"
+#include "logic.h"
 #include "3drando/item_pool.hpp"
 #include "z64item.h"
 #include "variables.h"
@@ -66,7 +67,7 @@ void Item::ApplyEffect() const {
             *std::get<uint8_t*>(logicVar) += 1;
         }
     }
-    Logic::UpdateHelpers();
+    Rando::Context::GetInstance()->GetLogic()->UpdateHelpers();
 }
 
 void Item::UndoEffect() const {
@@ -79,7 +80,7 @@ void Item::UndoEffect() const {
             *std::get<uint8_t*>(logicVar) -= 1;
         }
     }
-    Logic::UpdateHelpers();
+    Rando::Context::GetInstance()->GetLogic()->UpdateHelpers();
 }
 
 const Text& Item::GetName() const {
diff --git a/soh/soh/Enhancements/randomizer/item_list.cpp b/soh/soh/Enhancements/randomizer/item_list.cpp
index fc7696815..88732e6a2 100644
--- a/soh/soh/Enhancements/randomizer/item_list.cpp
+++ b/soh/soh/Enhancements/randomizer/item_list.cpp
@@ -1,5 +1,6 @@
 #include "static_data.h"
-#include "3drando/logic.hpp"
+#include "context.h"
+#include "logic.h"
 #include "z64object.h"
 #include "soh/Enhancements/custom-message/CustomMessageTypes.h"
 #include "draw.h"
@@ -9,298 +10,299 @@ using namespace Rando;
 std::array<Item, RG_MAX> Rando::StaticData::itemTable;
 
 void Rando::StaticData::InitItemTable() {
-    itemTable[RG_NONE] =                                Item(RG_NONE,                             Text{ "No Item", "Rien", "Kein Artikel" },                                                                        ITEMTYPE_EVENT,             GI_RUPEE_GREEN,     false, &Logic::noVariable,          RHT_NONE,                   ITEM_NONE,                      0,                      0,                  0,                           0,    0,                ITEM_CATEGORY_JUNK,   MOD_NONE);
+    auto logic = Context::GetInstance()->GetLogic();
+    itemTable[RG_NONE] =                                Item(RG_NONE,                             Text{ "No Item", "Rien", "Kein Artikel" },                                                                        ITEMTYPE_EVENT,             GI_RUPEE_GREEN,     false, &logic->noVariable,          RHT_NONE,                   ITEM_NONE,                      0,                      0,                  0,                           0,    0,                ITEM_CATEGORY_JUNK,   MOD_NONE);
     //        Randomizer Get                                 Randomizer Get                       Name Text                                                                                                         Type                        Get Item ID         Adv.   Logic Variable               Hint Text Key               Item ID                         Object ID               Draw ID             Text ID                      field Chest Animation Item Category         Mod Index
-    itemTable[RG_KOKIRI_SWORD] =                        Item(RG_KOKIRI_SWORD,                     Text{ "Kokiri Sword", "Épée Kokiri", "Kokiri-Schwert" },                                                          ITEMTYPE_ITEM,              GI_SWORD_KOKIRI,    true,  &Logic::KokiriSword,         RHT_KOKIRI_SWORD,           ITEM_SWORD_KOKIRI,              OBJECT_GI_SWORD_1,      GID_SWORD_KOKIRI,   0xA4,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_MASTER_SWORD] =                        Item(RG_MASTER_SWORD,                     Text{ "Master Sword", "Épée de Legende", "Espada Master"},                                                        ITEMTYPE_ITEM,              0xE0,               true,  &Logic::MasterSword,         RHT_MASTER_SWORD,           ITEM_SWORD_MASTER,              OBJECT_TOKI_OBJECTS,    GID_SWORD_BGS,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_KOKIRI_SWORD] =                        Item(RG_KOKIRI_SWORD,                     Text{ "Kokiri Sword", "Épée Kokiri", "Kokiri-Schwert" },                                                          ITEMTYPE_ITEM,              GI_SWORD_KOKIRI,    true,  &logic->KokiriSword,         RHT_KOKIRI_SWORD,           ITEM_SWORD_KOKIRI,              OBJECT_GI_SWORD_1,      GID_SWORD_KOKIRI,   0xA4,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_MASTER_SWORD] =                        Item(RG_MASTER_SWORD,                     Text{ "Master Sword", "Épée de Legende", "Espada Master"},                                                        ITEMTYPE_ITEM,              0xE0,               true,  &logic->MasterSword,         RHT_MASTER_SWORD,           ITEM_SWORD_MASTER,              OBJECT_TOKI_OBJECTS,    GID_SWORD_BGS,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_MASTER_SWORD].SetCustomDrawFunc(Randomizer_DrawMasterSword);
-    itemTable[RG_GIANTS_KNIFE] =                        Item(RG_GIANTS_KNIFE,                     Text{ "Giant's Knife", "Lame des Géants", "Messer des Riesen" },                                                  ITEMTYPE_ITEM,              GI_SWORD_KNIFE,     true,  &Logic::noVariable,          RHT_GIANTS_KNIFE,           ITEM_SWORD_BGS,                 OBJECT_GI_LONGSWORD,    GID_SWORD_BGS,      0x4B,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_BIGGORON_SWORD] =                      Item(RG_BIGGORON_SWORD,                   Text{ "Biggoron's Sword", "Épée de Biggoron", "Biggoron-Schwert" },                                               ITEMTYPE_ITEM,              GI_SWORD_BGS,       true,  &Logic::BiggoronSword,       RHT_BIGGORON_SWORD,         ITEM_SWORD_BGS,                 OBJECT_GI_LONGSWORD,    GID_SWORD_BGS,      0x0C,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_DEKU_SHIELD] =                         Item(RG_DEKU_SHIELD,                      Text{ "Deku Shield", "Bouclier Mojo", "Deku-Schild" },                                                            ITEMTYPE_ITEM,              GI_SHIELD_DEKU,     false, &Logic::noVariable,          RHT_DEKU_SHIELD,            ITEM_SHIELD_DEKU,               OBJECT_GI_SHIELD_1,     GID_SHIELD_DEKU,    0x4C,                        0xA0, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_HYLIAN_SHIELD] =                       Item(RG_HYLIAN_SHIELD,                    Text{ "Hylian Shield", "Bouclier Hylien", "Hylia-Schild" },                                                       ITEMTYPE_ITEM,              GI_SHIELD_HYLIAN,   false, &Logic::noVariable,          RHT_HYLIAN_SHIELD,          ITEM_SHIELD_HYLIAN,             OBJECT_GI_SHIELD_2,     GID_SHIELD_HYLIAN,  0x4D,                        0xA0, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_MIRROR_SHIELD] =                       Item(RG_MIRROR_SHIELD,                    Text{ "Mirror Shield", "Bouclier Miroir", "Spiegel-Schild" },                                                     ITEMTYPE_ITEM,              GI_SHIELD_MIRROR,   true,  &Logic::MirrorShield,        RHT_MIRROR_SHIELD,          ITEM_SHIELD_MIRROR,             OBJECT_GI_SHIELD_3,     GID_SHIELD_MIRROR,  0x4E,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_GORON_TUNIC] =                         Item(RG_GORON_TUNIC,                      Text{ "Goron Tunic", "Tunique Goron", "Goronen-Tunika" },                                                         ITEMTYPE_ITEM,              GI_TUNIC_GORON,     true,  &Logic::GoronTunic,          RHT_GORON_TUNIC,            ITEM_TUNIC_GORON,               OBJECT_GI_CLOTHES,      GID_TUNIC_GORON,    0x50,                        0xA0, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_ZORA_TUNIC] =                          Item(RG_ZORA_TUNIC,                       Text{ "Zora Tunic", "Tunique Zora", "Zora-Tunika" },                                                              ITEMTYPE_ITEM,              GI_TUNIC_ZORA,      true,  &Logic::ZoraTunic,           RHT_ZORA_TUNIC,             ITEM_TUNIC_ZORA,                OBJECT_GI_CLOTHES,      GID_TUNIC_ZORA,     0x51,                        0xA0, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_IRON_BOOTS] =                          Item(RG_IRON_BOOTS,                       Text{ "Iron Boots", "Bottes de plomb", "Eisenstiefel" },                                                          ITEMTYPE_ITEM,              GI_BOOTS_IRON,      true,  &Logic::IronBoots,           RHT_IRON_BOOTS,             ITEM_BOOTS_IRON,                OBJECT_GI_BOOTS_2,      GID_BOOTS_IRON,     0x53,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_HOVER_BOOTS] =                         Item(RG_HOVER_BOOTS,                      Text{ "Hover Boots", "Bottes de airs", "Gleitstiefel" },                                                          ITEMTYPE_ITEM,              GI_BOOTS_HOVER,     true,  &Logic::HoverBoots,          RHT_HOVER_BOOTS,            ITEM_BOOTS_HOVER,               OBJECT_GI_HOVERBOOTS,   GID_BOOTS_HOVER,    0x54,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_BOOMERANG] =                           Item(RG_BOOMERANG,                        Text{ "Boomerang", "Boomerang", "Bumerang" },                                                                     ITEMTYPE_ITEM,              GI_BOOMERANG,       true,  &Logic::Boomerang,           RHT_BOOMERANG,              ITEM_BOOMERANG,                 OBJECT_GI_BOOMERANG,    GID_BOOMERANG,      0x35,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_LENS_OF_TRUTH] =                       Item(RG_LENS_OF_TRUTH,                    Text{ "Lens of Truth", "Monocle de Vérité", "Auge der Wahrheit" },                                                ITEMTYPE_ITEM,              GI_LENS,            true,  &Logic::LensOfTruth,         RHT_LENS_OF_TRUTH,          ITEM_LENS,                      OBJECT_GI_GLASSES,      GID_LENS,           0x39,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_MEGATON_HAMMER] =                      Item(RG_MEGATON_HAMMER,                   Text{ "Megaton Hammer", "Masse des Titans", "Stahlhammer" },                                                      ITEMTYPE_ITEM,              GI_HAMMER,          true,  &Logic::Hammer,              RHT_MEGATON_HAMMER,         ITEM_HAMMER,                    OBJECT_GI_HAMMER,       GID_HAMMER,         0x38,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_STONE_OF_AGONY] =                      Item(RG_STONE_OF_AGONY,                   Text{ "Stone of Agony", "Pierre de Souffrance", "Stein der Qualen" },                                             ITEMTYPE_ITEM,              GI_STONE_OF_AGONY,  true,  &Logic::ShardOfAgony,        RHT_STONE_OF_AGONY,         ITEM_STONE_OF_AGONY,            OBJECT_GI_MAP,          GID_STONE_OF_AGONY, 0x68,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_DINS_FIRE] =                           Item(RG_DINS_FIRE,                        Text{ "Din's Fire", "Feu de Din", "Dins Feuerinferno" },                                                          ITEMTYPE_ITEM,              GI_DINS_FIRE,       true,  &Logic::DinsFire,            RHT_DINS_FIRE,              ITEM_DINS_FIRE,                 OBJECT_GI_GODDESS,      GID_DINS_FIRE,      0xAD,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_FARORES_WIND] =                        Item(RG_FARORES_WIND,                     Text{ "Farore's Wind", "Vent de Farore", "Farores Donnersturm" },                                                 ITEMTYPE_ITEM,              GI_FARORES_WIND,    true,  &Logic::FaroresWind,         RHT_FARORES_WIND,           ITEM_FARORES_WIND,              OBJECT_GI_GODDESS,      GID_FARORES_WIND,   0xAE,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_NAYRUS_LOVE] =                         Item(RG_NAYRUS_LOVE,                      Text{ "Nayru's Love", "Amour de Nayru", "Nayrus Umarmung" },                                                      ITEMTYPE_ITEM,              GI_NAYRUS_LOVE,     true,  &Logic::NayrusLove,          RHT_NAYRUS_LOVE,            ITEM_NAYRUS_LOVE,               OBJECT_GI_GODDESS,      GID_NAYRUS_LOVE,    0xAF,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_FIRE_ARROWS] =                         Item(RG_FIRE_ARROWS,                      Text{ "Fire Arrow", "Flèche de Feu", "Feuerpfeile" },                                                             ITEMTYPE_ITEM,              GI_ARROW_FIRE,      true,  &Logic::FireArrows,          RHT_FIRE_ARROWS,            ITEM_ARROW_FIRE,                OBJECT_GI_M_ARROW,      GID_ARROW_FIRE,     0x70,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_ICE_ARROWS] =                          Item(RG_ICE_ARROWS,                       Text{ "Ice Arrow", "Flèche de Glace", "Eispfeil" },                                                               ITEMTYPE_ITEM,              GI_ARROW_ICE,       true,  &Logic::IceArrows,           RHT_ICE_ARROWS,             ITEM_ARROW_ICE,                 OBJECT_GI_M_ARROW,      GID_ARROW_ICE,      0x71,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_LIGHT_ARROWS] =                        Item(RG_LIGHT_ARROWS,                     Text{ "Light Arrow", "Flèche de Lumière", "Lichtpfeil" },                                                         ITEMTYPE_ITEM,              GI_ARROW_LIGHT,     true,  &Logic::LightArrows,         RHT_LIGHT_ARROWS,           ITEM_ARROW_LIGHT,               OBJECT_GI_M_ARROW,      GID_ARROW_LIGHT,    0x72,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_GERUDO_MEMBERSHIP_CARD] =              Item(RG_GERUDO_MEMBERSHIP_CARD,           Text{ "Gerudo Membership Card", "Carte Gerudo", "Gerudo Karte" },                                                 ITEMTYPE_ITEM,              GI_GERUDO_CARD,     true,  &Logic::GerudoToken,         RHT_GERUDO_MEMBERSHIP_CARD, ITEM_GERUDO_CARD,               OBJECT_GI_GERUDO,       GID_GERUDO_CARD,    0x7B,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_MAGIC_BEAN] =                          Item(RG_MAGIC_BEAN,                       Text{ "Magic Bean", "Haricots Magiques", "Wundererbse" },                                                         ITEMTYPE_ITEM,              GI_BEAN,            true,  &Logic::MagicBean,           RHT_MAGIC_BEAN,             ITEM_BEAN,                      OBJECT_GI_BEAN,         GID_BEAN,           0x48,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_MAGIC_BEAN_PACK] =                     Item(RG_MAGIC_BEAN_PACK,                  Text{ "Magic Bean Pack", "Paquet de Haricots Magiques", "Wundererbsen-Packung" },                                 ITEMTYPE_ITEM,              RG_MAGIC_BEAN_PACK, true,  &Logic::MagicBeanPack,       RHT_MAGIC_BEAN_PACK,        RG_MAGIC_BEAN_PACK,             OBJECT_GI_BEAN,         GID_BEAN,           TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_DOUBLE_DEFENSE] =                      Item(RG_DOUBLE_DEFENSE,                   Text{ "Double Defense", "Double Défence", "Doppelte Verteidigung" },                                              ITEMTYPE_ITEM,              RG_DOUBLE_DEFENSE,  true,  &Logic::DoubleDefense,       RHT_DOUBLE_DEFENSE,         RG_DOUBLE_DEFENSE,              OBJECT_GI_HEARTS,       GID_HEART_CONTAINER,0xE9,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_GIANTS_KNIFE] =                        Item(RG_GIANTS_KNIFE,                     Text{ "Giant's Knife", "Lame des Géants", "Messer des Riesen" },                                                  ITEMTYPE_ITEM,              GI_SWORD_KNIFE,     true,  &logic->noVariable,          RHT_GIANTS_KNIFE,           ITEM_SWORD_BGS,                 OBJECT_GI_LONGSWORD,    GID_SWORD_BGS,      0x4B,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BIGGORON_SWORD] =                      Item(RG_BIGGORON_SWORD,                   Text{ "Biggoron's Sword", "Épée de Biggoron", "Biggoron-Schwert" },                                               ITEMTYPE_ITEM,              GI_SWORD_BGS,       true,  &logic->BiggoronSword,       RHT_BIGGORON_SWORD,         ITEM_SWORD_BGS,                 OBJECT_GI_LONGSWORD,    GID_SWORD_BGS,      0x0C,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_DEKU_SHIELD] =                         Item(RG_DEKU_SHIELD,                      Text{ "Deku Shield", "Bouclier Mojo", "Deku-Schild" },                                                            ITEMTYPE_ITEM,              GI_SHIELD_DEKU,     false, &logic->noVariable,          RHT_DEKU_SHIELD,            ITEM_SHIELD_DEKU,               OBJECT_GI_SHIELD_1,     GID_SHIELD_DEKU,    0x4C,                        0xA0, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_HYLIAN_SHIELD] =                       Item(RG_HYLIAN_SHIELD,                    Text{ "Hylian Shield", "Bouclier Hylien", "Hylia-Schild" },                                                       ITEMTYPE_ITEM,              GI_SHIELD_HYLIAN,   false, &logic->noVariable,          RHT_HYLIAN_SHIELD,          ITEM_SHIELD_HYLIAN,             OBJECT_GI_SHIELD_2,     GID_SHIELD_HYLIAN,  0x4D,                        0xA0, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_MIRROR_SHIELD] =                       Item(RG_MIRROR_SHIELD,                    Text{ "Mirror Shield", "Bouclier Miroir", "Spiegel-Schild" },                                                     ITEMTYPE_ITEM,              GI_SHIELD_MIRROR,   true,  &logic->MirrorShield,        RHT_MIRROR_SHIELD,          ITEM_SHIELD_MIRROR,             OBJECT_GI_SHIELD_3,     GID_SHIELD_MIRROR,  0x4E,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_GORON_TUNIC] =                         Item(RG_GORON_TUNIC,                      Text{ "Goron Tunic", "Tunique Goron", "Goronen-Tunika" },                                                         ITEMTYPE_ITEM,              GI_TUNIC_GORON,     true,  &logic->GoronTunic,          RHT_GORON_TUNIC,            ITEM_TUNIC_GORON,               OBJECT_GI_CLOTHES,      GID_TUNIC_GORON,    0x50,                        0xA0, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_ZORA_TUNIC] =                          Item(RG_ZORA_TUNIC,                       Text{ "Zora Tunic", "Tunique Zora", "Zora-Tunika" },                                                              ITEMTYPE_ITEM,              GI_TUNIC_ZORA,      true,  &logic->ZoraTunic,           RHT_ZORA_TUNIC,             ITEM_TUNIC_ZORA,                OBJECT_GI_CLOTHES,      GID_TUNIC_ZORA,     0x51,                        0xA0, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_IRON_BOOTS] =                          Item(RG_IRON_BOOTS,                       Text{ "Iron Boots", "Bottes de plomb", "Eisenstiefel" },                                                          ITEMTYPE_ITEM,              GI_BOOTS_IRON,      true,  &logic->IronBoots,           RHT_IRON_BOOTS,             ITEM_BOOTS_IRON,                OBJECT_GI_BOOTS_2,      GID_BOOTS_IRON,     0x53,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_HOVER_BOOTS] =                         Item(RG_HOVER_BOOTS,                      Text{ "Hover Boots", "Bottes de airs", "Gleitstiefel" },                                                          ITEMTYPE_ITEM,              GI_BOOTS_HOVER,     true,  &logic->HoverBoots,          RHT_HOVER_BOOTS,            ITEM_BOOTS_HOVER,               OBJECT_GI_HOVERBOOTS,   GID_BOOTS_HOVER,    0x54,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BOOMERANG] =                           Item(RG_BOOMERANG,                        Text{ "Boomerang", "Boomerang", "Bumerang" },                                                                     ITEMTYPE_ITEM,              GI_BOOMERANG,       true,  &logic->Boomerang,           RHT_BOOMERANG,              ITEM_BOOMERANG,                 OBJECT_GI_BOOMERANG,    GID_BOOMERANG,      0x35,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_LENS_OF_TRUTH] =                       Item(RG_LENS_OF_TRUTH,                    Text{ "Lens of Truth", "Monocle de Vérité", "Auge der Wahrheit" },                                                ITEMTYPE_ITEM,              GI_LENS,            true,  &logic->LensOfTruth,         RHT_LENS_OF_TRUTH,          ITEM_LENS,                      OBJECT_GI_GLASSES,      GID_LENS,           0x39,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_MEGATON_HAMMER] =                      Item(RG_MEGATON_HAMMER,                   Text{ "Megaton Hammer", "Masse des Titans", "Stahlhammer" },                                                      ITEMTYPE_ITEM,              GI_HAMMER,          true,  &logic->Hammer,              RHT_MEGATON_HAMMER,         ITEM_HAMMER,                    OBJECT_GI_HAMMER,       GID_HAMMER,         0x38,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_STONE_OF_AGONY] =                      Item(RG_STONE_OF_AGONY,                   Text{ "Stone of Agony", "Pierre de Souffrance", "Stein der Qualen" },                                             ITEMTYPE_ITEM,              GI_STONE_OF_AGONY,  true,  &logic->ShardOfAgony,        RHT_STONE_OF_AGONY,         ITEM_STONE_OF_AGONY,            OBJECT_GI_MAP,          GID_STONE_OF_AGONY, 0x68,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_DINS_FIRE] =                           Item(RG_DINS_FIRE,                        Text{ "Din's Fire", "Feu de Din", "Dins Feuerinferno" },                                                          ITEMTYPE_ITEM,              GI_DINS_FIRE,       true,  &logic->DinsFire,            RHT_DINS_FIRE,              ITEM_DINS_FIRE,                 OBJECT_GI_GODDESS,      GID_DINS_FIRE,      0xAD,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_FARORES_WIND] =                        Item(RG_FARORES_WIND,                     Text{ "Farore's Wind", "Vent de Farore", "Farores Donnersturm" },                                                 ITEMTYPE_ITEM,              GI_FARORES_WIND,    true,  &logic->FaroresWind,         RHT_FARORES_WIND,           ITEM_FARORES_WIND,              OBJECT_GI_GODDESS,      GID_FARORES_WIND,   0xAE,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_NAYRUS_LOVE] =                         Item(RG_NAYRUS_LOVE,                      Text{ "Nayru's Love", "Amour de Nayru", "Nayrus Umarmung" },                                                      ITEMTYPE_ITEM,              GI_NAYRUS_LOVE,     true,  &logic->NayrusLove,          RHT_NAYRUS_LOVE,            ITEM_NAYRUS_LOVE,               OBJECT_GI_GODDESS,      GID_NAYRUS_LOVE,    0xAF,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_FIRE_ARROWS] =                         Item(RG_FIRE_ARROWS,                      Text{ "Fire Arrow", "Flèche de Feu", "Feuerpfeile" },                                                             ITEMTYPE_ITEM,              GI_ARROW_FIRE,      true,  &logic->FireArrows,          RHT_FIRE_ARROWS,            ITEM_ARROW_FIRE,                OBJECT_GI_M_ARROW,      GID_ARROW_FIRE,     0x70,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_ICE_ARROWS] =                          Item(RG_ICE_ARROWS,                       Text{ "Ice Arrow", "Flèche de Glace", "Eispfeil" },                                                               ITEMTYPE_ITEM,              GI_ARROW_ICE,       true,  &logic->IceArrows,           RHT_ICE_ARROWS,             ITEM_ARROW_ICE,                 OBJECT_GI_M_ARROW,      GID_ARROW_ICE,      0x71,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_LIGHT_ARROWS] =                        Item(RG_LIGHT_ARROWS,                     Text{ "Light Arrow", "Flèche de Lumière", "Lichtpfeil" },                                                         ITEMTYPE_ITEM,              GI_ARROW_LIGHT,     true,  &logic->LightArrows,         RHT_LIGHT_ARROWS,           ITEM_ARROW_LIGHT,               OBJECT_GI_M_ARROW,      GID_ARROW_LIGHT,    0x72,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_GERUDO_MEMBERSHIP_CARD] =              Item(RG_GERUDO_MEMBERSHIP_CARD,           Text{ "Gerudo Membership Card", "Carte Gerudo", "Gerudo Karte" },                                                 ITEMTYPE_ITEM,              GI_GERUDO_CARD,     true,  &logic->GerudoToken,         RHT_GERUDO_MEMBERSHIP_CARD, ITEM_GERUDO_CARD,               OBJECT_GI_GERUDO,       GID_GERUDO_CARD,    0x7B,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_MAGIC_BEAN] =                          Item(RG_MAGIC_BEAN,                       Text{ "Magic Bean", "Haricots Magiques", "Wundererbse" },                                                         ITEMTYPE_ITEM,              GI_BEAN,            true,  &logic->MagicBean,           RHT_MAGIC_BEAN,             ITEM_BEAN,                      OBJECT_GI_BEAN,         GID_BEAN,           0x48,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_MAGIC_BEAN_PACK] =                     Item(RG_MAGIC_BEAN_PACK,                  Text{ "Magic Bean Pack", "Paquet de Haricots Magiques", "Wundererbsen-Packung" },                                 ITEMTYPE_ITEM,              RG_MAGIC_BEAN_PACK, true,  &logic->MagicBeanPack,       RHT_MAGIC_BEAN_PACK,        RG_MAGIC_BEAN_PACK,             OBJECT_GI_BEAN,         GID_BEAN,           TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_DOUBLE_DEFENSE] =                      Item(RG_DOUBLE_DEFENSE,                   Text{ "Double Defense", "Double Défence", "Doppelte Verteidigung" },                                              ITEMTYPE_ITEM,              RG_DOUBLE_DEFENSE,  true,  &logic->DoubleDefense,       RHT_DOUBLE_DEFENSE,         RG_DOUBLE_DEFENSE,              OBJECT_GI_HEARTS,       GID_HEART_CONTAINER,0xE9,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
     itemTable[RG_DOUBLE_DEFENSE].SetCustomDrawFunc(Randomizer_DrawDoubleDefense);
     // Trade Quest Items
-    itemTable[RG_WEIRD_EGG] =                           Item(RG_WEIRD_EGG,                        Text{ "Weird Egg", "Oeuf Curieux", "Seltsames Ei" },                                                              ITEMTYPE_ITEM,              GI_WEIRD_EGG,       true,  &Logic::WeirdEgg,            RHT_WEIRD_EGG,              ITEM_WEIRD_EGG,                 OBJECT_GI_EGG,          GID_EGG,            0x9A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_ZELDAS_LETTER] =                       Item(RG_ZELDAS_LETTER,                    Text{ "Zelda's Letter", "Lettre de Zelda", "Zeldas Brief" },                                                      ITEMTYPE_ITEM,              GI_LETTER_ZELDA,    true,  &Logic::ZeldasLetter,        RHT_ZELDAS_LETTER,          ITEM_LETTER_ZELDA,              OBJECT_GI_LETTER,       GID_LETTER_ZELDA,   0x69,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_POCKET_EGG] =                          Item(RG_POCKET_EGG,                       Text{ "Pocket Egg", "Oeuf de poche", "Taschenei" },                                                               ITEMTYPE_ITEM,              GI_POCKET_EGG,      true,  &Logic::PocketEgg,           RHT_POCKET_EGG,             ITEM_POCKET_EGG,                OBJECT_GI_EGG,          GID_EGG,            0x01,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_COJIRO] =                              Item(RG_COJIRO,                           Text{ "Cojiro", "P'tit Poulet", "Cojiro" },                                                                       ITEMTYPE_ITEM,              GI_COJIRO,          true,  &Logic::Cojiro,              RHT_COJIRO,                 ITEM_COJIRO,                    OBJECT_GI_NIWATORI,     GID_COJIRO,         0x02,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_ODD_MUSHROOM] =                        Item(RG_ODD_MUSHROOM,                     Text{ "Odd Mushroom", "Champigon Suspect", "Seltsamer Pilz" },                                                    ITEMTYPE_ITEM,              GI_ODD_MUSHROOM,    true,  &Logic::OddMushroom,         RHT_ODD_MUSHROOM,           ITEM_ODD_MUSHROOM,              OBJECT_GI_MUSHROOM,     GID_ODD_MUSHROOM,   0x03,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_ODD_POTION] =                          Item(RG_ODD_POTION,                       Text{ "Odd Potion", "Mixture Suspecte", "Seltsamer Trank" },                                                      ITEMTYPE_ITEM,              GI_ODD_POTION,      true,  &Logic::OddPoultice,         RHT_ODD_POTION,             ITEM_ODD_POTION,                OBJECT_GI_POWDER,       GID_ODD_POTION,     0x04,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_POACHERS_SAW] =                        Item(RG_POACHERS_SAW,                     Text{ "Poacher's Saw", "Scie du Chasseur", "Wilderer-Säge" },                                                     ITEMTYPE_ITEM,              GI_SAW,             true,  &Logic::PoachersSaw,         RHT_POACHERS_SAW,           ITEM_SAW,                       OBJECT_GI_SAW,          GID_SAW,            0x05,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_BROKEN_SWORD] =                        Item(RG_BROKEN_SWORD,                     Text{ "Broken Goron's Sword", "Épée Brisée de Goron", "Schwert des gebrochenen Goronen" },                        ITEMTYPE_ITEM,              GI_SWORD_BROKEN,    true,  &Logic::BrokenSword,         RHT_BROKEN_SWORD,           ITEM_SWORD_BROKEN,              OBJECT_GI_BROKENSWORD,  GID_SWORD_BROKEN,   0x08,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_PRESCRIPTION] =                        Item(RG_PRESCRIPTION,                     Text{ "Prescription", "Ordonnance", "Verschreibung" },                                                            ITEMTYPE_ITEM,              GI_PRESCRIPTION,    true,  &Logic::Prescription,        RHT_PRESCRIPTION,           ITEM_PRESCRIPTION,              OBJECT_GI_PRESCRIPTION, GID_PRESCRIPTION,   0x09,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_EYEBALL_FROG] =                        Item(RG_EYEBALL_FROG,                     Text{ "Eyeball Frog", "Crapaud-qui-louche", "Augapfel-Frosch" },                                                  ITEMTYPE_ITEM,              GI_FROG,            true,  &Logic::EyeballFrog,         RHT_EYEBALL_FROG,           ITEM_FROG,                      OBJECT_GI_FROG,         GID_FROG,           0x0D,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_EYEDROPS] =                            Item(RG_EYEDROPS,                         Text{ "World's Finest Eyedrops", "Super Gouttes", "Supertropfen" },                                               ITEMTYPE_ITEM,              GI_EYEDROPS,        true,  &Logic::Eyedrops,            RHT_EYEDROPS,               ITEM_EYEDROPS,                  OBJECT_GI_EYE_LOTION,   GID_EYEDROPS,       0x0E,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_CLAIM_CHECK] =                         Item(RG_CLAIM_CHECK,                      Text{ "Claim Check", "Certificat", "Quittung" },                                                                  ITEMTYPE_ITEM,              GI_CLAIM_CHECK,     true,  &Logic::ClaimCheck,          RHT_CLAIM_CHECK,            ITEM_CLAIM_CHECK,               OBJECT_GI_TICKETSTONE,  GID_CLAIM_CHECK,    0x0A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_WEIRD_EGG] =                           Item(RG_WEIRD_EGG,                        Text{ "Weird Egg", "Oeuf Curieux", "Seltsames Ei" },                                                              ITEMTYPE_ITEM,              GI_WEIRD_EGG,       true,  &logic->WeirdEgg,            RHT_WEIRD_EGG,              ITEM_WEIRD_EGG,                 OBJECT_GI_EGG,          GID_EGG,            0x9A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_ZELDAS_LETTER] =                       Item(RG_ZELDAS_LETTER,                    Text{ "Zelda's Letter", "Lettre de Zelda", "Zeldas Brief" },                                                      ITEMTYPE_ITEM,              GI_LETTER_ZELDA,    true,  &logic->ZeldasLetter,        RHT_ZELDAS_LETTER,          ITEM_LETTER_ZELDA,              OBJECT_GI_LETTER,       GID_LETTER_ZELDA,   0x69,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_POCKET_EGG] =                          Item(RG_POCKET_EGG,                       Text{ "Pocket Egg", "Oeuf de poche", "Taschenei" },                                                               ITEMTYPE_ITEM,              GI_POCKET_EGG,      true,  &logic->PocketEgg,           RHT_POCKET_EGG,             ITEM_POCKET_EGG,                OBJECT_GI_EGG,          GID_EGG,            0x01,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_COJIRO] =                              Item(RG_COJIRO,                           Text{ "Cojiro", "P'tit Poulet", "Cojiro" },                                                                       ITEMTYPE_ITEM,              GI_COJIRO,          true,  &logic->Cojiro,              RHT_COJIRO,                 ITEM_COJIRO,                    OBJECT_GI_NIWATORI,     GID_COJIRO,         0x02,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_ODD_MUSHROOM] =                        Item(RG_ODD_MUSHROOM,                     Text{ "Odd Mushroom", "Champigon Suspect", "Seltsamer Pilz" },                                                    ITEMTYPE_ITEM,              GI_ODD_MUSHROOM,    true,  &logic->OddMushroom,         RHT_ODD_MUSHROOM,           ITEM_ODD_MUSHROOM,              OBJECT_GI_MUSHROOM,     GID_ODD_MUSHROOM,   0x03,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_ODD_POTION] =                          Item(RG_ODD_POTION,                       Text{ "Odd Potion", "Mixture Suspecte", "Seltsamer Trank" },                                                      ITEMTYPE_ITEM,              GI_ODD_POTION,      true,  &logic->OddPoultice,         RHT_ODD_POTION,             ITEM_ODD_POTION,                OBJECT_GI_POWDER,       GID_ODD_POTION,     0x04,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_POACHERS_SAW] =                        Item(RG_POACHERS_SAW,                     Text{ "Poacher's Saw", "Scie du Chasseur", "Wilderer-Säge" },                                                     ITEMTYPE_ITEM,              GI_SAW,             true,  &logic->PoachersSaw,         RHT_POACHERS_SAW,           ITEM_SAW,                       OBJECT_GI_SAW,          GID_SAW,            0x05,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BROKEN_SWORD] =                        Item(RG_BROKEN_SWORD,                     Text{ "Broken Goron's Sword", "Épée Brisée de Goron", "Schwert des gebrochenen Goronen" },                        ITEMTYPE_ITEM,              GI_SWORD_BROKEN,    true,  &logic->BrokenSword,         RHT_BROKEN_SWORD,           ITEM_SWORD_BROKEN,              OBJECT_GI_BROKENSWORD,  GID_SWORD_BROKEN,   0x08,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_PRESCRIPTION] =                        Item(RG_PRESCRIPTION,                     Text{ "Prescription", "Ordonnance", "Verschreibung" },                                                            ITEMTYPE_ITEM,              GI_PRESCRIPTION,    true,  &logic->Prescription,        RHT_PRESCRIPTION,           ITEM_PRESCRIPTION,              OBJECT_GI_PRESCRIPTION, GID_PRESCRIPTION,   0x09,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_EYEBALL_FROG] =                        Item(RG_EYEBALL_FROG,                     Text{ "Eyeball Frog", "Crapaud-qui-louche", "Augapfel-Frosch" },                                                  ITEMTYPE_ITEM,              GI_FROG,            true,  &logic->EyeballFrog,         RHT_EYEBALL_FROG,           ITEM_FROG,                      OBJECT_GI_FROG,         GID_FROG,           0x0D,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_EYEDROPS] =                            Item(RG_EYEDROPS,                         Text{ "World's Finest Eyedrops", "Super Gouttes", "Supertropfen" },                                               ITEMTYPE_ITEM,              GI_EYEDROPS,        true,  &logic->Eyedrops,            RHT_EYEDROPS,               ITEM_EYEDROPS,                  OBJECT_GI_EYE_LOTION,   GID_EYEDROPS,       0x0E,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_CLAIM_CHECK] =                         Item(RG_CLAIM_CHECK,                      Text{ "Claim Check", "Certificat", "Quittung" },                                                                  ITEMTYPE_ITEM,              GI_CLAIM_CHECK,     true,  &logic->ClaimCheck,          RHT_CLAIM_CHECK,            ITEM_CLAIM_CHECK,               OBJECT_GI_TICKETSTONE,  GID_CLAIM_CHECK,    0x0A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
     // Skulltula Token
-    itemTable[RG_GOLD_SKULLTULA_TOKEN] =                Item(RG_GOLD_SKULLTULA_TOKEN,             Text{ "Gold Skulltula Token", "Symbole de Skulltula d'Or", "Goldenes Skulltula-Symbol" },                         ITEMTYPE_TOKEN,             GI_SKULL_TOKEN,     true,  &Logic::GoldSkulltulaTokens, RHT_GOLD_SKULLTULA_TOKEN,   ITEM_SKULL_TOKEN,               OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    0xB4,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SKULLTULA_TOKEN, MOD_NONE);
+    itemTable[RG_GOLD_SKULLTULA_TOKEN] =                Item(RG_GOLD_SKULLTULA_TOKEN,             Text{ "Gold Skulltula Token", "Symbole de Skulltula d'Or", "Goldenes Skulltula-Symbol" },                         ITEMTYPE_TOKEN,             GI_SKULL_TOKEN,     true,  &logic->GoldSkulltulaTokens, RHT_GOLD_SKULLTULA_TOKEN,   ITEM_SKULL_TOKEN,               OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    0xB4,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SKULLTULA_TOKEN, MOD_NONE);
     // Progressive Items
-    itemTable[RG_PROGRESSIVE_HOOKSHOT] =                Item(RG_PROGRESSIVE_HOOKSHOT,             Text{ "Progressive Hookshot", "Grappin (prog.)", "Progressiver Fanghaken" },                                      ITEMTYPE_ITEM,              0x80,               true,  &Logic::ProgressiveHookshot, RHT_PROGRESSIVE_HOOKSHOT, true);
-    itemTable[RG_PROGRESSIVE_STRENGTH] =                Item(RG_PROGRESSIVE_STRENGTH,             Text{ "Strength Upgrade", "Amélioration de Force (prog.)", "Progressives Kraft-Upgrade" },                        ITEMTYPE_ITEM,              0x81,               true,  &Logic::ProgressiveStrength, RHT_PROGRESSIVE_STRENGTH, true);
-    itemTable[RG_PROGRESSIVE_BOMB_BAG] =                Item(RG_PROGRESSIVE_BOMB_BAG,             Text{ "Progressive Bomb Bag", "Sac de Bombes (prog.)", "Progressive Bombentasche" },                              ITEMTYPE_ITEM,              0x82,               true,  &Logic::ProgressiveBombBag,  RHT_PROGRESSIVE_BOMB_BAG, true);
-    itemTable[RG_PROGRESSIVE_BOW] =                     Item(RG_PROGRESSIVE_BOW,                  Text{ "Progressive Bow", "Arc (prog.)", "Progressiver Bogen" },                                                   ITEMTYPE_ITEM,              0x83,               true,  &Logic::ProgressiveBow,      RHT_PROGRESSIVE_BOW, true);
-    itemTable[RG_PROGRESSIVE_SLINGSHOT] =               Item(RG_PROGRESSIVE_SLINGSHOT,            Text{ "Progressive Slingshot", "Lance-Pierre (prog.)", "Progressive Steinschleuder" },                            ITEMTYPE_ITEM,              0x84,               true,  &Logic::ProgressiveBulletBag,RHT_PROGRESSIVE_SLINGSHOT, true);
-    itemTable[RG_PROGRESSIVE_WALLET] =                  Item(RG_PROGRESSIVE_WALLET,               Text{ "Progressive Wallet", "Bourse (prog.)", "Progressive Brieftasche" },                                        ITEMTYPE_ITEM,              0x85,               true,  &Logic::ProgressiveWallet,   RHT_PROGRESSIVE_WALLET, true);
-    itemTable[RG_PROGRESSIVE_SCALE] =                   Item(RG_PROGRESSIVE_SCALE,                Text{ "Progressive Scale", "Écaille (prog.)", "Progressive Skala" },                                              ITEMTYPE_ITEM,              0x86,               true,  &Logic::ProgressiveScale,    RHT_PROGRESSIVE_SCALE, true);
-    itemTable[RG_PROGRESSIVE_NUT_UPGRADE] =             Item(RG_PROGRESSIVE_NUT_UPGRADE,          Text{ "Progressive Nut Capacity", "Capacité de Noix (prog.)", "Progressive Nusskapazität" },                      ITEMTYPE_ITEM,              0x87,               false, &Logic::noVariable,          RHT_PROGRESSIVE_NUT_UPGRADE, true);
-    itemTable[RG_PROGRESSIVE_STICK_UPGRADE] =           Item(RG_PROGRESSIVE_STICK_UPGRADE,        Text{ "Progressive Stick Capacity", "Capacité de Bâtons (prog.)", "Progressive Stick-Kapazität" },                ITEMTYPE_ITEM,              0x88,               false, &Logic::noVariable,          RHT_PROGRESSIVE_STICK_UPGRADE, true);
-    itemTable[RG_PROGRESSIVE_BOMBCHUS] =                Item(RG_PROGRESSIVE_BOMBCHUS,             Text{ "Progressive Bombchu", "Missiles (prog.)", "Progressive Kriechgrube" },                                     ITEMTYPE_ITEM,              0x89,               true,  &Logic::Bombchus,            RHT_PROGRESSIVE_BOMBCHUS,   RG_PROGRESSIVE_BOMBCHUS,        OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER, true);
-    itemTable[RG_PROGRESSIVE_MAGIC_METER] =             Item(RG_PROGRESSIVE_MAGIC_METER,          Text{ "Progressive Magic Meter", "Jauge de Magie (prog.)", "Progressives magisches Messgerät" },                  ITEMTYPE_ITEM,              0x8A,               true,  &Logic::ProgressiveMagic,    RHT_PROGRESSIVE_MAGIC_METER, true);
-    itemTable[RG_PROGRESSIVE_OCARINA] =                 Item(RG_PROGRESSIVE_OCARINA,              Text{ "Progressive Ocarina", "Ocarina (prog.)", "Progressive Okarina" },                                          ITEMTYPE_ITEM,              0x8B,               true,  &Logic::ProgressiveOcarina,  RHT_PROGRESSIVE_OCARINA, true);
-    itemTable[RG_PROGRESSIVE_GORONSWORD] =              Item(RG_PROGRESSIVE_GORONSWORD,           Text{ "Progressive Goron Sword", "Épée Goron (prog.)", "Progressives Goronenschwert" },                           ITEMTYPE_ITEM,              0xD4,               true,  &Logic::ProgressiveGiantKnife,RHT_PROGRESSIVE_GORONSWORD, true);
+    itemTable[RG_PROGRESSIVE_HOOKSHOT] =                Item(RG_PROGRESSIVE_HOOKSHOT,             Text{ "Progressive Hookshot", "Grappin (prog.)", "Progressiver Fanghaken" },                                      ITEMTYPE_ITEM,              0x80,               true,  &logic->ProgressiveHookshot, RHT_PROGRESSIVE_HOOKSHOT, true);
+    itemTable[RG_PROGRESSIVE_STRENGTH] =                Item(RG_PROGRESSIVE_STRENGTH,             Text{ "Strength Upgrade", "Amélioration de Force (prog.)", "Progressives Kraft-Upgrade" },                        ITEMTYPE_ITEM,              0x81,               true,  &logic->ProgressiveStrength, RHT_PROGRESSIVE_STRENGTH, true);
+    itemTable[RG_PROGRESSIVE_BOMB_BAG] =                Item(RG_PROGRESSIVE_BOMB_BAG,             Text{ "Progressive Bomb Bag", "Sac de Bombes (prog.)", "Progressive Bombentasche" },                              ITEMTYPE_ITEM,              0x82,               true,  &logic->ProgressiveBombBag,  RHT_PROGRESSIVE_BOMB_BAG, true);
+    itemTable[RG_PROGRESSIVE_BOW] =                     Item(RG_PROGRESSIVE_BOW,                  Text{ "Progressive Bow", "Arc (prog.)", "Progressiver Bogen" },                                                   ITEMTYPE_ITEM,              0x83,               true,  &logic->ProgressiveBow,      RHT_PROGRESSIVE_BOW, true);
+    itemTable[RG_PROGRESSIVE_SLINGSHOT] =               Item(RG_PROGRESSIVE_SLINGSHOT,            Text{ "Progressive Slingshot", "Lance-Pierre (prog.)", "Progressive Steinschleuder" },                            ITEMTYPE_ITEM,              0x84,               true,  &logic->ProgressiveBulletBag,RHT_PROGRESSIVE_SLINGSHOT, true);
+    itemTable[RG_PROGRESSIVE_WALLET] =                  Item(RG_PROGRESSIVE_WALLET,               Text{ "Progressive Wallet", "Bourse (prog.)", "Progressive Brieftasche" },                                        ITEMTYPE_ITEM,              0x85,               true,  &logic->ProgressiveWallet,   RHT_PROGRESSIVE_WALLET, true);
+    itemTable[RG_PROGRESSIVE_SCALE] =                   Item(RG_PROGRESSIVE_SCALE,                Text{ "Progressive Scale", "Écaille (prog.)", "Progressive Skala" },                                              ITEMTYPE_ITEM,              0x86,               true,  &logic->ProgressiveScale,    RHT_PROGRESSIVE_SCALE, true);
+    itemTable[RG_PROGRESSIVE_NUT_UPGRADE] =             Item(RG_PROGRESSIVE_NUT_UPGRADE,          Text{ "Progressive Nut Capacity", "Capacité de Noix (prog.)", "Progressive Nusskapazität" },                      ITEMTYPE_ITEM,              0x87,               false, &logic->noVariable,          RHT_PROGRESSIVE_NUT_UPGRADE, true);
+    itemTable[RG_PROGRESSIVE_STICK_UPGRADE] =           Item(RG_PROGRESSIVE_STICK_UPGRADE,        Text{ "Progressive Stick Capacity", "Capacité de Bâtons (prog.)", "Progressive Stick-Kapazität" },                ITEMTYPE_ITEM,              0x88,               false, &logic->noVariable,          RHT_PROGRESSIVE_STICK_UPGRADE, true);
+    itemTable[RG_PROGRESSIVE_BOMBCHUS] =                Item(RG_PROGRESSIVE_BOMBCHUS,             Text{ "Progressive Bombchu", "Missiles (prog.)", "Progressive Kriechgrube" },                                     ITEMTYPE_ITEM,              0x89,               true,  &logic->Bombchus,            RHT_PROGRESSIVE_BOMBCHUS,   RG_PROGRESSIVE_BOMBCHUS,        OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER, true);
+    itemTable[RG_PROGRESSIVE_MAGIC_METER] =             Item(RG_PROGRESSIVE_MAGIC_METER,          Text{ "Progressive Magic Meter", "Jauge de Magie (prog.)", "Progressives magisches Messgerät" },                  ITEMTYPE_ITEM,              0x8A,               true,  &logic->ProgressiveMagic,    RHT_PROGRESSIVE_MAGIC_METER, true);
+    itemTable[RG_PROGRESSIVE_OCARINA] =                 Item(RG_PROGRESSIVE_OCARINA,              Text{ "Progressive Ocarina", "Ocarina (prog.)", "Progressive Okarina" },                                          ITEMTYPE_ITEM,              0x8B,               true,  &logic->ProgressiveOcarina,  RHT_PROGRESSIVE_OCARINA, true);
+    itemTable[RG_PROGRESSIVE_GORONSWORD] =              Item(RG_PROGRESSIVE_GORONSWORD,           Text{ "Progressive Goron Sword", "Épée Goron (prog.)", "Progressives Goronenschwert" },                           ITEMTYPE_ITEM,              0xD4,               true,  &logic->ProgressiveGiantKnife,RHT_PROGRESSIVE_GORONSWORD, true);
     // Bottles
-    itemTable[RG_EMPTY_BOTTLE] =                        Item(RG_EMPTY_BOTTLE,                     Text{ "Empty Bottle", "Bouteille Vide", "Leere Flasche" },                                                        ITEMTYPE_ITEM,              GI_BOTTLE,          true,  &Logic::Bottles,             RHT_BOTTLE_WITH_MILK,       ITEM_BOTTLE,                    OBJECT_GI_BOTTLE,       GID_BOTTLE,         0x42,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_BOTTLE_WITH_MILK] =                    Item(RG_BOTTLE_WITH_MILK,                 Text{ "Bottle with Milk", "Bouteille avec du Lait", "Flasche mit Milch" },                                        ITEMTYPE_ITEM,              GI_MILK_BOTTLE,     true,  &Logic::Bottles,             RHT_BOTTLE_WITH_MILK,       ITEM_MILK_BOTTLE,               OBJECT_GI_MILK,         GID_MILK,           0x98,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_BOTTLE_WITH_RED_POTION] =              Item(RG_BOTTLE_WITH_RED_POTION,           Text{ "Bottle with Red Potion", "Bouteille avec une Potion Rouge", "Flasche mit rotem Elixier" },                 ITEMTYPE_ITEM,              0x8C,               true,  &Logic::Bottles,             RHT_BOTTLE_WITH_RED_POTION, RG_BOTTLE_WITH_RED_POTION,      OBJECT_GI_LIQUID,       GID_POTION_RED,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_BOTTLE_WITH_GREEN_POTION] =            Item(RG_BOTTLE_WITH_GREEN_POTION,         Text{ "Bottle with Green Potion", "Bouteille avec une Potion Verte", "Flasche mit grünem Elixier" },              ITEMTYPE_ITEM,              0x8D,               true,  &Logic::Bottles,             RHT_BOTTLE_WITH_GREEN_POTION,RG_BOTTLE_WITH_GREEN_POTION,   OBJECT_GI_LIQUID,       GID_POTION_GREEN,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_BOTTLE_WITH_BLUE_POTION] =             Item(RG_BOTTLE_WITH_BLUE_POTION,          Text{ "Bottle with Blue Potion", "Bouteille avec une Potion Bleue", "Flasche mit blauem Elixier" },               ITEMTYPE_ITEM,              0x8E,               true,  &Logic::Bottles,             RHT_BOTTLE_WITH_BLUE_POTION,RG_BOTTLE_WITH_BLUE_POTION,     OBJECT_GI_LIQUID,       GID_POTION_BLUE,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_BOTTLE_WITH_FAIRY] =                   Item(RG_BOTTLE_WITH_FAIRY,                Text{ "Bottle with Fairy", "Bouteille avec une Fée", "Flasche mit Fee" },                                         ITEMTYPE_ITEM,              0x8F,               true,  &Logic::Bottles,             RHT_BOTTLE_WITH_FAIRY,      RG_BOTTLE_WITH_FAIRY,           OBJECT_GI_BOTTLE,       GID_BOTTLE,         TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_BOTTLE_WITH_FISH] =                    Item(RG_BOTTLE_WITH_FISH,                 Text{ "Bottle with Fish", "Bouteille avec un Poisson", "Flasche mit Fisch" },                                     ITEMTYPE_ITEM,              0x90,               true,  &Logic::Bottles,             RHT_BOTTLE_WITH_FISH,       RG_BOTTLE_WITH_FISH,            OBJECT_GI_FISH,         GID_FISH,           TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_BOTTLE_WITH_BLUE_FIRE] =               Item(RG_BOTTLE_WITH_BLUE_FIRE,            Text{ "Bottle with Blue Fire", "Bouteille avec une Flamme Bleue", "Flasche mit blauem Feuer" },                   ITEMTYPE_ITEM,              0x91,               true,  &Logic::Bottles,             RHT_BOTTLE_WITH_BLUE_FIRE,  RG_BOTTLE_WITH_BLUE_FIRE,       OBJECT_GI_FIRE,         GID_BLUE_FIRE,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_BOTTLE_WITH_BUGS] =                    Item(RG_BOTTLE_WITH_BUGS,                 Text{ "Bottle with Bugs", "Bouteille avec des Insectes", "Flasche mit Wanzen" },                                  ITEMTYPE_ITEM,              0x92,               true,  &Logic::Bottles,             RHT_BOTTLE_WITH_BUGS,       RG_BOTTLE_WITH_BUGS,            OBJECT_GI_INSECT,       GID_BUG,            TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_BOTTLE_WITH_POE] =                     Item(RG_BOTTLE_WITH_POE,                  Text{ "Bottle with Poe", "Bouteille avec un Esprit", "Flasche mit einem Geist" },                                 ITEMTYPE_ITEM,              0x94,               true,  &Logic::Bottles,             RHT_BOTTLE_WITH_POE,        RG_BOTTLE_WITH_POE,             OBJECT_GI_GHOST,        GID_POE,            TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_RUTOS_LETTER] =                        Item(RG_RUTOS_LETTER,                     Text{ "Bottle with Ruto's Letter", "Bouteille avec la Lettre de Ruto", "Flasche mit Rutos Brief" },               ITEMTYPE_ITEM,              GI_LETTER_RUTO,     true,  &Logic::RutosLetter,         RHT_RUTOS_LETTER,           ITEM_LETTER_RUTO,               OBJECT_GI_BOTTLE_LETTER,GID_LETTER_RUTO,    0x99,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_BOTTLE_WITH_BIG_POE] =                 Item(RG_BOTTLE_WITH_BIG_POE,              Text{ "Bottle with Big Poe", "Bouteille avec une Âme", "Flasche mit Seele" },                                     ITEMTYPE_ITEM,              0x93,               true,  &Logic::BottleWithBigPoe,    RHT_BOTTLE_WITH_BIG_POE,    RG_BOTTLE_WITH_BIG_POE,         OBJECT_GI_GHOST,        GID_BIG_POE,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_EMPTY_BOTTLE] =                        Item(RG_EMPTY_BOTTLE,                     Text{ "Empty Bottle", "Bouteille Vide", "Leere Flasche" },                                                        ITEMTYPE_ITEM,              GI_BOTTLE,          true,  &logic->Bottles,             RHT_BOTTLE_WITH_MILK,       ITEM_BOTTLE,                    OBJECT_GI_BOTTLE,       GID_BOTTLE,         0x42,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BOTTLE_WITH_MILK] =                    Item(RG_BOTTLE_WITH_MILK,                 Text{ "Bottle with Milk", "Bouteille avec du Lait", "Flasche mit Milch" },                                        ITEMTYPE_ITEM,              GI_MILK_BOTTLE,     true,  &logic->Bottles,             RHT_BOTTLE_WITH_MILK,       ITEM_MILK_BOTTLE,               OBJECT_GI_MILK,         GID_MILK,           0x98,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BOTTLE_WITH_RED_POTION] =              Item(RG_BOTTLE_WITH_RED_POTION,           Text{ "Bottle with Red Potion", "Bouteille avec une Potion Rouge", "Flasche mit rotem Elixier" },                 ITEMTYPE_ITEM,              0x8C,               true,  &logic->Bottles,             RHT_BOTTLE_WITH_RED_POTION, RG_BOTTLE_WITH_RED_POTION,      OBJECT_GI_LIQUID,       GID_POTION_RED,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BOTTLE_WITH_GREEN_POTION] =            Item(RG_BOTTLE_WITH_GREEN_POTION,         Text{ "Bottle with Green Potion", "Bouteille avec une Potion Verte", "Flasche mit grünem Elixier" },              ITEMTYPE_ITEM,              0x8D,               true,  &logic->Bottles,             RHT_BOTTLE_WITH_GREEN_POTION,RG_BOTTLE_WITH_GREEN_POTION,   OBJECT_GI_LIQUID,       GID_POTION_GREEN,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BOTTLE_WITH_BLUE_POTION] =             Item(RG_BOTTLE_WITH_BLUE_POTION,          Text{ "Bottle with Blue Potion", "Bouteille avec une Potion Bleue", "Flasche mit blauem Elixier" },               ITEMTYPE_ITEM,              0x8E,               true,  &logic->Bottles,             RHT_BOTTLE_WITH_BLUE_POTION,RG_BOTTLE_WITH_BLUE_POTION,     OBJECT_GI_LIQUID,       GID_POTION_BLUE,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BOTTLE_WITH_FAIRY] =                   Item(RG_BOTTLE_WITH_FAIRY,                Text{ "Bottle with Fairy", "Bouteille avec une Fée", "Flasche mit Fee" },                                         ITEMTYPE_ITEM,              0x8F,               true,  &logic->Bottles,             RHT_BOTTLE_WITH_FAIRY,      RG_BOTTLE_WITH_FAIRY,           OBJECT_GI_BOTTLE,       GID_BOTTLE,         TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BOTTLE_WITH_FISH] =                    Item(RG_BOTTLE_WITH_FISH,                 Text{ "Bottle with Fish", "Bouteille avec un Poisson", "Flasche mit Fisch" },                                     ITEMTYPE_ITEM,              0x90,               true,  &logic->Bottles,             RHT_BOTTLE_WITH_FISH,       RG_BOTTLE_WITH_FISH,            OBJECT_GI_FISH,         GID_FISH,           TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BOTTLE_WITH_BLUE_FIRE] =               Item(RG_BOTTLE_WITH_BLUE_FIRE,            Text{ "Bottle with Blue Fire", "Bouteille avec une Flamme Bleue", "Flasche mit blauem Feuer" },                   ITEMTYPE_ITEM,              0x91,               true,  &logic->Bottles,             RHT_BOTTLE_WITH_BLUE_FIRE,  RG_BOTTLE_WITH_BLUE_FIRE,       OBJECT_GI_FIRE,         GID_BLUE_FIRE,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BOTTLE_WITH_BUGS] =                    Item(RG_BOTTLE_WITH_BUGS,                 Text{ "Bottle with Bugs", "Bouteille avec des Insectes", "Flasche mit Wanzen" },                                  ITEMTYPE_ITEM,              0x92,               true,  &logic->Bottles,             RHT_BOTTLE_WITH_BUGS,       RG_BOTTLE_WITH_BUGS,            OBJECT_GI_INSECT,       GID_BUG,            TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BOTTLE_WITH_POE] =                     Item(RG_BOTTLE_WITH_POE,                  Text{ "Bottle with Poe", "Bouteille avec un Esprit", "Flasche mit einem Geist" },                                 ITEMTYPE_ITEM,              0x94,               true,  &logic->Bottles,             RHT_BOTTLE_WITH_POE,        RG_BOTTLE_WITH_POE,             OBJECT_GI_GHOST,        GID_POE,            TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_RUTOS_LETTER] =                        Item(RG_RUTOS_LETTER,                     Text{ "Bottle with Ruto's Letter", "Bouteille avec la Lettre de Ruto", "Flasche mit Rutos Brief" },               ITEMTYPE_ITEM,              GI_LETTER_RUTO,     true,  &logic->RutosLetter,         RHT_RUTOS_LETTER,           ITEM_LETTER_RUTO,               OBJECT_GI_BOTTLE_LETTER,GID_LETTER_RUTO,    0x99,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BOTTLE_WITH_BIG_POE] =                 Item(RG_BOTTLE_WITH_BIG_POE,              Text{ "Bottle with Big Poe", "Bouteille avec une Âme", "Flasche mit Seele" },                                     ITEMTYPE_ITEM,              0x93,               true,  &logic->BottleWithBigPoe,    RHT_BOTTLE_WITH_BIG_POE,    RG_BOTTLE_WITH_BIG_POE,         OBJECT_GI_GHOST,        GID_BIG_POE,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     // Songs
-    itemTable[RG_ZELDAS_LULLABY] =                      Item(RG_ZELDAS_LULLABY,                   Text{ "Zelda's Lullaby", "Berceuse de Zelda", "Zeldas Wiegenlied" },                                              ITEMTYPE_SONG,              0xC1,               true,  &Logic::ZeldasLullaby,       RHT_ZELDAS_LULLABY,         ITEM_SONG_LULLABY,              OBJECT_GI_MELODY,       GID_SONG_ZELDA,     0xD4,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_EPONAS_SONG] =                         Item(RG_EPONAS_SONG,                      Text{ "Epona's Song", "Chant d'Epona", "Eponas Lied" },                                                           ITEMTYPE_SONG,              0xC2,               true,  &Logic::EponasSong,          RHT_EPONAS_SONG,            ITEM_SONG_EPONA,                OBJECT_GI_MELODY,       GID_SONG_EPONA,     0xD2,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_SARIAS_SONG] =                         Item(RG_SARIAS_SONG,                      Text{ "Saria's Song", "Chant de Saria", "Sarias Lied" },                                                          ITEMTYPE_SONG,              0xC3,               true,  &Logic::SariasSong,          RHT_SARIAS_SONG,            ITEM_SONG_SARIA,                OBJECT_GI_MELODY,       GID_SONG_SARIA,     0xD1,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_SUNS_SONG] =                           Item(RG_SUNS_SONG,                        Text{ "Sun's Song", "Chant du Soleil", "Das Lied der Sonne" },                                                    ITEMTYPE_SONG,              0xC4,               true,  &Logic::SunsSong,            RHT_SUNS_SONG,              ITEM_SONG_SUN,                  OBJECT_GI_MELODY,       GID_SONG_SUN,       0xD3,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_SONG_OF_TIME] =                        Item(RG_SONG_OF_TIME,                     Text{ "Song of Time", "Chant du Temps", "Das Lied der Zeit" },                                                    ITEMTYPE_SONG,              0xC5,               true,  &Logic::SongOfTime,          RHT_SONG_OF_TIME,           ITEM_SONG_TIME,                 OBJECT_GI_MELODY,       GID_SONG_TIME,      0xD5,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_SONG_OF_STORMS] =                      Item(RG_SONG_OF_STORMS,                   Text{ "Song of Storms", "Chant des Tempêtes", "Lied der Stürme" },                                                ITEMTYPE_SONG,              0xC6,               true,  &Logic::SongOfStorms,        RHT_SONG_OF_STORMS,         ITEM_SONG_STORMS,               OBJECT_GI_MELODY,       GID_SONG_STORM,     0xD6,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_MINUET_OF_FOREST] =                    Item(RG_MINUET_OF_FOREST,                 Text{ "Minuet of Forest", "Menuet des Bois", "Wald-Minuett" },                                                    ITEMTYPE_SONG,              0xBB,               true,  &Logic::MinuetOfForest,      RHT_MINUET_OF_FOREST,       ITEM_SONG_MINUET,               OBJECT_GI_MELODY,       GID_SONG_MINUET,    0x73,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_BOLERO_OF_FIRE] =                      Item(RG_BOLERO_OF_FIRE,                   Text{ "Bolero of Fire", "Boléro du Feu", "Bolero des Feuers" },                                                   ITEMTYPE_SONG,              0xBC,               true,  &Logic::BoleroOfFire,        RHT_BOLERO_OF_FIRE,         ITEM_SONG_BOLERO,               OBJECT_GI_MELODY,       GID_SONG_BOLERO,    0x74,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_SERENADE_OF_WATER] =                   Item(RG_SERENADE_OF_WATER,                Text{ "Serenade of Water", "Sérénade de l'Eau", "Serenade des Wassers" },                                         ITEMTYPE_SONG,              0xBD,               true,  &Logic::SerenadeOfWater,     RHT_SERENADE_OF_WATER,      ITEM_SONG_SERENADE,             OBJECT_GI_MELODY,       GID_SONG_SERENADE,  0x75,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_NOCTURNE_OF_SHADOW] =                  Item(RG_NOCTURNE_OF_SHADOW,               Text{ "Nocturne of Shadow", "Nocturne de l'Ombre", "Nocturne der Schatten " },                                    ITEMTYPE_SONG,              0xBF,               true,  &Logic::NocturneOfShadow,    RHT_NOCTURNE_OF_SHADOW,     ITEM_SONG_NOCTURNE,             OBJECT_GI_MELODY,       GID_SONG_NOCTURNE,  0x77,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_REQUIEM_OF_SPIRIT] =                   Item(RG_REQUIEM_OF_SPIRIT,                Text{ "Requiem of Spirit", "Requiem des Esprits", "Requiem des Geistes" },                                        ITEMTYPE_SONG,              0xBE,               true,  &Logic::RequiemOfSpirit,     RHT_REQUIEM_OF_SPIRIT,      ITEM_SONG_REQUIEM,              OBJECT_GI_MELODY,       GID_SONG_REQUIEM,   0x76,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_PRELUDE_OF_LIGHT] =                    Item(RG_PRELUDE_OF_LIGHT,                 Text{ "Prelude of Light", "Prélude de la Lumière", "Präludium des Lichts" },                                      ITEMTYPE_SONG,              0xC0,               true,  &Logic::PreludeOfLight,      RHT_PRELUDE_OF_LIGHT,       ITEM_SONG_PRELUDE,              OBJECT_GI_MELODY,       GID_SONG_PRELUDE,   0x78,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_ZELDAS_LULLABY] =                      Item(RG_ZELDAS_LULLABY,                   Text{ "Zelda's Lullaby", "Berceuse de Zelda", "Zeldas Wiegenlied" },                                              ITEMTYPE_SONG,              0xC1,               true,  &logic->ZeldasLullaby,       RHT_ZELDAS_LULLABY,         ITEM_SONG_LULLABY,              OBJECT_GI_MELODY,       GID_SONG_ZELDA,     0xD4,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_EPONAS_SONG] =                         Item(RG_EPONAS_SONG,                      Text{ "Epona's Song", "Chant d'Epona", "Eponas Lied" },                                                           ITEMTYPE_SONG,              0xC2,               true,  &logic->EponasSong,          RHT_EPONAS_SONG,            ITEM_SONG_EPONA,                OBJECT_GI_MELODY,       GID_SONG_EPONA,     0xD2,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_SARIAS_SONG] =                         Item(RG_SARIAS_SONG,                      Text{ "Saria's Song", "Chant de Saria", "Sarias Lied" },                                                          ITEMTYPE_SONG,              0xC3,               true,  &logic->SariasSong,          RHT_SARIAS_SONG,            ITEM_SONG_SARIA,                OBJECT_GI_MELODY,       GID_SONG_SARIA,     0xD1,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_SUNS_SONG] =                           Item(RG_SUNS_SONG,                        Text{ "Sun's Song", "Chant du Soleil", "Das Lied der Sonne" },                                                    ITEMTYPE_SONG,              0xC4,               true,  &logic->SunsSong,            RHT_SUNS_SONG,              ITEM_SONG_SUN,                  OBJECT_GI_MELODY,       GID_SONG_SUN,       0xD3,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_SONG_OF_TIME] =                        Item(RG_SONG_OF_TIME,                     Text{ "Song of Time", "Chant du Temps", "Das Lied der Zeit" },                                                    ITEMTYPE_SONG,              0xC5,               true,  &logic->SongOfTime,          RHT_SONG_OF_TIME,           ITEM_SONG_TIME,                 OBJECT_GI_MELODY,       GID_SONG_TIME,      0xD5,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_SONG_OF_STORMS] =                      Item(RG_SONG_OF_STORMS,                   Text{ "Song of Storms", "Chant des Tempêtes", "Lied der Stürme" },                                                ITEMTYPE_SONG,              0xC6,               true,  &logic->SongOfStorms,        RHT_SONG_OF_STORMS,         ITEM_SONG_STORMS,               OBJECT_GI_MELODY,       GID_SONG_STORM,     0xD6,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_MINUET_OF_FOREST] =                    Item(RG_MINUET_OF_FOREST,                 Text{ "Minuet of Forest", "Menuet des Bois", "Wald-Minuett" },                                                    ITEMTYPE_SONG,              0xBB,               true,  &logic->MinuetOfForest,      RHT_MINUET_OF_FOREST,       ITEM_SONG_MINUET,               OBJECT_GI_MELODY,       GID_SONG_MINUET,    0x73,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BOLERO_OF_FIRE] =                      Item(RG_BOLERO_OF_FIRE,                   Text{ "Bolero of Fire", "Boléro du Feu", "Bolero des Feuers" },                                                   ITEMTYPE_SONG,              0xBC,               true,  &logic->BoleroOfFire,        RHT_BOLERO_OF_FIRE,         ITEM_SONG_BOLERO,               OBJECT_GI_MELODY,       GID_SONG_BOLERO,    0x74,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_SERENADE_OF_WATER] =                   Item(RG_SERENADE_OF_WATER,                Text{ "Serenade of Water", "Sérénade de l'Eau", "Serenade des Wassers" },                                         ITEMTYPE_SONG,              0xBD,               true,  &logic->SerenadeOfWater,     RHT_SERENADE_OF_WATER,      ITEM_SONG_SERENADE,             OBJECT_GI_MELODY,       GID_SONG_SERENADE,  0x75,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_NOCTURNE_OF_SHADOW] =                  Item(RG_NOCTURNE_OF_SHADOW,               Text{ "Nocturne of Shadow", "Nocturne de l'Ombre", "Nocturne der Schatten " },                                    ITEMTYPE_SONG,              0xBF,               true,  &logic->NocturneOfShadow,    RHT_NOCTURNE_OF_SHADOW,     ITEM_SONG_NOCTURNE,             OBJECT_GI_MELODY,       GID_SONG_NOCTURNE,  0x77,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_REQUIEM_OF_SPIRIT] =                   Item(RG_REQUIEM_OF_SPIRIT,                Text{ "Requiem of Spirit", "Requiem des Esprits", "Requiem des Geistes" },                                        ITEMTYPE_SONG,              0xBE,               true,  &logic->RequiemOfSpirit,     RHT_REQUIEM_OF_SPIRIT,      ITEM_SONG_REQUIEM,              OBJECT_GI_MELODY,       GID_SONG_REQUIEM,   0x76,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_PRELUDE_OF_LIGHT] =                    Item(RG_PRELUDE_OF_LIGHT,                 Text{ "Prelude of Light", "Prélude de la Lumière", "Präludium des Lichts" },                                      ITEMTYPE_SONG,              0xC0,               true,  &logic->PreludeOfLight,      RHT_PRELUDE_OF_LIGHT,       ITEM_SONG_PRELUDE,              OBJECT_GI_MELODY,       GID_SONG_PRELUDE,   0x78,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
     // Maps and Compasses
-    itemTable[RG_DEKU_TREE_MAP] =                       Item(RG_DEKU_TREE_MAP,                    Text{ "Great Deku Tree Map", "Carte de l'Arbre Mojo", "Karte des Deku-Baums" },                                   ITEMTYPE_MAP,               0xA5,               false, &Logic::noVariable,          RHT_DEKU_TREE_MAP,          RG_DEKU_TREE_MAP,               OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_DODONGOS_CAVERN_MAP] =                 Item(RG_DODONGOS_CAVERN_MAP,              Text{ "Dodongo's Cavern Map", "Carte de la Caverne Dodongo", "Karte der Dodongo-Höhle" },                         ITEMTYPE_MAP,               0xA6,               false, &Logic::noVariable,          RHT_DODONGOS_CAVERN_MAP,    RG_DODONGOS_CAVERN_MAP,         OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_JABU_JABUS_BELLY_MAP] =                Item(RG_JABU_JABUS_BELLY_MAP,             Text{ "Jabu-Jabu's Belly Map", "Carte du Ventre de Jabu-Jabu", "Karte des Jabu-Jabu-Bauchs" },                    ITEMTYPE_MAP,               0xA7,               false, &Logic::noVariable,          RHT_JABU_JABUS_BELLY_MAP,   RG_JABU_JABUS_BELLY_MAP,        OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_FOREST_TEMPLE_MAP] =                   Item(RG_FOREST_TEMPLE_MAP,                Text{ "Forest Temple Map", "Carte du Temple de la Forêt", "Waldtempel Karte" },                                   ITEMTYPE_MAP,               0xA8,               false, &Logic::noVariable,          RHT_FOREST_TEMPLE_MAP,      RG_FOREST_TEMPLE_MAP,           OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_FIRE_TEMPLE_MAP] =                     Item(RG_FIRE_TEMPLE_MAP,                  Text{ "Fire Temple Map", "Carte due Temple de Feu", "Feuertempel Karte" },                                        ITEMTYPE_MAP,               0xA9,               false, &Logic::noVariable,          RHT_FIRE_TEMPLE_MAP,        RG_FIRE_TEMPLE_MAP,             OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_WATER_TEMPLE_MAP] =                    Item(RG_WATER_TEMPLE_MAP,                 Text{ "Water Temple Map", "Carte du Temple de l'Eau", "Wassertempel-Karte" },                                     ITEMTYPE_MAP,               0xAA,               false, &Logic::noVariable,          RHT_WATER_TEMPLE_MAP,       RG_WATER_TEMPLE_MAP,            OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_SPIRIT_TEMPLE_MAP] =                   Item(RG_SPIRIT_TEMPLE_MAP,                Text{ "Spirit Temple Map", "Carte due Temple de l'Esprit", "Geistertempel Karte" },                               ITEMTYPE_MAP,               0xAB,               false, &Logic::noVariable,          RHT_SPIRIT_TEMPLE_MAP,      RG_SPIRIT_TEMPLE_MAP,           OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_SHADOW_TEMPLE_MAP] =                   Item(RG_SHADOW_TEMPLE_MAP,                Text{ "Shadow Temple Map", "Carte du Temple de l'Ombre", "Karte des Schattentempels" },                           ITEMTYPE_MAP,               0xAC,               false, &Logic::noVariable,          RHT_SHADOW_TEMPLE_MAP,      RG_SHADOW_TEMPLE_MAP,           OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_BOTTOM_OF_THE_WELL_MAP] =              Item(RG_BOTTOM_OF_THE_WELL_MAP,           Text{ "Bottom of the Well Map", "Carte du Puits", "Boden des Brunnens Karte" },                                   ITEMTYPE_MAP,               0xAD,               false, &Logic::noVariable,          RHT_BOTTOM_OF_THE_WELL_MAP, RG_BOTTOM_OF_THE_WELL_MAP,      OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_ICE_CAVERN_MAP] =                      Item(RG_ICE_CAVERN_MAP,                   Text{ "Ice Cavern Map", "Carte de la Caverne Polaire", "Eishöhle Karte" },                                        ITEMTYPE_MAP,               0xAE,               false, &Logic::noVariable,          RHT_ICE_CAVERN_MAP,         RG_ICE_CAVERN_MAP,              OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_DEKU_TREE_COMPASS] =                   Item(RG_DEKU_TREE_COMPASS,                Text{ "Great Deku Tree Compass", "Boussole de l'Arbre Mojo", "Kompass des Deku-Baums" },                          ITEMTYPE_COMPASS,           0x9B,               false, &Logic::noVariable,          RHT_DEKU_TREE_COMPASS,      RG_DEKU_TREE_COMPASS,           OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_DODONGOS_CAVERN_COMPASS] =             Item(RG_DODONGOS_CAVERN_COMPASS,          Text{ "Dodongo's Cavern Compass", "Boussole de la Caverne Dodongo", "Kompass der Dodongo-Höhle" },                ITEMTYPE_COMPASS,           0x9C,               false, &Logic::noVariable,          RHT_DODONGOS_CAVERN_COMPASS,RG_DODONGOS_CAVERN_COMPASS,     OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_JABU_JABUS_BELLY_COMPASS] =            Item(RG_JABU_JABUS_BELLY_COMPASS,         Text{ "Jabu-Jabu's Belly Compass", "Boussole du Ventre de Jabu-Jabu", "Kompass des Jabu-Jabu-Bauchs" },           ITEMTYPE_COMPASS,           0x9D,               false, &Logic::noVariable,          RHT_JABU_JABUS_BELLY_COMPASS,RG_JABU_JABUS_BELLY_COMPASS,   OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_FOREST_TEMPLE_COMPASS] =               Item(RG_FOREST_TEMPLE_COMPASS,            Text{ "Forest Temple Compass", "Boussole du Temple de la Forêt", "Waldtempel-Kompass" },                          ITEMTYPE_COMPASS,           0x9E,               false, &Logic::noVariable,          RHT_FOREST_TEMPLE_COMPASS,  RG_FOREST_TEMPLE_COMPASS,       OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_FIRE_TEMPLE_COMPASS] =                 Item(RG_FIRE_TEMPLE_COMPASS,              Text{ "Fire Temple Compass", "Boussole du Temple du Feu", "Feuertempel-Kompass" },                                ITEMTYPE_COMPASS,           0x9F,               false, &Logic::noVariable,          RHT_FIRE_TEMPLE_COMPASS,    RG_FIRE_TEMPLE_COMPASS,         OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_WATER_TEMPLE_COMPASS] =                Item(RG_WATER_TEMPLE_COMPASS,             Text{ "Water Temple Compass", "Boussole du Temple de l'Eau", "Wassertempel-Kompass" },                            ITEMTYPE_COMPASS,           0xA0,               false, &Logic::noVariable,          RHT_WATER_TEMPLE_COMPASS,   RG_WATER_TEMPLE_COMPASS,        OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_SPIRIT_TEMPLE_COMPASS] =               Item(RG_SPIRIT_TEMPLE_COMPASS,            Text{ "Spirit Temple Compass", "Boussole due Temple de l'Esprit", "Geistiger Tempelkompass" },                    ITEMTYPE_COMPASS,           0xA1,               false, &Logic::noVariable,          RHT_SPIRIT_TEMPLE_COMPASS,  RG_SPIRIT_TEMPLE_COMPASS,       OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_SHADOW_TEMPLE_COMPASS] =               Item(RG_SHADOW_TEMPLE_COMPASS,            Text{ "Shadow Temple Compass", "Boussole du Temple de l'Ombre", "Kompass des Schattentempels" },                  ITEMTYPE_COMPASS,           0xA2,               false, &Logic::noVariable,          RHT_SHADOW_TEMPLE_COMPASS,  RG_SHADOW_TEMPLE_COMPASS,       OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_BOTTOM_OF_THE_WELL_COMPASS] =          Item(RG_BOTTOM_OF_THE_WELL_COMPASS,       Text{ "Bottom of the Well Compass", "Boussole du Puits", "Boden des Brunnenkompasses" },                          ITEMTYPE_COMPASS,           0xA3,               false, &Logic::noVariable,          RHT_BOTTOM_OF_THE_WELL_COMPASS,RG_BOTTOM_OF_THE_WELL_COMPASS,OBJECT_GI_COMPASS,     GID_COMPASS,        TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_ICE_CAVERN_COMPASS] =                  Item(RG_ICE_CAVERN_COMPASS,               Text{ "Ice Cavern Compass", "Boussole de la Caverne Polaire", "Eishöhlenkompass" },                               ITEMTYPE_COMPASS,           0xA4,               false, &Logic::noVariable,          RHT_ICE_CAVERN_COMPASS,     RG_ICE_CAVERN_COMPASS,          OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_DEKU_TREE_MAP] =                       Item(RG_DEKU_TREE_MAP,                    Text{ "Great Deku Tree Map", "Carte de l'Arbre Mojo", "Karte des Deku-Baums" },                                   ITEMTYPE_MAP,               0xA5,               false, &logic->noVariable,          RHT_DEKU_TREE_MAP,          RG_DEKU_TREE_MAP,               OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_DODONGOS_CAVERN_MAP] =                 Item(RG_DODONGOS_CAVERN_MAP,              Text{ "Dodongo's Cavern Map", "Carte de la Caverne Dodongo", "Karte der Dodongo-Höhle" },                         ITEMTYPE_MAP,               0xA6,               false, &logic->noVariable,          RHT_DODONGOS_CAVERN_MAP,    RG_DODONGOS_CAVERN_MAP,         OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_JABU_JABUS_BELLY_MAP] =                Item(RG_JABU_JABUS_BELLY_MAP,             Text{ "Jabu-Jabu's Belly Map", "Carte du Ventre de Jabu-Jabu", "Karte des Jabu-Jabu-Bauchs" },                    ITEMTYPE_MAP,               0xA7,               false, &logic->noVariable,          RHT_JABU_JABUS_BELLY_MAP,   RG_JABU_JABUS_BELLY_MAP,        OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_FOREST_TEMPLE_MAP] =                   Item(RG_FOREST_TEMPLE_MAP,                Text{ "Forest Temple Map", "Carte du Temple de la Forêt", "Waldtempel Karte" },                                   ITEMTYPE_MAP,               0xA8,               false, &logic->noVariable,          RHT_FOREST_TEMPLE_MAP,      RG_FOREST_TEMPLE_MAP,           OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_FIRE_TEMPLE_MAP] =                     Item(RG_FIRE_TEMPLE_MAP,                  Text{ "Fire Temple Map", "Carte due Temple de Feu", "Feuertempel Karte" },                                        ITEMTYPE_MAP,               0xA9,               false, &logic->noVariable,          RHT_FIRE_TEMPLE_MAP,        RG_FIRE_TEMPLE_MAP,             OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_WATER_TEMPLE_MAP] =                    Item(RG_WATER_TEMPLE_MAP,                 Text{ "Water Temple Map", "Carte du Temple de l'Eau", "Wassertempel-Karte" },                                     ITEMTYPE_MAP,               0xAA,               false, &logic->noVariable,          RHT_WATER_TEMPLE_MAP,       RG_WATER_TEMPLE_MAP,            OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_SPIRIT_TEMPLE_MAP] =                   Item(RG_SPIRIT_TEMPLE_MAP,                Text{ "Spirit Temple Map", "Carte due Temple de l'Esprit", "Geistertempel Karte" },                               ITEMTYPE_MAP,               0xAB,               false, &logic->noVariable,          RHT_SPIRIT_TEMPLE_MAP,      RG_SPIRIT_TEMPLE_MAP,           OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_SHADOW_TEMPLE_MAP] =                   Item(RG_SHADOW_TEMPLE_MAP,                Text{ "Shadow Temple Map", "Carte du Temple de l'Ombre", "Karte des Schattentempels" },                           ITEMTYPE_MAP,               0xAC,               false, &logic->noVariable,          RHT_SHADOW_TEMPLE_MAP,      RG_SHADOW_TEMPLE_MAP,           OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_BOTTOM_OF_THE_WELL_MAP] =              Item(RG_BOTTOM_OF_THE_WELL_MAP,           Text{ "Bottom of the Well Map", "Carte du Puits", "Boden des Brunnens Karte" },                                   ITEMTYPE_MAP,               0xAD,               false, &logic->noVariable,          RHT_BOTTOM_OF_THE_WELL_MAP, RG_BOTTOM_OF_THE_WELL_MAP,      OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_ICE_CAVERN_MAP] =                      Item(RG_ICE_CAVERN_MAP,                   Text{ "Ice Cavern Map", "Carte de la Caverne Polaire", "Eishöhle Karte" },                                        ITEMTYPE_MAP,               0xAE,               false, &logic->noVariable,          RHT_ICE_CAVERN_MAP,         RG_ICE_CAVERN_MAP,              OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_DEKU_TREE_COMPASS] =                   Item(RG_DEKU_TREE_COMPASS,                Text{ "Great Deku Tree Compass", "Boussole de l'Arbre Mojo", "Kompass des Deku-Baums" },                          ITEMTYPE_COMPASS,           0x9B,               false, &logic->noVariable,          RHT_DEKU_TREE_COMPASS,      RG_DEKU_TREE_COMPASS,           OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_DODONGOS_CAVERN_COMPASS] =             Item(RG_DODONGOS_CAVERN_COMPASS,          Text{ "Dodongo's Cavern Compass", "Boussole de la Caverne Dodongo", "Kompass der Dodongo-Höhle" },                ITEMTYPE_COMPASS,           0x9C,               false, &logic->noVariable,          RHT_DODONGOS_CAVERN_COMPASS,RG_DODONGOS_CAVERN_COMPASS,     OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_JABU_JABUS_BELLY_COMPASS] =            Item(RG_JABU_JABUS_BELLY_COMPASS,         Text{ "Jabu-Jabu's Belly Compass", "Boussole du Ventre de Jabu-Jabu", "Kompass des Jabu-Jabu-Bauchs" },           ITEMTYPE_COMPASS,           0x9D,               false, &logic->noVariable,          RHT_JABU_JABUS_BELLY_COMPASS,RG_JABU_JABUS_BELLY_COMPASS,   OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_FOREST_TEMPLE_COMPASS] =               Item(RG_FOREST_TEMPLE_COMPASS,            Text{ "Forest Temple Compass", "Boussole du Temple de la Forêt", "Waldtempel-Kompass" },                          ITEMTYPE_COMPASS,           0x9E,               false, &logic->noVariable,          RHT_FOREST_TEMPLE_COMPASS,  RG_FOREST_TEMPLE_COMPASS,       OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_FIRE_TEMPLE_COMPASS] =                 Item(RG_FIRE_TEMPLE_COMPASS,              Text{ "Fire Temple Compass", "Boussole du Temple du Feu", "Feuertempel-Kompass" },                                ITEMTYPE_COMPASS,           0x9F,               false, &logic->noVariable,          RHT_FIRE_TEMPLE_COMPASS,    RG_FIRE_TEMPLE_COMPASS,         OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_WATER_TEMPLE_COMPASS] =                Item(RG_WATER_TEMPLE_COMPASS,             Text{ "Water Temple Compass", "Boussole du Temple de l'Eau", "Wassertempel-Kompass" },                            ITEMTYPE_COMPASS,           0xA0,               false, &logic->noVariable,          RHT_WATER_TEMPLE_COMPASS,   RG_WATER_TEMPLE_COMPASS,        OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_SPIRIT_TEMPLE_COMPASS] =               Item(RG_SPIRIT_TEMPLE_COMPASS,            Text{ "Spirit Temple Compass", "Boussole due Temple de l'Esprit", "Geistiger Tempelkompass" },                    ITEMTYPE_COMPASS,           0xA1,               false, &logic->noVariable,          RHT_SPIRIT_TEMPLE_COMPASS,  RG_SPIRIT_TEMPLE_COMPASS,       OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_SHADOW_TEMPLE_COMPASS] =               Item(RG_SHADOW_TEMPLE_COMPASS,            Text{ "Shadow Temple Compass", "Boussole du Temple de l'Ombre", "Kompass des Schattentempels" },                  ITEMTYPE_COMPASS,           0xA2,               false, &logic->noVariable,          RHT_SHADOW_TEMPLE_COMPASS,  RG_SHADOW_TEMPLE_COMPASS,       OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_BOTTOM_OF_THE_WELL_COMPASS] =          Item(RG_BOTTOM_OF_THE_WELL_COMPASS,       Text{ "Bottom of the Well Compass", "Boussole du Puits", "Boden des Brunnenkompasses" },                          ITEMTYPE_COMPASS,           0xA3,               false, &logic->noVariable,          RHT_BOTTOM_OF_THE_WELL_COMPASS,RG_BOTTOM_OF_THE_WELL_COMPASS,OBJECT_GI_COMPASS,     GID_COMPASS,        TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_ICE_CAVERN_COMPASS] =                  Item(RG_ICE_CAVERN_COMPASS,               Text{ "Ice Cavern Compass", "Boussole de la Caverne Polaire", "Eishöhlenkompass" },                               ITEMTYPE_COMPASS,           0xA4,               false, &logic->noVariable,          RHT_ICE_CAVERN_COMPASS,     RG_ICE_CAVERN_COMPASS,          OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
     // Boss Keys
-    itemTable[RG_FOREST_TEMPLE_BOSS_KEY] =              Item(RG_FOREST_TEMPLE_BOSS_KEY,           Text{ "Forest Temple Boss Key", "Clé d'Or du Temple de la Forêt", "Waldtempel-Boss-Schlüssel" },                  ITEMTYPE_BOSSKEY,           0x95,               true,  &Logic::BossKeyForestTemple, RHT_FOREST_TEMPLE_BOSS_KEY, RG_FOREST_TEMPLE_BOSS_KEY,      OBJECT_GI_BOSSKEY,      GID_KEY_BOSS,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
+    itemTable[RG_FOREST_TEMPLE_BOSS_KEY] =              Item(RG_FOREST_TEMPLE_BOSS_KEY,           Text{ "Forest Temple Boss Key", "Clé d'Or du Temple de la Forêt", "Waldtempel-Boss-Schlüssel" },                  ITEMTYPE_BOSSKEY,           0x95,               true,  &logic->BossKeyForestTemple, RHT_FOREST_TEMPLE_BOSS_KEY, RG_FOREST_TEMPLE_BOSS_KEY,      OBJECT_GI_BOSSKEY,      GID_KEY_BOSS,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
     itemTable[RG_FOREST_TEMPLE_BOSS_KEY].SetCustomDrawFunc(Randomizer_DrawBossKey);
-    itemTable[RG_FIRE_TEMPLE_BOSS_KEY] =                Item(RG_FIRE_TEMPLE_BOSS_KEY,             Text{ "Fire Temple Boss Key", "Clé d'Or du Temple du Feu", "Feuertempel-Boss-Schlüssel" },                        ITEMTYPE_BOSSKEY,           0x96,               true,  &Logic::BossKeyFireTemple,   RHT_FIRE_TEMPLE_BOSS_KEY,   RG_FIRE_TEMPLE_BOSS_KEY,        OBJECT_GI_BOSSKEY,      GID_KEY_BOSS,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
+    itemTable[RG_FIRE_TEMPLE_BOSS_KEY] =                Item(RG_FIRE_TEMPLE_BOSS_KEY,             Text{ "Fire Temple Boss Key", "Clé d'Or du Temple du Feu", "Feuertempel-Boss-Schlüssel" },                        ITEMTYPE_BOSSKEY,           0x96,               true,  &logic->BossKeyFireTemple,   RHT_FIRE_TEMPLE_BOSS_KEY,   RG_FIRE_TEMPLE_BOSS_KEY,        OBJECT_GI_BOSSKEY,      GID_KEY_BOSS,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
     itemTable[RG_FIRE_TEMPLE_BOSS_KEY].SetCustomDrawFunc(Randomizer_DrawBossKey);
-    itemTable[RG_WATER_TEMPLE_BOSS_KEY] =               Item(RG_WATER_TEMPLE_BOSS_KEY,            Text{ "Water Temple Boss Key", "Clé d'Or du Temple de l'Eau", "Wassertempel-Boss-Schlüssel" },                    ITEMTYPE_BOSSKEY,           0x97,               true,  &Logic::BossKeyWaterTemple,  RHT_WATER_TEMPLE_BOSS_KEY,  RG_WATER_TEMPLE_BOSS_KEY,       OBJECT_GI_BOSSKEY,      GID_KEY_BOSS,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
+    itemTable[RG_WATER_TEMPLE_BOSS_KEY] =               Item(RG_WATER_TEMPLE_BOSS_KEY,            Text{ "Water Temple Boss Key", "Clé d'Or du Temple de l'Eau", "Wassertempel-Boss-Schlüssel" },                    ITEMTYPE_BOSSKEY,           0x97,               true,  &logic->BossKeyWaterTemple,  RHT_WATER_TEMPLE_BOSS_KEY,  RG_WATER_TEMPLE_BOSS_KEY,       OBJECT_GI_BOSSKEY,      GID_KEY_BOSS,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
     itemTable[RG_WATER_TEMPLE_BOSS_KEY].SetCustomDrawFunc(Randomizer_DrawBossKey);
-    itemTable[RG_SPIRIT_TEMPLE_BOSS_KEY] =              Item(RG_SPIRIT_TEMPLE_BOSS_KEY,           Text{ "Spirit Temple Boss Key", "Clé d'Or du Temple de l'Esprit", "Geistertempel-Boss-Schlüssel" },               ITEMTYPE_BOSSKEY,           0x98,               true,  &Logic::BossKeySpiritTemple, RHT_SPIRIT_TEMPLE_BOSS_KEY, RG_SPIRIT_TEMPLE_BOSS_KEY,      OBJECT_GI_BOSSKEY,      GID_KEY_BOSS,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
+    itemTable[RG_SPIRIT_TEMPLE_BOSS_KEY] =              Item(RG_SPIRIT_TEMPLE_BOSS_KEY,           Text{ "Spirit Temple Boss Key", "Clé d'Or du Temple de l'Esprit", "Geistertempel-Boss-Schlüssel" },               ITEMTYPE_BOSSKEY,           0x98,               true,  &logic->BossKeySpiritTemple, RHT_SPIRIT_TEMPLE_BOSS_KEY, RG_SPIRIT_TEMPLE_BOSS_KEY,      OBJECT_GI_BOSSKEY,      GID_KEY_BOSS,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
     itemTable[RG_SPIRIT_TEMPLE_BOSS_KEY].SetCustomDrawFunc(Randomizer_DrawBossKey);
-    itemTable[RG_SHADOW_TEMPLE_BOSS_KEY] =              Item( RG_SHADOW_TEMPLE_BOSS_KEY,          Text{ "Shadow Temple Boss Key", "Clé d'Or du Temple de l'Ombre", "Schlüssel für den Boss des Schattentempels" },  ITEMTYPE_BOSSKEY,           0x99,               true,  &Logic::BossKeyShadowTemple, RHT_SHADOW_TEMPLE_BOSS_KEY, RG_SHADOW_TEMPLE_BOSS_KEY,      OBJECT_GI_BOSSKEY,      GID_KEY_BOSS,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
+    itemTable[RG_SHADOW_TEMPLE_BOSS_KEY] =              Item( RG_SHADOW_TEMPLE_BOSS_KEY,          Text{ "Shadow Temple Boss Key", "Clé d'Or du Temple de l'Ombre", "Schlüssel für den Boss des Schattentempels" },  ITEMTYPE_BOSSKEY,           0x99,               true,  &logic->BossKeyShadowTemple, RHT_SHADOW_TEMPLE_BOSS_KEY, RG_SHADOW_TEMPLE_BOSS_KEY,      OBJECT_GI_BOSSKEY,      GID_KEY_BOSS,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
     itemTable[RG_SHADOW_TEMPLE_BOSS_KEY].SetCustomDrawFunc(Randomizer_DrawBossKey);
-    itemTable[RG_GANONS_CASTLE_BOSS_KEY] =              Item(RG_GANONS_CASTLE_BOSS_KEY,           Text{ "Ganon's Castle Boss Key", "Clé d'Or du Château de Ganon", "Ganons Schloss-Boss-Schlüssel" },               ITEMTYPE_BOSSKEY,           0x9A,               true,  &Logic::BossKeyGanonsCastle, RHT_GANONS_CASTLE_BOSS_KEY, RG_GANONS_CASTLE_BOSS_KEY,      OBJECT_GI_BOSSKEY,      GID_KEY_BOSS,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
+    itemTable[RG_GANONS_CASTLE_BOSS_KEY] =              Item(RG_GANONS_CASTLE_BOSS_KEY,           Text{ "Ganon's Castle Boss Key", "Clé d'Or du Château de Ganon", "Ganons Schloss-Boss-Schlüssel" },               ITEMTYPE_BOSSKEY,           0x9A,               true,  &logic->BossKeyGanonsCastle, RHT_GANONS_CASTLE_BOSS_KEY, RG_GANONS_CASTLE_BOSS_KEY,      OBJECT_GI_BOSSKEY,      GID_KEY_BOSS,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
     itemTable[RG_GANONS_CASTLE_BOSS_KEY].SetCustomDrawFunc(Randomizer_DrawBossKey);
-    itemTable[RG_FOREST_TEMPLE_SMALL_KEY] =             Item(RG_FOREST_TEMPLE_SMALL_KEY,          Text{ "Forest Temple Small Key", "Petite Clé du Temple de la Forêt", "Waldtempel Kleiner Schlüssel" },            ITEMTYPE_SMALLKEY,          0xAF,               true,  &Logic::ForestTempleKeys,    RHT_FOREST_TEMPLE_SMALL_KEY,RG_FOREST_TEMPLE_SMALL_KEY,     OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_FOREST_TEMPLE_SMALL_KEY] =             Item(RG_FOREST_TEMPLE_SMALL_KEY,          Text{ "Forest Temple Small Key", "Petite Clé du Temple de la Forêt", "Waldtempel Kleiner Schlüssel" },            ITEMTYPE_SMALLKEY,          0xAF,               true,  &logic->ForestTempleKeys,    RHT_FOREST_TEMPLE_SMALL_KEY,RG_FOREST_TEMPLE_SMALL_KEY,     OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_FOREST_TEMPLE_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
-    itemTable[RG_FIRE_TEMPLE_SMALL_KEY] =               Item(RG_FIRE_TEMPLE_SMALL_KEY,            Text{ "Fire Temple Small Key", "Petite Clé du Temple du Feu", "Feuertempel Kleiner Schlüssel" },                  ITEMTYPE_SMALLKEY,          0xB0,               true,  &Logic::FireTempleKeys,      RHT_FIRE_TEMPLE_SMALL_KEY,  RG_FIRE_TEMPLE_SMALL_KEY,       OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_FIRE_TEMPLE_SMALL_KEY] =               Item(RG_FIRE_TEMPLE_SMALL_KEY,            Text{ "Fire Temple Small Key", "Petite Clé du Temple du Feu", "Feuertempel Kleiner Schlüssel" },                  ITEMTYPE_SMALLKEY,          0xB0,               true,  &logic->FireTempleKeys,      RHT_FIRE_TEMPLE_SMALL_KEY,  RG_FIRE_TEMPLE_SMALL_KEY,       OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_FIRE_TEMPLE_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
-    itemTable[RG_WATER_TEMPLE_SMALL_KEY] =              Item(RG_WATER_TEMPLE_SMALL_KEY,           Text{ "Water Temple Small Key", "Petite Clé du Temple de l'Eau", "Wassertempel Kleiner Schlüssel" },              ITEMTYPE_SMALLKEY,          0xB1,               true,  &Logic::WaterTempleKeys,     RHT_WATER_TEMPLE_SMALL_KEY, RG_WATER_TEMPLE_SMALL_KEY,      OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_WATER_TEMPLE_SMALL_KEY] =              Item(RG_WATER_TEMPLE_SMALL_KEY,           Text{ "Water Temple Small Key", "Petite Clé du Temple de l'Eau", "Wassertempel Kleiner Schlüssel" },              ITEMTYPE_SMALLKEY,          0xB1,               true,  &logic->WaterTempleKeys,     RHT_WATER_TEMPLE_SMALL_KEY, RG_WATER_TEMPLE_SMALL_KEY,      OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_WATER_TEMPLE_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
-    itemTable[RG_SPIRIT_TEMPLE_SMALL_KEY] =             Item(RG_SPIRIT_TEMPLE_SMALL_KEY,          Text{ "Spirit Temple Small Key", "Petite Clé du Temple de l'Esprit", "Geisttempel Kleiner Schlüssel" },           ITEMTYPE_SMALLKEY,          0xB2,               true,  &Logic::SpiritTempleKeys,    RHT_SPIRIT_TEMPLE_SMALL_KEY,RG_SPIRIT_TEMPLE_SMALL_KEY,     OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_SPIRIT_TEMPLE_SMALL_KEY] =             Item(RG_SPIRIT_TEMPLE_SMALL_KEY,          Text{ "Spirit Temple Small Key", "Petite Clé du Temple de l'Esprit", "Geisttempel Kleiner Schlüssel" },           ITEMTYPE_SMALLKEY,          0xB2,               true,  &logic->SpiritTempleKeys,    RHT_SPIRIT_TEMPLE_SMALL_KEY,RG_SPIRIT_TEMPLE_SMALL_KEY,     OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_SPIRIT_TEMPLE_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
-    itemTable[RG_SHADOW_TEMPLE_SMALL_KEY] =             Item(RG_SHADOW_TEMPLE_SMALL_KEY,          Text{ "Shadow Temple Small Key", "Petite Clé du Temple de l'Ombre", "Schattentempel Kleiner Schlüssel" },         ITEMTYPE_SMALLKEY,          0xB3,               true,  &Logic::ShadowTempleKeys,    RHT_SHADOW_TEMPLE_SMALL_KEY,RG_SHADOW_TEMPLE_SMALL_KEY,     OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_SHADOW_TEMPLE_SMALL_KEY] =             Item(RG_SHADOW_TEMPLE_SMALL_KEY,          Text{ "Shadow Temple Small Key", "Petite Clé du Temple de l'Ombre", "Schattentempel Kleiner Schlüssel" },         ITEMTYPE_SMALLKEY,          0xB3,               true,  &logic->ShadowTempleKeys,    RHT_SHADOW_TEMPLE_SMALL_KEY,RG_SHADOW_TEMPLE_SMALL_KEY,     OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_SHADOW_TEMPLE_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
-    itemTable[RG_BOTTOM_OF_THE_WELL_SMALL_KEY] =        Item(RG_BOTTOM_OF_THE_WELL_SMALL_KEY,     Text{ "Bottom of the Well Small Key", "Petite Clé du Puits", "Boden des Brunnens Kleiner Schlüssel" },            ITEMTYPE_SMALLKEY,          0xB4,               true,  &Logic::BottomOfTheWellKeys, RHT_BOTTOM_OF_THE_WELL_SMALL_KEY,RG_BOTTOM_OF_THE_WELL_SMALL_KEY,OBJECT_GI_KEY,     GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_BOTTOM_OF_THE_WELL_SMALL_KEY] =        Item(RG_BOTTOM_OF_THE_WELL_SMALL_KEY,     Text{ "Bottom of the Well Small Key", "Petite Clé du Puits", "Boden des Brunnens Kleiner Schlüssel" },            ITEMTYPE_SMALLKEY,          0xB4,               true,  &logic->BottomOfTheWellKeys, RHT_BOTTOM_OF_THE_WELL_SMALL_KEY,RG_BOTTOM_OF_THE_WELL_SMALL_KEY,OBJECT_GI_KEY,     GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_BOTTOM_OF_THE_WELL_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
-    itemTable[RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY] =   Item(RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, Text{ "Training Grounds Small Key", "Petite Clé du Gymnase Gerudo", "Trainingsgelände Kleiner Schlüssel" },      ITEMTYPE_SMALLKEY,          0xB5,               true,  &Logic::GerudoTrainingGroundsKeys, RHT_GERUDO_TRAINING_GROUNDS_SMALL_KEY,RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY,OBJECT_GI_KEY,GID_KEY_SMALL,TEXT_RANDOMIZER_CUSTOM_ITEM,0x80, CHEST_ANIM_SHORT,ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY] =   Item(RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, Text{ "Training Grounds Small Key", "Petite Clé du Gymnase Gerudo", "Trainingsgelände Kleiner Schlüssel" },      ITEMTYPE_SMALLKEY,          0xB5,               true,  &logic->GerudoTrainingGroundsKeys, RHT_GERUDO_TRAINING_GROUNDS_SMALL_KEY,RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY,OBJECT_GI_KEY,GID_KEY_SMALL,TEXT_RANDOMIZER_CUSTOM_ITEM,0x80, CHEST_ANIM_SHORT,ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
-    itemTable[RG_GERUDO_FORTRESS_SMALL_KEY] =           Item(RG_GERUDO_FORTRESS_SMALL_KEY,        Text{ "Gerudo Fortress Small Key", "Petite Clé du Repaire des Voleurs", "Gerudo-Festung Kleiner Schlüssel" },     ITEMTYPE_FORTRESS_SMALLKEY, 0xB6,               true,  &Logic::GerudoFortressKeys,  RHT_GERUDO_FORTRESS_SMALL_KEY,RG_GERUDO_FORTRESS_SMALL_KEY, OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_GERUDO_FORTRESS_SMALL_KEY] =           Item(RG_GERUDO_FORTRESS_SMALL_KEY,        Text{ "Gerudo Fortress Small Key", "Petite Clé du Repaire des Voleurs", "Gerudo-Festung Kleiner Schlüssel" },     ITEMTYPE_FORTRESS_SMALLKEY, 0xB6,               true,  &logic->GerudoFortressKeys,  RHT_GERUDO_FORTRESS_SMALL_KEY,RG_GERUDO_FORTRESS_SMALL_KEY, OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_GERUDO_FORTRESS_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
-    itemTable[RG_GANONS_CASTLE_SMALL_KEY] =             Item(RG_GANONS_CASTLE_SMALL_KEY,          Text{ "Ganon's Castle Small Key", "Petite Clé du Château de Ganon", "Ganons Schloss Kleiner Schlüssel" },         ITEMTYPE_SMALLKEY,          0xB7,               true,  &Logic::GanonsCastleKeys,    RHT_GANONS_CASTLE_SMALL_KEY,RG_GANONS_CASTLE_SMALL_KEY,     OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_GANONS_CASTLE_SMALL_KEY] =             Item(RG_GANONS_CASTLE_SMALL_KEY,          Text{ "Ganon's Castle Small Key", "Petite Clé du Château de Ganon", "Ganons Schloss Kleiner Schlüssel" },         ITEMTYPE_SMALLKEY,          0xB7,               true,  &logic->GanonsCastleKeys,    RHT_GANONS_CASTLE_SMALL_KEY,RG_GANONS_CASTLE_SMALL_KEY,     OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_GANONS_CASTLE_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
-    itemTable[RG_TREASURE_GAME_SMALL_KEY] =             Item(RG_TREASURE_GAME_SMALL_KEY,          Text{ "Chest Game Small Key", "Petite Clé du jeu la Chasse-aux-Trésors", "Truhenspiel Kleiner Schlüssel" },       ITEMTYPE_SMALLKEY,          GI_DOOR_KEY,        true,  &Logic::TreasureGameKeys,    RHT_TREASURE_GAME_SMALL_KEY,ITEM_KEY_SMALL,                 OBJECT_GI_KEY,          GID_KEY_SMALL,      0xF3,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_NONE);
+    itemTable[RG_TREASURE_GAME_SMALL_KEY] =             Item(RG_TREASURE_GAME_SMALL_KEY,          Text{ "Chest Game Small Key", "Petite Clé du jeu la Chasse-aux-Trésors", "Truhenspiel Kleiner Schlüssel" },       ITEMTYPE_SMALLKEY,          GI_DOOR_KEY,        true,  &logic->TreasureGameKeys,    RHT_TREASURE_GAME_SMALL_KEY,ITEM_KEY_SMALL,                 OBJECT_GI_KEY,          GID_KEY_SMALL,      0xF3,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_NONE);
     // Key Rings
-    itemTable[RG_FOREST_TEMPLE_KEY_RING] =              Item(RG_FOREST_TEMPLE_KEY_RING,           Text{ "Forest Temple Key Ring", "Trousseau du Temple de la Forêt", "Waldtempel Schlüsselanhänger" },              ITEMTYPE_SMALLKEY,          0xD5,               true,  &Logic::ForestTempleKeys,    RHT_FOREST_TEMPLE_KEY_RING, RG_FOREST_TEMPLE_KEY_RING,      OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_FOREST_TEMPLE_KEY_RING] =              Item(RG_FOREST_TEMPLE_KEY_RING,           Text{ "Forest Temple Key Ring", "Trousseau du Temple de la Forêt", "Waldtempel Schlüsselanhänger" },              ITEMTYPE_SMALLKEY,          0xD5,               true,  &logic->ForestTempleKeys,    RHT_FOREST_TEMPLE_KEY_RING, RG_FOREST_TEMPLE_KEY_RING,      OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_FOREST_TEMPLE_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
-    itemTable[RG_FIRE_TEMPLE_KEY_RING] =                Item(RG_FIRE_TEMPLE_KEY_RING,             Text{ "Fire Temple Key Ring", "Trousseau du Temple du Feu", "Feuertempel Schlüsselanhänger" },                    ITEMTYPE_SMALLKEY,          0xD6,               true,  &Logic::FireTempleKeys,      RHT_FIRE_TEMPLE_KEY_RING,   RG_FIRE_TEMPLE_KEY_RING,        OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_FIRE_TEMPLE_KEY_RING] =                Item(RG_FIRE_TEMPLE_KEY_RING,             Text{ "Fire Temple Key Ring", "Trousseau du Temple du Feu", "Feuertempel Schlüsselanhänger" },                    ITEMTYPE_SMALLKEY,          0xD6,               true,  &logic->FireTempleKeys,      RHT_FIRE_TEMPLE_KEY_RING,   RG_FIRE_TEMPLE_KEY_RING,        OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_FIRE_TEMPLE_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
-    itemTable[RG_WATER_TEMPLE_KEY_RING] =               Item(RG_WATER_TEMPLE_KEY_RING,            Text{ "Water Temple Key Ring", "Trousseau du Temple de l'Eau", "Wassertempel Schlüsselanhänger" },                ITEMTYPE_SMALLKEY,          0xD7,               true,  &Logic::WaterTempleKeys,     RHT_WATER_TEMPLE_KEY_RING,  RG_WATER_TEMPLE_KEY_RING,       OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_WATER_TEMPLE_KEY_RING] =               Item(RG_WATER_TEMPLE_KEY_RING,            Text{ "Water Temple Key Ring", "Trousseau du Temple de l'Eau", "Wassertempel Schlüsselanhänger" },                ITEMTYPE_SMALLKEY,          0xD7,               true,  &logic->WaterTempleKeys,     RHT_WATER_TEMPLE_KEY_RING,  RG_WATER_TEMPLE_KEY_RING,       OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_WATER_TEMPLE_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
-    itemTable[RG_SPIRIT_TEMPLE_KEY_RING] =              Item(RG_SPIRIT_TEMPLE_KEY_RING,           Text{ "Spirit Temple Key Ring", "Trousseau du Temple de l'Esprit", "Geisttempel Schlüsselanhänger" },             ITEMTYPE_SMALLKEY,          0xD8,               true,  &Logic::SpiritTempleKeys,    RHT_SPIRIT_TEMPLE_KEY_RING, RG_SPIRIT_TEMPLE_KEY_RING,      OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_SPIRIT_TEMPLE_KEY_RING] =              Item(RG_SPIRIT_TEMPLE_KEY_RING,           Text{ "Spirit Temple Key Ring", "Trousseau du Temple de l'Esprit", "Geisttempel Schlüsselanhänger" },             ITEMTYPE_SMALLKEY,          0xD8,               true,  &logic->SpiritTempleKeys,    RHT_SPIRIT_TEMPLE_KEY_RING, RG_SPIRIT_TEMPLE_KEY_RING,      OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_SPIRIT_TEMPLE_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
-    itemTable[RG_SHADOW_TEMPLE_KEY_RING] =              Item(RG_SHADOW_TEMPLE_KEY_RING,           Text{ "Shadow Temple Key Ring", "Trousseau du Temple de l'Ombre", "Schattentempel Schlüsselanhänger" },           ITEMTYPE_SMALLKEY,          0xD9,               true,  &Logic::ShadowTempleKeys,    RHT_SHADOW_TEMPLE_KEY_RING, RG_SHADOW_TEMPLE_KEY_RING,      OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_SHADOW_TEMPLE_KEY_RING] =              Item(RG_SHADOW_TEMPLE_KEY_RING,           Text{ "Shadow Temple Key Ring", "Trousseau du Temple de l'Ombre", "Schattentempel Schlüsselanhänger" },           ITEMTYPE_SMALLKEY,          0xD9,               true,  &logic->ShadowTempleKeys,    RHT_SHADOW_TEMPLE_KEY_RING, RG_SHADOW_TEMPLE_KEY_RING,      OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_SHADOW_TEMPLE_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
-    itemTable[RG_BOTTOM_OF_THE_WELL_KEY_RING] =         Item(RG_BOTTOM_OF_THE_WELL_KEY_RING,      Text{ "Bottom of the Well Key Ring", "Trousseau du Puits", "Boden des Brunnens Schlüsselanhänger" },              ITEMTYPE_SMALLKEY,          0xDA,               true,  &Logic::BottomOfTheWellKeys, RHT_BOTTOM_OF_THE_WELL_KEY_RING,RG_BOTTOM_OF_THE_WELL_KEY_RING,OBJECT_GI_KEY,       GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_BOTTOM_OF_THE_WELL_KEY_RING] =         Item(RG_BOTTOM_OF_THE_WELL_KEY_RING,      Text{ "Bottom of the Well Key Ring", "Trousseau du Puits", "Boden des Brunnens Schlüsselanhänger" },              ITEMTYPE_SMALLKEY,          0xDA,               true,  &logic->BottomOfTheWellKeys, RHT_BOTTOM_OF_THE_WELL_KEY_RING,RG_BOTTOM_OF_THE_WELL_KEY_RING,OBJECT_GI_KEY,       GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_BOTTOM_OF_THE_WELL_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
-    itemTable[RG_GERUDO_TRAINING_GROUNDS_KEY_RING] =    Item(RG_GERUDO_TRAINING_GROUNDS_KEY_RING, Text{ "Training Grounds Key Ring", "Trousseau du Gymnase Gerudo", "Trainingsgelände Schlüsselanhänger" },         ITEMTYPE_SMALLKEY,          0xDB,               true,  &Logic::GerudoTrainingGroundsKeys, RHT_GERUDO_TRAINING_GROUNDS_KEY_RING,RG_GERUDO_TRAINING_GROUNDS_KEY_RING,OBJECT_GI_KEY,GID_KEY_SMALL,TEXT_RANDOMIZER_CUSTOM_ITEM,0x80, CHEST_ANIM_SHORT,ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_GERUDO_TRAINING_GROUNDS_KEY_RING] =    Item(RG_GERUDO_TRAINING_GROUNDS_KEY_RING, Text{ "Training Grounds Key Ring", "Trousseau du Gymnase Gerudo", "Trainingsgelände Schlüsselanhänger" },         ITEMTYPE_SMALLKEY,          0xDB,               true,  &logic->GerudoTrainingGroundsKeys, RHT_GERUDO_TRAINING_GROUNDS_KEY_RING,RG_GERUDO_TRAINING_GROUNDS_KEY_RING,OBJECT_GI_KEY,GID_KEY_SMALL,TEXT_RANDOMIZER_CUSTOM_ITEM,0x80, CHEST_ANIM_SHORT,ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_GERUDO_TRAINING_GROUNDS_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
-    itemTable[RG_GERUDO_FORTRESS_KEY_RING] =            Item(RG_GERUDO_FORTRESS_KEY_RING,         Text{ "Gerudo Fortress Key Ring", "Trousseau du Repaire des Voleurs", "Gerudo Festung Schlüsselanhänger" },       ITEMTYPE_FORTRESS_SMALLKEY, 0xDC,               true,  &Logic::GerudoFortressKeys,  RHT_GERUDO_FORTRESS_KEY_RING,RG_GERUDO_FORTRESS_KEY_RING,   OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_GERUDO_FORTRESS_KEY_RING] =            Item(RG_GERUDO_FORTRESS_KEY_RING,         Text{ "Gerudo Fortress Key Ring", "Trousseau du Repaire des Voleurs", "Gerudo Festung Schlüsselanhänger" },       ITEMTYPE_FORTRESS_SMALLKEY, 0xDC,               true,  &logic->GerudoFortressKeys,  RHT_GERUDO_FORTRESS_KEY_RING,RG_GERUDO_FORTRESS_KEY_RING,   OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_GERUDO_FORTRESS_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
-    itemTable[RG_GANONS_CASTLE_KEY_RING] =              Item(RG_GANONS_CASTLE_KEY_RING,           Text{ "Ganon's Castle Key Ring", "Trousseau du Château de Ganon", "Ganons Schloss Schlüsselanhänger" },           ITEMTYPE_SMALLKEY,          0xDD,               true,  &Logic::GanonsCastleKeys,    RHT_GANONS_CASTLE_KEY_RING, RG_GANONS_CASTLE_KEY_RING,      OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_GANONS_CASTLE_KEY_RING] =              Item(RG_GANONS_CASTLE_KEY_RING,           Text{ "Ganon's Castle Key Ring", "Trousseau du Château de Ganon", "Ganons Schloss Schlüsselanhänger" },           ITEMTYPE_SMALLKEY,          0xDD,               true,  &logic->GanonsCastleKeys,    RHT_GANONS_CASTLE_KEY_RING, RG_GANONS_CASTLE_KEY_RING,      OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_GANONS_CASTLE_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
     // Dungeon Rewards
-    itemTable[RG_KOKIRI_EMERALD] =                      Item(RG_KOKIRI_EMERALD,                   Text{ "Kokiri's Emerald", "Émeraude Kokiri", "Kokiri-Smaragd" },                                                  ITEMTYPE_DUNGEONREWARD,     0xCB,               true,  &Logic::KokiriEmerald,       RHT_KOKIRI_EMERALD,         ITEM_KOKIRI_EMERALD,            OBJECT_GI_JEWEL,        GID_KOKIRI_EMERALD, 0x80,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_GORON_RUBY] =                          Item(RG_GORON_RUBY,                       Text{ "Goron's Ruby", "Rubis Goron", "Goronen-Rubin" },                                                           ITEMTYPE_DUNGEONREWARD,     0xCC,               true,  &Logic::GoronRuby,           RHT_GORON_RUBY,             ITEM_GORON_RUBY,                OBJECT_GI_JEWEL,        GID_GORON_RUBY,     0x81,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_ZORA_SAPPHIRE] =                       Item(RG_ZORA_SAPPHIRE,                    Text{ "Zora's Sapphire", "Saphir Zora", "Zora-Saphir" },                                                          ITEMTYPE_DUNGEONREWARD,     0xCD,               true,  &Logic::ZoraSapphire,        RHT_ZORA_SAPPHIRE,          ITEM_ZORA_SAPPHIRE,             OBJECT_GI_JEWEL,        GID_ZORA_SAPPHIRE,  0x82,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_FOREST_MEDALLION] =                    Item(RG_FOREST_MEDALLION,                 Text{ "Forest Medallion", "Médaillon de la Forêt", "Wald Medaillon" },                                            ITEMTYPE_DUNGEONREWARD,     0xCE,               true,  &Logic::ForestMedallion,     RHT_FOREST_MEDALLION,       ITEM_MEDALLION_FOREST,          OBJECT_GI_MEDAL,        GID_MEDALLION_FOREST,0x3E,                       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_FIRE_MEDALLION] =                      Item(RG_FIRE_MEDALLION,                   Text{ "Fire Medallion", "Médaillon du Feu", "Feuer Medaillon" },                                                  ITEMTYPE_DUNGEONREWARD,     0xCF,               true,  &Logic::FireMedallion,       RHT_FIRE_MEDALLION,         ITEM_MEDALLION_FIRE,            OBJECT_GI_MEDAL,        GID_MEDALLION_FIRE, 0x3C,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_WATER_MEDALLION] =                     Item(RG_WATER_MEDALLION,                  Text{ "Water Medallion", "Médaillon de l'Eau", "Wasser Medaillon" },                                              ITEMTYPE_DUNGEONREWARD,     0xD0,               true,  &Logic::WaterMedallion,      RHT_WATER_MEDALLION,        ITEM_MEDALLION_WATER,           OBJECT_GI_MEDAL,        GID_MEDALLION_WATER,0x3D,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_SPIRIT_MEDALLION] =                    Item(RG_SPIRIT_MEDALLION,                 Text{ "Spirit Medallion", "Médaillon de l'Esprit", "Geist Medaillon" },                                           ITEMTYPE_DUNGEONREWARD,     0xD1,               true,  &Logic::SpiritMedallion,     RHT_SPIRIT_MEDALLION,       ITEM_MEDALLION_SPIRIT,          OBJECT_GI_MEDAL,        GID_MEDALLION_SPIRIT,0x3F,                       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_SHADOW_MEDALLION] =                    Item(RG_SHADOW_MEDALLION,                 Text{ "Shadow Medallion", "Médaillon de l'Ombre", "Schatten Medaillon" },                                         ITEMTYPE_DUNGEONREWARD,     0xD2,               true,  &Logic::ShadowMedallion,     RHT_SHADOW_MEDALLION,       ITEM_MEDALLION_SHADOW,          OBJECT_GI_MEDAL,        GID_MEDALLION_SHADOW,0x41,                       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_LIGHT_MEDALLION] =                     Item(RG_LIGHT_MEDALLION,                  Text{ "Light Medallion", "Médaillon de la Lumière", "Licht Medaillon" },                                          ITEMTYPE_DUNGEONREWARD,     0xD3,               true,  &Logic::LightMedallion,      RHT_LIGHT_MEDALLION,        ITEM_MEDALLION_LIGHT,           OBJECT_GI_MEDAL,        GID_MEDALLION_LIGHT,0x40,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_KOKIRI_EMERALD] =                      Item(RG_KOKIRI_EMERALD,                   Text{ "Kokiri's Emerald", "Émeraude Kokiri", "Kokiri-Smaragd" },                                                  ITEMTYPE_DUNGEONREWARD,     0xCB,               true,  &logic->KokiriEmerald,       RHT_KOKIRI_EMERALD,         ITEM_KOKIRI_EMERALD,            OBJECT_GI_JEWEL,        GID_KOKIRI_EMERALD, 0x80,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_GORON_RUBY] =                          Item(RG_GORON_RUBY,                       Text{ "Goron's Ruby", "Rubis Goron", "Goronen-Rubin" },                                                           ITEMTYPE_DUNGEONREWARD,     0xCC,               true,  &logic->GoronRuby,           RHT_GORON_RUBY,             ITEM_GORON_RUBY,                OBJECT_GI_JEWEL,        GID_GORON_RUBY,     0x81,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_ZORA_SAPPHIRE] =                       Item(RG_ZORA_SAPPHIRE,                    Text{ "Zora's Sapphire", "Saphir Zora", "Zora-Saphir" },                                                          ITEMTYPE_DUNGEONREWARD,     0xCD,               true,  &logic->ZoraSapphire,        RHT_ZORA_SAPPHIRE,          ITEM_ZORA_SAPPHIRE,             OBJECT_GI_JEWEL,        GID_ZORA_SAPPHIRE,  0x82,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_FOREST_MEDALLION] =                    Item(RG_FOREST_MEDALLION,                 Text{ "Forest Medallion", "Médaillon de la Forêt", "Wald Medaillon" },                                            ITEMTYPE_DUNGEONREWARD,     0xCE,               true,  &logic->ForestMedallion,     RHT_FOREST_MEDALLION,       ITEM_MEDALLION_FOREST,          OBJECT_GI_MEDAL,        GID_MEDALLION_FOREST,0x3E,                       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_FIRE_MEDALLION] =                      Item(RG_FIRE_MEDALLION,                   Text{ "Fire Medallion", "Médaillon du Feu", "Feuer Medaillon" },                                                  ITEMTYPE_DUNGEONREWARD,     0xCF,               true,  &logic->FireMedallion,       RHT_FIRE_MEDALLION,         ITEM_MEDALLION_FIRE,            OBJECT_GI_MEDAL,        GID_MEDALLION_FIRE, 0x3C,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_WATER_MEDALLION] =                     Item(RG_WATER_MEDALLION,                  Text{ "Water Medallion", "Médaillon de l'Eau", "Wasser Medaillon" },                                              ITEMTYPE_DUNGEONREWARD,     0xD0,               true,  &logic->WaterMedallion,      RHT_WATER_MEDALLION,        ITEM_MEDALLION_WATER,           OBJECT_GI_MEDAL,        GID_MEDALLION_WATER,0x3D,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_SPIRIT_MEDALLION] =                    Item(RG_SPIRIT_MEDALLION,                 Text{ "Spirit Medallion", "Médaillon de l'Esprit", "Geist Medaillon" },                                           ITEMTYPE_DUNGEONREWARD,     0xD1,               true,  &logic->SpiritMedallion,     RHT_SPIRIT_MEDALLION,       ITEM_MEDALLION_SPIRIT,          OBJECT_GI_MEDAL,        GID_MEDALLION_SPIRIT,0x3F,                       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_SHADOW_MEDALLION] =                    Item(RG_SHADOW_MEDALLION,                 Text{ "Shadow Medallion", "Médaillon de l'Ombre", "Schatten Medaillon" },                                         ITEMTYPE_DUNGEONREWARD,     0xD2,               true,  &logic->ShadowMedallion,     RHT_SHADOW_MEDALLION,       ITEM_MEDALLION_SHADOW,          OBJECT_GI_MEDAL,        GID_MEDALLION_SHADOW,0x41,                       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_LIGHT_MEDALLION] =                     Item(RG_LIGHT_MEDALLION,                  Text{ "Light Medallion", "Médaillon de la Lumière", "Licht Medaillon" },                                          ITEMTYPE_DUNGEONREWARD,     0xD3,               true,  &logic->LightMedallion,      RHT_LIGHT_MEDALLION,        ITEM_MEDALLION_LIGHT,           OBJECT_GI_MEDAL,        GID_MEDALLION_LIGHT,0x40,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
     // Generic Items
-    itemTable[RG_RECOVERY_HEART] =                      Item(RG_RECOVERY_HEART,                   Text{ "Recovery Heart", "Coeur de Vie", "Herz" },                                                                 ITEMTYPE_ITEM,              GI_HEART,           false, &Logic::noVariable,          RHT_RECOVERY_HEART,         ITEM_HEART,                     OBJECT_GI_HEART,        GID_HEART,          0x55,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_GREEN_RUPEE] =                         Item(RG_GREEN_RUPEE,                      Text{ "Green Rupee", "Rubis Vert", "Grüne Rupie" },                                                               ITEMTYPE_ITEM,              GI_RUPEE_GREEN,     false, &Logic::noVariable,          RHT_GREEN_RUPEE,            ITEM_RUPEE_GREEN,               OBJECT_GI_RUPY,         GID_RUPEE_GREEN,    0x6F,                        0x00, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_GREG_RUPEE] =                          Item(RG_GREG_RUPEE,                       Text{ "Greg the Green Rupee", "Rubis Greg", "Greg Rupie" },                                                       ITEMTYPE_ITEM,              GI_RUPEE_GREEN,     true,  &Logic::Greg,                RHT_GREG_RUPEE,             RG_GREG_RUPEE,                  OBJECT_GI_RUPY,         GID_RUPEE_GREEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_BLUE_RUPEE] =                          Item(RG_BLUE_RUPEE,                       Text{ "Blue Rupee", "Rubis Bleu", "Blaue Rupie" },                                                                ITEMTYPE_ITEM,              GI_RUPEE_BLUE,      false, &Logic::noVariable,          RHT_BLUE_RUPEE,             ITEM_RUPEE_BLUE,                OBJECT_GI_RUPY,         GID_RUPEE_BLUE,     0xCC,                        0x01, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_RED_RUPEE] =                           Item(RG_RED_RUPEE,                        Text{ "Red Rupee", "Rubis Rouge", "Rote Rupie" },                                                                 ITEMTYPE_ITEM,              GI_RUPEE_RED,       false, &Logic::noVariable,          RHT_RED_RUPEE,              ITEM_RUPEE_RED,                 OBJECT_GI_RUPY,         GID_RUPEE_RED,      0xF0,                        0x02, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_PURPLE_RUPEE] =                        Item(RG_PURPLE_RUPEE,                     Text{ "Purple Rupee", "Rubis Pourpre", "Lila Rupie" },                                                            ITEMTYPE_ITEM,              GI_RUPEE_PURPLE,    false, &Logic::noVariable,          RHT_PURPLE_RUPEE,           ITEM_RUPEE_PURPLE,              OBJECT_GI_RUPY,         GID_RUPEE_PURPLE,   0xF1,                        0x14, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_HUGE_RUPEE] =                          Item(RG_HUGE_RUPEE,                       Text{ "Huge Rupee", "Énorme Rubis", "Riesige Rupie" },                                                            ITEMTYPE_ITEM,              GI_RUPEE_GOLD,      false, &Logic::noVariable,          RHT_HUGE_RUPEE,             ITEM_RUPEE_GOLD,                OBJECT_GI_RUPY,         GID_RUPEE_GOLD,     0xF2,                        0x13, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_PIECE_OF_HEART] =                      Item(RG_PIECE_OF_HEART,                   Text{ "Piece of Heart", "Quart de Coeur", "Herzstück" },                                                          ITEMTYPE_ITEM,              GI_HEART_PIECE,     true,  &Logic::PieceOfHeart,        RHT_PIECE_OF_HEART,         ITEM_HEART_PIECE_2,             OBJECT_GI_HEARTS,       GID_HEART_PIECE,    0xC2,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_HEART_CONTAINER] =                     Item(RG_HEART_CONTAINER,                  Text{ "Heart Container", "Réceptacle de Coeur", "Herz-Container" },                                               ITEMTYPE_ITEM,              GI_HEART_CONTAINER_2,true, &Logic::HeartContainer,      RHT_HEART_CONTAINER,        ITEM_HEART_CONTAINER,           OBJECT_GI_HEARTS,       GID_HEART_CONTAINER,0xC6,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_ICE_TRAP] =                            Item(RG_ICE_TRAP,                         Text{ "Ice Trap", "Piège de Glace", "Eisfalle" },                                                                 ITEMTYPE_ITEM,              RG_ICE_TRAP,        false, &Logic::noVariable,          RHT_ICE_TRAP,               RG_ICE_TRAP,                    OBJECT_GI_RUPY,         GID_RUPEE_GOLD,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_MILK] =                                Item(RG_MILK,                             Text{ "Milk", "Lait", "Milch" },                                                                                  ITEMTYPE_ITEM,              GI_MILK,            false, &Logic::noVariable,          RHT_NONE,                   ITEM_MILK,                      OBJECT_GI_MILK,         GID_MILK,           0x98,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_RECOVERY_HEART] =                      Item(RG_RECOVERY_HEART,                   Text{ "Recovery Heart", "Coeur de Vie", "Herz" },                                                                 ITEMTYPE_ITEM,              GI_HEART,           false, &logic->noVariable,          RHT_RECOVERY_HEART,         ITEM_HEART,                     OBJECT_GI_HEART,        GID_HEART,          0x55,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_GREEN_RUPEE] =                         Item(RG_GREEN_RUPEE,                      Text{ "Green Rupee", "Rubis Vert", "Grüne Rupie" },                                                               ITEMTYPE_ITEM,              GI_RUPEE_GREEN,     false, &logic->noVariable,          RHT_GREEN_RUPEE,            ITEM_RUPEE_GREEN,               OBJECT_GI_RUPY,         GID_RUPEE_GREEN,    0x6F,                        0x00, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_GREG_RUPEE] =                          Item(RG_GREG_RUPEE,                       Text{ "Greg the Green Rupee", "Rubis Greg", "Greg Rupie" },                                                       ITEMTYPE_ITEM,              GI_RUPEE_GREEN,     true,  &logic->Greg,                RHT_GREG_RUPEE,             RG_GREG_RUPEE,                  OBJECT_GI_RUPY,         GID_RUPEE_GREEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BLUE_RUPEE] =                          Item(RG_BLUE_RUPEE,                       Text{ "Blue Rupee", "Rubis Bleu", "Blaue Rupie" },                                                                ITEMTYPE_ITEM,              GI_RUPEE_BLUE,      false, &logic->noVariable,          RHT_BLUE_RUPEE,             ITEM_RUPEE_BLUE,                OBJECT_GI_RUPY,         GID_RUPEE_BLUE,     0xCC,                        0x01, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_RED_RUPEE] =                           Item(RG_RED_RUPEE,                        Text{ "Red Rupee", "Rubis Rouge", "Rote Rupie" },                                                                 ITEMTYPE_ITEM,              GI_RUPEE_RED,       false, &logic->noVariable,          RHT_RED_RUPEE,              ITEM_RUPEE_RED,                 OBJECT_GI_RUPY,         GID_RUPEE_RED,      0xF0,                        0x02, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_PURPLE_RUPEE] =                        Item(RG_PURPLE_RUPEE,                     Text{ "Purple Rupee", "Rubis Pourpre", "Lila Rupie" },                                                            ITEMTYPE_ITEM,              GI_RUPEE_PURPLE,    false, &logic->noVariable,          RHT_PURPLE_RUPEE,           ITEM_RUPEE_PURPLE,              OBJECT_GI_RUPY,         GID_RUPEE_PURPLE,   0xF1,                        0x14, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_HUGE_RUPEE] =                          Item(RG_HUGE_RUPEE,                       Text{ "Huge Rupee", "Énorme Rubis", "Riesige Rupie" },                                                            ITEMTYPE_ITEM,              GI_RUPEE_GOLD,      false, &logic->noVariable,          RHT_HUGE_RUPEE,             ITEM_RUPEE_GOLD,                OBJECT_GI_RUPY,         GID_RUPEE_GOLD,     0xF2,                        0x13, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_PIECE_OF_HEART] =                      Item(RG_PIECE_OF_HEART,                   Text{ "Piece of Heart", "Quart de Coeur", "Herzstück" },                                                          ITEMTYPE_ITEM,              GI_HEART_PIECE,     true,  &logic->PieceOfHeart,        RHT_PIECE_OF_HEART,         ITEM_HEART_PIECE_2,             OBJECT_GI_HEARTS,       GID_HEART_PIECE,    0xC2,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_HEART_CONTAINER] =                     Item(RG_HEART_CONTAINER,                  Text{ "Heart Container", "Réceptacle de Coeur", "Herz-Container" },                                               ITEMTYPE_ITEM,              GI_HEART_CONTAINER_2,true, &logic->HeartContainer,      RHT_HEART_CONTAINER,        ITEM_HEART_CONTAINER,           OBJECT_GI_HEARTS,       GID_HEART_CONTAINER,0xC6,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_ICE_TRAP] =                            Item(RG_ICE_TRAP,                         Text{ "Ice Trap", "Piège de Glace", "Eisfalle" },                                                                 ITEMTYPE_ITEM,              RG_ICE_TRAP,        false, &logic->noVariable,          RHT_ICE_TRAP,               RG_ICE_TRAP,                    OBJECT_GI_RUPY,         GID_RUPEE_GOLD,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_MILK] =                                Item(RG_MILK,                             Text{ "Milk", "Lait", "Milch" },                                                                                  ITEMTYPE_ITEM,              GI_MILK,            false, &logic->noVariable,          RHT_NONE,                   ITEM_MILK,                      OBJECT_GI_MILK,         GID_MILK,           0x98,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
     // Refills
-    itemTable[RG_BOMBS_5] =                             Item(RG_BOMBS_5,                          Text{ "Bombs (5)", "Bombes (5)", "Bomben (5)" },                                                                  ITEMTYPE_REFILL,            GI_BOMBS_5,         false, &Logic::noVariable,          RHT_BOMBS_5,                ITEM_BOMBS_5,                   OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_BOMBS_10] =                            Item(RG_BOMBS_10,                         Text{ "Bombs (10)", "Bombes (10)", "Bomben (10)" },                                                               ITEMTYPE_REFILL,            GI_BOMBS_10,        false, &Logic::noVariable,          RHT_BOMBS_10,               ITEM_BOMBS_10,                  OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_BOMBS_20] =                            Item(RG_BOMBS_20,                         Text{ "Bombs (20)", "Bombes (20)", "Bomben (20)" },                                                               ITEMTYPE_REFILL,            GI_BOMBS_20,        false, &Logic::noVariable,          RHT_BOMBS_20,               ITEM_BOMBS_20,                  OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_BOMBCHU_5] =                           Item(RG_BOMBCHU_5,                        Text{ "Bombchus (5)", "Missiles (5)", "Bombchus (5)" },                                                           ITEMTYPE_REFILL,            GI_BOMBCHUS_5,      true,  &Logic::Bombchus5,           RHT_BOMBCHU_5,              ITEM_BOMBCHUS_5,                OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_BOMBCHU_10] =                          Item(RG_BOMBCHU_10,                       Text{ "Bombchus (10)", "Missiles (10)", "Bombchus (10)" },                                                        ITEMTYPE_REFILL,            GI_BOMBCHUS_10,     true,  &Logic::Bombchus10,          RHT_BOMBCHU_10,             ITEM_BOMBCHU,                   OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_BOMBCHU_20] =                          Item(RG_BOMBCHU_20,                       Text{ "Bombchus (20)", "Missiles (20)", "Bombchus (20)" },                                                        ITEMTYPE_REFILL,            GI_BOMBCHUS_20,     true,  &Logic::Bombchus20,          RHT_BOMBCHU_20,             ITEM_BOMBCHUS_20,               OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_BOMBCHU_DROP] =                        Item(RG_BOMBCHU_DROP,                     Text{ "Bombchu Drop", "Drop Missiles", "Bombchus" },                                                              ITEMTYPE_DROP,              GI_BOMBCHUS_10,     true,  &Logic::BombchuDrop,         RHT_NONE,                   ITEM_BOMBCHU,                   OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_ARROWS_5] =                            Item(RG_ARROWS_5,                         Text{ "Arrows (5)", "Flèches (5)", "Pfeile (5)" },                                                                ITEMTYPE_REFILL,            GI_ARROWS_SMALL,    false, &Logic::noVariable,          RHT_ARROWS_5,               ITEM_ARROWS_SMALL,              OBJECT_GI_ARROW,        GID_ARROWS_SMALL,   0xE6,                        0x48, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_ARROWS_10] =                           Item(RG_ARROWS_10,                        Text{ "Arrows (10)", "Flèches (10)", "Pfeile (10)" },                                                             ITEMTYPE_REFILL,            GI_ARROWS_MEDIUM,   false, &Logic::noVariable,          RHT_ARROWS_10,              ITEM_ARROWS_MEDIUM,             OBJECT_GI_ARROW,        GID_ARROWS_MEDIUM,  0xE6,                        0x49, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_ARROWS_30] =                           Item(RG_ARROWS_30,                        Text{ "Arrows (30)", "Flèches (30)", "Pfeile (30)" },                                                             ITEMTYPE_REFILL,            GI_ARROWS_LARGE,    false, &Logic::noVariable,          RHT_ARROWS_30,              ITEM_ARROWS_LARGE,              OBJECT_GI_ARROW,        GID_ARROWS_LARGE,   0xE6,                        0x4A, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_DEKU_NUTS_5] =                         Item(RG_DEKU_NUTS_5,                      Text{ "Deku Nuts (5)", "Noix Mojo (5)", "Deku-Nüsse (5)" },                                                       ITEMTYPE_REFILL,            GI_NUTS_5,          false, &Logic::noVariable,          RHT_DEKU_NUTS_5,            ITEM_NUTS_5,                    OBJECT_GI_NUTS,         GID_NUTS,           0x34,                        0x0C, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_DEKU_NUTS_10] =                        Item(RG_DEKU_NUTS_10,                     Text{ "Deku Nuts (10)", "Noix Mojo (10)", "Deku-Nüsse (10)" },                                                    ITEMTYPE_REFILL,            GI_NUTS_10,         false, &Logic::noVariable,          RHT_DEKU_NUTS_10,           ITEM_NUTS_10,                   OBJECT_GI_NUTS,         GID_NUTS,           0x34,                        0x0C, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_DEKU_SEEDS_30] =                       Item(RG_DEKU_SEEDS_30,                    Text{ "Deku Seeds (30)", "Graines Mojo (30)", "Deku-Samen (30)" },                                                ITEMTYPE_REFILL,            GI_SEEDS_30,        false, &Logic::noVariable,          RHT_DEKU_SEEDS_30,          ITEM_SEEDS_30,                  OBJECT_GI_SEED,         GID_SEEDS,          0xDC,                        0x50, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_DEKU_STICK_1] =                        Item(RG_DEKU_STICK_1,                     Text{ "Deku Stick (1)", "Bâton Mojo (1)", "Deku-Stick (1)" },                                                     ITEMTYPE_REFILL,            GI_STICKS_1,        false, &Logic::noVariable,          RHT_DEKU_STICK_1,           ITEM_STICK,                     OBJECT_GI_STICK,        GID_STICK,          0x37,                        0x0D, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_RED_POTION_REFILL] =                   Item(RG_RED_POTION_REFILL,                Text{ "Red Potion Refill", "Recharge de Potion Rouge", "Rotes Elixier Nachfüllpackung" },                         ITEMTYPE_REFILL,            GI_POTION_RED,      false, &Logic::noVariable,          RHT_NONE,                   ITEM_POTION_RED,                OBJECT_GI_LIQUID,       GID_POTION_RED,     0x43,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_GREEN_POTION_REFILL] =                 Item(RG_GREEN_POTION_REFILL,              Text{ "Green Potion Refill", "Recharge de Potion Verte", "Grünes Elixier Nachfüllpackung" },                      ITEMTYPE_REFILL,            GI_POTION_GREEN,    false, &Logic::noVariable,          RHT_NONE,                   ITEM_POTION_GREEN,              OBJECT_GI_LIQUID,       GID_POTION_GREEN,   0x44,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_BLUE_POTION_REFILL] =                  Item(RG_BLUE_POTION_REFILL,               Text{ "Blue Potion Refill", "Recharge de Potion Bleue", "Blaues Elixier Nachfüllpackung" },                       ITEMTYPE_REFILL,            GI_POTION_BLUE,     false, &Logic::noVariable,          RHT_NONE,                   ITEM_POTION_BLUE,               OBJECT_GI_LIQUID,       GID_POTION_BLUE,    0x45,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_BOMBS_5] =                             Item(RG_BOMBS_5,                          Text{ "Bombs (5)", "Bombes (5)", "Bomben (5)" },                                                                  ITEMTYPE_REFILL,            GI_BOMBS_5,         false, &logic->noVariable,          RHT_BOMBS_5,                ITEM_BOMBS_5,                   OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_BOMBS_10] =                            Item(RG_BOMBS_10,                         Text{ "Bombs (10)", "Bombes (10)", "Bomben (10)" },                                                               ITEMTYPE_REFILL,            GI_BOMBS_10,        false, &logic->noVariable,          RHT_BOMBS_10,               ITEM_BOMBS_10,                  OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_BOMBS_20] =                            Item(RG_BOMBS_20,                         Text{ "Bombs (20)", "Bombes (20)", "Bomben (20)" },                                                               ITEMTYPE_REFILL,            GI_BOMBS_20,        false, &logic->noVariable,          RHT_BOMBS_20,               ITEM_BOMBS_20,                  OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_BOMBCHU_5] =                           Item(RG_BOMBCHU_5,                        Text{ "Bombchus (5)", "Missiles (5)", "Bombchus (5)" },                                                           ITEMTYPE_REFILL,            GI_BOMBCHUS_5,      true,  &logic->Bombchus5,           RHT_BOMBCHU_5,              ITEM_BOMBCHUS_5,                OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_BOMBCHU_10] =                          Item(RG_BOMBCHU_10,                       Text{ "Bombchus (10)", "Missiles (10)", "Bombchus (10)" },                                                        ITEMTYPE_REFILL,            GI_BOMBCHUS_10,     true,  &logic->Bombchus10,          RHT_BOMBCHU_10,             ITEM_BOMBCHU,                   OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_BOMBCHU_20] =                          Item(RG_BOMBCHU_20,                       Text{ "Bombchus (20)", "Missiles (20)", "Bombchus (20)" },                                                        ITEMTYPE_REFILL,            GI_BOMBCHUS_20,     true,  &logic->Bombchus20,          RHT_BOMBCHU_20,             ITEM_BOMBCHUS_20,               OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_BOMBCHU_DROP] =                        Item(RG_BOMBCHU_DROP,                     Text{ "Bombchu Drop", "Drop Missiles", "Bombchus" },                                                              ITEMTYPE_DROP,              GI_BOMBCHUS_10,     true,  &logic->BombchuDrop,         RHT_NONE,                   ITEM_BOMBCHU,                   OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_ARROWS_5] =                            Item(RG_ARROWS_5,                         Text{ "Arrows (5)", "Flèches (5)", "Pfeile (5)" },                                                                ITEMTYPE_REFILL,            GI_ARROWS_SMALL,    false, &logic->noVariable,          RHT_ARROWS_5,               ITEM_ARROWS_SMALL,              OBJECT_GI_ARROW,        GID_ARROWS_SMALL,   0xE6,                        0x48, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_ARROWS_10] =                           Item(RG_ARROWS_10,                        Text{ "Arrows (10)", "Flèches (10)", "Pfeile (10)" },                                                             ITEMTYPE_REFILL,            GI_ARROWS_MEDIUM,   false, &logic->noVariable,          RHT_ARROWS_10,              ITEM_ARROWS_MEDIUM,             OBJECT_GI_ARROW,        GID_ARROWS_MEDIUM,  0xE6,                        0x49, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_ARROWS_30] =                           Item(RG_ARROWS_30,                        Text{ "Arrows (30)", "Flèches (30)", "Pfeile (30)" },                                                             ITEMTYPE_REFILL,            GI_ARROWS_LARGE,    false, &logic->noVariable,          RHT_ARROWS_30,              ITEM_ARROWS_LARGE,              OBJECT_GI_ARROW,        GID_ARROWS_LARGE,   0xE6,                        0x4A, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_DEKU_NUTS_5] =                         Item(RG_DEKU_NUTS_5,                      Text{ "Deku Nuts (5)", "Noix Mojo (5)", "Deku-Nüsse (5)" },                                                       ITEMTYPE_REFILL,            GI_NUTS_5,          false, &logic->noVariable,          RHT_DEKU_NUTS_5,            ITEM_NUTS_5,                    OBJECT_GI_NUTS,         GID_NUTS,           0x34,                        0x0C, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_DEKU_NUTS_10] =                        Item(RG_DEKU_NUTS_10,                     Text{ "Deku Nuts (10)", "Noix Mojo (10)", "Deku-Nüsse (10)" },                                                    ITEMTYPE_REFILL,            GI_NUTS_10,         false, &logic->noVariable,          RHT_DEKU_NUTS_10,           ITEM_NUTS_10,                   OBJECT_GI_NUTS,         GID_NUTS,           0x34,                        0x0C, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_DEKU_SEEDS_30] =                       Item(RG_DEKU_SEEDS_30,                    Text{ "Deku Seeds (30)", "Graines Mojo (30)", "Deku-Samen (30)" },                                                ITEMTYPE_REFILL,            GI_SEEDS_30,        false, &logic->noVariable,          RHT_DEKU_SEEDS_30,          ITEM_SEEDS_30,                  OBJECT_GI_SEED,         GID_SEEDS,          0xDC,                        0x50, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_DEKU_STICK_1] =                        Item(RG_DEKU_STICK_1,                     Text{ "Deku Stick (1)", "Bâton Mojo (1)", "Deku-Stick (1)" },                                                     ITEMTYPE_REFILL,            GI_STICKS_1,        false, &logic->noVariable,          RHT_DEKU_STICK_1,           ITEM_STICK,                     OBJECT_GI_STICK,        GID_STICK,          0x37,                        0x0D, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_RED_POTION_REFILL] =                   Item(RG_RED_POTION_REFILL,                Text{ "Red Potion Refill", "Recharge de Potion Rouge", "Rotes Elixier Nachfüllpackung" },                         ITEMTYPE_REFILL,            GI_POTION_RED,      false, &logic->noVariable,          RHT_NONE,                   ITEM_POTION_RED,                OBJECT_GI_LIQUID,       GID_POTION_RED,     0x43,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_GREEN_POTION_REFILL] =                 Item(RG_GREEN_POTION_REFILL,              Text{ "Green Potion Refill", "Recharge de Potion Verte", "Grünes Elixier Nachfüllpackung" },                      ITEMTYPE_REFILL,            GI_POTION_GREEN,    false, &logic->noVariable,          RHT_NONE,                   ITEM_POTION_GREEN,              OBJECT_GI_LIQUID,       GID_POTION_GREEN,   0x44,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_BLUE_POTION_REFILL] =                  Item(RG_BLUE_POTION_REFILL,               Text{ "Blue Potion Refill", "Recharge de Potion Bleue", "Blaues Elixier Nachfüllpackung" },                       ITEMTYPE_REFILL,            GI_POTION_BLUE,     false, &logic->noVariable,          RHT_NONE,                   ITEM_POTION_BLUE,               OBJECT_GI_LIQUID,       GID_POTION_BLUE,    0x45,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
     // Treasure Game
-    itemTable[RG_TREASURE_GAME_HEART] =                 Item(RG_TREASURE_GAME_HEART,              Text{ "Piece of Heart (WINNER)", "Quart de Coeur (Chasse-aux-Trésors)", "Herzstück (Schatztruhen-Minispiel)" },   ITEMTYPE_ITEM,              GI_HEART_PIECE_WIN, true,  &Logic::PieceOfHeart,        RHT_TREASURE_GAME_HEART,    ITEM_HEART_PIECE_2,             OBJECT_GI_HEARTS,       GID_HEART_PIECE,    0xFA,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_TREASURE_GAME_GREEN_RUPEE] =           Item(RG_TREASURE_GAME_GREEN_RUPEE,        Text{ "Green Rupee (LOSER)", "Rubis Vert (Chasse-aux-Trésors)", "Grüne Rupie (Schatztruhe-Minispiel)" },          ITEMTYPE_ITEM,              GI_RUPEE_GREEN_LOSE,false, &Logic::noVariable,          RHT_TREASURE_GAME_GREEN_RUPEE,ITEM_RUPEE_GREEN,             OBJECT_GI_RUPY,         GID_RUPEE_GREEN,    0xF4,                        0x00, CHEST_ANIM_SHORT, ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_TREASURE_GAME_HEART] =                 Item(RG_TREASURE_GAME_HEART,              Text{ "Piece of Heart (WINNER)", "Quart de Coeur (Chasse-aux-Trésors)", "Herzstück (Schatztruhen-Minispiel)" },   ITEMTYPE_ITEM,              GI_HEART_PIECE_WIN, true,  &logic->PieceOfHeart,        RHT_TREASURE_GAME_HEART,    ITEM_HEART_PIECE_2,             OBJECT_GI_HEARTS,       GID_HEART_PIECE,    0xFA,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_TREASURE_GAME_GREEN_RUPEE] =           Item(RG_TREASURE_GAME_GREEN_RUPEE,        Text{ "Green Rupee (LOSER)", "Rubis Vert (Chasse-aux-Trésors)", "Grüne Rupie (Schatztruhe-Minispiel)" },          ITEMTYPE_ITEM,              GI_RUPEE_GREEN_LOSE,false, &logic->noVariable,          RHT_TREASURE_GAME_GREEN_RUPEE,ITEM_RUPEE_GREEN,             OBJECT_GI_RUPY,         GID_RUPEE_GREEN,    0xF4,                        0x00, CHEST_ANIM_SHORT, ITEM_CATEGORY_MAJOR,  MOD_NONE);
     // Shop
-    itemTable[RG_BUY_DEKU_NUTS_5] =                     Item(RG_BUY_DEKU_NUTS_5,                  Text{ "Buy Deku Nut (5)", "Acheter: Noix Mojo (5)", "Deku-Nuss kaufen (5)" },                                     ITEMTYPE_SHOP,              GI_NUTS_5_2,        true,  &Logic::Nuts,                RHT_DEKU_NUTS_5,            ITEM_NUTS_5,                    OBJECT_GI_NUTS,         GID_NUTS,           0x34,                        0x0C, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 15);
-    itemTable[RG_BUY_ARROWS_30] =                       Item(RG_BUY_ARROWS_30,                    Text{ "Buy Arrows (30)", "Acheter: Flèches (30)", "Pfeile kaufen (30)" },                                         ITEMTYPE_SHOP,              GI_ARROWS_MEDIUM,   true,  &Logic::BuyArrow,            RHT_ARROWS_30,              ITEM_ARROWS_MEDIUM,             OBJECT_GI_ARROW,        GID_ARROWS_MEDIUM,  0xE6,                        0x49, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 60);
-    itemTable[RG_BUY_ARROWS_50] =                       Item(RG_BUY_ARROWS_50,                    Text{ "Buy Arrows (50)", "Acheter: Flèches (50)", "Pfeile kaufen (50)" },                                         ITEMTYPE_SHOP,              GI_ARROWS_LARGE,    true,  &Logic::BuyArrow,            RHT_ARROWS_30,              ITEM_ARROWS_LARGE,              OBJECT_GI_ARROW,        GID_ARROWS_LARGE,   0xE6,                        0x4A, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 90);
-    itemTable[RG_BUY_BOMBS_525] =                       Item(RG_BUY_BOMBS_525,                    Text{ "Buy Bombs (5) [25]", "Acheter: Bombes (5) [25]", "Bomben kaufen (5) [25]" },                               ITEMTYPE_SHOP,              GI_BOMBS_5,         true,  &Logic::BuyBomb,             RHT_BOMBS_5,                ITEM_BOMBS_5,                   OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 25);
-    itemTable[RG_BUY_DEKU_NUTS_10] =                    Item(RG_BUY_DEKU_NUTS_10,                 Text{ "Buy Deku Nut (10)", "Acheter: Noix Mojo (10)", "Deku-Nuss kaufen (10)" },                                  ITEMTYPE_SHOP,              GI_NUTS_10,         true,  &Logic::Nuts,                RHT_DEKU_NUTS_10,           ITEM_NUTS_10,                   OBJECT_GI_NUTS,         GID_NUTS,           0x34,                        0x0C, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
-    itemTable[RG_BUY_DEKU_STICK_1] =                    Item(RG_BUY_DEKU_STICK_1,                 Text{ "Buy Deku Stick (1)", "Acheter: Bâton Mojo (1)", "Deku-Stick kaufen (1)" },                                 ITEMTYPE_SHOP,              GI_STICKS_1,        true,  &Logic::Sticks,              RHT_DEKU_STICK_1,           ITEM_STICK,                     OBJECT_GI_STICK,        GID_STICK,          0x37,                        0x0D, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 10);
-    itemTable[RG_BUY_BOMBS_10] =                        Item(RG_BUY_BOMBS_10,                     Text{ "Buy Bombs (10)", "Acheter: Bombes (10)", "Bomben kaufen (10)" },                                           ITEMTYPE_SHOP,              GI_BOMBS_10,        true,  &Logic::BuyBomb,             RHT_BOMBS_10,               ITEM_BOMBS_10,                  OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 50);
-    itemTable[RG_BUY_FISH] =                            Item(RG_BUY_FISH,                         Text{ "Buy Fish", "Acheter: Poisson", "Fisch kaufen" },                                                           ITEMTYPE_SHOP,              GI_FISH,            true,  &Logic::FishAccess,          RHT_BOTTLE_WITH_FISH,       ITEM_FISH,                      OBJECT_GI_FISH,         GID_FISH,           0x47,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 200);
-    itemTable[RG_BUY_RED_POTION_30] =                   Item(RG_BUY_RED_POTION_30,                Text{ "Buy Red Potion [30]", "Acheter: Potion Rouge [30]", "Rotes Elixier kaufen [30]" },                         ITEMTYPE_SHOP,              GI_POTION_RED,      false, &Logic::noVariable,          RHT_BOTTLE_WITH_RED_POTION, ITEM_POTION_RED,                OBJECT_GI_LIQUID,       GID_POTION_RED,     0x43,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
-    itemTable[RG_BUY_GREEN_POTION] =                    Item(RG_BUY_GREEN_POTION,                 Text{ "Buy Green Potion", "Acheter: Potion Verte", "Grünes Elixier kaufen" },                                     ITEMTYPE_SHOP,              GI_POTION_GREEN,    true,  &Logic::BuyMagicPotion,          RHT_BOTTLE_WITH_GREEN_POTION,ITEM_POTION_GREEN,             OBJECT_GI_LIQUID,       GID_POTION_GREEN,   0x44,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
-    itemTable[RG_BUY_BLUE_POTION] =                     Item(RG_BUY_BLUE_POTION,                  Text{ "Buy Blue Potion", "Acheter: Potion Bleue", "Blaues Elixier kaufen" },                                      ITEMTYPE_SHOP,              GI_POTION_BLUE,     true,  &Logic::BuyMagicPotion,          RHT_BOTTLE_WITH_BLUE_POTION,ITEM_POTION_BLUE,               OBJECT_GI_LIQUID,       GID_POTION_BLUE,    0x45,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 100);
-    itemTable[RG_BUY_HYLIAN_SHIELD] =                   Item(RG_BUY_HYLIAN_SHIELD,                Text{ "Buy Hylian Shield", "Acheter: Bouclier Hylien", "Hylianischer Schild kaufen" },                            ITEMTYPE_SHOP,              GI_SHIELD_HYLIAN,   true,  &Logic::HylianShield,        RHT_HYLIAN_SHIELD,          ITEM_SHIELD_HYLIAN,             OBJECT_GI_SHIELD_2,     GID_SHIELD_HYLIAN,  0x4D,                        0xA0, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE, false, 80);
-    itemTable[RG_BUY_DEKU_SHIELD] =                     Item(RG_BUY_DEKU_SHIELD,                  Text{ "Buy Deku Shield", "Acheter: Bouclier Mojo", "Deku-Schild kaufen" },                                        ITEMTYPE_SHOP,              GI_SHIELD_DEKU,     true,  &Logic::DekuShield,          RHT_DEKU_SHIELD,            ITEM_SHIELD_DEKU,               OBJECT_GI_SHIELD_1,     GID_SHIELD_DEKU,    0x4C,                        0xA0, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE, false, 40);
-    itemTable[RG_BUY_GORON_TUNIC] =                     Item(RG_BUY_GORON_TUNIC,                  Text{ "Buy Goron Tunic", "Acheter: Tunique Goron", "Goronen-Tunika kaufen" },                                     ITEMTYPE_SHOP,              GI_TUNIC_GORON,     true,  &Logic::GoronTunic,          RHT_GORON_TUNIC,            ITEM_TUNIC_GORON,               OBJECT_GI_CLOTHES,      GID_TUNIC_GORON,    0x50,                        0xA0, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE, false, 200);
-    itemTable[RG_BUY_ZORA_TUNIC] =                      Item(RG_BUY_ZORA_TUNIC,                   Text{ "Buy Zora Tunic", "Acheter: Tunique Zora", "Zora-Tunika kaufen" },                                          ITEMTYPE_SHOP,              GI_TUNIC_ZORA,      true,  &Logic::ZoraTunic,           RHT_ZORA_TUNIC,             ITEM_TUNIC_ZORA,                OBJECT_GI_CLOTHES,      GID_TUNIC_ZORA,     0x51,                        0xA0, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE, false, 300);
-    itemTable[RG_BUY_HEART] =                           Item(RG_BUY_HEART,                        Text{ "Buy Heart", "Acheter: Coeur de Vie", "Herz kaufen" },                                                      ITEMTYPE_SHOP,              GI_HEART,           false, &Logic::noVariable,          RHT_RECOVERY_HEART,         ITEM_HEART,                     OBJECT_GI_HEART,        GID_HEART,          0x55,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 10);
-    itemTable[RG_BUY_BOMBCHU_10] =                      Item(RG_BUY_BOMBCHU_10,                   Text{ "Buy Bombchu (10)", "Acheter: Missiles (10)", "Bomchu kaufen (10)" },                                       ITEMTYPE_SHOP,              GI_BOMBCHUS_10,     true,  &Logic::BuyBombchus,         RHT_BOMBCHU_10,             ITEM_BOMBCHU,                   OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 99);
-    itemTable[RG_BUY_BOMBCHU_20] =                      Item(RG_BUY_BOMBCHU_20,                   Text{ "Buy Bombchu (20)", "Acheter: Missiles (20)", "Bomchu kaufen (20)" },                                       ITEMTYPE_SHOP,              GI_BOMBCHUS_20,     true,  &Logic::BuyBombchus,         RHT_BOMBCHU_20,             ITEM_BOMBCHUS_20,               OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 180);
-    itemTable[RG_BUY_DEKU_SEEDS_30] =                   Item(RG_BUY_DEKU_SEEDS_30,                Text{ "Buy Deku Seeds (30)", "Acheter: Graines Mojo (30)", "Deku-Samen kaufen (30)" },                            ITEMTYPE_SHOP,              GI_SEEDS_30,        true,  &Logic::BuySeed,             RHT_DEKU_SEEDS_30,          ITEM_SEEDS_30,                  OBJECT_GI_SEED,         GID_SEEDS,          0xDC,                        0x50, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
-    itemTable[RG_SOLD_OUT] =                            Item(RG_SOLD_OUT,                         Text{ "Sold Out", "Rupture de stock", "Ausverkauft" },                                                            ITEMTYPE_SHOP,              RG_SOLD_OUT,        false, &Logic::noVariable,          RHT_NONE, false, 0);
-    itemTable[RG_BUY_BLUE_FIRE] =                       Item(RG_BUY_BLUE_FIRE,                    Text{ "Buy Blue Fire", "Acheter: Flamme Bleue", "Blaues Feuer kaufen" },                                          ITEMTYPE_SHOP,              GI_BLUE_FIRE,       true,  &Logic::BlueFireAccess,      RHT_BOTTLE_WITH_BLUE_FIRE,  ITEM_BLUE_FIRE,                 OBJECT_GI_FIRE,         GID_BLUE_FIRE,      0x5D,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 300);
-    itemTable[RG_BUY_BOTTLE_BUG] =                      Item(RG_BUY_BOTTLE_BUG,                   Text{ "Buy Bottle Bug", "Acheter: Insecte en bouteille", "Flaschenkäfer kaufen" },                                ITEMTYPE_SHOP,              GI_BUGS,            true,  &Logic::BugsAccess,          RHT_BOTTLE_WITH_BUGS,       ITEM_BUG,                       OBJECT_GI_INSECT,       GID_BUG,            0x7A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 50);
-    itemTable[RG_BUY_POE] =                             Item(RG_BUY_POE,                          Text{ "Buy Poe", "Acheter: Esprit", "Geist kaufen" },                                                             ITEMTYPE_SHOP,              RG_BUY_POE,         false, &Logic::noVariable,          RHT_BOTTLE_WITH_BIG_POE,    ITEM_POE,                       OBJECT_GI_GHOST,        GID_POE,            0x97,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
-    itemTable[RG_BUY_FAIRYS_SPIRIT] =                   Item(RG_BUY_FAIRYS_SPIRIT,                Text{ "Buy Fairy's Spirit", "Acheter: Esprit de Fée", "Feengeist kaufen" },                                       ITEMTYPE_SHOP,              GI_FAIRY,           true,  &Logic::FairyAccess,         RHT_BOTTLE_WITH_FAIRY,      ITEM_FAIRY,                     OBJECT_GI_BOTTLE,       GID_BOTTLE,         0x46,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 50);
-    itemTable[RG_BUY_ARROWS_10] =                       Item(RG_BUY_ARROWS_10,                    Text{ "Buy Arrows (10)", "Acheter: Flèches (10)", "Pfeile kaufen (10)" },                                         ITEMTYPE_SHOP,              GI_ARROWS_SMALL,    true,  &Logic::BuyArrow,            RHT_ARROWS_10,              ITEM_ARROWS_SMALL,              OBJECT_GI_ARROW,        GID_ARROWS_SMALL,   0xE6,                        0x48, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 20);
-    itemTable[RG_BUY_BOMBS_20] =                        Item(RG_BUY_BOMBS_20,                     Text{ "Buy Bombs (20)", "Acheter: Bombes (20)", "Bomben kaufen (20)" },                                           ITEMTYPE_SHOP,              GI_BOMBS_20,        true,  &Logic::BuyBomb,             RHT_BOMBS_20,               ITEM_BOMBS_20,                  OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 80);
-    itemTable[RG_BUY_BOMBS_30] =                        Item(RG_BUY_BOMBS_30,                     Text{ "Buy Bombs (30)", "Acheter: Bombes (30)", "Bomben kaufen (30)" },                                           ITEMTYPE_SHOP,              GI_BOMBS_30,        true,  &Logic::BuyBomb,             RHT_BOMBS_20,               ITEM_BOMBS_30,                  OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 120);
-    itemTable[RG_BUY_BOMBS_535] =                       Item(RG_BUY_BOMBS_535,                    Text{ "Buy Bombs (5) [35]", "Acheter: Bombes (5) [35]", "Bomben kaufen (5) [35]" },                               ITEMTYPE_SHOP,              GI_BOMBS_5,         true,  &Logic::BuyBomb,             RHT_BOMBS_5,                ITEM_BOMBS_5,                   OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 35);
-    itemTable[RG_BUY_RED_POTION_40] =                   Item(RG_BUY_RED_POTION_40,                Text{ "Buy Red Potion [40]", "Acheter: Potion Rouge [40]", "Rotes Elixier kaufen [40]" },                         ITEMTYPE_SHOP,              GI_POTION_RED,      false, &Logic::noVariable,          RHT_BOTTLE_WITH_RED_POTION, ITEM_POTION_RED,                OBJECT_GI_LIQUID,       GID_POTION_RED,     0x43,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 40);
-    itemTable[RG_BUY_RED_POTION_50] =                   Item(RG_BUY_RED_POTION_50,                Text{ "Buy Red Potion [50]", "Acheter: Potion Rouge [50]", "Rotes Elixier kaufen [50]" },                         ITEMTYPE_SHOP,              GI_POTION_RED,      false, &Logic::noVariable,          RHT_BOTTLE_WITH_RED_POTION, ITEM_POTION_RED,                OBJECT_GI_LIQUID,       GID_POTION_RED,     0x43,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 50);
+    itemTable[RG_BUY_DEKU_NUTS_5] =                     Item(RG_BUY_DEKU_NUTS_5,                  Text{ "Buy Deku Nut (5)", "Acheter: Noix Mojo (5)", "Deku-Nuss kaufen (5)" },                                     ITEMTYPE_SHOP,              GI_NUTS_5_2,        true,  &logic->Nuts,                RHT_DEKU_NUTS_5,            ITEM_NUTS_5,                    OBJECT_GI_NUTS,         GID_NUTS,           0x34,                        0x0C, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 15);
+    itemTable[RG_BUY_ARROWS_30] =                       Item(RG_BUY_ARROWS_30,                    Text{ "Buy Arrows (30)", "Acheter: Flèches (30)", "Pfeile kaufen (30)" },                                         ITEMTYPE_SHOP,              GI_ARROWS_MEDIUM,   true,  &logic->BuyArrow,            RHT_ARROWS_30,              ITEM_ARROWS_MEDIUM,             OBJECT_GI_ARROW,        GID_ARROWS_MEDIUM,  0xE6,                        0x49, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 60);
+    itemTable[RG_BUY_ARROWS_50] =                       Item(RG_BUY_ARROWS_50,                    Text{ "Buy Arrows (50)", "Acheter: Flèches (50)", "Pfeile kaufen (50)" },                                         ITEMTYPE_SHOP,              GI_ARROWS_LARGE,    true,  &logic->BuyArrow,            RHT_ARROWS_30,              ITEM_ARROWS_LARGE,              OBJECT_GI_ARROW,        GID_ARROWS_LARGE,   0xE6,                        0x4A, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 90);
+    itemTable[RG_BUY_BOMBS_525] =                       Item(RG_BUY_BOMBS_525,                    Text{ "Buy Bombs (5) [25]", "Acheter: Bombes (5) [25]", "Bomben kaufen (5) [25]" },                               ITEMTYPE_SHOP,              GI_BOMBS_5,         true,  &logic->BuyBomb,             RHT_BOMBS_5,                ITEM_BOMBS_5,                   OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 25);
+    itemTable[RG_BUY_DEKU_NUTS_10] =                    Item(RG_BUY_DEKU_NUTS_10,                 Text{ "Buy Deku Nut (10)", "Acheter: Noix Mojo (10)", "Deku-Nuss kaufen (10)" },                                  ITEMTYPE_SHOP,              GI_NUTS_10,         true,  &logic->Nuts,                RHT_DEKU_NUTS_10,           ITEM_NUTS_10,                   OBJECT_GI_NUTS,         GID_NUTS,           0x34,                        0x0C, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
+    itemTable[RG_BUY_DEKU_STICK_1] =                    Item(RG_BUY_DEKU_STICK_1,                 Text{ "Buy Deku Stick (1)", "Acheter: Bâton Mojo (1)", "Deku-Stick kaufen (1)" },                                 ITEMTYPE_SHOP,              GI_STICKS_1,        true,  &logic->Sticks,              RHT_DEKU_STICK_1,           ITEM_STICK,                     OBJECT_GI_STICK,        GID_STICK,          0x37,                        0x0D, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 10);
+    itemTable[RG_BUY_BOMBS_10] =                        Item(RG_BUY_BOMBS_10,                     Text{ "Buy Bombs (10)", "Acheter: Bombes (10)", "Bomben kaufen (10)" },                                           ITEMTYPE_SHOP,              GI_BOMBS_10,        true,  &logic->BuyBomb,             RHT_BOMBS_10,               ITEM_BOMBS_10,                  OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 50);
+    itemTable[RG_BUY_FISH] =                            Item(RG_BUY_FISH,                         Text{ "Buy Fish", "Acheter: Poisson", "Fisch kaufen" },                                                           ITEMTYPE_SHOP,              GI_FISH,            true,  &logic->FishAccess,          RHT_BOTTLE_WITH_FISH,       ITEM_FISH,                      OBJECT_GI_FISH,         GID_FISH,           0x47,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 200);
+    itemTable[RG_BUY_RED_POTION_30] =                   Item(RG_BUY_RED_POTION_30,                Text{ "Buy Red Potion [30]", "Acheter: Potion Rouge [30]", "Rotes Elixier kaufen [30]" },                         ITEMTYPE_SHOP,              GI_POTION_RED,      false, &logic->noVariable,          RHT_BOTTLE_WITH_RED_POTION, ITEM_POTION_RED,                OBJECT_GI_LIQUID,       GID_POTION_RED,     0x43,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
+    itemTable[RG_BUY_GREEN_POTION] =                    Item(RG_BUY_GREEN_POTION,                 Text{ "Buy Green Potion", "Acheter: Potion Verte", "Grünes Elixier kaufen" },                                     ITEMTYPE_SHOP,              GI_POTION_GREEN,    true,  &logic->BuyMagicPotion,      RHT_BOTTLE_WITH_GREEN_POTION,ITEM_POTION_GREEN,             OBJECT_GI_LIQUID,       GID_POTION_GREEN,   0x44,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
+    itemTable[RG_BUY_BLUE_POTION] =                     Item(RG_BUY_BLUE_POTION,                  Text{ "Buy Blue Potion", "Acheter: Potion Bleue", "Blaues Elixier kaufen" },                                      ITEMTYPE_SHOP,              GI_POTION_BLUE,     true,  &logic->BuyMagicPotion,      RHT_BOTTLE_WITH_BLUE_POTION,ITEM_POTION_BLUE,               OBJECT_GI_LIQUID,       GID_POTION_BLUE,    0x45,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 100);
+    itemTable[RG_BUY_HYLIAN_SHIELD] =                   Item(RG_BUY_HYLIAN_SHIELD,                Text{ "Buy Hylian Shield", "Acheter: Bouclier Hylien", "Hylianischer Schild kaufen" },                            ITEMTYPE_SHOP,              GI_SHIELD_HYLIAN,   true,  &logic->HylianShield,        RHT_HYLIAN_SHIELD,          ITEM_SHIELD_HYLIAN,             OBJECT_GI_SHIELD_2,     GID_SHIELD_HYLIAN,  0x4D,                        0xA0, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE, false, 80);
+    itemTable[RG_BUY_DEKU_SHIELD] =                     Item(RG_BUY_DEKU_SHIELD,                  Text{ "Buy Deku Shield", "Acheter: Bouclier Mojo", "Deku-Schild kaufen" },                                        ITEMTYPE_SHOP,              GI_SHIELD_DEKU,     true,  &logic->DekuShield,          RHT_DEKU_SHIELD,            ITEM_SHIELD_DEKU,               OBJECT_GI_SHIELD_1,     GID_SHIELD_DEKU,    0x4C,                        0xA0, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE, false, 40);
+    itemTable[RG_BUY_GORON_TUNIC] =                     Item(RG_BUY_GORON_TUNIC,                  Text{ "Buy Goron Tunic", "Acheter: Tunique Goron", "Goronen-Tunika kaufen" },                                     ITEMTYPE_SHOP,              GI_TUNIC_GORON,     true,  &logic->GoronTunic,          RHT_GORON_TUNIC,            ITEM_TUNIC_GORON,               OBJECT_GI_CLOTHES,      GID_TUNIC_GORON,    0x50,                        0xA0, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE, false, 200);
+    itemTable[RG_BUY_ZORA_TUNIC] =                      Item(RG_BUY_ZORA_TUNIC,                   Text{ "Buy Zora Tunic", "Acheter: Tunique Zora", "Zora-Tunika kaufen" },                                          ITEMTYPE_SHOP,              GI_TUNIC_ZORA,      true,  &logic->ZoraTunic,           RHT_ZORA_TUNIC,             ITEM_TUNIC_ZORA,                OBJECT_GI_CLOTHES,      GID_TUNIC_ZORA,     0x51,                        0xA0, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE, false, 300);
+    itemTable[RG_BUY_HEART] =                           Item(RG_BUY_HEART,                        Text{ "Buy Heart", "Acheter: Coeur de Vie", "Herz kaufen" },                                                      ITEMTYPE_SHOP,              GI_HEART,           false, &logic->noVariable,          RHT_RECOVERY_HEART,         ITEM_HEART,                     OBJECT_GI_HEART,        GID_HEART,          0x55,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 10);
+    itemTable[RG_BUY_BOMBCHU_10] =                      Item(RG_BUY_BOMBCHU_10,                   Text{ "Buy Bombchu (10)", "Acheter: Missiles (10)", "Bomchu kaufen (10)" },                                       ITEMTYPE_SHOP,              GI_BOMBCHUS_10,     true,  &logic->BuyBombchus,         RHT_BOMBCHU_10,             ITEM_BOMBCHU,                   OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 99);
+    itemTable[RG_BUY_BOMBCHU_20] =                      Item(RG_BUY_BOMBCHU_20,                   Text{ "Buy Bombchu (20)", "Acheter: Missiles (20)", "Bomchu kaufen (20)" },                                       ITEMTYPE_SHOP,              GI_BOMBCHUS_20,     true,  &logic->BuyBombchus,         RHT_BOMBCHU_20,             ITEM_BOMBCHUS_20,               OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 180);
+    itemTable[RG_BUY_DEKU_SEEDS_30] =                   Item(RG_BUY_DEKU_SEEDS_30,                Text{ "Buy Deku Seeds (30)", "Acheter: Graines Mojo (30)", "Deku-Samen kaufen (30)" },                            ITEMTYPE_SHOP,              GI_SEEDS_30,        true,  &logic->BuySeed,             RHT_DEKU_SEEDS_30,          ITEM_SEEDS_30,                  OBJECT_GI_SEED,         GID_SEEDS,          0xDC,                        0x50, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
+    itemTable[RG_SOLD_OUT] =                            Item(RG_SOLD_OUT,                         Text{ "Sold Out", "Rupture de stock", "Ausverkauft" },                                                            ITEMTYPE_SHOP,              RG_SOLD_OUT,        false, &logic->noVariable,          RHT_NONE, false, 0);
+    itemTable[RG_BUY_BLUE_FIRE] =                       Item(RG_BUY_BLUE_FIRE,                    Text{ "Buy Blue Fire", "Acheter: Flamme Bleue", "Blaues Feuer kaufen" },                                          ITEMTYPE_SHOP,              GI_BLUE_FIRE,       true,  &logic->BlueFireAccess,      RHT_BOTTLE_WITH_BLUE_FIRE,  ITEM_BLUE_FIRE,                 OBJECT_GI_FIRE,         GID_BLUE_FIRE,      0x5D,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 300);
+    itemTable[RG_BUY_BOTTLE_BUG] =                      Item(RG_BUY_BOTTLE_BUG,                   Text{ "Buy Bottle Bug", "Acheter: Insecte en bouteille", "Flaschenkäfer kaufen" },                                ITEMTYPE_SHOP,              GI_BUGS,            true,  &logic->BugsAccess,          RHT_BOTTLE_WITH_BUGS,       ITEM_BUG,                       OBJECT_GI_INSECT,       GID_BUG,            0x7A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 50);
+    itemTable[RG_BUY_POE] =                             Item(RG_BUY_POE,                          Text{ "Buy Poe", "Acheter: Esprit", "Geist kaufen" },                                                             ITEMTYPE_SHOP,              RG_BUY_POE,         false, &logic->noVariable,          RHT_BOTTLE_WITH_BIG_POE,    ITEM_POE,                       OBJECT_GI_GHOST,        GID_POE,            0x97,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
+    itemTable[RG_BUY_FAIRYS_SPIRIT] =                   Item(RG_BUY_FAIRYS_SPIRIT,                Text{ "Buy Fairy's Spirit", "Acheter: Esprit de Fée", "Feengeist kaufen" },                                       ITEMTYPE_SHOP,              GI_FAIRY,           true,  &logic->FairyAccess,         RHT_BOTTLE_WITH_FAIRY,      ITEM_FAIRY,                     OBJECT_GI_BOTTLE,       GID_BOTTLE,         0x46,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 50);
+    itemTable[RG_BUY_ARROWS_10] =                       Item(RG_BUY_ARROWS_10,                    Text{ "Buy Arrows (10)", "Acheter: Flèches (10)", "Pfeile kaufen (10)" },                                         ITEMTYPE_SHOP,              GI_ARROWS_SMALL,    true,  &logic->BuyArrow,            RHT_ARROWS_10,              ITEM_ARROWS_SMALL,              OBJECT_GI_ARROW,        GID_ARROWS_SMALL,   0xE6,                        0x48, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 20);
+    itemTable[RG_BUY_BOMBS_20] =                        Item(RG_BUY_BOMBS_20,                     Text{ "Buy Bombs (20)", "Acheter: Bombes (20)", "Bomben kaufen (20)" },                                           ITEMTYPE_SHOP,              GI_BOMBS_20,        true,  &logic->BuyBomb,             RHT_BOMBS_20,               ITEM_BOMBS_20,                  OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 80);
+    itemTable[RG_BUY_BOMBS_30] =                        Item(RG_BUY_BOMBS_30,                     Text{ "Buy Bombs (30)", "Acheter: Bombes (30)", "Bomben kaufen (30)" },                                           ITEMTYPE_SHOP,              GI_BOMBS_30,        true,  &logic->BuyBomb,             RHT_BOMBS_20,               ITEM_BOMBS_30,                  OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 120);
+    itemTable[RG_BUY_BOMBS_535] =                       Item(RG_BUY_BOMBS_535,                    Text{ "Buy Bombs (5) [35]", "Acheter: Bombes (5) [35]", "Bomben kaufen (5) [35]" },                               ITEMTYPE_SHOP,              GI_BOMBS_5,         true,  &logic->BuyBomb,             RHT_BOMBS_5,                ITEM_BOMBS_5,                   OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 35);
+    itemTable[RG_BUY_RED_POTION_40] =                   Item(RG_BUY_RED_POTION_40,                Text{ "Buy Red Potion [40]", "Acheter: Potion Rouge [40]", "Rotes Elixier kaufen [40]" },                         ITEMTYPE_SHOP,              GI_POTION_RED,      false, &logic->noVariable,          RHT_BOTTLE_WITH_RED_POTION, ITEM_POTION_RED,                OBJECT_GI_LIQUID,       GID_POTION_RED,     0x43,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 40);
+    itemTable[RG_BUY_RED_POTION_50] =                   Item(RG_BUY_RED_POTION_50,                Text{ "Buy Red Potion [50]", "Acheter: Potion Rouge [50]", "Rotes Elixier kaufen [50]" },                         ITEMTYPE_SHOP,              GI_POTION_RED,      false, &logic->noVariable,          RHT_BOTTLE_WITH_RED_POTION, ITEM_POTION_RED,                OBJECT_GI_LIQUID,       GID_POTION_RED,     0x43,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 50);
     // Misc.
-    itemTable[RG_GOHMA_SOUL] =                          Item(RG_GOHMA_SOUL,                      Text{ "Gohma's Soul", "", "" },                                                                                    ITEMTYPE_ITEM,              0xE0,               true,  &Logic::CanSummonGohma,      RHT_GOHMA_SOUL,             RG_GOHMA_SOUL,                  OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_GOHMA_SOUL] =                          Item(RG_GOHMA_SOUL,                      Text{ "Gohma's Soul", "", "" },                                                                                    ITEMTYPE_ITEM,              0xE0,               true,  &logic->CanSummonGohma,      RHT_GOHMA_SOUL,             RG_GOHMA_SOUL,                  OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_GOHMA_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
-    itemTable[RG_KING_DODONGO_SOUL] =                   Item(RG_KING_DODONGO_SOUL,               Text{ "King Dodongo's Soul", "", "" },                                                                             ITEMTYPE_ITEM,              0xE1,               true,  &Logic::CanSummonKingDodongo,RHT_KING_DODONGO_SOUL,      RG_KING_DODONGO_SOUL,           OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_KING_DODONGO_SOUL] =                   Item(RG_KING_DODONGO_SOUL,               Text{ "King Dodongo's Soul", "", "" },                                                                             ITEMTYPE_ITEM,              0xE1,               true,  &logic->CanSummonKingDodongo,RHT_KING_DODONGO_SOUL,      RG_KING_DODONGO_SOUL,           OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_KING_DODONGO_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
-    itemTable[RG_BARINADE_SOUL] =                       Item(RG_BARINADE_SOUL,                   Text{ "Barinade's Soul", "", "" },                                                                                 ITEMTYPE_ITEM,              0xE2,               true,  &Logic::CanSummonBarinade,   RHT_BARINADE_SOUL,          RG_BARINADE_SOUL,               OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BARINADE_SOUL] =                       Item(RG_BARINADE_SOUL,                   Text{ "Barinade's Soul", "", "" },                                                                                 ITEMTYPE_ITEM,              0xE2,               true,  &logic->CanSummonBarinade,   RHT_BARINADE_SOUL,          RG_BARINADE_SOUL,               OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_BARINADE_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
-    itemTable[RG_PHANTOM_GANON_SOUL] =                  Item(RG_PHANTOM_GANON_SOUL,              Text{ "Phantom Ganon's Soul", "", "" },                                                                            ITEMTYPE_ITEM,              0xE3,               true,  &Logic::CanSummonPhantomGanon,RHT_PHANTOM_GANON_SOUL,    RG_PHANTOM_GANON_SOUL,          OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_PHANTOM_GANON_SOUL] =                  Item(RG_PHANTOM_GANON_SOUL,              Text{ "Phantom Ganon's Soul", "", "" },                                                                            ITEMTYPE_ITEM,              0xE3,               true,  &logic->CanSummonPhantomGanon,RHT_PHANTOM_GANON_SOUL,    RG_PHANTOM_GANON_SOUL,          OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_PHANTOM_GANON_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
-    itemTable[RG_VOLVAGIA_SOUL] =                       Item(RG_VOLVAGIA_SOUL,                   Text{ "Volvagia's Soul", "", "" },                                                                                 ITEMTYPE_ITEM,              0xE4,               true,  &Logic::CanSummonVolvagia,   RHT_VOLVAGIA_SOUL,          RG_VOLVAGIA_SOUL,               OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_VOLVAGIA_SOUL] =                       Item(RG_VOLVAGIA_SOUL,                   Text{ "Volvagia's Soul", "", "" },                                                                                 ITEMTYPE_ITEM,              0xE4,               true,  &logic->CanSummonVolvagia,   RHT_VOLVAGIA_SOUL,          RG_VOLVAGIA_SOUL,               OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_VOLVAGIA_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
-    itemTable[RG_MORPHA_SOUL] =                         Item(RG_MORPHA_SOUL,                     Text{ "Morpha's Soul", "", "" },                                                                                   ITEMTYPE_ITEM,              0xE5,               true,  &Logic::CanSummonMorpha,     RHT_MORPHA_SOUL,            RG_MORPHA_SOUL,                 OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_MORPHA_SOUL] =                         Item(RG_MORPHA_SOUL,                     Text{ "Morpha's Soul", "", "" },                                                                                   ITEMTYPE_ITEM,              0xE5,               true,  &logic->CanSummonMorpha,     RHT_MORPHA_SOUL,            RG_MORPHA_SOUL,                 OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_MORPHA_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
-    itemTable[RG_BONGO_BONGO_SOUL] =                    Item(RG_BONGO_BONGO_SOUL,                Text{ "Bongo Bongo's Soul", "", "" },                                                                              ITEMTYPE_ITEM,              0xE6,               true,  &Logic::CanSummonBongoBongo, RHT_BONGO_BONGO_SOUL,       RG_BONGO_BONGO_SOUL,            OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BONGO_BONGO_SOUL] =                    Item(RG_BONGO_BONGO_SOUL,                Text{ "Bongo Bongo's Soul", "", "" },                                                                              ITEMTYPE_ITEM,              0xE6,               true,  &logic->CanSummonBongoBongo, RHT_BONGO_BONGO_SOUL,       RG_BONGO_BONGO_SOUL,            OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_BONGO_BONGO_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
-    itemTable[RG_TWINROVA_SOUL] =                       Item(RG_TWINROVA_SOUL,                   Text{ "Twinrova's Soul", "", "" },                                                                                 ITEMTYPE_ITEM,              0xE7,               true,  &Logic::CanSummonTwinrova,   RHT_TWINROVA_SOUL,          RG_TWINROVA_SOUL,               OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_TWINROVA_SOUL] =                       Item(RG_TWINROVA_SOUL,                   Text{ "Twinrova's Soul", "", "" },                                                                                 ITEMTYPE_ITEM,              0xE7,               true,  &logic->CanSummonTwinrova,   RHT_TWINROVA_SOUL,          RG_TWINROVA_SOUL,               OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_TWINROVA_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
-    itemTable[RG_GANON_SOUL] =                          Item(RG_GANON_SOUL,                      Text{ "Ganon's Soul", "", "" },                                                                                    ITEMTYPE_ITEM,              0xE8,               true,  &Logic::CanSummonGanon,      RHT_GANON_SOUL,             RG_GANON_SOUL,                  OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_GANON_SOUL] =                          Item(RG_GANON_SOUL,                      Text{ "Ganon's Soul", "", "" },                                                                                    ITEMTYPE_ITEM,              0xE8,               true,  &logic->CanSummonGanon,      RHT_GANON_SOUL,             RG_GANON_SOUL,                  OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_GANON_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
 
-    itemTable[RG_OCARINA_A_BUTTON] =                    Item(RG_OCARINA_A_BUTTON,                Text{ "Ocarina A Button", "Touche A de l'Ocarina", "Botón A de Ocarina" },                                         ITEMTYPE_ITEM,              GI_MAP,             true,  &Logic::OcarinaAButton,      RHT_OCARINA_A_BUTTON,       RG_OCARINA_A_BUTTON,            OBJECT_GI_MAP,          GID_STONE_OF_AGONY, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_OCARINA_A_BUTTON] =                    Item(RG_OCARINA_A_BUTTON,                Text{ "Ocarina A Button", "Touche A de l'Ocarina", "Botón A de Ocarina" },                                         ITEMTYPE_ITEM,              GI_MAP,             true,  &logic->OcarinaAButton,      RHT_OCARINA_A_BUTTON,       RG_OCARINA_A_BUTTON,            OBJECT_GI_MAP,          GID_STONE_OF_AGONY, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_OCARINA_A_BUTTON].SetCustomDrawFunc(Randomizer_DrawOcarinaButton);
-    itemTable[RG_OCARINA_C_UP_BUTTON] =                 Item(RG_OCARINA_C_UP_BUTTON,             Text{ "Ocarina C Up Button", "Touche C-Haut de l'Ocarina", "Botón C superior de Ocarina" },                        ITEMTYPE_ITEM,              GI_MAP,             true,  &Logic::OcarinaCUpButton,    RHT_OCARINA_C_UP_BUTTON,    RG_OCARINA_C_UP_BUTTON,         OBJECT_GI_MAP,          GID_STONE_OF_AGONY, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_OCARINA_C_UP_BUTTON] =                 Item(RG_OCARINA_C_UP_BUTTON,             Text{ "Ocarina C Up Button", "Touche C-Haut de l'Ocarina", "Botón C superior de Ocarina" },                        ITEMTYPE_ITEM,              GI_MAP,             true,  &logic->OcarinaCUpButton,    RHT_OCARINA_C_UP_BUTTON,    RG_OCARINA_C_UP_BUTTON,         OBJECT_GI_MAP,          GID_STONE_OF_AGONY, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_OCARINA_C_UP_BUTTON].SetCustomDrawFunc(Randomizer_DrawOcarinaButton);
-    itemTable[RG_OCARINA_C_DOWN_BUTTON] =               Item(RG_OCARINA_C_DOWN_BUTTON,           Text{ "Ocarina C Down Button", "Touche C-Bas de l'Ocarina", "Botón C inferior de Ocarina" },                       ITEMTYPE_ITEM,              GI_MAP,             true,  &Logic::OcarinaCDownButton,  RHT_OCARINA_C_DOWN_BUTTON,  RG_OCARINA_C_DOWN_BUTTON,       OBJECT_GI_MAP,          GID_STONE_OF_AGONY, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_OCARINA_C_DOWN_BUTTON] =               Item(RG_OCARINA_C_DOWN_BUTTON,           Text{ "Ocarina C Down Button", "Touche C-Bas de l'Ocarina", "Botón C inferior de Ocarina" },                       ITEMTYPE_ITEM,              GI_MAP,             true,  &logic->OcarinaCDownButton,  RHT_OCARINA_C_DOWN_BUTTON,  RG_OCARINA_C_DOWN_BUTTON,       OBJECT_GI_MAP,          GID_STONE_OF_AGONY, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_OCARINA_C_DOWN_BUTTON].SetCustomDrawFunc(Randomizer_DrawOcarinaButton);
-    itemTable[RG_OCARINA_C_LEFT_BUTTON] =               Item(RG_OCARINA_C_LEFT_BUTTON,           Text{ "Ocarina C Left Button", "Touche C-Gauche de l'Ocarina", "Botón C izquierdo de Ocarina" },                   ITEMTYPE_ITEM,              GI_MAP,             true,  &Logic::OcarinaCLeftButton,  RHT_OCARINA_C_LEFT_BUTTON,  RG_OCARINA_C_LEFT_BUTTON,       OBJECT_GI_MAP,          GID_STONE_OF_AGONY, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_OCARINA_C_LEFT_BUTTON] =               Item(RG_OCARINA_C_LEFT_BUTTON,           Text{ "Ocarina C Left Button", "Touche C-Gauche de l'Ocarina", "Botón C izquierdo de Ocarina" },                   ITEMTYPE_ITEM,              GI_MAP,             true,  &logic->OcarinaCLeftButton,  RHT_OCARINA_C_LEFT_BUTTON,  RG_OCARINA_C_LEFT_BUTTON,       OBJECT_GI_MAP,          GID_STONE_OF_AGONY, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_OCARINA_C_LEFT_BUTTON].SetCustomDrawFunc(Randomizer_DrawOcarinaButton);
-    itemTable[RG_OCARINA_C_RIGHT_BUTTON] =              Item(RG_OCARINA_C_RIGHT_BUTTON,          Text{ "Ocarina C Right Button", "Touche C-Droit de l'Ocarina", "Botón C derecho de Ocarina" },                     ITEMTYPE_ITEM,              GI_MAP,             true,  &Logic::OcarinaCRightButton, RHT_OCARINA_C_RIGHT_BUTTON, RG_OCARINA_C_RIGHT_BUTTON,      OBJECT_GI_MAP,          GID_STONE_OF_AGONY, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_OCARINA_C_RIGHT_BUTTON] =              Item(RG_OCARINA_C_RIGHT_BUTTON,          Text{ "Ocarina C Right Button", "Touche C-Droit de l'Ocarina", "Botón C derecho de Ocarina" },                     ITEMTYPE_ITEM,              GI_MAP,             true,  &logic->OcarinaCRightButton, RHT_OCARINA_C_RIGHT_BUTTON, RG_OCARINA_C_RIGHT_BUTTON,      OBJECT_GI_MAP,          GID_STONE_OF_AGONY, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_OCARINA_C_RIGHT_BUTTON].SetCustomDrawFunc(Randomizer_DrawOcarinaButton);
 
-    itemTable[RG_TRIFORCE] =                            Item(RG_TRIFORCE,                         Text{ "Triforce", "Triforce", "Triforce" },                                                                       ITEMTYPE_EVENT,             RG_TRIFORCE,        false, &Logic::noVariable,          RHT_NONE);
-    itemTable[RG_HINT] =                                Item(RG_HINT,                             Text{ "Hint", "Indice", "Hinweis" },                                                                              ITEMTYPE_EVENT,             RG_HINT,            false, &Logic::noVariable,          RHT_NONE);
+    itemTable[RG_TRIFORCE] =                            Item(RG_TRIFORCE,                         Text{ "Triforce", "Triforce", "Triforce" },                                                                       ITEMTYPE_EVENT,             RG_TRIFORCE,        false, &logic->noVariable,          RHT_NONE);
+    itemTable[RG_HINT] =                                Item(RG_HINT,                             Text{ "Hint", "Indice", "Hinweis" },                                                                              ITEMTYPE_EVENT,             RG_HINT,            false, &logic->noVariable,          RHT_NONE);
     // Individual stages of progressive items (only here for GetItemEntry purposes, not for use in seed gen)
-    itemTable[RG_HOOKSHOT] =                            Item(RG_HOOKSHOT,                         Text{ "Hookshot", "Grappin", "Fanghaken" },                                                                       ITEMTYPE_ITEM,              GI_HOOKSHOT,        true,  &Logic::ProgressiveHookshot, RHT_HOOKSHOT,               ITEM_HOOKSHOT,                  OBJECT_GI_HOOKSHOT,     GID_HOOKSHOT,       0x36,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_LONGSHOT] =                            Item(RG_LONGSHOT,                         Text{ "Longshot", "Super-Grappin", "Enterhaken" },                                                                ITEMTYPE_ITEM,              GI_LONGSHOT,        true,  &Logic::ProgressiveHookshot, RHT_LONGSHOT,               ITEM_LONGSHOT,                  OBJECT_GI_HOOKSHOT,     GID_LONGSHOT,       0x4F,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_FAIRY_OCARINA] =                       Item(RG_FAIRY_OCARINA,                    Text{ "Fairy Ocarina", "Ocarina des fées", "Feen-Okarina" },                                                      ITEMTYPE_ITEM,              GI_OCARINA_FAIRY,   true,  &Logic::ProgressiveOcarina,  RHT_FAIRY_OCARINA,          ITEM_OCARINA_FAIRY,             OBJECT_GI_OCARINA_0,    GID_OCARINA_FAIRY,  0x4A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_OCARINA_OF_TIME] =                     Item(RG_OCARINA_OF_TIME,                  Text{ "Ocarina of Time", "Ocarina du Temps", "Okarina der Zeit" },                                                ITEMTYPE_ITEM,              GI_OCARINA_OOT,     true,  &Logic::ProgressiveOcarina,  RHT_OCARINA_OF_TIME,        ITEM_OCARINA_TIME,              OBJECT_GI_OCARINA,      GID_OCARINA_TIME,   0x3A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_BOMB_BAG] =                            Item(RG_BOMB_BAG,                         Text{ "Bomb Bag", "Sac de Bombes", "Bombentasche" },                                                              ITEMTYPE_ITEM,              GI_BOMB_BAG_20,     true,  &Logic::ProgressiveBombBag,  RHT_BOMB_BAG,               ITEM_BOMB_BAG_20,               OBJECT_GI_BOMBPOUCH,    GID_BOMB_BAG_20,    0x58,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_BIG_BOMB_BAG] =                        Item(RG_BIG_BOMB_BAG,                     Text{ "Big Bomb Bag", "Grand Sac de Bombes", "Große Bombentasche" },                                              ITEMTYPE_ITEM,              GI_BOMB_BAG_30,     true,  &Logic::ProgressiveBombBag,  RHT_BIG_BOMB_BAG,           ITEM_BOMB_BAG_30,               OBJECT_GI_BOMBPOUCH,    GID_BOMB_BAG_30,    0x59,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_BIGGEST_BOMB_BAG] =                    Item(RG_BIGGEST_BOMB_BAG,                 Text{ "Biggest Bomb Bag", "Énorme Sac de Bombes", "Größte Bombentasche" },                                        ITEMTYPE_ITEM,              GI_BOMB_BAG_40,     true,  &Logic::ProgressiveBombBag,  RHT_BIGGEST_BOMB_BAG,       ITEM_BOMB_BAG_40,               OBJECT_GI_BOMBPOUCH,    GID_BOMB_BAG_40,    0x5A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_FAIRY_BOW] =                           Item(RG_FAIRY_BOW,                        Text{ "Fairy Bow", "Arc des Fées", "Feen-Bogen" },                                                                ITEMTYPE_ITEM,              GI_BOW,             true,  &Logic::ProgressiveBow,      RHT_FAIRY_BOW,              ITEM_BOW,                       OBJECT_GI_BOW,          GID_BOW,            0x31,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_BIG_QUIVER] =                          Item(RG_BIG_QUIVER,                       Text{ "Big Quiver", "Grand carquois", "Großer Köcher" },                                                          ITEMTYPE_ITEM,              GI_QUIVER_40,       true,  &Logic::ProgressiveBow,      RHT_BIG_QUIVER,             ITEM_QUIVER_40,                 OBJECT_GI_ARROWCASE,    GID_QUIVER_40,      0x56,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_BIGGEST_QUIVER] =                      Item(RG_BIGGEST_QUIVER,                   Text{ "Biggest Quiver", "Énorme carquois", "Größter Köcher" },                                                    ITEMTYPE_ITEM,              GI_QUIVER_50,       true,  &Logic::ProgressiveBow,      RHT_BIGGEST_QUIVER,         ITEM_QUIVER_50,                 OBJECT_GI_ARROWCASE,    GID_QUIVER_50,      0x57,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_FAIRY_SLINGSHOT] =                     Item(RG_FAIRY_SLINGSHOT,                  Text{ "Fairy Slingshot", "Lance-Pierre des Fées", "Feen-Schleuder" },                                             ITEMTYPE_ITEM,              GI_SLINGSHOT,       true,  &Logic::ProgressiveBulletBag,RHT_FAIRY_SLINGSHOT,        ITEM_SLINGSHOT,                 OBJECT_GI_PACHINKO,     GID_SLINGSHOT,      0x30,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_BIG_BULLET_BAG] =                      Item(RG_BIG_BULLET_BAG,                   Text{ "Big Deku Seed Bullet Bag", "Grand sac de graines mojo", "Großer Deku-Samenkugelsack" },                    ITEMTYPE_ITEM,              GI_BULLET_BAG_40,   true,  &Logic::ProgressiveBulletBag,RHT_BIG_BULLET_BAG,         ITEM_BULLET_BAG_40,             OBJECT_GI_DEKUPOUCH,    GID_BULLET_BAG,     0x07,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_BIGGEST_BULLET_BAG] =                  Item(RG_BIGGEST_BULLET_BAG,               Text{ "Biggest Deku Seed Bullet Bag", "Énorme sac de graines mojo", "Größte Deku-Samenkugelsack" },               ITEMTYPE_ITEM,              GI_BULLET_BAG_50,   true,  &Logic::ProgressiveBulletBag,RHT_BIGGEST_BULLET_BAG,     ITEM_BULLET_BAG_50,             OBJECT_GI_DEKUPOUCH,    GID_BULLET_BAG,     0x07,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_GORONS_BRACELET] =                     Item(RG_GORONS_BRACELET,                  Text{ "Goron's Bracelet", "Bracelet Goron", "Goronen-Armband" },                                                  ITEMTYPE_ITEM,              GI_BRACELET,        true,  &Logic::ProgressiveStrength, RHT_GORONS_BRACELET,        ITEM_BRACELET,                  OBJECT_GI_BRACELET,     GID_BRACELET,       0x79,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_SILVER_GAUNTLETS] =                    Item(RG_SILVER_GAUNTLETS,                 Text{ "Silver Gauntlets", "Gantelets d'argent", "Silberne Fehdehandschuhe" },                                     ITEMTYPE_ITEM,              GI_GAUNTLETS_SILVER,true,  &Logic::ProgressiveStrength, RHT_SILVER_GAUNTLETS,       ITEM_GAUNTLETS_SILVER,          OBJECT_GI_GLOVES,       GID_GAUNTLETS_SILVER,0x5B,                       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_GOLDEN_GAUNTLETS] =                    Item(RG_GOLDEN_GAUNTLETS,                 Text{ "Golden Gauntlets", "Gantelets d'or", "Goldene Fehdehandschuhe" },                                          ITEMTYPE_ITEM,              GI_GAUNTLETS_GOLD,  true,  &Logic::ProgressiveStrength, RHT_GOLDEN_GAUNTLETS,       ITEM_GAUNTLETS_GOLD,            OBJECT_GI_GLOVES,       GID_GAUNTLETS_GOLD, 0x5C,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_SILVER_SCALE] =                        Item(RG_SILVER_SCALE,                     Text{ "Silver Scale", "Écaille d'argent", "Silberne Skala" },                                                     ITEMTYPE_ITEM,              GI_SCALE_SILVER,    true,  &Logic::ProgressiveScale,    RHT_SILVER_SCALE,           ITEM_SCALE_SILVER,              OBJECT_GI_SCALE,        GID_SCALE_SILVER,   0xCD,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_GOLDEN_SCALE] =                        Item(RG_GOLDEN_SCALE,                     Text{ "Golden Scale", "Écaille d'or", "Goldene Skala" },                                                          ITEMTYPE_ITEM,              GI_SCALE_GOLD,      true,  &Logic::ProgressiveScale,    RHT_GOLDEN_SCALE,           ITEM_SCALE_GOLDEN,              OBJECT_GI_SCALE,        GID_SCALE_GOLDEN,   0xCE,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_ADULT_WALLET] =                        Item(RG_ADULT_WALLET,                     Text{ "Adult Wallet", "Grande Bourse", "Erwachsene Geldbörse" },                                                  ITEMTYPE_ITEM,              GI_WALLET_ADULT,    true,  &Logic::ProgressiveWallet,   RHT_ADULT_WALLET,           ITEM_WALLET_ADULT,              OBJECT_GI_PURSE,        GID_WALLET_ADULT,   0x5E,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_GIANT_WALLET] =                        Item(RG_GIANT_WALLET,                     Text{ "Giant Wallet", "Bourse de Géant", "Riesige Geldbörse" },                                                   ITEMTYPE_ITEM,              GI_WALLET_GIANT,    true,  &Logic::ProgressiveWallet,   RHT_GIANT_WALLET,           ITEM_WALLET_GIANT,              OBJECT_GI_PURSE,        GID_WALLET_GIANT,   0x5F,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_TYCOON_WALLET] =                       Item(RG_TYCOON_WALLET,                    Text{ "Tycoon Wallet", "Bourse de Magnat", "Reiche Geldbörse" },                                                  ITEMTYPE_ITEM,              RG_TYCOON_WALLET,   true,  &Logic::ProgressiveWallet,   RHT_TYCOON_WALLET,          RG_TYCOON_WALLET,               OBJECT_GI_PURSE,        GID_WALLET_GIANT,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_DEKU_NUT_CAPACITY_30] =                Item(RG_DEKU_NUT_CAPACITY_30,             Text{ "Deku Nut Capacity (30)", "Capacité de noix Mojo (30)", "Deku Nuss Kapazität (30)" },                       ITEMTYPE_ITEM,              GI_NUT_UPGRADE_30,  false, &Logic::noVariable,          RHT_DEKU_NUT_CAPACITY_30,   ITEM_NUT_UPGRADE_30,            OBJECT_GI_NUTS,         GID_NUTS,           0xA7,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_DEKU_NUT_CAPACITY_40] =                Item(RG_DEKU_NUT_CAPACITY_40,             Text{ "Deku Nut Capacity (40)", "Capacité de noix Mojo (40)", "Deku Nuss Kapazität (40)" },                       ITEMTYPE_ITEM,              GI_NUT_UPGRADE_40,  false, &Logic::noVariable,          RHT_DEKU_NUT_CAPACITY_40,   ITEM_NUT_UPGRADE_40,            OBJECT_GI_NUTS,         GID_NUTS,           0xA8,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_DEKU_STICK_CAPACITY_20] =              Item(RG_DEKU_STICK_CAPACITY_20,           Text{ "Deku Stick Capacity (20)", "Capacité de Bâtons Mojo (20)", "Deku Stick Kapazität (20)" },                  ITEMTYPE_ITEM,              GI_STICK_UPGRADE_20,false, &Logic::noVariable,          RHT_DEKU_STICK_CAPACITY_20, ITEM_STICK_UPGRADE_20,          OBJECT_GI_STICK,        GID_STICK,          0x90,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_DEKU_STICK_CAPACITY_30] =              Item(RG_DEKU_STICK_CAPACITY_30,           Text{ "Deku Stick Capacity (30)", "Capacité de Bâtons Mojo (30)", "Deku Stick Kapazität (30)" },                  ITEMTYPE_ITEM,              GI_STICK_UPGRADE_30,false, &Logic::noVariable,          RHT_DEKU_STICK_CAPACITY_30, ITEM_STICK_UPGRADE_30,          OBJECT_GI_STICK,        GID_STICK,          0x91,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_MAGIC_SINGLE] =                        Item(RG_MAGIC_SINGLE,                     Text{ "Magic Meter", "Jauge de Magie", "Magisches Messgerät" },                                                   ITEMTYPE_ITEM,              0x8A,               true,  &Logic::ProgressiveMagic,    RHT_MAGIC_SINGLE,           RG_MAGIC_SINGLE,                OBJECT_GI_MAGICPOT,     GID_MAGIC_SMALL,    0xE4,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_MAGIC_DOUBLE] =                        Item(RG_MAGIC_DOUBLE,                     Text{ "Enhanced Magic Meter", "Jauge de Magie améliorée", "Verbesserte Magieanzeige" },                           ITEMTYPE_ITEM,              0x8A,               true,  &Logic::ProgressiveMagic,    RHT_MAGIC_DOUBLE,           RG_MAGIC_DOUBLE,                OBJECT_GI_MAGICPOT,     GID_MAGIC_LARGE,    0xE8,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_TRIFORCE_PIECE] =                      Item(RG_TRIFORCE_PIECE,                   Text{ "Triforce Piece", "Triforce Piece", "Triforce Piece" },                                                     ITEMTYPE_ITEM,              0xDF,               true,  &Logic::TriforcePieces,      RHT_TRIFORCE_PIECE,         RG_TRIFORCE_PIECE,              OBJECT_GI_BOMB_2,       GID_TRIFORCE_PIECE, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_HOOKSHOT] =                            Item(RG_HOOKSHOT,                         Text{ "Hookshot", "Grappin", "Fanghaken" },                                                                       ITEMTYPE_ITEM,              GI_HOOKSHOT,        true,  &logic->ProgressiveHookshot, RHT_HOOKSHOT,               ITEM_HOOKSHOT,                  OBJECT_GI_HOOKSHOT,     GID_HOOKSHOT,       0x36,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_LONGSHOT] =                            Item(RG_LONGSHOT,                         Text{ "Longshot", "Super-Grappin", "Enterhaken" },                                                                ITEMTYPE_ITEM,              GI_LONGSHOT,        true,  &logic->ProgressiveHookshot, RHT_LONGSHOT,               ITEM_LONGSHOT,                  OBJECT_GI_HOOKSHOT,     GID_LONGSHOT,       0x4F,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_FAIRY_OCARINA] =                       Item(RG_FAIRY_OCARINA,                    Text{ "Fairy Ocarina", "Ocarina des fées", "Feen-Okarina" },                                                      ITEMTYPE_ITEM,              GI_OCARINA_FAIRY,   true,  &logic->ProgressiveOcarina,  RHT_FAIRY_OCARINA,          ITEM_OCARINA_FAIRY,             OBJECT_GI_OCARINA_0,    GID_OCARINA_FAIRY,  0x4A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_OCARINA_OF_TIME] =                     Item(RG_OCARINA_OF_TIME,                  Text{ "Ocarina of Time", "Ocarina du Temps", "Okarina der Zeit" },                                                ITEMTYPE_ITEM,              GI_OCARINA_OOT,     true,  &logic->ProgressiveOcarina,  RHT_OCARINA_OF_TIME,        ITEM_OCARINA_TIME,              OBJECT_GI_OCARINA,      GID_OCARINA_TIME,   0x3A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BOMB_BAG] =                            Item(RG_BOMB_BAG,                         Text{ "Bomb Bag", "Sac de Bombes", "Bombentasche" },                                                              ITEMTYPE_ITEM,              GI_BOMB_BAG_20,     true,  &logic->ProgressiveBombBag,  RHT_BOMB_BAG,               ITEM_BOMB_BAG_20,               OBJECT_GI_BOMBPOUCH,    GID_BOMB_BAG_20,    0x58,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BIG_BOMB_BAG] =                        Item(RG_BIG_BOMB_BAG,                     Text{ "Big Bomb Bag", "Grand Sac de Bombes", "Große Bombentasche" },                                              ITEMTYPE_ITEM,              GI_BOMB_BAG_30,     true,  &logic->ProgressiveBombBag,  RHT_BIG_BOMB_BAG,           ITEM_BOMB_BAG_30,               OBJECT_GI_BOMBPOUCH,    GID_BOMB_BAG_30,    0x59,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_BIGGEST_BOMB_BAG] =                    Item(RG_BIGGEST_BOMB_BAG,                 Text{ "Biggest Bomb Bag", "Énorme Sac de Bombes", "Größte Bombentasche" },                                        ITEMTYPE_ITEM,              GI_BOMB_BAG_40,     true,  &logic->ProgressiveBombBag,  RHT_BIGGEST_BOMB_BAG,       ITEM_BOMB_BAG_40,               OBJECT_GI_BOMBPOUCH,    GID_BOMB_BAG_40,    0x5A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_FAIRY_BOW] =                           Item(RG_FAIRY_BOW,                        Text{ "Fairy Bow", "Arc des Fées", "Feen-Bogen" },                                                                ITEMTYPE_ITEM,              GI_BOW,             true,  &logic->ProgressiveBow,      RHT_FAIRY_BOW,              ITEM_BOW,                       OBJECT_GI_BOW,          GID_BOW,            0x31,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BIG_QUIVER] =                          Item(RG_BIG_QUIVER,                       Text{ "Big Quiver", "Grand carquois", "Großer Köcher" },                                                          ITEMTYPE_ITEM,              GI_QUIVER_40,       true,  &logic->ProgressiveBow,      RHT_BIG_QUIVER,             ITEM_QUIVER_40,                 OBJECT_GI_ARROWCASE,    GID_QUIVER_40,      0x56,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_BIGGEST_QUIVER] =                      Item(RG_BIGGEST_QUIVER,                   Text{ "Biggest Quiver", "Énorme carquois", "Größter Köcher" },                                                    ITEMTYPE_ITEM,              GI_QUIVER_50,       true,  &logic->ProgressiveBow,      RHT_BIGGEST_QUIVER,         ITEM_QUIVER_50,                 OBJECT_GI_ARROWCASE,    GID_QUIVER_50,      0x57,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_FAIRY_SLINGSHOT] =                     Item(RG_FAIRY_SLINGSHOT,                  Text{ "Fairy Slingshot", "Lance-Pierre des Fées", "Feen-Schleuder" },                                             ITEMTYPE_ITEM,              GI_SLINGSHOT,       true,  &logic->ProgressiveBulletBag,RHT_FAIRY_SLINGSHOT,        ITEM_SLINGSHOT,                 OBJECT_GI_PACHINKO,     GID_SLINGSHOT,      0x30,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BIG_BULLET_BAG] =                      Item(RG_BIG_BULLET_BAG,                   Text{ "Big Deku Seed Bullet Bag", "Grand sac de graines mojo", "Großer Deku-Samenkugelsack" },                    ITEMTYPE_ITEM,              GI_BULLET_BAG_40,   true,  &logic->ProgressiveBulletBag,RHT_BIG_BULLET_BAG,         ITEM_BULLET_BAG_40,             OBJECT_GI_DEKUPOUCH,    GID_BULLET_BAG,     0x07,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_BIGGEST_BULLET_BAG] =                  Item(RG_BIGGEST_BULLET_BAG,               Text{ "Biggest Deku Seed Bullet Bag", "Énorme sac de graines mojo", "Größte Deku-Samenkugelsack" },               ITEMTYPE_ITEM,              GI_BULLET_BAG_50,   true,  &logic->ProgressiveBulletBag,RHT_BIGGEST_BULLET_BAG,     ITEM_BULLET_BAG_50,             OBJECT_GI_DEKUPOUCH,    GID_BULLET_BAG,     0x07,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_GORONS_BRACELET] =                     Item(RG_GORONS_BRACELET,                  Text{ "Goron's Bracelet", "Bracelet Goron", "Goronen-Armband" },                                                  ITEMTYPE_ITEM,              GI_BRACELET,        true,  &logic->ProgressiveStrength, RHT_GORONS_BRACELET,        ITEM_BRACELET,                  OBJECT_GI_BRACELET,     GID_BRACELET,       0x79,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_SILVER_GAUNTLETS] =                    Item(RG_SILVER_GAUNTLETS,                 Text{ "Silver Gauntlets", "Gantelets d'argent", "Silberne Fehdehandschuhe" },                                     ITEMTYPE_ITEM,              GI_GAUNTLETS_SILVER,true,  &logic->ProgressiveStrength, RHT_SILVER_GAUNTLETS,       ITEM_GAUNTLETS_SILVER,          OBJECT_GI_GLOVES,       GID_GAUNTLETS_SILVER,0x5B,                       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_GOLDEN_GAUNTLETS] =                    Item(RG_GOLDEN_GAUNTLETS,                 Text{ "Golden Gauntlets", "Gantelets d'or", "Goldene Fehdehandschuhe" },                                          ITEMTYPE_ITEM,              GI_GAUNTLETS_GOLD,  true,  &logic->ProgressiveStrength, RHT_GOLDEN_GAUNTLETS,       ITEM_GAUNTLETS_GOLD,            OBJECT_GI_GLOVES,       GID_GAUNTLETS_GOLD, 0x5C,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_SILVER_SCALE] =                        Item(RG_SILVER_SCALE,                     Text{ "Silver Scale", "Écaille d'argent", "Silberne Skala" },                                                     ITEMTYPE_ITEM,              GI_SCALE_SILVER,    true,  &logic->ProgressiveScale,    RHT_SILVER_SCALE,           ITEM_SCALE_SILVER,              OBJECT_GI_SCALE,        GID_SCALE_SILVER,   0xCD,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_GOLDEN_SCALE] =                        Item(RG_GOLDEN_SCALE,                     Text{ "Golden Scale", "Écaille d'or", "Goldene Skala" },                                                          ITEMTYPE_ITEM,              GI_SCALE_GOLD,      true,  &logic->ProgressiveScale,    RHT_GOLDEN_SCALE,           ITEM_SCALE_GOLDEN,              OBJECT_GI_SCALE,        GID_SCALE_GOLDEN,   0xCE,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_ADULT_WALLET] =                        Item(RG_ADULT_WALLET,                     Text{ "Adult Wallet", "Grande Bourse", "Erwachsene Geldbörse" },                                                  ITEMTYPE_ITEM,              GI_WALLET_ADULT,    true,  &logic->ProgressiveWallet,   RHT_ADULT_WALLET,           ITEM_WALLET_ADULT,              OBJECT_GI_PURSE,        GID_WALLET_ADULT,   0x5E,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_GIANT_WALLET] =                        Item(RG_GIANT_WALLET,                     Text{ "Giant Wallet", "Bourse de Géant", "Riesige Geldbörse" },                                                   ITEMTYPE_ITEM,              GI_WALLET_GIANT,    true,  &logic->ProgressiveWallet,   RHT_GIANT_WALLET,           ITEM_WALLET_GIANT,              OBJECT_GI_PURSE,        GID_WALLET_GIANT,   0x5F,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_TYCOON_WALLET] =                       Item(RG_TYCOON_WALLET,                    Text{ "Tycoon Wallet", "Bourse de Magnat", "Reiche Geldbörse" },                                                  ITEMTYPE_ITEM,              RG_TYCOON_WALLET,   true,  &logic->ProgressiveWallet,   RHT_TYCOON_WALLET,          RG_TYCOON_WALLET,               OBJECT_GI_PURSE,        GID_WALLET_GIANT,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_DEKU_NUT_CAPACITY_30] =                Item(RG_DEKU_NUT_CAPACITY_30,             Text{ "Deku Nut Capacity (30)", "Capacité de noix Mojo (30)", "Deku Nuss Kapazität (30)" },                       ITEMTYPE_ITEM,              GI_NUT_UPGRADE_30,  false, &logic->noVariable,          RHT_DEKU_NUT_CAPACITY_30,   ITEM_NUT_UPGRADE_30,            OBJECT_GI_NUTS,         GID_NUTS,           0xA7,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_DEKU_NUT_CAPACITY_40] =                Item(RG_DEKU_NUT_CAPACITY_40,             Text{ "Deku Nut Capacity (40)", "Capacité de noix Mojo (40)", "Deku Nuss Kapazität (40)" },                       ITEMTYPE_ITEM,              GI_NUT_UPGRADE_40,  false, &logic->noVariable,          RHT_DEKU_NUT_CAPACITY_40,   ITEM_NUT_UPGRADE_40,            OBJECT_GI_NUTS,         GID_NUTS,           0xA8,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_DEKU_STICK_CAPACITY_20] =              Item(RG_DEKU_STICK_CAPACITY_20,           Text{ "Deku Stick Capacity (20)", "Capacité de Bâtons Mojo (20)", "Deku Stick Kapazität (20)" },                  ITEMTYPE_ITEM,              GI_STICK_UPGRADE_20,false, &logic->noVariable,          RHT_DEKU_STICK_CAPACITY_20, ITEM_STICK_UPGRADE_20,          OBJECT_GI_STICK,        GID_STICK,          0x90,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_DEKU_STICK_CAPACITY_30] =              Item(RG_DEKU_STICK_CAPACITY_30,           Text{ "Deku Stick Capacity (30)", "Capacité de Bâtons Mojo (30)", "Deku Stick Kapazität (30)" },                  ITEMTYPE_ITEM,              GI_STICK_UPGRADE_30,false, &logic->noVariable,          RHT_DEKU_STICK_CAPACITY_30, ITEM_STICK_UPGRADE_30,          OBJECT_GI_STICK,        GID_STICK,          0x91,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_MAGIC_SINGLE] =                        Item(RG_MAGIC_SINGLE,                     Text{ "Magic Meter", "Jauge de Magie", "Magisches Messgerät" },                                                   ITEMTYPE_ITEM,              0x8A,               true,  &logic->ProgressiveMagic,    RHT_MAGIC_SINGLE,           RG_MAGIC_SINGLE,                OBJECT_GI_MAGICPOT,     GID_MAGIC_SMALL,    0xE4,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_MAGIC_DOUBLE] =                        Item(RG_MAGIC_DOUBLE,                     Text{ "Enhanced Magic Meter", "Jauge de Magie améliorée", "Verbesserte Magieanzeige" },                           ITEMTYPE_ITEM,              0x8A,               true,  &logic->ProgressiveMagic,    RHT_MAGIC_DOUBLE,           RG_MAGIC_DOUBLE,                OBJECT_GI_MAGICPOT,     GID_MAGIC_LARGE,    0xE8,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_TRIFORCE_PIECE] =                      Item(RG_TRIFORCE_PIECE,                   Text{ "Triforce Piece", "Triforce Piece", "Triforce Piece" },                                                     ITEMTYPE_ITEM,              0xDF,               true,  &logic->TriforcePieces,      RHT_TRIFORCE_PIECE,         RG_TRIFORCE_PIECE,              OBJECT_GI_BOMB_2,       GID_TRIFORCE_PIECE, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
 }
 
 Item& Rando::StaticData::RetrieveItem(const RandomizerGet rgid) {
diff --git a/soh/soh/Enhancements/randomizer/item_location.cpp b/soh/soh/Enhancements/randomizer/item_location.cpp
index 323c6159b..736778786 100644
--- a/soh/soh/Enhancements/randomizer/item_location.cpp
+++ b/soh/soh/Enhancements/randomizer/item_location.cpp
@@ -1,5 +1,6 @@
 #include "item_location.h"
 #include "context.h"
+#include "logic.h"
 
 namespace Rando {
 ItemLocation::ItemLocation() : rc(RC_UNKNOWN_CHECK) {}
@@ -73,6 +74,8 @@ void ItemLocation::PlaceVanillaItem() {
 
 void ItemLocation::ApplyPlacedItemEffect() const {
     StaticData::RetrieveItem(placedItem).ApplyEffect();
+    auto ctx = Context::GetInstance();
+    ctx->GetLogic()->UpdateHelpers();
 }
 
 uint16_t ItemLocation::GetPrice() const {
diff --git a/soh/soh/Enhancements/randomizer/logic.cpp b/soh/soh/Enhancements/randomizer/logic.cpp
new file mode 100644
index 000000000..da3969511
--- /dev/null
+++ b/soh/soh/Enhancements/randomizer/logic.cpp
@@ -0,0 +1,825 @@
+#include "logic.h"
+
+#include <algorithm>
+#include <cstdio>
+#include <string>
+#include <string_view>
+#include <vector>
+
+#include "dungeon.h"
+#include "context.h"
+
+namespace Rando {
+    bool Logic::IsMagicItem(RandomizerGet item) {
+        return item == RG_DINS_FIRE    ||
+                item == RG_FARORES_WIND ||
+                item == RG_NAYRUS_LOVE  ||
+                item == RG_LENS_OF_TRUTH;
+    }
+
+    bool Logic::IsMagicArrow(RandomizerGet item) {
+        return item == RG_FIRE_ARROWS ||
+                item == RG_ICE_ARROWS  ||
+                item == RG_LIGHT_ARROWS;
+    }
+
+    bool Logic::HasItem(RandomizerGet itemName) {
+        return  (itemName == RG_DINS_FIRE              && DinsFire)            ||
+                (itemName == RG_FARORES_WIND           && FaroresWind)         ||
+                (itemName == RG_NAYRUS_LOVE            && NayrusLove)          ||
+                (itemName == RG_LENS_OF_TRUTH          && LensOfTruth)         ||
+                (itemName == RG_FAIRY_BOW              && Bow)                 ||
+                (itemName == RG_MEGATON_HAMMER         && Hammer)              ||
+                (itemName == RG_IRON_BOOTS             && IronBoots)           ||
+                (itemName == RG_HOVER_BOOTS            && HoverBoots)          ||
+                (itemName == RG_HOOKSHOT               && Hookshot)            ||
+                (itemName == RG_LONGSHOT               && Longshot)            ||
+                (itemName == RG_SILVER_GAUNTLETS       && SilverGauntlets)     ||
+                (itemName == RG_GOLDEN_GAUNTLETS       && GoldenGauntlets)     ||
+                (itemName == RG_GORON_TUNIC            && GoronTunic)          ||
+                (itemName == RG_ZORA_TUNIC             && ZoraTunic)           ||
+                (itemName == RG_SCARECROW              && Scarecrow)           ||
+                (itemName == RG_DISTANT_SCARECROW      && DistantScarecrow)    ||
+                (itemName == RG_HYLIAN_SHIELD          && HylianShield)        ||
+                (itemName == RG_MIRROR_SHIELD          && MirrorShield)        ||
+                (itemName == RG_MASTER_SWORD           && MasterSword)         ||
+                (itemName == RG_BIGGORON_SWORD         && BiggoronSword)       ||
+                (itemName == RG_FAIRY_SLINGSHOT        && Slingshot)           ||
+                (itemName == RG_BOOMERANG              && Boomerang)           ||
+                (itemName == RG_KOKIRI_SWORD           && KokiriSword)         ||
+                (itemName == RG_STICKS                 && Sticks)              ||
+                (itemName == RG_DEKU_SHIELD            && DekuShield)          ||
+                (itemName == RG_FIRE_ARROWS            && FireArrows)          ||
+                (itemName == RG_ICE_ARROWS             && IceArrows)           ||
+                (itemName == RG_LIGHT_ARROWS           && LightArrows)         ||
+                (itemName == RG_OCARINA_A_BUTTON       && OcarinaAButton)      ||
+                (itemName == RG_OCARINA_C_LEFT_BUTTON  && OcarinaCLeftButton)  ||
+                (itemName == RG_OCARINA_C_RIGHT_BUTTON && OcarinaCRightButton) ||
+                (itemName == RG_OCARINA_C_DOWN_BUTTON  && OcarinaCDownButton)  ||
+                (itemName == RG_OCARINA_C_UP_BUTTON    && OcarinaCUpButton)    ||
+                (itemName == RG_ZELDAS_LULLABY         && ZeldasLullaby)       ||
+                (itemName == RG_EPONAS_SONG            && EponasSong)          ||
+                (itemName == RG_SARIAS_SONG            && SariasSong)          ||
+                (itemName == RG_SUNS_SONG              && SunsSong)            ||
+                (itemName == RG_SONG_OF_TIME           && SongOfTime)          ||
+                (itemName == RG_SONG_OF_STORMS         && SongOfStorms)        ||
+                (itemName == RG_MINUET_OF_FOREST       && MinuetOfForest)      ||
+                (itemName == RG_BOLERO_OF_FIRE         && BoleroOfFire)        ||
+                (itemName == RG_SERENADE_OF_WATER      && SerenadeOfWater)     ||
+                (itemName == RG_REQUIEM_OF_SPIRIT      && RequiemOfSpirit)     ||
+                (itemName == RG_NOCTURNE_OF_SHADOW     && NocturneOfShadow)    ||
+                (itemName == RG_PRELUDE_OF_LIGHT       && PreludeOfLight);
+    }
+
+    //Can the passed in item be used?
+    bool Logic::CanUse(RandomizerGet itemName) {
+        if (!HasItem(itemName))
+            return false;
+
+        switch (itemName) {
+            // Adult items
+            // TODO: Uncomment those if we ever implement more item usability settings
+            case RG_FAIRY_BOW:
+                return IsAdult;// || BowAsChild;
+            case RG_MEGATON_HAMMER:
+                return IsAdult;// || HammerAsChild;
+            case RG_IRON_BOOTS:
+                return IsAdult;// || IronBootsAsChild;
+            case RG_HOVER_BOOTS:
+                return IsAdult;// || HoverBootsAsChild;
+            case RG_HOOKSHOT:
+                return IsAdult;// || HookshotAsChild;
+            case RG_LONGSHOT:
+                return IsAdult;// || HookshotAsChild;
+            case RG_SILVER_GAUNTLETS:
+                return IsAdult;
+            case RG_GOLDEN_GAUNTLETS:
+                return IsAdult;
+            case RG_GORON_TUNIC:
+                return IsAdult;// || GoronTunicAsChild;
+            case RG_ZORA_TUNIC:
+                return IsAdult;// || ZoraTunicAsChild;
+            case RG_SCARECROW:
+                return IsAdult;// || HookshotAsChild;
+            case RG_DISTANT_SCARECROW:
+                return IsAdult;// || HookshotAsChild;
+            case RG_HYLIAN_SHIELD:
+                return IsAdult;
+            case RG_MIRROR_SHIELD:
+                return IsAdult;// || MirrorShieldAsChild;
+            case RG_MASTER_SWORD:
+                return IsAdult;// || MasterSwordAsChild;
+            case RG_BIGGORON_SWORD:
+                return IsAdult;// || BiggoronSwordAsChild;
+
+            // Child items
+            case RG_FAIRY_SLINGSHOT:
+                return IsChild;// || SlingshotAsAdult;
+            case RG_BOOMERANG:
+                return IsChild;// || BoomerangAsAdult;
+            case RG_KOKIRI_SWORD:
+                return IsChild;// || KokiriSwordAsAdult;
+            case RG_STICKS:
+                return IsChild;// || StickAsAdult;
+            case RG_DEKU_SHIELD:
+                return IsChild;// || DekuShieldAsAdult;
+
+            // Songs
+            case RG_ZELDAS_LULLABY:
+                return Ocarina && OcarinaCLeftButton && OcarinaCRightButton && OcarinaCUpButton;
+            case RG_EPONAS_SONG:
+                return Ocarina && OcarinaCLeftButton && OcarinaCRightButton && OcarinaCUpButton;
+            case RG_SARIAS_SONG:
+                return Ocarina && OcarinaCLeftButton && OcarinaCRightButton && OcarinaCDownButton;
+            case RG_SUNS_SONG:
+                return Ocarina && OcarinaCRightButton && OcarinaCUpButton && OcarinaCDownButton;
+            case RG_SONG_OF_TIME:
+                return Ocarina && OcarinaAButton && OcarinaCRightButton && OcarinaCDownButton;
+            case RG_SONG_OF_STORMS:
+                return Ocarina && OcarinaAButton && OcarinaCUpButton && OcarinaCDownButton;
+            case RG_MINUET_OF_FOREST:
+                return Ocarina && OcarinaAButton && OcarinaCLeftButton && OcarinaCRightButton && OcarinaCUpButton;
+            case RG_BOLERO_OF_FIRE:
+                return Ocarina && OcarinaAButton && OcarinaCRightButton && OcarinaCDownButton;
+            case RG_SERENADE_OF_WATER:
+                return Ocarina && OcarinaAButton && OcarinaCLeftButton && OcarinaCRightButton && OcarinaCDownButton;
+            case RG_REQUIEM_OF_SPIRIT:
+                return Ocarina && OcarinaAButton && OcarinaCRightButton && OcarinaCDownButton;
+            case RG_NOCTURNE_OF_SHADOW:
+                return Ocarina && OcarinaAButton && OcarinaCLeftButton && OcarinaCRightButton && OcarinaCDownButton;
+            case RG_PRELUDE_OF_LIGHT:
+                return Ocarina && OcarinaCLeftButton && OcarinaCRightButton && OcarinaCUpButton;
+
+            // Magic items
+            default:
+                return MagicMeter && (IsMagicItem(itemName) || (IsMagicArrow(itemName) && CanUse(RG_FAIRY_BOW)));
+        }
+    }
+
+    bool Logic::HasProjectile(HasProjectileAge age) {
+        return HasExplosives ||
+               (age == HasProjectileAge::Child  && (Slingshot || Boomerang)) ||
+               (age == HasProjectileAge::Adult  && (Hookshot  || Bow      )) ||
+               (age == HasProjectileAge::Both   && (Slingshot || Boomerang)  && (Hookshot || Bow)) ||
+               (age == HasProjectileAge::Either && (Slingshot || Boomerang   ||  Hookshot || Bow));
+    }
+
+    bool Logic::HasBossSoul(RandomizerGet itemName) {
+        auto ctx = Rando::Context::GetInstance();
+        if (!ctx->GetOption(RSK_SHUFFLE_BOSS_SOULS)) {
+            return true;
+        }
+        switch(itemName) {
+            case RG_GOHMA_SOUL:
+                return CanSummonGohma;
+            case RG_KING_DODONGO_SOUL:
+                return CanSummonKingDodongo;
+            case RG_BARINADE_SOUL:
+                return CanSummonBarinade;
+            case RG_PHANTOM_GANON_SOUL:
+                return CanSummonPhantomGanon;
+            case RG_VOLVAGIA_SOUL:
+                return CanSummonVolvagia;
+            case RG_MORPHA_SOUL:
+                return CanSummonMorpha;
+            case RG_BONGO_BONGO_SOUL:
+                return CanSummonBongoBongo;
+            case RG_TWINROVA_SOUL:
+                return CanSummonTwinrova;
+            case RG_GANON_SOUL:
+                return ctx->GetOption(RSK_SHUFFLE_BOSS_SOULS).Is(RO_BOSS_SOULS_ON_PLUS_GANON) ? CanSummonGanon : true;
+            default:
+                break;
+        }
+    }
+
+    uint8_t GetDifficultyValueFromString(Rando::Option& glitchOption) {
+        return 0;
+    }
+
+    //todo rewrite glitch section
+
+    bool Logic::CanEquipSwap(RandomizerGet itemName) {
+        if (!HasItem(itemName))
+            return false;
+    
+        if (CanDoGlitch(GlitchType::EquipSwapDins) || CanDoGlitch(GlitchType::EquipSwap))
+            return true;
+
+        return false;
+    }
+
+    bool Logic::CanDoGlitch(GlitchType glitch) {
+        // TODO: Uncomment when glitches are implemented
+        switch(glitch) {
+            case GlitchType::EquipSwapDins:
+                return ((IsAdult && HasItem(RG_DINS_FIRE)) || (IsChild && (HasItem(RG_STICKS) || HasItem(RG_DINS_FIRE)))) && false; //GlitchEquipSwapDins;
+            case GlitchType::EquipSwap: // todo: add bunny hood to adult item equippable list and child trade item to child item equippable list
+                return ((IsAdult && (HasItem(RG_DINS_FIRE) || HasItem(RG_FARORES_WIND) || HasItem(RG_NAYRUS_LOVE))) || (IsChild && (HasItem(RG_STICKS) || 
+                    HasItem(RG_FAIRY_SLINGSHOT) || HasItem(RG_BOOMERANG) || HasBottle || Nuts || Ocarina || HasItem(RG_LENS_OF_TRUTH) || HasExplosives ||
+                    (MagicBean || MagicBeanPack) || HasItem(RG_DINS_FIRE) || HasItem(RG_FARORES_WIND) || HasItem(RG_NAYRUS_LOVE)))) && false; //GlitchEquipSwap;
+        }
+
+        //Shouldn't be reached
+        return false;
+    }
+
+    Logic::Logic() {
+        
+    }
+
+    // Updates all logic helpers. Should be called whenever a non-helper is changed
+    void Logic::UpdateHelpers() {
+        auto ctx = Rando::Context::GetInstance();
+        OcarinaButtons  =  (OcarinaAButton ? 1 : 0) +
+                           (OcarinaCLeftButton ? 1 : 0) +
+                           (OcarinaCRightButton ? 1 : 0) +
+                           (OcarinaCUpButton ? 1 : 0) +
+                           (OcarinaCDownButton ? 1 : 0);
+        NumBottles      = ((NoBottles) ? 0 : (Bottles + ((DeliverLetter) ? 1 : 0)));
+        HasBottle       = NumBottles >= 1;
+        Slingshot       = (ProgressiveBulletBag >= 1) && (BuySeed || AmmoCanDrop);
+        Ocarina         = ProgressiveOcarina    >= 1;
+        OcarinaOfTime   = ProgressiveOcarina    >= 2;
+        MagicMeter      = (ProgressiveMagic     >= 1) && (AmmoCanDrop || (HasBottle && BuyMagicPotion));
+        BombBag         = (ProgressiveBombBag   >= 1) && (BuyBomb || AmmoCanDrop);
+        Hookshot        = ProgressiveHookshot   >= 1;
+        Longshot        = ProgressiveHookshot   >= 2;
+        Bow             = (ProgressiveBow       >= 1) && (BuyArrow || AmmoCanDrop);
+        GoronBracelet   = ProgressiveStrength   >= 1;
+        SilverGauntlets = ProgressiveStrength   >= 2;
+        GoldenGauntlets = ProgressiveStrength   >= 3;
+        SilverScale     = ProgressiveScale      >= 1;
+        GoldScale       = ProgressiveScale      >= 2;
+        AdultsWallet    = ProgressiveWallet     >= 1;
+        BiggoronSword   = BiggoronSword || ProgressiveGiantKnife >= 2;
+
+        //you need at least 2 buttons for scarecrow song
+        ScarecrowSong    = ScarecrowSong || (ctx->GetOption(RSK_SKIP_SCARECROWS_SONG) && Ocarina && OcarinaButtons >= 2) || (ChildScarecrow && AdultScarecrow);
+        Scarecrow        = Hookshot && ScarecrowSong;
+        DistantScarecrow = Longshot && ScarecrowSong;
+
+        //Drop Access
+        DekuStickDrop = StickPot || DekuBabaSticks;
+        DekuNutDrop   = (NutPot  || NutCrate         || DekuBabaNuts) && AmmoCanDrop;
+        BugsAccess    = BugShrub || WanderingBugs    || BugRock;
+        FishAccess    = LoneFish || FishGroup;
+        FairyAccess   = FairyPot || GossipStoneFairy || BeanPlantFairy || ButterflyFairy || FreeFairies || FairyPond;
+
+
+        //refills
+        Bombs        = BombBag;
+        Nuts         = DekuNutDrop || Nuts;
+        Sticks       = DekuStickDrop || Sticks;
+        Bugs         = HasBottle && BugsAccess;
+        BlueFire     = (HasBottle && BlueFireAccess) || (ctx->GetOption(RSK_BLUE_FIRE_ARROWS) && CanUse(RG_ICE_ARROWS));
+        Fish         = HasBottle && FishAccess;
+        Fairy        = HasBottle && FairyAccess;
+
+        FoundBombchus   = (BombchuDrop || Bombchus || Bombchus5 || Bombchus10 || Bombchus20);
+        CanPlayBowling  = (ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && FoundBombchus) || (!ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && BombBag);
+        // TODO: Implement Ammo Drop Setting in place of bombchu drops
+        HasBombchus = (BuyBombchus || (ctx->GetOption(RSK_ENABLE_BOMBCHU_DROPS).Is(RO_AMMO_DROPS_ON/*_PLUS_BOMBCHU*/) && FoundBombchus));
+
+        HasExplosives =  Bombs || (ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && HasBombchus);
+
+        HasBoots = IronBoots || HoverBoots;
+
+        //Unshuffled adult trade quest
+        Eyedrops     = Eyedrops     || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && ClaimCheck);
+        EyeballFrog  = EyeballFrog  || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && Eyedrops);
+        Prescription = Prescription || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && EyeballFrog);
+        BrokenSword  = BrokenSword  || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && Prescription);
+        PoachersSaw  = PoachersSaw  || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && BrokenSword);
+        OddPoultice  = OddPoultice  || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && PoachersSaw);
+        OddMushroom  = OddMushroom  || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && OddPoultice);
+        Cojiro       = Cojiro       || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && OddMushroom);
+        PocketEgg    = PocketEgg    || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && Cojiro);
+
+        // IsChild = Age == AGE_CHILD;
+        // IsAdult = Age == AGE_ADULT;
+
+        CanBlastOrSmash = HasExplosives || CanUse(RG_MEGATON_HAMMER);
+        CanChildAttack  = IsChild && (Slingshot || Boomerang || Sticks || KokiriSword || HasExplosives || CanUse(RG_DINS_FIRE) || CanUse(RG_MASTER_SWORD) || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_BIGGORON_SWORD));
+        CanChildDamage  = IsChild && (Slingshot ||              Sticks || KokiriSword || HasExplosives || CanUse(RG_DINS_FIRE) || CanUse(RG_MASTER_SWORD) || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_BIGGORON_SWORD));
+        CanAdultAttack  = IsAdult && (CanUse(RG_FAIRY_BOW) || CanUse(RG_BOOMERANG)       || CanUse(RG_STICKS) || CanUse(RG_KOKIRI_SWORD) || HasExplosives || CanUse(RG_DINS_FIRE) || MasterSword || Hammer || BiggoronSword || Hookshot);
+        CanAdultDamage  = IsAdult && (CanUse(RG_FAIRY_BOW) || CanUse(RG_STICKS)          || CanUse(RG_KOKIRI_SWORD) || HasExplosives || CanUse(RG_DINS_FIRE) || MasterSword || Hammer || BiggoronSword);
+        CanStunDeku     = CanAdultAttack || CanChildAttack || Nuts || HasShield;
+        CanCutShrubs    = CanUse(RG_KOKIRI_SWORD) || CanUse(RG_BOOMERANG) || HasExplosives || CanUse(RG_MASTER_SWORD) || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_BIGGORON_SWORD);
+        CanDive         = ProgressiveScale >= 1;
+        CanLeaveForest  = ctx->GetOption(RSK_FOREST).IsNot(RO_FOREST_CLOSED) || IsAdult || DekuTreeClear || ctx->GetOption(RSK_SHUFFLE_INTERIOR_ENTRANCES) || ctx->GetOption(RSK_SHUFFLE_OVERWORLD_ENTRANCES);
+        CanPlantBugs    = IsChild && Bugs;
+        CanRideEpona    = IsAdult && Epona && CanUse(RG_EPONAS_SONG);
+        CanSummonGossipFairyWithoutSuns = CanUse(RG_ZELDAS_LULLABY) || CanUse(RG_EPONAS_SONG) || CanUse(RG_SONG_OF_TIME);
+        CanSummonGossipFairy            = CanSummonGossipFairyWithoutSuns || CanUse(RG_SUNS_SONG);
+        Hearts          = BaseHearts + HeartContainer + (PieceOfHeart >> 2);
+        EffectiveHealth = ((Hearts << (2 + DoubleDefense)) >> Multiplier) + ((Hearts << (2 + DoubleDefense)) % (1 << Multiplier) > 0); //Number of half heart hits to die, ranges from 1 to 160
+        FireTimer       = CanUse(RG_GORON_TUNIC) ? 255 : (ctx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS)) ? (Hearts * 8) : 0;
+        WaterTimer      = CanUse(RG_ZORA_TUNIC) ? 255 : (ctx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS)) ? (Hearts * 8) : 0;
+        NeedNayrusLove      = (EffectiveHealth == 1);
+        CanSurviveDamage    = !NeedNayrusLove || CanUse(RG_NAYRUS_LOVE);
+        CanTakeDamage       = Fairy || CanSurviveDamage;
+        CanTakeDamageTwice  = (Fairy && NumBottles >= 2) || ((EffectiveHealth == 2) && (CanUse(RG_NAYRUS_LOVE) || Fairy)) || (EffectiveHealth > 2);
+        //CanPlantBean        = IsChild && (MagicBean || MagicBeanPack);
+        CanOpenBombGrotto   = CanBlastOrSmash       && (ShardOfAgony || ctx->GetTrickOption(RT_GROTTOS_WITHOUT_AGONY));
+        CanOpenStormGrotto  = CanUse(RG_SONG_OF_STORMS) && (ShardOfAgony || ctx->GetTrickOption(RT_GROTTOS_WITHOUT_AGONY));
+        HookshotOrBoomerang = CanUse(RG_HOOKSHOT) || CanUse(RG_BOOMERANG);
+        CanGetNightTimeGS   = (CanUse(RG_SUNS_SONG) || !ctx->GetOption(RSK_SKULLS_SUNS_SONG));
+
+        GuaranteeTradePath     = ctx->GetOption(RSK_SHUFFLE_INTERIOR_ENTRANCES) || ctx->GetOption(RSK_SHUFFLE_OVERWORLD_ENTRANCES) || ctx->GetTrickOption(RT_DMT_BOLERO_BIGGORON) || CanBlastOrSmash || StopGCRollingGoronAsAdult;
+        //GuaranteeHint          = (hints == "Mask" && MaskofTruth) || (hints == "Agony") || (hints != "Mask" && hints != "Agony");
+        HasFireSource          = CanUse(RG_DINS_FIRE) || CanUse(RG_FIRE_ARROWS);
+        HasFireSourceWithTorch = HasFireSource || CanUse(RG_STICKS);
+
+        //Gerudo Fortress
+        CanFinishGerudoFortress = (ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_NORMAL)    && GerudoFortressKeys >= 4 && (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) && (GerudoToken || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_HOVER_BOOTS) || ctx->GetTrickOption(RT_GF_KITCHEN))) ||
+                                    (ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_FAST)      && GerudoFortressKeys >= 1 && (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD))) ||
+                                    (ctx->GetOption(RSK_GERUDO_FORTRESS).IsNot(RO_GF_NORMAL) && ctx->GetOption(RSK_GERUDO_FORTRESS).IsNot(RO_GF_FAST));
+
+        HasShield          = CanUse(RG_HYLIAN_SHIELD) || CanUse(RG_DEKU_SHIELD); //Mirror shield can't reflect attacks
+        CanShield          = CanUse(RG_MIRROR_SHIELD) || HasShield;
+        ChildShield        = IsChild && CanUse(RG_DEKU_SHIELD); //hylian shield is not helpful for child
+        AdultReflectShield = IsAdult && CanUse(RG_HYLIAN_SHIELD); //Mirror shield can't reflect attacks
+        AdultShield        = IsAdult && (CanUse(RG_HYLIAN_SHIELD) || CanUse(RG_MIRROR_SHIELD));
+        CanShieldFlick     = ChildShield || AdultShield;
+        CanJumpslash       = CanUse(RG_STICKS) || CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD); // Not including hammer as hammer jump attacks can be weird
+        CanUseProjectile   = HasExplosives || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOOMERANG);
+        CanUseMagicArrow   = CanUse(RG_FIRE_ARROWS) || CanUse(RG_ICE_ARROWS) || CanUse(RG_LIGHT_ARROWS);
+
+        //Bridge and LACS Requirements
+        MedallionCount        = (ForestMedallion ? 1:0) + (FireMedallion ? 1:0) + (WaterMedallion ? 1:0) + (SpiritMedallion ? 1:0) + (ShadowMedallion ? 1:0) + (LightMedallion ? 1:0);
+        StoneCount            = (KokiriEmerald ? 1:0) + (GoronRuby ? 1:0) + (ZoraSapphire ? 1:0);
+        DungeonCount          = (DekuTreeClear ? 1:0) + (DodongosCavernClear ? 1:0) + (JabuJabusBellyClear ? 1:0) + (ForestTempleClear ? 1:0) + (FireTempleClear ? 1:0) + (WaterTempleClear ? 1:0) + (SpiritTempleClear ? 1:0) + (ShadowTempleClear ? 1:0);
+        HasAllStones          = StoneCount == 3;
+        HasAllMedallions      = MedallionCount == 6;
+        GregInBridgeLogic     = ctx->GetOption(RSK_BRIDGE_OPTIONS).Is(RO_BRIDGE_GREG);
+        GregInLacsLogic       = ctx->GetOption(RSK_LACS_OPTIONS).Is(RO_LACS_GREG_REWARD);
+
+        CanBuildRainbowBridge = ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_ALWAYS_OPEN)                                                                         ||
+                                (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_VANILLA)    && ShadowMedallion && SpiritMedallion && LightArrows)             ||
+                                (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_STONES)     && StoneCount + (Greg && GregInBridgeLogic ? 1 : 0) >= ctx->GetOption(RSK_RAINBOW_BRIDGE_STONE_COUNT).Value<uint8_t>())                    ||
+                                (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_MEDALLIONS) && MedallionCount + (Greg && GregInBridgeLogic ? 1 : 0) >= ctx->GetOption(RSK_RAINBOW_BRIDGE_MEDALLION_COUNT).Value<uint8_t>())            ||
+                                (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_DUNGEON_REWARDS)    && StoneCount + MedallionCount + (Greg && GregInBridgeLogic ? 1 : 0) >= ctx->GetOption(RSK_RAINBOW_BRIDGE_REWARD_COUNT).Value<uint8_t>())  ||
+                                (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_DUNGEONS)   && DungeonCount + (Greg && GregInBridgeLogic ? 1 : 0) >= ctx->GetOption(RSK_RAINBOW_BRIDGE_DUNGEON_COUNT).Value<uint8_t>())                ||
+                                (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_TOKENS)     && GoldSkulltulaTokens >= ctx->GetOption(RSK_RAINBOW_BRIDGE_TOKEN_COUNT).Value<uint8_t>()) ||
+                                (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_GREG)       && Greg);
+
+        CanTriggerLACS = (ctx->GetSettings()->LACSCondition() == RO_LACS_VANILLA    && ShadowMedallion && SpiritMedallion)                          ||
+                            (ctx->GetSettings()->LACSCondition() == RO_LACS_STONES     && StoneCount + (Greg && GregInLacsLogic ? 1 : 0) >= ctx->GetOption(RSK_LACS_STONE_COUNT).Value<uint8_t>())                    ||
+                            (ctx->GetSettings()->LACSCondition() == RO_LACS_MEDALLIONS && MedallionCount + (Greg && GregInLacsLogic ? 1 : 0) >= ctx->GetOption(RSK_LACS_MEDALLION_COUNT).Value<uint8_t>())            ||
+                            (ctx->GetSettings()->LACSCondition() == RO_LACS_REWARDS    && StoneCount + MedallionCount + (Greg && GregInLacsLogic ? 1 : 0) >= ctx->GetOption(RSK_LACS_REWARD_COUNT).Value<uint8_t>())  ||
+                            (ctx->GetSettings()->LACSCondition() == RO_LACS_DUNGEONS   && DungeonCount + (Greg && GregInLacsLogic ? 1 : 0) >= ctx->GetOption(RSK_LACS_DUNGEON_COUNT).Value<uint8_t>())                ||
+                            (ctx->GetSettings()->LACSCondition() == RO_LACS_TOKENS     && GoldSkulltulaTokens >= ctx->GetOption(RSK_LACS_TOKEN_COUNT).Value<uint8_t>());
+        CanCompleteTriforce = TriforcePieces >= ctx->GetOption(RSK_TRIFORCE_HUNT_PIECES_REQUIRED).Value<uint8_t>();
+    }
+
+    bool Logic::SmallKeys(RandomizerRegion dungeon, uint8_t requiredAmount) {
+        return SmallKeys(dungeon, requiredAmount, requiredAmount);
+    }
+
+    bool Logic::SmallKeys(RandomizerRegion dungeon, uint8_t requiredAmountGlitchless, uint8_t requiredAmountGlitched) {
+        switch (dungeon) {
+            case RR_FOREST_TEMPLE:
+                /*if (IsGlitched && (GetDifficultyValueFromString(GlitchHookshotJump_Boots) >= static_cast<uint8_t>(GlitchDifficulty::INTERMEDIATE) || GetDifficultyValueFromString(GlitchHoverBoost) >= static_cast<uint8_t>(GlitchDifficulty::NOVICE) ||
+                                    (GetDifficultyValueFromString(GlitchHover) >= static_cast<uint8_t>(GlitchDifficulty::NOVICE) && GetDifficultyValueFromString(GlitchISG) >= static_cast<uint8_t>(GlitchDifficulty::INTERMEDIATE)))) {
+                    return ForestTempleKeys >= requiredAmountGlitched;
+                }*/
+                return ForestTempleKeys >= requiredAmountGlitchless;
+
+            case RR_FIRE_TEMPLE:
+                /*if (IsGlitched && (GetDifficultyValueFromString(GlitchLedgeClip) >= static_cast<uint8_t>(GlitchDifficulty::INTERMEDIATE) || GetDifficultyValueFromString(GlitchHover) >= static_cast<uint8_t>(GlitchDifficulty::INTERMEDIATE))) {
+                    return FireTempleKeys >= requiredAmountGlitched;
+                }*/
+                return FireTempleKeys >= requiredAmountGlitchless;
+
+            case RR_WATER_TEMPLE:
+                /*if (IsGlitched && (false)) {
+                    return WaterTempleKeys >= requiredAmountGlitched;
+                }*/
+                return WaterTempleKeys >= requiredAmountGlitchless;
+
+            case RR_SPIRIT_TEMPLE:
+                /*if (IsGlitched && (false)) {
+                    return SpiritTempleKeys >= requiredAmountGlitched;
+                }*/
+                return SpiritTempleKeys >= requiredAmountGlitchless;
+
+            case RR_SHADOW_TEMPLE:
+                /*if (IsGlitched && (GetDifficultyValueFromString(GlitchHookshotClip) >= static_cast<uint8_t>(GlitchDifficulty::NOVICE))) {
+                    return ShadowTempleKeys >= requiredAmountGlitched;
+                }*/
+                return ShadowTempleKeys >= requiredAmountGlitchless;
+
+            case RR_BOTTOM_OF_THE_WELL:
+                /*if (IsGlitched && (false)) {
+                    return BottomOfTheWellKeys >= requiredAmountGlitched;
+                }*/
+                return BottomOfTheWellKeys >= requiredAmountGlitchless;
+
+            case RR_GERUDO_TRAINING_GROUNDS:
+                /*if (IsGlitched && (false)) {
+                    return GerudoTrainingGroundsKeys >= requiredAmountGlitched;
+                }*/
+                return GerudoTrainingGroundsKeys >= requiredAmountGlitchless;
+
+            case RR_GANONS_CASTLE:
+                /*if (IsGlitched && (false)) {
+                    return GanonsCastleKeys >= requiredAmountGlitched;
+                }*/
+                return GanonsCastleKeys >= requiredAmountGlitchless;
+
+            case RR_MARKET_TREASURE_CHEST_GAME:
+                /*if (IsGlitched && (false)) {
+                    return TreasureGameKeys >= requiredAmountGlitched;
+                }*/
+                return TreasureGameKeys >= requiredAmountGlitchless;
+
+            default:
+                return false;
+        }
+    }
+
+    bool Logic::EventsUpdated() {
+        if (DekuTreeClearPast        != DekuTreeClear        ||
+            GoronRubyPast            != GoronRuby            ||
+            ZoraSapphirePast         != ZoraSapphire         ||
+            ForestTrialClearPast     != ForestTrialClear     ||
+            FireTrialClearPast       != FireTrialClear       ||
+            WaterTrialClearPast      != WaterTrialClear      ||
+            ShadowTrialClearPast     != ShadowTrialClear     ||
+            SpiritTrialClearPast     != SpiritTrialClear     ||
+            LightTrialClearPast      != LightTrialClear      ||
+            DrainWellPast            != DrainWell            ||
+            DampesWindmillAccessPast != DampesWindmillAccess ||
+            TimeTravelPast           != TimeTravel) {
+            DekuTreeClearPast         = DekuTreeClear;
+            GoronRubyPast             = GoronRuby;
+            ZoraSapphirePast          = ZoraSapphire;
+            ForestTrialClearPast      = ForestTrialClear;
+            FireTrialClearPast        = FireTrialClear;
+            WaterTrialClearPast       = WaterTrialClear;
+            ShadowTrialClearPast      = ShadowTrialClear;
+            SpiritTrialClearPast      = SpiritTrialClear;
+            LightTrialClearPast       = LightTrialClear;
+            DrainWellPast             = DrainWell;
+            DampesWindmillAccessPast  = DampesWindmillAccess;
+            return true;
+        }
+        return false;
+    }
+
+    void Logic::Reset() {
+        auto ctx = Rando::Context::GetInstance();
+        //Settings-dependent variables
+        IsKeysanity = ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_ANYWHERE) || 
+                    ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_ANYWHERE) || 
+                    ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_ANYWHERE);
+        AmmoCanDrop = /*AmmoDrops.IsNot(AMMODROPS_NONE) TODO: AmmoDrop setting*/ true;
+
+        //Child item logic
+        KokiriSword   = false;
+        ZeldasLetter  = false;
+        WeirdEgg      = false;
+        HasBottle     = false;
+        Bombchus      = false;
+        Bombchus5     = false;
+        Bombchus10    = false;
+        Bombchus20    = false;
+        MagicBean     = false;
+        MagicBeanPack = false;
+        RutosLetter   = false;
+        Boomerang     = false;
+        DinsFire      = false;
+        FaroresWind   = false;
+        NayrusLove    = false;
+        LensOfTruth   = false;
+        ShardOfAgony  = false;
+        SkullMask     = false;
+        MaskOfTruth   = false;
+
+        //Adult logic
+        Hammer        = false;
+        IronBoots     = false;
+        HoverBoots    = false;
+        MirrorShield  = false;
+        GoronTunic    = false;
+        ZoraTunic     = false;
+        Epona         = false;
+        BigPoe        = false;
+        GerudoToken   = false;
+        FireArrows    = false;
+        IceArrows     = false;
+        LightArrows   = false;
+        MasterSword   = false;
+        BiggoronSword = false;
+
+        //Trade Quest
+        PocketEgg     = false;
+        Cojiro        = false;
+        OddMushroom   = false;
+        OddPoultice   = false;
+        PoachersSaw   = false;
+        BrokenSword   = false;
+        Prescription  = false;
+        EyeballFrog   = false;
+        Eyedrops      = false;
+        ClaimCheck    = false;
+
+        //Trade Quest Events
+        WakeUpAdultTalon   = false;
+        CojiroAccess       = false;
+        OddMushroomAccess  = false;
+        OddPoulticeAccess  = false;
+        PoachersSawAccess  = false;
+        BrokenSwordAccess  = false;
+        PrescriptionAccess = false;
+        EyeballFrogAccess  = false;
+        EyedropsAccess     = false;
+        DisableTradeRevert = false;
+
+        //Songs
+        ZeldasLullaby    = false;
+        SariasSong       = false;
+        SunsSong         = false;
+        SongOfStorms     = false;
+        EponasSong       = false;
+        SongOfTime       = false;
+        MinuetOfForest   = false;
+        BoleroOfFire     = false;
+        SerenadeOfWater  = false;
+        RequiemOfSpirit  = false;
+        NocturneOfShadow = false;
+        PreludeOfLight   = false;
+
+        //Stones and Meddallions
+        ForestMedallion = false;
+        FireMedallion   = false;
+        WaterMedallion  = false;
+        SpiritMedallion = false;
+        ShadowMedallion = false;
+        LightMedallion  = false;
+        KokiriEmerald   = false;
+        GoronRuby       = false;
+        ZoraSapphire    = false;
+
+        //Dungeon Clears
+        DekuTreeClear       = false;
+        DodongosCavernClear = false;
+        JabuJabusBellyClear = false;
+        ForestTempleClear   = false;
+        FireTempleClear     = false;
+        WaterTempleClear    = false;
+        SpiritTempleClear   = false;
+        ShadowTempleClear   = false;
+
+        //Trial Clears
+        ForestTrialClear = false;
+        FireTrialClear   = false;
+        WaterTrialClear  = false;
+        SpiritTrialClear = false;
+        ShadowTrialClear = false;
+        LightTrialClear  = false;
+
+        //Greg
+        Greg = false;
+        GregInBridgeLogic = false;
+        GregInLacsLogic = false;
+
+        //Ocarina C Buttons
+        OcarinaAButton = ctx->GetOption(RSK_SHUFFLE_OCARINA_BUTTONS).Is(true) ? 0 : 1;
+        OcarinaCLeftButton = ctx->GetOption(RSK_SHUFFLE_OCARINA_BUTTONS).Is(true) ? 0 : 1;
+        OcarinaCRightButton = ctx->GetOption(RSK_SHUFFLE_OCARINA_BUTTONS).Is(true) ? 0 : 1;
+        OcarinaCUpButton = ctx->GetOption(RSK_SHUFFLE_OCARINA_BUTTONS).Is(true) ? 0 : 1;
+        OcarinaCDownButton = ctx->GetOption(RSK_SHUFFLE_OCARINA_BUTTONS).Is(true) ? 0 : 1;
+
+        //Progressive Items
+        ProgressiveBulletBag  = 0;
+        ProgressiveBombBag    = 0;
+        ProgressiveMagic      = 0;
+        ProgressiveScale      = 0;
+        ProgressiveHookshot   = 0;
+        ProgressiveBow        = 0;
+        ProgressiveWallet     = 0;
+        ProgressiveStrength   = 0;
+        ProgressiveOcarina    = 0;
+        ProgressiveGiantKnife = 0;
+
+        //Keys
+        ForestTempleKeys          = 0;
+        //If not keysanity, start with 1 logical key to account for automatically unlocking the basement door in vanilla FiT
+        FireTempleKeys            = IsKeysanity || ctx->GetDungeon(Rando::FIRE_TEMPLE)->IsMQ() ? 0 : 1;
+        WaterTempleKeys           = 0;
+        SpiritTempleKeys          = 0;
+        ShadowTempleKeys          = 0;
+        GanonsCastleKeys          = 0;
+        GerudoFortressKeys        = 0;
+        GerudoTrainingGroundsKeys = 0;
+        BottomOfTheWellKeys       = 0;
+        TreasureGameKeys          = 0;
+
+        //Boss Keys
+        BossKeyForestTemple = 0;
+        BossKeyFireTemple   = 0;
+        BossKeyWaterTemple  = 0;
+        BossKeySpiritTemple = 0;
+        BossKeyShadowTemple = 0;
+        BossKeyGanonsCastle = 0;
+
+        //Gold Skulltula Count
+        GoldSkulltulaTokens = 0;
+
+        //Bottle Count
+        Bottles    = 0;
+        NumBottles = 0;
+        NoBottles  = false;
+
+        //Triforce Pieces
+        TriforcePieces = 0;
+
+        //Boss Souls
+        CanSummonGohma        = false;
+        CanSummonKingDodongo  = false;
+        CanSummonBarinade     = false;
+        CanSummonPhantomGanon = false;
+        CanSummonVolvagia     = false;
+        CanSummonMorpha       = false;
+        CanSummonBongoBongo   = false;
+        CanSummonTwinrova     = false;
+        CanSummonGanon        = false;
+
+        //Drops and Bottle Contents Access
+        DekuNutDrop      = false;
+        NutPot           = false;
+        NutCrate         = false;
+        DekuBabaNuts     = false;
+        DekuStickDrop    = false;
+        StickPot         = false;
+        DekuBabaSticks   = false;
+        BugsAccess       = false;
+        BugShrub         = false;
+        WanderingBugs    = false;
+        BugRock          = false;
+        BlueFireAccess   = false;
+        FishAccess       = false;
+        FishGroup        = false;
+        LoneFish         = false;
+        FairyAccess      = false;
+        GossipStoneFairy = false;
+        BeanPlantFairy   = false;
+        ButterflyFairy   = false;
+        FairyPot         = false;
+        FreeFairies      = false;
+        FairyPond        = false;
+        BombchuDrop      = false;
+
+        BuyBombchus      = false;
+        BuySeed          = false;
+        BuyArrow         = false;
+        BuyBomb          = false;
+        BuyMagicPotion        = false;
+        MagicRefill      = false;
+
+        PieceOfHeart     = 0;
+        HeartContainer   = 0;
+        DoubleDefense    = false;
+
+        /* --- HELPERS, EVENTS, AND LOCATION ACCESS --- */
+        /* These are used to simplify reading the logic, but need to be updated
+        /  every time a base value is updated.                       */
+
+        Slingshot        = false;
+        Ocarina          = false;
+        OcarinaOfTime    = false;
+        BombBag          = false;
+        MagicMeter       = false;
+        Hookshot         = false;
+        Longshot         = false;
+        Bow              = false;
+        GoronBracelet    = false;
+        SilverGauntlets  = false;
+        GoldenGauntlets  = false;
+        SilverScale      = false;
+        GoldScale        = false;
+        AdultsWallet     = false;
+
+        ChildScarecrow   = false;
+        AdultScarecrow   = false;
+        ScarecrowSong    = false;
+        Scarecrow        = false;
+        DistantScarecrow = false;
+
+        Bombs            = false;
+        DekuShield       = false;
+        HylianShield     = false;
+        Nuts             = false;
+        Sticks           = false;
+        Bugs             = false;
+        BlueFire         = false;
+        Fish             = false;
+        Fairy            = false;
+        BottleWithBigPoe = false;
+
+        FoundBombchus    = false;
+        CanPlayBowling   = false;
+        HasBombchus      = false;
+        HasExplosives    = false;
+        HasBoots         = false;
+        IsChild          = false;
+        IsAdult          = false;
+        IsGlitched       = ctx->GetOption(RSK_LOGIC_RULES).Is(RO_LOGIC_GLITCHED);
+        CanBlastOrSmash  = false;
+        CanChildAttack   = false;
+        CanChildDamage   = false;
+        CanCutShrubs     = false;
+        CanDive          = false;
+        CanLeaveForest   = false;
+        CanPlantBugs     = false;
+        CanRideEpona     = false;
+        CanStunDeku      = false;
+        CanSummonGossipFairy = false;
+        CanSummonGossipFairyWithoutSuns = false;
+        //CanPlantBean        = false;
+        CanOpenBombGrotto   = false;
+        CanOpenStormGrotto  = false;
+        BigPoeKill          = false;
+        HookshotOrBoomerang = false;
+
+        BaseHearts      = ctx->GetOption(RSK_STARTING_HEARTS).Value<uint8_t>() + 1;
+        Hearts          = 0;
+        Multiplier      = (ctx->GetOption(RSK_DAMAGE_MULTIPLIER).Value<uint8_t>() < 6) ? ctx->GetOption(RSK_DAMAGE_MULTIPLIER).Value<uint8_t>() : 10;
+        EffectiveHealth = 0;
+        FireTimer       = 0;
+        WaterTimer      = 0;
+
+        GuaranteeTradePath     = false;
+        GuaranteeHint          = false;
+        HasFireSource          = false;
+        HasFireSourceWithTorch = false;
+
+        CanFinishGerudoFortress = false;
+
+        HasShield          = false;
+        CanShield          = false;
+        ChildShield        = false;
+        AdultReflectShield = false;
+        AdultShield        = false;
+        CanShieldFlick     = false;
+        CanJumpslash       = false;
+        CanUseProjectile   = false;
+        CanUseMagicArrow   = false;
+
+        //Bridge Requirements
+        HasAllStones          = false;
+        HasAllMedallions      = false;
+        CanBuildRainbowBridge = false;
+        BuiltRainbowBridge    = false;
+        CanTriggerLACS        = false;
+
+        //Other
+        AtDay         = false;
+        AtNight       = false;
+        Age           = ctx->GetSettings()->ResolvedStartingAge();
+
+        //Events
+        ShowedMidoSwordAndShield  = false;
+        CarpenterRescue           = false;
+        GF_GateOpen               = false;
+        GtG_GateOpen              = false;
+        DampesWindmillAccess      = false;
+        DrainWell                 = false;
+        GoronCityChildFire        = false;
+        GCWoodsWarpOpen           = false;
+        GCDaruniasDoorOpenChild   = false;
+        StopGCRollingGoronAsAdult = false;
+        WaterTempleLow            = false;
+        WaterTempleMiddle         = false;
+        WaterTempleHigh           = false;
+        KakarikoVillageGateOpen   = false;
+        KingZoraThawed            = false;
+        ForestTempleJoelle        = false;
+        ForestTempleBeth          = false;
+        ForestTempleJoAndBeth     = false;
+        ForestTempleAmy           = false;
+        ForestTempleMeg           = false;
+        ForestTempleAmyAndMeg     = false;
+        FireLoopSwitch            = false;
+        LinksCow                  = false;
+        AtDampeTime               = false;
+        DeliverLetter             = false;
+        TimeTravel                = false;
+
+        DrainWellPast            = false;
+        DampesWindmillAccessPast = false;
+        DekuTreeClearPast        = false;
+        GoronRubyPast            = false;
+        ZoraSapphirePast         = false;
+        ForestTrialClearPast     = false;
+        FireTrialClearPast       = false;
+        WaterTrialClearPast      = false;
+        SpiritTrialClearPast     = false;
+        ShadowTrialClearPast     = false;
+        LightTrialClearPast      = false;
+        BuyDekuShieldPast        = false;
+        TimeTravelPast           = false;
+    }
+}
diff --git a/soh/soh/Enhancements/randomizer/logic.h b/soh/soh/Enhancements/randomizer/logic.h
new file mode 100644
index 000000000..38cdda325
--- /dev/null
+++ b/soh/soh/Enhancements/randomizer/logic.h
@@ -0,0 +1,425 @@
+#pragma once
+
+#include "randomizerTypes.h"
+#include "context.h"
+#include <cstdint>
+
+namespace Rando {
+
+enum class HasProjectileAge {
+    Adult,
+    Child,
+    Both,
+    Either,
+};
+
+enum class GlitchType {
+    EquipSwapDins,
+    EquipSwap,
+};
+
+enum class GlitchDifficulty {
+    NOVICE = 1,
+    INTERMEDIATE,
+    ADVANCED,
+    EXPERT,
+    HERO,
+};
+
+class Logic {
+  public:
+    bool noVariable = false;
+
+    // Child item logic
+    bool KokiriSword = false;
+    bool ZeldasLetter = false;
+    bool WeirdEgg = false;
+    bool HasBottle = false;
+    bool Bombchus = false;
+    bool Bombchus5 = false;
+    bool Bombchus10 = false;
+    bool Bombchus20 = false;
+    bool MagicBean = false;
+    bool MagicBeanPack = false;
+    bool RutosLetter = false;
+    bool Boomerang = false;
+    bool DinsFire = false;
+    bool FaroresWind = false;
+    bool NayrusLove = false;
+    bool LensOfTruth = false;
+    bool ShardOfAgony = false;
+    bool SkullMask = false;
+    bool MaskOfTruth = false;
+
+    // Adult logic
+    bool Hammer = false;
+    bool IronBoots = false;
+    bool HoverBoots = false;
+    bool MirrorShield = false;
+    bool GoronTunic = false;
+    bool ZoraTunic = false;
+    bool Epona = false;
+    bool BigPoe = false;
+    bool GerudoToken = false;
+    bool FireArrows = false;
+    bool IceArrows = false;
+    bool LightArrows = false;
+    bool MasterSword = false;
+    bool BiggoronSword = false;
+
+    // Trade Quest
+    bool PocketEgg = false;
+    bool Cojiro = false;
+    bool OddMushroom = false;
+    bool OddPoultice = false;
+    bool PoachersSaw = false;
+    bool BrokenSword = false;
+    bool Prescription = false;
+    bool EyeballFrog = false;
+    bool Eyedrops = false;
+    bool ClaimCheck = false;
+
+    // Trade Quest Events
+    bool WakeUpAdultTalon = false;
+    bool CojiroAccess = false;
+    bool OddMushroomAccess = false;
+    bool OddPoulticeAccess = false;
+    bool PoachersSawAccess = false;
+    bool BrokenSwordAccess = false;
+    bool PrescriptionAccess = false;
+    bool EyeballFrogAccess = false;
+    bool EyedropsAccess = false;
+    bool DisableTradeRevert = false;
+
+    // Songs
+    bool ZeldasLullaby = false;
+    bool SariasSong = false;
+    bool SunsSong = false;
+    bool SongOfStorms = false;
+    bool EponasSong = false;
+    bool SongOfTime = false;
+    bool MinuetOfForest = false;
+    bool BoleroOfFire = false;
+    bool SerenadeOfWater = false;
+    bool RequiemOfSpirit = false;
+    bool NocturneOfShadow = false;
+    bool PreludeOfLight = false;
+
+    // Stones and Meddallions
+    bool ForestMedallion = false;
+    bool FireMedallion = false;
+    bool WaterMedallion = false;
+    bool SpiritMedallion = false;
+    bool ShadowMedallion = false;
+    bool LightMedallion = false;
+    bool KokiriEmerald = false;
+    bool GoronRuby = false;
+    bool ZoraSapphire = false;
+
+    // Dungeon Clears
+    bool DekuTreeClear = false;
+    bool DodongosCavernClear = false;
+    bool JabuJabusBellyClear = false;
+    bool ForestTempleClear = false;
+    bool FireTempleClear = false;
+    bool WaterTempleClear = false;
+    bool SpiritTempleClear = false;
+    bool ShadowTempleClear = false;
+
+    // Trial Clears
+    bool ForestTrialClear = false;
+    bool FireTrialClear = false;
+    bool WaterTrialClear = false;
+    bool SpiritTrialClear = false;
+    bool ShadowTrialClear = false;
+    bool LightTrialClear = false;
+
+    // Greg
+    bool Greg = false;
+    bool GregInBridgeLogic = false;
+    bool GregInLacsLogic = false;
+
+    // Progressive Items
+    uint8_t ProgressiveBulletBag = 0;
+    uint8_t ProgressiveBombBag = 0;
+    uint8_t ProgressiveMagic = 0;
+    uint8_t ProgressiveScale = 0;
+    uint8_t ProgressiveHookshot = 0;
+    uint8_t ProgressiveBow = 0;
+    uint8_t ProgressiveWallet = 0;
+    uint8_t ProgressiveStrength = 0;
+    uint8_t ProgressiveOcarina = 0;
+    uint8_t ProgressiveGiantKnife = 0;
+
+    // Logical keysanity
+    bool IsKeysanity = false;
+
+    // Keys
+    uint8_t ForestTempleKeys = 0;
+    uint8_t FireTempleKeys = 0;
+    uint8_t WaterTempleKeys = 0;
+    uint8_t SpiritTempleKeys = 0;
+    uint8_t ShadowTempleKeys = 0;
+    uint8_t GanonsCastleKeys = 0;
+    uint8_t GerudoFortressKeys = 0;
+    uint8_t GerudoTrainingGroundsKeys = 0;
+    uint8_t BottomOfTheWellKeys = 0;
+    uint8_t TreasureGameKeys = 0;
+
+    // Triforce Pieces
+    uint8_t TriforcePieces = 0;
+
+    // Boss Keys
+    bool BossKeyForestTemple = false;
+    bool BossKeyFireTemple = false;
+    bool BossKeyWaterTemple = false;
+    bool BossKeySpiritTemple = false;
+    bool BossKeyShadowTemple = false;
+    bool BossKeyGanonsCastle = false;
+
+    // Gold Skulltula Count
+    uint8_t GoldSkulltulaTokens = 0;
+
+    // Bottle Count
+    uint8_t Bottles = 0;
+    uint8_t NumBottles = 0;
+    bool NoBottles = false;
+
+    // Drops and Bottle Contents Access
+    bool DekuNutDrop = false;
+    bool NutPot = false;
+    bool NutCrate = false;
+    bool DekuBabaNuts = false;
+    bool DekuStickDrop = false;
+    bool StickPot = false;
+    bool DekuBabaSticks = false;
+    bool BugsAccess = false;
+    bool BugShrub = false;
+    bool WanderingBugs = false;
+    bool BugRock = false;
+    bool BlueFireAccess = false;
+    bool FishAccess = false;
+    bool FishGroup = false;
+    bool LoneFish = false;
+    bool FairyAccess = false;
+    bool GossipStoneFairy = false;
+    bool BeanPlantFairy = false;
+    bool ButterflyFairy = false;
+    bool FairyPot = false;
+    bool FreeFairies = false;
+    bool FairyPond = false;
+    bool BombchuDrop = false;
+    bool AmmoCanDrop = false;
+
+    bool BuyBombchus = false;
+    bool BuySeed = false;
+    bool BuyArrow = false;
+    bool BuyBomb = false;
+    bool BuyMagicPotion = false;
+    bool MagicRefill = false;
+
+    uint8_t PieceOfHeart = 0;
+    uint8_t HeartContainer = 0;
+    bool DoubleDefense = false;
+
+    /* --- HELPERS, EVENTS, AND LOCATION ACCESS --- */
+    /* These are used to simplify reading the logic, but need to be updated
+    /  every time a base value is updated.                       */
+
+    bool Slingshot = false;
+    bool Ocarina = false;
+    bool OcarinaOfTime = false;
+    bool BombBag = false;
+    bool MagicMeter = false;
+    bool Hookshot = false;
+    bool Longshot = false;
+    bool Bow = false;
+    bool GoronBracelet = false;
+    bool SilverGauntlets = false;
+    bool GoldenGauntlets = false;
+    bool SilverScale = false;
+    bool GoldScale = false;
+    bool AdultsWallet = false;
+
+    bool ChildScarecrow = false;
+    bool AdultScarecrow = false;
+    bool ScarecrowSong = false;
+    bool Scarecrow = false;
+    bool DistantScarecrow = false;
+
+    bool Bombs = false;
+    bool DekuShield = false;
+    bool HylianShield = false;
+    bool Nuts = false;
+    bool Sticks = false;
+    bool Bugs = false;
+    bool BlueFire = false;
+    bool Fish = false;
+    bool Fairy = false;
+    bool BottleWithBigPoe = false;
+
+    bool OcarinaAButton      = false;
+    bool OcarinaCLeftButton  = false;
+    bool OcarinaCRightButton = false;
+    bool OcarinaCUpButton    = false;
+    bool OcarinaCDownButton  = false;
+
+    bool FoundBombchus = false;
+    bool CanPlayBowling = false;
+    bool HasBombchus = false;
+    bool HasExplosives = false;
+    bool HasBoots = false;
+    bool IsChild = false;
+    bool IsAdult = false;
+    bool IsGlitched = false;
+    bool CanBlastOrSmash = false;
+    bool CanChildAttack = false;
+    bool CanChildDamage = false;
+    bool CanAdultAttack = false;
+    bool CanAdultDamage = false;
+    bool CanCutShrubs = false;
+    bool CanDive = false;
+    bool CanLeaveForest = false;
+    bool CanPlantBugs = false;
+    bool CanRideEpona = false;
+    bool CanStunDeku = false;
+    bool CanSummonGossipFairy = false;
+    bool CanSummonGossipFairyWithoutSuns = false;
+    bool NeedNayrusLove = false;
+    bool CanSurviveDamage = false;
+    bool CanTakeDamage = false;
+    bool CanTakeDamageTwice = false;
+    // bool CanPlantBean        = false;
+    bool CanOpenBombGrotto = false;
+    bool CanOpenStormGrotto = false;
+    bool BigPoeKill = false;
+    bool HookshotOrBoomerang = false;
+    bool CanGetNightTimeGS = false;
+
+    uint8_t OcarinaButtons = 0;
+    uint8_t BaseHearts = 0;
+    uint8_t Hearts = 0;
+    uint8_t Multiplier = 0;
+    uint8_t EffectiveHealth = 0;
+    uint8_t FireTimer = 0;
+    uint8_t WaterTimer = 0;
+
+    bool GuaranteeTradePath = false;
+    bool GuaranteeHint = false;
+    bool HasFireSource = false;
+    bool HasFireSourceWithTorch = false;
+
+    bool CanFinishGerudoFortress = false;
+
+    bool HasShield = false;
+    bool CanShield = false;
+    bool ChildShield = false;
+    bool AdultReflectShield = false;
+    bool AdultShield = false;
+    bool CanShieldFlick = false;
+    bool CanJumpslash = false;
+    bool CanUseProjectile = false;
+    bool CanUseMagicArrow = false;
+
+    // Bridge and LACS Requirements
+    uint8_t StoneCount = 0;
+    uint8_t MedallionCount = 0;
+    uint8_t DungeonCount = 0;
+    bool HasAllStones = false;
+    bool HasAllMedallions = false;
+    bool CanBuildRainbowBridge = false;
+    bool BuiltRainbowBridge = false;
+    bool CanTriggerLACS = false;
+
+    // Other
+    bool AtDay = false;
+    bool AtNight = false;
+    uint8_t Age = 0;
+    bool CanCompleteTriforce = false;
+
+    bool CanSummonGohma = false;
+    bool CanSummonKingDodongo = false;
+    bool CanSummonBarinade = false;
+    bool CanSummonPhantomGanon = false;
+    bool CanSummonVolvagia = false;
+    bool CanSummonMorpha = false;
+    bool CanSummonBongoBongo = false;
+    bool CanSummonTwinrova = false;
+    bool CanSummonGanon = false;
+
+    // Events
+    bool ShowedMidoSwordAndShield = false;
+    bool CarpenterRescue = false;
+    bool GF_GateOpen = false;
+    bool GtG_GateOpen = false;
+    bool DampesWindmillAccess = false;
+    bool DrainWell = false;
+    bool GoronCityChildFire = false;
+    bool GCWoodsWarpOpen = false;
+    bool GCDaruniasDoorOpenChild = false;
+    bool StopGCRollingGoronAsAdult = false;
+    bool WaterTempleLow = false;
+    bool WaterTempleMiddle = false;
+    bool WaterTempleHigh = false;
+    bool KakarikoVillageGateOpen = false;
+    bool KingZoraThawed = false;
+    bool ForestTempleJoelle = false;
+    bool ForestTempleBeth = false;
+    bool ForestTempleJoAndBeth = false;
+    bool ForestTempleAmy = false;
+    bool ForestTempleMeg = false;
+    bool ForestTempleAmyAndMeg = false;
+    bool FireLoopSwitch = false;
+    bool LinksCow = false;
+    bool AtDampeTime = false;
+    bool DeliverLetter = false;
+    bool TimeTravel = false;
+
+    /* --- END OF HELPERS AND LOCATION ACCESS --- */
+
+    // Placement Tracking
+    uint8_t AddedProgressiveBulletBags = 0;
+    uint8_t AddedProgressiveBombBags = 0;
+    uint8_t AddedProgressiveMagics = 0;
+    uint8_t AddedProgressiveScales = 0;
+    uint8_t AddedProgressiveHookshots = 0;
+    uint8_t AddedProgressiveBows = 0;
+    uint8_t AddedProgressiveWallets = 0;
+    uint8_t AddedProgressiveStrengths = 0;
+    uint8_t AddedProgressiveOcarinas = 0;
+    uint8_t TokensInPool = 0;
+
+    // Event checking past
+    bool DrainWellPast = false;
+    bool DampesWindmillAccessPast = false;
+    bool DekuTreeClearPast = false;
+    bool GoronRubyPast = false;
+    bool ZoraSapphirePast = false;
+    bool ForestTrialClearPast = false;
+    bool FireTrialClearPast = false;
+    bool WaterTrialClearPast = false;
+    bool SpiritTrialClearPast = false;
+    bool ShadowTrialClearPast = false;
+    bool LightTrialClearPast = false;
+    bool BuyDekuShieldPast = false;
+    bool TimeTravelPast = false;
+
+    SaveContext* mSaveContext;
+    Logic();
+    void UpdateHelpers();
+    bool CanUse(RandomizerGet itemName);
+    bool HasProjectile(HasProjectileAge age);
+    bool HasBossSoul(RandomizerGet itemName);
+    bool SmallKeys(RandomizerRegion dungeon, uint8_t requiredAmount);
+    bool SmallKeys(RandomizerRegion dungeon, uint8_t requiredAmountGlitchless, uint8_t requiredAmountGlitched);
+    bool CanDoGlitch(GlitchType glitch);
+    bool CanEquipSwap(RandomizerGet itemName);
+    bool EventsUpdated();
+    void Reset();
+
+  private:
+    static bool IsMagicItem(RandomizerGet item);
+    static bool IsMagicArrow(RandomizerGet item);
+    bool HasItem(RandomizerGet itemName);
+}; // class Logic
+} // namespace Rando
\ No newline at end of file
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
index 74273c22d..013a8fc9a 100644
--- a/soh/soh/OTRGlobals.cpp
+++ b/soh/soh/OTRGlobals.cpp
@@ -336,6 +336,7 @@ OTRGlobals::OTRGlobals() {
 
     gSaveStateMgr = std::make_shared<SaveStateMgr>();
     gRandoContext = Rando::Context::CreateInstance();
+    gRandoContext->InitStaticData();
     gRandoContext->AddExcludedOptions();
     gRandoContext->GetSettings()->CreateOptions();
     gRandomizer = std::make_shared<Randomizer>();

From a196dd6b7e3afad38943369734c8bc84390cd73b Mon Sep 17 00:00:00 2001
From: Christopher Leggett <chris@leggett.dev>
Date: Mon, 8 Jan 2024 14:41:33 -0500
Subject: [PATCH 063/230] Streamline hint generation (#3401)

* reimplement 3drando's hashtag color replacement system.

Also generates merchant text at seed gen time instead of runtime.
By merchants, I mean Bean Salesman, Medigoron, Granny, and Wasteland
Bombchu guy. Scrubs and shops are still dynamic at runtime.

* Improved auto-formatting and fixed altar text.

* Gets hint text for spoiler direct from context.

* Removal of now unused code.

* Change warp song hint generation/retrieval

Generates full warp location text instead of just location names and stores all six in the custom message tables for later retrieval as opposed to dynamically swapping in the location names every time the text is rendered.

* Change Frog Ocarina Game Hint generation/retrieval

Similar to previous changes, removes the on-the-fly generation aspect of it and just generates the full hint text once during seed generation.

* Update soh/soh/Enhancements/randomizer/3drando/text.hpp

Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>

* Fix submodules appearing as changed files.

* Fix WOTH/Foolish colors to match develop-macready.

* Fixes backwards colors for area and item in some hints.

---------

Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>
---
 .gitmodules                                   |   2 +-
 .../custom-message/CustomMessageManager.cpp   |  48 ++-
 .../custom-message/CustomMessageManager.h     |  19 +-
 .../randomizer/3drando/custom_messages.cpp    |   2 +-
 .../randomizer/3drando/hint_list.cpp          | 341 +++++++++------
 .../3drando/hint_list/hint_list_item.cpp      |   4 +
 .../Enhancements/randomizer/3drando/hints.cpp | 402 ++++++++++--------
 .../Enhancements/randomizer/3drando/hints.hpp |  16 -
 .../randomizer/3drando/pool_functions.hpp     |   4 +
 .../randomizer/3drando/spoiler_log.cpp        | 138 +-----
 .../Enhancements/randomizer/3drando/text.hpp  |  34 +-
 soh/soh/Enhancements/randomizer/context.cpp   | 144 ++-----
 .../Enhancements/randomizer/randomizer.cpp    | 177 +++-----
 soh/soh/Enhancements/randomizer/randomizer.h  |   2 -
 .../Enhancements/randomizer/randomizerTypes.h |  16 +-
 soh/soh/OTRGlobals.cpp                        |  14 +-
 soh/soh/SaveManager.cpp                       |  15 +-
 17 files changed, 646 insertions(+), 732 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index f5b67b3ab..7098d9d08 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,4 +6,4 @@
 	url = https://github.com/harbourmasters/ZAPDTR
 [submodule "OTRExporter"]
 	path = OTRExporter
-	url = https://github.com/harbourmasters/OTRExporter/
+	url = https://github.com/harbourmasters/OTRExporter
diff --git a/soh/soh/Enhancements/custom-message/CustomMessageManager.cpp b/soh/soh/Enhancements/custom-message/CustomMessageManager.cpp
index e552a9672..377ea2e75 100644
--- a/soh/soh/Enhancements/custom-message/CustomMessageManager.cpp
+++ b/soh/soh/Enhancements/custom-message/CustomMessageManager.cpp
@@ -17,6 +17,24 @@ static const std::unordered_map<std::string, char> textBoxSpecialCharacters = {
 static const std::unordered_map<std::string, char> colors = { { "w", QM_WHITE },  { "r", QM_RED },   { "g", QM_GREEN },
                                                               { "b", QM_BLUE },   { "c", QM_LBLUE }, { "p", QM_PINK },
                                                               { "y", QM_YELLOW }, { "B", QM_BLACK } };
+static const std::unordered_map<std::string, ItemID> altarIcons = {
+    { "0", ITEM_KOKIRI_EMERALD },
+    { "1", ITEM_GORON_RUBY },
+    { "2", ITEM_ZORA_SAPPHIRE },
+    { "8", ITEM_MEDALLION_LIGHT },
+    { "3", ITEM_MEDALLION_FOREST },
+    { "4", ITEM_MEDALLION_FIRE },
+    { "5", ITEM_MEDALLION_WATER },
+    { "6", ITEM_MEDALLION_SPIRIT },
+    { "7", ITEM_MEDALLION_SHADOW },
+    { "l", ITEM_ARROW_LIGHT },
+    { "b", ITEM_KEY_BOSS },
+    { "o", ITEM_SWORD_MASTER },
+    { "c", ITEM_OCARINA_FAIRY },
+    { "i", ITEM_OCARINA_TIME },
+    { "L", ITEM_BOW_ARROW_LIGHT },
+    { "k", ITEM_TUNIC_KOKIRI }
+};
 
 CustomMessage::CustomMessage(std::string english_, std::string german_, std::string french_, TextBoxType type_,
                              TextBoxPosition position_)
@@ -116,6 +134,7 @@ void CustomMessage::Format(ItemID iid) {
     }
     ReplaceSpecialCharacters();
     ReplaceColors();
+    ReplaceAltarIcons();
     *this += MESSAGE_END();
 }
 
@@ -127,6 +146,7 @@ void CustomMessage::Format() {
     }
     ReplaceSpecialCharacters();
     ReplaceColors();
+    ReplaceAltarIcons();
     *this += MESSAGE_END();
 }
 
@@ -171,7 +191,7 @@ const char* Interface_ReplaceSpecialCharacters(char text[]) {
 
 void CustomMessage::ReplaceColors() {
     for (std::string* str : { &english, &french, &german }) {
-        for (auto colorPair : colors) {
+        for (const auto& colorPair : colors) {
             std::string textToReplace = "%";
             textToReplace += colorPair.first;
             size_t start_pos = 0;
@@ -183,27 +203,41 @@ void CustomMessage::ReplaceColors() {
     }
 }
 
-const std::string CustomMessage::MESSAGE_END() const {
+void CustomMessage::ReplaceAltarIcons() {
+    for (std::string* str : { &english, &french, &german }) {
+        for (const auto& iconPair : altarIcons) {
+            std::string textToReplace = "$";
+            textToReplace += iconPair.first;
+            size_t start_pos = 0;
+            while ((start_pos = str->find(textToReplace, start_pos)) != std::string::npos) {
+                str->replace(start_pos, textToReplace.length(), ITEM_OBTAINED(iconPair.second));
+                start_pos += textToReplace.length();
+            }
+        }
+    }
+}
+
+std::string CustomMessage::MESSAGE_END() {
     return "\x02"s;
 }
 
-const std::string CustomMessage::ITEM_OBTAINED(uint8_t x) const {
+std::string CustomMessage::ITEM_OBTAINED(uint8_t x) {
     return "\x13"s + char(x);
 }
 
-const std::string CustomMessage::NEWLINE() const {
+std::string CustomMessage::NEWLINE() {
     return "\x01"s;
 }
 
-const std::string CustomMessage::COLOR(uint8_t x) const {
+std::string CustomMessage::COLOR(uint8_t x) {
     return "\x05"s + char(x);
 }
 
-const std::string CustomMessage::WAIT_FOR_INPUT() const {
+std::string CustomMessage::WAIT_FOR_INPUT() {
     return "\x04"s;
 }
 
-const std::string CustomMessage::PLAYER_NAME() const {
+std::string CustomMessage::PLAYER_NAME() {
     return "\x0F"s;
 }
 
diff --git a/soh/soh/Enhancements/custom-message/CustomMessageManager.h b/soh/soh/Enhancements/custom-message/CustomMessageManager.h
index afb0f51ae..58639e423 100644
--- a/soh/soh/Enhancements/custom-message/CustomMessageManager.h
+++ b/soh/soh/Enhancements/custom-message/CustomMessageManager.h
@@ -30,6 +30,13 @@ class CustomMessage {
     CustomMessage(std::string english_, std::string german_, std::string french_,
                   TextBoxType type_ = TEXTBOX_TYPE_BLACK, TextBoxPosition position_ = TEXTBOX_POS_BOTTOM);
 
+    static std::string MESSAGE_END() ;
+    static std::string ITEM_OBTAINED(uint8_t x) ;
+    static std::string NEWLINE() ;
+    static std::string COLOR(uint8_t x) ;
+    static std::string WAIT_FOR_INPUT() ;
+    static std::string PLAYER_NAME() ;
+
     const std::string& GetEnglish() const;
     const std::string& GetFrench() const;
     const std::string& GetGerman() const;
@@ -80,6 +87,11 @@ class CustomMessage {
      */
     void ReplaceColors();
 
+    /**
+     * @brief Replaces `$<char>` variable strings with OoT control codes.
+     */
+    void ReplaceAltarIcons();
+
     /**
      * @brief Replaces various symbols with the control codes necessary to
      * display them in OoT's textboxes. i.e. special characters, colors, newlines,
@@ -97,13 +109,6 @@ class CustomMessage {
     void Format();
 
   private:
-    const std::string MESSAGE_END() const;
-    const std::string ITEM_OBTAINED(uint8_t x) const;
-    const std::string NEWLINE() const;
-    const std::string COLOR(uint8_t x) const;
-    const std::string WAIT_FOR_INPUT() const;
-    const std::string PLAYER_NAME() const;
-
     std::string english = "";
     std::string french = "";
     std::string german = "";
diff --git a/soh/soh/Enhancements/randomizer/3drando/custom_messages.cpp b/soh/soh/Enhancements/randomizer/3drando/custom_messages.cpp
index b7dd96ca7..338cb86e7 100644
--- a/soh/soh/Enhancements/randomizer/3drando/custom_messages.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/custom_messages.cpp
@@ -283,7 +283,7 @@ constexpr std::array DungeonColors = {
     std::string SKULLTULAS_DESTROYED() { return  "\x7F\x15"s; }
     std::string CURRENT_TIME()         { return  "\x7F\x17"s; }
     std::string UNSKIPPABLE()          { return  "\x7F\x19"s; }
-    std::string TWO_WAY_CHOICE()       { return  "\x7F\x1A\xFF\xFF\xFF\xFF"s; }
+    std::string TWO_WAY_CHOICE()       { return  "\x1B"s; }
     std::string NEWLINE()              { return  "\x7F\x1C"s; }
     std::string COLOR(uint8_t x)       { return  "\x7F\x1D"s + char(x); }
     std::string CENTER_TEXT()          { return  "\x7F\x1E"s; }
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
index 6b0901d56..4504acc9a 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
@@ -31,12 +31,12 @@ void HintTable_Init() {
     hintTable[RHT_PREFIX] =
         HintText::Exclude({ Text{ "They say that ", /*french*/ "Selon moi, ", /*spanish*/ "Según dicen, " } });
     hintTable[RHT_WAY_OF_THE_HERO] =
-        HintText::Exclude({ Text{ " is on %cthe way of the hero%w.", /*french*/ " est sur %cla voie du héros%w.",
+        HintText::Exclude({ Text{ " is on #the way of the hero#.", /*french*/ " est sur #la voie du héros#.",
                                   /*spanish*/ " conduce a la senda del héroe." } });
     hintTable[RHT_PLUNDERING] =
         HintText::Exclude({ Text{ "plundering ", /*french*/ "explorer ", /*spanish*/ "inspeccionar " } });
     hintTable[RHT_FOOLISH] = HintText::Exclude(
-        { Text{ " is %pa foolish choice%w.", /*french*/ " est %pfutile%w.", /*spanish*/ " no es una sabia decisión." } });
+        { Text{ " is #a foolish choice#.", /*french*/ " est #futile#.", /*spanish*/ " #no es una sabia decisión#." } });
     hintTable[RHT_CAN_BE_FOUND_AT] =
         HintText::Exclude({ Text{ "can be found at", /*french*/ "se trouve dans", /*spanish*/ "aguarda en" } });
     hintTable[RHT_HOARDS] = HintText::Exclude({ Text{ "hoards", /*french*/ "recèle", /*spanish*/ "acapara" } });
@@ -2671,66 +2671,73 @@ void HintTable_Init() {
 
     hintTable[RHT_BRIDGE_OPEN_HINT] = HintText::Bridge({
         // obscure text
-        Text{ "The awakened ones have already&created a bridge to the castle&where the evil dwells.",
-              /*french*/ "Les êtres de sagesse ont&déjà créé un pont vers&le repaire du mal.",
-              /*spanish*/ "Los sabios #ya habrán creado un puente#&al castillo, de donde emana el mal." },
+        Text{ "The awakened ones have #already created a bridge# to the castle where the evil dwells.",
+              /*french*/ "Les êtres de sagesse ont#déjà créé un pont# vers le repaire du mal.",
+            /*spanish*/ "Los sabios #ya habrán creado un puente#&al castillo, de donde emana el mal.",
+              /*german*/"Die Weisen haben #bereits&eine Brücke zum Portal von&Ganons Schloss gelegt#..." },
     });
 
     hintTable[RHT_BRIDGE_VANILLA_HINT] = HintText::Bridge({
         // obscure text
-        Text{ "The awakened ones require&the Shadow and Spirit Medallions&as well as the Light Arrows.",
+        Text{ "The awakened ones require the #Shadow and Spirit Medallions# as well as the #Light Arrows#.",
               /*french*/
-              "Les êtres de sagesse attendront&le héros muni des %rMédaillons de&l'Ombre et l'Esprit%w et des&%yFlèches de Lumière%w.",
+              "Les êtres de sagesse attendront le héros muni des #Médaillons de l'Ombre et l'Esprit# et des #Flèches de Lumière#.",
               /*spanish*/
-              "Los sabios aguardarán a que el héroe&obtenga tanto el #Medallón de las&Sombras y el del Espíritu# junto "
-              "a la #flecha de luz#." },
+              "Los sabios aguardarán a que el héroe obtenga tanto el #Medallón de las Sombras y el del Espíritu# junto "
+            "a la #flecha de luz#.",
+              /*german*/"Die Weisen werden darauf warten, dass der Held das #Amulett des Schattens, Amulett der Geister# und die #Licht-Pfeile# sammelt." },
     });
 
     hintTable[RHT_BRIDGE_STONES_HINT] = HintText::Bridge({
         // obscure text                                                  singular        plural
         Text{
-            "The awakened ones will&await for the Hero to collect&%d |Spiritual Stone|Spiritual Stones|.",
-            /*french*/ "Les êtres de sagesse attendront&le héros muni de %r%d |Pierre&Ancestrale|Pierres&Ancestrales|%w.",
-            /*spanish*/ "Los sabios aguardarán a que el héroe&obtenga #%d |piedra espiritual|piedras espirituales|#." },
+            "The awakened ones will await for the Hero to collect #%d |Spiritual Stone|Spiritual Stones|#.",
+            /*french*/ "Les êtres de sagesse attendront le héros muni de #%d |Pierre Ancestrale|Pierres Ancestrales|#.",
+            /*spanish*/ "Los sabios aguardarán a que el héroe&obtenga #%d |piedra espiritual|piedras espirituales|#.",
+            /*german*/"Die Weisen werden darauf warten, dass der Held #%d |Heiligen Stein|Heilige Steine|# sammelt." },
     });
 
     hintTable[RHT_BRIDGE_MEDALLIONS_HINT] = HintText::Bridge({
         // obscure text                                                  singular  plural
-        Text{ "The awakened ones will await&for the Hero to collect&%d |Medallion|Medallions|.",
-              /*french*/ "Les êtres de sagesse attendront&le héros muni de %r#%d |Médaillon|Médaillons|%w.",
-              /*spanish*/ "Los sabios aguardarán a que el héroe&obtenga #%d |medallón|medallones|#." },
+        Text{ "The awakened ones will await for the Hero to collect #%d |Medallion|Medallions|#.",
+              /*french*/ "Les êtres de sagesse attendront le héros muni de #%d |Médaillon|Médaillons|#.",
+              /*spanish*/ "Los sabios aguardarán a que el héroe&obtenga #%d |medallón|medallones|#.",
+              /*german*/"Die Weisen werden darauf warten, dass der Held #%d |Amulett|Amulette|# sammelt." },
     });
 
     hintTable[RHT_BRIDGE_REWARDS_HINT] = HintText::Bridge({
         // obscure text                                                  singular                     plural
-        Text{ "The awakened ones will await&for the Hero to collect&%d |Spiritual Stone or Medallion|Spiritual Stones "
-              "and Medallions|.",
+        Text{ "The awakened ones will await for the Hero to collect #%d |Spiritual Stone or Medallion|Spiritual Stones "
+              "and Medallions|#.",
               /*french*/
-              "Les êtres de sagesse attendront&le héros muni de %r%d |Pierre&Ancestrale ou Médaillon|Pierres&Ancestrales ou Médaillons|%w.",
+              "Les êtres de sagesse attendront le héros muni de #%d |Pierre Ancestrale ou Médaillon|Pierres Ancestrales ou Médaillons|#.",
               /*spanish*/
-              "Los sabios aguardarán a que el héroe&obtenga #%d |piedra espiritual o medallón|piedras espirtuales y "
-              "medallones|#." },
+              "Los sabios aguardarán a que el héroe obtenga #%d |piedra espiritual o medallón|piedras espirtuales y "
+            "medallones|#.",
+              /*german*/"Die Weisen werden darauf warten, dass der Held #%d |Heiligen Stein oder Amulett|Heilige Steine oder Amulette|# sammelt." },
     });
 
     hintTable[RHT_BRIDGE_DUNGEONS_HINT] = HintText::Bridge({
         // obscure text                                                  singular plural
-        Text{ "The awakened ones will await&for the Hero to conquer&%d |Dungeon|Dungeons|.",
-              /*french*/ "Les êtres de sagesse attendront&la conquête de %r%d |Donjon|Donjons|%w.",
-              /*spanish*/ "Los sabios aguardarán a que el héroe& complete #%d |mazmorra|mazmorras|#." },
+        Text{ "The awakened ones will await for the Hero to conquer #%d |Dungeon|Dungeons|#.",
+              /*french*/ "Les êtres de sagesse attendront la conquête de #%d |Donjon|Donjons|#.",
+              /*spanish*/ "Los sabios aguardarán a que el héroe complete #%d |mazmorra|mazmorras|#.",
+              /*german*/"Die Weisen werden darauf warten, dass der Held #%d |Labyrinth|Labyrinthe|# abschließt." },
     });
 
     hintTable[RHT_BRIDGE_TOKENS_HINT] = HintText::Bridge({
         // obscure text
-        Text{ "The awakened ones will await&for the Hero to collect&%d |Gold Skulltula Token|Gold Skulltula Tokens|.",
-              /*french*/ "Les êtres de sagesse attendront&le héros muni de %r%d |Symbole|Symboles| &de Skulltula d'or%w.",
-              /*spanish*/ "Los sabios aguardarán a que el héroe&obtenga #%d |símbolo|símbolos| de&skulltula dorada#." },
+        Text{ "The awakened ones will await for the Hero to collect #%d |Gold Skulltula Token|Gold Skulltula Tokens|#.",
+              /*french*/ "Les êtres de sagesse attendront le héros muni de #%d |Symbole|Symboles| de Skulltula d'or#.",
+              /*spanish*/ "Los sabios aguardarán a que el héroe obtenga #%d |símbolo|símbolos| de skulltula dorada#.",
+              /*german*/"Die Weisen werden darauf warten, dass der Held #%d |Skulltula-Symbol|Skulltula-Symbole|# sammelt." },
     });
 
     hintTable[RHT_BRIDGE_GREG_HINT] = HintText::Bridge({
         // obscure text
-        Text{ "The awakened ones will await&for the Hero to find %gGreg%w.",
-              /*french*/ "The awakened ones will await&for the Hero to find %gGreg%w.",
-              /*spanish*/ "The awakened ones will await&for the Hero to find %gGreg%w." },
+        Text{ "The awakened ones will await for the Hero to find %gGreg%w.",
+              /*french*/ "The awakened ones will await for the Hero to find %gGreg%w.",
+              /*spanish*/ "The awakened ones will await for the Hero to find %gGreg%w." },
     });
 
     /*--------------------------
@@ -2739,57 +2746,64 @@ void HintTable_Init() {
 
     hintTable[RHT_GANON_BK_START_WITH_HINT] = HintText::GanonsBossKey({
         // obscure text
-        Text{ "And the %revil one%w's key will&be given %rfrom the start%w.",
-              /*french*/ "Aussi, la %rclé du Malin%w sera&possession %rmême du héros%w.",
-              /*spanish*/ "Y obtendrás la llave del #señor del mal# desde el #inicio#." },
+        Text{ "And the #evil one#'s key will be #given from the start#.",
+              /*french*/ "Aussi, la #clé du Malin# sera #possession même du héros#.",
+              /*spanish*/ "Y obtendrás la llave del #señor del mal# desde el #inicio#.",
+              /*german*/"Und der #Schlüssel des Bösen#, wird #von Anfang an, im Besitz des Helden# sein." },
     });
 
     hintTable[RHT_GANON_BK_VANILLA_HINT] = HintText::GanonsBossKey({
         // obscure text
-        Text{ "And the %revil one%w's key will&be kept in a big chest&%rinside its tower%w.",
-              /*french*/ "Aussi, la %rclé du Malin%w sera&encoffrée %rdans sa tour%w.",
-              /*spanish*/ "Y la llave del #señor del mal# aguardará en un gran cofre de #su torre#." },
+        Text{ "And the #evil one#'s key will be kept in a big chest #inside its tower#.",
+              /*french*/ "Aussi, la #clé du Malin# sera encoffrée #dans sa tour#.",
+              /*spanish*/ "Y la llave del #señor del mal# aguardará en un gran cofre de #su torre#.",
+              /*german*/"Und der #Schlüssel des Bösen#, wird in der großen Truhe #im Teufelsturm# zu finden sein." },
     });
 
     hintTable[RHT_GANON_BK_OWN_DUNGEON_HINT] = HintText::GanonsBossKey({
         // obscure text
-        Text{ "And the %revil one%w's key will&be hidden somewhere %rinside&its castle%w.",
-              /*french*/ "Aussi, la %rclé du Malin%w sera&cachée %rdans son vaste château%w.",
-              /*spanish*/ "Y la llave del #señor del mal# aguardará en #algún lugar de su castillo#." },
+        Text{ "And the #evil one#'s key will be hidden somewhere #inside its castle#.",
+              /*french*/ "Aussi, la #clé du Malin# sera cachée #dans son vaste château#.",
+              /*spanish*/ "Y la llave del #señor del mal# aguardará en #algún lugar de su castillo#.",
+              /*german*/"Und der #Schlüssel des Bösen#, wird irgendwo #in Ganons Schloss# zu finden sein." },
     });
 
     hintTable[RHT_GANON_BK_OVERWORLD_HINT] = HintText::GanonsBossKey({
         // obscure text
-        Text{ "And the %revil one%w's key will&be hidden %routside of&dungeons%w in Hyrule.",
-              /*french*/ "Aussi, la %rclé du Malin%w se&trouve %rhors des donjons%w d'Hyrule.",
-              /*spanish*/ "Y la llave del #señor del mal# aguardará #fuera de las mazmorras# de Hyrule." },
+        Text{ "And the #evil one#'s key will be hidden #outside of dungeons# in Hyrule.",
+              /*french*/ "Aussi, la #clé du Malin# se trouve #hors des donjons# d'Hyrule.",
+              /*spanish*/ "Y la llave del #señor del mal# aguardará #fuera de las mazmorras# de Hyrule.",
+              /*german*/"Und der #Schlüssel des Bösen#, wird irgendwo #in Hyrule, außerhalb von Labyrinthen# zu finden sein." },
     });
 
     hintTable[RHT_GANON_BK_ANY_DUNGEON_HINT] = HintText::GanonsBossKey({
         // obscure text
-        Text{ "And the %revil one%w's key will&be hidden %rinside a&dungeon%w in Hyrule.",
-              /*french*/ "Aussi, la %rclé du Malin%w se&trouve %rdans un donjon%w d'Hyrule.",
-              /*spanish*/ "Y la llave del #señor del mal# aguardará #en una mazmorra# de Hyrule." },
+        Text{ "And the #evil one#'s key will be hidden #inside a dungeon# in Hyrule.",
+              /*french*/ "Aussi, la #clé du Malin# se trouve #dans un donjon# d'Hyrule.",
+              /*spanish*/ "Y la llave del #señor del mal# aguardará #en una mazmorra# de Hyrule.",
+              /*german*/"Und der #Schlüssel des Bösen#, wird irgendwo #in Hyrule, innerhalb eines Labyrinths# zu finden sein." },
     });
 
     hintTable[RHT_GANON_BK_ANYWHERE_HINT] = HintText::GanonsBossKey({
         // obscure text
-        Text{ "And the %revil one%w's key will&be hidden somewhere&%rin Hyrule%w.",
-              /*french*/ "Aussi, la %rclé du Malin%w se&trouve quelque part %rdans Hyrule%w.",
-              /*spanish*/ "Y la llave del #señor del mal# aguardará en #cualquier lugar de Hyrule#." },
+        Text{ "And the #evil one#'s key will be hidden somewhere&#in Hyrule#.",
+              /*french*/ "Aussi, la #clé du Malin# se trouve quelque part #dans Hyrule#.",
+              /*spanish*/ "Y la llave del #señor del mal# aguardará en #cualquier lugar de Hyrule#.",
+              /*german*/"Und der #Schlüssel des Bösen#, wird irgendwo #in Hyrule# zu finden sein." },
     });
 
     hintTable[RHT_GANON_BK_TRIFORCE_HINT] = HintText::GanonsBossKey({
         // obscure text
-        Text{ "And the %revil one%w's key will&be given to the Hero once&the %rTriforce%w is completed.",
-              /*french*/ "Aussi, la %rclé du Malin%w se&révèlera une fois la %rTriforce%w&assemblée.",
-              /*spanish*/ "Y el héroe recibirá la llave del #señor del mal# cuando haya completado la #Trifuerza#." },
+        Text{ "And the #evil one#'s key will be given to the Hero once the #Triforce## is completed.",
+              /*french*/ "Aussi, la #clé du Malin# se&révèlera une fois la #Triforce#&assemblée.",
+              /*spanish*/ "Y el héroe recibirá la llave del #señor del mal# cuando haya completado la #Trifuerza#.",
+              /*german*/"Und der #Schlüssel des Bösen# wird verliehen, sobald das #Triforce# vervollständigt wurde." },
     });
 
     hintTable[RHT_GANON_BK_SKULLTULA_HINT] = HintText::GanonsBossKey({
         // obscure text
-        Text { "And the %revil one%w's key will be&provided by the cursed rich man&once %r100 Gold Skulltula Tokens%w&are retrieved.",
-              /*french*/ "Aussi, la %rclé du Malin%w sera&donnée par l'homme maudit une&fois que %r100 Symboles de&Skulltula d'or%w auront été trouvés.",
+        Text { "And the #evil one#'s key will be provided by the cursed rich man once #100 Gold Skulltula Tokens# are retrieved.",
+              /*french*/ "Aussi, la #clé du Malin# sera&donnée par l'homme maudit une fois que #100 Symboles de Skulltula d'or# auront été trouvés.",
               /*spanish*/ "Y el rico maldito entregará la llave&del #señor de mal# tras obtener&100 símbolos de skulltula dorada#."},
     });
 
@@ -2800,57 +2814,63 @@ void HintTable_Init() {
     hintTable[RHT_LACS_VANILLA_HINT] = HintText::LACS({
         // obscure text
         Text{
-            "And the %revil one%w's key will be&provided by Zelda once the&%rShadow and Spirit Medallions%w&are retrieved.",
-            /*french*/ "Aussi, la %rclé du Malin%w sera&fournie par Zelda une fois que &les %rMédaillons de l'Ombre et de&l'Esprit%w seront récupérés.",
+            "And the #evil one#'s key will be provided by Zelda once the #Shadow and Spirit Medallions# are retrieved.",
+            /*french*/ "Aussi, la #clé du Malin# sera fournie par Zelda une fois que les #Médaillons de l'Ombre et de l'Esprit# seront récupérés.",
             /*spanish*/
-            "Y Zelda entregará la llave&del #señor del mal# tras obtener&#el medallón de las sombras y del "
-            "espíritu#." },
+            "Y Zelda entregará la llave del #señor del mal# tras obtener #el medallón de las sombras y del "
+            "espíritu#.",
+            /*german*/"Und der #Schlüssel des Bösen# wird von Zelda verliehen, sobald #die Amulette des Schattens und der Geister# geborgen wurden." },
     });
 
     hintTable[RHT_LACS_MEDALLIONS_HINT] = HintText::LACS({
         // obscure text                                                     singular      plural
-        Text{ "And the %revil one%w's key will be&provided by Zelda once %r%d&|Medallion%w is|Medallions%w are| retrieved.",
-              /*french*/ "Aussi, la %rclé du Malin%w sera&fournie par Zelda une fois |qu'&%r%d Médaillon%w aura été&récupéré|que&%r%d Médaillons%w auront été&récupérés|.",
-              /*spanish*/ "Y Zelda entregará la llave&del #señor del mal# tras obtener&#%d |medallón|medallones|#." },
+        Text{ "And the #evil one#'s key will be provided by Zelda once #%d |Medallion# is|Medallions# are| retrieved.",
+              /*french*/ "Aussi, la #clé du Malin# sera fournie par Zelda une fois |qu' #%d Médaillon# aura été récupéré|que #%d Médaillons# auront été récupérés|.",
+              /*spanish*/ "Y Zelda entregará la llave&del #señor del mal# tras obtener #%d |medallón|medallones|#.",
+              /*german*/"Und der #Schlüssel des Bösen# wird von Zelda verliehen, sobald #%d |Amulett# geborgen wurde|Amulette# geborgen wurden|." },
     });
 
     hintTable[RHT_LACS_STONES_HINT] = HintText::LACS({
         // obscure text                                                     singular            plural
         Text{
-            "And the %revil one%w's key will be&provided by Zelda once %r%d&|Spiritual Stone%w is|Spiritual Stones%w are| "
+            "And the #evil one#'s key will be provided by Zelda once #%d |Spiritual Stone# is|Spiritual Stones# are| "
             "retrieved.",
-            /*french*/ "Aussi, la %rclé du Malin%w sera&fournie par Zelda une fois |qu'&%r%d Pierre Ancestrale%w aura été&récupérée|que&%r%d Pierres Ancestrales%w auront été&récupérées|.",
+            /*french*/ "Aussi, la #clé du Malin# sera fournie par Zelda une fois |qu' #%d Pierre Ancestrale# aura été&récupérée|que #%d Pierres Ancestrales# auront été récupérées|.",
             /*spanish*/
-            "Y Zelda entregará la llave&del #señor del mal# tras obtener&#%d |piedra espiritual|piedras "
-            "espirituales|#." },
+            "Y Zelda entregará la llave del #señor del mal# tras obtener #%d |piedra espiritual|piedras "
+            "espirituales|#.",
+            /*german*/"Und der #Schlüssel des Bösen# wird von Zelda verliehen, sobald #%d |Heiliger Stein# geborgen wurde|Heilige Steine# geborgen wurden|." },
     });
 
     hintTable[RHT_LACS_REWARDS_HINT] = HintText::LACS({
         // obscure text                                                     singular                         plural
-        Text{ "And the %revil one%w's key will be&provided by Zelda once %r%d&|Spiritual Stone or Medallion%w&"
-              "is|Spiritual Stones and Medallions%w&are| retrieved.",
+        Text{ "And the #evil one#'s key will be provided by Zelda once #%d |Spiritual Stone or Medallion# "
+              "is|Spiritual Stones and Medallions# are| retrieved.",
               /*french*/
-              "Aussi, la %rclé du Malin%w sera&fournie par Zelda une fois |qu'&%r%d Pierre Ancestrale ou %d&Médaillon%w sera récupéré|que&%r%d Pierres Ancestrales et&Médaillons%w seront récupérés|.",
+              "Aussi, la #clé du Malin# sera fournie par Zelda une fois |qu' #%d Pierre Ancestrale ou %d Médaillon# sera récupéré|que&#%d Pierres Ancestrales et&Médaillons# seront récupérés|.",
               /*spanish*/
-              "Y Zelda entregará la llave&del #señor del mal# tras obtener&#%d |piedra espiritual o medallón|piedras "
-              "espirituales o medallones|#." },
+              "Y Zelda entregará la llave del #señor del mal# tras obtener #%d |piedra espiritual o medallón|piedras "
+            "espirituales o medallones|#.",
+              /*german*/"Und der #Schlüssel des Bösen# wird von Zelda verliehen, sobald #%d |Heiliger Stein oder Amulett#&geborgen wurde|Heilige Steine oder Amulette#&geborgen wurden|." },
     });
 
     hintTable[RHT_LACS_DUNGEONS_HINT] = HintText::LACS({
         // obscure text                                                     singular    plural
-        Text{ "And the %revil one%w's key will be&provided by Zelda once %r%d&|Dungeon%w is|Dungeons%w are| conquered.",
-              /*french*/ "Aussi, la %rclé du Malin%w sera&fournie par Zelda une fois |qu'&%r%d donjon %wsera conquis|que&%r%d donjons%w seront conquis|.",
-              /*spanish*/ "Y Zelda entregará la llave&del #señor del mal# tras completar&#%d |mazmorra|mazmorras|#." },
+        Text{ "And the #evil one#'s key will be provided by Zelda once #%d |Dungeon# is|Dungeons# are| conquered.",
+              /*french*/ "Aussi, la #clé du Malin# sera fournie par Zelda une fois |qu' #%d donjon #sera conquis|que #%d donjons# seront conquis|.",
+            /*spanish*/ "Y Zelda entregará la llave del #señor del mal# tras completar #%d |mazmorra|mazmorras|#.",
+              /*german*/"Und der #Schlüssel des Bösen# wird von Zelda verliehen, sobald #%d |Labyrinth# abgeschlossen wurde|Labyrinthe# abgeschlossen wurden|." },
     });
 
     hintTable[RHT_LACS_TOKENS_HINT] = HintText::LACS({
         // obscure text                                                     singular                 plural
-        Text{ "And the %revil one%w's key will be&provided by Zelda once %r%d |Gold&Skulltula Token%w is|Gold&Skulltula "
-              "Tokens%w are| retrieved.",
-              /*french*/ "Aussi, la %rclé du Malin%w sera&fournie par Zelda une fois |qu'&%r%d symbole de Skulltula d'or&%wsera récupuéré|que &%r%d symboles de Skulltula d'or&%wseront recupérés|.",
+        Text{ "And the #evil one#'s key will be provided by Zelda once #%d |Gold&Skulltula Token# is|Gold Skulltula "
+              "Tokens# are| retrieved.",
+              /*french*/ "Aussi, la #clé du Malin# sera fournie par Zelda une fois |qu' #%d symbole de Skulltula d'or #sera récupuéré|que &#%d symboles de Skulltula d'or&#seront recupérés|.",
               /*spanish*/
-              "Y Zelda entregará la llave&del #señor del mal# tras obtener&#%d |símbolo|símbolos| de&skulltula "
-              "dorada#." },
+              "Y Zelda entregará la llave del #señor del mal# tras obtener #%d |símbolo|símbolos| de skulltula "
+            "dorada#.",
+              /*german*/"Und der #Schlüssel des Bösen# wird von Zelda verliehen, sobald #%d |Skulltula-Symbol# gesammelt wurde|Skulltula-Symbole# gesammelt wurden|." },
     });
     /*--------------------------
     |     TRIAL HINT TEXT      |
@@ -2860,26 +2880,30 @@ void HintTable_Init() {
         // obscure text
         Text{ "#Ganon's Tower# is protected by a powerful barrier.",
               /*french*/ "#la Tour de Ganon# est protégée par une puissante barrière",
-              /*spanish*/ "la #torre de Ganon# está protegida por una poderosa barrera" },
+              /*spanish*/ "la #torre de Ganon# está protegida por una poderosa barrera",
+              /*german*/"der #Teufelsturm# sei von einer mächtigen Barriere geschützt." },
     });
 
     hintTable[RHT_ZERO_TRIALS] = HintText::Exclude({
         // obscure text
         Text{ "Sheik dispelled the barrier around #Ganon's Tower#.",
               /*french*/ "Sheik a dissipé la barrière autour de #la Tour de Ganon#",
-              /*spanish*/ "Sheik disipó la barrera alrededor de la #torre de Ganon#." },
+              /*spanish*/ "Sheik disipó la barrera alrededor de la #torre de Ganon#.",
+              /*german*/"Shiek habe die Barriere um den #Teufelsturm# aufgelöst." },
     });
 
     hintTable[RHT_FOUR_TO_FIVE_TRIALS] = HintText::Exclude({
         // obscure text
         Text{ " was dispelled by Sheik.", /*french*/ " a été dissipée par Sheik.",
-              /*spanish*/ " se disipó gracias a Sheik." },
+            /*spanish*/ " se disipó gracias a Sheik.",
+              /*german*/" sei von Shiek aufgelöst worden." },
     });
 
     hintTable[RHT_ONE_TO_THREE_TRIALS] = HintText::Exclude({
         // obscure text
         Text{ " protects Ganons Tower.", /*french*/ " protège la Tour de Ganon.",
-              /*spanish*/ " protege la torre de Ganon" },
+            /*spanish*/ " protege la torre de Ganon",
+                /*german*/" schütze den Teufelsturm." },
     });
 
     /*--------------------------
@@ -2890,14 +2914,16 @@ void HintTable_Init() {
         // obscure text
         Text{ "3 Spiritual Stones found in Hyrule...",
               /*french*/ "Les trois Pierres Ancestrales cachées&dans Hyrule...",
-              /*spanish*/ "Tres piedras espirituales halladas por Hyrule..." },
+              /*spanish*/ "Tres piedras espirituales halladas por Hyrule...",
+              /*german*/"Drei Heilige Steine, zu finden in Hyrule..." },
     });
 
     hintTable[RHT_CHILD_ALTAR_TEXT_END_DOTOPEN] = HintText::Altar({
         // obscure text
         Text{ "Ye who may become a Hero...&The path to the future is open...",
               /*french*/ "À celui qui a quête de devenir&héros...&Le futur vous accueille béant...",
-              /*spanish*/ "Para aquel que se convierta en el héroe...&La puerta al futuro está a su disposición..." },
+              /*spanish*/ "Para aquel que se convierta en el héroe...&La puerta al futuro está a su disposición...",
+              /*german*/"Jener auf dem Weg des Helden...&Der Pfad zur Zukunft sei geöffnet..." },
     });
 
     hintTable[RHT_CHILD_ALTAR_TEXT_END_DOTSONGONLY] = HintText::Altar({
@@ -2905,7 +2931,8 @@ void HintTable_Init() {
         Text{
             "Ye who may become a Hero...&Stand with the Ocarina and&play the Song of Time.",
             /*french*/ "À celui qui a quête de devenir&héros...&Portez l'Ocarina et jouez&le chant du temps.",
-            /*spanish*/ "Para aquel que se convierta en el héroe...&Tome la ocarina y&entone la Canción del Tiempo." },
+            /*spanish*/ "Para aquel que se convierta en el héroe...&Tome la ocarina y&entone la Canción del Tiempo.",
+            /*german*/"Jener auf dem Weg des Helden...&Nehme er seine Okarina zur Hand und&spiele hier die Hymne der Zeit." },
     });
 
     hintTable[RHT_CHILD_ALTAR_TEXT_END_DOTCLOSED] = HintText::Altar({
@@ -2915,30 +2942,32 @@ void HintTable_Init() {
               "À celui qui a quête de devenir&héros... Présentez les Pierres&Ancestrales et jouez&le chant du temps.",
               /*spanish*/
               "Para aquel que se convierta en el héroe...&Tome las piedras espirituales y&entone la Canción del "
-              "Tiempo." },
+            "Tiempo.",
+              /*german*/"Jener mit den drei Heiligen Steinen&nehme seine Okarina zur Hand und&spiele hier die Hymne der Zeit." },
     });
 
     hintTable[RHT_ADULT_ALTAR_TEXT_START] = HintText::Altar({
         // obscure text
-        Text{ "An awakening voice from the Sacred&Realm will call those destined to be&Sages, who dwell in the five "
-              "temples.",
+        Text{ "An awakening voice from the Sacred Realm will call those destined to be Sages, who dwell in the #five temples#.",
               /*french*/
-              "Quand le mal aura triomphé, une voix&du Saint Royaume appellera ceux&cachés dans les cinq temples, "
+              "Quand le mal aura triomphé, une voix du Saint Royaume appellera ceux cachés dans les #cinq temples#, "
               "destinés^à être Sages.",
               /*spanish*/
               "Cuando el mal lo impregne todo, desde el Reino Sagrado surgirá una voz que hará despertar a los sabios "
-              "que moran en los #cinco templos#." },
+            "que moran en los #cinco templos#.",
+              /*german*/"Beherrscht das Böse die Welt, weilen&jene Weisen, die von der Stimme des Heiligen Reiches erweckt werden, noch&in den #fünf Tempeln#." },
     });
 
     hintTable[RHT_ADULT_ALTAR_TEXT_END] = HintText::Altar({
         // obscure text
         Text{
-            "$kTogether with the Hero of Time,&the awakened ones will return&the light of peace to the world...",
+            "$kTogether with the Hero of Time, the awakened ones will return the light of peace to the world...",
             /*french*/
-            "$kEnsemble avec le Héros du &Temps, ces Sages emprisonneront&le mal et réinstaureront la&lumière de paix "
+            "$kEnsemble avec le Héros du Temps, ces Sages emprisonneront le mal et réinstaureront la lumière de paix "
             "dans le monde...",
             /*spanish*/
-            "Con el Héroe del Tiempo, aquellos&que despierten detendrán el mal y&volverán al mundo de luz la paz..." },
+            "Con el Héroe del Tiempo, aquellos&que despierten detendrán el mal y&volverán al mundo de luz la paz...",
+            /*german*/"$kZusammen mit dem Auserwählten wer-den diese ihre Kräfte einsetzen, um der Welt den Frieden wiederzugeben." },
     });
 
     /*--------------------------
@@ -3054,7 +3083,7 @@ void HintTable_Init() {
     hintTable[RHT_SARIA_TEXT01] = HintText::OtherHint({
         // obscure text
         Text{
-            "Did you feel the %gsurge of magic%w recently? A mysterious bird told me it came from %g", 
+            "Did you feel the %gsurge of magic%w recently? A mysterious bird told me it came from %g",
             /*french*/
             "As-tu récemment ressenti une vague de %gpuissance magique%w? Un mystérieux hibou m'a dit  qu'elle provenait du %g",
             /*spanish*/
@@ -3071,6 +3100,35 @@ void HintTable_Init() {
             "%w.$C"},
     });
 
+    hintTable[RHT_WARP_TO] = HintText::OtherHint({
+        Text{
+            "Warp to&#",
+            "Se téléporter vers&#",
+            "",
+            "Zu&#"},
+        });
+    hintTable[RHT_WARP_CHOICE] = HintText::OtherHint({
+        Text{
+            "#?&" + TWO_WAY_CHOICE() + "#OK&No#",
+            "#?&" + TWO_WAY_CHOICE() + "#OK!&Non#",
+            "###",
+            "#?&" + TWO_WAY_CHOICE() + "#OK&No#"
+        }
+    });
+
+    hintTable[RHT_FROGS_HINT01] = HintText::OtherHint({Text{
+        "Some frogs holding #",
+        "Des grenouilles se trouvant sous l'eau vous fixent attentivement, tenant fermement #",
+        "",
+        "Unter Wasser gibt es Frösche, die #"
+    }});
+    hintTable[RHT_FROGS_HINT02] = HintText::OtherHint({Text{
+        "# are looking at you from underwater...",
+        "#.",
+        "",
+        "# bei sich haben und Dich neugierig beobachten..."
+    }});
+
     /*--------------------------
     |      GANON LINE TEXT     |
     ---------------------------*/
@@ -3179,67 +3237,100 @@ void HintTable_Init() {
     |      MERCHANTS' ITEMS     |
     ---------------------------*/
 
+    hintTable[RHT_BEAN_SALESMAN_FIRST] = HintText::MerchantsDialogs({
+        Text{
+            "I tried to be a #magic bean#&salesman, but it turns out my&marketing skills weren't worth&"
+            "beans!^Anyway, want to buy #",
+            /*french*/ "J'ai essayé d'être un vendeur&de #haricots magiques#, mais&j'étais mauvais au niveau du&marketing et ça "
+            "me courait sur&le haricot...^Enfin bref, ça te dirait de m'acheter #",
+            /*spanish*/ "",
+            /*german*/ "Möchten Sie #"
+        }
+    });
+    hintTable[RHT_BEAN_SALESMAN_SECOND] = HintText::MerchantsDialogs({
+        Text{
+            "# for #60 Rupees#?&" + TWO_WAY_CHOICE() + "#Yes&No#",
+            /*french*/ "# pour #60 Rubis#?&" + TWO_WAY_CHOICE() + "#Oui&Non#",
+            /*spanish*/ "",
+            /*german*/ "# für #60 Rubine#?&" + TWO_WAY_CHOICE() + "#Ja&Nein#"
+        }
+    });
+
     hintTable[RHT_MEDIGORON_DIALOG_FIRST] = HintText::MerchantsDialogs({
         // obscure text
-        Text{ "How about buying ",
-              /*french*/ "Veux-tu acheter ",
-              /*spanish*/ "¿Me compras " },
+        Text{ "How about buying #",
+              /*french*/ "Veux-tu acheter #",
+              /*spanish*/ "¿Me compras #",
+              /*german*/ "Möchtest du #" },
     });
 
     hintTable[RHT_MEDIGORON_DIALOG_SECOND] = HintText::MerchantsDialogs({
         // obscure text
-        Text{ " for #200 Rupees#?&" + TWO_WAY_CHOICE() + "#Buy&Don't buy#",
-              /*french*/ " pour #200 rubis#?&" + TWO_WAY_CHOICE() + "#Acheter&Ne pas acheter#",
-              /*spanish*/ " por #200 rupias#?&" + TWO_WAY_CHOICE() + "#Comprar&No comprar#" },
+        Text{ "# for #200 Rupees#?&" + TWO_WAY_CHOICE() + "#Buy&Don't buy#",
+              /*french*/ "# pour #200 rubis#?&" + TWO_WAY_CHOICE() + "#Acheter&Ne pas acheter#",
+              /*spanish*/ "# por #200 rupias#?&" + TWO_WAY_CHOICE() + "#Comprar&No comprar#",
+              /*german*/ "# für #200 Rubine# kaufen?&" + TWO_WAY_CHOICE() + "#Klar!&Nie im Leben!#" },
     });
 
     hintTable[RHT_CARPET_SALESMAN_DIALOG_FIRST] = HintText::MerchantsDialogs({
         // obscure text
-        Text{ "Welcome!^I am selling stuff, strange and rare, from&all over the world to everybody. Today's&special "
-              "is...^",
+        Text{ "Welcome!^I am selling stuff, strange and rare, from all over the world to everybody. Today's special "
+              "is...^#",
               /*french*/
-              "Bienvenue!^Je vends des objets rares et merveilleux du&monde entier. En spécial aujourd'hui...^",
+              "Bienvenue!^Je vends des objets rares et merveilleux du&monde entier. En spécial aujourd'hui...^#",
               /*spanish*/
               "¡Acércate!^Vendo productos extraños y difíciles de&encontrar... De todo el mundo a todo el&mundo. La "
-              "oferta de hoy es...^¡" },
+              "oferta de hoy es...^#¡",
+              /* german */
+              "Sei gegrüßt!^Ich verkaufe allerlei Kuriorisäten.&Stets sonderliche und seltene Ware&aus "
+              "aller Welt für jedermann.&Das heutige Angebot bleibt...^#" },
     });
 
-    hintTable[RHT_CARPET_SALESMAN_DIALOG_SECOND] = HintText::MerchantsDialogs({
+    hintTable[RHT_CARPET_SALESMAN_DIALOG_MYSTERIOUS] = HintText::MerchantsDialogs({
         // obscure text
-        Text{
-            "! Terrifying!&I won't tell you what it is until I see the&money...^How about #200 Rupees#?&&" +
-                TWO_WAY_CHOICE() + "#Buy&Don't buy#",
-            /*french*/
-                "! Un&concentré de puissance! Mais montre tes&rubis avant que je te dise ce que c'est...^Disons #200 "
-                "rubis#?&&" +
-                TWO_WAY_CHOICE() + "#Acheter&Ne pas acheter#",
-            /*spanish*/
-                "! ¡Terrorífico!&No te revelaré su nombre hasta que&vea el dinero...^#200 rupias#, ¿qué te parece?&&" +
-                TWO_WAY_CHOICE() + "#Comprar&No comprar#" },
+        Text{ "!# Terrifying! I won't tell you what it is until I see the #money#...^How about #200 Rupees#?&&" +
+                  TWO_WAY_CHOICE() + "#Buy&Don't buy#",
+              /*french*/
+              "!# Un concentré de puissance! Mais montre tes #rubis# avant que je te dise ce que c'est...^Disons #200 "
+              "rubis#?&&" +
+                  TWO_WAY_CHOICE() + "#Acheter&Ne pas acheter#",
+              /*spanish*/
+              "!# ¡Terrorífico! No te revelaré su nombre hasta que vea el #dinero#...^#200 rupias#, ¿qué te parece?&&" +
+                  TWO_WAY_CHOICE() + "#Comprar&No comprar#",
+              /*german*/
+              "!# Furchterregend oder? Ich erzähle Euch mehr, wenn ich #Geld# sehe...^Wie wär's mit #200 Rubinen#?&&" +
+                  TWO_WAY_CHOICE() + "#Aber sicher!&Ich bin weg!#" },
     });
 
-    hintTable[RHT_CARPET_SALESMAN_DIALOG_THIRD] = HintText::MerchantsDialogs({
+    hintTable[RHT_CARPET_SALESMAN_DIALOG_HINTED] = HintText::MerchantsDialogs({
         // obscure text
-        Text{ "Thank you very much!^What I'm selling is... #",
-              /*french*/ "Merci beaucoup!^Cet objet extraordinaire est... #",
-              /*spanish*/ "¡Muchas gracias!^Lo que vendo es... #¡" },
+        Text{ "!# It's real, I promise! A lonely man such as myself wouldn't #lie# to you, hmm?^"
+              "How about #200 Rupees#?&&" + TWO_WAY_CHOICE() + "#Buy&Don't buy#",
+              /*french*/
+              "!# C'est vrai! J'te jure! Un gars comme moi ne te #mentirai# pas tu ne crois pas?^Disons #200 "
+              "rubis#?&&" + TWO_WAY_CHOICE() + "#Acheter&Ne pas acheter#",
+              /*spanish*/ // TODO: Flesh this out with the flavor text if we ever support spanish translations
+              "#!^###200 rupias#, ¿qué te parece?&&" + TWO_WAY_CHOICE() + "#Comprar&No comprar#",
+              /*german*/
+              "#! Ich kann versichern es ist ein aufrichtiges Angebot!^Ein einsamer Mann wie ich würde dich doch "
+              "nicht #anlügen#, oder?^Wie wär's mit #200 Rubinen#?&&" + TWO_WAY_CHOICE() + 
+              "#Aber sicher!&Ich bin weg!#" },
     });
 
-    hintTable[RHT_CARPET_SALESMAN_DIALOG_FOURTH] = HintText::MerchantsDialogs({
+    hintTable[RHT_CARPET_SALESMAN_DIALOG_FINAL] = HintText::MerchantsDialogs({
         // obscure text
-        Text{ "!#^The mark that will lead you to the #Spirit&Temple# is the #flag on the " + IF_NOT_MQ() + "left" +
-                  MQ_ELSE() + "right" + MQ_END() + "# outside the shop. Be seeing you!",
-              /*french*/ "!#^La marque qui te mènera au #Temple de l'Esprit# est le #drapeau " + IF_NOT_MQ() +
-                  "gauche" + MQ_ELSE() + "droite" + MQ_END() + "# en sortant d'ici. À la prochaine!",
-              /*spanish*/ "!#^La marca que te guiará al #Templo del&Espíritu# es la #bandera que está a la&" +
-                  IF_NOT_MQ() + "izquierda" + MQ_ELSE() + "derecha" + MQ_END() + "# al salir de aquí. ¡Nos vemos!" },
+        Text{ "Finally! Now I can go back to being &an %rarms dealer%w!",
+              /*french*/ "Squalala! Je vais enfin pouvoir &%rprendre des vacances%w!",
+              /*spanish*/ "", // TODO: Flesh this out with the flavor text if we ever support spanish translations
+              /*german*/ "Endlich! Schon bald kann ich wieder &%rKrabbelminen-Händler%w sein!" },
     });
 
     hintTable[RHT_GRANNY_DIALOG] = HintText::MerchantsDialogs({
         // obscure text
         Text{ "! How about #100 Rupees#?&" + TWO_WAY_CHOICE() + "#Buy&Don't buy#",
               /*french*/ "! Que dis-tu de #100 rubis#?&" + TWO_WAY_CHOICE() + "#Acheter&Ne pas acheter#",
-              /*spanish*/ ". Vendo por #100 rupias#.&" + TWO_WAY_CHOICE() + "#Comprar&No comprar#" },
+              /*spanish*/ ". Vendo por #100 rupias#.&" + TWO_WAY_CHOICE() + "#Comprar&No comprar#",
+              /*german*/ "! Sagen wir #100 Rubine#!&" + TWO_WAY_CHOICE() + "#Gerne!&Auf keinen Fall!#" },
     });
 }
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp
index 8fd0625bc..d2c59c01d 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp
@@ -2115,6 +2115,10 @@ void HintTable_Init_Item() {
                        //clear text
                        Text{"Epona", /*french*/"Epona", /*spanish*/"a Epona"}
     );
+    hintTable[RHT_HINT_MYSTERIOUS] = HintText::Item({
+      Text{"something mysterious", /*french*/"un sacré mystère",  /*spanish*/"algo misterioso", /*german*/"etwas Unvorhergesehenes"},
+      Text{"an unknown treasure",  /*french*/"un trésor inconnu", /*spanish*/"un desconocido tesoro", /*german*/"ein unbekannter Schatz"},
+    });
 
     // [RHT_HINT_ERROR] = HintText::Item({
     //                      //obscure text
diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.cpp b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
index 3eab983c9..c9d6d2df5 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hints.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
@@ -1,6 +1,5 @@
 #include "hints.hpp"
 
-#include "custom_messages.hpp"
 #include "item_pool.hpp"
 #include "random.hpp"
 #include "spoiler_log.hpp"
@@ -14,7 +13,15 @@
 #include "../context.h"
 #include "pool_functions.hpp"
 
-using namespace CustomMessages;
+#define QM_WHITE "%w"
+#define QM_RED "%r"
+#define QM_GREEN "%g"
+#define QM_BLUE "%b"
+#define QM_LBLUE "%c"
+#define QM_PINK "%p"
+#define QM_YELLOW "%y"
+#define QM_BLACK "%B"
+
 using namespace Rando;
 
 const Text& HintText::GetText() const {
@@ -90,7 +97,7 @@ const std::array<HintSetting, 4> hintSettingTable{{
     .alwaysCopies = 0,
     .trialCopies = 0,
     .junkWeight = 1, //RANDOTODO when the hint pool is not implicitly an itemLocations, handle junk like other hint types
-    .distTable = {} /*RANDOTODO Instead of loading a function into this, 
+    .distTable = {} /*RANDOTODO Instead of loading a function into this,
     apply this filter on all possible hintables in advance and then filter by what is acually in the seed at the start of generation.
     This allows the distTable to hold the current status in hint generation (reducing potential doubled work) and
     will make handling custom hint pools easier later*/
@@ -109,7 +116,7 @@ const std::array<HintSetting, 4> hintSettingTable{{
       {"Dungeon",    HINT_TYPE_ITEM_LOCATION, 3,  0, 1, FilterDungeonLocations},
       {"Named Item", HINT_TYPE_ITEM_AREA,    10,  0, 1, FilterGoodItems},
       {"Random"    , HINT_TYPE_ITEM_AREA,    12,  0, 1, NoFilter}
-    } 
+    }
   },
   // Strong hints
   {
@@ -144,37 +151,109 @@ const std::array<HintSetting, 4> hintSettingTable{{
   },
 }};
 
-Text AutoFormatHintText(Text unformattedHintText) {
-  std::array<std::string, LANGUAGE_MAX> strings;
-  for (int i = 0; i < LANGUAGE_MAX; i++) {
-    std::string textStr = unformattedHintText.GetForLanguage(i);
-    // RANDOTODO: don't just make manual exceptions
-    bool needsAutomaticNewlines = true;
-    if (textStr == "Erreur 0x69a504:&Traduction manquante^C'est de la faute à Purple Hato!&J'vous jure!" ||
-      textStr == "Mon très cher @:&Viens vite au château, je t'ai préparé&un délicieux gâteau...^À bientôt, Princesse Zelda" ||
-      textStr == "What about Zelda makes you think&she'd be a better ruler than I?^I saved Lon Lon Ranch,&fed the hungry,&and my castle floats." ||
-      textStr == "Many tricks are up my sleeve,&to save yourself&you'd better leave!" ||
-      textStr == "I've learned this spell,&it's really neat,&I'll keep it later&for your treat!" ||
-      textStr == "Sale petit garnement,&tu fais erreur!&C'est maintenant que marque&ta dernière heure!" ||
-      textStr == "Gamin, ton destin achève,&sous mon sort tu périras!&Cette partie ne fut pas brève,&et cette mort, tu subiras!" ||
-      textStr == "Oh! It's @.&I was expecting someone called Sheik.&Do you know what happened to them?" ||
-      textStr == "Ah, c'est @.&J'attendais un certain Sheik.&Tu sais ce qui lui est arrivé?" ||
-      textStr == "They say \"Forgive me, but-^Your script will not be used.&....After all...^The one writing the rest of the script...&will be me.\"") {
-    needsAutomaticNewlines = false;
-  }
+static std::map<std::string, int> pixelWidthTable = {
+    { " ", 6 },  { "!", 6 },  { "\"", 5 },     { "#", 7 },  { "$", 7 },  { "%", 11 }, { "&", 9 },  { "\'", 3 },
+    { "(", 6 },  { ")", 6 },  { "*", 6 },      { "+", 7 },  { ",", 3 },  { "-", 5 },  { ".", 3 },  { "/", 7 },
+    { "0", 8 },  { "1", 4 },  { "2", 7 },      { "3", 7 },  { "4", 8 },  { "5", 7 },  { "6", 7 },  { "7", 7 },
+    { "8", 7 },  { "9", 7 },  { ":", 5 },      { ";", 5 },  { "<", 7 },  { "=", 9 },  { ">", 7 },  { "?", 9 },
+    { "@", 10 }, { "A", 9 },  { "B", 7 },      { "C", 9 },  { "D", 9 },  { "E", 6 },  { "F", 6 },  { "G", 9 },
+    { "H", 8 },  { "I", 3 },  { "J", 6 },      { "K", 8 },  { "L", 6 },  { "M", 10 }, { "N", 9 },  { "O", 10 },
+    { "P", 7 },  { "Q", 10 }, { "R", 8 },      { "S", 8 },  { "T", 7 },  { "U", 8 },  { "V", 9 },  { "W", 12 },
+    { "X", 9 },  { "Y", 8 },  { "Z", 8 },      { "[", 6 },  { "\\", 8 }, { "]", 6 },  { "^", 8 },  { "_", 7 },
+    { "`", 4 },  { "a", 6 },  { "b", 7 },      { "c", 6 },  { "d", 7 },  { "e", 7 },  { "f", 5 },  { "g", 7 },
+    { "h", 6 },  { "i", 3 },  { "j", 5 },      { "k", 6 },  { "l", 3 },  { "m", 9 },  { "n", 7 },  { "o", 7 },
+    { "p", 7 },  { "q", 7 },  { "r", 6 },      { "s", 6 },  { "t", 6 },  { "u", 6 },  { "v", 7 },  { "w", 9 },
+    { "x", 6 },  { "y", 7 },  { "z", 6 },      { "{", 6 },  { "¦", 4 },  { "}", 6 },  { "¡", 5 },  { "¢", 7 },
+    { "£", 8 },  { "¤", 7 },  { "¥", 8 },      { "|", 4 },  { "§", 12 }, { "¨", 12 }, { "©", 10 }, { "ª", 5 },
+    { "«", 8 },  { "¬", 7 },  { "\u00AD", 6 }, { "®", 10 }, { "¯", 8 },  { "°", 12 }, { "±", 12 }, { "²", 5 },
+    { "³", 5 },  { "µ", 6 },  { "¶", 8 },      { "·", 4 },  { "¹", 4 },  { "º", 5 },  { "»", 9 },  { "¼", 9 },
+    { "½", 9 },  { "¾", 10 }, { "¿", 7 },      { "À", 11 }, { "Á", 9 },  { "Â", 9 },  { "Ã", 9 },  { "Ä", 9 },
+    { "Å", 9 },  { "Æ", 12 }, { "Ç", 9 },      { "È", 6 },  { "É", 6 },  { "Ê", 6 },  { "Ë", 6 },  { "Ì", 5 },
+    { "Í", 5 },  { "Î", 5 },  { "Ï", 5 },      { "Ð", 10 }, { "Ñ", 9 },  { "Ò", 10 }, { "Ó", 10 }, { "Ô", 10 },
+    { "Õ", 10 }, { "Ö", 10 }, { "×", 9 },      { "Ø", 10 }, { "Ù", 8 },  { "Ú", 8 },  { "Û", 8 },  { "Ü", 8 },
+    { "Ý", 10 }, { "Þ", 8 },  { "ß", 7 },      { "à", 6 },  { "á", 6 },  { "â", 6 },  { "ã", 6 },  { "ä", 6 },
+    { "å", 6 },  { "æ", 11 }, { "ç", 6 },      { "è", 7 },  { "é", 7 },  { "ê", 7 },  { "ë", 7 },  { "ì", 5 },
+    { "í", 5 },  { "î", 5 },  { "ï", 5 },      { "ð", 7 },  { "ñ", 7 },  { "ò", 7 },  { "ó", 7 },  { "ô", 7 },
+    { "õ", 7 },  { "ö", 7 },  { "÷", 11 },     { "ø", 9 },  { "ù", 7 },  { "ú", 7 },  { "û", 7 },  { "ü", 7 },
+    { "ý", 8 },  { "þ", 8 },  { "ÿ", 8 },      { "Œ", 11 }, { "œ", 11 }, { "„", 5 },  { "”", 5 },  { "€", 10 },
+    { "Ÿ", 10 }, { "~", 8 }
+};
+
+static size_t NextLineLength(const std::string* textStr, const size_t lastNewline, bool hasIcon = false) {
+  const  size_t maxLinePixelWidth = hasIcon ? 200 : 216;
+
+
+  size_t totalPixelWidth = 0;
+  size_t currentPos = lastNewline;
+
+  // Looping through the string from the lastNewline until the total
+  // width of counted characters exceeds the maximum pixels in a line.
+  size_t nextPosJump = 0;
+  while (totalPixelWidth < maxLinePixelWidth && currentPos < textStr->length()) {
+    // Skip over control codes
+    if (textStr->at(currentPos) == '%') {
+      nextPosJump = 2;
+    } else if (textStr->at(currentPos) == '$') {
+      nextPosJump = 2;
+    } else if (textStr->at(currentPos) == '@') {
+      nextPosJump = 1;
+      // Assume worst case for player name 12 * 8 (widest character * longest name length)
+      totalPixelWidth += 96;
+    } else {
+      // Some characters only one byte while others are two bytes
+      // So check both possibilities when checking for a character
+      if (pixelWidthTable.count(textStr->substr(currentPos, 1))) {
+        totalPixelWidth += pixelWidthTable[textStr->substr(currentPos, 1)];
+        nextPosJump = 1;
+      } else if (pixelWidthTable.count(textStr->substr(currentPos, 2))) {
+        totalPixelWidth += pixelWidthTable[textStr->substr(currentPos, 2)];
+        nextPosJump = 2;
+      } else {
+        SPDLOG_DEBUG("Table does not contain " + textStr->substr(currentPos, 1) + "/" + textStr->substr(currentPos, 2));
+        SPDLOG_DEBUG("Full string: " + *textStr);
+        nextPosJump = 1;
+      }
+    }
+    currentPos += nextPosJump;
+  }
+  // return the total number of characters we looped through
+  if (totalPixelWidth > maxLinePixelWidth && textStr->at(currentPos - nextPosJump) != ' ') {
+    return currentPos - lastNewline - nextPosJump;
+  } else {
+    return currentPos - lastNewline;
+  }
+}
+
+Text AutoFormatHintText(const Text& unformattedHintText, const std::vector<std::string>& colors = {}) {
+    std::array<std::string, LANGUAGE_MAX> strings;
+    for (int i = 0; i < LANGUAGE_MAX; i++) {
+        std::string textStr = unformattedHintText.GetForLanguage(i);
+
+        for (const auto& color: colors) {
+          if (const size_t firstHashtag = textStr.find('#'); firstHashtag != std::string::npos) {
+            textStr.replace(firstHashtag, 1, color);
+            if (const size_t secondHashtag = textStr.find('#', firstHashtag + 1); secondHashtag != std::string::npos) {
+              textStr.replace(secondHashtag, 1, QM_WHITE);
+            } else {
+              SPDLOG_DEBUG("non-matching hashtags in string: \"%s\"", textStr);
+            }
+          }
+        }
+        // Remove any remaining '#' characters.
+        std::erase(textStr, '#');
 
-    if (needsAutomaticNewlines) {
         // insert newlines either manually or when encountering a '&'
-        constexpr size_t lineLength = 34;
         size_t lastNewline = 0;
+        const bool hasIcon = textStr.find('$', 0) != std::string::npos;
+        size_t lineLength = NextLineLength(&textStr, lastNewline, hasIcon);
         while (lastNewline + lineLength < textStr.length()) {
-            size_t carrot = textStr.find('^', lastNewline);
-            size_t ampersand = textStr.find('&', lastNewline);
-            size_t lastSpace = textStr.rfind(' ', lastNewline + lineLength);
-            size_t lastPeriod = textStr.rfind('.', lastNewline + lineLength);
+            const size_t carrot = textStr.find('^', lastNewline);
+            const size_t ampersand = textStr.find('&', lastNewline);
+            const size_t lastSpace = textStr.rfind(' ', lastNewline + lineLength);
+            const size_t lastPeriod = textStr.rfind('.', lastNewline + lineLength);
             // replace '&' first if it's within the newline range
             if (ampersand < lastNewline + lineLength) {
-                lastNewline = ampersand;
+                lastNewline = ampersand + 1;
                 // or move the lastNewline cursor to the next line if a '^' is encountered
             } else if (carrot < lastNewline + lineLength) {
                 lastNewline = carrot + 1;
@@ -186,15 +265,12 @@ Text AutoFormatHintText(Text unformattedHintText) {
                 textStr.replace(lastSpace, 1, "&");
                 lastNewline = lastSpace + 1;
             }
+          lineLength = NextLineLength(&textStr, lastNewline, hasIcon);
         }
+        strings[i] = textStr;
     }
 
-    // todo add colors (see `AddColorsAndFormat` in `custom_messages.cpp`)
-    textStr.erase(std::remove(textStr.begin(), textStr.end(), '#'), textStr.end());
-    strings[i] = textStr;
-  }
-
-  return Text(strings[0], strings[1], strings[2]);
+    return {strings[0], strings[1], ""/*spanish*/, strings[2]};
 }
 
 std::array<DungeonHintInfo, 10> dungeonInfoData;
@@ -220,67 +296,10 @@ std::string dampeHintLoc;
 std::string gregHintLoc;
 std::string sariaHintLoc;
 
-
-Text& GetChildAltarText() {
-  return childAltarText;
-}
-
-Text& GetAdultAltarText() {
-  return adultAltarText;
-}
-
 void SetGanonText(Text text){
   ganonText = text;
 }
 
-Text& GetGanonText() {
-  return ganonText;
-}
-
-Text& GetGanonHintText() {
-  return ganonHintText;
-}
-
-Text& GetDampeHintText() {
-  return dampesText;
-}
-
-Text& GetGregHintText() {
-  return gregText;
-}
-
-Text& GetSheikHintText() {
-  return sheikText;
-}
-
-Text& GetSariaHintText() {
-  return sariaText;
-}
-
-Text& GetWarpMinuetText() {
-  return warpMinuetText;
-}
-
-Text& GetWarpBoleroText() {
-  return warpBoleroText;
-}
-
-Text& GetWarpSerenadeText() {
-  return warpSerenadeText;
-}
-
-Text& GetWarpRequiemText() {
-  return warpRequiemText;
-}
-
-Text& GetWarpNocturneText() {
-  return warpNocturneText;
-}
-
-Text& GetWarpPreludeText() {
-  return warpPreludeText;
-}
-
 std::string GetMasterSwordHintLoc() {
     return masterSwordHintLoc;
 }
@@ -350,9 +369,9 @@ static void SetAllInRegionAsHinted(RandomizerArea area, std::vector<RandomizerCh
   }
 }
 
-static void AddGossipStoneHint(Text hint, 
+static void AddGossipStoneHint(Text hint,
                                 const RandomizerCheck gossipStone,
-                                const std::vector<uint8_t>& colors,
+                                const std::vector<std::string>& colors,
                                 HintType hintType,
                                 std::string distributionName,
                                 const RandomizerCheck hintedLocation) {
@@ -361,16 +380,16 @@ static void AddGossipStoneHint(Text hint,
   //GetLocation(gossipStone)->SetPlacedItem(gossipStone);
 
   auto ctx = Rando::Context::GetInstance();
-  ctx->AddHint((RandomizerHintKey)((gossipStone - RC_COLOSSUS_GOSSIP_STONE) + 1), AutoFormatHintText(hint), hintedLocation, hintType, distributionName, ctx->GetItemLocation(hintedLocation)->GetArea());
+  ctx->AddHint((RandomizerHintKey)((gossipStone - RC_COLOSSUS_GOSSIP_STONE) + 1), AutoFormatHintText(hint, colors), hintedLocation, hintType, distributionName, ctx->GetItemLocation(hintedLocation)->GetArea());
   ctx->GetItemLocation(gossipStone)->SetPlacedItem(RG_HINT); //RANDOTODO, better gossip stone to location to hint key system
 }
 
-static void AddGossipStoneHintCopies(uint8_t copies, 
-                                      Text hint, 
-                                      std::vector<uint8_t> colours, 
-                                      HintType type, 
+static void AddGossipStoneHintCopies(uint8_t copies,
+                                      Text hint,
+                                      std::vector<std::string> colours,
+                                      HintType type,
                                       std::string distributionName,
-                                      RandomizerCheck location = RC_UNKNOWN_CHECK, 
+                                      RandomizerCheck location = RC_UNKNOWN_CHECK,
                                       RandomizerCheck firstStone = RC_UNKNOWN_CHECK){
   if (firstStone != RC_UNKNOWN_CHECK && copies > 0){
       AddGossipStoneHint(hint, firstStone, colours, type, distributionName, location);
@@ -405,32 +424,32 @@ static bool CreateHint(RandomizerCheck hintedLocation, uint8_t copies, HintType
   //make hint text
   Text finalHint;
   Text prefix = ::Hint(RHT_PREFIX).GetText();
-  std::vector<uint8_t> colours;
+  std::vector<std::string> colours;
   if (type == HINT_TYPE_WOTH){
     Text areaText = ::Hint(ctx->GetItemLocation(hintedLocation)->GetArea()).GetText();
-    finalHint = prefix + "%r#" + areaText + "#%w" + ::Hint(RHT_WAY_OF_THE_HERO).GetText();
-    colours = {QM_LBLUE};
+    finalHint = prefix + "#" + areaText + "#" + ::Hint(RHT_WAY_OF_THE_HERO).GetText();
+    colours = {QM_RED, QM_LBLUE};
   }
   else if(type == HINT_TYPE_BARREN){
     Text areaText = ::Hint(ctx->GetItemLocation(hintedLocation)->GetArea()).GetText();
-    finalHint = prefix + ::Hint(RHT_PLUNDERING).GetText() + "%r#" + areaText + "#%w" + ::Hint(RHT_FOOLISH).GetText();
-    colours = {QM_PINK};
+    finalHint = prefix + ::Hint(RHT_PLUNDERING).GetText() + "#" + areaText + "#" + ::Hint(RHT_FOOLISH).GetText();
+    colours = {QM_RED, QM_PINK};
   }
   else {
     Text itemText = ctx->GetItemLocation(hintedLocation)->GetPlacedItem().GetHint().GetText();
     if (type == HINT_TYPE_ITEM_LOCATION){
       Text locationText = Rando::StaticData::GetLocation(hintedLocation)->GetHint()->GetText();
-      finalHint = prefix + "%r" + locationText + " %g#"+itemText+"#%w.";
-      colours = {QM_GREEN, QM_RED};
+      finalHint = prefix + locationText + " #"+itemText+"#.";
+      colours = {QM_RED, QM_GREEN};
     }
     else if (type == HINT_TYPE_ITEM_AREA){
       Text areaText = ::Hint(ctx->GetItemLocation(hintedLocation)->GetArea()).GetText();
       if (Rando::StaticData::GetLocation(hintedLocation)->IsDungeon()) {
-        finalHint = prefix+"%r#"+areaText+"#%w "+::Hint(RHT_HOARDS).GetText()+" %g#"+itemText+"#%w.";
-        colours = {QM_GREEN, QM_RED};
-      } else {
-        finalHint = prefix+"%r#"+itemText+"#%w "+::Hint(RHT_CAN_BE_FOUND_AT).GetText()+" %g#"+areaText+"#%w.";
+        finalHint = prefix+"#"+areaText+"# "+::Hint(RHT_HOARDS).GetText()+" #"+itemText+"#.";
         colours = {QM_RED, QM_GREEN};
+      } else {
+        finalHint = prefix+"#"+itemText+"# "+::Hint(RHT_CAN_BE_FOUND_AT).GetText()+" #"+areaText+"#.";
+        colours = {QM_GREEN, QM_RED};
       }
     }
     else{
@@ -451,7 +470,7 @@ static bool CreateHint(RandomizerCheck hintedLocation, uint8_t copies, HintType
 }
 
 
-static RandomizerCheck CreateRandomHint(std::vector<RandomizerCheck>& possibleHintLocations, 
+static RandomizerCheck CreateRandomHint(std::vector<RandomizerCheck>& possibleHintLocations,
                                         uint8_t copies,
                                         HintType type,
                                         std::string distributionName) {
@@ -488,7 +507,7 @@ static RandomizerCheck CreateRandomHint(std::vector<RandomizerCheck>& possibleHi
   return hintedLocation;
 }
 
-static std::vector<RandomizerCheck> FilterHintability(std::vector<RandomizerCheck>& locations, 
+static std::vector<RandomizerCheck> FilterHintability(std::vector<RandomizerCheck>& locations,
                                                       std::function<bool(RandomizerCheck)> extraFilter = NoFilter){
   auto ctx = Rando::Context::GetInstance();
   return FilterFromPool(locations, [extraFilter, ctx](const RandomizerCheck loc) {
@@ -595,10 +614,9 @@ void CreateGanonAndSheikText() {
       ganonHintText = ganonHintText + "!";
     }
 
-    //CreateMessageFromTextObject(0x70CC, 0, 2, 3, AddColorsAndFormat(ganonHintText));
     ctx->AddHint(RH_GANONDORF_HINT, AutoFormatHintText(ganonHintText), lightArrowLocation[0], HINT_TYPE_STATIC, "Static", lightArrowArea);
 
-    if(!ctx->GetOption(RSK_TRIAL_COUNT).Is(0)){
+    if (!ctx->GetOption(RSK_TRIAL_COUNT).Is(0)) {
       sheikText = ::Hint(RHT_SHEIK_LIGHT_ARROW_HINT).GetText() + LightArrowAreaText + "%w.";
       locsToCheck = {RC_GANONDORF_HINT, RC_SHEIK_HINT_GC, RC_SHEIK_HINT_MQ_GC};
 
@@ -622,11 +640,13 @@ void CreateGanonAndSheikText() {
 }
 
 //Find the location which has the given itemKey and create the generic altar text for the reward
-static Text BuildDungeonRewardText(const RandomizerGet itemKey, bool isChild) {
+static Text BuildDungeonRewardText(const ItemID itemID, const RandomizerGet itemKey) {
     auto ctx = Rando::Context::GetInstance();
     RandomizerCheck altarLoc = RC_ALTAR_HINT_ADULT;
-    if(isChild){altarLoc = RC_ALTAR_HINT_CHILD;}
-    RandomizerCheck location = FilterFromPool(ctx->allLocations, [itemKey, ctx](const RandomizerCheck loc) {
+    if (itemKey == RG_KOKIRI_EMERALD || itemKey == RG_GORON_RUBY || itemKey == RG_ZORA_SAPPHIRE) {
+      altarLoc = RC_ALTAR_HINT_CHILD;
+    }
+    const RandomizerCheck location = FilterFromPool(ctx->allLocations, [itemKey, ctx](const RandomizerCheck loc) {
         return ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == itemKey;
     })[0];
     if (IsReachableWithout({altarLoc}, location, true) || ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_END_OF_DUNGEON)){ //RANDOTODO check if works properly
@@ -636,9 +656,9 @@ static Text BuildDungeonRewardText(const RandomizerGet itemKey, bool isChild) {
     std::string rewardString = "$" + std::to_string(itemKey - RG_KOKIRI_EMERALD);
 
     // RANDOTODO implement colors for locations
-    return Text() + rewardString +
+    return Text() + rewardString + "#" +
            ::Hint(ctx->GetItemLocation(location)->GetArea()).GetText().Capitalize() +
-           "...^";
+           "#...^";
 }
 
 static Text BuildDoorOfTimeText() {
@@ -765,17 +785,17 @@ void CreateAltarText() {
     //Spiritual Stones
     // TODO: Starting Inventory Dungeon Rewards
         (/*StartingKokiriEmerald.Value<uint8_t>()*/false ? Text{ "##", "##", "##" }
-                                                : BuildDungeonRewardText(RG_KOKIRI_EMERALD, true)) +
+                                                : BuildDungeonRewardText(ITEM_KOKIRI_EMERALD, RG_KOKIRI_EMERALD)) +
         (/*StartingGoronRuby.Value<uint8_t>()*/false ? Text{ "##", "##", "##" }
-                                            : BuildDungeonRewardText(RG_GORON_RUBY, true)) +
+                                            : BuildDungeonRewardText(ITEM_GORON_RUBY, RG_GORON_RUBY)) +
         (/*StartingZoraSapphire.Value<uint8_t>()*/false ? Text{ "##", "##", "##" }
-                                              : BuildDungeonRewardText(RG_ZORA_SAPPHIRE, true)) +
+                                              : BuildDungeonRewardText(ITEM_ZORA_SAPPHIRE, RG_ZORA_SAPPHIRE)) +
     //How to open Door of Time, the event trigger is necessary to read the altar multiple times
     BuildDoorOfTimeText();
   } else {
     childAltarText = BuildDoorOfTimeText();
   }
-  ctx->AddHint(RH_ALTAR_CHILD, childAltarText, RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static");
+  ctx->AddHint(RH_ALTAR_CHILD, AutoFormatHintText(childAltarText, { QM_GREEN, QM_RED, QM_BLUE }), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static");
 
   //CreateMessageFromTextObject(0x7040, 0, 2, 3, AddColorsAndFormat(childAltarText, {QM_GREEN, QM_RED, QM_BLUE}));
 
@@ -785,17 +805,17 @@ void CreateAltarText() {
     adultAltarText = adultAltarText +
     //Medallion Areas
         (/*StartingLightMedallion.Value<uint8_t>()*/false ? Text{ "##", "##", "##" }
-                                                : BuildDungeonRewardText(RG_LIGHT_MEDALLION, false)) +
+                                                : BuildDungeonRewardText(ITEM_MEDALLION_LIGHT, RG_LIGHT_MEDALLION)) +
         (/*StartingForestMedallion.Value<uint8_t>()*/false ? Text{ "##", "##", "##" }
-                                                  : BuildDungeonRewardText(RG_FOREST_MEDALLION, false)) +
+                                                  : BuildDungeonRewardText(ITEM_MEDALLION_FOREST, RG_FOREST_MEDALLION)) +
         (/*StartingFireMedallion.Value<uint8_t>()*/false ? Text{ "##", "##", "##" }
-                                                : BuildDungeonRewardText(RG_FIRE_MEDALLION, false)) +
+                                                : BuildDungeonRewardText(ITEM_MEDALLION_FIRE, RG_FIRE_MEDALLION)) +
         (/*StartingWaterMedallion.Value<uint8_t>()*/false ? Text{ "##", "##", "##" }
-                                                : BuildDungeonRewardText(RG_WATER_MEDALLION, false)) +
+                                                : BuildDungeonRewardText(ITEM_MEDALLION_WATER, RG_WATER_MEDALLION)) +
         (/*StartingSpiritMedallion.Value<uint8_t>()*/false ? Text{ "##", "##", "##" }
-                                                  : BuildDungeonRewardText(RG_SPIRIT_MEDALLION, false)) +
+                                                  : BuildDungeonRewardText(ITEM_MEDALLION_SPIRIT, RG_SPIRIT_MEDALLION)) +
         (/*StartingShadowMedallion.Value<uint8_t>()*/false ? Text{ "##", "##", "##" }
-                                                  : BuildDungeonRewardText(RG_SHADOW_MEDALLION, false));
+                                                  : BuildDungeonRewardText(ITEM_MEDALLION_SHADOW, RG_SHADOW_MEDALLION));
   }
   adultAltarText = adultAltarText + 
   //Bridge requirement
@@ -807,35 +827,61 @@ void CreateAltarText() {
   //End
   ::Hint(RHT_ADULT_ALTAR_TEXT_END).GetText();
   //CreateMessageFromTextObject(0x7088, 0, 2, 3, AddColorsAndFormat(adultAltarText, {QM_RED, QM_YELLOW, QM_GREEN, QM_RED, QM_BLUE, QM_YELLOW, QM_PINK, QM_RED, QM_RED, QM_RED, QM_RED}));
-  ctx->AddHint(RH_ALTAR_ADULT, adultAltarText, RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static");
+  ctx->AddHint(RH_ALTAR_ADULT, AutoFormatHintText(adultAltarText, { QM_RED, QM_YELLOW, QM_GREEN, QM_RED, QM_BLUE, QM_YELLOW, QM_PINK, QM_RED, QM_RED, QM_RED, QM_RED }), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static");
 }
 
 void CreateMerchantsHints() {
     auto ctx = Rando::Context::GetInstance();
-    Text medigoronItemText = ctx->GetItemLocation(RC_GC_MEDIGORON)->GetPlacedItem().GetHint().GetText();
-    Text grannyItemText = ctx->GetItemLocation(RC_KAK_GRANNYS_SHOP)->GetPlacedItem().GetHint().GetText().Capitalize();
-    Text carpetSalesmanItemText =
-        ctx->GetItemLocation(RC_WASTELAND_BOMBCHU_SALESMAN)->GetPlacedItem().GetHint().GetText();
-    Text carpetSalesmanItemClearText =
-        ctx->GetItemLocation(RC_WASTELAND_BOMBCHU_SALESMAN)->GetPlacedItem().GetHint().GetClear();
-
+    Text beanSalesmanItemText, medigoronItemText, grannyItemText, carpetSalesmanItemText, carpetSalesmanAfterItemText;
+    if (ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ON_HINT)) {
+      RandomizerGet beanSalesmanItem = ctx->GetItemLocation(RC_ZR_MAGIC_BEAN_SALESMAN)->GetPlacedRandomizerGet();
+      beanSalesmanItemText = ctx->GetItemLocation(RC_ZR_MAGIC_BEAN_SALESMAN)->GetPlacedItem().GetHint().GetText();
+      if (beanSalesmanItem == RG_ICE_TRAP) {
+        beanSalesmanItemText = ctx->overrides[RC_ZR_MAGIC_BEAN_SALESMAN].GetTrickName();
+      }
+      RandomizerGet medigoronItem = ctx->GetItemLocation(RC_GC_MEDIGORON)->GetPlacedRandomizerGet();
+      medigoronItemText = ctx->GetItemLocation(RC_GC_MEDIGORON)->GetPlacedItem().GetHint().GetText();
+      if (medigoronItem == RG_ICE_TRAP) {
+        medigoronItemText = ctx->overrides[RC_GC_MEDIGORON].GetTrickName();
+      }
+      RandomizerGet grannyItem = ctx->GetItemLocation(RC_KAK_GRANNYS_SHOP)->GetPlacedRandomizerGet();
+      grannyItemText = ctx->GetItemLocation(RC_KAK_GRANNYS_SHOP)->GetPlacedItem().GetHint().GetText().Capitalize();
+      if (grannyItem == RG_ICE_TRAP) {
+        grannyItemText = ctx->overrides[RC_KAK_GRANNYS_SHOP].GetTrickName();
+      }
+      RandomizerGet carpetSalesmanItem = ctx->GetItemLocation(RC_WASTELAND_BOMBCHU_SALESMAN)->GetPlacedRandomizerGet();
+      carpetSalesmanItemText =
+          ctx->GetItemLocation(RC_WASTELAND_BOMBCHU_SALESMAN)->GetPlacedItem().GetHint().GetText();
+      if (carpetSalesmanItem == RG_ICE_TRAP) {
+        carpetSalesmanItemText = ctx->overrides[RC_WASTELAND_BOMBCHU_SALESMAN].GetTrickName();
+      }
+      carpetSalesmanAfterItemText = ::Hint(RHT_CARPET_SALESMAN_DIALOG_HINTED).GetText();
+    } else {
+      medigoronItemText = grannyItemText = carpetSalesmanItemText = hintTable[RHT_HINT_MYSTERIOUS].GetTextCopy();
+      carpetSalesmanAfterItemText = ::Hint(RHT_CARPET_SALESMAN_DIALOG_MYSTERIOUS).GetText();
+      beanSalesmanItemText = Text{ "mysterious item", "objet mystérieux", "objeto misterioso", "mysteriöser gegenstand" };
+    }
 
     Text medigoronText =
         ::Hint(RHT_MEDIGORON_DIALOG_FIRST).GetText() + medigoronItemText + ::Hint(RHT_MEDIGORON_DIALOG_SECOND).GetText();
-    Text grannyText = grannyItemText + ::Hint(RHT_GRANNY_DIALOG).GetText();
+    Text grannyText = Text{"#"} + grannyItemText + "#" + ::Hint(RHT_GRANNY_DIALOG).GetText();
     Text carpetSalesmanTextOne = ::Hint(RHT_CARPET_SALESMAN_DIALOG_FIRST).GetText() + carpetSalesmanItemText +
-                                 ::Hint(RHT_CARPET_SALESMAN_DIALOG_SECOND).GetText();
-    Text carpetSalesmanTextTwo = ::Hint(RHT_CARPET_SALESMAN_DIALOG_THIRD).GetText() + carpetSalesmanItemClearText +
-                                 ::Hint(RHT_CARPET_SALESMAN_DIALOG_FOURTH).GetText();
-    
-    // CreateMessageFromTextObject(0x9120, 0, 2, 3, AddColorsAndFormat(medigoronText, { QM_RED, QM_GREEN }));
-    // CreateMessageFromTextObject(0x9121, 0, 2, 3, AddColorsAndFormat(grannyText, { QM_RED, QM_GREEN }));
-    // CreateMessageFromTextObject(0x6077, 0, 2, 3, AddColorsAndFormat(carpetSalesmanTextOne, { QM_RED, QM_GREEN }));
-    // CreateMessageFromTextObject(0x6078, 0, 2, 3,
-                                // AddColorsAndFormat(carpetSalesmanTextTwo, { QM_RED, QM_YELLOW, QM_RED }));
-    // ctx->AddHint(RH_MEDIGORON, AutoFormatHintText(medigoronText), RC_GC_MEDIGORON, HINT_TYPE_STATIC, GetHintRegion(RR_GORON_CITY)->GetHint().GetText());
-    // ctx->AddHint(RH_GRANNYS_SHOP, AutoFormatHintText(grannyText), RC_KAK_GRANNYS_SHOP, HINT_TYPE_STATIC, GetHintRegion(RR_KAKARIKO_VILLAGE)->GetHint().GetText());
-    // ctx->AddHint(RH_WASTELAND_BOMBCHU_SALESMAN, AutoFormatHintText(carpetSalesmanTextOne), RC_WASTELAND_BOMBCHU_SALESMAN, HINT_TYPE_STATIC, GetHintRegion(RR_HAUNTED_WASTELAND)->GetHint().GetText());
+                                 carpetSalesmanAfterItemText;
+    Text carpetSalesmanTextTwo = ::Hint(RHT_CARPET_SALESMAN_DIALOG_FINAL).GetText();
+    medigoronText = AutoFormatHintText(medigoronText, {QM_GREEN, QM_YELLOW, QM_GREEN });
+    grannyText = AutoFormatHintText(grannyText, { QM_GREEN, QM_YELLOW, QM_GREEN });
+    carpetSalesmanTextOne = AutoFormatHintText(carpetSalesmanTextOne, { QM_GREEN, QM_RED, QM_YELLOW, QM_GREEN });
+
+    if (ctx->GetOption(RSK_SHUFFLE_MAGIC_BEANS)) {
+      Text beanSalesmanText = ::Hint(RHT_BEAN_SALESMAN_FIRST).GetText() + beanSalesmanItemText + ::Hint(RHT_BEAN_SALESMAN_SECOND).GetText();
+      ctx->AddHint(RH_BEAN_SALESMAN, AutoFormatHintText(beanSalesmanText, { QM_RED, QM_GREEN, QM_YELLOW, QM_GREEN }), RC_ZR_MAGIC_BEAN_SALESMAN, HINT_TYPE_STATIC, "Static", RA_ZORAS_RIVER);
+    }
+
+    ctx->AddHint(RH_MEDIGORON, medigoronText, RC_GC_MEDIGORON, HINT_TYPE_STATIC, "Static", RA_GORON_CITY);
+    ctx->AddHint(RH_GRANNYS_SHOP, grannyText, RC_KAK_GRANNYS_SHOP, HINT_TYPE_STATIC, "Static", RA_KAKARIKO_VILLAGE);
+    ctx->AddHint(RH_WASTELAND_BOMBCHU_SALESMAN, carpetSalesmanTextOne, RC_WASTELAND_BOMBCHU_SALESMAN, HINT_TYPE_STATIC, "Static", RA_HAUNTED_WASTELAND);
+    // Technically not a hint but this is probably the best place we have to store it for now.
+    ctx->AddHint(RH_WASTELAND_BOMBCHU_SALESMAN_POST, carpetSalesmanTextTwo, RC_WASTELAND_BOMBCHU_SALESMAN, HINT_TYPE_STATIC, "Static", RA_HAUNTED_WASTELAND);
 }
 
 //RANDOTODO add Better Links Pocket and starting item handling once more starting items are added
@@ -862,18 +908,8 @@ void CreateSpecialItemHint(uint32_t item, RandomizerHintKey hintKey, std::vector
 
 void CreateWarpSongTexts() {
   auto ctx = Rando::Context::GetInstance();
-  if (!ctx->GetOption(RSK_WARP_SONG_HINTS)) {
-    warpMinuetText = Text();
-    warpBoleroText = Text();
-    warpSerenadeText = Text();
-    warpRequiemText = Text();
-    warpNocturneText = Text();
-    warpPreludeText = Text();
-    return;
-  }
 
   auto warpSongEntrances = GetShuffleableEntrances(EntranceType::WarpSong, false);
-
   for (auto entrance : warpSongEntrances) {
     auto destination = entrance->GetConnectedRegion()->GetArea();
     Text resolvedHint = ::Hint(destination).GetText();
@@ -881,33 +917,31 @@ void CreateWarpSongTexts() {
     if (destination == RA_NONE) {
       resolvedHint = Text{"","",""} + entrance->GetConnectedRegion()->regionName;
     }
-
+    resolvedHint = ::Hint(RHT_WARP_TO).GetText() + resolvedHint + ::Hint(RHT_WARP_CHOICE).GetText();
+    RandomizerHintKey hintKey = RH_NONE;
     switch (entrance->GetIndex()) {
-      case 0x0600: // minuet RANDOTODO make an entrance enum and use it here
-        warpMinuetText = resolvedHint;
-        ctx->AddHint(RH_MINUET_WARP_LOC, resolvedHint, RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", destination);
+      case 0x0600: // minuet
+        hintKey = RH_MINUET_WARP_LOC;
         break;
       case 0x04F6: // bolero
-        warpBoleroText = resolvedHint;
-        ctx->AddHint(RH_BOLERO_WARP_LOC, resolvedHint, RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", destination);
+        hintKey = RH_BOLERO_WARP_LOC;
         break;
       case 0x0604: // serenade
-        warpSerenadeText = resolvedHint;
-        ctx->AddHint(RH_SERENADE_WARP_LOC, resolvedHint, RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", destination);
+        hintKey = RH_SERENADE_WARP_LOC;
         break;
       case 0x01F1: // requiem
-        warpRequiemText = resolvedHint;
-        ctx->AddHint(RH_REQUIEM_WARP_LOC, resolvedHint, RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", destination);
+        hintKey = RH_REQUIEM_WARP_LOC;
         break;
       case 0x0568: // nocturne
-          warpNocturneText = resolvedHint;
-          ctx->AddHint(RH_NOCTURNE_WARP_LOC, resolvedHint, RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", destination);
-          break;
+        hintKey = RH_NOCTURNE_WARP_LOC;
+        break;
       case 0x05F4: // prelude
-        warpPreludeText = resolvedHint;
-        ctx->AddHint(RH_PRELUDE_WARP_LOC, resolvedHint, RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", destination);
+        hintKey = RH_PRELUDE_WARP_LOC;
+        break;
+      default:
         break;
     }
+    ctx->AddHint(hintKey, AutoFormatHintText(resolvedHint, { QM_RED, QM_GREEN }), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", destination);
   }
 }
 
@@ -1071,6 +1105,19 @@ void CreateStoneHints() {
   GetAccessibleLocations({});
 }
 
+void CreateFrogsHint() {
+  const auto ctx = Rando::Context::GetInstance();
+  Rando::ItemLocation* itemLoc = ctx->GetItemLocation(RC_ZR_FROGS_OCARINA_GAME);
+  Text itemText = itemLoc->GetPlacedItem().GetHint().GetText();
+  if (itemLoc->GetPlacedRandomizerGet() == RG_ICE_TRAP) {
+    itemText = ctx->overrides[RC_ZR_FROGS_OCARINA_GAME].GetTrickName();
+  }
+  Text hintText = ::Hint(RHT_FROGS_HINT01).GetText() + itemText + ::Hint(RHT_FROGS_HINT02).GetText();
+  RandomizerArea area = itemLoc->GetArea();
+  itemLoc->SetAsHinted();
+  ctx->AddHint(RH_FROGS, AutoFormatHintText(hintText, { QM_GREEN }), RC_ZR_FROGS_OCARINA_GAME, HINT_TYPE_STATIC, "Static", area);
+}
+
 void CreateAllHints(){
   auto ctx = Rando::Context::GetInstance();
   CreateGanonAndSheikText();
@@ -1082,6 +1129,9 @@ void CreateAllHints(){
   if (ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ON_HINT)) {
     CreateMerchantsHints();
   }
+  if (ctx->GetOption(RSK_FROGS_HINT)) {
+    CreateFrogsHint();
+  }
   if (ctx->GetOption(RSK_GOSSIP_STONE_HINTS).IsNot(RO_GOSSIP_STONES_NONE)) {
     printf("\x1b[10;10HCreating Hints...");
     CreateStoneHints();
diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.hpp b/soh/soh/Enhancements/randomizer/3drando/hints.hpp
index d38dbf244..eb10ca0cc 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hints.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hints.hpp
@@ -217,23 +217,7 @@ extern std::array<ConditionalAlwaysHint, 10> conditionalAlwaysHints;
 extern void CreateAllHints();
 extern void CreateWarpSongTexts();
 
-
-Text& GetChildAltarText();
-Text& GetAdultAltarText();
-Text& GetGanonText();
 void SetGanonText(Text text);
-Text& GetGanonHintText();
-Text& GetDampeHintText();
-Text& GetGregHintText();
-Text& GetSheikHintText();
-Text& GetSariaHintText();
-
-Text& GetWarpMinuetText();
-Text& GetWarpBoleroText();
-Text& GetWarpSerenadeText();
-Text& GetWarpRequiemText();
-Text& GetWarpNocturneText();
-Text& GetWarpPreludeText();
 
 std::string GetMasterSwordHintLoc();
 std::string GetLightArrowHintLoc();
diff --git a/soh/soh/Enhancements/randomizer/3drando/pool_functions.hpp b/soh/soh/Enhancements/randomizer/3drando/pool_functions.hpp
index 1cb96c746..5a83cda5b 100644
--- a/soh/soh/Enhancements/randomizer/3drando/pool_functions.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/pool_functions.hpp
@@ -36,3 +36,7 @@ template <typename T, typename Container>
 bool ElementInContainer(T& element, const Container& container) {
   return std::find(container.begin(), container.end(), element) != container.end();
 }
+
+template <typename First, typename... T> bool IsAnyOf(First&& first, T&&... t) {
+  return ((first == t) || ...);
+}
diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
index 55192e7c5..7e73cefce 100644
--- a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
@@ -541,56 +541,6 @@ static void WriteShuffledEntrances() {
   }
 }
 
-std::string AutoFormatHintTextString(std::string unformattedHintTextString) {
-  std::string textStr = unformattedHintTextString;
-
-  // RANDOTODO: don't just make manual exceptions
-  bool needsAutomaicNewlines = true;
-  if (textStr == "Erreur 0x69a504:&Traduction manquante^C'est de la faute à Purple Hato!&J'vous jure!" ||
-      textStr == "Mon très cher @:&Viens vite au château, je t'ai préparé&un délicieux gâteau...^À bientôt, Princesse Zelda" ||
-      textStr == "What about Zelda makes you think&she'd be a better ruler than I?^I saved Lon Lon Ranch,&fed the hungry,&and my castle floats." ||
-      textStr == "Many tricks are up my sleeve,&to save yourself&you'd better leave!" ||
-      textStr == "I've learned this spell,&it's really neat,&I'll keep it later&for your treat!" ||
-      textStr == "Sale petit garnement,&tu fais erreur!&C'est maintenant que marque&ta dernière heure!" ||
-      textStr == "Gamin, ton destin achève,&sous mon sort tu périras!&Cette partie ne fut pas brève,&et cette mort, tu subiras!" ||
-      textStr == "Oh! It's @.&I was expecting someone called Sheik.&Do you know what happened to them?" ||
-      textStr == "Ah, c'est @.&J'attendais un certain Sheik.&Tu sais ce qui lui est arrivé?" ||
-      textStr == "They say \"Forgive me, but-^Your script will not be used.&....After all...^The one writing the rest of the script...&will be me.\"") {
-    needsAutomaicNewlines = false;
-  }
-
-  if (needsAutomaicNewlines) {
-    //insert newlines either manually or when encountering a '&'
-    constexpr size_t lineLength = 34;
-    size_t lastNewline = 0;
-    while (lastNewline + lineLength < textStr.length()) {
-      size_t carrot     = textStr.find('^', lastNewline);
-      size_t ampersand  = textStr.find('&', lastNewline);
-      size_t lastSpace  = textStr.rfind(' ', lastNewline + lineLength);
-      size_t lastPeriod = textStr.rfind('.', lastNewline + lineLength);
-      //replace '&' first if it's within the newline range
-      if (ampersand < lastNewline + lineLength) {
-        lastNewline = ampersand + 1;
-      //or move the lastNewline cursor to the next line if a '^' is encountered
-      } else if (carrot < lastNewline + lineLength) {
-        lastNewline = carrot + 1;
-      //some lines need to be split but don't have spaces, look for periods instead
-      } else if (lastSpace == std::string::npos) {
-        textStr.replace(lastPeriod, 1, ".&");
-        lastNewline = lastPeriod + 2;
-      } else {
-        textStr.replace(lastSpace, 1, "&");
-        lastNewline = lastSpace + 1;
-      }
-    }
-  }
-
-  // todo add colors (see `AddColorsAndFormat` in `custom_messages.cpp`)
-  textStr.erase(std::remove(textStr.begin(), textStr.end(), '#'), textStr.end());
-
-  return textStr;
-}
-
 Rando::ItemLocation* GetItemLocation(RandomizerGet item) {
     auto ctx = Rando::Context::GetInstance();
     return ctx->GetItemLocation(FilterFromPool(ctx->allLocations, [item, ctx](const RandomizerCheck loc) {
@@ -601,54 +551,17 @@ Rando::ItemLocation* GetItemLocation(RandomizerGet item) {
 // Writes the hints to the spoiler log, if they are enabled.
 static void WriteHints() {
     auto ctx = Rando::Context::GetInstance();
-    std::string unformattedGanonText;
-    std::string unformattedGanonHintText;
-    std::string unformattedDampesText;
-    std::string unformattedGregText;
-    std::string unformattedSheikText;
-    std::string unformattedSariaText;
-
-    switch (ctx->GetOption(RSK_LANGUAGE).GetSelectedOptionIndex()) {
-        case 0:
-        default:
-            unformattedGanonText = GetGanonText().GetEnglish();
-            unformattedGanonHintText = GetGanonHintText().GetEnglish();
-            unformattedDampesText = GetDampeHintText().GetEnglish();
-            unformattedGregText = GetGregHintText().GetEnglish();
-            unformattedSheikText = GetSheikHintText().GetEnglish();
-            unformattedSariaText = GetSariaHintText().GetEnglish();
-
-            if (ctx->GetOption(RSK_SHUFFLE_WARP_SONGS)){
-              jsonData["warpMinuetText"] = GetWarpMinuetText().GetEnglish();
-              jsonData["warpBoleroText"] = GetWarpBoleroText().GetEnglish();
-              jsonData["warpSerenadeText"] = GetWarpSerenadeText().GetEnglish();
-              jsonData["warpRequiemText"] = GetWarpRequiemText().GetEnglish();
-              jsonData["warpNocturneText"] = GetWarpNocturneText().GetEnglish();
-              jsonData["warpPreludeText"] = GetWarpPreludeText().GetEnglish();
-            }
-            jsonData["childAltar"]["hintText"] = GetChildAltarText().GetEnglish();
-            jsonData["adultAltar"]["hintText"] = GetAdultAltarText().GetEnglish();
-            break;
-        case 2:
-            unformattedGanonText = GetGanonText().GetFrench();
-            unformattedGanonHintText = GetGanonHintText().GetFrench();
-            unformattedDampesText = GetDampeHintText().GetFrench();
-            unformattedGregText = GetGregHintText().GetFrench();
-            unformattedSheikText = GetSheikHintText().GetFrench();
-            unformattedSariaText = GetSariaHintText().GetFrench();
-
-            if (ctx->GetOption(RSK_SHUFFLE_WARP_SONGS)){
-              jsonData["warpMinuetText"] = GetWarpMinuetText().GetFrench();
-              jsonData["warpBoleroText"] = GetWarpBoleroText().GetFrench();
-              jsonData["warpSerenadeText"] = GetWarpSerenadeText().GetFrench();
-              jsonData["warpRequiemText"] = GetWarpRequiemText().GetFrench();
-              jsonData["warpNocturneText"] = GetWarpNocturneText().GetFrench();
-              jsonData["warpPreludeText"] = GetWarpPreludeText().GetFrench();
-            }
-            jsonData["childAltar"]["hintText"] = GetChildAltarText().GetFrench();
-            jsonData["adultAltar"]["hintText"] = GetAdultAltarText().GetFrench();
-            break;
+    int language = ctx->GetOption(RSK_LANGUAGE).GetSelectedOptionIndex();
+    if (ctx->GetOption(RSK_SHUFFLE_WARP_SONGS)) {
+        jsonData["warpMinuetText"] = ctx->GetHint(RH_MINUET_WARP_LOC)->GetText().GetForLanguage(language);
+        jsonData["warpBoleroText"] = ctx->GetHint(RH_BOLERO_WARP_LOC)->GetText().GetForLanguage(language);
+        jsonData["warpSerenadeText"] = ctx->GetHint(RH_SERENADE_WARP_LOC)->GetText().GetForLanguage(language);
+        jsonData["warpRequiemText"] = ctx->GetHint(RH_REQUIEM_WARP_LOC)->GetText().GetForLanguage(language);
+        jsonData["warpNocturneText"] = ctx->GetHint(RH_NOCTURNE_WARP_LOC)->GetText().GetForLanguage(language);
+        jsonData["warpPreludeText"] = ctx->GetHint(RH_PRELUDE_WARP_LOC)->GetText().GetForLanguage(language);
     }
+    jsonData["childAltar"]["hintText"] = ctx->GetHint(RH_ALTAR_CHILD)->GetText().GetForLanguage(language);
+    jsonData["adultAltar"]["hintText"] = ctx->GetHint(RH_ALTAR_ADULT)->GetText().GetForLanguage(language);
 
     Rando::ItemLocation* emeraldLoc = GetItemLocation(RG_KOKIRI_EMERALD);
     Rando::ItemLocation* rubyLoc = GetItemLocation(RG_GORON_RUBY);
@@ -682,35 +595,28 @@ static void WriteHints() {
     jsonData["adultAltar"]["rewards"]["lightMedallionLoc"] =
         Rando::StaticData::GetLocation(lightMedallionLoc->GetRandomizerCheck())->GetName();
 
-    std::string ganonText = AutoFormatHintTextString(unformattedGanonText);
-    std::string ganonHintText = AutoFormatHintTextString(unformattedGanonHintText);
-    std::string dampesText = AutoFormatHintTextString(unformattedDampesText);
-    std::string gregText = AutoFormatHintTextString(unformattedGregText);
-    std::string sheikText = AutoFormatHintTextString(unformattedSheikText);
-    std::string sariaText = AutoFormatHintTextString(unformattedSariaText);
-
-    jsonData["ganonText"] = ganonText;
+    jsonData["ganonText"] = ctx->GetHint(RH_GANONDORF_NOHINT)->GetText().GetForLanguage(language);
     if (ctx->GetOption(RSK_LIGHT_ARROWS_HINT)){
-      jsonData["ganonHintText"] = ganonHintText;
+      jsonData["ganonHintText"] = ctx->GetHint(RH_GANONDORF_HINT)->GetText().GetForLanguage(language);
       jsonData["lightArrowHintLoc"] = GetLightArrowHintLoc();
       jsonData["lightArrowArea"] = ::Hint(ctx->GetHint(RH_GANONDORF_HINT)->GetHintedArea()).GetText().GetEnglish();
       jsonData["masterSwordHintLoc"] = GetMasterSwordHintLoc();
       if (!ctx->GetOption(RSK_TRIAL_COUNT).Is(0)) {
-          jsonData["sheikText"] = sheikText;
+          jsonData["sheikText"] = ctx->GetHint(RH_SHEIK_LIGHT_ARROWS)->GetText().GetForLanguage(language);
       }
     }
     if (ctx->GetOption(RSK_DAMPES_DIARY_HINT)){
-      jsonData["dampeText"] = dampesText;
+      jsonData["dampeText"] = ctx->GetHint(RH_DAMPES_DIARY)->GetText().GetForLanguage(language);
       jsonData["dampeHintLoc"] = GetDampeHintLoc();
       jsonData["dampeRegion"] = ::Hint(ctx->GetHint(RH_DAMPES_DIARY)->GetHintedArea()).GetText().GetEnglish();
     }
     if (ctx->GetOption(RSK_GREG_HINT)){
-      jsonData["gregText"] = gregText;
+      jsonData["gregText"] = ctx->GetHint(RH_GREG_RUPEE)->GetText().GetForLanguage(language);
       jsonData["gregLoc"] = GetGregHintLoc();
       jsonData["gregRegion"] = ::Hint(ctx->GetHint(RH_GREG_RUPEE)->GetHintedArea()).GetText().GetEnglish();
     }
     if (ctx->GetOption(RSK_SARIA_HINT)){
-      jsonData["sariaText"] = sariaText;
+      jsonData["sariaText"] = ctx->GetHint(RH_SARIA)->GetText().GetForLanguage(language);
       jsonData["sariaHintLoc"] = GetSariaHintLoc();
       jsonData["sariaRegion"] = ::Hint(ctx->GetHint(RH_SARIA)->GetHintedArea()).GetText().GetEnglish();
     }
@@ -721,17 +627,7 @@ static void WriteHints() {
     for (const RandomizerCheck key : Rando::StaticData::gossipStoneLocations) { //RANDOTODO should be merged with static hints, iterate over hint keys
         Rando::Hint* hint = ctx->GetHint((RandomizerHintKey)(key - RC_COLOSSUS_GOSSIP_STONE + 1));
         Rando::ItemLocation* hintedLocation = ctx->GetItemLocation(hint->GetHintedLocation());
-        std::string hintTextString;
-        switch (ctx->GetOption(RSK_LANGUAGE).GetSelectedOptionIndex()) {
-            case 0:
-            default:
-                hintTextString = hint->GetText().GetEnglish();
-                break;
-            case 2:
-                hintTextString = hint->GetText().GetFrench();
-                break;
-        }
-
+        std::string hintTextString = hint->GetText().GetForLanguage(language);
         HintType hintType = hint->GetHintType();
 
          std::string textStr = hintTextString;
diff --git a/soh/soh/Enhancements/randomizer/3drando/text.hpp b/soh/soh/Enhancements/randomizer/3drando/text.hpp
index e5c872ae4..cb6d763db 100644
--- a/soh/soh/Enhancements/randomizer/3drando/text.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/text.hpp
@@ -12,8 +12,14 @@ public:
     Text(std::string english_, std::string french_, std::string spanish_)
       : english(std::move(english_)),
         french(std::move(french_)),
-        spanish(std::move(spanish_)) {}
-    Text(std::string english_) : english(std::move(english_)), french(std::move("")), spanish(std::move("")) {}
+        spanish(std::move(spanish_)),
+        german(std::move("")) {}
+    Text(std::string english_, std::string french_, std::string spanish_, std::string german_)
+      : english(std::move(english_)),
+        french(std::move(french_)),
+        spanish(std::move(spanish_)),
+        german(std::move(german_)) {}
+    Text(std::string english_) : english(std::move(english_)), french(std::move("")), spanish(std::move("")), german(std::move("")) {}
 
     const std::string& GetEnglish() const {
         return english;
@@ -33,6 +39,13 @@ public:
         return english;
     }
 
+    const std::string& GetGerman() const {
+        if (german.length() > 0) {
+            return german;
+        }
+        return english;
+    }
+
     const std::string& GetForLanguage(uint8_t language) const {
         switch (language) {
             case LANGUAGE_ENG:
@@ -40,17 +53,19 @@ public:
             case LANGUAGE_FRA:
                 return french;
             case LANGUAGE_GER:
+                return german;
             default:
-                return english; // TODO: German
+                return english;
         }
     }
 
     Text operator+ (const Text& right) const {
-        return Text{english + right.GetEnglish(), french + right.GetFrench(), spanish + right.GetSpanish()};
+        return Text{english + right.GetEnglish(), french + right.GetFrench(), spanish + right.GetSpanish(),
+            german + right.GetGerman()};
     }
 
     Text operator+ (const std::string& right) const {
-        return Text{english + right, french + right, spanish + right};
+        return Text{english + right, french + right, spanish + right, german + right};
     }
 
     bool operator==(const Text& right) const {
@@ -58,7 +73,7 @@ public:
     }
 
     bool operator==(const std::string& right) const {
-        return english == right || french == right || spanish == right;
+        return english == right || french == right || spanish == right || german == right;
     }
 
     bool operator!=(const Text& right) const {
@@ -67,7 +82,7 @@ public:
 
     void Replace(std::string oldStr, std::string newStr) {
 
-        for (std::string* str : {&english, &french, &spanish}) {
+        for (std::string* str : {&english, &french, &spanish, &german}) {
             size_t position = str->find(oldStr);
             while (position != std::string::npos) {
               str->replace(position, oldStr.length(), newStr);
@@ -79,7 +94,7 @@ public:
     // Convert first char to upper case
     Text Capitalize(void) const {
         Text cap = *this + "";
-        for (std::string* str : {&cap.english, &cap.french, &cap.spanish}) {
+        for (std::string* str : {&cap.english, &cap.french, &cap.spanish, &cap.german}) {
             (*str)[0] = std::toupper((*str)[0]);
         }
         return cap;
@@ -87,7 +102,7 @@ public:
 
     //find the appropriate bars that separate singular from plural
     void SetForm(int form) {
-        for (std::string* str : {&english, &french, &spanish}) {
+        for (std::string* str : {&english, &french, &spanish, &german}) {
 
             size_t firstBar = str->find('|');
             if (firstBar != std::string::npos) {
@@ -114,4 +129,5 @@ public:
     std::string english = "";
     std::string french = "";
     std::string spanish = "";
+    std::string german = "";
 };
diff --git a/soh/soh/Enhancements/randomizer/context.cpp b/soh/soh/Enhancements/randomizer/context.cpp
index 32a3c63fa..602a21c4f 100644
--- a/soh/soh/Enhancements/randomizer/context.cpp
+++ b/soh/soh/Enhancements/randomizer/context.cpp
@@ -42,7 +42,7 @@ Context::Context() {
         { "Item Location", HINT_TYPE_ITEM_LOCATION },
         { "Junk", HINT_TYPE_JUNK },
     };
-    
+
     mSpoilerfileAreaNameToEnum = {
         {"No Hint", RA_NONE},
         {"Link's Pocket", RA_LINKS_POCKET},
@@ -423,187 +423,97 @@ void Context::ParseItemLocationsJson(nlohmann::json spoilerFileJson) {
     }
 }
 
-std::string AltarIconString(const char iconChar) {
-    std::string iconString;
-    iconString += '\x13';
-    switch (iconChar) {
-        case '0':
-            // Kokiri Emerald
-            iconString += '\x6C';
-            break;
-        case '1':
-            // Goron Ruby
-            iconString += '\x6D';
-            break;
-        case '2':
-            // Zora Sapphire
-            iconString += '\x6E';
-            break;
-        case '3':
-            // Forest Medallion
-            iconString += '\x66';
-            break;
-        case '4':
-            // Fire Medallion
-            iconString += '\x67';
-            break;
-        case '5':
-            // Water Medallion
-            iconString += '\x68';
-            break;
-        case '6':
-            // Spirit Medallion
-            iconString += '\x69';
-            break;
-        case '7':
-            // Shadow Medallion
-            iconString += '\x6A';
-            break;
-        case '8':
-            // Light Medallion
-            iconString += '\x6B';
-            break;
-        case 'o':
-            // Open DOT (master sword)
-            iconString += '\x3C';
-            break;
-        case 'c':
-            // Closed DOT (fairy ocarina)
-            iconString += '\x07';
-            break;
-        case 'i':
-            // Intended DOT (oot)
-            iconString += '\x08';
-            break;
-        case 'l':
-            // Light Arrow (for bridge reqs)
-            iconString += '\x12';
-            break;
-        case 'b':
-            // Boss Key (ganon boss key location)
-            iconString += '\x74';
-            break;
-        case 'L':
-            // Bow with Light Arrow
-            iconString += '\x3A';
-            break;
-        case 'k':
-            // Kokiri Tunic
-            iconString += '\x41';
-            break;
-        default:
-            break;
-    }
-    return iconString;
-}
-
-std::string FormatJsonHintText(const std::string& jsonHint) {
-    std::string formattedHintMessage = jsonHint;
-
-    // add icons to altar text
-    for (const char iconChar : { '0', '1', '2', '3', '4', '5', '6', '7', '8', 'o', 'c', 'i', 'l', 'b', 'L', 'k' }) {
-        std::string textToReplace = "$";
-        textToReplace += iconChar;
-        if (const size_t start_pos = formattedHintMessage.find(textToReplace); start_pos != std::string::npos) {
-            std::string iconString = AltarIconString(iconChar);
-            formattedHintMessage.replace(start_pos, textToReplace.length(), iconString);
-        }
-    }
-    return formattedHintMessage;
-}
-
 void Context::ParseHintJson(nlohmann::json spoilerFileJson) {
     // Child Altar
-    std::string childAltarJsonText = spoilerFileJson["childAltar"]["hintText"].get<std::string>();
-    std::string formattedChildAltarText = FormatJsonHintText(childAltarJsonText);
-    AddHint(RH_ALTAR_CHILD, Text(formattedChildAltarText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static");
+    std::string childAltarText = spoilerFileJson["childAltar"]["hintText"].get<std::string>();
+    AddHint(RH_ALTAR_CHILD, Text(childAltarText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", RA_NONE);
     mEmeraldLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["childAltar"]["rewards"]["emeraldLoc"]];
     mRubyLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["childAltar"]["rewards"]["rubyLoc"]];
     mSapphireLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["childAltar"]["rewards"]["sapphireLoc"]];
 
     // Adult Altar
-    std::string adultAltarJsonText = spoilerFileJson["adultAltar"]["hintText"].get<std::string>();
-    std::string formattedAdultAltarText = FormatJsonHintText(adultAltarJsonText);
-    AddHint(RH_ALTAR_ADULT, Text(formattedAdultAltarText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static");
+    std::string adultAltarText = spoilerFileJson["adultAltar"]["hintText"].get<std::string>();
+    AddHint(RH_ALTAR_ADULT, Text(adultAltarText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", RA_NONE);
     mForestMedallionLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["forestMedallionLoc"].get<std::string>()];
     mFireMedallionLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["fireMedallionLoc"].get<std::string>()];
     mWaterMedallionLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["waterMedallionLoc"].get<std::string>()];
     mShadowMedallionLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["shadowMedallionLoc"].get<std::string>()];
     mSpiritMedallionLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["spiritMedallionLoc"].get<std::string>()];
     mLightMedallionLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["lightMedallionLoc"].get<std::string>()];
-    
+
     // Ganondorf and Sheik Light Arrow Hints
-    std::string ganonHintText = FormatJsonHintText(spoilerFileJson["ganonHintText"].get<std::string>());
+    std::string ganonHintText = spoilerFileJson["ganonHintText"].get<std::string>();
     RandomizerCheck lightArrowLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["lightArrowHintLoc"].get<std::string>()];
     std::string lightArrowRegion = spoilerFileJson["lightArrowArea"].get<std::string>();
     AddHint(RH_GANONDORF_HINT, Text(ganonHintText), lightArrowLoc, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[lightArrowRegion]);
     if (spoilerFileJson.contains("sheikText")) {
-        std::string sheikText = FormatJsonHintText(spoilerFileJson["sheikText"].get<std::string>());
+        std::string sheikText = spoilerFileJson["sheikText"].get<std::string>();
         AddHint(RH_SHEIK_LIGHT_ARROWS, Text(sheikText), lightArrowLoc, HINT_TYPE_STATIC, lightArrowRegion);
     }
-    std::string ganonText = FormatJsonHintText(spoilerFileJson["ganonText"].get<std::string>());
+    std::string ganonText = spoilerFileJson["ganonText"].get<std::string>();
     AddHint(RH_GANONDORF_NOHINT, Text(ganonText), RC_UNKNOWN_CHECK, HINT_TYPE_JUNK, "Static", RA_GANONS_CASTLE);
-    
+
     // Dampe Hookshot Hint
     if (spoilerFileJson.contains("dampeText")) {
-        std::string dampeText = FormatJsonHintText(spoilerFileJson["dampeText"].get<std::string>());
+        std::string dampeText = spoilerFileJson["dampeText"].get<std::string>();
         std::string dampeRegion = spoilerFileJson["dampeRegion"].get<std::string>();
         RandomizerCheck dampeHintLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["dampeHintLoc"].get<std::string>()];
         AddHint(RH_DAMPES_DIARY, Text(dampeText), dampeHintLoc, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[dampeRegion]);
     }
-    
+
     // Greg Hint
     if (spoilerFileJson.contains("gregText")) {
-        std::string gregText = FormatJsonHintText(spoilerFileJson["gregText"].get<std::string>());
+        std::string gregText = spoilerFileJson["gregText"].get<std::string>();
         std::string gregRegion = spoilerFileJson["gregRegion"].get<std::string>();
         RandomizerCheck gregLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["gregLoc"].get<std::string>()];
         AddHint(RH_GREG_RUPEE, Text(gregText), gregLoc, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[gregRegion]);
     }
-    
+
     // Saria Magic Hint
     if (spoilerFileJson.contains("sariaText")) {
-        std::string sariaText = FormatJsonHintText(spoilerFileJson["sariaText"].get<std::string>());
+        std::string sariaText = spoilerFileJson["sariaText"].get<std::string>();
         std::string sariaRegion = spoilerFileJson["sariaRegion"].get<std::string>();
         RandomizerCheck sariaHintLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["sariaHintLoc"].get<std::string>()];
         AddHint(RH_SARIA, Text(sariaText), sariaHintLoc, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[sariaRegion]);
     }
-    
+
     // Warp Songs
     if (spoilerFileJson.contains("warpMinuetText")) {
-        std::string warpMinuetText = FormatJsonHintText(spoilerFileJson["warpMinuetText"].get<std::string>()); //RANDOTODO fall back for if location is used
+        std::string warpMinuetText = spoilerFileJson["warpMinuetText"].get<std::string>(); //RANDOTODO fall back for if location is used
         AddHint(RH_MINUET_WARP_LOC, Text(warpMinuetText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[warpMinuetText]);
     }
     if (spoilerFileJson.contains("warpBoleroText")) {
-        std::string warpBoleroText = FormatJsonHintText(spoilerFileJson["warpBoleroText"].get<std::string>());
+        std::string warpBoleroText = spoilerFileJson["warpBoleroText"].get<std::string>();
         AddHint(RH_BOLERO_WARP_LOC, Text(warpBoleroText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[warpBoleroText]);
     }
     if (spoilerFileJson.contains("warpSerenadeText")) {
-        std::string warpSerenadeText = FormatJsonHintText(spoilerFileJson["warpSerenadeText"].get<std::string>());
+        std::string warpSerenadeText = spoilerFileJson["warpSerenadeText"].get<std::string>();
         AddHint(RH_SERENADE_WARP_LOC, Text(warpSerenadeText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[warpSerenadeText]);
     }
     if (spoilerFileJson.contains("warpRequiemText")) {
-        std::string warpRequiemText = FormatJsonHintText(spoilerFileJson["warpRequiemText"].get<std::string>());
+        std::string warpRequiemText = spoilerFileJson["warpRequiemText"].get<std::string>();
         AddHint(RH_REQUIEM_WARP_LOC, Text(warpRequiemText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[warpRequiemText]);
     }
     if (spoilerFileJson.contains("warpNocturneText")) {
-        std::string warpNocturneText = FormatJsonHintText(spoilerFileJson["warpNocturneText"].get<std::string>());
+        std::string warpNocturneText = spoilerFileJson["warpNocturneText"].get<std::string>();
         AddHint(RH_NOCTURNE_WARP_LOC, Text(warpNocturneText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[warpNocturneText]);
     }
     if (spoilerFileJson.contains("warpPreludeText")) {
-        std::string warpPreludeText = FormatJsonHintText(spoilerFileJson["warpPreludeText"].get<std::string>());
+        std::string warpPreludeText = spoilerFileJson["warpPreludeText"].get<std::string>();
         AddHint(RH_PRELUDE_WARP_LOC, Text(warpPreludeText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[warpPreludeText]);
     }
-    
+
     // Gossip Stones
     nlohmann::json hintsJson = spoilerFileJson["hints"];
     for (auto it = hintsJson.begin(); it != hintsJson.end(); ++it) {
         RandomizerCheck gossipStoneLoc = mSpoilerfileCheckNameToEnum[it.key()];
         nlohmann::json hintInfo = it.value();
-        std::string hintText = FormatJsonHintText(hintInfo["hint"].get<std::string>());
+        std::string hintText = hintInfo["hint"].get<std::string>();
         HintType hintType = mSpoilerfileHintTypeNameToEnum[hintInfo["type"].get<std::string>()];
         RandomizerCheck hintedLocation = hintInfo.contains("location") ? mSpoilerfileCheckNameToEnum[hintInfo["location"]] : RC_UNKNOWN_CHECK;
-        std::string hintedArea = hintInfo.contains("area") ? hintInfo["area"].get<std::string>() : "";
-        AddHint(static_cast<RandomizerHintKey>(gossipStoneLoc - RC_COLOSSUS_GOSSIP_STONE + 1), Text(hintText), hintedLocation, hintType, hintedArea);
+        RandomizerArea hintedArea = hintInfo.contains("area") ? mSpoilerfileAreaNameToEnum[hintInfo["area"].get<std::string>()] : RA_NONE;
+        std::string distribution = hintInfo["distribution"].get<std::string>();
+        AddHint(static_cast<RandomizerHintKey>(gossipStoneLoc - RC_COLOSSUS_GOSSIP_STONE + 1), Text(hintText), hintedLocation, hintType, distribution, hintedArea);
     }
 }
 
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index 840c474a1..9a5aaf858 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -297,7 +297,7 @@ void Randomizer::LoadHintMessages() {
         CustomMessage("{{message}}", "{{message}}", "{{message}}"));
     CustomMessageManager::Instance->CreateMessage(
         Randomizer::hintMessageTableID, TEXT_SARIAS_SONG_FACE_TO_FACE,
-        CustomMessage(ctx->GetHint(RH_SARIA)->GetText().GetEnglish(), ctx->GetHint(RH_SARIA)->GetText().GetEnglish(), ctx->GetHint(RH_SARIA)->GetText().GetFrench(), TEXTBOX_TYPE_BLUE));
+        CustomMessage(ctx->GetHint(RH_SARIA)->GetText().GetEnglish(), ctx->GetHint(RH_SARIA)->GetText().GetGerman(), ctx->GetHint(RH_SARIA)->GetText().GetFrench(), TEXTBOX_TYPE_BLUE));
 
     for (int i : Rando::StaticData::gossipStoneLocations) {
         RandomizerHintKey rhk = RandomizerHintKey(i - RC_COLOSSUS_GOSSIP_STONE + 1);
@@ -329,19 +329,34 @@ void Randomizer::LoadHintMessages() {
         );
         CustomMessageManager::Instance->CreateMessage(
             Randomizer::randoMiscHintsTableID, TEXT_FROGS_UNDERWATER,
-            CustomMessage("Some frogs holding&%g{{item}}%w&are looking at you from underwater...",
-            "Unter Wasser gibt es Frösche,&die %g{{item}}%w&bei sich haben und Dich neugierig&beobachten...",
-            "Des grenouilles se trouvant&sous l'eau vous fixent attentivement,&tenant fermement&%g{{item}}%w.", TEXTBOX_TYPE_BLUE)
+            CustomMessage(ctx->GetHint(RH_FROGS)->GetText().GetEnglish(),
+                ctx->GetHint(RH_FROGS)->GetText().GetGerman(),
+                ctx->GetHint(RH_FROGS)->GetText().GetFrench(), TEXTBOX_TYPE_BLUE)
         );
-        CustomMessageManager::Instance->CreateMessage(
-            Randomizer::randoMiscHintsTableID, TEXT_SARIAS_SONG_FACE_TO_FACE,
-            CustomMessage("{{message}}", "{{message}}", "{{message}}", TEXTBOX_TYPE_BLUE)
-        );
-
-    CustomMessageManager::Instance->CreateMessage(Randomizer::hintMessageTableID, TEXT_WARP_RANDOM_REPLACED_TEXT,
-        CustomMessage("Warp to&{{location}}?\x1B&%gOK&No%w\x02",
-        "Zu {{location}}?\x1B&%gOK&No%w\x02",
-        "Se téléporter vers&{{location}}?\x1B&%gOK!&Non%w\x02"));
+    CustomMessageManager::Instance->CreateMessage(Randomizer::randoMiscHintsTableID, TEXT_WARP_MINUET_OF_FOREST,
+        CustomMessage(ctx->GetHint(RH_MINUET_WARP_LOC)->GetText().GetEnglish(),
+            ctx->GetHint(RH_MINUET_WARP_LOC)->GetText().GetGerman(),
+            ctx->GetHint(RH_MINUET_WARP_LOC)->GetText().GetFrench()));
+    CustomMessageManager::Instance->CreateMessage(Randomizer::randoMiscHintsTableID, TEXT_WARP_BOLERO_OF_FIRE,
+        CustomMessage(ctx->GetHint(RH_BOLERO_WARP_LOC)->GetText().GetEnglish(),
+            ctx->GetHint(RH_BOLERO_WARP_LOC)->GetText().GetGerman(),
+            ctx->GetHint(RH_BOLERO_WARP_LOC)->GetText().GetFrench()));
+    CustomMessageManager::Instance->CreateMessage(Randomizer::randoMiscHintsTableID, TEXT_WARP_SERENADE_OF_WATER,
+        CustomMessage(ctx->GetHint(RH_SERENADE_WARP_LOC)->GetText().GetEnglish(),
+            ctx->GetHint(RH_SERENADE_WARP_LOC)->GetText().GetGerman(),
+            ctx->GetHint(RH_SERENADE_WARP_LOC)->GetText().GetFrench()));
+    CustomMessageManager::Instance->CreateMessage(Randomizer::randoMiscHintsTableID, TEXT_WARP_REQUIEM_OF_SPIRIT,
+        CustomMessage(ctx->GetHint(RH_REQUIEM_WARP_LOC)->GetText().GetEnglish(),
+            ctx->GetHint(RH_REQUIEM_WARP_LOC)->GetText().GetGerman(),
+            ctx->GetHint(RH_REQUIEM_WARP_LOC)->GetText().GetFrench()));
+    CustomMessageManager::Instance->CreateMessage(Randomizer::randoMiscHintsTableID, TEXT_WARP_NOCTURNE_OF_SHADOW,
+        CustomMessage(ctx->GetHint(RH_NOCTURNE_WARP_LOC)->GetText().GetEnglish(),
+            ctx->GetHint(RH_NOCTURNE_WARP_LOC)->GetText().GetGerman(),
+            ctx->GetHint(RH_NOCTURNE_WARP_LOC)->GetText().GetFrench()));
+    CustomMessageManager::Instance->CreateMessage(Randomizer::randoMiscHintsTableID, TEXT_WARP_PRELUDE_OF_LIGHT,
+        CustomMessage(ctx->GetHint(RH_PRELUDE_WARP_LOC)->GetText().GetEnglish(),
+            ctx->GetHint(RH_PRELUDE_WARP_LOC)->GetText().GetGerman(),
+            ctx->GetHint(RH_PRELUDE_WARP_LOC)->GetText().GetFrench()));
 
     // Bow Shooting Gallery reminder
     CustomMessageManager::Instance->CreateMessage(Randomizer::hintMessageTableID, TEXT_SHOOTING_GALLERY_MAN_COME_BACK_WITH_BOW,
@@ -394,6 +409,7 @@ std::unordered_map<RandomizerGet, EnGirlAShopItem> randomizerGetToEnGirlShopItem
 };
 
 void Randomizer::LoadMerchantMessages() {
+    auto ctx = Rando::Context::GetInstance();
     CustomMessageManager::Instance->ClearMessageTable(Randomizer::merchantMessageTableID);
     CustomMessageManager::Instance->AddCustomMessageTable(Randomizer::merchantMessageTableID);
 
@@ -408,12 +424,9 @@ void Randomizer::LoadMerchantMessages() {
             "\x12\x38\x82" "J'abandonne! Tu veux bien m'acheter&un %g{{item}}%w?&Ça fera %r{{price}} Rubis%w!\x07\x10\xA3"));
     CustomMessageManager::Instance->CreateMessage(
         Randomizer::merchantMessageTableID, TEXT_BEAN_SALESMAN_BUY_FOR_10,
-        CustomMessage("I tried to be a %rmagic bean%w salesman,&but it turns out my marketing skills&weren't worth "
-            "beans!^Anyway, want to buy my&%gmysterious item%w for 60 Rupees?\x1B&%gYes&No%w",
-            "Möchten Sie einen geheimnisvollen&Gegenstand für 60 Rubine?\x1B&%gJa&Nein%w",
-            "J'ai essayé d'être un vendeur de&%rharicots magiques%w, mais j'étais&mauvais au niveau du marketing et&ça "
-            "me courait sur le haricot...^Enfin bref, ça te dirait de m'acheter un&"
-            "%gobjet mystérieux%w pour 60 Rubis?\x1B&%gOui&Non%w"));
+        CustomMessage(ctx->GetHint(RH_BEAN_SALESMAN)->GetText().GetEnglish(),
+            ctx->GetHint(RH_BEAN_SALESMAN)->GetText().GetGerman(),
+            ctx->GetHint(RH_BEAN_SALESMAN)->GetText().GetFrench()));
 
 
     //Setup for merchant text boxes
@@ -421,51 +434,30 @@ void Randomizer::LoadMerchantMessages() {
     //RANDOTODO: Implement obscure/ambiguous hints
     CustomMessageManager::Instance->CreateMessage(
         Randomizer::merchantMessageTableID, TEXT_MEDIGORON,
-        CustomMessage("How about buying %g&{{item}}%w for %y200 rupees%w?\x1B&%gYes&No%w",
-            "Wie wäre es mit %g&{{item}}%w für %y200 Rubine?%w\x1B&%gJa!&Nein!%w",
-            "Veux-tu acheter %g&{{item}}%w pour %y200 rubis?%w\x1B&%gOui&Non&w"));
+        CustomMessage(ctx->GetHint(RH_MEDIGORON)->GetText().GetEnglish(),
+            ctx->GetHint(RH_MEDIGORON)->GetText().GetGerman(),
+            ctx->GetHint(RH_MEDIGORON)->GetText().GetFrench()));
 
     //Granny Shopy
     //RANDOTODO: Implement obscure/ambiguous hints
     CustomMessageManager::Instance->CreateMessage(
         Randomizer::merchantMessageTableID, TEXT_GRANNYS_SHOP,
-        CustomMessage("%g{{item}}%w!&How about %y100 rupees%w?\x1B&%gYes&No%w",
-            "%g{{item}}%w!&Wie wäre es mit %y100 Rubine?%w\x1B&%gJa!&Nein!%w",
-            "%g{{item}}%w!&Que dis-tu de %y100 rubis?%w\x1B&%gOui&Non&w"));
+        CustomMessage(ctx->GetHint(RH_GRANNYS_SHOP)->GetText().GetEnglish(),
+            ctx->GetHint(RH_GRANNYS_SHOP)->GetText().GetGerman(),
+            ctx->GetHint(RH_GRANNYS_SHOP)->GetText().GetFrench()));
 
     //Carpet Salesman
     //RANDOTODO: Implement obscure/ambiguous hints
-    std::vector<std::string> cgBoxTwoText;
-    if (Randomizer::GetRandoSettingValue(RSK_SHUFFLE_MERCHANTS) == RO_SHUFFLE_MERCHANTS_ON_HINT) {
-        cgBoxTwoText = {
-            "!%w&It's real, I promise!&A lonely man such as myself&wouldn't %rlie%w to you, hmm?^",
-            "!%w&Ich kann versichern es ist ein&aufrichtiges Angebot!^Ein einsamer Mann wie ich würde dich&doch nicht %ranlügen%w, oder?^",
-            "!%w&C'est vrai! J'te jure!&Un gars comme moi ne te %rmentirai%w pas&tu ne crois pas?^"
-        };
-    } else {
-        cgBoxTwoText = {
-            "!%w&I won't tell you what it is until I see&the money...^",
-            "!%w&Erst kommt das Geld, dann die Ware...^",
-            "!%w&Je ne te dirai pas ce que c'est avant&d'être payé rubis sur l'ongle...^"
-            };
-        }
-        CustomMessageManager::Instance->CreateMessage(
-            Randomizer::merchantMessageTableID, TEXT_CARPET_SALESMAN_1,
-            CustomMessage("Welcome!^I am selling stuff, strange and rare, &from all over the world to "
-                          "everybody.&Today's special is...^%g{{item}}" +
-                              cgBoxTwoText[0] + "How about %y200 Rupees?%w\x1B&&%gYes&No%w",
-                          "Sei gegrüßt!^Ich verkaufe allerlei Kuriorisäten.&Stets sonderliche und seltene Ware&aus "
-                          "aller Welt für jedermann.&Das heutige Angebot bleibt...^%g{{item}}" +
-                              cgBoxTwoText[1] + "Wie wäre es mit %y200 Rubinen?%w\x1B&&%gJa!&Nein!%w",
-                          "Bienvenue!^Je vends des trucs étranges et rares,&de partout dans le monde et à tout "
-                          "le&monde! L'objet du jour est...^%g{{item}}" +
-                              cgBoxTwoText[2] + "Alors, marché conclu pour %y200 rubis?%w\x1B&&%gOui&Non%w"));
-
-        CustomMessageManager::Instance->CreateMessage(
-            Randomizer::merchantMessageTableID, TEXT_CARPET_SALESMAN_2,
-            CustomMessage("Finally! Now I can go back to being &an %rarms dealer%w!",
-              "Endlich! Schon bald kann ich wieder &%rKrabbelminen-Händler%w sein!",
-              "Squalala! Je vais enfin pouvoir &%rprendre des vacances%w!"));
+    CustomMessageManager::Instance->CreateMessage(
+        Randomizer::merchantMessageTableID, TEXT_CARPET_SALESMAN_1,
+        CustomMessage(ctx->GetHint(RH_WASTELAND_BOMBCHU_SALESMAN)->GetText().GetEnglish(),
+            ctx->GetHint(RH_WASTELAND_BOMBCHU_SALESMAN)->GetText().GetGerman(),
+            ctx->GetHint(RH_WASTELAND_BOMBCHU_SALESMAN)->GetText().GetFrench()));
+    CustomMessageManager::Instance->CreateMessage(
+        Randomizer::merchantMessageTableID, TEXT_CARPET_SALESMAN_2,
+        CustomMessage(ctx->GetHint(RH_WASTELAND_BOMBCHU_SALESMAN_POST)->GetText().GetEnglish(),
+            ctx->GetHint(RH_WASTELAND_BOMBCHU_SALESMAN_POST)->GetText().GetGerman(),
+            ctx->GetHint(RH_WASTELAND_BOMBCHU_SALESMAN_POST)->GetText().GetFrench()));
 
         // Each shop item has two messages, one for when the cursor is over it, and one for when you select it and are
         // prompted buy/don't buy
@@ -1145,7 +1137,7 @@ GetItemID Randomizer::GetItemIdFromRandomizerGet(RandomizerGet randoGet, GetItem
             return GI_HEART_PIECE_WIN;
         case RG_TREASURE_GAME_GREEN_RUPEE:
             return GI_RUPEE_GREEN_LOSE;
-        
+
         //Ocarina Buttons
         case RG_OCARINA_A_BUTTON:
             return (GetItemID)RG_OCARINA_A_BUTTON;
@@ -2368,77 +2360,6 @@ void RandomizerSettingsWindow::UpdateElement() {
     }
 }
 
-CustomMessage Randomizer::GetWarpSongMessage(u16 textId, bool mysterious) {
-    CustomMessage messageEntry = CustomMessageManager::Instance->RetrieveMessage(
-        Randomizer::hintMessageTableID, TEXT_WARP_RANDOM_REPLACED_TEXT);
-    if (mysterious) {
-        std::array<const char*, LANGUAGE_MAX> locationName ={
-            "a mysterious place",
-            "ein mysteriöser Ort",
-            "un endroit mystérieux",
-        };
-
-        messageEntry.Replace("{{location}}", locationName[0],
-            locationName[1], locationName[2]);
-        return messageEntry;
-    }
-
-    auto ctx = Rando::Context::GetInstance();
-    RandomizerHintKey locHintKey = RH_NONE;
-    switch (textId) {
-        case TEXT_WARP_MINUET_OF_FOREST:
-            locHintKey = RH_MINUET_WARP_LOC;
-            break;
-        case TEXT_WARP_BOLERO_OF_FIRE:
-            locHintKey = RH_BOLERO_WARP_LOC;
-            break;
-        case TEXT_WARP_SERENADE_OF_WATER:
-            locHintKey = RH_SERENADE_WARP_LOC;
-            break;
-        case TEXT_WARP_REQUIEM_OF_SPIRIT:
-            locHintKey = RH_REQUIEM_WARP_LOC;
-            break;
-        case TEXT_WARP_NOCTURNE_OF_SHADOW:
-            locHintKey = RH_NOCTURNE_WARP_LOC;
-            break;
-        case TEXT_WARP_PRELUDE_OF_LIGHT:
-            locHintKey = RH_PRELUDE_WARP_LOC;
-            break;
-    }
-    std::string locationName = "";
-    switch (gSaveContext.language) {
-        case LANGUAGE_FRA:
-            locationName = ctx->GetHint(locHintKey)->GetText().GetFrench();
-            break;
-        case LANGUAGE_ENG:
-        default:
-            locationName = ctx->GetHint(locHintKey)->GetText().GetEnglish();
-            break;
-    }
-
-    messageEntry.Replace("{{location}}", std::move(locationName));
-    return messageEntry;
-}
-
-CustomMessage Randomizer::GetFrogsMessage(u16 originalTextId) {
-    auto ctx = Rando::Context::GetInstance();
-    CustomMessage messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::randoMiscHintsTableID, originalTextId);
-        RandomizerGet frogsGet = ctx->GetItemLocation(RC_ZR_FROGS_OCARINA_GAME)->GetPlacedRandomizerGet();
-        std::array<std::string, LANGUAGE_MAX> frogItemName;
-        if (frogsGet == RG_ICE_TRAP) {
-            frogsGet = ctx->overrides[RC_ZR_FROGS_OCARINA_GAME].LooksLike();
-            frogItemName = {
-                ctx->overrides[RC_ZR_FROGS_OCARINA_GAME].GetTrickName().english,
-                ctx->overrides[RC_ZR_FROGS_OCARINA_GAME].GetTrickName().french,
-                ctx->overrides[RC_ZR_FROGS_OCARINA_GAME].GetTrickName().english
-            };
-        } else {
-            frogItemName = EnumToSpoilerfileGetName[frogsGet];
-        }
-        messageEntry.Replace("{{item}}", std::move(frogItemName[0]), std::move(frogItemName[1]), std::move(frogItemName[2]));
-        return messageEntry;
-}
-
 CustomMessage Randomizer::GetSheikMessage(s16 scene, u16 originalTextId) {
     auto ctx = Rando::Context::GetInstance();
     CustomMessage messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::hintMessageTableID, originalTextId);
diff --git a/soh/soh/Enhancements/randomizer/randomizer.h b/soh/soh/Enhancements/randomizer/randomizer.h
index b188cd421..0949f91cb 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.h
+++ b/soh/soh/Enhancements/randomizer/randomizer.h
@@ -58,9 +58,7 @@ class Randomizer {
     GetItemID GetItemIdFromRandomizerGet(RandomizerGet randoGet, GetItemID ogItemId);
     ItemObtainability GetItemObtainabilityFromRandomizerCheck(RandomizerCheck randomizerCheck);
     ItemObtainability GetItemObtainabilityFromRandomizerGet(RandomizerGet randomizerCheck);
-    CustomMessage GetWarpSongMessage(u16 textId, bool mysterious = false);
     CustomMessage GetSheikMessage(s16 scene, u16 originalTextId);
-    CustomMessage GetFrogsMessage(u16 originalTextId);
     CustomMessage GetSariaMessage(u16 originalTextId);
     CustomMessage GetMerchantMessage(RandomizerInf randomizerInf, u16 textId, bool mysterious = false);
     CustomMessage GetCursedSkullMessage(s16 params);
diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h
index 9cb8d9ef5..1a2d628ac 100644
--- a/soh/soh/Enhancements/randomizer/randomizerTypes.h
+++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@@ -1951,9 +1951,11 @@ typedef enum {
     RH_GANONDORF_NOHINT,
     RH_DAMPES_DIARY,
     RH_GREG_RUPEE,
+    RH_BEAN_SALESMAN,
     RH_MEDIGORON,
     RH_GRANNYS_SHOP,
     RH_WASTELAND_BOMBCHU_SALESMAN,
+    RH_WASTELAND_BOMBCHU_SALESMAN_POST,
     RH_ALTAR_CHILD,
     RH_ALTAR_ADULT,
     RH_SARIA,
@@ -1964,6 +1966,7 @@ typedef enum {
     RH_REQUIEM_WARP_LOC,
     RH_NOCTURNE_WARP_LOC,
     RH_PRELUDE_WARP_LOC,
+    RH_FROGS,
     RH_MAX,
 } RandomizerHintKey;
 
@@ -3050,6 +3053,7 @@ typedef enum {
     RHT_BUY_RED_POTION_50,
     RHT_TRIFORCE,
     RHT_HINT,
+    RHT_HINT_MYSTERIOUS,
     RHT_TYCOON_WALLET,
     RHT_HOOKSHOT,
     RHT_LONGSHOT,
@@ -3276,6 +3280,10 @@ typedef enum {
     RHT_GREG_HINT02,
     RHT_SARIA_TEXT01,
     RHT_SARIA_TEXT02,
+    RHT_WARP_TO,
+    RHT_WARP_CHOICE,
+    RHT_FROGS_HINT01,
+    RHT_FROGS_HINT02,
     // Ganon Line
     RHT_GANON_LINE01,
     RHT_GANON_LINE02,
@@ -3289,12 +3297,14 @@ typedef enum {
     RHT_GANON_LINE10,
     RHT_GANON_LINE11,
     // Merchants
+    RHT_BEAN_SALESMAN_FIRST,
+    RHT_BEAN_SALESMAN_SECOND,
     RHT_MEDIGORON_DIALOG_FIRST,
     RHT_MEDIGORON_DIALOG_SECOND,
     RHT_CARPET_SALESMAN_DIALOG_FIRST,
-    RHT_CARPET_SALESMAN_DIALOG_SECOND,
-    RHT_CARPET_SALESMAN_DIALOG_THIRD,
-    RHT_CARPET_SALESMAN_DIALOG_FOURTH,
+    RHT_CARPET_SALESMAN_DIALOG_MYSTERIOUS,
+    RHT_CARPET_SALESMAN_DIALOG_HINTED,
+    RHT_CARPET_SALESMAN_DIALOG_FINAL,
     RHT_GRANNY_DIALOG,
     RHT_MAX
 } RandomizerHintTextKey;
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
index 013a8fc9a..6f4ffe305 100644
--- a/soh/soh/OTRGlobals.cpp
+++ b/soh/soh/OTRGlobals.cpp
@@ -2585,15 +2585,7 @@ extern "C" int CustomMessage_RetrieveIfExists(PlayState* play) {
                     (Randomizer_GetSettingValue(RSK_SHUFFLE_ADULT_TRADE) || INV_CONTENT(ITEM_CLAIM_CHECK) == ITEM_CLAIM_CHECK)) ||
           (textId == TEXT_CARPET_SALESMAN_1 && !Flags_GetRandomizerInf(RAND_INF_MERCHANTS_CARPET_SALESMAN)) ||
           (textId == TEXT_CARPET_SALESMAN_2 && !Flags_GetRandomizerInf(RAND_INF_MERCHANTS_CARPET_SALESMAN)))) {
-            RandomizerInf randoInf;
-            if (textId == TEXT_MEDIGORON) {
-                randoInf = RAND_INF_MERCHANTS_MEDIGORON;
-            } else if (textId == TEXT_GRANNYS_SHOP) {
-                randoInf = RAND_INF_MERCHANTS_GRANNYS_SHOP;
-            } else {
-                randoInf = RAND_INF_MERCHANTS_CARPET_SALESMAN;
-            }
-            messageEntry = OTRGlobals::Instance->gRandomizer->GetMerchantMessage(randoInf, textId, Randomizer_GetSettingValue(RSK_SHUFFLE_MERCHANTS) != RO_SHUFFLE_MERCHANTS_ON_HINT);
+            messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::merchantMessageTableID, textId);
         } else if (Randomizer_GetSettingValue(RSK_BOMBCHUS_IN_LOGIC) &&
                    (textId == TEXT_BUY_BOMBCHU_10_DESC || textId == TEXT_BUY_BOMBCHU_10_PROMPT)) {
             messageEntry = CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, textId);
@@ -2611,7 +2603,7 @@ extern "C" int CustomMessage_RetrieveIfExists(PlayState* play) {
             messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::randoMiscHintsTableID, TEXT_CHEST_GAME_PROCEED);
         } else if (Randomizer_GetSettingValue(RSK_SHUFFLE_WARP_SONGS) &&
                    (textId >= TEXT_WARP_MINUET_OF_FOREST && textId <= TEXT_WARP_PRELUDE_OF_LIGHT)) {
-            messageEntry = OTRGlobals::Instance->gRandomizer->GetWarpSongMessage(textId, Randomizer_GetSettingValue(RSK_WARP_SONG_HINTS) == RO_GENERIC_OFF);
+            messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::randoMiscHintsTableID, textId);
         } else if (textId == TEXT_LAKE_HYLIA_WATER_SWITCH_NAVI || textId == TEXT_LAKE_HYLIA_WATER_SWITCH_SIGN) {
             messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::hintMessageTableID, textId);
         } else if (textId == TEXT_SHOOTING_GALLERY_MAN_COME_BACK_WITH_BOW) {
@@ -2620,7 +2612,7 @@ extern "C" int CustomMessage_RetrieveIfExists(PlayState* play) {
             u16 choice = Random(0, NUM_GORON_MESSAGES);
             messageEntry = OTRGlobals::Instance->gRandomizer->GetGoronMessage(choice);
         } else if (Randomizer_GetSettingValue(RSK_FROGS_HINT) && textId == TEXT_FROGS_UNDERWATER) {
-            messageEntry = OTRGlobals::Instance->gRandomizer->GetFrogsMessage(textId);
+            messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::randoMiscHintsTableID, textId);
         } else if (Randomizer_GetSettingValue(RSK_SARIA_HINT)) {
             if ((gPlayState->sceneNum == SCENE_SACRED_FOREST_MEADOW && textId == TEXT_SARIA_SFM) || (textId >= TEXT_SARIAS_SONG_FACE_TO_FACE && textId <= TEXT_SARIAS_SONG_CHANNELING_POWER)) {
             messageEntry = OTRGlobals::Instance->gRandomizer->GetSariaMessage(textId);
diff --git a/soh/soh/SaveManager.cpp b/soh/soh/SaveManager.cpp
index 328d24be7..83d648039 100644
--- a/soh/soh/SaveManager.cpp
+++ b/soh/soh/SaveManager.cpp
@@ -339,7 +339,7 @@ void SaveManager::LoadRandomizerVersion3() {
                         "french", randoContext->GetItemOverride(i).GetTrickName().french);
                 });
             }
-            uint16_t price = 0; 
+            uint16_t price = 0;
             SaveManager::Instance->LoadData("price", price, (uint16_t)0);
             if (price > 0) {
                 // Technically an item with a custom price (scrub/shopsanity) could have
@@ -385,11 +385,11 @@ void SaveManager::LoadRandomizerVersion3() {
         SaveManager::Instance->LoadStruct("", [&]() {
             RandomizerHintKey rhk = RH_NONE;
             SaveManager::Instance->LoadData("hintKey", rhk);
-            std::string english, french;
+            std::string english, french, german;
             SaveManager::Instance->LoadStruct("hintText", [&]() {
                 SaveManager::Instance->LoadData("english", english);
                 SaveManager::Instance->LoadData("french", french);
-                // TODO: German Hint Translations
+                SaveManager::Instance->LoadData("german", german);
             });
             RandomizerCheck rc = RC_UNKNOWN_CHECK;
             SaveManager::Instance->LoadData("hintedCheck", rc);
@@ -397,7 +397,7 @@ void SaveManager::LoadRandomizerVersion3() {
             SaveManager::Instance->LoadData("hintType", ht);
             RandomizerArea savedArea;
             SaveManager::Instance->LoadData("hintedArea", savedArea);
-            randoContext->AddHint(rhk, Text(english, french, english), rc, ht, "Unknown", savedArea);//RANDOTODO, maybe store and load distrabution, but it's a string...
+            randoContext->AddHint(rhk, Text(english, french, /*spanish*/"", german), rc, ht, "Unknown", savedArea);//RANDOTODO, maybe store and load distrabution, but it's a string...
         });
     });
 
@@ -479,8 +479,7 @@ void SaveManager::SaveRandomizer(SaveContext* saveContext, int sectionID, bool f
             SaveManager::Instance->SaveStruct("hintText", [&]() {
                 SaveManager::Instance->SaveData("english", hint->GetText().GetEnglish());
                 SaveManager::Instance->SaveData("french", hint->GetText().GetFrench());
-                SaveManager::Instance->SaveData("german", hint->GetText().GetEnglish());
-                // TODO: German Translation of hints
+                SaveManager::Instance->SaveData("german", hint->GetText().GetGerman());
             });
             SaveManager::Instance->SaveData("hintedCheck", hint->GetHintedLocation());
             SaveManager::Instance->SaveData("hintType", hint->GetHintType());
@@ -1113,13 +1112,13 @@ void SaveManager::SaveFileThreaded(int fileNum, SaveContext* saveContext, int se
     if (std::filesystem::exists(fileName)) {
         std::filesystem::remove(fileName);
     }
-    
+
 #if defined(__SWITCH__) || defined(__WIIU__)
     copy_file(tempFile.c_str(), fileName.c_str());
 #else
     std::filesystem::copy_file(tempFile, fileName);
 #endif
-    
+
     if (std::filesystem::exists(tempFile)) {
         std::filesystem::remove(tempFile);
     }

From eb5f7688f8d855e19e76728f0d317abefb562434 Mon Sep 17 00:00:00 2001
From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Date: Wed, 10 Jan 2024 15:44:11 +0000
Subject: [PATCH 064/230] Add more static hints (#3543)

* WIP biggoron and big poes hint

* commit v0 of biggoron and big poes hints

* adjust for settings update

* Add more hints

* Finish extra Basic Static Hints

* remove vestigial code

* Forgot to remove this

* try to fix windows build

* fix build post conflcit res

* remove StaticHintData as redundent

* last cleanup
---
 .../custom-message/CustomMessageManager.cpp   |   5 +
 .../custom-message/CustomMessageManager.h     |   2 +
 .../custom-message/CustomMessageTypes.h       |  50 ++++-
 .../randomizer/3drando/hint_list.cpp          |  30 ++-
 .../Enhancements/randomizer/3drando/hints.cpp |  82 +++-----
 .../Enhancements/randomizer/3drando/hints.hpp |   6 +-
 .../randomizer/3drando/spoiler_log.cpp        |  12 +-
 .../Enhancements/randomizer/3drando/text.hpp  |   8 +-
 .../randomizer/option_descriptions.cpp        |  14 +-
 .../Enhancements/randomizer/randomizer.cpp    | 197 ++++++++++++++----
 soh/soh/Enhancements/randomizer/randomizer.h  |   7 +-
 .../Enhancements/randomizer/randomizerTypes.h |   6 +
 soh/soh/Enhancements/randomizer/settings.cpp  |  73 ++++++-
 soh/soh/OTRGlobals.cpp                        |  38 +++-
 soh/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c |  35 ++--
 15 files changed, 416 insertions(+), 149 deletions(-)

diff --git a/soh/soh/Enhancements/custom-message/CustomMessageManager.cpp b/soh/soh/Enhancements/custom-message/CustomMessageManager.cpp
index 377ea2e75..92c13e85f 100644
--- a/soh/soh/Enhancements/custom-message/CustomMessageManager.cpp
+++ b/soh/soh/Enhancements/custom-message/CustomMessageManager.cpp
@@ -42,6 +42,11 @@ CustomMessage::CustomMessage(std::string english_, std::string german_, std::str
       position(position_) {
 }
 
+CustomMessage::CustomMessage(Text text, TextBoxType type_,TextBoxPosition position_)
+    : english(text.GetEnglish()), german(text.GetGerman()), french(text.GetFrench()), type(type_),
+      position(position_) {
+}
+
 const std::string& CustomMessage::GetEnglish() const {
     return english;
 }
diff --git a/soh/soh/Enhancements/custom-message/CustomMessageManager.h b/soh/soh/Enhancements/custom-message/CustomMessageManager.h
index 58639e423..9c5cc92ee 100644
--- a/soh/soh/Enhancements/custom-message/CustomMessageManager.h
+++ b/soh/soh/Enhancements/custom-message/CustomMessageManager.h
@@ -6,6 +6,7 @@
 
 #include "../../../include/z64item.h"
 #include "../../../include/message_data_textbox_types.h"
+#include "../randomizer/3drando/text.hpp"
 
 #undef MESSAGE_END
 
@@ -29,6 +30,7 @@ class CustomMessage {
     CustomMessage() = default;
     CustomMessage(std::string english_, std::string german_, std::string french_,
                   TextBoxType type_ = TEXTBOX_TYPE_BLACK, TextBoxPosition position_ = TEXTBOX_POS_BOTTOM);
+    CustomMessage(Text text, TextBoxType type_ = TEXTBOX_TYPE_BLACK, TextBoxPosition position_ = TEXTBOX_POS_BOTTOM);
 
     static std::string MESSAGE_END() ;
     static std::string ITEM_OBTAINED(uint8_t x) ;
diff --git a/soh/soh/Enhancements/custom-message/CustomMessageTypes.h b/soh/soh/Enhancements/custom-message/CustomMessageTypes.h
index 39fa9edbc..d8c66ce7d 100644
--- a/soh/soh/Enhancements/custom-message/CustomMessageTypes.h
+++ b/soh/soh/Enhancements/custom-message/CustomMessageTypes.h
@@ -1,7 +1,15 @@
 #pragma once
 
 typedef enum {
-    TEXT_CURSED_SKULLTULA_PEOPLE = 0x0022,
+    TEXT_SKULLTULA_PEOPLE_CURSE_BROKEN = 0x0021,
+    TEXT_SKULLTULA_PEOPLE_IM_CURSED = 0x0022,
+    TEXT_SKULLTULA_PEOPLE_WELL_BE_CAREFUL = 0x0023,
+    TEXT_SKULLTULA_PEOPLE_STARTING_TO_WEAKEN = 0x0024,
+    TEXT_SKULLTULA_PEOPLE_WE_LOOK_LIKE_THIS = 0x0025,
+    TEXT_SKULLTULA_PEOPLE_GS_TUTORIAL = 0x0026,
+    TEXT_SKULLTULA_PEOPLE_MAKE_YOU_VERY_RICH = 0x0027, 
+    TEXT_SKULLTULA_PEOPLE_CURSE_HAS_BEEN_BROKEN = 0x0028,
+    TEXT_SKULLTULA_PEOPLE_SAVING_MY_KIDS = 0x0029,
     TEXT_ITEM_KEY_SMALL = 0x0060,
     TEXT_ITEM_DUNGEON_MAP = 0x0066,
     TEXT_CHEST_GAME_REAL_GAMBLER = 0x006E,
@@ -67,6 +75,7 @@ typedef enum {
     TEXT_SARIAS_SONG_CHANNELING_POWER = 0x016D,
     TEXT_LAKE_HYLIA_WATER_SWITCH_NAVI = 0x01B3, // 0x1yy for Navi msg range
     TEXT_FROGS_UNDERWATER = 0x022E,
+    TEXT_GF_HBA_SIGN = 0x031A,
     TEXT_LAKE_HYLIA_WATER_SWITCH_SIGN = 0x0346, // 0x3yy for cuttable sign range
     TEXT_WARP_MINUET_OF_FOREST = 0x088D,
     TEXT_WARP_BOLERO_OF_FIRE = 0x088E,
@@ -78,9 +87,31 @@ typedef enum {
     TEXT_SARIA_SFM = 0x10AD,
     TEXT_SCRUB_STICK_UPGRADE = 0x10DC,
     TEXT_SCRUB_NUT_UPGRADE = 0x10DD,
+    TEXT_MALON_FIRST_TALK_AFTER_RESCUE = 0x2000, // RANDOTODO SKIP IN RANDO
+    TEXT_MALON_HOW_IS_EPONA_DOING = 0x2001,
+    TEXT_MALON_EPONA_LOOKS_GREAT = 0x2002,
+    TEXT_MALON_OBSTICLE_COURSE = 0x2003,
+    TEXT_MALON_EVERYONE_TURNING_EVIL = 0x204C, 
+    TEXT_MALON_I_SING_THIS_SONG = 0x2050,
+    TEXT_MALON_EVERYONE_LIKED_SONG = 0x2051,
+    TEXT_MALON_EPONA_LIKED_SONG = 0x2052,
     TEXT_RANDOMIZER_GOSSIP_STONE_HINTS = 0x2053,
+    TEXT_MALON_INGO_MUST_HAVE_BEEN_TEMPTED = 0x2056,
+    TEXT_MALON_LINK_HAS_TIME_BUT_NO_RECORD = 0x2090,
+    TEXT_MALON_LINK_HAS_RECORD = 0x2091,
+    TEXT_MALON_FIRST_BEAT_THIS_RECORD = 0x2092,
     TEXT_MEDIGORON = 0x304C,
     TEXT_FIRE_TEMPLE_GORON_OWE_YOU_BIG_TIME = 0x3052,
+    TEXT_BIGGORON_BETTER_AT_SMITHING = 0x3053,
+    TEXT_BIGGORON_BROKEN_KNIFE = 0x3054,
+    TEXT_BIGGORON_GET_THE_EYEDROPS = 0x3055,
+    TEXT_BIGGORON_IM_FINISHED_EYES_ITCHY = 0x3056,
+    TEXT_BIGGORON_WAITING_FOR_YOU = 0x3058,
+    TEXT_BIGGORON_BROUGHT_THE_EYE_DROPS = 0x3059,
+    TEXT_BIGGORON_THIS_IS_STIMULATING = 0x305A,
+    TEXT_BIGGORON_RETURN_AFTER_A_FEW_DAYS = 0x305C,
+    TEXT_BIGGORON_YOU_ARE_IMPATIENT = 0x305D,
+    TEXT_BIGGORON_MY_FINEST_WORK = 0x305E,
     TEXT_FIRE_TEMPLE_GORON_FALLING_DOORS_SECRET = 0x3069,
     TEXT_FIRE_TEMPLE_GORON_FIRE_SECRET = 0x306A,
     TEXT_FIRE_TEMPLE_GORON_FLAME_DANCER_SECRET = 0x306B,
@@ -106,6 +137,18 @@ typedef enum {
     TEXT_BEAN_SALESMAN_WANT_TO_PLANT = 0x406C,
     TEXT_DAMPES_DIARY = 0x5003,
     TEXT_GRANNYS_SHOP = 0x500C,
+    TEXT_ANJU_PLEASE_BRING_MY_CUCCOS_BACK = 0x5036,
+    TEXT_ANJU_PLEASE_BRING_4_CUCCOS = 0x5037,
+    TEXT_ANJU_PLEASE_BRING_3_CUCCOS = 0x5038,
+    TEXT_ANJU_PLEASE_BRING_2_CUCCOS = 0x5039,
+    TEXT_ANJU_PLEASE_BRING_1_CUCCO = 0x503A,
+    TEXT_ANJU_THANKS_FOR_FINDING_MY_CUCCOS = 0x503B,
+    TEXT_ANJU_ROUND_THEM_UP_OR_YOULL_PAY = 0x503C,
+    TEXT_ANJU_DONT_TEASE_MY_CUCCOS = 0x503D,
+    TEXT_HBA_NOT_ON_HORSE = 0x603F,
+    TEXT_HBA_INITIAL_EXPLAINATION = 0x6040,
+    TEXT_HBA_WANT_TO_TRY_AGAIN_YES_NO = 0x6041,
+    TEXT_HBA_ALREADY_HAVE_1000 = 0x6042,
     TEXT_CARPET_SALESMAN_1 = 0x6077,
     TEXT_CARPET_SALESMAN_2 = 0x6078,
     TEXT_MARKET_GUARD_NIGHT = 0x7003,
@@ -113,6 +156,11 @@ typedef enum {
     TEXT_SHEIK_HAVE_HOOK = 0x7010,
     TEXT_ALTAR_CHILD = 0x7040,
     TEXT_CHEST_GAME_PROCEED = 0x704C,
+    TEXT_GHOST_SHOP_EXPLAINATION = 0x70F4,
+    TEXT_GHOST_SHOP_CARD_HAS_POINTS = 0x70F5,
+    TEXT_GHOST_SHOP_BUY_NORMAL_POE = 0x70F6,
+    TEXT_GHOST_SHOP_BUY_BIG_POE = 0x70F7,
+    TEXT_GHOST_SHOP_1000_POINTS = 0x70F8,
     TEXT_ALTAR_ADULT = 0x7088,
     TEXT_GANONDORF = 0x70CC,
     TEXT_GANONDORF_NOHINT = 0x70CD,
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
index 4504acc9a..6540e18a4 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
@@ -45,11 +45,12 @@ void HintTable_Init() {
     HintTable_Init_Exclude_Overworld();
     HintTable_Init_Exclude_Dungeon();
 
+
     /*--------------------------
-    |     ALWAYS HINT TEXT     |
+    |    SOMETIMES HINT TEXT   |
     ---------------------------*/
 
-    hintTable[RHT_KF_LINKS_HOUSE_COW] = HintText::Always(
+    hintTable[RHT_KF_LINKS_HOUSE_COW] = HintText::Sometimes(
         {
             // obscure text
             Text{ "the #bovine bounty of a horseback hustle# gifts",
@@ -61,7 +62,7 @@ void HintTable_Init() {
         Text{ "#Malon's obstacle course# leads to", /*french*/ "la #course à obstacle de Malon# amène à",
               /*spanish*/ "la #carrera de obstáculos de Malon# brinda" });
 
-    hintTable[RHT_KAK_100_GOLD_SKULLTULA_REWARD] = HintText::Always(
+    hintTable[RHT_KAK_100_GOLD_SKULLTULA_REWARD] = HintText::Sometimes(
         {
             // obscure text
             Text{ "#100 bug badges# rewards",
@@ -80,9 +81,6 @@ void HintTable_Init() {
               /*french*/ "détruire #100 Skulltulas d'or# donne",
               /*spanish*/ "exterminar #100 skulltulas doradas# revela" });
 
-    /*--------------------------
-    |    SOMETIMES HINT TEXT   |
-    ---------------------------*/
     hintTable[RHT_SONG_FROM_OCARINA_OF_TIME] = HintText::Sometimes({
         // obscure text
         Text{ "the #Ocarina of Time# teaches", /*french*/ "l'#Ocarina du Temps# est accompagné par",
@@ -3434,11 +3432,11 @@ std::array<RandomizerHintTextKey, RA_MAX> AreaHintTextKeys = {
     RHT_GANONS_CASTLE
 };
 
-std::array<ConditionalAlwaysHint, 10> conditionalAlwaysHints = {
+std::array<ConditionalAlwaysHint, 12> conditionalAlwaysHints = {
     std::make_pair(RC_MARKET_10_BIG_POES,
                    []() {
                        auto ctx = Rando::Context::GetInstance();
-                       return ctx->GetOption(RSK_BIG_POE_COUNT).Value<uint8_t>() >= 3;
+                       return ctx->GetOption(RSK_BIG_POE_COUNT).Value<uint8_t>() >= 3 && !ctx->GetOption(RSK_BIG_POES_HINT);
                    }), // Remember, the option's value being 3 means 4 are required
     std::make_pair(RC_DEKU_THEATER_MASK_OF_TRUTH,
                    []() {
@@ -3448,7 +3446,11 @@ std::array<ConditionalAlwaysHint, 10> conditionalAlwaysHints = {
     std::make_pair(RC_SONG_FROM_OCARINA_OF_TIME, []() { return StonesRequiredBySettings() < 2; }),
     std::make_pair(RC_HF_OCARINA_OF_TIME_ITEM, []() { return StonesRequiredBySettings() < 2; }),
     std::make_pair(RC_SHEIK_IN_KAKARIKO, []() { return MedallionsRequiredBySettings() < 5; }),
-    std::make_pair(RC_DMT_TRADE_CLAIM_CHECK, []() { return false; }),
+    std::make_pair(RC_DMT_TRADE_CLAIM_CHECK,
+                   []() {
+                       auto ctx = Rando::Context::GetInstance();
+                       return !ctx->GetOption(RSK_BIGGORON_HINT);
+                   }),
     std::make_pair(RC_KAK_30_GOLD_SKULLTULA_REWARD,
                    []() {
                        auto ctx = Rando::Context::GetInstance();
@@ -3469,6 +3471,16 @@ std::array<ConditionalAlwaysHint, 10> conditionalAlwaysHints = {
                        auto ctx = Rando::Context::GetInstance();
                        return !ctx->GetOption(RSK_FROGS_HINT);
                    }),
+    std::make_pair(RC_KF_LINKS_HOUSE_COW,
+                   []() {
+                       auto ctx = Rando::Context::GetInstance();
+                       return !ctx->GetOption(RSK_MALON_HINT);
+                   }),
+    std::make_pair(RC_KAK_100_GOLD_SKULLTULA_REWARD,
+                   []() {
+                       auto ctx = Rando::Context::GetInstance();
+                       return !ctx->GetOption(RSK_KAK_100_SKULLS_HINT);
+                   }),
 };
 
 const HintText& Hint(const RandomizerHintTextKey hintKey) {
diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.cpp b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
index c9d6d2df5..aa1112764 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hints.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
@@ -57,6 +57,23 @@ std::array<std::string, HINT_TYPE_MAX> hintTypeNames = {
     "Junk"
 };
 
+std::array<std::pair<RandomizerCheck,RandomizerSettingKey>, 14> staticHintLocations = {{
+  {RC_KAK_10_GOLD_SKULLTULA_REWARD,  RSK_KAK_10_SKULLS_HINT},
+  {RC_KAK_20_GOLD_SKULLTULA_REWARD,  RSK_KAK_20_SKULLS_HINT},
+  {RC_KAK_30_GOLD_SKULLTULA_REWARD,  RSK_KAK_30_SKULLS_HINT},
+  {RC_KAK_40_GOLD_SKULLTULA_REWARD,  RSK_KAK_40_SKULLS_HINT},
+  {RC_KAK_50_GOLD_SKULLTULA_REWARD,  RSK_KAK_50_SKULLS_HINT},
+  {RC_KAK_100_GOLD_SKULLTULA_REWARD, RSK_KAK_100_SKULLS_HINT},
+  {RC_SONG_FROM_IMPA,                RSK_SKIP_CHILD_ZELDA},
+  {RC_ZR_FROGS_OCARINA_GAME,         RSK_FROGS_HINT},
+  {RC_DMT_TRADE_CLAIM_CHECK,         RSK_BIGGORON_HINT},
+  {RC_MARKET_10_BIG_POES,            RSK_BIG_POES_HINT},
+  {RC_KAK_ANJU_AS_CHILD,             RSK_CHICKENS_HINT},
+  {RC_KF_LINKS_HOUSE_COW,            RSK_MALON_HINT},
+  {RC_GF_HBA_1000_POINTS,            RSK_HBA_HINT},
+  {RC_GF_HBA_1500_POINTS,            RSK_HBA_HINT},
+  }};
+
 bool FilterWotHLocations(RandomizerCheck loc){
   auto ctx = Rando::Context::GetInstance();
   return ctx->GetItemLocation(loc)->IsWothCandidate();
@@ -280,9 +297,6 @@ Text adultAltarText;
 Text ganonText;
 Text ganonHintText;
 Text sheikText;
-Text sariaText;
-Text dampesText;
-Text gregText;
 Text warpMinuetText;
 Text warpBoleroText;
 Text warpSerenadeText;
@@ -292,14 +306,12 @@ Text warpPreludeText;
 
 std::string masterSwordHintLoc;
 std::string lightArrowHintLoc;
-std::string dampeHintLoc;
-std::string gregHintLoc;
-std::string sariaHintLoc;
 
 void SetGanonText(Text text){
   ganonText = text;
 }
 
+
 std::string GetMasterSwordHintLoc() {
     return masterSwordHintLoc;
 }
@@ -308,18 +320,6 @@ std::string GetLightArrowHintLoc() {
     return lightArrowHintLoc;
 }
 
-std::string GetDampeHintLoc() {
-    return dampeHintLoc;
-}
-
-std::string GetGregHintLoc() {
-    return gregHintLoc;
-}
-
-std::string GetSariaHintLoc() {
-  return sariaHintLoc;
-}
-
 static std::vector<RandomizerCheck> GetEmptyGossipStones() {
   auto emptyGossipStones = GetEmptyLocations(Rando::StaticData::gossipStoneLocations);
   return emptyGossipStones;
@@ -885,7 +885,7 @@ void CreateMerchantsHints() {
 }
 
 //RANDOTODO add Better Links Pocket and starting item handling once more starting items are added
-void CreateSpecialItemHint(uint32_t item, RandomizerHintKey hintKey, std::vector<RandomizerCheck> hints, RandomizerHintTextKey text1, RandomizerHintTextKey text2, Text& textLoc, std::string& nameLoc, bool condition, bool yourpocket = false) {
+void CreateSpecialItemHint(uint32_t item, RandomizerHintKey hintKey, std::vector<RandomizerCheck> hints, RandomizerHintTextKey text1, RandomizerHintTextKey text2, bool condition, bool yourpocket = false) {
   auto ctx = Rando::Context::GetInstance();
   if(condition){
       RandomizerCheck location = FilterFromPool(ctx->allLocations, [item, ctx](const RandomizerCheck loc) {
@@ -895,15 +895,11 @@ void CreateSpecialItemHint(uint32_t item, RandomizerHintKey hintKey, std::vector
     if (IsReachableWithout(hints,location,true)){
       ctx->GetItemLocation(location)->SetAsHinted();
     }
-    
+
     RandomizerArea area = ctx->GetItemLocation(location)->GetArea();
-    textLoc = ::Hint(text1).GetText() + ::Hint(area).GetText() + ::Hint(text2).GetText();
-    nameLoc = Rando::StaticData::GetLocation(location)->GetName();
-    ctx->AddHint(hintKey, AutoFormatHintText(textLoc), location, HINT_TYPE_STATIC, "Static", area);
-  } else {
-    textLoc = Text();
-    nameLoc = "";
-  }
+    ctx->AddHint(hintKey, AutoFormatHintText(::Hint(text1).GetText() + ::Hint(area).GetText() + ::Hint(text2).GetText()),
+                 location, HINT_TYPE_STATIC, "Static", area);
+  } 
 }
 
 void CreateWarpSongTexts() {
@@ -1033,27 +1029,11 @@ void CreateStoneHints() {
   const HintSetting& hintSetting = hintSettingTable[ctx->GetOption(RSK_HINT_DISTRIBUTION).Value<uint8_t>()];
   std::vector<HintDistributionSetting> distTable = hintSetting.distTable;
 
-  // Apply Special hint exclusions with no requirements
-  if (ctx->GetOption(RSK_KAK_10_SKULLS_HINT)){
-      ctx->GetItemLocation(RC_KAK_10_GOLD_SKULLTULA_REWARD)->SetAsHinted();
-  }
-  if (ctx->GetOption(RSK_KAK_20_SKULLS_HINT)){
-      ctx->GetItemLocation(RC_KAK_20_GOLD_SKULLTULA_REWARD)->SetAsHinted();
-  }
-  if (ctx->GetOption(RSK_KAK_30_SKULLS_HINT)){
-      ctx->GetItemLocation(RC_KAK_30_GOLD_SKULLTULA_REWARD)->SetAsHinted();
-  }
-  if (ctx->GetOption(RSK_KAK_40_SKULLS_HINT)){
-      ctx->GetItemLocation(RC_KAK_40_GOLD_SKULLTULA_REWARD)->SetAsHinted();
-  }
-  if (ctx->GetOption(RSK_KAK_50_SKULLS_HINT)){
-      ctx->GetItemLocation(RC_KAK_50_GOLD_SKULLTULA_REWARD)->SetAsHinted();
-  }
-  if (ctx->GetOption(RSK_FROGS_HINT)){
-      ctx->GetItemLocation(RC_ZR_FROGS_OCARINA_GAME)->SetAsHinted();
-  }
-  if (ctx->GetOption(RSK_SKIP_CHILD_ZELDA)){
-      ctx->GetItemLocation(RC_SONG_FROM_IMPA)->SetAsHinted();
+  // Apply Static hint exclusions with no in-game requirements
+  for (int c = 0; c < staticHintLocations.size(); c++){
+      if(ctx->GetOption(staticHintLocations[c].second)){
+          ctx->GetItemLocation(staticHintLocations[c].first)->SetAsHinted();
+      }
   }
 
   // Add 'always' location hints
@@ -1122,9 +1102,9 @@ void CreateAllHints(){
   auto ctx = Rando::Context::GetInstance();
   CreateGanonAndSheikText();
   CreateAltarText();
-  CreateSpecialItemHint(RG_PROGRESSIVE_HOOKSHOT, RH_DAMPES_DIARY, {RC_DAMPE_HINT}, RHT_DAMPE_DIARY01, RHT_DAMPE_DIARY02, dampesText, dampeHintLoc, (bool)ctx->GetOption(RSK_DAMPES_DIARY_HINT));
-  CreateSpecialItemHint(RG_GREG_RUPEE, RH_GREG_RUPEE, {RC_GREG_HINT}, RHT_GREG_HINT01, RHT_GREG_HINT02, gregText, gregHintLoc, (bool)ctx->GetOption(RSK_GREG_HINT));
-  CreateSpecialItemHint(RG_PROGRESSIVE_MAGIC_METER, RH_SARIA, {RC_SARIA_SONG_HINT, RC_SONG_FROM_SARIA}, RHT_SARIA_TEXT01, RHT_SARIA_TEXT02, sariaText, sariaHintLoc, (bool)ctx->GetOption(RSK_SARIA_HINT));
+  CreateSpecialItemHint(RG_PROGRESSIVE_HOOKSHOT, RH_DAMPES_DIARY, {RC_DAMPE_HINT}, RHT_DAMPE_DIARY01, RHT_DAMPE_DIARY02, (bool)ctx->GetOption(RSK_DAMPES_DIARY_HINT));
+  CreateSpecialItemHint(RG_GREG_RUPEE, RH_GREG_RUPEE, {RC_GREG_HINT}, RHT_GREG_HINT01, RHT_GREG_HINT02, (bool)ctx->GetOption(RSK_GREG_HINT));
+  CreateSpecialItemHint(RG_PROGRESSIVE_MAGIC_METER, RH_SARIA, {RC_SARIA_SONG_HINT, RC_SONG_FROM_SARIA}, RHT_SARIA_TEXT01, RHT_SARIA_TEXT02, (bool)ctx->GetOption(RSK_SARIA_HINT));
 
   if (ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ON_HINT)) {
     CreateMerchantsHints();
diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.hpp b/soh/soh/Enhancements/randomizer/3drando/hints.hpp
index eb10ca0cc..ed23c1e9a 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hints.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hints.hpp
@@ -212,7 +212,7 @@ typedef enum {
 //10 dungeons as GTG and GC are excluded
 extern std::array<DungeonHintInfo, 10> dungeonInfoData;
 
-extern std::array<ConditionalAlwaysHint, 10> conditionalAlwaysHints;
+extern std::array<ConditionalAlwaysHint, 12> conditionalAlwaysHints;
 
 extern void CreateAllHints();
 extern void CreateWarpSongTexts();
@@ -221,6 +221,4 @@ void SetGanonText(Text text);
 
 std::string GetMasterSwordHintLoc();
 std::string GetLightArrowHintLoc();
-std::string GetDampeHintLoc();
-std::string GetGregHintLoc();
-std::string GetSariaHintLoc();
+
diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
index 7e73cefce..aaf9d2361 100644
--- a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
@@ -551,7 +551,9 @@ Rando::ItemLocation* GetItemLocation(RandomizerGet item) {
 // Writes the hints to the spoiler log, if they are enabled.
 static void WriteHints() {
     auto ctx = Rando::Context::GetInstance();
-    int language = ctx->GetOption(RSK_LANGUAGE).GetSelectedOptionIndex();
+
+    uint8_t language = ctx->GetOption(RSK_LANGUAGE).GetSelectedOptionIndex();
+
     if (ctx->GetOption(RSK_SHUFFLE_WARP_SONGS)) {
         jsonData["warpMinuetText"] = ctx->GetHint(RH_MINUET_WARP_LOC)->GetText().GetForLanguage(language);
         jsonData["warpBoleroText"] = ctx->GetHint(RH_BOLERO_WARP_LOC)->GetText().GetForLanguage(language);
@@ -607,17 +609,17 @@ static void WriteHints() {
     }
     if (ctx->GetOption(RSK_DAMPES_DIARY_HINT)){
       jsonData["dampeText"] = ctx->GetHint(RH_DAMPES_DIARY)->GetText().GetForLanguage(language);
-      jsonData["dampeHintLoc"] = GetDampeHintLoc();
+      jsonData["dampeHintLoc"] = Rando::StaticData::GetLocation(ctx->GetHint(RH_DAMPES_DIARY)->GetHintedLocation())->GetName();
       jsonData["dampeRegion"] = ::Hint(ctx->GetHint(RH_DAMPES_DIARY)->GetHintedArea()).GetText().GetEnglish();
     }
     if (ctx->GetOption(RSK_GREG_HINT)){
       jsonData["gregText"] = ctx->GetHint(RH_GREG_RUPEE)->GetText().GetForLanguage(language);
-      jsonData["gregLoc"] = GetGregHintLoc();
+      jsonData["gregLoc"] = Rando::StaticData::GetLocation(ctx->GetHint(RH_GREG_RUPEE)->GetHintedLocation())->GetName();
       jsonData["gregRegion"] = ::Hint(ctx->GetHint(RH_GREG_RUPEE)->GetHintedArea()).GetText().GetEnglish();
     }
     if (ctx->GetOption(RSK_SARIA_HINT)){
       jsonData["sariaText"] = ctx->GetHint(RH_SARIA)->GetText().GetForLanguage(language);
-      jsonData["sariaHintLoc"] = GetSariaHintLoc();
+      jsonData["sariaHintLoc"] = Rando::StaticData::GetLocation(ctx->GetHint(RH_SARIA)->GetHintedLocation())->GetName();
       jsonData["sariaRegion"] = ::Hint(ctx->GetHint(RH_SARIA)->GetHintedArea()).GetText().GetEnglish();
     }
 
@@ -630,7 +632,7 @@ static void WriteHints() {
         std::string hintTextString = hint->GetText().GetForLanguage(language);
         HintType hintType = hint->GetHintType();
 
-         std::string textStr = hintTextString;
+        std::string textStr = hintTextString;
         std::string name = Rando::StaticData::GetLocation(key)->GetName();
         jsonData["hints"][name]["hint"] = textStr;
         jsonData["hints"][name]["distribution"] = hint->GetDistribution();
diff --git a/soh/soh/Enhancements/randomizer/3drando/text.hpp b/soh/soh/Enhancements/randomizer/3drando/text.hpp
index cb6d763db..7f7d16736 100644
--- a/soh/soh/Enhancements/randomizer/3drando/text.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/text.hpp
@@ -49,13 +49,13 @@ public:
     const std::string& GetForLanguage(uint8_t language) const {
         switch (language) {
             case LANGUAGE_ENG:
-                return english;
+                return GetEnglish();
             case LANGUAGE_FRA:
-                return french;
+                return GetFrench();
             case LANGUAGE_GER:
-                return german;
+                return GetGerman();
             default:
-                return english;
+                return GetEnglish();
         }
     }
 
diff --git a/soh/soh/Enhancements/randomizer/option_descriptions.cpp b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
index 85e5affe8..f618b3212 100644
--- a/soh/soh/Enhancements/randomizer/option_descriptions.cpp
+++ b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
@@ -487,9 +487,21 @@ void Settings::CreateOptionDescriptions() {
                                           "location of a progressive magic meter.";
     mOptionDescriptions[RSK_FROGS_HINT] = "Standing near the pedestal for the frogs in Zora's River will tell you the "
                                           "reward for the frogs' ocarina game.";
+    mOptionDescriptions[RSK_BIGGORON_HINT] = "Talking to Biggoron will tell you the item he will give you in exchange for the Claim Check.";
+    mOptionDescriptions[RSK_BIG_POES_HINT] = "Talking to the Poe Collector in the Market Guardhouse while adult will tell you what you recieve for handing in Big Poes.";
+    mOptionDescriptions[RSK_CHICKENS_HINT] = "Talking to Anju as a child will tell you the item she will give you for delivering her Cuccos to the pen";
+    mOptionDescriptions[RSK_MALON_HINT] = "Talking to Malon as adult will tell you the item on \"Link's cow\", the cow you win from beating her time on the Lon Lon Obsticle Course.";
+    mOptionDescriptions[RSK_HBA_HINT] = "Talking to the Horseback Archery gerudo in Gerudo Fortress, or the nearby sign, will tell you what you win for scoring 1000 and 1500 points on Horseback Archery.";
     mOptionDescriptions[RSK_WARP_SONG_HINTS] = "Standing near the pedestal for the frogs in Zora's River will tell you "
-                                               "the reward for the frogs' ocarina game.";
+                                               "the reward for the frogs' ocarina game."; //RANDOTODO fix this, I can't find the original right now because github search sucks
     mOptionDescriptions[RSK_SCRUB_TEXT_HINT] = "Business scrubs will reveal the identity of what they're selling.";
+    mOptionDescriptions[RSK_KAK_10_SKULLS_HINT] = "Talking to the Cursed Resident in the Skultulla House who is saved after 10 tokens will tell you the reward";
+    mOptionDescriptions[RSK_KAK_20_SKULLS_HINT] = "Talking to the Cursed Resident in the Skultulla House who is saved after 20 tokens will tell you the reward";
+    mOptionDescriptions[RSK_KAK_30_SKULLS_HINT] = "Talking to the Cursed Resident in the Skultulla House who is saved after 30 tokens will tell you the reward";
+    mOptionDescriptions[RSK_KAK_40_SKULLS_HINT] = "Talking to the Cursed Resident in the Skultulla House who is saved after 40 tokens will tell you the reward";
+    mOptionDescriptions[RSK_KAK_50_SKULLS_HINT] = "Talking to the Cursed Resident in the Skultulla House who is saved after 50 tokens will tell you the reward";
+    mOptionDescriptions[RSK_KAK_100_SKULLS_HINT] = "Talking to the Cursed Resident in the Skultulla House who is saved after 100 tokens will tell you the reward";
+    
     mOptionDescriptions[RSK_FULL_WALLETS] = "Start with a full wallet. All wallet upgrades come filled with rupees.";
     mOptionDescriptions[RSK_BOMBCHUS_IN_LOGIC] =
         "Bombchus are properly considered in logic.\n"
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index 9a5aaf858..aef7291dc 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -16,7 +16,6 @@
 #endif
 #include <ImGui/imgui.h>
 #include <ImGui/imgui_internal.h>
-#include "../custom-message/CustomMessageTypes.h"
 #include "../item-tables/ItemTableManager.h"
 #include "../presets.h"
 #include "../../../src/overlays/actors/ovl_En_GirlA/z_en_girla.h"
@@ -279,16 +278,16 @@ void Randomizer::LoadHintMessages() {
 
     CustomMessageManager::Instance->CreateMessage(
         Randomizer::hintMessageTableID, TEXT_ALTAR_CHILD,
-        CustomMessage(ctx->GetHint(RH_ALTAR_CHILD)->GetText().GetEnglish(), ctx->GetHint(RH_ALTAR_CHILD)->GetText().GetEnglish(), ctx->GetHint(RH_ALTAR_CHILD)->GetText().GetFrench(), TEXTBOX_TYPE_BLUE));
+        CustomMessage(ctx->GetHint(RH_ALTAR_CHILD)->GetText(), TEXTBOX_TYPE_BLUE));
     CustomMessageManager::Instance->CreateMessage(
         Randomizer::hintMessageTableID, TEXT_ALTAR_ADULT,
-        CustomMessage(ctx->GetHint(RH_ALTAR_ADULT)->GetText().GetEnglish(), ctx->GetHint(RH_ALTAR_ADULT)->GetText().GetEnglish(), ctx->GetHint(RH_ALTAR_ADULT)->GetText().GetFrench(), TEXTBOX_TYPE_BLUE));
+        CustomMessage(ctx->GetHint(RH_ALTAR_ADULT)->GetText(), TEXTBOX_TYPE_BLUE));
     CustomMessageManager::Instance->CreateMessage(
         Randomizer::hintMessageTableID, TEXT_GANONDORF,
-        CustomMessage(ctx->GetHint(RH_GANONDORF_HINT)->GetText().GetEnglish(), ctx->GetHint(RH_GANONDORF_HINT)->GetText().GetEnglish(), ctx->GetHint(RH_GANONDORF_HINT)->GetText().GetFrench()));
+        CustomMessage(ctx->GetHint(RH_GANONDORF_HINT)->GetText()));
     CustomMessageManager::Instance->CreateMessage(
         Randomizer::hintMessageTableID, TEXT_GANONDORF_NOHINT,
-        CustomMessage(ctx->GetHint(RH_SARIA)->GetText().GetEnglish(), ctx->GetHint(RH_SARIA)->GetText().GetEnglish(), ctx->GetHint(RH_SARIA)->GetText().GetFrench()));
+        CustomMessage(ctx->GetHint(RH_SARIA)->GetText()));//RANDOTODO: Change to RH_BLANK or remove {{message}} replacment
     CustomMessageManager::Instance->CreateMessage(
         Randomizer::hintMessageTableID, TEXT_SHEIK_NEED_HOOK,
         CustomMessage("{{message}}", "{{message}}", "{{message}}"));
@@ -297,12 +296,12 @@ void Randomizer::LoadHintMessages() {
         CustomMessage("{{message}}", "{{message}}", "{{message}}"));
     CustomMessageManager::Instance->CreateMessage(
         Randomizer::hintMessageTableID, TEXT_SARIAS_SONG_FACE_TO_FACE,
-        CustomMessage(ctx->GetHint(RH_SARIA)->GetText().GetEnglish(), ctx->GetHint(RH_SARIA)->GetText().GetGerman(), ctx->GetHint(RH_SARIA)->GetText().GetFrench(), TEXTBOX_TYPE_BLUE));
+        CustomMessage(ctx->GetHint(RH_SARIA)->GetText(), TEXTBOX_TYPE_BLUE));
 
     for (int i : Rando::StaticData::gossipStoneLocations) {
         RandomizerHintKey rhk = RandomizerHintKey(i - RC_COLOSSUS_GOSSIP_STONE + 1);
         CustomMessageManager::Instance->CreateMessage(
-            Randomizer::hintMessageTableID, i, CustomMessage(ctx->GetHint(rhk)->GetText().GetEnglish(), ctx->GetHint(rhk)->GetText().GetEnglish(), ctx->GetHint(rhk)->GetText().GetFrench()));
+            Randomizer::hintMessageTableID, i, CustomMessage(ctx->GetHint(rhk)->GetText()));
     }
 
     //Extra Hints
@@ -310,24 +309,20 @@ void Randomizer::LoadHintMessages() {
     CustomMessageManager::Instance->AddCustomMessageTable(Randomizer::randoMiscHintsTableID);
 
     CustomMessageManager::Instance->CreateMessage(
-            Randomizer::randoMiscHintsTableID, TEXT_CURSED_SKULLTULA_PEOPLE,
-            CustomMessage("Yeaaarrgh! I'm cursed!!^Please save me by destroying&%r{{params}} Spiders of the Curse%w&and I will give you my&%g{{check}}%w!",
-                "Yeaaarrgh! Ich bin verflucht!^Bitte rette mich, indem du %r{{params}} Skulltulas&%wzerstörst und ich werde dir dafür&%g{{check}} %wgeben!",
-                "Yeaaarrgh! Je suis maudit!^Détruit encore %r{{params}} Araignées de&la Malédiction%w et j'aurai quelque&chose à te donner!&%g({{check}})")
+            Randomizer::randoMiscHintsTableID, TEXT_SKULLTULA_PEOPLE_IM_CURSED,
+            CustomMessage("Yeaaarrgh! I'm cursed!!^Please save me by destroying&%r{{params}} Spiders of the Curse%w&and I will give you my&%g{{item1}}%w!",
+                "Yeaaarrgh! Ich bin verflucht!^Bitte rette mich, indem du %r{{params}} Skulltulas&%wzerstörst und ich werde dir dafür&%g{{item1}} %wgeben!",
+                "Yeaaarrgh! Je suis maudit!^Détruit encore %r{{params}} Araignées de&la Malédiction%w et j'aurai quelque&chose à te donner!&%g({{item1}})")
         );
-        CustomMessageManager::Instance->CreateMessage(
+    CustomMessageManager::Instance->CreateMessage(
             Randomizer::randoMiscHintsTableID, TEXT_DAMPES_DIARY,
-            CustomMessage(ctx->GetHint(RH_DAMPES_DIARY)->GetText().GetEnglish(),
-                ctx->GetHint(RH_DAMPES_DIARY)->GetText().GetEnglish(),
-                ctx->GetHint(RH_DAMPES_DIARY)->GetText().GetFrench())
+            CustomMessage(ctx->GetHint(RH_DAMPES_DIARY)->GetText())
         );
-        CustomMessageManager::Instance->CreateMessage(
+    CustomMessageManager::Instance->CreateMessage(
             Randomizer::randoMiscHintsTableID, TEXT_CHEST_GAME_PROCEED,
-            CustomMessage(ctx->GetHint(RH_GREG_RUPEE)->GetText().GetEnglish(),
-                ctx->GetHint(RH_GREG_RUPEE)->GetText().GetEnglish(),
-                ctx->GetHint(RH_GREG_RUPEE)->GetText().GetFrench())
+            CustomMessage(ctx->GetHint(RH_GREG_RUPEE)->GetText())
         );
-        CustomMessageManager::Instance->CreateMessage(
+    CustomMessageManager::Instance->CreateMessage(
             Randomizer::randoMiscHintsTableID, TEXT_FROGS_UNDERWATER,
             CustomMessage(ctx->GetHint(RH_FROGS)->GetText().GetEnglish(),
                 ctx->GetHint(RH_FROGS)->GetText().GetGerman(),
@@ -349,6 +344,111 @@ void Randomizer::LoadHintMessages() {
         CustomMessage(ctx->GetHint(RH_REQUIEM_WARP_LOC)->GetText().GetEnglish(),
             ctx->GetHint(RH_REQUIEM_WARP_LOC)->GetText().GetGerman(),
             ctx->GetHint(RH_REQUIEM_WARP_LOC)->GetText().GetFrench()));
+
+    CustomMessageManager::Instance->CreateMessage(
+        Randomizer::randoMiscHintsTableID, TEXT_SARIAS_SONG_FOREST_SOUNDS,
+            CustomMessage("{{message}}", "{{message}}", "{{message}}", TEXTBOX_TYPE_BLUE)
+        );
+
+    CustomMessageManager::Instance->CreateMessage(
+            Randomizer::randoMiscHintsTableID, TEXT_BIGGORON_BETTER_AT_SMITHING,
+            CustomMessage("Arrrrrre you here to claim my finest&%g{{item1}}%w?&Shoooooow me your %rClaim Check.%w",
+            "",
+            "")
+        );
+
+    CustomMessageManager::Instance->CreateMessage(
+            Randomizer::randoMiscHintsTableID, TEXT_GHOST_SHOP_CARD_HAS_POINTS,
+            CustomMessage("You have %g\x1E\x01%r Poe Points%w!&Reach 1000 and you'll get a&%g{{item1}}%w!",
+            "",
+            "")
+        );
+
+    CustomMessageManager::Instance->CreateMessage(
+            Randomizer::randoMiscHintsTableID, TEXT_ANJU_PLEASE_BRING_MY_CUCCOS_BACK,
+            CustomMessage("You! Please!&Bring my Cucco's back to my pen!&I'll give you my %g{{item1}}%w!",
+            "",
+            "")
+        );
+
+    CustomMessageManager::Instance->CreateMessage(
+            Randomizer::randoMiscHintsTableID, TEXT_MALON_OBSTICLE_COURSE,
+            CustomMessage("How about trying the %rObsticle Course?%w&If you beat my time I'll let you keep&my favourite cow Elsie and&her toy %g{{item1}}%w!^"
+            "Challenge the %rObsticle Course?&\x1B&%gLet's go&No thanks%w",
+            "",
+            "")
+        );
+
+    CustomMessageManager::Instance->CreateMessage(
+            Randomizer::randoMiscHintsTableID, TEXT_MALON_HOW_IS_EPONA_DOING,
+            CustomMessage("@! You should come back &with Epona and try to beat my time&on the %rObsticle Course%w!^If you beat my time, I'll give you&my favourite %rcow%w Elsie and&her toy %g{{item1}}%w!",
+            "",
+            "")
+        );
+
+    CustomMessageManager::Instance->CreateMessage(
+            Randomizer::randoMiscHintsTableID, TEXT_MALON_EVERYONE_TURNING_EVIL,
+            CustomMessage("@? Is that you? ^If I ran the ranch, I'd build an &%rObsticle Course%w, and whoever gets&the best time would win a %rcow%w!^Elsie loves sharing her %g{{item1}}%w&with new people, It'll be fun!^...But Ingo won't let me...",
+            "",
+            "")
+        );
+
+    CustomMessageManager::Instance->CreateMessage(
+            Randomizer::randoMiscHintsTableID, TEXT_MALON_INGO_MUST_HAVE_BEEN_TEMPTED,
+            CustomMessage("@! You should come back in&the morning and try to beat my time&on the %rObsticle Course%w!^If you beat my time, I'll give you&my favourite %rcow%w Elsie and&her toy %g{{item1}}%w!",
+            "",
+            "")
+        );
+
+    CustomMessageManager::Instance->CreateMessage(
+            Randomizer::randoMiscHintsTableID, TEXT_HBA_NOT_ON_HORSE,
+            CustomMessage("Hey, rookie!&Come back on your %rhorse%w&and take on the&%rHorseback Archery%w challenge!^Impress me with a high score of 1000&to win a %g{{item1}}%w&or score 1500 for my&%g{{item2}}%w!",
+            "",
+            "")
+        );
+
+    CustomMessageManager::Instance->CreateMessage(
+            Randomizer::randoMiscHintsTableID, TEXT_HBA_INITIAL_EXPLAINATION,
+            CustomMessage("Hey, rookie!&Want to take on the&%rHorseback Archery%w challenge?^Impress me with a high score of 1000&to win a %g{{item1}}%w&or score 1500 for my&%g{{item2}}%w!\x0B",
+            "",
+            "")
+        );
+
+    CustomMessageManager::Instance->CreateMessage(
+            Randomizer::randoMiscHintsTableID, TEXT_HBA_ALREADY_HAVE_1000,
+            CustomMessage("Hey, newcomer!&Want to take on the&%rHorseback Archery%w challenge?^Prove yourself to be a horsemaster&by scoring 1500 points to win &my %g{{item1}}%w!\x0B",
+            "",
+            "")
+        );
+
+    CustomMessageManager::Instance->CreateMessage(
+            Randomizer::randoMiscHintsTableID, TEXT_GF_HBA_SIGN,
+            CustomMessage("%rHorseback Archery%w Range Prizes:&1000: %g{{item1}}%w&1500: %g{{item2}}%w^@'s Record: %g\x1E\x00%w",
+            "",
+            "")
+        );
+
+    CustomMessageManager::Instance->CreateMessage(
+            Randomizer::randoMiscHintsTableID, TEXT_MALON_OBSTICLE_COURSE,
+            CustomMessage("How about trying your skill on the %rObsticle Course?%w& If you beat my time I'll let you keep my favourite cow Elsie and& her toy %g{{item1}}%w!&x1B&%gLet's go&No thanks%w",
+            "",
+            "")
+        );
+
+    CustomMessageManager::Instance->CreateMessage(
+            Randomizer::randoMiscHintsTableID, TEXT_MALON_EVERYONE_TURNING_EVIL,
+            CustomMessage("@? Is that you? &If I ran the ranch, I'd build an %rObsticle Course%w, and whoever gets the best time would win a cow!& Elsie loves sharing her %g{{item1}}%w&with new people, It'll be fun!&...But Ingo won't let me...",
+            "",
+            "")
+        );
+
+    CustomMessageManager::Instance->CreateMessage(
+            Randomizer::randoMiscHintsTableID, TEXT_MALON_INGO_MUST_HAVE_BEEN_TEMPTED,
+            CustomMessage("@! You should come back in the morning and try to beat my time on the %rObsticle Course%w!&If you beat my time, I'll let you keep Elsie and& her toy %g{{item1}}%w!",
+            "",
+            "")
+        );
+
     CustomMessageManager::Instance->CreateMessage(Randomizer::randoMiscHintsTableID, TEXT_WARP_NOCTURNE_OF_SHADOW,
         CustomMessage(ctx->GetHint(RH_NOCTURNE_WARP_LOC)->GetText().GetEnglish(),
             ctx->GetHint(RH_NOCTURNE_WARP_LOC)->GetText().GetGerman(),
@@ -2360,6 +2460,41 @@ void RandomizerSettingsWindow::UpdateElement() {
     }
 }
 
+CustomMessage Randomizer::ReplaceWithItemName(CustomMessage message, std::string&& toReplace, RandomizerCheck hintedCheck){
+    auto ctx = Rando::Context::GetInstance();
+    RandomizerGet targetRG = ctx->GetItemLocation(hintedCheck)->GetPlacedRandomizerGet();
+    std::array<std::string, LANGUAGE_MAX> itemName;
+        if (targetRG == RG_ICE_TRAP) {
+            targetRG = ctx->overrides[hintedCheck].LooksLike();
+            itemName = {
+                ctx->overrides[hintedCheck].GetTrickName().english,
+                ctx->overrides[hintedCheck].GetTrickName().french,
+                ctx->overrides[hintedCheck].GetTrickName().english
+            };
+        } else {
+            itemName = EnumToSpoilerfileGetName[targetRG];
+        }
+    message.Replace(std::move(toReplace), std::move(itemName[0]), std::move(itemName[1]), std::move(itemName[2]));
+    return message;
+}
+
+
+CustomMessage Randomizer::GetMiscHintMessage(TextIDs textToGet, RandomizerCheck hintedCheck, RandomizerCheck otherCheck) {
+    CustomMessage messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::randoMiscHintsTableID, textToGet);
+    messageEntry = ReplaceWithItemName(messageEntry, "{{item1}}", hintedCheck);
+    if (otherCheck != RC_UNKNOWN_CHECK){
+        messageEntry = ReplaceWithItemName(messageEntry, "{{item2}}", otherCheck);
+    }
+    return messageEntry;
+}
+
+CustomMessage Randomizer::GetCursedSkullMessage(s16 params, RandomizerCheck hintedCheck) {
+    auto ctx = Rando::Context::GetInstance();
+    CustomMessage messageEntry = GetMiscHintMessage(TEXT_SKULLTULA_PEOPLE_IM_CURSED, hintedCheck);
+    messageEntry.Replace("{{params}}", std::to_string(params*10));
+    return messageEntry;
+}
+
 CustomMessage Randomizer::GetSheikMessage(s16 scene, u16 originalTextId) {
     auto ctx = Rando::Context::GetInstance();
     CustomMessage messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::hintMessageTableID, originalTextId);
@@ -2461,28 +2596,6 @@ CustomMessage Randomizer::GetMerchantMessage(RandomizerInf randomizerInf, u16 te
     return messageEntry;
 }
 
-CustomMessage Randomizer::GetCursedSkullMessage(s16 params) {
-    auto ctx = Rando::Context::GetInstance();
-    CustomMessage messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::randoMiscHintsTableID, TEXT_CURSED_SKULLTULA_PEOPLE);
-    RandomizerCheck rc = GetCheckFromActor(ACTOR_EN_SSH, SCENE_HOUSE_OF_SKULLTULA, params);
-    RandomizerGet itemGet = ctx->GetItemLocation(rc)->GetPlacedRandomizerGet();
-    std::array<std::string, LANGUAGE_MAX> itemName;
-    if (itemGet == RG_ICE_TRAP) {
-        itemGet = ctx->overrides[rc].LooksLike();
-        itemName = {
-            std::string(ctx->overrides[rc].GetTrickName().english),
-            std::string(ctx->overrides[rc].GetTrickName().french),
-            std::string(ctx->overrides[rc].GetTrickName().english)
-        };
-    } else {
-        itemName = EnumToSpoilerfileGetName[itemGet];
-    }
-
-    messageEntry.Replace("{{params}}", std::to_string(params*10));
-    messageEntry.Replace("{{check}}", std::move(itemName[0]), std::move(itemName[1]), std::move(itemName[2]));
-    return messageEntry;
-}
-
 static const char* mapGetItemHints[3][2] = {
     { " It's ordinary.", " It's masterful!" },
     { "&Sieht aus wie immer.", " &Man kann darauf die Worte&%r\"Master Quest\"%w entziffern..." },
diff --git a/soh/soh/Enhancements/randomizer/randomizer.h b/soh/soh/Enhancements/randomizer/randomizer.h
index 0949f91cb..f0e3a3440 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.h
+++ b/soh/soh/Enhancements/randomizer/randomizer.h
@@ -12,6 +12,7 @@
 #include "soh/Enhancements/randomizer/randomizer_check_objects.h"
 #include <soh/Enhancements/custom-message/CustomMessageManager.h>
 #include "soh/Enhancements/item-tables/ItemTableTypes.h"
+#include "../custom-message/CustomMessageTypes.h"
 
 #define MAX_SEED_STRING_SIZE 1024
 #define NUM_TRIFORCE_PIECE_MESSAGES 6
@@ -46,7 +47,6 @@ class Randomizer {
     void LoadHintMessages();
     bool IsTrialRequired(RandomizerInf trial);
     u8 GetRandoSettingValue(RandomizerSettingKey randoSettingKey);
-    RandomizerCheck GetCheckFromActor(s16 actorId, s16 sceneNum, s16 actorParams);
     RandomizerCheck GetCheckFromRandomizerInf(RandomizerInf randomizerInf);
     RandomizerInf GetRandomizerInfFromCheck(RandomizerCheck rc);
     Rando::Location* GetCheckObjectFromActor(s16 actorId, s16 sceneNum, s32 actorParams);
@@ -59,9 +59,12 @@ class Randomizer {
     ItemObtainability GetItemObtainabilityFromRandomizerCheck(RandomizerCheck randomizerCheck);
     ItemObtainability GetItemObtainabilityFromRandomizerGet(RandomizerGet randomizerCheck);
     CustomMessage GetSheikMessage(s16 scene, u16 originalTextId);
+    CustomMessage ReplaceWithItemName(CustomMessage message, std::string&& toReplace, RandomizerCheck hintedCheck);
+    CustomMessage GetMiscHintMessage(TextIDs textToGet, RandomizerCheck hintedCheck, RandomizerCheck otherCheck = RC_UNKNOWN_CHECK);
     CustomMessage GetSariaMessage(u16 originalTextId);
     CustomMessage GetMerchantMessage(RandomizerInf randomizerInf, u16 textId, bool mysterious = false);
-    CustomMessage GetCursedSkullMessage(s16 params);
+    RandomizerCheck GetCheckFromActor(s16 actorId, s16 sceneNum, s16 actorParams);
+    CustomMessage GetCursedSkullMessage(s16 params, RandomizerCheck hintedCheck);
     CustomMessage GetGoronMessage(u16 index);
     CustomMessage GetMapGetItemMessageWithHint(GetItemEntry itemEntry);
     static void CreateCustomMessages();
diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h
index 1a2d628ac..f37952001 100644
--- a/soh/soh/Enhancements/randomizer/randomizerTypes.h
+++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@@ -3445,6 +3445,12 @@ typedef enum {
     RSK_KAK_30_SKULLS_HINT,
     RSK_KAK_40_SKULLS_HINT,
     RSK_KAK_50_SKULLS_HINT,
+    RSK_KAK_100_SKULLS_HINT,
+    RSK_BIGGORON_HINT,
+    RSK_BIG_POES_HINT,
+    RSK_CHICKENS_HINT,
+    RSK_MALON_HINT,
+    RSK_HBA_HINT,
     RSK_WARP_SONG_HINTS,
     RSK_SCRUB_TEXT_HINT,
     RSK_HINT_CLARITY,
diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
index 40f47c78b..edc8880fa 100644
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -155,13 +155,19 @@ void Settings::CreateOptions() {
     mOptions[RSK_GREG_HINT] = Option::Bool("Greg the Green Rupee Hint", "gRandomizeGregHint", mOptionDescriptions[RSK_GREG_HINT], IMFLAG_NONE);
     mOptions[RSK_SARIA_HINT] = Option::Bool("Saria's Hint", "gRandomizeSariaHint", mOptionDescriptions[RSK_SARIA_HINT], IMFLAG_NONE);
     mOptions[RSK_FROGS_HINT] = Option::Bool("Frog Ocarina Game Hint", "gRandomizeFrogsHint", mOptionDescriptions[RSK_FROGS_HINT], IMFLAG_NONE);
+    mOptions[RSK_BIGGORON_HINT] = Option::Bool("Biggoron's Hint", "gRandomizeBiggoronHint", mOptionDescriptions[RSK_BIGGORON_HINT], IMFLAG_NONE);
+    mOptions[RSK_BIG_POES_HINT] = Option::Bool("Big Poes Hint", "gRandomizeBigPoesHint", mOptionDescriptions[RSK_BIG_POES_HINT], IMFLAG_NONE);
+    mOptions[RSK_CHICKENS_HINT] = Option::Bool("Chickens Hint", "gRandomizeChickensHint", mOptionDescriptions[RSK_CHICKENS_HINT], IMFLAG_NONE);
+    mOptions[RSK_MALON_HINT] = Option::Bool("Malon Hint", "gRandomizeMalonHint", mOptionDescriptions[RSK_MALON_HINT], IMFLAG_NONE);
+    mOptions[RSK_HBA_HINT] = Option::Bool("Horseback Archery Hint", "gRandomizeHBAHint", mOptionDescriptions[RSK_HBA_HINT], IMFLAG_NONE);
     mOptions[RSK_WARP_SONG_HINTS] = Option::Bool("Warp Song Hints", "gRandomizeWarpSongText", mOptionDescriptions[RSK_WARP_SONG_HINTS], IMFLAG_NONE, WidgetType::Checkbox, RO_GENERIC_ON);
-    mOptions[RSK_KAK_10_SKULLS_HINT] = Option::Bool("10 GS Hint", "gRandomize10GSHint", "", IMFLAG_NONE);
-    mOptions[RSK_KAK_20_SKULLS_HINT] = Option::Bool("20 GS Hint", "gRandomize20GSHint", "", IMFLAG_NONE);
-    mOptions[RSK_KAK_30_SKULLS_HINT] = Option::Bool("30 GS Hint", "gRandomize30GSHint", "", IMFLAG_NONE);
-    mOptions[RSK_KAK_40_SKULLS_HINT] = Option::Bool("40 GS Hint", "gRandomize40GSHint", "", IMFLAG_NONE);
-    mOptions[RSK_KAK_50_SKULLS_HINT] = Option::Bool("50 GS Hint", "gRandomize50GSHint");
     mOptions[RSK_SCRUB_TEXT_HINT] = Option::Bool("Scrub Hint Text", "gRandomizeScrubText", mOptionDescriptions[RSK_SCRUB_TEXT_HINT], IMFLAG_NONE);
+    mOptions[RSK_KAK_10_SKULLS_HINT] = Option::Bool("10 GS Hint", "gRandomize10GSHint", mOptionDescriptions[RSK_KAK_10_SKULLS_HINT], IMFLAG_NONE);
+    mOptions[RSK_KAK_20_SKULLS_HINT] = Option::Bool("20 GS Hint", "gRandomize20GSHint", mOptionDescriptions[RSK_KAK_20_SKULLS_HINT], IMFLAG_NONE);
+    mOptions[RSK_KAK_30_SKULLS_HINT] = Option::Bool("30 GS Hint", "gRandomize30GSHint", mOptionDescriptions[RSK_KAK_30_SKULLS_HINT], IMFLAG_NONE);
+    mOptions[RSK_KAK_40_SKULLS_HINT] = Option::Bool("40 GS Hint", "gRandomize40GSHint", mOptionDescriptions[RSK_KAK_40_SKULLS_HINT], IMFLAG_NONE);
+    mOptions[RSK_KAK_50_SKULLS_HINT] = Option::Bool("50 GS Hint", "gRandomize50GSHint", mOptionDescriptions[RSK_KAK_50_SKULLS_HINT], IMFLAG_NONE);
+    mOptions[RSK_KAK_100_SKULLS_HINT] = Option::Bool("100 GS Hint", "gRandomize100GSHint", mOptionDescriptions[RSK_KAK_100_SKULLS_HINT]);
     // TODO: Compasses show rewards/woth, maps show dungeon mode
     mOptions[RSK_BLUE_FIRE_ARROWS] = Option::Bool("Blue Fire Arrows", "gRandomizeBlueFireArrows", mOptionDescriptions[RSK_BLUE_FIRE_ARROWS]);
     mOptions[RSK_SUNLIGHT_ARROWS] = Option::Bool("Sunlight Arrows", "gRandomizeSunlightArrows", mOptionDescriptions[RSK_SUNLIGHT_ARROWS]);
@@ -708,16 +714,20 @@ void Settings::CreateOptions() {
         &mOptions[RSK_GREG_HINT],
         &mOptions[RSK_SARIA_HINT],
         &mOptions[RSK_FROGS_HINT],
+        &mOptions[RSK_BIGGORON_HINT],
+        &mOptions[RSK_BIG_POES_HINT],
+        &mOptions[RSK_CHICKENS_HINT],
+        &mOptions[RSK_MALON_HINT],
+        &mOptions[RSK_HBA_HINT],
         &mOptions[RSK_WARP_SONG_HINTS],
         &mOptions[RSK_SCRUB_TEXT_HINT],
         &mOptions[RSK_KAK_10_SKULLS_HINT],
         &mOptions[RSK_KAK_20_SKULLS_HINT],
         &mOptions[RSK_KAK_30_SKULLS_HINT],
         &mOptions[RSK_KAK_40_SKULLS_HINT],
-        &mOptions[RSK_KAK_50_SKULLS_HINT]
-    }, false, WidgetContainerType::SECTION, "This setting adds some hints at locations other than Gossip Stones.\n\n"
-                    "House of Skulltula: # - Talking to a cursed House of Skulltula resident will tell you the reward"
-                    "they will give you for obtaining that many tokens.");
+        &mOptions[RSK_KAK_50_SKULLS_HINT],
+        &mOptions[RSK_KAK_100_SKULLS_HINT]
+    }, false, WidgetContainerType::SECTION, "This setting adds some hints at locations other than Gossip Stones.");
     mOptionGroups[RSG_ITEM_POOL_HINTS_IMGUI_COLUMN] = OptionGroup::SubGroup("Item Pool & Hints", std::initializer_list<OptionGroup*>{
         &mOptionGroups[RSG_ITEM_POOL_HINTS_IMGUI],
         &mOptionGroups[RSG_EXTRA_HINTS_IMGUI],
@@ -924,11 +934,17 @@ void Settings::CreateOptions() {
         &mOptions[RSK_SARIA_HINT],
         &mOptions[RSK_FROGS_HINT],
         &mOptions[RSK_WARP_SONG_HINTS],
+        &mOptions[RSK_BIGGORON_HINT],
+        &mOptions[RSK_BIG_POES_HINT],
+        &mOptions[RSK_CHICKENS_HINT],
+        &mOptions[RSK_MALON_HINT],
+        &mOptions[RSK_HBA_HINT],
         &mOptions[RSK_KAK_10_SKULLS_HINT],
         &mOptions[RSK_KAK_20_SKULLS_HINT],
         &mOptions[RSK_KAK_30_SKULLS_HINT],
         &mOptions[RSK_KAK_40_SKULLS_HINT],
         &mOptions[RSK_KAK_50_SKULLS_HINT],
+        &mOptions[RSK_KAK_100_SKULLS_HINT],
         &mOptions[RSK_SCRUB_TEXT_HINT],
         // TODO: Compasses show Reward/WOTH, Maps show Dungeon Mode, Starting Time
         &mOptions[RSK_DAMAGE_MULTIPLIER],
@@ -1126,6 +1142,9 @@ void Settings::CreateOptions() {
         { "Miscellaneous Settings:30 GS Hint", RSK_KAK_30_SKULLS_HINT },
         { "Miscellaneous Settings:40 GS Hint", RSK_KAK_40_SKULLS_HINT },
         { "Miscellaneous Settings:50 GS Hint", RSK_KAK_50_SKULLS_HINT },
+        { "Miscellaneous Settings:50 GS Hint", RSK_KAK_100_SKULLS_HINT },
+        { "Miscellaneous Settings:Biggoron's Hint", RSK_BIGGORON_HINT },
+        { "Miscellaneous Settings:Big Poes Hint", RSK_BIG_POES_HINT },
         { "Miscellaneous Settings:Warp Song Hints", RSK_WARP_SONG_HINTS },
         { "Miscellaneous Settings:Scrub Hint Text", RSK_SCRUB_TEXT_HINT },
         { "Miscellaneous Settings:Hint Distribution", RSK_HINT_DISTRIBUTION },
@@ -1646,6 +1665,24 @@ void Settings::UpdateOptionProperties() {
         mOptions[RSK_HINT_CLARITY].Unhide();
         mOptions[RSK_HINT_DISTRIBUTION].Unhide();
     }
+
+    if (CVarGetInteger("gRandomizeShuffleCows", RO_GENERIC_OFF)) {
+        mOptions[RSK_MALON_HINT].Enable();
+        } else {
+        mOptions[RSK_MALON_HINT].Disable("Malon's hint points to a cow, so requires cows to be shuffled.");
+    }
+
+    if (CVarGetInteger("gRandomizeShuffle100GSReward", RO_GENERIC_OFF)) {
+        mOptions[RSK_KAK_100_SKULLS_HINT].Enable();
+        } else {
+        mOptions[RSK_KAK_100_SKULLS_HINT].Disable("There is no point to hinting 100 skulls if it is not shuffled");
+    }
+
+    if (CVarGetInteger("gRandomizeCuccosToReturn", 7) == 0) {
+        mOptions[RSK_CHICKENS_HINT].Disable("Anju will just give you the item instead with 0 chickens");
+    } else {
+        mOptions[RSK_CHICKENS_HINT].Enable();
+    }
 }
 
 void Settings::FinalizeSettings(const std::set<RandomizerCheck>& excludedLocations, const std::set<RandomizerTrick>& enabledTricks) {
@@ -1927,6 +1964,18 @@ void Settings::FinalizeSettings(const std::set<RandomizerCheck>& excludedLocatio
         mOptions[RSK_KEYSANITY].SetDelayedOption();
         mOptions[RSK_KEYSANITY].SetSelectedIndex(3);
     }
+
+    if (!mOptions[RSK_SHUFFLE_COWS]) {
+        mOptions[RSK_MALON_HINT].SetSelectedIndex(RO_GENERIC_OFF);
+    }
+
+    if (!mOptions[RSK_SHUFFLE_100_GS_REWARD]) {
+        mOptions[RSK_KAK_100_SKULLS_HINT].SetSelectedIndex(RO_GENERIC_OFF);
+    }
+
+    if (mOptions[RSK_CUCCO_COUNT].Is(0)) {
+        mOptions[RSK_CHICKENS_HINT].SetSelectedIndex(RO_GENERIC_OFF);
+    }
 }
 void Settings::ParseJson(nlohmann::json spoilerFileJson) {
     mSeedString = spoilerFileJson["seed"].get<std::string>();
@@ -2171,6 +2220,12 @@ void Settings::ParseJson(nlohmann::json spoilerFileJson) {
                 case RSK_KAK_30_SKULLS_HINT:
                 case RSK_KAK_40_SKULLS_HINT:
                 case RSK_KAK_50_SKULLS_HINT:
+                case RSK_KAK_100_SKULLS_HINT:
+                case RSK_BIGGORON_HINT:
+                case RSK_BIG_POES_HINT:
+                case RSK_CHICKENS_HINT:
+                case RSK_MALON_HINT:
+                case RSK_HBA_HINT:
                 case RSK_WARP_SONG_HINTS:
                 case RSK_SCRUB_TEXT_HINT:
                 case RSK_KEYRINGS_GERUDO_FORTRESS:
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
index 6f4ffe305..d39d115d9 100644
--- a/soh/soh/OTRGlobals.cpp
+++ b/soh/soh/OTRGlobals.cpp
@@ -2589,11 +2589,12 @@ extern "C" int CustomMessage_RetrieveIfExists(PlayState* play) {
         } else if (Randomizer_GetSettingValue(RSK_BOMBCHUS_IN_LOGIC) &&
                    (textId == TEXT_BUY_BOMBCHU_10_DESC || textId == TEXT_BUY_BOMBCHU_10_PROMPT)) {
             messageEntry = CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, textId);
-        } else if (textId == TEXT_CURSED_SKULLTULA_PEOPLE) {
+        } else if (textId == TEXT_SKULLTULA_PEOPLE_IM_CURSED) {
             actorParams = GET_PLAYER(play)->targetActor->params;
             RandomizerSettingKey rsk = (RandomizerSettingKey)(RSK_KAK_10_SKULLS_HINT + (actorParams - 1));
             if (Randomizer_GetSettingValue(rsk)) {
-                messageEntry = OTRGlobals::Instance->gRandomizer->GetCursedSkullMessage(actorParams);
+                messageEntry = OTRGlobals::Instance->gRandomizer->GetCursedSkullMessage(actorParams, 
+                OTRGlobals::Instance->gRandomizer->GetCheckFromActor(ACTOR_EN_SSH, SCENE_HOUSE_OF_SKULLTULA, actorParams));
             }
         } else if (Randomizer_GetSettingValue(RSK_DAMPES_DIARY_HINT) && textId == TEXT_DAMPES_DIARY) {
             messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::randoMiscHintsTableID, TEXT_DAMPES_DIARY);
@@ -2608,15 +2609,38 @@ extern "C" int CustomMessage_RetrieveIfExists(PlayState* play) {
             messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::hintMessageTableID, textId);
         } else if (textId == TEXT_SHOOTING_GALLERY_MAN_COME_BACK_WITH_BOW) {
             messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::hintMessageTableID, TEXT_SHOOTING_GALLERY_MAN_COME_BACK_WITH_BOW);
-        } else if (textId == 0x3052 || (textId >= 0x3069 && textId <= 0x3070)) { //Fire Temple gorons
+        } else if (textId == TEXT_FIRE_TEMPLE_GORON_OWE_YOU_BIG_TIME || (textId >= TEXT_FIRE_TEMPLE_GORON_FALLING_DOORS_SECRET && textId <= TEXT_FIRE_TEMPLE_GORON_SOUNDS_DIFFERENT_SECRET)) {
             u16 choice = Random(0, NUM_GORON_MESSAGES);
             messageEntry = OTRGlobals::Instance->gRandomizer->GetGoronMessage(choice);
         } else if (Randomizer_GetSettingValue(RSK_FROGS_HINT) && textId == TEXT_FROGS_UNDERWATER) {
-            messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::randoMiscHintsTableID, textId);
-        } else if (Randomizer_GetSettingValue(RSK_SARIA_HINT)) {
-            if ((gPlayState->sceneNum == SCENE_SACRED_FOREST_MEADOW && textId == TEXT_SARIA_SFM) || (textId >= TEXT_SARIAS_SONG_FACE_TO_FACE && textId <= TEXT_SARIAS_SONG_CHANNELING_POWER)) {
+            messageEntry = OTRGlobals::Instance->gRandomizer->GetMiscHintMessage(TEXT_FROGS_UNDERWATER, RC_ZR_FROGS_OCARINA_GAME);
+        } else if (Randomizer_GetSettingValue(RSK_SARIA_HINT) &&
+        (gPlayState->sceneNum == SCENE_SACRED_FOREST_MEADOW && textId == TEXT_SARIA_SFM) || (textId >= TEXT_SARIAS_SONG_FACE_TO_FACE && textId <= TEXT_SARIAS_SONG_CHANNELING_POWER)) {
             messageEntry = OTRGlobals::Instance->gRandomizer->GetSariaMessage(textId);
-        }
+        } else if (Randomizer_GetSettingValue(RSK_BIGGORON_HINT) && (textId == TEXT_BIGGORON_BETTER_AT_SMITHING || textId ==  TEXT_BIGGORON_WAITING_FOR_YOU || textId ==  TEXT_BIGGORON_RETURN_AFTER_A_FEW_DAYS)) {
+            messageEntry = OTRGlobals::Instance->gRandomizer->GetMiscHintMessage(TEXT_BIGGORON_BETTER_AT_SMITHING, RC_DMT_TRADE_CLAIM_CHECK);
+        } else if (Randomizer_GetSettingValue(RSK_BIG_POES_HINT) && (textId == TEXT_GHOST_SHOP_EXPLAINATION || textId == TEXT_GHOST_SHOP_CARD_HAS_POINTS)) {
+            messageEntry = OTRGlobals::Instance->gRandomizer->GetMiscHintMessage(TEXT_GHOST_SHOP_CARD_HAS_POINTS, RC_MARKET_10_BIG_POES);
+        } else if (Randomizer_GetSettingValue(RSK_CHICKENS_HINT) && (textId >= TEXT_ANJU_PLEASE_BRING_MY_CUCCOS_BACK && textId <= TEXT_ANJU_PLEASE_BRING_1_CUCCO)) {
+            messageEntry = OTRGlobals::Instance->gRandomizer->GetMiscHintMessage(TEXT_ANJU_PLEASE_BRING_MY_CUCCOS_BACK, RC_KAK_ANJU_AS_CHILD);
+        } else if (Randomizer_GetSettingValue(RSK_MALON_HINT) && (textId == TEXT_MALON_EVERYONE_TURNING_EVIL || textId == TEXT_MALON_I_SING_THIS_SONG)) {
+            messageEntry = OTRGlobals::Instance->gRandomizer->GetMiscHintMessage(TEXT_MALON_EVERYONE_TURNING_EVIL, RC_KF_LINKS_HOUSE_COW);
+        } else if (Randomizer_GetSettingValue(RSK_MALON_HINT) && textId == TEXT_MALON_HOW_IS_EPONA_DOING) {
+            messageEntry = OTRGlobals::Instance->gRandomizer->GetMiscHintMessage(TEXT_MALON_HOW_IS_EPONA_DOING, RC_KF_LINKS_HOUSE_COW);
+        } else if (Randomizer_GetSettingValue(RSK_MALON_HINT) && textId == TEXT_MALON_OBSTICLE_COURSE) {
+            messageEntry = OTRGlobals::Instance->gRandomizer->GetMiscHintMessage(TEXT_MALON_OBSTICLE_COURSE, RC_KF_LINKS_HOUSE_COW);
+        } else if (Randomizer_GetSettingValue(RSK_MALON_HINT) && textId == TEXT_MALON_INGO_MUST_HAVE_BEEN_TEMPTED) {
+            messageEntry = OTRGlobals::Instance->gRandomizer->GetMiscHintMessage(TEXT_MALON_INGO_MUST_HAVE_BEEN_TEMPTED, RC_KF_LINKS_HOUSE_COW);
+        } else if (Randomizer_GetSettingValue(RSK_KAK_100_SKULLS_HINT) && textId == TEXT_SKULLTULA_PEOPLE_MAKE_YOU_VERY_RICH) {
+            messageEntry = OTRGlobals::Instance->gRandomizer->GetCursedSkullMessage(10, RC_KAK_100_GOLD_SKULLTULA_REWARD);
+        } else if (Randomizer_GetSettingValue(RSK_HBA_HINT) && textId == TEXT_GF_HBA_SIGN) {
+            messageEntry = OTRGlobals::Instance->gRandomizer->GetMiscHintMessage(TEXT_GF_HBA_SIGN, RC_GF_HBA_1000_POINTS, RC_GF_HBA_1500_POINTS);
+        } else if (Randomizer_GetSettingValue(RSK_HBA_HINT) && textId == TEXT_HBA_NOT_ON_HORSE) {
+            messageEntry = OTRGlobals::Instance->gRandomizer->GetMiscHintMessage(TEXT_HBA_NOT_ON_HORSE, RC_GF_HBA_1000_POINTS, RC_GF_HBA_1500_POINTS);
+        } else if (Randomizer_GetSettingValue(RSK_HBA_HINT) && textId == TEXT_HBA_INITIAL_EXPLAINATION) {
+            messageEntry = OTRGlobals::Instance->gRandomizer->GetMiscHintMessage(TEXT_HBA_INITIAL_EXPLAINATION, RC_GF_HBA_1000_POINTS, RC_GF_HBA_1500_POINTS);
+        } else if (Randomizer_GetSettingValue(RSK_HBA_HINT) && textId == TEXT_HBA_ALREADY_HAVE_1000) {
+            messageEntry = OTRGlobals::Instance->gRandomizer->GetMiscHintMessage(TEXT_HBA_ALREADY_HAVE_1000, RC_GF_HBA_1500_POINTS);
         }
     }
     if (textId == TEXT_GS_NO_FREEZE || textId == TEXT_GS_FREEZE) {
diff --git a/soh/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c b/soh/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c
index c6224d97f..fc814f915 100644
--- a/soh/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c
+++ b/soh/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c
@@ -350,12 +350,13 @@ void EnSsh_Bob(EnSsh* this, PlayState* play) {
 }
 
 s32 EnSsh_IsCloseToLink(EnSsh* this, PlayState* play) {
-    Player* player = GET_PLAYER(play);
-    f32 yDist;
-
+    // #region SOH [Randomizer] automatically lower skultulla people
     if (IS_RANDO) {
         return true;
     }
+    // #endregion
+    Player* player = GET_PLAYER(play);
+    f32 yDist;
     if (this->stateFlags & SSH_STATE_GROUND_START) {
         return true;
     }
@@ -698,19 +699,25 @@ void EnSsh_Idle(EnSsh* this, PlayState* play) {
                 this->actor.textId = Text_GetFaceReaction(play, 0xD);
                 if (this->actor.textId == 0) {
                     if (this->actor.params == ENSSH_FATHER) {
-                        if (gSaveContext.inventory.gsTokens >= 50) {
-                            this->actor.textId = 0x29;
-                        } else if (gSaveContext.inventory.gsTokens >= 10) {
-                            if (Flags_GetInfTable(INFTABLE_197)) {
-                                this->actor.textId = 0x24;
-                            } else {
-                                this->actor.textId = 0x25;
-                            }
+                        // #region SOH [Randomizer] Skip the complexity of the father's text when he should just give a hint
+                        if (IS_RANDO && Randomizer_GetSettingValue(RSK_KAK_100_SKULLS_HINT)){
+                            this->actor.textId = 0x27;
+                        // #endregion
                         } else {
-                            if (Flags_GetInfTable(INFTABLE_196)) {
-                                this->actor.textId = 0x27;
+                            if (gSaveContext.inventory.gsTokens >= 50) {
+                                this->actor.textId = 0x29;
+                            } else if (gSaveContext.inventory.gsTokens >= 10) {
+                                if (Flags_GetInfTable(INFTABLE_197)) {
+                                    this->actor.textId = 0x24;
+                                } else {
+                                    this->actor.textId = 0x25;
+                                }
                             } else {
-                                this->actor.textId = 0x26;
+                                if (Flags_GetInfTable(INFTABLE_196)) {
+                                    this->actor.textId = 0x27;
+                                } else {
+                                    this->actor.textId = 0x26;
+                                }
                             }
                         }
                     } else {

From 4cbf3a562130cdc36f66b558ee98c43dd7e49a61 Mon Sep 17 00:00:00 2001
From: Jordan Gilbreath <3819183+jordanpg@users.noreply.github.com>
Date: Sun, 14 Jan 2024 12:02:23 -0500
Subject: [PATCH 065/230] Fishsanity - Rando v3 (#3738)

* Update z_fishing documentation from decomp

* undo sCameraAt/Eye rename

* forgot to include these defines Heehee

* adding enums, settings

* adding more stuff back in

* more work

* we're literally typing words into computer

* include unordered map

maybe this fixes mac build idk

* wahoo

* hmm

* add make sure disabled flag gets popped

* poggers in the chat?

* doing some refactoring

* fixing build

* documentation, moving fishsanity instance to rando

* move FS back to context, fixing build, mod progress

since FS is needed during rando generation & provides perpetual info abt. fishsanity in the seed, seems to make more sense if it lives on the context

* moving some stuff around

* it's starting to get real in here

* ELIMINATE FISHSANITYMETA

* IT WROKS

* Update trackers, fix pond fish flagging

* ZD fish shuffle initial checkpoint

* ZD fish "working"

aside from the crashing

* wrapping up

* fix for partial pond shuffle

* remove misc. unrelated debugconsole modification

* updating GI model

* get build working

* add a todo for this

* removeoopsie

* Rework hints a bit

* update hint loc

* Use visual indicator instead of despawning caught fish

---------

Co-authored-by: jordanpg <jordanpg@users.noreply.github.com>
---
 .../object_gi_fishing_pole/eff_unknown_10_i8  |  Bin 0 -> 1116 bytes
 .../eff_unknown_10_i8_png                     |  Bin 0 -> 1116 bytes
 .../object_gi_fishing_pole/gFishingPoleGiDL   |   26 +
 .../gFishingPoleGiDL_tri_0                    |   80 +
 .../gFishingPoleGiDL_tri_1                    |   84 +
 .../gFishingPoleGiDL_tri_2                    |   53 +
 .../gFishingPoleGiDL_tri_3                    |   92 +
 .../gFishingPoleGiDL_tri_4                    |  341 ++
 .../gFishingPoleGiDL_tri_5                    |   30 +
 .../gFishingPoleGiDL_tri_6                    |   39 +
 .../gFishingPoleGiDL_tri_7                    |   80 +
 .../gFishingPoleGiDL_vtx_0                    |  147 +
 .../gFishingPoleGiDL_vtx_1                    |  209 ++
 .../gFishingPoleGiDL_vtx_2                    |  115 +
 .../gFishingPoleGiDL_vtx_3                    |  176 +
 .../gFishingPoleGiDL_vtx_4                    |  672 ++++
 .../gFishingPoleGiDL_vtx_5                    |   62 +
 .../gFishingPoleGiDL_vtx_6                    |   72 +
 .../gFishingPoleGiDL_vtx_7                    |  147 +
 .../gFishingPoleGiDL_vtx_cull                 |   10 +
 .../mat_gFishingPoleGiDL_black                |   12 +
 .../mat_gFishingPoleGiDL_f3dlite_material_006 |   21 +
 .../mat_gFishingPoleGiDL_line                 |   12 +
 .../mat_gFishingPoleGiDL_reel_accent_001      |   22 +
 .../mat_gFishingPoleGiDL_reel_handle_metal    |   22 +
 .../mat_gFishingPoleGiDL_reel_metal_001       |   22 +
 .../mat_gFishingPoleGiDL_reel_white           |   12 +
 .../mat_gFishingPoleGiDL_wood                 |   12 +
 soh/assets/soh_assets.h                       |    3 +
 soh/include/z64item.h                         |    1 +
 soh/include/z64save.h                         |   14 +-
 .../custom-message/CustomMessageTypes.h       |    2 +
 .../Enhancements/debugger/debugSaveEditor.cpp |   30 +
 .../Enhancements/debugger/debugSaveEditor.h   |   55 +-
 soh/soh/Enhancements/mods.cpp                 |  153 +
 soh/soh/Enhancements/presets.h                |    7 +
 .../randomizer/3drando/category.hpp           |    1 +
 .../randomizer/3drando/hint_list.cpp          |   18 +
 .../hint_list/hint_list_exclude_overworld.cpp |   73 +
 .../3drando/hint_list/hint_list_item.cpp      |   11 +
 .../Enhancements/randomizer/3drando/hints.cpp |    1 +
 .../randomizer/3drando/item_pool.cpp          |   45 +
 .../location_access/locacc_death_mountain.cpp |    2 +
 .../location_access/locacc_hyrule_field.cpp   |   42 +-
 .../location_access/locacc_kakariko.cpp       |    1 +
 .../location_access/locacc_lost_woods.cpp     |    2 +
 .../location_access/locacc_zoras_domain.cpp   |    6 +
 .../Enhancements/randomizer/3drando/shops.cpp |    6 +-
 .../randomizer/3drando/spoiler_log.cpp        |    5 +
 .../randomizer/3drando/spoiler_log.hpp        |    4 +-
 soh/soh/Enhancements/randomizer/context.cpp   |   18 +
 soh/soh/Enhancements/randomizer/context.h     |    3 +
 soh/soh/Enhancements/randomizer/draw.cpp      |   50 +
 soh/soh/Enhancements/randomizer/draw.h        |    1 +
 .../Enhancements/randomizer/fishsanity.cpp    |  412 +++
 soh/soh/Enhancements/randomizer/fishsanity.h  |  210 ++
 soh/soh/Enhancements/randomizer/item_list.cpp |    3 +
 soh/soh/Enhancements/randomizer/location.h    |    4 +
 .../Enhancements/randomizer/location_list.cpp |   77 +-
 soh/soh/Enhancements/randomizer/logic.cpp     |   13 +
 soh/soh/Enhancements/randomizer/logic.h       |    4 +
 .../randomizer/option_descriptions.cpp        |   15 +
 .../Enhancements/randomizer/randomizer.cpp    |  127 +-
 soh/soh/Enhancements/randomizer/randomizer.h  |    3 +
 .../Enhancements/randomizer/randomizerTypes.h |   85 +
 .../randomizer/randomizer_check_objects.cpp   |    2 +
 .../randomizer/randomizer_check_tracker.cpp   |   28 +-
 .../Enhancements/randomizer/randomizer_inf.h  |   53 +
 .../randomizer/randomizer_item_tracker.cpp    |   68 +-
 soh/soh/Enhancements/randomizer/settings.cpp  |   59 +-
 soh/soh/Enhancements/randomizer/static_data.h |    5 +
 soh/soh/OTRGlobals.cpp                        |   10 +
 soh/soh/OTRGlobals.h                          |    2 +
 soh/soh/SaveManager.cpp                       |    3 +
 soh/soh/SohMenuBar.cpp                        |    4 +
 soh/src/code/z_draw.c                         |   56 +-
 soh/src/code/z_parameter.c                    |    5 +
 .../overlays/actors/ovl_En_Fish/z_en_fish.c   |   25 +-
 .../overlays/actors/ovl_Fishing/z_fishing.c   | 3008 +++++++++--------
 .../overlays/actors/ovl_Fishing/z_fishing.h   |   74 +-
 .../overlays/actors/ovl_Obj_Mure/z_obj_mure.c |    2 +-
 .../actors/ovl_player_actor/z_player.c        |   72 +-
 82 files changed, 6012 insertions(+), 1541 deletions(-)
 create mode 100644 soh/assets/custom/objects/object_gi_fishing_pole/eff_unknown_10_i8
 create mode 100644 soh/assets/custom/objects/object_gi_fishing_pole/eff_unknown_10_i8_png
 create mode 100644 soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL
 create mode 100644 soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_0
 create mode 100644 soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_1
 create mode 100644 soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_2
 create mode 100644 soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_3
 create mode 100644 soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_4
 create mode 100644 soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_5
 create mode 100644 soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_6
 create mode 100644 soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_7
 create mode 100644 soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_0
 create mode 100644 soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_1
 create mode 100644 soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_2
 create mode 100644 soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_3
 create mode 100644 soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_4
 create mode 100644 soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_5
 create mode 100644 soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_6
 create mode 100644 soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_7
 create mode 100644 soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_cull
 create mode 100644 soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_black
 create mode 100644 soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_f3dlite_material_006
 create mode 100644 soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_line
 create mode 100644 soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_reel_accent_001
 create mode 100644 soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_reel_handle_metal
 create mode 100644 soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_reel_metal_001
 create mode 100644 soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_reel_white
 create mode 100644 soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_wood
 create mode 100644 soh/soh/Enhancements/randomizer/fishsanity.cpp
 create mode 100644 soh/soh/Enhancements/randomizer/fishsanity.h

diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/eff_unknown_10_i8 b/soh/assets/custom/objects/object_gi_fishing_pole/eff_unknown_10_i8
new file mode 100644
index 0000000000000000000000000000000000000000..174f53cb7b678fe0887581b63612bead5170e027
GIT binary patch
literal 1116
zcmZQzU|@)F4e@6L((m`Jy$8ZTCeeTms8RunA(|TO85n?=g@J)rOxf5iGNY)hyu7lu
zvAMoHCn+W}EWpFYKt)QBi-S{C!N4uPti8X#v$3|OzM-x>CnY{UHZs7~LPtqLkdI$R
z%{(BtZQ7g}y-ih>H4Sy8nF+D6aWUb3Znh@cN-|OkYUY7??bBvX?x-oNsB5Y%Oo|8z
zi;9hli-`zwx6)NnR5A9+sPF0Ps4Fk4ZE3B_2>0>y3s1@|tF0?b53<pcSI~D$D5<Nj
zE-$NT?P@NJ_H=Ocipp=BvwF?EmQ*(#X<2Q@@bvt`f}+Znp0287A6pAM|BTKxCvRTg
zKO@gwOI%9R#xE)%C9|l$tG78f*xtm{DXM<e#n<27otvBOq#`1zZtmh65|dum(%V&)
z=xJ_X=9xX~)SKUb-=CZuZ!Rk+p=M;`;v1P&-PzY(8s~0iXcbbo`N5BWKOb$W@zD|!
zkWw?Wa`uleY@RT=yDHV+*1|cy@5q}!zu%smnrJB}AS|bC=HMNfT{mIg!dYFVao#Te
zxpOak`t$kvieh&SQGRJnb7%jU?3xM7b{yEbw5KR8ETMkgo$uct?q~@!mK74xw)T!p
zEv)Zby!YCpJI7XZmE~8@I`-<vt7B8s9MvVoWt~G)3aVQAX01K(<m;Em$5&0AxM1Id
zub;22tOztwmQyi|&#P=`?VdPu*`Dife|&jzZr|S14?q8SwtqsZo1un|rB7*XLt|rO
zbH{`QyKa2=_3h2mCvU#}{&aO!U978xxl?F*ZFN~uZdO)qY0KP$Pk#LU{qyJVzdxTH
znpqa>>+TnuS6Pyk7#Zy68xWn_vG(eRpWnZJ`}y<TmG!+P$<eVHrM0ywp`H$wrY2VI
zan<t<-+lJz-oqC!Z|$4kR+gJnT-)4G66$QKt*WG~Z5>)NdBfooM-Co6d+xxBNsZ+t
z6^-q!l^NdV>ayZul1iol`8|u)ZCJm4%Z{xprngm<l-9Jg)fdLQ=*bB2@e0Wr`ee7w
zTC!r*+70WLPHU^o&&da-po;7$J2eq*4h~*P9rx7w$qQDj-MD`F^w!dhgxJK)!qTFQ
zFf&<Rc2+hn5jFehvYt6B)^AujyS*eS)Ym&8Dm6DRB|ux0la-Z~onOw>KdWi_vb8Jc
zc9kUux!73Qdq<^Z#JVZ)u><AVxWqJ_Vk`RRFPYn0nHJ(=uBT&U?;jHvWF^i8lm;0f
zZx#g12Q&I=vm!jL_0&`}O<nv0oOJj>+F9Ayd8G|}G8%e&n+oFtoXxeB6_j-?>}?I@
zxY*d(Ik<QP#FfqbGwV9qs<NW}oGta#6qVGp^|a)L**UoRMWhtf^{qT(3+mgN$}^(_
wJRHpRHB^)o<s=2UIe10owalD+f}@ghE1Oyx%d_Ib0=!*pjJ1@cMEE$_0ZQ$z4FCWD

literal 0
HcmV?d00001

diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/eff_unknown_10_i8_png b/soh/assets/custom/objects/object_gi_fishing_pole/eff_unknown_10_i8_png
new file mode 100644
index 0000000000000000000000000000000000000000..174f53cb7b678fe0887581b63612bead5170e027
GIT binary patch
literal 1116
zcmZQzU|@)F4e@6L((m`Jy$8ZTCeeTms8RunA(|TO85n?=g@J)rOxf5iGNY)hyu7lu
zvAMoHCn+W}EWpFYKt)QBi-S{C!N4uPti8X#v$3|OzM-x>CnY{UHZs7~LPtqLkdI$R
z%{(BtZQ7g}y-ih>H4Sy8nF+D6aWUb3Znh@cN-|OkYUY7??bBvX?x-oNsB5Y%Oo|8z
zi;9hli-`zwx6)NnR5A9+sPF0Ps4Fk4ZE3B_2>0>y3s1@|tF0?b53<pcSI~D$D5<Nj
zE-$NT?P@NJ_H=Ocipp=BvwF?EmQ*(#X<2Q@@bvt`f}+Znp0287A6pAM|BTKxCvRTg
zKO@gwOI%9R#xE)%C9|l$tG78f*xtm{DXM<e#n<27otvBOq#`1zZtmh65|dum(%V&)
z=xJ_X=9xX~)SKUb-=CZuZ!Rk+p=M;`;v1P&-PzY(8s~0iXcbbo`N5BWKOb$W@zD|!
zkWw?Wa`uleY@RT=yDHV+*1|cy@5q}!zu%smnrJB}AS|bC=HMNfT{mIg!dYFVao#Te
zxpOak`t$kvieh&SQGRJnb7%jU?3xM7b{yEbw5KR8ETMkgo$uct?q~@!mK74xw)T!p
zEv)Zby!YCpJI7XZmE~8@I`-<vt7B8s9MvVoWt~G)3aVQAX01K(<m;Em$5&0AxM1Id
zub;22tOztwmQyi|&#P=`?VdPu*`Dife|&jzZr|S14?q8SwtqsZo1un|rB7*XLt|rO
zbH{`QyKa2=_3h2mCvU#}{&aO!U978xxl?F*ZFN~uZdO)qY0KP$Pk#LU{qyJVzdxTH
znpqa>>+TnuS6Pyk7#Zy68xWn_vG(eRpWnZJ`}y<TmG!+P$<eVHrM0ywp`H$wrY2VI
zan<t<-+lJz-oqC!Z|$4kR+gJnT-)4G66$QKt*WG~Z5>)NdBfooM-Co6d+xxBNsZ+t
z6^-q!l^NdV>ayZul1iol`8|u)ZCJm4%Z{xprngm<l-9Jg)fdLQ=*bB2@e0Wr`ee7w
zTC!r*+70WLPHU^o&&da-po;7$J2eq*4h~*P9rx7w$qQDj-MD`F^w!dhgxJK)!qTFQ
zFf&<Rc2+hn5jFehvYt6B)^AujyS*eS)Ym&8Dm6DRB|ux0la-Z~onOw>KdWi_vb8Jc
zc9kUux!73Qdq<^Z#JVZ)u><AVxWqJ_Vk`RRFPYn0nHJ(=uBT&U?;jHvWF^i8lm;0f
zZx#g12Q&I=vm!jL_0&`}O<nv0oOJj>+F9Ayd8G|}G8%e&n+oFtoXxeB6_j-?>}?I@
zxY*d(Ik<QP#FfqbGwV9qs<NW}oGta#6qVGp^|a)L**UoRMWhtf^{qT(3+mgN$}^(_
wJRHpRHB^)o<s=2UIe10owalD+f}@ghE1Oyx%d_Ib0=!*pjJ1@cMEE$_0ZQ$z4FCWD

literal 0
HcmV?d00001

diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL
new file mode 100644
index 000000000..49ed9b0e5
--- /dev/null
+++ b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL
@@ -0,0 +1,26 @@
+<DisplayList Version="0">
+	<ClearGeometryMode G_LIGHTING="1" />
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_cull" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
+	<CullDisplayList Start="0" End="7"/>
+	<CallDisplayList Path="objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_reel_handle_metal"/>
+	<CallDisplayList Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_0"/>
+	<CallDisplayList Path="objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_wood"/>
+	<CallDisplayList Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_1"/>
+	<CallDisplayList Path="objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_black"/>
+	<CallDisplayList Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_2"/>
+	<CallDisplayList Path="objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_line"/>
+	<CallDisplayList Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_3"/>
+	<CallDisplayList Path="objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_reel_metal_001"/>
+	<CallDisplayList Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_4"/>
+	<CallDisplayList Path="objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_reel_accent_001"/>
+	<CallDisplayList Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_5"/>
+	<CallDisplayList Path="objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_reel_white"/>
+	<CallDisplayList Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_6"/>
+	<PipeSync/>
+	<SetGeometryMode G_LIGHTING="1" />
+	<ClearGeometryMode G_TEXTURE_GEN="1" />
+	<SetCombineLERP A0="G_CCMUX_0" B0="G_CCMUX_0" C0="G_CCMUX_0" D0="G_CCMUX_SHADE" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_ENVIRONMENT" A1="G_CCMUX_0" B1="G_CCMUX_0" C1="G_CCMUX_0" D1="G_CCMUX_SHADE" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_ENVIRONMENT"/>
+	<Texture S="65535" T="65535" Level="0" Tile="0" On="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_0 b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_0
new file mode 100644
index 000000000..747739cb7
--- /dev/null
+++ b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_0
@@ -0,0 +1,80 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="3" V12="1" Flag1="0"/>
+	<Triangles2 V00="4" V01="3" V02="0" Flag0="0" V10="4" V11="5" V12="3" Flag1="0"/>
+	<Triangles2 V00="6" V01="5" V02="4" Flag0="0" V10="6" V11="7" V12="5" Flag1="0"/>
+	<Triangles2 V00="7" V01="6" V02="8" Flag0="0" V10="7" V11="8" V12="9" Flag1="0"/>
+	<Triangles2 V00="10" V01="9" V02="8" Flag0="0" V10="10" V11="11" V12="9" Flag1="0"/>
+	<Triangles2 V00="11" V01="10" V02="12" Flag0="0" V10="11" V11="12" V12="13" Flag1="0"/>
+	<Triangles2 V00="14" V01="13" V02="12" Flag0="0" V10="14" V11="15" V12="13" Flag1="0"/>
+	<Triangles2 V00="16" V01="15" V02="14" Flag0="0" V10="16" V11="17" V12="15" Flag1="0"/>
+	<Triangles2 V00="17" V01="18" V02="15" Flag0="0" V10="17" V11="19" V12="18" Flag1="0"/>
+	<Triangles2 V00="19" V01="20" V02="18" Flag0="0" V10="19" V11="21" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="22" V02="20" Flag0="0" V10="21" V11="23" V12="22" Flag1="0"/>
+	<Triangles2 V00="24" V01="22" V02="23" Flag0="0" V10="24" V11="23" V12="25" Flag1="0"/>
+	<Triangles2 V00="22" V01="24" V02="26" Flag0="0" V10="22" V11="26" V12="27" Flag1="0"/>
+	<Triangles2 V00="28" V01="27" V02="26" Flag0="0" V10="28" V11="29" V12="27" Flag1="0"/>
+	<Triangles2 V00="29" V01="28" V02="30" Flag0="0" V10="29" V11="30" V12="31" Flag1="0"/>
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_0" VertexBufferIndex="0" VertexOffset="32" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="3" V12="1" Flag1="0"/>
+	<Triangles2 V00="3" V01="0" V02="4" Flag0="0" V10="5" V11="4" V12="0" Flag1="0"/>
+	<Triangles2 V00="5" V01="6" V02="4" Flag0="0" V10="7" V11="6" V12="5" Flag1="0"/>
+	<Triangles2 V00="7" V01="8" V02="6" Flag0="0" V10="7" V11="9" V12="8" Flag1="0"/>
+	<Triangles2 V00="7" V01="10" V02="9" Flag0="0" V10="10" V11="7" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="11" V02="7" Flag0="0" V10="12" V11="13" V12="11" Flag1="0"/>
+	<Triangles2 V00="10" V01="11" V02="14" Flag0="0" V10="10" V11="14" V12="15" Flag1="0"/>
+	<Triangles2 V00="10" V01="15" V02="16" Flag0="0" V10="17" V11="16" V12="15" Flag1="0"/>
+	<Triangles2 V00="17" V01="15" V02="18" Flag0="0" V10="19" V11="17" V12="18" Flag1="0"/>
+	<Triangles2 V00="19" V01="9" V02="17" Flag0="0" V10="8" V11="9" V12="19" Flag1="0"/>
+	<Triangles2 V00="8" V01="19" V02="20" Flag0="0" V10="8" V11="20" V12="21" Flag1="0"/>
+	<Triangles2 V00="8" V01="21" V02="22" Flag0="0" V10="9" V11="16" V12="17" Flag1="0"/>
+	<Triangles2 V00="9" V01="10" V02="16" Flag0="0" V10="23" V11="24" V12="25" Flag1="0"/>
+	<Triangles2 V00="23" V01="26" V02="24" Flag0="0" V10="27" V11="26" V12="23" Flag1="0"/>
+	<Triangles2 V00="27" V01="28" V02="26" Flag0="0" V10="29" V11="28" V12="27" Flag1="0"/>
+	<Triangles2 V00="29" V01="27" V02="30" Flag0="0" V10="30" V11="27" V12="31" Flag1="0"/>
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_0" VertexBufferIndex="0" VertexOffset="64" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="0" V02="5" Flag0="0" V10="4" V11="5" V12="6" Flag1="0"/>
+	<Triangles2 V00="4" V01="6" V02="7" Flag0="0" V10="8" V11="7" V12="6" Flag1="0"/>
+	<Triangles2 V00="8" V01="6" V02="9" Flag0="0" V10="10" V11="8" V12="9" Flag1="0"/>
+	<Triangles2 V00="10" V01="11" V02="8" Flag0="0" V10="12" V11="11" V12="10" Flag1="0"/>
+	<Triangles2 V00="12" V01="10" V02="13" Flag0="0" V10="14" V11="12" V12="13" Flag1="0"/>
+	<Triangles2 V00="14" V01="15" V02="12" Flag0="0" V10="11" V11="7" V12="8" Flag1="0"/>
+	<Triangles2 V00="11" V01="4" V02="7" Flag0="0" V10="16" V11="17" V12="18" Flag1="0"/>
+	<Triangles2 V00="16" V01="19" V02="17" Flag0="0" V10="20" V11="19" V12="16" Flag1="0"/>
+	<Triangles2 V00="20" V01="21" V02="19" Flag0="0" V10="22" V11="21" V12="20" Flag1="0"/>
+	<Triangles2 V00="22" V01="23" V02="21" Flag0="0" V10="23" V11="22" V12="24" Flag1="0"/>
+	<Triangles2 V00="23" V01="24" V02="25" Flag0="0" V10="26" V11="25" V12="24" Flag1="0"/>
+	<Triangles2 V00="26" V01="27" V02="25" Flag0="0" V10="27" V11="26" V12="28" Flag1="0"/>
+	<Triangles2 V00="27" V01="28" V02="29" Flag0="0" V10="30" V11="29" V12="28" Flag1="0"/>
+	<Triangle1 V00="30" V01="31" V02="29"/>
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_0" VertexBufferIndex="0" VertexOffset="96" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="3" V12="1" Flag1="0"/>
+	<Triangles2 V00="3" V01="4" V02="1" Flag0="0" V10="3" V11="5" V12="4" Flag1="0"/>
+	<Triangles2 V00="6" V01="1" V02="4" Flag0="0" V10="6" V11="7" V12="1" Flag1="0"/>
+	<Triangles2 V00="7" V01="6" V02="8" Flag0="0" V10="7" V11="8" V12="9" Flag1="0"/>
+	<Triangles2 V00="10" V01="9" V02="8" Flag0="0" V10="10" V11="11" V12="9" Flag1="0"/>
+	<Triangles2 V00="11" V01="10" V02="12" Flag0="0" V10="10" V11="13" V12="12" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="12" V11="14" V12="15" Flag1="0"/>
+	<Triangles2 V00="15" V01="14" V02="16" Flag0="0" V10="15" V11="16" V12="17" Flag1="0"/>
+	<Triangles2 V00="18" V01="15" V02="17" Flag0="0" V10="18" V11="17" V12="19" Flag1="0"/>
+	<Triangles2 V00="20" V01="18" V02="19" Flag0="0" V10="20" V11="19" V12="21" Flag1="0"/>
+	<Triangles2 V00="22" V01="18" V02="20" Flag0="0" V10="22" V11="23" V12="18" Flag1="0"/>
+	<Triangles2 V00="24" V01="23" V02="22" Flag0="0" V10="24" V11="11" V12="23" Flag1="0"/>
+	<Triangles2 V00="11" V01="24" V02="25" Flag0="0" V10="11" V11="25" V12="9" Flag1="0"/>
+	<Triangles2 V00="26" V01="9" V02="25" Flag0="0" V10="26" V11="7" V12="9" Flag1="0"/>
+	<Triangles2 V00="7" V01="26" V02="2" Flag0="0" V10="7" V11="2" V12="1" Flag1="0"/>
+	<Triangles2 V00="11" V01="12" V02="23" Flag0="0" V10="23" V11="12" V12="15" Flag1="0"/>
+	<Triangles2 V00="23" V01="15" V02="18" Flag0="0" V10="27" V11="28" V12="29" Flag1="0"/>
+	<Triangles2 V00="29" V01="30" V02="27" Flag0="0" V10="29" V11="31" V12="30" Flag1="0"/>
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_0" VertexBufferIndex="0" VertexOffset="128" Count="17"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="3" V01="6" V02="4" Flag0="0" V10="7" V11="6" V12="3" Flag1="0"/>
+	<Triangles2 V00="7" V01="8" V02="6" Flag0="0" V10="9" V11="8" V12="7" Flag1="0"/>
+	<Triangles2 V00="9" V01="10" V02="8" Flag0="0" V10="11" V11="10" V12="9" Flag1="0"/>
+	<Triangles2 V00="11" V01="12" V02="10" Flag0="0" V10="13" V11="12" V12="11" Flag1="0"/>
+	<Triangles2 V00="13" V01="14" V02="12" Flag0="0" V10="15" V11="14" V12="13" Flag1="0"/>
+	<Triangle1 V00="15" V01="16" V02="14"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_1 b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_1
new file mode 100644
index 000000000..6a28afee1
--- /dev/null
+++ b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_1
@@ -0,0 +1,84 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_1" VertexBufferIndex="0" VertexOffset="0" Count="30"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="4" V11="6" V12="7" Flag1="0"/>
+	<Triangles2 V00="8" V01="9" V02="10" Flag0="0" V10="8" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="12" V11="14" V12="15" Flag1="0"/>
+	<Triangles2 V00="16" V01="17" V02="18" Flag0="0" V10="18" V11="19" V12="16" Flag1="0"/>
+	<Triangles2 V00="18" V01="20" V02="19" Flag0="0" V10="19" V11="21" V12="16" Flag1="0"/>
+	<Triangles2 V00="22" V01="23" V02="24" Flag0="0" V10="22" V11="24" V12="25" Flag1="0"/>
+	<Triangles2 V00="26" V01="27" V02="28" Flag0="0" V10="26" V11="28" V12="29" Flag1="0"/>
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_1" VertexBufferIndex="0" VertexOffset="30" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="4" V11="6" V12="7" Flag1="0"/>
+	<Triangles2 V00="8" V01="9" V02="10" Flag0="0" V10="8" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="12" V11="14" V12="15" Flag1="0"/>
+	<Triangles2 V00="16" V01="17" V02="18" Flag0="0" V10="16" V11="18" V12="19" Flag1="0"/>
+	<Triangles2 V00="20" V01="21" V02="22" Flag0="0" V10="20" V11="22" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="25" V02="26" Flag0="0" V10="24" V11="27" V12="25" Flag1="0"/>
+	<Triangles2 V00="28" V01="29" V02="30" Flag0="0" V10="31" V11="29" V12="28" Flag1="0"/>
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_1" VertexBufferIndex="0" VertexOffset="62" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="3" V12="1" Flag1="0"/>
+	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="4" V11="7" V12="5" Flag1="0"/>
+	<Triangles2 V00="8" V01="9" V02="4" Flag0="0" V10="8" V11="10" V12="9" Flag1="0"/>
+	<Triangles2 V00="2" V01="10" V02="8" Flag0="0" V10="2" V11="11" V12="10" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="12" V11="14" V12="15" Flag1="0"/>
+	<Triangles2 V00="15" V01="14" V02="16" Flag0="0" V10="15" V11="16" V12="17" Flag1="0"/>
+	<Triangles2 V00="17" V01="16" V02="18" Flag0="0" V10="17" V11="18" V12="19" Flag1="0"/>
+	<Triangles2 V00="19" V01="18" V02="20" Flag0="0" V10="19" V11="20" V12="21" Flag1="0"/>
+	<Triangles2 V00="22" V01="23" V02="24" Flag0="0" V10="23" V11="25" V12="24" Flag1="0"/>
+	<Triangles2 V00="23" V01="26" V02="25" Flag0="0" V10="24" V11="25" V12="27" Flag1="0"/>
+	<Triangles2 V00="24" V01="27" V02="28" Flag0="0" V10="28" V11="27" V12="29" Flag1="0"/>
+	<Triangles2 V00="28" V01="29" V02="30" Flag0="0" V10="30" V11="29" V12="31" Flag1="0"/>
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_1" VertexBufferIndex="0" VertexOffset="94" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="0" V12="2" Flag1="0"/>
+	<Triangles2 V00="3" V01="2" V02="4" Flag0="0" V10="5" V11="0" V12="3" Flag1="0"/>
+	<Triangles2 V00="5" V01="6" V02="0" Flag0="0" V10="7" V11="6" V12="5" Flag1="0"/>
+	<Triangles2 V00="7" V01="8" V02="6" Flag0="0" V10="9" V11="8" V12="7" Flag1="0"/>
+	<Triangles2 V00="10" V01="11" V02="12" Flag0="0" V10="10" V11="13" V12="11" Flag1="0"/>
+	<Triangles2 V00="14" V01="13" V02="10" Flag0="0" V10="14" V11="15" V12="13" Flag1="0"/>
+	<Triangles2 V00="16" V01="15" V02="14" Flag0="0" V10="16" V11="17" V12="15" Flag1="0"/>
+	<Triangles2 V00="18" V01="17" V02="16" Flag0="0" V10="18" V11="19" V12="17" Flag1="0"/>
+	<Triangles2 V00="19" V01="20" V02="17" Flag0="0" V10="19" V11="21" V12="20" Flag1="0"/>
+	<Triangles2 V00="17" V01="22" V02="15" Flag0="0" V10="17" V11="23" V12="22" Flag1="0"/>
+	<Triangles2 V00="15" V01="22" V02="24" Flag0="0" V10="15" V11="24" V12="13" Flag1="0"/>
+	<Triangles2 V00="13" V01="24" V02="25" Flag0="0" V10="13" V11="25" V12="11" Flag1="0"/>
+	<Triangles2 V00="26" V01="27" V02="28" Flag0="0" V10="26" V11="29" V12="27" Flag1="0"/>
+	<Triangles2 V00="30" V01="29" V02="26" Flag0="0" V10="31" V11="30" V12="26" Flag1="0"/>
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_1" VertexBufferIndex="0" VertexOffset="126" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="2" V11="1" V12="3" Flag1="0"/>
+	<Triangles2 V00="2" V01="3" V02="4" Flag0="0" V10="5" V11="6" V12="0" Flag1="0"/>
+	<Triangles2 V00="5" V01="7" V02="6" Flag0="0" V10="8" V11="7" V12="5" Flag1="0"/>
+	<Triangles2 V00="8" V01="9" V02="7" Flag0="0" V10="9" V11="10" V12="7" Flag1="0"/>
+	<Triangles2 V00="9" V01="11" V02="10" Flag0="0" V10="7" V11="10" V12="12" Flag1="0"/>
+	<Triangles2 V00="7" V01="12" V02="6" Flag0="0" V10="6" V11="12" V12="13" Flag1="0"/>
+	<Triangles2 V00="14" V01="15" V02="16" Flag0="0" V10="14" V11="17" V12="15" Flag1="0"/>
+	<Triangles2 V00="18" V01="17" V02="14" Flag0="0" V10="18" V11="19" V12="17" Flag1="0"/>
+	<Triangles2 V00="20" V01="19" V02="18" Flag0="0" V10="20" V11="21" V12="19" Flag1="0"/>
+	<Triangles2 V00="22" V01="23" V02="21" Flag0="0" V10="22" V11="21" V12="24" Flag1="0"/>
+	<Triangles2 V00="25" V01="26" V02="27" Flag0="0" V10="25" V11="27" V12="28" Flag1="0"/>
+	<Triangles2 V00="28" V01="27" V02="29" Flag0="0" V10="28" V11="29" V12="30" Flag1="0"/>
+	<Triangle1 V00="30" V01="29" V02="31"/>
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_1" VertexBufferIndex="0" VertexOffset="158" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="2" V11="1" V12="3" Flag1="0"/>
+	<Triangles2 V00="2" V01="3" V02="4" Flag0="0" V10="5" V11="6" V12="7" Flag1="0"/>
+	<Triangles2 V00="5" V01="8" V02="6" Flag0="0" V10="9" V11="8" V12="5" Flag1="0"/>
+	<Triangles2 V00="9" V01="10" V02="8" Flag0="0" V10="11" V11="6" V12="12" Flag1="0"/>
+	<Triangles2 V00="11" V01="12" V02="13" Flag0="0" V10="14" V11="15" V12="10" Flag1="0"/>
+	<Triangles2 V00="14" V01="10" V02="16" Flag0="0" V10="17" V11="18" V12="19" Flag1="0"/>
+	<Triangles2 V00="17" V01="20" V02="18" Flag0="0" V10="21" V11="20" V12="17" Flag1="0"/>
+	<Triangles2 V00="21" V01="22" V02="20" Flag0="0" V10="23" V11="22" V12="21" Flag1="0"/>
+	<Triangles2 V00="23" V01="24" V02="22" Flag0="0" V10="25" V11="24" V12="23" Flag1="0"/>
+	<Triangles2 V00="25" V01="26" V02="24" Flag0="0" V10="27" V11="28" V12="29" Flag1="0"/>
+	<Triangles2 V00="27" V01="29" V02="30" Flag0="0" V10="30" V11="29" V12="31" Flag1="0"/>
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_1" VertexBufferIndex="0" VertexOffset="190" Count="17"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="2" V11="1" V12="3" Flag1="0"/>
+	<Triangles2 V00="2" V01="3" V02="4" Flag0="0" V10="4" V11="3" V12="5" Flag1="0"/>
+	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="7" V11="8" V12="9" Flag1="0"/>
+	<Triangles2 V00="7" V01="10" V02="8" Flag0="0" V10="11" V11="10" V12="7" Flag1="0"/>
+	<Triangles2 V00="11" V01="12" V02="10" Flag0="0" V10="13" V11="12" V12="11" Flag1="0"/>
+	<Triangles2 V00="13" V01="14" V02="12" Flag0="0" V10="15" V11="14" V12="13" Flag1="0"/>
+	<Triangle1 V00="15" V01="16" V02="14"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_2 b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_2
new file mode 100644
index 000000000..0f07ec616
--- /dev/null
+++ b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_2
@@ -0,0 +1,53 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_2" VertexBufferIndex="0" VertexOffset="0" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="3" V12="1" Flag1="0"/>
+	<Triangles2 V00="4" V01="3" V02="0" Flag0="0" V10="4" V11="5" V12="3" Flag1="0"/>
+	<Triangles2 V00="6" V01="5" V02="4" Flag0="0" V10="6" V11="7" V12="5" Flag1="0"/>
+	<Triangles2 V00="8" V01="7" V02="6" Flag0="0" V10="8" V11="9" V12="7" Flag1="0"/>
+	<Triangles2 V00="9" V01="10" V02="7" Flag0="0" V10="9" V11="11" V12="10" Flag1="0"/>
+	<Triangles2 V00="7" V01="10" V02="12" Flag0="0" V10="7" V11="12" V12="5" Flag1="0"/>
+	<Triangles2 V00="5" V01="12" V02="13" Flag0="0" V10="5" V11="13" V12="3" Flag1="0"/>
+	<Triangles2 V00="3" V01="13" V02="14" Flag0="0" V10="3" V11="14" V12="1" Flag1="0"/>
+	<Triangles2 V00="15" V01="16" V02="17" Flag0="0" V10="15" V11="18" V12="16" Flag1="0"/>
+	<Triangles2 V00="18" V01="19" V02="16" Flag0="0" V10="18" V11="20" V12="19" Flag1="0"/>
+	<Triangles2 V00="20" V01="21" V02="19" Flag0="0" V10="20" V11="22" V12="21" Flag1="0"/>
+	<Triangles2 V00="23" V01="24" V02="25" Flag0="0" V10="23" V11="25" V12="26" Flag1="0"/>
+	<Triangles2 V00="27" V01="28" V02="29" Flag0="0" V10="27" V11="30" V12="28" Flag1="0"/>
+	<Triangle1 V00="30" V01="31" V02="28"/>
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_2" VertexBufferIndex="0" VertexOffset="32" Count="31"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="1" V11="3" V12="2" Flag1="0"/>
+	<Triangles2 V00="1" V01="4" V02="3" Flag0="0" V10="4" V11="5" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="6" V02="5" Flag0="0" V10="7" V11="8" V12="9" Flag1="0"/>
+	<Triangles2 V00="7" V01="10" V02="8" Flag0="0" V10="10" V11="11" V12="8" Flag1="0"/>
+	<Triangles2 V00="10" V01="12" V02="11" Flag0="0" V10="13" V11="14" V12="15" Flag1="0"/>
+	<Triangles2 V00="13" V01="15" V02="16" Flag0="0" V10="17" V11="18" V12="19" Flag1="0"/>
+	<Triangles2 V00="17" V01="19" V02="20" Flag0="0" V10="21" V11="22" V12="23" Flag1="0"/>
+	<Triangles2 V00="21" V01="24" V02="22" Flag0="0" V10="25" V11="24" V12="21" Flag1="0"/>
+	<Triangles2 V00="25" V01="26" V02="24" Flag0="0" V10="27" V11="26" V12="25" Flag1="0"/>
+	<Triangles2 V00="27" V01="28" V02="26" Flag0="0" V10="29" V11="28" V12="27" Flag1="0"/>
+	<Triangle1 V00="29" V01="30" V02="28"/>
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_2" VertexBufferIndex="0" VertexOffset="63" Count="30"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="3" V01="2" V02="4" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="5" V01="4" V02="6" Flag0="0" V10="5" V11="6" V12="7" Flag1="0"/>
+	<Triangles2 V00="7" V01="6" V02="8" Flag0="0" V10="7" V11="8" V12="9" Flag1="0"/>
+	<Triangles2 V00="10" V01="11" V02="12" Flag0="0" V10="10" V11="13" V12="11" Flag1="0"/>
+	<Triangles2 V00="14" V01="13" V02="10" Flag0="0" V10="14" V11="15" V12="13" Flag1="0"/>
+	<Triangles2 V00="16" V01="15" V02="14" Flag0="0" V10="16" V11="17" V12="15" Flag1="0"/>
+	<Triangles2 V00="18" V01="17" V02="16" Flag0="0" V10="18" V11="19" V12="17" Flag1="0"/>
+	<Triangles2 V00="20" V01="21" V02="22" Flag0="0" V10="20" V11="23" V12="21" Flag1="0"/>
+	<Triangles2 V00="24" V01="23" V02="20" Flag0="0" V10="24" V11="25" V12="23" Flag1="0"/>
+	<Triangles2 V00="26" V01="25" V02="24" Flag0="0" V10="26" V11="27" V12="25" Flag1="0"/>
+	<Triangles2 V00="28" V01="27" V02="26" Flag0="0" V10="28" V11="29" V12="27" Flag1="0"/>
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_2" VertexBufferIndex="0" VertexOffset="93" Count="20"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="3" V01="2" V02="4" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="5" V01="4" V02="6" Flag0="0" V10="5" V11="6" V12="7" Flag1="0"/>
+	<Triangles2 V00="7" V01="6" V02="8" Flag0="0" V10="7" V11="8" V12="9" Flag1="0"/>
+	<Triangles2 V00="10" V01="11" V02="12" Flag0="0" V10="10" V11="13" V12="11" Flag1="0"/>
+	<Triangles2 V00="14" V01="13" V02="10" Flag0="0" V10="14" V11="15" V12="13" Flag1="0"/>
+	<Triangles2 V00="16" V01="15" V02="14" Flag0="0" V10="16" V11="17" V12="15" Flag1="0"/>
+	<Triangles2 V00="18" V01="17" V02="16" Flag0="0" V10="18" V11="19" V12="17" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_3 b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_3
new file mode 100644
index 000000000..b3bccf78a
--- /dev/null
+++ b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_3
@@ -0,0 +1,92 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_3" VertexBufferIndex="0" VertexOffset="0" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="3" V12="1" Flag1="0"/>
+	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="7" V11="5" V12="4" Flag1="0"/>
+	<Triangles2 V00="8" V01="9" V02="10" Flag0="0" V10="8" V11="11" V12="9" Flag1="0"/>
+	<Triangles2 V00="12" V01="11" V02="8" Flag0="0" V10="12" V11="13" V12="11" Flag1="0"/>
+	<Triangles2 V00="14" V01="13" V02="12" Flag0="0" V10="14" V11="15" V12="13" Flag1="0"/>
+	<Triangles2 V00="16" V01="15" V02="14" Flag0="0" V10="16" V11="17" V12="15" Flag1="0"/>
+	<Triangles2 V00="17" V01="18" V02="15" Flag0="0" V10="17" V11="19" V12="18" Flag1="0"/>
+	<Triangles2 V00="19" V01="20" V02="18" Flag0="0" V10="19" V11="21" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="22" V02="20" Flag0="0" V10="21" V11="23" V12="22" Flag1="0"/>
+	<Triangles2 V00="23" V01="24" V02="22" Flag0="0" V10="23" V11="25" V12="24" Flag1="0"/>
+	<Triangles2 V00="25" V01="26" V02="24" Flag0="0" V10="25" V11="27" V12="26" Flag1="0"/>
+	<Triangles2 V00="27" V01="28" V02="26" Flag0="0" V10="27" V11="29" V12="28" Flag1="0"/>
+	<Triangles2 V00="29" V01="30" V02="28" Flag0="0" V10="29" V11="31" V12="30" Flag1="0"/>
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_3" VertexBufferIndex="0" VertexOffset="32" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="3" V12="1" Flag1="0"/>
+	<Triangles2 V00="3" V01="4" V02="1" Flag0="0" V10="3" V11="5" V12="4" Flag1="0"/>
+	<Triangles2 V00="5" V01="6" V02="4" Flag0="0" V10="5" V11="7" V12="6" Flag1="0"/>
+	<Triangles2 V00="7" V01="8" V02="6" Flag0="0" V10="7" V11="9" V12="8" Flag1="0"/>
+	<Triangles2 V00="9" V01="10" V02="8" Flag0="0" V10="9" V11="11" V12="10" Flag1="0"/>
+	<Triangles2 V00="11" V01="12" V02="10" Flag0="0" V10="11" V11="13" V12="12" Flag1="0"/>
+	<Triangles2 V00="13" V01="14" V02="12" Flag0="0" V10="13" V11="15" V12="14" Flag1="0"/>
+	<Triangles2 V00="15" V01="16" V02="14" Flag0="0" V10="15" V11="17" V12="16" Flag1="0"/>
+	<Triangles2 V00="17" V01="18" V02="16" Flag0="0" V10="17" V11="19" V12="18" Flag1="0"/>
+	<Triangles2 V00="19" V01="20" V02="18" Flag0="0" V10="19" V11="21" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="22" V02="20" Flag0="0" V10="21" V11="23" V12="22" Flag1="0"/>
+	<Triangles2 V00="23" V01="24" V02="22" Flag0="0" V10="23" V11="25" V12="24" Flag1="0"/>
+	<Triangles2 V00="22" V01="24" V02="26" Flag0="0" V10="22" V11="26" V12="27" Flag1="0"/>
+	<Triangles2 V00="27" V01="26" V02="28" Flag0="0" V10="27" V11="28" V12="29" Flag1="0"/>
+	<Triangles2 V00="29" V01="28" V02="30" Flag0="0" V10="29" V11="30" V12="31" Flag1="0"/>
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_3" VertexBufferIndex="0" VertexOffset="64" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="0" V02="3" Flag0="0" V10="4" V11="3" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="4" V02="5" Flag0="0" V10="6" V11="5" V12="7" Flag1="0"/>
+	<Triangles2 V00="8" V01="6" V02="7" Flag0="0" V10="8" V11="7" V12="9" Flag1="0"/>
+	<Triangles2 V00="10" V01="8" V02="9" Flag0="0" V10="10" V11="9" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="10" V02="11" Flag0="0" V10="12" V11="11" V12="13" Flag1="0"/>
+	<Triangles2 V00="14" V01="12" V02="13" Flag0="0" V10="14" V11="13" V12="15" Flag1="0"/>
+	<Triangles2 V00="16" V01="14" V02="15" Flag0="0" V10="16" V11="15" V12="17" Flag1="0"/>
+	<Triangles2 V00="18" V01="16" V02="17" Flag0="0" V10="18" V11="17" V12="19" Flag1="0"/>
+	<Triangles2 V00="20" V01="18" V02="19" Flag0="0" V10="20" V11="19" V12="21" Flag1="0"/>
+	<Triangles2 V00="22" V01="20" V02="21" Flag0="0" V10="22" V11="21" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="22" V02="23" Flag0="0" V10="24" V11="23" V12="25" Flag1="0"/>
+	<Triangles2 V00="26" V01="24" V02="25" Flag0="0" V10="26" V11="25" V12="27" Flag1="0"/>
+	<Triangles2 V00="28" V01="26" V02="27" Flag0="0" V10="28" V11="27" V12="29" Flag1="0"/>
+	<Triangles2 V00="30" V01="28" V02="29" Flag0="0" V10="30" V11="29" V12="31" Flag1="0"/>
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_3" VertexBufferIndex="0" VertexOffset="96" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="0" V02="3" Flag0="0" V10="4" V11="3" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="4" V02="5" Flag0="0" V10="6" V11="5" V12="7" Flag1="0"/>
+	<Triangles2 V00="8" V01="4" V02="6" Flag0="0" V10="8" V11="9" V12="4" Flag1="0"/>
+	<Triangles2 V00="10" V01="9" V02="8" Flag0="0" V10="10" V11="11" V12="9" Flag1="0"/>
+	<Triangles2 V00="11" V01="12" V02="9" Flag0="0" V10="11" V11="13" V12="12" Flag1="0"/>
+	<Triangles2 V00="13" V01="14" V02="12" Flag0="0" V10="13" V11="15" V12="14" Flag1="0"/>
+	<Triangles2 V00="15" V01="16" V02="14" Flag0="0" V10="15" V11="17" V12="16" Flag1="0"/>
+	<Triangles2 V00="17" V01="18" V02="16" Flag0="0" V10="17" V11="19" V12="18" Flag1="0"/>
+	<Triangles2 V00="19" V01="20" V02="18" Flag0="0" V10="19" V11="21" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="22" V02="20" Flag0="0" V10="21" V11="23" V12="22" Flag1="0"/>
+	<Triangles2 V00="23" V01="24" V02="22" Flag0="0" V10="23" V11="25" V12="24" Flag1="0"/>
+	<Triangles2 V00="25" V01="26" V02="24" Flag0="0" V10="25" V11="27" V12="26" Flag1="0"/>
+	<Triangles2 V00="27" V01="28" V02="26" Flag0="0" V10="27" V11="29" V12="28" Flag1="0"/>
+	<Triangles2 V00="29" V01="30" V02="28" Flag0="0" V10="29" V11="31" V12="30" Flag1="0"/>
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_3" VertexBufferIndex="0" VertexOffset="128" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="3" V12="1" Flag1="0"/>
+	<Triangles2 V00="3" V01="4" V02="1" Flag0="0" V10="3" V11="5" V12="4" Flag1="0"/>
+	<Triangles2 V00="5" V01="6" V02="4" Flag0="0" V10="5" V11="7" V12="6" Flag1="0"/>
+	<Triangles2 V00="7" V01="8" V02="6" Flag0="0" V10="7" V11="9" V12="8" Flag1="0"/>
+	<Triangles2 V00="9" V01="10" V02="8" Flag0="0" V10="9" V11="11" V12="10" Flag1="0"/>
+	<Triangles2 V00="11" V01="12" V02="10" Flag0="0" V10="11" V11="13" V12="12" Flag1="0"/>
+	<Triangles2 V00="13" V01="14" V02="12" Flag0="0" V10="13" V11="15" V12="14" Flag1="0"/>
+	<Triangles2 V00="12" V01="14" V02="16" Flag0="0" V10="12" V11="16" V12="17" Flag1="0"/>
+	<Triangles2 V00="10" V01="12" V02="17" Flag0="0" V10="10" V11="17" V12="18" Flag1="0"/>
+	<Triangles2 V00="8" V01="10" V02="18" Flag0="0" V10="8" V11="18" V12="19" Flag1="0"/>
+	<Triangles2 V00="6" V01="8" V02="19" Flag0="0" V10="6" V11="19" V12="20" Flag1="0"/>
+	<Triangles2 V00="4" V01="6" V02="20" Flag0="0" V10="4" V11="20" V12="21" Flag1="0"/>
+	<Triangles2 V00="1" V01="4" V02="21" Flag0="0" V10="1" V11="21" V12="22" Flag1="0"/>
+	<Triangles2 V00="2" V01="1" V02="22" Flag0="0" V10="2" V11="22" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="2" V02="23" Flag0="0" V10="24" V11="23" V12="25" Flag1="0"/>
+	<Triangles2 V00="26" V01="24" V02="25" Flag0="0" V10="26" V11="25" V12="27" Flag1="0"/>
+	<Triangles2 V00="28" V01="26" V02="27" Flag0="0" V10="28" V11="27" V12="29" Flag1="0"/>
+	<Triangles2 V00="30" V01="28" V02="29" Flag0="0" V10="30" V11="29" V12="31" Flag1="0"/>
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_3" VertexBufferIndex="0" VertexOffset="160" Count="14"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="0" V02="3" Flag0="0" V10="4" V11="3" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="4" V02="5" Flag0="0" V10="6" V11="5" V12="7" Flag1="0"/>
+	<Triangles2 V00="8" V01="6" V02="7" Flag0="0" V10="8" V11="7" V12="9" Flag1="0"/>
+	<Triangles2 V00="10" V01="8" V02="9" Flag0="0" V10="10" V11="9" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="10" V02="11" Flag0="0" V10="12" V11="11" V12="13" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_4 b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_4
new file mode 100644
index 000000000..7aa7522e8
--- /dev/null
+++ b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_4
@@ -0,0 +1,341 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_4" VertexBufferIndex="0" VertexOffset="0" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="3" V01="5" V02="6" Flag0="0" V10="7" V11="6" V12="5" Flag1="0"/>
+	<Triangles2 V00="7" V01="8" V02="6" Flag0="0" V10="8" V11="7" V12="9" Flag1="0"/>
+	<Triangles2 V00="7" V01="10" V02="9" Flag0="0" V10="7" V11="11" V12="10" Flag1="0"/>
+	<Triangles2 V00="11" V01="7" V02="12" Flag0="0" V10="11" V11="12" V12="13" Flag1="0"/>
+	<Triangles2 V00="4" V01="13" V02="12" Flag0="0" V10="4" V11="14" V12="13" Flag1="0"/>
+	<Triangles2 V00="14" V01="15" V02="13" Flag0="0" V10="14" V11="16" V12="15" Flag1="0"/>
+	<Triangles2 V00="16" V01="17" V02="15" Flag0="0" V10="16" V11="18" V12="17" Flag1="0"/>
+	<Triangles2 V00="18" V01="19" V02="17" Flag0="0" V10="18" V11="20" V12="19" Flag1="0"/>
+	<Triangles2 V00="20" V01="21" V02="19" Flag0="0" V10="20" V11="22" V12="21" Flag1="0"/>
+	<Triangles2 V00="22" V01="23" V02="21" Flag0="0" V10="22" V11="24" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="25" V02="23" Flag0="0" V10="24" V11="26" V12="25" Flag1="0"/>
+	<Triangles2 V00="26" V01="27" V02="25" Flag0="0" V10="26" V11="28" V12="27" Flag1="0"/>
+	<Triangles2 V00="28" V01="29" V02="27" Flag0="0" V10="28" V11="30" V12="29" Flag1="0"/>
+	<Triangle1 V00="30" V01="31" V02="29"/>
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_4" VertexBufferIndex="0" VertexOffset="32" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="1" V11="3" V12="2" Flag1="0"/>
+	<Triangles2 V00="1" V01="4" V02="3" Flag0="0" V10="4" V11="5" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="6" V02="5" Flag0="0" V10="6" V11="7" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="8" V02="7" Flag0="0" V10="8" V11="9" V12="7" Flag1="0"/>
+	<Triangles2 V00="8" V01="10" V02="9" Flag0="0" V10="10" V11="11" V12="9" Flag1="0"/>
+	<Triangles2 V00="10" V01="12" V02="11" Flag0="0" V10="13" V11="9" V12="11" Flag1="0"/>
+	<Triangles2 V00="13" V01="14" V02="9" Flag0="0" V10="14" V11="13" V12="15" Flag1="0"/>
+	<Triangles2 V00="13" V01="16" V02="15" Flag0="0" V10="17" V11="15" V12="16" Flag1="0"/>
+	<Triangles2 V00="18" V01="17" V02="16" Flag0="0" V10="18" V11="16" V12="19" Flag1="0"/>
+	<Triangles2 V00="20" V01="18" V02="19" Flag0="0" V10="20" V11="19" V12="21" Flag1="0"/>
+	<Triangles2 V00="22" V01="21" V02="19" Flag0="0" V10="22" V11="23" V12="21" Flag1="0"/>
+	<Triangles2 V00="23" V01="22" V02="24" Flag0="0" V10="23" V11="24" V12="25" Flag1="0"/>
+	<Triangles2 V00="26" V01="23" V02="25" Flag0="0" V10="26" V11="25" V12="27" Flag1="0"/>
+	<Triangles2 V00="28" V01="26" V02="27" Flag0="0" V10="28" V11="27" V12="29" Flag1="0"/>
+	<Triangles2 V00="30" V01="28" V02="29" Flag0="0" V10="30" V11="29" V12="31" Flag1="0"/>
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_4" VertexBufferIndex="0" VertexOffset="64" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="0" V02="3" Flag0="0" V10="4" V11="3" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="4" V02="5" Flag0="0" V10="6" V11="5" V12="7" Flag1="0"/>
+	<Triangles2 V00="8" V01="6" V02="7" Flag0="0" V10="8" V11="7" V12="9" Flag1="0"/>
+	<Triangles2 V00="10" V01="8" V02="9" Flag0="0" V10="10" V11="9" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="10" V02="11" Flag0="0" V10="12" V11="11" V12="13" Flag1="0"/>
+	<Triangles2 V00="14" V01="12" V02="13" Flag0="0" V10="14" V11="13" V12="15" Flag1="0"/>
+	<Triangles2 V00="16" V01="14" V02="15" Flag0="0" V10="16" V11="15" V12="17" Flag1="0"/>
+	<Triangles2 V00="18" V01="16" V02="17" Flag0="0" V10="18" V11="17" V12="19" Flag1="0"/>
+	<Triangles2 V00="16" V01="18" V02="20" Flag0="0" V10="18" V11="21" V12="20" Flag1="0"/>
+	<Triangles2 V00="22" V01="20" V02="21" Flag0="0" V10="23" V11="22" V12="21" Flag1="0"/>
+	<Triangles2 V00="22" V01="24" V02="20" Flag0="0" V10="24" V11="25" V12="20" Flag1="0"/>
+	<Triangles2 V00="24" V01="26" V02="25" Flag0="0" V10="26" V11="27" V12="25" Flag1="0"/>
+	<Triangles2 V00="26" V01="28" V02="27" Flag0="0" V10="28" V11="29" V12="27" Flag1="0"/>
+	<Triangles2 V00="28" V01="30" V02="29" Flag0="0" V10="30" V11="31" V12="29" Flag1="0"/>
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_4" VertexBufferIndex="0" VertexOffset="96" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="1" V11="3" V12="2" Flag1="0"/>
+	<Triangles2 V00="1" V01="4" V02="3" Flag0="0" V10="4" V11="5" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="6" V02="5" Flag0="0" V10="6" V11="7" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="8" V02="7" Flag0="0" V10="8" V11="9" V12="7" Flag1="0"/>
+	<Triangles2 V00="8" V01="10" V02="9" Flag0="0" V10="10" V11="11" V12="9" Flag1="0"/>
+	<Triangles2 V00="10" V01="12" V02="11" Flag0="0" V10="12" V11="13" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="14" V02="13" Flag0="0" V10="14" V11="15" V12="13" Flag1="0"/>
+	<Triangles2 V00="14" V01="16" V02="15" Flag0="0" V10="16" V11="17" V12="15" Flag1="0"/>
+	<Triangles2 V00="16" V01="18" V02="17" Flag0="0" V10="19" V11="15" V12="17" Flag1="0"/>
+	<Triangles2 V00="19" V01="20" V02="15" Flag0="0" V10="20" V11="13" V12="15" Flag1="0"/>
+	<Triangles2 V00="20" V01="21" V02="13" Flag0="0" V10="21" V11="11" V12="13" Flag1="0"/>
+	<Triangles2 V00="21" V01="22" V02="11" Flag0="0" V10="22" V11="9" V12="11" Flag1="0"/>
+	<Triangles2 V00="22" V01="23" V02="9" Flag0="0" V10="23" V11="7" V12="9" Flag1="0"/>
+	<Triangles2 V00="23" V01="24" V02="7" Flag0="0" V10="24" V11="5" V12="7" Flag1="0"/>
+	<Triangles2 V00="24" V01="25" V02="5" Flag0="0" V10="25" V11="3" V12="5" Flag1="0"/>
+	<Triangles2 V00="25" V01="26" V02="3" Flag0="0" V10="26" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="26" V01="27" V02="2" Flag0="0" V10="27" V11="28" V12="2" Flag1="0"/>
+	<Triangles2 V00="27" V01="29" V02="28" Flag0="0" V10="29" V11="30" V12="28" Flag1="0"/>
+	<Triangle1 V00="29" V01="31" V02="30"/>
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_4" VertexBufferIndex="0" VertexOffset="128" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="3" V12="1" Flag1="0"/>
+	<Triangles2 V00="3" V01="4" V02="1" Flag0="0" V10="5" V11="6" V12="7" Flag1="0"/>
+	<Triangles2 V00="5" V01="8" V02="6" Flag0="0" V10="9" V11="8" V12="5" Flag1="0"/>
+	<Triangles2 V00="9" V01="10" V02="8" Flag0="0" V10="11" V11="10" V12="9" Flag1="0"/>
+	<Triangles2 V00="11" V01="12" V02="10" Flag0="0" V10="13" V11="12" V12="11" Flag1="0"/>
+	<Triangles2 V00="13" V01="14" V02="12" Flag0="0" V10="15" V11="14" V12="13" Flag1="0"/>
+	<Triangles2 V00="15" V01="16" V02="14" Flag0="0" V10="17" V11="16" V12="15" Flag1="0"/>
+	<Triangles2 V00="17" V01="18" V02="16" Flag0="0" V10="19" V11="18" V12="17" Flag1="0"/>
+	<Triangles2 V00="19" V01="20" V02="18" Flag0="0" V10="21" V11="20" V12="19" Flag1="0"/>
+	<Triangles2 V00="21" V01="22" V02="20" Flag0="0" V10="23" V11="22" V12="21" Flag1="0"/>
+	<Triangles2 V00="23" V01="24" V02="22" Flag0="0" V10="25" V11="24" V12="23" Flag1="0"/>
+	<Triangles2 V00="25" V01="26" V02="24" Flag0="0" V10="27" V11="26" V12="25" Flag1="0"/>
+	<Triangles2 V00="27" V01="28" V02="26" Flag0="0" V10="29" V11="28" V12="27" Flag1="0"/>
+	<Triangles2 V00="29" V01="30" V02="28" Flag0="0" V10="31" V11="30" V12="29" Flag1="0"/>
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_4" VertexBufferIndex="0" VertexOffset="160" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="1" V12="0" Flag1="0"/>
+	<Triangles2 V00="3" V01="4" V02="1" Flag0="0" V10="5" V11="4" V12="3" Flag1="0"/>
+	<Triangles2 V00="5" V01="6" V02="4" Flag0="0" V10="7" V11="6" V12="5" Flag1="0"/>
+	<Triangles2 V00="7" V01="8" V02="6" Flag0="0" V10="9" V11="6" V12="8" Flag1="0"/>
+	<Triangles2 V00="9" V01="10" V02="6" Flag0="0" V10="10" V11="9" V12="11" Flag1="0"/>
+	<Triangles2 V00="10" V01="11" V02="12" Flag0="0" V10="13" V11="10" V12="12" Flag1="0"/>
+	<Triangles2 V00="13" V01="12" V02="14" Flag0="0" V10="15" V11="13" V12="14" Flag1="0"/>
+	<Triangles2 V00="15" V01="14" V02="16" Flag0="0" V10="17" V11="15" V12="16" Flag1="0"/>
+	<Triangles2 V00="17" V01="16" V02="18" Flag0="0" V10="19" V11="17" V12="18" Flag1="0"/>
+	<Triangles2 V00="19" V01="18" V02="20" Flag0="0" V10="21" V11="19" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="20" V02="22" Flag0="0" V10="23" V11="21" V12="22" Flag1="0"/>
+	<Triangles2 V00="23" V01="22" V02="24" Flag0="0" V10="25" V11="23" V12="24" Flag1="0"/>
+	<Triangles2 V00="25" V01="24" V02="26" Flag0="0" V10="27" V11="25" V12="26" Flag1="0"/>
+	<Triangles2 V00="27" V01="26" V02="28" Flag0="0" V10="29" V11="27" V12="28" Flag1="0"/>
+	<Triangles2 V00="29" V01="28" V02="30" Flag0="0" V10="31" V11="29" V12="30" Flag1="0"/>
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_4" VertexBufferIndex="0" VertexOffset="192" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="0" V12="2" Flag1="0"/>
+	<Triangles2 V00="3" V01="2" V02="4" Flag0="0" V10="5" V11="3" V12="4" Flag1="0"/>
+	<Triangles2 V00="5" V01="4" V02="6" Flag0="0" V10="7" V11="5" V12="6" Flag1="0"/>
+	<Triangles2 V00="7" V01="6" V02="8" Flag0="0" V10="9" V11="7" V12="8" Flag1="0"/>
+	<Triangles2 V00="9" V01="8" V02="10" Flag0="0" V10="11" V11="9" V12="10" Flag1="0"/>
+	<Triangles2 V00="11" V01="10" V02="12" Flag0="0" V10="9" V11="11" V12="13" Flag1="0"/>
+	<Triangles2 V00="9" V01="13" V02="14" Flag0="0" V10="7" V11="9" V12="14" Flag1="0"/>
+	<Triangles2 V00="7" V01="14" V02="15" Flag0="0" V10="5" V11="7" V12="15" Flag1="0"/>
+	<Triangles2 V00="5" V01="15" V02="16" Flag0="0" V10="3" V11="5" V12="16" Flag1="0"/>
+	<Triangles2 V00="3" V01="16" V02="17" Flag0="0" V10="0" V11="3" V12="17" Flag1="0"/>
+	<Triangles2 V00="0" V01="17" V02="18" Flag0="0" V10="19" V11="0" V12="18" Flag1="0"/>
+	<Triangles2 V00="19" V01="18" V02="20" Flag0="0" V10="21" V11="19" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="20" V02="22" Flag0="0" V10="23" V11="21" V12="22" Flag1="0"/>
+	<Triangles2 V00="23" V01="22" V02="24" Flag0="0" V10="25" V11="23" V12="24" Flag1="0"/>
+	<Triangles2 V00="25" V01="24" V02="26" Flag0="0" V10="27" V11="25" V12="26" Flag1="0"/>
+	<Triangles2 V00="27" V01="26" V02="28" Flag0="0" V10="29" V11="27" V12="28" Flag1="0"/>
+	<Triangles2 V00="29" V01="28" V02="30" Flag0="0" V10="31" V11="29" V12="30" Flag1="0"/>
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_4" VertexBufferIndex="0" VertexOffset="224" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="0" V12="2" Flag1="0"/>
+	<Triangles2 V00="3" V01="2" V02="4" Flag0="0" V10="5" V11="3" V12="4" Flag1="0"/>
+	<Triangles2 V00="5" V01="4" V02="6" Flag0="0" V10="7" V11="5" V12="6" Flag1="0"/>
+	<Triangles2 V00="7" V01="6" V02="8" Flag0="0" V10="9" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="9" V01="11" V02="12" Flag0="0" V10="9" V11="12" V12="13" Flag1="0"/>
+	<Triangles2 V00="12" V01="14" V02="13" Flag0="0" V10="12" V11="15" V12="14" Flag1="0"/>
+	<Triangles2 V00="12" V01="16" V02="15" Flag0="0" V10="12" V11="17" V12="16" Flag1="0"/>
+	<Triangles2 V00="15" V01="18" V02="14" Flag0="0" V10="15" V11="19" V12="18" Flag1="0"/>
+	<Triangles2 V00="15" V01="20" V02="19" Flag0="0" V10="15" V11="21" V12="20" Flag1="0"/>
+	<Triangles2 V00="14" V01="18" V02="22" Flag0="0" V10="14" V11="22" V12="23" Flag1="0"/>
+	<Triangles2 V00="13" V01="14" V02="23" Flag0="0" V10="13" V11="23" V12="24" Flag1="0"/>
+	<Triangles2 V00="25" V01="13" V02="24" Flag0="0" V10="25" V11="24" V12="26" Flag1="0"/>
+	<Triangles2 V00="27" V01="25" V02="26" Flag0="0" V10="27" V11="26" V12="28" Flag1="0"/>
+	<Triangles2 V00="29" V01="27" V02="28" Flag0="0" V10="29" V11="28" V12="30" Flag1="0"/>
+	<Triangle1 V00="31" V01="29" V02="30"/>
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_4" VertexBufferIndex="0" VertexOffset="256" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="0" V12="2" Flag1="0"/>
+	<Triangles2 V00="3" V01="2" V02="4" Flag0="0" V10="5" V11="3" V12="4" Flag1="0"/>
+	<Triangles2 V00="5" V01="4" V02="6" Flag0="0" V10="7" V11="5" V12="6" Flag1="0"/>
+	<Triangles2 V00="7" V01="6" V02="8" Flag0="0" V10="9" V11="5" V12="7" Flag1="0"/>
+	<Triangles2 V00="9" V01="10" V02="5" Flag0="0" V10="9" V11="11" V12="10" Flag1="0"/>
+	<Triangles2 V00="9" V01="12" V02="11" Flag0="0" V10="10" V11="3" V12="5" Flag1="0"/>
+	<Triangles2 V00="10" V01="13" V02="3" Flag0="0" V10="10" V11="14" V12="13" Flag1="0"/>
+	<Triangles2 V00="10" V01="15" V02="14" Flag0="0" V10="13" V11="0" V12="3" Flag1="0"/>
+	<Triangles2 V00="13" V01="16" V02="0" Flag0="0" V10="13" V11="17" V12="16" Flag1="0"/>
+	<Triangles2 V00="13" V01="18" V02="17" Flag0="0" V10="16" V11="19" V12="0" Flag1="0"/>
+	<Triangles2 V00="16" V01="20" V02="19" Flag0="0" V10="16" V11="21" V12="20" Flag1="0"/>
+	<Triangles2 V00="16" V01="22" V02="21" Flag0="0" V10="20" V11="23" V12="19" Flag1="0"/>
+	<Triangles2 V00="20" V01="24" V02="23" Flag0="0" V10="20" V11="25" V12="24" Flag1="0"/>
+	<Triangles2 V00="20" V01="26" V02="25" Flag0="0" V10="24" V11="27" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="28" V02="27" Flag0="0" V10="24" V11="29" V12="28" Flag1="0"/>
+	<Triangles2 V00="24" V01="30" V02="29" Flag0="0" V10="28" V11="31" V12="27" Flag1="0"/>
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_4" VertexBufferIndex="0" VertexOffset="288" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="0" V01="3" V02="4" Flag0="0" V10="3" V11="5" V12="4" Flag1="0"/>
+	<Triangles2 V00="3" V01="6" V02="5" Flag0="0" V10="3" V11="7" V12="6" Flag1="0"/>
+	<Triangles2 V00="3" V01="8" V02="7" Flag0="0" V10="6" V11="9" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="10" V02="9" Flag0="0" V10="6" V11="11" V12="10" Flag1="0"/>
+	<Triangles2 V00="6" V01="12" V02="11" Flag0="0" V10="5" V11="9" V12="13" Flag1="0"/>
+	<Triangles2 V00="5" V01="13" V02="14" Flag0="0" V10="4" V11="5" V12="14" Flag1="0"/>
+	<Triangles2 V00="4" V01="14" V02="15" Flag0="0" V10="16" V11="4" V12="15" Flag1="0"/>
+	<Triangles2 V00="16" V01="15" V02="17" Flag0="0" V10="0" V11="4" V12="16" Flag1="0"/>
+	<Triangles2 V00="10" V01="18" V02="19" Flag0="0" V10="10" V11="19" V12="20" Flag1="0"/>
+	<Triangles2 V00="10" V01="20" V02="21" Flag0="0" V10="10" V11="21" V12="22" Flag1="0"/>
+	<Triangles2 V00="22" V01="21" V02="23" Flag0="0" V10="22" V11="23" V12="13" Flag1="0"/>
+	<Triangles2 V00="20" V01="24" V02="25" Flag0="0" V10="20" V11="25" V12="26" Flag1="0"/>
+	<Triangles2 V00="20" V01="26" V02="27" Flag0="0" V10="20" V11="27" V12="28" Flag1="0"/>
+	<Triangles2 V00="28" V01="27" V02="29" Flag0="0" V10="28" V11="29" V12="23" Flag1="0"/>
+	<Triangle1 V00="26" V01="30" V02="31"/>
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_4" VertexBufferIndex="0" VertexOffset="320" Count="30"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="2" V01="4" V02="3" Flag0="0" V10="2" V11="5" V12="4" Flag1="0"/>
+	<Triangles2 V00="2" V01="6" V02="5" Flag0="0" V10="2" V11="7" V12="6" Flag1="0"/>
+	<Triangles2 V00="3" V01="4" V02="8" Flag0="0" V10="3" V11="8" V12="9" Flag1="0"/>
+	<Triangles2 V00="10" V01="3" V02="9" Flag0="0" V10="10" V11="9" V12="11" Flag1="0"/>
+	<Triangles2 V00="0" V01="3" V02="10" Flag0="0" V10="12" V11="13" V12="14" Flag1="0"/>
+	<Triangles2 V00="12" V01="15" V02="13" Flag0="0" V10="15" V11="16" V12="13" Flag1="0"/>
+	<Triangles2 V00="15" V01="17" V02="16" Flag0="0" V10="17" V11="18" V12="16" Flag1="0"/>
+	<Triangles2 V00="17" V01="19" V02="18" Flag0="0" V10="19" V11="20" V12="18" Flag1="0"/>
+	<Triangles2 V00="19" V01="21" V02="20" Flag0="0" V10="21" V11="22" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="23" V02="22" Flag0="0" V10="24" V11="25" V12="26" Flag1="0"/>
+	<Triangles2 V00="24" V01="26" V02="27" Flag0="0" V10="28" V11="24" V12="27" Flag1="0"/>
+	<Triangle1 V00="28" V01="27" V02="29"/>
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_4" VertexBufferIndex="0" VertexOffset="350" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="0" V02="3" Flag0="0" V10="4" V11="3" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="6" V11="9" V12="7" Flag1="0"/>
+	<Triangles2 V00="9" V01="10" V02="7" Flag0="0" V10="9" V11="11" V12="10" Flag1="0"/>
+	<Triangles2 V00="11" V01="12" V02="10" Flag0="0" V10="11" V11="13" V12="12" Flag1="0"/>
+	<Triangles2 V00="13" V01="14" V02="12" Flag0="0" V10="13" V11="15" V12="14" Flag1="0"/>
+	<Triangles2 V00="15" V01="16" V02="14" Flag0="0" V10="15" V11="17" V12="16" Flag1="0"/>
+	<Triangles2 V00="18" V01="19" V02="20" Flag0="0" V10="18" V11="20" V12="21" Flag1="0"/>
+	<Triangles2 V00="22" V01="23" V02="24" Flag0="0" V10="22" V11="24" V12="25" Flag1="0"/>
+	<Triangles2 V00="26" V01="27" V02="28" Flag0="0" V10="27" V11="29" V12="28" Flag1="0"/>
+	<Triangles2 V00="29" V01="30" V02="28" Flag0="0" V10="30" V11="31" V12="28" Flag1="0"/>
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_4" VertexBufferIndex="0" VertexOffset="382" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="1" V11="3" V12="2" Flag1="0"/>
+	<Triangles2 V00="3" V01="4" V02="2" Flag0="0" V10="4" V11="5" V12="2" Flag1="0"/>
+	<Triangles2 V00="5" V01="6" V02="2" Flag0="0" V10="6" V11="7" V12="2" Flag1="0"/>
+	<Triangles2 V00="7" V01="8" V02="2" Flag0="0" V10="8" V11="9" V12="2" Flag1="0"/>
+	<Triangles2 V00="9" V01="10" V02="2" Flag0="0" V10="10" V11="11" V12="2" Flag1="0"/>
+	<Triangles2 V00="11" V01="12" V02="2" Flag0="0" V10="13" V11="14" V12="15" Flag1="0"/>
+	<Triangles2 V00="13" V01="15" V02="16" Flag0="0" V10="17" V11="16" V12="15" Flag1="0"/>
+	<Triangles2 V00="17" V01="18" V02="16" Flag0="0" V10="18" V11="17" V12="19" Flag1="0"/>
+	<Triangles2 V00="17" V01="20" V02="19" Flag0="0" V10="17" V11="21" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="17" V02="22" Flag0="0" V10="21" V11="22" V12="23" Flag1="0"/>
+	<Triangles2 V00="14" V01="23" V02="22" Flag0="0" V10="14" V11="24" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="25" V02="23" Flag0="0" V10="24" V11="26" V12="25" Flag1="0"/>
+	<Triangles2 V00="26" V01="27" V02="25" Flag0="0" V10="26" V11="28" V12="27" Flag1="0"/>
+	<Triangles2 V00="28" V01="29" V02="27" Flag0="0" V10="28" V11="30" V12="29" Flag1="0"/>
+	<Triangle1 V00="30" V01="31" V02="29"/>
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_4" VertexBufferIndex="0" VertexOffset="414" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="1" V11="3" V12="2" Flag1="0"/>
+	<Triangles2 V00="1" V01="4" V02="3" Flag0="0" V10="4" V11="5" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="6" V02="5" Flag0="0" V10="6" V11="7" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="8" V02="7" Flag0="0" V10="8" V11="9" V12="7" Flag1="0"/>
+	<Triangles2 V00="8" V01="10" V02="9" Flag0="0" V10="10" V11="11" V12="9" Flag1="0"/>
+	<Triangles2 V00="10" V01="12" V02="11" Flag0="0" V10="12" V11="13" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="14" V02="13" Flag0="0" V10="14" V11="15" V12="13" Flag1="0"/>
+	<Triangles2 V00="14" V01="16" V02="15" Flag0="0" V10="16" V11="17" V12="15" Flag1="0"/>
+	<Triangles2 V00="16" V01="18" V02="17" Flag0="0" V10="18" V11="19" V12="17" Flag1="0"/>
+	<Triangles2 V00="18" V01="20" V02="19" Flag0="0" V10="21" V11="17" V12="19" Flag1="0"/>
+	<Triangles2 V00="21" V01="22" V02="17" Flag0="0" V10="22" V11="21" V12="23" Flag1="0"/>
+	<Triangles2 V00="21" V01="24" V02="23" Flag0="0" V10="21" V11="25" V12="24" Flag1="0"/>
+	<Triangles2 V00="25" V01="21" V02="26" Flag0="0" V10="25" V11="26" V12="27" Flag1="0"/>
+	<Triangles2 V00="20" V01="27" V02="26" Flag0="0" V10="20" V11="28" V12="27" Flag1="0"/>
+	<Triangles2 V00="25" V01="29" V02="24" Flag0="0" V10="30" V11="24" V12="29" Flag1="0"/>
+	<Triangle1 V00="31" V01="30" V02="29"/>
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_4" VertexBufferIndex="0" VertexOffset="446" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="0" V12="2" Flag1="0"/>
+	<Triangles2 V00="3" V01="2" V02="4" Flag0="0" V10="5" V11="4" V12="2" Flag1="0"/>
+	<Triangles2 V00="5" V01="6" V02="4" Flag0="0" V10="6" V11="5" V12="7" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="9" V11="6" V12="8" Flag1="0"/>
+	<Triangles2 V00="9" V01="8" V02="10" Flag0="0" V10="11" V11="9" V12="10" Flag1="0"/>
+	<Triangles2 V00="11" V01="10" V02="12" Flag0="0" V10="13" V11="11" V12="12" Flag1="0"/>
+	<Triangles2 V00="13" V01="12" V02="14" Flag0="0" V10="15" V11="13" V12="14" Flag1="0"/>
+	<Triangles2 V00="15" V01="14" V02="16" Flag0="0" V10="17" V11="15" V12="16" Flag1="0"/>
+	<Triangles2 V00="17" V01="16" V02="18" Flag0="0" V10="19" V11="17" V12="18" Flag1="0"/>
+	<Triangles2 V00="19" V01="18" V02="20" Flag0="0" V10="21" V11="19" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="20" V02="22" Flag0="0" V10="23" V11="21" V12="22" Flag1="0"/>
+	<Triangles2 V00="23" V01="22" V02="24" Flag0="0" V10="25" V11="23" V12="24" Flag1="0"/>
+	<Triangles2 V00="25" V01="24" V02="26" Flag0="0" V10="27" V11="25" V12="26" Flag1="0"/>
+	<Triangles2 V00="27" V01="26" V02="28" Flag0="0" V10="29" V11="27" V12="28" Flag1="0"/>
+	<Triangles2 V00="29" V01="28" V02="30" Flag0="0" V10="27" V11="29" V12="31" Flag1="0"/>
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_4" VertexBufferIndex="0" VertexOffset="478" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="2" V12="1" Flag1="0"/>
+	<Triangles2 V00="4" V01="3" V02="1" Flag0="0" V10="4" V11="1" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="4" V02="5" Flag0="0" V10="3" V11="7" V12="2" Flag1="0"/>
+	<Triangles2 V00="7" V01="8" V02="2" Flag0="0" V10="7" V11="9" V12="8" Flag1="0"/>
+	<Triangles2 V00="9" V01="10" V02="8" Flag0="0" V10="9" V11="11" V12="10" Flag1="0"/>
+	<Triangles2 V00="11" V01="12" V02="10" Flag0="0" V10="11" V11="13" V12="12" Flag1="0"/>
+	<Triangles2 V00="13" V01="14" V02="12" Flag0="0" V10="13" V11="15" V12="14" Flag1="0"/>
+	<Triangles2 V00="15" V01="16" V02="14" Flag0="0" V10="15" V11="17" V12="16" Flag1="0"/>
+	<Triangles2 V00="17" V01="18" V02="16" Flag0="0" V10="17" V11="19" V12="18" Flag1="0"/>
+	<Triangles2 V00="19" V01="20" V02="18" Flag0="0" V10="19" V11="21" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="22" V02="20" Flag0="0" V10="21" V11="23" V12="22" Flag1="0"/>
+	<Triangles2 V00="23" V01="24" V02="22" Flag0="0" V10="23" V11="25" V12="24" Flag1="0"/>
+	<Triangles2 V00="25" V01="26" V02="24" Flag0="0" V10="25" V11="27" V12="26" Flag1="0"/>
+	<Triangles2 V00="27" V01="28" V02="26" Flag0="0" V10="27" V11="29" V12="28" Flag1="0"/>
+	<Triangles2 V00="30" V01="26" V02="28" Flag0="0" V10="30" V11="31" V12="26" Flag1="0"/>
+	<Triangle1 V00="31" V01="24" V02="26"/>
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_4" VertexBufferIndex="0" VertexOffset="510" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="1" V11="3" V12="2" Flag1="0"/>
+	<Triangles2 V00="1" V01="4" V02="3" Flag0="0" V10="4" V11="5" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="6" V02="5" Flag0="0" V10="6" V11="7" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="8" V02="7" Flag0="0" V10="8" V11="9" V12="7" Flag1="0"/>
+	<Triangles2 V00="8" V01="10" V02="9" Flag0="0" V10="10" V11="11" V12="9" Flag1="0"/>
+	<Triangles2 V00="10" V01="12" V02="11" Flag0="0" V10="12" V11="13" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="14" V02="13" Flag0="0" V10="14" V11="15" V12="13" Flag1="0"/>
+	<Triangles2 V00="14" V01="16" V02="15" Flag0="0" V10="16" V11="17" V12="15" Flag1="0"/>
+	<Triangles2 V00="16" V01="18" V02="17" Flag0="0" V10="18" V11="19" V12="17" Flag1="0"/>
+	<Triangles2 V00="20" V01="21" V02="22" Flag0="0" V10="21" V11="23" V12="22" Flag1="0"/>
+	<Triangles2 V00="21" V01="24" V02="23" Flag0="0" V10="24" V11="25" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="26" V02="25" Flag0="0" V10="26" V11="27" V12="25" Flag1="0"/>
+	<Triangles2 V00="26" V01="28" V02="27" Flag0="0" V10="28" V11="29" V12="27" Flag1="0"/>
+	<Triangles2 V00="28" V01="30" V02="29" Flag0="0" V10="30" V11="31" V12="29" Flag1="0"/>
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_4" VertexBufferIndex="0" VertexOffset="542" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="1" V11="3" V12="2" Flag1="0"/>
+	<Triangles2 V00="1" V01="4" V02="3" Flag0="0" V10="4" V11="5" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="6" V02="5" Flag0="0" V10="6" V11="7" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="8" V02="7" Flag0="0" V10="8" V11="9" V12="7" Flag1="0"/>
+	<Triangles2 V00="8" V01="10" V02="9" Flag0="0" V10="10" V11="11" V12="9" Flag1="0"/>
+	<Triangles2 V00="10" V01="12" V02="11" Flag0="0" V10="12" V11="13" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="14" V02="13" Flag0="0" V10="14" V11="15" V12="13" Flag1="0"/>
+	<Triangles2 V00="14" V01="16" V02="15" Flag0="0" V10="16" V11="17" V12="15" Flag1="0"/>
+	<Triangles2 V00="16" V01="18" V02="17" Flag0="0" V10="18" V11="19" V12="17" Flag1="0"/>
+	<Triangles2 V00="18" V01="20" V02="19" Flag0="0" V10="20" V11="21" V12="19" Flag1="0"/>
+	<Triangles2 V00="20" V01="22" V02="21" Flag0="0" V10="22" V11="23" V12="21" Flag1="0"/>
+	<Triangles2 V00="21" V01="23" V02="24" Flag0="0" V10="23" V11="25" V12="24" Flag1="0"/>
+	<Triangles2 V00="23" V01="26" V02="25" Flag0="0" V10="26" V11="27" V12="25" Flag1="0"/>
+	<Triangles2 V00="26" V01="28" V02="27" Flag0="0" V10="28" V11="29" V12="27" Flag1="0"/>
+	<Triangles2 V00="28" V01="30" V02="29" Flag0="0" V10="30" V11="31" V12="29" Flag1="0"/>
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_4" VertexBufferIndex="0" VertexOffset="574" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="1" V11="3" V12="2" Flag1="0"/>
+	<Triangles2 V00="1" V01="4" V02="3" Flag0="0" V10="4" V11="5" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="6" V02="5" Flag0="0" V10="6" V11="7" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="8" V02="7" Flag0="0" V10="8" V11="9" V12="7" Flag1="0"/>
+	<Triangles2 V00="8" V01="10" V02="9" Flag0="0" V10="10" V11="11" V12="9" Flag1="0"/>
+	<Triangles2 V00="10" V01="12" V02="11" Flag0="0" V10="12" V11="13" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="14" V02="13" Flag0="0" V10="14" V11="15" V12="13" Flag1="0"/>
+	<Triangles2 V00="14" V01="16" V02="15" Flag0="0" V10="16" V11="17" V12="15" Flag1="0"/>
+	<Triangles2 V00="16" V01="18" V02="17" Flag0="0" V10="18" V11="19" V12="17" Flag1="0"/>
+	<Triangles2 V00="18" V01="20" V02="19" Flag0="0" V10="20" V11="21" V12="19" Flag1="0"/>
+	<Triangles2 V00="20" V01="22" V02="21" Flag0="0" V10="22" V11="23" V12="21" Flag1="0"/>
+	<Triangles2 V00="22" V01="24" V02="23" Flag0="0" V10="24" V11="25" V12="23" Flag1="0"/>
+	<Triangles2 V00="26" V01="27" V02="28" Flag0="0" V10="27" V11="29" V12="28" Flag1="0"/>
+	<Triangles2 V00="27" V01="30" V02="29" Flag0="0" V10="30" V11="31" V12="29" Flag1="0"/>
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_4" VertexBufferIndex="0" VertexOffset="606" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="1" V11="3" V12="2" Flag1="0"/>
+	<Triangles2 V00="1" V01="4" V02="3" Flag0="0" V10="4" V11="5" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="6" V02="5" Flag0="0" V10="6" V11="7" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="8" V02="7" Flag0="0" V10="8" V11="9" V12="7" Flag1="0"/>
+	<Triangles2 V00="8" V01="10" V02="9" Flag0="0" V10="10" V11="11" V12="9" Flag1="0"/>
+	<Triangles2 V00="10" V01="12" V02="11" Flag0="0" V10="12" V11="13" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="14" V02="13" Flag0="0" V10="14" V11="15" V12="13" Flag1="0"/>
+	<Triangles2 V00="14" V01="16" V02="15" Flag0="0" V10="16" V11="17" V12="15" Flag1="0"/>
+	<Triangles2 V00="16" V01="18" V02="17" Flag0="0" V10="18" V11="19" V12="17" Flag1="0"/>
+	<Triangles2 V00="18" V01="20" V02="19" Flag0="0" V10="20" V11="21" V12="19" Flag1="0"/>
+	<Triangles2 V00="20" V01="22" V02="21" Flag0="0" V10="22" V11="23" V12="21" Flag1="0"/>
+	<Triangles2 V00="22" V01="24" V02="23" Flag0="0" V10="24" V11="25" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="26" V02="25" Flag0="0" V10="26" V11="27" V12="25" Flag1="0"/>
+	<Triangles2 V00="26" V01="28" V02="27" Flag0="0" V10="28" V11="29" V12="27" Flag1="0"/>
+	<Triangles2 V00="27" V01="29" V02="30" Flag0="0" V10="29" V11="31" V12="30" Flag1="0"/>
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_4" VertexBufferIndex="0" VertexOffset="638" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="1" V11="3" V12="2" Flag1="0"/>
+	<Triangles2 V00="1" V01="4" V02="3" Flag0="0" V10="4" V11="5" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="6" V02="5" Flag0="0" V10="6" V11="7" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="8" V02="7" Flag0="0" V10="8" V11="9" V12="7" Flag1="0"/>
+	<Triangles2 V00="8" V01="10" V02="9" Flag0="0" V10="10" V11="11" V12="9" Flag1="0"/>
+	<Triangles2 V00="10" V01="12" V02="11" Flag0="0" V10="12" V11="13" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="14" V02="13" Flag0="0" V10="14" V11="15" V12="13" Flag1="0"/>
+	<Triangles2 V00="14" V01="16" V02="15" Flag0="0" V10="16" V11="17" V12="15" Flag1="0"/>
+	<Triangles2 V00="16" V01="18" V02="17" Flag0="0" V10="18" V11="19" V12="17" Flag1="0"/>
+	<Triangles2 V00="18" V01="20" V02="19" Flag0="0" V10="20" V11="21" V12="19" Flag1="0"/>
+	<Triangles2 V00="20" V01="22" V02="21" Flag0="0" V10="22" V11="23" V12="21" Flag1="0"/>
+	<Triangles2 V00="22" V01="24" V02="23" Flag0="0" V10="24" V11="25" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="26" V02="25" Flag0="0" V10="26" V11="27" V12="25" Flag1="0"/>
+	<Triangles2 V00="26" V01="28" V02="27" Flag0="0" V10="28" V11="29" V12="27" Flag1="0"/>
+	<Triangles2 V00="28" V01="30" V02="29" Flag0="0" V10="30" V11="31" V12="29" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_5 b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_5
new file mode 100644
index 000000000..e815ce7ed
--- /dev/null
+++ b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_5
@@ -0,0 +1,30 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_5" VertexBufferIndex="0" VertexOffset="0" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="2" Flag1="0"/>
+	<Triangles2 V00="5" V01="6" V02="7" Flag0="0" V10="6" V11="8" V12="7" Flag1="0"/>
+	<Triangles2 V00="8" V01="9" V02="7" Flag0="0" V10="9" V11="10" V12="7" Flag1="0"/>
+	<Triangles2 V00="10" V01="11" V02="7" Flag0="0" V10="12" V11="13" V12="7" Flag1="0"/>
+	<Triangles2 V00="13" V01="14" V02="7" Flag0="0" V10="14" V11="15" V12="7" Flag1="0"/>
+	<Triangles2 V00="15" V01="16" V02="7" Flag0="0" V10="16" V11="17" V12="7" Flag1="0"/>
+	<Triangles2 V00="17" V01="18" V02="7" Flag0="0" V10="18" V11="19" V12="7" Flag1="0"/>
+	<Triangles2 V00="19" V01="20" V02="7" Flag0="0" V10="20" V11="21" V12="7" Flag1="0"/>
+	<Triangles2 V00="22" V01="23" V02="24" Flag0="0" V10="22" V11="24" V12="25" Flag1="0"/>
+	<Triangles2 V00="26" V01="22" V02="25" Flag0="0" V10="26" V11="25" V12="27" Flag1="0"/>
+	<Triangles2 V00="28" V01="26" V02="27" Flag0="0" V10="28" V11="27" V12="29" Flag1="0"/>
+	<Triangles2 V00="30" V01="28" V02="29" Flag0="0" V10="30" V11="29" V12="31" Flag1="0"/>
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_5" VertexBufferIndex="0" VertexOffset="32" Count="28"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="0" V02="3" Flag0="0" V10="4" V11="3" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="4" V02="5" Flag0="0" V10="6" V11="5" V12="7" Flag1="0"/>
+	<Triangles2 V00="8" V01="6" V02="7" Flag0="0" V10="8" V11="7" V12="9" Flag1="0"/>
+	<Triangles2 V00="10" V01="8" V02="9" Flag0="0" V10="10" V11="9" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="10" V02="11" Flag0="0" V10="12" V11="11" V12="13" Flag1="0"/>
+	<Triangles2 V00="14" V01="12" V02="13" Flag0="0" V10="14" V11="13" V12="15" Flag1="0"/>
+	<Triangles2 V00="16" V01="14" V02="15" Flag0="0" V10="16" V11="15" V12="17" Flag1="0"/>
+	<Triangles2 V00="18" V01="16" V02="17" Flag0="0" V10="18" V11="17" V12="19" Flag1="0"/>
+	<Triangles2 V00="20" V01="18" V02="19" Flag0="0" V10="20" V11="19" V12="21" Flag1="0"/>
+	<Triangles2 V00="22" V01="20" V02="21" Flag0="0" V10="22" V11="21" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="25" V02="26" Flag0="0" V10="24" V11="26" V12="27" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_6 b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_6
new file mode 100644
index 000000000..1c9bb3d9e
--- /dev/null
+++ b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_6
@@ -0,0 +1,39 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_6" VertexBufferIndex="0" VertexOffset="0" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="3" V12="1" Flag1="0"/>
+	<Triangles2 V00="4" V01="3" V02="0" Flag0="0" V10="4" V11="5" V12="3" Flag1="0"/>
+	<Triangles2 V00="6" V01="5" V02="4" Flag0="0" V10="6" V11="7" V12="5" Flag1="0"/>
+	<Triangles2 V00="8" V01="7" V02="6" Flag0="0" V10="8" V11="9" V12="7" Flag1="0"/>
+	<Triangles2 V00="10" V01="9" V02="8" Flag0="0" V10="10" V11="11" V12="9" Flag1="0"/>
+	<Triangles2 V00="12" V01="11" V02="10" Flag0="0" V10="12" V11="13" V12="11" Flag1="0"/>
+	<Triangles2 V00="14" V01="13" V02="12" Flag0="0" V10="14" V11="15" V12="13" Flag1="0"/>
+	<Triangles2 V00="16" V01="15" V02="14" Flag0="0" V10="16" V11="17" V12="15" Flag1="0"/>
+	<Triangles2 V00="18" V01="17" V02="16" Flag0="0" V10="18" V11="19" V12="17" Flag1="0"/>
+	<Triangles2 V00="20" V01="19" V02="18" Flag0="0" V10="20" V11="21" V12="19" Flag1="0"/>
+	<Triangles2 V00="22" V01="21" V02="20" Flag0="0" V10="22" V11="23" V12="21" Flag1="0"/>
+	<Triangles2 V00="24" V01="23" V02="22" Flag0="0" V10="24" V11="25" V12="23" Flag1="0"/>
+	<Triangles2 V00="26" V01="25" V02="24" Flag0="0" V10="26" V11="27" V12="25" Flag1="0"/>
+	<Triangles2 V00="28" V01="27" V02="26" Flag0="0" V10="28" V11="29" V12="27" Flag1="0"/>
+	<Triangles2 V00="30" V01="29" V02="28" Flag0="0" V10="30" V11="31" V12="29" Flag1="0"/>
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_6" VertexBufferIndex="0" VertexOffset="32" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="3" V12="1" Flag1="0"/>
+	<Triangles2 V00="3" V01="4" V02="1" Flag0="0" V10="3" V11="5" V12="4" Flag1="0"/>
+	<Triangles2 V00="1" V01="4" V02="6" Flag0="0" V10="1" V11="6" V12="7" Flag1="0"/>
+	<Triangles2 V00="7" V01="6" V02="8" Flag0="0" V10="7" V11="8" V12="9" Flag1="0"/>
+	<Triangles2 V00="9" V01="8" V02="10" Flag0="0" V10="9" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="11" V01="10" V02="12" Flag0="0" V10="11" V11="12" V12="13" Flag1="0"/>
+	<Triangles2 V00="13" V01="12" V02="14" Flag0="0" V10="13" V11="14" V12="15" Flag1="0"/>
+	<Triangles2 V00="15" V01="14" V02="16" Flag0="0" V10="15" V11="16" V12="17" Flag1="0"/>
+	<Triangles2 V00="17" V01="16" V02="18" Flag0="0" V10="17" V11="18" V12="19" Flag1="0"/>
+	<Triangles2 V00="19" V01="18" V02="20" Flag0="0" V10="19" V11="20" V12="21" Flag1="0"/>
+	<Triangles2 V00="21" V01="20" V02="22" Flag0="0" V10="21" V11="22" V12="23" Flag1="0"/>
+	<Triangles2 V00="23" V01="22" V02="24" Flag0="0" V10="23" V11="24" V12="25" Flag1="0"/>
+	<Triangles2 V00="25" V01="24" V02="26" Flag0="0" V10="25" V11="26" V12="27" Flag1="0"/>
+	<Triangles2 V00="27" V01="26" V02="28" Flag0="0" V10="27" V11="28" V12="29" Flag1="0"/>
+	<Triangles2 V00="29" V01="28" V02="30" Flag0="0" V10="29" V11="30" V12="31" Flag1="0"/>
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_6" VertexBufferIndex="0" VertexOffset="64" Count="6"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="3" V01="2" V02="4" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_7 b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_7
new file mode 100644
index 000000000..fff6a9fee
--- /dev/null
+++ b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_7
@@ -0,0 +1,80 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_7" VertexBufferIndex="0" VertexOffset="0" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="3" V12="1" Flag1="0"/>
+	<Triangles2 V00="4" V01="3" V02="0" Flag0="0" V10="4" V11="5" V12="3" Flag1="0"/>
+	<Triangles2 V00="6" V01="5" V02="4" Flag0="0" V10="6" V11="7" V12="5" Flag1="0"/>
+	<Triangles2 V00="7" V01="6" V02="8" Flag0="0" V10="7" V11="8" V12="9" Flag1="0"/>
+	<Triangles2 V00="10" V01="9" V02="8" Flag0="0" V10="10" V11="11" V12="9" Flag1="0"/>
+	<Triangles2 V00="11" V01="10" V02="12" Flag0="0" V10="11" V11="12" V12="13" Flag1="0"/>
+	<Triangles2 V00="14" V01="13" V02="12" Flag0="0" V10="14" V11="15" V12="13" Flag1="0"/>
+	<Triangles2 V00="16" V01="15" V02="14" Flag0="0" V10="16" V11="17" V12="15" Flag1="0"/>
+	<Triangles2 V00="17" V01="18" V02="15" Flag0="0" V10="17" V11="19" V12="18" Flag1="0"/>
+	<Triangles2 V00="19" V01="20" V02="18" Flag0="0" V10="19" V11="21" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="22" V02="20" Flag0="0" V10="21" V11="23" V12="22" Flag1="0"/>
+	<Triangles2 V00="24" V01="22" V02="23" Flag0="0" V10="24" V11="23" V12="25" Flag1="0"/>
+	<Triangles2 V00="22" V01="24" V02="26" Flag0="0" V10="22" V11="26" V12="27" Flag1="0"/>
+	<Triangles2 V00="28" V01="27" V02="26" Flag0="0" V10="28" V11="29" V12="27" Flag1="0"/>
+	<Triangles2 V00="29" V01="28" V02="30" Flag0="0" V10="29" V11="30" V12="31" Flag1="0"/>
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_7" VertexBufferIndex="0" VertexOffset="32" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="3" V12="1" Flag1="0"/>
+	<Triangles2 V00="3" V01="0" V02="4" Flag0="0" V10="5" V11="4" V12="0" Flag1="0"/>
+	<Triangles2 V00="5" V01="6" V02="4" Flag0="0" V10="7" V11="6" V12="5" Flag1="0"/>
+	<Triangles2 V00="7" V01="8" V02="6" Flag0="0" V10="7" V11="9" V12="8" Flag1="0"/>
+	<Triangles2 V00="7" V01="10" V02="9" Flag0="0" V10="10" V11="7" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="11" V02="7" Flag0="0" V10="12" V11="13" V12="11" Flag1="0"/>
+	<Triangles2 V00="10" V01="11" V02="14" Flag0="0" V10="10" V11="14" V12="15" Flag1="0"/>
+	<Triangles2 V00="10" V01="15" V02="16" Flag0="0" V10="17" V11="16" V12="15" Flag1="0"/>
+	<Triangles2 V00="17" V01="15" V02="18" Flag0="0" V10="19" V11="17" V12="18" Flag1="0"/>
+	<Triangles2 V00="19" V01="9" V02="17" Flag0="0" V10="8" V11="9" V12="19" Flag1="0"/>
+	<Triangles2 V00="8" V01="19" V02="20" Flag0="0" V10="8" V11="20" V12="21" Flag1="0"/>
+	<Triangles2 V00="8" V01="21" V02="22" Flag0="0" V10="9" V11="16" V12="17" Flag1="0"/>
+	<Triangles2 V00="9" V01="10" V02="16" Flag0="0" V10="23" V11="24" V12="25" Flag1="0"/>
+	<Triangles2 V00="23" V01="26" V02="24" Flag0="0" V10="27" V11="26" V12="23" Flag1="0"/>
+	<Triangles2 V00="27" V01="28" V02="26" Flag0="0" V10="29" V11="28" V12="27" Flag1="0"/>
+	<Triangles2 V00="29" V01="27" V02="30" Flag0="0" V10="30" V11="27" V12="31" Flag1="0"/>
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_7" VertexBufferIndex="0" VertexOffset="64" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="0" V02="5" Flag0="0" V10="4" V11="5" V12="6" Flag1="0"/>
+	<Triangles2 V00="4" V01="6" V02="7" Flag0="0" V10="8" V11="7" V12="6" Flag1="0"/>
+	<Triangles2 V00="8" V01="6" V02="9" Flag0="0" V10="10" V11="8" V12="9" Flag1="0"/>
+	<Triangles2 V00="10" V01="11" V02="8" Flag0="0" V10="12" V11="11" V12="10" Flag1="0"/>
+	<Triangles2 V00="12" V01="10" V02="13" Flag0="0" V10="14" V11="12" V12="13" Flag1="0"/>
+	<Triangles2 V00="14" V01="15" V02="12" Flag0="0" V10="11" V11="7" V12="8" Flag1="0"/>
+	<Triangles2 V00="11" V01="4" V02="7" Flag0="0" V10="16" V11="17" V12="18" Flag1="0"/>
+	<Triangles2 V00="16" V01="19" V02="17" Flag0="0" V10="20" V11="19" V12="16" Flag1="0"/>
+	<Triangles2 V00="20" V01="21" V02="19" Flag0="0" V10="22" V11="21" V12="20" Flag1="0"/>
+	<Triangles2 V00="22" V01="23" V02="21" Flag0="0" V10="23" V11="22" V12="24" Flag1="0"/>
+	<Triangles2 V00="23" V01="24" V02="25" Flag0="0" V10="26" V11="25" V12="24" Flag1="0"/>
+	<Triangles2 V00="26" V01="27" V02="25" Flag0="0" V10="27" V11="26" V12="28" Flag1="0"/>
+	<Triangles2 V00="27" V01="28" V02="29" Flag0="0" V10="30" V11="29" V12="28" Flag1="0"/>
+	<Triangle1 V00="30" V01="31" V02="29"/>
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_7" VertexBufferIndex="0" VertexOffset="96" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="3" V12="1" Flag1="0"/>
+	<Triangles2 V00="3" V01="4" V02="1" Flag0="0" V10="3" V11="5" V12="4" Flag1="0"/>
+	<Triangles2 V00="6" V01="1" V02="4" Flag0="0" V10="6" V11="7" V12="1" Flag1="0"/>
+	<Triangles2 V00="7" V01="6" V02="8" Flag0="0" V10="7" V11="8" V12="9" Flag1="0"/>
+	<Triangles2 V00="10" V01="9" V02="8" Flag0="0" V10="10" V11="11" V12="9" Flag1="0"/>
+	<Triangles2 V00="11" V01="10" V02="12" Flag0="0" V10="10" V11="13" V12="12" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="12" V11="14" V12="15" Flag1="0"/>
+	<Triangles2 V00="15" V01="14" V02="16" Flag0="0" V10="15" V11="16" V12="17" Flag1="0"/>
+	<Triangles2 V00="18" V01="15" V02="17" Flag0="0" V10="18" V11="17" V12="19" Flag1="0"/>
+	<Triangles2 V00="20" V01="18" V02="19" Flag0="0" V10="20" V11="19" V12="21" Flag1="0"/>
+	<Triangles2 V00="22" V01="18" V02="20" Flag0="0" V10="22" V11="23" V12="18" Flag1="0"/>
+	<Triangles2 V00="24" V01="23" V02="22" Flag0="0" V10="24" V11="11" V12="23" Flag1="0"/>
+	<Triangles2 V00="11" V01="24" V02="25" Flag0="0" V10="11" V11="25" V12="9" Flag1="0"/>
+	<Triangles2 V00="26" V01="9" V02="25" Flag0="0" V10="26" V11="7" V12="9" Flag1="0"/>
+	<Triangles2 V00="7" V01="26" V02="2" Flag0="0" V10="7" V11="2" V12="1" Flag1="0"/>
+	<Triangles2 V00="11" V01="12" V02="23" Flag0="0" V10="23" V11="12" V12="15" Flag1="0"/>
+	<Triangles2 V00="23" V01="15" V02="18" Flag0="0" V10="27" V11="28" V12="29" Flag1="0"/>
+	<Triangles2 V00="29" V01="30" V02="27" Flag0="0" V10="29" V11="31" V12="30" Flag1="0"/>
+	<LoadVertices Path="objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_7" VertexBufferIndex="0" VertexOffset="128" Count="17"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="3" V01="6" V02="4" Flag0="0" V10="7" V11="6" V12="3" Flag1="0"/>
+	<Triangles2 V00="7" V01="8" V02="6" Flag0="0" V10="9" V11="8" V12="7" Flag1="0"/>
+	<Triangles2 V00="9" V01="10" V02="8" Flag0="0" V10="11" V11="10" V12="9" Flag1="0"/>
+	<Triangles2 V00="11" V01="12" V02="10" Flag0="0" V10="13" V11="12" V12="11" Flag1="0"/>
+	<Triangles2 V00="13" V01="14" V02="12" Flag0="0" V10="15" V11="14" V12="13" Flag1="0"/>
+	<Triangle1 V00="15" V01="16" V02="14"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_0 b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_0
new file mode 100644
index 000000000..810b26e0c
--- /dev/null
+++ b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_0
@@ -0,0 +1,147 @@
+<Vertex Version="0">
+	<Vtx X="24" Y="-76" Z="78" S="-138" T="-288" R="68" G="63" B="87" A="255"/>
+	<Vtx X="21" Y="-73" Z="72" S="-95" T="-523" R="188" G="104" B="28" A="255"/>
+	<Vtx X="21" Y="-76" Z="78" S="-138" T="-523" R="188" G="63" B="87" A="255"/>
+	<Vtx X="24" Y="-73" Z="72" S="-95" T="-288" R="68" G="104" B="28" A="255"/>
+	<Vtx X="24" Y="-76" Z="78" S="-138" T="-266" R="121" G="4" B="38" A="255"/>
+	<Vtx X="24" Y="-73" Z="72" S="-95" T="-266" R="125" G="24" B="5" A="255"/>
+	<Vtx X="24" Y="-83" Z="73" S="-138" T="-33" R="121" G="220" B="15" A="255"/>
+	<Vtx X="24" Y="-80" Z="68" S="-95" T="-33" R="125" G="240" B="237" A="255"/>
+	<Vtx X="24" Y="-83" Z="73" S="-138" T="-11" R="68" G="149" B="244" A="255"/>
+	<Vtx X="24" Y="-80" Z="68" S="-95" T="-11" R="68" G="181" B="180" A="255"/>
+	<Vtx X="21" Y="-83" Z="73" S="-138" T="224" R="188" G="149" B="244" A="255"/>
+	<Vtx X="21" Y="-80" Z="68" S="-95" T="224" R="188" G="181" B="180" A="255"/>
+	<Vtx X="21" Y="-83" Z="73" S="-138" T="246" R="135" G="220" B="15" A="255"/>
+	<Vtx X="21" Y="-80" Z="68" S="-95" T="246" R="131" G="240" B="237" A="255"/>
+	<Vtx X="21" Y="-76" Z="78" S="-138" T="479" R="135" G="4" B="38" A="255"/>
+	<Vtx X="21" Y="-73" Z="72" S="-95" T="479" R="131" G="24" B="5" A="255"/>
+	<Vtx X="21" Y="-76" Z="78" S="-138" T="491" R="188" G="63" B="87" A="255"/>
+	<Vtx X="21" Y="-73" Z="72" S="-95" T="491" R="188" G="104" B="28" A="255"/>
+	<Vtx X="21" Y="-73" Z="68" S="-82" T="469" R="130" G="16" B="5" A="255"/>
+	<Vtx X="21" Y="-73" Z="68" S="-82" T="491" R="176" G="96" B="23" A="255"/>
+	<Vtx X="21" Y="-60" Z="46" S="69" T="469" R="130" G="12" B="12" A="255"/>
+	<Vtx X="21" Y="-60" Z="47" S="69" T="491" R="176" G="69" B="71" A="255"/>
+	<Vtx X="21" Y="-59" Z="46" S="77" T="474" R="131" G="16" B="18" A="255"/>
+	<Vtx X="21" Y="-59" Z="46" S="77" T="491" R="188" G="76" B="75" A="255"/>
+	<Vtx X="21" Y="-57" Z="43" S="99" T="474" R="134" G="33" B="246" A="255"/>
+	<Vtx X="21" Y="-57" Z="43" S="99" T="491" R="186" G="104" B="21" A="255"/>
+	<Vtx X="21" Y="-62" Z="40" S="99" T="251" R="134" G="249" B="223" A="255"/>
+	<Vtx X="21" Y="-64" Z="43" S="77" T="251" R="131" G="232" B="251" A="255"/>
+	<Vtx X="21" Y="-62" Z="40" S="99" T="224" R="186" G="187" B="176" A="255"/>
+	<Vtx X="21" Y="-64" Z="43" S="77" T="224" R="188" G="153" B="227" A="255"/>
+	<Vtx X="24" Y="-62" Z="40" S="99" T="-11" R="70" G="187" B="176" A="255"/>
+	<Vtx X="24" Y="-64" Z="43" S="77" T="-11" R="68" G="153" B="227" A="255"/>
+	<Vtx X="24" Y="-62" Z="40" S="99" T="-38" R="122" G="249" B="223" A="255"/>
+	<Vtx X="24" Y="-64" Z="43" S="77" T="-11" R="68" G="153" B="227" A="255"/>
+	<Vtx X="24" Y="-62" Z="40" S="99" T="-11" R="70" G="187" B="176" A="255"/>
+	<Vtx X="24" Y="-64" Z="43" S="77" T="-38" R="125" G="232" B="251" A="255"/>
+	<Vtx X="24" Y="-57" Z="43" S="99" T="-261" R="122" G="33" B="246" A="255"/>
+	<Vtx X="24" Y="-61" Z="40" S="108" T="-45" R="114" G="15" B="202" A="255"/>
+	<Vtx X="24" Y="-57" Z="42" S="108" T="-253" R="114" G="39" B="216" A="255"/>
+	<Vtx X="24" Y="-61" Z="39" S="126" T="-31" R="52" G="7" B="140" A="255"/>
+	<Vtx X="24" Y="-57" Z="41" S="126" T="-268" R="52" G="97" B="193" A="255"/>
+	<Vtx X="21" Y="-57" Z="41" S="343" T="-268" R="204" G="97" B="193" A="255"/>
+	<Vtx X="21" Y="-61" Z="39" S="343" T="-31" R="204" G="7" B="140" A="255"/>
+	<Vtx X="24" Y="-62" Z="40" S="117" T="-21" R="70" G="187" B="176" A="255"/>
+	<Vtx X="24" Y="-61" Z="40" S="112" T="-29" R="114" G="15" B="202" A="255"/>
+	<Vtx X="24" Y="-62" Z="40" S="108" T="-23" R="122" G="249" B="223" A="255"/>
+	<Vtx X="21" Y="-62" Z="40" S="352" T="-21" R="186" G="187" B="176" A="255"/>
+	<Vtx X="21" Y="-62" Z="40" S="363" T="-38" R="134" G="249" B="223" A="255"/>
+	<Vtx X="21" Y="-61" Z="40" S="358" T="-45" R="142" G="15" B="202" A="255"/>
+	<Vtx X="21" Y="-57" Z="42" S="358" T="-253" R="142" G="39" B="216" A="255"/>
+	<Vtx X="21" Y="-57" Z="43" S="363" T="-261" R="134" G="33" B="246" A="255"/>
+	<Vtx X="21" Y="-57" Z="43" S="352" T="-277" R="186" G="104" B="21" A="255"/>
+	<Vtx X="24" Y="-57" Z="43" S="117" T="-277" R="70" G="104" B="21" A="255"/>
+	<Vtx X="24" Y="-57" Z="43" S="108" T="-275" R="122" G="33" B="246" A="255"/>
+	<Vtx X="24" Y="-57" Z="42" S="112" T="-269" R="114" G="39" B="216" A="255"/>
+	<Vtx X="24" Y="-78" Z="78" S="-157" T="-254" R="111" G="236" B="59" A="255"/>
+	<Vtx X="24" Y="-83" Z="73" S="-138" T="-33" R="121" G="220" B="15" A="255"/>
+	<Vtx X="24" Y="-76" Z="78" S="-138" T="-266" R="121" G="4" B="38" A="255"/>
+	<Vtx X="24" Y="-83" Z="76" S="-157" T="-45" R="110" G="214" B="47" A="255"/>
+	<Vtx X="23" Y="-78" Z="79" S="-177" T="-266" R="49" G="237" B="116" A="255"/>
+	<Vtx X="23" Y="-83" Z="76" S="-177" T="-33" R="49" G="165" B="73" A="255"/>
+	<Vtx X="22" Y="-83" Z="76" S="-377" T="-33" R="207" G="165" B="73" A="255"/>
+	<Vtx X="22" Y="-78" Z="79" S="-377" T="-266" R="207" G="237" B="116" A="255"/>
+	<Vtx X="24" Y="-76" Z="78" S="-160" T="-277" R="68" G="63" B="87" A="255"/>
+	<Vtx X="24" Y="-76" Z="78" S="-160" T="-277" R="68" G="63" B="87" A="255"/>
+	<Vtx X="23" Y="-78" Z="79" S="-177" T="-266" R="49" G="237" B="116" A="255"/>
+	<Vtx X="24" Y="-78" Z="78" S="-160" T="-267" R="111" G="236" B="59" A="255"/>
+	<Vtx X="24" Y="-76" Z="78" S="-151" T="-276" R="121" G="4" B="38" A="255"/>
+	<Vtx X="22" Y="-78" Z="79" S="-377" T="-266" R="207" G="237" B="116" A="255"/>
+	<Vtx X="21" Y="-76" Z="78" S="-395" T="-277" R="188" G="63" B="87" A="255"/>
+	<Vtx X="21" Y="-76" Z="78" S="-405" T="-266" R="135" G="4" B="38" A="255"/>
+	<Vtx X="21" Y="-78" Z="78" S="-396" T="-254" R="145" G="236" B="59" A="255"/>
+	<Vtx X="21" Y="-83" Z="76" S="-396" T="-45" R="146" G="214" B="47" A="255"/>
+	<Vtx X="21" Y="-83" Z="73" S="-405" T="-33" R="135" G="220" B="15" A="255"/>
+	<Vtx X="21" Y="-83" Z="73" S="-395" T="-21" R="188" G="149" B="244" A="255"/>
+	<Vtx X="22" Y="-83" Z="76" S="-377" T="-33" R="207" G="165" B="73" A="255"/>
+	<Vtx X="23" Y="-83" Z="76" S="-177" T="-33" R="49" G="165" B="73" A="255"/>
+	<Vtx X="24" Y="-83" Z="73" S="-160" T="-21" R="68" G="149" B="244" A="255"/>
+	<Vtx X="24" Y="-83" Z="73" S="-151" T="-23" R="121" G="220" B="15" A="255"/>
+	<Vtx X="24" Y="-83" Z="76" S="-160" T="-32" R="110" G="214" B="47" A="255"/>
+	<Vtx X="24" Y="-73" Z="72" S="-95" T="-288" R="68" G="104" B="28" A="255"/>
+	<Vtx X="21" Y="-73" Z="68" S="-82" T="-523" R="176" G="96" B="23" A="255"/>
+	<Vtx X="21" Y="-73" Z="72" S="-95" T="-523" R="188" G="104" B="28" A="255"/>
+	<Vtx X="24" Y="-73" Z="68" S="-82" T="-288" R="80" G="96" B="23" A="255"/>
+	<Vtx X="24" Y="-73" Z="72" S="-95" T="-266" R="125" G="24" B="5" A="255"/>
+	<Vtx X="24" Y="-73" Z="68" S="-82" T="-255" R="126" G="16" B="5" A="255"/>
+	<Vtx X="24" Y="-80" Z="68" S="-95" T="-33" R="125" G="240" B="237" A="255"/>
+	<Vtx X="24" Y="-76" Z="66" S="-82" T="-43" R="126" G="244" B="244" A="255"/>
+	<Vtx X="24" Y="-80" Z="68" S="-95" T="-11" R="68" G="181" B="180" A="255"/>
+	<Vtx X="24" Y="-77" Z="66" S="-82" T="-11" R="80" G="188" B="184" A="255"/>
+	<Vtx X="21" Y="-80" Z="68" S="-95" T="224" R="188" G="181" B="180" A="255"/>
+	<Vtx X="21" Y="-77" Z="66" S="-82" T="224" R="176" G="188" B="184" A="255"/>
+	<Vtx X="21" Y="-80" Z="68" S="-95" T="246" R="131" G="240" B="237" A="255"/>
+	<Vtx X="21" Y="-76" Z="66" S="-82" T="257" R="130" G="244" B="244" A="255"/>
+	<Vtx X="21" Y="-73" Z="72" S="-95" T="479" R="131" G="24" B="5" A="255"/>
+	<Vtx X="21" Y="-73" Z="68" S="-82" T="469" R="130" G="16" B="5" A="255"/>
+	<Vtx X="21" Y="-73" Z="68" S="-82" T="469" R="130" G="16" B="5" A="255"/>
+	<Vtx X="21" Y="-64" Z="44" S="69" T="257" R="130" G="240" B="251" A="255"/>
+	<Vtx X="21" Y="-76" Z="66" S="-82" T="257" R="130" G="244" B="244" A="255"/>
+	<Vtx X="21" Y="-60" Z="46" S="69" T="469" R="130" G="12" B="12" A="255"/>
+	<Vtx X="21" Y="-64" Z="43" S="77" T="251" R="131" G="232" B="251" A="255"/>
+	<Vtx X="21" Y="-59" Z="46" S="77" T="474" R="131" G="16" B="18" A="255"/>
+	<Vtx X="21" Y="-64" Z="43" S="77" T="224" R="188" G="153" B="227" A="255"/>
+	<Vtx X="21" Y="-64" Z="44" S="69" T="224" R="176" G="160" B="232" A="255"/>
+	<Vtx X="24" Y="-64" Z="43" S="77" T="-11" R="68" G="153" B="227" A="255"/>
+	<Vtx X="24" Y="-64" Z="44" S="69" T="-11" R="80" G="160" B="232" A="255"/>
+	<Vtx X="24" Y="-64" Z="43" S="77" T="-38" R="125" G="232" B="251" A="255"/>
+	<Vtx X="24" Y="-64" Z="44" S="69" T="-43" R="126" G="240" B="251" A="255"/>
+	<Vtx X="24" Y="-59" Z="46" S="77" T="-261" R="125" G="16" B="18" A="255"/>
+	<Vtx X="24" Y="-57" Z="43" S="99" T="-261" R="122" G="33" B="246" A="255"/>
+	<Vtx X="24" Y="-57" Z="43" S="99" T="-288" R="70" G="104" B="21" A="255"/>
+	<Vtx X="24" Y="-59" Z="46" S="77" T="-288" R="68" G="76" B="75" A="255"/>
+	<Vtx X="21" Y="-57" Z="43" S="99" T="-523" R="186" G="104" B="21" A="255"/>
+	<Vtx X="21" Y="-59" Z="46" S="77" T="-523" R="188" G="76" B="75" A="255"/>
+	<Vtx X="24" Y="-60" Z="47" S="69" T="-288" R="80" G="69" B="71" A="255"/>
+	<Vtx X="21" Y="-60" Z="47" S="69" T="-523" R="176" G="69" B="71" A="255"/>
+	<Vtx X="24" Y="-73" Z="68" S="-82" T="-288" R="80" G="96" B="23" A="255"/>
+	<Vtx X="21" Y="-73" Z="68" S="-82" T="-523" R="176" G="96" B="23" A="255"/>
+	<Vtx X="24" Y="-73" Z="68" S="-82" T="-255" R="126" G="16" B="5" A="255"/>
+	<Vtx X="24" Y="-60" Z="46" S="69" T="-255" R="126" G="12" B="12" A="255"/>
+	<Vtx X="24" Y="-76" Z="66" S="-82" T="-43" R="126" G="244" B="244" A="255"/>
+	<Vtx X="24" Y="-77" Z="66" S="-82" T="-11" R="80" G="188" B="184" A="255"/>
+	<Vtx X="21" Y="-77" Z="66" S="-82" T="224" R="176" G="188" B="184" A="255"/>
+	<Vtx X="20" Y="-59" Z="42" S="22" T="112" R="129" G="0" B="0" A="255"/>
+	<Vtx X="20" Y="-61" Z="41" S="235" T="-11" R="129" G="0" B="0" A="255"/>
+	<Vtx X="20" Y="-62" Z="42" S="448" T="112" R="129" G="0" B="0" A="255"/>
+	<Vtx X="20" Y="-61" Z="45" S="235" T="480" R="129" G="0" B="0" A="255"/>
+	<Vtx X="20" Y="-62" Z="44" S="448" T="358" R="129" G="0" B="0" A="255"/>
+	<Vtx X="20" Y="-61" Z="45" S="235" T="480" R="129" G="0" B="0" A="255"/>
+	<Vtx X="20" Y="-59" Z="44" S="22" T="358" R="129" G="0" B="0" A="255"/>
+	<Vtx X="20" Y="-59" Z="42" S="22" T="112" R="129" G="0" B="0" A="255"/>
+	<Vtx X="20" Y="-59" Z="42" S="-363" T="-21" R="178" G="87" B="206" A="255"/>
+	<Vtx X="27" Y="-61" Z="41" S="-533" T="-280" R="190" G="0" B="147" A="255"/>
+	<Vtx X="20" Y="-61" Z="41" S="-533" T="-21" R="178" G="0" B="155" A="255"/>
+	<Vtx X="27" Y="-59" Z="42" S="-363" T="-280" R="190" G="94" B="202" A="255"/>
+	<Vtx X="20" Y="-59" Z="44" S="-192" T="-21" R="178" G="87" B="50" A="255"/>
+	<Vtx X="27" Y="-59" Z="44" S="-192" T="-280" R="190" G="94" B="54" A="255"/>
+	<Vtx X="20" Y="-61" Z="45" S="-21" T="-21" R="178" G="0" B="101" A="255"/>
+	<Vtx X="27" Y="-61" Z="45" S="-21" T="-280" R="190" G="0" B="109" A="255"/>
+	<Vtx X="20" Y="-62" Z="44" S="149" T="-21" R="178" G="169" B="50" A="255"/>
+	<Vtx X="27" Y="-62" Z="44" S="149" T="-280" R="190" G="162" B="54" A="255"/>
+	<Vtx X="20" Y="-62" Z="42" S="320" T="-21" R="178" G="169" B="206" A="255"/>
+	<Vtx X="27" Y="-62" Z="42" S="320" T="-280" R="190" G="162" B="202" A="255"/>
+	<Vtx X="20" Y="-61" Z="41" S="491" T="-21" R="178" G="0" B="155" A="255"/>
+	<Vtx X="27" Y="-61" Z="41" S="491" T="-280" R="190" G="0" B="147" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_1 b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_1
new file mode 100644
index 000000000..69b125a3e
--- /dev/null
+++ b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_1
@@ -0,0 +1,209 @@
+<Vertex Version="0">
+	<Vtx X="27" Y="-61" Z="40" S="1008" T="204" R="241" G="193" B="147" A="255"/>
+	<Vtx X="33" Y="-61" Z="39" S="1008" T="-16" R="241" G="193" B="147" A="255"/>
+	<Vtx X="33" Y="-63" Z="41" S="837" T="-16" R="241" G="193" B="147" A="255"/>
+	<Vtx X="27" Y="-63" Z="41" S="837" T="204" R="241" G="193" B="147" A="255"/>
+	<Vtx X="27" Y="-63" Z="41" S="837" T="204" R="241" G="130" B="0" A="255"/>
+	<Vtx X="33" Y="-63" Z="41" S="837" T="-16" R="241" G="130" B="0" A="255"/>
+	<Vtx X="33" Y="-63" Z="45" S="667" T="-16" R="241" G="130" B="0" A="255"/>
+	<Vtx X="27" Y="-63" Z="44" S="667" T="204" R="241" G="130" B="0" A="255"/>
+	<Vtx X="27" Y="-63" Z="44" S="667" T="204" R="241" G="193" B="109" A="255"/>
+	<Vtx X="33" Y="-63" Z="45" S="667" T="-16" R="241" G="193" B="109" A="255"/>
+	<Vtx X="33" Y="-61" Z="46" S="496" T="-16" R="241" G="193" B="109" A="255"/>
+	<Vtx X="27" Y="-61" Z="45" S="496" T="204" R="241" G="193" B="109" A="255"/>
+	<Vtx X="27" Y="-61" Z="45" S="496" T="204" R="241" G="63" B="109" A="255"/>
+	<Vtx X="33" Y="-61" Z="46" S="496" T="-16" R="241" G="63" B="109" A="255"/>
+	<Vtx X="33" Y="-58" Z="45" S="325" T="-16" R="241" G="63" B="109" A="255"/>
+	<Vtx X="27" Y="-58" Z="44" S="325" T="204" R="241" G="63" B="109" A="255"/>
+	<Vtx X="33" Y="-63" Z="45" S="453" T="875" R="127" G="0" B="0" A="255"/>
+	<Vtx X="33" Y="-63" Z="41" S="453" T="629" R="127" G="0" B="0" A="255"/>
+	<Vtx X="33" Y="-61" Z="39" S="240" T="506" R="127" G="0" B="0" A="255"/>
+	<Vtx X="33" Y="-58" Z="45" S="27" T="875" R="127" G="0" B="0" A="255"/>
+	<Vtx X="33" Y="-58" Z="41" S="27" T="629" R="127" G="0" B="0" A="255"/>
+	<Vtx X="33" Y="-61" Z="46" S="240" T="998" R="127" G="0" B="0" A="255"/>
+	<Vtx X="27" Y="-58" Z="44" S="325" T="204" R="241" G="126" B="0" A="255"/>
+	<Vtx X="33" Y="-58" Z="45" S="325" T="-16" R="241" G="126" B="0" A="255"/>
+	<Vtx X="33" Y="-58" Z="41" S="155" T="-16" R="241" G="126" B="0" A="255"/>
+	<Vtx X="27" Y="-58" Z="41" S="155" T="204" R="241" G="126" B="0" A="255"/>
+	<Vtx X="27" Y="-58" Z="41" S="155" T="204" R="241" G="63" B="147" A="255"/>
+	<Vtx X="33" Y="-58" Z="41" S="155" T="-16" R="241" G="63" B="147" A="255"/>
+	<Vtx X="33" Y="-61" Z="39" S="-16" T="-16" R="241" G="63" B="147" A="255"/>
+	<Vtx X="27" Y="-61" Z="40" S="-16" T="204" R="241" G="63" B="147" A="255"/>
+	<Vtx X="27" Y="-59" Z="42" S="155" T="237" R="160" G="41" B="184" A="255"/>
+	<Vtx X="27" Y="-58" Z="41" S="155" T="204" R="160" G="41" B="184" A="255"/>
+	<Vtx X="27" Y="-61" Z="40" S="-16" T="204" R="160" G="41" B="184" A="255"/>
+	<Vtx X="27" Y="-61" Z="41" S="-16" T="237" R="160" G="41" B="184" A="255"/>
+	<Vtx X="27" Y="-59" Z="44" S="325" T="237" R="160" G="83" B="0" A="255"/>
+	<Vtx X="27" Y="-58" Z="44" S="325" T="204" R="160" G="83" B="0" A="255"/>
+	<Vtx X="27" Y="-58" Z="41" S="155" T="204" R="160" G="83" B="0" A="255"/>
+	<Vtx X="27" Y="-59" Z="42" S="155" T="237" R="160" G="83" B="0" A="255"/>
+	<Vtx X="27" Y="-61" Z="45" S="496" T="237" R="160" G="41" B="72" A="255"/>
+	<Vtx X="27" Y="-61" Z="45" S="496" T="204" R="160" G="41" B="72" A="255"/>
+	<Vtx X="27" Y="-58" Z="44" S="325" T="204" R="160" G="41" B="72" A="255"/>
+	<Vtx X="27" Y="-59" Z="44" S="325" T="237" R="160" G="41" B="72" A="255"/>
+	<Vtx X="27" Y="-62" Z="44" S="667" T="237" R="160" G="215" B="72" A="255"/>
+	<Vtx X="27" Y="-63" Z="44" S="667" T="204" R="160" G="215" B="72" A="255"/>
+	<Vtx X="27" Y="-61" Z="45" S="496" T="204" R="160" G="215" B="72" A="255"/>
+	<Vtx X="27" Y="-61" Z="45" S="496" T="237" R="160" G="215" B="72" A="255"/>
+	<Vtx X="27" Y="-62" Z="42" S="837" T="237" R="160" G="173" B="0" A="255"/>
+	<Vtx X="27" Y="-63" Z="41" S="837" T="204" R="160" G="173" B="0" A="255"/>
+	<Vtx X="27" Y="-63" Z="44" S="667" T="204" R="160" G="173" B="0" A="255"/>
+	<Vtx X="27" Y="-62" Z="44" S="667" T="237" R="160" G="173" B="0" A="255"/>
+	<Vtx X="27" Y="-61" Z="41" S="1008" T="237" R="160" G="215" B="184" A="255"/>
+	<Vtx X="27" Y="-61" Z="40" S="1008" T="204" R="160" G="215" B="184" A="255"/>
+	<Vtx X="27" Y="-63" Z="41" S="837" T="204" R="160" G="215" B="184" A="255"/>
+	<Vtx X="27" Y="-62" Z="42" S="837" T="237" R="160" G="215" B="184" A="255"/>
+	<Vtx X="6" Y="-161" Z="144" S="1008" T="1008" R="0" G="143" B="59" A="255"/>
+	<Vtx X="-4" Y="-161" Z="143" S="325" T="1008" R="0" G="143" B="59" A="255"/>
+	<Vtx X="1" Y="-163" Z="139" S="667" T="1008" R="0" G="143" B="59" A="255"/>
+	<Vtx X="1" Y="-159" Z="148" S="-16" T="1008" R="0" G="143" B="59" A="255"/>
+	<Vtx X="-2" Y="171" Z="-124" S="325" T="1008" R="0" G="80" B="157" A="255"/>
+	<Vtx X="2" Y="171" Z="-124" S="1008" T="1008" R="0" G="80" B="157" A="255"/>
+	<Vtx X="0" Y="170" Z="-125" S="667" T="1008" R="0" G="80" B="157" A="255"/>
+	<Vtx X="0" Y="173" Z="-123" S="-16" T="1008" R="0" G="80" B="157" A="255"/>
+	<Vtx X="0" Y="173" Z="-123" S="-16" T="-16" R="255" G="96" B="83" A="255"/>
+	<Vtx X="2" Y="144" Z="-94" S="84" T="240" R="127" G="2" B="0" A="255"/>
+	<Vtx X="2" Y="171" Z="-124" S="-16" T="240" R="127" G="4" B="1" A="255"/>
+	<Vtx X="0" Y="146" Z="-92" S="84" T="-16" R="255" G="96" B="83" A="255"/>
+	<Vtx X="-2" Y="171" Z="-124" S="-16" T="752" R="129" G="1" B="0" A="255"/>
+	<Vtx X="0" Y="146" Z="-92" S="84" T="1008" R="255" G="96" B="83" A="255"/>
+	<Vtx X="0" Y="173" Z="-123" S="-16" T="1008" R="255" G="96" B="83" A="255"/>
+	<Vtx X="-3" Y="144" Z="-94" S="84" T="752" R="129" G="0" B="254" A="255"/>
+	<Vtx X="0" Y="170" Z="-125" S="-16" T="496" R="1" G="161" B="171" A="255"/>
+	<Vtx X="-3" Y="144" Z="-94" S="84" T="752" R="129" G="0" B="254" A="255"/>
+	<Vtx X="0" Y="143" Z="-95" S="84" T="496" R="1" G="161" B="171" A="255"/>
+	<Vtx X="2" Y="144" Z="-94" S="84" T="240" R="127" G="2" B="0" A="255"/>
+	<Vtx X="1" Y="-136" Z="135" S="949" T="-16" R="255" G="63" B="110" A="255"/>
+	<Vtx X="1" Y="-159" Z="148" S="1008" T="-16" R="255" G="63" B="110" A="255"/>
+	<Vtx X="6" Y="-161" Z="144" S="1008" T="240" R="127" G="2" B="2" A="255"/>
+	<Vtx X="6" Y="-138" Z="131" S="949" T="240" R="127" G="1" B="0" A="255"/>
+	<Vtx X="1" Y="-163" Z="139" S="1008" T="496" R="1" G="193" B="146" A="255"/>
+	<Vtx X="1" Y="-141" Z="126" S="949" T="496" R="1" G="193" B="146" A="255"/>
+	<Vtx X="-4" Y="-161" Z="143" S="1008" T="752" R="129" G="0" B="0" A="255"/>
+	<Vtx X="-4" Y="-138" Z="131" S="949" T="752" R="129" G="255" B="255" A="255"/>
+	<Vtx X="1" Y="-159" Z="148" S="1008" T="1008" R="255" G="63" B="110" A="255"/>
+	<Vtx X="1" Y="-136" Z="135" S="949" T="1008" R="255" G="63" B="110" A="255"/>
+	<Vtx X="0" Y="138" Z="-83" S="114" T="-16" R="255" G="96" B="83" A="255"/>
+	<Vtx X="0" Y="118" Z="-59" S="189" T="-16" R="255" G="93" B="87" A="255"/>
+	<Vtx X="3" Y="116" Z="-61" S="189" T="240" R="127" G="4" B="1" A="255"/>
+	<Vtx X="3" Y="87" Z="-33" S="289" T="240" R="127" G="2" B="0" A="255"/>
+	<Vtx X="0" Y="89" Z="-31" S="289" T="-16" R="255" G="89" B="91" A="255"/>
+	<Vtx X="0" Y="84" Z="-36" S="289" T="496" R="1" G="169" B="163" A="255"/>
+	<Vtx X="0" Y="114" Z="-63" S="189" T="496" R="1" G="165" B="167" A="255"/>
+	<Vtx X="-4" Y="86" Z="-33" S="289" T="752" R="129" G="0" B="255" A="255"/>
+	<Vtx X="-3" Y="116" Z="-61" S="189" T="752" R="129" G="1" B="0" A="255"/>
+	<Vtx X="0" Y="89" Z="-31" S="289" T="1008" R="255" G="89" B="91" A="255"/>
+	<Vtx X="-3" Y="116" Z="-61" S="189" T="752" R="129" G="1" B="0" A="255"/>
+	<Vtx X="0" Y="89" Z="-31" S="289" T="1008" R="255" G="89" B="91" A="255"/>
+	<Vtx X="0" Y="118" Z="-59" S="189" T="1008" R="255" G="93" B="87" A="255"/>
+	<Vtx X="-3" Y="136" Z="-84" S="114" T="752" R="129" G="0" B="254" A="255"/>
+	<Vtx X="0" Y="138" Z="-83" S="114" T="1008" R="255" G="96" B="83" A="255"/>
+	<Vtx X="0" Y="134" Z="-86" S="114" T="496" R="1" G="161" B="171" A="255"/>
+	<Vtx X="0" Y="114" Z="-63" S="189" T="496" R="1" G="165" B="167" A="255"/>
+	<Vtx X="2" Y="136" Z="-84" S="114" T="240" R="127" G="2" B="0" A="255"/>
+	<Vtx X="3" Y="116" Z="-61" S="189" T="240" R="127" G="4" B="1" A="255"/>
+	<Vtx X="0" Y="138" Z="-83" S="114" T="-16" R="255" G="96" B="83" A="255"/>
+	<Vtx X="-4" Y="78" Z="-25" S="319" T="752" R="129" G="0" B="255" A="255"/>
+	<Vtx X="0" Y="58" Z="0" S="394" T="1008" R="255" G="85" B="95" A="255"/>
+	<Vtx X="0" Y="80" Z="-22" S="319" T="1008" R="255" G="89" B="91" A="255"/>
+	<Vtx X="-4" Y="55" Z="-3" S="394" T="752" R="129" G="1" B="0" A="255"/>
+	<Vtx X="0" Y="75" Z="-27" S="319" T="496" R="1" G="169" B="163" A="255"/>
+	<Vtx X="0" Y="53" Z="-6" S="394" T="496" R="1" G="173" B="160" A="255"/>
+	<Vtx X="3" Y="78" Z="-25" S="319" T="240" R="127" G="2" B="0" A="255"/>
+	<Vtx X="4" Y="55" Z="-3" S="394" T="240" R="127" G="3" B="2" A="255"/>
+	<Vtx X="0" Y="80" Z="-22" S="319" T="-16" R="255" G="89" B="91" A="255"/>
+	<Vtx X="0" Y="58" Z="0" S="394" T="-16" R="255" G="85" B="95" A="255"/>
+	<Vtx X="4" Y="23" Z="23" S="494" T="240" R="127" G="1" B="0" A="255"/>
+	<Vtx X="0" Y="26" Z="26" S="494" T="-16" R="255" G="80" B="98" A="255"/>
+	<Vtx X="0" Y="20" Z="20" S="494" T="496" R="1" G="177" B="156" A="255"/>
+	<Vtx X="4" Y="23" Z="23" S="494" T="240" R="127" G="1" B="0" A="255"/>
+	<Vtx X="-4" Y="23" Z="23" S="494" T="752" R="129" G="0" B="255" A="255"/>
+	<Vtx X="0" Y="26" Z="26" S="494" T="1008" R="255" G="80" B="98" A="255"/>
+	<Vtx X="-4" Y="-11" Z="50" S="598" T="752" R="129" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="-44" Z="79" S="701" T="1008" R="255" G="72" B="105" A="255"/>
+	<Vtx X="0" Y="-8" Z="54" S="598" T="1008" R="255" G="76" B="102" A="255"/>
+	<Vtx X="-4" Y="-47" Z="75" S="701" T="752" R="129" G="0" B="255" A="255"/>
+	<Vtx X="0" Y="-14" Z="47" S="598" T="496" R="1" G="181" B="153" A="255"/>
+	<Vtx X="0" Y="11" Z="27" S="523" T="496" R="1" G="177" B="156" A="255"/>
+	<Vtx X="0" Y="11" Z="27" S="523" T="496" R="1" G="177" B="156" A="255"/>
+	<Vtx X="-4" Y="-11" Z="50" S="598" T="752" R="129" G="0" B="0" A="255"/>
+	<Vtx X="-4" Y="13" Z="31" S="523" T="752" R="129" G="0" B="255" A="255"/>
+	<Vtx X="0" Y="-8" Z="54" S="598" T="1008" R="255" G="76" B="102" A="255"/>
+	<Vtx X="0" Y="16" Z="34" S="523" T="1008" R="255" G="80" B="98" A="255"/>
+	<Vtx X="4" Y="13" Z="31" S="523" T="240" R="127" G="1" B="0" A="255"/>
+	<Vtx X="0" Y="-14" Z="47" S="598" T="496" R="1" G="181" B="153" A="255"/>
+	<Vtx X="5" Y="-11" Z="50" S="598" T="240" R="127" G="3" B="2" A="255"/>
+	<Vtx X="0" Y="16" Z="34" S="523" T="-16" R="255" G="80" B="98" A="255"/>
+	<Vtx X="0" Y="-8" Z="54" S="598" T="-16" R="255" G="76" B="102" A="255"/>
+	<Vtx X="5" Y="-47" Z="75" S="701" T="240" R="127" G="1" B="0" A="255"/>
+	<Vtx X="0" Y="-44" Z="79" S="701" T="-16" R="255" G="72" B="105" A="255"/>
+	<Vtx X="0" Y="-50" Z="71" S="701" T="496" R="1" G="185" B="150" A="255"/>
+	<Vtx X="-4" Y="-47" Z="75" S="701" T="752" R="129" G="0" B="255" A="255"/>
+	<Vtx X="-4" Y="21" Z="24" S="498" T="752" R="129" G="0" B="255" A="255"/>
+	<Vtx X="0" Y="21" Z="30" S="508" T="1008" R="255" G="80" B="98" A="255"/>
+	<Vtx X="0" Y="24" Z="27" S="498" T="1008" R="255" G="80" B="98" A="255"/>
+	<Vtx X="-4" Y="18" Z="27" S="508" T="752" R="129" G="0" B="255" A="255"/>
+	<Vtx X="0" Y="19" Z="21" S="498" T="496" R="1" G="177" B="156" A="255"/>
+	<Vtx X="0" Y="16" Z="23" S="508" T="496" R="1" G="177" B="156" A="255"/>
+	<Vtx X="4" Y="21" Z="24" S="498" T="240" R="127" G="1" B="0" A="255"/>
+	<Vtx X="4" Y="18" Z="27" S="508" T="240" R="127" G="1" B="0" A="255"/>
+	<Vtx X="0" Y="24" Z="27" S="498" T="-16" R="255" G="80" B="98" A="255"/>
+	<Vtx X="0" Y="21" Z="30" S="508" T="-16" R="255" G="80" B="98" A="255"/>
+	<Vtx X="4" Y="21" Z="24" S="498" T="240" R="127" G="1" B="0" A="255"/>
+	<Vtx X="0" Y="87" Z="-29" S="294" T="-16" R="255" G="89" B="91" A="255"/>
+	<Vtx X="0" Y="84" Z="-26" S="304" T="-16" R="255" G="89" B="91" A="255"/>
+	<Vtx X="3" Y="82" Z="-29" S="304" T="240" R="127" G="2" B="0" A="255"/>
+	<Vtx X="3" Y="85" Z="-32" S="294" T="240" R="127" G="2" B="0" A="255"/>
+	<Vtx X="0" Y="80" Z="-31" S="304" T="496" R="1" G="169" B="163" A="255"/>
+	<Vtx X="0" Y="83" Z="-34" S="294" T="496" R="1" G="169" B="163" A="255"/>
+	<Vtx X="-4" Y="82" Z="-29" S="304" T="752" R="129" G="0" B="255" A="255"/>
+	<Vtx X="0" Y="83" Z="-34" S="294" T="496" R="1" G="169" B="163" A="255"/>
+	<Vtx X="-4" Y="82" Z="-29" S="304" T="752" R="129" G="0" B="255" A="255"/>
+	<Vtx X="-4" Y="85" Z="-32" S="294" T="752" R="129" G="0" B="255" A="255"/>
+	<Vtx X="0" Y="84" Z="-26" S="304" T="1008" R="255" G="89" B="91" A="255"/>
+	<Vtx X="0" Y="87" Z="-29" S="294" T="1008" R="255" G="89" B="91" A="255"/>
+	<Vtx X="0" Y="141" Z="-94" S="89" T="496" R="1" G="161" B="171" A="255"/>
+	<Vtx X="-3" Y="140" Z="-89" S="99" T="752" R="129" G="0" B="254" A="255"/>
+	<Vtx X="-3" Y="143" Z="-92" S="89" T="752" R="129" G="0" B="254" A="255"/>
+	<Vtx X="0" Y="138" Z="-91" S="99" T="496" R="1" G="161" B="171" A="255"/>
+	<Vtx X="2" Y="143" Z="-92" S="89" T="240" R="127" G="2" B="0" A="255"/>
+	<Vtx X="2" Y="140" Z="-89" S="99" T="240" R="127" G="2" B="0" A="255"/>
+	<Vtx X="-3" Y="143" Z="-92" S="89" T="752" R="129" G="0" B="254" A="255"/>
+	<Vtx X="0" Y="142" Z="-87" S="99" T="1008" R="255" G="96" B="83" A="255"/>
+	<Vtx X="0" Y="145" Z="-90" S="89" T="1008" R="255" G="96" B="83" A="255"/>
+	<Vtx X="0" Y="145" Z="-90" S="89" T="-16" R="255" G="96" B="83" A="255"/>
+	<Vtx X="0" Y="142" Z="-87" S="99" T="-16" R="255" G="96" B="83" A="255"/>
+	<Vtx X="2" Y="143" Z="-92" S="89" T="240" R="127" G="2" B="0" A="255"/>
+	<Vtx X="-4" Y="17" Z="28" S="513" T="752" R="129" G="0" B="255" A="255"/>
+	<Vtx X="0" Y="17" Z="33" S="521" T="1008" R="255" G="80" B="98" A="255"/>
+	<Vtx X="0" Y="19" Z="31" S="513" T="1008" R="255" G="80" B="98" A="255"/>
+	<Vtx X="-4" Y="14" Z="30" S="521" T="752" R="129" G="0" B="255" A="255"/>
+	<Vtx X="0" Y="14" Z="25" S="513" T="496" R="1" G="177" B="156" A="255"/>
+	<Vtx X="0" Y="11" Z="27" S="521" T="496" R="1" G="177" B="156" A="255"/>
+	<Vtx X="4" Y="17" Z="28" S="513" T="240" R="127" G="1" B="0" A="255"/>
+	<Vtx X="4" Y="14" Z="30" S="521" T="240" R="127" G="1" B="0" A="255"/>
+	<Vtx X="0" Y="19" Z="31" S="513" T="-16" R="255" G="80" B="98" A="255"/>
+	<Vtx X="0" Y="17" Z="33" S="521" T="-16" R="255" G="80" B="98" A="255"/>
+	<Vtx X="0" Y="83" Z="-25" S="308" T="-16" R="255" G="89" B="91" A="255"/>
+	<Vtx X="0" Y="81" Z="-23" S="317" T="-16" R="255" G="89" B="91" A="255"/>
+	<Vtx X="3" Y="78" Z="-25" S="317" T="240" R="127" G="2" B="0" A="255"/>
+	<Vtx X="3" Y="81" Z="-28" S="308" T="240" R="127" G="2" B="0" A="255"/>
+	<Vtx X="0" Y="76" Z="-28" S="317" T="496" R="1" G="169" B="163" A="255"/>
+	<Vtx X="3" Y="81" Z="-28" S="308" T="240" R="127" G="2" B="0" A="255"/>
+	<Vtx X="0" Y="76" Z="-28" S="317" T="496" R="1" G="169" B="163" A="255"/>
+	<Vtx X="0" Y="78" Z="-30" S="308" T="496" R="1" G="169" B="163" A="255"/>
+	<Vtx X="-4" Y="78" Z="-25" S="317" T="752" R="129" G="0" B="255" A="255"/>
+	<Vtx X="-4" Y="81" Z="-28" S="308" T="752" R="129" G="0" B="255" A="255"/>
+	<Vtx X="0" Y="81" Z="-23" S="317" T="1008" R="255" G="89" B="91" A="255"/>
+	<Vtx X="0" Y="83" Z="-25" S="308" T="1008" R="255" G="89" B="91" A="255"/>
+	<Vtx X="-3" Y="139" Z="-88" S="103" T="752" R="129" G="0" B="254" A="255"/>
+	<Vtx X="0" Y="139" Z="-83" S="112" T="1008" R="255" G="96" B="83" A="255"/>
+	<Vtx X="0" Y="141" Z="-86" S="103" T="1008" R="255" G="96" B="83" A="255"/>
+	<Vtx X="-3" Y="137" Z="-85" S="112" T="752" R="129" G="0" B="254" A="255"/>
+	<Vtx X="0" Y="137" Z="-89" S="103" T="496" R="1" G="161" B="171" A="255"/>
+	<Vtx X="0" Y="135" Z="-87" S="112" T="496" R="1" G="161" B="171" A="255"/>
+	<Vtx X="2" Y="139" Z="-88" S="103" T="240" R="127" G="2" B="0" A="255"/>
+	<Vtx X="2" Y="137" Z="-85" S="112" T="240" R="127" G="2" B="0" A="255"/>
+	<Vtx X="0" Y="141" Z="-86" S="103" T="-16" R="255" G="96" B="83" A="255"/>
+	<Vtx X="0" Y="139" Z="-83" S="112" T="-16" R="255" G="96" B="83" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_2 b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_2
new file mode 100644
index 000000000..606a6ab09
--- /dev/null
+++ b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_2
@@ -0,0 +1,115 @@
+<Vertex Version="0">
+	<Vtx X="-4" Y="-47" Z="75" S="701" T="752" R="129" G="0" B="255" A="255"/>
+	<Vtx X="0" Y="-81" Z="103" S="803" T="1008" R="255" G="67" B="108" A="255"/>
+	<Vtx X="0" Y="-44" Z="79" S="701" T="1008" R="255" G="72" B="105" A="255"/>
+	<Vtx X="-5" Y="-83" Z="99" S="803" T="752" R="129" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="-50" Z="71" S="701" T="496" R="1" G="185" B="150" A="255"/>
+	<Vtx X="0" Y="-86" Z="95" S="803" T="496" R="1" G="189" B="148" A="255"/>
+	<Vtx X="5" Y="-47" Z="75" S="701" T="240" R="127" G="1" B="0" A="255"/>
+	<Vtx X="5" Y="-83" Z="99" S="803" T="240" R="127" G="2" B="2" A="255"/>
+	<Vtx X="0" Y="-44" Z="79" S="701" T="-16" R="255" G="72" B="105" A="255"/>
+	<Vtx X="0" Y="-81" Z="103" S="803" T="-16" R="255" G="67" B="108" A="255"/>
+	<Vtx X="6" Y="-138" Z="131" S="949" T="240" R="127" G="1" B="0" A="255"/>
+	<Vtx X="1" Y="-136" Z="135" S="949" T="-16" R="255" G="63" B="110" A="255"/>
+	<Vtx X="1" Y="-141" Z="126" S="949" T="496" R="1" G="193" B="146" A="255"/>
+	<Vtx X="-4" Y="-138" Z="131" S="949" T="752" R="129" G="255" B="255" A="255"/>
+	<Vtx X="1" Y="-136" Z="135" S="949" T="1008" R="255" G="63" B="110" A="255"/>
+	<Vtx X="4" Y="21" Z="24" S="498" T="240" R="127" G="1" B="0" A="255"/>
+	<Vtx X="0" Y="20" Z="20" S="494" T="496" R="1" G="177" B="156" A="255"/>
+	<Vtx X="4" Y="23" Z="23" S="494" T="240" R="127" G="1" B="0" A="255"/>
+	<Vtx X="0" Y="19" Z="21" S="498" T="496" R="1" G="177" B="156" A="255"/>
+	<Vtx X="-4" Y="23" Z="23" S="494" T="752" R="129" G="0" B="255" A="255"/>
+	<Vtx X="-4" Y="21" Z="24" S="498" T="752" R="129" G="0" B="255" A="255"/>
+	<Vtx X="0" Y="26" Z="26" S="494" T="1008" R="255" G="80" B="98" A="255"/>
+	<Vtx X="0" Y="24" Z="27" S="498" T="1008" R="255" G="80" B="98" A="255"/>
+	<Vtx X="0" Y="24" Z="27" S="498" T="-16" R="255" G="80" B="98" A="255"/>
+	<Vtx X="4" Y="21" Z="24" S="498" T="240" R="127" G="1" B="0" A="255"/>
+	<Vtx X="4" Y="23" Z="23" S="494" T="240" R="127" G="1" B="0" A="255"/>
+	<Vtx X="0" Y="26" Z="26" S="494" T="-16" R="255" G="80" B="98" A="255"/>
+	<Vtx X="0" Y="87" Z="-29" S="294" T="-16" R="255" G="89" B="91" A="255"/>
+	<Vtx X="3" Y="87" Z="-33" S="289" T="240" R="127" G="2" B="0" A="255"/>
+	<Vtx X="0" Y="89" Z="-31" S="289" T="-16" R="255" G="89" B="91" A="255"/>
+	<Vtx X="3" Y="85" Z="-32" S="294" T="240" R="127" G="2" B="0" A="255"/>
+	<Vtx X="0" Y="84" Z="-36" S="289" T="496" R="1" G="169" B="163" A="255"/>
+	<Vtx X="3" Y="85" Z="-32" S="294" T="240" R="127" G="2" B="0" A="255"/>
+	<Vtx X="0" Y="83" Z="-34" S="294" T="496" R="1" G="169" B="163" A="255"/>
+	<Vtx X="0" Y="84" Z="-36" S="289" T="496" R="1" G="169" B="163" A="255"/>
+	<Vtx X="-4" Y="86" Z="-33" S="289" T="752" R="129" G="0" B="255" A="255"/>
+	<Vtx X="-4" Y="85" Z="-32" S="294" T="752" R="129" G="0" B="255" A="255"/>
+	<Vtx X="0" Y="89" Z="-31" S="289" T="1008" R="255" G="89" B="91" A="255"/>
+	<Vtx X="0" Y="87" Z="-29" S="294" T="1008" R="255" G="89" B="91" A="255"/>
+	<Vtx X="2" Y="143" Z="-92" S="89" T="240" R="127" G="2" B="0" A="255"/>
+	<Vtx X="0" Y="143" Z="-95" S="84" T="496" R="1" G="161" B="171" A="255"/>
+	<Vtx X="2" Y="144" Z="-94" S="84" T="240" R="127" G="2" B="0" A="255"/>
+	<Vtx X="0" Y="141" Z="-94" S="89" T="496" R="1" G="161" B="171" A="255"/>
+	<Vtx X="-3" Y="144" Z="-94" S="84" T="752" R="129" G="0" B="254" A="255"/>
+	<Vtx X="-3" Y="143" Z="-92" S="89" T="752" R="129" G="0" B="254" A="255"/>
+	<Vtx X="0" Y="145" Z="-90" S="89" T="-16" R="255" G="96" B="83" A="255"/>
+	<Vtx X="2" Y="143" Z="-92" S="89" T="240" R="127" G="2" B="0" A="255"/>
+	<Vtx X="2" Y="144" Z="-94" S="84" T="240" R="127" G="2" B="0" A="255"/>
+	<Vtx X="0" Y="146" Z="-92" S="84" T="-16" R="255" G="96" B="83" A="255"/>
+	<Vtx X="-3" Y="143" Z="-92" S="89" T="752" R="129" G="0" B="254" A="255"/>
+	<Vtx X="0" Y="145" Z="-90" S="89" T="1008" R="255" G="96" B="83" A="255"/>
+	<Vtx X="0" Y="146" Z="-92" S="84" T="1008" R="255" G="96" B="83" A="255"/>
+	<Vtx X="-3" Y="144" Z="-94" S="84" T="752" R="129" G="0" B="254" A="255"/>
+	<Vtx X="-4" Y="18" Z="27" S="508" T="752" R="129" G="0" B="255" A="255"/>
+	<Vtx X="0" Y="19" Z="31" S="513" T="1008" R="255" G="80" B="98" A="255"/>
+	<Vtx X="0" Y="21" Z="30" S="508" T="1008" R="255" G="80" B="98" A="255"/>
+	<Vtx X="-4" Y="17" Z="28" S="513" T="752" R="129" G="0" B="255" A="255"/>
+	<Vtx X="0" Y="16" Z="23" S="508" T="496" R="1" G="177" B="156" A="255"/>
+	<Vtx X="0" Y="14" Z="25" S="513" T="496" R="1" G="177" B="156" A="255"/>
+	<Vtx X="4" Y="18" Z="27" S="508" T="240" R="127" G="1" B="0" A="255"/>
+	<Vtx X="4" Y="17" Z="28" S="513" T="240" R="127" G="1" B="0" A="255"/>
+	<Vtx X="0" Y="21" Z="30" S="508" T="-16" R="255" G="80" B="98" A="255"/>
+	<Vtx X="0" Y="19" Z="31" S="513" T="-16" R="255" G="80" B="98" A="255"/>
+	<Vtx X="0" Y="84" Z="-26" S="304" T="-16" R="255" G="89" B="91" A="255"/>
+	<Vtx X="0" Y="83" Z="-25" S="308" T="-16" R="255" G="89" B="91" A="255"/>
+	<Vtx X="3" Y="81" Z="-28" S="308" T="240" R="127" G="2" B="0" A="255"/>
+	<Vtx X="3" Y="82" Z="-29" S="304" T="240" R="127" G="2" B="0" A="255"/>
+	<Vtx X="0" Y="78" Z="-30" S="308" T="496" R="1" G="169" B="163" A="255"/>
+	<Vtx X="0" Y="80" Z="-31" S="304" T="496" R="1" G="169" B="163" A="255"/>
+	<Vtx X="-4" Y="81" Z="-28" S="308" T="752" R="129" G="0" B="255" A="255"/>
+	<Vtx X="-4" Y="82" Z="-29" S="304" T="752" R="129" G="0" B="255" A="255"/>
+	<Vtx X="0" Y="83" Z="-25" S="308" T="1008" R="255" G="89" B="91" A="255"/>
+	<Vtx X="0" Y="84" Z="-26" S="304" T="1008" R="255" G="89" B="91" A="255"/>
+	<Vtx X="-3" Y="140" Z="-89" S="99" T="752" R="129" G="0" B="254" A="255"/>
+	<Vtx X="0" Y="141" Z="-86" S="103" T="1008" R="255" G="96" B="83" A="255"/>
+	<Vtx X="0" Y="142" Z="-87" S="99" T="1008" R="255" G="96" B="83" A="255"/>
+	<Vtx X="-3" Y="139" Z="-88" S="103" T="752" R="129" G="0" B="254" A="255"/>
+	<Vtx X="0" Y="138" Z="-91" S="99" T="496" R="1" G="161" B="171" A="255"/>
+	<Vtx X="0" Y="137" Z="-89" S="103" T="496" R="1" G="161" B="171" A="255"/>
+	<Vtx X="2" Y="140" Z="-89" S="99" T="240" R="127" G="2" B="0" A="255"/>
+	<Vtx X="2" Y="139" Z="-88" S="103" T="240" R="127" G="2" B="0" A="255"/>
+	<Vtx X="0" Y="142" Z="-87" S="99" T="-16" R="255" G="96" B="83" A="255"/>
+	<Vtx X="0" Y="141" Z="-86" S="103" T="-16" R="255" G="96" B="83" A="255"/>
+	<Vtx X="-4" Y="14" Z="30" S="521" T="752" R="129" G="0" B="255" A="255"/>
+	<Vtx X="0" Y="16" Z="34" S="523" T="1008" R="255" G="80" B="98" A="255"/>
+	<Vtx X="0" Y="17" Z="33" S="521" T="1008" R="255" G="80" B="98" A="255"/>
+	<Vtx X="-4" Y="13" Z="31" S="523" T="752" R="129" G="0" B="255" A="255"/>
+	<Vtx X="0" Y="11" Z="27" S="521" T="496" R="1" G="177" B="156" A="255"/>
+	<Vtx X="0" Y="11" Z="27" S="523" T="496" R="1" G="177" B="156" A="255"/>
+	<Vtx X="4" Y="14" Z="30" S="521" T="240" R="127" G="1" B="0" A="255"/>
+	<Vtx X="4" Y="13" Z="31" S="523" T="240" R="127" G="1" B="0" A="255"/>
+	<Vtx X="0" Y="17" Z="33" S="521" T="-16" R="255" G="80" B="98" A="255"/>
+	<Vtx X="0" Y="16" Z="34" S="523" T="-16" R="255" G="80" B="98" A="255"/>
+	<Vtx X="0" Y="81" Z="-23" S="317" T="-16" R="255" G="89" B="91" A="255"/>
+	<Vtx X="0" Y="80" Z="-22" S="319" T="-16" R="255" G="89" B="91" A="255"/>
+	<Vtx X="3" Y="78" Z="-25" S="319" T="240" R="127" G="2" B="0" A="255"/>
+	<Vtx X="3" Y="78" Z="-25" S="317" T="240" R="127" G="2" B="0" A="255"/>
+	<Vtx X="0" Y="75" Z="-27" S="319" T="496" R="1" G="169" B="163" A="255"/>
+	<Vtx X="0" Y="76" Z="-28" S="317" T="496" R="1" G="169" B="163" A="255"/>
+	<Vtx X="-4" Y="78" Z="-25" S="319" T="752" R="129" G="0" B="255" A="255"/>
+	<Vtx X="-4" Y="78" Z="-25" S="317" T="752" R="129" G="0" B="255" A="255"/>
+	<Vtx X="0" Y="80" Z="-22" S="319" T="1008" R="255" G="89" B="91" A="255"/>
+	<Vtx X="0" Y="81" Z="-23" S="317" T="1008" R="255" G="89" B="91" A="255"/>
+	<Vtx X="-3" Y="137" Z="-85" S="112" T="752" R="129" G="0" B="254" A="255"/>
+	<Vtx X="0" Y="138" Z="-83" S="114" T="1008" R="255" G="96" B="83" A="255"/>
+	<Vtx X="0" Y="139" Z="-83" S="112" T="1008" R="255" G="96" B="83" A="255"/>
+	<Vtx X="-3" Y="136" Z="-84" S="114" T="752" R="129" G="0" B="254" A="255"/>
+	<Vtx X="0" Y="135" Z="-87" S="112" T="496" R="1" G="161" B="171" A="255"/>
+	<Vtx X="0" Y="134" Z="-86" S="114" T="496" R="1" G="161" B="171" A="255"/>
+	<Vtx X="2" Y="137" Z="-85" S="112" T="240" R="127" G="2" B="0" A="255"/>
+	<Vtx X="2" Y="136" Z="-84" S="114" T="240" R="127" G="2" B="0" A="255"/>
+	<Vtx X="0" Y="139" Z="-83" S="112" T="-16" R="255" G="96" B="83" A="255"/>
+	<Vtx X="0" Y="138" Z="-83" S="114" T="-16" R="255" G="96" B="83" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_3 b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_3
new file mode 100644
index 000000000..8d8b43d0f
--- /dev/null
+++ b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_3
@@ -0,0 +1,176 @@
+<Vertex Version="0">
+	<Vtx X="0" Y="-135" Z="-39" S="1008" T="1008" R="0" G="2" B="127" A="255"/>
+	<Vtx X="0" Y="-134" Z="-39" S="325" T="1008" R="0" G="2" B="127" A="255"/>
+	<Vtx X="-1" Y="-134" Z="-39" S="667" T="1008" R="0" G="2" B="127" A="255"/>
+	<Vtx X="0" Y="-134" Z="-39" S="-16" T="1008" R="0" G="2" B="127" A="255"/>
+	<Vtx X="0" Y="170" Z="-123" S="325" T="1008" R="0" G="97" B="82" A="255"/>
+	<Vtx X="0" Y="171" Z="-124" S="1008" T="1008" R="0" G="97" B="82" A="255"/>
+	<Vtx X="-1" Y="171" Z="-123" S="667" T="1008" R="0" G="97" B="82" A="255"/>
+	<Vtx X="0" Y="171" Z="-123" S="-16" T="1008" R="0" G="97" B="82" A="255"/>
+	<Vtx X="0" Y="170" Z="-123" S="-16" T="752" R="0" G="192" B="110" A="255"/>
+	<Vtx X="0" Y="122" Z="-152" S="35" T="1008" R="126" G="3" B="240" A="255"/>
+	<Vtx X="0" Y="171" Z="-123" S="-16" T="1008" R="127" G="5" B="247" A="255"/>
+	<Vtx X="0" Y="121" Z="-151" S="35" T="752" R="0" G="229" B="124" A="255"/>
+	<Vtx X="-1" Y="171" Z="-123" S="-16" T="496" R="129" G="5" B="247" A="255"/>
+	<Vtx X="-1" Y="122" Z="-152" S="35" T="496" R="130" G="3" B="240" A="255"/>
+	<Vtx X="0" Y="171" Z="-124" S="-16" T="240" R="0" G="64" B="146" A="255"/>
+	<Vtx X="0" Y="122" Z="-152" S="35" T="240" R="0" G="27" B="132" A="255"/>
+	<Vtx X="0" Y="171" Z="-123" S="-16" T="-16" R="127" G="5" B="247" A="255"/>
+	<Vtx X="0" Y="122" Z="-152" S="35" T="-16" R="126" G="3" B="240" A="255"/>
+	<Vtx X="0" Y="88" Z="-149" S="86" T="240" R="0" G="206" B="139" A="255"/>
+	<Vtx X="0" Y="88" Z="-149" S="86" T="-16" R="126" G="250" B="240" A="255"/>
+	<Vtx X="0" Y="65" Z="-129" S="138" T="240" R="0" G="159" B="174" A="255"/>
+	<Vtx X="0" Y="65" Z="-128" S="138" T="-16" R="127" G="250" B="251" A="255"/>
+	<Vtx X="0" Y="48" Z="-102" S="189" T="240" R="0" G="145" B="194" A="255"/>
+	<Vtx X="0" Y="49" Z="-102" S="189" T="-16" R="127" G="254" B="255" A="255"/>
+	<Vtx X="0" Y="35" Z="-76" S="240" T="240" R="0" G="142" B="200" A="255"/>
+	<Vtx X="0" Y="36" Z="-76" S="240" T="-16" R="127" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="24" Z="-54" S="291" T="240" R="0" G="143" B="197" A="255"/>
+	<Vtx X="0" Y="25" Z="-54" S="291" T="-16" R="127" G="1" B="0" A="255"/>
+	<Vtx X="0" Y="15" Z="-38" S="342" T="240" R="0" G="152" B="183" A="255"/>
+	<Vtx X="0" Y="16" Z="-37" S="342" T="-16" R="127" G="4" B="3" A="255"/>
+	<Vtx X="0" Y="7" Z="-28" S="394" T="240" R="0" G="185" B="151" A="255"/>
+	<Vtx X="0" Y="7" Z="-28" S="394" T="-16" R="126" G="8" B="12" A="255"/>
+	<Vtx X="0" Y="7" Z="-28" S="394" T="-16" R="126" G="8" B="12" A="255"/>
+	<Vtx X="0" Y="-1" Z="-25" S="445" T="240" R="0" G="8" B="129" A="255"/>
+	<Vtx X="0" Y="7" Z="-28" S="394" T="240" R="0" G="185" B="151" A="255"/>
+	<Vtx X="0" Y="-1" Z="-25" S="445" T="-16" R="125" G="255" B="21" A="255"/>
+	<Vtx X="0" Y="-9" Z="-29" S="496" T="240" R="0" G="79" B="157" A="255"/>
+	<Vtx X="0" Y="-9" Z="-29" S="496" T="-16" R="126" G="249" B="9" A="255"/>
+	<Vtx X="0" Y="-17" Z="-39" S="547" T="240" R="0" G="105" B="184" A="255"/>
+	<Vtx X="0" Y="-17" Z="-39" S="547" T="-16" R="127" G="253" B="2" A="255"/>
+	<Vtx X="0" Y="-26" Z="-55" S="598" T="240" R="0" G="112" B="195" A="255"/>
+	<Vtx X="0" Y="-26" Z="-55" S="598" T="-16" R="127" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="-35" Z="-73" S="650" T="240" R="0" G="111" B="194" A="255"/>
+	<Vtx X="0" Y="-36" Z="-73" S="650" T="-16" R="127" G="1" B="0" A="255"/>
+	<Vtx X="0" Y="-46" Z="-92" S="701" T="240" R="0" G="103" B="182" A="255"/>
+	<Vtx X="0" Y="-47" Z="-92" S="701" T="-16" R="127" G="3" B="254" A="255"/>
+	<Vtx X="0" Y="-59" Z="-107" S="752" T="240" R="0" G="78" B="156" A="255"/>
+	<Vtx X="0" Y="-60" Z="-107" S="752" T="-16" R="126" G="7" B="247" A="255"/>
+	<Vtx X="0" Y="-75" Z="-115" S="803" T="240" R="0" G="19" B="130" A="255"/>
+	<Vtx X="0" Y="-76" Z="-115" S="803" T="-16" R="126" G="2" B="239" A="255"/>
+	<Vtx X="0" Y="-94" Z="-112" S="854" T="240" R="0" G="205" B="140" A="255"/>
+	<Vtx X="0" Y="-94" Z="-112" S="854" T="-16" R="126" G="251" B="243" A="255"/>
+	<Vtx X="0" Y="-113" Z="-97" S="906" T="240" R="0" G="161" B="172" A="255"/>
+	<Vtx X="0" Y="-113" Z="-97" S="906" T="-16" R="127" G="249" B="250" A="255"/>
+	<Vtx X="0" Y="-129" Z="-71" S="957" T="240" R="0" G="138" B="210" A="255"/>
+	<Vtx X="0" Y="-128" Z="-71" S="957" T="-16" R="127" G="247" B="253" A="255"/>
+	<Vtx X="0" Y="-135" Z="-39" S="1008" T="240" R="0" G="131" B="232" A="255"/>
+	<Vtx X="0" Y="-134" Z="-39" S="1008" T="-16" R="126" G="244" B="254" A="255"/>
+	<Vtx X="-1" Y="-134" Z="-39" S="1008" T="496" R="130" G="244" B="254" A="255"/>
+	<Vtx X="-1" Y="-128" Z="-71" S="957" T="496" R="129" G="247" B="253" A="255"/>
+	<Vtx X="0" Y="-134" Z="-39" S="1008" T="752" R="0" G="125" B="24" A="255"/>
+	<Vtx X="0" Y="-128" Z="-71" S="957" T="752" R="0" G="118" B="46" A="255"/>
+	<Vtx X="0" Y="-134" Z="-39" S="1008" T="1008" R="126" G="244" B="254" A="255"/>
+	<Vtx X="0" Y="-128" Z="-71" S="957" T="1008" R="127" G="247" B="253" A="255"/>
+	<Vtx X="0" Y="-112" Z="-96" S="906" T="752" R="0" G="95" B="84" A="255"/>
+	<Vtx X="0" Y="-128" Z="-71" S="957" T="752" R="0" G="118" B="46" A="255"/>
+	<Vtx X="0" Y="-128" Z="-71" S="957" T="1008" R="127" G="247" B="253" A="255"/>
+	<Vtx X="0" Y="-113" Z="-97" S="906" T="1008" R="127" G="249" B="250" A="255"/>
+	<Vtx X="0" Y="-94" Z="-111" S="854" T="752" R="0" G="51" B="116" A="255"/>
+	<Vtx X="0" Y="-94" Z="-112" S="854" T="1008" R="126" G="251" B="243" A="255"/>
+	<Vtx X="0" Y="-76" Z="-114" S="803" T="752" R="0" G="237" B="126" A="255"/>
+	<Vtx X="0" Y="-76" Z="-115" S="803" T="1008" R="126" G="2" B="239" A="255"/>
+	<Vtx X="0" Y="-60" Z="-106" S="752" T="752" R="0" G="178" B="100" A="255"/>
+	<Vtx X="0" Y="-60" Z="-107" S="752" T="1008" R="126" G="7" B="247" A="255"/>
+	<Vtx X="0" Y="-47" Z="-91" S="701" T="752" R="0" G="153" B="74" A="255"/>
+	<Vtx X="0" Y="-47" Z="-92" S="701" T="1008" R="127" G="3" B="254" A="255"/>
+	<Vtx X="0" Y="-36" Z="-73" S="650" T="752" R="0" G="145" B="62" A="255"/>
+	<Vtx X="0" Y="-36" Z="-73" S="650" T="1008" R="127" G="1" B="0" A="255"/>
+	<Vtx X="0" Y="-27" Z="-54" S="598" T="752" R="0" G="144" B="61" A="255"/>
+	<Vtx X="0" Y="-26" Z="-55" S="598" T="1008" R="127" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="-18" Z="-39" S="547" T="752" R="0" G="151" B="72" A="255"/>
+	<Vtx X="0" Y="-17" Z="-39" S="547" T="1008" R="127" G="253" B="2" A="255"/>
+	<Vtx X="0" Y="-9" Z="-29" S="496" T="752" R="0" G="177" B="100" A="255"/>
+	<Vtx X="0" Y="-9" Z="-29" S="496" T="1008" R="126" G="249" B="9" A="255"/>
+	<Vtx X="0" Y="-1" Z="-24" S="445" T="752" R="0" G="248" B="127" A="255"/>
+	<Vtx X="0" Y="-1" Z="-25" S="445" T="1008" R="125" G="255" B="21" A="255"/>
+	<Vtx X="0" Y="8" Z="-27" S="394" T="752" R="0" G="71" B="106" A="255"/>
+	<Vtx X="0" Y="7" Z="-28" S="394" T="1008" R="126" G="8" B="12" A="255"/>
+	<Vtx X="0" Y="16" Z="-37" S="342" T="752" R="0" G="104" B="73" A="255"/>
+	<Vtx X="0" Y="16" Z="-37" S="342" T="1008" R="127" G="4" B="3" A="255"/>
+	<Vtx X="0" Y="25" Z="-53" S="291" T="752" R="0" G="113" B="59" A="255"/>
+	<Vtx X="0" Y="25" Z="-54" S="291" T="1008" R="127" G="1" B="0" A="255"/>
+	<Vtx X="0" Y="36" Z="-75" S="240" T="752" R="0" G="114" B="56" A="255"/>
+	<Vtx X="0" Y="36" Z="-76" S="240" T="1008" R="127" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="49" Z="-101" S="189" T="752" R="0" G="111" B="62" A="255"/>
+	<Vtx X="0" Y="49" Z="-102" S="189" T="1008" R="127" G="254" B="255" A="255"/>
+	<Vtx X="0" Y="66" Z="-128" S="138" T="752" R="0" G="97" B="82" A="255"/>
+	<Vtx X="0" Y="49" Z="-101" S="189" T="752" R="0" G="111" B="62" A="255"/>
+	<Vtx X="0" Y="49" Z="-102" S="189" T="1008" R="127" G="254" B="255" A="255"/>
+	<Vtx X="0" Y="65" Z="-128" S="138" T="1008" R="127" G="250" B="251" A="255"/>
+	<Vtx X="0" Y="88" Z="-148" S="86" T="752" R="0" G="50" B="117" A="255"/>
+	<Vtx X="0" Y="88" Z="-149" S="86" T="1008" R="126" G="250" B="240" A="255"/>
+	<Vtx X="0" Y="121" Z="-151" S="35" T="752" R="0" G="229" B="124" A="255"/>
+	<Vtx X="0" Y="122" Z="-152" S="35" T="1008" R="126" G="3" B="240" A="255"/>
+	<Vtx X="-1" Y="122" Z="-152" S="35" T="496" R="130" G="3" B="240" A="255"/>
+	<Vtx X="-1" Y="88" Z="-149" S="86" T="496" R="130" G="250" B="240" A="255"/>
+	<Vtx X="0" Y="122" Z="-152" S="35" T="240" R="0" G="27" B="132" A="255"/>
+	<Vtx X="0" Y="88" Z="-149" S="86" T="240" R="0" G="206" B="139" A="255"/>
+	<Vtx X="-1" Y="65" Z="-128" S="138" T="496" R="129" G="250" B="251" A="255"/>
+	<Vtx X="0" Y="65" Z="-129" S="138" T="240" R="0" G="159" B="174" A="255"/>
+	<Vtx X="-1" Y="49" Z="-102" S="189" T="496" R="129" G="254" B="255" A="255"/>
+	<Vtx X="0" Y="48" Z="-102" S="189" T="240" R="0" G="145" B="194" A="255"/>
+	<Vtx X="-1" Y="36" Z="-76" S="240" T="496" R="129" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="35" Z="-76" S="240" T="240" R="0" G="142" B="200" A="255"/>
+	<Vtx X="-1" Y="25" Z="-54" S="291" T="496" R="129" G="1" B="0" A="255"/>
+	<Vtx X="0" Y="24" Z="-54" S="291" T="240" R="0" G="143" B="197" A="255"/>
+	<Vtx X="-1" Y="16" Z="-37" S="342" T="496" R="129" G="4" B="3" A="255"/>
+	<Vtx X="0" Y="15" Z="-38" S="342" T="240" R="0" G="152" B="183" A="255"/>
+	<Vtx X="-1" Y="7" Z="-28" S="394" T="496" R="130" G="8" B="12" A="255"/>
+	<Vtx X="0" Y="7" Z="-28" S="394" T="240" R="0" G="185" B="151" A="255"/>
+	<Vtx X="-1" Y="-1" Z="-25" S="445" T="496" R="131" G="255" B="21" A="255"/>
+	<Vtx X="0" Y="-1" Z="-25" S="445" T="240" R="0" G="8" B="129" A="255"/>
+	<Vtx X="-1" Y="-9" Z="-29" S="496" T="496" R="130" G="249" B="9" A="255"/>
+	<Vtx X="0" Y="-9" Z="-29" S="496" T="240" R="0" G="79" B="157" A="255"/>
+	<Vtx X="-1" Y="-17" Z="-39" S="547" T="496" R="129" G="253" B="2" A="255"/>
+	<Vtx X="0" Y="-17" Z="-39" S="547" T="240" R="0" G="105" B="184" A="255"/>
+	<Vtx X="-1" Y="-26" Z="-55" S="598" T="496" R="129" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="-26" Z="-55" S="598" T="240" R="0" G="112" B="195" A="255"/>
+	<Vtx X="0" Y="-26" Z="-55" S="598" T="240" R="0" G="112" B="195" A="255"/>
+	<Vtx X="-1" Y="-36" Z="-73" S="650" T="496" R="129" G="1" B="0" A="255"/>
+	<Vtx X="-1" Y="-26" Z="-55" S="598" T="496" R="129" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="-35" Z="-73" S="650" T="240" R="0" G="111" B="194" A="255"/>
+	<Vtx X="-1" Y="-47" Z="-92" S="701" T="496" R="129" G="3" B="254" A="255"/>
+	<Vtx X="0" Y="-46" Z="-92" S="701" T="240" R="0" G="103" B="182" A="255"/>
+	<Vtx X="-1" Y="-60" Z="-107" S="752" T="496" R="130" G="7" B="247" A="255"/>
+	<Vtx X="0" Y="-59" Z="-107" S="752" T="240" R="0" G="78" B="156" A="255"/>
+	<Vtx X="-1" Y="-76" Z="-115" S="803" T="496" R="130" G="2" B="239" A="255"/>
+	<Vtx X="0" Y="-75" Z="-115" S="803" T="240" R="0" G="19" B="130" A="255"/>
+	<Vtx X="-1" Y="-94" Z="-112" S="854" T="496" R="130" G="251" B="243" A="255"/>
+	<Vtx X="0" Y="-94" Z="-112" S="854" T="240" R="0" G="205" B="140" A="255"/>
+	<Vtx X="-1" Y="-113" Z="-97" S="906" T="496" R="129" G="249" B="250" A="255"/>
+	<Vtx X="0" Y="-113" Z="-97" S="906" T="240" R="0" G="161" B="172" A="255"/>
+	<Vtx X="-1" Y="-128" Z="-71" S="957" T="496" R="129" G="247" B="253" A="255"/>
+	<Vtx X="0" Y="-129" Z="-71" S="957" T="240" R="0" G="138" B="210" A="255"/>
+	<Vtx X="0" Y="-128" Z="-71" S="957" T="752" R="0" G="118" B="46" A="255"/>
+	<Vtx X="0" Y="-112" Z="-96" S="906" T="752" R="0" G="95" B="84" A="255"/>
+	<Vtx X="0" Y="-94" Z="-111" S="854" T="752" R="0" G="51" B="116" A="255"/>
+	<Vtx X="0" Y="-76" Z="-114" S="803" T="752" R="0" G="237" B="126" A="255"/>
+	<Vtx X="0" Y="-60" Z="-106" S="752" T="752" R="0" G="178" B="100" A="255"/>
+	<Vtx X="0" Y="-47" Z="-91" S="701" T="752" R="0" G="153" B="74" A="255"/>
+	<Vtx X="0" Y="-36" Z="-73" S="650" T="752" R="0" G="145" B="62" A="255"/>
+	<Vtx X="0" Y="-27" Z="-54" S="598" T="752" R="0" G="144" B="61" A="255"/>
+	<Vtx X="-1" Y="-17" Z="-39" S="547" T="496" R="129" G="253" B="2" A="255"/>
+	<Vtx X="0" Y="-18" Z="-39" S="547" T="752" R="0" G="151" B="72" A="255"/>
+	<Vtx X="-1" Y="-9" Z="-29" S="496" T="496" R="130" G="249" B="9" A="255"/>
+	<Vtx X="0" Y="-9" Z="-29" S="496" T="752" R="0" G="177" B="100" A="255"/>
+	<Vtx X="-1" Y="-1" Z="-25" S="445" T="496" R="131" G="255" B="21" A="255"/>
+	<Vtx X="0" Y="-1" Z="-24" S="445" T="752" R="0" G="248" B="127" A="255"/>
+	<Vtx X="-1" Y="7" Z="-28" S="394" T="496" R="130" G="8" B="12" A="255"/>
+	<Vtx X="0" Y="8" Z="-27" S="394" T="752" R="0" G="71" B="106" A="255"/>
+	<Vtx X="-1" Y="16" Z="-37" S="342" T="496" R="129" G="4" B="3" A="255"/>
+	<Vtx X="-1" Y="7" Z="-28" S="394" T="496" R="130" G="8" B="12" A="255"/>
+	<Vtx X="0" Y="8" Z="-27" S="394" T="752" R="0" G="71" B="106" A="255"/>
+	<Vtx X="0" Y="16" Z="-37" S="342" T="752" R="0" G="104" B="73" A="255"/>
+	<Vtx X="-1" Y="25" Z="-54" S="291" T="496" R="129" G="1" B="0" A="255"/>
+	<Vtx X="0" Y="25" Z="-53" S="291" T="752" R="0" G="113" B="59" A="255"/>
+	<Vtx X="-1" Y="36" Z="-76" S="240" T="496" R="129" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="36" Z="-75" S="240" T="752" R="0" G="114" B="56" A="255"/>
+	<Vtx X="-1" Y="49" Z="-102" S="189" T="496" R="129" G="254" B="255" A="255"/>
+	<Vtx X="0" Y="49" Z="-101" S="189" T="752" R="0" G="111" B="62" A="255"/>
+	<Vtx X="-1" Y="65" Z="-128" S="138" T="496" R="129" G="250" B="251" A="255"/>
+	<Vtx X="0" Y="66" Z="-128" S="138" T="752" R="0" G="97" B="82" A="255"/>
+	<Vtx X="-1" Y="88" Z="-149" S="86" T="496" R="130" G="250" B="240" A="255"/>
+	<Vtx X="0" Y="88" Z="-148" S="86" T="752" R="0" G="50" B="117" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_4 b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_4
new file mode 100644
index 000000000..802a69d26
--- /dev/null
+++ b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_4
@@ -0,0 +1,672 @@
+<Vertex Version="0">
+	<Vtx X="25" Y="-79" Z="71" S="-133" T="340" R="127" G="0" B="0" A="255"/>
+	<Vtx X="25" Y="-78" Z="70" S="-144" T="338" R="127" G="0" B="0" A="255"/>
+	<Vtx X="25" Y="-78" Z="73" S="-144" T="368" R="127" G="0" B="0" A="255"/>
+	<Vtx X="-15" Y="-89" Z="84" S="507" T="507" R="174" G="68" B="186" A="255"/>
+	<Vtx X="-15" Y="-93" Z="79" S="550" T="443" R="173" G="89" B="219" A="255"/>
+	<Vtx X="-15" Y="-93" Z="79" S="551" T="444" R="208" G="109" B="211" A="255"/>
+	<Vtx X="-15" Y="-89" Z="84" S="508" T="508" R="210" G="84" B="172" A="255"/>
+	<Vtx X="-15" Y="-93" Z="79" S="553" T="445" R="136" G="40" B="240" A="255"/>
+	<Vtx X="-15" Y="-89" Z="84" S="510" T="510" R="137" G="31" B="225" A="255"/>
+	<Vtx X="-15" Y="-95" Z="80" S="583" T="457" R="140" G="207" B="20" A="255"/>
+	<Vtx X="-15" Y="-97" Z="73" S="601" T="368" R="140" G="203" B="0" A="255"/>
+	<Vtx X="-15" Y="-94" Z="73" S="568" T="368" R="136" G="42" B="0" A="255"/>
+	<Vtx X="-15" Y="-93" Z="79" S="551" T="444" R="208" G="109" B="211" A="255"/>
+	<Vtx X="-15" Y="-94" Z="73" S="566" T="368" R="203" G="116" B="0" A="255"/>
+	<Vtx X="-15" Y="-94" Z="73" S="565" T="368" R="171" G="94" B="0" A="255"/>
+	<Vtx X="-15" Y="-93" Z="67" S="551" T="292" R="199" G="105" B="43" A="255"/>
+	<Vtx X="-15" Y="-93" Z="67" S="550" T="293" R="169" G="86" B="35" A="255"/>
+	<Vtx X="-15" Y="-89" Z="61" S="508" T="228" R="203" G="82" B="82" A="255"/>
+	<Vtx X="-15" Y="-89" Z="61" S="507" T="229" R="171" G="67" B="67" A="255"/>
+	<Vtx X="-15" Y="-84" Z="58" S="444" T="185" R="208" G="45" B="109" A="255"/>
+	<Vtx X="-15" Y="-84" Z="58" S="443" T="186" R="173" G="36" B="90" A="255"/>
+	<Vtx X="-15" Y="-78" Z="57" S="368" T="170" R="210" G="0" B="118" A="255"/>
+	<Vtx X="-15" Y="-78" Z="57" S="368" T="171" R="175" G="0" B="97" A="255"/>
+	<Vtx X="-15" Y="-72" Z="58" S="292" T="185" R="208" G="211" B="109" A="255"/>
+	<Vtx X="-15" Y="-72" Z="58" S="293" T="186" R="173" G="218" B="88" A="255"/>
+	<Vtx X="-15" Y="-67" Z="61" S="228" T="228" R="198" G="176" B="80" A="255"/>
+	<Vtx X="-15" Y="-67" Z="61" S="229" T="229" R="168" G="191" B="65" A="255"/>
+	<Vtx X="-15" Y="-63" Z="67" S="185" T="292" R="194" G="154" B="42" A="255"/>
+	<Vtx X="-15" Y="-63" Z="67" S="186" T="293" R="166" G="174" B="34" A="255"/>
+	<Vtx X="-15" Y="-62" Z="73" S="170" T="368" R="194" G="145" B="0" A="255"/>
+	<Vtx X="-15" Y="-62" Z="73" S="171" T="368" R="165" G="167" B="0" A="255"/>
+	<Vtx X="-15" Y="-63" Z="79" S="185" T="444" R="194" G="154" B="214" A="255"/>
+	<Vtx X="-15" Y="-62" Z="73" S="171" T="368" R="165" G="167" B="0" A="255"/>
+	<Vtx X="-15" Y="-63" Z="79" S="186" T="443" R="166" G="174" B="222" A="255"/>
+	<Vtx X="-15" Y="-63" Z="79" S="185" T="444" R="194" G="154" B="214" A="255"/>
+	<Vtx X="-15" Y="-67" Z="84" S="228" T="508" R="194" G="178" B="178" A="255"/>
+	<Vtx X="-15" Y="-67" Z="84" S="229" T="507" R="165" G="193" B="193" A="255"/>
+	<Vtx X="-15" Y="-72" Z="88" S="292" T="551" R="194" G="214" B="154" A="255"/>
+	<Vtx X="-15" Y="-72" Z="88" S="293" T="550" R="166" G="222" B="174" A="255"/>
+	<Vtx X="-15" Y="-78" Z="89" S="368" T="566" R="198" G="0" B="143" A="255"/>
+	<Vtx X="-15" Y="-78" Z="89" S="368" T="565" R="168" G="0" B="164" A="255"/>
+	<Vtx X="-15" Y="-84" Z="88" S="444" T="551" R="208" G="45" B="147" A="255"/>
+	<Vtx X="-15" Y="-84" Z="88" S="443" T="550" R="173" G="35" B="167" A="255"/>
+	<Vtx X="-15" Y="-89" Z="84" S="508" T="508" R="210" G="84" B="172" A="255"/>
+	<Vtx X="-15" Y="-89" Z="84" S="507" T="507" R="174" G="68" B="186" A="255"/>
+	<Vtx X="-15" Y="-89" Z="84" S="510" T="510" R="137" G="31" B="225" A="255"/>
+	<Vtx X="-15" Y="-84" Z="88" S="445" T="553" R="137" G="17" B="216" A="255"/>
+	<Vtx X="-15" Y="-91" Z="86" S="533" T="533" R="140" G="219" B="37" A="255"/>
+	<Vtx X="-15" Y="-95" Z="80" S="583" T="457" R="140" G="207" B="20" A="255"/>
+	<Vtx X="-14" Y="-96" Z="80" S="595" T="462" R="209" G="147" B="45" A="255"/>
+	<Vtx X="-14" Y="-98" Z="73" S="614" T="368" R="209" G="138" B="0" A="255"/>
+	<Vtx X="-15" Y="-97" Z="73" S="601" T="368" R="140" G="203" B="0" A="255"/>
+	<Vtx X="-14" Y="-96" Z="65" S="595" T="274" R="209" G="147" B="211" A="255"/>
+	<Vtx X="-15" Y="-95" Z="66" S="583" T="279" R="140" G="207" B="236" A="255"/>
+	<Vtx X="-15" Y="-94" Z="73" S="568" T="368" R="136" G="42" B="0" A="255"/>
+	<Vtx X="-15" Y="-93" Z="67" S="553" T="291" R="136" G="38" B="15" A="255"/>
+	<Vtx X="-15" Y="-94" Z="73" S="566" T="368" R="203" G="116" B="0" A="255"/>
+	<Vtx X="-15" Y="-93" Z="67" S="551" T="292" R="199" G="105" B="43" A="255"/>
+	<Vtx X="-15" Y="-89" Z="61" S="510" T="226" R="136" G="30" B="30" A="255"/>
+	<Vtx X="-15" Y="-89" Z="61" S="508" T="228" R="203" G="82" B="82" A="255"/>
+	<Vtx X="-15" Y="-84" Z="58" S="445" T="183" R="137" G="17" B="40" A="255"/>
+	<Vtx X="-15" Y="-84" Z="58" S="444" T="185" R="208" G="45" B="109" A="255"/>
+	<Vtx X="-15" Y="-78" Z="57" S="368" T="168" R="137" G="0" B="44" A="255"/>
+	<Vtx X="-15" Y="-78" Z="57" S="368" T="170" R="210" G="0" B="118" A="255"/>
+	<Vtx X="-15" Y="-72" Z="58" S="291" T="183" R="136" G="240" B="40" A="255"/>
+	<Vtx X="-15" Y="-78" Z="57" S="368" T="168" R="137" G="0" B="44" A="255"/>
+	<Vtx X="-15" Y="-78" Z="57" S="368" T="170" R="210" G="0" B="118" A="255"/>
+	<Vtx X="-15" Y="-72" Z="58" S="292" T="185" R="208" G="211" B="109" A="255"/>
+	<Vtx X="-15" Y="-66" Z="61" S="226" T="226" R="136" G="228" B="29" A="255"/>
+	<Vtx X="-15" Y="-67" Z="61" S="228" T="228" R="198" G="176" B="80" A="255"/>
+	<Vtx X="-15" Y="-63" Z="67" S="183" T="291" R="135" G="220" B="15" A="255"/>
+	<Vtx X="-15" Y="-63" Z="67" S="185" T="292" R="194" G="154" B="42" A="255"/>
+	<Vtx X="-15" Y="-62" Z="73" S="168" T="368" R="135" G="217" B="0" A="255"/>
+	<Vtx X="-15" Y="-62" Z="73" S="170" T="368" R="194" G="145" B="0" A="255"/>
+	<Vtx X="-15" Y="-63" Z="79" S="183" T="445" R="135" G="220" B="241" A="255"/>
+	<Vtx X="-15" Y="-63" Z="79" S="185" T="444" R="194" G="154" B="214" A="255"/>
+	<Vtx X="-15" Y="-66" Z="84" S="226" T="510" R="135" G="228" B="228" A="255"/>
+	<Vtx X="-15" Y="-67" Z="84" S="228" T="508" R="194" G="178" B="178" A="255"/>
+	<Vtx X="-15" Y="-72" Z="88" S="291" T="553" R="135" G="241" B="220" A="255"/>
+	<Vtx X="-15" Y="-72" Z="88" S="292" T="551" R="194" G="214" B="154" A="255"/>
+	<Vtx X="-15" Y="-78" Z="89" S="368" T="568" R="136" G="0" B="215" A="255"/>
+	<Vtx X="-15" Y="-78" Z="89" S="368" T="566" R="198" G="0" B="143" A="255"/>
+	<Vtx X="-15" Y="-84" Z="88" S="445" T="553" R="137" G="17" B="216" A="255"/>
+	<Vtx X="-15" Y="-84" Z="88" S="444" T="551" R="208" G="45" B="147" A="255"/>
+	<Vtx X="-15" Y="-85" Z="90" S="457" T="583" R="140" G="236" B="49" A="255"/>
+	<Vtx X="-15" Y="-91" Z="86" S="533" T="533" R="140" G="219" B="37" A="255"/>
+	<Vtx X="-14" Y="-92" Z="87" S="542" T="542" R="209" G="172" B="84" A="255"/>
+	<Vtx X="-14" Y="-96" Z="80" S="595" T="462" R="209" G="147" B="45" A="255"/>
+	<Vtx X="-14" Y="-86" Z="91" S="462" T="595" R="209" G="211" B="109" A="255"/>
+	<Vtx X="-15" Y="-78" Z="92" S="368" T="601" R="140" G="0" B="53" A="255"/>
+	<Vtx X="-14" Y="-78" Z="93" S="368" T="614" R="209" G="0" B="118" A="255"/>
+	<Vtx X="-15" Y="-71" Z="90" S="279" T="583" R="140" G="20" B="49" A="255"/>
+	<Vtx X="-14" Y="-70" Z="91" S="274" T="595" R="209" G="45" B="109" A="255"/>
+	<Vtx X="-15" Y="-64" Z="86" S="203" T="533" R="140" G="37" B="37" A="255"/>
+	<Vtx X="-14" Y="-64" Z="87" S="194" T="542" R="209" G="84" B="84" A="255"/>
+	<Vtx X="-15" Y="-60" Z="80" S="153" T="457" R="140" G="49" B="20" A="255"/>
+	<Vtx X="-14" Y="-64" Z="87" S="194" T="542" R="209" G="84" B="84" A="255"/>
+	<Vtx X="-14" Y="-59" Z="80" S="141" T="462" R="209" G="109" B="45" A="255"/>
+	<Vtx X="-15" Y="-60" Z="80" S="153" T="457" R="140" G="49" B="20" A="255"/>
+	<Vtx X="-15" Y="-59" Z="73" S="135" T="368" R="140" G="53" B="0" A="255"/>
+	<Vtx X="-14" Y="-58" Z="73" S="122" T="368" R="209" G="118" B="0" A="255"/>
+	<Vtx X="-15" Y="-60" Z="66" S="153" T="279" R="140" G="49" B="236" A="255"/>
+	<Vtx X="-14" Y="-59" Z="65" S="141" T="274" R="209" G="109" B="211" A="255"/>
+	<Vtx X="-15" Y="-64" Z="59" S="203" T="203" R="140" G="37" B="219" A="255"/>
+	<Vtx X="-14" Y="-64" Z="59" S="194" T="194" R="209" G="84" B="172" A="255"/>
+	<Vtx X="-15" Y="-71" Z="55" S="279" T="153" R="140" G="20" B="207" A="255"/>
+	<Vtx X="-14" Y="-70" Z="54" S="274" T="141" R="209" G="45" B="147" A="255"/>
+	<Vtx X="-15" Y="-78" Z="54" S="368" T="135" R="140" G="0" B="203" A="255"/>
+	<Vtx X="-14" Y="-78" Z="53" S="368" T="122" R="209" G="0" B="138" A="255"/>
+	<Vtx X="-15" Y="-85" Z="55" S="457" T="153" R="140" G="236" B="207" A="255"/>
+	<Vtx X="-14" Y="-86" Z="54" S="462" T="141" R="209" G="211" B="147" A="255"/>
+	<Vtx X="-15" Y="-91" Z="59" S="533" T="203" R="140" G="219" B="219" A="255"/>
+	<Vtx X="-14" Y="-92" Z="59" S="542" T="194" R="209" G="172" B="172" A="255"/>
+	<Vtx X="-15" Y="-95" Z="66" S="583" T="279" R="140" G="207" B="236" A="255"/>
+	<Vtx X="-14" Y="-96" Z="65" S="595" T="274" R="209" G="147" B="211" A="255"/>
+	<Vtx X="-15" Y="-93" Z="67" S="553" T="291" R="136" G="38" B="15" A="255"/>
+	<Vtx X="-15" Y="-89" Z="61" S="510" T="226" R="136" G="30" B="30" A="255"/>
+	<Vtx X="-15" Y="-84" Z="58" S="445" T="183" R="137" G="17" B="40" A="255"/>
+	<Vtx X="-15" Y="-78" Z="57" S="368" T="168" R="137" G="0" B="44" A="255"/>
+	<Vtx X="-15" Y="-72" Z="58" S="291" T="183" R="136" G="240" B="40" A="255"/>
+	<Vtx X="-15" Y="-66" Z="61" S="226" T="226" R="136" G="228" B="29" A="255"/>
+	<Vtx X="-15" Y="-63" Z="67" S="183" T="291" R="135" G="220" B="15" A="255"/>
+	<Vtx X="-15" Y="-62" Z="73" S="168" T="368" R="135" G="217" B="0" A="255"/>
+	<Vtx X="-15" Y="-63" Z="79" S="183" T="445" R="135" G="220" B="241" A="255"/>
+	<Vtx X="-15" Y="-64" Z="86" S="203" T="533" R="140" G="37" B="37" A="255"/>
+	<Vtx X="-15" Y="-66" Z="84" S="226" T="510" R="135" G="228" B="228" A="255"/>
+	<Vtx X="-15" Y="-71" Z="90" S="279" T="583" R="140" G="20" B="49" A="255"/>
+	<Vtx X="-15" Y="-72" Z="88" S="291" T="553" R="135" G="241" B="220" A="255"/>
+	<Vtx X="-15" Y="-72" Z="88" S="291" T="553" R="135" G="241" B="220" A="255"/>
+	<Vtx X="-15" Y="-78" Z="92" S="368" T="601" R="140" G="0" B="53" A="255"/>
+	<Vtx X="-15" Y="-71" Z="90" S="279" T="583" R="140" G="20" B="49" A="255"/>
+	<Vtx X="-15" Y="-78" Z="89" S="368" T="568" R="136" G="0" B="215" A="255"/>
+	<Vtx X="-15" Y="-85" Z="90" S="457" T="583" R="140" G="236" B="49" A="255"/>
+	<Vtx X="-14" Y="-70" Z="54" S="-336" T="86" R="209" G="45" B="147" A="255"/>
+	<Vtx X="-11" Y="-78" Z="53" S="-400" T="10" R="47" G="0" B="138" A="255"/>
+	<Vtx X="-14" Y="-78" Z="53" S="-400" T="86" R="209" G="0" B="138" A="255"/>
+	<Vtx X="-11" Y="-70" Z="54" S="-336" T="10" R="47" G="45" B="147" A="255"/>
+	<Vtx X="-14" Y="-64" Z="59" S="-272" T="86" R="209" G="84" B="172" A="255"/>
+	<Vtx X="-11" Y="-64" Z="59" S="-272" T="10" R="47" G="84" B="172" A="255"/>
+	<Vtx X="-14" Y="-59" Z="65" S="-208" T="86" R="209" G="109" B="211" A="255"/>
+	<Vtx X="-11" Y="-59" Z="65" S="-208" T="10" R="47" G="109" B="211" A="255"/>
+	<Vtx X="-14" Y="-58" Z="73" S="-144" T="86" R="209" G="118" B="0" A="255"/>
+	<Vtx X="-11" Y="-58" Z="73" S="-144" T="10" R="47" G="118" B="0" A="255"/>
+	<Vtx X="-14" Y="-59" Z="80" S="-80" T="86" R="209" G="109" B="45" A="255"/>
+	<Vtx X="-11" Y="-59" Z="80" S="-80" T="10" R="47" G="109" B="45" A="255"/>
+	<Vtx X="-14" Y="-64" Z="87" S="-16" T="86" R="209" G="84" B="84" A="255"/>
+	<Vtx X="-11" Y="-64" Z="87" S="-16" T="10" R="47" G="84" B="84" A="255"/>
+	<Vtx X="-14" Y="-70" Z="91" S="48" T="86" R="209" G="45" B="109" A="255"/>
+	<Vtx X="-11" Y="-70" Z="91" S="48" T="10" R="47" G="45" B="109" A="255"/>
+	<Vtx X="-14" Y="-78" Z="93" S="112" T="86" R="209" G="0" B="118" A="255"/>
+	<Vtx X="-11" Y="-78" Z="93" S="112" T="10" R="47" G="0" B="118" A="255"/>
+	<Vtx X="-14" Y="-86" Z="91" S="176" T="86" R="209" G="211" B="109" A="255"/>
+	<Vtx X="-11" Y="-86" Z="91" S="176" T="10" R="47" G="211" B="109" A="255"/>
+	<Vtx X="-14" Y="-92" Z="87" S="240" T="86" R="209" G="172" B="84" A="255"/>
+	<Vtx X="-11" Y="-92" Z="87" S="240" T="10" R="47" G="172" B="84" A="255"/>
+	<Vtx X="-14" Y="-96" Z="80" S="304" T="86" R="209" G="147" B="45" A="255"/>
+	<Vtx X="-11" Y="-96" Z="80" S="304" T="10" R="47" G="147" B="45" A="255"/>
+	<Vtx X="-14" Y="-98" Z="73" S="368" T="86" R="209" G="138" B="0" A="255"/>
+	<Vtx X="-11" Y="-98" Z="73" S="368" T="10" R="47" G="138" B="0" A="255"/>
+	<Vtx X="-14" Y="-96" Z="65" S="432" T="86" R="209" G="147" B="211" A="255"/>
+	<Vtx X="-14" Y="-96" Z="65" S="432" T="86" R="209" G="147" B="211" A="255"/>
+	<Vtx X="-11" Y="-96" Z="65" S="432" T="10" R="47" G="147" B="211" A="255"/>
+	<Vtx X="-11" Y="-98" Z="73" S="368" T="10" R="47" G="138" B="0" A="255"/>
+	<Vtx X="-14" Y="-92" Z="59" S="496" T="86" R="209" G="172" B="172" A="255"/>
+	<Vtx X="-11" Y="-92" Z="59" S="496" T="10" R="47" G="172" B="172" A="255"/>
+	<Vtx X="-14" Y="-86" Z="54" S="560" T="86" R="209" G="211" B="147" A="255"/>
+	<Vtx X="-11" Y="-86" Z="54" S="560" T="10" R="47" G="211" B="147" A="255"/>
+	<Vtx X="-14" Y="-78" Z="53" S="624" T="86" R="209" G="0" B="138" A="255"/>
+	<Vtx X="-11" Y="-78" Z="53" S="624" T="10" R="47" G="0" B="138" A="255"/>
+	<Vtx X="-10" Y="-78" Z="54" S="624" T="-16" R="116" G="0" B="203" A="255"/>
+	<Vtx X="-10" Y="-85" Z="55" S="560" T="-16" R="116" G="236" B="207" A="255"/>
+	<Vtx X="-10" Y="-78" Z="57" S="624" T="-16" R="96" G="0" B="172" A="255"/>
+	<Vtx X="-10" Y="-84" Z="58" S="560" T="-16" R="95" G="225" B="178" A="255"/>
+	<Vtx X="-10" Y="-91" Z="59" S="496" T="-16" R="116" G="219" B="219" A="255"/>
+	<Vtx X="-10" Y="-89" Z="61" S="496" T="-16" R="95" G="197" B="195" A="255"/>
+	<Vtx X="-10" Y="-95" Z="66" S="432" T="-16" R="116" G="207" B="236" A="255"/>
+	<Vtx X="-10" Y="-93" Z="67" S="432" T="-16" R="94" G="177" B="222" A="255"/>
+	<Vtx X="-10" Y="-97" Z="73" S="368" T="-16" R="116" G="203" B="0" A="255"/>
+	<Vtx X="-10" Y="-94" Z="73" S="368" T="-16" R="93" G="169" B="0" A="255"/>
+	<Vtx X="-10" Y="-95" Z="80" S="304" T="-16" R="116" G="207" B="20" A="255"/>
+	<Vtx X="-10" Y="-93" Z="79" S="304" T="-16" R="94" G="177" B="34" A="255"/>
+	<Vtx X="-10" Y="-91" Z="86" S="240" T="-16" R="116" G="219" B="37" A="255"/>
+	<Vtx X="-10" Y="-89" Z="84" S="240" T="-16" R="95" G="197" B="61" A="255"/>
+	<Vtx X="-10" Y="-85" Z="90" S="176" T="-16" R="116" G="236" B="49" A="255"/>
+	<Vtx X="-10" Y="-84" Z="88" S="176" T="-16" R="95" G="225" B="78" A="255"/>
+	<Vtx X="-10" Y="-78" Z="92" S="112" T="-16" R="116" G="0" B="53" A="255"/>
+	<Vtx X="-10" Y="-78" Z="89" S="112" T="-16" R="96" G="0" B="84" A="255"/>
+	<Vtx X="-10" Y="-71" Z="90" S="48" T="-16" R="116" G="20" B="49" A="255"/>
+	<Vtx X="-10" Y="-72" Z="88" S="48" T="-16" R="95" G="31" B="78" A="255"/>
+	<Vtx X="-10" Y="-64" Z="86" S="-16" T="-16" R="116" G="37" B="37" A="255"/>
+	<Vtx X="-10" Y="-67" Z="84" S="-16" T="-16" R="95" G="59" B="61" A="255"/>
+	<Vtx X="-10" Y="-60" Z="80" S="-80" T="-16" R="116" G="49" B="20" A="255"/>
+	<Vtx X="-10" Y="-60" Z="80" S="-80" T="-16" R="116" G="49" B="20" A="255"/>
+	<Vtx X="-10" Y="-67" Z="84" S="-16" T="-16" R="95" G="59" B="61" A="255"/>
+	<Vtx X="-10" Y="-63" Z="79" S="-80" T="-16" R="94" G="79" B="34" A="255"/>
+	<Vtx X="-10" Y="-59" Z="73" S="-144" T="-16" R="116" G="53" B="0" A="255"/>
+	<Vtx X="-10" Y="-62" Z="73" S="-144" T="-16" R="93" G="87" B="0" A="255"/>
+	<Vtx X="-10" Y="-60" Z="66" S="-208" T="-16" R="116" G="49" B="236" A="255"/>
+	<Vtx X="-10" Y="-63" Z="67" S="-208" T="-16" R="94" G="79" B="222" A="255"/>
+	<Vtx X="-10" Y="-64" Z="59" S="-272" T="-16" R="116" G="37" B="219" A="255"/>
+	<Vtx X="-10" Y="-67" Z="61" S="-272" T="-16" R="95" G="59" B="195" A="255"/>
+	<Vtx X="-10" Y="-71" Z="55" S="-336" T="-16" R="116" G="20" B="207" A="255"/>
+	<Vtx X="-10" Y="-72" Z="58" S="-336" T="-16" R="95" G="31" B="178" A="255"/>
+	<Vtx X="-10" Y="-78" Z="54" S="-400" T="-16" R="116" G="0" B="203" A="255"/>
+	<Vtx X="-10" Y="-78" Z="57" S="-400" T="-16" R="96" G="0" B="172" A="255"/>
+	<Vtx X="-11" Y="-78" Z="53" S="-400" T="10" R="47" G="0" B="138" A="255"/>
+	<Vtx X="-11" Y="-70" Z="54" S="-336" T="10" R="47" G="45" B="147" A="255"/>
+	<Vtx X="-11" Y="-64" Z="59" S="-272" T="10" R="47" G="84" B="172" A="255"/>
+	<Vtx X="-11" Y="-59" Z="65" S="-208" T="10" R="47" G="109" B="211" A="255"/>
+	<Vtx X="-11" Y="-58" Z="73" S="-144" T="10" R="47" G="118" B="0" A="255"/>
+	<Vtx X="-11" Y="-59" Z="80" S="-80" T="10" R="47" G="109" B="45" A="255"/>
+	<Vtx X="-10" Y="-64" Z="86" S="-16" T="-16" R="116" G="37" B="37" A="255"/>
+	<Vtx X="-11" Y="-64" Z="87" S="-16" T="10" R="47" G="84" B="84" A="255"/>
+	<Vtx X="-10" Y="-71" Z="90" S="48" T="-16" R="116" G="20" B="49" A="255"/>
+	<Vtx X="-11" Y="-70" Z="91" S="48" T="10" R="47" G="45" B="109" A="255"/>
+	<Vtx X="-10" Y="-78" Z="92" S="112" T="-16" R="116" G="0" B="53" A="255"/>
+	<Vtx X="-11" Y="-78" Z="93" S="112" T="10" R="47" G="0" B="118" A="255"/>
+	<Vtx X="-10" Y="-85" Z="90" S="176" T="-16" R="116" G="236" B="49" A="255"/>
+	<Vtx X="-11" Y="-86" Z="91" S="176" T="10" R="47" G="211" B="109" A="255"/>
+	<Vtx X="-10" Y="-91" Z="86" S="240" T="-16" R="116" G="219" B="37" A="255"/>
+	<Vtx X="-11" Y="-92" Z="87" S="240" T="10" R="47" G="172" B="84" A="255"/>
+	<Vtx X="-10" Y="-95" Z="80" S="304" T="-16" R="116" G="207" B="20" A="255"/>
+	<Vtx X="-11" Y="-96" Z="80" S="304" T="10" R="47" G="147" B="45" A="255"/>
+	<Vtx X="-10" Y="-97" Z="73" S="368" T="-16" R="116" G="203" B="0" A="255"/>
+	<Vtx X="-10" Y="-97" Z="73" S="368" T="-16" R="116" G="203" B="0" A="255"/>
+	<Vtx X="-11" Y="-96" Z="80" S="304" T="10" R="47" G="147" B="45" A="255"/>
+	<Vtx X="-11" Y="-98" Z="73" S="368" T="10" R="47" G="138" B="0" A="255"/>
+	<Vtx X="-10" Y="-95" Z="66" S="432" T="-16" R="116" G="207" B="236" A="255"/>
+	<Vtx X="-11" Y="-96" Z="65" S="432" T="10" R="47" G="147" B="211" A="255"/>
+	<Vtx X="-10" Y="-91" Z="59" S="496" T="-16" R="116" G="219" B="219" A="255"/>
+	<Vtx X="-11" Y="-92" Z="59" S="496" T="10" R="47" G="172" B="172" A="255"/>
+	<Vtx X="-10" Y="-85" Z="55" S="560" T="-16" R="116" G="236" B="207" A="255"/>
+	<Vtx X="-11" Y="-86" Z="54" S="560" T="10" R="47" G="211" B="147" A="255"/>
+	<Vtx X="11" Y="-92" Z="87" S="240" T="-298" R="209" G="172" B="84" A="255"/>
+	<Vtx X="14" Y="-92" Z="87" S="240" T="-374" R="47" G="172" B="84" A="255"/>
+	<Vtx X="14" Y="-86" Z="91" S="176" T="-374" R="47" G="211" B="109" A="255"/>
+	<Vtx X="11" Y="-86" Z="91" S="176" T="-298" R="209" G="211" B="109" A="255"/>
+	<Vtx X="10" Y="-85" Z="90" S="176" T="-272" R="140" G="236" B="49" A="255"/>
+	<Vtx X="10" Y="-78" Z="92" S="112" T="-272" R="140" G="0" B="53" A="255"/>
+	<Vtx X="11" Y="-78" Z="93" S="112" T="-298" R="209" G="0" B="118" A="255"/>
+	<Vtx X="14" Y="-78" Z="93" S="112" T="-374" R="47" G="0" B="118" A="255"/>
+	<Vtx X="14" Y="-86" Z="91" S="176" T="-374" R="47" G="211" B="109" A="255"/>
+	<Vtx X="10" Y="-71" Z="90" S="48" T="-272" R="140" G="20" B="49" A="255"/>
+	<Vtx X="11" Y="-70" Z="91" S="48" T="-298" R="209" G="45" B="109" A="255"/>
+	<Vtx X="14" Y="-70" Z="91" S="48" T="-374" R="47" G="45" B="109" A="255"/>
+	<Vtx X="14" Y="-78" Z="93" S="112" T="-374" R="47" G="0" B="118" A="255"/>
+	<Vtx X="10" Y="-72" Z="88" S="48" T="-272" R="161" G="31" B="78" A="255"/>
+	<Vtx X="10" Y="-78" Z="89" S="112" T="-272" R="160" G="0" B="84" A="255"/>
+	<Vtx X="10" Y="-84" Z="88" S="176" T="-272" R="161" G="225" B="78" A="255"/>
+	<Vtx X="10" Y="-91" Z="86" S="240" T="-272" R="140" G="219" B="37" A="255"/>
+	<Vtx X="10" Y="-89" Z="84" S="240" T="-272" R="161" G="197" B="61" A="255"/>
+	<Vtx X="10" Y="-95" Z="80" S="304" T="-272" R="140" G="207" B="20" A="255"/>
+	<Vtx X="10" Y="-93" Z="79" S="304" T="-272" R="162" G="177" B="34" A="255"/>
+	<Vtx X="10" Y="-97" Z="73" S="368" T="-272" R="140" G="203" B="0" A="255"/>
+	<Vtx X="10" Y="-94" Z="73" S="368" T="-272" R="163" G="169" B="0" A="255"/>
+	<Vtx X="10" Y="-95" Z="66" S="432" T="-272" R="140" G="207" B="236" A="255"/>
+	<Vtx X="10" Y="-95" Z="66" S="432" T="-272" R="140" G="207" B="236" A="255"/>
+	<Vtx X="10" Y="-94" Z="73" S="368" T="-272" R="163" G="169" B="0" A="255"/>
+	<Vtx X="10" Y="-93" Z="67" S="432" T="-272" R="162" G="177" B="222" A="255"/>
+	<Vtx X="10" Y="-91" Z="59" S="496" T="-272" R="140" G="219" B="219" A="255"/>
+	<Vtx X="10" Y="-89" Z="61" S="496" T="-272" R="161" G="197" B="195" A="255"/>
+	<Vtx X="10" Y="-85" Z="55" S="560" T="-272" R="140" G="236" B="207" A="255"/>
+	<Vtx X="10" Y="-84" Z="58" S="560" T="-272" R="161" G="225" B="178" A="255"/>
+	<Vtx X="10" Y="-78" Z="54" S="624" T="-272" R="140" G="0" B="203" A="255"/>
+	<Vtx X="10" Y="-78" Z="57" S="624" T="-272" R="160" G="0" B="172" A="255"/>
+	<Vtx X="11" Y="-78" Z="53" S="624" T="-298" R="209" G="0" B="138" A="255"/>
+	<Vtx X="11" Y="-86" Z="54" S="560" T="-298" R="209" G="211" B="147" A="255"/>
+	<Vtx X="14" Y="-86" Z="54" S="560" T="-374" R="47" G="211" B="147" A="255"/>
+	<Vtx X="14" Y="-78" Z="53" S="624" T="-374" R="47" G="0" B="138" A="255"/>
+	<Vtx X="11" Y="-92" Z="59" S="496" T="-298" R="209" G="172" B="172" A="255"/>
+	<Vtx X="14" Y="-92" Z="59" S="496" T="-374" R="47" G="172" B="172" A="255"/>
+	<Vtx X="14" Y="-86" Z="54" S="560" T="-374" R="47" G="211" B="147" A="255"/>
+	<Vtx X="11" Y="-96" Z="65" S="432" T="-298" R="209" G="147" B="211" A="255"/>
+	<Vtx X="14" Y="-96" Z="65" S="432" T="-374" R="47" G="147" B="211" A="255"/>
+	<Vtx X="14" Y="-92" Z="59" S="496" T="-374" R="47" G="172" B="172" A="255"/>
+	<Vtx X="10" Y="-97" Z="73" S="368" T="-272" R="140" G="203" B="0" A="255"/>
+	<Vtx X="11" Y="-98" Z="73" S="368" T="-298" R="209" G="138" B="0" A="255"/>
+	<Vtx X="14" Y="-98" Z="73" S="368" T="-374" R="47" G="138" B="0" A="255"/>
+	<Vtx X="14" Y="-96" Z="65" S="432" T="-374" R="47" G="147" B="211" A="255"/>
+	<Vtx X="10" Y="-95" Z="80" S="304" T="-272" R="140" G="207" B="20" A="255"/>
+	<Vtx X="11" Y="-96" Z="80" S="304" T="-298" R="209" G="147" B="45" A="255"/>
+	<Vtx X="14" Y="-96" Z="80" S="304" T="-374" R="47" G="147" B="45" A="255"/>
+	<Vtx X="14" Y="-98" Z="73" S="368" T="-374" R="47" G="138" B="0" A="255"/>
+	<Vtx X="10" Y="-91" Z="86" S="240" T="-272" R="140" G="219" B="37" A="255"/>
+	<Vtx X="11" Y="-92" Z="87" S="240" T="-298" R="209" G="172" B="84" A="255"/>
+	<Vtx X="14" Y="-92" Z="87" S="240" T="-374" R="47" G="172" B="84" A="255"/>
+	<Vtx X="14" Y="-96" Z="80" S="304" T="-374" R="47" G="147" B="45" A="255"/>
+	<Vtx X="10" Y="-85" Z="90" S="176" T="-272" R="140" G="236" B="49" A="255"/>
+	<Vtx X="11" Y="-70" Z="91" S="48" T="-298" R="209" G="45" B="109" A="255"/>
+	<Vtx X="14" Y="-70" Z="91" S="48" T="-374" R="47" G="45" B="109" A="255"/>
+	<Vtx X="14" Y="-64" Z="87" S="-16" T="-374" R="47" G="84" B="84" A="255"/>
+	<Vtx X="11" Y="-64" Z="87" S="-16" T="-298" R="209" G="84" B="84" A="255"/>
+	<Vtx X="10" Y="-64" Z="86" S="-16" T="-272" R="140" G="37" B="37" A="255"/>
+	<Vtx X="10" Y="-60" Z="80" S="-80" T="-272" R="140" G="49" B="20" A="255"/>
+	<Vtx X="11" Y="-59" Z="80" S="-80" T="-298" R="209" G="109" B="45" A="255"/>
+	<Vtx X="14" Y="-59" Z="80" S="-80" T="-374" R="47" G="109" B="45" A="255"/>
+	<Vtx X="14" Y="-64" Z="87" S="-16" T="-374" R="47" G="84" B="84" A="255"/>
+	<Vtx X="10" Y="-59" Z="73" S="-144" T="-272" R="140" G="53" B="0" A="255"/>
+	<Vtx X="11" Y="-58" Z="73" S="-144" T="-298" R="209" G="118" B="0" A="255"/>
+	<Vtx X="14" Y="-58" Z="73" S="-144" T="-374" R="47" G="118" B="0" A="255"/>
+	<Vtx X="14" Y="-59" Z="80" S="-80" T="-374" R="47" G="109" B="45" A="255"/>
+	<Vtx X="10" Y="-62" Z="73" S="-144" T="-272" R="163" G="87" B="0" A="255"/>
+	<Vtx X="10" Y="-63" Z="79" S="-80" T="-272" R="162" G="79" B="34" A="255"/>
+	<Vtx X="10" Y="-67" Z="84" S="-16" T="-272" R="161" G="59" B="61" A="255"/>
+	<Vtx X="10" Y="-71" Z="90" S="48" T="-272" R="140" G="20" B="49" A="255"/>
+	<Vtx X="10" Y="-72" Z="88" S="48" T="-272" R="161" G="31" B="78" A="255"/>
+	<Vtx X="14" Y="-58" Z="73" S="-144" T="-374" R="47" G="118" B="0" A="255"/>
+	<Vtx X="14" Y="-59" Z="65" S="-208" T="-374" R="47" G="109" B="211" A="255"/>
+	<Vtx X="11" Y="-59" Z="65" S="-208" T="-298" R="209" G="109" B="211" A="255"/>
+	<Vtx X="10" Y="-60" Z="66" S="-208" T="-272" R="140" G="49" B="236" A="255"/>
+	<Vtx X="10" Y="-59" Z="73" S="-144" T="-272" R="140" G="53" B="0" A="255"/>
+	<Vtx X="10" Y="-63" Z="67" S="-208" T="-272" R="162" G="79" B="222" A="255"/>
+	<Vtx X="14" Y="-59" Z="65" S="-208" T="-374" R="47" G="109" B="211" A="255"/>
+	<Vtx X="14" Y="-64" Z="59" S="-272" T="-374" R="47" G="84" B="172" A="255"/>
+	<Vtx X="11" Y="-64" Z="59" S="-272" T="-298" R="209" G="84" B="172" A="255"/>
+	<Vtx X="10" Y="-64" Z="59" S="-272" T="-272" R="140" G="37" B="219" A="255"/>
+	<Vtx X="10" Y="-60" Z="66" S="-208" T="-272" R="140" G="49" B="236" A="255"/>
+	<Vtx X="10" Y="-67" Z="61" S="-272" T="-272" R="161" G="59" B="195" A="255"/>
+	<Vtx X="14" Y="-64" Z="59" S="-272" T="-374" R="47" G="84" B="172" A="255"/>
+	<Vtx X="14" Y="-70" Z="54" S="-336" T="-374" R="47" G="45" B="147" A="255"/>
+	<Vtx X="11" Y="-64" Z="59" S="-272" T="-298" R="209" G="84" B="172" A="255"/>
+	<Vtx X="14" Y="-70" Z="54" S="-336" T="-374" R="47" G="45" B="147" A="255"/>
+	<Vtx X="11" Y="-70" Z="54" S="-336" T="-298" R="209" G="45" B="147" A="255"/>
+	<Vtx X="10" Y="-71" Z="55" S="-336" T="-272" R="140" G="20" B="207" A="255"/>
+	<Vtx X="10" Y="-78" Z="54" S="-400" T="-272" R="140" G="0" B="203" A="255"/>
+	<Vtx X="11" Y="-78" Z="53" S="-400" T="-298" R="209" G="0" B="138" A="255"/>
+	<Vtx X="14" Y="-78" Z="53" S="-400" T="-374" R="47" G="0" B="138" A="255"/>
+	<Vtx X="14" Y="-70" Z="54" S="-336" T="-374" R="47" G="45" B="147" A="255"/>
+	<Vtx X="10" Y="-78" Z="57" S="-400" T="-272" R="160" G="0" B="172" A="255"/>
+	<Vtx X="10" Y="-72" Z="58" S="-336" T="-272" R="161" G="31" B="178" A="255"/>
+	<Vtx X="10" Y="-64" Z="59" S="-272" T="-272" R="140" G="37" B="219" A="255"/>
+	<Vtx X="10" Y="-67" Z="61" S="-272" T="-272" R="161" G="59" B="195" A="255"/>
+	<Vtx X="17" Y="-77" Z="76" S="-158" T="401" R="127" G="0" B="0" A="255"/>
+	<Vtx X="17" Y="-74" Z="76" S="-189" T="413" R="127" G="0" B="0" A="255"/>
+	<Vtx X="17" Y="-76" Z="78" S="-168" T="426" R="127" G="0" B="0" A="255"/>
+	<Vtx X="17" Y="-76" Z="75" S="-169" T="393" R="127" G="0" B="0" A="255"/>
+	<Vtx X="17" Y="-73" Z="75" S="-202" T="392" R="127" G="0" B="0" A="255"/>
+	<Vtx X="17" Y="-75" Z="74" S="-177" T="382" R="127" G="0" B="0" A="255"/>
+	<Vtx X="17" Y="-73" Z="73" S="-207" T="368" R="127" G="0" B="0" A="255"/>
+	<Vtx X="17" Y="-75" Z="73" S="-180" T="368" R="127" G="0" B="0" A="255"/>
+	<Vtx X="17" Y="-73" Z="71" S="-202" T="344" R="127" G="0" B="0" A="255"/>
+	<Vtx X="17" Y="-75" Z="72" S="-177" T="354" R="127" G="0" B="0" A="255"/>
+	<Vtx X="17" Y="-74" Z="69" S="-189" T="323" R="127" G="0" B="0" A="255"/>
+	<Vtx X="17" Y="-76" Z="71" S="-169" T="343" R="127" G="0" B="0" A="255"/>
+	<Vtx X="17" Y="-78" Z="76" S="-144" T="404" R="127" G="0" B="0" A="255"/>
+	<Vtx X="17" Y="-77" Z="76" S="-158" T="401" R="127" G="0" B="0" A="255"/>
+	<Vtx X="17" Y="-76" Z="78" S="-168" T="426" R="127" G="0" B="0" A="255"/>
+	<Vtx X="17" Y="-78" Z="78" S="-144" T="431" R="127" G="0" B="0" A="255"/>
+	<Vtx X="17" Y="-79" Z="76" S="-130" T="401" R="127" G="0" B="0" A="255"/>
+	<Vtx X="17" Y="-80" Z="78" S="-120" T="426" R="127" G="0" B="0" A="255"/>
+	<Vtx X="17" Y="-77" Z="70" S="-158" T="335" R="127" G="0" B="0" A="255"/>
+	<Vtx X="17" Y="-78" Z="70" S="-144" T="332" R="127" G="0" B="0" A="255"/>
+	<Vtx X="17" Y="-78" Z="68" S="-144" T="305" R="127" G="0" B="0" A="255"/>
+	<Vtx X="17" Y="-76" Z="68" S="-168" T="310" R="127" G="0" B="0" A="255"/>
+	<Vtx X="17" Y="-76" Z="71" S="-169" T="343" R="127" G="0" B="0" A="255"/>
+	<Vtx X="17" Y="-74" Z="69" S="-189" T="323" R="127" G="0" B="0" A="255"/>
+	<Vtx X="17" Y="-78" Z="70" S="-144" T="332" R="127" G="0" B="0" A="255"/>
+	<Vtx X="17" Y="-80" Z="68" S="-120" T="310" R="127" G="0" B="0" A="255"/>
+	<Vtx X="17" Y="-78" Z="68" S="-144" T="305" R="127" G="0" B="0" A="255"/>
+	<Vtx X="17" Y="-79" Z="70" S="-130" T="335" R="127" G="0" B="0" A="255"/>
+	<Vtx X="17" Y="-82" Z="69" S="-99" T="323" R="127" G="0" B="0" A="255"/>
+	<Vtx X="17" Y="-80" Z="71" S="-119" T="343" R="127" G="0" B="0" A="255"/>
+	<Vtx X="17" Y="-83" Z="71" S="-86" T="344" R="127" G="0" B="0" A="255"/>
+	<Vtx X="17" Y="-81" Z="72" S="-111" T="354" R="127" G="0" B="0" A="255"/>
+	<Vtx X="17" Y="-83" Z="73" S="-81" T="368" R="127" G="0" B="0" A="255"/>
+	<Vtx X="17" Y="-81" Z="73" S="-108" T="368" R="127" G="0" B="0" A="255"/>
+	<Vtx X="17" Y="-83" Z="75" S="-86" T="392" R="127" G="0" B="0" A="255"/>
+	<Vtx X="17" Y="-81" Z="74" S="-111" T="382" R="127" G="0" B="0" A="255"/>
+	<Vtx X="17" Y="-80" Z="75" S="-119" T="393" R="127" G="0" B="0" A="255"/>
+	<Vtx X="17" Y="-79" Z="76" S="-130" T="401" R="127" G="0" B="0" A="255"/>
+	<Vtx X="17" Y="-80" Z="78" S="-120" T="426" R="127" G="0" B="0" A="255"/>
+	<Vtx X="17" Y="-82" Z="76" S="-99" T="413" R="127" G="0" B="0" A="255"/>
+	<Vtx X="17" Y="-81" Z="74" S="-111" T="382" R="127" G="0" B="0" A="255"/>
+	<Vtx X="17" Y="-80" Z="75" S="-119" T="393" R="127" G="0" B="0" A="255"/>
+	<Vtx X="17" Y="-82" Z="76" S="-99" T="413" R="127" G="0" B="0" A="255"/>
+	<Vtx X="17" Y="-83" Z="75" S="-86" T="392" R="127" G="0" B="0" A="255"/>
+	<Vtx X="25" Y="-78" Z="70" S="-144" T="338" R="127" G="0" B="0" A="255"/>
+	<Vtx X="25" Y="-77" Z="71" S="-155" T="340" R="127" G="0" B="0" A="255"/>
+	<Vtx X="25" Y="-78" Z="73" S="-144" T="368" R="127" G="0" B="0" A="255"/>
+	<Vtx X="25" Y="-76" Z="71" S="-165" T="347" R="127" G="0" B="0" A="255"/>
+	<Vtx X="25" Y="-76" Z="72" S="-172" T="357" R="127" G="0" B="0" A="255"/>
+	<Vtx X="25" Y="-75" Z="73" S="-174" T="368" R="127" G="0" B="0" A="255"/>
+	<Vtx X="25" Y="-75" Z="73" S="-174" T="368" R="127" G="0" B="0" A="255"/>
+	<Vtx X="25" Y="-76" Z="74" S="-172" T="379" R="127" G="0" B="0" A="255"/>
+	<Vtx X="25" Y="-78" Z="73" S="-144" T="368" R="127" G="0" B="0" A="255"/>
+	<Vtx X="25" Y="-76" Z="75" S="-165" T="389" R="127" G="0" B="0" A="255"/>
+	<Vtx X="25" Y="-77" Z="75" S="-155" T="396" R="127" G="0" B="0" A="255"/>
+	<Vtx X="25" Y="-78" Z="75" S="-144" T="398" R="127" G="0" B="0" A="255"/>
+	<Vtx X="25" Y="-79" Z="75" S="-133" T="396" R="127" G="0" B="0" A="255"/>
+	<Vtx X="25" Y="-80" Z="75" S="-123" T="389" R="127" G="0" B="0" A="255"/>
+	<Vtx X="25" Y="-80" Z="74" S="-116" T="379" R="127" G="0" B="0" A="255"/>
+	<Vtx X="25" Y="-80" Z="73" S="-114" T="368" R="127" G="0" B="0" A="255"/>
+	<Vtx X="25" Y="-80" Z="72" S="-116" T="357" R="127" G="0" B="0" A="255"/>
+	<Vtx X="25" Y="-80" Z="71" S="-123" T="347" R="127" G="0" B="0" A="255"/>
+	<Vtx X="25" Y="-79" Z="71" S="-133" T="340" R="127" G="0" B="0" A="255"/>
+	<Vtx X="14" Y="-58" Z="73" S="-390" T="368" R="47" G="118" B="0" A="255"/>
+	<Vtx X="14" Y="-59" Z="80" S="-371" T="462" R="47" G="109" B="45" A="255"/>
+	<Vtx X="15" Y="-60" Z="80" S="-359" T="457" R="116" G="49" B="20" A="255"/>
+	<Vtx X="15" Y="-59" Z="73" S="-377" T="368" R="116" G="53" B="0" A="255"/>
+	<Vtx X="15" Y="-63" Z="79" S="-329" T="445" R="121" G="220" B="241" A="255"/>
+	<Vtx X="15" Y="-62" Z="73" S="-344" T="368" R="121" G="217" B="0" A="255"/>
+	<Vtx X="15" Y="-63" Z="79" S="-327" T="444" R="62" G="154" B="214" A="255"/>
+	<Vtx X="15" Y="-67" Z="84" S="-284" T="508" R="62" G="178" B="178" A="255"/>
+	<Vtx X="15" Y="-66" Z="84" S="-286" T="510" R="121" G="228" B="228" A="255"/>
+	<Vtx X="15" Y="-60" Z="80" S="-359" T="457" R="116" G="49" B="20" A="255"/>
+	<Vtx X="15" Y="-64" Z="86" S="-309" T="533" R="116" G="37" B="37" A="255"/>
+	<Vtx X="14" Y="-64" Z="87" S="-318" T="542" R="47" G="84" B="84" A="255"/>
+	<Vtx X="15" Y="-71" Z="90" S="-233" T="583" R="116" G="20" B="49" A="255"/>
+	<Vtx X="14" Y="-70" Z="91" S="-238" T="595" R="47" G="45" B="109" A="255"/>
+	<Vtx X="15" Y="-78" Z="92" S="-144" T="601" R="116" G="0" B="53" A="255"/>
+	<Vtx X="14" Y="-78" Z="93" S="-144" T="614" R="47" G="0" B="118" A="255"/>
+	<Vtx X="15" Y="-85" Z="90" S="-55" T="583" R="116" G="236" B="49" A="255"/>
+	<Vtx X="14" Y="-86" Z="91" S="-50" T="595" R="47" G="211" B="109" A="255"/>
+	<Vtx X="15" Y="-91" Z="86" S="21" T="533" R="116" G="219" B="37" A="255"/>
+	<Vtx X="14" Y="-86" Z="91" S="-50" T="595" R="47" G="211" B="109" A="255"/>
+	<Vtx X="14" Y="-92" Z="87" S="30" T="542" R="47" G="172" B="84" A="255"/>
+	<Vtx X="15" Y="-91" Z="86" S="21" T="533" R="116" G="219" B="37" A="255"/>
+	<Vtx X="15" Y="-95" Z="80" S="71" T="457" R="116" G="207" B="20" A="255"/>
+	<Vtx X="14" Y="-96" Z="80" S="83" T="462" R="47" G="147" B="45" A="255"/>
+	<Vtx X="15" Y="-97" Z="73" S="89" T="368" R="116" G="203" B="0" A="255"/>
+	<Vtx X="14" Y="-98" Z="73" S="102" T="368" R="47" G="138" B="0" A="255"/>
+	<Vtx X="15" Y="-95" Z="66" S="71" T="279" R="116" G="207" B="236" A="255"/>
+	<Vtx X="14" Y="-96" Z="65" S="83" T="274" R="47" G="147" B="211" A="255"/>
+	<Vtx X="15" Y="-91" Z="59" S="21" T="203" R="116" G="219" B="219" A="255"/>
+	<Vtx X="14" Y="-92" Z="59" S="30" T="194" R="47" G="172" B="172" A="255"/>
+	<Vtx X="15" Y="-85" Z="55" S="-55" T="153" R="116" G="236" B="207" A="255"/>
+	<Vtx X="14" Y="-86" Z="54" S="-50" T="141" R="47" G="211" B="147" A="255"/>
+	<Vtx X="15" Y="-78" Z="54" S="-144" T="135" R="116" G="0" B="203" A="255"/>
+	<Vtx X="14" Y="-78" Z="53" S="-144" T="122" R="47" G="0" B="138" A="255"/>
+	<Vtx X="15" Y="-71" Z="55" S="-233" T="153" R="116" G="20" B="207" A="255"/>
+	<Vtx X="14" Y="-70" Z="54" S="-238" T="141" R="47" G="45" B="147" A="255"/>
+	<Vtx X="15" Y="-64" Z="59" S="-309" T="203" R="116" G="37" B="219" A="255"/>
+	<Vtx X="14" Y="-64" Z="59" S="-318" T="194" R="47" G="84" B="172" A="255"/>
+	<Vtx X="15" Y="-60" Z="66" S="-359" T="279" R="116" G="49" B="236" A="255"/>
+	<Vtx X="14" Y="-59" Z="65" S="-371" T="274" R="47" G="109" B="211" A="255"/>
+	<Vtx X="15" Y="-63" Z="67" S="-329" T="291" R="121" G="220" B="15" A="255"/>
+	<Vtx X="15" Y="-66" Z="61" S="-286" T="226" R="120" G="228" B="29" A="255"/>
+	<Vtx X="15" Y="-63" Z="67" S="-327" T="292" R="62" G="154" B="42" A="255"/>
+	<Vtx X="15" Y="-62" Z="73" S="-342" T="368" R="62" G="145" B="0" A="255"/>
+	<Vtx X="15" Y="-62" Z="73" S="-344" T="368" R="121" G="217" B="0" A="255"/>
+	<Vtx X="15" Y="-60" Z="66" S="-359" T="279" R="116" G="49" B="236" A="255"/>
+	<Vtx X="15" Y="-59" Z="73" S="-377" T="368" R="116" G="53" B="0" A="255"/>
+	<Vtx X="14" Y="-58" Z="73" S="-390" T="368" R="47" G="118" B="0" A="255"/>
+	<Vtx X="15" Y="-63" Z="79" S="-327" T="444" R="62" G="154" B="214" A="255"/>
+	<Vtx X="14" Y="-63" Z="79" S="-326" T="443" R="90" G="174" B="222" A="255"/>
+	<Vtx X="14" Y="-67" Z="84" S="-283" T="507" R="91" G="193" B="193" A="255"/>
+	<Vtx X="14" Y="-67" Z="84" S="-283" T="507" R="91" G="193" B="193" A="255"/>
+	<Vtx X="15" Y="-63" Z="79" S="-327" T="444" R="62" G="154" B="214" A="255"/>
+	<Vtx X="15" Y="-67" Z="84" S="-284" T="508" R="62" G="178" B="178" A="255"/>
+	<Vtx X="14" Y="-72" Z="88" S="-219" T="550" R="90" G="222" B="174" A="255"/>
+	<Vtx X="15" Y="-72" Z="88" S="-220" T="551" R="62" G="214" B="154" A="255"/>
+	<Vtx X="15" Y="-66" Z="84" S="-286" T="510" R="121" G="228" B="228" A="255"/>
+	<Vtx X="15" Y="-72" Z="88" S="-221" T="553" R="121" G="241" B="220" A="255"/>
+	<Vtx X="15" Y="-64" Z="86" S="-309" T="533" R="116" G="37" B="37" A="255"/>
+	<Vtx X="15" Y="-71" Z="90" S="-233" T="583" R="116" G="20" B="49" A="255"/>
+	<Vtx X="15" Y="-78" Z="89" S="-144" T="568" R="120" G="0" B="215" A="255"/>
+	<Vtx X="15" Y="-78" Z="92" S="-144" T="601" R="116" G="0" B="53" A="255"/>
+	<Vtx X="15" Y="-84" Z="88" S="-67" T="553" R="119" G="17" B="216" A="255"/>
+	<Vtx X="15" Y="-85" Z="90" S="-55" T="583" R="116" G="236" B="49" A="255"/>
+	<Vtx X="15" Y="-89" Z="84" S="-2" T="510" R="119" G="31" B="225" A="255"/>
+	<Vtx X="15" Y="-91" Z="86" S="21" T="533" R="116" G="219" B="37" A="255"/>
+	<Vtx X="15" Y="-93" Z="79" S="41" T="445" R="120" G="40" B="240" A="255"/>
+	<Vtx X="15" Y="-95" Z="80" S="71" T="457" R="116" G="207" B="20" A="255"/>
+	<Vtx X="15" Y="-94" Z="73" S="56" T="368" R="120" G="42" B="0" A="255"/>
+	<Vtx X="15" Y="-97" Z="73" S="89" T="368" R="116" G="203" B="0" A="255"/>
+	<Vtx X="15" Y="-93" Z="67" S="41" T="291" R="120" G="38" B="15" A="255"/>
+	<Vtx X="15" Y="-95" Z="66" S="71" T="279" R="116" G="207" B="236" A="255"/>
+	<Vtx X="15" Y="-89" Z="61" S="-2" T="226" R="120" G="30" B="30" A="255"/>
+	<Vtx X="15" Y="-91" Z="59" S="21" T="203" R="116" G="219" B="219" A="255"/>
+	<Vtx X="15" Y="-84" Z="58" S="-67" T="183" R="119" G="17" B="40" A="255"/>
+	<Vtx X="15" Y="-85" Z="55" S="-55" T="153" R="116" G="236" B="207" A="255"/>
+	<Vtx X="15" Y="-78" Z="57" S="-144" T="168" R="119" G="0" B="44" A="255"/>
+	<Vtx X="15" Y="-78" Z="54" S="-144" T="135" R="116" G="0" B="203" A="255"/>
+	<Vtx X="15" Y="-72" Z="58" S="-221" T="183" R="120" G="240" B="40" A="255"/>
+	<Vtx X="15" Y="-71" Z="55" S="-233" T="153" R="116" G="20" B="207" A="255"/>
+	<Vtx X="15" Y="-66" Z="61" S="-286" T="226" R="120" G="228" B="29" A="255"/>
+	<Vtx X="15" Y="-64" Z="59" S="-309" T="203" R="116" G="37" B="219" A="255"/>
+	<Vtx X="15" Y="-67" Z="61" S="-284" T="228" R="58" G="176" B="80" A="255"/>
+	<Vtx X="15" Y="-66" Z="61" S="-286" T="226" R="120" G="228" B="29" A="255"/>
+	<Vtx X="15" Y="-63" Z="67" S="-327" T="292" R="62" G="154" B="42" A="255"/>
+	<Vtx X="15" Y="-67" Z="61" S="-284" T="228" R="58" G="176" B="80" A="255"/>
+	<Vtx X="14" Y="-63" Z="67" S="-326" T="293" R="90" G="174" B="34" A="255"/>
+	<Vtx X="14" Y="-62" Z="73" S="-341" T="368" R="91" G="167" B="0" A="255"/>
+	<Vtx X="15" Y="-62" Z="73" S="-342" T="368" R="62" G="145" B="0" A="255"/>
+	<Vtx X="14" Y="-63" Z="79" S="-326" T="443" R="90" G="174" B="222" A="255"/>
+	<Vtx X="14" Y="-67" Z="61" S="-283" T="229" R="88" G="191" B="65" A="255"/>
+	<Vtx X="15" Y="-72" Z="58" S="-220" T="185" R="48" G="211" B="109" A="255"/>
+	<Vtx X="14" Y="-72" Z="58" S="-219" T="186" R="83" G="218" B="88" A="255"/>
+	<Vtx X="15" Y="-78" Z="57" S="-144" T="170" R="46" G="0" B="118" A="255"/>
+	<Vtx X="14" Y="-78" Z="57" S="-144" T="171" R="81" G="0" B="97" A="255"/>
+	<Vtx X="15" Y="-84" Z="58" S="-68" T="185" R="48" G="45" B="109" A="255"/>
+	<Vtx X="14" Y="-84" Z="58" S="-69" T="186" R="83" G="36" B="90" A="255"/>
+	<Vtx X="15" Y="-89" Z="61" S="-4" T="228" R="53" G="82" B="82" A="255"/>
+	<Vtx X="14" Y="-89" Z="61" S="-5" T="229" R="85" G="67" B="67" A="255"/>
+	<Vtx X="15" Y="-93" Z="67" S="39" T="292" R="57" G="105" B="43" A="255"/>
+	<Vtx X="14" Y="-93" Z="67" S="38" T="293" R="87" G="86" B="35" A="255"/>
+	<Vtx X="15" Y="-94" Z="73" S="54" T="368" R="53" G="116" B="0" A="255"/>
+	<Vtx X="14" Y="-94" Z="73" S="53" T="368" R="85" G="94" B="0" A="255"/>
+	<Vtx X="15" Y="-93" Z="79" S="39" T="444" R="48" G="109" B="211" A="255"/>
+	<Vtx X="14" Y="-93" Z="79" S="38" T="443" R="83" G="89" B="219" A="255"/>
+	<Vtx X="15" Y="-89" Z="84" S="-4" T="508" R="46" G="84" B="172" A="255"/>
+	<Vtx X="14" Y="-89" Z="84" S="-5" T="507" R="82" G="68" B="186" A="255"/>
+	<Vtx X="15" Y="-84" Z="88" S="-68" T="551" R="48" G="45" B="147" A="255"/>
+	<Vtx X="14" Y="-84" Z="88" S="-69" T="550" R="83" G="35" B="167" A="255"/>
+	<Vtx X="15" Y="-78" Z="89" S="-144" T="566" R="58" G="0" B="143" A="255"/>
+	<Vtx X="14" Y="-78" Z="89" S="-144" T="565" R="88" G="0" B="164" A="255"/>
+	<Vtx X="15" Y="-72" Z="88" S="-220" T="551" R="62" G="214" B="154" A="255"/>
+	<Vtx X="14" Y="-72" Z="88" S="-219" T="550" R="90" G="222" B="174" A="255"/>
+	<Vtx X="15" Y="-72" Z="88" S="-221" T="553" R="121" G="241" B="220" A="255"/>
+	<Vtx X="15" Y="-78" Z="89" S="-144" T="568" R="120" G="0" B="215" A="255"/>
+	<Vtx X="15" Y="-78" Z="89" S="-144" T="568" R="120" G="0" B="215" A="255"/>
+	<Vtx X="15" Y="-84" Z="88" S="-67" T="553" R="119" G="17" B="216" A="255"/>
+	<Vtx X="15" Y="-84" Z="88" S="-68" T="551" R="48" G="45" B="147" A="255"/>
+	<Vtx X="15" Y="-89" Z="84" S="-4" T="508" R="46" G="84" B="172" A="255"/>
+	<Vtx X="15" Y="-89" Z="84" S="-2" T="510" R="119" G="31" B="225" A="255"/>
+	<Vtx X="15" Y="-93" Z="79" S="39" T="444" R="48" G="109" B="211" A="255"/>
+	<Vtx X="15" Y="-93" Z="79" S="41" T="445" R="120" G="40" B="240" A="255"/>
+	<Vtx X="15" Y="-94" Z="73" S="54" T="368" R="53" G="116" B="0" A="255"/>
+	<Vtx X="15" Y="-94" Z="73" S="56" T="368" R="120" G="42" B="0" A="255"/>
+	<Vtx X="15" Y="-93" Z="67" S="39" T="292" R="57" G="105" B="43" A="255"/>
+	<Vtx X="15" Y="-93" Z="67" S="41" T="291" R="120" G="38" B="15" A="255"/>
+	<Vtx X="15" Y="-89" Z="61" S="-4" T="228" R="53" G="82" B="82" A="255"/>
+	<Vtx X="15" Y="-89" Z="61" S="-2" T="226" R="120" G="30" B="30" A="255"/>
+	<Vtx X="15" Y="-84" Z="58" S="-68" T="185" R="48" G="45" B="109" A="255"/>
+	<Vtx X="15" Y="-84" Z="58" S="-67" T="183" R="119" G="17" B="40" A="255"/>
+	<Vtx X="15" Y="-78" Z="57" S="-144" T="170" R="46" G="0" B="118" A="255"/>
+	<Vtx X="15" Y="-78" Z="57" S="-144" T="168" R="119" G="0" B="44" A="255"/>
+	<Vtx X="15" Y="-72" Z="58" S="-220" T="185" R="48" G="211" B="109" A="255"/>
+	<Vtx X="15" Y="-72" Z="58" S="-221" T="183" R="120" G="240" B="40" A="255"/>
+	<Vtx X="15" Y="-67" Z="61" S="-284" T="228" R="58" G="176" B="80" A="255"/>
+	<Vtx X="17" Y="-78" Z="70" S="-144" T="332" R="96" G="0" B="172" A="255"/>
+	<Vtx X="17" Y="-77" Z="70" S="-158" T="335" R="96" G="32" B="179" A="255"/>
+	<Vtx X="24" Y="-77" Z="70" S="-158" T="335" R="47" G="45" B="147" A="255"/>
+	<Vtx X="24" Y="-76" Z="71" S="-169" T="343" R="47" G="84" B="172" A="255"/>
+	<Vtx X="17" Y="-76" Z="71" S="-169" T="343" R="96" G="59" B="197" A="255"/>
+	<Vtx X="24" Y="-75" Z="72" S="-177" T="354" R="47" G="109" B="211" A="255"/>
+	<Vtx X="17" Y="-75" Z="72" S="-177" T="354" R="96" G="77" B="224" A="255"/>
+	<Vtx X="24" Y="-75" Z="73" S="-180" T="368" R="47" G="118" B="0" A="255"/>
+	<Vtx X="17" Y="-75" Z="73" S="-180" T="368" R="96" G="84" B="0" A="255"/>
+	<Vtx X="24" Y="-75" Z="74" S="-177" T="382" R="47" G="109" B="45" A="255"/>
+	<Vtx X="17" Y="-75" Z="74" S="-177" T="382" R="96" G="77" B="32" A="255"/>
+	<Vtx X="24" Y="-76" Z="75" S="-169" T="393" R="47" G="84" B="84" A="255"/>
+	<Vtx X="17" Y="-75" Z="74" S="-177" T="382" R="96" G="77" B="32" A="255"/>
+	<Vtx X="17" Y="-76" Z="75" S="-169" T="393" R="96" G="59" B="59" A="255"/>
+	<Vtx X="24" Y="-76" Z="75" S="-169" T="393" R="47" G="84" B="84" A="255"/>
+	<Vtx X="24" Y="-77" Z="76" S="-158" T="401" R="47" G="45" B="109" A="255"/>
+	<Vtx X="17" Y="-77" Z="76" S="-158" T="401" R="96" G="32" B="77" A="255"/>
+	<Vtx X="24" Y="-78" Z="76" S="-144" T="404" R="47" G="0" B="118" A="255"/>
+	<Vtx X="17" Y="-78" Z="76" S="-144" T="404" R="96" G="0" B="84" A="255"/>
+	<Vtx X="24" Y="-79" Z="76" S="-130" T="401" R="47" G="211" B="109" A="255"/>
+	<Vtx X="17" Y="-79" Z="76" S="-130" T="401" R="96" G="224" B="77" A="255"/>
+	<Vtx X="24" Y="-80" Z="75" S="-119" T="393" R="47" G="172" B="84" A="255"/>
+	<Vtx X="17" Y="-80" Z="75" S="-119" T="393" R="96" G="197" B="59" A="255"/>
+	<Vtx X="24" Y="-81" Z="74" S="-111" T="382" R="47" G="147" B="45" A="255"/>
+	<Vtx X="17" Y="-81" Z="74" S="-111" T="382" R="96" G="179" B="32" A="255"/>
+	<Vtx X="24" Y="-81" Z="73" S="-108" T="368" R="47" G="138" B="0" A="255"/>
+	<Vtx X="17" Y="-81" Z="73" S="-108" T="368" R="96" G="172" B="0" A="255"/>
+	<Vtx X="24" Y="-81" Z="72" S="-111" T="354" R="47" G="147" B="211" A="255"/>
+	<Vtx X="17" Y="-81" Z="72" S="-111" T="354" R="96" G="179" B="224" A="255"/>
+	<Vtx X="24" Y="-80" Z="71" S="-119" T="343" R="47" G="172" B="172" A="255"/>
+	<Vtx X="17" Y="-80" Z="71" S="-119" T="343" R="96" G="197" B="197" A="255"/>
+	<Vtx X="24" Y="-79" Z="70" S="-130" T="335" R="47" G="211" B="147" A="255"/>
+	<Vtx X="17" Y="-79" Z="70" S="-130" T="335" R="96" G="224" B="179" A="255"/>
+	<Vtx X="24" Y="-78" Z="70" S="-144" T="332" R="47" G="0" B="138" A="255"/>
+	<Vtx X="17" Y="-78" Z="70" S="-144" T="332" R="96" G="0" B="172" A="255"/>
+	<Vtx X="24" Y="-77" Z="70" S="-158" T="335" R="47" G="45" B="147" A="255"/>
+	<Vtx X="25" Y="-77" Z="71" S="-155" T="340" R="116" G="20" B="207" A="255"/>
+	<Vtx X="25" Y="-76" Z="71" S="-165" T="347" R="116" G="37" B="219" A="255"/>
+	<Vtx X="24" Y="-76" Z="71" S="-169" T="343" R="47" G="84" B="172" A="255"/>
+	<Vtx X="25" Y="-76" Z="72" S="-172" T="357" R="116" G="49" B="236" A="255"/>
+	<Vtx X="24" Y="-75" Z="72" S="-177" T="354" R="47" G="109" B="211" A="255"/>
+	<Vtx X="25" Y="-75" Z="73" S="-174" T="368" R="116" G="53" B="0" A="255"/>
+	<Vtx X="24" Y="-75" Z="73" S="-180" T="368" R="47" G="118" B="0" A="255"/>
+	<Vtx X="25" Y="-76" Z="74" S="-172" T="379" R="116" G="49" B="20" A="255"/>
+	<Vtx X="24" Y="-75" Z="73" S="-180" T="368" R="47" G="118" B="0" A="255"/>
+	<Vtx X="24" Y="-75" Z="74" S="-177" T="382" R="47" G="109" B="45" A="255"/>
+	<Vtx X="25" Y="-76" Z="74" S="-172" T="379" R="116" G="49" B="20" A="255"/>
+	<Vtx X="25" Y="-76" Z="75" S="-165" T="389" R="116" G="37" B="37" A="255"/>
+	<Vtx X="24" Y="-76" Z="75" S="-169" T="393" R="47" G="84" B="84" A="255"/>
+	<Vtx X="25" Y="-77" Z="75" S="-155" T="396" R="116" G="20" B="49" A="255"/>
+	<Vtx X="24" Y="-77" Z="76" S="-158" T="401" R="47" G="45" B="109" A="255"/>
+	<Vtx X="25" Y="-78" Z="75" S="-144" T="398" R="116" G="0" B="53" A="255"/>
+	<Vtx X="24" Y="-78" Z="76" S="-144" T="404" R="47" G="0" B="118" A="255"/>
+	<Vtx X="25" Y="-79" Z="75" S="-133" T="396" R="116" G="236" B="49" A="255"/>
+	<Vtx X="24" Y="-79" Z="76" S="-130" T="401" R="47" G="211" B="109" A="255"/>
+	<Vtx X="25" Y="-80" Z="75" S="-123" T="389" R="116" G="219" B="37" A="255"/>
+	<Vtx X="24" Y="-80" Z="75" S="-119" T="393" R="47" G="172" B="84" A="255"/>
+	<Vtx X="25" Y="-80" Z="74" S="-116" T="379" R="116" G="207" B="20" A="255"/>
+	<Vtx X="24" Y="-81" Z="74" S="-111" T="382" R="47" G="147" B="45" A="255"/>
+	<Vtx X="25" Y="-80" Z="73" S="-114" T="368" R="116" G="203" B="0" A="255"/>
+	<Vtx X="24" Y="-81" Z="73" S="-108" T="368" R="47" G="138" B="0" A="255"/>
+	<Vtx X="25" Y="-80" Z="72" S="-116" T="357" R="116" G="207" B="236" A="255"/>
+	<Vtx X="24" Y="-81" Z="72" S="-111" T="354" R="47" G="147" B="211" A="255"/>
+	<Vtx X="25" Y="-80" Z="71" S="-123" T="347" R="116" G="219" B="219" A="255"/>
+	<Vtx X="24" Y="-80" Z="71" S="-119" T="343" R="47" G="172" B="172" A="255"/>
+	<Vtx X="25" Y="-79" Z="71" S="-133" T="340" R="116" G="236" B="207" A="255"/>
+	<Vtx X="24" Y="-79" Z="70" S="-130" T="335" R="47" G="211" B="147" A="255"/>
+	<Vtx X="25" Y="-78" Z="70" S="-144" T="338" R="116" G="0" B="203" A="255"/>
+	<Vtx X="24" Y="-78" Z="70" S="-144" T="332" R="47" G="0" B="138" A="255"/>
+	<Vtx X="25" Y="-77" Z="71" S="-155" T="340" R="116" G="20" B="207" A="255"/>
+	<Vtx X="14" Y="-82" Z="68" S="-90" T="314" R="96" G="197" B="197" A="255"/>
+	<Vtx X="14" Y="-80" Z="67" S="-115" T="298" R="96" G="225" B="179" A="255"/>
+	<Vtx X="16" Y="-80" Z="67" S="-115" T="298" R="48" G="211" B="147" A="255"/>
+	<Vtx X="16" Y="-78" Z="67" S="-144" T="292" R="48" G="0" B="138" A="255"/>
+	<Vtx X="14" Y="-78" Z="67" S="-144" T="292" R="96" G="0" B="173" A="255"/>
+	<Vtx X="16" Y="-76" Z="67" S="-173" T="298" R="48" G="45" B="147" A="255"/>
+	<Vtx X="14" Y="-78" Z="67" S="-144" T="292" R="96" G="0" B="173" A="255"/>
+	<Vtx X="14" Y="-75" Z="67" S="-173" T="298" R="97" G="32" B="180" A="255"/>
+	<Vtx X="16" Y="-76" Z="67" S="-173" T="298" R="48" G="45" B="147" A="255"/>
+	<Vtx X="16" Y="-74" Z="68" S="-198" T="314" R="47" G="84" B="173" A="255"/>
+	<Vtx X="14" Y="-74" Z="68" S="-198" T="314" R="96" G="60" B="197" A="255"/>
+	<Vtx X="16" Y="-72" Z="70" S="-214" T="339" R="47" G="109" B="211" A="255"/>
+	<Vtx X="14" Y="-72" Z="70" S="-214" T="339" R="96" G="77" B="224" A="255"/>
+	<Vtx X="16" Y="-72" Z="73" S="-220" T="368" R="47" G="118" B="0" A="255"/>
+	<Vtx X="14" Y="-72" Z="73" S="-220" T="368" R="96" G="84" B="0" A="255"/>
+	<Vtx X="16" Y="-72" Z="75" S="-214" T="397" R="47" G="109" B="45" A="255"/>
+	<Vtx X="14" Y="-72" Z="75" S="-214" T="397" R="96" G="77" B="32" A="255"/>
+	<Vtx X="16" Y="-74" Z="77" S="-198" T="422" R="47" G="84" B="84" A="255"/>
+	<Vtx X="14" Y="-74" Z="77" S="-198" T="422" R="96" G="59" B="59" A="255"/>
+	<Vtx X="16" Y="-76" Z="79" S="-173" T="438" R="47" G="45" B="109" A="255"/>
+	<Vtx X="14" Y="-76" Z="79" S="-173" T="438" R="96" G="32" B="77" A="255"/>
+	<Vtx X="16" Y="-78" Z="79" S="-144" T="444" R="47" G="0" B="118" A="255"/>
+	<Vtx X="14" Y="-78" Z="79" S="-144" T="444" R="96" G="0" B="84" A="255"/>
+	<Vtx X="16" Y="-80" Z="79" S="-115" T="438" R="48" G="212" B="109" A="255"/>
+	<Vtx X="14" Y="-80" Z="79" S="-115" T="438" R="96" G="225" B="77" A="255"/>
+	<Vtx X="16" Y="-82" Z="77" S="-90" T="422" R="48" G="173" B="83" A="255"/>
+	<Vtx X="14" Y="-82" Z="77" S="-90" T="422" R="96" G="198" B="59" A="255"/>
+	<Vtx X="16" Y="-84" Z="75" S="-74" T="397" R="48" G="147" B="45" A="255"/>
+	<Vtx X="14" Y="-84" Z="75" S="-74" T="397" R="96" G="179" B="32" A="255"/>
+	<Vtx X="16" Y="-84" Z="73" S="-68" T="368" R="47" G="138" B="0" A="255"/>
+	<Vtx X="14" Y="-84" Z="73" S="-68" T="368" R="96" G="173" B="0" A="255"/>
+	<Vtx X="16" Y="-84" Z="70" S="-74" T="339" R="47" G="147" B="211" A="255"/>
+	<Vtx X="14" Y="-84" Z="70" S="-74" T="339" R="96" G="179" B="224" A="255"/>
+	<Vtx X="16" Y="-82" Z="68" S="-90" T="314" R="47" G="172" B="173" A="255"/>
+	<Vtx X="14" Y="-82" Z="68" S="-90" T="314" R="96" G="197" B="197" A="255"/>
+	<Vtx X="16" Y="-80" Z="67" S="-115" T="298" R="48" G="211" B="147" A="255"/>
+	<Vtx X="17" Y="-80" Z="68" S="-120" T="310" R="116" G="236" B="207" A="255"/>
+	<Vtx X="17" Y="-78" Z="68" S="-144" T="305" R="116" G="0" B="203" A="255"/>
+	<Vtx X="16" Y="-80" Z="67" S="-115" T="298" R="48" G="211" B="147" A="255"/>
+	<Vtx X="16" Y="-78" Z="67" S="-144" T="292" R="48" G="0" B="138" A="255"/>
+	<Vtx X="17" Y="-78" Z="68" S="-144" T="305" R="116" G="0" B="203" A="255"/>
+	<Vtx X="17" Y="-76" Z="68" S="-168" T="310" R="116" G="20" B="208" A="255"/>
+	<Vtx X="16" Y="-76" Z="67" S="-173" T="298" R="48" G="45" B="147" A="255"/>
+	<Vtx X="17" Y="-74" Z="69" S="-189" T="323" R="116" G="37" B="219" A="255"/>
+	<Vtx X="16" Y="-74" Z="68" S="-198" T="314" R="47" G="84" B="173" A="255"/>
+	<Vtx X="17" Y="-73" Z="71" S="-202" T="344" R="116" G="49" B="236" A="255"/>
+	<Vtx X="16" Y="-72" Z="70" S="-214" T="339" R="47" G="109" B="211" A="255"/>
+	<Vtx X="17" Y="-73" Z="73" S="-207" T="368" R="116" G="53" B="0" A="255"/>
+	<Vtx X="16" Y="-72" Z="73" S="-220" T="368" R="47" G="118" B="0" A="255"/>
+	<Vtx X="17" Y="-73" Z="75" S="-202" T="392" R="116" G="49" B="20" A="255"/>
+	<Vtx X="16" Y="-72" Z="75" S="-214" T="397" R="47" G="109" B="45" A="255"/>
+	<Vtx X="17" Y="-74" Z="76" S="-189" T="413" R="116" G="37" B="37" A="255"/>
+	<Vtx X="16" Y="-74" Z="77" S="-198" T="422" R="47" G="84" B="84" A="255"/>
+	<Vtx X="17" Y="-76" Z="78" S="-168" T="426" R="116" G="20" B="49" A="255"/>
+	<Vtx X="16" Y="-76" Z="79" S="-173" T="438" R="47" G="45" B="109" A="255"/>
+	<Vtx X="17" Y="-78" Z="78" S="-144" T="431" R="116" G="0" B="53" A="255"/>
+	<Vtx X="16" Y="-78" Z="79" S="-144" T="444" R="47" G="0" B="118" A="255"/>
+	<Vtx X="17" Y="-80" Z="78" S="-120" T="426" R="116" G="236" B="49" A="255"/>
+	<Vtx X="16" Y="-80" Z="79" S="-115" T="438" R="48" G="212" B="109" A="255"/>
+	<Vtx X="17" Y="-82" Z="76" S="-99" T="413" R="116" G="219" B="37" A="255"/>
+	<Vtx X="16" Y="-82" Z="77" S="-90" T="422" R="48" G="173" B="83" A="255"/>
+	<Vtx X="17" Y="-83" Z="75" S="-86" T="392" R="116" G="207" B="20" A="255"/>
+	<Vtx X="16" Y="-84" Z="75" S="-74" T="397" R="48" G="147" B="45" A="255"/>
+	<Vtx X="17" Y="-83" Z="73" S="-81" T="368" R="116" G="203" B="0" A="255"/>
+	<Vtx X="16" Y="-84" Z="73" S="-68" T="368" R="47" G="138" B="0" A="255"/>
+	<Vtx X="17" Y="-83" Z="71" S="-86" T="344" R="116" G="207" B="236" A="255"/>
+	<Vtx X="16" Y="-84" Z="70" S="-74" T="339" R="47" G="147" B="211" A="255"/>
+	<Vtx X="17" Y="-82" Z="69" S="-99" T="323" R="116" G="219" B="219" A="255"/>
+	<Vtx X="16" Y="-82" Z="68" S="-90" T="314" R="47" G="172" B="173" A="255"/>
+	<Vtx X="17" Y="-80" Z="68" S="-120" T="310" R="116" G="236" B="207" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_5 b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_5
new file mode 100644
index 000000000..4137d75a2
--- /dev/null
+++ b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_5
@@ -0,0 +1,62 @@
+<Vertex Version="0">
+	<Vtx X="-15" Y="-78" Z="57" S="-832" T="-1029" R="129" G="0" B="0" A="255"/>
+	<Vtx X="-15" Y="-84" Z="58" S="-757" T="-1014" R="129" G="0" B="0" A="255"/>
+	<Vtx X="-15" Y="-78" Z="73" S="-832" T="-832" R="129" G="0" B="0" A="255"/>
+	<Vtx X="-15" Y="-89" Z="84" S="-693" T="-693" R="129" G="0" B="0" A="255"/>
+	<Vtx X="-15" Y="-84" Z="88" S="-757" T="-650" R="129" G="0" B="0" A="255"/>
+	<Vtx X="-15" Y="-84" Z="58" S="-757" T="-1014" R="129" G="0" B="0" A="255"/>
+	<Vtx X="-15" Y="-89" Z="61" S="-693" T="-971" R="129" G="0" B="0" A="255"/>
+	<Vtx X="-15" Y="-78" Z="73" S="-832" T="-832" R="129" G="0" B="0" A="255"/>
+	<Vtx X="-15" Y="-93" Z="67" S="-650" T="-907" R="129" G="0" B="0" A="255"/>
+	<Vtx X="-15" Y="-94" Z="73" S="-635" T="-832" R="129" G="0" B="0" A="255"/>
+	<Vtx X="-15" Y="-93" Z="79" S="-650" T="-757" R="129" G="0" B="0" A="255"/>
+	<Vtx X="-15" Y="-89" Z="84" S="-693" T="-693" R="129" G="0" B="0" A="255"/>
+	<Vtx X="-15" Y="-84" Z="88" S="-757" T="-650" R="129" G="0" B="0" A="255"/>
+	<Vtx X="-15" Y="-78" Z="89" S="-832" T="-635" R="129" G="0" B="0" A="255"/>
+	<Vtx X="-15" Y="-72" Z="88" S="-907" T="-650" R="129" G="0" B="0" A="255"/>
+	<Vtx X="-15" Y="-67" Z="84" S="-971" T="-693" R="129" G="0" B="0" A="255"/>
+	<Vtx X="-15" Y="-63" Z="79" S="-1014" T="-757" R="129" G="0" B="0" A="255"/>
+	<Vtx X="-15" Y="-62" Z="73" S="-1029" T="-832" R="129" G="0" B="0" A="255"/>
+	<Vtx X="-15" Y="-63" Z="67" S="-1014" T="-907" R="129" G="0" B="0" A="255"/>
+	<Vtx X="-15" Y="-67" Z="61" S="-971" T="-971" R="129" G="0" B="0" A="255"/>
+	<Vtx X="-15" Y="-72" Z="58" S="-907" T="-1014" R="129" G="0" B="0" A="255"/>
+	<Vtx X="-15" Y="-78" Z="57" S="-832" T="-1029" R="129" G="0" B="0" A="255"/>
+	<Vtx X="14" Y="-80" Z="79" S="-1315" T="-762" R="127" G="0" B="0" A="255"/>
+	<Vtx X="14" Y="-78" Z="79" S="-1344" T="-756" R="127" G="0" B="0" A="255"/>
+	<Vtx X="14" Y="-78" Z="89" S="-1344" T="-635" R="127" G="0" B="0" A="255"/>
+	<Vtx X="14" Y="-84" Z="88" S="-1269" T="-650" R="127" G="0" B="0" A="255"/>
+	<Vtx X="14" Y="-82" Z="77" S="-1290" T="-778" R="127" G="0" B="0" A="255"/>
+	<Vtx X="14" Y="-89" Z="84" S="-1205" T="-693" R="127" G="0" B="0" A="255"/>
+	<Vtx X="14" Y="-84" Z="75" S="-1274" T="-803" R="127" G="0" B="0" A="255"/>
+	<Vtx X="14" Y="-93" Z="79" S="-1162" T="-757" R="127" G="0" B="0" A="255"/>
+	<Vtx X="14" Y="-84" Z="73" S="-1268" T="-832" R="127" G="0" B="0" A="255"/>
+	<Vtx X="14" Y="-94" Z="73" S="-1147" T="-832" R="127" G="0" B="0" A="255"/>
+	<Vtx X="14" Y="-84" Z="70" S="-1274" T="-861" R="127" G="0" B="0" A="255"/>
+	<Vtx X="14" Y="-84" Z="73" S="-1268" T="-832" R="127" G="0" B="0" A="255"/>
+	<Vtx X="14" Y="-94" Z="73" S="-1147" T="-832" R="127" G="0" B="0" A="255"/>
+	<Vtx X="14" Y="-93" Z="67" S="-1162" T="-907" R="127" G="0" B="0" A="255"/>
+	<Vtx X="14" Y="-82" Z="68" S="-1290" T="-886" R="127" G="0" B="0" A="255"/>
+	<Vtx X="14" Y="-89" Z="61" S="-1205" T="-971" R="127" G="0" B="0" A="255"/>
+	<Vtx X="14" Y="-80" Z="67" S="-1315" T="-902" R="127" G="0" B="0" A="255"/>
+	<Vtx X="14" Y="-84" Z="58" S="-1269" T="-1014" R="127" G="0" B="0" A="255"/>
+	<Vtx X="14" Y="-78" Z="67" S="-1344" T="-908" R="127" G="0" B="0" A="255"/>
+	<Vtx X="14" Y="-78" Z="57" S="-1344" T="-1029" R="127" G="0" B="0" A="255"/>
+	<Vtx X="14" Y="-75" Z="67" S="-1373" T="-902" R="127" G="0" B="0" A="255"/>
+	<Vtx X="14" Y="-72" Z="58" S="-1419" T="-1014" R="127" G="0" B="0" A="255"/>
+	<Vtx X="14" Y="-74" Z="68" S="-1398" T="-886" R="127" G="0" B="0" A="255"/>
+	<Vtx X="14" Y="-67" Z="61" S="-1483" T="-971" R="127" G="0" B="0" A="255"/>
+	<Vtx X="14" Y="-72" Z="70" S="-1414" T="-861" R="127" G="0" B="0" A="255"/>
+	<Vtx X="14" Y="-63" Z="67" S="-1526" T="-907" R="127" G="0" B="0" A="255"/>
+	<Vtx X="14" Y="-72" Z="73" S="-1420" T="-832" R="127" G="0" B="0" A="255"/>
+	<Vtx X="14" Y="-62" Z="73" S="-1541" T="-832" R="127" G="0" B="0" A="255"/>
+	<Vtx X="14" Y="-72" Z="75" S="-1414" T="-803" R="127" G="0" B="0" A="255"/>
+	<Vtx X="14" Y="-63" Z="79" S="-1526" T="-757" R="127" G="0" B="0" A="255"/>
+	<Vtx X="14" Y="-74" Z="77" S="-1398" T="-778" R="127" G="0" B="0" A="255"/>
+	<Vtx X="14" Y="-67" Z="84" S="-1483" T="-693" R="127" G="0" B="0" A="255"/>
+	<Vtx X="14" Y="-76" Z="79" S="-1373" T="-762" R="127" G="0" B="0" A="255"/>
+	<Vtx X="14" Y="-72" Z="88" S="-1419" T="-650" R="127" G="0" B="0" A="255"/>
+	<Vtx X="14" Y="-78" Z="79" S="-1344" T="-756" R="127" G="0" B="0" A="255"/>
+	<Vtx X="14" Y="-76" Z="79" S="-1373" T="-762" R="127" G="0" B="0" A="255"/>
+	<Vtx X="14" Y="-72" Z="88" S="-1419" T="-650" R="127" G="0" B="0" A="255"/>
+	<Vtx X="14" Y="-78" Z="89" S="-1344" T="-635" R="127" G="0" B="0" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_6 b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_6
new file mode 100644
index 000000000..7ce420cfc
--- /dev/null
+++ b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_6
@@ -0,0 +1,72 @@
+<Vertex Version="0">
+	<Vtx X="-10" Y="-72" Z="58" S="48" T="368" R="95" G="31" B="178" A="255"/>
+	<Vtx X="0" Y="-78" Z="57" S="-16" T="240" R="0" G="0" B="129" A="255"/>
+	<Vtx X="-10" Y="-78" Z="57" S="-16" T="368" R="96" G="0" B="172" A="255"/>
+	<Vtx X="0" Y="-71" Z="58" S="48" T="240" R="0" G="48" B="138" A="255"/>
+	<Vtx X="-10" Y="-67" Z="61" S="112" T="368" R="95" G="59" B="195" A="255"/>
+	<Vtx X="0" Y="-66" Z="61" S="112" T="240" R="0" G="89" B="166" A="255"/>
+	<Vtx X="-10" Y="-63" Z="67" S="176" T="368" R="94" G="79" B="222" A="255"/>
+	<Vtx X="0" Y="-62" Z="67" S="176" T="240" R="0" G="117" B="207" A="255"/>
+	<Vtx X="-10" Y="-62" Z="73" S="240" T="368" R="93" G="87" B="0" A="255"/>
+	<Vtx X="0" Y="-61" Z="73" S="240" T="240" R="0" G="127" B="0" A="255"/>
+	<Vtx X="-10" Y="-63" Z="79" S="304" T="368" R="94" G="79" B="34" A="255"/>
+	<Vtx X="0" Y="-62" Z="79" S="304" T="240" R="0" G="117" B="49" A="255"/>
+	<Vtx X="-10" Y="-67" Z="84" S="368" T="368" R="95" G="59" B="61" A="255"/>
+	<Vtx X="0" Y="-66" Z="84" S="368" T="240" R="0" G="89" B="90" A="255"/>
+	<Vtx X="-10" Y="-72" Z="88" S="432" T="368" R="95" G="31" B="78" A="255"/>
+	<Vtx X="0" Y="-71" Z="88" S="432" T="240" R="0" G="48" B="118" A="255"/>
+	<Vtx X="-10" Y="-78" Z="89" S="496" T="368" R="96" G="0" B="84" A="255"/>
+	<Vtx X="0" Y="-78" Z="89" S="496" T="240" R="0" G="0" B="127" A="255"/>
+	<Vtx X="-10" Y="-84" Z="88" S="560" T="368" R="95" G="225" B="78" A="255"/>
+	<Vtx X="0" Y="-84" Z="88" S="560" T="240" R="0" G="208" B="118" A="255"/>
+	<Vtx X="-10" Y="-89" Z="84" S="624" T="368" R="95" G="197" B="61" A="255"/>
+	<Vtx X="0" Y="-90" Z="84" S="624" T="240" R="0" G="167" B="90" A="255"/>
+	<Vtx X="-10" Y="-93" Z="79" S="688" T="368" R="94" G="177" B="34" A="255"/>
+	<Vtx X="0" Y="-93" Z="79" S="688" T="240" R="0" G="139" B="49" A="255"/>
+	<Vtx X="-10" Y="-94" Z="73" S="752" T="368" R="93" G="169" B="0" A="255"/>
+	<Vtx X="0" Y="-95" Z="73" S="752" T="240" R="0" G="129" B="0" A="255"/>
+	<Vtx X="-10" Y="-93" Z="67" S="816" T="368" R="94" G="177" B="222" A="255"/>
+	<Vtx X="0" Y="-93" Z="67" S="816" T="240" R="0" G="139" B="207" A="255"/>
+	<Vtx X="-10" Y="-89" Z="61" S="880" T="368" R="95" G="197" B="195" A="255"/>
+	<Vtx X="0" Y="-90" Z="61" S="880" T="240" R="0" G="167" B="166" A="255"/>
+	<Vtx X="-10" Y="-84" Z="58" S="944" T="368" R="95" G="225" B="178" A="255"/>
+	<Vtx X="0" Y="-84" Z="58" S="944" T="240" R="0" G="208" B="138" A="255"/>
+	<Vtx X="-10" Y="-78" Z="57" S="1008" T="368" R="96" G="0" B="172" A="255"/>
+	<Vtx X="0" Y="-84" Z="58" S="944" T="240" R="0" G="208" B="138" A="255"/>
+	<Vtx X="-10" Y="-84" Z="58" S="944" T="368" R="95" G="225" B="178" A="255"/>
+	<Vtx X="0" Y="-78" Z="57" S="1008" T="240" R="0" G="0" B="129" A="255"/>
+	<Vtx X="10" Y="-84" Z="58" S="944" T="112" R="161" G="225" B="178" A="255"/>
+	<Vtx X="10" Y="-78" Z="57" S="1008" T="112" R="160" G="0" B="172" A="255"/>
+	<Vtx X="10" Y="-89" Z="61" S="880" T="112" R="161" G="197" B="195" A="255"/>
+	<Vtx X="0" Y="-90" Z="61" S="880" T="240" R="0" G="167" B="166" A="255"/>
+	<Vtx X="10" Y="-93" Z="67" S="816" T="112" R="162" G="177" B="222" A="255"/>
+	<Vtx X="0" Y="-93" Z="67" S="816" T="240" R="0" G="139" B="207" A="255"/>
+	<Vtx X="10" Y="-94" Z="73" S="752" T="112" R="163" G="169" B="0" A="255"/>
+	<Vtx X="0" Y="-95" Z="73" S="752" T="240" R="0" G="129" B="0" A="255"/>
+	<Vtx X="10" Y="-93" Z="79" S="688" T="112" R="162" G="177" B="34" A="255"/>
+	<Vtx X="0" Y="-93" Z="79" S="688" T="240" R="0" G="139" B="49" A="255"/>
+	<Vtx X="10" Y="-89" Z="84" S="624" T="112" R="161" G="197" B="61" A="255"/>
+	<Vtx X="0" Y="-90" Z="84" S="624" T="240" R="0" G="167" B="90" A="255"/>
+	<Vtx X="10" Y="-84" Z="88" S="560" T="112" R="161" G="225" B="78" A="255"/>
+	<Vtx X="0" Y="-84" Z="88" S="560" T="240" R="0" G="208" B="118" A="255"/>
+	<Vtx X="10" Y="-78" Z="89" S="496" T="112" R="160" G="0" B="84" A="255"/>
+	<Vtx X="0" Y="-78" Z="89" S="496" T="240" R="0" G="0" B="127" A="255"/>
+	<Vtx X="10" Y="-72" Z="88" S="432" T="112" R="161" G="31" B="78" A="255"/>
+	<Vtx X="0" Y="-71" Z="88" S="432" T="240" R="0" G="48" B="118" A="255"/>
+	<Vtx X="10" Y="-67" Z="84" S="368" T="112" R="161" G="59" B="61" A="255"/>
+	<Vtx X="0" Y="-66" Z="84" S="368" T="240" R="0" G="89" B="90" A="255"/>
+	<Vtx X="10" Y="-63" Z="79" S="304" T="112" R="162" G="79" B="34" A="255"/>
+	<Vtx X="0" Y="-62" Z="79" S="304" T="240" R="0" G="117" B="49" A="255"/>
+	<Vtx X="10" Y="-62" Z="73" S="240" T="112" R="163" G="87" B="0" A="255"/>
+	<Vtx X="0" Y="-61" Z="73" S="240" T="240" R="0" G="127" B="0" A="255"/>
+	<Vtx X="10" Y="-63" Z="67" S="176" T="112" R="162" G="79" B="222" A="255"/>
+	<Vtx X="0" Y="-62" Z="67" S="176" T="240" R="0" G="117" B="207" A="255"/>
+	<Vtx X="10" Y="-67" Z="61" S="112" T="112" R="161" G="59" B="195" A="255"/>
+	<Vtx X="0" Y="-66" Z="61" S="112" T="240" R="0" G="89" B="166" A="255"/>
+	<Vtx X="0" Y="-66" Z="61" S="112" T="240" R="0" G="89" B="166" A="255"/>
+	<Vtx X="10" Y="-67" Z="61" S="112" T="112" R="161" G="59" B="195" A="255"/>
+	<Vtx X="10" Y="-72" Z="58" S="48" T="112" R="161" G="31" B="178" A="255"/>
+	<Vtx X="0" Y="-71" Z="58" S="48" T="240" R="0" G="48" B="138" A="255"/>
+	<Vtx X="10" Y="-78" Z="57" S="-16" T="112" R="160" G="0" B="172" A="255"/>
+	<Vtx X="0" Y="-78" Z="57" S="-16" T="240" R="0" G="0" B="129" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_7 b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_7
new file mode 100644
index 000000000..381565a0e
--- /dev/null
+++ b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_7
@@ -0,0 +1,147 @@
+<Vertex Version="0">
+	<Vtx X="24" Y="-147" Z="233" S="-138" T="-288" R="68" G="63" B="87" A="255"/>
+	<Vtx X="21" Y="-144" Z="227" S="-95" T="-523" R="188" G="104" B="28" A="255"/>
+	<Vtx X="21" Y="-147" Z="233" S="-138" T="-523" R="188" G="63" B="87" A="255"/>
+	<Vtx X="24" Y="-144" Z="227" S="-95" T="-288" R="68" G="104" B="28" A="255"/>
+	<Vtx X="24" Y="-148" Z="232" S="-138" T="-266" R="121" G="4" B="38" A="255"/>
+	<Vtx X="24" Y="-144" Z="227" S="-95" T="-266" R="125" G="24" B="5" A="255"/>
+	<Vtx X="24" Y="-155" Z="228" S="-138" T="-33" R="121" G="220" B="15" A="255"/>
+	<Vtx X="24" Y="-152" Z="223" S="-95" T="-33" R="125" G="240" B="237" A="255"/>
+	<Vtx X="24" Y="-155" Z="228" S="-138" T="-11" R="68" G="149" B="244" A="255"/>
+	<Vtx X="24" Y="-152" Z="223" S="-95" T="-11" R="68" G="181" B="180" A="255"/>
+	<Vtx X="21" Y="-155" Z="228" S="-138" T="224" R="188" G="149" B="244" A="255"/>
+	<Vtx X="21" Y="-152" Z="223" S="-95" T="224" R="188" G="181" B="180" A="255"/>
+	<Vtx X="21" Y="-155" Z="228" S="-138" T="246" R="135" G="220" B="15" A="255"/>
+	<Vtx X="21" Y="-152" Z="223" S="-95" T="246" R="131" G="240" B="237" A="255"/>
+	<Vtx X="21" Y="-148" Z="232" S="-138" T="479" R="135" G="4" B="38" A="255"/>
+	<Vtx X="21" Y="-144" Z="227" S="-95" T="479" R="131" G="24" B="5" A="255"/>
+	<Vtx X="21" Y="-147" Z="233" S="-138" T="491" R="188" G="63" B="87" A="255"/>
+	<Vtx X="21" Y="-144" Z="227" S="-95" T="491" R="188" G="104" B="28" A="255"/>
+	<Vtx X="21" Y="-144" Z="223" S="-82" T="469" R="130" G="16" B="5" A="255"/>
+	<Vtx X="21" Y="-144" Z="223" S="-82" T="491" R="176" G="96" B="23" A="255"/>
+	<Vtx X="21" Y="-132" Z="201" S="69" T="469" R="130" G="12" B="12" A="255"/>
+	<Vtx X="21" Y="-131" Z="201" S="69" T="491" R="176" G="69" B="71" A="255"/>
+	<Vtx X="21" Y="-131" Z="201" S="77" T="474" R="131" G="16" B="18" A="255"/>
+	<Vtx X="21" Y="-130" Z="201" S="77" T="491" R="188" G="76" B="75" A="255"/>
+	<Vtx X="21" Y="-129" Z="198" S="99" T="474" R="134" G="33" B="246" A="255"/>
+	<Vtx X="21" Y="-128" Z="198" S="99" T="491" R="186" G="104" B="21" A="255"/>
+	<Vtx X="21" Y="-133" Z="195" S="99" T="251" R="134" G="249" B="223" A="255"/>
+	<Vtx X="21" Y="-135" Z="198" S="77" T="251" R="131" G="232" B="251" A="255"/>
+	<Vtx X="21" Y="-134" Z="195" S="99" T="224" R="186" G="187" B="176" A="255"/>
+	<Vtx X="21" Y="-136" Z="198" S="77" T="224" R="188" G="153" B="227" A="255"/>
+	<Vtx X="24" Y="-134" Z="195" S="99" T="-11" R="70" G="187" B="176" A="255"/>
+	<Vtx X="24" Y="-136" Z="198" S="77" T="-11" R="68" G="153" B="227" A="255"/>
+	<Vtx X="24" Y="-133" Z="195" S="99" T="-38" R="122" G="249" B="223" A="255"/>
+	<Vtx X="24" Y="-136" Z="198" S="77" T="-11" R="68" G="153" B="227" A="255"/>
+	<Vtx X="24" Y="-134" Z="195" S="99" T="-11" R="70" G="187" B="176" A="255"/>
+	<Vtx X="24" Y="-135" Z="198" S="77" T="-38" R="125" G="232" B="251" A="255"/>
+	<Vtx X="24" Y="-129" Z="198" S="99" T="-261" R="122" G="33" B="246" A="255"/>
+	<Vtx X="24" Y="-133" Z="194" S="108" T="-45" R="114" G="15" B="202" A="255"/>
+	<Vtx X="24" Y="-129" Z="197" S="108" T="-253" R="114" G="39" B="216" A="255"/>
+	<Vtx X="24" Y="-133" Z="194" S="126" T="-31" R="52" G="7" B="140" A="255"/>
+	<Vtx X="24" Y="-128" Z="196" S="126" T="-268" R="52" G="97" B="193" A="255"/>
+	<Vtx X="21" Y="-128" Z="196" S="343" T="-268" R="204" G="97" B="193" A="255"/>
+	<Vtx X="21" Y="-133" Z="194" S="343" T="-31" R="204" G="7" B="140" A="255"/>
+	<Vtx X="24" Y="-134" Z="195" S="117" T="-21" R="70" G="187" B="176" A="255"/>
+	<Vtx X="24" Y="-133" Z="194" S="112" T="-29" R="114" G="15" B="202" A="255"/>
+	<Vtx X="24" Y="-133" Z="195" S="108" T="-23" R="122" G="249" B="223" A="255"/>
+	<Vtx X="21" Y="-134" Z="195" S="352" T="-21" R="186" G="187" B="176" A="255"/>
+	<Vtx X="21" Y="-133" Z="195" S="363" T="-38" R="134" G="249" B="223" A="255"/>
+	<Vtx X="21" Y="-133" Z="194" S="358" T="-45" R="142" G="15" B="202" A="255"/>
+	<Vtx X="21" Y="-129" Z="197" S="358" T="-253" R="142" G="39" B="216" A="255"/>
+	<Vtx X="21" Y="-129" Z="198" S="363" T="-261" R="134" G="33" B="246" A="255"/>
+	<Vtx X="21" Y="-128" Z="198" S="352" T="-277" R="186" G="104" B="21" A="255"/>
+	<Vtx X="24" Y="-128" Z="198" S="117" T="-277" R="70" G="104" B="21" A="255"/>
+	<Vtx X="24" Y="-129" Z="198" S="108" T="-275" R="122" G="33" B="246" A="255"/>
+	<Vtx X="24" Y="-129" Z="197" S="112" T="-269" R="114" G="39" B="216" A="255"/>
+	<Vtx X="24" Y="-150" Z="233" S="-157" T="-254" R="111" G="236" B="59" A="255"/>
+	<Vtx X="24" Y="-155" Z="228" S="-138" T="-33" R="121" G="220" B="15" A="255"/>
+	<Vtx X="24" Y="-148" Z="232" S="-138" T="-266" R="121" G="4" B="38" A="255"/>
+	<Vtx X="24" Y="-154" Z="230" S="-157" T="-45" R="110" G="214" B="47" A="255"/>
+	<Vtx X="24" Y="-150" Z="233" S="-177" T="-266" R="49" G="237" B="116" A="255"/>
+	<Vtx X="24" Y="-154" Z="231" S="-177" T="-33" R="49" G="165" B="73" A="255"/>
+	<Vtx X="22" Y="-154" Z="231" S="-377" T="-33" R="207" G="165" B="73" A="255"/>
+	<Vtx X="22" Y="-150" Z="233" S="-377" T="-266" R="207" G="237" B="116" A="255"/>
+	<Vtx X="24" Y="-147" Z="233" S="-160" T="-277" R="68" G="63" B="87" A="255"/>
+	<Vtx X="24" Y="-147" Z="233" S="-160" T="-277" R="68" G="63" B="87" A="255"/>
+	<Vtx X="24" Y="-150" Z="233" S="-177" T="-266" R="49" G="237" B="116" A="255"/>
+	<Vtx X="24" Y="-150" Z="233" S="-160" T="-267" R="111" G="236" B="59" A="255"/>
+	<Vtx X="24" Y="-148" Z="232" S="-151" T="-276" R="121" G="4" B="38" A="255"/>
+	<Vtx X="22" Y="-150" Z="233" S="-377" T="-266" R="207" G="237" B="116" A="255"/>
+	<Vtx X="21" Y="-147" Z="233" S="-395" T="-277" R="188" G="63" B="87" A="255"/>
+	<Vtx X="21" Y="-148" Z="232" S="-405" T="-266" R="135" G="4" B="38" A="255"/>
+	<Vtx X="22" Y="-150" Z="233" S="-396" T="-254" R="145" G="236" B="59" A="255"/>
+	<Vtx X="22" Y="-154" Z="230" S="-396" T="-45" R="146" G="214" B="47" A="255"/>
+	<Vtx X="21" Y="-155" Z="228" S="-405" T="-33" R="135" G="220" B="15" A="255"/>
+	<Vtx X="21" Y="-155" Z="228" S="-395" T="-21" R="188" G="149" B="244" A="255"/>
+	<Vtx X="22" Y="-154" Z="231" S="-377" T="-33" R="207" G="165" B="73" A="255"/>
+	<Vtx X="24" Y="-154" Z="231" S="-177" T="-33" R="49" G="165" B="73" A="255"/>
+	<Vtx X="24" Y="-155" Z="228" S="-160" T="-21" R="68" G="149" B="244" A="255"/>
+	<Vtx X="24" Y="-155" Z="228" S="-151" T="-23" R="121" G="220" B="15" A="255"/>
+	<Vtx X="24" Y="-154" Z="230" S="-160" T="-32" R="110" G="214" B="47" A="255"/>
+	<Vtx X="24" Y="-144" Z="227" S="-95" T="-288" R="68" G="104" B="28" A="255"/>
+	<Vtx X="21" Y="-144" Z="223" S="-82" T="-523" R="176" G="96" B="23" A="255"/>
+	<Vtx X="21" Y="-144" Z="227" S="-95" T="-523" R="188" G="104" B="28" A="255"/>
+	<Vtx X="24" Y="-144" Z="223" S="-82" T="-288" R="80" G="96" B="23" A="255"/>
+	<Vtx X="24" Y="-144" Z="227" S="-95" T="-266" R="125" G="24" B="5" A="255"/>
+	<Vtx X="24" Y="-144" Z="223" S="-82" T="-255" R="126" G="16" B="5" A="255"/>
+	<Vtx X="24" Y="-152" Z="223" S="-95" T="-33" R="125" G="240" B="237" A="255"/>
+	<Vtx X="24" Y="-148" Z="221" S="-82" T="-43" R="126" G="244" B="244" A="255"/>
+	<Vtx X="24" Y="-152" Z="223" S="-95" T="-11" R="68" G="181" B="180" A="255"/>
+	<Vtx X="24" Y="-148" Z="221" S="-82" T="-11" R="80" G="188" B="184" A="255"/>
+	<Vtx X="21" Y="-152" Z="223" S="-95" T="224" R="188" G="181" B="180" A="255"/>
+	<Vtx X="21" Y="-148" Z="221" S="-82" T="224" R="176" G="188" B="184" A="255"/>
+	<Vtx X="21" Y="-152" Z="223" S="-95" T="246" R="131" G="240" B="237" A="255"/>
+	<Vtx X="21" Y="-148" Z="221" S="-82" T="257" R="130" G="244" B="244" A="255"/>
+	<Vtx X="21" Y="-144" Z="227" S="-95" T="479" R="131" G="24" B="5" A="255"/>
+	<Vtx X="21" Y="-144" Z="223" S="-82" T="469" R="130" G="16" B="5" A="255"/>
+	<Vtx X="21" Y="-144" Z="223" S="-82" T="469" R="130" G="16" B="5" A="255"/>
+	<Vtx X="21" Y="-135" Z="199" S="69" T="257" R="130" G="240" B="251" A="255"/>
+	<Vtx X="21" Y="-148" Z="221" S="-82" T="257" R="130" G="244" B="244" A="255"/>
+	<Vtx X="21" Y="-132" Z="201" S="69" T="469" R="130" G="12" B="12" A="255"/>
+	<Vtx X="21" Y="-135" Z="198" S="77" T="251" R="131" G="232" B="251" A="255"/>
+	<Vtx X="21" Y="-131" Z="201" S="77" T="474" R="131" G="16" B="18" A="255"/>
+	<Vtx X="21" Y="-136" Z="198" S="77" T="224" R="188" G="153" B="227" A="255"/>
+	<Vtx X="21" Y="-136" Z="199" S="69" T="224" R="176" G="160" B="232" A="255"/>
+	<Vtx X="24" Y="-136" Z="198" S="77" T="-11" R="68" G="153" B="227" A="255"/>
+	<Vtx X="24" Y="-136" Z="199" S="69" T="-11" R="80" G="160" B="232" A="255"/>
+	<Vtx X="24" Y="-135" Z="198" S="77" T="-38" R="125" G="232" B="251" A="255"/>
+	<Vtx X="24" Y="-135" Z="199" S="69" T="-43" R="126" G="240" B="251" A="255"/>
+	<Vtx X="24" Y="-131" Z="201" S="77" T="-261" R="125" G="16" B="18" A="255"/>
+	<Vtx X="24" Y="-129" Z="198" S="99" T="-261" R="122" G="33" B="246" A="255"/>
+	<Vtx X="24" Y="-128" Z="198" S="99" T="-288" R="70" G="104" B="21" A="255"/>
+	<Vtx X="24" Y="-130" Z="201" S="77" T="-288" R="68" G="76" B="75" A="255"/>
+	<Vtx X="21" Y="-128" Z="198" S="99" T="-523" R="186" G="104" B="21" A="255"/>
+	<Vtx X="21" Y="-130" Z="201" S="77" T="-523" R="188" G="76" B="75" A="255"/>
+	<Vtx X="24" Y="-131" Z="201" S="69" T="-288" R="80" G="69" B="71" A="255"/>
+	<Vtx X="21" Y="-131" Z="201" S="69" T="-523" R="176" G="69" B="71" A="255"/>
+	<Vtx X="24" Y="-144" Z="223" S="-82" T="-288" R="80" G="96" B="23" A="255"/>
+	<Vtx X="21" Y="-144" Z="223" S="-82" T="-523" R="176" G="96" B="23" A="255"/>
+	<Vtx X="24" Y="-144" Z="223" S="-82" T="-255" R="126" G="16" B="5" A="255"/>
+	<Vtx X="24" Y="-132" Z="201" S="69" T="-255" R="126" G="12" B="12" A="255"/>
+	<Vtx X="24" Y="-148" Z="221" S="-82" T="-43" R="126" G="244" B="244" A="255"/>
+	<Vtx X="24" Y="-148" Z="221" S="-82" T="-11" R="80" G="188" B="184" A="255"/>
+	<Vtx X="21" Y="-148" Z="221" S="-82" T="224" R="176" G="188" B="184" A="255"/>
+	<Vtx X="20" Y="-130" Z="197" S="22" T="112" R="129" G="0" B="0" A="255"/>
+	<Vtx X="20" Y="-132" Z="196" S="235" T="-11" R="129" G="0" B="0" A="255"/>
+	<Vtx X="20" Y="-134" Z="197" S="448" T="112" R="129" G="0" B="0" A="255"/>
+	<Vtx X="20" Y="-132" Z="200" S="235" T="480" R="129" G="0" B="0" A="255"/>
+	<Vtx X="20" Y="-134" Z="199" S="448" T="358" R="129" G="0" B="0" A="255"/>
+	<Vtx X="20" Y="-132" Z="200" S="235" T="480" R="129" G="0" B="0" A="255"/>
+	<Vtx X="20" Y="-130" Z="199" S="22" T="358" R="129" G="0" B="0" A="255"/>
+	<Vtx X="20" Y="-130" Z="197" S="22" T="112" R="129" G="0" B="0" A="255"/>
+	<Vtx X="20" Y="-130" Z="197" S="-363" T="-21" R="178" G="87" B="206" A="255"/>
+	<Vtx X="27" Y="-132" Z="196" S="-533" T="-280" R="190" G="0" B="147" A="255"/>
+	<Vtx X="20" Y="-132" Z="196" S="-533" T="-21" R="178" G="0" B="155" A="255"/>
+	<Vtx X="27" Y="-130" Z="197" S="-363" T="-280" R="190" G="94" B="202" A="255"/>
+	<Vtx X="20" Y="-130" Z="199" S="-192" T="-21" R="178" G="87" B="50" A="255"/>
+	<Vtx X="27" Y="-130" Z="199" S="-192" T="-280" R="190" G="94" B="54" A="255"/>
+	<Vtx X="20" Y="-132" Z="200" S="-21" T="-21" R="178" G="0" B="101" A="255"/>
+	<Vtx X="27" Y="-132" Z="200" S="-21" T="-280" R="190" G="0" B="109" A="255"/>
+	<Vtx X="20" Y="-134" Z="199" S="149" T="-21" R="178" G="169" B="50" A="255"/>
+	<Vtx X="27" Y="-134" Z="199" S="149" T="-280" R="190" G="162" B="54" A="255"/>
+	<Vtx X="20" Y="-134" Z="197" S="320" T="-21" R="178" G="169" B="206" A="255"/>
+	<Vtx X="27" Y="-134" Z="197" S="320" T="-280" R="190" G="162" B="202" A="255"/>
+	<Vtx X="20" Y="-132" Z="196" S="491" T="-21" R="178" G="0" B="155" A="255"/>
+	<Vtx X="27" Y="-132" Z="196" S="491" T="-280" R="190" G="0" B="147" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_cull b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_cull
new file mode 100644
index 000000000..47672f31f
--- /dev/null
+++ b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_cull
@@ -0,0 +1,10 @@
+<Vertex Version="0">
+	<Vtx X="-15" Y="-163" Z="-152" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-15" Y="-163" Z="148" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-15" Y="173" Z="148" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-15" Y="173" Z="-152" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="33" Y="-163" Z="-152" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="33" Y="-163" Z="148" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="33" Y="173" Z="148" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="33" Y="173" Z="-152" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_black b/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_black
new file mode 100644
index 000000000..26808af42
--- /dev/null
+++ b/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_black
@@ -0,0 +1,12 @@
+<DisplayList Version="0">
+	<PipeSync/>
+	<SetCombineLERP A0="G_CCMUX_0" B0="G_CCMUX_0" C0="G_CCMUX_0" D0="G_CCMUX_SHADE" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_1" A1="G_CCMUX_COMBINED" B1="G_CCMUX_0" C1="G_CCMUX_PRIMITIVE" D1="G_CCMUX_0" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_COMBINED"/>
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="1" G_CULL_BACK="1" G_FOG="1" G_LIGHTING="1" G_SHADING_SMOOTH="1"  />
+
+	<SetOtherMode Cmd="G_SETOTHERMODE_H" Sft="4" Length="20" G_AD_NOISE="1" G_CD_MAGICSQ="1" G_CK_NONE="1" G_TC_FILT="1" G_TF_BILERP="1" G_TL_TILE="1" G_TD_CLAMP="1" G_TP_PERSP="1" G_CYC_2CYCLE="1" G_PM_NPRIMITIVE="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_L" Sft="0" Length="32" G_AC_NONE="1" G_ZS_PIXEL="1" G_RM_FOG_SHADE_A="1" G_RM_AA_ZB_OPA_SURF2="1" />
+	<Texture S="65535" T="65535" Level="0" Tile="0" On="1"/>
+	<SetPrimColor M="0" L="0" R="0" G="0" B="0" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_f3dlite_material_006 b/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_f3dlite_material_006
new file mode 100644
index 000000000..3db97957e
--- /dev/null
+++ b/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_f3dlite_material_006
@@ -0,0 +1,21 @@
+<DisplayList Version="0">
+	<PipeSync/>
+	<SetCombineLERP A0="G_CCMUX_TEXEL0" B0="G_CCMUX_0" C0="G_CCMUX_SHADE" D0="G_CCMUX_0" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_1" A1="G_CCMUX_COMBINED" B1="G_CCMUX_0" C1="G_CCMUX_PRIMITIVE" D1="G_CCMUX_0" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_COMBINED"/>
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="1" G_CULL_BACK="1" G_FOG="1" G_LIGHTING="1" G_SHADING_SMOOTH="1"  />
+
+	<SetOtherMode Cmd="G_SETOTHERMODE_H" Sft="4" Length="20" G_AD_NOISE="1" G_CD_MAGICSQ="1" G_CK_NONE="1" G_TC_FILT="1" G_TF_BILERP="1" G_TL_TILE="1" G_TD_CLAMP="1" G_TP_PERSP="1" G_CYC_2CYCLE="1" G_PM_NPRIMITIVE="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_L" Sft="0" Length="32" G_AC_NONE="1" G_ZS_PIXEL="1" G_RM_FOG_SHADE_A="1" G_RM_AA_ZB_OPA_SURF2="1" />
+	<Texture S="65535" T="65535" Level="0" Tile="0" On="1"/>
+	<SetTextureLUT Mode="G_TT_NONE"/>
+	<TileSync/>
+	<SetTextureImage Path="objects/object_gi_fishing_pole/fishing_lure_float_rgba16_png" Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b_LOAD_BLOCK" Width="1"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b_LOAD_BLOCK" Line="0" TMem="0" Tile="7" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="4" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="511" Dxt="256"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="8" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="4" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="124" Lrt="60"/>
+	<SetPrimColor M="0" L="0" R="255" G="255" B="255" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_line b/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_line
new file mode 100644
index 000000000..d08aa632a
--- /dev/null
+++ b/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_line
@@ -0,0 +1,12 @@
+<DisplayList Version="0">
+	<PipeSync/>
+	<SetCombineLERP A0="G_CCMUX_0" B0="G_CCMUX_0" C0="G_CCMUX_0" D0="G_CCMUX_SHADE" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_1" A1="G_CCMUX_COMBINED" B1="G_CCMUX_0" C1="G_CCMUX_PRIMITIVE" D1="G_CCMUX_0" Aa1="G_ACMUX_COMBINED" Ab1="G_ACMUX_0" Ac1="G_ACMUX_PRIMITIVE" Ad1="G_ACMUX_0"/>
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="1" G_FOG="1" G_LIGHTING="1" G_SHADING_SMOOTH="1"  />
+
+	<SetOtherMode Cmd="G_SETOTHERMODE_H" Sft="4" Length="20" G_AD_NOISE="1" G_CD_MAGICSQ="1" G_CK_NONE="1" G_TC_FILT="1" G_TF_BILERP="1" G_TL_TILE="1" G_TD_CLAMP="1" G_TP_PERSP="1" G_CYC_2CYCLE="1" G_PM_NPRIMITIVE="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_L" Sft="0" Length="32" G_AC_NONE="1" G_ZS_PIXEL="1" G_RM_FOG_SHADE_A="1" G_RM_AA_ZB_XLU_SURF2="1" />
+	<Texture S="65535" T="65535" Level="0" Tile="0" On="1"/>
+	<SetPrimColor M="0" L="0" R="255" G="255" B="255" A="55"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_reel_accent_001 b/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_reel_accent_001
new file mode 100644
index 000000000..3fff6a270
--- /dev/null
+++ b/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_reel_accent_001
@@ -0,0 +1,22 @@
+<DisplayList Version="0">
+	<PipeSync/>
+	<SetCombineLERP A0="G_CCMUX_TEXEL0" B0="G_CCMUX_PRIMITIVE" C0="G_CCMUX_PRIM_LOD_FRAC" D0="G_CCMUX_TEXEL0" Aa0="G_ACMUX_1" Ab0="G_ACMUX_1" Ac0="G_ACMUX_PRIM_LOD_FRAC" Ad0="G_ACMUX_1" A1="G_CCMUX_PRIMITIVE" B1="G_CCMUX_ENVIRONMENT" C1="G_CCMUX_COMBINED" D1="G_CCMUX_ENVIRONMENT" Aa1="G_ACMUX_1" Ab1="G_ACMUX_1" Ac1="G_ACMUX_PRIM_LOD_FRAC" Ad1="G_ACMUX_1"/>
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="1" G_CULL_BACK="1" G_LIGHTING="1" G_TEXTURE_GEN="1" G_TEXTURE_GEN_LINEAR="1" G_SHADING_SMOOTH="1"  />
+
+	<SetOtherMode Cmd="G_SETOTHERMODE_H" Sft="4" Length="20" G_AD_NOISE="1" G_CD_MAGICSQ="1" G_CK_NONE="1" G_TC_FILT="1" G_TF_BILERP="1" G_TL_TILE="1" G_TD_CLAMP="1" G_TP_PERSP="1" G_CYC_2CYCLE="1" G_PM_NPRIMITIVE="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_L" Sft="0" Length="32" G_AC_NONE="1" G_ZS_PIXEL="1" G_RM_PASS="1" G_RM_AA_ZB_TEX_EDGE2="1" />
+	<Texture S="655" T="655" Level="0" Tile="0" On="1"/>
+	<SetTextureLUT Mode="G_TT_NONE"/>
+	<TileSync/>
+	<SetTextureImage Path="objects/object_gi_fishing_pole/eff_unknown_10_i8" Format="G_IM_FMT_I" Size="G_IM_SIZ_8b_LOAD_BLOCK" Width="1"/>
+	<SetTile Format="G_IM_FMT_I" Size="G_IM_SIZ_8b_LOAD_BLOCK" Line="0" TMem="0" Tile="7" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="1"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="511" Dxt="512"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_I" Size="G_IM_SIZ_8b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="1"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="124" Lrt="124"/>
+	<SetPrimColor M="0" L="128" R="0" G="134" B="241" A="255"/>
+	<SetEnvColor R="0" G="93" B="169" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_reel_handle_metal b/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_reel_handle_metal
new file mode 100644
index 000000000..9633e2458
--- /dev/null
+++ b/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_reel_handle_metal
@@ -0,0 +1,22 @@
+<DisplayList Version="0">
+	<PipeSync/>
+	<SetCombineLERP A0="G_CCMUX_TEXEL0" B0="G_CCMUX_PRIMITIVE" C0="G_CCMUX_PRIM_LOD_FRAC" D0="G_CCMUX_TEXEL0" Aa0="G_ACMUX_1" Ab0="G_ACMUX_1" Ac0="G_ACMUX_PRIM_LOD_FRAC" Ad0="G_ACMUX_1" A1="G_CCMUX_PRIMITIVE" B1="G_CCMUX_ENVIRONMENT" C1="G_CCMUX_COMBINED" D1="G_CCMUX_ENVIRONMENT" Aa1="G_ACMUX_1" Ab1="G_ACMUX_1" Ac1="G_ACMUX_PRIM_LOD_FRAC" Ad1="G_ACMUX_1"/>
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="1" G_CULL_BACK="1" G_LIGHTING="1" G_TEXTURE_GEN="1" G_TEXTURE_GEN_LINEAR="1" G_SHADING_SMOOTH="1"  />
+
+	<SetOtherMode Cmd="G_SETOTHERMODE_H" Sft="4" Length="20" G_AD_NOISE="1" G_CD_MAGICSQ="1" G_CK_NONE="1" G_TC_FILT="1" G_TF_BILERP="1" G_TL_TILE="1" G_TD_CLAMP="1" G_TP_PERSP="1" G_CYC_2CYCLE="1" G_PM_NPRIMITIVE="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_L" Sft="0" Length="32" G_AC_NONE="1" G_ZS_PIXEL="1" G_RM_PASS="1" G_RM_AA_ZB_TEX_EDGE2="1" />
+	<Texture S="1966" T="1966" Level="0" Tile="0" On="1"/>
+	<SetTextureLUT Mode="G_TT_NONE"/>
+	<TileSync/>
+	<SetTextureImage Path="objects/object_gi_fishing_pole/eff_unknown_10_i8" Format="G_IM_FMT_I" Size="G_IM_SIZ_8b_LOAD_BLOCK" Width="1"/>
+	<SetTile Format="G_IM_FMT_I" Size="G_IM_SIZ_8b_LOAD_BLOCK" Line="0" TMem="0" Tile="7" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="1"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="511" Dxt="512"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_I" Size="G_IM_SIZ_8b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="1"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="124" Lrt="124"/>
+	<SetPrimColor M="0" L="128" R="248" G="255" B="255" A="255"/>
+	<SetEnvColor R="147" G="150" B="150" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_reel_metal_001 b/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_reel_metal_001
new file mode 100644
index 000000000..332c12c8d
--- /dev/null
+++ b/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_reel_metal_001
@@ -0,0 +1,22 @@
+<DisplayList Version="0">
+	<PipeSync/>
+	<SetCombineLERP A0="G_CCMUX_TEXEL0" B0="G_CCMUX_PRIMITIVE" C0="G_CCMUX_PRIM_LOD_FRAC" D0="G_CCMUX_TEXEL0" Aa0="G_ACMUX_1" Ab0="G_ACMUX_1" Ac0="G_ACMUX_PRIM_LOD_FRAC" Ad0="G_ACMUX_1" A1="G_CCMUX_PRIMITIVE" B1="G_CCMUX_ENVIRONMENT" C1="G_CCMUX_COMBINED" D1="G_CCMUX_ENVIRONMENT" Aa1="G_ACMUX_1" Ab1="G_ACMUX_1" Ac1="G_ACMUX_PRIM_LOD_FRAC" Ad1="G_ACMUX_1"/>
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="1" G_CULL_BACK="1" G_LIGHTING="1" G_TEXTURE_GEN="1" G_TEXTURE_GEN_LINEAR="1" G_SHADING_SMOOTH="1"  />
+
+	<SetOtherMode Cmd="G_SETOTHERMODE_H" Sft="4" Length="20" G_AD_NOISE="1" G_CD_MAGICSQ="1" G_CK_NONE="1" G_TC_FILT="1" G_TF_BILERP="1" G_TL_TILE="1" G_TD_CLAMP="1" G_TP_PERSP="1" G_CYC_2CYCLE="1" G_PM_NPRIMITIVE="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_L" Sft="0" Length="32" G_AC_NONE="1" G_ZS_PIXEL="1" G_RM_PASS="1" G_RM_AA_ZB_TEX_EDGE2="1" />
+	<Texture S="2621" T="2621" Level="0" Tile="0" On="1"/>
+	<SetTextureLUT Mode="G_TT_NONE"/>
+	<TileSync/>
+	<SetTextureImage Path="objects/object_gi_fishing_pole/eff_unknown_10_i8" Format="G_IM_FMT_I" Size="G_IM_SIZ_8b_LOAD_BLOCK" Width="1"/>
+	<SetTile Format="G_IM_FMT_I" Size="G_IM_SIZ_8b_LOAD_BLOCK" Line="0" TMem="0" Tile="7" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="1"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="511" Dxt="512"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_I" Size="G_IM_SIZ_8b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="1"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="124" Lrt="124"/>
+	<SetPrimColor M="0" L="128" R="237" G="237" B="171" A="255"/>
+	<SetEnvColor R="195" G="157" B="0" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_reel_white b/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_reel_white
new file mode 100644
index 000000000..4b12ae0fb
--- /dev/null
+++ b/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_reel_white
@@ -0,0 +1,12 @@
+<DisplayList Version="0">
+	<PipeSync/>
+	<SetCombineLERP A0="G_CCMUX_0" B0="G_CCMUX_0" C0="G_CCMUX_0" D0="G_CCMUX_SHADE" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_1" A1="G_CCMUX_COMBINED" B1="G_CCMUX_0" C1="G_CCMUX_PRIMITIVE" D1="G_CCMUX_0" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_COMBINED"/>
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="1" G_CULL_BACK="1" G_FOG="1" G_LIGHTING="1" G_SHADING_SMOOTH="1"  />
+
+	<SetOtherMode Cmd="G_SETOTHERMODE_H" Sft="4" Length="20" G_AD_NOISE="1" G_CD_MAGICSQ="1" G_CK_NONE="1" G_TC_FILT="1" G_TF_BILERP="1" G_TL_TILE="1" G_TD_CLAMP="1" G_TP_PERSP="1" G_CYC_2CYCLE="1" G_PM_NPRIMITIVE="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_L" Sft="0" Length="32" G_AC_NONE="1" G_ZS_PIXEL="1" G_RM_FOG_SHADE_A="1" G_RM_AA_ZB_OPA_SURF2="1" />
+	<Texture S="65535" T="65535" Level="0" Tile="0" On="1"/>
+	<SetPrimColor M="0" L="0" R="255" G="255" B="247" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_wood b/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_wood
new file mode 100644
index 000000000..82b446f53
--- /dev/null
+++ b/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_wood
@@ -0,0 +1,12 @@
+<DisplayList Version="0">
+	<PipeSync/>
+	<SetCombineLERP A0="G_CCMUX_PRIMITIVE" B0="G_CCMUX_0" C0="G_CCMUX_SHADE" D0="G_CCMUX_0" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_1" A1="G_CCMUX_COMBINED" B1="G_CCMUX_0" C1="G_CCMUX_PRIMITIVE" D1="G_CCMUX_0" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_COMBINED"/>
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="1" G_CULL_BACK="1" G_FOG="1" G_LIGHTING="1" G_SHADING_SMOOTH="1"  />
+
+	<SetOtherMode Cmd="G_SETOTHERMODE_H" Sft="4" Length="20" G_AD_NOISE="1" G_CD_MAGICSQ="1" G_CK_NONE="1" G_TC_FILT="1" G_TF_BILERP="1" G_TL_TILE="1" G_TD_CLAMP="1" G_TP_PERSP="1" G_CYC_2CYCLE="1" G_PM_NPRIMITIVE="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_L" Sft="0" Length="32" G_AC_NONE="1" G_ZS_PIXEL="1" G_RM_FOG_SHADE_A="1" G_RM_AA_ZB_OPA_SURF2="1" />
+	<Texture S="65535" T="65535" Level="0" Tile="0" On="1"/>
+	<SetPrimColor M="0" L="0" R="255" G="205" B="0" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/soh_assets.h b/soh/assets/soh_assets.h
index 8765522b7..58fed005f 100644
--- a/soh/assets/soh_assets.h
+++ b/soh/assets/soh_assets.h
@@ -74,6 +74,9 @@ static const ALIGN_ASSET(2) char gTriforcePieceCompletedDL[] = dgTriforcePieceCo
 #define dgBossSoulSkullDL "__OTR__objects/object_boss_soul/gGIBossSoulSkullDL"
 static const ALIGN_ASSET(2) char gBossSoulSkullDL[] = dgBossSoulSkullDL;
 
+#define dgFishingPoleGiDL "__OTR__objects/object_gi_fishing_pole/gFishingPoleGiDL"
+static const ALIGN_ASSET(2) char gFishingPoleGiDL[] = dgFishingPoleGiDL;
+
 // overlays
 #define dgOptionsDividerChangeLangVtx "__OTR__overlays/ovl_file_choose/gOptionsDividerChangeLangVtx"
 static const ALIGN_ASSET(2) char gOptionsDividerChangeLangVtx[] = dgOptionsDividerChangeLangVtx;
diff --git a/soh/include/z64item.h b/soh/include/z64item.h
index 1fc919a45..92ce499ba 100644
--- a/soh/include/z64item.h
+++ b/soh/include/z64item.h
@@ -574,6 +574,7 @@ typedef enum {
     /* 0x7A */ GID_SONG_TIME,
     /* 0x7B */ GID_SONG_STORM,
     /* 0x7C */ GID_TRIFORCE_PIECE,
+    /*      */ GID_FISHING_POLE,
     /* 0x7C */ GID_MAXIMUM
 
 } GetItemDrawID;
diff --git a/soh/include/z64save.h b/soh/include/z64save.h
index 1e853568a..b0839b1d3 100644
--- a/soh/include/z64save.h
+++ b/soh/include/z64save.h
@@ -283,7 +283,7 @@ typedef struct {
     // #endregion
     // #region SOH [Randomizer]
     // Upstream TODO: Move these to their own struct or name to more obviously specific to Randomizer
-    /*        */ u16 randomizerInf[11];
+    /*        */ u16 randomizerInf[14];
     /*        */ u8 mqDungeonCount;
     /*        */ u16 adultTradeItems;
     /*        */ u8 triforcePiecesCollected;
@@ -326,6 +326,18 @@ typedef enum {
     /* 0x06 */ HS_DAMPE_RACE
 } HighScores;
 
+// the score value for the fishing minigame also stores many flags.
+#define HS_FISH_LENGTH_CHILD 0x7F       // mask for record length of catch as child.
+#define HS_FISH_LENGTH_ADULT 0x7F000000 // mask for record length of catch as adult.
+#define HS_FISH_PLAYED_CHILD 0x100      // set when first talking to owner as child
+#define HS_FISH_PLAYED_ADULT 0x200      // set when first talking to owner as adult
+#define HS_FISH_PRIZE_CHILD 0x400       // won the Piece of Heart
+#define HS_FISH_PRIZE_ADULT 0x800       // won the Golden Scale
+#define HS_FISH_STOLE_HAT 0x1000        // Pond owner is visibly bald as Adult Link.
+#define HS_FISH_CHEAT_CHILD 0x80        // used Sinking Lure as child to catch record fish
+#define HS_FISH_CHEAT_ADULT 0x80000000  // used Sinking Lure as adult to catch record fish
+#define HS_FISH_PLAYED 0x10000          // incremented for every play. controls weather.
+
 typedef enum {
     /* 0 */ SUNSSONG_INACTIVE,
     /* 1 */ SUNSSONG_START, // the suns ocarina effect signals that the song has finished playing
diff --git a/soh/soh/Enhancements/custom-message/CustomMessageTypes.h b/soh/soh/Enhancements/custom-message/CustomMessageTypes.h
index d8c66ce7d..64f2de063 100644
--- a/soh/soh/Enhancements/custom-message/CustomMessageTypes.h
+++ b/soh/soh/Enhancements/custom-message/CustomMessageTypes.h
@@ -135,6 +135,8 @@ typedef enum {
     TEXT_BEAN_SALESMAN_SET_A_BEAN_TO_C = 0x406A,
     TEXT_BEAN_SALESMAN_SOLD_OUT = 0x406B,
     TEXT_BEAN_SALESMAN_WANT_TO_PLANT = 0x406C,
+    TEXT_FISHING_POND_START = 0x407B,
+    TEXT_FISHING_POND_START_MET = 0x4093,
     TEXT_DAMPES_DIARY = 0x5003,
     TEXT_GRANNYS_SHOP = 0x500C,
     TEXT_ANJU_PLEASE_BRING_MY_CUCCOS_BACK = 0x5036,
diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp
index f90ab739c..468a46aca 100644
--- a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp
+++ b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp
@@ -1123,6 +1123,36 @@ void DrawFlagsTab() {
                     }
                 });
             }
+
+            // make some buttons to help with fishsanity debugging
+            uint8_t fsMode = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_FISHSANITY);
+            if (flagTable.flagTableType == RANDOMIZER_INF &&
+                fsMode != RO_FISHSANITY_OFF && fsMode != RO_FISHSANITY_OVERWORLD) {
+                if (ImGui::Button("Catch All (Child)")) {
+                    for (int k = RAND_INF_CHILD_FISH_1; k <= RAND_INF_CHILD_LOACH_2; k++) {
+                        Flags_SetRandomizerInf((RandomizerInf)k);
+                    }
+                }
+                ImGui::SameLine();
+                if (ImGui::Button("Uncatch All (Child)")) {
+                    for (int k = RAND_INF_CHILD_FISH_1; k <= RAND_INF_CHILD_LOACH_2; k++) {
+                        Flags_UnsetRandomizerInf((RandomizerInf)k);
+                    }
+                }
+
+                if (ImGui::Button("Catch All (Adult)")) {
+                    for (int k = RAND_INF_ADULT_FISH_1; k <= RAND_INF_ADULT_LOACH; k++) {
+                        Flags_SetRandomizerInf((RandomizerInf)k);
+                    }
+                }
+                ImGui::SameLine();
+                if (ImGui::Button("Uncatch All (Adult)")) {
+                    for (int k = RAND_INF_ADULT_FISH_1; k <= RAND_INF_ADULT_LOACH; k++) {
+                        Flags_UnsetRandomizerInf((RandomizerInf)k);
+                    }
+                }
+            }
+
             ImGui::TreePop();
         }
     }
diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.h b/soh/soh/Enhancements/debugger/debugSaveEditor.h
index dec733f3e..481d6c75d 100644
--- a/soh/soh/Enhancements/debugger/debugSaveEditor.h
+++ b/soh/soh/Enhancements/debugger/debugSaveEditor.h
@@ -348,7 +348,7 @@ const std::vector<FlagTable> flagTables = {
         { 0x24, "Market Crowd Text Randomizer" },
         { 0x30, "Entered the Market" },
     } },
-    { "Randomizer Inf Flags", RANDOMIZER_INF, 0x0A, {
+   { "Randomizer Inf Flags", RANDOMIZER_INF, 13, {
         { RAND_INF_DUNGEONS_DONE_DEKU_TREE, "DUNGEONS_DONE_DEKU_TREE" },
         { RAND_INF_DUNGEONS_DONE_DODONGOS_CAVERN, "DUNGEONS_DONE_DODONGOS_CAVERN" },
         { RAND_INF_DUNGEONS_DONE_JABU_JABUS_BELLY, "DUNGEONS_DONE_JABU_JABUS_BELLY" },
@@ -517,11 +517,54 @@ const std::vector<FlagTable> flagTables = {
         { RAND_INF_GANON_SOUL, "RAND_INF_GANON_SOUL" },
         { RAND_INF_GRANT_GANONS_BOSSKEY, "RAND_INF_GRANT_GANONS_BOSSKEY" },
 
-        { RAND_INF_HAS_OCARINA_A, "RAND_INF_HAS_OCARINA_A"},
-        { RAND_INF_HAS_OCARINA_C_UP, "RAND_INF_HAS_OCARINA_C_UP" },
-        { RAND_INF_HAS_OCARINA_C_DOWN, "RAND_INF_HAS_OCARINA_C_DOWN" },
-        { RAND_INF_HAS_OCARINA_C_LEFT, "RAND_INF_HAS_OCARINA_C_LEFT"},
-        { RAND_INF_HAS_OCARINA_C_RIGHT, "RAND_INF_HAS_OCARINA_C_RIGHT"},
+        { RAND_INF_CHILD_FISH_1, "RAND_INF_CHILD_FISH_1" },
+        { RAND_INF_CHILD_FISH_2, "RAND_INF_CHILD_FISH_2" },
+        { RAND_INF_CHILD_FISH_3, "RAND_INF_CHILD_FISH_3" },
+        { RAND_INF_CHILD_FISH_4, "RAND_INF_CHILD_FISH_4" },
+        { RAND_INF_CHILD_FISH_5, "RAND_INF_CHILD_FISH_5" },
+        { RAND_INF_CHILD_FISH_6, "RAND_INF_CHILD_FISH_6" },
+        { RAND_INF_CHILD_FISH_7, "RAND_INF_CHILD_FISH_7" },
+        { RAND_INF_CHILD_FISH_8, "RAND_INF_CHILD_FISH_8" },
+        { RAND_INF_CHILD_FISH_9, "RAND_INF_CHILD_FISH_9" },
+        { RAND_INF_CHILD_FISH_10, "RAND_INF_CHILD_FISH_10" },
+        { RAND_INF_CHILD_FISH_11, "RAND_INF_CHILD_FISH_11" },
+        { RAND_INF_CHILD_FISH_12, "RAND_INF_CHILD_FISH_12" },
+        { RAND_INF_CHILD_FISH_13, "RAND_INF_CHILD_FISH_13" },
+        { RAND_INF_CHILD_FISH_14, "RAND_INF_CHILD_FISH_14" },
+        { RAND_INF_CHILD_FISH_15, "RAND_INF_CHILD_FISH_15" },
+        { RAND_INF_CHILD_LOACH_1, "RAND_INF_CHILD_LOACH_1" },
+        { RAND_INF_CHILD_LOACH_2, "RAND_INF_CHILD_LOACH_2" },
+        { RAND_INF_ADULT_FISH_1, "RAND_INF_ADULT_FISH_1" },
+        { RAND_INF_ADULT_FISH_2, "RAND_INF_ADULT_FISH_2" },
+        { RAND_INF_ADULT_FISH_3, "RAND_INF_ADULT_FISH_3" },
+        { RAND_INF_ADULT_FISH_4, "RAND_INF_ADULT_FISH_4" },
+        { RAND_INF_ADULT_FISH_5, "RAND_INF_ADULT_FISH_5" },
+        { RAND_INF_ADULT_FISH_6, "RAND_INF_ADULT_FISH_6" },
+        { RAND_INF_ADULT_FISH_7, "RAND_INF_ADULT_FISH_7" },
+        { RAND_INF_ADULT_FISH_8, "RAND_INF_ADULT_FISH_8" },
+        { RAND_INF_ADULT_FISH_9, "RAND_INF_ADULT_FISH_9" },
+        { RAND_INF_ADULT_FISH_10, "RAND_INF_ADULT_FISH_10" },
+        { RAND_INF_ADULT_FISH_11, "RAND_INF_ADULT_FISH_11" },
+        { RAND_INF_ADULT_FISH_12, "RAND_INF_ADULT_FISH_12" },
+        { RAND_INF_ADULT_FISH_13, "RAND_INF_ADULT_FISH_13" },
+        { RAND_INF_ADULT_FISH_14, "RAND_INF_ADULT_FISH_14" },
+        { RAND_INF_ADULT_FISH_15, "RAND_INF_ADULT_FISH_15" },
+        { RAND_INF_ADULT_LOACH, "RAND_INF_ADULT_LOACH" },
+        { RAND_INF_GROTTO_FISH_ZR_OPEN_GROTTO, "RAND_INF_GROTTO_FISH_ZR_OPEN_GROTTO" },
+        { RAND_INF_GROTTO_FISH_DMC_UPPER_GROTTO, "RAND_INF_GROTTO_FISH_DMC_UPPER_GROTTO" },
+        { RAND_INF_GROTTO_FISH_DMT_STORMS_GROTTO, "RAND_INF_GROTTO_FISH_DMT_STORMS_GROTTO" },
+        { RAND_INF_GROTTO_FISH_KAK_OPEN_GROTTO, "RAND_INF_GROTTO_FISH_KAK_OPEN_GROTTO" },
+        { RAND_INF_GROTTO_FISH_HF_NEAR_MARKET_GROTTO, "RAND_INF_GROTTO_FISH_HF_NEAR_MARKET_GROTTO" },
+        { RAND_INF_GROTTO_FISH_HF_OPEN_GROTTO, "RAND_INF_GROTTO_FISH_HF_OPEN_GROTTO" },
+        { RAND_INF_GROTTO_FISH_HF_SOUTHEAST_GROTTO, "RAND_INF_GROTTO_FISH_HF_SOUTHEAST_GROTTO" },
+        { RAND_INF_GROTTO_FISH_LW_NEAR_SHORTCUTS_GROTTO, "RAND_INF_GROTTO_FISH_LW_NEAR_SHORTCUTS_GROTTO" },
+        { RAND_INF_GROTTO_FISH_KF_STORMS_GROTTO, "RAND_INF_GROTTO_FISH_KF_STORMS_GROTTO" },
+        { RAND_INF_FISHING_POLE_FOUND, "RAND_INF_FISHING_POLE_FOUND" },
+        { RAND_INF_ZD_FISH_1, "RAND_INF_ZD_FISH_1" },
+        { RAND_INF_ZD_FISH_2, "RAND_INF_ZD_FISH_2" },
+        { RAND_INF_ZD_FISH_3, "RAND_INF_ZD_FISH_3" },
+        { RAND_INF_ZD_FISH_4, "RAND_INF_ZD_FISH_4" },
+        { RAND_INF_ZD_FISH_5, "RAND_INF_ZD_FISH_5" }
     } },
 };
 
diff --git a/soh/soh/Enhancements/mods.cpp b/soh/soh/Enhancements/mods.cpp
index e6e0aa561..d08a9a575 100644
--- a/soh/soh/Enhancements/mods.cpp
+++ b/soh/soh/Enhancements/mods.cpp
@@ -6,6 +6,7 @@
 #include "soh/Enhancements/boss-rush/BossRushTypes.h"
 #include "soh/Enhancements/enhancementTypes.h"
 #include "soh/Enhancements/randomizer/3drando/random.hpp"
+#include "soh/Enhancements/randomizer/fishsanity.h"
 #include "soh/Enhancements/cosmetics/authenticGfxPatches.h"
 #include <soh/Enhancements/item-tables/ItemTableManager.h>
 #include "soh/Enhancements/nametag.h"
@@ -23,6 +24,7 @@
 #include "src/overlays/actors/ovl_En_Tp/z_en_tp.h"
 #include "src/overlays/actors/ovl_En_Firefly/z_en_firefly.h"
 #include "src/overlays/actors/ovl_En_Xc/z_en_xc.h"
+#include "src/overlays//actors/ovl_Fishing/z_fishing.h"
 
 extern "C" {
 #include <z64.h>
@@ -1282,6 +1284,156 @@ void RegisterToTMedallions() {
     });
 }
 
+void RegisterFishsanity() {
+    static s16 fishGroupCounter = 0;
+
+    // Initialization on load
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnLoadGame>([](int32_t fileNum) {
+        if (!IS_RANDO) {
+            return;
+        }
+        OTRGlobals::Instance->gRandoContext->GetFishsanity()->InitializeFromSave();
+    });
+
+    // Initialize actors for fishsanity
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorInit>([](void* refActor) {
+        if (!IS_RANDO) {
+            return;
+        }
+
+        Actor* actor = static_cast<Actor*>(refActor);
+        auto fs = OTRGlobals::Instance->gRandoContext->GetFishsanity();
+        FishIdentity fish;
+
+        if (actor->id == ACTOR_EN_FISH && fs->GetOverworldFishShuffled()) {
+            // Set fish ID for ZD fish
+            if (gPlayState->sceneNum == SCENE_ZORAS_DOMAIN && actor->params == -1) {
+                actor->params ^= fishGroupCounter++;
+            }
+
+            fish = OTRGlobals::Instance->gRandomizer->IdentifyFish(gPlayState->sceneNum, actor->params);
+            // Create effect for uncaught fish
+            if (Rando::Fishsanity::IsFish(&fish) && !Flags_GetRandomizerInf(fish.randomizerInf)) {
+                actor->shape.shadowDraw = Fishsanity_DrawEffShadow;
+            }
+            return;
+        }
+
+        if (actor->id == ACTOR_FISHING && gPlayState->sceneNum == SCENE_FISHING_POND && actor->params >= 100 &&
+            actor->params <= 117 && fs->GetPondFishShuffled()) {
+            // Initialize pond fish for fishsanity
+            // Initialize fishsanity metadata on this actor
+            Fishing* fishActor = static_cast<Fishing*>(refActor);
+            fishActor->fishsanityParams = actor->params;
+            fish = OTRGlobals::Instance->gRandomizer->IdentifyFish(gPlayState->sceneNum, actor->params);
+
+            // With every pond fish shuffled, caught fish will not spawn unless all fish have been caught.
+            if (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_FISHSANITY_POND_COUNT) > 16 &&
+                !fs->GetPondCleared()) {
+                // Create effect for uncaught fish
+                if (!Flags_GetRandomizerInf(fish.randomizerInf)) {
+                    actor->shape.shadowDraw = Fishsanity_DrawEffShadow;
+                }
+            }
+        }
+
+    });
+
+    // Update fishsanity when a fish is caught
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnFlagSet>([](int16_t flagType, int16_t flag) {
+        if (!IS_RANDO || flagType != FLAG_RANDOMIZER_INF) {
+            return;
+        }
+        RandomizerCheck rc = OTRGlobals::Instance->gRandomizer->GetCheckFromRandomizerInf((RandomizerInf)flag);
+        FishsanityCheckType fsType = Rando::Fishsanity::GetCheckType(rc);
+        if (fsType == FSC_NONE) {
+            return;
+        }
+
+        // When a pond fish is caught, advance the pond.
+        if (fsType == FSC_POND) {
+            OTRGlobals::Instance->gRandoContext->GetFishsanity()->AdvancePond();
+        }
+    });
+
+    // Award fishing pond checks
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnPlayerUpdate>([]() {
+        if (!IS_RANDO || GameInteractor::IsGameplayPaused() || !gPlayState) {
+            return;
+        }
+
+        Player* player = GET_PLAYER(gPlayState);
+        if (Player_InBlockingCsMode(gPlayState, player)) {
+            return;
+        }
+
+        auto fs = OTRGlobals::Instance->gRandoContext->GetFishsanity();
+        if (!fs->GetPondFishShuffled()) {
+            return;
+        }
+
+        FishIdentity pending = fs->GetPendingFish();
+        if (!Rando::Fishsanity::IsFish(&pending)) { // No fish currently pending
+            return;
+        }
+
+        // Award fish
+        GetItemEntry gi = OTRGlobals::Instance->gRandomizer->GetItemFromKnownCheck(pending.randomizerCheck, GI_NONE);
+        Flags_SetRandomizerInf(pending.randomizerInf);
+        GiveItemEntryWithoutActor(gPlayState, gi);
+        fs->SetPendingFish(NULL);
+    });
+
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* refActor) {
+        if (!IS_RANDO || (gPlayState->sceneNum != SCENE_GROTTOS && gPlayState->sceneNum != SCENE_ZORAS_DOMAIN && gPlayState->sceneNum != SCENE_FISHING_POND)) {
+            return;
+        }
+
+        Actor* actor = static_cast<Actor*>(refActor);
+        auto fs = OTRGlobals::Instance->gRandoContext->GetFishsanity();
+
+        // Detect fish catch
+        if (actor->id == ACTOR_FISHING && fs->GetPondFishShuffled()) {
+            Fishing* fish = static_cast<Fishing*>(refActor);
+
+            // State 6 -> Fish caught and hoisted
+            FishIdentity pending = fs->GetPendingFish();
+            if (fish->fishState == 6 && !Rando::Fishsanity::IsFish(&pending)) {
+                pending = OTRGlobals::Instance->gRandomizer->IdentifyFish(gPlayState->sceneNum, fish->fishsanityParams);
+                if (!Flags_GetRandomizerInf(pending.randomizerInf)) {
+                    fs->SetPendingFish(&pending);
+                    // Remove uncaught effect
+                    if (actor->shape.shadowDraw != NULL) {
+                        actor->shape.shadowDraw = NULL;
+                    }
+                }
+            }
+        }
+
+        if (actor->id == ACTOR_EN_FISH && fs->GetOverworldFishShuffled()) {
+            FishIdentity fish = OTRGlobals::Instance->gRandomizer->IdentifyFish(gPlayState->sceneNum, actor->params);
+            if (Rando::Fishsanity::IsFish(&fish) && Flags_GetRandomizerInf(fish.randomizerInf)) {
+                // Remove uncaught effect
+                if (actor->shape.shadowDraw != NULL) {
+                    actor->shape.shadowDraw = NULL;
+                }
+            }
+        }
+
+        // Reset fish group counter when the group gets culled
+        if (actor->id == ACTOR_OBJ_MURE && gPlayState->sceneNum == SCENE_ZORAS_DOMAIN && fishGroupCounter > 0 &&
+            !(actor->flags & ACTOR_FLAG_UPDATE_WHILE_CULLED) && fs->GetOverworldFishShuffled()) {
+            fishGroupCounter = 0;
+        }
+    });
+
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>([](int16_t sceneNum) {
+        if (!IS_RANDO || sceneNum != SCENE_ZORAS_DOMAIN)
+            return;
+        fishGroupCounter = 0;
+    });
+}
+
 void InitMods() {
     RegisterTTS();
     RegisterInfiniteMoney();
@@ -1315,5 +1467,6 @@ void InitMods() {
     RegisterBossSouls();
     RegisterRandomizedEnemySizes();
     RegisterToTMedallions();
+    RegisterFishsanity();
     NameTag_RegisterHooks();
 }
diff --git a/soh/soh/Enhancements/presets.h b/soh/soh/Enhancements/presets.h
index d7efeb4f3..01a7d8024 100644
--- a/soh/soh/Enhancements/presets.h
+++ b/soh/soh/Enhancements/presets.h
@@ -122,6 +122,8 @@ const std::vector<const char*> enhancementsCvars = {
     "gInstantFishing",
     "gGuaranteeFishingBite",
     "gFishNeverEscape",
+    "gLoachesAlwaysAppear",
+    "gSkipKeepConfirmation",
     "gChildMinimumWeightFish",
     "gAdultMinimumWeightFish",
     "gLowHpAlarm",
@@ -341,6 +343,10 @@ const std::vector<const char*> randomizerCvars = {
     "gRandomizeExcludedLocations",
     "gRandomizeForest",
     "gRandomizeFullWallets",
+    "gRandomizeFishingPoleHint",
+    "gRandomizeFishsanity",
+    "gRandomizeFishsanityPondCount",
+    "gRandomizeFishsanityAgeSplit",
     "gRandomizeGanonTrial",
     "gRandomizeGanonTrialCount",
     "gRandomizeGerudoFortress",
@@ -382,6 +388,7 @@ const std::vector<const char*> randomizerCvars = {
     "gRandomizeShuffleCows",
     "gRandomizeShuffleDungeonReward",
     "gRandomizeShuffleDungeonsEntrances",
+    "gRandomizeShuffleFishingPole",
     "gRandomizeShuffleFrogSongRupees",
     "gRandomizeShuffleGanonBossKey",
     "gRandomizeShuffleGerudoToken",
diff --git a/soh/soh/Enhancements/randomizer/3drando/category.hpp b/soh/soh/Enhancements/randomizer/3drando/category.hpp
index f43b3ccba..8916f53df 100644
--- a/soh/soh/Enhancements/randomizer/3drando/category.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/category.hpp
@@ -9,6 +9,7 @@ enum class Category {
     cSong,
     cSongDungeonReward,
     cCow,
+    cFish,
     cShop,
     cMerchant,
     cVanillaSmallKey,
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
index 6540e18a4..c6269d5de 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
@@ -3127,6 +3127,24 @@ void HintTable_Init() {
         "# bei sich haben und Dich neugierig beobachten..."
     }});
 
+    hintTable[RHT_FISHING_POLE_HINT01] = HintText::OtherHint({
+        // obscure text
+        Text{"^If I remember correctly, I lost it somewhere in %r",
+        /*french*/
+        "",
+        /*spanish*/
+        "" }
+    });
+
+    hintTable[RHT_FISHING_POLE_HINT02] = HintText::OtherHint({
+        // obscure text
+        Text{"%w...&Let me know if you find it!",
+        /*french*/
+        "",
+        /*spanish*/
+        "" }
+    });
+
     /*--------------------------
     |      GANON LINE TEXT     |
     ---------------------------*/
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_overworld.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_overworld.cpp
index 5e5a003ec..026514441 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_overworld.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_overworld.cpp
@@ -1,4 +1,5 @@
 #include "../hint_list.hpp"
+#include <soh/Enhancements/randomizer/static_data.h>
 
 void HintTable_Init_Exclude_Overworld() {
     hintTable[RHT_KF_KOKIRI_SWORD_CHEST] = HintText::Exclude({
@@ -91,46 +92,91 @@ void HintTable_Init_Exclude_Overworld() {
                        Text{"a #hole in a field near a drawbridge# holds", /*french*/"la #grotte près d'un pont# contient", /*spanish*/"bajo el #hoyo de una llanura cercano a un puente# yace"},
   });
 
+    hintTable[RHT_HF_NEAR_MARKET_GROTTO_FISH] = HintText::Exclude({
+                       //obscure text
+                       Text{"a #fish in a hole in a field near a drawbridge# holds", /*french*/"la #grotte près d'un pont# contient", /*spanish*/"bajo el #hoyo de una llanura cercano a un puente# yace"},
+  });
+
     hintTable[RHT_HF_SOUTHEAST_GROTTO_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #hole amongst trees in a field# holds", /*french*/"la #grotte près des arbres# contient", /*spanish*/"bajo el #hoyo de una llanura rodeado de árboles# yace"},
   });
+    
+    hintTable[RHT_HF_SOUTHEAST_GROTTO_FISH] = HintText::Exclude({
+                       //obscure text
+                       Text{"a #fish in a hole amongst trees in a field# holds", /*french*/"la #grotte près des arbres# contient", /*spanish*/"bajo el #hoyo de una llanura rodeado de árboles# yace"},
+  });
 
     hintTable[RHT_HF_OPEN_GROTTO_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"an #open hole in a field# holds", /*french*/"la #grotte dans les plaines# contient", /*spanish*/"bajo el #hoyo descubierto de una llanura# yace"},
   });
 
+    hintTable[RHT_HF_OPEN_GROTTO_FISH] = HintText::Exclude({
+                       //obscure text
+                       Text{"a #fish in an open hole in a field# holds", /*french*/"la #grotte dans les plaines# contient", /*spanish*/"bajo el #hoyo descubierto de una llanura# yace"},
+  });
+
     hintTable[RHT_KAK_OPEN_GROTTO_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"an #open hole in a town# holds", /*french*/"la #grotte dans le village# contient", /*spanish*/"bajo el #hoyo descubierto de un pueblo# yace"},
   });
 
+    hintTable[RHT_KAK_OPEN_GROTTO_FISH] = HintText::Exclude({
+                       //obscure text
+                       Text{"a #fish in an open hole in a town# holds", /*french*/"la #grotte dans le village# contient", /*spanish*/"bajo el #hoyo descubierto de un pueblo# yace"},
+  });
+
     hintTable[RHT_ZR_OPEN_GROTTO_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #hole along a river# holds", /*french*/"la #grotte près du fleuve# contient", /*spanish*/"bajo un #hoyo junto a un río# yace"},
   });
 
+    hintTable[RHT_ZR_OPEN_GROTTO_FISH] = HintText::Exclude({
+                       //obscure text
+                       Text{"a #fish in a hole along a river# holds", /*french*/"la #grotte près du fleuve# contient", /*spanish*/"bajo un #hoyo junto a un río# yace"},
+  });
+
     hintTable[RHT_KF_STORMS_GROTTO_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #hole in a forest village# holds", /*french*/"la #grotte inondée de pluie dans le Village Kokiri# révèle", /*spanish*/"bajo el #hoyo de una tribu del bosque# yace"},
   });
 
+    hintTable[RHT_KF_STORMS_GROTTO_FISH] = HintText::Exclude({
+                       //obscure text
+                       Text{"a #fish in a hole in a forest village# holds", /*french*/"la #grotte inondée de pluie dans le Village Kokiri# révèle", /*spanish*/"bajo el #hoyo de una tribu del bosque# yace"},
+  });
+
     hintTable[RHT_LW_NEAR_SHORTCUTS_GROTTO_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #hole in a wooded maze# holds", /*french*/"la #grotte dans le labyrinthe sylvestre# contient", /*spanish*/"bajo un #hoyo de un laberinto forestal# yace"},
   });
 
+    hintTable[RHT_LW_NEAR_SHORTCUTS_GROTTO_FISH] = HintText::Exclude({
+                       //obscure text
+                       Text{"a #fish in a hole in a wooded maze# holds", /*french*/"la #grotte dans le labyrinthe sylvestre# contient", /*spanish*/"bajo un #hoyo de un laberinto forestal# yace"},
+  });
+
     hintTable[RHT_DMT_STORMS_GROTTO_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"#hole flooded with rain on a mountain# holds", /*french*/"la #grotte inondée de pluie sur la montagne# contient", /*spanish*/"bajo un #hoyo de una montaña inundado de lluvia# yace"},
   });
 
+    hintTable[RHT_DMT_STORMS_GROTTO_FISH] = HintText::Exclude({
+                       //obscure text
+                       Text{"#fish in a hole flooded with rain on a mountain# holds", /*french*/"la #grotte inondée de pluie sur la montagne# contient", /*spanish*/"bajo un #hoyo de una montaña inundado de lluvia# yace"},
+  });
+
     hintTable[RHT_DMC_UPPER_GROTTO_CHEST] = HintText::Exclude({
                        //obscure text
                        Text{"a #hole in a volcano# holds", /*french*/"la #grotte dans le volcan# contient", /*spanish*/"bajo el #hoyo de un volcán# yace"},
   });
 
+    hintTable[RHT_DMC_UPPER_GROTTO_FISH] = HintText::Exclude({
+                       //obscure text
+                       Text{"a #fish in a hole in a volcano# holds", /*french*/"la #grotte dans le volcan# contient", /*spanish*/"bajo el #hoyo de un volcán# yace"},
+  });
+
     hintTable[RHT_TOT_MASTER_SWORD] = HintText::Exclude({
                        //obscure text
                        Text{"a #pedestal in a temple# holds", /*french*/"un #piédestal dans un temple# contient", /*spanish*/"un #pedestal en un templo# sostiene"},
@@ -225,6 +271,27 @@ void HintTable_Init_Exclude_Overworld() {
                        Text{"#fishing in youth# bestows", /*french*/"#pêcher dans sa jeunesse# promet", /*spanish*/"#pescar en la juventud# conduce a"},
   });
 
+    // TODO: needs french + spanish translation
+    hintTable[RHT_LH_POND_FISH] = HintText::Exclude({
+                       //obscure text
+                       Text{"#hitting the pond# reveals", /*french*/ "", /*spanish*/ ""},
+                       {},
+                       //clear text
+                       Text{"#the fishing pond's bounty# includes", /*french*/ "", /*spanish*/ ""}
+    });
+
+    // TODO: needs french translation
+    hintTable[RHT_LH_HYRULE_LOACH] = HintText::Exclude(
+        {
+            // obscure text
+            Text{ "#fishing the legend# bestows", /*french*/ "!!!", /*spanish*/ "#pescar a la leyenda# conduce a" },
+        },
+        {},
+        // clear text
+        Text{ "#fishing the hyrule loach# will give you", /*french*/ "!!!",
+              /*spanish*/ "si #pescas a la Locha de Hyrule# encontrarás" });
+
+
     hintTable[RHT_LH_ADULT_FISHING] = HintText::Exclude({
                        //obscure text
                        Text{"#fishing in maturity# bestows", /*french*/"#pêcher dans sa maturité# promet", /*spanish*/"#pescar en la madurez# conduce a"},
@@ -235,6 +302,12 @@ void HintTable_Init_Exclude_Overworld() {
                        Text{"a #diving experiment# is rewarded with", /*french*/"l'#expérience de plongée# donne", /*spanish*/"#bucear para un experimento# se premia con"},
   });
 
+    // TODO: needs translation
+    hintTable[RHT_ZD_FISH] = HintText::Exclude({
+        // obscure text
+        Text{"a #fish by a waterfall# hoards", /*french*/"", /*spanish*/""}
+    });
+
     hintTable[RHT_GC_ROLLING_GORON_AS_ADULT] = HintText::Exclude({
                        //obscure text
                        Text{"#comforting yourself# provides", /*french*/"se #réconforter soi-même# donne", /*spanish*/"#confrontarte a ti mismo# otorga"},
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp
index d2c59c01d..be20b95a3 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp
@@ -2102,6 +2102,17 @@ void HintTable_Init_Item() {
                       Text{"an Ocarina C Right Button", /*french*/"la Touche C-Droit de l'Ocarina", /*spanish*/"un botón C derecho de Ocarina"}}
      );
 
+    hintTable[RHT_FISHING_POLE] = HintText::Item({
+                       //obscure text
+                       Text{"a fish-puller", /*french*/"(canne à pêche)", /*spanish*/"(caña de pescar)"},
+                     }, {
+                       //ambiguous text
+                       Text{"the pond owner's property", /*french*/"(canne à pêche)", /*spanish*/"(caña de pescar)"},
+                     },
+                       //clear text
+                       Text{"a fishing pole", /*french*/"canne à pêche", /*spanish*/"caña de pescar"}
+    );
+
     hintTable[RHT_EPONA] = HintText::Item({
                        //obscure text
                        Text{"a horse",              /*french*/"un fidèle destrier", /*spanish*/"una yegua"},
diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.cpp b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
index aa1112764..c55655de0 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hints.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
@@ -1105,6 +1105,7 @@ void CreateAllHints(){
   CreateSpecialItemHint(RG_PROGRESSIVE_HOOKSHOT, RH_DAMPES_DIARY, {RC_DAMPE_HINT}, RHT_DAMPE_DIARY01, RHT_DAMPE_DIARY02, (bool)ctx->GetOption(RSK_DAMPES_DIARY_HINT));
   CreateSpecialItemHint(RG_GREG_RUPEE, RH_GREG_RUPEE, {RC_GREG_HINT}, RHT_GREG_HINT01, RHT_GREG_HINT02, (bool)ctx->GetOption(RSK_GREG_HINT));
   CreateSpecialItemHint(RG_PROGRESSIVE_MAGIC_METER, RH_SARIA, {RC_SARIA_SONG_HINT, RC_SONG_FROM_SARIA}, RHT_SARIA_TEXT01, RHT_SARIA_TEXT02, (bool)ctx->GetOption(RSK_SARIA_HINT));
+  CreateSpecialItemHint(RG_FISHING_POLE, RH_FISHING_POLE, {RC_FISHING_POLE_HINT}, RHT_FISHING_POLE_HINT01, RHT_FISHING_POLE_HINT02, (bool)ctx->GetOption(RSK_FISHING_POLE_HINT));
 
   if (ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ON_HINT)) {
     CreateMerchantsHints();
diff --git a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
index c4fad91eb..7acb68949 100644
--- a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
@@ -574,6 +574,13 @@ static void PlaceVanillaCowMilk() {
   }
 }
 
+static void PlaceVanillaOverworldFish() {
+  auto ctx = Rando::Context::GetInstance();
+  for (auto rc : Rando::StaticData::overworldFishLocations) {
+    ctx->PlaceItemInLocation(rc, RG_FISH, false, true);
+  }
+}
+
 static void SetScarceItemPool() {
   ReplaceMaxItem(RG_PROGRESSIVE_BOMBCHUS, 3);
   ReplaceMaxItem(RG_BOMBCHU_5, 1);
@@ -751,6 +758,40 @@ void GenerateItemPool() {
     PlaceVanillaCowMilk();
   }
 
+  auto fsMode = ctx->GetOption(RSK_FISHSANITY);
+  if (fsMode.IsNot(RO_FISHSANITY_OFF)) {
+    if (fsMode.Is(RO_FISHSANITY_POND) || fsMode.Is(RO_FISHSANITY_BOTH)) {
+      // 17 max child pond fish
+      uint8_t pondCt = ctx->GetOption(RSK_FISHSANITY_POND_COUNT).GetSelectedOptionIndex();
+      for (uint8_t i = 0; i < pondCt; i++) {
+        AddItemToMainPool(GetJunkItem());
+      }
+
+      if (ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT)) {
+        // 16 max adult pond fish, have to reduce to 16 if every fish is enabled
+        if (pondCt > 16)
+            pondCt = 16;
+        for (uint8_t i = 0; i < pondCt; i++) {
+            AddItemToMainPool(GetJunkItem());
+        }
+      }
+    }
+    // 9 grotto fish, 5 zora's domain fish
+    if (fsMode.Is(RO_FISHSANITY_OVERWORLD) || fsMode.Is(RO_FISHSANITY_BOTH)) {
+      for (uint8_t i = 0; i < Rando::StaticData::overworldFishLocations.size(); i++)
+        AddItemToMainPool(GetJunkItem());
+    } else {
+      PlaceVanillaOverworldFish();
+    }
+  } else {
+    PlaceVanillaOverworldFish();
+  }
+
+  if (ctx->GetOption(RSK_SHUFFLE_FISHING_POLE)) {
+    AddItemToMainPool(RG_FISHING_POLE);
+    ctx->possibleIceTrapModels.push_back(RG_FISHING_POLE);
+  }
+
   if (ctx->GetOption(RSK_SHUFFLE_MAGIC_BEANS)) {
     AddItemToMainPool(RG_MAGIC_BEAN_PACK);
     if (ctx->GetOption(RSK_ITEM_POOL).Is(RO_ITEM_POOL_PLENTIFUL)) {
@@ -971,6 +1012,10 @@ void GenerateItemPool() {
       AddItemToPool(PendingJunkPool, RG_GERUDO_MEMBERSHIP_CARD);
     }
 
+    if (ctx->GetOption(RSK_SHUFFLE_FISHING_POLE)) {
+      AddItemToPool(PendingJunkPool, RG_FISHING_POLE);
+    }
+
     //Plentiful small keys
     if (ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_ANYWHERE) || ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_ANY_DUNGEON) || ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_OVERWORLD)) {
       if (ctx->GetDungeon(Rando::BOTTOM_OF_THE_WELL)->HasKeyRing()) {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
index 213b04695..af1400eb9 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
@@ -62,6 +62,7 @@ void AreaTable_Init_DeathMountain() {
   areaTable[RR_DMT_STORMS_GROTTO] = Area("DMT Storms Grotto", "DMT Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LocationAccess(RC_DMT_STORMS_GROTTO_CHEST,        {[]{return true;}}),
+                  LocationAccess(RC_DMT_STORMS_GROTTO_FISH,         {[]{return logic->HasBottle;}}),
                   LocationAccess(RC_DMT_STORMS_GROTTO_GOSSIP_STONE, {[]{return true;}}),
                 }, {
                   //Exits
@@ -241,6 +242,7 @@ void AreaTable_Init_DeathMountain() {
   areaTable[RR_DMC_UPPER_GROTTO] = Area("DMC Upper Grotto", "DMC Upper Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LocationAccess(RC_DMC_UPPER_GROTTO_CHEST,        {[]{return true;}}),
+                  LocationAccess(RC_DMC_UPPER_GROTTO_FISH,         {[]{return logic->HasBottle;}}),
                   LocationAccess(RC_DMC_UPPER_GROTTO_GOSSIP_STONE, {[]{return true;}}),
                 }, {
                   //Exits
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
index 61dc34ed0..258ffd8d6 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
@@ -33,6 +33,7 @@ void AreaTable_Init_HyruleField() {
   areaTable[RR_HF_SOUTHEAST_GROTTO] = Area("HF Southeast Grotto", "HF Southeast Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LocationAccess(RC_HF_SOUTHEAST_GROTTO_CHEST,        {[]{return true;}}),
+                  LocationAccess(RC_HF_SOUTHEAST_GROTTO_FISH,         {[]{return logic->HasBottle;}}),
                   LocationAccess(RC_HF_SOUTHEAST_GOSSIP_STONE, {[]{return true;}}),
                 }, {
                   //Exits
@@ -42,6 +43,7 @@ void AreaTable_Init_HyruleField() {
   areaTable[RR_HF_OPEN_GROTTO] = Area("HF Open Grotto", "HF Open Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LocationAccess(RC_HF_OPEN_GROTTO_CHEST,        {[]{return true;}}),
+                  LocationAccess(RC_HF_OPEN_GROTTO_FISH,         {[]{return logic->HasBottle;}}),
                   LocationAccess(RC_HF_OPEN_GROTTO_GOSSIP_STONE, {[]{return true;}}),
                 }, {
                   //Exits
@@ -69,6 +71,7 @@ void AreaTable_Init_HyruleField() {
   areaTable[RR_HF_NEAR_MARKET_GROTTO] = Area("HF Near Market Grotto", "HF Near Market Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LocationAccess(RC_HF_NEAR_MARKET_GROTTO_CHEST,        {[]{return true;}}),
+                  LocationAccess(RC_HF_NEAR_MARKET_GROTTO_FISH,         {[]{return logic->HasBottle;}}),
                   LocationAccess(RC_HF_NEAR_MARKET_GOSSIP_STONE, {[]{return true;}}),
                 }, {
                   //Exits
@@ -154,10 +157,45 @@ void AreaTable_Init_HyruleField() {
                   Entrance(RR_LAKE_HYLIA, {[]{return true;}}),
   });
 
+  // TODO: should some of these helpers be done via events instead?
   areaTable[RR_LH_FISHING_HOLE] = Area("LH Fishing Hole", "LH Fishing Hole", RA_NONE, DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_LH_CHILD_FISHING, {[]{return logic->IsChild;}}),
-                  LocationAccess(RC_LH_ADULT_FISHING, {[]{return logic->IsAdult;}}),
+                  LocationAccess(RC_LH_CHILD_FISHING, {[]{return logic->CanFish && logic->IsChild;}}),
+                  LocationAccess(RC_LH_CHILD_FISH_1,  {[]{return logic->CanGetChildFish;}}),
+                  LocationAccess(RC_LH_CHILD_FISH_2,  {[]{return logic->CanGetChildFish;}}),
+                  LocationAccess(RC_LH_CHILD_FISH_3,  {[]{return logic->CanGetChildFish;}}),
+                  LocationAccess(RC_LH_CHILD_FISH_4,  {[]{return logic->CanGetChildFish;}}),
+                  LocationAccess(RC_LH_CHILD_FISH_5,  {[]{return logic->CanGetChildFish;}}),
+                  LocationAccess(RC_LH_CHILD_FISH_6,  {[]{return logic->CanGetChildFish;}}),
+                  LocationAccess(RC_LH_CHILD_FISH_7,  {[]{return logic->CanGetChildFish;}}),
+                  LocationAccess(RC_LH_CHILD_FISH_8,  {[]{return logic->CanGetChildFish;}}),
+                  LocationAccess(RC_LH_CHILD_FISH_9,  {[]{return logic->CanGetChildFish;}}),
+                  LocationAccess(RC_LH_CHILD_FISH_10, {[]{return logic->CanGetChildFish;}}),
+                  LocationAccess(RC_LH_CHILD_FISH_11, {[]{return logic->CanGetChildFish;}}),
+                  LocationAccess(RC_LH_CHILD_FISH_12, {[]{return logic->CanGetChildFish;}}),
+                  LocationAccess(RC_LH_CHILD_FISH_13, {[]{return logic->CanGetChildFish;}}),
+                  LocationAccess(RC_LH_CHILD_FISH_14, {[]{return logic->CanGetChildFish;}}),
+                  LocationAccess(RC_LH_CHILD_FISH_15, {[]{return logic->CanGetChildFish;}}),
+                  LocationAccess(RC_LH_CHILD_LOACH_1, {[]{return logic->CanGetChildFish;}}),
+                  LocationAccess(RC_LH_CHILD_LOACH_2, {[]{return logic->CanGetChildFish;}}),
+                  LocationAccess(RC_LH_ADULT_FISHING, {[]{return logic->CanFish && logic->IsAdult;}}),
+                  LocationAccess(RC_LH_ADULT_FISH_1,  {[]{return logic->CanGetAdultFish;}}),
+                  LocationAccess(RC_LH_ADULT_FISH_2,  {[]{return logic->CanGetAdultFish;}}),
+                  LocationAccess(RC_LH_ADULT_FISH_3,  {[]{return logic->CanGetAdultFish;}}),
+                  LocationAccess(RC_LH_ADULT_FISH_4,  {[]{return logic->CanGetAdultFish;}}),
+                  LocationAccess(RC_LH_ADULT_FISH_5,  {[]{return logic->CanGetAdultFish;}}),
+                  LocationAccess(RC_LH_ADULT_FISH_6,  {[]{return logic->CanGetAdultFish;}}),
+                  LocationAccess(RC_LH_ADULT_FISH_7,  {[]{return logic->CanGetAdultFish;}}),
+                  LocationAccess(RC_LH_ADULT_FISH_8,  {[]{return logic->CanGetAdultFish;}}),
+                  LocationAccess(RC_LH_ADULT_FISH_9,  {[]{return logic->CanGetAdultFish;}}),
+                  LocationAccess(RC_LH_ADULT_FISH_10, {[]{return logic->CanGetAdultFish;}}),
+                  LocationAccess(RC_LH_ADULT_FISH_11, {[]{return logic->CanGetAdultFish;}}),
+                  LocationAccess(RC_LH_ADULT_FISH_12, {[]{return logic->CanGetAdultFish;}}),
+                  LocationAccess(RC_LH_ADULT_FISH_13, {[]{return logic->CanGetAdultFish;}}),
+                  LocationAccess(RC_LH_ADULT_FISH_14, {[]{return logic->CanGetAdultFish;}}),
+                  LocationAccess(RC_LH_ADULT_FISH_15, {[]{return logic->CanGetAdultFish;}}),
+                  LocationAccess(RC_LH_ADULT_LOACH,   {[]{return logic->CanGetAdultFish;}}),
+                  LocationAccess(RC_FISHING_POLE_HINT,{[]{return true;}}),
                 }, {
                   //Exits
                   Entrance(RR_LH_FISHING_ISLAND, {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
index 14ec97cb6..750767323 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
@@ -197,6 +197,7 @@ void AreaTable_Init_Kakariko() {
   areaTable[RR_KAK_OPEN_GROTTO] = Area("Kak Open Grotto", "Kak Open Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LocationAccess(RC_KAK_OPEN_GROTTO_CHEST,        {[]{return true;}}),
+                  LocationAccess(RC_KAK_OPEN_GROTTO_FISH,         {[]{return logic->HasBottle;}}),
                   LocationAccess(RC_KAK_OPEN_GROTTO_GOSSIP_STONE, {[]{return true;}}),
                 }, {
                   //Exits
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
index 244a3cfd5..5ad1e6d5c 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
@@ -97,6 +97,7 @@ void AreaTable_Init_LostWoods() {
   areaTable[RR_KF_STORMS_GROTTO] = Area("KF Storms Grotto", "KF Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LocationAccess(RC_KF_STORMS_GROTTO_CHEST,        {[]{return true;}}),
+                  LocationAccess(RC_KF_STORMS_GROTTO_FISH,         {[]{return logic->HasBottle;}}),
                   LocationAccess(RC_KF_STORMS_GOSSIP_STONE, {[]{return true;}}),
                 }, {
                   //Exits
@@ -164,6 +165,7 @@ void AreaTable_Init_LostWoods() {
   areaTable[RR_LW_NEAR_SHORTCUTS_GROTTO] = Area("LW Near Shortcuts Grotto", "LW Near Shortcuts Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LocationAccess(RC_LW_NEAR_SHORTCUTS_GROTTO_CHEST,        {[]{return true;}}),
+                  LocationAccess(RC_LW_NEAR_SHORTCUTS_GROTTO_FISH,         {[]{return logic->HasBottle;}}),
                   LocationAccess(RC_LW_NEAR_SHORTCUTS_GOSSIP_STONE, {[]{return true;}}),
                 }, {
                   //Exits
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
index 7e786d4e6..5dade599a 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
@@ -55,6 +55,7 @@ void AreaTable_Init_ZorasDomain() {
   areaTable[RR_ZR_OPEN_GROTTO] = Area("ZR Open Grotto", "ZR Open Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LocationAccess(RC_ZR_OPEN_GROTTO_CHEST,        {[]{return true;}}),
+                  LocationAccess(RC_ZR_OPEN_GROTTO_FISH,         {[]{return logic->HasBottle;}}),
                   LocationAccess(RC_ZR_OPEN_GROTTO_GOSSIP_STONE, {[]{return true;}}),
                 }, {
                   //Exits
@@ -94,6 +95,11 @@ void AreaTable_Init_ZorasDomain() {
                   LocationAccess(RC_ZD_KING_ZORA_THAWED,    {[]{return logic->KingZoraThawed;}}),
                   LocationAccess(RC_ZD_TRADE_PRESCRIPTION,  {[]{return logic->KingZoraThawed && logic->Prescription;}}),
                   LocationAccess(RC_ZD_GS_FROZEN_WATERFALL, {[]{return logic->IsAdult && logic->AtNight && (logic->HookshotOrBoomerang || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->Bow || (logic->MagicMeter && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BIGGORON_SWORD))) || (randoCtx->GetTrickOption(RT_ZD_GS) && logic->CanJumpslash)) && logic->CanGetNightTimeGS;}}),
+                  LocationAccess(RC_ZD_FISH_1,              {[]{return logic->IsChild && logic->HasBottle;}}),
+                  LocationAccess(RC_ZD_FISH_2,              {[]{return logic->IsChild && logic->HasBottle;}}),
+                  LocationAccess(RC_ZD_FISH_3,              {[]{return logic->IsChild && logic->HasBottle;}}),
+                  LocationAccess(RC_ZD_FISH_4,              {[]{return logic->IsChild && logic->HasBottle;}}),
+                  LocationAccess(RC_ZD_FISH_5,              {[]{return logic->IsChild && logic->HasBottle;}}),
                   LocationAccess(RC_ZD_GOSSIP_STONE,        {[]{return true;}}),
                 }, {
                   //Exits
diff --git a/soh/soh/Enhancements/randomizer/3drando/shops.cpp b/soh/soh/Enhancements/randomizer/3drando/shops.cpp
index 9ca6a25ea..7ac5173c5 100644
--- a/soh/soh/Enhancements/randomizer/3drando/shops.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/shops.cpp
@@ -10,7 +10,7 @@
 
 std::vector<ItemAndPrice> NonShopItems = {};
 
-static std::array<std::vector<Text>, 0xF0> trickNameTable; // Table of trick names for ice traps
+static std::array<std::vector<Text>, 0xF1> trickNameTable; // Table of trick names for ice traps
 bool initTrickNames = false; //Indicates if trick ice trap names have been initialized yet
 
 //Set vanilla shop item locations before potentially shuffling
@@ -739,6 +739,10 @@ void InitTrickNames() {
      Text{"Pure Evil", "", ""},
      Text{"Ganon's Ghost", "", ""},
      Text{"Pork", "", ""}};
+  trickNameTable[RG_FISHING_POLE] = {
+     Text{"Fish Tickler", "Fish Tickler", "Fish Tickler"},
+     Text{"Floating Lure", "Floating Lure", "Floating Lure"},
+     Text{"Fishing Reel", "Fishing Reel", "Fishing Reel"}};
 
   trickNameTable[RG_OCARINA_A_BUTTON] = {
      Text{"Ocarina J Button", "", ""},
diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
index aaf9d2361..8e0dee301 100644
--- a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
@@ -622,6 +622,11 @@ static void WriteHints() {
       jsonData["sariaHintLoc"] = Rando::StaticData::GetLocation(ctx->GetHint(RH_SARIA)->GetHintedLocation())->GetName();
       jsonData["sariaRegion"] = ::Hint(ctx->GetHint(RH_SARIA)->GetHintedArea()).GetText().GetEnglish();
     }
+    if (ctx->GetOption(RSK_FISHING_POLE_HINT)) {
+      jsonData["fishingPoleText"] = ctx->GetHint(RH_FISHING_POLE)->GetText().GetForLanguage(language);
+      jsonData["fishingPoleHintLoc"] = Rando::StaticData::GetLocation(ctx->GetHint(RH_FISHING_POLE)->GetHintedLocation())->GetName();
+      jsonData["fishingPoleRegion"] = ::Hint(ctx->GetHint(RH_FISHING_POLE)->GetHintedArea()).GetText().GetEnglish();
+    }
 
     if (ctx->GetOption(RSK_GOSSIP_STONE_HINTS).Is(RO_GOSSIP_STONES_NONE)) {
         return;
diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.hpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.hpp
index 8ad3212f8..51fc51941 100644
--- a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.hpp
@@ -4,6 +4,7 @@
 #include <string>
 #include <string_view>
 #include <cstdint>
+#include "../randomizerTypes.h"
 
 using RandomizerHash = std::array<std::string, 5>;
 
@@ -18,6 +19,7 @@ typedef enum {
     SPOILER_CHK_EVENT_CHK_INF,
     SPOILER_CHK_INF_TABLE,
     SPOILER_CHK_COW,
+    SPOILER_CHK_FISH,
     SPOILER_CHK_MINIGAME,
     SPOILER_CHK_SCRUB,
     SPOILER_CHK_GERUDO_MEMBERSHIP_CARD,
@@ -74,7 +76,7 @@ typedef enum {
 } SpoilerItemRevealType;
 
 #define SPOILER_SPHERES_MAX 50
-#define SPOILER_ITEMS_MAX 512
+#define SPOILER_ITEMS_MAX RC_MAX
 #define SPOILER_STRING_DATA_SIZE 16384
 
 typedef struct {
diff --git a/soh/soh/Enhancements/randomizer/context.cpp b/soh/soh/Enhancements/randomizer/context.cpp
index 602a21c4f..5cf0dc087 100644
--- a/soh/soh/Enhancements/randomizer/context.cpp
+++ b/soh/soh/Enhancements/randomizer/context.cpp
@@ -9,6 +9,7 @@
 #include "entrance.h"
 #include "settings.h"
 #include "rando_hash.h"
+#include "fishsanity.h"
 
 #include <fstream>
 #include <spdlog/spdlog.h>
@@ -91,6 +92,7 @@ Context::Context() {
     mLogic = std::make_shared<Logic>();
     mTrials = std::make_shared<Trials>();
     mSettings = std::make_shared<Settings>();
+    mFishsanity = std::make_shared<Fishsanity>();
     for (auto& location : StaticData::GetLocationTable()) {
         mSpoilerfileCheckNameToEnum[location.GetName()] = location.GetRandomizerCheck();
     }
@@ -204,6 +206,10 @@ void Context::GenerateLocationPool() {
     }
     AddLocations(StaticData::overworldLocations);
 
+    if (mSettings->GetOption(RSK_FISHSANITY).IsNot(RO_FISHSANITY_OFF)) {
+        AddLocations(mFishsanity->GetFishsanityLocations().first);
+    }
+
     for (const auto dungeon : mDungeons->GetDungeonList()) {
         AddLocations(dungeon->GetDungeonLocations());
     }
@@ -477,6 +483,14 @@ void Context::ParseHintJson(nlohmann::json spoilerFileJson) {
         AddHint(RH_SARIA, Text(sariaText), sariaHintLoc, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[sariaRegion]);
     }
 
+    // Fishing Pole Hint
+    if(spoilerFileJson.contains("fishingPoleText")) {
+        std::string fishingPoleText = spoilerFileJson["fishingPoleText"].get<std::string>();
+        std::string fishingPoleRegion = spoilerFileJson["fishingPoleRegion"].get<std::string>();
+        RandomizerCheck fishingPoleHintLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["fishingPoleHintLoc"].get<std::string>()];
+        AddHint(RH_FISHING_POLE, Text(fishingPoleText), fishingPoleHintLoc, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[fishingPoleRegion]);
+    }
+
     // Warp Songs
     if (spoilerFileJson.contains("warpMinuetText")) {
         std::string warpMinuetText = spoilerFileJson["warpMinuetText"].get<std::string>(); //RANDOTODO fall back for if location is used
@@ -529,6 +543,10 @@ std::shared_ptr<Dungeons> Context::GetDungeons() {
     return mDungeons;
 }
 
+std::shared_ptr<Fishsanity> Context::GetFishsanity() {
+    return mFishsanity;
+}
+
 DungeonInfo* Context::GetDungeon(size_t key) const {
     return mDungeons->GetDungeon(static_cast<DungeonKey>(key));
 }
diff --git a/soh/soh/Enhancements/randomizer/context.h b/soh/soh/Enhancements/randomizer/context.h
index 247bca68e..cef9e5292 100644
--- a/soh/soh/Enhancements/randomizer/context.h
+++ b/soh/soh/Enhancements/randomizer/context.h
@@ -6,6 +6,7 @@
 #include "item_override.h"
 #include "3drando/text.hpp"
 #include "hint.h"
+#include "fishsanity.h"
 
 #include <memory>
 #include <array>
@@ -66,6 +67,7 @@ class Context {
     std::shared_ptr<Settings> GetSettings();
     std::shared_ptr<EntranceShuffler> GetEntranceShuffler();
     std::shared_ptr<Dungeons> GetDungeons();
+    std::shared_ptr<Fishsanity> GetFishsanity();
     DungeonInfo* GetDungeon(size_t key) const;
     std::shared_ptr<Logic> GetLogic();
     void ResetLogic();
@@ -111,6 +113,7 @@ class Context {
     std::shared_ptr<Dungeons> mDungeons;
     std::shared_ptr<Logic> mLogic;
     std::shared_ptr<Trials> mTrials;
+    std::shared_ptr<Fishsanity> mFishsanity;
     bool mSeedGenerated = false;
     bool mSpoilerLoaded = false;
     bool mPlandoLoaded = false;
diff --git a/soh/soh/Enhancements/randomizer/draw.cpp b/soh/soh/Enhancements/randomizer/draw.cpp
index a66d6b43d..51841ffcd 100644
--- a/soh/soh/Enhancements/randomizer/draw.cpp
+++ b/soh/soh/Enhancements/randomizer/draw.cpp
@@ -11,6 +11,7 @@
 #include "objects/object_gi_bosskey/object_gi_bosskey.h"
 #include "objects/object_gi_hearts/object_gi_hearts.h"
 #include "objects/object_gi_fire/object_gi_fire.h"
+#include "objects/object_fish/object_fish.h"
 #include "objects/object_toki_objects/object_toki_objects.h"
 #include "objects/gameplay_field_keep/gameplay_field_keep.h"
 #include "soh_assets.h"
@@ -389,5 +390,54 @@ extern "C" void Randomizer_DrawOcarinaButton(PlayState* play, GetItemEntry* getI
 
     gSPGrayscale(POLY_XLU_DISP++, false);
 
+    CLOSE_DISPS(play->state.gfxCtx);
+}
+
+extern "C" void Randomizer_DrawFishingPoleGI(PlayState* play, GetItemEntry* getItemEntry) {
+    Vec3f pos;
+    OPEN_DISPS(play->state.gfxCtx);
+
+    // Draw rod
+    Gfx_SetupDL_25Opa(play->state.gfxCtx);
+    Matrix_Scale(0.2, 0.2, 0.2, MTXMODE_APPLY);
+    gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
+              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gFishingPoleGiDL);
+
+    // Draw lure
+    Matrix_Push();
+    Matrix_Scale(5.0f, 5.0f, 5.0f, MTXMODE_APPLY);
+    pos = { 0.0f, -25.5f, -4.0f };
+    Matrix_Translate(pos.x, pos.y, pos.z, MTXMODE_APPLY);
+    Matrix_RotateZ(-M_PI_2, MTXMODE_APPLY);
+    Matrix_RotateY(-M_PI_2 - 0.2f, MTXMODE_APPLY);
+    Matrix_Scale(0.006f, 0.006f, 0.006f, MTXMODE_APPLY);
+    Gfx_SetupDL_25Opa(play->state.gfxCtx);
+    gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
+              G_MTX_NOPUSH | G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gFishingLureFloatDL);
+
+    // Draw hooks
+    Matrix_RotateY(0.2f, MTXMODE_APPLY);
+    Matrix_Translate(0.0f, 0.0f, -300.0f, MTXMODE_APPLY);
+    gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
+              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gFishingLureHookDL);
+    Matrix_RotateZ(M_PI_2, MTXMODE_APPLY);
+    gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
+              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gFishingLureHookDL);
+
+    Matrix_Translate(0.0f, -2200.0f, 700.0f, MTXMODE_APPLY);
+    gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
+              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gFishingLureHookDL);
+    Matrix_RotateZ(M_PI / 2, MTXMODE_APPLY);
+    gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
+              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gFishingLureHookDL);
+
+    Matrix_Pop();
+
     CLOSE_DISPS(play->state.gfxCtx);
 }
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/draw.h b/soh/soh/Enhancements/randomizer/draw.h
index b2f88e3da..59f173b17 100644
--- a/soh/soh/Enhancements/randomizer/draw.h
+++ b/soh/soh/Enhancements/randomizer/draw.h
@@ -18,6 +18,7 @@ void Randomizer_DrawMasterSword(PlayState* play, GetItemEntry* getItemEntry);
 void Randomizer_DrawTriforcePiece(PlayState* play, GetItemEntry getItemEntry);
 void Randomizer_DrawTriforcePieceGI(PlayState* play, GetItemEntry getItemEntry);
 void Randomizer_DrawOcarinaButton(PlayState* play, GetItemEntry* getItemEntry);
+void Randomizer_DrawFishingPoleGI(PlayState* play, GetItemEntry* getItemEntry);
 #ifdef __cplusplus
 };
 #endif
diff --git a/soh/soh/Enhancements/randomizer/fishsanity.cpp b/soh/soh/Enhancements/randomizer/fishsanity.cpp
new file mode 100644
index 000000000..48ca2d703
--- /dev/null
+++ b/soh/soh/Enhancements/randomizer/fishsanity.cpp
@@ -0,0 +1,412 @@
+#include "3drando/pool_functions.hpp"
+#include "../../OTRGlobals.h"
+#include "fishsanity.h"
+#include "variables.h"
+#include "functions.h"
+#include "macros.h"
+#include <consolevariablebridge.h>
+
+#define FSi OTRGlobals::Instance->gRandoContext->GetFishsanity()
+
+/**
+ * @brief Parallel list of pond fish checks for both ages
+*/
+std::array<std::pair<RandomizerCheck, RandomizerCheck>, 17> Rando::StaticData::randomizerFishingPondFish = {
+    { /*   Child Check           Adult Check    */
+      { RC_LH_CHILD_FISH_1,  RC_LH_ADULT_FISH_1 },
+      { RC_LH_CHILD_FISH_2,  RC_LH_ADULT_FISH_2 },
+      { RC_LH_CHILD_FISH_3,  RC_LH_ADULT_FISH_3 },
+      { RC_LH_CHILD_FISH_4,  RC_LH_ADULT_FISH_4 },
+      { RC_LH_CHILD_FISH_5,  RC_LH_ADULT_FISH_5 },
+      { RC_LH_CHILD_FISH_6,  RC_LH_ADULT_FISH_6 },
+      { RC_LH_CHILD_FISH_7,  RC_LH_ADULT_FISH_7 },
+      { RC_LH_CHILD_FISH_8,  RC_LH_ADULT_FISH_8 },
+      { RC_LH_CHILD_FISH_9,  RC_LH_ADULT_FISH_9 },
+      { RC_LH_CHILD_FISH_10, RC_LH_ADULT_FISH_10 },
+      { RC_LH_CHILD_FISH_11, RC_LH_ADULT_FISH_11 },
+      { RC_LH_CHILD_FISH_12, RC_LH_ADULT_FISH_12 },
+      { RC_LH_CHILD_FISH_13, RC_LH_ADULT_FISH_13 },
+      { RC_LH_CHILD_FISH_14, RC_LH_ADULT_FISH_14 },
+      { RC_LH_CHILD_FISH_15, RC_LH_ADULT_FISH_15 },
+      { RC_LH_CHILD_LOACH_1, RC_LH_ADULT_LOACH },
+      { RC_LH_CHILD_LOACH_2, RC_UNKNOWN_CHECK } }
+};
+
+std::unordered_map<int8_t, RandomizerCheck> Rando::StaticData::randomizerGrottoFishMap = {
+    { 0x2C, RC_KF_STORMS_GROTTO_FISH },      { 0x14, RC_LW_NEAR_SHORTCUTS_GROTTO_FISH },
+    { 0x22, RC_HF_SOUTHEAST_GROTTO_FISH },   { 0x03, RC_HF_OPEN_GROTTO_FISH },
+    { 0x00, RC_HF_NEAR_MARKET_GROTTO_FISH }, { 0x28, RC_KAK_OPEN_GROTTO_FISH },
+    { 0x57, RC_DMT_STORMS_GROTTO_FISH },     { 0x7A, RC_DMC_UPPER_GROTTO_FISH },
+    { 0x29, RC_ZR_OPEN_GROTTO_FISH }
+};
+
+namespace Rando {
+    const FishIdentity Fishsanity::defaultIdentity = { RAND_INF_MAX, RC_UNKNOWN_CHECK };
+    bool Fishsanity::fishsanityHelpersInit = false;
+    std::unordered_map<RandomizerCheck, LinkAge> Fishsanity::pondFishAgeMap;
+    std::vector<RandomizerCheck> Fishsanity::childPondFish;
+    std::vector<RandomizerCheck> Fishsanity::adultPondFish;
+
+    Fishsanity::Fishsanity() {
+        InitializeHelpers();
+    }
+
+    Fishsanity::~Fishsanity() {
+    
+    }
+
+    bool Fishsanity::GetFishLocationIncluded(Rando::Location* loc,
+                                             FishsanityOptionsSource optionsSource) {
+        auto [mode, numFish, ageSplit] = GetOptions(optionsSource);
+
+        if (loc->GetRCType() != RCTYPE_FISH || mode == RO_FISHSANITY_OFF)
+            return false;
+        RandomizerCheck rc = loc->GetRandomizerCheck();
+        // Are pond fish enabled, and is this a pond fish location?
+        if (mode != RO_FISHSANITY_OVERWORLD && numFish > 0 && loc->GetScene() == SCENE_FISHING_POND &&
+            loc->GetActorID() == ACTOR_FISHING) {
+            // Is this a child fish location? If so, is it within the defined number of pond fish checks?
+            if (rc >= RC_LH_CHILD_FISH_1 && rc <= RC_LH_CHILD_LOACH_2 && numFish > (loc->GetActorParams() - 100))
+                return true;
+            // Are adult fish available, and is this an adult fish location? If so, is it within the defined number of pond
+            // fish checks?
+            if (ageSplit && rc >= RC_LH_ADULT_FISH_1 && rc <= RC_LH_ADULT_LOACH && numFish > (loc->GetActorParams() - 100))
+                return true;
+        }
+        // Are overworld fish enabled, and is this an overworld fish location?
+        if (mode != RO_FISHSANITY_POND && (loc->GetScene() == SCENE_GROTTOS || loc->GetScene() == SCENE_ZORAS_DOMAIN)
+            && loc->GetActorID() == ACTOR_EN_FISH && (loc->GetActorParams() == 1 || loc->GetActorParams() < 0)) {
+            return true;
+        }
+        // Must not be an included fish location!
+        return false;
+    }
+
+    std::pair<std::vector<RandomizerCheck>, std::vector<RandomizerCheck>>
+    Fishsanity::GetFishingPondLocations(FishsanityOptionsSource optionsSource) {
+        auto [mode, numFish, ageSplit] = GetOptions(optionsSource);
+        std::vector<RandomizerCheck> activeFish;
+        std::vector<RandomizerCheck> remainingFish;
+
+        // Fishsanity_InitializeHelpers();
+        remainingFish.insert(remainingFish.end(), Rando::StaticData::pondFishLocations.begin(),
+                             Rando::StaticData::pondFishLocations.end());
+
+        // No pond fish shuffled
+        if (numFish == 0) {
+            return std::make_pair(activeFish, remainingFish);
+        }
+        // Every pond fish is shuffled, so we can save some time
+        if (numFish > 16) {
+            // Child and adult pond fish are both shuffled, set activeFish to remainingFish and return an empty vector for
+            // inactive fish.
+            if (ageSplit) {
+                return std::make_pair(remainingFish, activeFish);
+            }
+            // Activate all child fish only
+            activeFish = FilterAndEraseFromPool(
+                remainingFish, [](const RandomizerCheck loc) { return pondFishAgeMap[loc] == LINK_AGE_CHILD; });
+            return std::make_pair(activeFish, remainingFish);
+        }
+        // Only some pond fish are shuffled, so we have to only activate the requested number.
+        activeFish.insert(activeFish.end(), childPondFish.begin(), childPondFish.begin() + numFish);
+        // If pond is split, also add the requested number of adult fish.
+        if (ageSplit) {
+            activeFish.insert(activeFish.end(), adultPondFish.begin(),
+                              adultPondFish.begin() + std::min<uint8_t>(numFish, 16));
+        }
+        // NOTE: This only works because we can assume activeFish is already sorted; changes that break this assumption will
+        // also break this
+        FilterAndEraseFromPool(remainingFish,
+                               [&](uint32_t loc) { return std::binary_search(activeFish.begin(), activeFish.end(), loc); });
+
+        return std::make_pair(activeFish, remainingFish);
+    }
+
+    std::pair<std::vector<RandomizerCheck>, std::vector<RandomizerCheck>>
+    Fishsanity::GetFishsanityLocations(FishsanityOptionsSource optionsSource) {
+        auto [mode, numFish, ageSplit] = GetOptions(optionsSource);
+        std::vector<RandomizerCheck> activeFish;
+        std::vector<RandomizerCheck> remainingFish;
+
+        // Add pond fish
+        if (mode == RO_FISHSANITY_POND || mode == RO_FISHSANITY_BOTH) {
+            auto pondLocations = GetFishingPondLocations(optionsSource);
+            activeFish.insert(activeFish.end(), pondLocations.first.begin(), pondLocations.first.end());
+            remainingFish.insert(remainingFish.end(), pondLocations.second.begin(), pondLocations.second.end());
+        }
+
+        // Add overworld fish
+        if (mode == RO_FISHSANITY_OVERWORLD || mode == RO_FISHSANITY_BOTH) {
+            activeFish.insert(activeFish.end(), Rando::StaticData::overworldFishLocations.begin(),
+                              Rando::StaticData::overworldFishLocations.end());
+        }
+
+        return std::make_pair(activeFish, remainingFish);
+    }
+
+    FishIdentity Fishsanity::IdentifyPondFish(u8 fishParams) {
+        auto [mode, pondCount, ageSplit] = GetOptions();
+        FishIdentity identity = defaultIdentity;
+
+        if (!GetPondFishShuffled()) {
+            return identity;
+        }
+
+        if (pondCount > 16) {
+            identity = GetPondFish(fishParams, IsAdultPond());
+        } else {
+            identity = LINK_IS_ADULT ? mCurrPondFish.second : mCurrPondFish.first;
+        }
+
+        return identity;
+    }
+
+    FishsanityPondOptions Fishsanity::GetOptions(FishsanityOptionsSource optionsSource) {
+        FishsanityPondOptions options{};
+        switch (optionsSource) {
+            // Used in check tracker
+            case FSO_SOURCE_CVARS:
+                options.mode = CVarGetInteger("gRandomizeFishsanity", RO_FISHSANITY_OFF);
+                options.numFish = CVarGetInteger("gRandomizeFishsanityPondCount", 0);
+                options.ageSplit = CVarGetInteger("gRandomizeFishsanityAgeSplit", 0) == 1;
+                break;
+            case FSO_SOURCE_RANDO:
+            default:
+                options.mode = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_FISHSANITY);
+                options.numFish = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_FISHSANITY_POND_COUNT);
+                options.ageSplit = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_FISHSANITY_AGE_SPLIT);
+                break;
+        }
+        return options;
+    }
+
+    void Fishsanity::UpdateCurrentPondFish() {
+        auto [mode, pondCount, ageSplit] = GetOptions();
+        mCurrPondFish = std::pair<FishIdentity, FishIdentity>();
+        mCurrPondFish.first = defaultIdentity;
+        mCurrPondFish.second = defaultIdentity;
+
+        // Initialize mCurrPondFish if we're shuffling pond fish, but if all fish are shuffled, we don't need to use this.
+        if ((mode == RO_FISHSANITY_BOTH || mode == RO_FISHSANITY_POND) && pondCount < 17) {
+            // find the first inf that isn't set yet for each age
+            // but don't go past the max number
+            std::pair<RandomizerCheck, RandomizerCheck> tableEntry;
+            for (s16 i = 0, params = 100; i < pondCount; i++, params++) {
+                tableEntry = Rando::StaticData::randomizerFishingPondFish[i];
+                if (!Flags_GetRandomizerInf(OTRGlobals::Instance->gRandomizer->GetRandomizerInfFromCheck(tableEntry.first)) || i == pondCount - 1) {
+                    // Found first child check
+                    if (!IsFish(&mCurrPondFish.first)) {
+                        mCurrPondFish.first = GetPondFish(params, false);
+                    }
+
+                    if (!ageSplit && !IsFish(&mCurrPondFish.second)) {
+                        mCurrPondFish.second = GetPondFish(params, false);
+                        // both ages are resolved! we can quit here
+                        break;
+                    }
+                }
+
+                if (ageSplit && !IsFish(&mCurrPondFish.second) && tableEntry.second != RC_UNKNOWN_CHECK &&
+                    (!Flags_GetRandomizerInf(OTRGlobals::Instance->gRandomizer->GetRandomizerInfFromCheck(tableEntry.second)) || i == pondCount - 1)) {
+                    mCurrPondFish.second = mCurrPondFish.second = GetPondFish(params, true);
+                }
+            }
+        }
+    }
+
+    void Fishsanity::InitializeFromSave() {
+        UpdateCurrentPondFish();
+    }
+
+    bool Fishsanity::GetPondFishShuffled() {
+        u8 fsMode = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_FISHSANITY);
+        return OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_FISHSANITY_POND_COUNT) > 0 &&
+           (fsMode == RO_FISHSANITY_POND || fsMode == RO_FISHSANITY_BOTH);
+    }
+
+    bool Fishsanity::GetOverworldFishShuffled() {
+        u8 fsMode = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_FISHSANITY);
+        return fsMode == RO_FISHSANITY_OVERWORLD || fsMode == RO_FISHSANITY_BOTH;
+    }
+
+    bool Fishsanity::IsAdultPond() {
+        return LINK_IS_ADULT && OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_FISHSANITY_AGE_SPLIT);
+    }
+
+    bool Fishsanity::GetPondCleared() {
+        auto [mode, pondCount, ageSplit] = GetOptions();
+        // no fish shuffled, so pond is always cleared :thumbsup:
+        if (pondCount == 0)
+            return true;
+
+        bool adultPond = LINK_IS_ADULT && ageSplit;
+        // if we've collected the final shuffled fish, pond is complete
+        if (pondCount <= 16) {
+            auto tableEntry = Rando::StaticData::randomizerFishingPondFish[pondCount - 1];
+            return Flags_GetRandomizerInf(OTRGlobals::Instance->gRandomizer->GetRandomizerInfFromCheck(adultPond ? tableEntry.second : tableEntry.first));
+        }
+
+        // the last two checks actually don't matter because logically they will never be true, but maybe one day they will
+        // if every fish is shuffled, check if we've collected every fish
+        for (auto tableEntry : Rando::StaticData::randomizerFishingPondFish) {
+            RandomizerCheck rc = adultPond ? tableEntry.second : tableEntry.first;
+            // if we haven't collected this fish, then we're not done yet! get back in there, soldier
+            if (rc != RC_UNKNOWN_CHECK && !Flags_GetRandomizerInf(OTRGlobals::Instance->gRandomizer->GetRandomizerInfFromCheck(rc)))
+                return false;
+        }
+        return true;
+    }
+
+    bool Fishsanity::GetDomainCleared() {
+        for (RandomizerInf i = RAND_INF_ZD_FISH_1; i <= RAND_INF_ZD_FISH_5; i = (RandomizerInf)(i + 1)) {
+            if (!Flags_GetRandomizerInf(i))
+                return false;
+        }
+        return true;
+    }
+
+    void Fishsanity::InitializeHelpers() {
+        if (fishsanityHelpersInit)
+            return;
+
+        for (auto pair : Rando::StaticData::randomizerFishingPondFish) {
+            pondFishAgeMap[pair.first] = LINK_AGE_CHILD;
+            pondFishAgeMap[pair.second] = LINK_AGE_ADULT;
+            childPondFish.push_back(pair.first);
+            adultPondFish.push_back(pair.second);
+        }
+    }
+
+    FishIdentity Fishsanity::GetPondFish(s16 params, bool adultPond) {
+        auto pair = Rando::StaticData::randomizerFishingPondFish[params - 100];
+        RandomizerCheck rc = adultPond ? pair.second : pair.first;
+        return { OTRGlobals::Instance->gRandomizer->GetRandomizerInfFromCheck(rc), rc };
+    }
+
+    FishIdentity Fishsanity::AdvancePond() {
+        auto [mode, pondCount, ageSplit] = GetOptions();
+
+        // No need to update state with full pond shuffle
+        if (pondCount > 16) {
+            return defaultIdentity;
+        }
+
+        UpdateCurrentPondFish();
+
+        return IsAdultPond() ? mCurrPondFish.second : mCurrPondFish.first;
+    }
+
+    FishsanityCheckType Fishsanity::GetCheckType(RandomizerCheck rc) {
+        // Is this a pond fish?
+        if (std::binary_search(Rando::StaticData::pondFishLocations.begin(), Rando::StaticData::pondFishLocations.end(), rc))
+            return FSC_POND;
+
+        // Is this an overworld fish?
+        if (std::binary_search(Rando::StaticData::overworldFishLocations.begin(), Rando::StaticData::overworldFishLocations.end(), rc)) {
+            if (rc < RC_ZD_FISH_1)
+                return FSC_GROTTO;
+            else
+                return FSC_ZD;
+        }
+        
+        // Must not be a fishsanity check
+        return FSC_NONE;
+    }
+
+    bool Fishsanity::IsFish(FishIdentity* fish) {
+        if (fish->randomizerCheck == RC_UNKNOWN_CHECK || fish->randomizerInf == RAND_INF_MAX)
+            return false;
+
+        return GetCheckType(fish->randomizerCheck) != FSC_NONE;
+    }
+
+    void Fishsanity::SetPendingFish(FishIdentity* fish) {
+        mPendingFish = fish == NULL ? defaultIdentity : *fish;
+    }
+
+    FishIdentity Fishsanity::GetPendingFish() {
+        return mPendingFish;
+    }
+} // namespace Rando
+
+// C interface
+extern "C" {
+    bool Randomizer_GetPondFishShuffled() {
+        return FSi->GetPondFishShuffled();
+    }
+
+    bool Randomizer_GetOverworldFishShuffled() {
+        return FSi->GetOverworldFishShuffled();
+    }
+
+    bool Randomizer_IsAdultPond() {
+        return FSi->IsAdultPond();
+    }
+
+    void Randomizer_SetPendingFish(FishIdentity* fish) {
+        return FSi->SetPendingFish(fish);
+    }
+
+    void Fishsanity_DrawEffShadow(Actor* actor, Lights* lights, PlayState* play) {
+        Vec3f pos, ripplePos;
+        static Vec3f velocity = { 0.0f, 0.0f, 0.0f };
+        static Vec3f accel = { 0.0f, 0.0f, 0.0f };
+        Color_RGBA8 primColor;
+        Color_RGBA8 envColor;
+
+        // Color of the circle for the particles
+        static Color_RGBA8 mainColors[5][4] = {
+            { 240, 154, 137, 200 },
+            { 240, 190, 137, 200 },
+            { 240, 171, 137, 200 },
+            { 240, 141, 146, 200 },
+            { 240, 204, 137, 200 }
+        };
+
+        // Color of the faded flares stretching off the particles
+        static Color_RGBA8 flareColors[5][3] = {
+            { 128, 85, 82, 200 },
+            { 128, 101, 82, 200 },
+            { 128, 93, 82, 200 },
+            { 128, 82, 98, 200 },
+            { 128, 108, 82, 200 }
+        };
+
+        Color_RGBA8_Copy(&primColor, mainColors[ABS(actor->params) % 5]);
+        Color_RGBA8_Copy(&envColor, flareColors[ABS(actor->params) % 5]);
+
+        // Spawn sparkles
+        pos.x = Rand_CenteredFloat(23.0f) + actor->world.pos.x;
+        pos.y = (Rand_Centered() * 12.0f) + actor->world.pos.y;
+        pos.z = Rand_CenteredFloat(23.0f) + actor->world.pos.z;
+        velocity.y = 0.05f;
+        accel.y = 0.025f;
+        Math_Vec3f_Copy(&ripplePos, &pos);
+        ripplePos.y += actor->yDistToWater;
+
+        if (Rand_ZeroOne() < 0.3f) {
+            EffectSsKiraKira_SpawnDispersed(play, &pos, &velocity, &accel, &primColor, &envColor, 1800, 10);
+        }
+
+        if (actor->bgCheckFlags & 0x20 && Rand_ZeroOne() < 0.15f) {
+            EffectSsGRipple_Spawn(play, &ripplePos, 100, 200, 2);
+        }
+    }
+
+    void Fishsanity_OpenGreyscaleColor(PlayState* play, Color_RGBA16* color, int16_t frameOffset) {
+        OPEN_DISPS(play->state.gfxCtx);
+        gDPSetGrayscaleColor(
+            POLY_OPA_DISP++, color->r, color->g, color->b,
+            // Make color pulse, offset a bit by the actor params
+            ABS(255.0f * Math_CosS((play->gameplayFrames + frameOffset) * 1000)));
+        gSPGrayscale(POLY_OPA_DISP++, true);
+        CLOSE_DISPS(play->state.gfxCtx);
+    }
+
+    void Fishsanity_CloseGreyscaleColor(PlayState* play) {
+        OPEN_DISPS(play->state.gfxCtx);
+        gSPGrayscale(POLY_OPA_DISP++, false);
+        CLOSE_DISPS(play->state.gfxCtx);
+    }
+}
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/fishsanity.h b/soh/soh/Enhancements/randomizer/fishsanity.h
new file mode 100644
index 000000000..fb1281162
--- /dev/null
+++ b/soh/soh/Enhancements/randomizer/fishsanity.h
@@ -0,0 +1,210 @@
+#ifndef FISHSANITY_H
+#define FISHSANITY_H
+#pragma once
+
+#include <z64.h>
+#include "randomizerTypes.h"
+
+typedef struct FishsanityPondOptions {
+    u8 mode;
+    u8 numFish;
+    bool ageSplit;
+} FishsanityPondOptions;
+
+typedef enum FishsanityOptionsSource {
+    FSO_SOURCE_RANDO,
+    FSO_SOURCE_CVARS
+};
+
+typedef enum FishsanityCheckType {
+    FSC_NONE,
+    FSC_POND,
+    FSC_GROTTO,
+    FSC_ZD,
+};
+
+#ifdef __cplusplus
+namespace Rando {
+
+/**
+ * @brief Class to provide an interface for and direct Fishsanity features
+*/
+class Fishsanity {
+  public:
+    Fishsanity();
+    ~Fishsanity();
+
+    static const FishIdentity defaultIdentity;
+
+    /**
+     * @brief Gets the type of a fishsanity check
+     * @param rc The RandomizerCheck to categorize
+     * @return The check's fishsanity type, or FSC_NONE
+     */
+    static FishsanityCheckType GetCheckType(RandomizerCheck rc);
+
+    /**
+     * @brief Returns true if the given FishIdentity represents an actual fish
+     * @param fish The fish to check
+    */
+    static bool IsFish(FishIdentity* fish);
+
+    /**
+     * @brief Returns true if the given fish location is active
+     * 
+     * @param loc The Location to check
+     * @param optionsSource Optionally declare from which source to pull settings
+    */
+    bool GetFishLocationIncluded(Rando::Location* loc, FishsanityOptionsSource optionsSource = FSO_SOURCE_RANDO);
+
+    /**
+     * @brief Get the active and inactive locations in the fishing pond.
+     * 
+     * @param optionsSource Optionally declare from which source to pull settings
+     * @return A pair of vectors, where the fist is all active pond fish checks, and the second is all inactive pond fish checks.
+    */
+    std::pair<std::vector<RandomizerCheck>, std::vector<RandomizerCheck>> GetFishingPondLocations(FishsanityOptionsSource optionsSource = FSO_SOURCE_RANDO);
+
+    /**
+     * @brief Get all active fishsanity locations, and all inactive fishing pond locations.
+     * 
+     * @param optionsSource Optionally declare from which source to pull settings 
+     * @return A pair of vectors, where the first is all active fishsanity checks, and the second is all inactive fishsanity checks.
+    */
+    std::pair<std::vector<RandomizerCheck>, std::vector<RandomizerCheck>> GetFishsanityLocations(FishsanityOptionsSource optionsSource = FSO_SOURCE_RANDO);
+
+    /**
+     * @brief Returns the identity for a caught pond fish given its params.
+     * Not for use externally from rando, use Randomizer::IdentifyFish or Randomizer_IdentifyFish for that
+     * 
+     * @param fishParams Actor parameters for the fish to identify
+    */
+    FishIdentity IdentifyPondFish(u8 fishParams);
+
+    /**
+     * @brief Get fishsanity fishing pond options from the requested source
+    */
+    FishsanityPondOptions GetOptions(FishsanityOptionsSource optionsSource = FSO_SOURCE_RANDO);
+    
+    /**
+     * @brief Updates current pond fish according to save data
+    */
+    void UpdateCurrentPondFish();
+    
+    /**
+     * @brief Initializes internal state from save
+    */
+    void InitializeFromSave();
+
+    /**
+     * @brief Returns true if the fishing pond is shuffled
+    */
+    bool GetPondFishShuffled();
+
+    /**
+     * @brief Returns true if overworld fish are shuffled 
+    */
+    bool GetOverworldFishShuffled();
+
+    /**
+     * @brief Returns true if the fishing pond is currently adult (i.e., age split is enabled and Link is adult)
+    */
+    bool IsAdultPond();
+
+    /**
+     * @brief Returns true if all available pond fish checks have been collected for the current age
+    */
+    bool GetPondCleared();
+
+    /**
+     * @brief Returns true if all available Zora's Domain fish checks have been collected
+    */
+    bool GetDomainCleared();
+
+    /**
+     * @brief Advances current fishing pond check; no effect if every fish is shuffled
+     * @return The new FishIdentity for the current pond, or default identity if every fish is shuffled
+    */
+    FishIdentity AdvancePond();
+
+    /**
+     * @brief Set the currently held fish
+     * @param fish Pointer to FishIdentity to copy
+    */
+    void SetPendingFish(FishIdentity* fish);
+
+    /**
+     * @brief Get the currently held fish
+    */
+    FishIdentity GetPendingFish();
+
+  private:
+    /**
+     * @brief Initialize helper statics if they have not been initialized yet
+    */
+    void InitializeHelpers();
+    
+    /**
+     * @brief Resolves a pond fish's FishIdentity directly from params & pond age
+     * 
+     * @param params Params for Fishing actor
+     * @param adultPond Whether to resolve this fish as an adult check
+     * @return The FishIdentity for the described fish
+    */
+    static FishIdentity GetPondFish(s16 params, bool adultPond);
+    
+    /**
+     * @brief Current pond fish when all pond fish are not randomized
+    */
+    std::pair<FishIdentity, FishIdentity> mCurrPondFish;
+    
+    /**
+     * @brief Identity of the last-caught fish in the fishing pond minigame awaiting reward
+    */
+    FishIdentity mPendingFish;
+    
+    /**
+     * @brief True if fishsanity helpers have been initialized
+    */
+    static bool fishsanityHelpersInit;
+
+    /////////////////////////////////////////////////////////
+    //// Helper data structures derived from static data ////
+    /////////////////////////////////////////////////////////
+
+    /**
+     * @brief Mapping from pond fish check to the age where that check can be collected
+    */
+    static std::unordered_map<RandomizerCheck, LinkAge> pondFishAgeMap;
+
+    /**
+     * @brief List of child pond fish checks
+    */
+    static std::vector<RandomizerCheck> childPondFish;
+
+    /**
+     * @brief List of adult pond fish checks
+    */
+    static std::vector<RandomizerCheck> adultPondFish;
+};
+}
+
+extern "C" {
+#endif
+/// Returns true if pond fish should be shuffled based on fishsanity settings.
+bool Randomizer_GetPondFishShuffled();
+/// Returns true if overworld fish should be shuffled based on fishsanity settings.
+bool Randomizer_GetOverworldFishShuffled();
+/// Returns true if the adult fishing pond should be used for fishsanity.
+bool Randomizer_IsAdultPond();
+/// Sets the pending fish
+void Randomizer_SetPendingFish(FishIdentity* fish);
+/// Custom shadow draw function to add effect to uncollected fish
+void Fishsanity_DrawEffShadow(Actor* actor, Lights* lights, PlayState* play);
+void Fishsanity_OpenGreyscaleColor(PlayState* play, Color_RGBA16* color, int16_t frameOffset);
+void Fishsanity_CloseGreyscaleColor(PlayState* play);
+#ifdef __cplusplus
+}
+#endif
+
+#endif // FISHSANITY_H
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/item_list.cpp b/soh/soh/Enhancements/randomizer/item_list.cpp
index 88732e6a2..8374c98d6 100644
--- a/soh/soh/Enhancements/randomizer/item_list.cpp
+++ b/soh/soh/Enhancements/randomizer/item_list.cpp
@@ -189,6 +189,7 @@ void Rando::StaticData::InitItemTable() {
     itemTable[RG_HEART_CONTAINER] =                     Item(RG_HEART_CONTAINER,                  Text{ "Heart Container", "Réceptacle de Coeur", "Herz-Container" },                                               ITEMTYPE_ITEM,              GI_HEART_CONTAINER_2,true, &logic->HeartContainer,      RHT_HEART_CONTAINER,        ITEM_HEART_CONTAINER,           OBJECT_GI_HEARTS,       GID_HEART_CONTAINER,0xC6,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
     itemTable[RG_ICE_TRAP] =                            Item(RG_ICE_TRAP,                         Text{ "Ice Trap", "Piège de Glace", "Eisfalle" },                                                                 ITEMTYPE_ITEM,              RG_ICE_TRAP,        false, &logic->noVariable,          RHT_ICE_TRAP,               RG_ICE_TRAP,                    OBJECT_GI_RUPY,         GID_RUPEE_GOLD,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_MILK] =                                Item(RG_MILK,                             Text{ "Milk", "Lait", "Milch" },                                                                                  ITEMTYPE_ITEM,              GI_MILK,            false, &logic->noVariable,          RHT_NONE,                   ITEM_MILK,                      OBJECT_GI_MILK,         GID_MILK,           0x98,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_FISH] =                                Item(RG_FISH,                             Text{ "Fish", "Poisson", "Pez" },                                                                                 ITEMTYPE_ITEM,              GI_FISH,            false, &logic->noVariable,          RHT_NONE,                   ITEM_FISH,                      OBJECT_GI_FISH,         GID_FISH,           0x47,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
     // Refills
     itemTable[RG_BOMBS_5] =                             Item(RG_BOMBS_5,                          Text{ "Bombs (5)", "Bombes (5)", "Bomben (5)" },                                                                  ITEMTYPE_REFILL,            GI_BOMBS_5,         false, &logic->noVariable,          RHT_BOMBS_5,                ITEM_BOMBS_5,                   OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
     itemTable[RG_BOMBS_10] =                            Item(RG_BOMBS_10,                         Text{ "Bombs (10)", "Bombes (10)", "Bomben (10)" },                                                               ITEMTYPE_REFILL,            GI_BOMBS_10,        false, &logic->noVariable,          RHT_BOMBS_10,               ITEM_BOMBS_10,                  OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
@@ -260,6 +261,8 @@ void Rando::StaticData::InitItemTable() {
     itemTable[RG_TWINROVA_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
     itemTable[RG_GANON_SOUL] =                          Item(RG_GANON_SOUL,                      Text{ "Ganon's Soul", "", "" },                                                                                    ITEMTYPE_ITEM,              0xE8,               true,  &logic->CanSummonGanon,      RHT_GANON_SOUL,             RG_GANON_SOUL,                  OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_GANON_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
+    itemTable[RG_FISHING_POLE] =                        Item(RG_FISHING_POLE,                    Text{ "Fishing Pole", "Canne à Pêche", "Caña de Pescar" },                                                         ITEMTYPE_ITEM,              RG_FISHING_POLE,    true,  &logic->FishingPole,         RHT_FISHING_POLE,           RG_FISHING_POLE,                OBJECT_GI_FISH,         GID_FISHING_POLE,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_FISHING_POLE].SetCustomDrawFunc(Randomizer_DrawFishingPoleGI);
 
     itemTable[RG_OCARINA_A_BUTTON] =                    Item(RG_OCARINA_A_BUTTON,                Text{ "Ocarina A Button", "Touche A de l'Ocarina", "Botón A de Ocarina" },                                         ITEMTYPE_ITEM,              GI_MAP,             true,  &logic->OcarinaAButton,      RHT_OCARINA_A_BUTTON,       RG_OCARINA_A_BUTTON,            OBJECT_GI_MAP,          GID_STONE_OF_AGONY, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_OCARINA_A_BUTTON].SetCustomDrawFunc(Randomizer_DrawOcarinaButton);
diff --git a/soh/soh/Enhancements/randomizer/location.h b/soh/soh/Enhancements/randomizer/location.h
index cd6e88f32..993e8c184 100644
--- a/soh/soh/Enhancements/randomizer/location.h
+++ b/soh/soh/Enhancements/randomizer/location.h
@@ -55,6 +55,10 @@ class SpoilerCollectionCheck {
         return SpoilerCollectionCheck(SPOILER_CHK_COW, scene, flag);
     }
 
+    static auto Fish(const uint8_t flag, const uint8_t scene = SCENE_FISHING_POND) {
+        return SpoilerCollectionCheck(SPOILER_CHK_FISH, scene, flag);
+    }
+
     static auto Fishing(const uint8_t bit) {
         return SpoilerCollectionCheck(SPOILER_CHK_MINIGAME, 0x00, bit);
     }
diff --git a/soh/soh/Enhancements/randomizer/location_list.cpp b/soh/soh/Enhancements/randomizer/location_list.cpp
index 2e3122cb8..56861e484 100644
--- a/soh/soh/Enhancements/randomizer/location_list.cpp
+++ b/soh/soh/Enhancements/randomizer/location_list.cpp
@@ -516,7 +516,25 @@ std::vector<RandomizerCheck> Rando::StaticData::otherHintLocations = {
     RC_GREG_HINT,
     RC_SARIA_SONG_HINT,
     RC_ALTAR_HINT_CHILD,
-    RC_ALTAR_HINT_ADULT
+    RC_ALTAR_HINT_ADULT,
+    RC_FISHING_POLE_HINT
+};
+
+std::vector<RandomizerCheck> Rando::StaticData::pondFishLocations = {
+    RC_LH_CHILD_FISH_1,  RC_LH_CHILD_FISH_2,  RC_LH_CHILD_FISH_3,  RC_LH_CHILD_FISH_4,  RC_LH_CHILD_FISH_5,
+    RC_LH_CHILD_FISH_6,  RC_LH_CHILD_FISH_7,  RC_LH_CHILD_FISH_8,  RC_LH_CHILD_FISH_9,  RC_LH_CHILD_FISH_10,
+    RC_LH_CHILD_FISH_11, RC_LH_CHILD_FISH_12, RC_LH_CHILD_FISH_13, RC_LH_CHILD_FISH_14, RC_LH_CHILD_FISH_15,
+    RC_LH_CHILD_LOACH_1, RC_LH_CHILD_LOACH_2, RC_LH_ADULT_FISH_1,  RC_LH_ADULT_FISH_2,  RC_LH_ADULT_FISH_3,
+    RC_LH_ADULT_FISH_4,  RC_LH_ADULT_FISH_5,  RC_LH_ADULT_FISH_6,  RC_LH_ADULT_FISH_7,  RC_LH_ADULT_FISH_8,
+    RC_LH_ADULT_FISH_9,  RC_LH_ADULT_FISH_10, RC_LH_ADULT_FISH_11, RC_LH_ADULT_FISH_12, RC_LH_ADULT_FISH_13,
+    RC_LH_ADULT_FISH_14, RC_LH_ADULT_FISH_15, RC_LH_ADULT_LOACH
+};
+
+std::vector<RandomizerCheck> Rando::StaticData::overworldFishLocations = {
+    RC_DMC_UPPER_GROTTO_FISH,      RC_DMT_STORMS_GROTTO_FISH,        RC_HF_SOUTHEAST_GROTTO_FISH,
+    RC_HF_NEAR_MARKET_GROTTO_FISH, RC_HF_OPEN_GROTTO_FISH,           RC_KAK_OPEN_GROTTO_FISH,
+    RC_KF_STORMS_GROTTO_FISH,      RC_LW_NEAR_SHORTCUTS_GROTTO_FISH, RC_ZR_OPEN_GROTTO_FISH,
+    RC_ZD_FISH_1,   RC_ZD_FISH_2,   RC_ZD_FISH_3,   RC_ZD_FISH_4,    RC_ZD_FISH_5
 };
 
 typedef enum {
@@ -1372,6 +1390,62 @@ void Rando::StaticData::InitLocationTable() {
     locationTable[RC_GC_SHOP_ITEM_7] =              Location::Base(RC_GC_SHOP_ITEM_7,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_GORON_CITY,         ACTOR_EN_GIRLA, SCENE_GORON_SHOP,           0x06, 0x36, "Shop Item 7",         "GC Shop Item 7",         RHT_GC_SHOP_ITEM_7,             RG_BUY_RED_POTION_40,  { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2E, 6), SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
     locationTable[RC_GC_SHOP_ITEM_8] =              Location::Base(RC_GC_SHOP_ITEM_8,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_GORON_CITY,         ACTOR_EN_GIRLA, SCENE_GORON_SHOP,           0x07, 0x37, "Shop Item 8",         "GC Shop Item 8",         RHT_GC_SHOP_ITEM_8,             RG_BUY_HEART,          { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2E, 7), SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
 
+    /* +--------------+
+       |  FISHSANITY  |
+       +--------------+ */
+
+    //            Randomizer Check                                 Randomizer Check               Quest         Type         Area                       Actor ID        Scene ID                   Params Flags Short Name                      Spoiler Name                    Hint Text Key               Vanilla Item    Categories           Spoiler Collection Check            Collection Check Group
+    locationTable[RC_LH_CHILD_FISH_1] =             Location::Base(RC_LH_CHILD_FISH_1,            RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         100,  0x00, "Child Pond Fish 1",            "LH Child Pond Fish 1",         RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISH_2] =             Location::Base(RC_LH_CHILD_FISH_2,            RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         101,  0x00, "Child Pond Fish 2",            "LH Child Pond Fish 2",         RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISH_3] =             Location::Base(RC_LH_CHILD_FISH_3,            RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         102,  0x00, "Child Pond Fish 3",            "LH Child Pond Fish 3",         RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISH_4] =             Location::Base(RC_LH_CHILD_FISH_4,            RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         103,  0x00, "Child Pond Fish 4",            "LH Child Pond Fish 4",         RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISH_5] =             Location::Base(RC_LH_CHILD_FISH_5,            RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         104,  0x00, "Child Pond Fish 5",            "LH Child Pond Fish 5",         RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISH_6] =             Location::Base(RC_LH_CHILD_FISH_6,            RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         105,  0x00, "Child Pond Fish 6",            "LH Child Pond Fish 6",         RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISH_7] =             Location::Base(RC_LH_CHILD_FISH_7,            RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         106,  0x00, "Child Pond Fish 7",            "LH Child Pond Fish 7",         RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISH_8] =             Location::Base(RC_LH_CHILD_FISH_8,            RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         107,  0x00, "Child Pond Fish 8",            "LH Child Pond Fish 8",         RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISH_9] =             Location::Base(RC_LH_CHILD_FISH_9,            RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         108,  0x00, "Child Pond Fish 9",            "LH Child Pond Fish 9",         RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISH_10] =            Location::Base(RC_LH_CHILD_FISH_10,           RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         109,  0x00, "Child Pond Fish 10",           "LH Child Pond Fish 10",        RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISH_11] =            Location::Base(RC_LH_CHILD_FISH_11,           RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         110,  0x00, "Child Pond Fish 11",           "LH Child Pond Fish 11",        RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISH_12] =            Location::Base(RC_LH_CHILD_FISH_12,           RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         111,  0x00, "Child Pond Fish 12",           "LH Child Pond Fish 12",        RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISH_13] =            Location::Base(RC_LH_CHILD_FISH_13,           RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         112,  0x00, "Child Pond Fish 13",           "LH Child Pond Fish 13",        RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISH_14] =            Location::Base(RC_LH_CHILD_FISH_14,           RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         113,  0x00, "Child Pond Fish 14",           "LH Child Pond Fish 14",        RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISH_15] =            Location::Base(RC_LH_CHILD_FISH_15,           RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         114,  0x00, "Child Pond Fish 15",           "LH Child Pond Fish 15",        RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_LOACH_1] =            Location::Base(RC_LH_CHILD_LOACH_1,           RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         115,  0x00, "Child Pond Loach 1",           "LH Child Pond Loach 1",        RHT_LH_HYRULE_LOACH,         RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_LOACH_2] =            Location::Base(RC_LH_CHILD_LOACH_2,           RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         116,  0x00, "Child Pond Loach 2",           "LH Child Pond Loach 2",        RHT_LH_HYRULE_LOACH,         RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_FISH_1] =             Location::Base(RC_LH_ADULT_FISH_1,            RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         100,  0x00, "Adult Pond Fish 1",            "LH Adult Pond Fish 1",         RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_FISH_2] =             Location::Base(RC_LH_ADULT_FISH_2,            RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         101,  0x00, "Adult Pond Fish 2",            "LH Adult Pond Fish 2",         RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_FISH_3] =             Location::Base(RC_LH_ADULT_FISH_3,            RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         102,  0x00, "Adult Pond Fish 3",            "LH Adult Pond Fish 3",         RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_FISH_4] =             Location::Base(RC_LH_ADULT_FISH_4,            RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         103,  0x00, "Adult Pond Fish 4",            "LH Adult Pond Fish 4",         RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_FISH_5] =             Location::Base(RC_LH_ADULT_FISH_5,            RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         104,  0x00, "Adult Pond Fish 5",            "LH Adult Pond Fish 5",         RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_FISH_6] =             Location::Base(RC_LH_ADULT_FISH_6,            RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         105,  0x00, "Adult Pond Fish 6",            "LH Adult Pond Fish 6",         RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_FISH_7] =             Location::Base(RC_LH_ADULT_FISH_7,            RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         106,  0x00, "Adult Pond Fish 7",            "LH Adult Pond Fish 7",         RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_FISH_8] =             Location::Base(RC_LH_ADULT_FISH_8,            RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         107,  0x00, "Adult Pond Fish 8",            "LH Adult Pond Fish 8",         RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_FISH_9] =             Location::Base(RC_LH_ADULT_FISH_9,            RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         108,  0x00, "Adult Pond Fish 9",            "LH Adult Pond Fish 9",         RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_FISH_10] =            Location::Base(RC_LH_ADULT_FISH_10,           RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         109,  0x00, "Adult Pond Fish 10",           "LH Adult Pond Fish 10",        RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_FISH_11] =            Location::Base(RC_LH_ADULT_FISH_11,           RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         110,  0x00, "Adult Pond Fish 11",           "LH Adult Pond Fish 11",        RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_FISH_12] =            Location::Base(RC_LH_ADULT_FISH_12,           RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         111,  0x00, "Adult Pond Fish 12",           "LH Adult Pond Fish 12",        RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_FISH_13] =            Location::Base(RC_LH_ADULT_FISH_13,           RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         112,  0x00, "Adult Pond Fish 13",           "LH Adult Pond Fish 13",        RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_FISH_14] =            Location::Base(RC_LH_ADULT_FISH_14,           RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         113,  0x00, "Adult Pond Fish 14",           "LH Adult Pond Fish 14",        RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_FISH_15] =            Location::Base(RC_LH_ADULT_FISH_15,           RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         114,  0x00, "Adult Pond Fish 15",           "LH Adult Pond Fish 15",        RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_LOACH] =              Location::Base(RC_LH_ADULT_LOACH,             RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         115,  0x00, "Adult Pond Loach",             "LH Adult Pond Loach",          RHT_LH_HYRULE_LOACH,         RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    // Grotto fish
+    locationTable[RC_KF_STORMS_GROTTO_FISH] =           Location::Base(RC_KF_STORMS_GROTTO_FISH,            RCQUEST_BOTH, RCTYPE_FISH, RCAREA_KOKIRI_FOREST,        ACTOR_EN_FISH,  SCENE_GROTTOS,  1,    0x00, "Storms Grotto Fish",           "KF Storms Grotto Fish",            RHT_KF_STORMS_GROTTO_FISH,          RG_FISH, { Category::cFish }, SpoilerCollectionCheck::Fish(0x2C, SCENE_GROTTOS), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_FISH] =   Location::Base(RC_LW_NEAR_SHORTCUTS_GROTTO_FISH,    RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LOST_WOODS,           ACTOR_EN_FISH,  SCENE_GROTTOS,  1,    0x00, "Near Shortcuts Grotto Fish",   "LW Near Shortcuts Grotto Fish",    RHT_LW_NEAR_SHORTCUTS_GROTTO_FISH,  RG_FISH, { Category::cFish }, SpoilerCollectionCheck::Fish(0x14, SCENE_GROTTOS), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_HF_SOUTHEAST_GROTTO_FISH] =        Location::Base(RC_HF_SOUTHEAST_GROTTO_FISH,         RCQUEST_BOTH, RCTYPE_FISH, RCAREA_HYRULE_FIELD,         ACTOR_EN_FISH,  SCENE_GROTTOS,  1,    0x00, "Southeast Grotto Fish",        "HF Southeast Grotto Fish",         RHT_HF_SOUTHEAST_GROTTO_FISH,       RG_FISH, { Category::cFish }, SpoilerCollectionCheck::Fish(0x22, SCENE_GROTTOS), SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_HF_OPEN_GROTTO_FISH] =             Location::Base(RC_HF_OPEN_GROTTO_FISH,              RCQUEST_BOTH, RCTYPE_FISH, RCAREA_HYRULE_FIELD,         ACTOR_EN_FISH,  SCENE_GROTTOS,  1,    0x00, "Open Grotto Fish",             "HF Open Grotto Fish",              RHT_HF_OPEN_GROTTO_FISH,            RG_FISH, { Category::cFish }, SpoilerCollectionCheck::Fish(0x03, SCENE_GROTTOS), SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_HF_NEAR_MARKET_GROTTO_FISH] =      Location::Base(RC_HF_NEAR_MARKET_GROTTO_FISH,       RCQUEST_BOTH, RCTYPE_FISH, RCAREA_HYRULE_FIELD,         ACTOR_EN_FISH,  SCENE_GROTTOS,  1,    0x00, "Near Market Grotto Fish",      "HF Near Market Grotto Fish",       RHT_HF_NEAR_MARKET_GROTTO_FISH,     RG_FISH, { Category::cFish }, SpoilerCollectionCheck::Fish(0x00, SCENE_GROTTOS), SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_KAK_OPEN_GROTTO_FISH] =            Location::Base(RC_KAK_OPEN_GROTTO_FISH,             RCQUEST_BOTH, RCTYPE_FISH, RCAREA_KAKARIKO_VILLAGE,     ACTOR_EN_FISH,  SCENE_GROTTOS,  1,    0x00, "Open Grotto Fish",             "Kak Open Grotto Fish",             RHT_KAK_OPEN_GROTTO_FISH,           RG_FISH, { Category::cFish }, SpoilerCollectionCheck::Fish(0x28, SCENE_GROTTOS), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_DMT_STORMS_GROTTO_FISH] =          Location::Base(RC_DMT_STORMS_GROTTO_FISH,           RCQUEST_BOTH, RCTYPE_FISH, RCAREA_DEATH_MOUNTAIN_TRAIL, ACTOR_EN_FISH,  SCENE_GROTTOS,  1,    0x00, "Storms Grotto Fish",           "DMT Storms Grotto Fish",           RHT_DMT_STORMS_GROTTO_FISH,         RG_FISH, { Category::cFish }, SpoilerCollectionCheck::Fish(0x57, SCENE_GROTTOS), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMC_UPPER_GROTTO_FISH] =           Location::Base(RC_DMC_UPPER_GROTTO_FISH,            RCQUEST_BOTH, RCTYPE_FISH, RCAREA_DEATH_MOUNTAIN_CRATER,ACTOR_EN_FISH,  SCENE_GROTTOS,  1,    0x00, "Upper Grotto Fish",            "DMC Upper Grotto Fish",            RHT_DMC_UPPER_GROTTO_FISH,          RG_FISH, { Category::cFish }, SpoilerCollectionCheck::Fish(0x7A, SCENE_GROTTOS), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_ZR_OPEN_GROTTO_FISH] =             Location::Base(RC_ZR_OPEN_GROTTO_FISH,              RCQUEST_BOTH, RCTYPE_FISH, RCAREA_ZORAS_RIVER,          ACTOR_EN_FISH,  SCENE_GROTTOS,  1,    0x00, "Open Grotto Fish",             "ZR Open Grotto Fish",              RHT_ZR_OPEN_GROTTO_FISH,            RG_FISH, { Category::cFish }, SpoilerCollectionCheck::Fish(0x29, SCENE_GROTTOS), SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    // Zora's Domain fish
+    locationTable[RC_ZD_FISH_1] =                       Location::Base(RC_ZD_FISH_1,                        RCQUEST_BOTH, RCTYPE_FISH, RCAREA_ZORAS_DOMAIN,         ACTOR_EN_FISH,  SCENE_ZORAS_DOMAIN, -1 ^ 0, 0x00, "Fish 1",                 "ZD Fish 1",                        RHT_ZD_FISH,                      RG_FISH, { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF, SCENE_ZORAS_DOMAIN), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZD_FISH_2] =                       Location::Base(RC_ZD_FISH_2,                        RCQUEST_BOTH, RCTYPE_FISH, RCAREA_ZORAS_DOMAIN,         ACTOR_EN_FISH,  SCENE_ZORAS_DOMAIN, -1 ^ 1, 0x00, "Fish 2",                 "ZD Fish 2",                        RHT_ZD_FISH,                      RG_FISH, { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF, SCENE_ZORAS_DOMAIN), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZD_FISH_3] =                       Location::Base(RC_ZD_FISH_3,                        RCQUEST_BOTH, RCTYPE_FISH, RCAREA_ZORAS_DOMAIN,         ACTOR_EN_FISH,  SCENE_ZORAS_DOMAIN, -1 ^ 2, 0x00, "Fish 3",                 "ZD Fish 3",                        RHT_ZD_FISH,                      RG_FISH, { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF, SCENE_ZORAS_DOMAIN), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZD_FISH_4] =                       Location::Base(RC_ZD_FISH_4,                        RCQUEST_BOTH, RCTYPE_FISH, RCAREA_ZORAS_DOMAIN,         ACTOR_EN_FISH,  SCENE_ZORAS_DOMAIN, -1 ^ 3, 0x00, "Fish 4",                 "ZD Fish 4",                        RHT_ZD_FISH,                      RG_FISH, { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF, SCENE_ZORAS_DOMAIN), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZD_FISH_5] =                       Location::Base(RC_ZD_FISH_5,                        RCQUEST_BOTH, RCTYPE_FISH, RCAREA_ZORAS_DOMAIN,         ACTOR_EN_FISH,  SCENE_ZORAS_DOMAIN, -1 ^ 4, 0x00, "Fish 5",                 "ZD Fish 5",                        RHT_ZD_FISH,                      RG_FISH, { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF, SCENE_ZORAS_DOMAIN), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+
+
     // Gossip Stones
     //            RandomizerCheck                                           Randomizer Check                    Quest            Area                          Scene                        Params  Flag  Short Name                       Spoiler name                       Categories
     locationTable[RC_DMC_GOSSIP_STONE] =                Location::HintStone(RC_DMC_GOSSIP_STONE,                RCQUEST_BOTH,    RCAREA_DEATH_MOUNTAIN_CRATER, SCENE_DEATH_MOUNTAIN_CRATER, 14341,  0x05, "Gossip Stone",                  "DMC Gossip Stone",                {});
@@ -1424,6 +1498,7 @@ void Rando::StaticData::InitLocationTable() {
     locationTable[RC_SARIA_SONG_HINT]   = Location::OtherHint(RC_SARIA_SONG_HINT,  RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE, RCAREA_KOKIRI_FOREST, ACTOR_ID_MAX,        SCENE_ID_MAX,               "Sarias Song Hint", "Magic Hint Via Saria's Song");
     locationTable[RC_ALTAR_HINT_CHILD]  = Location::OtherHint(RC_ALTAR_HINT_CHILD, RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE, RCAREA_MARKET,        ACTOR_ID_MAX,        SCENE_TEMPLE_OF_TIME,       "Child Altar Hint", "ToT Child Altar Text");
     locationTable[RC_ALTAR_HINT_ADULT]  = Location::OtherHint(RC_ALTAR_HINT_ADULT, RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE, RCAREA_MARKET,        ACTOR_ID_MAX,        SCENE_TEMPLE_OF_TIME,       "Adult Altar Hint", "ToT Adult Altar Text");
+    locationTable[RC_FISHING_POLE_HINT] = Location::OtherHint(RC_FISHING_POLE_HINT,RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE, RCAREA_LAKE_HYLIA,    ACTOR_FISHING,       SCENE_FISHING_POND,         "Fishing Pole Hint","Fishing Pole Hint");
     
     locationTable[RC_TRIFORCE_COMPLETED] = Location::Reward(RC_TRIFORCE_COMPLETED, RCQUEST_BOTH, RCTYPE_STANDARD, RCAREA_MARKET, ACTOR_ID_MAX, SCENE_ID_MAX, 0x00, 0x00, "Completed Triforce", "Completed Triforce", RHT_NONE, RG_NONE, {}, SpoilerCollectionCheck::None(), SpoilerCollectionCheckGroup::GROUP_NO_GROUP);
     // clang-format on
diff --git a/soh/soh/Enhancements/randomizer/logic.cpp b/soh/soh/Enhancements/randomizer/logic.cpp
index da3969511..90e956b0b 100644
--- a/soh/soh/Enhancements/randomizer/logic.cpp
+++ b/soh/soh/Enhancements/randomizer/logic.cpp
@@ -57,6 +57,7 @@ namespace Rando {
                 (itemName == RG_OCARINA_C_RIGHT_BUTTON && OcarinaCRightButton) ||
                 (itemName == RG_OCARINA_C_DOWN_BUTTON  && OcarinaCDownButton)  ||
                 (itemName == RG_OCARINA_C_UP_BUTTON    && OcarinaCUpButton)    ||
+                (itemName == RG_FISHING_POLE           && FishingPole)         ||
                 (itemName == RG_ZELDAS_LULLABY         && ZeldasLullaby)       ||
                 (itemName == RG_EPONAS_SONG            && EponasSong)          ||
                 (itemName == RG_SARIAS_SONG            && SariasSong)          ||
@@ -150,6 +151,11 @@ namespace Rando {
             case RG_PRELUDE_OF_LIGHT:
                 return Ocarina && OcarinaCLeftButton && OcarinaCRightButton && OcarinaCUpButton;
 
+            // Misc. Items
+            // TODO: Once child wallet shuffle is added, this will need to be updated to account for the fishing pond entry fee.
+            case RG_FISHING_POLE:
+                return true; // as long as you have enough rubies
+
             // Magic items
             default:
                 return MagicMeter && (IsMagicItem(itemName) || (IsMagicArrow(itemName) && CanUse(RG_FAIRY_BOW)));
@@ -325,6 +331,9 @@ namespace Rando {
         CanOpenStormGrotto  = CanUse(RG_SONG_OF_STORMS) && (ShardOfAgony || ctx->GetTrickOption(RT_GROTTOS_WITHOUT_AGONY));
         HookshotOrBoomerang = CanUse(RG_HOOKSHOT) || CanUse(RG_BOOMERANG);
         CanGetNightTimeGS   = (CanUse(RG_SUNS_SONG) || !ctx->GetOption(RSK_SKULLS_SUNS_SONG));
+        CanFish = CanUse(RG_FISHING_POLE) || !ctx->GetOption(RSK_SHUFFLE_FISHING_POLE);
+        CanGetChildFish = CanFish && (IsChild || (IsAdult && !ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT)));
+        CanGetAdultFish = CanFish && IsAdult && ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT);
 
         GuaranteeTradePath     = ctx->GetOption(RSK_SHUFFLE_INTERIOR_ENTRANCES) || ctx->GetOption(RSK_SHUFFLE_OVERWORLD_ENTRANCES) || ctx->GetTrickOption(RT_DMT_BOLERO_BIGGORON) || CanBlastOrSmash || StopGCRollingGoronAsAdult;
         //GuaranteeHint          = (hints == "Mask" && MaskofTruth) || (hints == "Agony") || (hints != "Mask" && hints != "Agony");
@@ -743,6 +752,10 @@ namespace Rando {
         CanOpenStormGrotto  = false;
         BigPoeKill          = false;
         HookshotOrBoomerang = false;
+        CanGetChildFish     = false;
+        CanGetAdultFish     = false;
+        FishingPole         = false;
+        CanFish             = false;
 
         BaseHearts      = ctx->GetOption(RSK_STARTING_HEARTS).Value<uint8_t>() + 1;
         Hearts          = 0;
diff --git a/soh/soh/Enhancements/randomizer/logic.h b/soh/soh/Enhancements/randomizer/logic.h
index 38cdda325..dfad1077e 100644
--- a/soh/soh/Enhancements/randomizer/logic.h
+++ b/soh/soh/Enhancements/randomizer/logic.h
@@ -295,6 +295,10 @@ class Logic {
     bool BigPoeKill = false;
     bool HookshotOrBoomerang = false;
     bool CanGetNightTimeGS = false;
+    bool FishingPole = false;
+    bool CanGetChildFish = false;
+    bool CanGetAdultFish = false;
+    bool CanFish = false;
 
     uint8_t OcarinaButtons = 0;
     uint8_t BaseHearts = 0;
diff --git a/soh/soh/Enhancements/randomizer/option_descriptions.cpp b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
index f618b3212..0fd5c2572 100644
--- a/soh/soh/Enhancements/randomizer/option_descriptions.cpp
+++ b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
@@ -233,6 +233,9 @@ void Settings::CreateOptionDescriptions() {
         "\n"
         "The Gerudo Card is required to enter the Gerudo Training Grounds, opening "
         "the gate to Haunted Wasteland and the Horseback Archery minigame.";
+    mOptionDescriptions[RSK_SHUFFLE_FISHING_POLE] = "Shuffles the fishing pole into the item pool.\n"
+        "\n"
+        "The fishing pole is required to play the fishing pond minigame.";
     mOptionDescriptions[RSK_SHOPSANITY] = "Off - All shop items will be the same as vanilla.\n"
                                           "\n"
                                           "0 Items - Vanilla shop items will be shuffled among different shops.\n"
@@ -250,6 +253,17 @@ void Settings::CreateOptionDescriptions() {
     mOptionDescriptions[RSK_SHOPSANITY_PRICES_AFFORDABLE] =
         "Affordable prices per tier: starter = 10, adult = 105, giant = 205, tycoon = 505\n\n"
         "Use this to enable wallet tier locking, but make shop items not as expensive as they could be.";
+    mOptionDescriptions[RSK_FISHSANITY] = "Off - Fish will not be shuffled. No changes will be made to fishing behavior.\n\n"
+        "Shuffle Fishing Pond - The fishing pond's fish will be shuffled. Catching a fish in the fishing pond will grant a reward.\n\n"
+        "Shuffle Overworld Fish - Fish in generic grottos and Zora's Domain will be shuffled. Catching a fish in a bottle will give a reward.\n\n"
+        "Shuffle Both - Both overworld fish and fish in the fishing pond will be shuffled.";
+    mOptionDescriptions[RSK_FISHSANITY_POND_COUNT] = "The number of fish to randomize in the fishing pool.\n\n"
+        "If set to maximum, each fish will have a unique check, including a Hyrule Loach which appears only as child, and "
+        "uncaught fish will be given a visual indicator to distinguish from already-caught fish.\n\n"
+        "Otherwise, any fish caught in the pond will give a reward, until all rewards have been given.";
+    mOptionDescriptions[RSK_FISHSANITY_AGE_SPLIT] = "Enabling this will split the fishing pond fish by age, making fishing pond fish grant different rewards as child and adult.\n\n"
+        "If disabled, then the child pond will be shuffled and shared between both ages.\n\n"
+        "Note that, as child, there is a second loach available in the pond!";
     mOptionDescriptions[RSK_SHUFFLE_SCRUBS] =
         "Off - Scrubs will not be shuffled. The 3 Scrubs that give one-time items in the vanilla game "
         "(PoH, Deku Nut capacity, and Deku Stick capacity) will have random items.\n"
@@ -485,6 +499,7 @@ void Settings::CreateOptionDescriptions() {
         "Talking to the chest game owner after buying a key will tell you the location of Greg the Green Rupee.";
     mOptionDescriptions[RSK_SARIA_HINT] = "Talking to Saria either in person or through Saria's Song will tell you the "
                                           "location of a progressive magic meter.";
+    mOptionDescriptions[RSK_FISHING_POLE_HINT] = "Talking to the fishing pond owner without the fishing pole will tell you its location.";
     mOptionDescriptions[RSK_FROGS_HINT] = "Standing near the pedestal for the frogs in Zora's River will tell you the "
                                           "reward for the frogs' ocarina game.";
     mOptionDescriptions[RSK_BIGGORON_HINT] = "Talking to Biggoron will tell you the item he will give you in exchange for the Claim Check.";
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index aef7291dc..41f937828 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -36,6 +36,7 @@
 #include "trial.h"
 #include "settings.h"
 #include "soh/util.h"
+#include "fishsanity.h"
 
 extern "C" uint32_t ResourceMgr_IsGameMasterQuest();
 extern "C" uint32_t ResourceMgr_IsSceneMasterQuest(s16 sceneNum);
@@ -464,6 +465,20 @@ void Randomizer::LoadHintMessages() {
         "Komm wieder sobald du deinen eigenen&Bogen hast, um einen %rspeziellen Preis%w zu&erhalten!",
         "J'aurai %rune autre récompense%w pour toi&lorsque tu auras ton propre arc."));
 
+    // Fishing pond pole hint
+    CustomMessageManager::Instance->CreateMessage(
+            Randomizer::randoMiscHintsTableID, TEXT_FISHING_POND_START,
+            CustomMessage(ctx->GetHint(RH_FISHING_POLE)->GetText().GetEnglish(),
+                ctx->GetHint(RH_FISHING_POLE)->GetText().GetEnglish(),
+                ctx->GetHint(RH_FISHING_POLE)->GetText().GetFrench())
+        );
+        CustomMessageManager::Instance->CreateMessage(
+            Randomizer::randoMiscHintsTableID, TEXT_FISHING_POND_START_MET,
+            CustomMessage(ctx->GetHint(RH_FISHING_POLE)->GetText().GetEnglish(),
+                ctx->GetHint(RH_FISHING_POLE)->GetText().GetEnglish(),
+                ctx->GetHint(RH_FISHING_POLE)->GetText().GetFrench())
+        );
+
     // Lake Hylia water level system
     CustomMessageManager::Instance->CreateMessage(Randomizer::hintMessageTableID, TEXT_LAKE_HYLIA_WATER_SWITCH_SIGN,
         CustomMessage("Water level control system.&Keep away!",
@@ -731,6 +746,7 @@ ItemObtainability Randomizer::GetItemObtainabilityFromRandomizerGet(RandomizerGe
 
         // Bottle Refills
         case RG_MILK:
+        case RG_FISH:
         case RG_RED_POTION_REFILL:
         case RG_GREEN_POTION_REFILL:
         case RG_BLUE_POTION_REFILL:
@@ -782,6 +798,8 @@ ItemObtainability Randomizer::GetItemObtainabilityFromRandomizerGet(RandomizerGe
         case RG_MAGIC_SINGLE:
         case RG_MAGIC_DOUBLE:
             return gSaveContext.magicLevel < 2 ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE;
+        case RG_FISHING_POLE:
+            return !Flags_GetRandomizerInf(RAND_INF_FISHING_POLE_FOUND) ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE;
 
         // Songs
         case RG_ZELDAS_LULLABY:
@@ -1123,6 +1141,7 @@ GetItemID Randomizer::GetItemIdFromRandomizerGet(RandomizerGet randoGet, GetItem
         case RG_BLUE_POTION_REFILL:
         case RG_BUY_BLUE_POTION:
             return GI_POTION_BLUE;
+        case RG_FISH:
         case RG_BUY_FISH:
             return GI_FISH;
         case RG_BUY_BLUE_FIRE:
@@ -1318,6 +1337,7 @@ bool Randomizer::IsItemVanilla(RandomizerGet randoGet) {
         case RG_PIECE_OF_HEART:
         case RG_HEART_CONTAINER:
         case RG_MILK:
+        case RG_FISH:
         case RG_BOMBS_5:
         case RG_BOMBS_10:
         case RG_BOMBS_20:
@@ -1520,9 +1540,57 @@ std::map<RandomizerCheck, RandomizerInf> rcToRandomizerInf = {
     { RC_LH_ADULT_FISHING,                                            RAND_INF_ADULT_FISHING },
     { RC_MARKET_10_BIG_POES,                                          RAND_INF_10_BIG_POES },
     { RC_KAK_100_GOLD_SKULLTULA_REWARD,                               RAND_INF_KAK_100_GOLD_SKULLTULA_REWARD },
+    { RC_LH_CHILD_FISH_1,                                             RAND_INF_CHILD_FISH_1 },
+    { RC_LH_CHILD_FISH_2,                                             RAND_INF_CHILD_FISH_2 },
+    { RC_LH_CHILD_FISH_3,                                             RAND_INF_CHILD_FISH_3 },
+    { RC_LH_CHILD_FISH_4,                                             RAND_INF_CHILD_FISH_4 },
+    { RC_LH_CHILD_FISH_5,                                             RAND_INF_CHILD_FISH_5 },
+    { RC_LH_CHILD_FISH_6,                                             RAND_INF_CHILD_FISH_6 },
+    { RC_LH_CHILD_FISH_7,                                             RAND_INF_CHILD_FISH_7 },
+    { RC_LH_CHILD_FISH_8,                                             RAND_INF_CHILD_FISH_8 },
+    { RC_LH_CHILD_FISH_9,                                             RAND_INF_CHILD_FISH_9 },
+    { RC_LH_CHILD_FISH_10,                                            RAND_INF_CHILD_FISH_10 },
+    { RC_LH_CHILD_FISH_11,                                            RAND_INF_CHILD_FISH_11 },
+    { RC_LH_CHILD_FISH_12,                                            RAND_INF_CHILD_FISH_12 },
+    { RC_LH_CHILD_FISH_13,                                            RAND_INF_CHILD_FISH_13 },
+    { RC_LH_CHILD_FISH_14,                                            RAND_INF_CHILD_FISH_14 },
+    { RC_LH_CHILD_FISH_15,                                            RAND_INF_CHILD_FISH_15 },
+    { RC_LH_CHILD_LOACH_1,                                            RAND_INF_CHILD_LOACH_1 },
+    { RC_LH_CHILD_LOACH_2,                                            RAND_INF_CHILD_LOACH_2 },
+    { RC_LH_ADULT_FISH_1,                                             RAND_INF_ADULT_FISH_1 },
+    { RC_LH_ADULT_FISH_2,                                             RAND_INF_ADULT_FISH_2 },
+    { RC_LH_ADULT_FISH_3,                                             RAND_INF_ADULT_FISH_3 },
+    { RC_LH_ADULT_FISH_4,                                             RAND_INF_ADULT_FISH_4 },
+    { RC_LH_ADULT_FISH_5,                                             RAND_INF_ADULT_FISH_5 },
+    { RC_LH_ADULT_FISH_6,                                             RAND_INF_ADULT_FISH_6 },
+    { RC_LH_ADULT_FISH_7,                                             RAND_INF_ADULT_FISH_7 },
+    { RC_LH_ADULT_FISH_8,                                             RAND_INF_ADULT_FISH_8 },
+    { RC_LH_ADULT_FISH_9,                                             RAND_INF_ADULT_FISH_9 },
+    { RC_LH_ADULT_FISH_10,                                            RAND_INF_ADULT_FISH_10 },
+    { RC_LH_ADULT_FISH_11,                                            RAND_INF_ADULT_FISH_11 },
+    { RC_LH_ADULT_FISH_12,                                            RAND_INF_ADULT_FISH_12 },
+    { RC_LH_ADULT_FISH_13,                                            RAND_INF_ADULT_FISH_13 },
+    { RC_LH_ADULT_FISH_14,                                            RAND_INF_ADULT_FISH_14 },
+    { RC_LH_ADULT_FISH_15,                                            RAND_INF_ADULT_FISH_15 },
+    { RC_LH_ADULT_LOACH,                                              RAND_INF_ADULT_LOACH },
+    { RC_ZR_OPEN_GROTTO_FISH,                                         RAND_INF_GROTTO_FISH_ZR_OPEN_GROTTO },
+    { RC_DMC_UPPER_GROTTO_FISH,                                       RAND_INF_GROTTO_FISH_DMC_UPPER_GROTTO },
+    { RC_DMT_STORMS_GROTTO_FISH,                                      RAND_INF_GROTTO_FISH_DMT_STORMS_GROTTO },
+    { RC_KAK_OPEN_GROTTO_FISH,                                        RAND_INF_GROTTO_FISH_KAK_OPEN_GROTTO },
+    { RC_HF_NEAR_MARKET_GROTTO_FISH,                                  RAND_INF_GROTTO_FISH_HF_NEAR_MARKET_GROTTO },
+    { RC_HF_OPEN_GROTTO_FISH,                                         RAND_INF_GROTTO_FISH_HF_OPEN_GROTTO },
+    { RC_HF_SOUTHEAST_GROTTO_FISH,                                    RAND_INF_GROTTO_FISH_HF_SOUTHEAST_GROTTO },
+    { RC_LW_NEAR_SHORTCUTS_GROTTO_FISH,                               RAND_INF_GROTTO_FISH_LW_NEAR_SHORTCUTS_GROTTO },
+    { RC_KF_STORMS_GROTTO_FISH,                                       RAND_INF_GROTTO_FISH_KF_STORMS_GROTTO },
+    { RC_ZD_FISH_1,                                                   RAND_INF_ZD_FISH_1 },
+    { RC_ZD_FISH_2,                                                   RAND_INF_ZD_FISH_2 },
+    { RC_ZD_FISH_3,                                                   RAND_INF_ZD_FISH_3 },
+    { RC_ZD_FISH_4,                                                   RAND_INF_ZD_FISH_4 },
+    { RC_ZD_FISH_5,                                                   RAND_INF_ZD_FISH_5 },
 };
 
 Rando::Location* Randomizer::GetCheckObjectFromActor(s16 actorId, s16 sceneNum, s32 actorParams = 0x00) {
+    auto fs = OTRGlobals::Instance->gRandoContext->GetFishsanity();
     RandomizerCheck specialRc = RC_UNKNOWN_CHECK;
     // TODO: Migrate these special cases into table, or at least document why they are special
     switch(sceneNum) {
@@ -1620,6 +1688,15 @@ Rando::Location* Randomizer::GetCheckObjectFromActor(s16 actorId, s16 sceneNum,
                 specialRc = RC_DODONGOS_CAVERN_GOSSIP_STONE;
             }
             break;
+        case SCENE_GROTTOS:
+            // Grotto fish are identified by respawn data
+            if (actorId == ACTOR_EN_FISH && actorParams == 1) {
+                int8_t data = gSaveContext.respawn[RESPAWN_MODE_RETURN].data;
+                if (Rando::StaticData::randomizerGrottoFishMap.contains(data)) {
+                    specialRc = Rando::StaticData::randomizerGrottoFishMap[data];
+                }
+            }
+            break;
     }
 
     if (specialRc != RC_UNKNOWN_CHECK) {
@@ -1727,6 +1804,27 @@ CowIdentity Randomizer::IdentifyCow(s32 sceneNum, s32 posX, s32 posZ) {
     return cowIdentity;
 }
 
+FishIdentity Randomizer::IdentifyFish(s32 sceneNum, s32 actorParams) {
+    struct FishIdentity fishIdentity;
+
+    fishIdentity.randomizerInf = RAND_INF_MAX;
+    fishIdentity.randomizerCheck = RC_UNKNOWN_CHECK;
+
+    // Fishsanity will determine what the identity of the fish should be
+    if (sceneNum == SCENE_FISHING_POND) {
+        return OTRGlobals::Instance->gRandoContext->GetFishsanity()->IdentifyPondFish(actorParams);
+    }
+
+    Rando::Location* location = GetCheckObjectFromActor(ACTOR_EN_FISH, sceneNum, actorParams);
+
+    if (location->GetRandomizerCheck() != RC_UNKNOWN_CHECK) {
+        fishIdentity.randomizerInf = rcToRandomizerInf[location->GetRandomizerCheck()];
+        fishIdentity.randomizerCheck = location->GetRandomizerCheck();
+    }
+
+    return fishIdentity;
+}
+
 u8 Randomizer::GetRandoSettingValue(RandomizerSettingKey randoSettingKey) {
     return Rando::Context::GetInstance()->GetOption(randoSettingKey).GetSelectedOptionIndex();
 }
@@ -2557,6 +2655,32 @@ CustomMessage Randomizer::GetSariaMessage(u16 originalTextId) {
     }
 }
 
+CustomMessage Randomizer::GetFishingPondOwnerMessage(u16 originalTextId) {
+    CustomMessage hintMessageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::randoMiscHintsTableID, TEXT_FISHING_POND_START);
+    CustomMessage messageEntry = CustomMessage(
+      "Sorry, but the pond is closed.&I've lost my good %rfishing pole%w...&Can't go fishing without it!",
+      "",
+      ""
+    );
+
+    if (Rando::Context::GetInstance()->GetOption(RSK_FISHING_POLE_HINT)) {
+        messageEntry = messageEntry + hintMessageEntry;
+    }
+
+    // if the fishing pond guy doesnt remember me i will cry :(
+    if (originalTextId == TEXT_FISHING_POND_START_MET) {
+        messageEntry = CustomMessage(
+            "Hey, mister! I remember you!&It's been a long time!^",
+            "",
+            ""
+        ) + messageEntry;
+    }
+
+    messageEntry.Format();
+
+    return messageEntry;
+}
+
 CustomMessage Randomizer::GetMerchantMessage(RandomizerInf randomizerInf, u16 textId, bool mysterious) {
     auto ctx = Rando::Context::GetInstance();
     CustomMessage messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::merchantMessageTableID, textId);
@@ -3055,7 +3179,7 @@ CustomMessage Randomizer::GetGoronMessage(u16 index) {
 void Randomizer::CreateCustomMessages() {
     // RANDTODO: Translate into french and german and replace GIMESSAGE_UNTRANSLATED
     // with GIMESSAGE(getItemID, itemID, english, german, french).
-    const std::array<GetItemMessage, 71> getItemMessages = {{
+    const std::array<GetItemMessage, 72> getItemMessages = {{
         GIMESSAGE(RG_GREG_RUPEE, ITEM_MASK_GORON, 
 			"You found %gGreg%w!",
 			"%gGreg%w! Du hast ihn wirklich gefunden!",
@@ -3321,6 +3445,7 @@ void Randomizer::CreateCustomMessages() {
             "You got the %y\xa6%r button for the&Ocarina%w! You can now use it&while playing songs!",
 			"Der %y\xa6%r Knopf%w!&Du kannst ihn nun zum Spielen&von Liedern auf der %rOkarina%w&verwenden!",
 			"Vous trouvez la %rtouche %y\xa6%r de&l'Ocarina%w! Vous pouvez&maintenant l'utiliser lorsque&vous en jouez!"),
+        GIMESSAGE_UNTRANSLATED(RG_FISHING_POLE, ITEM_FISHING_POLE, "You found a lost %rFishing Pole%w!&Time to hit the pond!"),
     }};
     CreateGetItemMessages(&getItemMessages);
     CreateRupeeMessages();
diff --git a/soh/soh/Enhancements/randomizer/randomizer.h b/soh/soh/Enhancements/randomizer/randomizer.h
index f0e3a3440..23a63a074 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.h
+++ b/soh/soh/Enhancements/randomizer/randomizer.h
@@ -13,6 +13,7 @@
 #include <soh/Enhancements/custom-message/CustomMessageManager.h>
 #include "soh/Enhancements/item-tables/ItemTableTypes.h"
 #include "../custom-message/CustomMessageTypes.h"
+#include "soh/Enhancements/randomizer/fishsanity.h"
 
 #define MAX_SEED_STRING_SIZE 1024
 #define NUM_TRIFORCE_PIECE_MESSAGES 6
@@ -53,6 +54,7 @@ class Randomizer {
     ScrubIdentity IdentifyScrub(s32 sceneNum, s32 actorParams, s32 respawnData);
     ShopItemIdentity IdentifyShopItem(s32 sceneNum, u8 slotIndex);
     CowIdentity IdentifyCow(s32 sceneNum, s32 posX, s32 posZ);
+    FishIdentity IdentifyFish(s32 sceneNum, s32 actorParams);
     GetItemEntry GetItemFromKnownCheck(RandomizerCheck randomizerCheck, GetItemID ogItemId, bool checkObtainability = true);
     GetItemEntry GetItemFromActor(s16 actorId, s16 sceneNum, s16 actorParams, GetItemID ogItemId, bool checkObtainability = true);
     GetItemID GetItemIdFromRandomizerGet(RandomizerGet randoGet, GetItemID ogItemId);
@@ -62,6 +64,7 @@ class Randomizer {
     CustomMessage ReplaceWithItemName(CustomMessage message, std::string&& toReplace, RandomizerCheck hintedCheck);
     CustomMessage GetMiscHintMessage(TextIDs textToGet, RandomizerCheck hintedCheck, RandomizerCheck otherCheck = RC_UNKNOWN_CHECK);
     CustomMessage GetSariaMessage(u16 originalTextId);
+    CustomMessage GetFishingPondOwnerMessage(u16 originalTextId);
     CustomMessage GetMerchantMessage(RandomizerInf randomizerInf, u16 textId, bool mysterious = false);
     RandomizerCheck GetCheckFromActor(s16 actorId, s16 sceneNum, s16 actorParams);
     CustomMessage GetCursedSkullMessage(s16 params, RandomizerCheck hintedCheck);
diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h
index f37952001..2ab5bd745 100644
--- a/soh/soh/Enhancements/randomizer/randomizerTypes.h
+++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@@ -112,6 +112,7 @@ typedef enum {
     RCTYPE_BOSS_HEART_OR_OTHER_REWARD, // Boss heart container or lesser dungeon rewards (lens, ice arrow)
     RCTYPE_DUNGEON_REWARD,             // Dungeon rewards (blue warps)
     RCTYPE_OCARINA,                    // Ocarina locations
+    RCTYPE_FISH,
 } RandomizerCheckType;
 
 typedef enum { RCQUEST_VANILLA, RCQUEST_MQ, RCQUEST_BOTH } RandomizerCheckQuest;
@@ -905,7 +906,40 @@ typedef enum {
     RC_ZF_GS_HIDDEN_CAVE,
     RC_LH_UNDERWATER_ITEM,
     RC_LH_CHILD_FISHING,
+    RC_LH_CHILD_FISH_1,
+    RC_LH_CHILD_FISH_2,
+    RC_LH_CHILD_FISH_3,
+    RC_LH_CHILD_FISH_4,
+    RC_LH_CHILD_FISH_5,
+    RC_LH_CHILD_FISH_6,
+    RC_LH_CHILD_FISH_7,
+    RC_LH_CHILD_FISH_8,
+    RC_LH_CHILD_FISH_9,
+    RC_LH_CHILD_FISH_10,
+    RC_LH_CHILD_FISH_11,
+    RC_LH_CHILD_FISH_12,
+    RC_LH_CHILD_FISH_13,
+    RC_LH_CHILD_FISH_14,
+    RC_LH_CHILD_FISH_15,
+    RC_LH_CHILD_LOACH_1,
+    RC_LH_CHILD_LOACH_2,
     RC_LH_ADULT_FISHING,
+    RC_LH_ADULT_FISH_1,
+    RC_LH_ADULT_FISH_2,
+    RC_LH_ADULT_FISH_3,
+    RC_LH_ADULT_FISH_4,
+    RC_LH_ADULT_FISH_5,
+    RC_LH_ADULT_FISH_6,
+    RC_LH_ADULT_FISH_7,
+    RC_LH_ADULT_FISH_8,
+    RC_LH_ADULT_FISH_9,
+    RC_LH_ADULT_FISH_10,
+    RC_LH_ADULT_FISH_11,
+    RC_LH_ADULT_FISH_12,
+    RC_LH_ADULT_FISH_13,
+    RC_LH_ADULT_FISH_14,
+    RC_LH_ADULT_FISH_15,
+    RC_LH_ADULT_LOACH,
     RC_LH_LAB_DIVE,
     RC_LH_TRADE_FROG,
     RC_LH_FREESTANDING_POH,
@@ -1401,6 +1435,21 @@ typedef enum {
     RC_SARIA_SONG_HINT,
     RC_ALTAR_HINT_CHILD,
     RC_ALTAR_HINT_ADULT,
+    RC_FISHING_POLE_HINT,
+    RC_DMC_UPPER_GROTTO_FISH,
+    RC_DMT_STORMS_GROTTO_FISH,
+    RC_HF_SOUTHEAST_GROTTO_FISH,
+    RC_HF_NEAR_MARKET_GROTTO_FISH,
+    RC_HF_OPEN_GROTTO_FISH,
+    RC_KAK_OPEN_GROTTO_FISH,
+    RC_KF_STORMS_GROTTO_FISH,
+    RC_LW_NEAR_SHORTCUTS_GROTTO_FISH,
+    RC_ZR_OPEN_GROTTO_FISH,
+    RC_ZD_FISH_1,
+    RC_ZD_FISH_2,
+    RC_ZD_FISH_3,
+    RC_ZD_FISH_4,
+    RC_ZD_FISH_5,
     RC_MAX
 } RandomizerCheck;
 
@@ -1807,6 +1856,7 @@ typedef enum {
     RG_HEART_CONTAINER,
     RG_ICE_TRAP,
     RG_MILK,
+    RG_FISH,
     RG_BOMBS_5,
     RG_BOMBS_10,
     RG_BOMBS_20,
@@ -1872,6 +1922,7 @@ typedef enum {
     RG_OCARINA_C_DOWN_BUTTON,
     RG_OCARINA_C_LEFT_BUTTON,
     RG_OCARINA_C_RIGHT_BUTTON,
+    RG_FISHING_POLE,
     RG_HINT,
     RG_TYCOON_WALLET,
     RG_FAIRY_OCARINA,
@@ -1959,6 +2010,7 @@ typedef enum {
     RH_ALTAR_CHILD,
     RH_ALTAR_ADULT,
     RH_SARIA,
+    RH_FISHING_POLE,
     RH_SHEIK_LIGHT_ARROWS,
     RH_MINUET_WARP_LOC,
     RH_BOLERO_WARP_LOC,
@@ -2183,6 +2235,7 @@ typedef enum {
     RHT_KF_MIDOS_BOTTOM_RIGHT_CHEST,
     RHT_KF_KOKIRI_SWORD_CHEST,
     RHT_KF_STORMS_GROTTO_CHEST,
+    RHT_KF_STORMS_GROTTO_FISH,
     RHT_KF_LINKS_HOUSE_COW,
     RHT_KF_GS_KNOW_IT_ALL_HOUSE,
     RHT_KF_GS_BEAN_PATCH,
@@ -2199,6 +2252,7 @@ typedef enum {
     RHT_LW_OCARINA_MEMORY_GAME,
     RHT_LW_TARGET_IN_WOODS,
     RHT_LW_NEAR_SHORTCUTS_GROTTO_CHEST,
+    RHT_LW_NEAR_SHORTCUTS_GROTTO_FISH,
     RHT_LW_TRADE_COJIRO,
     RHT_DEKU_THEATER_SKULL_MASK,
     RHT_DEKU_THEATER_MASK_OF_TRUTH,
@@ -2218,9 +2272,12 @@ typedef enum {
     RHT_SFM_GS,
     RHT_HF_OCARINA_OF_TIME_ITEM,
     RHT_HF_NEAR_MARKET_GROTTO_CHEST,
+    RHT_HF_NEAR_MARKET_GROTTO_FISH,
     RHT_HF_TEKTITE_GROTTO_FREESTANDING_POH,
     RHT_HF_SOUTHEAST_GROTTO_CHEST,
+    RHT_HF_SOUTHEAST_GROTTO_FISH,
     RHT_HF_OPEN_GROTTO_CHEST,
+    RHT_HF_OPEN_GROTTO_FISH,
     RHT_HF_DEKU_SCRUB_GROTTO,
     RHT_HF_COW_GROTTO_COW,
     RHT_HF_GS_COW_GROTTO,
@@ -2288,6 +2345,7 @@ typedef enum {
     RHT_KAK_WINDMILL_FREESTANDING_POH,
     RHT_KAK_MAN_ON_ROOF,
     RHT_KAK_OPEN_GROTTO_CHEST,
+    RHT_KAK_OPEN_GROTTO_FISH,
     RHT_KAK_REDEAD_GROTTO_CHEST,
     RHT_KAK_SHOOTING_GALLERY_REWARD,
     RHT_KAK_TRADE_ODD_MUSHROOM,
@@ -2334,6 +2392,7 @@ typedef enum {
     RHT_DMT_FREESTANDING_POH,
     RHT_DMT_CHEST,
     RHT_DMT_STORMS_GROTTO_CHEST,
+    RHT_DMT_STORMS_GROTTO_FISH,
     RHT_DMT_TRADE_BROKEN_SWORD,
     RHT_DMT_TRADE_EYEDROPS,
     RHT_DMT_TRADE_CLAIM_CHECK,
@@ -2367,6 +2426,7 @@ typedef enum {
     RHT_DMC_VOLCANO_FREESTANDING_POH,
     RHT_DMC_WALL_FREESTANDING_POH,
     RHT_DMC_UPPER_GROTTO_CHEST,
+    RHT_DMC_UPPER_GROTTO_FISH,
     RHT_DMC_GREAT_FAIRY_REWARD,
     RHT_DMC_DEKU_SCRUB,
     RHT_DMC_DEKU_SCRUB_GROTTO_LEFT,
@@ -2376,6 +2436,7 @@ typedef enum {
     RHT_DMC_GS_BEAN_PATCH,
     RHT_ZR_MAGIC_BEAN_SALESMAN,
     RHT_ZR_OPEN_GROTTO_CHEST,
+    RHT_ZR_OPEN_GROTTO_FISH,
     RHT_ZR_FROGS_ZELDAS_LULLABY,
     RHT_ZR_FROGS_EPONAS_SONG,
     RHT_ZR_FROGS_SARIAS_SONG,
@@ -2404,6 +2465,7 @@ typedef enum {
     RHT_ZD_SHOP_ITEM_6,
     RHT_ZD_SHOP_ITEM_7,
     RHT_ZD_SHOP_ITEM_8,
+    RHT_ZD_FISH,
     RHT_ZF_GREAT_FAIRY_REWARD,
     RHT_ZF_ICEBERG_FREESTANDING_POH,
     RHT_ZF_BOTTOM_FREESTANDING_POH,
@@ -2413,6 +2475,8 @@ typedef enum {
     RHT_LH_UNDERWATER_ITEM,
     RHT_LH_CHILD_FISHING,
     RHT_LH_ADULT_FISHING,
+    RHT_LH_POND_FISH,
+    RHT_LH_HYRULE_LOACH,
     RHT_LH_LAB_DIVE,
     RHT_LH_TRADE_FROG,
     RHT_LH_FREESTANDING_POH,
@@ -3094,6 +3158,7 @@ typedef enum {
     RHT_OCARINA_C_DOWN_BUTTON,
     RHT_OCARINA_C_LEFT_BUTTON,
     RHT_OCARINA_C_RIGHT_BUTTON,
+    RHT_FISHING_POLE,
     RHT_EPONA,
     // Entrances
     RHT_DESERT_COLOSSUS_TO_COLOSSUS_GROTTO,
@@ -3284,6 +3349,8 @@ typedef enum {
     RHT_WARP_CHOICE,
     RHT_FROGS_HINT01,
     RHT_FROGS_HINT02,
+    RHT_FISHING_POLE_HINT01,
+    RHT_FISHING_POLE_HINT02,
     // Ganon Line
     RHT_GANON_LINE01,
     RHT_GANON_LINE02,
@@ -3453,6 +3520,7 @@ typedef enum {
     RSK_HBA_HINT,
     RSK_WARP_SONG_HINTS,
     RSK_SCRUB_TEXT_HINT,
+    RSK_FISHING_POLE_HINT,
     RSK_HINT_CLARITY,
     RSK_HINT_DISTRIBUTION,
     RSK_SHUFFLE_MAPANDCOMPASS,
@@ -3538,6 +3606,10 @@ typedef enum {
     RSK_TRIFORCE_HUNT_PIECES_TOTAL,
     RSK_TRIFORCE_HUNT_PIECES_REQUIRED,
     RSK_SHUFFLE_BOSS_SOULS,
+    RSK_FISHSANITY,
+    RSK_FISHSANITY_POND_COUNT,
+    RSK_FISHSANITY_AGE_SPLIT,
+    RSK_SHUFFLE_FISHING_POLE,
     RSK_MAX
 } RandomizerSettingKey;
 
@@ -3668,6 +3740,14 @@ typedef enum {
     RO_BOSS_SOULS_ON_PLUS_GANON,
 } RandoOptionBossSouls;
 
+//Fishsanity settings (off, pond only, grottos only, both)
+typedef enum {
+    RO_FISHSANITY_OFF,
+    RO_FISHSANITY_POND,
+    RO_FISHSANITY_OVERWORLD,
+    RO_FISHSANITY_BOTH
+} RandoOptionsFishsanity;
+
 //Any Dungeon Item (start with, vanilla, own dungeon, any dungeon,
 //overworld, anywhere)
 typedef enum {
@@ -3918,6 +3998,11 @@ typedef struct CowIdentity {
     RandomizerCheck randomizerCheck;
 } CowIdentity;
 
+typedef struct FishIdentity {
+    RandomizerInf randomizerInf;
+    RandomizerCheck randomizerCheck;
+} FishIdentity;
+
 typedef enum {
     TRACKER_WINDOW_FLOATING,
     TRACKER_WINDOW_WINDOW
diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp
index 14335db68..3fa6b82d6 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp
@@ -5,6 +5,7 @@
 #include <string>
 #include <libultraship/bridge.h>
 #include "z64.h"
+#include "fishsanity.h"
 
 std::map<RandomizerCheckArea, std::string> rcAreaNames = {
     { RCAREA_KOKIRI_FOREST, "Kokiri Forest" },
@@ -153,6 +154,7 @@ void RandomizerCheckObjects::UpdateImGuiVisibility() {
              ((CVarGetInteger("gRandomizeShuffleTokens", RO_TOKENSANITY_OFF) == RO_TOKENSANITY_DUNGEONS) &&
               RandomizerCheckObjects::AreaIsDungeon(location.GetArea()))) &&
             (location.GetRCType() != RCTYPE_COW || CVarGetInteger("gRandomizeShuffleCows", RO_GENERIC_NO)) &&
+            (location.GetRCType() != RCTYPE_FISH || ctx->GetFishsanity()->GetFishLocationIncluded(&location, FSO_SOURCE_CVARS)) &&
             (location.GetRCType() != RCTYPE_ADULT_TRADE ||
              CVarGetInteger("gRandomizeShuffleAdultTrade", RO_GENERIC_NO)) &&
             (location.GetRandomizerCheck() != RC_KF_KOKIRI_SWORD_CHEST ||
diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
index 798b11d97..82c2f98fd 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
@@ -15,6 +15,7 @@
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "z64item.h"
 #include "randomizerTypes.h"
+#include "fishsanity.h"
 
 extern "C" {
 #include "variables.h"
@@ -76,6 +77,10 @@ bool showLinksPocket;
 bool fortressFast;
 bool fortressNormal;
 
+u8 fishsanityMode;
+u8 fishsanityPondCount;
+bool fishsanityAgeSplit;
+
 // persistent during gameplay
 bool initialized;
 bool doAreaScroll;
@@ -119,6 +124,7 @@ RandomizerCheck lastLocationChecked = RC_UNKNOWN_CHECK;
 RandomizerCheckArea previousArea = RCAREA_INVALID;
 RandomizerCheckArea currentArea = RCAREA_INVALID;
 OSContPad* trackerButtonsPressed;
+std::unordered_map<RandomizerCheck, std::string> checkNameOverrides;
 
 void BeginFloatWindows(std::string UniqueName, bool& open, ImGuiWindowFlags flags = 0);
 bool CompareChecks(RandomizerCheck, RandomizerCheck);
@@ -415,6 +421,7 @@ bool HasItemBeenCollected(RandomizerCheck rc) {
     case SpoilerCollectionCheckType::SPOILER_CHK_MERCHANT:
     case SpoilerCollectionCheckType::SPOILER_CHK_SHOP_ITEM:
     case SpoilerCollectionCheckType::SPOILER_CHK_COW:
+    case SpoilerCollectionCheckType::SPOILER_CHK_FISH:
     case SpoilerCollectionCheckType::SPOILER_CHK_SCRUB:
     case SpoilerCollectionCheckType::SPOILER_CHK_RANDOMIZER_INF:
     case SpoilerCollectionCheckType::SPOILER_CHK_MASTER_SWORD:
@@ -473,6 +480,14 @@ void CheckTrackerLoadGame(int32_t fileNum) {
         if (areaChecksGotten[entry2->GetArea()] != 0 || RandomizerCheckObjects::AreaIsOverworld(entry2->GetArea())) {
             areasSpoiled |= (1 << entry2->GetArea());
         }
+
+        // Create check name overrides for child pond fish if age split is disabled
+        if (fishsanityMode != RO_FISHSANITY_OFF && fishsanityMode != RO_FISHSANITY_OVERWORLD && entry.GetRCType() == RCTYPE_FISH && entry.GetScene() == SCENE_FISHING_POND &&
+            entry.GetActorParams() != 116 && !fishsanityAgeSplit) {
+            if (entry.GetShortName().starts_with("Child")) {
+                checkNameOverrides[rc] = entry.GetShortName().substr(6);
+            }
+        }
     }
     if (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_LINKS_POCKET) != RO_LINKS_POCKET_NOTHING && IS_RANDO) {
         s8 startingAge = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_STARTING_AGE);
@@ -736,6 +751,7 @@ void CheckTrackerFlagSet(int16_t flagType, int32_t flag) {
               (scCheckType == SpoilerCollectionCheckType::SPOILER_CHK_MERCHANT ||
                scCheckType == SpoilerCollectionCheckType::SPOILER_CHK_SHOP_ITEM ||
                scCheckType == SpoilerCollectionCheckType::SPOILER_CHK_COW ||
+               scCheckType == SpoilerCollectionCheckType::SPOILER_CHK_FISH ||
                scCheckType == SpoilerCollectionCheckType::SPOILER_CHK_SCRUB ||
                scCheckType == SpoilerCollectionCheckType::SPOILER_CHK_MASTER_SWORD ||
                scCheckType == SpoilerCollectionCheckType::SPOILER_CHK_RANDOMIZER_INF)) {
@@ -1161,6 +1177,10 @@ void LoadSettings() {
             fortressNormal = true;
             break;
     }
+
+    fishsanityMode = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_FISHSANITY);
+    fishsanityPondCount = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_FISHSANITY_POND_COUNT);
+    fishsanityAgeSplit = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_FISHSANITY_AGE_SPLIT);
 }
 
 bool IsVisibleInCheckTracker(RandomizerCheck rc) {
@@ -1194,6 +1214,7 @@ bool IsVisibleInCheckTracker(RandomizerCheck rc) {
                 (showDungeonTokens && RandomizerCheckObjects::AreaIsDungeon(loc->GetArea()))
                 ) &&
             (loc->GetRCType() != RCTYPE_COW || showCows) &&
+            (loc->GetRCType() != RCTYPE_FISH || OTRGlobals::Instance->gRandoContext->GetFishsanity()->GetFishLocationIncluded(loc)) &&
             (loc->GetRCType() != RCTYPE_ADULT_TRADE ||
                 showAdultTrade ||
                 rc == RC_KAK_ANJU_AS_ADULT ||  // adult trade checks that are always shuffled
@@ -1375,7 +1396,12 @@ void DrawLocation(RandomizerCheck rc) {
     }
  
     //Main Text
-    txt = loc->GetShortName();
+    if (checkNameOverrides.contains(loc->GetRandomizerCheck())) {
+        txt = checkNameOverrides[loc->GetRandomizerCheck()];
+    } else {
+        txt = loc->GetShortName();
+    }
+    
     if (lastLocationChecked == loc->GetRandomizerCheck()) {
         txt = "* " + txt;
     }
diff --git a/soh/soh/Enhancements/randomizer/randomizer_inf.h b/soh/soh/Enhancements/randomizer/randomizer_inf.h
index 39f84ba2a..8cc8e7fb3 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_inf.h
+++ b/soh/soh/Enhancements/randomizer/randomizer_inf.h
@@ -156,8 +156,43 @@ typedef enum {
 
 
     RAND_INF_TOT_MASTER_SWORD,
+
     RAND_INF_CHILD_FISHING,
+    RAND_INF_CHILD_FISH_1,
+    RAND_INF_CHILD_FISH_2,
+    RAND_INF_CHILD_FISH_3,
+    RAND_INF_CHILD_FISH_4,
+    RAND_INF_CHILD_FISH_5,
+    RAND_INF_CHILD_FISH_6,
+    RAND_INF_CHILD_FISH_7,
+    RAND_INF_CHILD_FISH_8,
+    RAND_INF_CHILD_FISH_9,
+    RAND_INF_CHILD_FISH_10,
+    RAND_INF_CHILD_FISH_11,
+    RAND_INF_CHILD_FISH_12,
+    RAND_INF_CHILD_FISH_13,
+    RAND_INF_CHILD_FISH_14,
+    RAND_INF_CHILD_FISH_15,
+    RAND_INF_CHILD_LOACH_1,
+    RAND_INF_CHILD_LOACH_2,
     RAND_INF_ADULT_FISHING,
+    RAND_INF_ADULT_FISH_1,
+    RAND_INF_ADULT_FISH_2,
+    RAND_INF_ADULT_FISH_3,
+    RAND_INF_ADULT_FISH_4,
+    RAND_INF_ADULT_FISH_5,
+    RAND_INF_ADULT_FISH_6,
+    RAND_INF_ADULT_FISH_7,
+    RAND_INF_ADULT_FISH_8,
+    RAND_INF_ADULT_FISH_9,
+    RAND_INF_ADULT_FISH_10,
+    RAND_INF_ADULT_FISH_11,
+    RAND_INF_ADULT_FISH_12,
+    RAND_INF_ADULT_FISH_13,
+    RAND_INF_ADULT_FISH_14,
+    RAND_INF_ADULT_FISH_15,
+    RAND_INF_ADULT_LOACH,
+
     RAND_INF_10_BIG_POES,
     RAND_INF_GRANT_GANONS_BOSSKEY,
 
@@ -177,6 +212,24 @@ typedef enum {
     RAND_INF_HAS_OCARINA_C_LEFT,
     RAND_INF_HAS_OCARINA_C_RIGHT,
 
+    RAND_INF_GROTTO_FISH_ZR_OPEN_GROTTO,
+    RAND_INF_GROTTO_FISH_DMC_UPPER_GROTTO,
+    RAND_INF_GROTTO_FISH_DMT_STORMS_GROTTO,
+    RAND_INF_GROTTO_FISH_KAK_OPEN_GROTTO,
+    RAND_INF_GROTTO_FISH_HF_NEAR_MARKET_GROTTO,
+    RAND_INF_GROTTO_FISH_HF_OPEN_GROTTO,
+    RAND_INF_GROTTO_FISH_HF_SOUTHEAST_GROTTO,
+    RAND_INF_GROTTO_FISH_LW_NEAR_SHORTCUTS_GROTTO,
+    RAND_INF_GROTTO_FISH_KF_STORMS_GROTTO,
+
+    RAND_INF_FISHING_POLE_FOUND,
+
+    RAND_INF_ZD_FISH_1,
+    RAND_INF_ZD_FISH_2,
+    RAND_INF_ZD_FISH_3,
+    RAND_INF_ZD_FISH_4,
+    RAND_INF_ZD_FISH_5,
+
     // If you add anything to this list, you need to update the size of randomizerInf in z64save.h to be ceil(RAND_INF_MAX / 16)
 
     RAND_INF_MAX,
diff --git a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
index 3d4177c59..d0d8873ae 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
@@ -108,6 +108,10 @@ std::vector<ItemTrackerItem> ocarinaButtonItems = {
     ITEM_TRACKER_ITEM_CUSTOM(RG_OCARINA_C_RIGHT_BUTTON, ITEM_OCARINA_TIME, ITEM_OCARINA_TIME, 0, DrawItem ),
 };
 
+std::vector<ItemTrackerItem> fishingPoleItems = {
+    ITEM_TRACKER_ITEM(ITEM_FISHING_POLE, 0, DrawItem)
+};
+
 std::vector<ItemTrackerDungeon> itemTrackerDungeonsWithMapsHorizontal = {
     { SCENE_DEKU_TREE, { ITEM_DUNGEON_MAP, ITEM_COMPASS } },
     { SCENE_DODONGOS_CAVERN, { ITEM_DUNGEON_MAP, ITEM_COMPASS } },
@@ -726,6 +730,11 @@ void DrawItem(ItemTrackerItem item) {
             hasItem = Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_RIGHT);
             itemName = "Ocarina C Right Button";
             break;
+        case ITEM_FISHING_POLE:
+            actualItemId = item.id;
+            hasItem = IS_RANDO && Flags_GetRandomizerInf(RAND_INF_FISHING_POLE_FOUND);
+            itemName = "Fishing Pole";
+            break;
     }
 
     if (GameInteractor::IsSaveLoaded() && (hasItem && item.id != actualItemId && actualItemTrackerItemMap.find(actualItemId) != actualItemTrackerItemMap.end())) {
@@ -1054,25 +1063,22 @@ void UpdateVectors() {
     // and misc isn't on the main window,
     // and it doesn't already have greg, add him
     if (CVarGetInteger("gItemTrackerGregDisplayType", SECTION_DISPLAY_EXTENDED_HIDDEN) == SECTION_DISPLAY_EXTENDED_MISC_WINDOW &&
-        CVarGetInteger("gItemTrackerMiscItemsDisplayType", SECTION_DISPLAY_MAIN_WINDOW) != SECTION_DISPLAY_MAIN_WINDOW &&
-        std::none_of(miscItems.begin(), miscItems.end(), [](ItemTrackerItem item){return item.id == ITEM_RUPEE_GREEN;})) {
-
-        miscItems.insert(miscItems.end(), gregItems.begin(), gregItems.end());
+        CVarGetInteger("gItemTrackerMiscItemsDisplayType", SECTION_DISPLAY_MAIN_WINDOW) != SECTION_DISPLAY_MAIN_WINDOW) {
+        if (std::none_of(miscItems.begin(), miscItems.end(), [](ItemTrackerItem item) { return item.id == ITEM_RUPEE_GREEN; }))
+            miscItems.insert(miscItems.end(), gregItems.begin(), gregItems.end());
     } else {
-        for (auto it = miscItems.begin(); it != miscItems.end();) {
-            if (it->id == ITEM_RUPEE_GREEN) {
-                miscItems.erase(it);
-            } else {
-                it++;
-            }
-        }
+        miscItems.erase(std::remove_if(miscItems.begin(), miscItems.end(), [](ItemTrackerItem i) { return i.id == ITEM_RUPEE_GREEN; }), miscItems.end());
     }
 
+    bool newRowAdded = false;
     // if we're adding greg to the main window
     if (CVarGetInteger("gItemTrackerGregDisplayType", SECTION_DISPLAY_EXTENDED_HIDDEN) == SECTION_DISPLAY_EXTENDED_MAIN_WINDOW) {
-        // insert empty items until we're on a new row for greg
-        while (mainWindowItems.size() % 6) {
-            mainWindowItems.push_back(ITEM_TRACKER_ITEM(ITEM_NONE, 0, DrawItem));
+        if (!newRowAdded) {
+            // insert empty items until we're on a new row for greg
+            while (mainWindowItems.size() % 6) {
+                mainWindowItems.push_back(ITEM_TRACKER_ITEM(ITEM_NONE, 0, DrawItem));
+            }
+            newRowAdded = true;
         }
 
         // add greg
@@ -1082,16 +1088,37 @@ void UpdateVectors() {
     // If we're adding triforce pieces to the main window
     if (CVarGetInteger("gItemTrackerTriforcePiecesDisplayType", SECTION_DISPLAY_HIDDEN) == SECTION_DISPLAY_MAIN_WINDOW) {
         // If Greg isn't on the main window, add empty items to place the triforce pieces on a new row.
-        if (CVarGetInteger("gItemTrackerGregDisplayType", SECTION_DISPLAY_EXTENDED_HIDDEN) != SECTION_DISPLAY_EXTENDED_MAIN_WINDOW) {
+        if (!newRowAdded) {
             while (mainWindowItems.size() % 6) {
                 mainWindowItems.push_back(ITEM_TRACKER_ITEM(ITEM_NONE, 0, DrawItem));
             }
+            newRowAdded = true;
         }
 
         // Add triforce pieces
         mainWindowItems.insert(mainWindowItems.end(), triforcePieces.begin(), triforcePieces.end());
     }
 
+    // if misc is separate and fishing pole isn't added, add fishing pole to misc
+    if (CVarGetInteger("gItemTrackerFishingPoleDisplayType", SECTION_DISPLAY_EXTENDED_HIDDEN) == SECTION_DISPLAY_EXTENDED_MISC_WINDOW &&
+        CVarGetInteger("gItemTrackerMiscItemsDisplayType", SECTION_DISPLAY_MAIN_WINDOW) != SECTION_DISPLAY_MAIN_WINDOW) {
+        if (std::none_of(miscItems.begin(), miscItems.end(), [](ItemTrackerItem item) { return item.id == ITEM_FISHING_POLE; }))
+            miscItems.insert(miscItems.end(), fishingPoleItems.begin(), fishingPoleItems.end());
+    } else {
+        miscItems.erase(std::remove_if(miscItems.begin(), miscItems.end(), [](ItemTrackerItem i) { return i.id == ITEM_FISHING_POLE; }), miscItems.end());
+    }
+    // add fishing pole to main window
+    if (CVarGetInteger("gItemTrackerFishingPoleDisplayType", SECTION_DISPLAY_EXTENDED_HIDDEN) == SECTION_DISPLAY_EXTENDED_MAIN_WINDOW) {
+        if (!newRowAdded) {
+            while (mainWindowItems.size() % 6) {
+                mainWindowItems.push_back(ITEM_TRACKER_ITEM(ITEM_NONE, 0, DrawItem));
+            }
+            newRowAdded = true;
+        }
+
+        mainWindowItems.insert(mainWindowItems.end(), fishingPoleItems.begin(), fishingPoleItems.end());
+    }
+
     //If we're adding boss souls to the main window...
     if (CVarGetInteger("gItemTrackerBossSoulsDisplayType", SECTION_DISPLAY_HIDDEN) == SECTION_DISPLAY_MAIN_WINDOW) {
         //...add empty items on the main window to get the souls on their own row. (Too many to sit with Greg/Triforce pieces)
@@ -1138,6 +1165,7 @@ void ItemTrackerWindow::DrawElement() {
             (CVarGetInteger("gItemTrackerDungeonItemsDisplayType", SECTION_DISPLAY_HIDDEN) == SECTION_DISPLAY_MAIN_WINDOW) ||
             (CVarGetInteger("gItemTrackerGregDisplayType", SECTION_DISPLAY_EXTENDED_HIDDEN) == SECTION_DISPLAY_EXTENDED_MAIN_WINDOW) ||
             (CVarGetInteger("gItemTrackerTriforcePiecesDisplayType", SECTION_DISPLAY_HIDDEN) == SECTION_DISPLAY_MAIN_WINDOW) ||
+            (CVarGetInteger("gItemTrackerFishingPoleDisplayType", SECTION_DISPLAY_EXTENDED_HIDDEN) == SECTION_DISPLAY_EXTENDED_MAIN_WINDOW) ||
             (CVarGetInteger("gItemTrackerNotesDisplayType", SECTION_DISPLAY_HIDDEN) == SECTION_DISPLAY_MAIN_WINDOW)
         ) {
             BeginFloatingWindows("Item Tracker##main window");
@@ -1226,6 +1254,12 @@ void ItemTrackerWindow::DrawElement() {
             EndFloatingWindows();
         }
 
+        if (CVarGetInteger("gItemTrackerFishingPoleDisplayType", SECTION_DISPLAY_EXTENDED_HIDDEN) == SECTION_DISPLAY_EXTENDED_SEPARATE) {
+            BeginFloatingWindows("Fishing Pole Tracker");
+            DrawItemsInRows(fishingPoleItems);
+            EndFloatingWindows();
+        }
+
         if (CVarGetInteger("gItemTrackerNotesDisplayType", SECTION_DISPLAY_HIDDEN) == SECTION_DISPLAY_SEPARATE && CVarGetInteger("gItemTrackerDisplayType", TRACKER_DISPLAY_ALWAYS) == TRACKER_DISPLAY_ALWAYS) {
             ImGui::SetNextWindowSize(ImVec2(400,300), ImGuiCond_FirstUseEver);
             BeginFloatingWindows("Personal Notes", ImGuiWindowFlags_NoFocusOnAppearing);
@@ -1373,6 +1407,10 @@ void ItemTrackerSettingsWindow::DrawElement() {
         shouldUpdateVectors = true;
     }
 
+    if (UIWidgets::LabeledRightAlignedEnhancementCombobox("Fishing Pole", "gItemTrackerFishingPoleDisplayType", extendedDisplayTypes, SECTION_DISPLAY_EXTENDED_HIDDEN)) {
+        shouldUpdateVectors = true;
+    }
+
     if (CVarGetInteger("gItemTrackerDisplayType", TRACKER_DISPLAY_ALWAYS) == TRACKER_DISPLAY_ALWAYS) {
         if (UIWidgets::LabeledRightAlignedEnhancementCombobox("Personal notes", "gItemTrackerNotesDisplayType", displayTypes, SECTION_DISPLAY_HIDDEN)) {
             shouldUpdateVectors = true;
diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
index edc8880fa..df886e92a 100644
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -108,6 +108,7 @@ void Settings::CreateOptions() {
     mOptions[RSK_SHUFFLE_OCARINA_BUTTONS] = Option::Bool("Shuffle Ocarina Buttons", "gRandomizeShuffleOcarinaButtons", mOptionDescriptions[RSK_SHUFFLE_OCARINA_BUTTONS]);
     mOptions[RSK_SHUFFLE_WEIRD_EGG] = Option::Bool("Shuffle Weird Egg", "gRandomizeShuffleWeirdEgg", mOptionDescriptions[RSK_SHUFFLE_WEIRD_EGG]);
     mOptions[RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD] = Option::Bool("Shuffle Gerudo Membership Card", "gRandomizeShuffleGerudoToken", mOptionDescriptions[RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD]);
+    mOptions[RSK_SHUFFLE_FISHING_POLE] = Option::Bool("Shuffle Fishing Pole", "gRandomizeShuffleFishingPole", mOptionDescriptions[RSK_SHUFFLE_FISHING_POLE]);
     mOptions[RSK_SHUFFLE_MAGIC_BEANS] = Option::Bool("Shuffle Magic Beans", "gRandomizeShuffleBeans", mOptionDescriptions[RSK_SHUFFLE_MAGIC_BEANS]);
     mOptions[RSK_SHUFFLE_MERCHANTS] = Option::U8("Shuffle Merchants", {"Off", "On (No Hints)", "On (With Hints)"}, OptionCategory::Setting, "gRandomizeShuffleMerchants", mOptionDescriptions[RSK_SHUFFLE_MERCHANTS], WidgetType::Combobox, RO_SHUFFLE_MERCHANTS_OFF);
     mOptions[RSK_SHUFFLE_FROG_SONG_RUPEES] = Option::Bool("Shuffle Frog Song Rupees", "gRandomizeShuffleFrogSongRupees", mOptionDescriptions[RSK_SHUFFLE_FROG_SONG_RUPEES]);
@@ -115,6 +116,9 @@ void Settings::CreateOptions() {
     mOptions[RSK_SHUFFLE_CHEST_MINIGAME] = Option::U8("Shuffle Chest Minigame", {"Off", "On (Separate)", "On (Pack)"});
     mOptions[RSK_SHUFFLE_100_GS_REWARD] = Option::Bool("Shuffle 100 GS Reward", "gRandomizeShuffle100GSReward", mOptionDescriptions[RSK_SHUFFLE_100_GS_REWARD], IMFLAG_SEPARATOR_BOTTOM, WidgetType::Checkbox, RO_GENERIC_OFF);
     mOptions[RSK_SHUFFLE_BOSS_SOULS] = Option::U8("Shuffle Boss Souls", {"Off", "On", "On + Ganon"}, OptionCategory::Setting, "gRandomizeShuffleBossSouls", mOptionDescriptions[RSK_SHUFFLE_BOSS_SOULS], WidgetType::Combobox);
+    mOptions[RSK_FISHSANITY] = Option::U8("Fishsanity", {"Off", "Shuffle Fishing Pond", "Shuffle Overworld Fish", "Shuffle Both"}, OptionCategory::Setting, "gRandomizeFishsanity", mOptionDescriptions[RSK_FISHSANITY], WidgetType::Combobox, RO_FISHSANITY_OFF);
+    mOptions[RSK_FISHSANITY_POND_COUNT] = Option::U8("Pond Fish Count", {NumOpts(0,17,1)}, OptionCategory::Setting, "gRandomizeFishsanityPondCount", mOptionDescriptions[RSK_FISHSANITY_POND_COUNT], WidgetType::Slider, 0, true, IMFLAG_NONE);
+    mOptions[RSK_FISHSANITY_AGE_SPLIT] = Option::Bool("Pond Age Split", "gRandomizeFishsanityAgeSplit", mOptionDescriptions[RSK_FISHSANITY_AGE_SPLIT]);
     mOptions[RSK_SHUFFLE_MAPANDCOMPASS] = Option::U8("Maps/Compasses", {"Start With", "Vanilla", "Own Dungeon", "Any Dungeon", "Overworld", "Anywhere"}, OptionCategory::Setting, "gRandomizeStartingMapsCompasses", mOptionDescriptions[RSK_SHUFFLE_MAPANDCOMPASS], WidgetType::Combobox, RO_DUNGEON_ITEM_LOC_OWN_DUNGEON);
     mOptions[RSK_KEYSANITY] = Option::U8("Small Keys", {"Start With", "Vanilla", "Own Dungeon", "Any Dungeon", "Overworld", "Anywhere"}, OptionCategory::Setting, "gRandomizeKeysanity", mOptionDescriptions[RSK_KEYSANITY], WidgetType::Combobox, RO_DUNGEON_ITEM_LOC_OWN_DUNGEON);
     mOptions[RSK_GERUDO_KEYS] = Option::U8("Gerudo Fortress Keys", {"Vanilla", "Any Dungeon", "Overworld", "Anywhere"}, OptionCategory::Setting, "gRandomizeGerudoKeys", mOptionDescriptions[RSK_GERUDO_KEYS], WidgetType::Combobox, RO_GERUDO_KEYS_VANILLA);
@@ -154,6 +158,7 @@ void Settings::CreateOptions() {
     mOptions[RSK_DAMPES_DIARY_HINT] = Option::Bool("Dampe's Diary Hint", "gRandomizeDampeHint", mOptionDescriptions[RSK_DAMPES_DIARY_HINT], IMFLAG_NONE);
     mOptions[RSK_GREG_HINT] = Option::Bool("Greg the Green Rupee Hint", "gRandomizeGregHint", mOptionDescriptions[RSK_GREG_HINT], IMFLAG_NONE);
     mOptions[RSK_SARIA_HINT] = Option::Bool("Saria's Hint", "gRandomizeSariaHint", mOptionDescriptions[RSK_SARIA_HINT], IMFLAG_NONE);
+    mOptions[RSK_FISHING_POLE_HINT] = Option::Bool("Fishing Pole Hint", "gRandomizeFishingPoleHint", mOptionDescriptions[RSK_FISHING_POLE_HINT], IMFLAG_NONE);
     mOptions[RSK_FROGS_HINT] = Option::Bool("Frog Ocarina Game Hint", "gRandomizeFrogsHint", mOptionDescriptions[RSK_FROGS_HINT], IMFLAG_NONE);
     mOptions[RSK_BIGGORON_HINT] = Option::Bool("Biggoron's Hint", "gRandomizeBiggoronHint", mOptionDescriptions[RSK_BIGGORON_HINT], IMFLAG_NONE);
     mOptions[RSK_BIG_POES_HINT] = Option::Bool("Big Poes Hint", "gRandomizeBigPoesHint", mOptionDescriptions[RSK_BIG_POES_HINT], IMFLAG_NONE);
@@ -645,12 +650,16 @@ void Settings::CreateOptions() {
         &mOptions[RSK_SHUFFLE_OCARINA],
         &mOptions[RSK_SHUFFLE_OCARINA_BUTTONS],
         &mOptions[RSK_SHUFFLE_WEIRD_EGG],
-        &mOptions[RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD]
+        &mOptions[RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD],
+        &mOptions[RSK_SHUFFLE_FISHING_POLE],
     }, false, WidgetContainerType::COLUMN);
     mOptionGroups[RSG_SHUFFLE_NPCS_IMGUI] = OptionGroup::SubGroup("Shuffle NPCs & Merchants", {
         &mOptions[RSK_SHOPSANITY],
         &mOptions[RSK_SHOPSANITY_PRICES],
         &mOptions[RSK_SHOPSANITY_PRICES_AFFORDABLE],
+        &mOptions[RSK_FISHSANITY],
+        &mOptions[RSK_FISHSANITY_POND_COUNT],
+        &mOptions[RSK_FISHSANITY_AGE_SPLIT],
         &mOptions[RSK_SHUFFLE_SCRUBS],
         &mOptions[RSK_SHUFFLE_COWS],
         &mOptions[RSK_SHUFFLE_MAGIC_BEANS],
@@ -719,6 +728,7 @@ void Settings::CreateOptions() {
         &mOptions[RSK_CHICKENS_HINT],
         &mOptions[RSK_MALON_HINT],
         &mOptions[RSK_HBA_HINT],
+        &mOptions[RSK_FISHING_POLE_HINT],
         &mOptions[RSK_WARP_SONG_HINTS],
         &mOptions[RSK_SCRUB_TEXT_HINT],
         &mOptions[RSK_KAK_10_SKULLS_HINT],
@@ -843,6 +853,10 @@ void Settings::CreateOptions() {
         &mOptions[RSK_SHOPSANITY],
         &mOptions[RSK_SHOPSANITY_PRICES],
         &mOptions[RSK_SHOPSANITY_PRICES_AFFORDABLE],
+        &mOptions[RSK_FISHSANITY],
+        &mOptions[RSK_FISHSANITY_POND_COUNT],
+        &mOptions[RSK_FISHSANITY_AGE_SPLIT],
+        &mOptions[RSK_SHUFFLE_FISHING_POLE],
         &mOptions[RSK_SHUFFLE_TOKENS],
         &mOptions[RSK_SHUFFLE_SCRUBS],
         &mOptions[RSK_SHUFFLE_COWS],
@@ -946,6 +960,7 @@ void Settings::CreateOptions() {
         &mOptions[RSK_KAK_50_SKULLS_HINT],
         &mOptions[RSK_KAK_100_SKULLS_HINT],
         &mOptions[RSK_SCRUB_TEXT_HINT],
+        &mOptions[RSK_FISHING_POLE_HINT],
         // TODO: Compasses show Reward/WOTH, Maps show Dungeon Mode, Starting Time
         &mOptions[RSK_DAMAGE_MULTIPLIER],
         &mOptions[RSK_BLUE_FIRE_ARROWS],
@@ -1019,6 +1034,9 @@ void Settings::CreateOptions() {
         &mOptions[RSK_SHOPSANITY],
         &mOptions[RSK_SHOPSANITY_PRICES],
         &mOptions[RSK_SHOPSANITY_PRICES_AFFORDABLE],
+        &mOptions[RSK_FISHSANITY],
+        &mOptions[RSK_FISHSANITY_POND_COUNT],
+        &mOptions[RSK_FISHSANITY_AGE_SPLIT],
         &mOptions[RSK_SHUFFLE_SCRUBS],
         &mOptions[RSK_SHUFFLE_COWS],
         &mOptions[RSK_SHUFFLE_MAGIC_BEANS],
@@ -1056,6 +1074,10 @@ void Settings::CreateOptions() {
         { "Shuffle Settings:Shopsanity", RSK_SHOPSANITY },
         { "Shuffle Settings:Shopsanity Prices", RSK_SHOPSANITY_PRICES },
         { "Shuffle Settings:Affordable Prices", RSK_SHOPSANITY_PRICES_AFFORDABLE },
+        { "Shuffle Settings:Fishsanity", RSK_FISHSANITY },
+        { "Shuffle Settings:Pond Fish Count", RSK_FISHSANITY_POND_COUNT },
+        { "Shuffle Settings:Split Pond Fish", RSK_FISHSANITY_AGE_SPLIT },
+        { "Shuffle Settings:Shuffle Fishing Pole", RSK_SHUFFLE_FISHING_POLE },
         { "Shuffle Settings:Scrub Shuffle", RSK_SHUFFLE_SCRUBS },
         { "Shuffle Settings:Shuffle Cows", RSK_SHUFFLE_COWS },
         { "Shuffle Settings:Tokensanity", RSK_SHUFFLE_TOKENS },
@@ -1147,6 +1169,7 @@ void Settings::CreateOptions() {
         { "Miscellaneous Settings:Big Poes Hint", RSK_BIG_POES_HINT },
         { "Miscellaneous Settings:Warp Song Hints", RSK_WARP_SONG_HINTS },
         { "Miscellaneous Settings:Scrub Hint Text", RSK_SCRUB_TEXT_HINT },
+        { "Miscellaneous Settings:Fishing Pole Hint", RSK_FISHING_POLE_HINT },
         { "Miscellaneous Settings:Hint Distribution", RSK_HINT_DISTRIBUTION },
         { "Miscellaneous Settings:Blue Fire Arrows", RSK_BLUE_FIRE_ARROWS },
         { "Miscellaneous Settings:Sunlight Arrows", RSK_SUNLIGHT_ARROWS },
@@ -1526,6 +1549,25 @@ void Settings::UpdateOptionProperties() {
             mOptions[RSK_SHOPSANITY_PRICES_AFFORDABLE].Unhide();
             break;
     }
+    // Hide fishing pond settings if we aren't shuffling the fishing pond
+    switch (CVarGetInteger("gRandomizeFishsanity", RO_FISHSANITY_OFF)) {
+        case RO_FISHSANITY_POND:
+        case RO_FISHSANITY_BOTH:
+            mOptions[RSK_FISHSANITY].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
+            mOptions[RSK_FISHSANITY_POND_COUNT].Unhide();
+            mOptions[RSK_FISHSANITY_AGE_SPLIT].Unhide();
+            break;
+        default:
+            mOptions[RSK_FISHSANITY].AddFlag(IMFLAG_SEPARATOR_BOTTOM);
+            mOptions[RSK_FISHSANITY_POND_COUNT].Hide();
+            mOptions[RSK_FISHSANITY_AGE_SPLIT].Hide();
+    }
+    // Disable fishing pole hint if the fishing pole is not shuffled
+    if (CVarGetInteger("gRandomizeShuffleFishingPole", RO_GENERIC_OFF)) {
+        mOptions[RSK_FISHING_POLE_HINT].Enable();
+    } else {
+        mOptions[RSK_FISHING_POLE_HINT].Disable("This option is disabled since the fishing pole is not shuffled.");
+    }
     // Shuffle 100 GS Reward - Force-Enabled if Ganon's Boss Key is on the 100 GS Reward
     if (CVarGetInteger("gRandomizeShuffleGanonBossKey", RO_GANON_BOSS_KEY_VANILLA) == RO_GANON_BOSS_KEY_KAK_TOKENS) {
         mOptions[RSK_SHUFFLE_100_GS_REWARD].Disable("This option is force-enabled because \"Ganon's Boss Key\" is set to \"100 GS Reward.\"", UIWidgets::CheckboxGraphics::Checkmark);
@@ -2116,6 +2158,7 @@ void Settings::ParseJson(nlohmann::json spoilerFileJson) {
                 case RSK_LACS_TOKEN_COUNT:
                 case RSK_KEYRINGS_RANDOM_COUNT:
                 case RSK_CUCCO_COUNT:
+                case RSK_FISHSANITY_POND_COUNT:
                 case RSK_STARTING_SKULLTULA_TOKEN:
                     numericValueString = it.value();
                     mOptions[index].SetSelectedIndex(std::stoi(numericValueString));
@@ -2178,6 +2221,9 @@ void Settings::ParseJson(nlohmann::json spoilerFileJson) {
                         mOptions[index].SetSelectedIndex(RO_SCRUBS_RANDOM);
                     }
                     break;
+                case RSK_SHUFFLE_FISHING_POLE:
+                case RSK_FISHSANITY_AGE_SPLIT:
+                case RSK_FISHING_POLE_HINT:
                 case RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD:
                 case RSK_SHUFFLE_COWS:
                 case RSK_SHUFFLE_ADULT_TRADE:
@@ -2290,6 +2336,17 @@ void Settings::ParseJson(nlohmann::json spoilerFileJson) {
                         mOptions[index].SetSelectedIndex(RO_AMMO_DROPS_OFF);
                     }
                     break;
+                case RSK_FISHSANITY:
+                    if (it.value() == "Off") {
+                        mOptions[index].SetSelectedIndex(RO_FISHSANITY_OFF);
+                    } else if (it.value() == "Shuffle Fishing Pond") {
+                        mOptions[index].SetSelectedIndex(RO_FISHSANITY_POND);
+                    } else if (it.value() == "Shuffle Overworld Fish") {
+                        mOptions[index].SetSelectedIndex(RO_FISHSANITY_OVERWORLD);
+                    } else if (it.value() == "Shuffle Both") {
+                        mOptions[index].SetSelectedIndex(RO_FISHSANITY_BOTH);
+                    }
+                    break;
                 case RSK_SHUFFLE_BOSS_SOULS:
                     if (it.value() == "Off") {
                         mOptions[index].SetSelectedIndex(RO_BOSS_SOULS_OFF);
diff --git a/soh/soh/Enhancements/randomizer/static_data.h b/soh/soh/Enhancements/randomizer/static_data.h
index 9a0000da2..7650b5dc4 100644
--- a/soh/soh/Enhancements/randomizer/static_data.h
+++ b/soh/soh/Enhancements/randomizer/static_data.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <array>
+#include <unordered_map>
 #include "randomizerTypes.h"
 #include "item.h"
 #include "location.h"
@@ -32,6 +33,10 @@ class StaticData {
       static std::vector<RandomizerCheck> scrubLocations;
       static std::vector<RandomizerCheck> gossipStoneLocations;
       static std::vector<RandomizerCheck> otherHintLocations;
+      static std::vector<RandomizerCheck> pondFishLocations;
+      static std::vector<RandomizerCheck> overworldFishLocations;
+      static std::array<std::pair<RandomizerCheck, RandomizerCheck>, 17> randomizerFishingPondFish;
+      static std::unordered_map<int8_t, RandomizerCheck> randomizerGrottoFishMap;
       StaticData();
       ~StaticData();
 };
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
index d39d115d9..feae99c47 100644
--- a/soh/soh/OTRGlobals.cpp
+++ b/soh/soh/OTRGlobals.cpp
@@ -2387,6 +2387,9 @@ extern "C" CowIdentity Randomizer_IdentifyCow(s32 sceneNum, s32 posX, s32 posZ)
     return OTRGlobals::Instance->gRandomizer->IdentifyCow(sceneNum, posX, posZ);
 }
 
+extern "C" FishIdentity Randomizer_IdentifyFish(s32 sceneNum, s32 actorParams) {
+    return OTRGlobals::Instance->gRandomizer->IdentifyFish(sceneNum, actorParams);
+}
 extern "C" GetItemEntry ItemTable_Retrieve(int16_t getItemID) {
     GetItemEntry giEntry = ItemTableManager::Instance->RetrieveItemEntry(MOD_NONE, getItemID);
     return giEntry;
@@ -2415,6 +2418,10 @@ extern "C" GetItemEntry Randomizer_GetItemFromKnownCheckWithoutObtainabilityChec
     return OTRGlobals::Instance->gRandomizer->GetItemFromKnownCheck(randomizerCheck, ogId, false);
 }
 
+extern "C" RandomizerInf Randomizer_GetRandomizerInfFromCheck(RandomizerCheck randomizerCheck) {
+    return OTRGlobals::Instance->gRandomizer->GetRandomizerInfFromCheck(randomizerCheck);
+}
+
 extern "C" ItemObtainability Randomizer_GetItemObtainabilityFromRandomizerCheck(RandomizerCheck randomizerCheck) {
     return OTRGlobals::Instance->gRandomizer->GetItemObtainabilityFromRandomizerCheck(randomizerCheck);
 }
@@ -2614,6 +2621,9 @@ extern "C" int CustomMessage_RetrieveIfExists(PlayState* play) {
             messageEntry = OTRGlobals::Instance->gRandomizer->GetGoronMessage(choice);
         } else if (Randomizer_GetSettingValue(RSK_FROGS_HINT) && textId == TEXT_FROGS_UNDERWATER) {
             messageEntry = OTRGlobals::Instance->gRandomizer->GetMiscHintMessage(TEXT_FROGS_UNDERWATER, RC_ZR_FROGS_OCARINA_GAME);
+        } else if (Randomizer_GetSettingValue(RSK_FISHING_POLE_HINT) && !Flags_GetRandomizerInf(RAND_INF_FISHING_POLE_FOUND) &&
+                (textId == TEXT_FISHING_POND_START || textId == TEXT_FISHING_POND_START_MET)) {
+            messageEntry = OTRGlobals::Instance->gRandomizer->GetFishingPondOwnerMessage(textId);
         } else if (Randomizer_GetSettingValue(RSK_SARIA_HINT) &&
         (gPlayState->sceneNum == SCENE_SACRED_FOREST_MEADOW && textId == TEXT_SARIA_SFM) || (textId >= TEXT_SARIAS_SONG_FACE_TO_FACE && textId <= TEXT_SARIAS_SONG_CHANNELING_POWER)) {
             messageEntry = OTRGlobals::Instance->gRandomizer->GetSariaMessage(textId);
diff --git a/soh/soh/OTRGlobals.h b/soh/soh/OTRGlobals.h
index 76600d894..143ec9ef2 100644
--- a/soh/soh/OTRGlobals.h
+++ b/soh/soh/OTRGlobals.h
@@ -156,6 +156,7 @@ RandomizerCheck Randomizer_GetCheckFromActor(s16 actorId, s16 sceneNum, s16 acto
 ScrubIdentity Randomizer_IdentifyScrub(s32 sceneNum, s32 actorParams, s32 respawnData);
 ShopItemIdentity Randomizer_IdentifyShopItem(s32 sceneNum, u8 slotIndex);
 CowIdentity Randomizer_IdentifyCow(s32 sceneNum, s32 posX, s32 posZ);
+FishIdentity Randomizer_IdentifyFish(s32 sceneNum, s32 actorParams);
 void Randomizer_ParseSpoiler(const char* fileLoc);
 void Randomizer_LoadHintMessages();
 void Randomizer_LoadMerchantMessages();
@@ -164,6 +165,7 @@ GetItemEntry Randomizer_GetItemFromActor(s16 actorId, s16 sceneNum, s16 actorPar
 GetItemEntry Randomizer_GetItemFromActorWithoutObtainabilityCheck(s16 actorId, s16 sceneNum, s16 actorParams, GetItemID ogId);
 GetItemEntry Randomizer_GetItemFromKnownCheck(RandomizerCheck randomizerCheck, GetItemID ogId);
 GetItemEntry Randomizer_GetItemFromKnownCheckWithoutObtainabilityCheck(RandomizerCheck randomizerCheck, GetItemID ogId);
+RandomizerInf Randomizer_GetRandomizerInfFromCheck(RandomizerCheck randomizerCheck);
 ItemObtainability Randomizer_GetItemObtainabilityFromRandomizerCheck(RandomizerCheck randomizerCheck);
 void Randomizer_GenerateSeed();
 uint8_t Randomizer_IsSeedGenerated();
diff --git a/soh/soh/SaveManager.cpp b/soh/soh/SaveManager.cpp
index 83d648039..991e2df6d 100644
--- a/soh/soh/SaveManager.cpp
+++ b/soh/soh/SaveManager.cpp
@@ -272,6 +272,9 @@ void SaveManager::LoadRandomizerVersion2() {
     std::string sariaText;
     SaveManager::Instance->LoadData("sariaText", sariaText);
     randoContext->AddHint(RH_SARIA, Text(sariaText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static");
+    std::string fishingPoleText;
+    SaveManager::Instance->LoadData("fishingPoleText", fishingPoleText);
+    randoContext->AddHint(RH_FISHING_POLE, Text(fishingPoleText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static");
     std::string warpMinuetText;
     SaveManager::Instance->LoadData("warpMinuetText", warpMinuetText);
     randoContext->AddHint(RH_MINUET_WARP_LOC, Text(warpMinuetText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", randoContext->GetAreaFromString(warpMinuetText));
diff --git a/soh/soh/SohMenuBar.cpp b/soh/soh/SohMenuBar.cpp
index 81fa63c55..86ecd7322 100644
--- a/soh/soh/SohMenuBar.cpp
+++ b/soh/soh/SohMenuBar.cpp
@@ -871,6 +871,10 @@ void DrawEnhancementsMenu() {
                     UIWidgets::Tooltip("When a line is stable, guarantee bite. Otherwise use default logic");
                     UIWidgets::PaddedEnhancementCheckbox("Fish Never Escape", "gFishNeverEscape", true, false, disabled, disabledTooltip);
                     UIWidgets::Tooltip("Once a hook has been set, fish will never let go while being reeled in.");
+                    UIWidgets::PaddedEnhancementCheckbox("Loaches Always Appear", "gLoachesAlwaysAppear", true, false, disabled, disabledTooltip);
+                    UIWidgets::Tooltip("Loaches will always appear in the fishing pond instead of every four visits.");
+                    UIWidgets::PaddedEnhancementCheckbox("Skip Keep Confirmation", "gSkipKeepConfirmation", true, false, disabled, disabledTooltip);
+                    UIWidgets::Tooltip("The pond owner will not ask to confirm if you want to keep a smaller fish.");
                     UIWidgets::PaddedEnhancementSliderInt("Child Minimum Weight: %d", "##cMinimumWeight", "gChildMinimumWeightFish", 3, 10, "", 10, true, true, false, disabled, disabledTooltip);
                     UIWidgets::Tooltip("The minimum weight for the unique fishing reward as a child");
                     UIWidgets::PaddedEnhancementSliderInt("Adult Minimum Weight: %d", "##aMinimumWeight", "gAdultMinimumWeightFish", 6, 13, "", 13, true, true, false, disabled, disabledTooltip);
diff --git a/soh/src/code/z_draw.c b/soh/src/code/z_draw.c
index e9ab95398..8dcd847ec 100644
--- a/soh/src/code/z_draw.c
+++ b/soh/src/code/z_draw.c
@@ -76,6 +76,7 @@
 #include "objects/object_gi_dekupouch/object_gi_dekupouch.h"
 #include "objects/object_gi_rupy/object_gi_rupy.h"
 #include "objects/object_gi_sword_1/object_gi_sword_1.h"
+#include "objects/object_fish/object_fish.h"
 #include "objects/object_st/object_st.h"
 
 #include "soh_assets.h"
@@ -113,6 +114,7 @@ void GetItem_DrawJewelGoron(PlayState* play, s16 drawId);
 void GetItem_DrawJewelZora(PlayState* play, s16 drawId);
 void GetItem_DrawGenericMusicNote(PlayState* play, s16 drawId);
 void GetItem_DrawTriforcePiece(PlayState* play, s16 drawId);
+void GetItem_DrawFishingPole(PlayState* play, s16 drawId);
 
 typedef struct {
     /* 0x00 */ void (*drawFunc)(PlayState*, s16);
@@ -388,7 +390,8 @@ DrawItemTableEntry sDrawItemTable[] = {
     { GetItem_DrawGenericMusicNote, { gGiSongNoteDL } }, //Sun's song
     { GetItem_DrawGenericMusicNote, { gGiSongNoteDL } }, //Song of time
     { GetItem_DrawGenericMusicNote, { gGiSongNoteDL } }, //Song of storms
-    { GetItem_DrawTriforcePiece, { gTriforcePiece0DL } } // Triforce Piece
+    { GetItem_DrawTriforcePiece, { gTriforcePiece0DL } }, // Triforce Piece
+    { GetItem_DrawFishingPole, { gFishingPoleGiDL } }, // Fishing Pole
 };
 
 /**
@@ -1065,3 +1068,54 @@ void GetItem_DrawTriforcePiece(PlayState* play, s16 drawId) {
 
     CLOSE_DISPS(play->state.gfxCtx);
 }
+
+void GetItem_DrawFishingPole(PlayState* play, s16 drawId) {
+    Vec3f pos;
+    OPEN_DISPS(play->state.gfxCtx);
+
+    // Draw rod
+    Gfx_SetupDL_25Opa(play->state.gfxCtx);
+    Matrix_Scale(0.2, 0.2, 0.2, MTXMODE_APPLY);
+    gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
+              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gFishingPoleGiDL);
+
+    // Draw lure
+    Matrix_Push();
+    Matrix_Scale(5.0f, 5.0f, 5.0f, MTXMODE_APPLY);
+    pos.x = 0.0f;
+    pos.y = -25.5f;
+    pos.z = -4.0f;
+    Matrix_Translate(pos.x, pos.y, pos.z, MTXMODE_APPLY);
+    Matrix_RotateZ(M_PI / -2, MTXMODE_APPLY);
+    Matrix_RotateY((M_PI / -2) - 0.2f, MTXMODE_APPLY);
+    Matrix_Scale(0.006f, 0.006f, 0.006f, MTXMODE_APPLY);
+    Gfx_SetupDL_25Opa(play->state.gfxCtx);
+    gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
+              G_MTX_NOPUSH | G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gFishingLureFloatDL);
+
+    // Draw hooks
+    Matrix_RotateY(0.2f, MTXMODE_APPLY);
+    Matrix_Translate(0.0f, 0.0f, -300.0f, MTXMODE_APPLY);
+    gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
+              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gFishingLureHookDL);
+    Matrix_RotateZ(M_PI / 2, MTXMODE_APPLY);
+    gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
+              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gFishingLureHookDL);
+
+    Matrix_Translate(0.0f, -2200.0f, 700.0f, MTXMODE_APPLY);
+    gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
+              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gFishingLureHookDL);
+    Matrix_RotateZ(M_PI / 2, MTXMODE_APPLY);
+    gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
+              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gFishingLureHookDL);
+
+    Matrix_Pop();
+
+    CLOSE_DISPS(play->state.gfxCtx);
+}
\ No newline at end of file
diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c
index 141dbaf6a..7abc2b151 100644
--- a/soh/src/code/z_parameter.c
+++ b/soh/src/code/z_parameter.c
@@ -2644,6 +2644,11 @@ u16 Randomizer_Item_Give(PlayState* play, GetItemEntry giEntry) {
         return Return_Item_Entry(giEntry, RG_NONE);
     }
 
+    if (item == RG_FISHING_POLE) {
+        Flags_SetRandomizerInf(RAND_INF_FISHING_POLE_FOUND);
+        return Return_Item_Entry(giEntry, RG_NONE);
+    }
+
     if (item == RG_PROGRESSIVE_BOMBCHUS) {
         if (INV_CONTENT(ITEM_BOMBCHU) == ITEM_NONE) {
             INV_CONTENT(ITEM_BOMBCHU) = ITEM_BOMBCHU;
diff --git a/soh/src/overlays/actors/ovl_En_Fish/z_en_fish.c b/soh/src/overlays/actors/ovl_En_Fish/z_en_fish.c
index 785d1fbca..e777d993f 100644
--- a/soh/src/overlays/actors/ovl_En_Fish/z_en_fish.c
+++ b/soh/src/overlays/actors/ovl_En_Fish/z_en_fish.c
@@ -7,6 +7,7 @@
 #include "z_en_fish.h"
 #include "objects/gameplay_keep/gameplay_keep.h"
 #include "vt.h"
+#include "soh/Enhancements/randomizer/fishsanity.h"
 
 #define FLAGS 0
 
@@ -36,6 +37,7 @@ void EnFish_Unique_SwimIdle(EnFish* this, PlayState* play);
 static Actor* D_80A17010 = NULL;
 static f32 D_80A17014 = 0.0f;
 static f32 D_80A17018 = 0.0f;
+static Color_RGBA16 fsPulseColor = { 30, 240, 200 };
 
 static ColliderJntSphElementInit sJntSphElementsInit[1] = {
     {
@@ -760,10 +762,31 @@ void EnFish_Update(Actor* thisx, PlayState* play) {
     }
 }
 
+// #region SOH [Randomizer]
+s32 EnFish_FishsanityOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
+                                      void* thisx) {
+    EnFish* this = (EnFish*)thisx;
+    Fishsanity_OpenGreyscaleColor(play, &fsPulseColor, ABS(this->actor.params) * 20);
+    return 0;
+}
+
+void EnFish_FishPostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) {
+    Fishsanity_CloseGreyscaleColor(play);
+}
+// #endregion
+
 void EnFish_Draw(Actor* thisx, PlayState* play) {
     EnFish* this = (EnFish*)thisx;
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
+    // #region SOH [Randomizer]
+    // Modify drawing for uncollected fish, having a shadowDraw implies this is being given uncollected FX
+    if (IS_RANDO && Randomizer_GetOverworldFishShuffled() && this->actor.shape.shadowDraw != NULL) {
+        SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, EnFish_FishsanityOverrideLimbDraw, EnFish_FishPostLimbDraw, this);
+        Collider_UpdateSpheres(0, &this->collider);
+        return;
+    }
+    // #endregion
     SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, NULL, NULL, NULL);
     Collider_UpdateSpheres(0, &this->collider);
-}
+}
\ No newline at end of file
diff --git a/soh/src/overlays/actors/ovl_Fishing/z_fishing.c b/soh/src/overlays/actors/ovl_Fishing/z_fishing.c
index 3f8de83ba..1dd16e6da 100644
--- a/soh/src/overlays/actors/ovl_Fishing/z_fishing.c
+++ b/soh/src/overlays/actors/ovl_Fishing/z_fishing.c
@@ -15,6 +15,8 @@
 #define FLAGS ACTOR_FLAG_UPDATE_WHILE_CULLED
 
 #define WATER_SURFACE_Y(play) play->colCtx.colHeader->waterBoxes->ySurface
+#define IS_FISHSANITY (IS_RANDO && Randomizer_GetPondFishShuffled())
+#define FISHID(params) (Randomizer_IdentifyFish(play->sceneNum, params))
 
 void Fishing_Init(Actor* thisx, PlayState* play);
 void Fishing_Destroy(Actor* thisx, PlayState* play);
@@ -24,14 +26,14 @@ void Fishing_DrawFish(Actor* thisx, PlayState* play);
 void Fishing_DrawOwner(Actor* thisx, PlayState* play);
 void Fishing_Reset(void);
 
-typedef struct {
-    /* 0x00 */ u8 unk_00;
-    /* 0x02 */ Vec3s pos;
-    /* 0x08 */ u8 unk_08;
-    /* 0x0C */ f32 unk_0C;
-} FishingFishInit; // size = 0x10
+bool getShouldSpawnLoaches();
 
-#define EFFECT_COUNT 130
+typedef struct {
+    /* 0x00 */ u8 isLoach;
+    /* 0x02 */ Vec3s pos;
+    /* 0x08 */ u8 baseLength;
+    /* 0x0C */ f32 perception;
+} FishingFishInit; // size = 0x10
 
 typedef enum {
     /* 0x00 */ FS_EFF_NONE,
@@ -45,6 +47,8 @@ typedef enum {
     /* 0x08 */ FS_EFF_RAIN_SPLASH
 } FishingEffectType;
 
+#define FISHING_EFFECT_COUNT 130
+
 typedef struct {
     /* 0x00 */ Vec3f pos;
     /* 0x0C */ Vec3f vel;
@@ -53,12 +57,10 @@ typedef struct {
     /* 0x25 */ u8 timer;
     /* 0x26 */ char unk_26[0x04];
     /* 0x2A */ s16 alpha;
-    /* 0x2C */ s16 unk_2C;
-    /* 0x2E */ s16 unk_2E;
-    /* 0x30 */ f32 unk_30;
-    /* 0x34 */ f32 unk_34;
-    /* 0x38 */ f32 unk_38;
-    /* 0x3C */ f32 unk_3C;
+    /* 0x2C */ s16 state;
+    /* 0x2E */ s16 alphaMax;
+    /* 0x30 */ f32 scale;
+    /* 0x34 */ Vec3f rot;
     u32 epoch;
 } FishingEffect; // size = 0x40
 
@@ -105,10 +107,10 @@ typedef struct {
     /* 0x00 */ u8 type;
     /* 0x02 */ s16 timer;
     /* 0x04 */ Vec3f pos;
-    /* 0x10 */ Vec3f unk_10;
+    /* 0x10 */ Vec3f homePos;
     /* 0x1C */ Vec3f projectedPos;
-    /* 0x28 */ f32 unk_28;
-    /* 0x2C */ f32 unk_2C;
+    /* 0x28 */ f32 velY;
+    /* 0x2C */ f32 scaleX;
     /* 0x30 */ f32 unk_30;
     /* 0x34 */ f32 unk_34;
     /* 0x38 */ f32 unk_38;
@@ -120,6 +122,12 @@ typedef struct {
     u32 epoch;
 } FishingGroupFish; // size = 0x48
 
+typedef enum {
+    /* 0x00 */ FS_LURE_STOCK,
+    /* 0x01 */ FS_LURE_UNK, // hinted at with an "== 1"
+    /* 0x02 */ FS_LURE_SINKING
+} FishingLureTypes;
+
 #define LINE_SEG_COUNT 200
 #define SINKING_LURE_SEG_COUNT 20
 
@@ -136,42 +144,48 @@ const ActorInit Fishing_InitVars = {
     (ActorResetFunc)Fishing_Reset,
 };
 
-static f32 D_80B7A650 = 0.0f;
+static f32 sStormStrength = 0.0f;
 
-static u8 D_80B7A654 = 0;
+static u8 sStormStrengthTarget = 0;
 
-static f32 D_80B7A658 = 0.0f;
+static f32 sFishingStormShade = 0.0f;
 
-static Vec3f D_80B7A65C = { 0.0f, 0.0f, 0.0f };
+static Vec3f sFishingStormSfxPos = { 0.0f, 0.0f, 0.0f };
 
-static f32 D_80B7A668 = 0.0f;
+static f32 sStormSfxFreqScale = 0.0f;
 
 static u8 sSinkingLureLocation = 0;
 
 /// Weight of caught fish. 
-static f32 D_80B7A670 = 0.0f;
+static f32 sFishOnHandLength = 0.0f;
 
-static u8 D_80B7A674 = true;
+static u8 sIsRodVisible = true;
 
-static u16 D_80B7A678 = 0;
+static u16 sFishLengthToWeigh = 0;
 
-static u8 D_80B7A67C = 0;
+static u8 sFishingCaughtTextDelay = 0;
 
-static s32 D_80B7A680 = 0;
+static s32 sFishingTimePlayed = 0;
 
-static s16 D_80B7A684 = 0;
+static s16 sOwnerTheftTimer = 0;
 
-static u8 D_80B7A688 = 0;
-static u8 D_80B7A68C = 0;
-static u8 D_80B7A690 = 0;
+typedef enum {
+    /* 0x00 */ FS_OWNER_BALD,
+    /* 0x01 */ FS_OWNER_CAPPED,
+    /* 0x02 */ FS_OWNER_HAIR
+} FishingOwnerHair;
 
-static s16 D_80B7A694 = 0;
+static u8 sOwnerHair = FS_OWNER_BALD;
+static u8 sIsOwnersHatHooked = false; // hat is on fishing hook
+static u8 sIsOwnersHatSunk = false;   // hat is sinking into pond.
+
+static s16 sRodCastState = 0;
 
 static Vec3f sFishMouthOffset = { 500.0f, 500.0f, 0.0f };
 
 static u8 D_80B7A6A4 = 0;
 
-static f32 D_80B7A6A8 = 0.0f;
+static f32 sRodBendRotY = 0.0f;
 static f32 D_80B7A6AC = 0.0f;
 static f32 D_80B7A6B0 = 0.0f;
 static f32 D_80B7A6B4 = 0.0f;
@@ -179,12 +193,12 @@ static f32 D_80B7A6B8 = 0.0f;
 static f32 D_80B7A6BC = 0.0f;
 static f32 D_80B7A6C0 = 0.0f;
 
-static s16 D_80B7A6C4 = 0;
-static s16 D_80B7A6C8 = 0;
+static s16 sStickAdjXPrev = 0;
+static s16 sStickAdjYPrev = 0;
 
-static u8 D_80B7A6CC = 0;
-static u8 D_80B7A6D0 = 0;
-static u8 D_80B7A6D4 = 0;
+static u8 sFishingPlayerCinematicState = 0;
+static u8 sFishingCinematicTimer = 0;
+static u8 sSinkingLureFound = false;
 
 static ColliderJntSphElementInit sJntSphElementsInit[12] = {
     {
@@ -334,81 +348,81 @@ static ColliderJntSphInit sJntSphInit = {
     sJntSphElementsInit,
 };
 
-static f32 D_80B7A898 = 0.0f;
+static f32 sFishGroupVar = 0.0f;
 
 static Vec3f sZeroVec = { 0.0f, 0.0f, 0.0f };
-static Vec3f D_80B7A8A8 = { 0.0f, 0.0f, 2000.0f };
+static Vec3f sUnusedVec = { 0.0f, 0.0f, 2000.0f };
 
 static Fishing* sFishingMain;
-static u8 D_80B7E074;
+static u8 sReelLock;
 static u8 sLinkAge;
-static u8 D_80B7E076;
-static u8 D_80B7E077;
-static f32 D_80B7E078;
-static u8 D_80B7E07C;
-static u8 D_80B7E07D;
-static u8 D_80B7E07E;
-static s16 D_80B7E080;
-static u8 D_80B7E082;
-static u16 D_80B7E084;
-static u16 D_80B7E086;
-static s8 D_80B7E088;
+static u8 sFishingFoggy;
+static u8 sStormChanceTimer;
+static f32 sFishingRecordLength;
+static u8 sFishOnHandIsLoach;
+static u8 sFishGameNumber; // increments for each purchased play. effects weather
+static u8 sLureCaughtWith;
+static s16 sFishFightTime;
+static u8 sPondOwnerTextIdIndex;
+static u16 sFishesCaught;
+static u16 sFishingCaughtTextId;
+static s8 sLureCameraZoomLevel;
 static Vec3f sOwnerHeadPos;
-static Vec3s sEffOwnerHatRot;
-static u8 D_80B7E0A2;
-static s16 D_80B7E0A4;
-static s16 D_80B7E0A6;
+static Vec3s sEffOwnersHatRot;
+static u8 sLureMoveDelay; // a small delay between the lure hitting the water, and being able to reel.
+static s16 sRumbleDelay;
+static s16 sFishingMusicDelay;
 static Fishing* sFishingHookedFish;
-static s16 D_80B7E0AC;
-static s16 D_80B7E0AE;
+static s16 sFishingPlayingState;
+static s16 sLureTimer; // AND'd for various effects/checks
 static s16 D_80B7E0B0;
 static s16 D_80B7E0B2;
-static s16 D_80B7E0B4;
-static u8 D_80B7E0B6;
+static s16 sRodCastTimer; // used for the inital line casting
+static u8 sLureEquipped;
 static Vec3f sLurePos;
-static Vec3f D_80B7E0C8;
+static Vec3f sLureDrawPos;
 static Vec3f sLureRot;
-static Vec3f D_80B7E0E8;
-static Vec3f D_80B7E0F8;
-static f32 D_80B7E104;
-static f32 D_80B7E108;
-static f32 D_80B7E10C;
-static f32 D_80B7E110;
+static Vec3f sLurePosDelta;
+static Vec3f sLureCastDelta;
+static f32 sLure1Rotate; // lure type 1 is programmed to change this.
+static f32 sLurePosZOffset;
+static f32 sLureRotXTarget;
+static f32 sLureRotXStep;
 static s8 D_80B7E114;
-static s16 D_80B7E116;
+static s16 sRodPullback; // holding A+Down to keep the fish on line
 static u8 D_80B7E118;
-static f32 D_80B7E11C;
-static u8 D_80B7E120;
-static s16 D_80B7E122;
-static u8 D_80B7E124;
-static Vec3f D_80B7E128;
-static f32 D_80B7E134;
-static f32 D_80B7E138;
-static s16 D_80B7E13C;
-static f32 D_80B7E140;
-static f32 D_80B7E144;
+static f32 sRodReelingSpeed;
+static u8 sWiggleAttraction;
+static s16 sLureBitTimer;
+static u8 sLineHooked;
+static Vec3f sLureLineSegPosDelta;
+static f32 sLureWiggleRotYTarget;
+static f32 sLureWigglePosY;
+static s16 sLureWiggleRotY;
+static f32 sLureWiggleSign; // +/-1.0f
+static f32 sRodLineSpooled; // 200 represents the full spool.
 static f32 D_80B7E148;
-static f32 D_80B7E14C;
+static f32 sFishingLineScale;
 static s16 D_80B7E150;
-static f32 D_80B7E154;
+static f32 sReelLinePosStep;
 static Vec3f sRodTipPos;
 static Vec3f sReelLinePos[LINE_SEG_COUNT];
 static Vec3f sReelLineRot[LINE_SEG_COUNT];
 static Vec3f sReelLineUnk[LINE_SEG_COUNT];
 static Vec3f sLureHookRefPos[2];
 static f32 sLureHookRotY[2];
-static u8 D_80B7FDA8;
+static u8 sRodHitTimer; // brief timer for bending rod when line is snapped
 static Vec3f sSinkingLurePos[SINKING_LURE_SEG_COUNT];
-static s16 D_80B7FEA0;
+static s16 sSinkingLureSegmentIndex;
 static f32 sProjectedW;
 static Vec3f sCameraEye;
 static Vec3f sCameraAt;
-static s16 sCameraId;
-static f32 D_80B7FEC8;
-static f32 D_80B7FECC;
+static s16 sSubCamId;
+static f32 sCatchCamX;
+static f32 sSubCamVelFactor;
 static f32 D_80B7FED0;
 static Vec3f sSinkingLureBasePos;
-static f32 D_80B7FEE4;
+static f32 sSinkingLureHeldY; // the lure going to its mark when being held up.
 static s32 sRandSeed0;
 static s32 sRandSeed1;
 static s32 sRandSeed2;
@@ -417,8 +431,10 @@ static FishingGroupFish sGroupFishes[GROUP_FISH_COUNT];
 static f32 sFishGroupAngle1;
 static f32 sFishGroupAngle2;
 static f32 sFishGroupAngle3;
-static FishingEffect sFishingEffects[EFFECT_COUNT];
+static FishingEffect sFishingEffects[FISHING_EFFECT_COUNT];
 static Vec3f sStreamSoundProjectedPos;
+static s16 sFishOnHandParams;
+static Color_RGBA16 fsPulseColor = { 30, 240, 200 };
 
 void Fishing_SetColliderElement(s32 index, ColliderJntSph* collider, Vec3f* pos, f32 scale) {
     collider->elements[index].dim.worldSphere.center.x = pos->x;
@@ -470,7 +486,7 @@ s16 Fishing_SmoothStepToS(s16* pValue, s16 target, s16 scale, s16 step) {
     return stepSize;
 }
 
-void Fishing_SpawnRipple(Vec3f* projectedPos, FishingEffect* effect, Vec3f* pos, f32 arg3, f32 arg4, s16 arg5,
+void Fishing_SpawnRipple(Vec3f* projectedPos, FishingEffect* effect, Vec3f* pos, f32 scale, f32 rotX, s16 alpha,
                          s16 countLimit) {
     s16 i;
 
@@ -484,18 +500,18 @@ void Fishing_SpawnRipple(Vec3f* projectedPos, FishingEffect* effect, Vec3f* pos,
             effect->pos = *pos;
             effect->vel = sZeroVec;
             effect->accel = sZeroVec;
-            effect->unk_30 = arg3 * 0.0025f;
-            effect->unk_34 = arg4 * 0.0025f;
+            effect->scale = scale * 0.0025f;
+            effect->rot.x = rotX * 0.0025f;
 
-            if (arg3 > 300.0f) {
+            if (scale > 300.0f) {
                 effect->alpha = 0;
-                effect->unk_2E = arg5;
-                effect->unk_2C = 0;
-                effect->unk_38 = (effect->unk_34 - effect->unk_30) * 0.05f;
+                effect->alphaMax = alpha;
+                effect->state = 0;
+                effect->rot.y = (effect->rot.x - effect->scale) * 0.05f;
             } else {
-                effect->alpha = arg5;
-                effect->unk_2C = 1;
-                effect->unk_38 = (effect->unk_34 - effect->unk_30) * 0.1f;
+                effect->alpha = alpha;
+                effect->state = 1;
+                effect->rot.y = (effect->rot.x - effect->scale) * 0.1f;
             }
 
             effect->epoch++;
@@ -522,7 +538,7 @@ void Fishing_SpawnDustSplash(Vec3f* projectedPos, FishingEffect* effect, Vec3f*
             effect->vel = *vel;
             effect->accel = accel;
             effect->alpha = 100 + (s16)Rand_ZeroFloat(100.0f);
-            effect->unk_30 = scale;
+            effect->scale = scale;
             effect->epoch++;
             break;
         }
@@ -547,8 +563,8 @@ void Fishing_SpawnWaterDust(Vec3f* projectedPos, FishingEffect* effect, Vec3f* p
             effect->accel = accel;
             effect->alpha = 255;
             effect->timer = (s16)Rand_ZeroFloat(100.0f);
-            effect->unk_30 = scale;
-            effect->unk_34 = 2.0f * scale;
+            effect->scale = scale;
+            effect->rot.x = 2.0f * scale;
             effect->epoch++;
             break;
         }
@@ -557,7 +573,7 @@ void Fishing_SpawnWaterDust(Vec3f* projectedPos, FishingEffect* effect, Vec3f* p
     }
 }
 
-void Fishing_SpawnBubble(Vec3f* projectedPos, FishingEffect* effect, Vec3f* pos, f32 scale, u8 arg4) {
+void Fishing_SpawnBubble(Vec3f* projectedPos, FishingEffect* effect, Vec3f* pos, f32 scale, u8 state) {
     s16 i;
     Vec3f vel = { 0.0f, 1.0f, 0.0f };
 
@@ -572,8 +588,8 @@ void Fishing_SpawnBubble(Vec3f* projectedPos, FishingEffect* effect, Vec3f* pos,
             effect->vel = vel;
             effect->accel = sZeroVec;
             effect->timer = (s16)Rand_ZeroFloat(100.0f);
-            effect->unk_30 = scale;
-            effect->unk_2C = arg4;
+            effect->scale = scale;
+            effect->state = state;
             effect->epoch++;
             break;
         }
@@ -592,14 +608,14 @@ void Fishing_SpawnRainDrop(FishingEffect* effect, Vec3f* pos, Vec3f* rot) {
 
     effect += 30;
 
-    for (i = 30; i < EFFECT_COUNT; i++) {
+    for (i = 30; i < FISHING_EFFECT_COUNT; i++) {
         if (effect->type == FS_EFF_NONE) {
             effect->type = FS_EFF_RAIN_DROP;
             effect->pos = *pos;
             effect->accel = sZeroVec;
-            effect->unk_34 = rot->x;
-            effect->unk_38 = rot->y;
-            effect->unk_3C = rot->z;
+            effect->rot.x = rot->x;
+            effect->rot.y = rot->y;
+            effect->rot.z = rot->z;
             Matrix_RotateY(rot->y, MTXMODE_NEW);
             Matrix_RotateX(rot->x, MTXMODE_APPLY);
             Matrix_MultVec3f(&velSrc, &effect->vel);
@@ -781,7 +797,7 @@ void Fishing_InitPondProps(Fishing* this, PlayState* play) {
         if (prop->type == FS_PROP_REED) {
             prop->scale = (Fishing_RandZeroOne() * 0.25f) + 0.75f;
             prop->reedAngle = Rand_ZeroFloat(2 * M_PI);
-            if (sLinkAge == 1) {
+            if (sLinkAge == LINK_AGE_CHILD) {
                 prop->scale *= 0.6f;
             }
             prop->drawDistance = 1200.0f;
@@ -794,7 +810,7 @@ void Fishing_InitPondProps(Fishing* this, PlayState* play) {
         } else if (prop->type == FS_PROP_LILY_PAD) {
             prop->scale = (Fishing_RandZeroOne() * 0.3f) + 0.5f;
             prop->rotY = Rand_ZeroFloat(2 * M_PI);
-            if (sLinkAge == 1) {
+            if (sLinkAge == LINK_AGE_CHILD) {
                 if ((i % 4) != 0) {
                     prop->scale *= 0.6f;
                 } else {
@@ -836,18 +852,18 @@ void Fishing_Init(Actor* thisx, PlayState* play2) {
     ActorShape_Init(&thisx->shape, 0.0f, NULL, 0.0f);
 
     if (KREG(5) != 0) {
-        sLinkAge = 1;
+        sLinkAge = LINK_AGE_CHILD;
     } else {
         sLinkAge = gSaveContext.linkAge;
     }
 
-    if (thisx->params < 100) {
-        D_80B7E074 = 0;
+    if (thisx->params < EN_FISH_PARAM) {
+        sReelLock = 0;
         sFishingMain = this;
         Collider_InitJntSph(play, &sFishingMain->collider);
         Collider_SetJntSph(play, &sFishingMain->collider, thisx, &sJntSphInit, sFishingMain->colliderElements);
 
-        thisx->params = 1;
+        thisx->params = EN_FISH_OWNER;
 
         SkelAnime_InitFlex(play, &this->skelAnime, &gFishingOwnerSkel, &gFishingOwnerAnim, NULL, NULL, 0);
         Animation_MorphToLoop(&this->skelAnime, &gFishingOwnerAnim, 0.0f);
@@ -866,59 +882,59 @@ void Fishing_Init(Actor* thisx, PlayState* play2) {
         thisx->focus.pos.y += 75.0f;
         thisx->flags |= ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY;
 
-        if (sLinkAge != 1) {
-            if (HIGH_SCORE(HS_FISHING) & 0x1000) {
-                D_80B7A688 = 0;
+        if (sLinkAge != LINK_AGE_CHILD) {
+            if (HIGH_SCORE(HS_FISHING) & HS_FISH_STOLE_HAT) {
+                sOwnerHair = FS_OWNER_BALD;
             } else {
-                D_80B7A688 = 1;
+                sOwnerHair = FS_OWNER_CAPPED;
             }
         } else {
-            D_80B7A688 = 2;
+            sOwnerHair = FS_OWNER_HAIR;
         }
 
-        D_80B7A684 = 20;
+        sOwnerTheftTimer = 20;
         play->specialEffects = sFishingEffects;
         gTimeIncrement = 1;
-        D_80B7E0AC = 0;
-        D_80B7E0A6 = 10;
+        sFishingPlayingState = 0;
+        sFishingMusicDelay = 10;
 
         Audio_QueueSeqCmd(0x1 << 28 | SEQ_PLAYER_BGM_MAIN << 24 | 0x0100FF);
 
-        if (sLinkAge == 1) {
-            if ((HIGH_SCORE(HS_FISHING) & 0x7F) != 0) {
-                D_80B7E078 = HIGH_SCORE(HS_FISHING) & 0x7F;
+        if (sLinkAge == LINK_AGE_CHILD) {
+            if ((HIGH_SCORE(HS_FISHING) & HS_FISH_LENGTH_CHILD) != 0) {
+                sFishingRecordLength = HIGH_SCORE(HS_FISHING) & HS_FISH_LENGTH_CHILD;
             } else {
-                D_80B7E078 = 40.0f;
+                sFishingRecordLength = 40.0f; // 6 lbs
             }
         } else {
-            if ((HIGH_SCORE(HS_FISHING) & 0x7F000000) != 0) {
-                D_80B7E078 = (HIGH_SCORE(HS_FISHING) & 0x7F000000) >> 0x18;
+            if ((HIGH_SCORE(HS_FISHING) & HS_FISH_LENGTH_ADULT) != 0) {
+                sFishingRecordLength = (HIGH_SCORE(HS_FISHING) & HS_FISH_LENGTH_ADULT) >> 0x18;
             } else {
-                D_80B7E078 = 45.0f;
+                sFishingRecordLength = 45.0f; // 7 lbs
             }
         }
 
-        D_80B7E07D = (HIGH_SCORE(HS_FISHING) & 0xFF0000) >> 0x10;
-        if ((D_80B7E07D & 7) == 7) {
+        sFishGameNumber = (HIGH_SCORE(HS_FISHING) & (HS_FISH_PLAYED * 255)) >> 0x10;
+        if ((sFishGameNumber & 7) == 7) {
             play->roomCtx.unk_74[0] = 90;
-            D_80B7E076 = 1;
+            sFishingFoggy = 1;
         } else {
             play->roomCtx.unk_74[0] = 40;
-            D_80B7E076 = 0;
+            sFishingFoggy = 0;
         }
 
-        if (((D_80B7E07D & 7) == 6) || (KREG(3) != 0)) {
-            D_80B7E077 = 100;
+        if (((sFishGameNumber & 7) == 6) || (KREG(3) != 0)) {
+            sStormChanceTimer = 100;
             if (KREG(3) != 0) {
                 KREG(3) = 0;
-                HIGH_SCORE(HS_FISHING) &= 0xFF00FFFF;
-                HIGH_SCORE(HS_FISHING) |= 0x60000;
+                HIGH_SCORE(HS_FISHING) &= ~(HS_FISH_PLAYED * 255);
+                HIGH_SCORE(HS_FISHING) |= (HS_FISH_PLAYED * 6);
             }
         } else {
-            D_80B7E077 = 0;
+            sStormChanceTimer = 0;
         }
 
-        for (i = 0; i < EFFECT_COUNT; i++) {
+        for (i = 0; i < FISHING_EFFECT_COUNT; i++) {
             sFishingEffects[i].type = FS_EFF_NONE;
         }
 
@@ -938,17 +954,17 @@ void Fishing_Init(Actor* thisx, PlayState* play2) {
             fish->type = FS_GROUP_FISH_NORMAL;
 
             if (i <= 20) {
-                fish->unk_10.x = fish->pos.x = sinf(sFishGroupAngle1) * 720.0f;
-                fish->unk_10.z = fish->pos.z = cosf(sFishGroupAngle1) * 720.0f;
+                fish->homePos.x = fish->pos.x = sinf(sFishGroupAngle1) * 720.0f;
+                fish->homePos.z = fish->pos.z = cosf(sFishGroupAngle1) * 720.0f;
             } else if (i <= 40) {
-                fish->unk_10.x = fish->pos.x = sinf(sFishGroupAngle2) * 720.0f;
-                fish->unk_10.z = fish->pos.z = cosf(sFishGroupAngle2) * 720.0f;
+                fish->homePos.x = fish->pos.x = sinf(sFishGroupAngle2) * 720.0f;
+                fish->homePos.z = fish->pos.z = cosf(sFishGroupAngle2) * 720.0f;
             } else {
-                fish->unk_10.x = fish->pos.x = sinf(sFishGroupAngle3) * 720.0f;
-                fish->unk_10.z = fish->pos.z = cosf(sFishGroupAngle3) * 720.0f;
+                fish->homePos.x = fish->pos.x = sinf(sFishGroupAngle3) * 720.0f;
+                fish->homePos.z = fish->pos.z = cosf(sFishGroupAngle3) * 720.0f;
             }
 
-            fish->unk_10.y = fish->pos.y = -35.0f;
+            fish->homePos.y = fish->pos.y = -35.0f;
 
             fish->timer = Rand_ZeroFloat(100.0f);
 
@@ -956,7 +972,7 @@ void Fishing_Init(Actor* thisx, PlayState* play2) {
             fish->unk_3E = 0;
             fish->unk_40 = 0;
 
-            if (sLinkAge != 1) {
+            if (sLinkAge != LINK_AGE_CHILD) {
                 if (((i >= 15) && (i < 20)) || ((i >= 35) && (i < 40)) || ((i >= 55) && (i < 60))) {
                     fish->type = FS_GROUP_FISH_NONE;
                 }
@@ -968,8 +984,10 @@ void Fishing_Init(Actor* thisx, PlayState* play2) {
                            ENKANBAN_FISHING);
         Actor_Spawn(&play->actorCtx, play, ACTOR_FISHING, 0.0f, 0.0f, 0.0f, 0, 0, 0, 200, true);
 
-        if ((KREG(1) == 1) || ((D_80B7E07D & 3) == 3)) {
-            if (sLinkAge != 1) {
+        // Loach(es) will spawn every fourth game, or if "Loaches Always Appear" is enabled
+        if (getShouldSpawnLoaches()) {
+            // Fishes 16 and 17 are loaches. Only 16 is spawned as adult; child also spawns 17.
+            if (sLinkAge != LINK_AGE_CHILD) {
                 fishCount = 16;
             } else {
                 fishCount = 17;
@@ -983,7 +1001,7 @@ void Fishing_Init(Actor* thisx, PlayState* play2) {
                         sFishInits[i].pos.z, 0, Rand_ZeroFloat(0x10000), 0, 100 + i, true);
         }
     } else {
-        if ((thisx->params < 115) || (thisx->params == 200)) {
+        if ((thisx->params < (EN_FISH_PARAM + 15)) || (thisx->params == EN_FISH_AQUARIUM)) {
             SkelAnime_InitFlex(play, &this->skelAnime, &gFishingFishSkel, &gFishingFishAnim, NULL, NULL, 0);
             Animation_MorphToLoop(&this->skelAnime, &gFishingFishAnim, 0.0f);
         } else {
@@ -993,32 +1011,34 @@ void Fishing_Init(Actor* thisx, PlayState* play2) {
 
         SkelAnime_Update(&this->skelAnime);
 
-        if (thisx->params == 200) {
-            this->unk_158 = 100;
+        if (thisx->params == EN_FISH_AQUARIUM) {
+            this->fishState = 100;
             Actor_ChangeCategory(play, &play->actorCtx, thisx, ACTORCAT_PROP);
             thisx->targetMode = 0;
             thisx->flags |= ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY;
             this->lightNode = LightContext_InsertLight(play, &play->lightCtx, &this->lightInfo);
         } else {
-            this->unk_158 = 10;
-            this->unk_15A = 10;
+            this->fishState = 10;
+            this->fishStateNext = 10;
 
-            this->unk_150 = sFishInits[thisx->params - 100].unk_00;
-            this->unk_1A8 = sFishInits[thisx->params - 100].unk_0C;
-            this->unk_1AC = sFishInits[thisx->params - 100].unk_08;
+            this->isLoach = sFishInits[thisx->params - EN_FISH_PARAM].isLoach;
+            this->perception = sFishInits[thisx->params - EN_FISH_PARAM].perception;
+            this->fishLength = sFishInits[thisx->params - EN_FISH_PARAM].baseLength;
 
-            this->unk_1AC += Rand_ZeroFloat(4.99999f);
+            this->fishLength += Rand_ZeroFloat(4.99999f);
 
-            if ((this->unk_1AC >= 65.0f) && (Rand_ZeroOne() < 0.05f)) {
-                this->unk_1AC += Rand_ZeroFloat(7.99999f);
+            // small chance to make big fish even bigger.
+            if ((this->fishLength >= 65.0f) && (Rand_ZeroOne() < 0.05f)) {
+                this->fishLength += Rand_ZeroFloat(7.99999f);
             }
 
             if (KREG(6) != 0) {
-                this->unk_1AC = KREG(6) + 80.0f;
+                this->fishLength = KREG(6) + 80.0f;
             }
 
-            if (sLinkAge == 1) {
-                this->unk_1AC *= 0.73f;
+            // "Come back when you get older! The fish will be bigger, too!"
+            if (sLinkAge == LINK_AGE_CHILD) {
+                this->fishLength *= 0.73f;
             }
         }
     }
@@ -1030,9 +1050,9 @@ void Fishing_Destroy(Actor* thisx, PlayState* play2) {
 
     SkelAnime_Free(&this->skelAnime, play);
 
-    if (thisx->params == 200) {
+    if (thisx->params == EN_FISH_AQUARIUM) {
         LightContext_RemoveLight(play, &play->lightCtx, this->lightNode);
-    } else if (thisx->params == 1) {
+    } else if (thisx->params == EN_FISH_OWNER) {
         Collider_DestroyJntSph(play, &this->collider);
     }
 }
@@ -1041,7 +1061,7 @@ void Fishing_UpdateEffects(FishingEffect* effect, PlayState* play) {
     f32 rippleY;
     s16 i;
 
-    for (i = 0; i < EFFECT_COUNT; i++) {
+    for (i = 0; i < FISHING_EFFECT_COUNT; i++) {
         if (effect->type) {
             effect->timer++;
             effect->pos.x += effect->vel.x;
@@ -1050,14 +1070,14 @@ void Fishing_UpdateEffects(FishingEffect* effect, PlayState* play) {
             effect->vel.y += effect->accel.y;
 
             if (effect->type == FS_EFF_RIPPLE) {
-                Math_ApproachF(&effect->unk_30, effect->unk_34, 0.2f, effect->unk_38);
+                Math_ApproachF(&effect->scale, effect->rot.x, 0.2f, effect->rot.y);
 
-                if (effect->unk_2C == 0) {
+                if (effect->state == 0) {
                     effect->alpha += 20;
 
-                    if (effect->alpha >= effect->unk_2E) {
-                        effect->alpha = effect->unk_2E;
-                        effect->unk_2C++;
+                    if (effect->alpha >= effect->alphaMax) {
+                        effect->alpha = effect->alphaMax;
+                        effect->state++;
                     }
                 } else {
                     effect->alpha -= 8;
@@ -1067,7 +1087,7 @@ void Fishing_UpdateEffects(FishingEffect* effect, PlayState* play) {
                     }
                 }
             } else if (effect->type == FS_EFF_WATER_DUST) {
-                Math_ApproachF(&effect->unk_30, effect->unk_34, 0.1f, 0.1f);
+                Math_ApproachF(&effect->scale, effect->rot.x, 0.1f, 0.1f);
                 effect->alpha -= 10;
 
                 if (effect->pos.y > (WATER_SURFACE_Y(play) - 5.0f)) {
@@ -1080,7 +1100,7 @@ void Fishing_UpdateEffects(FishingEffect* effect, PlayState* play) {
                     effect->type = FS_EFF_NONE;
                 }
             } else if (effect->type == FS_EFF_BUBBLE) {
-                if (effect->unk_2C == 0) {
+                if (effect->state == 0) {
                     rippleY = WATER_SURFACE_Y(play);
                 } else {
                     rippleY = 69.0f;
@@ -1117,14 +1137,14 @@ void Fishing_UpdateEffects(FishingEffect* effect, PlayState* play) {
                         effect->pos.y = WATER_SURFACE_Y(play) + ((sqrtf(sqDistXZ) - 920.0f) * 0.11f);
                         effect->timer = KREG(17) + 2;
                         effect->type = FS_EFF_RAIN_SPLASH;
-                        effect->unk_30 = (KREG(18) + 30) * 0.001f;
+                        effect->scale = (KREG(18) + 30) * 0.001f;
                     } else {
                         effect->pos.y = WATER_SURFACE_Y(play) + 3.0f;
                         effect->timer = 0;
                         if (Rand_ZeroOne() < 0.75f) {
                             effect->type = FS_EFF_RAIN_RIPPLE;
                             effect->vel = sZeroVec;
-                            effect->unk_30 = (KREG(18) + 30) * 0.001f;
+                            effect->scale = (KREG(18) + 30) * 0.001f;
                         } else {
                             effect->type = FS_EFF_NONE;
                         }
@@ -1133,7 +1153,7 @@ void Fishing_UpdateEffects(FishingEffect* effect, PlayState* play) {
                     effect->vel = sZeroVec;
                 }
             } else if (effect->type >= FS_EFF_RAIN_RIPPLE) {
-                effect->unk_30 += (KREG(18) + 30) * 0.001f;
+                effect->scale += (KREG(18) + 30) * 0.001f;
 
                 if (effect->timer >= 6) {
                     effect->type = FS_EFF_NONE;
@@ -1142,11 +1162,11 @@ void Fishing_UpdateEffects(FishingEffect* effect, PlayState* play) {
                 f32 sqDistXZ;
                 f32 bottomY;
 
-                effect->unk_30 = 0.010000001f;
+                effect->scale = 10 * .001f;
 
-                Math_ApproachS(&sEffOwnerHatRot.y, 0, 20, 100);
-                Math_ApproachS(&sEffOwnerHatRot.x, 0, 20, 100);
-                Math_ApproachS(&sEffOwnerHatRot.z, -0x4000, 20, 100);
+                Math_ApproachS(&sEffOwnersHatRot.y, 0, 20, 100);
+                Math_ApproachS(&sEffOwnersHatRot.x, 0, 20, 100);
+                Math_ApproachS(&sEffOwnersHatRot.z, -0x4000, 20, 100);
 
                 sqDistXZ = SQ(effect->pos.x) + SQ(effect->pos.z);
                 bottomY = WATER_SURFACE_Y(play) + ((sqrtf(sqDistXZ) - 920.0f) * 0.147f);
@@ -1161,19 +1181,19 @@ void Fishing_UpdateEffects(FishingEffect* effect, PlayState* play) {
                     Fishing_SpawnRipple(NULL, play->specialEffects, &pos, 30.0f, 300.0f, 150, 90);
                 }
 
-                if (effect->unk_2C >= 0) {
-                    effect->unk_2C++;
+                if (effect->state >= 0) {
+                    effect->state++;
                 }
 
-                if (effect->unk_2C == 30) {
+                if (effect->state == 30) {
                     Message_StartTextbox(play, 0x40B3, NULL);
                 }
 
-                if ((effect->unk_2C >= 100) && (Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT)) {
+                if ((effect->state >= 100) && (Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT)) {
                     if (Message_ShouldAdvance(play) || (Message_GetState(&play->msgCtx) == TEXT_STATE_NONE)) {
                         Message_CloseTextbox(play);
                         Rupees_ChangeBy(-50);
-                        effect->unk_2C = -1;
+                        effect->state = -1;
                     }
                 }
             }
@@ -1208,7 +1228,7 @@ void Fishing_DrawEffects(FishingEffect* effect, PlayState* play) {
             gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, effect->alpha);
 
             Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW);
-            Matrix_Scale(effect->unk_30, 1.0f, effect->unk_30, MTXMODE_APPLY);
+            Matrix_Scale(effect->scale, 1.0f, effect->scale, MTXMODE_APPLY);
 
             gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@@ -1234,7 +1254,7 @@ void Fishing_DrawEffects(FishingEffect* effect, PlayState* play) {
 
             Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW);
             Matrix_ReplaceRotation(&play->billboardMtxF);
-            Matrix_Scale(effect->unk_30, effect->unk_30, 1.0f, MTXMODE_APPLY);
+            Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY);
 
             gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@@ -1264,7 +1284,7 @@ void Fishing_DrawEffects(FishingEffect* effect, PlayState* play) {
 
             Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW);
             Matrix_ReplaceRotation(&play->billboardMtxF);
-            Matrix_Scale(effect->unk_30, effect->unk_30, 1.0f, MTXMODE_APPLY);
+            Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY);
 
             gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@@ -1289,7 +1309,7 @@ void Fishing_DrawEffects(FishingEffect* effect, PlayState* play) {
 
             Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW);
             Matrix_ReplaceRotation(&play->billboardMtxF);
-            Matrix_Scale(effect->unk_30, effect->unk_30, 1.0f, MTXMODE_APPLY);
+            Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY);
 
             gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@@ -1302,7 +1322,7 @@ void Fishing_DrawEffects(FishingEffect* effect, PlayState* play) {
 
     effect = firstEffect + 30;
     flag = 0;
-    for (i = 30; i < EFFECT_COUNT; i++) {
+    for (i = 30; i < FISHING_EFFECT_COUNT; i++) {
         if (effect->type == FS_EFF_RAIN_DROP) {
             FrameInterpolation_RecordOpenChild(effect, effect->epoch);
             if (flag == 0) {
@@ -1313,9 +1333,9 @@ void Fishing_DrawEffects(FishingEffect* effect, PlayState* play) {
             }
 
             Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW);
-            Matrix_RotateY(effect->unk_38, MTXMODE_APPLY);
-            Matrix_RotateX(effect->unk_34, MTXMODE_APPLY);
-            Matrix_RotateZ(effect->unk_3C, MTXMODE_APPLY);
+            Matrix_RotateY(effect->rot.y, MTXMODE_APPLY);
+            Matrix_RotateX(effect->rot.x, MTXMODE_APPLY);
+            Matrix_RotateZ(effect->rot.z, MTXMODE_APPLY);
             Matrix_Scale(0.002f, 1.0f, 0.1f, MTXMODE_APPLY);
 
             gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
@@ -1331,7 +1351,7 @@ void Fishing_DrawEffects(FishingEffect* effect, PlayState* play) {
 
     effect = firstEffect + 30;
     flag = 0;
-    for (i = 30; i < EFFECT_COUNT; i++) {
+    for (i = 30; i < FISHING_EFFECT_COUNT; i++) {
         if (effect->type == FS_EFF_RAIN_RIPPLE) {
             FrameInterpolation_RecordOpenChild(effect, effect->epoch);
             if (flag == 0) {
@@ -1342,7 +1362,7 @@ void Fishing_DrawEffects(FishingEffect* effect, PlayState* play) {
             }
 
             Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW);
-            Matrix_Scale(effect->unk_30, 1.0f, effect->unk_30, MTXMODE_APPLY);
+            Matrix_Scale(effect->scale, 1.0f, effect->scale, MTXMODE_APPLY);
 
             gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@@ -1355,7 +1375,7 @@ void Fishing_DrawEffects(FishingEffect* effect, PlayState* play) {
 
     effect = firstEffect + 30;
     flag = 0;
-    for (i = 30; i < EFFECT_COUNT; i++) {
+    for (i = 30; i < FISHING_EFFECT_COUNT; i++) {
         if (effect->type == FS_EFF_RAIN_SPLASH) {
             FrameInterpolation_RecordOpenChild(effect, effect->epoch);
             if (flag == 0) {
@@ -1373,7 +1393,7 @@ void Fishing_DrawEffects(FishingEffect* effect, PlayState* play) {
             Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW);
             Matrix_ReplaceRotation(&play->billboardMtxF);
             Matrix_RotateY(rotY, MTXMODE_APPLY);
-            Matrix_Scale(effect->unk_30, effect->unk_30, 1.0f, MTXMODE_APPLY);
+            Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY);
 
             gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@@ -1388,10 +1408,10 @@ void Fishing_DrawEffects(FishingEffect* effect, PlayState* play) {
     if (effect->type == FS_EFF_OWNER_HAT) {
         FrameInterpolation_RecordOpenChild(effect, effect->epoch);
         Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW);
-        Matrix_RotateY((sEffOwnerHatRot.y * M_PI) / 32768, MTXMODE_APPLY);
-        Matrix_RotateX((sEffOwnerHatRot.x * M_PI) / 32768, MTXMODE_APPLY);
-        Matrix_RotateZ((sEffOwnerHatRot.z * M_PI) / 32768, MTXMODE_APPLY);
-        Matrix_Scale(effect->unk_30, effect->unk_30, effect->unk_30, MTXMODE_APPLY);
+        Matrix_RotateY((sEffOwnersHatRot.y * M_PI) / 32768, MTXMODE_APPLY);
+        Matrix_RotateX((sEffOwnersHatRot.x * M_PI) / 32768, MTXMODE_APPLY);
+        Matrix_RotateZ((sEffOwnersHatRot.z * M_PI) / 32768, MTXMODE_APPLY);
+        Matrix_Scale(effect->scale, effect->scale, effect->scale, MTXMODE_APPLY);
         Matrix_Translate(-1250.0f, 0.0f, 0.0f, MTXMODE_APPLY);
         Matrix_RotateX(M_PI / 2, MTXMODE_APPLY);
         gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
@@ -1427,7 +1447,7 @@ void Fishing_DrawStreamSplash(PlayState* play) {
     CLOSE_DISPS(play->state.gfxCtx);
 }
 
-s32 func_80B6C2EC(Vec3f* vec) {
+s32 Fishing_IsAboveCounter(Vec3f* vec) {
     if (((vec->x >= 110.0f) && (vec->x <= 150.0f) && (vec->z <= 1400.0f) && (vec->z >= 1160.0f)) ||
         ((vec->x >= 110.0f) && (vec->x <= 210.0f) && (vec->z <= 1200.0f) && (vec->z >= 1160.0f))) {
         if (vec->y <= 42.0f) {
@@ -1448,14 +1468,14 @@ void Fishing_UpdateLine(PlayState* play, Vec3f* basePos, Vec3f* pos, Vec3f* rot,
     f32 ry;
     f32 dist;
     f32 spD8;
-    s16 temp_s2;
+    s16 spooled;
     s32 pad;
     f32 temp_f20;
     Vec3f posSrc = { 0.0f, 0.0f, 0.0f };
     Vec3f posStep;
-    f32 phi_f18;
-    Vec3f spA4;
-    Vec3f sp98;
+    f32 lineLength;
+    Vec3f tempPos;
+    Vec3f segPos;
     f32 sp94;
     f32 sp90;
     f32 sp8C;
@@ -1465,36 +1485,36 @@ void Fishing_UpdateLine(PlayState* play, Vec3f* basePos, Vec3f* pos, Vec3f* rot,
     f32 phi_f2;
 
     if (D_80B7A6A4 != 0) {
-        spA4 = *basePos;
-        sp98 = pos[LINE_SEG_COUNT - 1];
+        tempPos = *basePos;
+        segPos = pos[LINE_SEG_COUNT - 1];
 
-        sp94 = sp98.x - spA4.x;
-        sp90 = sp98.y - spA4.y;
-        sp8C = sp98.z - spA4.z;
+        sp94 = segPos.x - tempPos.x;
+        sp90 = segPos.y - tempPos.y;
+        sp8C = segPos.z - tempPos.z;
 
-        phi_f18 = sqrtf(SQ(sp94) + SQ(sp90) + SQ(sp8C)) * 0.97f;
-        if (phi_f18 > 1000.0f) {
-            phi_f18 = 1000.0f;
+        lineLength = sqrtf(SQ(sp94) + SQ(sp90) + SQ(sp8C)) * 0.97f;
+        if (lineLength > 1000.0f) {
+            lineLength = 1000.0f;
         }
 
-        D_80B7E144 = 200.0f - (phi_f18 * 200.0f * 0.001f);
+        sRodLineSpooled = 200.0f - (lineLength * 200.0f * 0.001f);
     }
 
-    temp_s2 = D_80B7E144;
+    spooled = sRodLineSpooled;
     posSrc.z = 5.0f;
 
     for (i = 0; i < LINE_SEG_COUNT; i++) {
-        if (i <= temp_s2) {
+        if (i <= spooled) {
             pos[i] = *basePos;
         } else if (D_80B7A6A4 != 0) {
-            temp_f20 = (f32)(i - temp_s2) / (f32)(LINE_SEG_COUNT - temp_s2 + 1);
-            Math_ApproachF(&pos[i].x, (sp94 * temp_f20) + spA4.x, 1.0f, 20.0f);
-            Math_ApproachF(&pos[i].y, (sp90 * temp_f20) + spA4.y, 1.0f, 20.0f);
-            Math_ApproachF(&pos[i].z, (sp8C * temp_f20) + spA4.z, 1.0f, 20.0f);
+            temp_f20 = (f32)(i - spooled) / (f32)(LINE_SEG_COUNT - spooled + 1);
+            Math_ApproachF(&pos[i].x, (sp94 * temp_f20) + tempPos.x, 1.0f, 20.0f);
+            Math_ApproachF(&pos[i].y, (sp90 * temp_f20) + tempPos.y, 1.0f, 20.0f);
+            Math_ApproachF(&pos[i].z, (sp8C * temp_f20) + tempPos.z, 1.0f, 20.0f);
         }
     }
 
-    for (i = temp_s2 + 1, k = 0; i < LINE_SEG_COUNT; i++, k++) {
+    for (i = spooled + 1, k = 0; i < LINE_SEG_COUNT; i++, k++) {
         temp_f18 = 2.0f * D_80B7E148;
 
         dx = (pos + i)->x - (pos + i - 1)->x;
@@ -1508,7 +1528,7 @@ void Fishing_UpdateLine(PlayState* play, Vec3f* basePos, Vec3f* pos, Vec3f* rot,
             phi_f12 = WATER_SURFACE_Y(play);
         }
 
-        if (D_80B7E0B6 == 2) {
+        if (sLureEquipped == FS_LURE_SINKING) {
             if (spD8 < phi_f12) {
                 phi_f12 = ((sqrtf(sqDistXZ) - 920.0f) * 0.147f) + WATER_SURFACE_Y(play);
                 if (spD8 > phi_f12) {
@@ -1538,7 +1558,7 @@ void Fishing_UpdateLine(PlayState* play, Vec3f* basePos, Vec3f* pos, Vec3f* rot,
             }
         }
 
-        if (func_80B6C2EC(&pos[i])) {
+        if (Fishing_IsAboveCounter(&pos[i])) {
             spD8 = 42.0f;
         }
 
@@ -1572,11 +1592,11 @@ void Fishing_UpdateLinePos(Vec3f* pos) {
     f32 dist;
     Vec3f posSrc = { 0.0f, 0.0f, 0.0f };
     Vec3f posStep;
-    s16 min = D_80B7E144;
+    s16 spooled = sRodLineSpooled;
 
     posSrc.z = 5.0f;
 
-    for (i = LINE_SEG_COUNT - 2; i > min; i--) {
+    for (i = LINE_SEG_COUNT - 2; i > spooled; i--) {
         dx = (pos + i)->x - (pos + i + 1)->x;
         dy = (pos + i)->y - (pos + i + 1)->y;
         dz = (pos + i)->z - (pos + i + 1)->z;
@@ -1611,7 +1631,7 @@ void Fishing_DrawLureHook(PlayState* play, Vec3f* pos, Vec3f* refPos, u8 hookInd
 
     Matrix_Push();
 
-    if ((D_80B7A694 == 3) && ((pos->y > WATER_SURFACE_Y(play)) || ((D_80B7A68C != 0) && hookIndex))) {
+    if ((sRodCastState == 3) && ((pos->y > WATER_SURFACE_Y(play)) || (sIsOwnersHatHooked && hookIndex))) {
         offsetY = 0.0f;
     } else if (pos->y < WATER_SURFACE_Y(play)) {
         offsetY = -1.0f;
@@ -1637,7 +1657,7 @@ void Fishing_DrawLureHook(PlayState* play, Vec3f* pos, Vec3f* refPos, u8 hookInd
 
     Matrix_Translate(pos->x, pos->y, pos->z, MTXMODE_NEW);
 
-    if ((player->actor.speedXZ == 0.0f) && (D_80B7E138 == 0.0f)) {
+    if ((player->actor.speedXZ == 0.0f) && (sLureWigglePosY == 0.0f)) {
         Math_ApproachF(&sLureHookRotY[hookIndex], ry, 0.1f, 0.3f);
     } else {
         sLureHookRotY[hookIndex] = ry;
@@ -1658,24 +1678,24 @@ void Fishing_DrawLureHook(PlayState* play, Vec3f* pos, Vec3f* refPos, u8 hookInd
               G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, gFishingLureHookDL);
 
-    if ((hookIndex == 1) && (D_80B7A68C != 0)) {
+    if ((hookIndex == 1) && (sIsOwnersHatHooked)) {
         Matrix_Scale(2.0f, 2.0f, 2.0f, MTXMODE_APPLY);
         Matrix_Translate(250.0f, 0.0f, -1400.0f, MTXMODE_APPLY);
         Matrix_Push();
 
-        if (D_80B7A690 != 0) {
+        if (sIsOwnersHatSunk) {
             FishingEffect* effect = play->specialEffects;
             MtxF mf;
 
             Matrix_MultVec3f(&sZeroVec, &effect->pos);
             Matrix_Get(&mf);
-            Matrix_MtxFToYXZRotS(&mf, &sEffOwnerHatRot, 0);
+            Matrix_MtxFToYXZRotS(&mf, &sEffOwnersHatRot, 0);
 
-            D_80B7A690 = 0;
-            D_80B7A68C = 0;
+            sIsOwnersHatSunk = false;
+            sIsOwnersHatHooked = false;
 
             effect->type = FS_EFF_OWNER_HAT;
-            effect->unk_2C = 0;
+            effect->state = 0;
             effect->vel = sZeroVec;
             effect->accel = sZeroVec;
         }
@@ -1715,7 +1735,7 @@ void Fishing_UpdateSinkingLure(PlayState* play) {
 
     sSinkingLurePos[0] = sLurePos;
 
-    if (D_80B7A6D4 != 0) {
+    if (sSinkingLureFound) {
         offsetY = -1.0f;
     } else if (sLurePos.y < WATER_SURFACE_Y(play)) {
         offsetY = 0.5f;
@@ -1723,7 +1743,7 @@ void Fishing_UpdateSinkingLure(PlayState* play) {
         offsetY = -5.0f;
     }
 
-    if (D_80B7A694 == 5) {
+    if (sRodCastState == 5) {
         Matrix_RotateY(player->actor.shape.rot.y * (M_PI / 32768), MTXMODE_NEW);
         sp94.x = 5.0f;
         sp94.y = 0.0f;
@@ -1734,7 +1754,7 @@ void Fishing_UpdateSinkingLure(PlayState* play) {
     for (i = 1; i < SINKING_LURE_SEG_COUNT; i++) {
         Vec3f* pos = sSinkingLurePos;
 
-        if ((i < 10) && (D_80B7A694 == 5)) {
+        if ((i < 10) && (sRodCastState == 5)) {
             offsetX = (10 - i) * sp88.x * 0.1f;
             offsetZ = (10 - i) * sp88.z * 0.1f;
         } else {
@@ -1778,10 +1798,10 @@ void Fishing_DrawSinkingLure(PlayState* play) {
         gSPDisplayList(POLY_OPA_DISP++, gFishingSinkingLureSegmentMaterialDL);
 
         for (i = SINKING_LURE_SEG_COUNT - 1; i >= 0; i--) {
-            if ((i + D_80B7FEA0) < SINKING_LURE_SEG_COUNT) {
+            if ((i + sSinkingLureSegmentIndex) < SINKING_LURE_SEG_COUNT) {
                 FrameInterpolation_RecordOpenChild("Fishing Lures 1", i);
                 Matrix_Translate(sSinkingLurePos[i].x, sSinkingLurePos[i].y, sSinkingLurePos[i].z, MTXMODE_NEW);
-                scale = sSinkingLureSizes[i + D_80B7FEA0] * 0.04f;
+                scale = sSinkingLureSizes[i + sSinkingLureSegmentIndex] * 0.04f;
                 Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
                 Matrix_ReplaceRotation(&play->billboardMtxF);
 
@@ -1797,10 +1817,10 @@ void Fishing_DrawSinkingLure(PlayState* play) {
         gSPDisplayList(POLY_XLU_DISP++, gFishingSinkingLureSegmentMaterialDL);
 
         for (i = SINKING_LURE_SEG_COUNT - 1; i >= 0; i--) {
-            if ((i + D_80B7FEA0) < SINKING_LURE_SEG_COUNT) {
+            if ((i + sSinkingLureSegmentIndex) < SINKING_LURE_SEG_COUNT) {
                 FrameInterpolation_RecordOpenChild("Fishing Lures 2", i);
                 Matrix_Translate(sSinkingLurePos[i].x, sSinkingLurePos[i].y, sSinkingLurePos[i].z, MTXMODE_NEW);
-                scale = sSinkingLureSizes[i + D_80B7FEA0] * 0.04f;
+                scale = sSinkingLureSizes[i + sSinkingLureSegmentIndex] * 0.04f;
                 Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
                 Matrix_ReplaceRotation(&play->billboardMtxF);
 
@@ -1820,7 +1840,7 @@ void Fishing_DrawLureAndLine(PlayState* play, Vec3f* linePos, Vec3f* lineRot) {
     Vec3f posStep;
     Vec3f hookPos[2];
     s16 i;
-    s16 spB4 = D_80B7E144;
+    s16 spooled = sRodLineSpooled;
     s32 pad;
     Player* player = GET_PLAYER(play);
 
@@ -1829,17 +1849,17 @@ void Fishing_DrawLureAndLine(PlayState* play, Vec3f* linePos, Vec3f* lineRot) {
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
     Matrix_Push();
 
-    if (D_80B7A6D4 != 0) {
+    if (sSinkingLureFound) {
         Vec3f posTemp = sLurePos;
         sLurePos = sSinkingLureBasePos;
         Fishing_DrawSinkingLure(play);
         sLurePos = posTemp;
     }
 
-    if ((D_80B7A694 == 4) || (D_80B7A694 == 5)) {
+    if ((sRodCastState == 4) || (sRodCastState == 5)) {
         sLurePos = sFishingHookedFish->fishMouthPos;
 
-        if ((D_80B7A694 == 5) && (D_80B7E0B6 == 2)) {
+        if ((sRodCastState == 5) && (sLureEquipped == FS_LURE_SINKING)) {
             Matrix_RotateY(player->actor.shape.rot.y * (M_PI / 32768), MTXMODE_NEW);
             posSrc.x = 2.0f;
             posSrc.y = 0.0f;
@@ -1848,7 +1868,7 @@ void Fishing_DrawLureAndLine(PlayState* play, Vec3f* linePos, Vec3f* lineRot) {
             sLurePos.x += posStep.x;
             sLurePos.z += posStep.z;
         }
-    } else if (D_80B7A694 == 0) {
+    } else if (sRodCastState == 0) {
         sLurePos = sReelLinePos[LINE_SEG_COUNT - 1];
         sLureRot.x = sReelLineRot[LINE_SEG_COUNT - 2].x + M_PI;
 
@@ -1859,12 +1879,12 @@ void Fishing_DrawLureAndLine(PlayState* play, Vec3f* linePos, Vec3f* lineRot) {
         }
     }
 
-    if (D_80B7E0B6 != 2) {
+    if (sLureEquipped != FS_LURE_SINKING) {
         Matrix_Translate(sLurePos.x, sLurePos.y, sLurePos.z, MTXMODE_NEW);
-        Matrix_RotateY(sLureRot.y + D_80B7E104, MTXMODE_APPLY);
+        Matrix_RotateY(sLureRot.y + sLure1Rotate, MTXMODE_APPLY);
         Matrix_RotateX(sLureRot.x, MTXMODE_APPLY);
         Matrix_Scale(0.0039999997f, 0.0039999997f, 0.0039999997f, MTXMODE_APPLY);
-        Matrix_Translate(0.0f, 0.0f, D_80B7E108, MTXMODE_APPLY);
+        Matrix_Translate(0.0f, 0.0f, sLurePosZOffset, MTXMODE_APPLY);
         Matrix_RotateZ(M_PI / 2, MTXMODE_APPLY);
         Matrix_RotateY(M_PI / 2, MTXMODE_APPLY);
 
@@ -1877,7 +1897,7 @@ void Fishing_DrawLureAndLine(PlayState* play, Vec3f* linePos, Vec3f* lineRot) {
         posSrc.x = -850.0f;
         posSrc.y = 0.0f;
         posSrc.z = 0.0f;
-        Matrix_MultVec3f(&posSrc, &D_80B7E0C8);
+        Matrix_MultVec3f(&posSrc, &sLureDrawPos);
 
         posSrc.x = 500.0f;
         posSrc.z = -300.0f;
@@ -1895,7 +1915,7 @@ void Fishing_DrawLureAndLine(PlayState* play, Vec3f* linePos, Vec3f* lineRot) {
     gDPSetCombineMode(POLY_XLU_DISP++, G_CC_PRIMITIVE, G_CC_PRIMITIVE);
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 55);
 
-    if ((D_80B7A694 == 4) && ((D_80B7E124 != 0) || (D_80B7E0B6 != 2))) {
+    if ((sRodCastState == 4) && ((sLineHooked != 0) || (sLureEquipped != 2))) {
         f32 rx;
         f32 ry;
         f32 dist;
@@ -1916,14 +1936,14 @@ void Fishing_DrawLureAndLine(PlayState* play, Vec3f* linePos, Vec3f* lineRot) {
         Matrix_Translate(sRodTipPos.x, sRodTipPos.y, sRodTipPos.z, MTXMODE_NEW);
         Matrix_RotateY(ry, MTXMODE_APPLY);
         Matrix_RotateX(rx, MTXMODE_APPLY);
-        Matrix_Scale(D_80B7E14C, 1.0f, dist, MTXMODE_APPLY);
+        Matrix_Scale(sFishingLineScale, 1.0f, dist, MTXMODE_APPLY);
 
         gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
                   G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, gFishingLineModelDL);
     } else {
-        for (i = spB4; i < LINE_SEG_COUNT - 1; i++) {
-            if ((i == LINE_SEG_COUNT - 3) && (D_80B7E0B6 == 0) && (D_80B7A694 == 3)) {
+        for (i = spooled; i < LINE_SEG_COUNT - 1; i++) {
+            if ((i == LINE_SEG_COUNT - 3) && (sLureEquipped == FS_LURE_STOCK) && (sRodCastState == 3)) {
                 f32 rx;
                 f32 ry;
                 f32 dist;
@@ -1931,9 +1951,9 @@ void Fishing_DrawLureAndLine(PlayState* play, Vec3f* linePos, Vec3f* lineRot) {
                 f32 dy;
                 f32 dz;
 
-                dx = D_80B7E0C8.x - (linePos + i)->x;
-                dy = D_80B7E0C8.y - (linePos + i)->y;
-                dz = D_80B7E0C8.z - (linePos + i)->z;
+                dx = sLureDrawPos.x - (linePos + i)->x;
+                dy = sLureDrawPos.y - (linePos + i)->y;
+                dz = sLureDrawPos.z - (linePos + i)->z;
 
                 ry = Math_FAtan2F(dx, dz);
                 dist = sqrtf(SQ(dx) + SQ(dz));
@@ -1944,7 +1964,7 @@ void Fishing_DrawLureAndLine(PlayState* play, Vec3f* linePos, Vec3f* lineRot) {
                 Matrix_Translate((linePos + i)->x, (linePos + i)->y, (linePos + i)->z, MTXMODE_NEW);
                 Matrix_RotateY(ry, MTXMODE_APPLY);
                 Matrix_RotateX(rx, MTXMODE_APPLY);
-                Matrix_Scale(D_80B7E14C, 1.0f, dist, MTXMODE_APPLY);
+                Matrix_Scale(sFishingLineScale, 1.0f, dist, MTXMODE_APPLY);
 
                 gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
                           G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@@ -1955,7 +1975,7 @@ void Fishing_DrawLureAndLine(PlayState* play, Vec3f* linePos, Vec3f* lineRot) {
             Matrix_Translate((linePos + i)->x, (linePos + i)->y, (linePos + i)->z, MTXMODE_NEW);
             Matrix_RotateY((lineRot + i)->y, MTXMODE_APPLY);
             Matrix_RotateX((lineRot + i)->x, MTXMODE_APPLY);
-            Matrix_Scale(D_80B7E14C, 1.0f, 0.005f, MTXMODE_APPLY);
+            Matrix_Scale(sFishingLineScale, 1.0f, 0.005f, MTXMODE_APPLY);
 
             gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@@ -1984,7 +2004,7 @@ static Vec3f sRodTipOffset = { 0.0f, 0.0f, 0.0f };
 
 void Fishing_DrawRod(PlayState* play) {
     s16 i;
-    f32 spC8;
+    f32 lureXZLen;
     f32 spC4;
     f32 spC0;
     Input* input = &play->state.input[0];
@@ -1993,8 +2013,8 @@ void Fishing_DrawRod(PlayState* play) {
 
     OPEN_DISPS(play->state.gfxCtx);
 
-    if (D_80B7FDA8 != 0) {
-        D_80B7FDA8--;
+    if (sRodHitTimer != 0) {
+        sRodHitTimer--;
 
         Math_ApproachF(&D_80B7A6C0, 35.0f, 1.0f, 100.0f);
         Math_ApproachF(&D_80B7A6BC, -0.8f, 1.0f, 0.4f);
@@ -2002,8 +2022,8 @@ void Fishing_DrawRod(PlayState* play) {
     } else {
         s16 target = 0;
 
-        if ((D_80B7A694 == 4) && (D_80B7E124 != 0)) {
-            target = Math_SinS(D_80B7E0AE * 25600) * 1500.0f;
+        if ((sRodCastState == 4) && sLineHooked) {
+            target = Math_SinS(sLureTimer * 25600) * 1500.0f;
         } else {
             Math_ApproachZeroF(&D_80B7A6C0, 0.1f, 10.0f);
             Math_ApproachZeroF(&D_80B7A6BC, 1.0f, 0.05f);
@@ -2012,17 +2032,17 @@ void Fishing_DrawRod(PlayState* play) {
         Math_ApproachS(&player->actor.shape.rot.x, target, 5, 1000);
     }
 
-    if ((D_80B7A694 == 3) || (D_80B7A694 == 4)) {
-        if ((input->rel.stick_x == 0) && (D_80B7A6C4 != 0)) {
+    if ((sRodCastState == 3) || (sRodCastState == 4)) {
+        if ((input->rel.stick_x == 0) && (sStickAdjXPrev != 0)) {
             D_80B7A6B0 = 0.0f;
         }
-        if ((input->rel.stick_y == 0) && (D_80B7A6C8 != 0)) {
+        if ((input->rel.stick_y == 0) && (sStickAdjYPrev != 0)) {
             D_80B7A6B4 = 0.0f;
         }
 
-        spC8 = player->unk_85C;
+        lureXZLen = player->unk_85C;
         Math_SmoothStepToF(&player->unk_85C, input->rel.stick_y * 0.02f, 0.3f, 5.0f, 0.0f);
-        spC8 = player->unk_85C - spC8;
+        lureXZLen = player->unk_85C - lureXZLen;
 
         spC4 = player->unk_858;
         Math_SmoothStepToF(&player->unk_858, input->rel.stick_x * 0.02f * (CVarGetInteger("gMirroredWorld", 0) ? -1 : 1), 0.3f, 5.0f, 0.0f);
@@ -2041,18 +2061,18 @@ void Fishing_DrawRod(PlayState* play) {
             player->unk_85C = -1.0f;
         }
 
-        Math_ApproachF(&D_80B7A6A8, spC4 * 70.0f * -0.01f, 1.0f, D_80B7A6B0);
+        Math_ApproachF(&sRodBendRotY, spC4 * 70.0f * -0.01f, 1.0f, D_80B7A6B0);
         Math_ApproachF(&D_80B7A6B0, 1.0f, 1.0f, 0.1f);
-        Math_ApproachF(&D_80B7A6AC, spC8 * 70.0f * 0.01f, 1.0f, D_80B7A6B4);
+        Math_ApproachF(&D_80B7A6AC, lureXZLen * 70.0f * 0.01f, 1.0f, D_80B7A6B4);
         Math_ApproachF(&D_80B7A6B4, 1.0f, 1.0f, 0.1f);
         Math_ApproachZeroF(&D_80B7A6B8, 1.0f, 0.05f);
     } else {
         Math_ApproachZeroF(&player->unk_85C, 1.0f, 0.1f);
         Math_ApproachZeroF(&player->unk_858, 1.0f, 0.1f);
-        Math_ApproachF(&D_80B7A6AC, (Math_SinS(D_80B7E0AE * 3000) * 0.025f) + -0.03f, 1.0f, 0.05f);
-        Math_ApproachZeroF(&D_80B7A6A8, 1.0f, 0.05f);
+        Math_ApproachF(&D_80B7A6AC, (Math_SinS(sLureTimer * 3000) * 0.025f) + -0.03f, 1.0f, 0.05f);
+        Math_ApproachZeroF(&sRodBendRotY, 1.0f, 0.05f);
 
-        if ((D_80B7E0B4 >= 19) && (D_80B7E0B4 <= 24)) {
+        if ((sRodCastTimer > 18) && (sRodCastTimer < 25)) {
             Math_ApproachF(&D_80B7A6B8, 0.8f, 1.0f, 0.2f);
         } else {
             Math_ApproachF(&D_80B7A6B8, 0.0f, 1.0f, 0.4f);
@@ -2067,13 +2087,13 @@ void Fishing_DrawRod(PlayState* play) {
 
     Matrix_Mult(&player->mf_9E0, MTXMODE_NEW);
 
-    if (sLinkAge != 1) {
+    if (sLinkAge != LINK_AGE_CHILD) {
         Matrix_Translate(0.0f, 400.0f, 0.0f, MTXMODE_APPLY);
     } else {
         Matrix_Translate(0.0f, 230.0f, 0.0f, MTXMODE_APPLY);
     }
 
-    if (D_80B7A694 == 5) {
+    if (sRodCastState == 5) {
         Matrix_RotateY(0.56f * M_PI, MTXMODE_APPLY);
     } else {
         Matrix_RotateY(0.41f * M_PI, MTXMODE_APPLY);
@@ -2089,7 +2109,7 @@ void Fishing_DrawRod(PlayState* play) {
     Matrix_Translate(0.0f, 0.0f, -1300.0f, MTXMODE_APPLY);
 
     for (i = 0; i < 22; i++) {
-        Matrix_RotateY(sRodBendRatios[i] * D_80B7A6A8 * 0.5f, MTXMODE_APPLY);
+        Matrix_RotateY(sRodBendRatios[i] * sRodBendRotY * 0.5f, MTXMODE_APPLY);
         Matrix_RotateX(sRodBendRatios[i] * spC0 * 0.5f, MTXMODE_APPLY);
 
         Matrix_Push();
@@ -2122,18 +2142,18 @@ void Fishing_DrawRod(PlayState* play) {
     CLOSE_DISPS(play->state.gfxCtx);
 }
 
-static Vec3f D_80B7AF94 = { 0.0f, 0.0f, 0.0f };
+static Vec3f sSoundPos = { 0.0f, 0.0f, 0.0f };
 
 void Fishing_UpdateLure(Fishing* this, PlayState* play) {
     f32 spE4;
     f32 spE0;
-    s16 phi_v0;
+    s16 timer;
     s16 spDC;
     f32 spD8;
     f32 spD4;
     f32 spD0;
-    f32 phi_f16;
-    f32 spC8;
+    f32 lengthCasted;
+    f32 lureXZLen;
     s16 i;
     Player* player = GET_PLAYER(play);
     Vec3f zeroVec = { 0.0f, 0.0f, 0.0f };
@@ -2145,12 +2165,12 @@ void Fishing_UpdateLure(Fishing* this, PlayState* play) {
     f32 sp7C;
     f32 sp78;
     f32 phi_f0;
-    f32 sp70;
+    f32 wiggle;
     Vec3f sp64;
     Vec3f sp58;
     s32 pad;
 
-    D_80B7E0AE++;
+    sLureTimer++;
 
     if (D_80B7E0B0 != 0) {
         D_80B7E0B0--;
@@ -2160,12 +2180,12 @@ void Fishing_UpdateLure(Fishing* this, PlayState* play) {
         D_80B7E0B2--;
     }
 
-    if (D_80B7E0B4 != 0) {
-        D_80B7E0B4--;
+    if (sRodCastTimer != 0) {
+        sRodCastTimer--;
     }
 
-    if (D_80B7E122 != 0) {
-        D_80B7E122--;
+    if (sLureBitTimer != 0) {
+        sLureBitTimer--;
     }
 
     if (D_80B7E150 != 0) {
@@ -2176,33 +2196,34 @@ void Fishing_UpdateLure(Fishing* this, PlayState* play) {
         D_80B7A6A4--;
     }
 
-    if (D_80B7E0A4 != 0) {
-        D_80B7E0A4--;
+    if (sRumbleDelay != 0) {
+        sRumbleDelay--;
     }
 
     if (D_80B7E114 != 0) {
         D_80B7E114--;
     }
 
-    if (D_80B7E0AC == 1) {
-        D_80B7E0AC = 2;
-        D_80B7E084 = 0;
-        D_80B7E082 = 0;
-        D_80B7E0B6 = 0;
+    if (sFishingPlayingState == 1) {
+        sFishingPlayingState = 2;
+        sFishesCaught = 0;
+        sPondOwnerTextIdIndex = 0;
+        sLureEquipped = FS_LURE_STOCK;
 
-        if (((sLinkAge == 1) && (HIGH_SCORE(HS_FISHING) & 0x400)) ||
-            ((sLinkAge != 1) && (HIGH_SCORE(HS_FISHING) & 0x800))) {
+        // if prize item won as child or adult, set the sinking lure location.
+        if (((sLinkAge == LINK_AGE_CHILD) && (HIGH_SCORE(HS_FISHING) & HS_FISH_PRIZE_CHILD)) ||
+            ((sLinkAge != LINK_AGE_CHILD) && (HIGH_SCORE(HS_FISHING) & HS_FISH_PRIZE_ADULT))) {
             sSinkingLureLocation = (u8)Rand_ZeroFloat(3.999f) + 1;
         }
 
         D_80B7E148 = 520.0f;
-        D_80B7E144 = 195.0f;
+        sRodLineSpooled = 195.0f;
 
-        D_80B7A694 = D_80B7E0B6 = D_80B7E0AE = D_80B7E0B0 = D_80B7E0B2 = D_80B7E0B4 = D_80B7E120 = D_80B7E114 =
+        sRodCastState = sLureEquipped = sLureTimer = D_80B7E0B0 = D_80B7E0B2 = sRodCastTimer = sWiggleAttraction = D_80B7E114 =
             D_80B7E150 = 0;
-        D_80B7E104 = D_80B7E154 = D_80B7E108 = 0.0f;
+        sLure1Rotate = sReelLinePosStep = sLurePosZOffset = 0.0f;
 
-        D_80B7E128 = zeroVec;
+        sLureLineSegPosDelta = zeroVec;
 
         for (i = 0; i < LINE_SEG_COUNT; i++) {
             sReelLinePos[i] = zeroVec;
@@ -2211,78 +2232,78 @@ void Fishing_UpdateLure(Fishing* this, PlayState* play) {
         }
     }
 
-    SkinMatrix_Vec3fMtxFMultXYZW(&play->viewProjectionMtxF, &sLurePos, &D_80B7AF94, &sProjectedW);
+    SkinMatrix_Vec3fMtxFMultXYZW(&play->viewProjectionMtxF, &sLurePos, &sSoundPos, &sProjectedW);
 
-    if (D_80B7A694 == 0) {
-        Math_ApproachF(&D_80B7E108, -800.0f, 1.0f, 20.0f);
+    if (sRodCastState == 0) {
+        Math_ApproachF(&sLurePosZOffset, -800.0f, 1.0f, 20.0f);
     } else {
-        Math_ApproachF(&D_80B7E108, 300.0f, 1.0f, 20.0f);
+        Math_ApproachF(&sLurePosZOffset, 300.0f, 1.0f, 20.0f);
     }
 
-    switch (D_80B7A694) {
+    switch (sRodCastState) {
         case 0:
-            D_80B7FEA0 = 0;
+            sSinkingLureSegmentIndex = 0;
 
             if (KREG(14) != 0) {
                 KREG(14) = 0;
-                D_80B7E0B6 = 2 - D_80B7E0B6;
-                if (D_80B7E0B6 != 0) {
-                    D_80B7E082 = 0;
+                sLureEquipped = FS_LURE_SINKING - sLureEquipped;
+                if (sLureEquipped != FS_LURE_STOCK) {
+                    sPondOwnerTextIdIndex = 0;
                 }
             }
 
-            Math_ApproachF(&D_80B7E144, 195.0f, 1.0f, 1.0f);
+            Math_ApproachF(&sRodLineSpooled, 195.0f, 1.0f, 1.0f);
 
             if (player->stateFlags1 & 0x8000000) {
-                D_80B7E0B4 = 0;
+                sRodCastTimer = 0;
                 player->unk_860 = 0;
             }
 
-            if (D_80B7E0B4 == 0) {
+            if (sRodCastTimer == 0) {
                 if ((D_80B7E0B0 == 0) && (player->unk_860 == 1)) {
-                    D_80B7E0B4 = 37;
+                    sRodCastTimer = 37;
                     Message_CloseTextbox(play);
                 }
             } else {
                 sLureRot.x = sReelLineRot[LINE_SEG_COUNT - 2].x + M_PI;
                 sLureRot.y = sReelLineRot[LINE_SEG_COUNT - 2].y;
 
-                if (D_80B7E0B4 == 18) {
-                    D_80B7A694 = 1;
+                if (sRodCastTimer == 18) {
+                    sRodCastState = 1;
                     sLurePos = sRodTipPos;
                     Matrix_RotateY((player->actor.shape.rot.y / 32768.0f) * M_PI, MTXMODE_NEW);
                     sp90.x = 0.0f;
                     sp90.y = 0.0f;
                     sp90.z = 25.0f;
-                    Matrix_MultVec3f(&sp90, &D_80B7E0E8);
-                    D_80B7E0E8.y = 15.0f;
-                    D_80B7E0F8.x = D_80B7E0F8.z = 0.0f;
-                    D_80B7E0F8.y = -1.0f;
+                    Matrix_MultVec3f(&sp90, &sLurePosDelta);
+                    sLurePosDelta.y = 15.0f;
+                    sLureCastDelta.x = sLureCastDelta.z = 0.0f;
+                    sLureCastDelta.y = -1.0f;
                     D_80B7E148 = 0.0f;
                     D_80B7E0B2 = 5;
-                    D_80B7E11C = 0.5f;
+                    sRodReelingSpeed = 0.5f;
                     D_80B7E118 = Rand_ZeroFloat(1.9f);
                     sFishMouthOffset.y = 500.0f;
-                    func_80078914(&D_80B7AF94, NA_SE_IT_SWORD_SWING_HARD);
+                    func_80078914(&sSoundPos, NA_SE_IT_SWORD_SWING_HARD);
                 }
             }
             break;
 
-        case 1:
+        case 1: // casting the line
             spE0 = sLurePos.y;
 
-            sLurePos.x += D_80B7E0E8.x;
-            sLurePos.y += D_80B7E0E8.y;
-            sLurePos.z += D_80B7E0E8.z;
+            sLurePos.x += sLurePosDelta.x;
+            sLurePos.y += sLurePosDelta.y;
+            sLurePos.z += sLurePosDelta.z;
 
-            D_80B7E0E8.x += D_80B7E0F8.x;
-            D_80B7E0E8.y += D_80B7E0F8.y;
-            D_80B7E0E8.z += D_80B7E0F8.z;
-
-            if (CHECK_BTN_ALL(input->cur.button, BTN_A) || (D_80B7A68C != 0)) {
-                D_80B7E0E8.x *= 0.9f;
-                D_80B7E0E8.z *= 0.9f;
-                if (D_80B7A68C == 0) {
+            sLurePosDelta.x += sLureCastDelta.x;
+            sLurePosDelta.y += sLureCastDelta.y;
+            sLurePosDelta.z += sLureCastDelta.z;
+            // air drag by hat or reeling during cast.
+            if (CHECK_BTN_ALL(input->cur.button, BTN_A) || sIsOwnersHatHooked) {
+                sLurePosDelta.x *= 0.9f;
+                sLurePosDelta.z *= 0.9f;
+                if (!sIsOwnersHatHooked) {
                     func_80078884(NA_SE_IT_FISHING_REEL_HIGH - SFX_FLAG);
                 }
             }
@@ -2299,14 +2320,14 @@ void Fishing_UpdateLure(Fishing* this, PlayState* play) {
                 sLureRot.y = Math_Atan2F(spD0, spD8) + M_PI;
             }
 
-            phi_f16 = sqrtf(SQ(spD8) + SQ(spD4) + SQ(spD0));
-            if (phi_f16 > 1000.0f) {
-                phi_f16 = 1000.0f;
+            lengthCasted = sqrtf(SQ(spD8) + SQ(spD4) + SQ(spD0));
+            if (lengthCasted > 1000.0f) {
+                lengthCasted = 1000.0f;
             }
-            D_80B7E144 = 200.0f - (phi_f16 * 200.0f * 0.001f);
+            sRodLineSpooled = 200.0f - (lengthCasted * 200.0f * 0.001f);
 
-            spC8 = SQ(sLurePos.x) + SQ(sLurePos.z);
-            if (spC8 > SQ(920.0f)) {
+            lureXZLen = SQ(sLurePos.x) + SQ(sLurePos.z);
+            if (lureXZLen > SQ(920.0f)) {
                 if ((KREG(56) != 0) || (sLurePos.y > 160.0f) || (sLurePos.x < 80.0f) || (sLurePos.x > 180.0f) ||
                     (sLurePos.z > 1350.0f) || (sLurePos.z < 1100.0f) || (sLurePos.y < 45.0f)) {
                     sp80 = this->actor.world.pos;
@@ -2315,50 +2336,50 @@ void Fishing_UpdateLure(Fishing* this, PlayState* play) {
                     this->actor.world.pos = sp80;
 
                     if (this->actor.bgCheckFlags & 0x10) {
-                        D_80B7E0E8.y = -0.5f;
+                        sLurePosDelta.y = -0.5f;
                     }
                     if (this->actor.bgCheckFlags & 8) {
-                        if (D_80B7E0E8.y > 0.0f) {
-                            D_80B7E0E8.y = 0.0f;
+                        if (sLurePosDelta.y > 0.0f) {
+                            sLurePosDelta.y = 0.0f;
                         }
-                        D_80B7E0E8.x = D_80B7E0E8.z = 0.0f;
+                        sLurePosDelta.x = sLurePosDelta.z = 0.0f;
                     }
                 } else {
-                    if (func_80B6C2EC(&sLurePos) != 0) {
-                        D_80B7A694 = 3;
-                        D_80B7E154 = 0.0f;
+                    if (Fishing_IsAboveCounter(&sLurePos)) {
+                        sRodCastState = 3;
+                        sReelLinePosStep = 0.0f;
                     }
                 }
 
-                spE4 = ((sqrtf(spC8) - 920.0f) * 0.11f) + WATER_SURFACE_Y(play);
+                spE4 = ((sqrtf(lureXZLen) - 920.0f) * 0.11f) + WATER_SURFACE_Y(play);
                 if (sLurePos.y <= spE4) {
                     sLurePos.y = spE4;
-                    D_80B7E0E8.x = D_80B7E0E8.y = D_80B7E0E8.z = 0.0f;
-                    D_80B7A694 = 3;
-                    D_80B7E154 = 0.0;
+                    sLurePosDelta.x = sLurePosDelta.y = sLurePosDelta.z = 0.0f;
+                    sRodCastState = 3;
+                    sReelLinePosStep = 0.0;
                 } else {
                     Math_ApproachF(&D_80B7E148, 0.0f, 1.0f, 0.05f);
-                    func_80078914(&D_80B7AF94, NA_SE_EN_FANTOM_FLOAT - SFX_FLAG);
+                    func_80078914(&sSoundPos, NA_SE_EN_FANTOM_FLOAT - SFX_FLAG);
                 }
             } else {
                 spE4 = WATER_SURFACE_Y(play);
 
                 if (sLurePos.y <= spE4) {
-                    D_80B7A694 = 2;
-                    D_80B7E154 = 0.0f;
-                    D_80B7E0E8.x = D_80B7E0E8.z = 0.0f;
+                    sRodCastState = 2;
+                    sReelLinePosStep = 0.0f;
+                    sLurePosDelta.x = sLurePosDelta.z = 0.0f;
 
-                    if (D_80B7E0B6 == 2) {
-                        D_80B7E0A2 = 0;
+                    if (sLureEquipped == FS_LURE_SINKING) {
+                        sLureMoveDelay = 0;
                     } else {
-                        D_80B7E0A2 = 10;
+                        sLureMoveDelay = 10;
                     }
 
                     if ((sLurePos.y <= spE4) && (spE4 < spE0) && (spE4 == WATER_SURFACE_Y(play))) {
                         D_80B7E114 = 10;
-                        func_80078914(&D_80B7AF94, NA_SE_EV_BOMB_DROP_WATER);
-                        D_80B7E0F8.y = 0.0f;
-                        D_80B7E0E8.y *= 0.2f;
+                        func_80078914(&sSoundPos, NA_SE_EV_BOMB_DROP_WATER);
+                        sLureCastDelta.y = 0.0f;
+                        sLurePosDelta.y *= 0.2f;
 
                         for (i = 0; i < 50; i++) {
                             sp7C = Rand_ZeroFloat(1.5f) + 0.5f;
@@ -2382,7 +2403,7 @@ void Fishing_UpdateLure(Fishing* this, PlayState* play) {
                     }
                 } else {
                     Math_ApproachZeroF(&D_80B7E148, 1.0f, 0.05f);
-                    func_80078914(&D_80B7AF94, NA_SE_EN_FANTOM_FLOAT - SFX_FLAG);
+                    func_80078914(&sSoundPos, NA_SE_EN_FANTOM_FLOAT - SFX_FLAG);
                 }
             }
 
@@ -2390,218 +2411,218 @@ void Fishing_UpdateLure(Fishing* this, PlayState* play) {
             sReelLinePos[LINE_SEG_COUNT - 1].y = sLurePos.y;
             sReelLinePos[LINE_SEG_COUNT - 1].z = sLurePos.z;
 
-            D_80B7E140 = 1.0f;
-            D_80B7E10C = 0.5f;
+            sLureWiggleSign = 1.0f;
+            sLureRotXTarget = 0.5f;
             break;
 
         case 2:
             if (sLurePos.y <= WATER_SURFACE_Y(play)) {
-                sLurePos.y += D_80B7E0E8.y;
+                sLurePos.y += sLurePosDelta.y;
 
-                Math_ApproachZeroF(&D_80B7E0E8.y, 1.0f, 1.0f);
+                Math_ApproachZeroF(&sLurePosDelta.y, 1.0f, 1.0f);
 
-                if (D_80B7E0B6 != 2) {
+                if (sLureEquipped != FS_LURE_SINKING) {
                     Math_ApproachF(&sLurePos.y, WATER_SURFACE_Y(play), 0.5f, 1.0f);
                 }
             }
 
             Math_ApproachF(&D_80B7E148, 2.0f, 1.0f, 0.1f);
 
-            if (D_80B7E0A2 == 0) {
-                D_80B7A694 = 3;
+            if (sLureMoveDelay == 0) {
+                sRodCastState = 3;
             } else {
-                D_80B7E0A2--;
+                sLureMoveDelay--;
             }
             break;
 
         case 3:
-            D_80B7FEA0 = 0;
+            sSinkingLureSegmentIndex = 0;
 
-            if ((D_80B7A68C != 0) && ((SQ(sLurePos.x) + SQ(sLurePos.z)) < SQ(500.0f))) {
-                D_80B7A690 = 1;
+            if (sIsOwnersHatHooked && ((SQ(sLurePos.x) + SQ(sLurePos.z)) < SQ(500.0f))) {
+                sIsOwnersHatSunk = true;
             }
 
             player->unk_860 = 2;
 
-            if (D_80B7E138 < 3.0f) {
-                spD0 = D_80B7E10C * Math_SinS(D_80B7E0AE * 0x1060);
-                Math_ApproachF(&sLureRot.x, -M_PI / 6.0f + spD0, 0.3f, D_80B7E110);
-                Math_ApproachF(&D_80B7E110, 0.5f, 1.0f, 0.02f);
-                Math_ApproachZeroF(&D_80B7E10C, 1.0f, 0.02f);
+            if (sLureWigglePosY < 3.0f) {
+                spD0 = sLureRotXTarget * Math_SinS(sLureTimer * 0x1060);
+                Math_ApproachF(&sLureRot.x, -M_PI / 6.0f + spD0, 0.3f, sLureRotXStep);
+                Math_ApproachF(&sLureRotXStep, 0.5f, 1.0f, 0.02f);
+                Math_ApproachZeroF(&sLureRotXTarget, 1.0f, 0.02f);
             } else {
-                D_80B7E110 = 0.0f;
+                sLureRotXStep = 0.0f;
             }
 
             spDC = 0x4000;
             spE4 = WATER_SURFACE_Y(play);
 
-            spC8 = SQ(sLurePos.x) + SQ(sLurePos.z);
-            if (spC8 < SQ(920.0f)) {
+            lureXZLen = SQ(sLurePos.x) + SQ(sLurePos.z);
+            if (lureXZLen < SQ(920.0f)) {
                 if (sLurePos.y <= (spE4 + 4.0f)) {
-                    sp70 = 0.0f;
+                    wiggle = 0.0f;
 
                     if (D_80B7E150 == 0) {
                         if (fabsf(input->rel.stick_x) > 30.0f) {
-                            sp70 = fabsf((input->rel.stick_x - D_80B7A6C4) * (1.0f / 60.0f));
+                            wiggle = fabsf((input->rel.stick_x - sStickAdjXPrev) * (1.0f / 60.0f));
                         } else if (fabsf(input->rel.stick_y) > 30.0f) {
-                            sp70 = fabsf((input->rel.stick_y - D_80B7A6C8) * (1.0f / 60.0f));
+                            wiggle = fabsf((input->rel.stick_y - sStickAdjYPrev) * (1.0f / 60.0f));
                         }
                     }
 
-                    if (sp70 > 1.0f) {
-                        sp70 = 1.0f;
+                    if (wiggle > 1.0f) {
+                        wiggle = 1.0f;
                     }
                     if (CHECK_BTN_ALL(input->press.button, BTN_B)) {
-                        sp70 = 0.5f;
+                        wiggle = 0.5f;
                     }
 
-                    if (D_80B7A68C != 0) {
-                        if (sp70 > 0.3f) {
-                            sp70 = 0.3f;
+                    if (sIsOwnersHatHooked) {
+                        if (wiggle > 0.3f) {
+                            wiggle = 0.3f;
                         }
                     }
 
-                    if ((sp70 > 0.2f) && (D_80B7E138 < 4.0f)) {
+                    if ((wiggle > 0.2f) && (sLureWigglePosY < 4.0f)) {
                         D_80B7E150 = 5;
 
-                        if (sp70 > 0.8f) {
-                            D_80B7E120 = 2;
+                        if (wiggle > 0.8f) {
+                            sWiggleAttraction = 2;
                         } else {
-                            D_80B7E120 = 1;
+                            sWiggleAttraction = 1;
                         }
 
                         sp90.x = player->actor.world.pos.x - sLurePos.x;
                         sp90.z = player->actor.world.pos.z - sLurePos.z;
                         sp90.y = Math_Atan2F(sp90.z, sp90.x);
 
-                        D_80B7E134 = (sp70 * D_80B7E140) + sp90.y;
-                        D_80B7E140 = D_80B7E140 * -1.0f;
-                        D_80B7E138 = fabsf(sp70) * 6.0f;
+                        sLureWiggleRotYTarget = (wiggle * sLureWiggleSign) + sp90.y;
+                        sLureWiggleSign *= -1.0f;
+                        sLureWigglePosY = fabsf(wiggle) * 6.0f;
                         sLureRot.x = 0.0f;
-                        D_80B7E10C = 0.5f;
-                        D_80B7E144 += (fabsf(sp70) * (7.5f + (KREG(25) * 0.1f)));
+                        sLureRotXTarget = 0.5f;
+                        sRodLineSpooled += (fabsf(wiggle) * (7.5f + (KREG(25) * 0.1f)));
 
-                        func_800F436C(&D_80B7AF94, NA_SE_EV_LURE_MOVE_W, (sp70 * 1.999f * 0.25f) + 0.75f);
+                        func_800F436C(&sSoundPos, NA_SE_EV_LURE_MOVE_W, (wiggle * 1.999f * 0.25f) + 0.75f);
 
-                        if (D_80B7E0B6 == 2) {
-                            D_80B7E128.y = 5.0f * sp70;
-                            sReelLinePos[LINE_SEG_COUNT - 1].y += D_80B7E128.y;
-                            sLurePos.y += D_80B7E128.y;
+                        if (sLureEquipped == FS_LURE_SINKING) {
+                            sLureLineSegPosDelta.y = 5.0f * wiggle;
+                            sReelLinePos[LINE_SEG_COUNT - 1].y += sLureLineSegPosDelta.y;
+                            sLurePos.y += sLureLineSegPosDelta.y;
                         }
                     } else if (CHECK_BTN_ALL(input->cur.button, BTN_A)) {
                         spDC = 0x500;
-                        D_80B7E134 = sReelLineRot[LINE_SEG_COUNT - 2].y + M_PI;
+                        sLureWiggleRotYTarget = sReelLineRot[LINE_SEG_COUNT - 2].y + M_PI;
                         sLureRot.x = 0.0f;
-                        D_80B7E10C = 0.5f;
-                        if (D_80B7E0B6 == 2) {
-                            D_80B7E128.y = 0.2f;
-                            sReelLinePos[LINE_SEG_COUNT - 1].y += D_80B7E128.y;
-                            sLurePos.y += D_80B7E128.y;
+                        sLureRotXTarget = 0.5f;
+                        if (sLureEquipped == FS_LURE_SINKING) {
+                            sLureLineSegPosDelta.y = 0.2f;
+                            sReelLinePos[LINE_SEG_COUNT - 1].y += sLureLineSegPosDelta.y;
+                            sLurePos.y += sLureLineSegPosDelta.y;
                         }
                     }
                 } else {
-                    if (D_80B7E144 > 150.0f) {
+                    if (sRodLineSpooled > 150.0f) {
                         sLureRot.x = sReelLineRot[LINE_SEG_COUNT - 2].x + M_PI;
-                        D_80B7E134 = sReelLineRot[LINE_SEG_COUNT - 2].y + M_PI;
-                        D_80B7E144 += 2.0f;
+                        sLureWiggleRotYTarget = sReelLineRot[LINE_SEG_COUNT - 2].y + M_PI;
+                        sRodLineSpooled += 2.0f;
                     }
                 }
             } else {
-                spE4 = ((sqrtf(spC8) - 920.0f) * 0.11f) + WATER_SURFACE_Y(play);
+                spE4 = ((sqrtf(lureXZLen) - 920.0f) * 0.11f) + WATER_SURFACE_Y(play);
                 if (sLurePos.y <= spE4) {
                     sLurePos.y = spE4;
                     spDC = 0x500;
-                    D_80B7E134 = sReelLineRot[LINE_SEG_COUNT - 2].y + M_PI;
+                    sLureWiggleRotYTarget = sReelLineRot[LINE_SEG_COUNT - 2].y + M_PI;
                     sLureRot.x = 0.0f;
                     if (CHECK_BTN_ALL(input->press.button, BTN_B)) {
-                        D_80B7E144 += 6.0f;
-                        func_80078914(&D_80B7AF94, NA_SE_PL_WALK_SAND);
+                        sRodLineSpooled += 6.0f;
+                        func_80078914(&sSoundPos, NA_SE_PL_WALK_SAND);
                     }
                 } else {
-                    if (D_80B7E144 > 150.0f) {
+                    if (sRodLineSpooled > 150.0f) {
                         sLureRot.x = sReelLineRot[LINE_SEG_COUNT - 2].x + M_PI;
-                        D_80B7E134 = sReelLineRot[LINE_SEG_COUNT - 2].y + M_PI;
-                        D_80B7E144 += 2.0f;
+                        sLureWiggleRotYTarget = sReelLineRot[LINE_SEG_COUNT - 2].y + M_PI;
+                        sRodLineSpooled += 2.0f;
                     }
                 }
             }
 
-            Math_ApproachZeroF(&D_80B7E138, 1.0f, 0.3f);
-            Math_ApproachS(&D_80B7E13C, (D_80B7E134 * 32768.0f) / M_PI, 3, spDC);
+            Math_ApproachZeroF(&sLureWigglePosY, 1.0f, 0.3f);
+            Math_ApproachS(&sLureWiggleRotY, (sLureWiggleRotYTarget * 32768.0f) / M_PI, 3, spDC);
 
-            sLureRot.y = (D_80B7E13C / 32768.0f) * M_PI;
+            sLureRot.y = (sLureWiggleRotY / 32768.0f) * M_PI;
 
             sp90.x = 0.0f;
             sp90.y = 0.0f;
-            sp90.z = D_80B7E138;
+            sp90.z = sLureWigglePosY;
 
             Matrix_RotateY(sLureRot.y, MTXMODE_NEW);
 
-            if (D_80B7E0B6 == 2) {
+            if (sLureEquipped == FS_LURE_SINKING) {
                 Matrix_MultVec3f(&sp90, &sp64);
-                D_80B7E128.x = sp64.x;
-                D_80B7E128.z = sp64.z;
+                sLureLineSegPosDelta.x = sp64.x;
+                sLureLineSegPosDelta.z = sp64.z;
                 phi_f0 = 10.0f;
             } else {
-                Matrix_MultVec3f(&sp90, &D_80B7E128);
+                Matrix_MultVec3f(&sp90, &sLureLineSegPosDelta);
                 phi_f0 = 0.0f;
             }
 
-            D_80B7E104 = 0.0f;
+            sLure1Rotate = 0.0f;
 
-            if ((D_80B7E0B6 == 1) && CHECK_BTN_ALL(input->cur.button, BTN_A)) {
-                D_80B7E128.y = -2.0f;
+            if ((sLureEquipped == FS_LURE_UNK) && CHECK_BTN_ALL(input->cur.button, BTN_A)) {
+                sLureLineSegPosDelta.y = -2.0f;
 
-                if ((D_80B7E0AE & 1) != 0) {
-                    D_80B7E104 = 0.5f;
+                if ((sLureTimer & 1) != 0) {
+                    sLure1Rotate = 0.5f;
                 } else {
-                    D_80B7E104 = -0.5f;
+                    sLure1Rotate = -0.5f;
                 }
             } else if (sReelLinePos[LINE_SEG_COUNT - 1].y < (WATER_SURFACE_Y(play) + phi_f0)) {
-                if (D_80B7E0B6 == 2) {
+                if (sLureEquipped == FS_LURE_SINKING) {
                     sp58 = this->actor.world.pos;
                     this->actor.prevPos = this->actor.world.pos = sLurePos;
                     Actor_UpdateBgCheckInfo(play, &this->actor, 15.0f, 30.0f, 30.0f, 0x44);
                     this->actor.world.pos = sp58;
 
-                    D_80B7E128.y += -0.5f;
-                    if (D_80B7E128.y < -1.0f) {
-                        D_80B7E128.y = -1.0f;
+                    sLureLineSegPosDelta.y += -0.5f;
+                    if (sLureLineSegPosDelta.y < -1.0f) {
+                        sLureLineSegPosDelta.y = -1.0f;
                     }
 
                     if (sLurePos.y < (this->actor.floorHeight + 5.0f)) {
                         sReelLinePos[LINE_SEG_COUNT - 1].y = sLurePos.y = this->actor.floorHeight + 5.0f;
-                        D_80B7E128.y = 0.0f;
+                        sLureLineSegPosDelta.y = 0.0f;
                     } else {
-                        D_80B7E120 = 1;
+                        sWiggleAttraction = 1;
                     }
                 } else {
-                    D_80B7E128.y = fabsf(sReelLinePos[LINE_SEG_COUNT - 1].y - WATER_SURFACE_Y(play)) * 0.2f;
-                    if (D_80B7E128.y > 1.5f) {
-                        D_80B7E128.y = 1.5f;
+                    sLureLineSegPosDelta.y = fabsf(sReelLinePos[LINE_SEG_COUNT - 1].y - WATER_SURFACE_Y(play)) * 0.2f;
+                    if (sLureLineSegPosDelta.y > 1.5f) {
+                        sLureLineSegPosDelta.y = 1.5f;
                     }
                 }
             }
 
-            sReelLinePos[LINE_SEG_COUNT - 1].x += D_80B7E128.x;
-            sReelLinePos[LINE_SEG_COUNT - 1].y += D_80B7E128.y;
-            sReelLinePos[LINE_SEG_COUNT - 1].z += D_80B7E128.z;
+            sReelLinePos[LINE_SEG_COUNT - 1].x += sLureLineSegPosDelta.x;
+            sReelLinePos[LINE_SEG_COUNT - 1].y += sLureLineSegPosDelta.y;
+            sReelLinePos[LINE_SEG_COUNT - 1].z += sLureLineSegPosDelta.z;
 
             if (sReelLinePos[LINE_SEG_COUNT - 1].y > (spE4 + 6.0f)) {
                 sReelLinePos[LINE_SEG_COUNT - 1].y -= 5.0f;
             }
 
-            D_80B7E0E8.x = D_80B7E0E8.y = D_80B7E0E8.z = D_80B7E0F8.y = 0.0f;
+            sLurePosDelta.x = sLurePosDelta.y = sLurePosDelta.z = sLureCastDelta.y = 0.0f;
 
             if (CHECK_BTN_ALL(input->cur.button, BTN_A)) {
                 if (CHECK_BTN_ALL(input->cur.button, BTN_R)) {
-                    D_80B7E144 += 1.5f;
+                    sRodLineSpooled += 1.5f;
                     func_80078884(NA_SE_IT_FISHING_REEL_HIGH - SFX_FLAG);
-                    Math_ApproachF(&D_80B7E154, 1000.0f, 1.0f, 2.0f);
+                    Math_ApproachF(&sReelLinePosStep, 1000.0f, 1.0f, 2.0f);
                 } else {
-                    D_80B7E144 += D_80B7E11C;
+                    sRodLineSpooled += sRodReelingSpeed;
                     func_80078884(NA_SE_IT_FISHING_REEL_SLOW - SFX_FLAG);
-                    Math_ApproachF(&D_80B7E154, 1000.0f, 1.0f, 0.2f);
+                    Math_ApproachF(&sReelLinePosStep, 1000.0f, 1.0f, 0.2f);
                 }
 
                 if (sReelLinePos[LINE_SEG_COUNT - 1].y > (WATER_SURFACE_Y(play) + 4.0f)) {
@@ -2613,32 +2634,32 @@ void Fishing_UpdateLure(Fishing* this, PlayState* play) {
                 Math_ApproachF(&D_80B7E148, 2.0f, 1.0f, 0.2f);
             }
 
-            Math_ApproachF(&sLurePos.x, sReelLinePos[LINE_SEG_COUNT - 1].x, 1.0f, D_80B7E154);
-            Math_ApproachF(&sLurePos.y, sReelLinePos[LINE_SEG_COUNT - 1].y, 1.0f, D_80B7E154);
-            Math_ApproachF(&sLurePos.z, sReelLinePos[LINE_SEG_COUNT - 1].z, 1.0f, D_80B7E154);
+            Math_ApproachF(&sLurePos.x, sReelLinePos[LINE_SEG_COUNT - 1].x, 1.0f, sReelLinePosStep);
+            Math_ApproachF(&sLurePos.y, sReelLinePos[LINE_SEG_COUNT - 1].y, 1.0f, sReelLinePosStep);
+            Math_ApproachF(&sLurePos.z, sReelLinePos[LINE_SEG_COUNT - 1].z, 1.0f, sReelLinePosStep);
 
-            if (D_80B7E138 > 1.0f) {
-                Math_ApproachF(&D_80B7E154, 1000.0f, 1.0f, 1.0f);
+            if (sLureWigglePosY > 1.0f) {
+                Math_ApproachF(&sReelLinePosStep, 1000.0f, 1.0f, 1.0f);
             }
 
-            Math_ApproachF(&D_80B7E154, 1000.0f, 1.0f, 0.1f);
+            Math_ApproachF(&sReelLinePosStep, 1000.0f, 1.0f, 0.1f);
 
-            if (D_80B7E144 >= 195.0f) {
-                D_80B7E144 = 195.0f;
-                D_80B7A694 = 0;
+            if (sRodLineSpooled >= 195.0f) {
+                sRodLineSpooled = 195.0f;
+                sRodCastState = 0;
                 D_80B7E148 = 520.0f;
-                D_80B7A6CC = 3;
+                sFishingPlayerCinematicState = 3;
             }
 
             if ((sLurePos.y <= (WATER_SURFACE_Y(play) + 4.0f)) &&
                 (sLurePos.y >= (WATER_SURFACE_Y(play) - 4.0f))) {
 
-                phi_v0 = 63;
-                if (CHECK_BTN_ALL(input->cur.button, BTN_A) || (D_80B7E138 > 1.0f)) {
-                    phi_v0 = 1;
+                timer = 63;
+                if (CHECK_BTN_ALL(input->cur.button, BTN_A) || (sLureWigglePosY > 1.0f)) {
+                    timer = 1;
                 }
 
-                if ((D_80B7E0AE & phi_v0) == 0) {
+                if ((sLureTimer & timer) == 0) {
                     spA8 = sLurePos;
                     spA8.y = WATER_SURFACE_Y(play);
                     Fishing_SpawnRipple(NULL, play->specialEffects, &spA8, 30.0f, 300.0f, 150, 90);
@@ -2649,20 +2670,20 @@ void Fishing_UpdateLure(Fishing* this, PlayState* play) {
         case 4:
             if (this->unk_157 != 0) {
                 this->unk_157--;
-                D_80B7E144 += D_80B7E11C;
+                sRodLineSpooled += sRodReelingSpeed;
             }
 
             if (CHECK_BTN_ALL(input->cur.button, BTN_A)) {
                 if ((SQ(sLurePos.x) + SQ(sLurePos.z)) > SQ(920.0f)) {
-                    D_80B7E144 += (1.0f + (KREG(65) * 0.1f));
+                    sRodLineSpooled += (1.0f + (KREG(65) * 0.1f));
                 } else {
-                    D_80B7E144 += D_80B7E11C;
+                    sRodLineSpooled += sRodReelingSpeed;
                 }
                 func_80078884(NA_SE_IT_FISHING_REEL_SLOW - SFX_FLAG);
             }
 
-            if ((D_80B7E0AE & 0x1F) == 0) {
-                if ((D_80B7E124 != 0) || (D_80B7E0B6 != 2)) {
+            if ((sLureTimer & 0x1F) == 0) {
+                if (sLineHooked || (sLureEquipped != FS_LURE_SINKING)) {
                     D_80B7A6A4 = 5;
                 }
             }
@@ -2671,7 +2692,7 @@ void Fishing_UpdateLure(Fishing* this, PlayState* play) {
             break;
 
         case 5:
-            D_80B7E14C = 0.0005000001f;
+            sFishingLineScale = 0.0005000001f;
             sReelLinePos[LINE_SEG_COUNT - 1].x = sLurePos.x;
             sReelLinePos[LINE_SEG_COUNT - 1].y = sLurePos.y;
             sReelLinePos[LINE_SEG_COUNT - 1].z = sLurePos.z;
@@ -2680,7 +2701,7 @@ void Fishing_UpdateLure(Fishing* this, PlayState* play) {
     }
 }
 
-s32 func_80B70A2C(Fishing* this, PlayState* play, u8 ignorePosCheck) {
+s32 Fishing_SplashBySize(Fishing* this, PlayState* play, u8 ignorePosCheck) {
     s16 i;
     s16 count;
     f32 scale;
@@ -2693,7 +2714,7 @@ s32 func_80B70A2C(Fishing* this, PlayState* play, u8 ignorePosCheck) {
         return false;
     }
 
-    if (this->unk_1AC >= 40.0f) {
+    if (this->fishLength >= 40.0f) {
         count = 40;
         scale = 1.2f;
     } else {
@@ -2723,12 +2744,12 @@ s32 func_80B70A2C(Fishing* this, PlayState* play, u8 ignorePosCheck) {
 
     Fishing_SpawnRipple(&this->actor.projectedPos, play->specialEffects, &pos, 100.0f, 800.0f, 150, 90);
 
-    this->unk_151 = 30;
+    this->lilyTimer = 30;
 
     return true;
 }
 
-void func_80B70CF0(Fishing* this, PlayState* play) {
+void Fishing_SplashBySize2(Fishing* this, PlayState* play) {
     s16 count;
     s16 i;
     f32 scale;
@@ -2737,7 +2758,7 @@ void func_80B70CF0(Fishing* this, PlayState* play) {
     f32 speedXZ;
     f32 angle;
 
-    if (this->unk_1AC >= 45.0f) {
+    if (this->fishLength >= 45.0f) {
         count = 30;
         scale = 0.5f;
     } else {
@@ -2764,86 +2785,86 @@ void func_80B70CF0(Fishing* this, PlayState* play) {
 }
 
 void func_80B70ED4(Fishing* this, Input* input) {
-    Vec3f sp34;
+    Vec3f lineVec;
     Vec3f sp28;
-    f32 sp24;
+    f32 lineLengthSQ;
 
-    sp34.x = sLurePos.x - this->actor.world.pos.x;
-    sp34.y = sLurePos.y - this->actor.world.pos.y;
-    sp34.z = sLurePos.z - this->actor.world.pos.z;
+    lineVec.x = sLurePos.x - this->actor.world.pos.x;
+    lineVec.y = sLurePos.y - this->actor.world.pos.y;
+    lineVec.z = sLurePos.z - this->actor.world.pos.z;
 
-    sp24 = SQ(sp34.x) + SQ(sp34.y) + SQ(sp34.z);
+    lineLengthSQ = SQ(lineVec.x) + SQ(lineVec.y) + SQ(lineVec.z);
 
-    if ((D_80B7A694 == 3) && (this->unk_1A2 == 0) && (D_80B7A68C == 0)) {
+    if ((sRodCastState == 3) && (this->unk_1A2 == 0) && (sIsOwnersHatHooked == 0)) {
         Matrix_RotateY((-this->actor.shape.rot.y / 32768.0f) * M_PI, MTXMODE_NEW);
-        Matrix_MultVec3f(&sp34, &sp28);
+        Matrix_MultVec3f(&lineVec, &sp28);
 
-        if ((sp28.z > 0.0f) || (this->unk_1AC < 40.0f)) {
-            if ((this->unk_158 == 7) && (sp24 < SQ(200.0f))) {
-                this->unk_158 = 4;
-                this->unk_1B4 = sLurePos;
-                this->unk_1B0 = 28672.0f;
-                this->unk_188 = 5.0f;
+        if ((sp28.z > 0.0f) || (this->fishLength < 40.0f)) {
+            if ((this->fishState == 7) && (lineLengthSQ < SQ(200.0f))) {
+                this->fishState = 4;
+                this->fishTargetPos = sLurePos;
+                this->rotationStep = 28672.0f;
+                this->speedTarget = 5.0f;
             } else {
-                if ((CHECK_BTN_ALL(input->cur.button, BTN_A) || (D_80B7E138 > 1.0f)) && (sp24 < SQ(120.0f))) {
-                    this->unk_158 = 2;
+                if ((CHECK_BTN_ALL(input->cur.button, BTN_A) || (sLureWigglePosY > 1.0f)) && (lineLengthSQ < SQ(120.0f))) {
+                    this->fishState = 2;
                     this->unk_15E = 0;
-                    this->unk_17A[0] = 0;
-                    this->unk_17A[2] = (s16)Rand_ZeroFloat(100.0f) + 100;
-                    this->unk_1A8 = sFishInits[this->actor.params - 100].unk_0C;
-                    this->unk_1B0 = 0.0f;
+                    this->timerArray[0] = 0;
+                    this->timerArray[2] = (s16)Rand_ZeroFloat(100.0f) + 100;
+                    this->perception = sFishInits[this->actor.params - EN_FISH_PARAM].perception;
+                    this->rotationStep = 0.0f;
                 }
 
-                if ((this->unk_17A[1] == 0) && (sp24 < SQ(70.0f))) {
-                    this->unk_158 = 2;
+                if ((this->timerArray[1] == 0) && (lineLengthSQ < SQ(70.0f))) {
+                    this->fishState = 2;
                     this->unk_15E = 0;
-                    this->unk_17A[0] = 0;
-                    this->unk_17A[2] = (s16)Rand_ZeroFloat(100.0f) + 100;
-                    this->unk_1A8 = sFishInits[this->actor.params - 100].unk_0C;
-                    this->unk_1B0 = 0.0f;
+                    this->timerArray[0] = 0;
+                    this->timerArray[2] = (s16)Rand_ZeroFloat(100.0f) + 100;
+                    this->perception = sFishInits[this->actor.params - EN_FISH_PARAM].perception;
+                    this->rotationStep = 0.0f;
                 }
             }
         }
-    } else if ((D_80B7A694 == 4) && (D_80B7E124 != 0) && (sp24 < SQ(100.0f)) && (this->unk_158 >= 10)) {
-        this->unk_15A = 0;
-        this->unk_158 = 1;
+    } else if ((sRodCastState == 4) && sLineHooked && (lineLengthSQ < SQ(100.0f)) && (this->fishState >= 10)) {
+        this->fishStateNext = 0;
+        this->fishState = 1;
         this->unk_1A4 = 1000;
         this->unk_1A2 = 100;
-        this->unk_17A[1] = 50;
+        this->timerArray[1] = 50;
     }
 
-    if ((D_80B7E0B6 != 2) && (D_80B7E114 != 0) && (this->unk_1AC > 60.0f) && (sp24 < SQ(30.0f)) &&
-        (this->unk_158 >= 10)) {
-        this->unk_15A = 0;
-        this->unk_158 = 1;
+    if ((sLureEquipped != FS_LURE_SINKING) && (D_80B7E114 != 0) && (this->fishLength > 60.0f) && (lineLengthSQ < SQ(30.0f)) &&
+        (this->fishState >= 10)) {
+        this->fishStateNext = 0;
+        this->fishState = 1;
         this->unk_1A4 = 1000;
         this->unk_1A2 = 100;
-        this->unk_17A[1] = 50;
+        this->timerArray[1] = 50;
     }
 }
 
-void func_80B71278(Fishing* this, u8 arg1) {
+void Fishing_FishLeapSfx(Fishing* this, u8 outOfWater) {
     s16 sfxId;
-    u8 temp;
+    u8 length;
 
-    if (this->unk_150 == 0) {
-        temp = this->unk_1AC;
+    if (this->isLoach == 0) {
+        length = this->fishLength;
     } else {
-        temp = 2.0f * this->unk_1AC;
+        length = 2.0f * this->fishLength;
     }
 
-    if (arg1 == 0) {
-        if (temp >= 50) {
+    if (outOfWater == false) {
+        if (length >= 50) {
             sfxId = NA_SE_EV_DIVE_INTO_WATER;
-        } else if (temp >= 40) {
+        } else if (length >= 40) {
             sfxId = NA_SE_EV_BOMB_DROP_WATER;
         } else {
             sfxId = NA_SE_EV_BOMB_DROP_WATER;
         }
     } else {
-        if (temp >= 50) {
+        if (length >= 50) {
             sfxId = NA_SE_EV_JUMP_OUT_WATER;
-        } else if (temp >= 40) {
+        } else if (length >= 40) {
             sfxId = NA_SE_EV_OUT_OF_WATER;
         } else {
             sfxId = NA_SE_EV_OUT_OF_WATER;
@@ -2854,9 +2875,9 @@ void func_80B71278(Fishing* this, u8 arg1) {
 }
 
 void Fishing_HandleAquariumDialog(Fishing* this, PlayState* play) {
-    if (sLinkAge == 1) {
-        if ((HIGH_SCORE(HS_FISHING) & 0x7F) != 0) {
-            if (HIGH_SCORE(HS_FISHING) & 0x80) {
+    if (sLinkAge == LINK_AGE_CHILD) {
+        if ((HIGH_SCORE(HS_FISHING) & HS_FISH_LENGTH_CHILD) != 0) {
+            if (HIGH_SCORE(HS_FISHING) & HS_FISH_CHEAT_CHILD) {
                 this->actor.textId = 0x40B1;
             } else {
                 this->actor.textId = 0x4089;
@@ -2865,8 +2886,8 @@ void Fishing_HandleAquariumDialog(Fishing* this, PlayState* play) {
             this->actor.textId = 0x40AE;
         }
     } else {
-        if ((HIGH_SCORE(HS_FISHING) & 0x7F000000) != 0) {
-            if (HIGH_SCORE(HS_FISHING) & 0x80000000) {
+        if ((HIGH_SCORE(HS_FISHING) & HS_FISH_LENGTH_ADULT) != 0) {
+            if (HIGH_SCORE(HS_FISHING) & HS_FISH_CHEAT_ADULT) {
                 this->actor.textId = 0x40B1;
             } else {
                 this->actor.textId = 0x4089;
@@ -2876,23 +2897,23 @@ void Fishing_HandleAquariumDialog(Fishing* this, PlayState* play) {
         }
     }
 
-    if (this->unk_1D3 == 0) {
-        if (this->unk_1D4 == 0) {
+    if (!this->isAquariumMessage) {
+        if (this->aquariumWaitTimer == 0) {
             this->actor.flags |= ACTOR_FLAG_TARGETABLE;
 
             if (Actor_ProcessTalkRequest(&this->actor, play)) {
-                D_80B7A678 = D_80B7E078;
-                this->unk_1D3 = 1;
+                sFishLengthToWeigh = sFishingRecordLength;
+                this->isAquariumMessage = true;
             } else {
                 func_8002F2F4(&this->actor, play);
             }
         } else {
-            this->unk_1D4--;
+            this->aquariumWaitTimer--;
             this->actor.flags &= ~ACTOR_FLAG_TARGETABLE;
         }
     } else if (Actor_TextboxIsClosing(&this->actor, play)) {
-        this->unk_1D3 = 0;
-        this->unk_1D4 = 20;
+        this->isAquariumMessage = false;
+        this->aquariumWaitTimer = 20;
     }
 }
 
@@ -2921,27 +2942,36 @@ bool getFishNeverEscape() {
     return CVarGetInteger("gCustomizeFishing", 0) && CVarGetInteger("gFishNeverEscape", 0);
 }
 
+bool getShouldSpawnLoaches() {
+    return (CVarGetInteger("gCustomizeFishing", 0) && CVarGetInteger("gLoachesAlwaysAppear", 0))
+        || ((KREG(1) == 1) || ((sFishGameNumber & 3) == 3));
+}
+
+bool getShouldConfirmKeep() {
+    return !CVarGetInteger("gCustomizeFishing", 0) || !CVarGetInteger("gSkipKeepConfirmation", 0);
+}
+
 void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
     s16 i;
-    s16 sp134 = 10;
-    f32 sp130;
-    f32 sp12C;
-    f32 sp128;
-    f32 sp124;
+    s16 rotXYScale = 10;
+    f32 distX;
+    f32 distY;
+    f32 distZ;
+    f32 distToTarget;
     f32 multiplier;
-    f32 sp11C;
-    f32 sp118;
-    Vec3f sp10C;
-    Vec3f sp100;
-    s16 spFE;
-    s16 spFC;
-    s16 spFA;
-    s16 phi_v0;
+    f32 chance;
+    f32 playerSpeedMod;
+    Vec3f multiVecSrc;
+    Vec3f targetPosOffset;
+    s16 rotXTarget;
+    s16 rotYTarget;
+    s16 rotZScale;
+    s16 timer;
     s16 spF6;
-    s16 spF4;
-    s16 spF2;
-    s16 spF0;
-    s16 spEE;
+    s16 rotXScale;
+    s16 rotXStep;
+    s16 rotYScale;
+    s16 rotYStep;
     Fishing* this = (Fishing*)thisx;
     PlayState* play = play2;
     Player* player = GET_PLAYER(play);
@@ -2949,46 +2979,46 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
     f32 spD8;
     f32 phi_f0;
     f32 phi_f2;
-    Vec3f spC4;
+    Vec3f bubblePos;
     Vec3f spB8;
     u8 phi_v0_2;
     f32 temp_f0;
     f32 temp;
     s32 pad;
-    f32 spA4;
-    u16 spA2;
-    u8 phi_a1;
+    f32 rumbleStrength;
+    u16 attempts;
+    u8 rumbleStrength8;
 
     this->actor.uncullZoneForward = 700.0f;
     this->actor.uncullZoneScale = 50.0f;
 
-    if (this->unk_150 == 0) {
-        sp118 = (player->actor.speedXZ * 0.15f) + 0.25f;
+    if (this->isLoach == 0) {
+        playerSpeedMod = (player->actor.speedXZ * 0.15f) + 0.25f;
     } else {
-        sp118 = (player->actor.speedXZ * 0.3f) + 0.25f;
+        playerSpeedMod = (player->actor.speedXZ * 0.3f) + 0.25f;
     }
 
-    if ((D_80B7E0B0 != 0) || (sCameraId != 0) || ((player->actor.world.pos.z > 1150.0f) && (this->unk_158 != 100))) {
+    if ((D_80B7E0B0 != 0) || (sSubCamId != 0) || ((player->actor.world.pos.z > 1150.0f) && (this->fishState != 100))) {
         this->actor.flags &= ~ACTOR_FLAG_TARGETABLE;
     } else {
         this->actor.flags |= ACTOR_FLAG_TARGETABLE;
-        if (D_80B7A694 != 0) {
+        if (sRodCastState != 0) {
             if (D_80B7E0B2 == 0) {
                 this->actor.focus.pos = sLurePos;
             } else if (D_80B7E0B2 == 1) {
-                D_80B7A6CC = 1;
+                sFishingPlayerCinematicState = 1;
                 D_80B7FED0 = 0.0f;
-                D_80B7E088 = 2;
+                sLureCameraZoomLevel = 2;
             }
         }
         this->actor.focus.pos = this->actor.world.pos;
     }
 
-    this->unk_15C++;
+    this->stateAndTimer++;
 
     for (i = 0; i < 4; i++) {
-        if (this->unk_17A[i] != 0) {
-            this->unk_17A[i]--;
+        if (this->timerArray[i] != 0) {
+            this->timerArray[i]--;
         }
     }
 
@@ -3000,18 +3030,18 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
         this->unk_1A2--;
     }
 
-    if (this->unk_1A0 != 0) {
-        this->unk_1A0--;
+    if (this->bumpTimer != 0) {
+        this->bumpTimer--;
     }
 
-    if (this->unk_151 != 0) {
-        this->unk_151--;
+    if (this->lilyTimer != 0) {
+        this->lilyTimer--;
     }
 
-    Math_ApproachF(&this->unk_198, this->unk_190, 1.0f, 0.2f);
+    Math_ApproachF(&this->fishLimbRotPhaseStep, this->unk_190, 1.0f, 0.2f);
 
-    if (this->unk_158 == 6) {
-        Math_ApproachF(&this->unk_19C, this->unk_194, 0.2f, 200.0f);
+    if (this->fishState == 6) {
+        Math_ApproachF(&this->fishLimbRotPhaseMag, this->unk_194, 0.2f, 200.0f);
     } else {
         phi_f0 = 1.0f;
         phi_f2 = 1.0f;
@@ -3019,62 +3049,62 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
             phi_f0 = (KREG(64) * 0.1f) + 1.5f;
             phi_f2 = 3.0f;
         }
-        Math_ApproachF(&this->unk_19C, this->unk_194 * phi_f0, 1.0f, 500.0f * phi_f2);
+        Math_ApproachF(&this->fishLimbRotPhaseMag, this->unk_194 * phi_f0, 1.0f, 500.0f * phi_f2);
     }
 
-    Math_ApproachS(&this->unk_170, 0, 5, 0x1F4);
+    Math_ApproachS(&this->fishLimbDRotZDelta, 0, 5, 0x1F4);
 
-    if (this->unk_150 == 0) {
-        Actor_SetScale(&this->actor, this->unk_1AC * 15.0f * 0.00001f);
+    if (this->isLoach == 0) {
+        Actor_SetScale(&this->actor, this->fishLength * 15.0f * 0.00001f);
 
-        this->unk_18C += this->unk_198;
+        this->fishLimbRotPhase += this->fishLimbRotPhaseStep;
 
-        temp = cosf(this->unk_18C);
-        this->unk_16C = this->unk_16E + (s16)(temp * this->unk_19C);
+        temp = cosf(this->fishLimbRotPhase);
+        this->fishLimb23RotYDelta = this->unk_16E + (s16)(temp * this->fishLimbRotPhaseMag);
 
-        temp = cosf(this->unk_18C + -1.2f);
-        this->unk_176 = this->unk_16E + (s16)(temp * this->unk_19C * 1.6f);
+        temp = cosf(this->fishLimbRotPhase + -1.2f);
+        this->fishLimb4RotYDelta = this->unk_16E + (s16)(temp * this->fishLimbRotPhaseMag * 1.6f);
     } else {
-        Actor_SetScale(&this->actor, this->unk_1AC * 65.0f * 0.000001f);
+        Actor_SetScale(&this->actor, this->fishLength * 65.0f * 0.000001f);
 
         this->actor.scale.x = this->actor.scale.z * 1.1f;
         this->actor.scale.y = this->actor.scale.z * 1.1f;
 
-        this->unk_18C += this->unk_198 * 0.8f;
+        this->fishLimbRotPhase += this->fishLimbRotPhaseStep * 0.8f;
 
         for (i = 0; i < 3; i++) {
-            temp = cosf(this->unk_18C + (i * 2.1f));
-            this->unk_1CC[i] = this->unk_16E + (s16)(temp * this->unk_19C * 2.0f);
+            temp = cosf(this->fishLimbRotPhase + (i * 2.1f));
+            this->loachRotYDelta[i] = this->unk_16E + (s16)(temp * this->fishLimbRotPhaseMag * 2.0f);
         }
 
-        temp = cosf(this->unk_18C + 0.4f);
-        this->unk_16C = (this->unk_19C * temp * 2.0f) * 0.6f;
+        temp = cosf(this->fishLimbRotPhase + 0.4f);
+        this->fishLimb23RotYDelta = (this->fishLimbRotPhaseMag * temp * 2.0f) * 0.6f;
     }
 
-    sp130 = this->unk_1B4.x - this->actor.world.pos.x;
-    sp12C = this->unk_1B4.y - this->actor.world.pos.y;
-    sp128 = this->unk_1B4.z - this->actor.world.pos.z;
+    distX = this->fishTargetPos.x - this->actor.world.pos.x;
+    distY = this->fishTargetPos.y - this->actor.world.pos.y;
+    distZ = this->fishTargetPos.z - this->actor.world.pos.z;
 
-    spFC = Math_Atan2S(sp128, sp130);
-    sp124 = sqrtf(SQ(sp130) + SQ(sp128));
+    rotYTarget = Math_Atan2S(distZ, distX);
+    distToTarget = sqrtf(SQ(distX) + SQ(distZ));
 
-    spFE = Math_Atan2S(sp124, sp12C);
-    sp124 = sqrtf(SQ(sp130) + SQ(sp128) + SQ(sp12C));
+    rotXTarget = Math_Atan2S(distToTarget, distY);
+    distToTarget = sqrtf(SQ(distX) + SQ(distZ) + SQ(distY));
 
-    if ((this->unk_1A0 != 0) && (this->unk_158 != 2) && (this->unk_158 != 3) && (this->unk_158 != 4)) {
-        if ((this->unk_15C & 0x40) != 0) {
-            spFC += 0x4000;
+    if ((this->bumpTimer != 0) && (this->fishState != 2) && (this->fishState != 3) && (this->fishState != 4)) {
+        if ((this->stateAndTimer & 0x40) != 0) {
+            rotYTarget += 0x4000;
         } else {
-            spFC -= 0x4000;
+            rotYTarget -= 0x4000;
         }
-        if (((this->unk_15C + 0x20) & 0x40) != 0) {
-            spFE += 0x2000;
+        if (((this->stateAndTimer + 0x20) & 0x40) != 0) {
+            rotXTarget += 0x2000;
         } else {
-            spFE -= 0x2000;
+            rotXTarget -= 0x2000;
         }
     }
 
-    switch (this->unk_158) {
+    switch (this->fishState) {
         case 100:
             Fishing_HandleAquariumDialog(this, play);
 
@@ -3085,107 +3115,107 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
                                       (s16)this->actor.world.pos.y + 20.0f, (s16)this->actor.world.pos.z - 50.0f, 255,
                                       255, 255, 255);
 
-            this->unk_1AC = D_80B7E078;
-            sp100.y = (f32)Math_SinS(play->gameplayFrames * 300) * 1;
-            sp100.z = (f32)Math_SinS(play->gameplayFrames * 230) * 2;
+            this->fishLength = sFishingRecordLength;
+            targetPosOffset.y = (f32)Math_SinS(play->gameplayFrames * 300) * 1;
+            targetPosOffset.z = (f32)Math_SinS(play->gameplayFrames * 230) * 2;
             this->actor.world.pos.x = 130.0f;
-            this->actor.world.pos.y = 55.0f + sp100.y;
-            this->actor.world.pos.z = 1300.0f + sp100.z;
+            this->actor.world.pos.y = 55.0f + targetPosOffset.y;
+            this->actor.world.pos.z = 1300.0f + targetPosOffset.z;
             this->actor.shape.rot.y = -0x8000;
 
             if ((this->actor.projectedPos.z < 200.0f) && (this->actor.projectedPos.z > 0.0f)) {
-                spC4.x = Rand_CenteredFloat(5.0f) + 130.0f;
-                spC4.y = 40.0f;
-                spC4.z = Rand_CenteredFloat(5.0f) + 1280.0f;
-                Fishing_SpawnBubble(NULL, play->specialEffects, &spC4, Rand_ZeroFloat(0.02f) + 0.03f, 1);
+                bubblePos.x = Rand_CenteredFloat(5.0f) + 130.0f;
+                bubblePos.y = 40.0f;
+                bubblePos.z = Rand_CenteredFloat(5.0f) + 1280.0f;
+                Fishing_SpawnBubble(NULL, play->specialEffects, &bubblePos, Rand_ZeroFloat(0.02f) + 0.03f, 1);
             }
 
-            Math_ApproachS(&this->unk_172, (Math_SinS(this->unk_15C * 0x800) * 2500.0f) + 2500.0f, 2, 0x7D0);
-            Math_ApproachS(&this->unk_174, Math_SinS(this->unk_15C * 0xA00) * 1500.0f, 2, 0x7D0);
+            Math_ApproachS(&this->fishLimbEFRotYDelta, (Math_SinS(this->stateAndTimer * 0x800) * 2500.0f) + 2500.0f, 2, 0x7D0);
+            Math_ApproachS(&this->fishLimb89RotYDelta, Math_SinS(this->stateAndTimer * 0xA00) * 1500.0f, 2, 0x7D0);
 
             this->unk_190 = 0.3f;
             this->unk_194 = 1000.0f / 3.0f;
             return;
 
         case 10:
-            this->unk_1B4 = this->actor.home.pos;
+            this->fishTargetPos = this->actor.home.pos;
 
             Math_ApproachF(&this->actor.speedXZ, 2.0f, 1.0f, 0.5f);
-            Math_ApproachF(&this->unk_1B0, 4096.0f, 1.0f, 256.0f);
+            Math_ApproachF(&this->rotationStep, 4096.0f, 1.0f, 256.0f);
 
-            if (sp124 < 40.0f) {
-                this->unk_158 = 11;
+            if (distToTarget < 40.0f) {
+                this->fishState = 11;
                 this->unk_190 = 0.4f;
                 this->unk_194 = 500.0f;
             }
 
             func_80B70ED4(this, input);
 
-            if (this->actor.xzDistToPlayer < (250.0f * sp118)) {
-                this->unk_15A = this->unk_158 = 0;
+            if (this->actor.xzDistToPlayer < (250.0f * playerSpeedMod)) {
+                this->fishStateNext = this->fishState = 0;
                 this->unk_1A4 = 1000;
                 this->unk_1A2 = 200;
-                this->unk_17A[1] = 50;
+                this->timerArray[1] = 50;
             }
             break;
 
         case 11:
-            this->unk_1B4 = this->actor.home.pos;
+            this->fishTargetPos = this->actor.home.pos;
 
             Math_ApproachF(&this->actor.speedXZ, 0.0f, 1.0f, 0.05f);
-            Math_ApproachF(&this->unk_1B0, 0.0f, 1.0f, 256.0f);
+            Math_ApproachF(&this->rotationStep, 0.0f, 1.0f, 256.0f);
 
-            if (sp124 >= 40.0f) {
-                this->unk_158 = 10;
+            if (distToTarget >= 40.0f) {
+                this->fishState = 10;
                 this->unk_190 = 1.0f;
                 this->unk_194 = 2000.0f;
             }
             func_80B70ED4(this, input);
 
-            if (this->actor.xzDistToPlayer < (250.0f * sp118)) {
-                this->unk_15A = this->unk_158 = 0;
+            if (this->actor.xzDistToPlayer < (250.0f * playerSpeedMod)) {
+                this->fishStateNext = this->fishState = 0;
                 this->unk_1A4 = 1000;
                 this->unk_1A2 = 200;
-                this->unk_17A[1] = 50;
+                this->timerArray[1] = 50;
             }
 
             if (Message_GetState(&play->msgCtx) == TEXT_STATE_NONE) {
                 if ((gSaveContext.dayTime >= 0xC000) && (gSaveContext.dayTime <= 0xC01B)) {
-                    this->unk_158 = 7;
-                    this->unk_17A[3] = (s16)Rand_ZeroFloat(150.0f) + 200;
+                    this->fishState = 7;
+                    this->timerArray[3] = (s16)Rand_ZeroFloat(150.0f) + 200;
                 }
                 if ((gSaveContext.dayTime >= 0x3AAA) && (gSaveContext.dayTime <= 0x3AC5)) {
-                    this->unk_158 = 7;
-                    this->unk_17A[3] = (s16)Rand_ZeroFloat(150.0f) + 200;
+                    this->fishState = 7;
+                    this->timerArray[3] = (s16)Rand_ZeroFloat(150.0f) + 200;
                 }
             }
 
             if (KREG(15) != 0) {
                 KREG(15) = 0;
-                this->unk_158 = 7;
-                this->unk_17A[3] = (s16)Rand_ZeroFloat(150.0f) + 2000;
+                this->fishState = 7;
+                this->timerArray[3] = (s16)Rand_ZeroFloat(150.0f) + 2000;
             }
             break;
 
         case 0:
             Math_ApproachF(&this->actor.speedXZ, 1.0f, 1.0f, 0.05f);
-            Math_ApproachF(&this->unk_1B0, 0.0f, 1.0f, 256.0f);
+            Math_ApproachF(&this->rotationStep, 0.0f, 1.0f, 256.0f);
 
-            if (this->unk_17A[0] == 0) {
+            if (this->timerArray[0] == 0) {
                 if (this->unk_1A4 == 0) {
-                    this->unk_158 = this->unk_15A = 10;
+                    this->fishState = this->fishStateNext = 10;
                 } else {
-                    this->unk_158 = 1;
-                    this->unk_17A[0] = (s16)Rand_ZeroFloat(30.0f) + 10;
-                    this->unk_1B4.x = Rand_CenteredFloat(300.0f);
-                    this->unk_1B4.y = (WATER_SURFACE_Y(play) - 50.0f) - Rand_ZeroFloat(50.0f);
-                    this->unk_1B4.z = Rand_CenteredFloat(300.0f);
+                    this->fishState = 1;
+                    this->timerArray[0] = (s16)Rand_ZeroFloat(30.0f) + 10;
+                    this->fishTargetPos.x = Rand_CenteredFloat(300.0f);
+                    this->fishTargetPos.y = (WATER_SURFACE_Y(play) - 50.0f) - Rand_ZeroFloat(50.0f);
+                    this->fishTargetPos.z = Rand_CenteredFloat(300.0f);
                     this->unk_190 = 1.0f;
                     this->unk_194 = 2000.0f;
                 }
             }
 
-            if (D_80B7E0B6 == 2) {
+            if (sLureEquipped == FS_LURE_SINKING) {
                 func_80B70ED4(this, input);
             } else {
                 this->actor.flags &= ~ACTOR_FLAG_TARGETABLE;
@@ -3193,36 +3223,36 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
             break;
 
         case 1:
-            if (this->unk_150 == 1) {
-                this->unk_158 = -1;
+            if (this->isLoach == 1) {
+                this->fishState = -1;
                 this->unk_1A4 = 20000;
                 this->unk_1A2 = 20000;
-                this->unk_1B4.x = 0.0f;
-                this->unk_1B4.y = -140.0f;
-                this->unk_1B4.z = 0.0f;
+                this->fishTargetPos.x = 0.0f;
+                this->fishTargetPos.y = -140.0f;
+                this->fishTargetPos.z = 0.0f;
             } else {
-                Math_ApproachF(&this->unk_1B0, 4096.0f, 1.0f, 256.0f);
+                Math_ApproachF(&this->rotationStep, 4096.0f, 1.0f, 256.0f);
 
-                if ((this->actor.xzDistToPlayer < (250.0f * sp118)) || (this->unk_17A[1] != 0)) {
-                    Math_ApproachF(&this->unk_1B0, 8192.0f, 1.0f, 768.0f);
+                if ((this->actor.xzDistToPlayer < (250.0f * playerSpeedMod)) || (this->timerArray[1] != 0)) {
+                    Math_ApproachF(&this->rotationStep, 8192.0f, 1.0f, 768.0f);
                     Math_ApproachF(&this->actor.speedXZ, 4.2f, 1.0f, 0.75);
                     this->unk_190 = 1.2f;
                     this->unk_194 = 4000.0f;
-                    this->unk_17A[0] = 20;
+                    this->timerArray[0] = 20;
                 } else {
                     this->unk_190 = 1.0f;
                     this->unk_194 = 2000.0f;
                     Math_ApproachF(&this->actor.speedXZ, 1.5f, 1.0f, 0.1f);
                 }
 
-                if ((this->unk_17A[0] == 0) || (sp124 < 50.0f)) {
-                    this->unk_158 = 0;
-                    this->unk_17A[0] = (s16)Rand_ZeroFloat(30.0f) + 3;
+                if ((this->timerArray[0] == 0) || (distToTarget < 50.0f)) {
+                    this->fishState = 0;
+                    this->timerArray[0] = (s16)Rand_ZeroFloat(30.0f) + 3;
                     this->unk_190 = 1.0f;
                     this->unk_194 = 500.0f;
                 }
 
-                if (D_80B7E0B6 == 2) {
+                if (sLureEquipped == FS_LURE_SINKING) {
                     func_80B70ED4(this, input);
                 } else {
                     this->actor.flags &= ~ACTOR_FLAG_TARGETABLE;
@@ -3230,57 +3260,57 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
             }
             break;
 
-        case -1:
-            Math_ApproachS(&this->unk_166, 0, 0x14, 0x20);
+        case -1: // loach state 1
+            Math_ApproachS(&this->rotationTarget.x, 0, 0x14, 0x20);
 
-            if ((this->actor.xzDistToPlayer < (250.0f * sp118)) || (this->unk_17A[1] != 0)) {
+            if ((this->actor.xzDistToPlayer < (250.0f * playerSpeedMod)) || (this->timerArray[1] != 0)) {
                 Math_ApproachF(&this->actor.speedXZ, 3.0f, 1.0f, 0.75);
                 this->unk_190 = 1.0f;
-                this->unk_17A[0] = 20;
+                this->timerArray[0] = 20;
                 this->unk_194 = 4000.0f;
-                Math_ApproachF(&this->unk_1B0, 4096.0f, 1.0f, 256.0f);
+                Math_ApproachF(&this->rotationStep, 4096.0f, 1.0f, 256.0f);
 
                 if ((play->gameplayFrames % 32) == 0) {
-                    this->unk_1B4.x = Rand_CenteredFloat(600.0f);
-                    this->unk_1B4.z = Rand_CenteredFloat(600.0f);
-                    this->unk_1B4.y = -120.0f;
+                    this->fishTargetPos.x = Rand_CenteredFloat(600.0f);
+                    this->fishTargetPos.z = Rand_CenteredFloat(600.0f);
+                    this->fishTargetPos.y = -120.0f;
                 }
-            } else if (sp124 > 50.0f) {
+            } else if (distToTarget > 50.0f) {
                 this->unk_190 = 0.8f;
                 this->unk_194 = 1500.0f;
                 Math_ApproachF(&this->actor.speedXZ, 1.0f, 1.0f, 0.1f);
-                Math_ApproachF(&this->unk_1B0, 2048.0f, 1.0f, 128.0f);
+                Math_ApproachF(&this->rotationStep, 2048.0f, 1.0f, 128.0f);
             } else {
                 this->unk_190 = 0.4f;
                 this->unk_194 = 500.0f;
                 Math_ApproachZeroF(&this->actor.speedXZ, 1.0f, 0.02f);
-                Math_ApproachF(&this->unk_1B0, 0.0f, 1.0f, 256.0f);
+                Math_ApproachF(&this->rotationStep, 0.0f, 1.0f, 256.0f);
             }
 
             if (this->unk_1A4 == 0) {
-                this->unk_158 = 10;
-                this->unk_15A = 10;
+                this->fishState = 10;
+                this->fishStateNext = 10;
             } else if ((KREG(2) != 0) || (((this->unk_1A4 & 0x7FF) == 0) && (this->unk_1A4 < 15000))) {
                 KREG(2) = 0;
-                this->unk_158 = -2;
+                this->fishState = -2;
                 this->actor.world.rot.x = this->actor.shape.rot.x = 0;
-                this->unk_1B4.y = WATER_SURFACE_Y(play) + 10.0f;
-                this->unk_1B4.x = Rand_ZeroFloat(50.0f);
-                this->unk_1B4.z = Rand_ZeroFloat(50.0f);
+                this->fishTargetPos.y = WATER_SURFACE_Y(play) + 10.0f;
+                this->fishTargetPos.x = Rand_ZeroFloat(50.0f);
+                this->fishTargetPos.z = Rand_ZeroFloat(50.0f);
             }
 
             this->actor.flags &= ~ACTOR_FLAG_TARGETABLE;
             break;
 
         case -2:
-            if ((this->actor.xzDistToPlayer < (250.0f * sp118)) || (this->unk_17A[1] != 0)) {
-                this->unk_158 = -1;
-                this->unk_1B4.y = -120.0f;
+            if ((this->actor.xzDistToPlayer < (250.0f * playerSpeedMod)) || (this->timerArray[1] != 0)) {
+                this->fishState = -1;
+                this->fishTargetPos.y = -120.0f;
             } else {
                 this->unk_190 = 0.6f;
                 this->unk_194 = 1000.0f;
 
-                Math_ApproachS(&this->unk_166, -0x1000, 0x14, 0x100);
+                Math_ApproachS(&this->rotationTarget.x, -0x1000, 0x14, 0x100);
 
                 if (this->actor.world.pos.y < (WATER_SURFACE_Y(play) - 20.0f)) {
                     Math_ApproachF(&this->actor.speedXZ, 0.5f, 1.0f, 0.1f);
@@ -3289,11 +3319,11 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
 
                     if ((this->actor.speedXZ == 0.0f) ||
                         (this->actor.world.pos.y > (WATER_SURFACE_Y(play) - 5.0f))) {
-                        this->unk_1B4.x = Rand_ZeroFloat(300.0f);
-                        this->unk_1B4.z = Rand_ZeroFloat(300.0f);
-                        this->unk_1B4.y = this->actor.floorHeight + 10.0f;
-                        this->unk_158 = -25;
-                        this->unk_1B0 = 0.0f;
+                        this->fishTargetPos.x = Rand_ZeroFloat(300.0f);
+                        this->fishTargetPos.z = Rand_ZeroFloat(300.0f);
+                        this->fishTargetPos.y = this->actor.floorHeight + 10.0f;
+                        this->fishState = -25;
+                        this->rotationStep = 0.0f;
 
                         spB8 = this->fishMouthPos;
                         spB8.y = WATER_SURFACE_Y(play);
@@ -3307,99 +3337,99 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
                     }
                 }
 
-                Math_ApproachF(&this->unk_1B0, 2048.0f, 1.0f, 128.0f);
+                Math_ApproachF(&this->rotationStep, 2048.0f, 1.0f, 128.0f);
                 this->actor.flags &= ~ACTOR_FLAG_TARGETABLE;
             }
             break;
 
         case -25:
-            if ((this->actor.xzDistToPlayer < (250.0f * sp118)) || (this->unk_17A[1] != 0)) {
-                this->unk_158 = -1;
-                this->unk_1B4.y = -120.0f;
+            if ((this->actor.xzDistToPlayer < (250.0f * playerSpeedMod)) || (this->timerArray[1] != 0)) {
+                this->fishState = -1;
+                this->fishTargetPos.y = -120.0f;
             } else {
-                Math_ApproachS(&this->unk_166, 0x1000, 0x14, 0x6A);
+                Math_ApproachS(&this->rotationTarget.x, 0x1000, 0x14, 0x6A);
 
-                if (sp124 > 40.0f) {
+                if (distToTarget > 40.0f) {
                     this->unk_190 = 0.7f;
                     this->unk_194 = 1200.0f;
                     Math_ApproachF(&this->actor.speedXZ, 0.5f, 1.0f, 0.01f);
-                    Math_ApproachF(&this->unk_1B0, 2048.0f, 1.0f, 128.0f);
+                    Math_ApproachF(&this->rotationStep, 2048.0f, 1.0f, 128.0f);
                 } else {
-                    this->unk_158 = -1;
+                    this->fishState = -1;
                 }
             }
             break;
 
         case 2:
             if (((this->actor.params + D_80B7E118) & 1) != 0) {
-                sp10C.x = 10.0f;
+                multiVecSrc.x = 10.0f;
             } else {
-                sp10C.x = -10.0f;
+                multiVecSrc.x = -10.0f;
             }
-            sp10C.y = 0.0f;
-            sp10C.z = 0.0f;
+            multiVecSrc.y = 0.0f;
+            multiVecSrc.z = 0.0f;
             Matrix_RotateY(sLureRot.y, MTXMODE_NEW);
-            Matrix_MultVec3f(&sp10C, &sp100);
+            Matrix_MultVec3f(&multiVecSrc, &targetPosOffset);
 
-            this->unk_1B4.x = sLurePos.x + sp100.x;
-            this->unk_1B4.z = sLurePos.z + sp100.z;
+            this->fishTargetPos.x = sLurePos.x + targetPosOffset.x;
+            this->fishTargetPos.z = sLurePos.z + targetPosOffset.z;
 
-            if (D_80B7E0B6 == 2) {
-                this->unk_1B4.y = sLurePos.y;
-            } else if (this->unk_150 == 0) {
-                this->unk_1B4.y = sLurePos.y - 15.0f;
+            if (sLureEquipped == FS_LURE_SINKING) {
+                this->fishTargetPos.y = sLurePos.y;
+            } else if (this->isLoach == 0) {
+                this->fishTargetPos.y = sLurePos.y - 15.0f;
             } else {
-                this->unk_1B4.y = sLurePos.y - 5.0f;
+                this->fishTargetPos.y = sLurePos.y - 5.0f;
             }
 
-            if (this->unk_1B4.y <= this->actor.floorHeight) {
-                this->unk_1B4.y = this->actor.floorHeight + 3.0f;
+            if (this->fishTargetPos.y <= this->actor.floorHeight) {
+                this->fishTargetPos.y = this->actor.floorHeight + 3.0f;
             }
 
-            if ((D_80B7E0B6 != 2) && (this->unk_1B4.y < this->actor.world.pos.y)) {
-                Math_ApproachF(&this->actor.world.pos.y, this->unk_1B4.y, 0.1f,
-                               (this->actor.world.pos.y - this->unk_1B4.y) * 0.1f);
+            if ((sLureEquipped != FS_LURE_SINKING) && (this->fishTargetPos.y < this->actor.world.pos.y)) {
+                Math_ApproachF(&this->actor.world.pos.y, this->fishTargetPos.y, 0.1f,
+                               (this->actor.world.pos.y - this->fishTargetPos.y) * 0.1f);
             }
 
-            Math_ApproachF(&this->unk_1B0, 8192.0f, 1.0f, (KREG(16) * 128) + 384.0f);
+            Math_ApproachF(&this->rotationStep, 8192.0f, 1.0f, (KREG(16) * 128) + 384.0f);
             if (CHECK_BTN_ALL(input->press.button, BTN_A)) {
-                this->unk_1A8 += 0.005f;
+                this->perception += 0.005f;
             }
 
-            if (D_80B7E120 != 0) {
-                if (D_80B7E120 == 1) {
-                    this->unk_1A8 += 0.01f;
+            if (sWiggleAttraction != 0) {
+                if (sWiggleAttraction == 1) {
+                    this->perception += 0.01f;
                 } else {
-                    this->unk_1A8 += 0.05f;
+                    this->perception += 0.05f;
                 }
-                D_80B7E120 = 0;
+                sWiggleAttraction = 0;
             }
 
             if (CHECK_BTN_ALL(input->press.button, BTN_B)) {
-                this->unk_1A8 += 0.008f;
+                this->perception += 0.008f;
             }
 
-            if (sp124 < ((this->unk_1AC * 0.5f) + 20.0f)) {
+            if (distToTarget < ((this->fishLength * 0.5f) + 20.0f)) {
                 if (this->unk_15E == 0) {
                     this->unk_190 = 1.0f;
                     this->unk_194 = 500.0f;
-                    this->unk_17A[0] = (s16)Rand_ZeroFloat(10.0f) + 2;
+                    this->timerArray[0] = (s16)Rand_ZeroFloat(10.0f) + 2;
                 }
                 Math_ApproachF(&this->actor.speedXZ, -0.2f, 1.0f, 0.1f);
                 this->unk_15E = 1;
             } else {
                 if (this->unk_15E != 0) {
                     this->unk_190 = 1.0f;
-                    this->unk_1B0 = 0.0f;
+                    this->rotationStep = 0.0f;
                     this->unk_194 = 3000.0f;
                 }
                 Math_ApproachF(&this->actor.speedXZ, 3.0f, 1.0f, 0.15f);
                 this->unk_15E = 0;
             }
 
-            if (this->unk_1AC >= 60.0f) {
+            if (this->fishLength >= 60.0f) {
                 multiplier = 0.3f;
-            } else if (this->unk_1AC >= 45.0f) {
+            } else if (this->fishLength >= 45.0f) {
                 multiplier = 0.6f;
             } else {
                 multiplier = 1.0f;
@@ -3409,202 +3439,203 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
                 multiplier *= 1.75f;
             } else if ((gSaveContext.dayTime >= 0x3555) && (gSaveContext.dayTime <= 0x4AAA)) {
                 multiplier *= 1.5f;
-            } else if (D_80B7E076 != 0) {
+            } else if (sFishingFoggy != 0) {
                 multiplier *= 1.5f;
-            } else if ((u8)D_80B7A650 != 0) {
+            } else if ((u8)sStormStrength != 0) {
                 multiplier *= 3.0f;
             }
 
-            sp11C = 0.03f * multiplier;
-            if (D_80B7E0B6 == 2) {
-                sp11C *= 5.0f;
+            chance = 0.03f * multiplier;
+            if (sLureEquipped == FS_LURE_SINKING) {
+                chance *= 5.0f;
             }
             if (getGuaranteeBite() == 1 ||
-                ((this->unk_17A[0] == 1) || (Rand_ZeroOne() < sp11C)) &&
-                ((Rand_ZeroOne() < (this->unk_1A8 * multiplier)) || ((this->unk_150 + 1) == KREG(69)))) {
-                if (this->unk_150 == 0) {
-                    this->unk_158 = 3;
+                ((this->timerArray[0] == 1) || (Rand_ZeroOne() < chance)) &&
+                ((Rand_ZeroOne() < (this->perception * multiplier)) || ((this->isLoach + 1) == KREG(69)))) {
+                if (this->isLoach == 0) {
+                    this->fishState = 3;
                     this->unk_190 = 1.2f;
                     this->unk_194 = 5000.0f;
-                    this->unk_17A[0] = Rand_ZeroFloat(10.0f);
+                    this->timerArray[0] = Rand_ZeroFloat(10.0f);
                 } else {
-                    this->unk_158 = -3;
+                    this->fishState = -3;
                     this->unk_190 = 1.0f;
                     this->unk_194 = 3000.0f;
-                    this->unk_17A[0] = 40;
+                    this->timerArray[0] = 40;
                 }
-                if (D_80B7E0B6 == 2) {
-                    this->unk_188 = Rand_ZeroFloat(1.5f) + 3.0f;
+                if (sLureEquipped == FS_LURE_SINKING) {
+                    this->speedTarget = Rand_ZeroFloat(1.5f) + 3.0f;
                 } else {
-                    this->unk_188 = Rand_ZeroFloat(1.5f) + 4.5f;
+                    this->speedTarget = Rand_ZeroFloat(1.5f) + 4.5f;
                 }
             }
 
-            if ((D_80B7A694 != 3) || (this->unk_17A[2] == 0) ||
+            if ((sRodCastState != 3) || (this->timerArray[2] == 0) ||
                 (sqrtf(SQ(this->actor.world.pos.x) + SQ(this->actor.world.pos.z)) > 800.0f)) {
-                this->unk_158 = this->unk_15A;
-                this->unk_17A[1] = (s16)Rand_ZeroFloat(30.0f) + 50;
-                this->unk_17A[0] = (s16)Rand_ZeroFloat(10.0f) + 5;
+                this->fishState = this->fishStateNext;
+                this->timerArray[1] = (s16)Rand_ZeroFloat(30.0f) + 50;
+                this->timerArray[0] = (s16)Rand_ZeroFloat(10.0f) + 5;
                 this->unk_190 = 1.0f;
-                this->unk_1B0 = 0.0f;
+                this->rotationStep = 0.0f;
                 this->unk_194 = 2000.0f;
             }
 
-            if (this->actor.xzDistToPlayer < (100.0f * sp118)) {
-                this->unk_15A = this->unk_158 = 0;
+            if (this->actor.xzDistToPlayer < (100.0f * playerSpeedMod)) {
+                this->fishStateNext = this->fishState = 0;
                 this->unk_1A4 = 1000;
                 this->unk_1A2 = 200;
-                this->unk_17A[1] = 50;
+                this->timerArray[1] = 50;
             }
             break;
 
         case 3:
-            this->unk_151 = 6;
-            sp134 = 2;
+            this->lilyTimer = 6;
+            rotXYScale = 2;
 
             if ((((s16)player->actor.world.pos.x + D_80B7E118) & 1) != 0) {
-                sp10C.x = 30.0f;
+                multiVecSrc.x = 30.0f;
             } else {
-                sp10C.x = -30.0f;
+                multiVecSrc.x = -30.0f;
             }
-            sp10C.y = 0.0f;
-            sp10C.z = 30.0f;
+            multiVecSrc.y = 0.0f;
+            multiVecSrc.z = 30.0f;
 
             Matrix_RotateY(sLureRot.y, MTXMODE_NEW);
-            Matrix_MultVec3f(&sp10C, &sp100);
+            Matrix_MultVec3f(&multiVecSrc, &targetPosOffset);
 
-            this->unk_1B4.x = sLurePos.x + sp100.x;
-            this->unk_1B4.z = sLurePos.z + sp100.z;
-            this->unk_1B4.y = sLurePos.y - 10.0f;
-            this->unk_1B0 = 4096.0f;
-            Math_ApproachF(&this->actor.speedXZ, this->unk_188 * 0.8f, 1.0f, 1.0f);
+            this->fishTargetPos.x = sLurePos.x + targetPosOffset.x;
+            this->fishTargetPos.z = sLurePos.z + targetPosOffset.z;
+            this->fishTargetPos.y = sLurePos.y - 10.0f;
+            this->rotationStep = 4096.0f;
+            Math_ApproachF(&this->actor.speedXZ, this->speedTarget * 0.8f, 1.0f, 1.0f);
 
-            if ((D_80B7A694 != 3) || (sLurePos.y > (WATER_SURFACE_Y(play) + 5.0f)) ||
+            if ((sRodCastState != 3) || (sLurePos.y > (WATER_SURFACE_Y(play) + 5.0f)) ||
                 (sqrtf(SQ(sLurePos.x) + SQ(sLurePos.z)) > 800.0f)) {
-                this->unk_158 = this->unk_15A;
-                this->unk_17A[0] = 0;
+                this->fishState = this->fishStateNext;
+                this->timerArray[0] = 0;
                 this->unk_190 = 1.0f;
                 this->unk_194 = 2000.0f;
-            } else if ((this->unk_17A[0] == 0) || (sp124 < 30.0f)) {
-                this->unk_158 = 4;
-                this->unk_1B4 = sLurePos;
-                this->unk_1B0 = 16384.0f;
+            } else if ((this->timerArray[0] == 0) || (distToTarget < 30.0f)) {
+                this->fishState = 4;
+                this->fishTargetPos = sLurePos;
+                this->rotationStep = 16384.0f;
                 this->unk_190 = 1.2f;
                 this->unk_194 = 5000.0f;
-                this->unk_17A[0] = 20;
+                this->timerArray[0] = 20;
             }
             break;
 
         case 4:
-            Math_ApproachF(&this->unk_1B0, 16384.0f, 1.0f, 4096.0f);
-            Math_ApproachS(&this->unk_170, 0x4E20, 4, 0x1388);
+            Math_ApproachF(&this->rotationStep, 16384.0f, 1.0f, 4096.0f);
+            Math_ApproachS(&this->fishLimbDRotZDelta, 0x4E20, 4, 0x1388);
 
-            this->unk_151 = 50;
-            sp134 = 2;
-            this->unk_1B4 = sLurePos;
-            Math_ApproachF(&this->actor.speedXZ, this->unk_188, 1.0f, 1.0f);
+            this->lilyTimer = 50;
+            rotXYScale = 2;
+            this->fishTargetPos = sLurePos;
+            Math_ApproachF(&this->actor.speedXZ, this->speedTarget, 1.0f, 1.0f);
 
-            if ((D_80B7A694 != 3) || (this->unk_17A[0] == 0) || (sLurePos.y > (WATER_SURFACE_Y(play) + 5.0f)) ||
+            if ((sRodCastState != 3) || (this->timerArray[0] == 0) || (sLurePos.y > (WATER_SURFACE_Y(play) + 5.0f)) ||
                 (sqrtf(SQ(sLurePos.x) + SQ(sLurePos.z)) > 800.0f)) {
 
-                this->unk_17A[0] = 0;
-                this->unk_158 = this->unk_15A;
+                this->timerArray[0] = 0;
+                this->fishState = this->fishStateNext;
                 this->unk_190 = 1.0f;
                 this->unk_194 = 2000.0f;
-            } else if (sp124 < 10.0f) {
-                if (func_80B70A2C(this, play, false)) {
-                    func_80B71278(this, 0);
+            } else if (distToTarget < 10.0f) {
+                if (Fishing_SplashBySize(this, play, false)) {
+                    Fishing_FishLeapSfx(this, false);
                 }
 
-                this->unk_158 = 5;
+                this->fishState = 5;
                 this->unk_190 = 1.2f;
                 this->unk_194 = 5000.0f;
-                this->unk_17A[1] = 150;
-                this->unk_17A[0] = 0;
-                this->unk_17A[2] = 0;
-                this->unk_17A[3] = 120;
+                this->timerArray[1] = 150;
+                this->timerArray[0] = 0;
+                this->timerArray[2] = 0;
+                this->timerArray[3] = 120;
 
-                D_80B7A694 = 4;
+                sRodCastState = 4;
                 sFishingHookedFish = this;
                 sFishMouthOffset.y = 500.0f - Rand_ZeroFloat(400.0f);
 
-                if (D_80B7E0B6 == 2) {
-                    if (this->unk_1AC > 70.0f) {
-                        phi_v0 = (s16)Rand_ZeroFloat(20.0f) + 10;
-                    } else if (this->unk_1AC > 60.0f) {
-                        phi_v0 = (s16)Rand_ZeroFloat(30.0f) + 20;
-                    } else if (this->unk_1AC > 50.0f) {
-                        phi_v0 = (s16)Rand_ZeroFloat(30.0f) + 30;
+                // get rumble time based on size and lure used.
+                if (sLureEquipped == FS_LURE_SINKING) {
+                    if (this->fishLength > 70.0f) {
+                        timer = (s16)Rand_ZeroFloat(20.0f) + 10;
+                    } else if (this->fishLength > 60.0f) {
+                        timer = (s16)Rand_ZeroFloat(30.0f) + 20;
+                    } else if (this->fishLength > 50.0f) {
+                        timer = (s16)Rand_ZeroFloat(30.0f) + 30;
                     } else {
-                        phi_v0 = (s16)Rand_ZeroFloat(40.0f) + 40;
+                        timer = (s16)Rand_ZeroFloat(40.0f) + 40;
                     }
-                    D_80B7E122 = phi_v0;
-                    D_80B7E0A4 = phi_v0;
-                    func_800A9F6C(0.0f, 60, phi_v0 * 3, 10);
+                    sLureBitTimer = timer;
+                    sRumbleDelay = timer;
+                    func_800A9F6C(0.0f, 60, timer * 3, 10);
                 } else {
-                    if (this->unk_1AC > 70.0f) {
-                        phi_v0 = (s16)Rand_ZeroFloat(5.0f) + 10;
-                    } else if (this->unk_1AC > 60.0f) {
-                        phi_v0 = (s16)Rand_ZeroFloat(5.0f) + 15;
-                    } else if (this->unk_1AC > 50.0f) {
-                        phi_v0 = (s16)Rand_ZeroFloat(5.0f) + 17;
+                    if (this->fishLength > 70.0f) {
+                        timer = (s16)Rand_ZeroFloat(5.0f) + 10;
+                    } else if (this->fishLength > 60.0f) {
+                        timer = (s16)Rand_ZeroFloat(5.0f) + 15;
+                    } else if (this->fishLength > 50.0f) {
+                        timer = (s16)Rand_ZeroFloat(5.0f) + 17;
                     } else {
-                        phi_v0 = (s16)Rand_ZeroFloat(5.0f) + 25;
+                        timer = (s16)Rand_ZeroFloat(5.0f) + 25;
                     }
-                    D_80B7E122 = phi_v0;
-                    D_80B7E0A4 = phi_v0;
-                    func_800A9F6C(0.0f, 180, phi_v0 * 3, 10);
+                    sLureBitTimer = timer;
+                    sRumbleDelay = timer;
+                    func_800A9F6C(0.0f, 180, timer * 3, 10);
                 }
 
-                D_80B7E124 = 0;
-                D_80B7E116 = 100;
-                D_80B7E080 = 0;
+                sLineHooked = 0;
+                sRodPullback = 100;
+                sFishFightTime = 0;
             }
             break;
 
         case -3:
-            this->unk_151 = 50;
-            this->unk_1B4 = sLurePos;
+            this->lilyTimer = 50;
+            this->fishTargetPos = sLurePos;
             Math_ApproachF(&this->actor.speedXZ, 2.0f, 1.0f, 1.0f);
 
-            if ((D_80B7A694 != 3) || (this->unk_17A[0] == 0) || (sLurePos.y > (WATER_SURFACE_Y(play) + 5.0f)) ||
+            if ((sRodCastState != 3) || (this->timerArray[0] == 0) || (sLurePos.y > (WATER_SURFACE_Y(play) + 5.0f)) ||
                 (sqrtf(SQ(sLurePos.x) + SQ(sLurePos.z)) > 800.0f)) {
 
-                this->unk_17A[0] = 0;
+                this->timerArray[0] = 0;
                 this->unk_190 = 1.0f;
-                this->unk_158 = this->unk_15A;
+                this->fishState = this->fishStateNext;
                 this->unk_194 = 2000.0f;
-            } else if (sp124 < 10.0f) {
+            } else if (distToTarget < 10.0f) {
                 if (sLurePos.y > (WATER_SURFACE_Y(play) - 10.0f)) {
                     Audio_PlayActorSound2(&this->actor, NA_SE_EV_JUMP_OUT_WATER);
                     func_80078884(NA_SE_PL_CATCH_BOOMERANG);
                 }
 
-                func_80B70A2C(this, play, false);
-                this->unk_158 = 5;
+                Fishing_SplashBySize(this, play, false);
+                this->fishState = 5;
                 this->unk_190 = 1.2f;
                 this->unk_194 = 5000.0f;
-                this->unk_17A[1] = 150;
-                this->unk_17A[0] = 0;
-                this->unk_17A[2] = 0;
-                this->unk_17A[3] = 120;
+                this->timerArray[1] = 150;
+                this->timerArray[0] = 0;
+                this->timerArray[2] = 0;
+                this->timerArray[3] = 120;
 
-                D_80B7A694 = 4;
+                sRodCastState = 4;
                 sFishingHookedFish = this;
 
-                if (D_80B7E0B6 == 2) {
-                    D_80B7E122 = 30;
-                    D_80B7E0A4 = 100;
+                if (sLureEquipped == FS_LURE_SINKING) {
+                    sLureBitTimer = 30;
+                    sRumbleDelay = 100;
                     func_800A9F6C(0.0f, 60, 90, 10);
                 } else {
-                    D_80B7E122 = 30;
-                    D_80B7E0A4 = 40;
+                    sLureBitTimer = 30;
+                    sRumbleDelay = 40;
                     func_800A9F6C(0.0f, 180, 90, 10);
                 }
 
-                D_80B7E124 = 0;
-                D_80B7E116 = 100;
-                D_80B7E080 = 0;
+                sLineHooked = false;
+                sRodPullback = 100;
+                sFishFightTime = 0;
             }
             break;
 
@@ -3612,23 +3643,23 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
             this->actor.uncullZoneForward = 1200.0f;
             this->actor.uncullZoneScale = 200.0f;
 
-            D_80B7E080++;
-            osSyncPrintf("HIT FISH %dcm\n", (u8)this->unk_1AC);
+            sFishFightTime++;
+            osSyncPrintf("HIT FISH %dcm\n", (u8)this->fishLength);
 
-            Math_ApproachS(&this->unk_170, 0x2AF8, 4, 0xBB8);
+            Math_ApproachS(&this->fishLimbDRotZDelta, 0x2AF8, 4, 0xBB8);
             sFishingHookedFish = this;
             Math_ApproachS(&player->actor.shape.rot.y, this->actor.yawTowardsPlayer + 0x8000, 5, 0x500);
 
-            if (D_80B7E124 == 0) {
-                if ((D_80B7FEA0 < 20) && ((D_80B7E0AE & 3) == 0)) {
-                    D_80B7FEA0++;
+            if (sLineHooked == 0) {
+                if ((sSinkingLureSegmentIndex < 20) && ((sLureTimer & 3) == 0)) {
+                    sSinkingLureSegmentIndex++;
                         }
             }
 
-            if ((D_80B7E122 != 0) && (D_80B7E124 == 0)) {
-                if (((input->rel.stick_y < -50) && (D_80B7A6C8 > -40)) || CHECK_BTN_ALL(input->press.button, BTN_A)) {
+            if ((sLureBitTimer != 0) && (sLineHooked == 0)) { // pull the line to hook it
+                if (((input->rel.stick_y < -50) && (sStickAdjYPrev > -40)) || CHECK_BTN_ALL(input->press.button, BTN_A)) {
                     if (input->rel.stick_y < -50) {
-                        temp_f0 = 40.0f - ((this->unk_1AC - 30.0f) * 1.333333f);
+                        temp_f0 = 40.0f - ((this->fishLength - 30.0f) * 1.333333f);
                         if (temp_f0 > 0.0f) {
                             this->unk_152 = temp_f0;
                             this->unk_154 = this->actor.yawTowardsPlayer - this->actor.shape.rot.y;
@@ -3636,106 +3667,106 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
                         }
                     }
 
-                    this->unk_198 = 1.7f;
-                    this->unk_19C = 7000.0f;
-                    D_80B7E124 = 1;
+                    this->fishLimbRotPhaseStep = 1.7f;
+                    this->fishLimbRotPhaseMag = 7000.0f;
+                    sLineHooked = 1;
                     Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_ENEMY | 0x800);
-                    D_80B7E0A6 = 0;
+                    sFishingMusicDelay = 0;
 
-                    if (this->unk_150 == 1) {
-                        spA4 = (this->unk_1AC * 3.0f) + 120.0f;
+                    if (this->isLoach == 1) {
+                        rumbleStrength = (this->fishLength * 3.0f) + 120.0f;
                     } else {
-                        spA4 = (2.0f * this->unk_1AC) + 120.0f;
+                        rumbleStrength = (2.0f * this->fishLength) + 120.0f;
                     }
-                    if (spA4 > 255.0f) {
-                        spA4 = 255.0f;
+                    if (rumbleStrength > 255.0f) {
+                        rumbleStrength = 255.0f;
                     }
 
-                    func_800A9F6C(0.0f, spA4, 120, 5);
-                    D_80B7E0A4 = 40;
-                    D_80B7FDA8 = 10;
+                    func_800A9F6C(0.0f, rumbleStrength, 120, 5);
+                    sRumbleDelay = 40;
+                    sRodHitTimer = 10;
                     func_80078884(NA_SE_IT_FISHING_HIT);
                 }
             }
 
             if (this->actor.world.pos.y < WATER_SURFACE_Y(play)) {
-                if (this->unk_17A[1] > 30) {
+                if (this->timerArray[1] > 30) {
                     phi_v0_2 = 7;
                 } else {
                     phi_v0_2 = 0xF;
                 }
 
-                if (((this->unk_15C & phi_v0_2) == 0) && (Rand_ZeroOne() < 0.75f) && (D_80B7E0A4 == 0)) {
-                    if (this->unk_1AC >= 70.0f) {
-                        spA4 = 255.0f;
-                    } else if (this->unk_1AC >= 60.0f) {
-                        spA4 = 230.0f;
-                    } else if (this->unk_1AC >= 50.0f) {
-                        spA4 = 200.0f;
-                    } else if (this->unk_1AC >= 40.0f) {
-                        spA4 = 170.0f;
+                if (((this->stateAndTimer & phi_v0_2) == 0) && (Rand_ZeroOne() < 0.75f) && (sRumbleDelay == 0)) {
+                    if (this->fishLength >= 70.0f) {
+                        rumbleStrength = 255.0f;
+                    } else if (this->fishLength >= 60.0f) {
+                        rumbleStrength = 230.0f;
+                    } else if (this->fishLength >= 50.0f) {
+                        rumbleStrength = 200.0f;
+                    } else if (this->fishLength >= 40.0f) {
+                        rumbleStrength = 170.0f;
                     } else {
-                        spA4 = 140.0f;
+                        rumbleStrength = 140.0f;
                     }
 
                     if (phi_v0_2 == 0xF) {
-                        spA4 *= 3.0f / 4.0f;
+                        rumbleStrength *= 3.0f / 4.0f;
                     }
 
-                    func_800A9F6C(0.0f, spA4, (s16)Rand_ZeroFloat(5.0f) + 10, 5);
+                    func_800A9F6C(0.0f, rumbleStrength, (s16)Rand_ZeroFloat(5.0f) + 10, 5);
                 }
 
-                if (this->unk_17A[1] > 30) {
-                    if (this->unk_17A[0] == 0) {
-                        sp10C.x = 0.0f;
-                        sp10C.y = 0.0f;
-                        sp10C.z = 200.0f;
+                if (this->timerArray[1] > 30) {
+                    if (this->timerArray[0] == 0) {
+                        multiVecSrc.x = 0.0f;
+                        multiVecSrc.y = 0.0f;
+                        multiVecSrc.z = 200.0f;
 
-                        for (spA2 = 0; spA2 < 100; spA2++) {
+                        for (attempts = 0; attempts < 100; attempts++) {
                             Matrix_RotateY(Rand_CenteredFloat(3.0f * M_PI / 4.0f) +
                                                (((this->actor.yawTowardsPlayer + 0x8000) / 32768.0f) * M_PI),
                                            MTXMODE_NEW);
-                            Matrix_MultVec3f(&sp10C, &sp100);
+                            Matrix_MultVec3f(&multiVecSrc, &targetPosOffset);
 
-                            this->unk_1B4.x = this->actor.world.pos.x + sp100.x;
-                            this->unk_1B4.z = this->actor.world.pos.z + sp100.z;
+                            this->fishTargetPos.x = this->actor.world.pos.x + targetPosOffset.x;
+                            this->fishTargetPos.z = this->actor.world.pos.z + targetPosOffset.z;
 
-                            if ((SQ(this->unk_1B4.x) + SQ(this->unk_1B4.z)) < SQ(750.0f)) {
+                            if ((SQ(this->fishTargetPos.x) + SQ(this->fishTargetPos.z)) < SQ(750.0f)) {
                                 break;
                             }
                         }
 
-                        if ((Rand_ZeroOne() < 0.1f) && (this->unk_17A[3] == 0)) {
-                            if (this->unk_1AC >= 60.0f) {
-                                phi_a1 = 255;
-                            } else if (this->unk_1AC >= 50.0f) {
-                                phi_a1 = 200;
+                        if ((Rand_ZeroOne() < 0.1f) && (this->timerArray[3] == 0)) {
+                            if (this->fishLength >= 60.0f) {
+                                rumbleStrength8 = 255;
+                            } else if (this->fishLength >= 50.0f) {
+                                rumbleStrength8 = 200;
                             } else {
-                                phi_a1 = 180;
+                                rumbleStrength8 = 180;
                             }
-                            func_800A9F6C(0.0f, phi_a1, 90, 2);
-                            this->unk_17A[0] = 20;
-                            this->unk_17A[1] = 100;
-                            this->unk_17A[2] = 20;
-                            this->unk_17A[3] = 100;
-                            this->unk_1B4.y = 300.0f;
-                            D_80B7E0A4 = 0x28;
-                            D_80B7E116 = (s16)Rand_ZeroFloat(30.0f) + 20;
+                            func_800A9F6C(0.0f, rumbleStrength8, 90, 2);
+                            this->timerArray[0] = 20;
+                            this->timerArray[1] = 100;
+                            this->timerArray[2] = 20;
+                            this->timerArray[3] = 100;
+                            this->fishTargetPos.y = 300.0f;
+                            sRumbleDelay = 0x28;
+                            sRodPullback = (s16)Rand_ZeroFloat(30.0f) + 20;
                         } else {
-                            this->unk_17A[0] = (s16)Rand_ZeroFloat(10.0f) + 3;
-                            this->unk_17A[2] = 0;
-                            this->unk_1B4.y = -70.0f - Rand_ZeroFloat(150.0f);
+                            this->timerArray[0] = (s16)Rand_ZeroFloat(10.0f) + 3;
+                            this->timerArray[2] = 0;
+                            this->fishTargetPos.y = -70.0f - Rand_ZeroFloat(150.0f);
                         }
                     }
 
-                    if (this->unk_17A[2] != 0) {
-                        D_80B7E11C = 0.0f;
+                    if (this->timerArray[2] != 0) {
+                        sRodReelingSpeed = 0.0f;
                         this->unk_190 = 1.6f;
                         this->unk_194 = 6000.0f;
                         Math_ApproachF(&this->actor.speedXZ, 7.5f, 1.0f, 1.0f);
-                        Math_ApproachS(&this->unk_170, 0x4E20, 2, 0xFA0);
+                        Math_ApproachS(&this->fishLimbDRotZDelta, 0x4E20, 2, 0xFA0);
                     } else {
-                        if ((D_80B7E124 == 0) && (D_80B7E0B6 == 2)) {
+                        if ((sLineHooked == 0) && (sLureEquipped == FS_LURE_SINKING)) {
                             this->unk_190 = 1.0f;
                             this->unk_194 = 2000.0f;
                             Math_ApproachF(&this->actor.speedXZ, 3.0f, 1.0f, 0.2f);
@@ -3745,15 +3776,15 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
                             Math_ApproachF(&this->actor.speedXZ, 5.0f, 1.0f, 0.5f);
                         }
 
-                        if (this->unk_150 == 0) {
-                            D_80B7E11C = 1.0f - (this->unk_1AC * 0.00899f);
+                        if (this->isLoach == 0) {
+                            sRodReelingSpeed = 1.0f - (this->fishLength * 0.00899f);
                         } else {
-                            D_80B7E11C = 1.0f - (this->unk_1AC * 0.00899f * 1.4f);
+                            sRodReelingSpeed = 1.0f - (this->fishLength * 0.00899f * 1.4f);
                         }
                     }
                 } else {
-                    if (((this->unk_17A[1] & 0xF) == 0) && CHECK_BTN_ALL(input->cur.button, BTN_A) &&
-                        (!(this->unk_1AC >= 60.0f) || (D_80B7E080 >= 2000))) {
+                    if (((this->timerArray[1] & 0xF) == 0) && CHECK_BTN_ALL(input->cur.button, BTN_A) &&
+                        (!(this->fishLength >= 60.0f) || (sFishFightTime >= 2000))) {
                         this->unk_152 = (s16)Rand_ZeroFloat(30.0f) + 15;
                         this->unk_154 = this->actor.yawTowardsPlayer - this->actor.shape.rot.y;
                     }
@@ -3761,57 +3792,57 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
                     this->unk_190 = 1.0f;
                     this->unk_194 = 4500.0f;
 
-                    if (this->unk_150 == 0) {
-                        D_80B7E11C = 1.3f - (this->unk_1AC * 0.00899f);
+                    if (this->isLoach == 0) {
+                        sRodReelingSpeed = 1.3f - (this->fishLength * 0.00899f);
                     } else {
-                        D_80B7E11C = 1.3f - (this->unk_1AC * 0.00899f * 1.4f);
+                        sRodReelingSpeed = 1.3f - (this->fishLength * 0.00899f * 1.4f);
                     }
 
                     Math_ApproachF(&this->actor.speedXZ, 2.0f, 1.0f, 0.5f);
 
-                    if (this->unk_17A[1] == 0) {
+                    if (this->timerArray[1] == 0) {
                         this->unk_152 = 0;
 
-                        if (D_80B7E080 < 2000) {
-                            this->unk_17A[1] = (s16)Rand_ZeroFloat(50.0f) + 50;
-                        } else if (D_80B7E080 < 3000) {
-                            this->unk_17A[1] = (s16)Rand_ZeroFloat(20.0f) + 30;
+                        if (sFishFightTime < 2000) {
+                            this->timerArray[1] = (s16)Rand_ZeroFloat(50.0f) + 50;
+                        } else if (sFishFightTime < 3000) {
+                            this->timerArray[1] = (s16)Rand_ZeroFloat(20.0f) + 30;
                         } else {
-                            this->unk_17A[1] = (s16)Rand_ZeroFloat(10.0f) + 25;
+                            this->timerArray[1] = (s16)Rand_ZeroFloat(10.0f) + 25;
                         }
                     }
                 }
             }
 
-            if (D_80B7E074 != 0) {
-                D_80B7E11C = 0.0f;
+            if (sReelLock != 0) {
+                sRodReelingSpeed = 0.0f;
             }
 
-            if (D_80B7E124 || (D_80B7E0B6 != 2)) {
+            if (sLineHooked || (sLureEquipped != FS_LURE_SINKING)) {
                 if (this->actor.speedXZ < 3.0f) {
-                    if ((D_80B7E0AE & 8) != 0) {
-                        sp100.x = -0.8f;
+                    if ((sLureTimer & 8) != 0) {
+                        targetPosOffset.x = -0.8f;
                     } else {
-                        sp100.x = -0.75f;
+                        targetPosOffset.x = -0.75f;
                     }
                 } else {
-                    if ((D_80B7E0AE & 4) != 0) {
-                        sp100.x = -0.9f;
+                    if ((sLureTimer & 4) != 0) {
+                        targetPosOffset.x = -0.9f;
                     } else {
-                        sp100.x = -0.85f;
+                        targetPosOffset.x = -0.85f;
                     }
                 }
 
                 Math_ApproachF(&D_80B7A6C0, 35.0f, 0.1f, 3.5f);
-                Math_ApproachF(&D_80B7A6BC, sp100.x, 0.3f, 0.1f);
+                Math_ApproachF(&D_80B7A6BC, targetPosOffset.x, 0.3f, 0.1f);
             }
 
             sReelLinePos[LINE_SEG_COUNT - 1] = this->fishMouthPos;
-            sp10C.x = sReelLinePos[LINE_SEG_COUNT - 1].x - sReelLinePos[LINE_SEG_COUNT - 2].x;
-            sp10C.y = sReelLinePos[LINE_SEG_COUNT - 1].y - sReelLinePos[LINE_SEG_COUNT - 2].y;
-            sp10C.z = sReelLinePos[LINE_SEG_COUNT - 1].z - sReelLinePos[LINE_SEG_COUNT - 2].z;
+            multiVecSrc.x = sReelLinePos[LINE_SEG_COUNT - 1].x - sReelLinePos[LINE_SEG_COUNT - 2].x;
+            multiVecSrc.y = sReelLinePos[LINE_SEG_COUNT - 1].y - sReelLinePos[LINE_SEG_COUNT - 2].y;
+            multiVecSrc.z = sReelLinePos[LINE_SEG_COUNT - 1].z - sReelLinePos[LINE_SEG_COUNT - 2].z;
 
-            if ((SQ(sp10C.x) + SQ(sp10C.y) + SQ(sp10C.z)) > SQ(20.0f)) {
+            if ((SQ(multiVecSrc.x) + SQ(multiVecSrc.y) + SQ(multiVecSrc.z)) > SQ(20.0f)) {
                 Math_ApproachF(&this->actor.world.pos.x, sReelLinePos[LINE_SEG_COUNT - 2].x, 0.2f,
                                2.0f * (this->actor.speedXZ * 1.5f));
                 Math_ApproachF(&this->actor.world.pos.y, sReelLinePos[LINE_SEG_COUNT - 2].y, 0.2f,
@@ -3821,167 +3852,175 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
             }
 
             if (CHECK_BTN_ALL(input->cur.button, BTN_A) || (input->rel.stick_y < -30)) {
-                if (D_80B7E116 < 100) {
-                    D_80B7E116++;
+                if (sRodPullback < 100) {
+                    sRodPullback++;
                 }
             } else {
-                if (D_80B7E116 != 0) {
-                    D_80B7E116--;
+                if (sRodPullback != 0) {
+                    sRodPullback--;
                 }
             }
 
-            if ((D_80B7A694 < 3) || ((D_80B7E074 != 0) && (D_80B7E080 > 50)) || (D_80B7E080 >= 6000) ||
-                ((D_80B7E122 == 0) && (D_80B7E124 == 0)) || (D_80B7E116 == 0) ||
-                (((D_80B7E0AE & 0x7F) == 0) && (Rand_ZeroOne() < 0.05f) && (D_80B7E0B6 != 2) && (KREG(69) == 0) && (getFishNeverEscape() == 0))) {
-                D_80B7A67C = 20;
+            if ((sRodCastState < 3) || ((sReelLock != 0) && (sFishFightTime > 50)) || (sFishFightTime >= 6000) ||
+                ((sLureBitTimer == 0) && (sLineHooked == 0)) || (sRodPullback == 0) ||
+                (((sLureTimer & 0x7F) == 0) && (Rand_ZeroOne() < 0.05f) && (sLureEquipped != FS_LURE_SINKING) && (KREG(69) == 0) && (getFishNeverEscape() == 0))) {
+                sFishingCaughtTextDelay = 20;
 
-                if ((D_80B7E122 == 0) && (D_80B7E124 == 0)) {
-                    D_80B7E086 = 0x4081;
-                    if (((sLinkAge == 1) && (HIGH_SCORE(HS_FISHING) & 0x400)) ||
-                        ((sLinkAge != 1) && (HIGH_SCORE(HS_FISHING) & 0x800))) {
-                        D_80B7A67C = 0;
+                if ((sLureBitTimer == 0) && (sLineHooked == 0)) {
+                    sFishingCaughtTextId = 0x4081;
+                    if (((sLinkAge == LINK_AGE_CHILD) && (HIGH_SCORE(HS_FISHING) & HS_FISH_PRIZE_CHILD)) ||
+                        ((sLinkAge != LINK_AGE_CHILD) && (HIGH_SCORE(HS_FISHING) & HS_FISH_PRIZE_ADULT))) {
+                        sFishingCaughtTextDelay = 0;
                     }
                 } else {
-                    D_80B7E086 = 0x4082;
+                    sFishingCaughtTextId = 0x4082;
                     func_800A9F6C(0.0f, 1, 3, 1);
                     Audio_QueueSeqCmd(0x1 << 28 | SEQ_PLAYER_BGM_MAIN << 24 | 0x0A00FF);
                 }
 
-                this->unk_158 = this->unk_15A = 0;
+                this->fishState = this->fishStateNext = 0;
                 this->unk_1A4 = 10000;
                 this->unk_1A2 = 500;
-                this->unk_17A[1] = 50;
-                this->unk_17A[0] = 0;
+                this->timerArray[1] = 50;
+                this->timerArray[0] = 0;
                 this->unk_190 = 1.0f;
                 this->unk_194 = 3000.0f;
 
-                if (D_80B7A694 == 4) {
-                    D_80B7A694 = 3;
+                if (sRodCastState == 4) {
+                    sRodCastState = 3;
                 }
 
-                D_80B7E0A6 = 50;
-                D_80B7E11C = 0.5f;
+                sFishingMusicDelay = 50;
+                sRodReelingSpeed = 0.5f;
                 this->unk_152 = 0;
             } else if (this->actor.xzDistToPlayer < (KREG(59) + 50.0f) || getInstantFish() == 1) {
-                this->unk_158 = 6;
-                this->unk_17A[0] = 100;
+                this->fishState = 6;
+                this->timerArray[0] = 100;
                 player->unk_860 = 3;
                 func_800A9F6C(0.0f, 1, 3, 1);
-                D_80B7E084++;
+                sFishesCaught++;
                 func_80064520(play, &play->csCtx);
-                D_80B7A6CC = 100;
-                D_80B7FEC8 = 45.0f;
-                D_80B7A694 = 5;
+                sFishingPlayerCinematicState = 100;
+                sCatchCamX = 45.0f;
+                sRodCastState = 5;
                 this->unk_190 = 1.0f;
                 this->unk_194 = 500.0f;
-                this->unk_19C = 5000.0f;
+                this->fishLimbRotPhaseMag = 5000.0f;
 
                 if (this->actor.world.pos.y <= WATER_SURFACE_Y(play)) {
-                    func_80B71278(this, 1);
-                    func_80B70A2C(this, play, true);
+                    Fishing_FishLeapSfx(this, true);
+                    Fishing_SplashBySize(this, play, true);
                 }
-                goto case_6;
+                goto hoistCatch;
             }
             break;
 
-        case_6:
+        hoistCatch:
         case 6:
-            Math_ApproachS(&this->unk_170, 0x2AF8, 2, 0xFA0);
-            Math_ApproachF(&D_80B7FEC8, 15.0f, 0.05f, 0.75f);
+            Math_ApproachS(&this->fishLimbDRotZDelta, 0x2AF8, 2, 0xFA0);
+            Math_ApproachF(&sCatchCamX, 15.0f, 0.05f, 0.75f);
 
-            sp10C.x = D_80B7FEC8;
-            if (sLinkAge != 1) {
-                sp10C.y = 30.0f;
-                sp10C.z = 55.0f;
+            multiVecSrc.x = sCatchCamX;
+            if (sLinkAge != LINK_AGE_CHILD) {
+                multiVecSrc.y = 30.0f;
+                multiVecSrc.z = 55.0f;
             } else {
-                sp10C.y = 10.0f;
-                sp10C.z = 50.0f;
+                multiVecSrc.y = 10.0f;
+                multiVecSrc.z = 50.0f;
             }
             Matrix_RotateY((player->actor.shape.rot.y / 32768.0f) * M_PI, MTXMODE_NEW);
-            Matrix_MultVec3f(&sp10C, &sCameraEye);
+            Matrix_MultVec3f(&multiVecSrc, &sCameraEye);
 
             sCameraEye.x += player->actor.world.pos.x;
             sCameraEye.y += player->actor.world.pos.y;
             sCameraEye.z += player->actor.world.pos.z;
 
             sCameraAt = player->actor.world.pos;
-            if (sLinkAge != 1) {
+            if (sLinkAge != LINK_AGE_CHILD) {
                 sCameraAt.y += 40.0f;
             } else {
                 sCameraAt.y += 25.0f;
             }
 
-            if (this->unk_17A[0] == 90) {
+            if (this->timerArray[0] == 90) {
                 Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_HEART_GET | 0x900);
-                D_80B7A67C = 40;
+                sFishingCaughtTextDelay = 40;
 
-                if (this->unk_150 == 0) {
-                    D_80B7A678 = this->unk_1AC;
+                if (this->isLoach == 0) {
+                    sFishLengthToWeigh = this->fishLength;
 
-                    if (D_80B7A678 >= 75) {
-                        D_80B7E086 = 0x409F;
-                    } else if (D_80B7A678 >= 50) {
-                        D_80B7E086 = 0x4091;
+                    if (sFishLengthToWeigh >= 75) {
+                        sFishingCaughtTextId = 0x409F;
+                    } else if (sFishLengthToWeigh >= 50) {
+                        sFishingCaughtTextId = 0x4091;
                     } else {
-                        D_80B7E086 = 0x4083;
+                        sFishingCaughtTextId = 0x4083;
                     }
                 } else {
-                    D_80B7A678 = 2.0f * this->unk_1AC;
-                    D_80B7E086 = 0x4099;
+                    sFishLengthToWeigh = 2.0f * this->fishLength;
+                    sFishingCaughtTextId = 0x4099;
                 }
 
-                this->unk_1D5 = 0;
+                this->keepState = 0;
             }
 
             this->unk_160 = -0x4000;
             this->actor.shape.rot.y = player->actor.shape.rot.y + 0x5000;
             this->actor.shape.rot.x = this->actor.shape.rot.z = this->unk_162 = this->unk_164 = this->unk_16E = 0;
 
-            sp10C.x = 4.0f;
-            sp10C.y = -10.0f;
-            sp10C.z = 5.0f;
-            Matrix_MultVec3f(&sp10C, &sp100);
+            multiVecSrc.x = 4.0f;
+            multiVecSrc.y = -10.0f;
+            multiVecSrc.z = 5.0f;
+            Matrix_MultVec3f(&multiVecSrc, &targetPosOffset);
             if (getInstantFish() == 0) {
-                Math_ApproachF(&this->actor.world.pos.x, player->bodyPartsPos[15].x + sp100.x, 1.0f, 6.0f);
-                Math_ApproachF(&this->actor.world.pos.y, player->bodyPartsPos[15].y + sp100.y, 1.0f, 6.0f);
-                Math_ApproachF(&this->actor.world.pos.z, player->bodyPartsPos[15].z + sp100.z, 1.0f, 6.0f);
+                Math_ApproachF(&this->actor.world.pos.x, player->bodyPartsPos[15].x + targetPosOffset.x, 1.0f, 6.0f);
+                Math_ApproachF(&this->actor.world.pos.y, player->bodyPartsPos[15].y + targetPosOffset.y, 1.0f, 6.0f);
+                Math_ApproachF(&this->actor.world.pos.z, player->bodyPartsPos[15].z + targetPosOffset.z, 1.0f, 6.0f);
             } else {
-                this->actor.world.pos.x = player->bodyPartsPos[15].x + sp100.x;
-                this->actor.world.pos.y = player->bodyPartsPos[15].y + sp100.y;
-                this->actor.world.pos.z = player->bodyPartsPos[15].z + sp100.z;
+                this->actor.world.pos.x = player->bodyPartsPos[15].x + targetPosOffset.x;
+                this->actor.world.pos.y = player->bodyPartsPos[15].y + targetPosOffset.y;
+                this->actor.world.pos.z = player->bodyPartsPos[15].z + targetPosOffset.z;
             }
-            D_80B7E144 = 188.0f;
+            sRodLineSpooled = 188.0f;
 
-            if (this->unk_17A[0] <= 50) {
-                switch (this->unk_1D5) {
+            if (this->timerArray[0] <= 50) {
+                switch (this->keepState) {
                     case 0:
                         if ((Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE) ||
                             (Message_GetState(&play->msgCtx) == TEXT_STATE_NONE)) {
                             if (Message_ShouldAdvance(play)) {
                                 Message_CloseTextbox(play);
                                 if (play->msgCtx.choiceIndex == 0) {
-                                    if (D_80B7A670 == 0.0f) {
-                                        D_80B7A670 = this->unk_1AC;
-                                        D_80B7E07C = this->unk_150;
-                                        D_80B7E07E = D_80B7E0B6;
+                                    if (sFishOnHandLength == 0.0f) {
+                                        sFishOnHandLength = this->fishLength;
+                                        sFishOnHandIsLoach = this->isLoach;
+                                        sLureCaughtWith = sLureEquipped;
+                                        if (IS_FISHSANITY) {
+                                            sFishOnHandParams = this->fishsanityParams;
+                                        }
                                         Actor_Kill(&this->actor);
-                                    } else if ((this->unk_150 == 0) && (D_80B7E07C == 0) &&
-                                               ((s16)this->unk_1AC < (s16)D_80B7A670)) {
-                                        this->unk_1D5 = 1;
-                                        this->unk_17A[0] = 0x3C;
+                                    } else if (getShouldConfirmKeep() && (this->isLoach == 0) && (sFishOnHandIsLoach == 0) &&
+                                               ((s16)this->fishLength < (s16)sFishOnHandLength)) {
+                                        this->keepState = 1;
+                                        this->timerArray[0] = 0x3C;
                                         Message_StartTextbox(play, 0x4098, NULL);
                                     } else {
-                                        f32 temp1 = D_80B7A670;
-                                        s16 temp2 = D_80B7E07C;
-                                        D_80B7A670 = this->unk_1AC;
-                                        D_80B7E07C = this->unk_150;
-                                        D_80B7E07E = D_80B7E0B6;
-                                        this->unk_1AC = temp1;
-                                        this->unk_150 = temp2;
+                                        f32 lengthTemp = sFishOnHandLength;
+                                        s16 loachTemp = sFishOnHandIsLoach;
+                                        sFishOnHandLength = this->fishLength;
+                                        sFishOnHandIsLoach = this->isLoach;
+                                        sLureCaughtWith = sLureEquipped;
+                                        this->fishLength = lengthTemp;
+                                        this->isLoach = loachTemp;
+                                        if (IS_FISHSANITY) {
+                                            s16 paramsTemp = sFishOnHandParams;
+                                            sFishOnHandParams = this->fishsanityParams;
+                                            this->fishsanityParams = paramsTemp;
+                                        }
                                     }
                                 }
-                                if (this->unk_1D5 == 0) {
-                                    D_80B7A694 = 0;
+                                if (this->keepState == 0) {
+                                    sRodCastState = 0;
                                 }
                             }
                         }
@@ -3992,32 +4031,37 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
                             if (Message_ShouldAdvance(play)) {
                                 Message_CloseTextbox(play);
                                 if (play->msgCtx.choiceIndex != 0) {
-                                    f32 temp1 = D_80B7A670;
-                                    s16 temp2 = D_80B7E07C;
-                                    D_80B7A670 = this->unk_1AC;
-                                    D_80B7E07E = D_80B7E0B6;
-                                    this->unk_1AC = temp1;
-                                    this->unk_150 = temp2;
+                                    f32 temp1 = sFishOnHandLength;
+                                    s16 temp2 = sFishOnHandIsLoach;
+                                    sFishOnHandLength = this->fishLength;
+                                    sLureCaughtWith = sLureEquipped;
+                                    this->fishLength = temp1;
+                                    this->isLoach = temp2;
+                                    if (IS_FISHSANITY) {
+                                        s16 paramsTemp = sFishOnHandParams;
+                                        sFishOnHandParams = this->fishsanityParams;
+                                        this->fishsanityParams = paramsTemp;
+                                    }
                                 }
-                                D_80B7A694 = 0;
+                                sRodCastState = 0;
                             }
                         }
                         break;
                 }
             }
 
-            if (D_80B7A694 == 0) {
+            if (sRodCastState == 0) {
                 if (this->actor.update != NULL) {
-                    this->unk_158 = this->unk_15A = 0;
+                    this->fishState = this->fishStateNext = 0;
                     this->unk_1A4 = 10000;
                     this->unk_1A2 = 500;
-                    this->unk_17A[1] = 50;
-                    this->unk_17A[0] = 0;
+                    this->timerArray[1] = 50;
+                    this->timerArray[0] = 0;
                     this->unk_190 = 1.0f;
                     this->unk_194 = 2000.0f;
                     SkelAnime_Free(&this->skelAnime, play);
 
-                    if (this->unk_150 == 0) {
+                    if (this->isLoach == 0) {
                         SkelAnime_InitFlex(play, &this->skelAnime, &gFishingFishSkel, &gFishingFishAnim, 0, 0, 0);
                         Animation_MorphToLoop(&this->skelAnime, &gFishingFishAnim, 0.0f);
                     } else {
@@ -4028,81 +4072,81 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
                 }
 
                 D_80B7E148 = 520.0f;
-                D_80B7E144 = 195.0f;
+                sRodLineSpooled = 195.0f;
                 Audio_QueueSeqCmd(0x1 << 28 | SEQ_PLAYER_BGM_MAIN << 24 | 0xA00FF);
-                D_80B7E0A6 = 20;
-                D_80B7A6CC = 3;
+                sFishingMusicDelay = 20;
+                sFishingPlayerCinematicState = 3;
             }
             break;
 
         case 7:
-            this->unk_151 = 50;
-            sp134 = 5;
-            this->unk_1B0 = 12288.0f;
+            this->lilyTimer = 50;
+            rotXYScale = 5;
+            this->rotationStep = 12288.0f;
 
-            if (this->actor.params < 104) {
-                this->unk_1B4 = sGroupFishes[this->actor.params - 100].pos;
-                D_80B7A898 = 1;
-            } else if (this->actor.params < 108) {
-                this->unk_1B4 = sGroupFishes[this->actor.params - 100 + 16].pos;
-                D_80B7A898 = 2;
+            if (this->actor.params < (EN_FISH_PARAM + 4)) {
+                this->fishTargetPos = sGroupFishes[this->actor.params - EN_FISH_PARAM].pos;
+                sFishGroupVar = 1;
+            } else if (this->actor.params < (EN_FISH_PARAM + 8)) {
+                this->fishTargetPos = sGroupFishes[this->actor.params - EN_FISH_PARAM + 16].pos;
+                sFishGroupVar = 2;
             } else {
-                this->unk_1B4 = sGroupFishes[this->actor.params - 100 + 32].pos;
-                D_80B7A898 = 3;
+                this->fishTargetPos = sGroupFishes[this->actor.params - EN_FISH_PARAM + 32].pos;
+                sFishGroupVar = 3;
             }
 
             Math_ApproachF(&this->actor.speedXZ, 5.0f, 1.0f, 1.0f);
 
-            if (sp124 < 20.0f) {
-                Math_ApproachS(&this->unk_170, 0x4E20, 2, 0xFA0);
+            if (distToTarget < 20.0f) {
+                Math_ApproachS(&this->fishLimbDRotZDelta, 0x4E20, 2, 0xFA0);
 
-                if ((this->unk_17A[2] == 0) && func_80B70A2C(this, play, false)) {
-                    func_80B71278(this, Rand_ZeroFloat(1.99f));
-                    this->unk_17A[2] = (s16)Rand_ZeroFloat(20.0f) + 20;
+                if ((this->timerArray[2] == 0) && Fishing_SplashBySize(this, play, false)) {
+                    Fishing_FishLeapSfx(this, Rand_ZeroFloat(1.99f));
+                    this->timerArray[2] = (s16)Rand_ZeroFloat(20.0f) + 20;
                 }
             }
 
-            if (this->unk_17A[3] == 0) {
-                this->unk_158 = 10;
-                this->unk_15A = 10;
+            if (this->timerArray[3] == 0) {
+                this->fishState = 10;
+                this->fishStateNext = 10;
             } else {
                 func_80B70ED4(this, input);
-                if (this->actor.xzDistToPlayer < (100.0f * sp118)) {
-                    this->unk_15A = this->unk_158 = 0;
+                if (this->actor.xzDistToPlayer < (100.0f * playerSpeedMod)) {
+                    this->fishStateNext = this->fishState = 0;
                     this->unk_1A4 = 500;
                     this->unk_1A2 = 200;
-                    this->unk_17A[1] = 50;
+                    this->timerArray[1] = 50;
                 }
             }
             break;
     }
 
-    Math_ApproachS(&this->unk_172, (Math_SinS(this->unk_15C * 0x1000) * 5000.0f) + 5000.0f, 2, 0x7D0);
+    Math_ApproachS(&this->fishLimbEFRotYDelta, (Math_SinS(this->stateAndTimer * 0x1000) * 5000.0f) + 5000.0f, 2, 0x7D0);
 
-    if (this->unk_158 != 6) {
+    if (this->fishState != 6) {
         if (this->actor.world.pos.y > WATER_SURFACE_Y(play)) {
             this->unk_190 = 1.5f;
             this->unk_194 = 5000.0f;
 
             Math_ApproachS(&this->unk_16E, 0, 5, 0x7D0);
 
-            spF4 = spF0 = spFA = 3;
-            spF2 = spEE = 0x2000;
+            rotXScale = rotYScale = rotZScale = 3;
+            rotXStep = rotYStep = 0x2000;
 
-            this->unk_17A[2] = 0;
+            this->timerArray[2] = 0;
             this->unk_184 -= 1.0f;
         } else {
             Math_ApproachZeroF(&this->unk_184, 1.0f, 2.0f);
-            if ((this->unk_158 != -1) && (this->unk_158 != -2) && (this->unk_158 != -25)) {
-                this->unk_166 = 0;
+            if ((this->fishState != -1) && (this->fishState != -2) && (this->fishState != -25)) {
+                this->rotationTarget.x = 0;
             }
 
-            this->unk_168 = this->unk_16A = 0;
-            spF4 = spF0 = spFA = 4;
-            spF2 = spEE = 0x2000;
+            this->rotationTarget.y = this->rotationTarget.z = 0;
+            rotXScale = rotYScale = rotZScale = 4;
+            rotXStep = rotYStep = 0x2000;
 
-            spF6 = Fishing_SmoothStepToS(&this->actor.world.rot.y, spFC, sp134, this->unk_1B0) * 3.0f;
-            Math_ApproachS(&this->actor.world.rot.x, spFE, sp134, this->unk_1B0 * 0.5f);
+            spF6 = Fishing_SmoothStepToS(&this->actor.world.rot.y, rotYTarget, rotXYScale, this->rotationStep) * 3.0f;
+            Math_ApproachS(&this->actor.world.rot.x, rotXTarget, rotXYScale, this->rotationStep * 0.5f);
 
             if (spF6 > 0x1F40) {
                 spF6 = 0x1F40;
@@ -4124,25 +4168,25 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
         this->actor.world.pos.y += (this->unk_184 * 1.5f);
 
         if (this->unk_152 != 0) {
-            this->unk_168 = this->unk_154;
+            this->rotationTarget.y = this->unk_154;
             this->unk_152--;
             if (this->unk_156 != 0) {
-                spF0 = 5;
-                spEE = 0x4000;
+                rotYScale = 5;
+                rotYStep = 0x4000;
             } else {
-                spF0 = 10;
-                spEE = 0x800;
+                rotYScale = 10;
+                rotYStep = 0x800;
             }
-            this->unk_166 = -0x500 - this->actor.shape.rot.x;
-            spF4 = 5;
-            spF2 = 0x4000;
+            this->rotationTarget.x = -0x500 - this->actor.shape.rot.x;
+            rotXScale = 5;
+            rotXStep = 0x4000;
         } else {
             this->unk_156 = 0;
         }
 
-        Math_ApproachS(&this->unk_160, this->unk_166, spF4, spF2);
-        Math_ApproachS(&this->unk_162, this->unk_168, spF0, spEE);
-        Math_ApproachS(&this->unk_164, this->unk_16A, spFA, 0x2000);
+        Math_ApproachS(&this->unk_160, this->rotationTarget.x, rotXScale, rotXStep);
+        Math_ApproachS(&this->unk_162, this->rotationTarget.y, rotYScale, rotYStep);
+        Math_ApproachS(&this->unk_164, this->rotationTarget.z, rotZScale, 0x2000);
 
         if (this->actor.speedXZ <= 0.5f) {
             Math_ApproachS(&this->actor.shape.rot.x, 0, 10, this->unk_178);
@@ -4154,38 +4198,38 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
 
         this->actor.shape.rot.y = this->actor.world.rot.y;
 
-        if ((this->unk_158 != -1) && (this->unk_158 != -2) && (this->unk_158 != -25)) {
+        if ((this->fishState != -1) && (this->fishState != -2) && (this->fishState != -25)) {
             if ((this->actor.world.pos.y > WATER_SURFACE_Y(play)) &&
                 (this->actor.prevPos.y <= WATER_SURFACE_Y(play))) {
-                func_80B70A2C(this, play, true);
-                func_80B71278(this, 1);
+                Fishing_SplashBySize(this, play, true);
+                Fishing_FishLeapSfx(this, true);
                 this->unk_184 = this->actor.velocity.y;
                 this->actor.velocity.y = 0.0f;
-                this->unk_16A = Rand_CenteredFloat(32768.0f);
+                this->rotationTarget.z = Rand_CenteredFloat(32768.0f);
             } else if ((this->actor.world.pos.y < WATER_SURFACE_Y(play)) &&
                        (this->actor.prevPos.y >= WATER_SURFACE_Y(play))) {
                 if (this->unk_184 < -5.0f) {
                     this->unk_184 = -5.0f;
                 }
                 this->actor.world.rot.x = -0xFA0;
-                func_80B70A2C(this, play, true);
-                this->unk_1D2 = 20;
-                func_80B71278(this, 0);
+                Fishing_SplashBySize(this, play, true);
+                this->bubbleTime = 20;
+                Fishing_FishLeapSfx(this, 0);
             }
         }
 
         if ((this->actor.world.pos.y < WATER_SURFACE_Y(play)) &&
-            (this->actor.world.pos.y > (WATER_SURFACE_Y(play) - 10.0f)) && ((this->unk_15C & 1) == 0) &&
+            (this->actor.world.pos.y > (WATER_SURFACE_Y(play) - 10.0f)) && ((this->stateAndTimer & 1) == 0) &&
             (this->actor.speedXZ > 0.0f)) {
             Vec3f pos = this->actor.world.pos;
             pos.y = WATER_SURFACE_Y(play);
             Fishing_SpawnRipple(&this->actor.projectedPos, play->specialEffects, &pos, 80.0f, 500.0f, 150, 90);
         }
 
-        if ((this->actor.speedXZ > 0.0f) || (this->unk_158 == 5)) {
+        if ((this->actor.speedXZ > 0.0f) || (this->fishState == 5)) {
             f32 velocityY = this->actor.velocity.y;
 
-            spD8 = this->unk_1AC * 0.1f;
+            spD8 = this->fishLength * 0.1f;
 
             this->actor.world.pos.y -= spD8;
             this->actor.prevPos.y -= spD8;
@@ -4197,7 +4241,7 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
             this->actor.velocity.y = velocityY;
 
             if (this->actor.bgCheckFlags & 8) {
-                this->unk_1A0 = 20;
+                this->bumpTimer = 20;
             }
 
             if (this->actor.bgCheckFlags & 1) {
@@ -4207,47 +4251,47 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
                     this->actor.velocity.z = this->actor.world.pos.z * -0.003f;
 
                     Audio_PlayActorSound2(&this->actor, NA_SE_EV_FISH_LEAP);
-                    func_80B70CF0(this, play);
+                    Fishing_SplashBySize2(this, play);
 
                     if (Rand_ZeroOne() < 0.5f) {
-                        this->unk_16A = 0x4000;
+                        this->rotationTarget.z = 0x4000;
                     } else {
-                        this->unk_16A = -0x4000;
+                        this->rotationTarget.z = -0x4000;
                     }
 
                     if (Rand_ZeroOne() < 0.5f) {
-                        this->unk_166 = 0;
+                        this->rotationTarget.x = 0;
                     } else {
-                        this->unk_166 = (s16)Rand_CenteredFloat(32.0f) + 0x8000;
+                        this->rotationTarget.x = (s16)Rand_CenteredFloat(32.0f) + 0x8000;
                     }
 
-                    this->unk_168 = (s16)Rand_CenteredFloat(16384.0f);
+                    this->rotationTarget.y = (s16)Rand_CenteredFloat(16384.0f);
                     this->unk_190 = 1.0f;
                     this->unk_194 = 5000.0f;
-                    this->unk_19C = 5000.0f;
+                    this->fishLimbRotPhaseMag = 5000.0f;
                 } else {
                     this->unk_184 = 0.0f;
 
-                    if ((this->unk_158 == 5) && ((this->unk_15C & 1) == 0)) {
+                    if ((this->fishState == 5) && ((this->stateAndTimer & 1) == 0)) {
                         Vec3f pos;
 
                         pos.x = Rand_CenteredFloat(10.0f) + this->actor.world.pos.x;
                         pos.z = Rand_CenteredFloat(10.0f) + this->actor.world.pos.z;
                         pos.y = this->actor.floorHeight + 5.0f;
                         Fishing_SpawnWaterDust(&this->actor.projectedPos, play->specialEffects, &pos,
-                                               (this->unk_1AC * 0.005f) + 0.15f);
+                                               (this->fishLength * 0.005f) + 0.15f);
                     }
                 }
             }
         }
     }
 
-    if (this->unk_1D2 != 0) {
+    if (this->bubbleTime != 0) {
         s16 i;
         Vec3f pos;
-        f32 range = (this->unk_1AC * 0.075f) + 10.0f;
+        f32 range = (this->fishLength * 0.075f) + 10.0f;
 
-        this->unk_1D2--;
+        this->bubbleTime--;
 
         for (i = 0; i < 2; i++) {
             pos.x = Rand_CenteredFloat(range) + this->actor.world.pos.x;
@@ -4261,22 +4305,29 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
 
 s32 Fishing_FishOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
                                  void* thisx) {
-    Fishing* this = (Fishing*)thisx;
+    Fishing* this = (Fishing*)thisx; 
+
+    // #region SOH [Randomizer]
+    // A fish having a shadowDraw implies that it is being given uncollected FX
+    if (IS_FISHSANITY && this->actor.shape.shadowDraw != NULL) {
+        Fishsanity_OpenGreyscaleColor(play, &fsPulseColor, (this->actor.params - 100) * 20);
+    }
+    // #endregion
 
     if (limbIndex == 0xD) {
-        rot->z -= this->unk_170 - 11000;
+        rot->z -= this->fishLimbDRotZDelta - 11000;
     } else if ((limbIndex == 2) || (limbIndex == 3)) {
-        rot->y += this->unk_16C;
+        rot->y += this->fishLimb23RotYDelta;
     } else if (limbIndex == 4) {
-        rot->y += this->unk_176;
+        rot->y += this->fishLimb4RotYDelta;
     } else if (limbIndex == 0xE) {
-        rot->y -= this->unk_172;
+        rot->y -= this->fishLimbEFRotYDelta;
     } else if (limbIndex == 0xF) {
-        rot->y += this->unk_172;
+        rot->y += this->fishLimbEFRotYDelta;
     } else if (limbIndex == 8) {
-        rot->y += this->unk_174;
+        rot->y += this->fishLimb89RotYDelta;
     } else if (limbIndex == 9) {
-        rot->y -= this->unk_174;
+        rot->y -= this->fishLimb89RotYDelta;
     }
 
     return 0;
@@ -4285,6 +4336,13 @@ s32 Fishing_FishOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Ve
 void Fishing_FishPostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) {
     Fishing* this = (Fishing*)thisx;
 
+    // #region SOH [Randomizer]
+    // A fish having a shadowDraw implies that it is being given uncollected FX
+    if (IS_FISHSANITY && this->actor.shape.shadowDraw != NULL) {
+        Fishsanity_CloseGreyscaleColor(play);
+    }
+    // #endregion
+
     if (limbIndex == 0xD) {
         Matrix_MultVec3f(&sFishMouthOffset, &this->fishMouthPos);
     }
@@ -4294,12 +4352,19 @@ s32 Fishing_LoachOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, V
                                   void* thisx) {
     Fishing* this = (Fishing*)thisx;
 
+    // #region SOH [Randomizer]
+    // A fish having a shadowDraw implies that it is being given uncollected FX
+    if (IS_FISHSANITY && this->actor.shape.shadowDraw != NULL) {
+        Fishsanity_OpenGreyscaleColor(play, &fsPulseColor, (this->actor.params - 100) * 20);
+    }
+    // #endregion
+
     if (limbIndex == 3) {
-        rot->y += this->unk_1CC[0];
+        rot->y += this->loachRotYDelta[0];
     } else if (limbIndex == 4) {
-        rot->y += this->unk_1CC[1];
+        rot->y += this->loachRotYDelta[1];
     } else if (limbIndex == 5) {
-        rot->y += this->unk_1CC[2];
+        rot->y += this->loachRotYDelta[2];
     }
 
     return 0;
@@ -4309,6 +4374,13 @@ void Fishing_LoachPostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3
     static Vec3f sLoachMouthOffset = { 500.0f, 500.0f, 0.0f };
     Fishing* this = (Fishing*)thisx;
 
+    // #region SOH [Randomizer]
+    // A fish having a shadowDraw implies that it is being given uncollected FX
+    if (IS_FISHSANITY && this->actor.shape.shadowDraw != NULL) {
+        Fishsanity_CloseGreyscaleColor(play);
+    }
+    // #endregion
+
     if (limbIndex == 0xB) {
         Matrix_MultVec3f(&sLoachMouthOffset, &this->fishMouthPos);
     }
@@ -4325,14 +4397,14 @@ void Fishing_DrawFish(Actor* thisx, PlayState* play) {
     Matrix_RotateZ(((this->unk_164 + this->actor.shape.rot.z) / 32768.0f) * M_PI, MTXMODE_APPLY);
     Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY);
 
-    if (this->unk_150 == 0) {
-        Matrix_RotateY((this->unk_16C * (M_PI / 32768)) - (M_PI / 2), MTXMODE_APPLY);
-        Matrix_Translate(0.0f, 0.0f, this->unk_16C * 10.0f * 0.01f, MTXMODE_APPLY);
+    if (this->isLoach == 0) {
+        Matrix_RotateY((this->fishLimb23RotYDelta * (M_PI / 32768)) - (M_PI / 2), MTXMODE_APPLY);
+        Matrix_Translate(0.0f, 0.0f, this->fishLimb23RotYDelta * 10.0f * 0.01f, MTXMODE_APPLY);
 
         SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, Fishing_FishOverrideLimbDraw, Fishing_FishPostLimbDraw, this);
     } else {
         Matrix_Translate(0.0f, 0.0f, 3000.0f, MTXMODE_APPLY);
-        Matrix_RotateY(this->unk_16C * (M_PI / 32768), MTXMODE_APPLY);
+        Matrix_RotateY(this->fishLimb23RotYDelta * (M_PI / 32768), MTXMODE_APPLY);
         Matrix_Translate(0.0f, 0.0f, -3000.0f, MTXMODE_APPLY);
         Matrix_RotateY(-(M_PI / 2), MTXMODE_APPLY);
 
@@ -4397,7 +4469,7 @@ void Fishing_UpdatePondProps(PlayState* play) {
 
                     actor = play->actorCtx.actorLists[ACTORCAT_NPC].head;
                     while (actor != NULL) {
-                        if (!((actor->id == ACTOR_FISHING) && (actor->params >= 100))) {
+                        if (!((actor->id == ACTOR_FISHING) && (actor->params >= EN_FISH_PARAM))) {
                             actor = actor->next;
                         } else {
                             Fishing_HandleReedContact(prop, &actor->world.pos);
@@ -4411,10 +4483,10 @@ void Fishing_UpdatePondProps(PlayState* play) {
 
                     actor = play->actorCtx.actorLists[ACTORCAT_NPC].head;
                     while (actor != NULL) {
-                        if (!((actor->id == ACTOR_FISHING) && (actor->params >= 100))) {
+                        if (!((actor->id == ACTOR_FISHING) && (actor->params >= EN_FISH_PARAM))) {
                             actor = actor->next;
                         } else {
-                            Fishing_HandleLilyPadContact(prop, &actor->world.pos, ((Fishing*)actor)->unk_151);
+                            Fishing_HandleLilyPadContact(prop, &actor->world.pos, ((Fishing*)actor)->lilyTimer);
                             actor = actor->next;
                         }
                     }
@@ -4430,13 +4502,13 @@ void Fishing_UpdatePondProps(PlayState* play) {
         prop++;
     }
 
-    if (sCameraId == 0) {
+    if (sSubCamId == 0) {
         CollisionCheck_SetOC(play, &play->colChkCtx, &sFishingMain->collider.base);
     }
 }
 
 void Fishing_DrawPondProps(PlayState* play) {
-    u8 flag = 0;
+    u8 materialFlag = 0;
     FishingProp* prop = &sPondProps[0];
     s16 i;
     s32 pad;
@@ -4447,9 +4519,9 @@ void Fishing_DrawPondProps(PlayState* play) {
 
     for (i = 0; i < POND_PROP_COUNT; i++) {
         if (prop->type == FS_PROP_REED) {
-            if (flag == 0) {
+            if (materialFlag == 0) {
                 gSPDisplayList(POLY_XLU_DISP++, gFishingReedMaterialDL);
-                flag++;
+                materialFlag++;
             }
 
             if (prop->shouldDraw) {
@@ -4471,12 +4543,12 @@ void Fishing_DrawPondProps(PlayState* play) {
     }
 
     prop = &sPondProps[0];
-    flag = 0;
+    materialFlag = 0;
     for (i = 0; i < POND_PROP_COUNT; i++) {
         if (prop->type == FS_PROP_WOOD_POST) {
-            if (flag == 0) {
+            if (materialFlag == 0) {
                 gSPDisplayList(POLY_OPA_DISP++, gFishingWoodPostMaterialDL);
-                flag++;
+                materialFlag++;
             }
 
             if (prop->shouldDraw) {
@@ -4495,12 +4567,12 @@ void Fishing_DrawPondProps(PlayState* play) {
     }
 
     prop = &sPondProps[0];
-    flag = 0;
+    materialFlag = 0;
     for (i = 0; i < POND_PROP_COUNT; i++) {
         if (prop->type == FS_PROP_LILY_PAD) {
-            if (flag == 0) {
+            if (materialFlag == 0) {
                 gSPDisplayList(POLY_XLU_DISP++, gFishingLilyPadMaterialDL);
-                flag++;
+                materialFlag++;
             }
 
             if (prop->shouldDraw) {
@@ -4522,12 +4594,12 @@ void Fishing_DrawPondProps(PlayState* play) {
     }
 
     prop = &sPondProps[0];
-    flag = 0;
+    materialFlag = 0;
     for (i = 0; i < POND_PROP_COUNT; i++) {
         if (prop->type == FS_PROP_ROCK) {
-            if (flag == 0) {
+            if (materialFlag == 0) {
                 gSPDisplayList(POLY_OPA_DISP++, gFishingRockMaterialDL);
-                flag++;
+                materialFlag++;
             }
 
             if (prop->shouldDraw) {
@@ -4573,7 +4645,7 @@ void Fishing_UpdateGroupFishes(PlayState* play) {
     f32 temp1;
     f32 temp2;
 
-    if ((D_80B7E114 != 0) || (D_80B7A694 == 4)) {
+    if ((D_80B7E114 != 0) || (sRodCastState == 4)) {
         refPos = &sLurePos;
     } else {
         refPos = &player->actor.world.pos;
@@ -4589,7 +4661,7 @@ void Fishing_UpdateGroupFishes(PlayState* play) {
     if ((SQ(temp1) + SQ(temp2)) < SQ(50.0f)) {
         sFishGroupAngle1 += 0.3f;
         groupContactFlags |= 1;
-    } else if (D_80B7A898 != 0.0f) {
+    } else if (sFishGroupVar != 0.0f) {
         sFishGroupAngle1 += 0.05f;
         basePos[0].y = WATER_SURFACE_Y(play) - 5.0f;
     } else {
@@ -4606,7 +4678,7 @@ void Fishing_UpdateGroupFishes(PlayState* play) {
     if ((SQ(temp1) + SQ(temp2)) < SQ(50.0f)) {
         sFishGroupAngle2 -= 0.3f;
         groupContactFlags |= 2;
-    } else if (D_80B7A898 != 0.0f) {
+    } else if (sFishGroupVar != 0.0f) {
         sFishGroupAngle2 -= 0.05f;
         basePos[1].y = WATER_SURFACE_Y(play) - 5.0f;
     } else {
@@ -4623,14 +4695,14 @@ void Fishing_UpdateGroupFishes(PlayState* play) {
     if ((SQ(temp1) + SQ(temp2)) < SQ(50.0f)) {
         sFishGroupAngle3 -= 0.3f;
         groupContactFlags |= 4;
-    } else if (D_80B7A898 != 0.0f) {
+    } else if (sFishGroupVar != 0.0f) {
         sFishGroupAngle3 -= 0.05f;
         basePos[2].y = WATER_SURFACE_Y(play) - 5.0f;
     } else {
         Math_ApproachF(&sFishGroupAngle3, 4.6f, 1.0f, 0.001f);
     }
 
-    if (sLinkAge == 1) {
+    if (sLinkAge == LINK_AGE_CHILD) {
         spD8 = 0.8f;
     } else {
         spD8 = 1.0f;
@@ -4659,22 +4731,22 @@ void Fishing_UpdateGroupFishes(PlayState* play) {
                 groupFlag = 4;
             }
 
-            dx = fish->unk_10.x - fish->pos.x;
-            dy = fish->unk_10.y - fish->pos.y;
-            dz = fish->unk_10.z - fish->pos.z;
+            dx = fish->homePos.x - fish->pos.x;
+            dy = fish->homePos.y - fish->pos.y;
+            dz = fish->homePos.z - fish->pos.z;
             spD4 = Math_Atan2S(dz, dx);
             dist = sqrtf(SQ(dx) + SQ(dz));
             spD6 = Math_Atan2S(dist, dy);
 
             if ((dist < 10.0f) || (((fish->timer % 32) == 0) && (Rand_ZeroOne() > 0.5f))) {
-                fish->unk_10.y = basePos[groupIndex].y + Rand_CenteredFloat(10.0f);
+                fish->homePos.y = basePos[groupIndex].y + Rand_CenteredFloat(10.0f);
 
-                if (D_80B7A898 != 0.0f) {
-                    fish->unk_10.x = basePos[groupIndex].x + Rand_CenteredFloat(200.0f);
-                    fish->unk_10.z = basePos[groupIndex].z + Rand_CenteredFloat(200.0f);
+                if (sFishGroupVar != 0.0f) {
+                    fish->homePos.x = basePos[groupIndex].x + Rand_CenteredFloat(200.0f);
+                    fish->homePos.z = basePos[groupIndex].z + Rand_CenteredFloat(200.0f);
                 } else {
-                    fish->unk_10.x = basePos[groupIndex].x + Rand_CenteredFloat(100.0f);
-                    fish->unk_10.z = basePos[groupIndex].z + Rand_CenteredFloat(100.0f);
+                    fish->homePos.x = basePos[groupIndex].x + Rand_CenteredFloat(100.0f);
+                    fish->homePos.z = basePos[groupIndex].z + Rand_CenteredFloat(100.0f);
                 }
 
                 ripplePos = fish->pos;
@@ -4682,8 +4754,8 @@ void Fishing_UpdateGroupFishes(PlayState* play) {
                 Fishing_SpawnRipple(&fish->projectedPos, play->specialEffects, &ripplePos, 20.0f,
                                     Rand_ZeroFloat(50.0f) + 100.0f, 150, 90);
 
-                if (fish->unk_28 < 1.5f) {
-                    fish->unk_28 = 1.5f;
+                if (fish->velY < 1.5f) {
+                    fish->velY = 1.5f;
                 }
 
                 fish->unk_34 = 1.5f;
@@ -4704,19 +4776,19 @@ void Fishing_UpdateGroupFishes(PlayState* play) {
 
             if (groupContactFlags & groupFlag) {
                 fish->unk_38 = 1.0f;
-                fish->unk_28 = 6.0f;
+                fish->velY = 6.0f;
                 fish->unk_34 = 2.0f;
             }
 
-            if (D_80B7A898 != 0.0f) {
+            if (sFishGroupVar != 0.0f) {
                 fish->unk_38 = 1.0f;
-                fish->unk_28 = 4.0f;
+                fish->velY = 4.0f;
                 fish->unk_34 = 2.0f;
             }
 
-            Math_ApproachF(&fish->unk_28, 0.75f, 1.0f, 0.05f);
+            Math_ApproachF(&fish->velY, 0.75f, 1.0f, 0.05f);
 
-            temp1 = fish->unk_28 * spD8;
+            temp1 = fish->velY * spD8;
             temp2 = Math_CosS(fish->unk_3C) * temp1;
 
             fish->pos.x += temp2 * Math_SinS(fish->unk_3E);
@@ -4727,24 +4799,24 @@ void Fishing_UpdateGroupFishes(PlayState* play) {
                 Math_ApproachF(&fish->unk_34, 1.0f, 1.0f, 0.1f);
                 Math_ApproachF(&fish->unk_38, 0.4f, 1.0f, 0.04f);
                 fish->unk_30 += fish->unk_34;
-                fish->unk_2C = (cosf(fish->unk_30) * fish->unk_38) + offset;
+                fish->scaleX = (cosf(fish->unk_30) * fish->unk_38) + offset;
             }
         }
 
         fish++;
     }
 
-    D_80B7A898 = 0.0f;
+    sFishGroupVar = 0.0f;
 }
 
 void Fishing_DrawGroupFishes(PlayState* play) {
-    u8 flag = 0;
+    u8 materialFlag = 0;
     FishingGroupFish* fish = &sGroupFishes[0];
     f32 scale;
     s16 i;
     s32 pad;
 
-    if (sLinkAge == 1) {
+    if (sLinkAge == LINK_AGE_CHILD) {
         scale = 0.003325f;
     } else {
         scale = 0.00475f;
@@ -4754,10 +4826,10 @@ void Fishing_DrawGroupFishes(PlayState* play) {
 
     for (i = 0; i < GROUP_FISH_COUNT; i++) {
         if (fish->type != FS_GROUP_FISH_NONE) {
-            if (flag == 0) {
+            if (!materialFlag) {
                 gSPDisplayList(POLY_OPA_DISP++, gFishingGroupFishMaterialDL);
                 gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 155, 155, 155, 255);
-                flag++;
+                materialFlag++;
             }
 
             if (fish->shouldDraw) {
@@ -4765,7 +4837,7 @@ void Fishing_DrawGroupFishes(PlayState* play) {
                 Matrix_Translate(fish->pos.x, fish->pos.y, fish->pos.z, MTXMODE_NEW);
                 Matrix_RotateY(((f32)fish->unk_3E * M_PI) / 32768.0f, MTXMODE_APPLY);
                 Matrix_RotateX((-(f32)fish->unk_3C * M_PI) / 32768.0f, MTXMODE_APPLY);
-                Matrix_Scale(fish->unk_2C * scale, scale, scale, MTXMODE_APPLY);
+                Matrix_Scale(fish->scaleX * scale, scale, scale, MTXMODE_APPLY);
 
                 gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
                           G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@@ -4779,14 +4851,15 @@ void Fishing_DrawGroupFishes(PlayState* play) {
     CLOSE_DISPS(play->state.gfxCtx);
 }
 
-static u16 D_80B7AFB8[] = { 0x4096, 0x408D, 0x408E, 0x408F, 0x4094, 0x4095 };
+static u16 sPondOwnerTextIds[] = { 0x4096, 0x408D, 0x408E, 0x408F, 0x4094, 0x4095 };
 
 void Fishing_HandleOwnerDialog(Fishing* this, PlayState* play) {
-    switch (this->unk_15C) {
+    switch (this->stateAndTimer) {
         case 0:
-            if (D_80B7E0AC == 0) {
-                if (sLinkAge != 1) {
-                    if ((HIGH_SCORE(HS_FISHING) & 0x100) && !(HIGH_SCORE(HS_FISHING) & 0x200)) {
+            if (sFishingPlayingState == 0) {
+                if (sLinkAge != LINK_AGE_CHILD) {
+                    if ((HIGH_SCORE(HS_FISHING) & HS_FISH_PLAYED_CHILD) &&
+                        !(HIGH_SCORE(HS_FISHING) & HS_FISH_PLAYED_ADULT)) {
                         this->actor.textId = 0x4093;
                     } else {
                         this->actor.textId = 0x407B;
@@ -4794,22 +4867,22 @@ void Fishing_HandleOwnerDialog(Fishing* this, PlayState* play) {
                 } else {
                     this->actor.textId = 0x407B;
                 }
-            } else if (D_80B7A68C == 0) {
+            } else if (!sIsOwnersHatHooked) {
                 this->actor.textId = 0x4084;
             } else {
                 this->actor.textId = 0x4097;
             }
 
             if (Actor_ProcessTalkRequest(&this->actor, play)) {
-                if (D_80B7E0AC == 0) {
-                    this->unk_15C = 1;
-                    if (sLinkAge != 1) {
-                        HIGH_SCORE(HS_FISHING) |= 0x200;
+                if (sFishingPlayingState == 0) {
+                    this->stateAndTimer = 1;
+                    if (sLinkAge != LINK_AGE_CHILD) {
+                        HIGH_SCORE(HS_FISHING) |= HS_FISH_PLAYED_ADULT;
                     } else {
-                        HIGH_SCORE(HS_FISHING) |= 0x100;
+                        HIGH_SCORE(HS_FISHING) |= HS_FISH_PLAYED_CHILD;
                     }
                 } else {
-                    this->unk_15C = 10;
+                    this->stateAndTimer = 10;
                 }
             } else {
                 func_8002F2CC(&this->actor, play, 100.0f);
@@ -4830,17 +4903,21 @@ void Fishing_HandleOwnerDialog(Fishing* this, PlayState* play) {
                                 this->actor.textId = 0x407D;
                             }
                             Message_ContinueTextbox(play, this->actor.textId);
-                            this->unk_15C = 2;
+                            this->stateAndTimer = 2;
                         } else {
                             Message_ContinueTextbox(play, 0x407E);
-                            this->unk_15C = 3;
+                            this->stateAndTimer = 3;
                         }
                         break;
                     case 1:
                         Message_ContinueTextbox(play, 0x2D);
-                        this->unk_15C = 3;
+                        this->stateAndTimer = 3;
                         break;
                 }
+            // Fix for owner getting stuck when the pond is closed (Fishing Pole Shuffle)
+            } else if (Message_GetState(&play->msgCtx) == TEXT_STATE_DONE && Message_ShouldAdvance(play)) {
+                Message_CloseTextbox(play);
+                this->stateAndTimer = 0;
             }
             break;
 
@@ -4848,17 +4925,17 @@ void Fishing_HandleOwnerDialog(Fishing* this, PlayState* play) {
             if ((Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(play)) {
                 Message_CloseTextbox(play);
                 Message_ContinueTextbox(play, 0x407F);
-                this->unk_15C = 4;
+                this->stateAndTimer = 4;
             }
             break;
 
         case 3:
             if ((Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(play)) {
                 Message_CloseTextbox(play);
-                this->unk_15C = 0;
+                this->stateAndTimer = 0;
             }
             if (Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) {
-                this->unk_15C = 0;
+                this->stateAndTimer = 0;
             }
             break;
 
@@ -4868,9 +4945,9 @@ void Fishing_HandleOwnerDialog(Fishing* this, PlayState* play) {
 
                 switch (play->msgCtx.choiceIndex) {
                     case 0:
-                        D_80B7A678 = D_80B7E078;
+                        sFishLengthToWeigh = sFishingRecordLength;
                         Message_ContinueTextbox(play, 0x4080);
-                        this->unk_15C = 5;
+                        this->stateAndTimer = 5;
                         break;
                     case 1:
                         Message_ContinueTextbox(play, 0x407F);
@@ -4885,30 +4962,30 @@ void Fishing_HandleOwnerDialog(Fishing* this, PlayState* play) {
 
                 play->interfaceCtx.unk_260 = 1;
                 play->startPlayerFishing(play);
-                D_80B7E0AC = 1;
-                D_80B7A684 = 20;
-                this->unk_15C = 0;
+                sFishingPlayingState = 1;
+                sOwnerTheftTimer = 20;
+                this->stateAndTimer = 0;
 
                 if ((HIGH_SCORE(HS_FISHING) & 0xFF0000) < 0xFF0000) {
-                    HIGH_SCORE(HS_FISHING) += 0x10000;
+                    HIGH_SCORE(HS_FISHING) += HS_FISH_PLAYED;
                 }
             }
             break;
 
         case 10:
-            if (D_80B7A68C != 0) {
+            if (sIsOwnersHatHooked) { // owner asks for hat back
                 if ((Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE) && Message_ShouldAdvance(play)) {
                     Message_CloseTextbox(play);
 
                     switch (play->msgCtx.choiceIndex) {
                         case 0:
                             Message_ContinueTextbox(play, 0x40B2);
-                            D_80B7A688 = 1;
-                            D_80B7A68C = 0;
-                            this->unk_15C = 20;
+                            sOwnerHair = FS_OWNER_CAPPED;
+                            sIsOwnersHatHooked = false;
+                            this->stateAndTimer = 20;
                             break;
                         case 1:
-                            this->unk_15C = 0;
+                            this->stateAndTimer = 0;
                             break;
                     }
                 }
@@ -4918,77 +4995,77 @@ void Fishing_HandleOwnerDialog(Fishing* this, PlayState* play) {
 
                     switch (play->msgCtx.choiceIndex) {
                         case 0:
-                            if (D_80B7A670 == 0.0f) {
+                            if (sFishOnHandLength == 0.0f) {
                                 this->actor.textId = 0x408C;
-                                this->unk_15C = 20;
-                            } else if (D_80B7E07C == 0 && !IS_RANDO) {
-                                D_80B7A678 = D_80B7A670;
-                                if ((s16)D_80B7E078 < (s16)D_80B7A670) {
-                                    if (D_80B7E07E == 2) {
+                                this->stateAndTimer = 20;
+                            } else if (sFishOnHandIsLoach == 0 && !IS_RANDO) {
+                                sFishLengthToWeigh = sFishOnHandLength;
+                                if ((s16)sFishingRecordLength < (s16)sFishOnHandLength) {
+                                    if (sLureCaughtWith == FS_LURE_SINKING) {
                                         this->actor.textId = 0x40B0;
                                     } else {
                                         this->actor.textId = 0x4086;
                                     }
-                                    this->unk_15C = 11;
+                                    this->stateAndTimer = 11;
                                 } else {
                                     this->actor.textId = 0x408B;
-                                    this->unk_15C = 20;
+                                    this->stateAndTimer = 20;
                                 }
                             } else if (!IS_RANDO) {
                                 this->actor.textId = 0x409B;
-                                this->unk_15C = 11;
+                                this->stateAndTimer = 11;
                             }
                             else {
                                 this->actor.textId = 0x4086;
-                                this->unk_15C = 11;
+                                this->stateAndTimer = 11;
                             }
                             Message_ContinueTextbox(play, this->actor.textId);
                             break;
                         case 1:
-                            if (D_80B7A680 > 36000) {
-                                D_80B7A680 = 30000;
+                            if (sFishingTimePlayed > 36000) {
+                                sFishingTimePlayed = 30000;
                                 Message_ContinueTextbox(play, 0x4088);
                             } else {
-                                if (D_80B7E076 == 0) {
-                                    if (D_80B7E082 == 0) {
-                                        D_80B7E082++;
+                                if (sFishingFoggy == 0) {
+                                    if (sPondOwnerTextIdIndex == 0) {
+                                        sPondOwnerTextIdIndex++;
                                     }
                                 }
 
-                                if ((D_80B7E0B6 == 2) && (D_80B7AFB8[D_80B7E082] == 0x408D)) {
+                                if ((sLureEquipped == FS_LURE_SINKING) && (sPondOwnerTextIds[sPondOwnerTextIdIndex] == 0x408D)) {
                                     Message_ContinueTextbox(play, 0x40AF);
                                 } else {
-                                    Message_ContinueTextbox(play, D_80B7AFB8[D_80B7E082]);
+                                    Message_ContinueTextbox(play, sPondOwnerTextIds[sPondOwnerTextIdIndex]);
                                 }
 
-                                D_80B7E082++;
+                                sPondOwnerTextIdIndex++;
 
-                                if (sLinkAge != 1) {
-                                    if (D_80B7E082 >= 6) {
-                                        D_80B7E082 = 0;
+                                if (sLinkAge != LINK_AGE_CHILD) {
+                                    if (sPondOwnerTextIdIndex >= 6) {
+                                        sPondOwnerTextIdIndex = 0;
                                     }
                                 } else {
-                                    if (D_80B7E082 >= 4) {
-                                        D_80B7E082 = 0;
+                                    if (sPondOwnerTextIdIndex >= 4) {
+                                        sPondOwnerTextIdIndex = 0;
                                     }
                                 }
                             }
-                            this->unk_15C = 0;
+                            this->stateAndTimer = 0;
                             break;
                         case 2:
-                            if (D_80B7E084 == 0) {
+                            if (sFishesCaught == 0) {
                                 Message_ContinueTextbox(play, 0x4085);
-                            } else if (sLinkAge == 1) {
+                            } else if (sLinkAge == LINK_AGE_CHILD) {
                                 Message_ContinueTextbox(play, 0x4092);
                             }
-                            this->unk_15C = 22;
+                            this->stateAndTimer = 22;
                             break;
                     }
                 }
             }
             break;
 
-        case 11:
+        case 11: // collect prize, update record.
             if (((Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT) ||
                  (Message_GetState(&play->msgCtx) == TEXT_STATE_NONE)) &&
                 Message_ShouldAdvance(play)) {
@@ -4997,59 +5074,58 @@ void Fishing_HandleOwnerDialog(Fishing* this, PlayState* play) {
 
                 Message_CloseTextbox(play);
 
-                if (D_80B7E07C == 0) {
-                    D_80B7E078 = D_80B7A670;
-                    D_80B7A670 = 0.0f;
+                if (sFishOnHandIsLoach == 0) {
+                    sFishingRecordLength = sFishOnHandLength;
+                    sFishOnHandLength = 0.0f;
 
-                    if (sLinkAge == 1) {
+                    if (sLinkAge == LINK_AGE_CHILD) {
                         f32 temp;
 
                         HIGH_SCORE(HS_FISHING) &= 0xFFFFFF00;
-                        HIGH_SCORE(HS_FISHING) |= (s32)D_80B7E078 & 0x7F;
+                        HIGH_SCORE(HS_FISHING) |= (s32)sFishingRecordLength & HS_FISH_LENGTH_CHILD;
 
-                        temp = (HIGH_SCORE(HS_FISHING) & 0x7F000000) >> 0x18;
-                        if (temp < D_80B7E078) {
+                        temp = (HIGH_SCORE(HS_FISHING) & HS_FISH_LENGTH_ADULT) >> 0x18;
+                        if (temp < sFishingRecordLength) {
                             HIGH_SCORE(HS_FISHING) &= 0xFFFFFF;
-                            HIGH_SCORE(HS_FISHING) |= ((s32)D_80B7E078 & 0x7F) << 0x18;
+                            HIGH_SCORE(HS_FISHING) |= ((s32)sFishingRecordLength & HS_FISH_LENGTH_CHILD) << 0x18;
 
-                            if (D_80B7E07E == 2) {
-                                HIGH_SCORE(HS_FISHING) |= 0x80000000;
+                            if (sLureCaughtWith == FS_LURE_SINKING) {
+                                HIGH_SCORE(HS_FISHING) |= HS_FISH_CHEAT_ADULT;
                             }
                         }
 
-                        if (D_80B7E07E == 2) {
-                            HIGH_SCORE(HS_FISHING) |= 0x80;
-                            this->unk_15C = 0;
+                        if (sLureCaughtWith == FS_LURE_SINKING) {
+                            HIGH_SCORE(HS_FISHING) |= HS_FISH_CHEAT_CHILD;
+                            this->stateAndTimer = 0;
                             break;
                         }
                     } else {
                         HIGH_SCORE(HS_FISHING) &= 0xFFFFFF;
-                        HIGH_SCORE(HS_FISHING) |= ((s32)D_80B7E078 & 0x7F) << 0x18;
+                        HIGH_SCORE(HS_FISHING) |= ((s32)sFishingRecordLength & HS_FISH_LENGTH_CHILD) << 0x18;
 
-                        if (D_80B7E07E == 2) {
-                            HIGH_SCORE(HS_FISHING) |= 0x80000000;
-                            this->unk_15C = 0;
+                        if (sLureCaughtWith == FS_LURE_SINKING) {
+                            HIGH_SCORE(HS_FISHING) |= HS_FISH_CHEAT_ADULT;
+                            this->stateAndTimer = 0;
                             break;
                         }
                     }
 
-                    if (D_80B7E078 >= 60.0f) {
+                    if (sFishingRecordLength >= 60.0f) { // 13 lbs
                         getItemId = GI_RUPEE_PURPLE;
-                    } else if (D_80B7E078 >= 50.0f) {
+                    } else if (sFishingRecordLength >= 50.0f) { // 9 lbs
                         getItemId = GI_RUPEE_RED;
-                    } else if (D_80B7E078 >= 40.0f) {
+                    } else if (sFishingRecordLength >= 40.0f) { // 6 lbs
                         getItemId = GI_RUPEE_BLUE;
                     } else {
                         getItemId = GI_RUPEE_GREEN;
                     }
 
-                    if (sLinkAge == 1) {
-                        if (
-                            (!IS_RANDO && !(HIGH_SCORE(HS_FISHING) & 0x400)) ||
+                    if (sLinkAge == LINK_AGE_CHILD) { // 9 lbs
+                        if ((!IS_RANDO && !(HIGH_SCORE(HS_FISHING) & HS_FISH_PRIZE_CHILD)) ||
                             (IS_RANDO && !Flags_GetRandomizerInf(RAND_INF_CHILD_FISHING))
                         ) {
-                            if (D_80B7E078 >= Fishing_GetMinimumRequiredScore()) {
-                                HIGH_SCORE(HS_FISHING) |= 0x400;
+                            if (sFishingRecordLength >= Fishing_GetMinimumRequiredScore()) {
+                                HIGH_SCORE(HS_FISHING) |= HS_FISH_PRIZE_CHILD;
                                 Flags_SetRandomizerInf(RAND_INF_CHILD_FISHING);
                                 sSinkingLureLocation = (u8)Rand_ZeroFloat(3.999f) + 1;
                                 if (!IS_RANDO) {
@@ -5060,13 +5136,12 @@ void Fishing_HandleOwnerDialog(Fishing* this, PlayState* play) {
                                 }
                             }
                         }
-                    } else {
-                        if (
-                            (!IS_RANDO && !(HIGH_SCORE(HS_FISHING) & 0x800)) ||
+                    } else { // 13 lbs
+                        if ((!IS_RANDO && !(HIGH_SCORE(HS_FISHING) & HS_FISH_PRIZE_ADULT)) ||
                             (IS_RANDO && !Flags_GetRandomizerInf(RAND_INF_ADULT_FISHING))
                         ) {
-                            if (D_80B7E078 >= Fishing_GetMinimumRequiredScore()) {
-                                HIGH_SCORE(HS_FISHING) |= 0x800;
+                            if (sFishingRecordLength >= Fishing_GetMinimumRequiredScore()) {
+                                HIGH_SCORE(HS_FISHING) |= HS_FISH_PRIZE_ADULT;
                                 Flags_SetRandomizerInf(RAND_INF_ADULT_FISHING);
                                 sSinkingLureLocation = (u8)Rand_ZeroFloat(3.999f) + 1;
                                 if (!IS_RANDO) {
@@ -5080,7 +5155,7 @@ void Fishing_HandleOwnerDialog(Fishing* this, PlayState* play) {
                     }
                 } else {
                     getItemId = GI_RUPEE_PURPLE;
-                    D_80B7A670 = 0.0f;
+                    sFishOnHandLength = 0.0f; // doesn't record loach
                 }
 
                 this->actor.parent = NULL;
@@ -5089,14 +5164,14 @@ void Fishing_HandleOwnerDialog(Fishing* this, PlayState* play) {
                 } else {
                     GiveItemEntryFromActor(&this->actor, play, getItemEntry, 2000.0f, 1000.0f);
                 }
-                this->unk_15C = 23;
+                this->stateAndTimer = 23;
             }
             break;
 
         case 20:
             if ((Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(play)) {
                 Message_CloseTextbox(play);
-                this->unk_15C = 0;
+                this->stateAndTimer = 0;
             }
             break;
 
@@ -5106,15 +5181,15 @@ void Fishing_HandleOwnerDialog(Fishing* this, PlayState* play) {
 
                 switch (play->msgCtx.choiceIndex) {
                     case 0:
-                        this->unk_15C = 0;
+                        this->stateAndTimer = 0;
                         break;
                     case 1:
-                        if (D_80B7E084 == 0) {
+                        if (sFishesCaught == 0) {
                             Message_ContinueTextbox(play, 0x4085);
-                        } else if (sLinkAge == 1) {
+                        } else if (sLinkAge == LINK_AGE_CHILD) {
                             Message_ContinueTextbox(play, 0x4092);
                         }
-                        this->unk_15C = 22;
+                        this->stateAndTimer = 22;
                         break;
                 }
             }
@@ -5124,20 +5199,20 @@ void Fishing_HandleOwnerDialog(Fishing* this, PlayState* play) {
             if (play) {}
 
             if (Message_GetState(&play->msgCtx) == TEXT_STATE_NONE) {
-                this->unk_15C = 0;
-                if (D_80B7A68C != 0) {
-                    D_80B7A688 = 1;
-                    D_80B7A68C = 0;
+                this->stateAndTimer = 0;
+                if (sIsOwnersHatHooked) {
+                    sOwnerHair = FS_OWNER_CAPPED;
+                    sIsOwnersHatHooked = false;
                 }
-                D_80B7E0AC = 0;
+                sFishingPlayingState = 0;
                 play->interfaceCtx.unk_260 = 0;
             }
             break;
 
         case 23:
-            D_80B7A674 = false;
+            sIsRodVisible = false;
             if (Actor_HasParent(&this->actor, play)) {
-                this->unk_15C = 24;
+                this->stateAndTimer = 24;
             } else {
                 if (!IS_RANDO) {
                     func_8002F434(&this->actor, play, GI_SCALE_GOLD, 2000.0f, 1000.0f);
@@ -5149,41 +5224,41 @@ void Fishing_HandleOwnerDialog(Fishing* this, PlayState* play) {
             break;
 
         case 24:
-            D_80B7A674 = false;
+            sIsRodVisible = false;
             if (((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) ||
                 (IS_RANDO && GET_PLAYER(play)->getItemId == GI_ICE_TRAP)) {
-                if (D_80B7E07C == 0) {
-                    this->unk_15C = 0;
+                if (sFishOnHandIsLoach == 0) {
+                    this->stateAndTimer = 0;
                 } else {
                     Message_StartTextbox(play, 0x409C, NULL);
-                    this->unk_15C = 20;
+                    this->stateAndTimer = 20;
                 }
             }
             break;
     }
 }
 
-static s16 D_80B7AFC4[] = { 0, 1, 2, 2, 1 };
+static s16 sOwnerBlinkIndex[] = { 0, 1, 2, 2, 1 };
 
 static Vec3f sStreamSoundPos = { 670.0f, 0.0f, -600.0f };
 
 static Vec3s sSinkingLureLocationPos[] = {
-    { -364, -30, -269 },
-    { 1129, 3, -855 },
-    { -480, 0, -1055 },
-    { 553, -48, -508 },
+    { -364, -30, -269 }, // in the pond, log past the lilies.
+    { 1129, 3, -855 },   // rock next to stream
+    { -480, 0, -1055 },  // wall opposite of entrance
+    { 553, -48, -508 },  // tip of log beside 3 posts
 };
 
 void Fishing_UpdateOwner(Actor* thisx, PlayState* play2) {
     PlayState* play = play2;
     Fishing* this = (Fishing*)thisx;
-    Vec3f sp114;
-    Vec3f sp108;
-    Vec3f spFC;
+    Vec3f multiVecSrc;
+    Vec3f eyeTarget;
+    Vec3f lureDist;
     s16 headRotTarget;
     s16 playerShadowAlpha;
     f32 target;
-    f32 camAtFraction;
+    f32 subCamAtMaxVelFrac;
     f32 lureDistXZ;
     s32 pad;
     Player* player = GET_PLAYER(play);
@@ -5210,7 +5285,7 @@ void Fishing_UpdateOwner(Actor* thisx, PlayState* play2) {
 
     SkelAnime_Update(&this->skelAnime);
 
-    if ((D_80B7A684 != 0) || (Message_GetState(&play->msgCtx) != TEXT_STATE_NONE)) {
+    if ((sOwnerTheftTimer != 0) || (Message_GetState(&play->msgCtx) != TEXT_STATE_NONE)) {
         this->actor.flags &= ~ACTOR_FLAG_TARGETABLE;
     } else {
         this->actor.flags |= ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_DRAW_WHILE_CULLED;
@@ -5234,67 +5309,70 @@ void Fishing_UpdateOwner(Actor* thisx, PlayState* play2) {
         this->unk_162 = 4;
     }
 
-    this->unk_160 = D_80B7AFC4[this->unk_162];
+    this->unk_160 = sOwnerBlinkIndex[this->unk_162];
 
     if (this->unk_162 != 0) {
         this->unk_162--;
     }
 
-    if (D_80B7A684 != 0) {
-        D_80B7A684--;
+    if (sOwnerTheftTimer != 0) {
+        sOwnerTheftTimer--;
     }
 
-    if ((D_80B7A68C == 0) && (D_80B7E0B6 != 2) && (D_80B7A694 > 0) && (D_80B7A688 == 1) && (D_80B7A684 == 0)) {
+    // steal the owner's hat
+    if (!sIsOwnersHatHooked && (sLureEquipped != FS_LURE_SINKING) && (sRodCastState > 0) &&
+        (sOwnerHair == FS_OWNER_CAPPED) && (sOwnerTheftTimer == 0)) {
         f32 dx = sOwnerHeadPos.x - sLurePos.x;
         f32 dy = sOwnerHeadPos.y - sLurePos.y;
         f32 dz = sOwnerHeadPos.z - sLurePos.z;
 
         if ((sqrtf(SQ(dx) + SQ(dy) + SQ(dz)) < 25.0f) || (KREG(77) > 0)) {
             KREG(77) = 0;
-            D_80B7A688 = 0;
-            D_80B7A68C = 1;
+            sOwnerHair = FS_OWNER_BALD;
+            sIsOwnersHatHooked = true;
             Message_StartTextbox(play, 0x4087, NULL);
         }
     }
 
-    if (D_80B7A688 == 0) {
-        HIGH_SCORE(HS_FISHING) |= 0x1000;
-    } else if (D_80B7A688 == 1) {
-        HIGH_SCORE(HS_FISHING) &= ~0x1000;
+    // update hat flag.
+    if (sOwnerHair == FS_OWNER_BALD) {
+        HIGH_SCORE(HS_FISHING) |= HS_FISH_STOLE_HAT;
+    } else if (sOwnerHair == FS_OWNER_CAPPED) {
+        HIGH_SCORE(HS_FISHING) &= ~HS_FISH_STOLE_HAT;
     }
 
     if (KREG(77) < 0) {
         KREG(77) = 0;
-        D_80B7A690 = 1;
+        sIsOwnersHatSunk = true;
     }
 
-    if (D_80B7A67C != 0) {
-        D_80B7A67C--;
-        if (D_80B7A67C == 0) {
-            Message_StartTextbox(play, D_80B7E086, NULL);
+    if (sFishingCaughtTextDelay != 0) {
+        sFishingCaughtTextDelay--;
+        if (sFishingCaughtTextDelay == 0) {
+            Message_StartTextbox(play, sFishingCaughtTextId, NULL);
         }
     }
 
     Fishing_HandleOwnerDialog(this, play);
 
-    D_80B7E14C = 0.0015f;
-    D_80B7A680++;
+    sFishingLineScale = 0.0015f;
+    sFishingTimePlayed++;
 
-    if ((D_80B7E0AC != 0) && D_80B7A674) {
+    if ((sFishingPlayingState != 0) && sIsRodVisible) {
         Fishing_UpdateLure(this, play);
     }
 
     Fishing_UpdateEffects(play->specialEffects, play);
     Fishing_UpdatePondProps(play);
     Fishing_UpdateGroupFishes(play);
-
-    if ((D_80B7E0AC != 0) && (D_80B7A6CC == 0) && (player->actor.world.pos.z > 1360.0f) &&
+    // can't leave with the rod
+    if ((sFishingPlayingState != 0) && (sFishingPlayerCinematicState == 0) && (player->actor.world.pos.z > 1360.0f) &&
         (fabsf(player->actor.world.pos.x) < 25.0f)) {
         player->actor.world.pos.z = 1360.0f;
         player->actor.speedXZ = 0.0f;
 
-        if (D_80B7A6D0 == 0) {
-            D_80B7A6CC = 10;
+        if (sFishingCinematicTimer == 0) {
+            sFishingPlayerCinematicState = 10;
         }
     }
 
@@ -5303,7 +5381,7 @@ void Fishing_UpdateOwner(Actor* thisx, PlayState* play2) {
         (fabsf(player->actor.world.pos.y - sSinkingLureLocationPos[sSinkingLureLocation - 1].y) < 10.0f) &&
         (fabsf(player->actor.world.pos.z - sSinkingLureLocationPos[sSinkingLureLocation - 1].z) < 25.0f)) {
         sSinkingLureLocation = 0;
-        D_80B7A6CC = 20;
+        sFishingPlayerCinematicState = 20;
         func_800A9F6C(0.0f, 150, 10, 10);
         func_80078884(NA_SE_SY_TRE_BOX_APPEAR);
         Audio_QueueSeqCmd(0x1 << 28 | SEQ_PLAYER_BGM_MAIN << 24 | 0x1400FF);
@@ -5311,87 +5389,87 @@ void Fishing_UpdateOwner(Actor* thisx, PlayState* play2) {
 
     if (KREG(0) != 0) {
         KREG(0) = 0;
-        D_80B7E0B6 = 0;
-        D_80B7A6CC = 20;
+        sLureEquipped = FS_LURE_STOCK;
+        sFishingPlayerCinematicState = 20;
         func_800A9F6C(0.0f, 150, 10, 10);
         func_80078884(NA_SE_SY_TRE_BOX_APPEAR);
         Audio_QueueSeqCmd(0x1 << 28 | SEQ_PLAYER_BGM_MAIN << 24 | 0x1400FF);
     }
 
-    if (D_80B7A6D0 != 0) {
-        D_80B7A6D0--;
+    if (sFishingCinematicTimer != 0) {
+        sFishingCinematicTimer--;
     }
 
-    switch (D_80B7A6CC) {
+    switch (sFishingPlayerCinematicState) {
         case 0:
             break;
 
         case 1: {
-            Camera* camera;
+            Camera* mainCam;
 
-            sCameraId = Play_CreateSubCamera(play);
+            sSubCamId = Play_CreateSubCamera(play);
             Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT);
-            Play_ChangeCameraStatus(play, sCameraId, CAM_STAT_ACTIVE);
-            camera = Play_GetCamera(play, MAIN_CAM);
-            sCameraEye.x = camera->eye.x;
-            sCameraEye.y = camera->eye.y;
-            sCameraEye.z = camera->eye.z;
-            sCameraAt.x = camera->at.x;
-            sCameraAt.y = camera->at.y;
-            sCameraAt.z = camera->at.z;
-            D_80B7A6CC = 2;
+            Play_ChangeCameraStatus(play, sSubCamId, CAM_STAT_ACTIVE);
+            mainCam = Play_GetCamera(play, MAIN_CAM);
+            sCameraEye.x = mainCam->eye.x;
+            sCameraEye.y = mainCam->eye.y;
+            sCameraEye.z = mainCam->eye.z;
+            sCameraAt.x = mainCam->at.x;
+            sCameraAt.y = mainCam->at.y;
+            sCameraAt.z = mainCam->at.z;
+            sFishingPlayerCinematicState = 2;
             Interface_ChangeAlpha(12);
-            D_80B7FECC = 0.0f;
+            sSubCamVelFactor = 0.0f;
             // fallthrough
         }
 
         case 2:
             ShrinkWindow_SetVal(0x1B);
 
-            spFC.x = sLurePos.x - player->actor.world.pos.x;
-            spFC.z = sLurePos.z - player->actor.world.pos.z;
-            lureDistXZ = sqrtf(SQ(spFC.x) + SQ(spFC.z));
-            Matrix_RotateY(Math_Atan2F(spFC.z, spFC.x), MTXMODE_NEW);
+            lureDist.x = sLurePos.x - player->actor.world.pos.x;
+            lureDist.z = sLurePos.z - player->actor.world.pos.z;
+            lureDistXZ = sqrtf(SQ(lureDist.x) + SQ(lureDist.z));
+            Matrix_RotateY(Math_Atan2F(lureDist.z, lureDist.x), MTXMODE_NEW);
 
-            sp114.x = 0.0f;
-            sp114.y = 0.0f;
-            sp114.z = 100.0f;
-            Matrix_MultVec3f(&sp114, &spFC);
+            multiVecSrc.x = 0.0f;
+            multiVecSrc.y = 0.0f;
+            multiVecSrc.z = 100.0f;
+            Matrix_MultVec3f(&multiVecSrc, &lureDist);
 
-            if (D_80B7A694 == 1) {
-                camAtFraction = 0.2f;
+            if (sRodCastState == 1) {
+                subCamAtMaxVelFrac = 0.2f;
             } else {
-                camAtFraction = 0.1f;
+                subCamAtMaxVelFrac = 0.1f;
             }
 
-            Math_ApproachF(&sCameraAt.x, sLurePos.x, camAtFraction, fabsf(spFC.x) * D_80B7FECC);
-            Math_ApproachF(&sCameraAt.y, sLurePos.y, camAtFraction, 50.0f * D_80B7FECC);
-            Math_ApproachF(&sCameraAt.z, sLurePos.z, camAtFraction, fabsf(spFC.z) * D_80B7FECC);
+            Math_ApproachF(&sCameraAt.x, sLurePos.x, subCamAtMaxVelFrac, fabsf(lureDist.x) * sSubCamVelFactor);
+            Math_ApproachF(&sCameraAt.y, sLurePos.y, subCamAtMaxVelFrac, 50.0f * sSubCamVelFactor);
+            Math_ApproachF(&sCameraAt.z, sLurePos.z, subCamAtMaxVelFrac, fabsf(lureDist.z) * sSubCamVelFactor);
 
-            sp114.x = 0.0f - D_80B7FED0;
-            if (sLinkAge != 1) {
-                sp114.y = 80.0f;
+            multiVecSrc.x = 0.0f - D_80B7FED0;
+            if (sLinkAge != LINK_AGE_CHILD) {
+                multiVecSrc.y = 80.0f;
             } else {
-                sp114.y = 55.0f;
+                multiVecSrc.y = 55.0f;
             }
-            sp114.z = -80.0f;
+            multiVecSrc.z = -80.0f;
 
-            Matrix_MultVec3f(&sp114, &sp108);
-            sp108.x += player->actor.world.pos.x;
-            sp108.y += player->actor.world.pos.y;
-            sp108.z += player->actor.world.pos.z;
+            Matrix_MultVec3f(&multiVecSrc, &eyeTarget);
+            eyeTarget.x += player->actor.world.pos.x;
+            eyeTarget.y += player->actor.world.pos.y;
+            eyeTarget.z += player->actor.world.pos.z;
 
             Math_ApproachF(&D_80B7FED0, 30.0f, 0.1f, 0.4f);
 
-            if (CHECK_BTN_ALL(input->press.button, BTN_Z)) {
-                if ((D_80B7E088 >= 0) && (D_80B7E122 == 0)) {
-                    D_80B7E088++;
+            if (CHECK_BTN_ALL(input->press.button, BTN_Z)) { // zoom in/out from the lure
+                if ((sLureCameraZoomLevel >= 0) && (sLureBitTimer == 0)) {
+                    sLureCameraZoomLevel++;
 
-                    if (D_80B7E088 >= 4) {
-                        D_80B7E088 = 0;
+                    if (sLureCameraZoomLevel >= 4) {
+                        sLureCameraZoomLevel = 0;
                     }
 
-                    if ((D_80B7E088 == 0) || (D_80B7E088 == 3)) {
+                    if ((sLureCameraZoomLevel == 0) || (sLureCameraZoomLevel == 3)) {
                         func_80078884(NA_SE_SY_CAMERA_ZOOM_DOWN);
                     } else {
                         func_80078884(NA_SE_SY_CAMERA_ZOOM_UP);
@@ -5399,56 +5477,56 @@ void Fishing_UpdateOwner(Actor* thisx, PlayState* play2) {
                 }
             }
 
-            if (D_80B7A694 >= 3) {
+            if (sRodCastState >= 3) {
                 if (lureDistXZ < 110.0f) {
-                    D_80B7E088 = -1;
-                } else if ((lureDistXZ > 300.0f) && (D_80B7E088 < 0)) {
-                    D_80B7E088 = 0;
+                    sLureCameraZoomLevel = -1;
+                } else if ((lureDistXZ > 300.0f) && (sLureCameraZoomLevel < 0)) {
+                    sLureCameraZoomLevel = 0;
                 }
             }
 
-            if (D_80B7E088 > 0) {
+            if (sLureCameraZoomLevel > 0) {
                 f32 dist;
                 f32 offset;
                 f32 factor;
 
-                dist = sqrtf(SQ(spFC.x) + SQ(spFC.z)) * 0.001f;
+                dist = sqrtf(SQ(lureDist.x) + SQ(lureDist.z)) * 0.001f;
                 if (dist > 1.0f) {
                     dist = 1.0f;
                 }
-                if (D_80B7E088 == 2) {
+                if (sLureCameraZoomLevel == 2) {
                     offset = 0.3f;
                 } else {
                     offset = 0.1f;
                 }
                 factor = 0.4f + offset + (dist * 0.4f);
 
-                sp108.x += (sLurePos.x - sp108.x) * factor;
-                sp108.y += ((sLurePos.y - sp108.y) * factor) + 20.0f;
-                sp108.z += (sLurePos.z - sp108.z) * factor;
-                D_80B7E14C = 0.0005000001f;
+                eyeTarget.x += (sLurePos.x - eyeTarget.x) * factor;
+                eyeTarget.y += ((sLurePos.y - eyeTarget.y) * factor) + 20.0f;
+                eyeTarget.z += (sLurePos.z - eyeTarget.z) * factor;
+                sFishingLineScale = 0.0005000001f;
             }
 
-            sp114.x = 0.0f;
-            sp114.y = 0.0f;
-            sp114.z = 100.0f;
-            Matrix_MultVec3f(&sp114, &spFC);
+            multiVecSrc.x = 0.0f;
+            multiVecSrc.y = 0.0f;
+            multiVecSrc.z = 100.0f;
+            Matrix_MultVec3f(&multiVecSrc, &lureDist);
 
-            Math_ApproachF(&sCameraEye.x, sp108.x, 0.3f, fabsf(spFC.x) * D_80B7FECC);
-            Math_ApproachF(&sCameraEye.y, sp108.y, 0.3f, 20.0f * D_80B7FECC);
-            Math_ApproachF(&sCameraEye.z, sp108.z, 0.3f, fabsf(spFC.z) * D_80B7FECC);
+            Math_ApproachF(&sCameraEye.x, eyeTarget.x, 0.3f, fabsf(lureDist.x) * sSubCamVelFactor);
+            Math_ApproachF(&sCameraEye.y, eyeTarget.y, 0.3f, 20.0f * sSubCamVelFactor);
+            Math_ApproachF(&sCameraEye.z, eyeTarget.z, 0.3f, fabsf(lureDist.z) * sSubCamVelFactor);
             break;
 
         case 3: {
-            Camera* camera = Play_GetCamera(play, MAIN_CAM);
+            Camera* mainCam = Play_GetCamera(play, MAIN_CAM);
 
-            camera->eye = sCameraEye;
-            camera->eyeNext = sCameraEye;
-            camera->at = sCameraAt;
-            func_800C08AC(play, sCameraId, 0);
+            mainCam->eye = sCameraEye;
+            mainCam->eyeNext = sCameraEye;
+            mainCam->at = sCameraAt;
+            func_800C08AC(play, sSubCamId, 0);
             func_80064534(play, &play->csCtx);
-            D_80B7A6CC = 0;
-            sCameraId = 0;
+            sFishingPlayerCinematicState = 0;
+            sSubCamId = 0;
             Environment_EnableUnderwaterLights(play, 0);
             play->envCtx.adjFogNear = 0;
             player->unk_860 = -5;
@@ -5456,23 +5534,23 @@ void Fishing_UpdateOwner(Actor* thisx, PlayState* play2) {
             break;
         }
 
-        case 10: {
-            Camera* camera;
+        case 10: { // owner tells you to return the rod.
+            Camera* mainCam;
 
             func_80064520(play, &play->csCtx);
-            sCameraId = Play_CreateSubCamera(play);
+            sSubCamId = Play_CreateSubCamera(play);
             Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT);
-            Play_ChangeCameraStatus(play, sCameraId, CAM_STAT_ACTIVE);
+            Play_ChangeCameraStatus(play, sSubCamId, CAM_STAT_ACTIVE);
             func_8002DF54(play, &this->actor, 5);
-            camera = Play_GetCamera(play, MAIN_CAM);
-            sCameraEye.x = camera->eye.x;
-            sCameraEye.y = camera->eye.y;
-            sCameraEye.z = camera->eye.z;
-            sCameraAt.x = camera->at.x;
-            sCameraAt.y = camera->at.y;
-            sCameraAt.z = camera->at.z;
+            mainCam = Play_GetCamera(play, MAIN_CAM);
+            sCameraEye.x = mainCam->eye.x;
+            sCameraEye.y = mainCam->eye.y;
+            sCameraEye.z = mainCam->eye.z;
+            sCameraAt.x = mainCam->at.x;
+            sCameraAt.y = mainCam->at.y;
+            sCameraAt.z = mainCam->at.z;
             Message_StartTextbox(play, 0x409E, NULL);
-            D_80B7A6CC = 11;
+            sFishingPlayerCinematicState = 11;
             func_800A9F6C(0.0f, 150, 10, 10);
             // fallthrough
         }
@@ -5482,124 +5560,124 @@ void Fishing_UpdateOwner(Actor* thisx, PlayState* play2) {
             player->actor.speedXZ = 0.0f;
 
             if (Message_GetState(&play->msgCtx) == TEXT_STATE_NONE) {
-                Camera* camera = Play_GetCamera(play, MAIN_CAM);
+                Camera* mainCam = Play_GetCamera(play, MAIN_CAM);
 
-                camera->eye = sCameraEye;
-                camera->eyeNext = sCameraEye;
-                camera->at = sCameraAt;
-                func_800C08AC(play, sCameraId, 0);
+                mainCam->eye = sCameraEye;
+                mainCam->eyeNext = sCameraEye;
+                mainCam->at = sCameraAt;
+                func_800C08AC(play, sSubCamId, 0);
                 func_80064534(play, &play->csCtx);
                 func_8002DF54(play, &this->actor, 7);
-                D_80B7A6CC = 0;
-                sCameraId = 0;
-                D_80B7A6D0 = 30;
+                sFishingPlayerCinematicState = 0;
+                sSubCamId = 0;
+                sFishingCinematicTimer = 30;
                 Environment_EnableUnderwaterLights(play, 0);
                 play->envCtx.adjFogNear = 0;
             }
             break;
 
-        case 20: {
-            Camera* camera;
+        case 20: { // found the sinking lure
+            Camera* mainCam;
 
             func_80064520(play, &play->csCtx);
-            sCameraId = Play_CreateSubCamera(play);
+            sSubCamId = Play_CreateSubCamera(play);
             Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT);
-            Play_ChangeCameraStatus(play, sCameraId, CAM_STAT_ACTIVE);
+            Play_ChangeCameraStatus(play, sSubCamId, CAM_STAT_ACTIVE);
             func_8002DF54(play, &this->actor, 5);
-            camera = Play_GetCamera(play, MAIN_CAM);
-            sCameraEye.x = camera->eye.x;
-            sCameraEye.y = camera->eye.y;
-            sCameraEye.z = camera->eye.z;
-            sCameraAt.x = camera->at.x;
-            sCameraAt.y = camera->at.y;
-            sCameraAt.z = camera->at.z;
+            mainCam = Play_GetCamera(play, MAIN_CAM);
+            sCameraEye.x = mainCam->eye.x;
+            sCameraEye.y = mainCam->eye.y;
+            sCameraEye.z = mainCam->eye.z;
+            sCameraAt.x = mainCam->at.x;
+            sCameraAt.y = mainCam->at.y;
+            sCameraAt.z = mainCam->at.z;
             Message_StartTextbox(play, 0x409A, NULL);
-            D_80B7A6CC = 21;
-            D_80B7FEC8 = 45.0f;
-            D_80B7A6D0 = 10;
+            sFishingPlayerCinematicState = 21;
+            sCatchCamX = 45.0f;
+            sFishingCinematicTimer = 10;
             // fallthrough
         }
 
         case 21:
-            if ((D_80B7A6D0 == 0) && Message_ShouldAdvance(play)) {
-                D_80B7A6CC = 22;
-                D_80B7A6D0 = 40;
+            if ((sFishingCinematicTimer == 0) && Message_ShouldAdvance(play)) {
+                sFishingPlayerCinematicState = 22;
+                sFishingCinematicTimer = 40;
                 func_8002DF54(play, &this->actor, 0x1C);
-                D_80B7FEE4 = 0.0f;
+                sSinkingLureHeldY = 0.0f;
             }
             break;
 
         case 22:
-            if (D_80B7A6D0 == 30) {
+            if (sFishingCinematicTimer == 30) {
                 Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_ITEM_GET | 0x900);
             }
 
-            D_80B7A6D4 = 1;
+            sSinkingLureFound = 1;
 
-            Math_ApproachF(&D_80B7FEE4, 71.0f, 0.5f, 3.0f);
+            Math_ApproachF(&sSinkingLureHeldY, 71.0f, 0.5f, 3.0f);
             Matrix_RotateY((player->actor.shape.rot.y / 32768.0f) * M_PI, MTXMODE_NEW);
 
-            sp114.x = Math_SinS(play->gameplayFrames * 0x1000);
-            sp114.y = D_80B7FEE4;
-            sp114.z = -5.0f;
-            if (sLinkAge == 1) {
-                sp114.y -= 20.0f;
+            multiVecSrc.x = Math_SinS(play->gameplayFrames * 0x1000);
+            multiVecSrc.y = sSinkingLureHeldY;
+            multiVecSrc.z = -5.0f;
+            if (sLinkAge == LINK_AGE_CHILD) {
+                multiVecSrc.y -= 20.0f;
             }
 
-            Matrix_MultVec3f(&sp114, &sp108);
+            Matrix_MultVec3f(&multiVecSrc, &eyeTarget);
 
-            sSinkingLureBasePos.x = player->actor.world.pos.x + sp108.x;
-            sSinkingLureBasePos.y = player->actor.world.pos.y + sp108.y;
-            sSinkingLureBasePos.z = player->actor.world.pos.z + sp108.z;
+            sSinkingLureBasePos.x = player->actor.world.pos.x + eyeTarget.x;
+            sSinkingLureBasePos.y = player->actor.world.pos.y + eyeTarget.y;
+            sSinkingLureBasePos.z = player->actor.world.pos.z + eyeTarget.z;
 
-            Math_ApproachF(&D_80B7FEC8, 15.0f, 0.1f, 0.75f);
+            Math_ApproachF(&sCatchCamX, 15.0f, 0.1f, 0.75f);
 
-            sp114.x = D_80B7FEC8 - 15.0f;
+            multiVecSrc.x = sCatchCamX - 15.0f;
 
-            if (sLinkAge != 1) {
-                sp114.y = 60.0f;
-                sp114.z = -30.0f;
+            if (sLinkAge != LINK_AGE_CHILD) {
+                multiVecSrc.y = 60.0f;
+                multiVecSrc.z = -30.0f;
             } else {
-                sp114.y = 40.0f;
-                sp114.z = -35.0f;
+                multiVecSrc.y = 40.0f;
+                multiVecSrc.z = -35.0f;
             }
 
-            Matrix_MultVec3f(&sp114, &sCameraEye);
+            Matrix_MultVec3f(&multiVecSrc, &sCameraEye);
             sCameraEye.x += player->actor.world.pos.x;
             sCameraEye.y += player->actor.world.pos.y;
             sCameraEye.z += player->actor.world.pos.z;
 
             sCameraAt = player->actor.world.pos;
-            if (sLinkAge != 1) {
+            if (sLinkAge != LINK_AGE_CHILD) {
                 sCameraAt.y += 62.0f;
             } else {
                 sCameraAt.y += 40.0f;
             }
 
-            if (D_80B7A6D0 == 0) {
+            if (sFishingCinematicTimer == 0) {
                 if ((Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE) ||
                     (Message_GetState(&play->msgCtx) == TEXT_STATE_NONE)) {
                     if (Message_ShouldAdvance(play)) {
-                        Camera* camera = Play_GetCamera(play, MAIN_CAM);
+                        Camera* mainCam = Play_GetCamera(play, MAIN_CAM);
 
                         Message_CloseTextbox(play);
                         if (play->msgCtx.choiceIndex == 0) {
-                            D_80B7E0B6 = 2;
-                            D_80B7E082 = 0;
+                            sLureEquipped = FS_LURE_SINKING;
+                            sPondOwnerTextIdIndex = 0;
                         }
 
-                        camera->eye = sCameraEye;
-                        camera->eyeNext = sCameraEye;
-                        camera->at = sCameraAt;
-                        func_800C08AC(play, sCameraId, 0);
+                        mainCam->eye = sCameraEye;
+                        mainCam->eyeNext = sCameraEye;
+                        mainCam->at = sCameraAt;
+                        func_800C08AC(play, sSubCamId, 0);
                         func_80064534(play, &play->csCtx);
                         func_8002DF54(play, &this->actor, 7);
-                        D_80B7A6CC = 0;
-                        sCameraId = 0;
+                        sFishingPlayerCinematicState = 0;
+                        sSubCamId = 0;
                         player->unk_860 = -5;
                         D_80B7E0B0 = 5;
-                        D_80B7A6D4 = 0;
-                        D_80B7E0A6 = 20;
+                        sSinkingLureFound = false;
+                        sFishingMusicDelay = 20;
                         Environment_EnableUnderwaterLights(play, 0);
                         play->envCtx.adjFogNear = 0;
                     }
@@ -5611,13 +5689,13 @@ void Fishing_UpdateOwner(Actor* thisx, PlayState* play2) {
             break;
     }
 
-    if (sCameraId != 0) {
-        Play_CameraSetAtEye(play, sCameraId, &sCameraAt, &sCameraEye);
-        Math_ApproachF(&D_80B7FECC, 1.0f, 1.0f, 0.02f);
+    if (sSubCamId != 0) {
+        Play_CameraSetAtEye(play, sSubCamId, &sCameraAt, &sCameraEye);
+        Math_ApproachF(&sSubCamVelFactor, 1.0f, 1.0f, 0.02f);
 
         if (sCameraEye.y <= (WATER_SURFACE_Y(play) + 1.0f)) {
             Environment_EnableUnderwaterLights(play, 1);
-            if (D_80B7E076 != 0) {
+            if (sFishingFoggy != 0) {
                 play->envCtx.adjFogNear = -0xB2;
             } else {
                 play->envCtx.adjFogNear = -0x2E;
@@ -5666,15 +5744,15 @@ void Fishing_UpdateOwner(Actor* thisx, PlayState* play2) {
     }
 
     if (sREG(15) != 0) {
-        if (D_80B7A654 != (sREG(15) - 1)) {
-            if (D_80B7A654 == 0) {
+        if (sStormStrengthTarget != (sREG(15) - 1)) {
+            if (sStormStrengthTarget == 0) {
                 play->envCtx.gloomySkyMode = 1;
             } else {
                 play->envCtx.gloomySkyMode = 2;
             }
         }
 
-        D_80B7A654 = sREG(15) - 1;
+        sStormStrengthTarget = sREG(15) - 1;
     }
 
     if (sREG(14) == 1) {
@@ -5690,55 +5768,55 @@ void Fishing_UpdateOwner(Actor* thisx, PlayState* play2) {
     osSyncPrintf("zelda_time %x\n", ((void)0, gSaveContext.dayTime));
     osSyncPrintf(VT_RST);
 
-    if (D_80B7E077 >= 2) {
-        D_80B7E077--;
+    if (sStormChanceTimer >= 2) {
+        sStormChanceTimer--;
     }
 
-    if ((D_80B7E077 == 1) && (Message_GetState(&play->msgCtx) == TEXT_STATE_NONE) &&
-        ((D_80B7A680 & 0xFFF) == 0xFFF)) {
-        D_80B7E077 = 200;
+    if ((sStormChanceTimer == 1) && (Message_GetState(&play->msgCtx) == TEXT_STATE_NONE) &&
+        ((sFishingTimePlayed & 0xFFF) == 0xFFF)) {
+        sStormChanceTimer = 200;
 
         if (Rand_ZeroOne() < 0.5f) {
-            D_80B7A654 = (u8)Rand_ZeroFloat(10.0f) + 5;
+            sStormStrengthTarget = (u8)Rand_ZeroFloat(10.0f) + 5;
             play->envCtx.gloomySkyMode = 1;
         } else {
-            D_80B7A654 = 0;
+            sStormStrengthTarget = 0;
             play->envCtx.gloomySkyMode = 2;
         }
     }
 
-    Math_ApproachF(&D_80B7A650, D_80B7A654, 1.0f, 0.05f);
+    Math_ApproachF(&sStormStrength, sStormStrengthTarget, 1.0f, 0.05f);
 
-    if (D_80B7A650 > 0.0f) {
-        target = (D_80B7A650 * 0.03f) + 0.8f;
+    if (sStormStrength > 0.0f) {
+        target = (sStormStrength * 0.03f) + 0.8f;
         if (target > 1.2f) {
             target = 1.2f;
         }
-        Math_ApproachF(&D_80B7A668, target, 1.0f, 0.01f);
+        Math_ApproachF(&sStormSfxFreqScale, target, 1.0f, 0.01f);
     }
 
-    target = (10.0f - D_80B7A650) * 150.1f;
+    target = (10.0f - sStormStrength) * 150.1f;
     if (target < 0.0f) {
         target = 0.0f;
     }
-    Math_ApproachF(&D_80B7A65C.z, target, 1.0f, 5.0f);
+    Math_ApproachF(&sFishingStormSfxPos.z, target, 1.0f, 5.0f);
 
-    if (D_80B7A65C.z < 1500.0f) {
-        func_800F436C(&D_80B7A65C, NA_SE_EV_RAIN - SFX_FLAG, D_80B7A668);
+    if (sFishingStormSfxPos.z < 1500.0f) {
+        func_800F436C(&sFishingStormSfxPos, NA_SE_EV_RAIN - SFX_FLAG, sStormSfxFreqScale);
     }
 
-    if (D_80B7A654 != 0) {
-        Math_ApproachF(&D_80B7A658, -200.0f, 1.0f, 2.0f);
+    if (sStormStrengthTarget != 0) {
+        Math_ApproachF(&sFishingStormShade, -200.0f, 1.0f, 2.0f);
     } else {
-        Math_ApproachZeroF(&D_80B7A658, 1.0f, 2.0f);
+        Math_ApproachZeroF(&sFishingStormShade, 1.0f, 2.0f);
     }
 
     play->envCtx.adjLight1Color[0] = play->envCtx.adjLight1Color[1] = play->envCtx.adjLight1Color[2] =
-        D_80B7A658;
+        sFishingStormShade;
 
-    if ((u8)D_80B7A650 > 0) {
+    if ((u8)sStormStrength > 0) {
         s32 pad;
-        Camera* camera = Play_GetCamera(play, MAIN_CAM);
+        Camera* mainCam = Play_GetCamera(play, MAIN_CAM);
         s16 i;
         s32 pad1;
         Vec3f pos;
@@ -5748,9 +5826,9 @@ void Fishing_UpdateOwner(Actor* thisx, PlayState* play2) {
 
         rot.x = M_PI / 2.0f + 0.1f;
         rot.y = 1.0f;
-        rot.z = (Camera_GetInputDirYaw(camera) * -(M_PI / 32768)) + rot.y;
+        rot.z = (Camera_GetInputDirYaw(mainCam) * -(M_PI / 32768)) + rot.y;
 
-        for (i = 0; i < (u8)D_80B7A650; i++) {
+        for (i = 0; i < (u8)sStormStrength; i++) {
             pos.x = Rand_CenteredFloat(700.0f) + play->view.eye.x;
             pos.y = (Rand_ZeroFloat(100.0f) + 150.0f) - 170.0f;
             pos.z = Rand_CenteredFloat(700.0f) + play->view.eye.z;
@@ -5772,7 +5850,7 @@ void Fishing_UpdateOwner(Actor* thisx, PlayState* play2) {
 
     func_80078914(&sStreamSoundProjectedPos, NA_SE_EV_WATER_WALL - SFX_FLAG);
 
-    gSaveContext.minigameScore = (SQ((f32)D_80B7A678) * 0.0036f) + 0.5f;
+    gSaveContext.minigameScore = (SQ((f32)sFishLengthToWeigh) * 0.0036f) + 0.5f;
 
     if (BREG(26) != 0) {
         BREG(26) = 0;
@@ -5798,9 +5876,9 @@ void Fishing_OwnerPostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3
         OPEN_DISPS(play->state.gfxCtx);
         Matrix_MultVec3f(&sZeroVec, &sOwnerHeadPos);
 
-        if (D_80B7A688 == 1) {
+        if (sOwnerHair == FS_OWNER_CAPPED) {
             gSPDisplayList(POLY_OPA_DISP++, SEGMENTED_TO_VIRTUAL(gFishingOwnerHatDL));
-        } else if (D_80B7A688 == 2) {
+        } else if (sOwnerHair == FS_OWNER_HAIR) {
             gSPDisplayList(POLY_OPA_DISP++, SEGMENTED_TO_VIRTUAL(gFishingOwnerHairDL));
         }
 
@@ -5837,17 +5915,17 @@ void Fishing_DrawOwner(Actor* thisx, PlayState* play) {
     Fishing_DrawGroupFishes(play);
     Fishing_DrawStreamSplash(play);
 
-    if (D_80B7E0A6 != 0) {
-        D_80B7E0A6--;
+    if (sFishingMusicDelay != 0) {
+        sFishingMusicDelay--;
 
-        if (D_80B7E0A6 == 0) {
-            if (sLinkAge != 1) {
+        if (sFishingMusicDelay == 0) {
+            if (sLinkAge != LINK_AGE_CHILD) {
                 Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_KAKARIKO_ADULT);
             } else {
                 Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_KAKARIKO_KID);
             }
 
-            if (sLinkAge != 1) {
+            if (sLinkAge != LINK_AGE_CHILD) {
                 Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_KAKARIKO_ADULT);
             } else {
                 Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_KAKARIKO_KID);
@@ -5855,17 +5933,17 @@ void Fishing_DrawOwner(Actor* thisx, PlayState* play) {
         }
     }
 
-    if ((D_80B7E0AC != 0) && D_80B7A674) {
+    if ((sFishingPlayingState != 0) && sIsRodVisible) {
         Fishing_DrawRod(play);
         Fishing_UpdateLinePos(sReelLinePos);
         Fishing_UpdateLine(play, &sRodTipPos, sReelLinePos, sReelLineRot, sReelLineUnk);
         Fishing_DrawLureAndLine(play, sReelLinePos, sReelLineRot);
 
-        D_80B7A6C4 = input->rel.stick_x;
-        D_80B7A6C8 = input->rel.stick_y;
+        sStickAdjXPrev = input->rel.stick_x;
+        sStickAdjYPrev = input->rel.stick_y;
     }
 
-    D_80B7A674 = true;
+    sIsRodVisible = true;
 
     Matrix_Translate(130.0f, 40.0f, 1300.0f, MTXMODE_NEW);
     Matrix_Scale(0.08f, 0.12f, 0.14f, MTXMODE_APPLY);
@@ -5878,7 +5956,7 @@ void Fishing_DrawOwner(Actor* thisx, PlayState* play) {
     gSPDisplayList(POLY_OPA_DISP++, gFishingAquariumBottomDL);
     gSPDisplayList(POLY_XLU_DISP++, gFishingAquariumContainerDL);
 
-    if ((D_80B7E0AC != 0) && (D_80B7E0B6 == 2)) {
+    if ((sFishingPlayingState != 0) && (sLureEquipped == 2)) {
         Fishing_DrawSinkingLure(play);
     }
 
@@ -5888,6 +5966,6 @@ void Fishing_DrawOwner(Actor* thisx, PlayState* play) {
 void Fishing_Reset(void) {
     // Reset static variables for fishing camera and cinematic state to prevent crashing when dying
     // or re-entering the scene while the fishing rod was cast
-    sCameraId = 0;
-    D_80B7A6CC = 0;
+    sSubCamId = 0;
+    sFishingPlayerCinematicState = 0;
 }
diff --git a/soh/src/overlays/actors/ovl_Fishing/z_fishing.h b/soh/src/overlays/actors/ovl_Fishing/z_fishing.h
index f83416834..b128c71a5 100644
--- a/soh/src/overlays/actors/ovl_Fishing/z_fishing.h
+++ b/soh/src/overlays/actors/ovl_Fishing/z_fishing.h
@@ -3,61 +3,65 @@
 
 #include <libultraship/libultra.h>
 #include "global.h"
+#include "soh/Enhancements/randomizer/fishsanity.h"
 
 struct Fishing;
 
 typedef struct Fishing {
     /* 0x0000 */ Actor actor;
     /* 0x014C */ char unk_14C[0x004];
-    /* 0x0150 */ u8 unk_150;
-    /* 0x0151 */ u8 unk_151;
+    /* 0x0150 */ u8 isLoach;
+    /* 0x0151 */ u8 lilyTimer; // if near lily and >0, lily moves. Move more if >20
     /* 0x0152 */ u8 unk_152;
     /* 0x0154 */ s16 unk_154;
     /* 0x0156 */ u8 unk_156;
     /* 0x0157 */ u8 unk_157;
-    /* 0x0158 */ s16 unk_158;
-    /* 0x015A */ s16 unk_15A;
-    /* 0x015C */ s16 unk_15C;
+    /* 0x0158 */ s16 fishState;  // negative index for loach behavior
+    /* 0x015A */ s16 fishStateNext;
+    /* 0x015C */ s16 stateAndTimer; // fish use as timer that's AND'd, owner as talking state
     /* 0x015E */ s16 unk_15E;
-    /* 0x0160 */ s16 unk_160;
-    /* 0x0162 */ s16 unk_162;
-    /* 0x0164 */ s16 unk_164;
-    /* 0x0166 */ s16 unk_166;
-    /* 0x0168 */ s16 unk_168;
-    /* 0x016A */ s16 unk_16A;
-    /* 0x016C */ s16 unk_16C;
+    /* 0x0160 */ s16 unk_160; // fish use as rotateX, owner as index of eye texture
+    /* 0x0162 */ s16 unk_162; // fish use as rotateY, owner as index of eye texture
+    /* 0x0164 */ s16 unk_164; // fish use as rotateZ, owner as rotation of head
+    /* 0x0166 */ Vec3s rotationTarget;
+    /* 0x016C */ s16 fishLimb23RotYDelta;
     /* 0x016E */ s16 unk_16E;
-    /* 0x0170 */ s16 unk_170;
-    /* 0x0172 */ s16 unk_172;
-    /* 0x0174 */ s16 unk_174;
-    /* 0x0176 */ s16 unk_176;
+    /* 0x0170 */ s16 fishLimbDRotZDelta;
+    /* 0x0172 */ s16 fishLimbEFRotYDelta;
+    /* 0x0174 */ s16 fishLimb89RotYDelta;
+    /* 0x0176 */ s16 fishLimb4RotYDelta;
     /* 0x0178 */ s16 unk_178;
-    /* 0x017A */ s16 unk_17A[4];
+    /* 0x017A */ s16 timerArray[4];
     /* 0x0184 */ f32 unk_184;
-    /* 0x0188 */ f32 unk_188;
-    /* 0x018C */ f32 unk_18C;
-    /* 0x0190 */ f32 unk_190;
-    /* 0x0194 */ f32 unk_194;
-    /* 0x0198 */ f32 unk_198;
-    /* 0x019C */ f32 unk_19C;
-    /* 0x01A0 */ s16 unk_1A0;
-    /* 0x01A2 */ s16 unk_1A2;
-    /* 0x01A4 */ s16 unk_1A4;
-    /* 0x01A8 */ f32 unk_1A8;
-    /* 0x01AC */ f32 unk_1AC;
-    /* 0x01B0 */ f32 unk_1B0;
-    /* 0x01B4 */ Vec3f unk_1B4;
+    /* 0x0188 */ f32 speedTarget;
+    /* 0x018C */ f32 fishLimbRotPhase;
+    /* 0x0190 */ f32 unk_190; // fishLimbRotPhaseStep target
+    /* 0x0194 */ f32 unk_194; // fishLimbRotPhaseMag target
+    /* 0x0198 */ f32 fishLimbRotPhaseStep;
+    /* 0x019C */ f32 fishLimbRotPhaseMag;
+    /* 0x01A0 */ s16 bumpTimer; // set when hitting a wall.
+    /* 0x01A2 */ s16 unk_1A2; // "scared" timer?
+    /* 0x01A4 */ s16 unk_1A4; // "scared" timer? set at same time as above
+    /* 0x01A8 */ f32 perception; // how easily they are drawn to the lure.
+    /* 0x01AC */ f32 fishLength; // fish are (x^2*.0036+.5) lbs, loach double that.
+    /* 0x01B0 */ f32 rotationStep;
+    /* 0x01B4 */ Vec3f fishTargetPos;
     /* 0x01C0 */ Vec3f fishMouthPos;
-    /* 0x01CC */ s16 unk_1CC[3];
-    /* 0x01D2 */ u8 unk_1D2;
-    /* 0x01D3 */ u8 unk_1D3;
-    /* 0x01D4 */ u8 unk_1D4;
-    /* 0x01D5 */ u8 unk_1D5;
+    /* 0x01CC */ s16 loachRotYDelta[3]; // adds rotation to the loach limb 3-5.
+    /* 0x01D2 */ u8 bubbleTime; // spawn bubbles while >0
+    /* 0x01D3 */ u8 isAquariumMessage;
+    /* 0x01D4 */ u8 aquariumWaitTimer;
+    /* 0x01D5 */ u8 keepState; // case-switch and keeping or releasing a fish
     /* 0x01D8 */ SkelAnime skelAnime;
     /* 0x021C */ LightNode* lightNode;
     /* 0x0220 */ LightInfo lightInfo;
     /* 0x0230 */ ColliderJntSph collider;
     /* 0x0250 */ ColliderJntSphElement colliderElements[12];
+    /*        */ s16 fishsanityParams;
 } Fishing; // size = 0x0550
 
+#define EN_FISH_OWNER 1      // param for owner of pond. default if params<100
+#define EN_FISH_PARAM 100    // param base for fish in pond.
+#define EN_FISH_AQUARIUM 200 // param for record fish in tank.
+
 #endif
diff --git a/soh/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c b/soh/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c
index 2f5cf4ee3..bbe5bd0aa 100644
--- a/soh/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c
+++ b/soh/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c
@@ -193,7 +193,7 @@ void ObjMure_SpawnActors1(ObjMure* this, PlayState* play) {
         this->children[i] = Actor_Spawn(ac, play, sSpawnActorIds[this->type], spawnPos.x, spawnPos.y, spawnPos.z,
                                         actor->world.rot.x, actor->world.rot.y, actor->world.rot.z,
                                         (this->type == 4 && i == 0) ? 1 : sSpawnParams[this->type], true);
-        if (this->children[i] != NULL) {
+        if (this->children[i] != NULL && this->children[i]->update != NULL) {
             this->childrenStates[i] = OBJMURE_CHILD_STATE_0;
             this->children[i]->room = actor->room;
         } else {
diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c
index 82a600bee..279aa50e3 100644
--- a/soh/src/overlays/actors/ovl_player_actor/z_player.c
+++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c
@@ -29,6 +29,7 @@
 #include "soh/Enhancements/enhancementTypes.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/Enhancements/randomizer/randomizer_grotto.h"
+#include "soh/Enhancements/randomizer/fishsanity.h"
 #include "soh/frame_interpolation.h"
 
 #include <string.h>
@@ -13658,14 +13659,41 @@ void func_8084ECA4(Player* this, PlayState* play) {
     struct_80854554* sp24;
     BottleCatchInfo* catchInfo;
     s32 temp;
-    s32 i;
+    s32 i, j;
+    FishIdentity fish;
+    GetItemEntry gi = GET_ITEM_NONE;
+    RandomizerCheck rc = RC_UNKNOWN_CHECK;
+    u8 catchId;
 
-    sp24 = &D_80854554[this->unk_850];
     func_8083721C(this);
 
+    // TODO: Rework the bottle rando code in vanilla behavior overhaul
     if (LinkAnimation_Update(play, &this->skelAnime)) {
         if (this->unk_84F != 0) {
-            if (this->unk_850 == 0) {
+            if (IS_RANDO && this->unk_84F < 0) {
+                rc = this->unk_850;
+                // Award rando item; this should only give us GI_NONE if something went wrong during the catch setup
+                gi = Randomizer_GetItemFromKnownCheck(rc, GI_NONE);
+                temp = Randomizer_GetRandomizerInfFromCheck(rc);
+                // Either we can't give an item, we can't tell if we've gotten the check, or we have definitely gotten the check
+                if (gi.getItemId == GI_NONE || temp == RAND_INF_MAX || Flags_GetRandomizerInf(temp)) {
+                    this->unk_84F = 0;
+                    if (this->interactRangeActor != NULL)
+                        this->interactRangeActor->parent = NULL;
+                }
+                // Item get cutscene hasn't played yet
+                else if((this->interactRangeActor == NULL && !(this->stateFlags1 & PLAYER_STATE1_ITEM_OVER_HEAD)) || !Actor_HasParent(this->interactRangeActor, play)) {
+                    // Can't guarantee that whatever we "caught" is actually going to still exist
+                    if (GiveItemEntryWithoutActor(play, gi)) {
+                        // have to set this flag manually to prevent interactRangeActor from being wiped out
+                        this->stateFlags1 |= PLAYER_STATE1_ITEM_OVER_HEAD;
+                        this->pendingFlag.flagID = temp;
+                        this->pendingFlag.flagType = FLAG_RANDOMIZER_INF;
+                        Flags_SetRandomizerInf(temp);
+                    }
+
+                }
+            } else if (this->unk_850 == 0) {
                 if (CVarGetInteger("gFastDrops", 0)) {
                     this->unk_84F = 0;
                 } else {
@@ -13682,6 +13710,7 @@ void func_8084ECA4(Player* this, PlayState* play) {
         }
     } else {
         if (this->unk_84F == 0) {
+            sp24 = &D_80854554[this->unk_850];
             temp = this->skelAnime.curFrame - sp24->unk_08;
 
             if (temp >= 0) {
@@ -13704,11 +13733,38 @@ void func_8084ECA4(Player* this, PlayState* play) {
                             this->unk_84F = i + 1;
                             this->unk_850 = 0;
                             this->interactRangeActor->parent = &this->actor;
-                            Player_UpdateBottleHeld(play, this, catchInfo->itemId, ABS(catchInfo->itemAction));
-                            if (!CVarGetInteger("gFastDrops", 0)) {
-                                this->stateFlags1 |= PLAYER_STATE1_IN_ITEM_CS | PLAYER_STATE1_IN_CUTSCENE;
-                                Player_AnimPlayOnceAdjusted(play, this, sp24->unk_04);
-                                func_80835EA4(play, 4);
+                            // TODO: this should probably be refactored a bit, maybe rehome some of this to rando instead
+                            if (IS_RANDO) {
+                                // Check if fishsanity applies for this actor
+                                if (Randomizer_GetOverworldFishShuffled()) {
+                                    fish = Randomizer_IdentifyFish(play->sceneNum, this->interactRangeActor->params);
+                                    if (fish.randomizerCheck != RC_UNKNOWN_CHECK && !Flags_GetRandomizerInf(fish.randomizerInf)) {
+                                        gi = Randomizer_GetItemFromKnownCheck(fish.randomizerCheck, GI_FISH);
+                                        rc = fish.randomizerCheck;
+                                        // check if the item is a bottle item anyway
+                                        catchInfo = NULL;
+                                        for (j = 0; j < 4; j++) {
+                                            if (D_80854A04[j].itemId == gi.itemId) {
+                                                catchInfo = &D_80854A04[j];
+                                                break;
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+
+                            // Vanilla behavior/rando gave a bottle item
+                            if (!IS_RANDO || catchInfo != NULL) {
+                                Player_UpdateBottleHeld(play, this, catchInfo->itemId, ABS(catchInfo->itemAction));
+                                if (!CVarGetInteger("gFastDrops", 0)) {
+                                    this->stateFlags1 |= PLAYER_STATE1_IN_ITEM_CS | PLAYER_STATE1_IN_CUTSCENE;
+                                    Player_AnimPlayOnceAdjusted(play, this, sp24->unk_04);
+                                    func_80835EA4(play, 4);
+                                }
+                            } else if (IS_RANDO && gi.itemId != ITEM_NONE) {
+                                // Non-bottle item found from rando, flag for special behavior
+                                this->unk_84F = -1;
+                                this->unk_850 = rc;
                             }
                         }
                     }

From 080038c39e6de25a4cc3b157b7f94d7435427db3 Mon Sep 17 00:00:00 2001
From: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>
Date: Sun, 14 Jan 2024 19:16:32 +0100
Subject: [PATCH 066/230] Rando: Shuffle Beehives (Rando V3) (#3763)

* Shuffle Beehives

* Address review

* Fix build
---
 soh/include/functions.h                       |  2 +-
 soh/include/z64actor.h                        |  3 +
 soh/include/z64save.h                         |  2 +-
 .../Enhancements/debugger/debugSaveEditor.h   | 41 +++++++++++-
 .../randomizer/3drando/category.hpp           |  1 +
 .../hint_list/hint_list_exclude_overworld.cpp | 37 +++++++++-
 .../randomizer/3drando/item_pool.cpp          | 45 +++++++++++++
 .../location_access/locacc_death_mountain.cpp | 21 ++++--
 .../location_access/locacc_gerudo_valley.cpp  |  6 +-
 .../location_access/locacc_hyrule_field.cpp   | 29 +++++---
 .../location_access/locacc_kakariko.cpp       |  8 ++-
 .../location_access/locacc_lost_woods.cpp     | 22 +++---
 .../location_access/locacc_zoras_domain.cpp   | 38 ++++++-----
 .../randomizer/3drando/spoiler_log.cpp        |  6 +-
 .../Enhancements/randomizer/location_list.cpp | 67 +++++++++++++++++++
 soh/soh/Enhancements/randomizer/logic.cpp     | 20 +++---
 soh/soh/Enhancements/randomizer/logic.h       |  2 +
 .../randomizer/option_descriptions.cpp        |  2 +
 .../Enhancements/randomizer/randomizer.cpp    | 54 +++++++++++++++
 soh/soh/Enhancements/randomizer/randomizer.h  |  1 +
 .../Enhancements/randomizer/randomizerTypes.h | 48 +++++++++++++
 .../randomizer/randomizer_check_objects.cpp   |  1 +
 .../randomizer/randomizer_check_tracker.cpp   |  5 ++
 .../Enhancements/randomizer/randomizer_inf.h  | 33 +++++++++
 soh/soh/Enhancements/randomizer/settings.cpp  |  7 ++
 soh/soh/OTRGlobals.cpp                        |  4 ++
 soh/soh/OTRGlobals.h                          |  1 +
 soh/src/code/z_actor.c                        |  4 +-
 soh/src/code/z_en_item00.c                    | 40 ++++++-----
 .../overlays/actors/ovl_Obj_Comb/z_obj_comb.c | 37 +++++++++-
 .../overlays/actors/ovl_Obj_Comb/z_obj_comb.h |  1 +
 31 files changed, 505 insertions(+), 83 deletions(-)

diff --git a/soh/include/functions.h b/soh/include/functions.h
index 6f188a842..d8b4b934b 100644
--- a/soh/include/functions.h
+++ b/soh/include/functions.h
@@ -457,7 +457,7 @@ u32 Actor_HasParent(Actor* actor, PlayState* play);
 // TODO: Rename the follwing 3 functions using whatever scheme we use when we rename func_8002F434 and func_8002F554.
 s32 GiveItemEntryWithoutActor(PlayState* play, GetItemEntry getItemEntry);
 s32 GiveItemEntryFromActor(Actor* actor, PlayState* play, GetItemEntry getItemEntry, f32 xzRange, f32 yRange);
-void GiveItemEntryFromActorWithFixedRange(Actor* actor, PlayState* play, GetItemEntry getItemEntry);
+s32 GiveItemEntryFromActorWithFixedRange(Actor* actor, PlayState* play, GetItemEntry getItemEntry);
 s32 func_8002F434(Actor* actor, PlayState* play, s32 getItemId, f32 xzRange, f32 yRange);
 void func_8002F554(Actor* actor, PlayState* play, s32 getItemId);
 void func_8002F580(Actor* actor, PlayState* play);
diff --git a/soh/include/z64actor.h b/soh/include/z64actor.h
index 7d4e313e7..0a8ac9297 100644
--- a/soh/include/z64actor.h
+++ b/soh/include/z64actor.h
@@ -8,6 +8,7 @@
 #include "z64bgcheck.h"
 #include "soh/Enhancements/item-tables/ItemTableTypes.h"
 #include "z64actor_enum.h"
+#include "soh/Enhancements/randomizer/randomizerTypes.h"
 
 #define ACTOR_NUMBER_MAX 2000
 #define INVISIBLE_ACTOR_MAX 20
@@ -285,6 +286,8 @@ typedef struct EnItem00 {
     /* 0x160 */ ColliderCylinder collider;
     s16 ogParams;
     GetItemEntry randoGiEntry;
+    RandomizerCheck randoCheck;
+    RandomizerInf randoInf;
 } EnItem00; // size = 0x1AC
 
 // Only A_OBJ_SIGNPOST_OBLONG and A_OBJ_SIGNPOST_ARROW are used in room files.
diff --git a/soh/include/z64save.h b/soh/include/z64save.h
index b0839b1d3..0f527925d 100644
--- a/soh/include/z64save.h
+++ b/soh/include/z64save.h
@@ -283,7 +283,7 @@ typedef struct {
     // #endregion
     // #region SOH [Randomizer]
     // Upstream TODO: Move these to their own struct or name to more obviously specific to Randomizer
-    /*        */ u16 randomizerInf[14];
+    /*        */ u16 randomizerInf[16];
     /*        */ u8 mqDungeonCount;
     /*        */ u16 adultTradeItems;
     /*        */ u8 triforcePiecesCollected;
diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.h b/soh/soh/Enhancements/debugger/debugSaveEditor.h
index 481d6c75d..310d3ebe5 100644
--- a/soh/soh/Enhancements/debugger/debugSaveEditor.h
+++ b/soh/soh/Enhancements/debugger/debugSaveEditor.h
@@ -348,7 +348,7 @@ const std::vector<FlagTable> flagTables = {
         { 0x24, "Market Crowd Text Randomizer" },
         { 0x30, "Entered the Market" },
     } },
-   { "Randomizer Inf Flags", RANDOMIZER_INF, 13, {
+    { "Randomizer Inf Flags", RANDOMIZER_INF, 16, {
         { RAND_INF_DUNGEONS_DONE_DEKU_TREE, "DUNGEONS_DONE_DEKU_TREE" },
         { RAND_INF_DUNGEONS_DONE_DODONGOS_CAVERN, "DUNGEONS_DONE_DODONGOS_CAVERN" },
         { RAND_INF_DUNGEONS_DONE_JABU_JABUS_BELLY, "DUNGEONS_DONE_JABU_JABUS_BELLY" },
@@ -517,6 +517,45 @@ const std::vector<FlagTable> flagTables = {
         { RAND_INF_GANON_SOUL, "RAND_INF_GANON_SOUL" },
         { RAND_INF_GRANT_GANONS_BOSSKEY, "RAND_INF_GRANT_GANONS_BOSSKEY" },
 
+        { RAND_INF_HAS_OCARINA_A, "RAND_INF_HAS_OCARINA_A"},
+        { RAND_INF_HAS_OCARINA_C_UP, "RAND_INF_HAS_OCARINA_C_UP" },
+        { RAND_INF_HAS_OCARINA_C_DOWN, "RAND_INF_HAS_OCARINA_C_DOWN" },
+        { RAND_INF_HAS_OCARINA_C_LEFT, "RAND_INF_HAS_OCARINA_C_LEFT"},
+        { RAND_INF_HAS_OCARINA_C_RIGHT, "RAND_INF_HAS_OCARINA_C_RIGHT"},
+
+        { RAND_INF_BEEHIVE_KF_STORMS_GROTTO_LEFT, "RAND_INF_BEEHIVE_KF_STORMS_GROTTO_LEFT" },
+        { RAND_INF_BEEHIVE_KF_STORMS_GROTTO_RIGHT, "RAND_INF_BEEHIVE_KF_STORMS_GROTTO_RIGHT" },
+        { RAND_INF_BEEHIVE_LW_NEAR_SHORTCUTS_GROTTO_LEFT, "RAND_INF_BEEHIVE_LW_NEAR_SHORTCUTS_GROTTO_LEFT" },
+        { RAND_INF_BEEHIVE_LW_NEAR_SHORTCUTS_GROTTO_RIGHT, "RAND_INF_BEEHIVE_LW_NEAR_SHORTCUTS_GROTTO_RIGHT" },
+        { RAND_INF_BEEHIVE_LW_DEKU_SCRUB_GROTTO, "RAND_INF_BEEHIVE_LW_DEKU_SCRUB_GROTTO" },
+        { RAND_INF_BEEHIVE_SFM_STORMS_GROTTO, "RAND_INF_BEEHIVE_SFM_STORMS_GROTTO" },
+        { RAND_INF_BEEHIVE_HF_NEAR_MARKET_GROTTO_LEFT, "RAND_INF_BEEHIVE_HF_NEAR_MARKET_GROTTO_LEFT" },
+        { RAND_INF_BEEHIVE_HF_NEAR_MARKET_GROTTO_RIGHT, "RAND_INF_BEEHIVE_HF_NEAR_MARKET_GROTTO_RIGHT" },
+        { RAND_INF_BEEHIVE_HF_OPEN_GROTTO_LEFT, "RAND_INF_BEEHIVE_HF_OPEN_GROTTO_LEFT" },
+        { RAND_INF_BEEHIVE_HF_OPEN_GROTTO_RIGHT, "RAND_INF_BEEHIVE_HF_OPEN_GROTTO_RIGHT" },
+        { RAND_INF_BEEHIVE_HF_SOUTHEAST_GROTTO_LEFT, "RAND_INF_BEEHIVE_HF_SOUTHEAST_GROTTO_LEFT" },
+        { RAND_INF_BEEHIVE_HF_SOUTHEAST_GROTTO_RIGHT, "RAND_INF_BEEHIVE_HF_SOUTHEAST_GROTTO_RIGHT" },
+        { RAND_INF_BEEHIVE_HF_INSIDE_FENCE_GROTTO, "RAND_INF_BEEHIVE_HF_INSIDE_FENCE_GROTTO" },
+        { RAND_INF_BEEHIVE_LLR_GROTTO, "RAND_INF_BEEHIVE_LLR_GROTTO" },
+        { RAND_INF_BEEHIVE_KAK_OPEN_GROTTO_LEFT, "RAND_INF_BEEHIVE_KAK_OPEN_GROTTO_LEFT" },
+        { RAND_INF_BEEHIVE_KAK_OPEN_GROTTO_RIGHT, "RAND_INF_BEEHIVE_KAK_OPEN_GROTTO_RIGHT" },
+        { RAND_INF_BEEHIVE_DMT_COW_GROTTO, "RAND_INF_BEEHIVE_DMT_COW_GROTTO" },
+        { RAND_INF_BEEHIVE_DMT_STORMS_GROTTO_LEFT, "RAND_INF_BEEHIVE_DMT_STORMS_GROTTO_LEFT" },
+        { RAND_INF_BEEHIVE_DMT_STORMS_GROTTO_RIGHT, "RAND_INF_BEEHIVE_DMT_STORMS_GROTTO_RIGHT" },
+        { RAND_INF_BEEHIVE_GC_GROTTO, "RAND_INF_BEEHIVE_GC_GROTTO" },
+        { RAND_INF_BEEHIVE_DMC_UPPER_GROTTO_LEFT, "RAND_INF_BEEHIVE_DMC_UPPER_GROTTO_LEFT" },
+        { RAND_INF_BEEHIVE_DMC_UPPER_GROTTO_RIGHT, "RAND_INF_BEEHIVE_DMC_UPPER_GROTTO_RIGHT" },
+        { RAND_INF_BEEHIVE_DMC_HAMMER_GROTTO, "RAND_INF_BEEHIVE_DMC_HAMMER_GROTTO" },
+        { RAND_INF_BEEHIVE_ZR_OPEN_GROTTO_LEFT, "RAND_INF_BEEHIVE_ZR_OPEN_GROTTO_LEFT" },
+        { RAND_INF_BEEHIVE_ZR_OPEN_GROTTO_RIGHT, "RAND_INF_BEEHIVE_ZR_OPEN_GROTTO_RIGHT" },
+        { RAND_INF_BEEHIVE_ZR_STORMS_GROTTO, "RAND_INF_BEEHIVE_ZR_STORMS_GROTTO" },
+        { RAND_INF_BEEHIVE_ZD_IN_FRONT_OF_KING_ZORA_LEFT, "RAND_INF_BEEHIVE_ZD_IN_FRONT_OF_KING_ZORA_LEFT" },
+        { RAND_INF_BEEHIVE_ZD_IN_FRONT_OF_KING_ZORA_RIGHT, "RAND_INF_BEEHIVE_ZD_IN_FRONT_OF_KING_ZORA_RIGHT" },
+        { RAND_INF_BEEHIVE_ZD_BEHIND_KING_ZORA, "RAND_INF_BEEHIVE_ZD_BEHIND_KING_ZORA" },
+        { RAND_INF_BEEHIVE_LH_GROTTO, "RAND_INF_BEEHIVE_LH_GROTTO" },
+        { RAND_INF_BEEHIVE_GV_DEKU_SCRUB_GROTTO, "RAND_INF_BEEHIVE_GV_DEKU_SCRUB_GROTTO" },
+        { RAND_INF_BEEHIVE_COLOSSUS_GROTTO, "RAND_INF_BEEHIVE_COLOSSUS_GROTTO" },
+
         { RAND_INF_CHILD_FISH_1, "RAND_INF_CHILD_FISH_1" },
         { RAND_INF_CHILD_FISH_2, "RAND_INF_CHILD_FISH_2" },
         { RAND_INF_CHILD_FISH_3, "RAND_INF_CHILD_FISH_3" },
diff --git a/soh/soh/Enhancements/randomizer/3drando/category.hpp b/soh/soh/Enhancements/randomizer/3drando/category.hpp
index 8916f53df..22522789c 100644
--- a/soh/soh/Enhancements/randomizer/3drando/category.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/category.hpp
@@ -18,6 +18,7 @@ enum class Category {
     cVanillaMap,
     cVanillaCompass,
     cAdultTrade,
+    cBeehive,
 };
 
 enum class OptionCategory {
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_overworld.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_overworld.cpp
index 026514441..c705bb2b6 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_overworld.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_overworld.cpp
@@ -1429,4 +1429,39 @@ void HintTable_Init_Exclude_Overworld() {
                        //obscure text
                        Text{"a #cow in a luxurious hole# offers", /*french*/"la #vache dans une grotte luxueuse# donne", /*spanish*/"una #vaca de un lujoso hoyo# brinda"},
   });
-}
+
+    hintTable[RHT_BEEHIVE_CHEST_GROTTO] = HintText::Exclude({
+                       //obscure text
+                       Text{"a #beehive above a chest# hides", /*french*/"", /*spanish*/"una #colmena sobre un cofre# esconde"},
+  });
+
+    hintTable[RHT_BEEHIVE_LONELY_SCRUB_GROTTO] = HintText::Exclude({
+                       //obscure text
+                       Text{"a #beehive above a lonely scrub# hides", /*french*/"", /*spanish*/"una #colmena sobre un deku solitario# esconde"},
+  });
+
+    hintTable[RHT_BEEHIVE_SCRUB_PAIR_GROTTO] = HintText::Exclude({
+                       //obscure text
+                       Text{"a #beehive above a pair of scrubs# hides", /*french*/"", /*spanish*/"una #colmena sobre un par de dekus# esconde"},
+  });
+
+    hintTable[RHT_BEEHIVE_SCRUB_TRIO_GROTTO] = HintText::Exclude({
+                       //obscure text
+                       Text{"a #beehive above a trio of scrubs# hides", /*french*/"", /*spanish*/"una #colmena sobre un trío de dekus# esconde"},
+  });
+
+    hintTable[RHT_BEEHIVE_COW_GROTTO] = HintText::Exclude({
+                       //obscure text
+                       Text{"a #beehive above a cow# hides", /*french*/"", /*spanish*/"una #colmena sobre una vaca# esconde"},
+  });
+
+    hintTable[RHT_BEEHIVE_IN_FRONT_OF_KING_ZORA] = HintText::Exclude({
+                       //obscure text
+                       Text{"a #beehive in front of the king of the zoras# hides", /*french*/"", /*spanish*/"una #colmena delante del rey de los zoras# esconde"},
+  });
+
+    hintTable[RHT_BEEHIVE_BEHIND_KING_ZORA] = HintText::Exclude({
+                       //obscure text
+                       Text{"a #beehive behind the king of the zoras# hides", /*french*/"", /*spanish*/"una #colmena detrás del rey de los zoras# esconde"},
+  });
+}
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
index 7acb68949..6ec66b5a8 100644
--- a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
@@ -557,6 +557,43 @@ static void PlaceVanillaBossKeys() {
 // TODO: This feels like it could be moved to Dungeons class and probably shorten
 // a few function call chains. Needs investigation.
 
+static void PlaceVanillaBeehiveRupees() {
+  auto ctx = Rando::Context::GetInstance();
+  ctx->PlaceItemInLocation(RC_KF_STORMS_GROTTO_BEEHIVE_LEFT,         RG_BLUE_RUPEE, false, true);
+  ctx->PlaceItemInLocation(RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_LEFT, RG_BLUE_RUPEE, false, true);
+  ctx->PlaceItemInLocation(RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_LEFT,    RG_BLUE_RUPEE, false, true);
+  ctx->PlaceItemInLocation(RC_HF_OPEN_GROTTO_BEEHIVE_LEFT,           RG_BLUE_RUPEE, false, true);
+  ctx->PlaceItemInLocation(RC_HF_SOUTHEAST_GROTTO_BEEHIVE_LEFT,      RG_BLUE_RUPEE, false, true);
+  ctx->PlaceItemInLocation(RC_KAK_OPEN_GROTTO_BEEHIVE_LEFT,          RG_BLUE_RUPEE, false, true);
+  ctx->PlaceItemInLocation(RC_DMT_STORMS_GROTTO_BEEHIVE_LEFT,        RG_BLUE_RUPEE, false, true);
+  ctx->PlaceItemInLocation(RC_DMC_UPPER_GROTTO_BEEHIVE_LEFT,         RG_BLUE_RUPEE, false, true);
+  ctx->PlaceItemInLocation(RC_ZR_OPEN_GROTTO_BEEHIVE_LEFT,           RG_BLUE_RUPEE, false, true);
+
+  ctx->PlaceItemInLocation(RC_KF_STORMS_GROTTO_BEEHIVE_RIGHT,         RG_RED_RUPEE, false, true);
+  ctx->PlaceItemInLocation(RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_RIGHT, RG_RED_RUPEE, false, true);
+  ctx->PlaceItemInLocation(RC_LW_DEKU_SCRUB_GROTTO_BEEHIVE,           RG_RED_RUPEE, false, true);
+  ctx->PlaceItemInLocation(RC_SFM_STORMS_GROTTO_BEEHIVE,              RG_RED_RUPEE, false, true);
+  ctx->PlaceItemInLocation(RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_RIGHT,    RG_RED_RUPEE, false, true);
+  ctx->PlaceItemInLocation(RC_HF_OPEN_GROTTO_BEEHIVE_RIGHT,           RG_RED_RUPEE, false, true);
+  ctx->PlaceItemInLocation(RC_HF_SOUTHEAST_GROTTO_BEEHIVE_RIGHT,      RG_RED_RUPEE, false, true);
+  ctx->PlaceItemInLocation(RC_HF_INSIDE_FENCE_GROTTO_BEEHIVE,         RG_RED_RUPEE, false, true);
+  ctx->PlaceItemInLocation(RC_LLR_GROTTO_BEEHIVE,                     RG_RED_RUPEE, false, true);
+  ctx->PlaceItemInLocation(RC_KAK_OPEN_GROTTO_BEEHIVE_RIGHT,          RG_RED_RUPEE, false, true);
+  ctx->PlaceItemInLocation(RC_DMT_COW_GROTTO_BEEHIVE,                 RG_RED_RUPEE, false, true);
+  ctx->PlaceItemInLocation(RC_DMT_STORMS_GROTTO_BEEHIVE_RIGHT,        RG_RED_RUPEE, false, true);
+  ctx->PlaceItemInLocation(RC_GC_GROTTO_BEEHIVE,                      RG_RED_RUPEE, false, true);
+  ctx->PlaceItemInLocation(RC_DMC_UPPER_GROTTO_BEEHIVE_RIGHT,         RG_RED_RUPEE, false, true);
+  ctx->PlaceItemInLocation(RC_DMC_HAMMER_GROTTO_BEEHIVE,              RG_RED_RUPEE, false, true);
+  ctx->PlaceItemInLocation(RC_ZR_OPEN_GROTTO_BEEHIVE_RIGHT,           RG_RED_RUPEE, false, true);
+  ctx->PlaceItemInLocation(RC_ZR_STORMS_GROTTO_BEEHIVE,               RG_RED_RUPEE, false, true);
+  ctx->PlaceItemInLocation(RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_LEFT,  RG_RED_RUPEE, false, true);
+  ctx->PlaceItemInLocation(RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_RIGHT, RG_RED_RUPEE, false, true);
+  ctx->PlaceItemInLocation(RC_ZD_BEHIND_KING_ZORA_BEEHIVE,            RG_RED_RUPEE, false, true);
+  ctx->PlaceItemInLocation(RC_LH_GROTTO_BEEHIVE,                      RG_RED_RUPEE, false, true);
+  ctx->PlaceItemInLocation(RC_GV_DEKU_SCRUB_GROTTO_BEEHIVE,           RG_RED_RUPEE, false, true);
+  ctx->PlaceItemInLocation(RC_COLOSSUS_GROTTO_BEEHIVE,                RG_RED_RUPEE, false, true);
+}
+
 static void PlaceVanillaCowMilk() {
   auto ctx = Rando::Context::GetInstance();
   ctx->PlaceItemInLocation(RC_KF_LINKS_HOUSE_COW,    RG_MILK, false, true);
@@ -745,6 +782,14 @@ void GenerateItemPool() {
     ctx->possibleIceTrapModels.push_back(RG_OCARINA_C_RIGHT_BUTTON);
   }
 
+  if (ctx->GetOption(RSK_SHUFFLE_BEEHIVES)) {
+    //32 total beehive locations
+    AddItemToMainPool(RG_RED_RUPEE, 23);
+    AddItemToMainPool(RG_BLUE_RUPEE, 9);
+  } else {
+    PlaceVanillaBeehiveRupees();
+  }
+
   if (ctx->GetOption(RSK_SHUFFLE_COWS)) {
     //9 total cow locations
     for (uint8_t i = 0; i < 9; i++) {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
index af1400eb9..e4a8fbb63 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
@@ -52,7 +52,8 @@ void AreaTable_Init_DeathMountain() {
 
   areaTable[RR_DMT_COW_GROTTO] = Area("DMT Cow Grotto", "DMT Cow Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DMT_COW_GROTTO_COW, {[]{return logic->CanUse(RG_EPONAS_SONG);}}),
+                  LocationAccess(RC_DMT_COW_GROTTO_COW,     {[]{return logic->CanUse(RG_EPONAS_SONG);}}),
+                  LocationAccess(RC_DMT_COW_GROTTO_BEEHIVE, {[]{return logic->CanBreakLowerBeehives;}}),
                 }, {
                   //Exits
                   Entrance(RR_DEATH_MOUNTAIN_SUMMIT, {[]{return true;}}),
@@ -61,9 +62,11 @@ void AreaTable_Init_DeathMountain() {
 
   areaTable[RR_DMT_STORMS_GROTTO] = Area("DMT Storms Grotto", "DMT Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
-                  LocationAccess(RC_DMT_STORMS_GROTTO_CHEST,        {[]{return true;}}),
-                  LocationAccess(RC_DMT_STORMS_GROTTO_FISH,         {[]{return logic->HasBottle;}}),
-                  LocationAccess(RC_DMT_STORMS_GROTTO_GOSSIP_STONE, {[]{return true;}}),
+                  LocationAccess(RC_DMT_STORMS_GROTTO_CHEST,         {[]{return true;}}),
+                  LocationAccess(RC_DMT_STORMS_GROTTO_FISH,          {[]{return logic->HasBottle;}}),
+                  LocationAccess(RC_DMT_STORMS_GROTTO_GOSSIP_STONE,  {[]{return true;}}),
+                  LocationAccess(RC_DMT_STORMS_GROTTO_BEEHIVE_LEFT,  {[]{return logic->CanBreakLowerBeehives;}}),
+                  LocationAccess(RC_DMT_STORMS_GROTTO_BEEHIVE_RIGHT, {[]{return logic->CanBreakLowerBeehives;}}),
                 }, {
                   //Exits
                   Entrance(RR_DEATH_MOUNTAIN_TRAIL, {[]{return true;}}),
@@ -155,6 +158,7 @@ void AreaTable_Init_DeathMountain() {
                   LocationAccess(RC_GC_DEKU_SCRUB_GROTTO_LEFT,   {[]{return logic->CanStunDeku;}}),
                   LocationAccess(RC_GC_DEKU_SCRUB_GROTTO_RIGHT,  {[]{return logic->CanStunDeku;}}),
                   LocationAccess(RC_GC_DEKU_SCRUB_GROTTO_CENTER, {[]{return logic->CanStunDeku;}}),
+                  LocationAccess(RC_GC_GROTTO_BEEHIVE,           {[]{return logic->CanBreakUpperBeehives;}}),
                 }, {
                   //Exits
                   Entrance(RR_GC_GROTTO_PLATFORM, {[]{return true;}}),
@@ -241,9 +245,11 @@ void AreaTable_Init_DeathMountain() {
 
   areaTable[RR_DMC_UPPER_GROTTO] = Area("DMC Upper Grotto", "DMC Upper Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
-                  LocationAccess(RC_DMC_UPPER_GROTTO_CHEST,        {[]{return true;}}),
-                  LocationAccess(RC_DMC_UPPER_GROTTO_FISH,         {[]{return logic->HasBottle;}}),
-                  LocationAccess(RC_DMC_UPPER_GROTTO_GOSSIP_STONE, {[]{return true;}}),
+                  LocationAccess(RC_DMC_UPPER_GROTTO_CHEST,         {[]{return true;}}),
+                  LocationAccess(RC_DMC_UPPER_GROTTO_FISH,          {[]{return logic->HasBottle;}}),
+                  LocationAccess(RC_DMC_UPPER_GROTTO_GOSSIP_STONE,  {[]{return true;}}),
+                  LocationAccess(RC_DMC_UPPER_GROTTO_BEEHIVE_LEFT,  {[]{return logic->CanBreakLowerBeehives;}}),
+                  LocationAccess(RC_DMC_UPPER_GROTTO_BEEHIVE_RIGHT, {[]{return logic->CanBreakLowerBeehives;}}),
                 }, {
                   //Exits
                   Entrance(RR_DMC_UPPER_LOCAL, {[]{return true;}}),
@@ -254,6 +260,7 @@ void AreaTable_Init_DeathMountain() {
                   LocationAccess(RC_DMC_DEKU_SCRUB_GROTTO_LEFT,   {[]{return logic->CanStunDeku;}}),
                   LocationAccess(RC_DMC_DEKU_SCRUB_GROTTO_RIGHT,  {[]{return logic->CanStunDeku;}}),
                   LocationAccess(RC_DMC_DEKU_SCRUB_GROTTO_CENTER, {[]{return logic->CanStunDeku;}}),
+                  LocationAccess(RC_DMC_HAMMER_GROTTO_BEEHIVE,    {[]{return logic->CanBreakUpperBeehives;}}),
                 }, {
                   //Exits
                   Entrance(RR_DMC_LOWER_LOCAL, {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
index 2fd86634a..1a3c84305 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
@@ -85,8 +85,9 @@ void AreaTable_Init_GerudoValley() {
 
   areaTable[RR_GV_STORMS_GROTTO] = Area("GV Storms Grotto", "GV Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_GV_DEKU_SCRUB_GROTTO_REAR,  {[]{return logic->CanStunDeku;}}),
-                  LocationAccess(RC_GV_DEKU_SCRUB_GROTTO_FRONT, {[]{return logic->CanStunDeku;}}),
+                  LocationAccess(RC_GV_DEKU_SCRUB_GROTTO_REAR,    {[]{return logic->CanStunDeku;}}),
+                  LocationAccess(RC_GV_DEKU_SCRUB_GROTTO_FRONT,   {[]{return logic->CanStunDeku;}}),
+                  LocationAccess(RC_GV_DEKU_SCRUB_GROTTO_BEEHIVE, {[]{return logic->CanBreakUpperBeehives;}}),
                 }, {
                   //Exits
                   Entrance(RR_GV_FORTRESS_SIDE, {[]{return true;}}),
@@ -200,6 +201,7 @@ void AreaTable_Init_GerudoValley() {
                   //Locations
                   LocationAccess(RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,  {[]{return logic->CanStunDeku;}}),
                   LocationAccess(RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT, {[]{return logic->CanStunDeku;}}),
+                  LocationAccess(RC_COLOSSUS_GROTTO_BEEHIVE,          {[]{return logic->CanBreakUpperBeehives;}}),
                 }, {
                   //Exits
                   Entrance(RR_DESERT_COLOSSUS, {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
index 258ffd8d6..1d75415d3 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
@@ -32,9 +32,11 @@ void AreaTable_Init_HyruleField() {
 
   areaTable[RR_HF_SOUTHEAST_GROTTO] = Area("HF Southeast Grotto", "HF Southeast Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
-                  LocationAccess(RC_HF_SOUTHEAST_GROTTO_CHEST,        {[]{return true;}}),
-                  LocationAccess(RC_HF_SOUTHEAST_GROTTO_FISH,         {[]{return logic->HasBottle;}}),
-                  LocationAccess(RC_HF_SOUTHEAST_GOSSIP_STONE, {[]{return true;}}),
+                  LocationAccess(RC_HF_SOUTHEAST_GROTTO_CHEST,         {[]{return true;}}),
+                  LocationAccess(RC_HF_SOUTHEAST_GROTTO_FISH,          {[]{return logic->HasBottle;}}),
+                  LocationAccess(RC_HF_SOUTHEAST_GOSSIP_STONE,         {[]{return true;}}),
+                  LocationAccess(RC_HF_SOUTHEAST_GROTTO_BEEHIVE_LEFT,  {[]{return logic->CanBreakLowerBeehives;}}),
+                  LocationAccess(RC_HF_SOUTHEAST_GROTTO_BEEHIVE_RIGHT, {[]{return logic->CanBreakLowerBeehives;}}),
                 }, {
                   //Exits
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
@@ -42,9 +44,11 @@ void AreaTable_Init_HyruleField() {
 
   areaTable[RR_HF_OPEN_GROTTO] = Area("HF Open Grotto", "HF Open Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
-                  LocationAccess(RC_HF_OPEN_GROTTO_CHEST,        {[]{return true;}}),
-                  LocationAccess(RC_HF_OPEN_GROTTO_FISH,         {[]{return logic->HasBottle;}}),
-                  LocationAccess(RC_HF_OPEN_GROTTO_GOSSIP_STONE, {[]{return true;}}),
+                  LocationAccess(RC_HF_OPEN_GROTTO_CHEST,         {[]{return true;}}),
+                  LocationAccess(RC_HF_OPEN_GROTTO_FISH,          {[]{return logic->HasBottle;}}),
+                  LocationAccess(RC_HF_OPEN_GROTTO_GOSSIP_STONE,  {[]{return true;}}),
+                  LocationAccess(RC_HF_OPEN_GROTTO_BEEHIVE_LEFT,  {[]{return logic->CanBreakLowerBeehives;}}),
+                  LocationAccess(RC_HF_OPEN_GROTTO_BEEHIVE_RIGHT, {[]{return logic->CanBreakLowerBeehives;}}),
                 }, {
                   //Exits
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
@@ -52,7 +56,8 @@ void AreaTable_Init_HyruleField() {
 
   areaTable[RR_HF_INSIDE_FENCE_GROTTO] = Area("HF Inside Fence Grotto", "HF Inside Fence Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_HF_DEKU_SCRUB_GROTTO, {[]{return logic->CanStunDeku;}}),
+                  LocationAccess(RC_HF_DEKU_SCRUB_GROTTO,           {[]{return logic->CanStunDeku;}}),
+                  LocationAccess(RC_HF_INSIDE_FENCE_GROTTO_BEEHIVE, {[]{return logic->CanBreakLowerBeehives;}}),
                 }, {
                   //Exits
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
@@ -70,9 +75,11 @@ void AreaTable_Init_HyruleField() {
 
   areaTable[RR_HF_NEAR_MARKET_GROTTO] = Area("HF Near Market Grotto", "HF Near Market Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
-                  LocationAccess(RC_HF_NEAR_MARKET_GROTTO_CHEST,        {[]{return true;}}),
-                  LocationAccess(RC_HF_NEAR_MARKET_GROTTO_FISH,         {[]{return logic->HasBottle;}}),
-                  LocationAccess(RC_HF_NEAR_MARKET_GOSSIP_STONE, {[]{return true;}}),
+                  LocationAccess(RC_HF_NEAR_MARKET_GROTTO_CHEST,         {[]{return true;}}),
+                  LocationAccess(RC_HF_NEAR_MARKET_GROTTO_FISH,          {[]{return logic->HasBottle;}}),
+                  LocationAccess(RC_HF_NEAR_MARKET_GOSSIP_STONE,         {[]{return true;}}),
+                  LocationAccess(RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_LEFT,  {[]{return logic->CanBreakLowerBeehives;}}),
+                  LocationAccess(RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_RIGHT, {[]{return logic->CanBreakLowerBeehives;}}),
                 }, {
                   //Exits
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
@@ -206,6 +213,7 @@ void AreaTable_Init_HyruleField() {
                   LocationAccess(RC_LH_DEKU_SCRUB_GROTTO_LEFT,   {[]{return logic->CanStunDeku;}}),
                   LocationAccess(RC_LH_DEKU_SCRUB_GROTTO_RIGHT,  {[]{return logic->CanStunDeku;}}),
                   LocationAccess(RC_LH_DEKU_SCRUB_GROTTO_CENTER, {[]{return logic->CanStunDeku;}}),
+                  LocationAccess(RC_LH_GROTTO_BEEHIVE,           {[]{return logic->CanBreakUpperBeehives;}}),
                 }, {
                   //Exits
                   Entrance(RR_LAKE_HYLIA, {[]{return true;}}),
@@ -263,6 +271,7 @@ void AreaTable_Init_HyruleField() {
                   LocationAccess(RC_LLR_DEKU_SCRUB_GROTTO_LEFT,   {[]{return logic->CanStunDeku;}}),
                   LocationAccess(RC_LLR_DEKU_SCRUB_GROTTO_RIGHT,  {[]{return logic->CanStunDeku;}}),
                   LocationAccess(RC_LLR_DEKU_SCRUB_GROTTO_CENTER, {[]{return logic->CanStunDeku;}}),
+                  LocationAccess(RC_LLR_GROTTO_BEEHIVE,           {[]{return logic->CanBreakUpperBeehives;}}),
                 }, {
                   //Exits
                   Entrance(RR_LON_LON_RANCH, {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
index 750767323..5eb7263d3 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
@@ -196,9 +196,11 @@ void AreaTable_Init_Kakariko() {
 
   areaTable[RR_KAK_OPEN_GROTTO] = Area("Kak Open Grotto", "Kak Open Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
-                  LocationAccess(RC_KAK_OPEN_GROTTO_CHEST,        {[]{return true;}}),
-                  LocationAccess(RC_KAK_OPEN_GROTTO_FISH,         {[]{return logic->HasBottle;}}),
-                  LocationAccess(RC_KAK_OPEN_GROTTO_GOSSIP_STONE, {[]{return true;}}),
+                  LocationAccess(RC_KAK_OPEN_GROTTO_CHEST,         {[]{return true;}}),
+                  LocationAccess(RC_KAK_OPEN_GROTTO_FISH,          {[]{return logic->HasBottle;}}),
+                  LocationAccess(RC_KAK_OPEN_GROTTO_GOSSIP_STONE,  {[]{return true;}}),
+                  LocationAccess(RC_KAK_OPEN_GROTTO_BEEHIVE_LEFT,  {[]{return logic->CanBreakLowerBeehives;}}),
+                  LocationAccess(RC_KAK_OPEN_GROTTO_BEEHIVE_RIGHT, {[]{return logic->CanBreakLowerBeehives;}}),
                 }, {
                   //Exits
                   Entrance(RR_KAK_BACKYARD, {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
index 5ad1e6d5c..69911b049 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
@@ -96,9 +96,11 @@ void AreaTable_Init_LostWoods() {
 
   areaTable[RR_KF_STORMS_GROTTO] = Area("KF Storms Grotto", "KF Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
-                  LocationAccess(RC_KF_STORMS_GROTTO_CHEST,        {[]{return true;}}),
-                  LocationAccess(RC_KF_STORMS_GROTTO_FISH,         {[]{return logic->HasBottle;}}),
-                  LocationAccess(RC_KF_STORMS_GOSSIP_STONE, {[]{return true;}}),
+                  LocationAccess(RC_KF_STORMS_GROTTO_CHEST,         {[]{return true;}}),
+                  LocationAccess(RC_KF_STORMS_GROTTO_FISH,          {[]{return logic->HasBottle;}}),
+                  LocationAccess(RC_KF_STORMS_GOSSIP_STONE,         {[]{return true;}}),
+                  LocationAccess(RC_KF_STORMS_GROTTO_BEEHIVE_LEFT,  {[]{return logic->CanBreakLowerBeehives;}}),
+                  LocationAccess(RC_KF_STORMS_GROTTO_BEEHIVE_RIGHT, {[]{return logic->CanBreakLowerBeehives;}}),
                 }, {
                   //Exits
                   Entrance(RR_KOKIRI_FOREST, {[]{return true;}})
@@ -164,9 +166,11 @@ void AreaTable_Init_LostWoods() {
 
   areaTable[RR_LW_NEAR_SHORTCUTS_GROTTO] = Area("LW Near Shortcuts Grotto", "LW Near Shortcuts Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
-                  LocationAccess(RC_LW_NEAR_SHORTCUTS_GROTTO_CHEST,        {[]{return true;}}),
-                  LocationAccess(RC_LW_NEAR_SHORTCUTS_GROTTO_FISH,         {[]{return logic->HasBottle;}}),
-                  LocationAccess(RC_LW_NEAR_SHORTCUTS_GOSSIP_STONE, {[]{return true;}}),
+                  LocationAccess(RC_LW_NEAR_SHORTCUTS_GROTTO_CHEST,         {[]{return true;}}),
+                  LocationAccess(RC_LW_NEAR_SHORTCUTS_GROTTO_FISH,          {[]{return logic->HasBottle;}}),
+                  LocationAccess(RC_LW_NEAR_SHORTCUTS_GOSSIP_STONE,         {[]{return true;}}),
+                  LocationAccess(RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_LEFT,  {[]{return logic->CanBreakLowerBeehives;}}),
+                  LocationAccess(RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_RIGHT, {[]{return logic->CanBreakLowerBeehives;}}),
                 }, {
                   //Exits
                   Entrance(RR_THE_LOST_WOODS, {[]{return true;}}),
@@ -183,8 +187,9 @@ void AreaTable_Init_LostWoods() {
 
   areaTable[RR_LW_SCRUBS_GROTTO] = Area("LW Scrubs Grotto", "LW Scrubs Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_LW_DEKU_SCRUB_GROTTO_REAR,  {[]{return logic->CanStunDeku;}}),
-                  LocationAccess(RC_LW_DEKU_SCRUB_GROTTO_FRONT, {[]{return logic->CanStunDeku;}}),
+                  LocationAccess(RC_LW_DEKU_SCRUB_GROTTO_REAR,    {[]{return logic->CanStunDeku;}}),
+                  LocationAccess(RC_LW_DEKU_SCRUB_GROTTO_FRONT,   {[]{return logic->CanStunDeku;}}),
+                  LocationAccess(RC_LW_DEKU_SCRUB_GROTTO_BEEHIVE, {[]{return logic->CanBreakUpperBeehives;}}),
                 }, {
                   //Exits
                   Entrance(RR_LW_BEYOND_MIDO, {[]{return true;}}),
@@ -236,6 +241,7 @@ void AreaTable_Init_LostWoods() {
                   //Locations
                   LocationAccess(RC_SFM_DEKU_SCRUB_GROTTO_REAR,  {[]{return logic->CanStunDeku;}}),
                   LocationAccess(RC_SFM_DEKU_SCRUB_GROTTO_FRONT, {[]{return logic->CanStunDeku;}}),
+                  LocationAccess(RC_SFM_STORMS_GROTTO_BEEHIVE,   {[]{return logic->CanBreakUpperBeehives;}}),
                 }, {
                   //Exits
                   Entrance(RR_SACRED_FOREST_MEADOW, {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
index 5dade599a..d0cd7358d 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
@@ -54,9 +54,11 @@ void AreaTable_Init_ZorasDomain() {
 
   areaTable[RR_ZR_OPEN_GROTTO] = Area("ZR Open Grotto", "ZR Open Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
-                  LocationAccess(RC_ZR_OPEN_GROTTO_CHEST,        {[]{return true;}}),
-                  LocationAccess(RC_ZR_OPEN_GROTTO_FISH,         {[]{return logic->HasBottle;}}),
-                  LocationAccess(RC_ZR_OPEN_GROTTO_GOSSIP_STONE, {[]{return true;}}),
+                  LocationAccess(RC_ZR_OPEN_GROTTO_CHEST,         {[]{return true;}}),
+                  LocationAccess(RC_ZR_OPEN_GROTTO_FISH,          {[]{return logic->HasBottle;}}),
+                  LocationAccess(RC_ZR_OPEN_GROTTO_GOSSIP_STONE,  {[]{return true;}}),
+                  LocationAccess(RC_ZR_OPEN_GROTTO_BEEHIVE_LEFT,  {[]{return logic->CanBreakLowerBeehives;}}),
+                  LocationAccess(RC_ZR_OPEN_GROTTO_BEEHIVE_RIGHT, {[]{return logic->CanBreakLowerBeehives;}}),
                 }, {
                   //Exits
                   Entrance(RR_ZORAS_RIVER, {[]{return true;}}),
@@ -74,6 +76,7 @@ void AreaTable_Init_ZorasDomain() {
                   //Locations
                   LocationAccess(RC_ZR_DEKU_SCRUB_GROTTO_REAR,  {[]{return logic->CanStunDeku;}}),
                   LocationAccess(RC_ZR_DEKU_SCRUB_GROTTO_FRONT, {[]{return logic->CanStunDeku;}}),
+                  LocationAccess(RC_ZR_STORMS_GROTTO_BEEHIVE,   {[]{return logic->CanBreakUpperBeehives;}}),
                 }, {
                   //Exits
                   Entrance(RR_ZORAS_RIVER, {[]{return true;}}),
@@ -90,17 +93,19 @@ void AreaTable_Init_ZorasDomain() {
                   EventAccess(&logic->DeliverLetter,     {[]{return logic->DeliverLetter     || (logic->RutosLetter && logic->IsChild && randoCtx->GetOption(RSK_ZORAS_FOUNTAIN).IsNot(RO_ZF_OPEN));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_ZD_DIVING_MINIGAME,     {[]{return logic->IsChild;}}),
-                  LocationAccess(RC_ZD_CHEST,               {[]{return logic->IsChild && logic->CanUse(RG_STICKS);}}),
-                  LocationAccess(RC_ZD_KING_ZORA_THAWED,    {[]{return logic->KingZoraThawed;}}),
-                  LocationAccess(RC_ZD_TRADE_PRESCRIPTION,  {[]{return logic->KingZoraThawed && logic->Prescription;}}),
-                  LocationAccess(RC_ZD_GS_FROZEN_WATERFALL, {[]{return logic->IsAdult && logic->AtNight && (logic->HookshotOrBoomerang || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->Bow || (logic->MagicMeter && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BIGGORON_SWORD))) || (randoCtx->GetTrickOption(RT_ZD_GS) && logic->CanJumpslash)) && logic->CanGetNightTimeGS;}}),
-                  LocationAccess(RC_ZD_FISH_1,              {[]{return logic->IsChild && logic->HasBottle;}}),
-                  LocationAccess(RC_ZD_FISH_2,              {[]{return logic->IsChild && logic->HasBottle;}}),
-                  LocationAccess(RC_ZD_FISH_3,              {[]{return logic->IsChild && logic->HasBottle;}}),
-                  LocationAccess(RC_ZD_FISH_4,              {[]{return logic->IsChild && logic->HasBottle;}}),
-                  LocationAccess(RC_ZD_FISH_5,              {[]{return logic->IsChild && logic->HasBottle;}}),
-                  LocationAccess(RC_ZD_GOSSIP_STONE,        {[]{return true;}}),
+                  LocationAccess(RC_ZD_DIVING_MINIGAME,                     {[]{return logic->IsChild;}}),
+                  LocationAccess(RC_ZD_CHEST,                               {[]{return logic->IsChild && logic->CanUse(RG_STICKS);}}),
+                  LocationAccess(RC_ZD_KING_ZORA_THAWED,                    {[]{return logic->KingZoraThawed;}}),
+                  LocationAccess(RC_ZD_TRADE_PRESCRIPTION,                  {[]{return logic->KingZoraThawed && logic->Prescription;}}),
+                  LocationAccess(RC_ZD_GS_FROZEN_WATERFALL,                 {[]{return logic->IsAdult && logic->AtNight && (logic->HookshotOrBoomerang || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->Bow || (logic->MagicMeter && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BIGGORON_SWORD))) || (randoCtx->GetTrickOption(RT_ZD_GS) && logic->CanJumpslash)) && logic->CanGetNightTimeGS;}}),
+                  LocationAccess(RC_ZD_FISH_1,                              {[]{return logic->IsChild && logic->HasBottle;}}),
+                  LocationAccess(RC_ZD_FISH_2,                              {[]{return logic->IsChild && logic->HasBottle;}}),
+                  LocationAccess(RC_ZD_FISH_3,                              {[]{return logic->IsChild && logic->HasBottle;}}),
+                  LocationAccess(RC_ZD_FISH_4,                              {[]{return logic->IsChild && logic->HasBottle;}}),
+                  LocationAccess(RC_ZD_FISH_5,                              {[]{return logic->IsChild && logic->HasBottle;}}),
+                  LocationAccess(RC_ZD_GOSSIP_STONE,                        {[]{return true;}}),
+                  LocationAccess(RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_LEFT,  {[]{return logic->CanBreakUpperBeehives;}}),
+                  LocationAccess(RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_RIGHT, {[]{return logic->CanBreakUpperBeehives;}}),
                 }, {
                   //Exits
                   Entrance(RR_ZR_BEHIND_WATERFALL, {[]{return true;}}),
@@ -110,7 +115,10 @@ void AreaTable_Init_ZorasDomain() {
                   Entrance(RR_ZD_STORMS_GROTTO,    {[]{return logic->CanOpenStormGrotto;}}),
   });
 
-  areaTable[RR_ZD_BEHIND_KING_ZORA] = Area("ZD Behind King Zora", "Zoras Domain", RA_ZORAS_DOMAIN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_ZD_BEHIND_KING_ZORA] = Area("ZD Behind King Zora", "Zoras Domain", RA_ZORAS_DOMAIN, NO_DAY_NIGHT_CYCLE, {}, {
+                  //Locations
+                  LocationAccess(RC_ZD_BEHIND_KING_ZORA_BEEHIVE, {[]{return logic->CanBreakUpperBeehives;}}),
+                }, {
                   //Exits
                   Entrance(RR_ZORAS_DOMAIN,   {[]{return logic->DeliverLetter || randoCtx->GetOption(RSK_ZORAS_FOUNTAIN).Is(RO_ZF_OPEN) || (randoCtx->GetOption(RSK_ZORAS_FOUNTAIN).Is(RO_ZF_CLOSED_CHILD) && logic->IsAdult);}}),
                   Entrance(RR_ZORAS_FOUNTAIN, {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
index 8e0dee301..6dd1802a6 100644
--- a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
@@ -115,8 +115,12 @@ void WriteIngameSpoilerLog() {
         // if (loc->IsExcluded()) {
         //     continue;
         // }
+        // Beehives
+        if (!ctx->GetOption(RSK_SHUFFLE_BEEHIVES) && loc->IsCategory(Category::cBeehive)) {
+            continue;
+        }
         // Cows
-        if (!ctx->GetOption(RSK_SHUFFLE_COWS) && loc->IsCategory(Category::cCow)) {
+        else if (!ctx->GetOption(RSK_SHUFFLE_COWS) && loc->IsCategory(Category::cCow)) {
             continue;
         }
         // Merchants
diff --git a/soh/soh/Enhancements/randomizer/location_list.cpp b/soh/soh/Enhancements/randomizer/location_list.cpp
index 56861e484..ea4775d46 100644
--- a/soh/soh/Enhancements/randomizer/location_list.cpp
+++ b/soh/soh/Enhancements/randomizer/location_list.cpp
@@ -463,6 +463,39 @@ std::vector<RandomizerCheck> Rando::StaticData::overworldLocations = {
     RC_LLR_GS_RAIN_SHED,
     RC_LLR_GS_HOUSE_WINDOW,
     RC_LLR_GS_TREE,
+
+    RC_KF_STORMS_GROTTO_BEEHIVE_LEFT,
+    RC_KF_STORMS_GROTTO_BEEHIVE_RIGHT,
+    RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_LEFT,
+    RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_RIGHT,
+    RC_LW_DEKU_SCRUB_GROTTO_BEEHIVE,
+    RC_SFM_STORMS_GROTTO_BEEHIVE,
+    RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_LEFT,
+    RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_RIGHT,
+    RC_HF_OPEN_GROTTO_BEEHIVE_LEFT,
+    RC_HF_OPEN_GROTTO_BEEHIVE_RIGHT,
+    RC_HF_SOUTHEAST_GROTTO_BEEHIVE_LEFT,
+    RC_HF_SOUTHEAST_GROTTO_BEEHIVE_RIGHT,
+    RC_HF_INSIDE_FENCE_GROTTO_BEEHIVE,
+    RC_LLR_GROTTO_BEEHIVE,
+    RC_KAK_OPEN_GROTTO_BEEHIVE_LEFT,
+    RC_KAK_OPEN_GROTTO_BEEHIVE_RIGHT,
+    RC_DMT_COW_GROTTO_BEEHIVE,
+    RC_DMT_STORMS_GROTTO_BEEHIVE_LEFT,
+    RC_DMT_STORMS_GROTTO_BEEHIVE_RIGHT,
+    RC_GC_GROTTO_BEEHIVE,
+    RC_DMC_UPPER_GROTTO_BEEHIVE_LEFT,
+    RC_DMC_UPPER_GROTTO_BEEHIVE_RIGHT,
+    RC_DMC_HAMMER_GROTTO_BEEHIVE,
+    RC_ZR_OPEN_GROTTO_BEEHIVE_LEFT,
+    RC_ZR_OPEN_GROTTO_BEEHIVE_RIGHT,
+    RC_ZR_STORMS_GROTTO_BEEHIVE,
+    RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_LEFT,
+    RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_RIGHT,
+    RC_ZD_BEHIND_KING_ZORA_BEEHIVE,
+    RC_LH_GROTTO_BEEHIVE,
+    RC_GV_DEKU_SCRUB_GROTTO_BEEHIVE,
+    RC_COLOSSUS_GROTTO_BEEHIVE,
 };
 
 std::vector<RandomizerCheck> Rando::StaticData::gossipStoneLocations = {
@@ -1297,6 +1330,40 @@ void Rando::StaticData::InitLocationTable() {
     locationTable[RC_SONG_FROM_OCARINA_OF_TIME] =    Location::Delayed(RC_SONG_FROM_OCARINA_OF_TIME,    RCQUEST_BOTH, RCTYPE_SONG_LOCATION, RCAREA_HYRULE_FIELD,          ACTOR_ID_MAX, SCENE_ID_MAX,               0x00, 0x2A, "Song from Ocarina of Time", "Song from Ocarina of Time", RHT_SONG_FROM_OCARINA_OF_TIME,    RG_SONG_OF_TIME,       { Category::cSong },                               SpoilerCollectionCheck::Chest(0x51, 0x1F), SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD,       true);
     locationTable[RC_SONG_FROM_WINDMILL] =           Location::Delayed(RC_SONG_FROM_WINDMILL,           RCQUEST_BOTH, RCTYPE_SONG_LOCATION, RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX, SCENE_ID_MAX,               0x00, 0x2B, "Song from Windmill",        "Song from Windmill",        RHT_SONG_FROM_WINDMILL,           RG_SONG_OF_STORMS,     { Category::cSong },                               SpoilerCollectionCheck::EventChkInf(0x5B), SpoilerCollectionCheckGroup::GROUP_KAKARIKO,           true);
 
+    //Beehives    Randomizer Check                                            Randomizer Check                           Quest         Type            Area                         Actor ID        Scene ID             Params                        Flags Short Name                             Spoiler Name                              Hint Text Key                               Vanilla Item   Categories            Spoiler Collection Check                     Collection Check Group                             Vanilla Progression
+    locationTable[RC_KF_STORMS_GROTTO_BEEHIVE_LEFT]          = Location::Base(RC_KF_STORMS_GROTTO_BEEHIVE_LEFT,          RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_KOKIRI_FOREST,         ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(-144, 0x2C), 0x00, "Storms Grotto Beehive Left",          "KF Storms Grotto Beehive Left",          RHT_BEEHIVE_CHEST_GROTTO,           RG_BLUE_RUPEE, {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST,  false);
+    locationTable[RC_KF_STORMS_GROTTO_BEEHIVE_RIGHT]         = Location::Base(RC_KF_STORMS_GROTTO_BEEHIVE_RIGHT,         RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_KOKIRI_FOREST,         ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(121,  0x2C), 0x00, "Storms Grotto Beehive Right",         "KF Storms Grotto Beehive Right",         RHT_BEEHIVE_CHEST_GROTTO,           RG_RED_RUPEE,  {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST,  false);
+    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_LEFT]  = Location::Base(RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_LEFT,  RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_LOST_WOODS,            ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(-144, 0x14), 0x00, "Near Shortcuts Grotto Beehive Left",  "LW Near Shortcuts Grotto Beehive Left",  RHT_BEEHIVE_CHEST_GROTTO,           RG_BLUE_RUPEE, {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,     false);
+    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_RIGHT] = Location::Base(RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_RIGHT, RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_LOST_WOODS,            ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(121,  0x14), 0x00, "Near Shortcuts Grotto Beehive Right", "LW Near Shortcuts Grotto Beehive Right", RHT_BEEHIVE_CHEST_GROTTO,           RG_RED_RUPEE,  {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,     false);
+    locationTable[RC_LW_DEKU_SCRUB_GROTTO_BEEHIVE]           = Location::Base(RC_LW_DEKU_SCRUB_GROTTO_BEEHIVE,           RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_LOST_WOODS,            ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(747,  0xF5), 0x00, "Deku Scrub Grotto Beehive",           "LW Deku Scrub Grotto Beehive",           RHT_BEEHIVE_SCRUB_PAIR_GROTTO,      RG_RED_RUPEE,  {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,     false);
+    locationTable[RC_SFM_STORMS_GROTTO_BEEHIVE]              = Location::Base(RC_SFM_STORMS_GROTTO_BEEHIVE,              RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_SACRED_FOREST_MEADOW,  ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(2262, 0xEE), 0x00, "Storms Grotto Beehive",               "SFM Storms Grotto Beehive",              RHT_BEEHIVE_SCRUB_PAIR_GROTTO,      RG_RED_RUPEE,  {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,     false);
+    locationTable[RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_LEFT]     = Location::Base(RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_LEFT,     RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_HYRULE_FIELD,          ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(-144, 0x00), 0x00, "Near Market Grotto Beehive Left",     "HF Near Market Grotto Beehive Left",     RHT_BEEHIVE_CHEST_GROTTO,           RG_BLUE_RUPEE, {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD,   false);
+    locationTable[RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_RIGHT]    = Location::Base(RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_RIGHT,    RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_HYRULE_FIELD,          ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(121,  0x00), 0x00, "Near Market Grotto Beehive Right",    "HF Near Market Grotto Beehive Right",    RHT_BEEHIVE_CHEST_GROTTO,           RG_RED_RUPEE,  {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD,   false);
+    locationTable[RC_HF_OPEN_GROTTO_BEEHIVE_LEFT]            = Location::Base(RC_HF_OPEN_GROTTO_BEEHIVE_LEFT,            RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_HYRULE_FIELD,          ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(-144, 0x03), 0x00, "Open Grotto Beehive Left",            "HF Open Grotto Beehive Left",            RHT_BEEHIVE_CHEST_GROTTO,           RG_BLUE_RUPEE, {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD,   false);
+    locationTable[RC_HF_OPEN_GROTTO_BEEHIVE_RIGHT]           = Location::Base(RC_HF_OPEN_GROTTO_BEEHIVE_RIGHT,           RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_HYRULE_FIELD,          ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(121,  0x03), 0x00, "Open Grotto Beehive Right",           "HF Open Grotto Beehive Right",           RHT_BEEHIVE_CHEST_GROTTO,           RG_RED_RUPEE,  {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD,   false);
+    locationTable[RC_HF_SOUTHEAST_GROTTO_BEEHIVE_LEFT]       = Location::Base(RC_HF_SOUTHEAST_GROTTO_BEEHIVE_LEFT,       RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_HYRULE_FIELD,          ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(-144, 0x22), 0x00, "Southeast Grotto Beehive Left",       "HF Southeast Grotto Beehive Left",       RHT_BEEHIVE_CHEST_GROTTO,           RG_BLUE_RUPEE, {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD,   false);
+    locationTable[RC_HF_SOUTHEAST_GROTTO_BEEHIVE_RIGHT]      = Location::Base(RC_HF_SOUTHEAST_GROTTO_BEEHIVE_RIGHT,      RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_HYRULE_FIELD,          ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(121,  0x22), 0x00, "Southeast Grotto Beehive Right",      "HF Southeast Grotto Beehive Right",      RHT_BEEHIVE_CHEST_GROTTO,           RG_RED_RUPEE,  {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD,   false);
+    locationTable[RC_HF_INSIDE_FENCE_GROTTO_BEEHIVE]         = Location::Base(RC_HF_INSIDE_FENCE_GROTTO_BEEHIVE,         RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_HYRULE_FIELD,          ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(1410, 0xE6), 0x00, "Inside Fence Grotto Beehive",         "HF Inside Fence Grotto Beehive",         RHT_BEEHIVE_LONELY_SCRUB_GROTTO,    RG_RED_RUPEE,  {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD,   false);
+    locationTable[RC_LLR_GROTTO_BEEHIVE]                     = Location::Base(RC_LLR_GROTTO_BEEHIVE,                     RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_LON_LON_RANCH,         ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(5144, 0xFC), 0x00, "Grotto Beehive",                      "LLR Grotto Beehive",                     RHT_BEEHIVE_SCRUB_TRIO_GROTTO,      RG_RED_RUPEE,  {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH,  false);
+    locationTable[RC_KAK_OPEN_GROTTO_BEEHIVE_LEFT]           = Location::Base(RC_KAK_OPEN_GROTTO_BEEHIVE_LEFT,           RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_KAKARIKO_VILLAGE,      ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(-144, 0x28), 0x00, "Open Grotto Beehive Left",            "Kak Open Grotto Beehive Left",           RHT_BEEHIVE_CHEST_GROTTO,           RG_BLUE_RUPEE, {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       false);
+    locationTable[RC_KAK_OPEN_GROTTO_BEEHIVE_RIGHT]          = Location::Base(RC_KAK_OPEN_GROTTO_BEEHIVE_RIGHT,          RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_KAKARIKO_VILLAGE,      ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(121,  0x28), 0x00, "Open Grotto Beehive Right",           "Kak Open Grotto Beehive Right",          RHT_BEEHIVE_CHEST_GROTTO,           RG_RED_RUPEE,  {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       false);
+    locationTable[RC_DMT_COW_GROTTO_BEEHIVE]                 = Location::Base(RC_DMT_COW_GROTTO_BEEHIVE,                 RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_DEATH_MOUNTAIN_TRAIL,  ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(2617, 0xF8), 0x00, "Cow Grotto Beehive",                  "DMT Cow Grotto Beehive",                 RHT_BEEHIVE_COW_GROTTO,             RG_RED_RUPEE,  {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN, false);
+    locationTable[RC_DMT_STORMS_GROTTO_BEEHIVE_LEFT]         = Location::Base(RC_DMT_STORMS_GROTTO_BEEHIVE_LEFT,         RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_DEATH_MOUNTAIN_TRAIL,  ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(-144, 0x57), 0x00, "Storms Grotto Beehive Left",          "DMT Storms Grotto Beehive Left",         RHT_BEEHIVE_CHEST_GROTTO,           RG_BLUE_RUPEE, {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN, false);
+    locationTable[RC_DMT_STORMS_GROTTO_BEEHIVE_RIGHT]        = Location::Base(RC_DMT_STORMS_GROTTO_BEEHIVE_RIGHT,        RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_DEATH_MOUNTAIN_TRAIL,  ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(121,  0x57), 0x00, "Storms Grotto Beehive Right",         "DMT Storms Grotto Beehive Right",        RHT_BEEHIVE_CHEST_GROTTO,           RG_RED_RUPEE,  {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN, false);
+    locationTable[RC_GC_GROTTO_BEEHIVE]                      = Location::Base(RC_GC_GROTTO_BEEHIVE,                      RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_GORON_CITY,            ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(5144, 0xFB), 0x00, "Grotto Beehive",                      "GC Grotto Beehive",                      RHT_BEEHIVE_SCRUB_TRIO_GROTTO,      RG_RED_RUPEE,  {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_GORON_CITY,     false);
+    locationTable[RC_DMC_UPPER_GROTTO_BEEHIVE_LEFT]          = Location::Base(RC_DMC_UPPER_GROTTO_BEEHIVE_LEFT,          RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_DEATH_MOUNTAIN_CRATER, ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(-144, 0x7A), 0x00, "Upper Grotto Beehive Left",           "DMC Upper Grotto Beehive Left",          RHT_BEEHIVE_CHEST_GROTTO,           RG_BLUE_RUPEE, {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN, false);
+    locationTable[RC_DMC_UPPER_GROTTO_BEEHIVE_RIGHT]         = Location::Base(RC_DMC_UPPER_GROTTO_BEEHIVE_RIGHT,         RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_DEATH_MOUNTAIN_CRATER, ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(121,  0x7A), 0x00, "Upper Grotto Beehive Right",          "DMC Upper Grotto Beehive Right",         RHT_BEEHIVE_CHEST_GROTTO,           RG_RED_RUPEE,  {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN, false);
+    locationTable[RC_DMC_HAMMER_GROTTO_BEEHIVE]              = Location::Base(RC_DMC_HAMMER_GROTTO_BEEHIVE,              RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_DEATH_MOUNTAIN_CRATER, ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(5144, 0xF9), 0x00, "Hammer Grotto Beehive",               "DMC Hammer Grotto Beehive",              RHT_BEEHIVE_SCRUB_TRIO_GROTTO,      RG_RED_RUPEE,  {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN, false);
+    locationTable[RC_ZR_OPEN_GROTTO_BEEHIVE_LEFT]            = Location::Base(RC_ZR_OPEN_GROTTO_BEEHIVE_LEFT,            RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_ZORAS_RIVER,           ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(-144, 0x29), 0x00, "Open Grotto Beehive Left",            "ZR Open Grotto Beehive Left",            RHT_BEEHIVE_CHEST_GROTTO,           RG_BLUE_RUPEE, {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,    false);
+    locationTable[RC_ZR_OPEN_GROTTO_BEEHIVE_RIGHT]           = Location::Base(RC_ZR_OPEN_GROTTO_BEEHIVE_RIGHT,           RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_ZORAS_RIVER,           ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(121,  0x29), 0x00, "Open Grotto Beehive Right",           "ZR Open Grotto Beehive Right",           RHT_BEEHIVE_CHEST_GROTTO,           RG_RED_RUPEE,  {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,    false);
+    locationTable[RC_ZR_STORMS_GROTTO_BEEHIVE]               = Location::Base(RC_ZR_STORMS_GROTTO_BEEHIVE,               RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_ZORAS_RIVER,           ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(2262, 0xEB), 0x00, "Storms Grotto Beehive",               "ZR Storms Grotto Beehive",               RHT_BEEHIVE_SCRUB_PAIR_GROTTO,      RG_RED_RUPEE,  {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,    false);
+    locationTable[RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_LEFT]  = Location::Base(RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_LEFT,  RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_ZORAS_DOMAIN,          ACTOR_OBJ_COMB, SCENE_ZORAS_DOMAIN, TWO_ACTOR_PARAMS(382,  0x00), 0x00, "In Front of King Zora Beehive Left",  "ZD In Front of King Zora Beehive Left",  RHT_BEEHIVE_IN_FRONT_OF_KING_ZORA,  RG_BLUE_RUPEE, {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,   false);
+    locationTable[RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_RIGHT] = Location::Base(RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_RIGHT, RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_ZORAS_DOMAIN,          ACTOR_OBJ_COMB, SCENE_ZORAS_DOMAIN, TWO_ACTOR_PARAMS(948,  0x00), 0x00, "In Front of King Zora Beehive Right", "ZD In Front of King Zora Beehive Right", RHT_BEEHIVE_IN_FRONT_OF_KING_ZORA,  RG_RED_RUPEE,  {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,   false);
+    locationTable[RC_ZD_BEHIND_KING_ZORA_BEEHIVE]            = Location::Base(RC_ZD_BEHIND_KING_ZORA_BEEHIVE,            RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_ZORAS_DOMAIN,          ACTOR_OBJ_COMB, SCENE_ZORAS_DOMAIN, TWO_ACTOR_PARAMS(701,  0x00), 0x00, "Behind King Zora Beehive",            "ZD Behind King Zora Beehive",            RHT_BEEHIVE_BEHIND_KING_ZORA,       RG_RED_RUPEE,  {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,   false);
+    locationTable[RC_LH_GROTTO_BEEHIVE]                      = Location::Base(RC_LH_GROTTO_BEEHIVE,                      RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_LAKE_HYLIA,            ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(5144, 0xEF), 0x00, "Grotto Beehive",                      "LH Grotto Beehive",                      RHT_BEEHIVE_SCRUB_TRIO_GROTTO,      RG_RED_RUPEE,  {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,     false);
+    locationTable[RC_GV_DEKU_SCRUB_GROTTO_BEEHIVE]           = Location::Base(RC_GV_DEKU_SCRUB_GROTTO_BEEHIVE,           RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_GERUDO_VALLEY,         ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(2262, 0xF0), 0x00, "Deku Scrub Grotto Beehive",           "GV Deku Scrub Grotto Beehive",           RHT_BEEHIVE_SCRUB_PAIR_GROTTO,      RG_RED_RUPEE,  {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  false);
+    locationTable[RC_COLOSSUS_GROTTO_BEEHIVE]                = Location::Base(RC_COLOSSUS_GROTTO_BEEHIVE,                RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_DESERT_COLOSSUS,       ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(2262, 0xFD), 0x00, "Grotto Beehive",                      "Colossus Grotto Beehive",                RHT_BEEHIVE_SCRUB_PAIR_GROTTO,      RG_RED_RUPEE,  {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  false);
+
     // Cows       Randomizer Check                             Randomizer Check            Quest         Type        Area                         Actor ID      Scene ID                 Params                        Flags Short Name           Spoiler Name               Hint Text Key                Vanilla Item Categories      Spoiler Collection Check                 Collection Check Group
     locationTable[RC_KF_LINKS_HOUSE_COW] =      Location::Base(RC_KF_LINKS_HOUSE_COW,      RCQUEST_BOTH, RCTYPE_COW, RCAREA_KOKIRI_FOREST,        ACTOR_EN_COW, SCENE_LINKS_HOUSE,       0x00,                         0x15, "Links House Cow",   "KF Links House Cow",      RHT_KF_LINKS_HOUSE_COW,      RG_MILK, { Category::cCow }, SpoilerCollectionCheck::Cow(0x34, 0x15), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
     locationTable[RC_HF_COW_GROTTO_COW] =       Location::Base(RC_HF_COW_GROTTO_COW,       RCQUEST_BOTH, RCTYPE_COW, RCAREA_HYRULE_FIELD,         ACTOR_EN_COW, SCENE_GROTTOS,           TWO_ACTOR_PARAMS(3485, -291), 0x16, "Cow Grotto Cow",    "HF Cow Grotto Cow",       RHT_HF_COW_GROTTO_COW,       RG_MILK, { Category::cCow }, SpoilerCollectionCheck::Cow(0x3E, 0x16), SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
diff --git a/soh/soh/Enhancements/randomizer/logic.cpp b/soh/soh/Enhancements/randomizer/logic.cpp
index 90e956b0b..293295e92 100644
--- a/soh/soh/Enhancements/randomizer/logic.cpp
+++ b/soh/soh/Enhancements/randomizer/logic.cpp
@@ -331,6 +331,8 @@ namespace Rando {
         CanOpenStormGrotto  = CanUse(RG_SONG_OF_STORMS) && (ShardOfAgony || ctx->GetTrickOption(RT_GROTTOS_WITHOUT_AGONY));
         HookshotOrBoomerang = CanUse(RG_HOOKSHOT) || CanUse(RG_BOOMERANG);
         CanGetNightTimeGS   = (CanUse(RG_SUNS_SONG) || !ctx->GetOption(RSK_SKULLS_SUNS_SONG));
+        CanBreakUpperBeehives = HookshotOrBoomerang || (ctx->GetTrickOption(RT_BOMBCHU_BEEHIVES) && HasBombchus);
+        CanBreakLowerBeehives = CanBreakUpperBeehives || Bombs;
         CanFish = CanUse(RG_FISHING_POLE) || !ctx->GetOption(RSK_SHUFFLE_FISHING_POLE);
         CanGetChildFish = CanFish && (IsChild || (IsAdult && !ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT)));
         CanGetAdultFish = CanFish && IsAdult && ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT);
@@ -748,14 +750,16 @@ namespace Rando {
         CanSummonGossipFairy = false;
         CanSummonGossipFairyWithoutSuns = false;
         //CanPlantBean        = false;
-        CanOpenBombGrotto   = false;
-        CanOpenStormGrotto  = false;
-        BigPoeKill          = false;
-        HookshotOrBoomerang = false;
-        CanGetChildFish     = false;
-        CanGetAdultFish     = false;
-        FishingPole         = false;
-        CanFish             = false;
+        CanOpenBombGrotto     = false;
+        CanOpenStormGrotto    = false;
+        BigPoeKill            = false;
+        HookshotOrBoomerang   = false;
+        CanBreakUpperBeehives = false;
+        CanBreakLowerBeehives = false;
+        CanGetChildFish       = false;
+        CanGetAdultFish       = false;
+        FishingPole           = false;
+        CanFish               = false;
 
         BaseHearts      = ctx->GetOption(RSK_STARTING_HEARTS).Value<uint8_t>() + 1;
         Hearts          = 0;
diff --git a/soh/soh/Enhancements/randomizer/logic.h b/soh/soh/Enhancements/randomizer/logic.h
index dfad1077e..425aba55e 100644
--- a/soh/soh/Enhancements/randomizer/logic.h
+++ b/soh/soh/Enhancements/randomizer/logic.h
@@ -295,6 +295,8 @@ class Logic {
     bool BigPoeKill = false;
     bool HookshotOrBoomerang = false;
     bool CanGetNightTimeGS = false;
+    bool CanBreakLowerBeehives = false;
+    bool CanBreakUpperBeehives = false;
     bool FishingPole = false;
     bool CanGetChildFish = false;
     bool CanGetAdultFish = false;
diff --git a/soh/soh/Enhancements/randomizer/option_descriptions.cpp b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
index 0fd5c2572..62d1526d1 100644
--- a/soh/soh/Enhancements/randomizer/option_descriptions.cpp
+++ b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
@@ -273,6 +273,8 @@ void Settings::CreateOptionDescriptions() {
         "Expensive - Scrubs will be shuffled and their item will cost the vanilla price.\n"
         "\n"
         "Random - Scrubs will be shuffled and their item will cost will be between 0-95 rupees.\n";
+    mOptionDescriptions[RSK_SHUFFLE_BEEHIVES] =
+        "Beehives give a randomized item from the pool when broken.";
     mOptionDescriptions[RSK_SHUFFLE_COWS] =
         "Cows give a randomized item from the pool upon performing Epona's Song in front of them.";
     mOptionDescriptions[RSK_SHUFFLE_MAGIC_BEANS] =
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index 41f937828..3dc49988c 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -1540,6 +1540,38 @@ std::map<RandomizerCheck, RandomizerInf> rcToRandomizerInf = {
     { RC_LH_ADULT_FISHING,                                            RAND_INF_ADULT_FISHING },
     { RC_MARKET_10_BIG_POES,                                          RAND_INF_10_BIG_POES },
     { RC_KAK_100_GOLD_SKULLTULA_REWARD,                               RAND_INF_KAK_100_GOLD_SKULLTULA_REWARD },
+    { RC_KF_STORMS_GROTTO_BEEHIVE_LEFT,                               RAND_INF_BEEHIVE_KF_STORMS_GROTTO_LEFT },
+    { RC_KF_STORMS_GROTTO_BEEHIVE_RIGHT,                              RAND_INF_BEEHIVE_KF_STORMS_GROTTO_RIGHT },
+    { RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_LEFT,                       RAND_INF_BEEHIVE_LW_NEAR_SHORTCUTS_GROTTO_LEFT },
+    { RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_RIGHT,                      RAND_INF_BEEHIVE_LW_NEAR_SHORTCUTS_GROTTO_RIGHT },
+    { RC_LW_DEKU_SCRUB_GROTTO_BEEHIVE,                                RAND_INF_BEEHIVE_LW_DEKU_SCRUB_GROTTO },
+    { RC_SFM_STORMS_GROTTO_BEEHIVE,                                   RAND_INF_BEEHIVE_SFM_STORMS_GROTTO },
+    { RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_LEFT,                          RAND_INF_BEEHIVE_HF_NEAR_MARKET_GROTTO_LEFT },
+    { RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_RIGHT,                         RAND_INF_BEEHIVE_HF_NEAR_MARKET_GROTTO_RIGHT },
+    { RC_HF_OPEN_GROTTO_BEEHIVE_LEFT,                                 RAND_INF_BEEHIVE_HF_OPEN_GROTTO_LEFT },
+    { RC_HF_OPEN_GROTTO_BEEHIVE_RIGHT,                                RAND_INF_BEEHIVE_HF_OPEN_GROTTO_RIGHT },
+    { RC_HF_SOUTHEAST_GROTTO_BEEHIVE_LEFT,                            RAND_INF_BEEHIVE_HF_SOUTHEAST_GROTTO_LEFT },
+    { RC_HF_SOUTHEAST_GROTTO_BEEHIVE_RIGHT,                           RAND_INF_BEEHIVE_HF_SOUTHEAST_GROTTO_RIGHT },
+    { RC_HF_INSIDE_FENCE_GROTTO_BEEHIVE,                              RAND_INF_BEEHIVE_HF_INSIDE_FENCE_GROTTO },
+    { RC_LLR_GROTTO_BEEHIVE,                                          RAND_INF_BEEHIVE_LLR_GROTTO },
+    { RC_KAK_OPEN_GROTTO_BEEHIVE_LEFT,                                RAND_INF_BEEHIVE_KAK_OPEN_GROTTO_LEFT },
+    { RC_KAK_OPEN_GROTTO_BEEHIVE_RIGHT,                               RAND_INF_BEEHIVE_KAK_OPEN_GROTTO_RIGHT },
+    { RC_DMT_COW_GROTTO_BEEHIVE,                                      RAND_INF_BEEHIVE_DMT_COW_GROTTO },
+    { RC_DMT_STORMS_GROTTO_BEEHIVE_LEFT,                              RAND_INF_BEEHIVE_DMT_STORMS_GROTTO_LEFT },
+    { RC_DMT_STORMS_GROTTO_BEEHIVE_RIGHT,                             RAND_INF_BEEHIVE_DMT_STORMS_GROTTO_RIGHT },
+    { RC_GC_GROTTO_BEEHIVE,                                           RAND_INF_BEEHIVE_GC_GROTTO },
+    { RC_DMC_UPPER_GROTTO_BEEHIVE_LEFT,                               RAND_INF_BEEHIVE_DMC_UPPER_GROTTO_LEFT },
+    { RC_DMC_UPPER_GROTTO_BEEHIVE_RIGHT,                              RAND_INF_BEEHIVE_DMC_UPPER_GROTTO_RIGHT },
+    { RC_DMC_HAMMER_GROTTO_BEEHIVE,                                   RAND_INF_BEEHIVE_DMC_HAMMER_GROTTO },
+    { RC_ZR_OPEN_GROTTO_BEEHIVE_LEFT,                                 RAND_INF_BEEHIVE_ZR_OPEN_GROTTO_LEFT },
+    { RC_ZR_OPEN_GROTTO_BEEHIVE_RIGHT,                                RAND_INF_BEEHIVE_ZR_OPEN_GROTTO_RIGHT },
+    { RC_ZR_STORMS_GROTTO_BEEHIVE,                                    RAND_INF_BEEHIVE_ZR_STORMS_GROTTO },
+    { RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_LEFT,                       RAND_INF_BEEHIVE_ZD_IN_FRONT_OF_KING_ZORA_LEFT },
+    { RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_RIGHT,                      RAND_INF_BEEHIVE_ZD_IN_FRONT_OF_KING_ZORA_RIGHT },
+    { RC_ZD_BEHIND_KING_ZORA_BEEHIVE,                                 RAND_INF_BEEHIVE_ZD_BEHIND_KING_ZORA },
+    { RC_LH_GROTTO_BEEHIVE,                                           RAND_INF_BEEHIVE_LH_GROTTO },
+    { RC_GV_DEKU_SCRUB_GROTTO_BEEHIVE,                                RAND_INF_BEEHIVE_GV_DEKU_SCRUB_GROTTO },
+    { RC_COLOSSUS_GROTTO_BEEHIVE,                                     RAND_INF_BEEHIVE_COLOSSUS_GROTTO },
     { RC_LH_CHILD_FISH_1,                                             RAND_INF_CHILD_FISH_1 },
     { RC_LH_CHILD_FISH_2,                                             RAND_INF_CHILD_FISH_2 },
     { RC_LH_CHILD_FISH_3,                                             RAND_INF_CHILD_FISH_3 },
@@ -1589,6 +1621,28 @@ std::map<RandomizerCheck, RandomizerInf> rcToRandomizerInf = {
     { RC_ZD_FISH_5,                                                   RAND_INF_ZD_FISH_5 },
 };
 
+BeehiveIdentity Randomizer::IdentifyBeehive(s32 sceneNum, s16 xPosition, s32 respawnData) {
+    struct BeehiveIdentity beehiveIdentity;
+
+    beehiveIdentity.randomizerInf = RAND_INF_MAX;
+    beehiveIdentity.randomizerCheck = RC_UNKNOWN_CHECK;
+
+    if (sceneNum == SCENE_GROTTOS) {
+        respawnData = TWO_ACTOR_PARAMS(xPosition, respawnData);
+    } else {
+        respawnData = TWO_ACTOR_PARAMS(xPosition, 0);
+    }
+
+    Rando::Location* location = GetCheckObjectFromActor(ACTOR_OBJ_COMB, sceneNum, respawnData);
+
+    if (location->GetRandomizerCheck() != RC_UNKNOWN_CHECK) {
+        beehiveIdentity.randomizerInf = rcToRandomizerInf[location->GetRandomizerCheck()];
+        beehiveIdentity.randomizerCheck = location->GetRandomizerCheck();
+    }
+
+    return beehiveIdentity;
+}
+
 Rando::Location* Randomizer::GetCheckObjectFromActor(s16 actorId, s16 sceneNum, s32 actorParams = 0x00) {
     auto fs = OTRGlobals::Instance->gRandoContext->GetFishsanity();
     RandomizerCheck specialRc = RC_UNKNOWN_CHECK;
diff --git a/soh/soh/Enhancements/randomizer/randomizer.h b/soh/soh/Enhancements/randomizer/randomizer.h
index 23a63a074..4d5a2ff30 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.h
+++ b/soh/soh/Enhancements/randomizer/randomizer.h
@@ -52,6 +52,7 @@ class Randomizer {
     RandomizerInf GetRandomizerInfFromCheck(RandomizerCheck rc);
     Rando::Location* GetCheckObjectFromActor(s16 actorId, s16 sceneNum, s32 actorParams);
     ScrubIdentity IdentifyScrub(s32 sceneNum, s32 actorParams, s32 respawnData);
+    BeehiveIdentity IdentifyBeehive(s32 sceneNum, s16 xPosition, s32 respawnData);
     ShopItemIdentity IdentifyShopItem(s32 sceneNum, u8 slotIndex);
     CowIdentity IdentifyCow(s32 sceneNum, s32 posX, s32 posZ);
     FishIdentity IdentifyFish(s32 sceneNum, s32 actorParams);
diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h
index 2ab5bd745..6822bc650 100644
--- a/soh/soh/Enhancements/randomizer/randomizerTypes.h
+++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@@ -112,6 +112,7 @@ typedef enum {
     RCTYPE_BOSS_HEART_OR_OTHER_REWARD, // Boss heart container or lesser dungeon rewards (lens, ice arrow)
     RCTYPE_DUNGEON_REWARD,             // Dungeon rewards (blue warps)
     RCTYPE_OCARINA,                    // Ocarina locations
+    RCTYPE_BEEHIVE,                    // Beehives
     RCTYPE_FISH,
 } RandomizerCheckType;
 
@@ -1426,6 +1427,38 @@ typedef enum {
     RC_ZR_NEAR_DOMAIN_GOSSIP_STONE,
     RC_ZR_NEAR_GROTTOS_GOSSIP_STONE,
     RC_ZR_OPEN_GROTTO_GOSSIP_STONE,
+    RC_KF_STORMS_GROTTO_BEEHIVE_LEFT,
+    RC_KF_STORMS_GROTTO_BEEHIVE_RIGHT,
+    RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_LEFT,
+    RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_RIGHT,
+    RC_LW_DEKU_SCRUB_GROTTO_BEEHIVE,
+    RC_SFM_STORMS_GROTTO_BEEHIVE,
+    RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_LEFT,
+    RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_RIGHT,
+    RC_HF_OPEN_GROTTO_BEEHIVE_LEFT,
+    RC_HF_OPEN_GROTTO_BEEHIVE_RIGHT,
+    RC_HF_SOUTHEAST_GROTTO_BEEHIVE_LEFT,
+    RC_HF_SOUTHEAST_GROTTO_BEEHIVE_RIGHT,
+    RC_HF_INSIDE_FENCE_GROTTO_BEEHIVE,
+    RC_LLR_GROTTO_BEEHIVE,
+    RC_KAK_OPEN_GROTTO_BEEHIVE_LEFT,
+    RC_KAK_OPEN_GROTTO_BEEHIVE_RIGHT,
+    RC_DMT_COW_GROTTO_BEEHIVE,
+    RC_DMT_STORMS_GROTTO_BEEHIVE_LEFT,
+    RC_DMT_STORMS_GROTTO_BEEHIVE_RIGHT,
+    RC_GC_GROTTO_BEEHIVE,
+    RC_DMC_UPPER_GROTTO_BEEHIVE_LEFT,
+    RC_DMC_UPPER_GROTTO_BEEHIVE_RIGHT,
+    RC_DMC_HAMMER_GROTTO_BEEHIVE,
+    RC_ZR_OPEN_GROTTO_BEEHIVE_LEFT,
+    RC_ZR_OPEN_GROTTO_BEEHIVE_RIGHT,
+    RC_ZR_STORMS_GROTTO_BEEHIVE,
+    RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_LEFT,
+    RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_RIGHT,
+    RC_ZD_BEHIND_KING_ZORA_BEEHIVE,
+    RC_LH_GROTTO_BEEHIVE,
+    RC_GV_DEKU_SCRUB_GROTTO_BEEHIVE,
+    RC_COLOSSUS_GROTTO_BEEHIVE,
     RC_GANONDORF_HINT,
     RC_SHEIK_HINT_GC,
     RC_SHEIK_HINT_MQ_GC,
@@ -1466,6 +1499,7 @@ typedef enum {
     RT_BUNNY_HOOD_JUMPS,
     RT_DAMAGE_BOOST_SIMPLE,
     RT_HOVER_BOOST_SIMPLE,
+    RT_BOMBCHU_BEEHIVES,
     RT_KF_ADULT_GS,                            // -- location tricks
     RT_LW_BRIDGE,
     RT_LW_MIDO_BACKFLIP,
@@ -2922,6 +2956,14 @@ typedef enum {
     RHT_GANONS_TOWER_BOSS_KEY_CHEST,
     RHT_DELIVER_RUTOS_LETTER,
     RHT_MASTER_SWORD_PEDESTAL,
+    // Beehives
+    RHT_BEEHIVE_CHEST_GROTTO,
+    RHT_BEEHIVE_COW_GROTTO,
+    RHT_BEEHIVE_LONELY_SCRUB_GROTTO,
+    RHT_BEEHIVE_SCRUB_PAIR_GROTTO,
+    RHT_BEEHIVE_SCRUB_TRIO_GROTTO,
+    RHT_BEEHIVE_IN_FRONT_OF_KING_ZORA,
+    RHT_BEEHIVE_BEHIND_KING_ZORA,
     // Items
     RHT_KOKIRI_SWORD,
     RHT_MASTER_SWORD,
@@ -3494,6 +3536,7 @@ typedef enum {
     RSK_SHOPSANITY_PRICES,
     RSK_SHOPSANITY_PRICES_AFFORDABLE,
     RSK_SHUFFLE_SCRUBS,
+    RSK_SHUFFLE_BEEHIVES,
     RSK_SHUFFLE_COWS,
     RSK_SHUFFLE_WEIRD_EGG,
     RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD,
@@ -3977,6 +4020,11 @@ typedef enum {
     CANT_OBTAIN_NEED_EMPTY_BOTTLE,
 } ItemObtainability;
 
+typedef struct BeehiveIdentity {
+    RandomizerInf randomizerInf;
+    RandomizerCheck randomizerCheck;
+} BeehiveIdentity;
+
 typedef struct ScrubIdentity {
     RandomizerInf randomizerInf;
     RandomizerCheck randomizerCheck;
diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp
index 3fa6b82d6..bbd4682ce 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp
@@ -153,6 +153,7 @@ void RandomizerCheckObjects::UpdateImGuiVisibility() {
               RandomizerCheckObjects::AreaIsOverworld(location.GetArea())) ||
              ((CVarGetInteger("gRandomizeShuffleTokens", RO_TOKENSANITY_OFF) == RO_TOKENSANITY_DUNGEONS) &&
               RandomizerCheckObjects::AreaIsDungeon(location.GetArea()))) &&
+            (location.GetRCType() != RCTYPE_BEEHIVE || CVarGetInteger("gRandomizeShuffleBeehives", RO_GENERIC_NO)) &&
             (location.GetRCType() != RCTYPE_COW || CVarGetInteger("gRandomizeShuffleCows", RO_GENERIC_NO)) &&
             (location.GetRCType() != RCTYPE_FISH || ctx->GetFishsanity()->GetFishLocationIncluded(&location, FSO_SOURCE_CVARS)) &&
             (location.GetRCType() != RCTYPE_ADULT_TRADE ||
diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
index 82c2f98fd..2dc6d2271 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
@@ -59,6 +59,7 @@ bool showDungeonTokens;
 bool showBeans;
 bool showScrubs;
 bool showMerchants;
+bool showBeehives;
 bool showCows;
 bool showAdultTrade;
 bool showKokiriSword;
@@ -1091,6 +1092,9 @@ void LoadSettings() {
     showMerchants = IS_RANDO ?
         OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_MERCHANTS) != RO_SHUFFLE_MERCHANTS_OFF
         : true;
+    showBeehives = IS_RANDO ?
+        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_BEEHIVES) == RO_GENERIC_YES
+        : false;
     showCows = IS_RANDO ?
         OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_COWS) == RO_GENERIC_YES
         : false;
@@ -1208,6 +1212,7 @@ bool IsVisibleInCheckTracker(RandomizerCheck rc) {
                 rc == RC_LW_DEKU_SCRUB_GROTTO_FRONT
                 ) &&
             (loc->GetRCType() != RCTYPE_MERCHANT || showMerchants) &&
+            (loc->GetRCType() != RCTYPE_BEEHIVE || showBeehives) &&
             (loc->GetRCType() != RCTYPE_OCARINA || showOcarinas) &&
             (loc->GetRCType() != RCTYPE_SKULL_TOKEN || alwaysShowGS ||
                 (showOverworldTokens && RandomizerCheckObjects::AreaIsOverworld(loc->GetArea())) ||
diff --git a/soh/soh/Enhancements/randomizer/randomizer_inf.h b/soh/soh/Enhancements/randomizer/randomizer_inf.h
index 8cc8e7fb3..4c90aee18 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_inf.h
+++ b/soh/soh/Enhancements/randomizer/randomizer_inf.h
@@ -212,6 +212,39 @@ typedef enum {
     RAND_INF_HAS_OCARINA_C_LEFT,
     RAND_INF_HAS_OCARINA_C_RIGHT,
 
+    RAND_INF_BEEHIVE_KF_STORMS_GROTTO_LEFT,
+    RAND_INF_BEEHIVE_KF_STORMS_GROTTO_RIGHT,
+    RAND_INF_BEEHIVE_LW_NEAR_SHORTCUTS_GROTTO_LEFT,
+    RAND_INF_BEEHIVE_LW_NEAR_SHORTCUTS_GROTTO_RIGHT,
+    RAND_INF_BEEHIVE_LW_DEKU_SCRUB_GROTTO,
+    RAND_INF_BEEHIVE_SFM_STORMS_GROTTO,
+    RAND_INF_BEEHIVE_HF_NEAR_MARKET_GROTTO_LEFT,
+    RAND_INF_BEEHIVE_HF_NEAR_MARKET_GROTTO_RIGHT,
+    RAND_INF_BEEHIVE_HF_OPEN_GROTTO_LEFT,
+    RAND_INF_BEEHIVE_HF_OPEN_GROTTO_RIGHT,
+    RAND_INF_BEEHIVE_HF_SOUTHEAST_GROTTO_LEFT,
+    RAND_INF_BEEHIVE_HF_SOUTHEAST_GROTTO_RIGHT,
+    RAND_INF_BEEHIVE_HF_INSIDE_FENCE_GROTTO,
+    RAND_INF_BEEHIVE_LLR_GROTTO,
+    RAND_INF_BEEHIVE_KAK_OPEN_GROTTO_LEFT,
+    RAND_INF_BEEHIVE_KAK_OPEN_GROTTO_RIGHT,
+    RAND_INF_BEEHIVE_DMT_COW_GROTTO,
+    RAND_INF_BEEHIVE_DMT_STORMS_GROTTO_LEFT,
+    RAND_INF_BEEHIVE_DMT_STORMS_GROTTO_RIGHT,
+    RAND_INF_BEEHIVE_GC_GROTTO,
+    RAND_INF_BEEHIVE_DMC_UPPER_GROTTO_LEFT,
+    RAND_INF_BEEHIVE_DMC_UPPER_GROTTO_RIGHT,
+    RAND_INF_BEEHIVE_DMC_HAMMER_GROTTO,
+    RAND_INF_BEEHIVE_ZR_OPEN_GROTTO_LEFT,
+    RAND_INF_BEEHIVE_ZR_OPEN_GROTTO_RIGHT,
+    RAND_INF_BEEHIVE_ZR_STORMS_GROTTO,
+    RAND_INF_BEEHIVE_ZD_IN_FRONT_OF_KING_ZORA_LEFT,
+    RAND_INF_BEEHIVE_ZD_IN_FRONT_OF_KING_ZORA_RIGHT,
+    RAND_INF_BEEHIVE_ZD_BEHIND_KING_ZORA,
+    RAND_INF_BEEHIVE_LH_GROTTO,
+    RAND_INF_BEEHIVE_GV_DEKU_SCRUB_GROTTO,
+    RAND_INF_BEEHIVE_COLOSSUS_GROTTO,
+
     RAND_INF_GROTTO_FISH_ZR_OPEN_GROTTO,
     RAND_INF_GROTTO_FISH_DMC_UPPER_GROTTO,
     RAND_INF_GROTTO_FISH_DMT_STORMS_GROTTO,
diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
index df886e92a..9adfd85b8 100644
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -101,6 +101,7 @@ void Settings::CreateOptions() {
     mOptions[RSK_SHOPSANITY_PRICES_AFFORDABLE] = Option::Bool("Affordable Prices", "gRandomizeShopsanityPricesAffordable", mOptionDescriptions[RSK_SHOPSANITY_PRICES_AFFORDABLE]);
     mOptions[RSK_SHUFFLE_TOKENS] = Option::U8("Tokensanity", {"Off", "Dungeons", "Overworld", "All Tokens"}, OptionCategory::Setting, "gRandomizeShuffleTokens", mOptionDescriptions[RSK_SHUFFLE_TOKENS], WidgetType::Combobox, RO_TOKENSANITY_OFF);
     mOptions[RSK_SHUFFLE_SCRUBS] = Option::U8("Scrub Shuffle", {"Off", "Affordable", "Expensive", "Random Prices"}, OptionCategory::Setting, "gRandomizeShuffleScrubs", mOptionDescriptions[RSK_SHUFFLE_SCRUBS], WidgetType::Combobox, RO_SCRUBS_OFF);
+    mOptions[RSK_SHUFFLE_BEEHIVES] = Option::Bool("Shuffle Beehives", "gRandomizeShuffleBeehives", mOptionDescriptions[RSK_SHUFFLE_BEEHIVES]);
     mOptions[RSK_SHUFFLE_COWS] = Option::Bool("Shuffle Cows", "gRandomizeShuffleCows", mOptionDescriptions[RSK_SHUFFLE_COWS]);
     mOptions[RSK_SHUFFLE_KOKIRI_SWORD] = Option::Bool("Shuffle Kokiri Sword", "gRandomizeShuffleKokiriSword", mOptionDescriptions[RSK_SHUFFLE_KOKIRI_SWORD]);
     mOptions[RSK_SHUFFLE_MASTER_SWORD] = Option::Bool("Shuffle Master Sword", "gRandomizeShuffleMasterSword", mOptionDescriptions[RSK_SHUFFLE_MASTER_SWORD]);
@@ -232,6 +233,7 @@ void Settings::CreateOptions() {
     // mTrickOptions[RT_BUNNY_HOOD_JUMPS] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED}, false, "Bunny Hood Jumps", "Allows reaching locations using Bunny Hood's extended jumps.");
     // mTrickOptions[RT_DAMAGE_BOOST_SIMPLE] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED}, false, "Simple damage boosts", "Allows damage boosts to reach Hyrule Castle guards, the bomb bag area in DC and the Gerudo Valley crate Piece of Heart. Can be combined with \"Simple hover boosts\" for reaching far distances.");
     // mTrickOptions[RT_HOVER_BOOST_SIMPLE] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED}, false, "Simple hover boosts", "Allows equipping of hover boots when link is moving at high speeds to extend distance covered. Can be combined with \"Simple damage boosts\" for greater uses.");
+    mTrickOptions[RT_BOMBCHU_BEEHIVES] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_NONE, {Tricks::Tag::NOVICE}, false, "Bombchu Beehives", "Allows exploding beehives with bombchus"),
     mTrickOptions[RT_KF_ADULT_GS] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_KOKIRI_FOREST, {Tricks::Tag::NOVICE}, false, "Adult Kokiri Forest GS with Hover Boots", "Can be obtained without Hookshot by using the Hover Boots off of one of the roots.");
     mTrickOptions[RT_LW_BRIDGE] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_THE_LOST_WOODS, {Tricks::Tag::EXPERT}, false, "Jump onto the Lost Woods Bridge as Adult with Nothing", "With very precise movement it's possible for adult to jump onto the bridge without needing Longshot, Hover Boots, or Bean.");
     mTrickOptions[RT_LW_MIDO_BACKFLIP] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_THE_LOST_WOODS, {Tricks::Tag::NOVICE}, false, "Backflip over Mido as Adult", "With a specific position and angle, you can backflip over Mido.");
@@ -661,6 +663,7 @@ void Settings::CreateOptions() {
         &mOptions[RSK_FISHSANITY_POND_COUNT],
         &mOptions[RSK_FISHSANITY_AGE_SPLIT],
         &mOptions[RSK_SHUFFLE_SCRUBS],
+        &mOptions[RSK_SHUFFLE_BEEHIVES],
         &mOptions[RSK_SHUFFLE_COWS],
         &mOptions[RSK_SHUFFLE_MAGIC_BEANS],
         &mOptions[RSK_SHUFFLE_MERCHANTS],
@@ -859,6 +862,7 @@ void Settings::CreateOptions() {
         &mOptions[RSK_SHUFFLE_FISHING_POLE],
         &mOptions[RSK_SHUFFLE_TOKENS],
         &mOptions[RSK_SHUFFLE_SCRUBS],
+        &mOptions[RSK_SHUFFLE_BEEHIVES],
         &mOptions[RSK_SHUFFLE_COWS],
         &mOptions[RSK_SHUFFLE_KOKIRI_SWORD],
         &mOptions[RSK_SHUFFLE_OCARINA],
@@ -1038,6 +1042,7 @@ void Settings::CreateOptions() {
         &mOptions[RSK_FISHSANITY_POND_COUNT],
         &mOptions[RSK_FISHSANITY_AGE_SPLIT],
         &mOptions[RSK_SHUFFLE_SCRUBS],
+        &mOptions[RSK_SHUFFLE_BEEHIVES],
         &mOptions[RSK_SHUFFLE_COWS],
         &mOptions[RSK_SHUFFLE_MAGIC_BEANS],
         &mOptions[RSK_SHUFFLE_MERCHANTS],
@@ -1079,6 +1084,7 @@ void Settings::CreateOptions() {
         { "Shuffle Settings:Split Pond Fish", RSK_FISHSANITY_AGE_SPLIT },
         { "Shuffle Settings:Shuffle Fishing Pole", RSK_SHUFFLE_FISHING_POLE },
         { "Shuffle Settings:Scrub Shuffle", RSK_SHUFFLE_SCRUBS },
+        { "Shuffle Settings:Beehive Shuffle", RSK_SHUFFLE_BEEHIVES },
         { "Shuffle Settings:Shuffle Cows", RSK_SHUFFLE_COWS },
         { "Shuffle Settings:Tokensanity", RSK_SHUFFLE_TOKENS },
         { "Shuffle Settings:Shuffle Ocarinas", RSK_SHUFFLE_OCARINA },
@@ -2225,6 +2231,7 @@ void Settings::ParseJson(nlohmann::json spoilerFileJson) {
                 case RSK_FISHSANITY_AGE_SPLIT:
                 case RSK_FISHING_POLE_HINT:
                 case RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD:
+                case RSK_SHUFFLE_BEEHIVES:
                 case RSK_SHUFFLE_COWS:
                 case RSK_SHUFFLE_ADULT_TRADE:
                 case RSK_SHUFFLE_MAGIC_BEANS:
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
index feae99c47..7603cb398 100644
--- a/soh/soh/OTRGlobals.cpp
+++ b/soh/soh/OTRGlobals.cpp
@@ -2379,6 +2379,10 @@ extern "C" ScrubIdentity Randomizer_IdentifyScrub(s32 sceneNum, s32 actorParams,
     return OTRGlobals::Instance->gRandomizer->IdentifyScrub(sceneNum, actorParams, respawnData);
 }
 
+extern "C" BeehiveIdentity Randomizer_IdentifyBeehive(s32 sceneNum, s16 xPosition, s32 respawnData) {
+    return OTRGlobals::Instance->gRandomizer->IdentifyBeehive(sceneNum, xPosition, respawnData);
+}
+
 extern "C" ShopItemIdentity Randomizer_IdentifyShopItem(s32 sceneNum, u8 slotIndex) {
     return OTRGlobals::Instance->gRandomizer->IdentifyShopItem(sceneNum, slotIndex);
 }
diff --git a/soh/soh/OTRGlobals.h b/soh/soh/OTRGlobals.h
index 143ec9ef2..d397a96a1 100644
--- a/soh/soh/OTRGlobals.h
+++ b/soh/soh/OTRGlobals.h
@@ -154,6 +154,7 @@ uint8_t GetSeedIconIndex(uint8_t index);
 u8 Randomizer_GetSettingValue(RandomizerSettingKey randoSettingKey);
 RandomizerCheck Randomizer_GetCheckFromActor(s16 actorId, s16 sceneNum, s16 actorParams);
 ScrubIdentity Randomizer_IdentifyScrub(s32 sceneNum, s32 actorParams, s32 respawnData);
+BeehiveIdentity Randomizer_IdentifyBeehive(s32 sceneNum, s16 xPosition, s32 respawnData);
 ShopItemIdentity Randomizer_IdentifyShopItem(s32 sceneNum, u8 slotIndex);
 CowIdentity Randomizer_IdentifyCow(s32 sceneNum, s32 posX, s32 posZ);
 FishIdentity Randomizer_IdentifyFish(s32 sceneNum, s32 actorParams);
diff --git a/soh/src/code/z_actor.c b/soh/src/code/z_actor.c
index cd17e1756..a24e7e43c 100644
--- a/soh/src/code/z_actor.c
+++ b/soh/src/code/z_actor.c
@@ -2075,8 +2075,8 @@ s32 GiveItemEntryFromActor(Actor* actor, PlayState* play, GetItemEntry getItemEn
  * \param play the Global Context
  * \param getItemEntry the GetItemEntry for the item you want the player to receive.
  */
-void GiveItemEntryFromActorWithFixedRange(Actor* actor, PlayState* play, GetItemEntry getItemEntry) {
-    GiveItemEntryFromActor(actor, play, getItemEntry, 50.0f, 10.0f);
+s32 GiveItemEntryFromActorWithFixedRange(Actor* actor, PlayState* play, GetItemEntry getItemEntry) {
+    return GiveItemEntryFromActor(actor, play, getItemEntry, 50.0f, 10.0f);
 }
 
 // TODO: Rename to GiveItemIdFromActor or similar
diff --git a/soh/src/code/z_en_item00.c b/soh/src/code/z_en_item00.c
index 42ea78f90..77f42aebd 100644
--- a/soh/src/code/z_en_item00.c
+++ b/soh/src/code/z_en_item00.c
@@ -348,6 +348,7 @@ void EnItem00_Init(Actor* thisx, PlayState* play) {
     f32 shadowScale = 6.0f;
     s32 getItemId = GI_NONE;
     this->randoGiEntry = (GetItemEntry)GET_ITEM_NONE;
+    this->randoCheck = (RandomizerCheck)RC_UNKNOWN_CHECK;
     s16 spawnParam8000 = this->actor.params & 0x8000;
     s32 pad1;
 
@@ -485,12 +486,11 @@ void EnItem00_Init(Actor* thisx, PlayState* play) {
     this->actor.shape.shadowAlpha = 180;
     this->actor.focus.pos = this->actor.world.pos;
     this->getItemId = GI_NONE;
-    RandomizerCheck randoCheck =
-        Randomizer_GetCheckFromActor(this->actor.id, play->sceneNum, this->ogParams);
+    this->randoCheck = Randomizer_GetCheckFromActor(this->actor.id, play->sceneNum, this->ogParams);
+    this->randoInf = RAND_INF_MAX;
 
-    if (IS_RANDO && randoCheck != RC_UNKNOWN_CHECK) {
-        this->randoGiEntry =
-            Randomizer_GetItemFromKnownCheck(randoCheck, getItemId);
+    if (IS_RANDO && this->randoCheck != RC_UNKNOWN_CHECK) {
+        this->randoGiEntry = Randomizer_GetItemFromKnownCheck(this->randoCheck, getItemId);
         this->randoGiEntry.getItemFrom = ITEM_FROM_FREESTANDING;
     }
 
@@ -581,7 +581,9 @@ void EnItem00_Init(Actor* thisx, PlayState* play) {
             if (!IS_RANDO || this->randoGiEntry.getItemId == GI_NONE) {
                 func_8002F554(&this->actor, play, getItemId);
             } else {
-                GiveItemEntryFromActorWithFixedRange(&this->actor, play, this->randoGiEntry);
+                if (GiveItemEntryFromActorWithFixedRange(&this->actor, play, this->randoGiEntry) && this->randoInf != RAND_INF_MAX) {
+                    Flags_SetRandomizerInf(this->randoInf);
+                }
             }
         }
     }
@@ -734,7 +736,9 @@ void func_8001E5C8(EnItem00* this, PlayState* play) {
             if (!IS_RANDO) {
                 func_8002F434(&this->actor, play, this->getItemId, 50.0f, 80.0f);
             } else {
-                GiveItemEntryFromActor(&this->actor, play, this->randoGiEntry, 50.0f, 80.0f);
+                if (GiveItemEntryFromActor(&this->actor, play, this->randoGiEntry, 50.0f, 80.0f) && this->randoInf != RAND_INF_MAX) {
+                    Flags_SetRandomizerInf(this->randoInf);
+                }
             }
             this->unk_15A++;
         } else {
@@ -955,7 +959,9 @@ void EnItem00_Update(Actor* thisx, PlayState* play) {
             func_8002F554(&this->actor, play, getItemId);
         } else {
             getItemId = this->randoGiEntry.getItemId;
-            GiveItemEntryFromActorWithFixedRange(&this->actor, play, this->randoGiEntry);
+            if (GiveItemEntryFromActorWithFixedRange(&this->actor, play, this->randoGiEntry) && this->randoInf != RAND_INF_MAX) {
+                Flags_SetRandomizerInf(this->randoInf);
+            }
         }
     }
 
@@ -1363,15 +1369,11 @@ static const Vtx customDropVtx[] = {
  */
 void EnItem00_DrawCollectible(EnItem00* this, PlayState* play) {
     if (IS_RANDO && (this->getItemId != GI_NONE || this->actor.params == ITEM00_SMALL_KEY)) {
-        RandomizerCheck randoCheck =
-            Randomizer_GetCheckFromActor(this->actor.id, play->sceneNum, this->ogParams);
-
-        if (randoCheck != RC_UNKNOWN_CHECK) {
-            this->randoGiEntry =
-                Randomizer_GetItemFromKnownCheck(randoCheck, GI_NONE);
+        if (this->randoCheck != RC_UNKNOWN_CHECK) {
+            this->randoGiEntry = Randomizer_GetItemFromKnownCheck(this->randoCheck, GI_NONE);
             this->randoGiEntry.getItemFrom = ITEM_FROM_FREESTANDING;
         }
-        
+
         f32 mtxScale = 10.67f;
         Matrix_Scale(mtxScale, mtxScale, mtxScale, MTXMODE_APPLY);
         EnItem00_CustomItemsParticles(&this->actor, play, this->randoGiEntry);
@@ -1457,12 +1459,8 @@ void EnItem00_DrawHeartContainer(EnItem00* this, PlayState* play) {
  */
 void EnItem00_DrawHeartPiece(EnItem00* this, PlayState* play) {
     if (IS_RANDO) {
-        RandomizerCheck randoCheck =
-            Randomizer_GetCheckFromActor(this->actor.id, play->sceneNum, this->ogParams);
-
-        if (randoCheck != RC_UNKNOWN_CHECK) {
-            this->randoGiEntry =
-                Randomizer_GetItemFromKnownCheck(randoCheck, GI_NONE);
+        if (this->randoCheck != RC_UNKNOWN_CHECK) {
+            this->randoGiEntry = Randomizer_GetItemFromKnownCheck(this->randoCheck, GI_NONE);
             this->randoGiEntry.getItemFrom = ITEM_FROM_FREESTANDING;
         }
 
diff --git a/soh/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c b/soh/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c
index a9e5ca2a7..0dde415e0 100644
--- a/soh/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c
+++ b/soh/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c
@@ -7,6 +7,7 @@
 #include "z_obj_comb.h"
 #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h"
 #include "objects/gameplay_field_keep/gameplay_field_keep.h"
+#include "include/z64actor.h"
 
 #define FLAGS 0
 
@@ -131,6 +132,21 @@ void ObjComb_Break(ObjComb* this, PlayState* play) {
 void ObjComb_ChooseItemDrop(ObjComb* this, PlayState* play) {
     s16 params = this->actor.params & 0x1F;
 
+    if (
+        IS_RANDO &&
+        Randomizer_GetSettingValue(RSK_SHUFFLE_BEEHIVES) &&
+        !Flags_GetRandomizerInf(this->beehiveIdentity.randomizerInf)
+    ) {
+        GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(this->beehiveIdentity.randomizerCheck, GI_NONE);
+
+        EnItem00* actor = (EnItem00*)Item_DropCollectible2(play, &this->actor.world.pos, ITEM00_SMALL_KEY);
+        actor->randoCheck = this->beehiveIdentity.randomizerCheck;
+        actor->randoGiEntry = getItemEntry;
+        actor->randoGiEntry.getItemFrom = ITEM_FROM_FREESTANDING;
+        actor->randoInf = this->beehiveIdentity.randomizerInf;
+        return;
+    }
+
     if ((params > 0) || (params < 0x1A)) {
         if (params == 6) {
             if (Flags_GetCollectible(play, (this->actor.params >> 8) & 0x3F)) {
@@ -154,6 +170,10 @@ void ObjComb_Init(Actor* thisx, PlayState* play) {
     Collider_InitJntSph(play, &this->collider);
     Collider_SetJntSph(play, &this->collider, &this->actor, &sJntSphInit, this->colliderItems);
     ObjComb_SetupWait(this);
+    if (IS_RANDO) {
+        s16 respawnData = gSaveContext.respawn[RESPAWN_MODE_RETURN].data & ((1 << 8) - 1);
+        this->beehiveIdentity = Randomizer_IdentifyBeehive(play->sceneNum, (s16)this->actor.world.pos.x, respawnData);
+    }
 }
 
 void ObjComb_Destroy(Actor* thisx, PlayState* play2) {
@@ -171,7 +191,15 @@ void ObjComb_Wait(ObjComb* this, PlayState* play) {
     s32 dmgFlags;
 
     this->unk_1B0 -= 50;
-    if (this->unk_1B0 < 0) {
+    if (
+        IS_RANDO &&
+        Randomizer_GetSettingValue(RSK_SHUFFLE_BEEHIVES) &&
+        !Flags_GetRandomizerInf(this->beehiveIdentity.randomizerInf)
+    ) {
+        if (this->unk_1B0 <= -5000) {
+            this->unk_1B0 = 1500;
+        }
+    } else if (this->unk_1B0 < 0) {
         this->unk_1B0 = 0;
     }
 
@@ -199,7 +227,12 @@ void ObjComb_Update(Actor* thisx, PlayState* play) {
 
     this->unk_1B2 += 0x2EE0;
     this->actionFunc(this, play);
-    this->actor.shape.rot.x = Math_SinS(this->unk_1B2) * this->unk_1B0 + this->actor.home.rot.x;
+    s16 wiggleOffset = this->unk_1B0;
+    
+    if (IS_RANDO && this->unk_1B0 < 0) {
+        wiggleOffset = 0;
+    }
+    this->actor.shape.rot.x = Math_SinS(this->unk_1B2) * wiggleOffset + this->actor.home.rot.x;
 }
 
 void ObjComb_Draw(Actor* thisx, PlayState* play) {
diff --git a/soh/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h b/soh/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h
index 68640544f..f7713a961 100644
--- a/soh/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h
+++ b/soh/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h
@@ -15,6 +15,7 @@ typedef struct ObjComb {
     /* 0x0170 */ ColliderJntSphElement colliderItems[1];
     /* 0x01B0 */ s16 unk_1B0;
     /* 0x01B2 */ s16 unk_1B2;
+    /*        */ BeehiveIdentity beehiveIdentity;
 } ObjComb; // size = 0x01B4
 
 #endif

From ab3e9a7e54188586616cc902e6d61cb167953b8c Mon Sep 17 00:00:00 2001
From: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>
Date: Sun, 14 Jan 2024 20:55:03 +0100
Subject: [PATCH 067/230] Rando: Shuffle Child's Wallet (Rando V3) (#3794)

* Shuffle Child's Wallet

* Add support for "More info in file select"

* Fix build

* Fix build

* Update randomizer.cpp

* Update locacc_hyrule_field.cpp
---
 .../Enhancements/debugger/debugSaveEditor.h   |   4 +-
 soh/soh/Enhancements/mods.cpp                 |  11 +-
 .../randomizer/3drando/item_pool.cpp          |   5 +
 .../randomizer/3drando/location_access.cpp    |  10 +-
 .../location_access/locacc_castle_town.cpp    |  14 +-
 .../location_access/locacc_gerudo_valley.cpp  |   6 +-
 .../location_access/locacc_hyrule_field.cpp   |   6 +-
 .../location_access/locacc_kakariko.cpp       |   4 +-
 .../location_access/locacc_zoras_domain.cpp   |   4 +-
 soh/soh/Enhancements/randomizer/item.cpp      |  11 +-
 soh/soh/Enhancements/randomizer/item_list.cpp |   1 +
 soh/soh/Enhancements/randomizer/logic.cpp     |  11 +-
 soh/soh/Enhancements/randomizer/logic.h       |   1 +
 .../randomizer/option_descriptions.cpp        |   4 +
 .../Enhancements/randomizer/randomizer.cpp    |  20 ++-
 .../Enhancements/randomizer/randomizerTypes.h |   3 +
 .../Enhancements/randomizer/randomizer_inf.h  |   2 +
 .../randomizer/randomizer_item_tracker.cpp    |   4 +-
 soh/soh/Enhancements/randomizer/savefile.cpp  |   4 +
 soh/soh/Enhancements/randomizer/settings.cpp  |   4 +
 soh/soh/SaveManager.cpp                       |   1 +
 soh/soh/SaveManager.h                         |   1 +
 soh/src/code/z_parameter.c                    | 159 ++++++++++--------
 .../ovl_file_choose/z_file_choose.c           |  60 ++++---
 24 files changed, 212 insertions(+), 138 deletions(-)

diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.h b/soh/soh/Enhancements/debugger/debugSaveEditor.h
index 310d3ebe5..eb1dde10a 100644
--- a/soh/soh/Enhancements/debugger/debugSaveEditor.h
+++ b/soh/soh/Enhancements/debugger/debugSaveEditor.h
@@ -487,7 +487,7 @@ const std::vector<FlagTable> flagTables = {
         { RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_6, "SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_6" },
         { RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_7, "SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_7" },
         { RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_8, "SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_8" },
-        
+
         { RAND_INF_MERCHANTS_CARPET_SALESMAN, "RAND_INF_MERCHANTS_CARPET_SALESMAN" },
         { RAND_INF_MERCHANTS_MEDIGORON, "RAND_INF_MERCHANTS_MEDIGORON" },
         { RAND_INF_MERCHANTS_GRANNYS_SHOP, "RAND_INF_MERCHANTS_GRANNY_SHOP"},
@@ -523,6 +523,8 @@ const std::vector<FlagTable> flagTables = {
         { RAND_INF_HAS_OCARINA_C_LEFT, "RAND_INF_HAS_OCARINA_C_LEFT"},
         { RAND_INF_HAS_OCARINA_C_RIGHT, "RAND_INF_HAS_OCARINA_C_RIGHT"},
 
+        { RAND_INF_HAS_WALLET, "RAND_INF_HAS_WALLET" },
+
         { RAND_INF_BEEHIVE_KF_STORMS_GROTTO_LEFT, "RAND_INF_BEEHIVE_KF_STORMS_GROTTO_LEFT" },
         { RAND_INF_BEEHIVE_KF_STORMS_GROTTO_RIGHT, "RAND_INF_BEEHIVE_KF_STORMS_GROTTO_RIGHT" },
         { RAND_INF_BEEHIVE_LW_NEAR_SHORTCUTS_GROTTO_LEFT, "RAND_INF_BEEHIVE_LW_NEAR_SHORTCUTS_GROTTO_LEFT" },
diff --git a/soh/soh/Enhancements/mods.cpp b/soh/soh/Enhancements/mods.cpp
index d08a9a575..cb36db76f 100644
--- a/soh/soh/Enhancements/mods.cpp
+++ b/soh/soh/Enhancements/mods.cpp
@@ -64,7 +64,7 @@ void ReloadSceneTogglingLinkAge() {
 void RegisterInfiniteMoney() {
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGameFrameUpdate>([]() {
         if (!GameInteractor::IsSaveLoaded()) return;
-        if (CVarGetInteger("gInfiniteMoney", 0) != 0) {
+        if (CVarGetInteger("gInfiniteMoney", 0) != 0 && (!IS_RANDO || Flags_GetRandomizerInf(RAND_INF_HAS_WALLET))) {
             if (gSaveContext.rupees < CUR_CAPACITY(UPG_WALLET)) {
                 gSaveContext.rupees = CUR_CAPACITY(UPG_WALLET);
             }
@@ -1284,6 +1284,14 @@ void RegisterToTMedallions() {
     });
 }
 
+void RegisterNoWallet() {
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGameFrameUpdate>([]() {
+        if (IS_RANDO && !Flags_GetRandomizerInf(RAND_INF_HAS_WALLET)) {
+            gSaveContext.rupees = 0;
+        }
+    });
+}
+
 void RegisterFishsanity() {
     static s16 fishGroupCounter = 0;
 
@@ -1467,6 +1475,7 @@ void InitMods() {
     RegisterBossSouls();
     RegisterRandomizedEnemySizes();
     RegisterToTMedallions();
+    RegisterNoWallet();
     RegisterFishsanity();
     NameTag_RegisterHooks();
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
index 6ec66b5a8..55144d237 100644
--- a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
@@ -964,6 +964,11 @@ void GenerateItemPool() {
     }
   }
 
+  if (ctx->GetOption(RSK_SHUFFLE_CHILD_WALLET)) {
+    AddItemToMainPool(RG_PROGRESSIVE_WALLET);
+  }
+
+
   if (ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC)) {
     AddItemToMainPool(RG_PROGRESSIVE_BOMBCHUS, 5);
   } else {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
index f2749bca4..6c131e8ba 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
@@ -45,18 +45,20 @@ bool LocationAccess::ConditionsMet() const {
 
 bool LocationAccess::CanBuy() const {
   auto ctx = Rando::Context::GetInstance();
-  //Not a shop location, don't need to check if buyable
-  if (!(Rando::StaticData::GetLocation(location)->IsCategory(Category::cShop))) {
+  //Not a shop or scrub location, don't need to check if buyable
+  if (!(Rando::StaticData::GetLocation(location)->IsCategory(Category::cShop)) && !(Rando::StaticData::GetLocation(location)->IsCategory(Category::cDekuScrub))) {
     return true;
   }
 
   //Check if wallet is large enough to buy item
   bool SufficientWallet = true;
   if (ctx->GetItemLocation(location)->GetPrice() > 500) {
-    SufficientWallet = logic->ProgressiveWallet >= 3;
+    SufficientWallet = logic->ProgressiveWallet >= 4;
   } else if (ctx->GetItemLocation(location)->GetPrice() > 200) {
-    SufficientWallet = logic->ProgressiveWallet >= 2;
+    SufficientWallet = logic->ProgressiveWallet >= 3;
   } else if (ctx->GetItemLocation(location)->GetPrice() > 99) {
+    SufficientWallet = logic->ProgressiveWallet >= 2;
+  } else if (ctx->GetItemLocation(location)->GetPrice() > 0) {
     SufficientWallet = logic->ProgressiveWallet >= 1;
   }
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
index 3b3f3c3ac..874cc76c1 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
@@ -199,7 +199,7 @@ void AreaTable_Init_CastleTown() {
 
   areaTable[RR_MARKET_SHOOTING_GALLERY] = Area("Market Shooting Gallery", "Market Shooting Gallery", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_MARKET_SHOOTING_GALLERY_REWARD, {[]{return logic->IsChild;}}),
+                  LocationAccess(RC_MARKET_SHOOTING_GALLERY_REWARD, {[]{return logic->IsChild && logic->ChildsWallet;}}),
                 }, {
                   //Exits
                   Entrance(RR_THE_MARKET, {[]{return true;}}),
@@ -233,12 +233,12 @@ void AreaTable_Init_CastleTown() {
   areaTable[RR_MARKET_TREASURE_CHEST_GAME] = Area("Market Treasure Chest Game", "Market Treasure Chest Game", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_GREG_HINT, {[]{return true;}}),
-                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_REWARD, {[]{return (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 6)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1));}}),
-                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_1, {[]{return (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME));}}),
-                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_2, {[]{return (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 2)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME));}}),
-                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_3, {[]{return (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 3)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME));}}),
-                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_4, {[]{return (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 4)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME));}}),
-                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_5, {[]{return (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 5)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME));}}),
+                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_REWARD, {[]{return logic->ChildsWallet && ((logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 6)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)));}}),
+                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_1, {[]{return logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)));}}),
+                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_2, {[]{return logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 2)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)));}}),
+                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_3, {[]{return logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 3)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)));}}),
+                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_4, {[]{return logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 4)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)));}}),
+                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_5, {[]{return logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 5)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)));}}),
                 }, {
                   //Exits
                   Entrance(RR_THE_MARKET, {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
index 1a3c84305..e7a6f045e 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
@@ -97,12 +97,12 @@ void AreaTable_Init_GerudoValley() {
                   //Events
                   EventAccess(&logic->CarpenterRescue, {[]{return logic->CanFinishGerudoFortress;}}),
                   EventAccess(&logic->GF_GateOpen,     {[]{return logic->IsAdult && logic->GerudoToken;}}),
-                  EventAccess(&logic->GtG_GateOpen,    {[]{return logic->GtG_GateOpen || (logic->IsAdult && logic->GerudoToken);}}),
+                  EventAccess(&logic->GtG_GateOpen,    {[]{return logic->GtG_GateOpen || (logic->IsAdult && logic->GerudoToken && logic->ChildsWallet);}}),
                 }, {
                   //Locations
                   LocationAccess(RC_GF_CHEST,              {[]{return logic->CanUse(RG_HOVER_BOOTS) || (logic->IsAdult && logic->CanUse(RG_SCARECROW)) || logic->CanUse(RG_LONGSHOT);}}),
-                  LocationAccess(RC_GF_HBA_1000_POINTS,    {[]{return logic->GerudoToken && logic->CanRideEpona && logic->Bow && logic->AtDay;}}),
-                  LocationAccess(RC_GF_HBA_1500_POINTS,    {[]{return logic->GerudoToken && logic->CanRideEpona && logic->Bow && logic->AtDay;}}),
+                  LocationAccess(RC_GF_HBA_1000_POINTS,    {[]{return logic->ChildsWallet && logic->GerudoToken && logic->CanRideEpona && logic->Bow && logic->AtDay;}}),
+                  LocationAccess(RC_GF_HBA_1500_POINTS,    {[]{return logic->ChildsWallet && logic->GerudoToken && logic->CanRideEpona && logic->Bow && logic->AtDay;}}),
                   LocationAccess(RC_GF_NORTH_F1_CARPENTER, {[]{return  logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD);}}),
                   LocationAccess(RC_GF_NORTH_F2_CARPENTER, {[]{return (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && (logic->GerudoToken || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_HOVER_BOOTS) || randoCtx->GetTrickOption(RT_GF_KITCHEN));}}),
                   LocationAccess(RC_GF_SOUTH_F1_CARPENTER, {[]{return  logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD);}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
index 1d75415d3..777154bab 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
@@ -221,8 +221,8 @@ void AreaTable_Init_HyruleField() {
 
   areaTable[RR_LON_LON_RANCH] = Area("Lon Lon Ranch", "Lon Lon Ranch", RA_LON_LON_RANCH, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->Epona,    {[]{return logic->Epona    || (logic->CanUse(RG_EPONAS_SONG) && logic->IsAdult && logic->AtDay);}}),
-                  EventAccess(&logic->LinksCow, {[]{return logic->LinksCow || (logic->CanUse(RG_EPONAS_SONG) && logic->IsAdult && logic->AtDay);}}),
+                  EventAccess(&logic->Epona,    {[]{return logic->Epona    || ((logic->ChildsWallet || randoCtx->GetOption(RSK_SKIP_EPONA_RACE)) && logic->CanUse(RG_EPONAS_SONG) && logic->IsAdult && logic->AtDay);}}),
+                  EventAccess(&logic->LinksCow, {[]{return logic->LinksCow || (logic->ChildsWallet && logic->CanUse(RG_EPONAS_SONG) && logic->IsAdult && logic->AtDay);}}),
                 }, {
                   //Locations
                   LocationAccess(RC_SONG_FROM_MALON,     {[]{return logic->IsChild && logic->ZeldasLetter && logic->Ocarina && logic->AtDay;}}),
@@ -241,7 +241,7 @@ void AreaTable_Init_HyruleField() {
 
   areaTable[RR_LLR_TALONS_HOUSE] = Area("LLR Talons House", "LLR Talons House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_LLR_TALONS_CHICKENS, {[]{return logic->IsChild && logic->AtDay && logic->ZeldasLetter;}}),
+                  LocationAccess(RC_LLR_TALONS_CHICKENS, {[]{return logic->ChildsWallet && logic->IsChild && logic->AtDay && logic->ZeldasLetter;}}),
                 }, {
                   //Exits
                   Entrance(RR_LON_LON_RANCH, {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
index 5eb7263d3..809a439f8 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
@@ -141,7 +141,7 @@ void AreaTable_Init_Kakariko() {
 
   areaTable[RR_KAK_SHOOTING_GALLERY] = Area("Kak Shooting Gallery", "Kak Shooting Gallery", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_KAK_SHOOTING_GALLERY_REWARD, {[]{return logic->IsAdult && logic->Bow;}}),
+                  LocationAccess(RC_KAK_SHOOTING_GALLERY_REWARD, {[]{return logic->ChildsWallet && logic->IsAdult && logic->Bow;}}),
                 }, {
                   //Exits
                   Entrance(RR_KAKARIKO_VILLAGE, {[]{return true;}}),
@@ -214,7 +214,7 @@ void AreaTable_Init_Kakariko() {
                 }, {
                   //Locations
                   LocationAccess(RC_GRAVEYARD_FREESTANDING_POH,        {[]{return (logic->IsAdult && CanPlantBean(RR_THE_GRAVEYARD)) || logic->CanUse(RG_LONGSHOT) || (randoCtx->GetTrickOption(RT_GY_POH) && logic->CanUse(RG_BOOMERANG));}}),
-                  LocationAccess(RC_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR, {[]{return logic->IsChild && logic->AtNight;}}), //TODO: This needs to change
+                  LocationAccess(RC_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR, {[]{return logic->ChildsWallet && logic->IsChild && logic->AtNight;}}), //TODO: This needs to change
                   LocationAccess(RC_GRAVEYARD_GS_WALL,                 {[]{return logic->IsChild && logic->HookshotOrBoomerang && logic->AtNight && logic->CanGetNightTimeGS;}}),
                   LocationAccess(RC_GRAVEYARD_GS_BEAN_PATCH,           {[]{return logic->CanPlantBugs && logic->CanChildAttack;}}),
                 }, {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
index d0cd7358d..803c261f4 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
@@ -21,7 +21,7 @@ void AreaTable_Init_ZorasDomain() {
                   EventAccess(&logic->BugShrub,         {[]{return logic->BugShrub         || logic->CanCutShrubs;}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_ZR_MAGIC_BEAN_SALESMAN,               {[]{return logic->IsChild;}}),
+                  LocationAccess(RC_ZR_MAGIC_BEAN_SALESMAN,               {[]{return logic->ChildsWallet && logic->IsChild;}}),
                   LocationAccess(RC_ZR_FROGS_OCARINA_GAME,                {[]{return logic->IsChild && logic->CanUse(RG_ZELDAS_LULLABY) && logic->CanUse(RG_SARIAS_SONG) && logic->CanUse(RG_SUNS_SONG) && logic->CanUse(RG_EPONAS_SONG) && logic->CanUse(RG_SONG_OF_TIME) && logic->CanUse(RG_SONG_OF_STORMS);}}),
                   LocationAccess(RC_ZR_FROGS_IN_THE_RAIN,                 {[]{return logic->IsChild && logic->CanUse(RG_SONG_OF_STORMS);}}),
                   LocationAccess(RC_ZR_FROGS_ZELDAS_LULLABY,              {[]{return logic->IsChild && logic->CanUse(RG_ZELDAS_LULLABY);}}),
@@ -93,7 +93,7 @@ void AreaTable_Init_ZorasDomain() {
                   EventAccess(&logic->DeliverLetter,     {[]{return logic->DeliverLetter     || (logic->RutosLetter && logic->IsChild && randoCtx->GetOption(RSK_ZORAS_FOUNTAIN).IsNot(RO_ZF_OPEN));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_ZD_DIVING_MINIGAME,                     {[]{return logic->IsChild;}}),
+                  LocationAccess(RC_ZD_DIVING_MINIGAME,                     {[]{return logic->ChildsWallet && logic->IsChild;}}),
                   LocationAccess(RC_ZD_CHEST,                               {[]{return logic->IsChild && logic->CanUse(RG_STICKS);}}),
                   LocationAccess(RC_ZD_KING_ZORA_THAWED,                    {[]{return logic->KingZoraThawed;}}),
                   LocationAccess(RC_ZD_TRADE_PRESCRIPTION,                  {[]{return logic->KingZoraThawed && logic->Prescription;}}),
diff --git a/soh/soh/Enhancements/randomizer/item.cpp b/soh/soh/Enhancements/randomizer/item.cpp
index b571211e7..6c0fe4bbe 100644
--- a/soh/soh/Enhancements/randomizer/item.cpp
+++ b/soh/soh/Enhancements/randomizer/item.cpp
@@ -7,6 +7,7 @@
 #include "z64item.h"
 #include "variables.h"
 #include "macros.h"
+#include "functions.h"
 #include "../../OTRGlobals.h"
 
 namespace Rando {
@@ -116,8 +117,8 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
         return giEntry;
     }
     RandomizerGet actual = RG_NONE;
-    const u8 numWallets =
-        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHOPSANITY) > RO_SHOPSANITY_ZERO_ITEMS ? 3 : 2;
+    const bool tycoonWallet =
+        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHOPSANITY) > RO_SHOPSANITY_ZERO_ITEMS;
     switch (randomizerGet) {
         case RG_PROGRESSIVE_STICK_UPGRADE:
             switch (CUR_UPG_VALUE(UPG_STICKS)) {
@@ -238,6 +239,10 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
             }
             break;
         case RG_PROGRESSIVE_WALLET:
+            if (!Flags_GetRandomizerInf(RAND_INF_HAS_WALLET)) {
+                actual = RG_CHILD_WALLET;
+                break;
+            }
             switch (CUR_UPG_VALUE(UPG_WALLET)) {
                 case 0:
                     actual = RG_ADULT_WALLET;
@@ -247,7 +252,7 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
                     break;
                 case 2:
                 case 3:
-                    actual = numWallets == 3 ? RG_TYCOON_WALLET : RG_GIANT_WALLET;
+                    actual = tycoonWallet ? RG_TYCOON_WALLET : RG_GIANT_WALLET;
                     break;
                 default:
                     break;
diff --git a/soh/soh/Enhancements/randomizer/item_list.cpp b/soh/soh/Enhancements/randomizer/item_list.cpp
index 8374c98d6..8e85cb165 100644
--- a/soh/soh/Enhancements/randomizer/item_list.cpp
+++ b/soh/soh/Enhancements/randomizer/item_list.cpp
@@ -299,6 +299,7 @@ void Rando::StaticData::InitItemTable() {
     itemTable[RG_ADULT_WALLET] =                        Item(RG_ADULT_WALLET,                     Text{ "Adult Wallet", "Grande Bourse", "Erwachsene Geldbörse" },                                                  ITEMTYPE_ITEM,              GI_WALLET_ADULT,    true,  &logic->ProgressiveWallet,   RHT_ADULT_WALLET,           ITEM_WALLET_ADULT,              OBJECT_GI_PURSE,        GID_WALLET_ADULT,   0x5E,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
     itemTable[RG_GIANT_WALLET] =                        Item(RG_GIANT_WALLET,                     Text{ "Giant Wallet", "Bourse de Géant", "Riesige Geldbörse" },                                                   ITEMTYPE_ITEM,              GI_WALLET_GIANT,    true,  &logic->ProgressiveWallet,   RHT_GIANT_WALLET,           ITEM_WALLET_GIANT,              OBJECT_GI_PURSE,        GID_WALLET_GIANT,   0x5F,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
     itemTable[RG_TYCOON_WALLET] =                       Item(RG_TYCOON_WALLET,                    Text{ "Tycoon Wallet", "Bourse de Magnat", "Reiche Geldbörse" },                                                  ITEMTYPE_ITEM,              RG_TYCOON_WALLET,   true,  &logic->ProgressiveWallet,   RHT_TYCOON_WALLET,          RG_TYCOON_WALLET,               OBJECT_GI_PURSE,        GID_WALLET_GIANT,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_CHILD_WALLET] =                        Item(RG_CHILD_WALLET,                     Text{ "Child Wallet", "Bourse de Magnat", "Reiche Geldbörse" },/*FIXME: still says tycoon in french & german*/    ITEMTYPE_ITEM,              RG_CHILD_WALLET,    true,  &logic->ProgressiveWallet,   RHT_CHILD_WALLET,           RG_CHILD_WALLET,                OBJECT_GI_PURSE,        GID_WALLET_ADULT,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_DEKU_NUT_CAPACITY_30] =                Item(RG_DEKU_NUT_CAPACITY_30,             Text{ "Deku Nut Capacity (30)", "Capacité de noix Mojo (30)", "Deku Nuss Kapazität (30)" },                       ITEMTYPE_ITEM,              GI_NUT_UPGRADE_30,  false, &logic->noVariable,          RHT_DEKU_NUT_CAPACITY_30,   ITEM_NUT_UPGRADE_30,            OBJECT_GI_NUTS,         GID_NUTS,           0xA7,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
     itemTable[RG_DEKU_NUT_CAPACITY_40] =                Item(RG_DEKU_NUT_CAPACITY_40,             Text{ "Deku Nut Capacity (40)", "Capacité de noix Mojo (40)", "Deku Nuss Kapazität (40)" },                       ITEMTYPE_ITEM,              GI_NUT_UPGRADE_40,  false, &logic->noVariable,          RHT_DEKU_NUT_CAPACITY_40,   ITEM_NUT_UPGRADE_40,            OBJECT_GI_NUTS,         GID_NUTS,           0xA8,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
     itemTable[RG_DEKU_STICK_CAPACITY_20] =              Item(RG_DEKU_STICK_CAPACITY_20,           Text{ "Deku Stick Capacity (20)", "Capacité de Bâtons Mojo (20)", "Deku Stick Kapazität (20)" },                  ITEMTYPE_ITEM,              GI_STICK_UPGRADE_20,false, &logic->noVariable,          RHT_DEKU_STICK_CAPACITY_20, ITEM_STICK_UPGRADE_20,          OBJECT_GI_STICK,        GID_STICK,          0x90,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
diff --git a/soh/soh/Enhancements/randomizer/logic.cpp b/soh/soh/Enhancements/randomizer/logic.cpp
index 293295e92..3f6f0a079 100644
--- a/soh/soh/Enhancements/randomizer/logic.cpp
+++ b/soh/soh/Enhancements/randomizer/logic.cpp
@@ -257,7 +257,8 @@ namespace Rando {
         GoldenGauntlets = ProgressiveStrength   >= 3;
         SilverScale     = ProgressiveScale      >= 1;
         GoldScale       = ProgressiveScale      >= 2;
-        AdultsWallet    = ProgressiveWallet     >= 1;
+        ChildsWallet    = ProgressiveWallet     >= 1;
+        AdultsWallet    = ProgressiveWallet     >= 2;
         BiggoronSword   = BiggoronSword || ProgressiveGiantKnife >= 2;
 
         //you need at least 2 buttons for scarecrow song
@@ -283,7 +284,7 @@ namespace Rando {
         Fairy        = HasBottle && FairyAccess;
 
         FoundBombchus   = (BombchuDrop || Bombchus || Bombchus5 || Bombchus10 || Bombchus20);
-        CanPlayBowling  = (ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && FoundBombchus) || (!ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && BombBag);
+        CanPlayBowling  = ChildsWallet && ((ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && FoundBombchus) || (!ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && BombBag));
         // TODO: Implement Ammo Drop Setting in place of bombchu drops
         HasBombchus = (BuyBombchus || (ctx->GetOption(RSK_ENABLE_BOMBCHU_DROPS).Is(RO_AMMO_DROPS_ON/*_PLUS_BOMBCHU*/) && FoundBombchus));
 
@@ -333,7 +334,7 @@ namespace Rando {
         CanGetNightTimeGS   = (CanUse(RG_SUNS_SONG) || !ctx->GetOption(RSK_SKULLS_SUNS_SONG));
         CanBreakUpperBeehives = HookshotOrBoomerang || (ctx->GetTrickOption(RT_BOMBCHU_BEEHIVES) && HasBombchus);
         CanBreakLowerBeehives = CanBreakUpperBeehives || Bombs;
-        CanFish = CanUse(RG_FISHING_POLE) || !ctx->GetOption(RSK_SHUFFLE_FISHING_POLE);
+        CanFish = ChildsWallet && (CanUse(RG_FISHING_POLE) || !ctx->GetOption(RSK_SHUFFLE_FISHING_POLE));
         CanGetChildFish = CanFish && (IsChild || (IsAdult && !ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT)));
         CanGetAdultFish = CanFish && IsAdult && ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT);
 
@@ -610,7 +611,8 @@ namespace Rando {
         ProgressiveScale      = 0;
         ProgressiveHookshot   = 0;
         ProgressiveBow        = 0;
-        ProgressiveWallet     = 0;
+        //If we're not shuffling child's wallet, we start with it (wallet 1)
+        ProgressiveWallet     = ctx->GetOption(RSK_SHUFFLE_CHILD_WALLET).Is(true) ? 0 : 1;
         ProgressiveStrength   = 0;
         ProgressiveOcarina    = 0;
         ProgressiveGiantKnife = 0;
@@ -711,6 +713,7 @@ namespace Rando {
         GoldenGauntlets  = false;
         SilverScale      = false;
         GoldScale        = false;
+        ChildsWallet     = false;
         AdultsWallet     = false;
 
         ChildScarecrow   = false;
diff --git a/soh/soh/Enhancements/randomizer/logic.h b/soh/soh/Enhancements/randomizer/logic.h
index 425aba55e..b72c3cb47 100644
--- a/soh/soh/Enhancements/randomizer/logic.h
+++ b/soh/soh/Enhancements/randomizer/logic.h
@@ -239,6 +239,7 @@ class Logic {
     bool GoldenGauntlets = false;
     bool SilverScale = false;
     bool GoldScale = false;
+    bool ChildsWallet = false;
     bool AdultsWallet = false;
 
     bool ChildScarecrow = false;
diff --git a/soh/soh/Enhancements/randomizer/option_descriptions.cpp b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
index 62d1526d1..123b83edb 100644
--- a/soh/soh/Enhancements/randomizer/option_descriptions.cpp
+++ b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
@@ -211,6 +211,10 @@ void Settings::CreateOptionDescriptions() {
         "\n"
         "Adult Link will start with a second free item instead of the Master Sword.\n"
         "If you haven't found the Master Sword before facing Ganon, you won't receive it during the fight.";
+    mOptionDescriptions[RSK_SHUFFLE_CHILD_WALLET] =
+        "Enabling this shuffles the Child's Wallet into the item pool.\n"
+        "\n"
+        "You will not be able to carry any rupees until you find a wallet.";
     mOptionDescriptions[RSK_SHUFFLE_OCARINA] =
         "Enabling this shuffles the Fairy Ocarina and the Ocarina of Time into the item pool.\n"
         "\n"
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index 3dc49988c..f053e3674 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -608,7 +608,7 @@ ItemObtainability Randomizer::GetItemObtainabilityFromRandomizerGet(RandomizerGe
     // Shopsanity with at least one item shuffled allows for a third wallet upgrade.
     // This is needed since Plentiful item pool also adds a third progressive wallet
     // but we should *not* get Tycoon's Wallet in that mode.
-    u8 numWallets = GetRandoSettingValue(RSK_SHOPSANITY) > RO_SHOPSANITY_ZERO_ITEMS ? 3 : 2;
+    bool tycoonWallet = GetRandoSettingValue(RSK_SHOPSANITY) > RO_SHOPSANITY_ZERO_ITEMS;
     switch (randoGet) {
         case RG_NONE:
         case RG_TRIFORCE:
@@ -791,7 +791,7 @@ ItemObtainability Randomizer::GetItemObtainabilityFromRandomizerGet(RandomizerGe
         case RG_PROGRESSIVE_STRENGTH:
             return CUR_UPG_VALUE(UPG_STRENGTH) < 3 ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE;
         case RG_PROGRESSIVE_WALLET:
-            return CUR_UPG_VALUE(UPG_WALLET) < numWallets ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE;
+            return CUR_UPG_VALUE(UPG_WALLET) < (tycoonWallet ? 3 : 2) ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE;
         case RG_PROGRESSIVE_SCALE:
             return CUR_UPG_VALUE(UPG_SCALE) < 2 ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE;
         case RG_PROGRESSIVE_MAGIC_METER:
@@ -962,7 +962,7 @@ GetItemID Randomizer::GetItemIdFromRandomizerGet(RandomizerGet randoGet, GetItem
     // Shopsanity with at least one item shuffled allows for a third wallet upgrade.
     // This is needed since Plentiful item pool also adds a third progressive wallet
     // but we should *not* get Tycoon's Wallet in that mode.
-    u8 numWallets = GetRandoSettingValue(RSK_SHOPSANITY) > RO_SHOPSANITY_ZERO_ITEMS ? 3 : 2;
+    bool tycoonWallet = GetRandoSettingValue(RSK_SHOPSANITY) > RO_SHOPSANITY_ZERO_ITEMS;
     switch (randoGet) {
         case RG_NONE:
             return ogItemId;
@@ -1197,6 +1197,9 @@ GetItemID Randomizer::GetItemIdFromRandomizerGet(RandomizerGet randoGet, GetItem
                     return GI_GAUNTLETS_GOLD;
             }
         case RG_PROGRESSIVE_WALLET:
+            if (!Flags_GetRandomizerInf(RAND_INF_HAS_WALLET)) {
+                return (GetItemID)RG_CHILD_WALLET;
+            }
             switch (CUR_UPG_VALUE(UPG_WALLET)) {
                 case 0:
                     return GI_WALLET_ADULT;
@@ -1204,7 +1207,7 @@ GetItemID Randomizer::GetItemIdFromRandomizerGet(RandomizerGet randoGet, GetItem
                     return GI_WALLET_GIANT;
                 case 2:
                 case 3:
-                    return numWallets == 3 ? (GetItemID)RG_TYCOON_WALLET : GI_WALLET_GIANT;
+                    return tycoonWallet ? (GetItemID)RG_TYCOON_WALLET : GI_WALLET_GIANT;
             }
         case RG_PROGRESSIVE_SCALE:
             switch (CUR_UPG_VALUE(UPG_SCALE)) {
@@ -1389,6 +1392,9 @@ bool Randomizer::IsItemVanilla(RandomizerGet randoGet) {
         case RG_BUY_RED_POTION_50:
             return true;
         case RG_PROGRESSIVE_WALLET:
+            if (!Flags_GetRandomizerInf(RAND_INF_HAS_WALLET)) {
+                return false;
+            }
             if (CUR_UPG_VALUE(UPG_WALLET) < 2) {
                 return true;
             } else {
@@ -3233,7 +3239,7 @@ CustomMessage Randomizer::GetGoronMessage(u16 index) {
 void Randomizer::CreateCustomMessages() {
     // RANDTODO: Translate into french and german and replace GIMESSAGE_UNTRANSLATED
     // with GIMESSAGE(getItemID, itemID, english, german, french).
-    const std::array<GetItemMessage, 72> getItemMessages = {{
+    const std::array<GetItemMessage, 73> getItemMessages = {{
         GIMESSAGE(RG_GREG_RUPEE, ITEM_MASK_GORON, 
 			"You found %gGreg%w!",
 			"%gGreg%w! Du hast ihn wirklich gefunden!",
@@ -3468,6 +3474,10 @@ void Randomizer::CreateCustomMessages() {
 			"You got a %rTycoon's Wallet%w!&It's gigantic! Now you can carry&up to %y999 rupees%w!",
 			"Du erhältst die %rGoldene&Geldbörse%w! Die größte aller&Geldbörsen! Jetzt kannst Du bis&zu %y999 Rubine%w mit dir führen!",
 			"Vous obtenez la %rBourse de Magnat%w!&Elle peut contenir jusqu'à %y999 rubis%w!&C'est gigantesque!"),
+        GIMESSAGE(RG_CHILD_WALLET, ITEM_WALLET_ADULT,
+			"You got a %rChild's Wallet%w!&Now you can carry&up to %y99 rupees%w!",
+			"Du erhältst die %rGoldene&Geldbörse%w! Jetzt kannst Du bis&zu %y99 Rubine%w mit dir führen!",//FIXME: still says tycoon
+			"Vous obtenez la %rBourse de Magnat%w!&Elle peut contenir jusqu'à %y99 rubis%w!"),//FIXME: still says tycoon
 
         GIMESSAGE_UNTRANSLATED(RG_GOHMA_SOUL, ITEM_BIG_POE, "You found the soul for %gGohma%w!"),
         GIMESSAGE_UNTRANSLATED(RG_KING_DODONGO_SOUL, ITEM_BIG_POE, "You found the soul for %rKing&Dodongo%w!"),
diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h
index 6822bc650..4f75118cd 100644
--- a/soh/soh/Enhancements/randomizer/randomizerTypes.h
+++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@@ -1959,6 +1959,7 @@ typedef enum {
     RG_FISHING_POLE,
     RG_HINT,
     RG_TYCOON_WALLET,
+    RG_CHILD_WALLET,
     RG_FAIRY_OCARINA,
     RG_OCARINA_OF_TIME,
     RG_BOMB_BAG,
@@ -3161,6 +3162,7 @@ typedef enum {
     RHT_HINT,
     RHT_HINT_MYSTERIOUS,
     RHT_TYCOON_WALLET,
+    RHT_CHILD_WALLET,
     RHT_HOOKSHOT,
     RHT_LONGSHOT,
     RHT_FAIRY_OCARINA,
@@ -3529,6 +3531,7 @@ typedef enum {
     RSK_STARTING_PRELUDE_OF_LIGHT,
     RSK_SHUFFLE_KOKIRI_SWORD,
     RSK_SHUFFLE_MASTER_SWORD,
+    RSK_SHUFFLE_CHILD_WALLET,
     RSK_SHUFFLE_DUNGEON_REWARDS,
     RSK_SHUFFLE_SONGS,
     RSK_SHUFFLE_TOKENS,
diff --git a/soh/soh/Enhancements/randomizer/randomizer_inf.h b/soh/soh/Enhancements/randomizer/randomizer_inf.h
index 4c90aee18..ad8f95a7b 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_inf.h
+++ b/soh/soh/Enhancements/randomizer/randomizer_inf.h
@@ -212,6 +212,8 @@ typedef enum {
     RAND_INF_HAS_OCARINA_C_LEFT,
     RAND_INF_HAS_OCARINA_C_RIGHT,
 
+    RAND_INF_HAS_WALLET,
+
     RAND_INF_BEEHIVE_KF_STORMS_GROTTO_LEFT,
     RAND_INF_BEEHIVE_KF_STORMS_GROTTO_RIGHT,
     RAND_INF_BEEHIVE_LW_NEAR_SHORTCUTS_GROTTO_LEFT,
diff --git a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
index d0d8873ae..1129ca192 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
@@ -386,7 +386,7 @@ ItemTrackerNumbers GetItemCurrentAndMax(ItemTrackerItem item) {
             break;
         case ITEM_WALLET_ADULT:
         case ITEM_WALLET_GIANT:
-            result.currentCapacity = CUR_CAPACITY(UPG_WALLET);
+            result.currentCapacity = IS_RANDO && !Flags_GetRandomizerInf(RAND_INF_HAS_WALLET) ? 0 : CUR_CAPACITY(UPG_WALLET);
             result.maxCapacity = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHOPSANITY) > RO_SHOPSANITY_ZERO_ITEMS ? 999 : 500;
             result.currentAmmo = gSaveContext.rupees;
             break;
@@ -635,7 +635,7 @@ void DrawItem(ItemTrackerItem item) {
         case ITEM_WALLET_ADULT:
         case ITEM_WALLET_GIANT:
             actualItemId = CUR_UPG_VALUE(UPG_WALLET) == 2 ? ITEM_WALLET_GIANT : ITEM_WALLET_ADULT;
-            hasItem = true;
+            hasItem = !IS_RANDO || Flags_GetRandomizerInf(RAND_INF_HAS_WALLET);
             break;
         case ITEM_BRACELET:
         case ITEM_GAUNTLETS_SILVER:
diff --git a/soh/soh/Enhancements/randomizer/savefile.cpp b/soh/soh/Enhancements/randomizer/savefile.cpp
index 833778348..faf8dca0b 100644
--- a/soh/soh/Enhancements/randomizer/savefile.cpp
+++ b/soh/soh/Enhancements/randomizer/savefile.cpp
@@ -301,6 +301,10 @@ extern "C" void Randomizer_InitSaveFile() {
         Flags_SetRandomizerInf(RAND_INF_HAS_OCARINA_C_DOWN);
     }
 
+    if (Randomizer_GetSettingValue(RSK_SHUFFLE_CHILD_WALLET) == RO_GENERIC_OFF) {
+        Flags_SetRandomizerInf(RAND_INF_HAS_WALLET);
+    }
+
     // Give Link's pocket item
     GiveLinksPocketItem();
 
diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
index 9adfd85b8..e6f825056 100644
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -105,6 +105,7 @@ void Settings::CreateOptions() {
     mOptions[RSK_SHUFFLE_COWS] = Option::Bool("Shuffle Cows", "gRandomizeShuffleCows", mOptionDescriptions[RSK_SHUFFLE_COWS]);
     mOptions[RSK_SHUFFLE_KOKIRI_SWORD] = Option::Bool("Shuffle Kokiri Sword", "gRandomizeShuffleKokiriSword", mOptionDescriptions[RSK_SHUFFLE_KOKIRI_SWORD]);
     mOptions[RSK_SHUFFLE_MASTER_SWORD] = Option::Bool("Shuffle Master Sword", "gRandomizeShuffleMasterSword", mOptionDescriptions[RSK_SHUFFLE_MASTER_SWORD]);
+    mOptions[RSK_SHUFFLE_CHILD_WALLET] = Option::Bool("Shuffle Child's Wallet", "gRandomizeShuffleChildWallet", mOptionDescriptions[RSK_SHUFFLE_CHILD_WALLET]);
     mOptions[RSK_SHUFFLE_OCARINA] = Option::Bool("Shuffle Ocarinas", "gRandomizeShuffleOcarinas", mOptionDescriptions[RSK_SHUFFLE_OCARINA]);
     mOptions[RSK_SHUFFLE_OCARINA_BUTTONS] = Option::Bool("Shuffle Ocarina Buttons", "gRandomizeShuffleOcarinaButtons", mOptionDescriptions[RSK_SHUFFLE_OCARINA_BUTTONS]);
     mOptions[RSK_SHUFFLE_WEIRD_EGG] = Option::Bool("Shuffle Weird Egg", "gRandomizeShuffleWeirdEgg", mOptionDescriptions[RSK_SHUFFLE_WEIRD_EGG]);
@@ -649,6 +650,7 @@ void Settings::CreateOptions() {
         &mOptions[RSK_SKULLS_SUNS_SONG],
         &mOptions[RSK_SHUFFLE_KOKIRI_SWORD],
         &mOptions[RSK_SHUFFLE_MASTER_SWORD],
+        &mOptions[RSK_SHUFFLE_CHILD_WALLET],
         &mOptions[RSK_SHUFFLE_OCARINA],
         &mOptions[RSK_SHUFFLE_OCARINA_BUTTONS],
         &mOptions[RSK_SHUFFLE_WEIRD_EGG],
@@ -1093,6 +1095,7 @@ void Settings::CreateOptions() {
         { "Shuffle Settings:Shuffle Magic Beans", RSK_SHUFFLE_MAGIC_BEANS },
         { "Shuffle Settings:Shuffle Kokiri Sword", RSK_SHUFFLE_KOKIRI_SWORD },
         { "Shuffle Settings:Shuffle Master Sword", RSK_SHUFFLE_MASTER_SWORD },
+        { "Shuffle Settings:Shuffle Child's Wallet", RSK_SHUFFLE_CHILD_WALLET },
         { "Shuffle Settings:Shuffle Weird Egg", RSK_SHUFFLE_WEIRD_EGG },
         { "Shuffle Settings:Shuffle Frog Song Rupees", RSK_SHUFFLE_FROG_SONG_RUPEES },
         { "Shuffle Settings:Shuffle Merchants", RSK_SHUFFLE_MERCHANTS },
@@ -2241,6 +2244,7 @@ void Settings::ParseJson(nlohmann::json spoilerFileJson) {
                 case RSK_SHUFFLE_100_GS_REWARD:
                 case RSK_SHUFFLE_OCARINA:
                 case RSK_SHUFFLE_OCARINA_BUTTONS:
+                case RSK_SHUFFLE_CHILD_WALLET:
                 case RSK_STARTING_DEKU_SHIELD:
                 case RSK_STARTING_KOKIRI_SWORD:
                 case RSK_STARTING_ZELDAS_LULLABY:
diff --git a/soh/soh/SaveManager.cpp b/soh/soh/SaveManager.cpp
index 991e2df6d..daae87146 100644
--- a/soh/soh/SaveManager.cpp
+++ b/soh/soh/SaveManager.cpp
@@ -591,6 +591,7 @@ void SaveManager::InitMeta(int fileNum) {
     fileMetaInfo[fileNum].gsTokens = gSaveContext.inventory.gsTokens;
     fileMetaInfo[fileNum].isDoubleDefenseAcquired = gSaveContext.isDoubleDefenseAcquired;
     fileMetaInfo[fileNum].gregFound = Flags_GetRandomizerInf(RAND_INF_GREG_FOUND);
+    fileMetaInfo[fileNum].hasWallet = Flags_GetRandomizerInf(RAND_INF_HAS_WALLET);
     fileMetaInfo[fileNum].defense = gSaveContext.inventory.defenseHearts;
     fileMetaInfo[fileNum].health = gSaveContext.health;
     auto randoContext = Rando::Context::GetInstance();
diff --git a/soh/soh/SaveManager.h b/soh/soh/SaveManager.h
index 85d08a43d..935a6366e 100644
--- a/soh/soh/SaveManager.h
+++ b/soh/soh/SaveManager.h
@@ -29,6 +29,7 @@ typedef struct {
     s16 gsTokens;
     u8 isDoubleDefenseAcquired;
     u8 gregFound;
+    u8 hasWallet;
 } SaveFileMetaInfo;
 
 #ifdef __cplusplus
diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c
index 7abc2b151..e9bbf9ef8 100644
--- a/soh/src/code/z_parameter.c
+++ b/soh/src/code/z_parameter.c
@@ -2614,6 +2614,14 @@ u16 Randomizer_Item_Give(PlayState* play, GetItemEntry giEntry) {
         return Return_Item_Entry(giEntry, RG_NONE);
     }
 
+    if (item == RG_CHILD_WALLET) {
+        Flags_SetRandomizerInf(RAND_INF_HAS_WALLET);
+        if (IS_RANDO && Randomizer_GetSettingValue(RSK_FULL_WALLETS)) {
+            Rupees_ChangeBy(99);
+        }
+        return Return_Item_Entry(giEntry, RG_NONE);
+    }
+
     if (item == RG_GREG_RUPEE) {
         Rupees_ChangeBy(1);
         Flags_SetRandomizerInf(RAND_INF_GREG_FOUND);
@@ -5156,81 +5164,84 @@ void Interface_Draw(PlayState* play) {
         Gfx_SetupDL_39Overlay(play->state.gfxCtx);
 
         if (fullUi) {
-            // Rupee Icon
-            if (CVarGetInteger("gDynamicWalletIcon", 0)) {
-                switch (CUR_UPG_VALUE(UPG_WALLET)) {
-                    case 0:
-                        if (CVarGetInteger("gCosmetics.Consumable_GreenRupee.Changed", 0)) {
-                            rColor = CVarGetColor24("gCosmetics.Consumable_GreenRupee.Value", rupeeWalletColors[0]);
-                        } else {
-                            rColor = rupeeWalletColors[0];
-                        }
-                        break;
-                    case 1:
-                        if (CVarGetInteger("gCosmetics.Consumable_BlueRupee.Changed", 0)) {
-                            rColor = CVarGetColor24("gCosmetics.Consumable_BlueRupee.Value", rupeeWalletColors[1]);
-                        } else {
-                            rColor = rupeeWalletColors[1];
-                        }
-                        break;
-                    case 2:
-                        if (CVarGetInteger("gCosmetics.Consumable_RedRupee.Changed", 0)) {
-                            rColor = CVarGetColor24("gCosmetics.Consumable_RedRupee.Value", rupeeWalletColors[2]);
-                        } else {
-                            rColor = rupeeWalletColors[2];
-                        }
-                        break;
-                    case 3:
-                        if (CVarGetInteger("gCosmetics.Consumable_PurpleRupee.Changed", 0)) {
-                            rColor = CVarGetColor24("gCosmetics.Consumable_PurpleRupee.Value", rupeeWalletColors[3]);
-                        } else {
-                            rColor = rupeeWalletColors[3];
-                        }
-                        break;
-                }
-            } else {
-                if (CVarGetInteger("gCosmetics.Consumable_GreenRupee.Changed", rupeeWalletColors)) {
-                     rColor = CVarGetColor24("gCosmetics.Consumable_GreenRupee.Value", rupeeWalletColors[0]);
-                } else {
-                     rColor = rupeeWalletColors[0];
-                }
-            }
-
-            //Rupee icon & counter
-            s16 X_Margins_RC;
-            s16 Y_Margins_RC;
-            if (CVarGetInteger("gRCUseMargins", 0) != 0) {
-                if (CVarGetInteger("gRCPosType", 0) == 0) {X_Margins_RC = Left_HUD_Margin;};
-                Y_Margins_RC = Bottom_HUD_Margin;
-            } else {
-                X_Margins_RC = 0;
-                Y_Margins_RC = 0;
-            }
-            s16 PosX_RC_ori = OTRGetRectDimensionFromLeftEdge(26+X_Margins_RC);
-            s16 PosY_RC_ori = 206+Y_Margins_RC;
             s16 PosX_RC;
             s16 PosY_RC;
-            if (CVarGetInteger("gRCPosType", 0) != 0) {
-                PosY_RC = CVarGetInteger("gRCPosY", 0)+Y_Margins_RC;
-                if (CVarGetInteger("gRCPosType", 0) == 1) {//Anchor Left
-                    if (CVarGetInteger("gRCUseMargins", 0) != 0) {X_Margins_RC = Left_HUD_Margin;};
-                    PosX_RC = OTRGetDimensionFromLeftEdge(CVarGetInteger("gRCPosX", 0)+X_Margins_RC);
-                } else if (CVarGetInteger("gRCPosType", 0) == 2) {//Anchor Right
-                    if (CVarGetInteger("gRCUseMargins", 0) != 0) {X_Margins_RC = Right_HUD_Margin;};
-                    PosX_RC = OTRGetDimensionFromRightEdge(CVarGetInteger("gRCPosX", 0)+X_Margins_RC);
-                } else if (CVarGetInteger("gRCPosType", 0) == 3) {//Anchor None
-                    PosX_RC = CVarGetInteger("gRCPosX", 0);
-                } else if (CVarGetInteger("gRCPosType", 0) == 4) {//Hidden
-                PosX_RC = -9999;
+            //when not having a wallet in rando, don't calculate the ruppe icon
+            if (!IS_RANDO || Flags_GetRandomizerInf(RAND_INF_HAS_WALLET)) {
+                // Rupee Icon
+                if (CVarGetInteger("gDynamicWalletIcon", 0)) {
+                    switch (CUR_UPG_VALUE(UPG_WALLET)) {
+                        case 0:
+                            if (CVarGetInteger("gCosmetics.Consumable_GreenRupee.Changed", 0)) {
+                                rColor = CVarGetColor24("gCosmetics.Consumable_GreenRupee.Value", rupeeWalletColors[0]);
+                            } else {
+                                rColor = rupeeWalletColors[0];
+                            }
+                            break;
+                        case 1:
+                            if (CVarGetInteger("gCosmetics.Consumable_BlueRupee.Changed", 0)) {
+                                rColor = CVarGetColor24("gCosmetics.Consumable_BlueRupee.Value", rupeeWalletColors[1]);
+                            } else {
+                                rColor = rupeeWalletColors[1];
+                            }
+                            break;
+                        case 2:
+                            if (CVarGetInteger("gCosmetics.Consumable_RedRupee.Changed", 0)) {
+                                rColor = CVarGetColor24("gCosmetics.Consumable_RedRupee.Value", rupeeWalletColors[2]);
+                            } else {
+                                rColor = rupeeWalletColors[2];
+                            }
+                            break;
+                        case 3:
+                            if (CVarGetInteger("gCosmetics.Consumable_PurpleRupee.Changed", 0)) {
+                                rColor = CVarGetColor24("gCosmetics.Consumable_PurpleRupee.Value", rupeeWalletColors[3]);
+                            } else {
+                                rColor = rupeeWalletColors[3];
+                            }
+                            break;
+                    }
+                } else {
+                    if (CVarGetInteger("gCosmetics.Consumable_GreenRupee.Changed", rupeeWalletColors)) {
+                         rColor = CVarGetColor24("gCosmetics.Consumable_GreenRupee.Value", rupeeWalletColors[0]);
+                    } else {
+                         rColor = rupeeWalletColors[0];
+                    }
+                }
+
+                //Rupee icon & counter
+                s16 X_Margins_RC;
+                s16 Y_Margins_RC;
+                if (CVarGetInteger("gRCUseMargins", 0) != 0) {
+                    if (CVarGetInteger("gRCPosType", 0) == 0) {X_Margins_RC = Left_HUD_Margin;};
+                    Y_Margins_RC = Bottom_HUD_Margin;
+                } else {
+                    X_Margins_RC = 0;
+                    Y_Margins_RC = 0;
+                }
+                s16 PosX_RC_ori = OTRGetRectDimensionFromLeftEdge(26+X_Margins_RC);
+                s16 PosY_RC_ori = 206+Y_Margins_RC;
+                if (CVarGetInteger("gRCPosType", 0) != 0) {
+                    PosY_RC = CVarGetInteger("gRCPosY", 0)+Y_Margins_RC;
+                    if (CVarGetInteger("gRCPosType", 0) == 1) {//Anchor Left
+                        if (CVarGetInteger("gRCUseMargins", 0) != 0) {X_Margins_RC = Left_HUD_Margin;};
+                        PosX_RC = OTRGetDimensionFromLeftEdge(CVarGetInteger("gRCPosX", 0)+X_Margins_RC);
+                    } else if (CVarGetInteger("gRCPosType", 0) == 2) {//Anchor Right
+                        if (CVarGetInteger("gRCUseMargins", 0) != 0) {X_Margins_RC = Right_HUD_Margin;};
+                        PosX_RC = OTRGetDimensionFromRightEdge(CVarGetInteger("gRCPosX", 0)+X_Margins_RC);
+                    } else if (CVarGetInteger("gRCPosType", 0) == 3) {//Anchor None
+                        PosX_RC = CVarGetInteger("gRCPosX", 0);
+                    } else if (CVarGetInteger("gRCPosType", 0) == 4) {//Hidden
+                    PosX_RC = -9999;
+                    }
+                } else {
+                    PosY_RC = PosY_RC_ori;
+                    PosX_RC = PosX_RC_ori;
+                }
+                gDPSetPrimColor(OVERLAY_DISP++, 0, 0, rColor.r, rColor.g, rColor.b, interfaceCtx->magicAlpha);
+                // Draw Rupee icon. Hide in Boss Rush.
+                if (!IS_BOSS_RUSH) {
+                    OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, gRupeeCounterIconTex, 16, 16, PosX_RC, PosY_RC, 16, 16, 1 << 10, 1 << 10);
                 }
-            } else {
-                PosY_RC = PosY_RC_ori;
-                PosX_RC = PosX_RC_ori;
-            }
-            gDPSetPrimColor(OVERLAY_DISP++, 0, 0, rColor.r, rColor.g, rColor.b, interfaceCtx->magicAlpha);
-            // Draw Rupee icon. Hide in Boss Rush.
-            if (!IS_BOSS_RUSH) {
-                OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, gRupeeCounterIconTex, 16, 16, PosX_RC, PosY_RC, 16, 16, 1 << 10, 1 << 10);
             }
 
             switch (play->sceneNum) {
@@ -5346,8 +5357,8 @@ void Interface_Draw(PlayState* play) {
             svar2 = rupeeDigitsFirst[CUR_UPG_VALUE(UPG_WALLET)];
             svar5 = rupeeDigitsCount[CUR_UPG_VALUE(UPG_WALLET)];
 
-            // Draw Rupee Counter. Hide in Boss Rush.
-            if (!IS_BOSS_RUSH) {
+            // Draw Rupee Counter. Hide in Boss Rush and when not having a wallet in rando.
+            if (!IS_BOSS_RUSH && (!IS_RANDO || Flags_GetRandomizerInf(RAND_INF_HAS_WALLET))) {
                 for (svar1 = 0, svar3 = 16; svar1 < svar5; svar1++, svar2++, svar3 += 8) {
                     OVERLAY_DISP = Gfx_TextureI8(OVERLAY_DISP, ((u8*)digitTextures[interfaceCtx->counterDigits[svar2]]),
                                                  8, 16, PosX_RC + svar3, PosY_RC, 8, 16, 1 << 10, 1 << 10);
diff --git a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
index ac7d2aa29..d57ff27b6 100644
--- a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
+++ b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
@@ -98,7 +98,7 @@ static ItemData itemData[88] = {
     {CREATE_SPRITE_32(dgItemIconMaskGerudoTex, 37),        ITEM_MASK_GERUDO,      INV_IC_POS(6, 1), SIZE_NORMAL},
     {CREATE_SPRITE_32(dgItemIconMaskTruthTex, 37),         ITEM_MASK_TRUTH,       INV_IC_POS(6, 1), SIZE_NORMAL},
     {CREATE_SPRITE_32(dgItemIconSoldOutTex, 37),           ITEM_SOLD_OUT,         INV_IC_POS(6, 1), SIZE_NORMAL},
-    
+
     {CREATE_SPRITE_32(dgItemIconBoomerangTex, 14),         ITEM_BOOMERANG,        INV_IC_POS(0, 2), SIZE_NORMAL},
     {CREATE_SPRITE_32(dgItemIconLensOfTruthTex, 15),       ITEM_LENS,             INV_IC_POS(1, 2), SIZE_NORMAL},
     {CREATE_SPRITE_32(dgItemIconMagicBeanTex, 16),         ITEM_BEAN,             INV_IC_POS(2, 2), SIZE_NORMAL},
@@ -116,19 +116,19 @@ static ItemData itemData[88] = {
     {CREATE_SPRITE_32(dgItemIconEyeballFrogTex, 53),       ITEM_FROG,             INV_IC_POS(6, 2), SIZE_NORMAL},
     {CREATE_SPRITE_32(dgItemIconEyeDropsTex, 53),          ITEM_EYEDROPS,         INV_IC_POS(6, 2), SIZE_NORMAL},
     {CREATE_SPRITE_32(dgItemIconClaimCheckTex, 53),        ITEM_CLAIM_CHECK,      INV_IC_POS(6, 2), SIZE_NORMAL},
-    
+
     {CREATE_SPRITE_32(dgItemIconSwordKokiriTex, 54),       ITEM_SWORD_KOKIRI,     EQP_IC_POS(0, 0), SIZE_NORMAL},
     {CREATE_SPRITE_32(dgItemIconSwordMasterTex, 55),       ITEM_SWORD_MASTER,     EQP_IC_POS(1, 0), SIZE_NORMAL},
     {CREATE_SPRITE_32(dgItemIconSwordBiggoronTex, 56),     ITEM_SWORD_BGS,        EQP_IC_POS(2, 0), SIZE_NORMAL},
-    
+
     {CREATE_SPRITE_32(dgItemIconShieldDekuTex, 57),        ITEM_SHIELD_DEKU,      EQP_IC_POS(0, 1), SIZE_NORMAL},
     {CREATE_SPRITE_32(dgItemIconShieldHylianTex, 58),      ITEM_SHIELD_HYLIAN,    EQP_IC_POS(1, 1), SIZE_NORMAL},
     {CREATE_SPRITE_32(dgItemIconShieldMirrorTex, 59),      ITEM_SHIELD_MIRROR,    EQP_IC_POS(2, 1), SIZE_NORMAL},
-    
+
     {CREATE_SPRITE_32(dgItemIconTunicKokiriTex, 60),       ITEM_TUNIC_KOKIRI,     EQP_IC_POS(0, 2), SIZE_NORMAL},
     {CREATE_SPRITE_32(dgItemIconTunicGoronTex, 61),        ITEM_TUNIC_GORON,      EQP_IC_POS(1, 2), SIZE_NORMAL},
     {CREATE_SPRITE_32(dgItemIconTunicZoraTex, 62),         ITEM_TUNIC_ZORA,       EQP_IC_POS(2, 2), SIZE_NORMAL},
-    
+
     {CREATE_SPRITE_32(dgItemIconBootsKokiriTex, 63),       ITEM_BOOTS_KOKIRI,     EQP_IC_POS(0, 3), SIZE_NORMAL},
     {CREATE_SPRITE_32(dgItemIconBootsIronTex, 64),         ITEM_BOOTS_IRON,       EQP_IC_POS(1, 3), SIZE_NORMAL},
     {CREATE_SPRITE_32(dgItemIconBootsHoverTex, 65),        ITEM_BOOTS_HOVER,      EQP_IC_POS(2, 3), SIZE_NORMAL},
@@ -136,7 +136,7 @@ static ItemData itemData[88] = {
     {CREATE_SPRITE_24(dgQuestIconKokiriEmeraldTex, 87),    ITEM_KOKIRI_EMERALD,   STN_IC_POS(-1),   SIZE_NORMAL},
     {CREATE_SPRITE_24(dgQuestIconGoronRubyTex, 88),        ITEM_GORON_RUBY,       STN_IC_POS(0),    SIZE_NORMAL},
     {CREATE_SPRITE_24(dgQuestIconZoraSapphireTex, 89),     ITEM_ZORA_SAPPHIRE,    STN_IC_POS(1),    SIZE_NORMAL},
-    
+
     {CREATE_SPRITE_24(dgQuestIconMedallionForestTex, 81),  ITEM_MEDALLION_FOREST, {0x37, 0x0A},     SIZE_NORMAL},
     {CREATE_SPRITE_24(dgQuestIconMedallionFireTex, 82),    ITEM_MEDALLION_FIRE,   {0x37, 0x1A},     SIZE_NORMAL},
     {CREATE_SPRITE_24(dgQuestIconMedallionWaterTex, 83),   ITEM_MEDALLION_WATER,  {0x29, 0x22},     SIZE_NORMAL},
@@ -394,39 +394,39 @@ u8 ShouldRenderItem(s16 fileIndex, u8 item) {
     if (item == ITEM_POCKET_CUCCO && !HasItem(fileIndex, ITEM_POCKET_CUCCO)) {
         return 0;
     }
-    
+
     if (item == ITEM_COJIRO && !HasItem(fileIndex, ITEM_COJIRO)) {
         return 0;
     }
-    
+
     if (item == ITEM_ODD_MUSHROOM && !HasItem(fileIndex, ITEM_ODD_MUSHROOM)) {
         return 0;
     }
-    
+
     if (item == ITEM_ODD_POTION && !HasItem(fileIndex, ITEM_ODD_POTION)) {
         return 0;
     }
-    
+
     if (item == ITEM_SAW && !HasItem(fileIndex, ITEM_SAW)) {
         return 0;
     }
-    
+
     if (item == ITEM_SWORD_BROKEN && !HasItem(fileIndex, ITEM_SWORD_BROKEN)) {
         return 0;
     }
-    
+
     if (item == ITEM_PRESCRIPTION && !HasItem(fileIndex, ITEM_PRESCRIPTION)) {
         return 0;
     }
-    
+
     if (item == ITEM_FROG && !HasItem(fileIndex, ITEM_FROG)) {
         return 0;
     }
-    
+
     if (item == ITEM_EYEDROPS && !HasItem(fileIndex, ITEM_EYEDROPS)) {
         return 0;
     }
-    
+
     if (item == ITEM_CLAIM_CHECK && !HasItem(fileIndex, ITEM_CLAIM_CHECK)) {
         return 0;
     }
@@ -457,7 +457,7 @@ static void DrawItems(FileChooseContext* this, s16 fileIndex, u8 alpha) {
             } else {
                 gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, color_product(data->color.r, DIM.r), color_product(data->color.g, DIM.g), color_product(data->color.b, DIM.b), color_product(color_product(data->color.a, DIM.a), alpha));
             }
-        
+
             SpriteLoad(this, &(data->sprite));
             SpriteDraw(this, &(data->sprite), LEFT_OFFSET + data->pos.left, TOP_OFFSET + data->pos.top, data->size.width, data->size.height);
         }
@@ -469,12 +469,13 @@ static void DrawItems(FileChooseContext* this, s16 fileIndex, u8 alpha) {
 
 typedef enum {
     /* 0x00 */ COUNTER_HEALTH,
-    /* 0x01 */ COUNTER_WALLET_CHILD,
-    /* 0x02 */ COUNTER_WALLET_ADULT,
-    /* 0x03 */ COUNTER_WALLET_GIANT,
-    /* 0x04 */ COUNTER_WALLET_TYCOON,
-    /* 0x04 */ COUNTER_SKULLTULLAS,
-    /* 0x04 */ COUNTER_DEATHS,
+    /* 0x01 */ COUNTER_WALLET_NONE,
+    /* 0x02 */ COUNTER_WALLET_CHILD,
+    /* 0x03 */ COUNTER_WALLET_ADULT,
+    /* 0x04 */ COUNTER_WALLET_GIANT,
+    /* 0x05 */ COUNTER_WALLET_TYCOON,
+    /* 0x06 */ COUNTER_SKULLTULLAS,
+    /* 0x07 */ COUNTER_DEATHS,
 } CounterID;
 
 typedef struct {
@@ -485,8 +486,9 @@ typedef struct {
     IconSize size;
 } CounterData;
 
-static CounterData counterData[7] = {
+static CounterData counterData[8] = {
     {CREATE_SPRITE_24(dgQuestIconHeartContainerTex, 101), COUNTER_HEALTH,        {0x05, 0x00}, SIZE_COUNTER},
+    {CREATE_SPRITE_RUPEE(0x32, 0x40, 0x19),               COUNTER_WALLET_NONE,   {0x05, 0x15}, SIZE_COUNTER},
     {CREATE_SPRITE_RUPEE(0xC8, 0xFF, 0x64),               COUNTER_WALLET_CHILD,  {0x05, 0x15}, SIZE_COUNTER},
     {CREATE_SPRITE_RUPEE(0x82, 0x82, 0xFF),               COUNTER_WALLET_ADULT,  {0x05, 0x15}, SIZE_COUNTER},
     {CREATE_SPRITE_RUPEE(0xFF, 0x64, 0x64),               COUNTER_WALLET_GIANT,  {0x05, 0x15}, SIZE_COUNTER},
@@ -509,20 +511,24 @@ static Sprite counterDigitSprites[10] = {
 };
 
 u8 ShouldRenderCounter(s16 fileIndex, u8 counterId) {
+    if (counterId == COUNTER_WALLET_NONE) {
+        return !Save_GetSaveMetaInfo(fileIndex)->hasWallet;
+    }
+
     if (counterId == COUNTER_WALLET_CHILD) {
-        return ((Save_GetSaveMetaInfo(fileIndex)->upgrades & gUpgradeMasks[UPG_WALLET]) >> gUpgradeShifts[UPG_WALLET]) == 0;
+        return Save_GetSaveMetaInfo(fileIndex)->hasWallet && ((Save_GetSaveMetaInfo(fileIndex)->upgrades & gUpgradeMasks[UPG_WALLET]) >> gUpgradeShifts[UPG_WALLET]) == 0;
     }
 
     if (counterId == COUNTER_WALLET_ADULT) {
-        return ((Save_GetSaveMetaInfo(fileIndex)->upgrades & gUpgradeMasks[UPG_WALLET]) >> gUpgradeShifts[UPG_WALLET]) == 1;
+        return Save_GetSaveMetaInfo(fileIndex)->hasWallet && ((Save_GetSaveMetaInfo(fileIndex)->upgrades & gUpgradeMasks[UPG_WALLET]) >> gUpgradeShifts[UPG_WALLET]) == 1;
     }
 
     if (counterId == COUNTER_WALLET_GIANT) {
-        return ((Save_GetSaveMetaInfo(fileIndex)->upgrades & gUpgradeMasks[UPG_WALLET]) >> gUpgradeShifts[UPG_WALLET]) == 2;
+        return Save_GetSaveMetaInfo(fileIndex)->hasWallet && ((Save_GetSaveMetaInfo(fileIndex)->upgrades & gUpgradeMasks[UPG_WALLET]) >> gUpgradeShifts[UPG_WALLET]) == 2;
     }
 
     if (counterId == COUNTER_WALLET_TYCOON) {
-        return ((Save_GetSaveMetaInfo(fileIndex)->upgrades & gUpgradeMasks[UPG_WALLET]) >> gUpgradeShifts[UPG_WALLET]) == 3;
+        return Save_GetSaveMetaInfo(fileIndex)->hasWallet && ((Save_GetSaveMetaInfo(fileIndex)->upgrades & gUpgradeMasks[UPG_WALLET]) >> gUpgradeShifts[UPG_WALLET]) == 3;
     }
 
     return 1;

From 22b9284240292f30a1a1ebaaa414006ff5f68e12 Mon Sep 17 00:00:00 2001
From: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>
Date: Mon, 15 Jan 2024 16:20:57 +0100
Subject: [PATCH 068/230] Rando: Shuffle Swim (Rando V3) (#3795)

* Shuffle Swim

* Fix build
---
 .../Enhancements/debugger/debugSaveEditor.h   |  2 +
 soh/soh/Enhancements/mods.cpp                 | 74 +++++++++++++++++++
 .../randomizer/3drando/item_pool.cpp          |  4 +
 .../locacc_bottom_of_the_well.cpp             |  2 +-
 .../location_access/locacc_deku_tree.cpp      | 29 +++++---
 .../location_access/locacc_gerudo_valley.cpp  |  4 +-
 .../locacc_jabujabus_belly.cpp                |  8 +-
 .../location_access/locacc_water_temple.cpp   |  4 +-
 .../location_access/locacc_zoras_domain.cpp   |  2 +-
 soh/soh/Enhancements/randomizer/draw.cpp      | 35 +++++++++
 soh/soh/Enhancements/randomizer/draw.h        |  1 +
 soh/soh/Enhancements/randomizer/item.cpp      |  4 +
 soh/soh/Enhancements/randomizer/item_list.cpp |  3 +
 soh/soh/Enhancements/randomizer/logic.cpp     | 11 ++-
 soh/soh/Enhancements/randomizer/logic.h       |  1 +
 .../randomizer/option_descriptions.cpp        |  7 ++
 .../Enhancements/randomizer/randomizer.cpp    | 12 ++-
 .../Enhancements/randomizer/randomizerTypes.h |  7 +-
 .../Enhancements/randomizer/randomizer_inf.h  |  2 +
 soh/soh/Enhancements/randomizer/savefile.cpp  |  4 +
 soh/soh/Enhancements/randomizer/settings.cpp  |  7 ++
 soh/src/code/z_parameter.c                    |  5 ++
 22 files changed, 199 insertions(+), 29 deletions(-)

diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.h b/soh/soh/Enhancements/debugger/debugSaveEditor.h
index eb1dde10a..b0650bfa0 100644
--- a/soh/soh/Enhancements/debugger/debugSaveEditor.h
+++ b/soh/soh/Enhancements/debugger/debugSaveEditor.h
@@ -523,6 +523,8 @@ const std::vector<FlagTable> flagTables = {
         { RAND_INF_HAS_OCARINA_C_LEFT, "RAND_INF_HAS_OCARINA_C_LEFT"},
         { RAND_INF_HAS_OCARINA_C_RIGHT, "RAND_INF_HAS_OCARINA_C_RIGHT"},
 
+        { RAND_INF_CAN_SWIM, "RAND_INF_CAN_SWIM" },
+
         { RAND_INF_HAS_WALLET, "RAND_INF_HAS_WALLET" },
 
         { RAND_INF_BEEHIVE_KF_STORMS_GROTTO_LEFT, "RAND_INF_BEEHIVE_KF_STORMS_GROTTO_LEFT" },
diff --git a/soh/soh/Enhancements/mods.cpp b/soh/soh/Enhancements/mods.cpp
index cb36db76f..0edda9c9d 100644
--- a/soh/soh/Enhancements/mods.cpp
+++ b/soh/soh/Enhancements/mods.cpp
@@ -1284,6 +1284,79 @@ void RegisterToTMedallions() {
     });
 }
 
+//from z_player.c
+typedef struct {
+    /* 0x00 */ Vec3f pos;
+    /* 0x0C */ s16 yaw;
+} SpecialRespawnInfo; // size = 0x10
+
+//special respawns used when voided out without swim to prevent infinite loops
+std::map<s32, SpecialRespawnInfo> swimSpecialRespawnInfo = {
+    {
+        0x1D9,//hf to zr in water
+        { { -1455.443, -20, 1384.826 }, 28761 }
+    },
+    {
+        0x311,//zr to hf in water
+        { { 5830.209, -92.16, 3925.911 }, -20025 }
+    },
+    {
+        0x4DA,//zr to lw
+        { { 1978.718, -36.908, -855 }, -16384 }
+    },
+    {
+        0x1DD,//lw to zr
+        { { 4082.366, 860.442, -1018.949 }, -32768 }
+    },
+    {
+        0x219,//gv to lh
+        { { -3276.416, -1033, 2908.421 }, 11228 }
+    },
+    {
+        0x10,//lh to water temple
+        { { -182, 780, 759.5 }, -32768 }
+    },
+    {
+        0x21D,//water temple to lh
+        { { -955.028, -1306.9, 6768.954 }, -32768 }
+    },
+    {
+        0x328,//lh to zd
+        { { -109.86, 11.396, -9.933 }, -29131 }
+    },
+    {
+        0x560,//zd to lh
+        { { -912, -1326.967, 3391 }, 0 }
+    }
+};
+
+void RegisterNoSwim() {
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnPlayerUpdate>([]() {
+        if (
+            IS_RANDO &&
+            (GET_PLAYER(gPlayState)->stateFlags1 & PLAYER_STATE1_IN_WATER) &&
+            !Flags_GetRandomizerInf(RAND_INF_CAN_SWIM) &&
+            CUR_EQUIP_VALUE(EQUIP_TYPE_BOOTS) != EQUIP_VALUE_BOOTS_IRON
+        ) {
+            //if you void out in water temple without swim you get instantly kicked out to prevent softlocks
+            if (gPlayState->sceneNum == SCENE_WATER_TEMPLE) {
+                GameInteractor::RawAction::TeleportPlayer(Entrance_OverrideNextIndex(ENTR_LAKE_HYLIA_2));//lake hylia from water temple
+                return;
+            }
+
+            if (swimSpecialRespawnInfo.find(gSaveContext.entranceIndex) != swimSpecialRespawnInfo.end()) {
+                SpecialRespawnInfo* respawnInfo = &swimSpecialRespawnInfo.at(gSaveContext.entranceIndex);
+
+                Play_SetupRespawnPoint(gPlayState, RESPAWN_MODE_DOWN, 0xDFF);
+                gSaveContext.respawn[RESPAWN_MODE_DOWN].pos = respawnInfo->pos;
+                gSaveContext.respawn[RESPAWN_MODE_DOWN].yaw = respawnInfo->yaw;
+            }
+
+            Play_TriggerVoidOut(gPlayState);
+        }
+    });
+}
+
 void RegisterNoWallet() {
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGameFrameUpdate>([]() {
         if (IS_RANDO && !Flags_GetRandomizerInf(RAND_INF_HAS_WALLET)) {
@@ -1475,6 +1548,7 @@ void InitMods() {
     RegisterBossSouls();
     RegisterRandomizedEnemySizes();
     RegisterToTMedallions();
+    RegisterNoSwim();
     RegisterNoWallet();
     RegisterFishsanity();
     NameTag_RegisterHooks();
diff --git a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
index 55144d237..a54f522aa 100644
--- a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
@@ -782,6 +782,10 @@ void GenerateItemPool() {
     ctx->possibleIceTrapModels.push_back(RG_OCARINA_C_RIGHT_BUTTON);
   }
 
+  if (ctx->GetOption(RSK_SHUFFLE_SWIM)) {
+    AddItemToMainPool(RG_PROGRESSIVE_SCALE);
+  }
+
   if (ctx->GetOption(RSK_SHUFFLE_BEEHIVES)) {
     //32 total beehive locations
     AddItemToMainPool(RG_RED_RUPEE, 23);
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_bottom_of_the_well.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_bottom_of_the_well.cpp
index 47afc1244..37312b84b 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_bottom_of_the_well.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_bottom_of_the_well.cpp
@@ -31,7 +31,7 @@ void AreaTable_Init_BottomOfTheWell() {
                   LocationAccess(RC_BOTTOM_OF_THE_WELL_COMPASS_CHEST,                {[]{return randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH);}}),
                   LocationAccess(RC_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST,       {[]{return randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH);}}),
                   LocationAccess(RC_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST,     {[]{return (randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->HasExplosives;}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_FREESTANDING_KEY,             {[]{return logic->Sticks || logic->CanUse(RG_DINS_FIRE);}}),
+                  LocationAccess(RC_BOTTOM_OF_THE_WELL_FREESTANDING_KEY,             {[]{return (logic->Swim || logic->CanUse(RG_ZELDAS_LULLABY)) && logic->Sticks || logic->CanUse(RG_DINS_FIRE);}}),
                   LocationAccess(RC_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST,          {[]{return logic->CanUse(RG_ZELDAS_LULLABY) && (logic->KokiriSword || (logic->Sticks && randoCtx->GetTrickOption(RT_BOTW_CHILD_DEADHAND)));}}),
                   LocationAccess(RC_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST,              {[]{return logic->CanUse(RG_ZELDAS_LULLABY) && (randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH));}}),
                   LocationAccess(RC_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST,       {[]{return logic->CanUse(RG_ZELDAS_LULLABY);}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp
index 4c27646f2..af71727d4 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp
@@ -86,14 +86,20 @@ void AreaTable_Init_DekuTree() {
 
   areaTable[RR_DEKU_TREE_BASEMENT_SCRUB_ROOM] = Area("Deku Tree Basement Scrub Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_DEKU_TREE_BASEMENT_LOWER,      {[]{return true;}}),
-                  Entrance(RR_DEKU_TREE_BASEMENT_WATER_ROOM, {[]{return Here(RR_DEKU_TREE_BASEMENT_SCRUB_ROOM, []{return logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW);});}}),
+                  Entrance(RR_DEKU_TREE_BASEMENT_LOWER,            {[]{return true;}}),
+                  Entrance(RR_DEKU_TREE_BASEMENT_WATER_ROOM_FRONT, {[]{return Here(RR_DEKU_TREE_BASEMENT_SCRUB_ROOM, []{return logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW);});}}),
   });
 
-  areaTable[RR_DEKU_TREE_BASEMENT_WATER_ROOM] = Area("Deku Tree Basement Water Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DEKU_TREE_BASEMENT_WATER_ROOM_FRONT] = Area("Deku Tree Basement Water Room Front", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_DEKU_TREE_BASEMENT_SCRUB_ROOM, {[]{return true;}}),
-                  Entrance(RR_DEKU_TREE_BASEMENT_TORCH_ROOM, {[]{return true;}}),
+                  Entrance(RR_DEKU_TREE_BASEMENT_SCRUB_ROOM,      {[]{return true;}}),
+                  Entrance(RR_DEKU_TREE_BASEMENT_WATER_ROOM_BACK, {[]{return logic->Swim || randoCtx->GetTrickOption(RT_DEKU_B1_BACKFLIP_OVER_SPIKED_LOG);}}),
+  });
+
+  areaTable[RR_DEKU_TREE_BASEMENT_WATER_ROOM_BACK] = Area("Deku Tree Basement Water Room Back", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+                  //Exits
+                  Entrance(RR_DEKU_TREE_BASEMENT_WATER_ROOM_FRONT, {[]{return logic->Swim || randoCtx->GetTrickOption(RT_DEKU_B1_BACKFLIP_OVER_SPIKED_LOG);}}),
+                  Entrance(RR_DEKU_TREE_BASEMENT_TORCH_ROOM,       {[]{return true;}}),
   });
 
   areaTable[RR_DEKU_TREE_BASEMENT_TORCH_ROOM] = Area("Deku Tree Basement Torch Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
@@ -102,8 +108,8 @@ void AreaTable_Init_DekuTree() {
                   EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUse(RG_DINS_FIRE));}}),
                 }, {}, {
                   //Exits
-                  Entrance(RR_DEKU_TREE_BASEMENT_WATER_ROOM, {[]{return true;}}),
-                  Entrance(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, {[]{return Here(RR_DEKU_TREE_BASEMENT_TORCH_ROOM, []{return logic->HasFireSourceWithTorch || logic->CanUse(RG_FAIRY_BOW);});}}),
+                  Entrance(RR_DEKU_TREE_BASEMENT_WATER_ROOM_BACK, {[]{return true;}}),
+                  Entrance(RR_DEKU_TREE_BASEMENT_BACK_LOBBY,      {[]{return Here(RR_DEKU_TREE_BASEMENT_TORCH_ROOM, []{return logic->HasFireSourceWithTorch || logic->CanUse(RG_FAIRY_BOW);});}}),
   });
 
   areaTable[RR_DEKU_TREE_BASEMENT_BACK_LOBBY] = Area("Deku Tree Basement Back Lobby", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
@@ -141,7 +147,7 @@ void AreaTable_Init_DekuTree() {
   areaTable[RR_DEKU_TREE_OUTSIDE_BOSS_ROOM] = Area("Deku Tree Outside Boss Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DEKU_TREE_BASEMENT_UPPER, {[]{return true;}}),
-                  Entrance(RR_DEKU_TREE_BOSS_ENTRYWAY,  {[]{return Here(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM, []{return logic->HasShield;});}}),
+                  Entrance(RR_DEKU_TREE_BOSS_ENTRYWAY,  {[]{return (logic->Swim || Here(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM, []{return logic->CanUse(RG_IRON_BOOTS);})) && Here(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM, []{return logic->HasShield;});}}),
   });
   }
 
@@ -192,7 +198,7 @@ void AreaTable_Init_DekuTree() {
                   Entrance(RR_DEKU_TREE_MQ_LOBBY,                    {[]{return true;}}),
   });
 
-  areaTable[RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK] = Area("Deku Tree MQ Basement Water Room Front", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK] = Area("Deku Tree MQ Basement Water Room Back", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST, {[]{return logic->CanUse(RG_SONG_OF_TIME);}}),
   }, {
@@ -229,9 +235,8 @@ void AreaTable_Init_DekuTree() {
             Area("Deku Tree MQ Outside Boss Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {},
                  {
                      // Exits
-                     Entrance(RR_DEKU_TREE_MQ_BASEMENT_LEDGE, { [] { return true; } }),
-                     Entrance(RR_DEKU_TREE_BOSS_ENTRYWAY,
-                              { [] { return Here(RR_DEKU_TREE_MQ_BASEMENT_LEDGE, [] { return logic->HasShield; }); } }),
+                     Entrance(RR_DEKU_TREE_MQ_BASEMENT_LEDGE, {[]{ return true; }}),
+                     Entrance(RR_DEKU_TREE_BOSS_ENTRYWAY,     {[]{return (logic->Swim || Here(RR_DEKU_TREE_MQ_BASEMENT_LEDGE, []{return logic->CanUse(RG_IRON_BOOTS);})) && Here(RR_DEKU_TREE_MQ_BASEMENT_LEDGE, [] { return logic->HasShield; }); } }),
                  });
   }
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
index e7a6f045e..a81627656 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
@@ -25,7 +25,7 @@ void AreaTable_Init_GerudoValley() {
                   EventAccess(&logic->BeanPlantFairy,   {[]{return logic->BeanPlantFairy   || (CanPlantBean(RR_GV_UPPER_STREAM) && logic->CanUse(RG_SONG_OF_STORMS));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_GV_WATERFALL_FREESTANDING_POH, {[]{return true;}}),
+                  LocationAccess(RC_GV_WATERFALL_FREESTANDING_POH, {[]{return logic->IsChild || logic->Swim;}}),//can use cucco as child
                   LocationAccess(RC_GV_GS_BEAN_PATCH,              {[]{return logic->CanPlantBugs && logic->CanChildAttack;}}),
                   LocationAccess(RC_GV_COW,                        {[]{return logic->IsChild && logic->CanUse(RG_EPONAS_SONG);}}),
                   LocationAccess(RC_GV_GOSSIP_STONE,               {[]{return true;}}),
@@ -36,7 +36,7 @@ void AreaTable_Init_GerudoValley() {
 
   areaTable[RR_GV_LOWER_STREAM] = Area("GV Lower Stream", "Gerudo Valley", RA_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_LAKE_HYLIA, {[]{return true;}}),
+                  Entrance(RR_LAKE_HYLIA, {[]{return logic->IsChild || logic->Swim;}}),//can use cucco as child
   });
 
   areaTable[RR_GV_GROTTO_LEDGE] = Area("GV Grotto Ledge", "Gerudo Valley", RA_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {}, {}, {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp
index fe0fc3640..c54911a09 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp
@@ -60,8 +60,8 @@ void AreaTable_Init_JabuJabusBelly() {
                   LocationAccess(RC_JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM, {[]{return true;}}),
                 }, {
                   //Exits
-                  Entrance(RR_JABU_JABUS_BELLY_MAIN_LOWER, {[]{return true;}}),
-                  Entrance(RR_JABU_JABUS_BELLY_LIFT_LOWER, {[]{return logic->CanUseProjectile;}}),
+                  Entrance(RR_JABU_JABUS_BELLY_MAIN_LOWER, {[]{return logic->Swim;}}),
+                  Entrance(RR_JABU_JABUS_BELLY_LIFT_LOWER, {[]{return logic->Swim && logic->CanUseProjectile;}}),
   });
 
   areaTable[RR_JABU_JABUS_BELLY_LOWER_SIDE_ROOM] = Area("Jabu Jabus Belly Lower Side Room", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
@@ -74,7 +74,7 @@ void AreaTable_Init_JabuJabusBelly() {
 
   areaTable[RR_JABU_JABUS_BELLY_LIFT_LOWER] = Area("Jabu Jabus Belly Lift Lower", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_JABU_JABUS_BELLY_DEKU_SCRUB, {[]{return (logic->IsChild || logic->CanDive || randoCtx->GetTrickOption(RT_JABU_ALCOVE_JUMP_DIVE) || logic->CanUse(RG_IRON_BOOTS)) && logic->CanStunDeku;}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_DEKU_SCRUB, {[]{return logic->Swim && (logic->IsChild || logic->CanDive || randoCtx->GetTrickOption(RT_JABU_ALCOVE_JUMP_DIVE) || logic->CanUse(RG_IRON_BOOTS)) && logic->CanStunDeku;}}),
                 }, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_SHABOMB_CORRIDOR, {[]{return true;}}),
@@ -193,7 +193,7 @@ void AreaTable_Init_JabuJabusBelly() {
   areaTable[RR_JABU_JABUS_BELLY_MQ_DEPTHS] = Area("Jabu Jabus Belly MQ Depths", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST, {[]{return true;}}),
-                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM,          {[]{return logic->Sticks || logic->CanUse(RG_DINS_FIRE);}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM,          {[]{return logic->Swim && (logic->Sticks || logic->CanUse(RG_DINS_FIRE));}}),
                   LocationAccess(RC_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM,    {[]{return (randoCtx->GetTrickOption(RT_LENS_JABU_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) || Here(RR_JABU_JABUS_BELLY_MQ_MAIN, []{return logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS) && logic->CanUse(RG_HOOKSHOT);});}}),
   }, {
                   //Exits
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp
index e4d6a4ab2..001984ee7 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp
@@ -10,8 +10,8 @@ void AreaTable_Init_WaterTemple() {
   ---------------------------*/
   areaTable[RR_WATER_TEMPLE_ENTRYWAY] = Area("Water Temple Entryway", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_WATER_TEMPLE_LOBBY,    {[]{return randoCtx->GetDungeon(WATER_TEMPLE)->IsVanilla();}}),
-                  Entrance(RR_WATER_TEMPLE_MQ_LOBBY, {[]{return randoCtx->GetDungeon(WATER_TEMPLE)->IsMQ();}}),
+                  Entrance(RR_WATER_TEMPLE_LOBBY,    {[]{return logic->Swim && randoCtx->GetDungeon(WATER_TEMPLE)->IsVanilla();}}),
+                  Entrance(RR_WATER_TEMPLE_MQ_LOBBY, {[]{return logic->Swim && randoCtx->GetDungeon(WATER_TEMPLE)->IsMQ();}}),
                   Entrance(RR_LAKE_HYLIA,            {[]{return true;}}),
   });
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
index 803c261f4..c20667c47 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
@@ -93,7 +93,7 @@ void AreaTable_Init_ZorasDomain() {
                   EventAccess(&logic->DeliverLetter,     {[]{return logic->DeliverLetter     || (logic->RutosLetter && logic->IsChild && randoCtx->GetOption(RSK_ZORAS_FOUNTAIN).IsNot(RO_ZF_OPEN));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_ZD_DIVING_MINIGAME,                     {[]{return logic->ChildsWallet && logic->IsChild;}}),
+                  LocationAccess(RC_ZD_DIVING_MINIGAME,                     {[]{return logic->Swim && logic->ChildsWallet && logic->IsChild;}}),
                   LocationAccess(RC_ZD_CHEST,                               {[]{return logic->IsChild && logic->CanUse(RG_STICKS);}}),
                   LocationAccess(RC_ZD_KING_ZORA_THAWED,                    {[]{return logic->KingZoraThawed;}}),
                   LocationAccess(RC_ZD_TRADE_PRESCRIPTION,                  {[]{return logic->KingZoraThawed && logic->Prescription;}}),
diff --git a/soh/soh/Enhancements/randomizer/draw.cpp b/soh/soh/Enhancements/randomizer/draw.cpp
index 51841ffcd..646d99456 100644
--- a/soh/soh/Enhancements/randomizer/draw.cpp
+++ b/soh/soh/Enhancements/randomizer/draw.cpp
@@ -10,6 +10,7 @@
 #include "objects/object_gi_key/object_gi_key.h"
 #include "objects/object_gi_bosskey/object_gi_bosskey.h"
 #include "objects/object_gi_hearts/object_gi_hearts.h"
+#include "objects/object_gi_scale/object_gi_scale.h"
 #include "objects/object_gi_fire/object_gi_fire.h"
 #include "objects/object_fish/object_fish.h"
 #include "objects/object_toki_objects/object_toki_objects.h"
@@ -393,6 +394,40 @@ extern "C" void Randomizer_DrawOcarinaButton(PlayState* play, GetItemEntry* getI
     CLOSE_DISPS(play->state.gfxCtx);
 }
 
+static Gfx gGiBronzeScaleWaterColorDL[] = {
+    gsDPPipeSync(),
+    gsDPSetPrimColor(0, 0x60, 255, 255, 255, 255),
+    gsDPSetEnvColor(255, 123, 0, 255),
+    gsSPEndDisplayList(),
+};
+
+static Gfx gGiBronzeScaleColorDL[] = {
+    gsDPPipeSync(),
+    gsDPSetPrimColor(0, 0x80, 255, 255, 255, 255),
+    gsDPSetEnvColor(91, 51, 18, 255),
+    gsSPEndDisplayList(),
+};
+
+extern "C" void Randomizer_DrawBronzeScale(PlayState* play, GetItemEntry* getItemEntry) {
+    OPEN_DISPS(play->state.gfxCtx);
+
+    Gfx_SetupDL_25Xlu(play->state.gfxCtx);
+
+    gSPSegment(POLY_XLU_DISP++, 0x08,
+                (uintptr_t)Gfx_TwoTexScroll(play->state.gfxCtx, 0, 1 * (play->state.frames * 2),
+                                -1 * (play->state.frames * 2), 64, 64, 1, 1 * (play->state.frames * 4),
+                                1 * -(play->state.frames * 4), 32, 32));
+
+    gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__), G_MTX_MODELVIEW | G_MTX_LOAD);
+
+    gSPDisplayList(POLY_XLU_DISP++, (Gfx*)gGiBronzeScaleColorDL);
+    gSPDisplayList(POLY_XLU_DISP++, (Gfx*)gGiScaleDL);
+    gSPDisplayList(POLY_XLU_DISP++, (Gfx*)gGiBronzeScaleWaterColorDL);
+    gSPDisplayList(POLY_XLU_DISP++, (Gfx*)gGiScaleWaterDL);
+
+    CLOSE_DISPS(play->state.gfxCtx);
+}
+
 extern "C" void Randomizer_DrawFishingPoleGI(PlayState* play, GetItemEntry* getItemEntry) {
     Vec3f pos;
     OPEN_DISPS(play->state.gfxCtx);
diff --git a/soh/soh/Enhancements/randomizer/draw.h b/soh/soh/Enhancements/randomizer/draw.h
index 59f173b17..0e8a3e3b5 100644
--- a/soh/soh/Enhancements/randomizer/draw.h
+++ b/soh/soh/Enhancements/randomizer/draw.h
@@ -18,6 +18,7 @@ void Randomizer_DrawMasterSword(PlayState* play, GetItemEntry* getItemEntry);
 void Randomizer_DrawTriforcePiece(PlayState* play, GetItemEntry getItemEntry);
 void Randomizer_DrawTriforcePieceGI(PlayState* play, GetItemEntry getItemEntry);
 void Randomizer_DrawOcarinaButton(PlayState* play, GetItemEntry* getItemEntry);
+void Randomizer_DrawBronzeScale(PlayState* play, GetItemEntry* getItemEntry);
 void Randomizer_DrawFishingPoleGI(PlayState* play, GetItemEntry* getItemEntry);
 #ifdef __cplusplus
 };
diff --git a/soh/soh/Enhancements/randomizer/item.cpp b/soh/soh/Enhancements/randomizer/item.cpp
index 6c0fe4bbe..970d7a347 100644
--- a/soh/soh/Enhancements/randomizer/item.cpp
+++ b/soh/soh/Enhancements/randomizer/item.cpp
@@ -259,6 +259,10 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
             }
             break;
         case RG_PROGRESSIVE_SCALE:
+            if (!Flags_GetRandomizerInf(RAND_INF_CAN_SWIM)) {
+                actual = RG_BRONZE_SCALE;
+                break;
+            }
             switch (CUR_UPG_VALUE(UPG_SCALE)) {
                 case 0:
                     actual = RG_SILVER_SCALE;
diff --git a/soh/soh/Enhancements/randomizer/item_list.cpp b/soh/soh/Enhancements/randomizer/item_list.cpp
index 8e85cb165..a64d62d40 100644
--- a/soh/soh/Enhancements/randomizer/item_list.cpp
+++ b/soh/soh/Enhancements/randomizer/item_list.cpp
@@ -275,6 +275,9 @@ void Rando::StaticData::InitItemTable() {
     itemTable[RG_OCARINA_C_RIGHT_BUTTON] =              Item(RG_OCARINA_C_RIGHT_BUTTON,          Text{ "Ocarina C Right Button", "Touche C-Droit de l'Ocarina", "Botón C derecho de Ocarina" },                     ITEMTYPE_ITEM,              GI_MAP,             true,  &logic->OcarinaCRightButton, RHT_OCARINA_C_RIGHT_BUTTON, RG_OCARINA_C_RIGHT_BUTTON,      OBJECT_GI_MAP,          GID_STONE_OF_AGONY, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_OCARINA_C_RIGHT_BUTTON].SetCustomDrawFunc(Randomizer_DrawOcarinaButton);
 
+    itemTable[RG_BRONZE_SCALE] = Item(RG_BRONZE_SCALE, Text{ "Bronze Scale", "!!!", "!!!" }, ITEMTYPE_ITEM, GI_SCALE_SILVER, true, &logic->ProgressiveWallet, RHT_BRONZE_SCALE, RG_BRONZE_SCALE, OBJECT_GI_SCALE, GID_SCALE_SILVER, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
+    itemTable[RG_BRONZE_SCALE].SetCustomDrawFunc(Randomizer_DrawBronzeScale);
+
     itemTable[RG_TRIFORCE] =                            Item(RG_TRIFORCE,                         Text{ "Triforce", "Triforce", "Triforce" },                                                                       ITEMTYPE_EVENT,             RG_TRIFORCE,        false, &logic->noVariable,          RHT_NONE);
     itemTable[RG_HINT] =                                Item(RG_HINT,                             Text{ "Hint", "Indice", "Hinweis" },                                                                              ITEMTYPE_EVENT,             RG_HINT,            false, &logic->noVariable,          RHT_NONE);
     // Individual stages of progressive items (only here for GetItemEntry purposes, not for use in seed gen)
diff --git a/soh/soh/Enhancements/randomizer/logic.cpp b/soh/soh/Enhancements/randomizer/logic.cpp
index 3f6f0a079..a0b3ae378 100644
--- a/soh/soh/Enhancements/randomizer/logic.cpp
+++ b/soh/soh/Enhancements/randomizer/logic.cpp
@@ -255,8 +255,9 @@ namespace Rando {
         GoronBracelet   = ProgressiveStrength   >= 1;
         SilverGauntlets = ProgressiveStrength   >= 2;
         GoldenGauntlets = ProgressiveStrength   >= 3;
-        SilverScale     = ProgressiveScale      >= 1;
-        GoldScale       = ProgressiveScale      >= 2;
+        Swim            = ProgressiveScale      >= 1;
+        SilverScale     = ProgressiveScale      >= 2;
+        GoldScale       = ProgressiveScale      >= 3;
         ChildsWallet    = ProgressiveWallet     >= 1;
         AdultsWallet    = ProgressiveWallet     >= 2;
         BiggoronSword   = BiggoronSword || ProgressiveGiantKnife >= 2;
@@ -313,7 +314,7 @@ namespace Rando {
         CanAdultDamage  = IsAdult && (CanUse(RG_FAIRY_BOW) || CanUse(RG_STICKS)          || CanUse(RG_KOKIRI_SWORD) || HasExplosives || CanUse(RG_DINS_FIRE) || MasterSword || Hammer || BiggoronSword);
         CanStunDeku     = CanAdultAttack || CanChildAttack || Nuts || HasShield;
         CanCutShrubs    = CanUse(RG_KOKIRI_SWORD) || CanUse(RG_BOOMERANG) || HasExplosives || CanUse(RG_MASTER_SWORD) || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_BIGGORON_SWORD);
-        CanDive         = ProgressiveScale >= 1;
+        CanDive         = ProgressiveScale >= 2;
         CanLeaveForest  = ctx->GetOption(RSK_FOREST).IsNot(RO_FOREST_CLOSED) || IsAdult || DekuTreeClear || ctx->GetOption(RSK_SHUFFLE_INTERIOR_ENTRANCES) || ctx->GetOption(RSK_SHUFFLE_OVERWORLD_ENTRANCES);
         CanPlantBugs    = IsChild && Bugs;
         CanRideEpona    = IsAdult && Epona && CanUse(RG_EPONAS_SONG);
@@ -608,7 +609,8 @@ namespace Rando {
         ProgressiveBulletBag  = 0;
         ProgressiveBombBag    = 0;
         ProgressiveMagic      = 0;
-        ProgressiveScale      = 0;
+        //If we're not shuffling swim, we start with it (scale 1)
+        ProgressiveScale      = ctx->GetOption(RSK_SHUFFLE_SWIM).Is(true) ? 0 : 1;
         ProgressiveHookshot   = 0;
         ProgressiveBow        = 0;
         //If we're not shuffling child's wallet, we start with it (wallet 1)
@@ -711,6 +713,7 @@ namespace Rando {
         GoronBracelet    = false;
         SilverGauntlets  = false;
         GoldenGauntlets  = false;
+        Swim             = false;
         SilverScale      = false;
         GoldScale        = false;
         ChildsWallet     = false;
diff --git a/soh/soh/Enhancements/randomizer/logic.h b/soh/soh/Enhancements/randomizer/logic.h
index b72c3cb47..8cccdbbf8 100644
--- a/soh/soh/Enhancements/randomizer/logic.h
+++ b/soh/soh/Enhancements/randomizer/logic.h
@@ -237,6 +237,7 @@ class Logic {
     bool GoronBracelet = false;
     bool SilverGauntlets = false;
     bool GoldenGauntlets = false;
+    bool Swim = false;
     bool SilverScale = false;
     bool GoldScale = false;
     bool ChildsWallet = false;
diff --git a/soh/soh/Enhancements/randomizer/option_descriptions.cpp b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
index 123b83edb..95db75e55 100644
--- a/soh/soh/Enhancements/randomizer/option_descriptions.cpp
+++ b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
@@ -223,6 +223,13 @@ void Settings::CreateOptionDescriptions() {
         "Enabling this shuffles the Ocarina buttons into the item pool.\n"
         "\n"
         "This will require finding the buttons before being able to use them in songs.";
+
+    mOptionDescriptions[RSK_SHUFFLE_SWIM] =
+        "Shuffles the ability to Swim into the item pool.\n"
+        "The ability to swim has to be found as an item (you can still be underwater if you use iron boots).\n"
+        "\n"
+        "If you enter a water entrance without swim you will be respawned on land to prevent infinite death loops.\n"
+        "If you void out in Water Temple you will immediately be kicked out to prevent a softlock.";
     mOptionDescriptions[RSK_SHUFFLE_WEIRD_EGG] = "Shuffles the Weird Egg from Malon in to the item pool. Enabling "
                                                  "\"Skip Child Zelda\" disables this feature.\n"
                                                  "\n"
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index f053e3674..b2d9c7866 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -1210,6 +1210,9 @@ GetItemID Randomizer::GetItemIdFromRandomizerGet(RandomizerGet randoGet, GetItem
                     return tycoonWallet ? (GetItemID)RG_TYCOON_WALLET : GI_WALLET_GIANT;
             }
         case RG_PROGRESSIVE_SCALE:
+            if (!Flags_GetRandomizerInf(RAND_INF_CAN_SWIM)) {
+                return (GetItemID)RG_BRONZE_SCALE;
+            }
             switch (CUR_UPG_VALUE(UPG_SCALE)) {
                 case 0:
                     return GI_SCALE_SILVER;
@@ -1324,7 +1327,6 @@ bool Randomizer::IsItemVanilla(RandomizerGet randoGet) {
         case RG_PROGRESSIVE_BOMB_BAG:
         case RG_PROGRESSIVE_BOW:
         case RG_PROGRESSIVE_SLINGSHOT:
-        case RG_PROGRESSIVE_SCALE:
         case RG_PROGRESSIVE_NUT_UPGRADE:
         case RG_PROGRESSIVE_STICK_UPGRADE:
         case RG_PROGRESSIVE_OCARINA:
@@ -1391,6 +1393,11 @@ bool Randomizer::IsItemVanilla(RandomizerGet randoGet) {
         case RG_BUY_RED_POTION_40:
         case RG_BUY_RED_POTION_50:
             return true;
+        case RG_PROGRESSIVE_SCALE:
+            if (!Flags_GetRandomizerInf(RAND_INF_CAN_SWIM)) {
+                return false;
+            }
+            return true;
         case RG_PROGRESSIVE_WALLET:
             if (!Flags_GetRandomizerInf(RAND_INF_HAS_WALLET)) {
                 return false;
@@ -3239,7 +3246,7 @@ CustomMessage Randomizer::GetGoronMessage(u16 index) {
 void Randomizer::CreateCustomMessages() {
     // RANDTODO: Translate into french and german and replace GIMESSAGE_UNTRANSLATED
     // with GIMESSAGE(getItemID, itemID, english, german, french).
-    const std::array<GetItemMessage, 73> getItemMessages = {{
+    const std::array<GetItemMessage, 74> getItemMessages = {{
         GIMESSAGE(RG_GREG_RUPEE, ITEM_MASK_GORON, 
 			"You found %gGreg%w!",
 			"%gGreg%w! Du hast ihn wirklich gefunden!",
@@ -3509,6 +3516,7 @@ void Randomizer::CreateCustomMessages() {
             "You got the %y\xa6%r button for the&Ocarina%w! You can now use it&while playing songs!",
 			"Der %y\xa6%r Knopf%w!&Du kannst ihn nun zum Spielen&von Liedern auf der %rOkarina%w&verwenden!",
 			"Vous trouvez la %rtouche %y\xa6%r de&l'Ocarina%w! Vous pouvez&maintenant l'utiliser lorsque&vous en jouez!"),
+        GIMESSAGE_UNTRANSLATED(RG_BRONZE_SCALE, ITEM_SCALE_SILVER, "You got the %rBronze Scale%w!&The power of buoyancy is yours!"),
         GIMESSAGE_UNTRANSLATED(RG_FISHING_POLE, ITEM_FISHING_POLE, "You found a lost %rFishing Pole%w!&Time to hit the pond!"),
     }};
     CreateGetItemMessages(&getItemMessages);
diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h
index 4f75118cd..a86dc82c4 100644
--- a/soh/soh/Enhancements/randomizer/randomizerTypes.h
+++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@@ -333,7 +333,8 @@ typedef enum {
     RR_DEKU_TREE_COMPASS_ROOM,
     RR_DEKU_TREE_BASEMENT_LOWER,
     RR_DEKU_TREE_BASEMENT_SCRUB_ROOM,
-    RR_DEKU_TREE_BASEMENT_WATER_ROOM,
+    RR_DEKU_TREE_BASEMENT_WATER_ROOM_FRONT,
+    RR_DEKU_TREE_BASEMENT_WATER_ROOM_BACK,
     RR_DEKU_TREE_BASEMENT_TORCH_ROOM,
     RR_DEKU_TREE_BASEMENT_BACK_LOBBY,
     RR_DEKU_TREE_BASEMENT_BACK_ROOM,
@@ -1552,6 +1553,7 @@ typedef enum {
     RT_DEKU_BASEMENT_GS,
     RT_DEKU_B1_SKIP,
     RT_DEKU_B1_BOW_WEBS,
+    RT_DEKU_B1_BACKFLIP_OVER_SPIKED_LOG,
     RT_DEKU_MQ_COMPASS_GS,
     RT_DEKU_MQ_LOG,
     RT_DC_SCARECROW_GS,
@@ -1959,6 +1961,7 @@ typedef enum {
     RG_FISHING_POLE,
     RG_HINT,
     RG_TYCOON_WALLET,
+    RG_BRONZE_SCALE,
     RG_CHILD_WALLET,
     RG_FAIRY_OCARINA,
     RG_OCARINA_OF_TIME,
@@ -3202,6 +3205,7 @@ typedef enum {
     RHT_OCARINA_C_DOWN_BUTTON,
     RHT_OCARINA_C_LEFT_BUTTON,
     RHT_OCARINA_C_RIGHT_BUTTON,
+    RHT_BRONZE_SCALE,
     RHT_FISHING_POLE,
     RHT_EPONA,
     // Entrances
@@ -3514,6 +3518,7 @@ typedef enum {
     RSK_STARTING_OCARINA,
     RSK_SHUFFLE_OCARINA,
     RSK_SHUFFLE_OCARINA_BUTTONS,
+    RSK_SHUFFLE_SWIM,
     RSK_STARTING_DEKU_SHIELD,
     RSK_STARTING_KOKIRI_SWORD,
     RSK_STARTING_MASTER_SWORD,
diff --git a/soh/soh/Enhancements/randomizer/randomizer_inf.h b/soh/soh/Enhancements/randomizer/randomizer_inf.h
index ad8f95a7b..c61f933bf 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_inf.h
+++ b/soh/soh/Enhancements/randomizer/randomizer_inf.h
@@ -212,6 +212,8 @@ typedef enum {
     RAND_INF_HAS_OCARINA_C_LEFT,
     RAND_INF_HAS_OCARINA_C_RIGHT,
 
+    RAND_INF_CAN_SWIM,
+
     RAND_INF_HAS_WALLET,
 
     RAND_INF_BEEHIVE_KF_STORMS_GROTTO_LEFT,
diff --git a/soh/soh/Enhancements/randomizer/savefile.cpp b/soh/soh/Enhancements/randomizer/savefile.cpp
index faf8dca0b..fc892bcbb 100644
--- a/soh/soh/Enhancements/randomizer/savefile.cpp
+++ b/soh/soh/Enhancements/randomizer/savefile.cpp
@@ -301,6 +301,10 @@ extern "C" void Randomizer_InitSaveFile() {
         Flags_SetRandomizerInf(RAND_INF_HAS_OCARINA_C_DOWN);
     }
 
+    if (Randomizer_GetSettingValue(RSK_SHUFFLE_SWIM) == RO_GENERIC_OFF) {
+        Flags_SetRandomizerInf(RAND_INF_CAN_SWIM);
+    }
+
     if (Randomizer_GetSettingValue(RSK_SHUFFLE_CHILD_WALLET) == RO_GENERIC_OFF) {
         Flags_SetRandomizerInf(RAND_INF_HAS_WALLET);
     }
diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
index e6f825056..f3f5b1c10 100644
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -108,6 +108,7 @@ void Settings::CreateOptions() {
     mOptions[RSK_SHUFFLE_CHILD_WALLET] = Option::Bool("Shuffle Child's Wallet", "gRandomizeShuffleChildWallet", mOptionDescriptions[RSK_SHUFFLE_CHILD_WALLET]);
     mOptions[RSK_SHUFFLE_OCARINA] = Option::Bool("Shuffle Ocarinas", "gRandomizeShuffleOcarinas", mOptionDescriptions[RSK_SHUFFLE_OCARINA]);
     mOptions[RSK_SHUFFLE_OCARINA_BUTTONS] = Option::Bool("Shuffle Ocarina Buttons", "gRandomizeShuffleOcarinaButtons", mOptionDescriptions[RSK_SHUFFLE_OCARINA_BUTTONS]);
+    mOptions[RSK_SHUFFLE_SWIM] = Option::Bool("Shuffle Swim", "gRandomizeShuffleSwim", mOptionDescriptions[RSK_SHUFFLE_SWIM]);
     mOptions[RSK_SHUFFLE_WEIRD_EGG] = Option::Bool("Shuffle Weird Egg", "gRandomizeShuffleWeirdEgg", mOptionDescriptions[RSK_SHUFFLE_WEIRD_EGG]);
     mOptions[RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD] = Option::Bool("Shuffle Gerudo Membership Card", "gRandomizeShuffleGerudoToken", mOptionDescriptions[RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD]);
     mOptions[RSK_SHUFFLE_FISHING_POLE] = Option::Bool("Shuffle Fishing Pole", "gRandomizeShuffleFishingPole", mOptionDescriptions[RSK_SHUFFLE_FISHING_POLE]);
@@ -287,6 +288,7 @@ void Settings::CreateOptions() {
     mTrickOptions[RT_DEKU_BASEMENT_GS] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_DEKU_TREE, {Tricks::Tag::NOVICE}, false, "Deku Tree Basement Vines GS with Jump Slash", "Can be defeated by doing a precise jump slash.");
     mTrickOptions[RT_DEKU_B1_SKIP] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_DEKU_TREE, {Tricks::Tag::INTERMEDIATE}, false, "Deku Tree Basement without Slingshot", "A precise jump can be used to skip needing to use the Slingshot to go around B1 of the Deku Tree. If used with the \"Closed Forest\" setting, a Slingshot will not be guaranteed to exist somewhere inside the Forest. This trick applies to both Vanilla and Master Quest.");
     mTrickOptions[RT_DEKU_B1_BOW_WEBS] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_DEKU_TREE, {Tricks::Tag::NOVICE}, false, "Deku Tree Basement Web to Gohma with Bow", "All spider web walls in the Deku Tree basement can be burnt as adult with just a bow by shooting through torches. This trick only applies to the circular web leading to Gohma; the two vertical webs are always in logic. Backflip onto the chest near the torch at the bottom of the vine wall. With precise positioning you can shoot through the torch to the right edge of the circular web. This allows completion of adult Deku Tree with no fire source.");
+    mTrickOptions[RT_DEKU_B1_BACKFLIP_OVER_SPIKED_LOG] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_DEKU_TREE, {Tricks::Tag::NOVICE}, false, "Deku Tree Basement Backflip over Spiked Log", "Allows backflipping over the spiked log in the deku tree basement in vanilla. Only relevant if \"Shuffle Swim\" is enabled.");
     mTrickOptions[RT_DEKU_MQ_COMPASS_GS] = TrickOption::LogicTrick(RCQUEST_MQ, RA_DEKU_TREE, {Tricks::Tag::NOVICE}, false, "Deku Tree MQ Compass Room GS Boulders with Just Hammer", "Climb to the top of the vines, then let go and jump slash immediately to destroy the boulders using the Hammer, without needing to spawn a Song of Time block.");
     mTrickOptions[RT_DEKU_MQ_LOG] = TrickOption::LogicTrick(RCQUEST_MQ, RA_DEKU_TREE, {Tricks::Tag::NOVICE}, false, "Deku Tree MQ Roll Under the Spiked Log", "You can get past the spiked log by rolling to briefly shrink your hitbox. As adult, the timing is a bit more precise.");
     mTrickOptions[RT_DC_SCARECROW_GS] = TrickOption::LogicTrick(RCQUEST_VANILLA, RA_DODONGOS_CAVERN, {Tricks::Tag::NOVICE}, false, "Dodongo\'s Cavern Scarecrow GS with Armos Statue", "You can jump off an Armos Statue to reach the alcove with the Gold Skulltula. It takes quite a long time to pull the statue the entire way. The jump to the alcove can be a bit picky when done as child.");
@@ -466,6 +468,7 @@ void Settings::CreateOptions() {
         &mTrickOptions[RT_DEKU_BASEMENT_GS],
         &mTrickOptions[RT_DEKU_B1_SKIP],
         &mTrickOptions[RT_DEKU_B1_BOW_WEBS],
+        &mTrickOptions[RT_DEKU_B1_BACKFLIP_OVER_SPIKED_LOG],
         &mTrickOptions[RT_DEKU_MQ_COMPASS_GS],
         &mTrickOptions[RT_DEKU_MQ_LOG],
         &mTrickOptions[RT_DC_SCARECROW_GS],
@@ -653,6 +656,7 @@ void Settings::CreateOptions() {
         &mOptions[RSK_SHUFFLE_CHILD_WALLET],
         &mOptions[RSK_SHUFFLE_OCARINA],
         &mOptions[RSK_SHUFFLE_OCARINA_BUTTONS],
+        &mOptions[RSK_SHUFFLE_SWIM],
         &mOptions[RSK_SHUFFLE_WEIRD_EGG],
         &mOptions[RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD],
         &mOptions[RSK_SHUFFLE_FISHING_POLE],
@@ -869,6 +873,7 @@ void Settings::CreateOptions() {
         &mOptions[RSK_SHUFFLE_KOKIRI_SWORD],
         &mOptions[RSK_SHUFFLE_OCARINA],
         &mOptions[RSK_SHUFFLE_OCARINA_BUTTONS],
+        &mOptions[RSK_SHUFFLE_SWIM],
         &mOptions[RSK_SHUFFLE_WEIRD_EGG],
         &mOptions[RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD],
         &mOptions[RSK_SHUFFLE_MAGIC_BEANS],
@@ -1091,6 +1096,7 @@ void Settings::CreateOptions() {
         { "Shuffle Settings:Tokensanity", RSK_SHUFFLE_TOKENS },
         { "Shuffle Settings:Shuffle Ocarinas", RSK_SHUFFLE_OCARINA },
         { "Shuffle Settings:Shuffle Ocarina Buttons", RSK_SHUFFLE_OCARINA_BUTTONS },
+        { "Shuffle Settings:Shuffle Swim", RSK_SHUFFLE_SWIM },
         { "Shuffle Settings:Shuffle Adult Trade", RSK_SHUFFLE_ADULT_TRADE },
         { "Shuffle Settings:Shuffle Magic Beans", RSK_SHUFFLE_MAGIC_BEANS },
         { "Shuffle Settings:Shuffle Kokiri Sword", RSK_SHUFFLE_KOKIRI_SWORD },
@@ -2244,6 +2250,7 @@ void Settings::ParseJson(nlohmann::json spoilerFileJson) {
                 case RSK_SHUFFLE_100_GS_REWARD:
                 case RSK_SHUFFLE_OCARINA:
                 case RSK_SHUFFLE_OCARINA_BUTTONS:
+                case RSK_SHUFFLE_SWIM:
                 case RSK_SHUFFLE_CHILD_WALLET:
                 case RSK_STARTING_DEKU_SHIELD:
                 case RSK_STARTING_KOKIRI_SWORD:
diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c
index e9bbf9ef8..0ac3d6ead 100644
--- a/soh/src/code/z_parameter.c
+++ b/soh/src/code/z_parameter.c
@@ -2684,6 +2684,11 @@ u16 Randomizer_Item_Give(PlayState* play, GetItemEntry giEntry) {
         return Return_Item_Entry(giEntry, RG_NONE);
     }
 
+    if (item == RG_BRONZE_SCALE) {
+        Flags_SetRandomizerInf(RAND_INF_CAN_SWIM);
+        return Return_Item_Entry(giEntry, RG_NONE);
+    }
+
     temp = gSaveContext.inventory.items[slot];
     osSyncPrintf("Item_Register(%d)=%d  %d\n", slot, item, temp);
     INV_CONTENT(item) = item;

From 7cd2019ef6297786203fdd5ffbd7ebecf95dfa2e Mon Sep 17 00:00:00 2001
From: aMannus <mannusmenting@gmail.com>
Date: Fri, 2 Feb 2024 06:56:35 +0100
Subject: [PATCH 069/230] Fix starting skulltulas (#3876)

---
 soh/soh/Enhancements/randomizer/settings.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
index f3f5b1c10..3fc4efa86 100644
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -200,7 +200,7 @@ void Settings::CreateOptions() {
     mOptions[RSK_STARTING_REQUIEM_OF_SPIRIT] = Option::Bool("Start with Requiem of Spirit", "gRandomizeStartingRequiemOfSpirit", "", IMFLAG_NONE);
     mOptions[RSK_STARTING_NOCTURNE_OF_SHADOW] = Option::Bool("Start with Nocturne of Shadow", "gRandomizeStartingNocturneOfShadow", "", IMFLAG_NONE);
     mOptions[RSK_STARTING_PRELUDE_OF_LIGHT] = Option::Bool("Start with Prelude of Light", "gRandomizeStartingPreludeOfLight");
-    mOptions[RSK_STARTING_SKULLTULA_TOKEN] = Option::U8("Gold Skulltula Tokens", {NumOpts(0, 100)}, OptionCategory::Setting, "", "gRandomizeStartingSkulltulaToken", WidgetType::Slider);
+    mOptions[RSK_STARTING_SKULLTULA_TOKEN] = Option::U8("Gold Skulltula Tokens", {NumOpts(0, 100)}, OptionCategory::Setting, "gRandomizeStartingSkulltulaToken", "", WidgetType::Slider);
     mOptions[RSK_STARTING_HEARTS] = Option::U8("Hearts", {NumOpts(1, 20)}, OptionCategory::Setting, "", "", WidgetType::Slider, 2);
     // TODO: Remainder of Starting Items
     mOptions[RSK_LOGIC_RULES] = Option::U8("Logic", {"Glitchless", "Glitched", "No Logic", "Vanilla"}, OptionCategory::Setting, "gRandomizeLogicRules", mOptionDescriptions[RSK_LOGIC_RULES], WidgetType::Combobox, RO_LOGIC_GLITCHLESS);

From 596ea5ebbb3e5a5dfab72fb7bee6d4802d8b13d4 Mon Sep 17 00:00:00 2001
From: Garrett Cox <garrettjcox@gmail.com>
Date: Mon, 8 Jan 2024 09:25:47 -0600
Subject: [PATCH 070/230] Vanilla Behavior Overhaul

Co-authored-by: jordanpg <jordanpg@users.noreply.github.com>
---
 soh/include/functions.h                       |    4 +
 soh/include/z64actor.h                        |   12 +-
 .../Enhancements/debugger/debugSaveEditor.h   |    8 +-
 soh/soh/Enhancements/debugger/valueViewer.cpp |    2 +
 soh/soh/Enhancements/enhancementTypes.h       |    7 +
 .../game-interactor/GameInteractor.h          |  294 ++-
 .../game-interactor/GameInteractor_Hooks.cpp  |    5 +
 .../game-interactor/GameInteractor_Hooks.h    |    1 +
 soh/soh/Enhancements/mods.cpp                 |    4 +
 .../Enhancements/randomizer/3drando/fill.cpp  |   14 +-
 .../randomizer/3drando/spoiler_log.hpp        |    4 -
 .../Enhancements/randomizer/hook_handlers.cpp |  975 ++++++++++
 .../Enhancements/randomizer/hook_handlers.h   |    6 +
 .../Enhancements/randomizer/item_location.cpp |   13 +
 .../Enhancements/randomizer/item_location.h   |    4 +
 soh/soh/Enhancements/randomizer/location.h    |   20 +-
 .../Enhancements/randomizer/location_list.cpp | 1690 ++++++++---------
 .../randomizer/randomizer_check_tracker.cpp   |   21 +-
 .../randomizer/randomizer_entrance.c          |   51 +-
 .../Enhancements/randomizer/randomizer_inf.h  |   10 +
 soh/soh/Enhancements/randomizer/savefile.cpp  |  142 +-
 .../Enhancements/timesaver_hook_handlers.cpp  |  788 ++++++++
 .../Enhancements/timesaver_hook_handlers.h    |    6 +
 soh/soh/OTRGlobals.cpp                        |   10 +-
 soh/soh/SaveManager.cpp                       |   11 +
 soh/soh/SohMenuBar.cpp                        |  114 +-
 soh/src/code/z_demo.c                         |  171 +-
 soh/src/code/z_en_item00.c                    |  120 +-
 soh/src/code/z_message_PAL.c                  |   19 +-
 soh/src/code/z_onepointdemo.c                 |   18 +-
 soh/src/code/z_parameter.c                    |    8 +-
 soh/src/code/z_play.c                         |  126 --
 soh/src/code/z_player_lib.c                   |    4 +-
 .../ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c     |   15 +-
 .../actors/ovl_Bg_Breakwall/z_bg_breakwall.c  |   10 +-
 .../ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c       |   11 +-
 .../actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c    |   10 +-
 .../actors/ovl_Bg_Treemouth/z_bg_treemouth.c  |   15 +-
 .../actors/ovl_Bg_Treemouth/z_bg_treemouth.h  |    3 +
 .../overlays/actors/ovl_Demo_Du/z_demo_du.c   |    9 +-
 .../actors/ovl_Demo_Effect/z_demo_effect.c    |   53 +-
 .../overlays/actors/ovl_Demo_Im/z_demo_im.c   |   44 +-
 .../overlays/actors/ovl_Demo_Im/z_demo_im.h   |    2 +
 .../overlays/actors/ovl_Demo_Sa/z_demo_sa.c   |    9 +-
 .../actors/ovl_Door_Shutter/z_door_shutter.c  |   15 +-
 .../actors/ovl_Door_Warp1/z_door_warp1.c      |  176 +-
 .../overlays/actors/ovl_Elf_Msg/z_elf_msg.c   |   15 +-
 soh/src/overlays/actors/ovl_En_Box/z_en_box.c |   84 +-
 soh/src/overlays/actors/ovl_En_Box/z_en_box.h |    3 +-
 soh/src/overlays/actors/ovl_En_Cow/z_en_cow.c |   85 +-
 soh/src/overlays/actors/ovl_En_Cow/z_en_cow.h |    2 +
 soh/src/overlays/actors/ovl_En_Dns/z_en_dns.c |   85 +-
 soh/src/overlays/actors/ovl_En_Dns/z_en_dns.h |    5 +-
 soh/src/overlays/actors/ovl_En_Ds/z_en_ds.c   |   71 +-
 soh/src/overlays/actors/ovl_En_Du/z_en_du.c   |   27 +-
 soh/src/overlays/actors/ovl_En_Fr/z_en_fr.c   |   50 +-
 soh/src/overlays/actors/ovl_En_Fr/z_en_fr.h   |    4 +-
 soh/src/overlays/actors/ovl_En_Gm/z_en_gm.c   |   43 +-
 soh/src/overlays/actors/ovl_En_Go/z_en_go.c   |  219 +--
 soh/src/overlays/actors/ovl_En_Go/z_en_go.h   |    7 +-
 soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c |  185 +-
 soh/src/overlays/actors/ovl_En_Go2/z_en_go2.h |    5 +
 soh/src/overlays/actors/ovl_En_Hs/z_en_hs.c   |   49 +-
 soh/src/overlays/actors/ovl_En_Js/z_en_js.c   |   21 +-
 soh/src/overlays/actors/ovl_En_Ko/z_en_ko.c   |   46 +-
 soh/src/overlays/actors/ovl_En_Ko/z_en_ko.h   |    4 +
 soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c   |   90 +-
 soh/src/overlays/actors/ovl_En_Kz/z_en_kz.h   |    2 +
 soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c |  169 +-
 soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.h |    3 +
 soh/src/overlays/actors/ovl_En_Md/z_en_md.c   |   46 +-
 soh/src/overlays/actors/ovl_En_Mk/z_en_mk.c   |   54 +-
 soh/src/overlays/actors/ovl_En_Ms/z_en_ms.c   |   36 +-
 soh/src/overlays/actors/ovl_En_Ms/z_en_ms.h   |    3 +
 soh/src/overlays/actors/ovl_En_Nb/z_en_nb.c   |    9 +-
 .../actors/ovl_En_Niw_Lady/z_en_niw_lady.c    |   46 +-
 soh/src/overlays/actors/ovl_En_Owl/z_en_owl.c |    8 +-
 soh/src/overlays/actors/ovl_En_Owl/z_en_owl.h |    2 +
 soh/src/overlays/actors/ovl_En_Rl/z_en_rl.c   |    5 +-
 soh/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c |    9 +-
 soh/src/overlays/actors/ovl_En_Sa/z_en_sa.c   |   35 +-
 soh/src/overlays/actors/ovl_En_Sa/z_en_sa.h   |    2 +
 .../actors/ovl_En_Shopnuts/z_en_shopnuts.c    |   16 +-
 soh/src/overlays/actors/ovl_En_Si/z_en_si.c   |  113 +-
 soh/src/overlays/actors/ovl_En_Si/z_en_si.h   |    3 +
 soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c   |    3 +-
 soh/src/overlays/actors/ovl_En_Tk/z_en_tk.c   |   68 +-
 soh/src/overlays/actors/ovl_En_Tk/z_en_tk.h   |    2 +
 .../overlays/actors/ovl_En_Toryo/z_en_toryo.c |   20 +-
 .../ovl_En_Wonder_Talk2/z_en_wonder_talk2.c   |   41 +-
 soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c   |  110 +-
 soh/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c |    5 +-
 soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c |   34 +-
 soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.h |    5 +
 .../actors/ovl_Item_B_Heart/z_item_b_heart.c  |   34 +-
 .../actors/ovl_Item_B_Heart/z_item_b_heart.h  |    5 +
 .../actors/ovl_Item_Ocarina/z_item_ocarina.c  |   27 +-
 .../actors/ovl_Obj_Switch/z_obj_switch.c      |   15 +-
 .../actors/ovl_player_actor/z_player.c        |   19 +-
 99 files changed, 4191 insertions(+), 2912 deletions(-)
 create mode 100644 soh/soh/Enhancements/randomizer/hook_handlers.cpp
 create mode 100644 soh/soh/Enhancements/randomizer/hook_handlers.h
 create mode 100644 soh/soh/Enhancements/timesaver_hook_handlers.cpp
 create mode 100644 soh/soh/Enhancements/timesaver_hook_handlers.h

diff --git a/soh/include/functions.h b/soh/include/functions.h
index 49a8a0a93..698487621 100644
--- a/soh/include/functions.h
+++ b/soh/include/functions.h
@@ -183,6 +183,8 @@ void __osSetWatchLo(u32);
 EnItem00* Item_DropCollectible(PlayState* play, Vec3f* spawnPos, s16 params);
 EnItem00* Item_DropCollectible2(PlayState* play, Vec3f* spawnPos, s16 params);
 void EnItem00_CustomItemsParticles(Actor* Parent, PlayState* play, GetItemEntry giEntry);
+void EnItem00_SetupAction(EnItem00* this, EnItem00ActionFunc actionFunc);
+void func_8001E5C8(EnItem00* this, PlayState* play);
 void Item_DropCollectibleRandom(PlayState* play, Actor* fromActor, Vec3f* spawnPos, s16 params);
 void EffectBlure_ChangeType(EffectBlure* this, int type);
 void EffectBlure_AddVertex(EffectBlure* this, Vec3f* p1, Vec3f* p2);
@@ -415,6 +417,7 @@ f32 Actor_WorldDistXZToPoint(Actor* actor, Vec3f* refPoint);
 void func_8002DBD0(Actor* actor, Vec3f* result, Vec3f* arg2);
 f32 Actor_HeightDiff(Actor* actorA, Actor* actorB);
 f32 Player_GetHeight(Player* player);
+s32 func_8083E5A8(Player* player, PlayState* play);
 f32 func_8002DCE4(Player* player);
 s32 func_8002DD6C(Player* player);
 s32 func_8002DD78(Player* player);
@@ -1106,6 +1109,7 @@ s32 FrameAdvance_Update(FrameAdvanceContext* frameAdvCtx, Input* input);
 u8 PlayerGrounded(Player* player);
 void Player_SetBootData(PlayState* play, Player* player);
 s32 Player_InBlockingCsMode(PlayState* play, Player* player);
+s32 Player_TryCsAction(PlayState* play, Actor* actor, s32 csAction);
 s32 Player_InCsMode(PlayState* play);
 s32 func_8008E9C4(Player* player);
 s32 Player_IsChildWithHylianShield(Player* player);
diff --git a/soh/include/z64actor.h b/soh/include/z64actor.h
index 0a8ac9297..156f1d679 100644
--- a/soh/include/z64actor.h
+++ b/soh/include/z64actor.h
@@ -266,7 +266,12 @@ typedef enum {
     /* 0x17 */ ITEM00_TUNIC_ZORA,
     /* 0x18 */ ITEM00_TUNIC_GORON,
     /* 0x19 */ ITEM00_BOMBS_SPECIAL,
-    /* 0x20 */ ITEM00_BOMBCHU,
+    /* 0x1A */ ITEM00_BOMBCHU,
+    /* 0x1B */ ITEM00_SOH_DUMMY,
+    /* 0x1C */ ITEM00_SOH_GIVE_ITEM_ENTRY,
+    /* 0x1D */ ITEM00_SOH_GIVE_ITEM_ENTRY_GI,
+    /* 0x1E */ ITEM00_MAX,
+    /* 0xFF */ ITEM00_NONE = 0xFF
 } Item00Type;
 
 struct EnItem00;
@@ -284,10 +289,13 @@ typedef struct EnItem00 {
     /* 0x15A */ s16 unk_15A;
     /* 0x15C */ f32 scale;
     /* 0x160 */ ColliderCylinder collider;
-    s16 ogParams;
+    // #region SOH [Randomizer]
     GetItemEntry randoGiEntry;
     RandomizerCheck randoCheck;
     RandomizerInf randoInf;
+    /*       */ s16 ogParams;
+    /*       */ GetItemEntry itemEntry;
+    // #endregion
 } EnItem00; // size = 0x1AC
 
 // Only A_OBJ_SIGNPOST_OBLONG and A_OBJ_SIGNPOST_ARROW are used in room files.
diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.h b/soh/soh/Enhancements/debugger/debugSaveEditor.h
index b0650bfa0..5a4618dac 100644
--- a/soh/soh/Enhancements/debugger/debugSaveEditor.h
+++ b/soh/soh/Enhancements/debugger/debugSaveEditor.h
@@ -505,6 +505,7 @@ const std::vector<FlagTable> flagTables = {
         { RAND_INF_CHILD_FISHING, "RAND_INF_CHILD_FISHING" },
         { RAND_INF_ADULT_FISHING, "RAND_INF_ADULT_FISHING" },
         { RAND_INF_10_BIG_POES, "RAND_INF_10_BIG_POES" },
+        { RAND_INF_GRANT_GANONS_BOSSKEY, "RAND_INF_GRANT_GANONS_BOSSKEY" },
 
         { RAND_INF_GOHMA_SOUL, "RAND_INF_GOHMA_SOUL" },
         { RAND_INF_KING_DODONGO_SOUL, "RAND_INF_KING_DODONGO_SOUL" },
@@ -515,7 +516,6 @@ const std::vector<FlagTable> flagTables = {
         { RAND_INF_BONGO_BONGO_SOUL, "RAND_INF_BONGO_BONGO_SOUL" },
         { RAND_INF_TWINROVA_SOUL, "RAND_INF_TWINROVA_SOUL" },
         { RAND_INF_GANON_SOUL, "RAND_INF_GANON_SOUL" },
-        { RAND_INF_GRANT_GANONS_BOSSKEY, "RAND_INF_GRANT_GANONS_BOSSKEY" },
 
         { RAND_INF_HAS_OCARINA_A, "RAND_INF_HAS_OCARINA_A"},
         { RAND_INF_HAS_OCARINA_C_UP, "RAND_INF_HAS_OCARINA_C_UP" },
@@ -607,7 +607,11 @@ const std::vector<FlagTable> flagTables = {
         { RAND_INF_ZD_FISH_2, "RAND_INF_ZD_FISH_2" },
         { RAND_INF_ZD_FISH_3, "RAND_INF_ZD_FISH_3" },
         { RAND_INF_ZD_FISH_4, "RAND_INF_ZD_FISH_4" },
-        { RAND_INF_ZD_FISH_5, "RAND_INF_ZD_FISH_5" }
+        { RAND_INF_ZD_FISH_5, "RAND_INF_ZD_FISH_5" },
+
+        { RAND_INF_LINKS_POCKET, "RAND_INF_LINKS_POCKET" },
+        { RAND_INF_LEARNED_EPONA_SONG, "RAND_INF_LEARNED_EPONA_SONG" },
+        { RAND_INF_DARUNIAS_JOY, "RAND_INF_DARUNIAS_JOY" },
     } },
 };
 
diff --git a/soh/soh/Enhancements/debugger/valueViewer.cpp b/soh/soh/Enhancements/debugger/valueViewer.cpp
index 14a571dac..213c81cfa 100644
--- a/soh/soh/Enhancements/debugger/valueViewer.cpp
+++ b/soh/soh/Enhancements/debugger/valueViewer.cpp
@@ -34,6 +34,8 @@ std::vector<ValueTableElement> valueTable = {
     { "Text ID",            "play->msgCtx.textId",                  "TEXTID:", TYPE_U16,   true,  []() -> void* { return &gPlayState->msgCtx.textId; },                 WHITE },
     { "Analog Stick X",     "play->state.input->cur.stick_x",       "AX:",     TYPE_S8,    true,  []() -> void* { return &gPlayState->state.input->cur.stick_x; },      WHITE },
     { "Analog Stick Y",     "play->state.input->cur.stick_y",       "AY:",     TYPE_S8,    true,  []() -> void* { return &gPlayState->state.input->cur.stick_y; },      WHITE },
+    { "getItemID",          "Player->getItemId",                    "ITEM:",   TYPE_S16,   true,  []() -> void* { return &GET_PLAYER(gPlayState)->getItemId; },         WHITE },
+    { "getItemEntry",       "Player->getItemEntry",                 "IE:",     TYPE_S16,   true,  []() -> void* { return &GET_PLAYER(gPlayState)->getItemEntry.itemId; }, WHITE },
     /* TODO: Find these (from GZ)
     "XZ Units Traveled (Camera based speed variable)" f32 0x801C9018
     "Movement Angle" x16 0x801DBB1C
diff --git a/soh/soh/Enhancements/enhancementTypes.h b/soh/soh/Enhancements/enhancementTypes.h
index c8461bbf1..f3b8ac029 100644
--- a/soh/soh/Enhancements/enhancementTypes.h
+++ b/soh/soh/Enhancements/enhancementTypes.h
@@ -14,6 +14,13 @@ typedef enum {
     CSMC_SIZE
 } ChestStyleMatchesContentsType;
 
+typedef enum {
+    SGIA_DISABLED,
+    SGIA_JUNK,
+    SGIA_ALL,
+    SGIA_SIZE
+} SkipGetItemAnimationType;
+
 typedef enum {
     BUNNY_HOOD_VANILLA,
     BUNNY_HOOD_FAST_AND_JUMP,
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h
index be27e74a2..c6fb7c721 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h
@@ -3,6 +3,7 @@
 #ifndef GameInteractor_h
 #define GameInteractor_h
 
+#include "libultraship/libultraship.h"
 #include "GameInteractionEffect.h"
 #include "soh/Enhancements/item-tables/ItemTableTypes.h"
 #include <z64.h>
@@ -67,6 +68,272 @@ typedef enum {
     /*      */ GI_TP_DEST_PRELUDE = ENTR_TEMPLE_OF_TIME_7,
 } GITeleportDestinations;
 
+typedef enum {
+    // Vanilla condition: gSaveContext.showTitleCard
+    GI_VB_SHOW_TITLE_CARD,
+    // Opt: *EnWonderTalk2
+    GI_VB_WONDER_TALK,
+    // Opt: *ElfMsg
+    GI_VB_NAVI_TALK,
+    // Vanilla condition: INFTABLE_GREETED_BY_SARIA
+    GI_VB_NOT_BE_GREETED_BY_SARIA,
+    // Opt: *EnMd
+    // Vanilla condition: EnMd->interactInfo.talkState == NPC_TALK_STATE_ACTION
+    GI_VB_MOVE_MIDO_IN_KOKIRI_FOREST,
+    // Opt: *EnMd
+    // Vanilla condition: CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD)
+    GI_VB_MIDO_CONSIDER_DEKU_TREE_DEAD,
+    // Opt: *EnKo
+    // Vanilla condition: CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD)
+    GI_VB_OPEN_KOKIRI_FOREST,
+    // Opt: *EnOwl
+    // Vanilla condition: EnOwl->actor.xzDistToPlayer < targetDist
+    GI_VB_OWL_INTERACTION,
+    // Vanilla condition: EVENTCHKINF_TALON_RETURNED_FROM_CASTLE
+    GI_VB_MALON_RETURN_FROM_CASTLE,
+    // Vanilla condition: CUR_UPG_VALUE(UPG_STRENGTH) <= 0
+    GI_VB_BE_ELIGIBLE_FOR_DARUNIAS_JOY_REWARD,
+    /* Vanilla condition:
+    ```
+        LINK_IS_ADULT &&
+        (gEntranceTable[((void)0, gSaveContext.entranceIndex)].scene == SCENE_TEMPLE_OF_TIME) &&
+        CHECK_QUEST_ITEM(QUEST_MEDALLION_SPIRIT) &&
+        CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW) &&
+        !Flags_GetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS);
+    ```
+    */
+    GI_VB_BE_ELIGIBLE_FOR_LIGHT_ARROWS,
+    // Vanilla condition: !CHECK_QUEST_ITEM(QUEST_SONG_SARIA)
+    GI_VB_BE_ELIGIBLE_FOR_SARIAS_SONG,
+    // Vanilla condition: CHECK_QUEST_ITEM(QUEST_SONG_EPONA)
+    GI_VB_MALON_ALREADY_TAUGHT_EPONAS_SONG,
+    // Vanilla condition: CHECK_OWNED_EQUIP(EQUIP_TYPE_BOOTS, EQUIP_INV_BOOTS_IRON) && !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_SERENADE_OF_WATER)
+    GI_VB_BE_ELIGIBLE_FOR_SERENADE_OF_WATER,
+    // Vanilla condition: (!CHECK_OWNED_EQUIP(EQUIP_TYPE_BOOTS, EQUIP_INV_BOOTS_IRON) && !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_SERENADE_OF_WATER)) && LINK_IS_ADULT
+    GI_VB_SHIEK_PREPARE_TO_GIVE_SERENADE_OF_WATER,
+    // Vanilla condition: !EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT and EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP
+    GI_VB_BE_ELIGIBLE_FOR_PRELUDE_OF_LIGHT,
+    /* Vanilla Condition: 
+    ```
+        LINK_IS_ADULT &&
+        gSaveContext.entranceIndex == ENTR_KAKARIKO_VILLAGE_0 &&
+        Flags_GetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP) &&
+        Flags_GetEventChkInf(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP) &&
+        Flags_GetEventChkInf(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP) &&
+        !Flags_GetEventChkInf(EVENTCHKINF_BONGO_BONGO_ESCAPED_FROM_WELL);
+    ```
+    */
+    GI_VB_BE_ELIGIBLE_FOR_NOCTURNE_OF_SHADOW,
+    // Opt: *EnGo2
+    // Vanilla condition: CUR_CAPACITY(UPG_BOMB_BAG) >= 20 && this->waypoint > 7 && this->waypoint < 12
+    GI_VB_BE_ELIGIBLE_FOR_CHILD_ROLLING_GORON_REWARD,
+    // Vanilla condition: !CHECK_OWNED_EQUIP_ALT(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_BIGGORON)
+    GI_VB_BE_ELIGIBLE_FOR_GIANTS_KNIFE_PURCHASE,
+    // Opt: *EnMs
+    // Vanilla condition: gSaveContext.rupees >= sPrices[BEANS_BOUGHT]
+    GI_VB_BE_ELIGIBLE_FOR_MAGIC_BEANS_PURCHASE,
+    // Opt: *EnItem00
+    // Vanilla condition: Flags_GetCollectible(play, this->collectibleFlag)
+    GI_VB_ITEM00_DESPAWN,
+    // Opt: *EnTk
+    // Vanilla condition: gSaveContext.dayTime <= 0xC000 || gSaveContext.dayTime >= 0xE000 || LINK_IS_ADULT || play->sceneNum != SCENE_GRAVEYARD
+    GI_VB_DAMPE_IN_GRAVEYARD_DESPAWN,
+    // Opt: *EnTk
+    // Vanilla condition: this->validDigHere == 1
+    GI_VB_BE_VALID_GRAVEDIGGING_SPOT,
+    // Opt: *EnTk
+    // Vanilla condition: this->currentReward == 3
+    GI_VB_BE_DAMPE_GRAVEDIGGING_GRAND_PRIZE,
+    // Opt: *EnTk
+    // Vanilla condition: !Flags_GetItemGetInf(ITEMGETINF_1C)
+    GI_VB_DAMPE_GRAVEDIGGING_GRAND_PRIZE_BE_HEART_PIECE,
+    // Opt: *EnShopnuts
+    /* Vanilla Condition:
+    ```
+        ((this->actor.params == 0x0002) && (Flags_GetItemGetInf(ITEMGETINF_0B))) ||
+        ((this->actor.params == 0x0009) && (Flags_GetInfTable(INFTABLE_192))) ||
+        ((this->actor.params == 0x000A) && (Flags_GetInfTable(INFTABLE_193)))
+    ```
+    */
+    GI_VB_BUSINESS_SCRUB_DESPAWN,
+    // Opt: *EnCow
+    // Vanilla condition: play->sceneNum == SCENE_LINKS_HOUSE && (!LINK_IS_ADULT || !Flags_GetEventChkInf(EVENTCHKINF_WON_COW_IN_MALONS_RACE))
+    GI_VB_DESPAWN_HORSE_RACE_COW,
+    // Opt: *EnHs
+    // Vanilla condition: Flags_GetItemGetInf(ITEMGETINF_30)
+    GI_VB_DESPAWN_GROG,
+    // Opt: *EnKo
+    // Vanilla condition: (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_ODD_POTION) ? true : false;
+    GI_VB_SPAWN_LW_FADO,
+    // Opt: *EnMk
+    GI_VB_PLAY_EYEDROP_CREATION_ANIM,
+    // Opt: *EnDs
+    GI_VB_PLAY_ODD_POTION_ANIM,
+    // Opt: *EnMk
+    // Vanilla condition: INV_CONTENT(ITEM_ODD_MUSHROOM) == ITEM_EYEDROPS
+    GI_VB_USE_EYEDROP_DIALOGUE,
+    // Opt: *EnMk
+    // Vanilla condition: Flags_GetItemGetInf(ITEMGETINF_30)
+    GI_VB_OFFER_BLUE_POTION,
+    // Vanilla condition: Inventory_HasEmptyBottle() == 0
+    GI_VB_NEED_BOTTLE_FOR_GRANNYS_ITEM,
+    // Opt: *EnNiwLady
+    GI_VB_SET_CUCCO_COUNT,
+    // Opt: *EnKz
+    // Vanilla condition: CHECK_QUEST_ITEM(QUEST_ZORA_SAPPHIRE)
+    GI_VB_KING_ZORA_THANK_CHILD,
+    // Opt: *EnKz
+    // Vanilla condition: this->actor.textId == 0x401A
+    GI_VB_BE_ABLE_TO_EXCHANGE_RUTOS_LETTER,
+    // Opt: *EnKz
+    // Vanilla condition: Flags_GetEventChkInf(EVENTCHKINF_KING_ZORA_MOVED)
+    GI_VB_KING_ZORA_BE_MOVED,
+    // Vanilla condition: gSaveState.bgsFlag
+    GI_VB_BIGGORON_CONSIDER_TRADE_COMPLETE,
+    // Vanilla condition: gSaveState.bgsFlag
+    GI_VB_BIGGORON_CONSIDER_SWORD_COLLECTED,
+    // Vanilla condition: Environment_GetBgsDayCount() >= 3
+    GI_VB_BIGGORON_CONSIDER_SWORD_FORGED,
+    // Vanilla condition: CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)
+    GI_VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED,
+    // Vanilla condition: CHECK_QUEST_ITEM(QUEST_GORON_RUBY)
+    GI_VB_GORONS_CONSIDER_DODONGOS_CAVERN_FINISHED,
+    // Opt: *uint16_t
+    // Vanilla condition: false
+    GI_VB_OVERRIDE_LINK_THE_GORON_DIALOGUE,
+    // Opt: *EnGo2
+    GI_VB_EN_GO2_RESET_AFTER_GET_ITEM,
+
+    /*** Play Cutscenes ***/
+
+    GI_VB_PLAY_TRANSITION_CS,
+    // Opt: *EventChkInf flag
+    GI_VB_PLAY_ENTRANCE_CS,
+    // Opt: *cutsceneId
+    GI_VB_PLAY_ONEPOINT_CS,
+    // Opt: *actor
+    GI_VB_PLAY_ONEPOINT_ACTOR_CS,
+    // Opt: *BgTreemouth
+    GI_VB_PLAY_DEKU_TREE_INTRO_CS,
+    // Vanilla condition: !EventChkInf except for spirit & shadow temple which are !medallion, and Jabu which always is true
+    GI_VB_PLAY_BLUE_WARP_CS,
+    GI_VB_PLAY_DARUNIAS_JOY_CS,
+    GI_VB_PLAY_SHIEK_BLOCK_MASTER_SWORD_CS,
+    // Vanilla condition: !EVENTCHKINF_PULLED_MASTER_SWORD_FROM_PEDESTAL
+    GI_VB_PLAY_PULL_MASTER_SWORD_CS,
+    GI_VB_PLAY_DROP_FISH_FOR_JABU_CS,
+    // Vanilla condition: player->getItemId == GI_GAUNTLETS_SILVER
+    GI_VB_PLAY_NABOORU_CAPTURED_CS,
+    GI_VB_PLAY_ZELDAS_LULLABY_CS,
+    // Opt: *EnSa
+    GI_VB_PLAY_SARIAS_SONG_CS,
+    GI_VB_PLAY_PRELUDE_OF_LIGHT_CS,
+    GI_VB_PLAY_MINUET_OF_FOREST_CS,
+    GI_VB_PLAY_BOLERO_OF_FIRE_CS,
+    GI_VB_PLAY_SERENADE_OF_WATER_CS,
+    GI_VB_PLAY_EYEDROPS_CS,
+
+    /*** Give Items ***/
+
+    GI_VB_GIVE_ITEM_FROM_CHEST,
+    GI_VB_GIVE_ITEM_FROM_BLUE_WARP,
+    // Opt: *EnItem00
+    GI_VB_GIVE_ITEM_FROM_ITEM_00,
+    // Opt: *EnSi
+    GI_VB_GIVE_ITEM_SKULL_TOKEN,
+    // Opt: *EnCow
+    GI_VB_GIVE_ITEM_FROM_COW,
+    // Opt: *EnDns
+    GI_VB_GIVE_ITEM_FROM_BUSINESS_SCRUB,
+    // Opt: *EnMk
+    GI_VB_GIVE_ITEM_FROM_LAB_DIVE,
+    // Opt: *EnDs
+    GI_VB_GIVE_ITEM_FROM_GRANNYS_SHOP,
+    // Opt: *EnNiwLady
+    GI_VB_GIVE_ITEM_FROM_ANJU_AS_CHILD,
+    // Opt: *EnNiwLady
+    GI_VB_GIVE_ITEM_FROM_ANJU_AS_ADULT,
+    // Opt: *EnKz
+    // Vanilla condition: !CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_ZORA)
+    GI_VB_GIVE_ITEM_FROM_THAWING_KING_ZORA,
+    // Opt: *EnGo2
+    GI_VB_GIVE_ITEM_FROM_ROLLING_GORON_AS_CHILD,
+    // Opt: *EnGo2
+    GI_VB_GIVE_ITEM_FROM_ROLLING_GORON_AS_ADULT,
+    // Opt: *EnJs
+    GI_VB_GIVE_ITEM_FROM_CARPET_SALESMAN,
+    // Opt: *EnGm
+    GI_VB_GIVE_ITEM_FROM_MEDIGORON,
+    // Opt: *EnMs
+    GI_VB_GIVE_ITEM_FROM_MAGIC_BEAN_SALESMAN,
+    // Opt: *EnFr
+    GI_VB_GIVE_ITEM_FROM_FROGS,
+
+    GI_VB_GIVE_ITEM_FAIRY_OCARINA,
+    GI_VB_GIVE_ITEM_WEIRD_EGG,
+    GI_VB_GIVE_ITEM_LIGHT_ARROW,
+    GI_VB_GIVE_ITEM_STRENGTH_1,
+    GI_VB_GIVE_ITEM_ZELDAS_LETTER,
+    GI_VB_GIVE_ITEM_MASTER_SWORD,
+    GI_VB_GIVE_ITEM_OCARINA_OF_TIME,
+    GI_VB_GIVE_ITEM_KOKIRI_EMERALD,
+    GI_VB_GIVE_ITEM_GORON_RUBY,
+    GI_VB_GIVE_ITEM_ZORA_SAPPHIRE,
+    GI_VB_GIVE_ITEM_LIGHT_MEDALLION,
+    GI_VB_GIVE_ITEM_FOREST_MEDALLION,
+    GI_VB_GIVE_ITEM_FIRE_MEDALLION,
+    GI_VB_GIVE_ITEM_WATER_MEDALLION,
+    GI_VB_GIVE_ITEM_SPIRIT_MEDALLION,
+    GI_VB_GIVE_ITEM_SHADOW_MEDALLION,
+
+    /*** Give Songs ***/
+
+    GI_VB_GIVE_ITEM_ZELDAS_LULLABY,
+    GI_VB_GIVE_ITEM_SARIAS_SONG,
+    GI_VB_GIVE_ITEM_EPONAS_SONG,
+    GI_VB_GIVE_ITEM_SUNS_SONG,
+    GI_VB_GIVE_ITEM_SONG_OF_TIME,
+    GI_VB_GIVE_ITEM_SONG_OF_STORMS,
+    GI_VB_GIVE_ITEM_MINUET_OF_FOREST,
+    GI_VB_GIVE_ITEM_BOLERO_OF_FIRE,
+    GI_VB_GIVE_ITEM_SERENADE_OF_WATER,
+    GI_VB_GIVE_ITEM_REQUIEM_OF_SPIRIT,
+    GI_VB_GIVE_ITEM_NOCTURNE_OF_SHADOW,
+    GI_VB_GIVE_ITEM_PRELUDE_OF_LIGHT,
+
+    /*** Adult Trade ***/
+    // Opt: *EnNiwLady
+    GI_VB_TRADE_POCKET_CUCCO,
+    // Opt: *EnHs
+    GI_VB_TRADE_COJIRO,
+    // Opt: *EnDs
+    GI_VB_TRADE_ODD_MUSHROOM,
+    // Opt: *EnKo
+    GI_VB_TRADE_ODD_POTION,
+    // Opt: *EnToryo
+    GI_VB_TRADE_SAW,
+    // Opt: *EnGo2
+    GI_VB_TRADE_BROKEN_SWORD,
+    // Opt: *EnKz,
+    GI_VB_TRADE_PRESCRIPTION,
+    // Opt: *EnMk
+    GI_VB_TRADE_FROG,
+    // Opt: *EnGo2
+    GI_VB_TRADE_EYEDROPS,
+    // Opt: *EnGo2
+    GI_VB_TRADE_CLAIM_CHECK,
+
+    GI_VB_TRADE_TIMER_ODD_MUSHROOM,
+    GI_VB_TRADE_TIMER_EYEDROPS,
+    GI_VB_TRADE_TIMER_FROG,
+    // Opt: *EnNiwLady
+    GI_VB_ANJU_SET_OBTAINED_TRADE_ITEM,
+
+    /*** Fixes ***/
+    // Vanilla condition: false
+    GI_VB_FIX_SAW_SOFTLOCK,
+} GIVanillaBehavior;
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -163,11 +430,28 @@ public:
     static GameInteractionEffectQueryResult RemoveEffect(RemovableGameInteractionEffect* effect);
 
     // Game Hooks
-    template <typename H> struct RegisteredGameHooks { inline static std::vector<typename H::fn> functions; };
-    template <typename H> void RegisterGameHook(typename H::fn h) { RegisteredGameHooks<H>::functions.push_back(h); }
+    uint32_t nextHookId = 0;
+    template <typename H> struct RegisteredGameHooks { inline static std::unordered_map<uint32_t, typename H::fn> functions; };
+    template <typename H> struct HooksToUnregister { inline static std::vector<uint32_t> hooks; };
+    template <typename H> uint32_t RegisterGameHook(typename H::fn h) {
+        // Ensure hook id is unique
+        while (RegisteredGameHooks<H>::functions.find(this->nextHookId) != RegisteredGameHooks<H>::functions.end()) {
+            this->nextHookId++;
+        }
+        RegisteredGameHooks<H>::functions[this->nextHookId] = h;
+        return this->nextHookId++;
+    }
+    template <typename H> void UnregisterGameHook(uint32_t id) {
+        HooksToUnregister<H>::hooks.push_back(id);
+    }
+    
     template <typename H, typename... Args> void ExecuteHooks(Args&&... args) {
-        for (auto& fn : RegisteredGameHooks<H>::functions) {
-            fn(std::forward<Args>(args)...);
+        for (auto& hookId : HooksToUnregister<H>::hooks) {
+            RegisteredGameHooks<H>::functions.erase(hookId);
+        }
+        HooksToUnregister<H>::hooks.clear();
+        for (auto& hook : RegisteredGameHooks<H>::functions) {
+            hook.second(std::forward<Args>(args)...);
         }
     }
 
@@ -194,6 +478,8 @@ public:
     DEFINE_HOOK(OnPlayDestroy, void());
     DEFINE_HOOK(OnPlayDrawEnd, void());
 
+    DEFINE_HOOK(OnVanillaBehavior, void(GIVanillaBehavior flag, bool* result, void* opt));
+
     DEFINE_HOOK(OnSaveFile, void(int32_t fileNum));
     DEFINE_HOOK(OnLoadFile, void(int32_t fileNum));
     DEFINE_HOOK(OnDeleteFile, void(int32_t fileNum));
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp
index 4bd5354a6..95728c075 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp
@@ -90,6 +90,11 @@ void GameInteractor_ExecuteOnPlayDrawEnd() {
     GameInteractor::Instance->ExecuteHooks<GameInteractor::OnPlayDrawEnd>();
 }
 
+bool GameInteractor_Should(GIVanillaBehavior flag, bool result, void* opt) {
+    GameInteractor::Instance->ExecuteHooks<GameInteractor::OnVanillaBehavior>(flag, &result, opt);
+    return result;
+}
+
 // MARK: -  Save Files
 
 void GameInteractor_ExecuteOnSaveFile(int32_t fileNum) {
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h
index 7b7b226fa..d89b95381 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h
@@ -27,6 +27,7 @@ void GameInteractor_ExecuteOnOcarinaSongAction();
 void GameInteractor_ExecuteOnShopSlotChangeHooks(uint8_t cursorIndex, int16_t price);
 void GameInteractor_ExecuteOnPlayDestroy();
 void GameInteractor_ExecuteOnPlayDrawEnd();
+bool GameInteractor_Should(GIVanillaBehavior flag, bool result, void* opt);
 
 // MARK: -  Save Files
 void GameInteractor_ExecuteOnSaveFile(int32_t fileNum);
diff --git a/soh/soh/Enhancements/mods.cpp b/soh/soh/Enhancements/mods.cpp
index 26adf611d..4aabf04d6 100644
--- a/soh/soh/Enhancements/mods.cpp
+++ b/soh/soh/Enhancements/mods.cpp
@@ -10,6 +10,8 @@
 #include "soh/Enhancements/cosmetics/authenticGfxPatches.h"
 #include <soh/Enhancements/item-tables/ItemTableManager.h>
 #include "soh/Enhancements/nametag.h"
+#include "soh/Enhancements/timesaver_hook_handlers.h"
+#include "soh/Enhancements/randomizer/hook_handlers.h"
 
 #include "src/overlays/actors/ovl_En_Bb/z_en_bb.h"
 #include "src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h"
@@ -1596,6 +1598,8 @@ void RegisterFishsanity() {
 }
 
 void InitMods() {
+    RandomizerRegisterHooks();
+    TimeSaverRegisterHooks();
     RegisterTTS();
     RegisterInfiniteMoney();
     RegisterInfiniteHealth();
diff --git a/soh/soh/Enhancements/randomizer/3drando/fill.cpp b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
index 8536c1d17..92799a5db 100644
--- a/soh/soh/Enhancements/randomizer/3drando/fill.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
@@ -1122,7 +1122,19 @@ int Fill() {
     std::vector<RandomizerGet> remainingPool = FilterAndEraseFromPool(ItemPool, [](const auto i) { return true; });
     FastFill(remainingPool, GetAllEmptyLocations(), false);
 
-    //Add prices for scrubsanity, this is unique to SoH because we write/read scrub prices to/from the spoilerfile.
+    //Add default prices to scrubs
+    for (size_t i = 0; i < Rando::StaticData::scrubLocations.size(); i++) {
+      if (Rando::StaticData::scrubLocations[i] == RC_LW_DEKU_SCRUB_NEAR_BRIDGE || Rando::StaticData::scrubLocations[i] == RC_LW_DEKU_SCRUB_GROTTO_FRONT) {
+        ctx->GetItemLocation(Rando::StaticData::scrubLocations[i])->SetCustomPrice(40);
+      } else if (Rando::StaticData::scrubLocations[i] == RC_HF_DEKU_SCRUB_GROTTO) {
+        ctx->GetItemLocation(Rando::StaticData::scrubLocations[i])->SetCustomPrice(10);
+      } else {
+        auto loc = Rando::StaticData::GetLocation(Rando::StaticData::scrubLocations[i]);
+        auto item = Rando::StaticData::RetrieveItem(loc->GetVanillaItem());
+        ctx->GetItemLocation(Rando::StaticData::scrubLocations[i])->SetCustomPrice(item.GetPrice());
+      }
+    }
+
     if (ctx->GetOption(RSK_SHUFFLE_SCRUBS).Is(RO_SCRUBS_AFFORDABLE)) {
       for (size_t i = 0; i < Rando::StaticData::scrubLocations.size(); i++) {
         ctx->GetItemLocation(Rando::StaticData::scrubLocations[i])->SetCustomPrice(10);
diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.hpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.hpp
index 51fc51941..7e20b176a 100644
--- a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.hpp
@@ -18,16 +18,12 @@ typedef enum {
     SPOILER_CHK_ITEM_GET_INF,
     SPOILER_CHK_EVENT_CHK_INF,
     SPOILER_CHK_INF_TABLE,
-    SPOILER_CHK_COW,
     SPOILER_CHK_FISH,
     SPOILER_CHK_MINIGAME,
-    SPOILER_CHK_SCRUB,
     SPOILER_CHK_GERUDO_MEMBERSHIP_CARD,
     SPOILER_CHK_POE_POINTS,
     SPOILER_CHK_SHOP_ITEM,
-    SPOILER_CHK_MAGIC_BEANS,
     SPOILER_CHK_MASTER_SWORD,
-    SPOILER_CHK_MERCHANT,
     SPOILER_CHK_GRAVEDIGGER,
     SPOILER_CHK_RANDOMIZER_INF,
 } SpoilerCollectionCheckType;
diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
new file mode 100644
index 000000000..bf236a3ba
--- /dev/null
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -0,0 +1,975 @@
+#include <libultraship/bridge.h>
+#include "soh/OTRGlobals.h"
+#include "soh/Enhancements/enhancementTypes.h"
+#include "soh/Enhancements/custom-message/CustomMessageTypes.h"
+#include "soh/Enhancements/randomizer/randomizerTypes.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+
+extern "C" {
+#include "macros.h"
+#include "functions.h"
+#include "variables.h"
+#include "soh/Enhancements/randomizer/adult_trade_shuffle.h"
+#include "src/overlays/actors/ovl_En_Si/z_en_si.h"
+#include "src/overlays/actors/ovl_En_Cow/z_en_cow.h"
+#include "src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.h"
+#include "src/overlays/actors/ovl_En_Dns/z_en_dns.h"
+#include "src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h"
+#include "src/overlays/actors/ovl_En_Ko/z_en_ko.h"
+#include "src/overlays/actors/ovl_En_Mk/z_en_mk.h"
+#include "src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.h"
+#include "src/overlays/actors/ovl_En_Kz/z_en_kz.h"
+#include "src/overlays/actors/ovl_En_Go2/z_en_go2.h"
+#include "src/overlays/actors/ovl_En_Ms/z_en_ms.h"
+#include "src/overlays/actors/ovl_En_Fr/z_en_fr.h"
+#include "adult_trade_shuffle.h"
+extern SaveContext gSaveContext;
+extern PlayState* gPlayState;
+}
+
+#define RAND_GET_OPTION(option) Rando::Context::GetInstance()->GetOption(option).GetSelectedOptionIndex()
+
+RandomizerCheck GetRandomizerCheckFromFlag(int16_t flagType, int16_t flag) {
+    for (auto& loc : Rando::StaticData::GetLocationTable()) {
+        if (loc.GetCollectionCheck().flag == flag && (
+                (flagType == FLAG_EVENT_CHECK_INF && loc.GetCollectionCheck().type == SPOILER_CHK_EVENT_CHK_INF) ||
+                (flagType == FLAG_ITEM_GET_INF && loc.GetCollectionCheck().type == SPOILER_CHK_ITEM_GET_INF) ||
+                (flagType == FLAG_RANDOMIZER_INF && loc.GetCollectionCheck().type == SPOILER_CHK_RANDOMIZER_INF)
+            ) ||
+            (loc.GetActorParams() == flag && flagType == FLAG_GS_TOKEN && loc.GetCollectionCheck().type == SPOILER_CHK_GOLD_SKULLTULA)
+        ) {
+            return loc.GetRandomizerCheck();
+        }
+    }
+
+    return RC_UNKNOWN_CHECK;
+}
+
+RandomizerCheck GetRandomizerCheckFromSceneFlag(int16_t sceneNum, int16_t flagType, int16_t flag) {
+    for (auto& loc : Rando::StaticData::GetLocationTable()) {
+        if (loc.GetCollectionCheck().scene == sceneNum && loc.GetCollectionCheck().flag == flag && (
+            (flagType == FLAG_SCENE_TREASURE && loc.GetCollectionCheck().type == SPOILER_CHK_CHEST) ||
+            (flagType == FLAG_SCENE_COLLECTIBLE && loc.GetCollectionCheck().type == SPOILER_CHK_COLLECTABLE) ||
+            (flagType == FLAG_GS_TOKEN && loc.GetCollectionCheck().type == SPOILER_CHK_GOLD_SKULLTULA)
+        )) {
+            return loc.GetRandomizerCheck();
+        }
+    }
+
+    return RC_UNKNOWN_CHECK;
+}
+
+bool MeetsLACSRequirements() {
+    switch (RAND_GET_OPTION(RSK_GANONS_BOSS_KEY)) {
+        case RO_GANON_BOSS_KEY_LACS_STONES:
+            if ((CheckStoneCount() + CheckLACSRewardCount()) >= RAND_GET_OPTION(RSK_LACS_STONE_COUNT)) {
+                return true;
+            }
+            break;
+        case RO_GANON_BOSS_KEY_LACS_MEDALLIONS:
+            if ((CheckMedallionCount() + CheckLACSRewardCount()) >= RAND_GET_OPTION(RSK_LACS_MEDALLION_COUNT)) {
+                return true;
+            }
+            break;
+        case RO_GANON_BOSS_KEY_LACS_REWARDS:
+            if ((CheckMedallionCount() + CheckStoneCount() + CheckLACSRewardCount()) >= RAND_GET_OPTION(RSK_LACS_REWARD_COUNT)) {
+                return true;
+            }
+            break;
+        case RO_GANON_BOSS_KEY_LACS_DUNGEONS:
+            if ((CheckDungeonCount() + CheckLACSRewardCount()) >= RAND_GET_OPTION(RSK_LACS_DUNGEON_COUNT)) {
+                return true;
+            }
+            break;
+        case RO_GANON_BOSS_KEY_LACS_TOKENS:
+            if (gSaveContext.inventory.gsTokens >= RAND_GET_OPTION(RSK_LACS_TOKEN_COUNT)) {
+                return true;
+            }
+            break;
+        default:
+            if (CHECK_QUEST_ITEM(QUEST_MEDALLION_SPIRIT) && CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW)) {
+                return true;
+            }
+            break;
+    }
+
+    return false;
+}
+
+// Todo Move this to randomizer context, clear it out on save load etc
+static std::queue<RandomizerCheck> randomizerQueuedChecks;
+static RandomizerCheck randomizerQueuedCheck = RC_UNKNOWN_CHECK;
+static GetItemEntry randomizerQueuedItemEntry = GET_ITEM_NONE;
+
+void RandomizerOnFlagSetHandler(int16_t flagType, int16_t flag) {
+    RandomizerCheck rc = GetRandomizerCheckFromFlag(flagType, flag);
+    if (rc == RC_UNKNOWN_CHECK) return;
+
+    auto loc = Rando::Context::GetInstance()->GetItemLocation(rc);
+    if (loc == nullptr || loc->HasObtained()) return;
+
+    SPDLOG_INFO("Queuing RC: {}", rc);
+    randomizerQueuedChecks.push(rc);
+}
+
+void RandomizerOnSceneFlagSetHandler(int16_t sceneNum, int16_t flagType, int16_t flag) {
+    RandomizerCheck rc = GetRandomizerCheckFromSceneFlag(sceneNum, flagType, flag);
+    if (rc == RC_UNKNOWN_CHECK) return;
+
+    auto loc = Rando::Context::GetInstance()->GetItemLocation(rc);
+    if (loc == nullptr || loc->HasObtained()) return;
+
+    SPDLOG_INFO("Queuing RC: {}", rc);
+    randomizerQueuedChecks.push(rc);
+}
+
+static Vec3f spawnPos = { 0.0f, -999.0f, 0.0f };
+
+void RandomizerOnPlayerUpdateForRCQueueHandler() {
+    // If we're already queued, don't queue again
+    if (randomizerQueuedCheck != RC_UNKNOWN_CHECK) return;
+
+    // If there's nothing to queue, don't queue
+    if (randomizerQueuedChecks.size() < 1) return;
+
+    // If we're in a cutscene, don't queue
+    Player* player = GET_PLAYER(gPlayState);
+    if (Player_InBlockingCsMode(gPlayState, player) || player->stateFlags1 & PLAYER_STATE1_IN_ITEM_CS || player->stateFlags1 & PLAYER_STATE1_GETTING_ITEM || player->stateFlags1 & PLAYER_STATE1_ITEM_OVER_HEAD) {
+        return;
+    }
+
+    RandomizerCheck rc = randomizerQueuedChecks.front();
+    auto loc = Rando::Context::GetInstance()->GetItemLocation(rc);
+    GetItemEntry getItemEntry = Rando::Context::GetInstance()->GetFinalGIEntry(rc, true, (GetItemID)Rando::StaticData::GetLocation(rc)->GetVanillaItem());
+
+    if (loc->HasObtained()) {
+        SPDLOG_INFO("RC {} already obtained, skipping", rc);
+    } else {
+        randomizerQueuedCheck = rc;
+        randomizerQueuedItemEntry = getItemEntry;
+        SPDLOG_INFO("Queueing Item mod {} item {} from RC {}", getItemEntry.modIndex, getItemEntry.itemId, rc);
+        if (
+            // Skipping ItemGet animation incompatible with checks that require closing a text box to finish
+            rc != RC_HF_OCARINA_OF_TIME_ITEM &&
+            rc != RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST &&
+            // Always show ItemGet animation for ice traps
+            !(getItemEntry.modIndex == MOD_RANDOMIZER && getItemEntry.getItemId == RG_ICE_TRAP) &&
+            (
+                CVarGetInteger("gTimeSavers.SkipGetItemAnimation", SGIA_DISABLED) == SGIA_ALL ||
+                (
+                    CVarGetInteger("gTimeSavers.SkipGetItemAnimation", SGIA_DISABLED) == SGIA_JUNK &&
+                    (
+                        getItemEntry.getItemCategory == ITEM_CATEGORY_JUNK ||
+                        getItemEntry.getItemCategory == ITEM_CATEGORY_SKULLTULA_TOKEN ||
+                        getItemEntry.getItemCategory == ITEM_CATEGORY_LESSER
+                    )
+                )
+            )
+        ) {
+            Item_DropCollectible(gPlayState, &spawnPos, ITEM00_SOH_GIVE_ITEM_ENTRY | 0x8000);
+        }
+    }
+
+    randomizerQueuedChecks.pop();
+}
+
+void RandomizerOnPlayerUpdateForItemQueueHandler() {
+    if (randomizerQueuedCheck == RC_UNKNOWN_CHECK) return;
+
+    Player* player = GET_PLAYER(gPlayState);
+    if (player == NULL || Player_InBlockingCsMode(gPlayState, player) || player->stateFlags1 & PLAYER_STATE1_IN_ITEM_CS || player->stateFlags1 & PLAYER_STATE1_GETTING_ITEM || player->stateFlags1 & PLAYER_STATE1_ITEM_OVER_HEAD) {
+        return;
+    }
+
+    SPDLOG_INFO("Attempting to give Item mod {} item {} from RC {}", randomizerQueuedItemEntry.modIndex, randomizerQueuedItemEntry.itemId, randomizerQueuedCheck);
+    GiveItemEntryWithoutActor(gPlayState, randomizerQueuedItemEntry);
+    if (player->stateFlags1 & PLAYER_STATE1_IN_WATER) {
+        // Allow the player to receive the item while swimming
+        player->stateFlags2 |= PLAYER_STATE2_UNDERWATER;
+        func_8083E5A8(player, gPlayState);
+    }
+}
+
+void RandomizerOnItemReceiveHandler(GetItemEntry receivedItemEntry) {
+    if (randomizerQueuedCheck == RC_UNKNOWN_CHECK) return;
+
+    auto loc = Rando::Context::GetInstance()->GetItemLocation(randomizerQueuedCheck);
+    if (randomizerQueuedItemEntry.modIndex == receivedItemEntry.modIndex && randomizerQueuedItemEntry.itemId == receivedItemEntry.itemId) {
+        SPDLOG_INFO("Item received mod {} item {} from RC {}", receivedItemEntry.modIndex, receivedItemEntry.itemId, randomizerQueuedCheck);
+        loc->MarkAsObtained();
+        randomizerQueuedCheck = RC_UNKNOWN_CHECK;
+        randomizerQueuedItemEntry = GET_ITEM_NONE;
+    }
+
+    if (
+        receivedItemEntry.modIndex == MOD_NONE && (
+            receivedItemEntry.itemId == ITEM_HEART_PIECE ||
+            receivedItemEntry.itemId == ITEM_HEART_PIECE_2 ||
+            receivedItemEntry.itemId == ITEM_HEART_CONTAINER
+        )
+    ) {
+        gSaveContext.healthAccumulator = 0x140; // Refill 20 hearts
+        if ((s32)(gSaveContext.inventory.questItems & 0xF0000000) == 0x40000000) {
+            gSaveContext.inventory.questItems ^= 0x40000000;
+            gSaveContext.healthCapacity += 0x10;
+            gSaveContext.health += 0x10;
+        }
+    }
+
+    if (loc->GetRandomizerCheck() == RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST && !CVarGetInteger("gTimeSavers.SkipCutscene.Story", 0)) {
+        static uint32_t updateHook;
+        updateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnPlayerUpdate>([]() {
+            Player* player = GET_PLAYER(gPlayState);
+            if (player == NULL || Player_InBlockingCsMode(gPlayState, player) || player->stateFlags1 & PLAYER_STATE1_IN_ITEM_CS || player->stateFlags1 & PLAYER_STATE1_GETTING_ITEM || player->stateFlags1 & PLAYER_STATE1_ITEM_OVER_HEAD) {
+                return;
+            }
+
+            gPlayState->nextEntranceIndex = ENTR_DESERT_COLOSSUS_0;
+            gPlayState->transitionTrigger = TRANS_TRIGGER_START;
+            gSaveContext.nextCutsceneIndex = 0xFFF1;
+            gPlayState->transitionType = TRANS_TYPE_SANDSTORM_END;
+            GET_PLAYER(gPlayState)->stateFlags1 &= ~PLAYER_STATE1_IN_CUTSCENE;
+            Player_TryCsAction(gPlayState, NULL, 8);
+            GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnPlayerUpdate>(updateHook);
+        });
+    }
+}
+
+void EnItem00_DrawRandomizedItem(EnItem00* enItem00, PlayState* play) {
+    f32 mtxScale = CVarGetFloat("gTimeSavers.SkipGetItemAnimationScale", 10.0f);
+    Matrix_Scale(mtxScale, mtxScale, mtxScale, MTXMODE_APPLY);
+    EnItem00_CustomItemsParticles(&enItem00->actor, play, enItem00->itemEntry);
+    GetItemEntry_Draw(play, enItem00->itemEntry);
+}
+
+void ItemBHeart_DrawRandomizedItem(ItemBHeart* itemBHeart, PlayState* play) {
+    EnItem00_CustomItemsParticles(&itemBHeart->actor, play, itemBHeart->sohItemEntry);
+    GetItemEntry_Draw(play, itemBHeart->sohItemEntry);
+}
+
+void ItemBHeart_UpdateRandomizedItem(Actor* actor, PlayState* play) {
+    ItemBHeart* itemBHeart = (ItemBHeart*)actor;
+
+    func_80B85264(itemBHeart, play);
+    Actor_UpdateBgCheckInfo(play, &itemBHeart->actor, 0.0f, 0.0f, 0.0f, 4);
+    if ((itemBHeart->actor.xzDistToPlayer < 30.0f) && (fabsf(itemBHeart->actor.yDistToPlayer) < 40.0f)) {
+        Flags_SetCollectible(play, 0x1F);
+        Actor_Kill(&itemBHeart->actor);
+    }
+}
+
+void EnCow_MoveForRandomizer(EnCow* enCow, PlayState* play) {
+    bool moved = false;
+
+    // Don't reposition the tail
+    if (enCow->actor.params != 0) {
+        return;
+    }
+
+    // Move left cow in lon lon tower
+    if (play->sceneNum == SCENE_LON_LON_BUILDINGS && enCow->actor.world.pos.x == -108 &&
+        enCow->actor.world.pos.z == -65) {
+        enCow->actor.world.pos.x = -229.0f;
+        enCow->actor.world.pos.z = 157.0f;
+        enCow->actor.shape.rot.y = 15783.0f;
+        moved = true;
+        // Move right cow in lon lon stable
+    } else if (play->sceneNum == SCENE_STABLE && enCow->actor.world.pos.x == -3 && enCow->actor.world.pos.z == -254) {
+        enCow->actor.world.pos.x += 119.0f;
+        moved = true;
+    }
+
+    if (moved) {
+        // Reposition collider
+        func_809DEE9C(enCow);
+    }
+}
+
+u8 EnDs_RandoCanGetGrannyItem() {
+    return RAND_GET_OPTION(RSK_SHUFFLE_MERCHANTS) != RO_SHUFFLE_MERCHANTS_OFF &&
+           !Flags_GetRandomizerInf(RAND_INF_MERCHANTS_GRANNYS_SHOP) &&
+           // Traded odd mushroom when adult trade is on
+           ((RAND_GET_OPTION(RSK_SHUFFLE_ADULT_TRADE) && Flags_GetItemGetInf(ITEMGETINF_30)) ||
+            // Found claim check when adult trade is off
+            (!RAND_GET_OPTION(RSK_SHUFFLE_ADULT_TRADE) &&
+             INV_CONTENT(ITEM_CLAIM_CHECK) == ITEM_CLAIM_CHECK));
+}
+
+RandomizerCheck EnFr_RandomizerCheckFromSongIndex(u16 songIndex) {
+    switch (songIndex) {
+        case FROG_ZL:
+            return RC_ZR_FROGS_ZELDAS_LULLABY;
+        case FROG_EPONA:
+            return RC_ZR_FROGS_EPONAS_SONG;
+        case FROG_SARIA:
+            return RC_ZR_FROGS_SARIAS_SONG;
+        case FROG_SUNS:
+            return RC_ZR_FROGS_SUNS_SONG;
+        case FROG_SOT:
+            return RC_ZR_FROGS_SONG_OF_TIME;
+        case FROG_STORMS:
+            return RC_ZR_FROGS_IN_THE_RAIN;
+        case FROG_CHOIR_SONG:
+            return RC_ZR_FROGS_OCARINA_GAME;
+        default:
+            return RC_UNKNOWN_CHECK;
+    }
+}
+
+void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void* optionalArg) {
+    switch (id) {
+        case GI_VB_GIVE_ITEM_FROM_CHEST: {
+            Player* player = GET_PLAYER(gPlayState);
+            player->unk_850 = 1;
+            player->getItemId = GI_NONE;
+            player->getItemEntry = GetItemEntry(GET_ITEM_NONE);
+            *should = false;
+            break;
+        }
+        case GI_VB_PLAY_NABOORU_CAPTURED_CS:
+            // This behavior is replicated for randomizer in RandomizerOnItemReceiveHandler
+            *should = false;
+            break;
+        case GI_VB_SHIEK_PREPARE_TO_GIVE_SERENADE_OF_WATER: {
+            *should = !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_SERENADE_OF_WATER) && !Flags_GetTreasure(gPlayState, 0x2);
+            break;
+        }
+        case GI_VB_BE_ELIGIBLE_FOR_SERENADE_OF_WATER:
+            *should = !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_SERENADE_OF_WATER) && Flags_GetTreasure(gPlayState, 0x2);
+            break;
+        case GI_VB_BE_ELIGIBLE_FOR_PRELUDE_OF_LIGHT:
+            *should = !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT) && CHECK_QUEST_ITEM(QUEST_MEDALLION_FOREST);
+            break;
+        case GI_VB_MOVE_MIDO_IN_KOKIRI_FOREST:
+            if (RAND_GET_OPTION(RSK_FOREST) == RO_FOREST_OPEN) {
+                *should = true;
+            }
+            break;
+        case GI_VB_MIDO_CONSIDER_DEKU_TREE_DEAD:
+            *should = Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_KOKIRI_EMERALD_DEKU_TREE_DEAD);
+            break;
+        case GI_VB_OPEN_KOKIRI_FOREST:
+            *should = Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_KOKIRI_EMERALD_DEKU_TREE_DEAD) || RAND_GET_OPTION(RSK_FOREST) != RO_FOREST_CLOSED;
+            break;
+        case GI_VB_BE_ELIGIBLE_FOR_DARUNIAS_JOY_REWARD:
+            *should = !Flags_GetRandomizerInf(RAND_INF_DARUNIAS_JOY);
+            break;
+        case GI_VB_BE_ELIGIBLE_FOR_LIGHT_ARROWS:
+            *should = !Flags_GetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS) && MeetsLACSRequirements();
+            break;
+        case GI_VB_BE_ELIGIBLE_FOR_NOCTURNE_OF_SHADOW:
+            *should =
+                    !Flags_GetEventChkInf(EVENTCHKINF_BONGO_BONGO_ESCAPED_FROM_WELL) &&
+                    LINK_IS_ADULT &&
+                    gEntranceTable[((void)0, gSaveContext.entranceIndex)].scene == SCENE_KAKARIKO_VILLAGE &&
+                    CHECK_QUEST_ITEM(QUEST_MEDALLION_FOREST) &&
+                    CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE) &&
+                    CHECK_QUEST_ITEM(QUEST_MEDALLION_WATER);
+            break;
+        case GI_VB_BE_ELIGIBLE_FOR_CHILD_ROLLING_GORON_REWARD: {
+            // Don't require a bomb bag to get prize in rando
+            *should = true;
+            break;
+        }
+        case GI_VB_BE_ELIGIBLE_FOR_MAGIC_BEANS_PURCHASE: {
+            if (RAND_GET_OPTION(RSK_SHUFFLE_MAGIC_BEANS)) {
+                *should = gSaveContext.rupees >= 60;
+            }
+            break;
+        }
+        case GI_VB_GIVE_ITEM_MASTER_SWORD:
+            if (RAND_GET_OPTION(RSK_SHUFFLE_MASTER_SWORD)) {
+                *should = false;
+            } else {
+                *should = true;
+                Rando::Context::GetInstance()->GetItemLocation(RC_TOT_MASTER_SWORD)->MarkAsObtained();
+            }
+            break;
+        case GI_VB_ITEM00_DESPAWN: {
+            EnItem00* item00 = static_cast<EnItem00*>(optionalArg);
+            if (item00->actor.params == ITEM00_HEART_PIECE || item00->actor.params == ITEM00_SMALL_KEY) {
+                RandomizerCheck rc = OTRGlobals::Instance->gRandomizer->GetCheckFromActor(item00->actor.id, gPlayState->sceneNum, item00->ogParams);
+                if (rc != RC_UNKNOWN_CHECK) {
+                    item00->actor.params = ITEM00_SOH_DUMMY;
+                    item00->itemEntry = Rando::Context::GetInstance()->GetFinalGIEntry(rc, true, (GetItemID)Rando::StaticData::GetLocation(rc)->GetVanillaItem());
+                    item00->actor.draw = (ActorFunc)EnItem00_DrawRandomizedItem;
+                    *should = Rando::Context::GetInstance()->GetItemLocation(rc)->HasObtained();
+                }
+            } else if (item00->actor.params == ITEM00_SOH_GIVE_ITEM_ENTRY || item00->actor.params == ITEM00_SOH_GIVE_ITEM_ENTRY_GI) {
+                GetItemEntry itemEntry = randomizerQueuedItemEntry;
+                item00->itemEntry = itemEntry;
+                item00->actor.draw = (ActorFunc)EnItem00_DrawRandomizedItem;
+            }
+            break;
+        }
+        case GI_VB_MALON_ALREADY_TAUGHT_EPONAS_SONG: {
+            *should = Flags_GetRandomizerInf(RAND_INF_LEARNED_EPONA_SONG);
+            break;
+        }
+        case GI_VB_SET_CUCCO_COUNT: {
+            EnNiwLady* enNiwLady = static_cast<EnNiwLady*>(optionalArg);
+            // Override starting Cucco count using setting value
+            enNiwLady->cuccosInPen = 7 - RAND_GET_OPTION(RSK_CUCCO_COUNT);
+            *should = false;
+            break;
+        }
+        case GI_VB_KING_ZORA_THANK_CHILD: {
+            // Allow turning in Ruto's letter even if you have already rescued her
+            if (!Flags_GetEventChkInf(EVENTCHKINF_KING_ZORA_MOVED)) {
+                GET_PLAYER(gPlayState)->exchangeItemId = EXCH_ITEM_LETTER_RUTO;
+            }
+            *should = Flags_GetRandomizerInf(RAND_INF_DUNGEONS_DONE_JABU_JABUS_BELLY);
+            break;
+        }
+        case GI_VB_BE_ABLE_TO_EXCHANGE_RUTOS_LETTER: {
+            *should = LINK_IS_CHILD;
+            break;
+        }
+        case GI_VB_KING_ZORA_BE_MOVED: {
+            *should = false;
+            switch (RAND_GET_OPTION(RSK_ZORAS_FOUNTAIN)) {
+                case RO_ZF_CLOSED:
+                    if (Flags_GetEventChkInf(EVENTCHKINF_KING_ZORA_MOVED)) {
+                        *should = true;
+                    }
+                    break;
+                case RO_ZF_CLOSED_CHILD:
+                    if (LINK_IS_ADULT) {
+                        *should = true;
+                    } else if (Flags_GetEventChkInf(EVENTCHKINF_KING_ZORA_MOVED)) {
+                        *should = true;
+                    }
+                    break;
+                case RO_ZF_OPEN:
+                    *should = true;
+                    break;
+            }
+            break;
+        }
+        case GI_VB_BIGGORON_CONSIDER_SWORD_COLLECTED: {
+            *should = Flags_GetRandomizerInf(RAND_INF_ADULT_TRADES_DMT_TRADE_CLAIM_CHECK);
+            break;
+        }
+        case GI_VB_BIGGORON_CONSIDER_TRADE_COMPLETE: {
+
+            *should = INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_CLAIM_CHECK && Flags_GetRandomizerInf(RAND_INF_ADULT_TRADES_DMT_TRADE_CLAIM_CHECK);
+            break;
+        }
+        case GI_VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED: {
+            *should = Flags_GetEventChkInf(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP);
+            break;
+        }
+        case GI_VB_GORONS_CONSIDER_DODONGOS_CAVERN_FINISHED: {
+            *should = Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP);
+            break;
+        }
+        case GI_VB_OVERRIDE_LINK_THE_GORON_DIALOGUE: {
+            u16* textId = static_cast<u16*>(optionalArg);
+            *should = true;
+
+            // For rando, prioritize opening the doors in GC when Link the goron has been stopped when
+            // the doors are not opened, otherwise let him talk about the DMC exit or that gorons are saved
+            if (!Flags_GetInfTable(INFTABLE_STOPPED_GORON_LINKS_ROLLING)) {
+                *textId = 0x3030;
+            } else if (!Flags_GetInfTable(INFTABLE_GORON_CITY_DOORS_UNLOCKED)) {
+                *textId = 0x3036;
+            } else if (Flags_GetEventChkInf(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP)) {
+                *textId = 0x3041;
+            } else {
+                *textId = Flags_GetInfTable(INFTABLE_SPOKE_TO_GORON_LINK) ? 0x3038 : 0x3037;
+            }
+            break;
+        }
+        case GI_VB_EN_GO2_RESET_AFTER_GET_ITEM: {
+            EnGo2* enGo2 = static_cast<EnGo2*>(optionalArg);
+            // For randomizer, handle updating the states for the gorons after receiving the item based on
+            // the goron type rather then the item being received
+            switch (enGo2->actor.params & 0x1F) {
+                case GORON_DMT_BIGGORON:
+                    // Resolves #1301. unk_13EE is used to set the opacity of the HUD. The trade sequence discussion
+                    // with Biggoron sets the HUD to transparent, and it is restored at z_message_PAL:3549, but by
+                    // specifically watching for trade sequence items, this leaves it transparent for non-trade sequence
+                    // items (in rando) so we fix that here
+                    gSaveContext.unk_13EE = 0x32;
+                    break;
+                case GORON_CITY_LINK:
+                    EnGo2_GetItemAnimation(enGo2, gPlayState);
+                    break;
+                case GORON_CITY_ROLLING_BIG:
+                    EnGo2_RollingAnimation(enGo2, gPlayState);
+                    enGo2->actionFunc = (EnGo2ActionFunc)EnGo2_GoronRollingBigContinueRolling;
+                    break;
+                default:
+                    enGo2->actionFunc = func_80A46B40;
+                    break;
+            }
+            break;
+        }
+        case GI_VB_GIVE_ITEM_FROM_ITEM_00: {
+            EnItem00* item00 = static_cast<EnItem00*>(optionalArg);
+            if (item00->actor.params == ITEM00_SOH_DUMMY) {
+                Flags_SetCollectible(gPlayState, item00->collectibleFlag);
+                Actor_Kill(&item00->actor);
+                *should = false;
+            } else if (item00->actor.params == ITEM00_SOH_GIVE_ITEM_ENTRY) {
+                Audio_PlaySoundGeneral(NA_SE_SY_GET_ITEM, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
+                if (item00->itemEntry.modIndex == MOD_NONE) {
+                    if (item00->itemEntry.getItemId == GI_SWORD_BGS) {
+                        gSaveContext.bgsFlag = true;
+                    }
+                    Item_Give(gPlayState, item00->itemEntry.itemId);
+                } else if (item00->itemEntry.modIndex == MOD_RANDOMIZER) {
+                    if (item00->itemEntry.getItemId == RG_ICE_TRAP) {
+                        gSaveContext.pendingIceTrapCount++;
+                    } else {
+                        Randomizer_Item_Give(gPlayState, item00->itemEntry);
+                    }
+                }
+                // EnItem00_SetupAction(item00, func_8001E5C8);
+                // *should = false;
+            } else if (item00->actor.params == ITEM00_SOH_GIVE_ITEM_ENTRY_GI) {
+                if (!Actor_HasParent(&item00->actor, gPlayState)) {
+                    GiveItemEntryFromActorWithFixedRange(&item00->actor, gPlayState, item00->itemEntry);
+                }
+                EnItem00_SetupAction(item00, func_8001E5C8);
+                *should = false;
+            }
+            break;
+        }
+        case GI_VB_BE_ELIGIBLE_FOR_SARIAS_SONG: {
+            *should = !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_SARIAS_SONG);
+            break;
+        }
+        case GI_VB_GIVE_ITEM_FROM_COW: {
+            if (!RAND_GET_OPTION(RSK_SHUFFLE_COWS)) {
+                break;
+            }
+            EnCow* enCow = static_cast<EnCow*>(optionalArg);
+            CowIdentity cowIdentity = OTRGlobals::Instance->gRandomizer->IdentifyCow(gPlayState->sceneNum, enCow->actor.world.pos.x, enCow->actor.world.pos.z);
+            // Has this cow already rewarded an item?
+            if (Flags_GetRandomizerInf(cowIdentity.randomizerInf)) {
+                break;
+            }
+            Flags_SetRandomizerInf(cowIdentity.randomizerInf);
+            // setting the ocarina mode here prevents intermittent issues
+            // with the item get not triggering until walking away
+            gPlayState->msgCtx.ocarinaMode = OCARINA_MODE_00;
+            *should = false;
+            break;
+        }
+        case GI_VB_GIVE_ITEM_FROM_GRANNYS_SHOP: {
+            if (!EnDs_RandoCanGetGrannyItem()) {
+                break;
+            }
+            // Only setting the inf if we've actually gotten the rando item and not the vanilla blue potion
+            Flags_SetRandomizerInf(RAND_INF_MERCHANTS_GRANNYS_SHOP);
+            *should = false;
+            break;
+        }
+        case GI_VB_GIVE_ITEM_FROM_THAWING_KING_ZORA: {
+            EnKz* enKz = static_cast<EnKz*>(optionalArg);
+            // If we aren't setting up the item offer, then we're just checking if it should be possible.
+            if (enKz->actionFunc != (EnKzActionFunc)EnKz_SetupGetItem) {
+                // Always give the reward in rando
+                *should = true;
+                break;
+            }
+            *should = false;
+            break;
+        }
+        case GI_VB_GIVE_ITEM_FROM_ANJU_AS_CHILD: {
+            Flags_SetItemGetInf(ITEMGETINF_0C);
+            *should = false;
+            break;
+        }
+        case GI_VB_GIVE_ITEM_FROM_ANJU_AS_ADULT: {
+            Flags_SetItemGetInf(ITEMGETINF_2C);
+            *should = false;
+            break;
+        }
+        case GI_VB_GIVE_ITEM_FROM_ROLLING_GORON_AS_ADULT: {
+            EnGo2* enGo2 = static_cast<EnGo2*>(optionalArg);
+            *should = false;
+            if (!Flags_GetRandomizerInf(RAND_INF_ROLLING_GORON_AS_ADULT)) {
+                Flags_SetInfTable(INFTABLE_GORON_CITY_DOORS_UNLOCKED);
+                enGo2->interactInfo.talkState = NPC_TALK_STATE_ACTION;
+            }
+            break;
+        }
+        case GI_VB_GIVE_ITEM_FROM_CARPET_SALESMAN: {
+            *should = RAND_GET_OPTION(RSK_SHUFFLE_MERCHANTS) == RO_SHUFFLE_MERCHANTS_OFF ||
+                      // If the rando check has already been awarded, use vanilla behavior.
+                      Flags_GetRandomizerInf(RAND_INF_MERCHANTS_CARPET_SALESMAN);
+            break;
+        }
+        case GI_VB_GIVE_ITEM_FROM_MEDIGORON: {
+            // fallthrough
+        case GI_VB_BE_ELIGIBLE_FOR_GIANTS_KNIFE_PURCHASE:
+            if (RAND_GET_OPTION(RSK_SHUFFLE_MERCHANTS) != RO_SHUFFLE_MERCHANTS_OFF &&
+                !Flags_GetRandomizerInf(RAND_INF_MERCHANTS_MEDIGORON)) {
+                if (id == GI_VB_GIVE_ITEM_FROM_MEDIGORON) {
+                    Flags_SetInfTable(INFTABLE_B1);
+                    *should = false;
+                } else {
+                    // Resets "Talked to Medigoron" flag in infTable to restore initial conversation state
+                    Flags_UnsetInfTable(INFTABLE_B1);
+                    *should = true;
+                }
+            }
+            break;
+        }
+        case GI_VB_GIVE_ITEM_FROM_MAGIC_BEAN_SALESMAN: {
+            EnMs* enMs = static_cast<EnMs*>(optionalArg);
+            if (RAND_GET_OPTION(RSK_SHUFFLE_MAGIC_BEANS)) {
+                Rupees_ChangeBy(-60);
+                BEANS_BOUGHT = 10;
+                // Only set inf for buying rando check
+                Flags_SetRandomizerInf(RAND_INF_MERCHANTS_MAGIC_BEAN_SALESMAN);
+                enMs->actionFunc = (EnMsActionFunc)EnMs_Wait;
+                *should = false;
+            }
+            break;
+        }
+        case GI_VB_GIVE_ITEM_FROM_FROGS: {
+            EnFr* enFr = static_cast<EnFr*>(optionalArg);
+
+            // Skip GiveReward+SetIdle action func if the reward is an ice trap
+            if (enFr->actionFunc == (EnFrActionFunc)EnFr_GiveReward) {
+                RandomizerCheck rc = EnFr_RandomizerCheckFromSongIndex(enFr->songIndex);
+                GetItemEntry gi = Rando::Context::GetInstance()->GetFinalGIEntry(rc, true, (GetItemID)Rando::StaticData::GetLocation(rc)->GetVanillaItem());
+                if (gi.getItemId == RG_ICE_TRAP) {
+                    enFr->actionFunc = (EnFrActionFunc)EnFr_Idle;
+                }
+            }
+
+            *should = false;
+            break;
+        }
+        case GI_VB_TRADE_POCKET_CUCCO: {
+            Randomizer_ConsumeAdultTradeItem(gPlayState, ITEM_POCKET_CUCCO);
+            // Trigger the reward now
+            Flags_SetItemGetInf(ITEMGETINF_2E);
+            *should = false;
+            break;
+        }
+        case GI_VB_TRADE_COJIRO: {
+            Randomizer_ConsumeAdultTradeItem(gPlayState, ITEM_COJIRO);
+            *should = false;
+            break;
+        }
+        case GI_VB_TRADE_ODD_MUSHROOM: {
+            Randomizer_ConsumeAdultTradeItem(gPlayState, ITEM_ODD_MUSHROOM);
+            // Trigger the reward now
+            Flags_SetItemGetInf(ITEMGETINF_30);
+            *should = false;
+            break;
+        }
+        case GI_VB_TRADE_ODD_POTION: {
+            EnKo* enKo = static_cast<EnKo*>(optionalArg);
+            Randomizer_ConsumeAdultTradeItem(gPlayState, ITEM_ODD_POTION);
+            // Trigger the reward now
+            Flags_SetItemGetInf(ITEMGETINF_31);
+            *should = false;
+            break;
+        }
+        case GI_VB_TRADE_SAW: {
+            Randomizer_ConsumeAdultTradeItem(gPlayState, ITEM_SAW);
+            *should = false;
+            break;
+        }
+        case GI_VB_TRADE_PRESCRIPTION: {
+            EnKz* enKz = static_cast<EnKz*>(optionalArg);
+            // If we aren't setting up the item offer, then we're just checking if it should be possible.
+            if (enKz->actionFunc != (EnKzActionFunc)EnKz_SetupGetItem) {
+                *should = !Flags_GetRandomizerInf(RAND_INF_ADULT_TRADES_ZD_TRADE_PRESCRIPTION);
+                break;
+            }
+            Randomizer_ConsumeAdultTradeItem(gPlayState, ITEM_PRESCRIPTION);
+            *should = false;
+            break;
+        }
+        case GI_VB_TRADE_FROG: {
+            Randomizer_ConsumeAdultTradeItem(gPlayState, ITEM_FROG);
+            *should = false;
+            break;
+        }
+        case GI_VB_TRADE_BROKEN_SWORD: {
+            Randomizer_ConsumeAdultTradeItem(gPlayState, ITEM_SWORD_BROKEN);
+            *should = false;
+            break;
+        }
+        case GI_VB_TRADE_EYEDROPS: {
+            Randomizer_ConsumeAdultTradeItem(gPlayState, ITEM_EYEDROPS);
+            *should = false;
+            break;
+        }
+        case GI_VB_DESPAWN_HORSE_RACE_COW: {
+            if (!RAND_GET_OPTION(RSK_SHUFFLE_COWS)) {
+                break;
+            }
+            EnCow* enCow = static_cast<EnCow*>(optionalArg);
+            // If this is a cow we have to move, then move it now.
+            EnCow_MoveForRandomizer(enCow, gPlayState);
+            break;
+        }
+        case GI_VB_BUSINESS_SCRUB_DESPAWN: {
+            EnShopnuts* enShopnuts = static_cast<EnShopnuts*>(optionalArg);
+            s16 respawnData = gSaveContext.respawn[RESPAWN_MODE_RETURN].data & ((1 << 8) - 1);
+            ScrubIdentity scrubIdentity = OTRGlobals::Instance->gRandomizer->IdentifyScrub(gPlayState->sceneNum, enShopnuts->actor.params, respawnData);
+
+            if (scrubIdentity.isShuffled) {
+                *should = Flags_GetRandomizerInf(scrubIdentity.randomizerInf);
+            }
+            break;
+        }
+        case GI_VB_GIVE_ITEM_FROM_BUSINESS_SCRUB: {
+            EnDns* enDns = static_cast<EnDns*>(optionalArg);
+            *should = !enDns->sohScrubIdentity.isShuffled;
+            break;
+        }
+        // To explain the logic because Fado and Grog are linked:
+        // - If you have Cojiro, then spawn Grog and not Fado.
+        // - If you don't have Cojiro but do have Odd Potion, spawn Fado and not Grog.
+        // - If you don't have either, spawn Grog if you haven't traded the Odd Mushroom.
+        // - If you don't have either but have traded the mushroom, don't spawn either.
+        case GI_VB_DESPAWN_GROG: {
+            if (!RAND_GET_OPTION(RSK_SHUFFLE_ADULT_TRADE)) {
+                break;
+            }
+            if (PLAYER_HAS_SHUFFLED_ADULT_TRADE_ITEM(ITEM_COJIRO)) {
+                *should = false;
+            } else if (PLAYER_HAS_SHUFFLED_ADULT_TRADE_ITEM(ITEM_ODD_POTION)) {
+                *should = true;
+            } else {
+                *should = Flags_GetItemGetInf(ITEMGETINF_30); // Traded odd mushroom
+            }
+            break;
+        }
+        case GI_VB_SPAWN_LW_FADO: {
+            if (!RAND_GET_OPTION(RSK_SHUFFLE_ADULT_TRADE)) {
+                break;
+            }
+
+            if (PLAYER_HAS_SHUFFLED_ADULT_TRADE_ITEM(ITEM_COJIRO)) {
+                *should = false;
+            } else {
+                *should = PLAYER_HAS_SHUFFLED_ADULT_TRADE_ITEM(ITEM_ODD_POTION);
+            }
+
+            break;
+        }
+        case GI_VB_USE_EYEDROP_DIALOGUE: {
+            // Skip eye drop text on rando if Link went in the water, so you can still receive the dive check
+            EnMk* enMk = static_cast<EnMk*>(optionalArg);
+            *should &= enMk->swimFlag == 0;
+            break;
+        }
+        case GI_VB_OFFER_BLUE_POTION: {
+            // Always offer blue potion when adult trade is off
+            *should |= RAND_GET_OPTION(RSK_SHUFFLE_ADULT_TRADE) == RO_GENERIC_OFF;
+            break;
+        }
+        case GI_VB_NEED_BOTTLE_FOR_GRANNYS_ITEM: {
+            // Allow buying the rando item regardless of having a bottle
+            *should &= !EnDs_RandoCanGetGrannyItem();
+            break;
+        }
+        case GI_VB_TRADE_CLAIM_CHECK:
+        case GI_VB_TRADE_TIMER_ODD_MUSHROOM:
+        case GI_VB_TRADE_TIMER_EYEDROPS:
+        case GI_VB_TRADE_TIMER_FROG:
+        case GI_VB_ANJU_SET_OBTAINED_TRADE_ITEM:
+        case GI_VB_GIVE_ITEM_FROM_ROLLING_GORON_AS_CHILD:
+        case GI_VB_GIVE_ITEM_FROM_LAB_DIVE:
+        case GI_VB_GIVE_ITEM_SKULL_TOKEN:
+        case GI_VB_GIVE_ITEM_FROM_BLUE_WARP:
+        case GI_VB_GIVE_ITEM_FAIRY_OCARINA:
+        case GI_VB_GIVE_ITEM_WEIRD_EGG:
+        case GI_VB_GIVE_ITEM_LIGHT_ARROW:
+        case GI_VB_GIVE_ITEM_STRENGTH_1:
+        case GI_VB_GIVE_ITEM_ZELDAS_LETTER:
+        case GI_VB_GIVE_ITEM_OCARINA_OF_TIME:
+        case GI_VB_GIVE_ITEM_KOKIRI_EMERALD:
+        case GI_VB_GIVE_ITEM_GORON_RUBY:
+        case GI_VB_GIVE_ITEM_ZORA_SAPPHIRE:
+        case GI_VB_GIVE_ITEM_LIGHT_MEDALLION:
+        case GI_VB_GIVE_ITEM_FOREST_MEDALLION:
+        case GI_VB_GIVE_ITEM_FIRE_MEDALLION:
+        case GI_VB_GIVE_ITEM_WATER_MEDALLION:
+        case GI_VB_GIVE_ITEM_SPIRIT_MEDALLION:
+        case GI_VB_GIVE_ITEM_SHADOW_MEDALLION:
+            *should = false;
+            break;
+    }
+}
+
+void RandomizerOnSceneInitHandler(int16_t sceneNum) {
+    // LACs & Prelude checks
+    static uint32_t updateHook = 0;
+
+    if (updateHook) {
+        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnPlayerUpdate>(updateHook);
+        updateHook = 0;
+    }
+
+    if (
+        sceneNum != SCENE_TEMPLE_OF_TIME || 
+        (
+            Flags_GetEventChkInf(EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT) &&
+            Flags_GetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS)
+        )
+    ) return;
+
+    updateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnPlayerUpdate>([]() {
+        if (!Flags_GetEventChkInf(EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT) && LINK_IS_ADULT && CHECK_QUEST_ITEM(QUEST_MEDALLION_FOREST) && gPlayState->roomCtx.curRoom.num == 0) {
+            Flags_SetEventChkInf(EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT);
+        }
+
+        if (!Flags_GetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS) && MeetsLACSRequirements()) {
+            Flags_SetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS);
+        }
+
+        if (
+            Flags_GetEventChkInf(EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT) &&
+            Flags_GetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS)
+        ) {
+            GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnPlayerUpdate>(updateHook);
+        }
+    });
+}
+
+void EnSi_DrawRandomizedItem(EnSi* enSi, PlayState* play) {
+    func_8002ED80(&enSi->actor, play, 0);
+    func_8002EBCC(&enSi->actor, play, 0);
+    EnItem00_CustomItemsParticles(&enSi->actor, play, enSi->sohGetItemEntry);
+    GetItemEntry_Draw(play, enSi->sohGetItemEntry);
+}
+
+u32 EnDns_RandomizerPurchaseableCheck(EnDns* enDns) {
+    if (Flags_GetRandomizerInf(enDns->sohScrubIdentity.randomizerInf)) {
+        return 3; // Can't get this now
+    }
+    if (gSaveContext.rupees < enDns->dnsItemEntry->itemPrice) {
+        return 0; // Not enough rupees
+    }
+    return 4;
+}
+
+void EnDns_RandomizerPurchase(EnDns* enDns) {
+    Rupees_ChangeBy(-enDns->dnsItemEntry->itemPrice);
+    Flags_SetRandomizerInf(enDns->sohScrubIdentity.randomizerInf);
+}
+
+void RandomizerOnActorInitHandler(void* actorRef) {
+    Actor* actor = static_cast<Actor*>(actorRef);
+
+    if (actor->id == ACTOR_EN_SI) {
+        RandomizerCheck rc = OTRGlobals::Instance->gRandomizer->GetCheckFromActor(actor->id, gPlayState->sceneNum, actor->params);
+        if (rc != RC_UNKNOWN_CHECK) {
+            EnSi* enSi = static_cast<EnSi*>(actorRef);
+            enSi->sohGetItemEntry = Rando::Context::GetInstance()->GetFinalGIEntry(rc, true, (GetItemID)Rando::StaticData::GetLocation(rc)->GetVanillaItem());
+            actor->draw = (ActorFunc)EnSi_DrawRandomizedItem;
+        }
+    }
+
+    if (actor->id == ACTOR_ITEM_B_HEART) {
+        ItemBHeart* itemBHeart = static_cast<ItemBHeart*>(actorRef);
+        RandomizerCheck rc = OTRGlobals::Instance->gRandomizer->GetCheckFromActor(itemBHeart->actor.id, gPlayState->sceneNum, itemBHeart->actor.params);
+        if (rc != RC_UNKNOWN_CHECK) {
+            itemBHeart->sohItemEntry = Rando::Context::GetInstance()->GetFinalGIEntry(rc, true, (GetItemID)Rando::StaticData::GetLocation(rc)->GetVanillaItem());
+            itemBHeart->actor.draw = (ActorFunc)ItemBHeart_DrawRandomizedItem;
+            itemBHeart->actor.update = (ActorFunc)ItemBHeart_UpdateRandomizedItem;
+        }
+    }
+
+    if (actor->id == ACTOR_EN_DNS) {
+        EnDns* enDns = static_cast<EnDns*>(actorRef);
+        s16 respawnData = gSaveContext.respawn[RESPAWN_MODE_RETURN].data & ((1 << 8) - 1);
+        enDns->sohScrubIdentity = OTRGlobals::Instance->gRandomizer->IdentifyScrub(gPlayState->sceneNum, enDns->actor.params, respawnData);
+
+        if (enDns->sohScrubIdentity.isShuffled) {
+            // DNS uses pointers so we're creating our own entry instead of modifying the original
+            enDns->sohDnsItemEntry = {
+                enDns->dnsItemEntry->itemPrice,
+                1,
+                enDns->sohScrubIdentity.getItemId,
+                EnDns_RandomizerPurchaseableCheck,
+                EnDns_RandomizerPurchase,
+            };
+            enDns->dnsItemEntry = &enDns->sohDnsItemEntry;
+
+            if (enDns->sohScrubIdentity.itemPrice != -1) {
+                enDns->dnsItemEntry->itemPrice = enDns->sohScrubIdentity.itemPrice;
+            }
+
+            enDns->actor.textId = TEXT_SCRUB_RANDOM;
+
+            static uint32_t enDnsUpdateHook = 0;
+            static uint32_t enDnsKillHook = 0;
+            if (!enDnsUpdateHook) {
+                enDnsUpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* innerActorRef) {
+                    Actor* innerActor = static_cast<Actor*>(innerActorRef);
+                    if (innerActor->id == ACTOR_EN_DNS) {
+                        EnDns* innerEnDns = static_cast<EnDns*>(innerActorRef);
+                        if (innerEnDns->sohScrubIdentity.isShuffled) {
+                            innerActor->textId = TEXT_SCRUB_RANDOM;
+                        }
+                    }
+                });
+                enDnsKillHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>([](int16_t sceneNum) {
+                    GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(enDnsUpdateHook);
+                    GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(enDnsKillHook);
+                    enDnsUpdateHook = 0;
+                    enDnsKillHook = 0;
+                });
+            }
+        }
+    }
+}
+
+void RandomizerRegisterHooks() {
+    static uint32_t onFlagSetHook = 0;
+    static uint32_t onSceneFlagSetHook = 0;
+    static uint32_t onPlayerUpdateForRCQueueHook = 0;
+    static uint32_t onPlayerUpdateForItemQueueHook = 0;
+    static uint32_t onItemReceiveHook = 0;
+    static uint32_t onVanillaBehaviorHook = 0;
+    static uint32_t onSceneInitHook = 0;
+    static uint32_t onActorInitHook = 0;
+
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnLoadGame>([](int32_t fileNum) {
+        randomizerQueuedChecks = std::queue<RandomizerCheck>();
+        randomizerQueuedCheck = RC_UNKNOWN_CHECK;
+        randomizerQueuedItemEntry = GET_ITEM_NONE;
+
+        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnFlagSet>(onFlagSetHook);
+        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneFlagSet>(onSceneFlagSetHook);
+        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnPlayerUpdate>(onPlayerUpdateForRCQueueHook);
+        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnPlayerUpdate>(onPlayerUpdateForItemQueueHook);
+        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnItemReceive>(onItemReceiveHook);
+        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnVanillaBehavior>(onVanillaBehaviorHook);
+        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(onSceneInitHook);
+        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorInit>(onActorInitHook);
+
+        onFlagSetHook = 0;
+        onSceneFlagSetHook = 0;
+        onPlayerUpdateForRCQueueHook = 0;
+        onPlayerUpdateForItemQueueHook = 0;
+        onItemReceiveHook = 0;
+        onVanillaBehaviorHook = 0;
+        onSceneInitHook = 0;
+        onActorInitHook = 0;
+
+        if (!IS_RANDO) return;
+
+        onFlagSetHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnFlagSet>(RandomizerOnFlagSetHandler);
+        onSceneFlagSetHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneFlagSet>(RandomizerOnSceneFlagSetHandler);
+        onPlayerUpdateForRCQueueHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnPlayerUpdate>(RandomizerOnPlayerUpdateForRCQueueHandler);
+        onPlayerUpdateForItemQueueHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnPlayerUpdate>(RandomizerOnPlayerUpdateForItemQueueHandler);
+        onItemReceiveHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnItemReceive>(RandomizerOnItemReceiveHandler);
+        onVanillaBehaviorHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnVanillaBehavior>(RandomizerOnVanillaBehaviorHandler);
+        onSceneInitHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>(RandomizerOnSceneInitHandler);
+        onActorInitHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorInit>(RandomizerOnActorInitHandler);
+    });
+}
diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.h b/soh/soh/Enhancements/randomizer/hook_handlers.h
new file mode 100644
index 000000000..46abb30b7
--- /dev/null
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.h
@@ -0,0 +1,6 @@
+#ifndef RANDOMIZER_HOOK_HANDLERS_H
+#define RANDOMIZER_HOOK_HANDLERS_H
+
+void RandomizerRegisterHooks();
+
+#endif // RANDOMIZER_HOOK_HANDLERS_H
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/item_location.cpp b/soh/soh/Enhancements/randomizer/item_location.cpp
index 736778786..adc805550 100644
--- a/soh/soh/Enhancements/randomizer/item_location.cpp
+++ b/soh/soh/Enhancements/randomizer/item_location.cpp
@@ -101,6 +101,18 @@ void ItemLocation::SetCustomPrice(const uint16_t price_) {
     hasCustomPrice = true;
 }
 
+bool ItemLocation::HasObtained() const {
+    return obtained;
+}
+
+void ItemLocation::MarkAsObtained() {
+    obtained = true;
+}
+
+void ItemLocation::MarkAsNotObtained() {
+    obtained = false;
+}
+
 bool ItemLocation::IsHintable() const {
     return isHintable;
 }
@@ -201,5 +213,6 @@ void ItemLocation::ResetVariables() {
     wothCandidate = false;
     barrenCandidate = false;
     area = RA_NONE;
+    obtained = false;
 }
 }
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/item_location.h b/soh/soh/Enhancements/randomizer/item_location.h
index a4b60a5d3..ab74b2d77 100644
--- a/soh/soh/Enhancements/randomizer/item_location.h
+++ b/soh/soh/Enhancements/randomizer/item_location.h
@@ -31,6 +31,9 @@ class ItemLocation {
     void SetPrice(uint16_t price_);
     bool HasCustomPrice() const;
     void SetCustomPrice(uint16_t price_);
+    bool HasObtained() const;
+    void MarkAsObtained();
+    void MarkAsNotObtained();
     bool IsHintable() const;
     void SetAsHintable();
     bool IsHintedAt() const;
@@ -67,5 +70,6 @@ class ItemLocation {
     bool visibleInImGui = false;
     bool wothCandidate = false;
     bool barrenCandidate = false;
+    bool obtained = false;
 };
 } // namespace Rando
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/location.h b/soh/soh/Enhancements/randomizer/location.h
index 993e8c184..fcea02eb4 100644
--- a/soh/soh/Enhancements/randomizer/location.h
+++ b/soh/soh/Enhancements/randomizer/location.h
@@ -51,10 +51,6 @@ class SpoilerCollectionCheck {
         return SpoilerCollectionCheck(SPOILER_CHK_CHEST, scene, flag);
     }
 
-    static auto Cow(const uint8_t scene, const uint8_t flag) {
-        return SpoilerCollectionCheck(SPOILER_CHK_COW, scene, flag);
-    }
-
     static auto Fish(const uint8_t flag, const uint8_t scene = SCENE_FISHING_POND) {
         return SpoilerCollectionCheck(SPOILER_CHK_FISH, scene, flag);
     }
@@ -63,10 +59,6 @@ class SpoilerCollectionCheck {
         return SpoilerCollectionCheck(SPOILER_CHK_MINIGAME, 0x00, bit);
     }
 
-    static auto Scrub(const uint8_t scene, const uint8_t bit) {
-        return SpoilerCollectionCheck(SPOILER_CHK_SCRUB, scene, bit);
-    }
-
     static auto GerudoToken() {
         return SpoilerCollectionCheck(SPOILER_CHK_GERUDO_MEMBERSHIP_CARD, 0x00, 0x00);
     }
@@ -83,20 +75,12 @@ class SpoilerCollectionCheck {
         return SpoilerCollectionCheck(SPOILER_CHK_SHOP_ITEM, scene, itemSlot);
     }
 
-    static auto MagicBeans(const uint8_t scene, const uint8_t flag) {
-        return SpoilerCollectionCheck(SPOILER_CHK_MAGIC_BEANS, scene, flag);
-    }
-
     static auto MasterSword() {
         return SpoilerCollectionCheck(SPOILER_CHK_MASTER_SWORD, 0x00, 0x00);
     }
 
-    static auto Merchant(const int8_t scene, const uint8_t flag) {
-        return SpoilerCollectionCheck(SPOILER_CHK_MERCHANT, scene, flag);
-    }
-
-    static auto RandomizerInf(const int8_t scene, const uint8_t flag) {
-        return SpoilerCollectionCheck(SPOILER_CHK_RANDOMIZER_INF, scene, flag);
+    static auto RandomizerInf(const uint8_t flag) {
+        return SpoilerCollectionCheck(SPOILER_CHK_RANDOMIZER_INF, 0x00, flag);
     }
 };
 
diff --git a/soh/soh/Enhancements/randomizer/location_list.cpp b/soh/soh/Enhancements/randomizer/location_list.cpp
index ea4775d46..28ca3b85a 100644
--- a/soh/soh/Enhancements/randomizer/location_list.cpp
+++ b/soh/soh/Enhancements/randomizer/location_list.cpp
@@ -245,6 +245,7 @@ std::vector<RandomizerCheck> Rando::StaticData::overworldLocations = {
     RC_TOT_MASTER_SWORD,
     RC_SHEIK_AT_TEMPLE,
     RC_TOT_LIGHT_ARROWS_CUTSCENE,
+    RC_GIFT_FROM_SAGES,
 
     // Kakariko
     RC_SHEIK_IN_KAKARIKO,
@@ -595,786 +596,773 @@ typedef enum {
 
 using namespace Rando;
 
-void Rando::StaticData::InitLocationTable() {
+void Rando::StaticData::InitLocationTable() { //                                                      Randomizer Check                                                 Quest            Type                                Area                                 Actor ID              Scene ID                            Params                                             Flags Short Name                                     Spoiler Name                                                Hint Text Key                                                    Vanilla Item                          Categories                                              Spoiler Collection Check                                                                                                      Collection Check Group                                         Vanilla Progression
     // clang-format off
-    locationTable[RC_UNKNOWN_CHECK] =                               Location::Base(RC_UNKNOWN_CHECK,                        RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_INVALID,         ACTOR_ID_MAX,         SCENE_ID_MAX,                     0x00,                         0x00, "Invalid Location",                  "Invalid Location",                     RHT_NONE,                                 RG_NONE,                     {},                                                                           SpoilerCollectionCheck::None());
-    //            Randomizer Check                                                 Randomizer Check                         Quest         Type                Area                    Actor ID              Scene ID                          Params                        Flags Short Name                            Spoiler Name                           Hint Text Key                             Vanilla Item                 Categories                 Spoiler Collection Check                           Collection Check Group                             Vanilla Progression
+    locationTable[RC_UNKNOWN_CHECK] =                                                  Location::Base(RC_UNKNOWN_CHECK,                                                RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_INVALID,                      ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x00, "Invalid Location",                            "Invalid Location",                                         RHT_NONE,                                                        RG_NONE,                              {},                                                     SpoilerCollectionCheck::None());
     // Kokiri Forest
-    locationTable[RC_KF_KOKIRI_SWORD_CHEST] =                      Location::Chest(RC_KF_KOKIRI_SWORD_CHEST,                RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KOKIRI_FOREST,   ACTOR_EN_BOX,         SCENE_KOKIRI_FOREST,              1248,                         0x00, "Kokiri Sword Chest",                "KF Kokiri Sword Chest",                RHT_KF_KOKIRI_SWORD_CHEST,                RG_KOKIRI_SWORD,             {},                                                                           SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST,  true);
-    locationTable[RC_KF_MIDOS_TOP_LEFT_CHEST] =                    Location::Chest(RC_KF_MIDOS_TOP_LEFT_CHEST,              RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KOKIRI_FOREST,   ACTOR_EN_BOX,         SCENE_MIDOS_HOUSE,                22944,                        0x00, "Mido Top Left Chest",               "KF Mido Top Left Chest",               RHT_KF_MIDOS_TOP_LEFT_CHEST,              RG_BLUE_RUPEE,               {},                                                                           SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_MIDOS_TOP_RIGHT_CHEST] =                   Location::Chest(RC_KF_MIDOS_TOP_RIGHT_CHEST,             RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KOKIRI_FOREST,   ACTOR_EN_BOX,         SCENE_MIDOS_HOUSE,                22945,                        0x01, "Mido Top Right Chest",              "KF Mido Top Right Chest",              RHT_KF_MIDOS_TOP_RIGHT_CHEST,             RG_BLUE_RUPEE,               {},                                                                           SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_MIDOS_BOTTOM_LEFT_CHEST] =                 Location::Chest(RC_KF_MIDOS_BOTTOM_LEFT_CHEST,           RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KOKIRI_FOREST,   ACTOR_EN_BOX,         SCENE_MIDOS_HOUSE,                22914,                        0x02, "Mido Bottom Left Chest",            "KF Mido Bottom Left Chest",            RHT_KF_MIDOS_BOTTOM_LEFT_CHEST,           RG_GREG_RUPEE,               {},                                                                           SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_MIDOS_BOTTOM_RIGHT_CHEST] =                Location::Chest(RC_KF_MIDOS_BOTTOM_RIGHT_CHEST,          RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KOKIRI_FOREST,   ACTOR_EN_BOX,         SCENE_MIDOS_HOUSE,                22787,                        0x03, "Mido Bottom Right Chest",           "KF Mido Bottom Right Chest",           RHT_KF_MIDOS_BOTTOM_RIGHT_CHEST,          RG_RECOVERY_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_STORMS_GROTTO_CHEST] =                     Location::Chest(RC_KF_STORMS_GROTTO_CHEST,               RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KOKIRI_FOREST,   ACTOR_EN_BOX,         SCENE_GROTTOS,                    22988,                        0x0C, "Storms Grotto Chest",               "KF Storms Grotto Chest",               RHT_KF_STORMS_GROTTO_CHEST,               RG_RED_RUPEE,                {},                                                                           SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_KOKIRI_SWORD_CHEST] =                                         Location::Chest(RC_KF_KOKIRI_SWORD_CHEST,                                        RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KOKIRI_FOREST,                ACTOR_EN_BOX,         SCENE_KOKIRI_FOREST,                1248,                                              0x00, "Kokiri Sword Chest",                          "KF Kokiri Sword Chest",                                    RHT_KF_KOKIRI_SWORD_CHEST,                                       RG_KOKIRI_SWORD,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST,              true);
+    locationTable[RC_KF_MIDOS_TOP_LEFT_CHEST] =                                       Location::Chest(RC_KF_MIDOS_TOP_LEFT_CHEST,                                      RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KOKIRI_FOREST,                ACTOR_EN_BOX,         SCENE_MIDOS_HOUSE,                  22944,                                             0x00, "Mido Top Left Chest",                         "KF Mido Top Left Chest",                                   RHT_KF_MIDOS_TOP_LEFT_CHEST,                                     RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_MIDOS_TOP_RIGHT_CHEST] =                                      Location::Chest(RC_KF_MIDOS_TOP_RIGHT_CHEST,                                     RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KOKIRI_FOREST,                ACTOR_EN_BOX,         SCENE_MIDOS_HOUSE,                  22945,                                             0x01, "Mido Top Right Chest",                        "KF Mido Top Right Chest",                                  RHT_KF_MIDOS_TOP_RIGHT_CHEST,                                    RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_MIDOS_BOTTOM_LEFT_CHEST] =                                    Location::Chest(RC_KF_MIDOS_BOTTOM_LEFT_CHEST,                                   RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KOKIRI_FOREST,                ACTOR_EN_BOX,         SCENE_MIDOS_HOUSE,                  22914,                                             0x02, "Mido Bottom Left Chest",                      "KF Mido Bottom Left Chest",                                RHT_KF_MIDOS_BOTTOM_LEFT_CHEST,                                  RG_GREG_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_MIDOS_BOTTOM_RIGHT_CHEST] =                                   Location::Chest(RC_KF_MIDOS_BOTTOM_RIGHT_CHEST,                                  RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KOKIRI_FOREST,                ACTOR_EN_BOX,         SCENE_MIDOS_HOUSE,                  22787,                                             0x03, "Mido Bottom Right Chest",                     "KF Mido Bottom Right Chest",                               RHT_KF_MIDOS_BOTTOM_RIGHT_CHEST,                                 RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_STORMS_GROTTO_CHEST] =                                        Location::Chest(RC_KF_STORMS_GROTTO_CHEST,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KOKIRI_FOREST,                ACTOR_EN_BOX,         SCENE_GROTTOS,                      22988,                                             0x0C, "Storms Grotto Chest",                         "KF Storms Grotto Chest",                                   RHT_KF_STORMS_GROTTO_CHEST,                                      RG_RED_RUPEE,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
     // Lost Woods
-    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_CHEST] =             Location::Chest(RC_LW_NEAR_SHORTCUTS_GROTTO_CHEST,       RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LOST_WOODS,      ACTOR_EN_BOX,         SCENE_GROTTOS,                    22964,                        0x14, "Near Shortcuts Grotto Chest",       "LW Near Shortcuts Grotto Chest",       RHT_KF_STORMS_GROTTO_CHEST,               RG_RED_RUPEE,                {},                                                                           SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_LW_SKULL_KID] =                                Location::Base(RC_LW_SKULL_KID,                         RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LOST_WOODS,      ACTOR_ID_MAX,         SCENE_LOST_WOODS,                 0x00,                         0x3E, "Skull Kid",                         "LW Skull Kid",                         RHT_LW_SKULL_KID,                         RG_PIECE_OF_HEART,           {},                        SpoilerCollectionCheck::ItemGetInf(30),            SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,     true);
-    locationTable[RC_LW_TRADE_COJIRO] =                             Location::Base(RC_LW_TRADE_COJIRO,                      RCQUEST_BOTH, RCTYPE_ADULT_TRADE, RCAREA_LOST_WOODS,      ACTOR_ID_MAX,         SCENE_LOST_WOODS,                 0x00,                         0x1F, "Trade Cojiro",                      "LW Trade Cojiro",                      RHT_LW_TRADE_COJIRO,                      RG_ODD_MUSHROOM,             { Category::cAdultTrade }, SpoilerCollectionCheck::RandomizerInf(0x5B, 0x1F), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,     true);
-    locationTable[RC_LW_TRADE_ODD_POTION] =                         Location::Base(RC_LW_TRADE_ODD_POTION,                  RCQUEST_BOTH, RCTYPE_ADULT_TRADE, RCAREA_LOST_WOODS,      ACTOR_ID_MAX,         SCENE_LOST_WOODS,                 0x00,                         0x21, "Trade Odd Potion",                  "LW Trade Odd Potion",                  RHT_LW_TRADE_COJIRO,                      RG_POACHERS_SAW,             { Category::cAdultTrade }, SpoilerCollectionCheck::ItemGetInf(57),            SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,     true);
-    locationTable[RC_LW_OCARINA_MEMORY_GAME] =                      Location::Base(RC_LW_OCARINA_MEMORY_GAME,               RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LOST_WOODS,      ACTOR_ID_MAX,         SCENE_LOST_WOODS,                 0x00,                         0x21, "Ocarina Memory Game",               "LW Ocarina Memory Game",               RHT_LW_OCARINA_MEMORY_GAME,               RG_PIECE_OF_HEART,           {},                        SpoilerCollectionCheck::ItemGetInf(31),            SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,     true);
-    locationTable[RC_LW_TARGET_IN_WOODS] =                          Location::Base(RC_LW_TARGET_IN_WOODS,                   RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LOST_WOODS,      ACTOR_ID_MAX,         SCENE_LOST_WOODS,                 0x00,                         0x60, "Target in Woods",                   "LW Target in Woods",                   RHT_LW_TARGET_IN_WOODS,                   RG_PROGRESSIVE_SLINGSHOT,    {},                        SpoilerCollectionCheck::ItemGetInf(21),            SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,     true);
-    locationTable[RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT] =       Location::Base(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT,RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_LOST_WOODS,      ACTOR_EN_DNS,         SCENE_LOST_WOODS,                 0x00,                         0x30, "Deku Scrub Near Deku Theater Right","LW Deku Scrub Near Deku Theater Right",RHT_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT,RG_BUY_DEKU_NUTS_5,          { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x5B, 0x01),         SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT] =        Location::Base(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT, RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_LOST_WOODS,      ACTOR_EN_DNS,         SCENE_LOST_WOODS,                 0x01,                         0x31, "Deku Scrub Near Deku Theater Left", "LW Deku Scrub Near Deku Theater Left", RHT_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT, RG_BUY_DEKU_STICK_1,         { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x5B, 0x02),         SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[RC_LW_DEKU_SCRUB_NEAR_BRIDGE] =                   Location::Base(RC_LW_DEKU_SCRUB_NEAR_BRIDGE,            RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_LOST_WOODS,      ACTOR_EN_DNS,         SCENE_LOST_WOODS,                 0x09,                         0x77, "Deku Scrub Near Bridge",            "LW Deku Scrub Near Bridge",            RHT_LW_DEKU_SCRUB_NEAR_BRIDGE,            RG_PROGRESSIVE_STICK_UPGRADE,{ Category::cDekuScrub, Category::cDekuScrubUpgrades }, SpoilerCollectionCheck::Scrub(0x5B, 0x0A), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS, true);
-    locationTable[RC_LW_DEKU_SCRUB_GROTTO_REAR] =            Location::GrottoScrub(RC_LW_DEKU_SCRUB_GROTTO_REAR,            RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_LOST_WOODS,      ACTOR_EN_DNS,         SCENE_GROTTOS,                    TWO_ACTOR_PARAMS(0x03, 0xF5), 0x33, "Deku Scrub Grotto Rear",            "LW Deku Scrub Grotto Rear",            RHT_LW_DEKU_SCRUB_GROTTO_REAR,            RG_BUY_DEKU_SEEDS_30,        { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x1F, 0x04),         SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[RC_LW_DEKU_SCRUB_GROTTO_FRONT] =           Location::GrottoScrub(RC_LW_DEKU_SCRUB_GROTTO_FRONT,           RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_LOST_WOODS,      ACTOR_EN_DNS,         SCENE_GROTTOS,                    TWO_ACTOR_PARAMS(0x0A, 0xF5), 0x79, "Deku Scrub Grotto Front",           "LW Deku Scrub Grotto Front",           RHT_LW_DEKU_SCRUB_GROTTO_FRONT,           RG_PROGRESSIVE_NUT_UPGRADE,  { Category::cDekuScrub, Category::cDekuScrubUpgrades }, SpoilerCollectionCheck::Scrub(0x1F, 0x0B), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[RC_DEKU_THEATER_SKULL_MASK] =                     Location::Base(RC_DEKU_THEATER_SKULL_MASK,              RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LOST_WOODS,      ACTOR_ID_MAX,         SCENE_GROTTOS,                    0x00,                         0x77, "Deku Theater Skull Mask",           "Deku Theater Skull Mask",              RHT_DEKU_THEATER_SKULL_MASK,              RG_PROGRESSIVE_STICK_UPGRADE,{},                     SpoilerCollectionCheck::Chest(0x3E, 0x1F),         SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,     true);
-    locationTable[RC_DEKU_THEATER_MASK_OF_TRUTH] =                  Location::Base(RC_DEKU_THEATER_MASK_OF_TRUTH,           RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LOST_WOODS,      ACTOR_ID_MAX,         SCENE_GROTTOS,                    0x00,                         0x7A, "Deku Theater Mask of Truth",        "Deku Theater Mask of Truth",           RHT_DEKU_THEATER_MASK_OF_TRUTH,           RG_PROGRESSIVE_NUT_UPGRADE,  {},                       SpoilerCollectionCheck::Chest(0x3E, 0x1E),         SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,     true);
+    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_CHEST] =                                Location::Chest(RC_LW_NEAR_SHORTCUTS_GROTTO_CHEST,                               RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LOST_WOODS,                   ACTOR_EN_BOX,         SCENE_GROTTOS,                      22964,                                             0x14, "Near Shortcuts Grotto Chest",                 "LW Near Shortcuts Grotto Chest",                           RHT_KF_STORMS_GROTTO_CHEST,                                      RG_RED_RUPEE,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_LW_SKULL_KID] =                                                   Location::Base(RC_LW_SKULL_KID,                                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LOST_WOODS,                   ACTOR_ID_MAX,         SCENE_LOST_WOODS,                   0x00,                                              0x3E, "Skull Kid",                                   "LW Skull Kid",                                             RHT_LW_SKULL_KID,                                                RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::ItemGetInf(22),                                                                                       SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
+    locationTable[RC_LW_TRADE_COJIRO] =                                                Location::Base(RC_LW_TRADE_COJIRO,                                              RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_LOST_WOODS,                   ACTOR_ID_MAX,         SCENE_LOST_WOODS,                   0x00,                                              0x1F, "Trade Cojiro",                                "LW Trade Cojiro",                                          RHT_LW_TRADE_COJIRO,                                             RG_ODD_MUSHROOM,                      { Category::cAdultTrade },                              SpoilerCollectionCheck::RandomizerInf(RAND_INF_ADULT_TRADES_LW_TRADE_COJIRO),                                                 SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
+    locationTable[RC_LW_TRADE_ODD_POTION] =                                            Location::Base(RC_LW_TRADE_ODD_POTION,                                          RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_LOST_WOODS,                   ACTOR_ID_MAX,         SCENE_LOST_WOODS,                   0x00,                                              0x21, "Trade Odd Potion",                            "LW Trade Odd Potion",                                      RHT_LW_TRADE_COJIRO,                                             RG_POACHERS_SAW,                      { Category::cAdultTrade },                              SpoilerCollectionCheck::ItemGetInf(49),                                                                                       SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
+    locationTable[RC_LW_OCARINA_MEMORY_GAME] =                                         Location::Base(RC_LW_OCARINA_MEMORY_GAME,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LOST_WOODS,                   ACTOR_ID_MAX,         SCENE_LOST_WOODS,                   0x00,                                              0x21, "Ocarina Memory Game",                         "LW Ocarina Memory Game",                                   RHT_LW_OCARINA_MEMORY_GAME,                                      RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::ItemGetInf(23),                                                                                       SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
+    locationTable[RC_LW_TARGET_IN_WOODS] =                                             Location::Base(RC_LW_TARGET_IN_WOODS,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LOST_WOODS,                   ACTOR_ID_MAX,         SCENE_LOST_WOODS,                   0x00,                                              0x60, "Target in Woods",                             "LW Target in Woods",                                       RHT_LW_TARGET_IN_WOODS,                                          RG_PROGRESSIVE_SLINGSHOT,             {},                                                     SpoilerCollectionCheck::ItemGetInf(29),                                                                                       SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
+    locationTable[RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT] =                          Location::Base(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT,                        RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LOST_WOODS,                   ACTOR_EN_DNS,         SCENE_LOST_WOODS,                   0x00,                                              0x30, "Deku Scrub Near Deku Theater Right",          "LW Deku Scrub Near Deku Theater Right",                    RHT_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT,                       RG_BUY_DEKU_NUTS_5,                   { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT),                       SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT] =                           Location::Base(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT,                         RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LOST_WOODS,                   ACTOR_EN_DNS,         SCENE_LOST_WOODS,                   0x01,                                              0x31, "Deku Scrub Near Deku Theater Left",           "LW Deku Scrub Near Deku Theater Left",                     RHT_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT,                        RG_BUY_DEKU_STICK_1,                  { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT),                        SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_LW_DEKU_SCRUB_NEAR_BRIDGE] =                                      Location::Base(RC_LW_DEKU_SCRUB_NEAR_BRIDGE,                                    RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LOST_WOODS,                   ACTOR_EN_DNS,         SCENE_LOST_WOODS,                   0x09,                                              0x77, "Deku Scrub Near Bridge",                      "LW Deku Scrub Near Bridge",                                RHT_LW_DEKU_SCRUB_NEAR_BRIDGE,                                   RG_PROGRESSIVE_STICK_UPGRADE,         { Category::cDekuScrub, Category::cDekuScrubUpgrades }, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_NEAR_BRIDGE),                                   SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
+    locationTable[RC_LW_DEKU_SCRUB_GROTTO_REAR] =                               Location::GrottoScrub(RC_LW_DEKU_SCRUB_GROTTO_REAR,                                    RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LOST_WOODS,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x03, 0xF5),                      0x33, "Deku Scrub Grotto Rear",                      "LW Deku Scrub Grotto Rear",                                RHT_LW_DEKU_SCRUB_GROTTO_REAR,                                   RG_BUY_DEKU_SEEDS_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_GROTTO_REAR),                                   SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_LW_DEKU_SCRUB_GROTTO_FRONT] =                              Location::GrottoScrub(RC_LW_DEKU_SCRUB_GROTTO_FRONT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LOST_WOODS,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x0A, 0xF5),                      0x79, "Deku Scrub Grotto Front",                     "LW Deku Scrub Grotto Front",                               RHT_LW_DEKU_SCRUB_GROTTO_FRONT,                                  RG_PROGRESSIVE_NUT_UPGRADE,           { Category::cDekuScrub, Category::cDekuScrubUpgrades }, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_GROTTO_FRONT),                                  SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_DEKU_THEATER_SKULL_MASK] =                                        Location::Base(RC_DEKU_THEATER_SKULL_MASK,                                      RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LOST_WOODS,                   ACTOR_ID_MAX,         SCENE_GROTTOS,                      0x00,                                              0x77, "Deku Theater Skull Mask",                     "Deku Theater Skull Mask",                                  RHT_DEKU_THEATER_SKULL_MASK,                                     RG_PROGRESSIVE_STICK_UPGRADE,         {},                                                     SpoilerCollectionCheck::Chest(0x3E, 0x1F),                                                                                    SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
+    locationTable[RC_DEKU_THEATER_MASK_OF_TRUTH] =                                     Location::Base(RC_DEKU_THEATER_MASK_OF_TRUTH,                                   RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LOST_WOODS,                   ACTOR_ID_MAX,         SCENE_GROTTOS,                      0x00,                                              0x7A, "Deku Theater Mask of Truth",                  "Deku Theater Mask of Truth",                               RHT_DEKU_THEATER_MASK_OF_TRUTH,                                  RG_PROGRESSIVE_NUT_UPGRADE,           {},                                                     SpoilerCollectionCheck::Chest(0x3E, 0x1E),                                                                                    SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
     // Sacred Forest Meadow
-    locationTable[RC_SFM_WOLFOS_GROTTO_CHEST] =                    Location::Chest(RC_SFM_WOLFOS_GROTTO_CHEST,              RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_SACRED_FOREST_MEADOW, ACTOR_EN_BOX,    SCENE_GROTTOS,                    31409,                        0x11, "Wolfos Grotto Chest",               "SFM Wolfos Grotto Chest",              RHT_SFM_WOLFOS_GROTTO_CHEST,              RG_PURPLE_RUPEE,             {},                                                                           SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[RC_SFM_DEKU_SCRUB_GROTTO_REAR] =           Location::GrottoScrub(RC_SFM_DEKU_SCRUB_GROTTO_REAR,           RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_SACRED_FOREST_MEADOW, ACTOR_EN_DNS,    SCENE_GROTTOS,                    TWO_ACTOR_PARAMS(0x07, 0xEE), 0x39, "Deku Scrub Grotto Rear",            "SFM Deku Scrub Grotto Rear",           RHT_SFM_DEKU_SCRUB_GROTTO_REAR,           RG_BUY_RED_POTION_30,        { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x18, 0x08),         SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[RC_SFM_DEKU_SCRUB_GROTTO_FRONT] =          Location::GrottoScrub(RC_SFM_DEKU_SCRUB_GROTTO_FRONT,          RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_SACRED_FOREST_MEADOW, ACTOR_EN_DNS,    SCENE_GROTTOS,                    TWO_ACTOR_PARAMS(0x08, 0xEE), 0x3A, "Deku Scrub Grotto Front",           "SFM Deku Scrub Grotto Front",          RHT_SFM_DEKU_SCRUB_GROTTO_FRONT,          RG_BUY_GREEN_POTION,         { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x18, 0x09),         SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_SFM_WOLFOS_GROTTO_CHEST] =                                       Location::Chest(RC_SFM_WOLFOS_GROTTO_CHEST,                                      RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_SACRED_FOREST_MEADOW,         ACTOR_EN_BOX,         SCENE_GROTTOS,                      31409,                                             0x11, "Wolfos Grotto Chest",                         "SFM Wolfos Grotto Chest",                                  RHT_SFM_WOLFOS_GROTTO_CHEST,                                     RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_SFM_DEKU_SCRUB_GROTTO_REAR] =                              Location::GrottoScrub(RC_SFM_DEKU_SCRUB_GROTTO_REAR,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_SACRED_FOREST_MEADOW,         ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x07, 0xEE),                      0x39, "Deku Scrub Grotto Rear",                      "SFM Deku Scrub Grotto Rear",                               RHT_SFM_DEKU_SCRUB_GROTTO_REAR,                                  RG_BUY_RED_POTION_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_SFM_DEKU_SCRUB_GROTTO_REAR),                                  SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_SFM_DEKU_SCRUB_GROTTO_FRONT] =                             Location::GrottoScrub(RC_SFM_DEKU_SCRUB_GROTTO_FRONT,                                  RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_SACRED_FOREST_MEADOW,         ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x08, 0xEE),                      0x3A, "Deku Scrub Grotto Front",                     "SFM Deku Scrub Grotto Front",                              RHT_SFM_DEKU_SCRUB_GROTTO_FRONT,                                 RG_BUY_GREEN_POTION,                  { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_SFM_DEKU_SCRUB_GROTTO_FRONT),                                 SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
     // Hyrule Field
-    locationTable[RC_HF_SOUTHEAST_GROTTO_CHEST] =                  Location::Chest(RC_HF_SOUTHEAST_GROTTO_CHEST,            RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_HYRULE_FIELD,    ACTOR_EN_BOX,         SCENE_GROTTOS,                    22978,                        0x02, "Southeast Grotto Chest",            "HF Southeast Grotto Chest",            RHT_HF_SOUTHEAST_GROTTO_CHEST,            RG_RED_RUPEE,                {},                                                                           SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[RC_HF_OPEN_GROTTO_CHEST] =                       Location::Chest(RC_HF_OPEN_GROTTO_CHEST,                 RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_HYRULE_FIELD,    ACTOR_EN_BOX,         SCENE_GROTTOS,                    22947,                        0x03, "Open Grotto Chest",                 "HF Open Grotto Chest",                 RHT_HF_OPEN_GROTTO_CHEST,                 RG_BLUE_RUPEE,               {},                                                                           SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[RC_HF_NEAR_MARKET_GROTTO_CHEST] =                Location::Chest(RC_HF_NEAR_MARKET_GROTTO_CHEST,          RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_HYRULE_FIELD,    ACTOR_EN_BOX,         SCENE_GROTTOS,                    22944,                        0x00, "Near Market Grotto Chest",          "HF Near Market Grotto Chest",          RHT_HF_NEAR_MARKET_GROTTO_CHEST,          RG_BLUE_RUPEE,               {},                                                                           SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[RC_HF_OCARINA_OF_TIME_ITEM] =                     Location::Base(RC_HF_OCARINA_OF_TIME_ITEM,              RCQUEST_BOTH, RCTYPE_OCARINA,     RCAREA_HYRULE_FIELD,    ACTOR_ID_MAX,         SCENE_HYRULE_FIELD,               0x00,                         0x0C, "Ocarina of Time Item",              "HF Ocarina of Time Item",              RHT_HF_OCARINA_OF_TIME_ITEM,              RG_PROGRESSIVE_OCARINA,      {},                        SpoilerCollectionCheck::EventChkInf(0x43),         SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[RC_HF_TEKTITE_GROTTO_FREESTANDING_POH] =   Location::Collectable(RC_HF_TEKTITE_GROTTO_FREESTANDING_POH,   RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_HYRULE_FIELD,    ACTOR_EN_ITEM00,      SCENE_GROTTOS,                    262,                          0x01, "Tektite Grotto Freestanding PoH",   "HF Tektite Grotto Freestanding PoH",   RHT_HF_TEKTITE_GROTTO_FREESTANDING_POH,   RG_PIECE_OF_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD,   true);
-    locationTable[RC_HF_DEKU_SCRUB_GROTTO] =                 Location::GrottoScrub(RC_HF_DEKU_SCRUB_GROTTO,                 RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_HYRULE_FIELD,    ACTOR_EN_DNS,         SCENE_GROTTOS,                    TWO_ACTOR_PARAMS(0x02, 0xE6), 0x3E, "Deku Scrub Grotto",                 "HF Deku Scrub Grotto",                 RHT_HF_DEKU_SCRUB_GROTTO,                 RG_PIECE_OF_HEART,           { Category::cDekuScrub, Category::cDekuScrubUpgrades }, SpoilerCollectionCheck::Scrub(0x10, 0x03), SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD, true);
+    locationTable[RC_HF_SOUTHEAST_GROTTO_CHEST] =                                     Location::Chest(RC_HF_SOUTHEAST_GROTTO_CHEST,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_FIELD,                 ACTOR_EN_BOX,         SCENE_GROTTOS,                      22978,                                             0x02, "Southeast Grotto Chest",                      "HF Southeast Grotto Chest",                                RHT_HF_SOUTHEAST_GROTTO_CHEST,                                   RG_RED_RUPEE,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_HF_OPEN_GROTTO_CHEST] =                                          Location::Chest(RC_HF_OPEN_GROTTO_CHEST,                                         RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_FIELD,                 ACTOR_EN_BOX,         SCENE_GROTTOS,                      22947,                                             0x03, "Open Grotto Chest",                           "HF Open Grotto Chest",                                     RHT_HF_OPEN_GROTTO_CHEST,                                        RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_HF_NEAR_MARKET_GROTTO_CHEST] =                                   Location::Chest(RC_HF_NEAR_MARKET_GROTTO_CHEST,                                  RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_FIELD,                 ACTOR_EN_BOX,         SCENE_GROTTOS,                      22944,                                             0x00, "Near Market Grotto Chest",                    "HF Near Market Grotto Chest",                              RHT_HF_NEAR_MARKET_GROTTO_CHEST,                                 RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_HF_OCARINA_OF_TIME_ITEM] =                                        Location::Base(RC_HF_OCARINA_OF_TIME_ITEM,                                      RCQUEST_BOTH,    RCTYPE_OCARINA,                     RCAREA_HYRULE_FIELD,                 ACTOR_ID_MAX,         SCENE_HYRULE_FIELD,                 0x00,                                              0x0C, "Ocarina of Time Item",                        "HF Ocarina of Time Item",                                  RHT_HF_OCARINA_OF_TIME_ITEM,                                     RG_PROGRESSIVE_OCARINA,               {},                                                     SpoilerCollectionCheck::EventChkInf(0x43),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_HF_TEKTITE_GROTTO_FREESTANDING_POH] =                      Location::Collectable(RC_HF_TEKTITE_GROTTO_FREESTANDING_POH,                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_FIELD,                 ACTOR_EN_ITEM00,      SCENE_GROTTOS,                      262,                                               0x01, "Tektite Grotto Freestanding PoH",             "HF Tektite Grotto Freestanding PoH",                       RHT_HF_TEKTITE_GROTTO_FREESTANDING_POH,                          RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD,               true);
+    locationTable[RC_HF_DEKU_SCRUB_GROTTO] =                                    Location::GrottoScrub(RC_HF_DEKU_SCRUB_GROTTO,                                         RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_HYRULE_FIELD,                 ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x02, 0xE6),                      0x3E, "Deku Scrub Grotto",                           "HF Deku Scrub Grotto",                                     RHT_HF_DEKU_SCRUB_GROTTO,                                        RG_PIECE_OF_HEART,                    { Category::cDekuScrub, Category::cDekuScrubUpgrades }, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_HF_DEKU_SCRUB_GROTTO),                                        SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD,               true);
     // Lake Hylia
-    locationTable[RC_LH_CHILD_FISHING] =                            Location::Base(RC_LH_CHILD_FISHING,                     RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LAKE_HYLIA,      ACTOR_ID_MAX,         SCENE_FISHING_POND,               0x00,                         0x3E, "Child Fishing",                     "LH Child Fishing",                     RHT_LH_CHILD_FISHING,                     RG_PIECE_OF_HEART,           {}, SpoilerCollectionCheck::RandomizerInf(SCENE_FISHING_POND, RAND_INF_CHILD_FISHING), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA, true);
-    locationTable[RC_LH_ADULT_FISHING] =                            Location::Base(RC_LH_ADULT_FISHING,                     RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LAKE_HYLIA,      ACTOR_ID_MAX,         SCENE_FISHING_POND,               0x00,                         0x38, "Adult Fishing",                     "LH Adult Fishing",                     RHT_LH_ADULT_FISHING,                     RG_PROGRESSIVE_SCALE,        {}, SpoilerCollectionCheck::RandomizerInf(SCENE_FISHING_POND, RAND_INF_ADULT_FISHING), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA, true);
-    locationTable[RC_LH_LAB_DIVE] =                                 Location::Base(RC_LH_LAB_DIVE,                          RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LAKE_HYLIA,      ACTOR_ID_MAX,         SCENE_LAKESIDE_LABORATORY,        0x00,                         0x3E, "Lab Dive",                          "LH Lab Dive",                          RHT_LH_LAB_DIVE,                          RG_PIECE_OF_HEART,           {},                        SpoilerCollectionCheck::ItemGetInf(24),            SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,     true);
-    locationTable[RC_LH_TRADE_FROG] =                               Location::Base(RC_LH_TRADE_FROG,                        RCQUEST_BOTH, RCTYPE_ADULT_TRADE, RCAREA_LAKE_HYLIA,      ACTOR_ID_MAX,         SCENE_LAKESIDE_LABORATORY,        0x00,                         0x25, "Lab Trade Eyeball Frog",            "LH Lab Trade Eyeball Frog",            RHT_LH_TRADE_FROG,                        RG_EYEDROPS,                 { Category::cAdultTrade }, SpoilerCollectionCheck::RandomizerInf(0x38, 0x1F), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,     true);
-    locationTable[RC_LH_UNDERWATER_ITEM] =                          Location::Base(RC_LH_UNDERWATER_ITEM,                   RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LAKE_HYLIA,      ACTOR_ID_MAX,         SCENE_LAKE_HYLIA,                 0x00,                         0x15, "Underwater Item",                   "LH Underwater Item",                   RHT_LH_UNDERWATER_ITEM,                   RG_RUTOS_LETTER,             {},                        SpoilerCollectionCheck::EventChkInf(0x31),         SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,     true);
-    locationTable[RC_LH_SUN] =                                      Location::Base(RC_LH_SUN,                               RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LAKE_HYLIA,      ACTOR_ID_MAX,         SCENE_LAKE_HYLIA,                 0x00,                         0x58, "Sun",                               "LH Sun",                               RHT_LH_SUN,                               RG_FIRE_ARROWS,              {},                        SpoilerCollectionCheck::Chest(0x57, 0x1F),         SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,     true);
-    locationTable[RC_LH_FREESTANDING_POH] =                  Location::Collectable(RC_LH_FREESTANDING_POH,                  RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LAKE_HYLIA,      ACTOR_EN_ITEM00,      SCENE_LAKE_HYLIA,                 7686,                         0x1E, "Freestanding PoH",                  "LH Freestanding PoH",                  RHT_LH_FREESTANDING_POH,                  RG_PIECE_OF_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,     true);
-    locationTable[RC_LH_DEKU_SCRUB_GROTTO_LEFT] =            Location::GrottoScrub(RC_LH_DEKU_SCRUB_GROTTO_LEFT,            RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_LAKE_HYLIA,      ACTOR_EN_DNS,         SCENE_GROTTOS,                    TWO_ACTOR_PARAMS(0x00, 0xEF), 0x30, "Deku Scrub Grotto Left",            "LH Deku Scrub Grotto Left",            RHT_LH_DEKU_SCRUB_GROTTO_LEFT,            RG_BUY_DEKU_NUTS_5,          { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x19, 0x01),         SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_DEKU_SCRUB_GROTTO_RIGHT] =           Location::GrottoScrub(RC_LH_DEKU_SCRUB_GROTTO_RIGHT,           RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_LAKE_HYLIA,      ACTOR_EN_DNS,         SCENE_GROTTOS,                    TWO_ACTOR_PARAMS(0x05, 0xEF), 0x37, "Deku Scrub Grotto Right",           "LH Deku Scrub Grotto Right",           RHT_LH_DEKU_SCRUB_GROTTO_RIGHT,           RG_BUY_BOMBS_535,            { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x19, 0x06),         SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_DEKU_SCRUB_GROTTO_CENTER] =          Location::GrottoScrub(RC_LH_DEKU_SCRUB_GROTTO_CENTER,          RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_LAKE_HYLIA,      ACTOR_EN_DNS,         SCENE_GROTTOS,                    TWO_ACTOR_PARAMS(0x03, 0xEF), 0x33, "Deku Scrub Grotto Center",          "LH Deku Scrub Grotto Center",          RHT_LH_DEKU_SCRUB_GROTTO_CENTER,          RG_BUY_DEKU_SEEDS_30,        { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x19, 0x04),         SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISHING] =                                               Location::Base(RC_LH_CHILD_FISHING,                                             RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LAKE_HYLIA,                   ACTOR_ID_MAX,         SCENE_FISHING_POND,                 0x00,                                              0x3E, "Child Fishing",                               "LH Child Fishing",                                         RHT_LH_CHILD_FISHING,                                            RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_CHILD_FISHING),                                                                SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,                 true);
+    locationTable[RC_LH_ADULT_FISHING] =                                               Location::Base(RC_LH_ADULT_FISHING,                                             RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LAKE_HYLIA,                   ACTOR_ID_MAX,         SCENE_FISHING_POND,                 0x00,                                              0x38, "Adult Fishing",                               "LH Adult Fishing",                                         RHT_LH_ADULT_FISHING,                                            RG_PROGRESSIVE_SCALE,                 {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ADULT_FISHING),                                                                SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,                 true);
+    locationTable[RC_LH_LAB_DIVE] =                                                    Location::Base(RC_LH_LAB_DIVE,                                                  RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LAKE_HYLIA,                   ACTOR_ID_MAX,         SCENE_LAKESIDE_LABORATORY,          0x00,                                              0x3E, "Lab Dive",                                    "LH Lab Dive",                                              RHT_LH_LAB_DIVE,                                                 RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::ItemGetInf(16),                                                                                       SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,                 true);
+    locationTable[RC_LH_TRADE_FROG] =                                                  Location::Base(RC_LH_TRADE_FROG,                                                RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_LAKE_HYLIA,                   ACTOR_ID_MAX,         SCENE_LAKESIDE_LABORATORY,          0x00,                                              0x25, "Lab Trade Eyeball Frog",                      "LH Lab Trade Eyeball Frog",                                RHT_LH_TRADE_FROG,                                               RG_EYEDROPS,                          { Category::cAdultTrade },                              SpoilerCollectionCheck::RandomizerInf(RAND_INF_ADULT_TRADES_LH_TRADE_FROG),                                                   SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,                 true);
+    locationTable[RC_LH_UNDERWATER_ITEM] =                                             Location::Base(RC_LH_UNDERWATER_ITEM,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LAKE_HYLIA,                   ACTOR_ID_MAX,         SCENE_LAKE_HYLIA,                   0x00,                                              0x15, "Underwater Item",                             "LH Underwater Item",                                       RHT_LH_UNDERWATER_ITEM,                                          RG_RUTOS_LETTER,                      {},                                                     SpoilerCollectionCheck::EventChkInf(0x31),                                                                                    SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,                 true);
+    locationTable[RC_LH_SUN] =                                                         Location::Base(RC_LH_SUN,                                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LAKE_HYLIA,                   ACTOR_ID_MAX,         SCENE_LAKE_HYLIA,                   0x00,                                              0x58, "Sun",                                         "LH Sun",                                                   RHT_LH_SUN,                                                      RG_FIRE_ARROWS,                       {},                                                     SpoilerCollectionCheck::Chest(0x57, 0x1F),                                                                                    SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,                 true);
+    locationTable[RC_LH_FREESTANDING_POH] =                                     Location::Collectable(RC_LH_FREESTANDING_POH,                                          RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LAKE_HYLIA,                   ACTOR_EN_ITEM00,      SCENE_LAKE_HYLIA,                   7686,                                              0x1E, "Freestanding PoH",                            "LH Freestanding PoH",                                      RHT_LH_FREESTANDING_POH,                                         RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,                 true);
+    locationTable[RC_LH_DEKU_SCRUB_GROTTO_LEFT] =                               Location::GrottoScrub(RC_LH_DEKU_SCRUB_GROTTO_LEFT,                                    RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LAKE_HYLIA,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x00, 0xEF),                      0x30, "Deku Scrub Grotto Left",                      "LH Deku Scrub Grotto Left",                                RHT_LH_DEKU_SCRUB_GROTTO_LEFT,                                   RG_BUY_DEKU_NUTS_5,                   { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LH_DEKU_SCRUB_GROTTO_LEFT),                                   SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_DEKU_SCRUB_GROTTO_RIGHT] =                              Location::GrottoScrub(RC_LH_DEKU_SCRUB_GROTTO_RIGHT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LAKE_HYLIA,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x05, 0xEF),                      0x37, "Deku Scrub Grotto Right",                     "LH Deku Scrub Grotto Right",                               RHT_LH_DEKU_SCRUB_GROTTO_RIGHT,                                  RG_BUY_BOMBS_535,                     { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LH_DEKU_SCRUB_GROTTO_RIGHT),                                  SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_DEKU_SCRUB_GROTTO_CENTER] =                             Location::GrottoScrub(RC_LH_DEKU_SCRUB_GROTTO_CENTER,                                  RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LAKE_HYLIA,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x03, 0xEF),                      0x33, "Deku Scrub Grotto Center",                    "LH Deku Scrub Grotto Center",                              RHT_LH_DEKU_SCRUB_GROTTO_CENTER,                                 RG_BUY_DEKU_SEEDS_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LH_DEKU_SCRUB_GROTTO_CENTER),                                 SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
     // Gerudo Valley
-    locationTable[RC_GV_CHEST] =                                   Location::Chest(RC_GV_CHEST,                             RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GERUDO_VALLEY,   ACTOR_EN_BOX,         SCENE_GERUDO_VALLEY,              23200,                        0x00, "Chest",                             "GV Chest",                             RHT_GV_CHEST,                             RG_PURPLE_RUPEE,             {},                                                                           SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[RC_GV_TRADE_SAW] =                                Location::Base(RC_GV_TRADE_SAW,                         RCQUEST_BOTH, RCTYPE_ADULT_TRADE, RCAREA_GERUDO_VALLEY,   ACTOR_ID_MAX,         SCENE_GERUDO_VALLEY,              0x00,                         0x22, "Trade Saw",                         "GV Trade Saw",                         RHT_GV_TRADE_SAW,                         RG_BROKEN_SWORD,             { Category::cAdultTrade }, SpoilerCollectionCheck::RandomizerInf(0x5A, 0x1F), SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
-    locationTable[RC_GV_WATERFALL_FREESTANDING_POH] =        Location::Collectable(RC_GV_WATERFALL_FREESTANDING_POH,        RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GERUDO_VALLEY,   ACTOR_EN_ITEM00,      SCENE_GERUDO_VALLEY,              262,                          0x01, "Waterfall Freestanding PoH",        "GV Waterfall Freestanding PoH",        RHT_GV_WATERFALL_FREESTANDING_POH,        RG_PIECE_OF_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
-    locationTable[RC_GV_CRATE_FREESTANDING_POH] =            Location::Collectable(RC_GV_CRATE_FREESTANDING_POH,            RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GERUDO_VALLEY,   ACTOR_EN_ITEM00,      SCENE_GERUDO_VALLEY,              518,                          0x02, "Crate Freestanding PoH",            "GV Crate Freestanding PoH",            RHT_GV_CRATE_FREESTANDING_POH,            RG_PIECE_OF_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
-    locationTable[RC_GV_DEKU_SCRUB_GROTTO_REAR] =            Location::GrottoScrub(RC_GV_DEKU_SCRUB_GROTTO_REAR,            RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_GERUDO_VALLEY,   ACTOR_EN_DNS,         SCENE_GROTTOS,                    TWO_ACTOR_PARAMS(0x07, 0xF0), 0x39, "Deku Scrub Grotto Rear",            "GV Deku Scrub Grotto Rear",            RHT_GV_DEKU_SCRUB_GROTTO_FRONT,           RG_BUY_GREEN_POTION,         { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x1A, 0x09),         SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[RC_GV_DEKU_SCRUB_GROTTO_FRONT] =           Location::GrottoScrub(RC_GV_DEKU_SCRUB_GROTTO_FRONT,           RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_GERUDO_VALLEY,   ACTOR_EN_DNS,         SCENE_GROTTOS,                    TWO_ACTOR_PARAMS(0x08, 0xF0), 0x3A, "Deku Scrub Grotto Front",           "GV Deku Scrub Grotto Front",           RHT_GV_DEKU_SCRUB_GROTTO_FRONT,           RG_BUY_GREEN_POTION,         { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x1A, 0x09),         SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_GV_CHEST] =                                                      Location::Chest(RC_GV_CHEST,                                                     RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GERUDO_VALLEY,                ACTOR_EN_BOX,         SCENE_GERUDO_VALLEY,                23200,                                             0x00, "Chest",                                       "GV Chest",                                                 RHT_GV_CHEST,                                                    RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_GV_TRADE_SAW] =                                                   Location::Base(RC_GV_TRADE_SAW,                                                 RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_GERUDO_VALLEY,                ACTOR_ID_MAX,         SCENE_GERUDO_VALLEY,                0x00,                                              0x22, "Trade Saw",                                   "GV Trade Saw",                                             RHT_GV_TRADE_SAW,                                                RG_BROKEN_SWORD,                      { Category::cAdultTrade },                              SpoilerCollectionCheck::RandomizerInf(RAND_INF_ADULT_TRADES_GV_TRADE_SAW),                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
+    locationTable[RC_GV_WATERFALL_FREESTANDING_POH] =                           Location::Collectable(RC_GV_WATERFALL_FREESTANDING_POH,                                RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GERUDO_VALLEY,                ACTOR_EN_ITEM00,      SCENE_GERUDO_VALLEY,                262,                                               0x01, "Waterfall Freestanding PoH",                  "GV Waterfall Freestanding PoH",                            RHT_GV_WATERFALL_FREESTANDING_POH,                               RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
+    locationTable[RC_GV_CRATE_FREESTANDING_POH] =                               Location::Collectable(RC_GV_CRATE_FREESTANDING_POH,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GERUDO_VALLEY,                ACTOR_EN_ITEM00,      SCENE_GERUDO_VALLEY,                518,                                               0x02, "Crate Freestanding PoH",                      "GV Crate Freestanding PoH",                                RHT_GV_CRATE_FREESTANDING_POH,                                   RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
+    locationTable[RC_GV_DEKU_SCRUB_GROTTO_REAR] =                               Location::GrottoScrub(RC_GV_DEKU_SCRUB_GROTTO_REAR,                                    RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_GERUDO_VALLEY,                ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x07, 0xF0),                      0x39, "Deku Scrub Grotto Rear",                      "GV Deku Scrub Grotto Rear",                                RHT_GV_DEKU_SCRUB_GROTTO_FRONT,                                  RG_BUY_GREEN_POTION,                  { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GV_DEKU_SCRUB_GROTTO_REAR),                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_GV_DEKU_SCRUB_GROTTO_FRONT] =                              Location::GrottoScrub(RC_GV_DEKU_SCRUB_GROTTO_FRONT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_GERUDO_VALLEY,                ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x08, 0xF0),                      0x3A, "Deku Scrub Grotto Front",                     "GV Deku Scrub Grotto Front",                               RHT_GV_DEKU_SCRUB_GROTTO_FRONT,                                  RG_BUY_GREEN_POTION,                  { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GV_DEKU_SCRUB_GROTTO_FRONT),                                  SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
     // Gerudo Fortress
-    locationTable[RC_GF_CHEST] =                                   Location::Chest(RC_GF_CHEST,                             RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GERUDO_FORTRESS, ACTOR_EN_BOX,         SCENE_GERUDOS_FORTRESS,           1984,                         0x00, "Chest",                             "GF Chest",                             RHT_GF_CHEST,                             RG_PIECE_OF_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
-    locationTable[RC_GF_HBA_1000_POINTS] =                          Location::Base(RC_GF_HBA_1000_POINTS,                   RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GERUDO_FORTRESS, ACTOR_ID_MAX,         SCENE_GERUDOS_FORTRESS,           0x00,                         0x3E, "GF HBA 1000 Points",                "GF HBA 1000 Points",                   RHT_GF_HBA_1000_POINTS,                   RG_PIECE_OF_HEART,           {},                        SpoilerCollectionCheck::InfTable(0x19, 0x08),      SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
-    locationTable[RC_GF_HBA_1500_POINTS] =                          Location::Base(RC_GF_HBA_1500_POINTS,                   RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GERUDO_FORTRESS, ACTOR_ID_MAX,         SCENE_GERUDOS_FORTRESS,           0x00,                         0x30, "GF HBA 1500 Points",                "GF HBA 1500 Points",                   RHT_GF_HBA_1500_POINTS,                   RG_PROGRESSIVE_BOW,          {},                        SpoilerCollectionCheck::ItemGetInf(7),             SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
+    locationTable[RC_GF_CHEST] =                                                      Location::Chest(RC_GF_CHEST,                                                     RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GERUDO_FORTRESS,              ACTOR_EN_BOX,         SCENE_GERUDOS_FORTRESS,             1984,                                              0x00, "Chest",                                       "GF Chest",                                                 RHT_GF_CHEST,                                                    RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
+    locationTable[RC_GF_HBA_1000_POINTS] =                                             Location::Base(RC_GF_HBA_1000_POINTS,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GERUDO_FORTRESS,              ACTOR_ID_MAX,         SCENE_GERUDOS_FORTRESS,             0x00,                                              0x3E, "GF HBA 1000 Points",                          "GF HBA 1000 Points",                                       RHT_GF_HBA_1000_POINTS,                                          RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::InfTable(0x19, 0x08),                                                                                 SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
+    locationTable[RC_GF_HBA_1500_POINTS] =                                             Location::Base(RC_GF_HBA_1500_POINTS,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GERUDO_FORTRESS,              ACTOR_ID_MAX,         SCENE_GERUDOS_FORTRESS,             0x00,                                              0x30, "GF HBA 1500 Points",                          "GF HBA 1500 Points",                                       RHT_GF_HBA_1500_POINTS,                                          RG_PROGRESSIVE_BOW,                   {},                                                     SpoilerCollectionCheck::ItemGetInf(15),                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
     // RandoTodo: Do we replace these with the RC_HIDEOUT keys or keep these?
-    locationTable[RC_GF_GERUDO_MEMBERSHIP_CARD] =                   Location::Base(RC_GF_GERUDO_MEMBERSHIP_CARD,            RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GERUDO_FORTRESS, ACTOR_ID_MAX,         SCENE_THIEVES_HIDEOUT,            0x00,                         0x3A, "GF Gerudo Membership Card",         "GF Gerudo Membership Card",            RHT_GF_GERUDO_MEMBERSHIP_CARD,            RG_GERUDO_MEMBERSHIP_CARD,   {},                        SpoilerCollectionCheck::GerudoToken(),             SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
-    locationTable[RC_GF_NORTH_F1_CARPENTER] =                Location::Collectable(RC_GF_NORTH_F1_CARPENTER,                RCQUEST_BOTH, RCTYPE_GF_KEY,      RCAREA_GERUDO_FORTRESS, ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,            3089,                         0x0C, "GF North F1 Carpenter",             "GF North F1 Carpenter",                RHT_GF_NORTH_F1_CARPENTER,                RG_GERUDO_FORTRESS_SMALL_KEY,{ Category::cVanillaGFSmallKey },                                          SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
-    locationTable[RC_GF_NORTH_F2_CARPENTER] =                Location::Collectable(RC_GF_NORTH_F2_CARPENTER,                RCQUEST_BOTH, RCTYPE_GF_KEY,      RCAREA_GERUDO_FORTRESS, ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,            2577,                         0x0A, "GF North F2 Carpenter",             "GF North F2 Carpenter",                RHT_GF_NORTH_F2_CARPENTER,                RG_GERUDO_FORTRESS_SMALL_KEY,{ Category::cVanillaGFSmallKey },                                          SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
-    locationTable[RC_GF_SOUTH_F1_CARPENTER] =                Location::Collectable(RC_GF_SOUTH_F1_CARPENTER,                RCQUEST_BOTH, RCTYPE_GF_KEY,      RCAREA_GERUDO_FORTRESS, ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,            3601,                         0x0E, "GF South F1 Carpenter",             "GF South F1 Carpenter",                RHT_GF_SOUTH_F1_CARPENTER,                RG_GERUDO_FORTRESS_SMALL_KEY,{ Category::cVanillaGFSmallKey },                                          SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
-    locationTable[RC_GF_SOUTH_F2_CARPENTER] =                Location::Collectable(RC_GF_SOUTH_F2_CARPENTER,                RCQUEST_BOTH, RCTYPE_GF_KEY,      RCAREA_GERUDO_FORTRESS, ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,            3857,                         0x0F, "GF South F2 Carpenter",             "GF South F2 Carpenter",                RHT_GF_SOUTH_F2_CARPENTER,                RG_GERUDO_FORTRESS_SMALL_KEY,{ Category::cVanillaGFSmallKey },                                          SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
+    locationTable[RC_GF_GERUDO_MEMBERSHIP_CARD] =                                      Location::Base(RC_GF_GERUDO_MEMBERSHIP_CARD,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GERUDO_FORTRESS,              ACTOR_ID_MAX,         SCENE_THIEVES_HIDEOUT,              0x00,                                              0x3A, "GF Gerudo Membership Card",                   "GF Gerudo Membership Card",                                RHT_GF_GERUDO_MEMBERSHIP_CARD,                                   RG_GERUDO_MEMBERSHIP_CARD,            {},                                                     SpoilerCollectionCheck::GerudoToken(),                                                                                        SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
+    locationTable[RC_GF_NORTH_F1_CARPENTER] =                                   Location::Collectable(RC_GF_NORTH_F1_CARPENTER,                                        RCQUEST_BOTH,    RCTYPE_GF_KEY,                      RCAREA_GERUDO_FORTRESS,              ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,              3089,                                              0x0C, "GF North F1 Carpenter",                       "GF North F1 Carpenter",                                    RHT_GF_NORTH_F1_CARPENTER,                                       RG_GERUDO_FORTRESS_SMALL_KEY,         { Category::cVanillaGFSmallKey },                                                                                                                                                     SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
+    locationTable[RC_GF_NORTH_F2_CARPENTER] =                                   Location::Collectable(RC_GF_NORTH_F2_CARPENTER,                                        RCQUEST_BOTH,    RCTYPE_GF_KEY,                      RCAREA_GERUDO_FORTRESS,              ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,              2577,                                              0x0A, "GF North F2 Carpenter",                       "GF North F2 Carpenter",                                    RHT_GF_NORTH_F2_CARPENTER,                                       RG_GERUDO_FORTRESS_SMALL_KEY,         { Category::cVanillaGFSmallKey },                                                                                                                                                     SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
+    locationTable[RC_GF_SOUTH_F1_CARPENTER] =                                   Location::Collectable(RC_GF_SOUTH_F1_CARPENTER,                                        RCQUEST_BOTH,    RCTYPE_GF_KEY,                      RCAREA_GERUDO_FORTRESS,              ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,              3601,                                              0x0E, "GF South F1 Carpenter",                       "GF South F1 Carpenter",                                    RHT_GF_SOUTH_F1_CARPENTER,                                       RG_GERUDO_FORTRESS_SMALL_KEY,         { Category::cVanillaGFSmallKey },                                                                                                                                                     SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
+    locationTable[RC_GF_SOUTH_F2_CARPENTER] =                                   Location::Collectable(RC_GF_SOUTH_F2_CARPENTER,                                        RCQUEST_BOTH,    RCTYPE_GF_KEY,                      RCAREA_GERUDO_FORTRESS,              ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,              3857,                                              0x0F, "GF South F2 Carpenter",                       "GF South F2 Carpenter",                                    RHT_GF_SOUTH_F2_CARPENTER,                                       RG_GERUDO_FORTRESS_SMALL_KEY,         { Category::cVanillaGFSmallKey },                                                                                                                                                     SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
     // Haunted Wasteland
-    locationTable[RC_WASTELAND_CHEST] =                            Location::Chest(RC_WASTELAND_CHEST,                      RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_WASTELAND,             ACTOR_EN_BOX,    SCENE_HAUNTED_WASTELAND,         -30048,                       0x00, "Chest",                             "Wasteland Chest",                      RHT_WASTELAND_CHEST,                      RG_PURPLE_RUPEE,             {},                                                                           SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[RC_WASTELAND_BOMBCHU_SALESMAN] =                  Location::Base(RC_WASTELAND_BOMBCHU_SALESMAN,           RCQUEST_BOTH, RCTYPE_MERCHANT,    RCAREA_WASTELAND,             ACTOR_ID_MAX,    SCENE_HAUNTED_WASTELAND,         0x00,                         0x03, "Carpet Salesman",                   "Wasteland Carpet Salesman",            RHT_WASTELAND_BOMBCHU_SALESMAN,           RG_BOMBCHU_10,               { Category::cMerchant },   SpoilerCollectionCheck::Merchant(0x5E, 0x86),      SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_WASTELAND_CHEST] =                                               Location::Chest(RC_WASTELAND_CHEST,                                              RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_WASTELAND,                    ACTOR_EN_BOX,         SCENE_HAUNTED_WASTELAND,            -30048,                                            0x00, "Chest",                                       "Wasteland Chest",                                          RHT_WASTELAND_CHEST,                                             RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_WASTELAND_BOMBCHU_SALESMAN] =                                     Location::Base(RC_WASTELAND_BOMBCHU_SALESMAN,                                   RCQUEST_BOTH,    RCTYPE_MERCHANT,                    RCAREA_WASTELAND,                    ACTOR_ID_MAX,         SCENE_HAUNTED_WASTELAND,            0x00,                                              0x03, "Carpet Salesman",                             "Wasteland Carpet Salesman",                                RHT_WASTELAND_BOMBCHU_SALESMAN,                                  RG_BOMBCHU_10,                        { Category::cMerchant },                                SpoilerCollectionCheck::RandomizerInf(RAND_INF_MERCHANTS_CARPET_SALESMAN),                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
     // Desert Colossus
-    locationTable[RC_COLOSSUS_FREESTANDING_POH] =            Location::Collectable(RC_COLOSSUS_FREESTANDING_POH,            RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_DESERT_COLOSSUS,       ACTOR_EN_ITEM00, SCENE_DESERT_COLOSSUS,           3334,                         0x0D, "Freestanding PoH",                  "Colossus Freestanding PoH",            RHT_COLOSSUS_FREESTANDING_POH,            RG_PIECE_OF_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  true);
-    locationTable[RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR] =      Location::GrottoScrub(RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,      RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_DESERT_COLOSSUS,       ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x07, 0xFD), 0x39, "Deku Scrub Grotto Rear",            "Colossus Deku Scrub Grotto Rear",      RHT_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,      RG_BUY_RED_POTION_30,        { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x27, 0x08),         SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT] =     Location::GrottoScrub(RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT,     RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_DESERT_COLOSSUS,       ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x08, 0xFD), 0x3A, "Deku Scrub Grotto Front",           "Colossus Deku Scrub Grotto Front",     RHT_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT,     RG_BUY_GREEN_POTION,         { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x27, 0x09),         SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_COLOSSUS_FREESTANDING_POH] =                               Location::Collectable(RC_COLOSSUS_FREESTANDING_POH,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DESERT_COLOSSUS,              ACTOR_EN_ITEM00,      SCENE_DESERT_COLOSSUS,              3334,                                              0x0D, "Freestanding PoH",                            "Colossus Freestanding PoH",                                RHT_COLOSSUS_FREESTANDING_POH,                                   RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
+    locationTable[RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR] =                         Location::GrottoScrub(RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,                              RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_DESERT_COLOSSUS,              ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x07, 0xFD),                      0x39, "Deku Scrub Grotto Rear",                      "Colossus Deku Scrub Grotto Rear",                          RHT_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,                             RG_BUY_RED_POTION_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_COLOSSUS_DEKU_SCRUB_GROTTO_REAR),                             SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT] =                        Location::GrottoScrub(RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT,                             RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_DESERT_COLOSSUS,              ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x08, 0xFD),                      0x3A, "Deku Scrub Grotto Front",                     "Colossus Deku Scrub Grotto Front",                         RHT_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT,                            RG_BUY_GREEN_POTION,                  { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT),                            SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
     // Market
-    locationTable[RC_MARKET_TREASURE_CHEST_GAME_REWARD] =          Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_REWARD,    RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_MARKET,                ACTOR_EN_BOX,    SCENE_TREASURE_BOX_SHOP,         0x00,                         0x0A, "Treasure Chest Game Reward",        "MK Treasure Chest Game Reward",        RHT_MARKET_TREASURE_CHEST_GAME_REWARD,    RG_TREASURE_GAME_HEART,      {},                        SpoilerCollectionCheck::ItemGetInf(19),            SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,  true);
-    locationTable[RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE] =          Location::Base(RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,   RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_MARKET,                ACTOR_ID_MAX,    SCENE_BOMBCHU_BOWLING_ALLEY,     0x00,                         0x33, "Bombchu Bowling First Prize",       "MK Bombchu Bowling First Prize",       RHT_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,   RG_PROGRESSIVE_BOMB_BAG,     {},                        SpoilerCollectionCheck::ItemGetInf(25),            SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,  true);
-    locationTable[RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE] =         Location::Base(RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE,  RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_MARKET,                ACTOR_ID_MAX,    SCENE_BOMBCHU_BOWLING_ALLEY,     0x00,                         0x3E, "Bombchu Bowling Second Prize",      "MK Bombchu Bowling Second Prize",      RHT_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE,  RG_PIECE_OF_HEART,           {},                        SpoilerCollectionCheck::ItemGetInf(26),            SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,  true);
-    locationTable[RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS] =             Location::Base(RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS,      RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_MARKET,                ACTOR_ID_MAX,    SCENE_BOMBCHU_BOWLING_ALLEY,     0x00,                         0x00, "Bombchu Bowling Bombchus",          "MK Bombchu Bowling Bombchus",          RHT_MARKET_BOMBCHU_BOWLING_BOMBCHUS,      RG_BOMBCHU_DROP,             {},                        SpoilerCollectionCheck::None(),                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_LOST_DOG] =                             Location::Base(RC_MARKET_LOST_DOG,                      RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_MARKET,                ACTOR_ID_MAX,    SCENE_DOG_LADY_HOUSE,            0x00,                         0x3E, "Lost Dog",                          "MK Lost Dog",                          RHT_MARKET_LOST_DOG,                      RG_PIECE_OF_HEART,           {},                        SpoilerCollectionCheck::InfTable(0x19, 0x09),      SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,  true);
-    locationTable[RC_MARKET_SHOOTING_GALLERY_REWARD] =              Location::Base(RC_MARKET_SHOOTING_GALLERY_REWARD,       RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_MARKET,                ACTOR_ID_MAX,    SCENE_SHOOTING_GALLERY,          0x00,                         0x60, "Shooting Gallery",                  "MK Shooting Gallery",                  RHT_MARKET_SHOOTING_GALLERY_REWARD,       RG_PROGRESSIVE_SLINGSHOT,    {},                        SpoilerCollectionCheck::ItemGetInf(5),             SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,  true);
-    locationTable[RC_MARKET_10_BIG_POES] =                          Location::Base(RC_MARKET_10_BIG_POES,                   RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_MARKET,                ACTOR_ID_MAX,    SCENE_MARKET_GUARD_HOUSE,        0x00,                         0x0F, "10 Big Poes",                       "MK 10 Big Poes",                       RHT_MARKET_10_BIG_POES,                   RG_EMPTY_BOTTLE,             {},                        SpoilerCollectionCheck::RandomizerInf(SCENE_MARKET_GUARD_HOUSE, RAND_INF_10_BIG_POES), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE, true);
-    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_1] =          Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_1,    RCQUEST_BOTH, RCTYPE_CHEST_GAME,  RCAREA_MARKET,                ACTOR_EN_BOX,    SCENE_TREASURE_BOX_SHOP,         0x00,                         0x01, "Chest Game First Room Chest",       "MK Chest Game First Room Chest",       RHT_MARKET_TREASURE_CHEST_GAME_ITEM_1,    RG_TREASURE_GAME_SMALL_KEY,  { Category::cChestMinigame },                                                SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_2] =          Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_2,    RCQUEST_BOTH, RCTYPE_CHEST_GAME,  RCAREA_MARKET,                ACTOR_EN_BOX,    SCENE_TREASURE_BOX_SHOP,         0x00,                         0x03, "Chest Game Second Room Chest",      "MK Chest Game Second Room Chest",      RHT_MARKET_TREASURE_CHEST_GAME_ITEM_2,    RG_TREASURE_GAME_SMALL_KEY,  { Category::cChestMinigame },                                                SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_3] =          Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_3,    RCQUEST_BOTH, RCTYPE_CHEST_GAME,  RCAREA_MARKET,                ACTOR_EN_BOX,    SCENE_TREASURE_BOX_SHOP,         0x00,                         0x05, "Chest Game Third Room Chest",       "MK Chest Game Third Room Chest",       RHT_MARKET_TREASURE_CHEST_GAME_ITEM_3,    RG_TREASURE_GAME_SMALL_KEY,  { Category::cChestMinigame },                                                SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_4] =          Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_4,    RCQUEST_BOTH, RCTYPE_CHEST_GAME,  RCAREA_MARKET,                ACTOR_EN_BOX,    SCENE_TREASURE_BOX_SHOP,         0x00,                         0x07, "Chest Game Fourth Room Chest",      "MK Chest Game Fourth Room Chest",      RHT_MARKET_TREASURE_CHEST_GAME_ITEM_4,    RG_TREASURE_GAME_SMALL_KEY,  { Category::cChestMinigame },                                                SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_5] =          Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_5,    RCQUEST_BOTH, RCTYPE_CHEST_GAME,  RCAREA_MARKET,                ACTOR_EN_BOX,    SCENE_TREASURE_BOX_SHOP,         0x00,                         0x09, "Chest Game Fifth Room Chest",       "MK Chest Game Fifth Room Chest",       RHT_MARKET_TREASURE_CHEST_GAME_ITEM_5,    RG_TREASURE_GAME_SMALL_KEY,  { Category::cChestMinigame },                                                SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_REWARD] =                             Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_REWARD,                            RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0x0A, "Treasure Chest Game Reward",                  "MK Treasure Chest Game Reward",                            RHT_MARKET_TREASURE_CHEST_GAME_REWARD,                           RG_TREASURE_GAME_HEART,               {},                                                     SpoilerCollectionCheck::ItemGetInf(27),                                                                                       SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
+    locationTable[RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE] =                             Location::Base(RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_BOMBCHU_BOWLING_ALLEY,        0x00,                                              0x33, "Bombchu Bowling First Prize",                 "MK Bombchu Bowling First Prize",                           RHT_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,                          RG_PROGRESSIVE_BOMB_BAG,              {},                                                     SpoilerCollectionCheck::ItemGetInf(17),                                                                                       SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
+    locationTable[RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE] =                            Location::Base(RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE,                          RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_BOMBCHU_BOWLING_ALLEY,        0x00,                                              0x3E, "Bombchu Bowling Second Prize",                "MK Bombchu Bowling Second Prize",                          RHT_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE,                         RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::ItemGetInf(18),                                                                                       SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
+    locationTable[RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS] =                                Location::Base(RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS,                              RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_BOMBCHU_BOWLING_ALLEY,        0x00,                                              0x00, "Bombchu Bowling Bombchus",                    "MK Bombchu Bowling Bombchus",                              RHT_MARKET_BOMBCHU_BOWLING_BOMBCHUS,                             RG_BOMBCHU_DROP,                      {},                                                     SpoilerCollectionCheck::None(),                                                                                               SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_LOST_DOG] =                                                Location::Base(RC_MARKET_LOST_DOG,                                              RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_DOG_LADY_HOUSE,               0x00,                                              0x3E, "Lost Dog",                                    "MK Lost Dog",                                              RHT_MARKET_LOST_DOG,                                             RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::InfTable(0x19, 0x09),                                                                                 SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
+    locationTable[RC_MARKET_SHOOTING_GALLERY_REWARD] =                                 Location::Base(RC_MARKET_SHOOTING_GALLERY_REWARD,                               RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_SHOOTING_GALLERY,             0x00,                                              0x60, "Shooting Gallery",                            "MK Shooting Gallery",                                      RHT_MARKET_SHOOTING_GALLERY_REWARD,                              RG_PROGRESSIVE_SLINGSHOT,             {},                                                     SpoilerCollectionCheck::ItemGetInf(13),                                                                                       SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
+    locationTable[RC_MARKET_10_BIG_POES] =                                             Location::Base(RC_MARKET_10_BIG_POES,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_MARKET_GUARD_HOUSE,           0x00,                                              0x0F, "10 Big Poes",                                 "MK 10 Big Poes",                                           RHT_MARKET_10_BIG_POES,                                          RG_EMPTY_BOTTLE,                      {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_10_BIG_POES),                                                                  SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_1] =                             Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_1,                            RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0x01, "Chest Game First Room Chest",                 "MK Chest Game First Room Chest",                           RHT_MARKET_TREASURE_CHEST_GAME_ITEM_1,                           RG_TREASURE_GAME_SMALL_KEY,           { Category::cChestMinigame },                                                                                                                                                         SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_2] =                             Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_2,                            RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0x03, "Chest Game Second Room Chest",                "MK Chest Game Second Room Chest",                          RHT_MARKET_TREASURE_CHEST_GAME_ITEM_2,                           RG_TREASURE_GAME_SMALL_KEY,           { Category::cChestMinigame },                                                                                                                                                         SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_3] =                             Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_3,                            RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0x05, "Chest Game Third Room Chest",                 "MK Chest Game Third Room Chest",                           RHT_MARKET_TREASURE_CHEST_GAME_ITEM_3,                           RG_TREASURE_GAME_SMALL_KEY,           { Category::cChestMinigame },                                                                                                                                                         SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_4] =                             Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_4,                            RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0x07, "Chest Game Fourth Room Chest",                "MK Chest Game Fourth Room Chest",                          RHT_MARKET_TREASURE_CHEST_GAME_ITEM_4,                           RG_TREASURE_GAME_SMALL_KEY,           { Category::cChestMinigame },                                                                                                                                                         SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_5] =                             Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_5,                            RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0x09, "Chest Game Fifth Room Chest",                 "MK Chest Game Fifth Room Chest",                           RHT_MARKET_TREASURE_CHEST_GAME_ITEM_5,                           RG_TREASURE_GAME_SMALL_KEY,           { Category::cChestMinigame },                                                                                                                                                         SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
     // Hyrule Castle
-    locationTable[RC_HC_MALON_EGG] =                                Location::Base(RC_HC_MALON_EGG,                         RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_HYRULE_CASTLE,         ACTOR_ID_MAX,    SCENE_HYRULE_CASTLE,             0x00,                         0x47, "Malon Egg",                         "HC Malon Egg",                         RHT_HC_MALON_EGG,                         RG_WEIRD_EGG,                {},                        SpoilerCollectionCheck::EventChkInf(0x12),         SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,  true);
-    locationTable[RC_HC_ZELDAS_LETTER] =                            Location::Base(RC_HC_ZELDAS_LETTER,                     RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_HYRULE_CASTLE,         ACTOR_ID_MAX,    SCENE_CASTLE_COURTYARD_ZELDA,    0x00,                         0x0B, "Zeldas Letter",                     "HC Zeldas Letter",                     RHT_HC_ZELDAS_LETTER,                     RG_ZELDAS_LETTER,            {},                        SpoilerCollectionCheck::EventChkInf(0x40),         SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,  true);
+    locationTable[RC_HC_MALON_EGG] =                                                   Location::Base(RC_HC_MALON_EGG,                                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_CASTLE,                ACTOR_ID_MAX,         SCENE_HYRULE_CASTLE,                0x00,                                              0x47, "Malon Egg",                                   "HC Malon Egg",                                             RHT_HC_MALON_EGG,                                                RG_WEIRD_EGG,                         {},                                                     SpoilerCollectionCheck::EventChkInf(0x12),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
+    locationTable[RC_HC_ZELDAS_LETTER] =                                               Location::Base(RC_HC_ZELDAS_LETTER,                                             RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_CASTLE,                ACTOR_ID_MAX,         SCENE_CASTLE_COURTYARD_ZELDA,       0x00,                                              0x0B, "Zeldas Letter",                               "HC Zeldas Letter",                                         RHT_HC_ZELDAS_LETTER,                                            RG_ZELDAS_LETTER,                     {},                                                     SpoilerCollectionCheck::EventChkInf(0x40),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
     // Kakariko
-    locationTable[RC_KAK_REDEAD_GROTTO_CHEST] =                    Location::Chest(RC_KAK_REDEAD_GROTTO_CHEST,              RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_EN_BOX,    SCENE_GROTTOS,                   31434,                        0x0A, "Redead Grotto Chest",               "Kak Redead Grotto Chest",              RHT_KAK_REDEAD_GROTTO_CHEST,              RG_HUGE_RUPEE,               {},                                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_OPEN_GROTTO_CHEST] =                      Location::Chest(RC_KAK_OPEN_GROTTO_CHEST,                RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_EN_BOX,    SCENE_GROTTOS,                   22984,                        0x08, "Open Grotto Chest",                 "Kak Open Grotto Chest",                RHT_KAK_OPEN_GROTTO_CHEST,                RG_RED_RUPEE,                {},                                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_10_GOLD_SKULLTULA_REWARD] =                Location::Base(RC_KAK_10_GOLD_SKULLTULA_REWARD,         RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_HOUSE_OF_SKULLTULA,        0x00,                         0x45, "10 Gold Skulltula Reward",          "Kak 10 Gold Skulltula Reward",         RHT_KAK_10_GOLD_SKULLTULA_REWARD,         RG_PROGRESSIVE_WALLET,       {},                        SpoilerCollectionCheck::EventChkInf(0xDA),         SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
-    locationTable[RC_KAK_20_GOLD_SKULLTULA_REWARD] =                Location::Base(RC_KAK_20_GOLD_SKULLTULA_REWARD,         RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_HOUSE_OF_SKULLTULA,        0x00,                         0x39, "20 Gold Skulltula Reward",          "Kak 20 Gold Skulltula Reward",         RHT_KAK_20_GOLD_SKULLTULA_REWARD,         RG_STONE_OF_AGONY,           {},                        SpoilerCollectionCheck::EventChkInf(0xDB),         SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
-    locationTable[RC_KAK_30_GOLD_SKULLTULA_REWARD] =                Location::Base(RC_KAK_30_GOLD_SKULLTULA_REWARD,         RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_HOUSE_OF_SKULLTULA,        0x00,                         0x46, "30 Gold Skulltula Reward",          "Kak 30 Gold Skulltula Reward",         RHT_KAK_30_GOLD_SKULLTULA_REWARD,         RG_PROGRESSIVE_WALLET,       {},                        SpoilerCollectionCheck::EventChkInf(0xDC),         SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
-    locationTable[RC_KAK_40_GOLD_SKULLTULA_REWARD] =                Location::Base(RC_KAK_40_GOLD_SKULLTULA_REWARD,         RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_HOUSE_OF_SKULLTULA,        0x00,                         0x03, "40 Gold Skulltula Reward",          "Kak 40 Gold Skulltula Reward",         RHT_KAK_40_GOLD_SKULLTULA_REWARD,         RG_BOMBCHU_10,               {},                        SpoilerCollectionCheck::EventChkInf(0xDD),         SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_50_GOLD_SKULLTULA_REWARD] =                Location::Base(RC_KAK_50_GOLD_SKULLTULA_REWARD,         RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_HOUSE_OF_SKULLTULA,        0x00,                         0x3E, "50 Gold Skulltula Reward",          "Kak 50 Gold Skulltula Reward",         RHT_KAK_50_GOLD_SKULLTULA_REWARD,         RG_PIECE_OF_HEART,           {},                        SpoilerCollectionCheck::EventChkInf(0xDE),         SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
-    locationTable[RC_KAK_100_GOLD_SKULLTULA_REWARD] =               Location::Base(RC_KAK_100_GOLD_SKULLTULA_REWARD,        RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_HOUSE_OF_SKULLTULA,        0x00,                         0x3E, "100 Gold Skulltula Reward",         "Kak 100 Gold Skulltula Reward",        RHT_KAK_100_GOLD_SKULLTULA_REWARD,        RG_HUGE_RUPEE,               {},                        SpoilerCollectionCheck::RandomizerInf(SCENE_HOUSE_OF_SKULLTULA, RAND_INF_KAK_100_GOLD_SKULLTULA_REWARD), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_MAN_ON_ROOF] =                             Location::Base(RC_KAK_MAN_ON_ROOF,                      RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_KAKARIKO_VILLAGE,          0x00,                         0x3E, "Man on Roof",                       "Kak Man on Roof",                      RHT_KAK_MAN_ON_ROOF,                      RG_PIECE_OF_HEART,           {},                        SpoilerCollectionCheck::ItemGetInf(29),            SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
-    locationTable[RC_KAK_SHOOTING_GALLERY_REWARD] =                 Location::Base(RC_KAK_SHOOTING_GALLERY_REWARD,          RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_SHOOTING_GALLERY,          0x00,                         0x30, "Shooting Gallery Reward",           "Kak Shooting Gallery Reward",          RHT_KAK_SHOOTING_GALLERY_REWARD,          RG_PROGRESSIVE_BOW,          {},                        SpoilerCollectionCheck::Chest(0x42, 0x1F),         SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
-    locationTable[RC_KAK_TRADE_ODD_MUSHROOM] =                      Location::Base(RC_KAK_TRADE_ODD_MUSHROOM,               RCQUEST_BOTH, RCTYPE_ADULT_TRADE, RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_POTION_SHOP_GRANNY,        0x00,                         0x20, "Trade Odd Mushroom",                "Kak Trade Odd Mushroom",               RHT_KAK_TRADE_ODD_MUSHROOM,               RG_ODD_POTION,               { Category::cAdultTrade }, SpoilerCollectionCheck::ItemGetInf(56),            SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
-    locationTable[RC_KAK_GRANNYS_SHOP] =                            Location::Base(RC_KAK_GRANNYS_SHOP,                     RCQUEST_BOTH, RCTYPE_MERCHANT,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_POTION_SHOP_GRANNY,        0x00,                         0x4E, "Granny's Shop",                     "Kak Granny's Shop",                    RHT_KAK_GRANNYS_SHOP,                     RG_BUY_BLUE_POTION,          {},                        SpoilerCollectionCheck::RandomizerInf(SCENE_POTION_SHOP_GRANNY, RAND_INF_MERCHANTS_GRANNYS_SHOP), SpoilerCollectionCheckGroup::GROUP_KAKARIKO, true);
-    locationTable[RC_KAK_ANJU_AS_ADULT] =                           Location::Base(RC_KAK_ANJU_AS_ADULT,                    RCQUEST_BOTH, RCTYPE_ADULT_TRADE, RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_KAKARIKO_VILLAGE,          0x00,                         0x1D, "Anju as Adult",                     "Kak Anju as Adult",                    RHT_KAK_ANJU_AS_ADULT,                    RG_CLAIM_CHECK,              {},                        SpoilerCollectionCheck::ItemGetInf(36),            SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
-    locationTable[RC_KAK_ANJU_AS_CHILD] =                           Location::Base(RC_KAK_ANJU_AS_CHILD,                    RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_KAKARIKO_VILLAGE,          0x00,                         0x0F, "Anju as Child",                     "Kak Anju as Child",                    RHT_KAK_ANJU_AS_CHILD,                    RG_EMPTY_BOTTLE,             {},                        SpoilerCollectionCheck::ItemGetInf(4),             SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
-    locationTable[RC_KAK_TRADE_POCKET_CUCCO] =                      Location::Base(RC_KAK_TRADE_POCKET_CUCCO,               RCQUEST_BOTH, RCTYPE_ADULT_TRADE, RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX,    SCENE_KAKARIKO_VILLAGE,          0x00,                         0x0E, "Trade Pocket Cucco",                "Kak Trade Pocket Cucco",               RHT_KAK_TRADE_POCKET_CUCCO,               RG_COJIRO,                   { Category::cAdultTrade }, SpoilerCollectionCheck::ItemGetInf(38),            SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
-    locationTable[RC_KAK_IMPAS_HOUSE_FREESTANDING_POH] =     Location::Collectable(RC_KAK_IMPAS_HOUSE_FREESTANDING_POH,     RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_EN_ITEM00, SCENE_IMPAS_HOUSE,               262,                          0x01, "Impas House Freestanding PoH",      "Kak Impas House Freestanding PoH",     RHT_KAK_IMPAS_HOUSE_FREESTANDING_POH,     RG_PIECE_OF_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
-    locationTable[RC_KAK_WINDMILL_FREESTANDING_POH] =        Location::Collectable(RC_KAK_WINDMILL_FREESTANDING_POH,        RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_KAKARIKO_VILLAGE,      ACTOR_EN_ITEM00, SCENE_WINDMILL_AND_DAMPES_GRAVE, 262,                          0x01, "Windmill Freestanding PoH",         "Kak Windmill Freestanding PoH",        RHT_KAK_WINDMILL_FREESTANDING_POH,        RG_PIECE_OF_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
+    locationTable[RC_KAK_REDEAD_GROTTO_CHEST] =                                       Location::Chest(RC_KAK_REDEAD_GROTTO_CHEST,                                      RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_BOX,         SCENE_GROTTOS,                      31434,                                             0x0A, "Redead Grotto Chest",                         "Kak Redead Grotto Chest",                                  RHT_KAK_REDEAD_GROTTO_CHEST,                                     RG_HUGE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_OPEN_GROTTO_CHEST] =                                         Location::Chest(RC_KAK_OPEN_GROTTO_CHEST,                                        RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_BOX,         SCENE_GROTTOS,                      22984,                                             0x08, "Open Grotto Chest",                           "Kak Open Grotto Chest",                                    RHT_KAK_OPEN_GROTTO_CHEST,                                       RG_RED_RUPEE,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_10_GOLD_SKULLTULA_REWARD] =                                   Location::Base(RC_KAK_10_GOLD_SKULLTULA_REWARD,                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_HOUSE_OF_SKULLTULA,           0x00,                                              0x45, "10 Gold Skulltula Reward",                    "Kak 10 Gold Skulltula Reward",                             RHT_KAK_10_GOLD_SKULLTULA_REWARD,                                RG_PROGRESSIVE_WALLET,                {},                                                     SpoilerCollectionCheck::EventChkInf(0xDA),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
+    locationTable[RC_KAK_20_GOLD_SKULLTULA_REWARD] =                                   Location::Base(RC_KAK_20_GOLD_SKULLTULA_REWARD,                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_HOUSE_OF_SKULLTULA,           0x00,                                              0x39, "20 Gold Skulltula Reward",                    "Kak 20 Gold Skulltula Reward",                             RHT_KAK_20_GOLD_SKULLTULA_REWARD,                                RG_STONE_OF_AGONY,                    {},                                                     SpoilerCollectionCheck::EventChkInf(0xDB),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
+    locationTable[RC_KAK_30_GOLD_SKULLTULA_REWARD] =                                   Location::Base(RC_KAK_30_GOLD_SKULLTULA_REWARD,                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_HOUSE_OF_SKULLTULA,           0x00,                                              0x46, "30 Gold Skulltula Reward",                    "Kak 30 Gold Skulltula Reward",                             RHT_KAK_30_GOLD_SKULLTULA_REWARD,                                RG_PROGRESSIVE_WALLET,                {},                                                     SpoilerCollectionCheck::EventChkInf(0xDC),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
+    locationTable[RC_KAK_40_GOLD_SKULLTULA_REWARD] =                                   Location::Base(RC_KAK_40_GOLD_SKULLTULA_REWARD,                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_HOUSE_OF_SKULLTULA,           0x00,                                              0x03, "40 Gold Skulltula Reward",                    "Kak 40 Gold Skulltula Reward",                             RHT_KAK_40_GOLD_SKULLTULA_REWARD,                                RG_BOMBCHU_10,                        {},                                                     SpoilerCollectionCheck::EventChkInf(0xDD),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_50_GOLD_SKULLTULA_REWARD] =                                   Location::Base(RC_KAK_50_GOLD_SKULLTULA_REWARD,                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_HOUSE_OF_SKULLTULA,           0x00,                                              0x3E, "50 Gold Skulltula Reward",                    "Kak 50 Gold Skulltula Reward",                             RHT_KAK_50_GOLD_SKULLTULA_REWARD,                                RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::EventChkInf(0xDE),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
+    locationTable[RC_KAK_100_GOLD_SKULLTULA_REWARD] =                                  Location::Base(RC_KAK_100_GOLD_SKULLTULA_REWARD,                                RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_HOUSE_OF_SKULLTULA,           0x00,                                              0x3E, "100 Gold Skulltula Reward",                   "Kak 100 Gold Skulltula Reward",                            RHT_KAK_100_GOLD_SKULLTULA_REWARD,                               RG_HUGE_RUPEE,                        {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_100_GOLD_SKULLTULA_REWARD),                                                SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_MAN_ON_ROOF] =                                                Location::Base(RC_KAK_MAN_ON_ROOF,                                              RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_KAKARIKO_VILLAGE,             0x00,                                              0x3E, "Man on Roof",                                 "Kak Man on Roof",                                          RHT_KAK_MAN_ON_ROOF,                                             RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::ItemGetInf(21),                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
+    locationTable[RC_KAK_SHOOTING_GALLERY_REWARD] =                                    Location::Base(RC_KAK_SHOOTING_GALLERY_REWARD,                                  RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_SHOOTING_GALLERY,             0x00,                                              0x30, "Shooting Gallery Reward",                     "Kak Shooting Gallery Reward",                              RHT_KAK_SHOOTING_GALLERY_REWARD,                                 RG_PROGRESSIVE_BOW,                   {},                                                     SpoilerCollectionCheck::Chest(0x42, 0x1F),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
+    locationTable[RC_KAK_TRADE_ODD_MUSHROOM] =                                         Location::Base(RC_KAK_TRADE_ODD_MUSHROOM,                                       RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_POTION_SHOP_GRANNY,           0x00,                                              0x20, "Trade Odd Mushroom",                          "Kak Trade Odd Mushroom",                                   RHT_KAK_TRADE_ODD_MUSHROOM,                                      RG_ODD_POTION,                        { Category::cAdultTrade },                              SpoilerCollectionCheck::ItemGetInf(48),                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
+    locationTable[RC_KAK_GRANNYS_SHOP] =                                               Location::Base(RC_KAK_GRANNYS_SHOP,                                             RCQUEST_BOTH,    RCTYPE_MERCHANT,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_POTION_SHOP_GRANNY,           0x00,                                              0x4E, "Granny's Shop",                               "Kak Granny's Shop",                                        RHT_KAK_GRANNYS_SHOP,                                            RG_BUY_BLUE_POTION,                   {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MERCHANTS_GRANNYS_SHOP),                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
+    locationTable[RC_KAK_ANJU_AS_ADULT] =                                              Location::Base(RC_KAK_ANJU_AS_ADULT,                                            RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_KAKARIKO_VILLAGE,             0x00,                                              0x1D, "Anju as Adult",                               "Kak Anju as Adult",                                        RHT_KAK_ANJU_AS_ADULT,                                           RG_CLAIM_CHECK,                       {},                                                     SpoilerCollectionCheck::ItemGetInf(44),                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
+    locationTable[RC_KAK_ANJU_AS_CHILD] =                                              Location::Base(RC_KAK_ANJU_AS_CHILD,                                            RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_KAKARIKO_VILLAGE,             0x00,                                              0x0F, "Anju as Child",                               "Kak Anju as Child",                                        RHT_KAK_ANJU_AS_CHILD,                                           RG_EMPTY_BOTTLE,                      {},                                                     SpoilerCollectionCheck::ItemGetInf(12),                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
+    locationTable[RC_KAK_TRADE_POCKET_CUCCO] =                                         Location::Base(RC_KAK_TRADE_POCKET_CUCCO,                                       RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_KAKARIKO_VILLAGE,             0x00,                                              0x0E, "Trade Pocket Cucco",                          "Kak Trade Pocket Cucco",                                   RHT_KAK_TRADE_POCKET_CUCCO,                                      RG_COJIRO,                            { Category::cAdultTrade },                              SpoilerCollectionCheck::ItemGetInf(46),                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
+    locationTable[RC_KAK_IMPAS_HOUSE_FREESTANDING_POH] =                        Location::Collectable(RC_KAK_IMPAS_HOUSE_FREESTANDING_POH,                             RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_ITEM00,      SCENE_IMPAS_HOUSE,                  262,                                               0x01, "Impas House Freestanding PoH",                "Kak Impas House Freestanding PoH",                         RHT_KAK_IMPAS_HOUSE_FREESTANDING_POH,                            RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
+    locationTable[RC_KAK_WINDMILL_FREESTANDING_POH] =                           Location::Collectable(RC_KAK_WINDMILL_FREESTANDING_POH,                                RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_ITEM00,      SCENE_WINDMILL_AND_DAMPES_GRAVE,    262,                                               0x01, "Windmill Freestanding PoH",                   "Kak Windmill Freestanding PoH",                            RHT_KAK_WINDMILL_FREESTANDING_POH,                               RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
     // Graveyard
-    locationTable[RC_GRAVEYARD_SHIELD_GRAVE_CHEST] =               Location::Chest(RC_GRAVEYARD_SHIELD_GRAVE_CHEST,         RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GRAVEYARD,             ACTOR_EN_BOX,    SCENE_GRAVE_WITH_FAIRYS_FOUNTAIN,21824,                        0x00, "Shield Grave Chest",                "GY Shield Grave Chest",                RHT_GRAVEYARD_SHIELD_GRAVE_CHEST,         RG_HYLIAN_SHIELD,            {},                                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_GRAVEYARD_HEART_PIECE_GRAVE_CHEST] =          Location::Chest(RC_GRAVEYARD_HEART_PIECE_GRAVE_CHEST,    RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GRAVEYARD,             ACTOR_EN_BOX,    SCENE_REDEAD_GRAVE,              -22592,                       0x00, "Heart Piece Grave Chest",           "GY Heart Piece Grave Chest",           RHT_GRAVEYARD_HEART_PIECE_GRAVE_CHEST,    RG_PIECE_OF_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
-    locationTable[RC_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST] =         Location::Chest(RC_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST,   RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GRAVEYARD,             ACTOR_EN_BOX,    SCENE_ROYAL_FAMILYS_TOMB,        -32736,                       0x00, "Composers Grave Chest",             "GY Composers Grave Chest",             RHT_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST,   RG_BOMBS_5,                  {},                                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_GRAVEYARD_HOOKSHOT_CHEST] =                   Location::Chest(RC_GRAVEYARD_HOOKSHOT_CHEST,             RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GRAVEYARD,             ACTOR_EN_BOX,    SCENE_WINDMILL_AND_DAMPES_GRAVE, 4352,                         0x00, "Hookshot Chest",                    "GY Hookshot Chest",                    RHT_GRAVEYARD_HOOKSHOT_CHEST,             RG_PROGRESSIVE_HOOKSHOT,     {},                                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
-    locationTable[RC_GRAVEYARD_FREESTANDING_POH] =           Location::Collectable(RC_GRAVEYARD_FREESTANDING_POH,           RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GRAVEYARD,             ACTOR_EN_ITEM00, SCENE_GRAVEYARD,                 1030,                         0x04, "Freestanding PoH",                  "GY Freestanding PoH",                  RHT_GRAVEYARD_FREESTANDING_POH,           RG_PIECE_OF_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
-    locationTable[RC_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH] =Location::Collectable(RC_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH,RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GRAVEYARD,             ACTOR_EN_ITEM00, SCENE_WINDMILL_AND_DAMPES_GRAVE, 1798,                         0x07, "Dampe Race Freestanding PoH",       "GY Dampe Race Freestanding PoH",       RHT_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH,RG_PIECE_OF_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
-    locationTable[RC_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR] =    Location::Collectable(RC_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR,    RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GRAVEYARD,             ACTOR_EN_ITEM00, SCENE_GRAVEYARD,                 6406,                         0x08, "Dampe Gravedigging Tour",           "GY Dampe Gravedigging Tour",           RHT_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR,    RG_PIECE_OF_HEART,           {},                        SpoilerCollectionCheck::Gravedigger(0x53, 0x1F),   SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       true);
+    locationTable[RC_GRAVEYARD_SHIELD_GRAVE_CHEST] =                                  Location::Chest(RC_GRAVEYARD_SHIELD_GRAVE_CHEST,                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GRAVEYARD,                    ACTOR_EN_BOX,         SCENE_GRAVE_WITH_FAIRYS_FOUNTAIN,   21824,                                             0x00, "Shield Grave Chest",                          "GY Shield Grave Chest",                                    RHT_GRAVEYARD_SHIELD_GRAVE_CHEST,                                RG_HYLIAN_SHIELD,                     {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_GRAVEYARD_HEART_PIECE_GRAVE_CHEST] =                             Location::Chest(RC_GRAVEYARD_HEART_PIECE_GRAVE_CHEST,                            RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GRAVEYARD,                    ACTOR_EN_BOX,         SCENE_REDEAD_GRAVE,                 -22592,                                            0x00, "Heart Piece Grave Chest",                     "GY Heart Piece Grave Chest",                               RHT_GRAVEYARD_HEART_PIECE_GRAVE_CHEST,                           RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
+    locationTable[RC_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST] =                            Location::Chest(RC_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST,                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GRAVEYARD,                    ACTOR_EN_BOX,         SCENE_ROYAL_FAMILYS_TOMB,           -32736,                                            0x00, "Composers Grave Chest",                       "GY Composers Grave Chest",                                 RHT_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST,                          RG_BOMBS_5,                           {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_GRAVEYARD_HOOKSHOT_CHEST] =                                      Location::Chest(RC_GRAVEYARD_HOOKSHOT_CHEST,                                     RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GRAVEYARD,                    ACTOR_EN_BOX,         SCENE_WINDMILL_AND_DAMPES_GRAVE,    4352,                                              0x00, "Hookshot Chest",                              "GY Hookshot Chest",                                        RHT_GRAVEYARD_HOOKSHOT_CHEST,                                    RG_PROGRESSIVE_HOOKSHOT,              {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
+    locationTable[RC_GRAVEYARD_FREESTANDING_POH] =                              Location::Collectable(RC_GRAVEYARD_FREESTANDING_POH,                                   RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GRAVEYARD,                    ACTOR_EN_ITEM00,      SCENE_GRAVEYARD,                    1030,                                              0x04, "Freestanding PoH",                            "GY Freestanding PoH",                                      RHT_GRAVEYARD_FREESTANDING_POH,                                  RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
+    locationTable[RC_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH] =                   Location::Collectable(RC_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH,                        RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GRAVEYARD,                    ACTOR_EN_ITEM00,      SCENE_WINDMILL_AND_DAMPES_GRAVE,    1798,                                              0x07, "Dampe Race Freestanding PoH",                 "GY Dampe Race Freestanding PoH",                           RHT_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH,                       RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
+    locationTable[RC_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR] =                       Location::Collectable(RC_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR,                            RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GRAVEYARD,                    ACTOR_EN_ITEM00,      SCENE_GRAVEYARD,                    6406,                                              0x19, "Dampe Gravedigging Tour",                     "GY Dampe Gravedigging Tour",                               RHT_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR,                           RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
     // Death Mountain
-    locationTable[RC_DMT_CHEST] =                                  Location::Chest(RC_DMT_CHEST,                            RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_DEATH_MOUNTAIN_TRAIL,  ACTOR_EN_BOX,    SCENE_DEATH_MOUNTAIN_TRAIL,      23201,                        0x01, "Chest",                             "DMT Chest",                            RHT_DMT_CHEST,                            RG_PURPLE_RUPEE,             {},                                                                           SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMT_STORMS_GROTTO_CHEST] =                    Location::Chest(RC_DMT_STORMS_GROTTO_CHEST,              RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_DEATH_MOUNTAIN_TRAIL,  ACTOR_EN_BOX,    SCENE_GROTTOS,                   23255,                        0x17, "Storms Grotto Chest",               "DMT Storms Grotto Chest",              RHT_DMT_STORMS_GROTTO_CHEST,              RG_HUGE_RUPEE,               {},                                                                           SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMT_TRADE_BROKEN_SWORD] =                      Location::Base(RC_DMT_TRADE_BROKEN_SWORD,               RCQUEST_BOTH, RCTYPE_ADULT_TRADE, RCAREA_DEATH_MOUNTAIN_TRAIL,  ACTOR_ID_MAX,    SCENE_DEATH_MOUNTAIN_TRAIL,      0x00,                         0x23, "Trade Broken Sword",                "DMT Trade Broken Sword",               RHT_DMT_TRADE_BROKEN_SWORD,               RG_PRESCRIPTION,             { Category::cAdultTrade }, SpoilerCollectionCheck::RandomizerInf(0x60, 0x1D), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN, true);
-    locationTable[RC_DMT_TRADE_EYEDROPS] =                          Location::Base(RC_DMT_TRADE_EYEDROPS,                   RCQUEST_BOTH, RCTYPE_ADULT_TRADE, RCAREA_DEATH_MOUNTAIN_TRAIL,  ACTOR_ID_MAX,    SCENE_DEATH_MOUNTAIN_TRAIL,      0x00,                         0x26, "Trade Eyedrops",                    "DMT Trade Eyedrops",                   RHT_DMT_TRADE_EYEDROPS,                   RG_CLAIM_CHECK,              { Category::cAdultTrade }, SpoilerCollectionCheck::RandomizerInf(0x60, 0x1E), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN, true);
-    locationTable[RC_DMT_TRADE_CLAIM_CHECK] =                       Location::Base(RC_DMT_TRADE_CLAIM_CHECK,                RCQUEST_BOTH, RCTYPE_ADULT_TRADE, RCAREA_DEATH_MOUNTAIN_TRAIL,  ACTOR_ID_MAX,    SCENE_DEATH_MOUNTAIN_TRAIL,      0x00,                         0x57, "Trade Claim Check",                 "DMT Trade Claim Check",                RHT_DMT_TRADE_CLAIM_CHECK,                RG_BIGGORON_SWORD,           {},                        SpoilerCollectionCheck::Chest(0x60, 0x1F),         SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN, true);
-    locationTable[RC_DMT_FREESTANDING_POH] =                 Location::Collectable(RC_DMT_FREESTANDING_POH,                 RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_DEATH_MOUNTAIN_TRAIL,  ACTOR_EN_ITEM00, SCENE_DEATH_MOUNTAIN_TRAIL,      7686,                         0x1E, "Freestanding PoH",                  "DMT Freestanding PoH",                 RHT_DMT_FREESTANDING_POH,                 RG_PIECE_OF_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN, true);
+    locationTable[RC_DMT_CHEST] =                                                     Location::Chest(RC_DMT_CHEST,                                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_EN_BOX,         SCENE_DEATH_MOUNTAIN_TRAIL,         23201,                                             0x01, "Chest",                                       "DMT Chest",                                                RHT_DMT_CHEST,                                                   RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMT_STORMS_GROTTO_CHEST] =                                       Location::Chest(RC_DMT_STORMS_GROTTO_CHEST,                                      RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_EN_BOX,         SCENE_GROTTOS,                      23255,                                             0x17, "Storms Grotto Chest",                         "DMT Storms Grotto Chest",                                  RHT_DMT_STORMS_GROTTO_CHEST,                                     RG_HUGE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMT_TRADE_BROKEN_SWORD] =                                         Location::Base(RC_DMT_TRADE_BROKEN_SWORD,                                       RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_ID_MAX,         SCENE_DEATH_MOUNTAIN_TRAIL,         0x00,                                              0x23, "Trade Broken Sword",                          "DMT Trade Broken Sword",                                   RHT_DMT_TRADE_BROKEN_SWORD,                                      RG_PRESCRIPTION,                      { Category::cAdultTrade },                              SpoilerCollectionCheck::RandomizerInf(RAND_INF_ADULT_TRADES_DMT_TRADE_BROKEN_SWORD),                                          SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,             true);
+    locationTable[RC_DMT_TRADE_EYEDROPS] =                                             Location::Base(RC_DMT_TRADE_EYEDROPS,                                           RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_ID_MAX,         SCENE_DEATH_MOUNTAIN_TRAIL,         0x00,                                              0x26, "Trade Eyedrops",                              "DMT Trade Eyedrops",                                       RHT_DMT_TRADE_EYEDROPS,                                          RG_CLAIM_CHECK,                       { Category::cAdultTrade },                              SpoilerCollectionCheck::RandomizerInf(RAND_INF_ADULT_TRADES_DMT_TRADE_EYEDROPS),                                              SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,             true);
+    locationTable[RC_DMT_TRADE_CLAIM_CHECK] =                                          Location::Base(RC_DMT_TRADE_CLAIM_CHECK,                                        RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_ID_MAX,         SCENE_DEATH_MOUNTAIN_TRAIL,         0x00,                                              0x57, "Trade Claim Check",                           "DMT Trade Claim Check",                                    RHT_DMT_TRADE_CLAIM_CHECK,                                       RG_BIGGORON_SWORD,                    {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ADULT_TRADES_DMT_TRADE_CLAIM_CHECK),                                           SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,             true);
+    locationTable[RC_DMT_FREESTANDING_POH] =                                    Location::Collectable(RC_DMT_FREESTANDING_POH,                                         RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_EN_ITEM00,      SCENE_DEATH_MOUNTAIN_TRAIL,         7686,                                              0x1E, "Freestanding PoH",                            "DMT Freestanding PoH",                                     RHT_DMT_FREESTANDING_POH,                                        RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,             true);
     // Goron City
-    locationTable[RC_GC_MAZE_LEFT_CHEST] =                         Location::Chest(RC_GC_MAZE_LEFT_CHEST,                   RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GORON_CITY,            ACTOR_EN_BOX,    SCENE_GORON_CITY,                23232,                        0x00, "Maze Left Chest",                   "GC Maze Left Chest",                   RHT_GC_MAZE_LEFT_CHEST,                   RG_HUGE_RUPEE,               {},                                                                           SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_MAZE_RIGHT_CHEST] =                        Location::Chest(RC_GC_MAZE_RIGHT_CHEST,                  RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GORON_CITY,            ACTOR_EN_BOX,    SCENE_GORON_CITY,                23201,                        0x01, "Maze Right Chest",                  "GC Maze Right Chest",                  RHT_GC_MAZE_RIGHT_CHEST,                  RG_PURPLE_RUPEE,             {},                                                                           SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_MAZE_CENTER_CHEST] =                       Location::Chest(RC_GC_MAZE_CENTER_CHEST,                 RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GORON_CITY,            ACTOR_EN_BOX,    SCENE_GORON_CITY,                23202,                        0x02, "Maze Center Chest",                 "GC Maze Center Chest",                 RHT_GC_MAZE_CENTER_CHEST,                 RG_PURPLE_RUPEE,             {},                                                                           SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_ROLLING_GORON_AS_CHILD] =                   Location::Base(RC_GC_ROLLING_GORON_AS_CHILD,            RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GORON_CITY,            ACTOR_ID_MAX,    SCENE_GORON_CITY,                0x00,                         0x34, "Rolling Goron as Child",            "GC Rolling Goron as Child",            RHT_GC_ROLLING_GORON_AS_CHILD,            RG_PROGRESSIVE_BOMB_BAG,     {},                        SpoilerCollectionCheck::InfTable(0x11, 0x06),      SpoilerCollectionCheckGroup::GROUP_GORON_CITY,     true);
-    locationTable[RC_GC_ROLLING_GORON_AS_ADULT] =                   Location::Base(RC_GC_ROLLING_GORON_AS_ADULT,            RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GORON_CITY,            ACTOR_ID_MAX,    SCENE_GORON_CITY,                0x00,                         0x2C, "Rolling Goron as Adult",            "GC Rolling Goron as Adult",            RHT_GC_ROLLING_GORON_AS_ADULT,            RG_GORON_TUNIC,              {},                        SpoilerCollectionCheck::InfTable(0x10, 0x01),      SpoilerCollectionCheckGroup::GROUP_GORON_CITY,     true);
-    locationTable[RC_GC_DARUNIAS_JOY] =                             Location::Base(RC_GC_DARUNIAS_JOY,                      RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GORON_CITY,            ACTOR_ID_MAX,    SCENE_GORON_CITY,                0x00,                         0x54, "Darunias Joy",                      "GC Darunias Joy",                      RHT_GC_DARUNIAS_JOY,                      RG_PROGRESSIVE_STRENGTH,     {},                        SpoilerCollectionCheck::Chest(0x62, 0x1E),         SpoilerCollectionCheckGroup::GROUP_GORON_CITY,     true);
-    locationTable[RC_GC_POT_FREESTANDING_POH] =              Location::Collectable(RC_GC_POT_FREESTANDING_POH,              RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_GORON_CITY,            ACTOR_EN_ITEM00, SCENE_GORON_CITY,                7942,                         0x1F, "Pot Freestanding PoH",              "GC Pot Freestanding PoH",              RHT_GC_POT_FREESTANDING_POH,              RG_PIECE_OF_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_GORON_CITY,     true);
-    locationTable[RC_GC_DEKU_SCRUB_GROTTO_LEFT] =            Location::GrottoScrub(RC_GC_DEKU_SCRUB_GROTTO_LEFT,            RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_GORON_CITY,            ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x00, 0xFB), 0x30, "Deku Scrub Grotto Left",            "GC Deku Scrub Grotto Left",            RHT_GC_DEKU_SCRUB_GROTTO_LEFT,            RG_BUY_DEKU_NUTS_5,          { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x25, 0x01),         SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_DEKU_SCRUB_GROTTO_RIGHT] =           Location::GrottoScrub(RC_GC_DEKU_SCRUB_GROTTO_RIGHT,           RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_GORON_CITY,            ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x05, 0xFB), 0x37, "Deku Scrub Grotto Right",           "GC Deku Scrub Grotto Right",           RHT_GC_DEKU_SCRUB_GROTTO_RIGHT,           RG_BUY_BOMBS_535,            { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x25, 0x06),         SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_DEKU_SCRUB_GROTTO_CENTER] =          Location::GrottoScrub(RC_GC_DEKU_SCRUB_GROTTO_CENTER,          RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_GORON_CITY,            ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x03, 0xFB), 0x33, "Deku Scrub Grotto Center",          "GC Deku Scrub Grotto Center",          RHT_GC_DEKU_SCRUB_GROTTO_CENTER,          RG_BUY_ARROWS_30,            { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x25, 0x04),         SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_MEDIGORON] =                                Location::Base(RC_GC_MEDIGORON,                         RCQUEST_BOTH, RCTYPE_MERCHANT,    RCAREA_GORON_CITY,            ACTOR_ID_MAX,    SCENE_GORON_CITY,                0x00,                         0x51, "Medigoron",                         "GC Medigoron",                         RHT_GC_MEDIGORON,                         RG_GIANTS_KNIFE,             { Category::cMerchant },   SpoilerCollectionCheck::Merchant(0x62, 0x87),      SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_MAZE_LEFT_CHEST] =                                            Location::Chest(RC_GC_MAZE_LEFT_CHEST,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GORON_CITY,                   ACTOR_EN_BOX,         SCENE_GORON_CITY,                   23232,                                             0x00, "Maze Left Chest",                             "GC Maze Left Chest",                                       RHT_GC_MAZE_LEFT_CHEST,                                          RG_HUGE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_MAZE_RIGHT_CHEST] =                                           Location::Chest(RC_GC_MAZE_RIGHT_CHEST,                                          RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GORON_CITY,                   ACTOR_EN_BOX,         SCENE_GORON_CITY,                   23201,                                             0x01, "Maze Right Chest",                            "GC Maze Right Chest",                                      RHT_GC_MAZE_RIGHT_CHEST,                                         RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_MAZE_CENTER_CHEST] =                                          Location::Chest(RC_GC_MAZE_CENTER_CHEST,                                         RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GORON_CITY,                   ACTOR_EN_BOX,         SCENE_GORON_CITY,                   23202,                                             0x02, "Maze Center Chest",                           "GC Maze Center Chest",                                     RHT_GC_MAZE_CENTER_CHEST,                                        RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_ROLLING_GORON_AS_CHILD] =                                      Location::Base(RC_GC_ROLLING_GORON_AS_CHILD,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GORON_CITY,                   ACTOR_ID_MAX,         SCENE_GORON_CITY,                   0x00,                                              0x34, "Rolling Goron as Child",                      "GC Rolling Goron as Child",                                RHT_GC_ROLLING_GORON_AS_CHILD,                                   RG_PROGRESSIVE_BOMB_BAG,              {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ROLLING_GORON_AS_CHILD),                                                       SpoilerCollectionCheckGroup::GROUP_GORON_CITY,                 true);
+    locationTable[RC_GC_ROLLING_GORON_AS_ADULT] =                                      Location::Base(RC_GC_ROLLING_GORON_AS_ADULT,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GORON_CITY,                   ACTOR_ID_MAX,         SCENE_GORON_CITY,                   0x00,                                              0x2C, "Rolling Goron as Adult",                      "GC Rolling Goron as Adult",                                RHT_GC_ROLLING_GORON_AS_ADULT,                                   RG_GORON_TUNIC,                       {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ROLLING_GORON_AS_ADULT),                                                       SpoilerCollectionCheckGroup::GROUP_GORON_CITY,                 true);
+    locationTable[RC_GC_DARUNIAS_JOY] =                                                Location::Base(RC_GC_DARUNIAS_JOY,                                              RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GORON_CITY,                   ACTOR_ID_MAX,         SCENE_GORON_CITY,                   0x00,                                              0x54, "Darunias Joy",                                "GC Darunias Joy",                                          RHT_GC_DARUNIAS_JOY,                                             RG_PROGRESSIVE_STRENGTH,              {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DARUNIAS_JOY),                                                                 SpoilerCollectionCheckGroup::GROUP_GORON_CITY,                 true);
+    locationTable[RC_GC_POT_FREESTANDING_POH] =                                 Location::Collectable(RC_GC_POT_FREESTANDING_POH,                                      RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GORON_CITY,                   ACTOR_EN_ITEM00,      SCENE_GORON_CITY,                   7942,                                              0x1F, "Pot Freestanding PoH",                        "GC Pot Freestanding PoH",                                  RHT_GC_POT_FREESTANDING_POH,                                     RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GORON_CITY,                 true);
+    locationTable[RC_GC_DEKU_SCRUB_GROTTO_LEFT] =                               Location::GrottoScrub(RC_GC_DEKU_SCRUB_GROTTO_LEFT,                                    RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_GORON_CITY,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x00, 0xFB),                      0x30, "Deku Scrub Grotto Left",                      "GC Deku Scrub Grotto Left",                                RHT_GC_DEKU_SCRUB_GROTTO_LEFT,                                   RG_BUY_DEKU_NUTS_5,                   { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GC_DEKU_SCRUB_GROTTO_LEFT),                                   SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_DEKU_SCRUB_GROTTO_RIGHT] =                              Location::GrottoScrub(RC_GC_DEKU_SCRUB_GROTTO_RIGHT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_GORON_CITY,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x05, 0xFB),                      0x37, "Deku Scrub Grotto Right",                     "GC Deku Scrub Grotto Right",                               RHT_GC_DEKU_SCRUB_GROTTO_RIGHT,                                  RG_BUY_BOMBS_535,                     { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GC_DEKU_SCRUB_GROTTO_RIGHT),                                  SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_DEKU_SCRUB_GROTTO_CENTER] =                             Location::GrottoScrub(RC_GC_DEKU_SCRUB_GROTTO_CENTER,                                  RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_GORON_CITY,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x03, 0xFB),                      0x33, "Deku Scrub Grotto Center",                    "GC Deku Scrub Grotto Center",                              RHT_GC_DEKU_SCRUB_GROTTO_CENTER,                                 RG_BUY_ARROWS_30,                     { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GC_DEKU_SCRUB_GROTTO_CENTER),                                 SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_MEDIGORON] =                                                   Location::Base(RC_GC_MEDIGORON,                                                 RCQUEST_BOTH,    RCTYPE_MERCHANT,                    RCAREA_GORON_CITY,                   ACTOR_ID_MAX,         SCENE_GORON_CITY,                   0x00,                                              0x51, "Medigoron",                                   "GC Medigoron",                                             RHT_GC_MEDIGORON,                                                RG_GIANTS_KNIFE,                      { Category::cMerchant },                                SpoilerCollectionCheck::RandomizerInf(RAND_INF_MERCHANTS_MEDIGORON),                                                          SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
     // Death Mountain Crater
-    locationTable[RC_DMC_UPPER_GROTTO_CHEST] =                     Location::Chest(RC_DMC_UPPER_GROTTO_CHEST,               RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_DEATH_MOUNTAIN_CRATER, ACTOR_EN_BOX,    SCENE_GROTTOS,                   23802,                        0x1A, "Upper Grotto Chest",                "DMC Upper Grotto Chest",               RHT_DMC_UPPER_GROTTO_CHEST,               RG_BOMBS_20,                 {},                                                                           SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMC_WALL_FREESTANDING_POH] =            Location::Collectable(RC_DMC_WALL_FREESTANDING_POH,            RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_DEATH_MOUNTAIN_CRATER, ACTOR_EN_ITEM00, SCENE_DEATH_MOUNTAIN_CRATER,     518,                          0x02, "Wall Freestanding PoH",             "DMC Wall Freestanding PoH",            RHT_DMC_WALL_FREESTANDING_POH,            RG_PIECE_OF_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN, true);
-    locationTable[RC_DMC_VOLCANO_FREESTANDING_POH] =         Location::Collectable(RC_DMC_VOLCANO_FREESTANDING_POH,         RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_DEATH_MOUNTAIN_CRATER, ACTOR_EN_ITEM00, SCENE_DEATH_MOUNTAIN_CRATER,     2054,                         0x08, "Volcano Freestanding PoH",          "DMC Volcano Freestanding PoH",         RHT_DMC_WALL_FREESTANDING_POH,            RG_PIECE_OF_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN, true);
-    locationTable[RC_DMC_DEKU_SCRUB] =                              Location::Base(RC_DMC_DEKU_SCRUB,                       RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_DEATH_MOUNTAIN_CRATER, ACTOR_EN_DNS,    SCENE_DEATH_MOUNTAIN_CRATER,     0x05,                         0x37, "Deku Scrub",                        "DMC Deku Scrub",                       RHT_DMC_DEKU_SCRUB,                       RG_BUY_BOMBS_535,            { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x61, 0x06),         SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMC_DEKU_SCRUB_GROTTO_LEFT] =           Location::GrottoScrub(RC_DMC_DEKU_SCRUB_GROTTO_LEFT,           RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_DEATH_MOUNTAIN_CRATER, ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x00, 0xF9), 0x30, "Deku Scrub Grotto Left",            "DMC Deku Scrub Grotto Left",           RHT_DMC_DEKU_SCRUB_GROTTO_LEFT,           RG_BUY_DEKU_NUTS_5,          { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x23, 0x01),         SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMC_DEKU_SCRUB_GROTTO_RIGHT] =          Location::GrottoScrub(RC_DMC_DEKU_SCRUB_GROTTO_RIGHT,          RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_DEATH_MOUNTAIN_CRATER, ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x05, 0xF9), 0x37, "Deku Scrub Grotto Right",           "DMC Deku Scrub Grotto Right",          RHT_DMC_DEKU_SCRUB_GROTTO_RIGHT,          RG_BUY_BOMBS_535,            { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x23, 0x06),         SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMC_DEKU_SCRUB_GROTTO_CENTER] =         Location::GrottoScrub(RC_DMC_DEKU_SCRUB_GROTTO_CENTER,         RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_DEATH_MOUNTAIN_CRATER, ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x03, 0xF9), 0x33, "Deku Scrub Grotto Center",          "DMC Deku Scrub Grotto Center",         RHT_DMC_DEKU_SCRUB_GROTTO_CENTER,         RG_BUY_ARROWS_30,            { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x23, 0x04),         SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMC_UPPER_GROTTO_CHEST] =                                        Location::Chest(RC_DMC_UPPER_GROTTO_CHEST,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_EN_BOX,         SCENE_GROTTOS,                      23802,                                             0x1A, "Upper Grotto Chest",                          "DMC Upper Grotto Chest",                                   RHT_DMC_UPPER_GROTTO_CHEST,                                      RG_BOMBS_20,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMC_WALL_FREESTANDING_POH] =                               Location::Collectable(RC_DMC_WALL_FREESTANDING_POH,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_EN_ITEM00,      SCENE_DEATH_MOUNTAIN_CRATER,        518,                                               0x02, "Wall Freestanding PoH",                       "DMC Wall Freestanding PoH",                                RHT_DMC_WALL_FREESTANDING_POH,                                   RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,             true);
+    locationTable[RC_DMC_VOLCANO_FREESTANDING_POH] =                            Location::Collectable(RC_DMC_VOLCANO_FREESTANDING_POH,                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_EN_ITEM00,      SCENE_DEATH_MOUNTAIN_CRATER,        2054,                                              0x08, "Volcano Freestanding PoH",                    "DMC Volcano Freestanding PoH",                             RHT_DMC_WALL_FREESTANDING_POH,                                   RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,             true);
+    locationTable[RC_DMC_DEKU_SCRUB] =                                                 Location::Base(RC_DMC_DEKU_SCRUB,                                               RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_EN_DNS,         SCENE_DEATH_MOUNTAIN_CRATER,        0x05,                                              0x37, "Deku Scrub",                                  "DMC Deku Scrub",                                           RHT_DMC_DEKU_SCRUB,                                              RG_BUY_BOMBS_535,                     { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB),                                              SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMC_DEKU_SCRUB_GROTTO_LEFT] =                              Location::GrottoScrub(RC_DMC_DEKU_SCRUB_GROTTO_LEFT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x00, 0xF9),                      0x30, "Deku Scrub Grotto Left",                      "DMC Deku Scrub Grotto Left",                               RHT_DMC_DEKU_SCRUB_GROTTO_LEFT,                                  RG_BUY_DEKU_NUTS_5,                   { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB_GROTTO_LEFT),                                  SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMC_DEKU_SCRUB_GROTTO_RIGHT] =                             Location::GrottoScrub(RC_DMC_DEKU_SCRUB_GROTTO_RIGHT,                                  RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x05, 0xF9),                      0x37, "Deku Scrub Grotto Right",                     "DMC Deku Scrub Grotto Right",                              RHT_DMC_DEKU_SCRUB_GROTTO_RIGHT,                                 RG_BUY_BOMBS_535,                     { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB_GROTTO_RIGHT),                                 SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMC_DEKU_SCRUB_GROTTO_CENTER] =                            Location::GrottoScrub(RC_DMC_DEKU_SCRUB_GROTTO_CENTER,                                 RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x03, 0xF9),                      0x33, "Deku Scrub Grotto Center",                    "DMC Deku Scrub Grotto Center",                             RHT_DMC_DEKU_SCRUB_GROTTO_CENTER,                                RG_BUY_ARROWS_30,                     { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB_GROTTO_CENTER),                                SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
     // Zoras River
-    locationTable[RC_ZR_OPEN_GROTTO_CHEST] =                       Location::Chest(RC_ZR_OPEN_GROTTO_CHEST,                 RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_ZORAS_RIVER,           ACTOR_EN_BOX,    SCENE_GROTTOS,                   22985,                        0x09, "Open Grotto Chest",                 "ZR Open Grotto Chest",                 RHT_ZR_OPEN_GROTTO_CHEST,                 RG_RED_RUPEE,                {},                                                                           SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZR_MAGIC_BEAN_SALESMAN] =                      Location::Base(RC_ZR_MAGIC_BEAN_SALESMAN,               RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_ZORAS_RIVER,           ACTOR_ID_MAX,    SCENE_ZORAS_RIVER,               0x00,                         0x16, "Magic Bean Salesman",               "ZR Magic Bean Salesman",               RHT_ZR_MAGIC_BEAN_SALESMAN,               RG_MAGIC_BEAN,               {},                        SpoilerCollectionCheck::MagicBeans(0x54, 0x01),    SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,    true);
-    locationTable[RC_ZR_FROGS_ZELDAS_LULLABY] =                     Location::Base(RC_ZR_FROGS_ZELDAS_LULLABY,              RCQUEST_BOTH, RCTYPE_FROG_SONG,   RCAREA_ZORAS_RIVER,           ACTOR_EN_FR,     SCENE_ZORAS_RIVER,               0x00,                         0x3E, "Frogs Zelda's Lullaby",             "ZR Frogs Zelda's Lullaby",             RHT_ZR_FROGS_ZELDAS_LULLABY,              RG_PURPLE_RUPEE,             {},                        SpoilerCollectionCheck::EventChkInf(0xD1),         SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZR_FROGS_EPONAS_SONG] =                        Location::Base(RC_ZR_FROGS_EPONAS_SONG,                 RCQUEST_BOTH, RCTYPE_FROG_SONG,   RCAREA_ZORAS_RIVER,           ACTOR_EN_FR,     SCENE_ZORAS_RIVER,               0x00,                         0x3E, "Frogs Epona's Song",                "ZR Frogs Epona's Song",                RHT_ZR_FROGS_EPONAS_SONG,                 RG_PURPLE_RUPEE,             {},                        SpoilerCollectionCheck::EventChkInf(0xD2),         SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZR_FROGS_SARIAS_SONG] =                        Location::Base(RC_ZR_FROGS_SARIAS_SONG,                 RCQUEST_BOTH, RCTYPE_FROG_SONG,   RCAREA_ZORAS_RIVER,           ACTOR_EN_FR,     SCENE_ZORAS_RIVER,               0x00,                         0x3E, "Frogs Saria's Song",                "ZR Frogs Saria's Song",                RHT_ZR_FROGS_SARIAS_SONG,                 RG_PURPLE_RUPEE,             {},                        SpoilerCollectionCheck::EventChkInf(0xD4),         SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZR_FROGS_SUNS_SONG] =                          Location::Base(RC_ZR_FROGS_SUNS_SONG,                   RCQUEST_BOTH, RCTYPE_FROG_SONG,   RCAREA_ZORAS_RIVER,           ACTOR_EN_FR,     SCENE_ZORAS_RIVER,               0x00,                         0x3E, "Frogs Sun's Song",                  "ZR Frogs Sun's Song",                  RHT_ZR_FROGS_SUNS_SONG,                   RG_PURPLE_RUPEE,             {},                        SpoilerCollectionCheck::EventChkInf(0xD3),         SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZR_FROGS_SONG_OF_TIME] =                       Location::Base(RC_ZR_FROGS_SONG_OF_TIME,                RCQUEST_BOTH, RCTYPE_FROG_SONG,   RCAREA_ZORAS_RIVER,           ACTOR_EN_FR,     SCENE_ZORAS_RIVER,               0x00,                         0x3E, "Frogs Song of Time",                "ZR Frogs Song of Time",                RHT_ZR_FROGS_SONG_OF_TIME,                RG_PURPLE_RUPEE,             {},                        SpoilerCollectionCheck::EventChkInf(0xD5),         SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZR_FROGS_IN_THE_RAIN] =                        Location::Base(RC_ZR_FROGS_IN_THE_RAIN,                 RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_ZORAS_RIVER,           ACTOR_EN_FR,     SCENE_ZORAS_RIVER,               0x00,                         0x3E, "Frogs in the Rain",                 "ZR Frogs in the Rain",                 RHT_ZR_FROGS_IN_THE_RAIN,                 RG_PIECE_OF_HEART,           {},                        SpoilerCollectionCheck::EventChkInf(0xD6),         SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,    true);
-    locationTable[RC_ZR_FROGS_OCARINA_GAME] =                       Location::Base(RC_ZR_FROGS_OCARINA_GAME,                RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_ZORAS_RIVER,           ACTOR_EN_FR,     SCENE_ZORAS_RIVER,               0x00,                         0x76, "Frogs Ocarina Game",                "ZR Frogs Ocarina Game",                RHT_ZR_FROGS_OCARINA_GAME,                RG_PIECE_OF_HEART,           {},                        SpoilerCollectionCheck::EventChkInf(0xD0),         SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,    true);
-    locationTable[RC_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH] = Location::Collectable(RC_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH, RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_ZORAS_RIVER,           ACTOR_EN_ITEM00, SCENE_ZORAS_RIVER,               1030,                         0x04, "Near Open Grotto Freestanding PoH", "ZR Near Open Grotto Freestanding PoH", RHT_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH, RG_PIECE_OF_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,    true);
-    locationTable[RC_ZR_NEAR_DOMAIN_FREESTANDING_POH] =      Location::Collectable(RC_ZR_NEAR_DOMAIN_FREESTANDING_POH,      RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_ZORAS_RIVER,           ACTOR_EN_ITEM00, SCENE_ZORAS_RIVER,               2822,                         0x0B, "Near Domain Freestanding PoH",      "ZR Near Domain Freestanding PoH",      RHT_ZR_NEAR_DOMAIN_FREESTANDING_POH,      RG_PIECE_OF_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,    true);
-    locationTable[RC_ZR_DEKU_SCRUB_GROTTO_REAR] =            Location::GrottoScrub(RC_ZR_DEKU_SCRUB_GROTTO_REAR,            RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_ZORAS_RIVER,           ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x07, 0xEB), 0x39, "Deku Scrub Grotto Rear",            "ZR Deku Scrub Grotto Rear",            RHT_ZR_DEKU_SCRUB_GROTTO_REAR,            RG_BUY_RED_POTION_30,        { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x15, 0x08),         SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZR_DEKU_SCRUB_GROTTO_FRONT] =           Location::GrottoScrub(RC_ZR_DEKU_SCRUB_GROTTO_FRONT,           RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_ZORAS_RIVER,           ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x08, 0xEB), 0x3A, "Deku Scrub Grotto Front",           "ZR Deku Scrub Grotto Front",           RHT_ZR_DEKU_SCRUB_GROTTO_FRONT,           RG_BUY_GREEN_POTION,         { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x15, 0x09),         SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZR_OPEN_GROTTO_CHEST] =                                          Location::Chest(RC_ZR_OPEN_GROTTO_CHEST,                                         RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_RIVER,                  ACTOR_EN_BOX,         SCENE_GROTTOS,                      22985,                                             0x09, "Open Grotto Chest",                           "ZR Open Grotto Chest",                                     RHT_ZR_OPEN_GROTTO_CHEST,                                        RG_RED_RUPEE,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZR_MAGIC_BEAN_SALESMAN] =                                         Location::Base(RC_ZR_MAGIC_BEAN_SALESMAN,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_RIVER,                  ACTOR_ID_MAX,         SCENE_ZORAS_RIVER,                  0x00,                                              0x16, "Magic Bean Salesman",                         "ZR Magic Bean Salesman",                                   RHT_ZR_MAGIC_BEAN_SALESMAN,                                      RG_MAGIC_BEAN,                        {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MERCHANTS_MAGIC_BEAN_SALESMAN),                                                SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,                true);
+    locationTable[RC_ZR_FROGS_ZELDAS_LULLABY] =                                        Location::Base(RC_ZR_FROGS_ZELDAS_LULLABY,                                      RCQUEST_BOTH,    RCTYPE_FROG_SONG,                   RCAREA_ZORAS_RIVER,                  ACTOR_EN_FR,          SCENE_ZORAS_RIVER,                  0x00,                                              0x3E, "Frogs Zelda's Lullaby",                       "ZR Frogs Zelda's Lullaby",                                 RHT_ZR_FROGS_ZELDAS_LULLABY,                                     RG_PURPLE_RUPEE,                      {},                                                     SpoilerCollectionCheck::EventChkInf(0xD1),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZR_FROGS_EPONAS_SONG] =                                           Location::Base(RC_ZR_FROGS_EPONAS_SONG,                                         RCQUEST_BOTH,    RCTYPE_FROG_SONG,                   RCAREA_ZORAS_RIVER,                  ACTOR_EN_FR,          SCENE_ZORAS_RIVER,                  0x00,                                              0x3E, "Frogs Epona's Song",                          "ZR Frogs Epona's Song",                                    RHT_ZR_FROGS_EPONAS_SONG,                                        RG_PURPLE_RUPEE,                      {},                                                     SpoilerCollectionCheck::EventChkInf(0xD2),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZR_FROGS_SARIAS_SONG] =                                           Location::Base(RC_ZR_FROGS_SARIAS_SONG,                                         RCQUEST_BOTH,    RCTYPE_FROG_SONG,                   RCAREA_ZORAS_RIVER,                  ACTOR_EN_FR,          SCENE_ZORAS_RIVER,                  0x00,                                              0x3E, "Frogs Saria's Song",                          "ZR Frogs Saria's Song",                                    RHT_ZR_FROGS_SARIAS_SONG,                                        RG_PURPLE_RUPEE,                      {},                                                     SpoilerCollectionCheck::EventChkInf(0xD4),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZR_FROGS_SUNS_SONG] =                                             Location::Base(RC_ZR_FROGS_SUNS_SONG,                                           RCQUEST_BOTH,    RCTYPE_FROG_SONG,                   RCAREA_ZORAS_RIVER,                  ACTOR_EN_FR,          SCENE_ZORAS_RIVER,                  0x00,                                              0x3E, "Frogs Sun's Song",                            "ZR Frogs Sun's Song",                                      RHT_ZR_FROGS_SUNS_SONG,                                          RG_PURPLE_RUPEE,                      {},                                                     SpoilerCollectionCheck::EventChkInf(0xD3),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZR_FROGS_SONG_OF_TIME] =                                          Location::Base(RC_ZR_FROGS_SONG_OF_TIME,                                        RCQUEST_BOTH,    RCTYPE_FROG_SONG,                   RCAREA_ZORAS_RIVER,                  ACTOR_EN_FR,          SCENE_ZORAS_RIVER,                  0x00,                                              0x3E, "Frogs Song of Time",                          "ZR Frogs Song of Time",                                    RHT_ZR_FROGS_SONG_OF_TIME,                                       RG_PURPLE_RUPEE,                      {},                                                     SpoilerCollectionCheck::EventChkInf(0xD5),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZR_FROGS_IN_THE_RAIN] =                                           Location::Base(RC_ZR_FROGS_IN_THE_RAIN,                                         RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_RIVER,                  ACTOR_EN_FR,          SCENE_ZORAS_RIVER,                  0x00,                                              0x3E, "Frogs in the Rain",                           "ZR Frogs in the Rain",                                     RHT_ZR_FROGS_IN_THE_RAIN,                                        RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::EventChkInf(0xD6),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,                true);
+    locationTable[RC_ZR_FROGS_OCARINA_GAME] =                                          Location::Base(RC_ZR_FROGS_OCARINA_GAME,                                        RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_RIVER,                  ACTOR_EN_FR,          SCENE_ZORAS_RIVER,                  0x00,                                              0x76, "Frogs Ocarina Game",                          "ZR Frogs Ocarina Game",                                    RHT_ZR_FROGS_OCARINA_GAME,                                       RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::EventChkInf(0xD0),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,                true);
+    locationTable[RC_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH] =                    Location::Collectable(RC_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH,                         RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_RIVER,                  ACTOR_EN_ITEM00,      SCENE_ZORAS_RIVER,                  1030,                                              0x04, "Near Open Grotto Freestanding PoH",           "ZR Near Open Grotto Freestanding PoH",                     RHT_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH,                        RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,                true);
+    locationTable[RC_ZR_NEAR_DOMAIN_FREESTANDING_POH] =                         Location::Collectable(RC_ZR_NEAR_DOMAIN_FREESTANDING_POH,                              RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_RIVER,                  ACTOR_EN_ITEM00,      SCENE_ZORAS_RIVER,                  2822,                                              0x0B, "Near Domain Freestanding PoH",                "ZR Near Domain Freestanding PoH",                          RHT_ZR_NEAR_DOMAIN_FREESTANDING_POH,                             RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,                true);
+    locationTable[RC_ZR_DEKU_SCRUB_GROTTO_REAR] =                               Location::GrottoScrub(RC_ZR_DEKU_SCRUB_GROTTO_REAR,                                    RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_ZORAS_RIVER,                  ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x07, 0xEB),                      0x39, "Deku Scrub Grotto Rear",                      "ZR Deku Scrub Grotto Rear",                                RHT_ZR_DEKU_SCRUB_GROTTO_REAR,                                   RG_BUY_RED_POTION_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_ZR_DEKU_SCRUB_GROTTO_REAR),                                   SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZR_DEKU_SCRUB_GROTTO_FRONT] =                              Location::GrottoScrub(RC_ZR_DEKU_SCRUB_GROTTO_FRONT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_ZORAS_RIVER,                  ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x08, 0xEB),                      0x3A, "Deku Scrub Grotto Front",                     "ZR Deku Scrub Grotto Front",                               RHT_ZR_DEKU_SCRUB_GROTTO_FRONT,                                  RG_BUY_GREEN_POTION,                  { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_ZR_DEKU_SCRUB_GROTTO_FRONT),                                  SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
     // Zoras Domain
-    locationTable[RC_ZD_CHEST] =                                   Location::Chest(RC_ZD_CHEST,                             RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_ZORAS_DOMAIN,          ACTOR_EN_BOX,    SCENE_ZORAS_DOMAIN,              -18496,                       0x00, "Chest",                             "ZD Chest",                             RHT_ZD_CHEST,                             RG_PIECE_OF_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,   true);
-    locationTable[RC_ZD_DIVING_MINIGAME] =                          Location::Base(RC_ZD_DIVING_MINIGAME,                   RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_ZORAS_DOMAIN,          ACTOR_ID_MAX,    SCENE_ZORAS_DOMAIN,              0x00,                         0x37, "Diving Minigame",                   "ZD Diving Minigame",                   RHT_ZD_DIVING_MINIGAME,                   RG_PROGRESSIVE_SCALE,        {},                        SpoilerCollectionCheck::EventChkInf(0x38),        SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,   true);
-    locationTable[RC_ZD_KING_ZORA_THAWED] =                         Location::Base(RC_ZD_KING_ZORA_THAWED,                  RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_ZORAS_DOMAIN,          ACTOR_ID_MAX,    SCENE_ZORAS_DOMAIN,              0x00,                         0x2D, "King Zora Thawed",                  "ZD King Zora Thawed",                  RHT_ZD_KING_ZORA_THAWED,                  RG_ZORA_TUNIC,               {},                        SpoilerCollectionCheck::InfTable(0x13, 0x01),     SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,   true);
-    locationTable[RC_ZD_TRADE_PRESCRIPTION] =                       Location::Base(RC_ZD_TRADE_PRESCRIPTION,                RCQUEST_BOTH, RCTYPE_ADULT_TRADE, RCAREA_ZORAS_DOMAIN,          ACTOR_ID_MAX,    SCENE_ZORAS_DOMAIN,              0x00,                         0x24, "Trade Prescription",                "ZD Trade Prescription",                RHT_ZD_TRADE_PRESCRIPTION,                RG_EYEBALL_FROG,             { Category::cAdultTrade }, SpoilerCollectionCheck::Chest(0x58, 0x1F),        SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,   true);
+    locationTable[RC_ZD_CHEST] =                                                      Location::Chest(RC_ZD_CHEST,                                                     RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_BOX,         SCENE_ZORAS_DOMAIN,                 -18496,                                            0x00, "Chest",                                       "ZD Chest",                                                 RHT_ZD_CHEST,                                                    RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,               true);
+    locationTable[RC_ZD_DIVING_MINIGAME] =                                             Location::Base(RC_ZD_DIVING_MINIGAME,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_DOMAIN,                 ACTOR_ID_MAX,         SCENE_ZORAS_DOMAIN,                 0x00,                                              0x37, "Diving Minigame",                             "ZD Diving Minigame",                                       RHT_ZD_DIVING_MINIGAME,                                          RG_PROGRESSIVE_SCALE,                 {},                                                     SpoilerCollectionCheck::EventChkInf(0x38),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,               true);
+    locationTable[RC_ZD_KING_ZORA_THAWED] =                                            Location::Base(RC_ZD_KING_ZORA_THAWED,                                          RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_DOMAIN,                 ACTOR_ID_MAX,         SCENE_ZORAS_DOMAIN,                 0x00,                                              0x2D, "King Zora Thawed",                            "ZD King Zora Thawed",                                      RHT_ZD_KING_ZORA_THAWED,                                         RG_ZORA_TUNIC,                        {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KING_ZORA_THAWED),                                                             SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,               true);
+    locationTable[RC_ZD_TRADE_PRESCRIPTION] =                                          Location::Base(RC_ZD_TRADE_PRESCRIPTION,                                        RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_ZORAS_DOMAIN,                 ACTOR_ID_MAX,         SCENE_ZORAS_DOMAIN,                 0x00,                                              0x24, "Trade Prescription",                          "ZD Trade Prescription",                                    RHT_ZD_TRADE_PRESCRIPTION,                                       RG_EYEBALL_FROG,                      { Category::cAdultTrade },                              SpoilerCollectionCheck::RandomizerInf(RAND_INF_ADULT_TRADES_ZD_TRADE_PRESCRIPTION),                                           SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,               true);
     // Zora's Fountain
-    locationTable[RC_ZF_ICEBERC_FREESTANDING_POH] =          Location::Collectable(RC_ZF_ICEBERC_FREESTANDING_POH,          RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_ZORAS_FOUNTAIN,        ACTOR_EN_ITEM00, SCENE_ZORAS_FOUNTAIN,            262,                          0x01, "Iceberg Freestanding PoH",          "ZF Iceberg Freestanding PoH",          RHT_ZF_ICEBERG_FREESTANDING_POH,          RG_PIECE_OF_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,   true);
-    locationTable[RC_ZF_BOTTOM_FREESTANDING_POH] =           Location::Collectable(RC_ZF_BOTTOM_FREESTANDING_POH,           RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_ZORAS_FOUNTAIN,        ACTOR_EN_ITEM00, SCENE_ZORAS_FOUNTAIN,            5126,                         0x14, "Bottom Freestanding PoH",           "ZF Bottom Freestanding PoH",           RHT_ZF_BOTTOM_FREESTANDING_POH,           RG_PIECE_OF_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,   true);
+    locationTable[RC_ZF_ICEBERC_FREESTANDING_POH] =                             Location::Collectable(RC_ZF_ICEBERC_FREESTANDING_POH,                                  RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_FOUNTAIN,               ACTOR_EN_ITEM00,      SCENE_ZORAS_FOUNTAIN,               262,                                               0x01, "Iceberg Freestanding PoH",                    "ZF Iceberg Freestanding PoH",                              RHT_ZF_ICEBERG_FREESTANDING_POH,                                 RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,               true);
+    locationTable[RC_ZF_BOTTOM_FREESTANDING_POH] =                              Location::Collectable(RC_ZF_BOTTOM_FREESTANDING_POH,                                   RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_FOUNTAIN,               ACTOR_EN_ITEM00,      SCENE_ZORAS_FOUNTAIN,               5126,                                              0x14, "Bottom Freestanding PoH",                     "ZF Bottom Freestanding PoH",                               RHT_ZF_BOTTOM_FREESTANDING_POH,                                  RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,               true);
     // Lon Lon Ranch
-    locationTable[RC_LLR_TALONS_CHICKENS] =                         Location::Base(RC_LLR_TALONS_CHICKENS,                  RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LON_LON_RANCH,         ACTOR_ID_MAX,    SCENE_LON_LON_BUILDINGS,         0x00,                         0x14, "Talons Chickens",                   "LLR Talons Chickens",                  RHT_LLR_TALONS_CHICKENS,                  RG_BOTTLE_WITH_MILK,         {},                        SpoilerCollectionCheck::ItemGetInf(10),           SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH,  true);
-    locationTable[RC_LLR_FREESTANDING_POH] =                 Location::Collectable(RC_LLR_FREESTANDING_POH,                 RCQUEST_BOTH, RCTYPE_STANDARD,    RCAREA_LON_LON_RANCH,         ACTOR_EN_ITEM00, SCENE_LON_LON_BUILDINGS,         262,                          0x01, "Freestanding PoH",                  "LLR Freestanding PoH",                 RHT_LLR_FREESTANDING_POH,                 RG_PIECE_OF_HEART,           {},                                                                           SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH,  true);
-    locationTable[RC_LLR_DEKU_SCRUB_GROTTO_LEFT] =           Location::GrottoScrub(RC_LLR_DEKU_SCRUB_GROTTO_LEFT,           RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_LON_LON_RANCH,         ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x00, 0xFC), 0x30, "Deku Scrub Grotto Left",            "LLR Deku Scrub Grotto Left",           RHT_LLR_DEKU_SCRUB_GROTTO_LEFT,           RG_BUY_DEKU_NUTS_5,          { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x26, 0x01),        SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
-    locationTable[RC_LLR_DEKU_SCRUB_GROTTO_RIGHT] =          Location::GrottoScrub(RC_LLR_DEKU_SCRUB_GROTTO_RIGHT,          RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_LON_LON_RANCH,         ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x05, 0xFC), 0x37, "Deku Scrub Grotto Right",           "LLR Deku Scrub Grotto Right",          RHT_LLR_DEKU_SCRUB_GROTTO_RIGHT,          RG_BUY_BOMBS_535,            { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x26, 0x06),        SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
-    locationTable[RC_LLR_DEKU_SCRUB_GROTTO_CENTER] =         Location::GrottoScrub(RC_LLR_DEKU_SCRUB_GROTTO_CENTER,         RCQUEST_BOTH, RCTYPE_SCRUB,       RCAREA_LON_LON_RANCH,         ACTOR_EN_DNS,    SCENE_GROTTOS,                   TWO_ACTOR_PARAMS(0x03, 0xFC), 0x33, "Deku Scrub Grotto Center",          "LLR Deku Scrub Grotto Center",         RHT_LLR_DEKU_SCRUB_GROTTO_CENTER,         RG_BUY_DEKU_SEEDS_30,        { Category::cDekuScrub },  SpoilerCollectionCheck::Scrub(0x26, 0x04),        SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
+    locationTable[RC_LLR_TALONS_CHICKENS] =                                            Location::Base(RC_LLR_TALONS_CHICKENS,                                          RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LON_LON_RANCH,                ACTOR_ID_MAX,         SCENE_LON_LON_BUILDINGS,            0x00,                                              0x14, "Talons Chickens",                             "LLR Talons Chickens",                                      RHT_LLR_TALONS_CHICKENS,                                         RG_BOTTLE_WITH_MILK,                  {},                                                     SpoilerCollectionCheck::ItemGetInf(2),                                                                                        SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH,              true);
+    locationTable[RC_LLR_FREESTANDING_POH] =                                    Location::Collectable(RC_LLR_FREESTANDING_POH,                                         RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LON_LON_RANCH,                ACTOR_EN_ITEM00,      SCENE_LON_LON_BUILDINGS,            262,                                               0x01, "Freestanding PoH",                            "LLR Freestanding PoH",                                     RHT_LLR_FREESTANDING_POH,                                        RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH,              true);
+    locationTable[RC_LLR_DEKU_SCRUB_GROTTO_LEFT] =                              Location::GrottoScrub(RC_LLR_DEKU_SCRUB_GROTTO_LEFT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LON_LON_RANCH,                ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x00, 0xFC),                      0x30, "Deku Scrub Grotto Left",                      "LLR Deku Scrub Grotto Left",                               RHT_LLR_DEKU_SCRUB_GROTTO_LEFT,                                  RG_BUY_DEKU_NUTS_5,                   { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LLR_DEKU_SCRUB_GROTTO_LEFT),                                  SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
+    locationTable[RC_LLR_DEKU_SCRUB_GROTTO_RIGHT] =                             Location::GrottoScrub(RC_LLR_DEKU_SCRUB_GROTTO_RIGHT,                                  RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LON_LON_RANCH,                ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x05, 0xFC),                      0x37, "Deku Scrub Grotto Right",                     "LLR Deku Scrub Grotto Right",                              RHT_LLR_DEKU_SCRUB_GROTTO_RIGHT,                                 RG_BUY_BOMBS_535,                     { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LLR_DEKU_SCRUB_GROTTO_RIGHT),                                 SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
+    locationTable[RC_LLR_DEKU_SCRUB_GROTTO_CENTER] =                            Location::GrottoScrub(RC_LLR_DEKU_SCRUB_GROTTO_CENTER,                                 RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LON_LON_RANCH,                ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x03, 0xFC),                      0x33, "Deku Scrub Grotto Center",                    "LLR Deku Scrub Grotto Center",                             RHT_LLR_DEKU_SCRUB_GROTTO_CENTER,                                RG_BUY_DEKU_SEEDS_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LLR_DEKU_SCRUB_GROTTO_CENTER),                                SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
 
     // Dungeons
-    //            Randomizer Check                                             Randomizer Check                           Quest            Type                Area              Actor ID      Scene ID         Params Flags Short Name                       Spoiler Name                              Hint Text Key                               Vanilla Item              Categories                     Spoiler Collection Check                   Collection Check Group                                Vanilla Progression
     // Deku Tree Vanilla
-    locationTable[RC_DEKU_TREE_MAP_CHEST] =                    Location::Chest(RC_DEKU_TREE_MAP_CHEST,                    RCQUEST_VANILLA, RCTYPE_MAP_COMPASS, RCAREA_DEKU_TREE, ACTOR_EN_BOX, SCENE_DEKU_TREE, 2083,  0x03, "Map Chest",                     "Deku Tree Map Chest",                    RHT_DEKU_TREE_MAP_CHEST,                    RG_DEKU_TREE_MAP,         { Category::cVanillaMap },                                                SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE, true);
-    locationTable[RC_DEKU_TREE_COMPASS_CHEST] =                Location::Chest(RC_DEKU_TREE_COMPASS_CHEST,                RCQUEST_VANILLA, RCTYPE_MAP_COMPASS, RCAREA_DEKU_TREE, ACTOR_EN_BOX, SCENE_DEKU_TREE, 2050,  0x02, "Compass Chest",                 "Deku Tree Compass Chest",                RHT_DEKU_TREE_COMPASS_CHEST,                RG_DEKU_TREE_COMPASS,     { Category::cVanillaCompass },                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE, true);
-    locationTable[RC_DEKU_TREE_COMPASS_ROOM_SIDE_CHEST] =      Location::Chest(RC_DEKU_TREE_COMPASS_ROOM_SIDE_CHEST,      RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_DEKU_TREE, ACTOR_EN_BOX, SCENE_DEKU_TREE, 22790, 0x06, "Compass Room Side Chest",       "Deku Tree Compass Room Side Chest",      RHT_DEKU_TREE_COMPASS_ROOM_SIDE_CHEST,      RG_RECOVERY_HEART,        {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[RC_DEKU_TREE_BASEMENT_CHEST] =               Location::Chest(RC_DEKU_TREE_BASEMENT_CHEST,               RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_DEKU_TREE, ACTOR_EN_BOX, SCENE_DEKU_TREE, 22788, 0x04, "Basement Chest",                "Deku Tree Basement Chest",               RHT_DEKU_TREE_BASEMENT_CHEST,               RG_RECOVERY_HEART,        {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[RC_DEKU_TREE_SLINGSHOT_CHEST] =              Location::Chest(RC_DEKU_TREE_SLINGSHOT_CHEST,              RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_DEKU_TREE, ACTOR_EN_BOX, SCENE_DEKU_TREE, 161,   0x01, "Slingshot Chest",               "Deku Tree Slingshot Chest",              RHT_DEKU_TREE_SLINGSHOT_CHEST,              RG_PROGRESSIVE_SLINGSHOT, {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE, true);
-    locationTable[RC_DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST] =    Location::Chest(RC_DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST,    RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_DEKU_TREE, ACTOR_EN_BOX, SCENE_DEKU_TREE, 22789, 0x05, "Slingshot Room Side Chest",     "Deku Tree Slingshot Room Side Chest",    RHT_DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST,    RG_RECOVERY_HEART,        {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_MAP_CHEST] =                                           Location::Chest(RC_DEKU_TREE_MAP_CHEST,                                          RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    2083,                                              0x03, "Map Chest",                                   "Deku Tree Map Chest",                                      RHT_DEKU_TREE_MAP_CHEST,                                         RG_DEKU_TREE_MAP,                     { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE,          true);
+    locationTable[RC_DEKU_TREE_COMPASS_CHEST] =                                       Location::Chest(RC_DEKU_TREE_COMPASS_CHEST,                                      RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    2050,                                              0x02, "Compass Chest",                               "Deku Tree Compass Chest",                                  RHT_DEKU_TREE_COMPASS_CHEST,                                     RG_DEKU_TREE_COMPASS,                 { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE,          true);
+    locationTable[RC_DEKU_TREE_COMPASS_ROOM_SIDE_CHEST] =                             Location::Chest(RC_DEKU_TREE_COMPASS_ROOM_SIDE_CHEST,                            RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    22790,                                             0x06, "Compass Room Side Chest",                     "Deku Tree Compass Room Side Chest",                        RHT_DEKU_TREE_COMPASS_ROOM_SIDE_CHEST,                           RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_BASEMENT_CHEST] =                                      Location::Chest(RC_DEKU_TREE_BASEMENT_CHEST,                                     RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    22788,                                             0x04, "Basement Chest",                              "Deku Tree Basement Chest",                                 RHT_DEKU_TREE_BASEMENT_CHEST,                                    RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_SLINGSHOT_CHEST] =                                     Location::Chest(RC_DEKU_TREE_SLINGSHOT_CHEST,                                    RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    161,                                               0x01, "Slingshot Chest",                             "Deku Tree Slingshot Chest",                                RHT_DEKU_TREE_SLINGSHOT_CHEST,                                   RG_PROGRESSIVE_SLINGSHOT,             {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE,          true);
+    locationTable[RC_DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST] =                           Location::Chest(RC_DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST,                          RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    22789,                                             0x05, "Slingshot Room Side Chest",                   "Deku Tree Slingshot Room Side Chest",                      RHT_DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST,                         RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
     // Deku Tree MQ
-    locationTable[RC_DEKU_TREE_MQ_MAP_CHEST] =                 Location::Chest(RC_DEKU_TREE_MQ_MAP_CHEST,                 RCQUEST_MQ,      RCTYPE_MAP_COMPASS, RCAREA_DEKU_TREE, ACTOR_EN_BOX, SCENE_DEKU_TREE, 2083,   0x03, "MQ Map Chest",                 "Deku Tree MQ Map Chest",                 RHT_DEKU_TREE_MQ_MAP_CHEST,                 RG_DEKU_TREE_MAP,         { Category::cVanillaMap },                                                SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE, true);
-    locationTable[RC_DEKU_TREE_MQ_COMPASS_CHEST] =             Location::Chest(RC_DEKU_TREE_MQ_COMPASS_CHEST,             RCQUEST_MQ,      RCTYPE_MAP_COMPASS, RCAREA_DEKU_TREE, ACTOR_EN_BOX, SCENE_DEKU_TREE, 2049,   0x01, "MQ Compass Chest",             "Deku Tree MQ Compass Chest",             RHT_DEKU_TREE_MQ_COMPASS_CHEST,             RG_DEKU_TREE_COMPASS,     { Category::cVanillaCompass },                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE, true);
-    locationTable[RC_DEKU_TREE_MQ_SLINGSHOT_CHEST] =           Location::Chest(RC_DEKU_TREE_MQ_SLINGSHOT_CHEST,           RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_DEKU_TREE, ACTOR_EN_BOX, SCENE_DEKU_TREE, 4262,   0x06, "MQ Slingshot Chest",           "Deku Tree MQ Slingshot Chest",           RHT_DEKU_TREE_MQ_SLINGSHOT_CHEST,           RG_PROGRESSIVE_SLINGSHOT, {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE, true);
-    locationTable[RC_DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST] = Location::Chest(RC_DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST, RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_DEKU_TREE, ACTOR_EN_BOX, SCENE_DEKU_TREE, -31454, 0x02, "MQ Slingshot Room Back Chest", "Deku Tree MQ Slingshot Room Back Chest", RHT_DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST, RG_DEKU_SHIELD,           {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[RC_DEKU_TREE_MQ_BASEMENT_CHEST] =            Location::Chest(RC_DEKU_TREE_MQ_BASEMENT_CHEST,            RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_DEKU_TREE, ACTOR_EN_BOX, SCENE_DEKU_TREE, -31452, 0x04, "MQ Basement Chest",            "Deku Tree MQ Basement Chest",            RHT_DEKU_TREE_MQ_BASEMENT_CHEST,            RG_DEKU_SHIELD,           {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[RC_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST] = Location::Chest(RC_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST, RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_DEKU_TREE, ACTOR_EN_BOX, SCENE_DEKU_TREE, 22789,  0x05, "MQ Before Spinning Log Chest", "Deku Tree MQ Before Spinning Log Chest", RHT_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST, RG_RECOVERY_HEART,        {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[RC_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST] =  Location::Chest(RC_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST,  RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_DEKU_TREE, ACTOR_EN_BOX, SCENE_DEKU_TREE, 23200,  0x00, "MQ After Spinning Log Chest",  "Deku Tree MQ After Spinning Log Chest",  RHT_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST,  RG_PURPLE_RUPEE,          {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[RC_DEKU_TREE_MQ_DEKU_SCRUB] =                 Location::Base(RC_DEKU_TREE_MQ_DEKU_SCRUB,                RCQUEST_MQ,      RCTYPE_SCRUB,       RCAREA_DEKU_TREE, ACTOR_EN_DNS, SCENE_DEKU_TREE, 0x04,   0x34, "MQ Deku Scrub",                "Deku Tree MQ Deku Scrub",                RHT_DEKU_TREE_MQ_DEKU_SCRUB,                RG_BUY_DEKU_SHIELD,       { Category::cDekuScrub },      SpoilerCollectionCheck::Scrub(0x00, 0x05), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_MQ_MAP_CHEST] =                                        Location::Chest(RC_DEKU_TREE_MQ_MAP_CHEST,                                       RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    2083,                                              0x03, "MQ Map Chest",                                "Deku Tree MQ Map Chest",                                   RHT_DEKU_TREE_MQ_MAP_CHEST,                                      RG_DEKU_TREE_MAP,                     { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE,          true);
+    locationTable[RC_DEKU_TREE_MQ_COMPASS_CHEST] =                                    Location::Chest(RC_DEKU_TREE_MQ_COMPASS_CHEST,                                   RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    2049,                                              0x01, "MQ Compass Chest",                            "Deku Tree MQ Compass Chest",                               RHT_DEKU_TREE_MQ_COMPASS_CHEST,                                  RG_DEKU_TREE_COMPASS,                 { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE,          true);
+    locationTable[RC_DEKU_TREE_MQ_SLINGSHOT_CHEST] =                                  Location::Chest(RC_DEKU_TREE_MQ_SLINGSHOT_CHEST,                                 RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    4262,                                              0x06, "MQ Slingshot Chest",                          "Deku Tree MQ Slingshot Chest",                             RHT_DEKU_TREE_MQ_SLINGSHOT_CHEST,                                RG_PROGRESSIVE_SLINGSHOT,             {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE,          true);
+    locationTable[RC_DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST] =                        Location::Chest(RC_DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST,                       RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    -31454,                                            0x02, "MQ Slingshot Room Back Chest",                "Deku Tree MQ Slingshot Room Back Chest",                   RHT_DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST,                      RG_DEKU_SHIELD,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_MQ_BASEMENT_CHEST] =                                   Location::Chest(RC_DEKU_TREE_MQ_BASEMENT_CHEST,                                  RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    -31452,                                            0x04, "MQ Basement Chest",                           "Deku Tree MQ Basement Chest",                              RHT_DEKU_TREE_MQ_BASEMENT_CHEST,                                 RG_DEKU_SHIELD,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST] =                        Location::Chest(RC_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST,                       RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    22789,                                             0x05, "MQ Before Spinning Log Chest",                "Deku Tree MQ Before Spinning Log Chest",                   RHT_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST,                      RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST] =                         Location::Chest(RC_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST,                        RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    23200,                                             0x00, "MQ After Spinning Log Chest",                 "Deku Tree MQ After Spinning Log Chest",                    RHT_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST,                       RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_MQ_DEKU_SCRUB] =                                        Location::Base(RC_DEKU_TREE_MQ_DEKU_SCRUB,                                      RCQUEST_MQ,      RCTYPE_SCRUB,                       RCAREA_DEKU_TREE,                    ACTOR_EN_DNS,         SCENE_DEKU_TREE,                    0x04,                                              0x34, "MQ Deku Scrub",                               "Deku Tree MQ Deku Scrub",                                  RHT_DEKU_TREE_MQ_DEKU_SCRUB,                                     RG_BUY_DEKU_SHIELD,                   { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DEKU_TREE_MQ_DEKU_SCRUB),                                     SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
 
-    //            Randomizer Check                                                                 Randomizer Check                                                Quest            Type                Area                    Actor ID      Scene ID                    Params Flags Short Name                                     Spoiler Name                                                Hint Text Key                                                    Vanilla Item                Categories                     Spoiler Collection Check                   Collection Check Group                                      Vanilla Progression
     // Dodongo's Cavern Shared
-    locationTable[RC_DODONGOS_CAVERN_BOSS_ROOM_CHEST] =                            Location::Chest(RC_DODONGOS_CAVERN_BOSS_ROOM_CHEST,                             RCQUEST_BOTH,    RCTYPE_STANDARD,    RCAREA_DODONGOS_CAVERN, ACTOR_EN_BOX, SCENE_DODONGOS_CAVERN_BOSS, 20512, 0x00, "Boss Room Chest",                             "Dodongos Cavern Boss Room Chest",                          RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST,                             RG_BOMBS_5,                 {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_BOSS_ROOM_CHEST] =                               Location::Chest(RC_DODONGOS_CAVERN_BOSS_ROOM_CHEST,                              RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN_BOSS,         20512,                                             0x00, "Boss Room Chest",                             "Dodongos Cavern Boss Room Chest",                          RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST,                             RG_BOMBS_5,                           {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
     // Dodongo's Cavern Vanilla
-    locationTable[RC_DODONGOS_CAVERN_MAP_CHEST] =                                  Location::Chest(RC_DODONGOS_CAVERN_MAP_CHEST,                                   RCQUEST_VANILLA, RCTYPE_MAP_COMPASS, RCAREA_DODONGOS_CAVERN, ACTOR_EN_BOX, SCENE_DODONGOS_CAVERN,      2088,  0x08, "Map Chest",                                   "Dodongos Cavern Map Chest",                                RHT_DODONGOS_CAVERN_MAP_CHEST,                                   RG_DODONGOS_CAVERN_MAP,     { Category::cVanillaMap },                                                SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN, true);
-    locationTable[RC_DODONGOS_CAVERN_COMPASS_CHEST] =                              Location::Chest(RC_DODONGOS_CAVERN_COMPASS_CHEST,                               RCQUEST_VANILLA, RCTYPE_MAP_COMPASS, RCAREA_DODONGOS_CAVERN, ACTOR_EN_BOX, SCENE_DODONGOS_CAVERN,      2053,  0x05, "Compass Chest",                               "Dodongos Cavern Compass Chest",                            RHT_DODONGOS_CAVERN_COMPASS_CHEST,                               RG_DODONGOS_CAVERN_COMPASS, { Category::cVanillaCompass },                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN, true);
-    locationTable[RC_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST] =                 Location::Chest(RC_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST,                  RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_DODONGOS_CAVERN, ACTOR_EN_BOX, SCENE_DODONGOS_CAVERN,      22982, 0x06, "Bomb Flower Platform Chest",                  "Dodongos Cavern Bomb Flower Platform Chest",               RHT_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST,                  RG_RED_RUPEE,               {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_BOMB_BAG_CHEST] =                             Location::Chest(RC_DODONGOS_CAVERN_BOMB_BAG_CHEST,                              RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_DODONGOS_CAVERN, ACTOR_EN_BOX, SCENE_DODONGOS_CAVERN,      1604,  0x04, "Bomb Bag Chest",                              "Dodongos Cavern Bomb Bag Chest",                           RHT_DODONGOS_CAVERN_BOMB_BAG_CHEST,                              RG_PROGRESSIVE_BOMB_BAG,    {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN, true);
-    locationTable[RC_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST] =                        Location::Chest(RC_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST,                         RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_DODONGOS_CAVERN, ACTOR_EN_BOX, SCENE_DODONGOS_CAVERN,      21802, 0x0A, "End Of Bridge Chest",                         "Dodongos Cavern End Of Bridge Chest",                      RHT_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST,                         RG_DEKU_SHIELD,             {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT] =               Location::Base(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,               RCQUEST_VANILLA, RCTYPE_SCRUB,       RCAREA_DODONGOS_CAVERN, ACTOR_EN_DNS, SCENE_DODONGOS_CAVERN,      0x00,  0x30, "Deku Scrub Near Bomb Bag Left",               "Dodongos Cavern Deku Scrub Near Bomb Bag Left",            RHT_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,               RG_BUY_DEKU_NUTS_5,         { Category::cDekuScrub },      SpoilerCollectionCheck::Scrub(0x01, 0x01), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS] =          Location::Base(RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS,          RCQUEST_VANILLA, RCTYPE_SCRUB,       RCAREA_DODONGOS_CAVERN, ACTOR_EN_DNS, SCENE_DODONGOS_CAVERN,      0x01,  0x31, "Deku Scrub Side Room Near Dodongos",          "Dodongos Cavern Deku Scrub Side Room Near Dodongos",       RHT_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS,          RG_BUY_DEKU_STICK_1,        { Category::cDekuScrub },      SpoilerCollectionCheck::Scrub(0x01, 0x02), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT] =              Location::Base(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT,              RCQUEST_VANILLA, RCTYPE_SCRUB,       RCAREA_DODONGOS_CAVERN, ACTOR_EN_DNS, SCENE_DODONGOS_CAVERN,      0x03,  0x33, "Deku Scrub Near Bomb Bag Right",              "Dodongos Cavern Deku Scrub Near Bomb Bag Right",           RHT_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT,              RG_BUY_DEKU_SEEDS_30,       { Category::cDekuScrub },      SpoilerCollectionCheck::Scrub(0x01, 0x04), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY] =                            Location::Base(RC_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY,                            RCQUEST_VANILLA, RCTYPE_SCRUB,       RCAREA_DODONGOS_CAVERN, ACTOR_EN_DNS, SCENE_DODONGOS_CAVERN,      0x04,  0x34, "Deku Scrub Lobby",                            "Dodongos Cavern Deku Scrub Lobby",                         RHT_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY,                            RG_BUY_DEKU_SHIELD,         { Category::cDekuScrub },      SpoilerCollectionCheck::Scrub(0x01, 0x05), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_MAP_CHEST] =                                     Location::Chest(RC_DODONGOS_CAVERN_MAP_CHEST,                                    RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              2088,                                              0x08, "Map Chest",                                   "Dodongos Cavern Map Chest",                                RHT_DODONGOS_CAVERN_MAP_CHEST,                                   RG_DODONGOS_CAVERN_MAP,               { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN,    true);
+    locationTable[RC_DODONGOS_CAVERN_COMPASS_CHEST] =                                 Location::Chest(RC_DODONGOS_CAVERN_COMPASS_CHEST,                                RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              2053,                                              0x05, "Compass Chest",                               "Dodongos Cavern Compass Chest",                            RHT_DODONGOS_CAVERN_COMPASS_CHEST,                               RG_DODONGOS_CAVERN_COMPASS,           { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN,    true);
+    locationTable[RC_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST] =                    Location::Chest(RC_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST,                   RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              22982,                                             0x06, "Bomb Flower Platform Chest",                  "Dodongos Cavern Bomb Flower Platform Chest",               RHT_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST,                  RG_RED_RUPEE,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_BOMB_BAG_CHEST] =                                Location::Chest(RC_DODONGOS_CAVERN_BOMB_BAG_CHEST,                               RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              1604,                                              0x04, "Bomb Bag Chest",                              "Dodongos Cavern Bomb Bag Chest",                           RHT_DODONGOS_CAVERN_BOMB_BAG_CHEST,                              RG_PROGRESSIVE_BOMB_BAG,              {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN,    true);
+    locationTable[RC_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST] =                           Location::Chest(RC_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST,                          RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              21802,                                             0x0A, "End Of Bridge Chest",                         "Dodongos Cavern End Of Bridge Chest",                      RHT_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST,                         RG_DEKU_SHIELD,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT] =                  Location::Base(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,                RCQUEST_VANILLA, RCTYPE_SCRUB,                       RCAREA_DODONGOS_CAVERN,              ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x00,                                              0x30, "Deku Scrub Near Bomb Bag Left",               "Dodongos Cavern Deku Scrub Near Bomb Bag Left",            RHT_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,               RG_BUY_DEKU_NUTS_5,                   { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT),               SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS] =             Location::Base(RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS,           RCQUEST_VANILLA, RCTYPE_SCRUB,                       RCAREA_DODONGOS_CAVERN,              ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x01,                                              0x31, "Deku Scrub Side Room Near Dodongos",          "Dodongos Cavern Deku Scrub Side Room Near Dodongos",       RHT_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS,          RG_BUY_DEKU_STICK_1,                  { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS),          SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT] =                 Location::Base(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT,               RCQUEST_VANILLA, RCTYPE_SCRUB,                       RCAREA_DODONGOS_CAVERN,              ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x03,                                              0x33, "Deku Scrub Near Bomb Bag Right",              "Dodongos Cavern Deku Scrub Near Bomb Bag Right",           RHT_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT,              RG_BUY_DEKU_SEEDS_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT),              SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY] =                               Location::Base(RC_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY,                             RCQUEST_VANILLA, RCTYPE_SCRUB,                       RCAREA_DODONGOS_CAVERN,              ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x04,                                              0x34, "Deku Scrub Lobby",                            "Dodongos Cavern Deku Scrub Lobby",                         RHT_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY,                            RG_BUY_DEKU_SHIELD,                   { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY),                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
     // Dodongo's Cavern MQ
-    locationTable[RC_DODONGOS_CAVERN_MQ_MAP_CHEST] =                               Location::Chest(RC_DODONGOS_CAVERN_MQ_MAP_CHEST,                                RCQUEST_MQ,      RCTYPE_MAP_COMPASS, RCAREA_DODONGOS_CAVERN, ACTOR_EN_BOX, SCENE_DODONGOS_CAVERN,      2080,  0x00, "MQ Map Chest",                                "Dodongos Cavern MQ Map Chest",                             RHT_DODONGOS_CAVERN_MQ_MAP_CHEST,                                RG_DODONGOS_CAVERN_MAP,     { Category::cVanillaMap },                                                SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN, true);
-    locationTable[RC_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST] =                          Location::Chest(RC_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST,                           RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_DODONGOS_CAVERN, ACTOR_EN_BOX, SCENE_DODONGOS_CAVERN,      1604,  0x04, "MQ Bomb Bag Chest",                           "Dodongos Cavern MQ Bomb Bag Chest",                        RHT_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST,                           RG_PROGRESSIVE_BOMB_BAG,    {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN, true);
-    locationTable[RC_DODONGOS_CAVERN_MQ_COMPASS_CHEST] =                           Location::Chest(RC_DODONGOS_CAVERN_MQ_COMPASS_CHEST,                            RCQUEST_MQ,      RCTYPE_MAP_COMPASS, RCAREA_DODONGOS_CAVERN, ACTOR_EN_BOX, SCENE_DODONGOS_CAVERN,      6149,  0x05, "MQ Compass Chest",                            "Dodongos Cavern MQ Compass Chest",                         RHT_DODONGOS_CAVERN_MQ_COMPASS_CHEST,                            RG_DODONGOS_CAVERN_COMPASS, { Category::cVanillaCompass },                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN, true);
-    locationTable[RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST] =                       Location::Chest(RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST,                        RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_DODONGOS_CAVERN, ACTOR_EN_BOX, SCENE_DODONGOS_CAVERN,      29986, 0x02, "MQ Larvae Room Chest",                        "Dodongos Cavern MQ Larvae Room Chest",                     RHT_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST,                        RG_DEKU_SHIELD,             {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST] =                 Location::Chest(RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST,                  RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_DODONGOS_CAVERN, ACTOR_EN_BOX, SCENE_DODONGOS_CAVERN,      22947, 0x03, "MQ Torch Puzzle Room Chest",                  "Dodongos Cavern MQ Torch Puzzle Room Chest",               RHT_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST,                  RG_BLUE_RUPEE,              {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST] =                       Location::Chest(RC_DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST,                        RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_DODONGOS_CAVERN, ACTOR_EN_BOX, SCENE_DODONGOS_CAVERN,      21825, 0x01, "MQ Under Grave Chest",                        "Dodongos Cavern MQ Under Grave Chest",                     RHT_DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST,                        RG_HYLIAN_SHIELD,           {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR] =                    Location::Base(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,                    RCQUEST_MQ,      RCTYPE_SCRUB,       RCAREA_DODONGOS_CAVERN, ACTOR_EN_DNS, SCENE_DODONGOS_CAVERN,      0x01,  0x31, "MQ Deku Scrub Lobby Rear",                    "Dodongos Cavern Deku Scrub Lobby Rear",                    RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,                    RG_BUY_DEKU_STICK_1,        { Category::cDekuScrub },      SpoilerCollectionCheck::Scrub(0x01, 0x02), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT] =                   Location::Base(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT,                   RCQUEST_MQ,      RCTYPE_SCRUB,       RCAREA_DODONGOS_CAVERN, ACTOR_EN_DNS, SCENE_DODONGOS_CAVERN,      0x03,  0x33, "MQ Deku Scrub Lobby Front",                   "Dodongos Cavern Deku Scrub Lobby Front",                   RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT,                   RG_BUY_DEKU_SEEDS_30,       { Category::cDekuScrub },      SpoilerCollectionCheck::Scrub(0x01, 0x04), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE] =                     Location::Base(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,                     RCQUEST_MQ,      RCTYPE_SCRUB,       RCAREA_DODONGOS_CAVERN, ACTOR_EN_DNS, SCENE_DODONGOS_CAVERN,      0x04,  0x34, "MQ Deku Scrub Staircase",                     "Dodongos Cavern Deku Scrub Staircase",                     RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,                     RG_BUY_DEKU_SHIELD,         { Category::cDekuScrub },      SpoilerCollectionCheck::Scrub(0x01, 0x05), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS] = Location::Base(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS, RCQUEST_MQ,      RCTYPE_SCRUB,       RCAREA_DODONGOS_CAVERN, ACTOR_EN_DNS, SCENE_DODONGOS_CAVERN,      0x07,  0x39, "MQ Deku Scrub Side Room Near Lower Lizalfos", "Dodongos Cavern Deku Scrub Side Room Near Lower Lizalfos", RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS, RG_BUY_RED_POTION_30,       { Category::cDekuScrub },      SpoilerCollectionCheck::Scrub(0x01, 0x08), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_MQ_MAP_CHEST] =                                  Location::Chest(RC_DODONGOS_CAVERN_MQ_MAP_CHEST,                                 RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              2080,                                              0x00, "MQ Map Chest",                                "Dodongos Cavern MQ Map Chest",                             RHT_DODONGOS_CAVERN_MQ_MAP_CHEST,                                RG_DODONGOS_CAVERN_MAP,               { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN,    true);
+    locationTable[RC_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST] =                             Location::Chest(RC_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST,                            RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              1604,                                              0x04, "MQ Bomb Bag Chest",                           "Dodongos Cavern MQ Bomb Bag Chest",                        RHT_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST,                           RG_PROGRESSIVE_BOMB_BAG,              {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN,    true);
+    locationTable[RC_DODONGOS_CAVERN_MQ_COMPASS_CHEST] =                              Location::Chest(RC_DODONGOS_CAVERN_MQ_COMPASS_CHEST,                             RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              6149,                                              0x05, "MQ Compass Chest",                            "Dodongos Cavern MQ Compass Chest",                         RHT_DODONGOS_CAVERN_MQ_COMPASS_CHEST,                            RG_DODONGOS_CAVERN_COMPASS,           { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN,    true);
+    locationTable[RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST] =                          Location::Chest(RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST,                         RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              29986,                                             0x02, "MQ Larvae Room Chest",                        "Dodongos Cavern MQ Larvae Room Chest",                     RHT_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST,                        RG_DEKU_SHIELD,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST] =                    Location::Chest(RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST,                   RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              22947,                                             0x03, "MQ Torch Puzzle Room Chest",                  "Dodongos Cavern MQ Torch Puzzle Room Chest",               RHT_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST,                  RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST] =                          Location::Chest(RC_DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST,                         RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              21825,                                             0x01, "MQ Under Grave Chest",                        "Dodongos Cavern MQ Under Grave Chest",                     RHT_DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST,                        RG_HYLIAN_SHIELD,                     {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR] =                       Location::Base(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,                     RCQUEST_MQ,      RCTYPE_SCRUB,                       RCAREA_DODONGOS_CAVERN,              ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x01,                                              0x31, "MQ Deku Scrub Lobby Rear",                    "Dodongos Cavern Deku Scrub Lobby Rear",                    RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,                    RG_BUY_DEKU_STICK_1,                  { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR),                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT] =                      Location::Base(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT,                    RCQUEST_MQ,      RCTYPE_SCRUB,                       RCAREA_DODONGOS_CAVERN,              ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x03,                                              0x33, "MQ Deku Scrub Lobby Front",                   "Dodongos Cavern Deku Scrub Lobby Front",                   RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT,                   RG_BUY_DEKU_SEEDS_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT),                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE] =                        Location::Base(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,                      RCQUEST_MQ,      RCTYPE_SCRUB,                       RCAREA_DODONGOS_CAVERN,              ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x04,                                              0x34, "MQ Deku Scrub Staircase",                     "Dodongos Cavern Deku Scrub Staircase",                     RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,                     RG_BUY_DEKU_SHIELD,                   { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE),                     SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS] =    Location::Base(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS,  RCQUEST_MQ,      RCTYPE_SCRUB,                       RCAREA_DODONGOS_CAVERN,              ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x07,                                              0x39, "MQ Deku Scrub Side Room Near Lower Lizalfos", "Dodongos Cavern Deku Scrub Side Room Near Lower Lizalfos", RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS, RG_BUY_RED_POTION_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
 
-    //            Randomizer Check                                                       Randomizer Check                                     Quest            Type                Area                     Actor ID      Scene ID         Params  Flags Short Name                         Spoiler Name                                        Hint Text Key                                         Vanilla Item                 Categories                     Spoiler Collection Check                   Collection Check Group                                      Vanilla Progression
     // Jabu-Jabu's Belly Vanilla
-    locationTable[RC_JABU_JABUS_BELLY_MAP_CHEST] =                       Location::Chest(RC_JABU_JABUS_BELLY_MAP_CHEST,                       RCQUEST_VANILLA, RCTYPE_MAP_COMPASS, RCAREA_JABU_JABUS_BELLY, ACTOR_EN_BOX, SCENE_JABU_JABU, 6178,   0x02, "Map Chest",                       "Jabu Jabus Belly Map Chest",                       RHT_JABU_JABUS_BELLY_MAP_CHEST,                       RG_JABU_JABUS_BELLY_MAP,     { Category::cVanillaMap },                                                SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY, true);
-    locationTable[RC_JABU_JABUS_BELLY_COMPASS_CHEST] =                   Location::Chest(RC_JABU_JABUS_BELLY_COMPASS_CHEST,                   RCQUEST_VANILLA, RCTYPE_MAP_COMPASS, RCAREA_JABU_JABUS_BELLY, ACTOR_EN_BOX, SCENE_JABU_JABU, -18428, 0x04, "Compass Chest",                   "Jabu Jabus Belly Compass Chest",                   RHT_JABU_JABUS_BELLY_COMPASS_CHEST,                   RG_JABU_JABUS_BELLY_COMPASS, { Category::cVanillaCompass },                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY, true);
-    locationTable[RC_JABU_JABUS_BELLY_BOOMERANG_CHEST] =                 Location::Chest(RC_JABU_JABUS_BELLY_BOOMERANG_CHEST,                 RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_JABU_JABUS_BELLY, ACTOR_EN_BOX, SCENE_JABU_JABU, 4289,   0x01, "Boomerang Chest",                 "Jabu Jabus Belly Boomerang Chest",                 RHT_JABU_JABUS_BELLY_BOOMERANG_CHEST,                 RG_BOOMERANG,                {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY, true);
-    locationTable[RC_JABU_JABUS_BELLY_DEKU_SCRUB] =                      Location::Base(RC_JABU_JABUS_BELLY_DEKU_SCRUB,                       RCQUEST_VANILLA, RCTYPE_SCRUB,       RCAREA_JABU_JABUS_BELLY, ACTOR_EN_DNS, SCENE_JABU_JABU, 0x00,   0x30, "Deku Scrub",                      "Jabu Jabus Belly Deku Scrub",                      RHT_JABU_JABUS_BELLY_DEKU_SCRUB,                      RG_BUY_DEKU_NUTS_5,          { Category::cDekuScrub },      SpoilerCollectionCheck::Scrub(0x02, 0x01), SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_MAP_CHEST] =                                    Location::Chest(RC_JABU_JABUS_BELLY_MAP_CHEST,                                   RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    6178,                                              0x02, "Map Chest",                                   "Jabu Jabus Belly Map Chest",                               RHT_JABU_JABUS_BELLY_MAP_CHEST,                                  RG_JABU_JABUS_BELLY_MAP,              { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY,    true);
+    locationTable[RC_JABU_JABUS_BELLY_COMPASS_CHEST] =                                Location::Chest(RC_JABU_JABUS_BELLY_COMPASS_CHEST,                               RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    -18428,                                            0x04, "Compass Chest",                               "Jabu Jabus Belly Compass Chest",                           RHT_JABU_JABUS_BELLY_COMPASS_CHEST,                              RG_JABU_JABUS_BELLY_COMPASS,          { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY,    true);
+    locationTable[RC_JABU_JABUS_BELLY_BOOMERANG_CHEST] =                              Location::Chest(RC_JABU_JABUS_BELLY_BOOMERANG_CHEST,                             RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    4289,                                              0x01, "Boomerang Chest",                             "Jabu Jabus Belly Boomerang Chest",                         RHT_JABU_JABUS_BELLY_BOOMERANG_CHEST,                            RG_BOOMERANG,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY,    true);
+    locationTable[RC_JABU_JABUS_BELLY_DEKU_SCRUB] =                                    Location::Base(RC_JABU_JABUS_BELLY_DEKU_SCRUB,                                  RCQUEST_VANILLA, RCTYPE_SCRUB,                       RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_DNS,         SCENE_JABU_JABU,                    0x00,                                              0x30, "Deku Scrub",                                  "Jabu Jabus Belly Deku Scrub",                              RHT_JABU_JABUS_BELLY_DEKU_SCRUB,                                 RG_BUY_DEKU_NUTS_5,                   { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_JABU_JABUS_BELLY_DEKU_SCRUB),                                 SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
     // Jabu-Jabu's Belly MQ
-    locationTable[RC_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST] =        Location::Chest(RC_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST,        RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_JABU_JABUS_BELLY, ACTOR_EN_BOX, SCENE_JABU_JABU, -32699, 0x05, "MQ First Room Side Chest",        "Jabu Jabus Belly MQ First Room Side Chest",        RHT_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST,        RG_DEKU_NUTS_5,              {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_JABU_JABUS_BELLY_MQ_MAP_CHEST] =                    Location::Chest(RC_JABU_JABUS_BELLY_MQ_MAP_CHEST,                    RCQUEST_MQ,      RCTYPE_MAP_COMPASS, RCAREA_JABU_JABUS_BELLY, ACTOR_EN_BOX, SCENE_JABU_JABU, -18397, 0x03, "MQ Map Chest",                    "Jabu Jabus Belly MQ Map Chest",                    RHT_JABU_JABUS_BELLY_MQ_MAP_CHEST,                    RG_JABU_JABUS_BELLY_MAP,     { Category::cVanillaMap },                                                SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY, true);
-    locationTable[RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST] =      Location::Chest(RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST,      RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_JABU_JABUS_BELLY, ACTOR_EN_BOX, SCENE_JABU_JABU, 20546,  0x02, "MQ Second Room Lower Chest",      "Jabu Jabus Belly MQ Second Room Lower Chest",      RHT_JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST,      RG_DEKU_NUTS_5,              {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_JABU_JABUS_BELLY_MQ_COMPASS_CHEST] =                Location::Chest(RC_JABU_JABUS_BELLY_MQ_COMPASS_CHEST,                RCQUEST_MQ,      RCTYPE_MAP_COMPASS, RCAREA_JABU_JABUS_BELLY, ACTOR_EN_BOX, SCENE_JABU_JABU, -18432, 0x00, "MQ Compass Chest",                "Jabu Jabus Belly MQ Compass Chest",                RHT_JABU_JABUS_BELLY_MQ_COMPASS_CHEST,                RG_JABU_JABUS_BELLY_COMPASS, { Category::cVanillaCompass },                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY, true);
-    locationTable[RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST] =      Location::Chest(RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST,      RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_JABU_JABUS_BELLY, ACTOR_EN_BOX, SCENE_JABU_JABU, -30457, 0x07, "MQ Second Room Upper Chest",      "Jabu Jabus Belly MQ Second Room Upper Chest",      RHT_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST,      RG_RECOVERY_HEART,           {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST] = Location::Chest(RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST, RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_JABU_JABUS_BELLY, ACTOR_EN_BOX, SCENE_JABU_JABU, -32696, 0x08, "MQ Basement Near Switches Chest", "Jabu Jabus Belly MQ Basement Near Switches Chest", RHT_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST, RG_DEKU_NUTS_5,              {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST] =    Location::Chest(RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST,    RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_JABU_JABUS_BELLY, ACTOR_EN_BOX, SCENE_JABU_JABU, -32668, 0x04, "MQ Basement Near Vines Chest",    "Jabu Jabus Belly MQ Basement Near Vines Chest",    RHT_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST,    RG_BOMBCHU_10,               {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST] =              Location::Chest(RC_JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST,              RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_JABU_JABUS_BELLY, ACTOR_EN_BOX, SCENE_JABU_JABU, -31446, 0x0A, "MQ Near Boss Chest",              "Jabu Jabus Belly MQ Near Boss Chest",              RHT_JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST,              RG_DEKU_SHIELD,              {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST] = Location::Chest(RC_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST, RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_JABU_JABUS_BELLY, ACTOR_EN_BOX, SCENE_JABU_JABU, 28905,  0x09, "MQ Falling Like Like Room Chest", "Jabu Jabus Belly MQ Falling Like Like Room Chest", RHT_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST, RG_DEKU_STICK_1,             {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST] =   Location::Chest(RC_JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST,   RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_JABU_JABUS_BELLY, ACTOR_EN_BOX, SCENE_JABU_JABU, 20545,  0x01, "MQ Boomerang Room Small Chest",   "Jabu Jabus Belly MQ Boomerang Room Small Chest",   RHT_JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST,   RG_DEKU_NUTS_5,              {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST] =              Location::Chest(RC_JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST,              RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_JABU_JABUS_BELLY, ACTOR_EN_BOX, SCENE_JABU_JABU, 4294,   0x06, "MQ Boomerang Chest",              "Jabu Jabus Belly MQ Boomerang Chest",              RHT_JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST,              RG_BOOMERANG,                {},                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY, true);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST] =                     Location::Chest(RC_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST,                    RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    -32699,                                            0x05, "MQ First Room Side Chest",                    "Jabu Jabus Belly MQ First Room Side Chest",                RHT_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST,                   RG_DEKU_NUTS_5,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_MAP_CHEST] =                                 Location::Chest(RC_JABU_JABUS_BELLY_MQ_MAP_CHEST,                                RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    -18397,                                            0x03, "MQ Map Chest",                                "Jabu Jabus Belly MQ Map Chest",                            RHT_JABU_JABUS_BELLY_MQ_MAP_CHEST,                               RG_JABU_JABUS_BELLY_MAP,              { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY,    true);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST] =                   Location::Chest(RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST,                  RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    20546,                                             0x02, "MQ Second Room Lower Chest",                  "Jabu Jabus Belly MQ Second Room Lower Chest",              RHT_JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST,                 RG_DEKU_NUTS_5,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_COMPASS_CHEST] =                             Location::Chest(RC_JABU_JABUS_BELLY_MQ_COMPASS_CHEST,                            RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    -18432,                                            0x00, "MQ Compass Chest",                            "Jabu Jabus Belly MQ Compass Chest",                        RHT_JABU_JABUS_BELLY_MQ_COMPASS_CHEST,                           RG_JABU_JABUS_BELLY_COMPASS,          { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY,    true);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST] =                   Location::Chest(RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST,                  RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    -30457,                                            0x07, "MQ Second Room Upper Chest",                  "Jabu Jabus Belly MQ Second Room Upper Chest",              RHT_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST,                 RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST] =              Location::Chest(RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST,             RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    -32696,                                            0x08, "MQ Basement Near Switches Chest",             "Jabu Jabus Belly MQ Basement Near Switches Chest",         RHT_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST,            RG_DEKU_NUTS_5,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST] =                 Location::Chest(RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST,                RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    -32668,                                            0x04, "MQ Basement Near Vines Chest",                "Jabu Jabus Belly MQ Basement Near Vines Chest",            RHT_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST,               RG_BOMBCHU_10,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST] =                           Location::Chest(RC_JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST,                          RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    -31446,                                            0x0A, "MQ Near Boss Chest",                          "Jabu Jabus Belly MQ Near Boss Chest",                      RHT_JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST,                         RG_DEKU_SHIELD,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST] =              Location::Chest(RC_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST,             RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    28905,                                             0x09, "MQ Falling Like Like Room Chest",             "Jabu Jabus Belly MQ Falling Like Like Room Chest",         RHT_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST,            RG_DEKU_STICK_1,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST] =                Location::Chest(RC_JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST,               RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    20545,                                             0x01, "MQ Boomerang Room Small Chest",               "Jabu Jabus Belly MQ Boomerang Room Small Chest",           RHT_JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST,              RG_DEKU_NUTS_5,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST] =                           Location::Chest(RC_JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST,                          RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    4294,                                              0x06, "MQ Boomerang Chest",                          "Jabu Jabus Belly MQ Boomerang Chest",                      RHT_JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST,                         RG_BOOMERANG,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY,    true);
 
-    //            Randomizer Check                                                           Randomizer Check                                         Quest            Type                Area                  Actor ID      Scene ID             Params  Flags Short Name                                Spoiler Name                                            Hint Text Key                                             Vanilla Item                Categories                      Collection Check Group                                    Vanilla Progression
     // Forest Temple Vanilla
-    locationTable[RC_FOREST_TEMPLE_FIRST_ROOM_CHEST] =                       Location::Chest(RC_FOREST_TEMPLE_FIRST_ROOM_CHEST,                       RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, 22595,  0x03, "First Room Chest",                       "Forest Temple First Room Chest",                       RHT_FOREST_TEMPLE_FIRST_ROOM_CHEST,                       RG_FOREST_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE, true);
-    locationTable[RC_FOREST_TEMPLE_FIRST_STALFOS_CHEST] =                    Location::Chest(RC_FOREST_TEMPLE_FIRST_STALFOS_CHEST,                    RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, 30784,  0x00, "First Stalfos Chest",                    "Forest Temple First Stalfos Chest",                    RHT_FOREST_TEMPLE_FIRST_STALFOS_CHEST,                    RG_FOREST_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE, true);
-    locationTable[RC_FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST] =          Location::Chest(RC_FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST,          RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, 22789,  0x05, "Raised Island Courtyard Chest",          "Forest Temple Raised Island Courtyard Chest",          RHT_FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST,          RG_RECOVERY_HEART,          {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[RC_FOREST_TEMPLE_MAP_CHEST] =                              Location::Chest(RC_FOREST_TEMPLE_MAP_CHEST,                              RCQUEST_VANILLA, RCTYPE_MAP_COMPASS, RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, 6177,   0x01, "Map Chest",                              "Forest Temple Map Chest",                              RHT_FOREST_TEMPLE_MAP_CHEST,                              RG_FOREST_TEMPLE_MAP,       { Category::cVanillaMap },      SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE, true);
-    locationTable[RC_FOREST_TEMPLE_WELL_CHEST] =                             Location::Chest(RC_FOREST_TEMPLE_WELL_CHEST,                             RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, 22601,  0x09, "Well Chest",                             "Forest Temple Well Chest",                             RHT_FOREST_TEMPLE_WELL_CHEST,                             RG_FOREST_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE, true);
-    locationTable[RC_FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST] =             Location::Chest(RC_FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST,             RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, 22855,  0x07, "Falling Ceiling Room Chest",             "Forest Temple Falling Ceiling Room Chest",             RHT_FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST,             RG_ARROWS_10,               {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[RC_FOREST_TEMPLE_EYE_SWITCH_CHEST] =                       Location::Chest(RC_FOREST_TEMPLE_EYE_SWITCH_CHEST,                       RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, -30364, 0x04, "Eye Switch Chest",                       "Forest Temple Eye Switch Chest",                       RHT_FOREST_TEMPLE_EYE_SWITCH_CHEST,                       RG_ARROWS_30,               {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[RC_FOREST_TEMPLE_BOSS_KEY_CHEST] =                         Location::Chest(RC_FOREST_TEMPLE_BOSS_KEY_CHEST,                         RCQUEST_VANILLA, RCTYPE_BOSS_KEY,    RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, 10222,  0x0E, "Boss Key Chest",                         "Forest Temple Boss Key Chest",                         RHT_FOREST_TEMPLE_BOSS_KEY_CHEST,                         RG_FOREST_TEMPLE_BOSS_KEY,  { Category::cVanillaBossKey },  SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE, true);
-    locationTable[RC_FOREST_TEMPLE_FLOORMASTER_CHEST] =                      Location::Chest(RC_FOREST_TEMPLE_FLOORMASTER_CHEST,                      RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, 30786,  0x02, "Floormaster Chest",                      "Forest Temple Floormaster Chest",                      RHT_FOREST_TEMPLE_FLOORMASTER_CHEST,                      RG_FOREST_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE, true);
-    locationTable[RC_FOREST_TEMPLE_BOW_CHEST] =                              Location::Chest(RC_FOREST_TEMPLE_BOW_CHEST,                              RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, -20340, 0x0C, "Bow Chest",                              "Forest Temple Bow Chest",                              RHT_FOREST_TEMPLE_BOW_CHEST,                              RG_PROGRESSIVE_BOW,         {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE, true);
-    locationTable[RC_FOREST_TEMPLE_RED_POE_CHEST] =                          Location::Chest(RC_FOREST_TEMPLE_RED_POE_CHEST,                          RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, 30797,  0x0D, "Red Poe Chest",                          "Forest Temple Red Poe Chest",                          RHT_FOREST_TEMPLE_RED_POE_CHEST,                          RG_FOREST_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE, true);
-    locationTable[RC_FOREST_TEMPLE_BLUE_POE_CHEST] =                         Location::Chest(RC_FOREST_TEMPLE_BLUE_POE_CHEST,                         RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, 6159,   0x0F, "Blue Poe Chest",                         "Forest Temple Blue Poe Chest",                         RHT_FOREST_TEMPLE_BLUE_POE_CHEST,                         RG_FOREST_TEMPLE_COMPASS,   { Category::cVanillaCompass },  SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE, true);
-    locationTable[RC_FOREST_TEMPLE_BASEMENT_CHEST] =                         Location::Chest(RC_FOREST_TEMPLE_BASEMENT_CHEST,                         RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, 22827,  0x0B, "Basement Chest",                         "Forest Temple Basement Chest",                         RHT_FOREST_TEMPLE_BASEMENT_CHEST,                         RG_ARROWS_5,                {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_FIRST_ROOM_CHEST] =                                Location::Chest(RC_FOREST_TEMPLE_FIRST_ROOM_CHEST,                               RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                22595,                                             0x03, "First Room Chest",                            "Forest Temple First Room Chest",                           RHT_FOREST_TEMPLE_FIRST_ROOM_CHEST,                              RG_FOREST_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
+    locationTable[RC_FOREST_TEMPLE_FIRST_STALFOS_CHEST] =                             Location::Chest(RC_FOREST_TEMPLE_FIRST_STALFOS_CHEST,                            RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                30784,                                             0x00, "First Stalfos Chest",                         "Forest Temple First Stalfos Chest",                        RHT_FOREST_TEMPLE_FIRST_STALFOS_CHEST,                           RG_FOREST_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
+    locationTable[RC_FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST] =                   Location::Chest(RC_FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST,                  RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                22789,                                             0x05, "Raised Island Courtyard Chest",               "Forest Temple Raised Island Courtyard Chest",              RHT_FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST,                 RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_MAP_CHEST] =                                       Location::Chest(RC_FOREST_TEMPLE_MAP_CHEST,                                      RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                6177,                                              0x01, "Map Chest",                                   "Forest Temple Map Chest",                                  RHT_FOREST_TEMPLE_MAP_CHEST,                                     RG_FOREST_TEMPLE_MAP,                 { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
+    locationTable[RC_FOREST_TEMPLE_WELL_CHEST] =                                      Location::Chest(RC_FOREST_TEMPLE_WELL_CHEST,                                     RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                22601,                                             0x09, "Well Chest",                                  "Forest Temple Well Chest",                                 RHT_FOREST_TEMPLE_WELL_CHEST,                                    RG_FOREST_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
+    locationTable[RC_FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST] =                      Location::Chest(RC_FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST,                     RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                22855,                                             0x07, "Falling Ceiling Room Chest",                  "Forest Temple Falling Ceiling Room Chest",                 RHT_FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST,                    RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_EYE_SWITCH_CHEST] =                                Location::Chest(RC_FOREST_TEMPLE_EYE_SWITCH_CHEST,                               RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                -30364,                                            0x04, "Eye Switch Chest",                            "Forest Temple Eye Switch Chest",                           RHT_FOREST_TEMPLE_EYE_SWITCH_CHEST,                              RG_ARROWS_30,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_BOSS_KEY_CHEST] =                                  Location::Chest(RC_FOREST_TEMPLE_BOSS_KEY_CHEST,                                 RCQUEST_VANILLA, RCTYPE_BOSS_KEY,                    RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                10222,                                             0x0E, "Boss Key Chest",                              "Forest Temple Boss Key Chest",                             RHT_FOREST_TEMPLE_BOSS_KEY_CHEST,                                RG_FOREST_TEMPLE_BOSS_KEY,            { Category::cVanillaBossKey },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
+    locationTable[RC_FOREST_TEMPLE_FLOORMASTER_CHEST] =                               Location::Chest(RC_FOREST_TEMPLE_FLOORMASTER_CHEST,                              RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                30786,                                             0x02, "Floormaster Chest",                           "Forest Temple Floormaster Chest",                          RHT_FOREST_TEMPLE_FLOORMASTER_CHEST,                             RG_FOREST_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
+    locationTable[RC_FOREST_TEMPLE_BOW_CHEST] =                                       Location::Chest(RC_FOREST_TEMPLE_BOW_CHEST,                                      RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                -20340,                                            0x0C, "Bow Chest",                                   "Forest Temple Bow Chest",                                  RHT_FOREST_TEMPLE_BOW_CHEST,                                     RG_PROGRESSIVE_BOW,                   {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
+    locationTable[RC_FOREST_TEMPLE_RED_POE_CHEST] =                                   Location::Chest(RC_FOREST_TEMPLE_RED_POE_CHEST,                                  RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                30797,                                             0x0D, "Red Poe Chest",                               "Forest Temple Red Poe Chest",                              RHT_FOREST_TEMPLE_RED_POE_CHEST,                                 RG_FOREST_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
+    locationTable[RC_FOREST_TEMPLE_BLUE_POE_CHEST] =                                  Location::Chest(RC_FOREST_TEMPLE_BLUE_POE_CHEST,                                 RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                6159,                                              0x0F, "Blue Poe Chest",                              "Forest Temple Blue Poe Chest",                             RHT_FOREST_TEMPLE_BLUE_POE_CHEST,                                RG_FOREST_TEMPLE_COMPASS,             { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
+    locationTable[RC_FOREST_TEMPLE_BASEMENT_CHEST] =                                  Location::Chest(RC_FOREST_TEMPLE_BASEMENT_CHEST,                                 RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                22827,                                             0x0B, "Basement Chest",                              "Forest Temple Basement Chest",                             RHT_FOREST_TEMPLE_BASEMENT_CHEST,                                RG_ARROWS_5,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
     // Forest Temple MQ
-    locationTable[RC_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST] =                    Location::Chest(RC_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST,                    RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, -30653, 0x03, "MQ First Room Chest",                    "Forest Temple MQ First Room Chest",                    RHT_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST,                    RG_FOREST_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[RC_FOREST_TEMPLE_MQ_WOLFOS_CHEST] =                        Location::Chest(RC_FOREST_TEMPLE_MQ_WOLFOS_CHEST,                        RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, 30784,  0x00, "MQ Wolfos Chest",                        "Forest Temple MQ Wolfos Chest",                        RHT_FOREST_TEMPLE_MQ_WOLFOS_CHEST,                        RG_FOREST_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE, true);
-    locationTable[RC_FOREST_TEMPLE_MQ_BOW_CHEST] =                           Location::Chest(RC_FOREST_TEMPLE_MQ_BOW_CHEST,                           RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, -20340, 0x0C, "MQ Bow Chest",                           "Forest Temple MQ Bow Chest",                           RHT_FOREST_TEMPLE_MQ_BOW_CHEST,                           RG_PROGRESSIVE_BOW,         {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE, true);
-    locationTable[RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST] = Location::Chest(RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST, RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, 22593,  0x01, "MQ Raised Island Courtyard Lower Chest", "Forest Temple MQ Raised Island Courtyard Lower Chest", RHT_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST, RG_FOREST_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE, true);
-    locationTable[RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST] = Location::Chest(RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST, RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, 22597,  0x05, "MQ Raised Island Courtyard Upper Chest", "Forest Temple MQ Raised Island Courtyard Upper Chest", RHT_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST, RG_FOREST_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE, true);
-    locationTable[RC_FOREST_TEMPLE_MQ_WELL_CHEST] =                          Location::Chest(RC_FOREST_TEMPLE_MQ_WELL_CHEST,                          RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, 22601,  0x09, "MQ Well Chest",                          "Forest Temple MQ Well Chest",                          RHT_FOREST_TEMPLE_MQ_WELL_CHEST,                          RG_FOREST_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE, true);
-    locationTable[RC_FOREST_TEMPLE_MQ_MAP_CHEST] =                           Location::Chest(RC_FOREST_TEMPLE_MQ_MAP_CHEST,                           RCQUEST_MQ,      RCTYPE_MAP_COMPASS, RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, 6189,   0x0D, "MQ Map Chest",                           "Forest Temple MQ Map Chest",                           RHT_FOREST_TEMPLE_MQ_MAP_CHEST,                           RG_FOREST_TEMPLE_MAP,       { Category::cVanillaMap },      SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE, true);
-    locationTable[RC_FOREST_TEMPLE_MQ_COMPASS_CHEST] =                       Location::Chest(RC_FOREST_TEMPLE_MQ_COMPASS_CHEST,                       RCQUEST_MQ,      RCTYPE_MAP_COMPASS, RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, 6159,   0x0F, "MQ Compass Chest",                       "Forest Temple MQ Compass Chest",                       RHT_FOREST_TEMPLE_MQ_COMPASS_CHEST,                       RG_FOREST_TEMPLE_COMPASS,   { Category::cVanillaCompass },  SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE, true);
-    locationTable[RC_FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST] =          Location::Chest(RC_FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST,          RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, -30426, 0x06, "MQ Falling Ceiling Room Chest",          "Forest Temple MQ Falling Ceiling Room Chest",          RHT_FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST,          RG_ARROWS_5,                {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[RC_FOREST_TEMPLE_MQ_BASEMENT_CHEST] =                      Location::Chest(RC_FOREST_TEMPLE_MQ_BASEMENT_CHEST,                      RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, 22827,  0x0B, "MQ Basement Chest",                      "Forest Temple MQ Basement Chest",                      RHT_FOREST_TEMPLE_MQ_BASEMENT_CHEST,                      RG_ARROWS_5,                {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[RC_FOREST_TEMPLE_MQ_REDEAD_CHEST] =                        Location::Chest(RC_FOREST_TEMPLE_MQ_REDEAD_CHEST,                        RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, 30786,  0x02, "MQ Redead Chest",                        "Forest Temple MQ Redead Chest",                        RHT_FOREST_TEMPLE_MQ_REDEAD_CHEST,                        RG_FOREST_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE, true);
-    locationTable[RC_FOREST_TEMPLE_MQ_BOSS_KEY_CHEST] =                      Location::Chest(RC_FOREST_TEMPLE_MQ_BOSS_KEY_CHEST,                      RCQUEST_MQ,      RCTYPE_BOSS_KEY,    RCAREA_FOREST_TEMPLE, ACTOR_EN_BOX, SCENE_FOREST_TEMPLE, 10222,  0x0E, "MQ Boss Key Chest",                      "Forest Temple MQ Boss Key Chest",                      RHT_FOREST_TEMPLE_MQ_BOSS_KEY_CHEST,                      RG_FOREST_TEMPLE_BOSS_KEY,  { Category::cVanillaBossKey },  SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE, true);
+    locationTable[RC_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST] =                             Location::Chest(RC_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST,                            RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                -30653,                                            0x03, "MQ First Room Chest",                         "Forest Temple MQ First Room Chest",                        RHT_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST,                           RG_FOREST_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_MQ_WOLFOS_CHEST] =                                 Location::Chest(RC_FOREST_TEMPLE_MQ_WOLFOS_CHEST,                                RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                30784,                                             0x00, "MQ Wolfos Chest",                             "Forest Temple MQ Wolfos Chest",                            RHT_FOREST_TEMPLE_MQ_WOLFOS_CHEST,                               RG_FOREST_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
+    locationTable[RC_FOREST_TEMPLE_MQ_BOW_CHEST] =                                    Location::Chest(RC_FOREST_TEMPLE_MQ_BOW_CHEST,                                   RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                -20340,                                            0x0C, "MQ Bow Chest",                                "Forest Temple MQ Bow Chest",                               RHT_FOREST_TEMPLE_MQ_BOW_CHEST,                                  RG_PROGRESSIVE_BOW,                   {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
+    locationTable[RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST] =          Location::Chest(RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST,         RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                22593,                                             0x01, "MQ Raised Island Courtyard Lower Chest",      "Forest Temple MQ Raised Island Courtyard Lower Chest",     RHT_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST,        RG_FOREST_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
+    locationTable[RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST] =          Location::Chest(RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST,         RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                22597,                                             0x05, "MQ Raised Island Courtyard Upper Chest",      "Forest Temple MQ Raised Island Courtyard Upper Chest",     RHT_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST,        RG_FOREST_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
+    locationTable[RC_FOREST_TEMPLE_MQ_WELL_CHEST] =                                   Location::Chest(RC_FOREST_TEMPLE_MQ_WELL_CHEST,                                  RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                22601,                                             0x09, "MQ Well Chest",                               "Forest Temple MQ Well Chest",                              RHT_FOREST_TEMPLE_MQ_WELL_CHEST,                                 RG_FOREST_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
+    locationTable[RC_FOREST_TEMPLE_MQ_MAP_CHEST] =                                    Location::Chest(RC_FOREST_TEMPLE_MQ_MAP_CHEST,                                   RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                6189,                                              0x0D, "MQ Map Chest",                                "Forest Temple MQ Map Chest",                               RHT_FOREST_TEMPLE_MQ_MAP_CHEST,                                  RG_FOREST_TEMPLE_MAP,                 { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
+    locationTable[RC_FOREST_TEMPLE_MQ_COMPASS_CHEST] =                                Location::Chest(RC_FOREST_TEMPLE_MQ_COMPASS_CHEST,                               RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                6159,                                              0x0F, "MQ Compass Chest",                            "Forest Temple MQ Compass Chest",                           RHT_FOREST_TEMPLE_MQ_COMPASS_CHEST,                              RG_FOREST_TEMPLE_COMPASS,             { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
+    locationTable[RC_FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST] =                   Location::Chest(RC_FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST,                  RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                -30426,                                            0x06, "MQ Falling Ceiling Room Chest",               "Forest Temple MQ Falling Ceiling Room Chest",              RHT_FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST,                 RG_ARROWS_5,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_MQ_BASEMENT_CHEST] =                               Location::Chest(RC_FOREST_TEMPLE_MQ_BASEMENT_CHEST,                              RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                22827,                                             0x0B, "MQ Basement Chest",                           "Forest Temple MQ Basement Chest",                          RHT_FOREST_TEMPLE_MQ_BASEMENT_CHEST,                             RG_ARROWS_5,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_MQ_REDEAD_CHEST] =                                 Location::Chest(RC_FOREST_TEMPLE_MQ_REDEAD_CHEST,                                RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                30786,                                             0x02, "MQ Redead Chest",                             "Forest Temple MQ Redead Chest",                            RHT_FOREST_TEMPLE_MQ_REDEAD_CHEST,                               RG_FOREST_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
+    locationTable[RC_FOREST_TEMPLE_MQ_BOSS_KEY_CHEST] =                               Location::Chest(RC_FOREST_TEMPLE_MQ_BOSS_KEY_CHEST,                              RCQUEST_MQ,      RCTYPE_BOSS_KEY,                    RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                10222,                                             0x0E, "MQ Boss Key Chest",                           "Forest Temple MQ Boss Key Chest",                          RHT_FOREST_TEMPLE_MQ_BOSS_KEY_CHEST,                             RG_FOREST_TEMPLE_BOSS_KEY,            { Category::cVanillaBossKey },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
 
-    //            Randomizer Check                                                      Randomizer Check                                    Quest            Type                Area                Actor ID         Scene ID           Params Flags Short Name                             Spoiler Name                                       Hint Text Key                                        Vanilla Item              Categories                      Collection Check Group                                  Vanilla Progression
     // Fire Temple Vanilla
-    locationTable[RC_FIRE_TEMPLE_NEAR_BOSS_CHEST] =                     Location::Chest(RC_FIRE_TEMPLE_NEAR_BOSS_CHEST,                     RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 22593, 0x01, "Near Boss Chest",                     "Fire Temple Near Boss Chest",                     RHT_FIRE_TEMPLE_NEAR_BOSS_CHEST,                     RG_FIRE_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE, true);
-    locationTable[RC_FIRE_TEMPLE_FLARE_DANCER_CHEST] =                  Location::Chest(RC_FIRE_TEMPLE_FLARE_DANCER_CHEST,                  RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 31936, 0x00, "Flare Dancer Chest",                  "Fire Temple Flare Dancer Chest",                  RHT_FIRE_TEMPLE_FLARE_DANCER_CHEST,                  RG_BOMBS_10,              {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[RC_FIRE_TEMPLE_BOSS_KEY_CHEST] =                      Location::Chest(RC_FIRE_TEMPLE_BOSS_KEY_CHEST,                      RCQUEST_VANILLA, RCTYPE_BOSS_KEY,    RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 10220, 0x0C, "Boss Key Chest",                      "Fire Temple Boss Key Chest",                      RHT_FIRE_TEMPLE_BOSS_KEY_CHEST,                      RG_FIRE_TEMPLE_BOSS_KEY,  { Category::cVanillaBossKey },  SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE, true);
-    locationTable[RC_FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST] =    Location::Chest(RC_FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST,    RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 22594, 0x02, "Big Lava Room Blocked Door Chest",    "Fire Temple Big Lava Room Blocked Door Chest",    RHT_FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST,    RG_FIRE_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE, true);
-    locationTable[RC_FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST] = Location::Chest(RC_FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST, RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 22596, 0x04, "Big Lava Room Lower Open Door Chest", "Fire Temple Big Lava Room Lower Open Door Chest", RHT_FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST, RG_FIRE_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE, true);
-    locationTable[RC_FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST] =            Location::Chest(RC_FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST,            RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 22595, 0x03, "Boulder Maze Lower Chest",            "Fire Temple Boulder Maze Lower Chest",            RHT_FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST,            RG_FIRE_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE, true);
-    locationTable[RC_FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST] =            Location::Chest(RC_FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST,            RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 22598, 0x06, "Boulder Maze Upper Chest",            "Fire Temple Boulder Maze Upper Chest",            RHT_FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST,            RG_FIRE_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE, true);
-    locationTable[RC_FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST] =        Location::Chest(RC_FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST,        RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 22600, 0x08, "Boulder Maze Side Room Chest",        "Fire Temple Boulder Maze Side Room Chest",        RHT_FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST,        RG_FIRE_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE, true);
-    locationTable[RC_FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST] =         Location::Chest(RC_FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST,         RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 22603, 0x0B, "Boulder Maze Shortcut Chest",         "Fire Temple Boulder Maze Shortcut Chest",         RHT_FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST,         RG_FIRE_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE, true);
-    locationTable[RC_FIRE_TEMPLE_SCARECROW_CHEST] =                     Location::Chest(RC_FIRE_TEMPLE_SCARECROW_CHEST,                     RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 23245, 0x0D, "Scarecrow Chest",                     "Fire Temple Scarecrow Chest",                     RHT_FIRE_TEMPLE_SCARECROW_CHEST,                     RG_HUGE_RUPEE,            {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[RC_FIRE_TEMPLE_MAP_CHEST] =                           Location::Chest(RC_FIRE_TEMPLE_MAP_CHEST,                           RCQUEST_VANILLA, RCTYPE_MAP_COMPASS, RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 2090,  0x0A, "Map Chest",                           "Fire Temple Map Chest",                           RHT_FIRE_TEMPLE_MAP_CHEST,                           RG_FIRE_TEMPLE_MAP,       { Category::cVanillaMap },      SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE, true);
-    locationTable[RC_FIRE_TEMPLE_COMPASS_CHEST] =                       Location::Chest(RC_FIRE_TEMPLE_COMPASS_CHEST,                       RCQUEST_VANILLA, RCTYPE_MAP_COMPASS, RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 2055,  0x07, "Compass Chest",                       "Fire Temple Compass Chest",                       RHT_FIRE_TEMPLE_COMPASS_CHEST,                       RG_FIRE_TEMPLE_COMPASS,   { Category::cVanillaCompass },  SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE, true);
-    locationTable[RC_FIRE_TEMPLE_HIGHEST_GORON_CHEST] =                 Location::Chest(RC_FIRE_TEMPLE_HIGHEST_GORON_CHEST,                 RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 22601, 0x09, "Highest Goron Chest",                 "Fire Temple Highest Goron Chest",                 RHT_FIRE_TEMPLE_HIGHEST_GORON_CHEST,                 RG_FIRE_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE, true);
-    locationTable[RC_FIRE_TEMPLE_MEGATON_HAMMER_CHEST] =                Location::Chest(RC_FIRE_TEMPLE_MEGATON_HAMMER_CHEST,                RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 421,   0x05, "Megaton Hammer Chest",                "Fire Temple Megaton Hammer Chest",                RHT_FIRE_TEMPLE_MEGATON_HAMMER_CHEST,                RG_MEGATON_HAMMER,        {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE, true);
+    locationTable[RC_FIRE_TEMPLE_NEAR_BOSS_CHEST] =                                   Location::Chest(RC_FIRE_TEMPLE_NEAR_BOSS_CHEST,                                  RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22593,                                             0x01, "Near Boss Chest",                             "Fire Temple Near Boss Chest",                              RHT_FIRE_TEMPLE_NEAR_BOSS_CHEST,                                 RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_FIRE_TEMPLE_FLARE_DANCER_CHEST] =                                Location::Chest(RC_FIRE_TEMPLE_FLARE_DANCER_CHEST,                               RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  31936,                                             0x00, "Flare Dancer Chest",                          "Fire Temple Flare Dancer Chest",                           RHT_FIRE_TEMPLE_FLARE_DANCER_CHEST,                              RG_BOMBS_10,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    locationTable[RC_FIRE_TEMPLE_BOSS_KEY_CHEST] =                                    Location::Chest(RC_FIRE_TEMPLE_BOSS_KEY_CHEST,                                   RCQUEST_VANILLA, RCTYPE_BOSS_KEY,                    RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  10220,                                             0x0C, "Boss Key Chest",                              "Fire Temple Boss Key Chest",                               RHT_FIRE_TEMPLE_BOSS_KEY_CHEST,                                  RG_FIRE_TEMPLE_BOSS_KEY,              { Category::cVanillaBossKey },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST] =                  Location::Chest(RC_FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST,                 RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22594,                                             0x02, "Big Lava Room Blocked Door Chest",            "Fire Temple Big Lava Room Blocked Door Chest",             RHT_FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST,                RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST] =               Location::Chest(RC_FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST,              RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22596,                                             0x04, "Big Lava Room Lower Open Door Chest",         "Fire Temple Big Lava Room Lower Open Door Chest",          RHT_FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST,             RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST] =                          Location::Chest(RC_FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST,                         RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22595,                                             0x03, "Boulder Maze Lower Chest",                    "Fire Temple Boulder Maze Lower Chest",                     RHT_FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST,                        RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST] =                          Location::Chest(RC_FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST,                         RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22598,                                             0x06, "Boulder Maze Upper Chest",                    "Fire Temple Boulder Maze Upper Chest",                     RHT_FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST,                        RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST] =                      Location::Chest(RC_FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST,                     RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22600,                                             0x08, "Boulder Maze Side Room Chest",                "Fire Temple Boulder Maze Side Room Chest",                 RHT_FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST,                    RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST] =                       Location::Chest(RC_FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST,                      RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22603,                                             0x0B, "Boulder Maze Shortcut Chest",                 "Fire Temple Boulder Maze Shortcut Chest",                  RHT_FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST,                     RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_FIRE_TEMPLE_SCARECROW_CHEST] =                                   Location::Chest(RC_FIRE_TEMPLE_SCARECROW_CHEST,                                  RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  23245,                                             0x0D, "Scarecrow Chest",                             "Fire Temple Scarecrow Chest",                              RHT_FIRE_TEMPLE_SCARECROW_CHEST,                                 RG_HUGE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    locationTable[RC_FIRE_TEMPLE_MAP_CHEST] =                                         Location::Chest(RC_FIRE_TEMPLE_MAP_CHEST,                                        RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  2090,                                              0x0A, "Map Chest",                                   "Fire Temple Map Chest",                                    RHT_FIRE_TEMPLE_MAP_CHEST,                                       RG_FIRE_TEMPLE_MAP,                   { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_FIRE_TEMPLE_COMPASS_CHEST] =                                     Location::Chest(RC_FIRE_TEMPLE_COMPASS_CHEST,                                    RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  2055,                                              0x07, "Compass Chest",                               "Fire Temple Compass Chest",                                RHT_FIRE_TEMPLE_COMPASS_CHEST,                                   RG_FIRE_TEMPLE_COMPASS,               { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_FIRE_TEMPLE_HIGHEST_GORON_CHEST] =                               Location::Chest(RC_FIRE_TEMPLE_HIGHEST_GORON_CHEST,                              RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22601,                                             0x09, "Highest Goron Chest",                         "Fire Temple Highest Goron Chest",                          RHT_FIRE_TEMPLE_HIGHEST_GORON_CHEST,                             RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_FIRE_TEMPLE_MEGATON_HAMMER_CHEST] =                              Location::Chest(RC_FIRE_TEMPLE_MEGATON_HAMMER_CHEST,                             RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  421,                                               0x05, "Megaton Hammer Chest",                        "Fire Temple Megaton Hammer Chest",                         RHT_FIRE_TEMPLE_MEGATON_HAMMER_CHEST,                            RG_MEGATON_HAMMER,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
     // Fire Temple MQ
-    locationTable[RC_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST] =                  Location::Chest(RC_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST,                  RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 22599, 0x07, "MQ Near Boss Chest",                  "Fire Temple MQ Near Boss Chest",                  RHT_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST,                  RG_FIRE_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE, true);
-    locationTable[RC_FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST] =             Location::Chest(RC_FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST,             RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 4512,  0x00, "MQ Megaton Hammer Chest",             "Fire Temple MQ Megaton Hammer Chest",             RHT_FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST,             RG_MEGATON_HAMMER,        {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE, true);
-    locationTable[RC_FIRE_TEMPLE_MQ_COMPASS_CHEST] =                    Location::Chest(RC_FIRE_TEMPLE_MQ_COMPASS_CHEST,                    RCQUEST_MQ,      RCTYPE_MAP_COMPASS, RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 2059,  0x0B, "MQ Compass Chest",                    "Fire Temple MQ Compass Chest",                    RHT_FIRE_TEMPLE_MQ_COMPASS_CHEST,                    RG_FIRE_TEMPLE_COMPASS,   { Category::cVanillaCompass },  SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE, true);
-    locationTable[RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST] =        Location::Chest(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST,        RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 23747, 0x03, "MQ Lizalfos Maze Lower Chest",        "Fire Temple MQ Lizalfos Maze Lower Chest",        RHT_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST,        RG_BOMBS_10,              {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST] =        Location::Chest(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST,        RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 23782, 0x06, "MQ Lizalfos Maze Upper Chest",        "Fire Temple MQ Lizalfos Maze Upper Chest",        RHT_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST,        RG_BOMBS_10,              {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[RC_FIRE_TEMPLE_MQ_CHEST_ON_FIRE] =                    Location::Chest(RC_FIRE_TEMPLE_MQ_CHEST_ON_FIRE,                    RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 22597, 0x05, "MQ Chest on Fire",                    "Fire Temple MQ Chest on Fire",                    RHT_FIRE_TEMPLE_MQ_CHEST_ON_FIRE,                    RG_FIRE_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE, true);
-    locationTable[RC_FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST] =              Location::Chest(RC_FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST,              RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 30018, 0x02, "MQ Map Room Side Chest",              "Fire Temple MQ Map Room Side Chest",              RHT_FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST,              RG_HYLIAN_SHIELD,         {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[RC_FIRE_TEMPLE_MQ_MAP_CHEST] =                        Location::Chest(RC_FIRE_TEMPLE_MQ_MAP_CHEST,                        RCQUEST_MQ,      RCTYPE_MAP_COMPASS, RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 2092,  0x0C, "MQ Map Chest",                        "Fire Temple MQ Map Chest",                        RHT_FIRE_TEMPLE_MQ_MAP_CHEST,                        RG_FIRE_TEMPLE_MAP,       { Category::cVanillaMap },      SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE, true);
-    locationTable[RC_FIRE_TEMPLE_MQ_BOSS_KEY_CHEST] =                   Location::Chest(RC_FIRE_TEMPLE_MQ_BOSS_KEY_CHEST,                   RCQUEST_MQ,      RCTYPE_BOSS_KEY,    RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 10212, 0x04, "MQ Boss Key Chest",                   "Fire Temple MQ Boss Key Chest",                   RHT_FIRE_TEMPLE_MQ_BOSS_KEY_CHEST,                   RG_FIRE_TEMPLE_BOSS_KEY,  { Category::cVanillaBossKey },  SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE, true);
-    locationTable[RC_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST] = Location::Chest(RC_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST, RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 22593, 0x01, "MQ Big Lava Room Blocked Door Chest", "Fire Temple MQ Big Lava Room Blocked Door Chest", RHT_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST, RG_FIRE_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE, true);
-    locationTable[RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST] =    Location::Chest(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST,    RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_FIRE_TEMPLE, ACTOR_EN_BOX,    SCENE_FIRE_TEMPLE, 22600, 0x08, "MQ Lizalfos Maze Side Room Chest",    "Fire Temple MQ Lizalfos Maze Side Room Chest",    RHT_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST,    RG_FIRE_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE, true);
-    locationTable[RC_FIRE_TEMPLE_MQ_FREESTANDING_KEY] =           Location::Collectable(RC_FIRE_TEMPLE_MQ_FREESTANDING_KEY,                 RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_FIRE_TEMPLE, ACTOR_EN_ITEM00, SCENE_FIRE_TEMPLE, 7185,  0x1C, "MQ Freestanding Key",                 "Fire Temple MQ Freestanding Key",                 RHT_FIRE_TEMPLE_MQ_FREESTANDING_KEY,                 RG_FIRE_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE, true);
+    locationTable[RC_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST] =                                Location::Chest(RC_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST,                               RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22599,                                             0x07, "MQ Near Boss Chest",                          "Fire Temple MQ Near Boss Chest",                           RHT_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST,                              RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST] =                           Location::Chest(RC_FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST,                          RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  4512,                                              0x00, "MQ Megaton Hammer Chest",                     "Fire Temple MQ Megaton Hammer Chest",                      RHT_FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST,                         RG_MEGATON_HAMMER,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_FIRE_TEMPLE_MQ_COMPASS_CHEST] =                                  Location::Chest(RC_FIRE_TEMPLE_MQ_COMPASS_CHEST,                                 RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  2059,                                              0x0B, "MQ Compass Chest",                            "Fire Temple MQ Compass Chest",                             RHT_FIRE_TEMPLE_MQ_COMPASS_CHEST,                                RG_FIRE_TEMPLE_COMPASS,               { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST] =                      Location::Chest(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST,                     RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  23747,                                             0x03, "MQ Lizalfos Maze Lower Chest",                "Fire Temple MQ Lizalfos Maze Lower Chest",                 RHT_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST,                    RG_BOMBS_10,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    locationTable[RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST] =                      Location::Chest(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST,                     RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  23782,                                             0x06, "MQ Lizalfos Maze Upper Chest",                "Fire Temple MQ Lizalfos Maze Upper Chest",                 RHT_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST,                    RG_BOMBS_10,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    locationTable[RC_FIRE_TEMPLE_MQ_CHEST_ON_FIRE] =                                  Location::Chest(RC_FIRE_TEMPLE_MQ_CHEST_ON_FIRE,                                 RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22597,                                             0x05, "MQ Chest on Fire",                            "Fire Temple MQ Chest on Fire",                             RHT_FIRE_TEMPLE_MQ_CHEST_ON_FIRE,                                RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST] =                            Location::Chest(RC_FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST,                           RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  30018,                                             0x02, "MQ Map Room Side Chest",                      "Fire Temple MQ Map Room Side Chest",                       RHT_FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST,                          RG_HYLIAN_SHIELD,                     {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    locationTable[RC_FIRE_TEMPLE_MQ_MAP_CHEST] =                                      Location::Chest(RC_FIRE_TEMPLE_MQ_MAP_CHEST,                                     RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  2092,                                              0x0C, "MQ Map Chest",                                "Fire Temple MQ Map Chest",                                 RHT_FIRE_TEMPLE_MQ_MAP_CHEST,                                    RG_FIRE_TEMPLE_MAP,                   { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_FIRE_TEMPLE_MQ_BOSS_KEY_CHEST] =                                 Location::Chest(RC_FIRE_TEMPLE_MQ_BOSS_KEY_CHEST,                                RCQUEST_MQ,      RCTYPE_BOSS_KEY,                    RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  10212,                                             0x04, "MQ Boss Key Chest",                           "Fire Temple MQ Boss Key Chest",                            RHT_FIRE_TEMPLE_MQ_BOSS_KEY_CHEST,                               RG_FIRE_TEMPLE_BOSS_KEY,              { Category::cVanillaBossKey },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST] =               Location::Chest(RC_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST,              RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22593,                                             0x01, "MQ Big Lava Room Blocked Door Chest",         "Fire Temple MQ Big Lava Room Blocked Door Chest",          RHT_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST,             RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST] =                  Location::Chest(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST,                 RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22600,                                             0x08, "MQ Lizalfos Maze Side Room Chest",            "Fire Temple MQ Lizalfos Maze Side Room Chest",             RHT_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST,                RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_FIRE_TEMPLE_MQ_FREESTANDING_KEY] =                         Location::Collectable(RC_FIRE_TEMPLE_MQ_FREESTANDING_KEY,                              RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_ITEM00,      SCENE_FIRE_TEMPLE,                  7185,                                              0x1C, "MQ Freestanding Key",                         "Fire Temple MQ Freestanding Key",                          RHT_FIRE_TEMPLE_MQ_FREESTANDING_KEY,                             RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
 
-    //            Randomizer Check                                             Randomizer Check                          Quest            Type                Area                 Actor ID         Scene ID            Params  Flags Short Name                  Spoiler Name                             Hint Text Key                              Randomizer Get             Categories                      Collection Check Group                                   Vanilla Progression
     // Water Temple Vanilla
-    locationTable[RC_WATER_TEMPLE_MAP_CHEST] =                 Location::Chest(RC_WATER_TEMPLE_MAP_CHEST,                RCQUEST_VANILLA, RCTYPE_MAP_COMPASS, RCAREA_WATER_TEMPLE, ACTOR_EN_BOX,    SCENE_WATER_TEMPLE, 6178,   0x02, "Map Chest",                "Water Temple Map Chest",                RHT_WATER_TEMPLE_MAP_CHEST,                RG_WATER_TEMPLE_MAP,       { Category::cVanillaMap },      SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE, true);
-    locationTable[RC_WATER_TEMPLE_COMPASS_CHEST] =             Location::Chest(RC_WATER_TEMPLE_COMPASS_CHEST,            RCQUEST_VANILLA, RCTYPE_MAP_COMPASS, RCAREA_WATER_TEMPLE, ACTOR_EN_BOX,    SCENE_WATER_TEMPLE, 2057,   0x09, "Compass Chest",            "Water Temple Compass Chest",            RHT_WATER_TEMPLE_COMPASS_CHEST,            RG_WATER_TEMPLE_COMPASS,   { Category::cVanillaCompass },  SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE, true);
-    locationTable[RC_WATER_TEMPLE_TORCHES_CHEST] =             Location::Chest(RC_WATER_TEMPLE_TORCHES_CHEST,            RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_WATER_TEMPLE, ACTOR_EN_BOX,    SCENE_WATER_TEMPLE, 30785,  0x01, "Torches Chest",            "Water Temple Torches Chest",            RHT_WATER_TEMPLE_TORCHES_CHEST,            RG_WATER_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE, true);
-    locationTable[RC_WATER_TEMPLE_DRAGON_CHEST] =              Location::Chest(RC_WATER_TEMPLE_DRAGON_CHEST,             RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_WATER_TEMPLE, ACTOR_EN_BOX,    SCENE_WATER_TEMPLE, 22602,  0x0A, "Dragon Chest",             "Water Temple Dragon Chest",             RHT_WATER_TEMPLE_DRAGON_CHEST,             RG_WATER_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE, true);
-    locationTable[RC_WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST] =  Location::Chest(RC_WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST, RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_WATER_TEMPLE, ACTOR_EN_BOX,    SCENE_WATER_TEMPLE, 22600,  0x08, "Central Bow Target Chest", "Water Temple Central Bow Target Chest", RHT_WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST, RG_WATER_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE, true);
-    locationTable[RC_WATER_TEMPLE_CENTRAL_PILLAR_CHEST] =      Location::Chest(RC_WATER_TEMPLE_CENTRAL_PILLAR_CHEST,     RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_WATER_TEMPLE, ACTOR_EN_BOX,    SCENE_WATER_TEMPLE, 22598,  0x06, "Central Pillar Chest",     "Water Temple Central Pillar Chest",     RHT_WATER_TEMPLE_CENTRAL_PILLAR_CHEST,     RG_WATER_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE, true);
-    locationTable[RC_WATER_TEMPLE_CRACKED_WALL_CHEST] =        Location::Chest(RC_WATER_TEMPLE_CRACKED_WALL_CHEST,       RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_WATER_TEMPLE, ACTOR_EN_BOX,    SCENE_WATER_TEMPLE, 22592,  0x00, "Cracked Wall Chest",       "Water Temple Cracked Wall Chest",       RHT_WATER_TEMPLE_CRACKED_WALL_CHEST,       RG_WATER_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE, true);
-    locationTable[RC_WATER_TEMPLE_BOSS_KEY_CHEST] =            Location::Chest(RC_WATER_TEMPLE_BOSS_KEY_CHEST,           RCQUEST_VANILLA, RCTYPE_BOSS_KEY,    RCAREA_WATER_TEMPLE, ACTOR_EN_BOX,    SCENE_WATER_TEMPLE, 10213,  0x05, "Boss Key Chest",           "Water Temple Boss Key Chest",           RHT_WATER_TEMPLE_BOSS_KEY_CHEST,           RG_WATER_TEMPLE_BOSS_KEY,  { Category::cVanillaBossKey },  SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE, true);
-    locationTable[RC_WATER_TEMPLE_LONGSHOT_CHEST] =            Location::Chest(RC_WATER_TEMPLE_LONGSHOT_CHEST,           RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_WATER_TEMPLE, ACTOR_EN_BOX,    SCENE_WATER_TEMPLE, 295,    0x07, "Longshot Chest",           "Water Temple Longshot Chest",           RHT_WATER_TEMPLE_LONGSHOT_CHEST,           RG_PROGRESSIVE_HOOKSHOT,   {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE, true);
-    locationTable[RC_WATER_TEMPLE_RIVER_CHEST] =               Location::Chest(RC_WATER_TEMPLE_RIVER_CHEST,              RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_WATER_TEMPLE, ACTOR_EN_BOX,    SCENE_WATER_TEMPLE, 22595,  0x03, "River Chest",              "Water Temple River Chest",              RHT_WATER_TEMPLE_RIVER_CHEST,              RG_WATER_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE, true);
+    locationTable[RC_WATER_TEMPLE_MAP_CHEST] =                                        Location::Chest(RC_WATER_TEMPLE_MAP_CHEST,                                       RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 6178,                                              0x02, "Map Chest",                                   "Water Temple Map Chest",                                   RHT_WATER_TEMPLE_MAP_CHEST,                                      RG_WATER_TEMPLE_MAP,                  { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
+    locationTable[RC_WATER_TEMPLE_COMPASS_CHEST] =                                    Location::Chest(RC_WATER_TEMPLE_COMPASS_CHEST,                                   RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 2057,                                              0x09, "Compass Chest",                               "Water Temple Compass Chest",                               RHT_WATER_TEMPLE_COMPASS_CHEST,                                  RG_WATER_TEMPLE_COMPASS,              { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
+    locationTable[RC_WATER_TEMPLE_TORCHES_CHEST] =                                    Location::Chest(RC_WATER_TEMPLE_TORCHES_CHEST,                                   RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 30785,                                             0x01, "Torches Chest",                               "Water Temple Torches Chest",                               RHT_WATER_TEMPLE_TORCHES_CHEST,                                  RG_WATER_TEMPLE_SMALL_KEY,            { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
+    locationTable[RC_WATER_TEMPLE_DRAGON_CHEST] =                                     Location::Chest(RC_WATER_TEMPLE_DRAGON_CHEST,                                    RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 22602,                                             0x0A, "Dragon Chest",                                "Water Temple Dragon Chest",                                RHT_WATER_TEMPLE_DRAGON_CHEST,                                   RG_WATER_TEMPLE_SMALL_KEY,            { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
+    locationTable[RC_WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST] =                         Location::Chest(RC_WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST,                        RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 22600,                                             0x08, "Central Bow Target Chest",                    "Water Temple Central Bow Target Chest",                    RHT_WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST,                       RG_WATER_TEMPLE_SMALL_KEY,            { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
+    locationTable[RC_WATER_TEMPLE_CENTRAL_PILLAR_CHEST] =                             Location::Chest(RC_WATER_TEMPLE_CENTRAL_PILLAR_CHEST,                            RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 22598,                                             0x06, "Central Pillar Chest",                        "Water Temple Central Pillar Chest",                        RHT_WATER_TEMPLE_CENTRAL_PILLAR_CHEST,                           RG_WATER_TEMPLE_SMALL_KEY,            { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
+    locationTable[RC_WATER_TEMPLE_CRACKED_WALL_CHEST] =                               Location::Chest(RC_WATER_TEMPLE_CRACKED_WALL_CHEST,                              RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 22592,                                             0x00, "Cracked Wall Chest",                          "Water Temple Cracked Wall Chest",                          RHT_WATER_TEMPLE_CRACKED_WALL_CHEST,                             RG_WATER_TEMPLE_SMALL_KEY,            { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
+    locationTable[RC_WATER_TEMPLE_BOSS_KEY_CHEST] =                                   Location::Chest(RC_WATER_TEMPLE_BOSS_KEY_CHEST,                                  RCQUEST_VANILLA, RCTYPE_BOSS_KEY,                    RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 10213,                                             0x05, "Boss Key Chest",                              "Water Temple Boss Key Chest",                              RHT_WATER_TEMPLE_BOSS_KEY_CHEST,                                 RG_WATER_TEMPLE_BOSS_KEY,             { Category::cVanillaBossKey },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
+    locationTable[RC_WATER_TEMPLE_LONGSHOT_CHEST] =                                   Location::Chest(RC_WATER_TEMPLE_LONGSHOT_CHEST,                                  RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 295,                                               0x07, "Longshot Chest",                              "Water Temple Longshot Chest",                              RHT_WATER_TEMPLE_LONGSHOT_CHEST,                                 RG_PROGRESSIVE_HOOKSHOT,              {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
+    locationTable[RC_WATER_TEMPLE_RIVER_CHEST] =                                      Location::Chest(RC_WATER_TEMPLE_RIVER_CHEST,                                     RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 22595,                                             0x03, "River Chest",                                 "Water Temple River Chest",                                 RHT_WATER_TEMPLE_RIVER_CHEST,                                    RG_WATER_TEMPLE_SMALL_KEY,            { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
     // Water Temple MQ
-    locationTable[RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST] =   Location::Chest(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST,  RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_WATER_TEMPLE, ACTOR_EN_BOX,    SCENE_WATER_TEMPLE, -30650, 0x06, "MQ Central Pillar Chest",  "Water Temple MQ Central Pillar Chest",  RHT_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST,  RG_WATER_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE, true);
-    locationTable[RC_WATER_TEMPLE_MQ_BOSS_KEY_CHEST] =         Location::Chest(RC_WATER_TEMPLE_MQ_BOSS_KEY_CHEST,        RCQUEST_MQ,      RCTYPE_BOSS_KEY,    RCAREA_WATER_TEMPLE, ACTOR_EN_BOX,    SCENE_WATER_TEMPLE, 10213,  0x05, "MQ Boss Key Chest",        "Water Temple MQ Boss Key Chest",        RHT_WATER_TEMPLE_MQ_BOSS_KEY_CHEST,        RG_WATER_TEMPLE_BOSS_KEY,  { Category::cVanillaBossKey },  SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE, true);
-    locationTable[RC_WATER_TEMPLE_MQ_LONGSHOT_CHEST] =         Location::Chest(RC_WATER_TEMPLE_MQ_LONGSHOT_CHEST,        RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_WATER_TEMPLE, ACTOR_EN_BOX,    SCENE_WATER_TEMPLE, -20192, 0x00, "MQ Longshot Chest",        "Water Temple MQ Longshot Chest",        RHT_WATER_TEMPLE_MQ_LONGSHOT_CHEST,        RG_PROGRESSIVE_HOOKSHOT,   {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE, true);
-    locationTable[RC_WATER_TEMPLE_MQ_COMPASS_CHEST] =          Location::Chest(RC_WATER_TEMPLE_MQ_COMPASS_CHEST,         RCQUEST_MQ,      RCTYPE_MAP_COMPASS, RCAREA_WATER_TEMPLE, ACTOR_EN_BOX,    SCENE_WATER_TEMPLE, 6145,   0x01, "MQ Compass Chest",         "Water Temple MQ Compass Chest",         RHT_WATER_TEMPLE_MQ_COMPASS_CHEST,         RG_WATER_TEMPLE_COMPASS,   { Category::cVanillaCompass },  SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE, true);
-    locationTable[RC_WATER_TEMPLE_MQ_MAP_CHEST] =              Location::Chest(RC_WATER_TEMPLE_MQ_MAP_CHEST,             RCQUEST_MQ,      RCTYPE_MAP_COMPASS, RCAREA_WATER_TEMPLE, ACTOR_EN_BOX,    SCENE_WATER_TEMPLE, -18398, 0x02, "MQ Map Chest",             "Water Temple MQ Map Chest",             RHT_WATER_TEMPLE_MQ_MAP_CHEST,             RG_WATER_TEMPLE_MAP,       { Category::cVanillaMap },      SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE, true);
-    locationTable[RC_WATER_TEMPLE_MQ_FREESTANDING_KEY] = Location::Collectable(RC_WATER_TEMPLE_MQ_FREESTANDING_KEY,      RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_WATER_TEMPLE, ACTOR_EN_ITEM00, SCENE_WATER_TEMPLE, 273,    0x01, "MQ Freestanding Key",      "Water Temple MQ Freestanding Key",      RHT_WATER_TEMPLE_MQ_FREESTANDING_KEY,      RG_WATER_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE, true);
+    locationTable[RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST] =                          Location::Chest(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST,                         RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 -30650,                                            0x06, "MQ Central Pillar Chest",                     "Water Temple MQ Central Pillar Chest",                     RHT_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST,                        RG_WATER_TEMPLE_SMALL_KEY,            { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
+    locationTable[RC_WATER_TEMPLE_MQ_BOSS_KEY_CHEST] =                                Location::Chest(RC_WATER_TEMPLE_MQ_BOSS_KEY_CHEST,                               RCQUEST_MQ,      RCTYPE_BOSS_KEY,                    RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 10213,                                             0x05, "MQ Boss Key Chest",                           "Water Temple MQ Boss Key Chest",                           RHT_WATER_TEMPLE_MQ_BOSS_KEY_CHEST,                              RG_WATER_TEMPLE_BOSS_KEY,             { Category::cVanillaBossKey },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
+    locationTable[RC_WATER_TEMPLE_MQ_LONGSHOT_CHEST] =                                Location::Chest(RC_WATER_TEMPLE_MQ_LONGSHOT_CHEST,                               RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 -20192,                                            0x00, "MQ Longshot Chest",                           "Water Temple MQ Longshot Chest",                           RHT_WATER_TEMPLE_MQ_LONGSHOT_CHEST,                              RG_PROGRESSIVE_HOOKSHOT,              {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
+    locationTable[RC_WATER_TEMPLE_MQ_COMPASS_CHEST] =                                 Location::Chest(RC_WATER_TEMPLE_MQ_COMPASS_CHEST,                                RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 6145,                                              0x01, "MQ Compass Chest",                            "Water Temple MQ Compass Chest",                            RHT_WATER_TEMPLE_MQ_COMPASS_CHEST,                               RG_WATER_TEMPLE_COMPASS,              { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
+    locationTable[RC_WATER_TEMPLE_MQ_MAP_CHEST] =                                     Location::Chest(RC_WATER_TEMPLE_MQ_MAP_CHEST,                                    RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 -18398,                                            0x02, "MQ Map Chest",                                "Water Temple MQ Map Chest",                                RHT_WATER_TEMPLE_MQ_MAP_CHEST,                                   RG_WATER_TEMPLE_MAP,                  { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
+    locationTable[RC_WATER_TEMPLE_MQ_FREESTANDING_KEY] =                        Location::Collectable(RC_WATER_TEMPLE_MQ_FREESTANDING_KEY,                             RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_WATER_TEMPLE,                 ACTOR_EN_ITEM00,      SCENE_WATER_TEMPLE,                 273,                                               0x01, "MQ Freestanding Key",                         "Water Temple MQ Freestanding Key",                         RHT_WATER_TEMPLE_MQ_FREESTANDING_KEY,                            RG_WATER_TEMPLE_SMALL_KEY,            { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
 
-    //            Randomizer Check                                                     Randomizer Check                                   Quest            Type                Area                  Actor ID      Scene ID               Params  Flags Short Name                          Spoiler Name                                      Hint Text Key                                       Vanilla Item                Categories                      Collection Check Group                                    Vanilla Progression
     // Spirit Temple Shared
-    locationTable[RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST] =           Location::Chest(RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST,           RCQUEST_BOTH,    RCTYPE_STANDARD,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_DESERT_COLOSSUS, 1707,   0x0B, "Silver Gauntlets Chest",           "Spirit Temple Silver Gauntlets Chest",           RHT_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST,           RG_PROGRESSIVE_STRENGTH,    {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE, true);
-    locationTable[RC_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST] =              Location::Chest(RC_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST,              RCQUEST_BOTH,    RCTYPE_STANDARD,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_DESERT_COLOSSUS, 13673,  0x09, "Mirror Shield Chest",              "Spirit Temple Mirror Shield Chest",              RHT_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST,              RG_MIRROR_SHIELD,           {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE, true);
+    locationTable[RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST] =                          Location::Chest(RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST,                         RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_DESERT_COLOSSUS,              1707,                                              0x0B, "Silver Gauntlets Chest",                      "Spirit Temple Silver Gauntlets Chest",                     RHT_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST,                        RG_PROGRESSIVE_STRENGTH,              {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST] =                             Location::Chest(RC_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST,                            RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_DESERT_COLOSSUS,              13673,                                             0x09, "Mirror Shield Chest",                         "Spirit Temple Mirror Shield Chest",                        RHT_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST,                           RG_MIRROR_SHIELD,                     {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
     // Spirit Temple Vanilla
-    locationTable[RC_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST] =               Location::Chest(RC_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST,               RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   21800,  0x08, "Child Bridge Chest",               "Spirit Temple Child Bridge Chest",               RHT_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST,               RG_DEKU_SHIELD,             {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST] =        Location::Chest(RC_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST,        RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   -30656, 0x00, "Child Early Torches Chest",        "Spirit Temple Child Early Torches Chest",        RHT_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST,        RG_SPIRIT_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE, true);
-    locationTable[RC_SPIRIT_TEMPLE_COMPASS_CHEST] =                    Location::Chest(RC_SPIRIT_TEMPLE_COMPASS_CHEST,                    RCQUEST_VANILLA, RCTYPE_MAP_COMPASS, RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   14340,  0x04, "Compass Chest",                    "Spirit Temple Compass Chest",                    RHT_SPIRIT_TEMPLE_COMPASS_CHEST,                    RG_SPIRIT_TEMPLE_COMPASS,   { Category::cVanillaCompass },  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE, true);
-    locationTable[RC_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST] =          Location::Chest(RC_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST,          RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   22599,  0x07, "Early Adult Right Chest",          "Spirit Temple Early Adult Right Chest",          RHT_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST,          RG_SPIRIT_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE, true);
-    locationTable[RC_SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST] =          Location::Chest(RC_SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST,          RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   -30451, 0x0D, "First Mirror Left Chest",          "Spirit Temple First Mirror Left Chest",          RHT_SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST,          RG_ICE_TRAP,                {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST] =         Location::Chest(RC_SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST,         RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   -28786, 0x0E, "First Mirror Right Chest",         "Spirit Temple First Mirror Right Chest",         RHT_SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST,         RG_RECOVERY_HEART,          {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MAP_CHEST] =                        Location::Chest(RC_SPIRIT_TEMPLE_MAP_CHEST,                        RCQUEST_VANILLA, RCTYPE_MAP_COMPASS, RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   -18397, 0x03, "Map Chest",                        "Spirit Temple Map Chest",                        RHT_SPIRIT_TEMPLE_MAP_CHEST,                        RG_SPIRIT_TEMPLE_MAP,       { Category::cVanillaMap },      SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE, true);
-    locationTable[RC_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST] =          Location::Chest(RC_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST,          RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   -32666, 0x06, "Child Climb North Chest",          "Spirit Temple Child Climb North Chest",          RHT_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST,          RG_BOMBCHU_10,              {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST] =           Location::Chest(RC_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST,           RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   -31444, 0x0C, "Child Climb East Chest",           "Spirit Temple Child Climb East Chest",           RHT_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST,           RG_DEKU_SHIELD,             {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST] =             Location::Chest(RC_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST,             RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   -30655, 0x01, "Sun Block Room Chest",             "Spirit Temple Sun Block Room Chest",             RHT_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST,             RG_SPIRIT_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE, true);
-    locationTable[RC_SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST] =           Location::Chest(RC_SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST,           RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   -30654, 0x02, "Statue Room Hand Chest",           "Spirit Temple Statue Room Hand Chest",           RHT_SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST,           RG_SPIRIT_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE, true);
-    locationTable[RC_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST] =      Location::Chest(RC_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST,      RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   -30577, 0x0F, "Statue Room Northeast Chest",      "Spirit Temple Statue Room Northeast Chest",      RHT_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST,      RG_BLUE_RUPEE,              {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST] =            Location::Chest(RC_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST,            RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   22597,  0x05, "Near Four Armos Chest",            "Spirit Temple Near Four Armos Chest",            RHT_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST,            RG_SPIRIT_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE, true);
-    locationTable[RC_SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST] =    Location::Chest(RC_SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST,    RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   26900,  0x14, "Hallway Right Invisible Chest",    "Spirit Temple Hallway Right Invisible Chest",    RHT_SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST,    RG_RECOVERY_HEART,          {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST] =     Location::Chest(RC_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST,     RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   26901,  0x15, "Hallway Left Invisible Chest",     "Spirit Temple Hallway Left Invisible Chest",     RHT_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST,     RG_RECOVERY_HEART,          {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_BOSS_KEY_CHEST] =                   Location::Chest(RC_SPIRIT_TEMPLE_BOSS_KEY_CHEST,                   RCQUEST_VANILLA, RCTYPE_BOSS_KEY,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   10218,  0x0A, "Boss Key Chest",                   "Spirit Temple Boss Key Chest",                   RHT_SPIRIT_TEMPLE_BOSS_KEY_CHEST,                   RG_SPIRIT_TEMPLE_BOSS_KEY,  { Category::cVanillaBossKey },  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE, true);
-    locationTable[RC_SPIRIT_TEMPLE_TOPMOST_CHEST] =                    Location::Chest(RC_SPIRIT_TEMPLE_TOPMOST_CHEST,                    RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   -29454, 0x12, "Topmost Chest",                    "Spirit Temple Topmost Chest",                    RHT_SPIRIT_TEMPLE_TOPMOST_CHEST,                    RG_BOMBS_20,                {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE, true);
+    locationTable[RC_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST] =                              Location::Chest(RC_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST,                             RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                21800,                                             0x08, "Child Bridge Chest",                          "Spirit Temple Child Bridge Chest",                         RHT_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST,                            RG_DEKU_SHIELD,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST] =                       Location::Chest(RC_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST,                      RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30656,                                            0x00, "Child Early Torches Chest",                   "Spirit Temple Child Early Torches Chest",                  RHT_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST,                     RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_SPIRIT_TEMPLE_COMPASS_CHEST] =                                   Location::Chest(RC_SPIRIT_TEMPLE_COMPASS_CHEST,                                  RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                14340,                                             0x04, "Compass Chest",                               "Spirit Temple Compass Chest",                              RHT_SPIRIT_TEMPLE_COMPASS_CHEST,                                 RG_SPIRIT_TEMPLE_COMPASS,             { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST] =                         Location::Chest(RC_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST,                        RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                22599,                                             0x07, "Early Adult Right Chest",                     "Spirit Temple Early Adult Right Chest",                    RHT_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST,                       RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST] =                         Location::Chest(RC_SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST,                        RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30451,                                            0x0D, "First Mirror Left Chest",                     "Spirit Temple First Mirror Left Chest",                    RHT_SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST,                       RG_ICE_TRAP,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST] =                        Location::Chest(RC_SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST,                       RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -28786,                                            0x0E, "First Mirror Right Chest",                    "Spirit Temple First Mirror Right Chest",                   RHT_SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST,                      RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MAP_CHEST] =                                       Location::Chest(RC_SPIRIT_TEMPLE_MAP_CHEST,                                      RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -18397,                                            0x03, "Map Chest",                                   "Spirit Temple Map Chest",                                  RHT_SPIRIT_TEMPLE_MAP_CHEST,                                     RG_SPIRIT_TEMPLE_MAP,                 { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST] =                         Location::Chest(RC_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST,                        RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -32666,                                            0x06, "Child Climb North Chest",                     "Spirit Temple Child Climb North Chest",                    RHT_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST,                       RG_BOMBCHU_10,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST] =                          Location::Chest(RC_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST,                         RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -31444,                                            0x0C, "Child Climb East Chest",                      "Spirit Temple Child Climb East Chest",                     RHT_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST,                        RG_DEKU_SHIELD,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST] =                            Location::Chest(RC_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST,                           RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30655,                                            0x01, "Sun Block Room Chest",                        "Spirit Temple Sun Block Room Chest",                       RHT_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST,                          RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST] =                          Location::Chest(RC_SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST,                         RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30654,                                            0x02, "Statue Room Hand Chest",                      "Spirit Temple Statue Room Hand Chest",                     RHT_SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST,                        RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST] =                     Location::Chest(RC_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST,                    RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30577,                                            0x0F, "Statue Room Northeast Chest",                 "Spirit Temple Statue Room Northeast Chest",                RHT_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST,                   RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST] =                           Location::Chest(RC_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST,                          RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                22597,                                             0x05, "Near Four Armos Chest",                       "Spirit Temple Near Four Armos Chest",                      RHT_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST,                         RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST] =                   Location::Chest(RC_SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST,                  RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                26900,                                             0x14, "Hallway Right Invisible Chest",               "Spirit Temple Hallway Right Invisible Chest",              RHT_SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST,                 RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST] =                    Location::Chest(RC_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST,                   RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                26901,                                             0x15, "Hallway Left Invisible Chest",                "Spirit Temple Hallway Left Invisible Chest",               RHT_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST,                  RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_BOSS_KEY_CHEST] =                                  Location::Chest(RC_SPIRIT_TEMPLE_BOSS_KEY_CHEST,                                 RCQUEST_VANILLA, RCTYPE_BOSS_KEY,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                10218,                                             0x0A, "Boss Key Chest",                              "Spirit Temple Boss Key Chest",                             RHT_SPIRIT_TEMPLE_BOSS_KEY_CHEST,                                RG_SPIRIT_TEMPLE_BOSS_KEY,            { Category::cVanillaBossKey },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_SPIRIT_TEMPLE_TOPMOST_CHEST] =                                   Location::Chest(RC_SPIRIT_TEMPLE_TOPMOST_CHEST,                                  RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -29454,                                            0x12, "Topmost Chest",                               "Spirit Temple Topmost Chest",                              RHT_SPIRIT_TEMPLE_TOPMOST_CHEST,                                 RG_BOMBS_20,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
     // Spirit Temple MQ
-    locationTable[RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST] =     Location::Chest(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST,     RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   20602,  0x1A, "MQ Entrance Front Left Chest",     "Spirit Temple MQ Entrance Front Left Chest",     RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST,     RG_BOMBCHU_10,              {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST] =     Location::Chest(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST,     RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   -32641, 0x1F, "MQ Entrance Back Right Chest",     "Spirit Temple MQ Entrance Back Right Chest",     RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST,     RG_BOMBCHU_10,              {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST] =    Location::Chest(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST,    RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   -30629, 0x1B, "MQ Entrance Front Right Chest",    "Spirit Temple MQ Entrance Front Right Chest",    RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST,    RG_SPIRIT_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE, true);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST] =      Location::Chest(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST,      RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   -30626, 0x1E, "MQ Entrance Back Left Chest",      "Spirit Temple MQ Entrance Back Left Chest",      RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST,      RG_SPIRIT_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE, true);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST] =     Location::Chest(RC_SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST,     RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   -30627, 0x1D, "MQ Child Hammer Switch Chest",     "Spirit Temple MQ Child Hammer Switch Chest",     RHT_SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST,     RG_SPIRIT_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE, true);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_MAP_CHEST] =                     Location::Chest(RC_SPIRIT_TEMPLE_MQ_MAP_CHEST,                     RCQUEST_MQ,      RCTYPE_MAP_COMPASS, RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   2080,   0x00, "MQ Map Chest",                     "Spirit Temple MQ Map Chest",                     RHT_SPIRIT_TEMPLE_MQ_MAP_CHEST,                     RG_SPIRIT_TEMPLE_MAP,       { Category::cVanillaMap },      SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE, true);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST] =          Location::Chest(RC_SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST,          RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   30792,  0x08, "MQ Map Room Enemy Chest",          "Spirit Temple MQ Map Room Enemy Chest",          RHT_SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST,          RG_SPIRIT_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE, true);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST] =       Location::Chest(RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST,       RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   28774,  0x06, "MQ Child Climb North Chest",       "Spirit Temple MQ Child Climb North Chest",       RHT_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST,       RG_BOMBCHU_10,              {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST] =       Location::Chest(RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST,       RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   -30644, 0x0C, "MQ Child Climb South Chest",       "Spirit Temple MQ Child Climb South Chest",       RHT_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST,       RG_SPIRIT_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE, true);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_COMPASS_CHEST] =                 Location::Chest(RC_SPIRIT_TEMPLE_MQ_COMPASS_CHEST,                 RCQUEST_MQ,      RCTYPE_MAP_COMPASS, RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   -18429, 0x03, "MQ Compass Chest",                 "Spirit Temple MQ Compass Chest",                 RHT_SPIRIT_TEMPLE_MQ_COMPASS_CHEST,                 RG_SPIRIT_TEMPLE_COMPASS,   { Category::cVanillaCompass },  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE, true);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST] =     Location::Chest(RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST,     RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   -30577, 0x0F, "MQ Statue Room Lullaby Chest",     "Spirit Temple MQ Statue Room Lullaby Chest",     RHT_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST,     RG_BLUE_RUPEE,              {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST] =   Location::Chest(RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST,   RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   26882,  0x02, "MQ Statue Room Invisible Chest",   "Spirit Temple MQ Statue Room Invisible Chest",   RHT_SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST,   RG_RECOVERY_HEART,          {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST] =    Location::Chest(RC_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST,    RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   -30628, 0x1C, "MQ Silver Block Hallway Chest",    "Spirit Temple MQ Silver Block Hallway Chest",    RHT_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST,    RG_SPIRIT_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE, true);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST] =          Location::Chest(RC_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST,          RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   -30463, 0x01, "MQ Sun Block Room Chest",          "Spirit Temple MQ Sun Block Room Chest",          RHT_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST,          RG_RECOVERY_HEART,          {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST] =           Location::Chest(RC_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST,           RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   23207,  0x07, "MQ Symphony Room Chest",           "Spirit Temple MQ Symphony Room Chest",           RHT_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST,           RG_PURPLE_RUPEE,            {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST] =             Location::Chest(RC_SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST,             RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   31396,  0x04, "MQ Leever Room Chest",             "Spirit Temple MQ Leever Room Chest",             RHT_SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST,             RG_PURPLE_RUPEE,            {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST] =             Location::Chest(RC_SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST,             RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   24472,  0x19, "MQ Beamos Room Chest",             "Spirit Temple MQ Beamos Room Chest",             RHT_SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST,             RG_RECOVERY_HEART,          {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST] =            Location::Chest(RC_SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST,            RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   31097,  0x18, "MQ Chest Switch Chest",            "Spirit Temple MQ Chest Switch Chest",            RHT_SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST,            RG_ICE_TRAP,                {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST] =                Location::Chest(RC_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST,                RCQUEST_MQ,      RCTYPE_BOSS_KEY,    RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   10213,  0x05, "MQ Boss Key Chest",                "Spirit Temple MQ Boss Key Chest",                RHT_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST,                RG_SPIRIT_TEMPLE_BOSS_KEY,  { Category::cVanillaBossKey },  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE, true);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST] = Location::Chest(RC_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST, RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_SPIRIT_TEMPLE, ACTOR_EN_BOX, SCENE_SPIRIT_TEMPLE,   26706,  0x12, "MQ Mirror Puzzle Invisible Chest", "Spirit Temple MQ Mirror Puzzle Invisible Chest", RHT_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST, RG_SPIRIT_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE, true);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST] =                    Location::Chest(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST,                   RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                20602,                                             0x1A, "MQ Entrance Front Left Chest",                "Spirit Temple MQ Entrance Front Left Chest",               RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST,                  RG_BOMBCHU_10,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST] =                    Location::Chest(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST,                   RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -32641,                                            0x1F, "MQ Entrance Back Right Chest",                "Spirit Temple MQ Entrance Back Right Chest",               RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST,                  RG_BOMBCHU_10,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST] =                   Location::Chest(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST,                  RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30629,                                            0x1B, "MQ Entrance Front Right Chest",               "Spirit Temple MQ Entrance Front Right Chest",              RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST,                 RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST] =                     Location::Chest(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST,                    RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30626,                                            0x1E, "MQ Entrance Back Left Chest",                 "Spirit Temple MQ Entrance Back Left Chest",                RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST,                   RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST] =                    Location::Chest(RC_SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST,                   RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30627,                                            0x1D, "MQ Child Hammer Switch Chest",                "Spirit Temple MQ Child Hammer Switch Chest",               RHT_SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST,                  RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_MAP_CHEST] =                                    Location::Chest(RC_SPIRIT_TEMPLE_MQ_MAP_CHEST,                                   RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                2080,                                              0x00, "MQ Map Chest",                                "Spirit Temple MQ Map Chest",                               RHT_SPIRIT_TEMPLE_MQ_MAP_CHEST,                                  RG_SPIRIT_TEMPLE_MAP,                 { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST] =                         Location::Chest(RC_SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST,                        RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                30792,                                             0x08, "MQ Map Room Enemy Chest",                     "Spirit Temple MQ Map Room Enemy Chest",                    RHT_SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST,                       RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST] =                      Location::Chest(RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST,                     RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                28774,                                             0x06, "MQ Child Climb North Chest",                  "Spirit Temple MQ Child Climb North Chest",                 RHT_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST,                    RG_BOMBCHU_10,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST] =                      Location::Chest(RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST,                     RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30644,                                            0x0C, "MQ Child Climb South Chest",                  "Spirit Temple MQ Child Climb South Chest",                 RHT_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST,                    RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_COMPASS_CHEST] =                                Location::Chest(RC_SPIRIT_TEMPLE_MQ_COMPASS_CHEST,                               RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -18429,                                            0x03, "MQ Compass Chest",                            "Spirit Temple MQ Compass Chest",                           RHT_SPIRIT_TEMPLE_MQ_COMPASS_CHEST,                              RG_SPIRIT_TEMPLE_COMPASS,             { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST] =                    Location::Chest(RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST,                   RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30577,                                            0x0F, "MQ Statue Room Lullaby Chest",                "Spirit Temple MQ Statue Room Lullaby Chest",               RHT_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST,                  RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST] =                  Location::Chest(RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST,                 RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                26882,                                             0x02, "MQ Statue Room Invisible Chest",              "Spirit Temple MQ Statue Room Invisible Chest",             RHT_SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST,                RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST] =                   Location::Chest(RC_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST,                  RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30628,                                            0x1C, "MQ Silver Block Hallway Chest",               "Spirit Temple MQ Silver Block Hallway Chest",              RHT_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST,                 RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST] =                         Location::Chest(RC_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST,                        RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30463,                                            0x01, "MQ Sun Block Room Chest",                     "Spirit Temple MQ Sun Block Room Chest",                    RHT_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST,                       RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST] =                          Location::Chest(RC_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST,                         RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                23207,                                             0x07, "MQ Symphony Room Chest",                      "Spirit Temple MQ Symphony Room Chest",                     RHT_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST,                        RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST] =                            Location::Chest(RC_SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST,                           RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                31396,                                             0x04, "MQ Leever Room Chest",                        "Spirit Temple MQ Leever Room Chest",                       RHT_SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST,                          RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST] =                            Location::Chest(RC_SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST,                           RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                24472,                                             0x19, "MQ Beamos Room Chest",                        "Spirit Temple MQ Beamos Room Chest",                       RHT_SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST,                          RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST] =                           Location::Chest(RC_SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST,                          RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                31097,                                             0x18, "MQ Chest Switch Chest",                       "Spirit Temple MQ Chest Switch Chest",                      RHT_SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST,                         RG_ICE_TRAP,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST] =                               Location::Chest(RC_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST,                              RCQUEST_MQ,      RCTYPE_BOSS_KEY,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                10213,                                             0x05, "MQ Boss Key Chest",                           "Spirit Temple MQ Boss Key Chest",                          RHT_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST,                             RG_SPIRIT_TEMPLE_BOSS_KEY,            { Category::cVanillaBossKey },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST] =                Location::Chest(RC_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST,               RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                26706,                                             0x12, "MQ Mirror Puzzle Invisible Chest",            "Spirit Temple MQ Mirror Puzzle Invisible Chest",           RHT_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST,              RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
 
-    //            Randomizer Check                                                        Randomizer Check                                      Quest            Type                Area                  Actor ID         Scene ID             Params Flags Short Name                              Spoiler Name                                         Hint Text Key                                          Vanilla Item                Categories                      Collection Check Group                                    Vanilla Progression
     // Shadow Temple Vanilla
-    locationTable[RC_SHADOW_TEMPLE_MAP_CHEST] =                           Location::Chest(RC_SHADOW_TEMPLE_MAP_CHEST,                           RCQUEST_VANILLA, RCTYPE_MAP_COMPASS, RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 6177,  0x01, "Map Chest",                            "Shadow Temple Map Chest",                           RHT_SHADOW_TEMPLE_MAP_CHEST,                           RG_SHADOW_TEMPLE_MAP,       { Category::cVanillaMap },      SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE, true);
-    locationTable[RC_SHADOW_TEMPLE_HOVER_BOOTS_CHEST] =                   Location::Chest(RC_SHADOW_TEMPLE_HOVER_BOOTS_CHEST,                   RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 5607,  0x07, "Hover Boots Chest",                    "Shadow Temple Hover Boots Chest",                   RHT_SHADOW_TEMPLE_HOVER_BOOTS_CHEST,                   RG_HOVER_BOOTS,             {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE, true);
-    locationTable[RC_SHADOW_TEMPLE_COMPASS_CHEST] =                       Location::Chest(RC_SHADOW_TEMPLE_COMPASS_CHEST,                       RCQUEST_VANILLA, RCTYPE_MAP_COMPASS, RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 6147,  0x03, "Compass Chest",                        "Shadow Temple Compass Chest",                       RHT_SHADOW_TEMPLE_COMPASS_CHEST,                       RG_SHADOW_TEMPLE_COMPASS,   { Category::cVanillaCompass },  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE, true);
-    locationTable[RC_SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST] =            Location::Chest(RC_SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST,            RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 22594,  0x02, "Early Silver Rupee Chest",            "Shadow Temple Early Silver Rupee Chest",            RHT_SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST,            RG_SHADOW_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE, true);
-    locationTable[RC_SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST] =      Location::Chest(RC_SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST,      RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 22668,  0x0C, "Invisible Blades Visible Chest",      "Shadow Temple Invisible Blades Visible Chest",      RHT_SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST,      RG_BLUE_RUPEE,              {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST] =    Location::Chest(RC_SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST,    RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 26998,  0x16, "Invisible Blades Invisible Chest",    "Shadow Temple Invisible Blades Invisible Chest",    RHT_SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST,    RG_ARROWS_30,               {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST] =          Location::Chest(RC_SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST,          RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 22853,  0x05, "Falling Spikes Lower Chest",          "Shadow Temple Falling Spikes Lower Chest",          RHT_SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST,          RG_ARROWS_10,               {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST] =          Location::Chest(RC_SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST,          RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 22662,  0x06, "Falling Spikes Upper Chest",          "Shadow Temple Falling Spikes Upper Chest",          RHT_SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST,          RG_BLUE_RUPEE,              {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST] =         Location::Chest(RC_SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST,         RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, -30652, 0x04, "Falling Spikes Switch Chest",         "Shadow Temple Falling Spikes Switch Chest",         RHT_SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST,         RG_SHADOW_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE, true);
-    locationTable[RC_SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST] =              Location::Chest(RC_SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST,              RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 30857,  0x09, "Invisible Spikes Chest",              "Shadow Temple Invisible Spikes Chest",              RHT_SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST,              RG_BLUE_RUPEE,              {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_WIND_HINT_CHEST] =                     Location::Chest(RC_SHADOW_TEMPLE_WIND_HINT_CHEST,                     RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 26965,  0x15, "Wind Hint Chest",                     "Shadow Temple Wind Hint Chest",                     RHT_SHADOW_TEMPLE_WIND_HINT_CHEST,                     RG_ARROWS_10,               {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST] =              Location::Chest(RC_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST,              RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 30856,  0x08, "After Wind Enemy Chest",              "Shadow Temple After Wind Enemy Chest",              RHT_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST,              RG_BLUE_RUPEE,              {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST] =             Location::Chest(RC_SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST,             RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 26708,  0x14, "After Wind Hidden Chest",             "Shadow Temple After Wind Hidden Chest",             RHT_SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST,             RG_SHADOW_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE, true);
-    locationTable[RC_SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST] =              Location::Chest(RC_SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST,              RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 22666,  0x0A, "Spike Walls Left Chest",              "Shadow Temple Spike Walls Left Chest",              RHT_SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST,              RG_BLUE_RUPEE,              {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_BOSS_KEY_CHEST] =                      Location::Chest(RC_SHADOW_TEMPLE_BOSS_KEY_CHEST,                      RCQUEST_VANILLA, RCTYPE_BOSS_KEY,    RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 10219,  0x0B, "Boss Key Chest",                      "Shadow Temple Boss Key Chest",                      RHT_SHADOW_TEMPLE_BOSS_KEY_CHEST,                      RG_SHADOW_TEMPLE_BOSS_KEY,  { Category::cVanillaBossKey },  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE, true);
-    locationTable[RC_SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST] =         Location::Chest(RC_SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST,         RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 30797,  0x0D, "Invisible Floormaster Chest",         "Shadow Temple Invisible Floormaster Chest",         RHT_SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST,         RG_SHADOW_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE, true);
-    locationTable[RC_SHADOW_TEMPLE_FREESTANDING_KEY] =              Location::Collectable(RC_SHADOW_TEMPLE_FREESTANDING_KEY,                    RCQUEST_VANILLA, RCTYPE_SMALL_KEY,   RCAREA_SHADOW_TEMPLE, ACTOR_EN_ITEM00, SCENE_SHADOW_TEMPLE, 273,    0x01, "Freestanding Key",                    "Shadow Temple Freestanding Key",                    RHT_SHADOW_TEMPLE_FREESTANDING_KEY,                    RG_SHADOW_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE, true);
+    locationTable[RC_SHADOW_TEMPLE_MAP_CHEST] =                                       Location::Chest(RC_SHADOW_TEMPLE_MAP_CHEST,                                      RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                6177,                                              0x01, "Map Chest",                                   "Shadow Temple Map Chest",                                  RHT_SHADOW_TEMPLE_MAP_CHEST,                                     RG_SHADOW_TEMPLE_MAP,                 { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
+    locationTable[RC_SHADOW_TEMPLE_HOVER_BOOTS_CHEST] =                               Location::Chest(RC_SHADOW_TEMPLE_HOVER_BOOTS_CHEST,                              RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                5607,                                              0x07, "Hover Boots Chest",                           "Shadow Temple Hover Boots Chest",                          RHT_SHADOW_TEMPLE_HOVER_BOOTS_CHEST,                             RG_HOVER_BOOTS,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
+    locationTable[RC_SHADOW_TEMPLE_COMPASS_CHEST] =                                   Location::Chest(RC_SHADOW_TEMPLE_COMPASS_CHEST,                                  RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                6147,                                              0x03, "Compass Chest",                               "Shadow Temple Compass Chest",                              RHT_SHADOW_TEMPLE_COMPASS_CHEST,                                 RG_SHADOW_TEMPLE_COMPASS,             { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
+    locationTable[RC_SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST] =                        Location::Chest(RC_SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST,                       RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                22594,                                             0x02, "Early Silver Rupee Chest",                    "Shadow Temple Early Silver Rupee Chest",                   RHT_SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST,                      RG_SHADOW_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
+    locationTable[RC_SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST] =                  Location::Chest(RC_SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST,                 RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                22668,                                             0x0C, "Invisible Blades Visible Chest",              "Shadow Temple Invisible Blades Visible Chest",             RHT_SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST,                RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST] =                Location::Chest(RC_SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST,               RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                26998,                                             0x16, "Invisible Blades Invisible Chest",            "Shadow Temple Invisible Blades Invisible Chest",           RHT_SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST,              RG_ARROWS_30,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST] =                      Location::Chest(RC_SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST,                     RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                22853,                                             0x05, "Falling Spikes Lower Chest",                  "Shadow Temple Falling Spikes Lower Chest",                 RHT_SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST,                    RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST] =                      Location::Chest(RC_SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST,                     RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                22662,                                             0x06, "Falling Spikes Upper Chest",                  "Shadow Temple Falling Spikes Upper Chest",                 RHT_SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST,                    RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST] =                     Location::Chest(RC_SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST,                    RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                -30652,                                            0x04, "Falling Spikes Switch Chest",                 "Shadow Temple Falling Spikes Switch Chest",                RHT_SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST,                   RG_SHADOW_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
+    locationTable[RC_SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST] =                          Location::Chest(RC_SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST,                         RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                30857,                                             0x09, "Invisible Spikes Chest",                      "Shadow Temple Invisible Spikes Chest",                     RHT_SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST,                        RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_WIND_HINT_CHEST] =                                 Location::Chest(RC_SHADOW_TEMPLE_WIND_HINT_CHEST,                                RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                26965,                                             0x15, "Wind Hint Chest",                             "Shadow Temple Wind Hint Chest",                            RHT_SHADOW_TEMPLE_WIND_HINT_CHEST,                               RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST] =                          Location::Chest(RC_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST,                         RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                30856,                                             0x08, "After Wind Enemy Chest",                      "Shadow Temple After Wind Enemy Chest",                     RHT_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST,                        RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST] =                         Location::Chest(RC_SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST,                        RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                26708,                                             0x14, "After Wind Hidden Chest",                     "Shadow Temple After Wind Hidden Chest",                    RHT_SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST,                       RG_SHADOW_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
+    locationTable[RC_SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST] =                          Location::Chest(RC_SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST,                         RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                22666,                                             0x0A, "Spike Walls Left Chest",                      "Shadow Temple Spike Walls Left Chest",                     RHT_SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST,                        RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_BOSS_KEY_CHEST] =                                  Location::Chest(RC_SHADOW_TEMPLE_BOSS_KEY_CHEST,                                 RCQUEST_VANILLA, RCTYPE_BOSS_KEY,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                10219,                                             0x0B, "Boss Key Chest",                              "Shadow Temple Boss Key Chest",                             RHT_SHADOW_TEMPLE_BOSS_KEY_CHEST,                                RG_SHADOW_TEMPLE_BOSS_KEY,            { Category::cVanillaBossKey },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
+    locationTable[RC_SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST] =                     Location::Chest(RC_SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST,                    RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                30797,                                             0x0D, "Invisible Floormaster Chest",                 "Shadow Temple Invisible Floormaster Chest",                RHT_SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST,                   RG_SHADOW_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
+    locationTable[RC_SHADOW_TEMPLE_FREESTANDING_KEY] =                          Location::Collectable(RC_SHADOW_TEMPLE_FREESTANDING_KEY,                               RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_ITEM00,      SCENE_SHADOW_TEMPLE,                273,                                               0x01, "Freestanding Key",                            "Shadow Temple Freestanding Key",                           RHT_SHADOW_TEMPLE_FREESTANDING_KEY,                              RG_SHADOW_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
     // Shadow Temple MQ
-    locationTable[RC_SHADOW_TEMPLE_MQ_COMPASS_CHEST] =                    Location::Chest(RC_SHADOW_TEMPLE_MQ_COMPASS_CHEST,                    RCQUEST_MQ,      RCTYPE_MAP_COMPASS, RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 6145,   0x01, "MQ Compass Chest",                    "Shadow Temple MQ Compass Chest",                    RHT_SHADOW_TEMPLE_MQ_COMPASS_CHEST,                    RG_SHADOW_TEMPLE_COMPASS,   { Category::cVanillaCompass },  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE, true);
-    locationTable[RC_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST] =                Location::Chest(RC_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST,                RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 5607,   0x07, "MQ Hover Boots Chest",                "Shadow Temple MQ Hover Boots Chest",                RHT_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST,                RG_HOVER_BOOTS,             {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE, true);
-    locationTable[RC_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST] =               Location::Chest(RC_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST,               RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 30787,  0x03, "MQ Early Gibdos Chest",               "Shadow Temple MQ Early Gibdos Chest",               RHT_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST,               RG_SHADOW_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE, true);
-    locationTable[RC_SHADOW_TEMPLE_MQ_MAP_CHEST] =                        Location::Chest(RC_SHADOW_TEMPLE_MQ_MAP_CHEST,                        RCQUEST_MQ,      RCTYPE_MAP_COMPASS, RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 2082,   0x02, "MQ Map Chest",                        "Shadow Temple MQ Map Chest",                        RHT_SHADOW_TEMPLE_MQ_MAP_CHEST,                        RG_SHADOW_TEMPLE_MAP,       { Category::cVanillaMap },      SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE, true);
-    locationTable[RC_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST] =       Location::Chest(RC_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST,       RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, -30417, 0x0F, "MQ Beamos Silver Rupees Chest",       "Shadow Temple MQ Beamos Silver Rupees Chest",       RHT_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST,       RG_ARROWS_5,                {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST] =      Location::Chest(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST,      RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 22662,  0x04, "MQ Falling Spikes Switch Chest",      "Shadow Temple MQ Falling Spikes Switch Chest",      RHT_SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST,      RG_SHADOW_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE, true);
-    locationTable[RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST] =       Location::Chest(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST,       RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 22853,  0x05, "MQ Falling Spikes Lower Chest",       "Shadow Temple MQ Falling Spikes Lower Chest",       RHT_SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST,       RG_ARROWS_10,               {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST] =       Location::Chest(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST,       RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, -30652, 0x06, "MQ Falling Spikes Upper Chest",       "Shadow Temple MQ Falling Spikes Upper Chest",       RHT_SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST,       RG_ARROWS_5,                {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST] =           Location::Chest(RC_SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST,           RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 30857,  0x09, "MQ Invisible Spikes Chest",           "Shadow Temple MQ Invisible Spikes Chest",           RHT_SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST,           RG_BLUE_RUPEE,              {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST] =                   Location::Chest(RC_SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST,                   RCQUEST_MQ,      RCTYPE_BOSS_KEY,    RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 10219,  0x0B, "MQ Boss Key Chest",                   "Shadow Temple MQ Boss Key Chest",                   RHT_SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST,                   RG_SHADOW_TEMPLE_BOSS_KEY,  { Category::cVanillaBossKey },  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE, true);
-    locationTable[RC_SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST] =           Location::Chest(RC_SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST,           RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 22666,  0x0A, "MQ Spike Walls Left Chest",           "Shadow Temple MQ Spike Walls Left Chest",           RHT_SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST,           RG_BLUE_RUPEE,              {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST] =               Location::Chest(RC_SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST,               RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 31184,  0x10, "MQ Stalfos Room Chest",               "Shadow Temple MQ Stalfos Room Chest",               RHT_SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST,               RG_RED_RUPEE,               {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST] = Location::Chest(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST, RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 26710,  0x16, "MQ Invisible Blades Invisible Chest", "Shadow Temple MQ Invisible Blades Invisible Chest", RHT_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST, RG_SHADOW_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE, true);
-    locationTable[RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST] =   Location::Chest(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST,   RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 22668,  0x0C, "MQ Invisible Blades Visible Chest",   "Shadow Temple MQ Invisible Blades Visible Chest",   RHT_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST,   RG_BLUE_RUPEE,              {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST] =                Location::Chest(RC_SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST,                RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 31053,  0x0D, "MQ Bomb Flower Chest",                "Shadow Temple MQ Bomb Flower Chest",                RHT_SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST,                RG_ARROWS_10,               {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_MQ_WIND_HINT_CHEST] =                  Location::Chest(RC_SHADOW_TEMPLE_MQ_WIND_HINT_CHEST,                  RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 26709,  0x15, "MQ Wind Hint Chest",                  "Shadow Temple MQ Wind Hint Chest",                  RHT_SHADOW_TEMPLE_MQ_WIND_HINT_CHEST,                  RG_SHADOW_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE, true);
-    locationTable[RC_SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST] =          Location::Chest(RC_SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST,          RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 26932,  0x14, "MQ After Wind Hidden Chest",          "Shadow Temple MQ After Wind Hidden Chest",          RHT_SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST,          RG_ARROWS_5,                {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST] =           Location::Chest(RC_SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST,           RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 30856,  0x08, "MQ After Wind Enemy Chest",           "Shadow Temple MQ After Wind Enemy Chest",           RHT_SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST,           RG_BLUE_RUPEE,              {},                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST] =        Location::Chest(RC_SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST,        RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_SHADOW_TEMPLE, ACTOR_EN_BOX,    SCENE_SHADOW_TEMPLE, 26702,  0x0E, "MQ Near Ship Invisible Chest",        "Shadow Temple MQ Near Ship Invisible Chest",        RHT_SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST,        RG_SHADOW_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE, true);
-    locationTable[RC_SHADOW_TEMPLE_MQ_FREESTANDING_KEY] =           Location::Collectable(RC_SHADOW_TEMPLE_MQ_FREESTANDING_KEY,                 RCQUEST_MQ,      RCTYPE_SMALL_KEY,   RCAREA_SHADOW_TEMPLE, ACTOR_EN_ITEM00, SCENE_SHADOW_TEMPLE, 1553,   0x06, "MQ Freestanding Key",                 "Shadow Temple MQ Freestanding Key",                 RHT_SHADOW_TEMPLE_MQ_FREESTANDING_KEY,                 RG_SHADOW_TEMPLE_SMALL_KEY, { Category::cVanillaSmallKey }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE, true);
+    locationTable[RC_SHADOW_TEMPLE_MQ_COMPASS_CHEST] =                                Location::Chest(RC_SHADOW_TEMPLE_MQ_COMPASS_CHEST,                               RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                6145,                                              0x01, "MQ Compass Chest",                            "Shadow Temple MQ Compass Chest",                           RHT_SHADOW_TEMPLE_MQ_COMPASS_CHEST,                              RG_SHADOW_TEMPLE_COMPASS,             { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
+    locationTable[RC_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST] =                            Location::Chest(RC_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST,                           RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                5607,                                              0x07, "MQ Hover Boots Chest",                        "Shadow Temple MQ Hover Boots Chest",                       RHT_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST,                          RG_HOVER_BOOTS,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
+    locationTable[RC_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST] =                           Location::Chest(RC_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST,                          RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                30787,                                             0x03, "MQ Early Gibdos Chest",                       "Shadow Temple MQ Early Gibdos Chest",                      RHT_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST,                         RG_SHADOW_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
+    locationTable[RC_SHADOW_TEMPLE_MQ_MAP_CHEST] =                                    Location::Chest(RC_SHADOW_TEMPLE_MQ_MAP_CHEST,                                   RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                2082,                                              0x02, "MQ Map Chest",                                "Shadow Temple MQ Map Chest",                               RHT_SHADOW_TEMPLE_MQ_MAP_CHEST,                                  RG_SHADOW_TEMPLE_MAP,                 { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
+    locationTable[RC_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST] =                   Location::Chest(RC_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST,                  RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                -30417,                                            0x0F, "MQ Beamos Silver Rupees Chest",               "Shadow Temple MQ Beamos Silver Rupees Chest",              RHT_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST,                 RG_ARROWS_5,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST] =                  Location::Chest(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST,                 RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                22662,                                             0x04, "MQ Falling Spikes Switch Chest",              "Shadow Temple MQ Falling Spikes Switch Chest",             RHT_SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST,                RG_SHADOW_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
+    locationTable[RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST] =                   Location::Chest(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST,                  RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                22853,                                             0x05, "MQ Falling Spikes Lower Chest",               "Shadow Temple MQ Falling Spikes Lower Chest",              RHT_SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST,                 RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST] =                   Location::Chest(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST,                  RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                -30652,                                            0x06, "MQ Falling Spikes Upper Chest",               "Shadow Temple MQ Falling Spikes Upper Chest",              RHT_SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST,                 RG_ARROWS_5,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST] =                       Location::Chest(RC_SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST,                      RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                30857,                                             0x09, "MQ Invisible Spikes Chest",                   "Shadow Temple MQ Invisible Spikes Chest",                  RHT_SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST,                     RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST] =                               Location::Chest(RC_SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST,                              RCQUEST_MQ,      RCTYPE_BOSS_KEY,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                10219,                                             0x0B, "MQ Boss Key Chest",                           "Shadow Temple MQ Boss Key Chest",                          RHT_SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST,                             RG_SHADOW_TEMPLE_BOSS_KEY,            { Category::cVanillaBossKey },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
+    locationTable[RC_SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST] =                       Location::Chest(RC_SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST,                      RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                22666,                                             0x0A, "MQ Spike Walls Left Chest",                   "Shadow Temple MQ Spike Walls Left Chest",                  RHT_SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST,                     RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST] =                           Location::Chest(RC_SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST,                          RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                31184,                                             0x10, "MQ Stalfos Room Chest",                       "Shadow Temple MQ Stalfos Room Chest",                      RHT_SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST,                         RG_RED_RUPEE,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST] =             Location::Chest(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST,            RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                26710,                                             0x16, "MQ Invisible Blades Invisible Chest",         "Shadow Temple MQ Invisible Blades Invisible Chest",        RHT_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST,           RG_SHADOW_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
+    locationTable[RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST] =               Location::Chest(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST,              RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                22668,                                             0x0C, "MQ Invisible Blades Visible Chest",           "Shadow Temple MQ Invisible Blades Visible Chest",          RHT_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST,             RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST] =                            Location::Chest(RC_SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST,                           RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                31053,                                             0x0D, "MQ Bomb Flower Chest",                        "Shadow Temple MQ Bomb Flower Chest",                       RHT_SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST,                          RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_WIND_HINT_CHEST] =                              Location::Chest(RC_SHADOW_TEMPLE_MQ_WIND_HINT_CHEST,                             RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                26709,                                             0x15, "MQ Wind Hint Chest",                          "Shadow Temple MQ Wind Hint Chest",                         RHT_SHADOW_TEMPLE_MQ_WIND_HINT_CHEST,                            RG_SHADOW_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
+    locationTable[RC_SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST] =                      Location::Chest(RC_SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST,                     RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                26932,                                             0x14, "MQ After Wind Hidden Chest",                  "Shadow Temple MQ After Wind Hidden Chest",                 RHT_SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST,                    RG_ARROWS_5,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST] =                       Location::Chest(RC_SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST,                      RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                30856,                                             0x08, "MQ After Wind Enemy Chest",                   "Shadow Temple MQ After Wind Enemy Chest",                  RHT_SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST,                     RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST] =                    Location::Chest(RC_SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST,                   RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                26702,                                             0x0E, "MQ Near Ship Invisible Chest",                "Shadow Temple MQ Near Ship Invisible Chest",               RHT_SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST,                  RG_SHADOW_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
+    locationTable[RC_SHADOW_TEMPLE_MQ_FREESTANDING_KEY] =                       Location::Collectable(RC_SHADOW_TEMPLE_MQ_FREESTANDING_KEY,                            RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_ITEM00,      SCENE_SHADOW_TEMPLE,                1553,                                              0x06, "MQ Freestanding Key",                         "Shadow Temple MQ Freestanding Key",                        RHT_SHADOW_TEMPLE_MQ_FREESTANDING_KEY,                           RG_SHADOW_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
 
-    //            Randomizer Check                                                                   Randomizer Check                                           Quest            Type                               Area                       Actor ID         Scene ID                  Params  Flags Short Name                             Spoiler Name                                              Hint Text Key                                               Vanilla Item                     Categories                        Collection Check Group                                         Vanilla Progression
     // Bottom of the Well Vanilla
-    locationTable[RC_BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST] =          Location::Chest(      RC_BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST,          RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_BOTTOM_OF_THE_WELL, ACTOR_EN_BOX,    SCENE_BOTTOM_OF_THE_WELL, 22600,  0x08, "Front Left Fake Wall Chest",          "Bottom of the Well Front Left Fake Wall Chest",          RHT_BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST,          RG_BOTTOM_OF_THE_WELL_SMALL_KEY, { Category::cVanillaSmallKey },   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
-    locationTable[RC_BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST] =         Location::Chest(      RC_BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST,         RCQUEST_VANILLA, RCTYPE_STANDARD,                   RCAREA_BOTTOM_OF_THE_WELL, ACTOR_EN_BOX,    SCENE_BOTTOM_OF_THE_WELL, 20578,  0x02, "Front Center Bombable Chest",         "Bottom of the Well Front Center Bombable Chest",         RHT_BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST,         RG_BOMBCHU_10,                   {},                               SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[RC_BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST] =        Location::Chest(      RC_BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST,        RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_BOTTOM_OF_THE_WELL, ACTOR_EN_BOX,    SCENE_BOTTOM_OF_THE_WELL, 22597,  0x05, "Right Bottom Fake Wall Chest",        "Bottom of the Well Right Bottom Fake Wall Chest",        RHT_BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST,        RG_BOTTOM_OF_THE_WELL_SMALL_KEY, { Category::cVanillaSmallKey },   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
-    locationTable[RC_BOTTOM_OF_THE_WELL_COMPASS_CHEST] =                       Location::Chest(      RC_BOTTOM_OF_THE_WELL_COMPASS_CHEST,                       RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                RCAREA_BOTTOM_OF_THE_WELL, ACTOR_EN_BOX,    SCENE_BOTTOM_OF_THE_WELL, 2049,   0x01, "Compass Chest",                       "Bottom of the Well Compass Chest",                       RHT_BOTTOM_OF_THE_WELL_COMPASS_CHEST,                       RG_BOTTOM_OF_THE_WELL_COMPASS,   { Category::cVanillaCompass },    SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
-    locationTable[RC_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST] =              Location::Chest(      RC_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST,              RCQUEST_VANILLA, RCTYPE_STANDARD,                   RCAREA_BOTTOM_OF_THE_WELL, ACTOR_EN_BOX,    SCENE_BOTTOM_OF_THE_WELL, 20558,  0x0E, "Center Skulltula Chest",              "Bottom of the Well Center Skulltula Chest",              RHT_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST,              RG_DEKU_NUTS_5,                  {},                               SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[RC_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST] =            Location::Chest(      RC_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST,            RCQUEST_VANILLA, RCTYPE_STANDARD,                   RCAREA_BOTTOM_OF_THE_WELL, ACTOR_EN_BOX,    SCENE_BOTTOM_OF_THE_WELL, 23684,  0x04, "Back Left Bombable Chest",            "Bottom of the Well Back Left Bombable Chest",            RHT_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST,            RG_DEKU_NUTS_10,                 {},                               SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[RC_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST] =                 Location::Chest(      RC_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST,                 RCQUEST_VANILLA, RCTYPE_BOSS_HEART_OR_OTHER_REWARD, RCAREA_BOTTOM_OF_THE_WELL, ACTOR_EN_BOX,    SCENE_BOTTOM_OF_THE_WELL, 4419,   0x03, "Lens of Truth Chest",                 "Bottom of the Well Lens of Truth Chest",                 RHT_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST,                 RG_LENS_OF_TRUTH,                { Category::cSongDungeonReward }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
-    locationTable[RC_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST] =                     Location::Chest(      RC_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST,                     RCQUEST_VANILLA, RCTYPE_STANDARD,                   RCAREA_BOTTOM_OF_THE_WELL, ACTOR_EN_BOX,    SCENE_BOTTOM_OF_THE_WELL, 27348,  0x14, "Invisible Chest",                     "Bottom of the Well Invisible Chest",                     RHT_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST,                     RG_HUGE_RUPEE,                   {},                               SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[RC_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST] =              Location::Chest(      RC_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST,              RCQUEST_VANILLA, RCTYPE_STANDARD,                   RCAREA_BOTTOM_OF_THE_WELL, ACTOR_EN_BOX,    SCENE_BOTTOM_OF_THE_WELL, 23760,  0x10, "Underwater Front Chest",              "Bottom of the Well Underwater Front Chest",              RHT_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST,              RG_BOMBS_10,                     {},                               SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[RC_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST] =               Location::Chest(      RC_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST,               RCQUEST_VANILLA, RCTYPE_STANDARD,                   RCAREA_BOTTOM_OF_THE_WELL, ACTOR_EN_BOX,    SCENE_BOTTOM_OF_THE_WELL, 22793,  0x09, "Underwater Left Chest",               "Bottom of the Well Underwater Left Chest",               RHT_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST,               RG_RECOVERY_HEART,               {},                               SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[RC_BOTTOM_OF_THE_WELL_MAP_CHEST] =                           Location::Chest(      RC_BOTTOM_OF_THE_WELL_MAP_CHEST,                           RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                RCAREA_BOTTOM_OF_THE_WELL, ACTOR_EN_BOX,    SCENE_BOTTOM_OF_THE_WELL, 2087,   0x07, "Map Chest",                           "Bottom of the Well Map Chest",                           RHT_BOTTOM_OF_THE_WELL_MAP_CHEST,                           RG_BOTTOM_OF_THE_WELL_MAP,       { Category::cVanillaMap },        SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
-    locationTable[RC_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST] =                    Location::Chest(      RC_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST,                    RCQUEST_VANILLA, RCTYPE_STANDARD,                   RCAREA_BOTTOM_OF_THE_WELL, ACTOR_EN_BOX,    SCENE_BOTTOM_OF_THE_WELL, 21802,  0x0A, "Fire Keese Chest",                    "Bottom of the Well Fire Keese Chest",                    RHT_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST,                    RG_DEKU_SHIELD,                  {},                               SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[RC_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST] =                     Location::Chest(      RC_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST,                     RCQUEST_VANILLA, RCTYPE_STANDARD,                   RCAREA_BOTTOM_OF_THE_WELL, ACTOR_EN_BOX,    SCENE_BOTTOM_OF_THE_WELL, 21836,  0x0C, "Like Like Chest",                     "Bottom of the Well Like Like Chest",                     RHT_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST,                     RG_HYLIAN_SHIELD,                {},                               SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[RC_BOTTOM_OF_THE_WELL_FREESTANDING_KEY] =                    Location::Chest(      RC_BOTTOM_OF_THE_WELL_FREESTANDING_KEY,                    RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_BOTTOM_OF_THE_WELL, ACTOR_EN_ITEM00, SCENE_BOTTOM_OF_THE_WELL, 273,    0x01, "Freestanding Key",                    "Bottom of the Well Freestanding Key",                    RHT_BOTTOM_OF_THE_WELL_FREESTANDING_KEY,                    RG_BOTTOM_OF_THE_WELL_SMALL_KEY, { Category::cVanillaSmallKey },   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
+    locationTable[RC_BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST] =                 Location::Chest(RC_BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST,                RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           22600,                                             0x08, "Front Left Fake Wall Chest",                  "Bottom of the Well Front Left Fake Wall Chest",            RHT_BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST,               RG_BOTTOM_OF_THE_WELL_SMALL_KEY,      { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
+    locationTable[RC_BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST] =                Location::Chest(RC_BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST,               RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           20578,                                             0x02, "Front Center Bombable Chest",                 "Bottom of the Well Front Center Bombable Chest",           RHT_BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST,              RG_BOMBCHU_10,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
+    locationTable[RC_BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST] =               Location::Chest(RC_BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST,              RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           22597,                                             0x05, "Right Bottom Fake Wall Chest",                "Bottom of the Well Right Bottom Fake Wall Chest",          RHT_BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST,             RG_BOTTOM_OF_THE_WELL_SMALL_KEY,      { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
+    locationTable[RC_BOTTOM_OF_THE_WELL_COMPASS_CHEST] =                              Location::Chest(RC_BOTTOM_OF_THE_WELL_COMPASS_CHEST,                             RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           2049,                                              0x01, "Compass Chest",                               "Bottom of the Well Compass Chest",                         RHT_BOTTOM_OF_THE_WELL_COMPASS_CHEST,                            RG_BOTTOM_OF_THE_WELL_COMPASS,        { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
+    locationTable[RC_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST] =                     Location::Chest(RC_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST,                    RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           20558,                                             0x0E, "Center Skulltula Chest",                      "Bottom of the Well Center Skulltula Chest",                RHT_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST,                   RG_DEKU_NUTS_5,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
+    locationTable[RC_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST] =                   Location::Chest(RC_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST,                  RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           23684,                                             0x04, "Back Left Bombable Chest",                    "Bottom of the Well Back Left Bombable Chest",              RHT_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST,                 RG_DEKU_NUTS_10,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
+    locationTable[RC_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST] =                        Location::Chest(RC_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST,                       RCQUEST_VANILLA, RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           4419,                                              0x03, "Lens of Truth Chest",                         "Bottom of the Well Lens of Truth Chest",                   RHT_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST,                      RG_LENS_OF_TRUTH,                     { Category::cSongDungeonReward },                                                                                                                                                     SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
+    locationTable[RC_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST] =                            Location::Chest(RC_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST,                           RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           27348,                                             0x14, "Invisible Chest",                             "Bottom of the Well Invisible Chest",                       RHT_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST,                          RG_HUGE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
+    locationTable[RC_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST] =                     Location::Chest(RC_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST,                    RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           23760,                                             0x10, "Underwater Front Chest",                      "Bottom of the Well Underwater Front Chest",                RHT_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST,                   RG_BOMBS_10,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
+    locationTable[RC_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST] =                      Location::Chest(RC_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST,                     RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           22793,                                             0x09, "Underwater Left Chest",                       "Bottom of the Well Underwater Left Chest",                 RHT_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST,                    RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
+    locationTable[RC_BOTTOM_OF_THE_WELL_MAP_CHEST] =                                  Location::Chest(RC_BOTTOM_OF_THE_WELL_MAP_CHEST,                                 RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           2087,                                              0x07, "Map Chest",                                   "Bottom of the Well Map Chest",                             RHT_BOTTOM_OF_THE_WELL_MAP_CHEST,                                RG_BOTTOM_OF_THE_WELL_MAP,            { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
+    locationTable[RC_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST] =                           Location::Chest(RC_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST,                          RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           21802,                                             0x0A, "Fire Keese Chest",                            "Bottom of the Well Fire Keese Chest",                      RHT_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST,                         RG_DEKU_SHIELD,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
+    locationTable[RC_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST] =                            Location::Chest(RC_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST,                           RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           21836,                                             0x0C, "Like Like Chest",                             "Bottom of the Well Like Like Chest",                       RHT_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST,                          RG_HYLIAN_SHIELD,                     {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
+    locationTable[RC_BOTTOM_OF_THE_WELL_FREESTANDING_KEY] =                     Location::Collectable(RC_BOTTOM_OF_THE_WELL_FREESTANDING_KEY,                          RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_ITEM00,      SCENE_BOTTOM_OF_THE_WELL,           273,                                               0x01, "Freestanding Key",                            "Bottom of the Well Freestanding Key",                      RHT_BOTTOM_OF_THE_WELL_FREESTANDING_KEY,                         RG_BOTTOM_OF_THE_WELL_SMALL_KEY,      { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
     // Bottom of the Well Master Quest
-    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_MAP_CHEST] =                        Location::Chest(      RC_BOTTOM_OF_THE_WELL_MQ_MAP_CHEST,                        RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                RCAREA_BOTTOM_OF_THE_WELL, ACTOR_EN_BOX,    SCENE_BOTTOM_OF_THE_WELL, 2083,   0x03, "MQ Map Chest",                        "Bottom of the Well MQ Map Chest",                        RHT_BOTTOM_OF_THE_WELL_MQ_MAP_CHEST,                        RG_BOTTOM_OF_THE_WELL_MAP,       { Category::cVanillaMap },        SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
-    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST] =              Location::Chest(      RC_BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST,              RCQUEST_MQ,      RCTYPE_BOSS_HEART_OR_OTHER_REWARD, RCAREA_BOTTOM_OF_THE_WELL, ACTOR_EN_BOX,    SCENE_BOTTOM_OF_THE_WELL, -20159, 0x01, "MQ Lens of Truth Chest",              "Bottom of the Well MQ Lens of Truth Chest",              RHT_BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST,              RG_LENS_OF_TRUTH,                { Category::cSongDungeonReward }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
-    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST] =                    Location::Chest(      RC_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST,                    RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                RCAREA_BOTTOM_OF_THE_WELL, ACTOR_EN_BOX,    SCENE_BOTTOM_OF_THE_WELL, 6146,   0x02, "MQ Compass Chest",                    "Bottom of the Well MQ Compass Chest",                    RHT_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST,                    RG_BOTTOM_OF_THE_WELL_COMPASS,   { Category::cVanillaCompass },    SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
-    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY] =       Location::Collectable(RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY,       RCQUEST_MQ,      RCTYPE_SMALL_KEY,                  RCAREA_BOTTOM_OF_THE_WELL, ACTOR_EN_ITEM00, SCENE_BOTTOM_OF_THE_WELL, 529,    0x02, "MQ Dead Hand Freestanding Key",       "Bottom of the Well MQ Dead Hand Freestanding Key",       RHT_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY,       RG_BOTTOM_OF_THE_WELL_SMALL_KEY, { Category::cVanillaSmallKey },   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
-    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY] = Location::Collectable(RC_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY, RCQUEST_MQ,      RCTYPE_SMALL_KEY,                  RCAREA_BOTTOM_OF_THE_WELL, ACTOR_EN_ITEM00, SCENE_BOTTOM_OF_THE_WELL, 273,    0x01, "MQ East Inner Room Freestanding Key", "Bottom of the Well MQ East Inner Room Freestanding Key", RHT_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY, RG_BOTTOM_OF_THE_WELL_SMALL_KEY, { Category::cVanillaSmallKey },   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
+    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_MAP_CHEST] =                               Location::Chest(RC_BOTTOM_OF_THE_WELL_MQ_MAP_CHEST,                              RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           2083,                                              0x03, "MQ Map Chest",                                "Bottom of the Well MQ Map Chest",                          RHT_BOTTOM_OF_THE_WELL_MQ_MAP_CHEST,                             RG_BOTTOM_OF_THE_WELL_MAP,            { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
+    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST] =                     Location::Chest(RC_BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST,                    RCQUEST_MQ,      RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           -20159,                                            0x01, "MQ Lens of Truth Chest",                      "Bottom of the Well MQ Lens of Truth Chest",                RHT_BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST,                   RG_LENS_OF_TRUTH,                     { Category::cSongDungeonReward },                                                                                                                                                     SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
+    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST] =                           Location::Chest(RC_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST,                          RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           6146,                                              0x02, "MQ Compass Chest",                            "Bottom of the Well MQ Compass Chest",                      RHT_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST,                         RG_BOTTOM_OF_THE_WELL_COMPASS,        { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
+    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY] =        Location::Collectable(RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY,             RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_ITEM00,      SCENE_BOTTOM_OF_THE_WELL,           529,                                               0x02, "MQ Dead Hand Freestanding Key",               "Bottom of the Well MQ Dead Hand Freestanding Key",         RHT_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY,            RG_BOTTOM_OF_THE_WELL_SMALL_KEY,      { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
+    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY] =  Location::Collectable(RC_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY,       RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_ITEM00,      SCENE_BOTTOM_OF_THE_WELL,           273,                                               0x01, "MQ East Inner Room Freestanding Key",         "Bottom of the Well MQ East Inner Room Freestanding Key",   RHT_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY,      RG_BOTTOM_OF_THE_WELL_SMALL_KEY,      { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
 
-    //            Randomizer Check                                           Randomizer Check                   Quest            Type                Area               Actor ID         Scene ID          Params  Flag  Short Name             Spoiler Name                      Hint Text Key                       Vanilla Item           Categories                     Collection Check Group                                 Vanilla Progression
     // Ice Cavern Vanilla
-    locationTable[RC_ICE_CAVERN_MAP_CHEST] =           Location::Chest(      RC_ICE_CAVERN_MAP_CHEST,           RCQUEST_VANILLA, RCTYPE_MAP_COMPASS, RCAREA_ICE_CAVERN, ACTOR_EN_BOX,    SCENE_ICE_CAVERN, 2080,   0x00, "Map Chest",           "Ice Cavern Map Chest",           RHT_ICE_CAVERN_MAP_CHEST,           RG_ICE_CAVERN_MAP,     { Category::cVanillaMap },     SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN, true);
-    locationTable[RC_ICE_CAVERN_COMPASS_CHEST] =       Location::Chest(      RC_ICE_CAVERN_COMPASS_CHEST,       RCQUEST_VANILLA, RCTYPE_MAP_COMPASS, RCAREA_ICE_CAVERN, ACTOR_EN_BOX,    SCENE_ICE_CAVERN, 2049,   0x01, "Compass Chest",       "Ice Cavern Compass Chest",       RHT_ICE_CAVERN_COMPASS_CHEST,       RG_ICE_CAVERN_COMPASS, { Category::cVanillaCompass }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN, true);
-    locationTable[RC_ICE_CAVERN_IRON_BOOTS_CHEST] =    Location::Chest(      RC_ICE_CAVERN_IRON_BOOTS_CHEST,    RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_ICE_CAVERN, ACTOR_EN_BOX,    SCENE_ICE_CAVERN, 5570,   0x02, "Iron Boots Chest",    "Ice Cavern Iron Boots Chest",    RHT_ICE_CAVERN_IRON_BOOTS_CHEST,    RG_IRON_BOOTS,         {},                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN, true);
-    locationTable[RC_ICE_CAVERN_FREESTANDING_POH] =    Location::Collectable(RC_ICE_CAVERN_FREESTANDING_POH,    RCQUEST_VANILLA, RCTYPE_STANDARD,    RCAREA_ICE_CAVERN, ACTOR_EN_ITEM00, SCENE_ICE_CAVERN, 262,    0x01, "Freestanding PoH",    "Ice Cavern Freestanding PoH",    RHT_ICE_CAVERN_FREESTANDING_POH,    RG_PIECE_OF_HEART,     {},                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN, true);
+    locationTable[RC_ICE_CAVERN_MAP_CHEST] =                                          Location::Chest(RC_ICE_CAVERN_MAP_CHEST,                                         RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_ICE_CAVERN,                   ACTOR_EN_BOX,         SCENE_ICE_CAVERN,                   2080,                                              0x00, "Map Chest",                                   "Ice Cavern Map Chest",                                     RHT_ICE_CAVERN_MAP_CHEST,                                        RG_ICE_CAVERN_MAP,                    { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN,         true);
+    locationTable[RC_ICE_CAVERN_COMPASS_CHEST] =                                      Location::Chest(RC_ICE_CAVERN_COMPASS_CHEST,                                     RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_ICE_CAVERN,                   ACTOR_EN_BOX,         SCENE_ICE_CAVERN,                   2049,                                              0x01, "Compass Chest",                               "Ice Cavern Compass Chest",                                 RHT_ICE_CAVERN_COMPASS_CHEST,                                    RG_ICE_CAVERN_COMPASS,                { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN,         true);
+    locationTable[RC_ICE_CAVERN_IRON_BOOTS_CHEST] =                                   Location::Chest(RC_ICE_CAVERN_IRON_BOOTS_CHEST,                                  RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_ICE_CAVERN,                   ACTOR_EN_BOX,         SCENE_ICE_CAVERN,                   5570,                                              0x02, "Iron Boots Chest",                            "Ice Cavern Iron Boots Chest",                              RHT_ICE_CAVERN_IRON_BOOTS_CHEST,                                 RG_IRON_BOOTS,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN,         true);
+    locationTable[RC_ICE_CAVERN_FREESTANDING_POH] =                             Location::Collectable(RC_ICE_CAVERN_FREESTANDING_POH,                                  RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_ICE_CAVERN,                   ACTOR_EN_ITEM00,      SCENE_ICE_CAVERN,                   262,                                               0x01, "Freestanding PoH",                            "Ice Cavern Freestanding PoH",                              RHT_ICE_CAVERN_FREESTANDING_POH,                                 RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN,         true);
     // Ice Cavern Master Quest
-    locationTable[RC_ICE_CAVERN_MQ_IRON_BOOTS_CHEST] = Location::Chest(      RC_ICE_CAVERN_MQ_IRON_BOOTS_CHEST, RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_ICE_CAVERN, ACTOR_EN_BOX,    SCENE_ICE_CAVERN, 5570,   0x02, "MQ Iron Boots Chest", "Ice Cavern MQ Iron Boots Chest", RHT_ICE_CAVERN_MQ_IRON_BOOTS_CHEST, RG_IRON_BOOTS,         {},                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN, true);
-    locationTable[RC_ICE_CAVERN_MQ_COMPASS_CHEST] =    Location::Chest(      RC_ICE_CAVERN_MQ_COMPASS_CHEST,    RCQUEST_MQ,      RCTYPE_MAP_COMPASS, RCAREA_ICE_CAVERN, ACTOR_EN_BOX,    SCENE_ICE_CAVERN, 2048,   0x00, "MQ Compass Chest",    "Ice Cavern MQ Compass Chest",    RHT_ICE_CAVERN_MQ_COMPASS_CHEST,    RG_ICE_CAVERN_COMPASS, { Category::cVanillaCompass }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN, true);
-    locationTable[RC_ICE_CAVERN_MQ_MAP_CHEST] =        Location::Chest(      RC_ICE_CAVERN_MQ_MAP_CHEST,        RCQUEST_MQ,      RCTYPE_MAP_COMPASS, RCAREA_ICE_CAVERN, ACTOR_EN_BOX,    SCENE_ICE_CAVERN, -18399, 0x01, "MQ Map Chest",        "Ice Cavern MQ Map Chest",        RHT_ICE_CAVERN_MQ_MAP_CHEST,        RG_ICE_CAVERN_MAP,     { Category::cVanillaMap },     SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN, true);
-    locationTable[RC_ICE_CAVERN_MQ_FREESTANDING_POH] = Location::Collectable(RC_ICE_CAVERN_MQ_FREESTANDING_POH, RCQUEST_MQ,      RCTYPE_STANDARD,    RCAREA_ICE_CAVERN, ACTOR_EN_ITEM00, SCENE_ICE_CAVERN, 262,    0x01, "MQ Freestanding PoH", "Ice Cavern MQ Freestanding PoH", RHT_ICE_CAVERN_MQ_FREESTANDING_POH, RG_PIECE_OF_HEART,     {},                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN, true);
+    locationTable[RC_ICE_CAVERN_MQ_IRON_BOOTS_CHEST] =                                Location::Chest(RC_ICE_CAVERN_MQ_IRON_BOOTS_CHEST,                               RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_ICE_CAVERN,                   ACTOR_EN_BOX,         SCENE_ICE_CAVERN,                   5570,                                              0x02, "MQ Iron Boots Chest",                         "Ice Cavern MQ Iron Boots Chest",                           RHT_ICE_CAVERN_MQ_IRON_BOOTS_CHEST,                              RG_IRON_BOOTS,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN,         true);
+    locationTable[RC_ICE_CAVERN_MQ_COMPASS_CHEST] =                                   Location::Chest(RC_ICE_CAVERN_MQ_COMPASS_CHEST,                                  RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_ICE_CAVERN,                   ACTOR_EN_BOX,         SCENE_ICE_CAVERN,                   2048,                                              0x00, "MQ Compass Chest",                            "Ice Cavern MQ Compass Chest",                              RHT_ICE_CAVERN_MQ_COMPASS_CHEST,                                 RG_ICE_CAVERN_COMPASS,                { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN,         true);
+    locationTable[RC_ICE_CAVERN_MQ_MAP_CHEST] =                                       Location::Chest(RC_ICE_CAVERN_MQ_MAP_CHEST,                                      RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_ICE_CAVERN,                   ACTOR_EN_BOX,         SCENE_ICE_CAVERN,                   -18399,                                            0x01, "MQ Map Chest",                                "Ice Cavern MQ Map Chest",                                  RHT_ICE_CAVERN_MQ_MAP_CHEST,                                     RG_ICE_CAVERN_MAP,                    { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN,         true);
+    locationTable[RC_ICE_CAVERN_MQ_FREESTANDING_POH] =                          Location::Collectable(RC_ICE_CAVERN_MQ_FREESTANDING_POH,                               RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_ICE_CAVERN,                   ACTOR_EN_ITEM00,      SCENE_ICE_CAVERN,                   262,                                               0x01, "MQ Freestanding PoH",                         "Ice Cavern MQ Freestanding PoH",                           RHT_ICE_CAVERN_MQ_FREESTANDING_POH,                              RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN,         true);
 
-    //            Randomizer Check                                                              Randomizer Check                                            Quest            Type                               Area                           Actor ID         Scene ID                      Params  Flag  Short Name                          Spoiler Name                                                Hint Text Key                                                Vanilla Item                          Categories                        Collection Check Group                                     Vanilla Progression
     // Gerudo Training Grounds Vanilla
-    locationTable[RC_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST] =                 Location::Chest(RC_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST,                 RCQUEST_VANILLA, RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, -30573, 0x13, "Lobby Left Chest",                 "Gerudo Training Grounds Lobby Left Chest",                 RHT_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST,                 RG_BLUE_RUPEE,                        {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST] =                Location::Chest(RC_GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST,                RCQUEST_VANILLA, RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, -30393, 0x07, "Lobby Right Chest",                "Gerudo Training Grounds Lobby Right Chest",                RHT_GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST,                RG_ARROWS_10,                         {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_STALFOS_CHEST] =                    Location::Chest(RC_GERUDO_TRAINING_GROUND_STALFOS_CHEST,                    RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, -30656, 0x00, "Stalfos Chest",                    "Gerudo Training Grounds Stalfos Chest",                    RHT_GERUDO_TRAINING_GROUND_STALFOS_CHEST,                    RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND, true);
-    locationTable[RC_GERUDO_TRAINING_GROUND_BEAMOS_CHEST] =                     Location::Chest(RC_GERUDO_TRAINING_GROUND_BEAMOS_CHEST,                     RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, -30655, 0x01, "Beamos Chest",                     "Gerudo Training Grounds Beamos Chest",                     RHT_GERUDO_TRAINING_GROUND_BEAMOS_CHEST,                     RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND, true);
-    locationTable[RC_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST] =             Location::Chest(RC_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST,             RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 22603,  0x0B, "Hidden Ceiling Chest",             "Gerudo Training Grounds Hidden Ceiling Chest",             RHT_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST,             RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND, true);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST] =            Location::Chest(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST,            RCQUEST_VANILLA, RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 23206,  0x06, "Maze Path First Chest",            "Gerudo Training Grounds Maze Path First Chest",            RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST,            RG_PURPLE_RUPEE,                      {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MAZE_PATH_SECOND_CHEST] =           Location::Chest(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_SECOND_CHEST,           RCQUEST_VANILLA, RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 22986,  0x0A, "Maze Path Second Chest",           "Gerudo Training Grounds Maze Path Second Chest",           RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_SECOND_CHEST,           RG_RED_RUPEE,                         {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MAZE_PATH_THIRD_CHEST] =            Location::Chest(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_THIRD_CHEST,            RCQUEST_VANILLA, RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 22889,  0x09, "Maze Path Third Chest",            "Gerudo Training Grounds Maze Path Third Chest",            RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_THIRD_CHEST,            RG_ARROWS_30,                         {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FINAL_CHEST] =            Location::Chest(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FINAL_CHEST,            RCQUEST_VANILLA, RCTYPE_BOSS_HEART_OR_OTHER_REWARD, RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 2860,   0x0C, "Maze Path Final Chest",            "Gerudo Training Grounds Maze Path Final Chest",            RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_FINAL_CHEST,            RG_ICE_ARROWS,                        { Category::cSongDungeonReward }, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND, true);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_CENTRAL_CHEST] =         Location::Chest(RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_CENTRAL_CHEST,         RCQUEST_VANILLA, RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 23877,  0x05, "Maze Right Central Chest",         "Gerudo Training Grounds Maze Right Central Chest",         RHT_GERUDO_TRAINING_GROUND_MAZE_RIGHT_CENTRAL_CHEST,         RG_BOMBCHU_5,                         {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_SIDE_CHEST] =            Location::Chest(RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_SIDE_CHEST,            RCQUEST_VANILLA, RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 22888,  0x08, "Maze Right Side Chest",            "Gerudo Training Grounds Maze Right Side Chest",            RHT_GERUDO_TRAINING_GROUND_MAZE_RIGHT_SIDE_CHEST,            RG_ARROWS_30,                         {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST] =    Location::Chest(RC_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST,    RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, -30643, 0x0D, "Underwater Silver Rupee Chest",    "Gerudo Training Grounds Underwater Silver Rupee Chest",    RHT_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST,    RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND, true);
-    locationTable[RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST] =          Location::Chest(RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST,          RCQUEST_VANILLA, RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 31058,  0x12, "Hammer Room Clear Chest",          "Gerudo Training Grounds Hammer Room Clear Chest",          RHT_GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST,          RG_ARROWS_10,                         {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST] =         Location::Chest(RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST,         RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 22608,  0x10, "Hammer Room Switch Chest",         "Gerudo Training Grounds Hammer Room Switch Chest",         RHT_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST,         RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND, true);
-    locationTable[RC_GERUDO_TRAINING_GROUND_EYE_STATUE_CHEST] =                 Location::Chest(RC_GERUDO_TRAINING_GROUND_EYE_STATUE_CHEST,                 RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, -30653, 0x03, "Eye Statue Chest",                 "Gerudo Training Grounds Eye Statue Chest",                 RHT_GERUDO_TRAINING_GROUND_EYE_STATUE_CHEST,                 RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND, true);
-    locationTable[RC_GERUDO_TRAINING_GROUND_NEAR_SCARECROW_CHEST] =             Location::Chest(RC_GERUDO_TRAINING_GROUND_NEAR_SCARECROW_CHEST,             RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 22596,  0x04, "Near Scarecrow Chest",             "Gerudo Training Grounds Near Scarecrow Chest",             RHT_GERUDO_TRAINING_GROUND_NEAR_SCARECROW_CHEST,             RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND, true);
-    locationTable[RC_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST] =         Location::Chest(RC_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST,         RCQUEST_VANILLA, RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 31089,  0x11, "Before Heavy Block Chest",         "Gerudo Training Grounds Before Heavy Block Chest",         RHT_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST,         RG_ARROWS_30,                         {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST] =          Location::Chest(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST,          RCQUEST_VANILLA, RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 31439,  0x0F, "Heavy Block First Chest",          "Gerudo Training Grounds Heavy Block First Chest",          RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST,          RG_HUGE_RUPEE,                        {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST] =         Location::Chest(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST,         RCQUEST_VANILLA, RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 30862,  0x0E, "Heavy Block Second Chest",         "Gerudo Training Grounds Heavy Block Second Chest",         RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST,         RG_BLUE_RUPEE,                        {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_THIRD_CHEST] =          Location::Chest(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_THIRD_CHEST,          RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 26708,  0x14, "Heavy Block Third Chest",          "Gerudo Training Grounds Heavy Block Third Chest",          RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_THIRD_CHEST,          RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND, true);
-    locationTable[RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FOURTH_CHEST] =         Location::Chest(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FOURTH_CHEST,         RCQUEST_VANILLA, RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 24450,  0x02, "Heavy Block Fourth Chest",         "Gerudo Training Grounds Heavy Block Fourth Chest",         RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FOURTH_CHEST,         RG_ICE_TRAP,                          {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_FREESTANDING_KEY] =                 Location::Collectable(RC_GERUDO_TRAINING_GROUND_FREESTANDING_KEY,           RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                  RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_ITEM00, SCENE_GERUDO_TRAINING_GROUND, 273,    0x01, "Freestanding Key",                 "Gerudo Training Grounds Freestanding Key",                 RHT_GERUDO_TRAINING_GROUND_FREESTANDING_KEY,                 RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND, true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST] =                       Location::Chest(RC_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST,                      RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30573,                                            0x13, "Lobby Left Chest",                            "Gerudo Training Grounds Lobby Left Chest",                 RHT_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST,                     RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST] =                      Location::Chest(RC_GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST,                     RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30393,                                            0x07, "Lobby Right Chest",                           "Gerudo Training Grounds Lobby Right Chest",                RHT_GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST,                    RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_STALFOS_CHEST] =                          Location::Chest(RC_GERUDO_TRAINING_GROUND_STALFOS_CHEST,                         RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30656,                                            0x00, "Stalfos Chest",                               "Gerudo Training Grounds Stalfos Chest",                    RHT_GERUDO_TRAINING_GROUND_STALFOS_CHEST,                        RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_BEAMOS_CHEST] =                           Location::Chest(RC_GERUDO_TRAINING_GROUND_BEAMOS_CHEST,                          RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30655,                                            0x01, "Beamos Chest",                                "Gerudo Training Grounds Beamos Chest",                     RHT_GERUDO_TRAINING_GROUND_BEAMOS_CHEST,                         RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST] =                   Location::Chest(RC_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST,                  RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22603,                                             0x0B, "Hidden Ceiling Chest",                        "Gerudo Training Grounds Hidden Ceiling Chest",             RHT_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST,                 RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST] =                  Location::Chest(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST,                 RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       23206,                                             0x06, "Maze Path First Chest",                       "Gerudo Training Grounds Maze Path First Chest",            RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST,                RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MAZE_PATH_SECOND_CHEST] =                 Location::Chest(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_SECOND_CHEST,                RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22986,                                             0x0A, "Maze Path Second Chest",                      "Gerudo Training Grounds Maze Path Second Chest",           RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_SECOND_CHEST,               RG_RED_RUPEE,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MAZE_PATH_THIRD_CHEST] =                  Location::Chest(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_THIRD_CHEST,                 RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22889,                                             0x09, "Maze Path Third Chest",                       "Gerudo Training Grounds Maze Path Third Chest",            RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_THIRD_CHEST,                RG_ARROWS_30,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FINAL_CHEST] =                  Location::Chest(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FINAL_CHEST,                 RCQUEST_VANILLA, RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       2860,                                              0x0C, "Maze Path Final Chest",                       "Gerudo Training Grounds Maze Path Final Chest",            RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_FINAL_CHEST,                RG_ICE_ARROWS,                        { Category::cSongDungeonReward },                                                                                                                                                     SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_CENTRAL_CHEST] =               Location::Chest(RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_CENTRAL_CHEST,              RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       23877,                                             0x05, "Maze Right Central Chest",                    "Gerudo Training Grounds Maze Right Central Chest",         RHT_GERUDO_TRAINING_GROUND_MAZE_RIGHT_CENTRAL_CHEST,             RG_BOMBCHU_5,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_SIDE_CHEST] =                  Location::Chest(RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_SIDE_CHEST,                 RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22888,                                             0x08, "Maze Right Side Chest",                       "Gerudo Training Grounds Maze Right Side Chest",            RHT_GERUDO_TRAINING_GROUND_MAZE_RIGHT_SIDE_CHEST,                RG_ARROWS_30,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST] =          Location::Chest(RC_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST,         RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30643,                                            0x0D, "Underwater Silver Rupee Chest",               "Gerudo Training Grounds Underwater Silver Rupee Chest",    RHT_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST,        RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST] =                Location::Chest(RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST,               RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       31058,                                             0x12, "Hammer Room Clear Chest",                     "Gerudo Training Grounds Hammer Room Clear Chest",          RHT_GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST,              RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST] =               Location::Chest(RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST,              RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22608,                                             0x10, "Hammer Room Switch Chest",                    "Gerudo Training Grounds Hammer Room Switch Chest",         RHT_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST,             RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_EYE_STATUE_CHEST] =                       Location::Chest(RC_GERUDO_TRAINING_GROUND_EYE_STATUE_CHEST,                      RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30653,                                            0x03, "Eye Statue Chest",                            "Gerudo Training Grounds Eye Statue Chest",                 RHT_GERUDO_TRAINING_GROUND_EYE_STATUE_CHEST,                     RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_NEAR_SCARECROW_CHEST] =                   Location::Chest(RC_GERUDO_TRAINING_GROUND_NEAR_SCARECROW_CHEST,                  RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22596,                                             0x04, "Near Scarecrow Chest",                        "Gerudo Training Grounds Near Scarecrow Chest",             RHT_GERUDO_TRAINING_GROUND_NEAR_SCARECROW_CHEST,                 RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST] =               Location::Chest(RC_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST,              RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       31089,                                             0x11, "Before Heavy Block Chest",                    "Gerudo Training Grounds Before Heavy Block Chest",         RHT_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST,             RG_ARROWS_30,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST] =                Location::Chest(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST,               RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       31439,                                             0x0F, "Heavy Block First Chest",                     "Gerudo Training Grounds Heavy Block First Chest",          RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST,              RG_HUGE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST] =               Location::Chest(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST,              RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       30862,                                             0x0E, "Heavy Block Second Chest",                    "Gerudo Training Grounds Heavy Block Second Chest",         RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST,             RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_THIRD_CHEST] =                Location::Chest(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_THIRD_CHEST,               RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       26708,                                             0x14, "Heavy Block Third Chest",                     "Gerudo Training Grounds Heavy Block Third Chest",          RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_THIRD_CHEST,              RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FOURTH_CHEST] =               Location::Chest(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FOURTH_CHEST,              RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       24450,                                             0x02, "Heavy Block Fourth Chest",                    "Gerudo Training Grounds Heavy Block Fourth Chest",         RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FOURTH_CHEST,             RG_ICE_TRAP,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_FREESTANDING_KEY] =                 Location::Collectable(RC_GERUDO_TRAINING_GROUND_FREESTANDING_KEY,                      RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_ITEM00,      SCENE_GERUDO_TRAINING_GROUND,       273,                                               0x01, "Freestanding Key",                            "Gerudo Training Grounds Freestanding Key",                 RHT_GERUDO_TRAINING_GROUND_FREESTANDING_KEY,                     RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
     // Gerudo Training Grounds Master Quest
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST] =             Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST,             RCQUEST_MQ,      RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 23879,  0x07, "MQ Lobby Right Chest",             "Gerudo Training Grounds MQ Lobby Right Chest",             RHT_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST,             RG_BOMBCHU_5,                         {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST] =              Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST,              RCQUEST_MQ,      RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 22867,  0x13, "MQ Lobby Left Chest",              "Gerudo Training Grounds MQ Lobby Left Chest",              RHT_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST,              RG_ARROWS_10,                         {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST] =      Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST,      RCQUEST_MQ,      RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, -30304, 0x00, "MQ First Iron Knuckle Chest",      "Gerudo Training Grounds MQ First Iron Knuckle Chest",      RHT_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST,      RG_BLUE_RUPEE,                        {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_BEFORE_HEAVY_BLOCK_CHEST] =      Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_BEFORE_HEAVY_BLOCK_CHEST,      RCQUEST_MQ,      RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 31057,  0x11, "MQ Before Heavy Block Chest",      "Gerudo Training Grounds MQ Before Heavy Block Chest",      RHT_GERUDO_TRAINING_GROUND_MQ_BEFORE_HEAVY_BLOCK_CHEST,      RG_ARROWS_10,                         {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_EYE_STATUE_CHEST] =              Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_EYE_STATUE_CHEST,              RCQUEST_MQ,      RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, -32669, 0x03, "MQ Eye Statue Chest",              "Gerudo Training Grounds MQ Eye Statue Chest",              RHT_GERUDO_TRAINING_GROUND_MQ_EYE_STATUE_CHEST,              RG_BOMBCHU_10,                        {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_FLAME_CIRCLE_CHEST] =            Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_FLAME_CIRCLE_CHEST,            RCQUEST_MQ,      RCTYPE_SMALL_KEY,                  RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, -30642, 0x0E, "MQ Flame Circle Chest",            "Gerudo Training Grounds MQ Flame Circle Chest",            RHT_GERUDO_TRAINING_GROUND_MQ_FLAME_CIRCLE_CHEST,            RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND, true);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_SECOND_IRON_KNUCKLE_CHEST] =     Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_SECOND_IRON_KNUCKLE_CHEST,     RCQUEST_MQ,      RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 31058,  0x12, "MQ Second Iron Knuckle Chest",     "Gerudo Training Grounds MQ Second Iron Knuckle Chest",     RHT_GERUDO_TRAINING_GROUND_MQ_SECOND_IRON_KNUCKLE_CHEST,     RG_ARROWS_10,                         {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_DINOLFOS_CHEST] =                Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_DINOLFOS_CHEST,                RCQUEST_MQ,      RCTYPE_SMALL_KEY,                  RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, -30655, 0x01, "MQ Dinolfos Chest",                "Gerudo Training Grounds MQ Dinolfos Chest",                RHT_GERUDO_TRAINING_GROUND_MQ_DINOLFOS_CHEST,                RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND, true);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_ICE_ARROWS_CHEST] =              Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_ICE_ARROWS_CHEST,              RCQUEST_MQ,      RCTYPE_BOSS_HEART_OR_OTHER_REWARD, RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, -17628, 0x04, "MQ Ice Arrows Chest",              "Gerudo Training Grounds MQ Ice Arrows Chest",              RHT_GERUDO_TRAINING_GROUND_MQ_ICE_ARROWS_CHEST,              RG_ICE_ARROWS,                        { Category::cSongDungeonReward }, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND, true);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_CENTRAL_CHEST] =      Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_CENTRAL_CHEST,      RCQUEST_MQ,      RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 22661,  0x05, "MQ Maze Right Central Chest",      "Gerudo Training Grounds MQ Maze Right Central Chest",      RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_CENTRAL_CHEST,      RG_BLUE_RUPEE,                        {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_FIRST_CHEST] =         Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_FIRST_CHEST,         RCQUEST_MQ,      RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 22918,  0x06, "MQ Maze Path First Chest",         "Gerudo Training Grounds MQ Maze Path First Chest",         RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_FIRST_CHEST,         RG_GREEN_RUPEE,                       {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_SIDE_CHEST] =         Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_SIDE_CHEST,         RCQUEST_MQ,      RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 24136,  0x08, "MQ Maze Right Side Chest",         "Gerudo Training Grounds MQ Maze Right Side Chest",         RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_SIDE_CHEST,         RG_TREASURE_GAME_GREEN_RUPEE,         {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_THIRD_CHEST] =         Location::Chest( RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_THIRD_CHEST,        RCQUEST_MQ,      RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 24137,  0x09, "MQ Maze Path Third Chest",         "Gerudo Training Grounds MQ Maze Path Third Chest",         RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_THIRD_CHEST,         RG_TREASURE_GAME_GREEN_RUPEE,         {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_SECOND_CHEST] =        Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_SECOND_CHEST,        RCQUEST_MQ,      RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 22986,  0x0A, "MQ Maze Path Second Chest",        "Gerudo Training Grounds MQ Maze Path Second Chest",        RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_SECOND_CHEST,        RG_RED_RUPEE,                         {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_HIDDEN_CEILING_CHEST] =          Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_HIDDEN_CEILING_CHEST,          RCQUEST_MQ,      RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 23211,  0x0B, "MQ Hidden Ceiling Chest",          "Gerudo Training Grounds MQ Hidden Ceiling Chest",          RHT_GERUDO_TRAINING_GROUND_MQ_HIDDEN_CEILING_CHEST,          RG_PURPLE_RUPEE,                      {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST] = Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST, RCQUEST_MQ,      RCTYPE_SMALL_KEY,                  RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, -30643, 0x0D, "MQ Underwater Silver Rupee Chest", "Gerudo Training Grounds MQ Underwater Silver Rupee Chest", RHT_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST, RG_TREASURE_GAME_GREEN_RUPEE,         { Category::cVanillaSmallKey },   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND, true);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_HEAVY_BLOCK_CHEST] =             Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_HEAVY_BLOCK_CHEST,             RCQUEST_MQ,      RCTYPE_STANDARD,                   RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_BOX,    SCENE_GERUDO_TRAINING_GROUND, 31394,  0x02, "MQ Heavy Block Chest",             "Gerudo Training Grounds MQ Heavy Block Chest",             RHT_GERUDO_TRAINING_GROUND_MQ_HEAVY_BLOCK_CHEST,             RG_PURPLE_RUPEE,                      {},                               SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST] =                   Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST,                  RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       23879,                                             0x07, "MQ Lobby Right Chest",                        "Gerudo Training Grounds MQ Lobby Right Chest",             RHT_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST,                 RG_BOMBCHU_5,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST] =                    Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST,                   RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22867,                                             0x13, "MQ Lobby Left Chest",                         "Gerudo Training Grounds MQ Lobby Left Chest",              RHT_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST,                  RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST] =            Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST,           RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30304,                                            0x00, "MQ First Iron Knuckle Chest",                 "Gerudo Training Grounds MQ First Iron Knuckle Chest",      RHT_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST,          RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_BEFORE_HEAVY_BLOCK_CHEST] =            Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_BEFORE_HEAVY_BLOCK_CHEST,           RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       31057,                                             0x11, "MQ Before Heavy Block Chest",                 "Gerudo Training Grounds MQ Before Heavy Block Chest",      RHT_GERUDO_TRAINING_GROUND_MQ_BEFORE_HEAVY_BLOCK_CHEST,          RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_EYE_STATUE_CHEST] =                    Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_EYE_STATUE_CHEST,                   RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -32669,                                            0x03, "MQ Eye Statue Chest",                         "Gerudo Training Grounds MQ Eye Statue Chest",              RHT_GERUDO_TRAINING_GROUND_MQ_EYE_STATUE_CHEST,                  RG_BOMBCHU_10,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_FLAME_CIRCLE_CHEST] =                  Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_FLAME_CIRCLE_CHEST,                 RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30642,                                            0x0E, "MQ Flame Circle Chest",                       "Gerudo Training Grounds MQ Flame Circle Chest",            RHT_GERUDO_TRAINING_GROUND_MQ_FLAME_CIRCLE_CHEST,                RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_SECOND_IRON_KNUCKLE_CHEST] =           Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_SECOND_IRON_KNUCKLE_CHEST,          RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       31058,                                             0x12, "MQ Second Iron Knuckle Chest",                "Gerudo Training Grounds MQ Second Iron Knuckle Chest",     RHT_GERUDO_TRAINING_GROUND_MQ_SECOND_IRON_KNUCKLE_CHEST,         RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_DINOLFOS_CHEST] =                      Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_DINOLFOS_CHEST,                     RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30655,                                            0x01, "MQ Dinolfos Chest",                           "Gerudo Training Grounds MQ Dinolfos Chest",                RHT_GERUDO_TRAINING_GROUND_MQ_DINOLFOS_CHEST,                    RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_ICE_ARROWS_CHEST] =                    Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_ICE_ARROWS_CHEST,                   RCQUEST_MQ,      RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -17628,                                            0x04, "MQ Ice Arrows Chest",                         "Gerudo Training Grounds MQ Ice Arrows Chest",              RHT_GERUDO_TRAINING_GROUND_MQ_ICE_ARROWS_CHEST,                  RG_ICE_ARROWS,                        { Category::cSongDungeonReward },                                                                                                                                                     SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_CENTRAL_CHEST] =            Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_CENTRAL_CHEST,           RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22661,                                             0x05, "MQ Maze Right Central Chest",                 "Gerudo Training Grounds MQ Maze Right Central Chest",      RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_CENTRAL_CHEST,          RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_FIRST_CHEST] =               Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_FIRST_CHEST,              RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22918,                                             0x06, "MQ Maze Path First Chest",                    "Gerudo Training Grounds MQ Maze Path First Chest",         RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_FIRST_CHEST,             RG_GREEN_RUPEE,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_SIDE_CHEST] =               Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_SIDE_CHEST,              RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       24136,                                             0x08, "MQ Maze Right Side Chest",                    "Gerudo Training Grounds MQ Maze Right Side Chest",         RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_SIDE_CHEST,             RG_TREASURE_GAME_GREEN_RUPEE,         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_THIRD_CHEST] =               Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_THIRD_CHEST,              RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       24137,                                             0x09, "MQ Maze Path Third Chest",                    "Gerudo Training Grounds MQ Maze Path Third Chest",         RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_THIRD_CHEST,             RG_TREASURE_GAME_GREEN_RUPEE,         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_SECOND_CHEST] =              Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_SECOND_CHEST,             RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22986,                                             0x0A, "MQ Maze Path Second Chest",                   "Gerudo Training Grounds MQ Maze Path Second Chest",        RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_SECOND_CHEST,            RG_RED_RUPEE,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_HIDDEN_CEILING_CHEST] =                Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_HIDDEN_CEILING_CHEST,               RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       23211,                                             0x0B, "MQ Hidden Ceiling Chest",                     "Gerudo Training Grounds MQ Hidden Ceiling Chest",          RHT_GERUDO_TRAINING_GROUND_MQ_HIDDEN_CEILING_CHEST,              RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST] =       Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST,      RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30643,                                            0x0D, "MQ Underwater Silver Rupee Chest",            "Gerudo Training Grounds MQ Underwater Silver Rupee Chest", RHT_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST,     RG_TREASURE_GAME_GREEN_RUPEE,         { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_HEAVY_BLOCK_CHEST] =                   Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_HEAVY_BLOCK_CHEST,                  RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       31394,                                             0x02, "MQ Heavy Block Chest",                        "Gerudo Training Grounds MQ Heavy Block Chest",             RHT_GERUDO_TRAINING_GROUND_MQ_HEAVY_BLOCK_CHEST,                 RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
 
-    //            Randomizer Check                                                            Randomizer Check                                          Quest            Type                   Area                  Actor ID         Scene ID                    Params  Flag  Short Name                                 Spoiler Name                                              Hint Text Key                                              Vanilla Item                Categories                     Spoiler Collection Check                    Collection Check Group                                    Vanilla Progression
     // Ganon's Castle Shared
-    locationTable[RC_GANONS_TOWER_BOSS_KEY_CHEST] =                           Location::Chest(RC_GANONS_TOWER_BOSS_KEY_CHEST,                           RCQUEST_BOTH,    RCTYPE_GANON_BOSS_KEY, RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_GANONS_TOWER,         10219,  0x0B, "Boss Key Chest",                          "Ganon's Tower Boss Key Chest",                           RHT_GANONS_TOWER_BOSS_KEY_CHEST,                           RG_GANONS_CASTLE_BOSS_KEY,  {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE, true);
+    locationTable[RC_GANONS_TOWER_BOSS_KEY_CHEST] =                                   Location::Chest(RC_GANONS_TOWER_BOSS_KEY_CHEST,                                  RCQUEST_BOTH,    RCTYPE_GANON_BOSS_KEY,              RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_GANONS_TOWER,                 10219,                                             0x0B, "Boss Key Chest",                              "Ganon's Tower Boss Key Chest",                             RHT_GANONS_TOWER_BOSS_KEY_CHEST,                                 RG_GANONS_CASTLE_BOSS_KEY,            {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE,      true);
     // Ganon's Castle Vanilla
-    locationTable[RC_GANONS_CASTLE_FOREST_TRIAL_CHEST] =                      Location::Chest(RC_GANONS_CASTLE_FOREST_TRIAL_CHEST,                      RCQUEST_VANILLA, RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, 30857,  0x09, "Forest Trial Chest",                      "Ganon's Castle Forest Trial Chest",                      RHT_GANONS_CASTLE_FOREST_TRIAL_CHEST,                      RG_BLUE_RUPEE,              {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST] =                  Location::Chest(RC_GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST,                  RCQUEST_VANILLA, RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, 24455,  0x07, "Water Trial Left Chest",                  "Ganon's Castle Water Trial Left Chest",                  RHT_GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST,                  RG_ICE_TRAP,                {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST] =                 Location::Chest(RC_GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST,                 RCQUEST_VANILLA, RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, 22790,  0x06, "Water Trial Right Chest",                 "Ganon's Castle Water Trial Right Chest",                 RHT_GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST,                 RG_RECOVERY_HEART,          {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST] =                Location::Chest(RC_GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST,                RCQUEST_VANILLA, RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, 22664,  0x08, "Shadow Trial Front Chest",                "Ganon's Castle Shadow Trial Front Chest",                RHT_GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST,                RG_BLUE_RUPEE,              {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST] =     Location::Chest(RC_GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST,     RCQUEST_VANILLA, RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, 14021,  0x05, "Shadow Trial Golden Gauntlets Chest",     "Ganon's Castle Shadow Trial Golden Gauntlets Chest",     RHT_GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST,     RG_PROGRESSIVE_STRENGTH,    {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE, true);
-    locationTable[RC_GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST] =       Location::Chest(RC_GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST,       RCQUEST_VANILLA, RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, -29326, 0x12, "Spirit Trial Crystal Switch Chest",       "Ganon's Castle Spirit Trial Crystal Switch Chest",       RHT_GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST,       RG_BOMBCHU_20,              {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST] =            Location::Chest(RC_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST,            RCQUEST_VANILLA, RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, 26964,  0x14, "Spirit Trial Invisible Chest",            "Ganon's Castle Spirit Trial Invisible Chest",            RHT_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST,            RG_ARROWS_10,               {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST] =            Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST,            RCQUEST_VANILLA, RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, 22668,  0x0C, "Light Trial First Left Chest",            "Ganon's Castle Light Trial First Left Chest",            RHT_GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST,            RG_BLUE_RUPEE,              {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST] =           Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST,           RCQUEST_VANILLA, RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, 24459,  0x0B, "Light Trial Second Left Chest",           "Ganon's Castle Light Trial Second Left Chest",           RHT_GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST,           RG_ICE_TRAP,                {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST] =            Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST,            RCQUEST_VANILLA, RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, 22797,  0x0D, "Light Trial Third Left Chest",            "Ganon's Castle Light Trial Third Left Chest",            RHT_GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST,            RG_RECOVERY_HEART,          {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST] =           Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST,           RCQUEST_VANILLA, RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, 24462,  0x0E, "Light Trial First Right Chest",           "Ganon's Castle Light Trial First Right Chest",           RHT_GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST,           RG_ICE_TRAP,                {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST] =          Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST,          RCQUEST_VANILLA, RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, 22890,  0x0A, "Light Trial Second Right Chest",          "Ganon's Castle Light Trial Second Right Chest",          RHT_GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST,          RG_ARROWS_30,               {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST] =           Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST,           RCQUEST_VANILLA, RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, 24463,  0x0F, "Light Trial Third Right Chest",           "Ganon's Castle Light Trial Third Right Chest",           RHT_GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST,           RG_ICE_TRAP,                {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST] =     Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST,     RCQUEST_VANILLA, RCTYPE_SMALL_KEY,      RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, 30800,  0x10, "Light Trial Invisible Enemies Chest",     "Ganon's Castle Light Trial Invisible Enemies Chest",     RHT_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST,     RG_GANONS_CASTLE_SMALL_KEY, { Category::cVanillaSmallKey },                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE, true);
-    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST] =               Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST,               RCQUEST_VANILLA, RCTYPE_SMALL_KEY,      RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, -30639, 0x11, "Light Trial Lullaby Chest",               "Ganon's Castle Light Trial Lullaby Chest",               RHT_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST,               RG_GANONS_CASTLE_SMALL_KEY, { Category::cVanillaSmallKey },                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE, true);
-    locationTable[RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT] =                  Location::Base(RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,                   RCQUEST_VANILLA, RCTYPE_SCRUB,          RCAREA_GANONS_CASTLE, ACTOR_EN_DNS,    SCENE_INSIDE_GANONS_CASTLE, 0x05,   0x37, "Deku Scrub Center-Left",                  "Ganon's Castle Deku Scrub Center-Left",                  RHT_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,                  RG_BUY_BOMBS_535,           { Category::cDekuScrub },       SpoilerCollectionCheck::Scrub(0x0D, 0x06), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT] =                 Location::Base(RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT,                  RCQUEST_VANILLA, RCTYPE_SCRUB,          RCAREA_GANONS_CASTLE, ACTOR_EN_DNS,    SCENE_INSIDE_GANONS_CASTLE, 0x03,   0x33, "Deku Scrub Center-Right",                 "Ganon's Castle Deku Scrub Center-Right",                 RHT_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT,                 RG_BUY_ARROWS_30,           { Category::cDekuScrub },       SpoilerCollectionCheck::Scrub(0x0D, 0x04), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_DEKU_SCRUB_RIGHT] =                        Location::Base(RC_GANONS_CASTLE_DEKU_SCRUB_RIGHT,                         RCQUEST_VANILLA, RCTYPE_SCRUB,          RCAREA_GANONS_CASTLE, ACTOR_EN_DNS,    SCENE_INSIDE_GANONS_CASTLE, 0x07,   0x39, "Deku Scrub Right",                        "Ganon's Castle Deku Scrub Right",                        RHT_GANONS_CASTLE_DEKU_SCRUB_RIGHT,                        RG_BUY_RED_POTION_30,       { Category::cDekuScrub },       SpoilerCollectionCheck::Scrub(0x0D, 0x08), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_DEKU_SCRUB_LEFT] =                         Location::Base(RC_GANONS_CASTLE_DEKU_SCRUB_LEFT,                          RCQUEST_VANILLA, RCTYPE_SCRUB,          RCAREA_GANONS_CASTLE, ACTOR_EN_DNS,    SCENE_INSIDE_GANONS_CASTLE, 0x08,   0x3A, "Deku Scrub Left",                         "Ganon's Castle Deku Scrub Left",                         RHT_GANONS_CASTLE_DEKU_SCRUB_LEFT,                         RG_BUY_GREEN_POTION,        { Category::cDekuScrub },       SpoilerCollectionCheck::Scrub(0x0D, 0x09), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_FOREST_TRIAL_CHEST] =                              Location::Chest(RC_GANONS_CASTLE_FOREST_TRIAL_CHEST,                             RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         30857,                                             0x09, "Forest Trial Chest",                          "Ganon's Castle Forest Trial Chest",                        RHT_GANONS_CASTLE_FOREST_TRIAL_CHEST,                            RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST] =                          Location::Chest(RC_GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST,                         RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         24455,                                             0x07, "Water Trial Left Chest",                      "Ganon's Castle Water Trial Left Chest",                    RHT_GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST,                        RG_ICE_TRAP,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST] =                         Location::Chest(RC_GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST,                        RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         22790,                                             0x06, "Water Trial Right Chest",                     "Ganon's Castle Water Trial Right Chest",                   RHT_GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST,                       RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST] =                        Location::Chest(RC_GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST,                       RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         22664,                                             0x08, "Shadow Trial Front Chest",                    "Ganon's Castle Shadow Trial Front Chest",                  RHT_GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST,                      RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST] =             Location::Chest(RC_GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST,            RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         14021,                                             0x05, "Shadow Trial Golden Gauntlets Chest",         "Ganon's Castle Shadow Trial Golden Gauntlets Chest",       RHT_GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST,           RG_PROGRESSIVE_STRENGTH,              {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE,      true);
+    locationTable[RC_GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST] =               Location::Chest(RC_GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST,              RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -29326,                                            0x12, "Spirit Trial Crystal Switch Chest",           "Ganon's Castle Spirit Trial Crystal Switch Chest",         RHT_GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST,             RG_BOMBCHU_20,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST] =                    Location::Chest(RC_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST,                   RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         26964,                                             0x14, "Spirit Trial Invisible Chest",                "Ganon's Castle Spirit Trial Invisible Chest",              RHT_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST,                  RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST] =                    Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST,                   RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         22668,                                             0x0C, "Light Trial First Left Chest",                "Ganon's Castle Light Trial First Left Chest",              RHT_GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST,                  RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST] =                   Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST,                  RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         24459,                                             0x0B, "Light Trial Second Left Chest",               "Ganon's Castle Light Trial Second Left Chest",             RHT_GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST,                 RG_ICE_TRAP,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST] =                    Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST,                   RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         22797,                                             0x0D, "Light Trial Third Left Chest",                "Ganon's Castle Light Trial Third Left Chest",              RHT_GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST,                  RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST] =                   Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST,                  RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         24462,                                             0x0E, "Light Trial First Right Chest",               "Ganon's Castle Light Trial First Right Chest",             RHT_GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST,                 RG_ICE_TRAP,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST] =                  Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST,                 RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         22890,                                             0x0A, "Light Trial Second Right Chest",              "Ganon's Castle Light Trial Second Right Chest",            RHT_GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST,                RG_ARROWS_30,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST] =                   Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST,                  RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         24463,                                             0x0F, "Light Trial Third Right Chest",               "Ganon's Castle Light Trial Third Right Chest",             RHT_GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST,                 RG_ICE_TRAP,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST] =             Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST,            RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         30800,                                             0x10, "Light Trial Invisible Enemies Chest",         "Ganon's Castle Light Trial Invisible Enemies Chest",       RHT_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST,           RG_GANONS_CASTLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE,      true);
+    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST] =                       Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST,                      RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -30639,                                            0x11, "Light Trial Lullaby Chest",                   "Ganon's Castle Light Trial Lullaby Chest",                 RHT_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST,                     RG_GANONS_CASTLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE,      true);
+    locationTable[RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT] =                           Location::Base(RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,                         RCQUEST_VANILLA, RCTYPE_SCRUB,                       RCAREA_GANONS_CASTLE,                ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x05,                                              0x37, "Deku Scrub Center-Left",                      "Ganon's Castle Deku Scrub Center-Left",                    RHT_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,                        RG_BUY_BOMBS_535,                     { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT),                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT] =                          Location::Base(RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT,                        RCQUEST_VANILLA, RCTYPE_SCRUB,                       RCAREA_GANONS_CASTLE,                ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x03,                                              0x33, "Deku Scrub Center-Right",                     "Ganon's Castle Deku Scrub Center-Right",                   RHT_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT,                       RG_BUY_ARROWS_30,                     { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT),                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_DEKU_SCRUB_RIGHT] =                                 Location::Base(RC_GANONS_CASTLE_DEKU_SCRUB_RIGHT,                               RCQUEST_VANILLA, RCTYPE_SCRUB,                       RCAREA_GANONS_CASTLE,                ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x07,                                              0x39, "Deku Scrub Right",                            "Ganon's Castle Deku Scrub Right",                          RHT_GANONS_CASTLE_DEKU_SCRUB_RIGHT,                              RG_BUY_RED_POTION_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_RIGHT),                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_DEKU_SCRUB_LEFT] =                                  Location::Base(RC_GANONS_CASTLE_DEKU_SCRUB_LEFT,                                RCQUEST_VANILLA, RCTYPE_SCRUB,                       RCAREA_GANONS_CASTLE,                ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x08,                                              0x3A, "Deku Scrub Left",                             "Ganon's Castle Deku Scrub Left",                           RHT_GANONS_CASTLE_DEKU_SCRUB_LEFT,                               RG_BUY_GREEN_POTION,                  { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_LEFT),                               SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
     // Ganon's Castle MQ
-    locationTable[RC_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST] =                    Location::Chest(RC_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST,                    RCQUEST_MQ,      RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, 22977,  0x01, "MQ Water Trial Chest",                    "Ganon's Castle MQ Water Trial Chest",                    RHT_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST,                    RG_RED_RUPEE,               {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST] =        Location::Chest(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST,        RCQUEST_MQ,      RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, -30398, 0x02, "MQ Forest Trial Eye Switch Chest",        "Ganon's Castle MQ Forest Trial Eye Switch Chest",        RHT_GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST,        RG_ARROWS_10,               {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST] = Location::Chest(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST, RCQUEST_MQ,      RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, -32733, 0x03, "MQ Forest Trial Frozen Eye Switch Chest", "Ganon's Castle MQ Forest Trial Frozen Eye Switch Chest", RHT_GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST, RG_BOMBS_5,                 {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST] =            Location::Chest(RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST,            RCQUEST_MQ,      RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, -30460, 0x04, "MQ Light Trial Lullaby Chest",            "Ganon's Castle MQ Light Trial Lullaby Chest",            RHT_GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST,            RG_RECOVERY_HEART,          {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST] =       Location::Chest(RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST,       RCQUEST_MQ,      RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, -30400, 0x00, "MQ Shadow Trial Bomb Flower Chest",       "Ganon's Castle MQ Shadow Trial Bomb Flower Chest",       RHT_GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST,       RG_ARROWS_10,               {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST] =        Location::Chest(RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST,        RCQUEST_MQ,      RCTYPE_SMALL_KEY,      RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, -30651, 0x05, "MQ Shadow Trial Eye Switch Chest",        "Ganon's Castle MQ Shadow Trial Eye Switch Chest",        RHT_GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST,        RG_GANONS_CASTLE_SMALL_KEY, { Category::cVanillaSmallKey },                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE, true);
-    locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST] =  Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST,  RCQUEST_MQ,      RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, -18746, 0x06, "MQ Spirit Trial Golden Gauntlets Chest",  "Ganon's Castle MQ Spirit Trial Golden Gauntlets Chest",  RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST,  RG_PROGRESSIVE_STRENGTH,    {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE, true);
-    locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST] =    Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST,    RCQUEST_MQ,      RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, -30457, 0x07, "MQ Spirit Trial Sun Back Right Chest",    "Ganon's Castle MQ Spirit Trial Sun Back Right Chest",    RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST,    RG_RECOVERY_HEART,          {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST] =     Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST,     RCQUEST_MQ,      RCTYPE_SMALL_KEY,      RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, -30648, 0x08, "MQ Spirit Trial Sun Back Left Chest",     "Ganon's Castle MQ Spirit Trial Sun Back Left Chest",     RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST,     RG_GANONS_CASTLE_SMALL_KEY, { Category::cVanillaSmallKey },                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST] =    Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST,    RCQUEST_MQ,      RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, -30455, 0x09, "MQ Spirit Trial Sun Front Left Chest",    "Ganon's Castle MQ Spirit Trial Sun Front Left Chest",    RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST,    RG_RECOVERY_HEART,          {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST] =             Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST,             RCQUEST_MQ,      RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, 20586,  0x0A, "MQ Spirit Trial First Chest",             "Ganon's Castle MQ Spirit Trial First Chest",             RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST,             RG_BOMBCHU_10,              {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST] =         Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST,         RCQUEST_MQ,      RCTYPE_STANDARD,       RCAREA_GANONS_CASTLE, ACTOR_EN_BOX,    SCENE_INSIDE_GANONS_CASTLE, 26964,  0x14, "MQ Spirit Trial Invisible Chest",         "Ganon's Castle MQ Spirit Trial Invisible Chest",         RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST,         RG_ARROWS_10,               {},                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY] =        Location::Collectable(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY,  RCQUEST_MQ,      RCTYPE_SMALL_KEY,      RCAREA_GANONS_CASTLE, ACTOR_EN_ITEM00, SCENE_INSIDE_GANONS_CASTLE, 273,    0x01, "MQ Forest Trial Freestanding Key",        "Ganon's Castle MQ Forest Trial Freestanding Key",        RHT_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY,        RG_GANONS_CASTLE_SMALL_KEY, { Category::cVanillaSmallKey },                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE, true);
-    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT] =                     Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,                      RCQUEST_MQ,      RCTYPE_SCRUB,          RCAREA_GANONS_CASTLE, ACTOR_EN_DNS,    SCENE_INSIDE_GANONS_CASTLE, 0x00,   0x30, "MQ Deku Scrub Right",                     "Ganon's Castle MQ Deku Scrub Right",                     RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,                     RG_BUY_DEKU_NUTS_5,         { Category::cDekuScrub },       SpoilerCollectionCheck::Scrub(0x0D, 0x01), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT] =               Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,                RCQUEST_MQ,      RCTYPE_SCRUB,          RCAREA_GANONS_CASTLE, ACTOR_EN_DNS,    SCENE_INSIDE_GANONS_CASTLE, 0x05,   0x37, "MQ Deku Scrub Center-Left",               "Ganon's Castle MQ Deku Scrub Center-Left",               RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,               RG_BUY_BOMBS_535,           { Category::cDekuScrub },       SpoilerCollectionCheck::Scrub(0x0D, 0x06), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER] =                    Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,                     RCQUEST_MQ,      RCTYPE_SCRUB,          RCAREA_GANONS_CASTLE, ACTOR_EN_DNS,    SCENE_INSIDE_GANONS_CASTLE, 0x03,   0x33, "MQ Deku Scrub Center",                    "Ganon's Castle MQ Deku Scrub Center",                    RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,                    RG_BUY_ARROWS_30,           { Category::cDekuScrub },       SpoilerCollectionCheck::Scrub(0x0D, 0x04), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT] =              Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT,               RCQUEST_MQ,      RCTYPE_SCRUB,          RCAREA_GANONS_CASTLE, ACTOR_EN_DNS,    SCENE_INSIDE_GANONS_CASTLE, 0x07,   0x39, "MQ Deku Scrub Center-Right",              "Ganon's Castle MQ Deku Scrub Center-Right",              RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT,              RG_BUY_RED_POTION_30,       { Category::cDekuScrub },       SpoilerCollectionCheck::Scrub(0x0D, 0x08), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT] =                      Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,                       RCQUEST_MQ,      RCTYPE_SCRUB,          RCAREA_GANONS_CASTLE, ACTOR_EN_DNS,    SCENE_INSIDE_GANONS_CASTLE, 0x08,   0x3A, "MQ Deku Scrub Left",                      "Ganon's Castle MQ Deku Scrub Left",                      RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,                      RG_BUY_GREEN_POTION,        { Category::cDekuScrub },       SpoilerCollectionCheck::Scrub(0x0D, 0x09), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST] =                            Location::Chest(RC_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST,                           RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         22977,                                             0x01, "MQ Water Trial Chest",                        "Ganon's Castle MQ Water Trial Chest",                      RHT_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST,                          RG_RED_RUPEE,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST] =                Location::Chest(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST,               RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -30398,                                            0x02, "MQ Forest Trial Eye Switch Chest",            "Ganon's Castle MQ Forest Trial Eye Switch Chest",          RHT_GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST,              RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST] =         Location::Chest(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST,        RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -32733,                                            0x03, "MQ Forest Trial Frozen Eye Switch Chest",     "Ganon's Castle MQ Forest Trial Frozen Eye Switch Chest",   RHT_GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST,       RG_BOMBS_5,                           {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST] =                    Location::Chest(RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST,                   RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -30460,                                            0x04, "MQ Light Trial Lullaby Chest",                "Ganon's Castle MQ Light Trial Lullaby Chest",              RHT_GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST,                  RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST] =               Location::Chest(RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST,              RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -30400,                                            0x00, "MQ Shadow Trial Bomb Flower Chest",           "Ganon's Castle MQ Shadow Trial Bomb Flower Chest",         RHT_GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST,             RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST] =                Location::Chest(RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST,               RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -30651,                                            0x05, "MQ Shadow Trial Eye Switch Chest",            "Ganon's Castle MQ Shadow Trial Eye Switch Chest",          RHT_GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST,              RG_GANONS_CASTLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE,      true);
+    locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST] =          Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST,         RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -18746,                                            0x06, "MQ Spirit Trial Golden Gauntlets Chest",      "Ganon's Castle MQ Spirit Trial Golden Gauntlets Chest",    RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST,        RG_PROGRESSIVE_STRENGTH,              {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE,      true);
+    locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST] =            Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST,           RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -30457,                                            0x07, "MQ Spirit Trial Sun Back Right Chest",        "Ganon's Castle MQ Spirit Trial Sun Back Right Chest",      RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST,          RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST] =             Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST,            RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -30648,                                            0x08, "MQ Spirit Trial Sun Back Left Chest",         "Ganon's Castle MQ Spirit Trial Sun Back Left Chest",       RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST,           RG_GANONS_CASTLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST] =            Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST,           RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -30455,                                            0x09, "MQ Spirit Trial Sun Front Left Chest",        "Ganon's Castle MQ Spirit Trial Sun Front Left Chest",      RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST,          RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST] =                     Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST,                    RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         20586,                                             0x0A, "MQ Spirit Trial First Chest",                 "Ganon's Castle MQ Spirit Trial First Chest",               RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST,                   RG_BOMBCHU_10,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST] =                 Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST,                RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         26964,                                             0x14, "MQ Spirit Trial Invisible Chest",             "Ganon's Castle MQ Spirit Trial Invisible Chest",           RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST,               RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY] =          Location::Collectable(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY,               RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_GANONS_CASTLE,                ACTOR_EN_ITEM00,      SCENE_INSIDE_GANONS_CASTLE,         273,                                               0x01, "MQ Forest Trial Freestanding Key",            "Ganon's Castle MQ Forest Trial Freestanding Key",          RHT_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY,              RG_GANONS_CASTLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE,      true);
+    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT] =                              Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,                            RCQUEST_MQ,      RCTYPE_SCRUB,                       RCAREA_GANONS_CASTLE,                ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x00,                                              0x30, "MQ Deku Scrub Right",                         "Ganon's Castle MQ Deku Scrub Right",                       RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,                           RG_BUY_DEKU_NUTS_5,                   { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT),                           SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT] =                        Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,                      RCQUEST_MQ,      RCTYPE_SCRUB,                       RCAREA_GANONS_CASTLE,                ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x05,                                              0x37, "MQ Deku Scrub Center-Left",                   "Ganon's Castle MQ Deku Scrub Center-Left",                 RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,                     RG_BUY_BOMBS_535,                     { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT),                     SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER] =                             Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,                           RCQUEST_MQ,      RCTYPE_SCRUB,                       RCAREA_GANONS_CASTLE,                ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x03,                                              0x33, "MQ Deku Scrub Center",                        "Ganon's Castle MQ Deku Scrub Center",                      RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,                          RG_BUY_ARROWS_30,                     { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER),                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT] =                       Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT,                     RCQUEST_MQ,      RCTYPE_SCRUB,                       RCAREA_GANONS_CASTLE,                ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x07,                                              0x39, "MQ Deku Scrub Center-Right",                  "Ganon's Castle MQ Deku Scrub Center-Right",                RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT,                    RG_BUY_RED_POTION_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT),                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT] =                               Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,                             RCQUEST_MQ,      RCTYPE_SCRUB,                       RCAREA_GANONS_CASTLE,                ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x08,                                              0x3A, "MQ Deku Scrub Left",                          "Ganon's Castle MQ Deku Scrub Left",                        RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,                            RG_BUY_GREEN_POTION,                  { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT),                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
 
     // Gold Skulltula Tokens
 
     // Dungeons
-    // Deku Tree  RandomizerCheck                                                          RandomizerCheck                                      Quest            Area                          Scene ID                    params  Flag  Short Name                          Spoiler Name                                        Hint Text Key                                         Categories                Collection Check Group
-    locationTable[RC_DEKU_TREE_GS_BASEMENT_BACK_ROOM] =                  Location::GSToken(RC_DEKU_TREE_GS_BASEMENT_BACK_ROOM,                  RCQUEST_VANILLA, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,            8193,   0x01, "GS Basement Back Room",            "Deku Tree GS Basement Back Room",                  RHT_DEKU_TREE_GS_BASEMENT_BACK_ROOM,                  { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[RC_DEKU_TREE_GS_BASEMENT_GATE] =                       Location::GSToken(RC_DEKU_TREE_GS_BASEMENT_GATE,                       RCQUEST_VANILLA, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,            8194,   0x02, "GS Basement Gate",                 "Deku Tree GS Basement Gate",                       RHT_DEKU_TREE_GS_BASEMENT_GATE,                       { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[RC_DEKU_TREE_GS_BASEMENT_VINES] =                      Location::GSToken(RC_DEKU_TREE_GS_BASEMENT_VINES,                      RCQUEST_VANILLA, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,            8196,   0x04, "GS Basement Vines",                "Deku Tree GS Basement Vines",                      RHT_DEKU_TREE_GS_BASEMENT_VINES,                      { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[RC_DEKU_TREE_GS_COMPASS_ROOM] =                        Location::GSToken(RC_DEKU_TREE_GS_COMPASS_ROOM,                        RCQUEST_VANILLA, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,            8200,   0x08, "GS Compass Room",                  "Deku Tree GS Compass Room",                        RHT_DEKU_TREE_GS_COMPASS_ROOM,                        { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[RC_DEKU_TREE_MQ_GS_LOBBY] =                            Location::GSToken(RC_DEKU_TREE_MQ_GS_LOBBY,                            RCQUEST_MQ,      RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,            8194,   0x02, "MQ GS Lobby",                      "Deku Tree MQ GS Lobby",                            RHT_DEKU_TREE_MQ_GS_LOBBY,                            { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[RC_DEKU_TREE_MQ_GS_COMPASS_ROOM] =                     Location::GSToken(RC_DEKU_TREE_MQ_GS_COMPASS_ROOM,                     RCQUEST_MQ,      RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,            8200,   0x08, "MQ GS Compass Room",               "Deku Tree MQ GS Compass Room",                     RHT_DEKU_TREE_MQ_GS_COMPASS_ROOM,                     { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[RC_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM] =             Location::GSToken(RC_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM,             RCQUEST_MQ,      RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,            8196,   0x04, "MQ GS Basement Graves Room",       "Deku Tree MQ GS Basement Graves Room",             RHT_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM,             { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[RC_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM] =               Location::GSToken(RC_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM,               RCQUEST_MQ,      RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,            8193,   0x01, "MQ GS Basement Back Room",         "Deku Tree MQ GS Basement Back Room",               RHT_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM,               { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    // Deku Tree
+    locationTable[RC_DEKU_TREE_GS_BASEMENT_BACK_ROOM] =                             Location::GSToken(RC_DEKU_TREE_GS_BASEMENT_BACK_ROOM,                              RCQUEST_VANILLA,                                     RCAREA_DEKU_TREE,                                          SCENE_DEKU_TREE,                    8193,                                              0x01, "GS Basement Back Room",                       "Deku Tree GS Basement Back Room",                          RHT_DEKU_TREE_GS_BASEMENT_BACK_ROOM,                                                                   { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_GS_BASEMENT_GATE] =                                  Location::GSToken(RC_DEKU_TREE_GS_BASEMENT_GATE,                                   RCQUEST_VANILLA,                                     RCAREA_DEKU_TREE,                                          SCENE_DEKU_TREE,                    8194,                                              0x02, "GS Basement Gate",                            "Deku Tree GS Basement Gate",                               RHT_DEKU_TREE_GS_BASEMENT_GATE,                                                                        { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_GS_BASEMENT_VINES] =                                 Location::GSToken(RC_DEKU_TREE_GS_BASEMENT_VINES,                                  RCQUEST_VANILLA,                                     RCAREA_DEKU_TREE,                                          SCENE_DEKU_TREE,                    8196,                                              0x04, "GS Basement Vines",                           "Deku Tree GS Basement Vines",                              RHT_DEKU_TREE_GS_BASEMENT_VINES,                                                                       { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_GS_COMPASS_ROOM] =                                   Location::GSToken(RC_DEKU_TREE_GS_COMPASS_ROOM,                                    RCQUEST_VANILLA,                                     RCAREA_DEKU_TREE,                                          SCENE_DEKU_TREE,                    8200,                                              0x08, "GS Compass Room",                             "Deku Tree GS Compass Room",                                RHT_DEKU_TREE_GS_COMPASS_ROOM,                                                                         { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_MQ_GS_LOBBY] =                                       Location::GSToken(RC_DEKU_TREE_MQ_GS_LOBBY,                                        RCQUEST_MQ,                                          RCAREA_DEKU_TREE,                                          SCENE_DEKU_TREE,                    8194,                                              0x02, "MQ GS Lobby",                                 "Deku Tree MQ GS Lobby",                                    RHT_DEKU_TREE_MQ_GS_LOBBY,                                                                             { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_MQ_GS_COMPASS_ROOM] =                                Location::GSToken(RC_DEKU_TREE_MQ_GS_COMPASS_ROOM,                                 RCQUEST_MQ,                                          RCAREA_DEKU_TREE,                                          SCENE_DEKU_TREE,                    8200,                                              0x08, "MQ GS Compass Room",                          "Deku Tree MQ GS Compass Room",                             RHT_DEKU_TREE_MQ_GS_COMPASS_ROOM,                                                                      { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM] =                        Location::GSToken(RC_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM,                         RCQUEST_MQ,                                          RCAREA_DEKU_TREE,                                          SCENE_DEKU_TREE,                    8196,                                              0x04, "MQ GS Basement Graves Room",                  "Deku Tree MQ GS Basement Graves Room",                     RHT_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM,                                                              { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM] =                          Location::GSToken(RC_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM,                           RCQUEST_MQ,                                          RCAREA_DEKU_TREE,                                          SCENE_DEKU_TREE,                    8193,                                              0x01, "MQ GS Basement Back Room",                    "Deku Tree MQ GS Basement Back Room",                       RHT_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM,                                                                { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
     // Dodongo's Cavern
-    locationTable[RC_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS] =            Location::GSToken(RC_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS,            RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,       SCENE_DODONGOS_CAVERN,      8449,   0x01, "GS Vines Above Stairs",            "Dodongos Cavern GS Vines Above Stairs",            RHT_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS,            { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_GS_SCARECROW] =                     Location::GSToken(RC_DODONGOS_CAVERN_GS_SCARECROW,                     RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,       SCENE_DODONGOS_CAVERN,      8450,   0x02, "GS Scarecrow",                     "Dodongos Cavern GS Scarecrow",                     RHT_DODONGOS_CAVERN_GS_SCARECROW,                     { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS] =           Location::GSToken(RC_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS,           RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,       SCENE_DODONGOS_CAVERN,      8452,   0x04, "GS Alcove Above Stairs",           "Dodongos Cavern GS Alcove Above Stairs",           RHT_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS,           { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_GS_BACK_ROOM] =                     Location::GSToken(RC_DODONGOS_CAVERN_GS_BACK_ROOM,                     RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,       SCENE_DODONGOS_CAVERN,      8456,   0x08, "GS Back Room",                     "Dodongos Cavern GS Back Room",                     RHT_DODONGOS_CAVERN_GS_BACK_ROOM,                     { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS] = Location::GSToken(RC_DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS, RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,       SCENE_DODONGOS_CAVERN,      8464,   0x10, "GS Side Room Near Lower Lizalfos", "Dodongos Cavern GS Side Room Near Lower Lizalfos", RHT_DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS, { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM] =                 Location::GSToken(RC_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM,                 RCQUEST_MQ,      RCAREA_DODONGOS_CAVERN,       SCENE_DODONGOS_CAVERN,      8450,   0x02, "MQ GS Scrub Room",                 "Dodongos Cavern MQ GS Scrub Room",                 RHT_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM,                 { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM] =    Location::GSToken(RC_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM,    RCQUEST_MQ,      RCAREA_DODONGOS_CAVERN,       SCENE_DODONGOS_CAVERN,      8456,   0x08, "MQ GS Song of Time Block Room",    "Dodongos Cavern MQ GS Song of Time Block Room",    RHT_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM,    { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM] =              Location::GSToken(RC_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM,              RCQUEST_MQ,      RCAREA_DODONGOS_CAVERN,       SCENE_DODONGOS_CAVERN,      8452,   0x04, "MQ GS Lizalfos Room",              "Dodongos Cavern MQ GS Lizalfos Room",              RHT_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM,              { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM] =                Location::GSToken(RC_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM,                RCQUEST_MQ,      RCAREA_DODONGOS_CAVERN,       SCENE_DODONGOS_CAVERN,      8464,   0x10, "MQ GS Larvae Room",                "Dodongos Cavern MQ GS Larvae Room",                RHT_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM,                { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_MQ_GS_BACK_AREA] =                  Location::GSToken(RC_DODONGOS_CAVERN_MQ_GS_BACK_AREA,                  RCQUEST_MQ,      RCAREA_DODONGOS_CAVERN,       SCENE_DODONGOS_CAVERN,      8449,   0x01, "MQ GS Back Room",                  "Dodongos Cavern MQ GS Back Room",                  RHT_DODONGOS_CAVERN_MQ_GS_BACK_AREA,                  { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER] =         Location::GSToken(RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER,         RCQUEST_VANILLA, RCAREA_JABU_JABUS_BELLY,      SCENE_JABU_JABU,            8705,   0x01, "GS Lobby Basement Lower",          "Jabu Jabus Belly GS Lobby Basement Lower",         RHT_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER,         { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER] =         Location::GSToken(RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER,         RCQUEST_VANILLA, RCAREA_JABU_JABUS_BELLY,      SCENE_JABU_JABU,            8706,   0x02, "GS Lobby Basement Upper",          "Jabu Jabus Belly GS Lobby Basement Upper",         RHT_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER,         { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_JABU_JABUS_BELLY_GS_NEAR_BOSS] =                    Location::GSToken(RC_JABU_JABUS_BELLY_GS_NEAR_BOSS,                    RCQUEST_VANILLA, RCAREA_JABU_JABUS_BELLY,      SCENE_JABU_JABU,            8708,   0x04, "GS Near Boss",                     "Jabu Jabus Belly GS Near Boss",                    RHT_JABU_JABUS_BELLY_GS_NEAR_BOSS,                    { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM] =            Location::GSToken(RC_JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM,            RCQUEST_VANILLA, RCAREA_JABU_JABUS_BELLY,      SCENE_JABU_JABU,            8712,   0x08, "GS Water Switch Room",             "Jabu Jabus Belly GS Water Switch Room",            RHT_JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM,            { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM] =          Location::GSToken(RC_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM,          RCQUEST_MQ,      RCAREA_JABU_JABUS_BELLY,      SCENE_JABU_JABU,            8708,   0x04, "MQ GS Tail Parasan Room",          "Jabu Jabus Belly MQ GS Tail Parasan Room",         RHT_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM,          { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM] =    Location::GSToken(RC_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM,    RCQUEST_MQ,      RCAREA_JABU_JABUS_BELLY,      SCENE_JABU_JABU,            8712,   0x08, "MQ GS Invisible Enemies Room",     "Jabu Jabus Belly MQ GS Invisible Enemies Room",    RHT_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM,    { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM] =      Location::GSToken(RC_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM,      RCQUEST_MQ,      RCAREA_JABU_JABUS_BELLY,      SCENE_JABU_JABU,            8705,   0x01, "MQ GS Boomerang Chest Room",       "Jabu Jabus Belly MQ GS Boomerang Chest Room",      RHT_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM,      { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS] =                 Location::GSToken(RC_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS,                 RCQUEST_MQ,      RCAREA_JABU_JABUS_BELLY,      SCENE_JABU_JABU,            8706,   0x02, "MQ GS Near Boss",                  "Jabu Jabus Belly MQ GS Near Boss",                 RHT_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS,                 { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD] =         Location::GSToken(RC_FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD,         RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,         SCENE_FOREST_TEMPLE,        8961,   0x01, "GS Raised Island Courtyard",       "Forest Temple GS Raised Island Courtyard",         RHT_FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD,         { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[RC_FOREST_TEMPLE_GS_FIRST_ROOM] =                      Location::GSToken(RC_FOREST_TEMPLE_GS_FIRST_ROOM,                      RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,         SCENE_FOREST_TEMPLE,        8962,   0x02, "GS First Room",                    "Forest Temple GS First Room",                      RHT_FOREST_TEMPLE_GS_FIRST_ROOM,                      { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[RC_FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD] =          Location::GSToken(RC_FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD,          RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,         SCENE_FOREST_TEMPLE,        8964,   0x04, "GS Level Island Courtyard",        "Forest Temple GS Level Island Courtyard",          RHT_FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD,          { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[RC_FOREST_TEMPLE_GS_LOBBY] =                           Location::GSToken(RC_FOREST_TEMPLE_GS_LOBBY,                           RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,         SCENE_FOREST_TEMPLE,        8968,   0x08, "GS Lobby",                         "Forest Temple GS Lobby",                           RHT_FOREST_TEMPLE_GS_LOBBY,                           { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[RC_FOREST_TEMPLE_GS_BASEMENT] =                        Location::GSToken(RC_FOREST_TEMPLE_GS_BASEMENT,                        RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,         SCENE_FOREST_TEMPLE,        8976,   0x10, "GS Basement",                      "Forest Temple GS Basement",                        RHT_FOREST_TEMPLE_GS_BASEMENT,                        { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[RC_FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY] =                Location::GSToken(RC_FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY,                RCQUEST_MQ,      RCAREA_FOREST_TEMPLE,         SCENE_FOREST_TEMPLE,        8962,   0x02, "MQ GS First Hallway",              "Forest Temple MQ GS First Hallway",                RHT_FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY,                { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[RC_FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM] =              Location::GSToken(RC_FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM,              RCQUEST_MQ,      RCAREA_FOREST_TEMPLE,         SCENE_FOREST_TEMPLE,        8976,   0x10, "MQ GS Block Push Room",            "Forest Temple MQ GS Block Push Room",              RHT_FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM,              { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[RC_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD] =      Location::GSToken(RC_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD,      RCQUEST_MQ,      RCAREA_FOREST_TEMPLE,         SCENE_FOREST_TEMPLE,        8961,   0x01, "MQ GS Raised Island Courtyard",    "Forest Temple MQ GS Raised Island Courtyard",      RHT_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD,      { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[RC_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD] =       Location::GSToken(RC_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD,       RCQUEST_MQ,      RCAREA_FOREST_TEMPLE,         SCENE_FOREST_TEMPLE,        8964,   0x04, "MQ GS Level Island Courtyard",     "Forest Temple MQ GS Level Island Courtyard",       RHT_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD,       { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[RC_FOREST_TEMPLE_MQ_GS_WELL] =                         Location::GSToken(RC_FOREST_TEMPLE_MQ_GS_WELL,                         RCQUEST_MQ,      RCAREA_FOREST_TEMPLE,         SCENE_FOREST_TEMPLE,        8968,   0x08, "MQ GS Well",                       "Forest Temple MQ GS Well",                         RHT_FOREST_TEMPLE_MQ_GS_WELL,                         { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS] =                       Location::GSToken(RC_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS,                        RCQUEST_VANILLA,                                     RCAREA_DODONGOS_CAVERN,                                    SCENE_DODONGOS_CAVERN,              8449,                                              0x01, "GS Vines Above Stairs",                       "Dodongos Cavern GS Vines Above Stairs",                    RHT_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS,                                                             { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_GS_SCARECROW] =                                Location::GSToken(RC_DODONGOS_CAVERN_GS_SCARECROW,                                 RCQUEST_VANILLA,                                     RCAREA_DODONGOS_CAVERN,                                    SCENE_DODONGOS_CAVERN,              8450,                                              0x02, "GS Scarecrow",                                "Dodongos Cavern GS Scarecrow",                             RHT_DODONGOS_CAVERN_GS_SCARECROW,                                                                      { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS] =                      Location::GSToken(RC_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS,                       RCQUEST_VANILLA,                                     RCAREA_DODONGOS_CAVERN,                                    SCENE_DODONGOS_CAVERN,              8452,                                              0x04, "GS Alcove Above Stairs",                      "Dodongos Cavern GS Alcove Above Stairs",                   RHT_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS,                                                            { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_GS_BACK_ROOM] =                                Location::GSToken(RC_DODONGOS_CAVERN_GS_BACK_ROOM,                                 RCQUEST_VANILLA,                                     RCAREA_DODONGOS_CAVERN,                                    SCENE_DODONGOS_CAVERN,              8456,                                              0x08, "GS Back Room",                                "Dodongos Cavern GS Back Room",                             RHT_DODONGOS_CAVERN_GS_BACK_ROOM,                                                                      { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS] =            Location::GSToken(RC_DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS,             RCQUEST_VANILLA,                                     RCAREA_DODONGOS_CAVERN,                                    SCENE_DODONGOS_CAVERN,              8464,                                              0x10, "GS Side Room Near Lower Lizalfos",            "Dodongos Cavern GS Side Room Near Lower Lizalfos",         RHT_DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS,                                                  { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM] =                            Location::GSToken(RC_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM,                             RCQUEST_MQ,                                          RCAREA_DODONGOS_CAVERN,                                    SCENE_DODONGOS_CAVERN,              8450,                                              0x02, "MQ GS Scrub Room",                            "Dodongos Cavern MQ GS Scrub Room",                         RHT_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM,                                                                  { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM] =               Location::GSToken(RC_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM,                RCQUEST_MQ,                                          RCAREA_DODONGOS_CAVERN,                                    SCENE_DODONGOS_CAVERN,              8456,                                              0x08, "MQ GS Song of Time Block Room",               "Dodongos Cavern MQ GS Song of Time Block Room",            RHT_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM,                                                     { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM] =                         Location::GSToken(RC_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM,                          RCQUEST_MQ,                                          RCAREA_DODONGOS_CAVERN,                                    SCENE_DODONGOS_CAVERN,              8452,                                              0x04, "MQ GS Lizalfos Room",                         "Dodongos Cavern MQ GS Lizalfos Room",                      RHT_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM,                                                               { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM] =                           Location::GSToken(RC_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM,                            RCQUEST_MQ,                                          RCAREA_DODONGOS_CAVERN,                                    SCENE_DODONGOS_CAVERN,              8464,                                              0x10, "MQ GS Larvae Room",                           "Dodongos Cavern MQ GS Larvae Room",                        RHT_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM,                                                                 { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_MQ_GS_BACK_AREA] =                             Location::GSToken(RC_DODONGOS_CAVERN_MQ_GS_BACK_AREA,                              RCQUEST_MQ,                                          RCAREA_DODONGOS_CAVERN,                                    SCENE_DODONGOS_CAVERN,              8449,                                              0x01, "MQ GS Back Room",                             "Dodongos Cavern MQ GS Back Room",                          RHT_DODONGOS_CAVERN_MQ_GS_BACK_AREA,                                                                   { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER] =                    Location::GSToken(RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER,                     RCQUEST_VANILLA,                                     RCAREA_JABU_JABUS_BELLY,                                   SCENE_JABU_JABU,                    8705,                                              0x01, "GS Lobby Basement Lower",                     "Jabu Jabus Belly GS Lobby Basement Lower",                 RHT_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER,                                                          { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER] =                    Location::GSToken(RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER,                     RCQUEST_VANILLA,                                     RCAREA_JABU_JABUS_BELLY,                                   SCENE_JABU_JABU,                    8706,                                              0x02, "GS Lobby Basement Upper",                     "Jabu Jabus Belly GS Lobby Basement Upper",                 RHT_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER,                                                          { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_GS_NEAR_BOSS] =                               Location::GSToken(RC_JABU_JABUS_BELLY_GS_NEAR_BOSS,                                RCQUEST_VANILLA,                                     RCAREA_JABU_JABUS_BELLY,                                   SCENE_JABU_JABU,                    8708,                                              0x04, "GS Near Boss",                                "Jabu Jabus Belly GS Near Boss",                            RHT_JABU_JABUS_BELLY_GS_NEAR_BOSS,                                                                     { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM] =                       Location::GSToken(RC_JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM,                        RCQUEST_VANILLA,                                     RCAREA_JABU_JABUS_BELLY,                                   SCENE_JABU_JABU,                    8712,                                              0x08, "GS Water Switch Room",                        "Jabu Jabus Belly GS Water Switch Room",                    RHT_JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM,                                                             { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM] =                     Location::GSToken(RC_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM,                      RCQUEST_MQ,                                          RCAREA_JABU_JABUS_BELLY,                                   SCENE_JABU_JABU,                    8708,                                              0x04, "MQ GS Tail Parasan Room",                     "Jabu Jabus Belly MQ GS Tail Parasan Room",                 RHT_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM,                                                           { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM] =               Location::GSToken(RC_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM,                RCQUEST_MQ,                                          RCAREA_JABU_JABUS_BELLY,                                   SCENE_JABU_JABU,                    8712,                                              0x08, "MQ GS Invisible Enemies Room",                "Jabu Jabus Belly MQ GS Invisible Enemies Room",            RHT_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM,                                                     { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM] =                 Location::GSToken(RC_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM,                  RCQUEST_MQ,                                          RCAREA_JABU_JABUS_BELLY,                                   SCENE_JABU_JABU,                    8705,                                              0x01, "MQ GS Boomerang Chest Room",                  "Jabu Jabus Belly MQ GS Boomerang Chest Room",              RHT_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM,                                                       { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS] =                            Location::GSToken(RC_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS,                             RCQUEST_MQ,                                          RCAREA_JABU_JABUS_BELLY,                                   SCENE_JABU_JABU,                    8706,                                              0x02, "MQ GS Near Boss",                             "Jabu Jabus Belly MQ GS Near Boss",                         RHT_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS,                                                                  { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD] =                    Location::GSToken(RC_FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD,                     RCQUEST_VANILLA,                                     RCAREA_FOREST_TEMPLE,                                      SCENE_FOREST_TEMPLE,                8961,                                              0x01, "GS Raised Island Courtyard",                  "Forest Temple GS Raised Island Courtyard",                 RHT_FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD,                                                          { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_GS_FIRST_ROOM] =                                 Location::GSToken(RC_FOREST_TEMPLE_GS_FIRST_ROOM,                                  RCQUEST_VANILLA,                                     RCAREA_FOREST_TEMPLE,                                      SCENE_FOREST_TEMPLE,                8962,                                              0x02, "GS First Room",                               "Forest Temple GS First Room",                              RHT_FOREST_TEMPLE_GS_FIRST_ROOM,                                                                       { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD] =                     Location::GSToken(RC_FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD,                      RCQUEST_VANILLA,                                     RCAREA_FOREST_TEMPLE,                                      SCENE_FOREST_TEMPLE,                8964,                                              0x04, "GS Level Island Courtyard",                   "Forest Temple GS Level Island Courtyard",                  RHT_FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD,                                                           { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_GS_LOBBY] =                                      Location::GSToken(RC_FOREST_TEMPLE_GS_LOBBY,                                       RCQUEST_VANILLA,                                     RCAREA_FOREST_TEMPLE,                                      SCENE_FOREST_TEMPLE,                8968,                                              0x08, "GS Lobby",                                    "Forest Temple GS Lobby",                                   RHT_FOREST_TEMPLE_GS_LOBBY,                                                                            { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_GS_BASEMENT] =                                   Location::GSToken(RC_FOREST_TEMPLE_GS_BASEMENT,                                    RCQUEST_VANILLA,                                     RCAREA_FOREST_TEMPLE,                                      SCENE_FOREST_TEMPLE,                8976,                                              0x10, "GS Basement",                                 "Forest Temple GS Basement",                                RHT_FOREST_TEMPLE_GS_BASEMENT,                                                                         { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY] =                           Location::GSToken(RC_FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY,                            RCQUEST_MQ,                                          RCAREA_FOREST_TEMPLE,                                      SCENE_FOREST_TEMPLE,                8962,                                              0x02, "MQ GS First Hallway",                         "Forest Temple MQ GS First Hallway",                        RHT_FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY,                                                                 { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM] =                         Location::GSToken(RC_FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM,                          RCQUEST_MQ,                                          RCAREA_FOREST_TEMPLE,                                      SCENE_FOREST_TEMPLE,                8976,                                              0x10, "MQ GS Block Push Room",                       "Forest Temple MQ GS Block Push Room",                      RHT_FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM,                                                               { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD] =                 Location::GSToken(RC_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD,                  RCQUEST_MQ,                                          RCAREA_FOREST_TEMPLE,                                      SCENE_FOREST_TEMPLE,                8961,                                              0x01, "MQ GS Raised Island Courtyard",               "Forest Temple MQ GS Raised Island Courtyard",              RHT_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD,                                                       { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD] =                  Location::GSToken(RC_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD,                   RCQUEST_MQ,                                          RCAREA_FOREST_TEMPLE,                                      SCENE_FOREST_TEMPLE,                8964,                                              0x04, "MQ GS Level Island Courtyard",                "Forest Temple MQ GS Level Island Courtyard",               RHT_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD,                                                        { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_MQ_GS_WELL] =                                    Location::GSToken(RC_FOREST_TEMPLE_MQ_GS_WELL,                                     RCQUEST_MQ,                                          RCAREA_FOREST_TEMPLE,                                      SCENE_FOREST_TEMPLE,                8968,                                              0x08, "MQ GS Well",                                  "Forest Temple MQ GS Well",                                 RHT_FOREST_TEMPLE_MQ_GS_WELL,                                                                          { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
     // Fire Temple
-    locationTable[RC_FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM] =                 Location::GSToken(RC_FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM,                 RCQUEST_VANILLA, RCAREA_FIRE_TEMPLE,           SCENE_FIRE_TEMPLE,          9217,   0x01, "GS Song of Time Room",             "Fire Temple GS Song of Time Room",                 RHT_FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM,                 { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[RC_FIRE_TEMPLE_GS_BOSS_KEY_LOOP] =                     Location::GSToken(RC_FIRE_TEMPLE_GS_BOSS_KEY_LOOP,                     RCQUEST_VANILLA, RCAREA_FIRE_TEMPLE,           SCENE_FIRE_TEMPLE,          9218,   0x02, "GS Boss Key Loop",                 "Fire Temple GS Boss Key Loop",                     RHT_FIRE_TEMPLE_GS_BOSS_KEY_LOOP,                     { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[RC_FIRE_TEMPLE_GS_BOULDER_MAZE] =                      Location::GSToken(RC_FIRE_TEMPLE_GS_BOULDER_MAZE,                      RCQUEST_VANILLA, RCAREA_FIRE_TEMPLE,           SCENE_FIRE_TEMPLE,          9220,   0x04, "GS Boulder Maze",                  "Fire Temple GS Boulder Maze",                      RHT_FIRE_TEMPLE_GS_BOULDER_MAZE,                      { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[RC_FIRE_TEMPLE_GS_SCARECROW_TOP] =                     Location::GSToken(RC_FIRE_TEMPLE_GS_SCARECROW_TOP,                     RCQUEST_VANILLA, RCAREA_FIRE_TEMPLE,           SCENE_FIRE_TEMPLE,          9224,   0x08, "GS Scarecrow Top",                 "Fire Temple GS Scarecrow Top",                     RHT_FIRE_TEMPLE_GS_SCARECROW_TOP,                     { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[RC_FIRE_TEMPLE_GS_SCARECROW_CLIMB] =                   Location::GSToken(RC_FIRE_TEMPLE_GS_SCARECROW_CLIMB,                   RCQUEST_VANILLA, RCAREA_FIRE_TEMPLE,           SCENE_FIRE_TEMPLE,          9232,   0x10, "GS Scarecrow Climb",               "Fire Temple GS Scarecrow Climb",                   RHT_FIRE_TEMPLE_GS_SCARECROW_CLIMB,                   { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[RC_FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE] =           Location::GSToken(RC_FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE,           RCQUEST_MQ,      RCAREA_FIRE_TEMPLE,           SCENE_FIRE_TEMPLE,          9218,   0x02, "MQ GS Above Fire Wall Maze",       "Fire Temple MQ GS Above Fire Wall Maze",           RHT_FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE,           { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER] =          Location::GSToken(RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER,          RCQUEST_MQ,      RCAREA_FIRE_TEMPLE,           SCENE_FIRE_TEMPLE,          9224,   0x08, "MQ GS Fire Wall Maze Center",      "Fire Temple MQ GS Fire Wall Maze Center",          RHT_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER,          { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[RC_FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR] =        Location::GSToken(RC_FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR,        RCQUEST_MQ,      RCAREA_FIRE_TEMPLE,           SCENE_FIRE_TEMPLE,          9217,   0x01, "MQ GS Big Lava Room Open Door",    "Fire Temple MQ GS Big Lava Room Open Door",        RHT_FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR,        { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM] =       Location::GSToken(RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM,       RCQUEST_MQ,      RCAREA_FIRE_TEMPLE,           SCENE_FIRE_TEMPLE,          9232,   0x10, "MQ GS Fire Wall Maze Side Room",   "Fire Temple MQ GS Fire Wall Maze Side Room",       RHT_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM,       { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[RC_FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE] =                  Location::GSToken(RC_FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE,                  RCQUEST_MQ,      RCAREA_FIRE_TEMPLE,           SCENE_FIRE_TEMPLE,          9220,   0x04, "MQ GS Skull on Fire",              "Fire Temple MQ GS Skull on Fire",                  RHT_FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE,                  { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    locationTable[RC_FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM] =                            Location::GSToken(RC_FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM,                             RCQUEST_VANILLA,                                     RCAREA_FIRE_TEMPLE,                                        SCENE_FIRE_TEMPLE,                  9217,                                              0x01, "GS Song of Time Room",                        "Fire Temple GS Song of Time Room",                         RHT_FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM,                                                                  { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    locationTable[RC_FIRE_TEMPLE_GS_BOSS_KEY_LOOP] =                                Location::GSToken(RC_FIRE_TEMPLE_GS_BOSS_KEY_LOOP,                                 RCQUEST_VANILLA,                                     RCAREA_FIRE_TEMPLE,                                        SCENE_FIRE_TEMPLE,                  9218,                                              0x02, "GS Boss Key Loop",                            "Fire Temple GS Boss Key Loop",                             RHT_FIRE_TEMPLE_GS_BOSS_KEY_LOOP,                                                                      { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    locationTable[RC_FIRE_TEMPLE_GS_BOULDER_MAZE] =                                 Location::GSToken(RC_FIRE_TEMPLE_GS_BOULDER_MAZE,                                  RCQUEST_VANILLA,                                     RCAREA_FIRE_TEMPLE,                                        SCENE_FIRE_TEMPLE,                  9220,                                              0x04, "GS Boulder Maze",                             "Fire Temple GS Boulder Maze",                              RHT_FIRE_TEMPLE_GS_BOULDER_MAZE,                                                                       { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    locationTable[RC_FIRE_TEMPLE_GS_SCARECROW_TOP] =                                Location::GSToken(RC_FIRE_TEMPLE_GS_SCARECROW_TOP,                                 RCQUEST_VANILLA,                                     RCAREA_FIRE_TEMPLE,                                        SCENE_FIRE_TEMPLE,                  9224,                                              0x08, "GS Scarecrow Top",                            "Fire Temple GS Scarecrow Top",                             RHT_FIRE_TEMPLE_GS_SCARECROW_TOP,                                                                      { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    locationTable[RC_FIRE_TEMPLE_GS_SCARECROW_CLIMB] =                              Location::GSToken(RC_FIRE_TEMPLE_GS_SCARECROW_CLIMB,                               RCQUEST_VANILLA,                                     RCAREA_FIRE_TEMPLE,                                        SCENE_FIRE_TEMPLE,                  9232,                                              0x10, "GS Scarecrow Climb",                          "Fire Temple GS Scarecrow Climb",                           RHT_FIRE_TEMPLE_GS_SCARECROW_CLIMB,                                                                    { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    locationTable[RC_FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE] =                      Location::GSToken(RC_FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE,                       RCQUEST_MQ,                                          RCAREA_FIRE_TEMPLE,                                        SCENE_FIRE_TEMPLE,                  9218,                                              0x02, "MQ GS Above Fire Wall Maze",                  "Fire Temple MQ GS Above Fire Wall Maze",                   RHT_FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE,                                                            { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    locationTable[RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER] =                     Location::GSToken(RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER,                      RCQUEST_MQ,                                          RCAREA_FIRE_TEMPLE,                                        SCENE_FIRE_TEMPLE,                  9224,                                              0x08, "MQ GS Fire Wall Maze Center",                 "Fire Temple MQ GS Fire Wall Maze Center",                  RHT_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER,                                                           { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    locationTable[RC_FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR] =                   Location::GSToken(RC_FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR,                    RCQUEST_MQ,                                          RCAREA_FIRE_TEMPLE,                                        SCENE_FIRE_TEMPLE,                  9217,                                              0x01, "MQ GS Big Lava Room Open Door",               "Fire Temple MQ GS Big Lava Room Open Door",                RHT_FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR,                                                         { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    locationTable[RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM] =                  Location::GSToken(RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM,                   RCQUEST_MQ,                                          RCAREA_FIRE_TEMPLE,                                        SCENE_FIRE_TEMPLE,                  9232,                                              0x10, "MQ GS Fire Wall Maze Side Room",              "Fire Temple MQ GS Fire Wall Maze Side Room",               RHT_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM,                                                        { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    locationTable[RC_FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE] =                             Location::GSToken(RC_FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE,                              RCQUEST_MQ,                                          RCAREA_FIRE_TEMPLE,                                        SCENE_FIRE_TEMPLE,                  9220,                                              0x04, "MQ GS Skull on Fire",                         "Fire Temple MQ GS Skull on Fire",                          RHT_FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE,                                                                   { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
     // Water Temple
-    locationTable[RC_WATER_TEMPLE_GS_BEHIND_GATE] =                      Location::GSToken(RC_WATER_TEMPLE_GS_BEHIND_GATE,                      RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,          SCENE_WATER_TEMPLE,         9473,   0x01, "GS Behind Gate",                   "Water Temple GS Behind Gate",                      RHT_WATER_TEMPLE_GS_BEHIND_GATE,                      { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[RC_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM] =            Location::GSToken(RC_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM,            RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,          SCENE_WATER_TEMPLE,         9474,   0x02, "GS Falling Platform Room",         "Water Temple GS Falling Platform Room",            RHT_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM,            { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[RC_WATER_TEMPLE_GS_CENTRAL_PILLAR] =                   Location::GSToken(RC_WATER_TEMPLE_GS_CENTRAL_PILLAR,                   RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,          SCENE_WATER_TEMPLE,         9476,   0x04, "GS Central Pillar",                "Water Temple GS Central Pillar",                   RHT_WATER_TEMPLE_GS_CENTRAL_PILLAR,                   { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[RC_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST] =              Location::GSToken(RC_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST,              RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,          SCENE_WATER_TEMPLE,         9480,   0x08, "GS Near Boss Key Chest",           "Water Temple GS Near Boss Key Chest",              RHT_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST,              { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[RC_WATER_TEMPLE_GS_RIVER] =                            Location::GSToken(RC_WATER_TEMPLE_GS_RIVER,                            RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,          SCENE_WATER_TEMPLE,         9488,   0x10, "GS River",                         "Water Temple GS River",                            RHT_WATER_TEMPLE_GS_RIVER,                            { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[RC_WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH] =     Location::GSToken(RC_WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH,     RCQUEST_MQ,      RCAREA_WATER_TEMPLE,          SCENE_WATER_TEMPLE,         9476,   0x04, "MQ GS Before Upper Water Switch",  "Water Temple MQ GS Before Upper Water Switch",     RHT_WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH,     { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[RC_WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA] =         Location::GSToken(RC_WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA,         RCQUEST_MQ,      RCAREA_WATER_TEMPLE,          SCENE_WATER_TEMPLE,         9480,   0x08, "MQ GS Freestanding Key Area",      "Water Temple MQ GS Freestanding Key Area",         RHT_WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA,         { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[RC_WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY] =              Location::GSToken(RC_WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY,              RCQUEST_MQ,      RCAREA_WATER_TEMPLE,          SCENE_WATER_TEMPLE,         9473,   0x01, "MQ GS Lizalfos Hallway",           "Water Temple MQ GS Lizalfos Hallway",              RHT_WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY,              { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[RC_WATER_TEMPLE_MQ_GS_RIVER] =                         Location::GSToken(RC_WATER_TEMPLE_MQ_GS_RIVER,                         RCQUEST_MQ,      RCAREA_WATER_TEMPLE,          SCENE_WATER_TEMPLE,         9474,   0x02, "MQ GS River",                      "Water Temple MQ GS River",                         RHT_WATER_TEMPLE_MQ_GS_RIVER,                         { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[RC_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH] =             Location::GSToken(RC_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH,             RCQUEST_MQ,      RCAREA_WATER_TEMPLE,          SCENE_WATER_TEMPLE,         9488,   0x10, "MQ GS Triple Wall Torch",          "Water Temple MQ GS Triple Wall Torch",             RHT_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH,             { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
+    locationTable[RC_WATER_TEMPLE_GS_BEHIND_GATE] =                                 Location::GSToken(RC_WATER_TEMPLE_GS_BEHIND_GATE,                                  RCQUEST_VANILLA,                                     RCAREA_WATER_TEMPLE,                                       SCENE_WATER_TEMPLE,                 9473,                                              0x01, "GS Behind Gate",                              "Water Temple GS Behind Gate",                              RHT_WATER_TEMPLE_GS_BEHIND_GATE,                                                                       { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
+    locationTable[RC_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM] =                       Location::GSToken(RC_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM,                        RCQUEST_VANILLA,                                     RCAREA_WATER_TEMPLE,                                       SCENE_WATER_TEMPLE,                 9474,                                              0x02, "GS Falling Platform Room",                    "Water Temple GS Falling Platform Room",                    RHT_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM,                                                             { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
+    locationTable[RC_WATER_TEMPLE_GS_CENTRAL_PILLAR] =                              Location::GSToken(RC_WATER_TEMPLE_GS_CENTRAL_PILLAR,                               RCQUEST_VANILLA,                                     RCAREA_WATER_TEMPLE,                                       SCENE_WATER_TEMPLE,                 9476,                                              0x04, "GS Central Pillar",                           "Water Temple GS Central Pillar",                           RHT_WATER_TEMPLE_GS_CENTRAL_PILLAR,                                                                    { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
+    locationTable[RC_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST] =                         Location::GSToken(RC_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST,                          RCQUEST_VANILLA,                                     RCAREA_WATER_TEMPLE,                                       SCENE_WATER_TEMPLE,                 9480,                                              0x08, "GS Near Boss Key Chest",                      "Water Temple GS Near Boss Key Chest",                      RHT_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST,                                                               { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
+    locationTable[RC_WATER_TEMPLE_GS_RIVER] =                                       Location::GSToken(RC_WATER_TEMPLE_GS_RIVER,                                        RCQUEST_VANILLA,                                     RCAREA_WATER_TEMPLE,                                       SCENE_WATER_TEMPLE,                 9488,                                              0x10, "GS River",                                    "Water Temple GS River",                                    RHT_WATER_TEMPLE_GS_RIVER,                                                                             { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
+    locationTable[RC_WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH] =                Location::GSToken(RC_WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH,                 RCQUEST_MQ,                                          RCAREA_WATER_TEMPLE,                                       SCENE_WATER_TEMPLE,                 9476,                                              0x04, "MQ GS Before Upper Water Switch",             "Water Temple MQ GS Before Upper Water Switch",             RHT_WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH,                                                      { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
+    locationTable[RC_WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA] =                    Location::GSToken(RC_WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA,                     RCQUEST_MQ,                                          RCAREA_WATER_TEMPLE,                                       SCENE_WATER_TEMPLE,                 9480,                                              0x08, "MQ GS Freestanding Key Area",                 "Water Temple MQ GS Freestanding Key Area",                 RHT_WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA,                                                          { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
+    locationTable[RC_WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY] =                         Location::GSToken(RC_WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY,                          RCQUEST_MQ,                                          RCAREA_WATER_TEMPLE,                                       SCENE_WATER_TEMPLE,                 9473,                                              0x01, "MQ GS Lizalfos Hallway",                      "Water Temple MQ GS Lizalfos Hallway",                      RHT_WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY,                                                               { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
+    locationTable[RC_WATER_TEMPLE_MQ_GS_RIVER] =                                    Location::GSToken(RC_WATER_TEMPLE_MQ_GS_RIVER,                                     RCQUEST_MQ,                                          RCAREA_WATER_TEMPLE,                                       SCENE_WATER_TEMPLE,                 9474,                                              0x02, "MQ GS River",                                 "Water Temple MQ GS River",                                 RHT_WATER_TEMPLE_MQ_GS_RIVER,                                                                          { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
+    locationTable[RC_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH] =                        Location::GSToken(RC_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH,                         RCQUEST_MQ,                                          RCAREA_WATER_TEMPLE,                                       SCENE_WATER_TEMPLE,                 9488,                                              0x10, "MQ GS Triple Wall Torch",                     "Water Temple MQ GS Triple Wall Torch",                     RHT_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH,                                                              { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
     // Spirit Temple
-    locationTable[RC_SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM] =       Location::GSToken(RC_SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM,       RCQUEST_VANILLA, RCAREA_SPIRIT_TEMPLE,         SCENE_SPIRIT_TEMPLE,        9729,   0x01, "GS Hall After Sun Block Room",     "Spirit Temple GS Hall After Sun Block Room",       RHT_SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM,       { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_GS_BOULDER_ROOM] =                    Location::GSToken(RC_SPIRIT_TEMPLE_GS_BOULDER_ROOM,                    RCQUEST_VANILLA, RCAREA_SPIRIT_TEMPLE,         SCENE_SPIRIT_TEMPLE,        9730,   0x02, "GS Boulder Room",                  "Spirit Temple GS Boulder Room",                    RHT_SPIRIT_TEMPLE_GS_BOULDER_ROOM,                    { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_GS_LOBBY] =                           Location::GSToken(RC_SPIRIT_TEMPLE_GS_LOBBY,                           RCQUEST_VANILLA, RCAREA_SPIRIT_TEMPLE,         SCENE_SPIRIT_TEMPLE,        9732,   0x04, "GS Lobby",                         "Spirit Temple GS Lobby",                           RHT_SPIRIT_TEMPLE_GS_LOBBY,                           { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM] =               Location::GSToken(RC_SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM,               RCQUEST_VANILLA, RCAREA_SPIRIT_TEMPLE,         SCENE_SPIRIT_TEMPLE,        9736,   0x08, "GS Sun on Floor Room",             "Spirit Temple GS Sun on Floor Room",               RHT_SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM,               { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_GS_METAL_FENCE] =                     Location::GSToken(RC_SPIRIT_TEMPLE_GS_METAL_FENCE,                     RCQUEST_VANILLA, RCAREA_SPIRIT_TEMPLE,         SCENE_SPIRIT_TEMPLE,        9744,   0x10, "GS Metal Fence",                   "Spirit Temple GS Metal Fence",                     RHT_SPIRIT_TEMPLE_GS_METAL_FENCE,                     { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM] =                Location::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM,                RCQUEST_MQ,      RCAREA_SPIRIT_TEMPLE,         SCENE_SPIRIT_TEMPLE,        9736,   0x08, "MQ GS Symphony Room",              "Spirit Temple MQ GS Symphony Room",                RHT_SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM,                { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM] =                  Location::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM,                  RCQUEST_MQ,      RCAREA_SPIRIT_TEMPLE,         SCENE_SPIRIT_TEMPLE,        9730,   0x02, "MQ GS Leever Room",                "Spirit Temple MQ GS Leever Room",                  RHT_SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM,                  { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST] =       Location::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST,       RCQUEST_MQ,      RCAREA_SPIRIT_TEMPLE,         SCENE_SPIRIT_TEMPLE,        9732,   0x04, "MQ GS Nine Thrones Room West",     "Spirit Temple MQ GS Nine Thrones Room West",       RHT_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST,       { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH] =      Location::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH,      RCQUEST_MQ,      RCAREA_SPIRIT_TEMPLE,         SCENE_SPIRIT_TEMPLE,        9744,   0x10, "MQ GS Nine Thrones Room North",    "Spirit Temple MQ GS Nine Thrones Room North",      RHT_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH,      { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM] =               Location::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM,               RCQUEST_MQ,      RCAREA_SPIRIT_TEMPLE,         SCENE_SPIRIT_TEMPLE,        9729,   0x01, "MQ GS Sun Block Room",             "Spirit Temple MQ GS Sun Block Room",               RHT_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM,               { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM] =                  Location::GSToken(RC_SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM,                   RCQUEST_VANILLA,                                     RCAREA_SPIRIT_TEMPLE,                                      SCENE_SPIRIT_TEMPLE,                9729,                                              0x01, "GS Hall After Sun Block Room",                "Spirit Temple GS Hall After Sun Block Room",               RHT_SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM,                                                        { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_GS_BOULDER_ROOM] =                               Location::GSToken(RC_SPIRIT_TEMPLE_GS_BOULDER_ROOM,                                RCQUEST_VANILLA,                                     RCAREA_SPIRIT_TEMPLE,                                      SCENE_SPIRIT_TEMPLE,                9730,                                              0x02, "GS Boulder Room",                             "Spirit Temple GS Boulder Room",                            RHT_SPIRIT_TEMPLE_GS_BOULDER_ROOM,                                                                     { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_GS_LOBBY] =                                      Location::GSToken(RC_SPIRIT_TEMPLE_GS_LOBBY,                                       RCQUEST_VANILLA,                                     RCAREA_SPIRIT_TEMPLE,                                      SCENE_SPIRIT_TEMPLE,                9732,                                              0x04, "GS Lobby",                                    "Spirit Temple GS Lobby",                                   RHT_SPIRIT_TEMPLE_GS_LOBBY,                                                                            { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM] =                          Location::GSToken(RC_SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM,                           RCQUEST_VANILLA,                                     RCAREA_SPIRIT_TEMPLE,                                      SCENE_SPIRIT_TEMPLE,                9736,                                              0x08, "GS Sun on Floor Room",                        "Spirit Temple GS Sun on Floor Room",                       RHT_SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM,                                                                { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_GS_METAL_FENCE] =                                Location::GSToken(RC_SPIRIT_TEMPLE_GS_METAL_FENCE,                                 RCQUEST_VANILLA,                                     RCAREA_SPIRIT_TEMPLE,                                      SCENE_SPIRIT_TEMPLE,                9744,                                              0x10, "GS Metal Fence",                              "Spirit Temple GS Metal Fence",                             RHT_SPIRIT_TEMPLE_GS_METAL_FENCE,                                                                      { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM] =                           Location::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM,                            RCQUEST_MQ,                                          RCAREA_SPIRIT_TEMPLE,                                      SCENE_SPIRIT_TEMPLE,                9736,                                              0x08, "MQ GS Symphony Room",                         "Spirit Temple MQ GS Symphony Room",                        RHT_SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM,                                                                 { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM] =                             Location::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM,                              RCQUEST_MQ,                                          RCAREA_SPIRIT_TEMPLE,                                      SCENE_SPIRIT_TEMPLE,                9730,                                              0x02, "MQ GS Leever Room",                           "Spirit Temple MQ GS Leever Room",                          RHT_SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM,                                                                   { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST] =                  Location::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST,                   RCQUEST_MQ,                                          RCAREA_SPIRIT_TEMPLE,                                      SCENE_SPIRIT_TEMPLE,                9732,                                              0x04, "MQ GS Nine Thrones Room West",                "Spirit Temple MQ GS Nine Thrones Room West",               RHT_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST,                                                        { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH] =                 Location::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH,                  RCQUEST_MQ,                                          RCAREA_SPIRIT_TEMPLE,                                      SCENE_SPIRIT_TEMPLE,                9744,                                              0x10, "MQ GS Nine Thrones Room North",               "Spirit Temple MQ GS Nine Thrones Room North",              RHT_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH,                                                       { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM] =                          Location::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM,                           RCQUEST_MQ,                                          RCAREA_SPIRIT_TEMPLE,                                      SCENE_SPIRIT_TEMPLE,                9729,                                              0x01, "MQ GS Sun Block Room",                        "Spirit Temple MQ GS Sun Block Room",                       RHT_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM,                                                                { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
     // Shadow Temple
-    locationTable[RC_SHADOW_TEMPLE_GS_SINGLE_GIANT_POT] =                Location::GSToken(RC_SHADOW_TEMPLE_GS_SINGLE_GIANT_POT,                RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,         SCENE_SHADOW_TEMPLE,        9985,   0x01, "GS Single Giant Pot",              "Shadow Temple GS Single Giant Pot",                RHT_SHADOW_TEMPLE_GS_SINGLE_GIANT_POT,                { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM] =             Location::GSToken(RC_SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM,             RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,         SCENE_SHADOW_TEMPLE,        9986,   0x02, "GS Falling Spikes Room",           "Shadow Temple GS Falling Spikes Room",             RHT_SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM,             { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT] =                Location::GSToken(RC_SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT,                RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,         SCENE_SHADOW_TEMPLE,        9988,   0x04, "GS Triple Giant Pot",              "Shadow Temple GS Triple Giant Pot",                RHT_SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT,                { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM] =                  Location::GSToken(RC_SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM,                  RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,         SCENE_SHADOW_TEMPLE,        9992,   0x08, "GS Like Like Room",                "Shadow Temple GS Like Like Room",                  RHT_SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM,                  { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_GS_NEAR_SHIP] =                       Location::GSToken(RC_SHADOW_TEMPLE_GS_NEAR_SHIP,                       RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,         SCENE_SHADOW_TEMPLE,        10000,  0x10, "GS Near Ship",                     "Shadow Temple GS Near Ship",                       RHT_SHADOW_TEMPLE_GS_NEAR_SHIP,                       { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM] =          Location::GSToken(RC_SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM,          RCQUEST_MQ,      RCAREA_SHADOW_TEMPLE,         SCENE_SHADOW_TEMPLE,        9986,   0x02, "MQ GS Falling Spikes Room",        "Shadow Temple MQ GS Falling Spikes Room",          RHT_SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM,          { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM] =               Location::GSToken(RC_SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM,               RCQUEST_MQ,      RCAREA_SHADOW_TEMPLE,         SCENE_SHADOW_TEMPLE,        9985,   0x01, "MQ GS Wind Hint Room",             "Shadow Temple MQ GS Wind Hint Room",               RHT_SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM,               { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_MQ_GS_AFTER_WIND] =                   Location::GSToken(RC_SHADOW_TEMPLE_MQ_GS_AFTER_WIND,                   RCQUEST_MQ,      RCAREA_SHADOW_TEMPLE,         SCENE_SHADOW_TEMPLE,        9992,   0x08, "MQ GS After Wind",                 "Shadow Temple MQ GS After Wind",                   RHT_SHADOW_TEMPLE_MQ_GS_AFTER_WIND,                   { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_MQ_GS_AFTER_SHIP] =                   Location::GSToken(RC_SHADOW_TEMPLE_MQ_GS_AFTER_SHIP,                   RCQUEST_MQ,      RCAREA_SHADOW_TEMPLE,         SCENE_SHADOW_TEMPLE,        10000,  0x10, "MQ GS After Ship",                 "Shadow Temple MQ GS After Ship",                   RHT_SHADOW_TEMPLE_MQ_GS_AFTER_SHIP,                   { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS] =                    Location::GSToken(RC_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS,                    RCQUEST_MQ,      RCAREA_SHADOW_TEMPLE,         SCENE_SHADOW_TEMPLE,        9988,   0x04, "MQ GS Near Boss",                  "Shadow Temple MQ GS Near Boss",                    RHT_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS,                    { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_GS_SINGLE_GIANT_POT] =                           Location::GSToken(RC_SHADOW_TEMPLE_GS_SINGLE_GIANT_POT,                            RCQUEST_VANILLA,                                     RCAREA_SHADOW_TEMPLE,                                      SCENE_SHADOW_TEMPLE,                9985,                                              0x01, "GS Single Giant Pot",                         "Shadow Temple GS Single Giant Pot",                        RHT_SHADOW_TEMPLE_GS_SINGLE_GIANT_POT,                                                                 { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM] =                        Location::GSToken(RC_SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM,                         RCQUEST_VANILLA,                                     RCAREA_SHADOW_TEMPLE,                                      SCENE_SHADOW_TEMPLE,                9986,                                              0x02, "GS Falling Spikes Room",                      "Shadow Temple GS Falling Spikes Room",                     RHT_SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM,                                                              { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT] =                           Location::GSToken(RC_SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT,                            RCQUEST_VANILLA,                                     RCAREA_SHADOW_TEMPLE,                                      SCENE_SHADOW_TEMPLE,                9988,                                              0x04, "GS Triple Giant Pot",                         "Shadow Temple GS Triple Giant Pot",                        RHT_SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT,                                                                 { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM] =                             Location::GSToken(RC_SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM,                              RCQUEST_VANILLA,                                     RCAREA_SHADOW_TEMPLE,                                      SCENE_SHADOW_TEMPLE,                9992,                                              0x08, "GS Like Like Room",                           "Shadow Temple GS Like Like Room",                          RHT_SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM,                                                                   { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_GS_NEAR_SHIP] =                                  Location::GSToken(RC_SHADOW_TEMPLE_GS_NEAR_SHIP,                                   RCQUEST_VANILLA,                                     RCAREA_SHADOW_TEMPLE,                                      SCENE_SHADOW_TEMPLE,                10000,                                             0x10, "GS Near Ship",                                "Shadow Temple GS Near Ship",                               RHT_SHADOW_TEMPLE_GS_NEAR_SHIP,                                                                        { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM] =                     Location::GSToken(RC_SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM,                      RCQUEST_MQ,                                          RCAREA_SHADOW_TEMPLE,                                      SCENE_SHADOW_TEMPLE,                9986,                                              0x02, "MQ GS Falling Spikes Room",                   "Shadow Temple MQ GS Falling Spikes Room",                  RHT_SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM,                                                           { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM] =                          Location::GSToken(RC_SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM,                           RCQUEST_MQ,                                          RCAREA_SHADOW_TEMPLE,                                      SCENE_SHADOW_TEMPLE,                9985,                                              0x01, "MQ GS Wind Hint Room",                        "Shadow Temple MQ GS Wind Hint Room",                       RHT_SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM,                                                                { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_GS_AFTER_WIND] =                              Location::GSToken(RC_SHADOW_TEMPLE_MQ_GS_AFTER_WIND,                               RCQUEST_MQ,                                          RCAREA_SHADOW_TEMPLE,                                      SCENE_SHADOW_TEMPLE,                9992,                                              0x08, "MQ GS After Wind",                            "Shadow Temple MQ GS After Wind",                           RHT_SHADOW_TEMPLE_MQ_GS_AFTER_WIND,                                                                    { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_GS_AFTER_SHIP] =                              Location::GSToken(RC_SHADOW_TEMPLE_MQ_GS_AFTER_SHIP,                               RCQUEST_MQ,                                          RCAREA_SHADOW_TEMPLE,                                      SCENE_SHADOW_TEMPLE,                10000,                                             0x10, "MQ GS After Ship",                            "Shadow Temple MQ GS After Ship",                           RHT_SHADOW_TEMPLE_MQ_GS_AFTER_SHIP,                                                                    { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS] =                               Location::GSToken(RC_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS,                                RCQUEST_MQ,                                          RCAREA_SHADOW_TEMPLE,                                      SCENE_SHADOW_TEMPLE,                9988,                                              0x04, "MQ GS Near Boss",                             "Shadow Temple MQ GS Near Boss",                            RHT_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS,                                                                     { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
     // Bottom of the Well
-    locationTable[RC_BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE] =             Location::GSToken(RC_BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE,             RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL,    SCENE_BOTTOM_OF_THE_WELL,   10241,  0x01, "GS Like Like Cage",                "Bottom of the Well GS Like Like Cage",             RHT_BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE,             { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[RC_BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM] =            Location::GSToken(RC_BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM,            RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL,    SCENE_BOTTOM_OF_THE_WELL,   10242,  0x02, "GS East Inner Room",               "Bottom of the Well GS East Inner Room",            RHT_BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM,            { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[RC_BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM] =            Location::GSToken(RC_BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM,            RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL,    SCENE_BOTTOM_OF_THE_WELL,   10244,  0x04, "GS West Inner Room",               "Bottom of the Well GS West Inner Room",            RHT_BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM,            { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT] =                Location::GSToken(RC_BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT,                RCQUEST_MQ,      RCAREA_BOTTOM_OF_THE_WELL,    SCENE_BOTTOM_OF_THE_WELL,   10241,  0x01, "MQ GS Basement",                   "Bottom of the Well MQ GS Basement",                RHT_BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT,                { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM] =             Location::GSToken(RC_BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM,             RCQUEST_MQ,      RCAREA_BOTTOM_OF_THE_WELL,    SCENE_BOTTOM_OF_THE_WELL,   10244,  0x04, "MQ GS Coffin Room",                "Bottom of the Well MQ GS Coffin Room",             RHT_BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM,             { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM] =         Location::GSToken(RC_BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM,         RCQUEST_MQ,      RCAREA_BOTTOM_OF_THE_WELL,    SCENE_BOTTOM_OF_THE_WELL,   10242,  0x02, "MQ GS West Inner Room",            "Bottom of the Well MQ GS West Inner Room",         RHT_BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM,         { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
+    locationTable[RC_BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE] =                        Location::GSToken(RC_BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE,                         RCQUEST_VANILLA,                                     RCAREA_BOTTOM_OF_THE_WELL,                                 SCENE_BOTTOM_OF_THE_WELL,           10241,                                             0x01, "GS Like Like Cage",                           "Bottom of the Well GS Like Like Cage",                     RHT_BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE,                                                              { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
+    locationTable[RC_BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM] =                       Location::GSToken(RC_BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM,                        RCQUEST_VANILLA,                                     RCAREA_BOTTOM_OF_THE_WELL,                                 SCENE_BOTTOM_OF_THE_WELL,           10242,                                             0x02, "GS East Inner Room",                          "Bottom of the Well GS East Inner Room",                    RHT_BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM,                                                             { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
+    locationTable[RC_BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM] =                       Location::GSToken(RC_BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM,                        RCQUEST_VANILLA,                                     RCAREA_BOTTOM_OF_THE_WELL,                                 SCENE_BOTTOM_OF_THE_WELL,           10244,                                             0x04, "GS West Inner Room",                          "Bottom of the Well GS West Inner Room",                    RHT_BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM,                                                             { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
+    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT] =                           Location::GSToken(RC_BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT,                            RCQUEST_MQ,                                          RCAREA_BOTTOM_OF_THE_WELL,                                 SCENE_BOTTOM_OF_THE_WELL,           10241,                                             0x01, "MQ GS Basement",                              "Bottom of the Well MQ GS Basement",                        RHT_BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT,                                                                 { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
+    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM] =                        Location::GSToken(RC_BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM,                         RCQUEST_MQ,                                          RCAREA_BOTTOM_OF_THE_WELL,                                 SCENE_BOTTOM_OF_THE_WELL,           10244,                                             0x04, "MQ GS Coffin Room",                           "Bottom of the Well MQ GS Coffin Room",                     RHT_BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM,                                                              { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
+    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM] =                    Location::GSToken(RC_BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM,                     RCQUEST_MQ,                                          RCAREA_BOTTOM_OF_THE_WELL,                                 SCENE_BOTTOM_OF_THE_WELL,           10242,                                             0x02, "MQ GS West Inner Room",                       "Bottom of the Well MQ GS West Inner Room",                 RHT_BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM,                                                          { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
     // Ice Cavern
-    locationTable[RC_ICE_CAVERN_GS_PUSH_BLOCK_ROOM] =                    Location::GSToken(RC_ICE_CAVERN_GS_PUSH_BLOCK_ROOM,                    RCQUEST_VANILLA, RCAREA_ICE_CAVERN,            SCENE_ICE_CAVERN,           10497,  0x01, "GS Push Block Room",               "Ice Cavern GS Push Block Room",                    RHT_ICE_CAVERN_GS_PUSH_BLOCK_ROOM,                    { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
-    locationTable[RC_ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM] =               Location::GSToken(RC_ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM,               RCQUEST_VANILLA, RCAREA_ICE_CAVERN,            SCENE_ICE_CAVERN,           10498,  0x02, "GS Spinning Scythe Room",          "Ice Cavern GS Spinning Scythe Room",               RHT_ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM,               { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
-    locationTable[RC_ICE_CAVERN_GS_HEART_PIECE_ROOM] =                   Location::GSToken(RC_ICE_CAVERN_GS_HEART_PIECE_ROOM,                   RCQUEST_VANILLA, RCAREA_ICE_CAVERN,            SCENE_ICE_CAVERN,           10500,  0x04, "GS Heart Piece Room",              "Ice Cavern GS Heart Piece Room",                   RHT_ICE_CAVERN_GS_HEART_PIECE_ROOM,                   { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
-    locationTable[RC_ICE_CAVERN_MQ_GS_SCARECROW] =                       Location::GSToken(RC_ICE_CAVERN_MQ_GS_SCARECROW,                       RCQUEST_MQ,      RCAREA_ICE_CAVERN,            SCENE_ICE_CAVERN,           10497,  0x01, "MQ GS Scarecrow",                  "Ice Cavern MQ GS Scarecrow",                       RHT_ICE_CAVERN_MQ_GS_SCARECROW,                       { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
-    locationTable[RC_ICE_CAVERN_MQ_GS_ICE_BLOCK] =                       Location::GSToken(RC_ICE_CAVERN_MQ_GS_ICE_BLOCK,                       RCQUEST_MQ,      RCAREA_ICE_CAVERN,            SCENE_ICE_CAVERN,           10500,  0x04, "MQ GS Ice Block",                  "Ice Cavern MQ GS Ice Block",                       RHT_ICE_CAVERN_MQ_GS_ICE_BLOCK,                       { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
-    locationTable[RC_ICE_CAVERN_MQ_GS_RED_ICE] =                         Location::GSToken(RC_ICE_CAVERN_MQ_GS_RED_ICE,                         RCQUEST_MQ,      RCAREA_ICE_CAVERN,            SCENE_ICE_CAVERN,           10498,  0x02, "MQ GS Red Ice",                    "Ice Cavern MQ GS Red Ice",                         RHT_ICE_CAVERN_MQ_GS_RED_ICE,                         { Category::cSkulltula }, SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
+    locationTable[RC_ICE_CAVERN_GS_PUSH_BLOCK_ROOM] =                               Location::GSToken(RC_ICE_CAVERN_GS_PUSH_BLOCK_ROOM,                                RCQUEST_VANILLA,                                     RCAREA_ICE_CAVERN,                                         SCENE_ICE_CAVERN,                   10497,                                             0x01, "GS Push Block Room",                          "Ice Cavern GS Push Block Room",                            RHT_ICE_CAVERN_GS_PUSH_BLOCK_ROOM,                                                                     { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
+    locationTable[RC_ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM] =                          Location::GSToken(RC_ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM,                           RCQUEST_VANILLA,                                     RCAREA_ICE_CAVERN,                                         SCENE_ICE_CAVERN,                   10498,                                             0x02, "GS Spinning Scythe Room",                     "Ice Cavern GS Spinning Scythe Room",                       RHT_ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM,                                                                { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
+    locationTable[RC_ICE_CAVERN_GS_HEART_PIECE_ROOM] =                              Location::GSToken(RC_ICE_CAVERN_GS_HEART_PIECE_ROOM,                               RCQUEST_VANILLA,                                     RCAREA_ICE_CAVERN,                                         SCENE_ICE_CAVERN,                   10500,                                             0x04, "GS Heart Piece Room",                         "Ice Cavern GS Heart Piece Room",                           RHT_ICE_CAVERN_GS_HEART_PIECE_ROOM,                                                                    { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
+    locationTable[RC_ICE_CAVERN_MQ_GS_SCARECROW] =                                  Location::GSToken(RC_ICE_CAVERN_MQ_GS_SCARECROW,                                   RCQUEST_MQ,                                          RCAREA_ICE_CAVERN,                                         SCENE_ICE_CAVERN,                   10497,                                             0x01, "MQ GS Scarecrow",                             "Ice Cavern MQ GS Scarecrow",                               RHT_ICE_CAVERN_MQ_GS_SCARECROW,                                                                        { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
+    locationTable[RC_ICE_CAVERN_MQ_GS_ICE_BLOCK] =                                  Location::GSToken(RC_ICE_CAVERN_MQ_GS_ICE_BLOCK,                                   RCQUEST_MQ,                                          RCAREA_ICE_CAVERN,                                         SCENE_ICE_CAVERN,                   10500,                                             0x04, "MQ GS Ice Block",                             "Ice Cavern MQ GS Ice Block",                               RHT_ICE_CAVERN_MQ_GS_ICE_BLOCK,                                                                        { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
+    locationTable[RC_ICE_CAVERN_MQ_GS_RED_ICE] =                                    Location::GSToken(RC_ICE_CAVERN_MQ_GS_RED_ICE,                                     RCQUEST_MQ,                                          RCAREA_ICE_CAVERN,                                         SCENE_ICE_CAVERN,                   10498,                                             0x02, "MQ GS Red Ice",                               "Ice Cavern MQ GS Red Ice",                                 RHT_ICE_CAVERN_MQ_GS_RED_ICE,                                                                          { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
     // Overworld
-    // Kokiri Forest RandomizerCheck                                                       RandomizerCheck                                      Quest            Area                          Scene ID                    params  Flag  Short Name                          Spoiler Name                                        Hint Text Key                                         Categories                Map Index Collection Check Group
-    locationTable[RC_KF_GS_BEAN_PATCH] =                                 Location::GSToken(RC_KF_GS_BEAN_PATCH,                                 RCQUEST_BOTH,    RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,        27649,  0x01, "GS Bean Patch",                    "KF GS Bean Patch",                                 RHT_KF_GS_BEAN_PATCH,                                 { Category::cSkulltula }, 0x0C, SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_GS_KNOW_IT_ALL_HOUSE] =                          Location::GSToken(RC_KF_GS_KNOW_IT_ALL_HOUSE,                          RCQUEST_BOTH,    RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,        19458,  0x02, "GS Know It All House",             "KF GS Know It All House",                          RHT_KF_GS_KNOW_IT_ALL_HOUSE,                          { Category::cSkulltula }, 0x0C, SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_GS_HOUSE_OF_TWINS] =                             Location::GSToken(RC_KF_GS_HOUSE_OF_TWINS,                             RCQUEST_BOTH,    RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,        19460,  0x04, "GS House of Twins",                "KF GS House of Twins",                             RHT_KF_GS_HOUSE_OF_TWINS,                             { Category::cSkulltula }, 0x0C, SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    // Kokiri Forest
+    locationTable[RC_KF_GS_BEAN_PATCH] =                                            Location::GSToken(RC_KF_GS_BEAN_PATCH,                                             RCQUEST_BOTH,                                        RCAREA_KOKIRI_FOREST,                                      SCENE_KOKIRI_FOREST,                27649,                                             0x01, "GS Bean Patch",                               "KF GS Bean Patch",                                         RHT_KF_GS_BEAN_PATCH,                                                                                  { Category::cSkulltula }, 0x0C,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_GS_KNOW_IT_ALL_HOUSE] =                                     Location::GSToken(RC_KF_GS_KNOW_IT_ALL_HOUSE,                                      RCQUEST_BOTH,                                        RCAREA_KOKIRI_FOREST,                                      SCENE_KOKIRI_FOREST,                19458,                                             0x02, "GS Know It All House",                        "KF GS Know It All House",                                  RHT_KF_GS_KNOW_IT_ALL_HOUSE,                                                                           { Category::cSkulltula }, 0x0C,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_GS_HOUSE_OF_TWINS] =                                        Location::GSToken(RC_KF_GS_HOUSE_OF_TWINS,                                         RCQUEST_BOTH,                                        RCAREA_KOKIRI_FOREST,                                      SCENE_KOKIRI_FOREST,                19460,                                             0x04, "GS House of Twins",                           "KF GS House of Twins",                                     RHT_KF_GS_HOUSE_OF_TWINS,                                                                              { Category::cSkulltula }, 0x0C,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
     // Lost Woods
-    locationTable[RC_LW_GS_BEAN_PATCH_NEAR_BRIDGE] =                     Location::GSToken(RC_LW_GS_BEAN_PATCH_NEAR_BRIDGE,                     RCQUEST_BOTH,    RCAREA_LOST_WOODS,            SCENE_LOST_WOODS,           27905,  0x01, "GS Bean Patch Near Bridge",        "LW GS Bean Patch Near Bridge",                     RHT_LW_GS_BEAN_PATCH_NEAR_BRIDGE,                     { Category::cSkulltula }, 0x0D, SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[RC_LW_GS_BEAN_PATCH_NEAR_THEATER] =                    Location::GSToken(RC_LW_GS_BEAN_PATCH_NEAR_THEATER,                    RCQUEST_BOTH,    RCAREA_LOST_WOODS,            SCENE_LOST_WOODS,           27906,  0x02, "GS Bean Patch Near Theater",       "LW GS Bean Patch Near Theater",                    RHT_LW_GS_BEAN_PATCH_NEAR_THEATER,                    { Category::cSkulltula }, 0x0D, SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[RC_LW_GS_ABOVE_THEATER] =                              Location::GSToken(RC_LW_GS_ABOVE_THEATER,                              RCQUEST_BOTH,    RCAREA_LOST_WOODS,            SCENE_LOST_WOODS,           19716,  0x04, "GS Above Theater",                 "LW GS Above Theater",                              RHT_LW_GS_ABOVE_THEATER,                              { Category::cSkulltula }, 0x0D, SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[RC_SFM_GS] =                                           Location::GSToken(RC_SFM_GS,                                           RCQUEST_BOTH,    RCAREA_SACRED_FOREST_MEADOW,  SCENE_SACRED_FOREST_MEADOW, 19720,  0x08, "GS",                               "SFM GS",                                           RHT_SFM_GS,                                           { Category::cSkulltula }, 0x0D, SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_LW_GS_BEAN_PATCH_NEAR_BRIDGE] =                                Location::GSToken(RC_LW_GS_BEAN_PATCH_NEAR_BRIDGE,                                 RCQUEST_BOTH,                                        RCAREA_LOST_WOODS,                                         SCENE_LOST_WOODS,                   27905,                                             0x01, "GS Bean Patch Near Bridge",                   "LW GS Bean Patch Near Bridge",                             RHT_LW_GS_BEAN_PATCH_NEAR_BRIDGE,                                                                      { Category::cSkulltula }, 0x0D,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_LW_GS_BEAN_PATCH_NEAR_THEATER] =                               Location::GSToken(RC_LW_GS_BEAN_PATCH_NEAR_THEATER,                                RCQUEST_BOTH,                                        RCAREA_LOST_WOODS,                                         SCENE_LOST_WOODS,                   27906,                                             0x02, "GS Bean Patch Near Theater",                  "LW GS Bean Patch Near Theater",                            RHT_LW_GS_BEAN_PATCH_NEAR_THEATER,                                                                     { Category::cSkulltula }, 0x0D,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_LW_GS_ABOVE_THEATER] =                                         Location::GSToken(RC_LW_GS_ABOVE_THEATER,                                          RCQUEST_BOTH,                                        RCAREA_LOST_WOODS,                                         SCENE_LOST_WOODS,                   19716,                                             0x04, "GS Above Theater",                            "LW GS Above Theater",                                      RHT_LW_GS_ABOVE_THEATER,                                                                               { Category::cSkulltula }, 0x0D,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_SFM_GS] =                                                      Location::GSToken(RC_SFM_GS,                                                       RCQUEST_BOTH,                                        RCAREA_SACRED_FOREST_MEADOW,                               SCENE_SACRED_FOREST_MEADOW,         19720,                                             0x08, "GS",                                          "SFM GS",                                                   RHT_SFM_GS,                                                                                            { Category::cSkulltula }, 0x0D,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
     // Hyrule Field
-    locationTable[RC_HF_GS_COW_GROTTO] =                                 Location::GSToken(RC_HF_GS_COW_GROTTO,                                 RCQUEST_BOTH,    RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,              10753,  0x01, "GS Cow Grotto",                    "HF GS Cow Grotto",                                 RHT_HF_GS_COW_GROTTO,                                 { Category::cSkulltula }, 0x0A, SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[RC_HF_GS_NEAR_KAK_GROTTO] =                            Location::GSToken(RC_HF_GS_NEAR_KAK_GROTTO,                            RCQUEST_BOTH,    RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,              10754,  0x02, "GS Near Kak Grotto",               "HF GS Near Kak Grotto",                            RHT_HF_GS_NEAR_KAK_GROTTO,                            { Category::cSkulltula }, 0x0A, SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_HF_GS_COW_GROTTO] =                                            Location::GSToken(RC_HF_GS_COW_GROTTO,                                             RCQUEST_BOTH,                                        RCAREA_HYRULE_FIELD,                                       SCENE_GROTTOS,                      10753,                                             0x01, "GS Cow Grotto",                               "HF GS Cow Grotto",                                         RHT_HF_GS_COW_GROTTO,                                                                                  { Category::cSkulltula }, 0x0A,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_HF_GS_NEAR_KAK_GROTTO] =                                       Location::GSToken(RC_HF_GS_NEAR_KAK_GROTTO,                                        RCQUEST_BOTH,                                        RCAREA_HYRULE_FIELD,                                       SCENE_GROTTOS,                      10754,                                             0x02, "GS Near Kak Grotto",                          "HF GS Near Kak Grotto",                                    RHT_HF_GS_NEAR_KAK_GROTTO,                                                                             { Category::cSkulltula }, 0x0A,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
     // Lake Hylia
-    locationTable[RC_LH_GS_BEAN_PATCH] =                                 Location::GSToken(RC_LH_GS_BEAN_PATCH,                                 RCQUEST_BOTH,    RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,           29185,  0x01, "GS Bean Patch",                    "LH GS Bean Patch",                                 RHT_LH_GS_BEAN_PATCH,                                 { Category::cSkulltula }, 0x12, SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_GS_SMALL_ISLAND] =                               Location::GSToken(RC_LH_GS_SMALL_ISLAND,                               RCQUEST_BOTH,    RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,           20994,  0x02, "GS Small Island",                  "LH GS Small Island",                               RHT_LH_GS_SMALL_ISLAND,                               { Category::cSkulltula }, 0x12, SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_GS_LAB_WALL] =                                   Location::GSToken(RC_LH_GS_LAB_WALL,                                   RCQUEST_BOTH,    RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,           20996,  0x04, "GS Lab Wall",                      "LH GS Lab Wall",                                   RHT_LH_GS_LAB_WALL,                                   { Category::cSkulltula }, 0x12, SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_GS_LAB_CRATE] =                                  Location::GSToken(RC_LH_GS_LAB_CRATE,                                  RCQUEST_BOTH,    RCAREA_LAKE_HYLIA,            SCENE_LAKESIDE_LABORATORY,  -28152, 0x08, "GS Lab Crate",                     "LH GS Lab Crate",                                  RHT_LH_GS_LAB_CRATE,                                  { Category::cSkulltula }, 0x12, SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_GS_TREE] =                                       Location::GSToken(RC_LH_GS_TREE,                                       RCQUEST_BOTH,    RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,           21008,  0x10, "GS Tree",                          "LH GS Tree",                                       RHT_LH_GS_TREE,                                       { Category::cSkulltula }, 0x12, SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_GS_BEAN_PATCH] =                                            Location::GSToken(RC_LH_GS_BEAN_PATCH,                                             RCQUEST_BOTH,                                        RCAREA_LAKE_HYLIA,                                         SCENE_LAKE_HYLIA,                   29185,                                             0x01, "GS Bean Patch",                               "LH GS Bean Patch",                                         RHT_LH_GS_BEAN_PATCH,                                                                                  { Category::cSkulltula }, 0x12,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_GS_SMALL_ISLAND] =                                          Location::GSToken(RC_LH_GS_SMALL_ISLAND,                                           RCQUEST_BOTH,                                        RCAREA_LAKE_HYLIA,                                         SCENE_LAKE_HYLIA,                   20994,                                             0x02, "GS Small Island",                             "LH GS Small Island",                                       RHT_LH_GS_SMALL_ISLAND,                                                                                { Category::cSkulltula }, 0x12,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_GS_LAB_WALL] =                                              Location::GSToken(RC_LH_GS_LAB_WALL,                                               RCQUEST_BOTH,                                        RCAREA_LAKE_HYLIA,                                         SCENE_LAKE_HYLIA,                   20996,                                             0x04, "GS Lab Wall",                                 "LH GS Lab Wall",                                           RHT_LH_GS_LAB_WALL,                                                                                    { Category::cSkulltula }, 0x12,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_GS_LAB_CRATE] =                                             Location::GSToken(RC_LH_GS_LAB_CRATE,                                              RCQUEST_BOTH,                                        RCAREA_LAKE_HYLIA,                                         SCENE_LAKESIDE_LABORATORY,          -28152,                                            0x08, "GS Lab Crate",                                "LH GS Lab Crate",                                          RHT_LH_GS_LAB_CRATE,                                                                                   { Category::cSkulltula }, 0x12,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_GS_TREE] =                                                  Location::GSToken(RC_LH_GS_TREE,                                                   RCQUEST_BOTH,                                        RCAREA_LAKE_HYLIA,                                         SCENE_LAKE_HYLIA,                   21008,                                             0x10, "GS Tree",                                     "LH GS Tree",                                               RHT_LH_GS_TREE,                                                                                        { Category::cSkulltula }, 0x12,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
     // Gerudo Valley
-    locationTable[RC_GV_GS_BEAN_PATCH] =                                 Location::GSToken(RC_GV_GS_BEAN_PATCH,                                 RCQUEST_BOTH,    RCAREA_GERUDO_VALLEY,         SCENE_GERUDO_VALLEY,        29441,  0x01, "GS Bean Patch",                    "GV GS Bean Patch",                                 RHT_GV_GS_BEAN_PATCH,                                 { Category::cSkulltula }, 0x13, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[RC_GV_GS_SMALL_BRIDGE] =                               Location::GSToken(RC_GV_GS_SMALL_BRIDGE,                               RCQUEST_BOTH,    RCAREA_GERUDO_VALLEY,         SCENE_GERUDO_VALLEY,        21250,  0x02, "GS Small Bridge",                  "GV GS Small Bridge",                               RHT_GV_GS_SMALL_BRIDGE,                               { Category::cSkulltula }, 0x13, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[RC_GV_GS_PILLAR] =                                     Location::GSToken(RC_GV_GS_PILLAR,                                     RCQUEST_BOTH,    RCAREA_GERUDO_VALLEY,         SCENE_GERUDO_VALLEY,        21252,  0x04, "GS Pillar",                        "GV GS Pillar",                                     RHT_GV_GS_PILLAR,                                     { Category::cSkulltula }, 0x13, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[RC_GV_GS_BEHIND_TENT] =                                Location::GSToken(RC_GV_GS_BEHIND_TENT,                                RCQUEST_BOTH,    RCAREA_GERUDO_VALLEY,         SCENE_GERUDO_VALLEY,        21256,  0x08, "GS Behind Tent",                   "GV GS Behind Tent",                                RHT_GV_GS_BEHIND_TENT,                                { Category::cSkulltula }, 0x13, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_GV_GS_BEAN_PATCH] =                                            Location::GSToken(RC_GV_GS_BEAN_PATCH,                                             RCQUEST_BOTH,                                        RCAREA_GERUDO_VALLEY,                                      SCENE_GERUDO_VALLEY,                29441,                                             0x01, "GS Bean Patch",                               "GV GS Bean Patch",                                         RHT_GV_GS_BEAN_PATCH,                                                                                  { Category::cSkulltula }, 0x13,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_GV_GS_SMALL_BRIDGE] =                                          Location::GSToken(RC_GV_GS_SMALL_BRIDGE,                                           RCQUEST_BOTH,                                        RCAREA_GERUDO_VALLEY,                                      SCENE_GERUDO_VALLEY,                21250,                                             0x02, "GS Small Bridge",                             "GV GS Small Bridge",                                       RHT_GV_GS_SMALL_BRIDGE,                                                                                { Category::cSkulltula }, 0x13,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_GV_GS_PILLAR] =                                                Location::GSToken(RC_GV_GS_PILLAR,                                                 RCQUEST_BOTH,                                        RCAREA_GERUDO_VALLEY,                                      SCENE_GERUDO_VALLEY,                21252,                                             0x04, "GS Pillar",                                   "GV GS Pillar",                                             RHT_GV_GS_PILLAR,                                                                                      { Category::cSkulltula }, 0x13,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_GV_GS_BEHIND_TENT] =                                           Location::GSToken(RC_GV_GS_BEHIND_TENT,                                            RCQUEST_BOTH,                                        RCAREA_GERUDO_VALLEY,                                      SCENE_GERUDO_VALLEY,                21256,                                             0x08, "GS Behind Tent",                              "GV GS Behind Tent",                                        RHT_GV_GS_BEHIND_TENT,                                                                                 { Category::cSkulltula }, 0x13,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
     // Gerudo Fortress
-    locationTable[RC_GF_GS_ARCHERY_RANGE] =                              Location::GSToken(RC_GF_GS_ARCHERY_RANGE,                              RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,       SCENE_GERUDOS_FORTRESS,     21505,  0x01, "GS Archery Range",                 "GF GS Archery Range",                              RHT_GF_GS_ARCHERY_RANGE,                              { Category::cSkulltula }, 0x14, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[RC_GF_GS_TOP_FLOOR] =                                  Location::GSToken(RC_GF_GS_TOP_FLOOR,                                  RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,       SCENE_GERUDOS_FORTRESS,     21506,  0x02, "GS Top Floor",                     "GF GS Top Floor",                                  RHT_GF_GS_TOP_FLOOR,                                  { Category::cSkulltula }, 0x14, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_GF_GS_ARCHERY_RANGE] =                                         Location::GSToken(RC_GF_GS_ARCHERY_RANGE,                                          RCQUEST_BOTH,                                        RCAREA_GERUDO_FORTRESS,                                    SCENE_GERUDOS_FORTRESS,             21505,                                             0x01, "GS Archery Range",                            "GF GS Archery Range",                                      RHT_GF_GS_ARCHERY_RANGE,                                                                               { Category::cSkulltula }, 0x14,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_GF_GS_TOP_FLOOR] =                                             Location::GSToken(RC_GF_GS_TOP_FLOOR,                                              RCQUEST_BOTH,                                        RCAREA_GERUDO_FORTRESS,                                    SCENE_GERUDOS_FORTRESS,             21506,                                             0x02, "GS Top Floor",                                "GF GS Top Floor",                                          RHT_GF_GS_TOP_FLOOR,                                                                                   { Category::cSkulltula }, 0x14,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
     // Wasteland & Desert Colossus
-    locationTable[RC_WASTELAND_GS] =                                     Location::GSToken(RC_WASTELAND_GS,                                     RCQUEST_BOTH,    RCAREA_WASTELAND,             SCENE_HAUNTED_WASTELAND,    13570,  0x02, "GS",                               "Wasteland GS",                                     RHT_WASTELAND_GS,                                     { Category::cSkulltula }, 0x15, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[RC_COLOSSUS_GS_BEAN_PATCH] =                           Location::GSToken(RC_COLOSSUS_GS_BEAN_PATCH,                           RCQUEST_BOTH,    RCAREA_DESERT_COLOSSUS,       SCENE_DESERT_COLOSSUS,      29953,  0x01, "GS Bean Patch",                    "Colossus GS Bean Patch",                           RHT_COLOSSUS_GS_BEAN_PATCH,                           { Category::cSkulltula }, 0x15, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[RC_COLOSSUS_GS_HILL] =                                 Location::GSToken(RC_COLOSSUS_GS_HILL,                                 RCQUEST_BOTH,    RCAREA_DESERT_COLOSSUS,       SCENE_DESERT_COLOSSUS,      21764,  0x04, "GS Hill",                          "Colossus GS Hill",                                 RHT_COLOSSUS_GS_HILL,                                 { Category::cSkulltula }, 0x15, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[RC_COLOSSUS_GS_TREE] =                                 Location::GSToken(RC_COLOSSUS_GS_TREE,                                 RCQUEST_BOTH,    RCAREA_DESERT_COLOSSUS,       SCENE_DESERT_COLOSSUS,      21768,  0x08, "GS Tree",                          "Colossus GS Tree",                                 RHT_COLOSSUS_GS_TREE,                                 { Category::cSkulltula }, 0x15, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_WASTELAND_GS] =                                                Location::GSToken(RC_WASTELAND_GS,                                                 RCQUEST_BOTH,                                        RCAREA_WASTELAND,                                          SCENE_HAUNTED_WASTELAND,            13570,                                             0x02, "GS",                                          "Wasteland GS",                                             RHT_WASTELAND_GS,                                                                                      { Category::cSkulltula }, 0x15,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_COLOSSUS_GS_BEAN_PATCH] =                                      Location::GSToken(RC_COLOSSUS_GS_BEAN_PATCH,                                       RCQUEST_BOTH,                                        RCAREA_DESERT_COLOSSUS,                                    SCENE_DESERT_COLOSSUS,              29953,                                             0x01, "GS Bean Patch",                               "Colossus GS Bean Patch",                                   RHT_COLOSSUS_GS_BEAN_PATCH,                                                                            { Category::cSkulltula }, 0x15,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_COLOSSUS_GS_HILL] =                                            Location::GSToken(RC_COLOSSUS_GS_HILL,                                             RCQUEST_BOTH,                                        RCAREA_DESERT_COLOSSUS,                                    SCENE_DESERT_COLOSSUS,              21764,                                             0x04, "GS Hill",                                     "Colossus GS Hill",                                         RHT_COLOSSUS_GS_HILL,                                                                                  { Category::cSkulltula }, 0x15,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_COLOSSUS_GS_TREE] =                                            Location::GSToken(RC_COLOSSUS_GS_TREE,                                             RCQUEST_BOTH,                                        RCAREA_DESERT_COLOSSUS,                                    SCENE_DESERT_COLOSSUS,              21768,                                             0x08, "GS Tree",                                     "Colossus GS Tree",                                         RHT_COLOSSUS_GS_TREE,                                                                                  { Category::cSkulltula }, 0x15,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
     // Hyrule Castle, Market, and Outside Ganon's Castle
-    locationTable[RC_OGC_GS] =                                           Location::GSToken(RC_OGC_GS,                                           RCQUEST_BOTH,    RCAREA_HYRULE_CASTLE,         SCENE_OUTSIDE_GANONS_CASTLE,11777,  0x01, "OGC GS",                           "OGC GS",                                           RHT_OGC_GS,                                           { Category::cSkulltula }, 0x0E, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_HC_GS_STORMS_GROTTO] =                              Location::GSToken(RC_HC_GS_STORMS_GROTTO,                              RCQUEST_BOTH,    RCAREA_HYRULE_CASTLE,         SCENE_GROTTOS,              11778,  0x02, "GS Storms Grotto",                 "HC GS Storms Grotto",                              RHT_HC_GS_STORMS_GROTTO,                              { Category::cSkulltula }, 0x0E, SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_HC_GS_TREE] =                                       Location::GSToken(RC_HC_GS_TREE,                                       RCQUEST_BOTH,    RCAREA_HYRULE_CASTLE,         SCENE_HYRULE_CASTLE,        -29180, 0x04, "GS Tree",                          "HC GS Tree",                                       RHT_HC_GS_TREE,                                       { Category::cSkulltula }, 0x0E, SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_GS_GUARD_HOUSE] =                            Location::GSToken(RC_MARKET_GS_GUARD_HOUSE,                            RCQUEST_BOTH,    RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,   -29176, 0x08, "Market GS Guard House",            "Market GS Guard House",                            RHT_MARKET_GS_GUARD_HOUSE,                            { Category::cSkulltula }, 0x0E, SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_OGC_GS] =                                                      Location::GSToken(RC_OGC_GS,                                                       RCQUEST_BOTH,                                        RCAREA_HYRULE_CASTLE,                                      SCENE_OUTSIDE_GANONS_CASTLE,        11777,                                             0x01, "OGC GS",                                      "OGC GS",                                                   RHT_OGC_GS,                                                                                            { Category::cSkulltula }, 0x0E,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_HC_GS_STORMS_GROTTO] =                                         Location::GSToken(RC_HC_GS_STORMS_GROTTO,                                          RCQUEST_BOTH,                                        RCAREA_HYRULE_CASTLE,                                      SCENE_GROTTOS,                      11778,                                             0x02, "GS Storms Grotto",                            "HC GS Storms Grotto",                                      RHT_HC_GS_STORMS_GROTTO,                                                                               { Category::cSkulltula }, 0x0E,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_HC_GS_TREE] =                                                  Location::GSToken(RC_HC_GS_TREE,                                                   RCQUEST_BOTH,                                        RCAREA_HYRULE_CASTLE,                                      SCENE_HYRULE_CASTLE,                -29180,                                            0x04, "GS Tree",                                     "HC GS Tree",                                               RHT_HC_GS_TREE,                                                                                        { Category::cSkulltula }, 0x0E,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_GS_GUARD_HOUSE] =                                       Location::GSToken(RC_MARKET_GS_GUARD_HOUSE,                                        RCQUEST_BOTH,                                        RCAREA_MARKET,                                             SCENE_MARKET_GUARD_HOUSE,           -29176,                                            0x08, "Market GS Guard House",                       "Market GS Guard House",                                    RHT_MARKET_GS_GUARD_HOUSE,                                                                             { Category::cSkulltula }, 0x0E,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
     // Kakariko
-    locationTable[RC_KAK_GS_HOUSE_UNDER_CONSTRUCTION] =                  Location::GSToken(RC_KAK_GS_HOUSE_UNDER_CONSTRUCTION,                  RCQUEST_BOTH,    RCAREA_KAKARIKO_VILLAGE,      SCENE_KAKARIKO_VILLAGE,     20488,  0x08, "GS House Under Construction",      "Kak GS House Under Construction",                  RHT_KAK_GS_HOUSE_UNDER_CONSTRUCTION,                  { Category::cSkulltula }, 0x10, SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_GS_SKULLTULA_HOUSE] =                           Location::GSToken(RC_KAK_GS_SKULLTULA_HOUSE,                           RCQUEST_BOTH,    RCAREA_KAKARIKO_VILLAGE,      SCENE_KAKARIKO_VILLAGE,     20496,  0x10, "GS Skulltula House",               "Kak GS Skulltula House",                           RHT_KAK_GS_SKULLTULA_HOUSE,                           { Category::cSkulltula }, 0x10, SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_GS_GUARDS_HOUSE] =                              Location::GSToken(RC_KAK_GS_GUARDS_HOUSE,                              RCQUEST_BOTH,    RCAREA_KAKARIKO_VILLAGE,      SCENE_KAKARIKO_VILLAGE,     20482,  0x02, "GS Guards House",                  "Kak GS Guards House",                              RHT_KAK_GS_GUARDS_HOUSE,                              { Category::cSkulltula }, 0x10, SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_GS_TREE] =                                      Location::GSToken(RC_KAK_GS_TREE,                                      RCQUEST_BOTH,    RCAREA_KAKARIKO_VILLAGE,      SCENE_KAKARIKO_VILLAGE,     -28640, 0x20, "GS Tree",                          "Kak GS Tree",                                      RHT_KAK_GS_TREE,                                      { Category::cSkulltula }, 0x10, SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_GS_WATCHTOWER] =                                Location::GSToken(RC_KAK_GS_WATCHTOWER,                                RCQUEST_BOTH,    RCAREA_KAKARIKO_VILLAGE,      SCENE_KAKARIKO_VILLAGE,     20484,  0x04, "GS Watchtower",                    "Kak GS Watchtower",                                RHT_KAK_GS_WATCHTOWER,                                { Category::cSkulltula }, 0x10, SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_GS_ABOVE_IMPAS_HOUSE] =                         Location::GSToken(RC_KAK_GS_ABOVE_IMPAS_HOUSE,                         RCQUEST_BOTH,    RCAREA_KAKARIKO_VILLAGE,      SCENE_KAKARIKO_VILLAGE,     20544,  0x40, "GS Above Impas House",             "Kak GS Above Impas House",                         RHT_KAK_GS_ABOVE_IMPAS_HOUSE,                         { Category::cSkulltula }, 0x10, SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_GS_HOUSE_UNDER_CONSTRUCTION] =                             Location::GSToken(RC_KAK_GS_HOUSE_UNDER_CONSTRUCTION,                              RCQUEST_BOTH,                                        RCAREA_KAKARIKO_VILLAGE,                                   SCENE_KAKARIKO_VILLAGE,             20488,                                             0x08, "GS House Under Construction",                 "Kak GS House Under Construction",                          RHT_KAK_GS_HOUSE_UNDER_CONSTRUCTION,                                                                   { Category::cSkulltula }, 0x10,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_GS_SKULLTULA_HOUSE] =                                      Location::GSToken(RC_KAK_GS_SKULLTULA_HOUSE,                                       RCQUEST_BOTH,                                        RCAREA_KAKARIKO_VILLAGE,                                   SCENE_KAKARIKO_VILLAGE,             20496,                                             0x10, "GS Skulltula House",                          "Kak GS Skulltula House",                                   RHT_KAK_GS_SKULLTULA_HOUSE,                                                                            { Category::cSkulltula }, 0x10,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_GS_GUARDS_HOUSE] =                                         Location::GSToken(RC_KAK_GS_GUARDS_HOUSE,                                          RCQUEST_BOTH,                                        RCAREA_KAKARIKO_VILLAGE,                                   SCENE_KAKARIKO_VILLAGE,             20482,                                             0x02, "GS Guards House",                             "Kak GS Guards House",                                      RHT_KAK_GS_GUARDS_HOUSE,                                                                               { Category::cSkulltula }, 0x10,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_GS_TREE] =                                                 Location::GSToken(RC_KAK_GS_TREE,                                                  RCQUEST_BOTH,                                        RCAREA_KAKARIKO_VILLAGE,                                   SCENE_KAKARIKO_VILLAGE,             -28640,                                            0x20, "GS Tree",                                     "Kak GS Tree",                                              RHT_KAK_GS_TREE,                                                                                       { Category::cSkulltula }, 0x10,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_GS_WATCHTOWER] =                                           Location::GSToken(RC_KAK_GS_WATCHTOWER,                                            RCQUEST_BOTH,                                        RCAREA_KAKARIKO_VILLAGE,                                   SCENE_KAKARIKO_VILLAGE,             20484,                                             0x04, "GS Watchtower",                               "Kak GS Watchtower",                                        RHT_KAK_GS_WATCHTOWER,                                                                                 { Category::cSkulltula }, 0x10,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_GS_ABOVE_IMPAS_HOUSE] =                                    Location::GSToken(RC_KAK_GS_ABOVE_IMPAS_HOUSE,                                     RCQUEST_BOTH,                                        RCAREA_KAKARIKO_VILLAGE,                                   SCENE_KAKARIKO_VILLAGE,             20544,                                             0x40, "GS Above Impas House",                        "Kak GS Above Impas House",                                 RHT_KAK_GS_ABOVE_IMPAS_HOUSE,                                                                          { Category::cSkulltula }, 0x10,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
     // Graveyard
-    locationTable[RC_GRAVEYARD_GS_WALL] =                                Location::GSToken(RC_GRAVEYARD_GS_WALL,                                RCQUEST_BOTH,    RCAREA_GRAVEYARD,             SCENE_GRAVEYARD,            20608,  0x80, "GS Wall",                          "Graveyard GS Wall",                                RHT_GRAVEYARD_GS_WALL,                                { Category::cSkulltula }, 0x10, SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_GRAVEYARD_GS_BEAN_PATCH] =                          Location::GSToken(RC_GRAVEYARD_GS_BEAN_PATCH,                          RCQUEST_BOTH,    RCAREA_GRAVEYARD,             SCENE_GRAVEYARD,            28673,  0x01, "GS Bean Patch",                    "Graveyard GS Bean Patch",                          RHT_GRAVEYARD_GS_BEAN_PATCH,                          { Category::cSkulltula }, 0x10, SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_GRAVEYARD_GS_WALL] =                                           Location::GSToken(RC_GRAVEYARD_GS_WALL,                                            RCQUEST_BOTH,                                        RCAREA_GRAVEYARD,                                          SCENE_GRAVEYARD,                    20608,                                             0x80, "GS Wall",                                     "Graveyard GS Wall",                                        RHT_GRAVEYARD_GS_WALL,                                                                                 { Category::cSkulltula }, 0x10,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_GRAVEYARD_GS_BEAN_PATCH] =                                     Location::GSToken(RC_GRAVEYARD_GS_BEAN_PATCH,                                      RCQUEST_BOTH,                                        RCAREA_GRAVEYARD,                                          SCENE_GRAVEYARD,                    28673,                                             0x01, "GS Bean Patch",                               "Graveyard GS Bean Patch",                                  RHT_GRAVEYARD_GS_BEAN_PATCH,                                                                           { Category::cSkulltula }, 0x10,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
     // Death Mountain
-    locationTable[RC_DMC_GS_BEAN_PATCH] =                                Location::GSToken(RC_DMC_GS_BEAN_PATCH,                                RCQUEST_BOTH,    RCAREA_DEATH_MOUNTAIN_CRATER, SCENE_DEATH_MOUNTAIN_CRATER,28417,  0x01, "GS Bean Patch",                    "DMC GS Bean Patch",                                RHT_DMC_GS_BEAN_PATCH,                                { Category::cSkulltula }, 0x0F, SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMC_GS_CRATE] =                                     Location::GSToken(RC_DMC_GS_CRATE,                                     RCQUEST_BOTH,    RCAREA_DEATH_MOUNTAIN_CRATER, SCENE_DEATH_MOUNTAIN_CRATER,-28800, 0x80, "GS Crate",                         "DMC GS Crate",                                     RHT_DMC_GS_CRATE,                                     { Category::cSkulltula }, 0x0F, SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMT_GS_BEAN_PATCH] =                                Location::GSToken(RC_DMT_GS_BEAN_PATCH,                                RCQUEST_BOTH,    RCAREA_DEATH_MOUNTAIN_TRAIL,  SCENE_DEATH_MOUNTAIN_TRAIL, 28418,  0x02, "GS Bean Patch",                    "DMT GS Bean Patch",                                RHT_DMT_GS_BEAN_PATCH,                                { Category::cSkulltula }, 0x0F, SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMT_GS_NEAR_KAK] =                                  Location::GSToken(RC_DMT_GS_NEAR_KAK,                                  RCQUEST_BOTH,    RCAREA_DEATH_MOUNTAIN_TRAIL,  SCENE_DEATH_MOUNTAIN_TRAIL, 12036,  0x04, "GS Near Kak",                      "DMT GS Near Kak",                                  RHT_DMT_GS_NEAR_KAK,                                  { Category::cSkulltula }, 0x0F, SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMT_GS_ABOVE_DODONGOS_CAVERN] =                     Location::GSToken(RC_DMT_GS_ABOVE_DODONGOS_CAVERN,                     RCQUEST_BOTH,    RCAREA_DEATH_MOUNTAIN_TRAIL,  SCENE_DEATH_MOUNTAIN_TRAIL, 20232,  0x08, "GS Above Dodongos Cavern",         "DMT GS Above Dodongos Cavern",                     RHT_DMT_GS_ABOVE_DODONGOS_CAVERN,                     { Category::cSkulltula }, 0x0F, SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMT_GS_FALLING_ROCKS_PATH] =                        Location::GSToken(RC_DMT_GS_FALLING_ROCKS_PATH,                        RCQUEST_BOTH,    RCAREA_DEATH_MOUNTAIN_TRAIL,  SCENE_DEATH_MOUNTAIN_TRAIL, 20240,  0x10, "GS Falling Rocks Path",            "DMT GS Falling Rocks Path",                        RHT_DMT_GS_FALLING_ROCKS_PATH,                        { Category::cSkulltula }, 0x0F, SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_GC_GS_CENTER_PLATFORM] =                            Location::GSToken(RC_GC_GS_CENTER_PLATFORM,                            RCQUEST_BOTH,    RCAREA_GORON_CITY,            SCENE_GORON_CITY,           12064,  0x20, "GS Center Platform",               "GC GS Center Platform",                            RHT_GC_GS_CENTER_PLATFORM,                            { Category::cSkulltula }, 0x0F, SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_GS_BOULDER_MAZE] =                               Location::GSToken(RC_GC_GS_BOULDER_MAZE,                               RCQUEST_BOTH,    RCAREA_GORON_CITY,            SCENE_GORON_CITY,           -28864, 0x40, "GS Boulder Maze",                  "GC GS Boulder Maze",                               RHT_GC_GS_BOULDER_MAZE,                               { Category::cSkulltula }, 0x0F, SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_DMC_GS_BEAN_PATCH] =                                           Location::GSToken(RC_DMC_GS_BEAN_PATCH,                                            RCQUEST_BOTH,                                        RCAREA_DEATH_MOUNTAIN_CRATER,                              SCENE_DEATH_MOUNTAIN_CRATER,        28417,                                             0x01, "GS Bean Patch",                               "DMC GS Bean Patch",                                        RHT_DMC_GS_BEAN_PATCH,                                                                                 { Category::cSkulltula }, 0x0F,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMC_GS_CRATE] =                                                Location::GSToken(RC_DMC_GS_CRATE,                                                 RCQUEST_BOTH,                                        RCAREA_DEATH_MOUNTAIN_CRATER,                              SCENE_DEATH_MOUNTAIN_CRATER,        -28800,                                            0x80, "GS Crate",                                    "DMC GS Crate",                                             RHT_DMC_GS_CRATE,                                                                                      { Category::cSkulltula }, 0x0F,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMT_GS_BEAN_PATCH] =                                           Location::GSToken(RC_DMT_GS_BEAN_PATCH,                                            RCQUEST_BOTH,                                        RCAREA_DEATH_MOUNTAIN_TRAIL,                               SCENE_DEATH_MOUNTAIN_TRAIL,         28418,                                             0x02, "GS Bean Patch",                               "DMT GS Bean Patch",                                        RHT_DMT_GS_BEAN_PATCH,                                                                                 { Category::cSkulltula }, 0x0F,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMT_GS_NEAR_KAK] =                                             Location::GSToken(RC_DMT_GS_NEAR_KAK,                                              RCQUEST_BOTH,                                        RCAREA_DEATH_MOUNTAIN_TRAIL,                               SCENE_DEATH_MOUNTAIN_TRAIL,         12036,                                             0x04, "GS Near Kak",                                 "DMT GS Near Kak",                                          RHT_DMT_GS_NEAR_KAK,                                                                                   { Category::cSkulltula }, 0x0F,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMT_GS_ABOVE_DODONGOS_CAVERN] =                                Location::GSToken(RC_DMT_GS_ABOVE_DODONGOS_CAVERN,                                 RCQUEST_BOTH,                                        RCAREA_DEATH_MOUNTAIN_TRAIL,                               SCENE_DEATH_MOUNTAIN_TRAIL,         20232,                                             0x08, "GS Above Dodongos Cavern",                    "DMT GS Above Dodongos Cavern",                             RHT_DMT_GS_ABOVE_DODONGOS_CAVERN,                                                                      { Category::cSkulltula }, 0x0F,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMT_GS_FALLING_ROCKS_PATH] =                                   Location::GSToken(RC_DMT_GS_FALLING_ROCKS_PATH,                                    RCQUEST_BOTH,                                        RCAREA_DEATH_MOUNTAIN_TRAIL,                               SCENE_DEATH_MOUNTAIN_TRAIL,         20240,                                             0x10, "GS Falling Rocks Path",                       "DMT GS Falling Rocks Path",                                RHT_DMT_GS_FALLING_ROCKS_PATH,                                                                         { Category::cSkulltula }, 0x0F,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_GC_GS_CENTER_PLATFORM] =                                       Location::GSToken(RC_GC_GS_CENTER_PLATFORM,                                        RCQUEST_BOTH,                                        RCAREA_GORON_CITY,                                         SCENE_GORON_CITY,                   12064,                                             0x20, "GS Center Platform",                          "GC GS Center Platform",                                    RHT_GC_GS_CENTER_PLATFORM,                                                                             { Category::cSkulltula }, 0x0F,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_GS_BOULDER_MAZE] =                                          Location::GSToken(RC_GC_GS_BOULDER_MAZE,                                           RCQUEST_BOTH,                                        RCAREA_GORON_CITY,                                         SCENE_GORON_CITY,                   -28864,                                            0x40, "GS Boulder Maze",                             "GC GS Boulder Maze",                                       RHT_GC_GS_BOULDER_MAZE,                                                                                { Category::cSkulltula }, 0x0F,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
     // Zora's River, Domain, and Fountain
-    locationTable[RC_ZR_GS_LADDER] =                                     Location::GSToken(RC_ZR_GS_LADDER,                                     RCQUEST_BOTH,    RCAREA_ZORAS_RIVER,           SCENE_ZORAS_RIVER,          20737,  0x01, "GS Ladder",                        "ZR GS Ladder",                                     RHT_ZR_GS_LADDER,                                     { Category::cSkulltula }, 0x11, SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZR_GS_TREE] =                                       Location::GSToken(RC_ZR_GS_TREE,                                       RCQUEST_BOTH,    RCAREA_ZORAS_RIVER,           SCENE_ZORAS_RIVER,          -28414, 0x02, "GS Tree",                          "ZR GS Tree",                                       RHT_ZR_GS_TREE,                                       { Category::cSkulltula }, 0x11, SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZR_GS_ABOVE_BRIDGE] =                               Location::GSToken(RC_ZR_GS_ABOVE_BRIDGE,                               RCQUEST_BOTH,    RCAREA_ZORAS_RIVER,           SCENE_ZORAS_RIVER,          20744,  0x08, "GS Above Bridge",                  "ZR GS Above Bridge",                               RHT_ZR_GS_ABOVE_BRIDGE,                               { Category::cSkulltula }, 0x11, SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZR_GS_NEAR_RAISED_GROTTOS] =                        Location::GSToken(RC_ZR_GS_NEAR_RAISED_GROTTOS,                        RCQUEST_BOTH,    RCAREA_ZORAS_RIVER,           SCENE_ZORAS_RIVER,          20752,  0x10, "GS Near Raised Grottos",           "ZR GS Near Raised Grottos",                        RHT_ZR_GS_NEAR_RAISED_GROTTOS,                        { Category::cSkulltula }, 0x11, SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZD_GS_FROZEN_WATERFALL] =                           Location::GSToken(RC_ZD_GS_FROZEN_WATERFALL,                           RCQUEST_BOTH,    RCAREA_ZORAS_DOMAIN,          SCENE_ZORAS_DOMAIN,         20800,  0x40, "GS Frozen Waterfall",              "ZD GS Frozen Waterfall",                           RHT_ZD_GS_FROZEN_WATERFALL,                           { Category::cSkulltula }, 0x11, SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZF_GS_ABOVE_THE_LOG] =                              Location::GSToken(RC_ZF_GS_ABOVE_THE_LOG,                              RCQUEST_BOTH,    RCAREA_ZORAS_FOUNTAIN,        SCENE_ZORAS_FOUNTAIN,       20740,  0x04, "GS Above The Log",                 "ZF GS Above The Log",                              RHT_ZF_GS_ABOVE_THE_LOG,                              { Category::cSkulltula }, 0x11, SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZF_GS_HIDDEN_CAVE] =                                Location::GSToken(RC_ZF_GS_HIDDEN_CAVE,                                RCQUEST_BOTH,    RCAREA_ZORAS_FOUNTAIN,        SCENE_ZORAS_FOUNTAIN,       20768,  0x20, "GS Hidden Cave",                   "ZF GS Hidden Cave",                                RHT_ZF_GS_HIDDEN_CAVE,                                { Category::cSkulltula }, 0x11, SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZF_GS_TREE] =                                       Location::GSToken(RC_ZF_GS_TREE,                                       RCQUEST_BOTH,    RCAREA_ZORAS_FOUNTAIN,        SCENE_ZORAS_FOUNTAIN,       -28288, 0x80, "GS Tree",                          "ZF GS Tree",                                       RHT_ZF_GS_TREE,                                       { Category::cSkulltula }, 0x11, SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZR_GS_LADDER] =                                                Location::GSToken(RC_ZR_GS_LADDER,                                                 RCQUEST_BOTH,                                        RCAREA_ZORAS_RIVER,                                        SCENE_ZORAS_RIVER,                  20737,                                             0x01, "GS Ladder",                                   "ZR GS Ladder",                                             RHT_ZR_GS_LADDER,                                                                                      { Category::cSkulltula }, 0x11,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZR_GS_TREE] =                                                  Location::GSToken(RC_ZR_GS_TREE,                                                   RCQUEST_BOTH,                                        RCAREA_ZORAS_RIVER,                                        SCENE_ZORAS_RIVER,                  -28414,                                            0x02, "GS Tree",                                     "ZR GS Tree",                                               RHT_ZR_GS_TREE,                                                                                        { Category::cSkulltula }, 0x11,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZR_GS_ABOVE_BRIDGE] =                                          Location::GSToken(RC_ZR_GS_ABOVE_BRIDGE,                                           RCQUEST_BOTH,                                        RCAREA_ZORAS_RIVER,                                        SCENE_ZORAS_RIVER,                  20744,                                             0x08, "GS Above Bridge",                             "ZR GS Above Bridge",                                       RHT_ZR_GS_ABOVE_BRIDGE,                                                                                { Category::cSkulltula }, 0x11,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZR_GS_NEAR_RAISED_GROTTOS] =                                   Location::GSToken(RC_ZR_GS_NEAR_RAISED_GROTTOS,                                    RCQUEST_BOTH,                                        RCAREA_ZORAS_RIVER,                                        SCENE_ZORAS_RIVER,                  20752,                                             0x10, "GS Near Raised Grottos",                      "ZR GS Near Raised Grottos",                                RHT_ZR_GS_NEAR_RAISED_GROTTOS,                                                                         { Category::cSkulltula }, 0x11,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZD_GS_FROZEN_WATERFALL] =                                      Location::GSToken(RC_ZD_GS_FROZEN_WATERFALL,                                       RCQUEST_BOTH,                                        RCAREA_ZORAS_DOMAIN,                                       SCENE_ZORAS_DOMAIN,                 20800,                                             0x40, "GS Frozen Waterfall",                         "ZD GS Frozen Waterfall",                                   RHT_ZD_GS_FROZEN_WATERFALL,                                                                            { Category::cSkulltula }, 0x11,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZF_GS_ABOVE_THE_LOG] =                                         Location::GSToken(RC_ZF_GS_ABOVE_THE_LOG,                                          RCQUEST_BOTH,                                        RCAREA_ZORAS_FOUNTAIN,                                     SCENE_ZORAS_FOUNTAIN,               20740,                                             0x04, "GS Above The Log",                            "ZF GS Above The Log",                                      RHT_ZF_GS_ABOVE_THE_LOG,                                                                               { Category::cSkulltula }, 0x11,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZF_GS_HIDDEN_CAVE] =                                           Location::GSToken(RC_ZF_GS_HIDDEN_CAVE,                                            RCQUEST_BOTH,                                        RCAREA_ZORAS_FOUNTAIN,                                     SCENE_ZORAS_FOUNTAIN,               20768,                                             0x20, "GS Hidden Cave",                              "ZF GS Hidden Cave",                                        RHT_ZF_GS_HIDDEN_CAVE,                                                                                 { Category::cSkulltula }, 0x11,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZF_GS_TREE] =                                                  Location::GSToken(RC_ZF_GS_TREE,                                                   RCQUEST_BOTH,                                        RCAREA_ZORAS_FOUNTAIN,                                     SCENE_ZORAS_FOUNTAIN,               -28288,                                            0x80, "GS Tree",                                     "ZF GS Tree",                                               RHT_ZF_GS_TREE,                                                                                        { Category::cSkulltula }, 0x11,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
     // Lon Lon Ranch
-    locationTable[RC_LLR_GS_BACK_WALL] =                                 Location::GSToken(RC_LLR_GS_BACK_WALL,                                 RCQUEST_BOTH,    RCAREA_LON_LON_RANCH,         SCENE_LON_LON_RANCH,        11009,  0x01, "GS Back Wall",                     "LLR GS Back Wall",                                 RHT_LLR_GS_BACK_WALL,                                 { Category::cSkulltula }, 0x0B, SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
-    locationTable[RC_LLR_GS_RAIN_SHED] =                                 Location::GSToken(RC_LLR_GS_RAIN_SHED,                                 RCQUEST_BOTH,    RCAREA_LON_LON_RANCH,         SCENE_LON_LON_RANCH,        11010,  0x02, "GS Rain Shed",                     "LLR GS Rain Shed",                                 RHT_LLR_GS_RAIN_SHED,                                 { Category::cSkulltula }, 0x0B, SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
-    locationTable[RC_LLR_GS_HOUSE_WINDOW] =                              Location::GSToken(RC_LLR_GS_HOUSE_WINDOW,                              RCQUEST_BOTH,    RCAREA_LON_LON_RANCH,         SCENE_LON_LON_RANCH,        11012,  0x04, "GS House Window",                  "LLR GS House Window",                              RHT_LLR_GS_HOUSE_WINDOW,                              { Category::cSkulltula }, 0x0B, SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
-    locationTable[RC_LLR_GS_TREE] =                                      Location::GSToken(RC_LLR_GS_TREE,                                      RCQUEST_BOTH,    RCAREA_LON_LON_RANCH,         SCENE_LON_LON_RANCH,        -29944, 0x08, "GS Tree",                          "LLR GS Tree",                                      RHT_LLR_GS_TREE,                                      { Category::cSkulltula }, 0x0B, SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
+    locationTable[RC_LLR_GS_BACK_WALL] =                                            Location::GSToken(RC_LLR_GS_BACK_WALL,                                             RCQUEST_BOTH,                                        RCAREA_LON_LON_RANCH,                                      SCENE_LON_LON_RANCH,                11009,                                             0x01, "GS Back Wall",                                "LLR GS Back Wall",                                         RHT_LLR_GS_BACK_WALL,                                                                                  { Category::cSkulltula }, 0x0B,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
+    locationTable[RC_LLR_GS_RAIN_SHED] =                                            Location::GSToken(RC_LLR_GS_RAIN_SHED,                                             RCQUEST_BOTH,                                        RCAREA_LON_LON_RANCH,                                      SCENE_LON_LON_RANCH,                11010,                                             0x02, "GS Rain Shed",                                "LLR GS Rain Shed",                                         RHT_LLR_GS_RAIN_SHED,                                                                                  { Category::cSkulltula }, 0x0B,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
+    locationTable[RC_LLR_GS_HOUSE_WINDOW] =                                         Location::GSToken(RC_LLR_GS_HOUSE_WINDOW,                                          RCQUEST_BOTH,                                        RCAREA_LON_LON_RANCH,                                      SCENE_LON_LON_RANCH,                11012,                                             0x04, "GS House Window",                             "LLR GS House Window",                                      RHT_LLR_GS_HOUSE_WINDOW,                                                                               { Category::cSkulltula }, 0x0B,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
+    locationTable[RC_LLR_GS_TREE] =                                                 Location::GSToken(RC_LLR_GS_TREE,                                                  RCQUEST_BOTH,                                        RCAREA_LON_LON_RANCH,                                      SCENE_LON_LON_RANCH,                -29944,                                            0x08, "GS Tree",                                     "LLR GS Tree",                                              RHT_LLR_GS_TREE,                                                                                       { Category::cSkulltula }, 0x0B,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
 
-    // Bosses     Randomizer Check                       Randomizer Check    Quest         Type                   Area                     Actor ID          Scene ID                    Params Flags                                      Short Name         Spoiler Name       Hint Text Key      Vanilla Item        Categories Spoiler Collection Check             Collection Check Group                                      Vanilla Progression
-    locationTable[RC_LINKS_POCKET] =    Location::Reward(RC_LINKS_POCKET,    RCQUEST_BOTH, RCTYPE_LINKS_POCKET,   RCAREA_KOKIRI_FOREST,    ACTOR_ID_MAX,     SCENE_ID_MAX,               0x00, 0x00,                                       "Link's Pocket",   "Link's Pocket",   RHT_LINKS_POCKET,  RG_LIGHT_MEDALLION,  {}, SpoilerCollectionCheck::AlwaysCollected(), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST,           true);
-    locationTable[RC_QUEEN_GOHMA] =     Location::Reward(RC_QUEEN_GOHMA,     RCQUEST_BOTH, RCTYPE_DUNGEON_REWARD, RCAREA_DEKU_TREE,        ACTOR_DOOR_WARP1, SCENE_DEKU_TREE_BOSS,       0x00, DungeonId::DUNGEON_DEKU_TREE,               "Queen Gohma",     "Queen Gohma",     RHT_QUEEN_GOHMA,   RG_KOKIRI_EMERALD,   {}, SpoilerCollectionCheck::Chest(0x11, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE,       true);
-    locationTable[RC_KING_DODONGO] =    Location::Reward(RC_KING_DODONGO,    RCQUEST_BOTH, RCTYPE_DUNGEON_REWARD, RCAREA_DODONGOS_CAVERN,  ACTOR_DOOR_WARP1, SCENE_DODONGOS_CAVERN_BOSS, 0x00, DungeonId::DUNGEON_DODONGOS_CAVERN,         "King Dodongo",    "King Dodongo",    RHT_KING_DODONGO,  RG_GORON_RUBY,       {}, SpoilerCollectionCheck::Chest(0x12, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN, true);
-    locationTable[RC_BARINADE] =        Location::Reward(RC_BARINADE,        RCQUEST_BOTH, RCTYPE_DUNGEON_REWARD, RCAREA_JABU_JABUS_BELLY, ACTOR_DOOR_WARP1, SCENE_JABU_JABU_BOSS,       0x00, DungeonId::DUNGEON_JABUJABUS_BELLY,         "Barinade",        "Barinade",        RHT_BARINADE,      RG_ZORA_SAPPHIRE,    {}, SpoilerCollectionCheck::Chest(0x13, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY, true);
-    locationTable[RC_PHANTOM_GANON] =   Location::Reward(RC_PHANTOM_GANON,   RCQUEST_BOTH, RCTYPE_DUNGEON_REWARD, RCAREA_FOREST_TEMPLE,    ACTOR_DOOR_WARP1, SCENE_FOREST_TEMPLE_BOSS,   0x00, DungeonId::DUNGEON_FOREST_TEMPLE,           "Phantom Ganon",   "Phantom Ganon",   RHT_PHANTOM_GANON, RG_FOREST_MEDALLION, {}, SpoilerCollectionCheck::Chest(0x14, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,   true);
-    locationTable[RC_VOLVAGIA] =        Location::Reward(RC_VOLVAGIA,        RCQUEST_BOTH, RCTYPE_DUNGEON_REWARD, RCAREA_FIRE_TEMPLE,      ACTOR_DOOR_WARP1, SCENE_FIRE_TEMPLE_BOSS,     0x00, DungeonId::DUNGEON_FIRE_TEMPLE,             "Volvagia",        "Volvagia",        RHT_VOLVAGIA,      RG_FIRE_MEDALLION,   {}, SpoilerCollectionCheck::Chest(0x15, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,     true);
-    locationTable[RC_MORPHA] =          Location::Reward(RC_MORPHA,          RCQUEST_BOTH, RCTYPE_DUNGEON_REWARD, RCAREA_WATER_TEMPLE,     ACTOR_DOOR_WARP1, SCENE_WATER_TEMPLE_BOSS,    0x00, DungeonId::DUNGEON_WATER_TEMPLE,            "Morpha",          "Morpha",          RHT_MORPHA,        RG_WATER_MEDALLION,  {}, SpoilerCollectionCheck::Chest(0x16, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,    true);
-    locationTable[RC_TWINROVA] =        Location::Reward(RC_TWINROVA,        RCQUEST_BOTH, RCTYPE_DUNGEON_REWARD, RCAREA_SPIRIT_TEMPLE,    ACTOR_DOOR_WARP1, SCENE_SPIRIT_TEMPLE_BOSS,   0x00, DungeonId::DUNGEON_SPIRIT_TEMPLE,           "Twinrova",        "Twinrova",        RHT_TWINROVA,      RG_SPIRIT_MEDALLION, {}, SpoilerCollectionCheck::Chest(0x17, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,   true);
-    locationTable[RC_BONGO_BONGO] =     Location::Reward(RC_BONGO_BONGO,     RCQUEST_BOTH, RCTYPE_DUNGEON_REWARD, RCAREA_SHADOW_TEMPLE,    ACTOR_DOOR_WARP1, SCENE_SHADOW_TEMPLE_BOSS,   0x00, DungeonId::DUNGEON_SHADOW_TEMPLE,           "Bongo Bongo",     "Bongo Bongo",     RHT_BONGO_BONGO,   RG_SHADOW_MEDALLION, {}, SpoilerCollectionCheck::Chest(0x18, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,   true);
-    locationTable[RC_GANON] =           Location::Reward(RC_GANON,           RCQUEST_BOTH, RCTYPE_DUNGEON_REWARD, RCAREA_GANONS_CASTLE,    ACTOR_DOOR_WARP1, SCENE_GANON_BOSS,           0x00, DungeonId::DUNGEON_GANONS_CASTLE_CRUMBLING, "Ganon",           "Ganon",           RHT_NONE,          RG_TRIFORCE,         {}, SpoilerCollectionCheck::None(),            SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GIFT_FROM_SAGES] = Location::Reward(RC_GIFT_FROM_SAGES, RCQUEST_BOTH, RCTYPE_DUNGEON_REWARD, RCAREA_MARKET,           ACTOR_ID_MAX,     SCENE_ID_MAX,               0x00, 0x00,                                       "Gift from Raoru", "Gift from Raoru", RHT_NONE,          RG_LIGHT_MEDALLION,  {}, SpoilerCollectionCheck::None(),            SpoilerCollectionCheckGroup::GROUP_NO_GROUP,                true);
+    // Bosses
+    locationTable[RC_LINKS_POCKET] =                                                 Location::Reward(RC_LINKS_POCKET,                                                 RCQUEST_BOTH,    RCTYPE_LINKS_POCKET,                RCAREA_KOKIRI_FOREST,                ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x00, "Link's Pocket",                               "Link's Pocket",                                            RHT_LINKS_POCKET,                                                RG_NONE,                              {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LINKS_POCKET),                                                                 SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST,              true);
+    locationTable[RC_QUEEN_GOHMA] =                                                  Location::Reward(RC_QUEEN_GOHMA,                                                  RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_DEKU_TREE,                    ACTOR_DOOR_WARP1,     SCENE_DEKU_TREE_BOSS,               0x00,                      DungeonId::DUNGEON_DEKU_TREE, "Queen Gohma",                                 "Queen Gohma",                                              RHT_QUEEN_GOHMA,                                                 RG_KOKIRI_EMERALD,                    {},                                                     SpoilerCollectionCheck::EventChkInf(0x07),                                                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE,          true);
+    locationTable[RC_KING_DODONGO] =                                                 Location::Reward(RC_KING_DODONGO,                                                 RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_DODONGOS_CAVERN,              ACTOR_DOOR_WARP1,     SCENE_DODONGOS_CAVERN_BOSS,         0x00,                DungeonId::DUNGEON_DODONGOS_CAVERN, "King Dodongo",                                "King Dodongo",                                             RHT_KING_DODONGO,                                                RG_GORON_RUBY,                        {},                                                     SpoilerCollectionCheck::EventChkInf(0x25),                                                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN,    true);
+    locationTable[RC_BARINADE] =                                                     Location::Reward(RC_BARINADE,                                                     RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_JABU_JABUS_BELLY,             ACTOR_DOOR_WARP1,     SCENE_JABU_JABU_BOSS,               0x00,                DungeonId::DUNGEON_JABUJABUS_BELLY, "Barinade",                                    "Barinade",                                                 RHT_BARINADE,                                                    RG_ZORA_SAPPHIRE,                     {},                                                     SpoilerCollectionCheck::EventChkInf(0x37),                                                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY,    true);
+    locationTable[RC_PHANTOM_GANON] =                                                Location::Reward(RC_PHANTOM_GANON,                                                RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_FOREST_TEMPLE,                ACTOR_DOOR_WARP1,     SCENE_FOREST_TEMPLE_BOSS,           0x00,                  DungeonId::DUNGEON_FOREST_TEMPLE, "Phantom Ganon",                               "Phantom Ganon",                                            RHT_PHANTOM_GANON,                                               RG_FOREST_MEDALLION,                  {},                                                     SpoilerCollectionCheck::EventChkInf(0x48),                                                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
+    locationTable[RC_VOLVAGIA] =                                                     Location::Reward(RC_VOLVAGIA,                                                     RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_FIRE_TEMPLE,                  ACTOR_DOOR_WARP1,     SCENE_FIRE_TEMPLE_BOSS,             0x00,                    DungeonId::DUNGEON_FIRE_TEMPLE, "Volvagia",                                    "Volvagia",                                                 RHT_VOLVAGIA,                                                    RG_FIRE_MEDALLION,                    {},                                                     SpoilerCollectionCheck::EventChkInf(0x49),                                                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_MORPHA] =                                                       Location::Reward(RC_MORPHA,                                                       RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_WATER_TEMPLE,                 ACTOR_DOOR_WARP1,     SCENE_WATER_TEMPLE_BOSS,            0x00,                   DungeonId::DUNGEON_WATER_TEMPLE, "Morpha",                                      "Morpha",                                                   RHT_MORPHA,                                                      RG_WATER_MEDALLION,                   {},                                                     SpoilerCollectionCheck::EventChkInf(0x4A),                                                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
+    locationTable[RC_TWINROVA] =                                                     Location::Reward(RC_TWINROVA,                                                     RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_SPIRIT_TEMPLE,                ACTOR_DOOR_WARP1,     SCENE_SPIRIT_TEMPLE_BOSS,           0x00,                  DungeonId::DUNGEON_SPIRIT_TEMPLE, "Twinrova",                                    "Twinrova",                                                 RHT_TWINROVA,                                                    RG_SPIRIT_MEDALLION,                  {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DUNGEONS_DONE_SPIRIT_TEMPLE),                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_BONGO_BONGO] =                                                  Location::Reward(RC_BONGO_BONGO,                                                  RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_SHADOW_TEMPLE,                ACTOR_DOOR_WARP1,     SCENE_SHADOW_TEMPLE_BOSS,           0x00,                  DungeonId::DUNGEON_SHADOW_TEMPLE, "Bongo Bongo",                                 "Bongo Bongo",                                              RHT_BONGO_BONGO,                                                 RG_SHADOW_MEDALLION,                  {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DUNGEONS_DONE_SHADOW_TEMPLE),                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
+    locationTable[RC_GANON] =                                                        Location::Reward(RC_GANON,                                                        RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_GANONS_CASTLE,                ACTOR_DOOR_WARP1,     SCENE_GANON_BOSS,                   0x00,        DungeonId::DUNGEON_GANONS_CASTLE_CRUMBLING, "Ganon",                                       "Ganon",                                                    RHT_NONE,                                                        RG_TRIFORCE,                          {},                                                     SpoilerCollectionCheck::None(),                                                                                               SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GIFT_FROM_SAGES] =                                              Location::Reward(RC_GIFT_FROM_SAGES,                                              RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x00, "Gift from Raoru",                             "Gift from Raoru",                                          RHT_NONE,                                                        RG_LIGHT_MEDALLION,                   {},                                                     SpoilerCollectionCheck::EventChkInf(0xC9),                                                                                    SpoilerCollectionCheckGroup::GROUP_NO_GROUP,                   true);
 
-    // Heart Containers     Randomizer Check                              Randomizer Check                       Quest         Type                               Area                     Actor ID            Scene ID                    Params Flags Short Name                      Spoiler Name                                    Hint Text Key                           Vanilla Item        Categories                        Spoiler Collection Check                         Collection Check Group                                      Vanilla Progression
-    locationTable[RC_DEKU_TREE_QUEEN_GOHMA_HEART] =        Location::Base(RC_DEKU_TREE_QUEEN_GOHMA_HEART,        RCQUEST_BOTH, RCTYPE_BOSS_HEART_OR_OTHER_REWARD, RCAREA_DEKU_TREE,        ACTOR_ITEM_B_HEART, SCENE_DEKU_TREE_BOSS,       0x00, 0x4F, "Queen Gohma Heart Container",   "Deku Tree Queen Gohma Heart Container",        RHT_DEKU_TREE_QUEEN_GOHMA_HEART,        RG_HEART_CONTAINER, { Category::cSongDungeonReward }, SpoilerCollectionCheck::Collectable(0x11, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE,       true);
-    locationTable[RC_DODONGOS_CAVERN_KING_DODONGO_HEART] = Location::Base(RC_DODONGOS_CAVERN_KING_DODONGO_HEART, RCQUEST_BOTH, RCTYPE_BOSS_HEART_OR_OTHER_REWARD, RCAREA_DODONGOS_CAVERN,  ACTOR_ITEM_B_HEART, SCENE_DODONGOS_CAVERN_BOSS, 0x00, 0x4F, "King Dodongo Heart Container",  "Dodongos Cavern King Dodongo Heart Container", RHT_DODONGOS_CAVERN_KING_DODONGO_HEART, RG_HEART_CONTAINER, { Category::cSongDungeonReward }, SpoilerCollectionCheck::Collectable(0x12, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN, true);
-    locationTable[RC_JABU_JABUS_BELLY_BARINADE_HEART] =    Location::Base(RC_JABU_JABUS_BELLY_BARINADE_HEART,    RCQUEST_BOTH, RCTYPE_BOSS_HEART_OR_OTHER_REWARD, RCAREA_JABU_JABUS_BELLY, ACTOR_ITEM_B_HEART, SCENE_JABU_JABU_BOSS,       0x00, 0x4F, "Barinade Heart Container",      "Jabu Jabus Belly Barinade Heart Container",    RHT_JABU_JABUS_BELLY_BARINADE_HEART,    RG_HEART_CONTAINER, { Category::cSongDungeonReward }, SpoilerCollectionCheck::Collectable(0x13, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY, true);
-    locationTable[RC_FOREST_TEMPLE_PHANTOM_GANON_HEART] =  Location::Base(RC_FOREST_TEMPLE_PHANTOM_GANON_HEART,  RCQUEST_BOTH, RCTYPE_BOSS_HEART_OR_OTHER_REWARD, RCAREA_FOREST_TEMPLE,    ACTOR_ITEM_B_HEART, SCENE_FOREST_TEMPLE_BOSS,   0x00, 0x4F, "Phantom Ganon Heart Container", "Forest Temple Phantom Ganon Heart Container",  RHT_FOREST_TEMPLE_PHANTOM_GANON_HEART,  RG_HEART_CONTAINER, { Category::cSongDungeonReward }, SpoilerCollectionCheck::Collectable(0x14, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,   true);
-    locationTable[RC_FIRE_TEMPLE_VOLVAGIA_HEART] =         Location::Base(RC_FIRE_TEMPLE_VOLVAGIA_HEART,         RCQUEST_BOTH, RCTYPE_BOSS_HEART_OR_OTHER_REWARD, RCAREA_FIRE_TEMPLE,      ACTOR_ITEM_B_HEART, SCENE_FIRE_TEMPLE_BOSS,     0x00, 0x4F, "Volvagia Heart Container",      "Fire Temple Volvagia Heart Container",         RHT_FIRE_TEMPLE_VOLVAGIA_HEART,         RG_HEART_CONTAINER, { Category::cSongDungeonReward }, SpoilerCollectionCheck::Collectable(0x15, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,     true);
-    locationTable[RC_WATER_TEMPLE_MORPHA_HEART] =          Location::Base(RC_WATER_TEMPLE_MORPHA_HEART,          RCQUEST_BOTH, RCTYPE_BOSS_HEART_OR_OTHER_REWARD, RCAREA_WATER_TEMPLE,     ACTOR_ITEM_B_HEART, SCENE_WATER_TEMPLE_BOSS,    0x00, 0x4F, "Morpha Heart Container",        "Water Temple Morpha Heart Container",          RHT_WATER_TEMPLE_MORPHA_HEART,          RG_HEART_CONTAINER, { Category::cSongDungeonReward }, SpoilerCollectionCheck::Collectable(0x16, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,    true);
-    locationTable[RC_SPIRIT_TEMPLE_TWINROVA_HEART] =       Location::Base(RC_SPIRIT_TEMPLE_TWINROVA_HEART,       RCQUEST_BOTH, RCTYPE_BOSS_HEART_OR_OTHER_REWARD, RCAREA_SPIRIT_TEMPLE,    ACTOR_ITEM_B_HEART, SCENE_SPIRIT_TEMPLE_BOSS,   0x00, 0x4F, "Twinrova Heart Container",      "Spirit Temple Twinrova Heart Container",       RHT_SPIRIT_TEMPLE_TWINROVA_HEART,       RG_HEART_CONTAINER, { Category::cSongDungeonReward }, SpoilerCollectionCheck::Collectable(0x17, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,   true);
-    locationTable[RC_SHADOW_TEMPLE_BONGO_BONGO_HEART] =    Location::Base(RC_SHADOW_TEMPLE_BONGO_BONGO_HEART,    RCQUEST_BOTH, RCTYPE_BOSS_HEART_OR_OTHER_REWARD, RCAREA_SHADOW_TEMPLE,    ACTOR_ITEM_B_HEART, SCENE_SHADOW_TEMPLE_BOSS,   0x00, 0x4F, "Bongo Bongo Heart Container",   "Shadow Temple Bongo Bongo Heart Container",    RHT_SHADOW_TEMPLE_BONGO_BONGO_HEART,    RG_HEART_CONTAINER, { Category::cSongDungeonReward }, SpoilerCollectionCheck::Collectable(0x18, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,   true);
+    // Heart Containers
+    locationTable[RC_DEKU_TREE_QUEEN_GOHMA_HEART] =                                    Location::Base(RC_DEKU_TREE_QUEEN_GOHMA_HEART,                                  RCQUEST_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_DEKU_TREE,                    ACTOR_ITEM_B_HEART,   SCENE_DEKU_TREE_BOSS,               0x00,                                              0x4F, "Queen Gohma Heart Container",                 "Deku Tree Queen Gohma Heart Container",                    RHT_DEKU_TREE_QUEEN_GOHMA_HEART,                                 RG_HEART_CONTAINER,                   { Category::cSongDungeonReward },                       SpoilerCollectionCheck::Collectable(0x11, 0x1F),                                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE,          true);
+    locationTable[RC_DODONGOS_CAVERN_KING_DODONGO_HEART] =                             Location::Base(RC_DODONGOS_CAVERN_KING_DODONGO_HEART,                           RCQUEST_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_DODONGOS_CAVERN,              ACTOR_ITEM_B_HEART,   SCENE_DODONGOS_CAVERN_BOSS,         0x00,                                              0x4F, "King Dodongo Heart Container",                "Dodongos Cavern King Dodongo Heart Container",             RHT_DODONGOS_CAVERN_KING_DODONGO_HEART,                          RG_HEART_CONTAINER,                   { Category::cSongDungeonReward },                       SpoilerCollectionCheck::Collectable(0x12, 0x1F),                                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN,    true);
+    locationTable[RC_JABU_JABUS_BELLY_BARINADE_HEART] =                                Location::Base(RC_JABU_JABUS_BELLY_BARINADE_HEART,                              RCQUEST_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_JABU_JABUS_BELLY,             ACTOR_ITEM_B_HEART,   SCENE_JABU_JABU_BOSS,               0x00,                                              0x4F, "Barinade Heart Container",                    "Jabu Jabus Belly Barinade Heart Container",                RHT_JABU_JABUS_BELLY_BARINADE_HEART,                             RG_HEART_CONTAINER,                   { Category::cSongDungeonReward },                       SpoilerCollectionCheck::Collectable(0x13, 0x1F),                                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY,    true);
+    locationTable[RC_FOREST_TEMPLE_PHANTOM_GANON_HEART] =                              Location::Base(RC_FOREST_TEMPLE_PHANTOM_GANON_HEART,                            RCQUEST_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_FOREST_TEMPLE,                ACTOR_ITEM_B_HEART,   SCENE_FOREST_TEMPLE_BOSS,           0x00,                                              0x4F, "Phantom Ganon Heart Container",               "Forest Temple Phantom Ganon Heart Container",              RHT_FOREST_TEMPLE_PHANTOM_GANON_HEART,                           RG_HEART_CONTAINER,                   { Category::cSongDungeonReward },                       SpoilerCollectionCheck::Collectable(0x14, 0x1F),                                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
+    locationTable[RC_FIRE_TEMPLE_VOLVAGIA_HEART] =                                     Location::Base(RC_FIRE_TEMPLE_VOLVAGIA_HEART,                                   RCQUEST_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_FIRE_TEMPLE,                  ACTOR_ITEM_B_HEART,   SCENE_FIRE_TEMPLE_BOSS,             0x00,                                              0x4F, "Volvagia Heart Container",                    "Fire Temple Volvagia Heart Container",                     RHT_FIRE_TEMPLE_VOLVAGIA_HEART,                                  RG_HEART_CONTAINER,                   { Category::cSongDungeonReward },                       SpoilerCollectionCheck::Collectable(0x15, 0x1F),                                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_WATER_TEMPLE_MORPHA_HEART] =                                      Location::Base(RC_WATER_TEMPLE_MORPHA_HEART,                                    RCQUEST_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_WATER_TEMPLE,                 ACTOR_ITEM_B_HEART,   SCENE_WATER_TEMPLE_BOSS,            0x00,                                              0x4F, "Morpha Heart Container",                      "Water Temple Morpha Heart Container",                      RHT_WATER_TEMPLE_MORPHA_HEART,                                   RG_HEART_CONTAINER,                   { Category::cSongDungeonReward },                       SpoilerCollectionCheck::Collectable(0x16, 0x1F),                                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
+    locationTable[RC_SPIRIT_TEMPLE_TWINROVA_HEART] =                                   Location::Base(RC_SPIRIT_TEMPLE_TWINROVA_HEART,                                 RCQUEST_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_SPIRIT_TEMPLE,                ACTOR_ITEM_B_HEART,   SCENE_SPIRIT_TEMPLE_BOSS,           0x00,                                              0x4F, "Twinrova Heart Container",                    "Spirit Temple Twinrova Heart Container",                   RHT_SPIRIT_TEMPLE_TWINROVA_HEART,                                RG_HEART_CONTAINER,                   { Category::cSongDungeonReward },                       SpoilerCollectionCheck::Collectable(0x17, 0x1F),                                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_SHADOW_TEMPLE_BONGO_BONGO_HEART] =                                Location::Base(RC_SHADOW_TEMPLE_BONGO_BONGO_HEART,                              RCQUEST_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_SHADOW_TEMPLE,                ACTOR_ITEM_B_HEART,   SCENE_SHADOW_TEMPLE_BOSS,           0x00,                                              0x4F, "Bongo Bongo Heart Container",                 "Shadow Temple Bongo Bongo Heart Container",                RHT_SHADOW_TEMPLE_BONGO_BONGO_HEART,                             RG_HEART_CONTAINER,                   { Category::cSongDungeonReward },                       SpoilerCollectionCheck::Collectable(0x18, 0x1F),                                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
 
-    // Cutscenes  Randomizer Check                                    Randomizer Check                Quest         Type             Area                          Actor ID             Scene ID                            Params Flags Short Name                 Spoiler Name                   Hint Text Key                    Vanilla Item                Categories Spoiler Collection Check            Collection Check Group                                    Vanilla Progression
-    locationTable[RC_TOT_MASTER_SWORD] =            Location::Delayed(RC_TOT_MASTER_SWORD,            RCQUEST_BOTH, RCTYPE_STANDARD, RCAREA_MARKET,                ACTOR_ID_MAX,        SCENE_ID_MAX,                       0x00, 0x00, "ToT Master Sword",         "ToT Master Sword",            RHT_TOT_MASTER_SWORD,            RG_MASTER_SWORD,            {}, SpoilerCollectionCheck::MasterSword(),     SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,         true);
-    locationTable[RC_TOT_LIGHT_ARROWS_CUTSCENE] =   Location::Delayed(RC_TOT_LIGHT_ARROWS_CUTSCENE,   RCQUEST_BOTH, RCTYPE_STANDARD, RCAREA_MARKET,                ACTOR_ID_MAX,        SCENE_ID_MAX,                       0x00, 0x01, "ToT Light Arrow Cutscene", "ToT Light Arrow Cutscene",    RHT_TOT_LIGHT_ARROWS_CUTSCENE,   RG_LIGHT_ARROWS,            {}, SpoilerCollectionCheck::Chest(0x43, 0x1E), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,         true);
-    locationTable[RC_LW_GIFT_FROM_SARIA] =          Location::Delayed(RC_LW_GIFT_FROM_SARIA,          RCQUEST_BOTH, RCTYPE_OCARINA,  RCAREA_LOST_WOODS,            ACTOR_ID_MAX,        SCENE_LOST_WOODS,                   0x00, 0x02, "Gift From Saria",          "LW Gift From Saria",          RHT_LW_GIFT_FROM_SARIA,          RG_PROGRESSIVE_OCARINA,     {}, SpoilerCollectionCheck::EventChkInf(0xC1), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,            true);
-    locationTable[RC_ZF_GREAT_FAIRY_REWARD] =       Location::Delayed(RC_ZF_GREAT_FAIRY_REWARD,       RCQUEST_BOTH, RCTYPE_STANDARD, RCAREA_ZORAS_FOUNTAIN,        ACTOR_BG_DY_YOSEIZO, SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 1,    0x10, "Great Fairy Reward",       "ZF Great Fairy Reward",       RHT_ZF_GREAT_FAIRY_REWARD,       RG_FARORES_WIND,            {}, SpoilerCollectionCheck::Chest(0x3D, 0x01), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,          true);
-    locationTable[RC_HC_GREAT_FAIRY_REWARD] =       Location::Delayed(RC_HC_GREAT_FAIRY_REWARD,       RCQUEST_BOTH, RCTYPE_STANDARD, RCAREA_HYRULE_CASTLE,         ACTOR_BG_DY_YOSEIZO, SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 2,    0x11, "Great Fairy Reward",       "HC Great Fairy Reward",       RHT_HC_GREAT_FAIRY_REWARD,       RG_DINS_FIRE,               {}, SpoilerCollectionCheck::Chest(0x3D, 0x02), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,         true);
-    locationTable[RC_COLOSSUS_GREAT_FAIRY_REWARD] = Location::Delayed(RC_COLOSSUS_GREAT_FAIRY_REWARD, RCQUEST_BOTH, RCTYPE_STANDARD, RCAREA_DESERT_COLOSSUS,       ACTOR_BG_DY_YOSEIZO, SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 3,    0x12, "Great Fairy Reward",       "Colossus Great Fairy Reward", RHT_COLOSSUS_GREAT_FAIRY_REWARD, RG_NAYRUS_LOVE,             {}, SpoilerCollectionCheck::Chest(0x3D, 0x03), SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,         true);
-    locationTable[RC_DMT_GREAT_FAIRY_REWARD] =      Location::Delayed(RC_DMT_GREAT_FAIRY_REWARD,      RCQUEST_BOTH, RCTYPE_STANDARD, RCAREA_DEATH_MOUNTAIN_TRAIL,  ACTOR_BG_DY_YOSEIZO, SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC,  1,    0x13, "Great Fairy Reward",       "DMT Great Fairy Reward",      RHT_DMT_GREAT_FAIRY_REWARD,      RG_PROGRESSIVE_MAGIC_METER, {}, SpoilerCollectionCheck::Chest(0x3B, 0x01), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,        true);
-    locationTable[RC_DMC_GREAT_FAIRY_REWARD] =      Location::Delayed(RC_DMC_GREAT_FAIRY_REWARD,      RCQUEST_BOTH, RCTYPE_STANDARD, RCAREA_DEATH_MOUNTAIN_CRATER, ACTOR_BG_DY_YOSEIZO, SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC,  2,    0x14, "Great Fairy Reward",       "DMC Great Fairy Reward",      RHT_DMC_GREAT_FAIRY_REWARD,      RG_PROGRESSIVE_MAGIC_METER, {}, SpoilerCollectionCheck::Chest(0x3B, 0x02), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,        true);
-    locationTable[RC_OGC_GREAT_FAIRY_REWARD] =      Location::Delayed(RC_OGC_GREAT_FAIRY_REWARD,      RCQUEST_BOTH, RCTYPE_STANDARD, RCAREA_HYRULE_CASTLE,         ACTOR_BG_DY_YOSEIZO, SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC,  3,    0x15, "OGC Great Fairy Reward",   "OGC Great Fairy Reward",      RHT_OGC_GREAT_FAIRY_REWARD,      RG_DOUBLE_DEFENSE,          {}, SpoilerCollectionCheck::Chest(0x3B, 0x03), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE, true);
+    // Cutscenes
+    locationTable[RC_TOT_MASTER_SWORD] =                                            Location::Delayed(RC_TOT_MASTER_SWORD,                                             RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x00, "ToT Master Sword",                            "ToT Master Sword",                                         RHT_TOT_MASTER_SWORD,                                            RG_MASTER_SWORD,                      {},                                                     SpoilerCollectionCheck::EventChkInf(0x45),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
+    locationTable[RC_TOT_LIGHT_ARROWS_CUTSCENE] =                                   Location::Delayed(RC_TOT_LIGHT_ARROWS_CUTSCENE,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x01, "ToT Light Arrow Cutscene",                    "ToT Light Arrow Cutscene",                                 RHT_TOT_LIGHT_ARROWS_CUTSCENE,                                   RG_LIGHT_ARROWS,                      {},                                                     SpoilerCollectionCheck::EventChkInf(0xC4),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
+    locationTable[RC_LW_GIFT_FROM_SARIA] =                                          Location::Delayed(RC_LW_GIFT_FROM_SARIA,                                           RCQUEST_BOTH,    RCTYPE_OCARINA,                     RCAREA_LOST_WOODS,                   ACTOR_ID_MAX,         SCENE_LOST_WOODS,                   0x00,                                              0x02, "Gift From Saria",                             "LW Gift From Saria",                                       RHT_LW_GIFT_FROM_SARIA,                                          RG_PROGRESSIVE_OCARINA,               {},                                                     SpoilerCollectionCheck::EventChkInf(0xC1),                                                                                    SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
+    locationTable[RC_ZF_GREAT_FAIRY_REWARD] =                                       Location::Delayed(RC_ZF_GREAT_FAIRY_REWARD,                                        RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_FOUNTAIN,               ACTOR_BG_DY_YOSEIZO,  SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 1,                                                 0x10, "Great Fairy Reward",                          "ZF Great Fairy Reward",                                    RHT_ZF_GREAT_FAIRY_REWARD,                                       RG_FARORES_WIND,                      {},                                                     SpoilerCollectionCheck::Chest(0x3D, 0x01),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,               true);
+    locationTable[RC_HC_GREAT_FAIRY_REWARD] =                                       Location::Delayed(RC_HC_GREAT_FAIRY_REWARD,                                        RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_CASTLE,                ACTOR_BG_DY_YOSEIZO,  SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 2,                                                 0x11, "Great Fairy Reward",                          "HC Great Fairy Reward",                                    RHT_HC_GREAT_FAIRY_REWARD,                                       RG_DINS_FIRE,                         {},                                                     SpoilerCollectionCheck::Chest(0x3D, 0x02),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
+    locationTable[RC_COLOSSUS_GREAT_FAIRY_REWARD] =                                 Location::Delayed(RC_COLOSSUS_GREAT_FAIRY_REWARD,                                  RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DESERT_COLOSSUS,              ACTOR_BG_DY_YOSEIZO,  SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 3,                                                 0x12, "Great Fairy Reward",                          "Colossus Great Fairy Reward",                              RHT_COLOSSUS_GREAT_FAIRY_REWARD,                                 RG_NAYRUS_LOVE,                       {},                                                     SpoilerCollectionCheck::Chest(0x3D, 0x03),                                                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
+    locationTable[RC_DMT_GREAT_FAIRY_REWARD] =                                      Location::Delayed(RC_DMT_GREAT_FAIRY_REWARD,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_BG_DY_YOSEIZO,  SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC,  1,                                                 0x13, "Great Fairy Reward",                          "DMT Great Fairy Reward",                                   RHT_DMT_GREAT_FAIRY_REWARD,                                      RG_PROGRESSIVE_MAGIC_METER,           {},                                                     SpoilerCollectionCheck::Chest(0x3B, 0x01),                                                                                    SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,             true);
+    locationTable[RC_DMC_GREAT_FAIRY_REWARD] =                                      Location::Delayed(RC_DMC_GREAT_FAIRY_REWARD,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_BG_DY_YOSEIZO,  SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC,  2,                                                 0x14, "Great Fairy Reward",                          "DMC Great Fairy Reward",                                   RHT_DMC_GREAT_FAIRY_REWARD,                                      RG_PROGRESSIVE_MAGIC_METER,           {},                                                     SpoilerCollectionCheck::Chest(0x3B, 0x02),                                                                                    SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,             true);
+    locationTable[RC_OGC_GREAT_FAIRY_REWARD] =                                      Location::Delayed(RC_OGC_GREAT_FAIRY_REWARD,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_CASTLE,                ACTOR_BG_DY_YOSEIZO,  SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC,  3,                                                 0x15, "OGC Great Fairy Reward",                      "OGC Great Fairy Reward",                                   RHT_OGC_GREAT_FAIRY_REWARD,                                      RG_DOUBLE_DEFENSE,                    {},                                                     SpoilerCollectionCheck::Chest(0x3B, 0x03),                                                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE,      true);
 
-    // Songs      Randomizer Check                                     Randomizer Check                 Quest         Type                  Area                          Actor ID      Scene ID                    Params Flags Short Name                  Spoiler Name                 Hint Text Key                     Vanilla Item           Categories                                         Spoiler Collection Check                   Collection Check Group                                 Vanilla Progression
-    locationTable[RC_SHEIK_IN_FOREST] =              Location::Delayed(RC_SHEIK_IN_FOREST,              RCQUEST_BOTH, RCTYPE_SONG_LOCATION, RCAREA_SACRED_FOREST_MEADOW,  ACTOR_ID_MAX, SCENE_SACRED_FOREST_MEADOW, 0x00, 0x20, "Sheik in Forest",           "Sheik in Forest",           RHT_SHEIK_IN_FOREST,              RG_MINUET_OF_FOREST,   { Category::cSong },                               SpoilerCollectionCheck::EventChkInf(0x50), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,         true);
-    locationTable[RC_SHEIK_IN_CRATER] =              Location::Delayed(RC_SHEIK_IN_CRATER,              RCQUEST_BOTH, RCTYPE_SONG_LOCATION, RCAREA_DEATH_MOUNTAIN_CRATER, ACTOR_ID_MAX, SCENE_ID_MAX,               0x00, 0x21, "Sheik in Crater",           "Sheik in Crater",           RHT_SHEIK_IN_CRATER,              RG_BOLERO_OF_FIRE,     { Category::cSong },                               SpoilerCollectionCheck::EventChkInf(0x51), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,     true);
-    locationTable[RC_SHEIK_IN_ICE_CAVERN] =          Location::Delayed(RC_SHEIK_IN_ICE_CAVERN,          RCQUEST_BOTH, RCTYPE_SONG_LOCATION, RCAREA_ICE_CAVERN,            ACTOR_ID_MAX, SCENE_ICE_CAVERN,           0x00, 0x22, "Sheik in Ice Cavern",       "Sheik in Ice Cavern",       RHT_SHEIK_IN_ICE_CAVERN,          RG_SERENADE_OF_WATER,  { Category::cSong, Category::cSongDungeonReward }, SpoilerCollectionCheck::EventChkInf(0x52), SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN, true);
-    locationTable[RC_SHEIK_AT_COLOSSUS] =            Location::Delayed(RC_SHEIK_AT_COLOSSUS,            RCQUEST_BOTH, RCTYPE_SONG_LOCATION, RCAREA_DESERT_COLOSSUS,       ACTOR_ID_MAX, SCENE_DESERT_COLOSSUS,      0x00, 0x23, "Sheik at Colossus",         "Sheik at Colossus",         RHT_SHEIK_AT_COLOSSUS,            RG_REQUIEM_OF_SPIRIT,  { Category::cSong },                               SpoilerCollectionCheck::EventChkInf(0xAC), SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,      true);
-    locationTable[RC_SHEIK_IN_KAKARIKO] =            Location::Delayed(RC_SHEIK_IN_KAKARIKO,            RCQUEST_BOTH, RCTYPE_SONG_LOCATION, RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX, SCENE_ID_MAX,               0x00, 0x24, "Sheik in Kakariko",         "Sheik in Kakariko",         RHT_SHEIK_IN_KAKARIKO,            RG_NOCTURNE_OF_SHADOW, { Category::cSong },                               SpoilerCollectionCheck::EventChkInf(0xAA), SpoilerCollectionCheckGroup::GROUP_KAKARIKO,           true);
-    locationTable[RC_SHEIK_AT_TEMPLE] =              Location::Delayed(RC_SHEIK_AT_TEMPLE,              RCQUEST_BOTH, RCTYPE_SONG_LOCATION, RCAREA_MARKET,                ACTOR_ID_MAX, SCENE_ID_MAX,               0x00, 0x25, "Sheik at Temple",           "Sheik at Temple",           RHT_SHEIK_AT_TEMPLE,              RG_PRELUDE_OF_LIGHT,   { Category::cSong },                               SpoilerCollectionCheck::Chest(0x43, 0x1F), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,      true);
-    locationTable[RC_SONG_FROM_IMPA] =               Location::Delayed(RC_SONG_FROM_IMPA,               RCQUEST_BOTH, RCTYPE_SONG_LOCATION, RCAREA_HYRULE_CASTLE,         ACTOR_ID_MAX, SCENE_ID_MAX,               0x00, 0x26, "Song from Impa",            "Song from Impa",            RHT_SONG_FROM_IMPA,               RG_ZELDAS_LULLABY,     { Category::cSong, Category::cSongDungeonReward }, SpoilerCollectionCheck::EventChkInf(0x59), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,      true);
-    locationTable[RC_SONG_FROM_MALON] =              Location::Delayed(RC_SONG_FROM_MALON,              RCQUEST_BOTH, RCTYPE_SONG_LOCATION, RCAREA_LON_LON_RANCH,         ACTOR_ID_MAX, SCENE_ID_MAX,               0x00, 0x27, "Song from Malon",           "Song from Malon",           RHT_SONG_FROM_MALON,              RG_EPONAS_SONG,        { Category::cSong },                               SpoilerCollectionCheck::Chest(0x63, 0x1F), SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH,      true);
-    locationTable[RC_SONG_FROM_SARIA] =              Location::Delayed(RC_SONG_FROM_SARIA,              RCQUEST_BOTH, RCTYPE_SONG_LOCATION, RCAREA_SACRED_FOREST_MEADOW,  ACTOR_ID_MAX, SCENE_SACRED_FOREST_MEADOW, 0x00, 0x28, "Song from Saria",           "Song from Saria",           RHT_SONG_FROM_SARIA,              RG_SARIAS_SONG,        { Category::cSong },                               SpoilerCollectionCheck::Chest(0x56, 0x1F), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,         true);
-    locationTable[RC_SONG_FROM_ROYAL_FAMILYS_TOMB] = Location::Delayed(RC_SONG_FROM_ROYAL_FAMILYS_TOMB, RCQUEST_BOTH, RCTYPE_SONG_LOCATION, RCAREA_GRAVEYARD,             ACTOR_ID_MAX, SCENE_ID_MAX,               0x00, 0x29, "Song from Composers Grave", "Song from Composers Grave", RHT_SONG_FROM_ROYAL_FAMILYS_TOMB, RG_SUNS_SONG,          { Category::cSong },                               SpoilerCollectionCheck::Chest(0x41, 0x1F), SpoilerCollectionCheckGroup::GROUP_KAKARIKO,           true);
-    locationTable[RC_SONG_FROM_OCARINA_OF_TIME] =    Location::Delayed(RC_SONG_FROM_OCARINA_OF_TIME,    RCQUEST_BOTH, RCTYPE_SONG_LOCATION, RCAREA_HYRULE_FIELD,          ACTOR_ID_MAX, SCENE_ID_MAX,               0x00, 0x2A, "Song from Ocarina of Time", "Song from Ocarina of Time", RHT_SONG_FROM_OCARINA_OF_TIME,    RG_SONG_OF_TIME,       { Category::cSong },                               SpoilerCollectionCheck::Chest(0x51, 0x1F), SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD,       true);
-    locationTable[RC_SONG_FROM_WINDMILL] =           Location::Delayed(RC_SONG_FROM_WINDMILL,           RCQUEST_BOTH, RCTYPE_SONG_LOCATION, RCAREA_KAKARIKO_VILLAGE,      ACTOR_ID_MAX, SCENE_ID_MAX,               0x00, 0x2B, "Song from Windmill",        "Song from Windmill",        RHT_SONG_FROM_WINDMILL,           RG_SONG_OF_STORMS,     { Category::cSong },                               SpoilerCollectionCheck::EventChkInf(0x5B), SpoilerCollectionCheckGroup::GROUP_KAKARIKO,           true);
+    // Songs
+    locationTable[RC_SHEIK_IN_FOREST] =                                             Location::Delayed(RC_SHEIK_IN_FOREST,                                              RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_SACRED_FOREST_MEADOW,         ACTOR_ID_MAX,         SCENE_SACRED_FOREST_MEADOW,         0x00,                                              0x20, "Sheik in Forest",                             "Sheik in Forest",                                          RHT_SHEIK_IN_FOREST,                                             RG_MINUET_OF_FOREST,                  { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(0x50),                                                                                    SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
+    locationTable[RC_SHEIK_IN_CRATER] =                                             Location::Delayed(RC_SHEIK_IN_CRATER,                                              RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x21, "Sheik in Crater",                             "Sheik in Crater",                                          RHT_SHEIK_IN_CRATER,                                             RG_BOLERO_OF_FIRE,                    { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(0x51),                                                                                    SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,             true);
+    locationTable[RC_SHEIK_IN_ICE_CAVERN] =                                         Location::Delayed(RC_SHEIK_IN_ICE_CAVERN,                                          RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_ICE_CAVERN,                   ACTOR_ID_MAX,         SCENE_ICE_CAVERN,                   0x00,                                              0x22, "Sheik in Ice Cavern",                         "Sheik in Ice Cavern",                                      RHT_SHEIK_IN_ICE_CAVERN,                                         RG_SERENADE_OF_WATER,                 { Category::cSong, Category::cSongDungeonReward },      SpoilerCollectionCheck::EventChkInf(0x52),                                                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN,         true);
+    locationTable[RC_SHEIK_AT_COLOSSUS] =                                           Location::Delayed(RC_SHEIK_AT_COLOSSUS,                                            RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_DESERT_COLOSSUS,              ACTOR_ID_MAX,         SCENE_DESERT_COLOSSUS,              0x00,                                              0x23, "Sheik at Colossus",                           "Sheik at Colossus",                                        RHT_SHEIK_AT_COLOSSUS,                                           RG_REQUIEM_OF_SPIRIT,                 { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(0xAC),                                                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
+    locationTable[RC_SHEIK_IN_KAKARIKO] =                                           Location::Delayed(RC_SHEIK_IN_KAKARIKO,                                            RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x24, "Sheik in Kakariko",                           "Sheik in Kakariko",                                        RHT_SHEIK_IN_KAKARIKO,                                           RG_NOCTURNE_OF_SHADOW,                { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(0xAA),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
+    locationTable[RC_SHEIK_AT_TEMPLE] =                                             Location::Delayed(RC_SHEIK_AT_TEMPLE,                                              RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x25, "Sheik at Temple",                             "Sheik at Temple",                                          RHT_SHEIK_AT_TEMPLE,                                             RG_PRELUDE_OF_LIGHT,                  { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(0x55),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
+    locationTable[RC_SONG_FROM_IMPA] =                                              Location::Delayed(RC_SONG_FROM_IMPA,                                               RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_HYRULE_CASTLE,                ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x26, "Song from Impa",                              "Song from Impa",                                           RHT_SONG_FROM_IMPA,                                              RG_ZELDAS_LULLABY,                    { Category::cSong, Category::cSongDungeonReward },      SpoilerCollectionCheck::EventChkInf(0x59),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
+    locationTable[RC_SONG_FROM_MALON] =                                             Location::Delayed(RC_SONG_FROM_MALON,                                              RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_LON_LON_RANCH,                ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x27, "Song from Malon",                             "Song from Malon",                                          RHT_SONG_FROM_MALON,                                             RG_EPONAS_SONG,                       { Category::cSong },                                    SpoilerCollectionCheck::RandomizerInf(RAND_INF_LEARNED_EPONA_SONG),                                                           SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH,              true);
+    locationTable[RC_SONG_FROM_SARIA] =                                             Location::Delayed(RC_SONG_FROM_SARIA,                                              RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_SACRED_FOREST_MEADOW,         ACTOR_ID_MAX,         SCENE_SACRED_FOREST_MEADOW,         0x00,                                              0x28, "Song from Saria",                             "Song from Saria",                                          RHT_SONG_FROM_SARIA,                                             RG_SARIAS_SONG,                       { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(0x57),                                                                                    SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
+    locationTable[RC_SONG_FROM_ROYAL_FAMILYS_TOMB] =                                Location::Delayed(RC_SONG_FROM_ROYAL_FAMILYS_TOMB,                                 RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_GRAVEYARD,                    ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x29, "Song from Composers Grave",                   "Song from Composers Grave",                                RHT_SONG_FROM_ROYAL_FAMILYS_TOMB,                                RG_SUNS_SONG,                         { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(0x00),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
+    locationTable[RC_SONG_FROM_OCARINA_OF_TIME] =                                   Location::Delayed(RC_SONG_FROM_OCARINA_OF_TIME,                                    RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_HYRULE_FIELD,                 ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x2A, "Song from Ocarina of Time",                   "Song from Ocarina of Time",                                RHT_SONG_FROM_OCARINA_OF_TIME,                                   RG_SONG_OF_TIME,                      { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(0xA9),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD,               true);
+    locationTable[RC_SONG_FROM_WINDMILL] =                                          Location::Delayed(RC_SONG_FROM_WINDMILL,                                           RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x2B, "Song from Windmill",                          "Song from Windmill",                                       RHT_SONG_FROM_WINDMILL,                                          RG_SONG_OF_STORMS,                    { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(0x5B),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
 
-    //Beehives    Randomizer Check                                            Randomizer Check                           Quest         Type            Area                         Actor ID        Scene ID             Params                        Flags Short Name                             Spoiler Name                              Hint Text Key                               Vanilla Item   Categories            Spoiler Collection Check                     Collection Check Group                             Vanilla Progression
-    locationTable[RC_KF_STORMS_GROTTO_BEEHIVE_LEFT]          = Location::Base(RC_KF_STORMS_GROTTO_BEEHIVE_LEFT,          RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_KOKIRI_FOREST,         ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(-144, 0x2C), 0x00, "Storms Grotto Beehive Left",          "KF Storms Grotto Beehive Left",          RHT_BEEHIVE_CHEST_GROTTO,           RG_BLUE_RUPEE, {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST,  false);
-    locationTable[RC_KF_STORMS_GROTTO_BEEHIVE_RIGHT]         = Location::Base(RC_KF_STORMS_GROTTO_BEEHIVE_RIGHT,         RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_KOKIRI_FOREST,         ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(121,  0x2C), 0x00, "Storms Grotto Beehive Right",         "KF Storms Grotto Beehive Right",         RHT_BEEHIVE_CHEST_GROTTO,           RG_RED_RUPEE,  {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST,  false);
-    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_LEFT]  = Location::Base(RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_LEFT,  RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_LOST_WOODS,            ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(-144, 0x14), 0x00, "Near Shortcuts Grotto Beehive Left",  "LW Near Shortcuts Grotto Beehive Left",  RHT_BEEHIVE_CHEST_GROTTO,           RG_BLUE_RUPEE, {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,     false);
-    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_RIGHT] = Location::Base(RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_RIGHT, RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_LOST_WOODS,            ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(121,  0x14), 0x00, "Near Shortcuts Grotto Beehive Right", "LW Near Shortcuts Grotto Beehive Right", RHT_BEEHIVE_CHEST_GROTTO,           RG_RED_RUPEE,  {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,     false);
-    locationTable[RC_LW_DEKU_SCRUB_GROTTO_BEEHIVE]           = Location::Base(RC_LW_DEKU_SCRUB_GROTTO_BEEHIVE,           RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_LOST_WOODS,            ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(747,  0xF5), 0x00, "Deku Scrub Grotto Beehive",           "LW Deku Scrub Grotto Beehive",           RHT_BEEHIVE_SCRUB_PAIR_GROTTO,      RG_RED_RUPEE,  {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,     false);
-    locationTable[RC_SFM_STORMS_GROTTO_BEEHIVE]              = Location::Base(RC_SFM_STORMS_GROTTO_BEEHIVE,              RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_SACRED_FOREST_MEADOW,  ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(2262, 0xEE), 0x00, "Storms Grotto Beehive",               "SFM Storms Grotto Beehive",              RHT_BEEHIVE_SCRUB_PAIR_GROTTO,      RG_RED_RUPEE,  {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,     false);
-    locationTable[RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_LEFT]     = Location::Base(RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_LEFT,     RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_HYRULE_FIELD,          ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(-144, 0x00), 0x00, "Near Market Grotto Beehive Left",     "HF Near Market Grotto Beehive Left",     RHT_BEEHIVE_CHEST_GROTTO,           RG_BLUE_RUPEE, {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD,   false);
-    locationTable[RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_RIGHT]    = Location::Base(RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_RIGHT,    RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_HYRULE_FIELD,          ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(121,  0x00), 0x00, "Near Market Grotto Beehive Right",    "HF Near Market Grotto Beehive Right",    RHT_BEEHIVE_CHEST_GROTTO,           RG_RED_RUPEE,  {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD,   false);
-    locationTable[RC_HF_OPEN_GROTTO_BEEHIVE_LEFT]            = Location::Base(RC_HF_OPEN_GROTTO_BEEHIVE_LEFT,            RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_HYRULE_FIELD,          ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(-144, 0x03), 0x00, "Open Grotto Beehive Left",            "HF Open Grotto Beehive Left",            RHT_BEEHIVE_CHEST_GROTTO,           RG_BLUE_RUPEE, {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD,   false);
-    locationTable[RC_HF_OPEN_GROTTO_BEEHIVE_RIGHT]           = Location::Base(RC_HF_OPEN_GROTTO_BEEHIVE_RIGHT,           RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_HYRULE_FIELD,          ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(121,  0x03), 0x00, "Open Grotto Beehive Right",           "HF Open Grotto Beehive Right",           RHT_BEEHIVE_CHEST_GROTTO,           RG_RED_RUPEE,  {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD,   false);
-    locationTable[RC_HF_SOUTHEAST_GROTTO_BEEHIVE_LEFT]       = Location::Base(RC_HF_SOUTHEAST_GROTTO_BEEHIVE_LEFT,       RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_HYRULE_FIELD,          ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(-144, 0x22), 0x00, "Southeast Grotto Beehive Left",       "HF Southeast Grotto Beehive Left",       RHT_BEEHIVE_CHEST_GROTTO,           RG_BLUE_RUPEE, {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD,   false);
-    locationTable[RC_HF_SOUTHEAST_GROTTO_BEEHIVE_RIGHT]      = Location::Base(RC_HF_SOUTHEAST_GROTTO_BEEHIVE_RIGHT,      RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_HYRULE_FIELD,          ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(121,  0x22), 0x00, "Southeast Grotto Beehive Right",      "HF Southeast Grotto Beehive Right",      RHT_BEEHIVE_CHEST_GROTTO,           RG_RED_RUPEE,  {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD,   false);
-    locationTable[RC_HF_INSIDE_FENCE_GROTTO_BEEHIVE]         = Location::Base(RC_HF_INSIDE_FENCE_GROTTO_BEEHIVE,         RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_HYRULE_FIELD,          ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(1410, 0xE6), 0x00, "Inside Fence Grotto Beehive",         "HF Inside Fence Grotto Beehive",         RHT_BEEHIVE_LONELY_SCRUB_GROTTO,    RG_RED_RUPEE,  {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD,   false);
-    locationTable[RC_LLR_GROTTO_BEEHIVE]                     = Location::Base(RC_LLR_GROTTO_BEEHIVE,                     RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_LON_LON_RANCH,         ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(5144, 0xFC), 0x00, "Grotto Beehive",                      "LLR Grotto Beehive",                     RHT_BEEHIVE_SCRUB_TRIO_GROTTO,      RG_RED_RUPEE,  {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH,  false);
-    locationTable[RC_KAK_OPEN_GROTTO_BEEHIVE_LEFT]           = Location::Base(RC_KAK_OPEN_GROTTO_BEEHIVE_LEFT,           RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_KAKARIKO_VILLAGE,      ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(-144, 0x28), 0x00, "Open Grotto Beehive Left",            "Kak Open Grotto Beehive Left",           RHT_BEEHIVE_CHEST_GROTTO,           RG_BLUE_RUPEE, {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       false);
-    locationTable[RC_KAK_OPEN_GROTTO_BEEHIVE_RIGHT]          = Location::Base(RC_KAK_OPEN_GROTTO_BEEHIVE_RIGHT,          RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_KAKARIKO_VILLAGE,      ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(121,  0x28), 0x00, "Open Grotto Beehive Right",           "Kak Open Grotto Beehive Right",          RHT_BEEHIVE_CHEST_GROTTO,           RG_RED_RUPEE,  {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_KAKARIKO,       false);
-    locationTable[RC_DMT_COW_GROTTO_BEEHIVE]                 = Location::Base(RC_DMT_COW_GROTTO_BEEHIVE,                 RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_DEATH_MOUNTAIN_TRAIL,  ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(2617, 0xF8), 0x00, "Cow Grotto Beehive",                  "DMT Cow Grotto Beehive",                 RHT_BEEHIVE_COW_GROTTO,             RG_RED_RUPEE,  {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN, false);
-    locationTable[RC_DMT_STORMS_GROTTO_BEEHIVE_LEFT]         = Location::Base(RC_DMT_STORMS_GROTTO_BEEHIVE_LEFT,         RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_DEATH_MOUNTAIN_TRAIL,  ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(-144, 0x57), 0x00, "Storms Grotto Beehive Left",          "DMT Storms Grotto Beehive Left",         RHT_BEEHIVE_CHEST_GROTTO,           RG_BLUE_RUPEE, {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN, false);
-    locationTable[RC_DMT_STORMS_GROTTO_BEEHIVE_RIGHT]        = Location::Base(RC_DMT_STORMS_GROTTO_BEEHIVE_RIGHT,        RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_DEATH_MOUNTAIN_TRAIL,  ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(121,  0x57), 0x00, "Storms Grotto Beehive Right",         "DMT Storms Grotto Beehive Right",        RHT_BEEHIVE_CHEST_GROTTO,           RG_RED_RUPEE,  {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN, false);
-    locationTable[RC_GC_GROTTO_BEEHIVE]                      = Location::Base(RC_GC_GROTTO_BEEHIVE,                      RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_GORON_CITY,            ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(5144, 0xFB), 0x00, "Grotto Beehive",                      "GC Grotto Beehive",                      RHT_BEEHIVE_SCRUB_TRIO_GROTTO,      RG_RED_RUPEE,  {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_GORON_CITY,     false);
-    locationTable[RC_DMC_UPPER_GROTTO_BEEHIVE_LEFT]          = Location::Base(RC_DMC_UPPER_GROTTO_BEEHIVE_LEFT,          RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_DEATH_MOUNTAIN_CRATER, ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(-144, 0x7A), 0x00, "Upper Grotto Beehive Left",           "DMC Upper Grotto Beehive Left",          RHT_BEEHIVE_CHEST_GROTTO,           RG_BLUE_RUPEE, {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN, false);
-    locationTable[RC_DMC_UPPER_GROTTO_BEEHIVE_RIGHT]         = Location::Base(RC_DMC_UPPER_GROTTO_BEEHIVE_RIGHT,         RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_DEATH_MOUNTAIN_CRATER, ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(121,  0x7A), 0x00, "Upper Grotto Beehive Right",          "DMC Upper Grotto Beehive Right",         RHT_BEEHIVE_CHEST_GROTTO,           RG_RED_RUPEE,  {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN, false);
-    locationTable[RC_DMC_HAMMER_GROTTO_BEEHIVE]              = Location::Base(RC_DMC_HAMMER_GROTTO_BEEHIVE,              RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_DEATH_MOUNTAIN_CRATER, ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(5144, 0xF9), 0x00, "Hammer Grotto Beehive",               "DMC Hammer Grotto Beehive",              RHT_BEEHIVE_SCRUB_TRIO_GROTTO,      RG_RED_RUPEE,  {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN, false);
-    locationTable[RC_ZR_OPEN_GROTTO_BEEHIVE_LEFT]            = Location::Base(RC_ZR_OPEN_GROTTO_BEEHIVE_LEFT,            RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_ZORAS_RIVER,           ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(-144, 0x29), 0x00, "Open Grotto Beehive Left",            "ZR Open Grotto Beehive Left",            RHT_BEEHIVE_CHEST_GROTTO,           RG_BLUE_RUPEE, {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,    false);
-    locationTable[RC_ZR_OPEN_GROTTO_BEEHIVE_RIGHT]           = Location::Base(RC_ZR_OPEN_GROTTO_BEEHIVE_RIGHT,           RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_ZORAS_RIVER,           ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(121,  0x29), 0x00, "Open Grotto Beehive Right",           "ZR Open Grotto Beehive Right",           RHT_BEEHIVE_CHEST_GROTTO,           RG_RED_RUPEE,  {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,    false);
-    locationTable[RC_ZR_STORMS_GROTTO_BEEHIVE]               = Location::Base(RC_ZR_STORMS_GROTTO_BEEHIVE,               RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_ZORAS_RIVER,           ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(2262, 0xEB), 0x00, "Storms Grotto Beehive",               "ZR Storms Grotto Beehive",               RHT_BEEHIVE_SCRUB_PAIR_GROTTO,      RG_RED_RUPEE,  {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,    false);
-    locationTable[RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_LEFT]  = Location::Base(RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_LEFT,  RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_ZORAS_DOMAIN,          ACTOR_OBJ_COMB, SCENE_ZORAS_DOMAIN, TWO_ACTOR_PARAMS(382,  0x00), 0x00, "In Front of King Zora Beehive Left",  "ZD In Front of King Zora Beehive Left",  RHT_BEEHIVE_IN_FRONT_OF_KING_ZORA,  RG_BLUE_RUPEE, {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,   false);
-    locationTable[RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_RIGHT] = Location::Base(RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_RIGHT, RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_ZORAS_DOMAIN,          ACTOR_OBJ_COMB, SCENE_ZORAS_DOMAIN, TWO_ACTOR_PARAMS(948,  0x00), 0x00, "In Front of King Zora Beehive Right", "ZD In Front of King Zora Beehive Right", RHT_BEEHIVE_IN_FRONT_OF_KING_ZORA,  RG_RED_RUPEE,  {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,   false);
-    locationTable[RC_ZD_BEHIND_KING_ZORA_BEEHIVE]            = Location::Base(RC_ZD_BEHIND_KING_ZORA_BEEHIVE,            RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_ZORAS_DOMAIN,          ACTOR_OBJ_COMB, SCENE_ZORAS_DOMAIN, TWO_ACTOR_PARAMS(701,  0x00), 0x00, "Behind King Zora Beehive",            "ZD Behind King Zora Beehive",            RHT_BEEHIVE_BEHIND_KING_ZORA,       RG_RED_RUPEE,  {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,   false);
-    locationTable[RC_LH_GROTTO_BEEHIVE]                      = Location::Base(RC_LH_GROTTO_BEEHIVE,                      RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_LAKE_HYLIA,            ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(5144, 0xEF), 0x00, "Grotto Beehive",                      "LH Grotto Beehive",                      RHT_BEEHIVE_SCRUB_TRIO_GROTTO,      RG_RED_RUPEE,  {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,     false);
-    locationTable[RC_GV_DEKU_SCRUB_GROTTO_BEEHIVE]           = Location::Base(RC_GV_DEKU_SCRUB_GROTTO_BEEHIVE,           RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_GERUDO_VALLEY,         ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(2262, 0xF0), 0x00, "Deku Scrub Grotto Beehive",           "GV Deku Scrub Grotto Beehive",           RHT_BEEHIVE_SCRUB_PAIR_GROTTO,      RG_RED_RUPEE,  {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  false);
-    locationTable[RC_COLOSSUS_GROTTO_BEEHIVE]                = Location::Base(RC_COLOSSUS_GROTTO_BEEHIVE,                RCQUEST_BOTH, RCTYPE_BEEHIVE, RCAREA_DESERT_COLOSSUS,       ACTOR_OBJ_COMB, SCENE_GROTTOS,      TWO_ACTOR_PARAMS(2262, 0xFD), 0x00, "Grotto Beehive",                      "Colossus Grotto Beehive",                RHT_BEEHIVE_SCRUB_PAIR_GROTTO,      RG_RED_RUPEE,  {Category::cBeehive}, SpoilerCollectionCheck::RandomizerInf(0, 0), SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,  false);
+    //Beehives
+    locationTable[RC_KF_STORMS_GROTTO_BEEHIVE_LEFT] =                                  Location::Base(RC_KF_STORMS_GROTTO_BEEHIVE_LEFT,                                RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_KOKIRI_FOREST,                ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x2C),                      0x00, "Storms Grotto Beehive Left",                  "KF Storms Grotto Beehive Left",                            RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                        { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_KF_STORMS_GROTTO_LEFT),                                                SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_STORMS_GROTTO_BEEHIVE_RIGHT] =                                 Location::Base(RC_KF_STORMS_GROTTO_BEEHIVE_RIGHT,                               RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_KOKIRI_FOREST,                ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x2C),                      0x00, "Storms Grotto Beehive Right",                 "KF Storms Grotto Beehive Right",                           RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_KF_STORMS_GROTTO_RIGHT),                                               SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_LEFT] =                          Location::Base(RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_LEFT,                        RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_LOST_WOODS,                   ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x14),                      0x00, "Near Shortcuts Grotto Beehive Left",          "LW Near Shortcuts Grotto Beehive Left",                    RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                        { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_LW_NEAR_SHORTCUTS_GROTTO_LEFT),                                        SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_RIGHT] =                         Location::Base(RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_RIGHT,                       RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_LOST_WOODS,                   ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x14),                      0x00, "Near Shortcuts Grotto Beehive Right",         "LW Near Shortcuts Grotto Beehive Right",                   RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_LW_NEAR_SHORTCUTS_GROTTO_RIGHT),                                       SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_LW_DEKU_SCRUB_GROTTO_BEEHIVE] =                                   Location::Base(RC_LW_DEKU_SCRUB_GROTTO_BEEHIVE,                                 RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_LOST_WOODS,                   ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(747,  0xF5),                      0x00, "Deku Scrub Grotto Beehive",                   "LW Deku Scrub Grotto Beehive",                             RHT_BEEHIVE_SCRUB_PAIR_GROTTO,                                   RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_LW_DEKU_SCRUB_GROTTO),                                                 SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_SFM_STORMS_GROTTO_BEEHIVE] =                                      Location::Base(RC_SFM_STORMS_GROTTO_BEEHIVE,                                    RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_SACRED_FOREST_MEADOW,         ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(2262, 0xEE),                      0x00, "Storms Grotto Beehive",                       "SFM Storms Grotto Beehive",                                RHT_BEEHIVE_SCRUB_PAIR_GROTTO,                                   RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_SFM_STORMS_GROTTO),                                                    SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_LEFT] =                             Location::Base(RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_LEFT,                           RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x00),                      0x00, "Near Market Grotto Beehive Left",             "HF Near Market Grotto Beehive Left",                       RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                        { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_NEAR_MARKET_GROTTO_LEFT),                                           SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_RIGHT] =                            Location::Base(RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_RIGHT,                          RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x00),                      0x00, "Near Market Grotto Beehive Right",            "HF Near Market Grotto Beehive Right",                      RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_NEAR_MARKET_GROTTO_RIGHT),                                          SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_HF_OPEN_GROTTO_BEEHIVE_LEFT] =                                    Location::Base(RC_HF_OPEN_GROTTO_BEEHIVE_LEFT,                                  RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x03),                      0x00, "Open Grotto Beehive Left",                    "HF Open Grotto Beehive Left",                              RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                        { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_OPEN_GROTTO_LEFT),                                                  SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_HF_OPEN_GROTTO_BEEHIVE_RIGHT] =                                   Location::Base(RC_HF_OPEN_GROTTO_BEEHIVE_RIGHT,                                 RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x03),                      0x00, "Open Grotto Beehive Right",                   "HF Open Grotto Beehive Right",                             RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_OPEN_GROTTO_RIGHT),                                                 SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_HF_SOUTHEAST_GROTTO_BEEHIVE_LEFT] =                               Location::Base(RC_HF_SOUTHEAST_GROTTO_BEEHIVE_LEFT,                             RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x22),                      0x00, "Southeast Grotto Beehive Left",               "HF Southeast Grotto Beehive Left",                         RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                        { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_SOUTHEAST_GROTTO_LEFT),                                             SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_HF_SOUTHEAST_GROTTO_BEEHIVE_RIGHT] =                              Location::Base(RC_HF_SOUTHEAST_GROTTO_BEEHIVE_RIGHT,                            RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x22),                      0x00, "Southeast Grotto Beehive Right",              "HF Southeast Grotto Beehive Right",                        RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_SOUTHEAST_GROTTO_RIGHT),                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_HF_INSIDE_FENCE_GROTTO_BEEHIVE] =                                 Location::Base(RC_HF_INSIDE_FENCE_GROTTO_BEEHIVE,                               RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(1410, 0xE6),                      0x00, "Inside Fence Grotto Beehive",                 "HF Inside Fence Grotto Beehive",                           RHT_BEEHIVE_LONELY_SCRUB_GROTTO,                                 RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_INSIDE_FENCE_GROTTO),                                               SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_LLR_GROTTO_BEEHIVE] =                                             Location::Base(RC_LLR_GROTTO_BEEHIVE,                                           RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_LON_LON_RANCH,                ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(5144, 0xFC),                      0x00, "Grotto Beehive",                              "LLR Grotto Beehive",                                       RHT_BEEHIVE_SCRUB_TRIO_GROTTO,                                   RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_LLR_GROTTO),                                                           SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
+    locationTable[RC_KAK_OPEN_GROTTO_BEEHIVE_LEFT] =                                   Location::Base(RC_KAK_OPEN_GROTTO_BEEHIVE_LEFT,                                 RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_KAKARIKO_VILLAGE,             ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x28),                      0x00, "Open Grotto Beehive Left",                    "Kak Open Grotto Beehive Left",                             RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                        { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_KAK_OPEN_GROTTO_LEFT),                                                 SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_OPEN_GROTTO_BEEHIVE_RIGHT] =                                  Location::Base(RC_KAK_OPEN_GROTTO_BEEHIVE_RIGHT,                                RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_KAKARIKO_VILLAGE,             ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x28),                      0x00, "Open Grotto Beehive Right",                   "Kak Open Grotto Beehive Right",                            RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_KAK_OPEN_GROTTO_RIGHT),                                                SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_DMT_COW_GROTTO_BEEHIVE] =                                         Location::Base(RC_DMT_COW_GROTTO_BEEHIVE,                                       RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(2617, 0xF8),                      0x00, "Cow Grotto Beehive",                          "DMT Cow Grotto Beehive",                                   RHT_BEEHIVE_COW_GROTTO,                                          RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_DMT_COW_GROTTO),                                                       SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMT_STORMS_GROTTO_BEEHIVE_LEFT] =                                 Location::Base(RC_DMT_STORMS_GROTTO_BEEHIVE_LEFT,                               RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x57),                      0x00, "Storms Grotto Beehive Left",                  "DMT Storms Grotto Beehive Left",                           RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                        { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_DMT_STORMS_GROTTO_LEFT),                                               SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMT_STORMS_GROTTO_BEEHIVE_RIGHT] =                                Location::Base(RC_DMT_STORMS_GROTTO_BEEHIVE_RIGHT,                              RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x57),                      0x00, "Storms Grotto Beehive Right",                 "DMT Storms Grotto Beehive Right",                          RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_DMT_STORMS_GROTTO_RIGHT),                                              SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_GC_GROTTO_BEEHIVE] =                                              Location::Base(RC_GC_GROTTO_BEEHIVE,                                            RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_GORON_CITY,                   ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(5144, 0xFB),                      0x00, "Grotto Beehive",                              "GC Grotto Beehive",                                        RHT_BEEHIVE_SCRUB_TRIO_GROTTO,                                   RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_GC_GROTTO),                                                            SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_DMC_UPPER_GROTTO_BEEHIVE_LEFT] =                                  Location::Base(RC_DMC_UPPER_GROTTO_BEEHIVE_LEFT,                                RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x7A),                      0x00, "Upper Grotto Beehive Left",                   "DMC Upper Grotto Beehive Left",                            RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                        { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_DMC_UPPER_GROTTO_LEFT),                                                SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMC_UPPER_GROTTO_BEEHIVE_RIGHT] =                                 Location::Base(RC_DMC_UPPER_GROTTO_BEEHIVE_RIGHT,                               RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x7A),                      0x00, "Upper Grotto Beehive Right",                  "DMC Upper Grotto Beehive Right",                           RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_DMC_UPPER_GROTTO_RIGHT),                                               SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMC_HAMMER_GROTTO_BEEHIVE] =                                      Location::Base(RC_DMC_HAMMER_GROTTO_BEEHIVE,                                    RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(5144, 0xF9),                      0x00, "Hammer Grotto Beehive",                       "DMC Hammer Grotto Beehive",                                RHT_BEEHIVE_SCRUB_TRIO_GROTTO,                                   RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_DMC_HAMMER_GROTTO),                                                    SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_ZR_OPEN_GROTTO_BEEHIVE_LEFT] =                                    Location::Base(RC_ZR_OPEN_GROTTO_BEEHIVE_LEFT,                                  RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_ZORAS_RIVER,                  ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x29),                      0x00, "Open Grotto Beehive Left",                    "ZR Open Grotto Beehive Left",                              RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                        { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_ZR_OPEN_GROTTO_LEFT),                                                  SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZR_OPEN_GROTTO_BEEHIVE_RIGHT] =                                   Location::Base(RC_ZR_OPEN_GROTTO_BEEHIVE_RIGHT,                                 RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_ZORAS_RIVER,                  ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x29),                      0x00, "Open Grotto Beehive Right",                   "ZR Open Grotto Beehive Right",                             RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_ZR_OPEN_GROTTO_RIGHT),                                                 SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZR_STORMS_GROTTO_BEEHIVE] =                                       Location::Base(RC_ZR_STORMS_GROTTO_BEEHIVE,                                     RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_ZORAS_RIVER,                  ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(2262, 0xEB),                      0x00, "Storms Grotto Beehive",                       "ZR Storms Grotto Beehive",                                 RHT_BEEHIVE_SCRUB_PAIR_GROTTO,                                   RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_ZR_STORMS_GROTTO),                                                     SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_LEFT] =                          Location::Base(RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_LEFT,                        RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_ZORAS_DOMAIN,                 ACTOR_OBJ_COMB,       SCENE_ZORAS_DOMAIN,                 TWO_ACTOR_PARAMS(382,  0x00),                      0x00, "In Front of King Zora Beehive Left",          "ZD In Front of King Zora Beehive Left",                    RHT_BEEHIVE_IN_FRONT_OF_KING_ZORA,                               RG_BLUE_RUPEE,                        { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_ZD_IN_FRONT_OF_KING_ZORA_LEFT),                                        SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_RIGHT] =                         Location::Base(RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_RIGHT,                       RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_ZORAS_DOMAIN,                 ACTOR_OBJ_COMB,       SCENE_ZORAS_DOMAIN,                 TWO_ACTOR_PARAMS(948,  0x00),                      0x00, "In Front of King Zora Beehive Right",         "ZD In Front of King Zora Beehive Right",                   RHT_BEEHIVE_IN_FRONT_OF_KING_ZORA,                               RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_ZD_IN_FRONT_OF_KING_ZORA_RIGHT),                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZD_BEHIND_KING_ZORA_BEEHIVE] =                                    Location::Base(RC_ZD_BEHIND_KING_ZORA_BEEHIVE,                                  RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_ZORAS_DOMAIN,                 ACTOR_OBJ_COMB,       SCENE_ZORAS_DOMAIN,                 TWO_ACTOR_PARAMS(701,  0x00),                      0x00, "Behind King Zora Beehive",                    "ZD Behind King Zora Beehive",                              RHT_BEEHIVE_BEHIND_KING_ZORA,                                    RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_ZD_BEHIND_KING_ZORA),                                                  SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_LH_GROTTO_BEEHIVE] =                                              Location::Base(RC_LH_GROTTO_BEEHIVE,                                            RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_LAKE_HYLIA,                   ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(5144, 0xEF),                      0x00, "Grotto Beehive",                              "LH Grotto Beehive",                                        RHT_BEEHIVE_SCRUB_TRIO_GROTTO,                                   RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_LH_GROTTO),                                                            SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_GV_DEKU_SCRUB_GROTTO_BEEHIVE] =                                   Location::Base(RC_GV_DEKU_SCRUB_GROTTO_BEEHIVE,                                 RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_GERUDO_VALLEY,                ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(2262, 0xF0),                      0x00, "Deku Scrub Grotto Beehive",                   "GV Deku Scrub Grotto Beehive",                             RHT_BEEHIVE_SCRUB_PAIR_GROTTO,                                   RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_GV_DEKU_SCRUB_GROTTO),                                                 SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_COLOSSUS_GROTTO_BEEHIVE] =                                        Location::Base(RC_COLOSSUS_GROTTO_BEEHIVE,                                      RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DESERT_COLOSSUS,              ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(2262, 0xFD),                      0x00, "Grotto Beehive",                              "Colossus Grotto Beehive",                                  RHT_BEEHIVE_SCRUB_PAIR_GROTTO,                                   RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_COLOSSUS_GROTTO),                                                      SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
 
-    // Cows       Randomizer Check                             Randomizer Check            Quest         Type        Area                         Actor ID      Scene ID                 Params                        Flags Short Name           Spoiler Name               Hint Text Key                Vanilla Item Categories      Spoiler Collection Check                 Collection Check Group
-    locationTable[RC_KF_LINKS_HOUSE_COW] =      Location::Base(RC_KF_LINKS_HOUSE_COW,      RCQUEST_BOTH, RCTYPE_COW, RCAREA_KOKIRI_FOREST,        ACTOR_EN_COW, SCENE_LINKS_HOUSE,       0x00,                         0x15, "Links House Cow",   "KF Links House Cow",      RHT_KF_LINKS_HOUSE_COW,      RG_MILK, { Category::cCow }, SpoilerCollectionCheck::Cow(0x34, 0x15), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_HF_COW_GROTTO_COW] =       Location::Base(RC_HF_COW_GROTTO_COW,       RCQUEST_BOTH, RCTYPE_COW, RCAREA_HYRULE_FIELD,         ACTOR_EN_COW, SCENE_GROTTOS,           TWO_ACTOR_PARAMS(3485, -291), 0x16, "Cow Grotto Cow",    "HF Cow Grotto Cow",       RHT_HF_COW_GROTTO_COW,       RG_MILK, { Category::cCow }, SpoilerCollectionCheck::Cow(0x3E, 0x16), SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[RC_LLR_STABLES_LEFT_COW] =    Location::Base(RC_LLR_STABLES_LEFT_COW,    RCQUEST_BOTH, RCTYPE_COW, RCAREA_LON_LON_RANCH,        ACTOR_EN_COW, SCENE_STABLE,            TWO_ACTOR_PARAMS(-122, -254), 0x16, "Stables Left Cow",  "LLR Stables Left Cow",    RHT_LLR_STABLES_LEFT_COW,    RG_MILK, { Category::cCow }, SpoilerCollectionCheck::Cow(0x36, 0x16), SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
-    locationTable[RC_LLR_STABLES_RIGHT_COW] =   Location::Base(RC_LLR_STABLES_RIGHT_COW,   RCQUEST_BOTH, RCTYPE_COW, RCAREA_LON_LON_RANCH,        ACTOR_EN_COW, SCENE_STABLE,            TWO_ACTOR_PARAMS(116, -254),  0x15, "Stables Right Cow", "LLR Stables Right Cow",   RHT_LLR_STABLES_RIGHT_COW,   RG_MILK, { Category::cCow }, SpoilerCollectionCheck::Cow(0x36, 0x15), SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
-    locationTable[RC_LLR_TOWER_LEFT_COW] =      Location::Base(RC_LLR_TOWER_LEFT_COW,      RCQUEST_BOTH, RCTYPE_COW, RCAREA_LON_LON_RANCH,        ACTOR_EN_COW, SCENE_LON_LON_BUILDINGS, TWO_ACTOR_PARAMS(-229, 157),  0x15, "Tower Left Cow",    "LLR Tower Left Cow",      RHT_LLR_TOWER_LEFT_COW,      RG_MILK, { Category::cCow }, SpoilerCollectionCheck::Cow(0x4C, 0x16), SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
-    locationTable[RC_LLR_TOWER_RIGHT_COW] =     Location::Base(RC_LLR_TOWER_RIGHT_COW,     RCQUEST_BOTH, RCTYPE_COW, RCAREA_LON_LON_RANCH,        ACTOR_EN_COW, SCENE_LON_LON_BUILDINGS, TWO_ACTOR_PARAMS(-142, -140), 0x16, "Tower Right Cow",   "LLR Tower Right Cow",     RHT_LLR_TOWER_RIGHT_COW,     RG_MILK, { Category::cCow }, SpoilerCollectionCheck::Cow(0x4C, 0x15), SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
-    locationTable[RC_KAK_IMPAS_HOUSE_COW] =     Location::Base(RC_KAK_IMPAS_HOUSE_COW,     RCQUEST_BOTH, RCTYPE_COW, RCAREA_KAKARIKO_VILLAGE,     ACTOR_EN_COW, SCENE_IMPAS_HOUSE,       0x00,                         0x15, "Impas House Cow",   "Kak Impas House Cow",     RHT_KAK_IMPAS_HOUSE_COW,     RG_MILK, { Category::cCow }, SpoilerCollectionCheck::Cow(0x37, 0x15), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_DMT_COW_GROTTO_COW] =      Location::Base(RC_DMT_COW_GROTTO_COW,      RCQUEST_BOTH, RCTYPE_COW, RCAREA_DEATH_MOUNTAIN_TRAIL, ACTOR_EN_COW, SCENE_GROTTOS,           TWO_ACTOR_PARAMS(2444, -471), 0x15, "Cow Grotto Cow",    "DMT Cow Grotto Cow",      RHT_DMT_COW_GROTTO_COW,      RG_MILK, { Category::cCow }, SpoilerCollectionCheck::Cow(0x3E, 0x15), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_GV_COW] =                  Location::Base(RC_GV_COW,                  RCQUEST_BOTH, RCTYPE_COW, RCAREA_GERUDO_VALLEY,        ACTOR_EN_COW, SCENE_GERUDO_VALLEY,     0x00,                         0x15, "Cow",               "GV Cow",                  RHT_GV_COW,                  RG_MILK, { Category::cCow }, SpoilerCollectionCheck::Cow(0x5A, 0x15), SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[RC_JABU_JABUS_BELLY_MQ_COW] = Location::Base(RC_JABU_JABUS_BELLY_MQ_COW, RCQUEST_MQ,   RCTYPE_COW, RCAREA_JABU_JABUS_BELLY,     ACTOR_EN_COW, SCENE_JABU_JABU,         0x00,                         0x15, "MQ Cow",            "Jabu Jabus Belly MQ Cow", RHT_JABU_JABUS_BELLY_MQ_COW, RG_MILK, { Category::cCow }, SpoilerCollectionCheck::Cow(0x02, 0x15), SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    // Cows
+    locationTable[RC_KF_LINKS_HOUSE_COW] =                                             Location::Base(RC_KF_LINKS_HOUSE_COW,                                           RCQUEST_BOTH,    RCTYPE_COW,                         RCAREA_KOKIRI_FOREST,                ACTOR_EN_COW,         SCENE_LINKS_HOUSE,                  0x00,                                              0x15, "Links House Cow",                             "KF Links House Cow",                                       RHT_KF_LINKS_HOUSE_COW,                                          RG_MILK,                              { Category::cCow },                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_KF_LINKS_HOUSE_COW),                                               SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_HF_COW_GROTTO_COW] =                                              Location::Base(RC_HF_COW_GROTTO_COW,                                            RCQUEST_BOTH,    RCTYPE_COW,                         RCAREA_HYRULE_FIELD,                 ACTOR_EN_COW,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(3485, -291),                      0x16, "Cow Grotto Cow",                              "HF Cow Grotto Cow",                                        RHT_HF_COW_GROTTO_COW,                                           RG_MILK,                              { Category::cCow },                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_HF_COW_GROTTO_COW),                                                SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_LLR_STABLES_LEFT_COW] =                                           Location::Base(RC_LLR_STABLES_LEFT_COW,                                         RCQUEST_BOTH,    RCTYPE_COW,                         RCAREA_LON_LON_RANCH,                ACTOR_EN_COW,         SCENE_STABLE,                       TWO_ACTOR_PARAMS(-122, -254),                      0x16, "Stables Left Cow",                            "LLR Stables Left Cow",                                     RHT_LLR_STABLES_LEFT_COW,                                        RG_MILK,                              { Category::cCow },                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_LLR_STABLES_LEFT_COW),                                             SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
+    locationTable[RC_LLR_STABLES_RIGHT_COW] =                                          Location::Base(RC_LLR_STABLES_RIGHT_COW,                                        RCQUEST_BOTH,    RCTYPE_COW,                         RCAREA_LON_LON_RANCH,                ACTOR_EN_COW,         SCENE_STABLE,                       TWO_ACTOR_PARAMS(116, -254),                       0x15, "Stables Right Cow",                           "LLR Stables Right Cow",                                    RHT_LLR_STABLES_RIGHT_COW,                                       RG_MILK,                              { Category::cCow },                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_LLR_STABLES_RIGHT_COW),                                            SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
+    locationTable[RC_LLR_TOWER_LEFT_COW] =                                             Location::Base(RC_LLR_TOWER_LEFT_COW,                                           RCQUEST_BOTH,    RCTYPE_COW,                         RCAREA_LON_LON_RANCH,                ACTOR_EN_COW,         SCENE_LON_LON_BUILDINGS,            TWO_ACTOR_PARAMS(-229, 157),                       0x15, "Tower Left Cow",                              "LLR Tower Left Cow",                                       RHT_LLR_TOWER_LEFT_COW,                                          RG_MILK,                              { Category::cCow },                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_LLR_TOWER_LEFT_COW),                                               SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
+    locationTable[RC_LLR_TOWER_RIGHT_COW] =                                            Location::Base(RC_LLR_TOWER_RIGHT_COW,                                          RCQUEST_BOTH,    RCTYPE_COW,                         RCAREA_LON_LON_RANCH,                ACTOR_EN_COW,         SCENE_LON_LON_BUILDINGS,            TWO_ACTOR_PARAMS(-142, -140),                      0x16, "Tower Right Cow",                             "LLR Tower Right Cow",                                      RHT_LLR_TOWER_RIGHT_COW,                                         RG_MILK,                              { Category::cCow },                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_LLR_TOWER_RIGHT_COW),                                              SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
+    locationTable[RC_KAK_IMPAS_HOUSE_COW] =                                            Location::Base(RC_KAK_IMPAS_HOUSE_COW,                                          RCQUEST_BOTH,    RCTYPE_COW,                         RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_COW,         SCENE_IMPAS_HOUSE,                  0x00,                                              0x15, "Impas House Cow",                             "Kak Impas House Cow",                                      RHT_KAK_IMPAS_HOUSE_COW,                                         RG_MILK,                              { Category::cCow },                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_KAK_IMPAS_HOUSE_COW),                                              SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_DMT_COW_GROTTO_COW] =                                             Location::Base(RC_DMT_COW_GROTTO_COW,                                           RCQUEST_BOTH,    RCTYPE_COW,                         RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_EN_COW,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(2444, -471),                      0x15, "Cow Grotto Cow",                              "DMT Cow Grotto Cow",                                       RHT_DMT_COW_GROTTO_COW,                                          RG_MILK,                              { Category::cCow },                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_DMT_COW_GROTTO_COW),                                               SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_GV_COW] =                                                         Location::Base(RC_GV_COW,                                                       RCQUEST_BOTH,    RCTYPE_COW,                         RCAREA_GERUDO_VALLEY,                ACTOR_EN_COW,         SCENE_GERUDO_VALLEY,                0x00,                                              0x15, "Cow",                                         "GV Cow",                                                   RHT_GV_COW,                                                      RG_MILK,                              { Category::cCow },                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_GV_COW),                                                           SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_COW] =                                        Location::Base(RC_JABU_JABUS_BELLY_MQ_COW,                                      RCQUEST_MQ,      RCTYPE_COW,                         RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_COW,         SCENE_JABU_JABU,                    0x00,                                              0x15, "MQ Cow",                                      "Jabu Jabus Belly MQ Cow",                                  RHT_JABU_JABUS_BELLY_MQ_COW,                                     RG_MILK,                              { Category::cCow },                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_JABU_JABUS_BELLY_MQ_COW),                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
 
     /*-------------------------------
               --- SHOPS ---
@@ -1382,192 +1370,190 @@ void Rando::StaticData::InitLocationTable() {
 
       7     5               1     3
       -------------------------------*/
-    //            Randomizer Check                                 Randomizer Check               Quest         Type         Area                       Actor ID        Scene ID                    Params Flags Short Name            Spoiler Name              Hint Text Key                   Vanilla Item           Categories           Spoiler Collection Check                   Spoiler Collection Check Group
     // Kokiri Forest
-    locationTable[RC_KF_SHOP_ITEM_1] =              Location::Base(RC_KF_SHOP_ITEM_1,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KOKIRI_FOREST,      ACTOR_EN_GIRLA, SCENE_KOKIRI_SHOP,          0x00, 0x00, "Shop Item 1",         "KF Shop Item 1",         RHT_KF_SHOP_ITEM_1,             RG_BUY_DEKU_SHIELD,    { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2D, 0), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_SHOP_ITEM_2] =              Location::Base(RC_KF_SHOP_ITEM_2,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KOKIRI_FOREST,      ACTOR_EN_GIRLA, SCENE_KOKIRI_SHOP,          0x01, 0x01, "Shop Item 2",         "KF Shop Item 2",         RHT_KF_SHOP_ITEM_2,             RG_BUY_DEKU_NUTS_5,    { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2D, 1), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_SHOP_ITEM_3] =              Location::Base(RC_KF_SHOP_ITEM_3,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KOKIRI_FOREST,      ACTOR_EN_GIRLA, SCENE_KOKIRI_SHOP,          0x02, 0x02, "Shop Item 3",         "KF Shop Item 3",         RHT_KF_SHOP_ITEM_3,             RG_BUY_DEKU_NUTS_10,   { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2D, 2), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_SHOP_ITEM_4] =              Location::Base(RC_KF_SHOP_ITEM_4,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KOKIRI_FOREST,      ACTOR_EN_GIRLA, SCENE_KOKIRI_SHOP,          0x03, 0x03, "Shop Item 4",         "KF Shop Item 4",         RHT_KF_SHOP_ITEM_4,             RG_BUY_DEKU_STICK_1,   { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2D, 3), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_SHOP_ITEM_5] =              Location::Base(RC_KF_SHOP_ITEM_5,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KOKIRI_FOREST,      ACTOR_EN_GIRLA, SCENE_KOKIRI_SHOP,          0x04, 0x04, "Shop Item 5",         "KF Shop Item 5",         RHT_KF_SHOP_ITEM_5,             RG_BUY_DEKU_SEEDS_30,  { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2D, 4), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_SHOP_ITEM_6] =              Location::Base(RC_KF_SHOP_ITEM_6,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KOKIRI_FOREST,      ACTOR_EN_GIRLA, SCENE_KOKIRI_SHOP,          0x05, 0x05, "Shop Item 6",         "KF Shop Item 6",         RHT_KF_SHOP_ITEM_6,             RG_BUY_ARROWS_10,      { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2D, 5), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_SHOP_ITEM_7] =              Location::Base(RC_KF_SHOP_ITEM_7,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KOKIRI_FOREST,      ACTOR_EN_GIRLA, SCENE_KOKIRI_SHOP,          0x06, 0x06, "Shop Item 7",         "KF Shop Item 7",         RHT_KF_SHOP_ITEM_7,             RG_BUY_ARROWS_30,      { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2D, 6), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_SHOP_ITEM_8] =              Location::Base(RC_KF_SHOP_ITEM_8,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KOKIRI_FOREST,      ACTOR_EN_GIRLA, SCENE_KOKIRI_SHOP,          0x07, 0x07, "Shop Item 8",         "KF Shop Item 8",         RHT_KF_SHOP_ITEM_8,             RG_BUY_HEART,          { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2D, 7), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_SHOP_ITEM_1] =                                                 Location::Base(RC_KF_SHOP_ITEM_1,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KOKIRI_FOREST,                ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x00,                                              0x00, "Shop Item 1",                                 "KF Shop Item 1",                                           RHT_KF_SHOP_ITEM_1,                                              RG_BUY_DEKU_SHIELD,                   { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2D, 0),                                                                                    SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_SHOP_ITEM_2] =                                                 Location::Base(RC_KF_SHOP_ITEM_2,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KOKIRI_FOREST,                ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x01,                                              0x01, "Shop Item 2",                                 "KF Shop Item 2",                                           RHT_KF_SHOP_ITEM_2,                                              RG_BUY_DEKU_NUTS_5,                   { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2D, 1),                                                                                    SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_SHOP_ITEM_3] =                                                 Location::Base(RC_KF_SHOP_ITEM_3,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KOKIRI_FOREST,                ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x02,                                              0x02, "Shop Item 3",                                 "KF Shop Item 3",                                           RHT_KF_SHOP_ITEM_3,                                              RG_BUY_DEKU_NUTS_10,                  { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2D, 2),                                                                                    SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_SHOP_ITEM_4] =                                                 Location::Base(RC_KF_SHOP_ITEM_4,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KOKIRI_FOREST,                ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x03,                                              0x03, "Shop Item 4",                                 "KF Shop Item 4",                                           RHT_KF_SHOP_ITEM_4,                                              RG_BUY_DEKU_STICK_1,                  { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2D, 3),                                                                                    SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_SHOP_ITEM_5] =                                                 Location::Base(RC_KF_SHOP_ITEM_5,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KOKIRI_FOREST,                ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x04,                                              0x04, "Shop Item 5",                                 "KF Shop Item 5",                                           RHT_KF_SHOP_ITEM_5,                                              RG_BUY_DEKU_SEEDS_30,                 { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2D, 4),                                                                                    SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_SHOP_ITEM_6] =                                                 Location::Base(RC_KF_SHOP_ITEM_6,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KOKIRI_FOREST,                ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x05,                                              0x05, "Shop Item 6",                                 "KF Shop Item 6",                                           RHT_KF_SHOP_ITEM_6,                                              RG_BUY_ARROWS_10,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2D, 5),                                                                                    SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_SHOP_ITEM_7] =                                                 Location::Base(RC_KF_SHOP_ITEM_7,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KOKIRI_FOREST,                ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x06,                                              0x06, "Shop Item 7",                                 "KF Shop Item 7",                                           RHT_KF_SHOP_ITEM_7,                                              RG_BUY_ARROWS_30,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2D, 6),                                                                                    SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_SHOP_ITEM_8] =                                                 Location::Base(RC_KF_SHOP_ITEM_8,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KOKIRI_FOREST,                ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x07,                                              0x07, "Shop Item 8",                                 "KF Shop Item 8",                                           RHT_KF_SHOP_ITEM_8,                                              RG_BUY_HEART,                         { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2D, 7),                                                                                    SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
 
     // Kakariko Village
-    locationTable[RC_KAK_POTION_SHOP_ITEM_1] =      Location::Base(RC_KAK_POTION_SHOP_ITEM_1,     RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_POTION_SHOP_KAKARIKO, 0x00, 0x30, "Potion Shop Item 1",  "Kak Potion Shop Item 1", RHT_KAK_POTION_SHOP_ITEM_1,     RG_BUY_GREEN_POTION,   { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x30, 0), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_POTION_SHOP_ITEM_2] =      Location::Base(RC_KAK_POTION_SHOP_ITEM_2,     RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_POTION_SHOP_KAKARIKO, 0x01, 0x31, "Potion Shop Item 2",  "Kak Potion Shop Item 2", RHT_KAK_POTION_SHOP_ITEM_2,     RG_BUY_BLUE_FIRE,      { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x30, 1), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_POTION_SHOP_ITEM_3] =      Location::Base(RC_KAK_POTION_SHOP_ITEM_3,     RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_POTION_SHOP_KAKARIKO, 0x02, 0x32, "Potion Shop Item 3",  "Kak Potion Shop Item 3", RHT_KAK_POTION_SHOP_ITEM_3,     RG_BUY_RED_POTION_30,  { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x30, 2), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_POTION_SHOP_ITEM_4] =      Location::Base(RC_KAK_POTION_SHOP_ITEM_4,     RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_POTION_SHOP_KAKARIKO, 0x03, 0x33, "Potion Shop Item 4",  "Kak Potion Shop Item 4", RHT_KAK_POTION_SHOP_ITEM_4,     RG_BUY_FAIRYS_SPIRIT,  { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x30, 3), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_POTION_SHOP_ITEM_5] =      Location::Base(RC_KAK_POTION_SHOP_ITEM_5,     RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_POTION_SHOP_KAKARIKO, 0x04, 0x34, "Potion Shop Item 5",  "Kak Potion Shop Item 5", RHT_KAK_POTION_SHOP_ITEM_5,     RG_BUY_DEKU_NUTS_5,     { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x30, 4), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_POTION_SHOP_ITEM_6] =      Location::Base(RC_KAK_POTION_SHOP_ITEM_6,     RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_POTION_SHOP_KAKARIKO, 0x05, 0x35, "Potion Shop Item 6",  "Kak Potion Shop Item 6", RHT_KAK_POTION_SHOP_ITEM_6,     RG_BUY_BOTTLE_BUG,     { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x30, 5), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_POTION_SHOP_ITEM_7] =      Location::Base(RC_KAK_POTION_SHOP_ITEM_7,     RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_POTION_SHOP_KAKARIKO, 0x06, 0x36, "Potion Shop Item 7",  "Kak Potion Shop Item 7", RHT_KAK_POTION_SHOP_ITEM_7,     RG_BUY_POE,            { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x30, 6), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_POTION_SHOP_ITEM_8] =      Location::Base(RC_KAK_POTION_SHOP_ITEM_8,     RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_POTION_SHOP_KAKARIKO, 0x07, 0x37, "Potion Shop Item 8",  "Kak Potion Shop Item 8", RHT_KAK_POTION_SHOP_ITEM_8,     RG_BUY_FISH,           { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x30, 7), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_BAZAAR_ITEM_1] =           Location::Base(RC_KAK_BAZAAR_ITEM_1,          RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_TEST01,               0x00, 0x38, "Bazaar Item 1",       "Kak Bazaar Item 1",      RHT_KAK_BAZAAR_ITEM_1,          RG_BUY_HYLIAN_SHIELD,  { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x33, 0), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_BAZAAR_ITEM_2] =           Location::Base(RC_KAK_BAZAAR_ITEM_2,          RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_TEST01,               0x01, 0x39, "Bazaar Item 2",       "Kak Bazaar Item 2",      RHT_KAK_BAZAAR_ITEM_2,          RG_BUY_BOMBS_535,      { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x33, 1), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_BAZAAR_ITEM_3] =           Location::Base(RC_KAK_BAZAAR_ITEM_3,          RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_TEST01,               0x02, 0x3A, "Bazaar Item 3",       "Kak Bazaar Item 3",      RHT_KAK_BAZAAR_ITEM_3,          RG_BUY_DEKU_NUTS_5,     { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x33, 2), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_BAZAAR_ITEM_4] =           Location::Base(RC_KAK_BAZAAR_ITEM_4,          RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_TEST01,               0x03, 0x3B, "Bazaar Item 4",       "Kak Bazaar Item 4",      RHT_KAK_BAZAAR_ITEM_4,          RG_BUY_HEART,          { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x33, 3), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_BAZAAR_ITEM_5] =           Location::Base(RC_KAK_BAZAAR_ITEM_5,          RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_TEST01,               0x04, 0x3C, "Bazaar Item 5",       "Kak Bazaar Item 5",      RHT_KAK_BAZAAR_ITEM_5,          RG_BUY_ARROWS_10,      { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x33, 4), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_BAZAAR_ITEM_6] =           Location::Base(RC_KAK_BAZAAR_ITEM_6,          RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_TEST01,               0x05, 0x3D, "Bazaar Item 6",       "Kak Bazaar Item 6",      RHT_KAK_BAZAAR_ITEM_6,          RG_BUY_ARROWS_50,      { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x33, 5), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_BAZAAR_ITEM_7] =           Location::Base(RC_KAK_BAZAAR_ITEM_7,          RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_TEST01,               0x06, 0x3E, "Bazaar Item 7",       "Kak Bazaar Item 7",      RHT_KAK_BAZAAR_ITEM_7,          RG_BUY_DEKU_STICK_1,   { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x33, 6), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_BAZAAR_ITEM_8] =           Location::Base(RC_KAK_BAZAAR_ITEM_8,          RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_KAKARIKO_VILLAGE,   ACTOR_EN_GIRLA, SCENE_TEST01,               0x07, 0x3F, "Bazaar Item 8",       "Kak Bazaar Item 8",      RHT_KAK_BAZAAR_ITEM_8,          RG_BUY_ARROWS_30,      { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x33, 7), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_POTION_SHOP_ITEM_1] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_1,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x00,                                              0x30, "Potion Shop Item 1",                          "Kak Potion Shop Item 1",                                   RHT_KAK_POTION_SHOP_ITEM_1,                                      RG_BUY_GREEN_POTION,                  { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x30, 0),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_POTION_SHOP_ITEM_2] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_2,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x01,                                              0x31, "Potion Shop Item 2",                          "Kak Potion Shop Item 2",                                   RHT_KAK_POTION_SHOP_ITEM_2,                                      RG_BUY_BLUE_FIRE,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x30, 1),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_POTION_SHOP_ITEM_3] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_3,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x02,                                              0x32, "Potion Shop Item 3",                          "Kak Potion Shop Item 3",                                   RHT_KAK_POTION_SHOP_ITEM_3,                                      RG_BUY_RED_POTION_30,                 { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x30, 2),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_POTION_SHOP_ITEM_4] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_4,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x03,                                              0x33, "Potion Shop Item 4",                          "Kak Potion Shop Item 4",                                   RHT_KAK_POTION_SHOP_ITEM_4,                                      RG_BUY_FAIRYS_SPIRIT,                 { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x30, 3),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_POTION_SHOP_ITEM_5] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_5,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x04,                                              0x34, "Potion Shop Item 5",                          "Kak Potion Shop Item 5",                                   RHT_KAK_POTION_SHOP_ITEM_5,                                      RG_BUY_DEKU_NUTS_5,                   { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x30, 4),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_POTION_SHOP_ITEM_6] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_6,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x05,                                              0x35, "Potion Shop Item 6",                          "Kak Potion Shop Item 6",                                   RHT_KAK_POTION_SHOP_ITEM_6,                                      RG_BUY_BOTTLE_BUG,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x30, 5),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_POTION_SHOP_ITEM_7] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_7,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x06,                                              0x36, "Potion Shop Item 7",                          "Kak Potion Shop Item 7",                                   RHT_KAK_POTION_SHOP_ITEM_7,                                      RG_BUY_POE,                           { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x30, 6),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_POTION_SHOP_ITEM_8] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_8,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x07,                                              0x37, "Potion Shop Item 8",                          "Kak Potion Shop Item 8",                                   RHT_KAK_POTION_SHOP_ITEM_8,                                      RG_BUY_FISH,                          { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x30, 7),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_BAZAAR_ITEM_1] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_1,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x00,                                              0x38, "Bazaar Item 1",                               "Kak Bazaar Item 1",                                        RHT_KAK_BAZAAR_ITEM_1,                                           RG_BUY_HYLIAN_SHIELD,                 { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x33, 0),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_BAZAAR_ITEM_2] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_2,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x01,                                              0x39, "Bazaar Item 2",                               "Kak Bazaar Item 2",                                        RHT_KAK_BAZAAR_ITEM_2,                                           RG_BUY_BOMBS_535,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x33, 1),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_BAZAAR_ITEM_3] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_3,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x02,                                              0x3A, "Bazaar Item 3",                               "Kak Bazaar Item 3",                                        RHT_KAK_BAZAAR_ITEM_3,                                           RG_BUY_DEKU_NUTS_5,                   { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x33, 2),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_BAZAAR_ITEM_4] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_4,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x03,                                              0x3B, "Bazaar Item 4",                               "Kak Bazaar Item 4",                                        RHT_KAK_BAZAAR_ITEM_4,                                           RG_BUY_HEART,                         { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x33, 3),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_BAZAAR_ITEM_5] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_5,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x04,                                              0x3C, "Bazaar Item 5",                               "Kak Bazaar Item 5",                                        RHT_KAK_BAZAAR_ITEM_5,                                           RG_BUY_ARROWS_10,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x33, 4),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_BAZAAR_ITEM_6] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_6,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x05,                                              0x3D, "Bazaar Item 6",                               "Kak Bazaar Item 6",                                        RHT_KAK_BAZAAR_ITEM_6,                                           RG_BUY_ARROWS_50,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x33, 5),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_BAZAAR_ITEM_7] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_7,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x06,                                              0x3E, "Bazaar Item 7",                               "Kak Bazaar Item 7",                                        RHT_KAK_BAZAAR_ITEM_7,                                           RG_BUY_DEKU_STICK_1,                  { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x33, 6),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_BAZAAR_ITEM_8] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_8,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x07,                                              0x3F, "Bazaar Item 8",                               "Kak Bazaar Item 8",                                        RHT_KAK_BAZAAR_ITEM_8,                                           RG_BUY_ARROWS_30,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x33, 7),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
 
     // Market
-    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_1] =  Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_1, RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_BOMBCHU_SHOP,         0x00, 0x30, "Bombchu Shop Item 1", "MK Bombchu Shop Item 1", RHT_MARKET_BOMBCHU_SHOP_ITEM_1, RG_BUY_BOMBCHU_10,     { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x32, 0), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_2] =  Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_2, RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_BOMBCHU_SHOP,         0x01, 0x31, "Bombchu Shop Item 2", "MK Bombchu Shop Item 2", RHT_MARKET_BOMBCHU_SHOP_ITEM_2, RG_BUY_BOMBCHU_10,     { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x32, 1), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_3] =  Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_3, RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_BOMBCHU_SHOP,         0x02, 0x32, "Bombchu Shop Item 3", "MK Bombchu Shop Item 3", RHT_MARKET_BOMBCHU_SHOP_ITEM_3, RG_BUY_BOMBCHU_10,     { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x32, 2), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_4] =  Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_4, RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_BOMBCHU_SHOP,         0x03, 0x33, "Bombchu Shop Item 4", "MK Bombchu Shop Item 4", RHT_MARKET_BOMBCHU_SHOP_ITEM_4, RG_BUY_BOMBCHU_10,     { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x32, 3), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_5] =  Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_5, RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_BOMBCHU_SHOP,         0x04, 0x34, "Bombchu Shop Item 5", "MK Bombchu Shop Item 5", RHT_MARKET_BOMBCHU_SHOP_ITEM_5, RG_BUY_BOMBCHU_20,     { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x32, 4), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_6] =  Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_6, RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_BOMBCHU_SHOP,         0x05, 0x35, "Bombchu Shop Item 6", "MK Bombchu Shop Item 6", RHT_MARKET_BOMBCHU_SHOP_ITEM_6, RG_BUY_BOMBCHU_20,     { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x32, 5), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_7] =  Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_7, RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_BOMBCHU_SHOP,         0x06, 0x36, "Bombchu Shop Item 7", "MK Bombchu Shop Item 7", RHT_MARKET_BOMBCHU_SHOP_ITEM_7, RG_BUY_BOMBCHU_20,     { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x32, 6), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_8] =  Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_8, RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_BOMBCHU_SHOP,         0x07, 0x37, "Bombchu Shop Item 8", "MK Bombchu Shop Item 8", RHT_MARKET_BOMBCHU_SHOP_ITEM_8, RG_BUY_BOMBCHU_20,     { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x32, 7), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_POTION_SHOP_ITEM_1] =   Location::Base(RC_MARKET_POTION_SHOP_ITEM_1,  RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_POTION_SHOP_MARKET,   0x00, 0x30, "Potion Shop Item 1",  "MK Potion Shop Item 1",  RHT_MARKET_POTION_SHOP_ITEM_1,  RG_BUY_GREEN_POTION,   { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x31, 0), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_POTION_SHOP_ITEM_2] =   Location::Base(RC_MARKET_POTION_SHOP_ITEM_2,  RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_POTION_SHOP_MARKET,   0x01, 0x31, "Potion Shop Item 2",  "MK Potion Shop Item 2",  RHT_MARKET_POTION_SHOP_ITEM_2,  RG_BUY_BLUE_FIRE,      { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x31, 1), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_POTION_SHOP_ITEM_3] =   Location::Base(RC_MARKET_POTION_SHOP_ITEM_3,  RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_POTION_SHOP_MARKET,   0x02, 0x32, "Potion Shop Item 3",  "MK Potion Shop Item 3",  RHT_MARKET_POTION_SHOP_ITEM_3,  RG_BUY_RED_POTION_30,  { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x31, 2), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_POTION_SHOP_ITEM_4] =   Location::Base(RC_MARKET_POTION_SHOP_ITEM_4,  RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_POTION_SHOP_MARKET,   0x03, 0x33, "Potion Shop Item 4",  "MK Potion Shop Item 4",  RHT_MARKET_POTION_SHOP_ITEM_4,  RG_BUY_FAIRYS_SPIRIT,  { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x31, 3), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_POTION_SHOP_ITEM_5] =   Location::Base(RC_MARKET_POTION_SHOP_ITEM_5,  RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_POTION_SHOP_MARKET,   0x04, 0x34, "Potion Shop Item 5",  "MK Potion Shop Item 5",  RHT_MARKET_POTION_SHOP_ITEM_5,  RG_BUY_DEKU_NUTS_5,    { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x31, 4), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_POTION_SHOP_ITEM_6] =   Location::Base(RC_MARKET_POTION_SHOP_ITEM_6,  RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_POTION_SHOP_MARKET,   0x05, 0x35, "Potion Shop Item 6",  "MK Potion Shop Item 6",  RHT_MARKET_POTION_SHOP_ITEM_6,  RG_BUY_BOTTLE_BUG,     { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x31, 5), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_POTION_SHOP_ITEM_7] =   Location::Base(RC_MARKET_POTION_SHOP_ITEM_7,  RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_POTION_SHOP_MARKET,   0x06, 0x36, "Potion Shop Item 7",  "MK Potion Shop Item 7",  RHT_MARKET_POTION_SHOP_ITEM_7,  RG_BUY_POE,            { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x31, 6), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_POTION_SHOP_ITEM_8] =   Location::Base(RC_MARKET_POTION_SHOP_ITEM_8,  RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_POTION_SHOP_MARKET,   0x07, 0x37, "Potion Shop Item 8",  "MK Potion Shop Item 8",  RHT_MARKET_POTION_SHOP_ITEM_8,  RG_BUY_FISH,           { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x31, 7), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BAZAAR_ITEM_1] =        Location::Base(RC_MARKET_BAZAAR_ITEM_1,       RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_BAZAAR,               0x00, 0x30, "Bazaar Item 1",       "MK Bazaar Item 1",       RHT_MARKET_BAZAAR_ITEM_1,       RG_BUY_HYLIAN_SHIELD,  { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2C, 0), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BAZAAR_ITEM_2] =        Location::Base(RC_MARKET_BAZAAR_ITEM_2,       RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_BAZAAR,               0x01, 0x31, "Bazaar Item 2",       "MK Bazaar Item 2",       RHT_MARKET_BAZAAR_ITEM_2,       RG_BUY_BOMBS_535,      { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2C, 1), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BAZAAR_ITEM_3] =        Location::Base(RC_MARKET_BAZAAR_ITEM_3,       RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_BAZAAR,               0x02, 0x32, "Bazaar Item 3",       "MK Bazaar Item 3",       RHT_MARKET_BAZAAR_ITEM_3,       RG_BUY_DEKU_NUTS_5,    { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2C, 2), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BAZAAR_ITEM_4] =        Location::Base(RC_MARKET_BAZAAR_ITEM_4,       RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_BAZAAR,               0x03, 0x33, "Bazaar Item 4",       "MK Bazaar Item 4",       RHT_MARKET_BAZAAR_ITEM_4,       RG_BUY_HEART,          { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2C, 3), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BAZAAR_ITEM_5] =        Location::Base(RC_MARKET_BAZAAR_ITEM_5,       RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_BAZAAR,               0x04, 0x34, "Bazaar Item 5",       "MK Bazaar Item 5",       RHT_MARKET_BAZAAR_ITEM_5,       RG_BUY_ARROWS_10,      { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2C, 4), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BAZAAR_ITEM_6] =        Location::Base(RC_MARKET_BAZAAR_ITEM_6,       RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_BAZAAR,               0x05, 0x35, "Bazaar Item 6",       "MK Bazaar Item 6",       RHT_MARKET_BAZAAR_ITEM_6,       RG_BUY_ARROWS_50,      { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2C, 5), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BAZAAR_ITEM_7] =        Location::Base(RC_MARKET_BAZAAR_ITEM_7,       RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_BAZAAR,               0x06, 0x36, "Bazaar Item 7",       "MK Bazaar Item 7",       RHT_MARKET_BAZAAR_ITEM_7,       RG_BUY_DEKU_STICK_1,   { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2C, 6), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BAZAAR_ITEM_8] =        Location::Base(RC_MARKET_BAZAAR_ITEM_8,       RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_MARKET,             ACTOR_EN_GIRLA, SCENE_BAZAAR,               0x07, 0x37, "Bazaar Item 8",       "MK Bazaar Item 8",       RHT_MARKET_BAZAAR_ITEM_8,       RG_BUY_ARROWS_30,      { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2C, 7), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_1] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_1,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x00,                                              0x30, "Bombchu Shop Item 1",                         "MK Bombchu Shop Item 1",                                   RHT_MARKET_BOMBCHU_SHOP_ITEM_1,                                  RG_BUY_BOMBCHU_10,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 0),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_2] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_2,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x01,                                              0x31, "Bombchu Shop Item 2",                         "MK Bombchu Shop Item 2",                                   RHT_MARKET_BOMBCHU_SHOP_ITEM_2,                                  RG_BUY_BOMBCHU_10,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 1),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_3] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_3,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x02,                                              0x32, "Bombchu Shop Item 3",                         "MK Bombchu Shop Item 3",                                   RHT_MARKET_BOMBCHU_SHOP_ITEM_3,                                  RG_BUY_BOMBCHU_10,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 2),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_4] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_4,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x03,                                              0x33, "Bombchu Shop Item 4",                         "MK Bombchu Shop Item 4",                                   RHT_MARKET_BOMBCHU_SHOP_ITEM_4,                                  RG_BUY_BOMBCHU_10,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 3),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_5] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_5,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x04,                                              0x34, "Bombchu Shop Item 5",                         "MK Bombchu Shop Item 5",                                   RHT_MARKET_BOMBCHU_SHOP_ITEM_5,                                  RG_BUY_BOMBCHU_20,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 4),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_6] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_6,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x05,                                              0x35, "Bombchu Shop Item 6",                         "MK Bombchu Shop Item 6",                                   RHT_MARKET_BOMBCHU_SHOP_ITEM_6,                                  RG_BUY_BOMBCHU_20,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 5),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_7] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_7,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x06,                                              0x36, "Bombchu Shop Item 7",                         "MK Bombchu Shop Item 7",                                   RHT_MARKET_BOMBCHU_SHOP_ITEM_7,                                  RG_BUY_BOMBCHU_20,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 6),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_8] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_8,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x07,                                              0x37, "Bombchu Shop Item 8",                         "MK Bombchu Shop Item 8",                                   RHT_MARKET_BOMBCHU_SHOP_ITEM_8,                                  RG_BUY_BOMBCHU_20,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 7),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_POTION_SHOP_ITEM_1] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_1,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x00,                                              0x30, "Potion Shop Item 1",                          "MK Potion Shop Item 1",                                    RHT_MARKET_POTION_SHOP_ITEM_1,                                   RG_BUY_GREEN_POTION,                  { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x31, 0),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_POTION_SHOP_ITEM_2] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_2,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x01,                                              0x31, "Potion Shop Item 2",                          "MK Potion Shop Item 2",                                    RHT_MARKET_POTION_SHOP_ITEM_2,                                   RG_BUY_BLUE_FIRE,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x31, 1),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_POTION_SHOP_ITEM_3] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_3,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x02,                                              0x32, "Potion Shop Item 3",                          "MK Potion Shop Item 3",                                    RHT_MARKET_POTION_SHOP_ITEM_3,                                   RG_BUY_RED_POTION_30,                 { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x31, 2),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_POTION_SHOP_ITEM_4] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_4,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x03,                                              0x33, "Potion Shop Item 4",                          "MK Potion Shop Item 4",                                    RHT_MARKET_POTION_SHOP_ITEM_4,                                   RG_BUY_FAIRYS_SPIRIT,                 { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x31, 3),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_POTION_SHOP_ITEM_5] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_5,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x04,                                              0x34, "Potion Shop Item 5",                          "MK Potion Shop Item 5",                                    RHT_MARKET_POTION_SHOP_ITEM_5,                                   RG_BUY_DEKU_NUTS_5,                   { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x31, 4),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_POTION_SHOP_ITEM_6] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_6,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x05,                                              0x35, "Potion Shop Item 6",                          "MK Potion Shop Item 6",                                    RHT_MARKET_POTION_SHOP_ITEM_6,                                   RG_BUY_BOTTLE_BUG,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x31, 5),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_POTION_SHOP_ITEM_7] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_7,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x06,                                              0x36, "Potion Shop Item 7",                          "MK Potion Shop Item 7",                                    RHT_MARKET_POTION_SHOP_ITEM_7,                                   RG_BUY_POE,                           { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x31, 6),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_POTION_SHOP_ITEM_8] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_8,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x07,                                              0x37, "Potion Shop Item 8",                          "MK Potion Shop Item 8",                                    RHT_MARKET_POTION_SHOP_ITEM_8,                                   RG_BUY_FISH,                          { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x31, 7),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BAZAAR_ITEM_1] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_1,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x00,                                              0x30, "Bazaar Item 1",                               "MK Bazaar Item 1",                                         RHT_MARKET_BAZAAR_ITEM_1,                                        RG_BUY_HYLIAN_SHIELD,                 { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2C, 0),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BAZAAR_ITEM_2] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_2,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x01,                                              0x31, "Bazaar Item 2",                               "MK Bazaar Item 2",                                         RHT_MARKET_BAZAAR_ITEM_2,                                        RG_BUY_BOMBS_535,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2C, 1),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BAZAAR_ITEM_3] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_3,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x02,                                              0x32, "Bazaar Item 3",                               "MK Bazaar Item 3",                                         RHT_MARKET_BAZAAR_ITEM_3,                                        RG_BUY_DEKU_NUTS_5,                   { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2C, 2),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BAZAAR_ITEM_4] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_4,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x03,                                              0x33, "Bazaar Item 4",                               "MK Bazaar Item 4",                                         RHT_MARKET_BAZAAR_ITEM_4,                                        RG_BUY_HEART,                         { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2C, 3),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BAZAAR_ITEM_5] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_5,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x04,                                              0x34, "Bazaar Item 5",                               "MK Bazaar Item 5",                                         RHT_MARKET_BAZAAR_ITEM_5,                                        RG_BUY_ARROWS_10,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2C, 4),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BAZAAR_ITEM_6] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_6,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x05,                                              0x35, "Bazaar Item 6",                               "MK Bazaar Item 6",                                         RHT_MARKET_BAZAAR_ITEM_6,                                        RG_BUY_ARROWS_50,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2C, 5),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BAZAAR_ITEM_7] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_7,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x06,                                              0x36, "Bazaar Item 7",                               "MK Bazaar Item 7",                                         RHT_MARKET_BAZAAR_ITEM_7,                                        RG_BUY_DEKU_STICK_1,                  { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2C, 6),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BAZAAR_ITEM_8] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_8,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x07,                                              0x37, "Bazaar Item 8",                               "MK Bazaar Item 8",                                         RHT_MARKET_BAZAAR_ITEM_8,                                        RG_BUY_ARROWS_30,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2C, 7),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
  
     // Zora's Domain 
-    locationTable[RC_ZD_SHOP_ITEM_1] =              Location::Base(RC_ZD_SHOP_ITEM_1,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_ZORAS_DOMAIN,       ACTOR_EN_GIRLA, SCENE_ZORA_SHOP,            0x00, 0x30, "Shop Item 1",         "ZD Shop Item 1",         RHT_ZD_SHOP_ITEM_1,             RG_BUY_ZORA_TUNIC,     { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2F, 0), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZD_SHOP_ITEM_2] =              Location::Base(RC_ZD_SHOP_ITEM_2,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_ZORAS_DOMAIN,       ACTOR_EN_GIRLA, SCENE_ZORA_SHOP,            0x01, 0x31, "Shop Item 2",         "ZD Shop Item 2",         RHT_ZD_SHOP_ITEM_2,             RG_BUY_ARROWS_10,      { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2F, 1), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZD_SHOP_ITEM_3] =              Location::Base(RC_ZD_SHOP_ITEM_3,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_ZORAS_DOMAIN,       ACTOR_EN_GIRLA, SCENE_ZORA_SHOP,            0x02, 0x32, "Shop Item 3",         "ZD Shop Item 3",         RHT_ZD_SHOP_ITEM_3,             RG_BUY_HEART,          { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2F, 2), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZD_SHOP_ITEM_4] =              Location::Base(RC_ZD_SHOP_ITEM_4,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_ZORAS_DOMAIN,       ACTOR_EN_GIRLA, SCENE_ZORA_SHOP,            0x03, 0x33, "Shop Item 4",         "ZD Shop Item 4",         RHT_ZD_SHOP_ITEM_4,             RG_BUY_ARROWS_30,      { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2F, 3), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZD_SHOP_ITEM_5] =              Location::Base(RC_ZD_SHOP_ITEM_5,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_ZORAS_DOMAIN,       ACTOR_EN_GIRLA, SCENE_ZORA_SHOP,            0x04, 0x34, "Shop Item 5",         "ZD Shop Item 5",         RHT_ZD_SHOP_ITEM_5,             RG_BUY_DEKU_NUTS_5,    { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2F, 4), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZD_SHOP_ITEM_6] =              Location::Base(RC_ZD_SHOP_ITEM_6,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_ZORAS_DOMAIN,       ACTOR_EN_GIRLA, SCENE_ZORA_SHOP,            0x05, 0x35, "Shop Item 6",         "ZD Shop Item 6",         RHT_ZD_SHOP_ITEM_6,             RG_BUY_ARROWS_50,      { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2F, 5), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZD_SHOP_ITEM_7] =              Location::Base(RC_ZD_SHOP_ITEM_7,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_ZORAS_DOMAIN,       ACTOR_EN_GIRLA, SCENE_ZORA_SHOP,            0x06, 0x36, "Shop Item 7",         "ZD Shop Item 7",         RHT_ZD_SHOP_ITEM_7,             RG_BUY_FISH,           { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2F, 6), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZD_SHOP_ITEM_8] =              Location::Base(RC_ZD_SHOP_ITEM_8,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_ZORAS_DOMAIN,       ACTOR_EN_GIRLA, SCENE_ZORA_SHOP,            0x07, 0x37, "Shop Item 8",         "ZD Shop Item 8",         RHT_ZD_SHOP_ITEM_8,             RG_BUY_RED_POTION_50,  { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2F, 7), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZD_SHOP_ITEM_1] =                                                 Location::Base(RC_ZD_SHOP_ITEM_1,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x00,                                              0x30, "Shop Item 1",                                 "ZD Shop Item 1",                                           RHT_ZD_SHOP_ITEM_1,                                              RG_BUY_ZORA_TUNIC,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2F, 0),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZD_SHOP_ITEM_2] =                                                 Location::Base(RC_ZD_SHOP_ITEM_2,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x01,                                              0x31, "Shop Item 2",                                 "ZD Shop Item 2",                                           RHT_ZD_SHOP_ITEM_2,                                              RG_BUY_ARROWS_10,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2F, 1),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZD_SHOP_ITEM_3] =                                                 Location::Base(RC_ZD_SHOP_ITEM_3,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x02,                                              0x32, "Shop Item 3",                                 "ZD Shop Item 3",                                           RHT_ZD_SHOP_ITEM_3,                                              RG_BUY_HEART,                         { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2F, 2),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZD_SHOP_ITEM_4] =                                                 Location::Base(RC_ZD_SHOP_ITEM_4,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x03,                                              0x33, "Shop Item 4",                                 "ZD Shop Item 4",                                           RHT_ZD_SHOP_ITEM_4,                                              RG_BUY_ARROWS_30,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2F, 3),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZD_SHOP_ITEM_5] =                                                 Location::Base(RC_ZD_SHOP_ITEM_5,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x04,                                              0x34, "Shop Item 5",                                 "ZD Shop Item 5",                                           RHT_ZD_SHOP_ITEM_5,                                              RG_BUY_DEKU_NUTS_5,                   { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2F, 4),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZD_SHOP_ITEM_6] =                                                 Location::Base(RC_ZD_SHOP_ITEM_6,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x05,                                              0x35, "Shop Item 6",                                 "ZD Shop Item 6",                                           RHT_ZD_SHOP_ITEM_6,                                              RG_BUY_ARROWS_50,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2F, 5),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZD_SHOP_ITEM_7] =                                                 Location::Base(RC_ZD_SHOP_ITEM_7,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x06,                                              0x36, "Shop Item 7",                                 "ZD Shop Item 7",                                           RHT_ZD_SHOP_ITEM_7,                                              RG_BUY_FISH,                          { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2F, 6),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZD_SHOP_ITEM_8] =                                                 Location::Base(RC_ZD_SHOP_ITEM_8,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x07,                                              0x37, "Shop Item 8",                                 "ZD Shop Item 8",                                           RHT_ZD_SHOP_ITEM_8,                                              RG_BUY_RED_POTION_50,                 { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2F, 7),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
               
     // Goron City             
-    locationTable[RC_GC_SHOP_ITEM_1] =              Location::Base(RC_GC_SHOP_ITEM_1,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_GORON_CITY,         ACTOR_EN_GIRLA, SCENE_GORON_SHOP,           0x00, 0x30, "Shop Item 1",         "GC Shop Item 1",         RHT_GC_SHOP_ITEM_1,             RG_BUY_BOMBS_525,      { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2E, 0), SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_SHOP_ITEM_2] =              Location::Base(RC_GC_SHOP_ITEM_2,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_GORON_CITY,         ACTOR_EN_GIRLA, SCENE_GORON_SHOP,           0x01, 0x31, "Shop Item 2",         "GC Shop Item 2",         RHT_GC_SHOP_ITEM_2,             RG_BUY_BOMBS_10,       { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2E, 1), SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_SHOP_ITEM_3] =              Location::Base(RC_GC_SHOP_ITEM_3,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_GORON_CITY,         ACTOR_EN_GIRLA, SCENE_GORON_SHOP,           0x02, 0x32, "Shop Item 3",         "GC Shop Item 3",         RHT_GC_SHOP_ITEM_3,             RG_BUY_BOMBS_20,       { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2E, 2), SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_SHOP_ITEM_4] =              Location::Base(RC_GC_SHOP_ITEM_4,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_GORON_CITY,         ACTOR_EN_GIRLA, SCENE_GORON_SHOP,           0x03, 0x33, "Shop Item 4",         "GC Shop Item 4",         RHT_GC_SHOP_ITEM_4,             RG_BUY_BOMBS_30,       { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2E, 3), SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_SHOP_ITEM_5] =              Location::Base(RC_GC_SHOP_ITEM_5,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_GORON_CITY,         ACTOR_EN_GIRLA, SCENE_GORON_SHOP,           0x04, 0x34, "Shop Item 5",         "GC Shop Item 5",         RHT_GC_SHOP_ITEM_5,             RG_BUY_GORON_TUNIC,    { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2E, 4), SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_SHOP_ITEM_6] =              Location::Base(RC_GC_SHOP_ITEM_6,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_GORON_CITY,         ACTOR_EN_GIRLA, SCENE_GORON_SHOP,           0x05, 0x35, "Shop Item 6",         "GC Shop Item 6",         RHT_GC_SHOP_ITEM_6,             RG_BUY_HEART,          { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2E, 5), SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_SHOP_ITEM_7] =              Location::Base(RC_GC_SHOP_ITEM_7,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_GORON_CITY,         ACTOR_EN_GIRLA, SCENE_GORON_SHOP,           0x06, 0x36, "Shop Item 7",         "GC Shop Item 7",         RHT_GC_SHOP_ITEM_7,             RG_BUY_RED_POTION_40,  { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2E, 6), SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_SHOP_ITEM_8] =              Location::Base(RC_GC_SHOP_ITEM_8,             RCQUEST_BOTH, RCTYPE_SHOP, RCAREA_GORON_CITY,         ACTOR_EN_GIRLA, SCENE_GORON_SHOP,           0x07, 0x37, "Shop Item 8",         "GC Shop Item 8",         RHT_GC_SHOP_ITEM_8,             RG_BUY_HEART,          { Category::cShop }, SpoilerCollectionCheck::ShopItem(0x2E, 7), SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_SHOP_ITEM_1] =                                                 Location::Base(RC_GC_SHOP_ITEM_1,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_GORON_CITY,                   ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x00,                                              0x30, "Shop Item 1",                                 "GC Shop Item 1",                                           RHT_GC_SHOP_ITEM_1,                                              RG_BUY_BOMBS_525,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2E, 0),                                                                                    SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_SHOP_ITEM_2] =                                                 Location::Base(RC_GC_SHOP_ITEM_2,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_GORON_CITY,                   ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x01,                                              0x31, "Shop Item 2",                                 "GC Shop Item 2",                                           RHT_GC_SHOP_ITEM_2,                                              RG_BUY_BOMBS_10,                      { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2E, 1),                                                                                    SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_SHOP_ITEM_3] =                                                 Location::Base(RC_GC_SHOP_ITEM_3,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_GORON_CITY,                   ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x02,                                              0x32, "Shop Item 3",                                 "GC Shop Item 3",                                           RHT_GC_SHOP_ITEM_3,                                              RG_BUY_BOMBS_20,                      { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2E, 2),                                                                                    SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_SHOP_ITEM_4] =                                                 Location::Base(RC_GC_SHOP_ITEM_4,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_GORON_CITY,                   ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x03,                                              0x33, "Shop Item 4",                                 "GC Shop Item 4",                                           RHT_GC_SHOP_ITEM_4,                                              RG_BUY_BOMBS_30,                      { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2E, 3),                                                                                    SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_SHOP_ITEM_5] =                                                 Location::Base(RC_GC_SHOP_ITEM_5,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_GORON_CITY,                   ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x04,                                              0x34, "Shop Item 5",                                 "GC Shop Item 5",                                           RHT_GC_SHOP_ITEM_5,                                              RG_BUY_GORON_TUNIC,                   { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2E, 4),                                                                                    SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_SHOP_ITEM_6] =                                                 Location::Base(RC_GC_SHOP_ITEM_6,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_GORON_CITY,                   ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x05,                                              0x35, "Shop Item 6",                                 "GC Shop Item 6",                                           RHT_GC_SHOP_ITEM_6,                                              RG_BUY_HEART,                         { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2E, 5),                                                                                    SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_SHOP_ITEM_7] =                                                 Location::Base(RC_GC_SHOP_ITEM_7,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_GORON_CITY,                   ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x06,                                              0x36, "Shop Item 7",                                 "GC Shop Item 7",                                           RHT_GC_SHOP_ITEM_7,                                              RG_BUY_RED_POTION_40,                 { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2E, 6),                                                                                    SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_SHOP_ITEM_8] =                                                 Location::Base(RC_GC_SHOP_ITEM_8,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_GORON_CITY,                   ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x07,                                              0x37, "Shop Item 8",                                 "GC Shop Item 8",                                           RHT_GC_SHOP_ITEM_8,                                              RG_BUY_HEART,                         { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2E, 7),                                                                                    SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
 
     /* +--------------+
        |  FISHSANITY  |
        +--------------+ */
 
-    //            Randomizer Check                                 Randomizer Check               Quest         Type         Area                       Actor ID        Scene ID                   Params Flags Short Name                      Spoiler Name                    Hint Text Key               Vanilla Item    Categories           Spoiler Collection Check            Collection Check Group
-    locationTable[RC_LH_CHILD_FISH_1] =             Location::Base(RC_LH_CHILD_FISH_1,            RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         100,  0x00, "Child Pond Fish 1",            "LH Child Pond Fish 1",         RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_FISH_2] =             Location::Base(RC_LH_CHILD_FISH_2,            RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         101,  0x00, "Child Pond Fish 2",            "LH Child Pond Fish 2",         RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_FISH_3] =             Location::Base(RC_LH_CHILD_FISH_3,            RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         102,  0x00, "Child Pond Fish 3",            "LH Child Pond Fish 3",         RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_FISH_4] =             Location::Base(RC_LH_CHILD_FISH_4,            RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         103,  0x00, "Child Pond Fish 4",            "LH Child Pond Fish 4",         RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_FISH_5] =             Location::Base(RC_LH_CHILD_FISH_5,            RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         104,  0x00, "Child Pond Fish 5",            "LH Child Pond Fish 5",         RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_FISH_6] =             Location::Base(RC_LH_CHILD_FISH_6,            RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         105,  0x00, "Child Pond Fish 6",            "LH Child Pond Fish 6",         RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_FISH_7] =             Location::Base(RC_LH_CHILD_FISH_7,            RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         106,  0x00, "Child Pond Fish 7",            "LH Child Pond Fish 7",         RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_FISH_8] =             Location::Base(RC_LH_CHILD_FISH_8,            RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         107,  0x00, "Child Pond Fish 8",            "LH Child Pond Fish 8",         RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_FISH_9] =             Location::Base(RC_LH_CHILD_FISH_9,            RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         108,  0x00, "Child Pond Fish 9",            "LH Child Pond Fish 9",         RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_FISH_10] =            Location::Base(RC_LH_CHILD_FISH_10,           RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         109,  0x00, "Child Pond Fish 10",           "LH Child Pond Fish 10",        RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_FISH_11] =            Location::Base(RC_LH_CHILD_FISH_11,           RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         110,  0x00, "Child Pond Fish 11",           "LH Child Pond Fish 11",        RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_FISH_12] =            Location::Base(RC_LH_CHILD_FISH_12,           RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         111,  0x00, "Child Pond Fish 12",           "LH Child Pond Fish 12",        RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_FISH_13] =            Location::Base(RC_LH_CHILD_FISH_13,           RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         112,  0x00, "Child Pond Fish 13",           "LH Child Pond Fish 13",        RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_FISH_14] =            Location::Base(RC_LH_CHILD_FISH_14,           RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         113,  0x00, "Child Pond Fish 14",           "LH Child Pond Fish 14",        RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_FISH_15] =            Location::Base(RC_LH_CHILD_FISH_15,           RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         114,  0x00, "Child Pond Fish 15",           "LH Child Pond Fish 15",        RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_LOACH_1] =            Location::Base(RC_LH_CHILD_LOACH_1,           RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         115,  0x00, "Child Pond Loach 1",           "LH Child Pond Loach 1",        RHT_LH_HYRULE_LOACH,         RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_LOACH_2] =            Location::Base(RC_LH_CHILD_LOACH_2,           RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         116,  0x00, "Child Pond Loach 2",           "LH Child Pond Loach 2",        RHT_LH_HYRULE_LOACH,         RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_FISH_1] =             Location::Base(RC_LH_ADULT_FISH_1,            RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         100,  0x00, "Adult Pond Fish 1",            "LH Adult Pond Fish 1",         RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_FISH_2] =             Location::Base(RC_LH_ADULT_FISH_2,            RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         101,  0x00, "Adult Pond Fish 2",            "LH Adult Pond Fish 2",         RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_FISH_3] =             Location::Base(RC_LH_ADULT_FISH_3,            RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         102,  0x00, "Adult Pond Fish 3",            "LH Adult Pond Fish 3",         RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_FISH_4] =             Location::Base(RC_LH_ADULT_FISH_4,            RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         103,  0x00, "Adult Pond Fish 4",            "LH Adult Pond Fish 4",         RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_FISH_5] =             Location::Base(RC_LH_ADULT_FISH_5,            RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         104,  0x00, "Adult Pond Fish 5",            "LH Adult Pond Fish 5",         RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_FISH_6] =             Location::Base(RC_LH_ADULT_FISH_6,            RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         105,  0x00, "Adult Pond Fish 6",            "LH Adult Pond Fish 6",         RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_FISH_7] =             Location::Base(RC_LH_ADULT_FISH_7,            RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         106,  0x00, "Adult Pond Fish 7",            "LH Adult Pond Fish 7",         RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_FISH_8] =             Location::Base(RC_LH_ADULT_FISH_8,            RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         107,  0x00, "Adult Pond Fish 8",            "LH Adult Pond Fish 8",         RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_FISH_9] =             Location::Base(RC_LH_ADULT_FISH_9,            RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         108,  0x00, "Adult Pond Fish 9",            "LH Adult Pond Fish 9",         RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_FISH_10] =            Location::Base(RC_LH_ADULT_FISH_10,           RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         109,  0x00, "Adult Pond Fish 10",           "LH Adult Pond Fish 10",        RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_FISH_11] =            Location::Base(RC_LH_ADULT_FISH_11,           RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         110,  0x00, "Adult Pond Fish 11",           "LH Adult Pond Fish 11",        RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_FISH_12] =            Location::Base(RC_LH_ADULT_FISH_12,           RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         111,  0x00, "Adult Pond Fish 12",           "LH Adult Pond Fish 12",        RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_FISH_13] =            Location::Base(RC_LH_ADULT_FISH_13,           RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         112,  0x00, "Adult Pond Fish 13",           "LH Adult Pond Fish 13",        RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_FISH_14] =            Location::Base(RC_LH_ADULT_FISH_14,           RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         113,  0x00, "Adult Pond Fish 14",           "LH Adult Pond Fish 14",        RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_FISH_15] =            Location::Base(RC_LH_ADULT_FISH_15,           RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         114,  0x00, "Adult Pond Fish 15",           "LH Adult Pond Fish 15",        RHT_LH_POND_FISH,            RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_LOACH] =              Location::Base(RC_LH_ADULT_LOACH,             RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LAKE_HYLIA,         ACTOR_FISHING,  SCENE_FISHING_POND,         115,  0x00, "Adult Pond Loach",             "LH Adult Pond Loach",          RHT_LH_HYRULE_LOACH,         RG_NONE,        { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    // Fishing Pond
+    locationTable[RC_LH_CHILD_FISH_1] =                                                Location::Base(RC_LH_CHILD_FISH_1,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 100,                                               0x00, "Child Pond Fish 1",                           "LH Child Pond Fish 1",                                     RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISH_2] =                                                Location::Base(RC_LH_CHILD_FISH_2,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 101,                                               0x00, "Child Pond Fish 2",                           "LH Child Pond Fish 2",                                     RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISH_3] =                                                Location::Base(RC_LH_CHILD_FISH_3,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 102,                                               0x00, "Child Pond Fish 3",                           "LH Child Pond Fish 3",                                     RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISH_4] =                                                Location::Base(RC_LH_CHILD_FISH_4,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 103,                                               0x00, "Child Pond Fish 4",                           "LH Child Pond Fish 4",                                     RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISH_5] =                                                Location::Base(RC_LH_CHILD_FISH_5,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 104,                                               0x00, "Child Pond Fish 5",                           "LH Child Pond Fish 5",                                     RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISH_6] =                                                Location::Base(RC_LH_CHILD_FISH_6,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 105,                                               0x00, "Child Pond Fish 6",                           "LH Child Pond Fish 6",                                     RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISH_7] =                                                Location::Base(RC_LH_CHILD_FISH_7,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 106,                                               0x00, "Child Pond Fish 7",                           "LH Child Pond Fish 7",                                     RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISH_8] =                                                Location::Base(RC_LH_CHILD_FISH_8,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 107,                                               0x00, "Child Pond Fish 8",                           "LH Child Pond Fish 8",                                     RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISH_9] =                                                Location::Base(RC_LH_CHILD_FISH_9,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 108,                                               0x00, "Child Pond Fish 9",                           "LH Child Pond Fish 9",                                     RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISH_10] =                                               Location::Base(RC_LH_CHILD_FISH_10,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 109,                                               0x00, "Child Pond Fish 10",                          "LH Child Pond Fish 10",                                    RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISH_11] =                                               Location::Base(RC_LH_CHILD_FISH_11,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 110,                                               0x00, "Child Pond Fish 11",                          "LH Child Pond Fish 11",                                    RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISH_12] =                                               Location::Base(RC_LH_CHILD_FISH_12,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 111,                                               0x00, "Child Pond Fish 12",                          "LH Child Pond Fish 12",                                    RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISH_13] =                                               Location::Base(RC_LH_CHILD_FISH_13,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 112,                                               0x00, "Child Pond Fish 13",                          "LH Child Pond Fish 13",                                    RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISH_14] =                                               Location::Base(RC_LH_CHILD_FISH_14,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 113,                                               0x00, "Child Pond Fish 14",                          "LH Child Pond Fish 14",                                    RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISH_15] =                                               Location::Base(RC_LH_CHILD_FISH_15,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 114,                                               0x00, "Child Pond Fish 15",                          "LH Child Pond Fish 15",                                    RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_LOACH_1] =                                               Location::Base(RC_LH_CHILD_LOACH_1,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 115,                                               0x00, "Child Pond Loach 1",                          "LH Child Pond Loach 1",                                    RHT_LH_HYRULE_LOACH,                                             RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_LOACH_2] =                                               Location::Base(RC_LH_CHILD_LOACH_2,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 116,                                               0x00, "Child Pond Loach 2",                          "LH Child Pond Loach 2",                                    RHT_LH_HYRULE_LOACH,                                             RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_FISH_1] =                                                Location::Base(RC_LH_ADULT_FISH_1,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 100,                                               0x00, "Adult Pond Fish 1",                           "LH Adult Pond Fish 1",                                     RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_FISH_2] =                                                Location::Base(RC_LH_ADULT_FISH_2,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 101,                                               0x00, "Adult Pond Fish 2",                           "LH Adult Pond Fish 2",                                     RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_FISH_3] =                                                Location::Base(RC_LH_ADULT_FISH_3,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 102,                                               0x00, "Adult Pond Fish 3",                           "LH Adult Pond Fish 3",                                     RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_FISH_4] =                                                Location::Base(RC_LH_ADULT_FISH_4,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 103,                                               0x00, "Adult Pond Fish 4",                           "LH Adult Pond Fish 4",                                     RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_FISH_5] =                                                Location::Base(RC_LH_ADULT_FISH_5,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 104,                                               0x00, "Adult Pond Fish 5",                           "LH Adult Pond Fish 5",                                     RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_FISH_6] =                                                Location::Base(RC_LH_ADULT_FISH_6,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 105,                                               0x00, "Adult Pond Fish 6",                           "LH Adult Pond Fish 6",                                     RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_FISH_7] =                                                Location::Base(RC_LH_ADULT_FISH_7,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 106,                                               0x00, "Adult Pond Fish 7",                           "LH Adult Pond Fish 7",                                     RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_FISH_8] =                                                Location::Base(RC_LH_ADULT_FISH_8,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 107,                                               0x00, "Adult Pond Fish 8",                           "LH Adult Pond Fish 8",                                     RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_FISH_9] =                                                Location::Base(RC_LH_ADULT_FISH_9,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 108,                                               0x00, "Adult Pond Fish 9",                           "LH Adult Pond Fish 9",                                     RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_FISH_10] =                                               Location::Base(RC_LH_ADULT_FISH_10,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 109,                                               0x00, "Adult Pond Fish 10",                          "LH Adult Pond Fish 10",                                    RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_FISH_11] =                                               Location::Base(RC_LH_ADULT_FISH_11,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 110,                                               0x00, "Adult Pond Fish 11",                          "LH Adult Pond Fish 11",                                    RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_FISH_12] =                                               Location::Base(RC_LH_ADULT_FISH_12,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 111,                                               0x00, "Adult Pond Fish 12",                          "LH Adult Pond Fish 12",                                    RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_FISH_13] =                                               Location::Base(RC_LH_ADULT_FISH_13,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 112,                                               0x00, "Adult Pond Fish 13",                          "LH Adult Pond Fish 13",                                    RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_FISH_14] =                                               Location::Base(RC_LH_ADULT_FISH_14,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 113,                                               0x00, "Adult Pond Fish 14",                          "LH Adult Pond Fish 14",                                    RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_FISH_15] =                                               Location::Base(RC_LH_ADULT_FISH_15,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 114,                                               0x00, "Adult Pond Fish 15",                          "LH Adult Pond Fish 15",                                    RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_LOACH] =                                                 Location::Base(RC_LH_ADULT_LOACH,                                               RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 115,                                               0x00, "Adult Pond Loach",                            "LH Adult Pond Loach",                                      RHT_LH_HYRULE_LOACH,                                             RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
     // Grotto fish
-    locationTable[RC_KF_STORMS_GROTTO_FISH] =           Location::Base(RC_KF_STORMS_GROTTO_FISH,            RCQUEST_BOTH, RCTYPE_FISH, RCAREA_KOKIRI_FOREST,        ACTOR_EN_FISH,  SCENE_GROTTOS,  1,    0x00, "Storms Grotto Fish",           "KF Storms Grotto Fish",            RHT_KF_STORMS_GROTTO_FISH,          RG_FISH, { Category::cFish }, SpoilerCollectionCheck::Fish(0x2C, SCENE_GROTTOS), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_FISH] =   Location::Base(RC_LW_NEAR_SHORTCUTS_GROTTO_FISH,    RCQUEST_BOTH, RCTYPE_FISH, RCAREA_LOST_WOODS,           ACTOR_EN_FISH,  SCENE_GROTTOS,  1,    0x00, "Near Shortcuts Grotto Fish",   "LW Near Shortcuts Grotto Fish",    RHT_LW_NEAR_SHORTCUTS_GROTTO_FISH,  RG_FISH, { Category::cFish }, SpoilerCollectionCheck::Fish(0x14, SCENE_GROTTOS), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[RC_HF_SOUTHEAST_GROTTO_FISH] =        Location::Base(RC_HF_SOUTHEAST_GROTTO_FISH,         RCQUEST_BOTH, RCTYPE_FISH, RCAREA_HYRULE_FIELD,         ACTOR_EN_FISH,  SCENE_GROTTOS,  1,    0x00, "Southeast Grotto Fish",        "HF Southeast Grotto Fish",         RHT_HF_SOUTHEAST_GROTTO_FISH,       RG_FISH, { Category::cFish }, SpoilerCollectionCheck::Fish(0x22, SCENE_GROTTOS), SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[RC_HF_OPEN_GROTTO_FISH] =             Location::Base(RC_HF_OPEN_GROTTO_FISH,              RCQUEST_BOTH, RCTYPE_FISH, RCAREA_HYRULE_FIELD,         ACTOR_EN_FISH,  SCENE_GROTTOS,  1,    0x00, "Open Grotto Fish",             "HF Open Grotto Fish",              RHT_HF_OPEN_GROTTO_FISH,            RG_FISH, { Category::cFish }, SpoilerCollectionCheck::Fish(0x03, SCENE_GROTTOS), SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[RC_HF_NEAR_MARKET_GROTTO_FISH] =      Location::Base(RC_HF_NEAR_MARKET_GROTTO_FISH,       RCQUEST_BOTH, RCTYPE_FISH, RCAREA_HYRULE_FIELD,         ACTOR_EN_FISH,  SCENE_GROTTOS,  1,    0x00, "Near Market Grotto Fish",      "HF Near Market Grotto Fish",       RHT_HF_NEAR_MARKET_GROTTO_FISH,     RG_FISH, { Category::cFish }, SpoilerCollectionCheck::Fish(0x00, SCENE_GROTTOS), SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[RC_KAK_OPEN_GROTTO_FISH] =            Location::Base(RC_KAK_OPEN_GROTTO_FISH,             RCQUEST_BOTH, RCTYPE_FISH, RCAREA_KAKARIKO_VILLAGE,     ACTOR_EN_FISH,  SCENE_GROTTOS,  1,    0x00, "Open Grotto Fish",             "Kak Open Grotto Fish",             RHT_KAK_OPEN_GROTTO_FISH,           RG_FISH, { Category::cFish }, SpoilerCollectionCheck::Fish(0x28, SCENE_GROTTOS), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_DMT_STORMS_GROTTO_FISH] =          Location::Base(RC_DMT_STORMS_GROTTO_FISH,           RCQUEST_BOTH, RCTYPE_FISH, RCAREA_DEATH_MOUNTAIN_TRAIL, ACTOR_EN_FISH,  SCENE_GROTTOS,  1,    0x00, "Storms Grotto Fish",           "DMT Storms Grotto Fish",           RHT_DMT_STORMS_GROTTO_FISH,         RG_FISH, { Category::cFish }, SpoilerCollectionCheck::Fish(0x57, SCENE_GROTTOS), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMC_UPPER_GROTTO_FISH] =           Location::Base(RC_DMC_UPPER_GROTTO_FISH,            RCQUEST_BOTH, RCTYPE_FISH, RCAREA_DEATH_MOUNTAIN_CRATER,ACTOR_EN_FISH,  SCENE_GROTTOS,  1,    0x00, "Upper Grotto Fish",            "DMC Upper Grotto Fish",            RHT_DMC_UPPER_GROTTO_FISH,          RG_FISH, { Category::cFish }, SpoilerCollectionCheck::Fish(0x7A, SCENE_GROTTOS), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_ZR_OPEN_GROTTO_FISH] =             Location::Base(RC_ZR_OPEN_GROTTO_FISH,              RCQUEST_BOTH, RCTYPE_FISH, RCAREA_ZORAS_RIVER,          ACTOR_EN_FISH,  SCENE_GROTTOS,  1,    0x00, "Open Grotto Fish",             "ZR Open Grotto Fish",              RHT_ZR_OPEN_GROTTO_FISH,            RG_FISH, { Category::cFish }, SpoilerCollectionCheck::Fish(0x29, SCENE_GROTTOS), SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_KF_STORMS_GROTTO_FISH] =                                          Location::Base(RC_KF_STORMS_GROTTO_FISH,                                        RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_KOKIRI_FOREST,                ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                                 0x00, "Storms Grotto Fish",                          "KF Storms Grotto Fish",                                    RHT_KF_STORMS_GROTTO_FISH,                                       RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0x2C, SCENE_GROTTOS),                                                                            SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_FISH] =                                  Location::Base(RC_LW_NEAR_SHORTCUTS_GROTTO_FISH,                                RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LOST_WOODS,                   ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                                 0x00, "Near Shortcuts Grotto Fish",                  "LW Near Shortcuts Grotto Fish",                            RHT_LW_NEAR_SHORTCUTS_GROTTO_FISH,                               RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0x14, SCENE_GROTTOS),                                                                            SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_HF_SOUTHEAST_GROTTO_FISH] =                                       Location::Base(RC_HF_SOUTHEAST_GROTTO_FISH,                                     RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_HYRULE_FIELD,                 ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                                 0x00, "Southeast Grotto Fish",                       "HF Southeast Grotto Fish",                                 RHT_HF_SOUTHEAST_GROTTO_FISH,                                    RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0x22, SCENE_GROTTOS),                                                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_HF_OPEN_GROTTO_FISH] =                                            Location::Base(RC_HF_OPEN_GROTTO_FISH,                                          RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_HYRULE_FIELD,                 ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                                 0x00, "Open Grotto Fish",                            "HF Open Grotto Fish",                                      RHT_HF_OPEN_GROTTO_FISH,                                         RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0x03, SCENE_GROTTOS),                                                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_HF_NEAR_MARKET_GROTTO_FISH] =                                     Location::Base(RC_HF_NEAR_MARKET_GROTTO_FISH,                                   RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_HYRULE_FIELD,                 ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                                 0x00, "Near Market Grotto Fish",                     "HF Near Market Grotto Fish",                               RHT_HF_NEAR_MARKET_GROTTO_FISH,                                  RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0x00, SCENE_GROTTOS),                                                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_KAK_OPEN_GROTTO_FISH] =                                           Location::Base(RC_KAK_OPEN_GROTTO_FISH,                                         RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                                 0x00, "Open Grotto Fish",                            "Kak Open Grotto Fish",                                     RHT_KAK_OPEN_GROTTO_FISH,                                        RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0x28, SCENE_GROTTOS),                                                                            SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_DMT_STORMS_GROTTO_FISH] =                                         Location::Base(RC_DMT_STORMS_GROTTO_FISH,                                       RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                                 0x00, "Storms Grotto Fish",                          "DMT Storms Grotto Fish",                                   RHT_DMT_STORMS_GROTTO_FISH,                                      RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0x57, SCENE_GROTTOS),                                                                            SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMC_UPPER_GROTTO_FISH] =                                          Location::Base(RC_DMC_UPPER_GROTTO_FISH,                                        RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                                 0x00, "Upper Grotto Fish",                           "DMC Upper Grotto Fish",                                    RHT_DMC_UPPER_GROTTO_FISH,                                       RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0x7A, SCENE_GROTTOS),                                                                            SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_ZR_OPEN_GROTTO_FISH] =                                            Location::Base(RC_ZR_OPEN_GROTTO_FISH,                                          RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_ZORAS_RIVER,                  ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                                 0x00, "Open Grotto Fish",                            "ZR Open Grotto Fish",                                      RHT_ZR_OPEN_GROTTO_FISH,                                         RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0x29, SCENE_GROTTOS),                                                                            SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
     // Zora's Domain fish
-    locationTable[RC_ZD_FISH_1] =                       Location::Base(RC_ZD_FISH_1,                        RCQUEST_BOTH, RCTYPE_FISH, RCAREA_ZORAS_DOMAIN,         ACTOR_EN_FISH,  SCENE_ZORAS_DOMAIN, -1 ^ 0, 0x00, "Fish 1",                 "ZD Fish 1",                        RHT_ZD_FISH,                      RG_FISH, { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF, SCENE_ZORAS_DOMAIN), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZD_FISH_2] =                       Location::Base(RC_ZD_FISH_2,                        RCQUEST_BOTH, RCTYPE_FISH, RCAREA_ZORAS_DOMAIN,         ACTOR_EN_FISH,  SCENE_ZORAS_DOMAIN, -1 ^ 1, 0x00, "Fish 2",                 "ZD Fish 2",                        RHT_ZD_FISH,                      RG_FISH, { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF, SCENE_ZORAS_DOMAIN), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZD_FISH_3] =                       Location::Base(RC_ZD_FISH_3,                        RCQUEST_BOTH, RCTYPE_FISH, RCAREA_ZORAS_DOMAIN,         ACTOR_EN_FISH,  SCENE_ZORAS_DOMAIN, -1 ^ 2, 0x00, "Fish 3",                 "ZD Fish 3",                        RHT_ZD_FISH,                      RG_FISH, { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF, SCENE_ZORAS_DOMAIN), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZD_FISH_4] =                       Location::Base(RC_ZD_FISH_4,                        RCQUEST_BOTH, RCTYPE_FISH, RCAREA_ZORAS_DOMAIN,         ACTOR_EN_FISH,  SCENE_ZORAS_DOMAIN, -1 ^ 3, 0x00, "Fish 4",                 "ZD Fish 4",                        RHT_ZD_FISH,                      RG_FISH, { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF, SCENE_ZORAS_DOMAIN), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZD_FISH_5] =                       Location::Base(RC_ZD_FISH_5,                        RCQUEST_BOTH, RCTYPE_FISH, RCAREA_ZORAS_DOMAIN,         ACTOR_EN_FISH,  SCENE_ZORAS_DOMAIN, -1 ^ 4, 0x00, "Fish 5",                 "ZD Fish 5",                        RHT_ZD_FISH,                      RG_FISH, { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF, SCENE_ZORAS_DOMAIN), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZD_FISH_1] =                                                      Location::Base(RC_ZD_FISH_1,                                                    RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_FISH,        SCENE_ZORAS_DOMAIN,                 -1 ^ 0,                                            0x00, "Fish 1",                                      "ZD Fish 1",                                                RHT_ZD_FISH,                                                     RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF, SCENE_ZORAS_DOMAIN),                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZD_FISH_2] =                                                      Location::Base(RC_ZD_FISH_2,                                                    RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_FISH,        SCENE_ZORAS_DOMAIN,                 -1 ^ 1,                                            0x00, "Fish 2",                                      "ZD Fish 2",                                                RHT_ZD_FISH,                                                     RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF, SCENE_ZORAS_DOMAIN),                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZD_FISH_3] =                                                      Location::Base(RC_ZD_FISH_3,                                                    RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_FISH,        SCENE_ZORAS_DOMAIN,                 -1 ^ 2,                                            0x00, "Fish 3",                                      "ZD Fish 3",                                                RHT_ZD_FISH,                                                     RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF, SCENE_ZORAS_DOMAIN),                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZD_FISH_4] =                                                      Location::Base(RC_ZD_FISH_4,                                                    RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_FISH,        SCENE_ZORAS_DOMAIN,                 -1 ^ 3,                                            0x00, "Fish 4",                                      "ZD Fish 4",                                                RHT_ZD_FISH,                                                     RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF, SCENE_ZORAS_DOMAIN),                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZD_FISH_5] =                                                      Location::Base(RC_ZD_FISH_5,                                                    RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_FISH,        SCENE_ZORAS_DOMAIN,                 -1 ^ 4,                                            0x00, "Fish 5",                                      "ZD Fish 5",                                                RHT_ZD_FISH,                                                     RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF, SCENE_ZORAS_DOMAIN),                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
 
 
     // Gossip Stones
-    //            RandomizerCheck                                           Randomizer Check                    Quest            Area                          Scene                        Params  Flag  Short Name                       Spoiler name                       Categories
-    locationTable[RC_DMC_GOSSIP_STONE] =                Location::HintStone(RC_DMC_GOSSIP_STONE,                RCQUEST_BOTH,    RCAREA_DEATH_MOUNTAIN_CRATER, SCENE_DEATH_MOUNTAIN_CRATER, 14341,  0x05, "Gossip Stone",                  "DMC Gossip Stone",                {});
-    locationTable[RC_DMT_GOSSIP_STONE] =                Location::HintStone(RC_DMT_GOSSIP_STONE,                RCQUEST_BOTH,    RCAREA_DEATH_MOUNTAIN_TRAIL,  SCENE_DEATH_MOUNTAIN_TRAIL,  14340,  0x04, "Gossip Stone",                  "DMT Gossip Stone",                {});
-    locationTable[RC_COLOSSUS_GOSSIP_STONE] =           Location::HintStone(RC_COLOSSUS_GOSSIP_STONE,           RCQUEST_BOTH,    RCAREA_DESERT_COLOSSUS,       SCENE_DESERT_COLOSSUS,       14362,  0x1A, "Gossip Stone",                  "Colossus Gossip Stone",           {});
-    locationTable[RC_DODONGOS_CAVERN_GOSSIP_STONE] =    Location::HintStone(RC_DODONGOS_CAVERN_GOSSIP_STONE,    RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,       SCENE_DODONGOS_CAVERN,       4372,   0x14, "Gossip Stone",                  "Dodongo's Cavern Gossip Stone",   {});
-    locationTable[RC_GV_GOSSIP_STONE] =                 Location::HintStone(RC_GV_GOSSIP_STONE,                 RCQUEST_BOTH,    RCAREA_GERUDO_VALLEY,         SCENE_GERUDO_VALLEY,         14353,  0x11, "Gossip Stone",                  "GV Gossip Stone",                 {});
-    locationTable[RC_GC_MAZE_GOSSIP_STONE] =            Location::HintStone(RC_GC_MAZE_GOSSIP_STONE,            RCQUEST_BOTH,    RCAREA_GORON_CITY,            SCENE_GORON_CITY,            14357,  0x15, "Maze Gossip Stone",             "GC Maze Gossip Stone",            {});
-    locationTable[RC_GC_MEDIGORON_GOSSIP_STONE] =       Location::HintStone(RC_GC_MEDIGORON_GOSSIP_STONE,       RCQUEST_BOTH,    RCAREA_GORON_CITY,            SCENE_GORON_CITY,            14873,  0x19, "Medigoron Gossip Stone",        "GC Medigoron Gossip Stone",       {});
-    locationTable[RC_GY_GOSSIP_STONE] =                 Location::HintStone(RC_GY_GOSSIP_STONE,                 RCQUEST_BOTH,    RCAREA_GRAVEYARD,             SCENE_GRAVEYARD,             14346,  0x0A, "Gossip Stone",                  "GY Gossip Stone",                 {});
-    locationTable[RC_HC_MALON_GOSSIP_STONE] =           Location::HintStone(RC_HC_MALON_GOSSIP_STONE,           RCQUEST_BOTH,    RCAREA_HYRULE_CASTLE,         SCENE_HYRULE_CASTLE,         14610,  0x12, "Malon Gossip Stone",            "HC Malon Gossip Stone",           {});
-    locationTable[RC_HC_ROCK_WALL_GOSSIP_STONE] =       Location::HintStone(RC_HC_ROCK_WALL_GOSSIP_STONE,       RCQUEST_BOTH,    RCAREA_HYRULE_CASTLE,         SCENE_HYRULE_CASTLE,         14347,  0x0B, "Rock Wall Gossip Stone",        "HC Rock Wall Gossip Stone",       {});
-    locationTable[RC_HC_STORMS_GROTTO_GOSSIP_STONE] =   Location::HintStone(RC_HC_STORMS_GROTTO_GOSSIP_STONE,   RCQUEST_BOTH,    RCAREA_HYRULE_CASTLE,         SCENE_GROTTOS,               14355,  0x13, "Storms Grotto Gossip Stone",    "HC Storms Grotto Gossip Stone",   {});
-    locationTable[RC_KF_DEKU_TREE_LEFT_GOSSIP_STONE] =  Location::HintStone(RC_KF_DEKU_TREE_LEFT_GOSSIP_STONE,  RCQUEST_BOTH,    RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,         14623,  0x1F, "Deku Tree Left Gossip Stone",   "KF Deku Tree Left Gossip Stone",  {});
-    locationTable[RC_KF_DEKU_TREE_RIGHT_GOSSIP_STONE] = Location::HintStone(RC_KF_DEKU_TREE_RIGHT_GOSSIP_STONE, RCQUEST_BOTH,    RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,         14880,  0x20, "Deku Tree Right Gossip Stone",  "KF Deku Tree Right Gossip Stone", {});
-    locationTable[RC_KF_GOSSIP_STONE] =                 Location::HintStone(RC_KF_GOSSIP_STONE,                 RCQUEST_BOTH,    RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,         14366,  0x1E, "Gossip Stone",                  "KF Gossip Stone",                 {});
-    locationTable[RC_KF_STORMS_GOSSIP_STONE] =          Location::HintStone(RC_KF_STORMS_GOSSIP_STONE,          RCQUEST_BOTH,    RCAREA_KOKIRI_FOREST,         SCENE_GROTTOS,               -22988, 0x3C, "Storms Gossip Stone",           "KF Storms Gossip Stone",          {});
-    locationTable[RC_LH_LAB_GOSSIP_STONE] =             Location::HintStone(RC_LH_LAB_GOSSIP_STONE,             RCQUEST_BOTH,    RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,            14339,  0x03, "Lab Gossip Stone",              "LH Lab Gossip Stone",             {});
-    locationTable[RC_LH_SOUTHEAST_GOSSIP_STONE] =       Location::HintStone(RC_LH_SOUTHEAST_GOSSIP_STONE,       RCQUEST_BOTH,    RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,            14863,  0x0F, "Southeast Gossip Stone",        "LH Southeast Gossip Stone",       {});
-    locationTable[RC_LH_SOUTHWEST_GOSSIP_STONE] =       Location::HintStone(RC_LH_SOUTHWEST_GOSSIP_STONE,       RCQUEST_BOTH,    RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,            14600,  0x08, "Southwest Gossip Stone",        "LH Southwest Gossip Stone",       {});
-    locationTable[RC_LW_GOSSIP_STONE] =                 Location::HintStone(RC_LW_GOSSIP_STONE,                 RCQUEST_BOTH,    RCAREA_LOST_WOODS,            SCENE_LOST_WOODS,            14365,  0x1D, "Gossip Stone",                  "LW Gossip Stone",                 {});
-    locationTable[RC_SFM_MAZE_LOWER_GOSSIP_STONE] =     Location::HintStone(RC_SFM_MAZE_LOWER_GOSSIP_STONE,     RCQUEST_BOTH,    RCAREA_SACRED_FOREST_MEADOW,  SCENE_SACRED_FOREST_MEADOW,  14358,  0x16, "Maze Lower Gossip Stone",       "SFM Maze Lower Gossip Stone",     {});
-    locationTable[RC_SFM_MAZE_UPPER_GOSSIP_STONE] =     Location::HintStone(RC_SFM_MAZE_UPPER_GOSSIP_STONE,     RCQUEST_BOTH,    RCAREA_SACRED_FOREST_MEADOW,  SCENE_SACRED_FOREST_MEADOW,  14615,  0x17, "Maze Upper Gossip Stone",       "SFM Maze Upper Gossip Stone",     {});
-    locationTable[RC_SFM_SARIA_GOSSIP_STONE] =          Location::HintStone(RC_SFM_SARIA_GOSSIP_STONE,          RCQUEST_BOTH,    RCAREA_SACRED_FOREST_MEADOW,  SCENE_SACRED_FOREST_MEADOW,  14876,  0x1C, "Saria Gossip Stone",            "SFM Saria Gossip Stone",          {});
-    locationTable[RC_TOT_LEFT_GOSSIP_STONE] =           Location::HintStone(RC_TOT_LEFT_GOSSIP_STONE,           RCQUEST_BOTH,    RCAREA_MARKET,                SCENE_ID_MAX,                0x00,   0x06, "ToT Left Gossip Stone",         "ToT Left Gossip Stone",           {});
-    locationTable[RC_TOT_RIGHT_GOSSIP_STONE] =          Location::HintStone(RC_TOT_RIGHT_GOSSIP_STONE,          RCQUEST_BOTH,    RCAREA_MARKET,                SCENE_ID_MAX,                0x00,   0x07, "ToT Right Gossip Stone",        "ToT Right Gossip Stone",          {});
-    locationTable[RC_TOT_RIGHT_CENTER_GOSSIP_STONE] =   Location::HintStone(RC_TOT_RIGHT_CENTER_GOSSIP_STONE,   RCQUEST_BOTH,    RCAREA_MARKET,                SCENE_ID_MAX,                0x00,   0x10, "ToT Right Center Gossip Stone", "ToT Right Center Gossip Stone",   {});
-    locationTable[RC_TOT_LEFT_CENTER_GOSSIP_STONE] =    Location::HintStone(RC_TOT_LEFT_CENTER_GOSSIP_STONE,    RCQUEST_BOTH,    RCAREA_MARKET,                SCENE_ID_MAX,                0x00,   0x0E, "ToT Left Center Gossip Stone",  "ToT Left Center Gossip Stone",    {});
-    locationTable[RC_ZD_GOSSIP_STONE] =                 Location::HintStone(RC_ZD_GOSSIP_STONE,                 RCQUEST_BOTH,    RCAREA_ZORAS_DOMAIN,          SCENE_ZORAS_DOMAIN,          14345,  0x09, "Gossip Stone",                  "ZD Gossip Stone",                 {});
-    locationTable[RC_FAIRY_GOSSIP_STONE] =              Location::HintStone(RC_FAIRY_GOSSIP_STONE,              RCQUEST_BOTH,    RCAREA_ZORAS_FOUNTAIN,        SCENE_ZORAS_FOUNTAIN,        0x00,   0x01, "Fairy Gossip Stone",            "Fairy Gossip Stone",              {});
-    locationTable[RC_JABU_GOSSIP_STONE] =               Location::HintStone(RC_JABU_GOSSIP_STONE,               RCQUEST_BOTH,    RCAREA_ZORAS_FOUNTAIN,        SCENE_ZORAS_FOUNTAIN,        0x00,   0x02, "Jabu Gossip Stone",             "Jabu Gossip Stone",               {});
-    locationTable[RC_ZR_NEAR_GROTTOS_GOSSIP_STONE] =    Location::HintStone(RC_ZR_NEAR_GROTTOS_GOSSIP_STONE,    RCQUEST_BOTH,    RCAREA_ZORAS_RIVER,           SCENE_ZORAS_RIVER,           14605,  0x0D, "Near Grottos Gossip Stone",     "ZR Near Grottos Gossip Stone",    {});
-    locationTable[RC_ZR_NEAR_DOMAIN_GOSSIP_STONE] =     Location::HintStone(RC_ZR_NEAR_DOMAIN_GOSSIP_STONE,     RCQUEST_BOTH,    RCAREA_ZORAS_RIVER,           SCENE_ZORAS_RIVER,           14860,  0x0C, "Near Domain Gossip Stone",      "ZR Near Domain Gossip Stone",     {});
-    locationTable[RC_HF_COW_GROTTO_GOSSIP_STONE] =      Location::HintStone(RC_HF_COW_GROTTO_GOSSIP_STONE,      RCQUEST_BOTH,    RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,               14363,  0x1B, "Cow Grotto Gossip Stone",       "HF Cow Grotto Gossip Stone",      {});
-    locationTable[RC_HF_NEAR_MARKET_GOSSIP_STONE] =     Location::HintStone(RC_HF_NEAR_MARKET_GOSSIP_STONE,     RCQUEST_BOTH,    RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,               -22944, 0x30, "Near Market Gossip Stone",      "HF Near Market Gossip Stone",     {});
-    locationTable[RC_HF_SOUTHEAST_GOSSIP_STONE] =       Location::HintStone(RC_HF_SOUTHEAST_GOSSIP_STONE,       RCQUEST_BOTH,    RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,               -22978, 0x32, "Southeast Gossip Stone",        "HF Southeast Gossip Stone",       {});
-    locationTable[RC_HF_OPEN_GROTTO_GOSSIP_STONE] =     Location::HintStone(RC_HF_OPEN_GROTTO_GOSSIP_STONE,     RCQUEST_BOTH,    RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,               -22947, 0x33, "Open Grotto Gossip Stone",      "HF Open Grotto Gossip Stone",     {});
-    locationTable[RC_KAK_OPEN_GROTTO_GOSSIP_STONE] =    Location::HintStone(RC_KAK_OPEN_GROTTO_GOSSIP_STONE,    RCQUEST_BOTH,    RCAREA_KAKARIKO_VILLAGE,      SCENE_GROTTOS,               -22984, 0x38, "Open Grotto Gossip Stone",      "Kak Open Grotto Gossip Stone",    {});
-    locationTable[RC_ZR_OPEN_GROTTO_GOSSIP_STONE] =     Location::HintStone(RC_ZR_OPEN_GROTTO_GOSSIP_STONE,     RCQUEST_BOTH,    RCAREA_ZORAS_RIVER,           SCENE_GROTTOS,               -22985, 0x39, "Open Grotto Gossip Stone",      "ZR Open Grotto Gossip Stone",     {});
-    locationTable[RC_LW_NEAR_SHORTCUTS_GOSSIP_STONE] =  Location::HintStone(RC_LW_NEAR_SHORTCUTS_GOSSIP_STONE,  RCQUEST_BOTH,    RCAREA_LOST_WOODS,            SCENE_GROTTOS,               -22964, 0x34, "Near Shortcuts Gossip Stone",   "LW Near Shortcuts Gossip Stone",  {});
-    locationTable[RC_DMT_STORMS_GROTTO_GOSSIP_STONE] =  Location::HintStone(RC_DMT_STORMS_GROTTO_GOSSIP_STONE,  RCQUEST_BOTH,    RCAREA_DEATH_MOUNTAIN_TRAIL,  SCENE_GROTTOS,               -23255, 0x37, "Storms Grotto Gossip Stone",    "DMT Storms Grotto Gossip Stone",  {});
-    locationTable[RC_DMC_UPPER_GROTTO_GOSSIP_STONE] =   Location::HintStone(RC_DMC_UPPER_GROTTO_GOSSIP_STONE,   RCQUEST_BOTH,    RCAREA_DEATH_MOUNTAIN_CRATER, SCENE_GROTTOS,               -23802, 0x3A, "Upper Grotto Gossip Stone",     "DMC Upper Grotto Gossip Stone",   {});
+    locationTable[RC_DMC_GOSSIP_STONE] =                                          Location::HintStone(RC_DMC_GOSSIP_STONE,                                             RCQUEST_BOTH,                                        RCAREA_DEATH_MOUNTAIN_CRATER,                              SCENE_DEATH_MOUNTAIN_CRATER,        14341,                                             0x05, "Gossip Stone",                                "DMC Gossip Stone",                {});
+    locationTable[RC_DMT_GOSSIP_STONE] =                                          Location::HintStone(RC_DMT_GOSSIP_STONE,                                             RCQUEST_BOTH,                                        RCAREA_DEATH_MOUNTAIN_TRAIL,                               SCENE_DEATH_MOUNTAIN_TRAIL,         14340,                                             0x04, "Gossip Stone",                                "DMT Gossip Stone",                {});
+    locationTable[RC_COLOSSUS_GOSSIP_STONE] =                                     Location::HintStone(RC_COLOSSUS_GOSSIP_STONE,                                        RCQUEST_BOTH,                                        RCAREA_DESERT_COLOSSUS,                                    SCENE_DESERT_COLOSSUS,              14362,                                             0x1A, "Gossip Stone",                                "Colossus Gossip Stone",           {});
+    locationTable[RC_DODONGOS_CAVERN_GOSSIP_STONE] =                              Location::HintStone(RC_DODONGOS_CAVERN_GOSSIP_STONE,                                 RCQUEST_VANILLA,                                     RCAREA_DODONGOS_CAVERN,                                    SCENE_DODONGOS_CAVERN,              4372,                                              0x14, "Gossip Stone",                                "Dodongo's Cavern Gossip Stone",   {});
+    locationTable[RC_GV_GOSSIP_STONE] =                                           Location::HintStone(RC_GV_GOSSIP_STONE,                                              RCQUEST_BOTH,                                        RCAREA_GERUDO_VALLEY,                                      SCENE_GERUDO_VALLEY,                14353,                                             0x11, "Gossip Stone",                                "GV Gossip Stone",                 {});
+    locationTable[RC_GC_MAZE_GOSSIP_STONE] =                                      Location::HintStone(RC_GC_MAZE_GOSSIP_STONE,                                         RCQUEST_BOTH,                                        RCAREA_GORON_CITY,                                         SCENE_GORON_CITY,                   14357,                                             0x15, "Maze Gossip Stone",                           "GC Maze Gossip Stone",            {});
+    locationTable[RC_GC_MEDIGORON_GOSSIP_STONE] =                                 Location::HintStone(RC_GC_MEDIGORON_GOSSIP_STONE,                                    RCQUEST_BOTH,                                        RCAREA_GORON_CITY,                                         SCENE_GORON_CITY,                   14873,                                             0x19, "Medigoron Gossip Stone",                      "GC Medigoron Gossip Stone",       {});
+    locationTable[RC_GY_GOSSIP_STONE] =                                           Location::HintStone(RC_GY_GOSSIP_STONE,                                              RCQUEST_BOTH,                                        RCAREA_GRAVEYARD,                                          SCENE_GRAVEYARD,                    14346,                                             0x0A, "Gossip Stone",                                "GY Gossip Stone",                 {});
+    locationTable[RC_HC_MALON_GOSSIP_STONE] =                                     Location::HintStone(RC_HC_MALON_GOSSIP_STONE,                                        RCQUEST_BOTH,                                        RCAREA_HYRULE_CASTLE,                                      SCENE_HYRULE_CASTLE,                14610,                                             0x12, "Malon Gossip Stone",                          "HC Malon Gossip Stone",           {});
+    locationTable[RC_HC_ROCK_WALL_GOSSIP_STONE] =                                 Location::HintStone(RC_HC_ROCK_WALL_GOSSIP_STONE,                                    RCQUEST_BOTH,                                        RCAREA_HYRULE_CASTLE,                                      SCENE_HYRULE_CASTLE,                14347,                                             0x0B, "Rock Wall Gossip Stone",                      "HC Rock Wall Gossip Stone",       {});
+    locationTable[RC_HC_STORMS_GROTTO_GOSSIP_STONE] =                             Location::HintStone(RC_HC_STORMS_GROTTO_GOSSIP_STONE,                                RCQUEST_BOTH,                                        RCAREA_HYRULE_CASTLE,                                      SCENE_GROTTOS,                      14355,                                             0x13, "Storms Grotto Gossip Stone",                  "HC Storms Grotto Gossip Stone",   {});
+    locationTable[RC_KF_DEKU_TREE_LEFT_GOSSIP_STONE] =                            Location::HintStone(RC_KF_DEKU_TREE_LEFT_GOSSIP_STONE,                               RCQUEST_BOTH,                                        RCAREA_KOKIRI_FOREST,                                      SCENE_KOKIRI_FOREST,                14623,                                             0x1F, "Deku Tree Left Gossip Stone",                 "KF Deku Tree Left Gossip Stone",  {});
+    locationTable[RC_KF_DEKU_TREE_RIGHT_GOSSIP_STONE] =                           Location::HintStone(RC_KF_DEKU_TREE_RIGHT_GOSSIP_STONE,                              RCQUEST_BOTH,                                        RCAREA_KOKIRI_FOREST,                                      SCENE_KOKIRI_FOREST,                14880,                                             0x20, "Deku Tree Right Gossip Stone",                "KF Deku Tree Right Gossip Stone", {});
+    locationTable[RC_KF_GOSSIP_STONE] =                                           Location::HintStone(RC_KF_GOSSIP_STONE,                                              RCQUEST_BOTH,                                        RCAREA_KOKIRI_FOREST,                                      SCENE_KOKIRI_FOREST,                14366,                                             0x1E, "Gossip Stone",                                "KF Gossip Stone",                 {});
+    locationTable[RC_KF_STORMS_GOSSIP_STONE] =                                    Location::HintStone(RC_KF_STORMS_GOSSIP_STONE,                                       RCQUEST_BOTH,                                        RCAREA_KOKIRI_FOREST,                                      SCENE_GROTTOS,                      -22988,                                            0x3C, "Storms Gossip Stone",                         "KF Storms Gossip Stone",          {});
+    locationTable[RC_LH_LAB_GOSSIP_STONE] =                                       Location::HintStone(RC_LH_LAB_GOSSIP_STONE,                                          RCQUEST_BOTH,                                        RCAREA_LAKE_HYLIA,                                         SCENE_LAKE_HYLIA,                   14339,                                             0x03, "Lab Gossip Stone",                            "LH Lab Gossip Stone",             {});
+    locationTable[RC_LH_SOUTHEAST_GOSSIP_STONE] =                                 Location::HintStone(RC_LH_SOUTHEAST_GOSSIP_STONE,                                    RCQUEST_BOTH,                                        RCAREA_LAKE_HYLIA,                                         SCENE_LAKE_HYLIA,                   14863,                                             0x0F, "Southeast Gossip Stone",                      "LH Southeast Gossip Stone",       {});
+    locationTable[RC_LH_SOUTHWEST_GOSSIP_STONE] =                                 Location::HintStone(RC_LH_SOUTHWEST_GOSSIP_STONE,                                    RCQUEST_BOTH,                                        RCAREA_LAKE_HYLIA,                                         SCENE_LAKE_HYLIA,                   14600,                                             0x08, "Southwest Gossip Stone",                      "LH Southwest Gossip Stone",       {});
+    locationTable[RC_LW_GOSSIP_STONE] =                                           Location::HintStone(RC_LW_GOSSIP_STONE,                                              RCQUEST_BOTH,                                        RCAREA_LOST_WOODS,                                         SCENE_LOST_WOODS,                   14365,                                             0x1D, "Gossip Stone",                                "LW Gossip Stone",                 {});
+    locationTable[RC_SFM_MAZE_LOWER_GOSSIP_STONE] =                               Location::HintStone(RC_SFM_MAZE_LOWER_GOSSIP_STONE,                                  RCQUEST_BOTH,                                        RCAREA_SACRED_FOREST_MEADOW,                               SCENE_SACRED_FOREST_MEADOW,         14358,                                             0x16, "Maze Lower Gossip Stone",                     "SFM Maze Lower Gossip Stone",     {});
+    locationTable[RC_SFM_MAZE_UPPER_GOSSIP_STONE] =                               Location::HintStone(RC_SFM_MAZE_UPPER_GOSSIP_STONE,                                  RCQUEST_BOTH,                                        RCAREA_SACRED_FOREST_MEADOW,                               SCENE_SACRED_FOREST_MEADOW,         14615,                                             0x17, "Maze Upper Gossip Stone",                     "SFM Maze Upper Gossip Stone",     {});
+    locationTable[RC_SFM_SARIA_GOSSIP_STONE] =                                    Location::HintStone(RC_SFM_SARIA_GOSSIP_STONE,                                       RCQUEST_BOTH,                                        RCAREA_SACRED_FOREST_MEADOW,                               SCENE_SACRED_FOREST_MEADOW,         14876,                                             0x1C, "Saria Gossip Stone",                          "SFM Saria Gossip Stone",          {});
+    locationTable[RC_TOT_LEFT_GOSSIP_STONE] =                                     Location::HintStone(RC_TOT_LEFT_GOSSIP_STONE,                                        RCQUEST_BOTH,                                        RCAREA_MARKET,                                             SCENE_ID_MAX,                       0x00,                                              0x06, "ToT Left Gossip Stone",                       "ToT Left Gossip Stone",           {});
+    locationTable[RC_TOT_RIGHT_GOSSIP_STONE] =                                    Location::HintStone(RC_TOT_RIGHT_GOSSIP_STONE,                                       RCQUEST_BOTH,                                        RCAREA_MARKET,                                             SCENE_ID_MAX,                       0x00,                                              0x07, "ToT Right Gossip Stone",                      "ToT Right Gossip Stone",          {});
+    locationTable[RC_TOT_RIGHT_CENTER_GOSSIP_STONE] =                             Location::HintStone(RC_TOT_RIGHT_CENTER_GOSSIP_STONE,                                RCQUEST_BOTH,                                        RCAREA_MARKET,                                             SCENE_ID_MAX,                       0x00,                                              0x10, "ToT Right Center Gossip Stone",               "ToT Right Center Gossip Stone",   {});
+    locationTable[RC_TOT_LEFT_CENTER_GOSSIP_STONE] =                              Location::HintStone(RC_TOT_LEFT_CENTER_GOSSIP_STONE,                                 RCQUEST_BOTH,                                        RCAREA_MARKET,                                             SCENE_ID_MAX,                       0x00,                                              0x0E, "ToT Left Center Gossip Stone",                "ToT Left Center Gossip Stone",    {});
+    locationTable[RC_ZD_GOSSIP_STONE] =                                           Location::HintStone(RC_ZD_GOSSIP_STONE,                                              RCQUEST_BOTH,                                        RCAREA_ZORAS_DOMAIN,                                       SCENE_ZORAS_DOMAIN,                 14345,                                             0x09, "Gossip Stone",                                "ZD Gossip Stone",                 {});
+    locationTable[RC_FAIRY_GOSSIP_STONE] =                                        Location::HintStone(RC_FAIRY_GOSSIP_STONE,                                           RCQUEST_BOTH,                                        RCAREA_ZORAS_FOUNTAIN,                                     SCENE_ZORAS_FOUNTAIN,               0x00,                                              0x01, "Fairy Gossip Stone",                          "Fairy Gossip Stone",              {});
+    locationTable[RC_JABU_GOSSIP_STONE] =                                         Location::HintStone(RC_JABU_GOSSIP_STONE,                                            RCQUEST_BOTH,                                        RCAREA_ZORAS_FOUNTAIN,                                     SCENE_ZORAS_FOUNTAIN,               0x00,                                              0x02, "Jabu Gossip Stone",                           "Jabu Gossip Stone",               {});
+    locationTable[RC_ZR_NEAR_GROTTOS_GOSSIP_STONE] =                              Location::HintStone(RC_ZR_NEAR_GROTTOS_GOSSIP_STONE,                                 RCQUEST_BOTH,                                        RCAREA_ZORAS_RIVER,                                        SCENE_ZORAS_RIVER,                  14605,                                             0x0D, "Near Grottos Gossip Stone",                   "ZR Near Grottos Gossip Stone",    {});
+    locationTable[RC_ZR_NEAR_DOMAIN_GOSSIP_STONE] =                               Location::HintStone(RC_ZR_NEAR_DOMAIN_GOSSIP_STONE,                                  RCQUEST_BOTH,                                        RCAREA_ZORAS_RIVER,                                        SCENE_ZORAS_RIVER,                  14860,                                             0x0C, "Near Domain Gossip Stone",                    "ZR Near Domain Gossip Stone",     {});
+    locationTable[RC_HF_COW_GROTTO_GOSSIP_STONE] =                                Location::HintStone(RC_HF_COW_GROTTO_GOSSIP_STONE,                                   RCQUEST_BOTH,                                        RCAREA_HYRULE_FIELD,                                       SCENE_GROTTOS,                      14363,                                             0x1B, "Cow Grotto Gossip Stone",                     "HF Cow Grotto Gossip Stone",      {});
+    locationTable[RC_HF_NEAR_MARKET_GOSSIP_STONE] =                               Location::HintStone(RC_HF_NEAR_MARKET_GOSSIP_STONE,                                  RCQUEST_BOTH,                                        RCAREA_HYRULE_FIELD,                                       SCENE_GROTTOS,                      -22944,                                            0x30, "Near Market Gossip Stone",                    "HF Near Market Gossip Stone",     {});
+    locationTable[RC_HF_SOUTHEAST_GOSSIP_STONE] =                                 Location::HintStone(RC_HF_SOUTHEAST_GOSSIP_STONE,                                    RCQUEST_BOTH,                                        RCAREA_HYRULE_FIELD,                                       SCENE_GROTTOS,                      -22978,                                            0x32, "Southeast Gossip Stone",                      "HF Southeast Gossip Stone",       {});
+    locationTable[RC_HF_OPEN_GROTTO_GOSSIP_STONE] =                               Location::HintStone(RC_HF_OPEN_GROTTO_GOSSIP_STONE,                                  RCQUEST_BOTH,                                        RCAREA_HYRULE_FIELD,                                       SCENE_GROTTOS,                      -22947,                                            0x33, "Open Grotto Gossip Stone",                    "HF Open Grotto Gossip Stone",     {});
+    locationTable[RC_KAK_OPEN_GROTTO_GOSSIP_STONE] =                              Location::HintStone(RC_KAK_OPEN_GROTTO_GOSSIP_STONE,                                 RCQUEST_BOTH,                                        RCAREA_KAKARIKO_VILLAGE,                                   SCENE_GROTTOS,                      -22984,                                            0x38, "Open Grotto Gossip Stone",                    "Kak Open Grotto Gossip Stone",    {});
+    locationTable[RC_ZR_OPEN_GROTTO_GOSSIP_STONE] =                               Location::HintStone(RC_ZR_OPEN_GROTTO_GOSSIP_STONE,                                  RCQUEST_BOTH,                                        RCAREA_ZORAS_RIVER,                                        SCENE_GROTTOS,                      -22985,                                            0x39, "Open Grotto Gossip Stone",                    "ZR Open Grotto Gossip Stone",     {});
+    locationTable[RC_LW_NEAR_SHORTCUTS_GOSSIP_STONE] =                            Location::HintStone(RC_LW_NEAR_SHORTCUTS_GOSSIP_STONE,                               RCQUEST_BOTH,                                        RCAREA_LOST_WOODS,                                         SCENE_GROTTOS,                      -22964,                                            0x34, "Near Shortcuts Gossip Stone",                 "LW Near Shortcuts Gossip Stone",  {});
+    locationTable[RC_DMT_STORMS_GROTTO_GOSSIP_STONE] =                            Location::HintStone(RC_DMT_STORMS_GROTTO_GOSSIP_STONE,                               RCQUEST_BOTH,                                        RCAREA_DEATH_MOUNTAIN_TRAIL,                               SCENE_GROTTOS,                      -23255,                                            0x37, "Storms Grotto Gossip Stone",                  "DMT Storms Grotto Gossip Stone",  {});
+    locationTable[RC_DMC_UPPER_GROTTO_GOSSIP_STONE] =                             Location::HintStone(RC_DMC_UPPER_GROTTO_GOSSIP_STONE,                                RCQUEST_BOTH,                                        RCAREA_DEATH_MOUNTAIN_CRATER,                              SCENE_GROTTOS,                      -23802,                                            0x3A, "Upper Grotto Gossip Stone",                   "DMC Upper Grotto Gossip Stone",   {});
 
     // Other Hints
-    locationTable[RC_GANONDORF_HINT]    = Location::OtherHint(RC_GANONDORF_HINT,   RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE, RCAREA_GANONS_CASTLE, ACTOR_EN_GANON_MANT, SCENE_GANON_BOSS,           "Ganondorf Hint",   "Ganondorf Hint");
-    locationTable[RC_SHEIK_HINT_GC]     = Location::OtherHint(RC_SHEIK_HINT_GC,    RCQUEST_VANILLA, RCTYPE_GOSSIP_STONE, RCAREA_GANONS_CASTLE, ACTOR_EN_XC,         SCENE_INSIDE_GANONS_CASTLE, "Sheik Hint",       "Sheik Hint in Ganons Castle");
-    locationTable[RC_SHEIK_HINT_MQ_GC]  = Location::OtherHint(RC_SHEIK_HINT_MQ_GC, RCQUEST_MQ,      RCTYPE_GOSSIP_STONE, RCAREA_GANONS_CASTLE, ACTOR_EN_XC,         SCENE_INSIDE_GANONS_CASTLE, "Sheik Hint",       "Sheik Hint in MQ Ganons Castle");
-    locationTable[RC_DAMPE_HINT]        = Location::OtherHint(RC_DAMPE_HINT,       RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE, RCAREA_GRAVEYARD,     ACTOR_ID_MAX,        SCENE_GRAVEKEEPERS_HUT,     "Diary Hint",       "Dampe's Diary Hint");
-    locationTable[RC_GREG_HINT]         = Location::OtherHint(RC_GREG_HINT,        RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE, RCAREA_MARKET,        ACTOR_EN_TAKARA_MAN, SCENE_TREASURE_BOX_SHOP,    "Greg Hint",        "Greg Hint");
-    locationTable[RC_SARIA_SONG_HINT]   = Location::OtherHint(RC_SARIA_SONG_HINT,  RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE, RCAREA_KOKIRI_FOREST, ACTOR_ID_MAX,        SCENE_ID_MAX,               "Sarias Song Hint", "Magic Hint Via Saria's Song");
-    locationTable[RC_ALTAR_HINT_CHILD]  = Location::OtherHint(RC_ALTAR_HINT_CHILD, RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE, RCAREA_MARKET,        ACTOR_ID_MAX,        SCENE_TEMPLE_OF_TIME,       "Child Altar Hint", "ToT Child Altar Text");
-    locationTable[RC_ALTAR_HINT_ADULT]  = Location::OtherHint(RC_ALTAR_HINT_ADULT, RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE, RCAREA_MARKET,        ACTOR_ID_MAX,        SCENE_TEMPLE_OF_TIME,       "Adult Altar Hint", "ToT Adult Altar Text");
-    locationTable[RC_FISHING_POLE_HINT] = Location::OtherHint(RC_FISHING_POLE_HINT,RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE, RCAREA_LAKE_HYLIA,    ACTOR_FISHING,       SCENE_FISHING_POND,         "Fishing Pole Hint","Fishing Pole Hint");
+    locationTable[RC_GANONDORF_HINT]    =                                         Location::OtherHint(RC_GANONDORF_HINT,                                               RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE,                RCAREA_GANONS_CASTLE,                ACTOR_EN_GANON_MANT,  SCENE_GANON_BOSS,                                                                            "Ganondorf Hint",                              "Ganondorf Hint");
+    locationTable[RC_SHEIK_HINT_GC]     =                                         Location::OtherHint(RC_SHEIK_HINT_GC,                                                RCQUEST_VANILLA, RCTYPE_GOSSIP_STONE,                RCAREA_GANONS_CASTLE,                ACTOR_EN_XC,          SCENE_INSIDE_GANONS_CASTLE,                                                                  "Sheik Hint",                                  "Sheik Hint in Ganons Castle");
+    locationTable[RC_SHEIK_HINT_MQ_GC]  =                                         Location::OtherHint(RC_SHEIK_HINT_MQ_GC,                                             RCQUEST_MQ,      RCTYPE_GOSSIP_STONE,                RCAREA_GANONS_CASTLE,                ACTOR_EN_XC,          SCENE_INSIDE_GANONS_CASTLE,                                                                  "Sheik Hint",                                  "Sheik Hint in MQ Ganons Castle");
+    locationTable[RC_DAMPE_HINT]        =                                         Location::OtherHint(RC_DAMPE_HINT,                                                   RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE,                RCAREA_GRAVEYARD,                    ACTOR_ID_MAX,         SCENE_GRAVEKEEPERS_HUT,                                                                      "Diary Hint",                                  "Dampe's Diary Hint");
+    locationTable[RC_GREG_HINT]         =                                         Location::OtherHint(RC_GREG_HINT,                                                    RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE,                RCAREA_MARKET,                       ACTOR_EN_TAKARA_MAN,  SCENE_TREASURE_BOX_SHOP,                                                                     "Greg Hint",                                   "Greg Hint");
+    locationTable[RC_SARIA_SONG_HINT]   =                                         Location::OtherHint(RC_SARIA_SONG_HINT,                                              RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE,                RCAREA_KOKIRI_FOREST,                ACTOR_ID_MAX,         SCENE_ID_MAX,                                                                                "Sarias Song Hint",                            "Magic Hint Via Saria's Song");
+    locationTable[RC_ALTAR_HINT_CHILD]  =                                         Location::OtherHint(RC_ALTAR_HINT_CHILD,                                             RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE,                RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_TEMPLE_OF_TIME,                                                                        "Child Altar Hint",                            "ToT Child Altar Text");
+    locationTable[RC_ALTAR_HINT_ADULT]  =                                         Location::OtherHint(RC_ALTAR_HINT_ADULT,                                             RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE,                RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_TEMPLE_OF_TIME,                                                                        "Adult Altar Hint",                            "ToT Adult Altar Text");
+    locationTable[RC_FISHING_POLE_HINT] =                                         Location::OtherHint(RC_FISHING_POLE_HINT,                                            RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE,                RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                                                                          "Fishing Pole Hint",                           "Fishing Pole Hint");
     
-    locationTable[RC_TRIFORCE_COMPLETED] = Location::Reward(RC_TRIFORCE_COMPLETED, RCQUEST_BOTH, RCTYPE_STANDARD, RCAREA_MARKET, ACTOR_ID_MAX, SCENE_ID_MAX, 0x00, 0x00, "Completed Triforce", "Completed Triforce", RHT_NONE, RG_NONE, {}, SpoilerCollectionCheck::None(), SpoilerCollectionCheckGroup::GROUP_NO_GROUP);
+    locationTable[RC_TRIFORCE_COMPLETED] =                                           Location::Reward(RC_TRIFORCE_COMPLETED,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x00, "Completed Triforce",                          "Completed Triforce",                                       RHT_NONE,                                                        RG_NONE,                              {},                                                     SpoilerCollectionCheck::None(),                                                                                               SpoilerCollectionCheckGroup::GROUP_NO_GROUP);
     // clang-format on
 }
 
diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
index 2dc6d2271..8bf50387f 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
@@ -419,11 +419,8 @@ bool HasItemBeenCollected(RandomizerCheck rc) {
     case SpoilerCollectionCheckType::SPOILER_CHK_COLLECTABLE:
         return (gPlayState->sceneNum == scene && gPlayState->actorCtx.flags.collect & (1 << flag)) ||
                gSaveContext.sceneFlags[scene].collect & (1 << flag);
-    case SpoilerCollectionCheckType::SPOILER_CHK_MERCHANT:
     case SpoilerCollectionCheckType::SPOILER_CHK_SHOP_ITEM:
-    case SpoilerCollectionCheckType::SPOILER_CHK_COW:
     case SpoilerCollectionCheckType::SPOILER_CHK_FISH:
-    case SpoilerCollectionCheckType::SPOILER_CHK_SCRUB:
     case SpoilerCollectionCheckType::SPOILER_CHK_RANDOMIZER_INF:
     case SpoilerCollectionCheckType::SPOILER_CHK_MASTER_SWORD:
         return Flags_GetRandomizerInf(OTRGlobals::Instance->gRandomizer->GetRandomizerInfFromCheck(rc));
@@ -437,8 +434,6 @@ bool HasItemBeenCollected(RandomizerCheck rc) {
         return gSaveContext.infTable[scene] & INDEX_TO_16BIT_LITTLE_ENDIAN_BITMASK(flag);
     case SpoilerCollectionCheckType::SPOILER_CHK_ITEM_GET_INF:
         return gSaveContext.itemGetInf[flag / 16] & INDEX_TO_16BIT_LITTLE_ENDIAN_BITMASK(flag);
-    case SpoilerCollectionCheckType::SPOILER_CHK_MAGIC_BEANS:
-        return BEANS_BOUGHT >= 10;
     case SpoilerCollectionCheckType::SPOILER_CHK_NONE:
         return false;
     case SpoilerCollectionCheckType::SPOILER_CHK_GRAVEDIGGER:
@@ -749,11 +744,8 @@ void CheckTrackerFlagSet(int16_t flagType, int32_t flag) {
         Rando::SpoilerCollectionCheck scCheck = loc.GetCollectionCheck();
         SpoilerCollectionCheckType scCheckType = scCheck.type;
         if (checkMatchType == SpoilerCollectionCheckType::SPOILER_CHK_RANDOMIZER_INF &&
-              (scCheckType == SpoilerCollectionCheckType::SPOILER_CHK_MERCHANT ||
-               scCheckType == SpoilerCollectionCheckType::SPOILER_CHK_SHOP_ITEM ||
-               scCheckType == SpoilerCollectionCheckType::SPOILER_CHK_COW ||
+               (scCheckType == SpoilerCollectionCheckType::SPOILER_CHK_SHOP_ITEM ||
                scCheckType == SpoilerCollectionCheckType::SPOILER_CHK_FISH ||
-               scCheckType == SpoilerCollectionCheckType::SPOILER_CHK_SCRUB ||
                scCheckType == SpoilerCollectionCheckType::SPOILER_CHK_MASTER_SWORD ||
                scCheckType == SpoilerCollectionCheckType::SPOILER_CHK_RANDOMIZER_INF)) {
             if (flag == OTRGlobals::Instance->gRandomizer->GetRandomizerInfFromCheck(loc.GetRandomizerCheck())) {
@@ -1343,6 +1335,11 @@ void DrawLocation(RandomizerCheck rc) {
     Rando::ItemLocation* itemLoc = OTRGlobals::Instance->gRandoContext->GetItemLocation(rc);
     RandomizerCheckTrackerData checkData = gSaveContext.checkTrackerData[rc];
     RandomizerCheckStatus status = checkData.status;
+
+    if (itemLoc->HasObtained()) {
+        status = RCSHOW_COLLECTED;
+    }
+
     bool skipped = checkData.skipped;
     if (status == RCSHOW_COLLECTED) {
         if (!showHidden && CVarGetInteger("gCheckTrackerCollectedHide", 0)) {
@@ -1677,12 +1674,12 @@ void CheckTrackerWindow::InitElement() {
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnExitGame>([](uint32_t fileNum) {
         Teardown();
     });
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnItemReceive>(CheckTrackerItemReceive);
+    // GameInteractor::Instance->RegisterGameHook<GameInteractor::OnItemReceive>(CheckTrackerItemReceive);
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGameFrameUpdate>(CheckTrackerFrame);
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnTransitionEnd>(CheckTrackerTransition);
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnShopSlotChange>(CheckTrackerShopSlotChange);
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneFlagSet>(CheckTrackerSceneFlagSet);
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnFlagSet>(CheckTrackerFlagSet);
+    // GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneFlagSet>(CheckTrackerSceneFlagSet);
+    // GameInteractor::Instance->RegisterGameHook<GameInteractor::OnFlagSet>(CheckTrackerFlagSet);
 
     hideShopRightChecks = CVarGetInteger("gCheckTrackerOptionHideRightShopChecks", 1);
     alwaysShowGS = CVarGetInteger("gCheckTrackerOptionAlwaysShowGSLocs", 0);
diff --git a/soh/soh/Enhancements/randomizer/randomizer_entrance.c b/soh/soh/Enhancements/randomizer/randomizer_entrance.c
index fc2c651af..84e60bb23 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_entrance.c
+++ b/soh/soh/Enhancements/randomizer/randomizer_entrance.c
@@ -461,34 +461,31 @@ void Entrance_SetWarpSongEntrance(void) {
 }
 
 void Entrance_OverrideBlueWarp(void) {
-    // Set nextEntranceIndex as a flag so that Grotto_CheckSpecialEntrance
-    // won't return index 0x7FFF, which can't work to override blue warps.
-    gPlayState->nextEntranceIndex = 0;
+    // Handles first time entering bluewarp (with item give)
+    switch (gSaveContext.entranceIndex) {
+        case ENTR_KOKIRI_FOREST_11: // Gohma blue warp
+        case ENTR_DEATH_MOUNTAIN_TRAIL_5: // KD blue warp
+        case ENTR_ZORAS_FOUNTAIN_0: // Barinade blue warp
+        case ENTR_SACRED_FOREST_MEADOW_3: // Phantom Ganon blue warp
+        case ENTR_DEATH_MOUNTAIN_CRATER_5: // Volvagia blue warp
+        case ENTR_LAKE_HYLIA_9: // Morpha blue warp
+        case ENTR_DESERT_COLOSSUS_8: // Bongo-Bongo blue warp
+        case ENTR_GRAVEYARD_8: // Twinrova blue warp
+            gSaveContext.entranceIndex = Entrance_OverrideNextIndex(gSaveContext.entranceIndex);
+            return;
+    }
 
-    switch (gPlayState->sceneNum) {
-        case SCENE_DEKU_TREE_BOSS: // Ghoma boss room
-            gPlayState->nextEntranceIndex = Entrance_OverrideNextIndex(ENTR_KOKIRI_FOREST_11);
-            return;
-        case SCENE_DODONGOS_CAVERN_BOSS: // King Dodongo boss room
-            gPlayState->nextEntranceIndex = Entrance_OverrideNextIndex(ENTR_DEATH_MOUNTAIN_TRAIL_5);
-            return;
-        case SCENE_JABU_JABU_BOSS: // Barinade boss room
-            gPlayState->nextEntranceIndex = Entrance_OverrideNextIndex(ENTR_ZORAS_FOUNTAIN_0);
-            return;
-        case SCENE_FOREST_TEMPLE_BOSS: // Phantom Ganon boss room
-            gPlayState->nextEntranceIndex = Entrance_OverrideNextIndex(ENTR_SACRED_FOREST_MEADOW_3);
-            return;
-        case SCENE_FIRE_TEMPLE_BOSS: // Volvagia boss room
-            gPlayState->nextEntranceIndex = Entrance_OverrideNextIndex(ENTR_DEATH_MOUNTAIN_CRATER_5);
-            return;
-        case SCENE_WATER_TEMPLE_BOSS: // Morpha boss room
-            gPlayState->nextEntranceIndex = Entrance_OverrideNextIndex(ENTR_LAKE_HYLIA_9);
-            return;
-        case SCENE_SPIRIT_TEMPLE_BOSS: // Twinrova boss room
-            gPlayState->nextEntranceIndex = Entrance_OverrideNextIndex(ENTR_DESERT_COLOSSUS_8);
-            return;
-        case SCENE_SHADOW_TEMPLE_BOSS: // Bongo-Bongo boss room
-            gPlayState->nextEntranceIndex = Entrance_OverrideNextIndex(ENTR_GRAVEYARD_8);
+    // Handles second+ times entering bluewarp
+    switch (gPlayState->nextEntranceIndex) {
+        case ENTR_KOKIRI_FOREST_11: // Gohma blue warp
+        case ENTR_DEATH_MOUNTAIN_TRAIL_5: // KD blue warp
+        case ENTR_ZORAS_FOUNTAIN_0: // Barinade blue warp
+        case ENTR_SACRED_FOREST_MEADOW_3: // Phantom Ganon blue warp
+        case ENTR_DEATH_MOUNTAIN_CRATER_5: // Volvagia blue warp
+        case ENTR_LAKE_HYLIA_9: // Morpha blue warp
+        case ENTR_DESERT_COLOSSUS_8: // Bongo-Bongo blue warp
+        case ENTR_GRAVEYARD_8: // Twinrova blue warp
+            gPlayState->nextEntranceIndex = Entrance_OverrideNextIndex(gPlayState->nextEntranceIndex);
             return;
     }
 }
diff --git a/soh/soh/Enhancements/randomizer/randomizer_inf.h b/soh/soh/Enhancements/randomizer/randomizer_inf.h
index c61f933bf..31ca0a805 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_inf.h
+++ b/soh/soh/Enhancements/randomizer/randomizer_inf.h
@@ -143,12 +143,15 @@ typedef enum {
     RAND_INF_MERCHANTS_CARPET_SALESMAN,
     RAND_INF_MERCHANTS_MEDIGORON,
     RAND_INF_MERCHANTS_GRANNYS_SHOP,
+    RAND_INF_MERCHANTS_MAGIC_BEAN_SALESMAN,
 
     RAND_INF_ADULT_TRADES_LW_TRADE_COJIRO,
     RAND_INF_ADULT_TRADES_GV_TRADE_SAW,
     RAND_INF_ADULT_TRADES_DMT_TRADE_BROKEN_SWORD,
+    RAND_INF_ADULT_TRADES_ZD_TRADE_PRESCRIPTION,
     RAND_INF_ADULT_TRADES_LH_TRADE_FROG,
     RAND_INF_ADULT_TRADES_DMT_TRADE_EYEDROPS,
+    RAND_INF_ADULT_TRADES_DMT_TRADE_CLAIM_CHECK,
 
     RAND_INF_KAK_100_GOLD_SKULLTULA_REWARD,
 
@@ -267,6 +270,13 @@ typedef enum {
     RAND_INF_ZD_FISH_4,
     RAND_INF_ZD_FISH_5,
 
+    RAND_INF_LINKS_POCKET,
+    RAND_INF_LEARNED_EPONA_SONG,
+    RAND_INF_DARUNIAS_JOY,
+    RAND_INF_KING_ZORA_THAWED,
+    RAND_INF_ROLLING_GORON_AS_CHILD,
+    RAND_INF_ROLLING_GORON_AS_ADULT,
+
     // If you add anything to this list, you need to update the size of randomizerInf in z64save.h to be ceil(RAND_INF_MAX / 16)
 
     RAND_INF_MAX,
diff --git a/soh/soh/Enhancements/randomizer/savefile.cpp b/soh/soh/Enhancements/randomizer/savefile.cpp
index d3c2d535b..19ef26ac0 100644
--- a/soh/soh/Enhancements/randomizer/savefile.cpp
+++ b/soh/soh/Enhancements/randomizer/savefile.cpp
@@ -97,6 +97,9 @@ void GiveLinksPocketItem() {
     if (Randomizer_GetSettingValue(RSK_LINKS_POCKET) != RO_LINKS_POCKET_NOTHING) {
         GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_LINKS_POCKET, (GetItemID)RG_NONE);
         StartingItemGive(getItemEntry);
+        Rando::Context::GetInstance()->GetItemLocation(RC_LINKS_POCKET)->MarkAsObtained();
+        // If we re-add the above, we'll get the item on save creation, now it's given on first load
+        Flags_SetRandomizerInf(RAND_INF_LINKS_POCKET);
     }
 }
 
@@ -202,40 +205,42 @@ void SetStartingItems() {
 }
 
 extern "C" void Randomizer_InitSaveFile() {
-    // Sets all rando flags to false
-    for (s32 i = 0; i < ARRAY_COUNT(gSaveContext.randomizerInf); i++) {
-        gSaveContext.randomizerInf[i] = 0;
-    }
+    // Now handled by cutscene skips
+    // gSaveContext.cutsceneIndex = 0; // no intro cutscene
+    // Starts pending ice traps out at 0 before potentially incrementing them down the line.
+    gSaveContext.pendingIceTrapCount = 0;
 
     // Reset triforce pieces collected
     gSaveContext.triforcePiecesCollected = 0;
 
-    gSaveContext.cutsceneIndex = 0; // no intro cutscene
-    // Starts pending ice traps out at 0 before potentially incrementing them down the line.
-    gSaveContext.pendingIceTrapCount = 0;
-
     // Set Cutscene flags and texts to skip them
-    Flags_SetInfTable(INFTABLE_GREETED_BY_SARIA);
+    // Now handled by cutscene skips
+    // Flags_SetInfTable(INFTABLE_GREETED_BY_SARIA);
     Flags_SetEventChkInf(EVENTCHKINF_FIRST_SPOKE_TO_MIDO);
-    Flags_SetEventChkInf(EVENTCHKINF_MET_DEKU_TREE);
-    Flags_SetEventChkInf(EVENTCHKINF_DEKU_TREE_OPENED_MOUTH);
+    // Now handled by cutscene skips
+    // Flags_SetEventChkInf(EVENTCHKINF_MET_DEKU_TREE);
+    // Flags_SetEventChkInf(EVENTCHKINF_DEKU_TREE_OPENED_MOUTH);
     Flags_SetInfTable(INFTABLE_SPOKE_TO_KAEPORA_IN_LAKE_HYLIA);
-    Flags_SetEventChkInf(EVENTCHKINF_ENTERED_MASTER_SWORD_CHAMBER);
-    Flags_SetEventChkInf(EVENTCHKINF_PULLED_MASTER_SWORD_FROM_PEDESTAL);
+    // Now handled by cutscene skips
+    // Flags_SetEventChkInf(EVENTCHKINF_ENTERED_MASTER_SWORD_CHAMBER);
+    // Now using this to grant master sword check
+    // Flags_SetEventChkInf(EVENTCHKINF_PULLED_MASTER_SWORD_FROM_PEDESTAL);
     Flags_SetEventChkInf(EVENTCHKINF_SHEIK_SPAWNED_AT_MASTER_SWORD_PEDESTAL);
-    Flags_SetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS);
+    // Now used to give player LACS rewards
+    // Flags_SetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS);
     Flags_SetEventChkInf(EVENTCHKINF_RENTED_HORSE_FROM_INGO);
     Flags_SetInfTable(INFTABLE_SPOKE_TO_POE_COLLECTOR_IN_RUINED_MARKET);
     Flags_SetEventChkInf(EVENTCHKINF_WATCHED_GANONS_CASTLE_COLLAPSE_CAUGHT_BY_GERUDO);
     Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_NABOORU_IN_SPIRIT_TEMPLE);
 
-    Flags_SetInfTable(INFTABLE_MET_CHILD_MALON_AT_CASTLE_OR_MARKET);
-    Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_CHILD_MALON_AT_CASTLE_OR_MARKET);
-    Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_INGO_AT_RANCH_BEFORE_TALON_RETURNS);
-    Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_CHILD_MALON_AT_RANCH);
-    Flags_SetEventChkInf(EVENTCHKINF_INVITED_TO_SING_WITH_CHILD_MALON);
-    Flags_SetInfTable(INFTABLE_CHILD_MALON_SAID_EPONA_WAS_AFRAID_OF_YOU);
-    Flags_SetInfTable(INFTABLE_SPOKE_TO_INGO_ONCE_AS_ADULT);
+    // Now handled by cutscene skips
+    // Flags_SetInfTable(INFTABLE_MET_CHILD_MALON_AT_CASTLE_OR_MARKET);
+    // Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_CHILD_MALON_AT_CASTLE_OR_MARKET);
+    // Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_INGO_AT_RANCH_BEFORE_TALON_RETURNS);
+    // Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_CHILD_MALON_AT_RANCH);
+    // Flags_SetEventChkInf(EVENTCHKINF_INVITED_TO_SING_WITH_CHILD_MALON);
+    // Flags_SetInfTable(INFTABLE_CHILD_MALON_SAID_EPONA_WAS_AFRAID_OF_YOU);
+    // Flags_SetInfTable(INFTABLE_SPOKE_TO_INGO_ONCE_AS_ADULT);
 
     // Ruto already met in jabu and spawns down the hole immediately
     Flags_SetInfTable(INFTABLE_RUTO_IN_JJ_MEET_RUTO);
@@ -246,51 +251,55 @@ extern "C" void Randomizer_InitSaveFile() {
     Flags_SetEventChkInf(EVENTCHKINF_BEGAN_NABOORU_BATTLE);
     Flags_SetEventChkInf(EVENTCHKINF_NABOORU_ORDERED_TO_FIGHT_BY_TWINROVA);
 
+    // Now handled by cutscene skips
     // Skip boss cutscenes
-    Flags_SetEventChkInf(EVENTCHKINF_BEGAN_GOHMA_BATTLE);
-    Flags_SetEventChkInf(EVENTCHKINF_BEGAN_KING_DODONGO_BATTLE);
-    Flags_SetEventChkInf(EVENTCHKINF_BEGAN_PHANTOM_GANON_BATTLE);
-    Flags_SetEventChkInf(EVENTCHKINF_BEGAN_VOLVAGIA_BATTLE);
-    Flags_SetEventChkInf(EVENTCHKINF_BEGAN_MORPHA_BATTLE);
-    Flags_SetEventChkInf(EVENTCHKINF_BEGAN_TWINROVA_BATTLE);
-    Flags_SetEventChkInf(EVENTCHKINF_BEGAN_BARINA_BATTLE);
-    Flags_SetEventChkInf(EVENTCHKINF_BEGAN_BONGO_BONGO_BATTLE);
+    // Flags_SetEventChkInf(EVENTCHKINF_BEGAN_GOHMA_BATTLE);
+    // Flags_SetEventChkInf(EVENTCHKINF_BEGAN_KING_DODONGO_BATTLE);
+    // Flags_SetEventChkInf(EVENTCHKINF_BEGAN_PHANTOM_GANON_BATTLE);
+    // Flags_SetEventChkInf(EVENTCHKINF_BEGAN_VOLVAGIA_BATTLE);
+    // Flags_SetEventChkInf(EVENTCHKINF_BEGAN_MORPHA_BATTLE);
+    // Flags_SetEventChkInf(EVENTCHKINF_BEGAN_TWINROVA_BATTLE);
+    // Flags_SetEventChkInf(EVENTCHKINF_BEGAN_BARINA_BATTLE);
+    // Flags_SetEventChkInf(EVENTCHKINF_BEGAN_BONGO_BONGO_BATTLE);
 
-    // Entered areas
-    Flags_SetEventChkInf(EVENTCHKINF_ENTERED_HYRULE_FIELD);
-    Flags_SetEventChkInf(EVENTCHKINF_ENTERED_DEATH_MOUNTAIN_TRAIL);
-    Flags_SetEventChkInf(EVENTCHKINF_ENTERED_KAKARIKO_VILLAGE);
-    Flags_SetEventChkInf(EVENTCHKINF_ENTERED_ZORAS_DOMAIN);
-    Flags_SetEventChkInf(EVENTCHKINF_ENTERED_HYRULE_CASTLE);
-    Flags_SetEventChkInf(EVENTCHKINF_ENTERED_GORON_CITY);
-    Flags_SetEventChkInf(EVENTCHKINF_ENTERED_TEMPLE_OF_TIME);
-    Flags_SetEventChkInf(EVENTCHKINF_ENTERED_DEKU_TREE);
-    Flags_SetEventChkInf(EVENTCHKINF_ENTERED_DODONGOS_CAVERN);
-    Flags_SetEventChkInf(EVENTCHKINF_ENTERED_LAKE_HYLIA);
-    Flags_SetEventChkInf(EVENTCHKINF_ENTERED_GERUDO_VALLEY);
-    Flags_SetEventChkInf(EVENTCHKINF_ENTERED_GERUDOS_FORTRESS);
-    Flags_SetEventChkInf(EVENTCHKINF_ENTERED_LON_LON_RANCH);
-    Flags_SetEventChkInf(EVENTCHKINF_ENTERED_JABU_JABUS_BELLY);
-    Flags_SetEventChkInf(EVENTCHKINF_ENTERED_GRAVEYARD);
-    Flags_SetEventChkInf(EVENTCHKINF_ENTERED_ZORAS_FOUNTAIN);
-    Flags_SetEventChkInf(EVENTCHKINF_ENTERED_DESERT_COLOSSUS);
-    Flags_SetEventChkInf(EVENTCHKINF_ENTERED_DEATH_MOUNTAIN_CRATER);
-    Flags_SetEventChkInf(EVENTCHKINF_ENTERED_GANONS_CASTLE_EXTERIOR);
-    Flags_SetInfTable(INFTABLE_ENTERED_HYRULE_CASTLE);
+    // Now handled by cutscene skips
+    // Flags_SetEventChkInf(EVENTCHKINF_ENTERED_HYRULE_FIELD);
+    // Flags_SetEventChkInf(EVENTCHKINF_ENTERED_DEATH_MOUNTAIN_TRAIL);
+    // Flags_SetEventChkInf(EVENTCHKINF_ENTERED_KAKARIKO_VILLAGE);
+    // Flags_SetEventChkInf(EVENTCHKINF_ENTERED_ZORAS_DOMAIN);
+    // Flags_SetEventChkInf(EVENTCHKINF_ENTERED_HYRULE_CASTLE);
+    // Flags_SetEventChkInf(EVENTCHKINF_ENTERED_GORON_CITY);
+    // Flags_SetEventChkInf(EVENTCHKINF_ENTERED_TEMPLE_OF_TIME);
+    // Flags_SetEventChkInf(EVENTCHKINF_ENTERED_DEKU_TREE);
+    // Flags_SetEventChkInf(EVENTCHKINF_ENTERED_DODONGOS_CAVERN);
+    // Flags_SetEventChkInf(EVENTCHKINF_ENTERED_LAKE_HYLIA);
+    // Flags_SetEventChkInf(EVENTCHKINF_ENTERED_GERUDO_VALLEY);
+    // Flags_SetEventChkInf(EVENTCHKINF_ENTERED_GERUDOS_FORTRESS);
+    // Flags_SetEventChkInf(EVENTCHKINF_ENTERED_LON_LON_RANCH);
+    // Flags_SetEventChkInf(EVENTCHKINF_ENTERED_JABU_JABUS_BELLY);
+    // Flags_SetEventChkInf(EVENTCHKINF_ENTERED_GRAVEYARD);
+    // Flags_SetEventChkInf(EVENTCHKINF_ENTERED_ZORAS_FOUNTAIN);
+    // Flags_SetEventChkInf(EVENTCHKINF_ENTERED_DESERT_COLOSSUS);
+    // Flags_SetEventChkInf(EVENTCHKINF_ENTERED_DEATH_MOUNTAIN_CRATER);
+    // Flags_SetEventChkInf(EVENTCHKINF_ENTERED_GANONS_CASTLE_EXTERIOR);
+    // Ensure Malon appears at castle first time you enter
+    // Flags_SetInfTable(INFTABLE_ENTERED_HYRULE_CASTLE);
 
     // skip the z target talk instructions by the kokiri shop
-    gSaveContext.sceneFlags[SCENE_KOKIRI_FOREST].swch |= (1 << 0x1F);
+    // Now handled by cutscene skips
+    // gSaveContext.sceneFlags[SCENE_KOKIRI_FOREST].swch |= (1 << 0x1F);
 
     // Go away ruto (water temple first cutscene)
     gSaveContext.sceneFlags[SCENE_WATER_TEMPLE].swch |= (1 << 0x10);
 
+    // Now handled by cutscene skips
     // no more kaepora
-    gSaveContext.sceneFlags[SCENE_HYRULE_FIELD].swch |= (1 << 0xC);  // hyrule field kaepora outside kokiri forest
-    gSaveContext.sceneFlags[SCENE_HYRULE_FIELD].swch |= (1 << 0xB);  // hyrule field kaepora outside lake hylia
-    gSaveContext.sceneFlags[SCENE_LOST_WOODS].swch |= (1 << 0x7);  // lost woods kaepora pre-saria
-    gSaveContext.sceneFlags[SCENE_LOST_WOODS].swch |= (1 << 0x8);  // lost woods kaepora post-saria
-    gSaveContext.sceneFlags[SCENE_DESERT_COLOSSUS].swch |= (1 << 0x1F); // desert colossus kaepora
-    gSaveContext.sceneFlags[SCENE_HYRULE_CASTLE].swch |= (1 << 0x5);  // hyrule castle kaepora
+    // gSaveContext.sceneFlags[SCENE_HYRULE_FIELD].swch |= (1 << 0xC);  // hyrule field kaepora outside kokiri forest
+    // gSaveContext.sceneFlags[SCENE_HYRULE_FIELD].swch |= (1 << 0xB);  // hyrule field kaepora outside lake hylia
+    // gSaveContext.sceneFlags[SCENE_LOST_WOODS].swch |= (1 << 0x7);  // lost woods kaepora pre-saria
+    // gSaveContext.sceneFlags[SCENE_LOST_WOODS].swch |= (1 << 0x8);  // lost woods kaepora post-saria
+    // gSaveContext.sceneFlags[SCENE_DESERT_COLOSSUS].swch |= (1 << 0x1F); // desert colossus kaepora
+    // gSaveContext.sceneFlags[SCENE_HYRULE_CASTLE].swch |= (1 << 0x5);  // hyrule castle kaepora
 
     if (!Randomizer_GetSettingValue(RSK_ENABLE_GLITCH_CUTSCENES)) {
         Flags_SetInfTable(INFTABLE_SPOKE_TO_DARUNIA_IN_FIRE_TEMPLE); // Darunia in Fire Temple
@@ -398,15 +407,16 @@ extern "C" void Randomizer_InitSaveFile() {
         gSaveContext.sceneFlags[SCENE_WATER_TEMPLE].swch |= (1 << 0x15);
     }
 
-    int openForest = Randomizer_GetSettingValue(RSK_FOREST);
-    switch (openForest) {
-        case RO_FOREST_OPEN:
-            Flags_SetEventChkInf(EVENTCHKINF_SHOWED_MIDO_SWORD_SHIELD);
-            // Fallthrough
-        case RO_FOREST_CLOSED_DEKU:
-            Flags_SetEventChkInf(EVENTCHKINF_OBTAINED_KOKIRI_EMERALD_DEKU_TREE_DEAD);
-            break;
-    }
+    // Now handled on the fly
+    // int openForest = Randomizer_GetSettingValue(RSK_FOREST);
+    // switch (openForest) {
+    //     case RO_FOREST_OPEN:
+    //         Flags_SetEventChkInf(EVENTCHKINF_SHOWED_MIDO_SWORD_SHIELD);
+    //         // Fallthrough
+    //     case RO_FOREST_CLOSED_DEKU:
+    //         Flags_SetEventChkInf(EVENTCHKINF_OBTAINED_KOKIRI_EMERALD_DEKU_TREE_DEAD);
+    //         break;
+    // }
 
     int doorOfTime = Randomizer_GetSettingValue(RSK_DOOR_OF_TIME);
     switch (doorOfTime) {
diff --git a/soh/soh/Enhancements/timesaver_hook_handlers.cpp b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
new file mode 100644
index 000000000..cd34e5608
--- /dev/null
+++ b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
@@ -0,0 +1,788 @@
+#include <libultraship/bridge.h>
+#include "soh/OTRGlobals.h"
+#include "soh/Enhancements/randomizer/randomizerTypes.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+
+extern "C" {
+#include "src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.h"
+#include "src/overlays/actors/ovl_Elf_Msg/z_elf_msg.h"
+#include "src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h"
+#include "src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.h"
+#include "src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.h"
+#include "src/overlays/actors/ovl_En_Owl/z_en_owl.h"
+#include "src/overlays/actors/ovl_En_Ko/z_en_ko.h"
+#include "src/overlays/actors/ovl_En_Ma1/z_en_ma1.h"
+#include "src/overlays/actors/ovl_En_Zl4/z_en_zl4.h"
+#include "src/overlays/actors/ovl_Demo_Im/z_demo_im.h"
+#include "src/overlays/actors/ovl_En_Sa/z_en_sa.h"
+#include "src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.h"
+#include "src/overlays/actors/ovl_En_Tk/z_en_tk.h"
+extern SaveContext gSaveContext;
+extern PlayState* gPlayState;
+}
+
+#define RAND_GET_OPTION(option) Rando::Context::GetInstance()->GetOption(option).GetSelectedOptionIndex()
+
+void EnKo_MoveWhenReady(EnKo* enKo, PlayState* play) {
+    func_80A995CC(enKo, play);
+
+    if ((enKo->actor.params & 0xFF) == ENKO_TYPE_CHILD_3) {
+        // Typically this doesn't get get live updated in vanilla, but we need to
+        // live update it if we're skipping a certain cutscene or in randomizer
+        if (GameInteractor_Should(GI_VB_OPEN_KOKIRI_FOREST, CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD), NULL)) {
+            enKo->collider.dim.height -= 200;
+            Path_CopyLastPoint(enKo->path, &enKo->actor.world.pos);
+            enKo->actionFunc = func_80A99384;
+        }
+    }
+}
+
+void EnMa1_EndTeachSong(EnMa1* enMa1, PlayState* play) {
+    if (Message_GetState(&gPlayState->msgCtx) == TEXT_STATE_CLOSING) {
+        Flags_SetRandomizerInf(RAND_INF_LEARNED_EPONA_SONG);
+        func_80078884(NA_SE_SY_CORRECT_CHIME);
+        enMa1->actor.flags &= ~ACTOR_FLAG_WILL_TALK;
+        play->msgCtx.ocarinaMode = OCARINA_MODE_04;
+        enMa1->actionFunc = func_80AA0D88;
+        enMa1->unk_1E0 = 1;
+        enMa1->interactInfo.talkState = NPC_TALK_STATE_IDLE;
+        return;
+    }
+}
+
+u16 EnZl4_GiveItemTextId(PlayState* play, Actor* actor) {
+    return 0x207D;
+}
+
+void EnZl4_SkipToGivingZeldasLetter(EnZl4* enZl4, PlayState* play) {
+    if (enZl4->csState == 0 && enZl4->actor.xzDistToPlayer < 600.0f && EnZl4_SetNextAnim(enZl4, 3)) {
+        Audio_PlayFanfare(NA_BGM_APPEAR);
+        enZl4->csState = 8; // ZL4_CS_PLAN
+    } else {
+        Npc_UpdateTalking(play, &enZl4->actor, &enZl4->interactInfo.talkState, enZl4->collider.dim.radius + 60.0f, EnZl4_GiveItemTextId, func_80B5B9B0);
+        func_80B5BB78(enZl4, play);
+
+        if (enZl4->interactInfo.talkState != NPC_TALK_STATE_IDLE) {
+            enZl4->talkState = 6;
+            enZl4->actionFunc = EnZl4_Cutscene;
+        }
+    }
+}
+
+static int successChimeCooldown = 0;
+void RateLimitedSuccessChime() {
+    if (successChimeCooldown == 0) {
+        func_80078884(NA_SE_SY_CORRECT_CHIME);
+        successChimeCooldown = 120;
+    }
+}
+
+void TimeSaverOnGameFrameUpdateHandler() {
+    if (successChimeCooldown > 0) {
+        successChimeCooldown--;
+    }
+}
+
+void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void* opt) {
+    switch (id) {
+        case GI_VB_PLAY_TRANSITION_CS:
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.Intro", 0) && gSaveContext.entranceIndex == ENTR_LINKS_HOUSE_0 && gSaveContext.cutsceneIndex == 0xFFF1) {
+                gSaveContext.cutsceneIndex = 0;
+                *should = false;
+            }
+
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", 0) || IS_RANDO) {
+                // Song of Time
+                if (gSaveContext.entranceIndex == ENTR_TEMPLE_OF_TIME_0 && gSaveContext.cutsceneIndex == 0xFFF7) {
+                    gSaveContext.entranceIndex = ENTR_HYRULE_FIELD_16;
+                    gSaveContext.cutsceneIndex = 0;
+                    gSaveContext.nextTransitionType = 3;
+                    *should = false;
+                }
+
+                // Requiem of Spirit
+                if ((gSaveContext.entranceIndex == ENTR_DESERT_COLOSSUS_1) && !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_REQUIEM_OF_SPIRIT)) {
+                    Flags_SetEventChkInf(EVENTCHKINF_LEARNED_REQUIEM_OF_SPIRIT);
+                    // Normally happens in the cutscene
+                    if (GameInteractor_Should(GI_VB_GIVE_ITEM_REQUIEM_OF_SPIRIT, true, NULL)) {
+                        Item_Give(gPlayState, ITEM_SONG_REQUIEM);
+                    }
+                    *should = false;
+                }
+                
+                u8 meetsBurningKakRequirements = 
+                    LINK_IS_ADULT &&
+                    gSaveContext.entranceIndex == ENTR_KAKARIKO_VILLAGE_0 &&
+                    Flags_GetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP) &&
+                    Flags_GetEventChkInf(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP) &&
+                    Flags_GetEventChkInf(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP) &&
+                    !Flags_GetEventChkInf(EVENTCHKINF_BONGO_BONGO_ESCAPED_FROM_WELL);
+                if (GameInteractor_Should(GI_VB_BE_ELIGIBLE_FOR_NOCTURNE_OF_SHADOW, meetsBurningKakRequirements, NULL)) {
+                    Flags_SetEventChkInf(EVENTCHKINF_BONGO_BONGO_ESCAPED_FROM_WELL);
+                    // Normally happens in the cutscene
+                    Flags_SetEventChkInf(EVENTCHKINF_LEARNED_NOCTURNE_OF_SHADOW);
+                    if (GameInteractor_Should(GI_VB_GIVE_ITEM_NOCTURNE_OF_SHADOW, true, NULL)) {
+                        Item_Give(gPlayState, ITEM_SONG_NOCTURNE);
+                    }
+                    *should = false;
+                }
+            }
+
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.Story", 0)) {
+                uint8_t isBlueWarp = 0;
+                // Deku Tree Blue warp
+                if (gSaveContext.entranceIndex == ENTR_KOKIRI_FOREST_0 && gSaveContext.cutsceneIndex == 0xFFF1) {
+                    gSaveContext.dayTime = gSaveContext.skyboxTime = 0x8000;
+
+                    gSaveContext.entranceIndex = ENTR_KOKIRI_FOREST_11;
+                    isBlueWarp = 1;
+                // Dodongo's Cavern Blue warp
+                } else if (gSaveContext.entranceIndex == ENTR_DEATH_MOUNTAIN_TRAIL_0 && gSaveContext.cutsceneIndex == 0xFFF1) {
+                    gSaveContext.entranceIndex = ENTR_DEATH_MOUNTAIN_TRAIL_5;
+                    isBlueWarp = 1;
+                // Jabu Jabu's Blue warp
+                } else if (gSaveContext.entranceIndex == ENTR_ZORAS_FOUNTAIN_0 && gSaveContext.cutsceneIndex == 0xFFF0) {
+                    gSaveContext.entranceIndex = ENTR_ZORAS_FOUNTAIN_0;
+                    isBlueWarp = 1;
+                // Forest Temple Blue warp
+                } else if (gSaveContext.entranceIndex == ENTR_CHAMBER_OF_THE_SAGES_0 && gSaveContext.cutsceneIndex == 0x0 && gSaveContext.chamberCutsceneNum == CHAMBER_CS_FOREST) {
+                    // Normally set in the blue warp cutscene
+                    Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_DEKU_TREE_SPROUT);
+                    gSaveContext.dayTime = gSaveContext.skyboxTime = 0x8000;
+
+                    gSaveContext.entranceIndex = ENTR_SACRED_FOREST_MEADOW_3;
+                    isBlueWarp = 1;
+                // Fire Temple Blue warp
+                } else if (gSaveContext.entranceIndex == ENTR_KAKARIKO_VILLAGE_0 && gSaveContext.cutsceneIndex == 0xFFF3) {
+                    gSaveContext.entranceIndex = ENTR_DEATH_MOUNTAIN_CRATER_5;
+                    isBlueWarp = 1;
+                // Water Temple Blue warp
+                } else if (gSaveContext.entranceIndex == ENTR_CHAMBER_OF_THE_SAGES_0 && gSaveContext.cutsceneIndex == 0x0 && gSaveContext.chamberCutsceneNum == CHAMBER_CS_WATER) {
+                    gSaveContext.entranceIndex = ENTR_LAKE_HYLIA_9;
+                    isBlueWarp = 1;
+                // Spirit Temple Blue warp
+                } else if (gSaveContext.entranceIndex == ENTR_CHAMBER_OF_THE_SAGES_0 && gSaveContext.cutsceneIndex == 0x0 && gSaveContext.chamberCutsceneNum == CHAMBER_CS_SPIRIT) {
+                    gSaveContext.entranceIndex = ENTR_DESERT_COLOSSUS_8;
+                    isBlueWarp = 1;
+                // Shadow Temple Blue warp
+                } else if (gSaveContext.entranceIndex == ENTR_CHAMBER_OF_THE_SAGES_0 && gSaveContext.cutsceneIndex == 0x0 && gSaveContext.chamberCutsceneNum == CHAMBER_CS_SHADOW) {
+                    gSaveContext.entranceIndex = ENTR_GRAVEYARD_8;
+                    isBlueWarp = 1;
+                }
+
+                if (isBlueWarp) {
+                    *should = false;
+                    gSaveContext.cutsceneIndex = 0;
+
+                    if (IS_RANDO && (RAND_GET_OPTION(RSK_SHUFFLE_DUNGEON_ENTRANCES) != RO_DUNGEON_ENTRANCE_SHUFFLE_OFF || RAND_GET_OPTION(RSK_SHUFFLE_BOSS_ENTRANCES) != RO_BOSS_ROOM_ENTRANCE_SHUFFLE_OFF)) {
+                        Entrance_OverrideBlueWarp();
+                    }
+                }
+
+                // Flee hyrule castle cutscene
+                if (gSaveContext.entranceIndex == ENTR_HYRULE_FIELD_0 && gSaveContext.cutsceneIndex == 0xFFF1) {
+                    gSaveContext.cutsceneIndex = 0;
+                    *should = false;
+                }
+
+                // Lost Woods Bridge
+                if ((gSaveContext.entranceIndex == ENTR_LOST_WOODS_9) && !Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_SARIA_ON_BRIDGE)) {
+                    Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_SARIA_ON_BRIDGE);
+                    if (GameInteractor_Should(GI_VB_GIVE_ITEM_FAIRY_OCARINA, true, NULL)) {
+                        Item_Give(gPlayState, ITEM_OCARINA_FAIRY);
+                    }
+                    *should = false;
+                }
+
+                // LACS
+                u8 meetsLACSRequirements =
+                    LINK_IS_ADULT &&
+                    (gEntranceTable[((void)0, gSaveContext.entranceIndex)].scene == SCENE_TEMPLE_OF_TIME) &&
+                    CHECK_QUEST_ITEM(QUEST_MEDALLION_SPIRIT) &&
+                    CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW) &&
+                    !Flags_GetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS);
+                if (GameInteractor_Should(GI_VB_BE_ELIGIBLE_FOR_LIGHT_ARROWS, meetsLACSRequirements, NULL)) {
+                    Flags_SetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS);
+                    if (GameInteractor_Should(GI_VB_GIVE_ITEM_LIGHT_ARROW, true, NULL)) {
+                        Item_Give(gPlayState, ITEM_ARROW_LIGHT);
+                    }
+                    *should = false;
+                }
+            }
+            break;
+        case GI_VB_PLAY_ENTRANCE_CS: {
+            s32* entranceFlag = static_cast<s32*>(opt);
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.Entrances", 0) && (*entranceFlag != EVENTCHKINF_EPONA_OBTAINED)) {
+                *should = false;
+            }
+            break;
+        }
+        case GI_VB_PLAY_ONEPOINT_CS: {
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.OnePoint", 0)) {
+                s16* csId = static_cast<s16*>(opt);
+                switch (*csId) {
+                    case 4180:
+                    case 4100:
+                        *should = false;
+                        RateLimitedSuccessChime();
+                        break;
+                    default:
+                        SPDLOG_INFO("GI_VB_PLAY_ONEPOINT_CS {}", *csId);
+                        break;
+                }
+            }
+            break;
+        }
+        case GI_VB_PLAY_ONEPOINT_ACTOR_CS: {
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.OnePoint", 0)) {
+                Actor* actor = static_cast<Actor*>(opt);
+                switch (actor->category) {
+                    case ACTORCAT_BG:
+                        if (actor->id == ACTOR_BG_DDAN_KD) {
+                            BgDdanKd* ddanKd = static_cast<BgDdanKd*>(opt);
+                            Flags_SetSwitch(gPlayState, ddanKd->dyna.actor.params);
+                        }
+                        if (actor->id == ACTOR_BG_MORI_HINERI) {
+                            break;
+                        }
+
+                        RateLimitedSuccessChime();
+                        *should = false;
+                        break;
+                }
+                switch (actor->id) {
+                    case ACTOR_OBJ_SWITCH: {
+                        ObjSwitch *switchActor = static_cast<ObjSwitch*>(opt);
+                        switchActor->cooldownTimer = 0;
+                        *should = false;
+                        RateLimitedSuccessChime();
+                        break;
+                    }
+                    case ACTOR_BG_BDAN_SWITCH: {
+                        BgBdanSwitch* switchActor = static_cast<BgBdanSwitch*>(opt);
+                        switchActor->unk_1D8 = 0;
+                        switchActor->unk_1DA = 0;
+                        *should = false;
+                        RateLimitedSuccessChime();
+                        break;
+                    }
+                    // case ACTOR_PLAYER: // This might cause issues
+                    case ACTOR_EN_TA:
+                    case ACTOR_DOOR_SHUTTER:
+                    case ACTOR_EN_BOX:
+                    case ACTOR_OBJ_SYOKUDAI:
+                    case ACTOR_OBJ_TIMEBLOCK:
+                    case ACTOR_EN_PO_SISTERS:
+                    // Prop
+                    case ACTOR_OBJ_ICE_POLY:
+                    case ACTOR_BG_YDAN_MARUTA:
+                    case ACTOR_BG_SPOT18_SHUTTER:
+                    case ACTOR_BG_SPOT05_SOKO:
+                    case ACTOR_BG_SPOT18_BASKET:
+                    // BG
+                    // case ACTOR_BG_YDAN_SP:
+                    // case ACTOR_BG_YDAN_HASI:
+                    // case ACTOR_BG_DODOAGO:
+                    // case ACTOR_BG_DDAN_KD:
+                    // case ACTOR_BG_DDAN_JD:
+                        *should = false;
+                        RateLimitedSuccessChime();
+                        break;
+                }
+                if (*should) {
+                    SPDLOG_INFO("GI_VB_PLAY_ONEPOINT_ACTOR_CS ID:{} Cat:{}", actor->id, actor->category);
+                }
+            }
+            break;
+        }
+        case GI_VB_SHOW_TITLE_CARD:
+            if (CVarGetInteger("gTimeSavers.DisableTitleCard", 0)) {
+                *should = false;
+            }
+            break;
+        case GI_VB_WONDER_TALK: {
+            if (CVarGetInteger("gTimeSavers.NoForcedDialog", 0)) {
+                *should = false;
+            }
+            break;
+        }
+        case GI_VB_NAVI_TALK: {
+            if (CVarGetInteger("gTimeSavers.NoForcedDialog", 0)) {
+                ElfMsg* naviTalk = static_cast<ElfMsg*>(opt);
+                Flags_SetSwitch(gPlayState, (naviTalk->actor.params >> 8) & 0x3F);
+                Actor_Kill(&naviTalk->actor);
+                *should = false;
+            }
+            break;
+        }
+        case GI_VB_NOT_BE_GREETED_BY_SARIA:
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.Entrances", 0) && !Flags_GetInfTable(INFTABLE_GREETED_BY_SARIA)) {
+                Flags_SetInfTable(INFTABLE_GREETED_BY_SARIA);
+                *should = true;
+            }
+            break;
+        case GI_VB_MOVE_MIDO_IN_KOKIRI_FOREST:
+            if (
+                CVarGetInteger("gTimeSavers.SkipMiscInteractions", 0) &&
+                !Flags_GetEventChkInf(EVENTCHKINF_SHOWED_MIDO_SWORD_SHIELD) &&
+                (CUR_EQUIP_VALUE(EQUIP_TYPE_SHIELD) == EQUIP_VALUE_SHIELD_DEKU) && 
+                (CUR_EQUIP_VALUE(EQUIP_TYPE_SWORD) == EQUIP_VALUE_SWORD_KOKIRI)
+            ) {
+                Flags_SetEventChkInf(EVENTCHKINF_SHOWED_MIDO_SWORD_SHIELD);
+                *should = true;
+            }
+            break;
+        case GI_VB_PLAY_DEKU_TREE_INTRO_CS: {
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.Story", 0)) {
+                BgTreemouth* treeMouth = static_cast<BgTreemouth*>(opt);
+                Flags_SetEventChkInf(EVENTCHKINF_DEKU_TREE_OPENED_MOUTH);
+                Audio_PlaySoundGeneral(NA_SE_EV_WOODDOOR_OPEN, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
+                BgTreemouth_SetupAction(treeMouth, func_808BC6F8);
+                *should = false;
+            }
+            break;
+        }
+        case GI_VB_GIVE_ITEM_FROM_BLUE_WARP:
+        case GI_VB_PLAY_SHIEK_BLOCK_MASTER_SWORD_CS:
+        case GI_VB_GIVE_ITEM_FAIRY_OCARINA:
+        case GI_VB_GIVE_ITEM_LIGHT_ARROW:
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.Story", 0)) {
+                *should = false;
+            }
+            break;
+        case GI_VB_PLAY_NABOORU_CAPTURED_CS:
+            if (*should == true && CVarGetInteger("gTimeSavers.SkipCutscene.Story", 0)) {
+                Flags_SetEventChkInf(EVENTCHKINF_NABOORU_CAPTURED_BY_TWINROVA);
+                *should = false;
+            }
+            break;
+        case GI_VB_PLAY_PULL_MASTER_SWORD_CS:
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.Story", 0)) {
+                if (!Flags_GetEventChkInf(EVENTCHKINF_PULLED_MASTER_SWORD_FROM_PEDESTAL)) {
+                    // Normally, these would be done in the cutscene, but we're skipping it
+                    Flags_SetEventChkInf(EVENTCHKINF_PULLED_MASTER_SWORD_FROM_PEDESTAL);
+                    Flags_SetEventChkInf(EVENTCHKINF_ENTERED_MASTER_SWORD_CHAMBER);
+                    Flags_SetEventChkInf(EVENTCHKINF_SHEIK_SPAWNED_AT_MASTER_SWORD_PEDESTAL);
+                    Flags_SetEventChkInf(EVENTCHKINF_TIME_TRAVELED_TO_ADULT);
+                    if (GameInteractor_Should(GI_VB_GIVE_ITEM_LIGHT_MEDALLION, true, NULL)) {
+                        Item_Give(gPlayState, ITEM_MEDALLION_LIGHT);
+                    }
+                }
+                *should = false;
+            }
+            break;
+        case GI_VB_OWL_INTERACTION: {
+            if (CVarGetInteger("gTimeSavers.SkipOwlInteractions", 0) && *should) {
+                EnOwl* enOwl = static_cast<EnOwl*>(opt);
+                s32 owlType = (enOwl->actor.params & 0xFC0) >> 6;
+
+                if (((enOwl->actor.params & 0xFC0) >> 6) == 1) {
+                    Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_KAEPORA_BY_LOST_WOODS);
+                }
+
+                func_80ACA62C(enOwl, gPlayState);
+                *should = false;
+            }
+            break;
+        }
+        case GI_VB_PLAY_EYEDROP_CREATION_ANIM:
+        case GI_VB_PLAY_EYEDROPS_CS:
+        case GI_VB_PLAY_DROP_FISH_FOR_JABU_CS:
+        case GI_VB_PLAY_DARUNIAS_JOY_CS:
+            if (CVarGetInteger("gTimeSavers.SkipMiscInteractions", 0)) {
+                *should = false;
+            }
+            break;
+        case GI_VB_PLAY_ZELDAS_LULLABY_CS: {
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", 0) || IS_RANDO) {
+                DemoIm* demoIm = static_cast<DemoIm*>(opt);
+                Player* player = GET_PLAYER(gPlayState);
+                player->stateFlags1 |= PLAYER_STATE1_IN_CUTSCENE;
+                player->stateFlags1 |= PLAYER_STATE1_GETTING_ITEM;
+                func_80986794(demoIm);
+
+                static uint32_t demoImUpdateHook = 0;
+                static uint32_t demoImKillHook = 0;
+                demoImUpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* actorRef) mutable {
+                    Actor* actor = static_cast<Actor*>(actorRef);
+                    if (actor->id == ACTOR_DEMO_IM && (CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", 0) || IS_RANDO)) {
+                        DemoIm* demoIm = static_cast<DemoIm*>(actorRef);
+                        Player* player = GET_PLAYER(gPlayState);
+                        player->stateFlags1 |= PLAYER_STATE1_IN_CUTSCENE;
+                        player->stateFlags1 |= PLAYER_STATE1_GETTING_ITEM;
+
+                        if (Animation_OnFrame(&demoIm->skelAnime, 25.0f)) {
+                            Audio_PlaySoundGeneral(NA_SE_IT_DEKU, &demoIm->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8);
+                            GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(demoImUpdateHook);
+                            GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(demoImKillHook);
+                            demoImUpdateHook = 0;
+                            demoImKillHook = 0;
+                        } else if (Animation_OnFrame(&demoIm->skelAnime, 15.0f)) {
+                            Player* player = GET_PLAYER(gPlayState);
+                            // SOH [Randomizer] In entrance rando have impa bring link back to the front of castle grounds
+                            if (IS_RANDO && RAND_GET_OPTION(RSK_SHUFFLE_OVERWORLD_ENTRANCES)) {
+                                gPlayState->nextEntranceIndex = ENTR_HYRULE_CASTLE_0;
+                            } else {
+                                gPlayState->nextEntranceIndex = ENTR_HYRULE_FIELD_17;
+                            }
+                            gPlayState->transitionType = TRANS_TYPE_FADE_WHITE;
+                            gPlayState->transitionTrigger = TRANS_TRIGGER_START;
+                            gSaveContext.nextTransitionType = 2;
+                            func_8002DF54(gPlayState, &player->actor, 8);
+                        }
+                    }
+                });
+                demoImKillHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>([](int16_t sceneNum) mutable {
+                    GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(demoImUpdateHook);
+                    GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(demoImKillHook);
+                    demoImUpdateHook = 0;
+                    demoImKillHook = 0;
+                });
+                *should = false;
+            }
+            break;
+        }
+        case GI_VB_PLAY_SARIAS_SONG_CS: {
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", 0) || IS_RANDO) {
+                EnSa* enSa = static_cast<EnSa*>(opt);
+                enSa->actionFunc = func_80AF6B20;
+                *should = false;
+            }
+            break;
+        }
+        case GI_VB_DESPAWN_HORSE_RACE_COW: {
+            if (Flags_GetEventChkInf(EVENTCHKINF_WON_COW_IN_MALONS_RACE) && CVarGetInteger("gCowOfTime", 0)) {
+                *should = false;
+            }
+            break;
+        }
+        case GI_VB_GIVE_ITEM_MINUET_OF_FOREST:
+        case GI_VB_GIVE_ITEM_BOLERO_OF_FIRE:
+        case GI_VB_GIVE_ITEM_SERENADE_OF_WATER:
+        case GI_VB_GIVE_ITEM_REQUIEM_OF_SPIRIT:
+        case GI_VB_GIVE_ITEM_NOCTURNE_OF_SHADOW:
+        case GI_VB_GIVE_ITEM_PRELUDE_OF_LIGHT:
+        case GI_VB_GIVE_ITEM_ZELDAS_LULLABY:
+        case GI_VB_GIVE_ITEM_EPONAS_SONG:
+        case GI_VB_GIVE_ITEM_SARIAS_SONG:
+        case GI_VB_GIVE_ITEM_SUNS_SONG:
+        case GI_VB_GIVE_ITEM_SONG_OF_TIME:
+        case GI_VB_GIVE_ITEM_SONG_OF_STORMS:
+        case GI_VB_PLAY_MINUET_OF_FOREST_CS:
+        case GI_VB_PLAY_BOLERO_OF_FIRE_CS:
+        case GI_VB_PLAY_SERENADE_OF_WATER_CS:
+        case GI_VB_PLAY_PRELUDE_OF_LIGHT_CS:
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", 0) || IS_RANDO) {
+                *should = false;
+            }
+            break;
+        case GI_VB_DAMPE_IN_GRAVEYARD_DESPAWN:
+            if (CVarGetInteger("gDampeAllNight", 0)) {
+                *should = LINK_IS_ADULT || gPlayState->sceneNum != SCENE_GRAVEYARD;
+            }
+            break;
+        case GI_VB_BE_VALID_GRAVEDIGGING_SPOT:
+            if (CVarGetInteger("gDampeWin", 0)) {
+                EnTk *enTk = static_cast<EnTk*>(opt);
+                enTk->validDigHere = true;
+                *should = true;
+            }
+            break;
+        case GI_VB_BE_DAMPE_GRAVEDIGGING_GRAND_PRIZE:
+            if (CVarGetInteger("gDampeWin", 0)) {
+                EnTk *enTk = static_cast<EnTk*>(opt);
+                enTk->currentReward = 3;
+                *should = true;
+            }
+            break;
+        case GI_VB_DAMPE_GRAVEDIGGING_GRAND_PRIZE_BE_HEART_PIECE:
+            if (CVarGetInteger("gGravediggingTourFix", 0) || IS_RANDO) {
+                *should = !Flags_GetCollectible(gPlayState, COLLECTFLAG_GRAVEDIGGING_HEART_PIECE);
+            }
+            break;
+        case GI_VB_FIX_SAW_SOFTLOCK:
+            // Animation Count should be no more than 1 to guarantee putaway is complete after giving the saw
+            // As this is vanilla behavior, it only applies with the Fix toggle or Skip Text enabled.
+            *should = (CVarGetInteger("gFixSawSoftlock", 0) != 0 || CVarGetInteger("gSkipText", 0) != 0) ? gPlayState->animationCtx.animationCount > 1 : *should;
+            break;
+        case GI_VB_BIGGORON_CONSIDER_SWORD_FORGED:
+            *should = Environment_GetBgsDayCount() >= CVarGetInteger("gForgeTime", 3);
+            break;
+    }
+}
+
+static uint32_t enKoUpdateHook = 0;
+static uint32_t enKoKillHook = 0;
+static uint32_t itemOcarinaUpdateHook = 0;
+static uint32_t itemOcarinaframesSinceSpawn = 0;
+static uint32_t enMa1UpdateHook = 0;
+static uint32_t enMa1KillHook = 0;
+void TimeSaverOnActorInitHandler(void* actorRef) {
+    Actor* actor = static_cast<Actor*>(actorRef);
+
+    if (actor->id == ACTOR_EN_KO && (actor->params & 0xFF) == ENKO_TYPE_CHILD_3) {
+        enKoUpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* innerActorRef) mutable {
+            Actor* innerActor = static_cast<Actor*>(innerActorRef);
+            if (innerActor->id == ACTOR_EN_KO && (innerActor->params & 0xFF) == ENKO_TYPE_CHILD_3 && (CVarGetInteger("gTimeSavers.SkipCutscene.Story", 0) || IS_RANDO)) {
+                EnKo* enKo = static_cast<EnKo*>(innerActorRef);
+                // They haven't moved yet, wrap their update function so we check every frame
+                if (enKo->actionFunc == func_80A995CC) {
+                    enKo->actionFunc = EnKo_MoveWhenReady;
+                    GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(enKoUpdateHook);
+                    GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(enKoKillHook);
+                    enKoUpdateHook = 0;
+                    enKoKillHook = 0;
+                // They have already moved
+                } else if (enKo->actionFunc == func_80A99384) {
+                    GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(enKoUpdateHook);
+                    GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(enKoKillHook);
+                    enKoUpdateHook = 0;
+                    enKoKillHook = 0;
+                }
+            }
+        });
+        enKoKillHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>([](int16_t sceneNum) mutable {
+            GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(enKoUpdateHook);
+            GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(enKoKillHook);
+            enKoUpdateHook = 0;
+            enKoKillHook = 0;
+        });
+    }
+
+    if (actor->id == ACTOR_ITEM_OCARINA && actor->params == 3 && CVarGetInteger("gTimeSavers.SkipCutscene.Story", 0)) {
+        itemOcarinaframesSinceSpawn = 0;
+        itemOcarinaUpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* innerActorRef) mutable {
+            Actor* innerActor = static_cast<Actor*>(innerActorRef);
+            if (innerActor->id != ACTOR_ITEM_OCARINA || innerActor->params != 3) return;
+            itemOcarinaframesSinceSpawn++;
+            if (itemOcarinaframesSinceSpawn > 20) {
+                Audio_PlayActorSound2(innerActor, NA_SE_EV_BOMB_DROP_WATER);
+
+                GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(itemOcarinaUpdateHook);
+                itemOcarinaUpdateHook = 0;
+            }
+        });
+    }
+
+    if (actor->id == ACTOR_EN_MA1 && gPlayState->sceneNum == SCENE_LON_LON_RANCH) {
+        enMa1UpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* innerActorRef) mutable {
+            Actor* innerActor = static_cast<Actor*>(innerActorRef);
+            if (innerActor->id == ACTOR_EN_MA1 && (CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", 0) || IS_RANDO)) {
+                EnMa1* enMa1 = static_cast<EnMa1*>(innerActorRef);
+                if (enMa1->actionFunc == func_80AA106C) {
+                    enMa1->actionFunc = EnMa1_EndTeachSong;
+                    GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(enMa1UpdateHook);
+                    GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(enMa1KillHook);
+                    enMa1UpdateHook = 0;
+                    enMa1KillHook = 0;
+                // They've already learned the song
+                } else if (enMa1->actionFunc == func_80AA0D88) {
+                    GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(enMa1UpdateHook);
+                    GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(enMa1KillHook);
+                    enMa1UpdateHook = 0;
+                    enMa1KillHook = 0;
+                }
+            }
+        });
+        enMa1KillHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>([](int16_t sceneNum) mutable {
+            GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(enMa1UpdateHook);
+            GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(enMa1KillHook);
+            enMa1UpdateHook = 0;
+            enMa1KillHook = 0;
+        });
+    }
+
+    if (actor->id == ACTOR_EN_ZL4 && CVarGetInteger("gTimeSavers.SkipCutscene.Story", 0)) {
+        EnZl4* enZl4 = static_cast<EnZl4*>(actorRef);
+        if (enZl4->actionFunc != EnZl4_Cutscene || enZl4->csState != 0) return;
+
+        enZl4->actionFunc = EnZl4_SkipToGivingZeldasLetter;
+    }
+}
+
+void TimeSaverOnSceneInitHandler(int16_t sceneNum) {
+    switch (sceneNum) {
+        case SCENE_HYRULE_CASTLE:
+            if (CVarGetInteger("gTimeSavers.SkipMiscInteractions", 0) && !Flags_GetInfTable(INFTABLE_ENTERED_HYRULE_CASTLE)) {
+                Flags_SetInfTable(INFTABLE_ENTERED_HYRULE_CASTLE);
+                Flags_SetInfTable(INFTABLE_MET_CHILD_MALON_AT_CASTLE_OR_MARKET);
+                Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_CHILD_MALON_AT_CASTLE_OR_MARKET);
+            }
+            break;
+        case SCENE_LON_LON_RANCH:
+            if (CVarGetInteger("gTimeSavers.SkipMiscInteractions", 0) && GameInteractor_Should(GI_VB_MALON_RETURN_FROM_CASTLE, Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE), NULL)) {
+                Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_CHILD_MALON_AT_RANCH);
+                Flags_SetInfTable(INFTABLE_CHILD_MALON_SAID_EPONA_WAS_AFRAID_OF_YOU);
+                Flags_SetEventChkInf(EVENTCHKINF_INVITED_TO_SING_WITH_CHILD_MALON);
+            }
+            break;
+        case SCENE_DEKU_TREE_BOSS:
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", 0)) {
+                if (!Flags_GetEventChkInf(EVENTCHKINF_BEGAN_GOHMA_BATTLE)) {
+                    Flags_SetEventChkInf(EVENTCHKINF_BEGAN_GOHMA_BATTLE);
+                }
+            }
+            break;
+        case SCENE_DODONGOS_CAVERN_BOSS:
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", 0)) {
+                if (!Flags_GetEventChkInf(EVENTCHKINF_BEGAN_KING_DODONGO_BATTLE)) {
+                    Flags_SetEventChkInf(EVENTCHKINF_BEGAN_KING_DODONGO_BATTLE);
+                }
+            }
+            break;
+        case SCENE_JABU_JABU_BOSS:
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", 0)) {
+                if (!Flags_GetEventChkInf(EVENTCHKINF_BEGAN_BARINA_BATTLE)) {
+                    Flags_SetEventChkInf(EVENTCHKINF_BEGAN_BARINA_BATTLE);
+                }
+            }
+            break;
+    }
+}
+
+static GetItemEntry vanillaQueuedItemEntry = GET_ITEM_NONE;
+
+void TimeSaverOnFlagSetHandler(int16_t flagType, int16_t flag) {
+    if (!CVarGetInteger("gTimeSavers.SkipCutscene.Story", 0)) return;
+
+    switch (flagType) {
+        case FLAG_EVENT_CHECK_INF:
+            switch (flag) {
+                case EVENTCHKINF_SPOKE_TO_SARIA_ON_BRIDGE:
+                    vanillaQueuedItemEntry = Rando::StaticData::RetrieveItem(RG_FAIRY_OCARINA).GetGIEntry_Copy();
+                    break;
+                case EVENTCHKINF_LEARNED_ZELDAS_LULLABY:
+                    vanillaQueuedItemEntry = Rando::StaticData::RetrieveItem(RG_ZELDAS_LULLABY).GetGIEntry_Copy();
+                    break;
+                case EVENTCHKINF_LEARNED_MINUET_OF_FOREST:
+                    vanillaQueuedItemEntry = Rando::StaticData::RetrieveItem(RG_MINUET_OF_FOREST).GetGIEntry_Copy();
+                    break;
+                case EVENTCHKINF_LEARNED_BOLERO_OF_FIRE:
+                    vanillaQueuedItemEntry = Rando::StaticData::RetrieveItem(RG_BOLERO_OF_FIRE).GetGIEntry_Copy();
+                    break;
+                case EVENTCHKINF_LEARNED_SERENADE_OF_WATER:
+                    vanillaQueuedItemEntry = Rando::StaticData::RetrieveItem(RG_SERENADE_OF_WATER).GetGIEntry_Copy();
+                    break;
+                case EVENTCHKINF_LEARNED_REQUIEM_OF_SPIRIT:
+                    vanillaQueuedItemEntry = Rando::StaticData::RetrieveItem(RG_REQUIEM_OF_SPIRIT).GetGIEntry_Copy();
+                    break;
+                case EVENTCHKINF_BONGO_BONGO_ESCAPED_FROM_WELL:
+                    vanillaQueuedItemEntry = Rando::StaticData::RetrieveItem(RG_NOCTURNE_OF_SHADOW).GetGIEntry_Copy();
+                    break;
+                case EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT:
+                    vanillaQueuedItemEntry = Rando::StaticData::RetrieveItem(RG_PRELUDE_OF_LIGHT).GetGIEntry_Copy();
+                    break;
+                case EVENTCHKINF_LEARNED_SARIAS_SONG:
+                    vanillaQueuedItemEntry = Rando::StaticData::RetrieveItem(RG_SARIAS_SONG).GetGIEntry_Copy();
+                    break;
+                case EVENTCHKINF_OBTAINED_KOKIRI_EMERALD_DEKU_TREE_DEAD:
+                    vanillaQueuedItemEntry = Rando::StaticData::RetrieveItem(RG_KOKIRI_EMERALD).GetGIEntry_Copy();
+                    break;
+                case EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP:
+                    vanillaQueuedItemEntry = Rando::StaticData::RetrieveItem(RG_GORON_RUBY).GetGIEntry_Copy();
+                    break;
+                case EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP:
+                    vanillaQueuedItemEntry = Rando::StaticData::RetrieveItem(RG_ZORA_SAPPHIRE).GetGIEntry_Copy();
+                    break;
+                case EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP:
+                    vanillaQueuedItemEntry = Rando::StaticData::RetrieveItem(RG_FOREST_MEDALLION).GetGIEntry_Copy();
+                    break;
+                case EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP:
+                    vanillaQueuedItemEntry = Rando::StaticData::RetrieveItem(RG_FIRE_MEDALLION).GetGIEntry_Copy();
+                    break;
+                case EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP:
+                    vanillaQueuedItemEntry = Rando::StaticData::RetrieveItem(RG_WATER_MEDALLION).GetGIEntry_Copy();
+                    break;
+                case EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS:
+                    vanillaQueuedItemEntry = Rando::StaticData::RetrieveItem(RG_LIGHT_ARROWS).GetGIEntry_Copy();
+                    break;
+                case EVENTCHKINF_TIME_TRAVELED_TO_ADULT:
+                    vanillaQueuedItemEntry = Rando::StaticData::RetrieveItem(RG_LIGHT_MEDALLION).GetGIEntry_Copy();
+                    break;
+                case EVENTCHKINF_LEARNED_SONG_OF_TIME:
+                    vanillaQueuedItemEntry = Rando::StaticData::RetrieveItem(RG_SONG_OF_TIME).GetGIEntry_Copy();
+                    break;
+            }
+            break;
+        case FLAG_RANDOMIZER_INF:
+            switch (flag) {
+                case RAND_INF_LEARNED_EPONA_SONG:
+                    vanillaQueuedItemEntry = Rando::StaticData::RetrieveItem(RG_EPONAS_SONG).GetGIEntry_Copy();
+                    break;
+                case RAND_INF_DUNGEONS_DONE_SHADOW_TEMPLE:
+                    vanillaQueuedItemEntry = Rando::StaticData::RetrieveItem(RG_SHADOW_MEDALLION).GetGIEntry_Copy();
+                    break;
+                case RAND_INF_DUNGEONS_DONE_SPIRIT_TEMPLE:
+                    vanillaQueuedItemEntry = Rando::StaticData::RetrieveItem(RG_SPIRIT_MEDALLION).GetGIEntry_Copy();
+                    break;
+            }
+            break;
+    }
+}
+
+void TimeSaverOnPlayerUpdateHandler() {
+    if (vanillaQueuedItemEntry.itemId == ITEM_NONE) return;
+
+    Player* player = GET_PLAYER(gPlayState);
+    if (player == NULL || Player_InBlockingCsMode(gPlayState, player) || player->stateFlags1 & PLAYER_STATE1_IN_ITEM_CS || player->stateFlags1 & PLAYER_STATE1_GETTING_ITEM || player->stateFlags1 & PLAYER_STATE1_ITEM_OVER_HEAD) {
+        return;
+    }
+
+    SPDLOG_INFO("Attempting to give Item: mod {} item {}", vanillaQueuedItemEntry.modIndex, vanillaQueuedItemEntry.itemId);
+    GiveItemEntryWithoutActor(gPlayState, vanillaQueuedItemEntry);
+    if (player->stateFlags1 & PLAYER_STATE1_IN_WATER) {
+        // Allow the player to receive the item while swimming
+        player->stateFlags2 |= PLAYER_STATE2_UNDERWATER;
+        func_8083E5A8(player, gPlayState);
+    }
+}
+
+void TimeSaverOnItemReceiveHandler(GetItemEntry receivedItemEntry) {
+    if (vanillaQueuedItemEntry.itemId == ITEM_NONE) return;
+
+    if (vanillaQueuedItemEntry.modIndex == receivedItemEntry.modIndex && vanillaQueuedItemEntry.itemId == receivedItemEntry.itemId) {
+        SPDLOG_INFO("Item received: mod {} item {}", receivedItemEntry.modIndex, receivedItemEntry.itemId);
+        vanillaQueuedItemEntry = GET_ITEM_NONE;
+    }
+}
+
+static uint32_t onSceneInitHook = 0;
+static uint32_t onVanillaBehaviorHook = 0;
+static uint32_t onActorInitHook = 0;
+static uint32_t onGameFrameUpdate = 0;
+static uint32_t onFlagSetHook = 0;
+static uint32_t onPlayerUpdateHook = 0;
+static uint32_t onItemReceiveHook = 0;
+void TimeSaverRegisterHooks() {
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnLoadGame>([](int32_t fileNum) mutable {
+        vanillaQueuedItemEntry = GET_ITEM_NONE;
+
+        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(onSceneInitHook);
+        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnVanillaBehavior>(onVanillaBehaviorHook);
+        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorInit>(onActorInitHook);
+        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnGameFrameUpdate>(onGameFrameUpdate);
+        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnFlagSet>(onFlagSetHook);
+        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnPlayerUpdate>(onPlayerUpdateHook);
+        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnItemReceive>(onItemReceiveHook);
+
+        onSceneInitHook = 0;
+        onVanillaBehaviorHook = 0;
+        onActorInitHook = 0;
+        onGameFrameUpdate = 0;
+        onFlagSetHook = 0;
+        onPlayerUpdateHook = 0;
+        onItemReceiveHook = 0;
+
+        onSceneInitHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>(TimeSaverOnSceneInitHandler);
+        onVanillaBehaviorHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnVanillaBehavior>(TimeSaverOnVanillaBehaviorHandler);
+        onActorInitHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorInit>(TimeSaverOnActorInitHandler);
+        onGameFrameUpdate = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGameFrameUpdate>(TimeSaverOnGameFrameUpdateHandler);
+
+        if (IS_RANDO) return;
+
+        onFlagSetHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnFlagSet>(TimeSaverOnFlagSetHandler);
+        onPlayerUpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnPlayerUpdate>(TimeSaverOnPlayerUpdateHandler);
+        onItemReceiveHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnItemReceive>(TimeSaverOnItemReceiveHandler);
+    });
+}
\ No newline at end of file
diff --git a/soh/soh/Enhancements/timesaver_hook_handlers.h b/soh/soh/Enhancements/timesaver_hook_handlers.h
new file mode 100644
index 000000000..41bccd8d9
--- /dev/null
+++ b/soh/soh/Enhancements/timesaver_hook_handlers.h
@@ -0,0 +1,6 @@
+#ifndef TIMESAVER_HOOK_HANDLERS_H
+#define TIMESAVER_HOOK_HANDLERS_H
+
+void TimeSaverRegisterHooks();
+
+#endif // TIMESAVER_HOOK_HANDLERS_H
\ No newline at end of file
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
index 38da2015b..334b99949 100644
--- a/soh/soh/OTRGlobals.cpp
+++ b/soh/soh/OTRGlobals.cpp
@@ -122,6 +122,10 @@ GameInteractorSail* GameInteractorSail::Instance;
 
 #include "soh/config/ConfigUpdaters.h"
 
+extern "C" {
+#include "src/overlays/actors/ovl_En_Dns/z_en_dns.h"
+}
+
 void SoH_ProcessDroppedFiles(std::string filePath);
 
 OTRGlobals* OTRGlobals::Instance;
@@ -2567,9 +2571,9 @@ extern "C" int CustomMessage_RetrieveIfExists(PlayState* play) {
         } else if (textId == TEXT_SHEIK_NEED_HOOK || textId == TEXT_SHEIK_HAVE_HOOK) {
             messageEntry = OTRGlobals::Instance->gRandomizer->GetSheikMessage(gPlayState->sceneNum, textId);            
         // textId: TEXT_SCRUB_RANDOM + (randomizerInf - RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT)
-        } else if (textId >= TEXT_SCRUB_RANDOM && textId <= TEXT_SCRUB_RANDOM + NUM_SCRUBS) {
-            RandomizerInf randoInf = (RandomizerInf)((textId - TEXT_SCRUB_RANDOM) + RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT);
-            messageEntry = OTRGlobals::Instance->gRandomizer->GetMerchantMessage(randoInf, TEXT_SCRUB_RANDOM, Randomizer_GetSettingValue(RSK_SCRUB_TEXT_HINT) == RO_GENERIC_OFF);
+        } else if (textId == TEXT_SCRUB_RANDOM) {
+            EnDns* enDns = (EnDns*)GET_PLAYER(play)->targetActor;
+            messageEntry = OTRGlobals::Instance->gRandomizer->GetMerchantMessage(enDns->sohScrubIdentity.randomizerInf, TEXT_SCRUB_RANDOM, Randomizer_GetSettingValue(RSK_SCRUB_TEXT_HINT) == RO_GENERIC_OFF);
         // Shop items each have two message entries, second one offset by NUM_SHOP_ITEMS
         // textId: TEXT_SHOP_ITEM_RANDOM + (randomizerInf - RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_1)
         // textId: TEXT_SHOP_ITEM_RANDOM + ((randomizerInf - RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_1) + NUM_SHOP_ITEMS)
diff --git a/soh/soh/SaveManager.cpp b/soh/soh/SaveManager.cpp
index daae87146..e42e16b3f 100644
--- a/soh/soh/SaveManager.cpp
+++ b/soh/soh/SaveManager.cpp
@@ -351,6 +351,13 @@ void SaveManager::LoadRandomizerVersion3() {
                 // all ItemLocations is 0 anyway.
                 randoContext->GetItemLocation(i)->SetCustomPrice(price);
             }
+            uint16_t obtained = 0; 
+            SaveManager::Instance->LoadData("obtained", obtained, (uint16_t)0);
+            if (obtained) {
+                randoContext->GetItemLocation(i)->MarkAsObtained();
+            } else {
+                randoContext->GetItemLocation(i)->MarkAsNotObtained();
+            }
         });
     });
 
@@ -449,6 +456,7 @@ void SaveManager::SaveRandomizer(SaveContext* saveContext, int sectionID, bool f
             if (randoContext->GetItemLocation(i)->HasCustomPrice()) {
                 SaveManager::Instance->SaveData("price", randoContext->GetItemLocation(i)->GetPrice());
             }
+            SaveManager::Instance->SaveData("obtained", randoContext->GetItemLocation(i)->HasObtained());
         });
     });
 
@@ -727,6 +735,9 @@ void SaveManager::InitFileNormal() {
     for (int flag = 0; flag < ARRAY_COUNT(gSaveContext.infTable); flag++) {
         gSaveContext.infTable[flag] = 0;
     }
+    for (int flag = 0; flag < ARRAY_COUNT(gSaveContext.randomizerInf); flag++) {
+        gSaveContext.randomizerInf[flag] = 0;
+    }
     gSaveContext.worldMapAreaData = 0;
     gSaveContext.scarecrowLongSongSet = 0;
     for (int i = 0; i < ARRAY_COUNT(gSaveContext.scarecrowLongSong); i++) {
diff --git a/soh/soh/SohMenuBar.cpp b/soh/soh/SohMenuBar.cpp
index 56e12e53e..2ec571e26 100644
--- a/soh/soh/SohMenuBar.cpp
+++ b/soh/soh/SohMenuBar.cpp
@@ -69,6 +69,7 @@ static const char* imguiScaleOptions[4] = { "Small", "Normal", "Large", "X-Large
     };
 
     static const char* chestStyleMatchesContentsOptions[4] = { "Disabled", "Both", "Texture Only", "Size Only" };
+    static const char* skipGetItemAnimationOptions[3] = { "Disabled", "Junk Items", "All Items" };
     static const char* bunnyHoodOptions[3] = { "Disabled", "Faster Run & Longer Jump", "Faster Run" };
     static const char* mirroredWorldModes[9] = {
         "Disabled",           "Always",        "Random",          "Random (Seeded)",          "Dungeons",
@@ -555,6 +556,83 @@ void DrawEnhancementsMenu() {
                 UIWidgets::Spacer(0);
                 ImGui::Text("Speed-ups:");
                 UIWidgets::PaddedSeparator();
+                bool allChecked =
+                    CVarGetInteger("gTimeSavers.SkipCutscene.Intro", 0) &&
+                    CVarGetInteger("gTimeSavers.SkipCutscene.Entrances", 0) &&
+                    CVarGetInteger("gTimeSavers.SkipCutscene.Story", 0) &&
+                    CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", 0) &&
+                    CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", 0) &&
+                    CVarGetInteger("gTimeSavers.SkipCutscene.GlitchAiding", 0) &&
+                    CVarGetInteger("gTimeSavers.SkipCutscene.OnePoint", 0) &&
+                    CVarGetInteger("gTimeSavers.NoForcedDialog", 0) &&
+                    CVarGetInteger("gTimeSavers.SkipOwlInteractions", 0) &&
+                    CVarGetInteger("gTimeSavers.SkipMiscInteractions", 0) &&
+                    CVarGetInteger("gTimeSavers.DisableTitleCard", 0);
+                bool someChecked =
+                    CVarGetInteger("gTimeSavers.SkipCutscene.Intro", 0) ||
+                    CVarGetInteger("gTimeSavers.SkipCutscene.Entrances", 0) ||
+                    CVarGetInteger("gTimeSavers.SkipCutscene.Story", 0) ||
+                    CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", 0) ||
+                    CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", 0) ||
+                    CVarGetInteger("gTimeSavers.SkipCutscene.GlitchAiding", 0) ||
+                    CVarGetInteger("gTimeSavers.SkipCutscene.OnePoint", 0) ||
+                    CVarGetInteger("gTimeSavers.NoForcedDialog", 0) ||
+                    CVarGetInteger("gTimeSavers.SkipOwlInteractions", 0) ||
+                    CVarGetInteger("gTimeSavers.SkipMiscInteractions", 0) ||
+                    CVarGetInteger("gTimeSavers.DisableTitleCard", 0);
+
+                ImGuiContext* g = ImGui::GetCurrentContext();
+                ImGuiItemFlags backup_item_flags = g->CurrentItemFlags;
+                if (!allChecked && someChecked) g->CurrentItemFlags |= ImGuiItemFlags_MixedValue;
+                if (ImGui::Checkbox("All", &allChecked)) {
+                    if (allChecked) {
+                        CVarSetInteger("gTimeSavers.SkipCutscene.Intro", 1);
+                        CVarSetInteger("gTimeSavers.SkipCutscene.Entrances", 1);
+                        CVarSetInteger("gTimeSavers.SkipCutscene.Story", 1);
+                        CVarSetInteger("gTimeSavers.SkipCutscene.LearnSong", 1);
+                        CVarSetInteger("gTimeSavers.SkipCutscene.BossIntro", 1);
+                        CVarSetInteger("gTimeSavers.SkipCutscene.GlitchAiding", 1);
+                        CVarSetInteger("gTimeSavers.SkipCutscene.OnePoint", 1);
+                        CVarSetInteger("gTimeSavers.NoForcedDialog", 1);
+                        CVarSetInteger("gTimeSavers.SkipOwlInteractions", 1);
+                        CVarSetInteger("gTimeSavers.SkipMiscInteractions", 1);
+                        CVarSetInteger("gTimeSavers.DisableTitleCard", 1);
+                    } else {
+                        CVarSetInteger("gTimeSavers.SkipCutscene.Intro", 0);
+                        CVarSetInteger("gTimeSavers.SkipCutscene.Entrances", 0);
+                        CVarSetInteger("gTimeSavers.SkipCutscene.Story", 0);
+                        CVarSetInteger("gTimeSavers.SkipCutscene.LearnSong", 0);
+                        CVarSetInteger("gTimeSavers.SkipCutscene.BossIntro", 0);
+                        CVarSetInteger("gTimeSavers.SkipCutscene.GlitchAiding", 0);
+                        CVarSetInteger("gTimeSavers.SkipCutscene.OnePoint", 0);
+                        CVarSetInteger("gTimeSavers.NoForcedDialog", 0);
+                        CVarSetInteger("gTimeSavers.SkipOwlInteractions", 0);
+                        CVarSetInteger("gTimeSavers.SkipMiscInteractions", 0);
+                        CVarSetInteger("gTimeSavers.DisableTitleCard", 0);
+                    }
+                    LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
+                }
+                g->CurrentItemFlags = backup_item_flags;
+                UIWidgets::PaddedEnhancementCheckbox("Skip Intro", "gTimeSavers.SkipCutscene.Intro");
+                UIWidgets::PaddedEnhancementCheckbox("Skip Entrance Cutscenes", "gTimeSavers.SkipCutscene.Entrances");
+                UIWidgets::PaddedEnhancementCheckbox("Skip Story Cutscenes", "gTimeSavers.SkipCutscene.Story");
+                UIWidgets::PaddedEnhancementCheckbox("Skip Song Cutscenes", "gTimeSavers.SkipCutscene.LearnSong");
+                UIWidgets::PaddedEnhancementCheckbox("Skip Boss Introductions", "gTimeSavers.SkipCutscene.BossIntro");
+                UIWidgets::PaddedEnhancementCheckbox("Skip Glitch-Aiding Cutscenes", "gTimeSavers.SkipCutscene.GlitchAiding");
+                UIWidgets::Tooltip("Skip cutscenes that are associated with useful glitches, currently this is only the Fire Temple Darunia CS and Forest Temple Poe Sisters CS");
+                UIWidgets::PaddedEnhancementCheckbox("Skip One Point Cutscenes (Chests, Door Unlocks, etc)", "gTimeSavers.SkipCutscene.OnePoint");
+                UIWidgets::PaddedEnhancementCheckbox("No Forced Dialog", "gTimeSavers.NoForcedDialog");
+                UIWidgets::Tooltip("Prevent forced conversations with Navi or other NPCs");
+                UIWidgets::PaddedEnhancementCheckbox("Skip Owl Interactions", "gTimeSavers.SkipOwlInteractions");
+                UIWidgets::PaddedEnhancementCheckbox("Skip Misc Interactions", "gTimeSavers.SkipMiscInteractions");
+                UIWidgets::PaddedEnhancementCheckbox("Disable Title Card", "gTimeSavers.DisableTitleCard");
+
+                UIWidgets::PaddedText("Skip Get Item Animations", true, false);
+                UIWidgets::EnhancementCombobox("gTimeSavers.SkipGetItemAnimation", skipGetItemAnimationOptions, SGIA_DISABLED);
+                if (CVarGetInteger("gTimeSavers.SkipGetItemAnimation", SGIA_DISABLED) != SGIA_DISABLED) {
+                    UIWidgets::EnhancementSliderFloat("Item Scale: %f", "##ItemScale", "gTimeSavers.SkipGetItemAnimationScale", 5.0f, 15.0f, "", 10.0f, false);
+                    UIWidgets::Tooltip("The size of the item when it is picked up");
+                }
 
                 UIWidgets::PaddedEnhancementSliderInt("Text Speed: %dx", "##TEXTSPEED", "gTextSpeed", 1, 5, "", 1, true, false, true);
                 UIWidgets::PaddedEnhancementCheckbox("Skip Text", "gSkipText", false, true);
@@ -565,37 +643,8 @@ void DrawEnhancementsMenu() {
                 UIWidgets::PaddedEnhancementSliderInt("Crawl speed %dx", "##CRAWLSPEED", "gCrawlSpeed", 1, 5, "", 1, true, false, true);
                 UIWidgets::PaddedEnhancementCheckbox("Faster Heavy Block Lift", "gFasterHeavyBlockLift", false, false);
                 UIWidgets::Tooltip("Speeds up lifting silver rocks and obelisks");
-                UIWidgets::PaddedEnhancementCheckbox("Skip Pickup Messages", "gFastDrops", true, false);
-                UIWidgets::Tooltip("Skip pickup messages for new consumable items and bottle swipes");
-                UIWidgets::PaddedEnhancementCheckbox("Fast Ocarina Playback", "gFastOcarinaPlayback", true, false);
-                UIWidgets::Tooltip("Skip the part where the Ocarina playback is called when you play a song");
-                bool forceSkipScarecrow = IS_RANDO && OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SKIP_SCARECROWS_SONG);
-                static const char* forceSkipScarecrowText = "This setting is forcefully enabled because a savefile\nwith \"Skip Scarecrow Song\" is loaded";
-                UIWidgets::PaddedEnhancementCheckbox("Skip Scarecrow Song", "gSkipScarecrow", true, false,
-                                                        forceSkipScarecrow, forceSkipScarecrowText, UIWidgets::CheckboxGraphics::Checkmark);
-                UIWidgets::Tooltip("Pierre appears when Ocarina is pulled out. Requires learning scarecrow song.");
-                UIWidgets::PaddedEnhancementCheckbox("Skip Magic Arrow Equip Animation", "gSkipArrowAnimation", true, false);
-                UIWidgets::PaddedEnhancementCheckbox("Skip save confirmation", "gSkipSaveConfirmation", true, false);
-                UIWidgets::Tooltip("Skip the \"Game saved.\" confirmation screen");
-                UIWidgets::PaddedEnhancementCheckbox("Faster Farore's Wind", "gFastFarores", true, false);
-                UIWidgets::Tooltip("Greatly decreases cast time of Farore's Wind magic spell.");
-                UIWidgets::PaddedEnhancementCheckbox("Skip water take breath animation", "gSkipSwimDeepEndAnim", true, false);
-                UIWidgets::Tooltip("Skips Link's taking breath animation after coming up from water. This setting does not interfere with getting items from underwater.");
-
-                ImGui::TableNextColumn();
-                UIWidgets::Spacer(0);
-                ImGui::Text("Changes:");
-                UIWidgets::PaddedSeparator();
-                
-                UIWidgets::PaddedEnhancementSliderInt("Biggoron Forge Time: %d days", "##FORGETIME", "gForgeTime", 0, 3, "", 3, true, false, true);
-                UIWidgets::Tooltip("Allows you to change the number of days it takes for Biggoron to forge the Biggoron Sword");
-                UIWidgets::PaddedEnhancementCheckbox("Remember Save Location", "gRememberSaveLocation", false, false);
-                UIWidgets::Tooltip("When loading a save, places Link at the last entrance he went through.\n"
-                        "This doesn't work if the save was made in a grotto.");
-                UIWidgets::PaddedEnhancementCheckbox("No Forced Navi", "gNoForcedNavi", true, false);
-                UIWidgets::Tooltip("Prevent forced Navi conversations");
-                UIWidgets::PaddedEnhancementCheckbox("Navi Timer Resets", "gEnhancements.ResetNaviTimer", true, false);
-                UIWidgets::Tooltip("Resets the Navi timer on scene change. If you have already talked to her, she will try and talk to you again, instead of needing a save warp or death. ");
+                UIWidgets::PaddedEnhancementCheckbox("Link as default file name", "gLinkDefaultName", true, false);
+                UIWidgets::Tooltip("Allows you to have \"Link\" as a premade file name");
                 UIWidgets::PaddedEnhancementCheckbox("No Skulltula Freeze", "gSkulltulaFreeze", true, false);
                 UIWidgets::Tooltip("Stops the game from freezing the player when picking up Gold Skulltulas");
                 UIWidgets::PaddedEnhancementCheckbox("Nighttime GS Always Spawn", "gNightGSAlwaysSpawn", true, false);
@@ -1164,7 +1213,8 @@ void DrawEnhancementsMenu() {
             UIWidgets::Tooltip("Removes the dungeon entrance icon on the top-left corner of the screen when no dungeon is present on the current map");
             UIWidgets::PaddedEnhancementCheckbox("Fix Two Handed idle animations", "gTwoHandedIdle", true, false);
             UIWidgets::Tooltip("Re-enables the two-handed idle animation, a seemingly finished animation that was disabled on accident in the original game");
-            UIWidgets::PaddedEnhancementCheckbox("Fix the Gravedigging Tour Glitch", "gGravediggingTourFix", true, false);
+            UIWidgets::PaddedEnhancementCheckbox("Fix the Gravedigging Tour Glitch", "gGravediggingTourFix", true, false, SaveManager::Instance->IsRandoFile(),
+                                                        "This setting is always enabled in randomizer files", UIWidgets::CheckboxGraphics::Checkmark);
             UIWidgets::Tooltip("Fixes a bug where the Gravedigging Tour Heart Piece disappears if the area reloads");
             UIWidgets::PaddedEnhancementCheckbox("Fix Deku Nut upgrade", "gDekuNutUpgradeFix", true, false);
             UIWidgets::Tooltip("Prevents the Forest Stage Deku Nut upgrade from becoming unobtainable after receiving the Poacher's Saw");
diff --git a/soh/src/code/z_demo.c b/soh/src/code/z_demo.c
index 9c0dd9b05..94b04580f 100644
--- a/soh/src/code/z_demo.c
+++ b/soh/src/code/z_demo.c
@@ -32,6 +32,7 @@
 #include "scenes/misc/hakaana_ouke/hakaana_ouke_scene.h"
 
 #include "soh/Enhancements/randomizer/randomizer_entrance.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 u16 D_8011E1C0 = 0;
 u16 D_8011E1C4 = 0;
@@ -485,6 +486,7 @@ void func_80065134(PlayState* play, CutsceneContext* csCtx, CsCmdDayTime* cmd) {
 
         gSaveContext.dayTime = temp1 + temp2;
         gSaveContext.skyboxTime = temp1 + temp2;
+        LUSLOG_INFO("SET TIME %d", gSaveContext.dayTime);
     }
 }
 
@@ -493,11 +495,16 @@ void Cutscene_Command_Terminator(PlayState* play, CutsceneContext* csCtx, CsCmdB
     Player* player = GET_PLAYER(play);
     s32 temp = 0;
 
-    // Automatically skip certain cutscenes when in rando
-    // cmd->base == 8: Traveling back/forward in time cutscene
-    // cmd->base == 24: Dropping a fish for Jabu Jabu
-    // cmd->base == 33: Zelda escaping with impa cutscene
-    bool randoCsSkip = (IS_RANDO && (cmd->base == 8 || cmd->base == 24 || cmd->base == 33));
+    bool shouldSkipCommand = false;
+
+    if (cmd->base == 8 && !GameInteractor_Should(GI_VB_PLAY_PULL_MASTER_SWORD_CS, true, NULL)) {
+        shouldSkipCommand = true;
+    }
+
+    if (cmd->base == 24 && !GameInteractor_Should(GI_VB_PLAY_DROP_FISH_FOR_JABU_CS, true, NULL)) {
+        shouldSkipCommand = true;
+    }
+
     bool debugCsSkip = (CHECK_BTN_ALL(play->state.input[0].press.button, BTN_START) &&
                         (gSaveContext.fileNum != 0xFEDC) && CVarGetInteger("gDebugEnabled", 0));
 
@@ -558,7 +565,7 @@ void Cutscene_Command_Terminator(PlayState* play, CutsceneContext* csCtx, CsCmdB
         }
     }
 
-    if (playCutscene || (temp != 0) || ((csCtx->frames > 20) && (randoCsSkip || debugCsSkip))) {
+    if (playCutscene || (temp != 0) || ((csCtx->frames > 20) && (shouldSkipCommand || debugCsSkip))) {
 
         csCtx->state = CS_STATE_UNSKIPPABLE_EXEC;
         Audio_SetCutsceneFlag(0);
@@ -624,7 +631,7 @@ void Cutscene_Command_Terminator(PlayState* play, CutsceneContext* csCtx, CsCmdB
                     gSaveContext.fw.set = 0;
                     gSaveContext.respawn[RESPAWN_MODE_TOP].data = 0;
                 }
-                if (!Flags_GetEventChkInf(EVENTCHKINF_PULLED_MASTER_SWORD_FROM_PEDESTAL)) {
+                if (GameInteractor_Should(GI_VB_PLAY_PULL_MASTER_SWORD_CS, !Flags_GetEventChkInf(EVENTCHKINF_PULLED_MASTER_SWORD_FROM_PEDESTAL), NULL)) {
                     Flags_SetEventChkInf(EVENTCHKINF_PULLED_MASTER_SWORD_FROM_PEDESTAL);
                     play->nextEntranceIndex = ENTR_CUTSCENE_MAP_0;
                     play->transitionTrigger = TRANS_TRIGGER_START;
@@ -716,7 +723,9 @@ void Cutscene_Command_Terminator(PlayState* play, CutsceneContext* csCtx, CsCmdB
                 play->transitionType = TRANS_TYPE_FADE_WHITE;
                 break;
             case 22:
-                Item_Give(play, ITEM_SONG_REQUIEM);
+                if (GameInteractor_Should(GI_VB_GIVE_ITEM_REQUIEM_OF_SPIRIT, true, NULL)) {
+                    Item_Give(play, ITEM_SONG_REQUIEM);
+                }
                 play->nextEntranceIndex = ENTR_DESERT_COLOSSUS_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
                 gSaveContext.cutsceneIndex = 0xFFF0;
@@ -768,7 +777,9 @@ void Cutscene_Command_Terminator(PlayState* play, CutsceneContext* csCtx, CsCmdB
                 play->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
                 play->transitionType = TRANS_TYPE_FADE_WHITE;
-                Item_Give(play, ITEM_MEDALLION_FIRE);
+                if (GameInteractor_Should(GI_VB_GIVE_ITEM_FIRE_MEDALLION, true, NULL)) {
+                    Item_Give(play, ITEM_MEDALLION_FIRE);
+                }
                 gSaveContext.chamberCutsceneNum = 1;
                 break;
             case 31:
@@ -848,7 +859,9 @@ void Cutscene_Command_Terminator(PlayState* play, CutsceneContext* csCtx, CsCmdB
                 play->transitionType = TRANS_TYPE_FADE_BLACK_FAST;
                 break;
             case 47:
-                Item_Give(play, ITEM_SONG_NOCTURNE);
+                if (GameInteractor_Should(GI_VB_GIVE_ITEM_NOCTURNE_OF_SHADOW, true, NULL)) {
+                    Item_Give(play, ITEM_SONG_NOCTURNE);
+                }
                 Flags_SetEventChkInf(EVENTCHKINF_LEARNED_NOCTURNE_OF_SHADOW);
                 play->nextEntranceIndex = ENTR_KAKARIKO_VILLAGE_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
@@ -1292,7 +1305,7 @@ void Cutscene_Command_Terminator(PlayState* play, CutsceneContext* csCtx, CsCmdB
                 break;
         }
 
-        if (randoCsSkip) {
+        if (shouldSkipCommand && IS_RANDO) {
             Entrance_OverrideCutsceneEntrance(cmd->base);
         }
     }
@@ -1561,7 +1574,49 @@ void Cutscene_Command_Textbox(PlayState* play, CutsceneContext* csCtx, CsCmdText
                 } else if ((cmd->type == 4) && CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) {
                     Message_StartTextbox(play, cmd->textId1, NULL);
                 } else {
+                    GetItemEntry getItemEntry = GET_ITEM_NONE;
+                    if (IS_RANDO) {
+                        switch (cmd->base) {
+                            case 0x80:
+                                getItemEntry = Randomizer_GetItemFromKnownCheck(RC_QUEEN_GOHMA, RG_KOKIRI_EMERALD);
+                                break;
+                            case 0x81:
+                                getItemEntry = Randomizer_GetItemFromKnownCheck(RC_KING_DODONGO, RG_GORON_RUBY);
+                                break;
+                            case 0x82:
+                                getItemEntry = Randomizer_GetItemFromKnownCheck(RC_BARINADE, RG_ZORA_SAPPHIRE);
+                                break;
+                            case 0x3E:
+                                getItemEntry = Randomizer_GetItemFromKnownCheck(RC_PHANTOM_GANON, RG_FOREST_MEDALLION);
+                                break;
+                            case 0x3C:
+                                getItemEntry = Randomizer_GetItemFromKnownCheck(RC_VOLVAGIA, RG_FIRE_MEDALLION);
+                                break;
+                            case 0x3D:
+                                getItemEntry = Randomizer_GetItemFromKnownCheck(RC_MORPHA, RG_WATER_MEDALLION);
+                                break;
+                            case 0x3F:
+                                getItemEntry = Randomizer_GetItemFromKnownCheck(RC_TWINROVA, RG_SPIRIT_MEDALLION);
+                                break;
+                            case 0x41:
+                                getItemEntry = Randomizer_GetItemFromKnownCheck(RC_BONGO_BONGO, RG_SHADOW_MEDALLION);
+                                break;
+                            case 0x40:
+                                getItemEntry = Randomizer_GetItemFromKnownCheck(RC_GIFT_FROM_SAGES, RG_LIGHT_MEDALLION);
+                                break;
+                            case 0x72:
+                                getItemEntry = Randomizer_GetItemFromKnownCheck(RC_TOT_LIGHT_ARROWS_CUTSCENE, RG_LIGHT_ARROWS);
+                                break;
+                        }
+                        if (getItemEntry.getItemId != GI_NONE) {
+                            // cmd->base = getItemEntry.textId;
+                            // GET_PLAYER(play)->getItemEntry = getItemEntry;
+                        }
+                    }
                     Message_StartTextbox(play, cmd->base, NULL);
+                    if (IS_RANDO && getItemEntry.getItemId != GI_NONE) {
+                        // GET_PLAYER(play)->getItemEntry = (GetItemEntry)GET_ITEM_NONE;
+                    }
                 }
                 return;
             }
@@ -1584,12 +1639,14 @@ void Cutscene_Command_Textbox(PlayState* play, CutsceneContext* csCtx, CsCmdText
                 if ((dialogState == TEXT_STATE_CHOICE) && Message_ShouldAdvance(play)) {
                     if (play->msgCtx.choiceIndex == 0) {
                         if (cmd->textId1 != 0xFFFF) {
+                            // LUSLOG_INFO("Cutscene_Command_Textbox D: base:0x%x textId1:0x%x textId2:0x%x", cmd->base, cmd->textId1, cmd->textId2);
                             Message_ContinueTextbox(play, cmd->textId1);
                         } else {
                             csCtx->frames++;
                         }
                     } else {
                         if (cmd->textId2 != 0xFFFF) {
+                            // LUSLOG_INFO("Cutscene_Command_Textbox E: base:0x%x textId1:0x%x textId2:0x%x", cmd->base, cmd->textId1, cmd->textId2);
                             Message_ContinueTextbox(play, cmd->textId2);
                         } else {
                             csCtx->frames++;
@@ -1599,6 +1656,7 @@ void Cutscene_Command_Textbox(PlayState* play, CutsceneContext* csCtx, CsCmdText
 
                 if (dialogState == TEXT_STATE_9) {
                     if (cmd->textId1 != 0xFFFF) {
+                        // LUSLOG_INFO("Cutscene_Command_Textbox F: base:0x%x textId1:0x%x textId2:0x%x", cmd->base, cmd->textId1, cmd->textId2);
                         Message_ContinueTextbox(play, cmd->textId1);
                     } else {
                         csCtx->frames++;
@@ -2113,34 +2171,23 @@ void Cutscene_HandleEntranceTriggers(PlayState* play) {
     u8 requiredAge;
     s16 i;
 
-    if (IS_RANDO &&
-        // don't skip epona escape cutscenes 
-        gSaveContext.entranceIndex != ENTR_HYRULE_FIELD_11 &&
-        gSaveContext.entranceIndex != ENTR_HYRULE_FIELD_12 &&
-        gSaveContext.entranceIndex != ENTR_HYRULE_FIELD_13 &&
-        gSaveContext.entranceIndex != ENTR_HYRULE_FIELD_15 &&
-        // don't skip nabooru iron knuckle cs
-        gSaveContext.entranceIndex != ENTR_SPIRIT_TEMPLE_BOSS_0) {
-        gSaveContext.showTitleCard = false;
-        return;
-    }
-
     for (i = 0; i < ARRAY_COUNT(sEntranceCutsceneTable); i++) {
         entranceCutscene = &sEntranceCutsceneTable[i];
-
         requiredAge = entranceCutscene->ageRestriction;
         if (requiredAge == 2) {
             requiredAge = gSaveContext.linkAge;
         }
 
         if ((gSaveContext.entranceIndex == entranceCutscene->entrance) &&
-            (!Flags_GetEventChkInf(entranceCutscene->flag) || (entranceCutscene->flag == 0x18)) &&
+            (!Flags_GetEventChkInf(entranceCutscene->flag) || (entranceCutscene->flag == EVENTCHKINF_EPONA_OBTAINED)) &&
             (gSaveContext.cutsceneIndex < 0xFFF0) && ((u8)gSaveContext.linkAge == requiredAge) &&
             (gSaveContext.respawnFlag <= 0)) {
             Flags_SetEventChkInf(entranceCutscene->flag);
-            Cutscene_SetSegment(play, entranceCutscene->segAddr);
-            gSaveContext.cutsceneTrigger = 2;
-            gSaveContext.showTitleCard = false;
+            if (GameInteractor_Should(GI_VB_PLAY_ENTRANCE_CS, true, &entranceCutscene->flag)) {
+                Cutscene_SetSegment(play, entranceCutscene->segAddr);
+                gSaveContext.cutsceneTrigger = 2;
+                gSaveContext.showTitleCard = false;
+            }
             break;
         }
     }
@@ -2148,48 +2195,48 @@ void Cutscene_HandleEntranceTriggers(PlayState* play) {
 
 void Cutscene_HandleConditionalTriggers(PlayState* play) {
     osSyncPrintf("\ngame_info.mode=[%d] restart_flag", ((void)0, gSaveContext.respawnFlag));
+    LUSLOG_INFO("Cutscene_HandleConditionalTriggers - entranceIndex: %#x cutsceneIndex: %#x", gSaveContext.entranceIndex, gSaveContext.cutsceneIndex);
+
+    if (!GameInteractor_Should(GI_VB_PLAY_TRANSITION_CS, true, NULL)) {
+        return;
+    }
 
     if ((gSaveContext.gameMode == 0) && (gSaveContext.respawnFlag <= 0) && (gSaveContext.cutsceneIndex < 0xFFF0)) {
-        const bool bShouldTowerRandoSkip =
-            (IS_RANDO && Randomizer_GetSettingValue(RSK_SKIP_TOWER_ESCAPE));
         if ((gSaveContext.entranceIndex == ENTR_DESERT_COLOSSUS_1) && !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_REQUIEM_OF_SPIRIT)) {
-            if (!IS_RANDO) {
-                Flags_SetEventChkInf(EVENTCHKINF_LEARNED_REQUIEM_OF_SPIRIT);
-                gSaveContext.entranceIndex = ENTR_DESERT_COLOSSUS_0;
-                gSaveContext.cutsceneIndex = 0xFFF0;
-            }
-        } else if ((gSaveContext.entranceIndex == ENTR_KAKARIKO_VILLAGE_0) && LINK_IS_ADULT && (Flags_GetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP)) &&
-                   (Flags_GetEventChkInf(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP)) && (Flags_GetEventChkInf(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP)) &&
-                   !Flags_GetEventChkInf(EVENTCHKINF_BONGO_BONGO_ESCAPED_FROM_WELL)) {
-            if (!IS_RANDO) {
-                Flags_SetEventChkInf(EVENTCHKINF_BONGO_BONGO_ESCAPED_FROM_WELL);
-                gSaveContext.cutsceneIndex = 0xFFF0;
-            }
+            Flags_SetEventChkInf(EVENTCHKINF_LEARNED_REQUIEM_OF_SPIRIT);
+            gSaveContext.entranceIndex = ENTR_DESERT_COLOSSUS_0;
+            gSaveContext.cutsceneIndex = 0xFFF0;
+        } else if (GameInteractor_Should(GI_VB_BE_ELIGIBLE_FOR_NOCTURNE_OF_SHADOW, (
+            (gSaveContext.entranceIndex == ENTR_KAKARIKO_VILLAGE_0) && 
+            LINK_IS_ADULT &&
+            Flags_GetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP) && 
+            Flags_GetEventChkInf(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP) &&
+            Flags_GetEventChkInf(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP) && 
+            !Flags_GetEventChkInf(EVENTCHKINF_BONGO_BONGO_ESCAPED_FROM_WELL)
+        ), NULL)) {
+            Flags_SetEventChkInf(EVENTCHKINF_BONGO_BONGO_ESCAPED_FROM_WELL);
+            gSaveContext.cutsceneIndex = 0xFFF0;
         } else if ((gSaveContext.entranceIndex == ENTR_LOST_WOODS_9) && !Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_SARIA_ON_BRIDGE)) {
-            if (!IS_RANDO) {
-                Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_SARIA_ON_BRIDGE);
+            Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_SARIA_ON_BRIDGE);
+            if (GameInteractor_Should(GI_VB_GIVE_ITEM_FAIRY_OCARINA, true, NULL)) {
                 Item_Give(play, ITEM_OCARINA_FAIRY);
-                gSaveContext.entranceIndex = ENTR_LOST_WOODS_0;
-                gSaveContext.cutsceneIndex = 0xFFF0;
             }
-        } else if (CHECK_QUEST_ITEM(QUEST_MEDALLION_SPIRIT) && CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW) &&
-                   LINK_IS_ADULT && !Flags_GetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS) &&
-                   (gEntranceTable[((void)0, gSaveContext.entranceIndex)].scene == SCENE_TEMPLE_OF_TIME)) {
-            if (!IS_RANDO) {
-                Flags_SetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS);
-                gSaveContext.entranceIndex = ENTR_TEMPLE_OF_TIME_0;
-                gSaveContext.cutsceneIndex = 0xFFF8;
-            }
-        } else if ((!Flags_GetEventChkInf(EVENTCHKINF_WATCHED_GANONS_CASTLE_COLLAPSE_CAUGHT_BY_GERUDO) &&
-                       gEntranceTable[((void)0, gSaveContext.entranceIndex)].scene == SCENE_GANON_BOSS) ||
-                   (bShouldTowerRandoSkip &&
-                    gEntranceTable[((void)0, gSaveContext.entranceIndex)].scene == SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR)) {
+            gSaveContext.entranceIndex = ENTR_LOST_WOODS_0;
+            gSaveContext.cutsceneIndex = 0xFFF0;
+        } else if (GameInteractor_Should(GI_VB_BE_ELIGIBLE_FOR_LIGHT_ARROWS, (
+            CHECK_QUEST_ITEM(QUEST_MEDALLION_SPIRIT) && 
+            CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW) &&
+            LINK_IS_ADULT &&
+            !Flags_GetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS) &&
+            (gEntranceTable[((void)0, gSaveContext.entranceIndex)].scene == SCENE_TEMPLE_OF_TIME)
+        ), NULL)) {
+            Flags_SetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS);
+            gSaveContext.entranceIndex = ENTR_TEMPLE_OF_TIME_0;
+            gSaveContext.cutsceneIndex = 0xFFF8;
+        } else if (!Flags_GetEventChkInf(EVENTCHKINF_WATCHED_GANONS_CASTLE_COLLAPSE_CAUGHT_BY_GERUDO) &&
+                   (gEntranceTable[((void)0, gSaveContext.entranceIndex)].scene == SCENE_GANON_BOSS)) {
             Flags_SetEventChkInf(EVENTCHKINF_WATCHED_GANONS_CASTLE_COLLAPSE_CAUGHT_BY_GERUDO);
             gSaveContext.entranceIndex = ENTR_GANON_BOSS_0;
-            // In rando, skip the cutscene for the tower falling down after the escape.
-            if (IS_RANDO) {
-                return;
-            }
             gSaveContext.cutsceneIndex = 0xFFF0;
         }
     }
diff --git a/soh/src/code/z_en_item00.c b/soh/src/code/z_en_item00.c
index 77f42aebd..da7454961 100644
--- a/soh/src/code/z_en_item00.c
+++ b/soh/src/code/z_en_item00.c
@@ -3,6 +3,7 @@
 #include "objects/gameplay_keep/gameplay_keep.h"
 #include "overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h"
 #include "textures/icon_item_static/icon_item_static.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS 0
 
@@ -349,6 +350,7 @@ void EnItem00_Init(Actor* thisx, PlayState* play) {
     s32 getItemId = GI_NONE;
     this->randoGiEntry = (GetItemEntry)GET_ITEM_NONE;
     this->randoCheck = (RandomizerCheck)RC_UNKNOWN_CHECK;
+    this->itemEntry = (GetItemEntry)GET_ITEM_NONE;
     s16 spawnParam8000 = this->actor.params & 0x8000;
     s32 pad1;
 
@@ -358,7 +360,7 @@ void EnItem00_Init(Actor* thisx, PlayState* play) {
 
     this->actor.params &= 0xFF;
 
-    if (Flags_GetCollectible(play, this->collectibleFlag)) {
+    if (GameInteractor_Should(GI_VB_ITEM00_DESPAWN, Flags_GetCollectible(play, this->collectibleFlag), this)) {
         Actor_Kill(&this->actor);
         return;
     }
@@ -381,12 +383,7 @@ void EnItem00_Init(Actor* thisx, PlayState* play) {
             this->unk_158 = 0;
             Actor_SetScale(&this->actor, 0.03f);
             this->scale = 0.03f;
-            // Offset keys in randomizer slightly higher for their GID replacement
-            if (!IS_RANDO) {
-                yOffset = 350.0f;
-            } else {
-                yOffset = 430.0f;
-            }
+            yOffset = 350.0f;
             break;
         case ITEM00_HEART_PIECE:
             this->unk_158 = 0;
@@ -479,6 +476,14 @@ void EnItem00_Init(Actor* thisx, PlayState* play) {
             Actor_SetScale(&this->actor, 0.03f);
             this->scale = 0.03f;
             break;
+        case ITEM00_SOH_GIVE_ITEM_ENTRY:
+        case ITEM00_SOH_GIVE_ITEM_ENTRY_GI:
+        case ITEM00_SOH_DUMMY:
+            this->unk_158 = 0;
+            Actor_SetScale(&this->actor, 0.03f);
+            this->scale = 0.03f;
+            yOffset = 430.0f;
+            break;
     }
 
     this->unk_156 = 0;
@@ -507,6 +512,10 @@ void EnItem00_Init(Actor* thisx, PlayState* play) {
     this->actor.velocity.y = 0.0f;
     this->actor.gravity = 0.0f;
 
+    if (!GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_ITEM_00, true, this)) {
+        return;
+    }
+
     switch (this->actor.params) {
         case ITEM00_RUPEE_GREEN:
             Item_Give(play, ITEM_RUPEE_GREEN);
@@ -576,16 +585,8 @@ void EnItem00_Init(Actor* thisx, PlayState* play) {
             break;
     }
 
-    if (!Actor_HasParent(&this->actor, play)) {
-        if (getItemId != GI_NONE) {
-            if (!IS_RANDO || this->randoGiEntry.getItemId == GI_NONE) {
-                func_8002F554(&this->actor, play, getItemId);
-            } else {
-                if (GiveItemEntryFromActorWithFixedRange(&this->actor, play, this->randoGiEntry) && this->randoInf != RAND_INF_MAX) {
-                    Flags_SetRandomizerInf(this->randoInf);
-                }
-            }
-        }
+    if ((getItemId != GI_NONE) && !Actor_HasParent(&this->actor, play)) {
+        func_8002F554(&this->actor, play, getItemId);
     }
 
     EnItem00_SetupAction(this, func_8001E5C8);
@@ -603,8 +604,7 @@ void func_8001DFC8(EnItem00* this, PlayState* play) {
         (this->actor.params == ITEM00_HEART_PIECE)) {
         this->actor.shape.rot.y += 960;
     } else {
-        if ((this->actor.params >= ITEM00_SHIELD_DEKU) && (this->actor.params != ITEM00_BOMBS_SPECIAL) &&
-            (this->actor.params != ITEM00_BOMBCHU)) {
+        if ((this->actor.params >= ITEM00_SHIELD_DEKU) && (this->actor.params < ITEM00_BOMBS_SPECIAL)) {
             if (this->unk_15A == -1) {
                 if (Math_SmoothStepToS(&this->actor.shape.rot.x, this->actor.world.rot.x - 0x4000, 2, 3000, 1500) ==
                     0) {
@@ -697,8 +697,7 @@ void func_8001E304(EnItem00* this, PlayState* play) {
 
     if (this->actor.params <= ITEM00_RUPEE_RED) {
         this->actor.shape.rot.y += 960;
-    } else if ((this->actor.params >= ITEM00_SHIELD_DEKU) && (this->actor.params != ITEM00_BOMBS_SPECIAL) &&
-               (this->actor.params != ITEM00_BOMBCHU)) {
+    } else if ((this->actor.params >= ITEM00_SHIELD_DEKU) && (this->actor.params < ITEM00_BOMBS_SPECIAL)) {
         this->actor.world.rot.x -= 700;
         this->actor.shape.rot.y += 400;
         this->actor.shape.rot.x = this->actor.world.rot.x - 0x4000;
@@ -733,13 +732,7 @@ void func_8001E5C8(EnItem00* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
     if (this->getItemId != GI_NONE) {
         if (!Actor_HasParent(&this->actor, play)) {
-            if (!IS_RANDO) {
-                func_8002F434(&this->actor, play, this->getItemId, 50.0f, 80.0f);
-            } else {
-                if (GiveItemEntryFromActor(&this->actor, play, this->randoGiEntry, 50.0f, 80.0f) && this->randoInf != RAND_INF_MAX) {
-                    Flags_SetRandomizerInf(this->randoInf);
-                }
-            }
+            func_8002F434(&this->actor, play, this->getItemId, 50.0f, 80.0f);
             this->unk_15A++;
         } else {
             this->getItemId = GI_NONE;
@@ -781,13 +774,15 @@ void EnItem00_Update(Actor* thisx, PlayState* play) {
     s32 pad;
 
     // Rotate some drops when 3D drops are on, otherwise reset rotation back to 0 for billboard effect
-    if ((this->actor.params == ITEM00_HEART && this->unk_15A >= 0) ||
+    if (
+        (this->actor.params == ITEM00_HEART && this->unk_15A >= 0) ||
         (this->actor.params >= ITEM00_ARROWS_SMALL && this->actor.params <= ITEM00_SMALL_KEY) ||
-        this->actor.params == ITEM00_BOMBS_A || this->actor.params == ITEM00_ARROWS_SINGLE ||
-        this->actor.params == ITEM00_BOMBS_SPECIAL || this->actor.params == ITEM00_BOMBCHU) {
-        if (CVarGetInteger("gNewDrops", 0) ||
-            // Keys in randomizer need to always rotate for their GID replacement
-            (IS_RANDO && this->actor.params == ITEM00_SMALL_KEY)) {
+        this->actor.params == ITEM00_BOMBS_A ||
+        this->actor.params == ITEM00_ARROWS_SINGLE ||
+        this->actor.params == ITEM00_BOMBS_SPECIAL ||
+        (this->actor.params >= ITEM00_BOMBCHU && this->actor.params <= ITEM00_SOH_GIVE_ITEM_ENTRY_GI)
+    ) {
+        if (CVarGetInteger("gNewDrops", 0) || (this->actor.params >= ITEM00_SOH_DUMMY && this->actor.params <= ITEM00_SOH_GIVE_ITEM_ENTRY_GI)) {
             this->actor.shape.rot.y += 960;
         } else {
             this->actor.shape.rot.y = 0;
@@ -871,6 +866,10 @@ void EnItem00_Update(Actor* thisx, PlayState* play) {
         return;
     }
 
+    if (!GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_ITEM_00, true, this)) {
+        return;
+    }
+
     switch (this->actor.params) {
         case ITEM00_RUPEE_GREEN:
             Item_Give(play, ITEM_RUPEE_GREEN);
@@ -955,14 +954,7 @@ void EnItem00_Update(Actor* thisx, PlayState* play) {
     params = &this->actor.params;
 
     if ((getItemId != GI_NONE) && !Actor_HasParent(&this->actor, play)) {
-        if (!IS_RANDO || this->randoGiEntry.getItemId == GI_NONE) {
-            func_8002F554(&this->actor, play, getItemId);
-        } else {
-            getItemId = this->randoGiEntry.getItemId;
-            if (GiveItemEntryFromActorWithFixedRange(&this->actor, play, this->randoGiEntry) && this->randoInf != RAND_INF_MAX) {
-                Flags_SetRandomizerInf(this->randoInf);
-            }
-        }
+        func_8002F554(&this->actor, play, getItemId);
     }
 
     switch (*params) {
@@ -1052,7 +1044,7 @@ void EnItem00_Draw(Actor* thisx, PlayState* play) {
                 }
                 break;
             case ITEM00_HEART_PIECE:
-                if (CVarGetInteger("gNewDrops", 0) && !IS_RANDO) {
+                if (CVarGetInteger("gNewDrops", 0)) {
                     mtxScale = 21.0f;
                     Matrix_Scale(mtxScale, mtxScale, mtxScale, MTXMODE_APPLY);
                     GetItem_Draw(play, GID_HEART_PIECE);
@@ -1162,7 +1154,7 @@ void EnItem00_Draw(Actor* thisx, PlayState* play) {
                     break;
                 }
             case ITEM00_SMALL_KEY:
-                if (CVarGetInteger("gNewDrops", 0) && !IS_RANDO) {
+                if (CVarGetInteger("gNewDrops", 0)) {
                     mtxScale = 8.0f;
                     Matrix_Scale(mtxScale, mtxScale, mtxScale, MTXMODE_APPLY);
                     GetItem_Draw(play, GID_KEY_SMALL);
@@ -1368,17 +1360,7 @@ static const Vtx customDropVtx[] = {
  * Draw Function used for most collectible types of En_Item00 (ammo, bombs, sticks, nuts, magic...).
  */
 void EnItem00_DrawCollectible(EnItem00* this, PlayState* play) {
-    if (IS_RANDO && (this->getItemId != GI_NONE || this->actor.params == ITEM00_SMALL_KEY)) {
-        if (this->randoCheck != RC_UNKNOWN_CHECK) {
-            this->randoGiEntry = Randomizer_GetItemFromKnownCheck(this->randoCheck, GI_NONE);
-            this->randoGiEntry.getItemFrom = ITEM_FROM_FREESTANDING;
-        }
-
-        f32 mtxScale = 10.67f;
-        Matrix_Scale(mtxScale, mtxScale, mtxScale, MTXMODE_APPLY);
-        EnItem00_CustomItemsParticles(&this->actor, play, this->randoGiEntry);
-        GetItemEntry_Draw(play, this->randoGiEntry);
-    } else if (this->actor.params == ITEM00_BOMBCHU) {
+    if (this->actor.params == ITEM00_BOMBCHU) {
         OPEN_DISPS(play->state.gfxCtx);
 
         Matrix_ReplaceRotation(&play->billboardMtxF);
@@ -1458,29 +1440,17 @@ void EnItem00_DrawHeartContainer(EnItem00* this, PlayState* play) {
  * Draw Function used for the Piece of Heart type of En_Item00.
  */
 void EnItem00_DrawHeartPiece(EnItem00* this, PlayState* play) {
-    if (IS_RANDO) {
-        if (this->randoCheck != RC_UNKNOWN_CHECK) {
-            this->randoGiEntry = Randomizer_GetItemFromKnownCheck(this->randoCheck, GI_NONE);
-            this->randoGiEntry.getItemFrom = ITEM_FROM_FREESTANDING;
-        }
+    s32 pad;
 
-        f32 mtxScale = 16.0f;
-        Matrix_Scale(mtxScale, mtxScale, mtxScale, MTXMODE_APPLY);
-        EnItem00_CustomItemsParticles(&this->actor, play, this->randoGiEntry);
-        GetItemEntry_Draw(play, this->randoGiEntry);
-    } else {
-        s32 pad;
+    OPEN_DISPS(play->state.gfxCtx);
 
-        OPEN_DISPS(play->state.gfxCtx);
+    Gfx_SetupDL_25Xlu(play->state.gfxCtx);
+    func_8002ED80(&this->actor, play, 0);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
+            G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPDisplayList(POLY_XLU_DISP++, gHeartPieceInteriorDL);
 
-        Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-        func_8002ED80(&this->actor, play, 0);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                G_MTX_MODELVIEW | G_MTX_LOAD);
-        gSPDisplayList(POLY_XLU_DISP++, gHeartPieceInteriorDL);
-
-        CLOSE_DISPS(play->state.gfxCtx);
-    }
+    CLOSE_DISPS(play->state.gfxCtx);
 }
 
 /**
diff --git a/soh/src/code/z_message_PAL.c b/soh/src/code/z_message_PAL.c
index 4c661aad7..1d00f73bb 100644
--- a/soh/src/code/z_message_PAL.c
+++ b/soh/src/code/z_message_PAL.c
@@ -2603,8 +2603,23 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
                     msgCtx->lastPlayedSong = msgCtx->ocarinaStaff->state;
                     msgCtx->msgMode = MSGMODE_SONG_PLAYBACK_SUCCESS;
 
-                    if (!IS_RANDO) {
-                        Item_Give(play, ITEM_SONG_MINUET + gOcarinaSongItemMap[msgCtx->ocarinaStaff->state]);
+                    u8 songItemId = ITEM_SONG_MINUET + gOcarinaSongItemMap[msgCtx->ocarinaStaff->state];
+
+                    if (
+                        (songItemId == ITEM_SONG_MINUET && GameInteractor_Should(GI_VB_GIVE_ITEM_MINUET_OF_FOREST, true, NULL)) ||
+                        (songItemId == ITEM_SONG_BOLERO && GameInteractor_Should(GI_VB_GIVE_ITEM_BOLERO_OF_FIRE, true, NULL)) ||
+                        (songItemId == ITEM_SONG_SERENADE && GameInteractor_Should(GI_VB_GIVE_ITEM_SERENADE_OF_WATER, true, NULL)) ||
+                        (songItemId == ITEM_SONG_REQUIEM && GameInteractor_Should(GI_VB_GIVE_ITEM_REQUIEM_OF_SPIRIT, true, NULL)) ||
+                        (songItemId == ITEM_SONG_NOCTURNE && GameInteractor_Should(GI_VB_GIVE_ITEM_NOCTURNE_OF_SHADOW, true, NULL)) ||
+                        (songItemId == ITEM_SONG_PRELUDE && GameInteractor_Should(GI_VB_GIVE_ITEM_PRELUDE_OF_LIGHT, true, NULL)) ||
+                        (songItemId == ITEM_SONG_LULLABY && GameInteractor_Should(GI_VB_GIVE_ITEM_ZELDAS_LULLABY, true, NULL)) ||
+                        (songItemId == ITEM_SONG_EPONA && GameInteractor_Should(GI_VB_GIVE_ITEM_EPONAS_SONG, true, NULL)) ||
+                        (songItemId == ITEM_SONG_SARIA && GameInteractor_Should(GI_VB_GIVE_ITEM_SARIAS_SONG, true, NULL)) ||
+                        (songItemId == ITEM_SONG_SUN && GameInteractor_Should(GI_VB_GIVE_ITEM_SUNS_SONG, true, NULL)) ||
+                        (songItemId == ITEM_SONG_TIME && GameInteractor_Should(GI_VB_GIVE_ITEM_SONG_OF_TIME, true, NULL)) ||
+                        (songItemId == ITEM_SONG_STORMS && GameInteractor_Should(GI_VB_GIVE_ITEM_SONG_OF_STORMS, true, NULL))
+                    ) {
+                        Item_Give(play, songItemId);
                     }
 
                     osSyncPrintf(VT_FGCOL(YELLOW));
diff --git a/soh/src/code/z_onepointdemo.c b/soh/src/code/z_onepointdemo.c
index 9489eefcd..ad5df65bd 100644
--- a/soh/src/code/z_onepointdemo.c
+++ b/soh/src/code/z_onepointdemo.c
@@ -1,6 +1,7 @@
 #include "global.h"
 #include "vt.h"
 #include "overlays/actors/ovl_En_Sw/z_en_sw.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 static s16 sDisableAttention = false;
 static s16 sUnused = -1;
@@ -810,12 +811,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
             break;
         case 4100:
             csInfo->keyFrames = D_801225D4;
-            // RANDO: Waterfall opening cutscene skips to the end of the cutscene data earlier by doing this
-            if (!(IS_RANDO)) {
-                csInfo->keyFrameCnt = 5;
-            } else {
-                csInfo->keyFrameCnt = 2;
-            }
+            csInfo->keyFrameCnt = ARRAY_COUNT(D_801225D4);
 
             player->actor.shape.rot.y = player->actor.world.rot.y = player->currentYaw = 0x3FFC;
             func_800C0808(play, camIdx, player, CAM_SET_CS_C);
@@ -1176,6 +1172,16 @@ s16 OnePointCutscene_Init(PlayState* play, s16 csId, s16 timer, Actor* actor, s1
     s16 csCamIdx;
     Camera* csCam;
 
+    if (actor != NULL && actor->id != ACTOR_PLAYER) {
+        if (!GameInteractor_Should(GI_VB_PLAY_ONEPOINT_ACTOR_CS, true, actor)) {
+            return;
+        }
+    } else {
+        if (!GameInteractor_Should(GI_VB_PLAY_ONEPOINT_CS, true, &csId)) {
+            return;
+        }
+    }
+
     if (parentCamIdx == SUBCAM_ACTIVE) {
         parentCamIdx = play->activeCamera;
     }
diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c
index 828e98368..bc253ef3a 100644
--- a/soh/src/code/z_parameter.c
+++ b/soh/src/code/z_parameter.c
@@ -2128,7 +2128,9 @@ u8 Item_Give(PlayState* play, u8 item) {
                 AMMO(ITEM_STICK) = CUR_CAPACITY(UPG_STICKS);
             }
         }
-        item = ITEM_STICK;
+        // [SOH] This results in the same behavior as the original code, but also allows us to get an accurate ReceivedItemEntry hook
+        INV_CONTENT(ITEM_STICK) = ITEM_STICK;
+        return Return_Item(item, MOD_NONE, returnItem);
     } else if (item == ITEM_NUT) {
         if (gSaveContext.inventory.items[slot] == ITEM_NONE) {
             Inventory_ChangeUpgrade(UPG_NUTS, 1);
@@ -2152,7 +2154,9 @@ u8 Item_Give(PlayState* play, u8 item) {
                 AMMO(ITEM_NUT) = CUR_CAPACITY(UPG_NUTS);
             }
         }
-        item = ITEM_NUT;
+        // [SOH] This results in the same behavior as the original code, but also allows us to get an accurate ReceivedItemEntry hook
+        INV_CONTENT(ITEM_NUT) = ITEM_NUT;
+        return Return_Item(item, MOD_NONE, returnItem);
     } else if (item == ITEM_BOMB) {
         // "Bomb  Bomb  Bomb  Bomb Bomb   Bomb Bomb"
         osSyncPrintf(" 爆弾  爆弾  爆弾  爆弾 爆弾   爆弾 爆弾 \n");
diff --git a/soh/src/code/z_play.c b/soh/src/code/z_play.c
index f9b3e7cf4..3ce5eeefc 100644
--- a/soh/src/code/z_play.c
+++ b/soh/src/code/z_play.c
@@ -226,60 +226,6 @@ void Play_Destroy(GameState* thisx) {
     gPlayState = NULL;
 }
 
-void GivePlayerRandoRewardSongOfTime(PlayState* play, RandomizerCheck check) {
-    Player* player = GET_PLAYER(play);
-
-    if (gSaveContext.entranceIndex == ENTR_HYRULE_FIELD_16 && player != NULL && !Player_InBlockingCsMode(play, player) &&
-        !Flags_GetTreasure(play, 0x1F) && gSaveContext.nextTransitionType == TRANS_NEXT_TYPE_DEFAULT && !gSaveContext.pendingIceTrapCount) {
-        GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(check, RG_SONG_OF_TIME);
-        GiveItemEntryWithoutActor(play, getItemEntry);
-        player->pendingFlag.flagID = 0x1F;
-        player->pendingFlag.flagType = FLAG_SCENE_TREASURE;
-    }
-}
-
-void GivePlayerRandoRewardNocturne(PlayState* play, RandomizerCheck check) {
-    Player* player = GET_PLAYER(play);
-
-    if ((gSaveContext.entranceIndex == ENTR_KAKARIKO_VILLAGE_0 ||
-         gSaveContext.entranceIndex == ENTR_KAKARIKO_VILLAGE_1 ||
-         gSaveContext.entranceIndex == ENTR_KAKARIKO_VILLAGE_2) && LINK_IS_ADULT && CHECK_QUEST_ITEM(QUEST_MEDALLION_FOREST) &&
-        CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE) && CHECK_QUEST_ITEM(QUEST_MEDALLION_WATER) && player != NULL &&
-        !Player_InBlockingCsMode(play, player) && !Flags_GetEventChkInf(EVENTCHKINF_BONGO_BONGO_ESCAPED_FROM_WELL)) {
-        GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(check, RG_NOCTURNE_OF_SHADOW);
-        GiveItemEntryWithoutActor(play, getItemEntry);
-        player->pendingFlag.flagID = 0xAA;
-        player->pendingFlag.flagType = FLAG_EVENT_CHECK_INF;
-    }
-}
-
-void GivePlayerRandoRewardRequiem(PlayState* play, RandomizerCheck check) {
-    Player* player = GET_PLAYER(play);
-
-    if ((gSaveContext.gameMode == 0) && (gSaveContext.respawnFlag <= 0) && (gSaveContext.cutsceneIndex < 0xFFF0)) {
-        if ((gSaveContext.entranceIndex == ENTR_DESERT_COLOSSUS_1) && !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_REQUIEM_OF_SPIRIT) && player != NULL &&
-            !Player_InBlockingCsMode(play, player)) {
-            GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(check, RG_SONG_OF_TIME);
-            GiveItemEntryWithoutActor(play, getItemEntry);
-            player->pendingFlag.flagID = 0xAC;
-            player->pendingFlag.flagType = FLAG_EVENT_CHECK_INF;
-        }
-    }
-}
-
-void GivePlayerRandoRewardMasterSword(PlayState* play, RandomizerCheck check) {
-    Player* player = GET_PLAYER(play);
-
-    if (gSaveContext.entranceIndex == ENTR_TEMPLE_OF_TIME_2 && LINK_IS_ADULT && player != NULL &&
-        !Player_InBlockingCsMode(play, player) && Randomizer_GetSettingValue(RSK_SHUFFLE_MASTER_SWORD) &&
-        !Flags_GetRandomizerInf(RAND_INF_TOT_MASTER_SWORD)) {
-        GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(check, RG_MASTER_SWORD);
-        GiveItemEntryWithoutActor(play, getItemEntry);
-        player->pendingFlag.flagID = RAND_INF_TOT_MASTER_SWORD;
-        player->pendingFlag.flagType = FLAG_RANDOMIZER_INF;
-    }
-}
-
 u8 CheckStoneCount() {
     u8 stoneCount = 0;
 
@@ -402,69 +348,6 @@ u8 CheckLACSRewardCount() {
     return lacsRewardCount;
 }
 
-void GivePlayerRandoRewardZeldaLightArrowsGift(PlayState* play, RandomizerCheck check) {
-    Player* player = GET_PLAYER(play);
-
-    u8 meetsRequirements = 0;
-
-    switch (Randomizer_GetSettingValue(RSK_GANONS_BOSS_KEY)) {
-        case RO_GANON_BOSS_KEY_LACS_STONES:
-            if ((CheckStoneCount() + CheckLACSRewardCount()) >= Randomizer_GetSettingValue(RSK_LACS_STONE_COUNT)) {
-                meetsRequirements = true;
-            }
-            break;
-        case RO_GANON_BOSS_KEY_LACS_MEDALLIONS:
-            if ((CheckMedallionCount() + CheckLACSRewardCount()) >= Randomizer_GetSettingValue(RSK_LACS_MEDALLION_COUNT)) {
-                meetsRequirements = true;
-            }
-            break;
-        case RO_GANON_BOSS_KEY_LACS_REWARDS:
-            if ((CheckMedallionCount() + CheckStoneCount() + CheckLACSRewardCount()) >= Randomizer_GetSettingValue(RSK_LACS_REWARD_COUNT)) {
-                meetsRequirements = true;
-            }
-            break;
-        case RO_GANON_BOSS_KEY_LACS_DUNGEONS:
-            if ((CheckDungeonCount() + CheckLACSRewardCount()) >= Randomizer_GetSettingValue(RSK_LACS_DUNGEON_COUNT)) {
-                meetsRequirements = true;
-            }
-            break;
-        case RO_GANON_BOSS_KEY_LACS_TOKENS:
-            if (gSaveContext.inventory.gsTokens >= Randomizer_GetSettingValue(RSK_LACS_TOKEN_COUNT)) {
-                meetsRequirements = true;
-            }
-            break;
-        default:
-            if (CHECK_QUEST_ITEM(QUEST_MEDALLION_SPIRIT) && CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW)) {
-                meetsRequirements = true;
-            }
-            break;
-    }
-
-    if (meetsRequirements && LINK_IS_ADULT &&
-        (gEntranceTable[((void)0, gSaveContext.entranceIndex)].scene == SCENE_TEMPLE_OF_TIME) &&
-        !Flags_GetTreasure(play, 0x1E) && player != NULL && !Player_InBlockingCsMode(play, player) &&
-        play->transitionTrigger == TRANS_TRIGGER_OFF) {
-        GetItemEntry getItem = Randomizer_GetItemFromKnownCheck(check, GI_ARROW_LIGHT);
-        if (GiveItemEntryWithoutActor(play, getItem)) {
-            player->pendingFlag.flagID = 0x1E;
-            player->pendingFlag.flagType = FLAG_SCENE_TREASURE;
-        }
-    }
-}
-
-void GivePlayerRandoRewardSariaGift(PlayState* play, RandomizerCheck check) {
-    Player* player = GET_PLAYER(play);
-    if (gSaveContext.entranceIndex == ENTR_LOST_WOODS_9) {
-        GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(check, RG_ZELDAS_LULLABY);
-
-        if (!Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_SARIA_ON_BRIDGE) && player != NULL && !Player_InBlockingCsMode(play, player)) {
-            GiveItemEntryWithoutActor(play, getItemEntry);
-            player->pendingFlag.flagType = FLAG_EVENT_CHECK_INF;
-            player->pendingFlag.flagID = 0xC1;
-        }
-    }
-}
-
 void Play_Init(GameState* thisx) {
     PlayState* play = (PlayState*)thisx;
     GraphicsContext* gfxCtx = play->state.gfxCtx;
@@ -1448,15 +1331,6 @@ skip:
 
     Environment_Update(play, &play->envCtx, &play->lightCtx, &play->pauseCtx, &play->msgCtx,
                        &play->gameOverCtx, play->state.gfxCtx);
-
-    if (IS_RANDO) {
-        GivePlayerRandoRewardSariaGift(play, RC_LW_GIFT_FROM_SARIA);
-        GivePlayerRandoRewardSongOfTime(play, RC_SONG_FROM_OCARINA_OF_TIME);
-        GivePlayerRandoRewardZeldaLightArrowsGift(play, RC_TOT_LIGHT_ARROWS_CUTSCENE);
-        GivePlayerRandoRewardNocturne(play, RC_SHEIK_IN_KAKARIKO);
-        GivePlayerRandoRewardRequiem(play, RC_SHEIK_AT_COLOSSUS);
-        GivePlayerRandoRewardMasterSword(play, RC_TOT_MASTER_SWORD);
-    }
 }
 
 void Play_DrawOverlayElements(PlayState* play) {
diff --git a/soh/src/code/z_player_lib.c b/soh/src/code/z_player_lib.c
index dfffa7729..1f136674b 100644
--- a/soh/src/code/z_player_lib.c
+++ b/soh/src/code/z_player_lib.c
@@ -564,8 +564,8 @@ uint8_t Player_IsCustomLinkModel() {
 }
 
 s32 Player_InBlockingCsMode(PlayState* play, Player* this) {
-    return (this->stateFlags1 & 0x20000080) || (this->csAction != 0) || (play->transitionTrigger == TRANS_TRIGGER_START) ||
-           (this->stateFlags1 & 1) || (this->stateFlags3 & 0x80) ||
+    return (this->stateFlags1 & (PLAYER_STATE1_DEAD | PLAYER_STATE1_IN_CUTSCENE)) || (this->csAction != 0) || (play->transitionTrigger == TRANS_TRIGGER_START) ||
+            (this->stateFlags1 & PLAYER_STATE1_LOADING) || (this->stateFlags3 & PLAYER_STATE3_HOOKSHOT_TRAVELLING) ||
            ((gSaveContext.magicState != MAGIC_STATE_IDLE) && (Player_ActionToMagicSpell(this, this->itemAction) >= 0));
 }
 
diff --git a/soh/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c b/soh/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c
index 86d23c45b..e05c171f0 100644
--- a/soh/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c
+++ b/soh/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c
@@ -6,6 +6,7 @@
 
 #include "z_bg_bdan_switch.h"
 #include "objects/object_bdan_objects/object_bdan_objects.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_WHILE_CULLED
 
@@ -224,10 +225,12 @@ void func_8086D4B4(BgBdanSwitch* this, PlayState* play) {
     if (!Flags_GetSwitch(play, (this->dyna.actor.params >> 8) & 0x3F)) {
         type = this->dyna.actor.params & 0xFF;
         Flags_SetSwitch(play, (this->dyna.actor.params >> 8) & 0x3F);
-        if (type == BLUE || type == YELLOW_TALL_2) {
-            OnePointCutscene_AttentionSetSfx(play, &this->dyna.actor, NA_SE_SY_TRE_BOX_APPEAR);
-        } else {
-            OnePointCutscene_AttentionSetSfx(play, &this->dyna.actor, NA_SE_SY_CORRECT_CHIME);
+        if (GameInteractor_Should(GI_VB_PLAY_ONEPOINT_ACTOR_CS, true, this)) {
+            if (type == BLUE || type == YELLOW_TALL_2) {
+                OnePointCutscene_AttentionSetSfx(play, &this->dyna.actor, NA_SE_SY_TRE_BOX_APPEAR);
+            } else {
+                OnePointCutscene_AttentionSetSfx(play, &this->dyna.actor, NA_SE_SY_CORRECT_CHIME);
+            }
         }
     }
 }
@@ -236,7 +239,9 @@ void func_8086D548(BgBdanSwitch* this, PlayState* play) {
     if (Flags_GetSwitch(play, (this->dyna.actor.params >> 8) & 0x3F)) {
         Flags_UnsetSwitch(play, (this->dyna.actor.params >> 8) & 0x3F);
         if ((this->dyna.actor.params & 0xFF) == YELLOW_TALL_2) {
-            OnePointCutscene_AttentionSetSfx(play, &this->dyna.actor, NA_SE_SY_TRE_BOX_APPEAR);
+            if (GameInteractor_Should(GI_VB_PLAY_ONEPOINT_ACTOR_CS, true, this)) {
+                OnePointCutscene_AttentionSetSfx(play, &this->dyna.actor, NA_SE_SY_TRE_BOX_APPEAR);
+            }
         }
     }
 }
diff --git a/soh/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c b/soh/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c
index 58f11a7f3..d0fc8864f 100644
--- a/soh/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c
+++ b/soh/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c
@@ -8,6 +8,7 @@
 #include "scenes/dungeons/ddan/ddan_scene.h"
 #include "objects/object_bwall/object_bwall.h"
 #include "objects/object_kingdodongo/object_kingdodongo.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_WHILE_CULLED
 
@@ -300,10 +301,13 @@ void BgBreakwall_Wait(BgBreakwall* this, PlayState* play) {
 
         if ((wallType == BWALL_DC_ENTRANCE) && (!Flags_GetEventChkInf(EVENTCHKINF_ENTERED_DODONGOS_CAVERN))) {
             Flags_SetEventChkInf(EVENTCHKINF_ENTERED_DODONGOS_CAVERN);
-            Cutscene_SetSegment(play, gDcOpeningCs);
-            gSaveContext.cutsceneTrigger = 1;
+            s32 flag = EVENTCHKINF_ENTERED_DODONGOS_CAVERN;
+            if (GameInteractor_Should(GI_VB_PLAY_ENTRANCE_CS, true, &flag)) {
+                Cutscene_SetSegment(play, gDcOpeningCs);
+                gSaveContext.cutsceneTrigger = 1;
+                func_8002DF54(play, NULL, 0x31);
+            }
             Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
-            func_8002DF54(play, NULL, 0x31);
         }
 
         if (this->dyna.actor.params < 0) {
diff --git a/soh/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c b/soh/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c
index eeecfabcb..51b7dc622 100644
--- a/soh/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c
+++ b/soh/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c
@@ -6,6 +6,7 @@
 
 #include "z_bg_mori_bigst.h"
 #include "objects/object_mori_objects/object_mori_objects.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_WHILE_CULLED
 
@@ -149,7 +150,9 @@ void BgMoriBigst_StalfosFight(BgMoriBigst* this, PlayState* play) {
     if ((this->dyna.actor.home.rot.z == 0) &&
         ((this->dyna.actor.home.pos.y - 5.0f) <= GET_PLAYER(play)->actor.world.pos.y)) {
         BgMoriBigst_SetupFall(this, play);
-        OnePointCutscene_Init(play, 3220, 72, &this->dyna.actor, MAIN_CAM);
+        if (GameInteractor_Should(GI_VB_PLAY_ONEPOINT_ACTOR_CS, true, this)) {
+            OnePointCutscene_Init(play, 3220, 72, &this->dyna.actor, MAIN_CAM);
+        }
     }
 }
 
@@ -163,8 +166,10 @@ void BgMoriBigst_Fall(BgMoriBigst* this, PlayState* play) {
         this->dyna.actor.world.pos.y = this->dyna.actor.home.pos.y;
         BgMoriBigst_SetupLanding(this, play);
         Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_STONE_BOUND);
-        OnePointCutscene_Init(play, 1020, 8, &this->dyna.actor, MAIN_CAM);
-        func_8002DF38(play, NULL, 0x3C);
+        if (GameInteractor_Should(GI_VB_PLAY_ONEPOINT_ACTOR_CS, true, this)) {
+            OnePointCutscene_Init(play, 1020, 8, &this->dyna.actor, MAIN_CAM);
+            func_8002DF38(play, NULL, 0x3C);
+        }
     }
 }
 
diff --git a/soh/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c b/soh/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c
index 26a02aa96..b6d5ed15a 100644
--- a/soh/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c
+++ b/soh/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c
@@ -6,6 +6,7 @@
 
 #include "z_bg_toki_swd.h"
 #include "objects/object_toki_objects/object_toki_objects.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_WHILE_CULLED
 
@@ -115,14 +116,17 @@ void func_808BAF40(BgTokiSwd* this, PlayState* play) {
     if (((Flags_GetEventChkInf(EVENTCHKINF_ENTERED_MASTER_SWORD_CHAMBER)) == 0) && (gSaveContext.sceneSetupIndex < 4) &&
         Actor_IsFacingAndNearPlayer(&this->actor, 800.0f, 0x7530) && !Play_InCsMode(play)) {
         Flags_SetEventChkInf(EVENTCHKINF_ENTERED_MASTER_SWORD_CHAMBER);
-        play->csCtx.segment = D_808BBD90;
-        gSaveContext.cutsceneTrigger = 1;
+        s32 flag = EVENTCHKINF_ENTERED_MASTER_SWORD_CHAMBER;
+        if (GameInteractor_Should(GI_VB_PLAY_ENTRANCE_CS, true, &flag)) {
+            play->csCtx.segment = D_808BBD90;
+            gSaveContext.cutsceneTrigger = 1;
+        }
     }
 
     if (!LINK_IS_ADULT || (Flags_GetEventChkInf(EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT) && !IS_RANDO) || IS_RANDO) {
         if (Actor_HasParent(&this->actor, play)) {
             if (!LINK_IS_ADULT) {
-                 if (!IS_RANDO || !Randomizer_GetSettingValue(RSK_SHUFFLE_MASTER_SWORD)) {
+                 if (GameInteractor_Should(GI_VB_GIVE_ITEM_MASTER_SWORD, true, NULL)) {
                     Item_Give(play, ITEM_SWORD_MASTER);
                  }
                 play->csCtx.segment = D_808BB2F0;
diff --git a/soh/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c b/soh/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c
index 75e920b29..04d1d6c72 100644
--- a/soh/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c
+++ b/soh/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c
@@ -7,6 +7,7 @@
 #include "z_bg_treemouth.h"
 #include "objects/object_spot04_objects/object_spot04_objects.h"
 #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_WHILE_CULLED | ACTOR_FLAG_DRAW_WHILE_CULLED)
 
@@ -73,11 +74,7 @@ void BgTreemouth_Init(Actor* thisx, PlayState* play) {
 
     if ((gSaveContext.sceneSetupIndex < 4) && !LINK_IS_ADULT) {
         BgTreemouth_SetupAction(this, func_808BC8B8);
-    // If dungeon entrance randomizer is on, keep the tree mouth open
-    // when Link is adult and sword & shield have been shown to Mido
-    } else if ((LINK_IS_ADULT && (!IS_RANDO ||
-        Randomizer_GetSettingValue(RSK_SHUFFLE_DUNGEON_ENTRANCES) == RO_DUNGEON_ENTRANCE_SHUFFLE_OFF) ||
-        !Flags_GetEventChkInf(EVENTCHKINF_SHOWED_MIDO_SWORD_SHIELD)) || (gSaveContext.sceneSetupIndex == 7)) {
+    } else if (LINK_IS_ADULT || (gSaveContext.sceneSetupIndex == 7)) {
         this->unk_168 = 0.0f;
         BgTreemouth_SetupAction(this, BgTreemouth_DoNothing);
     } else {
@@ -157,9 +154,11 @@ void func_808BC8B8(BgTreemouth* this, PlayState* play) {
                 }
             } else if (Actor_IsFacingAndNearPlayer(&this->dyna.actor, 1658.0f, 0x4E20)) {
                 Flags_SetEventChkInf(EVENTCHKINF_MET_DEKU_TREE);
-                play->csCtx.segment = D_808BCE20;
-                gSaveContext.cutsceneTrigger = 1;
-                BgTreemouth_SetupAction(this, func_808BC9EC);
+                if (GameInteractor_Should(GI_VB_PLAY_DEKU_TREE_INTRO_CS, true, this)) {
+                    play->csCtx.segment = D_808BCE20;
+                    gSaveContext.cutsceneTrigger = 1;
+                    BgTreemouth_SetupAction(this, func_808BC9EC);
+                }
             }
         }
     } else {
diff --git a/soh/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.h b/soh/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.h
index 7fe96cfa1..daa33bfee 100644
--- a/soh/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.h
+++ b/soh/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.h
@@ -15,4 +15,7 @@ typedef struct BgTreemouth {
     /* 0x016C */ BgTreemouthActionFunc actionFunc;
 } BgTreemouth; // size = 0x0170
 
+void BgTreemouth_SetupAction(BgTreemouth* actor, BgTreemouthActionFunc actionFunc);
+void func_808BC6F8(BgTreemouth* actor, PlayState* play);
+
 #endif
diff --git a/soh/src/overlays/actors/ovl_Demo_Du/z_demo_du.c b/soh/src/overlays/actors/ovl_Demo_Du/z_demo_du.c
index 1c2f4c16b..cffdbea38 100644
--- a/soh/src/overlays/actors/ovl_Demo_Du/z_demo_du.c
+++ b/soh/src/overlays/actors/ovl_Demo_Du/z_demo_du.c
@@ -3,6 +3,7 @@
 #include "overlays/actors/ovl_Demo_Effect/z_demo_effect.h"
 #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h"
 #include "vt.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_WHILE_CULLED
 
@@ -184,7 +185,9 @@ void func_80969F38(DemoDu* this, PlayState* play) {
 
     Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DEMO_EFFECT, posX, posY, posZ, 0, 0, 0,
                        DEMO_EFFECT_MEDAL_FIRE);
-    Item_Give(play, ITEM_MEDALLION_FIRE);
+    if (GameInteractor_Should(GI_VB_GIVE_ITEM_FIRE_MEDALLION, true, NULL)) {
+        Item_Give(play, ITEM_MEDALLION_FIRE);
+    }
 }
 
 void func_80969FB4(DemoDu* this, PlayState* play) {
@@ -201,7 +204,9 @@ void DemoDu_CsFireMedallion_AdvanceTo01(DemoDu* this, PlayState* play) {
         this->updateIndex = CS_FIREMEDALLION_SUBSCENE(1);
         play->csCtx.segment = D_8096C1A4;
         gSaveContext.cutsceneTrigger = 2;
-        Item_Give(play, ITEM_MEDALLION_FIRE);
+        if (GameInteractor_Should(GI_VB_GIVE_ITEM_FIRE_MEDALLION, true, NULL)) {
+            Item_Give(play, ITEM_MEDALLION_FIRE);
+        }
 
         player->actor.world.rot.y = player->actor.shape.rot.y = this->actor.world.rot.y + 0x8000;
     }
diff --git a/soh/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c b/soh/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
index 9e4dd6119..4af2e9f87 100644
--- a/soh/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
+++ b/soh/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
@@ -142,7 +142,7 @@ f32 DemoEffect_InterpolateCsFrames(PlayState* play, s32 csActionId) {
  */
 void DemoEffect_InitJewel(PlayState* play, DemoEffect* this) {
     this->initDrawFunc = DemoEffect_DrawJewel;
-    if (IS_RANDO && play->sceneNum == SCENE_JABU_JABU) {
+    if (IS_RANDO && (play->sceneNum != SCENE_TEMPLE_OF_TIME || this->actor.params == DEMO_EFFECT_LIGHTARROW)) {
         this->initDrawFunc = DemoEffect_DrawGetItem;
     }
     if (!LINK_IS_ADULT) {
@@ -156,7 +156,7 @@ void DemoEffect_InitJewel(PlayState* play, DemoEffect* this) {
         Actor_SetScale(&this->actor, 0.10f);
     }
     this->csActionId = 1;
-    this->actor.shape.rot.x = (IS_RANDO && play->sceneNum == SCENE_JABU_JABU) ? 0 : 16384;
+    this->actor.shape.rot.x = (IS_RANDO && (play->sceneNum != SCENE_TEMPLE_OF_TIME || this->actor.params == DEMO_EFFECT_LIGHTARROW)) ? 0 : 16384;
     DemoEffect_InitJewelColor(this);
     this->jewel.alpha = 0;
     this->jewelCsRotation.x = this->jewelCsRotation.y = this->jewelCsRotation.z = 0;
@@ -2087,13 +2087,48 @@ void DemoEffect_DrawGetItem(Actor* thisx, PlayState* play) {
             this->getItem.isLoaded = 1;
             return;
         }
-        if (IS_RANDO && play->sceneNum == SCENE_JABU_JABU) {
-            GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_BARINADE, RG_ZORA_SAPPHIRE);
-            this->getItem.drawId = getItemEntry.gid;
-            func_8002EBCC(thisx, play, 0);
-            func_8002ED80(thisx, play, 0);
-            GetItemEntry_Draw(play, getItemEntry);
-            return;
+        if (IS_RANDO && (play->sceneNum != SCENE_TEMPLE_OF_TIME || this->actor.params == DEMO_EFFECT_LIGHTARROW)) {
+            GetItemEntry getItemEntry = GET_ITEM_NONE;
+
+            switch (this->actor.params) {
+                case DEMO_EFFECT_JEWEL_KOKIRI:
+                    getItemEntry = Randomizer_GetItemFromKnownCheck(RC_QUEEN_GOHMA, RG_KOKIRI_EMERALD);
+                    break;
+                case DEMO_EFFECT_JEWEL_GORON:
+                    getItemEntry = Randomizer_GetItemFromKnownCheck(RC_KING_DODONGO, RG_GORON_RUBY);
+                    break;
+                case DEMO_EFFECT_JEWEL_ZORA:
+                    getItemEntry = Randomizer_GetItemFromKnownCheck(RC_BARINADE, RG_ZORA_SAPPHIRE);
+                    break;
+                case DEMO_EFFECT_MEDAL_FOREST:
+                    getItemEntry = Randomizer_GetItemFromKnownCheck(RC_PHANTOM_GANON, RG_FOREST_MEDALLION);
+                    break;
+                case DEMO_EFFECT_MEDAL_FIRE:
+                    getItemEntry = Randomizer_GetItemFromKnownCheck(RC_VOLVAGIA, RG_FIRE_MEDALLION);
+                    break;
+                case DEMO_EFFECT_MEDAL_WATER:
+                    getItemEntry = Randomizer_GetItemFromKnownCheck(RC_MORPHA, RG_WATER_MEDALLION);
+                    break;
+                case DEMO_EFFECT_MEDAL_SPIRIT:
+                    getItemEntry = Randomizer_GetItemFromKnownCheck(RC_TWINROVA, RG_SPIRIT_MEDALLION);
+                    break;
+                case DEMO_EFFECT_MEDAL_SHADOW:
+                    getItemEntry = Randomizer_GetItemFromKnownCheck(RC_BONGO_BONGO, RG_SHADOW_MEDALLION);
+                    break;
+                case DEMO_EFFECT_MEDAL_LIGHT:
+                    getItemEntry = Randomizer_GetItemFromKnownCheck(RC_GIFT_FROM_SAGES, RG_LIGHT_MEDALLION);
+                    break;
+                case DEMO_EFFECT_LIGHTARROW:
+                    getItemEntry = Randomizer_GetItemFromKnownCheck(RC_TOT_LIGHT_ARROWS_CUTSCENE, RG_LIGHT_ARROWS);
+                    break;
+            }
+            if (getItemEntry.getItemId != GI_NONE) {
+                this->getItem.drawId = getItemEntry.gid;
+                func_8002EBCC(thisx, play, 0);
+                func_8002ED80(thisx, play, 0);
+                GetItemEntry_Draw(play, getItemEntry);
+                return;
+            }
         }
         func_8002EBCC(thisx, play, 0);
         func_8002ED80(thisx, play, 0);
diff --git a/soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.c b/soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.c
index 4ddeec155..a06786b2d 100644
--- a/soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.c
+++ b/soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.c
@@ -10,6 +10,7 @@
 #include "scenes/indoors/nakaniwa/nakaniwa_scene.h"
 #include "objects/object_im/object_im.h"
 #include "vt.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UPDATE_WHILE_CULLED)
 
@@ -318,7 +319,9 @@ void func_809853B4(DemoIm* this, PlayState* play) {
 
     Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DEMO_EFFECT, playerX, playerY, playerZ, 0,
                        0, 0, 0xD);
-    Item_Give(play, ITEM_MEDALLION_SHADOW);
+    if (GameInteractor_Should(GI_VB_GIVE_ITEM_SHADOW_MEDALLION, true, NULL)) {
+        Item_Give(play, ITEM_MEDALLION_SHADOW);
+    }
 }
 
 void func_80985430(DemoIm* this, PlayState* play) {
@@ -334,7 +337,9 @@ void func_8098544C(DemoIm* this, PlayState* play) {
         this->action = 1;
         play->csCtx.segment = D_8098786C;
         gSaveContext.cutsceneTrigger = 2;
-        Item_Give(play, ITEM_MEDALLION_SHADOW);
+        if (GameInteractor_Should(GI_VB_GIVE_ITEM_SHADOW_MEDALLION, true, NULL)) {
+            Item_Give(play, ITEM_MEDALLION_SHADOW);
+        }
         player->actor.world.rot.y = player->actor.shape.rot.y = this->actor.world.rot.y + 0x8000;
     }
 }
@@ -903,40 +908,17 @@ void func_80986BF8(DemoIm* this, PlayState* play) {
     }
 }
 
-void GivePlayerRandoRewardImpa(Actor* impa, PlayState* play, RandomizerCheck check) {
-    GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(check, RG_ZELDAS_LULLABY);
-
-    if (impa->parent != NULL && impa->parent->id == GET_PLAYER(play)->actor.id &&
-        !Flags_GetTreasure(play, 0x1F)) {
-        Flags_SetTreasure(play, 0x1F);
-    } else if (!Flags_GetTreasure(play, 0x1F) && !Randomizer_GetSettingValue(RSK_SKIP_CHILD_ZELDA)) {
-        GiveItemEntryFromActor(impa, play, getItemEntry, 75.0f, 50.0f);
-    } else if (!Player_InBlockingCsMode(play, GET_PLAYER(play))) {
-        Flags_SetEventChkInf(EVENTCHKINF_LEARNED_ZELDAS_LULLABY);
-        play->transitionTrigger = TRANS_TRIGGER_START;
-        play->transitionType = TRANS_TYPE_FADE_WHITE;
-        gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE;
-        // In entrance rando have impa bring link back to the front of castle grounds
-        if (Randomizer_GetSettingValue(RSK_SHUFFLE_OVERWORLD_ENTRANCES)) {
-            play->nextEntranceIndex = ENTR_HYRULE_CASTLE_0;
-        } else {
-            play->nextEntranceIndex = ENTR_HYRULE_FIELD_17;
-        }
-        gSaveContext.nextCutsceneIndex = 0;
-    }
-}
-
 void func_80986C30(DemoIm* this, PlayState* play) {
     if (func_80986A5C(this, play)) {
-        if (IS_RANDO) {
-            GivePlayerRandoRewardImpa(this, play, RC_SONG_FROM_IMPA);
-        } else {
+        if (GameInteractor_Should(GI_VB_PLAY_ZELDAS_LULLABY_CS, true, this)) {
             play->csCtx.segment = SEGMENTED_TO_VIRTUAL(gZeldasCourtyardLullabyCs);
             gSaveContext.cutsceneTrigger = 1;
-            Flags_SetEventChkInf(EVENTCHKINF_LEARNED_ZELDAS_LULLABY);
-            Item_Give(play, ITEM_SONG_LULLABY);
             func_80985F54(this);
         }
+        Flags_SetEventChkInf(EVENTCHKINF_LEARNED_ZELDAS_LULLABY);
+        if (GameInteractor_Should(GI_VB_GIVE_ITEM_ZELDAS_LULLABY, true, NULL)) {
+            Item_Give(play, ITEM_SONG_LULLABY);
+        }
     }
 }
 
@@ -960,7 +942,7 @@ void func_80986D40(DemoIm* this, PlayState* play) {
     if (gSaveContext.sceneSetupIndex == 6) {
         this->action = 19;
         this->drawConfig = 1;
-    } else if ((Flags_GetEventChkInf(EVENTCHKINF_ZELDA_FLED_HYRULE_CASTLE)) && !IS_RANDO) {
+    } else if ((Flags_GetEventChkInf(EVENTCHKINF_ZELDA_FLED_HYRULE_CASTLE)) && !IS_RANDO) { // SoH [Randomizer] Not sure why we're not killing impa here.
         Actor_Kill(&this->actor);
     } else if (!Flags_GetEventChkInf(EVENTCHKINF_LEARNED_ZELDAS_LULLABY)) {
         this->action = 23;
diff --git a/soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.h b/soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.h
index 3697733e1..06d6e5d7e 100644
--- a/soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.h
+++ b/soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.h
@@ -51,4 +51,6 @@ typedef struct DemoIm {
     /* 0x02D4 */ NpcInteractInfo interactInfo;
 } DemoIm; // size = 0x02FC
 
+void func_80986794(DemoIm* demoIm);
+
 #endif
diff --git a/soh/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c b/soh/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c
index 6da87ab3c..85dcb4ebe 100644
--- a/soh/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c
+++ b/soh/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c
@@ -9,6 +9,7 @@
 #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h"
 #include "objects/object_sa/object_sa.h"
 #include "soh/Enhancements/boss-rush/BossRush.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #include "vt.h"
 
@@ -241,7 +242,9 @@ void func_8098E8C8(DemoSa* this, PlayState* play) {
 
     Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DEMO_EFFECT, posX, posY, posZ, 0, 0, 0,
                        0xB);
-    Item_Give(play, ITEM_MEDALLION_FOREST);
+    if (GameInteractor_Should(GI_VB_GIVE_ITEM_FOREST_MEDALLION, true, NULL)) {
+        Item_Give(play, ITEM_MEDALLION_FOREST);
+    }
 }
 
 void func_8098E944(DemoSa* this, PlayState* play) {
@@ -258,7 +261,9 @@ void func_8098E960(DemoSa* this, PlayState* play) {
             this->action = 1;
             play->csCtx.segment = D_8099010C;
             gSaveContext.cutsceneTrigger = 2;
-            Item_Give(play, ITEM_MEDALLION_FOREST);
+            if (GameInteractor_Should(GI_VB_GIVE_ITEM_FOREST_MEDALLION, true, NULL)) {
+                Item_Give(play, ITEM_MEDALLION_FOREST);
+            }
             player->actor.world.rot.y = player->actor.shape.rot.y = this->actor.world.rot.y + 0x8000;
         } else {
             this->action = 1;
diff --git a/soh/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c b/soh/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
index 290e809f6..eeb0df2d2 100644
--- a/soh/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
+++ b/soh/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
@@ -23,6 +23,7 @@
 #include "objects/object_menkuri_objects/object_menkuri_objects.h"
 #include "objects/object_demo_kekkai/object_demo_kekkai.h"
 #include "objects/object_ouke_haka/object_ouke_haka.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_WHILE_CULLED
 
@@ -354,9 +355,11 @@ void func_80996A54(DoorShutter* this, PlayState* play) {
     if (Flags_GetClear(play, this->dyna.actor.room) || Flags_GetTempClear(play, this->dyna.actor.room)) {
         Flags_SetClear(play, this->dyna.actor.room);
         DoorShutter_SetupAction(this, func_80997150);
-        OnePointCutscene_Attention(play, &this->dyna.actor);
-        OnePointCutscene_Attention(play, &GET_PLAYER(play)->actor);
-        this->unk_16F = -100;
+        if (GameInteractor_Should(GI_VB_PLAY_ONEPOINT_ACTOR_CS, true, this)) {
+            OnePointCutscene_Attention(play, &this->dyna.actor);
+            OnePointCutscene_Attention(play, &GET_PLAYER(play)->actor);
+            this->unk_16F = -100;
+        }
     } else if (func_809968D4(this, play) != 0) {
         Player* player = GET_PLAYER(play);
 
@@ -470,8 +473,10 @@ void func_80996EE8(DoorShutter* this, PlayState* play) {
     if (func_80996E08(this, play, 1.0f)) {
         if (Flags_GetSwitch(play, this->dyna.actor.params & 0x3F)) {
             DoorShutter_SetupAction(this, func_80997150);
-            OnePointCutscene_Attention(play, &this->dyna.actor);
-            this->unk_16F = -100;
+            if (GameInteractor_Should(GI_VB_PLAY_ONEPOINT_ACTOR_CS, true, this)) {
+                OnePointCutscene_Attention(play, &this->dyna.actor);
+                this->unk_16F = -100;
+            }
         } else if (func_809968D4(this, play)) {
             Player* player = GET_PLAYER(play);
             // Jabu navi text for switch doors is different
diff --git a/soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c b/soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
index 5ea64e232..bdb154a92 100644
--- a/soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
+++ b/soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
@@ -2,6 +2,7 @@
 #include "objects/object_warp1/object_warp1.h"
 #include "soh/Enhancements/randomizer/randomizer_entrance.h"
 #include "soh/Enhancements/boss-rush/BossRush.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS 0
 
@@ -487,44 +488,6 @@ s32 DoorWarp1_PlayerInRange(DoorWarp1* this, PlayState* play) {
     return ret;
 }
 
-void GivePlayerRandoReward(DoorWarp1* this, Player* player, PlayState* play, u8 ruto, u8 adult) {
-    GetItemEntry getItemEntry = Randomizer_GetItemFromActor(this->actor.id, play->sceneNum, 0x00, GI_NONE);
-
-    if (this->actor.parent != NULL && this->actor.parent->id == GET_PLAYER(play)->actor.id &&
-        !Flags_GetTreasure(play, 0x1F)) {
-        Flags_SetTreasure(play, 0x1F);
-    } else if (!Flags_GetTreasure(play, 0x1F)) {
-        GiveItemEntryFromActor(&this->actor, play, getItemEntry, 10000.0f, 100.0f);
-    } else if (!Player_InBlockingCsMode(play, GET_PLAYER(play))) {
-        if (adult) {
-            OnePointCutscene_Init(play, 0x25E8, 999, &this->actor, MAIN_CAM);
-            func_8002DF54(play, &this->actor, 10);
-            player->unk_450.x = this->actor.world.pos.x;
-            player->unk_450.z = this->actor.world.pos.z;
-            this->unk_1B2 = 20;
-            DoorWarp1_SetupAction(this, func_8099A508);
-        } else {
-            if (ruto) {
-                this->rutoWarpState = WARP_BLUE_RUTO_STATE_ENTERED;
-                func_8002DF54(play, &this->actor, 10);
-                this->unk_1B2 = 1;
-                DoorWarp1_SetupAction(this, func_80999EE0);
-            } else {
-                Audio_PlaySoundGeneral(NA_SE_EV_LINK_WARP, &player->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
-                                       &D_801333E8);
-                OnePointCutscene_Init(play, 0x25E7, 999, &this->actor, MAIN_CAM);
-                func_8002DF54(play, &this->actor, 10);
-
-                player->unk_450.x = this->actor.world.pos.x;
-                player->unk_450.z = this->actor.world.pos.z;
-                this->unk_1B2 = 1;
-
-                DoorWarp1_SetupAction(this, DoorWarp1_ChildWarpOut);
-            }
-        }
-    }
-}
-
 void DoorWarp1_ChildWarpIdle(DoorWarp1* this, PlayState* play) {
     Player* player;
 
@@ -532,11 +495,6 @@ void DoorWarp1_ChildWarpIdle(DoorWarp1* this, PlayState* play) {
 
     if (DoorWarp1_PlayerInRange(this, play)) {
         player = GET_PLAYER(play);
-        
-        if (IS_RANDO) {
-            GivePlayerRandoReward(this, player, play, 0, 0);
-            return;
-        }
 
         Audio_PlaySoundGeneral(NA_SE_EV_LINK_WARP, &player->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
                                &D_801333E8);
@@ -570,36 +528,26 @@ void DoorWarp1_ChildWarpOut(DoorWarp1* this, PlayState* play) {
         osSyncPrintf("\n\n\nじかんがきたからおーしまい fade_direction=[%d]", play->transitionTrigger, TRANS_TRIGGER_START);
 
         if (play->sceneNum == SCENE_DODONGOS_CAVERN_BOSS) {
-            if (!Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP)) {
+            if (GameInteractor_Should(GI_VB_PLAY_BLUE_WARP_CS, !Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP), EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP)) {
                 Flags_SetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP);
-                Flags_SetRandomizerInf(RAND_INF_DUNGEONS_DONE_DODONGOS_CAVERN);
-                if (IS_RANDO) {
-                    play->nextEntranceIndex = ENTR_DEATH_MOUNTAIN_TRAIL_5;
-                    gSaveContext.nextCutsceneIndex = 0;
-                } else {
+                if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_BLUE_WARP, true, ITEM_GORON_RUBY)) {
                     Item_Give(play, ITEM_GORON_RUBY);
-                    play->nextEntranceIndex = ENTR_DEATH_MOUNTAIN_TRAIL_0;
-                    gSaveContext.nextCutsceneIndex = 0xFFF1;
                 }
+                play->nextEntranceIndex = ENTR_DEATH_MOUNTAIN_TRAIL_0;
+                gSaveContext.nextCutsceneIndex = 0xFFF1;
             } else {
                 play->nextEntranceIndex = ENTR_DEATH_MOUNTAIN_TRAIL_5;
                 gSaveContext.nextCutsceneIndex = 0;
             }
         } else if (play->sceneNum == SCENE_DEKU_TREE_BOSS) {
-            if (!Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_KOKIRI_EMERALD_DEKU_TREE_DEAD) || IS_RANDO) {
+            if (GameInteractor_Should(GI_VB_PLAY_BLUE_WARP_CS, !Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_KOKIRI_EMERALD_DEKU_TREE_DEAD), EVENTCHKINF_OBTAINED_KOKIRI_EMERALD_DEKU_TREE_DEAD)) {
                 Flags_SetEventChkInf(EVENTCHKINF_OBTAINED_KOKIRI_EMERALD_DEKU_TREE_DEAD);
                 Flags_SetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP);
-                Flags_SetRandomizerInf(RAND_INF_DUNGEONS_DONE_DEKU_TREE);
-                if (IS_RANDO) {
-                    play->nextEntranceIndex = ENTR_KOKIRI_FOREST_11;
-                    gSaveContext.nextCutsceneIndex = 0;
-                    // Skip Mido complaining about dead Deku tree
-                    Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_MIDO_AFTER_DEKU_TREES_DEATH);
-                } else {
+                if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_BLUE_WARP, true, ITEM_KOKIRI_EMERALD)) {
                     Item_Give(play, ITEM_KOKIRI_EMERALD);
-                    play->nextEntranceIndex = ENTR_KOKIRI_FOREST_0;
-                    gSaveContext.nextCutsceneIndex = 0xFFF1;
                 }
+                play->nextEntranceIndex = ENTR_KOKIRI_FOREST_0;
+                gSaveContext.nextCutsceneIndex = 0xFFF1;
             } else {
                 play->nextEntranceIndex = ENTR_KOKIRI_FOREST_11;
                 gSaveContext.nextCutsceneIndex = 0;
@@ -635,12 +583,6 @@ void DoorWarp1_RutoWarpIdle(DoorWarp1* this, PlayState* play) {
     Audio_PlayActorSound2(&this->actor, NA_SE_EV_WARP_HOLE - SFX_FLAG);
 
     if (this->rutoWarpState != WARP_BLUE_RUTO_STATE_INITIAL && DoorWarp1_PlayerInRange(this, play)) {
-
-        if (IS_RANDO) {
-            GivePlayerRandoReward(this, GET_PLAYER(play), play, 1, 0);
-            return;
-        }
-
         this->rutoWarpState = WARP_BLUE_RUTO_STATE_ENTERED;
         func_8002DF54(play, &this->actor, 10);
         this->unk_1B2 = 1;
@@ -670,9 +612,8 @@ void func_80999EE0(DoorWarp1* this, PlayState* play) {
         Play_CameraSetAtEye(play, sRutoWarpSubCamId, &at, &eye);
         Play_CameraSetFov(play, sRutoWarpSubCamId, 90.0f);
         this->rutoWarpState = WARP_BLUE_RUTO_STATE_TALKING;
-        if (!IS_RANDO) {
-            Message_StartTextbox(play, 0x4022, NULL);
-        }
+        // TODO: Why was this disabled in rando?
+        Message_StartTextbox(play, 0x4022, NULL);
         DoorWarp1_SetupAction(this, func_80999FE4);
     }
 }
@@ -704,17 +645,14 @@ void DoorWarp1_RutoWarpOut(DoorWarp1* this, PlayState* play) {
     this->warpTimer++;
 
     if (this->warpTimer > sWarpTimerTarget && gSaveContext.nextCutsceneIndex == 0xFFEF) {
-        Flags_SetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP);
-        Flags_SetRandomizerInf(RAND_INF_DUNGEONS_DONE_JABU_JABUS_BELLY);
-
-        if (IS_RANDO) {
-            play->nextEntranceIndex = ENTR_ZORAS_FOUNTAIN_0;
-            gSaveContext.nextCutsceneIndex = 0;
-        } else {
-            Item_Give(play, ITEM_ZORA_SAPPHIRE);
-            play->nextEntranceIndex = ENTR_ZORAS_FOUNTAIN_0;
+        if (GameInteractor_Should(GI_VB_PLAY_BLUE_WARP_CS, true, EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
+            Flags_SetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP);
+            if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_BLUE_WARP, true, ITEM_ZORA_SAPPHIRE)) {
+                Item_Give(play, ITEM_ZORA_SAPPHIRE);
+            }
             gSaveContext.nextCutsceneIndex = 0xFFF0;
         }
+        play->nextEntranceIndex = ENTR_ZORAS_FOUNTAIN_0;
 
         if (IS_RANDO && (Randomizer_GetSettingValue(RSK_SHUFFLE_DUNGEON_ENTRANCES) != RO_DUNGEON_ENTRANCE_SHUFFLE_OFF ||
             Randomizer_GetSettingValue(RSK_SHUFFLE_BOSS_ENTRANCES) != RO_BOSS_ROOM_ENTRANCE_SHUFFLE_OFF)) {
@@ -767,11 +705,6 @@ void DoorWarp1_AdultWarpIdle(DoorWarp1* this, PlayState* play) {
 
         player = GET_PLAYER(play);
 
-        if (IS_RANDO) {
-            GivePlayerRandoReward(this, player, play, 0, 1);
-            return;
-        }
-
         OnePointCutscene_Init(play, 0x25E8, 999, &this->actor, MAIN_CAM);
         func_8002DF54(play, &this->actor, 10);
         player->unk_450.x = this->actor.world.pos.x;
@@ -829,19 +762,14 @@ void DoorWarp1_AdultWarpOut(DoorWarp1* this, PlayState* play) {
         if (IS_BOSS_RUSH) {
             BossRush_HandleBlueWarp(play, this->actor.world.pos.x, this->actor.world.pos.z);
         } else if (play->sceneNum == SCENE_FOREST_TEMPLE_BOSS) {
-            if (!Flags_GetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP)) {
+            if (GameInteractor_Should(GI_VB_PLAY_BLUE_WARP_CS, !Flags_GetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP), EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP)) {
                 Flags_SetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP);
-                Flags_SetRandomizerInf(RAND_INF_DUNGEONS_DONE_FOREST_TEMPLE);
-
-                if (IS_RANDO) {
-                    play->nextEntranceIndex = ENTR_SACRED_FOREST_MEADOW_3;
-                    gSaveContext.nextCutsceneIndex = 0;
-                } else {
+                if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_BLUE_WARP, true, ITEM_MEDALLION_FOREST)) {
                     Item_Give(play, ITEM_MEDALLION_FOREST);
-                    play->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0;
-                    gSaveContext.nextCutsceneIndex = 0;
-                    gSaveContext.chamberCutsceneNum = CHAMBER_CS_FOREST;
                 }
+                play->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0;
+                gSaveContext.nextCutsceneIndex = 0;
+                gSaveContext.chamberCutsceneNum = CHAMBER_CS_FOREST;
             } else {
                 if (!LINK_IS_ADULT) {
                     play->nextEntranceIndex = ENTR_SACRED_FOREST_MEADOW_2;
@@ -851,20 +779,13 @@ void DoorWarp1_AdultWarpOut(DoorWarp1* this, PlayState* play) {
                 gSaveContext.nextCutsceneIndex = 0;
             }
         } else if (play->sceneNum == SCENE_FIRE_TEMPLE_BOSS) {
-            if (!Flags_GetEventChkInf(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP)) {
+            if (GameInteractor_Should(GI_VB_PLAY_BLUE_WARP_CS, !Flags_GetEventChkInf(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP), EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP)) {
                 Flags_SetEventChkInf(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP);
-                Flags_SetRandomizerInf(RAND_INF_DUNGEONS_DONE_FIRE_TEMPLE);
-
-                if (IS_RANDO) {
-                    play->nextEntranceIndex = ENTR_DEATH_MOUNTAIN_CRATER_5;
-                    gSaveContext.nextCutsceneIndex = 0;
-                    // Change Death Mountain cloud since we aren't warping to the cutscene
-                    Flags_SetEventChkInf(EVENTCHKINF_DEATH_MOUNTAIN_ERUPTED);
-                } else {
+                if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_BLUE_WARP, true, ITEM_MEDALLION_FIRE)) {
                     Item_Give(play, ITEM_MEDALLION_FIRE);
-                    play->nextEntranceIndex = ENTR_KAKARIKO_VILLAGE_0;
-                    gSaveContext.nextCutsceneIndex = 0xFFF3;
                 }
+                play->nextEntranceIndex = ENTR_KAKARIKO_VILLAGE_0;
+                gSaveContext.nextCutsceneIndex = 0xFFF3;
             } else {
                 if (!LINK_IS_ADULT) {
                     play->nextEntranceIndex = ENTR_DEATH_MOUNTAIN_CRATER_4;
@@ -874,21 +795,14 @@ void DoorWarp1_AdultWarpOut(DoorWarp1* this, PlayState* play) {
                 gSaveContext.nextCutsceneIndex = 0;
             }
         } else if (play->sceneNum == SCENE_WATER_TEMPLE_BOSS) {
-            if (!Flags_GetEventChkInf(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP)) {
+            if (GameInteractor_Should(GI_VB_PLAY_BLUE_WARP_CS, !Flags_GetEventChkInf(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP), EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP)) {
                 Flags_SetEventChkInf(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP);
-                Flags_SetRandomizerInf(RAND_INF_DUNGEONS_DONE_WATER_TEMPLE);
-
-                if (IS_RANDO) {
-                    play->nextEntranceIndex = ENTR_LAKE_HYLIA_9;
-                    gSaveContext.nextCutsceneIndex = 0;
-                    // Fill Lake Hylia since we aren't warping to the cutscene
-                    Flags_SetEventChkInf(EVENTCHKINF_RAISED_LAKE_HYLIA_WATER);
-                } else {
+                if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_BLUE_WARP, true, ITEM_MEDALLION_WATER)) {
                     Item_Give(play, ITEM_MEDALLION_WATER);
-                    play->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0;
-                    gSaveContext.nextCutsceneIndex = 0;
-                    gSaveContext.chamberCutsceneNum = CHAMBER_CS_WATER;
                 }
+                play->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0;
+                gSaveContext.nextCutsceneIndex = 0;
+                gSaveContext.chamberCutsceneNum = CHAMBER_CS_WATER;
             } else {
                 if (!LINK_IS_ADULT) {
                     play->nextEntranceIndex = ENTR_LAKE_HYLIA_8;
@@ -898,18 +812,14 @@ void DoorWarp1_AdultWarpOut(DoorWarp1* this, PlayState* play) {
                 gSaveContext.nextCutsceneIndex = 0;
             }
         } else if (play->sceneNum == SCENE_SPIRIT_TEMPLE_BOSS) {
-            if (!CHECK_QUEST_ITEM(QUEST_MEDALLION_SPIRIT) || IS_RANDO) {
+            if (GameInteractor_Should(GI_VB_PLAY_BLUE_WARP_CS, !CHECK_QUEST_ITEM(QUEST_MEDALLION_SPIRIT), RAND_INF_DUNGEONS_DONE_SPIRIT_TEMPLE)) {
                 Flags_SetRandomizerInf(RAND_INF_DUNGEONS_DONE_SPIRIT_TEMPLE);
-
-                if (IS_RANDO) {
-                    play->nextEntranceIndex = ENTR_DESERT_COLOSSUS_8;
-                    gSaveContext.nextCutsceneIndex = 0;
-                } else {
+                if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_BLUE_WARP, true, ITEM_MEDALLION_SPIRIT)) {
                     Item_Give(play, ITEM_MEDALLION_SPIRIT);
-                    play->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0;
-                    gSaveContext.nextCutsceneIndex = 0;
-                    gSaveContext.chamberCutsceneNum = CHAMBER_CS_SPIRIT;
                 }
+                play->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0;
+                gSaveContext.nextCutsceneIndex = 0;
+                gSaveContext.chamberCutsceneNum = CHAMBER_CS_SPIRIT;
             } else {
                 if (!LINK_IS_ADULT) {
                     play->nextEntranceIndex = ENTR_DESERT_COLOSSUS_5;
@@ -919,18 +829,14 @@ void DoorWarp1_AdultWarpOut(DoorWarp1* this, PlayState* play) {
                 gSaveContext.nextCutsceneIndex = 0;
             }
         } else if (play->sceneNum == SCENE_SHADOW_TEMPLE_BOSS) {
-            if (!CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW) || IS_RANDO) {
+            if (GameInteractor_Should(GI_VB_PLAY_BLUE_WARP_CS, !CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW), RAND_INF_DUNGEONS_DONE_SHADOW_TEMPLE)) {
                 Flags_SetRandomizerInf(RAND_INF_DUNGEONS_DONE_SHADOW_TEMPLE);
-
-                if (IS_RANDO) {
-                    play->nextEntranceIndex = ENTR_GRAVEYARD_8;
-                    gSaveContext.nextCutsceneIndex = 0;
-                } else {
+                if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_BLUE_WARP, true, ITEM_MEDALLION_SHADOW)) {
                     Item_Give(play, ITEM_MEDALLION_SHADOW);
-                    play->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0;
-                    gSaveContext.nextCutsceneIndex = 0;
-                    gSaveContext.chamberCutsceneNum = CHAMBER_CS_SHADOW;
                 }
+                play->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0;
+                gSaveContext.nextCutsceneIndex = 0;
+                gSaveContext.chamberCutsceneNum = CHAMBER_CS_SHADOW;
             } else {
                 if (!LINK_IS_ADULT) {
                     play->nextEntranceIndex = ENTR_GRAVEYARD_7;
diff --git a/soh/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c b/soh/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c
index 3fe7fc689..495ef96b8 100644
--- a/soh/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c
+++ b/soh/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c
@@ -7,6 +7,7 @@
 #include "z_elf_msg.h"
 #include "vt.h"
 #include "overlays/actors/ovl_En_Elf/z_en_elf.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_WHILE_CULLED
 
@@ -110,7 +111,7 @@ void ElfMsg_Destroy(Actor* thisx, PlayState* play) {
 
 s32 ElfMsg_GetMessageId(ElfMsg* this) {
     // Negative message ID forces link to talk to Navi
-    if (this->actor.params & 0x8000 || CVarGetInteger("gNoForcedNavi", 0) != 0) {
+    if (this->actor.params & 0x8000) {
         return (this->actor.params & 0xFF) + 0x100;
     } else {
         return -((this->actor.params & 0xFF) + 0x100);
@@ -125,8 +126,10 @@ void ElfMsg_CallNaviCuboid(ElfMsg* this, PlayState* play) {
         (this->actor.world.pos.y <= player->actor.world.pos.y) &&
         ((player->actor.world.pos.y - this->actor.world.pos.y) < (100.0f * this->actor.scale.y)) &&
         (fabsf(player->actor.world.pos.z - this->actor.world.pos.z) < (100.0f * this->actor.scale.z))) {
-        player->naviTextId = ElfMsg_GetMessageId(this);
-        navi->elfMsg = this;
+        if (GameInteractor_Should(GI_VB_NAVI_TALK, true, this)) {
+            player->naviTextId = ElfMsg_GetMessageId(this);
+            navi->elfMsg = this;
+        }
     }
 }
 
@@ -145,8 +148,10 @@ void ElfMsg_CallNaviCylinder(ElfMsg* this, PlayState* play) {
     if (ElfMsg_WithinXZDistance(&player->actor.world.pos, &this->actor.world.pos, this->actor.scale.x * 100.0f) &&
         (this->actor.world.pos.y <= player->actor.world.pos.y) &&
         ((player->actor.world.pos.y - this->actor.world.pos.y) < (100.0f * this->actor.scale.y))) {
-        player->naviTextId = ElfMsg_GetMessageId(this);
-        navi->elfMsg = this;
+        if (GameInteractor_Should(GI_VB_NAVI_TALK, true, this)) {
+            player->naviTextId = ElfMsg_GetMessageId(this);
+            navi->elfMsg = this;
+        }
     }
 }
 
diff --git a/soh/src/overlays/actors/ovl_En_Box/z_en_box.c b/soh/src/overlays/actors/ovl_En_Box/z_en_box.c
index a4d86ff61..e01573c9b 100644
--- a/soh/src/overlays/actors/ovl_En_Box/z_en_box.c
+++ b/soh/src/overlays/actors/ovl_En_Box/z_en_box.c
@@ -3,6 +3,7 @@
 #include "soh_assets.h"
 #include "soh/Enhancements/enhancementTypes.h"
 #include <assert.h>
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS 0
 
@@ -192,10 +193,12 @@ void EnBox_Init(Actor* thisx, PlayState* play2) {
     SkelAnime_Init(play, &this->skelanime, &gTreasureChestSkel, anim, this->jointTable, this->morphTable, 5);
     Animation_Change(&this->skelanime, anim, 1.5f, animFrameStart, endFrame, ANIMMODE_ONCE, 0.0f);
 
+    this->getItemEntry = ItemTable_RetrieveEntry(MOD_NONE, this->dyna.actor.params >> 5 & 0x7F);
     if (IS_RANDO) {
-        this->getItemEntry = Randomizer_GetItemFromActor(this->dyna.actor.id, play->sceneNum, this->dyna.actor.params, this->dyna.actor.params >> 5 & 0x7F);
-    } else {
-        this->getItemEntry = ItemTable_RetrieveEntry(MOD_NONE, this->dyna.actor.params >> 5 & 0x7F);
+        RandomizerCheck rc = Randomizer_GetCheckFromActor(this->dyna.actor.id, play->sceneNum, this->dyna.actor.params);
+        if (rc != RC_UNKNOWN_CHECK) {
+            this->getItemEntry = Randomizer_GetItemFromKnownCheck(rc, this->dyna.actor.params >> 5 & 0x7F);
+        }
     }
 
     EnBox_UpdateSizeAndTexture(this, play);
@@ -275,7 +278,9 @@ void EnBox_Fall(EnBox* this, PlayState* play) {
             this->dyna.actor.shape.rot.z = 0;
             this->dyna.actor.world.pos.y = this->dyna.actor.floorHeight;
             EnBox_SetupAction(this, EnBox_WaitOpen);
-            OnePointCutscene_EndCutscene(play, this->unk_1AC);
+            if (GameInteractor_Should(GI_VB_PLAY_ONEPOINT_ACTOR_CS, true, this)) {
+                OnePointCutscene_EndCutscene(play, this->unk_1AC);
+            }
         }
         Audio_PlaySoundGeneral(NA_SE_EV_COFFIN_CAP_BOUND, &this->dyna.actor.projectedPos, 4, &D_801333E0, &D_801333E0,
                                &D_801333E8);
@@ -445,74 +450,12 @@ void EnBox_WaitOpen(EnBox* this, PlayState* play) {
         }
         osSyncPrintf("Actor_Environment_Tbox_On() %d\n", this->dyna.actor.params & 0x1F);
         Flags_SetTreasure(play, this->dyna.actor.params & 0x1F);
-
-        // treasure chest game rando
-        if (Randomizer_GetSettingValue(RSK_SHUFFLE_CHEST_MINIGAME)) {
-            if (IS_RANDO && play->sceneNum == SCENE_TREASURE_BOX_SHOP && (this->dyna.actor.params & 0x60) != 0x20) {
-                if((this->dyna.actor.params & 0xF) < 2) {
-                    Flags_SetCollectible(play, 0x1B);
-                }
-                if((this->dyna.actor.params & 0xF) >= 2 && (this->dyna.actor.params & 0xF) < 4) {
-                    Flags_SetCollectible(play, 0x1C);
-                }
-                if((this->dyna.actor.params & 0xF) >= 4 && (this->dyna.actor.params & 0xF) < 6) {
-                    Flags_SetCollectible(play, 0x1D);
-                }
-                if((this->dyna.actor.params & 0xF) >= 6 && (this->dyna.actor.params & 0xF) < 8) {
-                    Flags_SetCollectible(play, 0x1E);
-                }
-                if((this->dyna.actor.params & 0xF) >= 8 && (this->dyna.actor.params & 0xF) < 10) {
-                    Flags_SetCollectible(play, 0x1F);
-                }
-            }
-        }
     } else {
         player = GET_PLAYER(play);
         func_8002DBD0(&this->dyna.actor, &sp4C, &player->actor.world.pos);
         if (sp4C.z > -50.0f && sp4C.z < 0.0f && fabsf(sp4C.y) < 10.0f && fabsf(sp4C.x) < 20.0f &&
             Player_IsFacingActor(&this->dyna.actor, 0x3000, play)) {
-            GetItemEntry sItem = Randomizer_GetItemFromActor(this->dyna.actor.id, play->sceneNum, this->dyna.actor.params, this->dyna.actor.params >> 5 & 0x7F);
-            GetItemEntry blueRupee = ItemTable_RetrieveEntry(MOD_NONE, GI_RUPEE_BLUE);
-            
-            // RANDOTODO treasure chest game rando
-            if (Randomizer_GetSettingValue(RSK_SHUFFLE_CHEST_MINIGAME)) {
-                if (IS_RANDO && play->sceneNum == SCENE_TREASURE_BOX_SHOP && (this->dyna.actor.params & 0x60) != 0x20) {
-                    if((this->dyna.actor.params & 0xF) < 2) {
-                        if(Flags_GetCollectible(play, 0x1B)) {
-                            sItem = blueRupee;
-                        }
-                    }
-                    if((this->dyna.actor.params & 0xF) >= 2 && (this->dyna.actor.params & 0xF) < 4) {
-                        if(Flags_GetCollectible(play, 0x1C)) {
-                            sItem = blueRupee;
-                        }
-                    }
-                    if((this->dyna.actor.params & 0xF) >= 4 && (this->dyna.actor.params & 0xF) < 6) {
-                        if(Flags_GetCollectible(play, 0x1D)) {
-                            sItem = blueRupee;
-                        }
-                    }
-                    if((this->dyna.actor.params & 0xF) >= 6 && (this->dyna.actor.params & 0xF) < 8) {
-                        if(Flags_GetCollectible(play, 0x1E)) {
-                            sItem = blueRupee;
-                        }
-                    }
-                    if((this->dyna.actor.params & 0xF) >= 8 && (this->dyna.actor.params & 0xF) < 10) {
-                        if(Flags_GetCollectible(play, 0x1F)) {
-                            sItem = blueRupee;
-                        }
-                    }
-                }
-            }
-            // Chests need to have a negative getItemId in order to not immediately give their item
-            // when approaching.
-            if (IS_RANDO) {
-                sItem.getItemId = 0 - sItem.getItemId;
-                sItem.getItemFrom = ITEM_FROM_CHEST;
-                GiveItemEntryFromActorWithFixedRange(&this->dyna.actor, play, sItem);
-            } else {
                 func_8002F554(&this->dyna.actor, play, -(this->dyna.actor.params >> 5 & 0x7F));
-            }
         }
         if (Flags_GetTreasure(play, this->dyna.actor.params & 0x1F)) {
             EnBox_SetupAction(this, EnBox_Open);
@@ -626,12 +569,9 @@ void EnBox_Update(Actor* thisx, PlayState* play) {
             Actor_SetFocus(&this->dyna.actor, 40.0f);
     }
 
-    if (((!IS_RANDO && ((this->dyna.actor.params >> 5 & 0x7F) == 0x7C)) ||
-        (IS_RANDO && this->getItemEntry.getItemId == RG_ICE_TRAP)) &&
-        this->actionFunc == EnBox_Open && this->skelanime.curFrame > 45 && this->iceSmokeTimer < 100) {
-        if (!CVarGetInteger("gAddTraps.enabled", 0)) {
-            EnBox_SpawnIceSmoke(this, play);
-        }
+    if ((this->dyna.actor.params >> 5 & 0x7F) == GI_ICE_TRAP && this->actionFunc == EnBox_Open &&
+        this->skelanime.curFrame > 45 && this->iceSmokeTimer < 100) {
+        EnBox_SpawnIceSmoke(this, play);
     }
 }
 
diff --git a/soh/src/overlays/actors/ovl_En_Box/z_en_box.h b/soh/src/overlays/actors/ovl_En_Box/z_en_box.h
index 765779367..0168fc1a8 100644
--- a/soh/src/overlays/actors/ovl_En_Box/z_en_box.h
+++ b/soh/src/overlays/actors/ovl_En_Box/z_en_box.h
@@ -4,6 +4,7 @@
 #include <libultraship/libultra.h>
 #include "global.h"
 
+#define ENBOX_PARAMS(type, itemId, treasureFlag) ((type) << 12 | (itemId) << 5 | (treasureFlag))
 #define ENBOX_TREASURE_FLAG_UNK_MIN 20
 #define ENBOX_TREASURE_FLAG_UNK_MAX 32
 
@@ -45,7 +46,7 @@ typedef struct EnBox {
     /* 0x01F9 */ u8 type;
     /* 0x01FA */ u8 iceSmokeTimer;
     /* 0x01FB */ u8 unk_1FB;
-    /*        */ GetItemEntry getItemEntry;
+    /*        */ GetItemEntry getItemEntry; // This is only to determine the Chest Style, randomzier item gives are handled elsewhere
     /*        */ Gfx* boxLidDL;
     /*        */ Gfx* boxBodyDL;
 } EnBox; // size = 0x01FC
diff --git a/soh/src/overlays/actors/ovl_En_Cow/z_en_cow.c b/soh/src/overlays/actors/ovl_En_Cow/z_en_cow.c
index 04123c7b3..b2bd6d65c 100644
--- a/soh/src/overlays/actors/ovl_En_Cow/z_en_cow.c
+++ b/soh/src/overlays/actors/ovl_En_Cow/z_en_cow.c
@@ -6,6 +6,7 @@
 
 #include "z_en_cow.h"
 #include "objects/object_cow/object_cow.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY)
 
@@ -18,7 +19,6 @@ void func_809E0070(Actor* thisx, PlayState* play);
 
 void func_809DF494(EnCow* this, PlayState* play);
 void func_809DF6BC(EnCow* this, PlayState* play);
-void EnCow_MoveForRandomizer(EnCow* this, PlayState* play);
 void func_809DF778(EnCow* this, PlayState* play);
 void func_809DF7D8(EnCow* this, PlayState* play);
 void func_809DF870(EnCow* this, PlayState* play);
@@ -107,10 +107,6 @@ void EnCow_Init(Actor* thisx, PlayState* play) {
     EnCow* this = (EnCow*)thisx;
     s32 pad;
 
-    if (IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_COWS)) {
-        EnCow_MoveForRandomizer(thisx, play);
-    }
-
     ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 72.0f);
     switch (this->actor.params) {
         case 0:
@@ -122,18 +118,15 @@ void EnCow_Init(Actor* thisx, PlayState* play) {
             Collider_SetCylinder(play, &this->colliders[1], &this->actor, &sCylinderInit);
             func_809DEE9C(this);
             this->actionFunc = func_809DF96C;
-            if (play->sceneNum == SCENE_LINKS_HOUSE) {
-                if (!LINK_IS_ADULT && !CVarGetInteger("gCowOfTime", 0)) {
-                    Actor_Kill(&this->actor);
-                    return;
-                }
-                if (!Flags_GetEventChkInf(EVENTCHKINF_WON_COW_IN_MALONS_RACE)) {
-                    Actor_Kill(&this->actor);
-                    return;
-                }
+            if (GameInteractor_Should(GI_VB_DESPAWN_HORSE_RACE_COW, (
+                play->sceneNum == SCENE_LINKS_HOUSE && (!LINK_IS_ADULT || !Flags_GetEventChkInf(EVENTCHKINF_WON_COW_IN_MALONS_RACE))
+            ), this)) {
+                Actor_Kill(&this->actor);
+                return;
             }
+
             Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_COW, this->actor.world.pos.x,
-                               this->actor.world.pos.y, this->actor.world.pos.z, 0, this->actor.shape.rot.y, 0, 1);
+                                this->actor.world.pos.y, this->actor.world.pos.z, 0, this->actor.shape.rot.y, 0, 1);
             this->unk_278 = Rand_ZeroFloat(1000.0f) + 40.0f;
             this->unk_27A = 0;
             this->actor.targetMode = 6;
@@ -216,30 +209,6 @@ void func_809DF730(EnCow* this, PlayState* play) {
     }
 }
 
-void EnCow_MoveForRandomizer(EnCow* this, PlayState* play) {
-    // Only move the cow body (the tail will be moved with the body)
-    if (this->actor.params != 0) {
-        return;
-    }
-
-    // Move left cow in lon lon tower
-    if (play->sceneNum == SCENE_LON_LON_BUILDINGS && this->actor.world.pos.x == -108 && this->actor.world.pos.z == -65) {
-        this->actor.world.pos.x = -229.0f;
-        this->actor.world.pos.z = 157.0f;
-        this->actor.shape.rot.y = 15783.0f;
-    // Move right cow in lon lon stable
-    } else if (play->sceneNum == SCENE_STABLE && this->actor.world.pos.x == -3 && this->actor.world.pos.z == -254) {
-        this->actor.world.pos.x += 119.0f;
-    }
-}
-
-void EnCow_SetCowMilked(EnCow* this, PlayState* play) {
-    CowIdentity cowIdentity = Randomizer_IdentifyCow(play->sceneNum, this->actor.world.pos.x, this->actor.world.pos.z);
-    Player* player = GET_PLAYER(play);
-    player->pendingFlag.flagID = cowIdentity.randomizerInf;
-    player->pendingFlag.flagType = FLAG_RANDOMIZER_INF;
-}
-
 void func_809DF778(EnCow* this, PlayState* play) {
     if (Actor_HasParent(&this->actor, play)) {
         this->actor.parent = NULL;
@@ -281,23 +250,6 @@ void func_809DF8FC(EnCow* this, PlayState* play) {
     func_809DF494(this, play);
 }
 
-bool EnCow_HasBeenMilked(EnCow* this, PlayState* play) {
-    CowIdentity cowIdentity = Randomizer_IdentifyCow(play->sceneNum, this->actor.world.pos.x, this->actor.world.pos.z);
-    return Flags_GetRandomizerInf(cowIdentity.randomizerInf);
-}
-
-void EnCow_GivePlayerRandomizedItem(EnCow* this, PlayState* play) {
-    if (!EnCow_HasBeenMilked(this, play)) {
-        CowIdentity cowIdentity = Randomizer_IdentifyCow(play->sceneNum, this->actor.world.pos.x, this->actor.world.pos.z);
-        GetItemEntry itemEntry = Randomizer_GetItemFromKnownCheck(cowIdentity.randomizerCheck, GI_MILK);
-        GiveItemEntryFromActor(&this->actor, play, itemEntry, 10000.0f, 100.0f);
-    } else {
-        // once we've gotten the rando reward from the cow,
-        // return them to the their default action function
-        this->actionFunc = func_809DF96C;
-    }
-}
-
 void func_809DF96C(EnCow* this, PlayState* play) {
     if ((play->msgCtx.ocarinaMode == OCARINA_MODE_00) || (play->msgCtx.ocarinaMode == OCARINA_MODE_04)) {
         if (DREG(53) != 0) {
@@ -308,23 +260,14 @@ void func_809DF96C(EnCow* this, PlayState* play) {
                 if ((this->actor.xzDistToPlayer < 150.0f) &&
                     (ABS((s16)(this->actor.yawTowardsPlayer - this->actor.shape.rot.y)) < 0x61A8)) {
                     DREG(53) = 0;
-                    // when randomized with cowsanity, if we haven't gotten the
-                    // reward from this cow yet, give that, otherwise use the
-                    // vanilla cow behavior
-                    if (IS_RANDO &&
-                        Randomizer_GetSettingValue(RSK_SHUFFLE_COWS) &&
-                        !EnCow_HasBeenMilked(this, play)) {
-                        EnCow_SetCowMilked(this, play);
-                        // setting the ocarina mode here prevents intermittent issues
-                        // with the item get not triggering until walking away
-                        play->msgCtx.ocarinaMode = OCARINA_MODE_00;
-                        this->actionFunc = EnCow_GivePlayerRandomizedItem;
+                    if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_COW, true, this)) {
+                        this->actionFunc = func_809DF8FC;
+                        this->actor.flags |= ACTOR_FLAG_WILL_TALK;
+                        func_8002F2CC(&this->actor, play, 170.0f);
+                        this->actor.textId = 0x2006;
+                    } else {
                         return;
                     }
-                    this->actionFunc = func_809DF8FC;
-                    this->actor.flags |= ACTOR_FLAG_WILL_TALK;
-                    func_8002F2CC(&this->actor, play, 170.0f);
-                    this->actor.textId = 0x2006;
                 } else {
                     this->unk_276 |= 4;
                 }
diff --git a/soh/src/overlays/actors/ovl_En_Cow/z_en_cow.h b/soh/src/overlays/actors/ovl_En_Cow/z_en_cow.h
index 63dbbddd3..3cd244388 100644
--- a/soh/src/overlays/actors/ovl_En_Cow/z_en_cow.h
+++ b/soh/src/overlays/actors/ovl_En_Cow/z_en_cow.h
@@ -21,4 +21,6 @@ typedef struct EnCow {
     /* 0x027C */ EnCowActionFunc actionFunc;
 } EnCow; // size = 0x0280
 
+void func_809DEE9C(EnCow* enCow);
+
 #endif
diff --git a/soh/src/overlays/actors/ovl_En_Dns/z_en_dns.c b/soh/src/overlays/actors/ovl_En_Dns/z_en_dns.c
index 0dd33a8ac..09a5e6cd1 100644
--- a/soh/src/overlays/actors/ovl_En_Dns/z_en_dns.c
+++ b/soh/src/overlays/actors/ovl_En_Dns/z_en_dns.c
@@ -16,7 +16,6 @@ void EnDns_Destroy(Actor* thisx, PlayState* play);
 void EnDns_Update(Actor* thisx, PlayState* play);
 void EnDns_Draw(Actor* thisx, PlayState* play);
 
-u32 EnDns_RandomizerPurchaseableCheck(EnDns* this);
 u32 func_809EF5A4(EnDns* this);
 u32 func_809EF658(EnDns* this);
 u32 func_809EF70C(EnDns* this);
@@ -26,7 +25,6 @@ u32 func_809EF854(EnDns* this);
 u32 func_809EF8F4(EnDns* this);
 u32 func_809EF9A4(EnDns* this);
 
-void EnDns_RandomizerPurchase(EnDns* this);
 void func_809EF9F8(EnDns* this);
 void func_809EFA28(EnDns* this);
 void func_809EFA58(EnDns* this);
@@ -168,32 +166,6 @@ void EnDns_Init(Actor* thisx, PlayState* play) {
     this->actor.gravity = -1.0f;
     this->actor.textId = D_809F040C[this->actor.params];
     this->dnsItemEntry = sItemEntries[this->actor.params];
-    if (IS_RANDO) {
-        // Ugly, but the best way we can identify which grotto we are in, same method 3DRando uses, but we'll need to account for entrance rando
-        s16 respawnData = gSaveContext.respawn[RESPAWN_MODE_RETURN].data & ((1 << 8) - 1);
-        this->scrubIdentity = Randomizer_IdentifyScrub(play->sceneNum, this->actor.params, respawnData);
-
-        if ((Randomizer_GetSettingValue(RSK_SHUFFLE_SCRUBS) == RO_SCRUBS_AFFORDABLE ||
-             Randomizer_GetSettingValue(RSK_SHUFFLE_SCRUBS) == RO_SCRUBS_RANDOM) &&
-            this->scrubIdentity.itemPrice != -1) {
-            this->dnsItemEntry->itemPrice = this->scrubIdentity.itemPrice;
-        }
-
-        if (Randomizer_GetSettingValue(RSK_SHUFFLE_SCRUBS) == RO_SCRUBS_EXPENSIVE) {
-            // temporary workaround: always use 40 rupees as price instead of 70
-            if (this->actor.params == 0x0006) {
-                this->dnsItemEntry->itemPrice = 40;
-            }
-        }
-
-        if (this->scrubIdentity.isShuffled) {
-            this->dnsItemEntry->getItemId = this->scrubIdentity.getItemId;
-            this->dnsItemEntry->purchaseableCheck = EnDns_RandomizerPurchaseableCheck;
-            this->dnsItemEntry->setRupeesAndFlags = EnDns_RandomizerPurchase;
-            this->dnsItemEntry->itemAmount = 1;
-            this->actor.textId = 0x9000 + (this->scrubIdentity.randomizerInf - RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT);
-        }
-    }
     this->actionFunc = EnDns_SetupWait;
 }
 
@@ -216,13 +188,6 @@ void EnDns_ChangeAnim(EnDns* this, u8 index) {
 
 /* Item give checking functions */
 
-u32 EnDns_RandomizerPurchaseableCheck(EnDns* this) {
-    if (gSaveContext.rupees < this->dnsItemEntry->itemPrice || Flags_GetRandomizerInf(this->scrubIdentity.randomizerInf)) {
-        return 0;
-    }
-    return 4;
-}
-
 u32 func_809EF5A4(EnDns* this) {
     if ((CUR_CAPACITY(UPG_NUTS) != 0) && (AMMO(ITEM_NUT) >= CUR_CAPACITY(UPG_NUTS))) {
         return 1;
@@ -319,10 +284,6 @@ u32 func_809EF9A4(EnDns* this) {
 }
 
 /* Paying and flagging functions */
-void EnDns_RandomizerPurchase(EnDns* this) {
-    Rupees_ChangeBy(-this->dnsItemEntry->itemPrice);
-    Flags_SetRandomizerInf(this->scrubIdentity.randomizerInf);
-}
 
 void func_809EF9F8(EnDns* this) {
     Rupees_ChangeBy(-this->dnsItemEntry->itemPrice);
@@ -412,44 +373,39 @@ void EnDns_Talk(EnDns* this, PlayState* play) {
 
 void func_809EFDD0(EnDns* this, PlayState* play) {
     u16 pendingGetItemId;
-    if (!IS_RANDO || !this->scrubIdentity.isShuffled) {
-        if (this->actor.params == 0x9) {
-            if (CUR_UPG_VALUE(UPG_STICKS) < 2) {
-                pendingGetItemId = GI_STICK_UPGRADE_20;
-            } else {
-                pendingGetItemId = GI_STICK_UPGRADE_30;
-            }
-        } else if (this->actor.params == 0xA) {
-            if (CUR_UPG_VALUE(UPG_NUTS) < 2) {
-                pendingGetItemId = GI_NUT_UPGRADE_30;
-            } else {
-                pendingGetItemId = GI_NUT_UPGRADE_40;
-            }
+    if (this->actor.params == 0x9) {
+        if (CUR_UPG_VALUE(UPG_STICKS) < 2) {
+            pendingGetItemId = GI_STICK_UPGRADE_20;
         } else {
-            pendingGetItemId = this->dnsItemEntry->getItemId;
+            pendingGetItemId = GI_STICK_UPGRADE_30;
+        }
+    } else if (this->actor.params == 0xA) {
+        if (CUR_UPG_VALUE(UPG_NUTS) < 2) {
+            pendingGetItemId = GI_NUT_UPGRADE_30;
+        } else {
+            pendingGetItemId = GI_NUT_UPGRADE_40;
         }
-        GetItemEntry itemEntry = ItemTable_Retrieve(pendingGetItemId);
-        gSaveContext.pendingSale = itemEntry.itemId;
-        gSaveContext.pendingSaleMod = itemEntry.modIndex;
-        func_8002F434(&this->actor, play, pendingGetItemId, 130.0f, 100.0f);
     } else {
-        GetItemEntry itemEntry = Randomizer_GetItemFromKnownCheck(this->scrubIdentity.randomizerCheck, this->scrubIdentity.getItemId);
-        gSaveContext.pendingSale = itemEntry.itemId;
-        gSaveContext.pendingSaleMod = itemEntry.modIndex;
-        GiveItemEntryFromActor(&this->actor, play, itemEntry, 130.0f, 100.0f);
+        pendingGetItemId = this->dnsItemEntry->getItemId;
     }
+    GetItemEntry itemEntry = ItemTable_Retrieve(pendingGetItemId);
+    gSaveContext.pendingSale = itemEntry.itemId;
+    gSaveContext.pendingSaleMod = itemEntry.modIndex;
+    func_8002F434(&this->actor, play, pendingGetItemId, 130.0f, 100.0f);
 }
 
 void func_809EFEE8(EnDns* this, PlayState* play) {
     if ((Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(play)) {
         Message_CloseTextbox(play);
-        func_809EFDD0(this, play);
+        if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_BUSINESS_SCRUB, true, this)) {
+            func_809EFDD0(this, play);
+        }
         this->actionFunc = func_809EFF50;
     }
 }
 
 void func_809EFF50(EnDns* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_BUSINESS_SCRUB, true, this)) {
         this->actor.parent = NULL;
         this->actionFunc = func_809EFF98;
     } else {
@@ -533,9 +489,6 @@ void EnDns_Update(Actor* thisx, PlayState* play) {
 
     this->dustTimer++;
     this->actor.textId = D_809F040C[this->actor.params];
-    if (IS_RANDO && this->scrubIdentity.isShuffled) {
-        this->actor.textId = 0x9000 + (this->scrubIdentity.randomizerInf - RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT);
-    }
     Actor_SetFocus(&this->actor, 60.0f);
     Actor_SetScale(&this->actor, 0.01f);
     SkelAnime_Update(&this->skelAnime);
diff --git a/soh/src/overlays/actors/ovl_En_Dns/z_en_dns.h b/soh/src/overlays/actors/ovl_En_Dns/z_en_dns.h
index bf0a3a167..0e3e50c9b 100644
--- a/soh/src/overlays/actors/ovl_En_Dns/z_en_dns.h
+++ b/soh/src/overlays/actors/ovl_En_Dns/z_en_dns.h
@@ -32,7 +32,10 @@ typedef struct EnDns {
     /* 0x02BD */ u8 dropCollectible;
     /* 0x02C0 */ DnsItemEntry* dnsItemEntry;
     /* 0x02C4 */ f32 yInitPos;
-    /*        */ ScrubIdentity scrubIdentity;
+    // #region SOH [Randomizer]
+    /*        */ DnsItemEntry sohDnsItemEntry;
+    /*        */ ScrubIdentity sohScrubIdentity;
+    // #endregion
 } EnDns; // size = 0x02C8
 
 #endif
diff --git a/soh/src/overlays/actors/ovl_En_Ds/z_en_ds.c b/soh/src/overlays/actors/ovl_En_Ds/z_en_ds.c
index 6da75b1e7..d3a0eadea 100644
--- a/soh/src/overlays/actors/ovl_En_Ds/z_en_ds.c
+++ b/soh/src/overlays/actors/ovl_En_Ds/z_en_ds.c
@@ -6,7 +6,7 @@
 
 #include "z_en_ds.h"
 #include "objects/object_ds/object_ds.h"
-#include "soh/Enhancements/randomizer/adult_trade_shuffle.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY)
 
@@ -90,19 +90,12 @@ void EnDs_DisplayOddPotionText(EnDs* this, PlayState* play) {
 }
 
 void EnDs_GiveOddPotion(EnDs* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_TRADE_ODD_MUSHROOM, true, this)) {
         this->actor.parent = NULL;
         this->actionFunc = EnDs_DisplayOddPotionText;
         gSaveContext.timer2State = 0;
     } else {
-        u32 itemId = GI_ODD_POTION;
-        if (IS_RANDO) {
-            GetItemEntry itemEntry = Randomizer_GetItemFromKnownCheck(RC_KAK_TRADE_ODD_MUSHROOM, GI_ODD_POTION);
-            GiveItemEntryFromActor(&this->actor, play, itemEntry, 10000.0f, 50.0f);
-            Randomizer_ConsumeAdultTradeItem(play, ITEM_ODD_MUSHROOM);
-            return;
-        }
-        func_8002F434(&this->actor, play, itemId, 10000.0f, 50.0f);
+        func_8002F434(&this->actor, play, GI_ODD_POTION, 10000.0f, 50.0f);
     }
 }
 
@@ -111,13 +104,9 @@ void EnDs_TalkAfterBrewOddPotion(EnDs* this, PlayState* play) {
         Message_CloseTextbox(play);
         this->actionFunc = EnDs_GiveOddPotion;
         u32 itemId = GI_ODD_POTION;
-        if (IS_RANDO) {
-            GetItemEntry itemEntry = Randomizer_GetItemFromKnownCheck(RC_KAK_TRADE_ODD_MUSHROOM, GI_ODD_POTION);
-            GiveItemEntryFromActor(&this->actor, play, itemEntry, 10000.0f, 50.0f);
-            Randomizer_ConsumeAdultTradeItem(play, ITEM_ODD_MUSHROOM);
-            return;
+        if (GameInteractor_Should(GI_VB_TRADE_ODD_MUSHROOM, true, this)) {
+            func_8002F434(&this->actor, play, itemId, 10000.0f, 50.0f);
         }
-        func_8002F434(&this->actor, play, itemId, 10000.0f, 50.0f);
     }
 }
 
@@ -138,7 +127,7 @@ void EnDs_BrewOddPotion2(EnDs* this, PlayState* play) {
         this->brewTimer -= 1;
     } else {
         this->actionFunc = EnDs_BrewOddPotion3;
-        this->brewTimer = IS_RANDO ? 0 : 60;
+        this->brewTimer = GameInteractor_Should(GI_VB_PLAY_EYEDROP_CREATION_ANIM, true, this) ? 60 : 0;
         Flags_UnsetSwitch(play, 0x3F);
     }
 }
@@ -148,7 +137,7 @@ void EnDs_BrewOddPotion1(EnDs* this, PlayState* play) {
         this->brewTimer -= 1;
     } else {
         this->actionFunc = EnDs_BrewOddPotion2;
-        this->brewTimer = IS_RANDO ? 0 : 20;
+        this->brewTimer = GameInteractor_Should(GI_VB_PLAY_EYEDROP_CREATION_ANIM, true, this) ? 20 : 0;
     }
 
     Math_StepToF(&this->unk_1E4, 1.0f, 0.01f);
@@ -162,7 +151,7 @@ void EnDs_OfferOddPotion(EnDs* this, PlayState* play) {
         switch (play->msgCtx.choiceIndex) {
             case 0: // yes
                 this->actionFunc = EnDs_BrewOddPotion1;
-                this->brewTimer = IS_RANDO ? 0 : 60;
+                this->brewTimer = GameInteractor_Should(GI_VB_PLAY_EYEDROP_CREATION_ANIM, true, this) ? 60 : 0;
                 Flags_SetSwitch(play, 0x3F);
                 play->msgCtx.msgMode = MSGMODE_PAUSED;
                 player->exchangeItemId = EXCH_ITEM_NONE;
@@ -174,22 +163,10 @@ void EnDs_OfferOddPotion(EnDs* this, PlayState* play) {
     }
 }
 
-u8 EnDs_RandoCanGetGrannyItem() {
-    return IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_MERCHANTS) != RO_SHUFFLE_MERCHANTS_OFF &&
-           !Flags_GetRandomizerInf(RAND_INF_MERCHANTS_GRANNYS_SHOP) &&
-           // Traded odd mushroom when adult trade is on
-           ((Randomizer_GetSettingValue(RSK_SHUFFLE_ADULT_TRADE) && Flags_GetItemGetInf(ITEMGETINF_30)) ||
-            // Found claim check when adult trade is off
-            (!Randomizer_GetSettingValue(RSK_SHUFFLE_ADULT_TRADE) &&
-             INV_CONTENT(ITEM_CLAIM_CHECK) == ITEM_CLAIM_CHECK));
-}
-
 s32 EnDs_CheckRupeesAndBottle() {
     if (gSaveContext.rupees < 100) {
         return 0;
-    } else if (EnDs_RandoCanGetGrannyItem()) { // Allow buying the rando item regardless of having a bottle
-        return 2;
-    } else if (Inventory_HasEmptyBottle() == 0) {
+    } else if (GameInteractor_Should(GI_VB_NEED_BOTTLE_FOR_GRANNYS_ITEM, Inventory_HasEmptyBottle() == 0, NULL)) {
         return 1;
     } else {
         return 2;
@@ -197,20 +174,11 @@ s32 EnDs_CheckRupeesAndBottle() {
 }
 
 void EnDs_GiveBluePotion(EnDs* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play)) {
-        if (EnDs_RandoCanGetGrannyItem()) {
-            Flags_SetRandomizerInf(RAND_INF_MERCHANTS_GRANNYS_SHOP);
-        }
-
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_GRANNYS_SHOP, true, this)) {
         this->actor.parent = NULL;
         this->actionFunc = EnDs_Talk;
     } else {
-        if (EnDs_RandoCanGetGrannyItem()) {
-            GetItemEntry entry = Randomizer_GetItemFromKnownCheck(RC_KAK_GRANNYS_SHOP, GI_POTION_BLUE);
-            GiveItemEntryFromActor(&this->actor, play, entry, 10000.0f, 50.0f);
-        } else {
-            func_8002F434(&this->actor, play, GI_POTION_BLUE, 10000.0f, 50.0f);
-        }
+        func_8002F434(&this->actor, play, GI_POTION_BLUE, 10000.0f, 50.0f);
     }
 }
 
@@ -229,18 +197,14 @@ void EnDs_OfferBluePotion(EnDs* this, PlayState* play) {
                     case 2: // have 100 rupees and empty bottle
                         Rupees_ChangeBy(-100);
                         this->actor.flags &= ~ACTOR_FLAG_WILL_TALK;
-                        GetItemEntry itemEntry;
 
-                        if (EnDs_RandoCanGetGrannyItem()) {
-                            itemEntry = Randomizer_GetItemFromKnownCheck(RC_KAK_GRANNYS_SHOP, GI_POTION_BLUE);
-                            GiveItemEntryFromActor(&this->actor, play, itemEntry, 10000.0f, 50.0f);
-                        } else {
-                            itemEntry = ItemTable_Retrieve(GI_POTION_BLUE);
+                        if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_GRANNYS_SHOP, true, this)) {
+                            GetItemEntry itemEntry = ItemTable_Retrieve(GI_POTION_BLUE);
                             func_8002F434(&this->actor, play, GI_POTION_BLUE, 10000.0f, 50.0f);
+                            gSaveContext.pendingSale = itemEntry.itemId;
+                            gSaveContext.pendingSaleMod = itemEntry.modIndex;
                         }
 
-                        gSaveContext.pendingSale = itemEntry.itemId;
-                        gSaveContext.pendingSaleMod = itemEntry.modIndex;
                         this->actionFunc = EnDs_GiveBluePotion;
                         return;
                 }
@@ -261,10 +225,7 @@ void EnDs_Wait(EnDs* this, PlayState* play) {
             Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
             player->actor.textId = 0x504A;
             this->actionFunc = EnDs_OfferOddPotion;
-        } else if (
-            // Always offer blue potion when adult trade is off
-            (IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_ADULT_TRADE) == RO_GENERIC_OFF) ||
-            Flags_GetItemGetInf(ITEMGETINF_30)) { // Traded odd mushroom
+        } else if (GameInteractor_Should(GI_VB_OFFER_BLUE_POTION, Flags_GetItemGetInf(ITEMGETINF_30), this)) { // Traded odd mushroom
             player->actor.textId = 0x500C;
             this->actionFunc = EnDs_OfferBluePotion;
         } else {
diff --git a/soh/src/overlays/actors/ovl_En_Du/z_en_du.c b/soh/src/overlays/actors/ovl_En_Du/z_en_du.c
index db13ecc54..6f99f070f 100644
--- a/soh/src/overlays/actors/ovl_En_Du/z_en_du.c
+++ b/soh/src/overlays/actors/ovl_En_Du/z_en_du.c
@@ -1,6 +1,7 @@
 #include "z_en_du.h"
 #include "objects/object_du/object_du.h"
 #include "scenes/overworld/spot18/spot18_scene.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_NO_FREEZE_OCARINA)
 
@@ -376,7 +377,7 @@ void func_809FE4A4(EnDu* this, PlayState* play) {
         play->msgCtx.ocarinaMode = OCARINA_MODE_00;
         EnDu_SetupAction(this, func_809FE3C0);
     } else if (play->msgCtx.ocarinaMode >= OCARINA_MODE_06) {
-        if (!IS_RANDO) {
+        if (GameInteractor_Should(GI_VB_PLAY_DARUNIAS_JOY_CS, true, NULL)) {
             play->csCtx.segment = SEGMENTED_TO_VIRTUAL(gGoronCityDaruniaWrongCs);
             gSaveContext.cutsceneTrigger = 1;
         }
@@ -385,7 +386,7 @@ void func_809FE4A4(EnDu* this, PlayState* play) {
         play->msgCtx.ocarinaMode = OCARINA_MODE_04;
     } else if (play->msgCtx.ocarinaMode == OCARINA_MODE_03) {
         Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
-        if (!IS_RANDO) {
+        if (GameInteractor_Should(GI_VB_PLAY_DARUNIAS_JOY_CS, true, NULL)) {
             play->csCtx.segment = SEGMENTED_TO_VIRTUAL(gGoronCityDaruniaCorrectCs);
             gSaveContext.cutsceneTrigger = 1;
         }
@@ -474,10 +475,7 @@ void func_809FE890(EnDu* this, PlayState* play) {
     Vec3f velocity = { 0.0f, 0.0f, 0.0f };
     CsCmdActorAction* csAction;
 
-    if (play->csCtx.state == CS_STATE_IDLE || IS_RANDO) {
-        if (IS_RANDO) {
-            play->csCtx.state = CS_STATE_IDLE;
-        }
+    if (play->csCtx.state == CS_STATE_IDLE) {
         func_8002DF54(play, &this->actor, 1);
         EnDu_SetupAction(this, func_809FEB08);
         return;
@@ -556,11 +554,8 @@ void func_809FEB08(EnDu* this, PlayState* play) {
         EnDu_SetupAction(this, func_809FE3C0);
         return;
     }
-    if ((!IS_RANDO && CUR_UPG_VALUE(UPG_STRENGTH) <= 0) ||
-         (IS_RANDO && !Flags_GetTreasure(play, 0x1E))) {
-        if (IS_RANDO) {
-            Flags_SetTreasure(play, 0x1E);
-        }
+    if (GameInteractor_Should(GI_VB_BE_ELIGIBLE_FOR_DARUNIAS_JOY_REWARD, CUR_UPG_VALUE(UPG_STRENGTH) <= 0, NULL)) {
+        Flags_SetRandomizerInf(RAND_INF_DARUNIAS_JOY);
         this->actor.textId = 0x301C;
         EnDu_SetupAction(this, func_809FEC14);
     } else {
@@ -581,17 +576,13 @@ void func_809FEC14(EnDu* this, PlayState* play) {
 }
 
 void func_809FEC70(EnDu* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_STRENGTH_1, true, NULL)) {
         this->actor.parent = NULL;
         EnDu_SetupAction(this, func_809FECE4);
     } else {
         f32 xzRange = this->actor.xzDistToPlayer + 1.0f;
-        if (!IS_RANDO) {
-            func_8002F434(&this->actor, play, GI_BRACELET, xzRange, fabsf(this->actor.yDistToPlayer) + 1.0f);
-        } else {
-            GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_GC_DARUNIAS_JOY, GI_BRACELET);
-            GiveItemEntryFromActor(&this->actor, play, getItemEntry, xzRange, fabsf(this->actor.yDistToPlayer) + 1.0f);
-        }
+
+        func_8002F434(&this->actor, play, GI_BRACELET, xzRange, fabsf(this->actor.yDistToPlayer) + 1.0f);
     }
 }
 
diff --git a/soh/src/overlays/actors/ovl_En_Fr/z_en_fr.c b/soh/src/overlays/actors/ovl_En_Fr/z_en_fr.c
index 11a7eb026..1c16a0eb0 100644
--- a/soh/src/overlays/actors/ovl_En_Fr/z_en_fr.c
+++ b/soh/src/overlays/actors/ovl_En_Fr/z_en_fr.c
@@ -45,7 +45,6 @@ void EnFr_OcarinaMistake(EnFr* this, PlayState* play);
 void EnFr_SetupReward(EnFr* this, PlayState* play, u8 unkCondition);
 void EnFr_PrintTextBox(EnFr* this, PlayState* play);
 void EnFr_TalkBeforeReward(EnFr* this, PlayState* play);
-RandomizerCheck EnFr_RandomizerCheckFromSongIndex(u16 songIndex);
 void EnFr_SetReward(EnFr* this, PlayState* play);
 
 // Deactivate
@@ -618,7 +617,6 @@ void EnFr_Idle(EnFr* this, PlayState* play) {
         player->actor.world.pos.z = this->actor.world.pos.z; // z = -1220.0f
         player->currentYaw = player->actor.world.rot.y = player->actor.shape.rot.y = this->actor.world.rot.y;
         this->reward = GI_NONE;
-        this->getItemEntry = (GetItemEntry)GET_ITEM_NONE;
         this->actionFunc = EnFr_Activate;
     } else if (EnFr_IsAboveAndWithin30DistXZ(player, this)) {
         player->unk_6A8 = &this->actor;
@@ -854,7 +852,6 @@ s32 EnFr_IsFrogSongComplete(EnFr* this, PlayState* play) {
 void EnFr_OcarinaMistake(EnFr* this, PlayState* play) {
     Message_CloseTextbox(play);
     this->reward = GI_NONE;
-    this->getItemEntry = (GetItemEntry)GET_ITEM_NONE;
     func_80078884(NA_SE_SY_OCARINA_ERROR);
     Audio_OcaSetInstrument(0);
     sEnFrPointers.flags = 12;
@@ -939,23 +936,6 @@ void EnFr_TalkBeforeReward(EnFr* this, PlayState* play) {
     }
 }
 
-RandomizerCheck EnFr_RandomizerCheckFromSongIndex(u16 songIndex) {
-    switch (songIndex) {
-        case FROG_ZL:
-            return RC_ZR_FROGS_ZELDAS_LULLABY;
-        case FROG_EPONA:
-            return RC_ZR_FROGS_EPONAS_SONG;
-        case FROG_SARIA:
-            return RC_ZR_FROGS_SARIAS_SONG;
-        case FROG_SUNS:
-            return RC_ZR_FROGS_SUNS_SONG;
-        case FROG_SOT:
-            return RC_ZR_FROGS_SONG_OF_TIME;
-        default:
-            return RC_UNKNOWN_CHECK;
-    }
-}
-
 void EnFr_SetReward(EnFr* this, PlayState* play) {
     u16 songIndex;
 
@@ -963,16 +943,12 @@ void EnFr_SetReward(EnFr* this, PlayState* play) {
     songIndex = this->songIndex;
     this->actionFunc = EnFr_Deactivate;
     this->reward = GI_NONE;
-    this->getItemEntry = (GetItemEntry)GET_ITEM_NONE;
     if ((songIndex >= FROG_ZL) && (songIndex <= FROG_SOT)) {
         if (!(gSaveContext.eventChkInf[13] & sSongIndex[songIndex])) {
             gSaveContext.eventChkInf[13] |= sSongIndex[songIndex];
             GameInteractor_ExecuteOnFlagSet(FLAG_EVENT_CHECK_INF, (EVENTCHKINF_SONGS_FOR_FROGS_INDEX << 4) + sSongIndexShift[songIndex]);
-            if (!IS_RANDO) {
+            if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_FROGS, true, this)) {
                 this->reward = GI_RUPEE_PURPLE;
-            } else {
-                this->getItemEntry = Randomizer_GetItemFromKnownCheck(EnFr_RandomizerCheckFromSongIndex(songIndex), GI_RUPEE_PURPLE);
-                this->reward = this->getItemEntry.getItemId;
             }
         } else {
             this->reward = GI_RUPEE_BLUE;
@@ -981,11 +957,8 @@ void EnFr_SetReward(EnFr* this, PlayState* play) {
         if (!(gSaveContext.eventChkInf[13] & sSongIndex[songIndex])) {
             gSaveContext.eventChkInf[13] |= sSongIndex[songIndex];
             GameInteractor_ExecuteOnFlagSet(FLAG_EVENT_CHECK_INF, (EVENTCHKINF_SONGS_FOR_FROGS_INDEX << 4) + sSongIndexShift[songIndex]);
-            if (!IS_RANDO) {
+            if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_FROGS, true, this)) {
                 this->reward = GI_HEART_PIECE;
-            } else {
-                this->getItemEntry = Randomizer_GetItemFromKnownCheck(RC_ZR_FROGS_IN_THE_RAIN, GI_HEART_PIECE);
-                this->reward = this->getItemEntry.getItemId;
             }
         } else {
             this->reward = GI_RUPEE_BLUE;
@@ -994,11 +967,8 @@ void EnFr_SetReward(EnFr* this, PlayState* play) {
         if (!(gSaveContext.eventChkInf[13] & sSongIndex[songIndex])) {
             gSaveContext.eventChkInf[13] |= sSongIndex[songIndex];
             GameInteractor_ExecuteOnFlagSet(FLAG_EVENT_CHECK_INF, (EVENTCHKINF_SONGS_FOR_FROGS_INDEX << 4) + sSongIndexShift[songIndex]);
-            if (!IS_RANDO) {
+            if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_FROGS, true, this)) {
                 this->reward = GI_HEART_PIECE;
-            } else {
-                this->getItemEntry = Randomizer_GetItemFromKnownCheck(RC_ZR_FROGS_OCARINA_GAME, GI_HEART_PIECE);
-                this->reward = this->getItemEntry.getItemId;
             }
         } else {
             this->reward = GI_RUPEE_PURPLE;
@@ -1049,29 +1019,23 @@ void EnFr_Deactivate(EnFr* this, PlayState* play) {
         this->actionFunc = EnFr_Idle;
     } else {
         this->actionFunc = EnFr_GiveReward;
-        if (!IS_RANDO || this->getItemEntry.getItemId == GI_NONE) {
+        if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_FROGS, true, this)) {
             func_8002F434(&this->actor, play, this->reward, 30.0f, 100.0f);
-        } else {
-            GiveItemEntryFromActor(&this->actor, play, this->getItemEntry, 30.0f, 100.0f);
         }
     }
 }
 
 void EnFr_GiveReward(EnFr* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_FROGS, true, this)) {
         this->actor.parent = NULL;
         this->actionFunc = EnFr_SetIdle;
     } else {
-        if (!IS_RANDO || this->getItemEntry.getItemId == GI_NONE) {
-            func_8002F434(&this->actor, play, this->reward, 30.0f, 100.0f);
-        } else {
-            GiveItemEntryFromActor(&this->actor, play, this->getItemEntry, 30.0f, 100.0f);
-        }
+        func_8002F434(&this->actor, play, this->reward, 30.0f, 100.0f);
     }
 }
 
 void EnFr_SetIdle(EnFr* this, PlayState* play) {
-    if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play) || (IS_RANDO && this->reward == RG_ICE_TRAP)) {
+    if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) {
         this->actionFunc = EnFr_Idle;
     }
 }
diff --git a/soh/src/overlays/actors/ovl_En_Fr/z_en_fr.h b/soh/src/overlays/actors/ovl_En_Fr/z_en_fr.h
index 19d612fdd..17b8b162e 100644
--- a/soh/src/overlays/actors/ovl_En_Fr/z_en_fr.h
+++ b/soh/src/overlays/actors/ovl_En_Fr/z_en_fr.h
@@ -73,7 +73,6 @@ typedef struct EnFr {
     /* 0x03AA */ s16 xyAngleButterfly; // Butterfly Travels along random angles in the x-y plane
     /* 0x03AC */ Vec3f posButterfly; // Position/Coordinates of the Butterfly
     /* 0x03B8 */ Vec3f posButterflyLight; // Used in Lights_PointNoGlowSetInfo()
-    /*        */ GetItemEntry getItemEntry;
 } EnFr; // size = 0x03C4
 
 typedef struct {
@@ -81,4 +80,7 @@ typedef struct {
     EnFr* frogs[5];
 } EnFrPointers;
 
+void EnFr_Idle(EnFr* enFr, PlayState* play);
+void EnFr_GiveReward(EnFr* enFr, PlayState* play);
+
 #endif
diff --git a/soh/src/overlays/actors/ovl_En_Gm/z_en_gm.c b/soh/src/overlays/actors/ovl_En_Gm/z_en_gm.c
index 4986f24f6..22754a87a 100644
--- a/soh/src/overlays/actors/ovl_En_Gm/z_en_gm.c
+++ b/soh/src/overlays/actors/ovl_En_Gm/z_en_gm.c
@@ -8,6 +8,7 @@
 #include "objects/object_oF1d_map/object_oF1d_map.h"
 #include "objects/object_gm/object_gm.h"
 #include "vt.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include <assert.h>
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_WHILE_CULLED)
@@ -96,10 +97,9 @@ void EnGm_Destroy(Actor* thisx, PlayState* play) {
 s32 func_80A3D7C8(void) {
     if (LINK_AGE_IN_YEARS == YEARS_CHILD) {
         return 0;
-    } else if ((IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_MERCHANTS) != RO_SHUFFLE_MERCHANTS_OFF) &&
-               !Flags_GetRandomizerInf(RAND_INF_MERCHANTS_MEDIGORON)) {
-        return 1;
-    } else if (!CHECK_OWNED_EQUIP_ALT(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_BIGGORON)) { // Don't have giant's knife
+    } else if (GameInteractor_Should(GI_VB_BE_ELIGIBLE_FOR_GIANTS_KNIFE_PURCHASE, (
+        !CHECK_OWNED_EQUIP_ALT(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_BIGGORON) // Don't have giant's knife
+    ), NULL)) {
         return 1;
     } else if (CHECK_OWNED_EQUIP_ALT(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_BROKENGIANTKNIFE)) { // Have broken giant's knife
         return 2;
@@ -215,11 +215,6 @@ void func_80A3DC44(EnGm* this, PlayState* play) {
                 return;
             case 1:
                 Flags_SetInfTable(INFTABLE_B1);
-                if (IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_MERCHANTS) != RO_SHUFFLE_MERCHANTS_OFF &&
-                    !Flags_GetRandomizerInf(RAND_INF_MERCHANTS_MEDIGORON)) {
-                        //Resets "Talked to Medigoron" flag in infTable to restore initial conversation state
-                        Flags_UnsetInfTable(INFTABLE_B1);
-                    }
             case 2:
                 this->actionFunc = EnGm_ProcessChoiceIndex;
             default:
@@ -254,20 +249,10 @@ void EnGm_ProcessChoiceIndex(EnGm* this, PlayState* play) {
                     Message_ContinueTextbox(play, 0xC8);
                     this->actionFunc = func_80A3DD7C;
                 } else {
-                    GetItemEntry itemEntry;
-
-                    if (IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_MERCHANTS) != RO_SHUFFLE_MERCHANTS_OFF &&
-                        !Flags_GetRandomizerInf(RAND_INF_MERCHANTS_MEDIGORON)) {
-                        itemEntry = Randomizer_GetItemFromKnownCheck(RC_GC_MEDIGORON, GI_SWORD_KNIFE);
-                        GiveItemEntryFromActor(&this->actor, play, itemEntry, 415.0f, 10.0f);
-                        Flags_SetInfTable(INFTABLE_B1);
-                    } else {
-                        itemEntry = ItemTable_Retrieve(GI_SWORD_KNIFE);
+                    if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_MEDIGORON, true, this)) {
                         func_8002F434(&this->actor, play, GI_SWORD_KNIFE, 415.0f, 10.0f);
                     }
 
-                    gSaveContext.pendingSale = itemEntry.itemId;
-                    gSaveContext.pendingSaleMod = itemEntry.modIndex;
                     this->actionFunc = func_80A3DF00;
                 }
                 break;
@@ -280,24 +265,12 @@ void EnGm_ProcessChoiceIndex(EnGm* this, PlayState* play) {
 }
 
 void func_80A3DF00(EnGm* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play)) {
-        if (IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_MERCHANTS) != RO_SHUFFLE_MERCHANTS_OFF &&
-            !Flags_GetRandomizerInf(RAND_INF_MERCHANTS_MEDIGORON)) {
-            Flags_SetRandomizerInf(RAND_INF_MERCHANTS_MEDIGORON);
-        }
-
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_MEDIGORON, true, this)) {
+        Flags_SetRandomizerInf(RAND_INF_MERCHANTS_MEDIGORON);
         this->actor.parent = NULL;
         this->actionFunc = func_80A3DF60;
     } else {
-        if (IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_MERCHANTS) != RO_SHUFFLE_MERCHANTS_OFF &&
-            !Flags_GetRandomizerInf(RAND_INF_MERCHANTS_MEDIGORON)) {
-            GetItemEntry itemEntry = Randomizer_GetItemFromKnownCheck(RC_GC_MEDIGORON, GI_SWORD_KNIFE);
-            GiveItemEntryFromActor(&this->actor, play, itemEntry, 415.0f, 10.0f);
-            Flags_SetInfTable(INFTABLE_B1);
-        }
-        else {
-            func_8002F434(&this->actor, play, GI_SWORD_KNIFE, 415.0f, 10.0f);
-        }
+        func_8002F434(&this->actor, play, GI_SWORD_KNIFE, 415.0f, 10.0f);
     }
 }
 
diff --git a/soh/src/overlays/actors/ovl_En_Go/z_en_go.c b/soh/src/overlays/actors/ovl_En_Go/z_en_go.c
index 3094f2171..7dc67f427 100644
--- a/soh/src/overlays/actors/ovl_En_Go/z_en_go.c
+++ b/soh/src/overlays/actors/ovl_En_Go/z_en_go.c
@@ -3,7 +3,6 @@
 #include "objects/gameplay_keep/gameplay_keep.h"
 #include "objects/object_oF1d_map/object_oF1d_map.h"
 #include "soh/frame_interpolation.h"
-#include "soh/Enhancements/randomizer/adult_trade_shuffle.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_WHILE_CULLED | ACTOR_FLAG_DRAW_WHILE_CULLED)
 
@@ -31,9 +30,11 @@ void func_80A40C78(EnGo* this, PlayState* play);
 void EnGo_Eyedrops(EnGo* this, PlayState* play);
 void func_80A40DCC(EnGo* this, PlayState* play);
 
-void EnGo_AddDust(EnGo* this, Vec3f* pos, Vec3f* velocity, Vec3f* accel, u8 initialTimer, f32 scale, f32 scaleStep);
-void EnGo_UpdateDust(EnGo* this);
-void EnGo_DrawDust(EnGo* this, PlayState* play);
+
+void EnGo_SpawnEffectDust(EnGo* this, Vec3f* pos, Vec3f* velocity, Vec3f* accel, u8 initialTimer, f32 scale,
+                          f32 scaleStep);
+void EnGo_UpdateEffects(EnGo* this);
+void EnGo_DrawEffects(EnGo* this, PlayState* play);
 
 const ActorInit En_Go_InitVars = {
     ACTOR_EN_GO,
@@ -95,10 +96,10 @@ u16 EnGo_GetTextID(PlayState* play, Actor* thisx) {
 
     switch (thisx->params & 0xF0) {
         case 0x90:
-            if (!IS_RANDO && gSaveContext.bgsFlag) {
+            if (gSaveContext.bgsFlag) {
                 return 0x305E;
             } else if (INV_CONTENT(ITEM_TRADE_ADULT) >= ITEM_CLAIM_CHECK) {
-                if (Environment_GetBgsDayCount() >= CVarGetInteger("gForgeTime", 3)) {
+                if (Environment_GetBgsDayCount() >= 3) {
                     return 0x305E;
                 } else {
                     return 0x305D;
@@ -113,8 +114,7 @@ u16 EnGo_GetTextID(PlayState* play, Actor* thisx) {
                 return 0x3053;
             }
         case 0x00:
-            if ((!IS_RANDO && CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)) ||
-                (IS_RANDO && Flags_GetRandomizerInf(RAND_INF_DUNGEONS_DONE_FIRE_TEMPLE))) {
+            if (CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)) {
                 if (Flags_GetInfTable(INFTABLE_10F)) {
                     return 0x3042;
                 } else {
@@ -199,7 +199,7 @@ u16 EnGo_GetTextID(PlayState* play, Actor* thisx) {
 }
 
 s16 EnGo_UpdateTalkState(PlayState* play, Actor* thisx) {
-    s16 unkState = NPC_TALK_STATE_TALKING;
+    s16 talkState = NPC_TALK_STATE_TALKING;
     f32 xzRange;
     f32 yRange = fabsf(thisx->yDistToPlayer) + 1.0f;
 
@@ -210,51 +210,51 @@ s16 EnGo_UpdateTalkState(PlayState* play, Actor* thisx) {
             switch (thisx->textId) {
                 case 0x3008:
                     Flags_SetInfTable(INFTABLE_E0);
-                    unkState = NPC_TALK_STATE_IDLE;
+                    talkState = NPC_TALK_STATE_IDLE;
                     break;
                 case 0x300B:
                     Flags_SetInfTable(INFTABLE_EB);
-                    unkState = NPC_TALK_STATE_IDLE;
+                    talkState = NPC_TALK_STATE_IDLE;
                     break;
                 case 0x3014:
                     Flags_SetInfTable(INFTABLE_F0);
-                    unkState = NPC_TALK_STATE_IDLE;
+                    talkState = NPC_TALK_STATE_IDLE;
                     break;
                 case 0x3016:
                     Flags_SetInfTable(INFTABLE_F4);
-                    unkState = NPC_TALK_STATE_IDLE;
+                    talkState = NPC_TALK_STATE_IDLE;
                     break;
                 case 0x3018:
                     Flags_SetInfTable(INFTABLE_F8);
-                    unkState = NPC_TALK_STATE_IDLE;
+                    talkState = NPC_TALK_STATE_IDLE;
                     break;
                 case 0x3036:
                     func_8002F434(thisx, play, GI_TUNIC_GORON, xzRange, yRange);
                     Flags_SetInfTable(INFTABLE_10D); // EnGo exclusive flag
-                    unkState = NPC_TALK_STATE_ACTION;
+                    talkState = NPC_TALK_STATE_ACTION;
                     break;
                 case 0x3037:
                     Flags_SetInfTable(INFTABLE_SPOKE_TO_GORON_LINK);
-                    unkState = NPC_TALK_STATE_IDLE;
+                    talkState = NPC_TALK_STATE_IDLE;
                     break;
                 case 0x3041:
                     Flags_SetInfTable(INFTABLE_10F);
-                    unkState = NPC_TALK_STATE_IDLE;
+                    talkState = NPC_TALK_STATE_IDLE;
                     break;
                 case 0x3059:
-                    unkState = NPC_TALK_STATE_ACTION;
+                    talkState = NPC_TALK_STATE_ACTION;
                     break;
                 case 0x3052:
                 case 0x3054:
                 case 0x3055:
                 case 0x305A:
-                    unkState = NPC_TALK_STATE_ACTION;
+                    talkState = NPC_TALK_STATE_ACTION;
                     break;
                 case 0x305E:
-                    unkState = NPC_TALK_STATE_ACTION;
+                    talkState = NPC_TALK_STATE_ACTION;
                     break;
                 default:
-                    unkState = NPC_TALK_STATE_IDLE;
+                    talkState = NPC_TALK_STATE_IDLE;
                     break;
             }
             break;
@@ -272,7 +272,7 @@ s16 EnGo_UpdateTalkState(PlayState* play, Actor* thisx) {
                             thisx->textId = 0x300D;
                         }
                         Message_ContinueTextbox(play, thisx->textId);
-                        unkState = NPC_TALK_STATE_TALKING;
+                        talkState = NPC_TALK_STATE_TALKING;
                         break;
                     case 0x3034:
                         if (play->msgCtx.choiceIndex == 0) {
@@ -287,16 +287,16 @@ s16 EnGo_UpdateTalkState(PlayState* play, Actor* thisx) {
                             thisx->textId = 0x3033;
                         }
                         Message_ContinueTextbox(play, thisx->textId);
-                        unkState = NPC_TALK_STATE_TALKING;
+                        talkState = NPC_TALK_STATE_TALKING;
                         break;
                     case 0x3054:
                     case 0x3055:
                         if (play->msgCtx.choiceIndex == 0) {
-                            unkState = NPC_TALK_STATE_ACTION;
+                            talkState = NPC_TALK_STATE_ACTION;
                         } else {
                             thisx->textId = 0x3056;
                             Message_ContinueTextbox(play, thisx->textId);
-                            unkState = NPC_TALK_STATE_TALKING;
+                            talkState = NPC_TALK_STATE_TALKING;
                         }
                         Flags_SetInfTable(INFTABLE_B4);
                         break;
@@ -312,17 +312,17 @@ s16 EnGo_UpdateTalkState(PlayState* play, Actor* thisx) {
                     case 0x3033:
                         thisx->textId = 0x3034;
                         Message_ContinueTextbox(play, thisx->textId);
-                        unkState = NPC_TALK_STATE_TALKING;
+                        talkState = NPC_TALK_STATE_TALKING;
                         break;
                     default:
-                        unkState = NPC_TALK_STATE_ACTION;
+                        talkState = NPC_TALK_STATE_ACTION;
                         break;
                 }
             }
             break;
         case TEXT_STATE_DONE:
             if (Message_ShouldAdvance(play)) {
-                unkState = NPC_TALK_STATE_ITEM_GIVEN;
+                talkState = NPC_TALK_STATE_ITEM_GIVEN;
             }
             break;
         case TEXT_STATE_NONE:
@@ -332,21 +332,21 @@ s16 EnGo_UpdateTalkState(PlayState* play, Actor* thisx) {
         case TEXT_STATE_9:
             break;
     }
-    return unkState;
+    return talkState;
 }
 
-s32 func_80A3ED24(PlayState* play, EnGo* this, NpcInteractInfo* interactInfo, f32 arg3, NpcGetTextIdFunc getTextId,
+s32 EnGo_UpdateTalking(PlayState* play, Actor* thisx, s16* talkState, f32 interactRange, NpcGetTextIdFunc getTextId,
                   NpcUpdateTalkStateFunc updateTalkState) {
-    if (interactInfo->talkState != NPC_TALK_STATE_IDLE) {
-        interactInfo->talkState = updateTalkState(play, &this->actor);
+    if (*talkState != NPC_TALK_STATE_IDLE) {
+        *talkState = updateTalkState(play, thisx);
         return false;
-    } else if (Actor_ProcessTalkRequest(&this->actor, play)) {
-        interactInfo->talkState = NPC_TALK_STATE_TALKING;
+    } else if (Actor_ProcessTalkRequest(thisx, play)) {
+        *talkState = NPC_TALK_STATE_TALKING;
         return true;
-    } else if (!func_8002F2CC(&this->actor, play, arg3)) {
+    } else if (!func_8002F2CC(thisx, play, interactRange)) {
         return false;
     } else {
-        this->actor.textId = getTextId(play, &this->actor);
+        thisx->textId = getTextId(play, thisx);
         return false;
     }
 }
@@ -379,7 +379,7 @@ s32 EnGo_IsActorSpawned(EnGo* this, PlayState* play) {
     }
 }
 
-f32 EnGo_GetGoronSize(EnGo* this) {
+f32 EnGo_GetPlayerTrackingYOffset(EnGo* this) {
     switch (this->actor.params & 0xF0) {
         case 0x00:
             return 10.0f;
@@ -398,16 +398,16 @@ f32 EnGo_GetGoronSize(EnGo* this) {
 
 void func_80A3F060(EnGo* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
-    s16 npcTrackingMode;
+    s16 trackingMode;
 
     if (this->actionFunc != EnGo_BiggoronActionFunc && this->actionFunc != EnGo_FireGenericActionFunc &&
         this->actionFunc != func_80A40B1C) {
-        npcTrackingMode = NPC_TRACKING_NONE;
+        trackingMode = NPC_TRACKING_NONE;
     }
 
     this->interactInfo.trackPos = player->actor.world.pos;
-    this->interactInfo.yOffset = EnGo_GetGoronSize(this);
-    Npc_TrackPoint(&this->actor, &this->interactInfo, 4, npcTrackingMode);
+    this->interactInfo.yOffset = EnGo_GetPlayerTrackingYOffset(this);
+    Npc_TrackPoint(&this->actor, &this->interactInfo, 4, trackingMode);
 }
 
 void func_80A3F0E4(EnGo* this) {
@@ -421,23 +421,23 @@ void func_80A3F0E4(EnGo* this) {
 }
 
 s32 EnGo_IsCameraModified(EnGo* this, PlayState* play) {
-    f32 xyzDist;
+    f32 xyzDistSq;
     s16 yawDiff = this->actor.yawTowardsPlayer - this->actor.shape.rot.y;
-    Camera* camera = play->cameraPtrs[MAIN_CAM];
+    Camera* mainCam = play->cameraPtrs[MAIN_CAM];
 
     if (fabsf(yawDiff) > 10920.0f) {
         return 0;
     }
 
-    xyzDist = (this->actor.scale.x / 0.01f) * 10000.0f;
+    xyzDistSq = (this->actor.scale.x / 0.01f) * SQ(100.0f);
     if ((this->actor.params & 0xF0) == 0x90) {
-        Camera_ChangeSetting(camera, CAM_SET_DIRECTED_YAW);
-        xyzDist *= 4.8f;
+        Camera_ChangeSetting(mainCam, CAM_SET_DIRECTED_YAW);
+        xyzDistSq *= 4.8f;
     }
 
-    if (fabsf(this->actor.xyzDistToPlayerSq) > xyzDist) {
-        if (camera->setting == CAM_SET_DIRECTED_YAW) {
-            Camera_ChangeSetting(camera, CAM_SET_NORMAL0);
+    if (fabsf(this->actor.xyzDistToPlayerSq) > xyzDistSq) {
+        if (mainCam->setting == CAM_SET_DIRECTED_YAW) {
+            Camera_ChangeSetting(mainCam, CAM_SET_NORMAL0);
         }
         return 0;
     } else {
@@ -480,7 +480,7 @@ s32 EnGo_FollowPath(EnGo* this, PlayState* play) {
     pointPos += this->unk_218;
     xDist = pointPos->x - this->actor.world.pos.x;
     zDist = pointPos->z - this->actor.world.pos.z;
-    Math_SmoothStepToS(&this->actor.world.rot.y, (s16)(Math_FAtan2F(xDist, zDist) * ((f32)0x8000 / M_PI)), 10, 1000, 1);
+    Math_SmoothStepToS(&this->actor.world.rot.y, RADF_TO_BINANG(Math_FAtan2F(xDist, zDist)), 10, 1000, 1);
 
     if ((SQ(xDist) + SQ(zDist)) < 600.0f) {
         this->unk_218++;
@@ -536,7 +536,7 @@ s32 EnGo_SpawnDust(EnGo* this, u8 initialTimer, f32 scale, f32 scaleStep, s32 nu
         accel.z = (Rand_ZeroOne() - 0.5f) * xzAccel;
         pos.x = (Math_SinS(angle) * radius) + this->actor.world.pos.x;
         pos.z = (Math_CosS(angle) * radius) + this->actor.world.pos.z;
-        EnGo_AddDust(this, &pos, &velocity, &accel, initialTimer, scale, scaleStep);
+        EnGo_SpawnEffectDust(this, &pos, &velocity, &accel, initialTimer, scale, scaleStep);
         angle += (s16)(0x10000 / numDustEffects);
         i--;
     }
@@ -549,7 +549,7 @@ s32 EnGo_IsRollingOnGround(EnGo* this, s16 unkArg1, f32 unkArg2) {
     } else if (this->interactInfo.talkState != NPC_TALK_STATE_IDLE) {
         return true;
     } else if (DECR(this->unk_21C)) {
-        if ((this->unk_21C & 1)) {
+        if (this->unk_21C & 1) {
             this->actor.world.pos.y += 1.5f;
         } else {
             this->actor.world.pos.y -= 1.5f;
@@ -573,29 +573,29 @@ s32 EnGo_IsRollingOnGround(EnGo* this, s16 unkArg1, f32 unkArg2) {
 
 void func_80A3F908(EnGo* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
-    f32 float1;
-    s32 isUnkCondition;
+    f32 interactRange;
+    s32 dialogStarted;
 
     if (this->actionFunc == EnGo_BiggoronActionFunc || this->actionFunc == EnGo_GoronLinkRolling ||
         this->actionFunc == EnGo_FireGenericActionFunc || this->actionFunc == EnGo_Eyedrops ||
         this->actionFunc == func_80A40DCC || this->actionFunc == EnGo_GetItem || this->actionFunc == func_80A40C78 ||
         this->actionFunc == func_80A40B1C) {
 
-        float1 = (this->collider.dim.radius + 30.0f);
-        float1 *= (this->actor.scale.x / 0.01f);
+        interactRange = (this->collider.dim.radius + 30.0f);
+        interactRange *= (this->actor.scale.x / 0.01f);
         if ((this->actor.params & 0xF0) == 0x90) {
-            float1 *= 4.8f;
+            interactRange *= 4.8f;
         }
 
         if ((this->actor.params & 0xF0) == 0x90) {
-            isUnkCondition =
-                func_80A3ED24(play, this, &this->interactInfo, float1, EnGo_GetTextID, EnGo_UpdateTalkState);
+            dialogStarted =
+                EnGo_UpdateTalking(play, &this->actor, &this->interactInfo.talkState, interactRange, EnGo_GetTextID, EnGo_UpdateTalkState);
         } else {
-            isUnkCondition = Npc_UpdateTalking(play, &this->actor, &this->interactInfo.talkState, float1,
+            dialogStarted = Npc_UpdateTalking(play, &this->actor, &this->interactInfo.talkState, interactRange,
                                                EnGo_GetTextID, EnGo_UpdateTalkState);
         }
 
-        if (((this->actor.params & 0xF0) == 0x90) && (isUnkCondition == true)) {
+        if (((this->actor.params & 0xF0) == 0x90) && (dialogStarted == true)) {
             if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_SWORD_BROKEN) {
                 if (func_8002F368(play) == EXCH_ITEM_SWORD_BROKEN) {
                     if (Flags_GetInfTable(INFTABLE_B4)) {
@@ -628,7 +628,7 @@ void EnGo_Init(Actor* thisx, PlayState* play) {
     Vec3f D_80A41BA8 = { 0.0f, 0.0f, 0.0f }; // unused
 
     ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f);
-    SkelAnime_InitFlex(play, &this->skelAnime, &gGoronSkel, NULL, 0, 0, 0);
+    SkelAnime_InitFlex(play, &this->skelAnime, &gGoronSkel, NULL, NULL, NULL, 0);
     Collider_InitCylinder(play, &this->collider);
     Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit);
     CollisionCheck_SetInfo2(&this->actor.colChkInfo, DamageTable_Get(0x16), &sColChkInfoInit);
@@ -711,8 +711,8 @@ void EnGo_StopRolling(EnGo* this, PlayState* play) {
     EnBom* bomb;
 
     if (DECR(this->unk_20E) == 0) {
-        if (this->collider.base.ocFlags2 & 1) {
-            this->collider.base.ocFlags2 &= ~1;
+        if (this->collider.base.ocFlags2 & OC2_HIT_PLAYER) {
+            this->collider.base.ocFlags2 &= ~OC2_HIT_PLAYER;
             play->damagePlayer(play, -4);
             func_8002F71C(play, &this->actor, 4.0f, this->actor.yawTowardsPlayer, 6.0f);
             this->unk_20E = 0x10;
@@ -859,7 +859,7 @@ void func_80A405CC(EnGo* this, PlayState* play) {
 
 void EnGo_BiggoronActionFunc(EnGo* this, PlayState* play) {
     if (((this->actor.params & 0xF0) == 0x90) && (this->interactInfo.talkState == NPC_TALK_STATE_ACTION)) {
-        if (!IS_RANDO && gSaveContext.bgsFlag) {
+        if (gSaveContext.bgsFlag) {
             this->interactInfo.talkState = NPC_TALK_STATE_IDLE;
         } else {
             if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_EYEDROPS) {
@@ -958,45 +958,25 @@ void EnGo_GetItem(EnGo* this, PlayState* play) {
         this->unk_20C = 0;
         if ((this->actor.params & 0xF0) == 0x90) {
             if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_CLAIM_CHECK) {
-                if (!IS_RANDO) {
-                    getItemId = GI_SWORD_BGS;
-                } else {
-                    getItemEntry = Randomizer_GetItemFromKnownCheck(RC_DMT_TRADE_CLAIM_CHECK, GI_SWORD_BGS);
-                    getItemId = getItemEntry.getItemId;
-                }
+                getItemId = GI_SWORD_BGS;
                 this->unk_20C = 1;
             }
             if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_EYEDROPS) {
-                if (IS_RANDO) {
-                    getItemEntry = Randomizer_GetItemFromKnownCheck(RC_DMT_TRADE_EYEDROPS, GI_CLAIM_CHECK);
-                    getItemId = getItemEntry.getItemId;
-                    Randomizer_ConsumeAdultTradeItem(play, ITEM_EYEDROPS);
-                } else {
-                    getItemId = GI_CLAIM_CHECK;
-                }
+                getItemId = GI_CLAIM_CHECK;
             }
             if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_SWORD_BROKEN) {
-                if (IS_RANDO) {
-                    getItemEntry = Randomizer_GetItemFromKnownCheck(RC_DMT_TRADE_BROKEN_SWORD, GI_PRESCRIPTION);
-                    Randomizer_ConsumeAdultTradeItem(play, ITEM_SWORD_BROKEN);
-                    getItemId = getItemEntry.getItemId;
-                } else {
-                    getItemId = GI_PRESCRIPTION;
-                }
+                getItemId = GI_PRESCRIPTION;
             }
         }
 
         if ((this->actor.params & 0xF0) == 0) {
             getItemId = GI_TUNIC_GORON;
+            Flags_SetRandomizerInf(RAND_INF_ROLLING_GORON_AS_ADULT);
         }
 
         yDist = fabsf(this->actor.yDistToPlayer) + 1.0f;
         xzDist = this->actor.xzDistToPlayer + 1.0f;
-        if (!IS_RANDO || getItemEntry.getItemId == GI_NONE) {
-            func_8002F434(&this->actor, play, getItemId, xzDist, yDist);
-        } else {
-            GiveItemEntryFromActor(&this->actor, play, getItemEntry, xzDist, yDist);
-        }
+        func_8002F434(&this->actor, play, getItemId, xzDist, yDist);
     }
 }
 
@@ -1105,32 +1085,30 @@ void EnGo_DrawRolling(EnGo* this, PlayState* play) {
 
 s32 EnGo_OverrideLimbDraw(PlayState* play, s32 limb, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     EnGo* this = (EnGo*)thisx;
-    Vec3s vec1;
+    Vec3s limbRot;
     f32 float1;
 
     if (limb == 17) {
         Matrix_Translate(2800.0f, 0.0f, 0.0f, MTXMODE_APPLY);
-        vec1 = this->interactInfo.headRot;
-        float1 = (vec1.y / (f32)0x8000) * M_PI;
+        limbRot = this->interactInfo.headRot;
+        float1 = (limbRot.y / (f32)0x8000) * M_PI;
         Matrix_RotateX(float1, MTXMODE_APPLY);
-        float1 = (vec1.x / (f32)0x8000) * M_PI;
+        float1 = (limbRot.x / (f32)0x8000) * M_PI;
         Matrix_RotateZ(float1, MTXMODE_APPLY);
         Matrix_Translate(-2800.0f, 0.0f, 0.0f, MTXMODE_APPLY);
     }
 
     if (limb == 10) {
-        vec1 = this->interactInfo.torsoRot;
-        float1 = (vec1.y / (f32)0x8000) * M_PI;
+        limbRot = this->interactInfo.torsoRot;
+        float1 = (limbRot.y / (f32)0x8000) * M_PI;
         Matrix_RotateY(float1, MTXMODE_APPLY);
-        float1 = (vec1.x / (f32)0x8000) * M_PI;
+        float1 = (limbRot.x / (f32)0x8000) * M_PI;
         Matrix_RotateX(float1, MTXMODE_APPLY);
     }
 
     if ((limb == 10) || (limb == 11) || (limb == 14)) {
-        float1 = Math_SinS(this->jointTable[limb]);
-        rot->y += float1 * 200.0f;
-        float1 = Math_CosS(this->morphTable[limb]);
-        rot->z += float1 * 200.0f;
+        rot->y += Math_SinS(this->jointTable[limb]) * 200.0f;
+        rot->z += Math_CosS(this->morphTable[limb]) * 200.0f;
     }
 
     return 0;
@@ -1150,9 +1128,9 @@ void EnGo_Draw(Actor* thisx, PlayState* play) {
 
     OPEN_DISPS(play->state.gfxCtx);
 
-    EnGo_UpdateDust(this);
+    EnGo_UpdateEffects(this);
     Matrix_Push();
-    EnGo_DrawDust(this, play);
+    EnGo_DrawEffects(this, play);
     Matrix_Pop();
 
     if (this->actionFunc == EnGo_CurledUp) {
@@ -1167,39 +1145,36 @@ void EnGo_Draw(Actor* thisx, PlayState* play) {
         gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(gGoronCsMouthNeutralTex));
 
         SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, EnGo_OverrideLimbDraw, EnGo_PostLimbDraw, &this->actor);
-        EnGo_DrawDust(this, play);
+        EnGo_DrawEffects(this, play);
     }
     CLOSE_DISPS(play->state.gfxCtx);
 }
 
-void EnGo_AddDust(EnGo* this, Vec3f* pos, Vec3f* velocity, Vec3f* accel, u8 initialTimer, f32 scale, f32 scaleStep) {
-    EnGoEffect* dustEffect = this->dustEffects;
+void EnGo_SpawnEffectDust(EnGo* this, Vec3f* pos, Vec3f* velocity, Vec3f* accel, u8 initialTimer, f32 scale, f32 scaleStep) {
+    EnGoEffect* dustEffect = this->effects;
     s16 i;
-    s16 timer;
 
-    for (i = 0; i < ARRAY_COUNT(this->dustEffects); i++, dustEffect++) {
+    for (i = 0; i < EN_GO_EFFECT_COUNT; i++, dustEffect++) {
         if (dustEffect->type != 1) {
             dustEffect->epoch++;
             dustEffect->scale = scale;
             dustEffect->scaleStep = scaleStep;
-            timer = initialTimer;
-            dustEffect->timer = timer;
+            dustEffect->initialTimer = dustEffect->timer = initialTimer;
             dustEffect->type = 1;
-            dustEffect->initialTimer = initialTimer;
             dustEffect->pos = *pos;
             dustEffect->accel = *accel;
             dustEffect->velocity = *velocity;
-            return;
+            break;
         }
     }
 }
 
-void EnGo_UpdateDust(EnGo* this) {
-    EnGoEffect* dustEffect = this->dustEffects;
+void EnGo_UpdateEffects(EnGo* this) {
+    EnGoEffect* dustEffect = this->effects;
     f32 randomNumber;
     s16 i;
 
-    for (i = 0; i < ARRAY_COUNT(this->dustEffects); i++, dustEffect++) {
+    for (i = 0; i < EN_GO_EFFECT_COUNT; i++, dustEffect++) {
         if (dustEffect->type) {
             dustEffect->timer--;
             if (dustEffect->timer == 0) {
@@ -1220,24 +1195,24 @@ void EnGo_UpdateDust(EnGo* this) {
     }
 }
 
-void EnGo_DrawDust(EnGo* this, PlayState* play) {
+void EnGo_DrawEffects(EnGo* this, PlayState* play) {
     static void* dustTex[] = { gDust8Tex, gDust7Tex, gDust6Tex, gDust5Tex, gDust4Tex, gDust3Tex, gDust2Tex, gDust1Tex };
-    EnGoEffect* dustEffect = this->dustEffects;
+    EnGoEffect* dustEffect = this->effects;
     s16 alpha;
-    s16 firstDone;
+    s16 materialFlag;
     s16 index;
     s16 i;
 
     OPEN_DISPS(play->state.gfxCtx);
-    firstDone = false;
+    materialFlag = false;
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-    for (i = 0; i < ARRAY_COUNT(this->dustEffects); i++, dustEffect++) {
+    for (i = 0; i < EN_GO_EFFECT_COUNT; i++, dustEffect++) {
         if (dustEffect->type) {
-            if (!firstDone) {
+            if (!materialFlag) {
                 POLY_XLU_DISP = Gfx_SetupDL(POLY_XLU_DISP, 0);
                 gSPDisplayList(POLY_XLU_DISP++, gGoronDL_00FD40);
                 gDPSetEnvColor(POLY_XLU_DISP++, 100, 60, 20, 0);
-                firstDone = true;
+                materialFlag = true;
             }
 
             FrameInterpolation_RecordOpenChild(dustEffect, dustEffect->epoch);
diff --git a/soh/src/overlays/actors/ovl_En_Go/z_en_go.h b/soh/src/overlays/actors/ovl_En_Go/z_en_go.h
index 7b3224aec..1b1320988 100644
--- a/soh/src/overlays/actors/ovl_En_Go/z_en_go.h
+++ b/soh/src/overlays/actors/ovl_En_Go/z_en_go.h
@@ -16,12 +16,13 @@ typedef s16 (*callback2_80A3ED24)(PlayState*, struct EnGo*);
 // /* 0x20 */ GORON1_DMT_DC_ENTRANCE,
 // /* 0x30 */ GORON1_DMT_ROLLING_SMALL,
 // /* 0x40 */ GORON1_DMT_BOMB_FLOWER,
-// /* 0x50 */ GORON1_CITY_ENTRANCE, 
+// /* 0x50 */ GORON1_CITY_ENTRANCE,
 // /* 0x60 */ GORON1_CITY_ISLAND,
-// /* 0x70 */ GORON1_CITY_LOST_WOODS, 
+// /* 0x70 */ GORON1_CITY_LOST_WOODS,
 // /* 0x80 */ // Not Used
 // /* 0x90 */ GORON1_DMT_BIGGORON,
 
+#define EN_GO_EFFECT_COUNT 20
 
 typedef struct {
     /* 0x0000 */ u8 type;
@@ -56,7 +57,7 @@ typedef struct EnGo {
     /* 0x021E */ s16 unk_21E;
     /* 0x0220 */ s16 jointTable[18];
     /* 0x0244 */ s16 morphTable[18];
-    /* 0x0268 */ EnGoEffect dustEffects[20];
+    /* 0x0268 */ EnGoEffect effects[EN_GO_EFFECT_COUNT];
 } EnGo; // size = 0x06C8
 
 #endif
diff --git a/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c b/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c
index a4aede2e5..86d1b488a 100644
--- a/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c
+++ b/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c
@@ -3,7 +3,7 @@
 #include "objects/gameplay_keep/gameplay_keep.h"
 #include "objects/object_oF1d_map/object_oF1d_map.h"
 #include "soh/frame_interpolation.h"
-#include "soh/Enhancements/randomizer/adult_trade_shuffle.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_WHILE_CULLED | ACTOR_FLAG_DRAW_WHILE_CULLED)
 
@@ -335,7 +335,8 @@ u16 EnGo2_GoronFireGenericGetTextId(EnGo2* this) {
 u16 EnGo2_GetTextIdGoronCityRollingBig(PlayState* play, EnGo2* this) {
     if (Flags_GetInfTable(INFTABLE_11E)) {
         return 0x3013;
-    } else if ((CUR_CAPACITY(UPG_BOMB_BAG) >= 20 || IS_RANDO) && this->waypoint > 7 && this->waypoint < 12) {
+    } else if (GameInteractor_Should(GI_VB_BE_ELIGIBLE_FOR_CHILD_ROLLING_GORON_REWARD, CUR_CAPACITY(UPG_BOMB_BAG) >= 2, this)
+        && this->waypoint > 7 && this->waypoint < 12) {
         return 0x3012;
     } else {
         return 0x3011;
@@ -350,13 +351,14 @@ s16 EnGo2_UpdateTalkStateGoronCityRollingBig(PlayState* play, EnGo2* this) {
             if (Message_ShouldAdvance(play)) {
                 if (this->actor.textId == 0x3012) {
                     this->actionFunc = EnGo2_SetupGetItem;
-                    if(!IS_RANDO) {
+                    if(GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_ROLLING_GORON_AS_CHILD, true, this)) {
                         EnGo2_GetItem(this, play, CUR_CAPACITY(UPG_BOMB_BAG) == 30 ? GI_BOMB_BAG_40 : GI_BOMB_BAG_30);
                     } else {
-                        EnGo2_GetItemEntry(this, play, Randomizer_GetItemFromKnownCheck(RC_GC_ROLLING_GORON_AS_CHILD, GI_BOMB_BAG_40));
+                        this->actionFunc = EnGo2_SetGetItem;
                     }
                     Message_CloseTextbox(play);
                     Flags_SetInfTable(INFTABLE_11E);
+                    Flags_SetRandomizerInf(RAND_INF_ROLLING_GORON_AS_CHILD);
                     return NPC_TALK_STATE_ACTION;
                 } else {
                     return NPC_TALK_STATE_ACTION;
@@ -416,11 +418,9 @@ s16 EnGo2_UpdateTalkStateGoronDmtRollingSmall(PlayState* play, EnGo2* this) {
 }
 
 u16 EnGo2_GetTextIdGoronDmtDcEntrance(PlayState* play, EnGo2* this) {
-    if (((!IS_RANDO && CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)) ||
-         (IS_RANDO && Flags_GetRandomizerInf(RAND_INF_DUNGEONS_DONE_FIRE_TEMPLE))) && LINK_IS_ADULT) {
+    if (GameInteractor_Should(GI_VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE), NULL) && LINK_IS_ADULT) {
         return 0x3043;
-    } else if ((!IS_RANDO && CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) ||
-               (IS_RANDO && Flags_GetRandomizerInf(RAND_INF_DUNGEONS_DONE_DODONGOS_CAVERN))) {
+    } else if (GameInteractor_Should(GI_VB_GORONS_CONSIDER_DODONGOS_CAVERN_FINISHED, CHECK_QUEST_ITEM(QUEST_GORON_RUBY), NULL)) {
         return 0x3027;
     } else {
         return Flags_GetEventChkInf(EVENTCHKINF_BOMBED_DODONGOS_CAVERN_ENTRANCE) ? 0x3021 : Flags_GetInfTable(INFTABLE_E0) ? 0x302A : 0x3008;
@@ -439,11 +439,9 @@ s16 EnGo2_UpdateTalkStateGoronDmtDcEntrance(PlayState* play, EnGo2* this) {
 }
 
 u16 EnGo2_GetTextIdGoronCityEntrance(PlayState* play, EnGo2* this) {
-    if (((!IS_RANDO && CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)) ||
-         (IS_RANDO && Flags_GetRandomizerInf(RAND_INF_DUNGEONS_DONE_FIRE_TEMPLE))) && LINK_IS_ADULT) {
+    if (GameInteractor_Should(GI_VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE), NULL) && LINK_IS_ADULT) {
         return 0x3043;
-    } else if ((!IS_RANDO && CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) ||
-               (IS_RANDO && Flags_GetRandomizerInf(RAND_INF_DUNGEONS_DONE_DODONGOS_CAVERN))) {
+    } else if (GameInteractor_Should(GI_VB_GORONS_CONSIDER_DODONGOS_CAVERN_FINISHED, CHECK_QUEST_ITEM(QUEST_GORON_RUBY), NULL)) {
         return 0x3027;
     } else {
         return Flags_GetInfTable(INFTABLE_F0) ? 0x3015 : 0x3014;
@@ -462,11 +460,9 @@ s16 EnGo2_UpdateTalkStateGoronCityEntrance(PlayState* play, EnGo2* this) {
 }
 
 u16 EnGo2_GetTextIdGoronCityIsland(PlayState* play, EnGo2* this) {
-    if (((!IS_RANDO && CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)) ||
-         (IS_RANDO && Flags_GetRandomizerInf(RAND_INF_DUNGEONS_DONE_FIRE_TEMPLE))) && LINK_IS_ADULT) {
+    if (GameInteractor_Should(GI_VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE), NULL) && LINK_IS_ADULT) {
         return 0x3043;
-    } else if ((!IS_RANDO && CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) ||
-               (IS_RANDO && Flags_GetRandomizerInf(RAND_INF_DUNGEONS_DONE_DODONGOS_CAVERN))) {
+    } else if (GameInteractor_Should(GI_VB_GORONS_CONSIDER_DODONGOS_CAVERN_FINISHED, CHECK_QUEST_ITEM(QUEST_GORON_RUBY), NULL)) {
         return 0x3027;
     } else {
         return Flags_GetInfTable(INFTABLE_F4) ? 0x3017 : 0x3016;
@@ -485,11 +481,9 @@ s16 EnGo2_UpdateTalkStateGoronCityIsland(PlayState* play, EnGo2* this) {
 }
 
 u16 EnGo2_GetTextIdGoronCityLowestFloor(PlayState* play, EnGo2* this) {
-    if (((!IS_RANDO && CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)) ||
-         (IS_RANDO && Flags_GetRandomizerInf(RAND_INF_DUNGEONS_DONE_FIRE_TEMPLE))) && LINK_IS_ADULT) {
+    if (GameInteractor_Should(GI_VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE), NULL) && LINK_IS_ADULT) {
         return 0x3043;
-    } else if ((!IS_RANDO && CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) ||
-               (IS_RANDO && Flags_GetRandomizerInf(RAND_INF_DUNGEONS_DONE_DODONGOS_CAVERN))) {
+    } else if (GameInteractor_Should(GI_VB_GORONS_CONSIDER_DODONGOS_CAVERN_FINISHED, CHECK_QUEST_ITEM(QUEST_GORON_RUBY), NULL)) {
         return 0x3027;
     } else {
         return CUR_UPG_VALUE(UPG_STRENGTH) != 0    ? 0x302C
@@ -511,18 +505,10 @@ s16 EnGo2_UpdateTalkStateGoronCityLowestFloor(PlayState* play, EnGo2* this) {
 }
 
 u16 EnGo2_GetTextIdGoronCityLink(PlayState* play, EnGo2* this) {
-    // For rando, prioritize opening the doors in GC when Link the goron has been stopped when
-    // the doors are not opened, otherwise let him talk about the DMC exit or that gorons are saved
-    if (IS_RANDO) {
-        if (!Flags_GetInfTable(INFTABLE_STOPPED_GORON_LINKS_ROLLING)) {
-            return 0x3030;
-        } else if (!Flags_GetInfTable(INFTABLE_GORON_CITY_DOORS_UNLOCKED)) {
-            return 0x3036;
-        } else if (Flags_GetRandomizerInf(RAND_INF_DUNGEONS_DONE_FIRE_TEMPLE)) {
-            return 0x3041;
-        } else { 
-            return Flags_GetInfTable(INFTABLE_SPOKE_TO_GORON_LINK) ? 0x3038 : 0x3037;
-        }
+    // In case a hook neglects to set the override, fall back to the first dialogue
+    u16 overrideTextId = 0x3030;
+    if (GameInteractor_Should(GI_VB_OVERRIDE_LINK_THE_GORON_DIALOGUE, false, &overrideTextId)) {
+        return overrideTextId;
     }
 
     if (CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)) {
@@ -543,20 +529,15 @@ s16 EnGo2_UpdateTalkStateGoronCityLink(PlayState* play, EnGo2* this) {
         case TEXT_STATE_CLOSING:
             switch (this->actor.textId) {
                 case 0x3036:
-                    if (!IS_RANDO) {
+                    Flags_SetRandomizerInf(RAND_INF_ROLLING_GORON_AS_ADULT);
+                    this->interactInfo.talkState = NPC_TALK_STATE_IDLE;
+                    if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_ROLLING_GORON_AS_ADULT, true, this)) {
                         EnGo2_GetItem(this, play, GI_TUNIC_GORON);
                         this->actionFunc = EnGo2_SetupGetItem;
                         return NPC_TALK_STATE_ACTION;
                     } else {
-                        if (Flags_GetTreasure(play, 0x1F)) {
-                            return NPC_TALK_STATE_IDLE;
-                        }
-
-                        Flags_SetInfTable(INFTABLE_GORON_CITY_DOORS_UNLOCKED);
-                        EnGo2_GetItemEntry(this, play, Randomizer_GetItemFromKnownCheck(RC_GC_ROLLING_GORON_AS_ADULT, GI_TUNIC_GORON));
-                        this->actionFunc = EnGo2_SetupGetItem;
-                        Flags_SetTreasure(play, 0x1F);
-                        return NPC_TALK_STATE_ACTION;
+                        this->actionFunc = EnGo2_SetGetItem;
+                        return this->interactInfo.talkState;
                     }
                 case 0x3037:
                     Flags_SetInfTable(INFTABLE_SPOKE_TO_GORON_LINK);
@@ -605,7 +586,7 @@ s16 EnGo2_UpdateTalkStateGoronCityLink(PlayState* play, EnGo2* this) {
 u16 EnGo2_GetTextIdGoronDmtBiggoron(PlayState* play, EnGo2* this) {
     Player* player = GET_PLAYER(play);
 
-    if (!IS_RANDO && gSaveContext.bgsFlag) {
+    if (GameInteractor_Should(GI_VB_BIGGORON_CONSIDER_TRADE_COMPLETE, gSaveContext.bgsFlag, NULL)) {
         player->exchangeItemId = EXCH_ITEM_CLAIM_CHECK;
         return 0x305E;
     } else if (INV_CONTENT(ITEM_TRADE_ADULT) >= ITEM_CLAIM_CHECK) {
@@ -627,17 +608,17 @@ s16 EnGo2_UpdateTalkStateGoronDmtBiggoron(PlayState* play, EnGo2* this) {
     switch (EnGo2_GetDialogState(this, play)) {
         case TEXT_STATE_DONE:
             if (this->actor.textId == 0x305E) {
-                if((!IS_RANDO && gSaveContext.bgsFlag) || (IS_RANDO && Flags_GetTreasure(play, 0x1F))) {
+                if (GameInteractor_Should(GI_VB_BIGGORON_CONSIDER_SWORD_COLLECTED, gSaveContext.bgsFlag, NULL)) {
                     return NPC_TALK_STATE_IDLE;
                 }
-                
-                if(IS_RANDO) {
-                    EnGo2_GetItemEntry(this, play, Randomizer_GetItemFromKnownCheck(RC_DMT_TRADE_CLAIM_CHECK, GI_SWORD_BGS));
-                    Flags_SetTreasure(play, 0x1F);
-                } else {
+                Flags_SetRandomizerInf(RAND_INF_ADULT_TRADES_DMT_TRADE_CLAIM_CHECK);
+                if (GameInteractor_Should(GI_VB_TRADE_CLAIM_CHECK, true, this)) {
                     EnGo2_GetItem(this, play, GI_SWORD_BGS);
+                    this->actionFunc = EnGo2_SetupGetItem;
+                } else {
+                    this->actionFunc = EnGo2_SetGetItem;
                 }
-                this->actionFunc = EnGo2_SetupGetItem;
+
                 return NPC_TALK_STATE_ACTION;
             } else {
                 return NPC_TALK_STATE_IDLE;
@@ -663,16 +644,13 @@ s16 EnGo2_UpdateTalkStateGoronDmtBiggoron(PlayState* play, EnGo2* this) {
             if (Message_ShouldAdvance(play)) {
                 if ((this->actor.textId == 0x3054) || (this->actor.textId == 0x3055)) {
                     if (play->msgCtx.choiceIndex == 0) {
-                        if (IS_RANDO) {
-                            GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_DMT_TRADE_BROKEN_SWORD, GI_PRESCRIPTION);
-                            Randomizer_ConsumeAdultTradeItem(play, ITEM_SWORD_BROKEN);
-                            EnGo2_GetItemEntry(this, play, getItemEntry);
-                            Flags_SetRandomizerInf(RAND_INF_ADULT_TRADES_DMT_TRADE_BROKEN_SWORD);
+                        Flags_SetRandomizerInf(RAND_INF_ADULT_TRADES_DMT_TRADE_BROKEN_SWORD);
+                        if (GameInteractor_Should(GI_VB_TRADE_BROKEN_SWORD, true, this)) {
+                            EnGo2_GetItem(this, play, GI_PRESCRIPTION);
+                            this->actionFunc = EnGo2_SetupGetItem;
                         } else {
-                            u32 getItemId = GI_PRESCRIPTION;
-                            EnGo2_GetItem(this, play, getItemId);
+                            this->actionFunc = EnGo2_SetGetItem;
                         }
-                        this->actionFunc = EnGo2_SetupGetItem;
                         return NPC_TALK_STATE_ACTION;
                     }
                     this->actor.textId = 0x3056;
@@ -1070,7 +1048,7 @@ void EnGo2_BiggoronSetTextId(EnGo2* this, PlayState* play, Player* player) {
     u16 textId;
 
     if ((this->actor.params & 0x1F) == GORON_DMT_BIGGORON) {
-        if ((!IS_RANDO && gSaveContext.bgsFlag)) {
+        if (GameInteractor_Should(GI_VB_BIGGORON_CONSIDER_TRADE_COMPLETE, gSaveContext.bgsFlag, NULL)) {
             if (func_8002F368(play) == EXCH_ITEM_CLAIM_CHECK) {
                 this->actor.textId = 0x3003;
             } else {
@@ -1080,18 +1058,14 @@ void EnGo2_BiggoronSetTextId(EnGo2* this, PlayState* play, Player* player) {
 
         } else if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_CLAIM_CHECK) {
             if (func_8002F368(play) == EXCH_ITEM_CLAIM_CHECK) {
-                if (IS_RANDO && Flags_GetTreasure(play, 0x1F)) {
-                    textId = 0x3003;
-                } else if (Environment_GetBgsDayCount() >= CVarGetInteger("gForgeTime", 3)) {
+                if (GameInteractor_Should(GI_VB_BIGGORON_CONSIDER_SWORD_FORGED, Environment_GetBgsDayCount() >= 3, NULL)) {
                     textId = 0x305E;
                 } else {
                     textId = 0x305D;
                 }
                 this->actor.textId = textId;
             } else {
-                if (IS_RANDO && Flags_GetTreasure(play, 0x1F)) {
-                    textId = 0x305E;
-                } else if (Environment_GetBgsDayCount() >= CVarGetInteger("gForgeTime", 3)) {
+                if (GameInteractor_Should(GI_VB_BIGGORON_CONSIDER_SWORD_FORGED, Environment_GetBgsDayCount() >= 3, NULL)) {
                     textId = 0x3002;
                 } else {
                     textId = 0x305D;
@@ -1219,8 +1193,7 @@ s32 EnGo2_IsCameraModified(EnGo2* this, PlayState* play) {
         (this->actor.params & 0x1F) == GORON_CITY_STAIRWELL || (this->actor.params & 0x1F) == GORON_DMT_BIGGORON ||
         (this->actor.params & 0x1F) == GORON_MARKET_BAZAAR) {
         return true;
-    } else if (((!IS_RANDO && !CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)) ||
-                (IS_RANDO && !Flags_GetRandomizerInf(RAND_INF_DUNGEONS_DONE_FIRE_TEMPLE))) &&
+    } else if (GameInteractor_Should(GI_VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE), NULL) &&
                 CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON)) {
         return true;
     } else {
@@ -1278,8 +1251,7 @@ void EnGo2_SelectGoronWakingUp(EnGo2* this) {
             EnGo2_BiggoronWakingUp(this);
             break;
         case GORON_CITY_LINK:
-            if (((!IS_RANDO && !CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)) ||
-                 (IS_RANDO && !Flags_GetRandomizerInf(RAND_INF_DUNGEONS_DONE_FIRE_TEMPLE))) &&
+            if (GameInteractor_Should(GI_VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE), NULL) &&
                 CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON)) {
                 EnGo2_WakingUp(this);
                 break;
@@ -1624,8 +1596,7 @@ void EnGo2_Init(Actor* thisx, PlayState* play) {
         case GORON_CITY_LOWEST_FLOOR:
         case GORON_CITY_STAIRWELL:
         case GORON_CITY_LOST_WOODS:
-            if (((!IS_RANDO && !CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)) ||
-                 (IS_RANDO && !Flags_GetRandomizerInf(RAND_INF_DUNGEONS_DONE_FIRE_TEMPLE))) && LINK_IS_ADULT) {
+            if (GameInteractor_Should(GI_VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE), NULL) && LINK_IS_ADULT) {
                 Actor_Kill(&this->actor);
             }
             this->actionFunc = EnGo2_CurledUp;
@@ -1640,8 +1611,7 @@ void EnGo2_Init(Actor* thisx, PlayState* play) {
             if ((Flags_GetInfTable(INFTABLE_GORON_CITY_DOORS_UNLOCKED))) {
                 Path_CopyLastPoint(this->path, &this->actor.world.pos);
                 this->actor.home.pos = this->actor.world.pos;
-                if (((!IS_RANDO && !CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)) ||
-                     (IS_RANDO && !Flags_GetRandomizerInf(RAND_INF_DUNGEONS_DONE_FIRE_TEMPLE))) &&
+                if (GameInteractor_Should(GI_VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE), NULL) &&
                     CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON)) {
                     EnGo2_GetItemAnimation(this, play);
                 } else {
@@ -1862,11 +1832,7 @@ void EnGo2_SetupGetItem(EnGo2* this, PlayState* play) {
         this->actor.parent = NULL;
         this->actionFunc = EnGo2_SetGetItem;
     } else {
-        if (!IS_RANDO || this->getItemEntry.getItemId == GI_NONE) {
-            func_8002F434(&this->actor, play, this->getItemId, this->actor.xzDistToPlayer + 1.0f, fabsf(this->actor.yDistToPlayer) + 1.0f);
-        } else {
-            GiveItemEntryFromActor(&this->actor, play, this->getItemEntry, this->actor.xzDistToPlayer + 1.0f, fabsf(this->actor.yDistToPlayer) + 1.0f);
-        }
+        func_8002F434(&this->actor, play, this->getItemId, this->actor.xzDistToPlayer + 1.0f, fabsf(this->actor.yDistToPlayer) + 1.0f);
     }
 }
 
@@ -1874,47 +1840,27 @@ void EnGo2_SetGetItem(EnGo2* this, PlayState* play) {
     if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) {
         this->interactInfo.talkState = NPC_TALK_STATE_IDLE;
 
-        // For randomizer, handle updating the states for the gorons after receiving the item based on
-        // the goron type rather then the item being received
-        if (IS_RANDO) {
-            switch (this->actor.params & 0x1F) {
-                case GORON_DMT_BIGGORON:
-                    // Resolves #1301. unk_13EE is used to set the opacity of the HUD. The trade sequence discussion with Biggoron
-                    // sets the HUD to transparent, and it is restored at z_message_PAL:3549, but by specifically watching for
-                    // trade sequence items, this leaves it transparent for non-trade sequence items (in rando) so we fix that here
-                    gSaveContext.unk_13EE = 0x32;
-                    return;
-                case GORON_CITY_LINK:
+        if (GameInteractor_Should(GI_VB_EN_GO2_RESET_AFTER_GET_ITEM, true, this)) {
+            switch (this->getItemId) {
+                case GI_CLAIM_CHECK:
+                    Environment_ClearBgsDayCount();
                     EnGo2_GetItemAnimation(this, play);
                     return;
-                case GORON_CITY_ROLLING_BIG:
+                case GI_TUNIC_GORON:
+                    Flags_SetInfTable(INFTABLE_GORON_CITY_DOORS_UNLOCKED);
+                    EnGo2_GetItemAnimation(this, play);
+                    return;
+                case GI_SWORD_BGS:
+                    gSaveContext.bgsFlag = true;
+                    break;
+                case GI_BOMB_BAG_30:
+                case GI_BOMB_BAG_40:
                     EnGo2_RollingAnimation(this, play);
                     this->actionFunc = EnGo2_GoronRollingBigContinueRolling;
                     return;
             }
             this->actionFunc = func_80A46B40;
-            return;
         }
-
-        switch (this->getItemId) {
-            case GI_CLAIM_CHECK:
-                Environment_ClearBgsDayCount();
-                EnGo2_GetItemAnimation(this, play);
-                return;
-            case GI_TUNIC_GORON:
-                Flags_SetInfTable(INFTABLE_GORON_CITY_DOORS_UNLOCKED);
-                EnGo2_GetItemAnimation(this, play);
-                return;
-            case GI_SWORD_BGS:
-                gSaveContext.bgsFlag = true;
-                break;
-            case GI_BOMB_BAG_30:
-            case GI_BOMB_BAG_40:
-                EnGo2_RollingAnimation(this, play);
-                this->actionFunc = EnGo2_GoronRollingBigContinueRolling;
-                return;
-        }
-        this->actionFunc = func_80A46B40;
     }
 }
 
@@ -1925,12 +1871,12 @@ void EnGo2_BiggoronEyedrops(EnGo2* this, PlayState* play) {
             this->actor.flags &= ~ACTOR_FLAG_TARGETABLE;
             this->actor.shape.rot.y += 0x5B0;
             this->trackingMode = NPC_TRACKING_NONE;
-            this->animTimer = IS_RANDO ? 0 : (this->skelAnime.endFrame + 60.0f + 60.0f); // eyeDrops animation timer
+            this->animTimer = !GameInteractor_Should(GI_VB_PLAY_EYEDROPS_CS, true, NULL) ? 0 : (this->skelAnime.endFrame + 60.0f + 60.0f); // eyeDrops animation timer
             this->eyeMouthTexState = 2;
             this->unk_20C = 0;
             this->goronState++;
             func_800F483C(0x28, 5);
-            if (!IS_RANDO) {
+            if (GameInteractor_Should(GI_VB_PLAY_EYEDROPS_CS, true, NULL)) {
                 OnePointCutscene_Init(play, 4190, -99, &this->actor, MAIN_CAM);
             }
             break;
@@ -1959,16 +1905,15 @@ void EnGo2_BiggoronEyedrops(EnGo2* this, PlayState* play) {
                 this->trackingMode = NPC_TRACKING_HEAD_AND_TORSO;
                 this->skelAnime.playSpeed = 0.0f;
                 this->skelAnime.curFrame = this->skelAnime.endFrame;
-                if (IS_RANDO) {
-                    GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_DMT_TRADE_EYEDROPS, GI_CLAIM_CHECK);
-                    Randomizer_ConsumeAdultTradeItem(play, ITEM_EYEDROPS);
-                    EnGo2_GetItemEntry(this, play, getItemEntry);
-                    Flags_SetRandomizerInf(RAND_INF_ADULT_TRADES_DMT_TRADE_EYEDROPS);
-                } else {
+
+                Flags_SetRandomizerInf(RAND_INF_ADULT_TRADES_DMT_TRADE_EYEDROPS);
+                if(GameInteractor_Should(GI_VB_TRADE_EYEDROPS, true, this)) {
                     u32 getItemId = GI_CLAIM_CHECK;
                     EnGo2_GetItem(this, play, getItemId);
+                    this->actionFunc = EnGo2_SetupGetItem;
+                } else {
+                    this->actionFunc = EnGo2_SetGetItem;
                 }
-                this->actionFunc = EnGo2_SetupGetItem;
                 this->goronState = 0;
             }
             break;
diff --git a/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.h b/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.h
index 86ac0c32e..185a036f4 100644
--- a/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.h
+++ b/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.h
@@ -107,4 +107,9 @@ typedef struct EnGo2 {
     /*        */ GetItemEntry getItemEntry;
 } EnGo2; // size = 0x05A0
 
+void EnGo2_GetItemAnimation(EnGo2* enGo2, PlayState* play);
+void EnGo2_RollingAnimation(EnGo2* enGo2, PlayState* play);
+void EnGo2_GoronRollingBigContinueRolling(EnGo2* enGo2, PlayState* play);
+void func_80A46B40(EnGo2* enGo2, PlayState* play);
+
 #endif
diff --git a/soh/src/overlays/actors/ovl_En_Hs/z_en_hs.c b/soh/src/overlays/actors/ovl_En_Hs/z_en_hs.c
index 14b3703b8..c8d70fe1f 100644
--- a/soh/src/overlays/actors/ovl_En_Hs/z_en_hs.c
+++ b/soh/src/overlays/actors/ovl_En_Hs/z_en_hs.c
@@ -7,7 +7,7 @@
 #include "z_en_hs.h"
 #include "vt.h"
 #include "objects/object_hs/object_hs.h"
-#include "soh/Enhancements/randomizer/adult_trade_shuffle.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY)
 
@@ -79,25 +79,7 @@ void EnHs_Init(Actor* thisx, PlayState* play) {
         // "chicken shop (adult era)"
         osSyncPrintf(VT_FGCOL(CYAN) " ヒヨコの店(大人の時) \n" VT_RST);
         func_80A6E3A0(this, func_80A6E9AC);
-        bool shouldSpawn;
-        bool tradedMushroom = Flags_GetItemGetInf(ITEMGETINF_30);
-        if (IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_ADULT_TRADE)) {
-            // To explain the logic because Fado and Grog are linked:
-            // - If you have Cojiro, then spawn Grog and not Fado.
-            // - If you don't have Cojiro but do have Odd Potion, spawn Fado and not Grog.
-            // - If you don't have either, spawn Grog if you haven't traded the Odd Mushroom.
-            // - If you don't have either but have traded the mushroom, don't spawn either.
-            if (PLAYER_HAS_SHUFFLED_ADULT_TRADE_ITEM(ITEM_COJIRO)) {
-                shouldSpawn = true;
-            } else if (PLAYER_HAS_SHUFFLED_ADULT_TRADE_ITEM(ITEM_ODD_POTION)) {
-                shouldSpawn = false;
-            } else {
-                shouldSpawn = !tradedMushroom;
-            }
-        } else {
-            shouldSpawn = !tradedMushroom;
-        }
-        if (!shouldSpawn) {
+        if (GameInteractor_Should(GI_VB_DESPAWN_GROG, Flags_GetItemGetInf(ITEMGETINF_30), this)) {
             // "chicken shop closed"
             osSyncPrintf(VT_FGCOL(CYAN) " ヒヨコ屋閉店 \n" VT_RST);
             Actor_Kill(&this->actor);
@@ -148,11 +130,11 @@ void func_80A6E5EC(EnHs* this, PlayState* play) {
 
 void func_80A6E630(EnHs* this, PlayState* play) {
     if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) {
-        if (!IS_RANDO) {
+        if (GameInteractor_Should(GI_VB_TRADE_TIMER_ODD_MUSHROOM, true, NULL)) {
             func_80088AA0(180);
+            gSaveContext.eventInf[1] &= ~1;
         }
         func_80A6E3A0(this, func_80A6E6B0);
-        gSaveContext.eventInf[1] &= ~1;
     }
 
     this->unk_2A8 |= 1;
@@ -175,19 +157,12 @@ void func_80A6E70C(EnHs* this, PlayState* play) {
 }
 
 void func_80A6E740(EnHs* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_TRADE_COJIRO, true, this)) {
         this->actor.parent = NULL;
+        Flags_SetRandomizerInf(RAND_INF_ADULT_TRADES_LW_TRADE_COJIRO);
         func_80A6E3A0(this, func_80A6E630);
     } else {
-        if (IS_RANDO) {
-            GetItemEntry itemEntry = Randomizer_GetItemFromKnownCheck(RC_LW_TRADE_COJIRO, GI_ODD_MUSHROOM);
-            Randomizer_ConsumeAdultTradeItem(play, ITEM_COJIRO);
-            GiveItemEntryFromActor(&this->actor, play, itemEntry, 10000.0f, 50.0f);
-            Flags_SetRandomizerInf(RAND_INF_ADULT_TRADES_LW_TRADE_COJIRO);
-        } else {
-            s32 itemId = GI_ODD_MUSHROOM;
-            func_8002F434(&this->actor, play, itemId, 10000.0f, 50.0f);
-        }
+        func_8002F434(&this->actor, play, GI_ODD_MUSHROOM, 10000.0f, 50.0f);
     }
 
     this->unk_2A8 |= 1;
@@ -198,14 +173,8 @@ void func_80A6E7BC(EnHs* this, PlayState* play) {
         switch (play->msgCtx.choiceIndex) {
             case 0:
                 func_80A6E3A0(this, func_80A6E740);
-                if (IS_RANDO) {
-                    GetItemEntry itemEntry = Randomizer_GetItemFromKnownCheck(RC_LW_TRADE_COJIRO, GI_ODD_MUSHROOM);
-                    Randomizer_ConsumeAdultTradeItem(play, ITEM_COJIRO);
-                    GiveItemEntryFromActor(&this->actor, play, itemEntry, 10000.0f, 50.0f);
-                    Flags_SetRandomizerInf(RAND_INF_ADULT_TRADES_LW_TRADE_COJIRO);
-                } else {
-                    s32 itemId = GI_ODD_MUSHROOM;
-                    func_8002F434(&this->actor, play, itemId, 10000.0f, 50.0f);
+                if (GameInteractor_Should(GI_VB_TRADE_COJIRO, true, this)) {
+                    func_8002F434(&this->actor, play, GI_ODD_MUSHROOM, 10000.0f, 50.0f);
                 }
                 break;
             case 1:
diff --git a/soh/src/overlays/actors/ovl_En_Js/z_en_js.c b/soh/src/overlays/actors/ovl_En_Js/z_en_js.c
index 50be2e458..793017d3d 100644
--- a/soh/src/overlays/actors/ovl_En_Js/z_en_js.c
+++ b/soh/src/overlays/actors/ovl_En_Js/z_en_js.c
@@ -6,6 +6,7 @@
 
 #include "z_en_js.h"
 #include "objects/object_js/object_js.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY)
 
@@ -127,23 +128,15 @@ void func_80A8910C(EnJs* this, PlayState* play) {
 }
 
 void func_80A89160(EnJs* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_CARPET_SALESMAN, true, this)) {
         this->actor.parent = NULL;
         En_Js_SetupAction(this, func_80A8910C);
+        Flags_SetRandomizerInf(RAND_INF_MERCHANTS_CARPET_SALESMAN);
     } else {
-        if (IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_MERCHANTS) != RO_SHUFFLE_MERCHANTS_OFF && 
-            !Flags_GetRandomizerInf(RAND_INF_MERCHANTS_CARPET_SALESMAN)) {
-            GetItemEntry itemEntry = Randomizer_GetItemFromKnownCheck(RC_WASTELAND_BOMBCHU_SALESMAN, GI_BOMBCHUS_10);
-            gSaveContext.pendingSale = itemEntry.itemId;
-            gSaveContext.pendingSaleMod = itemEntry.modIndex;
-            GiveItemEntryFromActor(&this->actor, play, itemEntry, 10000.0f, 50.0f);
-            Flags_SetRandomizerInf(RAND_INF_MERCHANTS_CARPET_SALESMAN);
-        } else {
-            GetItemEntry itemEntry = ItemTable_Retrieve(GI_BOMBCHUS_10);
-            gSaveContext.pendingSale = itemEntry.itemId;
-            gSaveContext.pendingSaleMod = itemEntry.modIndex;
-            func_8002F434(&this->actor, play, GI_BOMBCHUS_10, 10000.0f, 50.0f);
-        }
+        GetItemEntry itemEntry = ItemTable_Retrieve(GI_BOMBCHUS_10);
+        gSaveContext.pendingSale = itemEntry.itemId;
+        gSaveContext.pendingSaleMod = itemEntry.modIndex;
+        func_8002F434(&this->actor, play, GI_BOMBCHUS_10, 10000.0f, 50.0f);
     }
 }
 
diff --git a/soh/src/overlays/actors/ovl_En_Ko/z_en_ko.c b/soh/src/overlays/actors/ovl_En_Ko/z_en_ko.c
index 25299f5b0..c801356c9 100644
--- a/soh/src/overlays/actors/ovl_En_Ko/z_en_ko.c
+++ b/soh/src/overlays/actors/ovl_En_Ko/z_en_ko.c
@@ -10,7 +10,7 @@
 #include "objects/object_km1/object_km1.h"
 #include "objects/object_kw1/object_kw1.h"
 #include "vt.h"
-#include "soh/Enhancements/randomizer/adult_trade_shuffle.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_WHILE_CULLED)
 
@@ -1027,20 +1027,9 @@ s32 EnKo_CanSpawn(EnKo* this, PlayState* play) {
             }
 
         case SCENE_LOST_WOODS:
-            if (IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_ADULT_TRADE)) {
-                // To explain the logic because Fado and Grog are linked:
-                // - If you have Cojiro, then spawn Grog and not Fado.
-                // - If you don't have Cojiro but do have Odd Potion, spawn Fado and not Grog.
-                // - If you don't have either, spawn Grog if you haven't traded the Odd Mushroom.
-                // - If you don't have either but have traded the mushroom, don't spawn either.
-                if (PLAYER_HAS_SHUFFLED_ADULT_TRADE_ITEM(ITEM_COJIRO)) {
-                    return false;
-                } else {
-                    return PLAYER_HAS_SHUFFLED_ADULT_TRADE_ITEM(ITEM_ODD_POTION);
-                }
-            } else {
-                return (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_ODD_POTION) ? true : false;
-            }
+            return GameInteractor_Should(GI_VB_SPAWN_LW_FADO, (
+                (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_ODD_POTION) ? true : false
+            ), this);
         default:
             return false;
     }
@@ -1186,18 +1175,10 @@ void func_80A99048(EnKo* this, PlayState* play) {
         Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_ELF, this->actor.world.pos.x,
                            this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 3);
         if (ENKO_TYPE == ENKO_TYPE_CHILD_3) {
-            if (!IS_RANDO) {
-                if (!CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD)) {
-                    this->collider.dim.height += 200;
-                    this->actionFunc = func_80A995CC;
-                    return;
-                }
-            } else {
-                if (!Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_KOKIRI_EMERALD_DEKU_TREE_DEAD)) {
-                    this->collider.dim.height += 200;
-                    this->actionFunc = func_80A995CC;
-                    return;
-                }
+            if (!GameInteractor_Should(GI_VB_OPEN_KOKIRI_FOREST, CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD), this)) {
+                this->collider.dim.height += 200;
+                this->actionFunc = func_80A995CC;
+                return;
             }
             Path_CopyLastPoint(this->path, &this->actor.world.pos);
         }
@@ -1230,18 +1211,11 @@ void func_80A99438(EnKo* this, PlayState* play) {
 }
 
 void func_80A99504(EnKo* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_TRADE_ODD_POTION, true, this)) {
         this->actor.parent = NULL;
         this->actionFunc = func_80A99560;
     } else {
-        if (IS_RANDO) {
-            GetItemEntry itemEntry = Randomizer_GetItemFromKnownCheck(RC_LW_TRADE_ODD_POTION, GI_SAW);
-            Randomizer_ConsumeAdultTradeItem(play, ITEM_ODD_POTION);
-            GiveItemEntryFromActor(&this->actor, play, itemEntry, 120.0f, 10.0f);
-        } else {
-            s32 itemId = GI_SAW;
-            func_8002F434(&this->actor, play, itemId, 120.0f, 10.0f);
-        }
+        func_8002F434(&this->actor, play, GI_SAW, 120.0f, 10.0f);
     }
 }
 
diff --git a/soh/src/overlays/actors/ovl_En_Ko/z_en_ko.h b/soh/src/overlays/actors/ovl_En_Ko/z_en_ko.h
index c247f53b9..5deeef465 100644
--- a/soh/src/overlays/actors/ovl_En_Ko/z_en_ko.h
+++ b/soh/src/overlays/actors/ovl_En_Ko/z_en_ko.h
@@ -57,4 +57,8 @@ typedef enum {
     ENKO_FQS_ADULT_SAVED
 } KokiriForestQuestState;
 
+void func_80A995CC(EnKo* actor, PlayState* play);
+void func_80A99384(EnKo* actor, PlayState* play);
+void func_80A99560(EnKo* actor, PlayState* play);
+
 #endif
diff --git a/soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c b/soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c
index ad3bd0ab5..3d5c2c354 100644
--- a/soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c
+++ b/soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c
@@ -6,7 +6,7 @@
 
 #include "z_en_kz.h"
 #include "objects/object_kz/object_kz.h"
-#include "soh/Enhancements/randomizer/adult_trade_shuffle.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY)
 
@@ -73,12 +73,9 @@ static AnimationInfo sAnimationInfo[] = {
 u16 EnKz_GetTextNoMaskChild(PlayState* play, EnKz* this) {
     Player* player = GET_PLAYER(play);
 
-    if ((IS_RANDO && Flags_GetRandomizerInf(RAND_INF_DUNGEONS_DONE_JABU_JABUS_BELLY)) ||
-        (!IS_RANDO && CHECK_QUEST_ITEM(QUEST_ZORA_SAPPHIRE))) {
-        // Allow turning in Ruto's letter even if you have already rescued her
-        if (IS_RANDO && !Flags_GetEventChkInf(EVENTCHKINF_KING_ZORA_MOVED)) {
-            player->exchangeItemId = EXCH_ITEM_LETTER_RUTO;
-        }
+    if (GameInteractor_Should(GI_VB_KING_ZORA_THANK_CHILD, (
+        CHECK_QUEST_ITEM(QUEST_ZORA_SAPPHIRE)
+    ), this)) {
         return 0x402B;
     } else if (Flags_GetEventChkInf(EVENTCHKINF_KING_ZORA_MOVED)) {
         return 0x401C;
@@ -94,8 +91,10 @@ u16 EnKz_GetTextNoMaskAdult(PlayState* play, EnKz* this) {
     // this works because both ITEM_NONE and later trade items are > ITEM_FROG
     if (INV_CONTENT(ITEM_TRADE_ADULT) >= ITEM_FROG) {
         if (!Flags_GetInfTable(INFTABLE_139)) {
-            if (!IS_RANDO) {
-                return CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_ZORA) ? 0x401F : 0x4012;
+            if (!GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_THAWING_KING_ZORA, (
+                !CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_ZORA)
+            ), this)) {
+                return 0x401F;
             } else {
                 return 0x4012;
             }
@@ -243,7 +242,9 @@ void func_80A9CB18(EnKz* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
 
     if (func_80A9C95C(play, this, &this->interactInfo.talkState, 340.0f, EnKz_GetText, func_80A9C6C0)) {
-        if (((IS_RANDO && LINK_IS_CHILD) || this->actor.textId == 0x401A) && !Flags_GetEventChkInf(EVENTCHKINF_KING_ZORA_MOVED)) {
+        if (GameInteractor_Should(GI_VB_BE_ABLE_TO_EXCHANGE_RUTOS_LETTER, (this->actor.textId == 0x401A), this) &&
+            !Flags_GetEventChkInf(EVENTCHKINF_KING_ZORA_MOVED))
+        {
             if (func_8002F368(play) == EXCH_ITEM_LETTER_RUTO) {
                 this->actor.textId = 0x401B;
                 this->sfxPlayed = false;
@@ -257,7 +258,7 @@ void func_80A9CB18(EnKz* this, PlayState* play) {
         if (LINK_IS_ADULT) {
             if ((INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_PRESCRIPTION) &&
                 (func_8002F368(play) == EXCH_ITEM_PRESCRIPTION)) {
-                if (!IS_RANDO || !Flags_GetTreasure(play, 0x1F)) {
+                if (GameInteractor_Should(GI_VB_TRADE_PRESCRIPTION, true, this)) {
                     this->actor.textId = 0x4014;
                     this->sfxPlayed = false;
                     player->actor.textId = this->actor.textId;
@@ -271,11 +272,11 @@ void func_80A9CB18(EnKz* this, PlayState* play) {
                 this->actor.textId = CHECK_QUEST_ITEM(QUEST_SONG_SERENADE) ? 0x4045 : 0x401A;
                 player->actor.textId = this->actor.textId;
             } else {
-                if (!IS_RANDO) {
-                    this->actor.textId = CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_ZORA) ? 0x401F : 0x4012;
-                } else {
-                    this->actor.textId = 0x4012;
-                }
+                this->actor.textId =
+                    !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_THAWING_KING_ZORA,
+                                            (!CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_ZORA)), this)
+                        ? 0x401F
+                        : 0x4012;
 
                 player->actor.textId = this->actor.textId;
             }
@@ -344,29 +345,10 @@ void EnKz_Init(Actor* thisx, PlayState* play) {
     this->interactInfo.talkState = NPC_TALK_STATE_IDLE;
     Animation_ChangeByInfo(&this->skelanime, sAnimationInfo, ENKZ_ANIM_0);
 
-    if (!IS_RANDO) {
-        if (Flags_GetEventChkInf(EVENTCHKINF_KING_ZORA_MOVED)) {
-            EnKz_SetMovedPos(this, play);
-        }
-    } else {
-        int zorasFountain = Randomizer_GetSettingValue(RSK_ZORAS_FOUNTAIN);
-        switch (zorasFountain) {
-            case 0:
-                if (Flags_GetEventChkInf(EVENTCHKINF_KING_ZORA_MOVED)) {
-                    EnKz_SetMovedPos(this, play);
-                }
-                break;
-            case 1:
-                if (LINK_IS_ADULT) {
-                    EnKz_SetMovedPos(this, play);
-                } else if (Flags_GetEventChkInf(EVENTCHKINF_KING_ZORA_MOVED)) {
-                    EnKz_SetMovedPos(this, play);
-                }
-                break;
-            case 2:
-                EnKz_SetMovedPos(this, play);
-                break;
-        }
+    if (GameInteractor_Should(GI_VB_KING_ZORA_BE_MOVED, (
+        Flags_GetEventChkInf(EVENTCHKINF_KING_ZORA_MOVED)
+    ), this)) {
+        EnKz_SetMovedPos(this, play);
     }
 
     if (LINK_IS_ADULT) {
@@ -465,37 +447,29 @@ void EnKz_SetupGetItem(EnKz* this, PlayState* play) {
     f32 xzRange;
     f32 yRange;
 
-    if (Actor_HasParent(&this->actor, play)) {
+    if (Actor_HasParent(&this->actor, play) || (
+        (this->isTrading && !GameInteractor_Should(GI_VB_TRADE_PRESCRIPTION, true, this)) ||
+        (!this->isTrading && !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_THAWING_KING_ZORA, true, this))
+    )) {
         this->actor.parent = NULL;
         this->interactInfo.talkState = NPC_TALK_STATE_TALKING;
         this->actionFunc = EnKz_StartTimer;
-    } else {
-        if (IS_RANDO) {
-            if (this->isTrading) {
-                getItemEntry = Randomizer_GetItemFromKnownCheck(RC_ZD_TRADE_PRESCRIPTION, GI_FROG);
-                getItemId = getItemEntry.getItemId;
-                Randomizer_ConsumeAdultTradeItem(play, ITEM_PRESCRIPTION);
-                Flags_SetTreasure(play, 0x1F);
-            } else {
-                getItemEntry = Randomizer_GetItemFromKnownCheck(RC_ZD_KING_ZORA_THAWED, GI_TUNIC_ZORA);
-                getItemId = getItemEntry.getItemId;
-            }
+        if (!this->isTrading) {
+            Flags_SetRandomizerInf(RAND_INF_KING_ZORA_THAWED);
         } else {
-            getItemId = this->isTrading ? GI_FROG : GI_TUNIC_ZORA;
+            Flags_SetRandomizerInf(RAND_INF_ADULT_TRADES_ZD_TRADE_PRESCRIPTION);
         }
+    } else {
+        getItemId = this->isTrading ? GI_FROG : GI_TUNIC_ZORA;
         yRange = fabsf(this->actor.yDistToPlayer) + 1.0f;
         xzRange = this->actor.xzDistToPlayer + 1.0f;
-        if (!IS_RANDO || getItemEntry.getItemId == GI_NONE) {
-            func_8002F434(&this->actor, play, getItemId, xzRange, yRange);
-        } else {
-            GiveItemEntryFromActor(&this->actor, play, getItemEntry, xzRange, yRange);
-        }
+        func_8002F434(&this->actor, play, getItemId, xzRange, yRange);
     }
 }
 
 void EnKz_StartTimer(EnKz* this, PlayState* play) {
     if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) {
-        if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_FROG && !IS_RANDO) {
+        if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_FROG && GameInteractor_Should(GI_VB_TRADE_TIMER_FROG, true, NULL)) { 
             func_80088AA0(180); // start timer2 with 3 minutes
             gSaveContext.eventInf[1] &= ~1;
         }
diff --git a/soh/src/overlays/actors/ovl_En_Kz/z_en_kz.h b/soh/src/overlays/actors/ovl_En_Kz/z_en_kz.h
index 37feb841a..c97732356 100644
--- a/soh/src/overlays/actors/ovl_En_Kz/z_en_kz.h
+++ b/soh/src/overlays/actors/ovl_En_Kz/z_en_kz.h
@@ -28,4 +28,6 @@ typedef struct EnKz {
     /* 0x02BE */ s16 unk_2BE[12];
 } EnKz; // size = 0x02D8
 
+void EnKz_SetupGetItem(EnKz* enKz, PlayState* play);
+
 #endif
diff --git a/soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c b/soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c
index 8a11eb668..75db192cf 100644
--- a/soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c
+++ b/soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c
@@ -6,6 +6,7 @@
 
 #include "z_en_ma1.h"
 #include "objects/object_ma1/object_ma1.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_WHILE_CULLED | ACTOR_FLAG_DRAW_WHILE_CULLED | ACTOR_FLAG_NO_FREEZE_OCARINA)
 
@@ -25,7 +26,6 @@ void func_80AA106C(EnMa1* this, PlayState* play);
 void func_80AA10EC(EnMa1* this, PlayState* play);
 void func_80AA1150(EnMa1* this, PlayState* play);
 void EnMa1_DoNothing(EnMa1* this, PlayState* play);
-void EnMa1_WaitForSongGive(EnMa1* this, PlayState* play);
 
 const ActorInit En_Ma1_InitVars = {
     ACTOR_EN_MA1,
@@ -90,25 +90,16 @@ static void* sEyeTextures[] = {
     gMalonChildEyeClosedTex,
 };
 
-bool Randomizer_ObtainedMalonHCReward() {
-    return Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_POCKET_EGG);
-}
-
 u16 EnMa1_GetText(PlayState* play, Actor* thisx) {
-    // Special case for Malon Hyrule Castle Text. Placing it here at the beginning
-    // has the added benefit of circumventing mask text if wearing bunny hood.
-    if (IS_RANDO && play->sceneNum == SCENE_HYRULE_CASTLE) {
-        return Randomizer_ObtainedMalonHCReward() ? 0x2044 : 0x2043;
-    }
+    bool malonReturnedFromCastle = GameInteractor_Should(GI_VB_MALON_RETURN_FROM_CASTLE, Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE), NULL);
+    bool malonTaughtEponasSong = GameInteractor_Should(GI_VB_MALON_ALREADY_TAUGHT_EPONAS_SONG, CHECK_QUEST_ITEM(QUEST_SONG_EPONA), NULL);
     u16 faceReaction = Text_GetFaceReaction(play, 0x17);
 
     if (faceReaction != 0) {
         return faceReaction;
     }
-    if (!IS_RANDO) {
-        if (CHECK_QUEST_ITEM(QUEST_SONG_EPONA)) {
-            return 0x204A;
-        }
+    if (malonTaughtEponasSong) {
+        return 0x204A;
     }
     if (Flags_GetEventChkInf(EVENTCHKINF_INVITED_TO_SING_WITH_CHILD_MALON)) {
         return 0x2049;
@@ -120,7 +111,7 @@ u16 EnMa1_GetText(PlayState* play, Actor* thisx) {
             return 0x2048;
         }
     }
-    if (Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE)) {
+    if (malonReturnedFromCastle) {
         return 0x2047;
     }
     if (Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_POCKET_EGG)) {
@@ -194,6 +185,8 @@ s16 func_80AA0778(PlayState* play, Actor* thisx) {
 }
 
 s32 func_80AA08C4(EnMa1* this, PlayState* play) {
+    bool malonReturnedFromCastle = GameInteractor_Should(GI_VB_MALON_RETURN_FROM_CASTLE, Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE), NULL);
+
     if ((this->actor.shape.rot.z == 3) && (gSaveContext.sceneSetupIndex == 5)) {
         return 1;
     }
@@ -202,32 +195,24 @@ s32 func_80AA08C4(EnMa1* this, PlayState* play) {
     }
     // Causes Malon to appear in the market if you haven't met her yet.
     if (((play->sceneNum == SCENE_MARKET_NIGHT) || (play->sceneNum == SCENE_MARKET_DAY)) &&
-        !Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE) && !Flags_GetInfTable(INFTABLE_ENTERED_HYRULE_CASTLE)) {
+        !malonReturnedFromCastle && !Flags_GetInfTable(INFTABLE_ENTERED_HYRULE_CASTLE)) {
         return 1;
     }
-    if ((play->sceneNum == SCENE_HYRULE_CASTLE) &&  // if we're at hyrule castle
-        (!Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE) || // and talon hasn't left
-         (IS_RANDO &&
-          !Randomizer_ObtainedMalonHCReward()))) { // or we're rando'd and haven't gotten malon's HC check
-        if (Flags_GetInfTable(INFTABLE_ENTERED_HYRULE_CASTLE)) {    // if we've met malon
-            return 1;                              // make her appear at the castle
-        } else {                                   // if we haven't met malon
-            Flags_SetInfTable(INFTABLE_ENTERED_HYRULE_CASTLE);     // set the flag for meeting malon
-            return 0;                              // don't make her appear at the castle
+    if ((play->sceneNum == SCENE_HYRULE_CASTLE) && !malonReturnedFromCastle) {
+        if (Flags_GetInfTable(INFTABLE_ENTERED_HYRULE_CASTLE)) {
+            return 1;
+        } else {
+            Flags_SetInfTable(INFTABLE_ENTERED_HYRULE_CASTLE);
+            return 0;
         }
     }
-    // Malon asleep in her bed if Talon has left Hyrule Castle and it is nighttime.
-    if ((play->sceneNum == SCENE_LON_LON_BUILDINGS) && IS_NIGHT && (Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE))) {
+    if ((play->sceneNum == SCENE_LON_LON_BUILDINGS) && IS_NIGHT && malonReturnedFromCastle) {
         return 1;
     }
-    // Don't spawn Malon if none of the above are true and we are not in Lon Lon Ranch.
     if (play->sceneNum != SCENE_LON_LON_RANCH) {
         return 0;
     }
-    // If we've gotten this far, we're in Lon Lon Ranch. Spawn Malon if it is daytime, Talon has left Hyrule Castle, and
-    // either we are not randomized, or we are and we have received Malon's item at Hyrule Castle.
-    if ((this->actor.shape.rot.z == 3) && IS_DAY && (Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE)) && 
-        ((IS_RANDO && Randomizer_ObtainedMalonHCReward()) || !IS_RANDO)) {
+    if ((this->actor.shape.rot.z == 3) && IS_DAY && malonReturnedFromCastle) {
         return 1;
     }
     return 0;
@@ -284,6 +269,8 @@ void func_80AA0B74(EnMa1* this) {
 
 void EnMa1_Init(Actor* thisx, PlayState* play) {
     EnMa1* this = (EnMa1*)thisx;
+    bool malonReturnedFromCastle = GameInteractor_Should(GI_VB_MALON_RETURN_FROM_CASTLE, Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE), NULL);
+    bool malonTaughtEponasSong = GameInteractor_Should(GI_VB_MALON_ALREADY_TAUGHT_EPONAS_SONG, CHECK_QUEST_ITEM(QUEST_SONG_EPONA), NULL);
     s32 pad;
 
     ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 18.0f);
@@ -292,12 +279,6 @@ void EnMa1_Init(Actor* thisx, PlayState* play) {
     Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit);
     CollisionCheck_SetInfo2(&this->actor.colChkInfo, DamageTable_Get(22), &sColChkInfoInit);
 
-    if (IS_RANDO) { // Skip Malon's multiple textboxes before getting an item
-        Flags_SetInfTable(INFTABLE_ENTERED_HYRULE_CASTLE);
-        Flags_SetInfTable(INFTABLE_MET_CHILD_MALON_AT_CASTLE_OR_MARKET);
-        Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_CHILD_MALON_AT_CASTLE_OR_MARKET);
-    }
-
     if (!func_80AA08C4(this, play)) {
         Actor_Kill(&this->actor);
         return;
@@ -308,21 +289,10 @@ void EnMa1_Init(Actor* thisx, PlayState* play) {
     this->actor.targetMode = 6;
     this->interactInfo.talkState = NPC_TALK_STATE_IDLE;
 
-   // To avoid missing a check, we want Malon to have the actionFunc for singing, but not reacting to Ocarina, if any of
-   // the following are true.
-   // 1. Talon has not left Hyrule Castle.
-   // 2. We are Randomized and have not obtained Malon's Weird Egg Check.
-   // 3. We are not Randomized and have obtained Epona's Song
-    if (!Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE) || (IS_RANDO && !Randomizer_ObtainedMalonHCReward()) || (CHECK_QUEST_ITEM(QUEST_SONG_EPONA) && !IS_RANDO) ||
-        (IS_RANDO && Flags_GetTreasure(play, 0x1F))) {
+    if (!malonReturnedFromCastle || malonTaughtEponasSong) {
         this->actionFunc = func_80AA0D88;
         EnMa1_ChangeAnim(this, ENMA1_ANIM_2);
-    // If none of the above conditions were true, set Malon up to teach Epona's Song.
     } else {
-        if (IS_RANDO) { // Skip straight to "let's sing it together" textbox in the ranch
-            Flags_SetEventChkInf(EVENTCHKINF_INVITED_TO_SING_WITH_CHILD_MALON);
-        }
-
         this->actionFunc = func_80AA0F44;
         EnMa1_ChangeAnim(this, ENMA1_ANIM_2);
     }
@@ -336,6 +306,9 @@ void EnMa1_Destroy(Actor* thisx, PlayState* play) {
 }
 
 void func_80AA0D88(EnMa1* this, PlayState* play) {
+    bool malonReturnedFromCastle = GameInteractor_Should(GI_VB_MALON_RETURN_FROM_CASTLE, Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE), NULL);
+    bool malonTaughtEponasSong = GameInteractor_Should(GI_VB_MALON_ALREADY_TAUGHT_EPONAS_SONG, CHECK_QUEST_ITEM(QUEST_SONG_EPONA), NULL);
+
     if (this->interactInfo.talkState != NPC_TALK_STATE_IDLE) {
         if (this->skelAnime.animation != &gMalonChildIdleAnim) {
             EnMa1_ChangeAnim(this, ENMA1_ANIM_1);
@@ -346,16 +319,9 @@ void func_80AA0D88(EnMa1* this, PlayState* play) {
         }
     }
 
-    // We want to Kill Malon's Actor outside of randomizer when Talon is freed. In Randomizer we don't kill Malon's
-    // Actor here, otherwise if we wake up Talon first and then get her check she will spontaneously
-    // disappear.
-    if ((play->sceneNum == SCENE_HYRULE_CASTLE) && (!IS_RANDO && Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE))) {
+    if ((play->sceneNum == SCENE_HYRULE_CASTLE) && malonReturnedFromCastle) {
         Actor_Kill(&this->actor);
-    // We want Malon to give the Weird Egg Check (see function below) in the following situations:
-    // 1. Talon as not left Hyrule Castle (Vanilla) OR
-    // 2. We haven't obtained Malon's Weird Egg Check (Randomizer only) OR
-    // 3. We have Epona's Song? (Vanilla only, not sure why it's here but I didn't write that one)
-    } else if ((!Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE) || (IS_RANDO && !Randomizer_ObtainedMalonHCReward())) || (CHECK_QUEST_ITEM(QUEST_SONG_EPONA) && !IS_RANDO)) {
+    } else if (!malonReturnedFromCastle || malonTaughtEponasSong) {
         if (this->interactInfo.talkState == NPC_TALK_STATE_ACTION) {
             this->actionFunc = func_80AA0EA0;
             play->msgCtx.stateTimer = 4;
@@ -365,21 +331,16 @@ void func_80AA0D88(EnMa1* this, PlayState* play) {
 }
 
 void func_80AA0EA0(EnMa1* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_WEIRD_EGG, true, NULL)) {
         this->actor.parent = NULL;
         this->actionFunc = func_80AA0EFC;
     } else {
-        if (!IS_RANDO) {
-            func_8002F434(&this->actor, play, GI_WEIRD_EGG, 120.0f, 10.0f);
-        } else {
-            GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_HC_MALON_EGG, GI_WEIRD_EGG);
-            GiveItemEntryFromActor(&this->actor, play, getItemEntry, 120.0f, 10.0f);
-        }
+        func_8002F434(&this->actor, play, GI_WEIRD_EGG, 120.0f, 10.0f);
     }
 }
 
 void func_80AA0EFC(EnMa1* this, PlayState* play) {
-    if (this->interactInfo.talkState == NPC_TALK_STATE_ITEM_GIVEN) {
+    if (this->interactInfo.talkState == NPC_TALK_STATE_ITEM_GIVEN || !GameInteractor_Should(GI_VB_GIVE_ITEM_WEIRD_EGG, true, NULL)) {
         this->interactInfo.talkState = NPC_TALK_STATE_IDLE;
         this->actionFunc = func_80AA0D88;
         Flags_SetEventChkInf(EVENTCHKINF_OBTAINED_POCKET_EGG);
@@ -387,24 +348,6 @@ void func_80AA0EFC(EnMa1* this, PlayState* play) {
     }
 }
 
-void GivePlayerRandoRewardMalon(EnMa1* malon, PlayState* play, RandomizerCheck check) {
-    GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(check, RG_EPONAS_SONG);
-    // Prevents flag from getting set if we weren't able to get the item (i.e. Player is holding shield
-    // when closing the textbox).
-    if (malon->actor.parent != NULL && malon->actor.parent->id == GET_PLAYER(play)->actor.id &&
-        !Flags_GetTreasure(play, 0x1F)) {
-        Flags_SetTreasure(play, 0x1F);
-        // puts malon in the action that vanilla has her in after learning the song
-        // (confirmed via breakpoints in a vanilla save).
-        malon->actionFunc = func_80AA0D88;
-    } else if (!Flags_GetTreasure(play, 0x1F)) {
-        GiveItemEntryFromActor(&malon->actor, play, getItemEntry, 10000.0f, 100.0f);
-    }
-    // make malon sing again after giving the item.
-    malon->interactInfo.talkState = NPC_TALK_STATE_IDLE;
-    malon->unk_1E0 = 1;
-}
-
 void func_80AA0F44(EnMa1* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
 
@@ -419,7 +362,6 @@ void func_80AA0F44(EnMa1* this, PlayState* play) {
     }
 
     if (Flags_GetEventChkInf(EVENTCHKINF_INVITED_TO_SING_WITH_CHILD_MALON)) {
-        // When the player pulls out the Ocarina while close to Malon
         if (player->stateFlags2 & 0x1000000) {
             player->stateFlags2 |= 0x2000000;
             player->unk_6A8 = &this->actor;
@@ -427,19 +369,10 @@ void func_80AA0F44(EnMa1* this, PlayState* play) {
             Message_StartTextbox(play, this->actor.textId, NULL);
             this->interactInfo.talkState = NPC_TALK_STATE_TALKING;
             this->actor.flags |= ACTOR_FLAG_WILL_TALK;
-            // when rando'ed, skip to the Item Giving. Otherwise go to the song teaching code.
-            this->actionFunc = IS_RANDO ? func_80AA1150 : func_80AA106C;
+            this->actionFunc = func_80AA106C;
         } else if (this->actor.xzDistToPlayer < 30.0f + (f32)this->collider.dim.radius) {
-            // somehow flags that the player is close to malon so that pulling out the Ocarina
-            // triggers the code above this.
             player->stateFlags2 |= 0x800000;
         }
-        // If rando'ed, a textbox is closing, it's malon's 'my mom wrote this song' text, AND we do have an ocarina
-        // in our inventory. This allows us to grant the check when talking to malon with the ocarina in our inventory.
-        if (IS_RANDO && (Actor_TextboxIsClosing(&this->actor, play) && play->msgCtx.textId == 0x2049) &&
-            (INV_CONTENT(ITEM_OCARINA_FAIRY) != ITEM_NONE || INV_CONTENT(ITEM_OCARINA_TIME) != ITEM_NONE)) {
-            this->actionFunc = EnMa1_WaitForSongGive;
-        }
     }
 }
 
@@ -461,48 +394,16 @@ void func_80AA10EC(EnMa1* this, PlayState* play) {
     }
 }
 
-void EnMa1_WaitForSongGive(EnMa1* this, PlayState* play) {
-    // Actually give the song check.
-    GivePlayerRandoRewardMalon(this, play, RC_SONG_FROM_MALON);
-}
-
-// Sets an Ocarina State necessary to not softlock in rando.
-// This function should only be called in rando.
-void EnMa1_EndTeachSong(EnMa1* this, PlayState* play) {
-    if (play->csCtx.state == CS_STATE_IDLE) {
-        this->actionFunc = func_80AA0F44;
-        play->msgCtx.ocarinaMode = OCARINA_MODE_04;
-    }
-
-    if (IS_RANDO) {
-        // Transition to the giving the song check on the next update run.
-        this->actionFunc = EnMa1_WaitForSongGive;
-    }
-}
-
 void func_80AA1150(EnMa1* this, PlayState* play) {
     GET_PLAYER(play)->stateFlags2 |= 0x800000;
 
-    // When rando'ed, trigger the "song learned" Ocarina mode.
-    if (IS_RANDO && (Message_GetState(&play->msgCtx) == TEXT_STATE_CLOSING)) {
-        play->msgCtx.ocarinaMode = OCARINA_MODE_03;
-    }
-
     if (play->msgCtx.ocarinaMode == OCARINA_MODE_03) {
-        if (!IS_RANDO) {
-            play->nextEntranceIndex = ENTR_LON_LON_RANCH_0;
-            gSaveContext.nextCutsceneIndex = 0xFFF1;
-            play->transitionType = TRANS_TYPE_CIRCLE(TCA_WAVE, TCC_WHITE, TCS_FAST);
-            play->transitionTrigger = TRANS_TRIGGER_START;
-            this->actionFunc = EnMa1_DoNothing;
-        } else {
-            // When rando'ed, skip the cutscene, play the chime, reset some flags,
-            // and give the song on next update.
-            func_80078884(NA_SE_SY_CORRECT_CHIME);
-            this->actionFunc = EnMa1_EndTeachSong;
-            this->actor.flags &= ~ACTOR_FLAG_WILL_TALK;
-            play->msgCtx.ocarinaMode = OCARINA_MODE_00;
-        }
+        Flags_SetRandomizerInf(RAND_INF_LEARNED_EPONA_SONG);
+        play->nextEntranceIndex = ENTR_LON_LON_RANCH_0;
+        gSaveContext.nextCutsceneIndex = 0xFFF1;
+        play->transitionType = TRANS_TYPE_CIRCLE(TCA_WAVE, TCC_WHITE, TCS_FAST);
+        play->transitionTrigger = TRANS_TRIGGER_START;
+        this->actionFunc = EnMa1_DoNothing;
     }
 }
 
diff --git a/soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.h b/soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.h
index 55b53bd72..f06f220c9 100644
--- a/soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.h
+++ b/soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.h
@@ -20,4 +20,7 @@ typedef struct EnMa1 {
     /* 0x01E8 */ NpcInteractInfo interactInfo;
 } EnMa1; // size = 0x0210
 
+void func_80AA106C(EnMa1* enMa1, PlayState* play);
+void func_80AA0D88(EnMa1* enMa1, PlayState* play);
+
 #endif
diff --git a/soh/src/overlays/actors/ovl_En_Md/z_en_md.c b/soh/src/overlays/actors/ovl_En_Md/z_en_md.c
index 14d9cbb7b..6fb9119bf 100644
--- a/soh/src/overlays/actors/ovl_En_Md/z_en_md.c
+++ b/soh/src/overlays/actors/ovl_En_Md/z_en_md.c
@@ -7,6 +7,7 @@
 #include "z_en_md.h"
 #include "objects/object_md/object_md.h"
 #include "overlays/actors/ovl_En_Elf/z_en_elf.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_WHILE_CULLED | ACTOR_FLAG_NO_FREEZE_OCARINA)
 
@@ -372,11 +373,7 @@ u16 EnMd_GetTextKokiriForest(PlayState* play, EnMd* this) {
     this->unk_208 = 0;
     this->unk_209 = TEXT_STATE_NONE;
 
-    // In rando, skip talking about the tree being dead so we can have the prompt for sword and shield instead
-    if ((!IS_RANDO && CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD)) ||
-        (IS_RANDO && Flags_GetEventChkInf(EVENTCHKINF_SHOWED_MIDO_SWORD_SHIELD) &&
-        Flags_GetRandomizerInf(RAND_INF_DUNGEONS_DONE_DEKU_TREE) &&
-        !Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_MIDO_AFTER_DEKU_TREES_DEATH))) {
+    if (GameInteractor_Should(GI_VB_MIDO_CONSIDER_DEKU_TREE_DEAD, CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD), this)) {
         return 0x1045;
     }
 
@@ -486,25 +483,6 @@ s16 func_80AAAF04(PlayState* play, Actor* thisx) {
 }
 
 u8 EnMd_ShouldSpawn(EnMd* this, PlayState* play) {
-    // In rando, Mido's spawn logic is adjusted to support closed deku/forest options
-    // He will spawn in the forest if you haven't showed the sword and shield, and will remain
-    // in the forest until you've obtained Zelda's letter or Deku Tree dies
-    // This is to ensure Deku Tree can still be opened in dungeon entrance rando even if Ghoma is defeated
-    if (IS_RANDO) {
-        if (play->sceneNum == SCENE_LOST_WOODS) {
-            return 1;
-        }
-
-        if (Flags_GetEventChkInf(EVENTCHKINF_SHOWED_MIDO_SWORD_SHIELD) &&
-            Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_MIDO_AFTER_DEKU_TREES_DEATH) &&
-            (Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_ZELDAS_LETTER) ||
-            Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_KOKIRI_EMERALD_DEKU_TREE_DEAD))) {
-            return play->sceneNum == SCENE_MIDOS_HOUSE && !LINK_IS_ADULT;
-        }
-
-        return play->sceneNum == SCENE_KOKIRI_FOREST;
-    }
-
     if (play->sceneNum == SCENE_KOKIRI_FOREST) {
         if (!Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_MIDO_AFTER_DEKU_TREES_DEATH) && !Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_ZELDAS_LETTER)) {
             return 1;
@@ -512,7 +490,7 @@ u8 EnMd_ShouldSpawn(EnMd* this, PlayState* play) {
     }
 
     if (play->sceneNum == SCENE_MIDOS_HOUSE) {
-        if (((Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_MIDO_AFTER_DEKU_TREES_DEATH)) != 0) || ((Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_ZELDAS_LETTER)) != 0)) {
+        if (Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_MIDO_AFTER_DEKU_TREES_DEATH) || Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_ZELDAS_LETTER)) {
             if (!LINK_IS_ADULT) {
                 return 1;
             }
@@ -681,9 +659,8 @@ void EnMd_Init(Actor* thisx, PlayState* play) {
                        this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, FAIRY_KOKIRI);
 
     if (((play->sceneNum == SCENE_KOKIRI_FOREST) && !Flags_GetEventChkInf(EVENTCHKINF_SHOWED_MIDO_SWORD_SHIELD)) ||
-        ((play->sceneNum == SCENE_KOKIRI_FOREST) && (Flags_GetEventChkInf(EVENTCHKINF_SHOWED_MIDO_SWORD_SHIELD)) &&
-         ((!IS_RANDO && CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD)) ||
-          (IS_RANDO && Flags_GetRandomizerInf(RAND_INF_DUNGEONS_DONE_DEKU_TREE)))) ||
+        ((play->sceneNum == SCENE_KOKIRI_FOREST) && Flags_GetEventChkInf(EVENTCHKINF_SHOWED_MIDO_SWORD_SHIELD) &&
+         CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD)) ||
         ((play->sceneNum == SCENE_LOST_WOODS) && !Flags_GetEventChkInf(EVENTCHKINF_PLAYED_SARIAS_SONG_FOR_MIDO_AS_ADULT))) {
         this->actor.home.pos = this->actor.world.pos;
         this->actionFunc = func_80AAB948;
@@ -745,10 +722,11 @@ void func_80AAB948(EnMd* this, PlayState* play) {
         this->skelAnime.playSpeed = CLAMP(temp, 1.0f, 3.0f);
     }
 
-    if (this->interactInfo.talkState == NPC_TALK_STATE_ACTION) {
-        if ((!IS_RANDO && CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD) ||
-            IS_RANDO && Flags_GetRandomizerInf(RAND_INF_DUNGEONS_DONE_DEKU_TREE) &&
-            Flags_GetEventChkInf(EVENTCHKINF_SHOWED_MIDO_SWORD_SHIELD)) && !Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_MIDO_AFTER_DEKU_TREES_DEATH) &&
+    if (
+        (GameInteractor_Should(GI_VB_MOVE_MIDO_IN_KOKIRI_FOREST, this->interactInfo.talkState == NPC_TALK_STATE_ACTION, this) && play->sceneNum == SCENE_KOKIRI_FOREST) ||
+        this->interactInfo.talkState == NPC_TALK_STATE_ACTION
+    ) {
+        if (CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD) && !Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_MIDO_AFTER_DEKU_TREES_DEATH) &&
             (play->sceneNum == SCENE_KOKIRI_FOREST)) {
             play->msgCtx.msgMode = MSGMODE_PAUSED;
         }
@@ -815,9 +793,7 @@ void func_80AABD0C(EnMd* this, PlayState* play) {
         return;
     }
 
-    if ((!IS_RANDO && CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD) ||
-        IS_RANDO && Flags_GetRandomizerInf(RAND_INF_DUNGEONS_DONE_DEKU_TREE) &&
-        Flags_GetEventChkInf(EVENTCHKINF_SHOWED_MIDO_SWORD_SHIELD)) && !Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_MIDO_AFTER_DEKU_TREES_DEATH) &&
+    if (CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD) && !Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_MIDO_AFTER_DEKU_TREES_DEATH) &&
         (play->sceneNum == SCENE_KOKIRI_FOREST)) {
         Message_CloseTextbox(play);
         Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_MIDO_AFTER_DEKU_TREES_DEATH);
diff --git a/soh/src/overlays/actors/ovl_En_Mk/z_en_mk.c b/soh/src/overlays/actors/ovl_En_Mk/z_en_mk.c
index e5501858c..54e48bfc2 100644
--- a/soh/src/overlays/actors/ovl_En_Mk/z_en_mk.c
+++ b/soh/src/overlays/actors/ovl_En_Mk/z_en_mk.c
@@ -6,7 +6,7 @@
 
 #include "z_en_mk.h"
 #include "objects/object_mk/object_mk.h"
-#include "soh/Enhancements/randomizer/adult_trade_shuffle.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_WHILE_CULLED)
 
@@ -93,37 +93,24 @@ void func_80AACA40(EnMk* this, PlayState* play) {
 }
 
 void func_80AACA94(EnMk* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play) != 0) {
+    if (Actor_HasParent(&this->actor, play) != 0 || !GameInteractor_Should(GI_VB_TRADE_FROG, true, this)) {
         this->actor.parent = NULL;
         this->actionFunc = func_80AACA40;
-        if (!IS_RANDO) {
+        Flags_SetRandomizerInf(RAND_INF_ADULT_TRADES_LH_TRADE_FROG);
+        if (GameInteractor_Should(GI_VB_TRADE_TIMER_EYEDROPS, true, NULL)) {
             func_80088AA0(240);
             gSaveContext.eventInf[1] &= ~1;
         }
     } else {
-        if (IS_RANDO) {
-            GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_LH_TRADE_FROG, GI_EYEDROPS);
-            Randomizer_ConsumeAdultTradeItem(play, ITEM_FROG);
-            GiveItemEntryFromActor(&this->actor, play, getItemEntry, 10000.0f, 50.0f);
-            Flags_SetRandomizerInf(RAND_INF_ADULT_TRADES_LH_TRADE_FROG);
-        } else {
-            s32 getItemID = GI_EYEDROPS;
-            func_8002F434(&this->actor, play, getItemID, 10000.0f, 50.0f);
-        }
+        func_8002F434(&this->actor, play, GI_EYEDROPS, 10000.0f, 50.0f);
     }
 }
 
 void func_80AACB14(EnMk* this, PlayState* play) {
     if (Actor_TextboxIsClosing(&this->actor, play)) {
         this->actionFunc = func_80AACA94;
-        if (IS_RANDO) {
-            GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_LH_TRADE_FROG, GI_EYEDROPS);
-            Randomizer_ConsumeAdultTradeItem(play, ITEM_FROG);
-            GiveItemEntryFromActor(&this->actor, play, getItemEntry, 10000.0f, 50.0f);
-            Flags_SetRandomizerInf(RAND_INF_ADULT_TRADES_LH_TRADE_FROG);
-        } else {
-            s32 getItemID = GI_EYEDROPS;
-            func_8002F434(&this->actor, play, getItemID, 10000.0f, 50.0f);
+        if (GameInteractor_Should(GI_VB_TRADE_FROG, true, this)) {
+            func_8002F434(&this->actor, play, GI_EYEDROPS, 10000.0f, 50.0f);
         }
     }
 }
@@ -150,7 +137,7 @@ void func_80AACC04(EnMk* this, PlayState* play) {
     if (this->timer > 0) {
         this->timer--;
     } else {
-        this->timer = IS_RANDO ? 0 : 16;
+        this->timer = GameInteractor_Should(GI_VB_PLAY_EYEDROP_CREATION_ANIM, true, this) ? 16 : 0;
         this->actionFunc = func_80AACBAC;
         Animation_Change(&this->skelAnime, &object_mk_Anim_000D88, 1.0f, 0.0f,
                          Animation_GetLastFrame(&object_mk_Anim_000D88), ANIMMODE_LOOP, -4.0f);
@@ -163,7 +150,7 @@ void func_80AACCA0(EnMk* this, PlayState* play) {
         this->timer--;
         this->actor.shape.rot.y += 0x800;
     } else {
-        this->timer = IS_RANDO ? 0 : 120;
+        this->timer = GameInteractor_Should(GI_VB_PLAY_EYEDROP_CREATION_ANIM, true, this) ? 120 : 0;
         this->actionFunc = func_80AACC04;
         Animation_Change(&this->skelAnime, &object_mk_Anim_000724, 1.0f, 0.0f,
                          Animation_GetLastFrame(&object_mk_Anim_000724), ANIMMODE_LOOP, -4.0f);
@@ -179,7 +166,7 @@ void func_80AACD48(EnMk* this, PlayState* play) {
         this->actionFunc = func_80AACCA0;
         play->msgCtx.msgMode = MSGMODE_PAUSED;
         player->exchangeItemId = EXCH_ITEM_NONE;
-        this->timer = IS_RANDO ? 0 : 16;
+        this->timer = GameInteractor_Should(GI_VB_PLAY_EYEDROP_CREATION_ANIM, true, this) ? 16 : 0;
         Animation_Change(&this->skelAnime, &object_mk_Anim_000D88, 1.0f, 0.0f,
                          Animation_GetLastFrame(&object_mk_Anim_000D88), ANIMMODE_LOOP, -4.0f);
         this->flags &= ~2;
@@ -213,29 +200,20 @@ void func_80AACEE8(EnMk* this, PlayState* play) {
 }
 
 void func_80AACFA0(EnMk* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_LAB_DIVE, true, this)) {
         this->actor.parent = NULL;
         this->actionFunc = func_80AACA40;
         Flags_SetItemGetInf(ITEMGETINF_10);
     } else {
-        // not sure when/how/if this is getting called
-        if (!IS_RANDO) {
-            func_8002F434(&this->actor, play, GI_HEART_PIECE, 10000.0f, 50.0f);
-        } else {
-            GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_LH_LAB_DIVE, GI_HEART_PIECE);
-            GiveItemEntryFromActor(&this->actor, play, getItemEntry, 10000.0f, 50.0f);
-        }
+        func_8002F434(&this->actor, play, GI_HEART_PIECE, 10000.0f, 50.0f);
     }
 }
 
 void func_80AAD014(EnMk* this, PlayState* play) {
     if (Actor_TextboxIsClosing(&this->actor, play)) {
         this->actionFunc = func_80AACFA0;
-        if (!IS_RANDO) {
+        if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_LAB_DIVE, true, this)) {
             func_8002F434(&this->actor, play, GI_HEART_PIECE, 10000.0f, 50.0f);
-        } else {
-            GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_LH_LAB_DIVE, GI_HEART_PIECE);
-            GiveItemEntryFromActor(&this->actor, play, getItemEntry, 10000.0f, 50.0f);
         }
     }
 
@@ -255,9 +233,9 @@ void EnMk_Wait(EnMk* this, PlayState* play) {
             player->actor.textId = this->actor.textId;
             this->actionFunc = func_80AACA40;
         } else {
-            // Skip eye drop text on rando if Link went in the water, so you can still receive the dive check
-            if (INV_CONTENT(ITEM_ODD_MUSHROOM) == ITEM_EYEDROPS &&
-                (!IS_RANDO || this->swimFlag == 0)) {
+            if (GameInteractor_Should(GI_VB_USE_EYEDROP_DIALOGUE, (
+                INV_CONTENT(ITEM_ODD_MUSHROOM) == ITEM_EYEDROPS
+            ), this)) {
                 player->actor.textId = 0x4032;
                 this->actionFunc = func_80AACA40;
             } else {
diff --git a/soh/src/overlays/actors/ovl_En_Ms/z_en_ms.c b/soh/src/overlays/actors/ovl_En_Ms/z_en_ms.c
index b1d453f00..04b8166f7 100644
--- a/soh/src/overlays/actors/ovl_En_Ms/z_en_ms.c
+++ b/soh/src/overlays/actors/ovl_En_Ms/z_en_ms.c
@@ -6,6 +6,7 @@
 
 #include "z_en_ms.h"
 #include "objects/object_ms/object_ms.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY)
 
@@ -127,20 +128,16 @@ void EnMs_Talk(EnMs* this, PlayState* play) {
     } else if (Message_ShouldAdvance(play)) {
         switch (play->msgCtx.choiceIndex) {
             case 0: // yes
-                if (gSaveContext.rupees <
-                    ((IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_MAGIC_BEANS))
-                         ? 60
-                         : sPrices[BEANS_BOUGHT])) {
+                if (!GameInteractor_Should(GI_VB_BE_ELIGIBLE_FOR_MAGIC_BEANS_PURCHASE, (
+                    gSaveContext.rupees >= sPrices[BEANS_BOUGHT]), this)) {
                     Message_ContinueTextbox(play, 0x4069); // not enough rupees text
                     return;
                 }
-                if (IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_MAGIC_BEANS)) {
-                    GiveItemEntryFromActor(&this->actor, play, 
-                        Randomizer_GetItemFromKnownCheck(RC_ZR_MAGIC_BEAN_SALESMAN, GI_BEAN), 90.0f, 10.0f);
-                } else {
+    
+                if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_MAGIC_BEAN_SALESMAN, true, this)) {
                     func_8002F434(&this->actor, play, GI_BEAN, 90.0f, 10.0f);
+                    this->actionFunc = EnMs_Sell;
                 }
-                this->actionFunc = EnMs_Sell;
                 return;
             case 1: // no
                 Message_ContinueTextbox(play, 0x4068);
@@ -152,23 +149,14 @@ void EnMs_Talk(EnMs* this, PlayState* play) {
 
 void EnMs_Sell(EnMs* this, PlayState* play) {
     if (Actor_HasParent(&this->actor, play)) {
-        Rupees_ChangeBy((IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_MAGIC_BEANS)) ? -60 : -sPrices[BEANS_BOUGHT]);
+        Rupees_ChangeBy(-sPrices[BEANS_BOUGHT]);
         this->actor.parent = NULL;
-        this->actionFunc =
-            (IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_MAGIC_BEANS)) ? EnMs_Wait : EnMs_TalkAfterPurchase;
+        this->actionFunc = EnMs_TalkAfterPurchase;
     } else {
-        if (IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_MAGIC_BEANS)) {
-            GetItemEntry itemEntry = Randomizer_GetItemFromKnownCheck(RC_ZR_MAGIC_BEAN_SALESMAN, GI_BEAN);
-            gSaveContext.pendingSale = itemEntry.itemId;
-            gSaveContext.pendingSaleMod = itemEntry.modIndex;
-            GiveItemEntryFromActor(&this->actor, play, itemEntry, 90.0f, 10.0f);
-            BEANS_BOUGHT = 10;
-        } else {
-            GetItemEntry entry = ItemTable_Retrieve(GI_BEAN);
-            gSaveContext.pendingSaleMod = entry.modIndex;
-            gSaveContext.pendingSale = entry.itemId;
-            func_8002F434(&this->actor, play, GI_BEAN, 90.0f, 10.0f);
-        }
+        GetItemEntry entry = ItemTable_Retrieve(GI_BEAN);
+        gSaveContext.pendingSaleMod = entry.modIndex;
+        gSaveContext.pendingSale = entry.itemId;
+        func_8002F434(&this->actor, play, GI_BEAN, 90.0f, 10.0f);
     }
 }
 
diff --git a/soh/src/overlays/actors/ovl_En_Ms/z_en_ms.h b/soh/src/overlays/actors/ovl_En_Ms/z_en_ms.h
index 70b105073..e626056f0 100644
--- a/soh/src/overlays/actors/ovl_En_Ms/z_en_ms.h
+++ b/soh/src/overlays/actors/ovl_En_Ms/z_en_ms.h
@@ -18,4 +18,7 @@ typedef struct EnMs {
     /* 0x024C */ s16 activeTimer;
 } EnMs; // size = 0x0250
 
+void EnMs_TalkAfterPurchase(EnMs* enMs, PlayState* play);
+void EnMs_Wait(EnMs* enMs, PlayState* play);
+
 #endif
diff --git a/soh/src/overlays/actors/ovl_En_Nb/z_en_nb.c b/soh/src/overlays/actors/ovl_En_Nb/z_en_nb.c
index a519209aa..9a3990cf8 100644
--- a/soh/src/overlays/actors/ovl_En_Nb/z_en_nb.c
+++ b/soh/src/overlays/actors/ovl_En_Nb/z_en_nb.c
@@ -8,6 +8,7 @@
 #include "vt.h"
 #include "objects/object_nb/object_nb.h"
 #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_WHILE_CULLED
 
@@ -326,7 +327,9 @@ void EnNb_GiveMedallion(EnNb* this, PlayState* play) {
 
     Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DEMO_EFFECT, posX, posY, posZ, 0, 0, 0,
                        0xC);
-    Item_Give(play, ITEM_MEDALLION_SPIRIT);
+    if (GameInteractor_Should(GI_VB_GIVE_ITEM_SPIRIT_MEDALLION, true, NULL)) {
+        Item_Give(play, ITEM_MEDALLION_SPIRIT);
+    }
 }
 
 void EnNb_ComeUpImpl(EnNb* this, PlayState* play) {
@@ -342,7 +345,9 @@ void EnNb_SetupChamberCsImpl(EnNb* this, PlayState* play) {
         this->action = NB_CHAMBER_UNDERGROUND;
         play->csCtx.segment = &D_80AB431C;
         gSaveContext.cutsceneTrigger = 2;
-        Item_Give(play, ITEM_MEDALLION_SPIRIT);
+        if (GameInteractor_Should(GI_VB_GIVE_ITEM_SPIRIT_MEDALLION, true, NULL)) {
+            Item_Give(play, ITEM_MEDALLION_SPIRIT);
+        }
         player->actor.world.rot.y = player->actor.shape.rot.y = this->actor.world.rot.y + 0x8000;
     }
 }
diff --git a/soh/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c b/soh/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c
index 8ddf52fad..b4e6d8892 100644
--- a/soh/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c
+++ b/soh/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c
@@ -3,7 +3,7 @@
 #include "objects/object_os_anime/object_os_anime.h"
 #include "overlays/actors/ovl_En_Niw/z_en_niw.h"
 #include "vt.h"
-#include "soh/Enhancements/randomizer/adult_trade_shuffle.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_WHILE_CULLED)
 
@@ -204,7 +204,9 @@ void func_80ABA244(EnNiwLady* this, PlayState* play) {
     EnNiw* currentCucco;
     s32 phi_s1;
 
-    this->cuccosInPen = IS_RANDO ? (7 - Randomizer_GetSettingValue(RSK_CUCCO_COUNT)) : 0;
+    if (GameInteractor_Should(GI_VB_SET_CUCCO_COUNT, true, this)) {
+        this->cuccosInPen = 0;
+    }
     currentCucco = (EnNiw*)play->actorCtx.actorLists[ACTORCAT_PROP].head;
     while (currentCucco != NULL) {
         if (currentCucco->actor.id == ACTOR_EN_NIW) {
@@ -239,9 +241,11 @@ void func_80ABA244(EnNiwLady* this, PlayState* play) {
             phi_s1 = 7;
         }
     }
+    // Completed minigame and then threw Cucco(s) out of the pen
     if ((this->unk_26C != 0) && (phi_s1 < 7)) {
         phi_s1 = 9;
     }
+
     this->actor.textId = sMissingCuccoTextIds[phi_s1];
     if (Text_GetFaceReaction(play, 8) != 0) {
         this->actor.textId = Text_GetFaceReaction(play, 8);
@@ -308,16 +312,18 @@ void func_80ABA654(EnNiwLady* this, PlayState* play) {
         if (!Flags_GetItemGetInf(ITEMGETINF_0C)) {
             this->actor.parent = NULL;
 
-            if (!IS_RANDO) {
+            if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_ANJU_AS_CHILD, true, this)) {
                 this->getItemId = GI_BOTTLE;
                 func_8002F434(&this->actor, play, GI_BOTTLE, 100.0f, 50.0f);
             } else {
-                this->getItemEntry = Randomizer_GetItemFromKnownCheck(RC_KAK_ANJU_AS_CHILD, GI_BOTTLE);
-                GiveItemEntryFromActor(&this->actor, play, this->getItemEntry, 100.0f, 50.0f);
+                // Circumvent the item offer action
+                this->actionFunc = func_80ABAC84;
+                return;
             }
 
             this->actionFunc = func_80ABAC00;
             return;
+
         }
         if (this->unk_26C == 1) {
             this->getItemId = GI_RUPEE_PURPLE;
@@ -398,15 +404,15 @@ void func_80ABA9B8(EnNiwLady* this, PlayState* play) {
                 Message_CloseTextbox(play);
                 this->actor.parent = NULL;
 
-                if (!IS_RANDO) {
+                if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_ANJU_AS_ADULT, true, this)) {
                     func_8002F434(&this->actor, play, GI_POCKET_EGG, 200.0f, 100.0f);
+                    this->actionFunc = func_80ABAC00;
                 } else {
-                    this->getItemEntry = Randomizer_GetItemFromKnownCheck(RC_KAK_ANJU_AS_ADULT, GI_POCKET_EGG);
-                    GiveItemEntryFromActor(&this->actor, play, this->getItemEntry, 200.0f, 100.0f);
-                    Flags_SetItemGetInf(ITEMGETINF_2C);
+                    // Circumvent the item offer action
+                    this->actionFunc = func_80ABAC84;
+                    return;
                 }
 
-                this->actionFunc = func_80ABAC00;
                 break;
             case 1:
                 this->actor.textId = sTradeItemTextIds[3];
@@ -433,15 +439,14 @@ void func_80ABAB08(EnNiwLady* this, PlayState* play) {
             case 0:
                 Message_CloseTextbox(play);
                 this->actor.parent = NULL;
-                if (!IS_RANDO) {
+                if (GameInteractor_Should(GI_VB_TRADE_POCKET_CUCCO, true, this)) {
                     func_8002F434(&this->actor, play, GI_COJIRO, 200.0f, 100.0f);
+                    this->actionFunc = func_80ABAC00;
                 } else {
-                    this->getItemEntry = Randomizer_GetItemFromKnownCheck(RC_KAK_TRADE_POCKET_CUCCO, GI_COJIRO);
-                    Randomizer_ConsumeAdultTradeItem(play, ITEM_POCKET_CUCCO);
-                    GiveItemEntryFromActor(&this->actor, play, this->getItemEntry, 200.0f, 100.0f);
-                    Flags_SetItemGetInf(ITEMGETINF_2E);
+                    // Circumvent the item offer action
+                    this->actionFunc = func_80ABAC84;
+                    return;
                 }
-                this->actionFunc = func_80ABAC00;
                 break;
             case 1:
                 Message_CloseTextbox(play);
@@ -462,12 +467,6 @@ void func_80ABAC00(EnNiwLady* this, PlayState* play) {
     if (Actor_HasParent(&this->actor, play)) {
         this->actionFunc = func_80ABAC84;
     } else {
-         if (IS_RANDO) {
-            getItemId = this->getItemEntry.getItemId;
-            GiveItemEntryFromActor(&this->actor, play, this->getItemEntry, 200.0f, 100.0f);
-            return;
-        }
-
         getItemId = this->getItemId;
         if (LINK_IS_ADULT) {
             getItemId = !Flags_GetItemGetInf(ITEMGETINF_2C) ? GI_POCKET_EGG : GI_COJIRO;
@@ -482,8 +481,7 @@ void func_80ABAC84(EnNiwLady* this, PlayState* play) {
     }
     osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 正常終了 ☆☆☆☆☆ \n" VT_RST);
     if (LINK_IS_ADULT) {
-        // Flags for randomizer gives are set in the original message prompt choice handling
-        if (!IS_RANDO) {
+        if (GameInteractor_Should(GI_VB_ANJU_SET_OBTAINED_TRADE_ITEM, true, this)) {
             if (!Flags_GetItemGetInf(ITEMGETINF_2C)) {
                 Flags_SetItemGetInf(ITEMGETINF_2C);
             } else {
diff --git a/soh/src/overlays/actors/ovl_En_Owl/z_en_owl.c b/soh/src/overlays/actors/ovl_En_Owl/z_en_owl.c
index 303c58819..4ae7d366f 100644
--- a/soh/src/overlays/actors/ovl_En_Owl/z_en_owl.c
+++ b/soh/src/overlays/actors/ovl_En_Owl/z_en_owl.c
@@ -10,6 +10,7 @@
 #include "scenes/overworld/spot16/spot16_scene.h"
 #include "vt.h"
 #include <assert.h>
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_WHILE_CULLED)
 
@@ -42,6 +43,7 @@ void func_80ACAF74(EnOwl* this, PlayState* play);
 void func_80ACC30C(EnOwl* this, PlayState* play);
 void func_80ACB4FC(EnOwl* this, PlayState* play);
 void func_80ACB680(EnOwl* this, PlayState* play);
+void func_80ACA62C(EnOwl* this, PlayState* play);
 void func_80ACC460(EnOwl* this);
 void func_80ACBEA0(EnOwl*, PlayState*);
 
@@ -137,9 +139,7 @@ void EnOwl_Init(Actor* thisx, PlayState* play) {
     // "conversation owl %4x no = %d, sv = %d"
     osSyncPrintf(VT_FGCOL(CYAN) " 会話フクロウ %4x no = %d, sv = %d\n" VT_RST, this->actor.params, owlType, switchFlag);
 
-    if (((owlType != OWL_DEFAULT) && (switchFlag < 0x20) && Flags_GetSwitch(play, switchFlag)) ||
-        // Owl shortcuts at SPOT06: Lake Hylia and SPOT16: Death Mountain Trail
-        (IS_RANDO && !(play->sceneNum == SCENE_LAKE_HYLIA || play->sceneNum == SCENE_DEATH_MOUNTAIN_TRAIL))) {
+    if ((owlType != OWL_DEFAULT) && (switchFlag < 0x20) && Flags_GetSwitch(play, switchFlag)) {
         osSyncPrintf("savebitでフクロウ退避\n"); // "Save owl with savebit"
         Actor_Kill(&this->actor);
         return;
@@ -283,7 +283,7 @@ s32 EnOwl_CheckInitTalk(EnOwl* this, PlayState* play, u16 textId, f32 targetDist
     } else {
         this->actor.textId = textId;
         distCheck = (flags & 2) ? 200.0f : 1000.0f;
-        if (this->actor.xzDistToPlayer < targetDist) {
+        if (GameInteractor_Should(GI_VB_OWL_INTERACTION, this->actor.xzDistToPlayer < targetDist, this)) {
             this->actor.flags |= ACTOR_FLAG_WILL_TALK;
             func_8002F1C4(&this->actor, play, targetDist, distCheck, 0);
         }
diff --git a/soh/src/overlays/actors/ovl_En_Owl/z_en_owl.h b/soh/src/overlays/actors/ovl_En_Owl/z_en_owl.h
index 7a20eaa3a..a898dce2a 100644
--- a/soh/src/overlays/actors/ovl_En_Owl/z_en_owl.h
+++ b/soh/src/overlays/actors/ovl_En_Owl/z_en_owl.h
@@ -43,4 +43,6 @@ typedef struct EnOwl {
     /* 0x0410 */ OwlFunc unk_410;
 } EnOwl; // size = 0x0414
 
+void func_80ACA62C(EnOwl* enOwl, PlayState* play);
+
 #endif
diff --git a/soh/src/overlays/actors/ovl_En_Rl/z_en_rl.c b/soh/src/overlays/actors/ovl_En_Rl/z_en_rl.c
index 73996d58f..eafa8b82e 100644
--- a/soh/src/overlays/actors/ovl_En_Rl/z_en_rl.c
+++ b/soh/src/overlays/actors/ovl_En_Rl/z_en_rl.c
@@ -7,6 +7,7 @@
 #include "z_en_rl.h"
 #include "vt.h"
 #include "objects/object_rl/object_rl.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_WHILE_CULLED
 
@@ -126,7 +127,9 @@ void func_80AE7590(EnRl* this, PlayState* play) {
         pos.y = player->actor.world.pos.y + 80.0f;
         pos.z = player->actor.world.pos.z;
         Actor_Spawn(&play->actorCtx, play, ACTOR_DEMO_EFFECT, pos.x, pos.y, pos.z, 0, 0, 0, 0xE, true);
-        Item_Give(play, ITEM_MEDALLION_LIGHT);
+        if (GameInteractor_Should(GI_VB_GIVE_ITEM_LIGHT_MEDALLION, true, NULL)) {
+            Item_Give(play, ITEM_MEDALLION_LIGHT);
+        }
         this->lightMedallionGiven = 1;
     }
 }
diff --git a/soh/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c b/soh/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c
index fe4a77724..93d1fd99c 100644
--- a/soh/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c
+++ b/soh/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c
@@ -8,6 +8,7 @@
 #include "objects/object_ru2/object_ru2.h"
 #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h"
 #include "vt.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_WHILE_CULLED
 
@@ -260,7 +261,9 @@ void func_80AF2A38(EnRu2* this, PlayState* play) {
     f32 posZ = player->actor.world.pos.z;
 
     Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DEMO_EFFECT, posX, posY, posZ, 0, 0, 0, 10);
-    Item_Give(play, ITEM_MEDALLION_WATER);
+    if (GameInteractor_Should(GI_VB_GIVE_ITEM_WATER_MEDALLION, true, NULL)) {
+        Item_Give(play, ITEM_MEDALLION_WATER);
+    }
 }
 
 void func_80AF2AB4(EnRu2* this, PlayState* play) {
@@ -273,7 +276,9 @@ void func_80AF2AB4(EnRu2* this, PlayState* play) {
         this->action = 1;
         play->csCtx.segment = &D_80AF411C;
         gSaveContext.cutsceneTrigger = 2;
-        Item_Give(play, ITEM_MEDALLION_WATER);
+        if (GameInteractor_Should(GI_VB_GIVE_ITEM_WATER_MEDALLION, true, NULL)) {
+            Item_Give(play, ITEM_MEDALLION_WATER);
+        }
         temp = this->actor.world.rot.y + 0x8000;
         player->actor.shape.rot.y = temp;
         player->actor.world.rot.y = temp;
diff --git a/soh/src/overlays/actors/ovl_En_Sa/z_en_sa.c b/soh/src/overlays/actors/ovl_En_Sa/z_en_sa.c
index 9e09a705c..f2b2db3f9 100644
--- a/soh/src/overlays/actors/ovl_En_Sa/z_en_sa.c
+++ b/soh/src/overlays/actors/ovl_En_Sa/z_en_sa.c
@@ -3,6 +3,7 @@
 #include "objects/object_sa/object_sa.h"
 #include "scenes/overworld/spot04/spot04_scene.h"
 #include "scenes/overworld/spot05/spot05_scene.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_WHILE_CULLED | ACTOR_FLAG_NO_FREEZE_OCARINA)
 
@@ -390,13 +391,10 @@ s32 func_80AF5DFC(EnSa* this, PlayState* play) {
         return 1;
     }
     if (play->sceneNum == SCENE_SACRED_FOREST_MEADOW && (Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_ZELDAS_LETTER))) {
-        if (IS_RANDO) {
-            return 5;
-        }
-        return CHECK_QUEST_ITEM(QUEST_SONG_SARIA) ? 2 : 5;
+        return GameInteractor_Should(GI_VB_BE_ELIGIBLE_FOR_SARIAS_SONG, !CHECK_QUEST_ITEM(QUEST_SONG_SARIA), NULL) ? 5 : 2;
     }
     if (play->sceneNum == SCENE_KOKIRI_FOREST && !CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD)) {
-        if (Flags_GetInfTable(INFTABLE_GREETED_BY_SARIA)) {
+        if (GameInteractor_Should(GI_VB_NOT_BE_GREETED_BY_SARIA, Flags_GetInfTable(INFTABLE_GREETED_BY_SARIA), NULL)) {
             return 1;
         }
         return 4;
@@ -622,28 +620,17 @@ void func_80AF67D0(EnSa* this, PlayState* play) {
     }
 }
 
-void GivePlayerRandoRewardSaria(EnSa* saria, PlayState* play, RandomizerCheck check) {
-    GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(check, RG_SARIAS_SONG);
-    if (saria->actor.parent != NULL && saria->actor.parent->id == GET_PLAYER(play)->actor.id &&
-        !Flags_GetTreasure(play, 0x1F)) {
-        Flags_SetTreasure(play, 0x1F);
-    } else if (!Flags_GetTreasure(play, 0x1F)) {
-        GiveItemEntryFromActor(&saria->actor, play, getItemEntry, 10000.0f, 100.0f);
-    }
-}
-
 void func_80AF683C(EnSa* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
 
     if (!(player->actor.world.pos.z >= -2220.0f) && !Play_InCsMode(play)) {
-        if (IS_RANDO) {
-            GivePlayerRandoRewardSaria(this, play, RC_SONG_FROM_SARIA);
-            return;
+        // SOH [General] This flag was previously unused, but was named accordingly so we will make use of it. (Normally we should opt for soh_inf)
+        Flags_SetEventChkInf(EVENTCHKINF_LEARNED_SARIAS_SONG);
+        if (GameInteractor_Should(GI_VB_PLAY_SARIAS_SONG_CS, true, this)) {
+            play->csCtx.segment = SEGMENTED_TO_VIRTUAL(spot05_scene_Cs_005730);
+            gSaveContext.cutsceneTrigger = 1;
+            this->actionFunc = func_80AF68E4;
         }
-
-        play->csCtx.segment = SEGMENTED_TO_VIRTUAL(spot05_scene_Cs_005730);
-        gSaveContext.cutsceneTrigger = 1;
-        this->actionFunc = func_80AF68E4;
     }
 }
 
@@ -721,7 +708,9 @@ void func_80AF68E4(EnSa* this, PlayState* play) {
 
 void func_80AF6B20(EnSa* this, PlayState* play) {
     if (play->sceneNum == SCENE_SACRED_FOREST_MEADOW) {
-        Item_Give(play, ITEM_SONG_SARIA);
+        if (GameInteractor_Should(GI_VB_GIVE_ITEM_SARIAS_SONG, true, NULL)) {
+            Item_Give(play, ITEM_SONG_SARIA);
+        }
         EnSa_ChangeAnim(this, ENSA_ANIM1_6);
     }
 
diff --git a/soh/src/overlays/actors/ovl_En_Sa/z_en_sa.h b/soh/src/overlays/actors/ovl_En_Sa/z_en_sa.h
index 2965f04ab..56d368f13 100644
--- a/soh/src/overlays/actors/ovl_En_Sa/z_en_sa.h
+++ b/soh/src/overlays/actors/ovl_En_Sa/z_en_sa.h
@@ -30,4 +30,6 @@ typedef struct EnSa {
     /* 0x0286 */ Vec3s morphTable[17];
 } EnSa; // size = 0x02EC
 
+void func_80AF6B20(EnSa* enSa, PlayState* play);
+
 #endif
diff --git a/soh/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c b/soh/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c
index 6f48314ff..0f300d16f 100644
--- a/soh/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c
+++ b/soh/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c
@@ -1,5 +1,6 @@
 #include "z_en_shopnuts.h"
 #include "objects/object_shopnuts/object_shopnuts.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_HOSTILE)
 
@@ -69,18 +70,11 @@ void EnShopnuts_Init(Actor* thisx, PlayState* play) {
     CollisionCheck_SetInfo(&this->actor.colChkInfo, NULL, &sColChkInfoInit);
     Collider_UpdateCylinder(&this->actor, &this->collider);
 
-    if (IS_RANDO) {
-        s16 respawnData = gSaveContext.respawn[RESPAWN_MODE_RETURN].data & ((1 << 8) - 1);
-        ScrubIdentity scrubIdentity = Randomizer_IdentifyScrub(play->sceneNum, this->actor.params, respawnData);
-
-        if (scrubIdentity.isShuffled && Flags_GetRandomizerInf(scrubIdentity.randomizerInf)) {
-            Actor_Kill(&this->actor);
-        }
-    }
-
-    if (((this->actor.params == 0x0002) && (Flags_GetItemGetInf(ITEMGETINF_0B))) ||
+    if (GameInteractor_Should(GI_VB_BUSINESS_SCRUB_DESPAWN,
+        ((this->actor.params == 0x0002) && (Flags_GetItemGetInf(ITEMGETINF_0B))) ||
         ((this->actor.params == 0x0009) && (Flags_GetInfTable(INFTABLE_192))) ||
-        ((this->actor.params == 0x000A) && (Flags_GetInfTable(INFTABLE_193)))) {
+        ((this->actor.params == 0x000A) && (Flags_GetInfTable(INFTABLE_193))),
+    this)) {
         Actor_Kill(&this->actor);
     } else {
         EnShopnuts_SetupWait(this);
diff --git a/soh/src/overlays/actors/ovl_En_Si/z_en_si.c b/soh/src/overlays/actors/ovl_En_Si/z_en_si.c
index 49e88f903..8eb669d2d 100644
--- a/soh/src/overlays/actors/ovl_En_Si/z_en_si.c
+++ b/soh/src/overlays/actors/ovl_En_Si/z_en_si.c
@@ -7,9 +7,6 @@
 #include "z_en_si.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
-extern void func_8083C148(Player*, PlayState*);
-extern void func_80078884(uint16_t);
-
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_HOOKSHOT_DRAGS)
 
 void EnSi_Init(Actor* thisx, PlayState* play);
@@ -21,13 +18,6 @@ s32 func_80AFB748(EnSi* this, PlayState* play);
 void func_80AFB768(EnSi* this, PlayState* play);
 void func_80AFB89C(EnSi* this, PlayState* play);
 void func_80AFB950(EnSi* this, PlayState* play);
-void Randomizer_UpdateSkullReward(EnSi* this, PlayState* play);
-void Randomizer_GiveSkullReward(EnSi* this, PlayState* play);
-
-s32 textId = 0xB4;
-s32 giveItemId = ITEM_SKULL_TOKEN;
-s32 getItemId;
-GetItemEntry getItem;
 
 static ColliderCylinderInit sCylinderInit = {
     {
@@ -104,36 +94,12 @@ void func_80AFB768(EnSi* this, PlayState* play) {
 
             if (this->collider.base.ocFlags2 & OC2_HIT_PLAYER) {
                 this->collider.base.ocFlags2 &= ~OC2_HIT_PLAYER;
-
-                if (IS_RANDO) {
-                    Randomizer_UpdateSkullReward(this, play);
-                } else {
-                    Item_Give(play, giveItemId);
-                }
-                if ((!CVarGetInteger("gSkulltulaFreeze", 0) || giveItemId != ITEM_SKULL_TOKEN) &&
-                    getItemId != RG_ICE_TRAP) {
-                    player->actor.freezeTimer = 20;
-                }
-
-                if (getItemId == RG_ICE_TRAP && Message_GetState(&play->msgCtx) != TEXT_STATE_CLOSING) {
+                if (GameInteractor_Should(GI_VB_GIVE_ITEM_SKULL_TOKEN, true, this)) {
+                    Item_Give(play, ITEM_SKULL_TOKEN);
                     player->actor.freezeTimer = 10;
-                }
-
-                Message_StartTextbox(play, textId, NULL);
-
-                if (IS_RANDO) {
-                    if (getItemId != RG_ICE_TRAP) {
-                        Randomizer_GiveSkullReward(this, play);
-                        Audio_PlayFanfare_Rando(getItem);
-                    } else {
-                        gSaveContext.pendingIceTrapCount++;
-                        Audio_PlayFanfare(NA_BGM_SMALL_ITEM_GET);
-                    }
-                } else {
+                    Message_StartTextbox(play, 0xB4, NULL);
                     Audio_PlayFanfare(NA_BGM_SMALL_ITEM_GET);
                 }
-
-                player->getItemEntry = (GetItemEntry)GET_ITEM_NONE;
                 this->actionFunc = func_80AFB950;
             } else {
                 Collider_UpdateCylinder(&this->actor, &this->collider);
@@ -146,32 +112,18 @@ void func_80AFB768(EnSi* this, PlayState* play) {
 
 void func_80AFB89C(EnSi* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
+
     Math_SmoothStepToF(&this->actor.scale.x, 0.25f, 0.4f, 1.0f, 0.0f);
     Actor_SetScale(&this->actor, this->actor.scale.x);
     this->actor.shape.rot.y += 0x400;
 
     if (!CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_HOOKSHOT_ATTACHED)) {
-        if (IS_RANDO) {
-            Randomizer_UpdateSkullReward(this, play);
-        } else {
-            Item_Give(play, giveItemId);
-        }
-
-        Message_StartTextbox(play, textId, NULL);
-
-        if (IS_RANDO) {
-            if (getItemId != RG_ICE_TRAP) {
-                Randomizer_GiveSkullReward(this, play);
-                Audio_PlayFanfare_Rando(getItem);
-            } else {
-                gSaveContext.pendingIceTrapCount++;
-                Audio_PlayFanfare(NA_BGM_SMALL_ITEM_GET);
-            }
-        } else {
+        if (GameInteractor_Should(GI_VB_GIVE_ITEM_SKULL_TOKEN, true, this)) {
+            Item_Give(play, ITEM_SKULL_TOKEN);
+            player->actor.freezeTimer = 10;
+            Message_StartTextbox(play, 0xB4, NULL);
             Audio_PlayFanfare(NA_BGM_SMALL_ITEM_GET);
         }
-
-        player->getItemEntry = (GetItemEntry)GET_ITEM_NONE;
         this->actionFunc = func_80AFB950;
     }
 }
@@ -179,19 +131,12 @@ void func_80AFB89C(EnSi* this, PlayState* play) {
 void func_80AFB950(EnSi* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
 
-    if (Message_GetState(&play->msgCtx) != TEXT_STATE_CLOSING &&
-        (!CVarGetInteger("gSkulltulaFreeze", 0) || getItemId == RG_ICE_TRAP || giveItemId != ITEM_SKULL_TOKEN)) {
+    if (Message_GetState(&play->msgCtx) != TEXT_STATE_CLOSING && GameInteractor_Should(GI_VB_GIVE_ITEM_SKULL_TOKEN, true, this)) {
         player->actor.freezeTimer = 10;
     } else {
         SET_GS_FLAGS((this->actor.params & 0x1F00) >> 8, this->actor.params & 0xFF);
         GameInteractor_ExecuteOnFlagSet(FLAG_GS_TOKEN, this->actor.params);
         Actor_Kill(&this->actor);
-        if (gSaveContext.pendingIceTrapCount > 0 && player->heldItemId == 11) {
-            player->actor.freezeTimer = 0;
-            func_8083C148(GET_PLAYER(play), play);
-            func_80078884(NA_SE_SY_CAMERA_ZOOM_UP);
-            player->currentYaw = player->actor.shape.rot.y;
-        }
     }
 }
 
@@ -210,44 +155,6 @@ void EnSi_Draw(Actor* thisx, PlayState* play) {
     if (this->actionFunc != func_80AFB950) {
         func_8002ED80(&this->actor, play, 0);
         func_8002EBCC(&this->actor, play, 0);
-        if (!IS_RANDO) {
-            GetItem_Draw(play, GID_SKULL_TOKEN_2);
-        } else {
-            getItem = Randomizer_GetItemFromActor(this->actor.id, play->sceneNum, this->actor.params, GI_SKULL_TOKEN);
-            EnItem00_CustomItemsParticles(&this->actor, play, getItem);
-            if (getItem.itemId != ITEM_SKULL_TOKEN) {
-                f32 mtxScale = 1.5f;
-                Matrix_Scale(mtxScale, mtxScale, mtxScale, MTXMODE_APPLY);
-            }
-            GetItemEntry_Draw(play, getItem);
-        }
-    }
-}
-
-void Randomizer_UpdateSkullReward(EnSi* this, PlayState* play) {
-    Player* player = GET_PLAYER(play);
-
-    getItem = Randomizer_GetItemFromActor(this->actor.id, play->sceneNum, this->actor.params, GI_SKULL_TOKEN);
-    getItemId = getItem.getItemId;
-    if (getItemId == RG_ICE_TRAP) {
-        textId = 0xF8;
-    } else {
-        textId = getItem.textId;
-        giveItemId = getItem.itemId;
-    }
-    player->getItemEntry = getItem;
-}
-
-void Randomizer_GiveSkullReward(EnSi* this, PlayState* play) {
-    Player* player = GET_PLAYER(play);
-
-    if (getItem.modIndex == MOD_NONE) {
-        // RANDOTOD: Move this into Item_Give() or some other more central location
-        if (getItem.getItemId == GI_SWORD_BGS) {
-            gSaveContext.bgsFlag = true;
-        }
-        Item_Give(play, giveItemId);
-    } else if (getItem.modIndex == MOD_RANDOMIZER) {
-        Randomizer_Item_Give(play, getItem);
+        GetItem_Draw(play, GID_SKULL_TOKEN_2);
     }
 }
diff --git a/soh/src/overlays/actors/ovl_En_Si/z_en_si.h b/soh/src/overlays/actors/ovl_En_Si/z_en_si.h
index dc0a3b400..318876289 100644
--- a/soh/src/overlays/actors/ovl_En_Si/z_en_si.h
+++ b/soh/src/overlays/actors/ovl_En_Si/z_en_si.h
@@ -13,6 +13,9 @@ typedef struct EnSi {
     /* 0x014C */ EnSiActionFunc actionFunc;
     /* 0x0150 */ ColliderCylinder collider;
     /* 0x019C */ u8 unk_19C;
+    // #region SOH [Randomizer] Caching the get item entry for the draw function for performance
+    /*        */ GetItemEntry sohGetItemEntry;
+    // #endregion
 } EnSi; // size = 0x01A0
 
 #endif
diff --git a/soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c b/soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c
index 0eb3e9095..2f47f7c2a 100644
--- a/soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c
+++ b/soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c
@@ -7,6 +7,7 @@
 #include "z_en_ta.h"
 #include "vt.h"
 #include "objects/object_ta/object_ta.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY)
 
@@ -466,7 +467,7 @@ void func_80B14B6C(EnTa* this, PlayState* play) {
         func_80B13AA0(this, func_80B14AF4, func_80B167C0);
         this->unk_2CC = 5;
         Flags_SetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE);
-        if (IS_RANDO) {
+        if (GameInteractor_Should(GI_VB_PLAY_ONEPOINT_ACTOR_CS, true, this)) {
             OnePointCutscene_EndCutscene(play, csCamIdx);
         }
         Animation_PlayOnce(&this->skelAnime, &gTalonRunTransitionAnim);
diff --git a/soh/src/overlays/actors/ovl_En_Tk/z_en_tk.c b/soh/src/overlays/actors/ovl_En_Tk/z_en_tk.c
index 55fbed824..342eed149 100644
--- a/soh/src/overlays/actors/ovl_En_Tk/z_en_tk.c
+++ b/soh/src/overlays/actors/ovl_En_Tk/z_en_tk.c
@@ -8,12 +8,9 @@
 #include "objects/gameplay_keep/gameplay_keep.h"
 #include "objects/object_tk/object_tk.h"
 #include "soh/frame_interpolation.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY)
-#define COLLECTFLAG_GRAVEDIGGING_HEART_PIECE 0x19
-#define ITEMGETINFFLAG_GRAVEDIGGING_HEART_PIECE 0x1000
-
-bool heartPieceSpawned;
 
 void EnTk_Init(Actor* thisx, PlayState* play);
 void EnTk_Destroy(Actor* thisx, PlayState* play);
@@ -408,10 +405,6 @@ s32 EnTk_ChooseReward(EnTk* this) {
     f32 luck;
     s32 reward;
 
-    if ((IS_RANDO || CVarGetInteger("gDampeWin", 0)) && !Flags_GetCollectible(gPlayState, COLLECTFLAG_GRAVEDIGGING_HEART_PIECE) && this->heartPieceSpawned == 0) {
-        return 3;
-    }
-
     luck = Rand_ZeroOne();
 
     if (luck < 0.4f) {
@@ -502,12 +495,7 @@ void EnTk_Init(Actor* thisx, PlayState* play) {
 
     CollisionCheck_SetInfo2(&this->actor.colChkInfo, NULL, &sColChkInfoInit);
 
-    if (CVarGetInteger("gDampeAllNight", 0)) {
-        if (!!LINK_IS_ADULT || play->sceneNum != SCENE_GRAVEYARD) {
-            Actor_Kill(&this->actor);
-            return;
-        }
-    } else if (gSaveContext.dayTime <= 0xC000 || gSaveContext.dayTime >= 0xE000 || !!LINK_IS_ADULT || play->sceneNum != SCENE_GRAVEYARD) {
+    if (GameInteractor_Should(GI_VB_DAMPE_IN_GRAVEYARD_DESPAWN, gSaveContext.dayTime <= 0xC000 || gSaveContext.dayTime >= 0xE000 || LINK_IS_ADULT || play->sceneNum != SCENE_GRAVEYARD, this)) {
         Actor_Kill(&this->actor);
         return;
     }
@@ -519,7 +507,6 @@ void EnTk_Init(Actor* thisx, PlayState* play) {
     this->currentReward = -1;
     this->currentSpot = NULL;
     this->actionFunc = EnTk_Rest;
-    heartPieceSpawned = false;
 }
 
 void EnTk_Destroy(Actor* thisx, PlayState* play) {
@@ -599,7 +586,11 @@ void EnTk_Dig(EnTk* this, PlayState* play) {
     Vec3f rewardOrigin;
     Vec3f rewardPos;
     s32 rewardParams[] = {
-        ITEM00_RUPEE_GREEN, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_RED, ITEM00_RUPEE_PURPLE, ITEM00_HEART_PIECE,
+        ITEM00_RUPEE_GREEN, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_RED, ITEM00_RUPEE_PURPLE,
+        // #region SOH [General] Typically this heart piece would have no collectible flag set when it's picked up, but for both randomizer
+        // and gGravediggingTourFix we want to set one, and rely on it instead of the ItemGetInf flag that is set when the heart is spawned
+        ((COLLECTFLAG_GRAVEDIGGING_HEART_PIECE & 0x3F) << 8) | ITEM00_HEART_PIECE,
+        // #endregion
     };
 
     EnTk_DigEff(this);
@@ -610,7 +601,7 @@ void EnTk_Dig(EnTk* this, PlayState* play) {
 
         this->rewardTimer = 0;
 
-        if (this->validDigHere == 1 || IS_RANDO || CVarGetInteger("gDampeWin", 0)) {
+        if (GameInteractor_Should(GI_VB_BE_VALID_GRAVEDIGGING_SPOT, this->validDigHere == 1, this)) {
             rewardOrigin.x = 0.0f;
             rewardOrigin.y = 0.0f;
             rewardOrigin.z = -40.0f;
@@ -624,51 +615,24 @@ void EnTk_Dig(EnTk* this, PlayState* play) {
 
             this->currentReward = EnTk_ChooseReward(this);
 
-            if (this->currentReward == 3) {
-                if (IS_RANDO || CVarGetInteger("gDampeWin", 0)) {
-                    /*
-                    * Upgrade the purple rupee reward to the heart piece if this
-                    * is the first grand prize dig.
-                    */
-                    if (!Flags_GetItemGetInf(ITEMGETINF_1C) && !(IS_RANDO || CVarGetInteger("gDampeWin", 0))) {
-                        Flags_SetItemGetInf(ITEMGETINF_1C);
-                        this->currentReward = 4;
-                    } else if ((IS_RANDO || CVarGetInteger("gDampeWin", 0)) && !Flags_GetCollectible(gPlayState, COLLECTFLAG_GRAVEDIGGING_HEART_PIECE) && this->heartPieceSpawned == 0) {
-                        this->currentReward = 4;
-                    }
-                }
+            if (GameInteractor_Should(GI_VB_BE_DAMPE_GRAVEDIGGING_GRAND_PRIZE, this->currentReward == 3, this)) {
                 /*
-                * Upgrade the purple rupee reward to the heart piece if this
-                * is the first grand prize dig.
-                */
-                // If vanilla itemGetInf flag is not set, it's impossible for the new flag to be set, so return true.
-                // Otherwise if the gGravediggingTourFix is enabled and the new flag hasn't been set, return true.
-                // If true, spawn the heart piece and set the vanilla itemGetInf flag and new temp clear flag.
-                if (!heartPieceSpawned &&
-                    (!(gSaveContext.itemGetInf[1] & ITEMGETINFFLAG_GRAVEDIGGING_HEART_PIECE) ||
-                    CVarGetInteger("gGravediggingTourFix", 0) &&
-                        !Flags_GetCollectible(play, COLLECTFLAG_GRAVEDIGGING_HEART_PIECE))) {
+                 * Upgrade the purple rupee reward to the heart piece if this
+                 * is the first grand prize dig.
+                 */
+                if (GameInteractor_Should(GI_VB_DAMPE_GRAVEDIGGING_GRAND_PRIZE_BE_HEART_PIECE, !Flags_GetItemGetInf(ITEMGETINF_1C), this)) {
+                    Flags_SetItemGetInf(ITEMGETINF_1C);
                     this->currentReward = 4;
-                    gSaveContext.itemGetInf[1] |= ITEMGETINFFLAG_GRAVEDIGGING_HEART_PIECE;
-                    heartPieceSpawned = true;
                 }
             }
 
-            if (IS_RANDO && this->currentReward == 4) {
-                Actor_Spawn(&play->actorCtx, play, ACTOR_EN_ITEM00, rewardPos.x, rewardPos.y, rewardPos.z, 0, 0, 0, 0x1906, true);
-                this->heartPieceSpawned = 1;
-            } else {
-                EnItem00* reward = Item_DropCollectible(play, &rewardPos, rewardParams[this->currentReward]);
-                if (this->currentReward == 4) {
-                    reward->collectibleFlag = COLLECTFLAG_GRAVEDIGGING_HEART_PIECE;
-                }
-            }
+            Item_DropCollectible(play, &rewardPos, rewardParams[this->currentReward]);
         }
     }
 
     if (this->skelAnime.curFrame >= 32.0f && this->rewardTimer == 10) {
         /* Play a reward sound shortly after digging */
-        if (!(IS_RANDO || CVarGetInteger("gDampeWin", 0)) && this->validDigHere == 0) {
+        if (this->validDigHere == 0) {
             /* Bad dig spot */
             Audio_PlayActorSound2(&this->actor, NA_SE_SY_ERROR);
         } else if (this->currentReward == 4) {
diff --git a/soh/src/overlays/actors/ovl_En_Tk/z_en_tk.h b/soh/src/overlays/actors/ovl_En_Tk/z_en_tk.h
index c60cb5200..c2dee0fce 100644
--- a/soh/src/overlays/actors/ovl_En_Tk/z_en_tk.h
+++ b/soh/src/overlays/actors/ovl_En_Tk/z_en_tk.h
@@ -8,6 +8,8 @@
 /* Dirt particle effect */
 struct EnTkEff;
 
+#define COLLECTFLAG_GRAVEDIGGING_HEART_PIECE 0x19
+
 typedef struct EnTkEff {
     /* 0x0000 */ u8         active;
     /* 0x0001 */ u8         timeLeft;
diff --git a/soh/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c b/soh/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c
index d52b82d8d..c2ac2861b 100644
--- a/soh/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c
+++ b/soh/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c
@@ -6,7 +6,7 @@
 
 #include "z_en_toryo.h"
 #include "objects/object_toryo/object_toryo.h"
-#include "soh/Enhancements/randomizer/adult_trade_shuffle.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY)
 
@@ -291,10 +291,7 @@ void func_80B20768(EnToryo* this, PlayState* play) {
     s16 sp32;
     s16 sp30;
 
-    // Animation Count should be no more than 1 to guarantee putaway is complete after giving the saw
-    // As this is vanilla behavior, it only applies with the Fix toggle or Skip Text enabled.
-    bool checkAnim = (CVarGetInteger("gFixSawSoftlock", 0) != 0 || CVarGetInteger("gSkipText", 0) != 0) ? play->animationCtx.animationCount <= 1 : true;
-    if (this->unk_1E4 == 3 && checkAnim) {
+    if (this->unk_1E4 == 3 && !GameInteractor_Should(GI_VB_FIX_SAW_SOFTLOCK, false, NULL)) {
         Actor_ProcessTalkRequest(&this->actor, play);
         Message_ContinueTextbox(play, this->actor.textId);
         this->unk_1E4 = 1;
@@ -315,19 +312,12 @@ void func_80B20768(EnToryo* this, PlayState* play) {
     }
 
     if (this->unk_1E4 == 4) {
-        if (Actor_HasParent(&this->actor, play)) {
+        if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_TRADE_SAW, true, this)) {
             this->actor.parent = NULL;
             this->unk_1E4 = 5;
+            Flags_SetRandomizerInf(RAND_INF_ADULT_TRADES_GV_TRADE_SAW);
         } else {
-            if (IS_RANDO) {
-                GetItemEntry itemEntry = Randomizer_GetItemFromKnownCheck(RC_GV_TRADE_SAW, GI_SWORD_BROKEN);
-                Randomizer_ConsumeAdultTradeItem(play, ITEM_SAW);
-                GiveItemEntryFromActor(&this->actor, play, itemEntry, 100.0f, 10.0f);
-                Flags_SetRandomizerInf(RAND_INF_ADULT_TRADES_GV_TRADE_SAW);
-            } else {
-                s32 itemId = GI_SWORD_BROKEN;
-                func_8002F434(&this->actor, play, itemId, 100.0f, 10.0f);
-            }
+            func_8002F434(&this->actor, play, GI_SWORD_BROKEN, 100.0f, 10.0f);
         }
         return;
     }
diff --git a/soh/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c b/soh/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c
index 2b90e1ff7..658dd63f8 100644
--- a/soh/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c
+++ b/soh/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c
@@ -6,6 +6,7 @@
 
 #include "z_en_wonder_talk2.h"
 #include "vt.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_NO_LOCKON)
 
@@ -194,7 +195,9 @@ void func_80B3A3D4(EnWonderTalk2* this, PlayState* play) {
                 this->unk_15A = true;
             }
             this->actor.flags &= ~(ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UPDATE_WHILE_CULLED);
-            func_8002DF54(play, NULL, 7);
+            if (GameInteractor_Should(GI_VB_WONDER_TALK, true, this)) {
+                func_8002DF54(play, NULL, 7);
+            }
             this->unk_156 = true;
             this->actionFunc = func_80B3A4F8;
             break;
@@ -252,42 +255,12 @@ void func_80B3A4F8(EnWonderTalk2* this, PlayState* play) {
             }
             this->unk_158 = 0;
             if (!this->unk_156) {
-                // Whether or not to skip the text in rando
-                bool randoSkipText = false;
-                if (IS_RANDO) {
-                    // Scenes for which all of this type of wonder talk should be skipped.
-                    switch (play->sceneNum) {
-                        case SCENE_SHADOW_TEMPLE: // Shadow Temple
-                            randoSkipText = true;
-                            break;
-                        case SCENE_GERUDO_TRAINING_GROUND: // Gerudo Training Grounds
-                            randoSkipText = true;
-                            break;
-                        case SCENE_THIEVES_HIDEOUT: // Inside Gerudo Fortress
-                            randoSkipText = true;
-                            break;
-                        default:
-                            break;
-                    }
-                    // individual textIds that should be skipped, or that should be preserved
-                    // in a scene that otherwise has all wonder talk skipped.
-                    //switch (this->actor.textId) { 
-                    //    case: 0x023c //textId we want to skip
-                    //        randoSkipText = true;
-                    //        break;
-                    //    case 0x023c: // textId in a skipped scene that we don't want to skip
-                    //        randoSkipText = false;
-                    //        break;
-                    //    default:
-                    //        break;
-                    //}
-                }
-                if (!(randoSkipText)) {
+                if (GameInteractor_Should(GI_VB_WONDER_TALK, true, this)) {
                     Message_StartTextbox(play, this->actor.textId, NULL);
                     func_8002DF54(play, NULL, 8);
-                    this->actor.flags |= ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UPDATE_WHILE_CULLED;
-                    this->actionFunc = func_80B3A3D4;
                 }
+                this->actor.flags |= ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UPDATE_WHILE_CULLED;
+                this->actionFunc = func_80B3A3D4;
             }
 
         } else {
diff --git a/soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c b/soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c
index 83f799877..6436df29f 100644
--- a/soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c
+++ b/soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c
@@ -13,6 +13,7 @@
 #include "scenes/indoors/tokinoma/tokinoma_scene.h"
 #include "scenes/dungeons/ice_doukutu/ice_doukutu_scene.h"
 #include "vt.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_WHILE_CULLED
 
@@ -277,6 +278,7 @@ void func_80B3C9EC(EnXc* this) {
     this->action = SHEIK_ACTION_BLOCK_PEDESTAL;
     this->drawMode = SHEIK_DRAW_DEFAULT;
     this->unk_30C = 1;
+    // SOH [Randomizer] We don't want sheik blocking the pedestal in randomizer
     if (IS_RANDO) {
         Actor_Kill(&this->actor);
     }
@@ -292,24 +294,6 @@ void func_80B3CA38(EnXc* this, PlayState* play) {
     }
 }
 
-void GivePlayerRandoRewardSheikSong(EnXc* sheik, PlayState* play, RandomizerCheck check, int sheikType, GetItemID ogSongId) {
-    Player* player = GET_PLAYER(play);
-    if (!(gSaveContext.eventChkInf[5] & sheikType)) {
-        GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(check, ogSongId);
-        if (check == RC_SHEIK_AT_TEMPLE && !Flags_GetTreasure(play, 0x1F)) {
-            if (GiveItemEntryFromActor(&sheik->actor, play, getItemEntry, 10000.0f, 100.0f)) {
-                player->pendingFlag.flagID = 0x1F;
-                player->pendingFlag.flagType = FLAG_SCENE_TREASURE;
-            }
-        } else if (check != RC_SHEIK_AT_TEMPLE) {
-            if (GiveItemEntryFromActor(&sheik->actor, play, getItemEntry, 10000.0f, 100.0f)) {
-                player->pendingFlag.flagID = (0x5 << 4) | (sheikType & 0xF) >> 1;
-                player->pendingFlag.flagType = FLAG_EVENT_CHECK_INF;
-            }
-        }
-    }
-}
-
 s32 EnXc_MinuetCS(EnXc* this, PlayState* play) {
     if (this->actor.params == SHEIK_TYPE_MINUET) {
         Player* player = GET_PLAYER(play);
@@ -317,16 +301,17 @@ s32 EnXc_MinuetCS(EnXc* this, PlayState* play) {
 
         if (z < -2225.0f) {
             if (!Play_InCsMode(play)) {
-                if (!IS_RANDO) {
+                if (GameInteractor_Should(GI_VB_PLAY_MINUET_OF_FOREST_CS, true, NULL)) {
                     play->csCtx.segment = SEGMENTED_TO_VIRTUAL(&gMinuetCs);
                     gSaveContext.cutsceneTrigger = 1;
-                    Flags_SetEventChkInf(EVENTCHKINF_LEARNED_MINUET_OF_FOREST);
-                    Item_Give(play, ITEM_SONG_MINUET);
-                } else {
-                    GivePlayerRandoRewardSheikSong(this, play, RC_SHEIK_IN_FOREST, 1, RG_MINUET_OF_FOREST);
-                    return false;
                 }
-                return true;
+                Flags_SetEventChkInf(EVENTCHKINF_LEARNED_MINUET_OF_FOREST);
+                if (GameInteractor_Should(GI_VB_GIVE_ITEM_MINUET_OF_FOREST, true, NULL)) {
+                    Item_Give(play, ITEM_SONG_MINUET);
+                }
+                if (GameInteractor_Should(GI_VB_PLAY_MINUET_OF_FOREST_CS, true, NULL)) {
+                    return true;
+                }
             }
         }
         return false;
@@ -353,16 +338,17 @@ s32 EnXc_BoleroCS(EnXc* this, PlayState* play) {
         if ((posRot->pos.x > -784.0f) && (posRot->pos.x < -584.0f) && (posRot->pos.y > 447.0f) &&
             (posRot->pos.y < 647.0f) && (posRot->pos.z > -446.0f) && (posRot->pos.z < -246.0f) &&
             !Play_InCsMode(play)) {
-            if (!IS_RANDO) {
+            if (GameInteractor_Should(GI_VB_PLAY_BOLERO_OF_FIRE_CS, true, NULL)) {
                 play->csCtx.segment = SEGMENTED_TO_VIRTUAL(&gDeathMountainCraterBoleroCs);
                 gSaveContext.cutsceneTrigger = 1;
-                Flags_SetEventChkInf(EVENTCHKINF_LEARNED_BOLERO_OF_FIRE);
-                Item_Give(play, ITEM_SONG_BOLERO);
-            } else {
-                GivePlayerRandoRewardSheikSong(this, play, RC_SHEIK_IN_CRATER, 2, RG_BOLERO_OF_FIRE);
-                return false;
             }
-            return true;
+            Flags_SetEventChkInf(EVENTCHKINF_LEARNED_BOLERO_OF_FIRE);
+            if (GameInteractor_Should(GI_VB_GIVE_ITEM_BOLERO_OF_FIRE, true, NULL)) {
+                Item_Give(play, ITEM_SONG_BOLERO);
+            }
+            if (GameInteractor_Should(GI_VB_PLAY_BOLERO_OF_FIRE_CS, true, NULL)) {
+                return true;
+            }
         }
         return false;
     }
@@ -370,13 +356,8 @@ s32 EnXc_BoleroCS(EnXc* this, PlayState* play) {
 }
 
 void EnXc_SetupSerenadeAction(EnXc* this, PlayState* play) {
-    if (IS_RANDO) {
-        this->action = SHEIK_ACTION_SERENADE;
-        return;
-    }
-
     // Player is adult and does not have iron boots and has not learned Serenade
-    if ((!CHECK_OWNED_EQUIP(EQUIP_TYPE_BOOTS, EQUIP_INV_BOOTS_IRON) && !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_SERENADE_OF_WATER)) && LINK_IS_ADULT) {
+    if (GameInteractor_Should(GI_VB_SHIEK_PREPARE_TO_GIVE_SERENADE_OF_WATER, (!CHECK_OWNED_EQUIP(EQUIP_TYPE_BOOTS, EQUIP_INV_BOOTS_IRON) && !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_SERENADE_OF_WATER)) && LINK_IS_ADULT, NULL)) {
         this->action = SHEIK_ACTION_SERENADE;
         osSyncPrintf("水のセレナーデ シーク誕生!!!!!!!!!!!!!!!!!!\n");
     } else {
@@ -389,22 +370,20 @@ s32 EnXc_SerenadeCS(EnXc* this, PlayState* play) {
     if (this->actor.params == SHEIK_TYPE_SERENADE) {
         Player* player = GET_PLAYER(play);
         s32 stateFlags = player->stateFlags1;
-
-        if (((CHECK_OWNED_EQUIP(EQUIP_TYPE_BOOTS, EQUIP_INV_BOOTS_IRON) && !IS_RANDO) ||
-             (Flags_GetTreasure(play, 2) && IS_RANDO)) &&
-            !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_SERENADE_OF_WATER) && !(stateFlags & 0x20000000) &&
-            !Play_InCsMode(play)) {
-            if (!IS_RANDO) {
+        if (GameInteractor_Should(GI_VB_BE_ELIGIBLE_FOR_SERENADE_OF_WATER, CHECK_OWNED_EQUIP(EQUIP_TYPE_BOOTS, EQUIP_INV_BOOTS_IRON) && !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_SERENADE_OF_WATER), NULL) &&
+            !(stateFlags & PLAYER_STATE1_IN_CUTSCENE) && !Play_InCsMode(play)) {
+            if (GameInteractor_Should(GI_VB_PLAY_SERENADE_OF_WATER_CS, true, NULL)) {
                 Cutscene_SetSegment(play, &gIceCavernSerenadeCs);
                 gSaveContext.cutsceneTrigger = 1;
-                Flags_SetEventChkInf(EVENTCHKINF_LEARNED_SERENADE_OF_WATER); // Learned Serenade of Water Flag
+            }
+            Flags_SetEventChkInf(EVENTCHKINF_LEARNED_SERENADE_OF_WATER); // Learned Serenade of Water Flag
+            if (GameInteractor_Should(GI_VB_GIVE_ITEM_SERENADE_OF_WATER, true, NULL)) {
                 Item_Give(play, ITEM_SONG_SERENADE);
-            } else {
-                GivePlayerRandoRewardSheikSong(this, play, RC_SHEIK_IN_ICE_CAVERN, 4, RG_SERENADE_OF_WATER);
-                return false;
             }
             osSyncPrintf("ブーツを取った!!!!!!!!!!!!!!!!!!\n");
-            return true;
+            if (GameInteractor_Should(GI_VB_PLAY_SERENADE_OF_WATER_CS, true, NULL)) {
+                return true;
+            }
         }
         osSyncPrintf("はやくブーツを取るべし!!!!!!!!!!!!!!!!!!\n");
         return false;
@@ -415,7 +394,7 @@ s32 EnXc_SerenadeCS(EnXc* this, PlayState* play) {
 void EnXc_DoNothing(EnXc* this, PlayState* play) {
 }
 
-void EnXc_RandoStand(EnXc* this, PlayState* play) {
+void SoH_EnXc_RandoStand(EnXc* this, PlayState* play) {
     //Replaces Ganondorf Light Arrow hint. also stands in ToT
     if (play->sceneNum == SCENE_TEMPLE_OF_TIME) {
         EnXc_ChangeAnimation(this, &gSheikArmsCrossedIdleAnim, ANIMMODE_LOOP, 0.0f, false);
@@ -2209,22 +2188,21 @@ void EnXc_InitTempleOfTime(EnXc* this, PlayState* play) {
     if (LINK_IS_ADULT) {
         if (!Flags_GetEventChkInf(EVENTCHKINF_SHEIK_SPAWNED_AT_MASTER_SWORD_PEDESTAL)) {
             Flags_SetEventChkInf(EVENTCHKINF_SHEIK_SPAWNED_AT_MASTER_SWORD_PEDESTAL);
-            play->csCtx.segment = SEGMENTED_TO_VIRTUAL(gTempleOfTimeFirstAdultCs);
-            gSaveContext.cutsceneTrigger = 1;
+            if (GameInteractor_Should(GI_VB_PLAY_SHIEK_BLOCK_MASTER_SWORD_CS, true, NULL)) {
+                play->csCtx.segment = SEGMENTED_TO_VIRTUAL(gTempleOfTimeFirstAdultCs);
+                gSaveContext.cutsceneTrigger = 1;
+            }
             func_80B3EBF0(this, play);
-        } else if ((!Flags_GetEventChkInf(EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT) && (Flags_GetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP)) &&
-                    !IS_RANDO) ||
-                   (!Flags_GetEventChkInf(EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT) && CHECK_QUEST_ITEM(QUEST_MEDALLION_FOREST) &&
-                    IS_RANDO)) {
-            if (!IS_RANDO) {
-                Flags_SetEventChkInf(EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT);
+        } else if (GameInteractor_Should(GI_VB_BE_ELIGIBLE_FOR_PRELUDE_OF_LIGHT, !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT) && Flags_GetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP), NULL)) {
+            Flags_SetEventChkInf(EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT);
+            if (GameInteractor_Should(GI_VB_GIVE_ITEM_PRELUDE_OF_LIGHT, true, NULL)) {
                 Item_Give(play, ITEM_SONG_PRELUDE);
+            }
+            if (GameInteractor_Should(GI_VB_PLAY_PRELUDE_OF_LIGHT_CS, true, NULL)) {
                 play->csCtx.segment = SEGMENTED_TO_VIRTUAL(gTempleOfTimePreludeCs);
                 gSaveContext.cutsceneTrigger = 1;
-                this->action = SHEIK_ACTION_30;
-            } else {
-                GivePlayerRandoRewardSheikSong(this, play, RC_SHEIK_AT_TEMPLE, 0x20, RG_PRELUDE_OF_LIGHT);
             }
+            this->action = SHEIK_ACTION_30; // Not sure what this does exactly
         } else if (!Flags_GetEventChkInf(EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT)) {
             func_80B3C9EC(this);
         } else {
@@ -2378,14 +2356,6 @@ void EnXc_Update(Actor* thisx, PlayState* play) {
     EnXc* this = (EnXc*)thisx;
     s32 action = this->action;
 
-    if (this->actor.params == SHEIK_TYPE_9) {
-        if (IS_RANDO && LINK_IS_ADULT) {
-            if (CHECK_QUEST_ITEM(QUEST_MEDALLION_FOREST) && !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT)) {
-                GivePlayerRandoRewardSheikSong(this, play, RC_SHEIK_AT_TEMPLE, 0x20, RG_PRELUDE_OF_LIGHT);
-            }
-        }
-    }
-
     if ((action < 0) || (action >= ARRAY_COUNT(sActionFuncs)) || (sActionFuncs[action] == NULL)) {
         osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST);
     } else {
@@ -2433,7 +2403,7 @@ void EnXc_Init(Actor* thisx, PlayState* play) {
             EnXc_DoNothing(this, play);
             break;
         case SHEIK_TYPE_RANDO:
-            EnXc_RandoStand(this, play);
+            SoH_EnXc_RandoStand(this, play);
             break;
         default:
             osSyncPrintf(VT_FGCOL(RED) " En_Oa2 の arg_data がおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST);
diff --git a/soh/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c b/soh/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c
index 4a47b456e..9bc53169b 100644
--- a/soh/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c
+++ b/soh/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c
@@ -10,6 +10,7 @@
 #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h"
 #include "objects/object_zl2/object_zl2.h"
 #include "objects/object_zl2_anime1/object_zl2_anime1.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_WHILE_CULLED
 
@@ -633,7 +634,9 @@ void EnZl2_GiveLightArrows(EnZl2* this, PlayState* play) {
         posY = player->actor.world.pos.y + 80.0f;
         posZ = player->actor.world.pos.z;
         Actor_Spawn(&play->actorCtx, play, ACTOR_DEMO_EFFECT, posX, posY, posZ, 0, 0, 0, 0x17, true);
-        Item_Give(play, ITEM_ARROW_LIGHT);
+        if (GameInteractor_Should(GI_VB_GIVE_ITEM_LIGHT_ARROW, true, NULL)) {
+            Item_Give(play, ITEM_ARROW_LIGHT);
+        }
         this->unk_244 = 1;
     }
 }
diff --git a/soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c b/soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
index 08c3857e0..f805e2fb5 100644
--- a/soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
+++ b/soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
@@ -7,6 +7,7 @@
 #include "z_en_zl4.h"
 #include "objects/object_zl4/object_zl4.h"
 #include "scenes/indoors/nakaniwa/nakaniwa_scene.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_WHILE_CULLED)
 
@@ -227,20 +228,6 @@ u16 EnZl4_GetText(PlayState* play, Actor* thisx) {
     return ret;
 }
 
-void GivePlayerRandoRewardZeldaChild(EnZl4* zelda, PlayState* play, RandomizerCheck check) {
-    if (zelda->actor.parent != NULL && zelda->actor.parent->id == GET_PLAYER(play)->actor.id &&
-        !Flags_GetTreasure(play, 0x1E)) {
-        Flags_SetTreasure(play, 0x1E);
-    } else if (!Flags_GetTreasure(play, 0x1E) && !Randomizer_GetSettingValue(RSK_SKIP_CHILD_ZELDA) && Actor_TextboxIsClosing(&zelda->actor, play) &&
-               (play->msgCtx.textId == 0x703C || play->msgCtx.textId == 0x703D)) {
-        GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(check, GI_LETTER_ZELDA);
-        GiveItemEntryFromActor(&zelda->actor, play, getItemEntry, 10000.0f, 100.0f);
-    } else if (Flags_GetTreasure(play, 0x1E) && !Player_InBlockingCsMode(play, GET_PLAYER(play))) {
-        gSaveContext.unk_13EE = 0x32;
-        Flags_SetEventChkInf(EVENTCHKINF_OBTAINED_ZELDAS_LETTER);
-    }
-}
-
 s16 func_80B5B9B0(PlayState* play, Actor* thisx) {
     EnZl4* this = (EnZl4*)thisx;
 
@@ -389,12 +376,6 @@ void EnZl4_Init(Actor* thisx, PlayState* play) {
     this->actor.textId = -1;
     this->eyeExpression = this->mouthExpression = ZL4_MOUTH_NEUTRAL;
 
-    if (IS_RANDO) {
-        Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ZL4_ANIM_0);
-        this->actionFunc = EnZl4_Idle;
-        return;
-    }
-
     if (gSaveContext.sceneSetupIndex >= 4) {
         Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ZL4_ANIM_0);
         this->actionFunc = EnZl4_TheEnd;
@@ -1127,14 +1108,16 @@ s32 EnZl4_CsMakePlan(EnZl4* this, PlayState* play) {
                 Camera_ChangeSetting(GET_ACTIVE_CAM(play), 1);
                 this->talkState = 7;
                 play->talkWithPlayer(play, &this->actor);
-                func_8002F434(&this->actor, play, GI_LETTER_ZELDA, fabsf(this->actor.xzDistToPlayer) + 1.0f,
-                              fabsf(this->actor.yDistToPlayer) + 1.0f);
+                if (GameInteractor_Should(GI_VB_GIVE_ITEM_ZELDAS_LETTER, true, NULL)) {
+                    func_8002F434(&this->actor, play, GI_LETTER_ZELDA, fabsf(this->actor.xzDistToPlayer) + 1.0f,
+                                fabsf(this->actor.yDistToPlayer) + 1.0f);
+                }
                 play->msgCtx.stateTimer = 4;
                 play->msgCtx.msgMode = MSGMODE_TEXT_CLOSING;
             }
             break;
         case 7:
-            if (Actor_HasParent(&this->actor, play)) {
+            if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_ZELDAS_LETTER, true, NULL)) {
                 Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ZL4_ANIM_0);
                 this->talkState++;
             } else {
@@ -1225,11 +1208,6 @@ void EnZl4_Idle(EnZl4* this, PlayState* play) {
     Npc_UpdateTalking(play, &this->actor, &this->interactInfo.talkState, this->collider.dim.radius + 60.0f,
                       EnZl4_GetText, func_80B5B9B0);
     func_80B5BB78(this, play);
-    
-    if (IS_RANDO) {
-        GivePlayerRandoRewardZeldaChild(this, play, RC_HC_ZELDAS_LETTER);
-        return;
-    }
 }
 
 void EnZl4_TheEnd(EnZl4* this, PlayState* play) {
diff --git a/soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.h b/soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.h
index 601ed6905..4b14121c6 100644
--- a/soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.h
+++ b/soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.h
@@ -31,4 +31,9 @@ typedef struct EnZl4 {
     /* 0x0284 */ Vec3s morphTable[18];
 } EnZl4; // size = 0x02F0
 
+s16 func_80B5B9B0(PlayState* play, Actor* actor);
+void func_80B5BB78(EnZl4* enZl4, PlayState* play);
+void EnZl4_Cutscene(EnZl4* enZl4, PlayState* play);
+s32 EnZl4_SetNextAnim(EnZl4* enZl4, s32 nextAnim);
+
 #endif
diff --git a/soh/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c b/soh/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c
index abb65c191..f511d5bbf 100644
--- a/soh/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c
+++ b/soh/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c
@@ -59,12 +59,7 @@ void ItemBHeart_Update(Actor* thisx, PlayState* play) {
         Flags_SetCollectible(play, 0x1F);
         Actor_Kill(&this->actor);
     } else {
-        if (!IS_RANDO) {
-            func_8002F434(&this->actor, play, GI_HEART_CONTAINER_2, 30.0f, 40.0f);
-        } else {
-            GetItemEntry getItemEntry = Randomizer_GetItemFromActor(this->actor.id, play->sceneNum, this->actor.params, GI_HEART_CONTAINER_2);
-            GiveItemEntryFromActor(&this->actor, play, getItemEntry, 30.0f, 40.0f);
-        }
+        func_8002F434(&this->actor, play, GI_HEART_CONTAINER_2, 30.0f, 40.0f);
     }
 }
 
@@ -98,23 +93,18 @@ void ItemBHeart_Draw(Actor* thisx, PlayState* play) {
         actorIt = actorIt->next;
     }
 
-    if (IS_RANDO) {
-        GetItemEntry_Draw(play, Randomizer_GetItemFromActor(this->actor.id, 
-            play->sceneNum,this->actor.params, GI_HEART_CONTAINER_2));
+    if (flag) {
+        Gfx_SetupDL_25Xlu(play->state.gfxCtx);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
+                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPDisplayList(POLY_XLU_DISP++, gGiHeartBorderDL);
+        gSPDisplayList(POLY_XLU_DISP++, gGiHeartContainerDL);
     } else {
-        if (flag) {
-            Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-            gSPDisplayList(POLY_XLU_DISP++, gGiHeartBorderDL);
-            gSPDisplayList(POLY_XLU_DISP++, gGiHeartContainerDL);
-        } else {
-            Gfx_SetupDL_25Opa(play->state.gfxCtx);
-            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-            gSPDisplayList(POLY_OPA_DISP++, gGiHeartBorderDL);
-            gSPDisplayList(POLY_OPA_DISP++, gGiHeartContainerDL);
-        }
+        Gfx_SetupDL_25Opa(play->state.gfxCtx);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
+                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPDisplayList(POLY_OPA_DISP++, gGiHeartBorderDL);
+        gSPDisplayList(POLY_OPA_DISP++, gGiHeartContainerDL);
     }
 
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h b/soh/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h
index d9483b48c..434aa775b 100644
--- a/soh/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h
+++ b/soh/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h
@@ -13,6 +13,11 @@ typedef struct ItemBHeart {
     /* 0x015C */ char unk_15C[0x8];
     /* 0x0164 */ s16 unk_164;
     /* 0x0166 */ char unk_166[0x6];
+    // #region SOH [Randomizer] Cached for drawing for performance
+    /*        */ GetItemEntry sohItemEntry;
+    // #endregion
 } ItemBHeart; // size = 0x016C
 
+void func_80B85264(ItemBHeart* itemBHeart, PlayState* play);
+
 #endif
diff --git a/soh/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c b/soh/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c
index a9cd36446..dba879115 100644
--- a/soh/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c
+++ b/soh/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c
@@ -6,6 +6,7 @@
 
 #include "z_item_ocarina.h"
 #include "scenes/overworld/spot00/spot00_scene.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_WHILE_CULLED
 
@@ -169,31 +170,27 @@ void ItemOcarina_DoNothing(ItemOcarina* this, PlayState* play) {
 
 void ItemOcarina_StartSoTCutscene(ItemOcarina* this, PlayState* play) {
     if (Actor_TextboxIsClosing(&this->actor, play)) {
-        if (!IS_RANDO) {
-            play->csCtx.segment = SEGMENTED_TO_VIRTUAL(gHyruleFieldZeldaSongOfTimeCs);
-            gSaveContext.cutsceneTrigger = 1;
-        } else {
-            play->transitionTrigger = TRANS_TRIGGER_START;
-            play->transitionType = TRANS_TYPE_FADE_WHITE;
-            gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE;
-            play->nextEntranceIndex = ENTR_HYRULE_FIELD_16;
-            gSaveContext.nextCutsceneIndex = 0;
-        }
+        play->csCtx.segment = SEGMENTED_TO_VIRTUAL(gHyruleFieldZeldaSongOfTimeCs);
+        gSaveContext.cutsceneTrigger = 1;
     }
 }
 
 void ItemOcarina_WaitInWater(ItemOcarina* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play)) {
+    if (
+        Actor_HasParent(&this->actor, play) || 
+        (
+            !GameInteractor_Should(GI_VB_GIVE_ITEM_OCARINA_OF_TIME, true, NULL) &&
+            (this->actor.xzDistToPlayer < 20.0f) && (fabsf(this->actor.yDistToPlayer) < 10.0f) &&
+            GET_PLAYER(play)->stateFlags2 & PLAYER_STATE2_DIVING
+        )
+    ) {
         Flags_SetEventChkInf(EVENTCHKINF_OBTAINED_OCARINA_OF_TIME);
         Flags_SetSwitch(play, 3);
         this->actionFunc = ItemOcarina_StartSoTCutscene;
         this->actor.draw = NULL;
     } else {
-        if (!IS_RANDO) {
+        if (GameInteractor_Should(GI_VB_GIVE_ITEM_OCARINA_OF_TIME, true, NULL)) {
             func_8002F434(&this->actor, play, GI_OCARINA_OOT, 30.0f, 50.0f);
-        } else {
-            GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_HF_OCARINA_OF_TIME_ITEM, GI_OCARINA_OOT);
-            GiveItemEntryFromActor(&this->actor, play, getItemEntry, 30.0f, 50.0f);
         }
 
         if ((play->gameplayFrames & 13) == 0) {
diff --git a/soh/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c b/soh/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c
index 34defede5..9220c6be4 100644
--- a/soh/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c
+++ b/soh/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c
@@ -7,6 +7,7 @@
 #include "z_obj_switch.h"
 #include "objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
 #include "vt.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_WHILE_CULLED
 
@@ -249,10 +250,12 @@ void ObjSwitch_SetOn(ObjSwitch* this, PlayState* play) {
         subType = (this->dyna.actor.params >> 4 & 7);
         Flags_SetSwitch(play, (this->dyna.actor.params >> 8 & 0x3F));
 
-        if (subType == 0 || subType == 4) {
-            OnePointCutscene_AttentionSetSfx(play, &this->dyna.actor, NA_SE_SY_CORRECT_CHIME);
-        } else {
-            OnePointCutscene_AttentionSetSfx(play, &this->dyna.actor, NA_SE_SY_TRE_BOX_APPEAR);
+        if (GameInteractor_Should(GI_VB_PLAY_ONEPOINT_ACTOR_CS, true, this)) {
+            if (subType == 0 || subType == 4) {
+                OnePointCutscene_AttentionSetSfx(play, &this->dyna.actor, NA_SE_SY_CORRECT_CHIME);
+            } else {
+                OnePointCutscene_AttentionSetSfx(play, &this->dyna.actor, NA_SE_SY_TRE_BOX_APPEAR);
+            }
         }
 
         this->cooldownOn = true;
@@ -266,7 +269,9 @@ void ObjSwitch_SetOff(ObjSwitch* this, PlayState* play) {
         Flags_UnsetSwitch(play, (this->dyna.actor.params >> 8 & 0x3F));
 
         if ((this->dyna.actor.params >> 4 & 7) == 1) {
-            OnePointCutscene_AttentionSetSfx(play, &this->dyna.actor, NA_SE_SY_TRE_BOX_APPEAR);
+            if (GameInteractor_Should(GI_VB_PLAY_ONEPOINT_ACTOR_CS, true, this)) {
+                OnePointCutscene_AttentionSetSfx(play, &this->dyna.actor, NA_SE_SY_TRE_BOX_APPEAR);
+            }
             this->cooldownOn = true;
         }
     }
diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c
index 7489fa8fa..456955956 100644
--- a/soh/src/overlays/actors/ovl_player_actor/z_player.c
+++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c
@@ -31,6 +31,7 @@
 #include "soh/Enhancements/randomizer/randomizer_grotto.h"
 #include "soh/Enhancements/randomizer/fishsanity.h"
 #include "soh/frame_interpolation.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #include <string.h>
 #include <stdlib.h>
@@ -6658,7 +6659,14 @@ s32 func_8083E5A8(Player* this, PlayState* play) {
                 uint8_t showItemCutscene = play->sceneNum == SCENE_BOMBCHU_BOWLING_ALLEY || Item_CheckObtainability(giEntry.itemId) == ITEM_NONE || IS_RANDO;
 
                 // Only skip cutscenes for drops when they're items/consumables from bushes/rocks/enemies.
-                uint8_t isDropToSkip = (interactedActor->id == ACTOR_EN_ITEM00 && interactedActor->params != 6 && interactedActor->params != 17) || 
+                uint8_t isDropToSkip = 
+                                        (
+                                            interactedActor->id == ACTOR_EN_ITEM00 &&
+                                            interactedActor->params != ITEM00_HEART_PIECE &&
+                                            interactedActor->params != ITEM00_SMALL_KEY &&
+                                            interactedActor->params != ITEM00_SOH_GIVE_ITEM_ENTRY &&
+                                            interactedActor->params != ITEM00_SOH_GIVE_ITEM_ENTRY_GI
+                                        ) ||
                                         interactedActor->id == ACTOR_EN_KAREBABA || 
                                         interactedActor->id == ACTOR_EN_DEKUBABA;
 
@@ -6716,8 +6724,10 @@ s32 func_8083E5A8(Player* this, PlayState* play) {
                 }
 
                 func_80836898(play, this, func_8083A434);
+                if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_CHEST, true, &giEntry)) {
                 this->stateFlags1 |= PLAYER_STATE1_GETTING_ITEM | PLAYER_STATE1_ITEM_OVER_HEAD | PLAYER_STATE1_IN_CUTSCENE;
                 func_8083AE40(this, giEntry.objectId);
+                }
                 this->actor.world.pos.x =
                     chest->dyna.actor.world.pos.x - (Math_SinS(chest->dyna.actor.shape.rot.y) * 29.4343f);
                 this->actor.world.pos.z =
@@ -10087,7 +10097,7 @@ void Player_Init(Actor* thisx, PlayState* play2) {
 
     if ((sp50 == 0) || (sp50 < -1)) {
         titleFileSize = scene->titleFile.vromEnd - scene->titleFile.vromStart;
-        if (gSaveContext.showTitleCard) {
+        if (GameInteractor_Should(GI_VB_SHOW_TITLE_CARD, gSaveContext.showTitleCard, NULL)) {
             if ((gSaveContext.sceneSetupIndex < 4) &&
                 (gEntranceTable[((void)0, gSaveContext.entranceIndex) + ((void)0, gSaveContext.sceneSetupIndex)].field &
                  ENTRANCE_INFO_DISPLAY_TITLE_CARD_FLAG) &&
@@ -13393,7 +13403,7 @@ s32 func_8084DFF4(PlayState* play, Player* this) {
         play->msgCtx.msgMode = MSGMODE_TEXT_DONE;
     } else {
         if (Message_GetState(&play->msgCtx) == TEXT_STATE_CLOSING) {
-            if (this->getItemId == GI_GAUNTLETS_SILVER && !IS_RANDO) {
+            if (GameInteractor_Should(GI_VB_PLAY_NABOORU_CAPTURED_CS, this->getItemId == GI_GAUNTLETS_SILVER, NULL)) {
                 play->nextEntranceIndex = ENTR_DESERT_COLOSSUS_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
                 gSaveContext.nextCutsceneIndex = 0xFFF1;
@@ -13409,11 +13419,13 @@ s32 func_8084DFF4(PlayState* play, Player* this) {
                 this->unk_862 = 0;
             }
 
+            // #region SOH [Randomizer] TODO Better Ice trap handling?
             if (this->getItemEntry.itemId == RG_ICE_TRAP && this->getItemEntry.modIndex == MOD_RANDOMIZER) {
                 this->unk_862 = 0;
                 gSaveContext.pendingIceTrapCount++;
                 Player_SetPendingFlag(this, play);
             }
+            // #endregion
 
             this->getItemId = GI_NONE;
             this->getItemEntry = (GetItemEntry)GET_ITEM_NONE;
@@ -15675,6 +15687,7 @@ void func_8085283C(PlayState* play, Player* this, CsCmdActorAction* arg2) {
     if (LinkAnimation_Update(play, &this->skelAnime)) {
         func_80852944(play, this, arg2);
     } else if (this->unk_850 == 0) {
+        // This is when link picks up the sword in the Ganon fight
         Item_Give(play, ITEM_SWORD_MASTER);
         func_80846720(play, this, 0);
     } else {

From bea3c6dae04b92b0c10991ccaf387051adec396b Mon Sep 17 00:00:00 2001
From: Taw <Tawling@users.noreply.github.com>
Date: Fri, 9 Feb 2024 14:17:17 -0800
Subject: [PATCH 071/230] GameInteractor hooks for adult and child shooting
 gallery

---
 .../game-interactor/GameInteractor.h          |  6 +++
 .../Enhancements/randomizer/hook_handlers.cpp | 21 ++++++++++
 .../Enhancements/randomizer/location_list.cpp |  4 +-
 .../ovl_En_Syateki_Man/z_en_syateki_man.c     | 39 +++++--------------
 .../ovl_En_Syateki_Man/z_en_syateki_man.h     |  1 -
 5 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h
index c6fb7c721..bffed5458 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h
@@ -203,6 +203,9 @@ typedef enum {
     GI_VB_OVERRIDE_LINK_THE_GORON_DIALOGUE,
     // Opt: *EnGo2
     GI_VB_EN_GO2_RESET_AFTER_GET_ITEM,
+    // Opt: *EnSyatekiMan
+    // Vanilla condition: (this->getItemId == GI_QUIVER_40) || (this->getItemId == GI_QUIVER_50)
+    GI_VB_BE_ELIGIBLE_FOR_ADULT_SHOOTING_GAME_REWARD,
 
     /*** Play Cutscenes ***/
 
@@ -269,6 +272,9 @@ typedef enum {
     // Opt: *EnFr
     GI_VB_GIVE_ITEM_FROM_FROGS,
 
+    // Opt: *EnSyatekiMan
+    GI_VB_GIVE_ITEM_FROM_SHOOTING_GALLERY,
+
     GI_VB_GIVE_ITEM_FAIRY_OCARINA,
     GI_VB_GIVE_ITEM_WEIRD_EGG,
     GI_VB_GIVE_ITEM_LIGHT_ARROW,
diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index bf236a3ba..6e9a6809a 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -23,6 +23,7 @@ extern "C" {
 #include "src/overlays/actors/ovl_En_Go2/z_en_go2.h"
 #include "src/overlays/actors/ovl_En_Ms/z_en_ms.h"
 #include "src/overlays/actors/ovl_En_Fr/z_en_fr.h"
+#include "src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h"
 #include "adult_trade_shuffle.h"
 extern SaveContext gSaveContext;
 extern PlayState* gPlayState;
@@ -775,6 +776,26 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             *should &= !EnDs_RandoCanGetGrannyItem();
             break;
         }
+        case GI_VB_GIVE_ITEM_FROM_SHOOTING_GALLERY: {
+            EnSyatekiMan* enSyatekiMan = static_cast<EnSyatekiMan*>(optionalArg);
+            enSyatekiMan->getItemId = GI_RUPEE_PURPLE;
+            if (LINK_IS_ADULT) {
+                // Give purple rupee if we've already obtained the reward OR we don't have a bow
+                *should = Flags_GetItemGetInf(ITEMGETINF_0E) || CUR_UPG_VALUE(UPG_QUIVER) == 0;
+            } else {
+                // Give purple rupee if we've already obtained the reward
+                *should = Flags_GetItemGetInf(ITEMGETINF_0D);
+            }
+            break;
+        }
+        case GI_VB_BE_ELIGIBLE_FOR_ADULT_SHOOTING_GAME_REWARD: {
+            *should = CUR_UPG_VALUE(UPG_QUIVER) > 0;
+            if (!*should) {
+                // In Rando without a quiver, display a message reminding the player to come back with a bow
+                Message_StartTextbox(gPlayState, TEXT_SHOOTING_GALLERY_MAN_COME_BACK_WITH_BOW, NULL);
+            }
+            break;
+        }
         case GI_VB_TRADE_CLAIM_CHECK:
         case GI_VB_TRADE_TIMER_ODD_MUSHROOM:
         case GI_VB_TRADE_TIMER_EYEDROPS:
diff --git a/soh/soh/Enhancements/randomizer/location_list.cpp b/soh/soh/Enhancements/randomizer/location_list.cpp
index 28ca3b85a..67b2b35ed 100644
--- a/soh/soh/Enhancements/randomizer/location_list.cpp
+++ b/soh/soh/Enhancements/randomizer/location_list.cpp
@@ -672,7 +672,7 @@ void Rando::StaticData::InitLocationTable() { //
     locationTable[RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE] =                            Location::Base(RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE,                          RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_BOMBCHU_BOWLING_ALLEY,        0x00,                                              0x3E, "Bombchu Bowling Second Prize",                "MK Bombchu Bowling Second Prize",                          RHT_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE,                         RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::ItemGetInf(18),                                                                                       SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
     locationTable[RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS] =                                Location::Base(RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS,                              RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_BOMBCHU_BOWLING_ALLEY,        0x00,                                              0x00, "Bombchu Bowling Bombchus",                    "MK Bombchu Bowling Bombchus",                              RHT_MARKET_BOMBCHU_BOWLING_BOMBCHUS,                             RG_BOMBCHU_DROP,                      {},                                                     SpoilerCollectionCheck::None(),                                                                                               SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
     locationTable[RC_MARKET_LOST_DOG] =                                                Location::Base(RC_MARKET_LOST_DOG,                                              RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_DOG_LADY_HOUSE,               0x00,                                              0x3E, "Lost Dog",                                    "MK Lost Dog",                                              RHT_MARKET_LOST_DOG,                                             RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::InfTable(0x19, 0x09),                                                                                 SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
-    locationTable[RC_MARKET_SHOOTING_GALLERY_REWARD] =                                 Location::Base(RC_MARKET_SHOOTING_GALLERY_REWARD,                               RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_SHOOTING_GALLERY,             0x00,                                              0x60, "Shooting Gallery",                            "MK Shooting Gallery",                                      RHT_MARKET_SHOOTING_GALLERY_REWARD,                              RG_PROGRESSIVE_SLINGSHOT,             {},                                                     SpoilerCollectionCheck::ItemGetInf(13),                                                                                       SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
+    locationTable[RC_MARKET_SHOOTING_GALLERY_REWARD] =                                 Location::Base(RC_MARKET_SHOOTING_GALLERY_REWARD,                               RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_SHOOTING_GALLERY,             0x00,                                              0x60, "Shooting Gallery",                            "MK Shooting Gallery",                                      RHT_MARKET_SHOOTING_GALLERY_REWARD,                              RG_PROGRESSIVE_SLINGSHOT,             {},                                                     SpoilerCollectionCheck::ItemGetInf(ITEMGETINF_0D),                                                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
     locationTable[RC_MARKET_10_BIG_POES] =                                             Location::Base(RC_MARKET_10_BIG_POES,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_MARKET_GUARD_HOUSE,           0x00,                                              0x0F, "10 Big Poes",                                 "MK 10 Big Poes",                                           RHT_MARKET_10_BIG_POES,                                          RG_EMPTY_BOTTLE,                      {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_10_BIG_POES),                                                                  SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
     locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_1] =                             Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_1,                            RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0x01, "Chest Game First Room Chest",                 "MK Chest Game First Room Chest",                           RHT_MARKET_TREASURE_CHEST_GAME_ITEM_1,                           RG_TREASURE_GAME_SMALL_KEY,           { Category::cChestMinigame },                                                                                                                                                         SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
     locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_2] =                             Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_2,                            RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0x03, "Chest Game Second Room Chest",                "MK Chest Game Second Room Chest",                          RHT_MARKET_TREASURE_CHEST_GAME_ITEM_2,                           RG_TREASURE_GAME_SMALL_KEY,           { Category::cChestMinigame },                                                                                                                                                         SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
@@ -692,7 +692,7 @@ void Rando::StaticData::InitLocationTable() { //
     locationTable[RC_KAK_50_GOLD_SKULLTULA_REWARD] =                                   Location::Base(RC_KAK_50_GOLD_SKULLTULA_REWARD,                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_HOUSE_OF_SKULLTULA,           0x00,                                              0x3E, "50 Gold Skulltula Reward",                    "Kak 50 Gold Skulltula Reward",                             RHT_KAK_50_GOLD_SKULLTULA_REWARD,                                RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::EventChkInf(0xDE),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
     locationTable[RC_KAK_100_GOLD_SKULLTULA_REWARD] =                                  Location::Base(RC_KAK_100_GOLD_SKULLTULA_REWARD,                                RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_HOUSE_OF_SKULLTULA,           0x00,                                              0x3E, "100 Gold Skulltula Reward",                   "Kak 100 Gold Skulltula Reward",                            RHT_KAK_100_GOLD_SKULLTULA_REWARD,                               RG_HUGE_RUPEE,                        {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_100_GOLD_SKULLTULA_REWARD),                                                SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
     locationTable[RC_KAK_MAN_ON_ROOF] =                                                Location::Base(RC_KAK_MAN_ON_ROOF,                                              RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_KAKARIKO_VILLAGE,             0x00,                                              0x3E, "Man on Roof",                                 "Kak Man on Roof",                                          RHT_KAK_MAN_ON_ROOF,                                             RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::ItemGetInf(21),                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
-    locationTable[RC_KAK_SHOOTING_GALLERY_REWARD] =                                    Location::Base(RC_KAK_SHOOTING_GALLERY_REWARD,                                  RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_SHOOTING_GALLERY,             0x00,                                              0x30, "Shooting Gallery Reward",                     "Kak Shooting Gallery Reward",                              RHT_KAK_SHOOTING_GALLERY_REWARD,                                 RG_PROGRESSIVE_BOW,                   {},                                                     SpoilerCollectionCheck::Chest(0x42, 0x1F),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
+    locationTable[RC_KAK_SHOOTING_GALLERY_REWARD] =                                    Location::Base(RC_KAK_SHOOTING_GALLERY_REWARD,                                  RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_SHOOTING_GALLERY,             0x00,                                              0x30, "Shooting Gallery Reward",                     "Kak Shooting Gallery Reward",                              RHT_KAK_SHOOTING_GALLERY_REWARD,                                 RG_PROGRESSIVE_BOW,                   {},                                                     SpoilerCollectionCheck::ItemGetInf(ITEMGETINF_0E),                                                                            SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
     locationTable[RC_KAK_TRADE_ODD_MUSHROOM] =                                         Location::Base(RC_KAK_TRADE_ODD_MUSHROOM,                                       RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_POTION_SHOP_GRANNY,           0x00,                                              0x20, "Trade Odd Mushroom",                          "Kak Trade Odd Mushroom",                                   RHT_KAK_TRADE_ODD_MUSHROOM,                                      RG_ODD_POTION,                        { Category::cAdultTrade },                              SpoilerCollectionCheck::ItemGetInf(48),                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
     locationTable[RC_KAK_GRANNYS_SHOP] =                                               Location::Base(RC_KAK_GRANNYS_SHOP,                                             RCQUEST_BOTH,    RCTYPE_MERCHANT,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_POTION_SHOP_GRANNY,           0x00,                                              0x4E, "Granny's Shop",                               "Kak Granny's Shop",                                        RHT_KAK_GRANNYS_SHOP,                                            RG_BUY_BLUE_POTION,                   {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MERCHANTS_GRANNYS_SHOP),                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
     locationTable[RC_KAK_ANJU_AS_ADULT] =                                              Location::Base(RC_KAK_ANJU_AS_ADULT,                                            RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_KAKARIKO_VILLAGE,             0x00,                                              0x1D, "Anju as Adult",                               "Kak Anju as Adult",                                        RHT_KAK_ANJU_AS_ADULT,                                           RG_CLAIM_CHECK,                       {},                                                     SpoilerCollectionCheck::ItemGetInf(44),                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
diff --git a/soh/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c b/soh/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
index 6ab91ddc0..d84298800 100644
--- a/soh/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
+++ b/soh/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
@@ -4,6 +4,7 @@
 #include "objects/object_ossan/object_ossan.h"
 #include "soh/Enhancements/randomizer/randomizer_entrance.h"
 #include "soh/Enhancements/custom-message/CustomMessageTypes.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_WHILE_CULLED | ACTOR_FLAG_NO_LOCKON)
 
@@ -180,7 +181,6 @@ void EnSyatekiMan_Init(Actor* thisx, PlayState* play) {
     this->blinkFunc = EnSyatekiMan_BlinkWait;
     this->actor.colChkInfo.cylRadius = 100;
     this->actionFunc = EnSyatekiMan_Start;
-    this->getItemEntry = (GetItemEntry)GET_ITEM_NONE;
 }
 
 void EnSyatekiMan_Destroy(Actor* thisx, PlayState* play) {
@@ -355,11 +355,7 @@ void EnSyatekiMan_EndGame(EnSyatekiMan* this, PlayState* play) {
                     this->tempGallery = this->actor.parent;
                     this->actor.parent = NULL;
                     if (!LINK_IS_ADULT) {
-                        if(IS_RANDO && !Flags_GetTreasure(play, 0x1E)) {
-                            this->getItemEntry = Randomizer_GetItemFromKnownCheck(RC_MARKET_SHOOTING_GALLERY_REWARD, GI_BULLET_BAG_50);
-                            this->getItemId = this->getItemEntry.getItemId;
-                            Flags_SetTreasure(play, 0x1E);
-                        } else if (!IS_RANDO && !Flags_GetItemGetInf(ITEMGETINF_0D)) {
+                        if (!Flags_GetItemGetInf(ITEMGETINF_0D)) {
                             osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ Equip_Pachinko ☆☆☆☆☆ %d\n" VT_RST,
                                          CUR_UPG_VALUE(UPG_BULLET_BAG));
                             if (CUR_UPG_VALUE(UPG_BULLET_BAG) == 1) {
@@ -368,16 +364,11 @@ void EnSyatekiMan_EndGame(EnSyatekiMan* this, PlayState* play) {
                                 this->getItemId = GI_BULLET_BAG_50;
                             }
                         } else {
-                            this->getItemEntry = (GetItemEntry)GET_ITEM_NONE;
                             this->getItemId = GI_RUPEE_PURPLE;
                         }
                     } else {
                         // Only give the adult rando reward when the player has a quiver
-                        if (IS_RANDO && !Flags_GetTreasure(play, 0x1F) && CUR_UPG_VALUE(UPG_QUIVER) > 0) {
-                            this->getItemEntry = Randomizer_GetItemFromKnownCheck(RC_KAK_SHOOTING_GALLERY_REWARD, GI_QUIVER_50);
-                            this->getItemId = this->getItemEntry.getItemId;
-                            Flags_SetTreasure(play, 0x1F);
-                        } else if (!IS_RANDO && !Flags_GetItemGetInf(ITEMGETINF_0E)) {
+                        if (!Flags_GetItemGetInf(ITEMGETINF_0E)) {
                             osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ Equip_Bow ☆☆☆☆☆ %d\n" VT_RST,
                                          CUR_UPG_VALUE(UPG_QUIVER));
                             switch (CUR_UPG_VALUE(UPG_QUIVER)) {
@@ -392,14 +383,11 @@ void EnSyatekiMan_EndGame(EnSyatekiMan* this, PlayState* play) {
                                     break;
                             }
                         } else {
-                            this->getItemEntry = (GetItemEntry)GET_ITEM_NONE;
                             this->getItemId = GI_RUPEE_PURPLE;
                         }
                     }
-                    if (!IS_RANDO || this->getItemEntry.getItemId == GI_NONE) {
+                    if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_SHOOTING_GALLERY, true, this)) {
                         func_8002F434(&this->actor, play, this->getItemId, 2000.0f, 1000.0f);
-                    } else {
-                        GiveItemEntryFromActor(&this->actor, play, this->getItemEntry, 2000.0f, 1000.0f);
                     }
                     this->actionFunc = EnSyatekiMan_GivePrize;
                     break;
@@ -426,33 +414,26 @@ void EnSyatekiMan_EndGame(EnSyatekiMan* this, PlayState* play) {
             }
         }
     }
-}
+} 
 
 void EnSyatekiMan_GivePrize(EnSyatekiMan* this, PlayState* play) {
     SkelAnime_Update(&this->skelAnime);
-    if (Actor_HasParent(&this->actor, play)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_SHOOTING_GALLERY, true, this)) {
         this->actionFunc = EnSyatekiMan_FinishPrize;
-    } else {
-        if (!IS_RANDO || this->getItemEntry.getItemId == GI_NONE) {
-            func_8002F434(&this->actor, play, this->getItemId, 2000.0f, 1000.0f);
-        } else {
-            GiveItemEntryFromActor(&this->actor, play, this->getItemEntry, 2000.0f, 1000.0f);
-        }
+    } else { 
+        func_8002F434(&this->actor, play, this->getItemId, 2000.0f, 1000.0f);
     }
 }
 
 void EnSyatekiMan_FinishPrize(EnSyatekiMan* this, PlayState* play) {
     SkelAnime_Update(&this->skelAnime);
-    if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) {
+    if (((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) || !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_SHOOTING_GALLERY, true, this)) {
         // "Successful completion"
         osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 正常終了 ☆☆☆☆☆ \n" VT_RST);
         if (!LINK_IS_ADULT) {
             Flags_SetItemGetInf(ITEMGETINF_0D);
-        } else if ((this->getItemId == GI_QUIVER_40) || (this->getItemId == GI_QUIVER_50)) {
+        } else if (GameInteractor_Should(GI_VB_BE_ELIGIBLE_FOR_ADULT_SHOOTING_GAME_REWARD, (this->getItemId == GI_QUIVER_40) || (this->getItemId == GI_QUIVER_50), this)) {
             Flags_SetItemGetInf(ITEMGETINF_0E);
-        } else if (IS_RANDO && LINK_IS_ADULT && CUR_UPG_VALUE(UPG_QUIVER) == 0) {
-            // In Rando without a quiver, display a message reminding the player to come back with a bow
-            Message_StartTextbox(play, TEXT_SHOOTING_GALLERY_MAN_COME_BACK_WITH_BOW, NULL);
         }
         this->gameResult = SYATEKI_RESULT_NONE;
         this->actor.parent = this->tempGallery;
diff --git a/soh/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h b/soh/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h
index eaeec0429..b65364ae4 100644
--- a/soh/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h
+++ b/soh/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h
@@ -28,7 +28,6 @@ typedef struct EnSyatekiMan {
     /* 0x0220 */ Actor* tempGallery;
     /* 0x0224 */ EnSyatekiManOtherFunc blinkFunc; // Seems to be part of a blink system with unk_20C and unk_20E, but it's unused.
     /* 0x0228 */ s16 csCam;
-    /*        */ GetItemEntry getItemEntry;
 } EnSyatekiMan; // size = 0x022C
 
 #endif

From 4e5b92fdf385e34da94049071233dbe9c872cbca Mon Sep 17 00:00:00 2001
From: Taw <Tawling@users.noreply.github.com>
Date: Sat, 10 Feb 2024 09:06:34 -0800
Subject: [PATCH 072/230] Man On Roof

---
 .../Enhancements/game-interactor/GameInteractor.h   |  1 +
 soh/soh/Enhancements/randomizer/hook_handlers.cpp   |  1 +
 soh/src/overlays/actors/ovl_En_Ani/z_en_ani.c       | 13 ++++---------
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h
index c6fb7c721..e615e5954 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h
@@ -268,6 +268,7 @@ typedef enum {
     GI_VB_GIVE_ITEM_FROM_MAGIC_BEAN_SALESMAN,
     // Opt: *EnFr
     GI_VB_GIVE_ITEM_FROM_FROGS,
+    GI_VB_GIVE_ITEM_FROM_MAN_ON_ROOF,
 
     GI_VB_GIVE_ITEM_FAIRY_OCARINA,
     GI_VB_GIVE_ITEM_WEIRD_EGG,
diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index bf236a3ba..6b29ac567 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -782,6 +782,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
         case GI_VB_ANJU_SET_OBTAINED_TRADE_ITEM:
         case GI_VB_GIVE_ITEM_FROM_ROLLING_GORON_AS_CHILD:
         case GI_VB_GIVE_ITEM_FROM_LAB_DIVE:
+        case GI_VB_GIVE_ITEM_FROM_MAN_ON_ROOF:
         case GI_VB_GIVE_ITEM_SKULL_TOKEN:
         case GI_VB_GIVE_ITEM_FROM_BLUE_WARP:
         case GI_VB_GIVE_ITEM_FAIRY_OCARINA:
diff --git a/soh/src/overlays/actors/ovl_En_Ani/z_en_ani.c b/soh/src/overlays/actors/ovl_En_Ani/z_en_ani.c
index 15ebd759c..5093d47d2 100644
--- a/soh/src/overlays/actors/ovl_En_Ani/z_en_ani.c
+++ b/soh/src/overlays/actors/ovl_En_Ani/z_en_ani.c
@@ -6,6 +6,7 @@
 
 #include "z_en_ani.h"
 #include "objects/object_ani/object_ani.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY)
 
@@ -119,7 +120,7 @@ void func_809B0524(EnAni* this, PlayState* play) {
 }
 
 void func_809B0558(EnAni* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_MAN_ON_ROOF, true, NULL)) {
         this->actor.parent = NULL;
         if (!LINK_IS_ADULT) {
             EnAni_SetupAction(this, func_809B04F0);
@@ -128,11 +129,8 @@ void func_809B0558(EnAni* this, PlayState* play) {
         }
         Flags_SetItemGetInf(ITEMGETINF_15);
     } else {
-        if (!IS_RANDO) {
+        if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_MAN_ON_ROOF, true, NULL)) {
             func_8002F434(&this->actor, play, GI_HEART_PIECE, 10000.0f, 200.0f);
-        } else {
-            GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_KAK_MAN_ON_ROOF, GI_HEART_PIECE);
-            GiveItemEntryFromActor(&this->actor, play, getItemEntry, 10000.0f, 200.0f);
         }
     }
 }
@@ -142,11 +140,8 @@ void func_809B05F0(EnAni* this, PlayState* play) {
         EnAni_SetupAction(this, func_809B0558);
     }
 
-    if (!IS_RANDO) {
+    if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_MAN_ON_ROOF, true, NULL)) {
         func_8002F434(&this->actor, play, GI_HEART_PIECE, 10000.0f, 200.0f);
-    } else {
-        GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_KAK_MAN_ON_ROOF, GI_HEART_PIECE);
-        GiveItemEntryFromActor(&this->actor, play, getItemEntry, 10000.0f, 200.0f);
     }
 }
 

From ceb5b740b5af02862b778591b3bfe852c8a992f5 Mon Sep 17 00:00:00 2001
From: Taw <Tawling@users.noreply.github.com>
Date: Mon, 12 Feb 2024 14:26:10 -0800
Subject: [PATCH 073/230] fix include

---
 soh/src/overlays/actors/ovl_En_Ani/z_en_ani.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/soh/src/overlays/actors/ovl_En_Ani/z_en_ani.c b/soh/src/overlays/actors/ovl_En_Ani/z_en_ani.c
index 5093d47d2..3fe4e2a22 100644
--- a/soh/src/overlays/actors/ovl_En_Ani/z_en_ani.c
+++ b/soh/src/overlays/actors/ovl_En_Ani/z_en_ani.c
@@ -6,7 +6,7 @@
 
 #include "z_en_ani.h"
 #include "objects/object_ani/object_ani.h"
-#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY)
 

From a7726653e5fb0d2c25487ddc78ad041719734ee0 Mon Sep 17 00:00:00 2001
From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Date: Fri, 16 Feb 2024 02:49:45 +0000
Subject: [PATCH 074/230] Add Big Skulltula logic to adult kokiri forest and
 fix a small bug in forest temple logic (#3938)

* Add Big Skulltula logic to adult kokiri forest and fix a small bug in forest temple logic

* fix spelling
---
 .../location_access/locacc_forest_temple.cpp  |  2 +-
 .../location_access/locacc_lost_woods.cpp     |  4 ++--
 soh/soh/Enhancements/randomizer/logic.cpp     | 20 +++++++++++++++++++
 soh/soh/Enhancements/randomizer/logic.h       |  2 ++
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp
index 1e464357f..5f79f53cd 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp
@@ -170,7 +170,7 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_WEST_CORRIDOR,            {[]{return true;}}),
                   Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER,        {[]{return logic->CanUse(RG_HOVER_BOOTS) || (randoCtx->GetTrickOption(RT_FOREST_OUTSIDE_BACKDOOR) && logic->CanJumpslash && logic->GoronBracelet);}}),
                   Entrance(RR_FOREST_TEMPLE_NW_CORRIDOR_TWISTED,      {[]{return logic->IsAdult && logic->GoronBracelet && logic->SmallKeys(RR_FOREST_TEMPLE, 2);}}),
-                  Entrance(RR_FOREST_TEMPLE_NW_CORRIDOR_STRAIGHTENED, {[]{return (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT)) && logic->GoronBracelet && logic->SmallKeys(RR_FOREST_TEMPLE, 2);}}),
+                  Entrance(RR_FOREST_TEMPLE_NW_CORRIDOR_STRAIGHTENED, {[]{return logic->IsAdult && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT)) && logic->GoronBracelet && logic->SmallKeys(RR_FOREST_TEMPLE, 2);}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_NW_CORRIDOR_TWISTED] = Area("Forest Temple NW Corridor Twisted", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
index 69911b049..6dc417727 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
@@ -24,7 +24,7 @@ void AreaTable_Init_LostWoods() {
                   Entrance(RR_KF_HOUSE_OF_TWINS,     {[]{return true;}}),
                   Entrance(RR_KF_KNOW_IT_ALL_HOUSE,  {[]{return true;}}),
                   Entrance(RR_KF_KOKIRI_SHOP,        {[]{return true;}}),
-                  Entrance(RR_KF_OUTSIDE_DEKU_TREE,  {[]{return logic->IsAdult || randoCtx->GetOption(RSK_FOREST).Is(RO_FOREST_OPEN) || logic->ShowedMidoSwordAndShield;}}),
+                  Entrance(RR_KF_OUTSIDE_DEKU_TREE,  {[]{return (logic->IsAdult && (logic->CanPassEnemy("Big Skulltula") || logic->ForestTempleClear)) || randoCtx->GetOption(RSK_FOREST).Is(RO_FOREST_OPEN) || logic->ShowedMidoSwordAndShield;}}),
                   Entrance(RR_THE_LOST_WOODS,        {[]{return true;}}),
                   Entrance(RR_LW_BRIDGE_FROM_FOREST, {[]{return logic->IsAdult || randoCtx->GetOption(RSK_FOREST).IsNot(RO_FOREST_CLOSED) || logic->DekuTreeClear;}}),
                   Entrance(RR_KF_STORMS_GROTTO,      {[]{return logic->CanOpenStormGrotto;}}),
@@ -42,7 +42,7 @@ void AreaTable_Init_LostWoods() {
                 }, {
                   //Exits
                   Entrance(RR_DEKU_TREE_ENTRYWAY, {[]{return logic->IsChild || (randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).IsNot(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF) && (randoCtx->GetOption(RSK_FOREST).Is(RO_FOREST_OPEN) || logic->ShowedMidoSwordAndShield));}}),
-                  Entrance(RR_KOKIRI_FOREST,      {[]{return logic->IsAdult || randoCtx->GetOption(RSK_FOREST).Is(RO_FOREST_OPEN) || logic->ShowedMidoSwordAndShield;}}),
+                  Entrance(RR_KOKIRI_FOREST,      {[]{return (logic->IsAdult && (logic->CanPassEnemy("Big Skulltula") || logic->ForestTempleClear)) || randoCtx->GetOption(RSK_FOREST).Is(RO_FOREST_OPEN) || logic->ShowedMidoSwordAndShield;}}),
   });
 
   areaTable[RR_KF_LINKS_HOUSE] = Area("KF Link's House", "KF Link's House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
diff --git a/soh/soh/Enhancements/randomizer/logic.cpp b/soh/soh/Enhancements/randomizer/logic.cpp
index 31b8e7bdc..56ed191c0 100644
--- a/soh/soh/Enhancements/randomizer/logic.cpp
+++ b/soh/soh/Enhancements/randomizer/logic.cpp
@@ -230,6 +230,26 @@ namespace Rando {
         return false;
     }
 
+    bool Logic::CanKillEnemy(std::string enemy) {
+        //switch(enemy) {} RANDOTODO implement enemies enum
+        if (enemy == "Big Skulltula"){
+            return CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT) || CanJumpslash || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_HOOKSHOT) || CanUse(RG_DINS_FIRE) || HasExplosives;
+        }
+        //Shouldn't be reached
+        return false;
+    }
+
+    bool Logic::CanPassEnemy(std::string enemy) {
+        //switch(enemy) {} RANDOTODO implement enemies enum
+        if (CanKillEnemy(enemy)){
+            return true;
+        }
+        if (enemy == "Big Skulltula"){
+            return Nuts || CanUse(RG_BOOMERANG);
+        }
+        return false;
+    }
+
     Logic::Logic() {
         
     }
diff --git a/soh/soh/Enhancements/randomizer/logic.h b/soh/soh/Enhancements/randomizer/logic.h
index 8cccdbbf8..5475d4d92 100644
--- a/soh/soh/Enhancements/randomizer/logic.h
+++ b/soh/soh/Enhancements/randomizer/logic.h
@@ -422,6 +422,8 @@ class Logic {
     bool SmallKeys(RandomizerRegion dungeon, uint8_t requiredAmountGlitchless, uint8_t requiredAmountGlitched);
     bool CanDoGlitch(GlitchType glitch);
     bool CanEquipSwap(RandomizerGet itemName);
+    bool CanKillEnemy(std::string enemy);
+    bool CanPassEnemy(std::string enemy);
     bool EventsUpdated();
     void Reset();
 

From 8525f71c57c205712ce12c2fbe5d3b0090d7e5be Mon Sep 17 00:00:00 2001
From: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>
Date: Fri, 16 Feb 2024 03:50:17 +0100
Subject: [PATCH 075/230] Colored Compasses (#3883)

* Colored Compasses

* Rename cvar & add explicit rando check
---
 soh/soh/Enhancements/mods.cpp                 | 22 ++++++++++
 soh/soh/Enhancements/mods.h                   |  1 +
 soh/soh/Enhancements/randomizer/draw.cpp      | 44 +++++++++++++++++++
 soh/soh/Enhancements/randomizer/draw.h        |  1 +
 soh/soh/Enhancements/randomizer/item_list.cpp | 10 +++++
 soh/soh/SohMenuBar.cpp                        | 22 +++++++++-
 6 files changed, 98 insertions(+), 2 deletions(-)

diff --git a/soh/soh/Enhancements/mods.cpp b/soh/soh/Enhancements/mods.cpp
index 26adf611d..9b8e7076e 100644
--- a/soh/soh/Enhancements/mods.cpp
+++ b/soh/soh/Enhancements/mods.cpp
@@ -10,6 +10,7 @@
 #include "soh/Enhancements/cosmetics/authenticGfxPatches.h"
 #include <soh/Enhancements/item-tables/ItemTableManager.h>
 #include "soh/Enhancements/nametag.h"
+#include "objects/object_gi_compass/object_gi_compass.h"
 
 #include "src/overlays/actors/ovl_En_Bb/z_en_bb.h"
 #include "src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h"
@@ -1595,6 +1596,26 @@ void RegisterFishsanity() {
     });
 }
 
+extern "C" u8 Randomizer_GetSettingValue(RandomizerSettingKey randoSettingKey);
+
+void PatchCompasses() {
+    s8 compassesCanBeOutsideDungeon = IS_RANDO && DUNGEON_ITEMS_CAN_BE_OUTSIDE_DUNGEON(RSK_SHUFFLE_MAPANDCOMPASS);
+    s8 isColoredCompassesEnabled = compassesCanBeOutsideDungeon && CVarGetInteger("gRandoEnhancement.MatchCompassColors", 1);
+    if (isColoredCompassesEnabled) {
+        ResourceMgr_PatchGfxByName(gGiCompassDL, "Compass_PrimColor", 5, gsDPNoOp());
+        ResourceMgr_PatchGfxByName(gGiCompassDL, "Compass_EnvColor", 6, gsDPNoOp());
+    } else {
+        ResourceMgr_UnpatchGfxByName(gGiCompassDL, "Compass_PrimColor");
+        ResourceMgr_UnpatchGfxByName(gGiCompassDL, "Compass_EnvColor");
+    }
+}
+
+void RegisterRandomizerCompasses() {
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnLoadFile>([](int32_t _unused) {
+        PatchCompasses();
+    });
+}
+
 void InitMods() {
     RegisterTTS();
     RegisterInfiniteMoney();
@@ -1632,6 +1653,7 @@ void InitMods() {
     RegisterNoSwim();
     RegisterNoWallet();
     RegisterFishsanity();
+    RegisterRandomizerCompasses();
     NameTag_RegisterHooks();
     RegisterPatchHandHandler();
     RegisterHurtContainerModeHandler();
diff --git a/soh/soh/Enhancements/mods.h b/soh/soh/Enhancements/mods.h
index 57ebedfd9..9289594dc 100644
--- a/soh/soh/Enhancements/mods.h
+++ b/soh/soh/Enhancements/mods.h
@@ -11,6 +11,7 @@ void UpdateDirtPathFixState(int32_t sceneNum);
 void UpdateMirrorModeState(int32_t sceneNum);
 void UpdateHurtContainerModeState(bool newState);
 void PatchToTMedallions();
+void PatchCompasses();
 void UpdatePermanentHeartLossState();
 void InitMods();
 void UpdatePatchHand(); 
diff --git a/soh/soh/Enhancements/randomizer/draw.cpp b/soh/soh/Enhancements/randomizer/draw.cpp
index 646d99456..4ee80d919 100644
--- a/soh/soh/Enhancements/randomizer/draw.cpp
+++ b/soh/soh/Enhancements/randomizer/draw.cpp
@@ -9,6 +9,7 @@
 #include <array>
 #include "objects/object_gi_key/object_gi_key.h"
 #include "objects/object_gi_bosskey/object_gi_bosskey.h"
+#include "objects/object_gi_compass/object_gi_compass.h"
 #include "objects/object_gi_hearts/object_gi_hearts.h"
 #include "objects/object_gi_scale/object_gi_scale.h"
 #include "objects/object_gi_fire/object_gi_fire.h"
@@ -63,6 +64,49 @@ extern "C" void Randomizer_DrawSmallKey(PlayState* play, GetItemEntry* getItemEn
     CLOSE_DISPS(play->state.gfxCtx);
 }
 
+extern "C" {
+    void GetItem_DrawCompass(PlayState* play, s16 drawId);
+    void ResourceMgr_PatchGfxByName(const char* path, const char* patchName, int index, Gfx instruction);
+    void ResourceMgr_UnpatchGfxByName(const char* path, const char* patchName);
+}
+
+extern "C" void Randomizer_DrawCompass(PlayState* play, GetItemEntry* getItemEntry) {
+
+    s16 color_slot = getItemEntry->getItemId - RG_DEKU_TREE_COMPASS;
+    s16 colors[12][3] = {
+        { 4, 100, 46 },    // Deku Tree
+        { 140, 30, 30 },   // Dodongo's Cavern
+        { 30, 60, 255 },   // Jabu Jabu's Belly
+        { 4, 195, 46 },    // Forest Temple
+        { 237, 95, 95 },   // Fire Temple
+        { 85, 180, 223 },  // Water Temple
+        { 222, 158, 47 },  // Spirit Temple
+        { 126, 16, 177 },  // Shadow Temple
+        { 227, 110, 255 }, // Bottom of the Well
+        { 221, 212, 60 },  // Gerudo Training Grounds
+        { 255, 255, 255 }, // Thieves' Hideout
+        { 80, 80, 80 }     // Ganon's Castle
+    };
+
+    OPEN_DISPS(play->state.gfxCtx);
+
+    Gfx_SetupDL_25Opa(play->state.gfxCtx);
+    gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
+              G_MTX_MODELVIEW | G_MTX_LOAD);
+
+    gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, colors[color_slot][0], colors[color_slot][1], colors[color_slot][2], 255);
+    gDPSetEnvColor(POLY_OPA_DISP++, colors[color_slot][0] / 2, colors[color_slot][1] / 2, colors[color_slot][2] / 2, 255);
+
+    gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gGiCompassDL);
+
+    POLY_XLU_DISP = Gfx_SetupDL(POLY_XLU_DISP, 5);
+    gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
+              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPDisplayList(POLY_XLU_DISP++, (Gfx*)gGiCompassGlassDL);
+
+    CLOSE_DISPS(play->state.gfxCtx);
+}
+
 extern "C" void Randomizer_DrawBossKey(PlayState* play, GetItemEntry* getItemEntry) {
     s8 keysCanBeOutsideDungeon = getItemEntry->getItemId == RG_GANONS_CASTLE_BOSS_KEY ?
         DUNGEON_ITEMS_CAN_BE_OUTSIDE_DUNGEON(RSK_GANONS_BOSS_KEY) :
diff --git a/soh/soh/Enhancements/randomizer/draw.h b/soh/soh/Enhancements/randomizer/draw.h
index 0e8a3e3b5..51300f3a6 100644
--- a/soh/soh/Enhancements/randomizer/draw.h
+++ b/soh/soh/Enhancements/randomizer/draw.h
@@ -10,6 +10,7 @@ typedef struct PlayState PlayState;
 extern "C" {
 #endif
 void Randomizer_DrawSmallKey(PlayState* play, GetItemEntry* getItemEntry);
+void Randomizer_DrawCompass(PlayState* play, GetItemEntry* getItemEntry);
 void Randomizer_DrawKeyRing(PlayState* play, GetItemEntry* getItemEntry);
 void Randomizer_DrawBossKey(PlayState* play, GetItemEntry* getItemEntry);
 void Randomizer_DrawBossSoul(PlayState* play, GetItemEntry* getItemEntry);
diff --git a/soh/soh/Enhancements/randomizer/item_list.cpp b/soh/soh/Enhancements/randomizer/item_list.cpp
index a64d62d40..343f680b1 100644
--- a/soh/soh/Enhancements/randomizer/item_list.cpp
+++ b/soh/soh/Enhancements/randomizer/item_list.cpp
@@ -107,15 +107,25 @@ void Rando::StaticData::InitItemTable() {
     itemTable[RG_BOTTOM_OF_THE_WELL_MAP] =              Item(RG_BOTTOM_OF_THE_WELL_MAP,           Text{ "Bottom of the Well Map", "Carte du Puits", "Boden des Brunnens Karte" },                                   ITEMTYPE_MAP,               0xAD,               false, &logic->noVariable,          RHT_BOTTOM_OF_THE_WELL_MAP, RG_BOTTOM_OF_THE_WELL_MAP,      OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
     itemTable[RG_ICE_CAVERN_MAP] =                      Item(RG_ICE_CAVERN_MAP,                   Text{ "Ice Cavern Map", "Carte de la Caverne Polaire", "Eishöhle Karte" },                                        ITEMTYPE_MAP,               0xAE,               false, &logic->noVariable,          RHT_ICE_CAVERN_MAP,         RG_ICE_CAVERN_MAP,              OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
     itemTable[RG_DEKU_TREE_COMPASS] =                   Item(RG_DEKU_TREE_COMPASS,                Text{ "Great Deku Tree Compass", "Boussole de l'Arbre Mojo", "Kompass des Deku-Baums" },                          ITEMTYPE_COMPASS,           0x9B,               false, &logic->noVariable,          RHT_DEKU_TREE_COMPASS,      RG_DEKU_TREE_COMPASS,           OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_DEKU_TREE_COMPASS].SetCustomDrawFunc(Randomizer_DrawCompass);
     itemTable[RG_DODONGOS_CAVERN_COMPASS] =             Item(RG_DODONGOS_CAVERN_COMPASS,          Text{ "Dodongo's Cavern Compass", "Boussole de la Caverne Dodongo", "Kompass der Dodongo-Höhle" },                ITEMTYPE_COMPASS,           0x9C,               false, &logic->noVariable,          RHT_DODONGOS_CAVERN_COMPASS,RG_DODONGOS_CAVERN_COMPASS,     OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_DODONGOS_CAVERN_COMPASS].SetCustomDrawFunc(Randomizer_DrawCompass);
     itemTable[RG_JABU_JABUS_BELLY_COMPASS] =            Item(RG_JABU_JABUS_BELLY_COMPASS,         Text{ "Jabu-Jabu's Belly Compass", "Boussole du Ventre de Jabu-Jabu", "Kompass des Jabu-Jabu-Bauchs" },           ITEMTYPE_COMPASS,           0x9D,               false, &logic->noVariable,          RHT_JABU_JABUS_BELLY_COMPASS,RG_JABU_JABUS_BELLY_COMPASS,   OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_JABU_JABUS_BELLY_COMPASS].SetCustomDrawFunc(Randomizer_DrawCompass);
     itemTable[RG_FOREST_TEMPLE_COMPASS] =               Item(RG_FOREST_TEMPLE_COMPASS,            Text{ "Forest Temple Compass", "Boussole du Temple de la Forêt", "Waldtempel-Kompass" },                          ITEMTYPE_COMPASS,           0x9E,               false, &logic->noVariable,          RHT_FOREST_TEMPLE_COMPASS,  RG_FOREST_TEMPLE_COMPASS,       OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_FOREST_TEMPLE_COMPASS].SetCustomDrawFunc(Randomizer_DrawCompass);
     itemTable[RG_FIRE_TEMPLE_COMPASS] =                 Item(RG_FIRE_TEMPLE_COMPASS,              Text{ "Fire Temple Compass", "Boussole du Temple du Feu", "Feuertempel-Kompass" },                                ITEMTYPE_COMPASS,           0x9F,               false, &logic->noVariable,          RHT_FIRE_TEMPLE_COMPASS,    RG_FIRE_TEMPLE_COMPASS,         OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_FIRE_TEMPLE_COMPASS].SetCustomDrawFunc(Randomizer_DrawCompass);
     itemTable[RG_WATER_TEMPLE_COMPASS] =                Item(RG_WATER_TEMPLE_COMPASS,             Text{ "Water Temple Compass", "Boussole du Temple de l'Eau", "Wassertempel-Kompass" },                            ITEMTYPE_COMPASS,           0xA0,               false, &logic->noVariable,          RHT_WATER_TEMPLE_COMPASS,   RG_WATER_TEMPLE_COMPASS,        OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_WATER_TEMPLE_COMPASS].SetCustomDrawFunc(Randomizer_DrawCompass);
     itemTable[RG_SPIRIT_TEMPLE_COMPASS] =               Item(RG_SPIRIT_TEMPLE_COMPASS,            Text{ "Spirit Temple Compass", "Boussole due Temple de l'Esprit", "Geistiger Tempelkompass" },                    ITEMTYPE_COMPASS,           0xA1,               false, &logic->noVariable,          RHT_SPIRIT_TEMPLE_COMPASS,  RG_SPIRIT_TEMPLE_COMPASS,       OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_SPIRIT_TEMPLE_COMPASS].SetCustomDrawFunc(Randomizer_DrawCompass);
     itemTable[RG_SHADOW_TEMPLE_COMPASS] =               Item(RG_SHADOW_TEMPLE_COMPASS,            Text{ "Shadow Temple Compass", "Boussole du Temple de l'Ombre", "Kompass des Schattentempels" },                  ITEMTYPE_COMPASS,           0xA2,               false, &logic->noVariable,          RHT_SHADOW_TEMPLE_COMPASS,  RG_SHADOW_TEMPLE_COMPASS,       OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_SHADOW_TEMPLE_COMPASS].SetCustomDrawFunc(Randomizer_DrawCompass);
     itemTable[RG_BOTTOM_OF_THE_WELL_COMPASS] =          Item(RG_BOTTOM_OF_THE_WELL_COMPASS,       Text{ "Bottom of the Well Compass", "Boussole du Puits", "Boden des Brunnenkompasses" },                          ITEMTYPE_COMPASS,           0xA3,               false, &logic->noVariable,          RHT_BOTTOM_OF_THE_WELL_COMPASS,RG_BOTTOM_OF_THE_WELL_COMPASS,OBJECT_GI_COMPASS,     GID_COMPASS,        TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_BOTTOM_OF_THE_WELL_COMPASS].SetCustomDrawFunc(Randomizer_DrawCompass);
     itemTable[RG_ICE_CAVERN_COMPASS] =                  Item(RG_ICE_CAVERN_COMPASS,               Text{ "Ice Cavern Compass", "Boussole de la Caverne Polaire", "Eishöhlenkompass" },                               ITEMTYPE_COMPASS,           0xA4,               false, &logic->noVariable,          RHT_ICE_CAVERN_COMPASS,     RG_ICE_CAVERN_COMPASS,          OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_ICE_CAVERN_COMPASS].SetCustomDrawFunc(Randomizer_DrawCompass);
     // Boss Keys
     itemTable[RG_FOREST_TEMPLE_BOSS_KEY] =              Item(RG_FOREST_TEMPLE_BOSS_KEY,           Text{ "Forest Temple Boss Key", "Clé d'Or du Temple de la Forêt", "Waldtempel-Boss-Schlüssel" },                  ITEMTYPE_BOSSKEY,           0x95,               true,  &logic->BossKeyForestTemple, RHT_FOREST_TEMPLE_BOSS_KEY, RG_FOREST_TEMPLE_BOSS_KEY,      OBJECT_GI_BOSSKEY,      GID_KEY_BOSS,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
     itemTable[RG_FOREST_TEMPLE_BOSS_KEY].SetCustomDrawFunc(Randomizer_DrawBossKey);
diff --git a/soh/soh/SohMenuBar.cpp b/soh/soh/SohMenuBar.cpp
index 56e12e53e..c2b560296 100644
--- a/soh/soh/SohMenuBar.cpp
+++ b/soh/soh/SohMenuBar.cpp
@@ -10,6 +10,7 @@
 #include "include/z64audio.h"
 #include "OTRGlobals.h"
 #include "z64.h"
+#include "macros.h"
 #include "Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/presets.h"
 #include "soh/Enhancements/mods.h"
@@ -1826,6 +1827,7 @@ extern std::shared_ptr<ItemTrackerSettingsWindow> mItemTrackerSettingsWindow;
 extern std::shared_ptr<EntranceTrackerWindow> mEntranceTrackerWindow;
 extern std::shared_ptr<CheckTracker::CheckTrackerWindow> mCheckTrackerWindow;
 extern std::shared_ptr<CheckTracker::CheckTrackerSettingsWindow> mCheckTrackerSettingsWindow;
+extern "C" u8 Randomizer_GetSettingValue(RandomizerSettingKey randoSettingKey);
 
 void DrawRandomizerMenu() {
     if (ImGui::BeginMenu("Randomizer")) {
@@ -1916,7 +1918,7 @@ void DrawRandomizerMenu() {
                 disableKeyColors = false;
             }
 
-            static const char* disableKeyColorsText = 
+            static const char* disableKeyColorsText =
                 "This setting is disabled because a savefile is loaded without any key\n"
                 "shuffle settings set to \"Any Dungeon\", \"Overworld\" or \"Anywhere\"";
 
@@ -1925,7 +1927,23 @@ void DrawRandomizerMenu() {
             UIWidgets::Tooltip(
                 "Matches the color of small keys and boss keys to the dungeon they belong to. "
                 "This helps identify keys from afar and adds a little bit of flair.\n\nThis only "
-                "applies to seeds with keys and boss keys shuffled to Any Dungeon, Overworld, or Anywhere.");
+                "applies to seeds with keys and boss keys shuffled to \"Any Dungeon\", \"Overworld\", or \"Anywhere\".");
+
+            bool disableCompassColors = !DUNGEON_ITEMS_CAN_BE_OUTSIDE_DUNGEON(RSK_SHUFFLE_MAPANDCOMPASS);
+
+            static const char* disableCompassColorsText =
+                "This setting is disabled because a savefile is loaded without the compass\n"
+                "shuffle settings set to \"Any Dungeon\", \"Overworld\" or \"Anywhere\"";
+
+            if (UIWidgets::PaddedEnhancementCheckbox("Compass Colors Match Dungeon", "gRandoEnhancement.MatchCompassColors", true, false,
+                                                  disableCompassColors, disableCompassColorsText, UIWidgets::CheckboxGraphics::Cross, true)) {
+                PatchCompasses();
+            }
+            UIWidgets::Tooltip(
+                "Matches the color of compasses to the dungeon they belong to. "
+                "This helps identify compasses from afar and adds a little bit of flair.\n\nThis only "
+                "applies to seeds with compasses shuffled to \"Any Dungeon\", \"Overworld\", or \"Anywhere\".");
+
             UIWidgets::PaddedEnhancementCheckbox("Quest Item Fanfares", "gRandoQuestItemFanfares", true, false);
             UIWidgets::Tooltip(
                 "Play unique fanfares when obtaining quest items "

From 30ff3e9585eccaddae10058b2c773202b9aeab32 Mon Sep 17 00:00:00 2001
From: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Date: Fri, 16 Feb 2024 02:03:22 -0500
Subject: [PATCH 076/230] fix the torch

---
 soh/src/code/z_onepointdemo.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/soh/src/code/z_onepointdemo.c b/soh/src/code/z_onepointdemo.c
index ad5df65bd..68c0a4dff 100644
--- a/soh/src/code/z_onepointdemo.c
+++ b/soh/src/code/z_onepointdemo.c
@@ -1174,11 +1174,11 @@ s16 OnePointCutscene_Init(PlayState* play, s16 csId, s16 timer, Actor* actor, s1
 
     if (actor != NULL && actor->id != ACTOR_PLAYER) {
         if (!GameInteractor_Should(GI_VB_PLAY_ONEPOINT_ACTOR_CS, true, actor)) {
-            return;
+            return SUBCAM_NONE;
         }
     } else {
         if (!GameInteractor_Should(GI_VB_PLAY_ONEPOINT_CS, true, &csId)) {
-            return;
+            return SUBCAM_NONE;
         }
     }
 

From 8b178f938603fc62c2ed2c9a374745a19baf8872 Mon Sep 17 00:00:00 2001
From: Adam Bird <archez39@me.com>
Date: Tue, 20 Feb 2024 16:52:42 -0500
Subject: [PATCH 077/230] RandoV3 fixes for mix/decouple boss entrances

---
 .../randomizer/3drando/location_access.cpp    |   2 +-
 soh/soh/Enhancements/randomizer/entrance.cpp  | 211 ++++++++++++++----
 soh/soh/Enhancements/randomizer/entrance.h    |  10 +-
 .../randomizer/option_descriptions.cpp        |   4 +-
 .../Enhancements/randomizer/randomizer.cpp    |  17 --
 soh/soh/Enhancements/randomizer/settings.cpp  |   7 +
 soh/soh/SaveManager.cpp                       |   2 +-
 7 files changed, 184 insertions(+), 69 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
index 7eb1436df..e389e440e 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
@@ -502,7 +502,7 @@ Area* AreaTable(const RandomizerRegion areaKey) {
 std::vector<Rando::Entrance*> GetShuffleableEntrances(Rando::EntranceType type, bool onlyPrimary /*= true*/) {
   std::vector<Rando::Entrance*> entrancesToShuffle = {};
   for (RandomizerRegion area : Areas::GetAllAreas()) {
-    for (auto& exit: AreaTable(area)->exits) {
+    for (auto& exit : AreaTable(area)->exits) {
       if ((exit.GetType() == type || type == Rando::EntranceType::All) && (exit.IsPrimary() || !onlyPrimary) && exit.GetType() != Rando::EntranceType::None) {
         entrancesToShuffle.push_back(&exit);
       }
diff --git a/soh/soh/Enhancements/randomizer/entrance.cpp b/soh/soh/Enhancements/randomizer/entrance.cpp
index ee9df1dc1..2f4b43d26 100644
--- a/soh/soh/Enhancements/randomizer/entrance.cpp
+++ b/soh/soh/Enhancements/randomizer/entrance.cpp
@@ -10,6 +10,7 @@ EntranceLinkInfo NO_RETURN_ENTRANCE = { EntranceType::None, RR_NONE, RR_NONE, -1
 
 Entrance::Entrance(RandomizerRegion connectedRegion_, std::vector<ConditionFn> conditions_met_)
     : connectedRegion(connectedRegion_) {
+    originalConnectedRegion = connectedRegion_;
     conditions_met.resize(2);
     for (size_t i = 0; i < conditions_met_.size(); i++) {
         conditions_met[i] = conditions_met_[i];
@@ -109,6 +110,10 @@ RandomizerRegion Entrance::GetConnectedRegionKey() const {
     return connectedRegion;
 }
 
+RandomizerRegion Entrance::GetOriginalConnectedRegionKey() const {
+    return originalConnectedRegion;
+}
+
 Area* Entrance::GetConnectedRegion() const {
     return AreaTable(connectedRegion);
 }
@@ -173,14 +178,6 @@ void Entrance::SetIndex(int16_t newIndex) {
     index = newIndex;
 }
 
-int16_t Entrance::GetBlueWarp() const {
-    return blueWarp;
-}
-
-void Entrance::SetBlueWarp(int16_t newBlueWarp) {
-    blueWarp = newBlueWarp;
-}
-
 Entrance* Entrance::GetAssumed() const {
     return assumed;
 }
@@ -226,7 +223,7 @@ Entrance* Entrance::GetNewTarget() {
     AreaTable(RR_ROOT)->AddExit(RR_ROOT, connectedRegion, [] { return true; });
     Entrance* targetEntrance = AreaTable(RR_ROOT)->GetExit(connectedRegion);
     targetEntrance->SetReplacement(this);
-    targetEntrance->SetName(GetParentRegion()->regionName + " -> " + GetConnectedRegion()->regionName);
+    targetEntrance->SetName(AreaTable(RR_ROOT)->regionName + " -> " + GetConnectedRegion()->regionName);
     return targetEntrance;
 }
 
@@ -246,6 +243,11 @@ void EntranceShuffler::SetNoRandomEntrances(bool noRandomEntrances) {
     mNoRandomEntrances = noRandomEntrances;
 }
 
+// Construct entrance name from parent and connected region keys
+std::string EntranceNameByRegions(RandomizerRegion parentRegion, RandomizerRegion connectedRegion) {
+    return AreaTable(parentRegion)->regionName + " -> " + AreaTable(connectedRegion)->regionName;
+}
+
 void SetAllEntrancesData(std::vector<EntranceInfoPair>& entranceShuffleTable) {
     auto ctx = Rando::Context::GetInstance();
     for (auto& entrancePair : entranceShuffleTable) {
@@ -256,26 +258,22 @@ void SetAllEntrancesData(std::vector<EntranceInfoPair>& entranceShuffleTable) {
         // set data
         Entrance* forwardEntrance = AreaTable(forwardEntry.parentRegion)->GetExit(forwardEntry.connectedRegion);
         forwardEntrance->SetIndex(forwardEntry.index);
-        forwardEntrance->SetBlueWarp(forwardEntry.blueWarp);
         forwardEntrance->SetType(forwardEntry.type);
         forwardEntrance->SetAsPrimary();
 
-        // When decouple entrances is on, mark it for entrances except boss rooms
-        if (ctx->GetOption(RSK_DECOUPLED_ENTRANCES) && forwardEntry.type != EntranceType::ChildBoss &&
-            forwardEntry.type != EntranceType::AdultBoss) {
+        // When decouple entrances is on, mark the forward entrance
+        if (ctx->GetOption(RSK_DECOUPLED_ENTRANCES)) {
             forwardEntrance->SetDecoupled();
         }
 
         if (returnEntry.parentRegion != RR_NONE) {
             Entrance* returnEntrance = AreaTable(returnEntry.parentRegion)->GetExit(returnEntry.connectedRegion);
             returnEntrance->SetIndex(returnEntry.index);
-            returnEntrance->SetBlueWarp(returnEntry.blueWarp);
             returnEntrance->SetType(returnEntry.type);
             forwardEntrance->BindTwoWay(returnEntrance);
 
             // Mark reverse entrance as decoupled
-            if (ctx->GetOption(RSK_DECOUPLED_ENTRANCES) && returnEntry.type != EntranceType::ChildBoss &&
-                returnEntry.type != EntranceType::AdultBoss) {
+            if (ctx->GetOption(RSK_DECOUPLED_ENTRANCES)) {
                 returnEntrance->SetDecoupled();
             }
         }
@@ -925,24 +923,23 @@ int EntranceShuffler::ShuffleAllEntrances() {
     mCurNumRandomizedEntrances = 0;
 
     std::vector<EntranceInfoPair> entranceShuffleTable = {
-        // Parent Region                     Connected Region                      index   blue warp
+        // Type                    Parent Region            Connected Region       Index
         { { EntranceType::Dungeon, RR_KF_OUTSIDE_DEKU_TREE, RR_DEKU_TREE_ENTRYWAY, 0x0000 },
-          { EntranceType::Dungeon, RR_DEKU_TREE_ENTRYWAY, RR_KF_OUTSIDE_DEKU_TREE, 0x0209, 0x0457 } },
+          { EntranceType::Dungeon, RR_DEKU_TREE_ENTRYWAY, RR_KF_OUTSIDE_DEKU_TREE, 0x0209 } },
         { { EntranceType::Dungeon, RR_DEATH_MOUNTAIN_TRAIL, RR_DODONGOS_CAVERN_ENTRYWAY, 0x0004 },
-          { EntranceType::Dungeon, RR_DODONGOS_CAVERN_ENTRYWAY, RR_DEATH_MOUNTAIN_TRAIL, 0x0242, 0x047A } },
+          { EntranceType::Dungeon, RR_DODONGOS_CAVERN_ENTRYWAY, RR_DEATH_MOUNTAIN_TRAIL, 0x0242 } },
         { { EntranceType::Dungeon, RR_ZORAS_FOUNTAIN, RR_JABU_JABUS_BELLY_ENTRYWAY, 0x0028 },
-          { EntranceType::Dungeon, RR_JABU_JABUS_BELLY_ENTRYWAY, RR_ZORAS_FOUNTAIN, 0x0221, 0x010E } },
+          { EntranceType::Dungeon, RR_JABU_JABUS_BELLY_ENTRYWAY, RR_ZORAS_FOUNTAIN, 0x0221 } },
         { { EntranceType::Dungeon, RR_SACRED_FOREST_MEADOW, RR_FOREST_TEMPLE_ENTRYWAY, 0x0169 },
-          { EntranceType::Dungeon, RR_FOREST_TEMPLE_ENTRYWAY, RR_SACRED_FOREST_MEADOW, 0x0215, 0x0608 } },
+          { EntranceType::Dungeon, RR_FOREST_TEMPLE_ENTRYWAY, RR_SACRED_FOREST_MEADOW, 0x0215 } },
         { { EntranceType::Dungeon, RR_DMC_CENTRAL_LOCAL, RR_FIRE_TEMPLE_ENTRYWAY, 0x0165 },
-          { EntranceType::Dungeon, RR_FIRE_TEMPLE_ENTRYWAY, RR_DMC_CENTRAL_LOCAL, 0x024A, 0x0564 } },
+          { EntranceType::Dungeon, RR_FIRE_TEMPLE_ENTRYWAY, RR_DMC_CENTRAL_LOCAL, 0x024A } },
         { { EntranceType::Dungeon, RR_LAKE_HYLIA, RR_WATER_TEMPLE_ENTRYWAY, 0x0010 },
-          { EntranceType::Dungeon, RR_WATER_TEMPLE_ENTRYWAY, RR_LAKE_HYLIA, 0x021D, 0x060C } },
+          { EntranceType::Dungeon, RR_WATER_TEMPLE_ENTRYWAY, RR_LAKE_HYLIA, 0x021D } },
         { { EntranceType::Dungeon, RR_DESERT_COLOSSUS, RR_SPIRIT_TEMPLE_ENTRYWAY, 0x0082 },
-          { EntranceType::Dungeon, RR_SPIRIT_TEMPLE_ENTRYWAY, RR_DESERT_COLOSSUS_FROM_SPIRIT_ENTRYWAY, 0x01E1,
-            0x0610 } },
+          { EntranceType::Dungeon, RR_SPIRIT_TEMPLE_ENTRYWAY, RR_DESERT_COLOSSUS_FROM_SPIRIT_ENTRYWAY, 0x01E1 } },
         { { EntranceType::Dungeon, RR_GRAVEYARD_WARP_PAD_REGION, RR_SHADOW_TEMPLE_ENTRYWAY, 0x0037 },
-          { EntranceType::Dungeon, RR_SHADOW_TEMPLE_ENTRYWAY, RR_GRAVEYARD_WARP_PAD_REGION, 0x0205, 0x0580 } },
+          { EntranceType::Dungeon, RR_SHADOW_TEMPLE_ENTRYWAY, RR_GRAVEYARD_WARP_PAD_REGION, 0x0205 } },
         { { EntranceType::Dungeon, RR_KAKARIKO_VILLAGE, RR_BOTTOM_OF_THE_WELL_ENTRYWAY, 0x0098 },
           { EntranceType::Dungeon, RR_BOTTOM_OF_THE_WELL_ENTRYWAY, RR_KAKARIKO_VILLAGE, 0x02A6 } },
         { { EntranceType::Dungeon, RR_ZORAS_FOUNTAIN, RR_ICE_CAVERN_ENTRYWAY, 0x0088 },
@@ -1190,22 +1187,32 @@ int EntranceShuffler::ShuffleAllEntrances() {
         { { EntranceType::WarpSong, RR_PRELUDE_OF_LIGHT_WARP, RR_TEMPLE_OF_TIME, 0x05F4 }, NO_RETURN_ENTRANCE },
 
         { { EntranceType::ChildBoss, RR_DEKU_TREE_BOSS_ENTRYWAY, RR_DEKU_TREE_BOSS_ROOM, 0x040F },
-          { EntranceType::ChildBoss, RR_DEKU_TREE_BOSS_ROOM, RR_DEKU_TREE_BOSS_ENTRYWAY, 0x0252, 0x0457 } },
+          { EntranceType::ChildBoss, RR_DEKU_TREE_BOSS_ROOM, RR_DEKU_TREE_BOSS_ENTRYWAY, 0x0252 } },
         { { EntranceType::ChildBoss, RR_DODONGOS_CAVERN_BOSS_ENTRYWAY, RR_DODONGOS_CAVERN_BOSS_ROOM, 0x040B },
-          { EntranceType::ChildBoss, RR_DODONGOS_CAVERN_BOSS_ROOM, RR_DODONGOS_CAVERN_BOSS_ENTRYWAY, 0x00C5, 0x047A } },
+          { EntranceType::ChildBoss, RR_DODONGOS_CAVERN_BOSS_ROOM, RR_DODONGOS_CAVERN_BOSS_ENTRYWAY, 0x00C5 } },
         { { EntranceType::ChildBoss, RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY, RR_JABU_JABUS_BELLY_BOSS_ROOM, 0x0301 },
-          { EntranceType::ChildBoss, RR_JABU_JABUS_BELLY_BOSS_ROOM, RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY, 0x0407,
-            0x010E } },
+          { EntranceType::ChildBoss, RR_JABU_JABUS_BELLY_BOSS_ROOM, RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY, 0x0407 } },
         { { EntranceType::AdultBoss, RR_FOREST_TEMPLE_BOSS_ENTRYWAY, RR_FOREST_TEMPLE_BOSS_ROOM, 0x000C },
-          { EntranceType::AdultBoss, RR_FOREST_TEMPLE_BOSS_ROOM, RR_FOREST_TEMPLE_BOSS_ENTRYWAY, 0x024E, 0x0608 } },
+          { EntranceType::AdultBoss, RR_FOREST_TEMPLE_BOSS_ROOM, RR_FOREST_TEMPLE_BOSS_ENTRYWAY, 0x024E } },
         { { EntranceType::AdultBoss, RR_FIRE_TEMPLE_BOSS_ENTRYWAY, RR_FIRE_TEMPLE_BOSS_ROOM, 0x0305 },
-          { EntranceType::AdultBoss, RR_FIRE_TEMPLE_BOSS_ROOM, RR_FIRE_TEMPLE_BOSS_ENTRYWAY, 0x0175, 0x0564 } },
+          { EntranceType::AdultBoss, RR_FIRE_TEMPLE_BOSS_ROOM, RR_FIRE_TEMPLE_BOSS_ENTRYWAY, 0x0175 } },
         { { EntranceType::AdultBoss, RR_WATER_TEMPLE_BOSS_ENTRYWAY, RR_WATER_TEMPLE_BOSS_ROOM, 0x0417 },
-          { EntranceType::AdultBoss, RR_WATER_TEMPLE_BOSS_ROOM, RR_WATER_TEMPLE_BOSS_ENTRYWAY, 0x0423, 0x060C } },
+          { EntranceType::AdultBoss, RR_WATER_TEMPLE_BOSS_ROOM, RR_WATER_TEMPLE_BOSS_ENTRYWAY, 0x0423 } },
         { { EntranceType::AdultBoss, RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY, RR_SPIRIT_TEMPLE_BOSS_ROOM, 0x008D },
-          { EntranceType::AdultBoss, RR_SPIRIT_TEMPLE_BOSS_ROOM, RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY, 0x02F5, 0x0610 } },
+          { EntranceType::AdultBoss, RR_SPIRIT_TEMPLE_BOSS_ROOM, RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY, 0x02F5 } },
         { { EntranceType::AdultBoss, RR_SHADOW_TEMPLE_BOSS_ENTRYWAY, RR_SHADOW_TEMPLE_BOSS_ROOM, 0x0413 },
-          { EntranceType::AdultBoss, RR_SHADOW_TEMPLE_BOSS_ROOM, RR_SHADOW_TEMPLE_BOSS_ENTRYWAY, 0x02B2, 0x0580 } },
+          { EntranceType::AdultBoss, RR_SHADOW_TEMPLE_BOSS_ROOM, RR_SHADOW_TEMPLE_BOSS_ENTRYWAY, 0x02B2 } },
+
+        { { EntranceType::BlueWarp, RR_DEKU_TREE_BOSS_ROOM, RR_KF_OUTSIDE_DEKU_TREE, 0x0457 }, NO_RETURN_ENTRANCE },
+        { { EntranceType::BlueWarp, RR_DODONGOS_CAVERN_BOSS_ROOM, RR_DEATH_MOUNTAIN_TRAIL, 0x047A },
+          NO_RETURN_ENTRANCE },
+        { { EntranceType::BlueWarp, RR_JABU_JABUS_BELLY_BOSS_ROOM, RR_ZORAS_FOUNTAIN, 0x010E }, NO_RETURN_ENTRANCE },
+        { { EntranceType::BlueWarp, RR_FOREST_TEMPLE_BOSS_ROOM, RR_SACRED_FOREST_MEADOW, 0x0608 }, NO_RETURN_ENTRANCE },
+        { { EntranceType::BlueWarp, RR_FIRE_TEMPLE_BOSS_ROOM, RR_DMC_CENTRAL_LOCAL, 0x0564 }, NO_RETURN_ENTRANCE },
+        { { EntranceType::BlueWarp, RR_WATER_TEMPLE_BOSS_ROOM, RR_LAKE_HYLIA, 0x060C }, NO_RETURN_ENTRANCE },
+        { { EntranceType::BlueWarp, RR_SPIRIT_TEMPLE_BOSS_ROOM, RR_DESERT_COLOSSUS, 0x0610 }, NO_RETURN_ENTRANCE },
+        { { EntranceType::BlueWarp, RR_SHADOW_TEMPLE_BOSS_ROOM, RR_GRAVEYARD_WARP_PAD_REGION, 0x0580 },
+          NO_RETURN_ENTRANCE },
     };
 
     std::map<std::string, PriorityEntrance> priorityEntranceTable = {
@@ -1262,6 +1269,11 @@ int EntranceShuffler::ShuffleAllEntrances() {
                            entrance->GetConnectedRegionKey() == RR_DEKU_TREE_BOSS_ROOM;
                 });
             }
+            if (ctx->GetOption(RSK_DECOUPLED_ENTRANCES)) {
+                for (Entrance* entrance : entrancePools[EntranceType::Boss]) {
+                    entrancePools[EntranceType::BossReverse].push_back(entrance->GetReverse());
+                }
+            }
         } else {
             entrancePools[EntranceType::ChildBoss] = GetShuffleableEntrances(EntranceType::ChildBoss);
             entrancePools[EntranceType::AdultBoss] = GetShuffleableEntrances(EntranceType::AdultBoss);
@@ -1273,6 +1285,14 @@ int EntranceShuffler::ShuffleAllEntrances() {
                            entrance->GetConnectedRegionKey() == RR_DEKU_TREE_BOSS_ROOM;
                 });
             }
+            if (ctx->GetOption(RSK_DECOUPLED_ENTRANCES)) {
+                for (Entrance* entrance : entrancePools[EntranceType::ChildBoss]) {
+                    entrancePools[EntranceType::ChildBossReverse].push_back(entrance->GetReverse());
+                }
+                for (Entrance* entrance : entrancePools[EntranceType::AdultBoss]) {
+                    entrancePools[EntranceType::AdultBossReverse].push_back(entrance->GetReverse());
+                }
+            }
         }
     }
 
@@ -1346,11 +1366,13 @@ int EntranceShuffler::ShuffleAllEntrances() {
 
     // combine entrance pools if mixing pools. Only continue if more than one pool is selected.
     int totalMixedPools =
-        (ctx->GetOption(RSK_MIX_DUNGEON_ENTRANCES) ? 1 : 0) + (ctx->GetOption(RSK_MIX_OVERWORLD_ENTRANCES) ? 1 : 0) +
-        (ctx->GetOption(RSK_MIX_INTERIOR_ENTRANCES) ? 1 : 0) + (ctx->GetOption(RSK_MIX_GROTTO_ENTRANCES) ? 1 : 0);
+        (ctx->GetOption(RSK_MIX_DUNGEON_ENTRANCES) ? 1 : 0) + (ctx->GetOption(RSK_MIX_BOSS_ENTRANCES) ? 1 : 0) +
+        (ctx->GetOption(RSK_MIX_OVERWORLD_ENTRANCES) ? 1 : 0) + (ctx->GetOption(RSK_MIX_INTERIOR_ENTRANCES) ? 1 : 0) +
+        (ctx->GetOption(RSK_MIX_GROTTO_ENTRANCES) ? 1 : 0);
     if (totalMixedPools < 2) {
         ctx->GetOption(RSK_MIXED_ENTRANCE_POOLS).SetSelectedIndex(RO_GENERIC_OFF);
         ctx->GetOption(RSK_MIX_DUNGEON_ENTRANCES).SetSelectedIndex(RO_GENERIC_OFF);
+        ctx->GetOption(RSK_MIX_BOSS_ENTRANCES).SetSelectedIndex(RO_GENERIC_OFF);
         ctx->GetOption(RSK_MIX_OVERWORLD_ENTRANCES).SetSelectedIndex(RO_GENERIC_OFF);
         ctx->GetOption(RSK_MIX_INTERIOR_ENTRANCES).SetSelectedIndex(RO_GENERIC_OFF);
         ctx->GetOption(RSK_MIX_GROTTO_ENTRANCES).SetSelectedIndex(RO_GENERIC_OFF);
@@ -1364,6 +1386,12 @@ int EntranceShuffler::ShuffleAllEntrances() {
                 poolsToMix.insert(EntranceType::DungeonReverse);
             }
         }
+        if (ctx->GetOption(RSK_MIX_DUNGEON_ENTRANCES)) {
+            poolsToMix.insert(EntranceType::Boss);
+            if (ctx->GetOption(RSK_DECOUPLED_ENTRANCES)) {
+                poolsToMix.insert(EntranceType::BossReverse);
+            }
+        }
         if (ctx->GetOption(RSK_SHUFFLE_OVERWORLD_ENTRANCES)) {
             poolsToMix.insert(EntranceType::Overworld);
         }
@@ -1503,6 +1531,94 @@ int EntranceShuffler::ShuffleAllEntrances() {
         }
     }
 
+    // Determine blue warp targets
+    // RANDOTODO: add bluewarp shuffle
+    if (true /* ctx->GetOption(RSK_SHUFFLE_BLUEWARP_ENTRANCES).Is(RO_BLUEWARP_ENTRANCE_SHUFFLE_DUNGEON) */) {
+        // If a boss room is inside a boss door, make the blue warp go outside the dungeon's entrance
+        std::map<std::string, Entrance*> bossExits = {
+            { EntranceNameByRegions(RR_DEKU_TREE_BOSS_ROOM, RR_DEKU_TREE_BOSS_ENTRYWAY),
+              GetEntrance(EntranceNameByRegions(RR_DEKU_TREE_ENTRYWAY, RR_KF_OUTSIDE_DEKU_TREE)) },
+            { EntranceNameByRegions(RR_DODONGOS_CAVERN_BOSS_ROOM, RR_DODONGOS_CAVERN_BOSS_ENTRYWAY),
+              GetEntrance(EntranceNameByRegions(RR_DODONGOS_CAVERN_ENTRYWAY, RR_DEATH_MOUNTAIN_TRAIL)) },
+            { EntranceNameByRegions(RR_JABU_JABUS_BELLY_BOSS_ROOM, RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY),
+              GetEntrance(EntranceNameByRegions(RR_JABU_JABUS_BELLY_ENTRYWAY, RR_ZORAS_FOUNTAIN)) },
+            { EntranceNameByRegions(RR_FOREST_TEMPLE_BOSS_ROOM, RR_FOREST_TEMPLE_BOSS_ENTRYWAY),
+              GetEntrance(EntranceNameByRegions(RR_FOREST_TEMPLE_ENTRYWAY, RR_SACRED_FOREST_MEADOW)) },
+            { EntranceNameByRegions(RR_FIRE_TEMPLE_BOSS_ROOM, RR_FIRE_TEMPLE_BOSS_ENTRYWAY),
+              GetEntrance(EntranceNameByRegions(RR_FIRE_TEMPLE_ENTRYWAY, RR_DMC_CENTRAL_LOCAL)) },
+            { EntranceNameByRegions(RR_WATER_TEMPLE_BOSS_ROOM, RR_WATER_TEMPLE_BOSS_ENTRYWAY),
+              GetEntrance(EntranceNameByRegions(RR_WATER_TEMPLE_ENTRYWAY, RR_LAKE_HYLIA)) },
+            { EntranceNameByRegions(RR_SPIRIT_TEMPLE_BOSS_ROOM, RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY),
+              GetEntrance(EntranceNameByRegions(RR_SPIRIT_TEMPLE_ENTRYWAY, RR_DESERT_COLOSSUS_FROM_SPIRIT_ENTRYWAY)) },
+            { EntranceNameByRegions(RR_SHADOW_TEMPLE_BOSS_ROOM, RR_SHADOW_TEMPLE_BOSS_ENTRYWAY),
+              GetEntrance(EntranceNameByRegions(RR_SHADOW_TEMPLE_ENTRYWAY, RR_GRAVEYARD_WARP_PAD_REGION)) },
+        };
+
+        // If a boss room is inside a dungeon entrance (or inside a dungeon which is inside a dungeon entrance), make
+        // the blue warp go to that dungeon's blue warp target
+        std::map<std::string, Entrance*> dungeonExits = {
+            { EntranceNameByRegions(RR_DEKU_TREE_ENTRYWAY, RR_KF_OUTSIDE_DEKU_TREE),
+              GetEntrance(EntranceNameByRegions(RR_DEKU_TREE_BOSS_ROOM, RR_KF_OUTSIDE_DEKU_TREE)) },
+            { EntranceNameByRegions(RR_DODONGOS_CAVERN_ENTRYWAY, RR_DEATH_MOUNTAIN_TRAIL),
+              GetEntrance(EntranceNameByRegions(RR_DODONGOS_CAVERN_BOSS_ROOM, RR_DEATH_MOUNTAIN_TRAIL)) },
+            { EntranceNameByRegions(RR_JABU_JABUS_BELLY_ENTRYWAY, RR_ZORAS_FOUNTAIN),
+              GetEntrance(EntranceNameByRegions(RR_JABU_JABUS_BELLY_BOSS_ROOM, RR_ZORAS_FOUNTAIN)) },
+            { EntranceNameByRegions(RR_FOREST_TEMPLE_ENTRYWAY, RR_SACRED_FOREST_MEADOW),
+              GetEntrance(EntranceNameByRegions(RR_FOREST_TEMPLE_BOSS_ROOM, RR_SACRED_FOREST_MEADOW)) },
+            { EntranceNameByRegions(RR_FIRE_TEMPLE_ENTRYWAY, RR_DMC_CENTRAL_LOCAL),
+              GetEntrance(EntranceNameByRegions(RR_FIRE_TEMPLE_BOSS_ROOM, RR_DMC_CENTRAL_LOCAL)) },
+            { EntranceNameByRegions(RR_WATER_TEMPLE_ENTRYWAY, RR_LAKE_HYLIA),
+              GetEntrance(EntranceNameByRegions(RR_WATER_TEMPLE_BOSS_ROOM, RR_LAKE_HYLIA)) },
+            { EntranceNameByRegions(RR_SPIRIT_TEMPLE_ENTRYWAY, RR_DESERT_COLOSSUS_FROM_SPIRIT_ENTRYWAY),
+              GetEntrance(EntranceNameByRegions(RR_SPIRIT_TEMPLE_BOSS_ROOM, RR_DESERT_COLOSSUS)) },
+            { EntranceNameByRegions(RR_SHADOW_TEMPLE_ENTRYWAY, RR_GRAVEYARD_WARP_PAD_REGION),
+              GetEntrance(EntranceNameByRegions(RR_SHADOW_TEMPLE_BOSS_ROOM, RR_GRAVEYARD_WARP_PAD_REGION)) },
+        };
+
+        // Pair <BlueWarp exit, BossRoom reverse exit>
+        std::vector<EntrancePair> bossRoomExitPairs = {
+            { GetEntrance(EntranceNameByRegions(RR_DEKU_TREE_BOSS_ROOM, RR_KF_OUTSIDE_DEKU_TREE)),
+              GetEntrance(EntranceNameByRegions(RR_DEKU_TREE_BOSS_ROOM, RR_DEKU_TREE_BOSS_ENTRYWAY)) },
+            { GetEntrance(EntranceNameByRegions(RR_DODONGOS_CAVERN_BOSS_ROOM, RR_DEATH_MOUNTAIN_TRAIL)),
+              GetEntrance(EntranceNameByRegions(RR_DODONGOS_CAVERN_BOSS_ROOM, RR_DODONGOS_CAVERN_BOSS_ENTRYWAY)) },
+            { GetEntrance(EntranceNameByRegions(RR_JABU_JABUS_BELLY_BOSS_ROOM, RR_ZORAS_FOUNTAIN)),
+              GetEntrance(EntranceNameByRegions(RR_JABU_JABUS_BELLY_BOSS_ROOM, RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY)) },
+            { GetEntrance(EntranceNameByRegions(RR_FOREST_TEMPLE_BOSS_ROOM, RR_SACRED_FOREST_MEADOW)),
+              GetEntrance(EntranceNameByRegions(RR_FOREST_TEMPLE_BOSS_ROOM, RR_FOREST_TEMPLE_BOSS_ENTRYWAY)) },
+            { GetEntrance(EntranceNameByRegions(RR_FIRE_TEMPLE_BOSS_ROOM, RR_DMC_CENTRAL_LOCAL)),
+              GetEntrance(EntranceNameByRegions(RR_FIRE_TEMPLE_BOSS_ROOM, RR_FIRE_TEMPLE_BOSS_ENTRYWAY)) },
+            { GetEntrance(EntranceNameByRegions(RR_WATER_TEMPLE_BOSS_ROOM, RR_LAKE_HYLIA)),
+              GetEntrance(EntranceNameByRegions(RR_WATER_TEMPLE_BOSS_ROOM, RR_WATER_TEMPLE_BOSS_ENTRYWAY)) },
+            { GetEntrance(EntranceNameByRegions(RR_SPIRIT_TEMPLE_BOSS_ROOM, RR_DESERT_COLOSSUS)),
+              GetEntrance(EntranceNameByRegions(RR_SPIRIT_TEMPLE_BOSS_ROOM, RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY)) },
+            { GetEntrance(EntranceNameByRegions(RR_SHADOW_TEMPLE_BOSS_ROOM, RR_GRAVEYARD_WARP_PAD_REGION)),
+              GetEntrance(EntranceNameByRegions(RR_SHADOW_TEMPLE_BOSS_ROOM, RR_SHADOW_TEMPLE_BOSS_ENTRYWAY)) },
+        };
+
+        for (EntrancePair pair : bossRoomExitPairs) {
+            Entrance* target = pair.second->GetReplacement() != nullptr ? pair.second->GetReplacement() : pair.second;
+
+            if (!ctx->GetOption(RSK_DECOUPLED_ENTRANCES)) {
+                while (bossExits.find(target->GetName()) != bossExits.end()) {
+                    Entrance* next = bossExits.at(target->GetName());
+                    target = next->GetReplacement() != nullptr ? next->GetReplacement() : next;
+                }
+
+                if (dungeonExits.find(target->GetName()) != dungeonExits.end()) {
+                    target = dungeonExits.at(target->GetName());
+                }
+            }
+
+            pair.first->Connect(target->GetOriginalConnectedRegionKey());
+            pair.first->SetReplacement(target);
+        }
+    }
+
+    // Validate the world one last time to ensure all special conditions are still valid
+    if (!ValidateWorld(nullptr)) {
+        return ENTRANCE_SHUFFLE_FAILURE;
+    }
+
     return ENTRANCE_SHUFFLE_SUCCESS;
 }
 
@@ -1518,16 +1634,21 @@ void EntranceShuffler::CreateEntranceOverrides() {
     int i = 0;
     for (Entrance* entrance : allShuffleableEntrances) {
 
+        // Include blue warps when dungeons or bosses are shuffled
+        bool includeBluewarps =
+            entrance->GetType() == Rando::EntranceType::BlueWarp &&
+            (ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES) || ctx->GetOption(RSK_SHUFFLE_BOSS_ENTRANCES));
+
         // Double-check to make sure the entrance is actually shuffled
-        if (!entrance->IsShuffled()) {
+        if (!entrance->IsShuffled() && !includeBluewarps) {
             continue;
         }
 
         auto message = "Setting " + entrance->to_string() + "\n";
         SPDLOG_DEBUG(message);
 
+        uint8_t type = (uint8_t)entrance->GetType();
         int16_t originalIndex = entrance->GetIndex();
-        int16_t originalBlueWarp = entrance->GetBlueWarp();
         int16_t replacementIndex = entrance->GetReplacement()->GetIndex();
 
         int16_t destinationIndex = -1;
@@ -1541,9 +1662,9 @@ void EntranceShuffler::CreateEntranceOverrides() {
         }
 
         entranceOverrides[i] = {
+            .type = type,
             .index = originalIndex,
             .destination = destinationIndex,
-            .blueWarp = originalBlueWarp,
             .override = replacementIndex,
             .overrideDestination = replacementDestinationIndex,
         };
@@ -1559,9 +1680,9 @@ void EntranceShuffler::CreateEntranceOverrides() {
 /// @brief set all the entrances to be 0 to indicate an unshuffled entrance
 void EntranceShuffler::UnshuffleAllEntrances() {
     for (auto& entranceOveride : entranceOverrides) {
+        entranceOveride.type = 0;
         entranceOveride.index = 0;
         entranceOveride.destination = 0;
-        entranceOveride.blueWarp = 0;
         entranceOveride.override = 0;
         entranceOveride.overrideDestination = 0;
     }
@@ -1575,12 +1696,12 @@ void EntranceShuffler::ParseJson(nlohmann::json spoilerFileJson) {
         for (auto it = entrancesJson.begin(); it != entrancesJson.end(); ++it, i++) {
             nlohmann::json entranceJson = *it;
             for (auto entranceIt = entranceJson.begin(); entranceIt != entranceJson.end(); ++entranceIt) {
-                if (entranceIt.key() == "index") {
+                if (entranceIt.key() == "type") {
+                    entranceOverrides[i].type = entranceIt.value();
+                } else if (entranceIt.key() == "index") {
                     entranceOverrides[i].index = entranceIt.value();
                 } else if (entranceIt.key() == "destination") {
                     entranceOverrides[i].destination = entranceIt.value();
-                } else if (entranceIt.key() == "blueWarp") {
-                    entranceOverrides[i].blueWarp = entranceIt.value();
                 } else if (entranceIt.key() == "override") {
                     entranceOverrides[i].override = entranceIt.value();
                 } else if (entranceIt.key() == "overrideDestination") {
@@ -1593,5 +1714,5 @@ void EntranceShuffler::ParseJson(nlohmann::json spoilerFileJson) {
 } // namespace Rando
 
 extern "C" EntranceOverride* Randomizer_GetEntranceOverrides() {
-  return Rando::Context::GetInstance()->GetEntranceShuffler()->entranceOverrides.data();
+    return Rando::Context::GetInstance()->GetEntranceShuffler()->entranceOverrides.data();
 }
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/entrance.h b/soh/soh/Enhancements/randomizer/entrance.h
index 0886ddb26..e17687842 100644
--- a/soh/soh/Enhancements/randomizer/entrance.h
+++ b/soh/soh/Enhancements/randomizer/entrance.h
@@ -15,12 +15,16 @@ enum class EntranceType {
     OwlDrop,
     Spawn,
     WarpSong,
+    BlueWarp,
     Dungeon,
     GanonDungeon,
     DungeonReverse,
     Boss,
+    BossReverse,
     ChildBoss,
+    ChildBossReverse,
     AdultBoss,
+    AdultBossReverse,
     Interior,
     InteriorReverse,
     SpecialInterior,
@@ -45,6 +49,7 @@ class Entrance {
     uint32_t Getuint32_t() const;
     bool CheckConditionAtAgeTime(bool& age, bool& time, bool passAnyway = false) const;
     RandomizerRegion GetConnectedRegionKey() const;
+    RandomizerRegion GetOriginalConnectedRegionKey() const;
     Area* GetConnectedRegion() const;
     void SetParentRegion(RandomizerRegion newParent);
     RandomizerRegion GetParentRegionKey() const;
@@ -61,8 +66,6 @@ class Entrance {
     void SetDecoupled();
     int16_t GetIndex() const;
     void SetIndex(int16_t newIndex);
-    int16_t GetBlueWarp() const;
-    void SetBlueWarp(int16_t newBlueWarp);
     Entrance* GetAssumed() const;
     void SetReplacement(Entrance* newReplacement);
     Entrance* GetReplacement() const;
@@ -78,6 +81,7 @@ class Entrance {
   private:
     RandomizerRegion parentRegion;
     RandomizerRegion connectedRegion;
+    RandomizerRegion originalConnectedRegion;
     std::vector<ConditionFn> conditions_met;
 
     EntranceType type = EntranceType::None;
@@ -86,7 +90,6 @@ class Entrance {
     Entrance* assumed = nullptr;
     Entrance* replacement = nullptr;
     int16_t index = 0xFFFF;
-    int16_t blueWarp = 0;
     bool shuffled = false;
     bool primary = false;
     bool addedToPool = false;
@@ -99,7 +102,6 @@ typedef struct {
     RandomizerRegion parentRegion;
     RandomizerRegion connectedRegion;
     int16_t index;
-    int16_t blueWarp;
 } EntranceLinkInfo;
 
 typedef struct {
diff --git a/soh/soh/Enhancements/randomizer/option_descriptions.cpp b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
index 95db75e55..e50846005 100644
--- a/soh/soh/Enhancements/randomizer/option_descriptions.cpp
+++ b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
@@ -170,12 +170,14 @@ void Settings::CreateOptionDescriptions() {
         "This also adds the one-way entrance from Gerudo Valley to Lake Hylia in the pool of "
         "overworld entrances when they are shuffled.";
     mOptionDescriptions[RSK_MIXED_ENTRANCE_POOLS] =
-        "Shuffle entrances into a mixed pool instead of separate ones.\n"
+        "Shuffle entrances into a mixed pool instead of separate ones. Has no affect on pools whose "
+        "entrances aren't shuffled, and \"Shuffle Boss Entrances\" must be set to \"Full\" to include them.\n"
         "\n"
         "For example, enabling the settings to shuffle grotto, dungeon, and overworld entrances and "
         "selecting grotto and dungeon entrances here will allow a dungeon to be inside a grotto or "
         "vice versa, while overworld entrances are shuffled in their own separate pool and indoors stay vanilla.";
     mOptionDescriptions[RSK_MIX_DUNGEON_ENTRANCES] = "Dungeon entrances will be part of the mixed pool";
+    mOptionDescriptions[RSK_MIX_BOSS_ENTRANCES] = "Boss entrances will be part of the mixed pool";
     mOptionDescriptions[RSK_MIX_OVERWORLD_ENTRANCES] = "Overworld entrances will be part of the mixed pool";
     mOptionDescriptions[RSK_MIX_INTERIOR_ENTRANCES] = "Interior entrances will be part of the mixed pool";
     mOptionDescriptions[RSK_MIX_GROTTO_ENTRANCES] = "Grotto entrances will be part of the mixed pool";
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index b2d9c7866..179f8144e 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -236,23 +236,6 @@ std::unordered_map<s16, s16> getItemIdToItemId = {
     { GI_CLAIM_CHECK, ITEM_CLAIM_CHECK } 
 };
 
-std::string sanitize(std::string stringValue) {
-    // Add backslashes.
-    for (auto i = stringValue.begin();;) {
-        auto const pos = std::find_if(i, stringValue.end(), [](char const c) { return '\\' == c || '\'' == c || '"' == c; });
-        if (pos == stringValue.end()) {
-            break;
-        }
-        i = std::next(stringValue.insert(pos, '\\'), 2);
-    }
-
-    // Removes others.
-    stringValue.erase(std::remove_if(stringValue.begin(), stringValue.end(), [](char const c) {
-        return '\n' == c || '\r' == c || '\0' == c || '\x1A' == c; }), stringValue.end());
-
-    return stringValue;
-}
-
 #pragma optimize("", off)
 #pragma GCC push_options
 #pragma GCC optimize ("O0")
diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
index 3fc4efa86..ac947d4da 100644
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -68,6 +68,7 @@ void Settings::CreateOptions() {
     mOptions[RSK_SHUFFLE_OVERWORLD_SPAWNS] = Option::Bool("Overworld Spawns", "gRandomizeShuffleOverworldSpanws", mOptionDescriptions[RSK_SHUFFLE_OVERWORLD_SPAWNS]);
     mOptions[RSK_MIXED_ENTRANCE_POOLS] = Option::Bool("Mixed Entrance Pools", "gRandomizeMixedEntrances", mOptionDescriptions[RSK_MIXED_ENTRANCE_POOLS]);
     mOptions[RSK_MIX_DUNGEON_ENTRANCES] = Option::Bool("Mix Dungeons", "gRandomizeMixDungeons", mOptionDescriptions[RSK_MIX_DUNGEON_ENTRANCES], IMFLAG_NONE);
+    mOptions[RSK_MIX_BOSS_ENTRANCES] = Option::Bool("Mix Bosses", "gRandomizeMixBosses", mOptionDescriptions[RSK_MIX_BOSS_ENTRANCES], IMFLAG_NONE);
     mOptions[RSK_MIX_OVERWORLD_ENTRANCES] = Option::Bool("Mix Overworld", "gRandomizeMixOverworld", mOptionDescriptions[RSK_MIX_OVERWORLD_ENTRANCES], IMFLAG_NONE);
     mOptions[RSK_MIX_INTERIOR_ENTRANCES] = Option::Bool("Mix Interiors", "gRandomizeMixInteriors", mOptionDescriptions[RSK_MIX_INTERIOR_ENTRANCES], IMFLAG_NONE);
     mOptions[RSK_MIX_GROTTO_ENTRANCES] = Option::Bool("Mix Grottos", "gRandomizeMixGrottos", mOptionDescriptions[RSK_MIX_GROTTO_ENTRANCES]);
@@ -638,6 +639,7 @@ void Settings::CreateOptions() {
         &mOptions[RSK_DECOUPLED_ENTRANCES],
         &mOptions[RSK_MIXED_ENTRANCE_POOLS],
         &mOptions[RSK_MIX_DUNGEON_ENTRANCES],
+        &mOptions[RSK_MIX_BOSS_ENTRANCES],
         &mOptions[RSK_MIX_OVERWORLD_ENTRANCES],
         &mOptions[RSK_MIX_INTERIOR_ENTRANCES],
         &mOptions[RSK_MIX_GROTTO_ENTRANCES]
@@ -828,6 +830,7 @@ void Settings::CreateOptions() {
         &mOptions[RSK_SHUFFLE_OVERWORLD_SPAWNS],
         &mOptions[RSK_MIXED_ENTRANCE_POOLS],
         &mOptions[RSK_MIX_DUNGEON_ENTRANCES],
+        &mOptions[RSK_MIX_BOSS_ENTRANCES],
         &mOptions[RSK_MIX_OVERWORLD_ENTRANCES],
         &mOptions[RSK_MIX_INTERIOR_ENTRANCES],
         &mOptions[RSK_MIX_GROTTO_ENTRANCES],
@@ -1159,6 +1162,7 @@ void Settings::CreateOptions() {
         { "World Settings:Overworld Spawns", RSK_SHUFFLE_OVERWORLD_SPAWNS },
         { "World Settings:Mixed Entrance Pools", RSK_MIXED_ENTRANCE_POOLS },
         { "World Settings:Mix Dungeons", RSK_MIX_DUNGEON_ENTRANCES },
+        { "World Settings:Mix Bosses", RSK_MIX_BOSS_ENTRANCES },
         { "World Settings:Mix Overworld", RSK_MIX_OVERWORLD_ENTRANCES },
         { "World Settings:Mix Interiors", RSK_MIX_INTERIOR_ENTRANCES },
         { "World Settings:Mix Grottos", RSK_MIX_GROTTO_ENTRANCES },
@@ -1534,12 +1538,14 @@ void Settings::UpdateOptionProperties() {
     if (CVarGetInteger("gRandomizeMixedEntrances", RO_GENERIC_OFF)) {
         mOptions[RSK_MIXED_ENTRANCE_POOLS].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
         mOptions[RSK_MIX_DUNGEON_ENTRANCES].Unhide();
+        mOptions[RSK_MIX_BOSS_ENTRANCES].Unhide();
         mOptions[RSK_MIX_OVERWORLD_ENTRANCES].Unhide();
         mOptions[RSK_MIX_INTERIOR_ENTRANCES].Unhide();
         mOptions[RSK_MIX_GROTTO_ENTRANCES].Unhide();
     } else {
         mOptions[RSK_MIXED_ENTRANCE_POOLS].AddFlag(IMFLAG_SEPARATOR_BOTTOM);
         mOptions[RSK_MIX_DUNGEON_ENTRANCES].Hide();
+        mOptions[RSK_MIX_BOSS_ENTRANCES].Hide();
         mOptions[RSK_MIX_OVERWORLD_ENTRANCES].Hide();
         mOptions[RSK_MIX_INTERIOR_ENTRANCES].Hide();
         mOptions[RSK_MIX_GROTTO_ENTRANCES].Hide();
@@ -2309,6 +2315,7 @@ void Settings::ParseJson(nlohmann::json spoilerFileJson) {
                 case RSK_SHUFFLE_OVERWORLD_SPAWNS:
                 case RSK_MIXED_ENTRANCE_POOLS:
                 case RSK_MIX_DUNGEON_ENTRANCES:
+                case RSK_MIX_BOSS_ENTRANCES:
                 case RSK_MIX_OVERWORLD_ENTRANCES:
                 case RSK_MIX_INTERIOR_ENTRANCES:
                 case RSK_MIX_GROTTO_ENTRANCES:
diff --git a/soh/soh/SaveManager.cpp b/soh/soh/SaveManager.cpp
index 0fc3394c9..cb5820204 100644
--- a/soh/soh/SaveManager.cpp
+++ b/soh/soh/SaveManager.cpp
@@ -357,9 +357,9 @@ void SaveManager::LoadRandomizerVersion3() {
     auto entranceCtx = randoContext->GetEntranceShuffler();
     SaveManager::Instance->LoadArray("entrances", ARRAY_COUNT(entranceCtx->entranceOverrides), [&](size_t i) {
         SaveManager::Instance->LoadStruct("", [&]() {
+            SaveManager::Instance->LoadData("type", entranceCtx->entranceOverrides[i].type);
             SaveManager::Instance->LoadData("index", entranceCtx->entranceOverrides[i].index);
             SaveManager::Instance->LoadData("destination", entranceCtx->entranceOverrides[i].destination);
-            SaveManager::Instance->LoadData("blueWarp", entranceCtx->entranceOverrides[i].blueWarp);
             SaveManager::Instance->LoadData("override", entranceCtx->entranceOverrides[i].override);
             SaveManager::Instance->LoadData("overrideDestination",
                                             entranceCtx->entranceOverrides[i].overrideDestination);

From 00b358115196648cb50bcff4cce08694ce759000 Mon Sep 17 00:00:00 2001
From: Ted Newman <Tawling@users.noreply.github.com>
Date: Tue, 20 Feb 2024 18:15:10 -0800
Subject: [PATCH 078/230] Skull Kid (#86)

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
---
 .../Enhancements/game-interactor/GameInteractor.h  |  3 ++-
 soh/soh/Enhancements/randomizer/hook_handlers.cpp  |  1 +
 soh/src/overlays/actors/ovl_En_Skj/z_en_skj.c      | 14 ++++----------
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h
index 2cac52637..f27342c3e 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h
@@ -271,8 +271,9 @@ typedef enum {
     GI_VB_GIVE_ITEM_FROM_MAGIC_BEAN_SALESMAN,
     // Opt: *EnFr
     GI_VB_GIVE_ITEM_FROM_FROGS,
+    // Opt: *EnSkj
+    GI_VB_GIVE_ITEM_FROM_SKULL_KID_SARIAS_SONG,
     GI_VB_GIVE_ITEM_FROM_MAN_ON_ROOF,
-
     // Opt: *EnSyatekiMan
     GI_VB_GIVE_ITEM_FROM_SHOOTING_GALLERY,
 
diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index 87c7f5b3c..511c0d7e6 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -803,6 +803,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
         case GI_VB_ANJU_SET_OBTAINED_TRADE_ITEM:
         case GI_VB_GIVE_ITEM_FROM_ROLLING_GORON_AS_CHILD:
         case GI_VB_GIVE_ITEM_FROM_LAB_DIVE:
+        case GI_VB_GIVE_ITEM_FROM_SKULL_KID_SARIAS_SONG:
         case GI_VB_GIVE_ITEM_FROM_MAN_ON_ROOF:
         case GI_VB_GIVE_ITEM_SKULL_TOKEN:
         case GI_VB_GIVE_ITEM_FROM_BLUE_WARP:
diff --git a/soh/src/overlays/actors/ovl_En_Skj/z_en_skj.c b/soh/src/overlays/actors/ovl_En_Skj/z_en_skj.c
index 207d9612b..8b6545f76 100644
--- a/soh/src/overlays/actors/ovl_En_Skj/z_en_skj.c
+++ b/soh/src/overlays/actors/ovl_En_Skj/z_en_skj.c
@@ -1039,11 +1039,8 @@ void EnSkj_SariaSongTalk(EnSkj* this, PlayState* play) {
             EnSkj_SetupWaitInRange(this);
         } else {
             func_80AFFE24(this);
-            if (!IS_RANDO) {
+            if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_SKULL_KID_SARIAS_SONG, true, this)) {
                 func_8002F434(&this->actor, play, GI_HEART_PIECE, EnSkj_GetItemXzRange(this), EnSkj_GetItemYRange(this));
-            } else {
-                GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_LW_SKULL_KID, GI_HEART_PIECE);
-                GiveItemEntryFromActor(&this->actor, play, getItemEntry, EnSkj_GetItemXzRange(this), EnSkj_GetItemYRange(this));
             }
         }
     }
@@ -1054,15 +1051,12 @@ void func_80AFFE24(EnSkj* this) {
 }
 
 void func_80AFFE44(EnSkj* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_SKULL_KID_SARIAS_SONG, true, this)) {
         this->actor.parent = NULL;
         EnSkj_SetupPostSariasSong(this);
     } else {
-        if (!IS_RANDO) {
+        if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_SKULL_KID_SARIAS_SONG, true, this)) {
             func_8002F434(&this->actor, play, GI_HEART_PIECE, EnSkj_GetItemXzRange(this), EnSkj_GetItemYRange(this));
-        } else {
-            GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_LW_SKULL_KID, GI_HEART_PIECE);
-            GiveItemEntryFromActor(&this->actor, play, getItemEntry, EnSkj_GetItemXzRange(this), EnSkj_GetItemYRange(this));
         }
     }
 }
@@ -1072,7 +1066,7 @@ void EnSkj_SetupPostSariasSong(EnSkj* this) {
 }
 
 void EnSkj_ChangeModeAfterSong(EnSkj* this, PlayState* play) {
-    if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) {
+    if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_SKULL_KID_SARIAS_SONG, true, this)) {
         Flags_SetItemGetInf(ITEMGETINF_16);
         EnSkj_SetNaviId(this);
         EnSkj_SetupWaitInRange(this);

From 0dda3a6c298af5481e967de0fd9ae1ba21547e24 Mon Sep 17 00:00:00 2001
From: Garrett Cox <garrettjcox@gmail.com>
Date: Tue, 20 Feb 2024 21:00:10 -0600
Subject: [PATCH 079/230] More boss intro skips

---
 soh/soh/Enhancements/randomizer/savefile.cpp  |  5 ++-
 .../Enhancements/timesaver_hook_handlers.cpp  | 37 +++++++++++++++++++
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/savefile.cpp b/soh/soh/Enhancements/randomizer/savefile.cpp
index 19ef26ac0..95840b15c 100644
--- a/soh/soh/Enhancements/randomizer/savefile.cpp
+++ b/soh/soh/Enhancements/randomizer/savefile.cpp
@@ -247,9 +247,10 @@ extern "C" void Randomizer_InitSaveFile() {
     Flags_SetInfTable(INFTABLE_RUTO_IN_JJ_TALK_FIRST_TIME);
     Flags_SetInfTable(INFTABLE_RUTO_IN_JJ_WANTS_TO_BE_TOSSED_TO_SAPPHIRE);
 
+    // Now handled by cutscene skips
     // Skip cutscenes before Nabooru fight
-    Flags_SetEventChkInf(EVENTCHKINF_BEGAN_NABOORU_BATTLE);
-    Flags_SetEventChkInf(EVENTCHKINF_NABOORU_ORDERED_TO_FIGHT_BY_TWINROVA);
+    // Flags_SetEventChkInf(EVENTCHKINF_BEGAN_NABOORU_BATTLE);
+    // Flags_SetEventChkInf(EVENTCHKINF_NABOORU_ORDERED_TO_FIGHT_BY_TWINROVA);
 
     // Now handled by cutscene skips
     // Skip boss cutscenes
diff --git a/soh/soh/Enhancements/timesaver_hook_handlers.cpp b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
index cd34e5608..1a349805f 100644
--- a/soh/soh/Enhancements/timesaver_hook_handlers.cpp
+++ b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
@@ -638,6 +638,43 @@ void TimeSaverOnSceneInitHandler(int16_t sceneNum) {
                 }
             }
             break;
+        case SCENE_FOREST_TEMPLE_BOSS:
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", 0)) {
+                if (!Flags_GetEventChkInf(EVENTCHKINF_BEGAN_PHANTOM_GANON_BATTLE)) {
+                    Flags_SetEventChkInf(EVENTCHKINF_BEGAN_PHANTOM_GANON_BATTLE);
+                }
+            }
+            break;
+        case SCENE_FIRE_TEMPLE_BOSS:
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", 0)) {
+                if (!Flags_GetEventChkInf(EVENTCHKINF_BEGAN_VOLVAGIA_BATTLE)) {
+                    Flags_SetEventChkInf(EVENTCHKINF_BEGAN_VOLVAGIA_BATTLE);
+                }
+            }
+            break;
+        case SCENE_WATER_TEMPLE_BOSS:
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", 0)) {
+                if (!Flags_GetEventChkInf(EVENTCHKINF_BEGAN_MORPHA_BATTLE)) {
+                    Flags_SetEventChkInf(EVENTCHKINF_BEGAN_MORPHA_BATTLE);
+                }
+            }
+            break;
+        case SCENE_SPIRIT_TEMPLE_BOSS:
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", 0)) {
+                if (!Flags_GetEventChkInf(EVENTCHKINF_BEGAN_TWINROVA_BATTLE)) {
+                    Flags_SetEventChkInf(EVENTCHKINF_BEGAN_TWINROVA_BATTLE);
+                    Flags_SetEventChkInf(EVENTCHKINF_BEGAN_NABOORU_BATTLE);
+                    Flags_SetEventChkInf(EVENTCHKINF_NABOORU_ORDERED_TO_FIGHT_BY_TWINROVA);
+                }
+            }
+            break;
+        case SCENE_SHADOW_TEMPLE_BOSS:
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", 0)) {
+                if (!Flags_GetEventChkInf(EVENTCHKINF_BEGAN_BONGO_BONGO_BATTLE)) {
+                    Flags_SetEventChkInf(EVENTCHKINF_BEGAN_BONGO_BONGO_BATTLE);
+                }
+            }
+            break;
     }
 }
 

From 72581f74827ef5cc16dcde42f77671bcc372015b Mon Sep 17 00:00:00 2001
From: Garrett Cox <garrettjcox@gmail.com>
Date: Tue, 20 Feb 2024 21:04:16 -0600
Subject: [PATCH 080/230] Re-add some UI I accidentally removed

---
 soh/soh/SohMenuBar.cpp | 33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/soh/soh/SohMenuBar.cpp b/soh/soh/SohMenuBar.cpp
index 2ec571e26..15f67f763 100644
--- a/soh/soh/SohMenuBar.cpp
+++ b/soh/soh/SohMenuBar.cpp
@@ -643,8 +643,37 @@ void DrawEnhancementsMenu() {
                 UIWidgets::PaddedEnhancementSliderInt("Crawl speed %dx", "##CRAWLSPEED", "gCrawlSpeed", 1, 5, "", 1, true, false, true);
                 UIWidgets::PaddedEnhancementCheckbox("Faster Heavy Block Lift", "gFasterHeavyBlockLift", false, false);
                 UIWidgets::Tooltip("Speeds up lifting silver rocks and obelisks");
-                UIWidgets::PaddedEnhancementCheckbox("Link as default file name", "gLinkDefaultName", true, false);
-                UIWidgets::Tooltip("Allows you to have \"Link\" as a premade file name");
+                UIWidgets::PaddedEnhancementCheckbox("Skip Pickup Messages", "gFastDrops", true, false);
+                UIWidgets::Tooltip("Skip pickup messages for new consumable items and bottle swipes");
+                UIWidgets::PaddedEnhancementCheckbox("Fast Ocarina Playback", "gFastOcarinaPlayback", true, false);
+                UIWidgets::Tooltip("Skip the part where the Ocarina playback is called when you play a song");
+                bool forceSkipScarecrow = IS_RANDO && OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SKIP_SCARECROWS_SONG);
+                static const char* forceSkipScarecrowText = "This setting is forcefully enabled because a savefile\nwith \"Skip Scarecrow Song\" is loaded";
+                UIWidgets::PaddedEnhancementCheckbox("Skip Scarecrow Song", "gSkipScarecrow", true, false,
+                                                        forceSkipScarecrow, forceSkipScarecrowText, UIWidgets::CheckboxGraphics::Checkmark);
+                UIWidgets::Tooltip("Pierre appears when Ocarina is pulled out. Requires learning scarecrow song.");
+                UIWidgets::PaddedEnhancementCheckbox("Skip Magic Arrow Equip Animation", "gSkipArrowAnimation", true, false);
+                UIWidgets::PaddedEnhancementCheckbox("Skip save confirmation", "gSkipSaveConfirmation", true, false);
+                UIWidgets::Tooltip("Skip the \"Game saved.\" confirmation screen");
+                UIWidgets::PaddedEnhancementCheckbox("Faster Farore's Wind", "gFastFarores", true, false);
+                UIWidgets::Tooltip("Greatly decreases cast time of Farore's Wind magic spell.");
+                UIWidgets::PaddedEnhancementCheckbox("Skip water take breath animation", "gSkipSwimDeepEndAnim", true, false);
+                UIWidgets::Tooltip("Skips Link's taking breath animation after coming up from water. This setting does not interfere with getting items from underwater.");
+
+                ImGui::TableNextColumn();
+                UIWidgets::Spacer(0);
+                ImGui::Text("Changes:");
+                UIWidgets::PaddedSeparator();
+
+                UIWidgets::PaddedEnhancementSliderInt("Biggoron Forge Time: %d days", "##FORGETIME", "gForgeTime", 0, 3, "", 3, true, false, true);
+                UIWidgets::Tooltip("Allows you to change the number of days it takes for Biggoron to forge the Biggoron Sword");
+                UIWidgets::PaddedEnhancementCheckbox("Remember Save Location", "gRememberSaveLocation", false, false);
+                UIWidgets::Tooltip("When loading a save, places Link at the last entrance he went through.\n"
+                        "This doesn't work if the save was made in a grotto.");
+                UIWidgets::PaddedEnhancementCheckbox("No Forced Navi", "gNoForcedNavi", true, false);
+                UIWidgets::Tooltip("Prevent forced Navi conversations");
+                UIWidgets::PaddedEnhancementCheckbox("Navi Timer Resets", "gEnhancements.ResetNaviTimer", true, false);
+                UIWidgets::Tooltip("Resets the Navi timer on scene change. If you have already talked to her, she will try and talk to you again, instead of needing a save warp or death. ");
                 UIWidgets::PaddedEnhancementCheckbox("No Skulltula Freeze", "gSkulltulaFreeze", true, false);
                 UIWidgets::Tooltip("Stops the game from freezing the player when picking up Gold Skulltulas");
                 UIWidgets::PaddedEnhancementCheckbox("Nighttime GS Always Spawn", "gNightGSAlwaysSpawn", true, false);

From 37e89c0c7c9f8cf060ff2499ba5ec324aa73a2b2 Mon Sep 17 00:00:00 2001
From: Garrett Cox <garrettjcox@gmail.com>
Date: Tue, 20 Feb 2024 21:49:07 -0600
Subject: [PATCH 081/230] Migrate song of storms check

---
 .../Enhancements/randomizer/location_list.cpp |  2 +-
 .../Enhancements/timesaver_hook_handlers.cpp  | 41 +++++++++++++++++++
 soh/src/overlays/actors/ovl_En_Fu/z_en_fu.c   | 20 +--------
 soh/src/overlays/actors/ovl_En_Fu/z_en_fu.h   |  3 ++
 4 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/location_list.cpp b/soh/soh/Enhancements/randomizer/location_list.cpp
index 67b2b35ed..faebd65c9 100644
--- a/soh/soh/Enhancements/randomizer/location_list.cpp
+++ b/soh/soh/Enhancements/randomizer/location_list.cpp
@@ -1316,7 +1316,7 @@ void Rando::StaticData::InitLocationTable() { //
     locationTable[RC_SONG_FROM_SARIA] =                                             Location::Delayed(RC_SONG_FROM_SARIA,                                              RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_SACRED_FOREST_MEADOW,         ACTOR_ID_MAX,         SCENE_SACRED_FOREST_MEADOW,         0x00,                                              0x28, "Song from Saria",                             "Song from Saria",                                          RHT_SONG_FROM_SARIA,                                             RG_SARIAS_SONG,                       { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(0x57),                                                                                    SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
     locationTable[RC_SONG_FROM_ROYAL_FAMILYS_TOMB] =                                Location::Delayed(RC_SONG_FROM_ROYAL_FAMILYS_TOMB,                                 RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_GRAVEYARD,                    ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x29, "Song from Composers Grave",                   "Song from Composers Grave",                                RHT_SONG_FROM_ROYAL_FAMILYS_TOMB,                                RG_SUNS_SONG,                         { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(0x00),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
     locationTable[RC_SONG_FROM_OCARINA_OF_TIME] =                                   Location::Delayed(RC_SONG_FROM_OCARINA_OF_TIME,                                    RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_HYRULE_FIELD,                 ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x2A, "Song from Ocarina of Time",                   "Song from Ocarina of Time",                                RHT_SONG_FROM_OCARINA_OF_TIME,                                   RG_SONG_OF_TIME,                      { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(0xA9),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD,               true);
-    locationTable[RC_SONG_FROM_WINDMILL] =                                          Location::Delayed(RC_SONG_FROM_WINDMILL,                                           RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x2B, "Song from Windmill",                          "Song from Windmill",                                       RHT_SONG_FROM_WINDMILL,                                          RG_SONG_OF_STORMS,                    { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(0x5B),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
+    locationTable[RC_SONG_FROM_WINDMILL] =                                          Location::Delayed(RC_SONG_FROM_WINDMILL,                                           RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x2B, "Song from Windmill",                          "Song from Windmill",                                       RHT_SONG_FROM_WINDMILL,                                          RG_SONG_OF_STORMS,                    { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_LEARNED_SONG_OF_STORMS),                                                      SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
 
     //Beehives
     locationTable[RC_KF_STORMS_GROTTO_BEEHIVE_LEFT] =                                  Location::Base(RC_KF_STORMS_GROTTO_BEEHIVE_LEFT,                                RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_KOKIRI_FOREST,                ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x2C),                      0x00, "Storms Grotto Beehive Left",                  "KF Storms Grotto Beehive Left",                            RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                        { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_KF_STORMS_GROTTO_LEFT),                                                SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
diff --git a/soh/soh/Enhancements/timesaver_hook_handlers.cpp b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
index 1a349805f..58cdfb6fe 100644
--- a/soh/soh/Enhancements/timesaver_hook_handlers.cpp
+++ b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
@@ -18,6 +18,7 @@ extern "C" {
 #include "src/overlays/actors/ovl_En_Sa/z_en_sa.h"
 #include "src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.h"
 #include "src/overlays/actors/ovl_En_Tk/z_en_tk.h"
+#include "src/overlays/actors/ovl_En_Fu/z_en_fu.h"
 extern SaveContext gSaveContext;
 extern PlayState* gPlayState;
 }
@@ -51,6 +52,19 @@ void EnMa1_EndTeachSong(EnMa1* enMa1, PlayState* play) {
     }
 }
 
+void EnFu_EndTeachSong(EnFu* enFu, PlayState* play) {
+    if (Message_GetState(&gPlayState->msgCtx) == TEXT_STATE_CLOSING) {
+        func_80078884(NA_SE_SY_CORRECT_CHIME);
+        enFu->actionFunc = EnFu_WaitAdult;
+        enFu->actor.flags &= ~ACTOR_FLAG_WILL_TALK;
+
+        play->msgCtx.ocarinaMode = OCARINA_MODE_04;
+        Flags_SetEventChkInf(EVENTCHKINF_PLAYED_SONG_OF_STORMS_IN_WINDMILL);
+        Flags_SetEventChkInf(EVENTCHKINF_LEARNED_SONG_OF_STORMS);
+        return;
+    }
+}
+
 u16 EnZl4_GiveItemTextId(PlayState* play, Actor* actor) {
     return 0x207D;
 }
@@ -518,6 +532,8 @@ static uint32_t itemOcarinaUpdateHook = 0;
 static uint32_t itemOcarinaframesSinceSpawn = 0;
 static uint32_t enMa1UpdateHook = 0;
 static uint32_t enMa1KillHook = 0;
+static uint32_t enFuUpdateHook = 0;
+static uint32_t enFuKillHook = 0;
 void TimeSaverOnActorInitHandler(void* actorRef) {
     Actor* actor = static_cast<Actor*>(actorRef);
 
@@ -593,6 +609,28 @@ void TimeSaverOnActorInitHandler(void* actorRef) {
         });
     }
 
+    if (actor->id == ACTOR_EN_FU) {
+        enMa1UpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* innerActorRef) mutable {
+            Actor* innerActor = static_cast<Actor*>(innerActorRef);
+            if (innerActor->id == ACTOR_EN_FU && (CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", 0) || IS_RANDO)) {
+                EnFu* enFu = static_cast<EnFu*>(innerActorRef);
+                if (enFu->actionFunc == EnFu_TeachSong) {
+                    enFu->actionFunc = EnFu_EndTeachSong;
+                    GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(enFuUpdateHook);
+                    GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(enFuKillHook);
+                    enFuUpdateHook = 0;
+                    enFuKillHook = 0;
+                }
+            }
+        });
+        enMa1KillHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>([](int16_t sceneNum) mutable {
+            GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(enMa1UpdateHook);
+            GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(enMa1KillHook);
+            enMa1UpdateHook = 0;
+            enMa1KillHook = 0;
+        });
+    }
+
     if (actor->id == ACTOR_EN_ZL4 && CVarGetInteger("gTimeSavers.SkipCutscene.Story", 0)) {
         EnZl4* enZl4 = static_cast<EnZl4*>(actorRef);
         if (enZl4->actionFunc != EnZl4_Cutscene || enZl4->csState != 0) return;
@@ -740,6 +778,9 @@ void TimeSaverOnFlagSetHandler(int16_t flagType, int16_t flag) {
                 case EVENTCHKINF_LEARNED_SONG_OF_TIME:
                     vanillaQueuedItemEntry = Rando::StaticData::RetrieveItem(RG_SONG_OF_TIME).GetGIEntry_Copy();
                     break;
+                case EVENTCHKINF_LEARNED_SONG_OF_STORMS:
+                    vanillaQueuedItemEntry = Rando::StaticData::RetrieveItem(RG_SONG_OF_STORMS).GetGIEntry_Copy();
+                    break;
             }
             break;
         case FLAG_RANDOMIZER_INF:
diff --git a/soh/src/overlays/actors/ovl_En_Fu/z_en_fu.c b/soh/src/overlays/actors/ovl_En_Fu/z_en_fu.c
index 278fb18e2..ad1d6f12a 100644
--- a/soh/src/overlays/actors/ovl_En_Fu/z_en_fu.c
+++ b/soh/src/overlays/actors/ovl_En_Fu/z_en_fu.c
@@ -161,20 +161,12 @@ void GivePlayerRandoRewardSongOfStorms(EnFu* windmillGuy, PlayState* play, Rando
     }
 }
 
-void func_WaitForSongGive(EnFu* this, PlayState* play) {
-    GivePlayerRandoRewardSongOfStorms(this, play, RC_SONG_FROM_WINDMILL);
-}
-
 void func_80A1DB60(EnFu* this, PlayState* play) {
     if (play->csCtx.state == CS_STATE_IDLE) {
         this->actionFunc = EnFu_WaitAdult;
         Flags_SetEventChkInf(EVENTCHKINF_LEARNED_SONG_OF_STORMS);
         play->msgCtx.ocarinaMode = OCARINA_MODE_04;
     }
-
-    if (IS_RANDO) {
-        this->actionFunc = func_WaitForSongGive;
-    }
 }
 
 void func_80A1DBA0(EnFu* this, PlayState* play) {
@@ -186,10 +178,6 @@ void func_80A1DBA0(EnFu* this, PlayState* play) {
 void func_80A1DBD4(EnFu* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
 
-    if (IS_RANDO && (Message_GetState(&play->msgCtx) == TEXT_STATE_CLOSING)) {
-        play->msgCtx.ocarinaMode = OCARINA_MODE_03;
-    }
-
     if (play->msgCtx.ocarinaMode >= OCARINA_MODE_04) {
         this->actionFunc = EnFu_WaitAdult;
         play->msgCtx.ocarinaMode = OCARINA_MODE_04;
@@ -199,12 +187,6 @@ void func_80A1DBD4(EnFu* this, PlayState* play) {
         this->actionFunc = func_80A1DB60;
         this->actor.flags &= ~ACTOR_FLAG_WILL_TALK;
 
-        if (!IS_RANDO) {
-            play->csCtx.segment = SEGMENTED_TO_VIRTUAL(gSongOfStormsCs);
-            gSaveContext.cutsceneTrigger = 1;
-            Item_Give(play, ITEM_SONG_STORMS);
-        }
-
         play->msgCtx.ocarinaMode = OCARINA_MODE_00;
         Flags_SetEventChkInf(EVENTCHKINF_PLAYED_SONG_OF_STORMS_IN_WINDMILL);
     } else if (play->msgCtx.ocarinaMode == OCARINA_MODE_02) {
@@ -249,7 +231,7 @@ void EnFu_WaitAdult(EnFu* this, PlayState* play) {
     } else if (player->stateFlags2 & 0x1000000) {
         this->actor.textId = 0x5035;
         Message_StartTextbox(play, this->actor.textId, NULL);
-        this->actionFunc = IS_RANDO ? func_80A1DBD4 : EnFu_TeachSong;
+        this->actionFunc = EnFu_TeachSong;
         this->behaviorFlags |= FU_WAIT;
     } else if (Actor_ProcessTalkRequest(&this->actor, play)) {
         this->actionFunc = func_80A1DBA0;
diff --git a/soh/src/overlays/actors/ovl_En_Fu/z_en_fu.h b/soh/src/overlays/actors/ovl_En_Fu/z_en_fu.h
index 7fddd6543..fd371000d 100644
--- a/soh/src/overlays/actors/ovl_En_Fu/z_en_fu.h
+++ b/soh/src/overlays/actors/ovl_En_Fu/z_en_fu.h
@@ -41,4 +41,7 @@ typedef struct EnFu {
     /* 0x02AC */ EnFuActionFunc actionFunc;
 } EnFu; // size = 0x02B0
 
+void EnFu_TeachSong(EnFu* enFu, PlayState* play);
+void EnFu_WaitAdult(EnFu* enFu, PlayState* play);
+
 #endif

From 7bebe7a5738f355278b8e0d512958678aeeae442 Mon Sep 17 00:00:00 2001
From: Garrett Cox <garrettjcox@gmail.com>
Date: Wed, 21 Feb 2024 14:01:49 -0600
Subject: [PATCH 082/230] Migrate okarina_tag changes

---
 .../game-interactor/GameInteractor.h          | 13 +++
 .../Enhancements/randomizer/hook_handlers.cpp | 10 +++
 .../Enhancements/randomizer/location_list.cpp |  2 +-
 .../Enhancements/timesaver_hook_handlers.cpp  | 81 +++++++++++++++++--
 .../z_bg_spot02_objects.c                     | 26 +-----
 .../z_bg_spot02_objects.h                     |  3 +
 .../ovl_En_Okarina_Tag/z_en_okarina_tag.c     | 48 +++--------
 7 files changed, 117 insertions(+), 66 deletions(-)

diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h
index f27342c3e..940e49cae 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h
@@ -206,6 +206,9 @@ typedef enum {
     // Opt: *EnSyatekiMan
     // Vanilla condition: (this->getItemId == GI_QUIVER_40) || (this->getItemId == GI_QUIVER_50)
     GI_VB_BE_ELIGIBLE_FOR_ADULT_SHOOTING_GAME_REWARD,
+    // Opt: *EnOkarinaTag
+    // Vanilla condition: !Flags_GetEventChkInf(EVENTCHKINF_OPENED_THE_DOOR_OF_TIME)
+    GI_VB_BE_ELIGIBLE_TO_OPEN_DOT,
 
     /*** Play Cutscenes ***/
 
@@ -235,6 +238,16 @@ typedef enum {
     GI_VB_PLAY_BOLERO_OF_FIRE_CS,
     GI_VB_PLAY_SERENADE_OF_WATER_CS,
     GI_VB_PLAY_EYEDROPS_CS,
+    // Opt: *EnOkarinaTag
+    GI_VB_PLAY_DRAIN_WELL_CS,
+    // Opt: *EnOkarinaTag
+    // Vanilla condition: !CHECK_QUEST_ITEM(QUEST_SONG_SUN)
+    GI_VB_PLAY_SUNS_SONG_CS,
+    // Opt: *EnOkarinaTag
+    GI_VB_PLAY_ROYAL_FAMILY_TOMB_CS,
+    GI_VB_PLAY_ROYAL_FAMILY_TOMB_EXPLODE,
+    // Opt: *EnOkarinaTag
+    GI_VB_PLAY_DOOR_OF_TIME_CS,
 
     /*** Give Items ***/
 
diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index 511c0d7e6..c55331edf 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -796,6 +796,16 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             }
             break;
         }
+        case GI_VB_BE_ELIGIBLE_TO_OPEN_DOT: {
+            bool eligible = RAND_GET_OPTION(RSK_DOOR_OF_TIME) != RO_DOOROFTIME_CLOSED || (
+                INV_CONTENT(ITEM_OCARINA_FAIRY) == ITEM_OCARINA_TIME &&
+                CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD) &&
+                CHECK_QUEST_ITEM(QUEST_GORON_RUBY) &&
+                CHECK_QUEST_ITEM(QUEST_ZORA_SAPPHIRE)
+            );
+            *should = eligible;
+            break;
+        }
         case GI_VB_TRADE_CLAIM_CHECK:
         case GI_VB_TRADE_TIMER_ODD_MUSHROOM:
         case GI_VB_TRADE_TIMER_EYEDROPS:
diff --git a/soh/soh/Enhancements/randomizer/location_list.cpp b/soh/soh/Enhancements/randomizer/location_list.cpp
index faebd65c9..8deeab8c8 100644
--- a/soh/soh/Enhancements/randomizer/location_list.cpp
+++ b/soh/soh/Enhancements/randomizer/location_list.cpp
@@ -1314,7 +1314,7 @@ void Rando::StaticData::InitLocationTable() { //
     locationTable[RC_SONG_FROM_IMPA] =                                              Location::Delayed(RC_SONG_FROM_IMPA,                                               RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_HYRULE_CASTLE,                ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x26, "Song from Impa",                              "Song from Impa",                                           RHT_SONG_FROM_IMPA,                                              RG_ZELDAS_LULLABY,                    { Category::cSong, Category::cSongDungeonReward },      SpoilerCollectionCheck::EventChkInf(0x59),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
     locationTable[RC_SONG_FROM_MALON] =                                             Location::Delayed(RC_SONG_FROM_MALON,                                              RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_LON_LON_RANCH,                ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x27, "Song from Malon",                             "Song from Malon",                                          RHT_SONG_FROM_MALON,                                             RG_EPONAS_SONG,                       { Category::cSong },                                    SpoilerCollectionCheck::RandomizerInf(RAND_INF_LEARNED_EPONA_SONG),                                                           SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH,              true);
     locationTable[RC_SONG_FROM_SARIA] =                                             Location::Delayed(RC_SONG_FROM_SARIA,                                              RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_SACRED_FOREST_MEADOW,         ACTOR_ID_MAX,         SCENE_SACRED_FOREST_MEADOW,         0x00,                                              0x28, "Song from Saria",                             "Song from Saria",                                          RHT_SONG_FROM_SARIA,                                             RG_SARIAS_SONG,                       { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(0x57),                                                                                    SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
-    locationTable[RC_SONG_FROM_ROYAL_FAMILYS_TOMB] =                                Location::Delayed(RC_SONG_FROM_ROYAL_FAMILYS_TOMB,                                 RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_GRAVEYARD,                    ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x29, "Song from Composers Grave",                   "Song from Composers Grave",                                RHT_SONG_FROM_ROYAL_FAMILYS_TOMB,                                RG_SUNS_SONG,                         { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(0x00),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
+    locationTable[RC_SONG_FROM_ROYAL_FAMILYS_TOMB] =                                Location::Delayed(RC_SONG_FROM_ROYAL_FAMILYS_TOMB,                                 RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_GRAVEYARD,                    ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x29, "Song from Composers Grave",                   "Song from Composers Grave",                                RHT_SONG_FROM_ROYAL_FAMILYS_TOMB,                                RG_SUNS_SONG,                         { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_LEARNED_SUNS_SONG),                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
     locationTable[RC_SONG_FROM_OCARINA_OF_TIME] =                                   Location::Delayed(RC_SONG_FROM_OCARINA_OF_TIME,                                    RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_HYRULE_FIELD,                 ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x2A, "Song from Ocarina of Time",                   "Song from Ocarina of Time",                                RHT_SONG_FROM_OCARINA_OF_TIME,                                   RG_SONG_OF_TIME,                      { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(0xA9),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD,               true);
     locationTable[RC_SONG_FROM_WINDMILL] =                                          Location::Delayed(RC_SONG_FROM_WINDMILL,                                           RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x2B, "Song from Windmill",                          "Song from Windmill",                                       RHT_SONG_FROM_WINDMILL,                                          RG_SONG_OF_STORMS,                    { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_LEARNED_SONG_OF_STORMS),                                                      SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
 
diff --git a/soh/soh/Enhancements/timesaver_hook_handlers.cpp b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
index 58cdfb6fe..44102f944 100644
--- a/soh/soh/Enhancements/timesaver_hook_handlers.cpp
+++ b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
@@ -19,6 +19,7 @@ extern "C" {
 #include "src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.h"
 #include "src/overlays/actors/ovl_En_Tk/z_en_tk.h"
 #include "src/overlays/actors/ovl_En_Fu/z_en_fu.h"
+#include "src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.h"
 extern SaveContext gSaveContext;
 extern PlayState* gPlayState;
 }
@@ -471,6 +472,44 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             }
             break;
         }
+        case GI_VB_PLAY_DRAIN_WELL_CS: {
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.Story", 0)) {
+                *should = false;
+                Flags_SetSwitch(gPlayState, 0x2);
+                Flags_SetEventChkInf(EVENTCHKINF_PLAYED_SONG_OF_STORMS_IN_WINDMILL);
+                Flags_SetEventChkInf(EVENTCHKINF_DRAINED_WELL_IN_KAKARIKO);
+            }
+            break;
+        }
+        case GI_VB_PLAY_SUNS_SONG_CS:
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", 0) || IS_RANDO) {
+                *should = false;
+                Flags_SetEventChkInf(EVENTCHKINF_LEARNED_SUNS_SONG);
+                // SoH [Randomizer] TODO: Increment time X amount (find out X)
+                // When time is 0, it's changed to 0x46A7
+                // When it's 0x8000, it's changed to 0xC090
+            }
+            break;
+        case GI_VB_PLAY_ROYAL_FAMILY_TOMB_CS: {
+            if (CVarGetInteger("gTimeSavers.SkipMiscInteractions", 0)) {
+                *should = false;
+            }
+            break;
+        }
+        case GI_VB_PLAY_ROYAL_FAMILY_TOMB_EXPLODE: {
+            if (CVarGetInteger("gTimeSavers.SkipMiscInteractions", 0)) {
+                *should = Flags_GetEventChkInf(EVENTCHKINF_DESTROYED_ROYAL_FAMILY_TOMB);
+            }
+            break;
+        }
+        case GI_VB_PLAY_DOOR_OF_TIME_CS: {
+            if (CVarGetInteger("gTimeSavers.SkipMiscInteractions", 0)) {
+                *should = false;
+                Flags_SetEnv(gPlayState, 2);
+                func_80078884(NA_SE_SY_CORRECT_CHIME);
+            }
+            break;
+        }
         case GI_VB_GIVE_ITEM_MINUET_OF_FOREST:
         case GI_VB_GIVE_ITEM_BOLERO_OF_FIRE:
         case GI_VB_GIVE_ITEM_SERENADE_OF_WATER:
@@ -534,6 +573,8 @@ static uint32_t enMa1UpdateHook = 0;
 static uint32_t enMa1KillHook = 0;
 static uint32_t enFuUpdateHook = 0;
 static uint32_t enFuKillHook = 0;
+static uint32_t bgSpot02UpdateHook = 0;
+static uint32_t bgSpot02KillHook = 0;
 void TimeSaverOnActorInitHandler(void* actorRef) {
     Actor* actor = static_cast<Actor*>(actorRef);
 
@@ -610,7 +651,7 @@ void TimeSaverOnActorInitHandler(void* actorRef) {
     }
 
     if (actor->id == ACTOR_EN_FU) {
-        enMa1UpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* innerActorRef) mutable {
+        enFuUpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* innerActorRef) mutable {
             Actor* innerActor = static_cast<Actor*>(innerActorRef);
             if (innerActor->id == ACTOR_EN_FU && (CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", 0) || IS_RANDO)) {
                 EnFu* enFu = static_cast<EnFu*>(innerActorRef);
@@ -623,11 +664,36 @@ void TimeSaverOnActorInitHandler(void* actorRef) {
                 }
             }
         });
-        enMa1KillHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>([](int16_t sceneNum) mutable {
-            GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(enMa1UpdateHook);
-            GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(enMa1KillHook);
-            enMa1UpdateHook = 0;
-            enMa1KillHook = 0;
+        enFuKillHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>([](int16_t sceneNum) mutable {
+            GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(enFuUpdateHook);
+            GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(enFuKillHook);
+            enFuUpdateHook = 0;
+            enFuKillHook = 0;
+        });
+    }
+
+    if (actor->id == ACTOR_BG_SPOT02_OBJECTS && actor->params == 2) {
+        SPDLOG_INFO("Registering BG_SPOT02 hook");
+        bgSpot02UpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* innerActorRef) mutable {
+            Actor* innerActor = static_cast<Actor*>(innerActorRef);
+            if (innerActor->id == ACTOR_BG_SPOT02_OBJECTS && innerActor->params == 2 && (CVarGetInteger("gTimeSavers.SkipMiscInteractions", 0))) {
+                SPDLOG_INFO("on update BG_SPOT02 hook");
+                BgSpot02Objects* bgSpot02 = static_cast<BgSpot02Objects*>(innerActorRef);
+                if (bgSpot02->actionFunc == func_808ACC34) {
+                    SPDLOG_INFO("BGspot02 OVERRIDDEN");
+                    bgSpot02->actionFunc = func_808AC908;
+                    GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(bgSpot02UpdateHook);
+                    GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(bgSpot02KillHook);
+                    bgSpot02UpdateHook = 0;
+                    bgSpot02KillHook = 0;
+                }
+            }
+        });
+        bgSpot02KillHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>([](int16_t sceneNum) mutable {
+            GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(bgSpot02UpdateHook);
+            GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(bgSpot02KillHook);
+            bgSpot02UpdateHook = 0;
+            bgSpot02KillHook = 0;
         });
     }
 
@@ -781,6 +847,9 @@ void TimeSaverOnFlagSetHandler(int16_t flagType, int16_t flag) {
                 case EVENTCHKINF_LEARNED_SONG_OF_STORMS:
                     vanillaQueuedItemEntry = Rando::StaticData::RetrieveItem(RG_SONG_OF_STORMS).GetGIEntry_Copy();
                     break;
+                case EVENTCHKINF_LEARNED_SUNS_SONG:
+                    vanillaQueuedItemEntry = Rando::StaticData::RetrieveItem(RG_SUNS_SONG).GetGIEntry_Copy();
+                    break;
             }
             break;
         case FLAG_RANDOMIZER_INF:
diff --git a/soh/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c b/soh/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c
index 2eb3faeda..cc7d4c854 100644
--- a/soh/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c
+++ b/soh/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c
@@ -6,6 +6,7 @@
 
 #include "z_bg_spot02_objects.h"
 #include "objects/object_spot02_objects/object_spot02_objects.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_WHILE_CULLED | ACTOR_FLAG_DRAW_WHILE_CULLED)
 
@@ -129,20 +130,7 @@ void func_808AC908(BgSpot02Objects* this, PlayState* play) {
     static Vec3f zeroVec = { 0.0f, 0.0f, 0.0f };
     Vec3f pos;
 
-    // We want to do most of the same things in rando, but we're not in a cutscene and the flag for
-    // destroying the royal tombstone is already set.
-    if (IS_RANDO && Flags_GetEventChkInf(EVENTCHKINF_DESTROYED_ROYAL_FAMILY_TOMB)) {
-        Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_GRAVE_EXPLOSION);
-        this->timer = 25;
-        pos.x = (Math_SinS(this->dyna.actor.shape.rot.y) * 50.0f) + this->dyna.actor.world.pos.x;
-        pos.y = this->dyna.actor.world.pos.y + 30.0f;
-        pos.z = (Math_CosS(this->dyna.actor.shape.rot.y) * 50.0f) + this->dyna.actor.world.pos.z;
-        EffectSsBomb2_SpawnLayered(play, &pos, &zeroVec, &zeroVec, 70, 30);
-        this->actionFunc = func_808ACA08;
-    }
-
-    if (play->csCtx.state != 0) {
-        if (play->csCtx.npcActions[3] != NULL && play->csCtx.npcActions[3]->action == 2) {
+    if (GameInteractor_Should(GI_VB_PLAY_ROYAL_FAMILY_TOMB_EXPLODE, play->csCtx.state != 0 && play->csCtx.npcActions[3] != NULL && play->csCtx.npcActions[3]->action == 2, this)) {
             Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_GRAVE_EXPLOSION);
             Flags_SetEventChkInf(EVENTCHKINF_DESTROYED_ROYAL_FAMILY_TOMB);
             this->timer = 25;
@@ -151,7 +139,6 @@ void func_808AC908(BgSpot02Objects* this, PlayState* play) {
             pos.z = (Math_CosS(this->dyna.actor.shape.rot.y) * 50.0f) + this->dyna.actor.world.pos.z;
             EffectSsBomb2_SpawnLayered(play, &pos, &zeroVec, &zeroVec, 70, 30);
             this->actionFunc = func_808ACA08;
-        }
     }
 }
 
@@ -174,7 +161,7 @@ void func_808ACA08(BgSpot02Objects* this, PlayState* play) {
 
     // This shouldn't execute in rando even without the check since we never
     // enter the cutscene context.
-    if (play->csCtx.frames == 402 && !(IS_RANDO)) {
+    if (play->csCtx.frames == 402) {
         if (!LINK_IS_ADULT) {
             Player_PlaySfx(&player->actor, NA_SE_VO_LI_DEMO_DAMAGE_KID);
         } else {
@@ -217,13 +204,6 @@ void BgSpot02Objects_Draw(Actor* thisx, PlayState* play) {
 }
 
 void func_808ACC34(BgSpot02Objects* this, PlayState* play) {
-    // This is the actionFunc that the game settles on when you load the Graveyard
-    // When we're in rando and the flag for the gravestone being destroyed gets set,
-    // set the actionFunc to the function where the gravestone explodes.
-    if (IS_RANDO && Flags_GetEventChkInf(EVENTCHKINF_DESTROYED_ROYAL_FAMILY_TOMB)) {
-        this->actionFunc = func_808AC908;
-    }
-
     if (play->csCtx.state != 0 && play->csCtx.npcActions[0] != NULL &&
         play->csCtx.npcActions[0]->action == 2) {
         this->unk_16A++;
diff --git a/soh/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.h b/soh/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.h
index 0b54fa617..cf5152a7e 100644
--- a/soh/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.h
+++ b/soh/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.h
@@ -19,4 +19,7 @@ typedef struct BgSpot02Objects {
     /* 0x0172 */ u16 unk_172;
 } BgSpot02Objects; // size = 0x0174
 
+void func_808ACC34(BgSpot02Objects* bgSpot02Objects, PlayState* play);
+void func_808AC908(BgSpot02Objects* bgSpot02Objects, PlayState* play);
+
 #endif
diff --git a/soh/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c b/soh/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c
index 74afaacff..34c094320 100644
--- a/soh/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c
+++ b/soh/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c
@@ -8,6 +8,7 @@
 #include "scenes/misc/hakaana_ouke/hakaana_ouke_scene.h"
 #include "scenes/overworld/spot02/spot02_scene.h"
 #include "vt.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_WHILE_CULLED | ACTOR_FLAG_NO_FREEZE_OCARINA)
 
@@ -192,7 +193,7 @@ void func_80ABF28C(EnOkarinaTag* this, PlayState* play) {
     if ((this->ocarinaSong != 6) || (gSaveContext.scarecrowSpawnSongSet)) {
         if ((this->switchFlag >= 0) && Flags_GetSwitch(play, this->switchFlag)) {
             this->actor.flags &= ~ACTOR_FLAG_TARGETABLE;
-        } else if (((this->type != 4) || !Flags_GetEventChkInf(EVENTCHKINF_OPENED_THE_DOOR_OF_TIME)) &&
+        } else if (((this->type != 4) || GameInteractor_Should(GI_VB_BE_ELIGIBLE_TO_OPEN_DOT, !Flags_GetEventChkInf(EVENTCHKINF_OPENED_THE_DOOR_OF_TIME), this)) &&
                    ((this->type != 6) || !Flags_GetEventChkInf(EVENTCHKINF_DESTROYED_ROYAL_FAMILY_TOMB)) &&
                    (this->actor.xzDistToPlayer < (90.0f + this->interactRange)) &&
                    (fabsf(player->actor.world.pos.y - this->actor.world.pos.y) < 80.0f)) {
@@ -234,47 +235,30 @@ void func_80ABF4C8(EnOkarinaTag* this, PlayState* play) {
     if (play->msgCtx.ocarinaMode == OCARINA_MODE_04) {
         this->actionFunc = func_80ABF28C;
     } else if (play->msgCtx.ocarinaMode == OCARINA_MODE_03) {
-        if (!IS_RANDO || (IS_RANDO && Randomizer_GetSettingValue(RSK_DOOR_OF_TIME) != RO_DOOROFTIME_CLOSED)) {
-            func_80078884(NA_SE_SY_CORRECT_CHIME);
-        }
+        func_80078884(NA_SE_SY_CORRECT_CHIME);
         if (this->switchFlag >= 0) {
             Flags_SetSwitch(play, this->switchFlag);
         }
         switch (this->type) {
-            case 1:
+            case 1: // Zora's River Waterfall
                 Flags_SetSwitch(play, this->switchFlag);
                 Flags_SetEventChkInf(EVENTCHKINF_OPENED_ZORAS_DOMAIN);
                 break;
-            case 2:
-                if (!IS_RANDO) {
+            case 2: // Kakariko Windmill
+                if (GameInteractor_Should(GI_VB_PLAY_DRAIN_WELL_CS, true, this)) {
                     play->csCtx.segment = D_80ABF9D0;
                     gSaveContext.cutsceneTrigger = 1;
-                } else {
-                    Flags_SetEventChkInf(EVENTCHKINF_DRAINED_WELL_IN_KAKARIKO);
-                    Flags_SetEventChkInf(EVENTCHKINF_PLAYED_SONG_OF_STORMS_IN_WINDMILL);
                 }
                 func_800F574C(1.18921f, 0x5A);
                 break;
-            case 4:
-                if (IS_RANDO) {
-                    if (Randomizer_GetSettingValue(RSK_DOOR_OF_TIME) == RO_DOOROFTIME_CLOSED &&
-                        (INV_CONTENT(ITEM_OCARINA_FAIRY) != ITEM_OCARINA_TIME ||
-                         !CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD) || !CHECK_QUEST_ITEM(QUEST_GORON_RUBY) ||
-                         !CHECK_QUEST_ITEM(QUEST_ZORA_SAPPHIRE))) {
-                        func_80078884(NA_SE_SY_OCARINA_ERROR);
-                        break;
-                    } else {
-                        Flags_SetEnv(play, 2);
-                        func_80078884(NA_SE_SY_CORRECT_CHIME);
-                    }
-                } else {
+            case 4: // Door of Time
+                if (GameInteractor_Should(GI_VB_PLAY_DOOR_OF_TIME_CS, true, this)) {
                     play->csCtx.segment = D_80ABFB40;
                     gSaveContext.cutsceneTrigger = 1;
                 }
                 break;
-            case 6:
-                // Don't start the cutscene in a rando save.
-                if (!(IS_RANDO)) {
+            case 6: // Royal Family Tomb
+                if (GameInteractor_Should(GI_VB_PLAY_ROYAL_FAMILY_TOMB_CS, true, this)) {
                     play->csCtx.segment = LINK_IS_ADULT ? SEGMENTED_TO_VIRTUAL(&spot02_scene_Cs_003C80)
                                                              : SEGMENTED_TO_VIRTUAL(&spot02_scene_Cs_005020);
                     gSaveContext.cutsceneTrigger = 1;
@@ -311,7 +295,7 @@ void func_80ABF708(EnOkarinaTag* this, PlayState* play) {
         yawDiff = this->actor.yawTowardsPlayer - this->actor.world.rot.y;
         this->unk_15A++;
         if (!(this->actor.xzDistToPlayer > 120.0f)) {
-            if (CHECK_QUEST_ITEM(QUEST_SONG_SUN) || IS_RANDO) {
+            if (CHECK_QUEST_ITEM(QUEST_SONG_SUN)) {
                 this->actor.textId = 0x5021;
             }
             yawDiffNew = ABS(yawDiff);
@@ -323,23 +307,15 @@ void func_80ABF708(EnOkarinaTag* this, PlayState* play) {
     }
 }
 
-void GivePlayerRandoRewardSunSong(EnOkarinaTag* song, PlayState* play, RandomizerCheck check) {
-    Flags_SetTreasure(play, 0x1F);
-    GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(check, GI_LETTER_ZELDA);
-    GiveItemEntryFromActor(&song->actor, play, getItemEntry, 10000.0f, 100.0f);
-}
-
 void func_80ABF7CC(EnOkarinaTag* this, PlayState* play) {
     // "Open sesame sesame!"
     osSyncPrintf(VT_FGCOL(PURPLE) "☆☆☆☆☆ 開けゴマゴマゴマ！ ☆☆☆☆☆ %d\n" VT_RST, Message_GetState(&play->msgCtx));
 
     if ((Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(play)) {
         Message_CloseTextbox(play);
-        if (!IS_RANDO && !CHECK_QUEST_ITEM(QUEST_SONG_SUN)) {
+        if (GameInteractor_Should(GI_VB_PLAY_SUNS_SONG_CS, !CHECK_QUEST_ITEM(QUEST_SONG_SUN), this)) {
             play->csCtx.segment = SEGMENTED_TO_VIRTUAL(&gSunSongGraveSunSongTeachCs);
             gSaveContext.cutsceneTrigger = 1;
-        } else if (IS_RANDO && !Flags_GetTreasure(play, 0x1F)) {
-            GivePlayerRandoRewardSunSong(this, play, RC_SONG_FROM_ROYAL_FAMILYS_TOMB);
         }
         this->actionFunc = func_80ABF708;
     }

From b293cac51c756c0718c14b2869359a17049c5441 Mon Sep 17 00:00:00 2001
From: Garrett Cox <garrettjcox@gmail.com>
Date: Wed, 21 Feb 2024 15:26:11 -0600
Subject: [PATCH 083/230] Enable timesaver enhancements by default on rando

---
 soh/soh/Enhancements/presets.h                | 12 +++
 .../Enhancements/randomizer/hook_handlers.cpp |  2 +-
 .../Enhancements/timesaver_hook_handlers.cpp  | 86 +++++++++----------
 soh/soh/SohMenuBar.cpp                        | 66 +++++++-------
 4 files changed, 89 insertions(+), 77 deletions(-)

diff --git a/soh/soh/Enhancements/presets.h b/soh/soh/Enhancements/presets.h
index 822b61c75..3cce3dd74 100644
--- a/soh/soh/Enhancements/presets.h
+++ b/soh/soh/Enhancements/presets.h
@@ -280,6 +280,18 @@ const std::vector<const char*> enhancementsCvars = {
     "gPermanentHeartLoss",
     "gRemoveExplosiveLimit",
     "gToggleStrength",
+    "gTimeSavers.SkipCutscene.Intro",
+    "gTimeSavers.SkipCutscene.Entrances",
+    "gTimeSavers.SkipCutscene.Story",
+    "gTimeSavers.SkipCutscene.LearnSong",
+    "gTimeSavers.SkipCutscene.BossIntro",
+    "gTimeSavers.SkipCutscene.GlitchAiding",
+    "gTimeSavers.SkipCutscene.OnePoint",
+    "gTimeSavers.NoForcedDialog",
+    "gTimeSavers.SkipOwlInteractions",
+    "gTimeSavers.SkipMiscInteractions",
+    "gTimeSavers.DisableTitleCard",
+    "gTimeSavers.SkipGetItemAnimation",
 };
 
 const std::vector<const char*> cheatCvars = {
diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index c77e537f3..9f2e2633a 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -218,7 +218,7 @@ void RandomizerOnItemReceiveHandler(GetItemEntry receivedItemEntry) {
         }
     }
 
-    if (loc->GetRandomizerCheck() == RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST && !CVarGetInteger("gTimeSavers.SkipCutscene.Story", 0)) {
+    if (loc->GetRandomizerCheck() == RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST && !CVarGetInteger("gTimeSavers.SkipCutscene.Story", IS_RANDO)) {
         static uint32_t updateHook;
         updateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnPlayerUpdate>([]() {
             Player* player = GET_PLAYER(gPlayState);
diff --git a/soh/soh/Enhancements/timesaver_hook_handlers.cpp b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
index 08608b8ed..27d10c00e 100644
--- a/soh/soh/Enhancements/timesaver_hook_handlers.cpp
+++ b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
@@ -102,12 +102,12 @@ void TimeSaverOnGameFrameUpdateHandler() {
 void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void* opt) {
     switch (id) {
         case GI_VB_PLAY_TRANSITION_CS:
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.Intro", 0) && gSaveContext.entranceIndex == ENTR_LINKS_HOUSE_0 && gSaveContext.cutsceneIndex == 0xFFF1) {
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.Intro", IS_RANDO) && gSaveContext.entranceIndex == ENTR_LINKS_HOUSE_0 && gSaveContext.cutsceneIndex == 0xFFF1) {
                 gSaveContext.cutsceneIndex = 0;
                 *should = false;
             }
 
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", 0) || IS_RANDO) {
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", IS_RANDO) || IS_RANDO) {
                 // Song of Time
                 if (gSaveContext.entranceIndex == ENTR_TEMPLE_OF_TIME_0 && gSaveContext.cutsceneIndex == 0xFFF7) {
                     gSaveContext.entranceIndex = ENTR_HYRULE_FIELD_16;
@@ -144,7 +144,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
                 }
             }
 
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.Story", 0)) {
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.Story", IS_RANDO)) {
                 uint8_t isBlueWarp = 0;
                 // Deku Tree Blue warp
                 if (gSaveContext.entranceIndex == ENTR_KOKIRI_FOREST_0 && gSaveContext.cutsceneIndex == 0xFFF1) {
@@ -228,13 +228,13 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             break;
         case GI_VB_PLAY_ENTRANCE_CS: {
             s32* entranceFlag = static_cast<s32*>(opt);
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.Entrances", 0) && (*entranceFlag != EVENTCHKINF_EPONA_OBTAINED)) {
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.Entrances", IS_RANDO) && (*entranceFlag != EVENTCHKINF_EPONA_OBTAINED)) {
                 *should = false;
             }
             break;
         }
         case GI_VB_PLAY_ONEPOINT_CS: {
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.OnePoint", 0)) {
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.OnePoint", IS_RANDO)) {
                 s16* csId = static_cast<s16*>(opt);
                 switch (*csId) {
                     case 4180:
@@ -250,7 +250,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             break;
         }
         case GI_VB_PLAY_ONEPOINT_ACTOR_CS: {
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.OnePoint", 0)) {
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.OnePoint", IS_RANDO)) {
                 Actor* actor = static_cast<Actor*>(opt);
                 switch (actor->category) {
                     case ACTORCAT_BG:
@@ -312,18 +312,18 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             break;
         }
         case GI_VB_SHOW_TITLE_CARD:
-            if (CVarGetInteger("gTimeSavers.DisableTitleCard", 0)) {
+            if (CVarGetInteger("gTimeSavers.DisableTitleCard", IS_RANDO)) {
                 *should = false;
             }
             break;
         case GI_VB_WONDER_TALK: {
-            if (CVarGetInteger("gTimeSavers.NoForcedDialog", 0)) {
+            if (CVarGetInteger("gTimeSavers.NoForcedDialog", IS_RANDO)) {
                 *should = false;
             }
             break;
         }
         case GI_VB_NAVI_TALK: {
-            if (CVarGetInteger("gTimeSavers.NoForcedDialog", 0)) {
+            if (CVarGetInteger("gTimeSavers.NoForcedDialog", IS_RANDO)) {
                 ElfMsg* naviTalk = static_cast<ElfMsg*>(opt);
                 Flags_SetSwitch(gPlayState, (naviTalk->actor.params >> 8) & 0x3F);
                 Actor_Kill(&naviTalk->actor);
@@ -332,14 +332,14 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             break;
         }
         case GI_VB_NOT_BE_GREETED_BY_SARIA:
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.Entrances", 0) && !Flags_GetInfTable(INFTABLE_GREETED_BY_SARIA)) {
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.Entrances", IS_RANDO) && !Flags_GetInfTable(INFTABLE_GREETED_BY_SARIA)) {
                 Flags_SetInfTable(INFTABLE_GREETED_BY_SARIA);
                 *should = true;
             }
             break;
         case GI_VB_MOVE_MIDO_IN_KOKIRI_FOREST:
             if (
-                CVarGetInteger("gTimeSavers.SkipMiscInteractions", 0) &&
+                CVarGetInteger("gTimeSavers.SkipMiscInteractions", IS_RANDO) &&
                 !Flags_GetEventChkInf(EVENTCHKINF_SHOWED_MIDO_SWORD_SHIELD) &&
                 (CUR_EQUIP_VALUE(EQUIP_TYPE_SHIELD) == EQUIP_VALUE_SHIELD_DEKU) && 
                 (CUR_EQUIP_VALUE(EQUIP_TYPE_SWORD) == EQUIP_VALUE_SWORD_KOKIRI)
@@ -349,7 +349,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             }
             break;
         case GI_VB_PLAY_DEKU_TREE_INTRO_CS: {
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.Story", 0)) {
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.Story", IS_RANDO)) {
                 BgTreemouth* treeMouth = static_cast<BgTreemouth*>(opt);
                 Flags_SetEventChkInf(EVENTCHKINF_DEKU_TREE_OPENED_MOUTH);
                 Audio_PlaySoundGeneral(NA_SE_EV_WOODDOOR_OPEN, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
@@ -362,18 +362,18 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
         case GI_VB_PLAY_SHIEK_BLOCK_MASTER_SWORD_CS:
         case GI_VB_GIVE_ITEM_FAIRY_OCARINA:
         case GI_VB_GIVE_ITEM_LIGHT_ARROW:
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.Story", 0)) {
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.Story", IS_RANDO)) {
                 *should = false;
             }
             break;
         case GI_VB_PLAY_NABOORU_CAPTURED_CS:
-            if (*should == true && CVarGetInteger("gTimeSavers.SkipCutscene.Story", 0)) {
+            if (*should == true && CVarGetInteger("gTimeSavers.SkipCutscene.Story", IS_RANDO)) {
                 Flags_SetEventChkInf(EVENTCHKINF_NABOORU_CAPTURED_BY_TWINROVA);
                 *should = false;
             }
             break;
         case GI_VB_PLAY_PULL_MASTER_SWORD_CS:
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.Story", 0)) {
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.Story", IS_RANDO)) {
                 if (!Flags_GetEventChkInf(EVENTCHKINF_PULLED_MASTER_SWORD_FROM_PEDESTAL)) {
                     // Normally, these would be done in the cutscene, but we're skipping it
                     Flags_SetEventChkInf(EVENTCHKINF_PULLED_MASTER_SWORD_FROM_PEDESTAL);
@@ -388,7 +388,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             }
             break;
         case GI_VB_OWL_INTERACTION: {
-            if (CVarGetInteger("gTimeSavers.SkipOwlInteractions", 0) && *should) {
+            if (CVarGetInteger("gTimeSavers.SkipOwlInteractions", IS_RANDO) && *should) {
                 EnOwl* enOwl = static_cast<EnOwl*>(opt);
                 s32 owlType = (enOwl->actor.params & 0xFC0) >> 6;
 
@@ -405,12 +405,12 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
         case GI_VB_PLAY_EYEDROPS_CS:
         case GI_VB_PLAY_DROP_FISH_FOR_JABU_CS:
         case GI_VB_PLAY_DARUNIAS_JOY_CS:
-            if (CVarGetInteger("gTimeSavers.SkipMiscInteractions", 0)) {
+            if (CVarGetInteger("gTimeSavers.SkipMiscInteractions", IS_RANDO)) {
                 *should = false;
             }
             break;
         case GI_VB_PLAY_ZELDAS_LULLABY_CS: {
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", 0) || IS_RANDO) {
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", IS_RANDO) || IS_RANDO) {
                 DemoIm* demoIm = static_cast<DemoIm*>(opt);
                 Player* player = GET_PLAYER(gPlayState);
                 player->stateFlags1 |= PLAYER_STATE1_IN_CUTSCENE;
@@ -421,7 +421,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
                 static uint32_t demoImKillHook = 0;
                 demoImUpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* actorRef) mutable {
                     Actor* actor = static_cast<Actor*>(actorRef);
-                    if (actor->id == ACTOR_DEMO_IM && (CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", 0) || IS_RANDO)) {
+                    if (actor->id == ACTOR_DEMO_IM && (CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", IS_RANDO) || IS_RANDO)) {
                         DemoIm* demoIm = static_cast<DemoIm*>(actorRef);
                         Player* player = GET_PLAYER(gPlayState);
                         player->stateFlags1 |= PLAYER_STATE1_IN_CUTSCENE;
@@ -459,7 +459,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             break;
         }
         case GI_VB_PLAY_SARIAS_SONG_CS: {
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", 0) || IS_RANDO) {
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", IS_RANDO) || IS_RANDO) {
                 EnSa* enSa = static_cast<EnSa*>(opt);
                 enSa->actionFunc = func_80AF6B20;
                 *should = false;
@@ -473,7 +473,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             break;
         }
         case GI_VB_PLAY_DRAIN_WELL_CS: {
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.Story", 0)) {
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.Story", IS_RANDO)) {
                 *should = false;
                 Flags_SetSwitch(gPlayState, 0x2);
                 Flags_SetEventChkInf(EVENTCHKINF_PLAYED_SONG_OF_STORMS_IN_WINDMILL);
@@ -482,7 +482,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             break;
         }
         case GI_VB_PLAY_SUNS_SONG_CS:
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", 0) || IS_RANDO) {
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", IS_RANDO) || IS_RANDO) {
                 *should = false;
                 Flags_SetEventChkInf(EVENTCHKINF_LEARNED_SUNS_SONG);
                 // SoH [Randomizer] TODO: Increment time X amount (find out X)
@@ -491,19 +491,19 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             }
             break;
         case GI_VB_PLAY_ROYAL_FAMILY_TOMB_CS: {
-            if (CVarGetInteger("gTimeSavers.SkipMiscInteractions", 0)) {
+            if (CVarGetInteger("gTimeSavers.SkipMiscInteractions", IS_RANDO)) {
                 *should = false;
             }
             break;
         }
         case GI_VB_PLAY_ROYAL_FAMILY_TOMB_EXPLODE: {
-            if (CVarGetInteger("gTimeSavers.SkipMiscInteractions", 0)) {
+            if (CVarGetInteger("gTimeSavers.SkipMiscInteractions", IS_RANDO)) {
                 *should = Flags_GetEventChkInf(EVENTCHKINF_DESTROYED_ROYAL_FAMILY_TOMB);
             }
             break;
         }
         case GI_VB_PLAY_DOOR_OF_TIME_CS: {
-            if (CVarGetInteger("gTimeSavers.SkipMiscInteractions", 0)) {
+            if (CVarGetInteger("gTimeSavers.SkipMiscInteractions", IS_RANDO)) {
                 *should = false;
                 Flags_SetEnv(gPlayState, 2);
                 func_80078884(NA_SE_SY_CORRECT_CHIME);
@@ -526,7 +526,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
         case GI_VB_PLAY_BOLERO_OF_FIRE_CS:
         case GI_VB_PLAY_SERENADE_OF_WATER_CS:
         case GI_VB_PLAY_PRELUDE_OF_LIGHT_CS:
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", 0) || IS_RANDO) {
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", IS_RANDO) || IS_RANDO) {
                 *should = false;
             }
             break;
@@ -581,7 +581,7 @@ void TimeSaverOnActorInitHandler(void* actorRef) {
     if (actor->id == ACTOR_EN_KO && (actor->params & 0xFF) == ENKO_TYPE_CHILD_3) {
         enKoUpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* innerActorRef) mutable {
             Actor* innerActor = static_cast<Actor*>(innerActorRef);
-            if (innerActor->id == ACTOR_EN_KO && (innerActor->params & 0xFF) == ENKO_TYPE_CHILD_3 && (CVarGetInteger("gTimeSavers.SkipCutscene.Story", 0) || IS_RANDO)) {
+            if (innerActor->id == ACTOR_EN_KO && (innerActor->params & 0xFF) == ENKO_TYPE_CHILD_3 && (CVarGetInteger("gTimeSavers.SkipCutscene.Story", IS_RANDO) || IS_RANDO)) {
                 EnKo* enKo = static_cast<EnKo*>(innerActorRef);
                 // They haven't moved yet, wrap their update function so we check every frame
                 if (enKo->actionFunc == func_80A995CC) {
@@ -607,7 +607,7 @@ void TimeSaverOnActorInitHandler(void* actorRef) {
         });
     }
 
-    if (actor->id == ACTOR_ITEM_OCARINA && actor->params == 3 && CVarGetInteger("gTimeSavers.SkipCutscene.Story", 0)) {
+    if (actor->id == ACTOR_ITEM_OCARINA && actor->params == 3 && CVarGetInteger("gTimeSavers.SkipCutscene.Story", IS_RANDO)) {
         itemOcarinaframesSinceSpawn = 0;
         itemOcarinaUpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* innerActorRef) mutable {
             Actor* innerActor = static_cast<Actor*>(innerActorRef);
@@ -625,7 +625,7 @@ void TimeSaverOnActorInitHandler(void* actorRef) {
     if (actor->id == ACTOR_EN_MA1 && gPlayState->sceneNum == SCENE_LON_LON_RANCH) {
         enMa1UpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* innerActorRef) mutable {
             Actor* innerActor = static_cast<Actor*>(innerActorRef);
-            if (innerActor->id == ACTOR_EN_MA1 && (CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", 0) || IS_RANDO)) {
+            if (innerActor->id == ACTOR_EN_MA1 && (CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", IS_RANDO) || IS_RANDO)) {
                 EnMa1* enMa1 = static_cast<EnMa1*>(innerActorRef);
                 if (enMa1->actionFunc == func_80AA106C) {
                     enMa1->actionFunc = EnMa1_EndTeachSong;
@@ -653,7 +653,7 @@ void TimeSaverOnActorInitHandler(void* actorRef) {
     if (actor->id == ACTOR_EN_FU) {
         enFuUpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* innerActorRef) mutable {
             Actor* innerActor = static_cast<Actor*>(innerActorRef);
-            if (innerActor->id == ACTOR_EN_FU && (CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", 0) || IS_RANDO)) {
+            if (innerActor->id == ACTOR_EN_FU && (CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", IS_RANDO) || IS_RANDO)) {
                 EnFu* enFu = static_cast<EnFu*>(innerActorRef);
                 if (enFu->actionFunc == EnFu_TeachSong) {
                     enFu->actionFunc = EnFu_EndTeachSong;
@@ -676,7 +676,7 @@ void TimeSaverOnActorInitHandler(void* actorRef) {
         SPDLOG_INFO("Registering BG_SPOT02 hook");
         bgSpot02UpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* innerActorRef) mutable {
             Actor* innerActor = static_cast<Actor*>(innerActorRef);
-            if (innerActor->id == ACTOR_BG_SPOT02_OBJECTS && innerActor->params == 2 && (CVarGetInteger("gTimeSavers.SkipMiscInteractions", 0))) {
+            if (innerActor->id == ACTOR_BG_SPOT02_OBJECTS && innerActor->params == 2 && (CVarGetInteger("gTimeSavers.SkipMiscInteractions", IS_RANDO))) {
                 SPDLOG_INFO("on update BG_SPOT02 hook");
                 BgSpot02Objects* bgSpot02 = static_cast<BgSpot02Objects*>(innerActorRef);
                 if (bgSpot02->actionFunc == func_808ACC34) {
@@ -697,7 +697,7 @@ void TimeSaverOnActorInitHandler(void* actorRef) {
         });
     }
 
-    if (actor->id == ACTOR_EN_ZL4 && CVarGetInteger("gTimeSavers.SkipCutscene.Story", 0)) {
+    if (actor->id == ACTOR_EN_ZL4 && CVarGetInteger("gTimeSavers.SkipCutscene.Story", IS_RANDO)) {
         EnZl4* enZl4 = static_cast<EnZl4*>(actorRef);
         if (enZl4->actionFunc != EnZl4_Cutscene || enZl4->csState != 0) return;
 
@@ -708,63 +708,63 @@ void TimeSaverOnActorInitHandler(void* actorRef) {
 void TimeSaverOnSceneInitHandler(int16_t sceneNum) {
     switch (sceneNum) {
         case SCENE_HYRULE_CASTLE:
-            if (CVarGetInteger("gTimeSavers.SkipMiscInteractions", 0) && !Flags_GetInfTable(INFTABLE_ENTERED_HYRULE_CASTLE)) {
+            if (CVarGetInteger("gTimeSavers.SkipMiscInteractions", IS_RANDO) && !Flags_GetInfTable(INFTABLE_ENTERED_HYRULE_CASTLE)) {
                 Flags_SetInfTable(INFTABLE_ENTERED_HYRULE_CASTLE);
                 Flags_SetInfTable(INFTABLE_MET_CHILD_MALON_AT_CASTLE_OR_MARKET);
                 Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_CHILD_MALON_AT_CASTLE_OR_MARKET);
             }
             break;
         case SCENE_LON_LON_RANCH:
-            if (CVarGetInteger("gTimeSavers.SkipMiscInteractions", 0) && GameInteractor_Should(GI_VB_MALON_RETURN_FROM_CASTLE, Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE), NULL)) {
+            if (CVarGetInteger("gTimeSavers.SkipMiscInteractions", IS_RANDO) && GameInteractor_Should(GI_VB_MALON_RETURN_FROM_CASTLE, Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE), NULL)) {
                 Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_CHILD_MALON_AT_RANCH);
                 Flags_SetInfTable(INFTABLE_CHILD_MALON_SAID_EPONA_WAS_AFRAID_OF_YOU);
                 Flags_SetEventChkInf(EVENTCHKINF_INVITED_TO_SING_WITH_CHILD_MALON);
             }
             break;
         case SCENE_DEKU_TREE_BOSS:
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", 0)) {
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", IS_RANDO)) {
                 if (!Flags_GetEventChkInf(EVENTCHKINF_BEGAN_GOHMA_BATTLE)) {
                     Flags_SetEventChkInf(EVENTCHKINF_BEGAN_GOHMA_BATTLE);
                 }
             }
             break;
         case SCENE_DODONGOS_CAVERN_BOSS:
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", 0)) {
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", IS_RANDO)) {
                 if (!Flags_GetEventChkInf(EVENTCHKINF_BEGAN_KING_DODONGO_BATTLE)) {
                     Flags_SetEventChkInf(EVENTCHKINF_BEGAN_KING_DODONGO_BATTLE);
                 }
             }
             break;
         case SCENE_JABU_JABU_BOSS:
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", 0)) {
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", IS_RANDO)) {
                 if (!Flags_GetEventChkInf(EVENTCHKINF_BEGAN_BARINA_BATTLE)) {
                     Flags_SetEventChkInf(EVENTCHKINF_BEGAN_BARINA_BATTLE);
                 }
             }
             break;
         case SCENE_FOREST_TEMPLE_BOSS:
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", 0)) {
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", IS_RANDO)) {
                 if (!Flags_GetEventChkInf(EVENTCHKINF_BEGAN_PHANTOM_GANON_BATTLE)) {
                     Flags_SetEventChkInf(EVENTCHKINF_BEGAN_PHANTOM_GANON_BATTLE);
                 }
             }
             break;
         case SCENE_FIRE_TEMPLE_BOSS:
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", 0)) {
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", IS_RANDO)) {
                 if (!Flags_GetEventChkInf(EVENTCHKINF_BEGAN_VOLVAGIA_BATTLE)) {
                     Flags_SetEventChkInf(EVENTCHKINF_BEGAN_VOLVAGIA_BATTLE);
                 }
             }
             break;
         case SCENE_WATER_TEMPLE_BOSS:
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", 0)) {
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", IS_RANDO)) {
                 if (!Flags_GetEventChkInf(EVENTCHKINF_BEGAN_MORPHA_BATTLE)) {
                     Flags_SetEventChkInf(EVENTCHKINF_BEGAN_MORPHA_BATTLE);
                 }
             }
             break;
         case SCENE_SPIRIT_TEMPLE_BOSS:
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", 0)) {
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", IS_RANDO)) {
                 if (!Flags_GetEventChkInf(EVENTCHKINF_BEGAN_TWINROVA_BATTLE)) {
                     Flags_SetEventChkInf(EVENTCHKINF_BEGAN_TWINROVA_BATTLE);
                     Flags_SetEventChkInf(EVENTCHKINF_BEGAN_NABOORU_BATTLE);
@@ -773,7 +773,7 @@ void TimeSaverOnSceneInitHandler(int16_t sceneNum) {
             }
             break;
         case SCENE_SHADOW_TEMPLE_BOSS:
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", 0)) {
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", IS_RANDO)) {
                 if (!Flags_GetEventChkInf(EVENTCHKINF_BEGAN_BONGO_BONGO_BATTLE)) {
                     Flags_SetEventChkInf(EVENTCHKINF_BEGAN_BONGO_BONGO_BATTLE);
                 }
@@ -785,7 +785,7 @@ void TimeSaverOnSceneInitHandler(int16_t sceneNum) {
 static GetItemEntry vanillaQueuedItemEntry = GET_ITEM_NONE;
 
 void TimeSaverOnFlagSetHandler(int16_t flagType, int16_t flag) {
-    if (!CVarGetInteger("gTimeSavers.SkipCutscene.Story", 0)) return;
+    if (!CVarGetInteger("gTimeSavers.SkipCutscene.Story", IS_RANDO)) return;
 
     switch (flagType) {
         case FLAG_EVENT_CHECK_INF:
diff --git a/soh/soh/SohMenuBar.cpp b/soh/soh/SohMenuBar.cpp
index e133a1bb0..44aa38cbe 100644
--- a/soh/soh/SohMenuBar.cpp
+++ b/soh/soh/SohMenuBar.cpp
@@ -576,29 +576,29 @@ void DrawEnhancementsMenu() {
                 ImGui::Text("Speed-ups:");
                 UIWidgets::PaddedSeparator();
                 bool allChecked =
-                    CVarGetInteger("gTimeSavers.SkipCutscene.Intro", 0) &&
-                    CVarGetInteger("gTimeSavers.SkipCutscene.Entrances", 0) &&
-                    CVarGetInteger("gTimeSavers.SkipCutscene.Story", 0) &&
-                    CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", 0) &&
-                    CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", 0) &&
-                    CVarGetInteger("gTimeSavers.SkipCutscene.GlitchAiding", 0) &&
-                    CVarGetInteger("gTimeSavers.SkipCutscene.OnePoint", 0) &&
-                    CVarGetInteger("gTimeSavers.NoForcedDialog", 0) &&
-                    CVarGetInteger("gTimeSavers.SkipOwlInteractions", 0) &&
-                    CVarGetInteger("gTimeSavers.SkipMiscInteractions", 0) &&
-                    CVarGetInteger("gTimeSavers.DisableTitleCard", 0);
+                    CVarGetInteger("gTimeSavers.SkipCutscene.Intro", IS_RANDO) &&
+                    CVarGetInteger("gTimeSavers.SkipCutscene.Entrances", IS_RANDO) &&
+                    CVarGetInteger("gTimeSavers.SkipCutscene.Story", IS_RANDO) &&
+                    CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", IS_RANDO) &&
+                    CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", IS_RANDO) &&
+                    CVarGetInteger("gTimeSavers.SkipCutscene.GlitchAiding", IS_RANDO) &&
+                    CVarGetInteger("gTimeSavers.SkipCutscene.OnePoint", IS_RANDO) &&
+                    CVarGetInteger("gTimeSavers.NoForcedDialog", IS_RANDO) &&
+                    CVarGetInteger("gTimeSavers.SkipOwlInteractions", IS_RANDO) &&
+                    CVarGetInteger("gTimeSavers.SkipMiscInteractions", IS_RANDO) &&
+                    CVarGetInteger("gTimeSavers.DisableTitleCard", IS_RANDO);
                 bool someChecked =
-                    CVarGetInteger("gTimeSavers.SkipCutscene.Intro", 0) ||
-                    CVarGetInteger("gTimeSavers.SkipCutscene.Entrances", 0) ||
-                    CVarGetInteger("gTimeSavers.SkipCutscene.Story", 0) ||
-                    CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", 0) ||
-                    CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", 0) ||
-                    CVarGetInteger("gTimeSavers.SkipCutscene.GlitchAiding", 0) ||
-                    CVarGetInteger("gTimeSavers.SkipCutscene.OnePoint", 0) ||
-                    CVarGetInteger("gTimeSavers.NoForcedDialog", 0) ||
-                    CVarGetInteger("gTimeSavers.SkipOwlInteractions", 0) ||
-                    CVarGetInteger("gTimeSavers.SkipMiscInteractions", 0) ||
-                    CVarGetInteger("gTimeSavers.DisableTitleCard", 0);
+                    CVarGetInteger("gTimeSavers.SkipCutscene.Intro", IS_RANDO) ||
+                    CVarGetInteger("gTimeSavers.SkipCutscene.Entrances", IS_RANDO) ||
+                    CVarGetInteger("gTimeSavers.SkipCutscene.Story", IS_RANDO) ||
+                    CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", IS_RANDO) ||
+                    CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", IS_RANDO) ||
+                    CVarGetInteger("gTimeSavers.SkipCutscene.GlitchAiding", IS_RANDO) ||
+                    CVarGetInteger("gTimeSavers.SkipCutscene.OnePoint", IS_RANDO) ||
+                    CVarGetInteger("gTimeSavers.NoForcedDialog", IS_RANDO) ||
+                    CVarGetInteger("gTimeSavers.SkipOwlInteractions", IS_RANDO) ||
+                    CVarGetInteger("gTimeSavers.SkipMiscInteractions", IS_RANDO) ||
+                    CVarGetInteger("gTimeSavers.DisableTitleCard", IS_RANDO);
 
                 ImGuiContext* g = ImGui::GetCurrentContext();
                 ImGuiItemFlags backup_item_flags = g->CurrentItemFlags;
@@ -632,19 +632,19 @@ void DrawEnhancementsMenu() {
                     LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
                 }
                 g->CurrentItemFlags = backup_item_flags;
-                UIWidgets::PaddedEnhancementCheckbox("Skip Intro", "gTimeSavers.SkipCutscene.Intro");
-                UIWidgets::PaddedEnhancementCheckbox("Skip Entrance Cutscenes", "gTimeSavers.SkipCutscene.Entrances");
-                UIWidgets::PaddedEnhancementCheckbox("Skip Story Cutscenes", "gTimeSavers.SkipCutscene.Story");
-                UIWidgets::PaddedEnhancementCheckbox("Skip Song Cutscenes", "gTimeSavers.SkipCutscene.LearnSong");
-                UIWidgets::PaddedEnhancementCheckbox("Skip Boss Introductions", "gTimeSavers.SkipCutscene.BossIntro");
-                UIWidgets::PaddedEnhancementCheckbox("Skip Glitch-Aiding Cutscenes", "gTimeSavers.SkipCutscene.GlitchAiding");
+                UIWidgets::PaddedEnhancementCheckbox("Skip Intro", "gTimeSavers.SkipCutscene.Intro", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
+                UIWidgets::PaddedEnhancementCheckbox("Skip Entrance Cutscenes", "gTimeSavers.SkipCutscene.Entrances", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
+                UIWidgets::PaddedEnhancementCheckbox("Skip Story Cutscenes", "gTimeSavers.SkipCutscene.Story", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
+                UIWidgets::PaddedEnhancementCheckbox("Skip Song Cutscenes", "gTimeSavers.SkipCutscene.LearnSong", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
+                UIWidgets::PaddedEnhancementCheckbox("Skip Boss Introductions", "gTimeSavers.SkipCutscene.BossIntro", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
+                UIWidgets::PaddedEnhancementCheckbox("Skip Glitch-Aiding Cutscenes", "gTimeSavers.SkipCutscene.GlitchAiding", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
                 UIWidgets::Tooltip("Skip cutscenes that are associated with useful glitches, currently this is only the Fire Temple Darunia CS and Forest Temple Poe Sisters CS");
-                UIWidgets::PaddedEnhancementCheckbox("Skip One Point Cutscenes (Chests, Door Unlocks, etc)", "gTimeSavers.SkipCutscene.OnePoint");
-                UIWidgets::PaddedEnhancementCheckbox("No Forced Dialog", "gTimeSavers.NoForcedDialog");
+                UIWidgets::PaddedEnhancementCheckbox("Skip One Point Cutscenes (Chests, Door Unlocks, etc)", "gTimeSavers.SkipCutscene.OnePoint", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
+                UIWidgets::PaddedEnhancementCheckbox("No Forced Dialog", "gTimeSavers.NoForcedDialog", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
                 UIWidgets::Tooltip("Prevent forced conversations with Navi or other NPCs");
-                UIWidgets::PaddedEnhancementCheckbox("Skip Owl Interactions", "gTimeSavers.SkipOwlInteractions");
-                UIWidgets::PaddedEnhancementCheckbox("Skip Misc Interactions", "gTimeSavers.SkipMiscInteractions");
-                UIWidgets::PaddedEnhancementCheckbox("Disable Title Card", "gTimeSavers.DisableTitleCard");
+                UIWidgets::PaddedEnhancementCheckbox("Skip Owl Interactions", "gTimeSavers.SkipOwlInteractions", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
+                UIWidgets::PaddedEnhancementCheckbox("Skip Misc Interactions", "gTimeSavers.SkipMiscInteractions", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
+                UIWidgets::PaddedEnhancementCheckbox("Disable Title Card", "gTimeSavers.DisableTitleCard", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
 
                 UIWidgets::PaddedText("Skip Get Item Animations", true, false);
                 UIWidgets::EnhancementCombobox("gTimeSavers.SkipGetItemAnimation", skipGetItemAnimationOptions, SGIA_DISABLED);

From 13a113c36233e61554b297736b3df88885e739b7 Mon Sep 17 00:00:00 2001
From: Garrett Cox <garrettjcox@gmail.com>
Date: Fri, 23 Feb 2024 12:43:27 -0600
Subject: [PATCH 084/230] Various adjustments to goron related vanilla behavior
 hooks

---
 .../game-interactor/GameInteractor.h          |  14 +-
 .../Enhancements/randomizer/hook_handlers.cpp |  82 +++------
 soh/soh/Enhancements/randomizer/location.h    |   8 +-
 .../Enhancements/randomizer/location_list.cpp |   8 +-
 .../Enhancements/randomizer/randomizer_inf.h  |   2 -
 .../Enhancements/timesaver_hook_handlers.cpp  |  11 ++
 soh/src/overlays/actors/ovl_En_Go/z_en_go.c   |   1 -
 soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c | 160 +++++++-----------
 8 files changed, 101 insertions(+), 185 deletions(-)

diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h
index 453055da4..380454e01 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h
@@ -201,8 +201,8 @@ typedef enum {
     // Opt: *uint16_t
     // Vanilla condition: false
     GI_VB_OVERRIDE_LINK_THE_GORON_DIALOGUE,
-    // Opt: *EnGo2
-    GI_VB_EN_GO2_RESET_AFTER_GET_ITEM,
+    // Vanilla condition: CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON)
+    GI_VB_GORONS_CONSIDER_TUNIC_COLLECTED,
     // Opt: *EnSyatekiMan
     // Vanilla condition: (this->getItemId == GI_QUIVER_40) || (this->getItemId == GI_QUIVER_50)
     GI_VB_BE_ELIGIBLE_FOR_ADULT_SHOOTING_GAME_REWARD,
@@ -273,9 +273,7 @@ typedef enum {
     // Vanilla condition: !CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_ZORA)
     GI_VB_GIVE_ITEM_FROM_THAWING_KING_ZORA,
     // Opt: *EnGo2
-    GI_VB_GIVE_ITEM_FROM_ROLLING_GORON_AS_CHILD,
-    // Opt: *EnGo2
-    GI_VB_GIVE_ITEM_FROM_ROLLING_GORON_AS_ADULT,
+    GI_VB_GIVE_ITEM_FROM_GORON,
     // Opt: *EnJs
     GI_VB_GIVE_ITEM_FROM_CARPET_SALESMAN,
     // Opt: *EnGm
@@ -333,16 +331,10 @@ typedef enum {
     GI_VB_TRADE_ODD_POTION,
     // Opt: *EnToryo
     GI_VB_TRADE_SAW,
-    // Opt: *EnGo2
-    GI_VB_TRADE_BROKEN_SWORD,
     // Opt: *EnKz,
     GI_VB_TRADE_PRESCRIPTION,
     // Opt: *EnMk
     GI_VB_TRADE_FROG,
-    // Opt: *EnGo2
-    GI_VB_TRADE_EYEDROPS,
-    // Opt: *EnGo2
-    GI_VB_TRADE_CLAIM_CHECK,
 
     GI_VB_TRADE_TIMER_ODD_MUSHROOM,
     GI_VB_TRADE_TIMER_EYEDROPS,
diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index 9f2e2633a..35031690e 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -34,6 +34,7 @@ extern PlayState* gPlayState;
 RandomizerCheck GetRandomizerCheckFromFlag(int16_t flagType, int16_t flag) {
     for (auto& loc : Rando::StaticData::GetLocationTable()) {
         if (loc.GetCollectionCheck().flag == flag && (
+                (flagType == FLAG_INF_TABLE && loc.GetCollectionCheck().type == SPOILER_CHK_INF_TABLE) ||
                 (flagType == FLAG_EVENT_CHECK_INF && loc.GetCollectionCheck().type == SPOILER_CHK_EVENT_CHK_INF) ||
                 (flagType == FLAG_ITEM_GET_INF && loc.GetCollectionCheck().type == SPOILER_CHK_ITEM_GET_INF) ||
                 (flagType == FLAG_RANDOMIZER_INF && loc.GetCollectionCheck().type == SPOILER_CHK_RANDOMIZER_INF)
@@ -104,6 +105,18 @@ static RandomizerCheck randomizerQueuedCheck = RC_UNKNOWN_CHECK;
 static GetItemEntry randomizerQueuedItemEntry = GET_ITEM_NONE;
 
 void RandomizerOnFlagSetHandler(int16_t flagType, int16_t flag) {
+    // Consume adult trade items
+    if (RAND_GET_OPTION(RSK_SHUFFLE_ADULT_TRADE) && flagType == FLAG_RANDOMIZER_INF) {
+        switch (flag) {
+            case RAND_INF_ADULT_TRADES_DMT_TRADE_BROKEN_SWORD:
+                Randomizer_ConsumeAdultTradeItem(gPlayState, ITEM_SWORD_BROKEN);
+                break;
+            case RAND_INF_ADULT_TRADES_DMT_TRADE_EYEDROPS:
+                Randomizer_ConsumeAdultTradeItem(gPlayState, ITEM_EYEDROPS);
+                break;
+        }
+    }
+
     RandomizerCheck rc = GetRandomizerCheckFromFlag(flagType, flag);
     if (rc == RC_UNKNOWN_CHECK) return;
 
@@ -453,8 +466,9 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             break;
         }
         case GI_VB_BIGGORON_CONSIDER_TRADE_COMPLETE: {
-
-            *should = INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_CLAIM_CHECK && Flags_GetRandomizerInf(RAND_INF_ADULT_TRADES_DMT_TRADE_CLAIM_CHECK);
+            // This being true will prevent other biggoron trades, there are already safegaurds in place to prevent
+            // claim check from being traded multiple times, so we don't really need the quest to ever be considered "complete"
+            *should = false;
             break;
         }
         case GI_VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED: {
@@ -465,46 +479,8 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             *should = Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP);
             break;
         }
-        case GI_VB_OVERRIDE_LINK_THE_GORON_DIALOGUE: {
-            u16* textId = static_cast<u16*>(optionalArg);
-            *should = true;
-
-            // For rando, prioritize opening the doors in GC when Link the goron has been stopped when
-            // the doors are not opened, otherwise let him talk about the DMC exit or that gorons are saved
-            if (!Flags_GetInfTable(INFTABLE_STOPPED_GORON_LINKS_ROLLING)) {
-                *textId = 0x3030;
-            } else if (!Flags_GetInfTable(INFTABLE_GORON_CITY_DOORS_UNLOCKED)) {
-                *textId = 0x3036;
-            } else if (Flags_GetEventChkInf(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP)) {
-                *textId = 0x3041;
-            } else {
-                *textId = Flags_GetInfTable(INFTABLE_SPOKE_TO_GORON_LINK) ? 0x3038 : 0x3037;
-            }
-            break;
-        }
-        case GI_VB_EN_GO2_RESET_AFTER_GET_ITEM: {
-            EnGo2* enGo2 = static_cast<EnGo2*>(optionalArg);
-            // For randomizer, handle updating the states for the gorons after receiving the item based on
-            // the goron type rather then the item being received
-            switch (enGo2->actor.params & 0x1F) {
-                case GORON_DMT_BIGGORON:
-                    // Resolves #1301. unk_13EE is used to set the opacity of the HUD. The trade sequence discussion
-                    // with Biggoron sets the HUD to transparent, and it is restored at z_message_PAL:3549, but by
-                    // specifically watching for trade sequence items, this leaves it transparent for non-trade sequence
-                    // items (in rando) so we fix that here
-                    gSaveContext.unk_13EE = 0x32;
-                    break;
-                case GORON_CITY_LINK:
-                    EnGo2_GetItemAnimation(enGo2, gPlayState);
-                    break;
-                case GORON_CITY_ROLLING_BIG:
-                    EnGo2_RollingAnimation(enGo2, gPlayState);
-                    enGo2->actionFunc = (EnGo2ActionFunc)EnGo2_GoronRollingBigContinueRolling;
-                    break;
-                default:
-                    enGo2->actionFunc = func_80A46B40;
-                    break;
-            }
+        case GI_VB_GORONS_CONSIDER_TUNIC_COLLECTED: {
+            *should = Flags_GetInfTable(INFTABLE_GORON_CITY_DOORS_UNLOCKED);
             break;
         }
         case GI_VB_GIVE_ITEM_FROM_ITEM_00: {
@@ -589,15 +565,6 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             *should = false;
             break;
         }
-        case GI_VB_GIVE_ITEM_FROM_ROLLING_GORON_AS_ADULT: {
-            EnGo2* enGo2 = static_cast<EnGo2*>(optionalArg);
-            *should = false;
-            if (!Flags_GetRandomizerInf(RAND_INF_ROLLING_GORON_AS_ADULT)) {
-                Flags_SetInfTable(INFTABLE_GORON_CITY_DOORS_UNLOCKED);
-                enGo2->interactInfo.talkState = NPC_TALK_STATE_ACTION;
-            }
-            break;
-        }
         case GI_VB_GIVE_ITEM_FROM_CARPET_SALESMAN: {
             *should = RAND_GET_OPTION(RSK_SHUFFLE_MERCHANTS) == RO_SHUFFLE_MERCHANTS_OFF ||
                       // If the rando check has already been awarded, use vanilla behavior.
@@ -695,16 +662,6 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             *should = false;
             break;
         }
-        case GI_VB_TRADE_BROKEN_SWORD: {
-            Randomizer_ConsumeAdultTradeItem(gPlayState, ITEM_SWORD_BROKEN);
-            *should = false;
-            break;
-        }
-        case GI_VB_TRADE_EYEDROPS: {
-            Randomizer_ConsumeAdultTradeItem(gPlayState, ITEM_EYEDROPS);
-            *should = false;
-            break;
-        }
         case GI_VB_DESPAWN_HORSE_RACE_COW: {
             if (!RAND_GET_OPTION(RSK_SHUFFLE_COWS)) {
                 break;
@@ -806,12 +763,11 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             *should = eligible;
             break;
         }
-        case GI_VB_TRADE_CLAIM_CHECK:
         case GI_VB_TRADE_TIMER_ODD_MUSHROOM:
         case GI_VB_TRADE_TIMER_EYEDROPS:
         case GI_VB_TRADE_TIMER_FROG:
         case GI_VB_ANJU_SET_OBTAINED_TRADE_ITEM:
-        case GI_VB_GIVE_ITEM_FROM_ROLLING_GORON_AS_CHILD:
+        case GI_VB_GIVE_ITEM_FROM_GORON:
         case GI_VB_GIVE_ITEM_FROM_LAB_DIVE:
         case GI_VB_GIVE_ITEM_FROM_SKULL_KID_SARIAS_SONG:
         case GI_VB_GIVE_ITEM_FROM_MAN_ON_ROOF:
diff --git a/soh/soh/Enhancements/randomizer/location.h b/soh/soh/Enhancements/randomizer/location.h
index fcea02eb4..ad3142cae 100644
--- a/soh/soh/Enhancements/randomizer/location.h
+++ b/soh/soh/Enhancements/randomizer/location.h
@@ -16,10 +16,10 @@ class SpoilerCollectionCheck {
   public:
     SpoilerCollectionCheckType type = SPOILER_CHK_NONE;
     uint8_t scene = 0;
-    uint8_t flag = 0;
+    uint16_t flag = 0;
 
     SpoilerCollectionCheck() = default;
-    SpoilerCollectionCheck(const SpoilerCollectionCheckType type_, const uint8_t scene_, const uint8_t flag_)
+    SpoilerCollectionCheck(const SpoilerCollectionCheckType type_, const uint8_t scene_, const uint16_t flag_)
         : type(type_), scene(scene_), flag(flag_) {
     }
 
@@ -39,8 +39,8 @@ class SpoilerCollectionCheck {
         return SpoilerCollectionCheck(SPOILER_CHK_EVENT_CHK_INF, 0xFF, flag);
     }
 
-    static auto InfTable(const uint8_t offset, const uint8_t bit) {
-        return SpoilerCollectionCheck(SPOILER_CHK_INF_TABLE, offset, bit);
+    static auto InfTable(const uint16_t flag) {
+        return SpoilerCollectionCheck(SPOILER_CHK_INF_TABLE, 0xFF, flag);
     }
 
     static auto Collectable(const uint8_t scene, const uint8_t flag) {
diff --git a/soh/soh/Enhancements/randomizer/location_list.cpp b/soh/soh/Enhancements/randomizer/location_list.cpp
index 8deeab8c8..c375f6bea 100644
--- a/soh/soh/Enhancements/randomizer/location_list.cpp
+++ b/soh/soh/Enhancements/randomizer/location_list.cpp
@@ -651,7 +651,7 @@ void Rando::StaticData::InitLocationTable() { //
     locationTable[RC_GV_DEKU_SCRUB_GROTTO_FRONT] =                              Location::GrottoScrub(RC_GV_DEKU_SCRUB_GROTTO_FRONT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_GERUDO_VALLEY,                ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x08, 0xF0),                      0x3A, "Deku Scrub Grotto Front",                     "GV Deku Scrub Grotto Front",                               RHT_GV_DEKU_SCRUB_GROTTO_FRONT,                                  RG_BUY_GREEN_POTION,                  { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GV_DEKU_SCRUB_GROTTO_FRONT),                                  SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
     // Gerudo Fortress
     locationTable[RC_GF_CHEST] =                                                      Location::Chest(RC_GF_CHEST,                                                     RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GERUDO_FORTRESS,              ACTOR_EN_BOX,         SCENE_GERUDOS_FORTRESS,             1984,                                              0x00, "Chest",                                       "GF Chest",                                                 RHT_GF_CHEST,                                                    RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
-    locationTable[RC_GF_HBA_1000_POINTS] =                                             Location::Base(RC_GF_HBA_1000_POINTS,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GERUDO_FORTRESS,              ACTOR_ID_MAX,         SCENE_GERUDOS_FORTRESS,             0x00,                                              0x3E, "GF HBA 1000 Points",                          "GF HBA 1000 Points",                                       RHT_GF_HBA_1000_POINTS,                                          RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::InfTable(0x19, 0x08),                                                                                 SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
+    locationTable[RC_GF_HBA_1000_POINTS] =                                             Location::Base(RC_GF_HBA_1000_POINTS,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GERUDO_FORTRESS,              ACTOR_ID_MAX,         SCENE_GERUDOS_FORTRESS,             0x00,                                              0x3E, "GF HBA 1000 Points",                          "GF HBA 1000 Points",                                       RHT_GF_HBA_1000_POINTS,                                          RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::InfTable(INFTABLE_190),                                                                               SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
     locationTable[RC_GF_HBA_1500_POINTS] =                                             Location::Base(RC_GF_HBA_1500_POINTS,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GERUDO_FORTRESS,              ACTOR_ID_MAX,         SCENE_GERUDOS_FORTRESS,             0x00,                                              0x30, "GF HBA 1500 Points",                          "GF HBA 1500 Points",                                       RHT_GF_HBA_1500_POINTS,                                          RG_PROGRESSIVE_BOW,                   {},                                                     SpoilerCollectionCheck::ItemGetInf(15),                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
     // RandoTodo: Do we replace these with the RC_HIDEOUT keys or keep these?
     locationTable[RC_GF_GERUDO_MEMBERSHIP_CARD] =                                      Location::Base(RC_GF_GERUDO_MEMBERSHIP_CARD,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GERUDO_FORTRESS,              ACTOR_ID_MAX,         SCENE_THIEVES_HIDEOUT,              0x00,                                              0x3A, "GF Gerudo Membership Card",                   "GF Gerudo Membership Card",                                RHT_GF_GERUDO_MEMBERSHIP_CARD,                                   RG_GERUDO_MEMBERSHIP_CARD,            {},                                                     SpoilerCollectionCheck::GerudoToken(),                                                                                        SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
@@ -671,7 +671,7 @@ void Rando::StaticData::InitLocationTable() { //
     locationTable[RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE] =                             Location::Base(RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_BOMBCHU_BOWLING_ALLEY,        0x00,                                              0x33, "Bombchu Bowling First Prize",                 "MK Bombchu Bowling First Prize",                           RHT_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,                          RG_PROGRESSIVE_BOMB_BAG,              {},                                                     SpoilerCollectionCheck::ItemGetInf(17),                                                                                       SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
     locationTable[RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE] =                            Location::Base(RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE,                          RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_BOMBCHU_BOWLING_ALLEY,        0x00,                                              0x3E, "Bombchu Bowling Second Prize",                "MK Bombchu Bowling Second Prize",                          RHT_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE,                         RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::ItemGetInf(18),                                                                                       SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
     locationTable[RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS] =                                Location::Base(RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS,                              RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_BOMBCHU_BOWLING_ALLEY,        0x00,                                              0x00, "Bombchu Bowling Bombchus",                    "MK Bombchu Bowling Bombchus",                              RHT_MARKET_BOMBCHU_BOWLING_BOMBCHUS,                             RG_BOMBCHU_DROP,                      {},                                                     SpoilerCollectionCheck::None(),                                                                                               SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_LOST_DOG] =                                                Location::Base(RC_MARKET_LOST_DOG,                                              RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_DOG_LADY_HOUSE,               0x00,                                              0x3E, "Lost Dog",                                    "MK Lost Dog",                                              RHT_MARKET_LOST_DOG,                                             RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::InfTable(0x19, 0x09),                                                                                 SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
+    locationTable[RC_MARKET_LOST_DOG] =                                                Location::Base(RC_MARKET_LOST_DOG,                                              RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_DOG_LADY_HOUSE,               0x00,                                              0x3E, "Lost Dog",                                    "MK Lost Dog",                                              RHT_MARKET_LOST_DOG,                                             RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::InfTable(INFTABLE_191),                                                                               SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
     locationTable[RC_MARKET_SHOOTING_GALLERY_REWARD] =                                 Location::Base(RC_MARKET_SHOOTING_GALLERY_REWARD,                               RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_SHOOTING_GALLERY,             0x00,                                              0x60, "Shooting Gallery",                            "MK Shooting Gallery",                                      RHT_MARKET_SHOOTING_GALLERY_REWARD,                              RG_PROGRESSIVE_SLINGSHOT,             {},                                                     SpoilerCollectionCheck::ItemGetInf(ITEMGETINF_0D),                                                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
     locationTable[RC_MARKET_10_BIG_POES] =                                             Location::Base(RC_MARKET_10_BIG_POES,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_MARKET_GUARD_HOUSE,           0x00,                                              0x0F, "10 Big Poes",                                 "MK 10 Big Poes",                                           RHT_MARKET_10_BIG_POES,                                          RG_EMPTY_BOTTLE,                      {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_10_BIG_POES),                                                                  SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
     locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_1] =                             Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_1,                            RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0x01, "Chest Game First Room Chest",                 "MK Chest Game First Room Chest",                           RHT_MARKET_TREASURE_CHEST_GAME_ITEM_1,                           RG_TREASURE_GAME_SMALL_KEY,           { Category::cChestMinigame },                                                                                                                                                         SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
@@ -719,8 +719,8 @@ void Rando::StaticData::InitLocationTable() { //
     locationTable[RC_GC_MAZE_LEFT_CHEST] =                                            Location::Chest(RC_GC_MAZE_LEFT_CHEST,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GORON_CITY,                   ACTOR_EN_BOX,         SCENE_GORON_CITY,                   23232,                                             0x00, "Maze Left Chest",                             "GC Maze Left Chest",                                       RHT_GC_MAZE_LEFT_CHEST,                                          RG_HUGE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
     locationTable[RC_GC_MAZE_RIGHT_CHEST] =                                           Location::Chest(RC_GC_MAZE_RIGHT_CHEST,                                          RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GORON_CITY,                   ACTOR_EN_BOX,         SCENE_GORON_CITY,                   23201,                                             0x01, "Maze Right Chest",                            "GC Maze Right Chest",                                      RHT_GC_MAZE_RIGHT_CHEST,                                         RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
     locationTable[RC_GC_MAZE_CENTER_CHEST] =                                          Location::Chest(RC_GC_MAZE_CENTER_CHEST,                                         RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GORON_CITY,                   ACTOR_EN_BOX,         SCENE_GORON_CITY,                   23202,                                             0x02, "Maze Center Chest",                           "GC Maze Center Chest",                                     RHT_GC_MAZE_CENTER_CHEST,                                        RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_ROLLING_GORON_AS_CHILD] =                                      Location::Base(RC_GC_ROLLING_GORON_AS_CHILD,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GORON_CITY,                   ACTOR_ID_MAX,         SCENE_GORON_CITY,                   0x00,                                              0x34, "Rolling Goron as Child",                      "GC Rolling Goron as Child",                                RHT_GC_ROLLING_GORON_AS_CHILD,                                   RG_PROGRESSIVE_BOMB_BAG,              {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ROLLING_GORON_AS_CHILD),                                                       SpoilerCollectionCheckGroup::GROUP_GORON_CITY,                 true);
-    locationTable[RC_GC_ROLLING_GORON_AS_ADULT] =                                      Location::Base(RC_GC_ROLLING_GORON_AS_ADULT,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GORON_CITY,                   ACTOR_ID_MAX,         SCENE_GORON_CITY,                   0x00,                                              0x2C, "Rolling Goron as Adult",                      "GC Rolling Goron as Adult",                                RHT_GC_ROLLING_GORON_AS_ADULT,                                   RG_GORON_TUNIC,                       {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ROLLING_GORON_AS_ADULT),                                                       SpoilerCollectionCheckGroup::GROUP_GORON_CITY,                 true);
+    locationTable[RC_GC_ROLLING_GORON_AS_CHILD] =                                      Location::Base(RC_GC_ROLLING_GORON_AS_CHILD,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GORON_CITY,                   ACTOR_ID_MAX,         SCENE_GORON_CITY,                   0x00,                                              0x34, "Rolling Goron as Child",                      "GC Rolling Goron as Child",                                RHT_GC_ROLLING_GORON_AS_CHILD,                                   RG_PROGRESSIVE_BOMB_BAG,              {},                                                     SpoilerCollectionCheck::InfTable(INFTABLE_11E),                                                                               SpoilerCollectionCheckGroup::GROUP_GORON_CITY,                 true);
+    locationTable[RC_GC_ROLLING_GORON_AS_ADULT] =                                      Location::Base(RC_GC_ROLLING_GORON_AS_ADULT,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GORON_CITY,                   ACTOR_ID_MAX,         SCENE_GORON_CITY,                   0x00,                                              0x2C, "Rolling Goron as Adult",                      "GC Rolling Goron as Adult",                                RHT_GC_ROLLING_GORON_AS_ADULT,                                   RG_GORON_TUNIC,                       {},                                                     SpoilerCollectionCheck::InfTable(INFTABLE_GORON_CITY_DOORS_UNLOCKED),                                                         SpoilerCollectionCheckGroup::GROUP_GORON_CITY,                 true);
     locationTable[RC_GC_DARUNIAS_JOY] =                                                Location::Base(RC_GC_DARUNIAS_JOY,                                              RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GORON_CITY,                   ACTOR_ID_MAX,         SCENE_GORON_CITY,                   0x00,                                              0x54, "Darunias Joy",                                "GC Darunias Joy",                                          RHT_GC_DARUNIAS_JOY,                                             RG_PROGRESSIVE_STRENGTH,              {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DARUNIAS_JOY),                                                                 SpoilerCollectionCheckGroup::GROUP_GORON_CITY,                 true);
     locationTable[RC_GC_POT_FREESTANDING_POH] =                                 Location::Collectable(RC_GC_POT_FREESTANDING_POH,                                      RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GORON_CITY,                   ACTOR_EN_ITEM00,      SCENE_GORON_CITY,                   7942,                                              0x1F, "Pot Freestanding PoH",                        "GC Pot Freestanding PoH",                                  RHT_GC_POT_FREESTANDING_POH,                                     RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GORON_CITY,                 true);
     locationTable[RC_GC_DEKU_SCRUB_GROTTO_LEFT] =                               Location::GrottoScrub(RC_GC_DEKU_SCRUB_GROTTO_LEFT,                                    RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_GORON_CITY,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x00, 0xFB),                      0x30, "Deku Scrub Grotto Left",                      "GC Deku Scrub Grotto Left",                                RHT_GC_DEKU_SCRUB_GROTTO_LEFT,                                   RG_BUY_DEKU_NUTS_5,                   { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GC_DEKU_SCRUB_GROTTO_LEFT),                                   SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
diff --git a/soh/soh/Enhancements/randomizer/randomizer_inf.h b/soh/soh/Enhancements/randomizer/randomizer_inf.h
index 31ca0a805..a66827de6 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_inf.h
+++ b/soh/soh/Enhancements/randomizer/randomizer_inf.h
@@ -274,8 +274,6 @@ typedef enum {
     RAND_INF_LEARNED_EPONA_SONG,
     RAND_INF_DARUNIAS_JOY,
     RAND_INF_KING_ZORA_THAWED,
-    RAND_INF_ROLLING_GORON_AS_CHILD,
-    RAND_INF_ROLLING_GORON_AS_ADULT,
 
     // If you add anything to this list, you need to update the size of randomizerInf in z64save.h to be ceil(RAND_INF_MAX / 16)
 
diff --git a/soh/soh/Enhancements/timesaver_hook_handlers.cpp b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
index 27d10c00e..84b619ebe 100644
--- a/soh/soh/Enhancements/timesaver_hook_handlers.cpp
+++ b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
@@ -401,6 +401,17 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             }
             break;
         }
+        case GI_VB_OVERRIDE_LINK_THE_GORON_DIALOGUE: {
+            if (CVarGetInteger("gTimeSavers.SkipMiscInteractions", IS_RANDO)) {
+                u16* textId = static_cast<u16*>(opt);
+                // If the doors are not open yet, prioritize opening them
+                if (!Flags_GetInfTable(INFTABLE_GORON_CITY_DOORS_UNLOCKED)) {
+                    *textId = 0x3036;
+                    *should = true;
+                }
+            }
+            break;
+        }
         case GI_VB_PLAY_EYEDROP_CREATION_ANIM:
         case GI_VB_PLAY_EYEDROPS_CS:
         case GI_VB_PLAY_DROP_FISH_FOR_JABU_CS:
diff --git a/soh/src/overlays/actors/ovl_En_Go/z_en_go.c b/soh/src/overlays/actors/ovl_En_Go/z_en_go.c
index 7dc67f427..3ec88fb74 100644
--- a/soh/src/overlays/actors/ovl_En_Go/z_en_go.c
+++ b/soh/src/overlays/actors/ovl_En_Go/z_en_go.c
@@ -971,7 +971,6 @@ void EnGo_GetItem(EnGo* this, PlayState* play) {
 
         if ((this->actor.params & 0xF0) == 0) {
             getItemId = GI_TUNIC_GORON;
-            Flags_SetRandomizerInf(RAND_INF_ROLLING_GORON_AS_ADULT);
         }
 
         yDist = fabsf(this->actor.yDistToPlayer) + 1.0f;
diff --git a/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c b/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c
index 86d1b488a..783ada21a 100644
--- a/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c
+++ b/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c
@@ -142,7 +142,6 @@ typedef enum {
     /* 10 */ ENGO2_ANIM_10,
     /* 11 */ ENGO2_ANIM_11,
     /* 12 */ ENGO2_ANIM_12,
-    /* 13 */ ENGO2_ANIM_13, // Added to fix spinning goron issue for biggoron
 } EnGo2Animation;
 
 static AnimationInfo sAnimationInfo[] = {
@@ -152,7 +151,7 @@ static AnimationInfo sAnimationInfo[] = {
     { &gGoronAnim_002D80, 1.0f, 0.0f, -1.0f, 0x02, -8.0f }, { &gGoronAnim_00161C, 1.0f, 0.0f, -1.0f, 0x00, -8.0f },
     { &gGoronAnim_001A00, 1.0f, 0.0f, -1.0f, 0x00, -8.0f }, { &gGoronAnim_0021D0, 1.0f, 0.0f, -1.0f, 0x00, -8.0f },
     { &gGoronAnim_004930, 0.0f, 0.0f, -1.0f, 0x01, -8.0f }, { &gGoronAnim_000750, 1.0f, 0.0f, -1.0f, 0x00, -8.0f },
-    { &gGoronAnim_000D5C, 1.0f, 0.0f, -1.0f, 0x00, -8.0f }, { &gGoronAnim_004930, 0.0f, 1.0f, -1.0f, 0x01,  0.0f },
+    { &gGoronAnim_000D5C, 1.0f, 0.0f, -1.0f, 0x00, -8.0f },
 };
 
 static EnGo2DustEffectData sDustEffectData[2][4] = {
@@ -284,15 +283,10 @@ s32 EnGo2_SpawnDust(EnGo2* this, u8 initialTimer, f32 scale, f32 scaleStep, s32
 
 void EnGo2_GetItem(EnGo2* this, PlayState* play, s32 getItemId) {
     this->getItemId = getItemId;
-    func_8002F434(&this->actor, play, getItemId, this->actor.xzDistToPlayer + 1.0f,
-                  fabsf(this->actor.yDistToPlayer) + 1.0f);
-}
-
-void EnGo2_GetItemEntry(EnGo2* this, PlayState* play, GetItemEntry getItemEntry) {
-    this->getItemId = getItemEntry.getItemId;
-    this->getItemEntry = getItemEntry;
-    GiveItemEntryFromActor(&this->actor, play, getItemEntry, this->actor.xzDistToPlayer + 1.0f,
-                  fabsf(this->actor.yDistToPlayer) + 1.0f);
+    if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_GORON, true, this)) {
+        func_8002F434(&this->actor, play, getItemId, this->actor.xzDistToPlayer + 1.0f,
+                    fabsf(this->actor.yDistToPlayer) + 1.0f);
+    }
 }
 
 s32 EnGo2_GetDialogState(EnGo2* this, PlayState* play) {
@@ -335,7 +329,7 @@ u16 EnGo2_GoronFireGenericGetTextId(EnGo2* this) {
 u16 EnGo2_GetTextIdGoronCityRollingBig(PlayState* play, EnGo2* this) {
     if (Flags_GetInfTable(INFTABLE_11E)) {
         return 0x3013;
-    } else if (GameInteractor_Should(GI_VB_BE_ELIGIBLE_FOR_CHILD_ROLLING_GORON_REWARD, CUR_CAPACITY(UPG_BOMB_BAG) >= 2, this)
+    } else if (GameInteractor_Should(GI_VB_BE_ELIGIBLE_FOR_CHILD_ROLLING_GORON_REWARD, CUR_CAPACITY(UPG_BOMB_BAG) >= 20, this)
         && this->waypoint > 7 && this->waypoint < 12) {
         return 0x3012;
     } else {
@@ -351,14 +345,9 @@ s16 EnGo2_UpdateTalkStateGoronCityRollingBig(PlayState* play, EnGo2* this) {
             if (Message_ShouldAdvance(play)) {
                 if (this->actor.textId == 0x3012) {
                     this->actionFunc = EnGo2_SetupGetItem;
-                    if(GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_ROLLING_GORON_AS_CHILD, true, this)) {
-                        EnGo2_GetItem(this, play, CUR_CAPACITY(UPG_BOMB_BAG) == 30 ? GI_BOMB_BAG_40 : GI_BOMB_BAG_30);
-                    } else {
-                        this->actionFunc = EnGo2_SetGetItem;
-                    }
+                    EnGo2_GetItem(this, play, CUR_CAPACITY(UPG_BOMB_BAG) == 30 ? GI_BOMB_BAG_40 : GI_BOMB_BAG_30);
                     Message_CloseTextbox(play);
                     Flags_SetInfTable(INFTABLE_11E);
-                    Flags_SetRandomizerInf(RAND_INF_ROLLING_GORON_AS_CHILD);
                     return NPC_TALK_STATE_ACTION;
                 } else {
                     return NPC_TALK_STATE_ACTION;
@@ -511,9 +500,9 @@ u16 EnGo2_GetTextIdGoronCityLink(PlayState* play, EnGo2* this) {
         return overrideTextId;
     }
 
-    if (CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)) {
+    if (GameInteractor_Should(GI_VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE), NULL)) {
         return Flags_GetInfTable(INFTABLE_10F) ? 0x3042 : 0x3041;
-    } else if (CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON)) {
+    } else if (GameInteractor_Should(GI_VB_GORONS_CONSIDER_TUNIC_COLLECTED, CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON), NULL)) {
         return Flags_GetInfTable(INFTABLE_SPOKE_TO_GORON_LINK) ? 0x3038 : 0x3037;
     } else if (Flags_GetInfTable(INFTABLE_STOPPED_GORON_LINKS_ROLLING)) {
         this->unk_20C = 0;
@@ -529,16 +518,9 @@ s16 EnGo2_UpdateTalkStateGoronCityLink(PlayState* play, EnGo2* this) {
         case TEXT_STATE_CLOSING:
             switch (this->actor.textId) {
                 case 0x3036:
-                    Flags_SetRandomizerInf(RAND_INF_ROLLING_GORON_AS_ADULT);
-                    this->interactInfo.talkState = NPC_TALK_STATE_IDLE;
-                    if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_ROLLING_GORON_AS_ADULT, true, this)) {
-                        EnGo2_GetItem(this, play, GI_TUNIC_GORON);
-                        this->actionFunc = EnGo2_SetupGetItem;
-                        return NPC_TALK_STATE_ACTION;
-                    } else {
-                        this->actionFunc = EnGo2_SetGetItem;
-                        return this->interactInfo.talkState;
-                    }
+                    EnGo2_GetItem(this, play, GI_TUNIC_GORON);
+                    this->actionFunc = EnGo2_SetupGetItem;
+                    return NPC_TALK_STATE_ACTION;
                 case 0x3037:
                     Flags_SetInfTable(INFTABLE_SPOKE_TO_GORON_LINK);
                 default:
@@ -608,18 +590,14 @@ s16 EnGo2_UpdateTalkStateGoronDmtBiggoron(PlayState* play, EnGo2* this) {
     switch (EnGo2_GetDialogState(this, play)) {
         case TEXT_STATE_DONE:
             if (this->actor.textId == 0x305E) {
-                if (GameInteractor_Should(GI_VB_BIGGORON_CONSIDER_SWORD_COLLECTED, gSaveContext.bgsFlag, NULL)) {
-                    return NPC_TALK_STATE_IDLE;
-                }
-                Flags_SetRandomizerInf(RAND_INF_ADULT_TRADES_DMT_TRADE_CLAIM_CHECK);
-                if (GameInteractor_Should(GI_VB_TRADE_CLAIM_CHECK, true, this)) {
+                if (!GameInteractor_Should(GI_VB_BIGGORON_CONSIDER_SWORD_COLLECTED, gSaveContext.bgsFlag, NULL)) {
+                    Flags_SetRandomizerInf(RAND_INF_ADULT_TRADES_DMT_TRADE_CLAIM_CHECK);
                     EnGo2_GetItem(this, play, GI_SWORD_BGS);
                     this->actionFunc = EnGo2_SetupGetItem;
+                    return NPC_TALK_STATE_ACTION;
                 } else {
-                    this->actionFunc = EnGo2_SetGetItem;
+                    return NPC_TALK_STATE_IDLE;
                 }
-
-                return NPC_TALK_STATE_ACTION;
             } else {
                 return NPC_TALK_STATE_IDLE;
             }
@@ -645,12 +623,8 @@ s16 EnGo2_UpdateTalkStateGoronDmtBiggoron(PlayState* play, EnGo2* this) {
                 if ((this->actor.textId == 0x3054) || (this->actor.textId == 0x3055)) {
                     if (play->msgCtx.choiceIndex == 0) {
                         Flags_SetRandomizerInf(RAND_INF_ADULT_TRADES_DMT_TRADE_BROKEN_SWORD);
-                        if (GameInteractor_Should(GI_VB_TRADE_BROKEN_SWORD, true, this)) {
-                            EnGo2_GetItem(this, play, GI_PRESCRIPTION);
-                            this->actionFunc = EnGo2_SetupGetItem;
-                        } else {
-                            this->actionFunc = EnGo2_SetGetItem;
-                        }
+                        EnGo2_GetItem(this, play, GI_PRESCRIPTION);
+                        this->actionFunc = EnGo2_SetupGetItem;
                         return NPC_TALK_STATE_ACTION;
                     }
                     this->actor.textId = 0x3056;
@@ -1056,7 +1030,10 @@ void EnGo2_BiggoronSetTextId(EnGo2* this, PlayState* play, Player* player) {
             }
             player->actor.textId = this->actor.textId;
 
-        } else if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_CLAIM_CHECK) {
+        } else if (
+            !GameInteractor_Should(GI_VB_BIGGORON_CONSIDER_SWORD_COLLECTED, gSaveContext.bgsFlag, NULL) && 
+            (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_CLAIM_CHECK)
+        ) {
             if (func_8002F368(play) == EXCH_ITEM_CLAIM_CHECK) {
                 if (GameInteractor_Should(GI_VB_BIGGORON_CONSIDER_SWORD_FORGED, Environment_GetBgsDayCount() >= 3, NULL)) {
                     textId = 0x305E;
@@ -1193,8 +1170,10 @@ s32 EnGo2_IsCameraModified(EnGo2* this, PlayState* play) {
         (this->actor.params & 0x1F) == GORON_CITY_STAIRWELL || (this->actor.params & 0x1F) == GORON_DMT_BIGGORON ||
         (this->actor.params & 0x1F) == GORON_MARKET_BAZAAR) {
         return true;
-    } else if (GameInteractor_Should(GI_VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE), NULL) &&
-                CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON)) {
+    } else if (
+        !GameInteractor_Should(GI_VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE), NULL) &&
+        GameInteractor_Should(GI_VB_GORONS_CONSIDER_TUNIC_COLLECTED, CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON), NULL)
+    ) {
         return true;
     } else {
         return false;
@@ -1251,8 +1230,10 @@ void EnGo2_SelectGoronWakingUp(EnGo2* this) {
             EnGo2_BiggoronWakingUp(this);
             break;
         case GORON_CITY_LINK:
-            if (GameInteractor_Should(GI_VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE), NULL) &&
-                CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON)) {
+            if (
+                !GameInteractor_Should(GI_VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE), NULL) &&
+                GameInteractor_Should(GI_VB_GORONS_CONSIDER_TUNIC_COLLECTED, CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON), NULL)
+            ) {
                 EnGo2_WakingUp(this);
                 break;
             }
@@ -1349,25 +1330,10 @@ void EnGo2_WakeUp(EnGo2* this, PlayState* play) {
     }
     if ((this->actor.params & 0x1F) == GORON_DMT_BIGGORON) {
         OnePointCutscene_Init(play, 4200, -99, &this->actor, MAIN_CAM);
-        // There is an issue interpolating between ENGO2_ANIM_0 and ENGO2_ANIM_1/10, the goron
-        // is technically in the same position at the end of ANIM_0 and beginning of ANIM_1/10
-        // but something isn't getting translated correctly causing the 360 degree spin before
-        // then continuing the wake up animation like normal. One solution is to use ANIM_0
-        // which uses the same frame data as ANIM_1/10 but no morph frames, but only when the
-        // current animation frame is at 0, meaning no morphing is necessary anyway.
-        // ANIM_13 is ANIM_0 but with the startFrame and mode adjusted for biggoron.
-        if (this->skelAnime.curFrame == 0.0f && !CVarGetInteger("gUnfixGoronSpin", 0)) {
-            Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENGO2_ANIM_13);
-        } else {
-            Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENGO2_ANIM_10);
-        }
+        Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENGO2_ANIM_10);
         this->skelAnime.playSpeed = 0.5f;
     } else {
-        if (this->skelAnime.curFrame == 0.0f && !CVarGetInteger("gUnfixGoronSpin", 0)) {
-            Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENGO2_ANIM_0);
-        } else {
-            Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENGO2_ANIM_1);
-        }
+        Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENGO2_ANIM_1);
         this->skelAnime.playSpeed = 1.0f;
     }
     this->actionFunc = func_80A46B40;
@@ -1589,14 +1555,13 @@ void EnGo2_Init(Actor* thisx, PlayState* play) {
     this->unk_216 = this->actor.shape.rot.z;
     this->trackingMode = NPC_TRACKING_NONE;
     this->path = Path_GetByIndex(play, (this->actor.params & 0x3E0) >> 5, 0x1F);
-    this->getItemEntry = (GetItemEntry)GET_ITEM_NONE;
     switch (this->actor.params & 0x1F) {
         case GORON_CITY_ENTRANCE:
         case GORON_CITY_ISLAND:
         case GORON_CITY_LOWEST_FLOOR:
         case GORON_CITY_STAIRWELL:
         case GORON_CITY_LOST_WOODS:
-            if (GameInteractor_Should(GI_VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE), NULL) && LINK_IS_ADULT) {
+            if (!GameInteractor_Should(GI_VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE), NULL) && LINK_IS_ADULT) {
                 Actor_Kill(&this->actor);
             }
             this->actionFunc = EnGo2_CurledUp;
@@ -1611,8 +1576,10 @@ void EnGo2_Init(Actor* thisx, PlayState* play) {
             if ((Flags_GetInfTable(INFTABLE_GORON_CITY_DOORS_UNLOCKED))) {
                 Path_CopyLastPoint(this->path, &this->actor.world.pos);
                 this->actor.home.pos = this->actor.world.pos;
-                if (GameInteractor_Should(GI_VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE), NULL) &&
-                    CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON)) {
+                if (
+                    !GameInteractor_Should(GI_VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE), NULL) &&
+                    GameInteractor_Should(GI_VB_GORONS_CONSIDER_TUNIC_COLLECTED, CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON), NULL)
+                ) {
                     EnGo2_GetItemAnimation(this, play);
                 } else {
                     this->actionFunc = EnGo2_CurledUp;
@@ -1828,7 +1795,7 @@ void EnGo2_ReverseRolling(EnGo2* this, PlayState* play) {
 }
 
 void EnGo2_SetupGetItem(EnGo2* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_GORON, true, NULL)) {
         this->actor.parent = NULL;
         this->actionFunc = EnGo2_SetGetItem;
     } else {
@@ -1837,30 +1804,29 @@ void EnGo2_SetupGetItem(EnGo2* this, PlayState* play) {
 }
 
 void EnGo2_SetGetItem(EnGo2* this, PlayState* play) {
-    if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) {
+    if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_GORON, true, NULL)) {
         this->interactInfo.talkState = NPC_TALK_STATE_IDLE;
-
-        if (GameInteractor_Should(GI_VB_EN_GO2_RESET_AFTER_GET_ITEM, true, this)) {
-            switch (this->getItemId) {
-                case GI_CLAIM_CHECK:
-                    Environment_ClearBgsDayCount();
-                    EnGo2_GetItemAnimation(this, play);
-                    return;
-                case GI_TUNIC_GORON:
-                    Flags_SetInfTable(INFTABLE_GORON_CITY_DOORS_UNLOCKED);
-                    EnGo2_GetItemAnimation(this, play);
-                    return;
-                case GI_SWORD_BGS:
+        switch (this->getItemId) {
+            case GI_CLAIM_CHECK:
+                Environment_ClearBgsDayCount();
+                EnGo2_GetItemAnimation(this, play);
+                return;
+            case GI_TUNIC_GORON:
+                Flags_SetInfTable(INFTABLE_GORON_CITY_DOORS_UNLOCKED);
+                EnGo2_GetItemAnimation(this, play);
+                return;
+            case GI_SWORD_BGS:
+                if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_GORON, true, NULL)) {
                     gSaveContext.bgsFlag = true;
-                    break;
-                case GI_BOMB_BAG_30:
-                case GI_BOMB_BAG_40:
-                    EnGo2_RollingAnimation(this, play);
-                    this->actionFunc = EnGo2_GoronRollingBigContinueRolling;
-                    return;
-            }
-            this->actionFunc = func_80A46B40;
+                }
+                break;
+            case GI_BOMB_BAG_30:
+            case GI_BOMB_BAG_40:
+                EnGo2_RollingAnimation(this, play);
+                this->actionFunc = EnGo2_GoronRollingBigContinueRolling;
+                return;
         }
+        this->actionFunc = func_80A46B40;
     }
 }
 
@@ -1905,15 +1871,9 @@ void EnGo2_BiggoronEyedrops(EnGo2* this, PlayState* play) {
                 this->trackingMode = NPC_TRACKING_HEAD_AND_TORSO;
                 this->skelAnime.playSpeed = 0.0f;
                 this->skelAnime.curFrame = this->skelAnime.endFrame;
-
                 Flags_SetRandomizerInf(RAND_INF_ADULT_TRADES_DMT_TRADE_EYEDROPS);
-                if(GameInteractor_Should(GI_VB_TRADE_EYEDROPS, true, this)) {
-                    u32 getItemId = GI_CLAIM_CHECK;
-                    EnGo2_GetItem(this, play, getItemId);
-                    this->actionFunc = EnGo2_SetupGetItem;
-                } else {
-                    this->actionFunc = EnGo2_SetGetItem;
-                }
+                EnGo2_GetItem(this, play, GI_CLAIM_CHECK);
+                this->actionFunc = EnGo2_SetupGetItem;
                 this->goronState = 0;
             }
             break;

From 09c967249f8c49cfae85dbafa5778e2226a9d94a Mon Sep 17 00:00:00 2001
From: Garrett Cox <garrettjcox@gmail.com>
Date: Fri, 23 Feb 2024 14:06:27 -0600
Subject: [PATCH 085/230] More 1PC skips

---
 .../Enhancements/timesaver_hook_handlers.cpp  | 29 +++++++++++--------
 .../ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.h     |  3 ++
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/soh/soh/Enhancements/timesaver_hook_handlers.cpp b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
index 84b619ebe..84d95d7f0 100644
--- a/soh/soh/Enhancements/timesaver_hook_handlers.cpp
+++ b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
@@ -20,6 +20,7 @@ extern "C" {
 #include "src/overlays/actors/ovl_En_Tk/z_en_tk.h"
 #include "src/overlays/actors/ovl_En_Fu/z_en_fu.h"
 #include "src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.h"
+#include "src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.h"
 extern SaveContext gSaveContext;
 extern PlayState* gPlayState;
 }
@@ -88,7 +89,8 @@ void EnZl4_SkipToGivingZeldasLetter(EnZl4* enZl4, PlayState* play) {
 static int successChimeCooldown = 0;
 void RateLimitedSuccessChime() {
     if (successChimeCooldown == 0) {
-        func_80078884(NA_SE_SY_CORRECT_CHIME);
+        // Currently disabled, need to find a better way to do this, while being consistent with vanilla
+        // func_80078884(NA_SE_SY_CORRECT_CHIME);
         successChimeCooldown = 120;
     }
 }
@@ -282,25 +284,31 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
                         RateLimitedSuccessChime();
                         break;
                     }
-                    // case ACTOR_PLAYER: // This might cause issues
+                    case ACTOR_BG_HIDAN_KOUSI: {
+                        BgHidanKousi* switchActor = static_cast<BgHidanKousi*>(opt);
+                        BgHidanKousi_SetupAction(switchActor, func_80889C18);
+                        *should = false;
+                        RateLimitedSuccessChime();
+                        break;
+                    }
+                    case ACTOR_BG_HIDAN_FWBIG: {
+                        *should = false;
+                        break;
+                    }
                     case ACTOR_EN_TA:
                     case ACTOR_DOOR_SHUTTER:
+                    case ACTOR_BG_ICE_SHUTTER:
+                    case ACTOR_OBJ_LIGHTSWITCH:
                     case ACTOR_EN_BOX:
                     case ACTOR_OBJ_SYOKUDAI:
                     case ACTOR_OBJ_TIMEBLOCK:
                     case ACTOR_EN_PO_SISTERS:
-                    // Prop
                     case ACTOR_OBJ_ICE_POLY:
                     case ACTOR_BG_YDAN_MARUTA:
                     case ACTOR_BG_SPOT18_SHUTTER:
                     case ACTOR_BG_SPOT05_SOKO:
                     case ACTOR_BG_SPOT18_BASKET:
-                    // BG
-                    // case ACTOR_BG_YDAN_SP:
-                    // case ACTOR_BG_YDAN_HASI:
-                    // case ACTOR_BG_DODOAGO:
-                    // case ACTOR_BG_DDAN_KD:
-                    // case ACTOR_BG_DDAN_JD:
+                    case ACTOR_BG_HIDAN_CURTAIN:
                         *should = false;
                         RateLimitedSuccessChime();
                         break;
@@ -684,14 +692,11 @@ void TimeSaverOnActorInitHandler(void* actorRef) {
     }
 
     if (actor->id == ACTOR_BG_SPOT02_OBJECTS && actor->params == 2) {
-        SPDLOG_INFO("Registering BG_SPOT02 hook");
         bgSpot02UpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* innerActorRef) mutable {
             Actor* innerActor = static_cast<Actor*>(innerActorRef);
             if (innerActor->id == ACTOR_BG_SPOT02_OBJECTS && innerActor->params == 2 && (CVarGetInteger("gTimeSavers.SkipMiscInteractions", IS_RANDO))) {
-                SPDLOG_INFO("on update BG_SPOT02 hook");
                 BgSpot02Objects* bgSpot02 = static_cast<BgSpot02Objects*>(innerActorRef);
                 if (bgSpot02->actionFunc == func_808ACC34) {
-                    SPDLOG_INFO("BGspot02 OVERRIDDEN");
                     bgSpot02->actionFunc = func_808AC908;
                     GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(bgSpot02UpdateHook);
                     GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(bgSpot02KillHook);
diff --git a/soh/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.h b/soh/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.h
index fff8c4c53..1f3eb4161 100644
--- a/soh/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.h
+++ b/soh/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.h
@@ -14,4 +14,7 @@ typedef struct BgHidanKousi {
     /* 0x0168 */ s16 unk_168;
 } BgHidanKousi; // size = 0x016C
 
+void BgHidanKousi_SetupAction(BgHidanKousi* bgHidanKousi, BgHidanKousiActionFunc actionFunc);
+void func_80889C18(BgHidanKousi* bgHidanKousi, PlayState* play);
+
 #endif

From 416ed84bc689fecc1e1b2e62cf7b3353a9711977 Mon Sep 17 00:00:00 2001
From: Garrett Cox <garrettjcox@gmail.com>
Date: Sat, 24 Feb 2024 09:17:48 -0600
Subject: [PATCH 086/230] Migrate great fairy checks

---
 soh/include/z64save.h                         |  2 +-
 .../Enhancements/debugger/debugSaveEditor.h   |  8 +++
 .../game-interactor/GameInteractor.h          |  3 +
 soh/soh/Enhancements/randomizer/location.h    |  2 +-
 .../Enhancements/randomizer/location_list.cpp | 12 ++--
 .../Enhancements/randomizer/randomizer_inf.h  |  7 +++
 .../Enhancements/timesaver_hook_handlers.cpp  | 60 +++++++++++++++++++
 .../ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c       | 38 ++++--------
 .../actors/ovl_En_Ex_Item/z_en_ex_item.h      |  2 +-
 9 files changed, 97 insertions(+), 37 deletions(-)

diff --git a/soh/include/z64save.h b/soh/include/z64save.h
index 0f527925d..617c2acf5 100644
--- a/soh/include/z64save.h
+++ b/soh/include/z64save.h
@@ -283,7 +283,7 @@ typedef struct {
     // #endregion
     // #region SOH [Randomizer]
     // Upstream TODO: Move these to their own struct or name to more obviously specific to Randomizer
-    /*        */ u16 randomizerInf[16];
+    /*        */ u16 randomizerInf[17];
     /*        */ u8 mqDungeonCount;
     /*        */ u16 adultTradeItems;
     /*        */ u8 triforcePiecesCollected;
diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.h b/soh/soh/Enhancements/debugger/debugSaveEditor.h
index 5a4618dac..ff9f9bf8f 100644
--- a/soh/soh/Enhancements/debugger/debugSaveEditor.h
+++ b/soh/soh/Enhancements/debugger/debugSaveEditor.h
@@ -612,6 +612,14 @@ const std::vector<FlagTable> flagTables = {
         { RAND_INF_LINKS_POCKET, "RAND_INF_LINKS_POCKET" },
         { RAND_INF_LEARNED_EPONA_SONG, "RAND_INF_LEARNED_EPONA_SONG" },
         { RAND_INF_DARUNIAS_JOY, "RAND_INF_DARUNIAS_JOY" },
+        { RAND_INF_KING_ZORA_THAWED, "RAND_INF_KING_ZORA_THAWED" },
+        
+        { RAND_INF_HC_GREAT_FAIRY_REWARD, "RAND_INF_HC_GREAT_FAIRY_REWARD" },
+        { RAND_INF_DMT_GREAT_FAIRY_REWARD, "RAND_INF_DMT_GREAT_FAIRY_REWARD" },
+        { RAND_INF_DMC_GREAT_FAIRY_REWARD, "RAND_INF_DMC_GREAT_FAIRY_REWARD" },
+        { RAND_INF_ZF_GREAT_FAIRY_REWARD, "RAND_INF_ZF_GREAT_FAIRY_REWARD" },
+        { RAND_INF_COLOSSUS_GREAT_FAIRY_REWARD, "RAND_INF_COLOSSUS_GREAT_FAIRY_REWARD" },
+        { RAND_INF_OGC_GREAT_FAIRY_REWARD, "RAND_INF_OGC_GREAT_FAIRY_REWARD" },
     } },
 };
 
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h
index 380454e01..478f82712 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h
@@ -209,6 +209,9 @@ typedef enum {
     // Opt: *EnOkarinaTag
     // Vanilla condition: !Flags_GetEventChkInf(EVENTCHKINF_OPENED_THE_DOOR_OF_TIME)
     GI_VB_BE_ELIGIBLE_TO_OPEN_DOT,
+    // Opt: *BgDyYoseizo
+    // Vanilla condition: see soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
+    GI_VB_BE_ELIGIBLE_FOR_GREAT_FAIRY_REWARD,
 
     /*** Play Cutscenes ***/
 
diff --git a/soh/soh/Enhancements/randomizer/location.h b/soh/soh/Enhancements/randomizer/location.h
index ad3142cae..a962e4501 100644
--- a/soh/soh/Enhancements/randomizer/location.h
+++ b/soh/soh/Enhancements/randomizer/location.h
@@ -79,7 +79,7 @@ class SpoilerCollectionCheck {
         return SpoilerCollectionCheck(SPOILER_CHK_MASTER_SWORD, 0x00, 0x00);
     }
 
-    static auto RandomizerInf(const uint8_t flag) {
+    static auto RandomizerInf(const uint16_t flag) {
         return SpoilerCollectionCheck(SPOILER_CHK_RANDOMIZER_INF, 0x00, flag);
     }
 };
diff --git a/soh/soh/Enhancements/randomizer/location_list.cpp b/soh/soh/Enhancements/randomizer/location_list.cpp
index c375f6bea..c58674bae 100644
--- a/soh/soh/Enhancements/randomizer/location_list.cpp
+++ b/soh/soh/Enhancements/randomizer/location_list.cpp
@@ -1297,12 +1297,12 @@ void Rando::StaticData::InitLocationTable() { //
     locationTable[RC_TOT_MASTER_SWORD] =                                            Location::Delayed(RC_TOT_MASTER_SWORD,                                             RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x00, "ToT Master Sword",                            "ToT Master Sword",                                         RHT_TOT_MASTER_SWORD,                                            RG_MASTER_SWORD,                      {},                                                     SpoilerCollectionCheck::EventChkInf(0x45),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
     locationTable[RC_TOT_LIGHT_ARROWS_CUTSCENE] =                                   Location::Delayed(RC_TOT_LIGHT_ARROWS_CUTSCENE,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x01, "ToT Light Arrow Cutscene",                    "ToT Light Arrow Cutscene",                                 RHT_TOT_LIGHT_ARROWS_CUTSCENE,                                   RG_LIGHT_ARROWS,                      {},                                                     SpoilerCollectionCheck::EventChkInf(0xC4),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
     locationTable[RC_LW_GIFT_FROM_SARIA] =                                          Location::Delayed(RC_LW_GIFT_FROM_SARIA,                                           RCQUEST_BOTH,    RCTYPE_OCARINA,                     RCAREA_LOST_WOODS,                   ACTOR_ID_MAX,         SCENE_LOST_WOODS,                   0x00,                                              0x02, "Gift From Saria",                             "LW Gift From Saria",                                       RHT_LW_GIFT_FROM_SARIA,                                          RG_PROGRESSIVE_OCARINA,               {},                                                     SpoilerCollectionCheck::EventChkInf(0xC1),                                                                                    SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
-    locationTable[RC_ZF_GREAT_FAIRY_REWARD] =                                       Location::Delayed(RC_ZF_GREAT_FAIRY_REWARD,                                        RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_FOUNTAIN,               ACTOR_BG_DY_YOSEIZO,  SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 1,                                                 0x10, "Great Fairy Reward",                          "ZF Great Fairy Reward",                                    RHT_ZF_GREAT_FAIRY_REWARD,                                       RG_FARORES_WIND,                      {},                                                     SpoilerCollectionCheck::Chest(0x3D, 0x01),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,               true);
-    locationTable[RC_HC_GREAT_FAIRY_REWARD] =                                       Location::Delayed(RC_HC_GREAT_FAIRY_REWARD,                                        RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_CASTLE,                ACTOR_BG_DY_YOSEIZO,  SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 2,                                                 0x11, "Great Fairy Reward",                          "HC Great Fairy Reward",                                    RHT_HC_GREAT_FAIRY_REWARD,                                       RG_DINS_FIRE,                         {},                                                     SpoilerCollectionCheck::Chest(0x3D, 0x02),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
-    locationTable[RC_COLOSSUS_GREAT_FAIRY_REWARD] =                                 Location::Delayed(RC_COLOSSUS_GREAT_FAIRY_REWARD,                                  RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DESERT_COLOSSUS,              ACTOR_BG_DY_YOSEIZO,  SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 3,                                                 0x12, "Great Fairy Reward",                          "Colossus Great Fairy Reward",                              RHT_COLOSSUS_GREAT_FAIRY_REWARD,                                 RG_NAYRUS_LOVE,                       {},                                                     SpoilerCollectionCheck::Chest(0x3D, 0x03),                                                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
-    locationTable[RC_DMT_GREAT_FAIRY_REWARD] =                                      Location::Delayed(RC_DMT_GREAT_FAIRY_REWARD,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_BG_DY_YOSEIZO,  SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC,  1,                                                 0x13, "Great Fairy Reward",                          "DMT Great Fairy Reward",                                   RHT_DMT_GREAT_FAIRY_REWARD,                                      RG_PROGRESSIVE_MAGIC_METER,           {},                                                     SpoilerCollectionCheck::Chest(0x3B, 0x01),                                                                                    SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,             true);
-    locationTable[RC_DMC_GREAT_FAIRY_REWARD] =                                      Location::Delayed(RC_DMC_GREAT_FAIRY_REWARD,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_BG_DY_YOSEIZO,  SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC,  2,                                                 0x14, "Great Fairy Reward",                          "DMC Great Fairy Reward",                                   RHT_DMC_GREAT_FAIRY_REWARD,                                      RG_PROGRESSIVE_MAGIC_METER,           {},                                                     SpoilerCollectionCheck::Chest(0x3B, 0x02),                                                                                    SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,             true);
-    locationTable[RC_OGC_GREAT_FAIRY_REWARD] =                                      Location::Delayed(RC_OGC_GREAT_FAIRY_REWARD,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_CASTLE,                ACTOR_BG_DY_YOSEIZO,  SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC,  3,                                                 0x15, "OGC Great Fairy Reward",                      "OGC Great Fairy Reward",                                   RHT_OGC_GREAT_FAIRY_REWARD,                                      RG_DOUBLE_DEFENSE,                    {},                                                     SpoilerCollectionCheck::Chest(0x3B, 0x03),                                                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE,      true);
+    locationTable[RC_ZF_GREAT_FAIRY_REWARD] =                                       Location::Delayed(RC_ZF_GREAT_FAIRY_REWARD,                                        RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_FOUNTAIN,               ACTOR_BG_DY_YOSEIZO,  SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 1,                                                 0x10, "Great Fairy Reward",                          "ZF Great Fairy Reward",                                    RHT_ZF_GREAT_FAIRY_REWARD,                                       RG_FARORES_WIND,                      {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZF_GREAT_FAIRY_REWARD),                                                        SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,               true);
+    locationTable[RC_HC_GREAT_FAIRY_REWARD] =                                       Location::Delayed(RC_HC_GREAT_FAIRY_REWARD,                                        RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_CASTLE,                ACTOR_BG_DY_YOSEIZO,  SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 2,                                                 0x11, "Great Fairy Reward",                          "HC Great Fairy Reward",                                    RHT_HC_GREAT_FAIRY_REWARD,                                       RG_DINS_FIRE,                         {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HC_GREAT_FAIRY_REWARD),                                                        SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
+    locationTable[RC_COLOSSUS_GREAT_FAIRY_REWARD] =                                 Location::Delayed(RC_COLOSSUS_GREAT_FAIRY_REWARD,                                  RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DESERT_COLOSSUS,              ACTOR_BG_DY_YOSEIZO,  SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 3,                                                 0x12, "Great Fairy Reward",                          "Colossus Great Fairy Reward",                              RHT_COLOSSUS_GREAT_FAIRY_REWARD,                                 RG_NAYRUS_LOVE,                       {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COLOSSUS_GREAT_FAIRY_REWARD),                                                  SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
+    locationTable[RC_DMT_GREAT_FAIRY_REWARD] =                                      Location::Delayed(RC_DMT_GREAT_FAIRY_REWARD,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_BG_DY_YOSEIZO,  SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC,  1,                                                 0x13, "Great Fairy Reward",                          "DMT Great Fairy Reward",                                   RHT_DMT_GREAT_FAIRY_REWARD,                                      RG_PROGRESSIVE_MAGIC_METER,           {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMT_GREAT_FAIRY_REWARD),                                                       SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,             true);
+    locationTable[RC_DMC_GREAT_FAIRY_REWARD] =                                      Location::Delayed(RC_DMC_GREAT_FAIRY_REWARD,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_BG_DY_YOSEIZO,  SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC,  2,                                                 0x14, "Great Fairy Reward",                          "DMC Great Fairy Reward",                                   RHT_DMC_GREAT_FAIRY_REWARD,                                      RG_PROGRESSIVE_MAGIC_METER,           {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMC_GREAT_FAIRY_REWARD),                                                       SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,             true);
+    locationTable[RC_OGC_GREAT_FAIRY_REWARD] =                                      Location::Delayed(RC_OGC_GREAT_FAIRY_REWARD,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_CASTLE,                ACTOR_BG_DY_YOSEIZO,  SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC,  3,                                                 0x15, "OGC Great Fairy Reward",                      "OGC Great Fairy Reward",                                   RHT_OGC_GREAT_FAIRY_REWARD,                                      RG_DOUBLE_DEFENSE,                    {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_OGC_GREAT_FAIRY_REWARD),                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE,      true);
 
     // Songs
     locationTable[RC_SHEIK_IN_FOREST] =                                             Location::Delayed(RC_SHEIK_IN_FOREST,                                              RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_SACRED_FOREST_MEADOW,         ACTOR_ID_MAX,         SCENE_SACRED_FOREST_MEADOW,         0x00,                                              0x20, "Sheik in Forest",                             "Sheik in Forest",                                          RHT_SHEIK_IN_FOREST,                                             RG_MINUET_OF_FOREST,                  { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(0x50),                                                                                    SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
diff --git a/soh/soh/Enhancements/randomizer/randomizer_inf.h b/soh/soh/Enhancements/randomizer/randomizer_inf.h
index a66827de6..67b396d74 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_inf.h
+++ b/soh/soh/Enhancements/randomizer/randomizer_inf.h
@@ -274,6 +274,13 @@ typedef enum {
     RAND_INF_LEARNED_EPONA_SONG,
     RAND_INF_DARUNIAS_JOY,
     RAND_INF_KING_ZORA_THAWED,
+    
+    RAND_INF_HC_GREAT_FAIRY_REWARD,
+    RAND_INF_DMT_GREAT_FAIRY_REWARD,
+    RAND_INF_DMC_GREAT_FAIRY_REWARD,
+    RAND_INF_ZF_GREAT_FAIRY_REWARD,
+    RAND_INF_COLOSSUS_GREAT_FAIRY_REWARD,
+    RAND_INF_OGC_GREAT_FAIRY_REWARD,
 
     // If you add anything to this list, you need to update the size of randomizerInf in z64save.h to be ceil(RAND_INF_MAX / 16)
 
diff --git a/soh/soh/Enhancements/timesaver_hook_handlers.cpp b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
index 84d95d7f0..ba432796b 100644
--- a/soh/soh/Enhancements/timesaver_hook_handlers.cpp
+++ b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
@@ -21,6 +21,7 @@ extern "C" {
 #include "src/overlays/actors/ovl_En_Fu/z_en_fu.h"
 #include "src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.h"
 #include "src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.h"
+#include "src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h"
 extern SaveContext gSaveContext;
 extern PlayState* gPlayState;
 }
@@ -581,6 +582,47 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
         case GI_VB_BIGGORON_CONSIDER_SWORD_FORGED:
             *should = Environment_GetBgsDayCount() >= CVarGetInteger("gForgeTime", 3);
             break;
+        case GI_VB_BE_ELIGIBLE_FOR_GREAT_FAIRY_REWARD: {
+            BgDyYoseizo* bgDyYoseizo = static_cast<BgDyYoseizo*>(opt);
+            RandomizerInf flag = RAND_INF_MAX;
+
+            if (gPlayState->sceneNum == SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS) {
+                switch (bgDyYoseizo->fountainType) {
+                    case 0:
+                        flag = RAND_INF_ZF_GREAT_FAIRY_REWARD;
+                        break;
+                    case 1:
+                        flag = RAND_INF_HC_GREAT_FAIRY_REWARD;
+                        break;
+                    case 2:
+                        flag = RAND_INF_COLOSSUS_GREAT_FAIRY_REWARD;
+                        break;
+                }
+            } else {
+                switch (bgDyYoseizo->fountainType) {
+                    case 0:
+                        flag = RAND_INF_DMT_GREAT_FAIRY_REWARD;
+                        break;
+                    case 1:
+                        flag = RAND_INF_DMC_GREAT_FAIRY_REWARD;
+                        break;
+                    case 2:
+                        flag = RAND_INF_OGC_GREAT_FAIRY_REWARD;
+                        break;
+                }
+            }
+
+            if (flag != RAND_INF_MAX && (IS_RANDO || CVarGetInteger("gTimeSavers.SkipMiscInteractions", IS_RANDO))) {
+                if (IS_RANDO || *should) {
+                    Flags_SetRandomizerInf(flag);
+                    gSaveContext.healthAccumulator = 0x140;
+                    Magic_Fill(gPlayState);
+                }
+                *should = false;
+            }
+
+            break;
+        }
     }
 }
 
@@ -879,6 +921,24 @@ void TimeSaverOnFlagSetHandler(int16_t flagType, int16_t flag) {
                 case RAND_INF_DUNGEONS_DONE_SPIRIT_TEMPLE:
                     vanillaQueuedItemEntry = Rando::StaticData::RetrieveItem(RG_SPIRIT_MEDALLION).GetGIEntry_Copy();
                     break;
+                case RAND_INF_ZF_GREAT_FAIRY_REWARD:
+                    vanillaQueuedItemEntry = Rando::StaticData::RetrieveItem(RG_FARORES_WIND).GetGIEntry_Copy();
+                    break;
+                case RAND_INF_HC_GREAT_FAIRY_REWARD:
+                    vanillaQueuedItemEntry = Rando::StaticData::RetrieveItem(RG_DINS_FIRE).GetGIEntry_Copy();
+                    break;
+                case RAND_INF_COLOSSUS_GREAT_FAIRY_REWARD:
+                    vanillaQueuedItemEntry = Rando::StaticData::RetrieveItem(RG_NAYRUS_LOVE).GetGIEntry_Copy();
+                    break;
+                case RAND_INF_DMT_GREAT_FAIRY_REWARD:
+                    vanillaQueuedItemEntry = Rando::StaticData::RetrieveItem(RG_MAGIC_SINGLE).GetGIEntry_Copy();
+                    break;
+                case RAND_INF_DMC_GREAT_FAIRY_REWARD:
+                    vanillaQueuedItemEntry = Rando::StaticData::RetrieveItem(RG_MAGIC_DOUBLE).GetGIEntry_Copy();
+                    break;
+                case RAND_INF_OGC_GREAT_FAIRY_REWARD:
+                    vanillaQueuedItemEntry = Rando::StaticData::RetrieveItem(RG_DOUBLE_DEFENSE).GetGIEntry_Copy();
+                    break;
             }
             break;
     }
diff --git a/soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c b/soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
index e8b2be4df..542711f81 100644
--- a/soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
+++ b/soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
@@ -11,6 +11,7 @@
 #include "scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_scene.h"
 #include "scenes/indoors/daiyousei_izumi/daiyousei_izumi_scene.h"
 #include "soh/frame_interpolation.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_WHILE_CULLED | ACTOR_FLAG_DRAW_WHILE_CULLED | ACTOR_FLAG_NO_FREEZE_OCARINA)
 
@@ -68,19 +69,6 @@ const ActorInit Bg_Dy_Yoseizo_InitVars = {
     NULL,
 };
 
-void GivePlayerRandoRewardGreatFairy(BgDyYoseizo* this, PlayState* play) {
-    Player* player = GET_PLAYER(play);
-    GetItemEntry getItemEntry = Randomizer_GetItemFromActor(this->actor.id, play->sceneNum, this->fountainType + 1, GI_NONE);
-
-    if (this->actor.parent == GET_PLAYER(play) && !Flags_GetTreasure(play, this->fountainType + 1) &&
-        !Player_InBlockingCsMode(play, GET_PLAYER(play))) {
-        Flags_SetTreasure(play, this->fountainType + 1);
-        Actor_Kill(&this->actor);
-    } else if (!Flags_GetTreasure(play, this->fountainType + 1)) {
-        GiveItemEntryFromActor(&this->actor, play, getItemEntry, 10000.0f, 100.0f);
-    }
-}
-
 void BgDyYoseizo_Init(Actor* thisx, PlayState* play2) {
     PlayState* play = play2;
     BgDyYoseizo* this = (BgDyYoseizo*)thisx;
@@ -196,31 +184,25 @@ void BgDyYoseizo_Bob(BgDyYoseizo* this, PlayState* play) {
 }
 
 void BgDyYoseizo_CheckMagicAcquired(BgDyYoseizo* this, PlayState* play) {
+    u8 isEligible = true;
     if (Flags_GetSwitch(play, 0x38)) {
         play->msgCtx.ocarinaMode = OCARINA_MODE_04;
 
-        if(IS_RANDO) {
-            gSaveContext.healthAccumulator = 0x140;
-            Magic_Fill(play);
-            if(Flags_GetTreasure(play, this->fountainType + 1)) {
-                Actor_Kill(&this->actor);
-            } else {
-                GivePlayerRandoRewardGreatFairy(this, play);
-            }
-            return;
-        } 
-
         if (play->sceneNum == SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC) {
             if (!gSaveContext.isMagicAcquired && (this->fountainType != FAIRY_UPGRADE_MAGIC)) {
-                Actor_Kill(&this->actor);
-                return;
+                isEligible = false;
             }
         } else {
             if (!gSaveContext.isMagicAcquired) {
-                Actor_Kill(&this->actor);
-                return;
+                isEligible = false;
             }
         }
+
+        if (!GameInteractor_Should(GI_VB_BE_ELIGIBLE_FOR_GREAT_FAIRY_REWARD, isEligible, this)) {
+            Actor_Kill(&this->actor);
+            return;
+        }
+
         func_8002DF54(play, &this->actor, 1);
         this->actionFunc = BgDyYoseizo_ChooseType;
     }
diff --git a/soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h b/soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h
index 34a880c22..d014e19be 100644
--- a/soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h
+++ b/soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h
@@ -6,7 +6,7 @@
 
 struct EnExItem;
 
-typedef void (*EnExItemActionFunc)(struct EnExItem* this, PlayState* play);
+typedef void (*EnExItemActionFunc)(struct EnExItem* enExItem, PlayState* play);
 typedef void (*EnExItemLightFunc)(Actor*, PlayState*, s32);
 
 typedef struct EnExItem {

From c162af818d55d7e7e75c6931dcf5b8ab1ba4734b Mon Sep 17 00:00:00 2001
From: Christopher Leggett <chris@leggett.dev>
Date: Wed, 20 Mar 2024 18:24:58 -0400
Subject: [PATCH 087/230] Fix keysanity Any Dungeon setting. (#4020)

Due to a typo a few months ago, it was accidentally being ignored and
treated as Anywhere. Own Dungeon may have also been doing weird things,
but I'm not entirely sure.
---
 soh/soh/Enhancements/randomizer/3drando/fill.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/fill.cpp b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
index 7f424f758..a23636c91 100644
--- a/soh/soh/Enhancements/randomizer/3drando/fill.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
@@ -893,7 +893,7 @@ static void RandomizeDungeonItems() {
   std::vector<RandomizerGet> overworldItems;
 
   for (auto dungeon : ctx->GetDungeons()->GetDungeonList()) {
-    if (ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_OWN_DUNGEON)) {
+    if (ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_ANY_DUNGEON)) {
       auto dungeonKeys = FilterAndEraseFromPool(ItemPool, [dungeon](const RandomizerGet i){return (i == dungeon->GetSmallKey()) || (i == dungeon->GetKeyRing());});
       AddElementsToPool(anyDungeonItems, dungeonKeys);
     } else if (ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_OVERWORLD)) {

From 0334c4e35484882c09225b29a0f7dfc5642bcae8 Mon Sep 17 00:00:00 2001
From: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Date: Wed, 3 Apr 2024 21:07:42 -0400
Subject: [PATCH 088/230] pull in docs (#97)

* rename `func_8002DF54` to `Player_SetCsActionWithHaltedActors`
* rename `func_8002F434` to `Actor_OfferGetItem`
---
 soh/include/functions.h                       |  6 +-
 .../Enhancements/timesaver_hook_handlers.cpp  |  2 +-
 soh/src/code/z_actor.c                        |  7 +-
 soh/src/code/z_camera.c                       | 12 ++--
 soh/src/code/z_en_item00.c                    |  2 +-
 soh/src/code/z_onepointdemo.c                 | 66 +++++++++----------
 soh/src/code/z_parameter.c                    |  2 +-
 .../actors/ovl_Bg_Breakwall/z_bg_breakwall.c  |  2 +-
 .../ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c       | 18 ++---
 .../ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c   |  8 +--
 .../ovl_Bg_Heavy_Block/z_bg_heavy_block.c     |  2 +-
 .../ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c       |  4 +-
 .../ovl_Bg_Ice_Objects/z_bg_ice_objects.c     |  6 +-
 .../z_bg_mori_kaitenkabe.c                    |  4 +-
 .../actors/ovl_Bg_Po_Event/z_bg_po_event.c    |  4 +-
 .../z_bg_spot00_hanebasi.c                    |  2 +-
 .../actors/ovl_Boss_Dodongo/z_boss_dodongo.c  | 12 ++--
 .../overlays/actors/ovl_Boss_Fd/z_boss_fd.c   | 12 ++--
 .../overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c |  6 +-
 .../actors/ovl_Boss_Ganon/z_boss_ganon.c      | 32 ++++-----
 .../actors/ovl_Boss_Ganon2/z_boss_ganon2.c    | 54 +++++++--------
 .../ovl_Boss_Ganondrof/z_boss_ganondrof.c     |  4 +-
 .../actors/ovl_Boss_Goma/z_boss_goma.c        | 14 ++--
 .../overlays/actors/ovl_Boss_Mo/z_boss_mo.c   | 12 ++--
 .../overlays/actors/ovl_Boss_Sst/z_boss_sst.c |  8 +--
 .../overlays/actors/ovl_Boss_Tw/z_boss_tw.c   | 18 ++---
 .../overlays/actors/ovl_Boss_Va/z_boss_va.c   | 20 +++---
 .../overlays/actors/ovl_Demo_Im/z_demo_im.c   |  2 +-
 .../actors/ovl_Door_Shutter/z_door_shutter.c  |  4 +-
 .../actors/ovl_Door_Warp1/z_door_warp1.c      |  6 +-
 soh/src/overlays/actors/ovl_En_Ani/z_en_ani.c |  4 +-
 .../ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c   | 10 +--
 .../ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c   | 12 ++--
 soh/src/overlays/actors/ovl_En_Cow/z_en_cow.c |  4 +-
 .../overlays/actors/ovl_En_Daiku/z_en_daiku.c |  4 +-
 .../ovl_En_Diving_Game/z_en_diving_game.c     | 20 +++---
 soh/src/overlays/actors/ovl_En_Dns/z_en_dns.c |  2 +-
 .../actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c    |  8 +--
 .../actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c  |  6 +-
 soh/src/overlays/actors/ovl_En_Ds/z_en_ds.c   |  8 +--
 soh/src/overlays/actors/ovl_En_Du/z_en_du.c   | 10 +--
 soh/src/overlays/actors/ovl_En_Elf/z_en_elf.c |  2 +-
 .../actors/ovl_En_Ex_Item/z_en_ex_item.c      |  6 +-
 .../overlays/actors/ovl_En_Fish/z_en_fish.c   |  2 +-
 soh/src/overlays/actors/ovl_En_Fr/z_en_fr.c   |  4 +-
 soh/src/overlays/actors/ovl_En_Gb/z_en_gb.c   |  4 +-
 soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c |  8 +--
 soh/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c |  6 +-
 soh/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c |  6 +-
 .../overlays/actors/ovl_En_GeldB/z_en_geldb.c |  2 +-
 soh/src/overlays/actors/ovl_En_Gm/z_en_gm.c   |  4 +-
 soh/src/overlays/actors/ovl_En_Go/z_en_go.c   |  4 +-
 soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c |  8 +--
 .../actors/ovl_En_Heishi1/z_en_heishi1.c      |  4 +-
 .../actors/ovl_En_Heishi2/z_en_heishi2.c      | 14 ++--
 .../actors/ovl_En_Heishi3/z_en_heishi3.c      |  4 +-
 .../actors/ovl_En_Heishi4/z_en_heishi4.c      |  4 +-
 soh/src/overlays/actors/ovl_En_Hs/z_en_hs.c   |  4 +-
 soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c   |  4 +-
 .../actors/ovl_En_Ice_Hono/z_en_ice_hono.c    |  2 +-
 soh/src/overlays/actors/ovl_En_In/z_en_in.c   |  4 +-
 .../actors/ovl_En_Insect/z_en_insect.c        |  2 +-
 .../overlays/actors/ovl_En_Ishi/z_en_ishi.c   |  4 +-
 soh/src/overlays/actors/ovl_En_Js/z_en_js.c   |  2 +-
 .../actors/ovl_En_Kakasi/z_en_kakasi.c        |  6 +-
 .../actors/ovl_En_Kakasi3/z_en_kakasi3.c      | 10 +--
 soh/src/overlays/actors/ovl_En_Ko/z_en_ko.c   |  2 +-
 soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c   |  6 +-
 soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c |  2 +-
 soh/src/overlays/actors/ovl_En_Mk/z_en_mk.c   |  8 +--
 soh/src/overlays/actors/ovl_En_Ms/z_en_ms.c   |  4 +-
 soh/src/overlays/actors/ovl_En_Niw/z_en_niw.c |  2 +-
 .../actors/ovl_En_Niw_Lady/z_en_niw_lady.c    | 10 +--
 .../overlays/actors/ovl_En_Ossan/z_en_ossan.c |  8 +--
 soh/src/overlays/actors/ovl_En_Owl/z_en_owl.c |  6 +-
 soh/src/overlays/actors/ovl_En_Skj/z_en_skj.c | 12 ++--
 soh/src/overlays/actors/ovl_En_Sth/z_en_sth.c |  2 +-
 .../ovl_En_Syateki_Man/z_en_syateki_man.c     |  4 +-
 soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c   | 18 ++---
 .../ovl_En_Takara_Man/z_en_takara_man.c       |  4 +-
 .../overlays/actors/ovl_En_Toryo/z_en_toryo.c |  2 +-
 .../ovl_En_Wonder_Talk2/z_en_wonder_talk2.c   |  4 +-
 soh/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c |  8 +--
 soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c | 12 ++--
 soh/src/overlays/actors/ovl_En_fHG/z_en_fhg.c |  8 +--
 .../overlays/actors/ovl_Fishing/z_fishing.c   | 14 ++--
 .../actors/ovl_Item_B_Heart/z_item_b_heart.c  |  2 +-
 .../ovl_Item_Etcetera/z_item_etcetera.c       |  4 +-
 .../actors/ovl_Item_Ocarina/z_item_ocarina.c  |  2 +-
 .../actors/ovl_Item_Shield/z_item_shield.c    |  4 +-
 .../actors/ovl_Obj_Tsubo/z_obj_tsubo.c        |  2 +-
 .../actors/ovl_player_actor/z_player.c        | 10 +--
 92 files changed, 359 insertions(+), 360 deletions(-)

diff --git a/soh/include/functions.h b/soh/include/functions.h
index a0df5ba72..13c755cfe 100644
--- a/soh/include/functions.h
+++ b/soh/include/functions.h
@@ -429,7 +429,7 @@ void Actor_MountHorse(PlayState* play, Player* player, Actor* horse);
 s32 func_8002DEEC(Player* player);
 void func_8002DF18(PlayState* play, Player* player);
 s32 func_8002DF38(PlayState* play, Actor* actor, u8 csMode);
-s32 func_8002DF54(PlayState* play, Actor* actor, u8 arg2);
+s32 Player_SetCsActionWithHaltedActors(PlayState* play, Actor* actor, u8 arg2);
 void func_8002DF90(DynaPolyActor* dynaActor);
 void func_8002DFA4(DynaPolyActor* dynaActor, f32 arg1, s16 arg2);
 s32 Player_IsFacingActor(Actor* actor, s16 angle, PlayState* play);
@@ -457,11 +457,11 @@ u32 Actor_TextboxIsClosing(Actor* actor, PlayState* play);
 s8 func_8002F368(PlayState* play);
 void Actor_GetScreenPos(PlayState* play, Actor* actor, s16* x, s16* y);
 u32 Actor_HasParent(Actor* actor, PlayState* play);
-// TODO: Rename the follwing 3 functions using whatever scheme we use when we rename func_8002F434 and func_8002F554.
+// TODO: Rename the follwing 3 functions using whatever scheme we use when we rename Actor_OfferGetItem and func_8002F554.
 s32 GiveItemEntryWithoutActor(PlayState* play, GetItemEntry getItemEntry);
 s32 GiveItemEntryFromActor(Actor* actor, PlayState* play, GetItemEntry getItemEntry, f32 xzRange, f32 yRange);
 s32 GiveItemEntryFromActorWithFixedRange(Actor* actor, PlayState* play, GetItemEntry getItemEntry);
-s32 func_8002F434(Actor* actor, PlayState* play, s32 getItemId, f32 xzRange, f32 yRange);
+s32 Actor_OfferGetItem(Actor* actor, PlayState* play, s32 getItemId, f32 xzRange, f32 yRange);
 void func_8002F554(Actor* actor, PlayState* play, s32 getItemId);
 void func_8002F580(Actor* actor, PlayState* play);
 u32 Actor_HasNoParent(Actor* actor, PlayState* play);
diff --git a/soh/soh/Enhancements/timesaver_hook_handlers.cpp b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
index ba432796b..02decd7ba 100644
--- a/soh/soh/Enhancements/timesaver_hook_handlers.cpp
+++ b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
@@ -464,7 +464,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
                             gPlayState->transitionType = TRANS_TYPE_FADE_WHITE;
                             gPlayState->transitionTrigger = TRANS_TRIGGER_START;
                             gSaveContext.nextTransitionType = 2;
-                            func_8002DF54(gPlayState, &player->actor, 8);
+                            Player_SetCsActionWithHaltedActors(gPlayState, &player->actor, 8);
                         }
                     }
                 });
diff --git a/soh/src/code/z_actor.c b/soh/src/code/z_actor.c
index fed5ec639..e4edcc1d3 100644
--- a/soh/src/code/z_actor.c
+++ b/soh/src/code/z_actor.c
@@ -1462,7 +1462,7 @@ s32 func_8002DF38(PlayState* play, Actor* actor, u8 csAction) {
     return true;
 }
 
-s32 func_8002DF54(PlayState* play, Actor* actor, u8 csAction) {
+s32 Player_SetCsActionWithHaltedActors(PlayState* play, Actor* actor, u8 csAction) {
     Player* player = GET_PLAYER(play);
 
     func_8002DF38(play, actor, csAction);
@@ -2084,9 +2084,8 @@ s32 GiveItemEntryFromActorWithFixedRange(Actor* actor, PlayState* play, GetItemE
     return GiveItemEntryFromActor(actor, play, getItemEntry, 50.0f, 10.0f);
 }
 
-// TODO: Rename to GiveItemIdFromActor or similar
 // If you're doing something for randomizer, you're probably looking for GiveItemEntryFromActor
-s32 func_8002F434(Actor* actor, PlayState* play, s32 getItemId, f32 xzRange, f32 yRange) {
+s32 Actor_OfferGetItem(Actor* actor, PlayState* play, s32 getItemId, f32 xzRange, f32 yRange) {
     Player* player = GET_PLAYER(play);
 
     if (!(player->stateFlags1 & 
@@ -2116,7 +2115,7 @@ s32 func_8002F434(Actor* actor, PlayState* play, s32 getItemId, f32 xzRange, f32
 // TODO: Rename to GiveItemIdFromActorWithFixedRange or similar
 // If you're doing something for randomizer, you're probably looking for GiveItemEntryFromActorWithFixedRange
 void func_8002F554(Actor* actor, PlayState* play, s32 getItemId) {
-    func_8002F434(actor, play, getItemId, 50.0f, 10.0f);
+    Actor_OfferGetItem(actor, play, getItemId, 50.0f, 10.0f);
 }
 
 void func_8002F580(Actor* actor, PlayState* play) {
diff --git a/soh/src/code/z_camera.c b/soh/src/code/z_camera.c
index 90634ea31..b5719d48c 100644
--- a/soh/src/code/z_camera.c
+++ b/soh/src/code/z_camera.c
@@ -6184,14 +6184,14 @@ s32 Camera_Demo5(Camera* camera) {
             pad = camera->play->state.frames - sDemo5PrevAction12Frame;
             if (player->stateFlags1 & PLAYER_STATE1_ITEM_OVER_HEAD) {
                 // holding object over head.
-                func_8002DF54(camera->play, camera->target, 8);
+                Player_SetCsActionWithHaltedActors(camera->play, camera->target, 8);
             } else if (ABS(pad) > 3000) {
-                func_8002DF54(camera->play, camera->target, 12);
+                Player_SetCsActionWithHaltedActors(camera->play, camera->target, 12);
             } else {
-                func_8002DF54(camera->play, camera->target, 69);
+                Player_SetCsActionWithHaltedActors(camera->play, camera->target, 69);
             }
         } else {
-            func_8002DF54(camera->play, camera->target, 1);
+            Player_SetCsActionWithHaltedActors(camera->play, camera->target, 1);
         }
     }
 
@@ -6250,7 +6250,7 @@ s32 Camera_Demo6(Camera* camera) {
             camera->animState++;
         case 1:
             if (stateTimers[camera->animState] < anim->animTimer) {
-                func_8002DF54(camera->play, &camera->player->actor, 8);
+                Player_SetCsActionWithHaltedActors(camera->play, &camera->player->actor, 8);
                 Actor_GetWorld(&focusPosRot, camFocus);
                 anim->atTarget.x = focusPosRot.pos.x;
                 anim->atTarget.y = focusPosRot.pos.y - 20.0f;
@@ -7735,7 +7735,7 @@ void Camera_Finish(Camera* camera) {
             player->stateFlags1 &= ~PLAYER_STATE1_IN_CUTSCENE;
 
             if (player->csAction != 0) {
-                func_8002DF54(camera->play, &player->actor, 7);
+                Player_SetCsActionWithHaltedActors(camera->play, &player->actor, 7);
                 osSyncPrintf("camera: player demo end!!\n");
             }
 
diff --git a/soh/src/code/z_en_item00.c b/soh/src/code/z_en_item00.c
index da7454961..873a91ec9 100644
--- a/soh/src/code/z_en_item00.c
+++ b/soh/src/code/z_en_item00.c
@@ -732,7 +732,7 @@ void func_8001E5C8(EnItem00* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
     if (this->getItemId != GI_NONE) {
         if (!Actor_HasParent(&this->actor, play)) {
-            func_8002F434(&this->actor, play, this->getItemId, 50.0f, 80.0f);
+            Actor_OfferGetItem(&this->actor, play, this->getItemId, 50.0f, 80.0f);
             this->unk_15A++;
         } else {
             this->getItemId = GI_NONE;
diff --git a/soh/src/code/z_onepointdemo.c b/soh/src/code/z_onepointdemo.c
index 4224066c1..24a8820af 100644
--- a/soh/src/code/z_onepointdemo.c
+++ b/soh/src/code/z_onepointdemo.c
@@ -268,7 +268,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
         case 2290: {
             Actor* rideActor = player->rideActor;
 
-            func_8002DF54(play, NULL, 8);
+            Player_SetCsActionWithHaltedActors(play, NULL, 8);
             if (rideActor != NULL) {
                 rideActor->freezeTimer = 180;
             }
@@ -279,7 +279,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
             func_800C0808(play, camIdx, player, CAM_SET_CS_C);
         } break;
         case 5120:
-            func_8002DF54(play, NULL, 8);
+            Player_SetCsActionWithHaltedActors(play, NULL, 8);
 
             csInfo->keyFrames = D_80121314;
             csInfo->keyFrameCnt = 1;
@@ -289,7 +289,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
         case 4510:
             D_8012133C[0].eyeTargetInit = actor->world.pos;
             D_8012133C[0].eyeTargetInit.y = player->actor.world.pos.y + 40.0f;
-            func_8002DF54(play, NULL, 8);
+            Player_SetCsActionWithHaltedActors(play, NULL, 8);
 
             csInfo->keyFrames = D_8012133C;
             csInfo->keyFrameCnt = 3;
@@ -307,7 +307,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
             OnePointCutscene_AddVecSphToVec3f(&spB4, &spC0, &spD0);
             Play_CameraChangeSetting(play, camIdx, CAM_SET_FREE2);
             Play_CameraSetAtEye(play, camIdx, &spC0, &spB4);
-            func_8002DF54(play, NULL, 8);
+            Player_SetCsActionWithHaltedActors(play, NULL, 8);
             csCam->roll = 0;
             csCam->fov = 50.0f;
             if (csCam->childCamIdx != SUBCAM_FREE) {
@@ -321,7 +321,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
             if (Rand_ZeroOne() < 0.0f) {
                 D_801213B4[3].eyeTargetInit.x = -D_801213B4[3].eyeTargetInit.x;
             }
-            func_8002DF54(play, NULL, 8);
+            Player_SetCsActionWithHaltedActors(play, NULL, 8);
 
             csInfo->keyFrames = D_801213B4;
             csInfo->keyFrameCnt = 5;
@@ -374,10 +374,10 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
             Play_CameraSetAtEye(play, camIdx, &spC0, &spB4);
             csCam->roll = 6;
             csCam->fov = 75.0f;
-            func_8002DF54(play, NULL, 8);
+            Player_SetCsActionWithHaltedActors(play, NULL, 8);
             break;
         case 3040:
-            func_8002DF54(play, NULL, 8);
+            Player_SetCsActionWithHaltedActors(play, NULL, 8);
             D_8012151C[0].timerInit = timer - 1;
 
             csInfo->keyFrames = D_8012151C;
@@ -401,7 +401,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
             csInfo->keyFrameCnt = 2;
 
             func_800C0808(play, camIdx, player, CAM_SET_CS_C);
-            func_8002DF54(play, NULL, 8);
+            Player_SetCsActionWithHaltedActors(play, NULL, 8);
             break;
         case 3010:
             D_801215BC[0].timerInit = timer;
@@ -429,7 +429,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
             func_800C0808(play, camIdx, player, CAM_SET_CS_C);
             break;
         case 3090:
-            func_8002DF54(play, NULL, 8);
+            Player_SetCsActionWithHaltedActors(play, NULL, 8);
 
             csInfo->keyFrames = D_80121814;
             csInfo->keyFrameCnt = 4;
@@ -445,14 +445,14 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
             Play_CameraSetAtEye(play, camIdx, &spC0, &spB4);
             csCam->roll = 0;
             csCam->fov = 70.0f;
-            func_8002DF54(play, NULL, 8);
+            Player_SetCsActionWithHaltedActors(play, NULL, 8);
             break;
         case 3380:
         case 3065:
             csInfo->keyFrames = D_801218B4;
             csInfo->keyFrameCnt = 2;
 
-            func_8002DF54(play, NULL, 8);
+            Player_SetCsActionWithHaltedActors(play, NULL, 8);
             func_800C0808(play, camIdx, player, CAM_SET_CS_C);
 
             i = Quake_Add(csCam, 1);
@@ -464,12 +464,12 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
             csInfo->keyFrames = D_80121904;
             csInfo->keyFrameCnt = 2;
 
-            func_8002DF54(play, NULL, 8);
+            Player_SetCsActionWithHaltedActors(play, NULL, 8);
             func_800C0808(play, camIdx, player, CAM_SET_CS_C);
             break;
         case 3050:
             Play_CameraChangeSetting(play, camIdx, CAM_SET_CS_3);
-            func_8002DF54(play, &player->actor, 5);
+            Player_SetCsActionWithHaltedActors(play, &player->actor, 5);
             OnePointCutscene_SetCsCamPoints(csCam, D_80120304 | 0x2000, D_80120300, D_8012013C, D_8012021C);
             func_80078884(NA_SE_SY_CORRECT_CHIME);
             OnePointCutscene_Vec3sToVec3f(&mainCam->at, &D_8012013C[D_801202FC - 2].pos);
@@ -498,14 +498,14 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
             csCam->unk_14C |= 2;
             csInfo->keyFrameCnt = 2;
 
-            func_8002DF54(play, NULL, 8);
+            Player_SetCsActionWithHaltedActors(play, NULL, 8);
             func_800C0808(play, camIdx, player, CAM_SET_CS_C);
             break;
         case 3130:
             csInfo->keyFrames = D_80121A44;
             csInfo->keyFrameCnt = 12;
 
-            func_8002DF54(play, NULL, 8);
+            Player_SetCsActionWithHaltedActors(play, NULL, 8);
             func_800C0808(play, camIdx, player, CAM_SET_CS_C);
             csCam->unk_14C |= 2;
             break;
@@ -636,7 +636,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
             csCam->roll = 0;
             csCam->fov = 75.0f;
             player->actor.shape.rot.y = player->actor.world.rot.y = player->yaw = spD0.yaw + 0x7FFF;
-            func_8002DF54(play, NULL, 8);
+            Player_SetCsActionWithHaltedActors(play, NULL, 8);
             break;
         case 3240:
             D_80121D3C[2].timerInit = timer - 5;
@@ -644,12 +644,12 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
             csInfo->keyFrames = D_80121D3C;
             csInfo->keyFrameCnt = 3;
 
-            func_8002DF54(play, NULL, 8);
+            Player_SetCsActionWithHaltedActors(play, NULL, 8);
             func_800C0808(play, camIdx, player, CAM_SET_CS_C);
             break;
         case 6001:
             Play_CameraChangeSetting(play, camIdx, CAM_SET_CS_3);
-            func_8002DF54(play, NULL, 8);
+            Player_SetCsActionWithHaltedActors(play, NULL, 8);
             Actor_GetWorld(&spA0, actor);
             if (spA0.pos.z > -750.0f) {
                 OnePointCutscene_SetCsCamPoints(csCam, D_801208E8, D_801208E4, D_801206A0, D_80120820);
@@ -680,12 +680,12 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
             csInfo->keyFrames = D_80121DB4;
             csInfo->keyFrameCnt = 9;
 
-            func_8002DF54(play, NULL, 8);
+            Player_SetCsActionWithHaltedActors(play, NULL, 8);
             func_800C0808(play, camIdx, player, CAM_SET_CS_C);
             break;
         case 3310:
             Play_CameraChangeSetting(play, camIdx, CAM_SET_FIRE_STAIRCASE);
-            func_8002DF54(play, NULL, 8);
+            Player_SetCsActionWithHaltedActors(play, NULL, 8);
             Play_CopyCamera(play, camIdx, MAIN_CAM);
 
             i = Quake_Add(csCam, 1);
@@ -718,7 +718,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
             csInfo->keyFrames = D_80121FBC;
             csInfo->keyFrameCnt = 4;
 
-            func_8002DF54(play, NULL, 8);
+            Player_SetCsActionWithHaltedActors(play, NULL, 8);
             func_800C0808(play, camIdx, player, CAM_SET_CS_C);
 
             i = Quake_Add(csCam, 3);
@@ -745,7 +745,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
                 D_801220D4[1].eyeTargetInit.y = 80.0f;
                 D_801220D4[1].eyeTargetInit.x = -D_801220D4[1].eyeTargetInit.x;
             }
-            func_8002DF54(play, NULL, 8);
+            Player_SetCsActionWithHaltedActors(play, NULL, 8);
 
             csInfo->keyFrames = D_801220D4;
             csInfo->keyFrameCnt = 5;
@@ -763,7 +763,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
             csInfo->keyFrames = D_801222B4;
             csInfo->keyFrameCnt = 5;
 
-            func_8002DF54(play, NULL, 8);
+            Player_SetCsActionWithHaltedActors(play, NULL, 8);
             func_800C0808(play, camIdx, player, CAM_SET_CS_C);
 
             i = Quake_Add(csCam, 1);
@@ -787,7 +787,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
             csInfo->keyFrames = D_801223CC;
             csInfo->keyFrameCnt = 6;
 
-            func_8002DF54(play, NULL, 8);
+            Player_SetCsActionWithHaltedActors(play, NULL, 8);
             func_800C0808(play, camIdx, player, CAM_SET_CS_C);
             player->stateFlags1 |= PLAYER_STATE1_IN_CUTSCENE;
             player->actor.freezeTimer = 90;
@@ -801,7 +801,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
             csInfo->keyFrames = D_801224BC;
             csInfo->keyFrameCnt = 7;
 
-            func_8002DF54(play, NULL, 8);
+            Player_SetCsActionWithHaltedActors(play, NULL, 8);
             func_800C0808(play, camIdx, player, CAM_SET_CS_C);
 
             i = Quake_Add(csCam, 1);
@@ -815,7 +815,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
 
             player->actor.shape.rot.y = player->actor.world.rot.y = player->yaw = 0x3FFC;
             func_800C0808(play, camIdx, player, CAM_SET_CS_C);
-            func_8002DF54(play, NULL, 8);
+            Player_SetCsActionWithHaltedActors(play, NULL, 8);
             break;
         case 4110:
             csInfo->keyFrames = D_8012269C;
@@ -825,7 +825,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
             func_800C0808(play, camIdx, player, CAM_SET_CS_C);
             break;
         case 4120:
-            func_8002DF54(play, NULL, 8);
+            Player_SetCsActionWithHaltedActors(play, NULL, 8);
             D_80122714[1].timerInit = 80;
             csInfo->keyFrames = D_80122714;
             csInfo->keyFrameCnt = 4;
@@ -843,7 +843,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
             csInfo->keyFrames = D_801228A4;
             csInfo->keyFrameCnt = 5;
 
-            func_8002DF54(play, NULL, 8);
+            Player_SetCsActionWithHaltedActors(play, NULL, 8);
             Camera_ChangeMode(mainCam, CAM_MODE_NORMAL);
             func_800C0808(play, camIdx, player, CAM_SET_CS_C);
             break;
@@ -851,7 +851,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
             csInfo->keyFrames = D_8012296C;
             csInfo->keyFrameCnt = 4;
 
-            func_8002DF54(play, NULL, 8);
+            Player_SetCsActionWithHaltedActors(play, NULL, 8);
             Camera_ChangeMode(mainCam, CAM_MODE_NORMAL);
             func_800C0808(play, camIdx, player, CAM_SET_CS_C);
             break;
@@ -859,7 +859,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
             csInfo->keyFrames = D_80122A0C;
             csInfo->keyFrameCnt = 2;
 
-            func_8002DF54(play, NULL, 8);
+            Player_SetCsActionWithHaltedActors(play, NULL, 8);
             Camera_ChangeMode(mainCam, CAM_MODE_NORMAL);
             func_800C0808(play, camIdx, player, CAM_SET_CS_C);
             break;
@@ -908,11 +908,11 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
             csInfo->keyFrames = D_80122C8C;
             csInfo->keyFrameCnt = 1;
 
-            func_8002DF54(play, NULL, 8);
+            Player_SetCsActionWithHaltedActors(play, NULL, 8);
             func_800C0808(play, camIdx, player, CAM_SET_CS_C);
             break;
         case 3260:
-            func_8002DF54(play, NULL, 8);
+            Player_SetCsActionWithHaltedActors(play, NULL, 8);
             D_80122CB4[1].timerInit = timer - 5;
 
             csInfo->keyFrames = D_80122CB4;
@@ -921,7 +921,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
             func_800C0808(play, camIdx, player, CAM_SET_CS_C);
             break;
         case 3261:
-            func_8002DF54(play, NULL, 8);
+            Player_SetCsActionWithHaltedActors(play, NULL, 8);
             D_80122D04[1].timerInit = timer - 10;
 
             csInfo->keyFrames = D_80122D04;
diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c
index 21c45a1ae..cb665999e 100644
--- a/soh/src/code/z_parameter.c
+++ b/soh/src/code/z_parameter.c
@@ -6159,7 +6159,7 @@ void Interface_Draw(PlayState* play) {
                                                 gSaveContext.timer2State = 5;
                                                 gSaveContext.cutsceneIndex = 0;
                                                 Message_StartTextbox(play, 0x71B0, NULL);
-                                                func_8002DF54(play, NULL, 8);
+                                                Player_SetCsActionWithHaltedActors(play, NULL, 8);
                                             } else {
                                                 D_8015FFE6 = 40;
                                                 gSaveContext.timer2State = 6;
diff --git a/soh/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c b/soh/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c
index d0fc8864f..8b901339f 100644
--- a/soh/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c
+++ b/soh/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c
@@ -305,7 +305,7 @@ void BgBreakwall_Wait(BgBreakwall* this, PlayState* play) {
             if (GameInteractor_Should(GI_VB_PLAY_ENTRANCE_CS, true, &flag)) {
                 Cutscene_SetSegment(play, gDcOpeningCs);
                 gSaveContext.cutsceneTrigger = 1;
-                func_8002DF54(play, NULL, 0x31);
+                Player_SetCsActionWithHaltedActors(play, NULL, 0x31);
             }
             Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
         }
diff --git a/soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c b/soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
index 542711f81..8e2139aed 100644
--- a/soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
+++ b/soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
@@ -203,7 +203,7 @@ void BgDyYoseizo_CheckMagicAcquired(BgDyYoseizo* this, PlayState* play) {
             return;
         }
 
-        func_8002DF54(play, &this->actor, 1);
+        Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
         this->actionFunc = BgDyYoseizo_ChooseType;
     }
 }
@@ -211,7 +211,7 @@ void BgDyYoseizo_CheckMagicAcquired(BgDyYoseizo* this, PlayState* play) {
 void BgDyYoseizo_ChooseType(BgDyYoseizo* this, PlayState* play) {
     s32 givingReward;
 
-    func_8002DF54(play, &this->actor, 1);
+    Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
     // "Mode"
     osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ もうど ☆☆☆☆☆ %d\n" VT_RST, play->msgCtx.ocarinaMode);
     givingReward = false;
@@ -327,12 +327,12 @@ void BgDyYoseizo_SetupSpinGrow_NoReward(BgDyYoseizo* this, PlayState* play) {
     }
 
     Audio_PlayActorSound2(&this->actor, NA_SE_VO_FR_LAUGH_0);
-    func_8002DF54(play, &this->actor, 1);
+    Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
     this->actionFunc = BgDyYoseizo_SpinGrow_NoReward;
 }
 
 void BgDyYoseizo_SpinGrow_NoReward(BgDyYoseizo* this, PlayState* play) {
-    func_8002DF54(play, &this->actor, 1);
+    Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
     Math_ApproachF(&this->actor.world.pos.y, this->grownHeight, this->heightFraction, 100.0f);
     Math_ApproachF(&this->scale, 0.035f, this->scaleFraction, 0.005f);
     Math_ApproachF(&this->heightFraction, 0.8f, 0.1f, 0.02f);
@@ -358,7 +358,7 @@ void BgDyYoseizo_SpinGrow_NoReward(BgDyYoseizo* this, PlayState* play) {
 void BgDyYoseizo_CompleteSpinGrow_NoReward(BgDyYoseizo* this, PlayState* play) {
     f32 curFrame = this->skelAnime.curFrame;
 
-    func_8002DF54(play, &this->actor, 1);
+    Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
 
     if ((this->frameCount * 1273.0f) <= this->bobTimer) {
         this->bobTimer = 0.0f;
@@ -372,7 +372,7 @@ void BgDyYoseizo_CompleteSpinGrow_NoReward(BgDyYoseizo* this, PlayState* play) {
 }
 
 void BgDyYoseizo_SetupGreetPlayer_NoReward(BgDyYoseizo* this, PlayState* play) {
-    func_8002DF54(play, &this->actor, 1);
+    Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
 
     if (play->sceneNum == SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC) {
         this->frameCount = Animation_GetLastFrame(&gGreatFairySittingAnim);
@@ -392,7 +392,7 @@ void BgDyYoseizo_SetupGreetPlayer_NoReward(BgDyYoseizo* this, PlayState* play) {
 }
 
 void BgDyYoseizo_GreetPlayer_NoReward(BgDyYoseizo* this, PlayState* play) {
-    func_8002DF54(play, &this->actor, 1);
+    Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
     this->bobTimer = this->skelAnime.curFrame * 1273.0f;
 
     if ((this->frameCount * 1273.0f) <= this->bobTimer) {
@@ -560,7 +560,7 @@ void BgDyYoseizo_Vanish(BgDyYoseizo* this, PlayState* play) {
     Actor* findOcarinaSpot;
 
     if (this->vanishTimer == 0) {
-        func_8002DF54(play, &this->actor, 7);
+        Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
         play->envCtx.unk_BF = 0;
         findOcarinaSpot = play->actorCtx.actorLists[ACTORCAT_PROP].head;
 
@@ -582,7 +582,7 @@ void BgDyYoseizo_SetupSpinGrow_Reward(BgDyYoseizo* this, PlayState* play) {
     if (play->csCtx.state != CS_STATE_IDLE) {
         if ((play->csCtx.npcActions[0] != NULL) && (play->csCtx.npcActions[0]->action == 2)) {
             this->actor.draw = BgDyYoseizo_Draw;
-            func_8002DF54(play, &this->actor, 1);
+            Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
             this->finishedSpinGrow = false;
 
             if (play->sceneNum == SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC) {
diff --git a/soh/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c b/soh/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c
index ae8f9cd05..37ff09efc 100644
--- a/soh/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c
+++ b/soh/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c
@@ -241,7 +241,7 @@ void BgGndIceblock_Idle(BgGndIceblock* this, PlayState* play) {
         if (this->dyna.unk_150 > 0.0f) {
             BgGndIceblock_SetNextPosition(this);
             if (Actor_WorldDistXZToPoint(&this->dyna.actor, &this->targetPos) > 1.0f) {
-                func_8002DF54(play, &this->dyna.actor, 8);
+                Player_SetCsActionWithHaltedActors(play, &this->dyna.actor, 8);
                 this->actionFunc = BgGndIceblock_Slide;
             }
         }
@@ -282,7 +282,7 @@ void BgGndIceblock_Fall(BgGndIceblock* this, PlayState* play) {
         thisx->world.pos.y = thisx->home.pos.y - 100.0f;
         thisx->world.pos.z = thisx->home.pos.z;
         if (Player_InCsMode(play)) {
-            func_8002DF54(play, thisx, 7);
+            Player_SetCsActionWithHaltedActors(play, thisx, 7);
         }
         this->actionFunc = BgGndIceblock_Reset;
     }
@@ -295,7 +295,7 @@ void BgGndIceblock_Hole(BgGndIceblock* this, PlayState* play) {
     if (Math_StepToF(&thisx->world.pos.y, thisx->home.pos.y - 100.0f, thisx->velocity.y)) {
         thisx->velocity.y = 0.0f;
         if (Player_InCsMode(play)) {
-            func_8002DF54(play, thisx, 7);
+            Player_SetCsActionWithHaltedActors(play, thisx, 7);
         }
         this->actionFunc = BgGndIceblock_Idle;
     }
@@ -319,7 +319,7 @@ void BgGndIceblock_Slide(BgGndIceblock* this, PlayState* play) {
         switch (BgGndIceblock_NextAction(this)) {
             case GNDICE_IDLE:
                 this->actionFunc = BgGndIceblock_Idle;
-                func_8002DF54(play, thisx, 7);
+                Player_SetCsActionWithHaltedActors(play, thisx, 7);
                 break;
             case GNDICE_FALL:
                 this->actionFunc = BgGndIceblock_Fall;
diff --git a/soh/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c b/soh/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c
index 3b2524e79..97ed090a8 100644
--- a/soh/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c
+++ b/soh/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c
@@ -370,7 +370,7 @@ void BgHeavyBlock_LiftedUp(BgHeavyBlock* this, PlayState* play) {
     this->timer++;
 
     if (!CVarGetInteger("gFasterHeavyBlockLift", 0)) {
-        func_8002DF54(play, &player->actor, 8);
+        Player_SetCsActionWithHaltedActors(play, &player->actor, 8);
     }
 
     // if parent is NULL, link threw it
diff --git a/soh/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c b/soh/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c
index cae8037c6..3e1fd9d78 100644
--- a/soh/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c
+++ b/soh/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c
@@ -138,7 +138,7 @@ void BgHidanDalm_Wait(BgHidanDalm* this, PlayState* play) {
         this->dyna.actor.world.pos.x += 32.5f * Math_SinS(this->dyna.actor.world.rot.y);
         this->dyna.actor.world.pos.z += 32.5f * Math_CosS(this->dyna.actor.world.rot.y);
 
-        func_8002DF54(play, &this->dyna.actor, 8);
+        Player_SetCsActionWithHaltedActors(play, &this->dyna.actor, 8);
         this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_WHILE_CULLED;
         this->actionFunc = BgHidanDalm_Shrink;
         this->dyna.actor.bgCheckFlags &= ~2;
@@ -159,7 +159,7 @@ void BgHidanDalm_Shrink(BgHidanDalm* this, PlayState* play) {
     Vec3f pos;
 
     if (Math_StepToF(&this->dyna.actor.scale.x, 0.0f, 0.004f)) {
-        func_8002DF54(play, &this->dyna.actor, 7);
+        Player_SetCsActionWithHaltedActors(play, &this->dyna.actor, 7);
         Actor_Kill(&this->dyna.actor);
     }
 
diff --git a/soh/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c b/soh/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c
index 1cd91d468..7193d3659 100644
--- a/soh/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c
+++ b/soh/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c
@@ -126,7 +126,7 @@ void BgIceObjects_CheckPits(BgIceObjects* this, PlayState* play) {
             thisx->world.pos.y = thisx->home.pos.y - 60.0f;
             thisx->world.pos.z = thisx->home.pos.z;
             if (thisx->params != 0) {
-                func_8002DF54(play, thisx, 7);
+                Player_SetCsActionWithHaltedActors(play, thisx, 7);
             }
             this->actionFunc = BgIceObjects_Reset;
         }
@@ -143,7 +143,7 @@ void BgIceObjects_Idle(BgIceObjects* this, PlayState* play) {
             BgIceObjects_SetNextTarget(this, play);
             if (Actor_WorldDistXZToPoint(thisx, &this->targetPos) > 1.0f) {
                 thisx->flags |= ACTOR_FLAG_UPDATE_WHILE_CULLED;
-                func_8002DF54(play, thisx, 8);
+                Player_SetCsActionWithHaltedActors(play, thisx, 8);
                 thisx->params = 1;
                 this->actionFunc = BgIceObjects_Slide;
             }
@@ -173,7 +173,7 @@ void BgIceObjects_Slide(BgIceObjects* this, PlayState* play) {
             thisx->flags &= ~ACTOR_FLAG_UPDATE_WHILE_CULLED;
         }
         thisx->params = 0;
-        func_8002DF54(play, thisx, 7);
+        Player_SetCsActionWithHaltedActors(play, thisx, 7);
         Audio_PlayActorSound2(thisx, NA_SE_EV_BLOCK_BOUND);
         if ((fabsf(thisx->world.pos.x + 1387.0f) < 1.0f) && (fabsf(thisx->world.pos.z + 260.0f) < 1.0f)) {
             this->actionFunc = BgIceObjects_Stuck;
diff --git a/soh/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c b/soh/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c
index 8392e7224..f020a462a 100644
--- a/soh/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c
+++ b/soh/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c
@@ -96,7 +96,7 @@ void BgMoriKaitenkabe_Wait(BgMoriKaitenkabe* this, PlayState* play) {
         this->timer++;
         if ((this->timer > (28 - CVarGetInteger("gFasterBlockPush", 0) * 4)) && !Player_InCsMode(play)) {
             BgMoriKaitenkabe_SetupRotate(this);
-            func_8002DF54(play, &this->dyna.actor, 8);
+            Player_SetCsActionWithHaltedActors(play, &this->dyna.actor, 8);
             Math_Vec3f_Copy(&this->lockedPlayerPos, &player->actor.world.pos);
             push.x = Math_SinS(this->dyna.unk_158);
             push.y = 0.0f;
@@ -130,7 +130,7 @@ void BgMoriKaitenkabe_Rotate(BgMoriKaitenkabe* this, PlayState* play) {
     Math_StepToF(&this->rotSpeed, 0.6f, 0.02f);
     if (Math_StepToF(&this->rotYdeg, this->rotDirection * 45.0f, this->rotSpeed)) {
         BgMoriKaitenkabe_SetupWait(this);
-        func_8002DF54(play, thisx, 7);
+        Player_SetCsActionWithHaltedActors(play, thisx, 7);
         if (this->rotDirection > 0.0f) {
             thisx->home.rot.y += 0x2000;
         } else {
diff --git a/soh/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c b/soh/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c
index a2fca0db7..08d4fc773 100644
--- a/soh/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c
+++ b/soh/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c
@@ -321,7 +321,7 @@ void BgPoEvent_BlockFall(BgPoEvent* this, PlayState* play) {
             if (firstFall == 0) {
                 firstFall = 1;
             } else {
-                func_8002DF54(play, &GET_PLAYER(play)->actor, 7);
+                Player_SetCsActionWithHaltedActors(play, &GET_PLAYER(play)->actor, 7);
             }
         }
         this->direction = 0;
@@ -358,7 +358,7 @@ void BgPoEvent_BlockIdle(BgPoEvent* this, PlayState* play) {
             if (sBgPoEventPuzzleState == 0x10) {
                 sBgPoEventPuzzleState = 0x40;
                 Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_BLOCK_RISING);
-                func_8002DF54(play, &player->actor, 8);
+                Player_SetCsActionWithHaltedActors(play, &player->actor, 8);
             }
         } else if (this->dyna.unk_150 != 0.0f) {
             if (this->direction == 0) {
diff --git a/soh/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c b/soh/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c
index 0fb728661..675bbb3ed 100644
--- a/soh/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c
+++ b/soh/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c
@@ -223,7 +223,7 @@ void BgSpot00Hanebasi_Update(Actor* thisx, PlayState* play) {
                     Flags_SetEventChkInf(EVENTCHKINF_ZELDA_FLED_HYRULE_CASTLE);
                     Flags_SetEventChkInf(EVENTCHKINF_DRAWBRIDGE_OPENED_AFTER_ZELDA_FLED);
                     this->actionFunc = BgSpot00Hanebasi_DoNothing;
-                    func_8002DF54(play, &player->actor, 8);
+                    Player_SetCsActionWithHaltedActors(play, &player->actor, 8);
                     play->nextEntranceIndex = ENTR_HYRULE_FIELD_0;
                     gSaveContext.nextCutsceneIndex = 0xFFF1;
                     play->transitionTrigger = TRANS_TRIGGER_START;
diff --git a/soh/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c b/soh/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c
index 30455e8e5..a825f67d7 100644
--- a/soh/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c
+++ b/soh/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c
@@ -443,7 +443,7 @@ void BossDodongo_IntroCutscene(BossDodongo* this, PlayState* play) {
             break;
         case 1:
             func_80064520(play, &play->csCtx);
-            func_8002DF54(play, &this->actor, 1);
+            Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
             Play_ClearAllSubCameras(play);
             this->cutsceneCamera = Play_CreateSubCamera(play);
             Play_ChangeCameraStatus(play, 0, 1);
@@ -470,11 +470,11 @@ void BossDodongo_IntroCutscene(BossDodongo* this, PlayState* play) {
             }
 
             if (this->unk_198 == 110) {
-                func_8002DF54(play, &this->actor, 9);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 9);
             }
 
             if (this->unk_198 == 5) {
-                func_8002DF54(play, &this->actor, 12);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 12);
             }
 
             if (this->unk_198 < 6) {
@@ -589,7 +589,7 @@ void BossDodongo_IntroCutscene(BossDodongo* this, PlayState* play) {
                 func_800C08AC(play, this->cutsceneCamera, 0);
                 this->cutsceneCamera = 0;
                 func_80064534(play, &play->csCtx);
-                func_8002DF54(play, &this->actor, 7);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
                 BossDodongo_SetupWalk(this);
                 this->unk_1DA = 50;
                 this->unk_1BC = 0;
@@ -1535,7 +1535,7 @@ void BossDodongo_DeathCutscene(BossDodongo* this, PlayState* play) {
         case 0:
             this->csState = 5;
             func_80064520(play, &play->csCtx);
-            func_8002DF54(play, &this->actor, 1);
+            Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
             this->cutsceneCamera = Play_CreateSubCamera(play);
             Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_UNK3);
             Play_ChangeCameraStatus(play, this->cutsceneCamera, CAM_STAT_ACTIVE);
@@ -1850,7 +1850,7 @@ void BossDodongo_DeathCutscene(BossDodongo* this, PlayState* play) {
                 this->csState = 100;
                 Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_ACTIVE);
                 func_80064534(play, &play->csCtx);
-                func_8002DF54(play, &this->actor, 7);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
                 if (!IS_BOSS_RUSH) {
                     Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, -890.0f, -1523.76f, -3304.0f, 0, 0, 0, WARP_DUNGEON_CHILD);
                 } else {
diff --git a/soh/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c b/soh/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c
index 0d33533ae..72908fd2f 100644
--- a/soh/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c
+++ b/soh/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c
@@ -323,7 +323,7 @@ void BossFd_Fly(BossFd* this, PlayState* play) {
 
                     this->introState = BFD_CS_START;
                     func_80064520(play, &play->csCtx);
-                    func_8002DF54(play, &this->actor, 8);
+                    Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
                     this->introCamera = Play_CreateSubCamera(play);
                     Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT);
                     Play_ChangeCameraStatus(play, this->introCamera, CAM_STAT_ACTIVE);
@@ -399,7 +399,7 @@ void BossFd_Fly(BossFd* this, PlayState* play) {
                     Math_ApproachF(&this->camData.shake, 2.0f, 1.0f, 0.8 * 0.01f);
                 }
                 if (this->timers[0] == 40) {
-                    func_8002DF54(play, &this->actor, 0x13);
+                    Player_SetCsActionWithHaltedActors(play, &this->actor, 0x13);
                 }
                 if (this->timers[0] == 0) {
                     this->introState = BFD_CS_LOOK_GROUND;
@@ -428,7 +428,7 @@ void BossFd_Fly(BossFd* this, PlayState* play) {
                     this->timers[0] = 170;
                     this->camData.speedMod = 0.0f;
                     this->camData.accel = 0.0f;
-                    func_8002DF54(play, &this->actor, 0x14);
+                    Player_SetCsActionWithHaltedActors(play, &this->actor, 0x14);
                 }
                 break;
             case BFD_CS_COLLAPSE:
@@ -478,7 +478,7 @@ void BossFd_Fly(BossFd* this, PlayState* play) {
                 if (this->timers[3] == 190) {
                     this->camData.atMaxVel.x = this->camData.atMaxVel.y = this->camData.atMaxVel.z = 0.05f;
                     this->platformSignal = VBSIMA_KILL;
-                    func_8002DF54(play, &this->actor, 1);
+                    Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
                 }
                 if (this->actor.world.pos.y > 120.0f) {
                     this->camData.nextAt = this->actor.world.pos;
@@ -546,7 +546,7 @@ void BossFd_Fly(BossFd* this, PlayState* play) {
                     func_800C08AC(play, this->introCamera, 0);
                     this->introState = this->introFlyState = this->introCamera = BFD_CS_NONE;
                     func_80064534(play, &play->csCtx);
-                    func_8002DF54(play, &this->actor, 7);
+                    Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
                     this->actionFunc = BossFd_Wait;
                     this->handoffSignal = FD2_SIGNAL_GROUND;
                     Flags_SetEventChkInf(EVENTCHKINF_BEGAN_VOLVAGIA_BATTLE);
@@ -854,7 +854,7 @@ void BossFd_Fly(BossFd* this, PlayState* play) {
                         this->work[BFD_CAM_SHAKE_TIMER] = 20;
                         Audio_PlaySoundGeneral(NA_SE_EN_VALVAISA_LAND2, &this->actor.projectedPos, 4, &D_801333E0,
                                                &D_801333E0, &D_801333E8);
-                        func_8002DF54(play, &this->actor, 5);
+                        Player_SetCsActionWithHaltedActors(play, &this->actor, 5);
                         for (i1 = 0; i1 < 15; i1++) {
                             Vec3f sp144 = { 0.0f, 0.0f, 0.0f };
                             Vec3f sp138 = { 0.0f, 0.0f, 0.0f };
diff --git a/soh/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c b/soh/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c
index fb14c5ebe..2a03f1839 100644
--- a/soh/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c
+++ b/soh/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c
@@ -661,7 +661,7 @@ void BossFd2_Death(BossFd2* this, PlayState* play) {
         case DEATH_START:
             this->deathState = DEATH_RETREAT;
             func_80064520(play, &play->csCtx);
-            func_8002DF54(play, &this->actor, 1);
+            Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
             this->deathCamera = Play_CreateSubCamera(play);
             Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT);
             Play_ChangeCameraStatus(play, this->deathCamera, CAM_STAT_ACTIVE);
@@ -754,7 +754,7 @@ void BossFd2_Death(BossFd2* this, PlayState* play) {
                     this->work[FD2_ACTION_STATE]++;
                     this->camData.speedMod = 0.0f;
                     this->camData.accel = 0.02f;
-                    func_8002DF54(play, &bossFd->actor, 1);
+                    Player_SetCsActionWithHaltedActors(play, &bossFd->actor, 1);
                 }
             }
             if ((bossFd->work[BFD_ACTION_STATE] == BOSSFD_BONES_FALL) && (bossFd->timers[0] == 5)) {
@@ -788,7 +788,7 @@ void BossFd2_Death(BossFd2* this, PlayState* play) {
                 func_800C08AC(play, this->deathCamera, 0);
                 this->deathCamera = 0;
                 func_80064534(play, &play->csCtx);
-                func_8002DF54(play, &this->actor, 7);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
                 if (!IS_BOSS_RUSH) {
                     Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, 0.0f, 100.0f, 0.0f, 0, 0,
                                        0, WARP_DUNGEON_ADULT);
diff --git a/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c b/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c
index 97551ca46..b1c45feed 100644
--- a/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c
+++ b/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c
@@ -564,7 +564,7 @@ void BossGanon_IntroCutscene(BossGanon* this, PlayState* play) {
             this->actor.shape.rot.y = 0;
 
             func_80064520(play, &play->csCtx);
-            func_8002DF54(play, &this->actor, 8);
+            Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
             this->csCamIndex = Play_CreateSubCamera(play);
             Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT);
             Play_ChangeCameraStatus(play, this->csCamIndex, CAM_STAT_ACTIVE);
@@ -609,7 +609,7 @@ void BossGanon_IntroCutscene(BossGanon* this, PlayState* play) {
             BossGanon_SetIntroCsCamera(this, 1);
 
             if (this->csTimer == 10) {
-                func_8002DF54(play, &this->actor, 5);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 5);
             }
 
             if (this->csTimer == 13) {
@@ -642,7 +642,7 @@ void BossGanon_IntroCutscene(BossGanon* this, PlayState* play) {
                 break;
             }
 
-            func_8002DF54(play, &this->actor, 8);
+            Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
             this->csState = 4;
             BossGanon_SetIntroCsCamera(this, 2);
             this->csTimer = 0;
@@ -674,7 +674,7 @@ void BossGanon_IntroCutscene(BossGanon* this, PlayState* play) {
             }
 
             if (this->csTimer == 10) {
-                func_8002DF54(play, &this->actor, 0x4B);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 0x4B);
             }
 
             if (this->csTimer == 70) {
@@ -740,7 +740,7 @@ void BossGanon_IntroCutscene(BossGanon* this, PlayState* play) {
 
             this->csState = 9;
             this->csTimer = 0;
-            func_8002DF54(play, &this->actor, 8);
+            Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
             sBossGanonZelda->unk_3C8 = 0;
             this->triforceType = GDF_TRIFORCE_ZELDA;
             this->fwork[GDF_TRIFORCE_SCALE] = 10.0f;
@@ -794,7 +794,7 @@ void BossGanon_IntroCutscene(BossGanon* this, PlayState* play) {
             player->actor.world.pos.z = 20.0f;
 
             if (this->csTimer == 20) {
-                func_8002DF54(play, &this->actor, 0x17);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 0x17);
                 Interface_ChangeAlpha(11); // show hearts only
             }
 
@@ -1031,7 +1031,7 @@ void BossGanon_IntroCutscene(BossGanon* this, PlayState* play) {
             }
 
             if (this->csTimer == 30) {
-                func_8002DF54(play, &this->actor, 0x4A);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 0x4A);
             }
 
             if (this->csTimer <= 50) {
@@ -1154,7 +1154,7 @@ void BossGanon_IntroCutscene(BossGanon* this, PlayState* play) {
                 func_800C08AC(play, this->csCamIndex, 0);
                 this->csState = this->csCamIndex = 0;
                 func_80064534(play, &play->csCtx);
-                func_8002DF54(play, &this->actor, 7);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
                 BossGanon_SetupWait(this, play);
             }
 
@@ -1267,7 +1267,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, PlayState* play) {
     switch (this->csState) {
         case 0:
             func_80064520(play, &play->csCtx);
-            func_8002DF54(play, &this->actor, 8);
+            Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
             this->csCamIndex = Play_CreateSubCamera(play);
             Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT);
             Play_ChangeCameraStatus(play, this->csCamIndex, CAM_STAT_ACTIVE);
@@ -1510,7 +1510,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, PlayState* play) {
             Audio_PlayActorSound2(&this->actor, NA_SE_EN_GANON_BODY_SPARK - SFX_FLAG);
 
             if (this->csTimer == 2) {
-                func_8002DF54(play, &this->actor, 0x39);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 0x39);
             }
 
             if (this->csTimer > 50) {
@@ -1552,7 +1552,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, PlayState* play) {
 
         case 100:
             func_80064520(play, &play->csCtx);
-            func_8002DF54(play, &this->actor, 8);
+            Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
             this->csCamIndex = Play_CreateSubCamera(play);
             Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT);
             Play_ChangeCameraStatus(play, this->csCamIndex, CAM_STAT_ACTIVE);
@@ -1651,11 +1651,11 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, PlayState* play) {
             this->csCamAt.z = -135.0f;
 
             if (this->csTimer == 5) {
-                func_8002DF54(play, &this->actor, 0x4C);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 0x4C);
             }
 
             if (this->csTimer == 70) {
-                func_8002DF54(play, &this->actor, 0x4D);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 0x4D);
             }
 
             if (this->csTimer == 90) {
@@ -1754,7 +1754,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, PlayState* play) {
 
             if (this->csTimer == 20) {
                 sBossGanonZelda->unk_3C8 = 5;
-                func_8002DF54(play, &this->actor, 0x39);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 0x39);
             }
 
             if (this->csTimer == 40) {
@@ -1821,7 +1821,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, PlayState* play) {
                 this->csState = 107;
                 this->csTimer = 0;
                 Message_StartTextbox(play, 0x70D2, NULL);
-                func_8002DF54(play, &this->actor, 0x39);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 0x39);
             }
             break;
 
@@ -1863,7 +1863,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, PlayState* play) {
                 this->csState = 109;
                 this->csCamIndex = 0;
                 func_80064534(play, &play->csCtx);
-                func_8002DF54(play, &this->actor, 7);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
                 Flags_SetSwitch(play, 0x37);
             }
             break;
diff --git a/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c b/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c
index ba4a4fbc6..28febacd4 100644
--- a/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c
+++ b/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c
@@ -228,7 +228,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
             objectIdx = Object_GetIndex(&play->objectCtx, OBJECT_GANON_ANIME3);
             if (Object_IsLoaded(&play->objectCtx, objectIdx)) {
                 func_80064520(play, &play->csCtx);
-                func_8002DF54(play, &this->actor, 8);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
                 this->unk_39E = Play_CreateSubCamera(play);
                 Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT);
                 Play_ChangeCameraStatus(play, this->unk_39E, CAM_STAT_ACTIVE);
@@ -306,11 +306,11 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
             }
             if (this->csTimer == 40) {
                 sBossGanon2Zelda->unk_3C8 = 1;
-                func_8002DF54(play, &this->actor, 0x4E);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 0x4E);
             }
             if (this->csTimer == 85) {
                 sBossGanon2Zelda->unk_3C8 = 2;
-                func_8002DF54(play, &this->actor, 0x4F);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 0x4F);
             }
             this->unk_3A4.x = 930.0f;
             this->unk_3A4.y = 1129.0f;
@@ -339,14 +339,14 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
             }
             if (this->csTimer == 20) {
                 sBossGanon2Zelda->unk_3C8 = 3;
-                func_8002DF54(play, &this->actor, 0x50);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 0x50);
             }
             if (this->csTimer == 55) {
                 this->csState = 4;
                 this->csTimer = 0;
                 this->unk_410.x = 0.0f;
                 sBossGanon2Zelda->unk_3C8 = 4;
-                func_8002DF54(play, &this->actor, 0x50);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 0x50);
             }
             break;
         case 4:
@@ -363,7 +363,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
                 func_800C08AC(play, this->unk_39E, 0);
                 this->unk_39E = 0;
                 func_80064534(play, &play->csCtx);
-                func_8002DF54(play, &this->actor, 7);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
                 this->csState = 5;
                 this->csTimer = 0;
             }
@@ -409,7 +409,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
             }
             if (this->csTimer == 30) {
                 sBossGanon2Zelda->unk_3C8 = 5;
-                func_8002DF54(play, &this->actor, 0x51);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 0x51);
             }
             if (this->csTimer == 50) {
                 this->csTimer = 0;
@@ -440,7 +440,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
                 func_80078884(NA_SE_EV_STONE_BOUND);
             }
             if (this->csTimer == 30) {
-                func_8002DF54(play, &this->actor, 0x52);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 0x52);
             }
             if (this->csTimer == 50) {
                 this->csTimer = 0;
@@ -505,7 +505,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
             this->unk_3B0.y = player->actor.world.pos.y;
             this->unk_3B0.z = player->actor.world.pos.z - 200.0f;
             if (this->csTimer == 20) {
-                func_8002DF54(play, &this->actor, 0x1E);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 0x1E);
             }
             if (this->csTimer == 60) {
                 this->unk_3A4.x = (this->actor.world.pos.x + 200.0f) - 154.0f;
@@ -593,7 +593,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
                 SkelAnime_Free(&this->skelAnime, play);
                 SkelAnime_InitFlex(play, &this->skelAnime, &gGanonSkel, NULL, NULL, NULL, 0);
                 BossGanon2_SetObjectSegment(this, play, OBJECT_GANON_ANIME3, false);
-                func_8002DF54(play, &this->actor, 0x54);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 0x54);
                 this->unk_314 = 3;
 
                 // At this point, the actor has Ganon's skeleton but is still playing an animation for Ganondorf. This
@@ -657,7 +657,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
                 this->actor.world.pos.x += 250;
                 this->actor.world.pos.y = 1886.0f;
                 this->unk_394 = 0.0f;
-                func_8002DF54(play, &this->actor, 0x53);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 0x53);
                 this->unk_30C = 5.0f;
                 this->unk_228 = 1.0f;
             }
@@ -742,7 +742,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
             if (this->csTimer == 215) {
                 this->csState = 23;
                 this->unk_224 = 0.0f;
-                func_8002DF54(play, &this->actor, 0x55);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 0x55);
             }
             break;
         case 23:
@@ -762,7 +762,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
             this->unk_3B0.z = player->actor.world.pos.z;
             if (this->csTimer == 228) {
                 func_80078884(NA_SE_IT_SHIELD_REFLECT_SW);
-                func_8002DF54(play, &this->actor, 0x56);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 0x56);
                 func_800A9F6C(0.0f, 0xFF, 0xA, 0x32);
             }
             if (this->csTimer >= 229) {
@@ -799,7 +799,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
                 func_80078884(NA_SE_IT_SWORD_SWING);
             }
             if (this->csTimer == 25) {
-                func_8002DF54(play, &this->actor, 0x57);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 0x57);
                 this->csState = 25;
                 this->csTimer = 0;
             }
@@ -846,7 +846,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
         case 27:
             this->unk_3BC.z = 0.0f;
             if (this->csTimer == 4) {
-                func_8002DF54(play, &this->actor, 0x58);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 0x58);
             }
             this->unk_3A4.x = player->actor.world.pos.x - 20.0f;
             this->unk_3A4.y = player->actor.world.pos.y + 50.0f;
@@ -919,7 +919,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
                 func_800C08AC(play, this->unk_39E, 0);
                 this->unk_39E = 0;
                 func_80064534(play, &play->csCtx);
-                func_8002DF54(play, &this->actor, 7);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
                 this->csState = 0;
                 this->unk_337 = 1;
                 func_808FFDB0(this, play);
@@ -1340,7 +1340,7 @@ void func_80900890(BossGanon2* this, PlayState* play) {
             this->unk_39E = Play_CreateSubCamera(play);
             Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT);
             Play_ChangeCameraStatus(play, this->unk_39E, CAM_STAT_ACTIVE);
-            func_8002DF54(play, &this->actor, 8);
+            Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
             this->csState = 1;
             this->unk_3A4 = sp4C->eye;
             this->unk_3B0 = sp4C->at;
@@ -1388,7 +1388,7 @@ void func_80900890(BossGanon2* this, PlayState* play) {
                 func_800C08AC(play, this->unk_39E, 0);
                 this->unk_39E = 0;
                 func_80064534(play, &play->csCtx);
-                func_8002DF54(play, &this->actor, 7);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
                 this->csState = 3;
             }
             break;
@@ -1399,7 +1399,7 @@ void func_80900890(BossGanon2* this, PlayState* play) {
             Play_ChangeCameraStatus(play, this->unk_39E, CAM_STAT_ACTIVE);
             this->csState = 11;
             this->unk_334 = 1;
-            func_8002DF54(play, &this->actor, 0x60);
+            Player_SetCsActionWithHaltedActors(play, &this->actor, 0x60);
             this->csTimer = 0;
         case 11:
             player->actor.world.pos.x = sBossGanon2Zelda->actor.world.pos.x + 50.0f + 10.0f;
@@ -1420,7 +1420,7 @@ void func_80900890(BossGanon2* this, PlayState* play) {
                 func_800C08AC(play, this->unk_39E, 0);
                 this->unk_39E = 0;
                 func_80064534(play, &play->csCtx);
-                func_8002DF54(play, &this->actor, 7);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
             }
             break;
     }
@@ -1536,7 +1536,7 @@ void func_8090120C(BossGanon2* this, PlayState* play) {
             this->unk_39E = Play_CreateSubCamera(play);
             Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT);
             Play_ChangeCameraStatus(play, this->unk_39E, CAM_STAT_ACTIVE);
-            func_8002DF54(play, &this->actor, 8);
+            Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
             this->csState = 1;
             this->csTimer = 0;
             sBossGanon2Zelda->unk_3C8 = 9;
@@ -1572,7 +1572,7 @@ void func_8090120C(BossGanon2* this, PlayState* play) {
                 this->skelAnime.playSpeed = 3.0f;
             }
             if (this->csTimer == 120) {
-                func_8002DF54(play, &this->actor, 0x63);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 0x63);
             }
             this->actor.world.rot.y = 0x4000;
             this->actor.world.pos.x = this->actor.world.pos.z = 0.0f;
@@ -1640,7 +1640,7 @@ void func_8090120C(BossGanon2* this, PlayState* play) {
                 this->csState = 5;
                 this->csTimer = 40;
                 this->skelAnime.playSpeed = 1.0f;
-                func_8002DF54(play, &this->actor, 0x64);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 0x64);
             }
             break;
         case 5:
@@ -1654,10 +1654,10 @@ void func_8090120C(BossGanon2* this, PlayState* play) {
                 Math_ApproachZeroF(&this->unk_38C, 1.0f, 8.0f);
             }
             if (this->csTimer == 70) {
-                func_8002DF54(play, &this->actor, 0x65);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 0x65);
             }
             if (this->csTimer == 150) {
-                func_8002DF54(play, &this->actor, 0x66);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 0x66);
             }
             this->unk_30C = 10.0f;
             player->actor.world.pos.x = 250.0f;
@@ -1676,7 +1676,7 @@ void func_8090120C(BossGanon2* this, PlayState* play) {
                 func_800C08AC(play, this->unk_39E, 0);
                 this->unk_39E = 0;
                 func_80064534(play, &play->csCtx);
-                func_8002DF54(play, &this->actor, 7);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
                 this->csState = 6;
             }
             break;
@@ -1764,7 +1764,7 @@ void func_8090120C(BossGanon2* this, PlayState* play) {
             if (this->csTimer == 55) {
                 Animation_MorphToPlayOnce(&this->skelAnime, &gGanonDeadStartAnim, 0.0f);
                 this->unk_194 = Animation_GetLastFrame(&gGanonDeadStartAnim);
-                func_8002DF54(play, &this->actor, 0x62);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 0x62);
                 this->csState = 8;
                 this->csTimer = 1000;
             }
diff --git a/soh/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c b/soh/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c
index 111380f0b..82fe2c131 100644
--- a/soh/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c
+++ b/soh/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c
@@ -926,7 +926,7 @@ void BossGanondrof_Death(BossGanondrof* this, PlayState* play) {
     switch (this->deathState) {
         case DEATH_START:
             func_80064520(play, &play->csCtx);
-            func_8002DF54(play, &this->actor, 1);
+            Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
             this->deathCamera = Play_CreateSubCamera(play);
             Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT);
             osSyncPrintf("7\n");
@@ -1104,7 +1104,7 @@ void BossGanondrof_Death(BossGanondrof* this, PlayState* play) {
                 func_800C08AC(play, this->deathCamera, 0);
                 this->deathCamera = 0;
                 func_80064534(play, &play->csCtx);
-                func_8002DF54(play, &this->actor, 7);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
                 if (!IS_BOSS_RUSH) {
                     Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, GND_BOSSROOM_CENTER_X, GND_BOSSROOM_CENTER_Y,
                                 GND_BOSSROOM_CENTER_Z + 200.0f, 0, 0, 0, 0, true);
diff --git a/soh/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c b/soh/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c
index 6de72fd2d..489350ad0 100644
--- a/soh/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c
+++ b/soh/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c
@@ -628,7 +628,7 @@ void BossGoma_SetupEncounterState4(BossGoma* this, PlayState* play) {
     this->actionState = 4;
     this->actor.flags |= ACTOR_FLAG_TARGETABLE;
     func_80064520(play, &play->csCtx);
-    func_8002DF54(play, &this->actor, 1);
+    Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
     this->subCameraId = Play_CreateSubCamera(play);
     Play_ChangeCameraStatus(play, 0, 3);
     Play_ChangeCameraStatus(play, this->subCameraId, 7);
@@ -685,7 +685,7 @@ void BossGoma_Encounter(BossGoma* this, PlayState* play) {
                     Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_SHUTTER, 164.72f,
                                        -480.0f, 397.68002f, 0, -0x705C, 0, 0x180);
                 } else {
-                    func_8002DF54(play, &this->actor, 8);
+                    Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
                     this->actionState = 1;
                 }
             }
@@ -756,7 +756,7 @@ void BossGoma_Encounter(BossGoma* this, PlayState* play) {
             }
 
             if (this->frameCount == 190) {
-                func_8002DF54(play, &this->actor, 2);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 2);
             }
 
             if (this->frameCount >= 228) {
@@ -767,7 +767,7 @@ void BossGoma_Encounter(BossGoma* this, PlayState* play) {
                 func_800C08AC(play, this->subCameraId, 0);
                 this->subCameraId = 0;
                 func_80064534(play, &play->csCtx);
-                func_8002DF54(play, &this->actor, 7);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
                 this->actionState = 3;
             }
             break;
@@ -964,7 +964,7 @@ void BossGoma_Encounter(BossGoma* this, PlayState* play) {
                 this->disableGameplayLogic = false;
                 this->patienceTimer = 200;
                 func_80064534(play, &play->csCtx);
-                func_8002DF54(play, &this->actor, 7);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
             }
             break;
     }
@@ -1054,7 +1054,7 @@ void BossGoma_Defeated(BossGoma* this, PlayState* play) {
         case 0:
             this->actionState = 1;
             func_80064520(play, &play->csCtx);
-            func_8002DF54(play, &this->actor, 1);
+            Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
             this->subCameraId = Play_CreateSubCamera(play);
             Play_ChangeCameraStatus(play, 0, 3);
             Play_ChangeCameraStatus(play, this->subCameraId, 7);
@@ -1189,7 +1189,7 @@ void BossGoma_Defeated(BossGoma* this, PlayState* play) {
                     func_800C08AC(play, this->subCameraId, 0);
                     this->subCameraId = 0;
                     func_80064534(play, &play->csCtx);
-                    func_8002DF54(play, &this->actor, 7);
+                    Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
                     Actor_Kill(&this->actor);
                 }
 
diff --git a/soh/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c b/soh/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
index 74684df71..7d82b93a4 100644
--- a/soh/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
+++ b/soh/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
@@ -1249,7 +1249,7 @@ void BossMo_IntroCs(BossMo* this, PlayState* play) {
                  (fabsf(player->actor.world.pos.x - -180.0f) < 40.0f))) {
                 // checks if Link is on one of the four platforms
                 func_80064520(play, &play->csCtx);
-                func_8002DF54(play, &this->actor, 8);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
                 this->csCamera = Play_CreateSubCamera(play);
                 Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT);
                 Play_ChangeCameraStatus(play, this->csCamera, CAM_STAT_ACTIVE);
@@ -1357,11 +1357,11 @@ void BossMo_IntroCs(BossMo* this, PlayState* play) {
             Math_ApproachF(&this->actor.speedXZ, sp80, 1.0f, sp78);
             Math_ApproachF(&this->cameraYawRate, sp7C, 1.0f, 128.0f);
             if (this->work[MO_TENT_MOVE_TIMER] == 525) {
-                func_8002DF54(play, &this->actor, 2);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 2);
             }
             if (this->work[MO_TENT_MOVE_TIMER] > 540) {
                 this->csState = MO_INTRO_REVEAL;
-                func_8002DF54(play, &this->actor, 1);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
                 sMorphaTent1->drawActor = true;
                 player->actor.world.pos.x = 180.0f;
                 player->actor.world.pos.z = -210.0f;
@@ -1468,7 +1468,7 @@ void BossMo_IntroCs(BossMo* this, PlayState* play) {
                 func_800C08AC(play, this->csCamera, 0);
                 this->csState = this->csCamera = MO_BATTLE;
                 func_80064534(play, &play->csCtx);
-                func_8002DF54(play, &this->actor, 7);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
             }
             break;
     }
@@ -1533,7 +1533,7 @@ void BossMo_DeathCs(BossMo* this, PlayState* play) {
     switch (this->csState) {
         case MO_DEATH_START:
             func_80064520(play, &play->csCtx);
-            func_8002DF54(play, &this->actor, 8);
+            Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
             this->csCamera = Play_CreateSubCamera(play);
             Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT);
             Play_ChangeCameraStatus(play, this->csCamera, CAM_STAT_ACTIVE);
@@ -1700,7 +1700,7 @@ void BossMo_DeathCs(BossMo* this, PlayState* play) {
                     func_800C08AC(play, this->csCamera, 0);
                     this->csCamera = 0;
                     func_80064534(play, &play->csCtx);
-                    func_8002DF54(play, &this->actor, 7);
+                    Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
                     sMorphaTent1->actor.world.pos.y = -1000.0f;
                 }
             } else {
diff --git a/soh/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c b/soh/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c
index b9f5c6f2c..5b8eef344 100644
--- a/soh/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c
+++ b/soh/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c
@@ -390,7 +390,7 @@ void BossSst_HeadSetupIntro(BossSst* this, PlayState* play) {
     player->stateFlags1 |= PLAYER_STATE1_INPUT_DISABLED;
 
     func_80064520(play, &play->csCtx);
-    func_8002DF54(play, &this->actor, 8);
+    Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
     sCutsceneCamera = Play_CreateSubCamera(play);
     Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT);
     Play_ChangeCameraStatus(play, sCutsceneCamera, CAM_STAT_ACTIVE);
@@ -423,7 +423,7 @@ void BossSst_HeadIntro(BossSst* this, PlayState* play) {
         sHands[LEFT]->actor.flags |= ACTOR_FLAG_TARGETABLE;
         player->stateFlags1 &= ~PLAYER_STATE1_INPUT_DISABLED;
         func_80064534(play, &play->csCtx);
-        func_8002DF54(play, &this->actor, 7);
+        Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
         sCameraAt.y += 30.0f;
         sCameraAt.z += 300.0f;
         Play_CameraSetAtEye(play, sCutsceneCamera, &sCameraAt, &sCameraEye);
@@ -1032,7 +1032,7 @@ void BossSst_HeadSetupDeath(BossSst* this, PlayState* play) {
     Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT);
     Play_ChangeCameraStatus(play, sCutsceneCamera, CAM_STAT_ACTIVE);
     Play_CopyCamera(play, sCutsceneCamera, MAIN_CAM);
-    func_8002DF54(play, &player->actor, 8);
+    Player_SetCsActionWithHaltedActors(play, &player->actor, 8);
     func_80064520(play, &play->csCtx);
     Math_Vec3f_Copy(&sCameraEye, &GET_ACTIVE_CAM(play)->eye);
     this->actionFunc = BossSst_HeadDeath;
@@ -1194,7 +1194,7 @@ void BossSst_HeadFinish(BossSst* this, PlayState* play) {
             Play_ChangeCameraStatus(play, sCutsceneCamera, CAM_STAT_WAIT);
             Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_ACTIVE);
             Play_ClearCamera(play, sCutsceneCamera);
-            func_8002DF54(play, &GET_PLAYER(play)->actor, 7);
+            Player_SetCsActionWithHaltedActors(play, &GET_PLAYER(play)->actor, 7);
             func_80064534(play, &play->csCtx);
             Actor_Kill(&this->actor);
             Actor_Kill(&sHands[LEFT]->actor);
diff --git a/soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c b/soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c
index 9d0a68c38..40f8127cd 100644
--- a/soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c
+++ b/soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c
@@ -1466,7 +1466,7 @@ void BossTw_TwinrovaMergeCS(BossTw* this, PlayState* play) {
         case 0:
             this->csState2 = 1;
             func_80064520(play, &play->csCtx);
-            func_8002DF54(play, &this->actor, 0x39);
+            Player_SetCsActionWithHaltedActors(play, &this->actor, 0x39);
             this->subCamId = Play_CreateSubCamera(play);
             Play_ChangeCameraStatus(play, 0, CAM_STAT_WAIT);
             Play_ChangeCameraStatus(play, this->subCamId, CAM_STAT_ACTIVE);
@@ -1606,7 +1606,7 @@ void BossTw_TwinrovaMergeCS(BossTw* this, PlayState* play) {
                     Animation_MorphToPlayOnce(&this->skelAnime, &gTwinrovaIntroAnim, 0.0f);
                     this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&gTwinrovaIntroAnim);
                     this->timers[0] = 50;
-                    func_8002DF54(play, &this->actor, 2);
+                    Player_SetCsActionWithHaltedActors(play, &this->actor, 2);
                     Audio_PlayActorSound2(&this->actor, NA_SE_EN_TWINROBA_TRANSFORM);
                     Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_BOSS);
                 }
@@ -1649,7 +1649,7 @@ void BossTw_TwinrovaMergeCS(BossTw* this, PlayState* play) {
             }
 
             if (this->timers[3] == 19) {
-                func_8002DF54(play, &this->actor, 5);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 5);
             }
 
             if (this->timers[3] == 16) {
@@ -1682,7 +1682,7 @@ void BossTw_TwinrovaMergeCS(BossTw* this, PlayState* play) {
                 this->subCamId = 0;
                 this->csState2 = this->subCamId;
                 func_80064534(play, &play->csCtx);
-                func_8002DF54(play, &this->actor, 7);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
                 this->work[TW_PLLR_IDX] = 0;
                 this->targetPos = sTwinrovaPillarPos[0];
                 BossTw_TwinrovaSetupFly(this, play);
@@ -1762,7 +1762,7 @@ void BossTw_TwinrovaIntroCS(BossTw* this, PlayState* play) {
                 player->actor.world.pos.x = player->actor.world.pos.z = .0f;
                 this->csState2 = 1;
                 func_80064520(play, &play->csCtx);
-                func_8002DF54(play, &this->actor, 0x39);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 0x39);
                 this->subCamId = Play_CreateSubCamera(play);
                 Play_ChangeCameraStatus(play, 0, CAM_STAT_WAIT);
                 Play_ChangeCameraStatus(play, this->subCamId, CAM_STAT_ACTIVE);
@@ -2245,7 +2245,7 @@ void BossTw_TwinrovaIntroCS(BossTw* this, PlayState* play) {
                 this->subCamId = 0;
                 this->csState2 = this->subCamId;
                 func_80064534(play, &play->csCtx);
-                func_8002DF54(play, &this->actor, 7);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
                 BossTw_SetupWait(this, play);
             }
             break;
@@ -2666,7 +2666,7 @@ void BossTw_TwinrovaDeathCS(BossTw* this, PlayState* play) {
         case 0:
             this->csState2 = 1;
             func_80064520(play, &play->csCtx);
-            func_8002DF54(play, &this->actor, 8);
+            Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
             this->subCamId = Play_CreateSubCamera(play);
             Play_ChangeCameraStatus(play, 0, CAM_STAT_WAIT);
             Play_ChangeCameraStatus(play, this->subCamId, CAM_STAT_ACTIVE);
@@ -2705,7 +2705,7 @@ void BossTw_TwinrovaDeathCS(BossTw* this, PlayState* play) {
                 sKoumePtr->actor.world.pos.z = sKotakePtr->actor.world.pos.z;
                 sKoumePtr->work[YAW_TGT] = sKotakePtr->work[YAW_TGT] = sKoumePtr->actor.shape.rot.x =
                     sKotakePtr->actor.shape.rot.x = sKoumePtr->actor.shape.rot.y = sKotakePtr->actor.shape.rot.y = 0;
-                func_8002DF54(play, &sKoumePtr->actor, 1);
+                Player_SetCsActionWithHaltedActors(play, &sKoumePtr->actor, 1);
                 sKoumePtr->actor.flags |= ACTOR_FLAG_TARGETABLE;
             }
             break;
@@ -2793,7 +2793,7 @@ void BossTw_TwinrovaDeathCS(BossTw* this, PlayState* play) {
                 this->csState2 = 4;
                 this->subCamId = 0;
                 func_80064534(play, &play->csCtx);
-                func_8002DF54(play, &this->actor, 7);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
                 Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_BOSS_CLEAR);
                 if (!IS_BOSS_RUSH) {
                     Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, 600.0f, 230.0f, 0.0f, 0,
diff --git a/soh/src/overlays/actors/ovl_Boss_Va/z_boss_va.c b/soh/src/overlays/actors/ovl_Boss_Va/z_boss_va.c
index 0e5a95608..77a497e7a 100644
--- a/soh/src/overlays/actors/ovl_Boss_Va/z_boss_va.c
+++ b/soh/src/overlays/actors/ovl_Boss_Va/z_boss_va.c
@@ -657,7 +657,7 @@ void BossVa_Init(Actor* thisx, PlayState* play2) {
                     } else {
                     sCsState = INTRO_CALL_BARI;
                     sDoorState = 100;
-                    func_8002DF54(play, &this->actor, 1);
+                    Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
                     play->envCtx.screenFillColor[0] = 0xDC;
                     play->envCtx.screenFillColor[1] = 0xDC;
                     play->envCtx.screenFillColor[2] = 0xBE;
@@ -799,7 +799,7 @@ void BossVa_BodyIntro(BossVa* this, PlayState* play) {
             play->envCtx.screenFillColor[1] = 0xDC;
             play->envCtx.screenFillColor[2] = 0xBE;
             play->envCtx.screenFillColor[3] = 0xD2;
-            func_8002DF54(play, &this->actor, 8);
+            Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
             player->actor.world.rot.y = player->actor.shape.rot.y = 0x7FFF;
             sCsState++;
             break;
@@ -827,7 +827,7 @@ void BossVa_BodyIntro(BossVa* this, PlayState* play) {
         case INTRO_CLOSE_DOOR:
             this->timer--;
             if (this->timer == 0) {
-                func_8002DF54(play, &this->actor, 2);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 2);
                 sCsState++;
                 this->timer = 30;
             }
@@ -842,7 +842,7 @@ void BossVa_BodyIntro(BossVa* this, PlayState* play) {
             }
             break;
         case INTRO_CRACKLE:
-            func_8002DF54(play, &this->actor, 1);
+            Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
             sCsState++;
             break;
         case INTRO_SPAWN_BARI:
@@ -973,7 +973,7 @@ void BossVa_BodyIntro(BossVa* this, PlayState* play) {
             sCameraAtMaxVel = sCameraEyeMaxVel;
             if (this->timer >= 45000) {
                 play->envCtx.unk_BF = 1;
-                func_8002DF54(play, &this->actor, 8);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
             } else if (this->timer >= 35000) {
                 Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_BOSS);
             }
@@ -1030,7 +1030,7 @@ void BossVa_BodyIntro(BossVa* this, PlayState* play) {
                 sCsCamera = 0;
                 func_80064534(play, &play->csCtx);
                 Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_ACTIVE);
-                func_8002DF54(play, &this->actor, 7);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
                 sCsState++;
                 Flags_SetEventChkInf(EVENTCHKINF_BEGAN_BARINA_BATTLE);
                 player->actor.shape.rot.y = player->actor.world.rot.y = this->actor.yawTowardsPlayer + 0x8000;
@@ -1550,7 +1550,7 @@ void BossVa_BodyDeath(BossVa* this, PlayState* play) {
 
     switch (sCsState) {
         case DEATH_START:
-            func_8002DF54(play, &this->actor, 1);
+            Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
             func_80064520(play, &play->csCtx);
             sCsCamera = Play_CreateSubCamera(play);
             Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT);
@@ -1613,7 +1613,7 @@ void BossVa_BodyDeath(BossVa* this, PlayState* play) {
                                                   0x28);
                 this->onCeiling = 2; // Not used by body
                 BossVa_SetDeathEnv(play);
-                func_8002DF54(play, &this->actor, 8);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
             }
             break;
         case DEATH_CORE_BURST:
@@ -1654,7 +1654,7 @@ void BossVa_BodyDeath(BossVa* this, PlayState* play) {
 
                 camera->at = sCameraAt;
 
-                func_8002DF54(play, &this->actor, 7);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
                 sCsState++;
 
                 if (!IS_BOSS_RUSH) {
@@ -2444,7 +2444,7 @@ void BossVa_BariIntro(BossVa* this, PlayState* play) {
     switch (sCsState) {
         case INTRO_LOOK_BARI:
             if (this->actor.params == BOSSVA_BARI_UPPER_1) {
-                func_8002DF54(play, &this->actor, 1);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
                 if (Math_SmoothStepToF(&this->actor.world.pos.y, 60.0f, 0.3f, 1.0f, 0.15f) == 0.0f) {
                     this->timer--;
                     if (this->timer == 0) {
diff --git a/soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.c b/soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.c
index a06786b2d..1df2325e8 100644
--- a/soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.c
+++ b/soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.c
@@ -880,7 +880,7 @@ void func_80986B2C(PlayState* play) {
         }
         play->transitionType = TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_BLACK, TCS_FAST);
         play->transitionTrigger = TRANS_TRIGGER_START;
-        func_8002DF54(play, &player->actor, 8);
+        Player_SetCsActionWithHaltedActors(play, &player->actor, 8);
     }
 }
 
diff --git a/soh/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c b/soh/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
index b43089d9e..34c0a0f20 100644
--- a/soh/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
+++ b/soh/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
@@ -560,7 +560,7 @@ void func_80997220(DoorShutter* this, PlayState* play) {
     this->dyna.actor.velocity.y = 0.0f;
     if (DoorShutter_SetupDoor(this, play) && !(player->stateFlags1 & PLAYER_STATE1_ITEM_OVER_HEAD)) {
         DoorShutter_SetupAction(this, func_80997568);
-        func_8002DF54(play, NULL, 2);
+        Player_SetCsActionWithHaltedActors(play, NULL, 2);
     }
 }
 
@@ -594,7 +594,7 @@ void func_80997528(DoorShutter* this, PlayState* play) {
 
 void func_80997568(DoorShutter* this, PlayState* play) {
     if (this->unk_16F++ > 30) {
-        func_8002DF54(play, NULL, 7);
+        Player_SetCsActionWithHaltedActors(play, NULL, 7);
         DoorShutter_SetupDoor(this, play);
     }
 }
diff --git a/soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c b/soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
index bdb154a92..710c138e2 100644
--- a/soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
+++ b/soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
@@ -499,7 +499,7 @@ void DoorWarp1_ChildWarpIdle(DoorWarp1* this, PlayState* play) {
         Audio_PlaySoundGeneral(NA_SE_EV_LINK_WARP, &player->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
                                &D_801333E8);
         OnePointCutscene_Init(play, 0x25E7, 999, &this->actor, MAIN_CAM);
-        func_8002DF54(play, &this->actor, 10);
+        Player_SetCsActionWithHaltedActors(play, &this->actor, 10);
 
         player->unk_450.x = this->actor.world.pos.x;
         player->unk_450.z = this->actor.world.pos.z;
@@ -584,7 +584,7 @@ void DoorWarp1_RutoWarpIdle(DoorWarp1* this, PlayState* play) {
 
     if (this->rutoWarpState != WARP_BLUE_RUTO_STATE_INITIAL && DoorWarp1_PlayerInRange(this, play)) {
         this->rutoWarpState = WARP_BLUE_RUTO_STATE_ENTERED;
-        func_8002DF54(play, &this->actor, 10);
+        Player_SetCsActionWithHaltedActors(play, &this->actor, 10);
         this->unk_1B2 = 1;
         DoorWarp1_SetupAction(this, func_80999EE0);
     }
@@ -706,7 +706,7 @@ void DoorWarp1_AdultWarpIdle(DoorWarp1* this, PlayState* play) {
         player = GET_PLAYER(play);
 
         OnePointCutscene_Init(play, 0x25E8, 999, &this->actor, MAIN_CAM);
-        func_8002DF54(play, &this->actor, 10);
+        Player_SetCsActionWithHaltedActors(play, &this->actor, 10);
         player->unk_450.x = this->actor.world.pos.x;
         player->unk_450.z = this->actor.world.pos.z;
         this->unk_1B2 = 20;
diff --git a/soh/src/overlays/actors/ovl_En_Ani/z_en_ani.c b/soh/src/overlays/actors/ovl_En_Ani/z_en_ani.c
index 3fe4e2a22..57cb6045e 100644
--- a/soh/src/overlays/actors/ovl_En_Ani/z_en_ani.c
+++ b/soh/src/overlays/actors/ovl_En_Ani/z_en_ani.c
@@ -130,7 +130,7 @@ void func_809B0558(EnAni* this, PlayState* play) {
         Flags_SetItemGetInf(ITEMGETINF_15);
     } else {
         if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_MAN_ON_ROOF, true, NULL)) {
-            func_8002F434(&this->actor, play, GI_HEART_PIECE, 10000.0f, 200.0f);
+            Actor_OfferGetItem(&this->actor, play, GI_HEART_PIECE, 10000.0f, 200.0f);
         }
     }
 }
@@ -141,7 +141,7 @@ void func_809B05F0(EnAni* this, PlayState* play) {
     }
 
     if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_MAN_ON_ROOF, true, NULL)) {
-        func_8002F434(&this->actor, play, GI_HEART_PIECE, 10000.0f, 200.0f);
+        Actor_OfferGetItem(&this->actor, play, GI_HEART_PIECE, 10000.0f, 200.0f);
     }
 }
 
diff --git a/soh/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c b/soh/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c
index 76c0feac3..2110383a4 100644
--- a/soh/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c
+++ b/soh/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c
@@ -295,7 +295,7 @@ void EnBomBowMan_RunGame(EnBomBowlMan* this, PlayState* play) {
         Message_StartTextbox(play, this->actor.textId, NULL);
 
         if (this->gameResult == 2) {
-            func_8002DF54(play, NULL, 8);
+            Player_SetCsActionWithHaltedActors(play, NULL, 8);
         }
         this->actionFunc = EnBomBowlMan_HandlePlayChoice;
     } else {
@@ -345,7 +345,7 @@ void EnBomBowlMan_HandlePlayChoice(EnBomBowlMan* this, PlayState* play) {
                         Message_ContinueTextbox(play, this->actor.textId);
                         this->dialogState = TEXT_STATE_EVENT;
                         OnePointCutscene_Init(play, 8010, -99, NULL, MAIN_CAM);
-                        func_8002DF54(play, NULL, 8);
+                        Player_SetCsActionWithHaltedActors(play, NULL, 8);
                         this->actionFunc = EnBomBowMan_SetupChooseShowPrize;
                     }
                 } else {
@@ -381,11 +381,11 @@ void func_809C41FC(EnBomBowlMan* this, PlayState* play) {
             Message_ContinueTextbox(play, this->actor.textId);
             this->dialogState = TEXT_STATE_EVENT;
             OnePointCutscene_Init(play, 8010, -99, NULL, MAIN_CAM);
-            func_8002DF54(play, NULL, 8);
+            Player_SetCsActionWithHaltedActors(play, NULL, 8);
             this->actionFunc = EnBomBowMan_SetupChooseShowPrize;
         } else {
             if (this->gameResult == 2) {
-                func_8002DF54(play, NULL, 7);
+                Player_SetCsActionWithHaltedActors(play, NULL, 7);
             }
             this->actionFunc = EnBomBowMan_SetupRunGame;
         }
@@ -509,7 +509,7 @@ void EnBomBowlMan_BeginPlayGame(EnBomBowlMan* this, PlayState* play) {
 
         // "Wow"
         osSyncPrintf(VT_FGCOL(YELLOW) "☆ わー ☆ %d\n" VT_RST, play->bombchuBowlingStatus);
-        func_8002DF54(play, NULL, 7);
+        Player_SetCsActionWithHaltedActors(play, NULL, 7);
         this->actionFunc = EnBomBowMan_SetupRunGame;
     }
 }
diff --git a/soh/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c b/soh/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c
index 5c18c52fa..232b096f9 100644
--- a/soh/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c
+++ b/soh/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c
@@ -68,7 +68,7 @@ void EnBomBowlPit_DetectHit(EnBomBowlPit* this, PlayState* play) {
 
             if (((fabsf(chuPosDiff.x) < 40.0f) || (BREG(2))) && ((fabsf(chuPosDiff.y) < 40.0f) || (BREG(2))) &&
                 ((fabsf(chuPosDiff.z) < 40.0f) || (BREG(2)))) {
-                func_8002DF54(play, NULL, 8);
+                Player_SetCsActionWithHaltedActors(play, NULL, 8);
                 chu->timer = 1;
 
                 this->camId = Play_CreateSubCamera(play);
@@ -107,7 +107,7 @@ void EnBomBowlPit_DetectHit(EnBomBowlPit* this, PlayState* play) {
                 Message_StartTextbox(play, this->actor.textId, NULL);
                 this->unk_154 = TEXT_STATE_EVENT;
                 func_80078884(NA_SE_EV_HIT_SOUND);
-                func_8002DF54(play, NULL, 8);
+                Player_SetCsActionWithHaltedActors(play, NULL, 8);
                 this->status = 1;
                 this->actionFunc = EnBomBowlPit_CameraDollyIn;
                 break;
@@ -167,7 +167,7 @@ void EnBomBowlPit_SetupGivePrize(EnBomBowlPit* this, PlayState* play) {
 
         Play_ClearCamera(play, this->camId);
         Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_ACTIVE);
-        func_8002DF54(play, NULL, 8);
+        Player_SetCsActionWithHaltedActors(play, NULL, 8);
         this->actionFunc = EnBomBowlPit_GivePrize;
     }
 }
@@ -175,7 +175,7 @@ void EnBomBowlPit_SetupGivePrize(EnBomBowlPit* this, PlayState* play) {
 void EnBomBowlPit_GivePrize(EnBomBowlPit* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
 
-    func_8002DF54(play, NULL, 7);
+    Player_SetCsActionWithHaltedActors(play, NULL, 7);
     this->getItemId = sGetItemIds[this->prizeIndex];
     this->getItemEntry = (GetItemEntry)GET_ITEM_NONE;
 
@@ -203,7 +203,7 @@ void EnBomBowlPit_GivePrize(EnBomBowlPit* this, PlayState* play) {
     player->stateFlags1 &= ~PLAYER_STATE1_IN_CUTSCENE;
     this->actor.parent = NULL;
     if (!IS_RANDO || this->getItemEntry.getItemId == GI_NONE) {
-        func_8002F434(&this->actor, play, this->getItemId, 2000.0f, 1000.0f);
+        Actor_OfferGetItem(&this->actor, play, this->getItemId, 2000.0f, 1000.0f);
     } else {
         GiveItemEntryFromActor(&this->actor, play, this->getItemEntry, 2000.0f, 1000.0f);
     }
@@ -216,7 +216,7 @@ void EnBomBowlPit_WaitTillPrizeGiven(EnBomBowlPit* this, PlayState* play) {
         this->actionFunc = EnBomBowlPit_Reset;
     } else {
          if (!IS_RANDO || this->getItemEntry.getItemId == GI_NONE) {
-            func_8002F434(&this->actor, play, this->getItemId, 2000.0f, 1000.0f);
+            Actor_OfferGetItem(&this->actor, play, this->getItemId, 2000.0f, 1000.0f);
         } else {
             GiveItemEntryFromActor(&this->actor, play, this->getItemEntry, 2000.0f, 1000.0f);
         }
diff --git a/soh/src/overlays/actors/ovl_En_Cow/z_en_cow.c b/soh/src/overlays/actors/ovl_En_Cow/z_en_cow.c
index b2bd6d65c..9869a0621 100644
--- a/soh/src/overlays/actors/ovl_En_Cow/z_en_cow.c
+++ b/soh/src/overlays/actors/ovl_En_Cow/z_en_cow.c
@@ -214,7 +214,7 @@ void func_809DF778(EnCow* this, PlayState* play) {
         this->actor.parent = NULL;
         this->actionFunc = func_809DF730;
     } else {
-        func_8002F434(&this->actor, play, GI_MILK, 10000.0f, 100.0f);
+        Actor_OfferGetItem(&this->actor, play, GI_MILK, 10000.0f, 100.0f);
     }
 }
 
@@ -223,7 +223,7 @@ void func_809DF7D8(EnCow* this, PlayState* play) {
         this->actor.flags &= ~ACTOR_FLAG_WILL_TALK;
         Message_CloseTextbox(play);
         this->actionFunc = func_809DF778;
-        func_8002F434(&this->actor, play, GI_MILK, 10000.0f, 100.0f);
+        Actor_OfferGetItem(&this->actor, play, GI_MILK, 10000.0f, 100.0f);
     }
 }
 
diff --git a/soh/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c b/soh/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c
index 8df2f8c0b..715a48c37 100644
--- a/soh/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c
+++ b/soh/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c
@@ -470,7 +470,7 @@ void EnDaiku_InitSubCamera(EnDaiku* this, PlayState* play) {
 
     Play_CameraSetAtEye(play, this->subCamId, &this->subCamAt, &this->subCamEye);
     Play_CameraSetFov(play, this->subCamId, play->mainCamera.fov);
-    func_8002DF54(play, &this->actor, 1);
+    Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
 }
 
 void EnDaiku_UpdateSubCamera(EnDaiku* this, PlayState* play) {
@@ -507,7 +507,7 @@ void EnDaiku_EscapeSuccess(EnDaiku* this, PlayState* play) {
             Actor_Kill(&this->actor);
         }
     } else {
-        func_8002DF54(play, &this->actor, 7);
+        Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
     }
 }
 
diff --git a/soh/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c b/soh/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c
index df00c3cf5..84ac2749d 100644
--- a/soh/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c
+++ b/soh/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c
@@ -138,7 +138,7 @@ s32 EnDivingGame_HasMinigameFinished(EnDivingGame* this, PlayState* play) {
         Message_StartTextbox(play, this->actor.textId, NULL);
         this->unk_292 = TEXT_STATE_EVENT;
         this->allRupeesThrown = this->state = this->phase = this->unk_2A2 = this->grabbedRupeesCounter = 0;
-        func_8002DF54(play, NULL, 8);
+        Player_SetCsActionWithHaltedActors(play, NULL, 8);
         this->actionFunc = func_809EE048;
         return true;
     } else {
@@ -163,7 +163,7 @@ s32 EnDivingGame_HasMinigameFinished(EnDivingGame* this, PlayState* play) {
             this->unk_292 = TEXT_STATE_EVENT;
             func_800F5B58();
             Audio_PlayFanfare(NA_BGM_SMALL_ITEM_GET);
-            func_8002DF54(play, NULL, 8);
+            Player_SetCsActionWithHaltedActors(play, NULL, 8);
             if (!Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_SILVER_SCALE)) {
                 this->actionFunc = func_809EE96C;
             } else {
@@ -191,7 +191,7 @@ void EnDivingGame_Talk(EnDivingGame* this, PlayState* play) {
             if (this->unk_292 != TEXT_STATE_DONE) {
                 switch (this->state) {
                     case ENDIVINGGAME_STATE_NOTPLAYING:
-                        func_8002DF54(play, NULL, 8);
+                        Player_SetCsActionWithHaltedActors(play, NULL, 8);
                         this->actionFunc = EnDivingGame_HandlePlayChoice;
                         break;
                     case ENDIVINGGAME_STATE_AWARDPRIZE:
@@ -258,7 +258,7 @@ void EnDivingGame_HandlePlayChoice(EnDivingGame* this, PlayState* play) {
             this->actionFunc = func_809EE048;
         } else {
             play->msgCtx.msgMode = MSGMODE_PAUSED;
-            func_8002DF54(play, NULL, 8);
+            Player_SetCsActionWithHaltedActors(play, NULL, 8);
             this->actionFunc = func_809EE0FC;
         }
     }
@@ -270,11 +270,11 @@ void func_809EE048(EnDivingGame* this, PlayState* play) {
     if (this->unk_292 == Message_GetState(&play->msgCtx) && Message_ShouldAdvance(play)) {
         if (this->phase == ENDIVINGGAME_PHASE_ENDED) {
             Message_CloseTextbox(play);
-            func_8002DF54(play, NULL, 7);
+            Player_SetCsActionWithHaltedActors(play, NULL, 7);
             this->actionFunc = func_809EDCB0;
         } else {
             play->msgCtx.msgMode = MSGMODE_PAUSED;
-            func_8002DF54(play, NULL, 8);
+            Player_SetCsActionWithHaltedActors(play, NULL, 8);
             this->actionFunc = func_809EE0FC;
         }
     }
@@ -419,7 +419,7 @@ void func_809EE800(EnDivingGame* this, PlayState* play) {
             func_80088B34(BREG(2) + 50);
         }
         func_800F5ACC(NA_BGM_TIMED_MINI_GAME);
-        func_8002DF54(play, NULL, 7);
+        Player_SetCsActionWithHaltedActors(play, NULL, 7);
         this->actor.textId = 0x405B;
         this->unk_292 = TEXT_STATE_EVENT;
         this->state = ENDIVINGGAME_STATE_PLAYING;
@@ -442,7 +442,7 @@ void func_809EE96C(EnDivingGame* this, PlayState* play) {
     SkelAnime_Update(&this->skelAnime);
     if ((this->unk_292 == Message_GetState(&play->msgCtx) && Message_ShouldAdvance(play))) {
         Message_CloseTextbox(play);
-        func_8002DF54(play, NULL, 7);
+        Player_SetCsActionWithHaltedActors(play, NULL, 7);
         this->actor.textId = 0x4056;
         this->unk_292 = TEXT_STATE_EVENT;
         this->state = ENDIVINGGAME_STATE_AWARDPRIZE;
@@ -456,7 +456,7 @@ void func_809EEA00(EnDivingGame* this, PlayState* play) {
         Message_CloseTextbox(play);
         this->actor.parent = NULL;
         if (!IS_RANDO) {
-            func_8002F434(&this->actor, play, GI_SCALE_SILVER, 90.0f, 10.0f);
+            Actor_OfferGetItem(&this->actor, play, GI_SCALE_SILVER, 90.0f, 10.0f);
         } else {
             GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_ZD_DIVING_MINIGAME, GI_SCALE_SILVER);
             GiveItemEntryFromActor(&this->actor, play, getItemEntry, 90.0f, 10.0f);
@@ -471,7 +471,7 @@ void func_809EEA90(EnDivingGame* this, PlayState* play) {
         this->actionFunc = func_809EEAF8;
     } else {
         if (!IS_RANDO) {
-            func_8002F434(&this->actor, play, GI_SCALE_SILVER, 90.0f, 10.0f);
+            Actor_OfferGetItem(&this->actor, play, GI_SCALE_SILVER, 90.0f, 10.0f);
         } else {
             GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_ZD_DIVING_MINIGAME, GI_SCALE_SILVER);
             GiveItemEntryFromActor(&this->actor, play, getItemEntry, 90.0f, 10.0f);
diff --git a/soh/src/overlays/actors/ovl_En_Dns/z_en_dns.c b/soh/src/overlays/actors/ovl_En_Dns/z_en_dns.c
index 933f5be2e..6ea9c26e1 100644
--- a/soh/src/overlays/actors/ovl_En_Dns/z_en_dns.c
+++ b/soh/src/overlays/actors/ovl_En_Dns/z_en_dns.c
@@ -391,7 +391,7 @@ void func_809EFDD0(EnDns* this, PlayState* play) {
     GetItemEntry itemEntry = ItemTable_Retrieve(pendingGetItemId);
     gSaveContext.pendingSale = itemEntry.itemId;
     gSaveContext.pendingSaleMod = itemEntry.modIndex;
-    func_8002F434(&this->actor, play, pendingGetItemId, 130.0f, 100.0f);
+    Actor_OfferGetItem(&this->actor, play, pendingGetItemId, 130.0f, 100.0f);
 }
 
 void func_809EFEE8(EnDns* this, PlayState* play) {
diff --git a/soh/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c b/soh/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c
index 2864544c5..401ffbef4 100644
--- a/soh/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c
+++ b/soh/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c
@@ -126,7 +126,7 @@ void EnDntJiji_Wait(EnDntJiji* this, PlayState* play) {
         !(player->stateFlags1 & PLAYER_STATE1_ITEM_OVER_HEAD)) {
         OnePointCutscene_Init(play, 2230, -99, &this->actor, MAIN_CAM);
         this->timer = 0;
-        func_8002DF54(play, NULL, 8);
+        Player_SetCsActionWithHaltedActors(play, NULL, 8);
         this->actionFunc = EnDntJiji_SetupUnburrow;
     }
 }
@@ -260,9 +260,9 @@ void EnDntJiji_Talk(EnDntJiji* this, PlayState* play) {
     if ((Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(play)) {
         func_8005B1A4(GET_ACTIVE_CAM(play));
         Message_CloseTextbox(play);
-        func_8002DF54(play, NULL, 7);
+        Player_SetCsActionWithHaltedActors(play, NULL, 7);
         this->actor.parent = NULL;
-        func_8002F434(&this->actor, play, this->getItemId, 400.0f, 200.0f);
+        Actor_OfferGetItem(&this->actor, play, this->getItemId, 400.0f, 200.0f);
         this->actionFunc = EnDntJiji_SetupGivePrize;
     }
 }
@@ -272,7 +272,7 @@ void EnDntJiji_SetupGivePrize(EnDntJiji* this, PlayState* play) {
     if (Actor_HasParent(&this->actor, play)) {
         this->actionFunc = EnDntJiji_GivePrize;
     } else {
-        func_8002F434(&this->actor, play, this->getItemId, 400.0f, 200.0f);
+        Actor_OfferGetItem(&this->actor, play, this->getItemId, 400.0f, 200.0f);
     }
 }
 
diff --git a/soh/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c b/soh/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c
index f3dff79fe..f96c93695 100644
--- a/soh/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c
+++ b/soh/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c
@@ -256,7 +256,7 @@ void EnDntNomal_TargetWait(EnDntNomal* this, PlayState* play) {
                         this->actionFunc = EnDntNomal_TargetGivePrize;
                     } else {
                         OnePointCutscene_Init(play, 4140, -99, &this->actor, MAIN_CAM);
-                        func_8002DF54(play, &this->actor, 1);
+                        Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
                         this->timer4 = 50;
                         this->actionFunc = EnDntNomal_SetupTargetUnburrow;
                     }
@@ -346,7 +346,7 @@ void EnDntNomal_TargetTalk(EnDntNomal* this, PlayState* play) {
         Message_CloseTextbox(play);
         func_8005B1A4(GET_ACTIVE_CAM(play));
         GET_ACTIVE_CAM(play)->csId = 0;
-        func_8002DF54(play, NULL, 8);
+        Player_SetCsActionWithHaltedActors(play, NULL, 8);
         this->actionFunc = EnDntNomal_SetupTargetGivePrize;
     }
 }
@@ -368,7 +368,7 @@ void EnDntNomal_TargetGivePrize(EnDntNomal* this, PlayState* play) {
 
         if (Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_EX_ITEM, itemX, itemY, itemZ, 0,
                                0, 0, EXITEM_BULLET_BAG) == NULL) {
-            func_8002DF54(play, NULL, 7);
+            Player_SetCsActionWithHaltedActors(play, NULL, 7);
             Actor_Kill(&this->actor);
         }
         this->spawnedItem = true;
diff --git a/soh/src/overlays/actors/ovl_En_Ds/z_en_ds.c b/soh/src/overlays/actors/ovl_En_Ds/z_en_ds.c
index d3a0eadea..e94ff9039 100644
--- a/soh/src/overlays/actors/ovl_En_Ds/z_en_ds.c
+++ b/soh/src/overlays/actors/ovl_En_Ds/z_en_ds.c
@@ -95,7 +95,7 @@ void EnDs_GiveOddPotion(EnDs* this, PlayState* play) {
         this->actionFunc = EnDs_DisplayOddPotionText;
         gSaveContext.timer2State = 0;
     } else {
-        func_8002F434(&this->actor, play, GI_ODD_POTION, 10000.0f, 50.0f);
+        Actor_OfferGetItem(&this->actor, play, GI_ODD_POTION, 10000.0f, 50.0f);
     }
 }
 
@@ -105,7 +105,7 @@ void EnDs_TalkAfterBrewOddPotion(EnDs* this, PlayState* play) {
         this->actionFunc = EnDs_GiveOddPotion;
         u32 itemId = GI_ODD_POTION;
         if (GameInteractor_Should(GI_VB_TRADE_ODD_MUSHROOM, true, this)) {
-            func_8002F434(&this->actor, play, itemId, 10000.0f, 50.0f);
+            Actor_OfferGetItem(&this->actor, play, itemId, 10000.0f, 50.0f);
         }
     }
 }
@@ -178,7 +178,7 @@ void EnDs_GiveBluePotion(EnDs* this, PlayState* play) {
         this->actor.parent = NULL;
         this->actionFunc = EnDs_Talk;
     } else {
-        func_8002F434(&this->actor, play, GI_POTION_BLUE, 10000.0f, 50.0f);
+        Actor_OfferGetItem(&this->actor, play, GI_POTION_BLUE, 10000.0f, 50.0f);
     }
 }
 
@@ -200,7 +200,7 @@ void EnDs_OfferBluePotion(EnDs* this, PlayState* play) {
 
                         if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_GRANNYS_SHOP, true, this)) {
                             GetItemEntry itemEntry = ItemTable_Retrieve(GI_POTION_BLUE);
-                            func_8002F434(&this->actor, play, GI_POTION_BLUE, 10000.0f, 50.0f);
+                            Actor_OfferGetItem(&this->actor, play, GI_POTION_BLUE, 10000.0f, 50.0f);
                             gSaveContext.pendingSale = itemEntry.itemId;
                             gSaveContext.pendingSaleMod = itemEntry.modIndex;
                         }
diff --git a/soh/src/overlays/actors/ovl_En_Du/z_en_du.c b/soh/src/overlays/actors/ovl_En_Du/z_en_du.c
index 9f5ba2b0a..781c09f79 100644
--- a/soh/src/overlays/actors/ovl_En_Du/z_en_du.c
+++ b/soh/src/overlays/actors/ovl_En_Du/z_en_du.c
@@ -362,7 +362,7 @@ void func_809FE3C0(EnDu* this, PlayState* play) {
         return;
     }
     if (this->interactInfo.talkState == NPC_TALK_STATE_ACTION) {
-        func_8002DF54(play, &this->actor, 7);
+        Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
         this->interactInfo.talkState = NPC_TALK_STATE_IDLE;
     }
     if (this->actor.xzDistToPlayer < 116.0f + this->collider.dim.radius) {
@@ -476,7 +476,7 @@ void func_809FE890(EnDu* this, PlayState* play) {
     CsCmdActorAction* csAction;
 
     if (play->csCtx.state == CS_STATE_IDLE) {
-        func_8002DF54(play, &this->actor, 1);
+        Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
         EnDu_SetupAction(this, func_809FEB08);
         return;
     }
@@ -549,7 +549,7 @@ void func_809FEB08(EnDu* this, PlayState* play) {
     this->unk_1EE = 0;
 
     if (this->unk_1E8 == 1) {
-        func_8002DF54(play, &this->actor, 7);
+        Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
         Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENDU_ANIM_1);
         EnDu_SetupAction(this, func_809FE3C0);
         return;
@@ -569,7 +569,7 @@ void func_809FEB08(EnDu* this, PlayState* play) {
 
 void func_809FEC14(EnDu* this, PlayState* play) {
     if (this->interactInfo.talkState == NPC_TALK_STATE_ACTION) {
-        func_8002DF54(play, &this->actor, 7);
+        Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
         EnDu_SetupAction(this, func_809FEC70);
         func_809FEC70(this, play);
     }
@@ -582,7 +582,7 @@ void func_809FEC70(EnDu* this, PlayState* play) {
     } else {
         f32 xzRange = this->actor.xzDistToPlayer + 1.0f;
 
-        func_8002F434(&this->actor, play, GI_BRACELET, xzRange, fabsf(this->actor.yDistToPlayer) + 1.0f);
+        Actor_OfferGetItem(&this->actor, play, GI_BRACELET, xzRange, fabsf(this->actor.yDistToPlayer) + 1.0f);
     }
 }
 
diff --git a/soh/src/overlays/actors/ovl_En_Elf/z_en_elf.c b/soh/src/overlays/actors/ovl_En_Elf/z_en_elf.c
index f996fe6c1..e08e794a3 100644
--- a/soh/src/overlays/actors/ovl_En_Elf/z_en_elf.c
+++ b/soh/src/overlays/actors/ovl_En_Elf/z_en_elf.c
@@ -677,7 +677,7 @@ void func_80A0329C(EnElf* this, PlayState* play) {
 
         if (!(this->fairyFlags & FAIRY_FLAG_BIG)) {
             // GI_MAX in this case allows the player to catch the actor in a bottle
-            func_8002F434(&this->actor, play, GI_MAX, 80.0f, 60.0f);
+            Actor_OfferGetItem(&this->actor, play, GI_MAX, 80.0f, 60.0f);
         }
     }
 }
diff --git a/soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c b/soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c
index a3a196e31..03b343527 100644
--- a/soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c
+++ b/soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c
@@ -400,7 +400,7 @@ void EnExItem_TargetPrizeApproach(EnExItem* this, PlayState* play) {
         s32 getItemId;
 
         this->actor.draw = NULL;
-        func_8002DF54(play, NULL, 7);
+        Player_SetCsActionWithHaltedActors(play, NULL, 7);
         this->actor.parent = NULL;
         if (IS_RANDO) {
             GET_PLAYER(play)->stateFlags1 &= ~(PLAYER_STATE1_GETTING_ITEM | PLAYER_STATE1_ITEM_OVER_HEAD);
@@ -415,7 +415,7 @@ void EnExItem_TargetPrizeApproach(EnExItem* this, PlayState* play) {
         }
 
         if (!IS_RANDO || getItemEntry.getItemId == GI_NONE) {
-            func_8002F434(&this->actor, play, getItemId, 2000.0f, 1000.0f);
+            Actor_OfferGetItem(&this->actor, play, getItemId, 2000.0f, 1000.0f);
         } else {
             GiveItemEntryFromActor(&this->actor, play, getItemEntry, 2000.0f, 1000.0f);
         }
@@ -429,7 +429,7 @@ void EnExItem_TargetPrizeGive(EnExItem* this, PlayState* play) {
     } else {
         if (!IS_RANDO) {
             s32 getItemId = (CUR_UPG_VALUE(UPG_BULLET_BAG) == 2) ? GI_BULLET_BAG_50 : GI_BULLET_BAG_40;
-            func_8002F434(&this->actor, play, getItemId, 2000.0f, 1000.0f);
+            Actor_OfferGetItem(&this->actor, play, getItemId, 2000.0f, 1000.0f);
         } else {
             GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_LW_TARGET_IN_WOODS, GI_BULLET_BAG_50);
             GiveItemEntryFromActor(&this->actor, play, getItemEntry, 2000.0f, 1000.0f);
diff --git a/soh/src/overlays/actors/ovl_En_Fish/z_en_fish.c b/soh/src/overlays/actors/ovl_En_Fish/z_en_fish.c
index e777d993f..1bd8e3202 100644
--- a/soh/src/overlays/actors/ovl_En_Fish/z_en_fish.c
+++ b/soh/src/overlays/actors/ovl_En_Fish/z_en_fish.c
@@ -716,7 +716,7 @@ void EnFish_OrdinaryUpdate(EnFish* this, PlayState* play) {
             EnFish_BeginRespawn(this);
         } else if (EnFish_InBottleRange(this, play)) {
             // GI_MAX in this case allows the player to catch the actor in a bottle
-            func_8002F434(&this->actor, play, GI_MAX, 80.0f, 20.0f);
+            Actor_OfferGetItem(&this->actor, play, GI_MAX, 80.0f, 20.0f);
         }
     }
 }
diff --git a/soh/src/overlays/actors/ovl_En_Fr/z_en_fr.c b/soh/src/overlays/actors/ovl_En_Fr/z_en_fr.c
index d8ef93a6e..646fc5668 100644
--- a/soh/src/overlays/actors/ovl_En_Fr/z_en_fr.c
+++ b/soh/src/overlays/actors/ovl_En_Fr/z_en_fr.c
@@ -1020,7 +1020,7 @@ void EnFr_Deactivate(EnFr* this, PlayState* play) {
     } else {
         this->actionFunc = EnFr_GiveReward;
         if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_FROGS, true, this)) {
-            func_8002F434(&this->actor, play, this->reward, 30.0f, 100.0f);
+            Actor_OfferGetItem(&this->actor, play, this->reward, 30.0f, 100.0f);
         }
     }
 }
@@ -1030,7 +1030,7 @@ void EnFr_GiveReward(EnFr* this, PlayState* play) {
         this->actor.parent = NULL;
         this->actionFunc = EnFr_SetIdle;
     } else {
-        func_8002F434(&this->actor, play, this->reward, 30.0f, 100.0f);
+        Actor_OfferGetItem(&this->actor, play, this->reward, 30.0f, 100.0f);
     }
 }
 
diff --git a/soh/src/overlays/actors/ovl_En_Gb/z_en_gb.c b/soh/src/overlays/actors/ovl_En_Gb/z_en_gb.c
index 53c149026..fb37cf0af 100644
--- a/soh/src/overlays/actors/ovl_En_Gb/z_en_gb.c
+++ b/soh/src/overlays/actors/ovl_En_Gb/z_en_gb.c
@@ -360,7 +360,7 @@ void func_80A2FA50(EnGb* this, PlayState* play) {
 void func_80A2FB40(EnGb* this, PlayState* play) {
     if (Message_GetState(&play->msgCtx) == TEXT_STATE_DONE && Message_ShouldAdvance(play)) {
         if (!IS_RANDO) {
-            func_8002F434(&this->dyna.actor, play, GI_BOTTLE, 100.0f, 10.0f);
+            Actor_OfferGetItem(&this->dyna.actor, play, GI_BOTTLE, 100.0f, 10.0f);
         } else {
             GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_MARKET_10_BIG_POES, GI_BOTTLE);
             GiveItemEntryFromActor(&this->dyna.actor, play, getItemEntry, 100.0f, 10.0f);
@@ -375,7 +375,7 @@ void func_80A2FBB0(EnGb* this, PlayState* play) {
         this->actionFunc = func_80A2FC0C;
     } else {
         if (!IS_RANDO) {
-            func_8002F434(&this->dyna.actor, play, GI_BOTTLE, 100.0f, 10.0f);
+            Actor_OfferGetItem(&this->dyna.actor, play, GI_BOTTLE, 100.0f, 10.0f);
         } else {
             GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_MARKET_10_BIG_POES, GI_BOTTLE);
             GiveItemEntryFromActor(&this->dyna.actor, play, getItemEntry, 100.0f, 10.0f);
diff --git a/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c b/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
index 92a768205..c72205b8f 100644
--- a/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
+++ b/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
@@ -281,7 +281,7 @@ void EnGe1_KickPlayer(EnGe1* this, PlayState* play) {
 void EnGe1_SpotPlayer(EnGe1* this, PlayState* play) {
     this->cutsceneTimer = 30;
     this->actionFunc = EnGe1_KickPlayer;
-    func_8002DF54(play, &this->actor, 0x5F);
+    Player_SetCsActionWithHaltedActors(play, &this->actor, 0x5F);
     func_80078884(NA_SE_SY_FOUND);
     Message_StartTextbox(play, 0x6000, &this->actor);
 }
@@ -573,7 +573,7 @@ void EnGe1_WaitTillItemGiven_Archery(EnGe1* this, PlayState* play) {
         }
 
         if (!IS_RANDO || getItemEntry.getItemId == GI_NONE) {
-            func_8002F434(&this->actor, play, getItemId, 10000.0f, 50.0f);
+            Actor_OfferGetItem(&this->actor, play, getItemId, 10000.0f, 50.0f);
         } else {
             GiveItemEntryFromActor(&this->actor, play, getItemEntry, 10000.0f, 50.0f);
         }
@@ -614,7 +614,7 @@ void EnGe1_BeginGiveItem_Archery(EnGe1* this, PlayState* play) {
     }
 
     if (!IS_RANDO || getItemEntry.getItemId == GI_NONE) {
-        func_8002F434(&this->actor, play, getItemId, 10000.0f, 50.0f);
+        Actor_OfferGetItem(&this->actor, play, getItemId, 10000.0f, 50.0f);
     } else {
         GiveItemEntryFromActor(&this->actor, play, getItemEntry, 10000.0f, 50.0f);
     }
@@ -662,7 +662,7 @@ void EnGe1_BeginGame_Archery(EnGe1* this, PlayState* play) {
                     Flags_SetEventChkInf(EVENTCHKINF_PLAYED_HORSEBACK_ARCHERY);
 
                     if (!(player->stateFlags1 & PLAYER_STATE1_ON_HORSE)) {
-                        func_8002DF54(play, &this->actor, 1);
+                        Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
                     } else {
                         horse = Actor_FindNearby(play, &player->actor, ACTOR_EN_HORSE, ACTORCAT_BG, 1200.0f);
                         player->actor.freezeTimer = 1200;
diff --git a/soh/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c b/soh/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c
index 01e0e0176..5602dd883 100644
--- a/soh/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c
+++ b/soh/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c
@@ -472,7 +472,7 @@ void EnGe2_WaitTillCardGiven(EnGe2* this, PlayState* play) {
         this->actionFunc = EnGe2_SetActionAfterTalk;
     } else {
         if (!IS_RANDO) {
-            func_8002F434(&this->actor, play, GI_GERUDO_CARD, 10000.0f, 50.0f);
+            Actor_OfferGetItem(&this->actor, play, GI_GERUDO_CARD, 10000.0f, 50.0f);
         } else {
             GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_GF_GERUDO_MEMBERSHIP_CARD, GI_GERUDO_CARD);
             GiveItemEntryFromActor(&this->actor, play, getItemEntry, 10000.0f, 50.0f);
@@ -486,7 +486,7 @@ void EnGe2_GiveCard(EnGe2* this, PlayState* play) {
         this->actor.flags &= ~ACTOR_FLAG_WILL_TALK;
         this->actionFunc = EnGe2_WaitTillCardGiven;
          if (!IS_RANDO) {
-            func_8002F434(&this->actor, play, GI_GERUDO_CARD, 10000.0f, 50.0f);
+            Actor_OfferGetItem(&this->actor, play, GI_GERUDO_CARD, 10000.0f, 50.0f);
         } else {
             GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_GF_GERUDO_MEMBERSHIP_CARD, GI_GERUDO_CARD);
             GiveItemEntryFromActor(&this->actor, play, getItemEntry, 10000.0f, 50.0f);
@@ -510,7 +510,7 @@ void EnGe2_SetupCapturePlayer(EnGe2* this, PlayState* play) {
     this->stateFlags |= GE2_STATE_CAPTURING;
     this->actor.speedXZ = 0.0f;
     EnGe2_ChangeAction(this, GE2_ACTION_CAPTURETURN);
-    func_8002DF54(play, &this->actor, 95);
+    Player_SetCsActionWithHaltedActors(play, &this->actor, 95);
     func_80078884(NA_SE_SY_FOUND);
     Message_StartTextbox(play, 0x6000, &this->actor);
 }
diff --git a/soh/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c b/soh/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c
index 90d2981f0..aaa198060 100644
--- a/soh/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c
+++ b/soh/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c
@@ -145,7 +145,7 @@ void EnGe3_WaitTillCardGiven(EnGe3* this, PlayState* play) {
         this->actionFunc = EnGe3_Wait;
     } else {
         if (!IS_RANDO) {
-            func_8002F434(&this->actor, play, GI_GERUDO_CARD, 10000.0f, 50.0f);
+            Actor_OfferGetItem(&this->actor, play, GI_GERUDO_CARD, 10000.0f, 50.0f);
         } else {
             GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_GF_GERUDO_MEMBERSHIP_CARD, GI_GERUDO_CARD);
             GiveItemEntryFromActor(&this->actor, play, getItemEntry, 10000.0f, 50.0f);
@@ -159,7 +159,7 @@ void EnGe3_GiveCard(EnGe3* this, PlayState* play) {
         this->actor.flags &= ~ACTOR_FLAG_WILL_TALK;
         this->actionFunc = EnGe3_WaitTillCardGiven;
         if (!IS_RANDO) {
-            func_8002F434(&this->actor, play, GI_GERUDO_CARD, 10000.0f, 50.0f);
+            Actor_OfferGetItem(&this->actor, play, GI_GERUDO_CARD, 10000.0f, 50.0f);
         } else {
             GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_GF_GERUDO_MEMBERSHIP_CARD, GI_GERUDO_CARD);
             GiveItemEntryFromActor(&this->actor, play, getItemEntry, 10000.0f, 50.0f);
@@ -172,7 +172,7 @@ void EnGe3_ForceTalk(EnGe3* this, PlayState* play) {
         this->actionFunc = EnGe3_GiveCard;
     } else {
         if (!(this->unk_30C & 4)) {
-            func_8002DF54(play, &this->actor, 7);
+            Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
             this->unk_30C |= 4;
         }
         this->actor.textId = 0x6004;
diff --git a/soh/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c b/soh/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c
index 4ed0e52ee..293f19669 100644
--- a/soh/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c
+++ b/soh/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c
@@ -918,7 +918,7 @@ void EnGeldB_SpinAttack(EnGeldB* this, PlayState* play) {
             if (&player->actor == this->swordCollider.base.at) {
                 func_8002F71C(play, &this->actor, 6.0f, this->actor.yawTowardsPlayer, 6.0f);
                 this->spinAttackState = 2;
-                func_8002DF54(play, &this->actor, 0x18);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 0x18);
                 Message_StartTextbox(play, 0x6003, &this->actor);
                 this->timer = 30;
                 this->actor.speedXZ = 0.0f;
diff --git a/soh/src/overlays/actors/ovl_En_Gm/z_en_gm.c b/soh/src/overlays/actors/ovl_En_Gm/z_en_gm.c
index 22754a87a..7174a63f1 100644
--- a/soh/src/overlays/actors/ovl_En_Gm/z_en_gm.c
+++ b/soh/src/overlays/actors/ovl_En_Gm/z_en_gm.c
@@ -250,7 +250,7 @@ void EnGm_ProcessChoiceIndex(EnGm* this, PlayState* play) {
                     this->actionFunc = func_80A3DD7C;
                 } else {
                     if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_MEDIGORON, true, this)) {
-                        func_8002F434(&this->actor, play, GI_SWORD_KNIFE, 415.0f, 10.0f);
+                        Actor_OfferGetItem(&this->actor, play, GI_SWORD_KNIFE, 415.0f, 10.0f);
                     }
 
                     this->actionFunc = func_80A3DF00;
@@ -270,7 +270,7 @@ void func_80A3DF00(EnGm* this, PlayState* play) {
         this->actor.parent = NULL;
         this->actionFunc = func_80A3DF60;
     } else {
-        func_8002F434(&this->actor, play, GI_SWORD_KNIFE, 415.0f, 10.0f);
+        Actor_OfferGetItem(&this->actor, play, GI_SWORD_KNIFE, 415.0f, 10.0f);
     }
 }
 
diff --git a/soh/src/overlays/actors/ovl_En_Go/z_en_go.c b/soh/src/overlays/actors/ovl_En_Go/z_en_go.c
index 3ec88fb74..20d1c5326 100644
--- a/soh/src/overlays/actors/ovl_En_Go/z_en_go.c
+++ b/soh/src/overlays/actors/ovl_En_Go/z_en_go.c
@@ -229,7 +229,7 @@ s16 EnGo_UpdateTalkState(PlayState* play, Actor* thisx) {
                     talkState = NPC_TALK_STATE_IDLE;
                     break;
                 case 0x3036:
-                    func_8002F434(thisx, play, GI_TUNIC_GORON, xzRange, yRange);
+                    Actor_OfferGetItem(thisx, play, GI_TUNIC_GORON, xzRange, yRange);
                     Flags_SetInfTable(INFTABLE_10D); // EnGo exclusive flag
                     talkState = NPC_TALK_STATE_ACTION;
                     break;
@@ -975,7 +975,7 @@ void EnGo_GetItem(EnGo* this, PlayState* play) {
 
         yDist = fabsf(this->actor.yDistToPlayer) + 1.0f;
         xzDist = this->actor.xzDistToPlayer + 1.0f;
-        func_8002F434(&this->actor, play, getItemId, xzDist, yDist);
+        Actor_OfferGetItem(&this->actor, play, getItemId, xzDist, yDist);
     }
 }
 
diff --git a/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c b/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c
index 783ada21a..47d1d7b0d 100644
--- a/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c
+++ b/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c
@@ -284,7 +284,7 @@ s32 EnGo2_SpawnDust(EnGo2* this, u8 initialTimer, f32 scale, f32 scaleStep, s32
 void EnGo2_GetItem(EnGo2* this, PlayState* play, s32 getItemId) {
     this->getItemId = getItemId;
     if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_GORON, true, this)) {
-        func_8002F434(&this->actor, play, getItemId, this->actor.xzDistToPlayer + 1.0f,
+        Actor_OfferGetItem(&this->actor, play, getItemId, this->actor.xzDistToPlayer + 1.0f,
                     fabsf(this->actor.yDistToPlayer) + 1.0f);
     }
 }
@@ -1799,7 +1799,7 @@ void EnGo2_SetupGetItem(EnGo2* this, PlayState* play) {
         this->actor.parent = NULL;
         this->actionFunc = EnGo2_SetGetItem;
     } else {
-        func_8002F434(&this->actor, play, this->getItemId, this->actor.xzDistToPlayer + 1.0f, fabsf(this->actor.yDistToPlayer) + 1.0f);
+        Actor_OfferGetItem(&this->actor, play, this->getItemId, this->actor.xzDistToPlayer + 1.0f, fabsf(this->actor.yDistToPlayer) + 1.0f);
     }
 }
 
@@ -1936,7 +1936,7 @@ void EnGo2_GoronFireGenericAction(EnGo2* this, PlayState* play) {
                     (f32)((Math_SinS(this->actor.world.rot.y) * -30.0f) + this->actor.world.pos.x);
                 player->actor.world.pos.z =
                     (f32)((Math_CosS(this->actor.world.rot.y) * -30.0f) + this->actor.world.pos.z);
-                func_8002DF54(play, &this->actor, 8);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
                 Audio_PlayFanfare(NA_BGM_APPEAR);
             }
             break;
@@ -1973,7 +1973,7 @@ void EnGo2_GoronFireGenericAction(EnGo2* this, PlayState* play) {
         case 4: // Finalize walking away
             Message_CloseTextbox(play);
             EnGo2_GoronFireClearCamera(this, play);
-            func_8002DF54(play, &this->actor, 7);
+            Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
             Actor_Kill(&this->actor);
             break;
         case 1:
diff --git a/soh/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c b/soh/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c
index ed924dd3c..5b5a97a08 100644
--- a/soh/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c
+++ b/soh/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c
@@ -391,7 +391,7 @@ void EnHeishi1_WaitNight(EnHeishi1* this, PlayState* play) {
         Message_StartTextbox(play, 0x702D, &this->actor);
         func_80078884(NA_SE_SY_FOUND);
         osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発見！ ☆☆☆☆☆ \n" VT_RST); // "Discovered!"
-        func_8002DF54(play, &this->actor, 1);
+        Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
         this->actionFunc = EnHeishi1_SetupKick;
     }
 }
@@ -475,7 +475,7 @@ void EnHeishi1_Update(Actor* thisx, PlayState* play) {
                                     func_80078884(NA_SE_SY_FOUND);
                                     // "Discovered!"
                                     osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発見！ ☆☆☆☆☆ \n" VT_RST);
-                                    func_8002DF54(play, &this->actor, 1);
+                                    Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
                                     sHeishi1PlayerIsCaught = true;
                                     this->actionFunc = EnHeishi1_SetupMoveToLink;
                                 }
diff --git a/soh/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c b/soh/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c
index 379ce2893..89dcc6808 100644
--- a/soh/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c
+++ b/soh/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c
@@ -112,7 +112,7 @@ void EnHeishi2_Init(Actor* thisx, PlayState* play) {
             this->actor.world.pos.z += 90.0f;
             this->actor.shape.rot.y = this->actor.world.rot.y;
             Collider_DestroyCylinder(play, &this->collider);
-            func_8002DF54(play, 0, 8);
+            Player_SetCsActionWithHaltedActors(play, 0, 8);
             this->actor.flags |= ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UPDATE_WHILE_CULLED;
             this->actionFunc = func_80A544AC;
         }
@@ -265,7 +265,7 @@ void func_80A5344C(EnHeishi2* this, PlayState* play) {
 void func_80A53538(EnHeishi2* this, PlayState* play) {
     SkelAnime_Update(&this->skelAnime);
     if (this->unk_300 == Message_GetState(&play->msgCtx) && Message_ShouldAdvance(play)) {
-        func_8002DF54(play, NULL, 8);
+        Player_SetCsActionWithHaltedActors(play, NULL, 8);
         play->msgCtx.msgMode = MSGMODE_PAUSED;
         this->actionFunc = func_80A535BC;
     }
@@ -337,7 +337,7 @@ void func_80A53850(EnHeishi2* this, PlayState* play) {
         Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_ACTIVE);
         Message_CloseTextbox(play);
         this->unk_30C = 1;
-        func_8002DF54(play, NULL, 7);
+        Player_SetCsActionWithHaltedActors(play, NULL, 7);
         this->actionFunc = func_80A531E4;
     }
 }
@@ -426,7 +426,7 @@ void func_80A53AD4(EnHeishi2* this, PlayState* play) {
 void func_80A53C0C(EnHeishi2* this, PlayState* play) {
     SkelAnime_Update(&this->skelAnime);
     if ((this->unk_300 == Message_GetState(&play->msgCtx)) && Message_ShouldAdvance(play)) {
-        func_8002DF54(play, 0, 8);
+        Player_SetCsActionWithHaltedActors(play, 0, 8);
         play->msgCtx.msgMode = MSGMODE_PAUSED;
         this->actionFunc = func_80A53C90;
     }
@@ -510,7 +510,7 @@ void func_80A53F30(EnHeishi2* this, PlayState* play) {
                 this->actionFunc = func_80A54038;
             } else {
                 Message_CloseTextbox(play);
-                func_8002DF54(play, NULL, 7);
+                Player_SetCsActionWithHaltedActors(play, NULL, 7);
                 this->actionFunc = func_80A53908;
             }
         } else {
@@ -528,7 +528,7 @@ void func_80A54038(EnHeishi2* this, PlayState* play) {
     if ((Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(play)) {
         Flags_SetInfTable(INFTABLE_SHOWED_ZELDAS_LETTER_TO_GATE_GUARD);
         Message_CloseTextbox(play);
-        func_8002DF54(play, 0, 7);
+        Player_SetCsActionWithHaltedActors(play, 0, 7);
         this->actionFunc = func_80A53908;
     }
 }
@@ -653,7 +653,7 @@ void func_80A5455C(EnHeishi2* this, PlayState* play) {
     EnBom* bomb;
 
     if ((Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(play)) {
-        func_8002DF54(play, NULL, 7);
+        Player_SetCsActionWithHaltedActors(play, NULL, 7);
         Message_CloseTextbox(play);
 
         pos.x = Rand_CenteredFloat(20.0f) + this->unk_274.x;
diff --git a/soh/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c b/soh/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c
index 3ccc932ca..665a06470 100644
--- a/soh/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c
+++ b/soh/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c
@@ -137,7 +137,7 @@ void EnHeishi3_StandSentinelInGrounds(EnHeishi3* this, PlayState* play) {
         Message_StartTextbox(play, 0x702D, &this->actor);
         func_80078884(NA_SE_SY_FOUND);
         osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発見！ ☆☆☆☆☆ \n" VT_RST); // "Discovered!"
-        func_8002DF54(play, &this->actor, 1);
+        Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
         this->actionFunc = EnHeishi3_CatchStart;
     }
 }
@@ -165,7 +165,7 @@ void EnHeishi3_StandSentinelInCastle(EnHeishi3* this, PlayState* play) {
         Message_StartTextbox(play, 0x702D, &this->actor);
         func_80078884(NA_SE_SY_FOUND);
         osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発見！ ☆☆☆☆☆ \n" VT_RST); // "Discovered!"
-        func_8002DF54(play, &this->actor, 1);
+        Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
         this->actionFunc = EnHeishi3_CatchStart;
     }
 }
diff --git a/soh/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c b/soh/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c
index 391d7dc5d..d3b81c3d2 100644
--- a/soh/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c
+++ b/soh/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c
@@ -270,7 +270,7 @@ void func_80A56994(EnHeishi4* this, PlayState* play) {
     if ((this->unk_282 == Message_GetState(&play->msgCtx)) && Message_ShouldAdvance(play)) {
         Message_CloseTextbox(play);
         Flags_SetInfTable(INFTABLE_6C);
-        func_8002DF54(play, NULL, 8);
+        Player_SetCsActionWithHaltedActors(play, NULL, 8);
         this->actionFunc = func_80A56A50;
     }
 }
@@ -288,7 +288,7 @@ void func_80A56ACC(EnHeishi4* this, PlayState* play) {
 
     SkelAnime_Update(&this->skelAnime);
     if (this->unk_288 <= currentFrame) {
-        func_8002DF54(play, NULL, 7);
+        Player_SetCsActionWithHaltedActors(play, NULL, 7);
         this->actionFunc = func_80A5673C;
     }
 }
diff --git a/soh/src/overlays/actors/ovl_En_Hs/z_en_hs.c b/soh/src/overlays/actors/ovl_En_Hs/z_en_hs.c
index c8d70fe1f..eb3556a6e 100644
--- a/soh/src/overlays/actors/ovl_En_Hs/z_en_hs.c
+++ b/soh/src/overlays/actors/ovl_En_Hs/z_en_hs.c
@@ -162,7 +162,7 @@ void func_80A6E740(EnHs* this, PlayState* play) {
         Flags_SetRandomizerInf(RAND_INF_ADULT_TRADES_LW_TRADE_COJIRO);
         func_80A6E3A0(this, func_80A6E630);
     } else {
-        func_8002F434(&this->actor, play, GI_ODD_MUSHROOM, 10000.0f, 50.0f);
+        Actor_OfferGetItem(&this->actor, play, GI_ODD_MUSHROOM, 10000.0f, 50.0f);
     }
 
     this->unk_2A8 |= 1;
@@ -174,7 +174,7 @@ void func_80A6E7BC(EnHs* this, PlayState* play) {
             case 0:
                 func_80A6E3A0(this, func_80A6E740);
                 if (GameInteractor_Should(GI_VB_TRADE_COJIRO, true, this)) {
-                    func_8002F434(&this->actor, play, GI_ODD_MUSHROOM, 10000.0f, 50.0f);
+                    Actor_OfferGetItem(&this->actor, play, GI_ODD_MUSHROOM, 10000.0f, 50.0f);
                 }
                 break;
             case 1:
diff --git a/soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c b/soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c
index e0ff7470d..6d8640f3f 100644
--- a/soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c
+++ b/soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c
@@ -411,7 +411,7 @@ s32 EnHy_IsOsAnimeObjectLoaded(EnHy* this, PlayState* play) {
 
 void func_80A6F7CC(EnHy* this, PlayState* play, s32 getItemId) {
     this->unkGetItemId = getItemId;
-    func_8002F434(&this->actor, play, getItemId, this->actor.xzDistToPlayer + 1.0f,
+    Actor_OfferGetItem(&this->actor, play, getItemId, this->actor.xzDistToPlayer + 1.0f,
                   fabsf(this->actor.yDistToPlayer) + 1.0f);
 }
 
@@ -1069,7 +1069,7 @@ void func_80A714C4(EnHy* this, PlayState* play) {
         this->actionFunc = func_80A71530;
     } else {
         if (!IS_RANDO || this->getItemEntry.getItemId == GI_NONE) {
-            func_8002F434(&this->actor, play, this->unkGetItemId, this->actor.xzDistToPlayer + 1.0f, fabsf(this->actor.yDistToPlayer) + 1.0f);
+            Actor_OfferGetItem(&this->actor, play, this->unkGetItemId, this->actor.xzDistToPlayer + 1.0f, fabsf(this->actor.yDistToPlayer) + 1.0f);
         } else {
             GiveItemEntryFromActor(&this->actor, play, this->getItemEntry, this->actor.xzDistToPlayer + 1.0f, fabsf(this->actor.yDistToPlayer) + 1.0f);
         }
diff --git a/soh/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c b/soh/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c
index f412e7398..3503aef08 100644
--- a/soh/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c
+++ b/soh/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c
@@ -216,7 +216,7 @@ void EnIceHono_CapturableFlame(EnIceHono* this, PlayState* play) {
         this->actor.parent = NULL;
     } else if (EnIceHono_InBottleRange(this, play)) {
         // GI_MAX in this case allows the player to catch the actor in a bottle
-        func_8002F434(&this->actor, play, GI_MAX, 60.0f, 100.0f);
+        Actor_OfferGetItem(&this->actor, play, GI_MAX, 60.0f, 100.0f);
     }
 
     if (this->actor.xzDistToPlayer < 200.0f) {
diff --git a/soh/src/overlays/actors/ovl_En_In/z_en_in.c b/soh/src/overlays/actors/ovl_En_In/z_en_in.c
index 1d0866e6d..6edf01333 100644
--- a/soh/src/overlays/actors/ovl_En_In/z_en_in.c
+++ b/soh/src/overlays/actors/ovl_En_In/z_en_in.c
@@ -434,7 +434,7 @@ void func_80A79BAC(EnIn* this, PlayState* play, s32 index, u32 transitionType) {
     }
     play->transitionType = transitionType;
     play->transitionTrigger = TRANS_TRIGGER_START;
-    func_8002DF54(play, &this->actor, 8);
+    Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
     Interface_ChangeAlpha(1);
     if (index == 0) {
         AREG(6) = 0;
@@ -856,7 +856,7 @@ void func_80A7ABD4(EnIn* this, PlayState* play) {
 void func_80A7AE84(EnIn* this, PlayState* play) {
     Play_ChangeCameraStatus(play, this->activeCamId, CAM_STAT_ACTIVE);
     Play_ClearCamera(play, this->camId);
-    func_8002DF54(play, &this->actor, 7);
+    Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
     Interface_ChangeAlpha(0x32);
     this->actionFunc = func_80A7AEF0;
 }
diff --git a/soh/src/overlays/actors/ovl_En_Insect/z_en_insect.c b/soh/src/overlays/actors/ovl_En_Insect/z_en_insect.c
index 393e10a91..862b6f92b 100644
--- a/soh/src/overlays/actors/ovl_En_Insect/z_en_insect.c
+++ b/soh/src/overlays/actors/ovl_En_Insect/z_en_insect.c
@@ -786,7 +786,7 @@ void EnInsect_Update(Actor* thisx, PlayState* play) {
 
             if (!(this->unk_314 & 8) && D_80A7DEB4 < 4 && EnInsect_InBottleRange(this, play) &&
                 // GI_MAX in this case allows the player to catch the actor in a bottle
-                func_8002F434(&this->actor, play, GI_MAX, 60.0f, 30.0f)) {
+                Actor_OfferGetItem(&this->actor, play, GI_MAX, 60.0f, 30.0f)) {
                 D_80A7DEB4++;
             }
         }
diff --git a/soh/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c b/soh/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c
index af10aa086..c79033250 100644
--- a/soh/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c
+++ b/soh/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c
@@ -379,9 +379,9 @@ void EnIshi_Wait(EnIshi* this, PlayState* play) {
             if (this->actor.xzDistToPlayer < 90.0f) {
                 // GI_NONE in these cases allows the player to lift the actor
                 if (type == ROCK_LARGE) {
-                    func_8002F434(&this->actor, play, GI_NONE, 80.0f, 20.0f);
+                    Actor_OfferGetItem(&this->actor, play, GI_NONE, 80.0f, 20.0f);
                 } else {
-                    func_8002F434(&this->actor, play, GI_NONE, 50.0f, 10.0f);
+                    Actor_OfferGetItem(&this->actor, play, GI_NONE, 50.0f, 10.0f);
                 }
             }
         }
diff --git a/soh/src/overlays/actors/ovl_En_Js/z_en_js.c b/soh/src/overlays/actors/ovl_En_Js/z_en_js.c
index 793017d3d..1baf3413a 100644
--- a/soh/src/overlays/actors/ovl_En_Js/z_en_js.c
+++ b/soh/src/overlays/actors/ovl_En_Js/z_en_js.c
@@ -136,7 +136,7 @@ void func_80A89160(EnJs* this, PlayState* play) {
         GetItemEntry itemEntry = ItemTable_Retrieve(GI_BOMBCHUS_10);
         gSaveContext.pendingSale = itemEntry.itemId;
         gSaveContext.pendingSaleMod = itemEntry.modIndex;
-        func_8002F434(&this->actor, play, GI_BOMBCHUS_10, 10000.0f, 50.0f);
+        Actor_OfferGetItem(&this->actor, play, GI_BOMBCHUS_10, 10000.0f, 50.0f);
     }
 }
 
diff --git a/soh/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c b/soh/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c
index cf2f4499b..99cc81540 100644
--- a/soh/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c
+++ b/soh/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c
@@ -260,7 +260,7 @@ void func_80A8F8D0(EnKakasi* this, PlayState* play) {
 void func_80A8F9C8(EnKakasi* this, PlayState* play) {
     func_80A8F28C(this);
     SkelAnime_Update(&this->skelanime);
-    func_8002DF54(play, NULL, 8);
+    Player_SetCsActionWithHaltedActors(play, NULL, 8);
 
     if (this->unk_196 == Message_GetState(&play->msgCtx) && Message_ShouldAdvance(play)) {
 
@@ -269,7 +269,7 @@ void func_80A8F9C8(EnKakasi* this, PlayState* play) {
         }
         this->camId = OnePointCutscene_Init(play, 2270, -99, &this->actor, MAIN_CAM);
         play->msgCtx.msgMode = MSGMODE_PAUSED;
-        func_8002DF54(play, NULL, 8);
+        Player_SetCsActionWithHaltedActors(play, NULL, 8);
         func_8010BD58(play, OCARINA_ACTION_SCARECROW_LONG_PLAYBACK);
         this->actionFunc = func_80A8FAA4;
     }
@@ -308,7 +308,7 @@ void func_80A8FBB8(EnKakasi* this, PlayState* play) {
     if (this->unk_196 == Message_GetState(&play->msgCtx) && Message_ShouldAdvance(play)) {
         func_8005B1A4(play->cameraPtrs[this->camId]);
         Message_CloseTextbox(play);
-        func_8002DF54(play, NULL, 7);
+        Player_SetCsActionWithHaltedActors(play, NULL, 7);
         this->actionFunc = func_80A8F660;
     }
 }
diff --git a/soh/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c b/soh/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c
index 37b6236a5..9cb4e5de5 100644
--- a/soh/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c
+++ b/soh/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c
@@ -296,7 +296,7 @@ void func_80A91620(EnKakasi3* this, PlayState* play) {
     if (play->msgCtx.ocarinaMode == OCARINA_MODE_03 && play->msgCtx.msgMode == MSGMODE_NONE) {
         this->dialogState = TEXT_STATE_EVENT;
         Message_StartTextbox(play, 0x40A5, NULL);
-        func_8002DF54(play, NULL, 8);
+        Player_SetCsActionWithHaltedActors(play, NULL, 8);
         this->actionFunc = func_80A91A90;
         return;
     }
@@ -354,7 +354,7 @@ void func_80A918E4(EnKakasi3* this, PlayState* play) {
         this->dialogState = TEXT_STATE_EVENT;
         OnePointCutscene_EndCutscene(play, this->camId);
         this->camId = SUBCAM_NONE;
-        func_8002DF54(play, NULL, 8);
+        Player_SetCsActionWithHaltedActors(play, NULL, 8);
         this->actionFunc = func_80A91A90;
         return;
     }
@@ -370,7 +370,7 @@ void func_80A918E4(EnKakasi3* this, PlayState* play) {
         this->unk_195 = true;
         Message_StartTextbox(play, 0x40A7, NULL);
         this->dialogState = TEXT_STATE_EVENT;
-        func_8002DF54(play, NULL, 8);
+        Player_SetCsActionWithHaltedActors(play, NULL, 8);
         this->actionFunc = func_80A91A90;
         return;
     }
@@ -384,7 +384,7 @@ void func_80A918E4(EnKakasi3* this, PlayState* play) {
 void func_80A91A90(EnKakasi3* this, PlayState* play) {
     func_80A90E28(this);
     SkelAnime_Update(&this->skelAnime);
-    func_8002DF54(play, NULL, 8);
+    Player_SetCsActionWithHaltedActors(play, NULL, 8);
 
     if (this->dialogState == Message_GetState(&play->msgCtx) && Message_ShouldAdvance(play)) {
         if (this->unk_195) {
@@ -400,7 +400,7 @@ void func_80A91A90(EnKakasi3* this, PlayState* play) {
         }
         Message_CloseTextbox(play);
         play->msgCtx.ocarinaMode = OCARINA_MODE_04;
-        func_8002DF54(play, NULL, 7);
+        Player_SetCsActionWithHaltedActors(play, NULL, 7);
         this->actionFunc = func_80A911F0;
     }
 }
diff --git a/soh/src/overlays/actors/ovl_En_Ko/z_en_ko.c b/soh/src/overlays/actors/ovl_En_Ko/z_en_ko.c
index c801356c9..4e83742c3 100644
--- a/soh/src/overlays/actors/ovl_En_Ko/z_en_ko.c
+++ b/soh/src/overlays/actors/ovl_En_Ko/z_en_ko.c
@@ -1215,7 +1215,7 @@ void func_80A99504(EnKo* this, PlayState* play) {
         this->actor.parent = NULL;
         this->actionFunc = func_80A99560;
     } else {
-        func_8002F434(&this->actor, play, GI_SAW, 120.0f, 10.0f);
+        Actor_OfferGetItem(&this->actor, play, GI_SAW, 120.0f, 10.0f);
     }
 }
 
diff --git a/soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c b/soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c
index 3d5c2c354..9ee9f6d0a 100644
--- a/soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c
+++ b/soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c
@@ -396,7 +396,7 @@ void EnKz_SetupMweep(EnKz* this, PlayState* play) {
     initPos.y += -100.0f;
     initPos.z += 260.0f;
     Play_CameraSetAtEye(play, this->cutsceneCamera, &pos, &initPos);
-    func_8002DF54(play, &this->actor, 8);
+    Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
     this->actor.speedXZ = 0.1f * CVarGetInteger("gMweepSpeed", 1);
     this->actionFunc = EnKz_Mweep;
 }
@@ -428,7 +428,7 @@ void EnKz_Mweep(EnKz* this, PlayState* play) {
 void EnKz_StopMweep(EnKz* this, PlayState* play) {
     Play_ChangeCameraStatus(play, this->gameplayCamera, CAM_STAT_ACTIVE);
     Play_ClearCamera(play, this->cutsceneCamera);
-    func_8002DF54(play, &this->actor, 7);
+    Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
     this->actionFunc = EnKz_Wait;
 }
 
@@ -463,7 +463,7 @@ void EnKz_SetupGetItem(EnKz* this, PlayState* play) {
         getItemId = this->isTrading ? GI_FROG : GI_TUNIC_ZORA;
         yRange = fabsf(this->actor.yDistToPlayer) + 1.0f;
         xzRange = this->actor.xzDistToPlayer + 1.0f;
-        func_8002F434(&this->actor, play, getItemId, xzRange, yRange);
+        Actor_OfferGetItem(&this->actor, play, getItemId, xzRange, yRange);
     }
 }
 
diff --git a/soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c b/soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c
index 3edae9858..267a49bcd 100644
--- a/soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c
+++ b/soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c
@@ -335,7 +335,7 @@ void func_80AA0EA0(EnMa1* this, PlayState* play) {
         this->actor.parent = NULL;
         this->actionFunc = func_80AA0EFC;
     } else {
-        func_8002F434(&this->actor, play, GI_WEIRD_EGG, 120.0f, 10.0f);
+        Actor_OfferGetItem(&this->actor, play, GI_WEIRD_EGG, 120.0f, 10.0f);
     }
 }
 
diff --git a/soh/src/overlays/actors/ovl_En_Mk/z_en_mk.c b/soh/src/overlays/actors/ovl_En_Mk/z_en_mk.c
index eac914089..64510807c 100644
--- a/soh/src/overlays/actors/ovl_En_Mk/z_en_mk.c
+++ b/soh/src/overlays/actors/ovl_En_Mk/z_en_mk.c
@@ -102,7 +102,7 @@ void func_80AACA94(EnMk* this, PlayState* play) {
             gSaveContext.eventInf[1] &= ~1;
         }
     } else {
-        func_8002F434(&this->actor, play, GI_EYEDROPS, 10000.0f, 50.0f);
+        Actor_OfferGetItem(&this->actor, play, GI_EYEDROPS, 10000.0f, 50.0f);
     }
 }
 
@@ -110,7 +110,7 @@ void func_80AACB14(EnMk* this, PlayState* play) {
     if (Actor_TextboxIsClosing(&this->actor, play)) {
         this->actionFunc = func_80AACA94;
         if (GameInteractor_Should(GI_VB_TRADE_FROG, true, this)) {
-            func_8002F434(&this->actor, play, GI_EYEDROPS, 10000.0f, 50.0f);
+            Actor_OfferGetItem(&this->actor, play, GI_EYEDROPS, 10000.0f, 50.0f);
         }
     }
 }
@@ -205,7 +205,7 @@ void func_80AACFA0(EnMk* this, PlayState* play) {
         this->actionFunc = func_80AACA40;
         Flags_SetItemGetInf(ITEMGETINF_10);
     } else {
-        func_8002F434(&this->actor, play, GI_HEART_PIECE, 10000.0f, 50.0f);
+        Actor_OfferGetItem(&this->actor, play, GI_HEART_PIECE, 10000.0f, 50.0f);
     }
 }
 
@@ -213,7 +213,7 @@ void func_80AAD014(EnMk* this, PlayState* play) {
     if (Actor_TextboxIsClosing(&this->actor, play)) {
         this->actionFunc = func_80AACFA0;
         if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_LAB_DIVE, true, this)) {
-            func_8002F434(&this->actor, play, GI_HEART_PIECE, 10000.0f, 50.0f);
+            Actor_OfferGetItem(&this->actor, play, GI_HEART_PIECE, 10000.0f, 50.0f);
         }
     }
 
diff --git a/soh/src/overlays/actors/ovl_En_Ms/z_en_ms.c b/soh/src/overlays/actors/ovl_En_Ms/z_en_ms.c
index 72b84db3b..244be5cde 100644
--- a/soh/src/overlays/actors/ovl_En_Ms/z_en_ms.c
+++ b/soh/src/overlays/actors/ovl_En_Ms/z_en_ms.c
@@ -134,7 +134,7 @@ void EnMs_Talk(EnMs* this, PlayState* play) {
                 }
     
                 if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_MAGIC_BEAN_SALESMAN, true, this)) {
-                    func_8002F434(&this->actor, play, GI_BEAN, 90.0f, 10.0f);
+                    Actor_OfferGetItem(&this->actor, play, GI_BEAN, 90.0f, 10.0f);
                     this->actionFunc = EnMs_Sell;
                 }
                 return;
@@ -152,7 +152,7 @@ void EnMs_Sell(EnMs* this, PlayState* play) {
         this->actor.parent = NULL;
         this->actionFunc = EnMs_TalkAfterPurchase;
     } else {
-        func_8002F434(&this->actor, play, GI_BEAN, 90.0f, 10.0f);
+        Actor_OfferGetItem(&this->actor, play, GI_BEAN, 90.0f, 10.0f);
     }
 }
 
diff --git a/soh/src/overlays/actors/ovl_En_Niw/z_en_niw.c b/soh/src/overlays/actors/ovl_En_Niw/z_en_niw.c
index 91730e5bf..0497b82e9 100644
--- a/soh/src/overlays/actors/ovl_En_Niw/z_en_niw.c
+++ b/soh/src/overlays/actors/ovl_En_Niw/z_en_niw.c
@@ -467,7 +467,7 @@ void func_80AB6450(EnNiw* this, PlayState* play) {
         this->actionFunc = func_80AB6BF8;
     } else {
         // GI_NONE in this case allows the player to lift the actor
-        func_8002F434(&this->actor, play, GI_NONE, 25.0f, 10.0f);
+        Actor_OfferGetItem(&this->actor, play, GI_NONE, 25.0f, 10.0f);
         func_80AB5BF8(this, play, 1);
     }
 }
diff --git a/soh/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c b/soh/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c
index b4e6d8892..612abcf0e 100644
--- a/soh/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c
+++ b/soh/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c
@@ -314,7 +314,7 @@ void func_80ABA654(EnNiwLady* this, PlayState* play) {
 
             if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_ANJU_AS_CHILD, true, this)) {
                 this->getItemId = GI_BOTTLE;
-                func_8002F434(&this->actor, play, GI_BOTTLE, 100.0f, 50.0f);
+                Actor_OfferGetItem(&this->actor, play, GI_BOTTLE, 100.0f, 50.0f);
             } else {
                 // Circumvent the item offer action
                 this->actionFunc = func_80ABAC84;
@@ -327,7 +327,7 @@ void func_80ABA654(EnNiwLady* this, PlayState* play) {
         }
         if (this->unk_26C == 1) {
             this->getItemId = GI_RUPEE_PURPLE;
-            func_8002F434(&this->actor, play, GI_RUPEE_PURPLE, 100.0f, 50.0f);
+            Actor_OfferGetItem(&this->actor, play, GI_RUPEE_PURPLE, 100.0f, 50.0f);
             this->actionFunc = func_80ABAC00;
         }
         this->actionFunc = func_80ABA244;
@@ -405,7 +405,7 @@ void func_80ABA9B8(EnNiwLady* this, PlayState* play) {
                 this->actor.parent = NULL;
 
                 if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_ANJU_AS_ADULT, true, this)) {
-                    func_8002F434(&this->actor, play, GI_POCKET_EGG, 200.0f, 100.0f);
+                    Actor_OfferGetItem(&this->actor, play, GI_POCKET_EGG, 200.0f, 100.0f);
                     this->actionFunc = func_80ABAC00;
                 } else {
                     // Circumvent the item offer action
@@ -440,7 +440,7 @@ void func_80ABAB08(EnNiwLady* this, PlayState* play) {
                 Message_CloseTextbox(play);
                 this->actor.parent = NULL;
                 if (GameInteractor_Should(GI_VB_TRADE_POCKET_CUCCO, true, this)) {
-                    func_8002F434(&this->actor, play, GI_COJIRO, 200.0f, 100.0f);
+                    Actor_OfferGetItem(&this->actor, play, GI_COJIRO, 200.0f, 100.0f);
                     this->actionFunc = func_80ABAC00;
                 } else {
                     // Circumvent the item offer action
@@ -471,7 +471,7 @@ void func_80ABAC00(EnNiwLady* this, PlayState* play) {
         if (LINK_IS_ADULT) {
             getItemId = !Flags_GetItemGetInf(ITEMGETINF_2C) ? GI_POCKET_EGG : GI_COJIRO;
         }
-        func_8002F434(&this->actor, play, getItemId, 200.0f, 100.0f);
+        Actor_OfferGetItem(&this->actor, play, getItemId, 200.0f, 100.0f);
     }
 }
 
diff --git a/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
index 34ef24e40..a2c1f5f9a 100644
--- a/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
+++ b/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
@@ -1389,7 +1389,7 @@ void EnOssan_GiveItemWithFanfare(PlayState* play, EnOssan* this) {
 
     osSyncPrintf("\n" VT_FGCOL(YELLOW) "初めて手にいれた！！" VT_RST "\n\n");
     if (!IS_RANDO) {
-        func_8002F434(&this->actor, play, this->shelfSlots[this->cursorIndex]->getItemId, 120.0f, 120.0f);
+        Actor_OfferGetItem(&this->actor, play, this->shelfSlots[this->cursorIndex]->getItemId, 120.0f, 120.0f);
     } else {
         ShopItemIdentity shopItemIdentity = Randomizer_IdentifyShopItem(play->sceneNum, this->cursorIndex);
         // en_ossan/en_girla are also used for the happy mask shop, which never has randomized items
@@ -1398,7 +1398,7 @@ void EnOssan_GiveItemWithFanfare(PlayState* play, EnOssan* this) {
             GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(shopItemIdentity.randomizerCheck, shopItemIdentity.ogItemId);
             GiveItemEntryFromActor(&this->actor, play, getItemEntry, 120.0f, 120.0f);
         } else {
-            func_8002F434(&this->actor, play, this->shelfSlots[this->cursorIndex]->getItemId, 120.0f, 120.0f);
+            Actor_OfferGetItem(&this->actor, play, this->shelfSlots[this->cursorIndex]->getItemId, 120.0f, 120.0f);
         }
     }
     play->msgCtx.msgMode = MSGMODE_TEXT_CLOSING;
@@ -1736,7 +1736,7 @@ void EnOssan_State_GiveItemWithFanfare(EnOssan* this, PlayState* play, Player* p
         return;
     }
     if (!IS_RANDO) {
-        func_8002F434(&this->actor, play, this->shelfSlots[this->cursorIndex]->getItemId, 120.0f, 120.0f);
+        Actor_OfferGetItem(&this->actor, play, this->shelfSlots[this->cursorIndex]->getItemId, 120.0f, 120.0f);
     } else {
         ShopItemIdentity shopItemIdentity = Randomizer_IdentifyShopItem(play->sceneNum, this->cursorIndex);
         // en_ossan/en_girla are also used for the happy mask shop, which never has randomized items
@@ -1746,7 +1746,7 @@ void EnOssan_State_GiveItemWithFanfare(EnOssan* this, PlayState* play, Player* p
                 Randomizer_GetItemFromKnownCheck(shopItemIdentity.randomizerCheck, shopItemIdentity.ogItemId);
             GiveItemEntryFromActor(&this->actor, play, getItemEntry, 120.0f, 120.0f);
         } else {
-            func_8002F434(&this->actor, play, this->shelfSlots[this->cursorIndex]->getItemId, 120.0f, 120.0f);
+            Actor_OfferGetItem(&this->actor, play, this->shelfSlots[this->cursorIndex]->getItemId, 120.0f, 120.0f);
         }
     }
 }
diff --git a/soh/src/overlays/actors/ovl_En_Owl/z_en_owl.c b/soh/src/overlays/actors/ovl_En_Owl/z_en_owl.c
index 4ae7d366f..d46424b0b 100644
--- a/soh/src/overlays/actors/ovl_En_Owl/z_en_owl.c
+++ b/soh/src/overlays/actors/ovl_En_Owl/z_en_owl.c
@@ -345,7 +345,7 @@ void func_80ACA71C(EnOwl* this) {
 }
 
 void func_80ACA76C(EnOwl* this, PlayState* play) {
-    func_8002DF54(play, &this->actor, 8);
+    Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
 
     if (Actor_TextboxIsClosing(&this->actor, play)) {
         Audio_QueueSeqCmd(0x1 << 28 | SEQ_PLAYER_FANFARE << 24 | 0xFF);
@@ -355,7 +355,7 @@ void func_80ACA76C(EnOwl* this, PlayState* play) {
 }
 
 void func_80ACA7E0(EnOwl* this, PlayState* play) {
-    func_8002DF54(play, &this->actor, 8);
+    Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
 
     if (Actor_TextboxIsClosing(&this->actor, play)) {
         Audio_QueueSeqCmd(0x1 << 28 | SEQ_PLAYER_FANFARE << 24 | 0xFF);
@@ -565,7 +565,7 @@ void EnOwl_WaitLakeHylia(EnOwl* this, PlayState* play) {
 }
 
 void func_80ACB03C(EnOwl* this, PlayState* play) {
-    func_8002DF54(play, &this->actor, 8);
+    Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
 
     if (Actor_TextboxIsClosing(&this->actor, play)) {
         Audio_QueueSeqCmd(0x1 << 28 | SEQ_PLAYER_FANFARE << 24 | 0xFF);
diff --git a/soh/src/overlays/actors/ovl_En_Skj/z_en_skj.c b/soh/src/overlays/actors/ovl_En_Skj/z_en_skj.c
index 5bbeb8efe..344a09f19 100644
--- a/soh/src/overlays/actors/ovl_En_Skj/z_en_skj.c
+++ b/soh/src/overlays/actors/ovl_En_Skj/z_en_skj.c
@@ -1040,7 +1040,7 @@ void EnSkj_SariaSongTalk(EnSkj* this, PlayState* play) {
         } else {
             func_80AFFE24(this);
             if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_SKULL_KID_SARIAS_SONG, true, this)) {
-                func_8002F434(&this->actor, play, GI_HEART_PIECE, EnSkj_GetItemXzRange(this), EnSkj_GetItemYRange(this));
+                Actor_OfferGetItem(&this->actor, play, GI_HEART_PIECE, EnSkj_GetItemXzRange(this), EnSkj_GetItemYRange(this));
             }
         }
     }
@@ -1056,7 +1056,7 @@ void func_80AFFE44(EnSkj* this, PlayState* play) {
         EnSkj_SetupPostSariasSong(this);
     } else {
         if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_SKULL_KID_SARIAS_SONG, true, this)) {
-            func_8002F434(&this->actor, play, GI_HEART_PIECE, EnSkj_GetItemXzRange(this), EnSkj_GetItemYRange(this));
+            Actor_OfferGetItem(&this->actor, play, GI_HEART_PIECE, EnSkj_GetItemXzRange(this), EnSkj_GetItemYRange(this));
         }
     }
 }
@@ -1080,7 +1080,7 @@ void EnSkj_SetupMaskTrade(EnSkj* this) {
 void EnSkj_StartMaskTrade(EnSkj* this, PlayState* play) {
     u8 sp1F = Message_GetState(&play->msgCtx);
 
-    func_8002DF54(play, &this->actor, 1);
+    Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
     if ((sp1F == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) {
         EnSkj_JumpFromStump(this);
     }
@@ -1178,7 +1178,7 @@ void EnSkj_SetupWaitForMaskTextClear(EnSkj* this) {
 
 void EnSkj_WaitForMaskTextClear(EnSkj* this, PlayState* play) {
     if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) {
-        func_8002DF54(play, &this->actor, 7);
+        Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
         this->backflipFlag = 1;
         EnSkj_Backflip(this);
     }
@@ -1553,7 +1553,7 @@ void EnSkj_WaitToGiveReward(EnSkj* this, PlayState* play) {
             GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_LW_OCARINA_MEMORY_GAME, GI_HEART_PIECE);
             GiveItemEntryFromActor(&this->actor, play, getItemEntry, 26.0f, 26.0f);
         } else {
-            func_8002F434(&this->actor, play, sOcarinaGameRewards[gSaveContext.ocarinaGameRoundNum], 26.0f, 26.0f);
+            Actor_OfferGetItem(&this->actor, play, sOcarinaGameRewards[gSaveContext.ocarinaGameRoundNum], 26.0f, 26.0f);
         }
 
         this->actionFunc = EnSkj_GiveOcarinaGameReward;
@@ -1569,7 +1569,7 @@ void EnSkj_GiveOcarinaGameReward(EnSkj* this, PlayState* play) {
             GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_LW_OCARINA_MEMORY_GAME, GI_HEART_PIECE);
             GiveItemEntryFromActor(&this->actor, play, getItemEntry, 26.0f, 26.0f);
         } else {
-            func_8002F434(&this->actor, play, sOcarinaGameRewards[gSaveContext.ocarinaGameRoundNum], 26.0f, 26.0f);
+            Actor_OfferGetItem(&this->actor, play, sOcarinaGameRewards[gSaveContext.ocarinaGameRoundNum], 26.0f, 26.0f);
         }
     }
 }
diff --git a/soh/src/overlays/actors/ovl_En_Sth/z_en_sth.c b/soh/src/overlays/actors/ovl_En_Sth/z_en_sth.c
index 908a1af96..7a0332910 100644
--- a/soh/src/overlays/actors/ovl_En_Sth/z_en_sth.c
+++ b/soh/src/overlays/actors/ovl_En_Sth/z_en_sth.c
@@ -302,7 +302,7 @@ void EnSth_GivePlayerItem(EnSth* this, PlayState* play) {
     }
 
     if (!IS_RANDO || getItemEntry.getItemId == GI_NONE) {
-        func_8002F434(&this->actor, play, getItemId, 10000.0f, 50.0f);
+        Actor_OfferGetItem(&this->actor, play, getItemId, 10000.0f, 50.0f);
     } else {
         GiveItemEntryFromActor(&this->actor, play, getItemEntry, 10000.0f, 50.0f);
     }
diff --git a/soh/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c b/soh/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
index d84298800..a406049a9 100644
--- a/soh/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
+++ b/soh/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
@@ -387,7 +387,7 @@ void EnSyatekiMan_EndGame(EnSyatekiMan* this, PlayState* play) {
                         }
                     }
                     if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_SHOOTING_GALLERY, true, this)) {
-                        func_8002F434(&this->actor, play, this->getItemId, 2000.0f, 1000.0f);
+                        Actor_OfferGetItem(&this->actor, play, this->getItemId, 2000.0f, 1000.0f);
                     }
                     this->actionFunc = EnSyatekiMan_GivePrize;
                     break;
@@ -421,7 +421,7 @@ void EnSyatekiMan_GivePrize(EnSyatekiMan* this, PlayState* play) {
     if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_SHOOTING_GALLERY, true, this)) {
         this->actionFunc = EnSyatekiMan_FinishPrize;
     } else { 
-        func_8002F434(&this->actor, play, this->getItemId, 2000.0f, 1000.0f);
+        Actor_OfferGetItem(&this->actor, play, this->getItemId, 2000.0f, 1000.0f);
     }
 }
 
diff --git a/soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c b/soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c
index d62e6ddfc..85f5053d1 100644
--- a/soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c
+++ b/soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c
@@ -707,7 +707,7 @@ void func_80B154FC(EnTa* this, PlayState* play) {
                     switch (EnTa_GetSuperCuccosCount(this, play)) {
                         case 1:
                             gSaveContext.timer1State = 0;
-                            func_8002DF54(play, &this->actor, 1);
+                            Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
 
                             Message_StartTextbox(play, 0x2084, &this->actor);
                             this->actionFunc = func_80B15424;
@@ -749,7 +749,7 @@ void func_80B154FC(EnTa* this, PlayState* play) {
         this->unk_2E0 &= ~0x200;
         func_80078884(NA_SE_SY_FOUND);
         gSaveContext.timer1State = 0;
-        func_8002DF54(play, &this->actor, 1);
+        Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
         Message_StartTextbox(play, 0x2081, &this->actor);
         this->actionFunc = func_80B15424;
         func_80B14E28(this, play);
@@ -802,7 +802,7 @@ void func_80B1585C(EnTa* this, PlayState* play) {
         Animation_Change(&this->skelAnime, &gTalonSitWakeUpAnim, 1.0f,
                          Animation_GetLastFrame(&gTalonSitWakeUpAnim) - 1.0f,
                          Animation_GetLastFrame(&gTalonSitWakeUpAnim), ANIMMODE_ONCE, 10.0f);
-        func_8002DF54(play, &this->actor, 7);
+        Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
     }
 }
 
@@ -817,7 +817,7 @@ void func_80B15AD4(EnTa* this, PlayState* play) {
         func_800F5ACC(NA_BGM_TIMED_MINI_GAME);
         this->unk_2E0 |= 0x200;
         Message_CloseTextbox(play);
-        func_8002DF54(play, &this->actor, 1);
+        Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
     }
 
     if ((Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(play)) {
@@ -877,10 +877,10 @@ void func_80B15E80(EnTa* this, PlayState* play) {
         }
         this->unk_2E0 &= ~0x2;
     } else if (this->unk_2E0 & 2) {
-        func_8002F434(&this->actor, play, GI_MILK, 10000.0f, 50.0f);
+        Actor_OfferGetItem(&this->actor, play, GI_MILK, 10000.0f, 50.0f);
     } else {
         if (!IS_RANDO) {
-            func_8002F434(&this->actor, play, GI_MILK_BOTTLE, 10000.0f, 50.0f);
+            Actor_OfferGetItem(&this->actor, play, GI_MILK_BOTTLE, 10000.0f, 50.0f);
         } else {
             GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_LLR_TALONS_CHICKENS, GI_MILK_BOTTLE);
             GiveItemEntryFromActor(&this->actor, play, getItemEntry, 10000.0f, 50.0f);
@@ -895,7 +895,7 @@ void func_80B15F54(EnTa* this, PlayState* play) {
         this->unk_2E0 &= ~0x2;
         func_80B13AA0(this, func_80B15E80, func_80B16938);
         if (!IS_RANDO) {
-            func_8002F434(&this->actor, play, GI_MILK_BOTTLE, 10000.0f, 50.0f);
+            Actor_OfferGetItem(&this->actor, play, GI_MILK_BOTTLE, 10000.0f, 50.0f);
         } else {
             GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_LLR_TALONS_CHICKENS, GI_MILK_BOTTLE);
             GiveItemEntryFromActor(&this->actor, play, getItemEntry, 10000.0f, 50.0f);
@@ -923,7 +923,7 @@ void func_80B15FE8(EnTa* this, PlayState* play) {
                         GetItemEntry itemEntry = ItemTable_Retrieve(GI_MILK);
                         gSaveContext.pendingSale = itemEntry.itemId;
                         gSaveContext.pendingSaleMod = itemEntry.modIndex;
-                        func_8002F434(&this->actor, play, GI_MILK, 10000.0f, 50.0f);
+                        Actor_OfferGetItem(&this->actor, play, GI_MILK, 10000.0f, 50.0f);
                         break;
                 }
                 break;
@@ -1014,7 +1014,7 @@ void func_80B1642C(EnTa* this, PlayState* play) {
             Message_CloseTextbox(play);
             this->unk_2E0 |= 2;
             func_80B13AA0(this, func_80B15E80, func_80B16938);
-            func_8002F434(&this->actor, play, GI_MILK, 10000.0f, 50.0f);
+            Actor_OfferGetItem(&this->actor, play, GI_MILK, 10000.0f, 50.0f);
         } else {
             Message_ContinueTextbox(play, 0x208A);
             func_80B13AA0(this, func_80B15E28, func_80B16938);
diff --git a/soh/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c b/soh/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c
index f614e0f4c..e15d481fd 100644
--- a/soh/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c
+++ b/soh/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c
@@ -147,7 +147,7 @@ void func_80B17934(EnTakaraMan* this, PlayState* play) {
                     Rupees_ChangeBy(-10);
                     this->unk_214 = 1;
                     this->actor.parent = NULL;
-                    func_8002F434(&this->actor, play, GI_DOOR_KEY, 2000.0f, 1000.0f);
+                    Actor_OfferGetItem(&this->actor, play, GI_DOOR_KEY, 2000.0f, 1000.0f);
                     this->actionFunc = func_80B17A6C;
                 } else {
                     Message_CloseTextbox(play);
@@ -172,7 +172,7 @@ void func_80B17A6C(EnTakaraMan* this, PlayState* play) {
     if (Actor_HasParent(&this->actor, play)) {
         this->actionFunc = func_80B17AC4;
     } else {
-        func_8002F434(&this->actor, play, GI_DOOR_KEY, 2000.0f, 1000.0f);
+        Actor_OfferGetItem(&this->actor, play, GI_DOOR_KEY, 2000.0f, 1000.0f);
     }
 }
 
diff --git a/soh/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c b/soh/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c
index c2ac2861b..275b62ba1 100644
--- a/soh/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c
+++ b/soh/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c
@@ -317,7 +317,7 @@ void func_80B20768(EnToryo* this, PlayState* play) {
             this->unk_1E4 = 5;
             Flags_SetRandomizerInf(RAND_INF_ADULT_TRADES_GV_TRADE_SAW);
         } else {
-            func_8002F434(&this->actor, play, GI_SWORD_BROKEN, 100.0f, 10.0f);
+            Actor_OfferGetItem(&this->actor, play, GI_SWORD_BROKEN, 100.0f, 10.0f);
         }
         return;
     }
diff --git a/soh/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c b/soh/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c
index 658dd63f8..5aeb0a86b 100644
--- a/soh/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c
+++ b/soh/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c
@@ -196,7 +196,7 @@ void func_80B3A3D4(EnWonderTalk2* this, PlayState* play) {
             }
             this->actor.flags &= ~(ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UPDATE_WHILE_CULLED);
             if (GameInteractor_Should(GI_VB_WONDER_TALK, true, this)) {
-                func_8002DF54(play, NULL, 7);
+                Player_SetCsActionWithHaltedActors(play, NULL, 7);
             }
             this->unk_156 = true;
             this->actionFunc = func_80B3A4F8;
@@ -257,7 +257,7 @@ void func_80B3A4F8(EnWonderTalk2* this, PlayState* play) {
             if (!this->unk_156) {
                 if (GameInteractor_Should(GI_VB_WONDER_TALK, true, this)) {
                     Message_StartTextbox(play, this->actor.textId, NULL);
-                    func_8002DF54(play, NULL, 8);
+                    Player_SetCsActionWithHaltedActors(play, NULL, 8);
                 }
                 this->actor.flags |= ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UPDATE_WHILE_CULLED;
                 this->actionFunc = func_80B3A3D4;
diff --git a/soh/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c b/soh/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c
index 133556f52..7234ed57f 100644
--- a/soh/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c
+++ b/soh/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c
@@ -421,7 +421,7 @@ void func_80B4BBC4(EnZl1* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
 
     Animation_Change(&this->skelAnime, &gChildZelda1Anim_00438, 1.0f, 0.0f, frameCount, ANIMMODE_LOOP, 0.0f);
-    func_8002DF54(play, &this->actor, 1);
+    Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
     Player_PlaySfx(&player->actor, NA_SE_VO_LI_SURPRISE_KID);
     this->actor.textId = 0x7039;
     Message_StartTextbox(play, this->actor.textId, NULL);
@@ -510,7 +510,7 @@ void func_80B4BF2C(EnZl1* this, PlayState* play) {
             if ((Message_GetState(msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(play)) {
                 this->actor.textId = 0xFFFF;
                 play->talkWithPlayer(play, &this->actor);
-                func_8002F434(&this->actor, play, GI_LETTER_ZELDA, 120.0f, 10.0f);
+                Actor_OfferGetItem(&this->actor, play, GI_LETTER_ZELDA, 120.0f, 10.0f);
                 play->msgCtx.msgMode = MSGMODE_TEXT_CLOSING;
                 play->msgCtx.stateTimer = 4;
                 this->unk_1E2++;
@@ -525,7 +525,7 @@ void func_80B4BF2C(EnZl1* this, PlayState* play) {
                 this->actor.parent = NULL;
                 this->unk_1E2++;
             } else {
-                func_8002F434(&this->actor, play, GI_LETTER_ZELDA, 120.0f, 10.0f);
+                Actor_OfferGetItem(&this->actor, play, GI_LETTER_ZELDA, 120.0f, 10.0f);
             }
             break;
         case 3:
@@ -554,7 +554,7 @@ void func_80B4BF2C(EnZl1* this, PlayState* play) {
             break;
         case 6:
             if (Actor_TextboxIsClosing(&this->actor, play)) {
-                func_8002DF54(play, &this->actor, 7);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
                 Interface_ChangeAlpha(50);
                 this->actor.flags &= ~ACTOR_FLAG_PLAYER_TALKED_TO;
                 this->unk_1E2 = 4;
diff --git a/soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c b/soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
index f805e2fb5..f2abefd97 100644
--- a/soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
+++ b/soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
@@ -325,7 +325,7 @@ s32 EnZl4_SetupFromLegendCs(EnZl4* this, PlayState* play) {
     Actor* playerx = &GET_PLAYER(play)->actor;
     s16 rotY;
 
-    func_8002DF54(play, &this->actor, 8);
+    Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
     playerx->world.pos = this->actor.world.pos;
     rotY = this->actor.shape.rot.y;
     playerx->world.pos.x += 56.0f * Math_SinS(rotY);
@@ -911,7 +911,7 @@ s32 EnZl4_CsLookWindow(EnZl4* this, PlayState* play) {
                 play->csCtx.segment = SEGMENTED_TO_VIRTUAL(gZeldasCourtyardGanonCs);
                 gSaveContext.cutsceneTrigger = 1;
                 this->talkState++;
-                func_8002DF54(play, &this->actor, 8);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
             }
             break;
         case 2:
@@ -921,7 +921,7 @@ s32 EnZl4_CsLookWindow(EnZl4* this, PlayState* play) {
                 }
             } else {
                 func_800AA000(0.0f, 0xA0, 0xA, 0x28);
-                func_8002DF54(play, &this->actor, 1);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
                 Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ZL4_ANIM_30);
                 EnZl4_SetCsCameraAngle(play, 11);
                 Message_StartTextbox(play, 0x7039, NULL);
@@ -1109,7 +1109,7 @@ s32 EnZl4_CsMakePlan(EnZl4* this, PlayState* play) {
                 this->talkState = 7;
                 play->talkWithPlayer(play, &this->actor);
                 if (GameInteractor_Should(GI_VB_GIVE_ITEM_ZELDAS_LETTER, true, NULL)) {
-                    func_8002F434(&this->actor, play, GI_LETTER_ZELDA, fabsf(this->actor.xzDistToPlayer) + 1.0f,
+                    Actor_OfferGetItem(&this->actor, play, GI_LETTER_ZELDA, fabsf(this->actor.xzDistToPlayer) + 1.0f,
                                 fabsf(this->actor.yDistToPlayer) + 1.0f);
                 }
                 play->msgCtx.stateTimer = 4;
@@ -1121,7 +1121,7 @@ s32 EnZl4_CsMakePlan(EnZl4* this, PlayState* play) {
                 Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ZL4_ANIM_0);
                 this->talkState++;
             } else {
-                func_8002F434(&this->actor, play, GI_LETTER_ZELDA, fabsf(this->actor.xzDistToPlayer) + 1.0f,
+                Actor_OfferGetItem(&this->actor, play, GI_LETTER_ZELDA, fabsf(this->actor.xzDistToPlayer) + 1.0f,
                               fabsf(this->actor.yDistToPlayer) + 1.0f);
             }
             // no break here is required for matching
@@ -1189,7 +1189,7 @@ void EnZl4_Cutscene(EnZl4* this, PlayState* play) {
             break;
         case ZL4_CS_PLAN:
             if (EnZl4_CsMakePlan(this, play)) {
-                func_8002DF54(play, &this->actor, 7);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
                 gSaveContext.unk_13EE = 0x32;
                 Flags_SetEventChkInf(EVENTCHKINF_OBTAINED_ZELDAS_LETTER);
                 this->actionFunc = EnZl4_Idle;
diff --git a/soh/src/overlays/actors/ovl_En_fHG/z_en_fhg.c b/soh/src/overlays/actors/ovl_En_fHG/z_en_fhg.c
index 9212362d6..0601a7f5b 100644
--- a/soh/src/overlays/actors/ovl_En_fHG/z_en_fhg.c
+++ b/soh/src/overlays/actors/ovl_En_fHG/z_en_fhg.c
@@ -153,7 +153,7 @@ void EnfHG_Intro(EnfHG* this, PlayState* play) {
                 break;
             }
             func_80064520(play, &play->csCtx);
-            func_8002DF54(play, &this->actor, 8);
+            Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
             this->cutsceneCamera = Play_CreateSubCamera(play);
             Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT);
             Play_ChangeCameraStatus(play, this->cutsceneCamera, CAM_STAT_ACTIVE);
@@ -193,7 +193,7 @@ void EnfHG_Intro(EnfHG* this, PlayState* play) {
                 Audio_PlayActorSound2(&this->actor, NA_SE_EV_GANON_HORSE_GROAN);
             }
             if (this->timers[0] == 20) {
-                func_8002DF54(play, &this->actor, 9);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 9);
             }
             if (this->timers[0] == 1) {
                 Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_OPENING_GANON);
@@ -354,7 +354,7 @@ void EnfHG_Intro(EnfHG* this, PlayState* play) {
                 this->bossGndSignal = FHG_FINISH;
             }
             if (this->timers[0] == 170) {
-                func_8002DF54(play, &this->actor, 8);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
                 Audio_PlayActorSound2(&this->actor, NA_SE_EN_FANTOM_MASIC2);
             }
             Math_ApproachF(&this->cameraEye.z, this->cameraPanZ + (GND_BOSSROOM_CENTER_Z + 100.0f), 0.1f,
@@ -401,7 +401,7 @@ void EnfHG_Intro(EnfHG* this, PlayState* play) {
                 func_800C08AC(play, this->cutsceneCamera, 0);
                 this->cutsceneCamera = 0;
                 func_80064534(play, &play->csCtx);
-                func_8002DF54(play, &this->actor, 7);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
                 this->actionFunc = EnfHG_Retreat;
             }
             break;
diff --git a/soh/src/overlays/actors/ovl_Fishing/z_fishing.c b/soh/src/overlays/actors/ovl_Fishing/z_fishing.c
index 48d85723e..8b7c77aca 100644
--- a/soh/src/overlays/actors/ovl_Fishing/z_fishing.c
+++ b/soh/src/overlays/actors/ovl_Fishing/z_fishing.c
@@ -5160,7 +5160,7 @@ void Fishing_HandleOwnerDialog(Fishing* this, PlayState* play) {
 
                 this->actor.parent = NULL;
                 if (!IS_RANDO || getItemEntry.getItemId == GI_NONE) {
-                    func_8002F434(&this->actor, play, getItemId, 2000.0f, 1000.0f);
+                    Actor_OfferGetItem(&this->actor, play, getItemId, 2000.0f, 1000.0f);
                 } else {
                     GiveItemEntryFromActor(&this->actor, play, getItemEntry, 2000.0f, 1000.0f);
                 }
@@ -5215,7 +5215,7 @@ void Fishing_HandleOwnerDialog(Fishing* this, PlayState* play) {
                 this->stateAndTimer = 24;
             } else {
                 if (!IS_RANDO) {
-                    func_8002F434(&this->actor, play, GI_SCALE_GOLD, 2000.0f, 1000.0f);
+                    Actor_OfferGetItem(&this->actor, play, GI_SCALE_GOLD, 2000.0f, 1000.0f);
                 } else {
                     GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_LH_ADULT_FISHING, GI_SCALE_GOLD);
                     GiveItemEntryFromActor(&this->actor, play, getItemEntry, 2000.0f, 1000.0f);
@@ -5572,7 +5572,7 @@ void Fishing_UpdateOwner(Actor* thisx, PlayState* play2) {
             sSubCamId = Play_CreateSubCamera(play);
             Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT);
             Play_ChangeCameraStatus(play, sSubCamId, CAM_STAT_ACTIVE);
-            func_8002DF54(play, &this->actor, 5);
+            Player_SetCsActionWithHaltedActors(play, &this->actor, 5);
             mainCam = Play_GetCamera(play, MAIN_CAM);
             sCameraEye.x = mainCam->eye.x;
             sCameraEye.y = mainCam->eye.y;
@@ -5604,7 +5604,7 @@ void Fishing_UpdateOwner(Actor* thisx, PlayState* play2) {
                 mainCam->at = sCameraAt;
                 func_800C08AC(play, sSubCamId, 0);
                 func_80064534(play, &play->csCtx);
-                func_8002DF54(play, &this->actor, 7);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
                 sFishingPlayerCinematicState = 0;
                 sSubCamId = 0;
                 sFishingCinematicTimer = 30;
@@ -5620,7 +5620,7 @@ void Fishing_UpdateOwner(Actor* thisx, PlayState* play2) {
             sSubCamId = Play_CreateSubCamera(play);
             Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT);
             Play_ChangeCameraStatus(play, sSubCamId, CAM_STAT_ACTIVE);
-            func_8002DF54(play, &this->actor, 5);
+            Player_SetCsActionWithHaltedActors(play, &this->actor, 5);
             mainCam = Play_GetCamera(play, MAIN_CAM);
             sCameraEye.x = mainCam->eye.x;
             sCameraEye.y = mainCam->eye.y;
@@ -5639,7 +5639,7 @@ void Fishing_UpdateOwner(Actor* thisx, PlayState* play2) {
             if ((sFishingCinematicTimer == 0) && Message_ShouldAdvance(play)) {
                 sFishingPlayerCinematicState = 22;
                 sFishingCinematicTimer = 40;
-                func_8002DF54(play, &this->actor, 0x1C);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 0x1C);
                 sSinkingLureHeldY = 0.0f;
             }
             break;
@@ -5708,7 +5708,7 @@ void Fishing_UpdateOwner(Actor* thisx, PlayState* play2) {
                         mainCam->at = sCameraAt;
                         func_800C08AC(play, sSubCamId, 0);
                         func_80064534(play, &play->csCtx);
-                        func_8002DF54(play, &this->actor, 7);
+                        Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
                         sFishingPlayerCinematicState = 0;
                         sSubCamId = 0;
                         player->unk_860 = -5;
diff --git a/soh/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c b/soh/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c
index f511d5bbf..5015a3908 100644
--- a/soh/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c
+++ b/soh/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c
@@ -59,7 +59,7 @@ void ItemBHeart_Update(Actor* thisx, PlayState* play) {
         Flags_SetCollectible(play, 0x1F);
         Actor_Kill(&this->actor);
     } else {
-        func_8002F434(&this->actor, play, GI_HEART_CONTAINER_2, 30.0f, 40.0f);
+        Actor_OfferGetItem(&this->actor, play, GI_HEART_CONTAINER_2, 30.0f, 40.0f);
     }
 }
 
diff --git a/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c b/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c
index b12d7b4b0..6fdf162db 100644
--- a/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c
+++ b/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c
@@ -134,7 +134,7 @@ void func_80B85824(ItemEtcetera* this, PlayState* play) {
         Actor_Kill(&this->actor);
     } else {
         if (!IS_RANDO) {
-            func_8002F434(&this->actor, play, this->getItemId, 30.0f, 50.0f);
+            Actor_OfferGetItem(&this->actor, play, this->getItemId, 30.0f, 50.0f);
         } else {
             GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_LH_SUN, GI_ARROW_FIRE);
             GiveItemEntryFromActor(&this->actor, play, getItemEntry, 30.0f, 50.0f);
@@ -157,7 +157,7 @@ void func_80B858B4(ItemEtcetera* this, PlayState* play) {
         if (0) {} // Necessary to match
 
         if (!IS_RANDO) {
-            func_8002F434(&this->actor, play, this->getItemId, 30.0f, 50.0f);
+            Actor_OfferGetItem(&this->actor, play, this->getItemId, 30.0f, 50.0f);
         } else {
             GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_LH_UNDERWATER_ITEM, GI_LETTER_RUTO);
             GiveItemEntryFromActor(&this->actor, play, getItemEntry, 30.0f, 50.0f);
diff --git a/soh/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c b/soh/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c
index dba879115..d14862553 100644
--- a/soh/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c
+++ b/soh/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c
@@ -190,7 +190,7 @@ void ItemOcarina_WaitInWater(ItemOcarina* this, PlayState* play) {
         this->actor.draw = NULL;
     } else {
         if (GameInteractor_Should(GI_VB_GIVE_ITEM_OCARINA_OF_TIME, true, NULL)) {
-            func_8002F434(&this->actor, play, GI_OCARINA_OOT, 30.0f, 50.0f);
+            Actor_OfferGetItem(&this->actor, play, GI_OCARINA_OOT, 30.0f, 50.0f);
         }
 
         if ((play->gameplayFrames & 13) == 0) {
diff --git a/soh/src/overlays/actors/ovl_Item_Shield/z_item_shield.c b/soh/src/overlays/actors/ovl_Item_Shield/z_item_shield.c
index e54b343fc..beecbf759 100644
--- a/soh/src/overlays/actors/ovl_Item_Shield/z_item_shield.c
+++ b/soh/src/overlays/actors/ovl_Item_Shield/z_item_shield.c
@@ -103,7 +103,7 @@ void func_80B86AC8(ItemShield* this, PlayState* play) {
         Actor_Kill(&this->actor);
         return;
     }
-    func_8002F434(&this->actor, play, GI_SHIELD_DEKU, 30.0f, 50.0f);
+    Actor_OfferGetItem(&this->actor, play, GI_SHIELD_DEKU, 30.0f, 50.0f);
     Actor_UpdateBgCheckInfo(play, &this->actor, 10.0f, 10.0f, 0.0f, 5);
     if (this->actor.bgCheckFlags & 1) {
         this->timer--;
@@ -125,7 +125,7 @@ void func_80B86BC8(ItemShield* this, PlayState* play) {
         Actor_Kill(&this->actor);
         return;
     }
-    func_8002F434(&this->actor, play, GI_SHIELD_DEKU, 30.0f, 50.0f);
+    Actor_OfferGetItem(&this->actor, play, GI_SHIELD_DEKU, 30.0f, 50.0f);
     if (this->collider.base.acFlags & AC_HIT) {
         ItemShield_SetupAction(this, func_80B86AC8);
         this->actor.velocity.y = 4.0f;
diff --git a/soh/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c b/soh/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c
index 2346b34ff..0dd03a5be 100644
--- a/soh/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c
+++ b/soh/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c
@@ -274,7 +274,7 @@ void ObjTsubo_Idle(ObjTsubo* this, PlayState* play) {
             phi_v1 = ABS(temp_v0);
             if (phi_v1 >= 0x5556) {
                 // GI_NONE in this case allows the player to lift the actor
-                func_8002F434(&this->actor, play, GI_NONE, 30.0f, 30.0f);
+                Actor_OfferGetItem(&this->actor, play, GI_NONE, 30.0f, 30.0f);
             }
         }
     }
diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c
index 2bb2b04fd..7125500f7 100644
--- a/soh/src/overlays/actors/ovl_player_actor/z_player.c
+++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c
@@ -11477,11 +11477,11 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) {
             CsCmdActorAction* linkActionCsCmd = play->csCtx.linkAction;
 
             if ((linkActionCsCmd != NULL) && (D_808547C4[linkActionCsCmd->action] != 0)) {
-                func_8002DF54(play, NULL, 6);
+                Player_SetCsActionWithHaltedActors(play, NULL, 6);
                 Player_ZeroSpeedXZ(this);
             } else if ((this->csAction == 0) && !(this->stateFlags2 & PLAYER_STATE2_UNDERWATER) &&
                        (play->csCtx.state != CS_STATE_UNSKIPPABLE_INIT)) {
-                func_8002DF54(play, NULL, 0x31);
+                Player_SetCsActionWithHaltedActors(play, NULL, 0x31);
                 Player_ZeroSpeedXZ(this);
             }
         }
@@ -15342,7 +15342,7 @@ void func_808515A4(PlayState* play, Player* this, CsCmdActorAction* arg2) {
 void func_80851688(PlayState* play, Player* this, CsCmdActorAction* arg2) {
     if (func_8084B3CC(play, this) == 0) {
         if ((this->csAction == 0x31) && (play->csCtx.state == CS_STATE_IDLE)) {
-            func_8002DF54(play, NULL, 7);
+            Player_SetCsActionWithHaltedActors(play, NULL, 7);
             return;
         }
 
@@ -15923,7 +15923,7 @@ void func_80852C50(PlayState* play, Player* this, CsCmdActorAction* arg2) {
     s32 sp24;
 
     if (play->csCtx.state == CS_STATE_UNSKIPPABLE_INIT) {
-        func_8002DF54(play, NULL, 7);
+        Player_SetCsActionWithHaltedActors(play, NULL, 7);
         this->cueId = 0;
         Player_ZeroSpeedXZ(this);
         return;
@@ -16065,7 +16065,7 @@ void Player_StartTalking(PlayState* play, Actor* actor) {
     this->exchangeItemId = EXCH_ITEM_NONE;
 
     if (actor->textId == 0xFFFF) {
-        func_8002DF54(play, actor, 1);
+        Player_SetCsActionWithHaltedActors(play, actor, 1);
         actor->flags |= ACTOR_FLAG_PLAYER_TALKED_TO;
         func_80832528(play, this);
     } else {

From d6c512904bee3563dd559682febc8c8a16ba98cc Mon Sep 17 00:00:00 2001
From: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Date: Wed, 3 Apr 2024 21:11:13 -0400
Subject: [PATCH 089/230] vb target in woods (#95)

* do some target in woods VB stuff

* skip deku scrub hopping out animation

* replace a couple IS_RANDOs

* cleanup
---
 .../game-interactor/GameInteractor.h          |  2 +
 .../Enhancements/randomizer/hook_handlers.cpp |  1 +
 .../Enhancements/timesaver_hook_handlers.cpp  |  8 ++++
 .../actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c  |  3 +-
 .../actors/ovl_En_Ex_Item/z_en_ex_item.c      | 40 ++++++++-----------
 5 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h
index 478f82712..c61a82760 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h
@@ -290,6 +290,8 @@ typedef enum {
     GI_VB_GIVE_ITEM_FROM_MAN_ON_ROOF,
     // Opt: *EnSyatekiMan
     GI_VB_GIVE_ITEM_FROM_SHOOTING_GALLERY,
+    // Opt: *EnExItem
+    GI_VB_GIVE_ITEM_FROM_TARGET_IN_WOODS,
 
     GI_VB_GIVE_ITEM_FAIRY_OCARINA,
     GI_VB_GIVE_ITEM_WEIRD_EGG,
diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index 35031690e..ea3755a69 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -767,6 +767,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
         case GI_VB_TRADE_TIMER_EYEDROPS:
         case GI_VB_TRADE_TIMER_FROG:
         case GI_VB_ANJU_SET_OBTAINED_TRADE_ITEM:
+        case GI_VB_GIVE_ITEM_FROM_TARGET_IN_WOODS:
         case GI_VB_GIVE_ITEM_FROM_GORON:
         case GI_VB_GIVE_ITEM_FROM_LAB_DIVE:
         case GI_VB_GIVE_ITEM_FROM_SKULL_KID_SARIAS_SONG:
diff --git a/soh/soh/Enhancements/timesaver_hook_handlers.cpp b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
index 02decd7ba..8e733b427 100644
--- a/soh/soh/Enhancements/timesaver_hook_handlers.cpp
+++ b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
@@ -296,6 +296,14 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
                         *should = false;
                         break;
                     }
+                    case ACTOR_EN_EX_ITEM: {
+                        *should = false;
+                        break;
+                    }
+                    case ACTOR_EN_DNT_NOMAL: {
+                        *should = false;
+                        break;
+                    }
                     case ACTOR_EN_TA:
                     case ACTOR_DOOR_SHUTTER:
                     case ACTOR_BG_ICE_SHUTTER:
diff --git a/soh/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c b/soh/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c
index f96c93695..102a904cf 100644
--- a/soh/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c
+++ b/soh/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c
@@ -12,6 +12,7 @@
 #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h"
 #include "objects/object_hintnuts/object_hintnuts.h"
 #include "vt.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_WHILE_CULLED | ACTOR_FLAG_DRAW_WHILE_CULLED)
 
@@ -252,7 +253,7 @@ void EnDntNomal_TargetWait(EnDntNomal* this, PlayState* play) {
             if (!LINK_IS_ADULT && !Flags_GetItemGetInf(ITEMGETINF_1D)) {
                 this->hitCounter++;
                 if (this->hitCounter >= 3) {
-                    if(IS_RANDO) {
+                    if (!GameInteractor_Should(GI_VB_PLAY_ONEPOINT_ACTOR_CS, true, &this->actor)) {
                         this->actionFunc = EnDntNomal_TargetGivePrize;
                     } else {
                         OnePointCutscene_Init(play, 4140, -99, &this->actor, MAIN_CAM);
diff --git a/soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c b/soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c
index 03b343527..32f50d9e1 100644
--- a/soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c
+++ b/soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c
@@ -8,6 +8,7 @@
 #include "overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.h"
 #include "objects/gameplay_keep/gameplay_keep.h"
 #include "vt.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_WHILE_CULLED | ACTOR_FLAG_DRAW_WHILE_CULLED)
 
@@ -376,7 +377,7 @@ void EnExItem_TargetPrizeApproach(EnExItem* this, PlayState* play) {
         Math_SmoothStepToS(&this->actor.shape.rot.y, -0x4000, 5, 0x1000, 0);
     }
 
-    if (!IS_RANDO && this->timer != 0) {
+    if (GameInteractor_Should(GI_VB_PLAY_ONEPOINT_ACTOR_CS, true, &this->actor) && this->timer != 0) {
         if (this->prizeRotateTimer != 0) {
             tmpf1 = play->view.lookAt.x - play->view.eye.x;
             tmpf2 = play->view.lookAt.y - 10.0f - play->view.eye.y;
@@ -396,50 +397,41 @@ void EnExItem_TargetPrizeApproach(EnExItem* this, PlayState* play) {
             this->actor.world.pos.z += (tmpf3 / tmpf4) * 5.0f;
         }
     } else {
-        GetItemEntry getItemEntry = (GetItemEntry)GET_ITEM_NONE;
         s32 getItemId;
 
         this->actor.draw = NULL;
         Player_SetCsActionWithHaltedActors(play, NULL, 7);
         this->actor.parent = NULL;
-        if (IS_RANDO) {
+
+        if (!GameInteractor_Should(GI_VB_PLAY_ONEPOINT_ACTOR_CS, true, &this->actor)) {
             GET_PLAYER(play)->stateFlags1 &= ~(PLAYER_STATE1_GETTING_ITEM | PLAYER_STATE1_ITEM_OVER_HEAD);
-            getItemEntry = Randomizer_GetItemFromKnownCheck(RC_LW_TARGET_IN_WOODS, GI_BULLET_BAG_50);
-            getItemId = getItemEntry.getItemId;
-        } else {
-            if (CUR_UPG_VALUE(UPG_BULLET_BAG) == 1) {
-                getItemId = GI_BULLET_BAG_40;
-            } else {
-                getItemId = GI_BULLET_BAG_50;
-            }
         }
 
-        if (!IS_RANDO || getItemEntry.getItemId == GI_NONE) {
-            Actor_OfferGetItem(&this->actor, play, getItemId, 2000.0f, 1000.0f);
+        if (CUR_UPG_VALUE(UPG_BULLET_BAG) == 1) {
+            getItemId = GI_BULLET_BAG_40;
         } else {
-            GiveItemEntryFromActor(&this->actor, play, getItemEntry, 2000.0f, 1000.0f);
+            getItemId = GI_BULLET_BAG_50;
         }
+
+        if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_TARGET_IN_WOODS, true, &this->actor)) {
+            Actor_OfferGetItem(&this->actor, play, getItemId, 2000.0f, 1000.0f);
+        }
+
         this->actionFunc = EnExItem_TargetPrizeGive;
     }
 }
 
 void EnExItem_TargetPrizeGive(EnExItem* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_TARGET_IN_WOODS, true, &this->actor)) {
         this->actionFunc = EnExItem_TargetPrizeFinish;
     } else {
-        if (!IS_RANDO) {
-            s32 getItemId = (CUR_UPG_VALUE(UPG_BULLET_BAG) == 2) ? GI_BULLET_BAG_50 : GI_BULLET_BAG_40;
-            Actor_OfferGetItem(&this->actor, play, getItemId, 2000.0f, 1000.0f);
-        } else {
-            GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_LW_TARGET_IN_WOODS, GI_BULLET_BAG_50);
-            GiveItemEntryFromActor(&this->actor, play, getItemEntry, 2000.0f, 1000.0f);
-        }
-
+        s32 getItemId = (CUR_UPG_VALUE(UPG_BULLET_BAG) == 2) ? GI_BULLET_BAG_50 : GI_BULLET_BAG_40;
+        Actor_OfferGetItem(&this->actor, play, getItemId, 2000.0f, 1000.0f);
     }
 }
 
 void EnExItem_TargetPrizeFinish(EnExItem* this, PlayState* play) {
-    if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) {
+    if (!GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_TARGET_IN_WOODS, true, &this->actor) || (Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) {
         // "Successful completion"
         osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 正常終了 ☆☆☆☆☆ \n" VT_RST);
         Flags_SetItemGetInf(ITEMGETINF_1D);

From 2339a729eea09c71d066070e01f6de77a496d510 Mon Sep 17 00:00:00 2001
From: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Date: Wed, 3 Apr 2024 22:10:18 -0400
Subject: [PATCH 090/230] vb deku theater (#96)

---
 .../Enhancements/randomizer/location_list.cpp |  4 +-
 .../Enhancements/timesaver_hook_handlers.cpp  | 52 ++++++++++++++++++-
 .../actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c    | 23 --------
 .../actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h    |  2 +
 4 files changed, 55 insertions(+), 26 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/location_list.cpp b/soh/soh/Enhancements/randomizer/location_list.cpp
index c58674bae..0ff2837db 100644
--- a/soh/soh/Enhancements/randomizer/location_list.cpp
+++ b/soh/soh/Enhancements/randomizer/location_list.cpp
@@ -618,8 +618,8 @@ void Rando::StaticData::InitLocationTable() { //
     locationTable[RC_LW_DEKU_SCRUB_NEAR_BRIDGE] =                                      Location::Base(RC_LW_DEKU_SCRUB_NEAR_BRIDGE,                                    RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LOST_WOODS,                   ACTOR_EN_DNS,         SCENE_LOST_WOODS,                   0x09,                                              0x77, "Deku Scrub Near Bridge",                      "LW Deku Scrub Near Bridge",                                RHT_LW_DEKU_SCRUB_NEAR_BRIDGE,                                   RG_PROGRESSIVE_STICK_UPGRADE,         { Category::cDekuScrub, Category::cDekuScrubUpgrades }, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_NEAR_BRIDGE),                                   SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
     locationTable[RC_LW_DEKU_SCRUB_GROTTO_REAR] =                               Location::GrottoScrub(RC_LW_DEKU_SCRUB_GROTTO_REAR,                                    RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LOST_WOODS,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x03, 0xF5),                      0x33, "Deku Scrub Grotto Rear",                      "LW Deku Scrub Grotto Rear",                                RHT_LW_DEKU_SCRUB_GROTTO_REAR,                                   RG_BUY_DEKU_SEEDS_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_GROTTO_REAR),                                   SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
     locationTable[RC_LW_DEKU_SCRUB_GROTTO_FRONT] =                              Location::GrottoScrub(RC_LW_DEKU_SCRUB_GROTTO_FRONT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LOST_WOODS,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x0A, 0xF5),                      0x79, "Deku Scrub Grotto Front",                     "LW Deku Scrub Grotto Front",                               RHT_LW_DEKU_SCRUB_GROTTO_FRONT,                                  RG_PROGRESSIVE_NUT_UPGRADE,           { Category::cDekuScrub, Category::cDekuScrubUpgrades }, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_GROTTO_FRONT),                                  SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[RC_DEKU_THEATER_SKULL_MASK] =                                        Location::Base(RC_DEKU_THEATER_SKULL_MASK,                                      RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LOST_WOODS,                   ACTOR_ID_MAX,         SCENE_GROTTOS,                      0x00,                                              0x77, "Deku Theater Skull Mask",                     "Deku Theater Skull Mask",                                  RHT_DEKU_THEATER_SKULL_MASK,                                     RG_PROGRESSIVE_STICK_UPGRADE,         {},                                                     SpoilerCollectionCheck::Chest(0x3E, 0x1F),                                                                                    SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
-    locationTable[RC_DEKU_THEATER_MASK_OF_TRUTH] =                                     Location::Base(RC_DEKU_THEATER_MASK_OF_TRUTH,                                   RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LOST_WOODS,                   ACTOR_ID_MAX,         SCENE_GROTTOS,                      0x00,                                              0x7A, "Deku Theater Mask of Truth",                  "Deku Theater Mask of Truth",                               RHT_DEKU_THEATER_MASK_OF_TRUTH,                                  RG_PROGRESSIVE_NUT_UPGRADE,           {},                                                     SpoilerCollectionCheck::Chest(0x3E, 0x1E),                                                                                    SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
+    locationTable[RC_DEKU_THEATER_SKULL_MASK] =                                        Location::Base(RC_DEKU_THEATER_SKULL_MASK,                                      RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LOST_WOODS,                   ACTOR_ID_MAX,         SCENE_GROTTOS,                      0x00,                                              0x77, "Deku Theater Skull Mask",                     "Deku Theater Skull Mask",                                  RHT_DEKU_THEATER_SKULL_MASK,                                     RG_PROGRESSIVE_STICK_UPGRADE,         {},                                                     SpoilerCollectionCheck::ItemGetInf(ITEMGETINF_OBTAINED_STICK_UPGRADE_FROM_STAGE),                                                                                    SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
+    locationTable[RC_DEKU_THEATER_MASK_OF_TRUTH] =                                     Location::Base(RC_DEKU_THEATER_MASK_OF_TRUTH,                                   RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LOST_WOODS,                   ACTOR_ID_MAX,         SCENE_GROTTOS,                      0x00,                                              0x7A, "Deku Theater Mask of Truth",                  "Deku Theater Mask of Truth",                               RHT_DEKU_THEATER_MASK_OF_TRUTH,                                  RG_PROGRESSIVE_NUT_UPGRADE,           {},                                                     SpoilerCollectionCheck::ItemGetInf(ITEMGETINF_OBTAINED_NUT_UPGRADE_FROM_STAGE),                                                                                    SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
     // Sacred Forest Meadow
     locationTable[RC_SFM_WOLFOS_GROTTO_CHEST] =                                       Location::Chest(RC_SFM_WOLFOS_GROTTO_CHEST,                                      RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_SACRED_FOREST_MEADOW,         ACTOR_EN_BOX,         SCENE_GROTTOS,                      31409,                                             0x11, "Wolfos Grotto Chest",                         "SFM Wolfos Grotto Chest",                                  RHT_SFM_WOLFOS_GROTTO_CHEST,                                     RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
     locationTable[RC_SFM_DEKU_SCRUB_GROTTO_REAR] =                              Location::GrottoScrub(RC_SFM_DEKU_SCRUB_GROTTO_REAR,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_SACRED_FOREST_MEADOW,         ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x07, 0xEE),                      0x39, "Deku Scrub Grotto Rear",                      "SFM Deku Scrub Grotto Rear",                               RHT_SFM_DEKU_SCRUB_GROTTO_REAR,                                  RG_BUY_RED_POTION_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_SFM_DEKU_SCRUB_GROTTO_REAR),                                  SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
diff --git a/soh/soh/Enhancements/timesaver_hook_handlers.cpp b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
index 8e733b427..18249e0bf 100644
--- a/soh/soh/Enhancements/timesaver_hook_handlers.cpp
+++ b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
@@ -22,6 +22,7 @@ extern "C" {
 #include "src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.h"
 #include "src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.h"
 #include "src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h"
+#include "src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h"
 extern SaveContext gSaveContext;
 extern PlayState* gPlayState;
 }
@@ -87,6 +88,36 @@ void EnZl4_SkipToGivingZeldasLetter(EnZl4* enZl4, PlayState* play) {
     }
 }
 
+void EnDntDemo_JudgeSkipToReward(EnDntDemo* enDntDemo, PlayState* play) {
+    // todo: figure out a better way to handle toggling so we don't
+    //       need to double check cvars like this
+    if(!(IS_RANDO || CVarGetInteger("gTimeSavers.SkipMiscInteractions", IS_RANDO))) {
+        EnDntDemo_Judge(enDntDemo, play);
+        return;
+    }
+
+    if (enDntDemo->actor.xzDistToPlayer > 30.0f) {
+        EnDntDemo_Judge(enDntDemo, play);
+        return;
+    }
+
+    Player* player = GET_PLAYER(play);
+    switch (Player_GetMask(play)) {
+        case PLAYER_MASK_SKULL: {
+            Flags_SetItemGetInf(ITEMGETINF_OBTAINED_STICK_UPGRADE_FROM_STAGE);
+            return;
+        }
+        case PLAYER_MASK_TRUTH: {
+            Flags_SetItemGetInf(ITEMGETINF_OBTAINED_NUT_UPGRADE_FROM_STAGE);
+            return;
+        }
+        default: {
+            EnDntDemo_Judge(enDntDemo, play);
+            return;
+        }
+    }
+}
+
 static int successChimeCooldown = 0;
 void RateLimitedSuccessChime() {
     if (successChimeCooldown == 0) {
@@ -304,6 +335,10 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
                         *should = false;
                         break;
                     }
+                    case ACTOR_EN_DNT_DEMO: {
+                        *should = false;
+                        break;
+                    }
                     case ACTOR_EN_TA:
                     case ACTOR_DOOR_SHUTTER:
                     case ACTOR_BG_ICE_SHUTTER:
@@ -769,6 +804,11 @@ void TimeSaverOnActorInitHandler(void* actorRef) {
 
         enZl4->actionFunc = EnZl4_SkipToGivingZeldasLetter;
     }
+
+    if (actor->id == ACTOR_EN_DNT_DEMO && (IS_RANDO || CVarGetInteger("gTimeSavers.SkipMiscInteractions", IS_RANDO))) {
+        EnDntDemo* enDntDemo = static_cast<EnDntDemo*>(actorRef);
+        enDntDemo->actionFunc = EnDntDemo_JudgeSkipToReward;
+    }
 }
 
 void TimeSaverOnSceneInitHandler(int16_t sceneNum) {
@@ -949,6 +989,16 @@ void TimeSaverOnFlagSetHandler(int16_t flagType, int16_t flag) {
                     break;
             }
             break;
+        case FLAG_ITEM_GET_INF:
+            switch (flag) {
+                case ITEMGETINF_OBTAINED_STICK_UPGRADE_FROM_STAGE:
+                    vanillaQueuedItemEntry = Rando::StaticData::RetrieveItem(RG_DEKU_STICK_CAPACITY_30).GetGIEntry_Copy();
+                    break;
+                case ITEMGETINF_OBTAINED_NUT_UPGRADE_FROM_STAGE:
+                    vanillaQueuedItemEntry = Rando::StaticData::RetrieveItem(RG_DEKU_NUT_CAPACITY_40).GetGIEntry_Copy();
+                    break;
+            }
+            break;
     }
 }
 
@@ -1016,4 +1066,4 @@ void TimeSaverRegisterHooks() {
         onPlayerUpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnPlayerUpdate>(TimeSaverOnPlayerUpdateHandler);
         onItemReceiveHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnItemReceive>(TimeSaverOnItemReceiveHandler);
     });
-}
\ No newline at end of file
+}
diff --git a/soh/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c b/soh/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c
index eb9942fba..d63cb14c8 100644
--- a/soh/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c
+++ b/soh/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c
@@ -135,29 +135,6 @@ void EnDntDemo_Judge(EnDntDemo* this, PlayState* play) {
             this->judgeTimer = 0;
         }
     } else {
-        if (IS_RANDO) {
-            Player* player = GET_PLAYER(play);
-            switch (Player_GetMask(play)) {
-                case PLAYER_MASK_SKULL:
-                    if (!Flags_GetTreasure(play, 0x1F) && !Player_InBlockingCsMode(play, player)) {
-                        GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_DEKU_THEATER_SKULL_MASK, GI_STICK_UPGRADE_30);
-                        GiveItemEntryWithoutActor(play, getItemEntry);
-                        player->pendingFlag.flagID = 0x1F;
-                        player->pendingFlag.flagType = FLAG_SCENE_TREASURE;
-                    }
-                    break;
-                case PLAYER_MASK_TRUTH:
-                    if (!Flags_GetTreasure(play, 0x1E) && !Player_InBlockingCsMode(play, player)) {
-                        GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_DEKU_THEATER_MASK_OF_TRUTH, GI_NUT_UPGRADE_40);
-                        GiveItemEntryWithoutActor(play, getItemEntry);
-                        player->pendingFlag.flagID = 0x1E;
-                        player->pendingFlag.flagType = FLAG_SCENE_TREASURE;
-                    }
-                    break;
-            }
-            return;
-        }
-
         if ((Player_GetMask(play) != 0) && (this->subCamera == SUBCAM_FREE)) {
             this->subCamera = OnePointCutscene_Init(play, 2220, -99, &this->scrubs[3]->actor, MAIN_CAM);
         }
diff --git a/soh/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h b/soh/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h
index 9093d451c..c6b9a7efb 100644
--- a/soh/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h
+++ b/soh/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h
@@ -64,4 +64,6 @@ typedef enum {
     /* 5 */ DNT_ACTION_PRIZE
 } EnDntAction;
 
+void EnDntDemo_Judge(EnDntDemo* enDntDemo, PlayState* play);
+
 #endif

From 249490909f8e8f2a675cd43464f3628bdf3966d7 Mon Sep 17 00:00:00 2001
From: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Date: Thu, 4 Apr 2024 11:26:48 -0400
Subject: [PATCH 091/230] pull docs: talon function names (#98)

---
 soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c | 192 ++++++++++----------
 1 file changed, 96 insertions(+), 96 deletions(-)

diff --git a/soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c b/soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c
index 85f5053d1..d8a0ff554 100644
--- a/soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c
+++ b/soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c
@@ -16,21 +16,21 @@ void EnTa_Destroy(Actor* thisx, PlayState* play);
 void EnTa_Update(Actor* thisx, PlayState* play);
 void EnTa_Draw(Actor* thisx, PlayState* play);
 
-void func_80B14634(EnTa* this, PlayState* play);
-void func_80B146F8(EnTa* this, PlayState* play);
-void func_80B14754(EnTa* this, PlayState* play);
-void func_80B14C18(EnTa* this, PlayState* play);
-void func_80B14CAC(EnTa* this, PlayState* play);
-void func_80B14D98(EnTa* this, PlayState* play);
-void func_80B154FC(EnTa* this, PlayState* play);
-void func_80B16504(EnTa* this, PlayState* play);
-void func_80B16608(EnTa* this, PlayState* play);
-void func_80B166CC(EnTa* this);
-void func_80B16700(EnTa* this);
-void func_80B167C0(EnTa* this);
-void func_80B167FC(EnTa* this);
-void func_80B16854(EnTa* this);
-void func_80B16938(EnTa* this);
+void EnTa_IdleAsleepInCastle(EnTa* this, PlayState* play);
+void EnTa_IdleAsleepInLonLonHouse(EnTa* this, PlayState* play);
+void EnTa_IdleAsleepInKakariko(EnTa* this, PlayState* play);
+void EnTa_IdleAwakeInCastle(EnTa* this, PlayState* play);
+void EnTa_IdleAwakeInKakariko(EnTa* this, PlayState* play);
+void EnTa_IdleAtRanch(EnTa* this, PlayState* play);
+void EnTa_RunCuccoGame(EnTa* this, PlayState* play);
+void EnTa_IdleSittingInLonLonHouse(EnTa* this, PlayState* play);
+void EnTa_IdleAfterCuccoGameFinished(EnTa* this, PlayState* play);
+void EnTa_BlinkWaitUntilNext(EnTa* this);
+void EnTa_BlinkAdvanceState(EnTa* this);
+void EnTa_AnimRepeatCurrent(EnTa* this);
+void EnTa_AnimSleeping(EnTa* this);
+void EnTa_AnimSitSleeping(EnTa* this);
+void EnTa_AnimRunToEnd(EnTa* this);
 
 const ActorInit En_Ta_InitVars = {
     ACTOR_EN_TA,
@@ -65,7 +65,7 @@ static ColliderCylinderInit sCylinderInit = {
     { 30, 40, 0, { 0, 0, 0 } },
 };
 
-void func_80B13AA0(EnTa* this, EnTaActionFunc arg1, EnTaUnkFunc arg2) {
+void EnTa_SetupAction(EnTa* this, EnTaActionFunc arg1, EnTaUnkFunc arg2) {
     this->actionFunc = arg1;
     this->unk_260 = arg2;
 }
@@ -114,7 +114,7 @@ void EnTa_Init(Actor* thisx, PlayState* play2) {
     this->unk_2CE = 0;
     this->unk_2E2 = 0;
     this->blinkTimer = 20;
-    this->unk_2B0 = func_80B166CC;
+    this->unk_2B0 = EnTa_BlinkWaitUntilNext;
     Actor_SetScale(&this->actor, 0.01f);
     this->actor.targetMode = 6;
     this->actor.velocity.y = -4.0f;
@@ -129,12 +129,12 @@ void EnTa_Init(Actor* thisx, PlayState* play2) {
             } else if (!LINK_IS_ADULT) {
                 Actor_Kill(&this->actor);
             } else if (Flags_GetEventChkInf(EVENTCHKINF_TALON_WOKEN_IN_KAKARIKO)) {
-                func_80B13AA0(this, func_80B14CAC, func_80B167C0);
+                EnTa_SetupAction(this, EnTa_IdleAwakeInKakariko, EnTa_AnimRepeatCurrent);
                 this->eyeIndex = 0;
                 Animation_PlayOnce(&this->skelAnime, &gTalonStandAnim);
                 this->currentAnimation = &gTalonStandAnim;
             } else {
-                func_80B13AA0(this, func_80B14754, func_80B167FC);
+                EnTa_SetupAction(this, EnTa_IdleAsleepInKakariko, EnTa_AnimSleeping);
                 this->eyeIndex = 2;
                 Animation_PlayOnce(&this->skelAnime, &gTalonSleepAnim);
                 this->currentAnimation = &gTalonSleepAnim;
@@ -151,7 +151,7 @@ void EnTa_Init(Actor* thisx, PlayState* play2) {
                 Actor_Kill(&this->actor);
                 osSyncPrintf(VT_FGCOL(CYAN) " 夜はいない \n" VT_RST);
             } else {
-                func_80B13AA0(this, func_80B14D98, func_80B167C0);
+                EnTa_SetupAction(this, EnTa_IdleAtRanch, EnTa_AnimRepeatCurrent);
                 this->eyeIndex = 0;
                 Animation_PlayOnce(&this->skelAnime, &gTalonStandAnim);
                 this->currentAnimation = &gTalonStandAnim;
@@ -163,12 +163,12 @@ void EnTa_Init(Actor* thisx, PlayState* play2) {
                 if (Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE)) {
                     Actor_Kill(&this->actor);
                 } else if (Flags_GetEventChkInf(EVENTCHKINF_TALON_WOKEN_IN_CASTLE)) {
-                    func_80B13AA0(this, func_80B14C18, func_80B167C0);
+                    EnTa_SetupAction(this, EnTa_IdleAwakeInCastle, EnTa_AnimRepeatCurrent);
                     this->eyeIndex = 0;
                     Animation_PlayOnce(&this->skelAnime, &gTalonStandAnim);
                     this->currentAnimation = &gTalonStandAnim;
                 } else {
-                    func_80B13AA0(this, func_80B14634, func_80B167FC);
+                    EnTa_SetupAction(this, EnTa_IdleAsleepInCastle, EnTa_AnimSleeping);
                     this->eyeIndex = 2;
                     Animation_PlayOnce(&this->skelAnime, &gTalonSleepAnim);
                     this->currentAnimation = &gTalonSleepAnim;
@@ -196,19 +196,19 @@ void EnTa_Init(Actor* thisx, PlayState* play2) {
                         func_80B13AAC(this, play);
 
                         if (gSaveContext.eventInf[0] & 0x400) {
-                            func_80B13AA0(this, func_80B16608, func_80B16938);
+                            EnTa_SetupAction(this, EnTa_IdleAfterCuccoGameFinished, EnTa_AnimRunToEnd);
                             Animation_Change(&this->skelAnime, &gTalonSitWakeUpAnim, 1.0f,
                                              Animation_GetLastFrame(&gTalonSitWakeUpAnim) - 1.0f,
                                              Animation_GetLastFrame(&gTalonSitWakeUpAnim), ANIMMODE_ONCE, 0.0f);
                             gSaveContext.eventInf[0] &= ~0x400;
                         } else {
-                            func_80B13AA0(this, func_80B16504, func_80B16854);
+                            EnTa_SetupAction(this, EnTa_IdleSittingInLonLonHouse, EnTa_AnimSitSleeping);
                             this->eyeIndex = 0;
                             Animation_PlayOnce(&this->skelAnime, &gTalonSitSleepingAnim);
                             this->currentAnimation = &gTalonSitSleepingAnim;
                         }
                     } else {
-                        func_80B13AA0(this, func_80B146F8, func_80B167FC);
+                        EnTa_SetupAction(this, EnTa_IdleAsleepInLonLonHouse, EnTa_AnimSleeping);
                         this->eyeIndex = 2;
                         Animation_PlayOnce(&this->skelAnime, &gTalonSleepAnim);
                         this->currentAnimation = &gTalonSleepAnim;
@@ -216,7 +216,7 @@ void EnTa_Init(Actor* thisx, PlayState* play2) {
                     }
                 }
             } else {
-                func_80B13AA0(this, func_80B14634, func_80B167FC);
+                EnTa_SetupAction(this, EnTa_IdleAsleepInCastle, EnTa_AnimSleeping);
                 this->eyeIndex = 2;
                 Animation_PlayOnce(&this->skelAnime, &gTalonSleepAnim);
                 this->currentAnimation = &gTalonSleepAnim;
@@ -265,22 +265,22 @@ s32 func_80B142F4(EnTa* this, PlayState* play, u16 textId) {
 
 void func_80B14398(EnTa* this, PlayState* play) {
     if (Actor_TextboxIsClosing(&this->actor, play)) {
-        func_80B13AA0(this, func_80B14754, func_80B167FC);
+        EnTa_SetupAction(this, EnTa_IdleAsleepInKakariko, EnTa_AnimSleeping);
     }
 }
 
 void func_80B143D4(EnTa* this, PlayState* play) {
     if (Actor_TextboxIsClosing(&this->actor, play)) {
-        func_80B13AA0(this, func_80B146F8, func_80B167FC);
+        EnTa_SetupAction(this, EnTa_IdleAsleepInLonLonHouse, EnTa_AnimSleeping);
     }
 }
 
 void func_80B14410(EnTa* this) {
     if (!LINK_IS_ADULT) {
-        func_80B13AA0(this, func_80B14C18, func_80B167C0);
+        EnTa_SetupAction(this, EnTa_IdleAwakeInCastle, EnTa_AnimRepeatCurrent);
         Flags_SetEventChkInf(EVENTCHKINF_TALON_WOKEN_IN_CASTLE);
     } else {
-        func_80B13AA0(this, func_80B14CAC, func_80B167C0);
+        EnTa_SetupAction(this, EnTa_IdleAwakeInKakariko, EnTa_AnimRepeatCurrent);
         Flags_SetEventChkInf(EVENTCHKINF_TALON_WOKEN_IN_KAKARIKO);
     }
 }
@@ -297,12 +297,12 @@ void func_80B144D8(EnTa* this, PlayState* play) {
     if (Actor_TextboxIsClosing(&this->actor, play)) {
         func_80B14410(this);
         this->blinkTimer = 1;
-        this->unk_2B0 = func_80B16700;
+        this->unk_2B0 = EnTa_BlinkAdvanceState;
     }
 
     if (Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) {
         this->eyeIndex = 1;
-        func_80B13AA0(this, func_80B1448C, func_80B167C0);
+        EnTa_SetupAction(this, func_80B1448C, EnTa_AnimRepeatCurrent);
     }
     func_80B14248(this);
     this->unk_2E0 |= 4;
@@ -312,7 +312,7 @@ void func_80B14570(EnTa* this, PlayState* play) {
     this->unk_2E0 |= 4;
 
     if (this->unk_2CC == 0) {
-        func_80B13AA0(this, func_80B144D8, func_80B167C0);
+        EnTa_SetupAction(this, func_80B144D8, EnTa_AnimRepeatCurrent);
         this->unk_2CE = 3;
         this->unk_2CC = 60;
         Animation_PlayOnce(&this->skelAnime, &gTalonWakeUpAnim);
@@ -323,11 +323,11 @@ void func_80B14570(EnTa* this, PlayState* play) {
 
 void func_80B145F8(EnTa* this, PlayState* play) {
     if (Actor_TextboxIsClosing(&this->actor, play)) {
-        func_80B13AA0(this, func_80B14634, func_80B167FC);
+        EnTa_SetupAction(this, EnTa_IdleAsleepInCastle, EnTa_AnimSleeping);
     }
 }
 
-void func_80B14634(EnTa* this, PlayState* play) {
+void EnTa_IdleAsleepInCastle(EnTa* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
 
     if (Actor_ProcessTalkRequest(&this->actor, play)) {
@@ -336,14 +336,14 @@ void func_80B14634(EnTa* this, PlayState* play) {
         switch (exchangeItemId) {
             case EXCH_ITEM_CHICKEN:
                 player->actor.textId = 0x702B;
-                func_80B13AA0(this, func_80B14570, func_80B167C0);
+                EnTa_SetupAction(this, func_80B14570, EnTa_AnimRepeatCurrent);
                 this->unk_2CC = 40;
                 break;
             default:
                 if (exchangeItemId != EXCH_ITEM_NONE) {
                     player->actor.textId = 0x702A;
                 }
-                func_80B13AA0(this, func_80B145F8, func_80B167FC);
+                EnTa_SetupAction(this, func_80B145F8, EnTa_AnimSleeping);
                 break;
         }
     } else {
@@ -352,15 +352,15 @@ void func_80B14634(EnTa* this, PlayState* play) {
     }
 }
 
-void func_80B146F8(EnTa* this, PlayState* play) {
+void EnTa_IdleAsleepInLonLonHouse(EnTa* this, PlayState* play) {
     if (Actor_ProcessTalkRequest(&this->actor, play)) {
-        func_80B13AA0(this, func_80B143D4, func_80B167FC);
+        EnTa_SetupAction(this, func_80B143D4, EnTa_AnimSleeping);
     }
     this->actor.textId = 0x204B;
     func_8002F2CC(&this->actor, play, 100.0f);
 }
 
-void func_80B14754(EnTa* this, PlayState* play) {
+void EnTa_IdleAsleepInKakariko(EnTa* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
 
     if (Actor_ProcessTalkRequest(&this->actor, play)) {
@@ -369,14 +369,14 @@ void func_80B14754(EnTa* this, PlayState* play) {
         switch (exchangeItemId) {
             case EXCH_ITEM_POCKET_CUCCO:
                 player->actor.textId = 0x702B;
-                func_80B13AA0(this, func_80B14570, func_80B167C0);
+                EnTa_SetupAction(this, func_80B14570, EnTa_AnimRepeatCurrent);
                 this->unk_2CC = 40;
                 break;
             default:
                 if (exchangeItemId != EXCH_ITEM_NONE) {
                     player->actor.textId = 0x5015;
                 }
-                func_80B13AA0(this, func_80B14398, func_80B167FC);
+                EnTa_SetupAction(this, func_80B14398, EnTa_AnimSleeping);
                 break;
         }
     } else {
@@ -411,7 +411,7 @@ void func_80B1490C(EnTa* this, PlayState* play) {
     this->actor.shape.rot.y += 0xC00;
 
     if (this->unk_2CC == 0) {
-        func_80B13AA0(this, func_80B14898, func_80B167C0);
+        EnTa_SetupAction(this, func_80B14898, EnTa_AnimRepeatCurrent);
         this->unk_2CC = 60;
     }
 }
@@ -421,7 +421,7 @@ void func_80B1496C(EnTa* this, PlayState* play) {
     func_80B14818(this, play);
 
     if (this->unk_2CC == 0) {
-        func_80B13AA0(this, func_80B1490C, func_80B167C0);
+        EnTa_SetupAction(this, func_80B1490C, EnTa_AnimRepeatCurrent);
         this->unk_2CC = 5;
     }
 }
@@ -431,7 +431,7 @@ void func_80B149F4(EnTa* this, PlayState* play) {
     this->actor.shape.rot.y -= 0xD00;
 
     if (this->unk_2CC == 0) {
-        func_80B13AA0(this, func_80B1496C, func_80B167C0);
+        EnTa_SetupAction(this, func_80B1496C, EnTa_AnimRepeatCurrent);
         this->unk_2CC = 65;
     }
 }
@@ -445,7 +445,7 @@ void func_80B14A54(EnTa* this, PlayState* play) {
     }
     if (this->unk_2CC == 0) {
         this->unk_2CC = 5;
-        func_80B13AA0(this, func_80B149F4, func_80B167C0);
+        EnTa_SetupAction(this, func_80B149F4, EnTa_AnimRepeatCurrent);
     }
 }
 
@@ -455,7 +455,7 @@ void func_80B14AF4(EnTa* this, PlayState* play) {
 
     if (this->unk_2CC == 0) {
         Audio_PlayActorSound2(&this->actor, NA_SE_VO_TA_CRY_1);
-        func_80B13AA0(this, func_80B14A54, func_80B167C0);
+        EnTa_SetupAction(this, func_80B14A54, EnTa_AnimRepeatCurrent);
         this->unk_2CC = 65;
         this->actor.flags |= ACTOR_FLAG_UPDATE_WHILE_CULLED;
     }
@@ -464,7 +464,7 @@ void func_80B14AF4(EnTa* this, PlayState* play) {
 void func_80B14B6C(EnTa* this, PlayState* play) {
     if (Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT) {
         s16 csCamIdx = OnePointCutscene_Init(play, 4175, -99, &this->actor, MAIN_CAM);
-        func_80B13AA0(this, func_80B14AF4, func_80B167C0);
+        EnTa_SetupAction(this, func_80B14AF4, EnTa_AnimRepeatCurrent);
         this->unk_2CC = 5;
         Flags_SetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE);
         if (GameInteractor_Should(GI_VB_PLAY_ONEPOINT_ACTOR_CS, true, this)) {
@@ -476,42 +476,42 @@ void func_80B14B6C(EnTa* this, PlayState* play) {
     this->unk_2E0 |= 1;
 }
 
-void func_80B14C18(EnTa* this, PlayState* play) {
+void EnTa_IdleAwakeInCastle(EnTa* this, PlayState* play) {
     if (func_80B142F4(this, play, 0x702C)) {
-        func_80B13AA0(this, func_80B14B6C, func_80B167C0);
+        EnTa_SetupAction(this, func_80B14B6C, EnTa_AnimRepeatCurrent);
     }
     func_80B14248(this);
 }
 
 void func_80B14C60(EnTa* this, PlayState* play) {
     if (Actor_TextboxIsClosing(&this->actor, play)) {
-        func_80B13AA0(this, func_80B14CAC, func_80B167C0);
+        EnTa_SetupAction(this, EnTa_IdleAwakeInKakariko, EnTa_AnimRepeatCurrent);
     }
     this->unk_2E0 |= 1;
 }
 
-void func_80B14CAC(EnTa* this, PlayState* play) {
+void EnTa_IdleAwakeInKakariko(EnTa* this, PlayState* play) {
     if (Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED)) {
         if (func_80B142F4(this, play, 0x5017)) {
-            func_80B13AA0(this, func_80B14C60, func_80B167C0);
+            EnTa_SetupAction(this, func_80B14C60, EnTa_AnimRepeatCurrent);
             Flags_SetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_KAKARIKO);
         }
     } else if (func_80B142F4(this, play, 0x5016)) {
-        func_80B13AA0(this, func_80B14C60, func_80B167C0);
+        EnTa_SetupAction(this, func_80B14C60, EnTa_AnimRepeatCurrent);
     }
     func_80B14248(this);
 }
 
 void func_80B14D4C(EnTa* this, PlayState* play) {
     if (Actor_TextboxIsClosing(&this->actor, play)) {
-        func_80B13AA0(this, func_80B14D98, func_80B167C0);
+        EnTa_SetupAction(this, EnTa_IdleAtRanch, EnTa_AnimRepeatCurrent);
     }
     this->unk_2E0 |= 1;
 }
 
-void func_80B14D98(EnTa* this, PlayState* play) {
+void EnTa_IdleAtRanch(EnTa* this, PlayState* play) {
     if (func_80B142F4(this, play, 0x2055)) {
-        func_80B13AA0(this, func_80B14D4C, func_80B167C0);
+        EnTa_SetupAction(this, func_80B14D4C, EnTa_AnimRepeatCurrent);
     }
 }
 
@@ -551,7 +551,7 @@ void func_80B14EDC(EnTa* this, PlayState* play) {
 }
 
 void func_80B14F20(EnTa* this, EnTaActionFunc arg1) {
-    func_80B13AA0(this, arg1, func_80B16854);
+    EnTa_SetupAction(this, arg1, EnTa_AnimSitSleeping);
     this->eyeIndex = 2;
     Animation_Change(&this->skelAnime, &gTalonSitSleepingAnim, 1.0f, 0.0f,
                      Animation_GetLastFrame(&gTalonSitSleepingAnim), ANIMMODE_ONCE, -5.0f);
@@ -561,7 +561,7 @@ void func_80B14F20(EnTa* this, EnTaActionFunc arg1) {
 
 void func_80B14FAC(EnTa* this, EnTaActionFunc arg1) {
     this->eyeIndex = 1;
-    func_80B13AA0(this, arg1, func_80B16938);
+    EnTa_SetupAction(this, arg1, EnTa_AnimRunToEnd);
     this->unk_2E0 &= ~0x10;
     Animation_Change(&this->skelAnime, &gTalonSitWakeUpAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gTalonSitWakeUpAnim),
                      ANIMMODE_ONCE, -5.0f);
@@ -570,7 +570,7 @@ void func_80B14FAC(EnTa* this, EnTaActionFunc arg1) {
 void func_80B15034(EnTa* this, PlayState* play) {
     if ((Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(play)) {
         Message_CloseTextbox(play);
-        func_80B14F20(this, func_80B16504);
+        func_80B14F20(this, EnTa_IdleSittingInLonLonHouse);
         func_80B13AAC(this, play);
     }
     this->unk_2E0 |= 1;
@@ -602,7 +602,7 @@ void func_80B15100(EnTa* this, PlayState* play) {
         this->unk_2E0 &= ~0x10;
         Message_CloseTextbox(play);
         unk_2CA = this->unk_2CA;
-        this->actionFunc = func_80B154FC;
+        this->actionFunc = EnTa_RunCuccoGame;
         this->superCuccos[unk_2CA]->actor.gravity = 0.1f;
         this->superCuccos[unk_2CA]->actor.velocity.y = 0.0f;
         this->superCuccos[unk_2CA]->actor.speedXZ = 0.0f;
@@ -687,7 +687,7 @@ void func_80B15424(EnTa* this, PlayState* play) {
     }
 }
 
-void func_80B154FC(EnTa* this, PlayState* play) {
+void EnTa_RunCuccoGame(EnTa* this, PlayState* play) {
     s32 i;
 
     for (i = 0; i < ARRAY_COUNT(this->superCuccos); i++) {
@@ -797,7 +797,7 @@ void func_80B1585C(EnTa* this, PlayState* play) {
     }
 
     if (this->unk_2CC == 0) {
-        func_80B13AA0(this, func_80B154FC, func_80B16938);
+        EnTa_SetupAction(this, EnTa_RunCuccoGame, EnTa_AnimRunToEnd);
         this->unk_2E0 &= ~0x10;
         Animation_Change(&this->skelAnime, &gTalonSitWakeUpAnim, 1.0f,
                          Animation_GetLastFrame(&gTalonSitWakeUpAnim) - 1.0f,
@@ -808,7 +808,7 @@ void func_80B1585C(EnTa* this, PlayState* play) {
 
 void func_80B15AD4(EnTa* this, PlayState* play) {
     if (this->unk_2CC == 0 && this->unk_2E0 & 0x20) {
-        func_80B13AA0(this, func_80B1585C, func_80B16938);
+        EnTa_SetupAction(this, func_80B1585C, EnTa_AnimRunToEnd);
         this->unk_2E0 &= ~0x10;
         Animation_Change(&this->skelAnime, &gTalonSitHandsUpAnim, 1.0f, 1.0f,
                          Animation_GetLastFrame(&gTalonSitHandsUpAnim), ANIMMODE_ONCE, 0.0f);
@@ -829,7 +829,7 @@ void func_80B15AD4(EnTa* this, PlayState* play) {
 
 void func_80B15BF8(EnTa* this, PlayState* play) {
     if (this->unk_2E0 & 0x10) {
-        func_80B13AA0(this, func_80B15AD4, func_80B16938);
+        EnTa_SetupAction(this, func_80B15AD4, EnTa_AnimRunToEnd);
         this->unk_2E0 &= ~0x10;
         Animation_Change(&this->skelAnime, &gTalonSitHandsUpAnim, 1.0f, 0.0f, 1.0f, ANIMMODE_ONCE, 0.0f);
         this->unk_2CC = 5;
@@ -842,7 +842,7 @@ void func_80B15BF8(EnTa* this, PlayState* play) {
 
 void func_80B15CC8(EnTa* this, PlayState* play) {
     if (this->unk_2E0 & 0x10) {
-        func_80B13AA0(this, func_80B15BF8, func_80B16938);
+        EnTa_SetupAction(this, func_80B15BF8, EnTa_AnimRunToEnd);
         this->unk_2E0 &= ~0x10;
         Animation_Change(&this->skelAnime, &gTalonSitHandsUpAnim, -1.0f, 29.0f, 0.0f, ANIMMODE_ONCE, 10.0f);
     }
@@ -853,25 +853,25 @@ void func_80B15CC8(EnTa* this, PlayState* play) {
 }
 
 void func_80B15D90(EnTa* this, PlayState* play) {
-    func_80B13AA0(this, func_80B15CC8, func_80B16938);
+    EnTa_SetupAction(this, func_80B15CC8, EnTa_AnimRunToEnd);
     this->unk_2E0 &= ~0x10;
     Animation_Change(&this->skelAnime, &gTalonSitHandsUpAnim, 1.0f, 8.0f, 29.0f, ANIMMODE_ONCE, -10.0f);
     Message_ContinueTextbox(play, 0x2080);
     this->unk_2E0 &= ~0x20;
 }
 
-void func_80B15E28(EnTa* this, PlayState* play) {
+void EnTa_TalkGeneralInLonLonHouse(EnTa* this, PlayState* play) {
     if (Actor_TextboxIsClosing(&this->actor, play)) {
-        func_80B14F20(this, func_80B16504);
+        func_80B14F20(this, EnTa_IdleSittingInLonLonHouse);
         func_80B13AAC(this, play);
     }
     this->unk_2E0 |= 1;
 }
 
-void func_80B15E80(EnTa* this, PlayState* play) {
+void EnTa_GiveItemInLonLonHouse(EnTa* this, PlayState* play) {
     if (Actor_HasParent(&this->actor, play)) {
         this->actor.parent = NULL;
-        this->actionFunc = func_80B15E28;
+        this->actionFunc = EnTa_TalkGeneralInLonLonHouse;
         if (!(this->unk_2E0 & 0x2)) {
             Flags_SetItemGetInf(ITEMGETINF_TALON_BOTTLE);
         }
@@ -889,11 +889,11 @@ void func_80B15E80(EnTa* this, PlayState* play) {
     this->unk_2E0 |= 1;
 }
 
-void func_80B15F54(EnTa* this, PlayState* play) {
+void EnTa_TalkAfterCuccoGameFirstWon(EnTa* this, PlayState* play) {
     if ((Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(play)) {
         Message_CloseTextbox(play);
         this->unk_2E0 &= ~0x2;
-        func_80B13AA0(this, func_80B15E80, func_80B16938);
+        EnTa_SetupAction(this, EnTa_GiveItemInLonLonHouse, EnTa_AnimRunToEnd);
         if (!IS_RANDO) {
             Actor_OfferGetItem(&this->actor, play, GI_MILK_BOTTLE, 10000.0f, 50.0f);
         } else {
@@ -910,15 +910,15 @@ void func_80B15FE8(EnTa* this, PlayState* play) {
                 switch (func_80B14DD8()) {
                     case 0:
                         Message_ContinueTextbox(play, 0x85);
-                        func_80B13AA0(this, func_80B15034, func_80B16938);
+                        EnTa_SetupAction(this, func_80B15034, EnTa_AnimRunToEnd);
                         break;
                     case 1:
                         Message_ContinueTextbox(play, 0x208A);
-                        func_80B13AA0(this, func_80B15E28, func_80B16938);
+                        EnTa_SetupAction(this, EnTa_TalkGeneralInLonLonHouse, EnTa_AnimRunToEnd);
                         break;
                     case 2:
                         this->unk_2E0 |= 2;
-                        func_80B13AA0(this, func_80B15E80, func_80B16938);
+                        EnTa_SetupAction(this, EnTa_GiveItemInLonLonHouse, EnTa_AnimRunToEnd);
                         Rupees_ChangeBy(-30);
                         GetItemEntry itemEntry = ItemTable_Retrieve(GI_MILK);
                         gSaveContext.pendingSale = itemEntry.itemId;
@@ -930,14 +930,14 @@ void func_80B15FE8(EnTa* this, PlayState* play) {
             case 1:
                 if (gSaveContext.rupees < 10) {
                     Message_ContinueTextbox(play, 0x85);
-                    func_80B13AA0(this, func_80B15034, func_80B16938);
+                    EnTa_SetupAction(this, func_80B15034, EnTa_AnimRunToEnd);
                 } else {
                     Rupees_ChangeBy(-10);
                     func_80B15D90(this, play);
                 }
                 break;
             case 2:
-                func_80B14F20(this, func_80B16504);
+                func_80B14F20(this, EnTa_IdleSittingInLonLonHouse);
                 func_80B13AAC(this, play);
                 break;
         }
@@ -962,14 +962,14 @@ void func_80B161C0(EnTa* this, PlayState* play) {
             case 0:
                 if (gSaveContext.rupees < price) {
                     Message_ContinueTextbox(play, 0x85);
-                    func_80B13AA0(this, func_80B15034, func_80B16938);
+                    EnTa_SetupAction(this, func_80B15034, EnTa_AnimRunToEnd);
                 } else {
                     Rupees_ChangeBy(-price);
                     func_80B15D90(this, play);
                 }
                 break;
             case 1:
-                func_80B14F20(this, func_80B16504);
+                func_80B14F20(this, EnTa_IdleSittingInLonLonHouse);
                 func_80B13AAC(this, play);
                 break;
         }
@@ -983,7 +983,7 @@ void func_80B161C0(EnTa* this, PlayState* play) {
 void func_80B162E8(EnTa* this, PlayState* play) {
     if ((Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE) && Message_ShouldAdvance(play)) {
         Message_ContinueTextbox(play, 0x2087);
-        func_80B13AA0(this, func_80B15F54, func_80B16938);
+        EnTa_SetupAction(this, EnTa_TalkAfterCuccoGameFirstWon, EnTa_AnimRunToEnd);
     }
 
     if (this->unk_2E0 & 0x10) {
@@ -996,10 +996,10 @@ void func_80B16364(EnTa* this, PlayState* play) {
         Flags_SetInfTable(INFTABLE_TALKED_TO_TALON_IN_RANCH_HOUSE);
         if (Flags_GetItemGetInf(ITEMGETINF_TALON_BOTTLE)) {
             Message_ContinueTextbox(play, 0x208B);
-            func_80B13AA0(this, func_80B15FE8, func_80B16938);
+            EnTa_SetupAction(this, func_80B15FE8, EnTa_AnimRunToEnd);
         } else {
             Message_ContinueTextbox(play, 0x207F);
-            func_80B13AA0(this, func_80B161C0, func_80B16938);
+            EnTa_SetupAction(this, func_80B161C0, EnTa_AnimRunToEnd);
         }
     }
 
@@ -1013,16 +1013,16 @@ void func_80B1642C(EnTa* this, PlayState* play) {
         if (Inventory_HasEmptyBottle()) {
             Message_CloseTextbox(play);
             this->unk_2E0 |= 2;
-            func_80B13AA0(this, func_80B15E80, func_80B16938);
+            EnTa_SetupAction(this, EnTa_GiveItemInLonLonHouse, EnTa_AnimRunToEnd);
             Actor_OfferGetItem(&this->actor, play, GI_MILK, 10000.0f, 50.0f);
         } else {
             Message_ContinueTextbox(play, 0x208A);
-            func_80B13AA0(this, func_80B15E28, func_80B16938);
+            EnTa_SetupAction(this, EnTa_TalkGeneralInLonLonHouse, EnTa_AnimRunToEnd);
         }
     }
 }
 
-void func_80B16504(EnTa* this, PlayState* play) {
+void EnTa_IdleSittingInLonLonHouse(EnTa* this, PlayState* play) {
     u16 faceReaction = Text_GetFaceReaction(play, 0x18);
 
     func_80B13AAC(this, play);
@@ -1031,7 +1031,7 @@ void func_80B16504(EnTa* this, PlayState* play) {
         Audio_PlayActorSound2(&this->actor, NA_SE_VO_TA_SURPRISE);
 
         if (faceReaction != 0) {
-            func_80B14FAC(this, func_80B15E28);
+            func_80B14FAC(this, EnTa_TalkGeneralInLonLonHouse);
         } else {
             Flags_SetInfTable(INFTABLE_TALKED_TO_TALON_IN_RANCH_HOUSE);
 
@@ -1052,7 +1052,7 @@ void func_80B16504(EnTa* this, PlayState* play) {
     this->unk_2E0 &= ~1;
 }
 
-void func_80B16608(EnTa* this, PlayState* play) {
+void EnTa_IdleAfterCuccoGameFinished(EnTa* this, PlayState* play) {
     if (Actor_ProcessTalkRequest(&this->actor, play)) {
         switch (this->actor.textId) {
             case 0x2085:
@@ -1073,17 +1073,17 @@ void func_80B16608(EnTa* this, PlayState* play) {
     this->unk_2E0 |= 1;
 }
 
-void func_80B166CC(EnTa* this) {
+void EnTa_BlinkWaitUntilNext(EnTa* this) {
     s16 temp_v0 = this->blinkTimer - 1;
 
     if (temp_v0 != 0) {
         this->blinkTimer = temp_v0;
     } else {
-        this->unk_2B0 = func_80B16700;
+        this->unk_2B0 = EnTa_BlinkAdvanceState;
     }
 }
 
-void func_80B16700(EnTa* this) {
+void EnTa_BlinkAdvanceState(EnTa* this) {
     s16 blinkTimer = this->blinkTimer - 1;
 
     if (blinkTimer != 0) {
@@ -1101,7 +1101,7 @@ void func_80B16700(EnTa* this) {
                 blinkTimer = (s32)(Rand_ZeroOne() * 60.0f) + 20;
             }
             this->blinkTimer = blinkTimer;
-            this->unk_2B0 = func_80B166CC;
+            this->unk_2B0 = EnTa_BlinkWaitUntilNext;
         } else {
             this->eyeIndex = nextEyeIndex;
             this->blinkTimer = 1;
@@ -1109,13 +1109,13 @@ void func_80B16700(EnTa* this) {
     }
 }
 
-void func_80B167C0(EnTa* this) {
+void EnTa_AnimRepeatCurrent(EnTa* this) {
     if (SkelAnime_Update(&this->skelAnime)) {
         Animation_PlayOnce(&this->skelAnime, this->currentAnimation);
     }
 }
 
-void func_80B167FC(EnTa* this) {
+void EnTa_AnimSleeping(EnTa* this) {
     if (SkelAnime_Update(&this->skelAnime)) {
         Animation_PlayOnce(&this->skelAnime, this->currentAnimation);
         Audio_PlayActorSound2(&this->actor, NA_SE_VO_TA_SLEEP);
@@ -1123,7 +1123,7 @@ void func_80B167FC(EnTa* this) {
     this->unk_2E0 |= 0xC;
 }
 
-void func_80B16854(EnTa* this) {
+void EnTa_AnimSitSleeping(EnTa* this) {
     if (this->unk_2E2 > 0) {
         this->unk_2E2--;
     } else {
@@ -1142,7 +1142,7 @@ void func_80B16854(EnTa* this) {
     this->unk_2E0 |= 4;
 }
 
-void func_80B16938(EnTa* this) {
+void EnTa_AnimRunToEnd(EnTa* this) {
     if (!(this->unk_2E0 & 0x10)) {
         if (SkelAnime_Update(&this->skelAnime)) {
             this->unk_2E0 |= 0x10;

From 1e9cba1d616615234079e414f6d8b354be2c9efb Mon Sep 17 00:00:00 2001
From: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Date: Thu, 4 Apr 2024 11:30:45 -0400
Subject: [PATCH 092/230] vb diving game (#100)

---
 .../game-interactor/GameInteractor.h             |  2 ++
 .../Enhancements/randomizer/hook_handlers.cpp    |  1 +
 .../actors/ovl_En_Diving_Game/z_en_diving_game.c | 16 ++++++----------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h
index c61a82760..08f1fe0be 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h
@@ -292,6 +292,8 @@ typedef enum {
     GI_VB_GIVE_ITEM_FROM_SHOOTING_GALLERY,
     // Opt: *EnExItem
     GI_VB_GIVE_ITEM_FROM_TARGET_IN_WOODS,
+    // Opt: *EnDivingGame
+    GI_VB_GIVE_ITEM_FROM_DIVING_MINIGAME,
 
     GI_VB_GIVE_ITEM_FAIRY_OCARINA,
     GI_VB_GIVE_ITEM_WEIRD_EGG,
diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index ea3755a69..f1cc89102 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -768,6 +768,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
         case GI_VB_TRADE_TIMER_FROG:
         case GI_VB_ANJU_SET_OBTAINED_TRADE_ITEM:
         case GI_VB_GIVE_ITEM_FROM_TARGET_IN_WOODS:
+        case GI_VB_GIVE_ITEM_FROM_DIVING_MINIGAME:
         case GI_VB_GIVE_ITEM_FROM_GORON:
         case GI_VB_GIVE_ITEM_FROM_LAB_DIVE:
         case GI_VB_GIVE_ITEM_FROM_SKULL_KID_SARIAS_SONG:
diff --git a/soh/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c b/soh/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c
index 84ac2749d..b411c1427 100644
--- a/soh/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c
+++ b/soh/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c
@@ -8,6 +8,7 @@
 #include "overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h"
 #include "objects/object_zo/object_zo.h"
 #include "vt.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_WHILE_CULLED)
 
@@ -455,11 +456,8 @@ void func_809EEA00(EnDivingGame* this, PlayState* play) {
     if ((this->unk_292 == Message_GetState(&play->msgCtx) && Message_ShouldAdvance(play))) {
         Message_CloseTextbox(play);
         this->actor.parent = NULL;
-        if (!IS_RANDO) {
+        if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_DIVING_MINIGAME, true, &this->actor)) {
             Actor_OfferGetItem(&this->actor, play, GI_SCALE_SILVER, 90.0f, 10.0f);
-        } else {
-            GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_ZD_DIVING_MINIGAME, GI_SCALE_SILVER);
-            GiveItemEntryFromActor(&this->actor, play, getItemEntry, 90.0f, 10.0f);
         }
         this->actionFunc = func_809EEA90;
     }
@@ -467,14 +465,11 @@ void func_809EEA00(EnDivingGame* this, PlayState* play) {
 
 void func_809EEA90(EnDivingGame* this, PlayState* play) {
     SkelAnime_Update(&this->skelAnime);
-    if (Actor_HasParent(&this->actor, play)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_DIVING_MINIGAME, true, &this->actor)) {
         this->actionFunc = func_809EEAF8;
     } else {
-        if (!IS_RANDO) {
+        if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_DIVING_MINIGAME, true, &this->actor)) {
             Actor_OfferGetItem(&this->actor, play, GI_SCALE_SILVER, 90.0f, 10.0f);
-        } else {
-            GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_ZD_DIVING_MINIGAME, GI_SCALE_SILVER);
-            GiveItemEntryFromActor(&this->actor, play, getItemEntry, 90.0f, 10.0f);
         }
     }
 }
@@ -482,7 +477,8 @@ void func_809EEA90(EnDivingGame* this, PlayState* play) {
 // Award the scale?
 void func_809EEAF8(EnDivingGame* this, PlayState* play) {
     SkelAnime_Update(&this->skelAnime);
-    if (Message_GetState(&play->msgCtx) == TEXT_STATE_DONE && Message_ShouldAdvance(play)) {
+    if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE && Message_ShouldAdvance(play)) ||
+         !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_DIVING_MINIGAME, true, &this->actor)) {
         // "Successful completion"
         osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 正常終了 ☆☆☆☆☆ \n" VT_RST);
         this->allRupeesThrown = this->state = this->phase = this->unk_2A2 = this->grabbedRupeesCounter = 0;

From 307e1060381bebd338b4769af3e606eecb898c00 Mon Sep 17 00:00:00 2001
From: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Date: Thu, 4 Apr 2024 11:55:07 -0400
Subject: [PATCH 093/230] vb talon's chickens (#99)

---
 .../Enhancements/game-interactor/GameInteractor.h    |  2 ++
 soh/soh/Enhancements/randomizer/hook_handlers.cpp    |  1 +
 soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c          | 12 +++---------
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h
index 08f1fe0be..f5e70da16 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h
@@ -292,6 +292,8 @@ typedef enum {
     GI_VB_GIVE_ITEM_FROM_SHOOTING_GALLERY,
     // Opt: *EnExItem
     GI_VB_GIVE_ITEM_FROM_TARGET_IN_WOODS,
+    // Opt: *EnTa
+    GI_VB_GIVE_ITEM_FROM_TALONS_CHICKENS,
     // Opt: *EnDivingGame
     GI_VB_GIVE_ITEM_FROM_DIVING_MINIGAME,
 
diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index f1cc89102..772ce16aa 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -768,6 +768,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
         case GI_VB_TRADE_TIMER_FROG:
         case GI_VB_ANJU_SET_OBTAINED_TRADE_ITEM:
         case GI_VB_GIVE_ITEM_FROM_TARGET_IN_WOODS:
+        case GI_VB_GIVE_ITEM_FROM_TALONS_CHICKENS:
         case GI_VB_GIVE_ITEM_FROM_DIVING_MINIGAME:
         case GI_VB_GIVE_ITEM_FROM_GORON:
         case GI_VB_GIVE_ITEM_FROM_LAB_DIVE:
diff --git a/soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c b/soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c
index d8a0ff554..cdec042bc 100644
--- a/soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c
+++ b/soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c
@@ -869,7 +869,7 @@ void EnTa_TalkGeneralInLonLonHouse(EnTa* this, PlayState* play) {
 }
 
 void EnTa_GiveItemInLonLonHouse(EnTa* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_TALONS_CHICKENS, true, &this->actor)) {
         this->actor.parent = NULL;
         this->actionFunc = EnTa_TalkGeneralInLonLonHouse;
         if (!(this->unk_2E0 & 0x2)) {
@@ -879,11 +879,8 @@ void EnTa_GiveItemInLonLonHouse(EnTa* this, PlayState* play) {
     } else if (this->unk_2E0 & 2) {
         Actor_OfferGetItem(&this->actor, play, GI_MILK, 10000.0f, 50.0f);
     } else {
-        if (!IS_RANDO) {
+        if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_TALONS_CHICKENS, true, &this->actor)) {
             Actor_OfferGetItem(&this->actor, play, GI_MILK_BOTTLE, 10000.0f, 50.0f);
-        } else {
-            GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_LLR_TALONS_CHICKENS, GI_MILK_BOTTLE);
-            GiveItemEntryFromActor(&this->actor, play, getItemEntry, 10000.0f, 50.0f);
         }
     }
     this->unk_2E0 |= 1;
@@ -894,11 +891,8 @@ void EnTa_TalkAfterCuccoGameFirstWon(EnTa* this, PlayState* play) {
         Message_CloseTextbox(play);
         this->unk_2E0 &= ~0x2;
         EnTa_SetupAction(this, EnTa_GiveItemInLonLonHouse, EnTa_AnimRunToEnd);
-        if (!IS_RANDO) {
+        if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_TALONS_CHICKENS, true, &this->actor)) {
             Actor_OfferGetItem(&this->actor, play, GI_MILK_BOTTLE, 10000.0f, 50.0f);
-        } else {
-            GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_LLR_TALONS_CHICKENS, GI_MILK_BOTTLE);
-            GiveItemEntryFromActor(&this->actor, play, getItemEntry, 10000.0f, 50.0f);
         }
     }
 }

From 6d77bbd4a975c56a89d9011e4fcb3f73c8d25b65 Mon Sep 17 00:00:00 2001
From: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Date: Mon, 8 Apr 2024 11:55:16 -0400
Subject: [PATCH 094/230] vb skull rewards (#101)

---
 .../game-interactor/GameInteractor.h          |  2 +
 .../Enhancements/randomizer/hook_handlers.cpp | 28 ++++++++
 soh/src/overlays/actors/ovl_En_Sth/z_en_sth.c | 68 ++++++-------------
 soh/src/overlays/actors/ovl_En_Sth/z_en_sth.h |  2 +
 4 files changed, 51 insertions(+), 49 deletions(-)

diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h
index f5e70da16..1f0da656f 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h
@@ -296,6 +296,8 @@ typedef enum {
     GI_VB_GIVE_ITEM_FROM_TALONS_CHICKENS,
     // Opt: *EnDivingGame
     GI_VB_GIVE_ITEM_FROM_DIVING_MINIGAME,
+    // Opt: *EnSth
+    GI_VB_GIVE_ITEM_FROM_SKULLTULA_REWARD,
 
     GI_VB_GIVE_ITEM_FAIRY_OCARINA,
     GI_VB_GIVE_ITEM_WEIRD_EGG,
diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index 772ce16aa..933b27e5a 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -24,6 +24,7 @@ extern "C" {
 #include "src/overlays/actors/ovl_En_Ms/z_en_ms.h"
 #include "src/overlays/actors/ovl_En_Fr/z_en_fr.h"
 #include "src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h"
+#include "src/overlays/actors/ovl_En_Sth/z_en_sth.h"
 #include "adult_trade_shuffle.h"
 extern SaveContext gSaveContext;
 extern PlayState* gPlayState;
@@ -763,6 +764,33 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             *should = eligible;
             break;
         }
+        case GI_VB_GIVE_ITEM_FROM_SKULLTULA_REWARD: {
+            // In z_en_sth.c the rewards are stored in sGetItemIds, the first entry
+            // in that array is GI_RUPEE_GOLD, and the reward is picked in EnSth_GivePlayerItem
+            // via sGetItemIds[this->actor.params]. This means if actor.params == 0 we're looking
+            // at the 100 GS reward
+            EnSth* enSth = static_cast<EnSth*>(optionalArg);
+            if (enSth->actor.params == 0) {
+                // if nothing is shuffled onto 100 GS,
+                // or we already got the 100 GS reward,
+                // let the player farm
+                if (!RAND_GET_OPTION(RSK_SHUFFLE_100_GS_REWARD) ||
+                    Flags_GetRandomizerInf(RAND_INF_KAK_100_GOLD_SKULLTULA_REWARD)) {
+                    *should = true;
+                    break;
+                }
+
+                // we're giving the 100 GS rando reward! set the rando inf
+                Flags_SetRandomizerInf(RAND_INF_KAK_100_GOLD_SKULLTULA_REWARD);
+                
+                // also set the actionfunc so this doesn't immediately get
+                // called again (and lead to a vanilla+rando item give
+                // because the flag check will pass next time)
+                enSth->actionFunc = (EnSthActionFunc)EnSth_RewardObtainedTalk;
+            }
+            *should = false;
+            break;
+        }
         case GI_VB_TRADE_TIMER_ODD_MUSHROOM:
         case GI_VB_TRADE_TIMER_EYEDROPS:
         case GI_VB_TRADE_TIMER_FROG:
diff --git a/soh/src/overlays/actors/ovl_En_Sth/z_en_sth.c b/soh/src/overlays/actors/ovl_En_Sth/z_en_sth.c
index 7a0332910..f8b50d823 100644
--- a/soh/src/overlays/actors/ovl_En_Sth/z_en_sth.c
+++ b/soh/src/overlays/actors/ovl_En_Sth/z_en_sth.c
@@ -257,66 +257,34 @@ void EnSth_ParentRewardObtainedWait(EnSth* this, PlayState* play) {
 
 void EnSth_GivePlayerItem(EnSth* this, PlayState* play) {
     u16 getItemId = sGetItemIds[this->actor.params];
-    GetItemEntry getItemEntry = (GetItemEntry)GET_ITEM_NONE;
-    
-    if (IS_RANDO) {
-        switch (getItemId) {
-            case GI_RUPEE_GOLD:
-                if (!Flags_GetRandomizerInf(RAND_INF_KAK_100_GOLD_SKULLTULA_REWARD)) {
-                    getItemEntry = Randomizer_GetItemFromKnownCheck(RC_KAK_100_GOLD_SKULLTULA_REWARD, GI_RUPEE_GOLD);
-                    Flags_SetRandomizerInf(RAND_INF_KAK_100_GOLD_SKULLTULA_REWARD);
-                }
-                break;
-            case GI_WALLET_ADULT:
-                getItemEntry = Randomizer_GetItemFromKnownCheck(RC_KAK_10_GOLD_SKULLTULA_REWARD, GI_WALLET_ADULT);
-                break;
-            case GI_STONE_OF_AGONY:
-                getItemEntry = Randomizer_GetItemFromKnownCheck(RC_KAK_20_GOLD_SKULLTULA_REWARD, GI_STONE_OF_AGONY);
-                break;
-            case GI_WALLET_GIANT:
-                getItemEntry = Randomizer_GetItemFromKnownCheck(RC_KAK_30_GOLD_SKULLTULA_REWARD, GI_WALLET_GIANT);
-                break;
-            case GI_BOMBCHUS_10:
-                getItemEntry = Randomizer_GetItemFromKnownCheck(RC_KAK_40_GOLD_SKULLTULA_REWARD, GI_BOMBCHUS_10);
-                break;
-            case GI_HEART_PIECE:
-                getItemEntry = Randomizer_GetItemFromKnownCheck(RC_KAK_50_GOLD_SKULLTULA_REWARD, GI_HEART_PIECE);
-                break;
-        }
-        getItemId = getItemEntry.getItemId;
-    } else {
-        switch (this->actor.params) {
-            case 1:
-            case 3:
-                switch (CUR_UPG_VALUE(UPG_WALLET)) {
-                    case 0:
-                        getItemId = GI_WALLET_ADULT;
-                        break;
 
-                    case 1:
-                        getItemId = GI_WALLET_GIANT;
-                        break;
-                }
-                break;
-        }
+    switch (this->actor.params) {
+        case 1:
+        case 3:
+            switch (CUR_UPG_VALUE(UPG_WALLET)) {
+                case 0:
+                    getItemId = GI_WALLET_ADULT;
+                    break;
+
+                case 1:
+                    getItemId = GI_WALLET_GIANT;
+                    break;
+            }
+            break;
     }
 
-    if (!IS_RANDO || getItemEntry.getItemId == GI_NONE) {
-        Actor_OfferGetItem(&this->actor, play, getItemId, 10000.0f, 50.0f);
-    } else {
-        GiveItemEntryFromActor(&this->actor, play, getItemEntry, 10000.0f, 50.0f);
-    }
+    Actor_OfferGetItem(&this->actor, play, getItemId, 10000.0f, 50.0f);
 }
 
 void EnSth_GiveReward(EnSth* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_SKULLTULA_REWARD, true, this)) {
         this->actor.parent = NULL;
         EnSth_SetupAction(this, EnSth_RewardObtainedTalk);
         gSaveContext.eventChkInf[EVENTCHKINF_SKULLTULA_REWARD_INDEX] |= this->eventFlag;
         if (this->eventFlag != 0) {
             GameInteractor_ExecuteOnFlagSet(FLAG_EVENT_CHECK_INF, (EVENTCHKINF_SKULLTULA_REWARD_INDEX << 4) + sEventFlagsShift[this->actor.params]);
         }
-    } else {
+    } else if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_SKULLTULA_REWARD, true, this)) {
         EnSth_GivePlayerItem(this, play);
     }
     EnSth_FacePlayer(this, play);
@@ -326,7 +294,9 @@ void EnSth_RewardUnobtainedTalk(EnSth* this, PlayState* play) {
     if ((Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(play)) {
         Message_CloseTextbox(play);
         EnSth_SetupAction(this, EnSth_GiveReward);
-        EnSth_GivePlayerItem(this, play);
+        if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_SKULLTULA_REWARD, true, this)) {
+            EnSth_GivePlayerItem(this, play);
+        }
     }
     EnSth_FacePlayer(this, play);
 }
diff --git a/soh/src/overlays/actors/ovl_En_Sth/z_en_sth.h b/soh/src/overlays/actors/ovl_En_Sth/z_en_sth.h
index 9391496ae..c0001f955 100644
--- a/soh/src/overlays/actors/ovl_En_Sth/z_en_sth.h
+++ b/soh/src/overlays/actors/ovl_En_Sth/z_en_sth.h
@@ -25,4 +25,6 @@ typedef struct EnSth {
     /* 0x02B8 */ EnSthActionFunc actionFunc;
 } EnSth; // size = 0x02BC
 
+void EnSth_RewardObtainedTalk(EnSth* enSth, PlayState* play);
+
 #endif

From 9c9fc49d32847a7cce24336a12ce43fd57958574 Mon Sep 17 00:00:00 2001
From: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Date: Mon, 8 Apr 2024 11:59:48 -0400
Subject: [PATCH 095/230] vb horseback archery (#102)

* vb horseback archery

* Update soh/soh/Enhancements/randomizer/hook_handlers.cpp

---------

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
---
 .../game-interactor/GameInteractor.h          |  2 +
 .../Enhancements/randomizer/hook_handlers.cpp |  8 ++
 soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c | 77 ++++++-------------
 3 files changed, 33 insertions(+), 54 deletions(-)

diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h
index 1f0da656f..ad3ff9d6f 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h
@@ -296,6 +296,8 @@ typedef enum {
     GI_VB_GIVE_ITEM_FROM_TALONS_CHICKENS,
     // Opt: *EnDivingGame
     GI_VB_GIVE_ITEM_FROM_DIVING_MINIGAME,
+    // Opt: *EnGe1
+    GI_VB_GIVE_ITEM_FROM_HORSEBACK_ARCHERY,
     // Opt: *EnSth
     GI_VB_GIVE_ITEM_FROM_SKULLTULA_REWARD,
 
diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index 933b27e5a..788701b9c 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -764,6 +764,14 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             *should = eligible;
             break;
         }
+        case GI_VB_GIVE_ITEM_FROM_HORSEBACK_ARCHERY: {
+            // give both rewards at the same time
+            if (gSaveContext.minigameScore >= 1500) {
+                Flags_SetItemGetInf(ITEMGETINF_0F);
+            }
+            *should = false;
+            break;
+        }
         case GI_VB_GIVE_ITEM_FROM_SKULLTULA_REWARD: {
             // In z_en_sth.c the rewards are stored in sGetItemIds, the first entry
             // in that array is GI_RUPEE_GOLD, and the reward is picked in EnSth_GivePlayerItem
diff --git a/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c b/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
index c72205b8f..995e3d5fd 100644
--- a/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
+++ b/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
@@ -8,6 +8,7 @@
 #include "vt.h"
 #include "objects/object_ge1/object_ge1.h"
 #include "soh/Enhancements/randomizer/randomizer_entrance.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY)
 
@@ -531,16 +532,8 @@ void EnGe1_WaitTillItemGiven_Archery(EnGe1* this, PlayState* play) {
     GetItemEntry getItemEntry = (GetItemEntry)GET_ITEM_NONE;
     s32 getItemId;
 
-    if (Actor_HasParent(&this->actor, play)) {
-        if (IS_RANDO && gSaveContext.minigameScore >= 1500 && !Flags_GetInfTable(INFTABLE_190)) {
-            Flags_SetItemGetInf(ITEMGETINF_0F);
-            Flags_SetInfTable(INFTABLE_190);
-            this->stateFlags |= GE1_STATE_GIVE_QUIVER;
-            this->actor.parent = NULL;
-            return;
-        } else {
-            this->actionFunc = EnGe1_SetupWait_Archery;
-        }
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_HORSEBACK_ARCHERY, true, this)) {
+        this->actionFunc = EnGe1_SetupWait_Archery;
 
         if (this->stateFlags & GE1_STATE_GIVE_QUIVER) {
             Flags_SetItemGetInf(ITEMGETINF_0F);
@@ -549,33 +542,21 @@ void EnGe1_WaitTillItemGiven_Archery(EnGe1* this, PlayState* play) {
         }
     } else {
         if (this->stateFlags & GE1_STATE_GIVE_QUIVER) {
-            if (!IS_RANDO) {
-                switch (CUR_UPG_VALUE(UPG_QUIVER)) {
-                    //! @bug Asschest. See next function for details
-                    case 1:
-                        getItemId = GI_QUIVER_40;
-                        break;
-                    case 2:
-                        getItemId = GI_QUIVER_50;
-                        break;
-                }
-            } else {
-                getItemEntry = Randomizer_GetItemFromKnownCheck(RC_GF_HBA_1500_POINTS, CUR_UPG_VALUE(UPG_QUIVER) == 1 ? GI_QUIVER_40 : GI_QUIVER_50);
-                getItemId = getItemEntry.getItemId;
+            switch (CUR_UPG_VALUE(UPG_QUIVER)) {
+                //! @bug Asschest. See next function for details
+                case 1:
+                    getItemId = GI_QUIVER_40;
+                    break;
+                case 2:
+                    getItemId = GI_QUIVER_50;
+                    break;
             }
         } else {
-            if (!IS_RANDO) {
-                getItemId = GI_HEART_PIECE;
-            } else {
-                getItemEntry = Randomizer_GetItemFromKnownCheck(RC_GF_HBA_1000_POINTS, GI_HEART_PIECE);
-                getItemId = getItemEntry.getItemId;
-            }
+            getItemId = GI_HEART_PIECE;
         }
 
-        if (!IS_RANDO || getItemEntry.getItemId == GI_NONE) {
+        if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_HORSEBACK_ARCHERY, true, this)) {
             Actor_OfferGetItem(&this->actor, play, getItemId, 10000.0f, 50.0f);
-        } else {
-            GiveItemEntryFromActor(&this->actor, play, getItemEntry, 10000.0f, 50.0f);
         }
     }
 }
@@ -590,33 +571,21 @@ void EnGe1_BeginGiveItem_Archery(EnGe1* this, PlayState* play) {
     }
 
     if (this->stateFlags & GE1_STATE_GIVE_QUIVER) {
-        if (!IS_RANDO) {
-            switch (CUR_UPG_VALUE(UPG_QUIVER)) {
-                //! @bug Asschest. See next function for details
-                case 1:
-                    getItemId = GI_QUIVER_40;
-                    break;
-                case 2:
-                    getItemId = GI_QUIVER_50;
-                    break;
-            }
-        } else {
-            getItemEntry = Randomizer_GetItemFromKnownCheck(RC_GF_HBA_1500_POINTS, CUR_UPG_VALUE(UPG_QUIVER) == 1 ? GI_QUIVER_40 : GI_QUIVER_50);
-            getItemId = getItemEntry.getItemId;
+        switch (CUR_UPG_VALUE(UPG_QUIVER)) {
+            //! @bug Asschest. See next function for details
+            case 1:
+                getItemId = GI_QUIVER_40;
+                break;
+            case 2:
+                getItemId = GI_QUIVER_50;
+                break;
         }
     } else {
-        if (!IS_RANDO) {
-            getItemId = GI_HEART_PIECE;
-        } else {
-            getItemEntry = Randomizer_GetItemFromKnownCheck(RC_GF_HBA_1000_POINTS, GI_HEART_PIECE);
-            getItemId = getItemEntry.getItemId;
-        }
+        getItemId = GI_HEART_PIECE;
     }
 
-    if (!IS_RANDO || getItemEntry.getItemId == GI_NONE) {
+    if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_HORSEBACK_ARCHERY, true, this)) {
         Actor_OfferGetItem(&this->actor, play, getItemId, 10000.0f, 50.0f);
-    } else {
-        GiveItemEntryFromActor(&this->actor, play, getItemEntry, 10000.0f, 50.0f);
     }
 }
 

From fe231147d5b1942c2b700640f25d5faddc672dad Mon Sep 17 00:00:00 2001
From: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Date: Tue, 9 Apr 2024 23:46:11 -0400
Subject: [PATCH 096/230] vb underwater item (#104)

* underwater working pre func_80B858B4 replacement

* underwater item update handled by hookhandlers

* remove commented out code

* remove unused should
---
 .../Enhancements/randomizer/hook_handlers.cpp | 39 +++++++++++++++++++
 .../ovl_Item_Etcetera/z_item_etcetera.c       | 35 ++---------------
 .../ovl_Item_Etcetera/z_item_etcetera.h       |  3 ++
 3 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index 788701b9c..31ba23427 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -25,6 +25,7 @@ extern "C" {
 #include "src/overlays/actors/ovl_En_Fr/z_en_fr.h"
 #include "src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h"
 #include "src/overlays/actors/ovl_En_Sth/z_en_sth.h"
+#include "src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h"
 #include "adult_trade_shuffle.h"
 extern SaveContext gSaveContext;
 extern PlayState* gPlayState;
@@ -274,6 +275,27 @@ void ItemBHeart_UpdateRandomizedItem(Actor* actor, PlayState* play) {
     }
 }
 
+void ItemEtcetera_DrawRandomizedItem(ItemEtcetera* itemEtcetera, PlayState* play) {
+    EnItem00_CustomItemsParticles(&itemEtcetera->actor, play, itemEtcetera->sohItemEntry);
+    GetItemEntry_Draw(play, itemEtcetera->sohItemEntry);
+}
+
+void ItemEtcetera_func_80B858B4_Randomized(ItemEtcetera* itemEtcetera, PlayState* play) {
+    if (itemEtcetera->actor.xzDistToPlayer < 30.0f &&
+        fabsf(itemEtcetera->actor.yDistToPlayer) < 50.0f) {
+        if ((itemEtcetera->actor.params & 0xFF) == 1) {
+            Flags_SetEventChkInf(EVENTCHKINF_OBTAINED_RUTOS_LETTER);
+            Flags_SetSwitch(play, 0xB);
+        }
+
+        Actor_Kill(&itemEtcetera->actor);
+    } else {
+        if ((play->gameplayFrames & 0xD) == 0) {
+            EffectSsBubble_Spawn(play, &itemEtcetera->actor.world.pos, 0.0f, 0.0f, 10.0f, 0.13f);
+        }
+    }
+}
+
 void EnCow_MoveForRandomizer(EnCow* enCow, PlayState* play) {
     bool moved = false;
 
@@ -954,6 +976,23 @@ void RandomizerOnActorInitHandler(void* actorRef) {
             }
         }
     }
+
+    if (actor->id == ACTOR_ITEM_ETCETERA) {
+        ItemEtcetera* itemEtcetera = static_cast<ItemEtcetera*>(actorRef);
+        RandomizerCheck rc = OTRGlobals::Instance->gRandomizer->GetCheckFromActor(itemEtcetera->actor.id, gPlayState->sceneNum, itemEtcetera->actor.params);
+        if (rc != RC_UNKNOWN_CHECK) {
+            itemEtcetera->sohItemEntry = Rando::Context::GetInstance()->GetFinalGIEntry(rc, true, (GetItemID)Rando::StaticData::GetLocation(rc)->GetVanillaItem());
+            itemEtcetera->drawFunc = (ActorFunc)ItemEtcetera_DrawRandomizedItem;
+        }
+
+        int32_t type = itemEtcetera->actor.params & 0xFF;
+        switch (type) {
+            case ITEM_ETC_LETTER: {
+                itemEtcetera->futureActionFunc = (ItemEtceteraActionFunc)ItemEtcetera_func_80B858B4_Randomized;
+                break;
+            }
+        }
+    }
 }
 
 void RandomizerRegisterHooks() {
diff --git a/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c b/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c
index 6fdf162db..db42bc15b 100644
--- a/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c
+++ b/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c
@@ -83,8 +83,7 @@ void ItemEtcetera_Init(Actor* thisx, PlayState* play) {
         case ITEM_ETC_LETTER:
             Actor_SetScale(&this->actor, 0.5f);
             this->futureActionFunc = func_80B858B4;
-            if ((Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_RUTOS_LETTER) && !IS_RANDO) ||
-                (IS_RANDO && Flags_GetTreasure(play, 0x1E))) {
+            if (Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_RUTOS_LETTER)) {
                 Actor_Kill(&this->actor);
             }
             break;
@@ -147,21 +146,11 @@ void func_80B858B4(ItemEtcetera* this, PlayState* play) {
         if ((this->actor.params & 0xFF) == 1) {
             Flags_SetEventChkInf(EVENTCHKINF_OBTAINED_RUTOS_LETTER);
             Flags_SetSwitch(play, 0xB);
-
-            if (IS_RANDO) {
-                Flags_SetTreasure(play, 0x1E);
-            }
         }
+
         Actor_Kill(&this->actor);
     } else {
-        if (0) {} // Necessary to match
-
-        if (!IS_RANDO) {
-            Actor_OfferGetItem(&this->actor, play, this->getItemId, 30.0f, 50.0f);
-        } else {
-            GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_LH_UNDERWATER_ITEM, GI_LETTER_RUTO);
-            GiveItemEntryFromActor(&this->actor, play, getItemEntry, 30.0f, 50.0f);
-        }
+        Actor_OfferGetItem(&this->actor, play, this->getItemId, 30.0f, 50.0f);
 
         if ((play->gameplayFrames & 0xD) == 0) {
             EffectSsBubble_Spawn(play, &this->actor.world.pos, 0.0f, 0.0f, 10.0f, 0.13f);
@@ -246,24 +235,6 @@ void ItemEtcetera_Draw(Actor* thisx, PlayState* play) {
     ItemEtcetera* this = (ItemEtcetera*)thisx;
     s32 type = this->actor.params & 0xFF;
 
-    if (IS_RANDO) {
-        GetItemEntry randoGetItem = (GetItemEntry)GET_ITEM_NONE;
-        if (type == ITEM_ETC_ARROW_FIRE) {
-            randoGetItem = Randomizer_GetItemFromKnownCheck(RC_LH_SUN, GI_ARROW_FIRE);
-        } else if (type == ITEM_ETC_LETTER) {
-            randoGetItem = Randomizer_GetItemFromKnownCheck(RC_LH_UNDERWATER_ITEM, GI_LETTER_RUTO);
-        }
-
-        EnItem00_CustomItemsParticles(&this->actor, play, randoGetItem);
-
-        if (randoGetItem.itemId != ITEM_NONE) {
-            func_8002EBCC(&this->actor, play, 0);
-            func_8002ED80(&this->actor, play, 0);
-            GetItemEntry_Draw(play, randoGetItem);
-            return;
-        }
-    }
-
     func_8002EBCC(&this->actor, play, 0);
     func_8002ED80(&this->actor, play, 0);
     GetItem_Draw(play, this->giDrawId);
diff --git a/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h b/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h
index 3ec33b926..ceec9c8b1 100644
--- a/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h
+++ b/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h
@@ -16,6 +16,9 @@ typedef struct ItemEtcetera {
     /* 0x0154 */ u8 objBankIndex;
     /* 0x0158 */ ActorFunc drawFunc;
     /* 0x015C */ ItemEtceteraActionFunc actionFunc;
+    // #region SOH [Randomizer] Caching the get item entry for the draw function for performance
+    /*        */ GetItemEntry sohItemEntry;
+    // #endregion
 } ItemEtcetera; // size = 0x0160
 
 typedef enum {

From bbbd2520b1611f18da2df7ba13751d9da2694636 Mon Sep 17 00:00:00 2001
From: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Date: Tue, 9 Apr 2024 23:57:07 -0400
Subject: [PATCH 097/230] vb lh sun (#106)

* underwater working pre func_80B858B4 replacement

* underwater item update handled by hookhandlers

* vb lh sun

* remove unused should
---
 .../Enhancements/randomizer/hook_handlers.cpp | 44 +++++++++++++++++++
 .../ovl_Item_Etcetera/z_item_etcetera.c       | 14 +-----
 .../ovl_Item_Etcetera/z_item_etcetera.h       |  2 +
 3 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index 31ba23427..ce24e11d9 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -277,6 +277,8 @@ void ItemBHeart_UpdateRandomizedItem(Actor* actor, PlayState* play) {
 
 void ItemEtcetera_DrawRandomizedItem(ItemEtcetera* itemEtcetera, PlayState* play) {
     EnItem00_CustomItemsParticles(&itemEtcetera->actor, play, itemEtcetera->sohItemEntry);
+    func_8002EBCC(&itemEtcetera->actor, play, 0);
+    func_8002ED80(&itemEtcetera->actor, play, 0);
     GetItemEntry_Draw(play, itemEtcetera->sohItemEntry);
 }
 
@@ -296,6 +298,44 @@ void ItemEtcetera_func_80B858B4_Randomized(ItemEtcetera* itemEtcetera, PlayState
     }
 }
 
+void ItemEtcetera_func_80B85824_Randomized(ItemEtcetera* itemEtcetera, PlayState* play) {
+    if ((itemEtcetera->actor.params & 0xFF) != 7) {
+        return;
+    }
+
+    if (itemEtcetera->actor.xzDistToPlayer < 30.0f &&
+        fabsf(itemEtcetera->actor.yDistToPlayer) < 50.0f) {
+
+        Flags_SetTreasure(play, 0x1F);
+        Actor_Kill(&itemEtcetera->actor);
+    }
+}
+
+void ItemEtcetera_MoveRandomizedFireArrowDown(ItemEtcetera* itemEtcetera, PlayState* play) {
+    Actor_UpdateBgCheckInfo(play, &itemEtcetera->actor, 10.0f, 10.0f, 0.0f, 5);
+    Actor_MoveForward(&itemEtcetera->actor);
+    if (!(itemEtcetera->actor.bgCheckFlags & 1)) {
+        ItemEtcetera_SpawnSparkles(itemEtcetera, play);
+    }
+    itemEtcetera->actor.shape.rot.y += 0x400;
+    ItemEtcetera_func_80B85824_Randomized(itemEtcetera, play);
+}
+
+void ItemEtcetera_UpdateRandomizedFireArrow(ItemEtcetera* itemEtcetera, PlayState* play) {
+    if ((play->csCtx.state != CS_STATE_IDLE) && (play->csCtx.npcActions[0] != NULL)) {
+        if (play->csCtx.npcActions[0]->action == 2) {
+            itemEtcetera->actor.draw = (ActorFunc)ItemEtcetera_DrawRandomizedItem;
+            itemEtcetera->actor.gravity = -0.1f;
+            itemEtcetera->actor.minVelocityY = -4.0f;
+            itemEtcetera->actionFunc = ItemEtcetera_MoveRandomizedFireArrowDown;
+        }
+    } else {
+        itemEtcetera->actor.gravity = -0.1f;
+        itemEtcetera->actor.minVelocityY = -4.0f;
+        itemEtcetera->actionFunc = ItemEtcetera_MoveRandomizedFireArrowDown;
+    }
+}
+
 void EnCow_MoveForRandomizer(EnCow* enCow, PlayState* play) {
     bool moved = false;
 
@@ -991,6 +1031,10 @@ void RandomizerOnActorInitHandler(void* actorRef) {
                 itemEtcetera->futureActionFunc = (ItemEtceteraActionFunc)ItemEtcetera_func_80B858B4_Randomized;
                 break;
             }
+            case ITEM_ETC_ARROW_FIRE: {
+                itemEtcetera->futureActionFunc = (ItemEtceteraActionFunc)ItemEtcetera_UpdateRandomizedFireArrow;
+                break;
+            }
         }
     }
 }
diff --git a/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c b/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c
index db42bc15b..8a26860f7 100644
--- a/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c
+++ b/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c
@@ -120,24 +120,13 @@ void func_80B857D0(ItemEtcetera* this, PlayState* play) {
 
 void func_80B85824(ItemEtcetera* this, PlayState* play) {
     if (Actor_HasParent(&this->actor, play)) {
-        if ((this->actor.params & 0xFF) == 7) {
-            if (IS_RANDO) {
-                Flags_SetTreasure(play, 0x1F);
-            }
-        }
-
         if ((this->actor.params & 0xFF) == 1) {
             Flags_SetEventChkInf(EVENTCHKINF_OBTAINED_RUTOS_LETTER);
             Flags_SetSwitch(play, 0xB);
         }
         Actor_Kill(&this->actor);
     } else {
-        if (!IS_RANDO) {
-            Actor_OfferGetItem(&this->actor, play, this->getItemId, 30.0f, 50.0f);
-        } else {
-            GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_LH_SUN, GI_ARROW_FIRE);
-            GiveItemEntryFromActor(&this->actor, play, getItemEntry, 30.0f, 50.0f);
-        }
+        Actor_OfferGetItem(&this->actor, play, this->getItemId, 30.0f, 50.0f);
     }
 }
 
@@ -233,7 +222,6 @@ void ItemEtcetera_DrawThroughLens(Actor* thisx, PlayState* play) {
 
 void ItemEtcetera_Draw(Actor* thisx, PlayState* play) {
     ItemEtcetera* this = (ItemEtcetera*)thisx;
-    s32 type = this->actor.params & 0xFF;
 
     func_8002EBCC(&this->actor, play, 0);
     func_8002ED80(&this->actor, play, 0);
diff --git a/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h b/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h
index ceec9c8b1..5293292a4 100644
--- a/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h
+++ b/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h
@@ -38,4 +38,6 @@ typedef enum {
     /* 0x0D */ ITEM_ETC_KEY_SMALL_CHEST_GAME
 } ItemEtceteraType;
 
+void ItemEtcetera_SpawnSparkles(ItemEtcetera* ItemEtcetera, PlayState* play);
+
 #endif

From f3273e76273ae38306412ddf324be21511a80de9 Mon Sep 17 00:00:00 2001
From: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Date: Wed, 10 Apr 2024 00:31:45 -0400
Subject: [PATCH 098/230] vb treasure chest game (#103)

---
 soh/include/functions.h                       |  2 -
 .../game-interactor/GameInteractor.h          |  1 +
 .../randomizer/3drando/item_pool.cpp          | 15 ++--
 .../location_access/locacc_castle_town.cpp    | 10 +--
 .../Enhancements/randomizer/hook_handlers.cpp | 85 +++++++++++++++++++
 .../Enhancements/randomizer/location_list.cpp | 20 +++--
 .../Enhancements/randomizer/randomizer.cpp    | 31 ++++---
 .../Enhancements/randomizer/randomizerTypes.h | 10 +++
 .../Enhancements/randomizer/randomizer_inf.h  | 11 +++
 soh/src/code/z_actor.c                        | 55 ------------
 .../overlays/actors/ovl_Door_Ana/z_door_ana.c |  1 -
 .../actors/ovl_En_Ex_Item/z_en_ex_item.c      | 32 +++----
 .../ovl_Item_Etcetera/z_item_etcetera.c       | 10 ---
 .../actors/ovl_player_actor/z_player.c        |  2 +-
 14 files changed, 170 insertions(+), 115 deletions(-)

diff --git a/soh/include/functions.h b/soh/include/functions.h
index 8efad485a..8ee00ed8d 100644
--- a/soh/include/functions.h
+++ b/soh/include/functions.h
@@ -575,8 +575,6 @@ void Flags_UnsetRandomizerInf(RandomizerInf flag);
 u16 func_80037C30(PlayState* play, s16 arg1);
 s32 func_80037D98(PlayState* play, Actor* actor, s16 arg2, s32* arg3);
 s32 func_80038290(PlayState* play, Actor* actor, Vec3s* arg2, Vec3s* arg3, Vec3f arg4);
-GetItemEntry GetChestGameRandoGetItem(s8 room, s16 ogDrawId, PlayState* play);
-s16 GetChestGameRandoGiDrawId(s8 room, s16 ogDrawId, PlayState* play);
 
 // ? func_80038600(?);
 u16 DynaSSNodeList_GetNextNodeIdx(DynaSSNodeList*);
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h
index ad3ff9d6f..3790545fd 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h
@@ -254,6 +254,7 @@ typedef enum {
 
     /*** Give Items ***/
 
+    // Opt: *EnBox
     GI_VB_GIVE_ITEM_FROM_CHEST,
     GI_VB_GIVE_ITEM_FROM_BLUE_WARP,
     // Opt: *EnItem00
diff --git a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
index a54f522aa..e3e0aa322 100644
--- a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
@@ -904,11 +904,16 @@ void GenerateItemPool() {
   } else if (ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK)) {
     AddItemToMainPool(RG_TREASURE_GAME_SMALL_KEY); // 1 key which will behave as a pack of 6
   } else {
-    ctx->PlaceItemInLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_1, RG_TREASURE_GAME_SMALL_KEY, false, true);
-    ctx->PlaceItemInLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_2, RG_TREASURE_GAME_SMALL_KEY, false, true);
-    ctx->PlaceItemInLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_3, RG_TREASURE_GAME_SMALL_KEY, false, true);
-    ctx->PlaceItemInLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_4, RG_TREASURE_GAME_SMALL_KEY, false, true);
-    ctx->PlaceItemInLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_5, RG_TREASURE_GAME_SMALL_KEY, false, true);
+    ctx->PlaceItemInLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_1, RG_GREEN_RUPEE, false, true);
+    ctx->PlaceItemInLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_2, RG_GREEN_RUPEE, false, true);
+    ctx->PlaceItemInLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_3, RG_BLUE_RUPEE, false, true);
+    ctx->PlaceItemInLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_4, RG_BLUE_RUPEE, false, true);
+    ctx->PlaceItemInLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_5, RG_RED_RUPEE, false, true);
+    ctx->PlaceItemInLocation(RC_MARKET_TREASURE_CHEST_GAME_KEY_1, RG_TREASURE_GAME_SMALL_KEY, false, true);
+    ctx->PlaceItemInLocation(RC_MARKET_TREASURE_CHEST_GAME_KEY_2, RG_TREASURE_GAME_SMALL_KEY, false, true);
+    ctx->PlaceItemInLocation(RC_MARKET_TREASURE_CHEST_GAME_KEY_3, RG_TREASURE_GAME_SMALL_KEY, false, true);
+    ctx->PlaceItemInLocation(RC_MARKET_TREASURE_CHEST_GAME_KEY_4, RG_TREASURE_GAME_SMALL_KEY, false, true);
+    ctx->PlaceItemInLocation(RC_MARKET_TREASURE_CHEST_GAME_KEY_5, RG_TREASURE_GAME_SMALL_KEY, false, true);
   };
 
   if (ctx->GetOption(RSK_SHUFFLE_TOKENS).Is(RO_TOKENSANITY_OFF)) {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
index 874cc76c1..f48a2bb53 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
@@ -234,11 +234,11 @@ void AreaTable_Init_CastleTown() {
                   //Locations
                   LocationAccess(RC_GREG_HINT, {[]{return true;}}),
                   LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_REWARD, {[]{return logic->ChildsWallet && ((logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 6)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)));}}),
-                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_1, {[]{return logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)));}}),
-                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_2, {[]{return logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 2)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)));}}),
-                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_3, {[]{return logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 3)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)));}}),
-                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_4, {[]{return logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 4)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)));}}),
-                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_5, {[]{return logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 5)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)));}}),
+                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_KEY_1, {[]{return logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)));}}),
+                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_KEY_2, {[]{return logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 2)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)));}}),
+                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_KEY_3, {[]{return logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 3)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)));}}),
+                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_KEY_4, {[]{return logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 4)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)));}}),
+                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_KEY_5, {[]{return logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 5)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)));}}),
                 }, {
                   //Exits
                   Entrance(RR_THE_MARKET, {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index ce24e11d9..ae6beb869 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -26,6 +26,7 @@ extern "C" {
 #include "src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h"
 #include "src/overlays/actors/ovl_En_Sth/z_en_sth.h"
 #include "src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h"
+#include "src/overlays/actors/ovl_En_Box/z_en_box.h"
 #include "adult_trade_shuffle.h"
 extern SaveContext gSaveContext;
 extern PlayState* gPlayState;
@@ -282,6 +283,12 @@ void ItemEtcetera_DrawRandomizedItem(ItemEtcetera* itemEtcetera, PlayState* play
     GetItemEntry_Draw(play, itemEtcetera->sohItemEntry);
 }
 
+void ItemEtcetera_DrawRandomizedItemThroughLens(ItemEtcetera* itemEtcetera, PlayState* play) {
+    if (play->actorCtx.lensActive) {
+        ItemEtcetera_DrawRandomizedItem(itemEtcetera, play);
+    }
+}
+
 void ItemEtcetera_func_80B858B4_Randomized(ItemEtcetera* itemEtcetera, PlayState* play) {
     if (itemEtcetera->actor.xzDistToPlayer < 30.0f &&
         fabsf(itemEtcetera->actor.yDistToPlayer) < 50.0f) {
@@ -394,9 +401,50 @@ RandomizerCheck EnFr_RandomizerCheckFromSongIndex(u16 songIndex) {
     }
 }
 
+void RandomizerSetChestGameRandomizerInf(RandomizerCheck rc) {
+    switch (rc) {
+        case RC_MARKET_TREASURE_CHEST_GAME_ITEM_1:
+            Flags_SetRandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_1);
+            break;
+        case RC_MARKET_TREASURE_CHEST_GAME_ITEM_2:
+            Flags_SetRandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_2);
+            break;
+        case RC_MARKET_TREASURE_CHEST_GAME_ITEM_3:
+            Flags_SetRandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_3);
+            break;
+        case RC_MARKET_TREASURE_CHEST_GAME_ITEM_4:
+            Flags_SetRandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_4);
+            break;
+        case RC_MARKET_TREASURE_CHEST_GAME_ITEM_5:
+            Flags_SetRandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_5);
+            break;
+        case RC_MARKET_TREASURE_CHEST_GAME_KEY_1:
+            Flags_SetRandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_1);
+            break;
+        case RC_MARKET_TREASURE_CHEST_GAME_KEY_2:
+            Flags_SetRandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_2);
+            break;
+        case RC_MARKET_TREASURE_CHEST_GAME_KEY_3:
+            Flags_SetRandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_3);
+            break;
+        case RC_MARKET_TREASURE_CHEST_GAME_KEY_4:
+            Flags_SetRandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_4);
+            break;
+        case RC_MARKET_TREASURE_CHEST_GAME_KEY_5:
+            Flags_SetRandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_5);
+            break;
+    }
+}
+
 void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void* optionalArg) {
     switch (id) {
         case GI_VB_GIVE_ITEM_FROM_CHEST: {
+            EnBox* chest = static_cast<EnBox*>(optionalArg);
+            RandomizerCheck rc = OTRGlobals::Instance->gRandomizer->GetCheckFromActor(chest->dyna.actor.id, gPlayState->sceneNum, chest->dyna.actor.params);
+            
+            // if this is a treasure chest game chest then set the appropriate rando inf
+            RandomizerSetChestGameRandomizerInf(rc);
+
             Player* player = GET_PLAYER(gPlayState);
             player->av2.actionVar2 = 1;
             player->getItemId = GI_NONE;
@@ -895,6 +943,32 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
 }
 
 void RandomizerOnSceneInitHandler(int16_t sceneNum) {
+    // Treasure Chest Game
+    // todo: for now we're just unsetting all of them, we will
+    //       probably need to do something different when we implement shuffle
+    if (sceneNum == SCENE_TREASURE_BOX_SHOP) {
+        Flags_UnsetRandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_1);
+        Rando::Context::GetInstance()->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_1)->MarkAsNotObtained();
+        Flags_UnsetRandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_2);
+        Rando::Context::GetInstance()->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_2)->MarkAsNotObtained();
+        Flags_UnsetRandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_3);
+        Rando::Context::GetInstance()->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_3)->MarkAsNotObtained();
+        Flags_UnsetRandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_4);
+        Rando::Context::GetInstance()->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_4)->MarkAsNotObtained();
+        Flags_UnsetRandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_5);
+        Rando::Context::GetInstance()->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_5)->MarkAsNotObtained();
+        Flags_UnsetRandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_1);
+        Rando::Context::GetInstance()->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_KEY_1)->MarkAsNotObtained();
+        Flags_UnsetRandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_2);
+        Rando::Context::GetInstance()->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_KEY_2)->MarkAsNotObtained();
+        Flags_UnsetRandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_3);
+        Rando::Context::GetInstance()->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_KEY_3)->MarkAsNotObtained();
+        Flags_UnsetRandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_4);
+        Rando::Context::GetInstance()->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_KEY_4)->MarkAsNotObtained();
+        Flags_UnsetRandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_5);
+        Rando::Context::GetInstance()->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_KEY_5)->MarkAsNotObtained();
+    }
+
     // LACs & Prelude checks
     static uint32_t updateHook = 0;
 
@@ -1035,6 +1109,17 @@ void RandomizerOnActorInitHandler(void* actorRef) {
                 itemEtcetera->futureActionFunc = (ItemEtceteraActionFunc)ItemEtcetera_UpdateRandomizedFireArrow;
                 break;
             }
+            case ITEM_ETC_RUPEE_GREEN_CHEST_GAME:
+            case ITEM_ETC_RUPEE_BLUE_CHEST_GAME:
+            case ITEM_ETC_RUPEE_RED_CHEST_GAME:
+            case ITEM_ETC_RUPEE_PURPLE_CHEST_GAME:
+            case ITEM_ETC_HEART_PIECE_CHEST_GAME:
+            case ITEM_ETC_KEY_SMALL_CHEST_GAME: {
+                if (rc != RC_UNKNOWN_CHECK) {
+                    itemEtcetera->drawFunc = (ActorFunc)ItemEtcetera_DrawRandomizedItemThroughLens;
+                }
+                break;
+            }
         }
     }
 }
diff --git a/soh/soh/Enhancements/randomizer/location_list.cpp b/soh/soh/Enhancements/randomizer/location_list.cpp
index 0ff2837db..39f9b7477 100644
--- a/soh/soh/Enhancements/randomizer/location_list.cpp
+++ b/soh/soh/Enhancements/randomizer/location_list.cpp
@@ -207,6 +207,11 @@ std::vector<RandomizerCheck> Rando::StaticData::overworldLocations = {
     RC_MARKET_TREASURE_CHEST_GAME_ITEM_3,
     RC_MARKET_TREASURE_CHEST_GAME_ITEM_4,
     RC_MARKET_TREASURE_CHEST_GAME_ITEM_5,
+    RC_MARKET_TREASURE_CHEST_GAME_KEY_1,
+    RC_MARKET_TREASURE_CHEST_GAME_KEY_2,
+    RC_MARKET_TREASURE_CHEST_GAME_KEY_3,
+    RC_MARKET_TREASURE_CHEST_GAME_KEY_4,
+    RC_MARKET_TREASURE_CHEST_GAME_KEY_5,
 
     // Market Shops
     RC_MARKET_BOMBCHU_SHOP_ITEM_1,
@@ -674,11 +679,16 @@ void Rando::StaticData::InitLocationTable() { //
     locationTable[RC_MARKET_LOST_DOG] =                                                Location::Base(RC_MARKET_LOST_DOG,                                              RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_DOG_LADY_HOUSE,               0x00,                                              0x3E, "Lost Dog",                                    "MK Lost Dog",                                              RHT_MARKET_LOST_DOG,                                             RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::InfTable(INFTABLE_191),                                                                               SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
     locationTable[RC_MARKET_SHOOTING_GALLERY_REWARD] =                                 Location::Base(RC_MARKET_SHOOTING_GALLERY_REWARD,                               RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_SHOOTING_GALLERY,             0x00,                                              0x60, "Shooting Gallery",                            "MK Shooting Gallery",                                      RHT_MARKET_SHOOTING_GALLERY_REWARD,                              RG_PROGRESSIVE_SLINGSHOT,             {},                                                     SpoilerCollectionCheck::ItemGetInf(ITEMGETINF_0D),                                                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
     locationTable[RC_MARKET_10_BIG_POES] =                                             Location::Base(RC_MARKET_10_BIG_POES,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_MARKET_GUARD_HOUSE,           0x00,                                              0x0F, "10 Big Poes",                                 "MK 10 Big Poes",                                           RHT_MARKET_10_BIG_POES,                                          RG_EMPTY_BOTTLE,                      {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_10_BIG_POES),                                                                  SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
-    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_1] =                             Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_1,                            RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0x01, "Chest Game First Room Chest",                 "MK Chest Game First Room Chest",                           RHT_MARKET_TREASURE_CHEST_GAME_ITEM_1,                           RG_TREASURE_GAME_SMALL_KEY,           { Category::cChestMinigame },                                                                                                                                                         SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_2] =                             Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_2,                            RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0x03, "Chest Game Second Room Chest",                "MK Chest Game Second Room Chest",                          RHT_MARKET_TREASURE_CHEST_GAME_ITEM_2,                           RG_TREASURE_GAME_SMALL_KEY,           { Category::cChestMinigame },                                                                                                                                                         SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_3] =                             Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_3,                            RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0x05, "Chest Game Third Room Chest",                 "MK Chest Game Third Room Chest",                           RHT_MARKET_TREASURE_CHEST_GAME_ITEM_3,                           RG_TREASURE_GAME_SMALL_KEY,           { Category::cChestMinigame },                                                                                                                                                         SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_4] =                             Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_4,                            RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0x07, "Chest Game Fourth Room Chest",                "MK Chest Game Fourth Room Chest",                          RHT_MARKET_TREASURE_CHEST_GAME_ITEM_4,                           RG_TREASURE_GAME_SMALL_KEY,           { Category::cChestMinigame },                                                                                                                                                         SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_5] =                             Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_5,                            RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0x09, "Chest Game Fifth Room Chest",                 "MK Chest Game Fifth Room Chest",                           RHT_MARKET_TREASURE_CHEST_GAME_ITEM_5,                           RG_TREASURE_GAME_SMALL_KEY,           { Category::cChestMinigame },                                                                                                                                                         SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_1] =                             Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_1,                            RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0xFF, "Chest Game First Room Item",                  "MK Chest Game First Room Item",                            RHT_MARKET_TREASURE_CHEST_GAME_ITEM_1,                           RG_GREEN_RUPEE,                       { Category::cChestMinigame },                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_1),                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_2] =                             Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_2,                            RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0xFF, "Chest Game Second Room Item",                 "MK Chest Game Second Room Item",                           RHT_MARKET_TREASURE_CHEST_GAME_ITEM_2,                           RG_GREEN_RUPEE,                       { Category::cChestMinigame },                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_2),                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_3] =                             Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_3,                            RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0xFF, "Chest Game Third Room Item",                  "MK Chest Game Third Room Item",                            RHT_MARKET_TREASURE_CHEST_GAME_ITEM_3,                           RG_BLUE_RUPEE,                        { Category::cChestMinigame },                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_3),                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_4] =                             Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_4,                            RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0xFF, "Chest Game Fourth Room Item",                 "MK Chest Game Fourth Room Item",                           RHT_MARKET_TREASURE_CHEST_GAME_ITEM_4,                           RG_BLUE_RUPEE,                        { Category::cChestMinigame },                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_4),                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_5] =                             Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_5,                            RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0xFF, "Chest Game Fifth Room Item",                  "MK Chest Game Fifth Room Item",                            RHT_MARKET_TREASURE_CHEST_GAME_ITEM_5,                           RG_RED_RUPEE,                         { Category::cChestMinigame },                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_5),                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_KEY_1] =                              Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_KEY_1,                             RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0xFF, "Chest Game First Room Key",                   "MK Chest Game First Room Key",                             RHT_MARKET_TREASURE_CHEST_GAME_KEY_1,                            RG_TREASURE_GAME_SMALL_KEY,           { Category::cChestMinigame },                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_1),                                             SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_KEY_2] =                              Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_KEY_2,                             RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0xFF, "Chest Game Second Room Key",                  "MK Chest Game Second Room Key",                            RHT_MARKET_TREASURE_CHEST_GAME_KEY_2,                            RG_TREASURE_GAME_SMALL_KEY,           { Category::cChestMinigame },                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_2),                                             SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_KEY_3] =                              Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_KEY_3,                             RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0xFF, "Chest Game Third Room Key",                   "MK Chest Game Third Room Key",                             RHT_MARKET_TREASURE_CHEST_GAME_KEY_3,                            RG_TREASURE_GAME_SMALL_KEY,           { Category::cChestMinigame },                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_3),                                             SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_KEY_4] =                              Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_KEY_4,                             RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0xFF, "Chest Game Fourth Room Key",                  "MK Chest Game Fourth Room Key",                            RHT_MARKET_TREASURE_CHEST_GAME_KEY_4,                            RG_TREASURE_GAME_SMALL_KEY,           { Category::cChestMinigame },                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_4),                                             SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_KEY_5] =                              Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_KEY_5,                             RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0xFF, "Chest Game Fifth Room Key",                   "MK Chest Game Fifth Room Key",                             RHT_MARKET_TREASURE_CHEST_GAME_KEY_5,                            RG_TREASURE_GAME_SMALL_KEY,           { Category::cChestMinigame },                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_5),                                             SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
     // Hyrule Castle
     locationTable[RC_HC_MALON_EGG] =                                                   Location::Base(RC_HC_MALON_EGG,                                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_CASTLE,                ACTOR_ID_MAX,         SCENE_HYRULE_CASTLE,                0x00,                                              0x47, "Malon Egg",                                   "HC Malon Egg",                                             RHT_HC_MALON_EGG,                                                RG_WEIRD_EGG,                         {},                                                     SpoilerCollectionCheck::EventChkInf(0x12),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
     locationTable[RC_HC_ZELDAS_LETTER] =                                               Location::Base(RC_HC_ZELDAS_LETTER,                                             RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_CASTLE,                ACTOR_ID_MAX,         SCENE_CASTLE_COURTYARD_ZELDA,       0x00,                                              0x0B, "Zeldas Letter",                               "HC Zeldas Letter",                                         RHT_HC_ZELDAS_LETTER,                                            RG_ZELDAS_LETTER,                     {},                                                     SpoilerCollectionCheck::EventChkInf(0x40),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index 5d32e7a35..eb34721b5 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -1649,21 +1649,28 @@ Rando::Location* Randomizer::GetCheckObjectFromActor(s16 actorId, s16 sceneNum,
     RandomizerCheck specialRc = RC_UNKNOWN_CHECK;
     // TODO: Migrate these special cases into table, or at least document why they are special
     switch(sceneNum) {
-        case SCENE_TREASURE_BOX_SHOP:
-            if(actorParams == 20170) specialRc = RC_MARKET_TREASURE_CHEST_GAME_REWARD;
+        case SCENE_TREASURE_BOX_SHOP: {
+            if ((actorId == ACTOR_EN_BOX && actorParams == 20170) || (actorId == ACTOR_ITEM_ETCETERA && actorParams == 2572)) {
+                specialRc = RC_MARKET_TREASURE_CHEST_GAME_REWARD;
+            }
 
-            // RANDOTODO update logic to match 3ds rando when we implement keysanity
-            // keep keys og
-            if ((actorParams & 0x60) == 0x20) break;
-
-            if (GetRandoSettingValue(RSK_SHUFFLE_CHEST_MINIGAME)) {
-                if((actorParams & 0xF) < 2) specialRc = RC_MARKET_TREASURE_CHEST_GAME_ITEM_1;
-                if((actorParams & 0xF) < 4) specialRc = RC_MARKET_TREASURE_CHEST_GAME_ITEM_2;
-                if((actorParams & 0xF) < 6) specialRc = RC_MARKET_TREASURE_CHEST_GAME_ITEM_3;
-                if((actorParams & 0xF) < 8) specialRc = RC_MARKET_TREASURE_CHEST_GAME_ITEM_4;
-                if((actorParams & 0xF) < 10) specialRc = RC_MARKET_TREASURE_CHEST_GAME_ITEM_5;
+            // todo: handle the itemetc part of this so drawing works when we implement shuffle
+            if (actorId == ACTOR_EN_BOX) {
+                bool isAKey = (actorParams & 0x60) == 0x20;
+                if ((actorParams & 0xF) < 2) {
+                    specialRc = isAKey ? RC_MARKET_TREASURE_CHEST_GAME_KEY_1 : RC_MARKET_TREASURE_CHEST_GAME_ITEM_1;
+                } else if ((actorParams & 0xF) < 4) {
+                    specialRc = isAKey ? RC_MARKET_TREASURE_CHEST_GAME_KEY_2 : RC_MARKET_TREASURE_CHEST_GAME_ITEM_2;
+                } else if ((actorParams & 0xF) < 6) {
+                    specialRc = isAKey ? RC_MARKET_TREASURE_CHEST_GAME_KEY_3 : RC_MARKET_TREASURE_CHEST_GAME_ITEM_3;
+                } else if ((actorParams & 0xF) < 8) {
+                    specialRc = isAKey ? RC_MARKET_TREASURE_CHEST_GAME_KEY_4 : RC_MARKET_TREASURE_CHEST_GAME_ITEM_4;
+                } else if ((actorParams & 0xF) < 10) {
+                    specialRc = isAKey ? RC_MARKET_TREASURE_CHEST_GAME_KEY_5 : RC_MARKET_TREASURE_CHEST_GAME_ITEM_5;
+                }
             }
             break;
+        }
         case SCENE_SACRED_FOREST_MEADOW:
             if (actorId == ACTOR_EN_SA) {
                 specialRc = RC_SONG_FROM_SARIA;
diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h
index 91906d127..f1d368763 100644
--- a/soh/soh/Enhancements/randomizer/randomizerTypes.h
+++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@@ -733,6 +733,11 @@ typedef enum {
     RC_MARKET_TREASURE_CHEST_GAME_ITEM_3,
     RC_MARKET_TREASURE_CHEST_GAME_ITEM_4,
     RC_MARKET_TREASURE_CHEST_GAME_ITEM_5,
+    RC_MARKET_TREASURE_CHEST_GAME_KEY_1,
+    RC_MARKET_TREASURE_CHEST_GAME_KEY_2,
+    RC_MARKET_TREASURE_CHEST_GAME_KEY_3,
+    RC_MARKET_TREASURE_CHEST_GAME_KEY_4,
+    RC_MARKET_TREASURE_CHEST_GAME_KEY_5,
     RC_MARKET_GS_GUARD_HOUSE,
     RC_MARKET_BAZAAR_ITEM_1,
     RC_MARKET_BAZAAR_ITEM_2,
@@ -2332,6 +2337,11 @@ typedef enum {
     RHT_MARKET_TREASURE_CHEST_GAME_ITEM_3,
     RHT_MARKET_TREASURE_CHEST_GAME_ITEM_4,
     RHT_MARKET_TREASURE_CHEST_GAME_ITEM_5,
+    RHT_MARKET_TREASURE_CHEST_GAME_KEY_1,
+    RHT_MARKET_TREASURE_CHEST_GAME_KEY_2,
+    RHT_MARKET_TREASURE_CHEST_GAME_KEY_3,
+    RHT_MARKET_TREASURE_CHEST_GAME_KEY_4,
+    RHT_MARKET_TREASURE_CHEST_GAME_KEY_5,
     RHT_MARKET_GS_GUARD_HOUSE,
     RHT_MARKET_BAZAAR_ITEM_1,
     RHT_MARKET_BAZAAR_ITEM_2,
diff --git a/soh/soh/Enhancements/randomizer/randomizer_inf.h b/soh/soh/Enhancements/randomizer/randomizer_inf.h
index 67b396d74..14749e574 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_inf.h
+++ b/soh/soh/Enhancements/randomizer/randomizer_inf.h
@@ -282,6 +282,17 @@ typedef enum {
     RAND_INF_COLOSSUS_GREAT_FAIRY_REWARD,
     RAND_INF_OGC_GREAT_FAIRY_REWARD,
 
+    RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_1,
+    RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_2,
+    RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_3,
+    RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_4,
+    RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_5,
+    RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_1,
+    RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_2,
+    RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_3,
+    RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_4,
+    RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_5,
+
     // If you add anything to this list, you need to update the size of randomizerInf in z64save.h to be ceil(RAND_INF_MAX / 16)
 
     RAND_INF_MAX,
diff --git a/soh/src/code/z_actor.c b/soh/src/code/z_actor.c
index e4edcc1d3..2379c8ba9 100644
--- a/soh/src/code/z_actor.c
+++ b/soh/src/code/z_actor.c
@@ -6275,58 +6275,3 @@ s32 func_80038290(PlayState* play, Actor* actor, Vec3s* arg2, Vec3s* arg3, Vec3f
 
     return true;
 }
-
-GetItemEntry GetChestGameRandoGetItem(s8 room, s16 ogDrawId, PlayState* play) {
-    if (Randomizer_GetSettingValue(RSK_SHUFFLE_CHEST_MINIGAME)) {
-        // RANDOTODO update this logic when we implement keysanity
-        // because 3drando replaces the keys not the rupees
-        if (ogDrawId == GID_RUPEE_GREEN ||
-            ogDrawId == GID_RUPEE_BLUE ||
-            ogDrawId == GID_RUPEE_RED)
-        {
-            switch(room) {
-                case 1:
-                    if(!Flags_GetCollectible(play, 0x1B)) {
-                        return Randomizer_GetItemFromKnownCheck(RC_MARKET_TREASURE_CHEST_GAME_ITEM_1, GI_RUPEE_GREEN);
-                    }
-                    break;
-                case 2:
-                    if(!Flags_GetCollectible(play, 0x1C)) {
-                        return Randomizer_GetItemFromKnownCheck(RC_MARKET_TREASURE_CHEST_GAME_ITEM_2, GI_RUPEE_GREEN);
-                    }
-                    break;
-                case 3:
-                    if(!Flags_GetCollectible(play, 0x1D)) {
-                        return Randomizer_GetItemFromKnownCheck(RC_MARKET_TREASURE_CHEST_GAME_ITEM_3, GI_RUPEE_BLUE);
-                    }
-                    break;
-                case 4:
-                    if(!Flags_GetCollectible(play, 0x1E)) {
-                        return Randomizer_GetItemFromKnownCheck(RC_MARKET_TREASURE_CHEST_GAME_ITEM_4, GI_RUPEE_BLUE);
-                    }
-                    break;
-                case 5:
-                    if(!Flags_GetCollectible(play, 0x1F)) {
-                        return Randomizer_GetItemFromKnownCheck(RC_MARKET_TREASURE_CHEST_GAME_ITEM_5, GI_RUPEE_RED);
-                    }
-                    break;
-            }
-        }
-    }
-
-    if(ogDrawId == GID_HEART_PIECE) {
-        return Randomizer_GetItemFromKnownCheck(RC_MARKET_TREASURE_CHEST_GAME_REWARD, GI_HEART_PIECE);
-    }
-
-    return (GetItemEntry)GET_ITEM_NONE;
-}
-
-s16 GetChestGameRandoGiDrawId(s8 room, s16 ogDrawId, PlayState* play) {
-    GetItemEntry randoGetItem = GetChestGameRandoGetItem(room, ogDrawId, play);
-
-    if (randoGetItem.itemId != ITEM_NONE) {
-        return randoGetItem.gid;
-    }
-
-    return ogDrawId;
-}
diff --git a/soh/src/overlays/actors/ovl_Door_Ana/z_door_ana.c b/soh/src/overlays/actors/ovl_Door_Ana/z_door_ana.c
index 22c850111..04f388b39 100644
--- a/soh/src/overlays/actors/ovl_Door_Ana/z_door_ana.c
+++ b/soh/src/overlays/actors/ovl_Door_Ana/z_door_ana.c
@@ -20,7 +20,6 @@ void DoorAna_WaitClosed(DoorAna* this, PlayState* play);
 void DoorAna_WaitOpen(DoorAna* this, PlayState* play);
 void DoorAna_GrabPlayer(DoorAna* this, PlayState* play);
 
-s16 GetChestGameRandoGiDrawId(s8 room, s16 ogDrawId, PlayState* play);
 void Grotto_OverrideActorEntrance(Actor* thisx);
 
 const ActorInit Door_Ana_InitVars = {
diff --git a/soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c b/soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c
index 32f50d9e1..3860336ef 100644
--- a/soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c
+++ b/soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c
@@ -229,25 +229,19 @@ void EnExItem_WaitForObject(EnExItem* this, PlayState* play) {
                 this->scale = 0.5f;
                 this->unkFloat = 0.5f;
                 this->actor.velocity.y = 10.0f;
-                if (!IS_RANDO || !Randomizer_GetSettingValue(RSK_SHUFFLE_CHEST_MINIGAME)) {
-                    switch (this->type) {
-                        case EXITEM_GREEN_RUPEE_CHEST:
-                            this->giDrawId = GID_RUPEE_GREEN;
-                            break;
-                        case EXITEM_BLUE_RUPEE_CHEST:
-                            this->giDrawId = GID_RUPEE_BLUE;
-                            break;
-                        case EXITEM_RED_RUPEE_CHEST:
-                            this->giDrawId = GID_RUPEE_RED;
-                            break;
-                        case EXITEM_14:
-                            this->giDrawId = GID_RUPEE_PURPLE;
-                            break;
-                    }
-                } else {
-                    if (play->sceneNum == SCENE_TREASURE_BOX_SHOP) {
-                        this->giDrawId = GetChestGameRandoGiDrawId(play->roomCtx.curRoom.num, GID_RUPEE_GREEN, play);
-                    }
+                switch (this->type) {
+                    case EXITEM_GREEN_RUPEE_CHEST:
+                        this->giDrawId = GID_RUPEE_GREEN;
+                        break;
+                    case EXITEM_BLUE_RUPEE_CHEST:
+                        this->giDrawId = GID_RUPEE_BLUE;
+                        break;
+                    case EXITEM_RED_RUPEE_CHEST:
+                        this->giDrawId = GID_RUPEE_RED;
+                        break;
+                    case EXITEM_14:
+                        this->giDrawId = GID_RUPEE_PURPLE;
+                        break;
                 }
                 this->actionFunc = EnExItem_ExitChest;
                 break;
diff --git a/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c b/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c
index 8a26860f7..796b157a3 100644
--- a/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c
+++ b/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c
@@ -206,16 +206,6 @@ void ItemEtcetera_DrawThroughLens(Actor* thisx, PlayState* play) {
     if (play->actorCtx.lensActive) {
         func_8002EBCC(&this->actor, play, 0);
         func_8002ED80(&this->actor, play, 0);
-
-        if(IS_RANDO && play->sceneNum == SCENE_TREASURE_BOX_SHOP) {
-            GetItemEntry randoGetItem = GetChestGameRandoGetItem(this->actor.room, this->giDrawId, play);
-            EnItem00_CustomItemsParticles(&this->actor, play, randoGetItem);
-            if (randoGetItem.itemId != ITEM_NONE) {
-                GetItemEntry_Draw(play, randoGetItem);
-                return;
-            }
-        }
-        
         GetItem_Draw(play, this->giDrawId);
     }
 }
diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c
index 7125500f7..dff81a13e 100644
--- a/soh/src/overlays/actors/ovl_player_actor/z_player.c
+++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c
@@ -6866,7 +6866,7 @@ s32 Player_ActionChange_2(Player* this, PlayState* play) {
                 }
 
                 func_80836898(play, this, func_8083A434);
-                if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_CHEST, true, &giEntry)) {
+                if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_CHEST, true, chest)) {
                 this->stateFlags1 |= PLAYER_STATE1_GETTING_ITEM | PLAYER_STATE1_ITEM_OVER_HEAD | PLAYER_STATE1_IN_CUTSCENE;
                 func_8083AE40(this, giEntry.objectId);
                 }

From 63afaa3cc993254cc35c4acc92ce1f31759f09cd Mon Sep 17 00:00:00 2001
From: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Date: Tue, 16 Apr 2024 20:18:26 -0400
Subject: [PATCH 099/230] vb ocarina memory (#107)

* Ocarina Memory Game

* vb memory game

---------

Co-authored-by: Taw <Tawling@users.noreply.github.com>
---
 .../game-interactor/GameInteractor.h          |  2 ++
 .../Enhancements/randomizer/hook_handlers.cpp |  8 ++++++
 soh/src/overlays/actors/ovl_En_Skj/z_en_skj.c | 27 ++++++-------------
 soh/src/overlays/actors/ovl_En_Skj/z_en_skj.h |  2 ++
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h
index 3790545fd..440a241ef 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h
@@ -287,6 +287,8 @@ typedef enum {
     // Opt: *EnFr
     GI_VB_GIVE_ITEM_FROM_FROGS,
     // Opt: *EnSkj
+    GI_VB_GIVE_ITEM_FROM_OCARINA_MEMORY_GAME,
+    // Opt: *EnSkj
     GI_VB_GIVE_ITEM_FROM_SKULL_KID_SARIAS_SONG,
     GI_VB_GIVE_ITEM_FROM_MAN_ON_ROOF,
     // Opt: *EnSyatekiMan
diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index ae6beb869..47441fb31 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -27,6 +27,7 @@ extern "C" {
 #include "src/overlays/actors/ovl_En_Sth/z_en_sth.h"
 #include "src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h"
 #include "src/overlays/actors/ovl_En_Box/z_en_box.h"
+#include "src/overlays/actors/ovl_En_Skj/z_en_skj.h"
 #include "adult_trade_shuffle.h"
 extern SaveContext gSaveContext;
 extern PlayState* gPlayState;
@@ -909,6 +910,13 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             *should = false;
             break;
         }
+        case GI_VB_GIVE_ITEM_FROM_OCARINA_MEMORY_GAME: {
+            EnSkj* enSkj = static_cast<EnSkj*>(optionalArg);
+            Flags_SetItemGetInf(ITEMGETINF_17);
+            enSkj->actionFunc = (EnSkjActionFunc)EnSkj_CleanupOcarinaGame;
+            *should = false;
+            break;
+        }
         case GI_VB_TRADE_TIMER_ODD_MUSHROOM:
         case GI_VB_TRADE_TIMER_EYEDROPS:
         case GI_VB_TRADE_TIMER_FROG:
diff --git a/soh/src/overlays/actors/ovl_En_Skj/z_en_skj.c b/soh/src/overlays/actors/ovl_En_Skj/z_en_skj.c
index 344a09f19..94df7a49f 100644
--- a/soh/src/overlays/actors/ovl_En_Skj/z_en_skj.c
+++ b/soh/src/overlays/actors/ovl_En_Skj/z_en_skj.c
@@ -1541,7 +1541,9 @@ void EnSkj_WaitForOfferResponse(EnSkj* this, PlayState* play) {
 
 void EnSkj_WonOcarinaMiniGame(EnSkj* this, PlayState* play) {
     if (D_80B01EA0) {
-        this->actionFunc = EnSkj_WaitToGiveReward;
+        if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_OCARINA_MEMORY_GAME, true, this)) {
+            this->actionFunc = EnSkj_WaitToGiveReward;
+        }
     } else {
         func_8002F2CC(&this->actor, play, 26.0f);
     }
@@ -1549,13 +1551,8 @@ void EnSkj_WonOcarinaMiniGame(EnSkj* this, PlayState* play) {
 
 void EnSkj_WaitToGiveReward(EnSkj* this, PlayState* play) {
     if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) {
-        if (IS_RANDO && gSaveContext.ocarinaGameRoundNum != 3) {
-            GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_LW_OCARINA_MEMORY_GAME, GI_HEART_PIECE);
-            GiveItemEntryFromActor(&this->actor, play, getItemEntry, 26.0f, 26.0f);
-        } else {
-            Actor_OfferGetItem(&this->actor, play, sOcarinaGameRewards[gSaveContext.ocarinaGameRoundNum], 26.0f, 26.0f);
-        }
-
+        Actor_OfferGetItem(&this->actor, play,
+                           sOcarinaGameRewards[gSaveContext.ocarinaGameRoundNum], 26.0f, 26.0f);
         this->actionFunc = EnSkj_GiveOcarinaGameReward;
     }
 }
@@ -1565,12 +1562,8 @@ void EnSkj_GiveOcarinaGameReward(EnSkj* this, PlayState* play) {
         this->actor.parent = NULL;
         this->actionFunc = EnSkj_FinishOcarinaGameRound;
     } else {
-        if (IS_RANDO && gSaveContext.ocarinaGameRoundNum != 3) {
-            GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_LW_OCARINA_MEMORY_GAME, GI_HEART_PIECE);
-            GiveItemEntryFromActor(&this->actor, play, getItemEntry, 26.0f, 26.0f);
-        } else {
-            Actor_OfferGetItem(&this->actor, play, sOcarinaGameRewards[gSaveContext.ocarinaGameRoundNum], 26.0f, 26.0f);
-        }
+        Actor_OfferGetItem(&this->actor, play,
+                           sOcarinaGameRewards[gSaveContext.ocarinaGameRoundNum], 26.0f, 26.0f);
     }
 }
 
@@ -1582,11 +1575,7 @@ void EnSkj_FinishOcarinaGameRound(EnSkj* this, PlayState* play) {
             gSaveContext.ocarinaGameRoundNum++;
         }
 
-        if (IS_RANDO) {
-            gSaveContext.ocarinaGameRoundNum = 3;
-        }
-
-        if (ocarinaGameRoundNum == 2 || IS_RANDO) {
+        if (ocarinaGameRoundNum == 2) {
             Flags_SetItemGetInf(ITEMGETINF_17);
             this->actionFunc = EnSkj_CleanupOcarinaGame;
         } else {
diff --git a/soh/src/overlays/actors/ovl_En_Skj/z_en_skj.h b/soh/src/overlays/actors/ovl_En_Skj/z_en_skj.h
index bc8febcd4..3f8b75ba2 100644
--- a/soh/src/overlays/actors/ovl_En_Skj/z_en_skj.h
+++ b/soh/src/overlays/actors/ovl_En_Skj/z_en_skj.h
@@ -37,4 +37,6 @@ typedef struct EnSkj {
     /* 0x02F4 */ Vec3f posCopy;
 } EnSkj; // size = 0x0300
 
+void EnSkj_CleanupOcarinaGame(EnSkj* enSkj, PlayState* play);
+
 #endif

From 60d74f720a0c9b032b1f4bbd7392b95102da01f3 Mon Sep 17 00:00:00 2001
From: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Date: Tue, 16 Apr 2024 20:28:20 -0400
Subject: [PATCH 100/230] vb richard (#108)

* Lost Dog + Custom Hook Handler

* vb richard

* fix the merge

---------

Co-authored-by: Taw <Tawling@users.noreply.github.com>
---
 .../game-interactor/GameInteractor.h          |  2 +
 .../Enhancements/randomizer/hook_handlers.cpp | 10 ++++
 soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c   | 54 +++++++------------
 soh/src/overlays/actors/ovl_En_Hy/z_en_hy.h   |  2 +
 4 files changed, 32 insertions(+), 36 deletions(-)

diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h
index 440a241ef..a4054f2cb 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h
@@ -303,6 +303,8 @@ typedef enum {
     GI_VB_GIVE_ITEM_FROM_HORSEBACK_ARCHERY,
     // Opt: *EnSth
     GI_VB_GIVE_ITEM_FROM_SKULLTULA_REWARD,
+    // Opt: *EnHy
+    GI_VB_GIVE_ITEM_FROM_LOST_DOG,
 
     GI_VB_GIVE_ITEM_FAIRY_OCARINA,
     GI_VB_GIVE_ITEM_WEIRD_EGG,
diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index 47441fb31..dcc36873a 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -28,6 +28,7 @@ extern "C" {
 #include "src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h"
 #include "src/overlays/actors/ovl_En_Box/z_en_box.h"
 #include "src/overlays/actors/ovl_En_Skj/z_en_skj.h"
+#include "src/overlays/actors/ovl_En_Hy/z_en_hy.h"
 #include "adult_trade_shuffle.h"
 extern SaveContext gSaveContext;
 extern PlayState* gPlayState;
@@ -917,6 +918,15 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             *should = false;
             break;
         }
+        case GI_VB_GIVE_ITEM_FROM_LOST_DOG: {
+            EnHy* enHy = static_cast<EnHy*>(optionalArg);
+            Flags_SetInfTable(INFTABLE_191);
+            gSaveContext.dogParams = 0;
+            gSaveContext.dogIsLost = false;
+            enHy->actionFunc = func_80A7127C;
+            *should = false;
+            break;
+        }
         case GI_VB_TRADE_TIMER_ODD_MUSHROOM:
         case GI_VB_TRADE_TIMER_EYEDROPS:
         case GI_VB_TRADE_TIMER_FROG:
diff --git a/soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c b/soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c
index 6d8640f3f..adb50441e 100644
--- a/soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c
+++ b/soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c
@@ -14,6 +14,7 @@
 #include "objects/object_cne/object_cne.h"
 #include "objects/object_cob/object_cob.h"
 #include "objects/object_os_anime/object_os_anime.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_WHILE_CULLED)
 
@@ -659,19 +660,10 @@ s16 func_80A70058(PlayState* play, Actor* thisx) {
                     gSaveContext.dogParams = 0;
                     break;
                 case 0x709F:
-                    if (Flags_GetInfTable(INFTABLE_191)) { // Already brought the lost dog back
-                        func_80A6F7CC(this, play, GI_RUPEE_BLUE);
-                    } else {
-                        if (!IS_RANDO) {
-                            func_80A6F7CC(this, play, GI_HEART_PIECE);
-                        } else {
-                            this->getItemEntry = Randomizer_GetItemFromKnownCheck(RC_MARKET_LOST_DOG, GI_HEART_PIECE);
-                            // The follownig line and last arguments of GiveItemEntryFromActor are copied from func_80A6F7CC
-                            this->unkGetItemId = this->getItemEntry.getItemId;
-                            GiveItemEntryFromActor(&this->actor, play, this->getItemEntry, this->actor.xzDistToPlayer + 1.0f, fabsf(this->actor.yDistToPlayer) + 1.0f);
-                        }
+                    if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_LOST_DOG, true, this)) {
+                        func_80A6F7CC(this, play, Flags_GetInfTable(INFTABLE_191) ? GI_RUPEE_BLUE : GI_HEART_PIECE);
+                        this->actionFunc = func_80A714C4;
                     }
-                    this->actionFunc = func_80A714C4;
                     break;
             }
             return NPC_TALK_STATE_IDLE;
@@ -1068,36 +1060,26 @@ void func_80A714C4(EnHy* this, PlayState* play) {
     if (Actor_HasParent(&this->actor, play)) {
         this->actionFunc = func_80A71530;
     } else {
-        if (!IS_RANDO || this->getItemEntry.getItemId == GI_NONE) {
-            Actor_OfferGetItem(&this->actor, play, this->unkGetItemId, this->actor.xzDistToPlayer + 1.0f, fabsf(this->actor.yDistToPlayer) + 1.0f);
-        } else {
-            GiveItemEntryFromActor(&this->actor, play, this->getItemEntry, this->actor.xzDistToPlayer + 1.0f, fabsf(this->actor.yDistToPlayer) + 1.0f);
-        }
+        Actor_OfferGetItem(&this->actor, play, this->unkGetItemId, this->actor.xzDistToPlayer + 1.0f,
+                           fabsf(this->actor.yDistToPlayer) + 1.0f);
     }
 }
 
 void func_80A71530(EnHy* this, PlayState* play) {
     if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) {
-        if (IS_RANDO) {
-            if (!Flags_GetInfTable(INFTABLE_191)) {
-                Flags_SetInfTable(INFTABLE_191);
-            }
-            gSaveContext.dogParams = 0;
-            gSaveContext.dogIsLost = false;
-        } else {
-            switch (this->unkGetItemId) {
-                case GI_HEART_PIECE:
-                    gSaveContext.dogParams = 0;
-                    gSaveContext.dogIsLost = false;
-                    Flags_SetInfTable(INFTABLE_191);
-                    break;
-                case GI_RUPEE_BLUE:
-                    Rupees_ChangeBy(5);
-                    gSaveContext.dogParams = 0;
-                    gSaveContext.dogIsLost = false;
-                    break;
-            }
+        switch (this->unkGetItemId) {
+            case GI_HEART_PIECE:
+                gSaveContext.dogParams = 0;
+                gSaveContext.dogIsLost = false;
+                SET_INFTABLE(INFTABLE_191);
+                break;
+            case GI_RUPEE_BLUE:
+                Rupees_ChangeBy(5);
+                gSaveContext.dogParams = 0;
+                gSaveContext.dogIsLost = false;
+                break;
         }
+
         this->actionFunc = func_80A7127C;
     }
 }
diff --git a/soh/src/overlays/actors/ovl_En_Hy/z_en_hy.h b/soh/src/overlays/actors/ovl_En_Hy/z_en_hy.h
index 6a5ed2680..7d94a5ca6 100644
--- a/soh/src/overlays/actors/ovl_En_Hy/z_en_hy.h
+++ b/soh/src/overlays/actors/ovl_En_Hy/z_en_hy.h
@@ -62,4 +62,6 @@ typedef struct EnHy {
     /*        */ GetItemEntry getItemEntry;
 } EnHy; // size = 0x0334
 
+void func_80A7127C(EnHy* enHy, PlayState* play);
+
 #endif

From 84db4c8ab807112bd8931c7cf78f46da61c1b583 Mon Sep 17 00:00:00 2001
From: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Date: Tue, 16 Apr 2024 21:02:16 -0400
Subject: [PATCH 101/230] vb beehives (#109)

* vb beehives

* format
---
 .../Enhancements/randomizer/hook_handlers.cpp | 78 ++++++++++++++++++-
 .../overlays/actors/ovl_Obj_Comb/z_obj_comb.c | 29 +------
 .../overlays/actors/ovl_Obj_Comb/z_obj_comb.h |  2 +
 3 files changed, 80 insertions(+), 29 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index dcc36873a..f1715c8eb 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -29,6 +29,7 @@ extern "C" {
 #include "src/overlays/actors/ovl_En_Box/z_en_box.h"
 #include "src/overlays/actors/ovl_En_Skj/z_en_skj.h"
 #include "src/overlays/actors/ovl_En_Hy/z_en_hy.h"
+#include "src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h"
 #include "adult_trade_shuffle.h"
 extern SaveContext gSaveContext;
 extern PlayState* gPlayState;
@@ -599,7 +600,11 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
         case GI_VB_GIVE_ITEM_FROM_ITEM_00: {
             EnItem00* item00 = static_cast<EnItem00*>(optionalArg);
             if (item00->actor.params == ITEM00_SOH_DUMMY) {
-                Flags_SetCollectible(gPlayState, item00->collectibleFlag);
+                if (item00->randoInf != RAND_INF_MAX) {
+                    Flags_SetRandomizerInf(item00->randoInf);
+                } else {
+                    Flags_SetCollectible(gPlayState, item00->collectibleFlag);
+                }
                 Actor_Kill(&item00->actor);
                 *should = false;
             } else if (item00->actor.params == ITEM00_SOH_GIVE_ITEM_ENTRY) {
@@ -1043,6 +1048,70 @@ void EnDns_RandomizerPurchase(EnDns* enDns) {
     Flags_SetRandomizerInf(enDns->sohScrubIdentity.randomizerInf);
 }
 
+void ObjComb_RandomizerChooseItemDrop(ObjComb* objComb, PlayState* play) {
+    s16 params = objComb->actor.params & 0x1F;
+
+    if (
+        RAND_GET_OPTION(RSK_SHUFFLE_BEEHIVES) &&
+        !Flags_GetRandomizerInf(objComb->beehiveIdentity.randomizerInf)
+    ) {
+        EnItem00* item00 = (EnItem00*)Item_DropCollectible2(play, &objComb->actor.world.pos, ITEM00_SOH_DUMMY);
+        item00->randoInf = objComb->beehiveIdentity.randomizerInf;
+        item00->itemEntry = OTRGlobals::Instance->gRandomizer->GetItemFromKnownCheck(objComb->beehiveIdentity.randomizerCheck, GI_NONE);
+        item00->actor.draw = (ActorFunc)EnItem00_DrawRandomizedItem;
+        return;
+    }
+
+    if ((params > 0) || (params < 0x1A)) {
+        if (params == 6) {
+            if (Flags_GetCollectible(play, (objComb->actor.params >> 8) & 0x3F)) {
+                params = -1;
+            } else {
+                params = (params | (((objComb->actor.params >> 8) & 0x3F) << 8));
+            }
+        } else if (Rand_ZeroOne() < 0.5f) {
+            params = -1;
+        }
+        if (params >= 0 && !CVarGetInteger("gNoRandomDrops", 0)) {
+            Item_DropCollectible(play, &objComb->actor.world.pos, params);
+        }
+    }
+}
+
+void ObjComb_RandomizerWait(ObjComb* objComb, PlayState* play) {
+    s32 dmgFlags;
+
+    objComb->unk_1B0 -= 50;
+    if (
+        RAND_GET_OPTION(RSK_SHUFFLE_BEEHIVES) &&
+        !Flags_GetRandomizerInf(objComb->beehiveIdentity.randomizerInf)
+    ) {
+        if (objComb->unk_1B0 <= -5000) {
+            objComb->unk_1B0 = 1500;
+        }
+    } else if (objComb->unk_1B0 < 0) {
+        objComb->unk_1B0 = 0;
+    }
+
+    if ((objComb->collider.base.acFlags & AC_HIT) != 0) {
+        objComb->collider.base.acFlags &= ~AC_HIT;
+        dmgFlags = objComb->collider.elements[0].info.acHitInfo->toucher.dmgFlags;
+        if (dmgFlags & 0x4001F866) {
+            objComb->unk_1B0 = 1500;
+        } else {
+            ObjComb_Break(objComb, play);
+            ObjComb_RandomizerChooseItemDrop(objComb, play);
+            Actor_Kill(&objComb->actor);
+        }
+    } else {
+        CollisionCheck_SetAC(play, &play->colChkCtx, &objComb->collider.base);
+    }
+
+    if (objComb->actor.update != NULL) {
+        CollisionCheck_SetOC(play, &play->colChkCtx, &objComb->collider.base);
+    }    
+}
+
 void RandomizerOnActorInitHandler(void* actorRef) {
     Actor* actor = static_cast<Actor*>(actorRef);
 
@@ -1140,6 +1209,13 @@ void RandomizerOnActorInitHandler(void* actorRef) {
             }
         }
     }
+
+    if (actor->id == ACTOR_OBJ_COMB) {
+        ObjComb* objComb = static_cast<ObjComb*>(actorRef);
+        s16 respawnData = gSaveContext.respawn[RESPAWN_MODE_RETURN].data & ((1 << 8) - 1);
+        objComb->beehiveIdentity = OTRGlobals::Instance->gRandomizer->IdentifyBeehive(gPlayState->sceneNum, (s16)actor->world.pos.x, respawnData);
+        objComb->actionFunc = (ObjCombActionFunc)ObjComb_RandomizerWait;
+    }
 }
 
 void RandomizerRegisterHooks() {
diff --git a/soh/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c b/soh/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c
index 0dde415e0..e17de7597 100644
--- a/soh/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c
+++ b/soh/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c
@@ -132,21 +132,6 @@ void ObjComb_Break(ObjComb* this, PlayState* play) {
 void ObjComb_ChooseItemDrop(ObjComb* this, PlayState* play) {
     s16 params = this->actor.params & 0x1F;
 
-    if (
-        IS_RANDO &&
-        Randomizer_GetSettingValue(RSK_SHUFFLE_BEEHIVES) &&
-        !Flags_GetRandomizerInf(this->beehiveIdentity.randomizerInf)
-    ) {
-        GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(this->beehiveIdentity.randomizerCheck, GI_NONE);
-
-        EnItem00* actor = (EnItem00*)Item_DropCollectible2(play, &this->actor.world.pos, ITEM00_SMALL_KEY);
-        actor->randoCheck = this->beehiveIdentity.randomizerCheck;
-        actor->randoGiEntry = getItemEntry;
-        actor->randoGiEntry.getItemFrom = ITEM_FROM_FREESTANDING;
-        actor->randoInf = this->beehiveIdentity.randomizerInf;
-        return;
-    }
-
     if ((params > 0) || (params < 0x1A)) {
         if (params == 6) {
             if (Flags_GetCollectible(play, (this->actor.params >> 8) & 0x3F)) {
@@ -170,10 +155,6 @@ void ObjComb_Init(Actor* thisx, PlayState* play) {
     Collider_InitJntSph(play, &this->collider);
     Collider_SetJntSph(play, &this->collider, &this->actor, &sJntSphInit, this->colliderItems);
     ObjComb_SetupWait(this);
-    if (IS_RANDO) {
-        s16 respawnData = gSaveContext.respawn[RESPAWN_MODE_RETURN].data & ((1 << 8) - 1);
-        this->beehiveIdentity = Randomizer_IdentifyBeehive(play->sceneNum, (s16)this->actor.world.pos.x, respawnData);
-    }
 }
 
 void ObjComb_Destroy(Actor* thisx, PlayState* play2) {
@@ -191,15 +172,7 @@ void ObjComb_Wait(ObjComb* this, PlayState* play) {
     s32 dmgFlags;
 
     this->unk_1B0 -= 50;
-    if (
-        IS_RANDO &&
-        Randomizer_GetSettingValue(RSK_SHUFFLE_BEEHIVES) &&
-        !Flags_GetRandomizerInf(this->beehiveIdentity.randomizerInf)
-    ) {
-        if (this->unk_1B0 <= -5000) {
-            this->unk_1B0 = 1500;
-        }
-    } else if (this->unk_1B0 < 0) {
+    if (this->unk_1B0 < 0) {
         this->unk_1B0 = 0;
     }
 
diff --git a/soh/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h b/soh/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h
index f7713a961..ded72dfc4 100644
--- a/soh/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h
+++ b/soh/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h
@@ -18,4 +18,6 @@ typedef struct ObjComb {
     /*        */ BeehiveIdentity beehiveIdentity;
 } ObjComb; // size = 0x01B4
 
+void ObjComb_Break(ObjComb* objComb, PlayState* play);
+
 #endif

From f6a583446b21cd0f338a718d13700c1602036da7 Mon Sep 17 00:00:00 2001
From: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Date: Wed, 17 Apr 2024 20:49:29 -0400
Subject: [PATCH 102/230] vb bombchu bowling (#110)

* vb bombchu bowling

* don't need it

* it's drawing the right thing but it's tiny

* scale

* no need to should, don't rescale every draw

* slightly safer
---
 .../game-interactor/GameInteractor.h          |  2 +
 .../Enhancements/randomizer/hook_handlers.cpp | 59 +++++++++++++++++++
 .../ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c   | 35 ++---------
 .../ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.h   |  1 -
 .../actors/ovl_En_Ex_Item/z_en_ex_item.c      | 48 ++-------------
 .../actors/ovl_En_Ex_Item/z_en_ex_item.h      |  5 ++
 6 files changed, 75 insertions(+), 75 deletions(-)

diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h
index a4054f2cb..89d2467c6 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h
@@ -305,6 +305,8 @@ typedef enum {
     GI_VB_GIVE_ITEM_FROM_SKULLTULA_REWARD,
     // Opt: *EnHy
     GI_VB_GIVE_ITEM_FROM_LOST_DOG,
+    // Opt: *EnBomBowlPit
+    GI_VB_GIVE_ITEM_FROM_BOMBCHU_BOWLING,
 
     GI_VB_GIVE_ITEM_FAIRY_OCARINA,
     GI_VB_GIVE_ITEM_WEIRD_EGG,
diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index f1715c8eb..07f2ecb54 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -30,6 +30,7 @@ extern "C" {
 #include "src/overlays/actors/ovl_En_Skj/z_en_skj.h"
 #include "src/overlays/actors/ovl_En_Hy/z_en_hy.h"
 #include "src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h"
+#include "src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.h"
 #include "adult_trade_shuffle.h"
 extern SaveContext gSaveContext;
 extern PlayState* gPlayState;
@@ -256,6 +257,30 @@ void RandomizerOnItemReceiveHandler(GetItemEntry receivedItemEntry) {
     }
 }
 
+void EnExItem_DrawRandomizedItem(EnExItem* enExItem, PlayState* play) {
+    func_8002ED80(&enExItem->actor, play, 0);
+    EnItem00_CustomItemsParticles(&enExItem->actor, play, enExItem->sohItemEntry);
+    GetItemEntry_Draw(play, enExItem->sohItemEntry);
+}
+
+void EnExItem_WaitForObjectRandomized(EnExItem* enExItem, PlayState* play) {
+    EnExItem_WaitForObject(enExItem, play);
+    if (Object_IsLoaded(&play->objectCtx, enExItem->objectIdx)) {
+        enExItem->actor.draw = (ActorFunc)EnExItem_DrawRandomizedItem;
+        Actor_SetScale(&enExItem->actor, enExItem->scale);
+        
+        // for now we're just using this to not have items float
+        // below the bowling counter, but it would be nice to use
+        // this to not draw gigantic skull tokens etc.
+        switch (enExItem->type) {
+            case EXITEM_BOMB_BAG_COUNTER: {
+                enExItem->actor.shape.yOffset = -10.0f;
+                break;
+            }
+        }
+    }
+}
+
 void EnItem00_DrawRandomizedItem(EnItem00* enItem00, PlayState* play) {
     f32 mtxScale = CVarGetFloat("gTimeSavers.SkipGetItemAnimationScale", 10.0f);
     Matrix_Scale(mtxScale, mtxScale, mtxScale, MTXMODE_APPLY);
@@ -932,6 +957,13 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             *should = false;
             break;
         }
+        case GI_VB_GIVE_ITEM_FROM_BOMBCHU_BOWLING: {
+            EnBomBowlPit* enBomBowlPit = static_cast<EnBomBowlPit*>(optionalArg);
+            if (enBomBowlPit->prizeIndex == EXITEM_BOMB_BAG_BOWLING || enBomBowlPit->prizeIndex == EXITEM_HEART_PIECE_BOWLING) {
+                *should = false;
+            }
+            break;
+        }
         case GI_VB_TRADE_TIMER_ODD_MUSHROOM:
         case GI_VB_TRADE_TIMER_EYEDROPS:
         case GI_VB_TRADE_TIMER_FROG:
@@ -1216,6 +1248,33 @@ void RandomizerOnActorInitHandler(void* actorRef) {
         objComb->beehiveIdentity = OTRGlobals::Instance->gRandomizer->IdentifyBeehive(gPlayState->sceneNum, (s16)actor->world.pos.x, respawnData);
         objComb->actionFunc = (ObjCombActionFunc)ObjComb_RandomizerWait;
     }
+
+    if (actor->id == ACTOR_EN_EX_ITEM) {
+        EnExItem* enExItem = static_cast<EnExItem*>(actorRef);
+        
+        RandomizerCheck rc = RC_UNKNOWN_CHECK;
+        switch (enExItem->type) {
+            case EXITEM_BOMB_BAG_COUNTER:
+            case EXITEM_BOMB_BAG_BOWLING:
+                rc = RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE;
+                break;
+            case EXITEM_HEART_PIECE_COUNTER:
+            case EXITEM_HEART_PIECE_BOWLING:
+                rc = RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE;
+                break;
+            case EXITEM_BOMBCHUS_COUNTER:
+            case EXITEM_BOMBCHUS_BOWLING:
+                rc = RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS;
+                break;
+            case EXITEM_BULLET_BAG:
+                rc = RC_LW_TARGET_IN_WOODS;
+                break;
+        }
+        if (rc != RC_UNKNOWN_CHECK) {
+            enExItem->sohItemEntry = Rando::Context::GetInstance()->GetFinalGIEntry(rc, true, (GetItemID)Rando::StaticData::GetLocation(rc)->GetVanillaItem());
+            enExItem->actionFunc = (EnExItemActionFunc)EnExItem_WaitForObjectRandomized;
+        }
+    }
 }
 
 void RandomizerRegisterHooks() {
diff --git a/soh/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c b/soh/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c
index 232b096f9..7e5cc3ef1 100644
--- a/soh/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c
+++ b/soh/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c
@@ -2,6 +2,7 @@
 #include "vt.h"
 #include "overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.h"
 #include "overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_WHILE_CULLED
 
@@ -177,56 +178,30 @@ void EnBomBowlPit_GivePrize(EnBomBowlPit* this, PlayState* play) {
 
     Player_SetCsActionWithHaltedActors(play, NULL, 7);
     this->getItemId = sGetItemIds[this->prizeIndex];
-    this->getItemEntry = (GetItemEntry)GET_ITEM_NONE;
 
     if ((this->getItemId == GI_BOMB_BAG_30) && (CUR_CAPACITY(UPG_BOMB_BAG) == 30)) {
         this->getItemId = GI_BOMB_BAG_40;
     }
 
-    if (IS_RANDO) {
-        switch (this->prizeIndex) {
-            case EXITEM_BOMB_BAG_BOWLING:
-                this->getItemEntry = Randomizer_GetItemFromKnownCheck(RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE, GI_BOMB_BAG_20);
-                this->getItemId = this->getItemEntry.getItemId;
-                break;
-            case EXITEM_HEART_PIECE_BOWLING:
-                this->getItemEntry = Randomizer_GetItemFromKnownCheck(RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE, GI_HEART_PIECE);
-                this->getItemId = this->getItemEntry.getItemId;
-                break;
-            case EXITEM_BOMBCHUS_BOWLING:
-                this->getItemEntry = Randomizer_GetItemFromKnownCheck(RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS, GI_BOMBCHUS_10);
-                this->getItemId = this->getItemEntry.getItemId;
-                break;
-        }
-    }
-
     player->stateFlags1 &= ~PLAYER_STATE1_IN_CUTSCENE;
     this->actor.parent = NULL;
-    if (!IS_RANDO || this->getItemEntry.getItemId == GI_NONE) {
+    if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_BOMBCHU_BOWLING, true, this)) {
         Actor_OfferGetItem(&this->actor, play, this->getItemId, 2000.0f, 1000.0f);
-    } else {
-        GiveItemEntryFromActor(&this->actor, play, this->getItemEntry, 2000.0f, 1000.0f);
     }
     player->stateFlags1 |= PLAYER_STATE1_IN_CUTSCENE;
     this->actionFunc = EnBomBowlPit_WaitTillPrizeGiven;
 }
 
 void EnBomBowlPit_WaitTillPrizeGiven(EnBomBowlPit* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_BOMBCHU_BOWLING, true, this)) {
         this->actionFunc = EnBomBowlPit_Reset;
     } else {
-         if (!IS_RANDO || this->getItemEntry.getItemId == GI_NONE) {
-            Actor_OfferGetItem(&this->actor, play, this->getItemId, 2000.0f, 1000.0f);
-        } else {
-            GiveItemEntryFromActor(&this->actor, play, this->getItemEntry, 2000.0f, 1000.0f);
-        }
+        Actor_OfferGetItem(&this->actor, play, this->getItemId, 2000.0f, 1000.0f);
     }
 }
 
 void EnBomBowlPit_Reset(EnBomBowlPit* this, PlayState* play) {
-    if (((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) &&
-          Message_ShouldAdvance(play)) ||
-        (IS_RANDO && this->getItemId == GI_ICE_TRAP)) {
+    if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) {
         // "Normal termination"/"completion"
         osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 正常終了 ☆☆☆☆☆ \n" VT_RST);
         if (this->getItemId == GI_HEART_PIECE) {
diff --git a/soh/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.h b/soh/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.h
index 97ff39ac8..48cfbd5c2 100644
--- a/soh/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.h
+++ b/soh/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.h
@@ -33,7 +33,6 @@ typedef struct EnBomBowlPit {
     /* 0x01D4 */ Vec3f unk_1D4; // camera eye (maxsteps)
     /* 0x01E0 */ EnExItem* exItem;
     /* 0x01E4 */ char unk_1E4[0x3520];
-    /*        */ GetItemEntry getItemEntry;
 } EnBomBowlPit; // size = 0x3704
 
 #endif
diff --git a/soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c b/soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c
index 3860336ef..28e89036d 100644
--- a/soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c
+++ b/soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c
@@ -138,12 +138,7 @@ void EnExItem_WaitForObject(EnExItem* this, PlayState* play) {
                 onCounter = true;
             case EXITEM_BOMB_BAG_BOWLING:
                 this->unk_17C = func_8002EBCC;
-                if (IS_RANDO) {
-                    this->giDrawId =
-                        Randomizer_GetItemFromKnownCheck(RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE, GI_BOMB_BAG_20).gid;
-                } else {
-                    this->giDrawId = GID_BOMB_BAG_30;
-                }
+                this->giDrawId = GID_BOMB_BAG_30;
                 this->timer = 65;
                 this->prizeRotateTimer = 35;
                 this->scale = 0.5f;
@@ -151,7 +146,7 @@ void EnExItem_WaitForObject(EnExItem* this, PlayState* play) {
                     this->actionFunc = EnExItem_BowlPrize;
                 } else {
                     this->actionFunc = EnExItem_SetupBowlCounter;
-                    this->actor.shape.yOffset = IS_RANDO ? -10.0f : -18.0f;
+                    this->actor.shape.yOffset = -18.0f;
                 }
                 break;
             case EXITEM_HEART_PIECE_COUNTER:
@@ -173,11 +168,7 @@ void EnExItem_WaitForObject(EnExItem* this, PlayState* play) {
                 onCounter = true;
             case EXITEM_BOMBCHUS_BOWLING:
                 this->unk_17C = func_8002EBCC;
-                if (IS_RANDO) {
-                    this->giDrawId = Randomizer_GetItemFromKnownCheck(RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS, GI_BOMBCHUS_10).gid;
-                } else {
-                    this->giDrawId = GID_BOMBCHU;
-                }
+                this->giDrawId = GID_BOMBCHU;
                 this->timer = 65;
                 this->prizeRotateTimer = 35;
                 this->scale = 0.5f;
@@ -496,43 +487,12 @@ void EnExItem_DrawItems(EnExItem* this, PlayState* play) {
     }
     if (this) {}
     func_8002ED80(&this->actor, play, 0);
-    if (IS_RANDO) {
-        GetItemEntry randoGetItem = (GetItemEntry)GET_ITEM_NONE;
-        switch (this->type) {
-            case EXITEM_BOMB_BAG_BOWLING:
-            case EXITEM_BOMB_BAG_COUNTER:
-                randoGetItem = Randomizer_GetItemFromKnownCheck(RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE, GI_BOMB_BAG_20);
-                break;
-            case EXITEM_BOMBCHUS_BOWLING:
-            case EXITEM_BOMBCHUS_COUNTER:
-                randoGetItem = Randomizer_GetItemFromKnownCheck(RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS, GI_BOMBCHUS_10);
-                break;
-            case EXITEM_BULLET_BAG:
-                randoGetItem = Randomizer_GetItemFromKnownCheck(RC_LW_TARGET_IN_WOODS, GI_BULLET_BAG_50);
-                break;
-        }
-
-        if (randoGetItem.getItemId != GI_NONE) {
-            EnItem00_CustomItemsParticles(&this->actor, play, randoGetItem);
-            GetItemEntry_Draw(play, randoGetItem);
-            return;
-        }
-    }
-
     GetItem_Draw(play, this->giDrawId);
 }
 
 void EnExItem_DrawHeartPiece(EnExItem* this, PlayState* play) {
     func_8002ED80(&this->actor, play, 0);
-
-    if (IS_RANDO) {
-        GetItemEntry randoGetItem =
-            Randomizer_GetItemFromKnownCheck(RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE, GI_HEART_PIECE);
-        EnItem00_CustomItemsParticles(&this->actor, play, randoGetItem);
-        GetItemEntry_Draw(play, randoGetItem);
-    } else {
-        GetItem_Draw(play, GID_HEART_PIECE);
-    }
+    GetItem_Draw(play, GID_HEART_PIECE);
 }
 
 void EnExItem_DrawMagic(EnExItem* this, PlayState* play, s16 magicIndex) {
diff --git a/soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h b/soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h
index d014e19be..090d7028c 100644
--- a/soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h
+++ b/soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h
@@ -27,6 +27,9 @@ typedef struct EnExItem {
     /* 0x0170 */ Vec3f initPos; // unused
     /* 0x017C */ EnExItemLightFunc unk_17C;
     /* 0x0180 */ EnExItemLightFunc unk_180;
+    // #region SOH [Randomizer] Caching the get item entry for the draw function for performance
+    /*        */ GetItemEntry sohItemEntry;
+    // #endregion
 } EnExItem; // size = 0x0184
 
 typedef enum {
@@ -52,6 +55,8 @@ typedef enum {
     /* 19 */ EXITEM_BULLET_BAG
 } EnExItemType;
 
+void EnExItem_WaitForObject(EnExItem* enExItem, PlayState* play);
+
 #define EXITEM_COUNTER 5
 #define EXITEM_CHEST 10
 #define EXITEM_MAGIC 16

From 54b15051371561df1344257b6be9c946afbcfbda Mon Sep 17 00:00:00 2001
From: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Date: Wed, 17 Apr 2024 21:17:00 -0400
Subject: [PATCH 103/230] vb gerudo (#111)

* vb gerudo

* clean up
---
 .../game-interactor/GameInteractor.h          |  6 ++++
 .../randomizer/3drando/spoiler_log.hpp        |  1 -
 .../Enhancements/randomizer/hook_handlers.cpp | 32 +++++++++++++++++++
 soh/soh/Enhancements/randomizer/location.h    |  4 ---
 .../Enhancements/randomizer/location_list.cpp |  2 +-
 .../randomizer/randomizer_check_tracker.cpp   |  2 --
 .../Enhancements/randomizer/randomizer_inf.h  |  2 ++
 .../ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c     | 17 ++--------
 soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c | 23 +++----------
 soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h |  2 ++
 soh/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c | 31 +++++-------------
 soh/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c | 15 +++------
 12 files changed, 63 insertions(+), 74 deletions(-)

diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h
index 89d2467c6..a3d7e9045 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h
@@ -212,6 +212,10 @@ typedef enum {
     // Opt: *BgDyYoseizo
     // Vanilla condition: see soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
     GI_VB_BE_ELIGIBLE_FOR_GREAT_FAIRY_REWARD,
+    // Vanilla condition: see CheckCarpentersFreed in z_en_ge1 and z_en_ge2
+    GI_VB_GERUDOS_BE_FRIENDLY,
+    // Vanilla condition: switch
+    GI_VB_GTG_GATE_BE_OPEN,
 
     /*** Play Cutscenes ***/
 
@@ -308,6 +312,8 @@ typedef enum {
     // Opt: *EnBomBowlPit
     GI_VB_GIVE_ITEM_FROM_BOMBCHU_BOWLING,
 
+    GI_VB_GIVE_ITEM_GERUDO_MEMBERSHIP_CARD,
+
     GI_VB_GIVE_ITEM_FAIRY_OCARINA,
     GI_VB_GIVE_ITEM_WEIRD_EGG,
     GI_VB_GIVE_ITEM_LIGHT_ARROW,
diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.hpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.hpp
index 7e20b176a..89b9d36bc 100644
--- a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.hpp
@@ -20,7 +20,6 @@ typedef enum {
     SPOILER_CHK_INF_TABLE,
     SPOILER_CHK_FISH,
     SPOILER_CHK_MINIGAME,
-    SPOILER_CHK_GERUDO_MEMBERSHIP_CARD,
     SPOILER_CHK_POE_POINTS,
     SPOILER_CHK_SHOP_ITEM,
     SPOILER_CHK_MASTER_SWORD,
diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index 07f2ecb54..f8e1c5020 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -31,6 +31,7 @@ extern "C" {
 #include "src/overlays/actors/ovl_En_Hy/z_en_hy.h"
 #include "src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h"
 #include "src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.h"
+#include "src/overlays/actors/ovl_En_Ge1/z_en_ge1.h"
 #include "adult_trade_shuffle.h"
 extern SaveContext gSaveContext;
 extern PlayState* gPlayState;
@@ -135,6 +136,13 @@ void RandomizerOnFlagSetHandler(int16_t flagType, int16_t flag) {
 }
 
 void RandomizerOnSceneFlagSetHandler(int16_t sceneNum, int16_t flagType, int16_t flag) {
+    if (RAND_GET_OPTION(RSK_SHUFFLE_DUNGEON_ENTRANCES) != RO_DUNGEON_ENTRANCE_SHUFFLE_OFF &&
+        sceneNum == SCENE_GERUDOS_FORTRESS &&
+        flagType == FLAG_SCENE_SWITCH &&
+        flag == 0x3A) {
+        Flags_SetRandomizerInf(RAND_INF_GF_GTG_GATE_PERMANENTLY_OPEN);
+    }
+
     RandomizerCheck rc = GetRandomizerCheckFromSceneFlag(sceneNum, flagType, flag);
     if (rc == RC_UNKNOWN_CHECK) return;
 
@@ -964,6 +972,21 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             }
             break;
         }
+        case GI_VB_GERUDOS_BE_FRIENDLY: {
+            *should = CHECK_QUEST_ITEM(QUEST_GERUDO_CARD);
+            break;
+        }
+        case GI_VB_GTG_GATE_BE_OPEN: {
+            if (Flags_GetRandomizerInf(RAND_INF_GF_GTG_GATE_PERMANENTLY_OPEN)) {
+                *should = true;
+            }
+            break;
+        }
+        case GI_VB_GIVE_ITEM_GERUDO_MEMBERSHIP_CARD: {
+            Flags_SetRandomizerInf(RAND_INF_GF_ITEM_FROM_LEADER_OF_FORTRESS);
+            *should = false;
+            break;
+        }
         case GI_VB_TRADE_TIMER_ODD_MUSHROOM:
         case GI_VB_TRADE_TIMER_EYEDROPS:
         case GI_VB_TRADE_TIMER_FROG:
@@ -1275,6 +1298,15 @@ void RandomizerOnActorInitHandler(void* actorRef) {
             enExItem->actionFunc = (EnExItemActionFunc)EnExItem_WaitForObjectRandomized;
         }
     }
+
+    if (actor->id == ACTOR_EN_GE1) {
+        EnGe1* enGe1 = static_cast<EnGe1*>(actorRef);
+        auto ge1Type = enGe1->actor.params & 0xFF;
+        if (ge1Type == GE1_TYPE_TRAINING_GROUNDS_GUARD &&
+            Flags_GetRandomizerInf(RAND_INF_GF_GTG_GATE_PERMANENTLY_OPEN)) {
+            enGe1->actionFunc = (EnGe1ActionFunc)EnGe1_SetNormalText;
+        }
+    }
 }
 
 void RandomizerRegisterHooks() {
diff --git a/soh/soh/Enhancements/randomizer/location.h b/soh/soh/Enhancements/randomizer/location.h
index a962e4501..1731067cf 100644
--- a/soh/soh/Enhancements/randomizer/location.h
+++ b/soh/soh/Enhancements/randomizer/location.h
@@ -59,10 +59,6 @@ class SpoilerCollectionCheck {
         return SpoilerCollectionCheck(SPOILER_CHK_MINIGAME, 0x00, bit);
     }
 
-    static auto GerudoToken() {
-        return SpoilerCollectionCheck(SPOILER_CHK_GERUDO_MEMBERSHIP_CARD, 0x00, 0x00);
-    }
-
     static auto BigPoePoints() {
         return SpoilerCollectionCheck(SPOILER_CHK_POE_POINTS, 0x00, 0x00);
     }
diff --git a/soh/soh/Enhancements/randomizer/location_list.cpp b/soh/soh/Enhancements/randomizer/location_list.cpp
index 39f9b7477..1dfa2f5e4 100644
--- a/soh/soh/Enhancements/randomizer/location_list.cpp
+++ b/soh/soh/Enhancements/randomizer/location_list.cpp
@@ -659,7 +659,7 @@ void Rando::StaticData::InitLocationTable() { //
     locationTable[RC_GF_HBA_1000_POINTS] =                                             Location::Base(RC_GF_HBA_1000_POINTS,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GERUDO_FORTRESS,              ACTOR_ID_MAX,         SCENE_GERUDOS_FORTRESS,             0x00,                                              0x3E, "GF HBA 1000 Points",                          "GF HBA 1000 Points",                                       RHT_GF_HBA_1000_POINTS,                                          RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::InfTable(INFTABLE_190),                                                                               SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
     locationTable[RC_GF_HBA_1500_POINTS] =                                             Location::Base(RC_GF_HBA_1500_POINTS,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GERUDO_FORTRESS,              ACTOR_ID_MAX,         SCENE_GERUDOS_FORTRESS,             0x00,                                              0x30, "GF HBA 1500 Points",                          "GF HBA 1500 Points",                                       RHT_GF_HBA_1500_POINTS,                                          RG_PROGRESSIVE_BOW,                   {},                                                     SpoilerCollectionCheck::ItemGetInf(15),                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
     // RandoTodo: Do we replace these with the RC_HIDEOUT keys or keep these?
-    locationTable[RC_GF_GERUDO_MEMBERSHIP_CARD] =                                      Location::Base(RC_GF_GERUDO_MEMBERSHIP_CARD,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GERUDO_FORTRESS,              ACTOR_ID_MAX,         SCENE_THIEVES_HIDEOUT,              0x00,                                              0x3A, "GF Gerudo Membership Card",                   "GF Gerudo Membership Card",                                RHT_GF_GERUDO_MEMBERSHIP_CARD,                                   RG_GERUDO_MEMBERSHIP_CARD,            {},                                                     SpoilerCollectionCheck::GerudoToken(),                                                                                        SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
+    locationTable[RC_GF_GERUDO_MEMBERSHIP_CARD] =                                      Location::Base(RC_GF_GERUDO_MEMBERSHIP_CARD,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GERUDO_FORTRESS,              ACTOR_ID_MAX,         SCENE_THIEVES_HIDEOUT,              0x00,                                              0x3A, "GF Gerudo Membership Card",                   "GF Gerudo Membership Card",                                RHT_GF_GERUDO_MEMBERSHIP_CARD,                                   RG_GERUDO_MEMBERSHIP_CARD,            {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_ITEM_FROM_LEADER_OF_FORTRESS),                                              SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
     locationTable[RC_GF_NORTH_F1_CARPENTER] =                                   Location::Collectable(RC_GF_NORTH_F1_CARPENTER,                                        RCQUEST_BOTH,    RCTYPE_GF_KEY,                      RCAREA_GERUDO_FORTRESS,              ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,              3089,                                              0x0C, "GF North F1 Carpenter",                       "GF North F1 Carpenter",                                    RHT_GF_NORTH_F1_CARPENTER,                                       RG_GERUDO_FORTRESS_SMALL_KEY,         { Category::cVanillaGFSmallKey },                                                                                                                                                     SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
     locationTable[RC_GF_NORTH_F2_CARPENTER] =                                   Location::Collectable(RC_GF_NORTH_F2_CARPENTER,                                        RCQUEST_BOTH,    RCTYPE_GF_KEY,                      RCAREA_GERUDO_FORTRESS,              ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,              2577,                                              0x0A, "GF North F2 Carpenter",                       "GF North F2 Carpenter",                                    RHT_GF_NORTH_F2_CARPENTER,                                       RG_GERUDO_FORTRESS_SMALL_KEY,         { Category::cVanillaGFSmallKey },                                                                                                                                                     SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
     locationTable[RC_GF_SOUTH_F1_CARPENTER] =                                   Location::Collectable(RC_GF_SOUTH_F1_CARPENTER,                                        RCQUEST_BOTH,    RCTYPE_GF_KEY,                      RCAREA_GERUDO_FORTRESS,              ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,              3601,                                              0x0E, "GF South F1 Carpenter",                       "GF South F1 Carpenter",                                    RHT_GF_SOUTH_F1_CARPENTER,                                       RG_GERUDO_FORTRESS_SMALL_KEY,         { Category::cVanillaGFSmallKey },                                                                                                                                                     SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
index 7c5b63c37..fda9d717d 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
@@ -426,8 +426,6 @@ bool HasItemBeenCollected(RandomizerCheck rc) {
         return Flags_GetRandomizerInf(OTRGlobals::Instance->gRandomizer->GetRandomizerInfFromCheck(rc));
     case SpoilerCollectionCheckType::SPOILER_CHK_EVENT_CHK_INF:
         return gSaveContext.eventChkInf[flag / 16] & (0x01 << flag % 16);
-    case SpoilerCollectionCheckType::SPOILER_CHK_GERUDO_MEMBERSHIP_CARD:
-        return CHECK_FLAG_ALL(gSaveContext.eventChkInf[0x09], 0x0F);
     case SpoilerCollectionCheckType::SPOILER_CHK_GOLD_SKULLTULA:
         return GET_GS_FLAGS(scene) & flag;
     case SpoilerCollectionCheckType::SPOILER_CHK_INF_TABLE:
diff --git a/soh/soh/Enhancements/randomizer/randomizer_inf.h b/soh/soh/Enhancements/randomizer/randomizer_inf.h
index 14749e574..465f5316c 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_inf.h
+++ b/soh/soh/Enhancements/randomizer/randomizer_inf.h
@@ -293,6 +293,8 @@ typedef enum {
     RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_4,
     RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_5,
 
+    RAND_INF_GF_ITEM_FROM_LEADER_OF_FORTRESS,
+    RAND_INF_GF_GTG_GATE_PERMANENTLY_OPEN,
     // If you add anything to this list, you need to update the size of randomizerInf in z64save.h to be ceil(RAND_INF_MAX / 16)
 
     RAND_INF_MAX,
diff --git a/soh/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c b/soh/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c
index 519767534..6d65c049f 100644
--- a/soh/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c
+++ b/soh/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c
@@ -6,6 +6,7 @@
 
 #include "z_bg_spot12_saku.h"
 #include "objects/object_spot12_obj/object_spot12_obj.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS 0
 
@@ -58,15 +59,9 @@ void func_808B3420(BgSpot12Saku* this, PlayState* play, CollisionHeader* collisi
 void BgSpot12Saku_Init(Actor* thisx, PlayState* play) {
     BgSpot12Saku* this = (BgSpot12Saku*)thisx;
 
-    // If ER is on, force the gate to always use its permanent flag
-    // (which it only uses in Child Gerudo Fortress in the vanilla game)
-    if (IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_DUNGEON_ENTRANCES) != RO_DUNGEON_ENTRANCE_SHUFFLE_OFF) {
-        thisx->params = 0x0002;
-    }
-
     func_808B3420(this, play, &gGerudoFortressGTGShutterCol, DPM_UNK);
     Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
-    if (Flags_GetSwitch(play, this->dyna.actor.params & 0x3F)) {
+    if (GameInteractor_Should(GI_VB_GTG_GATE_BE_OPEN, Flags_GetSwitch(play, this->dyna.actor.params & 0x3F), NULL)) {
         func_808B3714(this);
     } else {
         func_808B3550(this);
@@ -87,7 +82,7 @@ void func_808B3550(BgSpot12Saku* this) {
 }
 
 void func_808B357C(BgSpot12Saku* this, PlayState* play) {
-    if (Flags_GetSwitch(play, this->dyna.actor.params & 0x3F)) {
+    if (GameInteractor_Should(GI_VB_GTG_GATE_BE_OPEN, Flags_GetSwitch(play, this->dyna.actor.params & 0x3F), NULL)) {
         func_808B35E4(this);
         this->timer = 20;
         OnePointCutscene_Init(play, 4170, -99, &this->dyna.actor, MAIN_CAM);
@@ -131,12 +126,6 @@ void func_808B37AC(BgSpot12Saku* this, PlayState* play) {
 void BgSpot12Saku_Update(Actor* thisx, PlayState* play) {
     BgSpot12Saku* this = (BgSpot12Saku*)thisx;
 
-    // If ER is on, when the guard opens the GtG gate its permanent flag will be set.
-    if (IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_DUNGEON_ENTRANCES) != RO_DUNGEON_ENTRANCE_SHUFFLE_OFF &&
-        Flags_GetSwitch(play, 0x3A)) {
-        Flags_SetSwitch(play, 0x2);
-    }
-
     if (this->timer > 0) {
         this->timer--;
     }
diff --git a/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c b/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
index 995e3d5fd..2086e528f 100644
--- a/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
+++ b/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
@@ -134,7 +134,7 @@ void EnGe1_Init(Actor* thisx, PlayState* play) {
         case GE1_TYPE_GATE_OPERATOR:
             this->hairstyle = GE1_HAIR_STRAIGHT;
 
-            if (EnGe1_CheckCarpentersFreed()) {
+            if (GameInteractor_Should(GI_VB_GERUDOS_BE_FRIENDLY, EnGe1_CheckCarpentersFreed(), NULL)) {
                 this->actionFunc = EnGe1_CheckGate_GateOp;
             } else {
                 this->actionFunc = EnGe1_WatchForPlayerFrontOnly;
@@ -144,7 +144,7 @@ void EnGe1_Init(Actor* thisx, PlayState* play) {
         case GE1_TYPE_NORMAL:
             this->hairstyle = GE1_HAIR_STRAIGHT;
 
-            if (EnGe1_CheckCarpentersFreed()) {
+            if (GameInteractor_Should(GI_VB_GERUDOS_BE_FRIENDLY, EnGe1_CheckCarpentersFreed(), NULL)) {
                 this->actionFunc = EnGe1_SetNormalText;
             } else {
                 this->actionFunc = EnGe1_WatchForAndSensePlayer;
@@ -174,7 +174,7 @@ void EnGe1_Init(Actor* thisx, PlayState* play) {
 
             if (gSaveContext.eventInf[0] & 0x100) {
                 this->actionFunc = EnGe1_TalkAfterGame_Archery;
-            } else if (EnGe1_CheckCarpentersFreed()) {
+            } else if (GameInteractor_Should(GI_VB_GERUDOS_BE_FRIENDLY, EnGe1_CheckCarpentersFreed(), NULL)) {
                 this->actionFunc = EnGe1_Wait_Archery;
             } else {
                 this->actionFunc = EnGe1_WatchForPlayerFrontOnly;
@@ -184,13 +184,8 @@ void EnGe1_Init(Actor* thisx, PlayState* play) {
         case GE1_TYPE_TRAINING_GROUNDS_GUARD:
             this->hairstyle = GE1_HAIR_STRAIGHT;
 
-            if (EnGe1_CheckCarpentersFreed()) {
-                // If the gtg gate is permanently open, don't let the gaurd charge to open it again
-                if (IS_RANDO && gSaveContext.sceneFlags[93].swch & 0x00000004) {
-                    this->actionFunc = EnGe1_SetNormalText;
-                } else {
-                    this->actionFunc = EnGe1_CheckForCard_GTGGuard;
-                }
+            if (GameInteractor_Should(GI_VB_GERUDOS_BE_FRIENDLY, EnGe1_CheckCarpentersFreed(), NULL)) {
+                this->actionFunc = EnGe1_CheckForCard_GTGGuard;
             } else {
                 this->actionFunc = EnGe1_WatchForPlayerFrontOnly;
             }
@@ -236,14 +231,6 @@ void EnGe1_SetAnimationIdle(EnGe1* this) {
 }
 
 s32 EnGe1_CheckCarpentersFreed(void) {
-    if (IS_RANDO) {
-        if (CHECK_QUEST_ITEM(QUEST_GERUDO_CARD)) {
-            return 1;
-        } else {
-            return 0;
-        }
-    }
-
     u16 carpenterFlags = gSaveContext.eventChkInf[9];
     if (!((carpenterFlags & 1) && (carpenterFlags & 2) && (carpenterFlags & 4) && (carpenterFlags & 8))) {
         return 0;
diff --git a/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h b/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h
index 1851fdbce..afb57fb41 100644
--- a/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h
+++ b/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h
@@ -57,4 +57,6 @@ typedef struct EnGe1 {
     /* 0x02B8 */ EnGe1AnimFunc animFunc;
 } EnGe1; // size = 0x02BC
 
+void EnGe1_SetNormalText(EnGe1* enGe1, PlayState* play);
+
 #endif
diff --git a/soh/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c b/soh/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c
index 5602dd883..0b5b9c09e 100644
--- a/soh/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c
+++ b/soh/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c
@@ -8,6 +8,7 @@
 #include "vt.h"
 #include "objects/object_gla/object_gla.h"
 #include "soh/Enhancements/randomizer/randomizer_entrance.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include <assert.h>
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_WHILE_CULLED)
@@ -139,14 +140,14 @@ void EnGe2_Init(Actor* thisx, PlayState* play) {
     switch (this->actor.params & 0xFF) {
         case GE2_TYPE_PATROLLING:
             EnGe2_ChangeAction(this, GE2_ACTION_WALK);
-            if (EnGe2_CheckCarpentersFreed()) {
+            if (GameInteractor_Should(GI_VB_GERUDOS_BE_FRIENDLY, EnGe2_CheckCarpentersFreed(), NULL)) {
                 this->actor.update = EnGe2_UpdateFriendly;
                 this->actor.targetMode = 6;
             }
             break;
         case GE2_TYPE_STATIONARY:
             EnGe2_ChangeAction(this, GE2_ACTION_STAND);
-            if (EnGe2_CheckCarpentersFreed()) {
+            if (GameInteractor_Should(GI_VB_GERUDOS_BE_FRIENDLY, EnGe2_CheckCarpentersFreed(), NULL)) {
                 this->actor.update = EnGe2_UpdateFriendly;
                 this->actor.targetMode = 6;
             }
@@ -227,14 +228,6 @@ s32 Ge2_DetectPlayerInUpdate(PlayState* play, EnGe2* this, Vec3f* pos, s16 yRot,
 }
 
 s32 EnGe2_CheckCarpentersFreed(void) {
-    if (IS_RANDO) {
-        if (CHECK_QUEST_ITEM(QUEST_GERUDO_CARD)) {
-            return 1;
-        } else {
-            return 0;
-        }
-    } 
-
     if (CHECK_FLAG_ALL(gSaveContext.eventChkInf[EVENTCHKINF_CARPENTERS_FREE_INDEX] &
                            (EVENTCHKINF_CARPENTERS_FREE_MASK_ALL | 0xF0),
                        EVENTCHKINF_CARPENTERS_FREE_MASK_ALL)) {
@@ -467,16 +460,11 @@ void EnGe2_WaitLookAtPlayer(EnGe2* this, PlayState* play) {
 }
 
 void EnGe2_WaitTillCardGiven(EnGe2* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_GERUDO_MEMBERSHIP_CARD, true, NULL)) {
         this->actor.parent = NULL;
         this->actionFunc = EnGe2_SetActionAfterTalk;
     } else {
-        if (!IS_RANDO) {
-            Actor_OfferGetItem(&this->actor, play, GI_GERUDO_CARD, 10000.0f, 50.0f);
-        } else {
-            GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_GF_GERUDO_MEMBERSHIP_CARD, GI_GERUDO_CARD);
-            GiveItemEntryFromActor(&this->actor, play, getItemEntry, 10000.0f, 50.0f);
-        }
+        Actor_OfferGetItem(&this->actor, play, GI_GERUDO_CARD, 10000.0f, 50.0f);
     }
 }
 
@@ -485,11 +473,8 @@ void EnGe2_GiveCard(EnGe2* this, PlayState* play) {
         Message_CloseTextbox(play);
         this->actor.flags &= ~ACTOR_FLAG_WILL_TALK;
         this->actionFunc = EnGe2_WaitTillCardGiven;
-         if (!IS_RANDO) {
+        if (GameInteractor_Should(GI_VB_GIVE_ITEM_GERUDO_MEMBERSHIP_CARD, true, NULL)) {
             Actor_OfferGetItem(&this->actor, play, GI_GERUDO_CARD, 10000.0f, 50.0f);
-        } else {
-            GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_GF_GERUDO_MEMBERSHIP_CARD, GI_GERUDO_CARD);
-            GiveItemEntryFromActor(&this->actor, play, getItemEntry, 10000.0f, 50.0f);
         }
     }
 }
@@ -620,7 +605,7 @@ void EnGe2_Update(Actor* thisx, PlayState* play) {
     }
     EnGe2_MoveAndBlink(this, play);
 
-    if (EnGe2_CheckCarpentersFreed() && !(this->stateFlags & GE2_STATE_KO)) {
+    if (GameInteractor_Should(GI_VB_GERUDOS_BE_FRIENDLY, EnGe2_CheckCarpentersFreed(), NULL) && !(this->stateFlags & GE2_STATE_KO)) {
         this->actor.update = EnGe2_UpdateFriendly;
         this->actor.targetMode = 6;
     }
@@ -645,7 +630,7 @@ void EnGe2_UpdateStunned(Actor* thisx, PlayState* play2) {
     }
     CollisionCheck_SetAC(play, &play->colChkCtx, &this->collider.base);
 
-    if (EnGe2_CheckCarpentersFreed()) {
+    if (GameInteractor_Should(GI_VB_GERUDOS_BE_FRIENDLY, EnGe2_CheckCarpentersFreed(), NULL)) {
         this->actor.update = EnGe2_UpdateFriendly;
         this->actor.targetMode = 6;
         this->actor.colorFilterTimer = 0;
diff --git a/soh/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c b/soh/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c
index aaa198060..1265ba51e 100644
--- a/soh/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c
+++ b/soh/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c
@@ -6,6 +6,7 @@
 
 #include "z_en_ge3.h"
 #include "objects/object_geldb/object_geldb.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_WHILE_CULLED)
 
@@ -140,16 +141,11 @@ void EnGe3_WaitLookAtPlayer(EnGe3* this, PlayState* play) {
 }
 
 void EnGe3_WaitTillCardGiven(EnGe3* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_GERUDO_MEMBERSHIP_CARD, true, NULL)) {
         this->actor.parent = NULL;
         this->actionFunc = EnGe3_Wait;
     } else {
-        if (!IS_RANDO) {
-            Actor_OfferGetItem(&this->actor, play, GI_GERUDO_CARD, 10000.0f, 50.0f);
-        } else {
-            GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_GF_GERUDO_MEMBERSHIP_CARD, GI_GERUDO_CARD);
-            GiveItemEntryFromActor(&this->actor, play, getItemEntry, 10000.0f, 50.0f);
-        }
+        Actor_OfferGetItem(&this->actor, play, GI_GERUDO_CARD, 10000.0f, 50.0f);
     }
 }
 
@@ -158,11 +154,8 @@ void EnGe3_GiveCard(EnGe3* this, PlayState* play) {
         Message_CloseTextbox(play);
         this->actor.flags &= ~ACTOR_FLAG_WILL_TALK;
         this->actionFunc = EnGe3_WaitTillCardGiven;
-        if (!IS_RANDO) {
+        if (GameInteractor_Should(GI_VB_GIVE_ITEM_GERUDO_MEMBERSHIP_CARD, true, NULL)) {
             Actor_OfferGetItem(&this->actor, play, GI_GERUDO_CARD, 10000.0f, 50.0f);
-        } else {
-            GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_GF_GERUDO_MEMBERSHIP_CARD, GI_GERUDO_CARD);
-            GiveItemEntryFromActor(&this->actor, play, getItemEntry, 10000.0f, 50.0f);
         }
     }
 }

From edf6d9334a7a6f275e18c8d448a1ae64e4faa8e6 Mon Sep 17 00:00:00 2001
From: Garrett Cox <garrettjcox@gmail.com>
Date: Thu, 18 Apr 2024 20:42:25 -0500
Subject: [PATCH 104/230] Migrate ganon trials

---
 .../Enhancements/debugger/debugSaveEditor.h   |  7 --
 .../Enhancements/randomizer/hook_handlers.cpp | 15 ++++
 .../Enhancements/randomizer/randomizer.cpp    | 28 +++----
 soh/soh/Enhancements/randomizer/randomizer.h  |  2 +-
 .../Enhancements/randomizer/randomizer_inf.h  |  7 --
 soh/soh/Enhancements/randomizer/savefile.cpp  | 13 ++-
 soh/soh/OTRGlobals.cpp                        |  4 +-
 soh/soh/OTRGlobals.h                          |  2 +-
 .../actors/ovl_Demo_Kekkai/z_demo_kekkai.c    | 80 +++----------------
 .../ovl_Object_Kankyo/z_object_kankyo.c       | 21 -----
 10 files changed, 48 insertions(+), 131 deletions(-)

diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.h b/soh/soh/Enhancements/debugger/debugSaveEditor.h
index ff9f9bf8f..047df95f8 100644
--- a/soh/soh/Enhancements/debugger/debugSaveEditor.h
+++ b/soh/soh/Enhancements/debugger/debugSaveEditor.h
@@ -358,13 +358,6 @@ const std::vector<FlagTable> flagTables = {
         { RAND_INF_DUNGEONS_DONE_SPIRIT_TEMPLE, "DUNGEONS_DONE_SPIRIT_TEMPLE" },
         { RAND_INF_DUNGEONS_DONE_SHADOW_TEMPLE, "DUNGEONS_DONE_SHADOW_TEMPLE" },
 
-        { RAND_INF_TRIALS_DONE_LIGHT_TRIAL, "TRIALS_DONE_LIGHT_TRIAL" },
-        { RAND_INF_TRIALS_DONE_FOREST_TRIAL, "TRIALS_DONE_FOREST_TRIAL" },
-        { RAND_INF_TRIALS_DONE_FIRE_TRIAL, "TRIALS_DONE_FIRE_TRIAL" },
-        { RAND_INF_TRIALS_DONE_WATER_TRIAL, "TRIALS_DONE_WATER_TRIAL" },
-        { RAND_INF_TRIALS_DONE_SPIRIT_TRIAL, "TRIALS_DONE_SPIRIT_TRIAL" },
-        { RAND_INF_TRIALS_DONE_SHADOW_TRIAL, "TRIALS_DONE_SHADOW_TRIAL" },
-
         { RAND_INF_COWS_MILKED_KF_LINKS_HOUSE_COW, "COWS_MILKED_KF_LINKS_HOUSE_COW" },
         { RAND_INF_COWS_MILKED_HF_COW_GROTTO_COW, "COWS_MILKED_HF_COW_GROTTO_COW" },
         { RAND_INF_COWS_MILKED_LLR_STABLES_LEFT_COW, "COWS_MILKED_LLR_STABLES_LEFT_COW" },
diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index f8e1c5020..f47d1adad 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -107,6 +107,15 @@ bool MeetsLACSRequirements() {
     return false;
 }
 
+bool CompletedAllTrials() {
+    return Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_WATER_TRIAL) &&
+           Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_LIGHT_TRIAL) &&
+           Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_FIRE_TRIAL) &&
+           Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_SHADOW_TRIAL) &&
+           Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_SPIRIT_TRIAL) &&
+           Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_FOREST_TRIAL);
+}
+
 // Todo Move this to randomizer context, clear it out on save load etc
 static std::queue<RandomizerCheck> randomizerQueuedChecks;
 static RandomizerCheck randomizerQueuedCheck = RC_UNKNOWN_CHECK;
@@ -1307,6 +1316,12 @@ void RandomizerOnActorInitHandler(void* actorRef) {
             enGe1->actionFunc = (EnGe1ActionFunc)EnGe1_SetNormalText;
         }
     }
+
+    if (actor->id == ACTOR_DEMO_KEKKAI && actor->params == 0) { // 0 == KEKKAI_TOWER
+        if (CompletedAllTrials()) {
+            Actor_Kill(actor);
+        }
+    }
 }
 
 void RandomizerRegisterHooks() {
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index eb34721b5..74409c4c7 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -164,21 +164,6 @@ Randomizer::Randomizer() {
 Randomizer::~Randomizer() {
 }
 
-std::unordered_map<std::string, RandomizerInf> spoilerFileTrialToEnum = {
-    { "the Forest Trial", RAND_INF_TRIALS_DONE_FOREST_TRIAL },
-    { "l'épreuve de la Forêt", RAND_INF_TRIALS_DONE_FOREST_TRIAL },
-    { "the Fire Trial", RAND_INF_TRIALS_DONE_FIRE_TRIAL },
-    { "l'épreuve du Feu", RAND_INF_TRIALS_DONE_FIRE_TRIAL },
-    { "the Water Trial", RAND_INF_TRIALS_DONE_WATER_TRIAL },
-    { "l'épreuve de l'Eau", RAND_INF_TRIALS_DONE_WATER_TRIAL },
-    { "the Spirit Trial", RAND_INF_TRIALS_DONE_SPIRIT_TRIAL },
-    { "l'épreuve de l'Esprit", RAND_INF_TRIALS_DONE_SPIRIT_TRIAL },
-    { "the Shadow Trial", RAND_INF_TRIALS_DONE_SHADOW_TRIAL },
-    { "l'épreuve de l'Ombre", RAND_INF_TRIALS_DONE_SHADOW_TRIAL },
-    { "the Light Trial", RAND_INF_TRIALS_DONE_LIGHT_TRIAL },
-    { "l'épreuve de la Lumière", RAND_INF_TRIALS_DONE_LIGHT_TRIAL }
-};
-
 std::unordered_map<std::string, SceneID> spoilerFileDungeonToScene = {
     { "Deku Tree", SCENE_DEKU_TREE },
     { "Dodongo's Cavern", SCENE_DODONGOS_CAVERN },
@@ -576,8 +561,17 @@ void Randomizer::LoadMerchantMessages() {
                 "\x08{{item}}  {{price}} Rubis\x09&&\x1B%gAcheter&Ne pas acheter%w\x09\x02"));
 }
 
-bool Randomizer::IsTrialRequired(RandomizerInf trial) {
-    return Rando::Context::GetInstance()->GetTrial(trial - RAND_INF_TRIALS_DONE_LIGHT_TRIAL)->IsRequired();
+std::map<s32, Rando::TrialKey> trialFlagToTrialKey = {
+    { EVENTCHKINF_COMPLETED_LIGHT_TRIAL, Rando::TrialKey::LIGHT_TRIAL, },
+    { EVENTCHKINF_COMPLETED_FOREST_TRIAL, Rando::TrialKey::FOREST_TRIAL, },
+    { EVENTCHKINF_COMPLETED_FIRE_TRIAL, Rando::TrialKey::FIRE_TRIAL, },
+    { EVENTCHKINF_COMPLETED_WATER_TRIAL, Rando::TrialKey::WATER_TRIAL, },
+    { EVENTCHKINF_COMPLETED_SPIRIT_TRIAL, Rando::TrialKey::SPIRIT_TRIAL, },
+    { EVENTCHKINF_COMPLETED_SHADOW_TRIAL, Rando::TrialKey::SHADOW_TRIAL, }
+};
+
+bool Randomizer::IsTrialRequired(s32 trialFlag) {
+    return Rando::Context::GetInstance()->GetTrial(trialFlagToTrialKey[trialFlag])->IsRequired();
 }
 
 GetItemEntry Randomizer::GetItemFromActor(s16 actorId, s16 sceneNum, s16 actorParams, GetItemID ogItemId,
diff --git a/soh/soh/Enhancements/randomizer/randomizer.h b/soh/soh/Enhancements/randomizer/randomizer.h
index 4d5a2ff30..de7f216e6 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.h
+++ b/soh/soh/Enhancements/randomizer/randomizer.h
@@ -46,7 +46,7 @@ class Randomizer {
     bool SpoilerFileExists(const char* spoilerFileName);
     void LoadMerchantMessages();
     void LoadHintMessages();
-    bool IsTrialRequired(RandomizerInf trial);
+    bool IsTrialRequired(s32 trialFlag);
     u8 GetRandoSettingValue(RandomizerSettingKey randoSettingKey);
     RandomizerCheck GetCheckFromRandomizerInf(RandomizerInf randomizerInf);
     RandomizerInf GetRandomizerInfFromCheck(RandomizerCheck rc);
diff --git a/soh/soh/Enhancements/randomizer/randomizer_inf.h b/soh/soh/Enhancements/randomizer/randomizer_inf.h
index 465f5316c..8bd2cc7c1 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_inf.h
+++ b/soh/soh/Enhancements/randomizer/randomizer_inf.h
@@ -10,13 +10,6 @@ typedef enum {
     RAND_INF_DUNGEONS_DONE_SPIRIT_TEMPLE,
     RAND_INF_DUNGEONS_DONE_SHADOW_TEMPLE,
 
-    RAND_INF_TRIALS_DONE_LIGHT_TRIAL,
-    RAND_INF_TRIALS_DONE_FOREST_TRIAL,
-    RAND_INF_TRIALS_DONE_FIRE_TRIAL,
-    RAND_INF_TRIALS_DONE_WATER_TRIAL,
-    RAND_INF_TRIALS_DONE_SPIRIT_TRIAL,
-    RAND_INF_TRIALS_DONE_SHADOW_TRIAL,
-
     RAND_INF_COWS_MILKED_KF_LINKS_HOUSE_COW,
     RAND_INF_COWS_MILKED_HF_COW_GROTTO_COW,
     RAND_INF_COWS_MILKED_LLR_STABLES_LEFT_COW,
diff --git a/soh/soh/Enhancements/randomizer/savefile.cpp b/soh/soh/Enhancements/randomizer/savefile.cpp
index 95840b15c..a43e9e2be 100644
--- a/soh/soh/Enhancements/randomizer/savefile.cpp
+++ b/soh/soh/Enhancements/randomizer/savefile.cpp
@@ -351,10 +351,15 @@ extern "C" void Randomizer_InitSaveFile() {
         gSaveContext.entranceIndex = -1;
     }
 
-    // If any trials aren't required, set them as completed
-    for (u16 i = RAND_INF_TRIALS_DONE_LIGHT_TRIAL; i <= RAND_INF_TRIALS_DONE_SHADOW_TRIAL; i++) {
-        if (!OTRGlobals::Instance->gRandomizer->IsTrialRequired((RandomizerInf)i)) {
-            Flags_SetRandomizerInf((RandomizerInf)i);
+    for (auto trialFlag : { EVENTCHKINF_COMPLETED_LIGHT_TRIAL,
+                        EVENTCHKINF_COMPLETED_FOREST_TRIAL,
+                        EVENTCHKINF_COMPLETED_FIRE_TRIAL,
+                        EVENTCHKINF_COMPLETED_WATER_TRIAL,
+                        EVENTCHKINF_COMPLETED_SPIRIT_TRIAL,
+                        EVENTCHKINF_COMPLETED_SHADOW_TRIAL }
+    ) {
+        if (!OTRGlobals::Instance->gRandomizer->IsTrialRequired(trialFlag)) {
+            Flags_SetEventChkInf(trialFlag);
         }
     }
 
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
index a01d96fed..c7e363ad7 100644
--- a/soh/soh/OTRGlobals.cpp
+++ b/soh/soh/OTRGlobals.cpp
@@ -2359,8 +2359,8 @@ extern "C" void Randomizer_LoadMerchantMessages() {
     OTRGlobals::Instance->gRandomizer->LoadMerchantMessages();
 }
 
-extern "C" bool Randomizer_IsTrialRequired(RandomizerInf trial) {
-    return OTRGlobals::Instance->gRandomizer->IsTrialRequired(trial);
+extern "C" bool Randomizer_IsTrialRequired(s32 trialFlag) {
+    return OTRGlobals::Instance->gRandomizer->IsTrialRequired(trialFlag);
 }
 
 extern "C" u32 SpoilerFileExists(const char* spoilerFileName) {
diff --git a/soh/soh/OTRGlobals.h b/soh/soh/OTRGlobals.h
index c90f07316..00b643bcb 100644
--- a/soh/soh/OTRGlobals.h
+++ b/soh/soh/OTRGlobals.h
@@ -159,7 +159,7 @@ FishIdentity Randomizer_IdentifyFish(s32 sceneNum, s32 actorParams);
 void Randomizer_ParseSpoiler(const char* fileLoc);
 void Randomizer_LoadHintMessages();
 void Randomizer_LoadMerchantMessages();
-bool Randomizer_IsTrialRequired(RandomizerInf trial);
+bool Randomizer_IsTrialRequired(s32 trialFlag);
 GetItemEntry Randomizer_GetItemFromActor(s16 actorId, s16 sceneNum, s16 actorParams, GetItemID ogId);
 GetItemEntry Randomizer_GetItemFromActorWithoutObtainabilityCheck(s16 actorId, s16 sceneNum, s16 actorParams, GetItemID ogId);
 GetItemEntry Randomizer_GetItemFromKnownCheck(RandomizerCheck randomizerCheck, GetItemID ogId);
diff --git a/soh/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c b/soh/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c
index 01a2ab047..09a45856b 100644
--- a/soh/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c
+++ b/soh/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c
@@ -64,66 +64,23 @@ static u8 sEnergyColors[] = {
     /* Forest  prim */ 255, 255, 170, /* env */ 0,   200, 0,
 };
 
-// Translates from the barrier's actor params to their corresponding randInf flags.
-RandomizerInf trialParamToRandInf(u16 params) {
-    switch (params) {
-        case KEKKAI_LIGHT:
-            return RAND_INF_TRIALS_DONE_LIGHT_TRIAL;
-        case KEKKAI_FOREST:
-            return RAND_INF_TRIALS_DONE_FOREST_TRIAL;
-        case KEKKAI_FIRE:
-            return RAND_INF_TRIALS_DONE_FIRE_TRIAL;
-        case KEKKAI_WATER:
-            return RAND_INF_TRIALS_DONE_WATER_TRIAL;
-        case KEKKAI_SPIRIT:
-            return RAND_INF_TRIALS_DONE_SPIRIT_TRIAL;
-        case KEKKAI_SHADOW:
-            return RAND_INF_TRIALS_DONE_SHADOW_TRIAL;
-    }
-}
-
 s32 DemoKekkai_CheckEventFlag(s32 params) {
-    static s32 eventFlags[] = { 0xC3, 0xBC, 0xBF, 0xBE, 0xBD, 0xAD, 0xBB };
+    static s32 eventFlags[] = {
+        EVENTCHKINF_DISPELLED_GANONS_TOWER_BARRIER,
+        EVENTCHKINF_COMPLETED_WATER_TRIAL,
+        EVENTCHKINF_COMPLETED_LIGHT_TRIAL,
+        EVENTCHKINF_COMPLETED_FIRE_TRIAL,
+        EVENTCHKINF_COMPLETED_SHADOW_TRIAL,
+        EVENTCHKINF_COMPLETED_SPIRIT_TRIAL,
+        EVENTCHKINF_COMPLETED_FOREST_TRIAL,
+    };
 
     if ((params < KEKKAI_TOWER) || (params > KEKKAI_FOREST)) {
         return true;
     }
-    if (IS_RANDO && params > KEKKAI_TOWER) {
-        return Flags_GetRandomizerInf(trialParamToRandInf(params));
-    }
     return Flags_GetEventChkInf(eventFlags[params]);
 }
 
-u32 TrialsDoneCount() {
-    u8 trialCount = 0;
-
-    if (Flags_GetRandomizerInf(RAND_INF_TRIALS_DONE_LIGHT_TRIAL)) {
-        trialCount++;
-    }
-
-    if (Flags_GetRandomizerInf(RAND_INF_TRIALS_DONE_FOREST_TRIAL)) {
-        trialCount++;
-    }
-
-    if (Flags_GetRandomizerInf(RAND_INF_TRIALS_DONE_FIRE_TRIAL)) {
-        trialCount++;
-    }
-
-    if (Flags_GetRandomizerInf(RAND_INF_TRIALS_DONE_WATER_TRIAL)) {
-        trialCount++;
-    }
-
-    if (Flags_GetRandomizerInf(RAND_INF_TRIALS_DONE_SPIRIT_TRIAL)) {
-        trialCount++;
-    }
-
-    if (Flags_GetRandomizerInf(RAND_INF_TRIALS_DONE_SHADOW_TRIAL)) {
-        trialCount++;
-    }
-
-    return trialCount;
-}
-
 void DemoKekkai_Init(Actor* thisx, PlayState* play) {
     s32 pad;
     DemoKekkai* this = (DemoKekkai*)thisx;
@@ -147,13 +104,6 @@ void DemoKekkai_Init(Actor* thisx, PlayState* play) {
             this->collider2.dim.radius = thisx->scale.x * 6100.0f;
             this->collider2.dim.height = thisx->scale.y * 5000.0f;
             this->collider2.dim.yShift = 300;
-
-            if (IS_RANDO) {
-                if (TrialsDoneCount() == NUM_TRIALS) {
-                    Actor_Kill(thisx);
-                    return;
-                }
-            }
             break;
         case KEKKAI_WATER:
         case KEKKAI_LIGHT:
@@ -161,10 +111,6 @@ void DemoKekkai_Init(Actor* thisx, PlayState* play) {
         case KEKKAI_SHADOW:
         case KEKKAI_SPIRIT:
         case KEKKAI_FOREST:
-            if (IS_RANDO && Flags_GetRandomizerInf(trialParamToRandInf(thisx->params))) {
-                Actor_Kill(thisx);
-                return;
-            }
             this->energyAlpha = 1.0f;
             this->orbScale = 1.0f;
             Actor_SetScale(thisx, 0.1f);
@@ -265,18 +211,10 @@ void DemoKekkai_Update(Actor* thisx, PlayState* play2) {
 }
 
 void DemoKekkai_TrialBarrierDispel(Actor* thisx, PlayState* play) {
-    static s32 eventFlags[] = { 0xC3, 0xBC, 0xBF, 0xBE, 0xBD, 0xAD, 0xBB };
     static u16 csFrames[] = { 0, 280, 280, 280, 280, 280, 280 };
     s32 pad;
     DemoKekkai* this = (DemoKekkai*)thisx;
 
-    if (IS_RANDO) {
-        Flags_SetRandomizerInf(trialParamToRandInf(thisx->params));
-        // May or may not be needed. Not sure if needed for anything
-        // that randoInf isn't already covering. Leaving it for safety.
-        Flags_SetEventChkInf(eventFlags[thisx->params]); 
-    }
-
     if (play->csCtx.frames == csFrames[this->actor.params]) {
         func_800F3F3C(0xA);
     }
diff --git a/soh/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c b/soh/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c
index eefaf9c0c..2600acd6b 100644
--- a/soh/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c
+++ b/soh/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c
@@ -136,27 +136,6 @@ void ObjectKankyo_Init(Actor* thisx, PlayState* play) {
                 this->effects[5].size = 0.0f;
             }
 
-            if (IS_RANDO) {
-                if (Flags_GetRandomizerInf(RAND_INF_TRIALS_DONE_FOREST_TRIAL)) {
-                    this->effects[0].size = 0.0f;
-                }
-                if (Flags_GetRandomizerInf(RAND_INF_TRIALS_DONE_WATER_TRIAL)) {
-                    this->effects[1].size = 0.0f;
-                }
-                if (Flags_GetRandomizerInf(RAND_INF_TRIALS_DONE_SHADOW_TRIAL)) {
-                    this->effects[2].size = 0.0f;
-                }
-                if (Flags_GetRandomizerInf(RAND_INF_TRIALS_DONE_FIRE_TRIAL)) {
-                    this->effects[3].size = 0.0f;
-                }
-                if (Flags_GetRandomizerInf(RAND_INF_TRIALS_DONE_LIGHT_TRIAL)) {
-                    this->effects[4].size = 0.0f;
-                }
-                if (Flags_GetRandomizerInf(RAND_INF_TRIALS_DONE_SPIRIT_TRIAL)) {
-                    this->effects[5].size = 0.0f;
-                }
-            }
-
             if (gSaveContext.cutsceneTrigger != 0) {
                 if (gSaveContext.entranceIndex == ENTR_INSIDE_GANONS_CASTLE_2) {
                     this->effects[0].size = 0.1f;

From 16836172105ee90802f2e81ddcedf67193b2a20d Mon Sep 17 00:00:00 2001
From: Garrett Cox <garrettjcox@gmail.com>
Date: Thu, 18 Apr 2024 21:13:40 -0500
Subject: [PATCH 105/230] Migrate rainbow bridge

---
 .../game-interactor/GameInteractor.h          |  2 +
 .../Enhancements/randomizer/hook_handlers.cpp | 57 +++++++++++++
 .../Enhancements/timesaver_hook_handlers.cpp  |  7 ++
 .../ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c     | 82 +++++--------------
 4 files changed, 85 insertions(+), 63 deletions(-)

diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h
index a3d7e9045..8dc20e215 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h
@@ -113,6 +113,7 @@ typedef enum {
     GI_VB_SHIEK_PREPARE_TO_GIVE_SERENADE_OF_WATER,
     // Vanilla condition: !EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT and EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP
     GI_VB_BE_ELIGIBLE_FOR_PRELUDE_OF_LIGHT,
+    GI_VB_BE_ELIGIBLE_FOR_RAINBOW_BRIDGE,
     /* Vanilla Condition: 
     ```
         LINK_IS_ADULT &&
@@ -255,6 +256,7 @@ typedef enum {
     GI_VB_PLAY_ROYAL_FAMILY_TOMB_EXPLODE,
     // Opt: *EnOkarinaTag
     GI_VB_PLAY_DOOR_OF_TIME_CS,
+    GI_VB_PLAY_RAINBOW_BRIDGE_CS,
 
     /*** Give Items ***/
 
diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index f47d1adad..a2fe8697e 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -116,6 +116,59 @@ bool CompletedAllTrials() {
            Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_FOREST_TRIAL);
 }
 
+bool MeetsRainbowBridgeRequirements() {
+    switch (RAND_GET_OPTION(RSK_RAINBOW_BRIDGE)) {
+        case RO_BRIDGE_VANILLA: {
+            if (CHECK_QUEST_ITEM(QUEST_MEDALLION_SPIRIT) && CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW) &&
+                (INV_CONTENT(ITEM_ARROW_LIGHT) == ITEM_ARROW_LIGHT)) {
+                return true;
+            }
+            break;
+        }
+        case RO_BRIDGE_STONES: {
+            if ((CheckStoneCount() + CheckBridgeRewardCount()) >= RAND_GET_OPTION(RSK_RAINBOW_BRIDGE_STONE_COUNT)) {
+                return true;
+            }
+            break;
+        }
+        case RO_BRIDGE_MEDALLIONS: {
+            if ((CheckMedallionCount() + CheckBridgeRewardCount()) >= RAND_GET_OPTION(RSK_RAINBOW_BRIDGE_MEDALLION_COUNT)) {
+                return true;
+            }
+            break;
+        }
+        case RO_BRIDGE_DUNGEON_REWARDS: {
+            if ((CheckMedallionCount() + CheckStoneCount() + CheckBridgeRewardCount()) >= RAND_GET_OPTION(RSK_RAINBOW_BRIDGE_REWARD_COUNT)) {
+                return true;
+            }
+            break;
+        }
+        case RO_BRIDGE_DUNGEONS: {
+            if ((CheckDungeonCount() + CheckBridgeRewardCount()) >= RAND_GET_OPTION(RSK_RAINBOW_BRIDGE_DUNGEON_COUNT)) {
+                return true;
+            }
+            break;
+        }
+        case RO_BRIDGE_TOKENS: {
+            if (gSaveContext.inventory.gsTokens >= RAND_GET_OPTION(RSK_RAINBOW_BRIDGE_TOKEN_COUNT)) {
+                return true;
+            }
+            break;
+        }
+        case RO_BRIDGE_GREG: {
+            if (Flags_GetRandomizerInf(RAND_INF_GREG_FOUND)) {
+                return true;
+            }
+            break;
+        }
+        case RO_BRIDGE_ALWAYS_OPEN: {
+            return true;
+        }
+    }
+
+    return false;
+}
+
 // Todo Move this to randomizer context, clear it out on save load etc
 static std::queue<RandomizerCheck> randomizerQueuedChecks;
 static RandomizerCheck randomizerQueuedCheck = RC_UNKNOWN_CHECK;
@@ -996,6 +1049,10 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             *should = false;
             break;
         }
+        case GI_VB_BE_ELIGIBLE_FOR_RAINBOW_BRIDGE: {
+            *should = MeetsRainbowBridgeRequirements();
+            break;
+        }
         case GI_VB_TRADE_TIMER_ODD_MUSHROOM:
         case GI_VB_TRADE_TIMER_EYEDROPS:
         case GI_VB_TRADE_TIMER_FROG:
diff --git a/soh/soh/Enhancements/timesaver_hook_handlers.cpp b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
index 18249e0bf..886b3ddea 100644
--- a/soh/soh/Enhancements/timesaver_hook_handlers.cpp
+++ b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
@@ -666,6 +666,13 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
 
             break;
         }
+        case GI_VB_PLAY_RAINBOW_BRIDGE_CS: {
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.Story", IS_RANDO)) {
+                *should = false;
+                func_800F595C(NA_BGM_BRIDGE_TO_GANONS);
+            }
+            break;
+        }
     }
 }
 
diff --git a/soh/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c b/soh/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c
index b592edcd5..543770505 100644
--- a/soh/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c
+++ b/soh/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c
@@ -7,6 +7,7 @@
 #include "z_bg_gjyo_bridge.h"
 #include "objects/object_gjyo_objects/object_gjyo_objects.h"
 #include "scenes/dungeons/ganon_tou/ganon_tou_scene.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS 0
 
@@ -50,8 +51,7 @@ void BgGjyoBridge_Init(Actor* thisx, PlayState* play) {
 
     this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, thisx, colHeader);
 
-    int bridge = Randomizer_GetSettingValue(RSK_RAINBOW_BRIDGE);
-    if (Flags_GetEventChkInf(EVENTCHKINF_RAINBOW_BRIDGE_BUILT) || (IS_RANDO && bridge == RO_BRIDGE_ALWAYS_OPEN)) {
+    if (Flags_GetEventChkInf(EVENTCHKINF_RAINBOW_BRIDGE_BUILT)) {
         this->actionFunc = func_808787A4;
     } else {
         this->dyna.actor.draw = NULL;
@@ -70,8 +70,10 @@ void func_808787A4(BgGjyoBridge* this, PlayState* play) {
 }
 
 void LaunchBridgeCutscene(BgGjyoBridge* this, PlayState* play) {
-    play->csCtx.segment = SEGMENTED_TO_VIRTUAL(gRainbowBridgeCs);
-    gSaveContext.cutsceneTrigger = 1;
+    if (GameInteractor_Should(GI_VB_PLAY_RAINBOW_BRIDGE_CS, true, NULL)) {
+        play->csCtx.segment = SEGMENTED_TO_VIRTUAL(gRainbowBridgeCs);
+        gSaveContext.cutsceneTrigger = 1;
+    }
     this->actionFunc = BgGjyoBridge_SpawnBridge;
 }
 
@@ -84,70 +86,24 @@ u8 CheckPlayerPosition(Player* player, PlayState* play) {
 void BgGjyoBridge_TriggerCutscene(BgGjyoBridge* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
 
-    if (!IS_RANDO) {
-        if (CHECK_QUEST_ITEM(QUEST_MEDALLION_SPIRIT) && CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW) &&
-            (INV_CONTENT(ITEM_ARROW_LIGHT) == ITEM_ARROW_LIGHT) && CheckPlayerPosition(player, play)) {
-            LaunchBridgeCutscene(this, play);
-        }
-    } else {
-        int bridge = Randomizer_GetSettingValue(RSK_RAINBOW_BRIDGE);
-        int bridgeStoneCount = Randomizer_GetSettingValue(RSK_RAINBOW_BRIDGE_STONE_COUNT);
-        int bridgeMedallionCount = Randomizer_GetSettingValue(RSK_RAINBOW_BRIDGE_MEDALLION_COUNT);
-        int bridgeRewardCount = Randomizer_GetSettingValue(RSK_RAINBOW_BRIDGE_REWARD_COUNT);
-        int bridgeDungeonCount = Randomizer_GetSettingValue(RSK_RAINBOW_BRIDGE_DUNGEON_COUNT);
-        int bridgeTokenCount = Randomizer_GetSettingValue(RSK_RAINBOW_BRIDGE_TOKEN_COUNT);
+    u8 vanillaBridgeCondition = 
+        CHECK_QUEST_ITEM(QUEST_MEDALLION_SPIRIT) &&
+        CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW) &&
+        (INV_CONTENT(ITEM_ARROW_LIGHT) == ITEM_ARROW_LIGHT) &&
+        CheckPlayerPosition(player, play);
 
-        switch (bridge) {
-            case RO_BRIDGE_VANILLA:
-                if (CHECK_QUEST_ITEM(QUEST_MEDALLION_SPIRIT) && CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW) &&
-                    (INV_CONTENT(ITEM_ARROW_LIGHT) == ITEM_ARROW_LIGHT)) {
-                    this->actionFunc = BgGjyoBridge_SpawnBridge;
-                    func_800F595C(NA_BGM_BRIDGE_TO_GANONS);
-                }
-                break;
-            case RO_BRIDGE_STONES:
-                if ((CheckStoneCount() + CheckBridgeRewardCount()) >= bridgeStoneCount) {
-                    this->actionFunc = BgGjyoBridge_SpawnBridge;
-                    func_800F595C(NA_BGM_BRIDGE_TO_GANONS);
-                }
-                break;
-            case RO_BRIDGE_MEDALLIONS:
-                if ((CheckMedallionCount() + CheckBridgeRewardCount()) >= bridgeMedallionCount) {
-                    this->actionFunc = BgGjyoBridge_SpawnBridge;
-                    func_800F595C(NA_BGM_BRIDGE_TO_GANONS);
-                }
-                break;
-            case RO_BRIDGE_DUNGEON_REWARDS:
-                if ((CheckMedallionCount() + CheckStoneCount() + CheckBridgeRewardCount()) >= bridgeRewardCount) {
-                    this->actionFunc = BgGjyoBridge_SpawnBridge;
-                    func_800F595C(NA_BGM_BRIDGE_TO_GANONS);
-                }
-                break;
-            case RO_BRIDGE_DUNGEONS:
-                if ((CheckDungeonCount() + CheckBridgeRewardCount()) >= bridgeDungeonCount) {
-                    this->actionFunc = BgGjyoBridge_SpawnBridge;
-                    func_800F595C(NA_BGM_BRIDGE_TO_GANONS);
-                }
-                break;
-            case RO_BRIDGE_TOKENS:
-                if (gSaveContext.inventory.gsTokens >= bridgeTokenCount) {
-                    this->actionFunc = BgGjyoBridge_SpawnBridge;
-                    func_800F595C(NA_BGM_BRIDGE_TO_GANONS);
-                }
-                break;
-            case RO_BRIDGE_GREG:
-                if (Flags_GetRandomizerInf(RAND_INF_GREG_FOUND)) {
-                    this->actionFunc = BgGjyoBridge_SpawnBridge;
-                    func_800F595C(NA_BGM_BRIDGE_TO_GANONS);
-                }
-                break;
-        }
+    if (GameInteractor_Should(GI_VB_BE_ELIGIBLE_FOR_RAINBOW_BRIDGE, vanillaBridgeCondition, NULL)) {
+        LaunchBridgeCutscene(this, play);
     }
 }
 
 void BgGjyoBridge_SpawnBridge(BgGjyoBridge* this, PlayState* play) {
-    if (IS_RANDO || (play->csCtx.state != CS_STATE_IDLE) && (play->csCtx.npcActions[2] != NULL) &&
-        (play->csCtx.npcActions[2]->action == 2)) {
+    u8 vanillaBridgeCondition = 
+        (play->csCtx.state != CS_STATE_IDLE) && 
+        (play->csCtx.npcActions[2] != NULL) &&
+        (play->csCtx.npcActions[2]->action == 2);
+
+    if (!GameInteractor_Should(GI_VB_PLAY_RAINBOW_BRIDGE_CS, true, NULL) || vanillaBridgeCondition) {
         this->dyna.actor.draw = BgGjyoBridge_Draw;
         func_8003EC50(play, &play->colCtx.dyna, this->dyna.bgId);
         Flags_SetEventChkInf(EVENTCHKINF_RAINBOW_BRIDGE_BUILT);

From abdbe25c8a92c0c38b28ef2445ef197c45883187 Mon Sep 17 00:00:00 2001
From: Garrett Cox <garrettjcox@gmail.com>
Date: Thu, 18 Apr 2024 21:36:10 -0500
Subject: [PATCH 106/230] Migrate purple poe faster fight

---
 .../Enhancements/timesaver_hook_handlers.cpp  | 30 +++++++++++++++++++
 .../ovl_En_Po_Sisters/z_en_po_sisters.c       | 11 -------
 .../ovl_En_Po_Sisters/z_en_po_sisters.h       |  2 ++
 3 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/soh/soh/Enhancements/timesaver_hook_handlers.cpp b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
index 886b3ddea..6c6930ec4 100644
--- a/soh/soh/Enhancements/timesaver_hook_handlers.cpp
+++ b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
@@ -23,6 +23,7 @@ extern "C" {
 #include "src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.h"
 #include "src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h"
 #include "src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h"
+#include "src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h"
 extern SaveContext gSaveContext;
 extern PlayState* gPlayState;
 }
@@ -686,6 +687,8 @@ static uint32_t enFuUpdateHook = 0;
 static uint32_t enFuKillHook = 0;
 static uint32_t bgSpot02UpdateHook = 0;
 static uint32_t bgSpot02KillHook = 0;
+static uint32_t enPoSistersUpdateHook = 0;
+static uint32_t enPoSistersKillHook = 0;
 void TimeSaverOnActorInitHandler(void* actorRef) {
     Actor* actor = static_cast<Actor*>(actorRef);
 
@@ -816,6 +819,33 @@ void TimeSaverOnActorInitHandler(void* actorRef) {
         EnDntDemo* enDntDemo = static_cast<EnDntDemo*>(actorRef);
         enDntDemo->actionFunc = EnDntDemo_JudgeSkipToReward;
     }
+
+    // Forest Temple entrance cutscene
+    if (actor->id == ACTOR_EN_PO_SISTERS && actor->params == 4124) {
+        if (CVarGetInteger("gTimeSavers.SkipCutscene.GlitchAiding", 0)) {
+            Flags_SetSwitch(gPlayState, 0x1B);
+            Actor_Kill(actor);
+        }
+    }
+
+    // Forest Temple purple poe fight speedup
+    if (actor->id == ACTOR_EN_PO_SISTERS && actor->params == 28) {
+        enPoSistersUpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* innerActorRef) mutable {
+            Actor* innerActor = static_cast<Actor*>(innerActorRef);
+            if (innerActor->id == ACTOR_EN_PO_SISTERS && innerActor->params == 28 && (CVarGetInteger("gTimeSavers.SkipMiscInteractions", IS_RANDO))) {
+                EnPoSisters* enPoSisters = static_cast<EnPoSisters*>(innerActorRef);
+                if (enPoSisters->actionFunc == func_80ADB338) {
+                    enPoSisters->unk_19C = 0;
+                }
+            }
+        });
+        enPoSistersKillHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>([](int16_t sceneNum) mutable {
+            GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(enPoSistersUpdateHook);
+            GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(enPoSistersKillHook);
+            enPoSistersUpdateHook = 0;
+            enPoSistersKillHook = 0;
+        });
+    }
 }
 
 void TimeSaverOnSceneInitHandler(int16_t sceneNum) {
diff --git a/soh/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c b/soh/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c
index ea324c5a5..280640efd 100644
--- a/soh/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c
+++ b/soh/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c
@@ -183,12 +183,6 @@ void EnPoSisters_Init(Actor* thisx, PlayState* play) {
 
     this->epoch++;
 
-    // Skip Poe Intro Cutscene
-    if (IS_RANDO && thisx->params == 4124 && !Randomizer_GetSettingValue(RSK_ENABLE_GLITCH_CUTSCENES)) {
-        Flags_SetSwitch(play, 0x1B);
-        Actor_Kill(thisx);
-    }
-
     Actor_ProcessInitChain(&this->actor, sInitChain);
     ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 50.0f);
     SkelAnime_Init(play, &this->skelAnime, &gPoeSistersSkel, &gPoeSistersSwayAnim, this->jointTable,
@@ -862,11 +856,6 @@ void func_80ADB338(EnPoSisters* this, PlayState* play) {
         if (Actor_WorldDistXZToPoint(&player->actor, &this->actor.home.pos) < 600.0f) {
             if (this->unk_19C != 0) {
                 this->unk_19C--;
-
-                // Force Meg to respawn instantly after getting hit
-                if (IS_RANDO) {
-                    this->unk_19C = 0;
-                }
             }
         } else {
             this->unk_19C = 100;
diff --git a/soh/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h b/soh/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h
index 2bd780983..5f42856a4 100644
--- a/soh/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h
+++ b/soh/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h
@@ -32,4 +32,6 @@ typedef struct EnPoSisters {
     u32 epoch;
 } EnPoSisters; // size = 0x0338
 
+void func_80ADB338(EnPoSisters* enPoSisters, PlayState* play);
+
 #endif

From 6c384c3cb69ba3a651148f2739fd2754542c0926 Mon Sep 17 00:00:00 2001
From: Garrett Cox <garrettjcox@gmail.com>
Date: Thu, 18 Apr 2024 21:52:38 -0500
Subject: [PATCH 107/230] Finish glitch aiding cutscenes toggle

---
 soh/soh/Enhancements/randomizer/savefile.cpp     | 4 ----
 soh/soh/Enhancements/timesaver_hook_handlers.cpp | 8 ++++++++
 soh/soh/SohMenuBar.cpp                           | 6 +++---
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/savefile.cpp b/soh/soh/Enhancements/randomizer/savefile.cpp
index a43e9e2be..ffab46e49 100644
--- a/soh/soh/Enhancements/randomizer/savefile.cpp
+++ b/soh/soh/Enhancements/randomizer/savefile.cpp
@@ -302,10 +302,6 @@ extern "C" void Randomizer_InitSaveFile() {
     // gSaveContext.sceneFlags[SCENE_DESERT_COLOSSUS].swch |= (1 << 0x1F); // desert colossus kaepora
     // gSaveContext.sceneFlags[SCENE_HYRULE_CASTLE].swch |= (1 << 0x5);  // hyrule castle kaepora
 
-    if (!Randomizer_GetSettingValue(RSK_ENABLE_GLITCH_CUTSCENES)) {
-        Flags_SetInfTable(INFTABLE_SPOKE_TO_DARUNIA_IN_FIRE_TEMPLE); // Darunia in Fire Temple
-    }
-
     if (Randomizer_GetSettingValue(RSK_SHUFFLE_OCARINA_BUTTONS) == RO_GENERIC_OFF) {
         Flags_SetRandomizerInf(RAND_INF_HAS_OCARINA_A);
         Flags_SetRandomizerInf(RAND_INF_HAS_OCARINA_C_LEFT);
diff --git a/soh/soh/Enhancements/timesaver_hook_handlers.cpp b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
index 6c6930ec4..5d77515da 100644
--- a/soh/soh/Enhancements/timesaver_hook_handlers.cpp
+++ b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
@@ -846,6 +846,14 @@ void TimeSaverOnActorInitHandler(void* actorRef) {
             enPoSistersKillHook = 0;
         });
     }
+
+    // Fire Temple Darunia cutscene
+    if (actor->id == ACTOR_EN_DU && gPlayState->sceneNum == SCENE_FIRE_TEMPLE) {
+        if (CVarGetInteger("gTimeSavers.SkipCutscene.GlitchAiding", 0)) {
+            Flags_SetInfTable(INFTABLE_SPOKE_TO_DARUNIA_IN_FIRE_TEMPLE);
+            Actor_Kill(actor);
+        }
+    }
 }
 
 void TimeSaverOnSceneInitHandler(int16_t sceneNum) {
diff --git a/soh/soh/SohMenuBar.cpp b/soh/soh/SohMenuBar.cpp
index b32a39627..95f59a14f 100644
--- a/soh/soh/SohMenuBar.cpp
+++ b/soh/soh/SohMenuBar.cpp
@@ -581,7 +581,7 @@ void DrawEnhancementsMenu() {
                     CVarGetInteger("gTimeSavers.SkipCutscene.Story", IS_RANDO) &&
                     CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", IS_RANDO) &&
                     CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", IS_RANDO) &&
-                    CVarGetInteger("gTimeSavers.SkipCutscene.GlitchAiding", IS_RANDO) &&
+                    CVarGetInteger("gTimeSavers.SkipCutscene.GlitchAiding", 0) &&
                     CVarGetInteger("gTimeSavers.SkipCutscene.OnePoint", IS_RANDO) &&
                     CVarGetInteger("gTimeSavers.NoForcedDialog", IS_RANDO) &&
                     CVarGetInteger("gTimeSavers.SkipOwlInteractions", IS_RANDO) &&
@@ -593,7 +593,7 @@ void DrawEnhancementsMenu() {
                     CVarGetInteger("gTimeSavers.SkipCutscene.Story", IS_RANDO) ||
                     CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", IS_RANDO) ||
                     CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", IS_RANDO) ||
-                    CVarGetInteger("gTimeSavers.SkipCutscene.GlitchAiding", IS_RANDO) ||
+                    CVarGetInteger("gTimeSavers.SkipCutscene.GlitchAiding", 0) ||
                     CVarGetInteger("gTimeSavers.SkipCutscene.OnePoint", IS_RANDO) ||
                     CVarGetInteger("gTimeSavers.NoForcedDialog", IS_RANDO) ||
                     CVarGetInteger("gTimeSavers.SkipOwlInteractions", IS_RANDO) ||
@@ -637,7 +637,7 @@ void DrawEnhancementsMenu() {
                 UIWidgets::PaddedEnhancementCheckbox("Skip Story Cutscenes", "gTimeSavers.SkipCutscene.Story", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
                 UIWidgets::PaddedEnhancementCheckbox("Skip Song Cutscenes", "gTimeSavers.SkipCutscene.LearnSong", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
                 UIWidgets::PaddedEnhancementCheckbox("Skip Boss Introductions", "gTimeSavers.SkipCutscene.BossIntro", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
-                UIWidgets::PaddedEnhancementCheckbox("Skip Glitch-Aiding Cutscenes", "gTimeSavers.SkipCutscene.GlitchAiding", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
+                UIWidgets::PaddedEnhancementCheckbox("Skip Glitch-Aiding Cutscenes", "gTimeSavers.SkipCutscene.GlitchAiding", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, 0);
                 UIWidgets::Tooltip("Skip cutscenes that are associated with useful glitches, currently this is only the Fire Temple Darunia CS and Forest Temple Poe Sisters CS");
                 UIWidgets::PaddedEnhancementCheckbox("Skip One Point Cutscenes (Chests, Door Unlocks, etc)", "gTimeSavers.SkipCutscene.OnePoint", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
                 UIWidgets::PaddedEnhancementCheckbox("No Forced Dialog", "gTimeSavers.NoForcedDialog", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);

From 43e8eec6bd417ce119f505419670a4476b520035 Mon Sep 17 00:00:00 2001
From: Garrett Cox <garrettjcox@gmail.com>
Date: Fri, 19 Apr 2024 12:28:38 -0500
Subject: [PATCH 108/230] Replace some printfs with spdlogs (#4058)

---
 .../Enhancements/randomizer/3drando/fill.cpp  | 24 ++++++++-----------
 .../Enhancements/randomizer/3drando/hints.cpp |  4 ++--
 .../randomizer/3drando/item_pool.cpp          |  2 +-
 .../Enhancements/randomizer/3drando/menu.cpp  |  6 ++---
 .../randomizer/3drando/playthrough.cpp        | 16 ++++++-------
 .../randomizer/3drando/spoiler_log.cpp        |  2 +-
 6 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/fill.cpp b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
index 9394ef22d..f87871944 100644
--- a/soh/soh/Enhancements/randomizer/3drando/fill.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
@@ -635,7 +635,7 @@ static void AssumedFill(const std::vector<RandomizerGet>& items, const std::vect
                         bool setLocationsAsHintable = false) {
     auto ctx = Rando::Context::GetInstance();
     if (items.size() > allowedLocations.size()) {
-        printf("\x1b[2;2HERROR: MORE ITEMS THAN LOCATIONS IN GIVEN LISTS");
+        SPDLOG_ERROR("ERROR: MORE ITEMS THAN LOCATIONS IN GIVEN LISTS");
         SPDLOG_DEBUG("Items:\n");
         // NOLINTNEXTLINE(clang-diagnostic-unused-variable)
         for (const RandomizerGet item : items) {
@@ -984,9 +984,9 @@ void VanillaFill() {
   }
   //If necessary, handle ER stuff
   if (ctx->GetOption(RSK_SHUFFLE_ENTRANCES)) {
-    printf("\x1b[7;10HShuffling Entrances...");
+    SPDLOG_INFO("Shuffling Entrances...");
     ctx->GetEntranceShuffler()->ShuffleAllEntrances();
-    printf("\x1b[7;32HDone");
+    SPDLOG_INFO("Shuffling Entrances Done");
   }
   // Populate the playthrough for entrances so they are placed in the spoiler log
   GeneratePlaythrough();
@@ -997,11 +997,6 @@ void VanillaFill() {
 }
 
 void ClearProgress() {
-  printf("\x1b[7;32H    "); // Done
-  printf("\x1b[8;10H                    "); // Placing Items...Done
-  printf("\x1b[9;10H                              "); // Calculating Playthrough...Done
-  printf("\x1b[10;10H                     "); // Creating Hints...Done
-  printf("\x1b[11;10H                                  "); // Writing Spoiler Log...Done
 }
 
 int Fill() {
@@ -1024,13 +1019,13 @@ int Fill() {
     //can validate the world using deku/hylian shields
     AddElementsToPool(ItemPool, GetMinVanillaShopItems(32)); //assume worst case shopsanity 4
     if (ctx->GetOption(RSK_SHUFFLE_ENTRANCES)) {
-      printf("\x1b[7;10HShuffling Entrances");
+      SPDLOG_INFO("Shuffling Entrances...");
       if (ctx->GetEntranceShuffler()->ShuffleAllEntrances() == ENTRANCE_SHUFFLE_FAILURE) {
         retries++;
         ClearProgress();
         continue;
       }
-      printf("\x1b[7;32HDone");
+      SPDLOG_INFO("Shuffling Entrances Done");
     }
     SetAreas();
     //erase temporary shop items
@@ -1142,19 +1137,20 @@ int Fill() {
     GeneratePlaythrough();
     //Successful placement, produced beatable result
     if(ctx->playthroughBeatable && !placementFailure) {
-      printf("Done");
-      printf("\x1b[9;10HCalculating Playthrough...");
+      SPDLOG_INFO("Calculating Playthrough...");
       PareDownPlaythrough();
       CalculateWotH();
       CalculateBarren(); 
-      printf("Done");
+      SPDLOG_INFO("Calculating Playthrough Done");
       ctx->CreateItemOverrides();
       ctx->GetEntranceShuffler()->CreateEntranceOverrides();
       
+      SPDLOG_INFO("Creating Other Hint Texts...");
       //funny ganon line
       Text ganonText = RandomElement(GetHintCategory(HintCategory::GanonLine)).GetText();
       CreateMessageFromTextObject(0x70CB, 0, 2, 3, AddColorsAndFormat(ganonText));
       SetGanonText(ganonText);
+      SPDLOG_INFO("Creating Other Hint Texts Done");
       
       CreateAllHints();
       CreateWarpSongTexts();
@@ -1162,7 +1158,7 @@ int Fill() {
     }
     //Unsuccessful placement
     if(retries < 4) {
-      SPDLOG_DEBUG("\nGOT STUCK. RETRYING...\n");
+      SPDLOG_DEBUG("Failed to generate a beatable seed. Retrying...");
       Areas::ResetAllLocations();
       logic->Reset();
       ClearProgress();
diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.cpp b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
index c55655de0..ce29c95d0 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hints.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
@@ -1114,8 +1114,8 @@ void CreateAllHints(){
     CreateFrogsHint();
   }
   if (ctx->GetOption(RSK_GOSSIP_STONE_HINTS).IsNot(RO_GOSSIP_STONES_NONE)) {
-    printf("\x1b[10;10HCreating Hints...");
+    SPDLOG_INFO("Creating Hints...");
     CreateStoneHints();
-    printf("Done");
+    SPDLOG_INFO("Creating Hints Done");
   }
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
index a54f522aa..f1119123c 100644
--- a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
@@ -468,7 +468,7 @@ void PlaceJunkInExcludedLocation(const RandomizerCheck il) {
       return;
     }
   }
-  printf("ERROR: No Junk to Place!!!\n");
+  SPDLOG_ERROR("ERROR: No Junk to Place!!!");
 }
 
 static void PlaceVanillaDekuScrubItems() {
diff --git a/soh/soh/Enhancements/randomizer/3drando/menu.cpp b/soh/soh/Enhancements/randomizer/3drando/menu.cpp
index 752984032..76cf6f1bc 100644
--- a/soh/soh/Enhancements/randomizer/3drando/menu.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/menu.cpp
@@ -50,12 +50,10 @@ bool GenerateRandomizer(std::set<RandomizerCheck> excludedLocations, std::set<Ra
     int ret = Playthrough::Playthrough_Init(ctx->GetSettings()->GetSeed(), excludedLocations, enabledTricks);
     if (ret < 0) {
         if (ret == -1) { // Failed to generate after 5 tries
-            printf("\n\nFailed to generate after 5 tries.\nPress B to go back to the menu.\nA different seed might be "
-                   "successful.");
-            SPDLOG_DEBUG("\nRANDOMIZATION FAILED COMPLETELY. PLZ FIX\n");//RANDOTODO print seed for reproduction purposes
+            SPDLOG_ERROR("Failed to generate after 5 tries.");
             return false;
         } else {
-            printf("\n\nError %d with fill.\nPress Select to exit or B to go back to the menu.\n", ret);
+            SPDLOG_ERROR("Error {} with fill.", ret);
             return false;
         }
     }
diff --git a/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp b/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
index 7aef15aa5..d29b6e8a6 100644
--- a/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
@@ -69,18 +69,18 @@ int Playthrough_Init(uint32_t seed, std::set<RandomizerCheck> excludedLocations,
     if (true) {
         //TODO: Handle different types of file output (i.e. Spoiler Log, Plando Template, Patch Files, Race Files, etc.)
         // write logs
-        printf("\x1b[11;10HWriting Spoiler Log...");
+        SPDLOG_INFO("Writing Spoiler Log...");
         if (SpoilerLog_Write()) {
-            printf("Done");
+            SPDLOG_INFO("Writing Spoiler Log Done");
         } else {
-            printf("Failed");
+            SPDLOG_ERROR("Writing Spoiler Log Failed");
         }
 #ifdef ENABLE_DEBUG
-        printf("\x1b[11;10HWriting Placement Log...");
+        SPDLOG_INFO("Writing Placement Log...");
         if (PlacementLog_Write()) {
-            printf("Done\n");
+            SPDLOG_INFO("Writing Placement Log Done");
         } else {
-            printf("Failed\n");
+            SPDLOG_ERROR("Writing Placement Log Failed");
         }
 #endif
     }
@@ -93,7 +93,7 @@ int Playthrough_Init(uint32_t seed, std::set<RandomizerCheck> excludedLocations,
 
 // used for generating a lot of seeds at once
 int Playthrough_Repeat(std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks, int count /*= 1*/) {
-    printf("\x1b[0;0HGENERATING %d SEEDS", count);
+    SPDLOG_INFO("GENERATING {} SEEDS", count);
     auto ctx = Rando::Context::GetInstance();
     uint32_t repeatedSeed = 0;
     for (int i = 0; i < count; i++) {
@@ -103,7 +103,7 @@ int Playthrough_Repeat(std::set<RandomizerCheck> excludedLocations, std::set<Ran
         //CitraPrint("testing seed: " + std::to_string(Settings::seed));
         ClearProgress();
         Playthrough_Init(ctx->GetSettings()->GetSeed(), excludedLocations, enabledTricks);
-        printf("\x1b[15;15HSeeds Generated: %d\n", i + 1);
+        SPDLOG_INFO("Seeds Generated: {}", i + 1);
     }
 
     return 1;
diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
index ba63e4641..3fdf56b60 100644
--- a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
@@ -260,7 +260,7 @@ void WriteIngameSpoilerLog() {
             }
         }
         if (spoilerOutOfSpace || playthroughItemNotFound) {
-            printf("Error! ");
+            SPDLOG_ERROR("In-game spoiler log is out of space, playthrough data will not be written");
         }
     }
 }

From ed0ef62c0cc86cc82a3aac4eb0521094411107ba Mon Sep 17 00:00:00 2001
From: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Date: Fri, 19 Apr 2024 16:15:15 -0400
Subject: [PATCH 109/230] fix: add location access for treasure chest game
 items

vb treasure chest game added new RCs for the treasure chest game (now there are RCs for each of the 5 keys and each of the 5 non key chests), but the location area table only had the keys, this adds the items
---
 .../3drando/location_access/locacc_castle_town.cpp           | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
index f48a2bb53..ac4a8ef50 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
@@ -235,10 +235,15 @@ void AreaTable_Init_CastleTown() {
                   LocationAccess(RC_GREG_HINT, {[]{return true;}}),
                   LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_REWARD, {[]{return logic->ChildsWallet && ((logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 6)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)));}}),
                   LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_KEY_1, {[]{return logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)));}}),
+                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_1, {[]{return logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)));}}),
                   LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_KEY_2, {[]{return logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 2)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)));}}),
+                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_2, {[]{return logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 2)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)));}}),
                   LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_KEY_3, {[]{return logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 3)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)));}}),
+                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_3, {[]{return logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 3)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)));}}),
                   LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_KEY_4, {[]{return logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 4)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)));}}),
+                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_4, {[]{return logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 4)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)));}}),
                   LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_KEY_5, {[]{return logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 5)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)));}}),
+                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_5, {[]{return logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 5)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)));}}),
                 }, {
                   //Exits
                   Entrance(RR_THE_MARKET, {[]{return true;}}),

From d3beac7337f1c62a666dfdde852795e25ec99f08 Mon Sep 17 00:00:00 2001
From: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Date: Fri, 19 Apr 2024 16:29:37 -0400
Subject: [PATCH 110/230] fix: gift from sages location access

---
 .../randomizer/3drando/location_access/locacc_castle_town.cpp    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
index ac4a8ef50..9527f5243 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
@@ -65,6 +65,7 @@ void AreaTable_Init_CastleTown() {
                 }, {
                   //Locations
                   LocationAccess(RC_TOT_MASTER_SWORD, {[]{return logic->IsAdult;}}),
+                  LocationAccess(RC_GIFT_FROM_SAGES, {[]{return logic->IsAdult;}}),
                   LocationAccess(RC_SHEIK_AT_TEMPLE, {[]{return logic->ForestMedallion && logic->IsAdult;}}),
                 }, {
                   //Exits

From 3b0548f585b4a4894157c3f7d63bdef786023a0e Mon Sep 17 00:00:00 2001
From: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Date: Fri, 19 Apr 2024 18:05:38 -0400
Subject: [PATCH 111/230] vb tower escape

---
 .../Enhancements/randomizer/option_descriptions.cpp   |  2 --
 soh/soh/Enhancements/randomizer/randomizerTypes.h     |  1 -
 soh/soh/Enhancements/randomizer/settings.cpp          |  4 ----
 soh/soh/Enhancements/timesaver_hook_handlers.cpp      | 11 ++++++++++-
 soh/soh/SohMenuBar.cpp                                | 10 ++++++++--
 soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c |  8 +-------
 6 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/option_descriptions.cpp b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
index e50846005..82228dbed 100644
--- a/soh/soh/Enhancements/randomizer/option_descriptions.cpp
+++ b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
@@ -438,8 +438,6 @@ void Settings::CreateOptionDescriptions() {
         "Start with Zelda's Letter and the item Impa would normally give you and skip the sequence up "
         "until after meeting Zelda. Disables the ability to shuffle Weird Egg.";
     mOptionDescriptions[RSK_SKIP_EPONA_RACE] = "Epona can be summoned with Epona's Song without needing to race Ingo.";
-    mOptionDescriptions[RSK_SKIP_TOWER_ESCAPE] =
-        "The tower escape sequence between Ganondorf and Ganon will be skipped.";
     mOptionDescriptions[RSK_COMPLETE_MASK_QUEST] =
         "Once the happy mask shop is opened, all masks will be available to be borrowed.";
     mOptionDescriptions[RSK_SKIP_SCARECROWS_SONG] =
diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h
index f1d368763..074849b00 100644
--- a/soh/soh/Enhancements/randomizer/randomizerTypes.h
+++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@@ -3598,7 +3598,6 @@ typedef enum {
     RSK_CUCCO_COUNT,
     RSK_BIG_POE_COUNT,
     RSK_SKIP_EPONA_RACE,
-    RSK_SKIP_TOWER_ESCAPE,
     RSK_COMPLETE_MASK_QUEST,
     RSK_SKIP_SCARECROWS_SONG,
     RSK_ENABLE_GLITCH_CUTSCENES,
diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
index ac947d4da..5edc219dd 100644
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -147,7 +147,6 @@ void Settings::CreateOptions() {
     mOptions[RSK_KEYRINGS_GANONS_CASTLE] = Option::Bool("Ganon's Castle", "gRandomizeShuffleKeyRingsGanonsCastle");
     mOptions[RSK_SKIP_CHILD_STEALTH] = Option::Bool("Skip Child Stealth", {"Don't Skip", "Skip"}, OptionCategory::Setting, "gRandomizeSkipChildStealth", mOptionDescriptions[RSK_SKIP_CHILD_STEALTH], WidgetType::Checkbox, RO_GENERIC_DONT_SKIP);
     mOptions[RSK_SKIP_CHILD_ZELDA] = Option::Bool("Skip Child Zelda", {"Don't Skip", "Skip"}, OptionCategory::Setting, "gRandomizeSkipChildZelda", mOptionDescriptions[RSK_SKIP_CHILD_ZELDA], WidgetType::Checkbox, RO_GENERIC_DONT_SKIP);
-    mOptions[RSK_SKIP_TOWER_ESCAPE] = Option::Bool("Skip Tower Escape", {"Don't Skip", "Skip"}, OptionCategory::Setting, "gRandomizeSkipTowerEscape", mOptionDescriptions[RSK_SKIP_TOWER_ESCAPE], WidgetType::Checkbox, RO_GENERIC_DONT_SKIP);
     mOptions[RSK_SKIP_EPONA_RACE] = Option::Bool("Skip Epona Race", {"Don't Skip", "Skip"}, OptionCategory::Setting, "gRandomizeSkipEponaRace", mOptionDescriptions[RSK_SKIP_EPONA_RACE], WidgetType::Checkbox, RO_GENERIC_DONT_SKIP);
     mOptions[RSK_SKIP_SCARECROWS_SONG] = Option::Bool("Skip Scarecrow's Song", "gRandomizeSkipScarecrowsSong", mOptionDescriptions[RSK_SKIP_SCARECROWS_SONG]);
     mOptions[RSK_BIG_POE_COUNT] = Option::U8("Big Poe Target Count", {NumOpts(1, 10)}, OptionCategory::Setting, "gRandomizeBigPoeTargetCount", mOptionDescriptions[RSK_BIG_POE_COUNT], WidgetType::Slider, 9);
@@ -716,7 +715,6 @@ void Settings::CreateOptions() {
         &mOptions[RSK_SKIP_CHILD_STEALTH],
         &mOptions[RSK_SKIP_CHILD_ZELDA],
         &mOptions[RSK_SKIP_EPONA_RACE],
-        &mOptions[RSK_SKIP_TOWER_ESCAPE],
         &mOptions[RSK_COMPLETE_MASK_QUEST],
         &mOptions[RSK_SKIP_SCARECROWS_SONG]
     }, false, WidgetContainerType::COLUMN);
@@ -1200,7 +1198,6 @@ void Settings::CreateOptions() {
         { "Timesaver Settings:Big Poe Target Count", RSK_BIG_POE_COUNT },
         { "Timesaver Settings:Skip Child Stealth", RSK_SKIP_CHILD_STEALTH },
         { "Timesaver Settings:Skip Epona Race", RSK_SKIP_EPONA_RACE },
-        { "Timesaver Settings:Skip Tower Escape", RSK_SKIP_TOWER_ESCAPE },
         { "Timesaver Settings:Complete Mask Quest", RSK_COMPLETE_MASK_QUEST },
         { "Timesaver Settings:Skip Scarecrow's Song", RSK_SKIP_SCARECROWS_SONG },
         { "Timesaver Settings:Enable Glitch-Useful Cutscenes", RSK_ENABLE_GLITCH_CUTSCENES },
@@ -2523,7 +2520,6 @@ void Settings::ParseJson(nlohmann::json spoilerFileJson) {
                 case RSK_SKIP_CHILD_ZELDA:
                 case RSK_SKIP_CHILD_STEALTH:
                 case RSK_SKIP_EPONA_RACE:
-                case RSK_SKIP_TOWER_ESCAPE:
                     if (it.value() == "Don't Skip") {
                         mOptions[index].SetSelectedIndex(RO_GENERIC_DONT_SKIP);
                     } else if (it.value() == "Skip") {
diff --git a/soh/soh/Enhancements/timesaver_hook_handlers.cpp b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
index 5d77515da..61a83b482 100644
--- a/soh/soh/Enhancements/timesaver_hook_handlers.cpp
+++ b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
@@ -136,7 +136,7 @@ void TimeSaverOnGameFrameUpdateHandler() {
 
 void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void* opt) {
     switch (id) {
-        case GI_VB_PLAY_TRANSITION_CS:
+        case GI_VB_PLAY_TRANSITION_CS: {
             if (CVarGetInteger("gTimeSavers.SkipCutscene.Intro", IS_RANDO) && gSaveContext.entranceIndex == ENTR_LINKS_HOUSE_0 && gSaveContext.cutsceneIndex == 0xFFF1) {
                 gSaveContext.cutsceneIndex = 0;
                 *should = false;
@@ -260,7 +260,16 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
                     *should = false;
                 }
             }
+
+            if (gSaveContext.entranceIndex == ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_0) {
+                if (CVarGetInteger("gTimeSavers.SkipTowerEscape", false) || IS_BOSS_RUSH) {
+                    Flags_SetEventChkInf(EVENTCHKINF_WATCHED_GANONS_CASTLE_COLLAPSE_CAUGHT_BY_GERUDO);
+                    gSaveContext.entranceIndex = ENTR_GANON_BOSS_0;
+                    *should = false;
+                }
+            }
             break;
+        }
         case GI_VB_PLAY_ENTRANCE_CS: {
             s32* entranceFlag = static_cast<s32*>(opt);
             if (CVarGetInteger("gTimeSavers.SkipCutscene.Entrances", IS_RANDO) && (*entranceFlag != EVENTCHKINF_EPONA_OBTAINED)) {
diff --git a/soh/soh/SohMenuBar.cpp b/soh/soh/SohMenuBar.cpp
index 95f59a14f..c11b88a62 100644
--- a/soh/soh/SohMenuBar.cpp
+++ b/soh/soh/SohMenuBar.cpp
@@ -586,7 +586,8 @@ void DrawEnhancementsMenu() {
                     CVarGetInteger("gTimeSavers.NoForcedDialog", IS_RANDO) &&
                     CVarGetInteger("gTimeSavers.SkipOwlInteractions", IS_RANDO) &&
                     CVarGetInteger("gTimeSavers.SkipMiscInteractions", IS_RANDO) &&
-                    CVarGetInteger("gTimeSavers.DisableTitleCard", IS_RANDO);
+                    CVarGetInteger("gTimeSavers.DisableTitleCard", IS_RANDO) &&
+                    CVarGetInteger("gTimeSavers.SkipTowerEscape", false);
                 bool someChecked =
                     CVarGetInteger("gTimeSavers.SkipCutscene.Intro", IS_RANDO) ||
                     CVarGetInteger("gTimeSavers.SkipCutscene.Entrances", IS_RANDO) ||
@@ -598,7 +599,8 @@ void DrawEnhancementsMenu() {
                     CVarGetInteger("gTimeSavers.NoForcedDialog", IS_RANDO) ||
                     CVarGetInteger("gTimeSavers.SkipOwlInteractions", IS_RANDO) ||
                     CVarGetInteger("gTimeSavers.SkipMiscInteractions", IS_RANDO) ||
-                    CVarGetInteger("gTimeSavers.DisableTitleCard", IS_RANDO);
+                    CVarGetInteger("gTimeSavers.DisableTitleCard", IS_RANDO) ||
+                    CVarGetInteger("gTimeSavers.SkipTowerEscape", false);
 
                 ImGuiContext* g = ImGui::GetCurrentContext();
                 ImGuiItemFlags backup_item_flags = g->CurrentItemFlags;
@@ -616,6 +618,7 @@ void DrawEnhancementsMenu() {
                         CVarSetInteger("gTimeSavers.SkipOwlInteractions", 1);
                         CVarSetInteger("gTimeSavers.SkipMiscInteractions", 1);
                         CVarSetInteger("gTimeSavers.DisableTitleCard", 1);
+                        CVarSetInteger("gTimeSavers.SkipTowerEscape", 1);
                     } else {
                         CVarSetInteger("gTimeSavers.SkipCutscene.Intro", 0);
                         CVarSetInteger("gTimeSavers.SkipCutscene.Entrances", 0);
@@ -628,6 +631,7 @@ void DrawEnhancementsMenu() {
                         CVarSetInteger("gTimeSavers.SkipOwlInteractions", 0);
                         CVarSetInteger("gTimeSavers.SkipMiscInteractions", 0);
                         CVarSetInteger("gTimeSavers.DisableTitleCard", 0);
+                        CVarSetInteger("gTimeSavers.SkipTowerEscape", 0);
                     }
                     LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
                 }
@@ -645,6 +649,8 @@ void DrawEnhancementsMenu() {
                 UIWidgets::PaddedEnhancementCheckbox("Skip Owl Interactions", "gTimeSavers.SkipOwlInteractions", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
                 UIWidgets::PaddedEnhancementCheckbox("Skip Misc Interactions", "gTimeSavers.SkipMiscInteractions", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
                 UIWidgets::PaddedEnhancementCheckbox("Disable Title Card", "gTimeSavers.DisableTitleCard", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
+                UIWidgets::PaddedEnhancementCheckbox("Skip Tower Escape", "gTimeSavers.SkipTowerEscape", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, false);
+                UIWidgets::Tooltip("Skip the tower escape sequence between Ganondorf and Ganon.");
 
                 UIWidgets::PaddedText("Skip Get Item Animations", true, false);
                 UIWidgets::EnhancementCombobox("gTimeSavers.SkipGetItemAnimation", skipGetItemAnimationOptions, SGIA_DISABLED);
diff --git a/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c b/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c
index b1c45feed..169794568 100644
--- a/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c
+++ b/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c
@@ -1539,13 +1539,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, PlayState* play) {
 
             if (this->csTimer == 180) {
                 play->transitionTrigger = TRANS_TRIGGER_START;
-                if ((IS_RANDO && Randomizer_GetSettingValue(RSK_SKIP_TOWER_ESCAPE) || IS_BOSS_RUSH)) {
-                    Flags_SetEventChkInf(EVENTCHKINF_WATCHED_GANONS_CASTLE_COLLAPSE_CAUGHT_BY_GERUDO);
-                    play->nextEntranceIndex = ENTR_GANON_BOSS_0;
-                }
-                else {
-                    play->nextEntranceIndex = ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_0;
-                }
+                play->nextEntranceIndex = ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_0;
                 play->transitionType = TRANS_TYPE_FADE_WHITE_FAST;
             }
             break;

From 14c7f0c3e1c2e02eb26cd1dcb7de94c5f5ff9061 Mon Sep 17 00:00:00 2001
From: Garrett Cox <garrettjcox@gmail.com>
Date: Sun, 21 Apr 2024 09:14:46 -0500
Subject: [PATCH 112/230] More time cutscene skip fixes

---
 .../game-interactor/GameInteractor.h          |  3 ++
 .../Enhancements/timesaver_hook_handlers.cpp  | 29 ++++++++++++++++---
 .../actors/ovl_Obj_Dekujr/z_obj_dekujr.c      |  3 +-
 3 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h
index 8dc20e215..fd5611df8 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h
@@ -83,6 +83,9 @@ typedef enum {
     // Opt: *EnMd
     // Vanilla condition: CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD)
     GI_VB_MIDO_CONSIDER_DEKU_TREE_DEAD,
+    // Opt: *ObjDekujr
+    // Vanilla condition: CHECK_QUEST_ITEM(QUEST_MEDALLION_FOREST)
+    GI_VB_DEKU_JR_CONSIDER_FOREST_TEMPLE_FINISHED,
     // Opt: *EnKo
     // Vanilla condition: CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD)
     GI_VB_OPEN_KOKIRI_FOREST,
diff --git a/soh/soh/Enhancements/timesaver_hook_handlers.cpp b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
index 61a83b482..b920419bb 100644
--- a/soh/soh/Enhancements/timesaver_hook_handlers.cpp
+++ b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
@@ -155,6 +155,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
                 if ((gSaveContext.entranceIndex == ENTR_DESERT_COLOSSUS_1) && !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_REQUIEM_OF_SPIRIT)) {
                     Flags_SetEventChkInf(EVENTCHKINF_LEARNED_REQUIEM_OF_SPIRIT);
                     // Normally happens in the cutscene
+                    gSaveContext.dayTime = gSaveContext.skyboxTime = 0xAC60;
                     if (GameInteractor_Should(GI_VB_GIVE_ITEM_REQUIEM_OF_SPIRIT, true, NULL)) {
                         Item_Give(gPlayState, ITEM_SONG_REQUIEM);
                     }
@@ -183,8 +184,6 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
                 uint8_t isBlueWarp = 0;
                 // Deku Tree Blue warp
                 if (gSaveContext.entranceIndex == ENTR_KOKIRI_FOREST_0 && gSaveContext.cutsceneIndex == 0xFFF1) {
-                    gSaveContext.dayTime = gSaveContext.skyboxTime = 0x8000;
-
                     gSaveContext.entranceIndex = ENTR_KOKIRI_FOREST_11;
                     isBlueWarp = 1;
                 // Dodongo's Cavern Blue warp
@@ -199,9 +198,13 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
                 } else if (gSaveContext.entranceIndex == ENTR_CHAMBER_OF_THE_SAGES_0 && gSaveContext.cutsceneIndex == 0x0 && gSaveContext.chamberCutsceneNum == CHAMBER_CS_FOREST) {
                     // Normally set in the blue warp cutscene
                     Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_DEKU_TREE_SPROUT);
-                    gSaveContext.dayTime = gSaveContext.skyboxTime = 0x8000;
 
-                    gSaveContext.entranceIndex = ENTR_SACRED_FOREST_MEADOW_3;
+                    if (IS_RANDO) {
+                        gSaveContext.entranceIndex = ENTR_SACRED_FOREST_MEADOW_3;
+                    } else {
+                        gSaveContext.entranceIndex = ENTR_KOKIRI_FOREST_12;
+                    }
+
                     isBlueWarp = 1;
                 // Fire Temple Blue warp
                 } else if (gSaveContext.entranceIndex == ENTR_KAKARIKO_VILLAGE_0 && gSaveContext.cutsceneIndex == 0xFFF3) {
@@ -209,6 +212,9 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
                     isBlueWarp = 1;
                 // Water Temple Blue warp
                 } else if (gSaveContext.entranceIndex == ENTR_CHAMBER_OF_THE_SAGES_0 && gSaveContext.cutsceneIndex == 0x0 && gSaveContext.chamberCutsceneNum == CHAMBER_CS_WATER) {
+                    // Normally set in the blue warp cutscene
+                    gSaveContext.dayTime = gSaveContext.skyboxTime = 0x4800;
+
                     gSaveContext.entranceIndex = ENTR_LAKE_HYLIA_9;
                     isBlueWarp = 1;
                 // Spirit Temple Blue warp
@@ -222,6 +228,9 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
                 }
 
                 if (isBlueWarp) {
+                    // Normally set in the blue warp cutscene
+                    gSaveContext.dayTime = gSaveContext.skyboxTime = 0x8000;
+
                     *should = false;
                     gSaveContext.cutsceneIndex = 0;
 
@@ -232,6 +241,9 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
 
                 // Flee hyrule castle cutscene
                 if (gSaveContext.entranceIndex == ENTR_HYRULE_FIELD_0 && gSaveContext.cutsceneIndex == 0xFFF1) {
+                    // Normally set in the blue warp cutscene
+                    gSaveContext.dayTime = gSaveContext.skyboxTime = 0x4AAA;
+
                     gSaveContext.cutsceneIndex = 0;
                     *should = false;
                 }
@@ -420,6 +432,14 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             }
             break;
         }
+        case GI_VB_DEKU_JR_CONSIDER_FOREST_TEMPLE_FINISHED: {
+            // We're overriding this so that the Deku JR doesn't despawn after skipping the forest temple blue warp cutscene.
+            // It typically relies on the forest medallion being obtained, but that isn't given yet until after scene init
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.Story", IS_RANDO)) {
+                *should = Flags_GetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP);
+            }
+            break;
+        }
         case GI_VB_GIVE_ITEM_FROM_BLUE_WARP:
         case GI_VB_PLAY_SHIEK_BLOCK_MASTER_SWORD_CS:
         case GI_VB_GIVE_ITEM_FAIRY_OCARINA:
@@ -514,6 +534,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
                             } else {
                                 gPlayState->nextEntranceIndex = ENTR_HYRULE_FIELD_17;
                             }
+                            gSaveContext.dayTime = gSaveContext.skyboxTime = 0x8000;
                             gPlayState->transitionType = TRANS_TYPE_FADE_WHITE;
                             gPlayState->transitionTrigger = TRANS_TRIGGER_START;
                             gSaveContext.nextTransitionType = 2;
diff --git a/soh/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c b/soh/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c
index ae9545825..9463d45af 100644
--- a/soh/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c
+++ b/soh/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c
@@ -6,6 +6,7 @@
 
 #include "z_obj_dekujr.h"
 #include "objects/object_dekujr/object_dekujr.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY)
 
@@ -56,7 +57,7 @@ void ObjDekujr_Init(Actor* thisx, PlayState* play) {
         this->unk_19C = 0;
         this->unk_19B = 1;
     }
-    if (!CHECK_QUEST_ITEM(QUEST_MEDALLION_FOREST)) {
+    if (!GameInteractor_Should(GI_VB_DEKU_JR_CONSIDER_FOREST_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FOREST), this)) {
         Actor_Kill(thisx);
     } else {
         ActorShape_Init(&thisx->shape, 0.0f, NULL, 0.0f);

From 5813b37415d3eb37aa7d4cdbd431ce7067ddfba2 Mon Sep 17 00:00:00 2001
From: Garrett Cox <garrettjcox@gmail.com>
Date: Sun, 21 Apr 2024 09:38:53 -0500
Subject: [PATCH 113/230] Migrate child stealth

---
 .../Enhancements/timesaver_hook_handlers.cpp   |  7 +++++++
 soh/soh/SohMenuBar.cpp                         | 18 ++++++------------
 soh/src/code/z_play.c                          | 12 ------------
 3 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/soh/soh/Enhancements/timesaver_hook_handlers.cpp b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
index b920419bb..700e55e18 100644
--- a/soh/soh/Enhancements/timesaver_hook_handlers.cpp
+++ b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
@@ -280,6 +280,13 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
                     *should = false;
                 }
             }
+
+            if (gSaveContext.entranceIndex == ENTR_CASTLE_COURTYARD_GUARDS_DAY_0) {
+                if (CVarGetInteger("gTimeSavers.SkipChildStealth", false)) {
+                    gSaveContext.entranceIndex = ENTR_CASTLE_COURTYARD_ZELDA_0;
+                    *should = false;
+                }
+            }
             break;
         }
         case GI_VB_PLAY_ENTRANCE_CS: {
diff --git a/soh/soh/SohMenuBar.cpp b/soh/soh/SohMenuBar.cpp
index c11b88a62..3821f9df4 100644
--- a/soh/soh/SohMenuBar.cpp
+++ b/soh/soh/SohMenuBar.cpp
@@ -581,26 +581,22 @@ void DrawEnhancementsMenu() {
                     CVarGetInteger("gTimeSavers.SkipCutscene.Story", IS_RANDO) &&
                     CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", IS_RANDO) &&
                     CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", IS_RANDO) &&
-                    CVarGetInteger("gTimeSavers.SkipCutscene.GlitchAiding", 0) &&
                     CVarGetInteger("gTimeSavers.SkipCutscene.OnePoint", IS_RANDO) &&
                     CVarGetInteger("gTimeSavers.NoForcedDialog", IS_RANDO) &&
                     CVarGetInteger("gTimeSavers.SkipOwlInteractions", IS_RANDO) &&
                     CVarGetInteger("gTimeSavers.SkipMiscInteractions", IS_RANDO) &&
-                    CVarGetInteger("gTimeSavers.DisableTitleCard", IS_RANDO) &&
-                    CVarGetInteger("gTimeSavers.SkipTowerEscape", false);
+                    CVarGetInteger("gTimeSavers.DisableTitleCard", IS_RANDO);
                 bool someChecked =
                     CVarGetInteger("gTimeSavers.SkipCutscene.Intro", IS_RANDO) ||
                     CVarGetInteger("gTimeSavers.SkipCutscene.Entrances", IS_RANDO) ||
                     CVarGetInteger("gTimeSavers.SkipCutscene.Story", IS_RANDO) ||
                     CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", IS_RANDO) ||
                     CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", IS_RANDO) ||
-                    CVarGetInteger("gTimeSavers.SkipCutscene.GlitchAiding", 0) ||
                     CVarGetInteger("gTimeSavers.SkipCutscene.OnePoint", IS_RANDO) ||
                     CVarGetInteger("gTimeSavers.NoForcedDialog", IS_RANDO) ||
                     CVarGetInteger("gTimeSavers.SkipOwlInteractions", IS_RANDO) ||
                     CVarGetInteger("gTimeSavers.SkipMiscInteractions", IS_RANDO) ||
-                    CVarGetInteger("gTimeSavers.DisableTitleCard", IS_RANDO) ||
-                    CVarGetInteger("gTimeSavers.SkipTowerEscape", false);
+                    CVarGetInteger("gTimeSavers.DisableTitleCard", IS_RANDO);
 
                 ImGuiContext* g = ImGui::GetCurrentContext();
                 ImGuiItemFlags backup_item_flags = g->CurrentItemFlags;
@@ -612,26 +608,22 @@ void DrawEnhancementsMenu() {
                         CVarSetInteger("gTimeSavers.SkipCutscene.Story", 1);
                         CVarSetInteger("gTimeSavers.SkipCutscene.LearnSong", 1);
                         CVarSetInteger("gTimeSavers.SkipCutscene.BossIntro", 1);
-                        CVarSetInteger("gTimeSavers.SkipCutscene.GlitchAiding", 1);
                         CVarSetInteger("gTimeSavers.SkipCutscene.OnePoint", 1);
                         CVarSetInteger("gTimeSavers.NoForcedDialog", 1);
                         CVarSetInteger("gTimeSavers.SkipOwlInteractions", 1);
                         CVarSetInteger("gTimeSavers.SkipMiscInteractions", 1);
                         CVarSetInteger("gTimeSavers.DisableTitleCard", 1);
-                        CVarSetInteger("gTimeSavers.SkipTowerEscape", 1);
                     } else {
                         CVarSetInteger("gTimeSavers.SkipCutscene.Intro", 0);
                         CVarSetInteger("gTimeSavers.SkipCutscene.Entrances", 0);
                         CVarSetInteger("gTimeSavers.SkipCutscene.Story", 0);
                         CVarSetInteger("gTimeSavers.SkipCutscene.LearnSong", 0);
                         CVarSetInteger("gTimeSavers.SkipCutscene.BossIntro", 0);
-                        CVarSetInteger("gTimeSavers.SkipCutscene.GlitchAiding", 0);
                         CVarSetInteger("gTimeSavers.SkipCutscene.OnePoint", 0);
                         CVarSetInteger("gTimeSavers.NoForcedDialog", 0);
                         CVarSetInteger("gTimeSavers.SkipOwlInteractions", 0);
                         CVarSetInteger("gTimeSavers.SkipMiscInteractions", 0);
                         CVarSetInteger("gTimeSavers.DisableTitleCard", 0);
-                        CVarSetInteger("gTimeSavers.SkipTowerEscape", 0);
                     }
                     LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
                 }
@@ -641,14 +633,16 @@ void DrawEnhancementsMenu() {
                 UIWidgets::PaddedEnhancementCheckbox("Skip Story Cutscenes", "gTimeSavers.SkipCutscene.Story", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
                 UIWidgets::PaddedEnhancementCheckbox("Skip Song Cutscenes", "gTimeSavers.SkipCutscene.LearnSong", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
                 UIWidgets::PaddedEnhancementCheckbox("Skip Boss Introductions", "gTimeSavers.SkipCutscene.BossIntro", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
-                UIWidgets::PaddedEnhancementCheckbox("Skip Glitch-Aiding Cutscenes", "gTimeSavers.SkipCutscene.GlitchAiding", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, 0);
-                UIWidgets::Tooltip("Skip cutscenes that are associated with useful glitches, currently this is only the Fire Temple Darunia CS and Forest Temple Poe Sisters CS");
                 UIWidgets::PaddedEnhancementCheckbox("Skip One Point Cutscenes (Chests, Door Unlocks, etc)", "gTimeSavers.SkipCutscene.OnePoint", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
                 UIWidgets::PaddedEnhancementCheckbox("No Forced Dialog", "gTimeSavers.NoForcedDialog", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
                 UIWidgets::Tooltip("Prevent forced conversations with Navi or other NPCs");
                 UIWidgets::PaddedEnhancementCheckbox("Skip Owl Interactions", "gTimeSavers.SkipOwlInteractions", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
                 UIWidgets::PaddedEnhancementCheckbox("Skip Misc Interactions", "gTimeSavers.SkipMiscInteractions", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
                 UIWidgets::PaddedEnhancementCheckbox("Disable Title Card", "gTimeSavers.DisableTitleCard", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
+                UIWidgets::PaddedEnhancementCheckbox("Skip Glitch-Aiding Cutscenes", "gTimeSavers.SkipCutscene.GlitchAiding", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, 0);
+                UIWidgets::Tooltip("Skip cutscenes that are associated with useful glitches, currently this is only the Fire Temple Darunia CS and Forest Temple Poe Sisters CS");
+                UIWidgets::PaddedEnhancementCheckbox("Skip Child Stealth", "gTimeSavers.SkipChildStealth", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, false);
+                UIWidgets::Tooltip("The crawlspace into Hyrule Castle goes straight to Zelda, skipping the guards.");
                 UIWidgets::PaddedEnhancementCheckbox("Skip Tower Escape", "gTimeSavers.SkipTowerEscape", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, false);
                 UIWidgets::Tooltip("Skip the tower escape sequence between Ganondorf and Ganon.");
 
diff --git a/soh/src/code/z_play.c b/soh/src/code/z_play.c
index 3ce5eeefc..43d30f54b 100644
--- a/soh/src/code/z_play.c
+++ b/soh/src/code/z_play.c
@@ -363,18 +363,6 @@ void Play_Init(GameState* thisx) {
     u8 tempSetupIndex;
     s32 pad[2];
 
-    // Skip Child Stealth when option is enabled, Zelda's Letter isn't obtained and Impa's reward hasn't been received
-    // eventChkInf[4] & 1 = Got Zelda's Letter
-    // eventChkInf[5] & 0x200 = Got Impa's reward
-    // entranceIndex 0x7A, ENTR_CASTLE_COURTYARD_GUARDS_DAY_0, Castle Courtyard - Day from crawlspace
-    // entranceIndex 0x400, ENTR_CASTLE_COURTYARD_ZELDA_0, Zelda's Courtyard
-    if (IS_RANDO && Randomizer_GetSettingValue(RSK_SKIP_CHILD_STEALTH) &&
-        !Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_ZELDAS_LETTER) && !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_ZELDAS_LULLABY)) {
-        if (gSaveContext.entranceIndex == ENTR_CASTLE_COURTYARD_GUARDS_DAY_0) {
-            gSaveContext.entranceIndex = ENTR_CASTLE_COURTYARD_ZELDA_0;
-        }
-    }
-
     // Properly initialize the frame counter so it doesn't use garbage data
     if (!firstInit) {
         play->gameplayFrames = 0;

From a554c1550dd63f66caddaed44e5b1edc4b4d8685 Mon Sep 17 00:00:00 2001
From: Garrett Cox <garrettjcox@gmail.com>
Date: Sun, 21 Apr 2024 18:53:15 -0500
Subject: [PATCH 114/230] Fix shadow & spirit rewards, remove remaning usage of
 duplicate dungeon done flags

---
 soh/soh/Enhancements/boss-rush/BossRush.cpp   | 36 +++++++++----------
 .../Enhancements/debugger/debugSaveEditor.h   |  6 ----
 soh/soh/Enhancements/presets.h                |  2 ++
 .../Enhancements/randomizer/hook_handlers.cpp | 11 +++++-
 .../Enhancements/randomizer/location_list.cpp | 12 +++----
 .../Enhancements/randomizer/randomizer_inf.h  |  6 ----
 soh/src/code/z_map_exp.c                      |  2 +-
 soh/src/code/z_play.c                         | 12 +++----
 .../z_bg_spot06_objects.c                     |  8 ++---
 .../overlays/actors/ovl_En_Ossan/z_en_ossan.c |  2 +-
 10 files changed, 48 insertions(+), 49 deletions(-)

diff --git a/soh/soh/Enhancements/boss-rush/BossRush.cpp b/soh/soh/Enhancements/boss-rush/BossRush.cpp
index 63414f88c..9dbbad527 100644
--- a/soh/soh/Enhancements/boss-rush/BossRush.cpp
+++ b/soh/soh/Enhancements/boss-rush/BossRush.cpp
@@ -129,15 +129,15 @@ void BossRush_SpawnBlueWarps(PlayState* play) {
     // Spawn blue warps in Chamber of Sages based on what bosses have been defeated.
     if (gSaveContext.linkAge == LINK_AGE_CHILD) {
         // Forest Medallion (Gohma)
-        if (!Flags_GetRandomizerInf(RAND_INF_DUNGEONS_DONE_DEKU_TREE)) {
+        if (!Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP)) {
             Actor_Spawn(&play->actorCtx, play, ACTOR_DOOR_WARP1, -100, 6, -170, 0, 0, 0, -1, false);
         }
         // Fire Medallion (King Dodongo)
-        if (!Flags_GetRandomizerInf(RAND_INF_DUNGEONS_DONE_DODONGOS_CAVERN)) {
+        if (!Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP)) {
             Actor_Spawn(&play->actorCtx, play, ACTOR_DOOR_WARP1, 100, 6, -170, 0, 0, 0, -1, false);
         }
         // Water Medallion (Barinade)
-        if (!Flags_GetRandomizerInf(RAND_INF_DUNGEONS_DONE_JABU_JABUS_BELLY)) {
+        if (!Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
             Actor_Spawn(&play->actorCtx, play, ACTOR_DOOR_WARP1, 199, 6, 0, 0, 0, 0, -1, false);
         }
     } else {
@@ -146,15 +146,15 @@ void BossRush_SpawnBlueWarps(PlayState* play) {
             Actor_Spawn(&play->actorCtx, play, ACTOR_DOOR_WARP1, -199, 6, 0, 0, 0, 0, -1, false);
         }
         // Forest Medallion (Phantom Ganondorf)
-        if (!Flags_GetRandomizerInf(RAND_INF_DUNGEONS_DONE_FOREST_TEMPLE)) {
+        if (!Flags_GetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP)) {
             Actor_Spawn(&play->actorCtx, play, ACTOR_DOOR_WARP1, -100, 6, -170, 0, 0, 0, -1, false);
         }
         // Fire Medallion (Volvagia)
-        if (!Flags_GetRandomizerInf(RAND_INF_DUNGEONS_DONE_FIRE_TEMPLE)) {
+        if (!Flags_GetEventChkInf(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP)) {
             Actor_Spawn(&play->actorCtx, play, ACTOR_DOOR_WARP1, 100, 6, -170, 0, 0, 0, -1, false);
         }
         // Water Medallion (Morpha)
-        if (!Flags_GetRandomizerInf(RAND_INF_DUNGEONS_DONE_WATER_TEMPLE)) {
+        if (!Flags_GetEventChkInf(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP)) {
             Actor_Spawn(&play->actorCtx, play, ACTOR_DOOR_WARP1, 199, 6, 0, 0, 0, 0, -1, false);
         }
         // Spirit Medallion (Twinrova)
@@ -242,22 +242,22 @@ void BossRush_HandleCompleteBoss(PlayState* play) {
     gSaveContext.isBossRushPaused = 1;
     switch (play->sceneNum) {
         case SCENE_DEKU_TREE_BOSS:
-            Flags_SetRandomizerInf(RAND_INF_DUNGEONS_DONE_DEKU_TREE);
+            Flags_SetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP);
             break;
         case SCENE_DODONGOS_CAVERN_BOSS:
-            Flags_SetRandomizerInf(RAND_INF_DUNGEONS_DONE_DODONGOS_CAVERN);
+            Flags_SetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP);
             break;
         case SCENE_JABU_JABU_BOSS:
-            Flags_SetRandomizerInf(RAND_INF_DUNGEONS_DONE_JABU_JABUS_BELLY);
+            Flags_SetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP);
             break;
         case SCENE_FOREST_TEMPLE_BOSS:
-            Flags_SetRandomizerInf(RAND_INF_DUNGEONS_DONE_FOREST_TEMPLE);
+            Flags_SetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP);
             break;
         case SCENE_FIRE_TEMPLE_BOSS:
-            Flags_SetRandomizerInf(RAND_INF_DUNGEONS_DONE_FIRE_TEMPLE);
+            Flags_SetEventChkInf(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP);
             break;
         case SCENE_WATER_TEMPLE_BOSS:
-            Flags_SetRandomizerInf(RAND_INF_DUNGEONS_DONE_WATER_TEMPLE);
+            Flags_SetEventChkInf(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP);
             break;
         case SCENE_SPIRIT_TEMPLE_BOSS:
             Flags_SetRandomizerInf(RAND_INF_DUNGEONS_DONE_SPIRIT_TEMPLE);
@@ -432,13 +432,13 @@ void BossRush_InitSave() {
     // Set flags and Link's age based on chosen settings.
     if (gSaveContext.bossRushOptions[BR_OPTIONS_BOSSES] == BR_CHOICE_BOSSES_ADULT ||
         gSaveContext.bossRushOptions[BR_OPTIONS_BOSSES] == BR_CHOICE_BOSSES_GANONDORF_GANON) {
-        Flags_SetRandomizerInf(RAND_INF_DUNGEONS_DONE_DEKU_TREE);
-        Flags_SetRandomizerInf(RAND_INF_DUNGEONS_DONE_DODONGOS_CAVERN);
-        Flags_SetRandomizerInf(RAND_INF_DUNGEONS_DONE_JABU_JABUS_BELLY);
+        Flags_SetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP);
+        Flags_SetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP);
+        Flags_SetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP);
         if (gSaveContext.bossRushOptions[BR_OPTIONS_BOSSES] == BR_CHOICE_BOSSES_GANONDORF_GANON) {
-            Flags_SetRandomizerInf(RAND_INF_DUNGEONS_DONE_FOREST_TEMPLE);
-            Flags_SetRandomizerInf(RAND_INF_DUNGEONS_DONE_FIRE_TEMPLE);
-            Flags_SetRandomizerInf(RAND_INF_DUNGEONS_DONE_WATER_TEMPLE);
+            Flags_SetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP);
+            Flags_SetEventChkInf(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP);
+            Flags_SetEventChkInf(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP);
             Flags_SetRandomizerInf(RAND_INF_DUNGEONS_DONE_SPIRIT_TEMPLE);
             Flags_SetRandomizerInf(RAND_INF_DUNGEONS_DONE_SHADOW_TEMPLE);
         }
diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.h b/soh/soh/Enhancements/debugger/debugSaveEditor.h
index 047df95f8..53cd4b7ae 100644
--- a/soh/soh/Enhancements/debugger/debugSaveEditor.h
+++ b/soh/soh/Enhancements/debugger/debugSaveEditor.h
@@ -349,12 +349,6 @@ const std::vector<FlagTable> flagTables = {
         { 0x30, "Entered the Market" },
     } },
     { "Randomizer Inf Flags", RANDOMIZER_INF, 16, {
-        { RAND_INF_DUNGEONS_DONE_DEKU_TREE, "DUNGEONS_DONE_DEKU_TREE" },
-        { RAND_INF_DUNGEONS_DONE_DODONGOS_CAVERN, "DUNGEONS_DONE_DODONGOS_CAVERN" },
-        { RAND_INF_DUNGEONS_DONE_JABU_JABUS_BELLY, "DUNGEONS_DONE_JABU_JABUS_BELLY" },
-        { RAND_INF_DUNGEONS_DONE_FOREST_TEMPLE, "DUNGEONS_DONE_FOREST_TEMPLE" },
-        { RAND_INF_DUNGEONS_DONE_FIRE_TEMPLE, "DUNGEONS_DONE_FIRE_TEMPLE" },
-        { RAND_INF_DUNGEONS_DONE_WATER_TEMPLE, "DUNGEONS_DONE_WATER_TEMPLE" },
         { RAND_INF_DUNGEONS_DONE_SPIRIT_TEMPLE, "DUNGEONS_DONE_SPIRIT_TEMPLE" },
         { RAND_INF_DUNGEONS_DONE_SHADOW_TEMPLE, "DUNGEONS_DONE_SHADOW_TEMPLE" },
 
diff --git a/soh/soh/Enhancements/presets.h b/soh/soh/Enhancements/presets.h
index 3cce3dd74..83cf25bd9 100644
--- a/soh/soh/Enhancements/presets.h
+++ b/soh/soh/Enhancements/presets.h
@@ -292,6 +292,8 @@ const std::vector<const char*> enhancementsCvars = {
     "gTimeSavers.SkipMiscInteractions",
     "gTimeSavers.DisableTitleCard",
     "gTimeSavers.SkipGetItemAnimation",
+    "gTimeSavers.SkipChildStealth",
+    "gTimeSavers.SkipTowerEscape",
 };
 
 const std::vector<const char*> cheatCvars = {
diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index a2fe8697e..42dabae88 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -642,7 +642,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             if (!Flags_GetEventChkInf(EVENTCHKINF_KING_ZORA_MOVED)) {
                 GET_PLAYER(gPlayState)->exchangeItemId = EXCH_ITEM_LETTER_RUTO;
             }
-            *should = Flags_GetRandomizerInf(RAND_INF_DUNGEONS_DONE_JABU_JABUS_BELLY);
+            *should = Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP);
             break;
         }
         case GI_VB_BE_ABLE_TO_EXCHANGE_RUTOS_LETTER: {
@@ -1053,6 +1053,15 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             *should = MeetsRainbowBridgeRequirements();
             break;
         }
+        case GI_VB_PLAY_BLUE_WARP_CS: {
+            // We need to override just these two temples because they check medallions instead of flags
+            if (gPlayState->sceneNum == SCENE_SPIRIT_TEMPLE_BOSS) {
+                *should = !Flags_GetRandomizerInf(RAND_INF_DUNGEONS_DONE_SPIRIT_TEMPLE);
+            } else if (gPlayState->sceneNum == SCENE_SHADOW_TEMPLE_BOSS) {
+                *should = !Flags_GetRandomizerInf(RAND_INF_DUNGEONS_DONE_SHADOW_TEMPLE);
+            }
+            break;
+        }
         case GI_VB_TRADE_TIMER_ODD_MUSHROOM:
         case GI_VB_TRADE_TIMER_EYEDROPS:
         case GI_VB_TRADE_TIMER_FROG:
diff --git a/soh/soh/Enhancements/randomizer/location_list.cpp b/soh/soh/Enhancements/randomizer/location_list.cpp
index 1dfa2f5e4..fbe80d638 100644
--- a/soh/soh/Enhancements/randomizer/location_list.cpp
+++ b/soh/soh/Enhancements/randomizer/location_list.cpp
@@ -1282,12 +1282,12 @@ void Rando::StaticData::InitLocationTable() { //
 
     // Bosses
     locationTable[RC_LINKS_POCKET] =                                                 Location::Reward(RC_LINKS_POCKET,                                                 RCQUEST_BOTH,    RCTYPE_LINKS_POCKET,                RCAREA_KOKIRI_FOREST,                ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x00, "Link's Pocket",                               "Link's Pocket",                                            RHT_LINKS_POCKET,                                                RG_NONE,                              {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LINKS_POCKET),                                                                 SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST,              true);
-    locationTable[RC_QUEEN_GOHMA] =                                                  Location::Reward(RC_QUEEN_GOHMA,                                                  RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_DEKU_TREE,                    ACTOR_DOOR_WARP1,     SCENE_DEKU_TREE_BOSS,               0x00,                      DungeonId::DUNGEON_DEKU_TREE, "Queen Gohma",                                 "Queen Gohma",                                              RHT_QUEEN_GOHMA,                                                 RG_KOKIRI_EMERALD,                    {},                                                     SpoilerCollectionCheck::EventChkInf(0x07),                                                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE,          true);
-    locationTable[RC_KING_DODONGO] =                                                 Location::Reward(RC_KING_DODONGO,                                                 RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_DODONGOS_CAVERN,              ACTOR_DOOR_WARP1,     SCENE_DODONGOS_CAVERN_BOSS,         0x00,                DungeonId::DUNGEON_DODONGOS_CAVERN, "King Dodongo",                                "King Dodongo",                                             RHT_KING_DODONGO,                                                RG_GORON_RUBY,                        {},                                                     SpoilerCollectionCheck::EventChkInf(0x25),                                                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN,    true);
-    locationTable[RC_BARINADE] =                                                     Location::Reward(RC_BARINADE,                                                     RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_JABU_JABUS_BELLY,             ACTOR_DOOR_WARP1,     SCENE_JABU_JABU_BOSS,               0x00,                DungeonId::DUNGEON_JABUJABUS_BELLY, "Barinade",                                    "Barinade",                                                 RHT_BARINADE,                                                    RG_ZORA_SAPPHIRE,                     {},                                                     SpoilerCollectionCheck::EventChkInf(0x37),                                                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY,    true);
-    locationTable[RC_PHANTOM_GANON] =                                                Location::Reward(RC_PHANTOM_GANON,                                                RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_FOREST_TEMPLE,                ACTOR_DOOR_WARP1,     SCENE_FOREST_TEMPLE_BOSS,           0x00,                  DungeonId::DUNGEON_FOREST_TEMPLE, "Phantom Ganon",                               "Phantom Ganon",                                            RHT_PHANTOM_GANON,                                               RG_FOREST_MEDALLION,                  {},                                                     SpoilerCollectionCheck::EventChkInf(0x48),                                                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
-    locationTable[RC_VOLVAGIA] =                                                     Location::Reward(RC_VOLVAGIA,                                                     RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_FIRE_TEMPLE,                  ACTOR_DOOR_WARP1,     SCENE_FIRE_TEMPLE_BOSS,             0x00,                    DungeonId::DUNGEON_FIRE_TEMPLE, "Volvagia",                                    "Volvagia",                                                 RHT_VOLVAGIA,                                                    RG_FIRE_MEDALLION,                    {},                                                     SpoilerCollectionCheck::EventChkInf(0x49),                                                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
-    locationTable[RC_MORPHA] =                                                       Location::Reward(RC_MORPHA,                                                       RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_WATER_TEMPLE,                 ACTOR_DOOR_WARP1,     SCENE_WATER_TEMPLE_BOSS,            0x00,                   DungeonId::DUNGEON_WATER_TEMPLE, "Morpha",                                      "Morpha",                                                   RHT_MORPHA,                                                      RG_WATER_MEDALLION,                   {},                                                     SpoilerCollectionCheck::EventChkInf(0x4A),                                                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
+    locationTable[RC_QUEEN_GOHMA] =                                                  Location::Reward(RC_QUEEN_GOHMA,                                                  RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_DEKU_TREE,                    ACTOR_DOOR_WARP1,     SCENE_DEKU_TREE_BOSS,               0x00,                      DungeonId::DUNGEON_DEKU_TREE, "Queen Gohma",                                 "Queen Gohma",                                              RHT_QUEEN_GOHMA,                                                 RG_KOKIRI_EMERALD,                    {},                                                     SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP),                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE,          true);
+    locationTable[RC_KING_DODONGO] =                                                 Location::Reward(RC_KING_DODONGO,                                                 RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_DODONGOS_CAVERN,              ACTOR_DOOR_WARP1,     SCENE_DODONGOS_CAVERN_BOSS,         0x00,                DungeonId::DUNGEON_DODONGOS_CAVERN, "King Dodongo",                                "King Dodongo",                                             RHT_KING_DODONGO,                                                RG_GORON_RUBY,                        {},                                                     SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP),                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN,    true);
+    locationTable[RC_BARINADE] =                                                     Location::Reward(RC_BARINADE,                                                     RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_JABU_JABUS_BELLY,             ACTOR_DOOR_WARP1,     SCENE_JABU_JABU_BOSS,               0x00,                DungeonId::DUNGEON_JABUJABUS_BELLY, "Barinade",                                    "Barinade",                                                 RHT_BARINADE,                                                    RG_ZORA_SAPPHIRE,                     {},                                                     SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP),                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY,    true);
+    locationTable[RC_PHANTOM_GANON] =                                                Location::Reward(RC_PHANTOM_GANON,                                                RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_FOREST_TEMPLE,                ACTOR_DOOR_WARP1,     SCENE_FOREST_TEMPLE_BOSS,           0x00,                  DungeonId::DUNGEON_FOREST_TEMPLE, "Phantom Ganon",                               "Phantom Ganon",                                            RHT_PHANTOM_GANON,                                               RG_FOREST_MEDALLION,                  {},                                                     SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP),                                                SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
+    locationTable[RC_VOLVAGIA] =                                                     Location::Reward(RC_VOLVAGIA,                                                     RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_FIRE_TEMPLE,                  ACTOR_DOOR_WARP1,     SCENE_FIRE_TEMPLE_BOSS,             0x00,                    DungeonId::DUNGEON_FIRE_TEMPLE, "Volvagia",                                    "Volvagia",                                                 RHT_VOLVAGIA,                                                    RG_FIRE_MEDALLION,                    {},                                                     SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP),                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_MORPHA] =                                                       Location::Reward(RC_MORPHA,                                                       RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_WATER_TEMPLE,                 ACTOR_DOOR_WARP1,     SCENE_WATER_TEMPLE_BOSS,            0x00,                   DungeonId::DUNGEON_WATER_TEMPLE, "Morpha",                                      "Morpha",                                                   RHT_MORPHA,                                                      RG_WATER_MEDALLION,                   {},                                                     SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP),                                                 SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
     locationTable[RC_TWINROVA] =                                                     Location::Reward(RC_TWINROVA,                                                     RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_SPIRIT_TEMPLE,                ACTOR_DOOR_WARP1,     SCENE_SPIRIT_TEMPLE_BOSS,           0x00,                  DungeonId::DUNGEON_SPIRIT_TEMPLE, "Twinrova",                                    "Twinrova",                                                 RHT_TWINROVA,                                                    RG_SPIRIT_MEDALLION,                  {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DUNGEONS_DONE_SPIRIT_TEMPLE),                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
     locationTable[RC_BONGO_BONGO] =                                                  Location::Reward(RC_BONGO_BONGO,                                                  RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_SHADOW_TEMPLE,                ACTOR_DOOR_WARP1,     SCENE_SHADOW_TEMPLE_BOSS,           0x00,                  DungeonId::DUNGEON_SHADOW_TEMPLE, "Bongo Bongo",                                 "Bongo Bongo",                                              RHT_BONGO_BONGO,                                                 RG_SHADOW_MEDALLION,                  {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DUNGEONS_DONE_SHADOW_TEMPLE),                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
     locationTable[RC_GANON] =                                                        Location::Reward(RC_GANON,                                                        RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_GANONS_CASTLE,                ACTOR_DOOR_WARP1,     SCENE_GANON_BOSS,                   0x00,        DungeonId::DUNGEON_GANONS_CASTLE_CRUMBLING, "Ganon",                                       "Ganon",                                                    RHT_NONE,                                                        RG_TRIFORCE,                          {},                                                     SpoilerCollectionCheck::None(),                                                                                               SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
diff --git a/soh/soh/Enhancements/randomizer/randomizer_inf.h b/soh/soh/Enhancements/randomizer/randomizer_inf.h
index 8bd2cc7c1..f1ae83121 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_inf.h
+++ b/soh/soh/Enhancements/randomizer/randomizer_inf.h
@@ -1,12 +1,6 @@
 #pragma once
 
 typedef enum {
-    RAND_INF_DUNGEONS_DONE_DEKU_TREE,
-    RAND_INF_DUNGEONS_DONE_DODONGOS_CAVERN,
-    RAND_INF_DUNGEONS_DONE_JABU_JABUS_BELLY,
-    RAND_INF_DUNGEONS_DONE_FOREST_TEMPLE,
-    RAND_INF_DUNGEONS_DONE_FIRE_TEMPLE,
-    RAND_INF_DUNGEONS_DONE_WATER_TEMPLE,
     RAND_INF_DUNGEONS_DONE_SPIRIT_TEMPLE,
     RAND_INF_DUNGEONS_DONE_SHADOW_TEMPLE,
 
diff --git a/soh/src/code/z_map_exp.c b/soh/src/code/z_map_exp.c
index 213ee018d..5ed13f810 100644
--- a/soh/src/code/z_map_exp.c
+++ b/soh/src/code/z_map_exp.c
@@ -395,7 +395,7 @@ void Map_InitData(PlayState* play, s16 room) {
             } else if (play->sceneNum == SCENE_LAKE_HYLIA) {
                 if ((LINK_AGE_IN_YEARS == YEARS_ADULT) &&
                     ((!IS_RANDO && !CHECK_QUEST_ITEM(QUEST_MEDALLION_WATER)) ||
-                     (IS_RANDO && !Flags_GetRandomizerInf(RAND_INF_DUNGEONS_DONE_WATER_TEMPLE)))) {
+                     (IS_RANDO && !Flags_GetEventChkInf(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP)))) {
                     extendedMapIndex = 0x15;
                 }
             } else if (play->sceneNum == SCENE_GERUDO_VALLEY) {
diff --git a/soh/src/code/z_play.c b/soh/src/code/z_play.c
index 43d30f54b..4e27e6cb8 100644
--- a/soh/src/code/z_play.c
+++ b/soh/src/code/z_play.c
@@ -277,27 +277,27 @@ u8 CheckMedallionCount() {
 u8 CheckDungeonCount() {
     u8 dungeonCount = 0;
 
-    if (Flags_GetRandomizerInf(RAND_INF_DUNGEONS_DONE_DEKU_TREE)) {
+    if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP)) {
         dungeonCount++;
     }
 
-    if (Flags_GetRandomizerInf(RAND_INF_DUNGEONS_DONE_DODONGOS_CAVERN)) {
+    if (Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP)) {
         dungeonCount++;
     }
 
-    if (Flags_GetRandomizerInf(RAND_INF_DUNGEONS_DONE_JABU_JABUS_BELLY)) {
+    if (Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
         dungeonCount++;
     }
 
-    if (Flags_GetRandomizerInf(RAND_INF_DUNGEONS_DONE_FOREST_TEMPLE)) {
+    if (Flags_GetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP)) {
         dungeonCount++;
     }
 
-    if (Flags_GetRandomizerInf(RAND_INF_DUNGEONS_DONE_FIRE_TEMPLE)) {
+    if (Flags_GetEventChkInf(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP)) {
         dungeonCount++;
     }
 
-    if (Flags_GetRandomizerInf(RAND_INF_DUNGEONS_DONE_WATER_TEMPLE)) {
+    if (Flags_GetEventChkInf(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP)) {
         dungeonCount++;
     }
 
diff --git a/soh/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c b/soh/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c
index 816f96aa4..0a4738092 100644
--- a/soh/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c
+++ b/soh/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c
@@ -217,7 +217,7 @@ void BgSpot06Objects_Destroy(Actor* thisx, PlayState* play) {
     // Due to Ships resource caching, the water box collisions for the river have to be manually reset
     play->colCtx.colHeader->waterBoxes[LHWB_GERUDO_VALLEY_RIVER_LOWER].zMin = WATER_LEVEL_RIVER_LOWER_Z;
 
-    if (IS_RANDO && Flags_GetRandomizerInf(RAND_INF_DUNGEONS_DONE_WATER_TEMPLE)) {
+    if (IS_RANDO && Flags_GetEventChkInf(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP)) {
         // For randomizer when leaving lake hylia while the water level is lowered,
         // reset the "raise lake hylia water" flag back to on if the water temple is cleared
         Flags_SetEventChkInf(EVENTCHKINF_RAISED_LAKE_HYLIA_WATER);
@@ -461,7 +461,7 @@ void BgSpot06Objects_Update(Actor* thisx, PlayState* play) {
         Object_Spawn(&play->objectCtx, OBJECT_GAMEPLAY_DANGEON_KEEP);
 
         s16 switchParams;
-        if (Flags_GetRandomizerInf(RAND_INF_DUNGEONS_DONE_WATER_TEMPLE)) {
+        if (Flags_GetEventChkInf(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP)) {
             // Toggle-able floor switch,
             // linked to temp_switch 0x1E (room temporary, cleared when room unloads)
             switchParams = 0x3E10;
@@ -477,7 +477,7 @@ void BgSpot06Objects_Update(Actor* thisx, PlayState* play) {
             0x0000 | (TEXT_LAKE_HYLIA_WATER_SWITCH_SIGN & 0xFF), false);
 
         // Spawn a Navi check spot when Water Temple isn't cleared
-        if (!Flags_GetRandomizerInf(RAND_INF_DUNGEONS_DONE_WATER_TEMPLE)) {
+        if (!Flags_GetEventChkInf(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP)) {
             Actor_Spawn(&play->actorCtx, play, ACTOR_ELF_MSG2, -896.0f, -1243.0f, 6953.0f, 0, 0, 0,
                 0x3D00 | (TEXT_LAKE_HYLIA_WATER_SWITCH_NAVI & 0xFF), false);
         }
@@ -485,7 +485,7 @@ void BgSpot06Objects_Update(Actor* thisx, PlayState* play) {
         actionCounter++;
         return;
     } else if (actionCounter == 1) {
-        if (!Flags_GetRandomizerInf(RAND_INF_DUNGEONS_DONE_WATER_TEMPLE)) {
+        if (!Flags_GetEventChkInf(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP)) {
             // Remove the link to ice block so melting it doesn't set the flag
             lakeControlFloorSwitch->params = 0x3E01;
         }
diff --git a/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
index a2c1f5f9a..afa825e57 100644
--- a/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
+++ b/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
@@ -535,7 +535,7 @@ void EnOssan_TalkGoronShopkeeper(PlayState* play) {
             Message_ContinueTextbox(play, 0x300F);
         }
     } else if ((!IS_RANDO && !CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)) ||
-               (IS_RANDO && !Flags_GetRandomizerInf(RAND_INF_DUNGEONS_DONE_FIRE_TEMPLE))) {
+               (IS_RANDO && !Flags_GetEventChkInf(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP))) {
         Message_ContinueTextbox(play, 0x3057);
     } else {
         Message_ContinueTextbox(play, 0x305B);

From 3c6c46d95dea547bbff236e4c2347ab8a26368f5 Mon Sep 17 00:00:00 2001
From: Garrett Cox <garrettjcox@gmail.com>
Date: Sun, 21 Apr 2024 21:09:52 -0500
Subject: [PATCH 115/230] Fix for some chests not appearing

---
 soh/soh/Enhancements/timesaver_hook_handlers.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/soh/soh/Enhancements/timesaver_hook_handlers.cpp b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
index 700e55e18..27947f3ea 100644
--- a/soh/soh/Enhancements/timesaver_hook_handlers.cpp
+++ b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
@@ -26,6 +26,7 @@ extern "C" {
 #include "src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h"
 extern SaveContext gSaveContext;
 extern PlayState* gPlayState;
+extern int32_t D_8011D3AC;
 }
 
 #define RAND_GET_OPTION(option) Rando::Context::GetInstance()->GetOption(option).GetSelectedOptionIndex()
@@ -315,6 +316,13 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
         case GI_VB_PLAY_ONEPOINT_ACTOR_CS: {
             if (CVarGetInteger("gTimeSavers.SkipCutscene.OnePoint", IS_RANDO)) {
                 Actor* actor = static_cast<Actor*>(opt);
+
+                // there are a few checks throughout the game (such as chest spawns) that rely on this
+                // the checks are for func_8005B198() == this->dyna.actor.category
+                // func_8005B198 just returns D_8011D3AC
+                // D_8011D3AC is set to camera->target->category in Camera_Demo5
+                D_8011D3AC = actor->category;
+
                 switch (actor->category) {
                     case ACTORCAT_BG:
                         if (actor->id == ACTOR_BG_DDAN_KD) {

From 4c75fd14a77018a2dfce2679e8e8a15af6f233b1 Mon Sep 17 00:00:00 2001
From: Christopher Leggett <chris@leggett.dev>
Date: Mon, 22 Apr 2024 13:29:05 -0400
Subject: [PATCH 116/230] Fix hint generation bugs on develop-rando (#4001)

* Fix hint generation bugs on develop-rando

1. Fixed Ganon Non-hint text from loading as Saria's Magic Hint.
2. Fixed Ganon Non-hint text from not getting saved correctly.
3. Fixed gossip stone hint generation from not generating any non-always hints on No Logic.

For #3, the hint distribution and placement algorithm was bailing out too early when it wasn't able
to place a hint. For No Logic, what it was doing was failing to place WOTH hints (since No Logic seeds
don't calculate WOTH candidacy), returning the amount of hints it failed to place, and then it called
the function to redistribute the hints, but did not call the function to attempt to place the remaining hints.

Additionally, it was not accounting for the fact that we shouldn't redistribute the hints into the categories we failed to
place a hint in, so it would redistribute hints right back into those categories. I changed it so that when DistributeHints
gets called after PlaceHints fails to place the hint, it checks if the distribution settings copies attribute was set to 0.
In this case, it breaks while looping for the type distribution settings, and moves on to the next category. Also, it now repeatedly
attempts to distribute and place hints until PlaceHints returns 0 (meaning it placed all of its hints successfully).

* Fixes some further seed-bleed type issues with hint generation.
---
 soh/soh/Enhancements/randomizer/3drando/hints.cpp |  8 +++++---
 soh/soh/Enhancements/randomizer/3drando/text.hpp  | 10 ++++++++--
 soh/soh/Enhancements/randomizer/hint.cpp          |  4 ++++
 soh/soh/Enhancements/randomizer/randomizer.cpp    |  2 +-
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.cpp b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
index ce29c95d0..ba4fce24b 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hints.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
@@ -287,7 +287,7 @@ Text AutoFormatHintText(const Text& unformattedHintText, const std::vector<std::
         strings[i] = textStr;
     }
 
-    return {strings[0], strings[1], ""/*spanish*/, strings[2]};
+    return {strings[0], strings[2], ""/*spanish*/, strings[1]};
 }
 
 std::array<DungeonHintInfo, 10> dungeonInfoData;
@@ -615,6 +615,7 @@ void CreateGanonAndSheikText() {
     }
 
     ctx->AddHint(RH_GANONDORF_HINT, AutoFormatHintText(ganonHintText), lightArrowLocation[0], HINT_TYPE_STATIC, "Static", lightArrowArea);
+    ctx->AddHint(RH_GANONDORF_NOHINT, AutoFormatHintText(ganonText), lightArrowLocation[0], HINT_TYPE_STATIC, "Static", lightArrowArea);
 
     if (!ctx->GetOption(RSK_TRIAL_COUNT).Is(0)) {
       sheikText = ::Hint(RHT_SHEIK_LIGHT_ARROW_HINT).GetText() + LightArrowAreaText + "%w.";
@@ -963,7 +964,7 @@ static void DistributeHints(std::vector<uint8_t>& selected, size_t stoneCount, s
     for (uint8_t distribution = 0; distribution < distTable.size(); distribution++){
       currentWeight -= distTable[distribution].weight;
       if (currentWeight <= 0){
-        if (stoneCount >= distTable[distribution].copies){
+        if (stoneCount >= distTable[distribution].copies || distTable[distribution].copies == 0){
           selected[distribution] += 1;
           stoneCount -= distTable[distribution].copies;
           break;
@@ -1074,8 +1075,9 @@ void CreateStoneHints() {
 
   while(totalStones != 0){
     totalStones = PlaceHints(selectedHints, distTable);
-    if (totalStones != 0){
+    while (totalStones != 0){
       DistributeHints(selectedHints, totalStones, distTable, hintSetting.junkWeight, false);
+      totalStones = PlaceHints(selectedHints, distTable);
     }
   }
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/text.hpp b/soh/soh/Enhancements/randomizer/3drando/text.hpp
index 7f7d16736..49e598f63 100644
--- a/soh/soh/Enhancements/randomizer/3drando/text.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/text.hpp
@@ -13,13 +13,19 @@ public:
       : english(std::move(english_)),
         french(std::move(french_)),
         spanish(std::move(spanish_)),
-        german(std::move("")) {}
+        german(std::move("")) {
+            // german defaults to english text until a translation is provided.
+            german = english;
+        }
     Text(std::string english_, std::string french_, std::string spanish_, std::string german_)
       : english(std::move(english_)),
         french(std::move(french_)),
         spanish(std::move(spanish_)),
         german(std::move(german_)) {}
-    Text(std::string english_) : english(std::move(english_)), french(std::move("")), spanish(std::move("")), german(std::move("")) {}
+    Text(std::string english_) : english(std::move(english_)), french(std::move("")), spanish(std::move("")), german(std::move("")) {
+        // default unprovided languages to english text
+        french = spanish = german = english;
+    }
 
     const std::string& GetEnglish() const {
         return english;
diff --git a/soh/soh/Enhancements/randomizer/hint.cpp b/soh/soh/Enhancements/randomizer/hint.cpp
index 3827c40f8..ff9dfdf81 100644
--- a/soh/soh/Enhancements/randomizer/hint.cpp
+++ b/soh/soh/Enhancements/randomizer/hint.cpp
@@ -47,6 +47,10 @@ const std::string& Hint::GetDistribution() {
 
 void Hint::ResetVariables() {
     hintedLocation = RC_UNKNOWN_CHECK;
+    text = Text{};
+    distribution = "";
+    hintedArea = RA_NONE;
+    hintType = HINT_TYPE_STATIC;
     addedToPool = false;
 }
 }
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index 5d32e7a35..3e861962b 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -271,7 +271,7 @@ void Randomizer::LoadHintMessages() {
         CustomMessage(ctx->GetHint(RH_GANONDORF_HINT)->GetText()));
     CustomMessageManager::Instance->CreateMessage(
         Randomizer::hintMessageTableID, TEXT_GANONDORF_NOHINT,
-        CustomMessage(ctx->GetHint(RH_SARIA)->GetText()));//RANDOTODO: Change to RH_BLANK or remove {{message}} replacment
+        CustomMessage(ctx->GetHint(RH_GANONDORF_NOHINT)->GetText()));
     CustomMessageManager::Instance->CreateMessage(
         Randomizer::hintMessageTableID, TEXT_SHEIK_NEED_HOOK,
         CustomMessage("{{message}}", "{{message}}", "{{message}}"));

From b65a15028b926e8aac73988f7241c01edcfecda2 Mon Sep 17 00:00:00 2001
From: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>
Date: Mon, 22 Apr 2024 19:44:12 +0200
Subject: [PATCH 117/230] Update z_horse.c (#4014)

---
 soh/src/code/z_horse.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/soh/src/code/z_horse.c b/soh/src/code/z_horse.c
index 6f7aa2d3a..48c76396f 100644
--- a/soh/src/code/z_horse.c
+++ b/soh/src/code/z_horse.c
@@ -75,6 +75,9 @@ void func_8006D0EC(PlayState* play, Player* player) {
     } else if ((play->sceneNum == gSaveContext.horseData.scene) &&
                (((Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) != 0) && (!IS_RANDO ||
                (IS_RANDO && CHECK_QUEST_ITEM(QUEST_SONG_EPONA) &&
+                    Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_UP) &&
+                    Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_LEFT) &&
+                    Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_RIGHT) &&
                (INV_CONTENT(ITEM_OCARINA_FAIRY) != ITEM_NONE)))) || DREG(1) != 0)) {
         // "Set by existence of horse %d %d %d"
         osSyncPrintf("馬存在によるセット %d %d %d\n", gSaveContext.horseData.scene, Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED),

From 6b831f9256333933388b167785b7f98bb214afbf Mon Sep 17 00:00:00 2001
From: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>
Date: Mon, 22 Apr 2024 19:44:59 +0200
Subject: [PATCH 118/230] Fix swim softlock (#3965)

* Update mods.cpp

* Update mods.cpp
---
 soh/soh/Enhancements/mods.cpp | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/soh/soh/Enhancements/mods.cpp b/soh/soh/Enhancements/mods.cpp
index 0c157110b..5d86b11f4 100644
--- a/soh/soh/Enhancements/mods.cpp
+++ b/soh/soh/Enhancements/mods.cpp
@@ -1464,40 +1464,44 @@ typedef struct {
 //special respawns used when voided out without swim to prevent infinite loops
 std::map<s32, SpecialRespawnInfo> swimSpecialRespawnInfo = {
     {
-        0x1D9,//hf to zr in water
+        ENTR_ZORAS_RIVER_3,//hf to zr in water
         { { -1455.443, -20, 1384.826 }, 28761 }
     },
     {
-        0x311,//zr to hf in water
+        ENTR_HYRULE_FIELD_14,//zr to hf in water
         { { 5830.209, -92.16, 3925.911 }, -20025 }
     },
     {
-        0x4DA,//zr to lw
+        ENTR_LOST_WOODS_7,//zr to lw
         { { 1978.718, -36.908, -855 }, -16384 }
     },
     {
-        0x1DD,//lw to zr
+        ENTR_ZORAS_RIVER_4,//lw to zr
         { { 4082.366, 860.442, -1018.949 }, -32768 }
     },
     {
-        0x219,//gv to lh
+        ENTR_LAKE_HYLIA_1,//gv to lh
         { { -3276.416, -1033, 2908.421 }, 11228 }
     },
     {
-        0x10,//lh to water temple
+        ENTR_WATER_TEMPLE_0,//lh to water temple
         { { -182, 780, 759.5 }, -32768 }
     },
     {
-        0x21D,//water temple to lh
+        ENTR_LAKE_HYLIA_2,//water temple to lh
         { { -955.028, -1306.9, 6768.954 }, -32768 }
     },
     {
-        0x328,//lh to zd
+        ENTR_ZORAS_DOMAIN_4,//lh to zd
         { { -109.86, 11.396, -9.933 }, -29131 }
     },
     {
-        0x560,//zd to lh
+        ENTR_LAKE_HYLIA_7,//zd to lh
         { { -912, -1326.967, 3391 }, 0 }
+    },
+    {
+        ENTR_GERUDO_VALLEY_1,//caught by gerudos as child
+        { { -424, -2051, -74 }, 16384 }
     }
 };
 

From 5174a48be1c39b08a8b8bc1966188b8793f3841f Mon Sep 17 00:00:00 2001
From: Garrett Cox <garrettjcox@gmail.com>
Date: Mon, 22 Apr 2024 19:16:58 -0500
Subject: [PATCH 119/230] Point LUS to fork temporarily for dl fix

---
 libultraship | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libultraship b/libultraship
index b135db823..b505413e8 160000
--- a/libultraship
+++ b/libultraship
@@ -1 +1 @@
-Subproject commit b135db823aaabf6e848fcbd2796933b0771f9968
+Subproject commit b505413e85591ffc633c063ee2fe43cd7810b981

From 854e20680ad9cfbf814727a3af978102ab5efff9 Mon Sep 17 00:00:00 2001
From: Garrett Cox <garrettjcox@gmail.com>
Date: Tue, 23 Apr 2024 09:17:57 -0500
Subject: [PATCH 120/230] Fix forest temple entrance cs skip

---
 soh/soh/Enhancements/timesaver_hook_handlers.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/soh/soh/Enhancements/timesaver_hook_handlers.cpp b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
index 27947f3ea..46b4353ee 100644
--- a/soh/soh/Enhancements/timesaver_hook_handlers.cpp
+++ b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
@@ -866,10 +866,12 @@ void TimeSaverOnActorInitHandler(void* actorRef) {
     }
 
     // Forest Temple entrance cutscene
-    if (actor->id == ACTOR_EN_PO_SISTERS && actor->params == 4124) {
+    // This is a bit of a hack, we can't effectively override the behavior of the torches 
+    // or poes from which the cutscene is triggered until we can have a "BeforeActorInit" hook.
+    // So for now we're just going to set the flag before they get to the room the cutscene is in
+    if (gPlayState->sceneNum == SCENE_FOREST_TEMPLE && actor->id == ACTOR_EN_ST && !Flags_GetSwitch(gPlayState, 0x1B)) {
         if (CVarGetInteger("gTimeSavers.SkipCutscene.GlitchAiding", 0)) {
             Flags_SetSwitch(gPlayState, 0x1B);
-            Actor_Kill(actor);
         }
     }
 

From 39e62697317cc58c8afd49f5f57d996d9b9bba8d Mon Sep 17 00:00:00 2001
From: Christopher Leggett <chris@leggett.dev>
Date: Tue, 23 Apr 2024 10:26:59 -0400
Subject: [PATCH 121/230] Fixes bugs with spoiler file parsing (#4066)

* Fix bugs with spoiler file parsing

* Hopefully fix mac build issue

* fix typo
---
 soh/soh/Enhancements/randomizer/context.cpp   | 56 +++++++------------
 soh/soh/Enhancements/randomizer/context.h     |  2 -
 soh/soh/Enhancements/randomizer/item_list.cpp | 12 ++++
 .../Enhancements/randomizer/location_list.cpp | 11 ++++
 .../Enhancements/randomizer/randomizer.cpp    | 22 +-------
 soh/soh/Enhancements/randomizer/settings.cpp  |  2 +-
 soh/soh/Enhancements/randomizer/static_data.h |  4 ++
 7 files changed, 49 insertions(+), 60 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/context.cpp b/soh/soh/Enhancements/randomizer/context.cpp
index 5cf0dc087..3f5e09db3 100644
--- a/soh/soh/Enhancements/randomizer/context.cpp
+++ b/soh/soh/Enhancements/randomizer/context.cpp
@@ -20,19 +20,6 @@ namespace Rando {
 std::weak_ptr<Context> Context::mContext;
 
 Context::Context() {
-    mSpoilerfileCheckNameToEnum["Invalid Location"] = RC_UNKNOWN_CHECK;
-    mSpoilerfileCheckNameToEnum["Link's Pocket"] = RC_LINKS_POCKET;
-
-    for (auto& item : StaticData::GetItemTable()) {
-        // Easiest way to filter out all the empty values from the array, since we still technically want the 0/RG_NONE
-        // entry
-        if (item.GetName().english.empty()) {
-            continue;
-        }
-        mSpoilerfileGetNameToEnum[item.GetName().english] = item.GetRandomizerGet();
-        mSpoilerfileGetNameToEnum[item.GetName().french] = item.GetRandomizerGet();
-    }
-
     mSpoilerfileHintTypeNameToEnum = {
         { "Static", HINT_TYPE_STATIC },
         { "Trial", HINT_TYPE_TRIAL },
@@ -93,9 +80,6 @@ Context::Context() {
     mTrials = std::make_shared<Trials>();
     mSettings = std::make_shared<Settings>();
     mFishsanity = std::make_shared<Fishsanity>();
-    for (auto& location : StaticData::GetLocationTable()) {
-        mSpoilerfileCheckNameToEnum[location.GetName()] = location.GetRandomizerCheck();
-    }
 }
 
 RandomizerArea Context::GetAreaFromString(std::string str) {
@@ -409,22 +393,22 @@ void Context::ParseHashIconIndexesJson(nlohmann::json spoilerFileJson) {
 void Context::ParseItemLocationsJson(nlohmann::json spoilerFileJson) {
     nlohmann::json locationsJson = spoilerFileJson["locations"];
     for (auto it = locationsJson.begin(); it != locationsJson.end(); ++it) {
-        RandomizerCheck rc = mSpoilerfileCheckNameToEnum[it.key()];
+        RandomizerCheck rc = StaticData::SpoilerfileCheckNameToEnum[it.key()];
         if (it->is_structured()) {
             nlohmann::json itemJson = *it;
             for (auto itemit = itemJson.begin(); itemit != itemJson.end(); ++itemit) {
                 if (itemit.key() == "item") {
-                    itemLocationTable[rc].SetPlacedItem(mSpoilerfileGetNameToEnum[itemit.value().get<std::string>()]);
+                    itemLocationTable[rc].SetPlacedItem(StaticData::SpoilerfileItemNameToEnum[itemit.value().get<std::string>()]);
                 } else if (itemit.key() == "price") {
                     itemLocationTable[rc].SetCustomPrice(itemit.value().get<uint16_t>());
                 } else if (itemit.key() == "model") {
-                    overrides[rc] = ItemOverride(rc, mSpoilerfileGetNameToEnum[itemit.value().get<std::string>()]);
+                    overrides[rc] = ItemOverride(rc, StaticData::SpoilerfileItemNameToEnum[itemit.value().get<std::string>()]);
                 } else if (itemit.key() == "trickName") {
                     overrides[rc].SetTrickName(Text(itemit.value().get<std::string>()));
                 }
             }
         } else {
-            itemLocationTable[rc].SetPlacedItem(mSpoilerfileGetNameToEnum[it.value().get<std::string>()]);
+            itemLocationTable[rc].SetPlacedItem(StaticData::SpoilerfileItemNameToEnum[it.value().get<std::string>()]);
         }
     }
 }
@@ -433,23 +417,23 @@ void Context::ParseHintJson(nlohmann::json spoilerFileJson) {
     // Child Altar
     std::string childAltarText = spoilerFileJson["childAltar"]["hintText"].get<std::string>();
     AddHint(RH_ALTAR_CHILD, Text(childAltarText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", RA_NONE);
-    mEmeraldLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["childAltar"]["rewards"]["emeraldLoc"]];
-    mRubyLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["childAltar"]["rewards"]["rubyLoc"]];
-    mSapphireLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["childAltar"]["rewards"]["sapphireLoc"]];
+    mEmeraldLoc = StaticData::SpoilerfileCheckNameToEnum[spoilerFileJson["childAltar"]["rewards"]["emeraldLoc"]];
+    mRubyLoc = StaticData::SpoilerfileCheckNameToEnum[spoilerFileJson["childAltar"]["rewards"]["rubyLoc"]];
+    mSapphireLoc = StaticData::SpoilerfileCheckNameToEnum[spoilerFileJson["childAltar"]["rewards"]["sapphireLoc"]];
 
     // Adult Altar
     std::string adultAltarText = spoilerFileJson["adultAltar"]["hintText"].get<std::string>();
     AddHint(RH_ALTAR_ADULT, Text(adultAltarText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", RA_NONE);
-    mForestMedallionLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["forestMedallionLoc"].get<std::string>()];
-    mFireMedallionLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["fireMedallionLoc"].get<std::string>()];
-    mWaterMedallionLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["waterMedallionLoc"].get<std::string>()];
-    mShadowMedallionLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["shadowMedallionLoc"].get<std::string>()];
-    mSpiritMedallionLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["spiritMedallionLoc"].get<std::string>()];
-    mLightMedallionLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["lightMedallionLoc"].get<std::string>()];
+    mForestMedallionLoc = StaticData::SpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["forestMedallionLoc"].get<std::string>()];
+    mFireMedallionLoc = StaticData::SpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["fireMedallionLoc"].get<std::string>()];
+    mWaterMedallionLoc = StaticData::SpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["waterMedallionLoc"].get<std::string>()];
+    mShadowMedallionLoc = StaticData::SpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["shadowMedallionLoc"].get<std::string>()];
+    mSpiritMedallionLoc = StaticData::SpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["spiritMedallionLoc"].get<std::string>()];
+    mLightMedallionLoc = StaticData::SpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["lightMedallionLoc"].get<std::string>()];
 
     // Ganondorf and Sheik Light Arrow Hints
     std::string ganonHintText = spoilerFileJson["ganonHintText"].get<std::string>();
-    RandomizerCheck lightArrowLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["lightArrowHintLoc"].get<std::string>()];
+    RandomizerCheck lightArrowLoc = StaticData::SpoilerfileCheckNameToEnum[spoilerFileJson["lightArrowHintLoc"].get<std::string>()];
     std::string lightArrowRegion = spoilerFileJson["lightArrowArea"].get<std::string>();
     AddHint(RH_GANONDORF_HINT, Text(ganonHintText), lightArrowLoc, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[lightArrowRegion]);
     if (spoilerFileJson.contains("sheikText")) {
@@ -463,7 +447,7 @@ void Context::ParseHintJson(nlohmann::json spoilerFileJson) {
     if (spoilerFileJson.contains("dampeText")) {
         std::string dampeText = spoilerFileJson["dampeText"].get<std::string>();
         std::string dampeRegion = spoilerFileJson["dampeRegion"].get<std::string>();
-        RandomizerCheck dampeHintLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["dampeHintLoc"].get<std::string>()];
+        RandomizerCheck dampeHintLoc = StaticData::SpoilerfileCheckNameToEnum[spoilerFileJson["dampeHintLoc"].get<std::string>()];
         AddHint(RH_DAMPES_DIARY, Text(dampeText), dampeHintLoc, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[dampeRegion]);
     }
 
@@ -471,7 +455,7 @@ void Context::ParseHintJson(nlohmann::json spoilerFileJson) {
     if (spoilerFileJson.contains("gregText")) {
         std::string gregText = spoilerFileJson["gregText"].get<std::string>();
         std::string gregRegion = spoilerFileJson["gregRegion"].get<std::string>();
-        RandomizerCheck gregLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["gregLoc"].get<std::string>()];
+        RandomizerCheck gregLoc = StaticData::SpoilerfileCheckNameToEnum[spoilerFileJson["gregLoc"].get<std::string>()];
         AddHint(RH_GREG_RUPEE, Text(gregText), gregLoc, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[gregRegion]);
     }
 
@@ -479,7 +463,7 @@ void Context::ParseHintJson(nlohmann::json spoilerFileJson) {
     if (spoilerFileJson.contains("sariaText")) {
         std::string sariaText = spoilerFileJson["sariaText"].get<std::string>();
         std::string sariaRegion = spoilerFileJson["sariaRegion"].get<std::string>();
-        RandomizerCheck sariaHintLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["sariaHintLoc"].get<std::string>()];
+        RandomizerCheck sariaHintLoc = StaticData::SpoilerfileCheckNameToEnum[spoilerFileJson["sariaHintLoc"].get<std::string>()];
         AddHint(RH_SARIA, Text(sariaText), sariaHintLoc, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[sariaRegion]);
     }
 
@@ -487,7 +471,7 @@ void Context::ParseHintJson(nlohmann::json spoilerFileJson) {
     if(spoilerFileJson.contains("fishingPoleText")) {
         std::string fishingPoleText = spoilerFileJson["fishingPoleText"].get<std::string>();
         std::string fishingPoleRegion = spoilerFileJson["fishingPoleRegion"].get<std::string>();
-        RandomizerCheck fishingPoleHintLoc = mSpoilerfileCheckNameToEnum[spoilerFileJson["fishingPoleHintLoc"].get<std::string>()];
+        RandomizerCheck fishingPoleHintLoc = StaticData::SpoilerfileCheckNameToEnum[spoilerFileJson["fishingPoleHintLoc"].get<std::string>()];
         AddHint(RH_FISHING_POLE, Text(fishingPoleText), fishingPoleHintLoc, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[fishingPoleRegion]);
     }
 
@@ -520,11 +504,11 @@ void Context::ParseHintJson(nlohmann::json spoilerFileJson) {
     // Gossip Stones
     nlohmann::json hintsJson = spoilerFileJson["hints"];
     for (auto it = hintsJson.begin(); it != hintsJson.end(); ++it) {
-        RandomizerCheck gossipStoneLoc = mSpoilerfileCheckNameToEnum[it.key()];
+        RandomizerCheck gossipStoneLoc = StaticData::SpoilerfileCheckNameToEnum[it.key()];
         nlohmann::json hintInfo = it.value();
         std::string hintText = hintInfo["hint"].get<std::string>();
         HintType hintType = mSpoilerfileHintTypeNameToEnum[hintInfo["type"].get<std::string>()];
-        RandomizerCheck hintedLocation = hintInfo.contains("location") ? mSpoilerfileCheckNameToEnum[hintInfo["location"]] : RC_UNKNOWN_CHECK;
+        RandomizerCheck hintedLocation = hintInfo.contains("location") ? StaticData::SpoilerfileCheckNameToEnum[hintInfo["location"]] : RC_UNKNOWN_CHECK;
         RandomizerArea hintedArea = hintInfo.contains("area") ? mSpoilerfileAreaNameToEnum[hintInfo["area"].get<std::string>()] : RA_NONE;
         std::string distribution = hintInfo["distribution"].get<std::string>();
         AddHint(static_cast<RandomizerHintKey>(gossipStoneLoc - RC_COLOSSUS_GOSSIP_STONE + 1), Text(hintText), hintedLocation, hintType, distribution, hintedArea);
diff --git a/soh/soh/Enhancements/randomizer/context.h b/soh/soh/Enhancements/randomizer/context.h
index cef9e5292..06dd44628 100644
--- a/soh/soh/Enhancements/randomizer/context.h
+++ b/soh/soh/Enhancements/randomizer/context.h
@@ -87,14 +87,12 @@ class Context {
     std::vector<RandomizerGet> possibleIceTrapModels = {};
     std::unordered_map<RandomizerCheck, RandomizerGet> iceTrapModels = {};
     std::array<uint8_t, 5> hashIconIndexes = {};
-    std::unordered_map<std::string, RandomizerCheck> mSpoilerfileCheckNameToEnum;
     bool playthroughBeatable = false;
     bool allLocationsReachable = false;
     RandomizerArea GetAreaFromString(std::string str);
 
   private:
     static std::weak_ptr<Context> mContext;
-    std::unordered_map<std::string, RandomizerGet> mSpoilerfileGetNameToEnum;
     std::unordered_map<std::string, HintType> mSpoilerfileHintTypeNameToEnum;
     std::unordered_map<std::string, RandomizerArea> mSpoilerfileAreaNameToEnum;
     std::array<Hint, RH_MAX> hintTable = {};
diff --git a/soh/soh/Enhancements/randomizer/item_list.cpp b/soh/soh/Enhancements/randomizer/item_list.cpp
index 343f680b1..4541550e8 100644
--- a/soh/soh/Enhancements/randomizer/item_list.cpp
+++ b/soh/soh/Enhancements/randomizer/item_list.cpp
@@ -8,6 +8,7 @@
 using namespace Rando;
 
 std::array<Item, RG_MAX> Rando::StaticData::itemTable;
+std::unordered_map<std::string, RandomizerGet> Rando::StaticData::SpoilerfileItemNameToEnum;
 
 void Rando::StaticData::InitItemTable() {
     auto logic = Context::GetInstance()->GetLogic();
@@ -320,6 +321,17 @@ void Rando::StaticData::InitItemTable() {
     itemTable[RG_MAGIC_SINGLE] =                        Item(RG_MAGIC_SINGLE,                     Text{ "Magic Meter", "Jauge de Magie", "Magisches Messgerät" },                                                   ITEMTYPE_ITEM,              0x8A,               true,  &logic->ProgressiveMagic,    RHT_MAGIC_SINGLE,           RG_MAGIC_SINGLE,                OBJECT_GI_MAGICPOT,     GID_MAGIC_SMALL,    0xE4,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_MAGIC_DOUBLE] =                        Item(RG_MAGIC_DOUBLE,                     Text{ "Enhanced Magic Meter", "Jauge de Magie améliorée", "Verbesserte Magieanzeige" },                           ITEMTYPE_ITEM,              0x8A,               true,  &logic->ProgressiveMagic,    RHT_MAGIC_DOUBLE,           RG_MAGIC_DOUBLE,                OBJECT_GI_MAGICPOT,     GID_MAGIC_LARGE,    0xE8,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
     itemTable[RG_TRIFORCE_PIECE] =                      Item(RG_TRIFORCE_PIECE,                   Text{ "Triforce Piece", "Triforce Piece", "Triforce Piece" },                                                     ITEMTYPE_ITEM,              0xDF,               true,  &logic->TriforcePieces,      RHT_TRIFORCE_PIECE,         RG_TRIFORCE_PIECE,              OBJECT_GI_BOMB_2,       GID_TRIFORCE_PIECE, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+
+    // Init SpoilerfileItemNameToEnum
+    for (auto& item : itemTable) {
+        // Easiest way to filter out all the empty values from the array, since we still technically want the 0/RG_NONE
+        // entry
+        if (item.GetName().english.empty()) {
+            continue;
+        }
+        SpoilerfileItemNameToEnum[item.GetName().english] = item.GetRandomizerGet();
+        SpoilerfileItemNameToEnum[item.GetName().french] = item.GetRandomizerGet();
+    }
 }
 
 Item& Rando::StaticData::RetrieveItem(const RandomizerGet rgid) {
diff --git a/soh/soh/Enhancements/randomizer/location_list.cpp b/soh/soh/Enhancements/randomizer/location_list.cpp
index ea4775d46..c5418dda2 100644
--- a/soh/soh/Enhancements/randomizer/location_list.cpp
+++ b/soh/soh/Enhancements/randomizer/location_list.cpp
@@ -3,6 +3,8 @@
 #define TWO_ACTOR_PARAMS(a, b) (abs(a) << 16) | abs(b)
 
 std::array<Rando::Location, RC_MAX> Rando::StaticData::locationTable;
+std::unordered_map<std::string, RandomizerCheck> Rando::StaticData::SpoilerfileCheckNameToEnum;
+std::multimap<std::tuple<s16, s16, s32>, RandomizerCheck> Rando::StaticData::CheckFromActorMultimap;
 
 std::vector<RandomizerCheck> KF_ShopLocations = {
     RC_KF_SHOP_ITEM_1, RC_KF_SHOP_ITEM_2, RC_KF_SHOP_ITEM_3, RC_KF_SHOP_ITEM_4,
@@ -1569,6 +1571,15 @@ void Rando::StaticData::InitLocationTable() {
     
     locationTable[RC_TRIFORCE_COMPLETED] = Location::Reward(RC_TRIFORCE_COMPLETED, RCQUEST_BOTH, RCTYPE_STANDARD, RCAREA_MARKET, ACTOR_ID_MAX, SCENE_ID_MAX, 0x00, 0x00, "Completed Triforce", "Completed Triforce", RHT_NONE, RG_NONE, {}, SpoilerCollectionCheck::None(), SpoilerCollectionCheckGroup::GROUP_NO_GROUP);
     // clang-format on
+
+    // Init SpoilerfileCheckNameToEnum
+    SpoilerfileCheckNameToEnum["Invalid Location"] = RC_UNKNOWN_CHECK;
+    SpoilerfileCheckNameToEnum["Link's Pocket"] = RC_LINKS_POCKET;
+
+    for (auto& location : locationTable) {
+        SpoilerfileCheckNameToEnum[location.GetName()] = location.GetRandomizerCheck();
+        CheckFromActorMultimap.emplace(std::make_tuple((int16_t)location.GetActorID(), (int16_t)location.GetScene(), location.GetActorParams()), location.GetRandomizerCheck());
+    }
 }
 
 Location* Rando::StaticData::GetLocation(RandomizerCheck locKey) {
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index 3e861962b..1a4d21f7d 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -47,11 +47,8 @@ extern std::array<std::string, HINT_TYPE_MAX> hintTypeNames;
 using json = nlohmann::json;
 using namespace std::literals::string_literals;
 
-std::unordered_map<std::string, RandomizerCheck> SpoilerfileCheckNameToEnum;
-std::unordered_map<std::string, RandomizerGet> SpoilerfileGetNameToEnum;
 std::unordered_map<std::string, RandomizerCheckArea> SpoilerfileAreaNameToEnum;
 std::unordered_map<std::string, HintType> SpoilerfileHintTypeNameToEnum;
-std::multimap<std::tuple<s16, s16, s32>, RandomizerCheck> checkFromActorMultimap;
 std::set<RandomizerCheck> excludedLocations;
 std::set<RandomizerCheck> spoilerExcludedLocations;
 std::set<RandomizerTrick> enabledTricks;
@@ -129,24 +126,7 @@ static const char* frenchRupeeNames[36] = {
 Randomizer::Randomizer() {
     Rando::StaticData::InitItemTable();
     Rando::StaticData::InitLocationTable();
-    for (auto& location : Rando::StaticData::GetLocationTable()) {
-        SpoilerfileCheckNameToEnum[location.GetName()] = location.GetRandomizerCheck();
-        checkFromActorMultimap.emplace(std::make_tuple((s16)location.GetActorID(), (s16)location.GetScene(), location.GetActorParams()), location.GetRandomizerCheck());
-    }
-    SpoilerfileCheckNameToEnum["Invalid Location"] = RC_UNKNOWN_CHECK;
-    SpoilerfileCheckNameToEnum["Link's Pocket"] = RC_LINKS_POCKET;
 
-    for (auto& item: Rando::StaticData::GetItemTable()) {
-        // Easiest way to filter out all the empty values from the array, since we still technically want the 0/RG_NONE entry
-        if (item.GetName().english.empty()) continue;
-        SpoilerfileGetNameToEnum[item.GetName().english] = item.GetRandomizerGet();
-        SpoilerfileGetNameToEnum[item.GetName().french] = item.GetRandomizerGet();
-        EnumToSpoilerfileGetName[item.GetRandomizerGet()] = {
-            item.GetName().english,
-            item.GetName().english,
-            item.GetName().french,
-        };
-    }
     for (auto area : rcAreaNames) {
         SpoilerfileAreaNameToEnum[area.second] = area.first;
     }
@@ -1758,7 +1738,7 @@ Rando::Location* Randomizer::GetCheckObjectFromActor(s16 actorId, s16 sceneNum,
         return Rando::StaticData::GetLocation(specialRc);
     }
 
-    auto range = checkFromActorMultimap.equal_range(std::make_tuple(actorId, sceneNum, actorParams));
+    auto range = Rando::StaticData::CheckFromActorMultimap.equal_range(std::make_tuple(actorId, sceneNum, actorParams));
 
     for (auto it = range.first; it != range.second; ++it) {
         if (
diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
index ac947d4da..b664b0898 100644
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -2644,7 +2644,7 @@ void Settings::ParseJson(nlohmann::json spoilerFileJson) {
 
     ctx->AddExcludedOptions();
     for (auto it = jsonExcludedLocations.begin(); it != jsonExcludedLocations.end(); ++it) {
-        const RandomizerCheck rc = ctx->mSpoilerfileCheckNameToEnum[it.value()];
+        const RandomizerCheck rc = StaticData::SpoilerfileCheckNameToEnum[it.value()];
         ctx->GetItemLocation(rc)->GetExcludedOption()->SetSelectedIndex(RO_GENERIC_ON);
     }
 
diff --git a/soh/soh/Enhancements/randomizer/static_data.h b/soh/soh/Enhancements/randomizer/static_data.h
index 7650b5dc4..0e5ba4c03 100644
--- a/soh/soh/Enhancements/randomizer/static_data.h
+++ b/soh/soh/Enhancements/randomizer/static_data.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <array>
+#include <map>
 #include <unordered_map>
 #include "randomizerTypes.h"
 #include "item.h"
@@ -27,6 +28,9 @@ class StaticData {
       static void InitLocationTable();
       static Location* GetLocation(RandomizerCheck locKey);
       static std::array<Rando::Location, RC_MAX>& GetLocationTable();
+      static std::unordered_map<std::string, RandomizerCheck> SpoilerfileCheckNameToEnum;
+      static std::unordered_map<std::string, RandomizerGet> SpoilerfileItemNameToEnum;
+      static std::multimap<std::tuple<s16, s16, s32>, RandomizerCheck> CheckFromActorMultimap;
       static std::vector<RandomizerCheck> overworldLocations;
       static std::vector<RandomizerCheck> dungeonRewardLocations;
       static std::vector<std::vector<RandomizerCheck>> shopLocationLists;

From 99fbecd951bfd0710ccbd14ac8086b965ea1e143 Mon Sep 17 00:00:00 2001
From: Christopher Leggett <chris@leggett.dev>
Date: Tue, 23 Apr 2024 12:30:30 -0400
Subject: [PATCH 122/230] Fix issue with item name replacement at runtime.
 (#4068)

---
 soh/soh/Enhancements/randomizer/randomizer.cpp | 13 +++++++++++--
 soh/soh/Enhancements/randomizer/randomizer.h   |  3 ---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index 1a4d21f7d..99d8961a5 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -2613,7 +2613,11 @@ CustomMessage Randomizer::ReplaceWithItemName(CustomMessage message, std::string
                 ctx->overrides[hintedCheck].GetTrickName().english
             };
         } else {
-            itemName = EnumToSpoilerfileGetName[targetRG];
+            itemName = {
+                Rando::StaticData::RetrieveItem(targetRG).GetName().english,
+                Rando::StaticData::RetrieveItem(targetRG).GetName().french,
+                Rando::StaticData::RetrieveItem(targetRG).GetName().english,
+            };
         }
     message.Replace(std::move(toReplace), std::move(itemName[0]), std::move(itemName[1]), std::move(itemName[2]));
     return message;
@@ -2745,7 +2749,12 @@ CustomMessage Randomizer::GetMerchantMessage(RandomizerInf randomizerInf, u16 te
             std::string(ctx->overrides[rc].GetTrickName().english)
         };
     } else { 
-        shopItemName = EnumToSpoilerfileGetName[shopItemGet];
+        auto shopItem = Rando::StaticData::RetrieveItem(shopItemGet);
+        shopItemName = {
+            shopItem.GetName().english,
+            shopItem.GetName().french,
+            shopItem.GetName().english,
+        };
     }
     u16 shopItemPrice = ctx->GetItemLocation(rc)->GetPrice();
 
diff --git a/soh/soh/Enhancements/randomizer/randomizer.h b/soh/soh/Enhancements/randomizer/randomizer.h
index 4d5a2ff30..5f567cd54 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.h
+++ b/soh/soh/Enhancements/randomizer/randomizer.h
@@ -39,9 +39,6 @@ class Randomizer {
     static const std::string IceTrapRandoMessageTableID;
     static const std::string randoMiscHintsTableID;
 
-    // Public for now to be accessed by SaveManager, will be made private again soon :tm:
-    std::unordered_map<RandomizerGet, std::array<std::string, 3>> EnumToSpoilerfileGetName;
-
     static Sprite* GetSeedTexture(uint8_t index);
     bool SpoilerFileExists(const char* spoilerFileName);
     void LoadMerchantMessages();

From c67d8f4baaf7702703dc15e07c68b67ff2d61d9a Mon Sep 17 00:00:00 2001
From: Garrett Cox <garrettjcox@gmail.com>
Date: Tue, 23 Apr 2024 11:31:34 -0500
Subject: [PATCH 123/230] Add missing RHT entries

---
 .../randomizer/3drando/hint_list.cpp          | 75 +++++++++++++++++++
 1 file changed, 75 insertions(+)

diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
index c6269d5de..54d2cf056 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
@@ -404,6 +404,81 @@ void HintTable_Init() {
               /*french*/ "la #cinquième salle# de la Chasse-aux-Trésors contient",
               /*spanish*/ "#en la quinta sala del Cofre del Tesoro# aguarda" });
 
+    hintTable[RHT_MARKET_TREASURE_CHEST_GAME_KEY_1] = HintText::Sometimes(
+        {
+            // obscure text
+            Text{ "#gambling once# grants", /*french*/ "#parier une fois# donne",
+                  /*spanish*/ "#apostar solo una vez# revelará" },
+            Text{ "the #first or second game chest# contains",
+                  /*french*/ "le #premier ou deuxième coffre à jeu# contient",
+                  /*spanish*/ "#el primer o segundo cofre del azar# revela" },
+        },
+        {},
+        // clear text
+        Text{ "the #first locked room# in the chest game contains",
+              /*french*/ "la #première salle# de la Chasse-aux-Trésors contient",
+              /*spanish*/ "#en la primera sala del Cofre del Tesoro# aguarda" });
+
+    hintTable[RHT_MARKET_TREASURE_CHEST_GAME_KEY_2] = HintText::Sometimes(
+        {
+            // obscure text
+            Text{ "#gambling twice# grants", /*french*/ "#parier deux fois# donne",
+                  /*spanish*/ "#apostar dos veces# revelará" },
+            Text{ "the #third or fourth game chest# contains",
+                  /*french*/ "le #troisième ou quatrième coffre à jeu# contient",
+                  /*spanish*/ "#el tercer o cuarto cofre del azar# revela" },
+        },
+        {},
+        // clear text
+        Text{ "the #second locked room# in the chest game contains",
+              /*french*/ "la #deuxième salle# de la Chasse-aux-Trésors contient",
+              /*spanish*/ "#en la segunda sala del Cofre del Tesoro# aguarda" });
+
+    hintTable[RHT_MARKET_TREASURE_CHEST_GAME_KEY_3] = HintText::Sometimes(
+        {
+            // obscure text
+            Text{ "#gambling 3 times# grants", /*french*/ "#parier trois fois# donne",
+                  /*spanish*/ "#apostar tres veces# revelará" },
+            Text{ "the #fifth or sixth game chest# contains",
+                  /*french*/ "le #cinquième ou sixième coffre à jeu# contient",
+                  /*spanish*/ "#el quinto o sexto cofre del azar# revela" },
+        },
+        {},
+        // clear text
+        Text{ "the #third locked room# in the chest game contains",
+              /*french*/ "la #troisième salle# de la Chasse-aux-Trésors contient",
+              /*spanish*/ "#en la tercera sala del Cofre del Tesoro# aguarda" });
+
+    hintTable[RHT_MARKET_TREASURE_CHEST_GAME_KEY_4] = HintText::Sometimes(
+        {
+            // obscure text
+            Text{ "#gambling 4 times# grants", /*french*/ "#parier quatre fois# donne",
+                  /*spanish*/ "#apostar cuatro veces# revelará" },
+            Text{ "the #seventh or eighth game chest# contains",
+                  /*french*/ "le #septième ou huitième coffre à jeu# contient",
+                  /*spanish*/ "#el séptimo u octavo cofre del azar# revela" },
+        },
+        {},
+        // clear text
+        Text{ "the #fourth locked room# in the chest game contains",
+              /*french*/ "la #quatrième salle# de la Chasse-aux-Trésors contient",
+              /*spanish*/ "#en la cuarta sala del Cofre del Tesoro# aguarda" });
+
+    hintTable[RHT_MARKET_TREASURE_CHEST_GAME_KEY_5] = HintText::Sometimes(
+        {
+            // obscure text
+            Text{ "#gambling 5 times# grants", /*french*/ "#parier cinq fois# donne",
+                  /*spanish*/ "#apostar cinco veces# revelará" },
+            Text{ "the #ninth or tenth game chest# contains",
+                  /*french*/ "le #neuvième ou dixième coffre à jeu# contient",
+                  /*spanish*/ "#el noveno o décimo cofre del azar# revela" },
+        },
+        {},
+        // clear text
+        Text{ "the #fifth locked room# in the chest game contains",
+              /*french*/ "la #cinquième salle# de la Chasse-aux-Trésors contient",
+              /*spanish*/ "#en la quinta sala del Cofre del Tesoro# aguarda" });
+
     hintTable[RHT_GF_HBA_1500_POINTS] = HintText::Sometimes(
         {
             // obscure text

From 65c580633339f9bd3bd5bd0cb1d9b408869df5e7 Mon Sep 17 00:00:00 2001
From: Christopher Leggett <chris@leggett.dev>
Date: Wed, 24 Apr 2024 17:09:49 -0400
Subject: [PATCH 124/230] Better fix for blank hint issue. (#4070)

---
 soh/soh/Enhancements/randomizer/3drando/hints.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.cpp b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
index ba4fce24b..e007c06af 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hints.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
@@ -964,7 +964,12 @@ static void DistributeHints(std::vector<uint8_t>& selected, size_t stoneCount, s
     for (uint8_t distribution = 0; distribution < distTable.size(); distribution++){
       currentWeight -= distTable[distribution].weight;
       if (currentWeight <= 0){
-        if (stoneCount >= distTable[distribution].copies || distTable[distribution].copies == 0){
+        if (distTable[distribution].copies == 0) {
+          // This should only happen if we ran out of locations to place hints of a certain distribution earlier. Skip
+          // to the next distribution.
+          break;
+        }
+        if (stoneCount >= distTable[distribution].copies){
           selected[distribution] += 1;
           stoneCount -= distTable[distribution].copies;
           break;

From d22dbd69338e770eb2f944d458fdb65ab3560dac Mon Sep 17 00:00:00 2001
From: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Date: Sun, 21 Apr 2024 21:16:59 -0400
Subject: [PATCH 125/230] move `RawJson` to LUS (#4063)

---
 soh/soh/Enhancements/tts/tts.cpp             | 12 ++++++------
 soh/soh/OTRGlobals.cpp                       |  2 --
 soh/soh/resource/importer/RawJsonFactory.cpp | 19 -------------------
 soh/soh/resource/importer/RawJsonFactory.h   | 11 -----------
 soh/soh/resource/type/RawJson.cpp            | 14 --------------
 soh/soh/resource/type/RawJson.h              | 20 --------------------
 soh/soh/resource/type/SohResourceType.h      |  1 -
 7 files changed, 6 insertions(+), 73 deletions(-)
 delete mode 100644 soh/soh/resource/importer/RawJsonFactory.cpp
 delete mode 100644 soh/soh/resource/importer/RawJsonFactory.h
 delete mode 100644 soh/soh/resource/type/RawJson.cpp
 delete mode 100644 soh/soh/resource/type/RawJson.h

diff --git a/soh/soh/Enhancements/tts/tts.cpp b/soh/soh/Enhancements/tts/tts.cpp
index f4b498815..3a375230f 100644
--- a/soh/soh/Enhancements/tts/tts.cpp
+++ b/soh/soh/Enhancements/tts/tts.cpp
@@ -3,6 +3,7 @@
 
 #include <cassert>
 #include <File.h>
+#include <Json.h>
 #include <libultraship/classes.h>
 #include <nlohmann/json.hpp>
 #include <spdlog/fmt/fmt.h>
@@ -12,7 +13,6 @@
 #include "overlays/gamestates/ovl_file_choose/file_choose.h"
 #include "soh/Enhancements/boss-rush/BossRush.h"
 #include "soh/resource/type/SohResourceType.h"
-#include "soh/resource/type/RawJson.h"
 
 extern "C" {
 extern MapData* gMapData;
@@ -1041,19 +1041,19 @@ void InitTTSBank() {
 
     auto initData = std::make_shared<LUS::ResourceInitData>();
     initData->Format = RESOURCE_FORMAT_BINARY;
-    initData->Type = static_cast<uint32_t>(SOH::ResourceType::SOH_RawJson);
+    initData->Type = static_cast<uint32_t>(LUS::ResourceType::Json);
     initData->ResourceVersion = 0;
     
-    sceneMap = std::static_pointer_cast<SOH::RawJson>(
+    sceneMap = std::static_pointer_cast<LUS::Json>(
         LUS::Context::GetInstance()->GetResourceManager()->LoadResource("accessibility/texts/scenes" + languageSuffix, true, initData))->Data;
 
-    miscMap = std::static_pointer_cast<SOH::RawJson>(
+    miscMap = std::static_pointer_cast<LUS::Json>(
         LUS::Context::GetInstance()->GetResourceManager()->LoadResource("accessibility/texts/misc" + languageSuffix, true, initData))->Data;
 
-    kaleidoMap = std::static_pointer_cast<SOH::RawJson>(
+    kaleidoMap = std::static_pointer_cast<LUS::Json>(
         LUS::Context::GetInstance()->GetResourceManager()->LoadResource("accessibility/texts/kaleidoscope" + languageSuffix, true, initData))->Data;
 
-    fileChooseMap = std::static_pointer_cast<SOH::RawJson>(
+    fileChooseMap = std::static_pointer_cast<LUS::Json>(
         LUS::Context::GetInstance()->GetResourceManager()->LoadResource("accessibility/texts/filechoose" + languageSuffix, true, initData))->Data;
 }
 
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
index c7e363ad7..d62e75703 100644
--- a/soh/soh/OTRGlobals.cpp
+++ b/soh/soh/OTRGlobals.cpp
@@ -120,7 +120,6 @@ GameInteractorSail* GameInteractorSail::Instance;
 #include "soh/resource/importer/SkeletonLimbFactory.h"
 #include "soh/resource/importer/TextFactory.h"
 #include "soh/resource/importer/BackgroundFactory.h"
-#include "soh/resource/importer/RawJsonFactory.h"
 
 #include "soh/config/ConfigUpdaters.h"
 
@@ -349,7 +348,6 @@ OTRGlobals::OTRGlobals() {
     loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryBinaryAudioSoundFontV2>(), RESOURCE_FORMAT_BINARY, "AudioSoundFont", static_cast<uint32_t>(SOH::ResourceType::SOH_AudioSoundFont), 2);
     loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryBinaryAudioSequenceV2>(), RESOURCE_FORMAT_BINARY, "AudioSequence", static_cast<uint32_t>(SOH::ResourceType::SOH_AudioSequence), 2);
     loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryBinaryBackgroundV0>(), RESOURCE_FORMAT_BINARY, "Background", static_cast<uint32_t>(SOH::ResourceType::SOH_Background), 0);
-    loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryBinaryRawJsonV0>(), RESOURCE_FORMAT_BINARY, "RawJson", static_cast<uint32_t>(SOH::ResourceType::SOH_RawJson), 0);
 
     gSaveStateMgr = std::make_shared<SaveStateMgr>();
     gRandoContext = Rando::Context::CreateInstance();
diff --git a/soh/soh/resource/importer/RawJsonFactory.cpp b/soh/soh/resource/importer/RawJsonFactory.cpp
deleted file mode 100644
index 4978f6f96..000000000
--- a/soh/soh/resource/importer/RawJsonFactory.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "soh/resource/importer/RawJsonFactory.h"
-#include "soh/resource/type/RawJson.h"
-#include "spdlog/spdlog.h"
-
-namespace SOH {
-std::shared_ptr<LUS::IResource> ResourceFactoryBinaryRawJsonV0::ReadResource(std::shared_ptr<LUS::File> file) {
-    if (!FileHasValidFormatAndReader(file)) {
-        return nullptr;
-    }
-
-    auto rawJson = std::make_shared<RawJson>(file->InitData);
-    auto reader = std::get<std::shared_ptr<LUS::BinaryReader>>(file->Reader);
-
-    rawJson->DataSize = file->Buffer->size();
-    rawJson->Data = nlohmann::json::parse(reader->ReadCString(), nullptr, true, true);
-
-    return rawJson;
-}
-} // namespace SOH
diff --git a/soh/soh/resource/importer/RawJsonFactory.h b/soh/soh/resource/importer/RawJsonFactory.h
deleted file mode 100644
index d5fa656b6..000000000
--- a/soh/soh/resource/importer/RawJsonFactory.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#include "resource/Resource.h"
-#include "resource/ResourceFactoryBinary.h"
-
-namespace SOH {
-class ResourceFactoryBinaryRawJsonV0 : public LUS::ResourceFactoryBinary {
-  public:
-    std::shared_ptr<LUS::IResource> ReadResource(std::shared_ptr<LUS::File> file) override;
-};
-}; // namespace SOH
diff --git a/soh/soh/resource/type/RawJson.cpp b/soh/soh/resource/type/RawJson.cpp
deleted file mode 100644
index 3022a67ef..000000000
--- a/soh/soh/resource/type/RawJson.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "RawJson.h"
-
-namespace SOH {
-RawJson::RawJson() : Resource(std::shared_ptr<LUS::ResourceInitData>()) {
-}
-
-void* RawJson::GetPointer() {
-    return &Data;
-}
-
-size_t RawJson::GetPointerSize() {
-    return DataSize * sizeof(char);
-}
-} // namespace SOH
diff --git a/soh/soh/resource/type/RawJson.h b/soh/soh/resource/type/RawJson.h
deleted file mode 100644
index 47e0323cc..000000000
--- a/soh/soh/resource/type/RawJson.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#pragma once
-
-#include "resource/Resource.h"
-#include <nlohmann/json.hpp>
-
-namespace SOH {
-
-class RawJson : public LUS::Resource<void> {
-  public:
-    using Resource::Resource;
-
-    RawJson();
-
-    void* GetPointer() override;
-    size_t GetPointerSize() override;
-
-    nlohmann::json Data;
-    size_t DataSize;
-};
-}; // namespace SOH
diff --git a/soh/soh/resource/type/SohResourceType.h b/soh/soh/resource/type/SohResourceType.h
index 3ef4163fe..fdf39031e 100644
--- a/soh/soh/resource/type/SohResourceType.h
+++ b/soh/soh/resource/type/SohResourceType.h
@@ -17,6 +17,5 @@ enum class ResourceType {
     SOH_AudioSequence = 0x4F534551,   // OSEQ
     SOH_Background = 0x4F424749,      // OBGI
     SOH_SceneCommand = 0x4F52434D,    // ORCM
-    SOH_RawJson = 0x4A534F4E,         // JSON
 };
 } // namespace SOH

From b2041df311fa68331836246b55f58dbd515aefca Mon Sep 17 00:00:00 2001
From: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Date: Wed, 24 Apr 2024 21:21:22 -0400
Subject: [PATCH 126/230] latest lus main

---
 libultraship | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libultraship b/libultraship
index b505413e8..493639d5d 160000
--- a/libultraship
+++ b/libultraship
@@ -1 +1 @@
-Subproject commit b505413e85591ffc633c063ee2fe43cd7810b981
+Subproject commit 493639d5daf75c8fa5d374f96fc95b652714299f

From 1fff8fd6d5da26b089f7ec1ec0ef7e4bce17f1ee Mon Sep 17 00:00:00 2001
From: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Date: Wed, 24 Apr 2024 21:48:31 -0400
Subject: [PATCH 127/230] don't skip item give animation in chu bowling

---
 soh/soh/Enhancements/randomizer/hook_handlers.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index 42dabae88..bd71f7e0c 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -244,6 +244,9 @@ void RandomizerOnPlayerUpdateForRCQueueHandler() {
             // Skipping ItemGet animation incompatible with checks that require closing a text box to finish
             rc != RC_HF_OCARINA_OF_TIME_ITEM &&
             rc != RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST &&
+            rc != RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE &&
+            rc != RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE &&
+            rc != RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS &&
             // Always show ItemGet animation for ice traps
             !(getItemEntry.modIndex == MOD_RANDOMIZER && getItemEntry.getItemId == RG_ICE_TRAP) &&
             (

From d69814ed95238cd76aba208a9e321adbe5926350 Mon Sep 17 00:00:00 2001
From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Date: Mon, 29 Apr 2024 15:41:33 +0100
Subject: [PATCH 128/230] Real time Hint Assembly, Hint object refactor, and
 expansion of CustomMessage (#4078)

* Hint text refactor WIP DOES NOT BUILD

* Update to show people DOES NOT BUILD

* stuck on wierd errors

* forgot to add

* expression error does not name a type

* commit in case anyone looks

* static assertion failed: T must be an integral type or an enum.

* fail without error, complaining about unrefernced things

* fix some issues, still linker bs

* restructure some trials, conditionalAlwaysHints and hint_list stuff

* builds and does not crash, but there's text issues

* fix text issues

* commit to push, halfway through trimming down log

* finish trimming spoiler logging

* post merge clean up

* plando mode seems to work, looking into song text wierdness

* push for debugging crash on HBA sign

* fix num and anju issues

* fix the damn sign

* Fix Windows build

Renames GetMessage to GetHintMessage (a different name could be chosen, but GetMessage conflicts with a macro in winuser.h)
Changes uint to size_t, uint does not seem to exist on Windows.

* fix biggoron

* remove some manual formatting that autoformat doesn't like

* fix some altar text

* fix more altar text

* last cleanup

---------

Co-authored-by: Christopher Leggett <chris@leggett.dev>
---
 .../custom-message/CustomMessageManager.cpp   |  478 +-
 .../custom-message/CustomMessageManager.h     |  120 +-
 .../custom-message/CustomMessageTypes.h       |    1 +
 .../Enhancements/debugger/MessageViewer.cpp   |   11 +-
 soh/soh/Enhancements/mods.cpp                 |    4 +-
 soh/soh/Enhancements/presets.h                |    3 +-
 .../randomizer/3drando/custom_messages.cpp    |    6 +-
 .../randomizer/3drando/custom_messages.hpp    |   11 +-
 .../Enhancements/randomizer/3drando/fill.cpp  |    8 -
 .../randomizer/3drando/hint_list.cpp          | 5977 ++++++++---------
 .../randomizer/3drando/hint_list.hpp          |   16 -
 .../hint_list/hint_list_exclude_dungeon.cpp   | 3167 ++++-----
 .../hint_list/hint_list_exclude_overworld.cpp | 2956 ++++----
 .../3drando/hint_list/hint_list_item.cpp      | 4224 ++++++------
 .../Enhancements/randomizer/3drando/hints.cpp | 1131 ++--
 .../Enhancements/randomizer/3drando/hints.hpp |  224 +-
 .../randomizer/3drando/location_access.hpp    |    1 -
 .../location_access/locacc_castle_town.cpp    |    4 +-
 .../location_access/locacc_ganons_castle.cpp  |   24 +-
 .../location_access/locacc_hyrule_field.cpp   |    4 +-
 .../location_access/locacc_kakariko.cpp       |    2 +-
 .../location_access/locacc_lost_woods.cpp     |    4 +-
 .../location_access/locacc_zoras_domain.cpp   |    4 +-
 .../randomizer/3drando/rando_main.cpp         |    2 -
 .../randomizer/3drando/spoiler_log.cpp        |  126 +-
 .../Enhancements/randomizer/3drando/text.hpp  |   31 +-
 soh/soh/Enhancements/randomizer/context.cpp   |  208 +-
 soh/soh/Enhancements/randomizer/context.h     |   19 +-
 soh/soh/Enhancements/randomizer/hint.cpp      |  719 +-
 soh/soh/Enhancements/randomizer/hint.h        |   95 +-
 soh/soh/Enhancements/randomizer/item.cpp      |    2 +-
 soh/soh/Enhancements/randomizer/item.h        |    2 +-
 soh/soh/Enhancements/randomizer/item_list.cpp |    8 +-
 .../Enhancements/randomizer/item_location.cpp |   14 +-
 .../Enhancements/randomizer/item_location.h   |   12 +-
 soh/soh/Enhancements/randomizer/location.cpp  |    6 +-
 .../Enhancements/randomizer/location_list.cpp |  151 +-
 .../randomizer/option_descriptions.cpp        |   13 +-
 .../Enhancements/randomizer/randomizer.cpp    |  554 +-
 soh/soh/Enhancements/randomizer/randomizer.h  |    4 -
 .../Enhancements/randomizer/randomizerTypes.h |  318 +-
 soh/soh/Enhancements/randomizer/settings.cpp  |   19 +-
 .../Enhancements/randomizer/static_data.cpp   |  307 +
 soh/soh/Enhancements/randomizer/static_data.h |   30 +-
 soh/soh/Enhancements/randomizer/trial.cpp     |   40 +-
 soh/soh/Enhancements/randomizer/trial.h       |   30 +-
 soh/soh/OTRGlobals.cpp                        |  251 +-
 soh/soh/SaveManager.cpp                       |  185 +-
 soh/soh/SaveManager.h                         |    1 +
 soh/soh/z_message_OTR.cpp                     |   24 +-
 soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c   |   29 +-
 51 files changed, 10736 insertions(+), 10844 deletions(-)
 delete mode 100644 soh/soh/Enhancements/randomizer/3drando/hint_list.hpp
 create mode 100644 soh/soh/Enhancements/randomizer/static_data.cpp

diff --git a/soh/soh/Enhancements/custom-message/CustomMessageManager.cpp b/soh/soh/Enhancements/custom-message/CustomMessageManager.cpp
index 92c13e85f..8c71fb023 100644
--- a/soh/soh/Enhancements/custom-message/CustomMessageManager.cpp
+++ b/soh/soh/Enhancements/custom-message/CustomMessageManager.cpp
@@ -3,7 +3,9 @@
 #include <algorithm>
 #include <stdint.h>
 #include <cstring>
-#include <string>
+#include <map>
+#include <spdlog/spdlog.h>
+#include <variables.h>
 
 using namespace std::literals::string_literals;
 
@@ -14,9 +16,10 @@ static const std::unordered_map<std::string, char> textBoxSpecialCharacters = {
     { "è", 0x95 }, { "é", 0x96 }, { "ê", 0x97 }, { "ë", 0x98 }, { "ï", 0x99 }, { "ô", 0x9A }, { "ö", 0x9B },
     { "ù", 0x9C }, { "û", 0x9D }, { "ü", 0x9E }
 };
-static const std::unordered_map<std::string, char> colors = { { "w", QM_WHITE },  { "r", QM_RED },   { "g", QM_GREEN },
+static const std::unordered_map<std::string, std::string> percentColors = { { "w", QM_WHITE },  { "r", QM_RED },   { "g", QM_GREEN },
                                                               { "b", QM_BLUE },   { "c", QM_LBLUE }, { "p", QM_PINK },
                                                               { "y", QM_YELLOW }, { "B", QM_BLACK } };
+
 static const std::unordered_map<std::string, ItemID> altarIcons = {
     { "0", ITEM_KOKIRI_EMERALD },
     { "1", ITEM_GORON_RUBY },
@@ -33,61 +36,190 @@ static const std::unordered_map<std::string, ItemID> altarIcons = {
     { "c", ITEM_OCARINA_FAIRY },
     { "i", ITEM_OCARINA_TIME },
     { "L", ITEM_BOW_ARROW_LIGHT },
-    { "k", ITEM_TUNIC_KOKIRI }
+    { "k", ITEM_TUNIC_KOKIRI },
+    { "m", ITEM_DUNGEON_MAP },
+    { "C", ITEM_COMPASS },
+    { "s", ITEM_SKULL_TOKEN },
+    { "g", ITEM_MASK_GORON }
+};
+
+static std::map<std::string, int> pixelWidthTable = {
+    { " ", 6 },  { "!", 6 },  { "\"", 5 },     { "#", 7 },  { "$", 7 },  { "%", 11 }, { "&", 9 },  { "\'", 3 },
+    { "(", 6 },  { ")", 6 },  { "*", 6 },      { "+", 7 },  { ",", 3 },  { "-", 5 },  { ".", 3 },  { "/", 7 },
+    { "0", 8 },  { "1", 4 },  { "2", 7 },      { "3", 7 },  { "4", 8 },  { "5", 7 },  { "6", 7 },  { "7", 7 },
+    { "8", 7 },  { "9", 7 },  { ":", 5 },      { ";", 5 },  { "<", 7 },  { "=", 9 },  { ">", 7 },  { "?", 9 },
+    { "@", 10 }, { "A", 9 },  { "B", 7 },      { "C", 9 },  { "D", 9 },  { "E", 6 },  { "F", 6 },  { "G", 9 },
+    { "H", 8 },  { "I", 3 },  { "J", 6 },      { "K", 8 },  { "L", 6 },  { "M", 10 }, { "N", 9 },  { "O", 10 },
+    { "P", 7 },  { "Q", 10 }, { "R", 8 },      { "S", 8 },  { "T", 7 },  { "U", 8 },  { "V", 9 },  { "W", 12 },
+    { "X", 9 },  { "Y", 8 },  { "Z", 8 },      { "[", 6 },  { "\\", 8 }, { "]", 6 },  { "^", 8 },  { "_", 7 },
+    { "`", 4 },  { "a", 6 },  { "b", 7 },      { "c", 6 },  { "d", 7 },  { "e", 7 },  { "f", 5 },  { "g", 7 },
+    { "h", 6 },  { "i", 3 },  { "j", 5 },      { "k", 6 },  { "l", 3 },  { "m", 9 },  { "n", 7 },  { "o", 7 },
+    { "p", 7 },  { "q", 7 },  { "r", 6 },      { "s", 6 },  { "t", 6 },  { "u", 6 },  { "v", 7 },  { "w", 9 },
+    { "x", 6 },  { "y", 7 },  { "z", 6 },      { "{", 6 },  { "¦", 4 },  { "}", 6 },  { "¡", 5 },  { "¢", 7 },
+    { "£", 8 },  { "¤", 7 },  { "¥", 8 },      { "|", 4 },  { "§", 12 }, { "¨", 12 }, { "©", 10 }, { "ª", 5 },
+    { "«", 8 },  { "¬", 7 },  { "\u00AD", 6 }, { "®", 10 }, { "¯", 8 },  { "°", 12 }, { "±", 12 }, { "²", 5 },
+    { "³", 5 },  { "µ", 6 },  { "¶", 8 },      { "·", 4 },  { "¹", 4 },  { "º", 5 },  { "»", 9 },  { "¼", 9 },
+    { "½", 9 },  { "¾", 10 }, { "¿", 7 },      { "À", 11 }, { "Á", 9 },  { "Â", 9 },  { "Ã", 9 },  { "Ä", 9 },
+    { "Å", 9 },  { "Æ", 12 }, { "Ç", 9 },      { "È", 6 },  { "É", 6 },  { "Ê", 6 },  { "Ë", 6 },  { "Ì", 5 },
+    { "Í", 5 },  { "Î", 5 },  { "Ï", 5 },      { "Ð", 10 }, { "Ñ", 9 },  { "Ò", 10 }, { "Ó", 10 }, { "Ô", 10 },
+    { "Õ", 10 }, { "Ö", 10 }, { "×", 9 },      { "Ø", 10 }, { "Ù", 8 },  { "Ú", 8 },  { "Û", 8 },  { "Ü", 8 },
+    { "Ý", 10 }, { "Þ", 8 },  { "ß", 7 },      { "à", 6 },  { "á", 6 },  { "â", 6 },  { "ã", 6 },  { "ä", 6 },
+    { "å", 6 },  { "æ", 11 }, { "ç", 6 },      { "è", 7 },  { "é", 7 },  { "ê", 7 },  { "ë", 7 },  { "ì", 5 },
+    { "í", 5 },  { "î", 5 },  { "ï", 5 },      { "ð", 7 },  { "ñ", 7 },  { "ò", 7 },  { "ó", 7 },  { "ô", 7 },
+    { "õ", 7 },  { "ö", 7 },  { "÷", 11 },     { "ø", 9 },  { "ù", 7 },  { "ú", 7 },  { "û", 7 },  { "ü", 7 },
+    { "ý", 8 },  { "þ", 8 },  { "ÿ", 8 },      { "Œ", 11 }, { "œ", 11 }, { "„", 5 },  { "”", 5 },  { "€", 10 },
+    { "Ÿ", 10 }, { "~", 8 }
 };
 
 CustomMessage::CustomMessage(std::string english_, std::string german_, std::string french_, TextBoxType type_,
                              TextBoxPosition position_)
-    : english(std::move(english_)), german(std::move(german_)), french(std::move(french_)), type(type_),
-      position(position_) {
+    : type(type_), position(position_){
+    messages[LANGUAGE_ENG] = std::move(english_);
+    messages[LANGUAGE_GER] = std::move(german_);
+    messages[LANGUAGE_FRA] = std::move(french_);
+}
+
+CustomMessage::CustomMessage(std::string english_, std::string german_, std::string french_, std::vector<std::string> colors_,
+                              std::vector<bool> capital_, TextBoxType type_, TextBoxPosition position_) {
+    messages[LANGUAGE_ENG] = std::move(english_);
+    messages[LANGUAGE_GER] = std::move(german_);
+    messages[LANGUAGE_FRA] = std::move(french_);
+    colors = colors_;
+    capital = capital_;
+    type = type_;
+    position = position_;
+}
+
+CustomMessage::CustomMessage(std::string english_, TextBoxType type_, TextBoxPosition position_)
+    : type(type_), position(position_) {
+    messages[LANGUAGE_ENG] = std::move(english_);
+}
+
+CustomMessage::CustomMessage(std::string english_, std::vector<std::string> colors_, std::vector<bool> capital_, TextBoxType type_, TextBoxPosition position_){
+    messages[LANGUAGE_ENG] = std::move(english_);
+    colors = colors_;
+    capital = capital_;
+    type = type_;
+    position = position_;
 }
 
 CustomMessage::CustomMessage(Text text, TextBoxType type_,TextBoxPosition position_)
-    : english(text.GetEnglish()), german(text.GetGerman()), french(text.GetFrench()), type(type_),
-      position(position_) {
+    : type(type_), position(position_) {
+    messages[LANGUAGE_ENG] = text.GetEnglish();
+    messages[LANGUAGE_GER] = text.GetGerman();
+    messages[LANGUAGE_FRA] = text.GetFrench();
 }
 
-const std::string& CustomMessage::GetEnglish() const {
-    return english;
+const std::string CustomMessage::GetEnglish(MessageFormat format) const {
+    return GetForLanguage(LANGUAGE_ENG, format);
 }
 
-const std::string& CustomMessage::GetFrench() const {
-    if (french.length() > 0) {
-        return french;
-    }
-    return english;
+const std::string CustomMessage::GetGerman(MessageFormat format) const {
+    return GetForLanguage(LANGUAGE_GER, format);
 }
-const std::string& CustomMessage::GetGerman() const {
-    if (german.length() > 0) {
-        return german;
+
+const std::string CustomMessage::GetFrench(MessageFormat format) const {
+    return GetForLanguage(LANGUAGE_FRA, format);
+}
+
+const std::string CustomMessage::GetForCurrentLanguage(MessageFormat format) const {
+    return GetForLanguage(gSaveContext.language, format);
+}
+
+const std::string CustomMessage::GetForLanguage(uint8_t language, MessageFormat format) const {
+    std::string output = messages[language].length() > 0 ? messages[language] : messages[LANGUAGE_ENG];
+    ProcessMessageFormat(output, format);
+    return output;
+}
+
+const std::vector<std::string> CustomMessage::GetAllMessages(MessageFormat format) const{
+    std::vector<std::string> output = messages;
+    for (auto str : output){
+        ProcessMessageFormat(str, format);
     }
-    return english;
+    return output;
+}
+
+void CustomMessage::ProcessMessageFormat(std::string& str, MessageFormat format) const {
+    if (format == MF_FORMATTED){
+        FormatString(str);
+    } else if (format == MF_CLEAN){
+        CleanString(str);
+    } else if (format == MF_AUTO_FORMAT){
+        AutoFormatString(str);
+    }
+}
+
+const std::vector<bool>& CustomMessage::GetCapital() const {
+    return capital;
+}
+
+void CustomMessage::SetCapital(std::vector<bool> capital_){
+    capital = capital_;
+}
+const std::vector<std::string>& CustomMessage::GetColors() const {
+    return colors;
+}
+
+void CustomMessage::SetColors(std::vector<std::string> colors_){
+    colors = colors_;
 }
 
 const TextBoxType& CustomMessage::GetTextBoxType() const {
     return type;
 }
 
+void CustomMessage::SetTextBoxType(TextBoxType boxType){
+    type = boxType;
+}
+
 const TextBoxPosition& CustomMessage::GetTextBoxPosition() const {
     return position;
 }
 
 CustomMessage CustomMessage::operator+(const CustomMessage& right) const {
-    return CustomMessage(english + right.GetEnglish(), german + right.GetGerman(), french + right.GetFrench());
+    std::vector<std::string> newColors = colors;
+    std::vector<std::string> rColors = right.GetColors();
+    for (auto color: rColors){
+        newColors.push_back(color);
+    }
+    std::vector<bool> newCapital = capital;
+    newCapital.insert(capital.end(), right.GetCapital().begin(), right.GetCapital().end());
+    return CustomMessage(messages[LANGUAGE_ENG] + right.GetEnglish(MF_RAW),
+                         messages[LANGUAGE_GER] + right.GetGerman(MF_RAW),
+                         messages[LANGUAGE_FRA] + right.GetFrench(MF_RAW),
+                         newColors, newCapital, type, position);
 }
 
 CustomMessage CustomMessage::operator+(const std::string& right) const {
-    return CustomMessage(english + right, german + right, french + right);
+    return CustomMessage(messages[LANGUAGE_ENG] + right, messages[LANGUAGE_GER] + right, messages[LANGUAGE_FRA] + right);
+}
+
+void CustomMessage::operator+=(const CustomMessage& right) {
+    messages[LANGUAGE_ENG] += right.GetEnglish(MF_RAW);
+    messages[LANGUAGE_GER] += right.GetGerman(MF_RAW);
+    messages[LANGUAGE_FRA] += right.GetFrench(MF_RAW);
+    colors.insert(colors.end(), right.GetColors().begin(), right.GetColors().end());
+    capital.insert(capital.end(), right.GetCapital().begin(), right.GetCapital().end());
 }
 
 void CustomMessage::operator+=(const std::string& right) {
-    english += right;
-    french += right;
-    german += right;
+    messages[LANGUAGE_ENG] += right;
+    messages[LANGUAGE_GER] += right;
+    messages[LANGUAGE_FRA] += right;
 }
 
 bool CustomMessage::operator==(const CustomMessage& operand) const {
-    return english == operand.english;
+    return messages[LANGUAGE_ENG] == operand.messages[LANGUAGE_ENG];
+}
+
+bool CustomMessage::operator==(const std::string& operand) const {
+    for (auto str: messages){
+        if (str == operand){
+            return true;
+        }
+    }
+    return false;
 }
 
 bool CustomMessage::operator!=(const CustomMessage& operand) const {
@@ -95,83 +227,209 @@ bool CustomMessage::operator!=(const CustomMessage& operand) const {
 }
 
 void CustomMessage::Replace(std::string&& oldStr, std::string&& newStr) {
-    for (std::string* str : { &english, &french, &german }) {
-        size_t position = str->find(oldStr);
+    for (std::string& str : messages) {
+        size_t position = str.find(oldStr);
         while (position != std::string::npos) {
-            str->replace(position, oldStr.length(), newStr);
-            position = str->find(oldStr);
+            str.replace(position, oldStr.length(), newStr);
+            position = str.find(oldStr);
         }
     }
-    Format();
 }
 
-void CustomMessage::Replace(std::string&& oldStr, std::string&& newEnglish, std::string&& newGerman,
-                            std::string&& newFrench) {
-    size_t position = 0;
-    position = english.find(oldStr);
-    while (position != std::string::npos) {
-        english.replace(position, oldStr.length(), newEnglish);
-        position = english.find(oldStr);
+void CustomMessage::Replace(std::string&& oldStr, CustomMessage newMessage) {
+    for (uint8_t language = 0; language < LANGUAGE_MAX; language++) {
+        size_t position = messages[language].find(oldStr);
+        while (position != std::string::npos) {
+            messages[language].replace(position, oldStr.length(), newMessage.messages[language]);
+            position = messages[language].find(oldStr);
+        }
     }
-    position = french.find(oldStr);
-    while (position != std::string::npos) {
-        french.replace(position, oldStr.length(), newFrench);
-        position = french.find(oldStr);
-    }
-    position = german.find(oldStr);
-    while (position != std::string::npos) {
-        german.replace(position, oldStr.length(), newGerman);
-        position = german.find(oldStr);
-    }
-    Format();
 }
 
 void CustomMessage::Format(ItemID iid) {
-    for (std::string* str : { &english, &french, &german }) {
-        str->insert(0, ITEM_OBTAINED(iid));
+    for (std::string &str : messages) {
+        str.insert(0, ITEM_OBTAINED(iid));
         size_t start_pos = 0;
-        std::replace(str->begin(), str->end(), '&', NEWLINE()[0]);
-        while ((start_pos = str->find('^', start_pos)) != std::string::npos) {
-            str->replace(start_pos, 1, WAIT_FOR_INPUT() + ITEM_OBTAINED(iid));
+        std::replace(str.begin(), str.end(), '&', NEWLINE()[0]);
+        while ((start_pos = str.find('^', start_pos)) != std::string::npos) {
+            str.replace(start_pos, 1, WAIT_FOR_INPUT() + ITEM_OBTAINED(iid));
             start_pos += 3;
         }
-        std::replace(str->begin(), str->end(), '@', PLAYER_NAME()[0]);
+        std::replace(str.begin(), str.end(), '@', PLAYER_NAME()[0]);
+        ReplaceSpecialCharacters(str);
+        ReplaceColors(str);
+        ReplaceAltarIcons(str);
     }
-    ReplaceSpecialCharacters();
-    ReplaceColors();
-    ReplaceAltarIcons();
     *this += MESSAGE_END();
 }
 
 void CustomMessage::Format() {
-    for (std::string* str : { &english, &french, &german }) {
-        std::replace(str->begin(), str->end(), '&', NEWLINE()[0]);
-        std::replace(str->begin(), str->end(), '^', WAIT_FOR_INPUT()[0]);
-        std::replace(str->begin(), str->end(), '@', PLAYER_NAME()[0]);
+    for (std::string& str : messages) {
+        FormatString(str);
     }
-    ReplaceSpecialCharacters();
-    ReplaceColors();
-    ReplaceAltarIcons();
-    *this += MESSAGE_END();
 }
 
+void CustomMessage::AutoFormat() {
+    for (std::string& str : messages) {
+        AutoFormatString(str);
+    }
+}
+
+void CustomMessage::Clean() {
+    for (std::string& str : messages) {
+        CleanString(str);
+    }
+}
+
+void CustomMessage::FormatString(std::string& str) const {
+    std::replace(str.begin(), str.end(), '&', NEWLINE()[0]);
+    std::replace(str.begin(), str.end(), '^', WAIT_FOR_INPUT()[0]);
+    std::replace(str.begin(), str.end(), '@', PLAYER_NAME()[0]);
+    ReplaceSpecialCharacters(str);
+    ReplaceColors(str);
+    ReplaceAltarIcons(str);
+    str += MESSAGE_END();
+}
+
+void DeleteControlCode(std::string& str, std::string code){
+    size_t start_pos = 0;
+    while ((start_pos = str.find(code, start_pos)) != std::string::npos) {
+        str.replace(start_pos, code.length(), "");
+        start_pos += code.length();
+    }
+}
+
+void CustomMessage::CleanString(std::string& str) const {
+    std::replace(str.begin(), str.end(), '&', "\n"[0]);
+    std::replace(str.begin(), str.end(), '^', " "[0]);
+    for (const auto& colorPair : percentColors) {
+        DeleteControlCode(str, "%" + colorPair.first);
+    }
+    std::erase(str, '#');
+    for (const auto& iconPair : altarIcons) {
+        DeleteControlCode(str, "$" + iconPair.first);
+    }
+}
+
+static size_t NextLineLength(const std::string* textStr, const size_t lastNewline, bool hasIcon = false) {
+  const  size_t maxLinePixelWidth = hasIcon ? 200 : 216;
+
+
+  size_t totalPixelWidth = 0;
+  size_t currentPos = lastNewline;
+
+  // Looping through the string from the lastNewline until the total
+  // width of counted characters exceeds the maximum pixels in a line.
+  size_t nextPosJump = 0;
+  while (totalPixelWidth < maxLinePixelWidth && currentPos < textStr->length()) {
+    // Skip over control codes
+    if (textStr->at(currentPos) == '%') {
+      nextPosJump = 2;
+    } else if (textStr->at(currentPos) == '$') {
+      nextPosJump = 2;
+    } else if (textStr->at(currentPos) == '@') {
+      nextPosJump = 1;
+      // Assume worst case for player name 12 * 8 (widest character * longest name length)
+      totalPixelWidth += 96;
+    } else {
+      // Some characters only one byte while others are two bytes
+      // So check both possibilities when checking for a character
+      if (pixelWidthTable.count(textStr->substr(currentPos, 1))) {
+        totalPixelWidth += pixelWidthTable[textStr->substr(currentPos, 1)];
+        nextPosJump = 1;
+      } else if (pixelWidthTable.count(textStr->substr(currentPos, 2))) {
+        totalPixelWidth += pixelWidthTable[textStr->substr(currentPos, 2)];
+        nextPosJump = 2;
+      } else {
+        SPDLOG_DEBUG("Table does not contain " + textStr->substr(currentPos, 1) + "/" + textStr->substr(currentPos, 2));
+        SPDLOG_DEBUG("Full string: " + *textStr);
+        nextPosJump = 1;
+      }
+    }
+    currentPos += nextPosJump;
+  }
+  // return the total number of characters we looped through
+  if (totalPixelWidth > maxLinePixelWidth && textStr->at(currentPos - nextPosJump) != ' ') {
+    return currentPos - lastNewline - nextPosJump;
+  } else {
+    return currentPos - lastNewline;
+  }
+}
+
+void CustomMessage::AutoFormatString(std::string& str) const {// did I do this right?
+    ReplaceAltarIcons(str);
+    ReplaceColors(str);
+    // insert newlines either manually or when encountering a '&'
+    size_t lastNewline = 0;
+    const bool hasIcon = str.find('$', 0) != std::string::npos;
+    size_t lineLength = NextLineLength(&str, lastNewline, hasIcon);
+    while (lastNewline + lineLength < str.length()) {
+        const size_t carrot = str.find('^', lastNewline);
+        const size_t ampersand = str.find('&', lastNewline);
+        const size_t lastSpace = str.rfind(' ', lastNewline + lineLength);
+        const size_t lastPeriod = str.rfind('.', lastNewline + lineLength);
+        // replace '&' first if it's within the newline range
+        if (ampersand < lastNewline + lineLength) {
+            lastNewline = ampersand + 1;
+            // or move the lastNewline cursor to the next line if a '^' is encountered
+        } else if (carrot < lastNewline + lineLength) {
+            lastNewline = carrot + 1;
+            // some lines need to be split but don't have spaces, look for periods instead
+        } else if (lastSpace == std::string::npos) {
+            str.replace(lastPeriod, 1, ".&");
+            lastNewline = lastPeriod + 2;
+        } else {
+            str.replace(lastSpace, 1, "&");
+            lastNewline = lastSpace + 1;
+        }
+        lineLength = NextLineLength(&str, lastNewline, hasIcon);
+    }
+    ReplaceSpecialCharacters(str);
+    ReplaceAltarIcons(str);
+    std::replace(str.begin(), str.end(), '&', NEWLINE()[0]);
+    std::replace(str.begin(), str.end(), '^', WAIT_FOR_INPUT()[0]);
+    std::replace(str.begin(), str.end(), '@', PLAYER_NAME()[0]);
+    str += MESSAGE_END();
+}
+
+void CustomMessage::InsertNumber(uint8_t num){
+    for (std::string& str : messages) {
+        size_t firstBar = str.find('|');
+        if (firstBar != std::string::npos) {
+            size_t secondBar = str.find('|', firstBar + 1);
+            if (secondBar != std::string::npos) {
+                size_t thirdBar = str.find('|', secondBar + 1);
+                if (thirdBar != std::string::npos) {
+                    if (num == 1) {
+                        str.erase(secondBar, thirdBar - secondBar);
+                    } else {
+                        str.erase(firstBar, secondBar - firstBar);
+                    }
+                }
+            }
+        }
+    }
+    //remove the remaining bar
+    this->Replace("|", "");
+    Replace("[[d]]", std::to_string(num));
+}
+
+
 void CustomMessage::Capitalize() {
-    for (std::string* str : { &english, &french, &german }) {
-        (*str)[0] = std::toupper((*str)[0]);
+    for (std::string str : messages) {
+        (str)[0] = std::toupper((str)[0]);
     }
 }
 
-void CustomMessage::ReplaceSpecialCharacters() {
+void CustomMessage::ReplaceSpecialCharacters(std::string& str) const {
     // add special characters
-    for (std::string* str : { &english, &french, &german }) {
-        for (auto specialCharacterPair : textBoxSpecialCharacters) {
-            size_t start_pos = 0;
-            std::string textBoxSpecialCharacterString = ""s;
-            textBoxSpecialCharacterString += specialCharacterPair.second;
-            while ((start_pos = str->find(specialCharacterPair.first, start_pos)) != std::string::npos) {
-                str->replace(start_pos, specialCharacterPair.first.length(), textBoxSpecialCharacterString);
-                start_pos += textBoxSpecialCharacterString.length();
-            }
+    for (auto specialCharacterPair : textBoxSpecialCharacters) {
+        size_t start_pos = 0;
+        std::string textBoxSpecialCharacterString = ""s;
+        textBoxSpecialCharacterString += specialCharacterPair.second;
+        while ((start_pos = str.find(specialCharacterPair.first, start_pos)) != std::string::npos) {
+            str.replace(start_pos, specialCharacterPair.first.length(), textBoxSpecialCharacterString);
+            start_pos += textBoxSpecialCharacterString.length();
         }
     }
 }
@@ -194,31 +452,49 @@ const char* Interface_ReplaceSpecialCharacters(char text[]) {
     return textChar;
 }
 
-void CustomMessage::ReplaceColors() {
-    for (std::string* str : { &english, &french, &german }) {
-        for (const auto& colorPair : colors) {
-            std::string textToReplace = "%";
-            textToReplace += colorPair.first;
-            size_t start_pos = 0;
-            while ((start_pos = str->find(textToReplace, start_pos)) != std::string::npos) {
-                str->replace(start_pos, textToReplace.length(), COLOR(colorPair.second));
-                start_pos += textToReplace.length();
-            }
+void CustomMessage::ReplaceColors(std::string& str) const {
+    for (const auto& colorPair : percentColors) {
+        std::string textToReplace = "%";
+        textToReplace += colorPair.first;
+        size_t start_pos = 0;
+        while ((start_pos = str.find(textToReplace, start_pos)) != std::string::npos) {
+            str.replace(start_pos, textToReplace.length(), COLOR(colorPair.second));
+            start_pos += textToReplace.length();
+        }
+    }
+    for (auto color: colors) {
+        if (const size_t firstHashtag = str.find('#'); firstHashtag != std::string::npos) {
+            str.replace(firstHashtag, 1, COLOR(color));
+        if (const size_t secondHashtag = str.find('#', firstHashtag + 1); secondHashtag != std::string::npos) {
+            str.replace(secondHashtag, 1, COLOR(QM_WHITE));
+        } else {
+            SPDLOG_DEBUG("non-matching hashtags in string: \"%s\"", str);
+        }
+        }
+    }
+    // Remove any remaining '#' characters.
+    std::erase(str, '#');
+}
+
+void CustomMessage::ReplaceAltarIcons(std::string& str) const {
+    for (const auto& iconPair : altarIcons) {
+        std::string textToReplace = "$";
+        textToReplace += iconPair.first;
+        size_t start_pos = 0;
+        while ((start_pos = str.find(textToReplace, start_pos)) != std::string::npos) {
+            str.replace(start_pos, textToReplace.length(), ITEM_OBTAINED(iconPair.second));
+            start_pos += textToReplace.length();
         }
     }
 }
 
-void CustomMessage::ReplaceAltarIcons() {
-    for (std::string* str : { &english, &french, &german }) {
-        for (const auto& iconPair : altarIcons) {
-            std::string textToReplace = "$";
-            textToReplace += iconPair.first;
-            size_t start_pos = 0;
-            while ((start_pos = str->find(textToReplace, start_pos)) != std::string::npos) {
-                str->replace(start_pos, textToReplace.length(), ITEM_OBTAINED(iconPair.second));
-                start_pos += textToReplace.length();
-            }
-        }
+void CustomMessage::InsertNames(std::vector<CustomMessage> toInsert){
+    for(uint8_t a = 0; a < toInsert.size(); a++){
+        CustomMessage temp = toInsert[a];
+        if ((capital.size() > a) && (capital[a] = true)){
+            temp.Capitalize();
+        } 
+        Replace("[[" + std::to_string(a+1) + "]]", temp); 
     }
 }
 
@@ -234,8 +510,12 @@ std::string CustomMessage::NEWLINE() {
     return "\x01"s;
 }
 
-std::string CustomMessage::COLOR(uint8_t x) {
-    return "\x05"s + char(x);
+std::string CustomMessage::COLOR(std::string x) {
+    return "\x05"s + x;
+}
+
+std::string CustomMessage::POINTS(std::string x) {
+    return "\x1E"s + x;
 }
 
 std::string CustomMessage::WAIT_FOR_INPUT() {
diff --git a/soh/soh/Enhancements/custom-message/CustomMessageManager.h b/soh/soh/Enhancements/custom-message/CustomMessageManager.h
index 9c5cc92ee..2c797e527 100644
--- a/soh/soh/Enhancements/custom-message/CustomMessageManager.h
+++ b/soh/soh/Enhancements/custom-message/CustomMessageManager.h
@@ -1,8 +1,9 @@
 #pragma once
-#include <string>
 #include <unordered_map>
 #include <cstdint>
 #include <exception>
+#include <vector>
+#include <string>
 
 #include "../../../include/z64item.h"
 #include "../../../include/message_data_textbox_types.h"
@@ -10,14 +11,23 @@
 
 #undef MESSAGE_END
 
-#define QM_WHITE 0x00
-#define QM_RED 0x41
-#define QM_GREEN 0x42
-#define QM_BLUE 0x43
-#define QM_LBLUE 0x44
-#define QM_PINK 0x45
-#define QM_YELLOW 0x46
-#define QM_BLACK 0x47
+#define QM_WHITE "\x00"s
+#define QM_RED "\x41"
+#define QM_GREEN "\x42"
+#define QM_BLUE "\x43"
+#define QM_LBLUE "\x44"
+#define QM_PINK "\x45"
+#define QM_YELLOW "\x46"
+#define QM_BLACK "\x47"
+
+#define HS_HORSE_ARCHERY "\x00"s //HS_HBA is an enum already
+
+typedef enum {
+    MF_FORMATTED,
+    MF_CLEAN,
+    MF_RAW,
+    MF_AUTO_FORMAT
+} MessageFormat;
 
 /**
  * @brief Encapsulates logic surrounding languages, and formatting strings for OoT's textboxes and
@@ -30,25 +40,41 @@ class CustomMessage {
     CustomMessage() = default;
     CustomMessage(std::string english_, std::string german_, std::string french_,
                   TextBoxType type_ = TEXTBOX_TYPE_BLACK, TextBoxPosition position_ = TEXTBOX_POS_BOTTOM);
+    CustomMessage(std::string english_, std::string german_, std::string french_, std::vector<std::string> colors_, std::vector<bool> capital_ = {},
+              TextBoxType type_ = TEXTBOX_TYPE_BLACK, TextBoxPosition position_ = TEXTBOX_POS_BOTTOM);
+    CustomMessage(std::string english_, TextBoxType type_ = TEXTBOX_TYPE_BLACK, TextBoxPosition position_ = TEXTBOX_POS_BOTTOM);
+    CustomMessage(std::string english_, std::vector<std::string> colors_, std::vector<bool> capital_ = {}, TextBoxType type_ = TEXTBOX_TYPE_BLACK, TextBoxPosition position_ = TEXTBOX_POS_BOTTOM);
     CustomMessage(Text text, TextBoxType type_ = TEXTBOX_TYPE_BLACK, TextBoxPosition position_ = TEXTBOX_POS_BOTTOM);
 
     static std::string MESSAGE_END() ;
     static std::string ITEM_OBTAINED(uint8_t x) ;
     static std::string NEWLINE() ;
-    static std::string COLOR(uint8_t x) ;
+    static std::string COLOR(std::string x) ;
+    static std::string POINTS(std::string x) ;//HIGH_SCORE is also a macro
     static std::string WAIT_FOR_INPUT() ;
     static std::string PLAYER_NAME() ;
 
-    const std::string& GetEnglish() const;
-    const std::string& GetFrench() const;
-    const std::string& GetGerman() const;
+    const std::string GetEnglish(MessageFormat format = MF_FORMATTED) const;
+    const std::string GetFrench(MessageFormat format = MF_FORMATTED) const;
+    const std::string GetGerman(MessageFormat format = MF_FORMATTED) const;
+    const std::string GetForCurrentLanguage(MessageFormat format = MF_FORMATTED) const;
+    const std::string GetForLanguage(uint8_t language, MessageFormat format = MF_FORMATTED) const;
+    const std::vector<std::string> GetAllMessages(MessageFormat format = MF_FORMATTED) const;
+    void ProcessMessageFormat(std::string& str, MessageFormat format) const;
+    const std::vector<std::string>& GetColors() const;
+    void SetColors(std::vector<std::string> colors_);
+    const std::vector<bool>& GetCapital() const;
+    void SetCapital(std::vector<bool> capital_);
     const TextBoxType& GetTextBoxType() const;
+    void SetTextBoxType(TextBoxType boxType);
     const TextBoxPosition& GetTextBoxPosition() const;
 
     CustomMessage operator+(const CustomMessage& right) const;
     CustomMessage operator+(const std::string& right) const;
     void operator+=(const std::string& right);
-    bool operator==(const CustomMessage& right) const;
+    void operator+=(const CustomMessage& right);
+    bool operator==(const CustomMessage& operand) const;
+    bool operator==(const std::string& operand) const;
     bool operator!=(const CustomMessage& right) const;
 
     /**
@@ -63,15 +89,13 @@ class CustomMessage {
 
     /**
      * @brief Finds an instance of oldStr in each language of the CustomMessage,
-     * and replaces it with the corresponding new string provided for each language.
+     * and replaces it with the corresponding string in the provided CustomMessage.
      * Typically used for dynamic variable replacement (i.e. gameplay stats, skulltula count)
      *
      * @param oldStr the string to be replaced
-     * @param newEnglish the new string for the English message
-     * @param newGerman the new string for the German message
-     * @param newFrench the new string for the French message
+     * @param newMessage the message containing the new strings.
      */
-    void Replace(std::string&& oldStr, std::string&& newEnglish, std::string&& newGerman, std::string&& newFrench);
+    void Replace(std::string&& oldStr, CustomMessage newMessage);
 
     /**
      * @brief Capitalizes the first letter of the string for each language.
@@ -82,17 +106,22 @@ class CustomMessage {
      * @brief Replaces special characters (things like diacritics for non-english langugages)
      * with the control codes used to display them in OoT's textboxes.
      */
-    void ReplaceSpecialCharacters();
+    void ReplaceSpecialCharacters(std::string& str) const;
 
     /**
      * @brief Replaces our color variable strings with the OoT control codes.
      */
-    void ReplaceColors();
+    void ReplaceColors(std::string& str) const;
 
     /**
      * @brief Replaces `$<char>` variable strings with OoT control codes.
      */
-    void ReplaceAltarIcons();
+    void ReplaceAltarIcons(std::string& str) const;
+
+    /**
+     * @brief Replaces [[1]] style variable strings with the provided vector of customMessages
+     */
+    void InsertNames(std::vector<CustomMessage> toInsert);
 
     /**
      * @brief Replaces various symbols with the control codes necessary to
@@ -103,6 +132,15 @@ class CustomMessage {
      */
     void Format(ItemID iid);
 
+    /**
+     * @brief Replaces [[d]] in text with the supplied number, and if plural
+     * options exist (2 blocks of text surrounded by |) choose the former if it 1,
+     * and the latter otherwise, deleting the other and the |'s.
+     *
+     * @param num the number to insert.
+     */
+    void InsertNumber(uint8_t num);
+
     /**
      * @brief Replaces various symbols with the control codes necessary to
      * display them in OoT's textboxes. i.e. special characters, colors, newlines,
@@ -110,12 +148,44 @@ class CustomMessage {
      */
     void Format();
 
+    /**
+     * @brief formats the message specifically to fit in OoT's 
+     * textboxes, and use it's formatting.
+     */
+    void AutoFormat();
+
+    /**
+     * @brief Removes all OoT formatting from the message, 
+     * making it a good form for writing into spoiler logs.
+     */
+    void Clean();
+
+    /**
+     * @brief Replaces various symbols with the control codes necessary to
+     * display them in OoT's textboxes for a single string
+     * . i.e. special characters, colors, newlines, wait for input, etc.
+     */
+    void FormatString(std::string& str) const;
+    
+    /**
+     * @brief formats the string specifically to fit in OoT's 
+     * textboxes, and use it's formatting.
+     * RANDOTODO whoever knows exactly what this does check my adaption
+     */
+    void AutoFormatString(std::string& str) const;
+
+    /**
+     * @brief Removes symbols used for control codes from the string,
+     * leaving raw text
+     */
+    void CleanString(std::string& str) const;
+
   private:
-    std::string english = "";
-    std::string french = "";
-    std::string german = "";
+    std::vector<std::string> messages = {"","",""};
     TextBoxType type = TEXTBOX_TYPE_BLACK;
     TextBoxPosition position = TEXTBOX_POS_BOTTOM;
+    std::vector<std::string> colors = {};
+    std::vector<bool> capital = {};
 };
 
 typedef std::unordered_map<uint16_t, CustomMessage> CustomMessageTable;
diff --git a/soh/soh/Enhancements/custom-message/CustomMessageTypes.h b/soh/soh/Enhancements/custom-message/CustomMessageTypes.h
index 737d22665..1f5a093c7 100644
--- a/soh/soh/Enhancements/custom-message/CustomMessageTypes.h
+++ b/soh/soh/Enhancements/custom-message/CustomMessageTypes.h
@@ -100,6 +100,7 @@ typedef enum {
     TEXT_MALON_LINK_HAS_TIME_BUT_NO_RECORD = 0x2090,
     TEXT_MALON_LINK_HAS_RECORD = 0x2091,
     TEXT_MALON_FIRST_BEAT_THIS_RECORD = 0x2092,
+    TEXT_BIGGORON_I_MAAAADE_THISSSS = 0x3002,
     TEXT_MEDIGORON = 0x304C,
     TEXT_FIRE_TEMPLE_GORON_OWE_YOU_BIG_TIME = 0x3052,
     TEXT_BIGGORON_BETTER_AT_SMITHING = 0x3053,
diff --git a/soh/soh/Enhancements/debugger/MessageViewer.cpp b/soh/soh/Enhancements/debugger/MessageViewer.cpp
index 51fe3c0b9..92ae5070d 100644
--- a/soh/soh/Enhancements/debugger/MessageViewer.cpp
+++ b/soh/soh/Enhancements/debugger/MessageViewer.cpp
@@ -204,16 +204,7 @@ void MessageDebug_StartTextBox(const char* tableId, uint16_t textId, uint8_t lan
         const CustomMessage messageEntry = CustomMessageManager::Instance->RetrieveMessage(tableId, textId);
         font->charTexBuf[0] = (messageEntry.GetTextBoxType() << 4) | messageEntry.GetTextBoxPosition();
         switch (language) {
-            case LANGUAGE_FRA:
-                font->msgLength = SohUtils::CopyStringToCharBuffer(buffer, messageEntry.GetFrench(), maxBufferSize);
-                break;
-            case LANGUAGE_GER:
-                font->msgLength = SohUtils::CopyStringToCharBuffer(buffer, messageEntry.GetGerman(), maxBufferSize);
-                break;
-            case LANGUAGE_ENG:
-            default:
-                font->msgLength = SohUtils::CopyStringToCharBuffer(buffer, messageEntry.GetEnglish(), maxBufferSize);
-                break;
+            font->msgLength = SohUtils::CopyStringToCharBuffer(buffer, messageEntry.GetForLanguage(language), maxBufferSize);
         }
         msgCtx->msgLength = static_cast<int32_t>(font->msgLength);
     }
diff --git a/soh/soh/Enhancements/mods.cpp b/soh/soh/Enhancements/mods.cpp
index 5d86b11f4..e129048c8 100644
--- a/soh/soh/Enhancements/mods.cpp
+++ b/soh/soh/Enhancements/mods.cpp
@@ -1161,9 +1161,7 @@ void RegisterAltTrapTypes() {
 void RegisterRandomizerSheikSpawn() {
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneSpawnActors>([]() {
         if (!gPlayState) return;
-        bool canSheik = (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIAL_COUNT) != 0 &&
-          OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_LIGHT_ARROWS_HINT));
-        if (!IS_RANDO || !LINK_IS_ADULT || !canSheik) return;
+        if (!IS_RANDO || !LINK_IS_ADULT || !OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHEIK_LA_HINT)) return;
         switch (gPlayState->sceneNum) {
             case SCENE_TEMPLE_OF_TIME:
                 if (gPlayState->roomCtx.curRoom.num == 1) {
diff --git a/soh/soh/Enhancements/presets.h b/soh/soh/Enhancements/presets.h
index 822b61c75..7bc941afb 100644
--- a/soh/soh/Enhancements/presets.h
+++ b/soh/soh/Enhancements/presets.h
@@ -403,7 +403,8 @@ const std::vector<const char*> randomizerCvars = {
     "gRandomizeLacsRewardOptions",
     "gRandomizeLacsStoneCount",
     "gRandomizeLacsTokenCount",
-    "gRandomizeLAHint",
+    "gRandomizeGanondorfHint",
+    "gRandomizeSheikLAHint",
     "gRandomizeLinksPocket",
     "gRandomizeLogicRules",
     "gRandomizeMedallionCount",
diff --git a/soh/soh/Enhancements/randomizer/3drando/custom_messages.cpp b/soh/soh/Enhancements/randomizer/3drando/custom_messages.cpp
index 338cb86e7..c00ec8840 100644
--- a/soh/soh/Enhancements/randomizer/3drando/custom_messages.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/custom_messages.cpp
@@ -158,7 +158,7 @@ constexpr std::array DungeonColors = {
         CreateMessage(textId, unk_04, textBoxType, textBoxPosition, text.GetEnglish(), text.GetFrench(), text.GetSpanish());
     }
 
-    Text AddColorsAndFormat(Text text, const std::vector<uint8_t>& colors /*= {}*/) {
+    Text AddColorsAndFormat(Text text, const std::vector<std::string>& colors /*= {}*/) {
 
       //for each language
       for (std::string* textStr : {&text.english, &text.french, &text.spanish}) {
@@ -280,12 +280,12 @@ constexpr std::array DungeonColors = {
     std::string SET_SPEED(uint8_t x) {
         return "\x7F\x10"s + char(x);
     }
-    std::string SKULLTULAS_DESTROYED() { return  "\x7F\x15"s; }
+    std::string SKULLTULAS_DESTROYED() { return  "\x7F\x15"s; } //RANDOTODO just refernce the versions in CustomMessage
     std::string CURRENT_TIME()         { return  "\x7F\x17"s; }
     std::string UNSKIPPABLE()          { return  "\x7F\x19"s; }
     std::string TWO_WAY_CHOICE()       { return  "\x1B"s; }
     std::string NEWLINE()              { return  "\x7F\x1C"s; }
-    std::string COLOR(uint8_t x)       { return  "\x7F\x1D"s + char(x); }
+    std::string COLOR(std::string x)   { return  "\x7F\x1D"s + x; }
     std::string CENTER_TEXT()          { return  "\x7F\x1E"s; }
     std::string IF_NOT_MQ()            { return  "\x7F\x29"s; }
     std::string MQ_ELSE()              { return  "\x7F\x2A"s; }
diff --git a/soh/soh/Enhancements/randomizer/3drando/custom_messages.hpp b/soh/soh/Enhancements/randomizer/3drando/custom_messages.hpp
index c8029dc66..b9d2a08c6 100644
--- a/soh/soh/Enhancements/randomizer/3drando/custom_messages.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/custom_messages.hpp
@@ -7,15 +7,6 @@
 
 #include "text.hpp"
 
-#define QM_WHITE  0x00
-#define QM_RED    0x41
-#define QM_GREEN  0x42
-#define QM_BLUE   0x43
-#define QM_LBLUE  0x44
-#define QM_PINK   0x45
-#define QM_YELLOW 0x46
-#define QM_BLACK  0x47
-
 namespace CustomMessages {
 typedef struct {
     // In the true file format, offset is the offset into the QM file.
@@ -73,7 +64,7 @@ typedef struct {
     std::string UNSKIPPABLE();
     std::string TWO_WAY_CHOICE();
     std::string NEWLINE();
-    std::string COLOR(uint8_t x);
+    std::string COLOR(std::string x);
     std::string CENTER_TEXT();
     std::string IF_NOT_MQ();
     std::string MQ_ELSE();
diff --git a/soh/soh/Enhancements/randomizer/3drando/fill.cpp b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
index f87871944..bf9b9ef19 100644
--- a/soh/soh/Enhancements/randomizer/3drando/fill.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
@@ -9,7 +9,6 @@
 #include "spoiler_log.hpp"
 #include "starting_inventory.hpp"
 #include "hints.hpp"
-#include "hint_list.hpp"
 #include "../entrance.h"
 #include "shops.hpp"
 #include "pool_functions.hpp"
@@ -1145,13 +1144,6 @@ int Fill() {
       ctx->CreateItemOverrides();
       ctx->GetEntranceShuffler()->CreateEntranceOverrides();
       
-      SPDLOG_INFO("Creating Other Hint Texts...");
-      //funny ganon line
-      Text ganonText = RandomElement(GetHintCategory(HintCategory::GanonLine)).GetText();
-      CreateMessageFromTextObject(0x70CB, 0, 2, 3, AddColorsAndFormat(ganonText));
-      SetGanonText(ganonText);
-      SPDLOG_INFO("Creating Other Hint Texts Done");
-      
       CreateAllHints();
       CreateWarpSongTexts();
       return 1;
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
index c6269d5de..33f6c64d0 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
@@ -1,12 +1,11 @@
-#include "hint_list.hpp"
 #include "custom_messages.hpp"
 
 #include "../randomizerTypes.h"
 #include "../context.h"
-
-#include <array>
+#include "../static_data.h"
 
 using namespace CustomMessages;
+using namespace std::literals::string_literals;
 
 // Big thanks to Lioncache, Gabyelnuevo, Danius88, and Charade for their translations!
 
@@ -19,27 +18,34 @@ using namespace CustomMessages;
 // surrounding text with '#' will make it a different color
 // - OoT Randomizer
 
-// '%d' indicates a number will be placed there.
+// '[[d]]' indicates a number will be placed there, numbers in [[]] will be replaced by other text in hints
+namespace Rando {
 
-std::array<HintText, RHT_MAX> hintTable;
-
-void HintTable_Init() {
+void StaticData::HintTable_Init() {
     /*--------------------------
-    |       GENERAL TEXT       |
+    |       GENERAL TEXT        |
     ---------------------------*/
-    hintTable[RHT_NONE] = HintText::Exclude({ Text{ "No Hint", "Pas d'Indice", "" } });
-    hintTable[RHT_PREFIX] =
-        HintText::Exclude({ Text{ "They say that ", /*french*/ "Selon moi, ", /*spanish*/ "Según dicen, " } });
-    hintTable[RHT_WAY_OF_THE_HERO] =
-        HintText::Exclude({ Text{ " is on #the way of the hero#.", /*french*/ " est sur #la voie du héros#.",
-                                  /*spanish*/ " conduce a la senda del héroe." } });
-    hintTable[RHT_PLUNDERING] =
-        HintText::Exclude({ Text{ "plundering ", /*french*/ "explorer ", /*spanish*/ "inspeccionar " } });
-    hintTable[RHT_FOOLISH] = HintText::Exclude(
-        { Text{ " is #a foolish choice#.", /*french*/ " est #futile#.", /*spanish*/ " #no es una sabia decisión#." } });
-    hintTable[RHT_CAN_BE_FOUND_AT] =
-        HintText::Exclude({ Text{ "can be found at", /*french*/ "se trouve dans", /*spanish*/ "aguarda en" } });
-    hintTable[RHT_HOARDS] = HintText::Exclude({ Text{ "hoards", /*french*/ "recèle", /*spanish*/ "acapara" } });
+    hintTextTable[RHT_NONE] = HintText(CustomMessage("No Hint", "", "Pas d'Indice" ));
+    hintTextTable[RHT_WAY_OF_THE_HERO] =
+        HintText(CustomMessage( "They say that #[[1]]# is on #the way of the hero#.", 
+                                "",
+                     /*french*/ "Selon moi, #[[1]]# est sur #la voie du héros#.", {QM_RED, QM_LBLUE}));
+                 // /*spanish*/ "Según dicen, #[[1]]# conduce a la senda del héroe."
+    hintTextTable[RHT_FOOLISH] = 
+        HintText(CustomMessage( "They say that plundering #[[1]]# is #a foolish choice#.",
+                                "",
+                        /*french*/ "Selon moi, explorer #[[1]]# est #futile#.", {QM_RED, QM_PINK}));
+                    // /*spanish*/ "Según dicen, inspeccionar #[[1]]# #no es una sabia decisión#."
+    hintTextTable[RHT_CAN_BE_FOUND_AT] =
+        HintText(CustomMessage( "They say that #[[1]]# can be found at #[[2]]#.",
+                                "",
+                        /*french*/ "Selon moi, #[[1]]# se trouve dans #[[2]]#.", {QM_GREEN, QM_RED}));
+                    // /*spanish*/ "Según dicen, #[[1]]# aguarda en #[[2]]#."
+    hintTextTable[RHT_HOARDS] = 
+        HintText(CustomMessage( "They say that #[[2]]# hoards #[[1]]#.",
+                                "",
+                     /*french*/ "Selon moi, #[[2]]# recèle #[[1]]#.", {QM_RED, QM_GREEN}));
+                    // /*spanish*/ "Según dicen, #[[2]]# acapara #[[1]]#."
 
     HintTable_Init_Item();
     HintTable_Init_Exclude_Overworld();
@@ -50,2036 +56,1720 @@ void HintTable_Init() {
     |    SOMETIMES HINT TEXT   |
     ---------------------------*/
 
-    hintTable[RHT_KF_LINKS_HOUSE_COW] = HintText::Sometimes(
-        {
-            // obscure text
-            Text{ "the #bovine bounty of a horseback hustle# gifts",
-                  /*french*/ "le cadeau #qui découle d'une réussite équestre# est",
-                  /*spanish*/ "la #recompensa bovina de un paseo a caballo# brinda" },
-        },
-        {},
-        // clear text
-        Text{ "#Malon's obstacle course# leads to", /*french*/ "la #course à obstacle de Malon# amène à",
-              /*spanish*/ "la #carrera de obstáculos de Malon# brinda" });
-
-    hintTable[RHT_KAK_100_GOLD_SKULLTULA_REWARD] = HintText::Sometimes(
-        {
-            // obscure text
-            Text{ "#100 bug badges# rewards",
-                  /*french*/ "#100 écussons# donnent",
-                  /*spanish*/ "#100 medallas de insectos# otorgan" },
-            Text{ "#100 spider souls# yields",
-                  /*french*/ "#100 âmes d'arachnide# donnent",
-                  /*spanish*/ "#100 almas de araña# otorgan" },
-            Text{ "#100 auriferous arachnids# lead to",
-                  /*french*/ "#100 arachnides aurifères# donnent",
-                  /*spanish*/ "#100 arácnidos auríferos# otorgan" },
-        },
-        {},
-        // clear text
-        Text{ "slaying #100 Gold Skulltulas# reveals",
-              /*french*/ "détruire #100 Skulltulas d'or# donne",
-              /*spanish*/ "exterminar #100 skulltulas doradas# revela" });
-
-    hintTable[RHT_SONG_FROM_OCARINA_OF_TIME] = HintText::Sometimes({
-        // obscure text
-        Text{ "the #Ocarina of Time# teaches", /*french*/ "l'#Ocarina du Temps# est accompagné par",
-              /*spanish*/ "la #Ocarina del Tiempo# enseña" },
-    });
-
-    hintTable[RHT_SONG_FROM_ROYAL_FAMILYS_TOMB] = HintText::Sometimes({
-        // obscure text
-        Text{ "#ReDead in the Composers' Grave# guard",
-              /*french*/ "les #Éffrois du tombeau des compositeurs# protègent",
-              /*spanish*/ "los #ReDeads del Panteón Real# guardan" },
-        Text{ "the #Composer Brothers wrote#", /*french*/ "le #trésor des compositeurs# est",
-              /*spanish*/ "los #hermanos compositores escribieron#" },
-    });
-
-    hintTable[RHT_SHEIK_IN_FOREST] = HintText::Sometimes({
-        // obscure text
-        Text{ "#in a meadow# Sheik teaches", /*french*/ "Sheik confiera, #dans un bosquet#,",
-              /*spanish*/ "#en la pradera sagrada# Sheik enseña" },
-    });
-
-    hintTable[RHT_SHEIK_AT_TEMPLE] = HintText::Sometimes({
-        // obscure text
-        Text{ "Sheik waits at a #monument to time# to teach",
-              /*french*/ "Sheik confiera, #au pied de l'épée légendaire#,",
-              /*spanish*/ "Sheik espera en el #momumento del tiempo# para enseñar" },
-    });
-
-    hintTable[RHT_SHEIK_IN_CRATER] = HintText::Sometimes({
-        // obscure text
-        Text{ "the #crater's melody# is", /*french*/ "Sheik confiera, #entouré de lave#,",
-              /*spanish*/ "la #melodía del cráter# otorga" },
-    });
-
-    hintTable[RHT_SHEIK_IN_ICE_CAVERN] = HintText::Sometimes({
-        // obscure text
-        Text{ "the #frozen cavern# echoes with", /*french*/ "Sheik confiera, #dans une caverne enneigée#,",
-              /*spanish*/ "en la #caverna de hielo# retumban los ecos de" },
-    });
-
-    hintTable[RHT_SHEIK_IN_KAKARIKO] = HintText::Sometimes({
-        // obscure text
-        Text{ "a #ravaged village# mourns with", /*french*/ "Sheik confirera, #au coeur d'un village ravagé#,",
-              /*spanish*/ "un #arrasado pueblo# llora" },
-    });
-
-    hintTable[RHT_SHEIK_AT_COLOSSUS] = HintText::Sometimes({
-        // obscure text
-        Text{ "a hero ventures #beyond the wasteland# to learn",
-              /*french*/ "Sheik confiera, #au bout d'un chemin sableux#,",
-              /*spanish*/ "el héroe que se adentre #más allá del desierto# aprenderá" },
-    });
-
-    hintTable[RHT_MARKET_10_BIG_POES] = HintText::Sometimes(
-        {
-            // obscure text
-            Text{ "#ghost hunters# will be rewarded with",
-                  /*french*/ "#les chasseurs de fantômes# sont récompensés avec",
-                  /*spanish*/ "los #cazafantasmas# son premiados con" },
-        },
-        {},
-        // clear text
-        Text{ "catching #Big Poes# leads to", /*french*/ "#d'attraper des Àmes# donne",
-              /*spanish*/ "hacerte con #Grandes Poes# conduce a" });
-
-    hintTable[RHT_DEKU_THEATER_SKULL_MASK] = HintText::Sometimes({
-        // obscure text
-        Text{ "the #Skull Mask# yields", /*french*/ "le #Masque de Mort# donne",
-              /*spanish*/ "la #máscara de calavera# otorga" },
-    });
-
-    hintTable[RHT_DEKU_THEATER_MASK_OF_TRUTH] = HintText::Sometimes(
-        {
-            // obscure text
-            Text{ "showing a #truthful eye to the crowd# rewards",
-                  /*french*/ "montrer #l'oeil de vérité à la foule# donne",
-                  /*spanish*/ "#mostrarle el ojo verdadero# a una multitud brinda" },
-        },
-        {},
-        // clear text
-        Text{ "the #Mask of Truth# yields", /*french*/ "le #Masque de Vérité# donne",
-              /*spanish*/ "la #máscara de la verdad# premia" });
-
-    hintTable[RHT_HF_OCARINA_OF_TIME_ITEM] = HintText::Sometimes({
-        // obscure text
-        Text{ "the #treasure thrown by Princess Zelda# is", /*french*/ "le trésor #laissé par la princesse# est",
-              /*spanish*/ "el #tesoro arrojado por la Princesa Zelda# se trata de" },
-    });
-
-    hintTable[RHT_DMT_TRADE_BROKEN_SWORD] = HintText::Sometimes({
-        // obscure text
-        Text{ "a #blinded Biggoron# entrusts", /*french*/ "un #Grogoron aveuglé# confie",
-              /*spanish*/ "un #miope Biggoron# otorga" },
-    });
-
-    hintTable[RHT_DMT_TRADE_EYEDROPS] = HintText::Sometimes({
-        // obscure text
-        Text{ "while you wait, #Biggoron# gives", /*french*/ "pendant que tu attends, #Biggoron# donne",
-              /*spanish*/ "#Biggoron# está a la espera de otorgar" },
-    });
-
-    hintTable[RHT_DMT_TRADE_CLAIM_CHECK] = HintText::Sometimes({
-        // obscure text
-        Text{ "#Biggoron# crafts", /*french*/ "#Biggoron# fabrique", /*spanish*/ "#Biggoron# forja" },
-    });
-
-    hintTable[RHT_KAK_50_GOLD_SKULLTULA_REWARD] = HintText::Sometimes(
-        {
-            // obscure text
-            Text{ "#50 bug badges# rewards", /*french*/ "#50 écussons# donnent",
-                  /*spanish*/ "#50 medallas de insectos# otorgan" },
-            Text{ "#50 spider souls# yields", /*french*/ "#50 âmes d'arachnide# donnent",
-                  /*spanish*/ "#50 almas de araña# otorgan" },
-            Text{ "#50 auriferous arachnids# lead to", /*french*/ "#50 arachnides aurifères# donnent",
-                  /*spanish*/ "#50 arácnidos auríferos# otorgan" },
-        },
-        {},
-        // clear text
-        Text{ "slaying #50 Gold Skulltulas# reveals", /*french*/ "détruire #50 Skulltulas d'or# donne",
-              /*spanish*/ "exterminar #50 skulltulas doradas# revela" });
-
-    hintTable[RHT_KAK_40_GOLD_SKULLTULA_REWARD] = HintText::Sometimes(
-        {
-            // obscure text
-            Text{ "#40 bug badges# rewards", /*french*/ "#40 écussons# donnent",
-                  /*spanish*/ "#40 medallas de insectos# otorgan" },
-            Text{ "#40 spider souls# yields", /*french*/ "#40 âmes d'arachnide# donnent",
-                  /*spanish*/ "#40 almas de araña# otorgan" },
-            Text{ "#40 auriferous arachnids# lead to", /*french*/ "#40 arachnides aurifères# donnent",
-                  /*spanish*/ "#40 arácnidos auríferos# otorgan" },
-        },
-        {},
-        // clear text
-        Text{ "slaying #40 Gold Skulltulas# reveals", /*french*/ "détruire #40 Skulltulas d'or# donne",
-              /*spanish*/ "exterminar #40 skulltulas doradas# revela" });
-
-    hintTable[RHT_KAK_30_GOLD_SKULLTULA_REWARD] = HintText::Sometimes(
-        {
-            // obscure text
-            Text{ "#30 bug badges# rewards", /*french*/ "#30 écussons# donnent",
-                  /*spanish*/ "#30 medallas de insectos# otorgan" },
-            Text{ "#30 spider souls# yields", /*french*/ "#30 âmes d'arachnide# donnent",
-                  /*spanish*/ "#30 almas de araña# otorgan" },
-            Text{ "#30 auriferous arachnids# lead to", /*french*/ "#30 arachnides aurifères# donnent",
-                  /*spanish*/ "#30 arácnidos auríferos# otorgan" },
-        },
-        {},
-        // clear text
-        Text{ "slaying #30 Gold Skulltulas# reveals", /*french*/ "détruire #30 Skulltulas d'or# donne",
-              /*spanish*/ "exterminar #30 skulltulas doradas# revela" });
-
-    hintTable[RHT_KAK_20_GOLD_SKULLTULA_REWARD] = HintText::Sometimes(
-        {
-            // obscure text
-            Text{ "#20 bug badges# rewards", /*french*/ "#20 écussons# donnent",
-                  /*spanish*/ "#20 medallas de insectos# otorgan" },
-            Text{ "#20 spider souls# yields", /*french*/ "#20 âmes d'arachnide# donnent",
-                  /*spanish*/ "#20 almas de araña# otorgan" },
-            Text{ "#20 auriferous arachnids# lead to", /*french*/ "#20 arachnides aurifères# donnent",
-                  /*spanish*/ "#20 arácnidos auríferos# otorgan" },
-        },
-        {},
-        // clear text
-        Text{ "slaying #20 Gold Skulltulas# reveals", /*french*/ "détruire #20 Skulltulas d'or# donne",
-              /*spanish*/ "exterminar #20 skulltulas doradas# revela" });
-
-    hintTable[RHT_KAK_ANJU_AS_CHILD] = HintText::Sometimes(
-        {
-            // obscure text
-            Text{ "#wrangling roosters# rewards", /*french*/ "#plumer des poulets# donne",
-                  /*spanish*/ "#atrapar a las gallinas# premia" },
-            Text{ "#chucking chickens# gifts", /*french*/ "#lancer des poulets# donne",
-                  /*spanish*/ "#reunir a unos emplumados# premia" },
-        },
-        {},
-        // clear text
-        Text{ "#collecting cuccos# rewards", /*french*/ "#rapporter les Cocottes# donne",
-              /*spanish*/ "#hacerte con todos los cucos# premia" });
-
-    hintTable[RHT_KAK_TRADE_POCKET_CUCCO] = HintText::Sometimes({
-        // obscure text
-        Text{ "an adult's #happy Cucco# awards", /*french*/ "un adulte avec une #poulette joyeuse# obtient",
-              /*spanish*/ "un #alegre cuco# en la madurez otorga" },
-    });
-
-    hintTable[RHT_KAK_TRADE_ODD_MUSHROOM] = HintText::Sometimes({
-        // obscure text
-        Text{ "the #potion shop lady# entrusts", /*french*/ "la #gribiche du magasin de potion# confie",
-              /*spanish*/ "la #señora de la tienda de pociones# otorga" },
-    });
-
-    hintTable[RHT_GC_DARUNIAS_JOY] = HintText::Sometimes(
-        {
-            // obscure text
-            Text{ "a #groovin' goron# gifts", /*french*/ "#le Goron joyeux# donne",
-                  /*spanish*/ "#un goron marchoso# otorga" },
-        },
-        {},
-        // clear text
-        Text{ "#Darunia's dance# leads to", /*french*/ "#la dance de Darunia# donne",
-              /*spanish*/ "#el baile de Darunia# conduce a" });
-
-    hintTable[RHT_LW_SKULL_KID] = HintText::Sometimes({
-        // obscure text
-        Text{ "the #Skull Kid# grants", /*french*/ "le #Skull Kid# donne", /*spanish*/ "#Skull Kid# otorga" },
-    });
-
-    hintTable[RHT_LW_TRADE_COJIRO] = HintText::Sometimes({
-        // obscure text
-        Text{ "returning a #special Cucco# awards", /*french*/ "ramener une #poulette précieuse# donne",
-              /*spanish*/ "quien devuelva un #cuco especial# encontrará" },
-    });
-
-    hintTable[RHT_LW_TRADE_ODD_POTION] = HintText::Sometimes({
-        // obscure text
-        Text{ "a #Kokiri girl in the woods# leaves", /*french*/ "la #fillette Kokiri dans les bois# laisse",
-              /*spanish*/ "una #chica kokiri del bosque# otorga" },
-    });
-
-    hintTable[RHT_LH_SUN] = HintText::Sometimes(
-        {
-            // obscure text
-            Text{ "staring into #the sun# grants", /*french*/ "regarder #le soleil# donne",
-                  /*spanish*/ "#mirar al sol# revela" },
-        },
-        {},
-        // clear text
-        Text{ "shooting #the sun# grants", /*french*/ "tirer une flèche dans #sur le soleil# donne",
-              /*spanish*/ "#disparar al sol# revela" });
-
-    hintTable[RHT_LH_TRADE_FROG] = HintText::Sometimes({
-        // obscure text
-        Text{ "#Lake Hylia's scientist# hurriedly entrusts", /*french*/ "le #scientifique du lac# confie rapidement",
-              /*spanish*/ "el #científico del Lago Hylia# otorga con prisa" },
-    });
-
-    hintTable[RHT_MARKET_TREASURE_CHEST_GAME_REWARD] = HintText::Sometimes(
-        {
-            // obscure text
-            Text{ "#gambling# grants", /*french*/ "#parier# donne", /*spanish*/ "#los juegos de azar# revelan" },
-            Text{ "there is a #1/32 chance# to win", /*french*/ "être #le gagnant parmi 32# donne",
-                  /*spanish*/ "hay una #probabilidad de 1/32# de ganar" },
-        },
-        {},
-        // clear text
-        Text{ "the #treasure chest game# grants", /*french*/ "la #Chasse-aux-Trésors# donne",
-              /*spanish*/ "#el Cofre del Tesoro# premia" });
-
-    hintTable[RHT_MARKET_TREASURE_CHEST_GAME_ITEM_1] = HintText::Sometimes(
-        {
-            // obscure text
-            Text{ "#gambling once# grants", /*french*/ "#parier une fois# donne",
-                  /*spanish*/ "#apostar solo una vez# revelará" },
-            Text{ "the #first or second game chest# contains",
-                  /*french*/ "le #premier ou deuxième coffre à jeu# contient",
-                  /*spanish*/ "#el primer o segundo cofre del azar# revela" },
-        },
-        {},
-        // clear text
-        Text{ "the #first locked room# in the chest game contains",
-              /*french*/ "la #première salle# de la Chasse-aux-Trésors contient",
-              /*spanish*/ "#en la primera sala del Cofre del Tesoro# aguarda" });
-
-    hintTable[RHT_MARKET_TREASURE_CHEST_GAME_ITEM_2] = HintText::Sometimes(
-        {
-            // obscure text
-            Text{ "#gambling twice# grants", /*french*/ "#parier deux fois# donne",
-                  /*spanish*/ "#apostar dos veces# revelará" },
-            Text{ "the #third or fourth game chest# contains",
-                  /*french*/ "le #troisième ou quatrième coffre à jeu# contient",
-                  /*spanish*/ "#el tercer o cuarto cofre del azar# revela" },
-        },
-        {},
-        // clear text
-        Text{ "the #second locked room# in the chest game contains",
-              /*french*/ "la #deuxième salle# de la Chasse-aux-Trésors contient",
-              /*spanish*/ "#en la segunda sala del Cofre del Tesoro# aguarda" });
-
-    hintTable[RHT_MARKET_TREASURE_CHEST_GAME_ITEM_3] = HintText::Sometimes(
-        {
-            // obscure text
-            Text{ "#gambling 3 times# grants", /*french*/ "#parier trois fois# donne",
-                  /*spanish*/ "#apostar tres veces# revelará" },
-            Text{ "the #fifth or sixth game chest# contains",
-                  /*french*/ "le #cinquième ou sixième coffre à jeu# contient",
-                  /*spanish*/ "#el quinto o sexto cofre del azar# revela" },
-        },
-        {},
-        // clear text
-        Text{ "the #third locked room# in the chest game contains",
-              /*french*/ "la #troisième salle# de la Chasse-aux-Trésors contient",
-              /*spanish*/ "#en la tercera sala del Cofre del Tesoro# aguarda" });
-
-    hintTable[RHT_MARKET_TREASURE_CHEST_GAME_ITEM_4] = HintText::Sometimes(
-        {
-            // obscure text
-            Text{ "#gambling 4 times# grants", /*french*/ "#parier quatre fois# donne",
-                  /*spanish*/ "#apostar cuatro veces# revelará" },
-            Text{ "the #seventh or eighth game chest# contains",
-                  /*french*/ "le #septième ou huitième coffre à jeu# contient",
-                  /*spanish*/ "#el séptimo u octavo cofre del azar# revela" },
-        },
-        {},
-        // clear text
-        Text{ "the #fourth locked room# in the chest game contains",
-              /*french*/ "la #quatrième salle# de la Chasse-aux-Trésors contient",
-              /*spanish*/ "#en la cuarta sala del Cofre del Tesoro# aguarda" });
-
-    hintTable[RHT_MARKET_TREASURE_CHEST_GAME_ITEM_5] = HintText::Sometimes(
-        {
-            // obscure text
-            Text{ "#gambling 5 times# grants", /*french*/ "#parier cinq fois# donne",
-                  /*spanish*/ "#apostar cinco veces# revelará" },
-            Text{ "the #ninth or tenth game chest# contains",
-                  /*french*/ "le #neuvième ou dixième coffre à jeu# contient",
-                  /*spanish*/ "#el noveno o décimo cofre del azar# revela" },
-        },
-        {},
-        // clear text
-        Text{ "the #fifth locked room# in the chest game contains",
-              /*french*/ "la #cinquième salle# de la Chasse-aux-Trésors contient",
-              /*spanish*/ "#en la quinta sala del Cofre del Tesoro# aguarda" });
-
-    hintTable[RHT_GF_HBA_1500_POINTS] = HintText::Sometimes(
-        {
-            // obscure text
-            Text{ "mastery of #horseback archery# grants", /*french*/ "maîtriser l'#archerie équestre# donne",
-                  /*spanish*/ "dominar el #tiro con arco a caballo# premia con" },
-        },
-        {},
-        // clear text
-        Text{ "scoring 1500 in #horseback archery# grants",
-              /*french*/ "obtenir 1500 points dans l'#archerie équestre# donne",
-              /*spanish*/ "conseguir 1500 puntos en el #tiro con arco a caballo# premia" });
-
-    hintTable[RHT_GRAVEYARD_HEART_PIECE_GRAVE_CHEST] = HintText::Sometimes({
-        // obscure text
-        Text{ "playing #Sun's Song# in a grave spawns", /*french*/ "jouer le #chant du soleil# dans un tombeau donne",
-              /*spanish*/ "#tocar la Canción del Sol# en una cripta conduce a" },
-    });
-
-    hintTable[RHT_GC_MAZE_LEFT_CHEST] = HintText::Sometimes({
-        // obscure text
-        Text{ "in #Goron City# the hammer unlocks", /*french*/ "dans le #village Goron#, le marteau donne accès à",
-              /*spanish*/ "en la #Ciudad Goron# el martillo desbloquea" },
-    });
-
-    hintTable[RHT_GV_CHEST] = HintText::Sometimes({
-        // obscure text
-        Text{ "in #Gerudo Valley# the hammer unlocks", /*french*/ "dans la #Vallée Gerudo#, le marteau donne accès à",
-              /*spanish*/ "en el #Valle Gerudo# el martillo desbloquea" },
-    });
-
-    hintTable[RHT_GV_TRADE_SAW] = HintText::Sometimes({
-        // obscure text
-        Text{ "the #boss of the carpenters# leaves", /*french*/ "le #patron des ouvriers# laisse",
-              /*spanish*/ "el #capataz de los carpinteros# otorga" },
-    });
-
-    hintTable[RHT_GV_COW] = HintText::Sometimes({
-        // obscure text
-        Text{ "a #cow in Gerudo Valley# gifts", /*french*/ "la #vache de la Vallée Gerudo# donne",
-              /*spanish*/ "una #vaca del Valle Gerudo# brinda" },
-    });
-
-    hintTable[RHT_HC_GS_STORMS_GROTTO] = HintText::Sometimes({
-        // obscure text
-        Text{ "a #spider behind a muddy wall# in a grotto holds",
-              /*french*/ "l'#araignée derrière un mur de boue# dans une grotte donne",
-              /*spanish*/ "una #Skulltula tras la agrietada pared# de una cueva otorga" },
-    });
-
-    hintTable[RHT_HF_GS_COW_GROTTO] = HintText::Sometimes({
-        // obscure text
-        Text{ "a #spider behind webs# in a grotto holds",
-              /*french*/ "l'#araignée derrière une toile# dans une grotte donne",
-              /*spanish*/ "una #Skulltula tras la telaraña# de una cueva otorga" },
-    });
-
-    hintTable[RHT_HF_COW_GROTTO_COW] = HintText::Sometimes(
-        {
-            // obscure text
-            Text{ "the #cobwebbed cow# gifts", /*french*/ "la #vache prisonnière d'araignées# donne",
-                  /*spanish*/ "una #vaca tras una telaraña# brinda" },
-        },
-        {},
-        // clear text
-        Text{ "a #cow behind webs# in a grotto gifts", /*french*/ "la #vache derrière les toiles# d'une grotte donne",
-              /*spanish*/ "una #vaca tras la telaraña# de una cueva brinda" });
-
-    hintTable[RHT_ZR_FROGS_OCARINA_GAME] = HintText::Sometimes(
-        {
-            // obscure text
-            Text{ "an #amphibian feast# yields", /*french*/ "un #festin d'amphibiens# donne",
-                  /*spanish*/ "una #fiesta anfibia# brinda" },
-            Text{ "the #croaking choir's magnum opus# awards", /*french*/ "la #chorale coassante# donne",
-                  /*spanish*/ "un #coro maestro de ancas# premia" },
-            Text{ "the #froggy finale# yields", /*french*/ "la #finale amphibienne# donne",
-                  /*spanish*/ "el #gran final batracio# brinda" },
-        },
-        {},
-        // clear text
-        Text{ "the final reward from the #Frogs of Zora's River# is",
-              /*french*/ "la dernière récompense des #grenouilles de la Rivière Zora# est",
-              /*spanish*/ "la recompensa final de las #ranas del Río Zora# premia" });
-
-    hintTable[RHT_ZF_GS_HIDDEN_CAVE] = HintText::Sometimes({
-        // obscure text
-        Text{ "a spider high #above the icy waters# holds", /*french*/ "l'araignée #en haut des eaux glacées# donne",
-              /*spanish*/ "una Skulltula en lo #alto de las congeladas aguas# otorga" },
-    });
-
-    hintTable[RHT_WASTELAND_CHEST] = HintText::Sometimes({
-        // obscure text
-        Text{ "#deep in the wasteland# is", /*french*/ "#loin dans le désert# gît",
-              /*spanish*/ "en lo #profundo del desierto encantado# yace" },
-        Text{ "beneath #the sands#, flames reveal", /*french*/ "#sous le désert#, les flammes font apparaître",
-              /*spanish*/ "tras las #arenas# unas llamas revelan" },
-    });
-
-    hintTable[RHT_WASTELAND_GS] = HintText::Sometimes({
-        // obscure text
-        Text{ "a #spider in the wasteland# holds", /*french*/ "#l'araignée dans le désert# donne",
-              /*spanish*/ "una #Skulltula del desierto encantado# otorga" },
-    });
-
-    hintTable[RHT_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST] = HintText::Sometimes({
-        // obscure text
-        Text{ "#flames in the Composers' Grave# reveal",
-              /*french*/ "#les flammes dans le tombeau des compositeurs# cachent",
-              /*spanish*/ "#las llamas del Panteón Real# revelan" },
-        Text{ "the #Composer Brothers hid#", /*french*/ "#les Frères compositeurs on caché#",
-              /*spanish*/ "los #hermanos compositores esconden#" },
-    });
-
-    hintTable[RHT_ZF_BOTTOM_FREESTANDING_POH] = HintText::Sometimes({
-        // obscure text
-        Text{ "#under the icy waters# lies", /*french*/ "#sous les eaux glacées# se cache",
-              /*spanish*/ "#bajo las congeladas aguas# yace" },
-    });
-
-    hintTable[RHT_GC_POT_FREESTANDING_POH] = HintText::Sometimes({
-        // obscure text
-        Text{ "spinning #Goron pottery# contains", /*french*/ "la #potterie Goron# contient",
-              /*spanish*/ "una #cerámica goron# contiene" },
-    });
-
-    hintTable[RHT_ZD_KING_ZORA_THAWED] = HintText::Sometimes(
-        {
-            // obscure text
-            Text{ "a #defrosted dignitary# gifts", /*french*/ "le #monarque libéré# donne",
-                  /*spanish*/ "una #liberación monárquica# brinda" },
-        },
-        {},
-        // clear text
-        Text{ "unfreezing #King Zora# grants", /*french*/ "dégeler # le Roi Zora# donne",
-              /*spanish*/ "#descongelar al Rey Zora# conduce a" });
-
-    hintTable[RHT_ZD_TRADE_PRESCRIPTION] = HintText::Sometimes({
-        // obscure text
-        Text{ "#King Zora# hurriedly entrusts", /*french*/ "le #roi Zora# confie rapidement",
-              /*spanish*/ "el #Rey Zora# otorga con prisa" },
-    });
-
-    hintTable[RHT_DMC_DEKU_SCRUB] = HintText::Sometimes({
-        // obscure text
-        Text{ "a single #scrub in the crater# sells", /*french*/ "la #peste Mojo dans le cratère# vend",
-              /*spanish*/ "un solitario #deku del cráter# vende" },
-    });
-
-    hintTable[RHT_DMC_GS_CRATE] = HintText::Sometimes({
-        // obscure text
-        Text{ "a spider under a #crate in the crater# holds", /*french*/ "la Skulltula dans une #boîte volcanique# a",
-              /*spanish*/ "una Skulltula bajo una #caja del cráter# otorga" },
-    });
-
-    hintTable[RHT_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST] = HintText::Sometimes(
-        {
-            // obscure text
-            Text{ "a #temporal stone within a tree# contains", /*french*/ "la #pierre bleue dans un arbre# mène à",
-                  /*spanish*/ "un #bloque temporal de un árbol# contiene" },
-        },
-        {},
-        // clear text
-        Text{ "a #temporal stone within the Deku Tree# contains",
-              /*french*/ "la #pierre temporelle dans l'Arbre Mojo# cache",
-              /*spanish*/ "un #bloque temporal del Gran Árbol Deku# contiene" });
-
-    hintTable[RHT_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM] = HintText::Sometimes(
-        {
-            // obscure text
-            Text{ "a #spider on a ceiling in a tree# holds", /*french*/ "l'#araignée haut-perchée dans un arbre# a",
-                  /*spanish*/ "una #Skulltula en el techo de un árbol# otorga" },
-        },
-        {},
-        // clear text
-        Text{ "a #spider on a ceiling in the Deku Tree# holds",
-              /*french*/ "la#Skulltula dans le Cimetière de l'Arbre Mojo# a",
-              /*spanish*/ "una #Skulltula en el techo del Gran Árbol Deku# otorga" });
-
-    hintTable[RHT_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM] = HintText::Sometimes(
-        {
-            // obscure text
-            Text{ "a spider under #temporal stones in a cavern# holds",
-                  /*french*/ "l'araignée sous #une pierre bleue dans une caverne# a",
-                  /*spanish*/ "una Skulltula bajo #bloques temporales de una cueva# otorga" },
-        },
-        {},
-        // clear text
-        Text{ "a spider under #temporal stones in Dodongo's Cavern# holds",
-              /*french*/ "la Skulltula sous #la pierre temporelle dans la Caverne Dodongo# a",
-              /*spanish*/ "una Skulltula bajo #bloques temporales de la Cueva de los Dodongos# otorga" });
-
-    hintTable[RHT_JABU_JABUS_BELLY_BOOMERANG_CHEST] = HintText::Sometimes(
-        {
-            // obscure text
-            Text{ "a school of #stingers swallowed by a deity# guard",
-                  /*french*/ "les #raies dans un gardien# protègent",
-                  /*spanish*/ "unos de #stingers engullidos por cierta deidad# guardan" },
-        },
-        {},
-        // clear text
-        Text{ "a school of #stingers swallowed by Jabu-Jabu# guard", /*french*/ "les #raies dans Jabu-Jabu# protègent",
-              /*spanish*/ "unos #stingers engullidos por Jabu-Jabu# guardan" });
-
-    hintTable[RHT_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM] = HintText::Sometimes(
-        {
-            // obscure text
-            Text{ "a spider surrounded by #shadows in the belly of a deity# holds",
-                  /*french*/ "l'araignée entourée d'#ombres dans le ventre du gardien# possède",
-                  /*spanish*/ "una Skulltula rodeada de #sombras en la tripa de cierta diedad# otorga" },
-        },
-        {},
-        // clear text
-        Text{ "a spider surrounded by #shadows in Jabu-Jabu's Belly# holds",
-              /*french*/ "la Skulltula entourée d'#ombres dans Jabu-Jabu# possède",
-              /*spanish*/ "una Skulltula rodeada de #sombras en la Tripa de Jabu-Jabu# otorga" });
-
-    hintTable[RHT_JABU_JABUS_BELLY_MQ_COW] = HintText::Sometimes(
-        {
-            // obscure text
-            Text{ "a #cow swallowed by a deity# gifts", /*french*/ "la #vache dans le gardien# donne",
-                  /*spanish*/ "una #vaca engullida por cierta deidad# brinda" },
-        },
-        {},
-        // clear text
-        Text{ "a #cow swallowed by Jabu-Jabu# gifts", /*french*/ "la #vache avallée par Jabu-Jabu# donne",
-              /*spanish*/ "una #vaca engullida por Jabu-Jabu# brinda" });
-
-    hintTable[RHT_FIRE_TEMPLE_SCARECROW_CHEST] = HintText::Sometimes(
-        {
-            // obscure text
-            Text{ "a #scarecrow atop the volcano# hides", /*french*/ "l'#épouvantail au sommet d'un volcan# donne",
-                  /*spanish*/ "un #espantapájaros en lo alto del volcán# esconde" },
-        },
-        {},
-        // clear text
-        Text{ "#Pierre atop the Fire Temple# hides", /*french*/ "#Pierre au sommet du Temple du Feu# donne",
-              /*spanish*/ "#Pierre en lo alto del Templo del Fuego# esconde" });
-
-    hintTable[RHT_FIRE_TEMPLE_MEGATON_HAMMER_CHEST] = HintText::Sometimes(
-        {
-            // obscure text
-            Text{ "the #Flare Dancer atop the volcano# guards a chest containing",
-                  /*french*/ "le #danseur au sommet du volcan# protège",
-                  /*spanish*/ "el #Bailafuego en lo alto del volcán# otorga" },
-        },
-        {},
-        // clear text
-        Text{ "the #Flare Dancer atop the Fire Temple# guards a chest containing",
-              /*french*/ "le #Danse-Flamme au sommet du Temple du Feu# protège",
-              /*spanish*/ "el #Bailaguego en lo alto del Templo del Fuego# otorga" });
-
-    hintTable[RHT_FIRE_TEMPLE_MQ_CHEST_ON_FIRE] = HintText::Sometimes(
-        {
-            // obscure text
-            Text{ "the #Flare Dancer atop the volcano# guards a chest containing",
-                  /*french*/ "le #danseur au sommet du volcan# protège",
-                  /*spanish*/ "el #Bailafuego en lo alto del volcán# otorga" },
-        },
-        {},
-        // clear text
-        Text{ "the #Flare Dancer atop the Fire Temple# guards a chest containing",
-              /*french*/ "le #Danse-Flamme au sommet du Temple du Feu# protège",
-              /*spanish*/ "el #Bailafuego en lo alto del Templo del Fuego# otorga" });
-
-    hintTable[RHT_FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE] = HintText::Sometimes(
-        {
-            // obscure text
-            Text{ "a #spider under a block in the volcano# holds",
-                  /*french*/ "l'#araignée sous un bloc dans le volcan# a",
-                  /*spanish*/ "una #Skulltula bajo el bloque de un volcán# otorga" },
-        },
-        {},
-        // clear text
-        Text{ "a #spider under a block in the Fire Temple# holds",
-              /*french*/ "une #Skulltula sous un bloc dans le Temple du Feu# a",
-              /*spanish*/ "una #Skulltula bajo un bloque del Templo del Fuego# otorga" });
-
-    hintTable[RHT_WATER_TEMPLE_RIVER_CHEST] = HintText::Sometimes(
-        {
-            // obscure text
-            Text{ "beyond the #river under the lake# waits", /*french*/ "au delà de #la rivière sous le lac# se cache",
-                  /*spanish*/ "tras el #río bajo el lago# yace" },
-        },
-        {},
-        // clear text
-        Text{ "beyond the #river in the Water Temple# waits",
-              /*french*/ "au delà de #la rivière dans le Temple de l'Eau# se cache",
-              /*spanish*/ "tras el #río del Templo del Agua# yace" });
-
-    hintTable[RHT_WATER_TEMPLE_BOSS_KEY_CHEST] = HintText::Sometimes(
-        {
-            // obscure text
-            Text{ "dodging #rolling boulders under the lake# leads to",
-                  /*french*/ "éviter des #rochers roulants sous le lac# mène à",
-                  /*spanish*/ "esquivar #rocas rodantes bajo el lago# conduce a" },
-        },
-        {},
-        // clear text
-        Text{ "dodging #rolling boulders in the Water Temple# leads to",
-              /*french*/ "éviter des #rochers roulants dans le Temple de l'Eau# mène à",
-              /*spanish*/ "esquivar #rocas rondantes del Templo del Agua# conduce a" });
-
-    hintTable[RHT_WATER_TEMPLE_GS_BEHIND_GATE] = HintText::Sometimes(
-        {
-            // obscure text
-            Text{ "a spider behind a #gate under the lake# holds",
-                  /*french*/ "l'araignée derrière une #barrière sous le lac# a",
-                  /*spanish*/ "una Skulltula tras #una valla bajo el lago# otorga" },
-        },
-        {},
-        // clear text
-        Text{ "a spider behind a #gate in the Water Temple# holds",
-              /*french*/ "la Skulltula derrière une #barrière dans le Temple de l'Eau# a",
-              /*spanish*/ "una Skulltula tras #una valla del Templo del Agua# otorga" });
-
-    hintTable[RHT_WATER_TEMPLE_MQ_FREESTANDING_KEY] = HintText::Sometimes(
-        {
-            // obscure text
-            Text{ "hidden in a #box under the lake# lies", /*french*/ "dans une #boîte sous le lac# gît",
-                  /*spanish*/ "en una #caja bajo el lago# yace" },
-        },
-        {},
-        // clear text
-        Text{ "hidden in a #box in the Water Temple# lies", /*french*/ "dans une #boîte dans le Temple de l'Eau# gît",
-              /*spanish*/ "en una #caja del Templo del Agua# yace" });
-
-    hintTable[RHT_WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA] = HintText::Sometimes(
-        {
-            // obscure text
-            Text{ "the #locked spider under the lake# holds", /*french*/ "l'#araignée emprisonnée sous le lac# a",
-                  /*spanish*/ "la #Skulltula enjaulada bajo el lago# otorga" },
-        },
-        {},
-        // clear text
-        Text{ "the #locked spider in the Water Temple# holds",
-              /*french*/ "une #Skulltula emprisonnée dans le Temple de l'Eau# a",
-              /*spanish*/ "la #Skulltula enjaulada del Templo del Agua# otorga" });
-
-    hintTable[RHT_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH] = HintText::Sometimes(
-        {
-            // obscure text
-            Text{ "a spider behind a #gate under the lake# holds",
-                  /*french*/ "l'#araignée derrière une barrière sous le lac# a",
-                  /*spanish*/ "una Skulltula tras una #valla bajo el lago# otorga" },
-        },
-        {},
-        // clear text
-        Text{ "a spider behind a #gate in the Water Temple# holds",
-              /*french*/ "une #Skulltula derrière une barrière dans le Temple de l'Eau# a",
-              /*spanish*/ "una Skulltula tras una #valla del Templo del Agua#" });
-
-    hintTable[RHT_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST] = HintText::Sometimes({
-        // obscure text
-        Text{ "those who seek #sunken silver rupees# will find",
-              /*french*/ "ceux qui pêchent les #joyaux argentés# trouveront",
-              /*spanish*/ "aquellos que busquen las #rupias plateadas sumergidas# encontrarán" },
-        Text{ "the #thieves' underwater training# rewards", /*french*/ "l'#épreuve de plongée des voleurs# recèle",
-              /*spanish*/ "la #instrucción submarina de las bandidas# premia" },
-    });
-
-    hintTable[RHT_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST] = HintText::Sometimes({
-        // obscure text
-        Text{ "those who seek #sunken silver rupees# will find",
-              /*french*/ "ceux qui pêchent les #joyaux argentés# trouveront",
-              /*spanish*/ "aquellos que busquen las #rupias plateadas sumergidas# encontrarán" },
-        Text{ "the #thieves' underwater training# rewards", /*french*/ "l'#épreuve de plongée des voleurs# recèle",
-              /*spanish*/ "la #instrucción submarina de las bandidas# premia" },
-    });
-
-    hintTable[RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_FINAL_CHEST] = HintText::Sometimes({
-        // obscure text
-        Text{ "the final prize of #the thieves' training# is",
-              /*french*/ "la récompense ultime de #l'épreuve des voleurs# est",
-              /*spanish*/ "la recompensa final de la #instrucción de las bandida# brinda" },
-    });
-
-    hintTable[RHT_GERUDO_TRAINING_GROUND_MQ_ICE_ARROWS_CHEST] = HintText::Sometimes({
-        // obscure text
-        Text{ "the final prize of #the thieves' training# is",
-              /*french*/ "la récompense ultime de #l'épreuve des voleurs# est",
-              /*spanish*/ "el premio final de la #instrucción de las bandidas# brinda" },
-    });
-
-    hintTable[RHT_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST] = HintText::Sometimes(
-        {
-            // obscure text
-            Text{ "the well's #grasping ghoul# hides", /*french*/ "la #terreur du Puits# cache",
-                  /*spanish*/ "en las #profundidades del pozo# se esconde" },
-            Text{ "a #nether dweller in the well# holds", /*french*/ "le #spectre qui réside dans le Puits# a",
-                  /*spanish*/ "el #temido morador del pozo# concede" },
-        },
-        {},
-        // clear text
-        Text{ "#Dead Hand in the well# holds", /*french*/ "le #Poigneur dans le Puits# cache",
-              /*spanish*/ "la #Mano Muerta del pozo# concede" });
-
-    hintTable[RHT_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST] = HintText::Sometimes(
-        {
-            // obscure text
-            Text{ "the well's #grasping ghoul# hides", /*french*/ "la #terreur du Puits# cache",
-                  /*spanish*/ "en las #profundidades del pozo# se esconde" },
-            Text{ "a #nether dweller in the well# holds", /*french*/ "le #spectre qui réside dans le Puits# a",
-                  /*spanish*/ "el #temido morador del pozo# concede" },
-        },
-        {},
-        // clear text
-        Text{ "#Dead Hand in the well# holds", /*french*/ "le #Poigneur dans le Puits# cache",
-              /*spanish*/ "la #Mano Muerta del pozo# concede" });
-
-    hintTable[RHT_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST] = HintText::Sometimes(
-        {
-            // obscure text
-            Text{ "the treasure #sought by Nabooru# is", /*french*/ "le trésor que #recherche Nabooru# est",
-                  /*spanish*/ "el #ansiado tesoro de Nabooru# brinda" },
-        },
-        {},
-        // clear text
-        Text{ "upon the #Colossus's right hand# is", /*french*/ "sur la #main droite du colosse# repose",
-              /*spanish*/ "en la #mano derecha del Coloso# yace" });
-
-    hintTable[RHT_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST] = HintText::Sometimes({
-        // obscure text
-        Text{ "upon the #Colossus's left hand# is", /*french*/ "sur la #main gauche du colosse# repose",
-              /*spanish*/ "en la #mano izquierda del Coloso# yace" },
-    });
-
-    hintTable[RHT_SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST] = HintText::Sometimes(
-        {
-            // obscure text
-            Text{ "a #temporal paradox in the Colossus# yields",
-                  /*french*/ "un #paradoxe temporel dans le colosse# révèle",
-                  /*spanish*/ "una #paradoja temporal del Coloso# conduce a" },
-        },
-        {},
-        // clear text
-        Text{ "a #temporal paradox in the Spirit Temple# yields",
-              /*french*/ "le #paradoxe temporel dans le Temple de l'Esprit# révèle",
-              /*spanish*/ "una #paradoja temporal del Coloso# conduce a" });
-
-    hintTable[RHT_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST] = HintText::Sometimes(
-        {
-            // obscure text
-            Text{ "a #symphony in the Colossus# yields", /*french*/ "la #symphonie du colosse# révèle",
-                  /*spanish*/ "una #sinfonía del Coloso# conduce a" },
-        },
-        {},
-        // clear text
-        Text{ "a #symphony in the Spirit Temple# yields",
-              /*french*/ "les #cinq chansons du Temple de l'Esprit# révèlent",
-              /*spanish*/ "una #sinfonía del Coloso# conduce a" });
-
-    hintTable[RHT_SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM] = HintText::Sometimes(
-        {
-            // obscure text
-            Text{ "a #spider's symphony in the Colossus# yields",
-                  /*french*/ "la #mélodie de l'araignée du colosse# révèle",
-                  /*spanish*/ "la #Skulltula de la sinfonía del Coloso# otorga" },
-        },
-        {},
-        // clear text
-        Text{ "a #spider's symphony in the Spirit Temple# yields",
-              /*french*/ "la #mélodie de la Skulltula du Temple de l'Esprit# révèle",
-              /*spanish*/ "la #Skulltula de la sinfonía del Coloso# otorga" });
-
-    hintTable[RHT_SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST] = HintText::Sometimes({
-        // obscure text
-        Text{ "shadows in an #invisible maze# guard", /*french*/ "les ombres dans le #labyrinthe invisible# protègent",
-              /*spanish*/ "las sombras del #laberinto misterioso# esconden" },
-    });
-
-    hintTable[RHT_SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST] = HintText::Sometimes({
-        // obscure text
-        Text{ "shadows in an #invisible maze# guard", /*french*/ "les ombres dans le #labyrinthe invisible# protègent",
-              /*spanish*/ "las sombras del #laberinto invisible# esconden" },
-    });
+    hintTextTable[RHT_KF_LINKS_HOUSE_COW] = HintText(CustomMessage("They say that #Malon's obstacle course# leads to #[[1]]#.",
+                                                        /*german*/ "",
+                                                        /*french*/ "Selon moi, la #course à obstacle de Malon# amène à #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                     // /*spanish*/la #carrera de obstáculos de Malon# brinda #[[1]]#.
+                                                     {},
+                                                     {CustomMessage("They say that the #bovine bounty of a horseback hustle# gifts #[[1]]#.",
+                                                         /*german*/ "",
+                                                         /*french*/ "Selon moi, le cadeau #qui découle d'une réussite équestre# est #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                      // /*spanish*/la #recompensa bovina de un paseo a caballo# brinda #[[1]]#.
+
+    hintTextTable[RHT_KAK_100_GOLD_SKULLTULA_REWARD] = HintText(CustomMessage("They say that slaying #100 Gold Skulltulas# reveals #[[1]]#.",
+                                                                   /*german*/ "",
+                                                                   /*french*/ "Selon moi, détruire #100 Skulltulas d'or# donne #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                // /*spanish*/exterminar #100 skulltulas doradas# revela #[[1]]#.
+                                                                {},
+                                                                {CustomMessage("They say that #100 bug badges# rewards #[[1]]#.",
+                                                                    /*german*/ "",
+                                                                    /*french*/ "Selon moi, #100 écussons# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                 // /*spanish*/#100 medallas de insectos# otorgan #[[1]]#.
+                                                                 CustomMessage("They say that #100 spider souls# yields #[[1]]#.",
+                                                                    /*german*/ "",
+                                                                    /*french*/ "Selon moi, #100 âmes d'arachnide# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                 // /*spanish*/#100 almas de araña# otorgan #[[1]]#.
+                                                                 CustomMessage("They say that #100 auriferous arachnids# lead to #[[1]]#.",
+                                                                    /*german*/ "",
+                                                                    /*french*/ "Selon moi, #100 arachnides aurifères# donnent #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                 // /*spanish*/#100 arácnidos auríferos# otorgan #[[1]]#.
+
+    hintTextTable[RHT_SONG_FROM_OCARINA_OF_TIME] = HintText(CustomMessage("They say that the #Ocarina of Time# teaches #[[1]]#.",
+                                                               /*german*/ "",
+                                                               /*french*/ "Selon moi, l'#Ocarina du Temps# est accompagné par #[[1]]#.", {QM_RED, QM_GREEN})),
+                                                            // /*spanish*/la #Ocarina del Tiempo# enseña #[[1]]#.
+
+    hintTextTable[RHT_SONG_FROM_ROYAL_FAMILYS_TOMB] = HintText(CustomMessage("They say that #ReDead in the Composers' Grave# guard #[[1]]#.",
+                                                                  /*german*/ "",
+                                                                  /*french*/ "Selon moi, les #Éffrois du tombeau des compositeurs# protègent #[[1]]#.", {QM_RED, QM_GREEN})),
+                                                               // /*spanish*/los #ReDeads del Panteón Real# guardan #[[1]]#.
+
+    hintTextTable[RHT_SHEIK_IN_FOREST] = HintText(CustomMessage("They say that #in a meadow# Sheik teaches #[[1]]#.",
+                                                     /*german*/ "",
+                                                     /*french*/ "Selon moi, Sheik confiera, #dans un bosquet#, #[[1]]#.", {QM_RED, QM_GREEN})),
+                                                  // /*spanish*/#en la pradera sagrada# Sheik enseña #[[1]]#.
+
+    hintTextTable[RHT_SHEIK_AT_TEMPLE] = HintText(CustomMessage("They say that Sheik waits at a #monument to time# to teach #[[1]]#.",
+                                                     /*german*/ "",
+                                                     /*french*/ "Selon moi, Sheik confiera, #au pied de l'épée légendaire#, #[[1]]#.", {QM_RED, QM_GREEN})),
+                                                  // /*spanish*/Sheik espera en el #momumento del tiempo# para enseñar #[[1]]#.
+
+    hintTextTable[RHT_SHEIK_IN_CRATER] = HintText(CustomMessage("They say that the #crater's melody# is #[[1]]#.",
+                                                     /*german*/ "",
+                                                     /*french*/ "Selon moi, Sheik confiera, #entouré de lave#, #[[1]]#.", {QM_RED, QM_GREEN})),
+                                                  // /*spanish*/la #melodía del cráter# otorga #[[1]]#.
+
+    hintTextTable[RHT_SHEIK_IN_ICE_CAVERN] = HintText(CustomMessage("They say that the #frozen cavern# echoes with #[[1]]#.",
+                                                         /*german*/ "",
+                                                         /*french*/ "Selon moi, Sheik confiera, #dans une caverne enneigée#, #[[1]]#.", {QM_RED, QM_GREEN})),
+                                                      // /*spanish*/en la #caverna de hielo# retumban los ecos de #[[1]]#.
+
+    hintTextTable[RHT_SHEIK_IN_KAKARIKO] = HintText(CustomMessage("They say that a #ravaged village# mourns with #[[1]]#.",
+                                                       /*german*/ "",
+                                                       /*french*/ "Selon moi, Sheik confirera, #au coeur d'un village ravagé#, #[[1]]#.", {QM_RED, QM_GREEN})),
+                                                    // /*spanish*/un #arrasado pueblo# llora #[[1]]#.
+
+    hintTextTable[RHT_SHEIK_AT_COLOSSUS] = HintText(CustomMessage("They say that a hero ventures #beyond the wasteland# to learn #[[1]]#.",
+                                                       /*german*/ "",
+                                                       /*french*/ "Selon moi, Sheik confiera, #au bout d'un chemin sableux#, #[[1]]#.", {QM_RED, QM_GREEN})),
+                                                    // /*spanish*/el héroe que se adentre #más allá del desierto# aprenderá #[[1]]#.
+
+    hintTextTable[RHT_MARKET_10_BIG_POES] = HintText(CustomMessage("They say that catching #Big Poes# leads to #[[1]]#.",
+                                                        /*german*/ "",
+                                                        /*french*/ "Selon moi, #d'attraper des Àmes# donne #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                     // /*spanish*/hacerte con #Grandes Poes# conduce a #[[1]]#.
+                                                     {},
+                                                     {CustomMessage("They say that #ghost hunters# will be rewarded with #[[1]]#.",
+                                                         /*german*/ "",
+                                                         /*french*/ "Selon moi, #les chasseurs de fantômes# sont récompensés avec #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                      // /*spanish*/los #cazafantasmas# son premiados con #[[1]]#.
+
+    hintTextTable[RHT_DEKU_THEATER_SKULL_MASK] = HintText(CustomMessage("They say that the #Skull Mask# yields #[[1]]#.",
+                                                             /*german*/ "",
+                                                             /*french*/ "Selon moi, le #Masque de Mort# donne #[[1]]#.", {QM_RED, QM_GREEN})),
+                                                          // /*spanish*/la #máscara de calavera# otorga #[[1]]#.
+
+    hintTextTable[RHT_DEKU_THEATER_MASK_OF_TRUTH] = HintText(CustomMessage("They say that the #Mask of Truth# yields #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, le #Masque de Vérité# donne #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                             // /*spanish*/la #máscara de la verdad# premia #[[1]]#.
+                                                             {},
+                                                             {CustomMessage("They say that showing a #truthful eye to the crowd# rewards #[[1]]#.",
+                                                                 /*german*/ "",
+                                                                 /*french*/ "Selon moi, montrer #l'oeil de vérité à la foule# donne #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                              // /*spanish*/#mostrarle el ojo verdadero# a una multitud brinda #[[1]]#.
+
+    hintTextTable[RHT_HF_OCARINA_OF_TIME_ITEM] = HintText(CustomMessage("They say that the #treasure thrown by Princess Zelda# is #[[1]]#.",
+                                                             /*german*/ "",
+                                                             /*french*/ "Selon moi, le trésor #laissé par la princesse# est #[[1]]#.", {QM_RED, QM_GREEN})),
+                                                          // /*spanish*/el #tesoro arrojado por la Princesa Zelda# se trata de #[[1]]#.
+
+    hintTextTable[RHT_DMT_TRADE_BROKEN_SWORD] = HintText(CustomMessage("They say that a #blinded Biggoron# entrusts #[[1]]#.",
+                                                            /*german*/ "",
+                                                            /*french*/ "Selon moi, They say that un #Grogoron aveuglé# confie #[[1]]#.", {QM_RED, QM_GREEN})),
+                                                         // /*spanish*/un #miope Biggoron# otorga #[[1]]#.
+
+    hintTextTable[RHT_DMT_TRADE_EYEDROPS] = HintText(CustomMessage("They say that while you wait, #Biggoron# gives #[[1]]#.",
+                                                        /*german*/ "",
+                                                        /*french*/ "Selon moi, pendant que tu attends, #Biggoron# donne #[[1]]#.", {QM_RED, QM_GREEN})),
+                                                     // /*spanish*/#Biggoron# está a la espera de otorgar #[[1]]#.
+
+    hintTextTable[RHT_DMT_TRADE_CLAIM_CHECK] = HintText(CustomMessage("They say that #Biggoron# crafts #[[1]]#.",
+                                                           /*german*/ "",
+                                                           /*french*/ "Selon moi, #Biggoron# fabrique #[[1]]#.", {QM_RED, QM_GREEN})),
+                                                        // /*spanish*/#Biggoron# forja #[[1]]#.
+
+    hintTextTable[RHT_KAK_50_GOLD_SKULLTULA_REWARD] = HintText(CustomMessage("They say that slaying #50 Gold Skulltulas# reveals #[[1]]#.",
+                                                                  /*german*/ "",
+                                                                  /*french*/ "Selon moi, détruire #50 Skulltulas d'or# donne #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                               // /*spanish*/exterminar #50 skulltulas doradas# revela #[[1]]#.
+                                                               {},
+                                                               {CustomMessage("They say that #50 bug badges# rewards #[[1]]#.",
+                                                                   /*german*/ "",
+                                                                   /*french*/ "Selon moi, #50 écussons# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                // /*spanish*/#50 medallas de insectos# otorgan #[[1]]#.
+                                                                CustomMessage("They say that #50 spider souls# yields #[[1]]#.",
+                                                                   /*german*/ "",
+                                                                   /*french*/ "Selon moi, #50 âmes d'arachnide# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                // /*spanish*/#50 almas de araña# otorgan #[[1]]#.
+                                                                CustomMessage("They say that #50 auriferous arachnids# lead to #[[1]]#.",
+                                                                   /*german*/ "",
+                                                                   /*french*/ "Selon moi, #50 arachnides aurifères# donnent #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                // /*spanish*/#50 arácnidos auríferos# otorgan #[[1]]#.
+
+    hintTextTable[RHT_KAK_40_GOLD_SKULLTULA_REWARD] = HintText(CustomMessage("They say that slaying #40 Gold Skulltulas# reveals #[[1]]#.",
+                                                                  /*german*/ "",
+                                                                  /*french*/ "Selon moi, détruire #40 Skulltulas d'or# donne #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                               // /*spanish*/exterminar #40 skulltulas doradas# revela #[[1]]#.
+                                                               {},
+                                                               {CustomMessage("They say that #40 bug badges# rewards #[[1]]#.",
+                                                                   /*german*/ "",
+                                                                   /*french*/ "Selon moi, #40 écussons# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                // /*spanish*/#40 medallas de insectos# otorgan #[[1]]#.
+                                                                CustomMessage("They say that #40 spider souls# yields #[[1]]#.",
+                                                                   /*german*/ "",
+                                                                   /*french*/ "Selon moi, #40 âmes d'arachnide# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                // /*spanish*/#40 almas de araña# otorgan #[[1]]#.
+                                                                CustomMessage("They say that #40 auriferous arachnids# lead to #[[1]]#.",
+                                                                   /*german*/ "",
+                                                                   /*french*/ "Selon moi, #40 arachnides aurifères# donnent #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                // /*spanish*/#40 arácnidos auríferos# otorgan #[[1]]#.
+
+    hintTextTable[RHT_KAK_30_GOLD_SKULLTULA_REWARD] = HintText(CustomMessage("They say that slaying #30 Gold Skulltulas# reveals #[[1]]#.",
+                                                                  /*german*/ "",
+                                                                  /*french*/ "Selon moi, détruire #30 Skulltulas d'or# donne #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                               // /*spanish*/exterminar #30 skulltulas doradas# revela #[[1]]#.
+                                                               {},
+                                                               {CustomMessage("They say that #30 bug badges# rewards #[[1]]#.",
+                                                                   /*german*/ "",
+                                                                   /*french*/ "Selon moi, #30 écussons# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                // /*spanish*/#30 medallas de insectos# otorgan #[[1]]#.
+                                                                CustomMessage("They say that #30 spider souls# yields #[[1]]#.",
+                                                                   /*german*/ "",
+                                                                   /*french*/ "Selon moi, #30 âmes d'arachnide# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                // /*spanish*/#30 almas de araña# otorgan #[[1]]#.
+                                                                CustomMessage("They say that #30 auriferous arachnids# lead to #[[1]]#.",
+                                                                   /*german*/ "",
+                                                                   /*french*/ "Selon moi, #30 arachnides aurifères# donnent #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                // /*spanish*/#30 arácnidos auríferos# otorgan #[[1]]#.
+
+    hintTextTable[RHT_KAK_20_GOLD_SKULLTULA_REWARD] = HintText(CustomMessage("They say that slaying #20 Gold Skulltulas# reveals #[[1]]#.",
+                                                                  /*german*/ "",
+                                                                  /*french*/ "Selon moi, détruire #20 Skulltulas d'or# donne #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                               // /*spanish*/exterminar #20 skulltulas doradas# revela #[[1]]#.
+                                                               {},
+                                                               {CustomMessage("They say that #20 bug badges# rewards #[[1]]#.",
+                                                                   /*german*/ "",
+                                                                   /*french*/ "Selon moi, #20 écussons# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                // /*spanish*/#20 medallas de insectos# otorgan #[[1]]#.
+                                                                CustomMessage("They say that #20 spider souls# yields #[[1]]#.",
+                                                                   /*german*/ "",
+                                                                   /*french*/ "Selon moi, #20 âmes d'arachnide# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                // /*spanish*/#20 almas de araña# otorgan #[[1]]#.
+                                                                CustomMessage("They say that #20 auriferous arachnids# lead to #[[1]]#.",
+                                                                   /*german*/ "",
+                                                                   /*french*/ "Selon moi, #20 arachnides aurifères# donnent #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                // /*spanish*/#20 arácnidos auríferos# otorgan #[[1]]#.
+
+    hintTextTable[RHT_KAK_ANJU_AS_CHILD] = HintText(CustomMessage("They say that #collecting cuccos# rewards #[[1]]#.",
+                                                       /*german*/ "",
+                                                       /*french*/ "Selon moi, #rapporter les Cocottes# donne #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                    // /*spanish*/#hacerte con todos los cucos# premia #[[1]]#.
+                                                    {},
+                                                    {CustomMessage("They say that #wrangling roosters# rewards #[[1]]#.",
+                                                        /*german*/ "",
+                                                        /*french*/ "Selon moi, #plumer des poulets# donne #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                     // /*spanish*/#atrapar a las gallinas# premia #[[1]]#.
+                                                     CustomMessage("They say that #chucking chickens# gifts #[[1]]#.",
+                                                        /*german*/ "",
+                                                        /*french*/ "Selon moi, #lancer des poulets# donne #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                     // /*spanish*/#reunir a unos emplumados# premia #[[1]]#.
+
+    hintTextTable[RHT_KAK_TRADE_POCKET_CUCCO] = HintText(CustomMessage("They say that an adult's #happy Cucco# awards #[[1]]#.",
+                                                            /*german*/ "",
+                                                            /*french*/ "Selon moi, un adulte avec une #poulette joyeuse# obtient #[[1]]#.", {QM_RED, QM_GREEN})),
+                                                         // /*spanish*/un #alegre cuco# en la madurez otorga #[[1]]#.
+
+    hintTextTable[RHT_KAK_TRADE_ODD_MUSHROOM] = HintText(CustomMessage("They say that the #potion shop lady# entrusts #[[1]]#.",
+                                                            /*german*/ "",
+                                                            /*french*/ "Selon moi, la #gribiche du magasin de potion# confie #[[1]]#.", {QM_RED, QM_GREEN})),
+                                                         // /*spanish*/la #señora de la tienda de pociones# otorga #[[1]]#.
+
+    hintTextTable[RHT_GC_DARUNIAS_JOY] = HintText(CustomMessage("They say that #Darunia's dance# leads to #[[1]]#.",
+                                                     /*german*/ "",
+                                                     /*french*/ "Selon moi, #la dance de Darunia# donne #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                  // /*spanish*/#el baile de Darunia# conduce a #[[1]]#.
+                                                  {},
+                                                  {CustomMessage("They say that a #groovin' goron# gifts #[[1]]#.",
+                                                      /*german*/ "",
+                                                      /*french*/ "Selon moi, #le Goron joyeux# donne #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                   // /*spanish*/#un goron marchoso# otorga #[[1]]#.
+
+    hintTextTable[RHT_LW_SKULL_KID] = HintText(CustomMessage("They say that the #Skull Kid# grants #[[1]]#.",
+                                                  /*german*/ "",
+                                                  /*french*/ "Selon moi, le #Skull Kid# donne #[[1]]#.", {QM_RED, QM_GREEN})),
+                                               // /*spanish*/#Skull Kid# otorga #[[1]]#.
+
+    hintTextTable[RHT_LW_TRADE_COJIRO] = HintText(CustomMessage("They say that returning a #special Cucco# awards #[[1]]#.",
+                                                     /*german*/ "",
+                                                     /*french*/ "Selon moi, ramener une #poulette précieuse# donne #[[1]]#.", {QM_RED, QM_GREEN})),
+                                                  // /*spanish*/quien devuelva un #cuco especial# encontrará #[[1]]#.
+
+    hintTextTable[RHT_LW_TRADE_ODD_POTION] = HintText(CustomMessage("They say that a #Kokiri girl in the woods# leaves #[[1]]#.",
+                                                         /*german*/ "",
+                                                         /*french*/ "Selon moi, la #fillette Kokiri dans les bois# laisse #[[1]]#.", {QM_RED, QM_GREEN})),
+                                                      // /*spanish*/una #chica kokiri del bosque# otorga #[[1]]#.
+
+    hintTextTable[RHT_LH_SUN] = HintText(CustomMessage("They say that shooting #the sun# grants #[[1]]#.",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, tirer une flèche dans #sur le soleil# donne #[[1]]#.", {QM_RED, QM_GREEN}),
+                                         // /*spanish*/#disparar al sol# revela #[[1]]#.
+                                         {},
+                                         {CustomMessage("They say that staring into #the sun# grants #[[1]]#.",
+                                             /*german*/ "",
+                                             /*french*/ "Selon moi, regarder #le soleil# donne #[[1]]#.", {QM_RED, QM_GREEN})});
+                                          // /*spanish*/#mirar al sol# revela #[[1]]#.
+
+    hintTextTable[RHT_LH_TRADE_FROG] = HintText(CustomMessage("They say that #Lake Hylia's scientist# hurriedly entrusts #[[1]]#.",
+                                                   /*german*/ "",
+                                                   /*french*/ "Selon moi, le #scientifique du lac# confie rapidement #[[1]]#.", {QM_RED, QM_GREEN})),
+                                                // /*spanish*/el #científico del Lago Hylia# otorga con prisa #[[1]]#.
+
+    hintTextTable[RHT_MARKET_TREASURE_CHEST_GAME_REWARD] = HintText(CustomMessage("They say that the #treasure chest game# grants #[[1]]#.",
+                                                                       /*german*/ "",
+                                                                       /*french*/ "Selon moi, la #Chasse-aux-Trésors# donne #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                    // /*spanish*/#el Cofre del Tesoro# premia #[[1]]#.
+                                                                    {},
+                                                                    {CustomMessage("They say that #gambling# grants #[[1]]#.",
+                                                                        /*german*/ "",
+                                                                        /*french*/ "Selon moi, #parier# donne #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                     // /*spanish*/#los juegos de azar# revelan #[[1]]#.
+                                                                     CustomMessage("They say that there is a #1/32 chance# to win #[[1]]#.",
+                                                                        /*german*/ "",
+                                                                        /*french*/ "Selon moi, être #le gagnant parmi 32# donne #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                     // /*spanish*/hay una #probabilidad de 1/32# de ganar #[[1]]#.
+
+    hintTextTable[RHT_MARKET_TREASURE_CHEST_GAME_ITEM_1] = HintText(CustomMessage("They say that the #first locked room# in the chest game contains #[[1]]#.",
+                                                                       /*german*/ "",
+                                                                       /*french*/ "Selon moi, la #première salle# de la Chasse-aux-Trésors contient #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                    // /*spanish*/#en la primera sala del Cofre del Tesoro# aguarda #[[1]]#.
+                                                                    {},
+                                                                    {CustomMessage("They say that #gambling once# grants #[[1]]#.",
+                                                                        /*german*/ "",
+                                                                        /*french*/ "Selon moi, #parier une fois# donne #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                     // /*spanish*/#apostar solo una vez# revelará #[[1]]#.
+                                                                     CustomMessage("They say that the #first or second game chest# contains #[[1]]#.",
+                                                                        /*german*/ "",
+                                                                        /*french*/ "Selon moi, le #premier ou deuxième coffre à jeu# contient #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                     // /*spanish*/#el primer o segundo cofre del azar# revela #[[1]]#.
+
+    hintTextTable[RHT_MARKET_TREASURE_CHEST_GAME_ITEM_2] = HintText(CustomMessage("They say that the #second locked room# in the chest game contains #[[1]]#.",
+                                                                       /*german*/ "",
+                                                                       /*french*/ "Selon moi, la #deuxième salle# de la Chasse-aux-Trésors contient #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                    // /*spanish*/#en la segunda sala del Cofre del Tesoro# aguarda #[[1]]#.
+                                                                    {},
+                                                                    {CustomMessage("They say that #gambling twice# grants #[[1]]#.",
+                                                                        /*german*/ "",
+                                                                        /*french*/ "Selon moi, #parier deux fois# donne #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                     // /*spanish*/#apostar dos veces# revelará #[[1]]#.
+                                                                     CustomMessage("They say that the #third or fourth game chest# contains #[[1]]#.",
+                                                                        /*german*/ "",
+                                                                        /*french*/ "Selon moi, le #troisième ou quatrième coffre à jeu# contient #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                     // /*spanish*/#el tercer o cuarto cofre del azar# revela #[[1]]#.
+
+    hintTextTable[RHT_MARKET_TREASURE_CHEST_GAME_ITEM_3] = HintText(CustomMessage("They say that the #third locked room# in the chest game contains #[[1]]#.",
+                                                                       /*german*/ "",
+                                                                       /*french*/ "Selon moi, la #troisième salle# de la Chasse-aux-Trésors contient #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                    // /*spanish*/#en la tercera sala del Cofre del Tesoro# aguarda #[[1]]#.
+                                                                    {},
+                                                                    {CustomMessage("They say that #gambling 3 times# grants #[[1]]#.",
+                                                                        /*german*/ "",
+                                                                        /*french*/ "Selon moi, #parier trois fois# donne #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                     // /*spanish*/#apostar tres veces# revelará #[[1]]#.
+                                                                     CustomMessage("They say that the #fifth or sixth game chest# contains #[[1]]#.",
+                                                                        /*german*/ "",
+                                                                        /*french*/ "Selon moi, le #cinquième ou sixième coffre à jeu# contient #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                     // /*spanish*/#el quinto o sexto cofre del azar# revela #[[1]]#.
+
+    hintTextTable[RHT_MARKET_TREASURE_CHEST_GAME_ITEM_4] = HintText(CustomMessage("They say that the #fourth locked room# in the chest game contains #[[1]]#.",
+                                                                       /*german*/ "",
+                                                                       /*french*/ "Selon moi, la #quatrième salle# de la Chasse-aux-Trésors contient #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                    // /*spanish*/#en la cuarta sala del Cofre del Tesoro# aguarda #[[1]]#.
+                                                                    {},
+                                                                    {CustomMessage("They say that #gambling 4 times# grants #[[1]]#.",
+                                                                        /*german*/ "",
+                                                                        /*french*/ "Selon moi, #parier quatre fois# donne #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                     // /*spanish*/#apostar cuatro veces# revelará #[[1]]#.
+                                                                     CustomMessage("They say that the #seventh or eighth game chest# contains #[[1]]#.",
+                                                                        /*german*/ "",
+                                                                        /*french*/ "Selon moi, le #septième ou huitième coffre à jeu# contient #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                     // /*spanish*/#el séptimo u octavo cofre del azar# revela #[[1]]#.
+
+    hintTextTable[RHT_MARKET_TREASURE_CHEST_GAME_ITEM_5] = HintText(CustomMessage("They say that the #fifth locked room# in the chest game contains #[[1]]#.",
+                                                                       /*german*/ "",
+                                                                       /*french*/ "Selon moi, la #cinquième salle# de la Chasse-aux-Trésors contient #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                    // /*spanish*/#en la quinta sala del Cofre del Tesoro# aguarda #[[1]]#.
+                                                                    {},
+                                                                    {CustomMessage("They say that #gambling 5 times# grants #[[1]]#.",
+                                                                        /*german*/ "",
+                                                                        /*french*/ "Selon moi, #parier cinq fois# donne #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                     // /*spanish*/#apostar cinco veces# revelará #[[1]]#.
+                                                                     CustomMessage("They say that the #ninth or tenth game chest# contains #[[1]]#.",
+                                                                        /*german*/ "",
+                                                                        /*french*/ "Selon moi, le #neuvième ou dixième coffre à jeu# contient #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                     // /*spanish*/#el noveno o décimo cofre del azar# revela #[[1]]#.
+
+    hintTextTable[RHT_GF_HBA_1500_POINTS] = HintText(CustomMessage("They say that scoring 1500 in #horseback archery# grants #[[1]]#.",
+                                                        /*german*/ "",
+                                                        /*french*/ "Selon moi, obtenir 1500 points dans l'#archerie équestre# donne #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                     // /*spanish*/conseguir 1500 puntos en el #tiro con arco a caballo# premia #[[1]]#.
+                                                     {},
+                                                     {CustomMessage("They say that mastery of #horseback archery# grants #[[1]]#.",
+                                                         /*german*/ "",
+                                                         /*french*/ "Selon moi, maîtriser l'#archerie équestre# donne #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                      // /*spanish*/dominar el #tiro con arco a caballo# premia con #[[1]]#.
+
+    hintTextTable[RHT_GRAVEYARD_HEART_PIECE_GRAVE_CHEST] = HintText(CustomMessage("They say that playing #Sun's Song# in a grave spawns #[[1]]#.",
+                                                                       /*german*/ "",
+                                                                       /*french*/ "Selon moi, jouer le #chant du soleil# dans un tombeau donne #[[1]]#.", {QM_RED, QM_GREEN})),
+                                                                    // /*spanish*/#tocar la Canción del Sol# en una cripta conduce a #[[1]]#.
+
+    hintTextTable[RHT_GC_MAZE_LEFT_CHEST] = HintText(CustomMessage("They say that in #Goron City# the hammer unlocks #[[1]]#.",
+                                                        /*german*/ "",
+                                                        /*french*/ "Selon moi, dans le #village Goron#, le marteau donne accès à #[[1]]#.", {QM_RED, QM_GREEN})),
+                                                     // /*spanish*/en la #Ciudad Goron# el martillo desbloquea #[[1]]#.
+
+    hintTextTable[RHT_GV_CHEST] = HintText(CustomMessage("They say that in #Gerudo Valley# the hammer unlocks #[[1]]#.",
+                                              /*german*/ "",
+                                              /*french*/ "Selon moi, dans la #Vallée Gerudo#, le marteau donne accès à #[[1]]#.", {QM_RED, QM_GREEN})),
+                                           // /*spanish*/en el #Valle Gerudo# el martillo desbloquea #[[1]]#.
+
+
+    hintTextTable[RHT_GV_TRADE_SAW] = HintText(CustomMessage("They say that the #boss of the carpenters# leaves #[[1]]#.",
+                                                  /*german*/ "",
+                                                  /*french*/ "Selon moi, le #patron des ouvriers# laisse #[[1]]#.", {QM_RED, QM_GREEN})),
+                                               // /*spanish*/el #capataz de los carpinteros# otorga #[[1]]#.
+
+    hintTextTable[RHT_GV_COW] = HintText(CustomMessage("They say that a #cow in Gerudo Valley# gifts #[[1]]#.",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, la #vache de la Vallée Gerudo# donne #[[1]]#.", {QM_RED, QM_GREEN})),
+                                         // /*spanish*/una #vaca del Valle Gerudo# brinda #[[1]]#.
+
+    hintTextTable[RHT_HC_GS_STORMS_GROTTO] = HintText(CustomMessage("They say that a #spider behind a muddy wall# in a grotto holds #[[1]]#.",
+                                                         /*german*/ "",
+                                                         /*french*/ "Selon moi, l'#araignée derrière un mur de boue# dans une grotte donne #[[1]]#.", {QM_RED, QM_GREEN})),
+                                                      // /*spanish*/una #Skulltula tras la agrietada pared# de una cueva otorga #[[1]]#.
+
+    hintTextTable[RHT_HF_GS_COW_GROTTO] = HintText(CustomMessage("They say that a #spider behind webs# in a grotto holds #[[1]]#.",
+                                                      /*german*/ "",
+                                                      /*french*/ "Selon moi, l'#araignée derrière une toile# dans une grotte donne #[[1]]#.", {QM_RED, QM_GREEN})),
+                                                   // /*spanish*/una #Skulltula tras la telaraña# de una cueva otorga #[[1]]#.
+
+    hintTextTable[RHT_HF_COW_GROTTO_COW] = HintText(CustomMessage("They say that a #cow behind webs# in a grotto gifts #[[1]]#.",
+                                                       /*german*/ "",
+                                                       /*french*/ "Selon moi, la #vache derrière les toiles# d'une grotte donne #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                    // /*spanish*/una #vaca tras la telaraña# de una cueva brinda #[[1]]#.
+                                                    {},
+                                                    {CustomMessage("They say that the #cobwebbed cow# gifts #[[1]]#.",
+                                                        /*german*/ "",
+                                                        /*french*/ "Selon moi, la #vache prisonnière d'araignées# donne #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                     // /*spanish*/una #vaca tras una telaraña# brinda #[[1]]#.
+
+    hintTextTable[RHT_ZR_FROGS_OCARINA_GAME] = HintText(CustomMessage("They say that the final reward from the #Frogs of Zora's River# is #[[1]]#.",
+                                                           /*german*/ "",
+                                                           /*french*/ "Selon moi, la dernière récompense des #grenouilles de la Rivière Zora# est #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                        // /*spanish*/la recompensa final de las #ranas del Río Zora# premia #[[1]]#.
+                                                        {},
+                                                        {CustomMessage("They say that an #amphibian feast# yields #[[1]]#.",
+                                                            /*german*/ "",
+                                                            /*french*/ "Selon moi, un #festin d'amphibiens# donne #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                         // /*spanish*/una #fiesta anfibia# brinda #[[1]]#.
+                                                         CustomMessage("They say that the #croaking choir's magnum opus# awards #[[1]]#.",
+                                                            /*german*/ "",
+                                                            /*french*/ "Selon moi, la #chorale coassante# donne #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                         // /*spanish*/un #coro maestro de ancas# premia #[[1]]#.
+                                                         CustomMessage("They say that the #froggy finale# yields #[[1]]#.",
+                                                            /*german*/ "",
+                                                            /*french*/ "Selon moi, la #finale amphibienne# donne #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                         // /*spanish*/el #gran final batracio# brinda #[[1]]#.
+
+    hintTextTable[RHT_ZF_GS_HIDDEN_CAVE] = HintText(CustomMessage("They say that a spider high #above the icy waters# holds #[[1]]#.",
+                                                       /*german*/ "",
+                                                       /*french*/ "Selon moi, l'araignée #en haut des eaux glacées# donne #[[1]]#.", {QM_RED, QM_GREEN})),
+                                                    // /*spanish*/una Skulltula en lo #alto de las congeladas aguas# otorga #[[1]]#.
+
+    hintTextTable[RHT_WASTELAND_CHEST] = HintText(CustomMessage("They say that #deep in the wasteland# is #[[1]]#.",
+                                                     /*german*/ "",
+                                                     /*french*/ "Selon moi, #loin dans le désert# gît #[[1]]#.", {QM_RED, QM_GREEN})),
+                                                  // /*spanish*/en lo #profundo del desierto encantado# yace #[[1]]#.
+
+    hintTextTable[RHT_WASTELAND_GS] = HintText(CustomMessage("They say that a #spider in the wasteland# holds #[[1]]#.",
+                                                  /*german*/ "",
+                                                  /*french*/ "Selon moi, #l'araignée dans le désert# donne #[[1]]#.", {QM_RED, QM_GREEN})),
+                                               // /*spanish*/una #Skulltula del desierto encantado# otorga #[[1]]#.
+
+    hintTextTable[RHT_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST] = HintText(CustomMessage("They say that #flames in the Composers' Grave# reveal #[[1]]#.",
+                                                                        /*german*/ "",
+                                                                        /*french*/ "Selon moi, #les flammes dans le tombeau des compositeurs# cachent #[[1]]#.", {QM_RED, QM_GREEN})),
+                                                                     // /*spanish*/#las llamas del Panteón Real# revelan #[[1]]#.
+
+    hintTextTable[RHT_ZF_BOTTOM_FREESTANDING_POH] = HintText(CustomMessage("They say that #under the icy waters# lies #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, #sous les eaux glacées# se cache #[[1]]#.", {QM_RED, QM_GREEN})),
+                                                             // /*spanish*/#bajo las congeladas aguas# yace #[[1]]#.
+
+    hintTextTable[RHT_GC_POT_FREESTANDING_POH] = HintText(CustomMessage("They say that spinning #Goron pottery# contains #[[1]]#.",
+                                                             /*german*/ "",
+                                                             /*french*/ "Selon moi, la #potterie Goron# contient #[[1]]#.", {QM_RED, QM_GREEN})),
+                                                          // /*spanish*/una #cerámica goron# contiene #[[1]]#.
+
+    hintTextTable[RHT_ZD_KING_ZORA_THAWED] = HintText(CustomMessage("They say that unfreezing #King Zora# grants #[[1]]#.",
+                                                         /*german*/ "",
+                                                         /*french*/ "Selon moi, dégeler # le Roi Zora# donne #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                      // /*spanish*/#descongelar al Rey Zora# conduce a #[[1]]#.
+                                                      {},
+                                                      {CustomMessage("They say that a #defrosted dignitary# gifts #[[1]]#.",
+                                                          /*german*/ "",
+                                                          /*french*/ "Selon moi, le #monarque libéré# donne #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                       // /*spanish*/una #liberación monárquica# brinda #[[1]]#.
+
+    hintTextTable[RHT_ZD_TRADE_PRESCRIPTION] = HintText(CustomMessage("They say that #King Zora# hurriedly entrusts #[[1]]#.",
+                                                           /*german*/ "",
+                                                           /*french*/ "Selon moi, le #roi Zora# confie rapidement #[[1]]#.", {QM_RED, QM_GREEN})),
+                                                        // /*spanish*/el #Rey Zora# otorga con prisa #[[1]]#.
+
+    hintTextTable[RHT_DMC_DEKU_SCRUB] = HintText(CustomMessage("They say that a single #scrub in the crater# sells #[[1]]#.",
+                                                    /*german*/ "",
+                                                    /*french*/ "Selon moi, la #peste Mojo dans le cratère# vend #[[1]]#.", {QM_RED, QM_GREEN})),
+                                                 // /*spanish*/un solitario #deku del cráter# vende #[[1]]#.
+    hintTextTable[RHT_DMC_GS_CRATE] = HintText(CustomMessage("They say that a spider under a #crate in the crater# holds #[[1]]#.",
+                                                  /*german*/ "",
+                                                  /*french*/ "Selon moi, la Skulltula dans une #boîte volcanique# a #[[1]]#.", {QM_RED, QM_GREEN})),
+                                               // /*spanish*/una Skulltula bajo una #caja del cráter# otorga #[[1]]#.
+
+    hintTextTable[RHT_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST] = HintText(CustomMessage("They say that a #temporal stone within the Deku Tree# contains #[[1]]#.",
+                                                                           /*german*/ "",
+                                                                           /*french*/ "Selon moi, la #pierre temporelle dans l'Arbre Mojo# cache #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                        // /*spanish*/un #bloque temporal del Gran Árbol Deku# contiene #[[1]]#.
+                                                                        {},
+                                                                        {CustomMessage("They say that a #temporal stone within a tree# contains #[[1]]#.",
+                                                                            /*german*/ "",
+                                                                            /*french*/ "Selon moi, la #pierre bleue dans un arbre# mène à #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                         // /*spanish*/un #bloque temporal de un árbol# contiene #[[1]]#.
+
+
+    hintTextTable[RHT_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM] = HintText(CustomMessage("They say that a #spider on a ceiling in the Deku Tree# holds #[[1]]#.",
+                                                                          /*german*/ "",
+                                                                          /*french*/ "Selon moi, la#Skulltula dans le Cimetière de l'Arbre Mojo# a #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                       // /*spanish*/una #Skulltula en el techo del Gran Árbol Deku# otorga #[[1]]#.
+                                                                       {},
+                                                                       {CustomMessage("They say that a #spider on a ceiling in a tree# holds #[[1]]#.",
+                                                                           /*german*/ "",
+                                                                           /*french*/ "Selon moi, l'#araignée haut-perchée dans un arbre# a #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                        // /*spanish*/una #Skulltula en el techo de un árbol# otorga #[[1]]#.
+
+    hintTextTable[RHT_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM] = HintText(CustomMessage("They say that a spider under #temporal stones in Dodongo's Cavern# holds #[[1]]#.",
+                                                                                   /*german*/ "",
+                                                                                   /*french*/ "Selon moi, la Skulltula sous #la pierre temporelle dans la Caverne Dodongo# a #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                                // /*spanish*/una Skulltula bajo #bloques temporales de la Cueva de los Dodongos# otorga #[[1]]#.
+                                                                                {},
+                                                                                {CustomMessage("They say that a spider under #temporal stones in a cavern# holds #[[1]]#.",
+                                                                                    /*german*/ "",
+                                                                                    /*french*/ "Selon moi, l'araignée sous #une pierre bleue dans une caverne# a #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                                 // /*spanish*/una Skulltula bajo #bloques temporales de una cueva# otorga #[[1]]#.
+
+
+    hintTextTable[RHT_JABU_JABUS_BELLY_BOOMERANG_CHEST] = HintText(CustomMessage("They say that a school of #stingers swallowed by Jabu-Jabu# guard #[[1]]#.",
+                                                                      /*german*/ "",
+                                                                      /*french*/ "Selon moi, les #raies dans Jabu-Jabu# protègent #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                   // /*spanish*/unos #stingers engullidos por Jabu-Jabu# guardan #[[1]]#.
+                                                                   {},
+                                                                   {CustomMessage("They say that a school of #stingers swallowed by a deity# guard #[[1]]#.",
+                                                                       /*german*/ "",
+                                                                       /*french*/ "Selon moi, les #raies dans un gardien# protègent #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                    // /*spanish*/unos de #stingers engullidos por cierta deidad# guardan #[[1]]#.
+
+    hintTextTable[RHT_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM] = HintText(CustomMessage("They say that a spider surrounded by #shadows in Jabu-Jabu's Belly# holds #[[1]]#.",
+                                                                                   /*german*/ "",
+                                                                                   /*french*/ "Selon moi, la Skulltula entourée d'#ombres dans Jabu-Jabu# possède #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                                // /*spanish*/una Skulltula rodeada de #sombras en la Tripa de Jabu-Jabu# otorga #[[1]]#.
+                                                                                {},
+                                                                                {CustomMessage("They say that a spider surrounded by #shadows in the belly of a deity# holds #[[1]]#.",
+                                                                                    /*german*/ "",
+                                                                                    /*french*/ "Selon moi, l'araignée entourée d'#ombres dans le ventre du gardien# possède #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                                 // /*spanish*/una Skulltula rodeada de #sombras en la tripa de cierta diedad# otorga #[[1]]#.
+
+
+    hintTextTable[RHT_JABU_JABUS_BELLY_MQ_COW] = HintText(CustomMessage("They say that a #cow swallowed by Jabu-Jabu# gifts #[[1]]#.",
+                                                             /*german*/ "",
+                                                             /*french*/ "Selon moi, la #vache avallée par Jabu-Jabu# donne #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                          // /*spanish*/una #vaca engullida por Jabu-Jabu# brinda #[[1]]#.
+                                                          {},
+                                                          {CustomMessage("They say that a #cow swallowed by a deity# gifts #[[1]]#.",
+                                                              /*german*/ "",
+                                                              /*french*/ "Selon moi, la #vache dans le gardien# donne #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                           // /*spanish*/una #vaca engullida por cierta deidad# brinda #[[1]]#.
+
+    hintTextTable[RHT_FIRE_TEMPLE_SCARECROW_CHEST] = HintText(CustomMessage("They say that #Pierre atop the Fire Temple# hides #[[1]]#.",
+                                                                 /*german*/ "",
+                                                                 /*french*/ "Selon moi, #Pierre au sommet du Temple du Feu# donne #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                              // /*spanish*/#Pierre en lo alto del Templo del Fuego# esconde #[[1]]#.
+                                                              {},
+                                                              {CustomMessage("They say that a #scarecrow atop the volcano# hides #[[1]]#.",
+                                                                  /*german*/ "",
+                                                                  /*french*/ "Selon moi, l'#épouvantail au sommet d'un volcan# donne #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                               // /*spanish*/un #espantapájaros en lo alto del volcán# esconde #[[1]]#.
+
+    hintTextTable[RHT_FIRE_TEMPLE_MEGATON_HAMMER_CHEST] = HintText(CustomMessage("They say that the #Flare Dancer atop the Fire Temple# guards a chest containing #[[1]]#.",
+                                                                      /*german*/ "",
+                                                                      /*french*/ "Selon moi, le #Danse-Flamme au sommet du Temple du Feu# protège #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                   // /*spanish*/el #Bailaguego en lo alto del Templo del Fuego# otorga #[[1]]#.
+                                                                   {},
+                                                                   {CustomMessage("They say that the #Flare Dancer atop the volcano# guards a chest containing #[[1]]#.",
+                                                                       /*german*/ "",
+                                                                       /*french*/ "Selon moi, le #danseur au sommet du volcan# protège #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                    // /*spanish*/el #Bailafuego en lo alto del volcán# otorga #[[1]]#.
+
+    hintTextTable[RHT_FIRE_TEMPLE_MQ_CHEST_ON_FIRE] = HintText(CustomMessage("They say that the #Flare Dancer atop the Fire Temple# guards a chest containing #[[1]]#.",
+                                                                  /*german*/ "",
+                                                                  /*french*/ "Selon moi, le #Danse-Flamme au sommet du Temple du Feu# protège #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                               // /*spanish*/el #Bailafuego en lo alto del Templo del Fuego# otorga #[[1]]#.
+                                                               {},
+                                                               {CustomMessage("They say that the #Flare Dancer atop the volcano# guards a chest containing #[[1]]#.",
+                                                                   /*german*/ "",
+                                                                   /*french*/ "Selon moi, le #danseur au sommet du volcan# protège #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                // /*spanish*/el #Bailafuego en lo alto del volcán# otorga #[[1]]#.
+
+    hintTextTable[RHT_FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE] = HintText(CustomMessage("They say that a #spider under a block in the Fire Temple# holds #[[1]]#.",
+                                                                     /*german*/ "",
+                                                                     /*french*/ "Selon moi, une #Skulltula sous un bloc dans le Temple du Feu# a #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                  // /*spanish*/una #Skulltula bajo un bloque del Templo del Fuego# otorga #[[1]]#.
+                                                                  {},
+                                                                  {CustomMessage("They say that a #spider under a block in the volcano# holds #[[1]]#.",
+                                                                      /*german*/ "",
+                                                                      /*french*/ "Selon moi, l'#araignée sous un bloc dans le volcan# a #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                   // /*spanish*/una #Skulltula bajo el bloque de un volcán# otorga #[[1]]#.
+
+
+    hintTextTable[RHT_WATER_TEMPLE_RIVER_CHEST] = HintText(CustomMessage("They say that beyond the #river in the Water Temple# waits #[[1]]#.",
+                                                              /*german*/ "",
+                                                              /*french*/ "Selon moi, au delà de #la rivière dans le Temple de l'Eau# se cache #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                           // /*spanish*/tras el #río del Templo del Agua# yace #[[1]]#.
+                                                           {},
+                                                           {CustomMessage("They say that beyond the #river under the lake# waits #[[1]]#.",
+                                                               /*german*/ "",
+                                                               /*french*/ "Selon moi, au delà de #la rivière sous le lac# se cache #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                            // /*spanish*/tras el #río bajo el lago# yace #[[1]]#.
+
+    hintTextTable[RHT_WATER_TEMPLE_BOSS_KEY_CHEST] = HintText(CustomMessage("They say that dodging #rolling boulders in the Water Temple# leads to #[[1]]#.",
+                                                                 /*german*/ "",
+                                                                 /*french*/ "Selon moi, éviter des #rochers roulants dans le Temple de l'Eau# mène à #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                              // /*spanish*/esquivar #rocas rondantes del Templo del Agua# conduce a #[[1]]#.
+                                                              {},
+                                                              {CustomMessage("They say that dodging #rolling boulders under the lake# leads to #[[1]]#.",
+                                                                  /*german*/ "",
+                                                                  /*french*/ "Selon moi, éviter des #rochers roulants sous le lac# mène à #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                               // /*spanish*/esquivar #rocas rodantes bajo el lago# conduce a #[[1]]#.
+
+    hintTextTable[RHT_WATER_TEMPLE_GS_BEHIND_GATE] = HintText(CustomMessage("They say that a spider behind a #gate in the Water Temple# holds #[[1]]#.",
+                                                                 /*german*/ "",
+                                                                 /*french*/ "Selon moi, la Skulltula derrière une #barrière dans le Temple de l'Eau# a #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                              // /*spanish*/una Skulltula tras #una valla del Templo del Agua# otorga #[[1]]#.
+                                                              {},
+                                                              {CustomMessage("They say that a spider behind a #gate under the lake# holds #[[1]]#.",
+                                                                  /*german*/ "",
+                                                                  /*french*/ "Selon moi, l'araignée derrière une #barrière sous le lac# a #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                               // /*spanish*/una Skulltula tras #una valla bajo el lago# otorga #[[1]]#.
+
+    hintTextTable[RHT_WATER_TEMPLE_MQ_FREESTANDING_KEY] = HintText(CustomMessage("They say that hidden in a #box in the Water Temple# lies #[[1]]#.",
+                                                                      /*german*/ "",
+                                                                      /*french*/ "Selon moi, dans une #boîte dans le Temple de l'Eau# gît #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                   // /*spanish*/en una #caja del Templo del Agua# yace #[[1]]#.
+                                                                   {},
+                                                                   {CustomMessage("They say that hidden in a #box under the lake# lies #[[1]]#.",
+                                                                       /*german*/ "",
+                                                                       /*french*/ "Selon moi, dans une #boîte sous le lac# gît #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                    // /*spanish*/en una #caja bajo el lago# yace #[[1]]#.
+
+    hintTextTable[RHT_WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA] = HintText(CustomMessage("They say that the #locked spider in the Water Temple# holds #[[1]]#.",
+                                                                              /*german*/ "",
+                                                                              /*french*/ "Selon moi, une #Skulltula emprisonnée dans le Temple de l'Eau# a #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                           // /*spanish*/la #Skulltula enjaulada del Templo del Agua# otorga #[[1]]#.
+                                                                           {},
+                                                                           {CustomMessage("They say that the #locked spider under the lake# holds #[[1]]#.",
+                                                                               /*german*/ "",
+                                                                               /*french*/ "Selon moi, l'#araignée emprisonnée sous le lac# a #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                            // /*spanish*/la #Skulltula enjaulada bajo el lago# otorga #[[1]]#.
+
+    hintTextTable[RHT_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH] = HintText(CustomMessage("They say that a spider behind a #gate in the Water Temple# holds #[[1]]#.",
+                                                                          /*german*/ "",
+                                                                          /*french*/ "Selon moi, une #Skulltula derrière une barrière dans le Temple de l'Eau# a #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                       // /*spanish*/una Skulltula tras una #valla del Templo del Agua# #[[1]]#.
+                                                                       {},
+                                                                       {CustomMessage("They say that a spider behind a #gate under the lake# holds #[[1]]#.",
+                                                                           /*german*/ "",
+                                                                           /*french*/ "Selon moi, l'#araignée derrière une barrière sous le lac# a #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                        // /*spanish*/una Skulltula tras una #valla bajo el lago# otorga #[[1]]#.
+
+    hintTextTable[RHT_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST] = HintText(CustomMessage("They say that those who seek #sunken silver rupees# will find #[[1]]#.",
+                                                                                          /*german*/ "",
+                                                                                          /*french*/ "Selon moi, ceux qui pêchent les #joyaux argentés# trouveront #[[1]]#.", {QM_RED, QM_GREEN})),
+                                                                                       // /*spanish*/aquellos que busquen las #rupias plateadas sumergidas# encontrarán
+
+    hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST] = HintText(CustomMessage("They say that those who seek #sunken silver rupees# will find #[[1]]#.",
+                                                                                             /*german*/ "",
+                                                                                             /*french*/ "Selon moi, ceux qui pêchent les #joyaux argentés# trouveront #[[1]]#.", {QM_RED, QM_GREEN})),
+                                                                                          // /*spanish*/aquellos que busquen las #rupias plateadas sumergidas# encontrarán #[[1]]#.
+
+    hintTextTable[RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_FINAL_CHEST] = HintText(CustomMessage("They say that the final prize of #the thieves' training# is #[[1]]#.",
+                                                                                  /*german*/ "",
+                                                                                  /*french*/ "Selon moi, la récompense ultime de #l'épreuve des voleurs# est #[[1]]#.", {QM_RED, QM_GREEN})),
+                                                                               // /*spanish*/la recompensa final de la #instrucción de las bandida# brinda #[[1]]#.
+
+    hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_ICE_ARROWS_CHEST] = HintText(CustomMessage("They say that the final prize of #the thieves' training# is #[[1]]#.",
+                                                                                /*german*/ "",
+                                                                                /*french*/ "Selon moi, la récompense ultime de #l'épreuve des voleurs# est #[[1]]#.", {QM_RED, QM_GREEN})),
+                                                                             // /*spanish*/el premio final de la #instrucción de las bandidas# brinda #[[1]]#.
+
+    hintTextTable[RHT_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST] = HintText(CustomMessage("They say that #Dead Hand in the well# holds #[[1]]#.",
+                                                                            /*german*/ "",
+                                                                            /*french*/ "Selon moi, le #Poigneur dans le Puits# cache #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                         // /*spanish*/la #Mano Muerta del pozo# concede #[[1]]#.
+                                                                         {},
+                                                                         {CustomMessage("They say that the well's #grasping ghoul# hides #[[1]]#.",
+                                                                             /*german*/ "",
+                                                                             /*french*/ "Selon moi, la #terreur du Puits# cache #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                          // /*spanish*/en las #profundidades del pozo# se esconde #[[1]]#.
+                                                                          CustomMessage("They say that a #nether dweller in the well# holds #[[1]]#.",
+                                                                             /*german*/ "",
+                                                                             /*french*/ "Selon moi, le #spectre qui réside dans le Puits# a #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                          // /*spanish*/el #temido morador del pozo# concede #[[1]]#.
+
+    hintTextTable[RHT_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST] = HintText(CustomMessage("They say that #Dead Hand in the well# holds #[[1]]#.",
+                                                                         /*german*/ "",
+                                                                         /*french*/ "Selon moi, le #Poigneur dans le Puits# cache #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                      // /*spanish*/la #Mano Muerta del pozo# concede #[[1]]#.
+                                                                      {},
+                                                                      {CustomMessage("They say that the well's #grasping ghoul# hides #[[1]]#.",
+                                                                          /*german*/ "",
+                                                                          /*french*/ "Selon moi, la #terreur du Puits# cache #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                       // /*spanish*/en las #profundidades del pozo# se esconde #[[1]]#.
+                                                                       CustomMessage("They say that a #nether dweller in the well# holds #[[1]]#.",
+                                                                          /*german*/ "",
+                                                                          /*french*/ "Selon moi, le #spectre qui réside dans le Puits# a #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                       // /*spanish*/el #temido morador del pozo# concede #[[1]]#.
+
+    hintTextTable[RHT_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST] = HintText(CustomMessage("They say that upon the #Colossus's right hand# is #[[1]]#.",
+                                                                          /*german*/ "",
+                                                                          /*french*/ "Selon moi, sur la #main droite du colosse# repose #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                       // /*spanish*/en la #mano derecha del Coloso# yace #[[1]]#.
+                                                                       {},
+                                                                       {CustomMessage("They say that the treasure #sought by Nabooru# is #[[1]]#.",
+                                                                           /*german*/ "",
+                                                                           /*french*/ "Selon moi, le trésor que #recherche Nabooru# est #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                        // /*spanish*/el #ansiado tesoro de Nabooru# brinda #[[1]]#.
+
+    hintTextTable[RHT_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST] = HintText(CustomMessage("They say that upon the #Colossus's left hand# is #[[1]]#.",
+                                                                       /*german*/ "",
+                                                                       /*french*/ "Selon moi, sur la #main gauche du colosse# repose #[[1]]#.", {QM_RED, QM_GREEN})),
+                                                                    // /*spanish*/en la #mano izquierda del Coloso# yace #[[1]]#.
+
+    hintTextTable[RHT_SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST] = HintText(CustomMessage("They say that a #temporal paradox in the Spirit Temple# yields #[[1]]#.",
+                                                                                /*german*/ "",
+                                                                                /*french*/ "Selon moi, le #paradoxe temporel dans le Temple de l'Esprit# révèle #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                             // /*spanish*/una #paradoja temporal del Coloso# conduce a #[[1]]#.
+                                                                             {},
+                                                                             {CustomMessage("They say that a #temporal paradox in the Colossus# yields #[[1]]#.",
+                                                                                 /*german*/ "",
+                                                                                 /*french*/ "Selon moi, un #paradoxe temporel dans le colosse# révèle #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                              // /*spanish*/una #paradoja temporal del Coloso# conduce a #[[1]]#.
+
+    hintTextTable[RHT_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST] = HintText(CustomMessage("They say that a #symphony in the Spirit Temple# yields #[[1]]#.",
+                                                                          /*german*/ "",
+                                                                          /*french*/ "Selon moi, les #cinq chansons du Temple de l'Esprit# révèlent #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                       // /*spanish*/una #sinfonía del Coloso# conduce a #[[1]]#.
+                                                                       {},
+                                                                       {CustomMessage("They say that a #symphony in the Colossus# yields #[[1]]#.",
+                                                                           /*german*/ "",
+                                                                           /*french*/ "Selon moi, la #symphonie du colosse# révèle #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                        // /*spanish*/una #sinfonía del Coloso# conduce a #[[1]]#.
+
+    hintTextTable[RHT_SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM] = HintText(CustomMessage("They say that a #spider's symphony in the Spirit Temple# yields #[[1]]#.",
+                                                                       /*german*/ "",
+                                                                       /*french*/ "Selon moi, la #mélodie de la Skulltula du Temple de l'Esprit# révèle #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                    // /*spanish*/la #Skulltula de la sinfonía del Coloso# otorga #[[1]]#.
+                                                                    {},
+                                                                    {CustomMessage("They say that a #spider's symphony in the Colossus# yields #[[1]]#.",
+                                                                        /*german*/ "",
+                                                                        /*french*/ "Selon moi, la #mélodie de l'araignée du colosse# révèle #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                     // /*spanish*/la #Skulltula de la sinfonía del Coloso# otorga #[[1]]#.
+
+    hintTextTable[RHT_SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST] = HintText(CustomMessage("They say that shadows in an #invisible maze# guard #[[1]]#.",
+                                                                               /*german*/ "",
+                                                                               /*french*/ "Selon moi, les ombres dans le #labyrinthe invisible# protègent #[[1]]#.", {QM_RED, QM_GREEN})),
+                                                                            // /*spanish*/las sombras del #laberinto misterioso# esconden #[[1]]#.
+
+    hintTextTable[RHT_SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST] = HintText(CustomMessage("They say that shadows in an #invisible maze# guard #[[1]]#.",
+                                                                        /*german*/ "",
+                                                                        /*french*/ "Selon moi, les ombres dans le #labyrinthe invisible# protègent #[[1]]#.", {QM_RED, QM_GREEN})),
+                                                                     // /*spanish*/las sombras del #laberinto invisible# esconden #[[1]]#.
 
     /*--------------------------
     |    ENTRANCE HINT TEXT    |
     ---------------------------*/
 
-    hintTable[RHT_DESERT_COLOSSUS_TO_COLOSSUS_GROTTO] = HintText::Entrance({
-        // obscure text
-        Text{ "lifting a #rock in the desert# reveals", /*french*/ "soulever une #roche dans le désert# révèle",
-              /*spanish*/ "levantar una #roca del desierto# revela" },
-    });
+    hintTextTable[RHT_DESERT_COLOSSUS_TO_COLOSSUS_GROTTO] = HintText(CustomMessage("They say that lifting a #rock in the desert# reveals #[[1]]#.",
+                                                                        /*german*/ "",
+                                                                        /*french*/ "Selon moi, soulever une #roche dans le désert# révèle #[[1]]#.", {QM_RED, QM_BLUE})),
+                                                                     // /*spanish*/levantar una #roca del desierto# revela #[[1]]#.
 
-    hintTable[RHT_GV_GROTTO_LEDGE_TO_GV_OCTOROK_GROTTO] = HintText::Entrance({
-        // obscure text
-        Text{ "a rock on #a ledge in the valley# hides", /*french*/ "soulever une #roche dans la vallée# révèle",
-              /*spanish*/ "levantar una #roca al borde del valle# esconde" },
-    });
+    hintTextTable[RHT_GV_GROTTO_LEDGE_TO_GV_OCTOROK_GROTTO] = HintText(CustomMessage("They say that a rock on #a ledge in the valley# hides #[[1]]#.",
+                                                                          /*german*/ "",
+                                                                          /*french*/ "Selon moi, soulever une #roche dans la vallée# révèle #[[1]]#.", {QM_RED, QM_BLUE})),
+                                                                       // /*spanish*/levantar una #roca al borde del valle# esconde #[[1]]#.
 
-    hintTable[RHT_GC_GROTTO_PLATFORM_TO_GC_GROTTO] = HintText::Entrance({
-        // obscure text
-        Text{ "a #pool of lava# in Goron City blocks the way to",
-              /*french*/ "l'#étang de lave# dans le village Goron renferme",
-              /*spanish*/ "un #estanque de lava# en la Ciudad Goron bloquea el paso a" },
-    });
+    hintTextTable[RHT_GC_GROTTO_PLATFORM_TO_GC_GROTTO] = HintText(CustomMessage("They say that a #pool of lava# in Goron City blocks the way to #[[1]]#.",
+                                                                     /*german*/ "",
+                                                                     /*french*/ "Selon moi, l'#étang de lave# dans le village Goron renferme #[[1]]#.", {QM_RED, QM_BLUE})),
+                                                                  // /*spanish*/un #estanque de lava# en la Ciudad Goron bloquea el paso a #[[1]]#.
 
-    hintTable[RHT_GERUDO_FORTRESS_TO_GF_STORMS_GROTTO] = HintText::Entrance({
-        // obscure text
-        Text{ "a #storm within Gerudo's Fortress# reveals", /*french*/ "la #tempête dans la forteresse# révèle",
-              /*spanish*/ "una #tormenta en la Fortaleza Gerudo# revela" },
-    });
 
-    hintTable[RHT_ZORAS_DOMAIN_TO_ZD_STORMS_GROTTO] = HintText::Entrance({
-        // obscure text
-        Text{ "a #storm within Zora's Domain# reveals", /*french*/ "la #tempête dans le Domaine Zora# révèle",
-              /*spanish*/ "una #tormenta en la Región de los Zora# revela" },
-    });
+    hintTextTable[RHT_GERUDO_FORTRESS_TO_GF_STORMS_GROTTO] = HintText(CustomMessage("They say that a #storm within Gerudo's Fortress# reveals #[[1]]#.",
+                                                                         /*german*/ "",
+                                                                         /*french*/ "Selon moi, la #tempête dans la forteresse# révèle #[[1]]#.", {QM_RED, QM_BLUE})),
+                                                                      // /*spanish*/una #tormenta en la Fortaleza Gerudo# revela #[[1]]#.
 
-    hintTable[RHT_HYRULE_CASTLE_GROUNDS_TO_HC_STORMS_GROTTO] = HintText::Entrance({
-        // obscure text
-        Text{ "a #storm near the castle# reveals", /*french*/ "la #tempête près du château# révèle",
-              /*spanish*/ "una #tormenta junto al castillo# revela" },
-    });
 
-    hintTable[RHT_GV_FORTRESS_SIDE_TO_GV_STORMS_GROTTO] = HintText::Entrance({
-        // obscure text
-        Text{ "a #storm in the valley# reveals", /*french*/ "la #tempête dans la vallée# révèle",
-              /*spanish*/ "una #tormenta en el valle# revela" },
-    });
+    hintTextTable[RHT_ZORAS_DOMAIN_TO_ZD_STORMS_GROTTO] = HintText(CustomMessage("They say that a #storm within Zora's Domain# reveals #[[1]]#.",
+                                                                      /*german*/ "",
+                                                                      /*french*/ "Selon moi, la #tempête dans le Domaine Zora# révèle #[[1]]#.", {QM_RED, QM_BLUE})),
+                                                                   // /*spanish*/una #tormenta en la Región de los Zora# revela #[[1]]#.
 
-    hintTable[RHT_DESERT_COLOSSUS_TO_COLOSSUS_GREAT_FAIRY_FOUNTAIN] = HintText::Entrance({
-        // obscure text
-        Text{ "a #fractured desert wall# hides", /*french*/ "le #mur fragile du désert# cache",
-              /*spanish*/ "una #agrietada pared del desierto# esconde" },
-    });
 
-    hintTable[RHT_GANONS_CASTLE_GROUNDS_TO_OGC_GREAT_FAIRY_FOUNTAIN] = HintText::Entrance({
-        // obscure text
-        Text{ "a #heavy pillar# outside the castle obstructs", /*french*/ "le #rocher fragile près du château# cache",
-              /*spanish*/ "una #pesada columna# fuera del castillo obstruye" },
-    });
+    hintTextTable[RHT_HYRULE_CASTLE_GROUNDS_TO_HC_STORMS_GROTTO] = HintText(CustomMessage("They say that a #storm near the castle# reveals #[[1]]#.",
+                                                                               /*german*/ "",
+                                                                               /*french*/ "Selon moi, la #tempête près du château# révèle #[[1]]#.", {QM_RED, QM_BLUE})),
+                                                                            // /*spanish*/una #tormenta junto al castillo# revela #[[1]]#.
 
-    hintTable[RHT_ZORAS_FOUNTAIN_TO_ZF_GREAT_FAIRY_FOUNTAIN] = HintText::Entrance({
-        // obscure text
-        Text{ "a #fountain wall# hides", /*french*/ "le #mur fragile du réservoir# cache",
-              /*spanish*/ "una #pared de la fuente# esconde" },
-    });
+    hintTextTable[RHT_GV_FORTRESS_SIDE_TO_GV_STORMS_GROTTO] = HintText(CustomMessage("They say that a #storm in the valley# reveals #[[1]]#.",
+                                                                          /*german*/ "",
+                                                                          /*french*/ "Selon moi, la #tempête dans la vallée# révèle #[[1]]#.", {QM_RED, QM_BLUE})),
+                                                                       // /*spanish*/una #tormenta en el valle# revela #[[1]]#.
 
-    hintTable[RHT_GV_FORTRESS_SIDE_TO_GV_CARPENTER_TENT] = HintText::Entrance({
-        // obscure text
-        Text{ "a #tent in the valley# covers", /*french*/ "la #tente dans la vallée# recouvre",
-              /*spanish*/ "una #tienda de campaña del valle# cubre" },
-    });
+    hintTextTable[RHT_DESERT_COLOSSUS_TO_COLOSSUS_GREAT_FAIRY_FOUNTAIN] = HintText(CustomMessage("They say that a #fractured desert wall# hides #[[1]]#.",
+                                                                                      /*german*/ "",
+                                                                                      /*french*/ "Selon moi, le #mur fragile du désert# cache #[[1]]#.", {QM_RED, QM_BLUE})),
+                                                                                   // /*spanish*/una #agrietada pared del desierto# esconde #[[1]]#.
 
-    hintTable[RHT_GRAVEYARD_WARP_PAD_REGION_TO_SHADOW_TEMPLE_ENTRYWAY] = HintText::Entrance({
-        // obscure text
-        Text{ "at the #back of the Graveyard#, there is", /*french*/ "#derrière le Cimetière# gît",
-              /*spanish*/ "en la #parte trasera del cementerio# se halla" },
-    });
+    hintTextTable[RHT_GANONS_CASTLE_GROUNDS_TO_OGC_GREAT_FAIRY_FOUNTAIN] = HintText(CustomMessage("They say that a #heavy pillar# outside the castle obstructs #[[1]]#.",
+                                                                                       /*german*/ "",
+                                                                                       /*french*/ "Selon moi, le #rocher fragile près du château# cache #[[1]]#.", {QM_RED, QM_BLUE})),
+                                                                                    // /*spanish*/una #pesada columna# fuera del castillo obstruye #[[1]]#.
 
-    hintTable[RHT_LAKE_HYLIA_TO_WATER_TEMPLE_LOBBY] = HintText::Entrance({
-        // obscure text
-        Text{ "deep #under a vast lake#, one can find", /*french*/ "#sous le lac# gît",
-              /*spanish*/ "en las #profundidades de un lago inmenso# se halla" },
-    });
 
-    hintTable[RHT_GERUDO_FORTRESS_TO_GERUDO_TRAINING_GROUNDS_LOBBY] = HintText::Entrance({
-        // obscure text
-        Text{ "paying a #fee to the Gerudos# grants access to",
-              /*french*/ "l'#entrée payante des Gerudo# donne accès à",
-              /*spanish*/ "pagarle una #tasa a las gerudo# da acceso a" },
-    });
+    hintTextTable[RHT_ZORAS_FOUNTAIN_TO_ZF_GREAT_FAIRY_FOUNTAIN] = HintText(CustomMessage("They say that a #fountain wall# hides #[[1]]#.",
+                                                                               /*german*/ "",
+                                                                               /*french*/ "Selon moi, le #mur fragile du réservoir# cache #[[1]]#.", {QM_RED, QM_BLUE})),
+                                                                            // /*spanish*/una #pared de la fuente# esconde #[[1]]#.
 
-    hintTable[RHT_ZORAS_FOUNTAIN_TO_JABU_JABUS_BELLY_BEGINNING] = HintText::Entrance({
-        // obscure text
-        Text{ "inside #Jabu-Jabu#, one can find", /*french*/ "#dans Jabu-Jabu# se trouve",
-              /*spanish*/ "dentro de #Jabu-Jabu# se halla" },
-    });
+    hintTextTable[RHT_GV_FORTRESS_SIDE_TO_GV_CARPENTER_TENT] = HintText(CustomMessage("They say that a #tent in the valley# covers #[[1]]#.",
+                                                                           /*german*/ "",
+                                                                           /*french*/ "Selon moi, la #tente dans la vallée# recouvre #[[1]]#.", {QM_RED, QM_BLUE})),
+                                                                        // /*spanish*/una #tienda de campaña del valle# cubre #[[1]]#.
 
-    hintTable[RHT_KAKARIKO_VILLAGE_TO_BOTTOM_OF_THE_WELL] = HintText::Entrance({
-        // obscure text
-        Text{ "a #village well# leads to", /*french*/ "dans le fond du #Puits du village# gît",
-              /*spanish*/ "el #pozo de un pueblo# conduce a" },
-    });
+    hintTextTable[RHT_GRAVEYARD_WARP_PAD_REGION_TO_SHADOW_TEMPLE_ENTRYWAY] = HintText(CustomMessage("They say that at the #back of the Graveyard#, there is #[[1]]#.",
+                                                                                         /*german*/ "",
+                                                                                         /*french*/ "Selon moi, #derrière le Cimetière# gît #[[1]]#.", {QM_RED, QM_BLUE})),
+                                                                                      // /*spanish*/en la #parte trasera del cementerio# se halla #[[1]]#.
+
+
+    hintTextTable[RHT_LAKE_HYLIA_TO_WATER_TEMPLE_LOBBY] = HintText(CustomMessage("They say that deep #under a vast lake#, one can find #[[1]]#.",
+                                                                      /*german*/ "",
+                                                                      /*french*/ "Selon moi, #sous le lac# gît #[[1]]#.", {QM_RED, QM_BLUE})),
+                                                                   // /*spanish*/en las #profundidades de un lago inmenso# se halla #[[1]]#.
+
+
+    hintTextTable[RHT_GERUDO_FORTRESS_TO_GERUDO_TRAINING_GROUNDS_LOBBY] = HintText(CustomMessage("They say that paying a #fee to the Gerudos# grants access to #[[1]]#.",
+                                                                                      /*german*/ "",
+                                                                                      /*french*/ "Selon moi, l'#entrée payante des Gerudo# donne accès à #[[1]]#.", {QM_RED, QM_BLUE})),
+                                                                                   // /*spanish*/pagarle una #tasa a las gerudo# da acceso a #[[1]]#.
+
+    hintTextTable[RHT_ZORAS_FOUNTAIN_TO_JABU_JABUS_BELLY_BEGINNING] = HintText(CustomMessage("They say that inside #Jabu-Jabu#, one can find #[[1]]#.",
+                                                                                  /*german*/ "",
+                                                                                  /*french*/ "Selon moi, #dans Jabu-Jabu# se trouve #[[1]]#.", {QM_RED, QM_BLUE})),
+                                                                               // /*spanish*/dentro de #Jabu-Jabu# se halla #[[1]]#.
+
+    hintTextTable[RHT_KAKARIKO_VILLAGE_TO_BOTTOM_OF_THE_WELL] = HintText(CustomMessage("They say that a #village well# leads to #[[1]]#.",
+                                                                            /*german*/ "",
+                                                                            /*french*/ "Selon moi, dans le fond du #Puits du village# gît #[[1]]#.", {QM_RED, QM_BLUE})),
+                                                                         // /*spanish*/el #pozo de un pueblo# conduce a #[[1]]#.
 
     /*--------------------------
     |      EXIT HINT TEXT      |
     ---------------------------*/
-    // maybe make a new type for this? I'm not sure if it really matters
 
-    hintTable[RHT_LINKS_POCKET] = HintText::Exclude({
-        // obscure text
-        Text{ "Link's Pocket", /*french*/ "les Poches de @", /*spanish*/ "el bolsillo de @" },
-    });
+    hintTextTable[RHT_LINKS_POCKET] = HintText(CustomMessage("Link's Pocket",
+                                                  /*german*/ "",
+                                                  /*french*/ "les Poches de @"));
+                                               // /*spanish*/el bolsillo de @
 
-    hintTable[RHT_KOKIRI_FOREST] = HintText::Exclude({
-        // obscure text
-        Text{ "Kokiri Forest", /*french*/ "la Forêt Kokiri", /*spanish*/ "el Bosque Kokiri" },
-    });
+    hintTextTable[RHT_KOKIRI_FOREST] = HintText(CustomMessage("Kokiri Forest",
+                                                   /*german*/ "",
+                                                   /*french*/ "la Forêt Kokiri"));
+                                                // /*spanish*/el Bosque Kokiri
 
-    hintTable[RHT_THE_LOST_WOODS] = HintText::Exclude({
-        // obscure text
-        Text{ "the Lost Woods", /*french*/ "les Bois Perdus", /*spanish*/ "el Bosque Perdido" },
-    });
+    hintTextTable[RHT_THE_LOST_WOODS] = HintText(CustomMessage("the Lost Woods",
+                                                    /*german*/ "",
+                                                    /*french*/ "les Bois Perdus"));
+                                                 // /*spanish*/el Bosque Perdido
+    hintTextTable[RHT_SACRED_FOREST_MEADOW] = HintText(CustomMessage("Sacred Forest Meadow",
+                                                          /*german*/ "",
+                                                          /*french*/ "le Bosquet Sacré"));
+                                                       // /*spanish*/la pradera sagrada del bosque
 
-    hintTable[RHT_SACRED_FOREST_MEADOW] = HintText::Exclude({
-        // obscure text
-        Text{ "Sacred Forest Meadow", /*french*/ "le Bosquet Sacré", /*spanish*/ "la pradera sagrada del bosque" },
-    });
+    hintTextTable[RHT_HYRULE_FIELD] = HintText(CustomMessage("Hyrule Field",
+                                                  /*german*/ "",
+                                                  /*french*/ "la Plaine d'Hyrule"));
+                                               // /*spanish*/la Llanura de Hyrule
 
-    hintTable[RHT_HYRULE_FIELD] = HintText::Exclude({
-        // obscure text
-        Text{ "Hyrule Field", /*french*/ "la Plaine d'Hyrule", /*spanish*/ "la Llanura de Hyrule" },
-    });
+    hintTextTable[RHT_LAKE_HYLIA] = HintText(CustomMessage("Lake Hylia",
+                                                /*german*/ "",
+                                                /*french*/ "le Lac Hylia"));
+                                             // /*spanish*/el Lago Hylia
 
-    hintTable[RHT_LAKE_HYLIA] = HintText::Exclude({
-        // obscure text
-        Text{ "Lake Hylia", /*french*/ "le Lac Hylia", /*spanish*/ "el Lago Hylia" },
-    });
+    hintTextTable[RHT_GERUDO_VALLEY] = HintText(CustomMessage("Gerudo Valley",
+                                                   /*german*/ "",
+                                                   /*french*/ "la Vallée Gerudo"));
+                                                // /*spanish*/el Valle Gerudo
 
-    hintTable[RHT_GERUDO_VALLEY] = HintText::Exclude({
-        // obscure text
-        Text{ "Gerudo Valley", /*french*/ "la Vallée Gerudo", /*spanish*/ "el Valle Gerudo" },
-    });
+    hintTextTable[RHT_GERUDO_FORTRESS] = HintText(CustomMessage("Gerudo's Fortress",
+                                                     /*german*/ "",
+                                                     /*french*/ "le Repaire des Voleurs"));
+                                                  // /*spanish*/la Fortaleza Gerudo
 
-    hintTable[RHT_GERUDO_FORTRESS] = HintText::Exclude({
-        // obscure text
-        Text{ "Gerudo's Fortress", /*french*/ "le Repaire des Voleurs", /*spanish*/ "la Fortaleza Gerudo" },
-    });
+    hintTextTable[RHT_HAUNTED_WASTELAND] = HintText(CustomMessage("Haunted Wasteland",
+                                                       /*german*/ "",
+                                                       /*french*/ "le Désert Hanté"));
+                                                    // /*spanish*/el desierto encantado
 
-    hintTable[RHT_HAUNTED_WASTELAND] = HintText::Exclude({
-        // obscure text
-        Text{ "Haunted Wasteland", /*french*/ "le Désert Hanté", /*spanish*/ "el desierto encantado" },
-    });
+    hintTextTable[RHT_DESERT_COLOSSUS] = HintText(CustomMessage("Desert Colossus",
+                                                     /*german*/ "",
+                                                     /*french*/ "le Colosse du Désert"));
+                                                  // /*spanish*/el Coloso del Desierto
 
-    hintTable[RHT_DESERT_COLOSSUS] = HintText::Exclude({
-        // obscure text
-        Text{ "Desert Colossus", /*french*/ "le Colosse du Désert", /*spanish*/ "el Coloso del Desierto" },
-    });
+    hintTextTable[RHT_THE_MARKET] = HintText(CustomMessage("the Market",
+                                                /*german*/ "",
+                                                /*french*/ "la Place du Marché"));
+                                             // /*spanish*/la plaza del mercado
 
-    hintTable[RHT_THE_MARKET] = HintText::Exclude({
-        // obscure text
-        Text{ "the Market", /*french*/ "la Place du Marché", /*spanish*/ "la plaza del mercado" },
-    });
+    hintTextTable[RHT_TEMPLE_OF_TIME] = HintText(CustomMessage("Temple of Time",
+                                                    /*german*/ "",
+                                                    /*french*/ "le Temple du Temps"));
+                                                 // /*spanish*/el Templo del Tiempo
+    hintTextTable[RHT_CASTLE_GROUNDS] = HintText(CustomMessage("the Castle Grounds",
+                                                    /*german*/ "",
+                                                    /*french*/ "le Château d'Hyrule"));
+                                                 // /*spanish*/
+    hintTextTable[RHT_HYRULE_CASTLE] = HintText(CustomMessage("Hyrule Castle",
+                                                   /*german*/ "",
+                                                   /*french*/ "le Château d'Hyrule"));
+                                                // /*spanish*/el Castillo de Hyrule
 
-    hintTable[RHT_TEMPLE_OF_TIME] = HintText::Exclude({
-        // obscure text
-        Text{ "Temple of Time", /*french*/ "le Temple du Temps", /*spanish*/ "el Templo del Tiempo" },
-    });
+    hintTextTable[RHT_OUTSIDE_GANONS_CASTLE] = HintText(CustomMessage("outside Ganon's Castle",
+                                                           /*german*/ "",
+                                                           /*french*/ "les alentours du Château de Ganon"));
+                                                        // /*spanish*/el exterior del Castillo de Ganon
 
-    hintTable[RHT_CASTLE_GROUNDS] = HintText::Exclude({
-        // obscure text
-        Text{ "the Castle Grounds", /*french*/ "le Château d'Hyrule", /*spanish*/ "" },
-    });
+    hintTextTable[RHT_CASTLE_GROUNDS] = HintText(CustomMessage("the Castle Grounds",
+                                                    /*german*/ "",
+                                                    /*french*/ "le Château d'Hyrule"));
+                                                 // /*spanish*/
+    hintTextTable[RHT_KAKARIKO_VILLAGE] = HintText(CustomMessage("Kakariko Village",
+                                                      /*german*/ "",
+                                                      /*french*/ "le Village Cocorico"));
+                                                   // /*spanish*/Kakariko
 
-    hintTable[RHT_HYRULE_CASTLE] = HintText::Exclude({
-        // obscure text
-        Text{ "Hyrule Castle", /*french*/ "le Château d'Hyrule", /*spanish*/ "el Castillo de Hyrule" },
-    });
+    hintTextTable[RHT_THE_GRAVEYARD] = HintText(CustomMessage("the Graveyard",
+                                                   /*german*/ "",
+                                                   /*french*/ "le Cimetière"));
+                                                // /*spanish*/el cementerio
 
-    hintTable[RHT_OUTSIDE_GANONS_CASTLE] = HintText::Exclude({
-        // obscure text
-        Text{ "outside Ganon's Castle", /*french*/ "les alentours du Château de Ganon",
-              /*spanish*/ "el exterior del Castillo de Ganon" },
-    });
+    hintTextTable[RHT_DEATH_MOUNTAIN_TRAIL] = HintText(CustomMessage("Death Mountain Trail",
+                                                          /*german*/ "",
+                                                          /*french*/ "le Chemin du Péril"));
+                                                       // /*spanish*/el sendero de la Montaña de la Muerte
 
-    hintTable[RHT_CASTLE_GROUNDS] = HintText::Exclude({
-        // obscure text
-        Text{ "the Castle Grounds", /*french*/ "le Château d'Hyrule", /*spanish*/ "" },
-    });
+    hintTextTable[RHT_GORON_CITY] = HintText(CustomMessage("Goron City",
+                                                /*german*/ "",
+                                                /*french*/ "le Village Goron"));
+                                             // /*spanish*/la Ciudad Goron
 
-    hintTable[RHT_KAKARIKO_VILLAGE] = HintText::Exclude({
-        // obscure text
-        Text{ "Kakariko Village", /*french*/ "le Village Cocorico", /*spanish*/ "Kakariko" },
-    });
+    hintTextTable[RHT_DEATH_MOUNTAIN_CRATER] = HintText(CustomMessage("Death Mountain Crater",
+                                                           /*german*/ "",
+                                                           /*french*/ "le Cratère du Péril"));
+                                                        // /*spanish*/el cráter de la Montaña de la Muerte
 
-    hintTable[RHT_THE_GRAVEYARD] = HintText::Exclude({
-        // obscure text
-        Text{ "the Graveyard", /*french*/ "le Cimetière", /*spanish*/ "el cementerio" },
-    });
+    hintTextTable[RHT_ZORAS_RIVER] = HintText(CustomMessage("Zora's River",
+                                                 /*german*/ "",
+                                                 /*french*/ "la Rivière Zora"));
+                                              // /*spanish*/el Río Zora
 
-    hintTable[RHT_DEATH_MOUNTAIN_TRAIL] = HintText::Exclude({
-        // obscure text
-        Text{ "Death Mountain Trail", /*french*/ "le Chemin du Péril",
-              /*spanish*/ "el sendero de la Montaña de la Muerte" },
-    });
+    hintTextTable[RHT_ZORAS_DOMAIN] = HintText(CustomMessage("Zora's Domain",
+                                                  /*german*/ "",
+                                                  /*french*/ "le Domaine Zora"));
+                                               // /*spanish*/la Región de los Zora
 
-    hintTable[RHT_GORON_CITY] = HintText::Exclude({
-        // obscure text
-        Text{ "Goron City", /*french*/ "le Village Goron", /*spanish*/ "la Ciudad Goron" },
-    });
-
-    hintTable[RHT_DEATH_MOUNTAIN_CRATER] = HintText::Exclude({
-        // obscure text
-        Text{ "Death Mountain Crater", /*french*/ "le Cratère du Péril",
-              /*spanish*/ "el cráter de la Montaña de la Muerte" },
-    });
-
-    hintTable[RHT_ZORAS_RIVER] = HintText::Exclude({
-        // obscure text
-        Text{ "Zora's River", /*french*/ "la Rivière Zora", /*spanish*/ "el Río Zora" },
-    });
-
-    hintTable[RHT_ZORAS_DOMAIN] = HintText::Exclude({
-        // obscure text
-        Text{ "Zora's Domain", /*french*/ "le Domaine Zora", /*spanish*/ "la Región de los Zora" },
-    });
-
-    hintTable[RHT_ZORAS_FOUNTAIN] = HintText::Exclude({
-        // obscure text
-        Text{ "Zora's Fountain", /*french*/ "la Fontaine Zora", /*spanish*/ "la Fuente Zora" },
-    });
-
-    hintTable[RHT_LON_LON_RANCH] = HintText::Exclude({
-        // obscure text
-        Text{ "Lon Lon Ranch", /*french*/ "le Ranch Lon Lon", /*spanish*/ "el Rancho Lon Lon" },
-    });
+    hintTextTable[RHT_ZORAS_FOUNTAIN] = HintText(CustomMessage("Zora's Fountain",
+                                                    /*german*/ "",
+                                                    /*french*/ "la Fontaine Zora"));
+                                                 // /*spanish*/la Fuente Zora
+    hintTextTable[RHT_LON_LON_RANCH] = HintText(CustomMessage("Lon Lon Ranch",
+                                                   /*german*/ "",
+                                                   /*french*/ "le Ranch Lon Lon"));
+                                                // /*spanish*/el Rancho Lon Lon
 
     /*--------------------------
     |     REGION HINT TEXT     |
     ---------------------------*/
 
-    hintTable[RHT_KF_LINKS_HOUSE] = HintText::Region({
-        // obscure text
-        Text{ "Link's House", /*french*/ "la #maison de @#", /*spanish*/ "la casa de @" },
-    });
-
-    //   hintTable[RHT_TOT_MAIN] = HintText::Region({
-    //                    //obscure text
-    //                    Text{"the #Temple of Time#", /*french*/"le #Temple du Temps#", /*spanish*/"el Templo del
-    //                    Tiempo"},
-    // });
-
-    hintTable[RHT_KF_MIDOS_HOUSE] = HintText::Region({
-        // obscure text
-        Text{ "Mido's house", /*french*/ "la Cabane du Grand Mido", /*spanish*/ "la casa de Mido" },
-    });
-
-    hintTable[RHT_KF_SARIAS_HOUSE] = HintText::Region({
-        // obscure text
-        Text{ "Saria's House", /*french*/ "la Cabane de Saria", /*spanish*/ "la casa de Saria" },
-    });
-
-    hintTable[RHT_KF_HOUSE_OF_TWINS] = HintText::Region({
-        // obscure text
-        Text{ "the #House of Twins#", /*french*/ "la Cabane des Jumelles", /*spanish*/ "la casa de las gemelas" },
-    });
-
-    hintTable[RHT_KF_KNOW_IT_ALL_HOUSE] = HintText::Region({
-        // obscure text
-        Text{ "Know-It-All Brothers' House", /*french*/ "la Cabane des frères Je-Sais-Tout",
-              /*spanish*/ "la casa de los hermanos Sabelotodo" },
-    });
-
-    hintTable[RHT_KF_KOKIRI_SHOP] = HintText::Region({
-        // obscure text
-        Text{ "the #Kokiri Shop#", /*french*/ "le #Magasin Kokiri#", /*spanish*/ "la tienda kokiri" },
-    });
-
-    hintTable[RHT_LH_LAB] = HintText::Region({
-        // obscure text
-        Text{ "the #Lakeside Laboratory#", /*french*/ "le #Laboratoire du Lac#",
-              /*spanish*/ "el laboratorio del lago" },
-    });
-
-    hintTable[RHT_LH_FISHING_HOLE] = HintText::Region({
-        // obscure text
-        Text{ "the #Fishing Pond#", /*french*/ "l'#Étang#", /*spanish*/ "el estanque" },
-    });
-
-    hintTable[RHT_GV_CARPENTER_TENT] = HintText::Region({
-        // obscure text
-        Text{ "the #Carpenters' tent#", /*french*/ "la #Tente des charpentiers#",
-              /*spanish*/ "la #tienda de campaña de los carpinteros#" },
-    });
-
-    hintTable[RHT_MARKET_GUARD_HOUSE] = HintText::Region({
-        // obscure text
-        Text{ "the #Guard House#", /*french*/ "le #poste de garde#", /*spanish*/ "la caseta de guardia" },
-    });
-
-    hintTable[RHT_MARKET_MASK_SHOP] = HintText::Region({
-        // obscure text
-        Text{ "the #Happy Mask Shop#", /*french*/ "la #Foire Aux Masques#",
-              /*spanish*/ "la tienda de La Máscara Feliz" },
-    });
-
-    hintTable[RHT_MARKET_BOMBCHU_BOWLING] = HintText::Region({
-        // obscure text
-        Text{ "the #Bombchu Bowling Alley#", /*french*/ "le #Bowling Teigneux#", /*spanish*/ "la Bolera Bombchu" },
-    });
-
-    hintTable[RHT_MARKET_POTION_SHOP] = HintText::Region({
-        // obscure text
-        Text{ "the #Market Potion Shop#", /*french*/ "l'#apothicaire de la Place du Marché#",
-              /*spanish*/ "la tienda de pociones de la plaza del mercado" },
-    });
-
-    hintTable[RHT_MARKET_TREASURE_CHEST_GAME] = HintText::Region({
-        // obscure text
-        Text{ "the #Treasure Chest Shop#", /*french*/ "la #Chasse-aux-Trésors#", /*spanish*/ "el Cofre del Tesoro" },
-    });
-
-    hintTable[RHT_MARKET_BOMBCHU_SHOP] = HintText::Region({
-        // obscure text
-        Text{ "the #Bombchu Shop#", /*french*/ "le #Magasin de Missiles#", /*spanish*/ "la Tienda Bombchu" },
-    });
-
-    hintTable[RHT_MARKET_MAN_IN_GREEN_HOUSE] = HintText::Region({
-        // obscure text
-        Text{ "Man in Green's House", /*french*/ "la #Maison de l'Homme en Vert#",
-              /*spanish*/ "la casa del hombre de verde" },
-    });
-
-    hintTable[RHT_KAK_WINDMILL] = HintText::Region({
-        // obscure text
-        Text{ "the #Windmill#", /*french*/ "le #Moulin#", /*spanish*/ "el #molino#" },
-    });
-
-    hintTable[RHT_KAK_CARPENTER_BOSS_HOUSE] = HintText::Region({
-        // obscure text
-        Text{ "the #Carpenters' Boss House#", /*french*/ "la #Maison du Chef des ouvriers#",
-              /*spanish*/ "la casa del capataz de los carpinteros" },
-    });
-
-    hintTable[RHT_KAK_HOUSE_OF_SKULLTULA] = HintText::Region({
-        // obscure text
-        Text{ "the #House of Skulltula#", /*french*/ "la #Maison des Skulltulas#",
-              /*spanish*/ "la casa de las Skulltulas" },
-    });
-
-    hintTable[RHT_KAK_IMPAS_HOUSE] = HintText::Region({
-        // obscure text
-        Text{ "Impa's House", /*french*/ "la #Maison d'Impa#", /*spanish*/ "la casa de Impa" },
-    });
-
-    hintTable[RHT_KAK_IMPAS_HOUSE_BACK] = HintText::Region({
-        // obscure text
-        Text{ "Impa's cow cage", /*french*/ "la #cage à vache d'Impa#", /*spanish*/ "la jaula de la vaca de Impa" },
-    });
-
-    hintTable[RHT_KAK_ODD_POTION_BUILDING] = HintText::Region({
-        // obscure text
-        Text{ "Granny's Potion Shop", /*french*/ "la #maison bleue de Cocorico#",
-              /*spanish*/ "la tienda de pociones de la abuela" },
-    });
-
-    hintTable[RHT_GRAVEYARD_DAMPES_HOUSE] = HintText::Region({
-        // obscure text
-        Text{ "Dampé's Hut", /*french*/ "la #Cabane du Fossoyeur#", /*spanish*/ "la cabaña de Dampé" },
-    });
-
-    hintTable[RHT_GC_SHOP] = HintText::Region({
-        // obscure text
-        Text{ "the #Goron Shop#", /*french*/ "la #Boutique Goron#", /*spanish*/ "la #tienda goron#" },
-    });
-
-    hintTable[RHT_ZD_SHOP] = HintText::Region({
-        // obscure text
-        Text{ "the #Zora Shop#", /*french*/ "la #Boutique Zora#", /*spanish*/ "la #tienda zora#" },
-    });
-
-    hintTable[RHT_LLR_TALONS_HOUSE] = HintText::Region({
-        // obscure text
-        Text{ "Talon's House", /*french*/ "la #Maison de Talon#", /*spanish*/ "la casa de Talon" },
-    });
-
-    hintTable[RHT_LLR_STABLES] = HintText::Region({
-        // obscure text
-        Text{ "a #stable#", /*french*/ "l'#Étable#", /*spanish*/ "el establo" },
-    });
-
-    hintTable[RHT_LLR_TOWER] = HintText::Region({
-        // obscure text
-        Text{ "the #Lon Lon Tower#", /*french*/ "le #silo du Ranch Lon Lon#", /*spanish*/ "la torre Lon Lon" },
-    });
-
-    hintTable[RHT_MARKET_BAZAAR] = HintText::Region({
-        // obscure text
-        Text{ "the #Market Bazaar#", /*french*/ "le #Bazar de la Place du Marché#",
-              /*spanish*/ "el bazar de la plaza del mercado" },
-    });
-
-    hintTable[RHT_MARKET_SHOOTING_GALLERY] = HintText::Region({
-        // obscure text
-        Text{ "a #Slingshot Shooting Gallery#", /*french*/ "le #Jeu d'Adresse de la Place du Marché#",
-              /*spanish*/ "el Tiro al Blanco con tirachinas" },
-    });
-
-    hintTable[RHT_KAK_BAZAAR] = HintText::Region({
-        // obscure text
-        Text{ "the #Kakariko Bazaar#", /*french*/ "le #Bazar de Cocorico#", /*spanish*/ "el bazar de Kakariko" },
-    });
-
-    hintTable[RHT_KAK_POTION_SHOP_FRONT] = HintText::Region({
-        // obscure text
-        Text{ "the #Kakariko Potion Shop#", /*french*/ "l'#apothicaire de Cocorico#",
-              /*spanish*/ "la tienda de pociones de Kakariko" },
-    });
-
-    hintTable[RHT_KAK_POTION_SHOP_BACK] = HintText::Region({
-        // obscure text
-        Text{ "the #Kakariko Potion Shop#", /*french*/ "l'#apothicaire de Cocorico#",
-              /*spanish*/ "la tienda de pociones de Kakariko" },
-    });
-
-    hintTable[RHT_KAK_SHOOTING_GALLERY] = HintText::Region({
-        // obscure text
-        Text{ "a #Bow Shooting Gallery#", /*french*/ "le #jeu d'adresse de Cocorico#",
-              /*spanish*/ "el Tiro al Blanco con arco" },
-    });
-
-    hintTable[RHT_COLOSSUS_GREAT_FAIRY_FOUNTAIN] = HintText::Region({
-        // obscure text
-        Text{ "a #Great Fairy Fountain#", /*french*/ "une #Fontaine Royale des Fées#",
-              /*spanish*/ "una fuente de la Gran Hada" },
-    });
-
-    hintTable[RHT_HC_GREAT_FAIRY_FOUNTAIN] = HintText::Region({
-        // obscure text
-        Text{ "a #Great Fairy Fountain#", /*french*/ "une #Fontaine Royale des Fées#",
-              /*spanish*/ "una fuente de la Gran Hada" },
-    });
-
-    hintTable[RHT_OGC_GREAT_FAIRY_FOUNTAIN] = HintText::Region({
-        // obscure text
-        Text{ "a #Great Fairy Fountain#", /*french*/ "une #Fontaine Royale des Fées#",
-              /*spanish*/ "una fuente de la Gran Hada" },
-    });
-
-    hintTable[RHT_DMC_GREAT_FAIRY_FOUNTAIN] = HintText::Region({
-        // obscure text
-        Text{ "a #Great Fairy Fountain#", /*french*/ "une #Fontaine Royale des Fées#",
-              /*spanish*/ "una fuente de la Gran Hada" },
-    });
-
-    hintTable[RHT_DMT_GREAT_FAIRY_FOUNTAIN] = HintText::Region({
-        // obscure text
-        Text{ "a #Great Fairy Fountain#", /*french*/ "une #Fontaine Royale des Fées#",
-              /*spanish*/ "una fuente de la Gran Hada" },
-    });
-
-    hintTable[RHT_ZF_GREAT_FAIRY_FOUNTAIN] = HintText::Region({
-        // obscure text
-        Text{ "a #Great Fairy Fountain#", /*french*/ "une #Fontaine Royale des Fées#",
-              /*spanish*/ "una fuente de la Gran Hada" },
-    });
-
-    hintTable[RHT_GRAVEYARD_SHIELD_GRAVE] = HintText::Region({
-        // obscure text
-        Text{ "a #grave with a free chest#", /*french*/ "le #tombeau avec un trésor#",
-              /*spanish*/ "la #tumba con un cofre#" },
-    });
-
-    hintTable[RHT_GRAVEYARD_HEART_PIECE_GRAVE] = HintText::Region({
-        // obscure text
-        Text{ "a chest spawned by #Sun's Song#", /*french*/ "un #coffre apparaît avec le Chant du Soleil#",
-              /*spanish*/ "la #tumba de la Canción del Sol#" },
-    });
-
-    hintTable[RHT_GRAVEYARD_COMPOSERS_GRAVE] = HintText::Region({
-        // obscure text
-        Text{ "the #Composers' Grave#", /*french*/ "la #Tombe royale#", /*spanish*/ "el #Panteón Real#" },
-    });
-
-    hintTable[RHT_GRAVEYARD_DAMPES_GRAVE] = HintText::Region({
-        // obscure text
-        Text{ "Dampé's Grave", /*french*/ "la #Tombe d'Igor#", /*spanish*/ "la #tumba de Dampé#" },
-    });
-
-    hintTable[RHT_DMT_COW_GROTTO] = HintText::Region({
-        // obscure text
-        Text{ "a solitary #Cow#", /*french*/ "la #grotte avec une vache#", /*spanish*/ "una #vaca# solitaria" },
-    });
-
-    hintTable[RHT_HC_STORMS_GROTTO] = HintText::Region({
-        // obscure text
-        Text{ "a sandy grotto with #fragile walls#", /*french*/ "la #grotte avec des murs fragiles#",
-              /*spanish*/ "la arenosa gruta de #frágiles paredes#" },
-    });
-
-    hintTable[RHT_HF_TEKTITE_GROTTO] = HintText::Region({
-        // obscure text
-        Text{ "a pool guarded by a #Tektite#", /*french*/ "l'#étang sous-terrain avec un Araknon#",
-              /*spanish*/ "un charco custodiado por un #Tektite#" },
-    });
-
-    hintTable[RHT_HF_NEAR_KAK_GROTTO] = HintText::Region({
-        // obscure text
-        Text{ "a #Big Skulltula# guarding a Gold one", /*french*/ "la #grotte d'araignées#",
-              /*spanish*/ "una #gran Skulltula# custodiando una dorada" },
-    });
-
-    hintTable[RHT_HF_COW_GROTTO] = HintText::Region({
-        // obscure text
-        Text{ "a grotto full of #spider webs#", /*french*/ "la #grotte couverte de toiles d'araignées#",
-              /*spanish*/ "una gruta llena de #telarañas#" },
-    });
-
-    hintTable[RHT_KAK_REDEAD_GROTTO] = HintText::Region({
-        // obscure text
-        Text{ "#ReDeads# guarding a chest", /*french*/ "le tombeau de #deux morts#",
-              /*spanish*/ "los #ReDeads# que custodian un cofre" },
-    });
-
-    hintTable[RHT_SFM_WOLFOS_GROTTO] = HintText::Region({
-        // obscure text
-        Text{ "#Wolfos# guarding a chest", /*french*/ "la #grotte iridescente#",
-              /*spanish*/ "los #Wolfos# que custodian un cofre" },
-    });
-
-    hintTable[RHT_GV_OCTOROK_GROTTO] = HintText::Region({
-        // obscure text
-        Text{ "an #Octorok# guarding a rich pool", /*french*/ "un #étang sous-terrain avec un Octorok#",
-              /*spanish*/ "un #Octorok# que custodia un lujoso charco" },
-    });
-
-    hintTable[RHT_DEKU_THEATER] = HintText::Region({
-        // obscure text
-        Text{ "the #Lost Woods Stage#", /*french*/ "le #théâtre sylvestre#",
-              /*spanish*/ "el #escenario del Bosque Perdido#" },
-    });
-
-    hintTable[RHT_ZR_OPEN_GROTTO] = HintText::Region({
-        // obscure text
-        Text{ "a #generic grotto#", /*french*/ "une #grotte avec un trésor#", /*spanish*/ "una #cueva genérica#" },
-    });
-
-    hintTable[RHT_DMC_UPPER_GROTTO] = HintText::Region({
-        // obscure text
-        Text{ "a #generic grotto#", /*french*/ "une #grotte avec un trésor#", /*spanish*/ "una #cueva genérica#" },
-    });
-
-    hintTable[RHT_DMT_STORMS_GROTTO] = HintText::Region({
-        // obscure text
-        Text{ "a #generic grotto#", /*french*/ "une #grotte avec un trésor#", /*spanish*/ "una #cueva genérica#" },
-    });
-
-    hintTable[RHT_KAK_OPEN_GROTTO] = HintText::Region({
-        // obscure text
-        Text{ "a #generic grotto#", /*french*/ "une #grotte avec un trésor#", /*spanish*/ "una #cueva genérica#" },
-    });
-
-    hintTable[RHT_HF_NEAR_MARKET_GROTTO] = HintText::Region({
-        // obscure text
-        Text{ "a #generic grotto#", /*french*/ "une #grotte avec un trésor#", /*spanish*/ "una #cueva genérica#" },
-    });
-
-    hintTable[RHT_HF_OPEN_GROTTO] = HintText::Region({
-        // obscure text
-        Text{ "a #generic grotto#", /*french*/ "une #grotte avec un trésor#", /*spanish*/ "una #cueva genérica#" },
-    });
-
-    hintTable[RHT_HF_SOUTHEAST_GROTTO] = HintText::Region({
-        // obscure text
-        Text{ "a #generic grotto#", /*french*/ "une #grotte avec un trésor#", /*spanish*/ "una #cueva genérica#" },
-    });
-
-    hintTable[RHT_KF_STORMS_GROTTO] = HintText::Region({
-        // obscure text
-        Text{ "a #generic grotto#", /*french*/ "une #grotte avec un trésor#", /*spanish*/ "una #cueva genérica#" },
-    });
-
-    hintTable[RHT_LW_NEAR_SHORTCUTS_GROTTO] = HintText::Region({
-        // obscure text
-        Text{ "a #generic grotto#", /*french*/ "une #grotte avec un trésor#", /*spanish*/ "una #cueva genérica#" },
-    });
-
-    hintTable[RHT_HF_INSIDE_FENCE_GROTTO] = HintText::Region({
-        // obscure text
-        Text{ "a #single Upgrade Deku Scrub#", /*french*/ "une #grotte avec une peste Mojo#",
-              /*spanish*/ "una cueva con un #solitario mercader deku#" },
-    });
-
-    hintTable[RHT_LW_SCRUBS_GROTTO] = HintText::Region({
-        // obscure text
-        Text{ "#2 Deku Scrubs# including an Upgrade one", /*french*/ "une #grotte avec deux pestes Mojo#",
-              /*spanish*/ "una cueva con #dos mercaderes deku#" },
-    });
-
-    hintTable[RHT_COLOSSUS_GROTTO] = HintText::Region({
-        // obscure text
-        Text{ "2 Deku Scrubs", /*french*/ "une #grotte avec deux pestes Mojo#",
-              /*spanish*/ "una cueva con #dos mercaderes deku#" },
-    });
-
-    hintTable[RHT_ZR_STORMS_GROTTO] = HintText::Region({
-        // obscure text
-        Text{ "2 Deku Scrubs", /*french*/ "une #grotte avec deux pestes Mojo#",
-              /*spanish*/ "una cueva con #dos mercaderes deku#" },
-    });
-
-    hintTable[RHT_SFM_STORMS_GROTTO] = HintText::Region({
-        // obscure text
-        Text{ "2 Deku Scrubs", /*french*/ "une #grotte avec deux pestes Mojo#",
-              /*spanish*/ "una cueva con #dos mercaderes deku#" },
-    });
-
-    hintTable[RHT_GV_STORMS_GROTTO] = HintText::Region({
-        // obscure text
-        Text{ "2 Deku Scrubs", /*french*/ "une #grotte avec deux pestes Mojo#",
-              /*spanish*/ "una cueva con #dos mercaderes deku#" },
-    });
-
-    hintTable[RHT_LH_GROTTO] = HintText::Region({
-        // obscure text
-        Text{ "3 Deku Scrubs", /*french*/ "une #grotte avec trois pestes Mojo#",
-              /*spanish*/ "una cueva con #tres mercaderes deku#" },
-    });
-
-    hintTable[RHT_DMC_HAMMER_GROTTO] = HintText::Region({
-        // obscure text
-        Text{ "3 Deku Scrubs", /*french*/ "une #grotte avec trois pestes Mojo#",
-              /*spanish*/ "una cueva con #tres mercaderes deku#" },
-    });
-
-    hintTable[RHT_GC_GROTTO] = HintText::Region({
-        // obscure text
-        Text{ "3 Deku Scrubs", /*french*/ "une #grotte avec trois pestes Mojo#",
-              /*spanish*/ "una cueva con #tres mercaderes deku#" },
-    });
-
-    hintTable[RHT_LLR_GROTTO] = HintText::Region({
-        // obscure text
-        Text{ "3 Deku Scrubs", /*french*/ "une #grotte avec trois pestes Mojo#",
-              /*spanish*/ "una cueva con #tres mercaderes deku#" },
-    });
-
-    hintTable[RHT_ZR_FAIRY_GROTTO] = HintText::Region({
-        // obscure text
-        Text{ "a small #Fairy Fountain#", /*french*/ "une #fontaine de fées#",
-              /*spanish*/ "una pequeña #fuente de hadas#" },
-    });
-
-    hintTable[RHT_HF_FAIRY_GROTTO] = HintText::Region({
-        // obscure text
-        Text{ "a small #Fairy Fountain#", /*french*/ "une #fontaine de fées#",
-              /*spanish*/ "una pequeña #fuente de hadas#" },
-    });
-
-    hintTable[RHT_SFM_FAIRY_GROTTO] = HintText::Region({
-        // obscure text
-        Text{ "a small #Fairy Fountain#", /*french*/ "une #fontaine de fées#",
-              /*spanish*/ "una pequeña #fuente de hadas#" },
-    });
-
-    hintTable[RHT_ZD_STORMS_GROTTO] = HintText::Region({
-        // obscure text
-        Text{ "a small #Fairy Fountain#", /*french*/ "une #fontaine de fées#",
-              /*spanish*/ "una pequeña #fuente de hadas#" },
-    });
-
-    hintTable[RHT_GF_STORMS_GROTTO] = HintText::Region({
-        // obscure text
-        Text{ "a small #Fairy Fountain#", /*french*/ "une #fontaine de fées#",
-              /*spanish*/ "una pequeña #fuente de hadas#" },
-    });
+    hintTextTable[RHT_KF_LINKS_HOUSE] = HintText(CustomMessage("Link's House",
+                                                    /*german*/ "",
+                                                    /*french*/ "la #maison de @#"));
+                                                 // /*spanish*/la casa de @
+
+    hintTextTable[RHT_KF_MIDOS_HOUSE] = HintText(CustomMessage("Mido's house",
+                                                    /*german*/ "",
+                                                    /*french*/ "la Cabane du Grand Mido"));
+                                                 // /*spanish*/la casa de Mido
+    hintTextTable[RHT_KF_SARIAS_HOUSE] = HintText(CustomMessage("Saria's House",
+                                                     /*german*/ "",
+                                                     /*french*/ "la Cabane de Saria"));
+                                                  // /*spanish*/la casa de Saria
+
+    hintTextTable[RHT_KF_HOUSE_OF_TWINS] = HintText(CustomMessage("the #House of Twins#",
+                                                       /*german*/ "",
+                                                       /*french*/ "la Cabane des Jumelles"));
+                                                    // /*spanish*/la casa de las gemelas
+
+    hintTextTable[RHT_KF_KNOW_IT_ALL_HOUSE] = HintText(CustomMessage("Know-It-All Brothers' House",
+                                                          /*german*/ "",
+                                                          /*french*/ "la Cabane des frères Je-Sais-Tout"));
+                                                       // /*spanish*/la casa de los hermanos Sabelotodo
+
+    hintTextTable[RHT_KF_KOKIRI_SHOP] = HintText(CustomMessage("the #Kokiri Shop#",
+                                                    /*german*/ "",
+                                                    /*french*/ "le #Magasin Kokiri#"));
+                                                 // /*spanish*/la tienda kokiri
+    hintTextTable[RHT_LH_LAB] = HintText(CustomMessage("the #Lakeside Laboratory#",
+                                            /*german*/ "",
+                                            /*french*/ "le #Laboratoire du Lac#"));
+                                         // /*spanish*/el laboratorio del lago
+
+    hintTextTable[RHT_LH_FISHING_HOLE] = HintText(CustomMessage("the #Fishing Pond#",
+                                                     /*german*/ "",
+                                                     /*french*/ "l'#Étang#"));
+                                                  // /*spanish*/el estanque
+
+    hintTextTable[RHT_GV_CARPENTER_TENT] = HintText(CustomMessage("the #Carpenters' tent#",
+                                                       /*german*/ "",
+                                                       /*french*/ "la #Tente des charpentiers#"));
+                                                    // /*spanish*/la #tienda de campaña de los carpinteros#
+
+    hintTextTable[RHT_MARKET_GUARD_HOUSE] = HintText(CustomMessage("the #Guard House#",
+                                                        /*german*/ "",
+                                                        /*french*/ "le #poste de garde#"));
+                                                     // /*spanish*/la caseta de guardia
+
+    hintTextTable[RHT_MARKET_MASK_SHOP] = HintText(CustomMessage("the #Happy Mask Shop#",
+                                                      /*german*/ "",
+                                                      /*french*/ "la #Foire Aux Masques#"));
+                                                   // /*spanish*/la tienda de La Máscara Feliz
+
+    hintTextTable[RHT_MARKET_BOMBCHU_BOWLING] = HintText(CustomMessage("the #Bombchu Bowling Alley#",
+                                                            /*german*/ "",
+                                                            /*french*/ "le #Bowling Teigneux#"));
+                                                         // /*spanish*/la Bolera Bombchu
+
+    hintTextTable[RHT_MARKET_POTION_SHOP] = HintText(CustomMessage("the #Market Potion Shop#",
+                                                        /*german*/ "",
+                                                        /*french*/ "l'#apothicaire de la Place du Marché#"));
+                                                     // /*spanish*/la tienda de pociones de la plaza del mercado
+
+    hintTextTable[RHT_MARKET_TREASURE_CHEST_GAME] = HintText(CustomMessage("the #Treasure Chest Shop#",
+                                                                /*german*/ "",
+                                                                /*french*/ "la #Chasse-aux-Trésors#"));
+                                                             // /*spanish*/el Cofre del Tesoro
+
+    hintTextTable[RHT_MARKET_BOMBCHU_SHOP] = HintText(CustomMessage("the #Bombchu Shop#",
+                                                         /*german*/ "",
+                                                         /*french*/ "le #Magasin de Missiles#"));
+                                                      // /*spanish*/la Tienda Bombchu
+
+    hintTextTable[RHT_MARKET_MAN_IN_GREEN_HOUSE] = HintText(CustomMessage("Man in Green's House",
+                                                               /*german*/ "",
+                                                               /*french*/ "la #Maison de l'Homme en Vert#"));
+                                                            // /*spanish*/la casa del hombre de verde
+
+    hintTextTable[RHT_KAK_WINDMILL] = HintText(CustomMessage("the #Windmill#",
+                                                  /*german*/ "",
+                                                  /*french*/ "le #Moulin#"));
+                                               // /*spanish*/el #molino#
+
+    hintTextTable[RHT_KAK_CARPENTER_BOSS_HOUSE] = HintText(CustomMessage("the #Carpenters' Boss House#",
+                                                              /*german*/ "",
+                                                              /*french*/ "la #Maison du Chef des ouvriers#"));
+                                                           // /*spanish*/la casa del capataz de los carpinteros
+
+    hintTextTable[RHT_KAK_HOUSE_OF_SKULLTULA] = HintText(CustomMessage("the #House of Skulltula#",
+                                                            /*german*/ "",
+                                                            /*french*/ "la #Maison des Skulltulas#"));
+                                                         // /*spanish*/la casa de las Skulltulas
+
+    hintTextTable[RHT_KAK_IMPAS_HOUSE] = HintText(CustomMessage("Impa's House",
+                                                     /*german*/ "",
+                                                     /*french*/ "la #Maison d'Impa#"));
+                                                  // /*spanish*/la casa de Impa
+
+    hintTextTable[RHT_KAK_IMPAS_HOUSE_BACK] = HintText(CustomMessage("Impa's cow cage",
+                                                          /*german*/ "",
+                                                          /*french*/ "la #cage à vache d'Impa#"));
+                                                       // /*spanish*/la jaula de la vaca de Impa
+
+    hintTextTable[RHT_KAK_ODD_POTION_BUILDING] = HintText(CustomMessage("Granny's Potion Shop",
+                                                             /*german*/ "",
+                                                             /*french*/ "la #maison bleue de Cocorico#"));
+                                                          // /*spanish*/la tienda de pociones de la abuela
+
+    hintTextTable[RHT_GRAVEYARD_DAMPES_HOUSE] = HintText(CustomMessage("Dampé's Hut",
+                                                            /*german*/ "",
+                                                            /*french*/ "la #Cabane du Fossoyeur#"));
+                                                         // /*spanish*/la cabaña de Dampé
+
+    hintTextTable[RHT_GC_SHOP] = HintText(CustomMessage("the #Goron Shop#",
+                                             /*german*/ "",
+                                             /*french*/ "la #Boutique Goron#"));
+                                          // /*spanish*/la #tienda goron#
+
+    hintTextTable[RHT_ZD_SHOP] = HintText(CustomMessage("the #Zora Shop#",
+                                             /*german*/ "",
+                                             /*french*/ "la #Boutique Zora#"));
+                                          // /*spanish*/la #tienda zora#
+
+    hintTextTable[RHT_LLR_TALONS_HOUSE] = HintText(CustomMessage("Talon's House",
+                                                      /*german*/ "",
+                                                      /*french*/ "la #Maison de Talon#"));
+                                                   // /*spanish*/la casa de Talon
+
+    hintTextTable[RHT_LLR_STABLES] = HintText(CustomMessage("a #stable#",
+                                                 /*german*/ "",
+                                                 /*french*/ "l'#Étable#"));
+                                              // /*spanish*/el establo
+
+    hintTextTable[RHT_LLR_TOWER] = HintText(CustomMessage("the #Lon Lon Tower#",
+                                               /*german*/ "",
+                                               /*french*/ "le #silo du Ranch Lon Lon#"));
+                                            // /*spanish*/la torre Lon Lon
+
+    hintTextTable[RHT_MARKET_BAZAAR] = HintText(CustomMessage("the #Market Bazaar#",
+                                                   /*german*/ "",
+                                                   /*french*/ "le #Bazar de la Place du Marché#"));
+                                                // /*spanish*/el bazar de la plaza del mercado
+
+    hintTextTable[RHT_MARKET_SHOOTING_GALLERY] = HintText(CustomMessage("a #Slingshot Shooting Gallery#",
+                                                             /*german*/ "",
+                                                             /*french*/ "le #Jeu d'Adresse de la Place du Marché#"));
+                                                          // /*spanish*/el Tiro al Blanco con tirachinas
+
+    hintTextTable[RHT_KAK_BAZAAR] = HintText(CustomMessage("the #Kakariko Bazaar#",
+                                                /*german*/ "",
+                                                /*french*/ "le #Bazar de Cocorico#"));
+                                             // /*spanish*/el bazar de Kakariko
+
+    hintTextTable[RHT_KAK_POTION_SHOP_FRONT] = HintText(CustomMessage("the #Kakariko Potion Shop#",
+                                                           /*german*/ "",
+                                                           /*french*/ "l'#apothicaire de Cocorico#"));
+                                                        // /*spanish*/la tienda de pociones de Kakariko
+
+    hintTextTable[RHT_KAK_POTION_SHOP_BACK] = HintText(CustomMessage("the #Kakariko Potion Shop#",
+                                                          /*german*/ "",
+                                                          /*french*/ "l'#apothicaire de Cocorico#"));
+                                                       // /*spanish*/la tienda de pociones de Kakariko
+
+    hintTextTable[RHT_KAK_SHOOTING_GALLERY] = HintText(CustomMessage("a #Bow Shooting Gallery#",
+                                                          /*german*/ "",
+                                                          /*french*/ "le #jeu d'adresse de Cocorico#"));
+                                                       // /*spanish*/el Tiro al Blanco con arco
+
+    hintTextTable[RHT_COLOSSUS_GREAT_FAIRY_FOUNTAIN] = HintText(CustomMessage("a #Great Fairy Fountain#",
+                                                                   /*german*/ "",
+                                                                   /*french*/ "une #Fontaine Royale des Fées#"));
+                                                                // /*spanish*/una fuente de la Gran Hada
+
+    hintTextTable[RHT_HC_GREAT_FAIRY_FOUNTAIN] = HintText(CustomMessage("a #Great Fairy Fountain#",
+                                                             /*german*/ "",
+                                                             /*french*/ "une #Fontaine Royale des Fées#"));
+                                                          // /*spanish*/una fuente de la Gran Hada
+
+    hintTextTable[RHT_OGC_GREAT_FAIRY_FOUNTAIN] = HintText(CustomMessage("a #Great Fairy Fountain#",
+                                                              /*german*/ "",
+                                                              /*french*/ "une #Fontaine Royale des Fées#"));
+                                                           // /*spanish*/una fuente de la Gran Hada
+
+    hintTextTable[RHT_DMC_GREAT_FAIRY_FOUNTAIN] = HintText(CustomMessage("a #Great Fairy Fountain#",
+                                                              /*german*/ "",
+                                                              /*french*/ "une #Fontaine Royale des Fées#"));
+                                                           // /*spanish*/una fuente de la Gran Hada
+
+    hintTextTable[RHT_DMT_GREAT_FAIRY_FOUNTAIN] = HintText(CustomMessage("a #Great Fairy Fountain#",
+                                                              /*german*/ "",
+                                                              /*french*/ "une #Fontaine Royale des Fées#"));
+                                                           // /*spanish*/una fuente de la Gran Hada
+
+    hintTextTable[RHT_ZF_GREAT_FAIRY_FOUNTAIN] = HintText(CustomMessage("a #Great Fairy Fountain#",
+                                                             /*german*/ "",
+                                                             /*french*/ "une #Fontaine Royale des Fées#"));
+                                                          // /*spanish*/una fuente de la Gran Hada
+
+    hintTextTable[RHT_GRAVEYARD_SHIELD_GRAVE] = HintText(CustomMessage("a #grave with a free chest#",
+                                                            /*german*/ "",
+                                                            /*french*/ "le #tombeau avec un trésor#"));
+                                                         // /*spanish*/la #tumba con un cofre#
+
+    hintTextTable[RHT_GRAVEYARD_HEART_PIECE_GRAVE] = HintText(CustomMessage("a chest spawned by #Sun's Song#",
+                                                                 /*german*/ "",
+                                                                 /*french*/ "un #coffre apparaît avec le Chant du Soleil#"));
+                                                              // /*spanish*/la #tumba de la Canción del Sol#
+
+    hintTextTable[RHT_GRAVEYARD_COMPOSERS_GRAVE] = HintText(CustomMessage("the #Composers' Grave#",
+                                                               /*german*/ "",
+                                                               /*french*/ "la #Tombe royale#"));
+                                                            // /*spanish*/el #Panteón Real#
+
+    hintTextTable[RHT_GRAVEYARD_DAMPES_GRAVE] = HintText(CustomMessage("Dampé's Grave",
+                                                            /*german*/ "",
+                                                            /*french*/ "la #Tombe d'Igor#"));
+                                                         // /*spanish*/la #tumba de Dampé#
+
+    hintTextTable[RHT_DMT_COW_GROTTO] = HintText(CustomMessage("a solitary #Cow#",
+                                                    /*german*/ "",
+                                                    /*french*/ "la #grotte avec une vache#"));
+                                                 // /*spanish*/una #vaca# solitaria
+    hintTextTable[RHT_HC_STORMS_GROTTO] = HintText(CustomMessage("a sandy grotto with #fragile walls#",
+                                                      /*german*/ "",
+                                                      /*french*/ "la #grotte avec des murs fragiles#"));
+                                                   // /*spanish*/la arenosa gruta de #frágiles paredes#
+
+    hintTextTable[RHT_HF_TEKTITE_GROTTO] = HintText(CustomMessage("a pool guarded by a #Tektite#",
+                                                       /*german*/ "",
+                                                       /*french*/ "l'#étang sous-terrain avec un Araknon#"));
+                                                    // /*spanish*/un charco custodiado por un #Tektite#
+
+    hintTextTable[RHT_HF_NEAR_KAK_GROTTO] = HintText(CustomMessage("a #Big Skulltula# guarding a Gold one",
+                                                        /*german*/ "",
+                                                        /*french*/ "la #grotte d'araignées#"));
+                                                     // /*spanish*/una #gran Skulltula# custodiando una dorada
+
+    hintTextTable[RHT_HF_COW_GROTTO] = HintText(CustomMessage("a grotto full of #spider webs#",
+                                                   /*german*/ "",
+                                                   /*french*/ "la #grotte couverte de toiles d'araignées#"));
+                                                // /*spanish*/una gruta llena de #telarañas#
+
+    hintTextTable[RHT_KAK_REDEAD_GROTTO] = HintText(CustomMessage("#ReDeads# guarding a chest",
+                                                       /*german*/ "",
+                                                       /*french*/ "le tombeau de #deux morts#"));
+                                                    // /*spanish*/los #ReDeads# que custodian un cofre
+
+    hintTextTable[RHT_SFM_WOLFOS_GROTTO] = HintText(CustomMessage("#Wolfos# guarding a chest",
+                                                       /*german*/ "",
+                                                       /*french*/ "la #grotte iridescente#"));
+                                                    // /*spanish*/los #Wolfos# que custodian un cofre
+
+    hintTextTable[RHT_GV_OCTOROK_GROTTO] = HintText(CustomMessage("an #Octorok# guarding a rich pool",
+                                                       /*german*/ "",
+                                                       /*french*/ "un #étang sous-terrain avec un Octorok#"));
+                                                    // /*spanish*/un #Octorok# que custodia un lujoso charco
+
+    hintTextTable[RHT_DEKU_THEATER] = HintText(CustomMessage("the #Lost Woods Stage#",
+                                                  /*german*/ "",
+                                                  /*french*/ "le #théâtre sylvestre#"));
+                                               // /*spanish*/el #escenario del Bosque Perdido#
+
+    hintTextTable[RHT_ZR_OPEN_GROTTO] = HintText(CustomMessage("a #generic grotto#",
+                                                    /*german*/ "",
+                                                    /*french*/ "une #grotte avec un trésor#"));
+                                                 // /*spanish*/una #cueva genérica#
+    hintTextTable[RHT_DMC_UPPER_GROTTO] = HintText(CustomMessage("a #generic grotto#",
+                                                      /*german*/ "",
+                                                      /*french*/ "une #grotte avec un trésor#"));
+                                                   // /*spanish*/una #cueva genérica#
+
+    hintTextTable[RHT_DMT_STORMS_GROTTO] = HintText(CustomMessage("a #generic grotto#",
+                                                       /*german*/ "",
+                                                       /*french*/ "une #grotte avec un trésor#"));
+                                                    // /*spanish*/una #cueva genérica#
+
+    hintTextTable[RHT_KAK_OPEN_GROTTO] = HintText(CustomMessage("a #generic grotto#",
+                                                     /*german*/ "",
+                                                     /*french*/ "une #grotte avec un trésor#"));
+                                                  // /*spanish*/una #cueva genérica#
+
+    hintTextTable[RHT_HF_NEAR_MARKET_GROTTO] = HintText(CustomMessage("a #generic grotto#",
+                                                           /*german*/ "",
+                                                           /*french*/ "une #grotte avec un trésor#"));
+                                                        // /*spanish*/una #cueva genérica#
+
+    hintTextTable[RHT_HF_OPEN_GROTTO] = HintText(CustomMessage("a #generic grotto#",
+                                                    /*german*/ "",
+                                                    /*french*/ "une #grotte avec un trésor#"));
+                                                 // /*spanish*/una #cueva genérica#
+    hintTextTable[RHT_HF_SOUTHEAST_GROTTO] = HintText(CustomMessage("a #generic grotto#",
+                                                         /*german*/ "",
+                                                         /*french*/ "une #grotte avec un trésor#"));
+                                                      // /*spanish*/una #cueva genérica#
+
+    hintTextTable[RHT_KF_STORMS_GROTTO] = HintText(CustomMessage("a #generic grotto#",
+                                                      /*german*/ "",
+                                                      /*french*/ "une #grotte avec un trésor#"));
+                                                   // /*spanish*/una #cueva genérica#
+
+    hintTextTable[RHT_LW_NEAR_SHORTCUTS_GROTTO] = HintText(CustomMessage("a #generic grotto#",
+                                                              /*german*/ "",
+                                                              /*french*/ "une #grotte avec un trésor#"));
+                                                           // /*spanish*/una #cueva genérica#
+
+    hintTextTable[RHT_HF_INSIDE_FENCE_GROTTO] = HintText(CustomMessage("a #single Upgrade Deku Scrub#",
+                                                            /*german*/ "",
+                                                            /*french*/ "une #grotte avec une peste Mojo#"));
+                                                         // /*spanish*/una cueva con un #solitario mercader deku#
+
+    hintTextTable[RHT_LW_SCRUBS_GROTTO] = HintText(CustomMessage("#2 Deku Scrubs# including an Upgrade one",
+                                                      /*german*/ "",
+                                                      /*french*/ "une #grotte avec deux pestes Mojo#"));
+                                                   // /*spanish*/una cueva con #dos mercaderes deku#
+
+    hintTextTable[RHT_COLOSSUS_GROTTO] = HintText(CustomMessage("2 Deku Scrubs",
+                                                     /*german*/ "",
+                                                     /*french*/ "une #grotte avec deux pestes Mojo#"));
+                                                  // /*spanish*/una cueva con #dos mercaderes deku#
+
+    hintTextTable[RHT_ZR_STORMS_GROTTO] = HintText(CustomMessage("2 Deku Scrubs",
+                                                      /*german*/ "",
+                                                      /*french*/ "une #grotte avec deux pestes Mojo#"));
+                                                   // /*spanish*/una cueva con #dos mercaderes deku#
+
+    hintTextTable[RHT_SFM_STORMS_GROTTO] = HintText(CustomMessage("2 Deku Scrubs",
+                                                       /*german*/ "",
+                                                       /*french*/ "une #grotte avec deux pestes Mojo#"));
+                                                    // /*spanish*/una cueva con #dos mercaderes deku#
+
+    hintTextTable[RHT_GV_STORMS_GROTTO] = HintText(CustomMessage("2 Deku Scrubs",
+                                                      /*german*/ "",
+                                                      /*french*/ "une #grotte avec deux pestes Mojo#"));
+                                                   // /*spanish*/una cueva con #dos mercaderes deku#
+
+    hintTextTable[RHT_LH_GROTTO] = HintText(CustomMessage("3 Deku Scrubs",
+                                               /*german*/ "",
+                                               /*french*/ "une #grotte avec trois pestes Mojo#"));
+                                            // /*spanish*/una cueva con #tres mercaderes deku#
+
+    hintTextTable[RHT_DMC_HAMMER_GROTTO] = HintText(CustomMessage("3 Deku Scrubs",
+                                                       /*german*/ "",
+                                                       /*french*/ "une #grotte avec trois pestes Mojo#"));
+                                                    // /*spanish*/una cueva con #tres mercaderes deku#
+
+    hintTextTable[RHT_GC_GROTTO] = HintText(CustomMessage("3 Deku Scrubs",
+                                               /*german*/ "",
+                                               /*french*/ "une #grotte avec trois pestes Mojo#"));
+                                            // /*spanish*/una cueva con #tres mercaderes deku#
+
+    hintTextTable[RHT_LLR_GROTTO] = HintText(CustomMessage("3 Deku Scrubs",
+                                                /*german*/ "",
+                                                /*french*/ "une #grotte avec trois pestes Mojo#"));
+                                             // /*spanish*/una cueva con #tres mercaderes deku#
+
+    hintTextTable[RHT_ZR_FAIRY_GROTTO] = HintText(CustomMessage("a small #Fairy Fountain#",
+                                                     /*german*/ "",
+                                                     /*french*/ "une #fontaine de fées#"));
+                                                  // /*spanish*/una pequeña #fuente de hadas#
+
+    hintTextTable[RHT_HF_FAIRY_GROTTO] = HintText(CustomMessage("a small #Fairy Fountain#",
+                                                     /*german*/ "",
+                                                     /*french*/ "une #fontaine de fées#"));
+                                                  // /*spanish*/una pequeña #fuente de hadas#
+
+    hintTextTable[RHT_SFM_FAIRY_GROTTO] = HintText(CustomMessage("a small #Fairy Fountain#",
+                                                      /*german*/ "",
+                                                      /*french*/ "une #fontaine de fées#"));
+                                                   // /*spanish*/una pequeña #fuente de hadas#
+
+    hintTextTable[RHT_ZD_STORMS_GROTTO] = HintText(CustomMessage("a small #Fairy Fountain#",
+                                                      /*german*/ "",
+                                                      /*french*/ "une #fontaine de fées#"));
+                                                   // /*spanish*/una pequeña #fuente de hadas#
+
+    hintTextTable[RHT_GF_STORMS_GROTTO] = HintText(CustomMessage("a small #Fairy Fountain#",
+                                                      /*german*/ "",
+                                                      /*french*/ "une #fontaine de fées#"));
+                                                   // /*spanish*/una pequeña #fuente de hadas#
 
     /*--------------------------
     |      JUNK HINT TEXT      |
     ---------------------------*/
 
-    hintTable[RHT_JUNK02] = HintText::Junk({
-        // obscure text
-        Text{ "They say you must read the names of \"Special Deal\" shop items carefully.",
-              /*french*/ "Selon moi, les \"Offres spéciales\" sont parfois trompeuses... Lisez les attentivement!",
-              /*spanish*/ "Según dicen, se debería prestar atención a los nombres de las ofertas especiales." },
-    });
-
-    hintTable[RHT_JUNK03] = HintText::Junk({
-        // obscure text
-        Text{ "They say that Zelda is a poor leader.", /*french*/ "Selon moi, Zelda ne ferait pas un bon monarque.",
-              /*spanish*/ "Según dicen, Zelda es mala líder." },
-    });
-
-    hintTable[RHT_JUNK04] = HintText::Junk({
-        // obscure text
-        Text{ "These hints can be quite useful. This is an exception.",
-              /*french*/ "Ces indices sont très utiles, à l'exception de celui-ci.",
-              /*spanish*/ "Las pistas suelen servir de ayuda. En cambio, esta no." },
-    });
-
-    hintTable[RHT_JUNK05] = HintText::Junk({
-        // obscure text
-        Text{ "They say that the Lizalfos in Dodongo's Cavern like to play in lava.",
-              /*french*/ "Selon moi, les Lézalfos de la Caverne Dodongo aiment patauger dans la lave.",
-              /*spanish*/ "Según dicen, a los Lizalfos de la Cueva de los Dodongos les gusta jugar en la lava." },
-    });
-
-    hintTable[RHT_JUNK06] = HintText::Junk({
-        // obscure text
-        Text{ "They say that all the Zora drowned in Wind Waker.",
-              /*french*/ "Selon moi, les Zoras se sont noyés dans Wind Waker.",
-              /*spanish*/ "Según dicen, en Wind Waker todos los zora se ahogaron." },
-    });
-
-    hintTable[RHT_JUNK07] = HintText::Junk({
-        // obscure text
-        Text{ "If Gorons eat rocks, does that mean I'm in danger?",
-              /*french*/ "Ne dis pas au Gorons que je suis ici. Ils mangent des roches, tu sais!",
-              /*spanish*/ "Si los Goron se tragan las piedras, ¿no me hace ser una especia vulnarable o algo así" },
-    });
-
-    hintTable[RHT_JUNK08] = HintText::Junk({
-        // obscure text
-        Text{
-            "'Member when Ganon was a blue pig?^I 'member.",
-            /*french*/ "Dans mon temps, Ganon était un cochon bleu...^Pff! Les jeunes de nos jours, et leur Ganondorf!",
-            /*spanish*/ "¿T'acuerdas cuando Ganon era un cerdo azul?^Qué tiempos, chico." },
-    });
-
-    hintTable[RHT_JUNK09] = HintText::Junk({
-        // obscure text
-        Text{ "One who does not have Triforce can't go in.", /*french*/ "Ceux sans Triforce doivent rebrousser chemin.",
-              /*spanish*/ "Aquel que no porte la Trifuerza no podrá pasar." },
-    });
-
-    hintTable[RHT_JUNK10] = HintText::Junk({
-        // obscure text
-        Text{ "Save your future, end the Happy Mask Salesman.",
-              /*french*/ "Selon moi, tu t'éviteras des jours de malheur si tu vaincs le vendeur de masques...",
-              /*spanish*/ "Salva tu futuro, acaba con el dueño de La Máscara Feliz." },
-    });
-
-    hintTable[RHT_JUNK11] = HintText::Junk({
-        // obscure text
-        Text{ "Glitches are a pathway to many abilities some consider to be... Unnatural.", /*french*/
-              "Les glitchs sont un moyen d'acquérir de nombreuses facultés considérées par certains comme... contraire "
-              "à la nature.",
-              /*spanish*/ "Los glitches son el camino a muchas habilidades que varios consideran... nada natural." },
-    });
-
-    hintTable[RHT_JUNK12] = HintText::Junk({
-        // obscure text
-        Text{ "I'm stoned. Get it?", /*french*/ "Allez, roche, papier, ciseau...&Roche.",
-              /*spanish*/ "Me he quedado de piedra. ¿Lo pillas?" },
-    });
-
-    hintTable[RHT_JUNK13] = HintText::Junk({
-        // obscure text
-        Text{ "Hoot! Hoot! Would you like me to repeat that?", /*french*/ "Hou hou! Veux-tu que je répète tout ça?",
-              /*spanish*/ "¡Buuu, buuu! ¿Te lo vuelvo a repetir?" },
-    });
-
-    hintTable[RHT_JUNK14] = HintText::Junk({
-        // obscure text
-        Text{ "Gorons are stupid. They eat rocks.", /*french*/ "Les Gorons sont des vraies têtes dures.",
-              /*spanish*/ "Los Goron son tontos. Se comen las piedras." },
-    });
-
-    hintTable[RHT_JUNK15] = HintText::Junk({
-        // obscure text
-        Text{ "They say that Lon Lon Ranch prospered under Ingo.",
-              /*french*/ "Selon moi, le Ranch Lon Lon était plus prospère sous Ingo.",
-              /*spanish*/ "Según dicen, el Rancho Lon Lon prosperó gracias a Ingo." },
-    });
-
-    hintTable[RHT_JUNK16] = HintText::Junk({
-        // obscure text
-        Text{ "The single rupee is a unique item.", /*french*/ "Nul objet n'est plus unique que le rubis vert.",
-              /*spanish*/ "La rupia de uno es un objeto singular." },
-    });
-
-    hintTable[RHT_JUNK17] = HintText::Junk({
-        // obscure text
-        Text{ "Without the Lens of Truth, the Treasure Chest Mini-Game is a 1 out of 32 chance.^Good luck!",
-              /*french*/ "Gagner la Chasse-aux-Trésors est 1 chance sur 32.^Bonne chance!", /*spanish*/
-              "Sin la Lupa de la Verdad, ganarías 1/32 veces en el Cofre del Tesoro.^¡Buena suerte con ello!" },
-    });
-
-    hintTable[RHT_JUNK18] = HintText::Junk({
-        // obscure text
-        Text{ "Use bombs wisely.", /*french*/ "Utilise les bombes avec précaution.",
-              /*spanish*/ "No desperdicies las bombas." },
-    });
-
-    hintTable[RHT_JUNK19] = HintText::Junk({
-        // obscure text
-        Text{ "They say that Volvagia hates splinters", /*french*/ "Selon moi, Volvagia déteste les échardes.",
-              /*spanish*/ "Según dicen, Volvagia le teme a las astillas." },
-    });
-
-    hintTable[RHT_JUNK20] = HintText::Junk({
-        // obscure text
-        Text{ "They say that funky monkeys can be spotted on Friday.",
-              /*french*/ "Selon moi, des capucins coquins sortent le vendredi.",
-              /*spanish*/ "Según dicen, en los viernes puedes hallar monos marchosos." },
-    });
-
-    hintTable[RHT_JUNK21] = HintText::Junk({
-        // obscure text
-        Text{ "I found you, faker!", /*french*/ "Ah-ha! Je t'ai trouvé!", /*spanish*/ "¡Ahí estás, impostor!" },
-    });
-
-    hintTable[RHT_JUNK22] = HintText::Junk({
-        // obscure text
-        Text{ "They say the Groose is loose.", /*french*/ "Selon moi, Hergo est le vrai héros.",
-              /*spanish*/ "Según dicen, Malton es un espanto." },
-    });
-
-    hintTable[RHT_JUNK23] = HintText::Junk({
-        // obscure text
-        Text{
-            "They say that players who select the \"ON\" option for \"MOTION CONTROL\" are the real \"Zelda players!\"",
-            /*french*/ "Selon moi, ceux qui utilisent les contrôles gyroscopiques sont les VRAIS joueurs.", /*spanish*/
-            "Según dicen, aquellos que juegan usando el control por movimiento son los verdaderos jugadores de "
-            "Zelda." },
-    });
-
-    hintTable[RHT_JUNK24] = HintText::Junk({
-        // obscure text
-        Text{ "What happened to Sheik?", /*french*/ "Donc... Qu'est-ce qui arrive avec Sheik?",
-              /*spanish*/ "¿Qué la habrá pasado a Sheik?" },
-    });
-
-    hintTable[RHT_JUNK25] = HintText::Junk({
-        // obscure text
-        Text{ "L2P @.", /*french*/ "Arrête de lire les indices et joue comme un grand, @.",
-              /*spanish*/ "Mira que eres novato, @." },
-    });
-
-    hintTable[RHT_JUNK26] = HintText::Junk({
-        // obscure text
-        Text{ "I've heard you can cheat at Sploosh Kaboom.",
-              /*french*/ "Selon moi, il y a une carte aux trésors à Mercantîle... Duh!",
-              /*spanish*/ "He oído por ahí que puedes hacer trampa en el Sploosh Kaboom." },
-    });
-
-    hintTable[RHT_JUNK27] = HintText::Junk({
-        // obscure text
-        Text{ "I'm Lonk from Pennsylvania.", /*french*/ "Je suis Lonk, le héros de Pennsylvanie!",
-              /*spanish*/ "Soy Lonk, de Pensilvania." },
-    });
-
-    hintTable[RHT_JUNK28] = HintText::Junk({
-        // obscure text
-        Text{ "I bet you'd like to have more bombs.", /*french*/ "Je parie que tu veux plus de bombes.",
-              /*spanish*/ "Me apuesto a que quisieras tener más bombas." },
-    });
-
-    hintTable[RHT_JUNK29] = HintText::Junk({
-        // obscure text
-        Text{ "When all else fails, use Fire.", /*french*/ "Quand rien ne marche, utilise le feu.",
-              /*spanish*/ "Cuando nada funcione, usa el fuego." },
-    });
-
-    hintTable[RHT_JUNK30] = HintText::Junk({
-        // obscure text
-        Text{ "Here's a hint, @. Don't be bad.", /*french*/ "Selon moi, la #Triforce# n'est pas dans le jeu... Duh!",
-              /*spanish*/ "Aquí tienes una pista, @: deja de ser manco." },
-    });
-
-    hintTable[RHT_JUNK31] = HintText::Junk({
-        // obscure text
-        Text{ "Game Over. Return of Ganon.", /*french*/ "Partie terminée. RETour de Ganon.",
-              /*spanish*/ "Fin de la partida. El regreso de Ganon." },
-    });
-
-    hintTable[RHT_JUNK32] = HintText::Junk({
-        // obscure text
-        Text{ "May the way of the Hero lead to the Triforce.",
-              /*french*/ "Que le chemin du héros te mène à la Triforce.",
-              /*spanish*/ "Puede que la senda del héroe te lleve hacia la Trifuerza." },
-    });
-
-    hintTable[RHT_JUNK33] = HintText::Junk({
-        // obscure text
-        Text{ "Can't find an item? Scan an Amiibo.", /*french*/ "Tu cherches de quoi? Utilise un Amiibo!",
-              /*spanish*/ "¿No encuentras algo? Escanea un amiibo." },
-    });
-
-    hintTable[RHT_JUNK34] = HintText::Junk({
-        // obscure text
-        Text{ "They say this game has just a few glitches.",
-              /*french*/ "Selon moi, ce jeu est complètement exempt de glitchs.",
-              /*spanish*/ "Dicen que este juego apenas tiene glitches." },
-    });
-
-    hintTable[RHT_JUNK35] = HintText::Junk({
-        // obscure text
-        Text{ "BRRING BRRING This is Ulrira. Wrong number?",
-              /*french*/ "DRING DRING!! Pépé le Ramollo à l'appareil... Quoi? Faux numéro?",
-              /*spanish*/ "¡Ring! ¡Ring! Al habla Ulrira. ¿Me he equivocado de número?" },
-    });
-
-    hintTable[RHT_JUNK36] = HintText::Junk({
-        // obscure text
-        Text{ "Tingle Tingle Kooloo Limpah!", /*french*/ "Tingle! Tingle! Kooloolin... Pah!",
-              /*spanish*/ "Tingle, Tingle, Kurulín... ¡PA!" },
-    });
-
-    hintTable[RHT_JUNK37] = HintText::Junk({
-        // obscure text
-        Text{ "L is real 2401", /*french*/ "L is real 2401", /*spanish*/ "L es real 2401." },
-    });
-
-    hintTable[RHT_JUNK38] = HintText::Junk({
-        // obscure text
-        Text{ "They say that Ganondorf will appear in the next Mario Tennis.",
-              /*french*/ "Selon moi, Ganondorf sera la nouvelle recrue dans Mario Tennis.",
-              /*spanish*/ "Según dicen, Ganondorf estará en el próximo Mario Tennis." },
-    });
-
-    hintTable[RHT_JUNK39] = HintText::Junk({
-        // obscure text
-        Text{ "Medigoron sells the earliest Breath of the Wild demo.",
-              /*french*/ "Selon moi, Medigoron vend une démo de #Breath of the Wild#.",
-              /*spanish*/ "Medigoron vende la primera demo del Breath of the Wild." },
-    });
-
-    hintTable[RHT_JUNK40] = HintText::Junk({
-        // obscure text
-        Text{ "Can you move me? I don't get great service here.",
-              /*french*/ "Peux-tu me déplacer? J'ai pas une bonne réception ici.",
-              /*spanish*/ "¿Puedes llevarme a otro lado? Aquí nadie me presta atención." },
-    });
-
-    hintTable[RHT_JUNK41] = HintText::Junk({
-        // obscure text
-        Text{ "They say if you use Strength on the truck, you can find Mew.",
-              /*french*/ "Selon moi, #Mew# se trouve dessous le camion... Duh!",
-              /*spanish*/ "Según dicen, puedes hallar un Mew usando Fuerza contra el camión de Ciudad Carmín." },
-    });
-
-    hintTable[RHT_JUNK42] = HintText::Junk({
-        // obscure text
-        Text{ "I'm a helpful hint Gossip Stone!^See, I'm helping.",
-              /*french*/ "Salut! Je suis une pierre de bons conseils!^Tiens, tu vois? J'aide bien, hein?",
-              /*spanish*/ "Soy una Piedra Sheikah muy útil.^¡Mira cómo te ayudo!" },
-    });
-
-    hintTable[RHT_JUNK43] = HintText::Junk({
-        // obscure text
-        Text{
-            "Dear @, please come to the castle. I've baked a cake for you.&Yours truly, Princess Zelda.", /*french*/
-            "Mon très cher @:&Viens vite au château, je t'ai préparé&un délicieux gâteau...^À bientôt, Princesse Zelda",
-            /*spanish*/
-            "Querido @: Por favor, ven al castillo. He hecho una tarta para ti.&Sinceramente tuya: Princesa Zelda." },
-    });
-
-    hintTable[RHT_JUNK44] = HintText::Junk({
-        // obscure text
-        Text{ "They say all toasters toast toast.", /*french*/ "Selon moi, les grille-pains grillent du pain.",
-              /*spanish*/ "Según dicen, todas las tostadoras tostan tostadas tostadas." },
-    });
-
-    hintTable[RHT_JUNK45] = HintText::Junk({
-        // obscure text
-        Text{ "You thought it would be a useful hint, but it was me, junk hint!",
-              /*french*/ "Tu t'attendais à un bon indice... Mais c'était moi, un mauvais indice!", /*spanish*/
-              "Je... Creeías que iba a ser una piedra de utilidad, ¡pero no, era yo, la piedra de la agonía!" },
-    });
-
-    hintTable[RHT_JUNK46] = HintText::Junk({
-        // obscure text
-        Text{ "They say that quest guidance can be found at a talking rock.",
-              /*french*/ "Selon moi, des #indices# se trouvent auprès d'une pierre parlante... Duh!",
-              /*spanish*/ "Según dicen, puedes consultarle ayuda a rocas parlanchinas." },
-    });
-
-    hintTable[RHT_JUNK47] = HintText::Junk({
-        // obscure text
-        Text{ "They say that the final item you're looking for can be found somewhere in Hyrule.",
-              /*french*/ "Selon moi, le #dernier objet# se trouve quelque part dans Hyrule... Duh!",
-              /*spanish*/ "Según dicen, el último objeto que te falte puede estar en cualquier rincón de Hyrule." },
-    });
-
-    hintTable[RHT_JUNK48] = HintText::Junk({
-        // obscure text
-        Text{ "Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.",
-              /*french*/ "Mwip.^Mwip.^Mwip.^Mwip.^Mwip.^Mwip.^Mwip.^Mwip.^Mwip.^Mwip.^Mwip.^Mwip.",
-              /*spanish*/ "Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep." },
-    });
-
-    hintTable[RHT_JUNK49] = HintText::Junk({
-        // obscure text
-        Text{ "They say that Barinade fears Deku Nuts.", /*french*/ "Selon moi, Barinade a la frousse des noix Mojo.",
-              /*spanish*/ "Según dicen, lo que más teme a Barinade son las nueces deku." },
-    });
-
-    hintTable[RHT_JUNK50] = HintText::Junk({
-        // obscure text
-        Text{ "They say that Flare Dancers do not fear Goron-crafted blades.",
-              /*french*/ "Selon moi, le danse-flamme n'a pas peur des armes de Goron.",
-              /*spanish*/ "Según dicen, los Bailafuegos no le temen a las armas forjadas por Gorons." },
-    });
-
-    hintTable[RHT_JUNK51] = HintText::Junk({
-        // obscure text
-        Text{ "They say that Morpha is easily trapped in a corner.",
-              /*french*/ "Selon moi, Morpha est facilement coincé.",
-              /*spanish*/ "Según dicen, puedes atrapar a Morpha con facilidad en una esquina." },
-    });
-
-    hintTable[RHT_JUNK52] = HintText::Junk({
-        // obscure text
-        Text{ "They say that Bongo Bongo really hates the cold.",
-              /*french*/ "Selon moi, Bongo Bongo a facilement froid aux doigts.",
-              /*spanish*/ "Según dicen, Bongo Bongo odia a muerte el frío." },
-    });
-
-    hintTable[RHT_JUNK53] = HintText::Junk({
-        // obscure text
-        Text{ "They say that your sword is most powerful when you put it away.",
-              /*french*/ "Selon moi, ton épée est à pleine puissance quand tu la rengaines.",
-              /*spanish*/ "Según dicen, tu espada se vuelve más poderosa si la guardas." },
-    });
-
-    hintTable[RHT_JUNK54] = HintText::Junk({
-        // obscure text
-        Text{ "They say that bombing the hole Volvagia last flew into can be rewarding.",
-              /*french*/ "Selon moi, le trou où se creuse Volvagia est vulnérable aux bombes.", /*spanish*/
-              "Según dicen, trae buena suerte colocar una bomba en el último agujero de donde salió Volvagia." },
-    });
-
-    hintTable[RHT_JUNK55] = HintText::Junk({
-        // obscure text
-        Text{ "They say that invisible ghosts can be exposed with Deku Nuts.",
-              /*french*/ "Selon moi, des fantômes invisibles apparaissent avec des noix Mojo.",
-              /*spanish*/ "Según dicen, puedes exponer a los espectros invisibles con nueces deku." },
-    });
-
-    hintTable[RHT_JUNK56] = HintText::Junk({
-        // obscure text
-        Text{ "They say that the real Phantom Ganon is bright and loud.",
-              /*french*/ "Selon moi, le vrai spectre de Ganon est clair et bruyant.",
-              /*spanish*/ "Según dicen, el verdadero Ganon Fantasma es brillante y ruidoso." },
-    });
-
-    hintTable[RHT_JUNK57] = HintText::Junk({
-        // obscure text
-        Text{ "They say that walking backwards is very fast.",
-              /*french*/ "Selon moi, tu fais marche arrière très rapidement pour un héros.",
-              /*spanish*/ "Según dicen, es más rápido caminar hacia atrás." },
-    });
-
-    hintTable[RHT_JUNK58] = HintText::Junk({
-        // obscure text
-        Text{
-            "They say that leaping above the Market entrance enriches most children.",
-            /*french*/ "Selon moi, les enfants riches se pavanent en haut du pont-levis.",
-            /*spanish*/ "Según dicen, saltar por las cadenas a la entrada de la plaza enriquece a muchos chiquillos." },
-    });
-
-    hintTable[RHT_JUNK59] = HintText::Junk({
-        // obscure text
-        Text{ "They say Ingo is not very good at planning ahead.",
-              /*french*/ "Selon moi, Ingo ne fait pas un très bon geôlier.",
-              /*spanish*/ "Según dicen, a Ingo no se le da especialmente bien planificar con antelación." },
-    });
-
-    hintTable[RHT_JUNK60] = HintText::Junk({
-        // obscure text
-        Text{ "You found a spiritual Stone! By which I mean, I worship Nayru.",
-              /*french*/ "Vous avez trouvé une Pierre Ancestrale! En effet, je vénère la déesse Hylia.",
-              /*spanish*/ "¡Has encontrado una piedra espiritual! Es que le rindo culto a Nayru..." },
-    });
-
-    hintTable[RHT_JUNK61] = HintText::Junk({
-        // obscure text
-        Text{ "They say that a flying strike with a Deku Stick is no stronger than a grounded one.",
-              /*french*/ "Selon moi, un coup de bâton sauté n'est pas meilleur qu'au sol.",
-              /*spanish*/ "Según dicen, los golpes aéreos con palos deku son tan fuertes como los normales." },
-    });
-
-    hintTable[RHT_JUNK62] = HintText::Junk({
-        // obscure text
-        Text{ "Open your eyes.^Open your eyes.^Wake up, @.",
-              /*french*/ "Réveille-toi...^Réveille-toi.^Ouvre les yeux, @.",
-              /*spanish*/ "Abre los ojos...^Abre los ojos...^Despierta, @..." },
-    });
-
-    hintTable[RHT_JUNK63] = HintText::Junk({
-        // obscure text
-        Text{ "They say that the Nocturne of Shadow can bring you very close to Ganon.",
-              /*french*/ "Selon moi, le nocturne de l'ombre peut t'amener très près de Ganon.",
-              /*spanish*/ "Según dicen, el Nocturno de la sombra te puede acercar mucho a Ganon." },
-    });
-
-    hintTable[RHT_JUNK64] = HintText::Junk({
-        // obscure text
-        Text{ "They say that Twinrova always casts the same spell the first three times.",
-              /*french*/ "Selon moi, Twinrova lance toujours les mêmes trois premiers sorts.",
-              /*spanish*/ "Según dicen, Birova siempre lanza el mismo hechizo las tres primeras veces." },
-    });
-
-    hintTable[RHT_JUNK65] = HintText::Junk({
-        // obscure text
-        Text{ "They say that the nightly builds may be unstable.",
-              /*french*/ "Selon moi, les \"nightly builds\" peuvent être instables.",
-              /*spanish*/ "Según dicen, las últimas nightlies pueden llegar a ser algo inestables." },
-    });
-
-    hintTable[RHT_JUNK66] = HintText::Junk({
-        // obscure text
-        Text{ "You're playing a Randomizer. I'm randomized!^Here's a random number:  #4#.&Enjoy your Randomizer!",
-              /*french*/ "Tu joues à un randomizer. Je suis aléatoire!^Voici un nombre aléatoire: #4#.&Bonne partie!",
-              /*spanish*/
-              "¡Estás jugando un Randomizer! ¡Yo también estoy aleatorizada!^Aquí tienes un número aleatorio:  "
-              "#8#.&¡Diviértete!" },
-    });
-
-    hintTable[RHT_JUNK67] = HintText::Junk({
-        // obscure text
-        Text{ "They say Ganondorf's bolts can be reflected with glass or steel.",
-              /*french*/ "Selon moi, les éclairs de Ganon se reflètent sur l'acier et le verre.",
-              /*spanish*/ "Según dicen, puedes reflejar las esferas de energía de Ganondorf con cristal y acero." },
-    });
-
-    hintTable[RHT_JUNK68] = HintText::Junk({
-        // obscure text
-        Text{ "They say Ganon's tail is vulnerable to nuts, arrows, swords, explosives, hammers...^...sticks, seeds, "
-              "boomerangs...^...rods, shovels, iron balls, angry bees...",
-              /*french*/
-              "Selon moi, la queue de Ganon est vulnérable aux noix, flèches, épées, bombes, marteaux...^...bâtons, "
-              "graines, boomerangs...^...baguettes, pelles, boulets de fer, abeilles enragées...",
-              /*spanish*/
-              "Según dicen, la cola de Ganon es vulnerable a nueces, flechas, espadas, explosivos, "
-              "martillos...^...palos, semillas, bumeráns...^...cetros, palas, bolas de hierro, abejas..." },
-    });
-
-    hintTable[RHT_JUNK69] = HintText::Junk({
-        // obscure text
-        Text{
-            "They say that you're wasting time reading this hint, but I disagree. Talk to me again!",
-            /*french*/ "Selon moi... tu sais quoi? Parle-moi encore, et je te le dirai!", /*spanish*/
-            "Según dicen, pierdes el tiempo en leer esta pista, pero no pienso igual. ¡Vuelve a hablarme, ya verás!" },
-    });
-
-    hintTable[RHT_JUNK70] = HintText::Junk({
-        // obscure text
-        Text{ "They say Ganondorf knows where to find the instrument of his doom.",
-              /*french*/ "Selon moi, Ganondorf sait où il a caché son point faible.",
-              /*spanish*/ "Según dicen, Ganondorf sabe dónde hallar el instrumento de su perdición." },
-    });
-
-    hintTable[RHT_JUNK71] = HintText::Junk({
-        // obscure text
-        Text{ "I heard @ is pretty good at Zelda.", /*french*/ "Apparemment, @ est super bon à Zelda.",
-              /*spanish*/ "He oído que a @ se le dan muy bien los Zelda." },
-    });
-
-    hintTable[RHT_JUNK72] = HintText::Junk({
-        // obscure text
-        Text{ "Hi @, we've been trying to reach you about your car's extended warranty. ",
-              /*french*/ "Bonjour, @. Vous avez une voiture? Vous savez, nous offrons des assurances abordables...",
-              /*spanish*/
-              "Buenas, @. Le llamamos para ofrecerle un nuevo seguro de hogar que puede pagar en cómodos plazos, sin "
-              "intereses ni comisiones." },
-    });
-
-    hintTable[RHT_JUNK73] = HintText::Junk({
-        // obscure text
-        Text{ "They say that the best weapon against Iron Knuckles is item 176.",
-              /*french*/ "Selon moi, les hache-viandes sont vulnérables contre l'objet 176.",
-              /*spanish*/ "Según dicen, la mejor arma para enfrentarse a los Nudillos de hierro es el objeto 176." },
-    });
-
-    hintTable[RHT_JUNK74] = HintText::Junk({
-        // obscure text
-        Text{ "They say that it's actually possible to beat the running man.",
-              /*french*/ "Selon moi, il est possible de battre le coureur.&Donc, tu prends ton arc, et...",
-              /*spanish*/ "Según dicen, con mucha perseverancia puedes ganarle al corredor con la capucha de conejo." },
-    });
-
-    hintTable[RHT_JUNK75] = HintText::Junk({
-        // obscure text
-        Text{ "They say that the stone-cold guardian of the Well is only present during work hours.",
-              /*french*/ "Selon moi, le gardien de pierre du Puits quitte le soir pour aller se coucher.",
-              /*spanish*/ "Según dicen, la inmensa roca que bloquea el pozo solo trabaja en horas laborales." },
-    });
-
-    hintTable[RHT_JUNK76] = HintText::Junk({
-        // obscure text
-        Text{
-            "They say this hint makes more sense in other languages.",
-            /*french*/ "Selon moi, ces indices auraient pu être mieux traduits... Duh!",
-            /*spanish*/ "Según dicen, esta pista revela algo de vital importancia si cambias el idioma del juego..." },
-    });
-
-    hintTable[RHT_JUNK77] = HintText::Junk({
-        // obscure text
-        Text{ "BOK? No way.", /*french*/ "BD'accord? Hors de question.", /*spanish*/ "¿BVale? Ni hablar." },
-    });
+    hintTextTable[RHT_JUNK02] = HintText(CustomMessage("They say you must read the names of \"Special Deal\" shop items carefully.",
+                                                      /*german*/ "",
+                                                      /*french*/ "Selon moi, les \"Offres spéciales\" sont parfois trompeuses... Lisez les attentivement!"));
+                                                   // /*spanish*/"Según dicen, se debería prestar atención a los nombres de las ofertas especiales."
+
+
+ hintTextTable[RHT_JUNK03] = HintText(CustomMessage("They say that Zelda is a poor leader.",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, Zelda ne ferait pas un bon monarque."));
+                                         // /*spanish*/Según dicen, Zelda es mala líder.
+
+    hintTextTable[RHT_JUNK04] = HintText(CustomMessage("These hints can be quite useful. This is an exception.",
+                                            /*german*/ "",
+                                            /*french*/ "Ces indices sont très utiles, à l'exception de celui-ci."));
+                                         // /*spanish*/Las pistas suelen servir de ayuda. En cambio, esta no.
+
+    hintTextTable[RHT_JUNK05] = HintText(CustomMessage("They say that the Lizalfos in Dodongo's Cavern like to play in lava.",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, les Lézalfos de la Caverne Dodongo aiment patauger dans la lave."));
+                                         // /*spanish*/Según dicen, a los Lizalfos de la Cueva de los Dodongos les gusta jugar en la lava.
+
+    hintTextTable[RHT_JUNK06] = HintText(CustomMessage("They say that all the Zora drowned in Wind Waker.",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, les Zoras se sont noyés dans Wind Waker."));
+                                         // /*spanish*/Según dicen, en Wind Waker todos los zora se ahogaron.
+
+    hintTextTable[RHT_JUNK07] = HintText(CustomMessage("If Gorons eat rocks, does that mean I'm in danger?",
+                                            /*german*/ "",
+                                            /*french*/ "Ne dis pas au Gorons que je suis ici. Ils mangent des roches, tu sais!"));
+                                         // /*spanish*/Si los Goron se tragan las piedras, ¿no me hace ser una especia vulnarable o algo así
+
+    hintTextTable[RHT_JUNK08] = HintText(CustomMessage("'Member when Ganon was a blue pig?^I 'member.",
+                                            /*german*/ "",
+                                            /*french*/ "Dans mon temps, Ganon était un cochon bleu...^Pff! Les jeunes de nos jours, et leur Ganondorf!"));
+                                         // /*spanish*/¿T'acuerdas cuando Ganon era un cerdo azul?^Qué tiempos, chico.
+
+    hintTextTable[RHT_JUNK09] = HintText(CustomMessage("One who does not have Triforce can't go in.",
+                                            /*german*/ "",
+                                            /*french*/ "Ceux sans Triforce doivent rebrousser chemin."));
+                                         // /*spanish*/Aquel que no porte la Trifuerza no podrá pasar.
+
+    hintTextTable[RHT_JUNK10] = HintText(CustomMessage("Save your future, end the Happy Mask Salesman.",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, tu t'éviteras des jours de malheur si tu vaincs le vendeur de masques..."));
+                                         // /*spanish*/Salva tu futuro, acaba con el dueño de La Máscara Feliz.
+
+    hintTextTable[RHT_JUNK11] = HintText(CustomMessage("Glitches are a pathway to many abilities some consider to be... Unnatural.",
+                                            /*german*/ "Los glitches son el camino a muchas habilidades que varios consideran... nada natural.",
+                                            /*french*/ "Les glitchs sont un moyen d'acquérir de nombreuses facultés considérées par certains comme... contraire "));
+                                         // /*spanish*/à la nature.
+
+    hintTextTable[RHT_JUNK12] = HintText(CustomMessage("I'm stoned. Get it?",
+                                            /*german*/ "",
+                                            /*french*/ "Allez, roche, papier, ciseau...&Roche."));
+                                         // /*spanish*/Me he quedado de piedra. ¿Lo pillas?
+
+    hintTextTable[RHT_JUNK13] = HintText(CustomMessage("Hoot! Hoot! Would you like me to repeat that?",
+                                            /*german*/ "",
+                                            /*french*/ "Hou hou! Veux-tu que je répète tout ça?"));
+                                         // /*spanish*/¡Buuu, buuu! ¿Te lo vuelvo a repetir?
+
+    hintTextTable[RHT_JUNK14] = HintText(CustomMessage("Gorons are stupid. They eat rocks.",
+                                            /*german*/ "",
+                                            /*french*/ "Les Gorons sont des vraies têtes dures."));
+                                         // /*spanish*/Los Goron son tontos. Se comen las piedras.
+
+    hintTextTable[RHT_JUNK15] = HintText(CustomMessage("They say that Lon Lon Ranch prospered under Ingo.",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, le Ranch Lon Lon était plus prospère sous Ingo."));
+                                         // /*spanish*/Según dicen, el Rancho Lon Lon prosperó gracias a Ingo.
+
+    hintTextTable[RHT_JUNK16] = HintText(CustomMessage("The single rupee is a unique item.",
+                                            /*german*/ "",
+                                            /*french*/ "Nul objet n'est plus unique que le rubis vert."));
+                                         // /*spanish*/La rupia de uno es un objeto singular.
+
+    hintTextTable[RHT_JUNK17] = HintText(CustomMessage("Without the Lens of Truth, the Treasure Chest Mini-Game is a 1 out of 32 chance.^Good luck!",
+                                            /*german*/ "",
+                                            /*french*/ "Gagner la Chasse-aux-Trésors est 1 chance sur 32.^Bonne chance!"));
+                                         // /*spanish*/Sin la Lupa de la Verdad, ganarías 1/32 veces en el Cofre del Tesoro.^¡Buena suerte con ello!
+
+    hintTextTable[RHT_JUNK18] = HintText(CustomMessage("Use bombs wisely.",
+                                            /*german*/ "",
+                                            /*french*/ "Utilise les bombes avec précaution."));
+                                         // /*spanish*/No desperdicies las bombas.
+
+    hintTextTable[RHT_JUNK19] = HintText(CustomMessage("They say that Volvagia hates splinters",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, Volvagia déteste les échardes."));
+                                         // /*spanish*/Según dicen, Volvagia le teme a las astillas.
+
+    hintTextTable[RHT_JUNK20] = HintText(CustomMessage("They say that funky monkeys can be spotted on Friday.",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, des capucins coquins sortent le vendredi."));
+                                         // /*spanish*/Según dicen, en los viernes puedes hallar monos marchosos.
+
+    hintTextTable[RHT_JUNK21] = HintText(CustomMessage("I found you, faker!",
+                                            /*german*/ "",
+                                            /*french*/ "Ah-ha! Je t'ai trouvé!"));
+                                         // /*spanish*/¡Ahí estás, impostor!
+
+    hintTextTable[RHT_JUNK22] = HintText(CustomMessage("They say the Groose is loose.",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, Hergo est le vrai héros."));
+                                         // /*spanish*/Según dicen, Malton es un espanto.
+
+    hintTextTable[RHT_JUNK23] = HintText(CustomMessage("They say that players who select the \"ON\" option for \"MOTION CONTROL\" are the real \"Zelda players!\"",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, ceux qui utilisent les contrôles gyroscopiques sont les VRAIS joueurs."));
+                                            // /*spanish*/ "Según dicen, aquellos que juegan usando el control por movimiento son los verdaderos jugadores de Zelda."
+
+    hintTextTable[RHT_JUNK24] = HintText(CustomMessage("What happened to Sheik?",
+                                            /*german*/ "",
+                                            /*french*/ "Donc... Qu'est-ce qui arrive avec Sheik?"));
+                                         // /*spanish*/¿Qué la habrá pasado a Sheik?
+
+    hintTextTable[RHT_JUNK25] = HintText(CustomMessage("L2P @.",
+                                            /*german*/ "",
+                                            /*french*/ "Arrête de lire les indices et joue comme un grand, @."));
+                                         // /*spanish*/Mira que eres novato, @.
+
+    hintTextTable[RHT_JUNK26] = HintText(CustomMessage("I've heard you can cheat at Sploosh Kaboom.",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, il y a une carte aux trésors à Mercantîle... Duh!"));
+                                         // /*spanish*/He oído por ahí que puedes hacer trampa en el Sploosh Kaboom.
+
+    hintTextTable[RHT_JUNK27] = HintText(CustomMessage("I'm Lonk from Pennsylvania.",
+                                            /*german*/ "",
+                                            /*french*/ "Je suis Lonk, le héros de Pennsylvanie!"));
+                                         // /*spanish*/Soy Lonk, de Pensilvania.
+
+    hintTextTable[RHT_JUNK28] = HintText(CustomMessage("I bet you'd like to have more bombs.",
+                                            /*german*/ "",
+                                            /*french*/ "Je parie que tu veux plus de bombes."));
+                                         // /*spanish*/Me apuesto a que quisieras tener más bombas.
+
+    hintTextTable[RHT_JUNK29] = HintText(CustomMessage("When all else fails, use Fire.",
+                                            /*german*/ "",
+                                            /*french*/ "Quand rien ne marche, utilise le feu."));
+                                         // /*spanish*/Cuando nada funcione, usa el fuego.
+
+    hintTextTable[RHT_JUNK30] = HintText(CustomMessage("Here's a hint, @. Don't be bad.",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, la #Triforce# n'est pas dans le jeu... Duh!"));
+                                         // /*spanish*/Aquí tienes una pista, @: deja de ser manco.
+
+    hintTextTable[RHT_JUNK31] = HintText(CustomMessage("Game Over. Return of Ganon.",
+                                            /*german*/ "",
+                                            /*french*/ "Partie terminée. RETour de Ganon."));
+                                         // /*spanish*/Fin de la partida. El regreso de Ganon.
+
+    hintTextTable[RHT_JUNK32] = HintText(CustomMessage("May the way of the Hero lead to the Triforce.",
+                                            /*german*/ "",
+                                            /*french*/ "Que le chemin du héros te mène à la Triforce."));
+                                         // /*spanish*/Puede que la senda del héroe te lleve hacia la Trifuerza.
+
+    hintTextTable[RHT_JUNK33] = HintText(CustomMessage("Can't find an item? Scan an Amiibo.",
+                                            /*german*/ "",
+                                            /*french*/ "Tu cherches de quoi? Utilise un Amiibo!"));
+                                         // /*spanish*/¿No encuentras algo? Escanea un amiibo.
+
+    hintTextTable[RHT_JUNK34] = HintText(CustomMessage("They say this game has just a few glitches.",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, ce jeu est complètement exempt de glitchs."));
+                                         // /*spanish*/Dicen que este juego apenas tiene glitches.
+
+    hintTextTable[RHT_JUNK35] = HintText(CustomMessage("BRRING BRRING This is Ulrira. Wrong number?",
+                                            /*german*/ "",
+                                            /*french*/ "DRING DRING!! Pépé le Ramollo à l'appareil... Quoi? Faux numéro?"));
+                                         // /*spanish*/¡Ring! ¡Ring! Al habla Ulrira. ¿Me he equivocado de número?
+
+    hintTextTable[RHT_JUNK36] = HintText(CustomMessage("Tingle Tingle Kooloo Limpah!",
+                                            /*german*/ "",
+                                            /*french*/ "Tingle! Tingle! Kooloolin... Pah!"));
+                                         // /*spanish*/Tingle, Tingle, Kurulín... ¡PA!
+
+    hintTextTable[RHT_JUNK37] = HintText(CustomMessage("L is real 2401",
+                                            /*german*/ "",
+                                            /*french*/ "L is real 2401"));
+                                         // /*spanish*/L es real 2401.
+
+    hintTextTable[RHT_JUNK38] = HintText(CustomMessage("They say that Ganondorf will appear in the next Mario Tennis.",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, Ganondorf sera la nouvelle recrue dans Mario Tennis."));
+                                         // /*spanish*/Según dicen, Ganondorf estará en el próximo Mario Tennis.
+
+    hintTextTable[RHT_JUNK39] = HintText(CustomMessage("Medigoron sells the earliest Breath of the Wild demo.",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, Medigoron vend une démo de #Breath of the Wild#."));
+                                         // /*spanish*/Medigoron vende la primera demo del Breath of the Wild.
+
+    hintTextTable[RHT_JUNK40] = HintText(CustomMessage("Can you move me? I don't get great service here.",
+                                            /*german*/ "",
+                                            /*french*/ "Peux-tu me déplacer? J'ai pas une bonne réception ici."));
+                                         // /*spanish*/¿Puedes llevarme a otro lado? Aquí nadie me presta atención.
+
+    hintTextTable[RHT_JUNK41] = HintText(CustomMessage("They say if you use Strength on the truck, you can find Mew.",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, #Mew# se trouve dessous le camion... Duh!"));
+                                         // /*spanish*/Según dicen, puedes hallar un Mew usando Fuerza contra el camión de Ciudad Carmín.
+
+    hintTextTable[RHT_JUNK42] = HintText(CustomMessage("I'm a helpful hint Gossip Stone!^See, I'm helping.",
+                                            /*german*/ "",
+                                            /*french*/ "Salut! Je suis une pierre de bons conseils!^Tiens, tu vois? J'aide bien, hein?"));
+                                         // /*spanish*/Soy una Piedra Sheikah muy útil.^¡Mira cómo te ayudo!
+
+    hintTextTable[RHT_JUNK43] = HintText(CustomMessage("Dear @, please come to the castle. I've baked a cake for you.&Yours truly, Princess Zelda.",
+                                            /*german*/ "",
+                                            /*french*/ "Mon très cher @:&Viens vite au château, je t'ai préparé&un délicieux gâteau...^À bientôt, Princesse Zelda"));
+                                         // /*spanish*/Querido @: Por favor, ven al castillo. He hecho una tarta para ti.&Sinceramente tuya: Princesa Zelda.
+
+    hintTextTable[RHT_JUNK44] = HintText(CustomMessage("They say all toasters toast toast.",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, les grille-pains grillent du pain."));
+                                         // /*spanish*/Según dicen, todas las tostadoras tostan tostadas tostadas.
+
+    hintTextTable[RHT_JUNK45] = HintText(CustomMessage("You thought it would be a useful hint, but it was me, junk hint!",
+                                            /*german*/ "",
+                                            /*french*/ "Tu t'attendais à un bon indice... Mais c'était moi, un mauvais indice!"));
+                                         // /*spanish*/Je... Creeías que iba a ser una piedra de utilidad, ¡pero no, era yo, la piedra de la agonía!
+
+    hintTextTable[RHT_JUNK46] = HintText(CustomMessage("They say that quest guidance can be found at a talking rock.",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, des #indices# se trouvent auprès d'une pierre parlante... Duh!"));
+                                         // /*spanish*/Según dicen, puedes consultarle ayuda a rocas parlanchinas.
+
+    hintTextTable[RHT_JUNK47] = HintText(CustomMessage("They say that the final item you're looking for can be found somewhere in Hyrule.",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, le #dernier objet# se trouve quelque part dans Hyrule... Duh!"));
+                                         // /*spanish*/Según dicen, el último objeto que te falte puede estar en cualquier rincón de Hyrule.
+
+    hintTextTable[RHT_JUNK48] = HintText(CustomMessage("Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.",
+                                            /*german*/ "",
+                                            /*french*/ "Mwip.^Mwip.^Mwip.^Mwip.^Mwip.^Mwip.^Mwip.^Mwip.^Mwip.^Mwip.^Mwip.^Mwip."));
+                                         // /*spanish*/Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.
+
+    hintTextTable[RHT_JUNK49] = HintText(CustomMessage("They say that Barinade fears Deku Nuts.",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, Barinade a la frousse des noix Mojo."));
+                                         // /*spanish*/Según dicen, lo que más teme a Barinade son las nueces deku.
+
+    hintTextTable[RHT_JUNK50] = HintText(CustomMessage("They say that Flare Dancers do not fear Goron-crafted blades.",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, le danse-flamme n'a pas peur des armes de Goron."));
+                                         // /*spanish*/Según dicen, los Bailafuegos no le temen a las armas forjadas por Gorons.
+
+    hintTextTable[RHT_JUNK51] = HintText(CustomMessage("They say that Morpha is easily trapped in a corner.",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, Morpha est facilement coincé."));
+                                         // /*spanish*/Según dicen, puedes atrapar a Morpha con facilidad en una esquina.
+
+    hintTextTable[RHT_JUNK52] = HintText(CustomMessage("They say that Bongo Bongo really hates the cold.",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, Bongo Bongo a facilement froid aux doigts."));
+                                         // /*spanish*/Según dicen, Bongo Bongo odia a muerte el frío.
+
+    hintTextTable[RHT_JUNK53] = HintText(CustomMessage("They say that your sword is most powerful when you put it away.",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, ton épée est à pleine puissance quand tu la rengaines."));
+                                         // /*spanish*/Según dicen, tu espada se vuelve más poderosa si la guardas.
+
+    hintTextTable[RHT_JUNK54] = HintText(CustomMessage("They say that bombing the hole Volvagia last flew into can be rewarding.",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, le trou où se creuse Volvagia est vulnérable aux bombes."));
+                                         // /*spanish*/Según dicen, trae buena suerte colocar una bomba en el último agujero de donde salió Volvagia.
+
+    hintTextTable[RHT_JUNK55] = HintText(CustomMessage("They say that invisible ghosts can be exposed with Deku Nuts.",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, des fantômes invisibles apparaissent avec des noix Mojo."));
+                                         // /*spanish*/Según dicen, puedes exponer a los espectros invisibles con nueces deku.
+
+    hintTextTable[RHT_JUNK56] = HintText(CustomMessage("They say that the real Phantom Ganon is bright and loud.",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, le vrai spectre de Ganon est clair et bruyant."));
+                                         // /*spanish*/Según dicen, el verdadero Ganon Fantasma es brillante y ruidoso.
+
+    hintTextTable[RHT_JUNK57] = HintText(CustomMessage("They say that walking backwards is very fast.",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, tu fais marche arrière très rapidement pour un héros."));
+                                         // /*spanish*/Según dicen, es más rápido caminar hacia atrás.
+
+    hintTextTable[RHT_JUNK58] = HintText(CustomMessage("They say that leaping above the Market entrance enriches most children.",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, les enfants riches se pavanent en haut du pont-levis."));
+                                         // /*spanish*/Según dicen, saltar por las cadenas a la entrada de la plaza enriquece a muchos chiquillos.
+
+    hintTextTable[RHT_JUNK59] = HintText(CustomMessage("They say Ingo is not very good at planning ahead.",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, Ingo ne fait pas un très bon geôlier."));
+                                         // /*spanish*/Según dicen, a Ingo no se le da especialmente bien planificar con antelación.
+
+    hintTextTable[RHT_JUNK60] = HintText(CustomMessage("You found a spiritual Stone! By which I mean, I worship Nayru.",
+                                            /*german*/ "",
+                                            /*french*/ "Vous avez trouvé une Pierre Ancestrale! En effet, je vénère la déesse Hylia."));
+                                         // /*spanish*/¡Has encontrado una piedra espiritual! Es que le rindo culto a Nayru...
+
+    hintTextTable[RHT_JUNK61] = HintText(CustomMessage("They say that a flying strike with a Deku Stick is no stronger than a grounded one.",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, un coup de bâton sauté n'est pas meilleur qu'au sol."));
+                                         // /*spanish*/Según dicen, los golpes aéreos con palos deku son tan fuertes como los normales.
+
+    hintTextTable[RHT_JUNK62] = HintText(CustomMessage("Open your eyes.^Open your eyes.^Wake up, @.",
+                                            /*german*/ "",
+                                            /*french*/ "Réveille-toi...^Réveille-toi.^Ouvre les yeux, @."));
+                                         // /*spanish*/Abre los ojos...^Abre los ojos...^Despierta, @...
+
+    hintTextTable[RHT_JUNK63] = HintText(CustomMessage("They say that the Nocturne of Shadow can bring you very close to Ganon.",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, le nocturne de l'ombre peut t'amener très près de Ganon."));
+                                         // /*spanish*/Según dicen, el Nocturno de la sombra te puede acercar mucho a Ganon.
+
+    hintTextTable[RHT_JUNK64] = HintText(CustomMessage("They say that Twinrova always casts the same spell the first three times.",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, Twinrova lance toujours les mêmes trois premiers sorts."));
+                                         // /*spanish*/Según dicen, Birova siempre lanza el mismo hechizo las tres primeras veces.
+
+    hintTextTable[RHT_JUNK65] = HintText(CustomMessage("They say that the nightly builds may be unstable.",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, les \"nightly builds\" peuvent être instables."));
+                                         // /*spanish*/Según dicen, las últimas nightlies pueden llegar a ser algo inestables.
+
+    hintTextTable[RHT_JUNK66] = HintText(CustomMessage("You're playing a Randomizer. I'm randomized!^Here's a random number:  #4#.&Enjoy your Randomizer!",
+                                            /*german*/ "",
+                                            /*french*/ "Tu joues à un randomizer. Je suis aléatoire!^Voici un nombre aléatoire: #4#.&Bonne partie!"));
+                                         // /*spanish*/¡Estás jugando un Randomizer! ¡Yo también estoy aleatorizada!^Aquí tienes un número aleatorio: #8#.&¡Diviértete!
+
+    hintTextTable[RHT_JUNK67] = HintText(CustomMessage("They say Ganondorf's bolts can be reflected with glass or steel.",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, les éclairs de Ganon se reflètent sur l'acier et le verre."));
+                                         // /*spanish*/Según dicen, puedes reflejar las esferas de energía de Ganondorf con cristal y acero.
+
+    hintTextTable[RHT_JUNK68] = HintText(CustomMessage("They say Ganon's tail is vulnerable to nuts, arrows, swords, explosives, hammers...^...sticks, seeds, "
+                                                       "boomerangs...^...rods, shovels, iron balls, angry bees...",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, la queue de Ganon est vulnérable aux noix, flèches, épées, bombes, marteaux...^...bâtons, "
+                                                       "graines, boomerangs...^...baguettes, pelles, boulets de fer, abeilles enragées..."));
+                                         // /*spanish*/Según dicen, la cola de Ganon es vulnerable a nueces, flechas, espadas, explosivos,
+                                                    // martillos...^...palos, semillas, bumeráns...^...cetros, palas, bolas de hierro, abejas...
+
+    hintTextTable[RHT_JUNK69] = HintText(CustomMessage("They say that you're wasting time reading this hint, but I disagree. Talk to me again!",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi... tu sais quoi? Parle-moi encore, et je te le dirai!"));
+                                         // /*spanish*/Según dicen, pierdes el tiempo en leer esta pista, pero no pienso igual. ¡Vuelve a hablarme, ya verás!
+
+    hintTextTable[RHT_JUNK70] = HintText(CustomMessage("They say Ganondorf knows where to find the instrument of his doom.",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, Ganondorf sait où il a caché son point faible."));
+                                         // /*spanish*/Según dicen, Ganondorf sabe dónde hallar el instrumento de su perdición.
+
+    hintTextTable[RHT_JUNK71] = HintText(CustomMessage("I heard @ is pretty good at Zelda.",
+                                            /*german*/ "",
+                                            /*french*/ "Apparemment, @ est super bon à Zelda."));
+                                         // /*spanish*/He oído que a @ se le dan muy bien los Zelda.
+
+    hintTextTable[RHT_JUNK72] = HintText(CustomMessage("Hi @, we've been trying to reach you about your car's extended warranty. ",
+                                            /*german*/ "",
+                                            /*french*/ "Bonjour, @. Vous avez une voiture? Vous savez, nous offrons des assurances abordables..."));
+                                         // /*spanish*/Buenas, @. Le llamamos para ofrecerle un nuevo seguro de hogar que puede pagar en cómodos plazos, sin
+                                                    // intereses ni comisiones.
+
+    hintTextTable[RHT_JUNK73] = HintText(CustomMessage("They say that the best weapon against Iron Knuckles is item 176.",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, les hache-viandes sont vulnérables contre l'objet 176."));
+                                         // /*spanish*/Según dicen, la mejor arma para enfrentarse a los Nudillos de hierro es el objeto 176.
+
+    hintTextTable[RHT_JUNK74] = HintText(CustomMessage("They say that it's actually possible to beat the running man.",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, il est possible de battre le coureur.&Donc, tu prends ton arc, et..."));
+                                         // /*spanish*/Según dicen, con mucha perseverancia puedes ganarle al corredor con la capucha de conejo.
+
+    hintTextTable[RHT_JUNK75] = HintText(CustomMessage("They say that the stone-cold guardian of the Well is only present during work hours.",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, le gardien de pierre du Puits quitte le soir pour aller se coucher."));
+                                         // /*spanish*/Según dicen, la inmensa roca que bloquea el pozo solo trabaja en horas laborales.
+
+    hintTextTable[RHT_JUNK76] = HintText(CustomMessage("They say this hint makes more sense in other languages.",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, ces indices auraient pu être mieux traduits... Duh!"));
+                                         // /*spanish*/Según dicen, esta pista revela algo de vital importancia si cambias el idioma del juego...
+
+    hintTextTable[RHT_JUNK77] = HintText(CustomMessage("BOK? No way.",
+                                            /*german*/ "",
+                                            /*french*/ "BD'accord? Hors de question."));
+                                         // /*spanish*/¿BVale? Ni hablar.
 
     // ^ junk hints above are from 3drando
     // v junk hints below are new to soh rando
@@ -2087,1436 +1777,1103 @@ void HintTable_Init() {
 #define HINT_TEXT_NEEDS_TRANSLATION_FR \
     "Erreur 0x69a504:&Traduction manquante^C'est de la faute à Purple Hato!&J'vous jure!"
 
-    hintTable[RHT_JUNK78] = HintText::Junk({
-        //obscure text
-        Text{"They say blarg...^...or at least briaguya does.", /*french*/"Tout ce que j'ai à dire, c'est blarg...^... 'fin c'est plutôt ce que briaguya dirait.", /*spanish*/"blarg"},
-    });
-
-    hintTable[RHT_JUNK79] = HintText::Junk({
-        //obscure text
-        Text{"They say this peace is what all true warriors strive for.", /*french*/"Selon moi, cette paix est ce pour quoi luttent tous les vrais guerriers.", /*spanish*/"blarg"},
-    });
-
-    hintTable[RHT_JUNK80] = HintText::Junk({
-        //obscure text
-        Text{"They say this ship is what all true gamers strive for.", /*french*/"Selon moi, cette version du port est ce pour quoi luttent tous les vrais gamers.", /*spanish*/"blarg"},
-    });
-
-    hintTable[RHT_JUNK81] = HintText::Junk({
-        //obscure text
-        Text{"They say that Glowsticks can be found in the Raveyard.", /*french*/"On peut trouver des Bâtons Lumineux sur le dancefloor du cimetière.", /*spanish*/"blarg"},
-    });
-
-    hintTable[RHT_JUNK_WTC_1] = HintText::Junk({
-        Text{ "They say %rthere are no more than 18&people on this island.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_WTC_2] = HintText::Junk({
-        Text{ "They say I am one yet many", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_WTC_3] = HintText::Junk({
-        Text{ "They say its all in the name of guiding&humanity down the right path.", HINT_TEXT_NEEDS_TRANSLATION_FR,
-              "blarg" },
-    });
-
-    hintTable[RHT_JUNK_WTC_4] = HintText::Junk({
-        Text{ "They say \"Repetition requested\"", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_WTC_5] = HintText::Junk({
-        Text{ "They say %rThe red tells only the truth!", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_WTC_6] = HintText::Junk({
-        Text{ "They say good tidings to you^my traitorous @", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_WTC_7] = HintText::Junk({
-        Text{ "They say when the seagulls cried,&none were left alive.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_WTC_7] = HintText::Junk({
-        Text{ "They say when the seagulls cried,&none were left alive.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_WTC_8] = HintText::Junk({
-        Text{ "They say she is lying with the red letters!", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_WTC_9] = HintText::Junk({
-        Text{ "They say we'll meet again,&when something else cries.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_WTC_10] = HintText::Junk({
-        Text{ "They say \"Forgive me, but-^Your script will not be used.&....After all...^The one writing the rest of "
-              "the script...&will be me.\"",
-              HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_WTC_11] = HintText::Junk({
-        Text{ "They say tea is best enjoyed...^\"\"With your fellow monsters.\"\"", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_WTC_12] = HintText::Junk({
-        Text{ "They say I shall make you some black tea. With my own hands, not magic.", HINT_TEXT_NEEDS_TRANSLATION_FR,
-              "blarg" },
-    });
-
-    hintTable[RHT_JUNK_SEI_1] = HintText::Junk({
-        Text{ "They say you know I've kiboshed before...^and I will kibosh again.", HINT_TEXT_NEEDS_TRANSLATION_FR,
-              "blarg" },
-    });
-
-    hintTable[RHT_JUNK_SEI_2] = HintText::Junk({
-        Text{ "They say if relationship @ walks through that door,^they will KILL independent @.",
-              HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_SEI_3] = HintText::Junk({
-        Text{ "They say you gotta have the BIG Salad.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_SEI_4] = HintText::Junk({
-        Text{ "They say it's a festivus miracle", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_SEI_5] = HintText::Junk({
-        Text{ "They say there are no houses in Tuscany to rent.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_SEI_6] = HintText::Junk({
-        Text{ "They say my last boyfriend had a real&Kroner comprehension problem.", HINT_TEXT_NEEDS_TRANSLATION_FR,
-              "blarg" },
-    });
-
-    hintTable[RHT_JUNK_SEI_7] = HintText::Junk({
-        Text{ "They say it's a festivus miracle.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_SEI_8] = HintText::Junk({
-        Text{ "They say Louis quit the importing&to focus on the exporting.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_SEI_9] = HintText::Junk({
-        Text{ "They say no thanks, I can't drink coffee&late at night, it keeps me up.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-    
-    hintTable[RHT_JUNK_SEI_10] = HintText::Junk({
-        Text{ "They say it's not a lie if you believe it.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_SEI_11] = HintText::Junk({
-        Text{ "They say there was a second spitter.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_SEI_12] = HintText::Junk({
-        Text{ "They say there was a second spitter.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_SEI_13] = HintText::Junk({
-        Text{ "They say the jerk store called,^they're running out of YOU.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-    
-    hintTable[RHT_JUNK_SEI_14] = HintText::Junk({
-        Text{ "They say when you look annoyed all the time,&people thing you are busy.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_SEI_15] = HintText::Junk({
-        Text{ "They say when you look annoyed all the time,&people think you are busy.", HINT_TEXT_NEEDS_TRANSLATION_FR,
-              "blarg" },
-    });
-
-    hintTable[RHT_JUNK_SEI_16] = HintText::Junk({
-        Text{ "They say he fires people like its a bodily function.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_SEI_17] = HintText::Junk({
-        Text{ "They say he threatened to move the ship to New Jersey&just to upset people.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_SEI_18] = HintText::Junk({
-        Text{ "They say there was significant shrinkage.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_SEI_19] = HintText::Junk({
-        Text{ "They say if it wasn't for the toilet there'd be no books.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_SEI_20] = HintText::Junk({
-        Text{ "They say if it wasn't for the toilet there'd be no books.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_SEI_21] = HintText::Junk({
-        Text{ "They say don't trust men in capes.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-    
-    hintTable[RHT_JUNK_SEI_22] = HintText::Junk({
-        Text{ "They say @'s uncle works for Nintendo.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_SEI_23] = HintText::Junk({
-        Text{ "They say @'s stole the marble rye.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_SEI_24] = HintText::Junk({
-        Text{ "They say there is no better harmony&than the black and white cookie.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_SEI_25] = HintText::Junk({
-        Text{ "They say @ hasn't vomited since 1983.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_SEI_26] = HintText::Junk({
-        Text{ "They say you gotta have the early bird special.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_SEI_27] = HintText::Junk({
-        Text{ "They say a donation has been made in your name&to the human fund.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_SEI_28] = HintText::Junk({
-        Text{ "They say you want to be my latex salesman.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_SEI_29] = HintText::Junk({
-        Text{ "They say if every instinct you have is wrong...^... then the opposite would have to be right.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_OTR_MEANS_1] = HintText::Junk({
-        Text{ "They say OTR stands for&Over the Rainbow", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-    hintTable[RHT_JUNK_OTR_MEANS_2] = HintText::Junk({
-        Text{ "They say that OTR stands for&Onions, Tomatoes, and Radishes", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-    hintTable[RHT_JUNK_OTR_MEANS_3] = HintText::Junk({
-        Text{ "They say that OTR stands for&Ocarina of Time Resources", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-    hintTable[RHT_JUNK_OTR_MEANS_4] = HintText::Junk({
-        Text{ "They say that OTR stands for&Over the Road", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-    hintTable[RHT_JUNK_OTR_MEANS_5] = HintText::Junk({
-        Text{ "They say that OTR stands for&Off the Record", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-    hintTable[RHT_JUNK_OTR_MEANS_6] = HintText::Junk({
-        Text{ "They say that OTR stands for&Office of Tax and Revenue", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-    hintTable[RHT_JUNK_OTR_MEANS_7] = HintText::Junk({
-        Text{ "They say OTR stands for&Over the Rainbow", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-    hintTable[RHT_JUNK_OTR_MEANS_8] = HintText::Junk({
-        Text{ "They say that OTR stands for&Office of Trade Relations", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-    hintTable[RHT_JUNK_OTR_MEANS_9] = HintText::Junk({
-        Text{ "They say that OTR stands for&Original Theatrical Release", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-    hintTable[RHT_JUNK_OTR_MEANS_10] = HintText::Junk({
-        Text{ "They say that OTR stands for&Operational Test Requirement", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-    hintTable[RHT_JUNK_OTR_MEANS_11] = HintText::Junk({
-        Text{ "They say that OTR stands for&Operational Trouble Report", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-    hintTable[RHT_JUNK_OTR_MEANS_12] = HintText::Junk({
-        Text{ "They say that OTR stands for&Oxygen Transmission Rate", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-    hintTable[RHT_JUNK_OTR_MEANS_13] = HintText::Junk({
-        Text{ "They say that OTR stands for&One Touch Recording", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-    hintTable[RHT_JUNK_OTR_MEANS_14] = HintText::Junk({
-        Text{ "They say that OTR stands for&Olympic Torch Relay", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-    hintTable[RHT_JUNK_OTR_MEANS_15] = HintText::Junk({
-        Text{ "They say that OTR stands for&Off the Rack", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-    hintTable[RHT_JUNK_OTR_MEANS_16] = HintText::Junk({
-        Text{ "They say that OTR stands for&Overhead Transfer Rate", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-    hintTable[RHT_JUNK_OTR_MEANS_17] = HintText::Junk({
-        Text{ "They say that OTR stands for&Operational TurnaRound", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-    hintTable[RHT_JUNK_OTR_MEANS_18] = HintText::Junk({
-        Text{ "They say that OTR stands for&Opportunity to Recall", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-    hintTable[RHT_JUNK_OTR_MEANS_19] = HintText::Junk({
-        Text{ "They say that OTR stands for&Operability Test Report", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-    hintTable[RHT_JUNK_OTR_MEANS_20] = HintText::Junk({
-        Text{ "They say that OTR stands for&Overall Tuning Range", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-    hintTable[RHT_JUNK_OTR_MEANS_21] = HintText::Junk({
-        Text{ "They say that OTR stands for&One Time Requisition", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-    hintTable[RHT_JUNK_OTR_MEANS_22] = HintText::Junk({
-        Text{ "They say that OTR stands for&Oblivious to Reality", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-    hintTable[RHT_JUNK_OTR_MEANS_23] = HintText::Junk({
-        Text{ "They say that OTR stands for&On the Run", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-    hintTable[RHT_JUNK_OTR_MEANS_24] = HintText::Junk({
-        Text{ "They say that OTR stands for&On Time Reporting", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-    hintTable[RHT_JUNK_OTR_MEANS_25] = HintText::Junk({
-        Text{ "They say that OTR stands for&Order to Receipt", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-    hintTable[RHT_JUNK_OTR_MEANS_26] = HintText::Junk({
-        Text{ "They say that OTR stands for&Other Terrestrial Radio", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-    hintTable[RHT_JUNK_OTR_MEANS_27] = HintText::Junk({
-        Text{ "They say that OTR stands for&On Target Reports", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-    hintTable[RHT_JUNK_OTR_MEANS_28] = HintText::Junk({
-        Text{ "They say that OTR stands for&One Time Repair", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-    hintTable[RHT_JUNK_OTR_MEANS_29] = HintText::Junk({
-        Text{ "They say that OTR stands for&Own the Room", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-    hintTable[RHT_JUNK_OTR_MEANS_30] = HintText::Junk({
-        Text{ "They say that OTR stands for&Online Text Repository", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_MISC_1] = HintText::Junk({
-        Text{ "They say %gKenix%w isn't a developer...^...Just a PR guy", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_MISC_2] = HintText::Junk({
-        Text {"They say... No", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg"},
-     });
-
-    hintTable[RHT_JUNK_MISC_3] = HintText::Junk({ 
-        Text{ "They say BIG RIGS: OTR", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" } 
-    });
-
-    hintTable[RHT_JUNK_MISC_4] = HintText::Junk({
-        Text{ "They say you wanted to see me %pMr. Kenix%w?", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_MISC_5] = HintText::Junk({
-        Text{ "They say Louis once saw an&equals not get set equals", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_MISC_6] = HintText::Junk({
-        Text{ "They say only you can find your rom.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_MISC_7] = HintText::Junk({
-        Text{ "They say ZAPD is good software.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_MISC_8] = HintText::Junk({
-        Text{ "They say you can encounter&a parascode in tall grass.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_MISC_9] = HintText::Junk({
-        Text{ "They say the ship sails on March 32nd.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_MISC_10] = HintText::Junk({
-        Text{ "They say bombing dodongos is fun.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_MISC_11] = HintText::Junk({
-        Text{ "They say shopkeepers don't give credits.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_MISC_12] = HintText::Junk({
-        Text{ "They say shopkeepers don't give credits.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_MISC_13] = HintText::Junk({
-        Text{ "They say Malon is glitched.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_MISC_14] = HintText::Junk({
-        Text{ "They say do I look like I know&what a DList is?", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_MISC_15] = HintText::Junk({
-        Text{ "They say do I look like I know&what an AList is?", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_MISC_16] = HintText::Junk({
-        Text{ "They say the king drinks enthusiastically", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_MISC_17] = HintText::Junk({
-        Text{ "They say Rubies are on the path to&Lamp Oil, Rope, and Bombs", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_SG_1] = HintText::Junk({
-        Text{ "They say %rError. Human is dead, mismatch.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_SG_2] = HintText::Junk({
-        Text{ "They say this is the choice of the&steins gate.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_SG_3] = HintText::Junk({
-        Text{ "They say el psy kongroo.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_SG_4] = HintText::Junk({
-        Text{ "They say tutturu~.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-
-    hintTable[RHT_JUNK_SG_5] = HintText::Junk({
-        Text{ "They say im not Christina!.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_SG_6] = HintText::Junk({
-        Text{ "They say you know where to find an IBN5100.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
-
-    hintTable[RHT_JUNK_SG_7] = HintText::Junk({
-        Text{ "They say when you're on a chicken bender&grab a box of chicken tenders.", HINT_TEXT_NEEDS_TRANSLATION_FR, "blarg" },
-    });
+    hintTextTable[RHT_JUNK78] = HintText(CustomMessage("They say blarg...^...or at least briaguya does.",
+                                            /*german*/ "",
+                                            /*french*/ "Tout ce que j'ai à dire, c'est blarg...^... 'fin c'est plutôt ce que briaguya dirait."));
+                                         // /*spanish*/blarg
+
+    hintTextTable[RHT_JUNK79] = HintText(CustomMessage("They say this peace is what all true warriors strive for.",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, cette paix est ce pour quoi luttent tous les vrais guerriers."));
+                                         // /*spanish*/blarg
 
-    hintTable[RHT_JUNK_SG_8] = HintText::Junk({
-        Text{ "Juicy Chicken #1! Wow!.", HINT_TEXT_NEEDS_TRANSLATION_FR,
-              "blarg" },
-    });
+    hintTextTable[RHT_JUNK80] = HintText(CustomMessage("They say this ship is what all true gamers strive for.",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, cette version du port est ce pour quoi luttent tous les vrais gamers."));
+                                         // /*spanish*/blarg
+
+    hintTextTable[RHT_JUNK81] = HintText(CustomMessage("They say that Glowsticks can be found in the Raveyard.",
+                                            /*german*/ "",
+                                            /*french*/ "On peut trouver des Bâtons Lumineux sur le dancefloor du cimetière."));
+                                         // /*spanish*/blarg
+
+    hintTextTable[RHT_JUNK_WTC_1] = HintText(CustomMessage("They say %rthere are no more than 18&people on this island.",
+                                                /*german*/ "",
+                                                /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_WTC_2] = HintText(CustomMessage("They say I am one yet many",
+                                                /*german*/ "",
+                                                /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_WTC_3] = HintText(CustomMessage("They say its all in the name of guiding&humanity down the right path.",
+                                                /*german*/ "",
+                                                /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_WTC_4] = HintText(CustomMessage("They say \"Repetition requested\"",
+                                                /*german*/ "",
+                                                /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_WTC_5] = HintText(CustomMessage("They say %rThe red tells only the truth!",
+                                                /*german*/ "",
+                                                /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_WTC_6] = HintText(CustomMessage("They say good tidings to you^my traitorous @",
+                                                /*german*/ "",
+                                                /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_WTC_7] = HintText(CustomMessage("They say when the seagulls cried,&none were left alive.",
+                                                /*german*/ "",
+                                                /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_WTC_8] = HintText(CustomMessage("They say she is lying with the red letters!",
+                                                /*german*/ "",
+                                                /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_WTC_9] = HintText(CustomMessage("They say we'll meet again,&when something else cries.",
+                                                /*german*/ "",
+                                                /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_WTC_10] = HintText(CustomMessage("They say \"Forgive me, but-^Your script will not be used.&....After all...^The one writing the rest of "
+                                                            "the script...&will be me.\"",
+                                                 /*german*/ "",
+                                                 /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_WTC_11] = HintText(CustomMessage("They say tea is best enjoyed...^\"\"With your fellow monsters.\"\"",
+                                                 /*german*/ "",
+                                                 /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+
+    hintTextTable[RHT_JUNK_WTC_12] = HintText(CustomMessage("They say I shall make you some black tea. With my own hands, not magic.",
+                                                 /*german*/ "",
+                                                 /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_SEI_1] = HintText(CustomMessage("They say you know I've kiboshed before...^and I will kibosh again.",
+                                                /*german*/ "",
+                                                /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_SEI_2] = HintText(CustomMessage("They say if relationship @ walks through that door,^they will KILL independent @.",
+                                                /*german*/ "",
+                                                /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_SEI_3] = HintText(CustomMessage("They say you gotta have the BIG Salad.",
+                                                /*german*/ "",
+                                                /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_SEI_4] = HintText(CustomMessage("They say it's a festivus miracle",
+                                                /*german*/ "",
+                                                /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_SEI_5] = HintText(CustomMessage("They say there are no houses in Tuscany to rent.",
+                                                /*german*/ "",
+                                                /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_SEI_6] = HintText(CustomMessage("They say my last boyfriend had a real&Kroner comprehension problem.",
+                                                /*german*/ "",
+                                                /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_SEI_7] = HintText(CustomMessage("They say it's a festivus miracle.",
+                                                /*german*/ "",
+                                                /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_SEI_8] = HintText(CustomMessage("They say Louis quit the importing&to focus on the exporting.",
+                                                /*german*/ "",
+                                                /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_SEI_9] = HintText(CustomMessage("They say no thanks, I can't drink coffee&late at night, it keeps me up.",
+                                                /*german*/ "",
+                                                /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_SEI_10] = HintText(CustomMessage("They say it's not a lie if you believe it.",
+                                                 /*german*/ "",
+                                                 /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_SEI_11] = HintText(CustomMessage("They say there was a second spitter.",
+                                                 /*german*/ "",
+                                                 /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_SEI_12] = HintText(CustomMessage("They say there was a second spitter.",
+                                                 /*german*/ "",
+                                                 /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_SEI_13] = HintText(CustomMessage("They say the jerk store called,^they're running out of YOU.",
+                                                 /*german*/ "",
+                                                 /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_SEI_14] = HintText(CustomMessage("They say when you look annoyed all the time,&people thing you are busy.",
+                                                 /*german*/ "",
+                                                 /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_SEI_15] = HintText(CustomMessage("They say when you look annoyed all the time,&people think you are busy.",
+                                                 /*german*/ "",
+                                                 /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_SEI_16] = HintText(CustomMessage("They say he fires people like its a bodily function.",
+                                                 /*german*/ "",
+                                                 /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_SEI_17] = HintText(CustomMessage("They say he threatened to move the ship to New Jersey&just to upset people.",
+                                                 /*german*/ "",
+                                                 /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_SEI_18] = HintText(CustomMessage("They say there was significant shrinkage.",
+                                                 /*german*/ "",
+                                                 /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_SEI_19] = HintText(CustomMessage("They say if it wasn't for the toilet there'd be no books.",
+                                                 /*german*/ "",
+                                                 /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_SEI_20] = HintText(CustomMessage("They say if it wasn't for the toilet there'd be no books.",
+                                                 /*german*/ "",
+                                                 /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_SEI_21] = HintText(CustomMessage("They say don't trust men in capes.",
+                                                 /*german*/ "",
+                                                 /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_SEI_22] = HintText(CustomMessage("They say @'s uncle works for Nintendo.",
+                                                 /*german*/ "",
+                                                 /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_SEI_23] = HintText(CustomMessage("They say @'s stole the marble rye.",
+                                                 /*german*/ "",
+                                                 /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_SEI_24] = HintText(CustomMessage("They say there is no better harmony&than the black and white cookie.",
+                                                 /*german*/ "",
+                                                 /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_SEI_25] = HintText(CustomMessage("They say @ hasn't vomited since 1983.",
+                                                 /*german*/ "",
+                                                 /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_SEI_26] = HintText(CustomMessage("They say you gotta have the early bird special.",
+                                                 /*german*/ "",
+                                                 /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_SEI_27] = HintText(CustomMessage("They say a donation has been made in your name&to the human fund.",
+                                                 /*german*/ "",
+                                                 /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_SEI_28] = HintText(CustomMessage("They say you want to be my latex salesman.",
+                                                 /*german*/ "",
+                                                 /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_SEI_29] = HintText(CustomMessage("They say if every instinct you have is wrong...^... then the opposite would have to be right.",
+                                                 /*german*/ "",
+                                                 /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_OTR_MEANS_1] = HintText(CustomMessage("They say OTR stands for&Over the Rainbow",
+                                                      /*german*/ "",
+                                                      /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_OTR_MEANS_2] = HintText(CustomMessage("They say that OTR stands for&Onions, Tomatoes, and Radishes",
+                                                      /*german*/ "",
+                                                      /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_OTR_MEANS_3] = HintText(CustomMessage("They say that OTR stands for&Ocarina of Time Resources",
+                                                      /*german*/ "",
+                                                      /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_OTR_MEANS_4] = HintText(CustomMessage("They say that OTR stands for&Over the Road",
+                                                      /*german*/ "",
+                                                      /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_OTR_MEANS_5] = HintText(CustomMessage("They say that OTR stands for&Off the Record",
+                                                      /*german*/ "",
+                                                      /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_OTR_MEANS_6] = HintText(CustomMessage("They say that OTR stands for&Office of Tax and Revenue",
+                                                      /*german*/ "",
+                                                      /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_OTR_MEANS_7] = HintText(CustomMessage("They say OTR stands for&Over the Rainbow",
+                                                      /*german*/ "",
+                                                      /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_OTR_MEANS_8] = HintText(CustomMessage("They say that OTR stands for&Office of Trade Relations",
+                                                      /*german*/ "",
+                                                      /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_OTR_MEANS_9] = HintText(CustomMessage("They say that OTR stands for&Original Theatrical Release",
+                                                      /*german*/ "",
+                                                      /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_OTR_MEANS_10] = HintText(CustomMessage("They say that OTR stands for&Operational Test Requirement",
+                                                       /*german*/ "",
+                                                       /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_OTR_MEANS_11] = HintText(CustomMessage("They say that OTR stands for&Operational Trouble Report",
+                                                       /*german*/ "",
+                                                       /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_OTR_MEANS_12] = HintText(CustomMessage("They say that OTR stands for&Oxygen Transmission Rate",
+                                                       /*german*/ "",
+                                                       /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_OTR_MEANS_13] = HintText(CustomMessage("They say that OTR stands for&One Touch Recording",
+                                                       /*german*/ "",
+                                                       /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_OTR_MEANS_14] = HintText(CustomMessage("They say that OTR stands for&Olympic Torch Relay",
+                                                       /*german*/ "",
+                                                       /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_OTR_MEANS_15] = HintText(CustomMessage("They say that OTR stands for&Off the Rack",
+                                                       /*german*/ "",
+                                                       /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_OTR_MEANS_16] = HintText(CustomMessage("They say that OTR stands for&Overhead Transfer Rate",
+                                                       /*german*/ "",
+                                                       /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_OTR_MEANS_17] = HintText(CustomMessage("They say that OTR stands for&Operational TurnaRound",
+                                                       /*german*/ "",
+                                                       /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_OTR_MEANS_18] = HintText(CustomMessage("They say that OTR stands for&Opportunity to Recall",
+                                                       /*german*/ "",
+                                                       /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_OTR_MEANS_19] = HintText(CustomMessage("They say that OTR stands for&Operability Test Report",
+                                                       /*german*/ "",
+                                                       /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_OTR_MEANS_20] = HintText(CustomMessage("They say that OTR stands for&Overall Tuning Range",
+                                                       /*german*/ "",
+                                                       /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_OTR_MEANS_21] = HintText(CustomMessage("They say that OTR stands for&One Time Requisition",
+                                                       /*german*/ "",
+                                                       /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_OTR_MEANS_22] = HintText(CustomMessage("They say that OTR stands for&Oblivious to Reality",
+                                                       /*german*/ "",
+                                                       /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_OTR_MEANS_23] = HintText(CustomMessage("They say that OTR stands for&On the Run",
+                                                       /*german*/ "",
+                                                       /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_OTR_MEANS_24] = HintText(CustomMessage("They say that OTR stands for&On Time Reporting",
+                                                       /*german*/ "",
+                                                       /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_OTR_MEANS_25] = HintText(CustomMessage("They say that OTR stands for&Order to Receipt",
+                                                       /*german*/ "",
+                                                       /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_OTR_MEANS_26] = HintText(CustomMessage("They say that OTR stands for&Other Terrestrial Radio",
+                                                       /*german*/ "",
+                                                       /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_OTR_MEANS_27] = HintText(CustomMessage("They say that OTR stands for&On Target Reports",
+                                                       /*german*/ "",
+                                                       /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_OTR_MEANS_28] = HintText(CustomMessage("They say that OTR stands for&One Time Repair",
+                                                       /*german*/ "",
+                                                       /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_OTR_MEANS_29] = HintText(CustomMessage("They say that OTR stands for&Own the Room",
+                                                       /*german*/ "",
+                                                       /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_OTR_MEANS_30] = HintText(CustomMessage("They say that OTR stands for&Online Text Repository",
+                                                       /*german*/ "",
+                                                       /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_MISC_1] = HintText(CustomMessage("They say #Kenix# isn't a developer...^...Just a PR guy",
+                                                 /*german*/ "",
+                                                 /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR,
+                                                            {QM_GREEN}));
+
+    hintTextTable[RHT_JUNK_MISC_2] = HintText(CustomMessage("They say... No",
+                                                 /*german*/ "",
+                                                 /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_MISC_3] = HintText(CustomMessage("They say BIG RIGS: OTR",
+                                                 /*german*/ "",
+                                                 /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_MISC_4] = HintText(CustomMessage("They say you wanted to see me #Mr. Kenix#?",
+                                                 /*german*/ "",
+                                                 /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR,
+                                                            {QM_PINK}));
+
+    hintTextTable[RHT_JUNK_MISC_5] = HintText(CustomMessage("They say Louis once saw an&equals not get set equals",
+                                                 /*german*/ "",
+                                                 /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_MISC_6] = HintText(CustomMessage("They say only you can find your rom.",
+                                                 /*german*/ "",
+                                                 /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_MISC_7] = HintText(CustomMessage("They say ZAPD is good software.",
+                                                 /*german*/ "",
+                                                 /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_MISC_8] = HintText(CustomMessage("They say you can encounter&a parascode in tall grass.",
+                                                 /*german*/ "",
+                                                 /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_MISC_9] = HintText(CustomMessage("They say the ship sails on March 32nd.",
+                                                 /*german*/ "",
+                                                 /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_MISC_10] = HintText(CustomMessage("They say bombing dodongos is fun.",
+                                                  /*german*/ "",
+                                                  /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_MISC_11] = HintText(CustomMessage("They say shopkeepers don't give credits.",
+                                                  /*german*/ "",
+                                                  /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_MISC_12] = HintText(CustomMessage("They say shopkeepers don't give credits.",
+                                                  /*german*/ "",
+                                                  /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_MISC_13] = HintText(CustomMessage("They say Malon is glitched.",
+                                                  /*german*/ "",
+                                                  /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_MISC_14] = HintText(CustomMessage("They say do I look like I know&what a DList is?",
+                                                  /*german*/ "",
+                                                  /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_MISC_15] = HintText(CustomMessage("They say do I look like I know&what an AList is?",
+                                                  /*german*/ "",
+                                                  /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_MISC_16] = HintText(CustomMessage("They say the king drinks enthusiastically",
+                                                  /*german*/ "",
+                                                  /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_MISC_17] = HintText(CustomMessage("They say Rubies are on the path to&Lamp Oil, Rope, and Bombs",
+                                                  /*german*/ "",
+                                                  /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_SG_1] = HintText(CustomMessage("They say %rError. Human is dead, mismatch.",
+                                               /*german*/ "",
+                                               /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_SG_2] = HintText(CustomMessage("They say this is the choice of the&steins gate.",
+                                               /*german*/ "",
+                                               /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_SG_3] = HintText(CustomMessage("They say el psy kongroo.",
+                                               /*german*/ "",
+                                               /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_SG_4] = HintText(CustomMessage("They say tutturu~.",
+                                               /*german*/ "",
+                                               /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_SG_5] = HintText(CustomMessage("They say im not Christina!.",
+                                               /*german*/ "",
+                                               /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_SG_6] = HintText(CustomMessage("They say you know where to find an IBN5100.",
+                                               /*german*/ "",
+                                               /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_SG_7] = HintText(CustomMessage("They say when you're on a chicken bender&grab a box of chicken tenders.",
+                                               /*german*/ "",
+                                               /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+
+    hintTextTable[RHT_JUNK_SG_8] = HintText(CustomMessage("Juicy Chicken #1! Wow!.",
+                                               /*german*/ "",
+                                               /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
 
     /*--------------------------
     |     DUNGEON HINT TEXT    |
     ---------------------------*/
 
-    hintTable[RHT_DEKU_TREE] = HintText::DungeonName(
-        {
-            // obscure text
-            Text{ "an ancient tree", /*french*/ "le vieil arbre", /*spanish*/ "un ancestral árbol" },
-        },
-        {},
-        // clear text
-        Text{ "Deku Tree", /*french*/ "l'Arbre Mojo", /*spanish*/ "el Gran Árbol Deku" });
+    
+    hintTextTable[RHT_DEKU_TREE] = HintText(CustomMessage("Deku Tree",
+                                               /*german*/ "",
+                                               /*french*/ "l'Arbre Mojo"),
+                                            // /*spanish*/el Gran Árbol Deku
+                                            {},
+                                            {CustomMessage("an ancient tree",
+                                                /*german*/ "",
+                                                /*french*/ "le vieil arbre")});
+                                             // /*spanish*/un ancestral árbol
 
-    hintTable[RHT_DODONGOS_CAVERN] = HintText::DungeonName(
-        {
-            // obscure text
-            Text{ "an immense cavern", /*french*/ "l'immense caverne", /*spanish*/ "una descomunal cueva" },
-        },
-        {},
-        // clear text
-        Text{ "Dodongo's Cavern", /*french*/ "la Caverne Dodongo", /*spanish*/ "la Cueva de los Dodongos" });
+    hintTextTable[RHT_DODONGOS_CAVERN] = HintText(CustomMessage("Dodongo's Cavern",
+                                                     /*german*/ "",
+                                                     /*french*/ "la Caverne Dodongo"),
+                                                  // /*spanish*/la Cueva de los Dodongos
+                                                  {},
+                                                  {CustomMessage("an immense cavern",
+                                                      /*german*/ "",
+                                                      /*french*/ "l'immense caverne")});
+                                                   // /*spanish*/una descomunal cueva
 
-    hintTable[RHT_JABU_JABUS_BELLY] = HintText::DungeonName(
-        {
-            // obscure text
-            Text{ "the belly of a deity", /*french*/ "le ventre d'un gardien",
-                  /*spanish*/ "la tripa de cierta deidad" },
-        },
-        {},
-        // clear text
-        Text{ "Jabu-Jabu's Belly", /*french*/ "le Ventre de Jabu-Jabu", /*spanish*/ "tripa de Jabu-Jabu" });
+    hintTextTable[RHT_JABU_JABUS_BELLY] = HintText(CustomMessage("Jabu-Jabu's Belly",
+                                                      /*german*/ "",
+                                                      /*french*/ "le Ventre de Jabu-Jabu"),
+                                                   // /*spanish*/tripa de Jabu-Jabu
+                                                   {},
+                                                   {CustomMessage("the belly of a deity",
+                                                       /*german*/ "",
+                                                       /*french*/ "le ventre d'un gardien")});
+                                                    // /*spanish*/la tripa de cierta deidad
 
-    hintTable[RHT_FOREST_TEMPLE] = HintText::DungeonName(
-        {
-            // obscure text
-            Text{ "a deep forest", /*french*/ "la profonde forêt", /*spanish*/ "las profundidades del bosque" },
-        },
-        {},
-        // clear text
-        Text{ "Forest Temple", /*french*/ "le Temple de la Forêt", /*spanish*/ "el Templo del Bosque" });
+    hintTextTable[RHT_FOREST_TEMPLE] = HintText(CustomMessage("Forest Temple",
+                                                   /*german*/ "",
+                                                   /*french*/ "le Temple de la Forêt"),
+                                                // /*spanish*/el Templo del Bosque
+                                                {},
+                                                {CustomMessage("a deep forest",
+                                                    /*german*/ "",
+                                                    /*french*/ "la profonde forêt")});
+                                                 // /*spanish*/las profundidades del bosque
 
-    hintTable[RHT_FIRE_TEMPLE] = HintText::DungeonName(
-        {
-            // obscure text
-            Text{ "a high mountain", /*french*/ "la grande montagne", /*spanish*/ "una alta montaña" },
-        },
-        {},
-        // clear text
-        Text{ "Fire Temple", /*french*/ "le Temple du Feu", /*spanish*/ "el Templo del Fuego" });
+    hintTextTable[RHT_FIRE_TEMPLE] = HintText(CustomMessage("Fire Temple",
+                                                 /*german*/ "",
+                                                 /*french*/ "le Temple du Feu"),
+                                              // /*spanish*/el Templo del Fuego
+                                              {},
+                                              {CustomMessage("a high mountain",
+                                                  /*german*/ "",
+                                                  /*french*/ "la grande montagne")});
+                                               // /*spanish*/una alta montaña
 
-    hintTable[RHT_WATER_TEMPLE] = HintText::DungeonName(
-        {
-            // obscure text
-            Text{ "a vast lake", /*french*/ "le vaste lac", /*spanish*/ "un lago inmenso" },
-        },
-        {},
-        // clear text
-        Text{ "Water Temple", /*french*/ "le Temple de l'Eau", /*spanish*/ "el Templo del Agua" });
+    hintTextTable[RHT_WATER_TEMPLE] = HintText(CustomMessage("Water Temple",
+                                                  /*german*/ "",
+                                                  /*french*/ "le Temple de l'Eau"),
+                                               // /*spanish*/el Templo del Agua
+                                               {},
+                                               {CustomMessage("a vast lake",
+                                                   /*german*/ "",
+                                                   /*french*/ "le vaste lac")});
+                                                // /*spanish*/un lago inmenso
 
-    hintTable[RHT_SPIRIT_TEMPLE] = HintText::DungeonName(
-        {
-            // obscure text
-            Text{ "the goddess of the sand", /*french*/ "la déesse des sables", /*spanish*/ "la diosa de las arenas" },
-        },
-        {},
-        // clear text
-        Text{ "Spirit Temple", /*french*/ "le Temple de l'Esprit", /*spanish*/ "el Templo del Espíritu" }
+    hintTextTable[RHT_SPIRIT_TEMPLE] = HintText(CustomMessage("Spirit Temple",
+                                                   /*german*/ "",
+                                                   /*french*/ "le Temple de l'Esprit"),
+                                                // /*spanish*/el Templo del Espíritu
+                                                {},
+                                                {CustomMessage("the goddess of the sand",
+                                                    /*german*/ "",
+                                                    /*french*/ "la déesse des sables")});
+                                                 // /*spanish*/la diosa de las arenas
 
-    );
+    hintTextTable[RHT_SHADOW_TEMPLE] = HintText(CustomMessage("Shadow Temple",
+                                                   /*german*/ "",
+                                                   /*french*/ "le Temple de l'Ombre"),
+                                                // /*spanish*/el Templo de las Sombras
+                                                {},
+                                                {CustomMessage("the house of the dead",
+                                                    /*german*/ "",
+                                                    /*french*/ "la maison des morts")});
+                                                 // /*spanish*/la casa de la muerte
 
-    hintTable[RHT_SHADOW_TEMPLE] = HintText::DungeonName(
-        {
-            // obscure text
-            Text{ "the house of the dead", /*french*/ "la maison des morts", /*spanish*/ "la casa de la muerte" },
-        },
-        {},
-        // clear text
-        Text{ "Shadow Temple", /*french*/ "le Temple de l'Ombre", /*spanish*/ "el Templo de las Sombras" });
+    hintTextTable[RHT_ICE_CAVERN] = HintText(CustomMessage("Ice Cavern",
+                                                /*german*/ "",
+                                                /*french*/ "la caverne de glace"),
+                                             // /*spanish*/la caverna de hielo
+                                             {},
+                                             {CustomMessage("a frozen maze",
+                                                 /*german*/ "",
+                                                 /*french*/ "le dédale glacé")});
+                                              // /*spanish*/un gélido laberinto
 
-    hintTable[RHT_ICE_CAVERN] = HintText::DungeonName(
-        {
-            // obscure text
-            Text{ "a frozen maze", /*french*/ "le dédale glacé", /*spanish*/ "un gélido laberinto" },
-        },
-        {},
-        // clear text
-        Text{ "Ice Cavern", /*french*/ "la caverne de glace", /*spanish*/ "la caverna de hielo" });
+    hintTextTable[RHT_BOTTOM_OF_THE_WELL] = HintText(CustomMessage("Bottom of the Well",
+                                                        /*german*/ "",
+                                                        /*french*/ "le fonds du Puits"),
+                                                     // /*spanish*/el fondo del pozo
+                                                     {},
+                                                     {CustomMessage("a shadow\'s prison",
+                                                         /*german*/ "",
+                                                         /*french*/ "la prison d'une ombre")});
+                                                      // /*spanish*/la prisión de las sombras
 
-    hintTable[RHT_BOTTOM_OF_THE_WELL] = HintText::DungeonName(
-        {
-            // obscure text
-            Text{ "a shadow\'s prison", /*french*/ "la prison d'une ombre", /*spanish*/ "la prisión de las sombras" },
-        },
-        {},
-        // clear text
-        Text{ "Bottom of the Well", /*french*/ "le fonds du Puits", /*spanish*/ "el fondo del pozo" });
+    hintTextTable[RHT_GERUDO_TRAINING_GROUND] = HintText(CustomMessage("Gerudo Training Grounds",
+                                                            /*german*/ "",
+                                                            /*french*/ "le Gymnase Gerudo"),
+                                                         // /*spanish*/el Centro de Instrucción Gerudo
+                                                         {},
+                                                         {CustomMessage("the test of thieves",
+                                                             /*german*/ "",
+                                                             /*french*/ "l'épreuve des voleurs")});
+                                                          // /*spanish*/la prueba de las bandidas
 
-    hintTable[RHT_GERUDO_TRAINING_GROUND] = HintText::DungeonName(
-        {
-            // obscure text
-            Text{ "the test of thieves", /*french*/ "l'épreuve des voleurs", /*spanish*/ "la prueba de las bandidas" },
-        },
-        {},
-        // clear text
-        Text{ "Gerudo Training Grounds", /*french*/ "le Gymnase Gerudo",
-              /*spanish*/ "el Centro de Instrucción Gerudo" });
-
-    hintTable[RHT_GANONS_CASTLE] = HintText::DungeonName(
-        {
-            // obscure text
-            Text{ "a conquered citadel", /*french*/ "la citadelle assiégée", /*spanish*/ "una conquistada ciudadela" },
-        },
-        {},
-        // clear text
-        Text{ "Inside Ganon's Castle", /*french*/ "l'intérieur du Château de Ganon",
-              /*spanish*/ "el interior del Castillo de Ganon" });
+    hintTextTable[RHT_GANONS_CASTLE] = HintText(CustomMessage("Inside Ganon's Castle",
+                                                   /*german*/ "",
+                                                   /*french*/ "l'intérieur du Château de Ganon"),
+                                                // /*spanish*/el interior del Castillo de Ganon
+                                                {},
+                                                {CustomMessage("a conquered citadel",
+                                                    /*german*/ "",
+                                                    /*french*/ "la citadelle assiégée")});
+                                                 // /*spanish*/una conquistada ciudadela
 
     /*--------------------------
     |      BOSS HINT TEXT      |
     ---------------------------*/
 
-    hintTable[RHT_QUEEN_GOHMA] = HintText::Boss({
-                       // obscure text
-                       Text{"the #Parasitic Armored Arachnid# holds", /*french*/"le #monstre insectoïde géant# possède", /*spanish*/"el #arácnido parasitario acorazado# porta"},
-                     }, {},
-                       //clear text
-                       Text{"#Queen Gohma# holds", /*french*/"la #Reine Gohma# possède", /*spanish*/"la #Reina Goma# porta"});
+    hintTextTable[RHT_QUEEN_GOHMA] = HintText(CustomMessage("#Queen Gohma# holds",
+                                                 /*german*/ "",
+                                                 /*french*/ "la #Reine Gohma# possède"),
+                                              // /*spanish*/la #Reina Goma# porta
+                                              {},
+                                              {CustomMessage("the #Parasitic Armored Arachnid# holds",
+                                                  /*german*/ "",
+                                                  /*french*/ "le #monstre insectoïde géant# possède")});
+                                               // /*spanish*/el #arácnido parasitario acorazado# porta
 
-    hintTable[RHT_KING_DODONGO] = HintText::Boss({
-                       //obscure text
-                       Text{"the #Infernal Dinosaur# holds", /*french*/"le #dinosaure infernal# possède", /*spanish*/"el #dinosaurio infernal# porta"},
-                     }, {},
-                       //clear text
-                       Text{"#King Dodongo# holds", /*french*/"le #Roi Dodongo# possède", /*spanish*/"el #Rey Dodongo# porta"});
+    hintTextTable[RHT_KING_DODONGO] = HintText(CustomMessage("#King Dodongo# holds",
+                                                  /*german*/ "",
+                                                  /*french*/ "le #Roi Dodongo# possède"),
+                                               // /*spanish*/el #Rey Dodongo# porta
+                                               {},
+                                               {CustomMessage("the #Infernal Dinosaur# holds",
+                                                   /*german*/ "",
+                                                   /*french*/ "le #dinosaure infernal# possède")});
+                                                // /*spanish*/el #dinosaurio infernal# porta
 
-    hintTable[RHT_BARINADE] = HintText::Boss({
-                       //obscure text
-                       Text{"the #Bio-Electric Anemone# holds", /*french*/"l'#anémone bioélectrique# possède", /*spanish*/"la #anémona bioeléctrica# porta"},
-                     }, {},
-                       //clear text
-                       Text{"#Barinade# holds", /*french*/"#Barinade# possède", /*spanish*/"#Barinade# porta"});
+    hintTextTable[RHT_BARINADE] = HintText(CustomMessage("#Barinade# holds",
+                                              /*german*/ "",
+                                              /*french*/ "#Barinade# possède"),
+                                           // /*spanish*/#Barinade# porta
+                                           {},
+                                           {CustomMessage("the #Bio-Electric Anemone# holds",
+                                               /*german*/ "",
+                                               /*french*/ "l'#anémone bioélectrique# possède")});
+                                            // /*spanish*/la #anémona bioeléctrica# porta
 
-    hintTable[RHT_PHANTOM_GANON] = HintText::Boss({
-                       //obscure text
-                       Text{"the #Evil Spirit from Beyond# holds", /*french*/"l'#esprit maléfique de l'au-delà# possède", /*spanish*/"el #espíritu maligno de ultratumba# porta"},
-                     }, {},
-                       //clear text
-                       Text{"#Phantom Ganon# holds", /*french*/"#Ganon Spectral# possède", /*spanish*/"#Ganon Fantasma# porta"});
+    hintTextTable[RHT_PHANTOM_GANON] = HintText(CustomMessage("#Phantom Ganon# holds",
+                                                   /*german*/ "",
+                                                   /*french*/ "#Ganon Spectral# possède"),
+                                                // /*spanish*/#Ganon Fantasma# porta
+                                                {},
+                                                {CustomMessage("the #Evil Spirit from Beyond# holds",
+                                                    /*german*/ "",
+                                                    /*french*/ "l'#esprit maléfique de l'au-delà# possède")});
+                                                 // /*spanish*/el #espíritu maligno de ultratumba# porta
 
-    hintTable[RHT_VOLVAGIA] = HintText::Boss({
-                       //obscure text
-                       Text{"the #Subterranean Lava Dragon# holds", /*french*/"le #dragon des profondeurs# possède", /*spanish*/"el #dragón de lava subterráneo# porta"},
-                     }, {},
-                       //clear text
-                       Text{"#Volvagia# holds", /*french*/"#Volvagia# possède", /*spanish*/"#Volvagia# porta"});
+    hintTextTable[RHT_VOLVAGIA] = HintText(CustomMessage("#Volvagia# holds",
+                                              /*german*/ "",
+                                              /*french*/ "#Volvagia# possède"),
+                                           // /*spanish*/#Volvagia# porta
+                                           {},
+                                           {CustomMessage("the #Subterranean Lava Dragon# holds",
+                                               /*german*/ "",
+                                               /*french*/ "le #dragon des profondeurs# possède")});
+                                            // /*spanish*/el #dragón de lava subterráneo# porta
 
-    hintTable[RHT_MORPHA] = HintText::Boss({
-                       //obscure text
-                       Text{"the #Giant Aquatic Amoeba# holds", /*french*/"l'#amibe aquatique géante# possède", /*spanish*/"la #ameba acuática gigante# porta"},
-                     }, {},
-                       //clear text
-                       Text{"#Morpha# holds", /*french*/"#Morpha# possède", /*spanish*/"#Morpha# porta"});
+    hintTextTable[RHT_MORPHA] = HintText(CustomMessage("#Morpha# holds",
+                                            /*german*/ "",
+                                            /*french*/ "#Morpha# possède"),
+                                         // /*spanish*/#Morpha# porta
+                                         {},
+                                         {CustomMessage("the #Giant Aquatic Amoeba# holds",
+                                             /*german*/ "",
+                                             /*french*/ "l'#amibe aquatique géante# possède")});
+                                          // /*spanish*/la #ameba acuática gigante# porta
 
-    hintTable[RHT_BONGO_BONGO] = HintText::Boss({
-                       //obscure text
-                       Text{"the #Phantom Shadow Beast# holds", /*french*/"le #monstre de l'ombre# possède", /*spanish*/"la #alimaña oscura espectral# porta"},
-                     }, {},
-                       //clear text
-                       Text{"#Bongo Bongo# holds", /*french*/"#Bongo Bongo# possède", /*spanish*/"#Bongo Bongo# porta"});
-
-    hintTable[RHT_TWINROVA] = HintText::Boss({
-                       //obscure text
-                       Text{"the #Sorceress Sisters# hold", /*french*/"#les sorcières jumelles# possède", /*spanish*/"las #hermanas hechiceras# portan"},
-                     }, {},
-                       //clear text
-                       Text{"#Twinrova# holds", /*french*/"#Twinrova# possède", /*spanish*/"#Birova# porta"});
-    //
-    // [RHT_LINKS_POCKET_BOSS] = HintText::Boss({
-    //                    //obscure text
-    //                    Text{"#@'s pocket# rewards", /*french*/"#@ débute avec#", /*spanish*/"el #bolsillo de @#
-    //                    premia con"},
-    //                  },
-    //                    //clear text
-    //                           Text{"#@ already has#", /*french*/"#@ a déjà#", /*spanish*/"el #bolsillo de @ ya
-    //                           tiene#"}
-    // );
+    hintTextTable[RHT_BONGO_BONGO] = HintText(CustomMessage("#Bongo Bongo# holds",
+                                                 /*german*/ "",
+                                                 /*french*/ "#Bongo Bongo# possède"),
+                                              // /*spanish*/#Bongo Bongo# porta
+                                              {},
+                                              {CustomMessage("the #Phantom Shadow Beast# holds",
+                                                  /*german*/ "",
+                                                  /*french*/ "le #monstre de l'ombre# possède")});
+                                               // /*spanish*/la #alimaña oscura espectral# porta
 
+    hintTextTable[RHT_TWINROVA] = HintText(CustomMessage("#Twinrova# holds",
+                                              /*german*/ "",
+                                              /*french*/ "#Twinrova# possède"),
+                                           // /*spanish*/#Birova# porta
+                                           {},
+                                           {CustomMessage("the #Sorceress Sisters# hold",
+                                               /*german*/ "",
+                                               /*french*/ "#les sorcières jumelles# possède")});
+                                            // /*spanish*/las #hermanas hechiceras# portan
     /*--------------------------
     |     BRIDGE HINT TEXT     |
     ---------------------------*/
 
-    hintTable[RHT_BRIDGE_OPEN_HINT] = HintText::Bridge({
-        // obscure text
-        Text{ "The awakened ones have #already created a bridge# to the castle where the evil dwells.",
-              /*french*/ "Les êtres de sagesse ont#déjà créé un pont# vers le repaire du mal.",
-            /*spanish*/ "Los sabios #ya habrán creado un puente#&al castillo, de donde emana el mal.",
-              /*german*/"Die Weisen haben #bereits&eine Brücke zum Portal von&Ganons Schloss gelegt#..." },
-    });
+    hintTextTable[RHT_BRIDGE_OPEN_HINT] = HintText(CustomMessage("$lThe awakened ones have #already created a bridge# to the castle where the evil dwells.^",
+                                                      /*german*/ "$lDie Weisen haben #bereits&eine Brücke zum Portal von&Ganons Schloss gelegt#...^",
+                                                      /*french*/ "$lLes êtres de sagesse ont#déjà créé un pont# vers le repaire du mal.^",
+                                                                 {QM_LBLUE}));
+                                                   // /*spanish*/$lLos sabios #ya habrán creado un puente#&al castillo, de donde emana el mal.^
 
-    hintTable[RHT_BRIDGE_VANILLA_HINT] = HintText::Bridge({
-        // obscure text
-        Text{ "The awakened ones require the #Shadow and Spirit Medallions# as well as the #Light Arrows#.",
-              /*french*/
-              "Les êtres de sagesse attendront le héros muni des #Médaillons de l'Ombre et l'Esprit# et des #Flèches de Lumière#.",
-              /*spanish*/
-              "Los sabios aguardarán a que el héroe obtenga tanto el #Medallón de las Sombras y el del Espíritu# junto "
-            "a la #flecha de luz#.",
-              /*german*/"Die Weisen werden darauf warten, dass der Held das #Amulett des Schattens, Amulett der Geister# und die #Licht-Pfeile# sammelt." },
-    });
 
-    hintTable[RHT_BRIDGE_STONES_HINT] = HintText::Bridge({
-        // obscure text                                                  singular        plural
-        Text{
-            "The awakened ones will await for the Hero to collect #%d |Spiritual Stone|Spiritual Stones|#.",
-            /*french*/ "Les êtres de sagesse attendront le héros muni de #%d |Pierre Ancestrale|Pierres Ancestrales|#.",
-            /*spanish*/ "Los sabios aguardarán a que el héroe&obtenga #%d |piedra espiritual|piedras espirituales|#.",
-            /*german*/"Die Weisen werden darauf warten, dass der Held #%d |Heiligen Stein|Heilige Steine|# sammelt." },
-    });
+    hintTextTable[RHT_BRIDGE_VANILLA_HINT] = HintText(CustomMessage("$6The awakened ones require the #Shadow and Spirit Medallions# as well as the #Light Arrows#.^",
+                                                        /*german*/ "$6Die Weisen werden darauf warten, dass der Held das #Amulett des Schattens, Amulett der Geister# und die #Licht-Pfeile# sammelt.^",
+                                                        /*french*/ "$6Les êtres de sagesse attendront le héros muni des #Médaillons de l'Ombre et l'Esprit# et des #Flèches de Lumière#.^",
+                                                                   {QM_RED, QM_YELLOW}));
+                                                     // /*spanish*/$6Los sabios aguardarán a que el héroe obtenga tanto el #Medallón de las Sombras y el del Espíritu# junto
+                                                                // a la #flecha de luz#.^
 
-    hintTable[RHT_BRIDGE_MEDALLIONS_HINT] = HintText::Bridge({
-        // obscure text                                                  singular  plural
-        Text{ "The awakened ones will await for the Hero to collect #%d |Medallion|Medallions|#.",
-              /*french*/ "Les êtres de sagesse attendront le héros muni de #%d |Médaillon|Médaillons|#.",
-              /*spanish*/ "Los sabios aguardarán a que el héroe&obtenga #%d |medallón|medallones|#.",
-              /*german*/"Die Weisen werden darauf warten, dass der Held #%d |Amulett|Amulette|# sammelt." },
-    });
+    hintTextTable[RHT_BRIDGE_STONES_HINT] = HintText(CustomMessage("$0The awakened ones will await for the Hero to collect #[[d]] Spiritual Stone||s|#.^",
+                                                        /*german*/ "$0Die Weisen werden darauf warten, dass der Held #[[d]] |Heiligen Stein|Heilige Steine|# sammelt.^",
+                                                        /*french*/ "$0Les êtres de sagesse attendront le héros muni de #[[d]] |Pierre Ancestrale|Pierres Ancestrales|#.^",
+                                                                   {QM_BLUE}));
+                                                     // /*spanish*/$0Los sabios aguardarán a que el héroe&obtenga #[[d]] |piedra espiritual|piedras espirituales|#.^
 
-    hintTable[RHT_BRIDGE_REWARDS_HINT] = HintText::Bridge({
-        // obscure text                                                  singular                     plural
-        Text{ "The awakened ones will await for the Hero to collect #%d |Spiritual Stone or Medallion|Spiritual Stones "
-              "and Medallions|#.",
-              /*french*/
-              "Les êtres de sagesse attendront le héros muni de #%d |Pierre Ancestrale ou Médaillon|Pierres Ancestrales ou Médaillons|#.",
-              /*spanish*/
-              "Los sabios aguardarán a que el héroe obtenga #%d |piedra espiritual o medallón|piedras espirtuales y "
-            "medallones|#.",
-              /*german*/"Die Weisen werden darauf warten, dass der Held #%d |Heiligen Stein oder Amulett|Heilige Steine oder Amulette|# sammelt." },
-    });
+    hintTextTable[RHT_BRIDGE_MEDALLIONS_HINT] = HintText(CustomMessage("$8The awakened ones will await for the Hero to collect #[[d]] Medallion||s|#.^",
+                                                            /*german*/ "$8Die Weisen werden darauf warten, dass der Held #[[d]] Amulett||e|# sammelt.^",
+                                                            /*french*/ "$8Les êtres de sagesse attendront le héros muni de #[[d]] Médaillon||s|#.^",
+                                                                       {QM_RED}));
+                                                         // /*spanish*/$8Los sabios aguardarán a que el héroe&obtenga #[[d]] |medallón|medallones|#.^
 
-    hintTable[RHT_BRIDGE_DUNGEONS_HINT] = HintText::Bridge({
-        // obscure text                                                  singular plural
-        Text{ "The awakened ones will await for the Hero to conquer #%d |Dungeon|Dungeons|#.",
-              /*french*/ "Les êtres de sagesse attendront la conquête de #%d |Donjon|Donjons|#.",
-              /*spanish*/ "Los sabios aguardarán a que el héroe complete #%d |mazmorra|mazmorras|#.",
-              /*german*/"Die Weisen werden darauf warten, dass der Held #%d |Labyrinth|Labyrinthe|# abschließt." },
-    });
+    hintTextTable[RHT_BRIDGE_REWARDS_HINT] = HintText(CustomMessage("$CThe awakened ones will await for the Hero to collect #[[d]]# |#Spiritual Stone# or #Medallion#|"
+                                                                       "#Spiritual Stones# and #Medallions#|.^",
+                                                            /*german*/ "$CDie Weisen werden darauf warten, dass der Held #[[d]]# |#Heiligen Stein# oder #Amulett#|"
+                                                                       "#Heilige Steine# oder #Amulette#| sammelt.^",
+                                                            /*french*/ "$CLes êtres de sagesse attendront le héros muni de #[[d]]# |#Pierre Ancestrale# ou #Médaillon#"
+                                                                       "|#Pierres Ancestrales# ou #Médaillons#|.^",
+                                                                       {QM_YELLOW, QM_BLUE, QM_RED}));
+                                                         // /*spanish*/$CLos sabios aguardarán a que el héroe obtenga #[[d]]# |#piedra espiritual# o #medallón#|
+                                                                    //#piedras espirtuales# y #medallones#|.^
 
-    hintTable[RHT_BRIDGE_TOKENS_HINT] = HintText::Bridge({
-        // obscure text
-        Text{ "The awakened ones will await for the Hero to collect #%d |Gold Skulltula Token|Gold Skulltula Tokens|#.",
-              /*french*/ "Les êtres de sagesse attendront le héros muni de #%d |Symbole|Symboles| de Skulltula d'or#.",
-              /*spanish*/ "Los sabios aguardarán a que el héroe obtenga #%d |símbolo|símbolos| de skulltula dorada#.",
-              /*german*/"Die Weisen werden darauf warten, dass der Held #%d |Skulltula-Symbol|Skulltula-Symbole|# sammelt." },
-    });
+    hintTextTable[RHT_BRIDGE_DUNGEONS_HINT] = HintText(CustomMessage("$mThe awakened ones will await for the Hero to conquer #[[d]] Dungeon||s|#.^",
+                                                          /*german*/ "$mDie Weisen werden darauf warten, dass der Held #[[d]] Labyrinth||e|# abschließt.^",
+                                                          /*french*/ "$mLes êtres de sagesse attendront la conquête de #[[d]] Donjon||s|#.^",
+                                                                     {QM_PINK}));
+                                                       // /*spanish*/$mLos sabios aguardarán a que el héroe complete #[[d]] mazmorra||s|#.^
+
+    hintTextTable[RHT_BRIDGE_TOKENS_HINT] = HintText(CustomMessage("$sThe awakened ones will await for the Hero to collect #[[d]] Gold Skulltula Token||s|#.^",
+                                                        /*german*/ "$sDie Weisen werden darauf warten, dass der Held #[[d]] Skulltula-Symbol||e|# sammelt.^",
+                                                        /*french*/ "$sLes êtres de sagesse attendront le héros muni de #[[d]] Symbole||s| de Skulltula d'or#.^",
+                                                                   {QM_YELLOW}));
+                                                     // /*spanish*/$sLos sabios aguardarán a que el héroe obtenga #[[d]] símbolo||s| de skulltula dorada#.^
+
+    hintTextTable[RHT_BRIDGE_GREG_HINT] = HintText(CustomMessage("$gThe awakened ones will await for the Hero to find #Greg#.^",
+                                                                 {QM_GREEN}));
 
-    hintTable[RHT_BRIDGE_GREG_HINT] = HintText::Bridge({
-        // obscure text
-        Text{ "The awakened ones will await for the Hero to find %gGreg%w.",
-              /*french*/ "The awakened ones will await for the Hero to find %gGreg%w.",
-              /*spanish*/ "The awakened ones will await for the Hero to find %gGreg%w." },
-    });
 
     /*--------------------------
     | GANON BOSS KEY HINT TEXT |
     ---------------------------*/
 
-    hintTable[RHT_GANON_BK_START_WITH_HINT] = HintText::GanonsBossKey({
-        // obscure text
-        Text{ "And the #evil one#'s key will be #given from the start#.",
-              /*french*/ "Aussi, la #clé du Malin# sera #possession même du héros#.",
-              /*spanish*/ "Y obtendrás la llave del #señor del mal# desde el #inicio#.",
-              /*german*/"Und der #Schlüssel des Bösen#, wird #von Anfang an, im Besitz des Helden# sein." },
-    });
+    hintTextTable[RHT_GANON_BK_START_WITH_HINT] = HintText(CustomMessage("$bAnd the #evil one#'s key will be #given from the start#.^",
+                                                              /*german*/ "$bUnd der #Schlüssel des Bösen#, wird #von Anfang an, im Besitz des Helden# sein.^",
+                                                              /*french*/ "$bAussi, la #clé du Malin# sera #possession même du héros#.^",
+                                                                         {QM_PINK, QM_LBLUE}));
+                                                           // /*spanish*/$bY obtendrás la llave del #señor del mal# desde el #inicio#.^
 
-    hintTable[RHT_GANON_BK_VANILLA_HINT] = HintText::GanonsBossKey({
-        // obscure text
-        Text{ "And the #evil one#'s key will be kept in a big chest #inside its tower#.",
-              /*french*/ "Aussi, la #clé du Malin# sera encoffrée #dans sa tour#.",
-              /*spanish*/ "Y la llave del #señor del mal# aguardará en un gran cofre de #su torre#.",
-              /*german*/"Und der #Schlüssel des Bösen#, wird in der großen Truhe #im Teufelsturm# zu finden sein." },
-    });
+    hintTextTable[RHT_GANON_BK_VANILLA_HINT] = HintText(CustomMessage("$bAnd the #evil one#'s key will be kept in a big chest #inside its tower#.^",
+                                                           /*german*/ "$bUnd der #Schlüssel des Bösen#, wird in der großen Truhe #im Teufelsturm# zu finden sein.^",
+                                                           /*french*/ "$bAussi, la #clé du Malin# sera encoffrée #dans sa tour#.^",
+                                                                      {QM_PINK, QM_LBLUE}));
+                                                        // /*spanish*/$bY la llave del #señor del mal# aguardará en un gran cofre de #su torre#.^
 
-    hintTable[RHT_GANON_BK_OWN_DUNGEON_HINT] = HintText::GanonsBossKey({
-        // obscure text
-        Text{ "And the #evil one#'s key will be hidden somewhere #inside its castle#.",
-              /*french*/ "Aussi, la #clé du Malin# sera cachée #dans son vaste château#.",
-              /*spanish*/ "Y la llave del #señor del mal# aguardará en #algún lugar de su castillo#.",
-              /*german*/"Und der #Schlüssel des Bösen#, wird irgendwo #in Ganons Schloss# zu finden sein." },
-    });
+    hintTextTable[RHT_GANON_BK_OWN_DUNGEON_HINT] = HintText(CustomMessage("$bAnd the #evil one#'s key will be hidden somewhere #inside its castle#.^",
+                                                               /*german*/ "$bUnd der #Schlüssel des Bösen#, wird irgendwo #in Ganons Schloss# zu finden sein.^",
+                                                               /*french*/ "$bAussi, la #clé du Malin# sera cachée #dans son vaste château#.^",
+                                                                          {QM_PINK, QM_PINK}));
+                                                            // /*spanish*/$bY la llave del #señor del mal# aguardará en #algún lugar de su castillo#.^
 
-    hintTable[RHT_GANON_BK_OVERWORLD_HINT] = HintText::GanonsBossKey({
-        // obscure text
-        Text{ "And the #evil one#'s key will be hidden #outside of dungeons# in Hyrule.",
-              /*french*/ "Aussi, la #clé du Malin# se trouve #hors des donjons# d'Hyrule.",
-              /*spanish*/ "Y la llave del #señor del mal# aguardará #fuera de las mazmorras# de Hyrule.",
-              /*german*/"Und der #Schlüssel des Bösen#, wird irgendwo #in Hyrule, außerhalb von Labyrinthen# zu finden sein." },
-    });
+    hintTextTable[RHT_GANON_BK_OVERWORLD_HINT] = HintText(CustomMessage("$bAnd the #evil one#'s key will be hidden #outside of dungeons# in Hyrule.^",
+                                                             /*german*/ "$bUnd der #Schlüssel des Bösen#, wird irgendwo #in Hyrule, außerhalb von Labyrinthen# zu finden sein.^",
+                                                             /*french*/ "$bAussi, la #clé du Malin# se trouve #hors des donjons# d'Hyrule.^",
+                                                                        {QM_PINK, QM_GREEN}));
+                                                          // /*spanish*/$bY la llave del #señor del mal# aguardará #fuera de las mazmorras# de Hyrule.^
 
-    hintTable[RHT_GANON_BK_ANY_DUNGEON_HINT] = HintText::GanonsBossKey({
-        // obscure text
-        Text{ "And the #evil one#'s key will be hidden #inside a dungeon# in Hyrule.",
-              /*french*/ "Aussi, la #clé du Malin# se trouve #dans un donjon# d'Hyrule.",
-              /*spanish*/ "Y la llave del #señor del mal# aguardará #en una mazmorra# de Hyrule.",
-              /*german*/"Und der #Schlüssel des Bösen#, wird irgendwo #in Hyrule, innerhalb eines Labyrinths# zu finden sein." },
-    });
+    hintTextTable[RHT_GANON_BK_ANY_DUNGEON_HINT] = HintText(CustomMessage("$bAnd the #evil one#'s key will be hidden #inside a dungeon# in Hyrule.^",
+                                                               /*german*/ "$bUnd der #Schlüssel des Bösen#, wird irgendwo #in Hyrule, innerhalb eines Labyrinths# zu finden sein.^",
+                                                               /*french*/ "$bAussi, la #clé du Malin# se trouve #dans un donjon# d'Hyrule.^",
+                                                                          {QM_PINK, QM_PINK}));
+                                                            // /*spanish*/$bY la llave del #señor del mal# aguardará #en una mazmorra# de Hyrule.^
 
-    hintTable[RHT_GANON_BK_ANYWHERE_HINT] = HintText::GanonsBossKey({
-        // obscure text
-        Text{ "And the #evil one#'s key will be hidden somewhere&#in Hyrule#.",
-              /*french*/ "Aussi, la #clé du Malin# se trouve quelque part #dans Hyrule#.",
-              /*spanish*/ "Y la llave del #señor del mal# aguardará en #cualquier lugar de Hyrule#.",
-              /*german*/"Und der #Schlüssel des Bösen#, wird irgendwo #in Hyrule# zu finden sein." },
-    });
+    hintTextTable[RHT_GANON_BK_ANYWHERE_HINT] = HintText(CustomMessage("$bAnd the #evil one#'s key will be hidden somewhere&#in Hyrule#.^",
+                                                            /*german*/ "$bUnd der #Schlüssel des Bösen#, wird irgendwo #in Hyrule# zu finden sein.^",
+                                                            /*french*/ "$bAussi, la #clé du Malin# se trouve quelque part #dans Hyrule#.^",
+                                                                       {QM_PINK, QM_BLUE}));
+                                                         // /*spanish*/$bY la llave del #señor del mal# aguardará en #cualquier lugar de Hyrule#.^
 
-    hintTable[RHT_GANON_BK_TRIFORCE_HINT] = HintText::GanonsBossKey({
-        // obscure text
-        Text{ "And the #evil one#'s key will be given to the Hero once the #Triforce## is completed.",
-              /*french*/ "Aussi, la #clé du Malin# se&révèlera une fois la #Triforce#&assemblée.",
-              /*spanish*/ "Y el héroe recibirá la llave del #señor del mal# cuando haya completado la #Trifuerza#.",
-              /*german*/"Und der #Schlüssel des Bösen# wird verliehen, sobald das #Triforce# vervollständigt wurde." },
-    });
+    hintTextTable[RHT_GANON_BK_TRIFORCE_HINT] = HintText(CustomMessage("$bAnd the #evil one#'s key will be given to the Hero once the #Triforce## is completed.^",
+                                                            /*german*/ "$bUnd der #Schlüssel des Bösen# wird verliehen, sobald das #Triforce# vervollständigt wurde.^",
+                                                            /*french*/ "$bAussi, la #clé du Malin# se&révèlera une fois la #Triforce#&assemblée.^",
+                                                                       {QM_PINK, QM_YELLOW}));
+                                                         // /*spanish*/$bY el héroe recibirá la llave del #señor del mal# cuando haya completado la #Trifuerza#.^
 
-    hintTable[RHT_GANON_BK_SKULLTULA_HINT] = HintText::GanonsBossKey({
-        // obscure text
-        Text { "And the #evil one#'s key will be provided by the cursed rich man once #100 Gold Skulltula Tokens# are retrieved.",
-              /*french*/ "Aussi, la #clé du Malin# sera&donnée par l'homme maudit une fois que #100 Symboles de Skulltula d'or# auront été trouvés.",
-              /*spanish*/ "Y el rico maldito entregará la llave&del #señor de mal# tras obtener&100 símbolos de skulltula dorada#."},
-    });
+    hintTextTable[RHT_GANON_BK_SKULLTULA_HINT] = HintText(CustomMessage("$bAnd the #evil one#'s key will be provided by the cursed rich man once #100 Gold Skulltula Tokens# are retrieved.^",
+                                                             /*german*/ "",
+                                                             /*french*/ "$bAussi, la #clé du Malin# sera&donnée par l'homme maudit une fois que #100 Symboles de Skulltula d'or# auront été trouvés.^",
+                                                                        {QM_PINK, QM_YELLOW}));
+                                                          // /*spanish*/$bY el rico maldito entregará la llave&del #señor de mal# tras obtener&100 símbolos de skulltula dorada#.^
 
-    /*--------------------------
-    |      LACS HINT TEXT      |
-    ---------------------------*/
+    hintTextTable[RHT_LACS_VANILLA_HINT] = HintText(CustomMessage("$bAnd the #evil one#'s key will be provided by #Zelda# once the #Shadow and Spirit Medallions# are retrieved.^",
+                                                       /*german*/ "$bUnd der #Schlüssel des Bösen# wird von #Zelda# verliehen, sobald #die Amulette des Schattens und der Geister# geborgen wurden.^",
+                                                       /*french*/ "$bAussi, la #clé du Malin# sera fournie par #Zelda# une fois que les #Médaillons de l'Ombre et de l'Esprit# seront récupérés.^",
+                                                                  {QM_PINK, QM_YELLOW, QM_RED}));
+                                                    // /*spanish*/$bY #Zelda# entregará la llave del #señor del mal# tras obtener #el medallón de las sombras y del espíritu#.^
 
-    hintTable[RHT_LACS_VANILLA_HINT] = HintText::LACS({
-        // obscure text
-        Text{
-            "And the #evil one#'s key will be provided by Zelda once the #Shadow and Spirit Medallions# are retrieved.",
-            /*french*/ "Aussi, la #clé du Malin# sera fournie par Zelda une fois que les #Médaillons de l'Ombre et de l'Esprit# seront récupérés.",
-            /*spanish*/
-            "Y Zelda entregará la llave del #señor del mal# tras obtener #el medallón de las sombras y del "
-            "espíritu#.",
-            /*german*/"Und der #Schlüssel des Bösen# wird von Zelda verliehen, sobald #die Amulette des Schattens und der Geister# geborgen wurden." },
-    });
+    hintTextTable[RHT_LACS_MEDALLIONS_HINT] = HintText(CustomMessage("$bAnd the #evil one#'s key will be provided by #Zelda# once #[[d]] Medallion|# is|s# are| retrieved.^",
+                                                          /*german*/ "$bUnd der #Schlüssel des Bösen# wird von #Zelda# verliehen, sobald #[[d]] Amulett|# geborgen wurde|e# geborgen wurden|.^",
+                                                          /*french*/ "$bAussi, la #clé du Malin# sera fournie par #Zelda# une fois |qu' #[[d]] Médaillon# aura été récupéré|que #[[d]] Médaillons# auront été récupérés|.^",
+                                                                     {QM_PINK, QM_YELLOW, QM_RED}));
+                                                       // /*spanish*/$bY #Zelda# entregará la llave&del #señor del mal# tras obtener #[[d]] |medallón|medallones|#.^
 
-    hintTable[RHT_LACS_MEDALLIONS_HINT] = HintText::LACS({
-        // obscure text                                                     singular      plural
-        Text{ "And the #evil one#'s key will be provided by Zelda once #%d |Medallion# is|Medallions# are| retrieved.",
-              /*french*/ "Aussi, la #clé du Malin# sera fournie par Zelda une fois |qu' #%d Médaillon# aura été récupéré|que #%d Médaillons# auront été récupérés|.",
-              /*spanish*/ "Y Zelda entregará la llave&del #señor del mal# tras obtener #%d |medallón|medallones|#.",
-              /*german*/"Und der #Schlüssel des Bösen# wird von Zelda verliehen, sobald #%d |Amulett# geborgen wurde|Amulette# geborgen wurden|." },
-    });
+    hintTextTable[RHT_LACS_STONES_HINT] = HintText(CustomMessage("$bAnd the #evil one#'s key will be provided by #Zelda# once #[[d]] Spiritual Stone|# is|s# are| retrieved.^",
+                                                      /*german*/ "$bUnd der #Schlüssel des Bösen# wird von #Zelda# verliehen, sobald #[[d]] Heilige|r Stein# geborgen wurde| Steine# geborgen wurden|.^",
+                                                      /*french*/ "$bAussi, la #clé du Malin# sera fournie par #Zelda# une fois |qu' #[[d]] Pierre Ancestrale# aura été&récupérée|que #[[d]] Pierres Ancestrales# auront été récupérées|.^",
+                                                                 {QM_PINK, QM_YELLOW, QM_BLUE}));
+                                                   // /*spanish*/$bY #Zelda# entregará la llave del #señor del mal# tras obtener #[[d]] piedra| espiritual|s espirituales|#.^
 
-    hintTable[RHT_LACS_STONES_HINT] = HintText::LACS({
-        // obscure text                                                     singular            plural
-        Text{
-            "And the #evil one#'s key will be provided by Zelda once #%d |Spiritual Stone# is|Spiritual Stones# are| "
-            "retrieved.",
-            /*french*/ "Aussi, la #clé du Malin# sera fournie par Zelda une fois |qu' #%d Pierre Ancestrale# aura été&récupérée|que #%d Pierres Ancestrales# auront été récupérées|.",
-            /*spanish*/
-            "Y Zelda entregará la llave del #señor del mal# tras obtener #%d |piedra espiritual|piedras "
-            "espirituales|#.",
-            /*german*/"Und der #Schlüssel des Bösen# wird von Zelda verliehen, sobald #%d |Heiliger Stein# geborgen wurde|Heilige Steine# geborgen wurden|." },
-    });
+    hintTextTable[RHT_LACS_REWARDS_HINT] = HintText(CustomMessage("$bAnd the #evil one#'s key will be provided by #Zelda# once #[[d]]# #Spiritual Stone|# or #Medallion# is|s# and #Medallions# are| retrieved.^",
+                                                       /*german*/ "$bUnd der #Schlüssel des Bösen# wird von #Zelda# verliehen, sobald #[[d]]# #Heilige|r Stein# oder #Amulett#&geborgen wurde| Steine# oder #Amulette#&geborgen wurden|.^",
+                                                       /*french*/ "$bAussi, la #clé du Malin# sera fournie par #Zelda# une fois qu|' #[[d]]# #Pierre Ancestrale# ou #[[d]] Médaillon# sera récupéré|e&#[[d]]# #Pierres Ancestrales# et&#Médaillons# seront récupérés|.^",
+                                                                  {QM_PINK, QM_YELLOW, QM_YELLOW, QM_BLUE, QM_RED}));
+                                                    // /*spanish*/$bY #Zelda# entregará la llave del #señor del mal# tras obtener #[[d]]# piedra| espiritual o medallón|s espirituales o medallones|#.^
 
-    hintTable[RHT_LACS_REWARDS_HINT] = HintText::LACS({
-        // obscure text                                                     singular                         plural
-        Text{ "And the #evil one#'s key will be provided by Zelda once #%d |Spiritual Stone or Medallion# "
-              "is|Spiritual Stones and Medallions# are| retrieved.",
-              /*french*/
-              "Aussi, la #clé du Malin# sera fournie par Zelda une fois |qu' #%d Pierre Ancestrale ou %d Médaillon# sera récupéré|que&#%d Pierres Ancestrales et&Médaillons# seront récupérés|.",
-              /*spanish*/
-              "Y Zelda entregará la llave del #señor del mal# tras obtener #%d |piedra espiritual o medallón|piedras "
-            "espirituales o medallones|#.",
-              /*german*/"Und der #Schlüssel des Bösen# wird von Zelda verliehen, sobald #%d |Heiliger Stein oder Amulett#&geborgen wurde|Heilige Steine oder Amulette#&geborgen wurden|." },
-    });
+    hintTextTable[RHT_LACS_DUNGEONS_HINT] = HintText(CustomMessage("$bAnd the #evil one#'s key will be provided by #Zelda# once #[[d]] Dungeon|# is|s# are| conquered.^",
+                                                        /*german*/ "$bUnd der #Schlüssel des Bösen# wird von #Zelda# verliehen, sobald #[[d]] Labyrinth|# abgeschlossen wurde|e# abgeschlossen wurden|.^",
+                                                        /*french*/ "$bAussi, la #clé du Malin# sera fournie par #Zelda# une fois qu|' #[[d]] donjon #sera conquis|e #[[d]] donjons# seront conquis|.^",
+                                                                  {QM_PINK, QM_YELLOW, QM_PINK}));
+                                                     // /*spanish*/$bY #Zelda# entregará la llave del #señor del mal# tras completar #[[d]] mazmorra||s|#.^
 
-    hintTable[RHT_LACS_DUNGEONS_HINT] = HintText::LACS({
-        // obscure text                                                     singular    plural
-        Text{ "And the #evil one#'s key will be provided by Zelda once #%d |Dungeon# is|Dungeons# are| conquered.",
-              /*french*/ "Aussi, la #clé du Malin# sera fournie par Zelda une fois |qu' #%d donjon #sera conquis|que #%d donjons# seront conquis|.",
-            /*spanish*/ "Y Zelda entregará la llave del #señor del mal# tras completar #%d |mazmorra|mazmorras|#.",
-              /*german*/"Und der #Schlüssel des Bösen# wird von Zelda verliehen, sobald #%d |Labyrinth# abgeschlossen wurde|Labyrinthe# abgeschlossen wurden|." },
-    });
+    hintTextTable[RHT_LACS_TOKENS_HINT] = HintText(CustomMessage("$bAnd the #evil one#'s key will be provided by #Zelda# once #[[d]] Gold Skulltula Token|# is|s# are| retrieved.^",
+                                                      /*german*/ "$bUnd der #Schlüssel des Bösen# wird von #Zelda# verliehen, sobald #[[d]] Skulltula-Symbol|# gesammelt wurde|e# gesammelt wurden|.^",
+                                                      /*french*/ "$bAussi, la #clé du Malin# sera fournie par #Zelda# une fois |qu' #[[d]] symbole de Skulltula d'or #sera récupuéré"
+                                                                 "|que &#[[d]] symboles de Skulltula d'or&#seront recupérés|.^",
+                                                                  {QM_PINK, QM_YELLOW, QM_YELLOW}));
+                                                    // /*spanish*/$bY #Zelda# entregará la llave del #señor del mal# tras obtener #[[d]] símbolo
+                                                              // ||s| de skulltula dorada#.^
 
-    hintTable[RHT_LACS_TOKENS_HINT] = HintText::LACS({
-        // obscure text                                                     singular                 plural
-        Text{ "And the #evil one#'s key will be provided by Zelda once #%d |Gold&Skulltula Token# is|Gold Skulltula "
-              "Tokens# are| retrieved.",
-              /*french*/ "Aussi, la #clé du Malin# sera fournie par Zelda une fois |qu' #%d symbole de Skulltula d'or #sera récupuéré|que &#%d symboles de Skulltula d'or&#seront recupérés|.",
-              /*spanish*/
-              "Y Zelda entregará la llave del #señor del mal# tras obtener #%d |símbolo|símbolos| de skulltula "
-            "dorada#.",
-              /*german*/"Und der #Schlüssel des Bösen# wird von Zelda verliehen, sobald #%d |Skulltula-Symbol# gesammelt wurde|Skulltula-Symbole# gesammelt wurden|." },
-    });
     /*--------------------------
     |     TRIAL HINT TEXT      |
     ---------------------------*/
 
-    hintTable[RHT_SIX_TRIALS] = HintText::Exclude({
-        // obscure text
-        Text{ "#Ganon's Tower# is protected by a powerful barrier.",
-              /*french*/ "#la Tour de Ganon# est protégée par une puissante barrière",
-              /*spanish*/ "la #torre de Ganon# está protegida por una poderosa barrera",
-              /*german*/"der #Teufelsturm# sei von einer mächtigen Barriere geschützt." },
-    });
+    hintTextTable[RHT_SIX_TRIALS] = HintText(CustomMessage("They say that #Ganon's Tower# is protected by a powerful barrier.",
+                                                /*german*/ "Man erzählt sich, daß der #Teufelsturm# sei von einer mächtigen Barriere geschützt sei.",
+                                                /*french*/ "Selon moi, #la Tour de Ganon# est protégée par une puissante barrière", {QM_PINK}));
+                                             // /*spanish*/Según dicen, la #torre de Ganon# está protegida por una poderosa barrera
 
-    hintTable[RHT_ZERO_TRIALS] = HintText::Exclude({
-        // obscure text
-        Text{ "Sheik dispelled the barrier around #Ganon's Tower#.",
-              /*french*/ "Sheik a dissipé la barrière autour de #la Tour de Ganon#",
-              /*spanish*/ "Sheik disipó la barrera alrededor de la #torre de Ganon#.",
-              /*german*/"Shiek habe die Barriere um den #Teufelsturm# aufgelöst." },
-    });
+    hintTextTable[RHT_ZERO_TRIALS] = HintText(CustomMessage("They say that Sheik dispelled the barrier around #Ganon's Tower#.",
+                                                 /*german*/ "Man erzählt sich, Shiek habe die Barriere um den #Teufelsturm# aufgelöst sei.",
+                                                 /*french*/ "Selon moi, Sheik a dissipé la barrière autour de #la Tour de Ganon#", {QM_YELLOW}));
+                                              // /*spanish*/Según dicen, Sheik disipó la barrera alrededor de la #torre de Ganon#.
 
-    hintTable[RHT_FOUR_TO_FIVE_TRIALS] = HintText::Exclude({
-        // obscure text
-        Text{ " was dispelled by Sheik.", /*french*/ " a été dissipée par Sheik.",
-            /*spanish*/ " se disipó gracias a Sheik.",
-              /*german*/" sei von Shiek aufgelöst worden." },
-    });
+    hintTextTable[RHT_TRIAL_OFF] = HintText(CustomMessage("They say that #[[1]]# was dispelled by Sheik.",
+                                               /*german*/ "Man erzählt sich, daß #[[1]]# sei von Shiek aufgelöst worden sei.",
+                                               /*french*/ "Selon moi, #[[1]]# a été dissipée par Sheik.", {QM_YELLOW}));
+                                            // /*spanish*/Según dicen, #[[1]]# se disipó gracias a Sheik.
 
-    hintTable[RHT_ONE_TO_THREE_TRIALS] = HintText::Exclude({
-        // obscure text
-        Text{ " protects Ganons Tower.", /*french*/ " protège la Tour de Ganon.",
-            /*spanish*/ " protege la torre de Ganon",
-                /*german*/" schütze den Teufelsturm." },
-    });
+    hintTextTable[RHT_TRIAL_ON] = HintText(CustomMessage("They say that #[[1]]# protects Ganons Tower.",
+                                              /*german*/ "Man erzählt sich, daß #[[1]]# schütze den Teufelsturm sei.",
+                                              /*french*/ "Selon moi, #[[1]]# protège la Tour de Ganon.", {QM_PINK}));
+                                           // /*spanish*/Según dicen, #[[1]]# protege la torre de Ganon
+
+    hintTextTable[RHT_LIGHT_TRIAL] = HintText(CustomMessage("the Light Trial",
+                                                 /*german*/ "",
+                                                 /*french*/ "l'épreuve de la Lumière"));
+                                              // /*spanish*/la prueba de la luz
+
+    hintTextTable[RHT_FOREST_TRIAL] = HintText(CustomMessage("the Forest Trial",
+                                                  /*german*/ "",
+                                                  /*french*/ "l'épreuve de la Forêt"));
+                                               // /*spanish*/la prueba del bosque
+
+    hintTextTable[RHT_FIRE_TRIAL] = HintText(CustomMessage("the Fire Trial",
+                                                /*german*/ "",
+                                                /*french*/ "l'épreuve du Feu"));
+                                             // /*spanish*/la prueba del fuego
+
+    hintTextTable[RHT_WATER_TRIAL] = HintText(CustomMessage("the Water Trial",
+                                                 /*german*/ "",
+                                                 /*french*/ "l'épreuve de l'Eau"));
+                                              // /*spanish*/la prueba del agua
+
+    hintTextTable[RHT_SPIRIT_TRIAL] = HintText(CustomMessage("the Spirit Trial",
+                                                  /*german*/ "",
+                                                  /*french*/ "l'épreuve de l'Esprit"));
+                                               // /*spanish*/la prueba del espíritu
+
+    hintTextTable[RHT_SHADOW_TRIAL] = HintText(CustomMessage("the Shadow Trial",
+                                                  /*german*/ "",
+                                                  /*french*/ "l'épreuve de l'Ombre"));
+                                               // /*spanish*/la prueba de las sombras
 
     /*--------------------------
     |        ALTAR TEXT        |
     ---------------------------*/
 
-    hintTable[RHT_SPIRITUAL_STONE_TEXT_START] = HintText::Altar({
-        // obscure text
-        Text{ "3 Spiritual Stones found in Hyrule...",
-              /*french*/ "Les trois Pierres Ancestrales cachées&dans Hyrule...",
-              /*spanish*/ "Tres piedras espirituales halladas por Hyrule...",
-              /*german*/"Drei Heilige Steine, zu finden in Hyrule..." },
-    });
+    hintTextTable[RHT_CHILD_ALTAR_STONES] = HintText(CustomMessage("3 Spiritual Stone's found in Hyrule...^$0#[[1]]#...^$1#[[2]]#...^$2#[[3]]#...^",
+                                                        /*german*/ "Drei Heilige Steine, zu finden in Hyrule...$0#[[1]]#...^$1#[[2]]#...^$2#[[3]]#...^",
+                                                        /*french*/ "Les trois Pierres Ancestrales cachées&dans Hyrule...$0#[[1]]#...^$1#[[2]]#...^$2#[[3]]#...^",
+                                                        {QM_GREEN, QM_RED, QM_BLUE}, {true, true, true}));
+                                                    // /*spanish*/ Tres piedras espirituales halladas por Hyrule...$0#[[1]]#...^$1#[[2]]#...^$2#[[3]]#...^
 
-    hintTable[RHT_CHILD_ALTAR_TEXT_END_DOTOPEN] = HintText::Altar({
-        // obscure text
-        Text{ "Ye who may become a Hero...&The path to the future is open...",
-              /*french*/ "À celui qui a quête de devenir&héros...&Le futur vous accueille béant...",
-              /*spanish*/ "Para aquel que se convierta en el héroe...&La puerta al futuro está a su disposición...",
-              /*german*/"Jener auf dem Weg des Helden...&Der Pfad zur Zukunft sei geöffnet..." },
-    });
+    hintTextTable[RHT_CHILD_ALTAR_TEXT_END_DOTOPEN] = HintText(CustomMessage("$oYe who may become a Hero...&The path to the future is open...",
+                                                                  /*german*/ "$oJener auf dem Weg des Helden...&Der Pfad zur Zukunft sei geöffnet...",
+                                                                  /*french*/ "$oÀ celui qui a quête de devenir&héros...&Le futur vous accueille béant..."));
+                                                               // /*spanish*/$oPara aquel que se convierta en el héroe...&La puerta al futuro está a su disposición...
 
-    hintTable[RHT_CHILD_ALTAR_TEXT_END_DOTSONGONLY] = HintText::Altar({
-        // obscure text
-        Text{
-            "Ye who may become a Hero...&Stand with the Ocarina and&play the Song of Time.",
-            /*french*/ "À celui qui a quête de devenir&héros...&Portez l'Ocarina et jouez&le chant du temps.",
-            /*spanish*/ "Para aquel que se convierta en el héroe...&Tome la ocarina y&entone la Canción del Tiempo.",
-            /*german*/"Jener auf dem Weg des Helden...&Nehme er seine Okarina zur Hand und&spiele hier die Hymne der Zeit." },
-    });
+    hintTextTable[RHT_CHILD_ALTAR_TEXT_END_DOTSONGONLY] = HintText(CustomMessage("$cYe who may become a Hero...&Stand with the Ocarina and&play the Song of Time.",
+                                                                      /*german*/ "$cJener auf dem Weg des Helden...&Nehme er seine Okarina zur Hand und&spiele hier die Hymne der Zeit.",
+                                                                      /*french*/ "$cÀ celui qui a quête de devenir&héros...&Portez l'Ocarina et jouez&le chant du temps."));
+                                                                   // /*spanish*/$cPara aquel que se convierta en el héroe...&Tome la ocarina y&entone la Canción del Tiempo.
+    
+    hintTextTable[RHT_CHILD_ALTAR_TEXT_END_DOTCLOSED] = HintText(CustomMessage("$iYe who may become a Hero...&Offer the spiritual stones and&play the Song of Time.",
+                                                                    /*german*/ "$iJener mit den drei Heiligen Steinen&nehme seine Okarina zur Hand und&spiele hier die Hymne der Zeit.",
+                                                                    /*french*/ "$iÀ celui qui a quête de devenir&héros... Présentez les Pierres&Ancestrales et jouez&le chant du temps."));
+                                                                 // /*spanish*/$iPara aquel que se convierta en el héroe...&Tome las piedras espirituales y&entone la Canción del Tiempo.
 
-    hintTable[RHT_CHILD_ALTAR_TEXT_END_DOTCLOSED] = HintText::Altar({
-        // obscure text
-        Text{ "Ye who may become a Hero...&Offer the spiritual stones and&play the Song of Time.",
-              /*french*/
-              "À celui qui a quête de devenir&héros... Présentez les Pierres&Ancestrales et jouez&le chant du temps.",
-              /*spanish*/
-              "Para aquel que se convierta en el héroe...&Tome las piedras espirituales y&entone la Canción del "
-            "Tiempo.",
-              /*german*/"Jener mit den drei Heiligen Steinen&nehme seine Okarina zur Hand und&spiele hier die Hymne der Zeit." },
-    });
+    hintTextTable[RHT_ADULT_ALTAR_MEDALLIONS] = HintText(CustomMessage("An awakening voice from the Sacred Realm will call those destined to be Sages, who dwell in the #five temples#.^"
+                                                                       "$8#[[1]]#...^$3#[[2]]#...^$4#[[3]]#...^$5#[[4]]#...^$6#[[5]]#...^$7#[[6]]#...^" ,
+                                                            /*german*/ "Beherrscht das Böse die Welt, weilen&jene Weisen, die von der Stimme des Heiligen Reiches erweckt werden, noch&in den #fünf Tempeln#.^"
+                                                                       "$8#[[1]]#...^$3#[[2]]#...^$4#[[3]]#...^$5#[[4]]#...^$6#[[5]]#...^$7#[[6]]#...^",
+                                                            /*french*/ "Quand le mal aura triomphé, une voix du Saint Royaume appellera ceux cachés dans les #cinq temples#, destinés^à être Sages.^"
+                                                                       "$8#[[1]]#...^$3#[[2]]#...^$4#[[3]]#...^$5#[[4]]#...^$6#[[5]]#...^$7#[[6]]#...^",
+                                                                       { QM_RED, QM_YELLOW, QM_GREEN, QM_RED, QM_BLUE, QM_YELLOW, QM_PINK}, {true, true, true, true, true, true}, TEXTBOX_TYPE_BLUE));
+                                                         // /*spanish*/Cuando el mal lo impregne todo, desde el Reino Sagrado surgirá una voz que hará despertar a los sabios que moran en los #cinco templos#.^
+                                                                    // $8#[[1]]#...^$3#[[2]]#...^$4#[[3]]#...^$5#[[4]]#...^$6#[[5]]#...^$7#[[6]]#...^
 
-    hintTable[RHT_ADULT_ALTAR_TEXT_START] = HintText::Altar({
-        // obscure text
-        Text{ "An awakening voice from the Sacred Realm will call those destined to be Sages, who dwell in the #five temples#.",
-              /*french*/
-              "Quand le mal aura triomphé, une voix du Saint Royaume appellera ceux cachés dans les #cinq temples#, "
-              "destinés^à être Sages.",
-              /*spanish*/
-              "Cuando el mal lo impregne todo, desde el Reino Sagrado surgirá una voz que hará despertar a los sabios "
-            "que moran en los #cinco templos#.",
-              /*german*/"Beherrscht das Böse die Welt, weilen&jene Weisen, die von der Stimme des Heiligen Reiches erweckt werden, noch&in den #fünf Tempeln#." },
-    });
-
-    hintTable[RHT_ADULT_ALTAR_TEXT_END] = HintText::Altar({
-        // obscure text
-        Text{
-            "$kTogether with the Hero of Time, the awakened ones will return the light of peace to the world...",
-            /*french*/
-            "$kEnsemble avec le Héros du Temps, ces Sages emprisonneront le mal et réinstaureront la lumière de paix "
-            "dans le monde...",
-            /*spanish*/
-            "Con el Héroe del Tiempo, aquellos&que despierten detendrán el mal y&volverán al mundo de luz la paz...",
-            /*german*/"$kZusammen mit dem Auserwählten wer-den diese ihre Kräfte einsetzen, um der Welt den Frieden wiederzugeben." },
-    });
+    hintTextTable[RHT_ADULT_ALTAR_TEXT_END] = HintText(CustomMessage("$kTogether with the Hero of Time, the awakened ones will return the light of peace to the world...",
+                                                        /*german*/ "$kZusammen mit dem Auserwählten wer-den diese ihre Kräfte einsetzen, um der Welt den Frieden wiederzugeben.",
+                                                        /*french*/ "$kEnsemble avec le Héros du Temps, ces Sages emprisonneront le mal et réinstaureront la lumière de paix dans le monde..."));
+                                                        // /*spanish*/Con el Héroe del Tiempo, aquellos&que despierten detendrán el mal y&volverán al mundo de luz la paz...
 
     /*--------------------------
-    |   VALIDATION LINE TEXT   |
+    |     Static Item Hints     |
     ---------------------------*/
 
-    hintTable[RHT_VALIDATION_LINE] = HintText::Validation({
-        // obscure text
-        Text{ "Hmph... Since you made it this far, I'll let you know what glorious prize of Ganon's you likely missed "
-              "out on in my tower.^Behold...^",
-              /*french*/
-              "Pah! Puisque tu t'es rendu ici, je te dirai quel trésor tu as manqué dans ma tour.^Et c'est...^",
-              /*spanish*/
-              "Mmm... Ya que has llegado hasta aquí, te diré qué preciado objeto de mi propiedad puedes haberte dejado "
-              "en mi torre.^He aquí...^" },
-    });
+    hintTextTable[RHT_GANONDORF_HINT_LA_ONLY] = HintText(CustomMessage("Ha ha ha... You'll never beat me by reflecting my lightning bolts and unleashing the arrows from #[[1]]#!",
+                                                            /*german*/ "",
+                                                            /*french*/ "Ha ha ha... Pauvre fou! Tu ne pourras jamais me vaincre sans les flèches que j'ai cachées dans #[[1]]#!",
+                                                                       {QM_RED}));
+                                                         // /*spanish*/Ja, ja, ja... Nunca me derrotarás reflejando mis esferas de energía y desplegando la flecha de luz de #[[1]]#!
+
+    hintTextTable[RHT_GANONDORF_HINT_MS_ONLY] = HintText(CustomMessage("Ha ha ha... You'll never defeat me, drop a castle on me and finish me off with the sacred blade from #[[2]]#!",
+                                                            /*german*/ "",
+                                                            /*french*/ "",
+                                                                       {QM_RED}));
+
+    hintTextTable[RHT_GANONDORF_HINT_LA_AND_MS] = HintText(CustomMessage("Ha ha ha... You'll never beat me by reflecting my lightning bolts and unleashing the arrows from #[[1]]#!"
+                                                                         "^And even if you do, you'll never find the legendary blade hidden in #[[2]]#!",
+                                                              /*german*/ "",
+                                                              /*french*/ "Ha ha ha... Pauvre fou! Tu ne pourras jamais me vaincre sans les flèches que j'ai cachées dans #[[1]]#!"
+                                                                         "^Et même si tu les trouves, tu ne touveras jamais l'épée de légende cachée dans #[[2]]#!",
+                                                                         {QM_RED, QM_RED}));
+                                                           // /*spanish*/Ja, ja, ja... Nunca me derrotarás reflejando mis esferas de energía y desplegando la flecha de luz de #[[1]]#!
+                                                                      // ^E incluso si lo haces, nunca encontrarás la espada legendaria escondida en #[[2]]#!
+
+    hintTextTable[RHT_SHEIK_HINT_LA_ONLY] = HintText(CustomMessage("I overheard Ganondorf say that he misplaced the #Light Arrows# in #[[1]]#.",
+                                                        /*german*/ "",
+                                                        /*french*/ "J'ai entendu dire que Ganondorf aurait caché les #Flèches de Lumière# dans #[[1]]#.",
+                                                                   {QM_YELLOW, QM_RED}));
+
+    hintTextTable[RHT_DAMPE_DIARY] = HintText(CustomMessage("Whoever reads this, please enter #[[1]]#. I will let you have my #stretching, shrinking keepsake#.^I'm waiting for you.&--Dampé",
+                                                 /*german*/ "Wer immer dies liest, der möge folgenden Ort aufsuchen: #[[1]]#. Ihm gebe ich meinen langen, kurzen Schatz.^Ich warte!&Boris", //RANDOTODO color in whatever refers to the hookshot
+                                                 /*french*/ "Toi qui lit ce journal, rends-toi dans #[[1]]#. Et peut-être auras-tu droit à mon précieux #trésor#.^Je t'attends...&--Igor",
+                                                            {QM_RED, QM_RED}));
+
+    hintTextTable[RHT_GREG_HINT] = HintText(CustomMessage("By the way, if you're interested, I saw the shiniest #Green Rupee# somewhere in #[[1]]#.^It's said to have #mysterious powers#...^But then, it could just be another regular rupee.&Oh well.",
+                                               /*german*/ "",
+                                               /*french*/ "Au fait, si ça t'intéresse, j'ai aperçu le plus éclatant des #Rubis Verts# quelque part à #[[1]]#. On dit qu'il possède des pouvoirs mystérieux... Mais bon, ça pourrait juste être un autre rubis ordinaire.",//RANDOTODO color in mysterious powers
+                                                          {QM_GREEN, QM_RED, QM_RED}));
+
+    hintTextTable[RHT_SARIA_TALK_HINT] = HintText(CustomMessage("Did you feel the #surge of magic# recently? A mysterious bird told me it came from #[[1]]#.^You should check that place out, @!",
+                                                /*german*/ "",
+                                                /*french*/ "As-tu récemment ressenti une vague de #puissance magique#? Un mystérieux hibou m'a dit  qu'elle provenait du #[[1]]#. Tu devrais aller y jeter un coup d'oeil, @!",
+                                                           {QM_GREEN, QM_RED}));
+
+    hintTextTable[RHT_SARIA_SONG_HINT] = HintText(CustomMessage("Did you feel the #surge of magic# recently? A mysterious bird told me it came from #[[1]]#.^You should check that place out, @!\x0B",
+                                                /*german*/ "",
+                                                /*french*/ "As-tu récemment ressenti une vague de #puissance magique#? Un mystérieux hibou m'a dit  qu'elle provenait du #[[1]]#. Tu devrais aller y jeter un coup d'oeil, @!\x0B",
+                                                           {QM_GREEN, QM_RED}, {}, TEXTBOX_TYPE_BLUE));
+
+    hintTextTable[RHT_FISHING_POLE_HINT] = HintText(CustomMessage("^If I remember correctly, I lost it somewhere in #[[1]]#...&Let me know if you find it!",
+                                                                  {QM_RED}));
 
     /*--------------------------
-    | LIGHT ARROW LOCATION TEXT|
+    |    Static Entrance Hint   |
     ---------------------------*/
 
-    hintTable[RHT_LIGHT_ARROW_LOCATION_HINT] = HintText::OtherHint({
-        // obscure text
-        Text{
-            "Ha ha ha... You'll never beat me by reflecting my lightning bolts and unleashing the arrows from ",
-            /*french*/
-            "Ha ha ha... Pauvre fou! Tu ne pourras jamais me vaincre sans les flèches que j'ai cachées dans ",
-            /*spanish*/
-            "Ja, ja, ja... Nunca me derrotarás reflejando mis esferas de energía y desplegando la flecha de luz de " },
-    });
-
-    hintTable[RHT_SHEIK_LIGHT_ARROW_HINT] = HintText::SheikLine({
-        // obscure text
-        Text{
-            "I overheard Ganondorf say that he misplaced the %yLight Arrows%w in %r",
-            /*french*/
-            "J'ai entendu dire que Ganondorf aurait caché les %yFlèches de Lumière%w dans %r",
-            /*spanish*/
-            ""},
-    });
-
+    hintTextTable[RHT_WARP_SONG] = HintText(CustomMessage("Warp to&#[[1]]#?&" + TWO_WAY_CHOICE() + "#OK&No#",
+                                               /*german*/ "Zu&#[[1]]#?&" + TWO_WAY_CHOICE() + "#OK&No#",
+                                               /*french*/ "Se téléporter vers&#[[1]]#?&" + TWO_WAY_CHOICE() + "#OK!&Non#",
+                                                          {QM_RED, QM_GREEN}));
+                                                          
     /*--------------------------
-    |MASTER SWORD LOCATION TEXT|
+    |   STATIC LOCATION HINTS   |
     ---------------------------*/
 
-    hintTable[RHT_MASTER_SWORD_LOCATION_HINT] = HintText::MasterSword({
-        // obscure text
-        Text{"And even if you do, you'll never find the legendary blade hidden in ",
-            /*french*/
-            "Et même si tu les trouves, tu ne touveras jamais l'épée de légende cachée dans ",
-            /*spanish*/
-            "E incluso si lo haces, nunca encontrarás la espada legendaria escondida en " },
-    });
+    hintTextTable[RHT_MEDIGORON_HINT] = HintText(CustomMessage("How about buying #[[1]]# for #200 Rupees#?&" + TWO_WAY_CHOICE() + "#Buy&Don't buy#",
+                                                    /*german*/ "Möchtest du #[[1]]# für #200 Rubine# kaufen?&" + TWO_WAY_CHOICE() + "#Klar!&Nie im Leben!#",
+                                                    /*french*/ "Veux-tu acheter #[[1]]# pour #200 rubis#?&" + TWO_WAY_CHOICE() + "#Acheter&Ne pas acheter#",
+                                                               {QM_GREEN, QM_YELLOW, QM_GREEN}));
+                                                /*spanish*/ // ¿Me compras #[[1]]# por #200 rupias#?&" + TWO_WAY_CHOICE() + "#Comprar&No comprar#
 
-    hintTable[RHT_SHEIK_MASTER_SWORD_LOCATION_HINT] = HintText::SheikLine({
-        // obscure text
-        Text{"He also stole %gthe Master Sword%w and hid it in %r",
-            /*french*/
-            "Il aurait aussi volé %gl'épée de légende%w, qu'il aurait caché dans %r",
-            /*spanish*/
-            "Él también robó %gla Espada Maestra%w y la escondió en %r" },
-    });
+    hintTextTable[RHT_CARPET_SALESMAN_DIALOG_FIRST] = HintText(CustomMessage("Welcome!^I am selling stuff, strange and rare, from all over the world to everybody. Today's special is...^",
+                                                                  /*german*/ "Sei gegrüßt!^Ich verkaufe allerlei Kuriorisäten. Stets sonderliche und seltene Ware aus "
+                                                                             "aller Welt für jedermann. Das heutige Angebot bleibt...^#",
+                                                                  /*french*/ "Bienvenue!^Je vends des objets rares et merveilleux du monde entier. En spécial aujourd'hui...^"));
+                                                              /*spanish*/ // ¡Acércate!^Vendo productos extraños y difíciles de encontrar... De todo el mundo a todo el mundo. La oferta de hoy es...^#¡
 
-    hintTable[RHT_YOUR_POCKET] = HintText::Exclude({
-        // obscure text
-        Text{ "your pocket", /*french*/ "tes poches", /*spanish*/ "tu bolsillo" },
-    });
+    hintTextTable[RHT_CARPET_SALESMAN_DIALOG_MYSTERIOUS] = HintText(CustomMessage("Terrifying! I won't tell you what it is until I see the #money#...^How about #200 Rupees#?&&" +
+                                                                                  TWO_WAY_CHOICE() + "#Buy&Don't buy#",
+                                                                       /*german*/ "Furchterregend oder? Ich erzähle Euch mehr, wenn ich #Geld# sehe...^Wie wär's mit #200 Rubinen#?&&" +
+                                                                                  TWO_WAY_CHOICE() + "#Aber sicher!&Ich bin weg!#",
+                                                                       /*french*/ "Un concentré de puissance! Mais montre tes #rubis# avant que je te dise ce que c'est...^Disons #200 "
+                                                                                  "rubis#?&&" + TWO_WAY_CHOICE() + "#Acheter&Ne pas acheter#",
+                                                                                  {QM_RED, QM_YELLOW, QM_GREEN}));
+                                                                   /*spanish*/ // ¡Terrorífico! No te revelaré su nombre hasta que vea el #dinero#...^#200 rupias#, ¿qué te parece?&&" +
+                                                                               // TWO_WAY_CHOICE() + "#Comprar&No comprar#
 
-    /*--------------------------
-    |      OTHER HINT TEXT     |
-    ---------------------------*/
+    hintTextTable[RHT_CARPET_SALESMAN_DIALOG_HINTED] = HintText(CustomMessage("#[[1]]!# It's real, I promise! A lonely man such as myself wouldn't #lie# to you, hmm?^"
+                                                                              "How about #200 Rupees#?&&" + TWO_WAY_CHOICE() + "#Buy&Don't buy#",
+                                                                  /*german*/ "#[[1]]#! Ich kann versichern es ist ein aufrichtiges Angebot!^Ein einsamer Mann wie ich würde dich doch "
+                                                                             "nicht #anlügen#, oder?^Wie wär's mit #200 Rubinen#?&&" + TWO_WAY_CHOICE() + "#Aber sicher!&Ich bin weg!#",
+                                                                  /*french*/ "#[[1]]!# C'est vrai! J'te jure! Un gars comme moi ne te #mentirai# pas tu ne crois pas?^Disons #200 "
+                                                                             "rubis#?&&" + TWO_WAY_CHOICE() + "#Acheter&Ne pas acheter#",
+                                                                             {QM_GREEN, QM_YELLOW, QM_GREEN}));
 
-    hintTable[RHT_DAMPE_DIARY01] = HintText::OtherHint({
-        // obscure text
-        Text{
-            "Whoever reads this, please enter %r", 
-            /*french*/
-            "Toi qui lit ce journal, rends-toi dans %r",
-            /*german?*/
-            "Wer immer dies liest, der möge folgenden Ort aufsuchen: %r"},
-    });
+    hintTextTable[RHT_BEAN_SALESMAN_HINT] = HintText(CustomMessage("I tried to be a #magic bean# salesman, but it turns out my marketing skills weren't worth "
+                                                                   "beans!^Anyway, want to buy #[[1]]# for #60 Rupees#?&" + TWO_WAY_CHOICE() + "#Yes&No#",
+                                                        /*german*/ "Möchten Sie #[[1]]# für #60 Rubine#?&" + TWO_WAY_CHOICE() + "#Ja&Nein#",
+                                                        /*french*/ "J'ai essayé d'être un vendeur de #haricots magiques#, mais j'étais mauvais au niveau du marketing et ça "
+                                                                   "me courait sur le haricot...^Enfin bref, ça te dirait de m'acheter #[[1]]# pour #60 Rubis#?&" + TWO_WAY_CHOICE() + "#Oui&Non#",
+                                                                   {QM_RED, QM_GREEN, QM_YELLOW, QM_GREEN}));
 
-    hintTable[RHT_DAMPE_DIARY02] = HintText::OtherHint({
-        // obscure text
-        Text{
-            "%w. I will let you have my stretching, shrinking keepsake.^I'm waiting for you.&--Dampé",
-            /*french*/
-            "%w. Et peut-être auras-tu droit à mon précieux %rtrésor%w.^Je t'attends...&--Igor",
-            /*german?*/
-            "%w. Ihm gebe ich meinen langen, kurzen Schatz.^Ich warte!&Boris"},
-    });
+    hintTextTable[RHT_GRANNY_HINT] = HintText(CustomMessage("#[[1]]#! How about #100 Rupees#?&" + TWO_WAY_CHOICE() + "#Buy&Don't buy#",
+                                                /*german*/ "#[[1]]#! Sagen wir #100 Rubine#!&" + TWO_WAY_CHOICE() + "#Gerne!&Auf keinen Fall!#",
+                                                /*french*/ "#[[1]]#! Que dis-tu de #100 rubis#?&" + TWO_WAY_CHOICE() + "#Acheter&Ne pas acheter#",
+                                                           {QM_GREEN, QM_YELLOW, QM_GREEN}, {true}));
+                                             // /*spanish*/#[[1]]#. Vendo por #100 rupias#.&" + TWO_WAY_CHOICE() + "#Comprar&No comprar#
 
-    hintTable[RHT_GREG_HINT01] = HintText::OtherHint({
-        // obscure text
-        Text{
-            "By the way, if you're interested, I saw the shiniest %gGreen Rupee%w somewhere in%g ", 
-            /*french*/
-            "Au fait, si ça t'intéresse, j'ai aperçu le plus éclatant des %gRubis Verts%w quelque part à %g",
-            /*spanish*/
-            ""},
-    });
+    hintTextTable[RHT_HBA_HINT_SIGN] = HintText(CustomMessage("#Horseback Archery# Range Prizes:&1000: #[[1]]#&1500: #[[2]]#^@'s Record: #" + CustomMessage::POINTS(HS_HORSE_ARCHERY) + "#",
+                                                              {QM_RED, QM_GREEN, QM_GREEN, QM_GREEN}, {}, TEXTBOX_TYPE_WOODEN));
 
-    hintTable[RHT_GREG_HINT02] = HintText::OtherHint({
-        // obscure text
-        Text{
-            "%w.^It's said to have %rmysterious powers%w...^But then, it could just be another regular rupee.&Oh well.",
-            /*french*/
-            "%w. On dit qu'il possède des pouvoirs mystérieux... Mais bon, ça pourrait juste être un autre rubis ordinaire.",
-            /*spanish*/
-            ""},
-    });
+    hintTextTable[RHT_HBA_HINT_NOT_ON_HORSE] = HintText(CustomMessage("Hey, rookie!&Come back on your #horse# and take on then #Horseback Archery# challenge!^"
+                                                                      "Impress me with a high score of 1000 to win a #[[1]]# or score 1500 for my #[[2]]#!",
+                                                                      {QM_RED, QM_RED, QM_GREEN, QM_GREEN}));
 
-    hintTable[RHT_SARIA_TEXT01] = HintText::OtherHint({
-        // obscure text
-        Text{
-            "Did you feel the %gsurge of magic%w recently? A mysterious bird told me it came from %g",
-            /*french*/
-            "As-tu récemment ressenti une vague de %gpuissance magique%w? Un mystérieux hibou m'a dit  qu'elle provenait du %g",
-            /*spanish*/
-            ""},
-    });
+    hintTextTable[RHT_HBA_HINT_INITIAL] = HintText(CustomMessage("Hey, rookie!&Want to take on the #Horseback Archery# challenge?^"
+                                                                 "Impress me with a high score of 1000 to win a #[[1]]# or score 1500 for my #[[2]]#!\x0B",
+                                                                 {QM_RED, QM_GREEN, QM_GREEN}));
 
-    hintTable[RHT_SARIA_TEXT02] = HintText::OtherHint({
-        // obscure text
-        Text{
-            "%w.^You should check that place out, @!$C",
-            /*french*/
-            "%w. Tu devrais aller y jeter un coup d'oeil, @!$C",
-            /*spanish*/
-            "%w.$C"},
-    });
+    hintTextTable[RHT_HBA_HINT_HAVE_1000] = HintText(CustomMessage("Hey, newcomer!&Want to take on the #Horseback Archery# challenge?^"
+                                                                   "Prove yourself to be a horsemaster by scoring 1500 points to win  my #[[1]]#!\x0B",
+                                                                   {QM_RED, QM_GREEN}));
 
-    hintTable[RHT_WARP_TO] = HintText::OtherHint({
-        Text{
-            "Warp to&#",
-            "Se téléporter vers&#",
-            "",
-            "Zu&#"},
-        });
-    hintTable[RHT_WARP_CHOICE] = HintText::OtherHint({
-        Text{
-            "#?&" + TWO_WAY_CHOICE() + "#OK&No#",
-            "#?&" + TWO_WAY_CHOICE() + "#OK!&Non#",
-            "###",
-            "#?&" + TWO_WAY_CHOICE() + "#OK&No#"
-        }
-    });
+    hintTextTable[RHT_MALON_HINT_HOW_IS_EPONA] = HintText(CustomMessage("@! You should come back with Epona and try to beat my time on the #Obsticle Course#!^"
+                                                                        "If you beat my time, I'll give you my favourite #cow# Elsie and her toy #[[1]]#!",
+                                                                        {QM_RED, QM_BLUE, QM_GREEN}));
 
-    hintTable[RHT_FROGS_HINT01] = HintText::OtherHint({Text{
-        "Some frogs holding #",
-        "Des grenouilles se trouvant sous l'eau vous fixent attentivement, tenant fermement #",
-        "",
-        "Unter Wasser gibt es Frösche, die #"
-    }});
-    hintTable[RHT_FROGS_HINT02] = HintText::OtherHint({Text{
-        "# are looking at you from underwater...",
-        "#.",
-        "",
-        "# bei sich haben und Dich neugierig beobachten..."
-    }});
+    hintTextTable[RHT_MALON_HINT_OBSTICLE_COURSE] = HintText(CustomMessage("How about trying the #Obsticle Course?# If you beat my time I'll let you keep my favourite #cow# Elsie and her toy #[[1]]#!^"
+                                                                           "Challenge the #Obsticle Course?#&\x1B&#Let's go&No thanks#",
+                                                                           {QM_RED, QM_BLUE, QM_GREEN, QM_RED, QM_GREEN}));
 
-    hintTable[RHT_FISHING_POLE_HINT01] = HintText::OtherHint({
-        // obscure text
-        Text{"^If I remember correctly, I lost it somewhere in %r",
-        /*french*/
-        "",
-        /*spanish*/
-        "" }
-    });
+    hintTextTable[RHT_MALON_HINT_TURNING_EVIL] = HintText(CustomMessage("@? Is that you? ^If I ran the ranch, I'd build an #Obsticle Course#, and whoever gets the best time would win a #cow#!^"
+                                                                        "Elsie loves sharing her #[[1]]# with new people, It'll be fun!^...But Ingo won't let me...",
+                                                                        {QM_RED, QM_BLUE, QM_GREEN}));
 
-    hintTable[RHT_FISHING_POLE_HINT02] = HintText::OtherHint({
-        // obscure text
-        Text{"%w...&Let me know if you find it!",
-        /*french*/
-        "",
-        /*spanish*/
-        "" }
-    });
+    hintTextTable[RHT_MALON_HINT_INGO_TEMPTED] = HintText(CustomMessage("@! You should come back in the morning and try to beat my time on the #Obsticle Course#!^"
+                                                                        "If you beat my time, I'll give you my favourite #cow# Elsie and her toy #[[1]]#!",
+                                                                        {QM_RED, QM_BLUE, QM_GREEN}));
+
+    hintTextTable[RHT_CHICKENS_HINT] = HintText(CustomMessage("You! Please!&Bring my Cucco's back to my pen!&I'll give you my #[[1]]#!",
+                                                              {QM_GREEN}));
+
+    hintTextTable[RHT_BIG_POES_HINT] = HintText(CustomMessage("You have #\x1E\x01 Poe Points#! Reach 1000 and you'll get a #[[1]]#!",
+                                                              {QM_YELLOW, QM_GREEN}));
+
+    hintTextTable[RHT_BIGGORON_HINT] = HintText(CustomMessage("Arrrrrre you here to claim my finest #[[1]]#? Shoooooow me your #Claim Check#.",
+                                                              {QM_GREEN, QM_RED}));
+
+    hintTextTable[RHT_FROGS_HINT] = HintText(CustomMessage("Some frogs holding #[[1]]# are looking at you from underwater...",
+                                                /*german*/ "Unter Wasser gibt es Frösche, die #[[1]]# bei sich haben und Dich neugierig beobachten...",
+                                                /*french*/ "Des grenouilles se trouvant sous l'eau vous fixent attentivement, tenant fermement #[[1]]#.",
+                                                           {QM_GREEN}));
+
+    hintTextTable[RHT_SKULLS_HINT] = HintText(CustomMessage("Yeaaarrgh! I'm cursed!!^Please save me by destroying #[[d]] Spiders of the Curse# and I will give you my #[[1]]#!",
+                                                 /*german*/ "Yeaaarrgh! Ich bin verflucht!^Bitte rette mich, indem du #[[d]] Skulltulas# zerstörst und ich werde dir dafür #[[1]]# geben!",
+                                                 /*french*/ "Yeaaarrgh! Je suis maudit!^Détruit encore #[[d]] Araignées de la Malédiction# et j'aurai quelque chose à te donner! #([[1]])#",
+                                                            {QM_YELLOW, QM_GREEN}));
 
     /*--------------------------
     |      GANON LINE TEXT     |
     ---------------------------*/
 
-    hintTable[RHT_GANON_LINE01] = HintText::GanonLine({
-        // obscure text
-        Text{ "Oh! It's @.&I was expecting someone called Sheik.&Do you know what happened to them?",
-              /*french*/ "Ah, c'est @.&J'attendais un certain Sheik.&Tu sais ce qui lui est arrivé?",
-              /*spanish*/
-              "¡Oh! Pero si es @.&Estaba esperando a alguien llamado Sheik. ¿Sabes qué puede haberle pasado?" },
-    });
+    hintTextTable[RHT_GANON_JOKE01] = HintText(CustomMessage("Oh! It's @.&I was expecting someone called Sheik.&Do you know what happened to them?",
+                                                  /*german*/ "",
+                                                  /*french*/ "Ah, c'est @.&J'attendais un certain Sheik.&Tu sais ce qui lui est arrivé?"));
+                                               // /*spanish*/¡Oh! Pero si es @.&Estaba esperando a alguien llamado Sheik. ¿Sabes qué puede haberle pasado?
 
-    hintTable[RHT_GANON_LINE02] = HintText::GanonLine({
-        // obscure text
-        Text{ "I knew I shouldn't have put the key on the other side of my door.",
-              /*french*/ "J'aurais dû garder la clé ici. Hélas...",
-              /*spanish*/ "Sabía que no tendría que haber dejado la llave al otro lado de la puerta." },
-    });
+    hintTextTable[RHT_GANON_JOKE02] = HintText(CustomMessage("I knew I shouldn't have put the key on the other side of my door.",
+                                                  /*german*/ "",
+                                                  /*french*/ "J'aurais dû garder la clé ici. Hélas..."));
+                                               // /*spanish*/Sabía que no tendría que haber dejado la llave al otro lado de la puerta.
 
-    hintTable[RHT_GANON_LINE03] = HintText::GanonLine({
-        // obscure text
-        Text{ "Looks like it's time for a round of tennis.",
-              /*french*/ "C'est l'heure de jouer au tennis.",
-              /*spanish*/ "Parece que es hora de una pachanga de tenis." },
-    });
+    hintTextTable[RHT_GANON_JOKE03] = HintText(CustomMessage("Looks like it's time for a round of tennis.",
+                                                  /*german*/ "",
+                                                  /*french*/ "C'est l'heure de jouer au tennis."));
+                                               // /*spanish*/Parece que es hora de una pachanga de tenis.
 
-    hintTable[RHT_GANON_LINE04] = HintText::GanonLine({
-        // obscure text
-        Text{ "You'll never deflect my bolts of energy with your sword, then shoot me with those Light Arrows you "
-              "happen to have.",
-              /*french*/
-              "Ne perds pas ton temps à frapper mes éclairs d'énergie avec ton épée et me tirer avec tes flèches de "
-              "Lumière!",
-              /*spanish*/
-              "Nunca reflejarás mis esferas de energía con tu espada, para después dispararme con las flechas de luz "
-              "que tendrás." },
-    });
+    hintTextTable[RHT_GANON_JOKE04] = HintText(CustomMessage("You'll never deflect my bolts of energy with your sword, then shoot me with those Light Arrows you happen to have.",
+                                                  /*german*/ "",
+                                                  /*french*/ "Ne perds pas ton temps à frapper mes éclairs d'énergie avec ton épée et me tirer avec tes flèches de Lumière!"));
+                                               // /*spanish*/Nunca reflejarás mis esferas de energía con tu espada, para después dispararme con las flechas de luz que tendrás.
 
-    hintTable[RHT_GANON_LINE05] = HintText::GanonLine({
-        // obscure text
-        Text{ "Why did I leave my trident back in the desert?",
-              /*french*/ "Sale bêtise... Et j'ai oublié mon trident dans le désert!",
-              /*spanish*/ "Santa Hylia... ¿Por qué me habré dejado el tridente en el desierto?" },
-    });
+    hintTextTable[RHT_GANON_JOKE05] = HintText(CustomMessage("Why did I leave my trident back in the desert?",
+                                                  /*german*/ "",
+                                                  /*french*/ "Sale bêtise... Et j'ai oublié mon trident dans le désert!"));
+                                               // /*spanish*/Santa Hylia... ¿Por qué me habré dejado el tridente en el desierto?
 
-    hintTable[RHT_GANON_LINE06] = HintText::GanonLine({
-        // obscure text
-        Text{ "Zelda is probably going to do something stupid, like send you back to your own timeline.^So this is "
-              "quite meaningless. Do you really want to save this moron?",
-              /*french*/
-              "Même si je suis vaincu... Zelda te renverra dans ton ère, et je reviendrai conquérir!^Telle est la "
-              "prophécie d'Hyrule Historia!",
-              /*spanish*/
-              "Seguro que Zelda trata de hacer alguna tontería, como enviarte de vuelta a tu línea temporal.^No tiene "
-              "ningún sentido alguno. ¿De verdad quieres salvar a esa tonta?" },
-    });
+    hintTextTable[RHT_GANON_JOKE06] = HintText(CustomMessage("Zelda is probably going to do something stupid, like send you back to your own timeline.^So this is "
+                                                             "quite meaningless. Do you really want to save this moron?",
+                                                  /*german*/ "",
+                                                  /*french*/ "Même si je suis vaincu... Zelda te renverra dans ton ère, et je reviendrai conquérir!^Telle est la "
+                                                             "prophécie d'Hyrule Historia!"));
+                                               // /*spanish*/Seguro que Zelda trata de hacer alguna tontería, como enviarte de vuelta a tu línea temporal.^No tiene
+                                                         // ningún sentido alguno. ¿De verdad quieres salvar a esa tonta?
 
-    hintTable[RHT_GANON_LINE07] = HintText::GanonLine({
-        // obscure text
-        Text{ "What about Zelda makes you think&she'd be a better ruler than I?^I saved Lon Lon Ranch,&fed the "
-              "hungry,&and my castle floats.",
-              /*french*/
-              "Zelda ne sera jamais un meilleur monarque que moi!^J'ai un château volant, mes sujets sont des belles "
-              "amazones... et mes Moblins sont clairement plus puissants que jamais!",
-              /*spanish*/
-              "¿Qué te hace pensar que Zelda gobierna mejor que yo?^Yo he salvado el Rancho Lon Lon,&he alimentado a "
-              "los hambrientos&y hasta hago que mi castillo flote." },
-    });
+    hintTextTable[RHT_GANON_JOKE07] = HintText(CustomMessage("What about Zelda makes you think&she'd be a better ruler than I?^I saved Lon Lon Ranch,&fed the "
+                                                             "hungry,&and my castle floats.",
+                                                  /*german*/ "",
+                                                  /*french*/ "Zelda ne sera jamais un meilleur monarque que moi!^J'ai un château volant, mes sujets sont des belles "
+                                                             "amazones... et mes Moblins sont clairement plus puissants que jamais!"));
+                                               // /*spanish*/¿Qué te hace pensar que Zelda gobierna mejor que yo?^Yo he salvado el Rancho Lon Lon,&he alimentado a
+                                                          // los hambrientos&y hasta hago que mi castillo flote.
 
-    hintTable[RHT_GANON_LINE08] = HintText::GanonLine({
-        // obscure text
-        Text{ "I've learned this spell,&it's really neat,&I'll keep it later&for your treat!",
-              /*french*/
-              "Gamin, ton destin achève,&sous mon sort tu périras!&Cette partie ne fut pas brève,&et cette mort, tu "
-              "subiras!",
-              /*spanish*/
-              "Veamos ahora que harás,&la batalla ha de comenzar,&te enviaré de una vez al más allá,&¿listo para "
-              "afrontar la verdad?" },
-    });
+    hintTextTable[RHT_GANON_JOKE08] = HintText(CustomMessage("I've learned this spell,&it's really neat,&I'll keep it later&for your treat!",
+                                                  /*german*/ "",
+                                                  /*french*/ "Gamin, ton destin achève,&sous mon sort tu périras!&Cette partie ne fut pas brève,&et cette mort, tu subiras!"));
+                                               // /*spanish*/Veamos ahora que harás,&la batalla ha de comenzar,&te enviaré de una vez al más allá,&¿listo para
+                                                          // afrontar la verdad?
 
-    hintTable[RHT_GANON_LINE09] = HintText::GanonLine({
-        // obscure text
-        Text{ "Many tricks are up my sleeve,&to save yourself&you'd better leave!",
-              /*french*/ "Sale petit garnement,&tu fais erreur!&C'est maintenant que marque&ta dernière heure!",
-              /*spanish*/ "¿No osarás a mí enfrentarte?&Rimas aparte,&¡voy a matarte!" },
-    });
+    hintTextTable[RHT_GANON_JOKE09] = HintText(CustomMessage("Many tricks are up my sleeve,&to save yourself&you'd better leave!",
+                                                  /*german*/ "",
+                                                  /*french*/ "Sale petit garnement,&tu fais erreur!&C'est maintenant que marque&ta dernière heure!"));
+                                               // /*spanish*/¿No osarás a mí enfrentarte?&Rimas aparte,&¡voy a matarte!
 
-    hintTable[RHT_GANON_LINE10] = HintText::GanonLine({
-        // obscure text
-        Text{ "After what you did to Koholint Island, how can you call me the bad guy?",
-              /*french*/ "J'admire ce que tu as fait à l'Île Koholint... Toi et moi, nous devrions faire équipe!",
-              /*spanish*/ "Después de lo que le hiciste a la Isla Koholint, ¿cómo te atreves a llamarme malvado?" },
-    });
+    hintTextTable[RHT_GANON_JOKE10] = HintText(CustomMessage("After what you did to Koholint Island, how can you call me the bad guy?",
+                                                  /*german*/ "",
+                                                  /*french*/ "J'admire ce que tu as fait à l'Île Koholint... Toi et moi, nous devrions faire équipe!"));
+                                               // /*spanish*/Después de lo que le hiciste a la Isla Koholint, ¿cómo te atreves a llamarme malvado?
 
-    hintTable[RHT_GANON_LINE11] = HintText::GanonLine({
-        // obscure text
-        Text{ "Today, let's begin down&'The Hero is Defeated' timeline.",
-              /*french*/
-              "Si tu me vaincs, Hyrule sera englouti... mais si tu meurs, on aura A Link to the Past, le meilleur opus "
-              "de la série!",
-              /*spanish*/
-              "Hoy daremos lugar a la línea temporal del Héroe Derrotado.&¡Prepárate para el culmen de esta saga!" },
-    });
+    hintTextTable[RHT_GANON_JOKE10] = HintText(CustomMessage("Today, let's begin down&'The Hero is Defeated' timeline.",
+                                                  /*german*/ "",
+                                                  /*french*/ "Si tu me vaincs, Hyrule sera englouti... mais si tu meurs, on aura A Link to the Past, le meilleur opus "
+                                                             "de la série!"));
+                                               // /*spanish*/Hoy daremos lugar a la línea temporal del Héroe Derrotado.&¡Prepárate para el culmen de esta saga!
 
-    /*--------------------------
-    |      MERCHANTS' ITEMS     |
-    ---------------------------*/
+   /*--------------------------
+   |     Misc utilities       |
+   ---------------------------*/
+   
+    hintTextTable[RHT_YOUR_POCKET] = HintText(CustomMessage("your pocket",
+                                                 /*german*/ "",
+                                                 /*french*/ "tes poches"));
+                                              // /*spanish*/tu bolsillo
 
-    hintTable[RHT_BEAN_SALESMAN_FIRST] = HintText::MerchantsDialogs({
-        Text{
-            "I tried to be a #magic bean#&salesman, but it turns out my&marketing skills weren't worth&"
-            "beans!^Anyway, want to buy #",
-            /*french*/ "J'ai essayé d'être un vendeur&de #haricots magiques#, mais&j'étais mauvais au niveau du&marketing et ça "
-            "me courait sur&le haricot...^Enfin bref, ça te dirait de m'acheter #",
-            /*spanish*/ "",
-            /*german*/ "Möchten Sie #"
-        }
-    });
-    hintTable[RHT_BEAN_SALESMAN_SECOND] = HintText::MerchantsDialogs({
-        Text{
-            "# for #60 Rupees#?&" + TWO_WAY_CHOICE() + "#Yes&No#",
-            /*french*/ "# pour #60 Rubis#?&" + TWO_WAY_CHOICE() + "#Oui&Non#",
-            /*spanish*/ "",
-            /*german*/ "# für #60 Rubine#?&" + TWO_WAY_CHOICE() + "#Ja&Nein#"
-        }
-    });
+    hintTextTable[RHT_DUNGEON_ORDINARY] = HintText(CustomMessage(" It's ordinary.",
+                                                      /*german*/ "&Sieht aus wie immer.",
+                                                      /*french*/ "&Elle vous semble %rordinaire%w."));
 
-    hintTable[RHT_MEDIGORON_DIALOG_FIRST] = HintText::MerchantsDialogs({
-        // obscure text
-        Text{ "How about buying #",
-              /*french*/ "Veux-tu acheter #",
-              /*spanish*/ "¿Me compras #",
-              /*german*/ "Möchtest du #" },
-    });
+    hintTextTable[RHT_DUNGEON_MASTERFUL] = HintText(CustomMessage(" It's masterful!",
+                                                       /*german*/ "&Man kann darauf die Worte&%r\"Master Quest\"%w entziffern...",
+                                                       /*french*/ "&Étrange... les mots %r\"Master&Quest\"%w sont gravés dessus."));
 
-    hintTable[RHT_MEDIGORON_DIALOG_SECOND] = HintText::MerchantsDialogs({
-        // obscure text
-        Text{ "# for #200 Rupees#?&" + TWO_WAY_CHOICE() + "#Buy&Don't buy#",
-              /*french*/ "# pour #200 rubis#?&" + TWO_WAY_CHOICE() + "#Acheter&Ne pas acheter#",
-              /*spanish*/ "# por #200 rupias#?&" + TWO_WAY_CHOICE() + "#Comprar&No comprar#",
-              /*german*/ "# für #200 Rubine# kaufen?&" + TWO_WAY_CHOICE() + "#Klar!&Nie im Leben!#" },
-    });
-
-    hintTable[RHT_CARPET_SALESMAN_DIALOG_FIRST] = HintText::MerchantsDialogs({
-        // obscure text
-        Text{ "Welcome!^I am selling stuff, strange and rare, from all over the world to everybody. Today's special "
-              "is...^#",
-              /*french*/
-              "Bienvenue!^Je vends des objets rares et merveilleux du&monde entier. En spécial aujourd'hui...^#",
-              /*spanish*/
-              "¡Acércate!^Vendo productos extraños y difíciles de&encontrar... De todo el mundo a todo el&mundo. La "
-              "oferta de hoy es...^#¡",
-              /* german */
-              "Sei gegrüßt!^Ich verkaufe allerlei Kuriorisäten.&Stets sonderliche und seltene Ware&aus "
-              "aller Welt für jedermann.&Das heutige Angebot bleibt...^#" },
-    });
-
-    hintTable[RHT_CARPET_SALESMAN_DIALOG_MYSTERIOUS] = HintText::MerchantsDialogs({
-        // obscure text
-        Text{ "!# Terrifying! I won't tell you what it is until I see the #money#...^How about #200 Rupees#?&&" +
-                  TWO_WAY_CHOICE() + "#Buy&Don't buy#",
-              /*french*/
-              "!# Un concentré de puissance! Mais montre tes #rubis# avant que je te dise ce que c'est...^Disons #200 "
-              "rubis#?&&" +
-                  TWO_WAY_CHOICE() + "#Acheter&Ne pas acheter#",
-              /*spanish*/
-              "!# ¡Terrorífico! No te revelaré su nombre hasta que vea el #dinero#...^#200 rupias#, ¿qué te parece?&&" +
-                  TWO_WAY_CHOICE() + "#Comprar&No comprar#",
-              /*german*/
-              "!# Furchterregend oder? Ich erzähle Euch mehr, wenn ich #Geld# sehe...^Wie wär's mit #200 Rubinen#?&&" +
-                  TWO_WAY_CHOICE() + "#Aber sicher!&Ich bin weg!#" },
-    });
-
-    hintTable[RHT_CARPET_SALESMAN_DIALOG_HINTED] = HintText::MerchantsDialogs({
-        // obscure text
-        Text{ "!# It's real, I promise! A lonely man such as myself wouldn't #lie# to you, hmm?^"
-              "How about #200 Rupees#?&&" + TWO_WAY_CHOICE() + "#Buy&Don't buy#",
-              /*french*/
-              "!# C'est vrai! J'te jure! Un gars comme moi ne te #mentirai# pas tu ne crois pas?^Disons #200 "
-              "rubis#?&&" + TWO_WAY_CHOICE() + "#Acheter&Ne pas acheter#",
-              /*spanish*/ // TODO: Flesh this out with the flavor text if we ever support spanish translations
-              "#!^###200 rupias#, ¿qué te parece?&&" + TWO_WAY_CHOICE() + "#Comprar&No comprar#",
-              /*german*/
-              "#! Ich kann versichern es ist ein aufrichtiges Angebot!^Ein einsamer Mann wie ich würde dich doch "
-              "nicht #anlügen#, oder?^Wie wär's mit #200 Rubinen#?&&" + TWO_WAY_CHOICE() + 
-              "#Aber sicher!&Ich bin weg!#" },
-    });
-
-    hintTable[RHT_CARPET_SALESMAN_DIALOG_FINAL] = HintText::MerchantsDialogs({
-        // obscure text
-        Text{ "Finally! Now I can go back to being &an %rarms dealer%w!",
-              /*french*/ "Squalala! Je vais enfin pouvoir &%rprendre des vacances%w!",
-              /*spanish*/ "", // TODO: Flesh this out with the flavor text if we ever support spanish translations
-              /*german*/ "Endlich! Schon bald kann ich wieder &%rKrabbelminen-Händler%w sein!" },
-    });
-
-    hintTable[RHT_GRANNY_DIALOG] = HintText::MerchantsDialogs({
-        // obscure text
-        Text{ "! How about #100 Rupees#?&" + TWO_WAY_CHOICE() + "#Buy&Don't buy#",
-              /*french*/ "! Que dis-tu de #100 rubis#?&" + TWO_WAY_CHOICE() + "#Acheter&Ne pas acheter#",
-              /*spanish*/ ". Vendo por #100 rupias#.&" + TWO_WAY_CHOICE() + "#Comprar&No comprar#",
-              /*german*/ "! Sagen wir #100 Rubine#!&" + TWO_WAY_CHOICE() + "#Gerne!&Auf keinen Fall!#" },
-    });
 }
-
-int32_t StonesRequiredBySettings() {
-    auto ctx = Rando::Context::GetInstance();
-    int32_t stones = 0;
-    if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_STONES)) {
-        stones = std::max<int32_t>({ stones, (int32_t)ctx->GetOption(RSK_RAINBOW_BRIDGE_STONE_COUNT).Value<uint8_t>() });
-    }
-    if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_DUNGEON_REWARDS)) {
-        stones = std::max<int32_t>({ stones, (int32_t)ctx->GetOption(RSK_RAINBOW_BRIDGE_REWARD_COUNT).Value<uint8_t>() - 6 });
-    }
-    if ((ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_DUNGEONS)) && (ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_END_OF_DUNGEON))) {
-        stones = std::max<int32_t>({ stones, (int32_t)ctx->GetOption(RSK_RAINBOW_BRIDGE_DUNGEON_COUNT).Value<uint8_t>() - 6 });
-    }
-    if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_STONES)) {
-        stones = std::max<int32_t>({ stones, (int32_t)ctx->GetOption(RSK_LACS_STONE_COUNT).Value<uint8_t>() });
-    }
-    if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_STONES)) {
-        stones = std::max<int32_t>({ stones, (int32_t)ctx->GetOption(RSK_LACS_REWARD_COUNT).Value<uint8_t>() - 6 });
-    }
-    if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_DUNGEONS)) {
-        stones = std::max<int32_t>({ stones, (int32_t)ctx->GetOption(RSK_LACS_DUNGEON_COUNT).Value<uint8_t>() - 6 });
-    }
-    return stones;
-}
-
-int32_t MedallionsRequiredBySettings() {
-    auto ctx = Rando::Context::GetInstance();
-    int32_t medallions = 0;
-    if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_MEDALLIONS)) {
-        medallions = std::max<int32_t>({ medallions, (int32_t)ctx->GetOption(RSK_RAINBOW_BRIDGE_MEDALLION_COUNT).Value<uint8_t>() });
-    }
-    if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_DUNGEON_REWARDS)) {
-        medallions = std::max<int32_t>({ medallions, (int32_t)ctx->GetOption(RSK_RAINBOW_BRIDGE_REWARD_COUNT).Value<uint8_t>() - 3 });
-    }
-    if ((ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_DUNGEONS)) && (ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_END_OF_DUNGEON))) {
-        medallions = std::max<int32_t>({ medallions, (int32_t)ctx->GetOption(RSK_RAINBOW_BRIDGE_DUNGEON_COUNT).Value<uint8_t>() - 3 });
-    }
-    if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_MEDALLIONS)) {
-        medallions = std::max<int32_t>({ medallions, (int32_t)ctx->GetOption(RSK_LACS_MEDALLION_COUNT).Value<uint8_t>() });
-    }
-    if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_REWARDS)) {
-        medallions = std::max<int32_t>({ medallions, (int32_t)ctx->GetOption(RSK_LACS_REWARD_COUNT).Value<uint8_t>() - 3 });
-    }
-    if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_DUNGEONS)) {
-        medallions = std::max<int32_t>({ medallions, (int32_t)ctx->GetOption(RSK_LACS_DUNGEON_COUNT).Value<uint8_t>() - 3 });
-    }
-    return medallions;
-}
-
-int32_t TokensRequiredBySettings() {
-    auto ctx = Rando::Context::GetInstance();
-    int32_t tokens = 0;
-    if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_TOKENS)) {
-        tokens = std::max<int32_t>({ tokens, (int32_t)ctx->GetOption(RSK_RAINBOW_BRIDGE_TOKEN_COUNT).Value<uint8_t>() });
-    }
-    if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_TOKENS)) {
-        tokens = std::max<int32_t>({ tokens, (int32_t)ctx->GetOption(RSK_LACS_TOKEN_COUNT).Value<uint8_t>() });
-    }
-    return tokens;
-}
-
-std::array<RandomizerHintTextKey, RA_MAX> AreaHintTextKeys = {
-    RHT_NONE,
-    RHT_LINKS_POCKET,
-    RHT_KOKIRI_FOREST,
-    RHT_THE_LOST_WOODS,
-    RHT_SACRED_FOREST_MEADOW,
-    RHT_HYRULE_FIELD,
-    RHT_LAKE_HYLIA,
-    RHT_GERUDO_VALLEY,
-    RHT_GERUDO_FORTRESS,
-    RHT_HAUNTED_WASTELAND,
-    RHT_DESERT_COLOSSUS,
-    RHT_THE_MARKET,
-    RHT_TEMPLE_OF_TIME,
-    RHT_HYRULE_CASTLE,
-    RHT_OUTSIDE_GANONS_CASTLE,
-    RHT_CASTLE_GROUNDS,
-    RHT_KAKARIKO_VILLAGE,
-    RHT_THE_GRAVEYARD,
-    RHT_DEATH_MOUNTAIN_TRAIL,
-    RHT_GORON_CITY,
-    RHT_DEATH_MOUNTAIN_CRATER,
-    RHT_ZORAS_RIVER,
-    RHT_ZORAS_DOMAIN,
-    RHT_ZORAS_FOUNTAIN,
-    RHT_LON_LON_RANCH,
-    RHT_DEKU_TREE,
-    RHT_DODONGOS_CAVERN,
-    RHT_JABU_JABUS_BELLY,
-    RHT_FOREST_TEMPLE,
-    RHT_FIRE_TEMPLE,
-    RHT_WATER_TEMPLE,
-    RHT_SPIRIT_TEMPLE,
-    RHT_SHADOW_TEMPLE,
-    RHT_BOTTOM_OF_THE_WELL,
-    RHT_ICE_CAVERN,
-    RHT_GERUDO_TRAINING_GROUND,
-    RHT_GANONS_CASTLE
-};
-
-std::array<ConditionalAlwaysHint, 12> conditionalAlwaysHints = {
-    std::make_pair(RC_MARKET_10_BIG_POES,
-                   []() {
-                       auto ctx = Rando::Context::GetInstance();
-                       return ctx->GetOption(RSK_BIG_POE_COUNT).Value<uint8_t>() >= 3 && !ctx->GetOption(RSK_BIG_POES_HINT);
-                   }), // Remember, the option's value being 3 means 4 are required
-    std::make_pair(RC_DEKU_THEATER_MASK_OF_TRUTH,
-                   []() {
-                       auto ctx = Rando::Context::GetInstance();
-                       return !ctx->GetOption(RSK_COMPLETE_MASK_QUEST);
-                   }),
-    std::make_pair(RC_SONG_FROM_OCARINA_OF_TIME, []() { return StonesRequiredBySettings() < 2; }),
-    std::make_pair(RC_HF_OCARINA_OF_TIME_ITEM, []() { return StonesRequiredBySettings() < 2; }),
-    std::make_pair(RC_SHEIK_IN_KAKARIKO, []() { return MedallionsRequiredBySettings() < 5; }),
-    std::make_pair(RC_DMT_TRADE_CLAIM_CHECK,
-                   []() {
-                       auto ctx = Rando::Context::GetInstance();
-                       return !ctx->GetOption(RSK_BIGGORON_HINT);
-                   }),
-    std::make_pair(RC_KAK_30_GOLD_SKULLTULA_REWARD,
-                   []() {
-                       auto ctx = Rando::Context::GetInstance();
-                       return TokensRequiredBySettings() < 30 && !ctx->GetOption(RSK_KAK_30_SKULLS_HINT);
-                   }),
-    std::make_pair(RC_KAK_40_GOLD_SKULLTULA_REWARD,
-                   []() {
-                       auto ctx = Rando::Context::GetInstance();
-                       return TokensRequiredBySettings() < 40 && !ctx->GetOption(RSK_KAK_40_SKULLS_HINT);
-                   }),
-    std::make_pair(RC_KAK_50_GOLD_SKULLTULA_REWARD,
-                   []() {
-                       auto ctx = Rando::Context::GetInstance();
-                       return TokensRequiredBySettings() < 50 && !ctx->GetOption(RSK_KAK_50_SKULLS_HINT);
-                   }),
-    std::make_pair(RC_ZR_FROGS_OCARINA_GAME,
-                   []() {
-                       auto ctx = Rando::Context::GetInstance();
-                       return !ctx->GetOption(RSK_FROGS_HINT);
-                   }),
-    std::make_pair(RC_KF_LINKS_HOUSE_COW,
-                   []() {
-                       auto ctx = Rando::Context::GetInstance();
-                       return !ctx->GetOption(RSK_MALON_HINT);
-                   }),
-    std::make_pair(RC_KAK_100_GOLD_SKULLTULA_REWARD,
-                   []() {
-                       auto ctx = Rando::Context::GetInstance();
-                       return !ctx->GetOption(RSK_KAK_100_SKULLS_HINT);
-                   }),
-};
-
-const HintText& Hint(const RandomizerHintTextKey hintKey) {
-    return hintTable[hintKey];
-}
-
-const HintText& Hint(const RandomizerArea area) {
-    return hintTable[AreaHintTextKeys[area]];
-}
-
-std::vector<HintText> GetHintCategory(HintCategory category) {
-
-    std::vector<HintText> hintsInCategory = {};
-
-    for (const auto& hint : hintTable) {
-        if (hint.GetType() == category) {
-            hintsInCategory.push_back(hint);
-        }
-    }
-    return hintsInCategory;
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list.hpp b/soh/soh/Enhancements/randomizer/3drando/hint_list.hpp
deleted file mode 100644
index 69e66e6db..000000000
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#include "hints.hpp"
-
-#include <vector>
-
-extern std::array<HintText, RHT_MAX> hintTable;
-
-void HintTable_Init();
-const HintText& Hint(const RandomizerHintTextKey hintKey);
-const HintText& Hint(const RandomizerArea area);
-std::vector<HintText> GetHintCategory(HintCategory category);
-
-void HintTable_Init_Item();
-void HintTable_Init_Exclude_Overworld();
-void HintTable_Init_Exclude_Dungeon();
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_dungeon.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_dungeon.cpp
index 934a8f56c..b86b8f33e 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_dungeon.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_dungeon.cpp
@@ -1,1964 +1,1999 @@
-#include "../hint_list.hpp"
+#include "../../static_data.h"
+#include "../hints.hpp"
+#include "../../../custom-message/CustomMessageManager.h"
 
-void HintTable_Init_Exclude_Dungeon() {
+namespace Rando {
+void StaticData::HintTable_Init_Exclude_Dungeon() {
   /*--------------------------
   |        DEKU TREE         |
   ---------------------------*/
-    hintTable[RHT_DEKU_TREE_MAP_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"in the #center of the Deku Tree# lies", /*french*/"#le coeur de l'Arbre Mojo# recèle", /*spanish*/"al #centro del Gran Árbol Deku# yace"},
-  });
+   hintTextTable[RHT_DEKU_TREE_MAP_CHEST] = HintText(CustomMessage("They say that in the #center of the Deku Tree# lies #[[1]]#.",
+                                                         /*german*/ "",
+                                                         /*french*/ "Selon moi, #le coeur de l'Arbre Mojo# recèle #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                      // /*spanish*/ Según dicen, al #centro del Gran Árbol Deku# yace #[[1]]#.
 
-    hintTable[RHT_DEKU_TREE_SLINGSHOT_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #treasure guarded by a scrub# in the Deku Tree is", /*french*/"le #trésor protégé par une peste# dans l'Arbre Mojo est", /*spanish*/"un #deku del Gran Árbol Deku# esconde"},
-  });
+    hintTextTable[RHT_DEKU_TREE_SLINGSHOT_CHEST] = HintText(CustomMessage("They say that the #treasure guarded by a scrub# in the Deku Tree is #[[1]]#.",
+                                                               /*german*/ "",
+                                                               /*french*/ "Selon moi, le #trésor protégé par une peste# dans l'Arbre Mojo est #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                            // /*spanish*/ Según dicen, un #deku del Gran Árbol Deku# esconde #[[1]]#.
 
-    hintTable[RHT_DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #treasure guarded by a scrub# in the Deku Tree is", /*french*/"le #trésor protégé par une peste# dans l'Arbre Mojo est", /*spanish*/"un #deku del Gran Árbol Deku# esconde"},
-  });
+    hintTextTable[RHT_DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST] = HintText(CustomMessage("They say that the #treasure guarded by a scrub# in the Deku Tree is #[[1]]#.",
+                                                                         /*german*/ "",
+                                                                         /*french*/ "Selon moi, le #trésor protégé par une peste# dans l'Arbre Mojo est #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                      // /*spanish*/ Según dicen, un #deku del Gran Árbol Deku# esconde #[[1]]#.
 
-    hintTable[RHT_DEKU_TREE_COMPASS_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#pillars of wood# in the Deku Tree lead to", /*french*/"les #piliers de bois# dans l'Arbre Mojo indiquent", /*spanish*/"los #salientes del Gran Árbol Deku# conducen a"},
-  });
+    hintTextTable[RHT_DEKU_TREE_COMPASS_CHEST] = HintText(CustomMessage("They say that #pillars of wood# in the Deku Tree lead to #[[1]]#.",
+                                                             /*german*/ "",
+                                                             /*french*/ "Selon moi, les #piliers de bois# dans l'Arbre Mojo indiquent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                          // /*spanish*/ Según dicen, los #salientes del Gran Árbol Deku# conducen a #[[1]]#.
 
-    hintTable[RHT_DEKU_TREE_COMPASS_ROOM_SIDE_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#pillars of wood# in the Deku Tree lead to", /*french*/"les #piliers de bois# dans l'Arbre Mojo indiquent", /*spanish*/"los #salientes del Gran Árbol Deku# conducen a"},
-  });
+    hintTextTable[RHT_DEKU_TREE_COMPASS_ROOM_SIDE_CHEST] = HintText(CustomMessage("They say that #pillars of wood# in the Deku Tree lead to #[[1]]#.",
+                                                                       /*german*/ "",
+                                                                       /*french*/ "Selon moi, les #piliers de bois# dans l'Arbre Mojo indiquent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                    // /*spanish*/ Según dicen, los #salientes del Gran Árbol Deku# conducen a #[[1]]#.
 
-    hintTable[RHT_DEKU_TREE_BASEMENT_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#webs in the Deku Tree# hide", /*french*/"les #toiles dans l'Arbre Mojo# cachent", /*spanish*/"entre #telarañas del Gran Árbol Deku# yace"},
-  });
+    hintTextTable[RHT_DEKU_TREE_BASEMENT_CHEST] = HintText(CustomMessage("They say that #webs in the Deku Tree# hide #[[1]]#.",
+                                                              /*german*/ "",
+                                                              /*french*/ "Selon moi, les #toiles dans l'Arbre Mojo# cachent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                           // /*spanish*/ Según dicen, entre #telarañas del Gran Árbol Deku# yace #[[1]]#.
 
+    hintTextTable[RHT_DEKU_TREE_MQ_MAP_CHEST] = HintText(CustomMessage("They say that in the #center of the Deku Tree# lies #[[1]]#.",
+                                                            /*german*/ "",
+                                                            /*french*/ "Selon moi, #le coeur de l'Arbre Mojo# recèle #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                         // /*spanish*/ Según dicen, al #centro del Gran Árbol Deku# yace #[[1]]#.
 
-    hintTable[RHT_DEKU_TREE_MQ_MAP_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"in the #center of the Deku Tree# lies", /*french*/"#le coeur de l'Arbre Mojo# recèle", /*spanish*/"al #centro del Gran Árbol Deku# yace"},
-  });
+    hintTextTable[RHT_DEKU_TREE_MQ_COMPASS_CHEST] = HintText(CustomMessage("They say that a #treasure guarded by a large spider# in the Deku Tree is #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, le #trésor protégé par une grosse araignée# dans l'Arbre Mojo est #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                             // /*spanish*/ Según dicen, una #gran araña del Gran Árbol Deku# esconde #[[1]]#.
 
-    hintTable[RHT_DEKU_TREE_MQ_COMPASS_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #treasure guarded by a large spider# in the Deku Tree is", /*french*/"le #trésor protégé par une grosse araignée# dans l'Arbre Mojo est", /*spanish*/"una #gran araña del Gran Árbol Deku# esconde"},
-  });
+    hintTextTable[RHT_DEKU_TREE_MQ_SLINGSHOT_CHEST] = HintText(CustomMessage("They say that #pillars of wood# in the Deku Tree lead to #[[1]]#.",
+                                                                  /*german*/ "",
+                                                                  /*french*/ "Selon moi, les #piliers de bois# dans l'Arbre Mojo indiquent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                               // /*spanish*/ Según dicen, los #salientes del Gran Árbol Deku# conducen a #[[1]]#.
 
-    hintTable[RHT_DEKU_TREE_MQ_SLINGSHOT_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#pillars of wood# in the Deku Tree lead to", /*french*/"les #piliers de bois# dans l'Arbre Mojo indiquent", /*spanish*/"los #salientes del Gran Árbol Deku# conducen a"},
-  });
+    hintTextTable[RHT_DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST] = HintText(CustomMessage("They say that #pillars of wood# in the Deku Tree lead to #[[1]]#.",
+                                                                            /*german*/ "",
+                                                                            /*french*/ "Selon moi, les #piliers de bois# dans l'Arbre Mojo indiquent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                         // /*spanish*/ Según dicen, los #salientes del Gran Árbol Deku# conducen a #[[1]]#.
 
-    hintTable[RHT_DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#pillars of wood# in the Deku Tree lead to", /*french*/"les #piliers de bois# dans l'Arbre Mojo indiquent", /*spanish*/"los #salientes del Gran Árbol Deku# conducen a"},
-  });
+    hintTextTable[RHT_DEKU_TREE_MQ_BASEMENT_CHEST] = HintText(CustomMessage("They say that #webs in the Deku Tree# hide #[[1]]#.",
+                                                                 /*german*/ "",
+                                                                 /*french*/ "Selon moi, les #toiles dans l'Arbre Mojo# cachent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                              // /*spanish*/ Según dicen, entre #telarañas del Gran Árbol Deku# yace #[[1]]#.
 
-    hintTable[RHT_DEKU_TREE_MQ_BASEMENT_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#webs in the Deku Tree# hide", /*french*/"les #toiles dans l'Arbre Mojo# cachent", /*spanish*/"entre #telarañas del Gran Árbol Deku# yace"},
-  });
+    hintTextTable[RHT_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST] = HintText(CustomMessage("They say that #magical fire in the Deku Tree# leads to #[[1]]#.",
+                                                                            /*german*/ "",
+                                                                            /*french*/ "Selon moi, le #feu magique dans l'Arbre Mojo# éclaire #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                         // /*spanish*/ Según dicen, el #fuego mágico en el Gran Árbol Deku# conduce a #[[1]]#.
 
-    hintTable[RHT_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#magical fire in the Deku Tree# leads to", /*french*/"le #feu magique dans l'Arbre Mojo# éclaire", /*spanish*/"el #fuego mágico en el Gran Árbol Deku# conduce a"},
-  });
+    hintTextTable[RHT_DEKU_TREE_QUEEN_GOHMA_HEART] = HintText(CustomMessage("They say that #Queen Gohma# holds #[[1]]#.",
+                                                                 /*german*/ "",
+                                                                 /*french*/ "Selon moi, la #Reine Gohma# possède #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                              // /*spanish*/ Según dicen, la #Reina Goma# porta #[[1]]#.
+                                                              {}, {
+                                                              CustomMessage("They say that the #Parasitic Armored Arachnid# holds #[[1]]#.",
+                                                                  /*german*/ "",
+                                                                  /*french*/ "Selon moi, le #monstre insectoïde géant# possède #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                               // /*spanish*/ Según dicen, el #arácnido parasitario acorazado# porta #[[1]]#.
 
-    hintTable[RHT_DEKU_TREE_QUEEN_GOHMA_HEART] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #Parasitic Armored Arachnid# holds", /*french*/"le #monstre insectoïde géant# possède", /*spanish*/"el #arácnido parasitario acorazado# porta"},
-                     }, {},
-                       //clear text
-                       Text{"#Queen Gohma# holds", /*french*/"la #Reine Gohma# possède", /*spanish*/"la #Reina Goma# porta"}
-  );
+    hintTextTable[RHT_DEKU_TREE_GS_BASEMENT_BACK_ROOM] = HintText(CustomMessage("They say that a #spider deep within the Deku Tree# hides #[[1]]#.",
+                                                                     /*german*/ "",
+                                                                     /*french*/ "Selon moi, une #Skulltula au coeur de l'Arbre Mojo# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                  // /*spanish*/ Según dicen, una #Skulltula en las profundidades del Árbol Deku# otorga #[[1]]#.
 
-    hintTable[RHT_DEKU_TREE_GS_BASEMENT_BACK_ROOM] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider deep within the Deku Tree# hides", /*french*/"une #Skulltula au coeur de l'Arbre Mojo# a", /*spanish*/"una #Skulltula en las profundidades del Árbol Deku# otorga"},
-  });
+    hintTextTable[RHT_DEKU_TREE_GS_BASEMENT_GATE] = HintText(CustomMessage("They say that a #web protects a spider# within the Deku Tree holding #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, une #Skulltula derrière une toile dans l'Arbre Mojo# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                             // /*spanish*/ Según dicen, una #Skulltula protegida por su tela# del Árbol Deku otorga #[[1]]#.
 
-    hintTable[RHT_DEKU_TREE_GS_BASEMENT_GATE] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #web protects a spider# within the Deku Tree holding", /*french*/"une #Skulltula derrière une toile dans l'Arbre Mojo# a", /*spanish*/"una #Skulltula protegida por su tela# del Árbol Deku otorga"},
-  });
+    hintTextTable[RHT_DEKU_TREE_GS_BASEMENT_VINES] = HintText(CustomMessage("They say that a #web protects a spider# within the Deku Tree holding #[[1]]#.",
+                                                                 /*german*/ "",
+                                                                 /*french*/ "Selon moi, une #Skulltula derrière une toile dans l'Arbre Mojo# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                              // /*spanish*/ Según dicen, una #Skulltula protegida por su tela# del Árbol Deku otorga #[[1]]#.
 
-    hintTable[RHT_DEKU_TREE_GS_BASEMENT_VINES] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #web protects a spider# within the Deku Tree holding", /*french*/"une #Skulltula derrière une toile dans l'Arbre Mojo# a", /*spanish*/"una #Skulltula protegida por su tela# del Árbol Deku otorga"},
-  });
+    hintTextTable[RHT_DEKU_TREE_GS_COMPASS_ROOM] = HintText(CustomMessage("They say that a #spider atop the Deku Tree# holds #[[1]]#.",
+                                                               /*german*/ "",
+                                                               /*french*/ "Selon moi, une #Skulltula au sommet de l'Arbre Mojo# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                            // /*spanish*/ Según dicen, una #Skulltula en lo alto del Árbol Deku# otorga #[[1]]#.
 
-    hintTable[RHT_DEKU_TREE_GS_COMPASS_ROOM] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider atop the Deku Tree# holds", /*french*/"une #Skulltula au sommet de l'Arbre Mojo# a", /*spanish*/"una #Skulltula en lo alto del Árbol Deku# otorga"},
-  });
+    hintTextTable[RHT_DEKU_TREE_MQ_GS_LOBBY] = HintText(CustomMessage("They say that a #spider in a crate# within the Deku Tree hides #[[1]]#.",
+                                                           /*german*/ "",
+                                                           /*french*/ "Selon moi, une #Skulltula dans une boîte dans l'Arbre Mojo# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                        // /*spanish*/ Según dicen, una #Skulltula bajo una caja# del Árbol Deku otorga #[[1]]#.
 
+    hintTextTable[RHT_DEKU_TREE_MQ_GS_COMPASS_ROOM] = HintText(CustomMessage("They say that a #wall of rock protects a spider# within the Deku Tree holding #[[1]]#.",
+                                                                  /*german*/ "",
+                                                                  /*french*/ "Selon moi, une #Skulltula derrière des rochers dans l'Arbre Mojo# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                               // /*spanish*/ Según dicen, una #Skulltula protegida por una pared rocosa# del Árbol Deku otorga #[[1]]#.
 
-    hintTable[RHT_DEKU_TREE_MQ_GS_LOBBY] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider in a crate# within the Deku Tree hides", /*french*/"une #Skulltula dans une boîte dans l'Arbre Mojo# a", /*spanish*/"una #Skulltula bajo una caja# del Árbol Deku otorga"},
-  });
+    hintTextTable[RHT_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM] = HintText(CustomMessage("They say that a #spider deep within the Deku Tree# hides #[[1]]#.",
+                                                                        /*german*/ "",
+                                                                        /*french*/ "Selon moi, une #Skulltula au coeur de l'Arbre Mojo# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                     // /*spanish*/ Según dicen, una #Skulltula en las profundidades del Árbol Deku# otorga #[[1]]#.
 
-    hintTable[RHT_DEKU_TREE_MQ_GS_COMPASS_ROOM] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #wall of rock protects a spider# within the Deku Tree holding", /*french*/"une #Skulltula derrière des rochers dans l'Arbre Mojo# a", /*spanish*/"una #Skulltula protegida por una pared rocosa# del Árbol Deku otorga"},
-  });
-
-    hintTable[RHT_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider deep within the Deku Tree# hides", /*french*/"une #Skulltula au coeur de l'Arbre Mojo# a", /*spanish*/"una #Skulltula en las profundidades del Árbol Deku# otorga"},
-  });
-
-    hintTable[RHT_DEKU_TREE_MQ_DEKU_SCRUB] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #scrub in the Deku Tree# sells", /*french*/"la #peste Mojo dans l'Arbre Mojo# vend", /*spanish*/"un #deku del Gran Árbol Deku# vende"},
-  });
+    hintTextTable[RHT_DEKU_TREE_MQ_DEKU_SCRUB] = HintText(CustomMessage("They say that a #scrub in the Deku Tree# sells #[[1]]#.",
+                                                             /*german*/ "",
+                                                             /*french*/ "Selon moi, la #peste Mojo dans l'Arbre Mojo# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                          // /*spanish*/ Según dicen, un #deku del Gran Árbol Deku# vende #[[1]]#.
 
   /*--------------------------
   |     DODONGOS CAVERN      |
   ---------------------------*/
-    hintTable[RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#above King Dodongo# lies", /*french*/"#par dessus le Roi Dodongo# gît", /*spanish*/"#sobre el Rey Dodongo# yace"},
-  });
+hintTextTable[RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST] = HintText(CustomMessage("They say that #above King Dodongo# lies #[[1]]#.",
+                                                                     /*german*/ "",
+                                                                     /*french*/ "Selon moi, #par dessus le Roi Dodongo# gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                  // /*spanish*/ Según dicen, #sobre el Rey Dodongo# yace #[[1]]#.
 
-    hintTable[RHT_DODONGOS_CAVERN_MAP_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #muddy wall in Dodongo's Cavern# hides", /*french*/"le #mur fragile dans la Caverne Dodongo# recèle", /*spanish*/"tras una #agrietada pared en la Cueva de los Dodongos# yace"},
-  });
+    hintTextTable[RHT_DODONGOS_CAVERN_MAP_CHEST] = HintText(CustomMessage("They say that a #muddy wall in Dodongo's Cavern# hides #[[1]]#.",
+                                                               /*german*/ "",
+                                                               /*french*/ "Selon moi, le #mur fragile dans la Caverne Dodongo# recèle #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                            // /*spanish*/ Según dicen, tras una #agrietada pared en la Cueva de los Dodongos# yace #[[1]]#.
 
-    hintTable[RHT_DODONGOS_CAVERN_COMPASS_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #statue in Dodongo's Cavern# guards", /*french*/"la #statue dans la Caverne Dodongo# protège", /*spanish*/"una #estatua de la Cueva de los Dodongos# esconde"},
-  });
+    hintTextTable[RHT_DODONGOS_CAVERN_COMPASS_CHEST] = HintText(CustomMessage("They say that a #statue in Dodongo's Cavern# guards #[[1]]#.",
+                                                                   /*german*/ "",
+                                                                   /*french*/ "Selon moi, la #statue dans la Caverne Dodongo# protège #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                // /*spanish*/ Según dicen, una #estatua de la Cueva de los Dodongos# esconde #[[1]]#.
 
-    hintTable[RHT_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"above a #maze of stone# in Dodongo's Cavern lies", /*french*/"sur #un labyrinthe de pierre# dans la Caverne Dodongo gît", /*spanish*/"entre un #laberinto de piedra# en la Cueva de los Dodongos yace"},
-  });
+    hintTextTable[RHT_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST] = HintText(CustomMessage("They say that above a #maze of stone# in Dodongo's Cavern lies #[[1]]#.",
+                                                                                /*german*/ "",
+                                                                                /*french*/ "Selon moi, sur #un labyrinthe de pierre# dans la Caverne Dodongo gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                             // /*spanish*/ Según dicen, entre un #laberinto de piedra# en la Cueva de los Dodongos yace #[[1]]#.
 
-    hintTable[RHT_DODONGOS_CAVERN_BOMB_BAG_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #second lizard cavern battle# yields", /*french*/"le #deuxième duel de lézards de caverne# octroie", /*spanish*/"#luchar dos veces contra reptiles en una cueva# conduce a"},
-  });
+    hintTextTable[RHT_DODONGOS_CAVERN_BOMB_BAG_CHEST] = HintText(CustomMessage("They say that the #second lizard cavern battle# yields #[[1]]#.",
+                                                                    /*german*/ "",
+                                                                    /*french*/ "Selon moi, le #deuxième duel de lézards de caverne# octroie #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                 // /*spanish*/ Según dicen, #luchar dos veces contra reptiles en una cueva# conduce a #[[1]]#.
 
-    hintTable[RHT_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #chest at the end of a bridge# yields", /*french*/"le #trésor à l'extrémité d'un pont# contient", /*spanish*/"un #cofre al final de un quebrado puente# contiene"},
-  });
+    hintTextTable[RHT_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST] = HintText(CustomMessage("They say that a #chest at the end of a bridge# yields #[[1]]#.",
+                                                                         /*german*/ "",
+                                                                         /*french*/ "Selon moi, le #trésor à l'extrémité d'un pont# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                      // /*spanish*/ Según dicen, un #cofre al final de un quebrado puente# contiene #[[1]]#.
 
+    hintTextTable[RHT_DODONGOS_CAVERN_MQ_MAP_CHEST] = HintText(CustomMessage("They say that a #muddy wall in Dodongo's Cavern# hides #[[1]]#.",
+                                                                  /*german*/ "",
+                                                                  /*french*/ "Selon moi, le #mur fragile dans la Caverne Dodongo# recèle #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                               // /*spanish*/ Según dicen, una #agrietada pared en la Cueva de los Dodongos# esconde #[[1]]#.
 
-    hintTable[RHT_DODONGOS_CAVERN_MQ_MAP_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #muddy wall in Dodongo's Cavern# hides", /*french*/"le #mur fragile dans la Caverne Dodongo# recèle", /*spanish*/"una #agrietada pared en la Cueva de los Dodongos# esconde"},
-  });
+    hintTextTable[RHT_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST] = HintText(CustomMessage("They say that an #elevated alcove# in Dodongo's Cavern holds #[[1]]#.",
+                                                                       /*german*/ "",
+                                                                       /*french*/ "Selon moi, l'#alcove haut perchée# dans la Caverne Dodongo cache #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                    // /*spanish*/ Según dicen, una #elevada alcoba# en la Cueva de los Dodongos brinda #[[1]]#.
 
-    hintTable[RHT_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"an #elevated alcove# in Dodongo's Cavern holds", /*french*/"l'#alcove haut perchée# dans la Caverne Dodongo cache", /*spanish*/"una #elevada alcoba# en la Cueva de los Dodongos brinda"},
-  });
+    hintTextTable[RHT_DODONGOS_CAVERN_MQ_COMPASS_CHEST] = HintText(CustomMessage("They say that #fire-breathing lizards# in Dodongo's Cavern guard #[[1]]#.",
+                                                                      /*german*/ "",
+                                                                      /*french*/ "Selon moi, les #lézards cracheurs de feu# dans la Caverne Dodongo protègent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                   // /*spanish*/ Según dicen, unos #flamígeros reptiles# en la Cueva de los Dodongos esconden #[[1]]#.
 
-    hintTable[RHT_DODONGOS_CAVERN_MQ_COMPASS_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#fire-breathing lizards# in Dodongo's Cavern guard", /*french*/"les #lézards cracheurs de feu# dans la Caverne Dodongo protègent", /*spanish*/"unos #flamígeros reptiles# en la Cueva de los Dodongos esconden"},
-  });
+    hintTextTable[RHT_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST] = HintText(CustomMessage("They say that #baby spiders# in Dodongo's Cavern guard #[[1]]#.",
+                                                                          /*german*/ "",
+                                                                          /*french*/ "Selon moi, les #petites araignées dans la Caverne Dodongo# protègent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                       // /*spanish*/ Según dicen, unas #pequeñas larvas# en la Cueva de los Dodongos esconden #[[1]]#.
 
-    hintTable[RHT_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#baby spiders# in Dodongo's Cavern guard", /*french*/"les #petites araignées dans la Caverne Dodongo# protègent", /*spanish*/"unas #pequeñas larvas# en la Cueva de los Dodongos esconden"},
-  });
+    hintTextTable[RHT_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST] = HintText(CustomMessage("They say that above a #maze of stone# in Dodongo's Cavern lies #[[1]]#.",
+                                                                                /*german*/ "",
+                                                                                /*french*/ "Selon moi, sur #un labyrinthe de pierre# dans la Caverne Dodongo gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                             // /*spanish*/ Según dicen, sobre un #laberinto de piedra# en la Cueva de los Dodongos yace #[[1]]#.
 
-    hintTable[RHT_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"above a #maze of stone# in Dodongo's Cavern lies", /*french*/"sur #un labyrinthe de pierre# dans la Caverne Dodongo gît", /*spanish*/"sobre un #laberinto de piedra# en la Cueva de los Dodongos yace"},
-  });
+    hintTextTable[RHT_DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST] = HintText(CustomMessage("They say that #beneath a headstone# in Dodongo's Cavern lies #[[1]]#.",
+                                                                          /*german*/ "",
+                                                                          /*french*/ "Selon moi, #sous une pierre tombale# dans la Caverne Dodongo gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                       // /*spanish*/ Según dicen, #bajo una lápida# en la Cueva de los Dodongos yace #[[1]]#.
 
-    hintTable[RHT_DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#beneath a headstone# in Dodongo's Cavern lies", /*french*/"#sous une pierre tombale# dans la Caverne Dodongo gît", /*spanish*/"#bajo una lápida# en la Cueva de los Dodongos yace"},
-  });
+    hintTextTable[RHT_DODONGOS_CAVERN_KING_DODONGO_HEART] = HintText(CustomMessage("They say that #King Dodongo# holds #[[1]]#.",
+                                                                        /*german*/ "",
+                                                                        /*french*/ "Selon moi, le #Roi Dodongo# possède #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                     // /*spanish*/ Según dicen, el #Rey Dodongo# porta #[[1]]#.
+                                                                     {}, {
+                                                                     CustomMessage("They say that the #Infernal Dinosaur# holds #[[1]]#.",
+                                                                         /*german*/ "",
+                                                                         /*french*/ "Selon moi, le #dinosaure infernal# possède #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                      // /*spanish*/ Según dicen, el #dinosaurio infernal# porta #[[1]]#.
 
-    hintTable[RHT_DODONGOS_CAVERN_KING_DODONGO_HEART] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #Infernal Dinosaur# holds", /*french*/"le #dinosaure infernal# possède", /*spanish*/"el #dinosaurio infernal# porta"},
-                     }, {},
-                       //clear text
-                       Text{"#King Dodongo# holds", /*french*/"le #Roi Dodongo# possède", /*spanish*/"el #Rey Dodongo# porta"}
-  );
+    hintTextTable[RHT_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS] = HintText(CustomMessage("They say that a #spider entangled in vines# in Dodongo's Cavern guards #[[1]]#.",
+                                                                           /*german*/ "",
+                                                                           /*french*/ "Selon moi, une #Skulltula sur les vignes dans la Caverne Dodongo# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                        // /*spanish*/ Según dicen, una #Skulltula sobre unas cepas# de la Cueva de los Dodongos otorga #[[1]]#.
 
-    hintTable[RHT_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider entangled in vines# in Dodongo's Cavern guards", /*french*/"une #Skulltula sur les vignes dans la Caverne Dodongo# a", /*spanish*/"una #Skulltula sobre unas cepas# de la Cueva de los Dodongos otorga"},
-  });
+    hintTextTable[RHT_DODONGOS_CAVERN_GS_SCARECROW] = HintText(CustomMessage("They say that a #spider among explosive slugs# hides #[[1]]#.",
+                                                                  /*german*/ "",
+                                                                  /*french*/ "Selon moi, une #Skulltula dans l'alcove du couloir dans la Caverne Dodongo# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                               // /*spanish*/ Según dicen, una #Skulltula rodeada de explosivos gusanos# otorga #[[1]]#.
 
-    hintTable[RHT_DODONGOS_CAVERN_GS_SCARECROW] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider among explosive slugs# hides", /*french*/"une #Skulltula dans l'alcove du couloir dans la Caverne Dodongo# a", /*spanish*/"una #Skulltula rodeada de explosivos gusanos# otorga"},
-  });
+    hintTextTable[RHT_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS] = HintText(CustomMessage("They say that a #spider just out of reach# in Dodongo's Cavern holds #[[1]]#.",
+                                                                            /*german*/ "",
+                                                                            /*french*/ "Selon moi, une #Skulltula au haut des escaliers de la Caverne Dodongo# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                         // /*spanish*/ Según dicen, una #Skulltula fuera del alcance# de la Cueva de los Dodongos otorga #[[1]]#.
 
-    hintTable[RHT_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider just out of reach# in Dodongo's Cavern holds", /*french*/"une #Skulltula au haut des escaliers de la Caverne Dodongo# a", /*spanish*/"una #Skulltula fuera del alcance# de la Cueva de los Dodongos otorga"},
-  });
+    hintTextTable[RHT_DODONGOS_CAVERN_GS_BACK_ROOM] = HintText(CustomMessage("They say that a #spider behind a statue# in Dodongo's Cavern holds #[[1]]#.",
+                                                                  /*german*/ "",
+                                                                  /*french*/ "Selon moi, une #Skulltula au coeur de la Caverne Dodongo# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                               // /*spanish*/ Según dicen, una #Skulltula tras una estatua# de la Cueva de los Dodongos otorga #[[1]]#.
 
-    hintTable[RHT_DODONGOS_CAVERN_GS_BACK_ROOM] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider behind a statue# in Dodongo's Cavern holds", /*french*/"une #Skulltula au coeur de la Caverne Dodongo# a", /*spanish*/"una #Skulltula tras una estatua# de la Cueva de los Dodongos otorga"},
-  });
+    hintTextTable[RHT_DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS] = HintText(CustomMessage("They say that a #spider among bats# in Dodongo's Cavern holds #[[1]]#.",
+                                                                                      /*german*/ "",
+                                                                                      /*french*/ "Selon moi, une #Skulltula entourée de Saigneurs dans la Caverne Dodongo# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                   // /*spanish*/ Según dicen, una #Skulltula rodeada de murciélagos# de la Cueva de los Dodongos otorga #[[1]]#.
 
-    hintTable[RHT_DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider among bats# in Dodongo's Cavern holds", /*french*/"une #Skulltula entourée de Saigneurs dans la Caverne Dodongo# a", /*spanish*/"una #Skulltula rodeada de murciélagos# de la Cueva de los Dodongos otorga"},
-  });
+    hintTextTable[RHT_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM] = HintText(CustomMessage("They say that a #spider high on a wall# in Dodongo's Cavern holds #[[1]]#.",
+                                                                      /*german*/ "",
+                                                                      /*french*/ "Selon moi, une #Skulltula haut perchée dans la Caverne Dodongo# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                   // /*spanish*/ Según dicen, una #Skulltula en lo alto de una pared# de la Cueva de los Dodongos otorga #[[1]]#.
 
+    hintTextTable[RHT_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM] = HintText(CustomMessage("They say that a #spider on top of a pillar of rock# in Dodongo's Cavern holds #[[1]]#.",
+                                                                         /*german*/ "",
+                                                                         /*french*/ "Selon moi, une #Skulltula sur l'énorme pilier de roc de la Caverne Dodongo# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                      // /*spanish*/ Según dicen, una #Skulltula en lo alto de un pilar# de la Cueva de los Dodongos otorga #[[1]]#.
 
-    hintTable[RHT_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider high on a wall# in Dodongo's Cavern holds", /*french*/"une #Skulltula haut perchée dans la Caverne Dodongo# a", /*spanish*/"una #Skulltula en lo alto de una pared# de la Cueva de los Dodongos otorga"},
-  });
+    hintTextTable[RHT_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM] = HintText(CustomMessage("They say that a #spider in a crate# in Dodongo's Cavern holds #[[1]]#.",
+                                                                       /*german*/ "",
+                                                                       /*french*/ "Selon moi, une #Skulltula dans une boîte de la Caverne Dodongo# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                    // /*spanish*/ Según dicen, una #Skulltula bajo una caja# de la Cueva de los Dodongos otorga #[[1]]#.
 
-    hintTable[RHT_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider on top of a pillar of rock# in Dodongo's Cavern holds", /*french*/"une #Skulltula sur l'énorme pilier de roc de la Caverne Dodongo# a", /*spanish*/"una #Skulltula en lo alto de un pilar# de la Cueva de los Dodongos otorga"},
-  });
+    hintTextTable[RHT_DODONGOS_CAVERN_MQ_GS_BACK_AREA] = HintText(CustomMessage("They say that a #spider among graves# in Dodongo's Cavern holds #[[1]]#.",
+                                                                     /*german*/ "",
+                                                                     /*french*/ "Selon moi, une #Skulltula parmi les tombes de la Caverne Dodongo# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                  // /*spanish*/ Según dicen, una #Skulltula entre lápidas# en la Cueva de los Dodongos otorga #[[1]]#.
 
-    hintTable[RHT_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider in a crate# in Dodongo's Cavern holds", /*french*/"une #Skulltula dans une boîte de la Caverne Dodongo# a", /*spanish*/"una #Skulltula bajo una caja# de la Cueva de los Dodongos otorga"},
-  });
+    hintTextTable[RHT_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT] = HintText(CustomMessage("They say that a pair of #scrubs in Dodongo's Cavern# sells #[[1]]#.",
+                                                                                   /*german*/ "",
+                                                                                   /*french*/ "Selon moi, le #duo de peste Mojo dans la Caverne Dodongo# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                // /*spanish*/ Según dicen, un #par de dekus en la Cueva de los Dodongos# venden #[[1]]#.
 
-    hintTable[RHT_DODONGOS_CAVERN_MQ_GS_BACK_AREA] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider among graves# in Dodongo's Cavern holds", /*french*/"une #Skulltula parmi les tombes de la Caverne Dodongo# a", /*spanish*/"una #Skulltula entre lápidas# en la Cueva de los Dodongos otorga"},
-  });
+    hintTextTable[RHT_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS] = HintText(CustomMessage("They say that a #scrub guarded by Lizalfos# sells #[[1]]#.",
+                                                                                        /*german*/ "",
+                                                                                        /*french*/ "Selon moi, la #peste Mojo au coeur de la Caverne Dodongo# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                     // /*spanish*/ Según dicen, un #deku custodiado por Lizalfos# vende #[[1]]#.
 
-    hintTable[RHT_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT] = HintText::Exclude({
-                       //obscure text
-                       Text{"a pair of #scrubs in Dodongo's Cavern# sells", /*french*/"le #duo de peste Mojo dans la Caverne Dodongo# vend", /*spanish*/"un #par de dekus en la Cueva de los Dodongos# venden"},
-  });
+    hintTextTable[RHT_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT] = HintText(CustomMessage("They say that a pair of #scrubs in Dodongo's Cavern# sells #[[1]]#.",
+                                                                                    /*german*/ "",
+                                                                                    /*french*/ "Selon moi, le #duo de peste Mojo dans la Caverne Dodongo# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                 // /*spanish*/ Según dicen, un #par de dekus en la Cueva de los Dodongos# venden #[[1]]#.
 
-    hintTable[RHT_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #scrub guarded by Lizalfos# sells", /*french*/"la #peste Mojo au coeur de la Caverne Dodongo# vend", /*spanish*/"un #deku custodiado por Lizalfos# vende"},
-  });
+    hintTextTable[RHT_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY] = HintText(CustomMessage("They say that a #scrub in Dodongo's Cavern# sells #[[1]]#.",
+                                                                      /*german*/ "",
+                                                                      /*french*/ "Selon moi, la #peste Mojo dans l'entrée de la Caverne Dodongo# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                   // /*spanish*/ Según dicen, un #deku en la Cueva de los Dodongos# vende #[[1]]#.
 
-    hintTable[RHT_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT] = HintText::Exclude({
-                       //obscure text
-                       Text{"a pair of #scrubs in Dodongo's Cavern# sells", /*french*/"le #duo de peste Mojo dans la Caverne Dodongo# vend", /*spanish*/"un #par de dekus en la Cueva de los Dodongos# venden"},
-  });
+    hintTextTable[RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR] = HintText(CustomMessage("They say that a pair of #scrubs in Dodongo's Cavern# sells #[[1]]#.",
+                                                                              /*german*/ "",
+                                                                              /*french*/ "Selon moi, le #duo de peste Mojo dans l'entrée de la Caverne Dodongo# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                           // /*spanish*/ Según dicen, un #par de dekus en la Cueva de los Dodongos# venden #[[1]]#.
 
-    hintTable[RHT_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #scrub in Dodongo's Cavern# sells", /*french*/"la #peste Mojo dans l'entrée de la Caverne Dodongo# vend", /*spanish*/"un #deku en la Cueva de los Dodongos# vende"},
-  });
+    hintTextTable[RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT] = HintText(CustomMessage("They say that a pair of #scrubs in Dodongo's Cavern# sells #[[1]]#.",
+                                                                               /*german*/ "",
+                                                                               /*french*/ "Selon moi, le #duo de peste Mojo dans l'entrée de la Caverne Dodongo# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                            // /*spanish*/ Según dicen, un #par de dekus en la Cueva de los Dodongos# venden #[[1]]#.
 
+    hintTextTable[RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE] = HintText(CustomMessage("They say that a #scrub in Dodongo's Cavern# sells #[[1]]#.",
+                                                                             /*german*/ "",
+                                                                             /*french*/ "Selon moi, la #peste Mojo au sommet des escaliers dans la Caverne Dodongo# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                          // /*spanish*/ Según dicen, un #deku en la Cueva de los Dodongos# vende #[[1]]#.
 
-    hintTable[RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR] = HintText::Exclude({
-                       //obscure text
-                       Text{"a pair of #scrubs in Dodongo's Cavern# sells", /*french*/"le #duo de peste Mojo dans l'entrée de la Caverne Dodongo# vend", /*spanish*/"un #par de dekus en la Cueva de los Dodongos# venden"},
-  });
-
-    hintTable[RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT] = HintText::Exclude({
-                       //obscure text
-                       Text{"a pair of #scrubs in Dodongo's Cavern# sells", /*french*/"le #duo de peste Mojo dans l'entrée de la Caverne Dodongo# vend", /*spanish*/"un #par de dekus en la Cueva de los Dodongos# venden"},
-  });
-
-    hintTable[RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #scrub in Dodongo's Cavern# sells", /*french*/"la #peste Mojo au sommet des escaliers dans la Caverne Dodongo# vend", /*spanish*/"un #deku en la Cueva de los Dodongos# vende"},
-  });
-
-    hintTable[RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #scrub guarded by Lizalfos# sells", /*french*/"la #peste Mojo au coeur de la Caverne Dodongo# vend", /*spanish*/"un #deku custodiado por Lizalfos# vende"},
-  });
+    hintTextTable[RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS] = HintText(CustomMessage("They say that a #scrub guarded by Lizalfos# sells #[[1]]#.",
+                                                                                                 /*german*/ "",
+                                                                                                 /*french*/ "Selon moi, la #peste Mojo au coeur de la Caverne Dodongo# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                              // /*spanish*/ Según dicen, un #deku custodiado por Lizalfos# vende #[[1]]#.
 
   /*--------------------------
   |     JABU JABUS BELLY     |
   ---------------------------*/
-    hintTable[RHT_JABU_JABUS_BELLY_MAP_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#tentacle trouble# in a deity's belly guards", /*french*/"la #membrane# dans le ventre du gardien protège", /*spanish*/"un #problema tentaculoso# en la tripa de cierta deidad esconde"},
-                     }, {},
-                       //clear text
-                       Text{"a #slimy thing# guards", /*french*/"la #chose gluante# gardien protège", /*spanish*/"un #tentáculo parasitario# protege"}
-  );
+    hintTextTable[RHT_JABU_JABUS_BELLY_MAP_CHEST] = HintText(CustomMessage("They say that a #slimy thing# guards #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, la #chose gluante# gardien protège #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                             // /*spanish*/ Según dicen, un #tentáculo parasitario# protege #[[1]]#.
+                                                             {}, {
+                                                             CustomMessage("They say that #tentacle trouble# in a deity's belly guards #[[1]]#.",
+                                                                 /*german*/ "",
+                                                                 /*french*/ "Selon moi, la #membrane# dans le ventre du gardien protège #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                              // /*spanish*/ Según dicen, un #problema tentaculoso# en la tripa de cierta deidad esconde #[[1]]#.
 
-    hintTable[RHT_JABU_JABUS_BELLY_COMPASS_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#bubble trouble# in a deity's belly guards", /*french*/"un #horde de bulles# dans le ventre du gardien protègent", /*spanish*/"un #problema burbujesco# en la tripa de cierta deidad esconde"},
-                     }, {},
-                       //clear text
-                       Text{"#bubbles# guard", /*french*/"des #bulles# entourent", /*spanish*/"unas #burbujas# protegen"}
-  );
+    hintTextTable[RHT_JABU_JABUS_BELLY_COMPASS_CHEST] = HintText(CustomMessage("They say that #bubbles# guard #[[1]]#.",
+                                                                    /*german*/ "",
+                                                                    /*french*/ "Selon moi, des #bulles# entourent #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                 // /*spanish*/ Según dicen, unas #burbujas# protegen #[[1]]#.
+                                                                 {}, {
+                                                                 CustomMessage("They say that #bubble trouble# in a deity's belly guards #[[1]]#.",
+                                                                     /*german*/ "",
+                                                                     /*french*/ "Selon moi, un #horde de bulles# dans le ventre du gardien protègent #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                  // /*spanish*/ Según dicen, un #problema burbujesco# en la tripa de cierta deidad esconde #[[1]]#.
 
+    hintTextTable[RHT_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST] = HintText(CustomMessage("They say that shooting a #mouth cow# reveals #[[1]]#.",
+                                                                               /*german*/ "",
+                                                                               /*french*/ "Selon moi, tirer sur une #vache# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                            // /*spanish*/ Según dicen, #dispararle a una vaca# revela #[[1]]#.
 
-    hintTable[RHT_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"shooting a #mouth cow# reveals", /*french*/"tirer sur une #vache# révèle", /*spanish*/"#dispararle a una vaca# revela"},
-  });
+    hintTextTable[RHT_JABU_JABUS_BELLY_MQ_MAP_CHEST] = HintText(CustomMessage("They say that a #boulder before cows# hides #[[1]]#.",
+                                                                   /*german*/ "",
+                                                                   /*french*/ "Selon moi, des #rochers près des vaches# cachent #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                // /*spanish*/ Según dicen, cierta #roca rodeada de vacas# esconde #[[1]]#.
+                                                                {}, {
+                                                                CustomMessage("They say that #pop rocks# hide #[[1]]#.",
+                                                                    /*german*/ "",
+                                                                    /*french*/ "Selon moi, des #pierres aux reins# cachent #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                 // /*spanish*/ Según dicen, #cepillarse los dientes con explosivos# revela #[[1]]#.
+                                                                CustomMessage("They say that an #explosive palate# holds #[[1]]#.",
+                                                                    /*german*/ "",
+                                                                    /*french*/ "Selon moi, des #gargouillis explosifs# cachent #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                 // /*spanish*/ Según dicen, un #paladar explosivo# esconde #[[1]]#.
 
-    hintTable[RHT_JABU_JABUS_BELLY_MQ_MAP_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#pop rocks# hide",            /*french*/"des #pierres aux reins# cachent",     /*spanish*/"#cepillarse los dientes con explosivos# revela"},
-                       Text{"an #explosive palate# holds", /*french*/"des #gargouillis explosifs# cachent", /*spanish*/"un #paladar explosivo# esconde"},
-                     }, {},
-                       //clear text
-                       Text{"a #boulder before cows# hides", /*french*/"des #rochers près des vaches# cachent", /*spanish*/"cierta #roca rodeada de vacas# esconde"}
-  );
+    hintTextTable[RHT_JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST] = HintText(CustomMessage("They say that near a #spiked elevator# lies #[[1]]#.",
+                                                                                 /*german*/ "",
+                                                                                 /*french*/ "Selon moi, près d'un #ascenseur visqueux# gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                              // /*spanish*/ Según dicen, cerca de un #ascensor puntiagudo# yace #[[1]]#.
 
-    hintTable[RHT_JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"near a #spiked elevator# lies", /*french*/"près d'un #ascenseur visqueux# gît", /*spanish*/"cerca de un #ascensor puntiagudo# yace"},
-  });
+    hintTextTable[RHT_JABU_JABUS_BELLY_MQ_COMPASS_CHEST] = HintText(CustomMessage("They say that a #drowning cow# unveils #[[1]]#.",
+                                                                       /*german*/ "",
+                                                                       /*french*/ "Selon moi, une #vache à l'eau# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                    // /*spanish*/ Según dicen, una #vaca sumergida# revela #[[1]]#.
 
-    hintTable[RHT_JABU_JABUS_BELLY_MQ_COMPASS_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #drowning cow# unveils", /*french*/"une #vache à l'eau# a", /*spanish*/"una #vaca sumergida# revela"},
-  });
+    hintTextTable[RHT_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST] = HintText(CustomMessage("They say that #moving anatomy# creates a path to #[[1]]#.",
+                                                                                 /*german*/ "",
+                                                                                 /*french*/ "Selon moi, un #organe descendant# mène à #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                              // /*spanish*/ Según dicen, un #ser movedizo entre paredes# conduce a #[[1]]#.
 
-    hintTable[RHT_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#moving anatomy# creates a path to", /*french*/"un #organe descendant# mène à", /*spanish*/"un #ser movedizo entre paredes# conduce a"},
-  });
+    hintTextTable[RHT_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST] = HintText(CustomMessage("They say that a #pair of digested cows# hold #[[1]]#.",
+                                                                                      /*german*/ "",
+                                                                                      /*french*/ "Selon moi, #deux boeufs digérés# détiennent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                   // /*spanish*/ Según dicen, un #par de digeridas vacas# otorgan #[[1]]#.
 
-    hintTable[RHT_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #pair of digested cows# hold", /*french*/"#deux boeufs digérés# détiennent", /*spanish*/"un #par de digeridas vacas# otorgan"},
-  });
+    hintTextTable[RHT_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST] = HintText(CustomMessage("They say that a #pair of digested cows# hold #[[1]]#.",
+                                                                                   /*german*/ "",
+                                                                                   /*french*/ "Selon moi, #deux boeufs digérés# détiennent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                // /*spanish*/ Según dicen, un #par de digeridas vacas# otorgan #[[1]]#.
 
-    hintTable[RHT_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #pair of digested cows# hold", /*french*/"#deux boeufs digérés# détiennent", /*spanish*/"un #par de digeridas vacas# otorgan"},
-  });
+    hintTextTable[RHT_JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST] = HintText(CustomMessage("They say that the #final cows' reward# in a deity's belly is #[[1]]#.",
+                                                                         /*german*/ "",
+                                                                         /*french*/ "Selon moi, le #cadeau des dernières vaches# estomacales est #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                      // /*spanish*/ Según dicen, las #vacas al final# de la tripa de cierta deidad otorgan #[[1]]#.
 
-    hintTable[RHT_JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #final cows' reward# in a deity's belly is", /*french*/"le #cadeau des dernières vaches# estomacales est", /*spanish*/"las #vacas al final# de la tripa de cierta deidad otorgan"},
-  });
+    hintTextTable[RHT_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST] = HintText(CustomMessage("They say that #cows protected by falling monsters# in a deity's belly guard #[[1]]#.",
+                                                                                      /*german*/ "",
+                                                                                      /*french*/ "Selon moi, des #vaches protégées par des monstres tombants# cachent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                   // /*spanish*/ Según dicen, unas #vacas custodiadas por monstruos del techo# de la tripa de cierta deidad otorgan #[[1]]#.
 
-    hintTable[RHT_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#cows protected by falling monsters# in a deity's belly guard", /*french*/"des #vaches protégées par des monstres tombants# cachent", /*spanish*/"unas #vacas custodiadas por monstruos del techo# de la tripa de cierta deidad otorgan"},
-  });
+    hintTextTable[RHT_JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST] = HintText(CustomMessage("They say that a school of #stingers swallowed by Jabu-Jabu# guard #[[1]]#.",
+                                                                                    /*german*/ "",
+                                                                                    /*french*/ "Selon moi, les #raies avallées par Jabu-Jabu# protègent #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                                 // /*spanish*/ Según dicen, unos #stingers engullidos por Jabu-Jabu# guardan #[[1]]#.
+                                                                                 {}, {
+                                                                                 CustomMessage("They say that a school of #stingers swallowed by a deity# guard #[[1]]#.",
+                                                                                     /*german*/ "",
+                                                                                     /*french*/ "Selon moi, les #raies avallées par le gardien# protègent #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                                  // /*spanish*/ Según dicen, unos #stingers engullidos por cierta deidad# guardan #[[1]]#.
 
-    hintTable[RHT_JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a school of #stingers swallowed by a deity# guard", /*french*/"les #raies avallées par le gardien# protègent", /*spanish*/"unos #stingers engullidos por cierta deidad# guardan"},
-                     }, {},
-                       //clear text
-                       Text{"a school of #stingers swallowed by Jabu-Jabu# guard", /*french*/"les #raies avallées par Jabu-Jabu# protègent", /*spanish*/"unos #stingers engullidos por Jabu-Jabu# guardan"}
-  );
+    hintTextTable[RHT_JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST] = HintText(CustomMessage("They say that a school of #stingers swallowed by Jabu-Jabu# guard #[[1]]#.",
+                                                                         /*german*/ "",
+                                                                         /*french*/ "Selon moi, les #raies avallées par Jabu-Jabu# protègent #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                      // /*spanish*/ Según dicen, unos #stingers engullidos por Jabu-Jabu# guardan #[[1]]#.
+                                                                      {}, {
+                                                                      CustomMessage("They say that a school of #stingers swallowed by a deity# guard #[[1]]#.",
+                                                                          /*german*/ "",
+                                                                          /*french*/ "Selon moi, les #raies avallées par le gardien# protègent #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                       // /*spanish*/ Según dicen, unos #stingers engullidos por cierta deidad# guardan #[[1]]#.
 
-    hintTable[RHT_JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a school of #stingers swallowed by a deity# guard", /*french*/"les #raies avallées par le gardien# protègent", /*spanish*/"unos #stingers engullidos por cierta deidad# guardan"},
-                     }, {},
-                       //clear text
-                       Text{"a school of #stingers swallowed by Jabu-Jabu# guard", /*french*/"les #raies avallées par Jabu-Jabu# protègent", /*spanish*/"unos #stingers engullidos por Jabu-Jabu# guardan"}
-  );
+    hintTextTable[RHT_JABU_JABUS_BELLY_BARINADE_HEART] = HintText(CustomMessage("They say that #Barinade# holds #[[1]]#.",
+                                                                     /*german*/ "",
+                                                                     /*french*/ "Selon moi, #Barinade# possède #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                  // /*spanish*/ Según dicen, #Barinade# porta #[[1]]#.
+                                                                  {}, {
+                                                                  CustomMessage("They say that the #Bio-Electric Anemone# holds #[[1]]#.",
+                                                                      /*german*/ "",
+                                                                      /*french*/ "Selon moi, l'#anémone bioélectrique# possède #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                   // /*spanish*/ Según dicen, la #anémona bioeléctrica# porta #[[1]]#.
 
-    hintTable[RHT_JABU_JABUS_BELLY_BARINADE_HEART] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #Bio-Electric Anemone# holds", /*french*/"l'#anémone bioélectrique# possède", /*spanish*/"la #anémona bioeléctrica# porta"},
-                     }, {},
-                       //clear text
-                       Text{"#Barinade# holds", /*french*/"#Barinade# possède", /*spanish*/"#Barinade# porta"}
-  );
+    hintTextTable[RHT_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER] = HintText(CustomMessage("They say that a #spider resting near a princess# in Jabu-Jabu's Belly holds #[[1]]#.",
+                                                                              /*german*/ "",
+                                                                              /*french*/ "Selon moi, une #Skulltula près de la princesse dans le Ventre de Jabu-Jabu# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                           // /*spanish*/ Según dicen, una #Skulltula junto a una princesa# en la Tripa de Jabu-Jabu otorga #[[1]]#.
 
-    hintTable[RHT_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider resting near a princess# in Jabu-Jabu's Belly holds", /*french*/"une #Skulltula près de la princesse dans le Ventre de Jabu-Jabu# a", /*spanish*/"una #Skulltula junto a una princesa# en la Tripa de Jabu-Jabu otorga"},
-  });
+    hintTextTable[RHT_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER] = HintText(CustomMessage("They say that a #spider resting near a princess# in Jabu-Jabu's Belly holds #[[1]]#.",
+                                                                              /*german*/ "",
+                                                                              /*french*/ "Selon moi, une #Skulltula près de la princesse dans le Ventre de Jabu-Jabu# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                           // /*spanish*/ Según dicen, una #Skulltula junto a una princesa# en la Tripa de Jabu-Jabu otorga #[[1]]#.
 
-    hintTable[RHT_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider resting near a princess# in Jabu-Jabu's Belly holds", /*french*/"une #Skulltula près de la princesse dans le Ventre de Jabu-Jabu# a", /*spanish*/"una #Skulltula junto a una princesa# en la Tripa de Jabu-Jabu otorga"},
-  });
+    hintTextTable[RHT_JABU_JABUS_BELLY_GS_NEAR_BOSS] = HintText(CustomMessage("They say that #jellyfish surround a spider# holding #[[1]]#.",
+                                                                   /*german*/ "",
+                                                                   /*french*/ "Selon moi, une #Skulltula entourée de méduses dans le Ventre de Jabu-Jabu# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                // /*spanish*/ Según dicen, una #Skulltula rodeada de medusas# otorga #[[1]]#.
 
-    hintTable[RHT_JABU_JABUS_BELLY_GS_NEAR_BOSS] = HintText::Exclude({
-                       //obscure text
-                       Text{"#jellyfish surround a spider# holding", /*french*/"une #Skulltula entourée de méduses dans le Ventre de Jabu-Jabu# a", /*spanish*/"una #Skulltula rodeada de medusas# otorga"},
-  });
+    hintTextTable[RHT_JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM] = HintText(CustomMessage("They say that a #spider guarded by a school of stingers# in Jabu-Jabu's Belly holds #[[1]]#.",
+                                                                           /*german*/ "",
+                                                                           /*french*/ "Selon moi, une #Skulltula protégée par des raies dans le Ventre de Jabu-Jabu# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                        // /*spanish*/ Según dicen, una #Skulltula rodeada por unos stingers# en la Tripa de Jabu-Jabu otorga #[[1]]#.
 
-    hintTable[RHT_JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider guarded by a school of stingers# in Jabu-Jabu's Belly holds", /*french*/"une #Skulltula protégée par des raies dans le Ventre de Jabu-Jabu# a", /*spanish*/"una #Skulltula rodeada por unos stingers# en la Tripa de Jabu-Jabu otorga"},
-  });
+    hintTextTable[RHT_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM] = HintText(CustomMessage("They say that a #spider surrounded by electricity# in Jabu-Jabu's Belly holds #[[1]]#.",
+                                                                             /*german*/ "",
+                                                                             /*french*/ "Selon moi, une #Skulltula entourée d'électricité dans le Ventre de Jabu-Jabu# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                          // /*spanish*/ Según dicen, una #Skulltula rodeada de electricidad# en la Tripa de Jabu-Jabu otorga #[[1]]#.
 
+    hintTextTable[RHT_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM] = HintText(CustomMessage("They say that a #spider guarded by a school of stingers# in Jabu-Jabu's Belly holds #[[1]]#.",
+                                                                                 /*german*/ "",
+                                                                                 /*french*/ "Selon moi, une #Skulltula protégée par des raies dans le Ventre de Jabu-Jabu# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                              // /*spanish*/ Según dicen, una #Skulltula protegida por unos stingers# en la Tripa de Jabu-Jabu otorga #[[1]]#.
 
-    hintTable[RHT_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider surrounded by electricity# in Jabu-Jabu's Belly holds", /*french*/"une #Skulltula entourée d'électricité dans le Ventre de Jabu-Jabu# a", /*spanish*/"una #Skulltula rodeada de electricidad# en la Tripa de Jabu-Jabu otorga"},
-  });
-
-    hintTable[RHT_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider guarded by a school of stingers# in Jabu-Jabu's Belly holds", /*french*/"une #Skulltula protégée par des raies dans le Ventre de Jabu-Jabu# a", /*spanish*/"una #Skulltula protegida por unos stingers# en la Tripa de Jabu-Jabu otorga"},
-  });
-
-    hintTable[RHT_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider in a web within Jabu-Jabu's Belly# holds", /*french*/"une #Skulltula sur une toile dans le Ventre de Jabu-Jabu# a", /*spanish*/"una #Skulltula sobre una red# en la Tripa de Jabu-Jabu otorga"},
-  });
-
-    hintTable[RHT_JABU_JABUS_BELLY_DEKU_SCRUB] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #scrub in a deity# sells", /*french*/"la #peste Mojo dans le ventre du gardien# vend", /*spanish*/"un #deku dentro de cierta deidad# vende"},
-  });
+    hintTextTable[RHT_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS] = HintText(CustomMessage("They say that a #spider in a web within Jabu-Jabu's Belly# holds #[[1]]#.",
+                                                                      /*german*/ "",
+                                                                      /*french*/ "Selon moi, une #Skulltula sur une toile dans le Ventre de Jabu-Jabu# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                   // /*spanish*/ Según dicen, una #Skulltula sobre una red# en la Tripa de Jabu-Jabu otorga #[[1]]#.
 
+    hintTextTable[RHT_JABU_JABUS_BELLY_DEKU_SCRUB] = HintText(CustomMessage("They say that a #scrub in a deity# sells #[[1]]#.",
+                                                                 /*german*/ "",
+                                                                 /*french*/ "Selon moi, la #peste Mojo dans le ventre du gardien# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                              // /*spanish*/ Según dicen, un #deku dentro de cierta deidad# vende #[[1]]#.
   /*--------------------------
   |      FOREST TEMPLE       |
   ---------------------------*/
-    hintTable[RHT_FOREST_TEMPLE_FIRST_ROOM_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #tree in the Forest Temple# supports", /*french*/"sur l'#arbre dans le Temple de la Forêt# gît", /*spanish*/"sobre un #árbol del Templo del Bosque# yace"},
-  });
+ hintTextTable[RHT_FOREST_TEMPLE_FIRST_ROOM_CHEST] = HintText(CustomMessage("They say that a #tree in the Forest Temple# supports #[[1]]#.",
+                                                                    /*german*/ "",
+                                                                    /*french*/ "Selon moi, sur l'#arbre dans le Temple de la Forêt# gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                 // /*spanish*/ Según dicen, sobre un #árbol del Templo del Bosque# yace #[[1]]#.
 
-    hintTable[RHT_FOREST_TEMPLE_FIRST_STALFOS_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#defeating enemies beneath a falling ceiling# in Forest Temple yields", /*french*/"#deux squelettes# dans le Temple de la Forêt protègent", /*spanish*/"#derrotar enemigos caídos de lo alto# del Templo del Bosque revela"},
-  });
+    hintTextTable[RHT_FOREST_TEMPLE_FIRST_STALFOS_CHEST] = HintText(CustomMessage("They say that #defeating enemies beneath a falling ceiling# in Forest Temple yields #[[1]]#.",
+                                                                       /*german*/ "",
+                                                                       /*french*/ "Selon moi, #deux squelettes# dans le Temple de la Forêt protègent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                    // /*spanish*/ Según dicen, #derrotar enemigos caídos de lo alto# del Templo del Bosque revela #[[1]]#.
 
-    hintTable[RHT_FOREST_TEMPLE_WELL_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #sunken chest deep in the woods# contains", /*french*/"le #coffre submergé dans la forêt# contient", /*spanish*/"un #sumergido cofre en lo profundo del bosque# contiene"},
-  });
+    hintTextTable[RHT_FOREST_TEMPLE_WELL_CHEST] = HintText(CustomMessage("They say that a #sunken chest deep in the woods# contains #[[1]]#.",
+                                                              /*german*/ "",
+                                                              /*french*/ "Selon moi, le #coffre submergé dans la forêt# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                           // /*spanish*/ Según dicen, un #sumergido cofre en lo profundo del bosque# contiene #[[1]]#.
 
-    hintTable[RHT_FOREST_TEMPLE_MAP_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #fiery skull# in Forest Temple guards", /*french*/"le #crâne enflammé# dans le Temple de la Forêt protège", /*spanish*/"una #ardiente calavera# del Templo del Bosque esconde"},
-  });
+    hintTextTable[RHT_FOREST_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say that a #fiery skull# in Forest Temple guards #[[1]]#.",
+                                                             /*german*/ "",
+                                                             /*french*/ "Selon moi, le #crâne enflammé# dans le Temple de la Forêt protège #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                          // /*spanish*/ Según dicen, una #ardiente calavera# del Templo del Bosque esconde #[[1]]#.
 
-    hintTable[RHT_FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #chest on a small island# in the Forest Temple holds", /*french*/"le #coffre sur l'îlot# du Temple de la Forêt contient", /*spanish*/"un #cofre sobre una isla# del Templo del Bosque contiene"},
-  });
+    hintTextTable[RHT_FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST] = HintText(CustomMessage("They say that a #chest on a small island# in the Forest Temple holds #[[1]]#.",
+                                                                                 /*german*/ "",
+                                                                                 /*french*/ "Selon moi, le #coffre sur l'îlot# du Temple de la Forêt contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                              // /*spanish*/ Según dicen, un #cofre sobre una isla# del Templo del Bosque contiene #[[1]]#.
 
-    hintTable[RHT_FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"beneath a #checkerboard falling ceiling# lies", /*french*/"sous #l'échiquier tombant# gît", /*spanish*/"tras un #techo de ajedrez# yace"},
-  });
+    hintTextTable[RHT_FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST] = HintText(CustomMessage("They say that beneath a #checkerboard falling ceiling# lies #[[1]]#.",
+                                                                              /*german*/ "",
+                                                                              /*french*/ "Selon moi, sous #l'échiquier tombant# gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                           // /*spanish*/ Según dicen, tras un #techo de ajedrez# yace #[[1]]#.
 
-    hintTable[RHT_FOREST_TEMPLE_EYE_SWITCH_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #sharp eye# will spot", /*french*/"l'#oeil perçant# dans la forêt verra", /*spanish*/"un #afilado ojo# revela"},
-                     }, {},
-                       //clear text
-                       Text{"#blocks of stone# in the Forest Temple surround", /*french*/"les #blocs dans le Temple de la Forêt# entourent", /*spanish*/"cerca de unos #bloques de piedra# del Templo del Bosque yace"}
-  );
+    hintTextTable[RHT_FOREST_TEMPLE_EYE_SWITCH_CHEST] = HintText(CustomMessage("They say that #blocks of stone# in the Forest Temple surround #[[1]]#.",
+                                                                    /*german*/ "",
+                                                                    /*french*/ "Selon moi, les #blocs dans le Temple de la Forêt# entourent #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                 // /*spanish*/ Según dicen, cerca de unos #bloques de piedra# del Templo del Bosque yace #[[1]]#.
+                                                                 {}, {
+                                                                 CustomMessage("They say that a #sharp eye# will spot #[[1]]#.",
+                                                                     /*german*/ "",
+                                                                     /*french*/ "Selon moi, l'#oeil perçant# dans la forêt verra #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                  // /*spanish*/ Según dicen, un #afilado ojo# revela #[[1]]#.
 
-    hintTable[RHT_FOREST_TEMPLE_BOSS_KEY_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #turned trunk# contains", /*french*/"le #coffre pivoté# contient", /*spanish*/"en una #sala con otro punto de vista# se esconde"},
-  });
+    hintTextTable[RHT_FOREST_TEMPLE_BOSS_KEY_CHEST] = HintText(CustomMessage("They say that a #turned trunk# contains #[[1]]#.",
+                                                                  /*german*/ "",
+                                                                  /*french*/ "Selon moi, le #coffre pivoté# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                               // /*spanish*/ Según dicen, en una #sala con otro punto de vista# se esconde #[[1]]#.
 
-    hintTable[RHT_FOREST_TEMPLE_FLOORMASTER_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"deep in the forest #shadows guard a chest# containing", /*french*/"l'#ombre de la forêt# protège un coffre contenant", /*spanish*/"en lo profundo del bosque #unas sombras# esconden"},
-  });
+    hintTextTable[RHT_FOREST_TEMPLE_FLOORMASTER_CHEST] = HintText(CustomMessage("They say that deep in the forest #shadows guard a chest# containing #[[1]]#.",
+                                                                     /*german*/ "",
+                                                                     /*french*/ "Selon moi, l'#ombre de la forêt# protège un coffre contenant #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                  // /*spanish*/ Según dicen, en lo profundo del bosque #unas sombras# esconden #[[1]]#.
 
-    hintTable[RHT_FOREST_TEMPLE_BOW_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"an #army of the dead# guards", /*french*/"des #squelettes sylvestres# protègent", /*spanish*/"un #ejército de soldados caídos# guarda"},
-                     }, {},
-                       //clear text
-                       Text{"#Stalfos deep in the Forest Temple# guard", /*french*/"#trois squelettes dans le Temple de la Forêt# protègent", /*spanish*/"los #Stalfos en lo profundo del Templo del Bosque# guardan"}
-  );
+    hintTextTable[RHT_FOREST_TEMPLE_BOW_CHEST] = HintText(CustomMessage("They say that #Stalfos deep in the Forest Temple# guard #[[1]]#.",
+                                                             /*german*/ "",
+                                                             /*french*/ "Selon moi, #trois squelettes dans le Temple de la Forêt# protègent #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                          // /*spanish*/ Según dicen, los #Stalfos en lo profundo del Templo del Bosque# guardan #[[1]]#.
+                                                          {}, {
+                                                          CustomMessage("They say that an #army of the dead# guards #[[1]]#.",
+                                                              /*german*/ "",
+                                                              /*french*/ "Selon moi, des #squelettes sylvestres# protègent #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                           // /*spanish*/ Según dicen, un #ejército de soldados caídos# guarda #[[1]]#.
 
-    hintTable[RHT_FOREST_TEMPLE_RED_POE_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#Joelle# guards", /*french*/"#Joelle# protège", /*spanish*/"#Joelle# guarda"},
-                     }, {},
-                       //clear text
-                       Text{"a #red ghost# guards", /*french*/"le #fantôme rouge# protège", /*spanish*/"un #espectro rojo# guarda"}
-  );
+    hintTextTable[RHT_FOREST_TEMPLE_RED_POE_CHEST] = HintText(CustomMessage("They say that a #red ghost# guards #[[1]]#.",
+                                                                 /*german*/ "",
+                                                                 /*french*/ "Selon moi, le #fantôme rouge# protège #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                              // /*spanish*/ Según dicen, un #espectro rojo# guarda #[[1]]#.
+                                                              {}, {
+                                                              CustomMessage("They say that #Joelle# guards #[[1]]#.",
+                                                                  /*german*/ "",
+                                                                  /*french*/ "Selon moi, #Joelle# protège #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                               // /*spanish*/ Según dicen, #Joelle# guarda #[[1]]#.
 
-    hintTable[RHT_FOREST_TEMPLE_BLUE_POE_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#Beth# guards", /*french*/"#Beth# protège", /*spanish*/"#Beth# guarda"},
-                     }, {},
-                       //clear text
-                       Text{"a #blue ghost# guards", /*french*/"le #fantôme bleu# protège", /*spanish*/"un #espectro azul# guarda"}
-  );
+    hintTextTable[RHT_FOREST_TEMPLE_BLUE_POE_CHEST] = HintText(CustomMessage("They say that a #blue ghost# guards #[[1]]#.",
+                                                                  /*german*/ "",
+                                                                  /*french*/ "Selon moi, le #fantôme bleu# protège #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                               // /*spanish*/ Según dicen, un #espectro azul# guarda #[[1]]#.
+                                                               {}, {
+                                                               CustomMessage("They say that #Beth# guards #[[1]]#.",
+                                                                   /*german*/ "",
+                                                                   /*french*/ "Selon moi, #Beth# protège #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                // /*spanish*/ Según dicen, #Beth# guarda #[[1]]#.
 
-    hintTable[RHT_FOREST_TEMPLE_BASEMENT_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#revolving walls# in the Forest Temple conceal", /*french*/"des #murs rotatifs dans la forêt# recèlent", /*spanish*/"las #paredes giratorias# del Templo del Bosque conceden"},
-  });
+    hintTextTable[RHT_FOREST_TEMPLE_BASEMENT_CHEST] = HintText(CustomMessage("They say that #revolving walls# in the Forest Temple conceal #[[1]]#.",
+                                                                  /*german*/ "",
+                                                                  /*french*/ "Selon moi, des #murs rotatifs dans la forêt# recèlent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                               // /*spanish*/ Según dicen, las #paredes giratorias# del Templo del Bosque conceden #[[1]]#.
 
+    hintTextTable[RHT_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST] = HintText(CustomMessage("They say that a #tree in the Forest Temple# supports #[[1]]#.",
+                                                                       /*german*/ "",
+                                                                       /*french*/ "Selon moi, sur l'#arbre dans le Temple de la Forêt# gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                    // /*spanish*/ Según dicen, sobre un #árbol del Templo del Bosque# yace #[[1]]#.
 
-    hintTable[RHT_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #tree in the Forest Temple# supports", /*french*/"sur l'#arbre dans le Temple de la Forêt# gît", /*spanish*/"sobre un #árbol del Templo del Bosque# yace"},
-  });
+    hintTextTable[RHT_FOREST_TEMPLE_MQ_WOLFOS_CHEST] = HintText(CustomMessage("They say that #defeating enemies beneath a falling ceiling# in Forest Temple yields #[[1]]#.",
+                                                                   /*german*/ "",
+                                                                   /*french*/ "Selon moi, #deux squelettes# dans le Temple de la Forêt protègent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                // /*spanish*/ Según dicen, #derrotar enemigos caídos de lo alto# del Templo del Bosque revela #[[1]]#.
 
-    hintTable[RHT_FOREST_TEMPLE_MQ_WOLFOS_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#defeating enemies beneath a falling ceiling# in Forest Temple yields", /*french*/"#deux squelettes# dans le Temple de la Forêt protègent", /*spanish*/"#derrotar enemigos caídos de lo alto# del Templo del Bosque revela"},
-  });
+    hintTextTable[RHT_FOREST_TEMPLE_MQ_BOW_CHEST] = HintText(CustomMessage("They say that #Stalfos deep in the Forest Temple# guard #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, #trois squelettes dans le Temple de la Forêt# protègent #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                             // /*spanish*/ Según dicen, los #Stalfos en lo profundo del Templo del Bosque# guardan #[[1]]#.
+                                                             {}, {
+                                                             CustomMessage("They say that an #army of the dead# guards #[[1]]#.",
+                                                                 /*german*/ "",
+                                                                 /*french*/ "Selon moi, des #squelettes sylvestres# protègent #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                              // /*spanish*/ Según dicen, un #ejército de soldados caídos# guarda #[[1]]#.
 
-    hintTable[RHT_FOREST_TEMPLE_MQ_BOW_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"an #army of the dead# guards", /*french*/"des #squelettes sylvestres# protègent", /*spanish*/"un #ejército de soldados caídos# guarda"},
-                     }, {},
-                       //clear text
-                       Text{"#Stalfos deep in the Forest Temple# guard", /*french*/"#trois squelettes dans le Temple de la Forêt# protègent", /*spanish*/"los #Stalfos en lo profundo del Templo del Bosque# guardan"}
-  );
+    hintTextTable[RHT_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST] = HintText(CustomMessage("They say that a #chest on a small island# in the Forest Temple holds #[[1]]#.",
+                                                                                          /*german*/ "",
+                                                                                          /*french*/ "Selon moi, le #coffre sur l'îlot# du Temple de la Forêt contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                       // /*spanish*/ Según dicen, un #cofre sobre una isla# del Templo del Bosque contiene #[[1]]#.
 
-    hintTable[RHT_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #chest on a small island# in the Forest Temple holds", /*french*/"le #coffre sur l'îlot# du Temple de la Forêt contient", /*spanish*/"un #cofre sobre una isla# del Templo del Bosque contiene"},
-  });
+    hintTextTable[RHT_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST] = HintText(CustomMessage("They say that #high in a courtyard# within the Forest Temple is #[[1]]#.",
+                                                                                          /*german*/ "",
+                                                                                          /*french*/ "Selon moi, #haut perché dans le jardin# du Temple de la Forêt gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                       // /*spanish*/ Según dicen, un #cofre en lo alto de un patio# del Templo del Bosque contiene #[[1]]#.
 
-    hintTable[RHT_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#high in a courtyard# within the Forest Temple is", /*french*/"#haut perché dans le jardin# du Temple de la Forêt gît", /*spanish*/"un #cofre en lo alto de un patio# del Templo del Bosque contiene"},
-  });
+    hintTextTable[RHT_FOREST_TEMPLE_MQ_WELL_CHEST] = HintText(CustomMessage("They say that a #sunken chest deep in the woods# contains #[[1]]#.",
+                                                                 /*german*/ "",
+                                                                 /*french*/ "Selon moi, le #coffre submergé dans la forêt# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                              // /*spanish*/ Según dicen, un #sumergido cofre en lo profundo del bosque# contiene #[[1]]#.
 
-    hintTable[RHT_FOREST_TEMPLE_MQ_WELL_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #sunken chest deep in the woods# contains", /*french*/"le #coffre submergé dans la forêt# contient", /*spanish*/"un #sumergido cofre en lo profundo del bosque# contiene"},
-  });
+    hintTextTable[RHT_FOREST_TEMPLE_MQ_MAP_CHEST] = HintText(CustomMessage("They say that a #red ghost# guards #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, le #fantôme rouge# protège #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                             // /*spanish*/ Según dicen, un #fantasma rojo# guarda #[[1]]#.
+                                                             {}, {
+                                                             CustomMessage("They say that #Joelle# guards #[[1]]#.",
+                                                                 /*german*/ "",
+                                                                 /*french*/ "Selon moi, #Joelle# protège #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                              // /*spanish*/ Según dicen, #Joelle# guarda #[[1]]#.
 
-    hintTable[RHT_FOREST_TEMPLE_MQ_MAP_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#Joelle# guards", /*french*/"#Joelle# protège", /*spanish*/"#Joelle# guarda"},
-                     }, {},
-                       //clear text
-                       Text{"a #red ghost# guards", /*french*/"le #fantôme rouge# protège", /*spanish*/"un #fantasma rojo# guarda"}
-  );
+    hintTextTable[RHT_FOREST_TEMPLE_MQ_COMPASS_CHEST] = HintText(CustomMessage("They say that a #blue ghost# guards #[[1]]#.",
+                                                                    /*german*/ "",
+                                                                    /*french*/ "Selon moi, le #fantôme bleu# protège #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                 // /*spanish*/ Según dicen, un #fantasma azul# guarda #[[1]]#.
+                                                                 {}, {
+                                                                 CustomMessage("They say that #Beth# guards #[[1]]#.",
+                                                                     /*german*/ "",
+                                                                     /*french*/ "Selon moi, #Beth# protège #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                  // /*spanish*/ Según dicen, #Beth# guarda #[[1]]#.
 
-    hintTable[RHT_FOREST_TEMPLE_MQ_COMPASS_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#Beth# guards", /*french*/"#Beth# protège", /*spanish*/"#Beth# guarda"},
-                     }, {},
-                       //clear text
-                       Text{"a #blue ghost# guards", /*french*/"le #fantôme bleu# protège", /*spanish*/"un #fantasma azul# guarda"}
-  );
+    hintTextTable[RHT_FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST] = HintText(CustomMessage("They say that beneath a #checkerboard falling ceiling# lies #[[1]]#.",
+                                                                                 /*german*/ "",
+                                                                                 /*french*/ "Selon moi, sous #l'échiquier tombant# gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                              // /*spanish*/ Según dicen, tras un #techo de ajedrez# yace #[[1]]#.
 
-    hintTable[RHT_FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"beneath a #checkerboard falling ceiling# lies", /*french*/"sous #l'échiquier tombant# gît", /*spanish*/"tras un #techo de ajedrez# yace"},
-  });
+    hintTextTable[RHT_FOREST_TEMPLE_MQ_BASEMENT_CHEST] = HintText(CustomMessage("They say that #revolving walls# in the Forest Temple conceal #[[1]]#.",
+                                                                     /*german*/ "",
+                                                                     /*french*/ "Selon moi, des #murs rotatifs dans la forêt# recèlent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                  // /*spanish*/ Según dicen, las #paredes giratorias# del Templo del Bosque conceden #[[1]]#.
 
-    hintTable[RHT_FOREST_TEMPLE_MQ_BASEMENT_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#revolving walls# in the Forest Temple conceal", /*french*/"des #murs rotatifs dans la forêt# recèlent", /*spanish*/"las #paredes giratorias# del Templo del Bosque conceden"},
-  });
+    hintTextTable[RHT_FOREST_TEMPLE_MQ_REDEAD_CHEST] = HintText(CustomMessage("They say that deep in the forest #undead guard a chest# containing #[[1]]#.",
+                                                                   /*german*/ "",
+                                                                   /*french*/ "Selon moi, des #revenants dans le Temple de la Forêt# protègent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                // /*spanish*/ Según dicen, en lo profundo del bosque #guardias del más allá# guardan #[[1]]#.
 
-    hintTable[RHT_FOREST_TEMPLE_MQ_REDEAD_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"deep in the forest #undead guard a chest# containing", /*french*/"des #revenants dans le Temple de la Forêt# protègent", /*spanish*/"en lo profundo del bosque #guardias del más allá# guardan"},
-  });
+    hintTextTable[RHT_FOREST_TEMPLE_MQ_BOSS_KEY_CHEST] = HintText(CustomMessage("They say that a #turned trunk# contains #[[1]]#.",
+                                                                     /*german*/ "",
+                                                                     /*french*/ "Selon moi, le #coffre pivoté# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                  // /*spanish*/ Según dicen, en una #sala con otro punto de vista# se esconde #[[1]]#.
 
-    hintTable[RHT_FOREST_TEMPLE_MQ_BOSS_KEY_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #turned trunk# contains", /*french*/"le #coffre pivoté# contient", /*spanish*/"en una #sala con otro punto de vista# se esconde"},
-  });
+    hintTextTable[RHT_FOREST_TEMPLE_PHANTOM_GANON_HEART] = HintText(CustomMessage("They say that #Phantom Ganon# holds #[[1]]#.",
+                                                                       /*german*/ "",
+                                                                       /*french*/ "Selon moi, #Ganon Spectral# possède #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                    // /*spanish*/ Según dicen, #Ganon Fantasma# porta #[[1]]#.
+                                                                    {}, {
+                                                                    CustomMessage("They say that the #Evil Spirit from Beyond# holds #[[1]]#.",
+                                                                        /*german*/ "",
+                                                                        /*french*/ "Selon moi, l'#esprit maléfique de l'au-delà# possède #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                     // /*spanish*/ Según dicen, el #espíritu maligno de ultratumba# porta #[[1]]#.
 
-    hintTable[RHT_FOREST_TEMPLE_PHANTOM_GANON_HEART] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #Evil Spirit from Beyond# holds", /*french*/"l'#esprit maléfique de l'au-delà# possède", /*spanish*/"el #espíritu maligno de ultratumba# porta"},
-                     }, {},
-                       //clear text
-                       Text{"#Phantom Ganon# holds", /*french*/"#Ganon Spectral# possède", /*spanish*/"#Ganon Fantasma# porta"}
-  );
+    hintTextTable[RHT_FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD] = HintText(CustomMessage("They say that a #spider on a small island# in the Forest Temple holds #[[1]]#.",
+                                                                              /*german*/ "",
+                                                                              /*french*/ "Selon moi, une #Skulltula sur l'îlot du Temple de la Forêt# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                           // /*spanish*/ Según dicen, una #Skulltula sobre una pequeña isla# del Templo del Bosque otorga #[[1]]#.
 
-    hintTable[RHT_FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider on a small island# in the Forest Temple holds", /*french*/"une #Skulltula sur l'îlot du Temple de la Forêt# a", /*spanish*/"una #Skulltula sobre una pequeña isla# del Templo del Bosque otorga"},
-  });
+    hintTextTable[RHT_FOREST_TEMPLE_GS_FIRST_ROOM] = HintText(CustomMessage("They say that a #spider high on a wall of vines# in the Forest Temple holds #[[1]]#.",
+                                                                 /*german*/ "",
+                                                                 /*french*/ "Selon moi, une #Skulltula sur un mur de vignes du Temple de la Forêt# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                              // /*spanish*/ Según dicen, una #Skulltula en lo alto de una pared de cepas# del Templo del Bosque otorga #[[1]]#.
 
-    hintTable[RHT_FOREST_TEMPLE_GS_FIRST_ROOM] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider high on a wall of vines# in the Forest Temple holds", /*french*/"une #Skulltula sur un mur de vignes du Temple de la Forêt# a", /*spanish*/"una #Skulltula en lo alto de una pared de cepas# del Templo del Bosque otorga"},
-  });
+    hintTextTable[RHT_FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD] = HintText(CustomMessage("They say that #stone columns# lead to a spider in the Forest Temple hiding #[[1]]#.",
+                                                                             /*german*/ "",
+                                                                             /*french*/ "Selon moi, une #Skulltula haut perchée dans le jardin du Temple de la Forêt# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                          // /*spanish*/ Según dicen, unas #columnas del Templo del Bosque# conducen a una Skulltula que otorga #[[1]]#.
 
-    hintTable[RHT_FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD] = HintText::Exclude({
-                       //obscure text
-                       Text{"#stone columns# lead to a spider in the Forest Temple hiding", /*french*/"une #Skulltula haut perchée dans le jardin du Temple de la Forêt# a", /*spanish*/"unas #columnas del Templo del Bosque# conducen a una Skulltula que otorga"},
-  });
+    hintTextTable[RHT_FOREST_TEMPLE_GS_LOBBY] = HintText(CustomMessage("They say that a #spider among ghosts# in the Forest Temple guards #[[1]]#.",
+                                                            /*german*/ "",
+                                                            /*french*/ "Selon moi, une #Skulltula dans la grande salle du Temple de la Forêt# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                         // /*spanish*/ Según dicen, una #Skulltula rodeada de fantasmas# del Templo del Bosque otorga #[[1]]#.
 
-    hintTable[RHT_FOREST_TEMPLE_GS_LOBBY] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider among ghosts# in the Forest Temple guards", /*french*/"une #Skulltula dans la grande salle du Temple de la Forêt# a", /*spanish*/"una #Skulltula rodeada de fantasmas# del Templo del Bosque otorga"},
-  });
+    hintTextTable[RHT_FOREST_TEMPLE_GS_BASEMENT] = HintText(CustomMessage("They say that a #spider within revolving walls# in the Forest Temple holds #[[1]]#.",
+                                                               /*german*/ "",
+                                                               /*french*/ "Selon moi, une #Skulltula derrière les murs pivotants du Temple de la Forêt# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                            // /*spanish*/ Según dicen, una #Skulltula entre paredes giratorias# del Templo del Bosque otorga #[[1]]#.
 
-    hintTable[RHT_FOREST_TEMPLE_GS_BASEMENT] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider within revolving walls# in the Forest Temple holds", /*french*/"une #Skulltula derrière les murs pivotants du Temple de la Forêt# a", /*spanish*/"una #Skulltula entre paredes giratorias# del Templo del Bosque otorga"},
-  });
+    hintTextTable[RHT_FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY] = HintText(CustomMessage("They say that an #ivy-hidden spider# in the Forest Temple hoards #[[1]]#.",
+                                                                       /*german*/ "",
+                                                                       /*french*/ "Selon moi, une #Skulltula près de l'entrée du Temple de la Forêt# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                    // /*spanish*/ Según dicen, una #Skulltula escondida entre cepas# del Templo del Bosque otorga #[[1]]#.
 
+    hintTextTable[RHT_FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM] = HintText(CustomMessage("They say that a #spider in a hidden nook# within the Forest Temple holds #[[1]]#.",
+                                                                         /*german*/ "",
+                                                                         /*french*/ "Selon moi, une #Skulltula dans un recoin caché du Temple de la Forêt# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                      // /*spanish*/ Según dicen, una #Skulltula en una esquina oculta# del Templo del Bosque otorga #[[1]]#.
 
-    hintTable[RHT_FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY] = HintText::Exclude({
-                       //obscure text
-                       Text{"an #ivy-hidden spider# in the Forest Temple hoards", /*french*/"une #Skulltula près de l'entrée du Temple de la Forêt# a", /*spanish*/"una #Skulltula escondida entre cepas# del Templo del Bosque otorga"},
-  });
-
-    hintTable[RHT_FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider in a hidden nook# within the Forest Temple holds", /*french*/"une #Skulltula dans un recoin caché du Temple de la Forêt# a", /*spanish*/"una #Skulltula en una esquina oculta# del Templo del Bosque otorga"},
-  });
-
-    hintTable[RHT_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider on an arch# in the Forest Temple holds", /*french*/"une #Skulltula sur une arche du Temple de la Forêt# a", /*spanish*/"una #Skulltula sobre un arco# del Templo del Bosque otorga"},
-  });
-
-    hintTable[RHT_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider on a ledge# in the Forest Temple holds", /*french*/"une #Skulltula dans le jardin du Temple de la Forêt# a", /*spanish*/"una #Skulltula en un borde# del Templo del Bosque otorga"},
-  });
-
-    hintTable[RHT_FOREST_TEMPLE_MQ_GS_WELL] = HintText::Exclude({
-                       //obscure text
-                       Text{"#draining a well# in Forest Temple uncovers a spider with", /*french*/"une #Skulltula au fond du Puits du Temple de la Forêt# a", /*spanish*/"#vaciar el pozo# del Templo del Bosque desvela una Skulltula que otorga"},
-  });
+    hintTextTable[RHT_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD] = HintText(CustomMessage("They say that a #spider on an arch# in the Forest Temple holds #[[1]]#.",
+                                                                                 /*german*/ "",
+                                                                                 /*french*/ "Selon moi, une #Skulltula sur une arche du Temple de la Forêt# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                              // /*spanish*/ Según dicen, una #Skulltula sobre un arco# del Templo del Bosque otorga #[[1]]#.
 
+    hintTextTable[RHT_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD] = HintText(CustomMessage("They say that a #spider on a ledge# in the Forest Temple holds #[[1]]#.",
+                                                                                /*german*/ "",
+                                                                                /*french*/ "Selon moi, une #Skulltula dans le jardin du Temple de la Forêt# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                             // /*spanish*/ Según dicen, una #Skulltula en un borde# del Templo del Bosque otorga #[[1]]#.
+  hintTextTable[RHT_FOREST_TEMPLE_MQ_GS_WELL] = HintText(CustomMessage("They say that #draining a well# in Forest Temple uncovers a spider with #[[1]]#.",
+                                                              /*german*/ "",
+                                                              /*french*/ "Selon moi, une #Skulltula au fond du Puits du Temple de la Forêt# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                           // /*spanish*/ Según dicen, #vaciar el pozo# del Templo del Bosque desvela una Skulltula que otorga #[[1]]#.
+  
   /*--------------------------
   |       FIRE TEMPLE        |
   ---------------------------*/
-    hintTable[RHT_FIRE_TEMPLE_NEAR_BOSS_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#near a dragon# is", /*french*/"#près d'un dragon# gît", /*spanish*/"#cerca de un dragón# yace"},
-  });
+hintTextTable[RHT_FIRE_TEMPLE_NEAR_BOSS_CHEST] = HintText(CustomMessage("They say that #near a dragon# is #[[1]]#.",
+                                                                 /*german*/ "",
+                                                                 /*french*/ "Selon moi, #près d'un dragon# gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                              // /*spanish*/ Según dicen, #cerca de un dragón# yace #[[1]]#.
 
-    hintTable[RHT_FIRE_TEMPLE_FLARE_DANCER_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #Flare Dancer behind a totem# guards", /*french*/"le #Danse-Flamme derrière un totem# protège", /*spanish*/"el #Bailafuego tras unos tótems# esconde"},
-  });
+    hintTextTable[RHT_FIRE_TEMPLE_FLARE_DANCER_CHEST] = HintText(CustomMessage("They say that the #Flare Dancer behind a totem# guards #[[1]]#.",
+                                                                    /*german*/ "",
+                                                                    /*french*/ "Selon moi, le #Danse-Flamme derrière un totem# protège #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                 // /*spanish*/ Según dicen, el #Bailafuego tras unos tótems# esconde #[[1]]#.
 
-    hintTable[RHT_FIRE_TEMPLE_BOSS_KEY_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #prison beyond a totem# holds", /*french*/"la #prison derrière un totem# contient", /*spanish*/"en una #prisión tras unos tótems# yace"},
-  });
+    hintTextTable[RHT_FIRE_TEMPLE_BOSS_KEY_CHEST] = HintText(CustomMessage("They say that a #prison beyond a totem# holds #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, la #prison derrière un totem# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                             // /*spanish*/ Según dicen, en una #prisión tras unos tótems# yace #[[1]]#.
 
-    hintTable[RHT_FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#explosives over a lava pit# unveil", /*french*/"des #explosifs dans un lac de lave# révèlent", /*spanish*/"los #explosivos en un mar de llamas# revelan"},
-  });
+    hintTextTable[RHT_FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST] = HintText(CustomMessage("They say that #explosives over a lava pit# unveil #[[1]]#.",
+                                                                                  /*german*/ "",
+                                                                                  /*french*/ "Selon moi, des #explosifs dans un lac de lave# révèlent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                               // /*spanish*/ Según dicen, los #explosivos en un mar de llamas# revelan #[[1]]#.
 
-    hintTable[RHT_FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #Goron trapped near lava# holds", /*french*/"le #Goron emprisonné près de la lave# a", /*spanish*/"un #goron atrapado cerca de un mar de llamas# guarda"},
-  });
+    hintTextTable[RHT_FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST] = HintText(CustomMessage("They say that a #Goron trapped near lava# holds #[[1]]#.",
+                                                                                     /*german*/ "",
+                                                                                     /*french*/ "Selon moi, le #Goron emprisonné près de la lave# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                  // /*spanish*/ Según dicen, un #goron atrapado cerca de un mar de llamas# guarda #[[1]]#.
 
-    hintTable[RHT_FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #Goron at the end of a maze# holds", /*french*/"le #Goron dans le labyrinthe# a", /*spanish*/"un #goron al final de un laberinto# guarda"},
-  });
+    hintTextTable[RHT_FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST] = HintText(CustomMessage("They say that a #Goron at the end of a maze# holds #[[1]]#.",
+                                                                          /*german*/ "",
+                                                                          /*french*/ "Selon moi, le #Goron dans le labyrinthe# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                       // /*spanish*/ Según dicen, un #goron al final de un laberinto# guarda #[[1]]#.
 
-    hintTable[RHT_FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #Goron above a maze# holds", /*french*/"le #Goron au dessus du labyrinthe# a", /*spanish*/"un #goron sobre un laberinto# guarda"},
-  });
+    hintTextTable[RHT_FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST] = HintText(CustomMessage("They say that a #Goron above a maze# holds #[[1]]#.",
+                                                                          /*german*/ "",
+                                                                          /*french*/ "Selon moi, le #Goron au dessus du labyrinthe# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                       // /*spanish*/ Según dicen, un #goron sobre un laberinto# guarda #[[1]]#.
 
-    hintTable[RHT_FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #Goron hidden near a maze# holds", /*french*/"le #Goron caché près du labyrinthe# a", /*spanish*/"un #goron escondido tras un laberinto# guarda"},
-  });
+    hintTextTable[RHT_FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST] = HintText(CustomMessage("They say that a #Goron hidden near a maze# holds #[[1]]#.",
+                                                                              /*german*/ "",
+                                                                              /*french*/ "Selon moi, le #Goron caché près du labyrinthe# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                           // /*spanish*/ Según dicen, un #goron escondido tras un laberinto# guarda #[[1]]#.
 
-    hintTable[RHT_FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #blocked path# in Fire Temple holds", /*french*/"un #sol fragile dans le Temple du Feu# contient", /*spanish*/"en un #camino bloqueado# del Templo del Fuego yace"},
-  });
+    hintTextTable[RHT_FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST] = HintText(CustomMessage("They say that a #blocked path# in Fire Temple holds #[[1]]#.",
+                                                                             /*german*/ "",
+                                                                             /*french*/ "Selon moi, un #sol fragile dans le Temple du Feu# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                          // /*spanish*/ Según dicen, en un #camino bloqueado# del Templo del Fuego yace #[[1]]#.
 
-    hintTable[RHT_FIRE_TEMPLE_MAP_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #caged chest# in the Fire Temple hoards", /*french*/"un #coffre emprisonné# dans le Temple du Feu contient", /*spanish*/"un #cofre entre rejas# del Templo del Fuego contiene"},
-  });
+    hintTextTable[RHT_FIRE_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say that a #caged chest# in the Fire Temple hoards #[[1]]#.",
+                                                           /*german*/ "",
+                                                           /*french*/ "Selon moi, un #coffre emprisonné# dans le Temple du Feu contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                        // /*spanish*/ Según dicen, un #cofre entre rejas# del Templo del Fuego contiene #[[1]]#.
 
-    hintTable[RHT_FIRE_TEMPLE_COMPASS_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #chest in a fiery maze# contains", /*french*/"un #coffre dans un labyrinthe enflammé# contient", /*spanish*/"un #cofre de un ardiente laberinto# contiene"},
-  });
+    hintTextTable[RHT_FIRE_TEMPLE_COMPASS_CHEST] = HintText(CustomMessage("They say that a #chest in a fiery maze# contains #[[1]]#.",
+                                                               /*german*/ "",
+                                                               /*french*/ "Selon moi, un #coffre dans un labyrinthe enflammé# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                            // /*spanish*/ Según dicen, un #cofre de un ardiente laberinto# contiene #[[1]]#.
 
-    hintTable[RHT_FIRE_TEMPLE_HIGHEST_GORON_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #Goron atop the Fire Temple# holds", /*french*/"le #Goron au sommet du Temple du Feu# a", /*spanish*/"un #goron en lo alto del Templo del Fuego# guarda"},
-  });
+    hintTextTable[RHT_FIRE_TEMPLE_HIGHEST_GORON_CHEST] = HintText(CustomMessage("They say that a #Goron atop the Fire Temple# holds #[[1]]#.",
+                                                                     /*german*/ "",
+                                                                     /*french*/ "Selon moi, le #Goron au sommet du Temple du Feu# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                  // /*spanish*/ Según dicen, un #goron en lo alto del Templo del Fuego# guarda #[[1]]#.
 
+    hintTextTable[RHT_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST] = HintText(CustomMessage("They say that #near a dragon# is #[[1]]#.",
+                                                                    /*german*/ "",
+                                                                    /*french*/ "Selon moi, #près d'un dragon# gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                 // /*spanish*/ Según dicen, #cerca de un dragón# yace #[[1]]#.
 
-    hintTable[RHT_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#near a dragon# is", /*french*/"#près d'un dragon# gît", /*spanish*/"#cerca de un dragón# yace"},
-  });
+    hintTextTable[RHT_FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST] = HintText(CustomMessage("They say that the #Flare Dancer in the depths of the Fire Temple# guards #[[1]]#.",
+                                                                         /*german*/ "",
+                                                                         /*french*/ "Selon moi, le #Danse-Flamme au coeur du volcan# a #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                      // /*spanish*/ Según dicen, el #Bailafuego en lo profundo del Templo del Fuego# esconde #[[1]]#.
+                                                                      {}, {
+                                                                      CustomMessage("They say that the #Flare Dancer in the depths of a volcano# guards #[[1]]#.",
+                                                                          /*german*/ "",
+                                                                          /*french*/ "Selon moi, le #Danse-Flamme au coeur du volcan# a #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                       // /*spanish*/ Según dicen, el #Bailafuego en lo profundo del volcán# esconde #[[1]]#.
 
-    hintTable[RHT_FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #Flare Dancer in the depths of a volcano# guards", /*french*/"le #Danse-Flamme au coeur du volcan# a", /*spanish*/"el #Bailafuego en lo profundo del volcán# esconde"},
-                     }, {},
-                       //clear text
-                       Text{"the #Flare Dancer in the depths of the Fire Temple# guards", /*french*/"le #Danse-Flamme au coeur du volcan# a", /*spanish*/"el #Bailafuego en lo profundo del Templo del Fuego# esconde"}
-  );
+    hintTextTable[RHT_FIRE_TEMPLE_MQ_COMPASS_CHEST] = HintText(CustomMessage("They say that a #blocked path# in Fire Temple holds #[[1]]#.",
+                                                                  /*german*/ "",
+                                                                  /*french*/ "Selon moi, le #chemin scellé# dans le Temple du Feu contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                               // /*spanish*/ Según dicen, en un #camino bloqueado# del Templo del Fuego yace #[[1]]#.
 
-    hintTable[RHT_FIRE_TEMPLE_MQ_COMPASS_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #blocked path# in Fire Temple holds", /*french*/"le #chemin scellé# dans le Temple du Feu contient", /*spanish*/"en un #camino bloqueado# del Templo del Fuego yace"},
-  });
+    hintTextTable[RHT_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST] = HintText(CustomMessage("They say that #crates in a maze# contain #[[1]]#.",
+                                                                              /*german*/ "",
+                                                                              /*french*/ "Selon moi, des #boîtes dans le labyrinthe# contiennent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                           // /*spanish*/ Según dicen, las #cajas de un laberinto# contienen #[[1]]#.
 
-    hintTable[RHT_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#crates in a maze# contain", /*french*/"des #boîtes dans le labyrinthe# contiennent", /*spanish*/"las #cajas de un laberinto# contienen"},
-  });
+    hintTextTable[RHT_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST] = HintText(CustomMessage("They say that #crates in a maze# contain #[[1]]#.",
+                                                                              /*german*/ "",
+                                                                              /*french*/ "Selon moi, des #boîtes dans le labyrinthe# contiennent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                           // /*spanish*/ Según dicen, las #cajas de un laberinto# contienen #[[1]]#.
 
-    hintTable[RHT_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#crates in a maze# contain", /*french*/"des #boîtes dans le labyrinthe# contiennent", /*spanish*/"las #cajas de un laberinto# contienen"},
-  });
+    hintTextTable[RHT_FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST] = HintText(CustomMessage("They say that a #falling slug# in the Fire Temple guards #[[1]]#.",
+                                                                        /*german*/ "",
+                                                                        /*french*/ "Selon moi, la #limace tombante# dans le Temple du Feu protège #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                     // /*spanish*/ Según dicen, una #babosa del techo# del Templo del Fuego guarda #[[1]]#.
 
-    hintTable[RHT_FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #falling slug# in the Fire Temple guards", /*french*/"la #limace tombante# dans le Temple du Feu protège", /*spanish*/"una #babosa del techo# del Templo del Fuego guarda"},
-  });
+    hintTextTable[RHT_FIRE_TEMPLE_MQ_MAP_CHEST] = HintText(CustomMessage("They say that using a #hammer in the depths of the Fire Temple# reveals #[[1]]#.",
+                                                              /*german*/ "",
+                                                              /*french*/ "Selon moi, frapper du #marteau au coeur du volcan# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                           // /*spanish*/ Según dicen, usar el #martillo en lo profundo del Templo del Fuego# revela #[[1]]#.
 
-    hintTable[RHT_FIRE_TEMPLE_MQ_MAP_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"using a #hammer in the depths of the Fire Temple# reveals", "frapper du #marteau au coeur du volcan# révèle", /*spanish*/"usar el #martillo en lo profundo del Templo del Fuego# revela"},
-  });
+    hintTextTable[RHT_FIRE_TEMPLE_MQ_BOSS_KEY_CHEST] = HintText(CustomMessage("They say that #illuminating a lava pit# reveals the path to #[[1]]#.",
+                                                                   /*german*/ "",
+                                                                   /*french*/ "Selon moi, #éclairer le lac de lave# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                // /*spanish*/ Según dicen, #iluminar un mar de llamas# revela #[[1]]#.
 
-    hintTable[RHT_FIRE_TEMPLE_MQ_BOSS_KEY_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#illuminating a lava pit# reveals the path to", /*french*/"#éclairer le lac de lave# révèle", /*spanish*/"#iluminar un mar de llamas# revela"},
-  });
+    hintTextTable[RHT_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST] = HintText(CustomMessage("They say that #explosives over a lava pit# unveil #[[1]]#.",
+                                                                                     /*german*/ "",
+                                                                                     /*french*/ "Selon moi, des #explosifs dans un lac de lave# révèlent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                  // /*spanish*/ Según dicen, los #explosivos en un mar de llamas# revelan #[[1]]#.
 
-    hintTable[RHT_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#explosives over a lava pit# unveil", /*french*/"des #explosifs dans un lac de lave# révèlent", /*spanish*/"los #explosivos en un mar de llamas# revelan"},
-  });
+    hintTextTable[RHT_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST] = HintText(CustomMessage("They say that a #Goron hidden near a maze# holds #[[1]]#.",
+                                                                                  /*german*/ "",
+                                                                                  /*french*/ "Selon moi, le #Goron caché près du labyrinthe# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                               // /*spanish*/ Según dicen, un #goron cerca de un laberinto# guarda #[[1]]#.
 
-    hintTable[RHT_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #Goron hidden near a maze# holds", /*french*/"le #Goron caché près du labyrinthe# a", /*spanish*/"un #goron cerca de un laberinto# guarda"},
-  });
+    hintTextTable[RHT_FIRE_TEMPLE_MQ_FREESTANDING_KEY] = HintText(CustomMessage("They say that hidden #beneath a block of stone# lies #[[1]]#.",
+                                                                     /*german*/ "",
+                                                                     /*french*/ "Selon moi, caché #derrière un bloc de pierre# gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                  // /*spanish*/ Según dicen, #bajo unos bloques de piedra# yace #[[1]]#.
 
-    hintTable[RHT_FIRE_TEMPLE_MQ_FREESTANDING_KEY] = HintText::Exclude({
-                       //obscure text
-                       Text{"hidden #beneath a block of stone# lies", /*french*/"caché #derrière un bloc de pierre# gît", /*spanish*/"#bajo unos bloques de piedra# yace"},
-  });
+    hintTextTable[RHT_FIRE_TEMPLE_VOLVAGIA_HEART] = HintText(CustomMessage("They say that #Volvagia# holds #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, #Volvagia# possède #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                             // /*spanish*/ Según dicen, #Volvagia# porta #[[1]]#.
+                                                             {}, {
+                                                             CustomMessage("They say that the #Subterranean Lava Dragon# holds #[[1]]#.",
+                                                                 /*german*/ "",
+                                                                 /*french*/ "Selon moi, le #dragon des profondeurs# possède #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                              // /*spanish*/ Según dicen, el #dragón de lava subterráneo# porta #[[1]]#.
 
-    hintTable[RHT_FIRE_TEMPLE_VOLVAGIA_HEART] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #Subterranean Lava Dragon# holds", /*french*/"le #dragon des profondeurs# possède", /*spanish*/"el #dragón de lava subterráneo# porta"},
-                     }, {},
-                       //clear text
-                       Text{"#Volvagia# holds", /*french*/"#Volvagia# possède", /*spanish*/"#Volvagia# porta"}
-  );
+    hintTextTable[RHT_FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM] = HintText(CustomMessage("They say that #eight tiles of malice# guard a spider holding #[[1]]#.",
+                                                                      /*german*/ "",
+                                                                      /*french*/ "Selon moi, une #Skulltula protégée par huit tuiles dans le Temple du Feu# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                   // /*spanish*/ Según dicen, #ocho baldosas de maldad# custodian una Skulltula que otorga #[[1]]#.
 
-    hintTable[RHT_FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM] = HintText::Exclude({
-                       //obscure text
-                       Text{"#eight tiles of malice# guard a spider holding", /*french*/"une #Skulltula protégée par huit tuiles dans le Temple du Feu# a", /*spanish*/"#ocho baldosas de maldad# custodian una Skulltula que otorga"},
-  });
+    hintTextTable[RHT_FIRE_TEMPLE_GS_BOSS_KEY_LOOP] = HintText(CustomMessage("They say that #five tiles of malice# guard a spider holding #[[1]]#.",
+                                                                  /*german*/ "",
+                                                                  /*french*/ "Selon moi, une #Skulltula protégée par cinq tuiles dans le Temple du Feu# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                               // /*spanish*/ Según dicen, #cinco baldosas de maldad# custodian una Skulltula que otorga #[[1]]#.
 
-    hintTable[RHT_FIRE_TEMPLE_GS_BOSS_KEY_LOOP] = HintText::Exclude({
-                       //obscure text
-                       Text{"#five tiles of malice# guard a spider holding", /*french*/"une #Skulltula protégée par cinq tuiles dans le Temple du Feu# a", /*spanish*/"#cinco baldosas de maldad# custodian una Skulltula que otorga"},
-  });
+    hintTextTable[RHT_FIRE_TEMPLE_GS_BOULDER_MAZE] = HintText(CustomMessage("They say that #explosives in a maze# unveil a spider hiding #[[1]]#.",
+                                                                 /*german*/ "",
+                                                                 /*french*/ "Selon moi, une #Skulltula derrière un mur fragile du Temple du Feu# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                              // /*spanish*/ Según dicen, los #explosivos en un laberinto# desvelan una Skulltula que otorga #[[1]]#.
 
-    hintTable[RHT_FIRE_TEMPLE_GS_BOULDER_MAZE] = HintText::Exclude({
-                       //obscure text
-                       Text{"#explosives in a maze# unveil a spider hiding", /*french*/"une #Skulltula derrière un mur fragile du Temple du Feu# a", /*spanish*/"los #explosivos en un laberinto# desvelan una Skulltula que otorga"},
-  });
+    hintTextTable[RHT_FIRE_TEMPLE_GS_SCARECROW_TOP] = HintText(CustomMessage("They say that a #spider-friendly scarecrow# atop the Fire Temple hides #[[1]]#.",
+                                                                  /*german*/ "",
+                                                                  /*french*/ "Selon moi, une #Skulltula repérée par l'épouvantail du Temple du Feu# a #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                               // /*spanish*/ Según dicen, un #espantapájaros del Templo del Fuego# custodia una Skulltula que otorga #[[1]]#.
+                                                               {}, {
+                                                               CustomMessage("They say that a #spider-friendly scarecrow# atop a volcano hides #[[1]]#.",
+                                                                   /*german*/ "",
+                                                                   /*french*/ "Selon moi, une #Skulltula repérée par l'épouvantail du volcan# a #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                // /*spanish*/ Según dicen, un #espantapájaros en lo alto de un volcán# custodia una Skulltula que otorga #[[1]]#.
 
-    hintTable[RHT_FIRE_TEMPLE_GS_SCARECROW_TOP] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider-friendly scarecrow# atop a volcano hides", /*french*/"une #Skulltula repérée par l'épouvantail du volcan# a", /*spanish*/"un #espantapájaros en lo alto de un volcán# custodia una Skulltula que otorga"},
-                     }, {},
-                       //clear text
-                       Text{"a #spider-friendly scarecrow# atop the Fire Temple hides", /*french*/"une #Skulltula repérée par l'épouvantail du Temple du Feu# a", /*spanish*/"un #espantapájaros del Templo del Fuego# custodia una Skulltula que otorga"}
-  );
+    hintTextTable[RHT_FIRE_TEMPLE_GS_SCARECROW_CLIMB] = HintText(CustomMessage("They say that a #spider-friendly scarecrow# atop the Fire Temple hides #[[1]]#.",
+                                                                    /*german*/ "",
+                                                                    /*french*/ "Selon moi, une #Skulltula repérée par l'épouvantail du Temple du Feu# a #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                 // /*spanish*/ Según dicen, un #espantapájaros del Templo del Fuego# custodia una Skulltula que otorga #[[1]]#.
+                                                                 {}, {
+                                                                 CustomMessage("They say that a #spider-friendly scarecrow# atop a volcano hides #[[1]]#.",
+                                                                     /*german*/ "",
+                                                                     /*french*/ "Selon moi, une #Skulltula repérée par l'épouvantail du volcan# a #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                  // /*spanish*/ Según dicen, un #espantapájaros en lo alto de un volcán# custodia una Skulltula que otorga #[[1]]#.
 
-    hintTable[RHT_FIRE_TEMPLE_GS_SCARECROW_CLIMB] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider-friendly scarecrow# atop a volcano hides", /*french*/"une #Skulltula repérée par l'épouvantail du volcan# a", /*spanish*/"un #espantapájaros en lo alto de un volcán# custodia una Skulltula que otorga"},
-                     }, {},
-                       //clear text
-                       Text{"a #spider-friendly scarecrow# atop the Fire Temple hides", /*french*/"une #Skulltula repérée par l'épouvantail du Temple du Feu# a", /*spanish*/"un #espantapájaros del Templo del Fuego# custodia una Skulltula que otorga"}
-  );
+    hintTextTable[RHT_FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE] = HintText(CustomMessage("They say that a #spider above a fiery maze# holds #[[1]]#.",
+                                                                            /*german*/ "",
+                                                                            /*french*/ "Selon moi, une #Skulltula au dessus du labyrinthe enflammé du Temple du Feu# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                         // /*spanish*/ Según dicen, una #Skulltula sobre un ardiente laberinto# otorga #[[1]]#.
 
+    hintTextTable[RHT_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER] = HintText(CustomMessage("They say that a #spider within a fiery maze# holds #[[1]]#.",
+                                                                             /*german*/ "",
+                                                                             /*french*/ "Selon moi, une #Skulltula dans le labyrinthe enflammé du Temple du Feu# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                          // /*spanish*/ Según dicen, una #Skulltula en el interior de un ardiente laberinto# otorga #[[1]]#.
 
-    hintTable[RHT_FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider above a fiery maze# holds", /*french*/"une #Skulltula au dessus du labyrinthe enflammé du Temple du Feu# a", /*spanish*/"una #Skulltula sobre un ardiente laberinto# otorga"},
-  });
+    hintTextTable[RHT_FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR] = HintText(CustomMessage("They say that a #Goron trapped near lava# befriended a spider with #[[1]]#.",
+                                                                               /*german*/ "",
+                                                                               /*french*/ "Selon moi, une #Skulltula emprisonnée près du lac de lave du Temple du Feu# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                            // /*spanish*/ Según dicen, una #Skulltula amiga de un Goron atrapado junto a la lava# otorga #[[1]]#.
 
-    hintTable[RHT_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider within a fiery maze# holds", /*french*/"une #Skulltula dans le labyrinthe enflammé du Temple du Feu# a", /*spanish*/"una #Skulltula en el interior de un ardiente laberinto# otorga"},
-  });
-
-    hintTable[RHT_FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #Goron trapped near lava# befriended a spider with", /*french*/"une #Skulltula emprisonnée près du lac de lave du Temple du Feu# a", /*spanish*/"una #Skulltula amiga de un Goron atrapado junto a la lava# otorga"},
-  });
-
-    hintTable[RHT_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider beside a fiery maze# holds", /*french*/"une #Skulltula près du labyrinthe enflammé du Temple du Feu# a", /*spanish*/"una #Skulltula junto a un ardiente laberinto# otorga"},
-  });
+    hintTextTable[RHT_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM] = HintText(CustomMessage("They say that a #spider beside a fiery maze# holds #[[1]]#.",
+                                                                                /*german*/ "",
+                                                                                /*french*/ "Selon moi, une #Skulltula près du labyrinthe enflammé du Temple du Feu# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                             // /*spanish*/ Según dicen, una #Skulltula junto a un ardiente laberinto# otorga #[[1]]#.
 
   /*--------------------------
   |       WATER TEMPLE       |
   ---------------------------*/
-    hintTable[RHT_WATER_TEMPLE_MAP_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#rolling spikes# in the Water Temple surround", /*french*/"des #Spikes# dans le Temple de l'Eau entourent", /*spanish*/"unas #rodantes púas# del Templo del Agua guardan"},
-  });
+    hintTextTable[RHT_WATER_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say that #rolling spikes# in the Water Temple surround #[[1]]#.",
+                                                            /*german*/ "",
+                                                            /*french*/ "Selon moi, des #Spikes# dans le Temple de l'Eau entourent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                         // /*spanish*/ Según dicen, unas #rodantes púas# del Templo del Agua guardan #[[1]]#.
 
-    hintTable[RHT_WATER_TEMPLE_COMPASS_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#roaming stingers in the Water Temple# guard", /*french*/"des #raies dans le Temple de l'Eau# protègent", /*spanish*/"unos #errantes stingers# del Templo del Agua guardan"},
-  });
+    hintTextTable[RHT_WATER_TEMPLE_COMPASS_CHEST] = HintText(CustomMessage("They say that #roaming stingers in the Water Temple# guard #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, des #raies dans le Temple de l'Eau# protègent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                             // /*spanish*/ Según dicen, unos #errantes stingers# del Templo del Agua guardan #[[1]]#.
 
-    hintTable[RHT_WATER_TEMPLE_TORCHES_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#fire in the Water Temple# reveals", /*french*/"des #flammes dans le Temple de l'Eau# révèlent", /*spanish*/"el #fuego en el Templo del Agua# revela"},
-  });
+    hintTextTable[RHT_WATER_TEMPLE_TORCHES_CHEST] = HintText(CustomMessage("They say that #fire in the Water Temple# reveals #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, des #flammes dans le Temple de l'Eau# révèlent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                             // /*spanish*/ Según dicen, el #fuego en el Templo del Agua# revela #[[1]]#.
 
-    hintTable[RHT_WATER_TEMPLE_DRAGON_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #serpent's prize# in the Water Temple is", /*french*/"la #récompense du dragon submergé# est", /*spanish*/"el #escamado premio# del Templo del Agua se trata de"},
-  });
+    hintTextTable[RHT_WATER_TEMPLE_DRAGON_CHEST] = HintText(CustomMessage("They say that a #serpent's prize# in the Water Temple is #[[1]]#.",
+                                                               /*german*/ "",
+                                                               /*french*/ "Selon moi, la #récompense du dragon submergé# est #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                            // /*spanish*/ Según dicen, el #escamado premio# del Templo del Agua se trata de #[[1]]#.
 
-    hintTable[RHT_WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#blinding an eye# in the Water Temple leads to", /*french*/"#l'oeil# du Temple de l'Eau voit", /*spanish*/"#cegar un ojo# del Templo del Agua conduce a"},
-  });
+    hintTextTable[RHT_WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST] = HintText(CustomMessage("They say that #blinding an eye# in the Water Temple leads to #[[1]]#.",
+                                                                           /*german*/ "",
+                                                                           /*french*/ "Selon moi, #l'oeil# du Temple de l'Eau voit #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                        // /*spanish*/ Según dicen, #cegar un ojo# del Templo del Agua conduce a #[[1]]#.
 
-    hintTable[RHT_WATER_TEMPLE_CENTRAL_PILLAR_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"in the #depths of the Water Temple# lies", /*french*/"le #coeur du Temple de l'Eau# cache", /*spanish*/"en las #profundidades del Templo del Agua# yace"},
-  });
+    hintTextTable[RHT_WATER_TEMPLE_CENTRAL_PILLAR_CHEST] = HintText(CustomMessage("They say that in the #depths of the Water Temple# lies #[[1]]#.",
+                                                                       /*german*/ "",
+                                                                       /*french*/ "Selon moi, le #coeur du Temple de l'Eau# cache #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                    // /*spanish*/ Según dicen, en las #profundidades del Templo del Agua# yace #[[1]]#.
 
-    hintTable[RHT_WATER_TEMPLE_CRACKED_WALL_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#through a crack# in the Water Temple is", /*french*/"le #mur fragile# du Temple de l'Eau cache", /*spanish*/"tras una #agrietada pared# del Templo del Agua yace"},
-  });
+    hintTextTable[RHT_WATER_TEMPLE_CRACKED_WALL_CHEST] = HintText(CustomMessage("They say that #through a crack# in the Water Temple is #[[1]]#.",
+                                                                     /*german*/ "",
+                                                                     /*french*/ "Selon moi, le #mur fragile# du Temple de l'Eau cache #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                  // /*spanish*/ Según dicen, tras una #agrietada pared# del Templo del Agua yace #[[1]]#.
 
-    hintTable[RHT_WATER_TEMPLE_LONGSHOT_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#facing yourself# reveals",              /*french*/"se #vaincre soi-même# révèle", /*spanish*/"#luchar contra ti mismo# revela"},
-                       Text{"a #dark reflection# of yourself guards", /*french*/"son #propre reflet# cache",    /*spanish*/"el #oscuro reflejo de ti mismo# guarda"},
-                     }, {},
-                       //clear text
-                       Text{"#Dark Link# guards", /*french*/"l'#Ombre de @# protège", /*spanish*/"#@ Oscuro# guarda"}
-  );
+    hintTextTable[RHT_WATER_TEMPLE_LONGSHOT_CHEST] = HintText(CustomMessage("They say that #Dark Link# guards #[[1]]#.",
+                                                                 /*german*/ "",
+                                                                 /*french*/ "Selon moi, l'#Ombre de @# protège #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                              // /*spanish*/ Según dicen, #@ Oscuro# guarda #[[1]]#.
+                                                              {}, {
+                                                              CustomMessage("They say that #facing yourself# reveals #[[1]]#.",
+                                                                  /*german*/ "",
+                                                                  /*french*/ "Selon moi, se #vaincre soi-même# révèle #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                               // /*spanish*/ Según dicen, #luchar contra ti mismo# revela #[[1]]#.
+                                                              CustomMessage("They say that a #dark reflection# of yourself guards #[[1]]#.",
+                                                                  /*german*/ "",
+                                                                  /*french*/ "Selon moi, son #propre reflet# cache #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                               // /*spanish*/ Según dicen, el #oscuro reflejo de ti mismo# guarda #[[1]]#.
 
+    hintTextTable[RHT_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST] = HintText(CustomMessage("They say that in the #depths of the Water Temple# lies #[[1]]#.",
+                                                                          /*german*/ "",
+                                                                          /*french*/ "Selon moi, le #coeur du Temple de l'Eau# cache #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                       // /*spanish*/ Según dicen, en las #profundidades del Templo del Agua# yace #[[1]]#.
 
-    hintTable[RHT_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"in the #depths of the Water Temple# lies", /*french*/"le #coeur du Temple de l'Eau# cache", /*spanish*/"en las #profundidades del Templo del Agua# yace"},
-  });
+    hintTextTable[RHT_WATER_TEMPLE_MQ_BOSS_KEY_CHEST] = HintText(CustomMessage("They say that fire in the Water Temple unlocks a #vast gate# revealing a chest with #[[1]]#.",
+                                                                    /*german*/ "",
+                                                                    /*french*/ "Selon moi, des #flammes au coeur du Temple de l'Eau# révèlent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                 // /*spanish*/ Según dicen, el fuego en el Templo del Agua alza una #gran valla# con #[[1]]#.
 
-    hintTable[RHT_WATER_TEMPLE_MQ_BOSS_KEY_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"fire in the Water Temple unlocks a #vast gate# revealing a chest with", /*french*/"des #flammes au coeur du Temple de l'Eau# révèlent", /*spanish*/"el fuego en el Templo del Agua alza una #gran valla# con"},
-  });
+    hintTextTable[RHT_WATER_TEMPLE_MQ_LONGSHOT_CHEST] = HintText(CustomMessage("They say that #through a crack# in the Water Temple is #[[1]]#.",
+                                                                    /*german*/ "",
+                                                                    /*french*/ "Selon moi, le #mur fragile# du Temple de l'Eau cache #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                 // /*spanish*/ Según dicen, tras una #agrietada pared# del Templo del Agua yace #[[1]]#.
 
-    hintTable[RHT_WATER_TEMPLE_MQ_LONGSHOT_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#through a crack# in the Water Temple is", /*french*/"le #mur fragile# du Temple de l'Eau cache", /*spanish*/"tras una #agrietada pared# del Templo del Agua yace"},
-  });
+    hintTextTable[RHT_WATER_TEMPLE_MQ_COMPASS_CHEST] = HintText(CustomMessage("They say that #fire in the Water Temple# reveals #[[1]]#.",
+                                                                   /*german*/ "",
+                                                                   /*french*/ "Selon moi, des #flammes dans le Temple de l'Eau# révèlent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                // /*spanish*/ Según dicen, el #fuego en el Templo del Agua# revela #[[1]]#.
 
-    hintTable[RHT_WATER_TEMPLE_MQ_COMPASS_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#fire in the Water Temple# reveals", /*french*/"des #flammes dans le Temple de l'Eau# révèlent", /*spanish*/"el #fuego en el Templo del Agua# revela"},
-  });
+    hintTextTable[RHT_WATER_TEMPLE_MQ_MAP_CHEST] = HintText(CustomMessage("They say that #sparring soldiers# in the Water Temple guard #[[1]]#.",
+                                                               /*german*/ "",
+                                                               /*french*/ "Selon moi, les #soldats du Temple de l'Eau# protègent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                            // /*spanish*/ Según dicen, #acabar con unos soldados# del Templo del Agua revela #[[1]]#.
 
-    hintTable[RHT_WATER_TEMPLE_MQ_MAP_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#sparring soldiers# in the Water Temple guard", /*french*/"les #soldats du Temple de l'Eau# protègent", /*spanish*/"#acabar con unos soldados# del Templo del Agua revela"},
-  });
+    hintTextTable[RHT_WATER_TEMPLE_MORPHA_HEART] = HintText(CustomMessage("They say that #Morpha# holds #[[1]]#.",
+                                                               /*german*/ "",
+                                                               /*french*/ "Selon moi, #Morpha# possède #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                            // /*spanish*/ Según dicen, #Morpha# porta #[[1]]#.
+                                                            {}, {
+                                                            CustomMessage("They say that the #Giant Aquatic Amoeba# holds #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, l'#amibe aquatique géante# possède #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                             // /*spanish*/ Según dicen, la #ameba acuática gigante# porta #[[1]]#.
 
-    hintTable[RHT_WATER_TEMPLE_MORPHA_HEART] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #Giant Aquatic Amoeba# holds", /*french*/"l'#amibe aquatique géante# possède", /*spanish*/"la #ameba acuática gigante# porta"},
-                     }, {},
-                       //clear text
-                       Text{"#Morpha# holds", /*french*/"#Morpha# possède", /*spanish*/"#Morpha# porta"}
-  );
+    hintTextTable[RHT_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM] = HintText(CustomMessage("They say that a #spider over a waterfall# in the Water Temple holds #[[1]]#.",
+                                                                           /*german*/ "",
+                                                                           /*french*/ "Selon moi, une #Skulltula au dessus d'une cascade du Temple de l'Eau# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                        // /*spanish*/ Según dicen, una #Skulltula tras una cascada# del Templo del Agua otorga #[[1]]#.
 
-    hintTable[RHT_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider over a waterfall# in the Water Temple holds", /*french*/"une #Skulltula au dessus d'une cascade du Temple de l'Eau# a", /*spanish*/"una #Skulltula tras una cascada# del Templo del Agua otorga"},
-  });
+    hintTextTable[RHT_WATER_TEMPLE_GS_CENTRAL_PILLAR] = HintText(CustomMessage("They say that a #spider in the center of the Water Temple# holds #[[1]]#.",
+                                                                    /*german*/ "",
+                                                                    /*french*/ "Selon moi, une #Skulltula au centre du Temple de l'Eau# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                 // /*spanish*/ Según dicen, una #Skulltula en el centro del Templo del Agua# otorga #[[1]]#.
 
-    hintTable[RHT_WATER_TEMPLE_GS_CENTRAL_PILLAR] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider in the center of the Water Temple# holds", /*french*/"une #Skulltula au centre du Temple de l'Eau# a", /*spanish*/"una #Skulltula en el centro del Templo del Agua# otorga"},
-  });
+    hintTextTable[RHT_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST] = HintText(CustomMessage("They say that a spider protected by #rolling boulders in the Water Temple# hides #[[1]]#.",
+                                                                         /*german*/ "",
+                                                                         /*french*/ "Selon moi, une #Skulltula derrière les rochers roulants du Temple de l'Eau# a #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                      // /*spanish*/ Según dicen, una #Skulltula protegida por rocas rodantes# del Templo del Agua otorga #[[1]]#.
+                                                                      {}, {
+                                                                      CustomMessage("They say that a spider protected by #rolling boulders under the lake# hides #[[1]]#.",
+                                                                          /*german*/ "",
+                                                                          /*french*/ "Selon moi, une #Skulltula derrière les rochers roulants sous le lac# a #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                       // /*spanish*/ Según dicen, una #Skulltula protegida por rocas rodantes# bajo el lago otorga #[[1]]#.
 
-    hintTable[RHT_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a spider protected by #rolling boulders under the lake# hides", /*french*/"une #Skulltula derrière les rochers roulants sous le lac# a", /*spanish*/"una #Skulltula protegida por rocas rodantes# bajo el lago otorga"},
-                     }, {},
-                       //clear text
-                       Text{"a spider protected by #rolling boulders in the Water Temple# hides", /*french*/"une #Skulltula derrière les rochers roulants du Temple de l'Eau# a", /*spanish*/"una #Skulltula protegida por rocas rodantes# del Templo del Agua otorga"}
-  );
+    hintTextTable[RHT_WATER_TEMPLE_GS_RIVER] = HintText(CustomMessage("They say that a #spider over a river# in the Water Temple holds #[[1]]#.",
+                                                           /*german*/ "",
+                                                           /*french*/ "Selon moi, une #Skulltula au dessus de la rivière du Temple de l'Eau# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                        // /*spanish*/ Según dicen, una #Skulltula sobre un río# del Templo del Agua otorga #[[1]]#.
 
-    hintTable[RHT_WATER_TEMPLE_GS_RIVER] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider over a river# in the Water Temple holds", /*french*/"une #Skulltula au dessus de la rivière du Temple de l'Eau# a", /*spanish*/"una #Skulltula sobre un río# del Templo del Agua otorga"},
-  });
+    hintTextTable[RHT_WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH] = HintText(CustomMessage("They say that #beyond a pit of lizards# is a spider holding #[[1]]#.",
+                                                                                  /*german*/ "",
+                                                                                  /*french*/ "Selon moi, une #Skulltula près des lézards du Temple de l'Eau# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                               // /*spanish*/ Según dicen, #más allá de un pozo de reptiles# una Skulltula otorga #[[1]]#.
 
+    hintTextTable[RHT_WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY] = HintText(CustomMessage("They say that #lizards guard a spider# in the Water Temple with #[[1]]#.",
+                                                                         /*german*/ "",
+                                                                         /*french*/ "Selon moi, une #Skulltula dans les couloirs croisés du Temple de l'Eau# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                      // /*spanish*/ Según dicen, unos #reptiles custodian una Skulltula# del Templo del Agua que otorga #[[1]]#.
 
-    hintTable[RHT_WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH] = HintText::Exclude({
-                       //obscure text
-                       Text{"#beyond a pit of lizards# is a spider holding", /*french*/"une #Skulltula près des lézards du Temple de l'Eau# a", /*spanish*/"#más allá de un pozo de reptiles# una Skulltula otorga"},
-  });
-
-    hintTable[RHT_WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY] = HintText::Exclude({
-                       //obscure text
-                       Text{"#lizards guard a spider# in the Water Temple with", /*french*/"une #Skulltula dans les couloirs croisés du Temple de l'Eau# a", /*spanish*/"unos #reptiles custodian una Skulltula# del Templo del Agua que otorga"},
-  });
-
-    hintTable[RHT_WATER_TEMPLE_MQ_GS_RIVER] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider over a river# in the Water Temple holds", /*french*/"une #Skulltula au dessus de la rivière du Temple de l'Eau# a", /*spanish*/"una #Skulltula sobre un río# del Templo del Agua otorga"},
-  });
+    hintTextTable[RHT_WATER_TEMPLE_MQ_GS_RIVER] = HintText(CustomMessage("They say that a #spider over a river# in the Water Temple holds #[[1]]#.",
+                                                              /*german*/ "",
+                                                              /*french*/ "Selon moi, une #Skulltula au dessus de la rivière du Temple de l'Eau# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                           // /*spanish*/ Según dicen, una #Skulltula sobre un río# del Templo del Agua otorga #[[1]]#.
 
   /*--------------------------
   |      SPIRIT TEMPLE       |
   ---------------------------*/
-    hintTable[RHT_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a child conquers a #skull in green fire# in the Spirit Temple to reach", /*french*/"le #crâne au halo vert dans le colosse# cache", /*spanish*/"el joven que #baje el puente# del Templo del Espíritu encontrará"},
-  });
+ hintTextTable[RHT_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST] = HintText(CustomMessage("They say that a child conquers a #skull in green fire# in the Spirit Temple to reach #[[1]]#.",
+                                                                      /*german*/ "",
+                                                                      /*french*/ "Selon moi, le #crâne au halo vert dans le colosse# cache #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                   // /*spanish*/ Según dicen, el joven que #baje el puente# del Templo del Espíritu encontrará #[[1]]#.
 
-    hintTable[RHT_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a child can find a #caged chest# in the Spirit Temple with", /*french*/"le #coffre embarré dans le colosse# contient", /*spanish*/"un joven puede encontrar un #cofre entre rejas# del Templo del Espíritu con"},
-  });
+    hintTextTable[RHT_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST] = HintText(CustomMessage("They say that a child can find a #caged chest# in the Spirit Temple with #[[1]]#.",
+                                                                             /*german*/ "",
+                                                                             /*french*/ "Selon moi, le #coffre embarré dans le colosse# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                          // /*spanish*/ Según dicen, un joven puede encontrar un #cofre entre rejas# del Templo del Espíritu con #[[1]]#.
 
-    hintTable[RHT_SPIRIT_TEMPLE_COMPASS_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#across a pit of sand# in the Spirit Temple lies", /*french*/"le #trou sableux dans le colosse# a", /*spanish*/"tras un #pozo de arena# del Templo del Espíritu yace"},
-  });
+    hintTextTable[RHT_SPIRIT_TEMPLE_COMPASS_CHEST] = HintText(CustomMessage("They say that #across a pit of sand# in the Spirit Temple lies #[[1]]#.",
+                                                                 /*german*/ "",
+                                                                 /*french*/ "Selon moi, le #trou sableux dans le colosse# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                              // /*spanish*/ Según dicen, tras un #pozo de arena# del Templo del Espíritu yace #[[1]]#.
 
-    hintTable[RHT_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#dodging boulders to collect silver rupees# in the Spirit Temple yields", /*french*/"les #pièces argentées entourées de rochers dans le colosse# révèlent", /*spanish*/"#esquivar rocas y conseguir plateadas rupias# en el Templo del Espíritu conduce a"},
-  });
+    hintTextTable[RHT_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST] = HintText(CustomMessage("They say that #dodging boulders to collect silver rupees# in the Spirit Temple yields #[[1]]#.",
+                                                                           /*german*/ "",
+                                                                           /*french*/ "Selon moi, les #pièces argentées entourées de rochers dans le colosse# révèlent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                        // /*spanish*/ Según dicen, #esquivar rocas y conseguir plateadas rupias# en el Templo del Espíritu conduce a #[[1]]#.
 
-    hintTable[RHT_SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #shadow circling reflected light# in the Spirit Temple guards", /*french*/"l'#ombre près d'un miroir# protège", /*spanish*/"un #círculo de reflectante luz# del Templo del Espíritu guarda"},
-  });
+    hintTextTable[RHT_SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST] = HintText(CustomMessage("They say that a #shadow circling reflected light# in the Spirit Temple guards #[[1]]#.",
+                                                                           /*german*/ "",
+                                                                           /*french*/ "Selon moi, l'#ombre près d'un miroir# protège #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                        // /*spanish*/ Según dicen, un #círculo de reflectante luz# del Templo del Espíritu guarda #[[1]]#.
 
-    hintTable[RHT_SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #shadow circling reflected light# in the Spirit Temple guards", /*french*/"l'#ombre près d'un miroir# protège", /*spanish*/"un #círculo de reflectante luz# del Templo del Espíritu guarda"},
-  });
+    hintTextTable[RHT_SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST] = HintText(CustomMessage("They say that a #shadow circling reflected light# in the Spirit Temple guards #[[1]]#.",
+                                                                            /*german*/ "",
+                                                                            /*french*/ "Selon moi, l'#ombre près d'un miroir# protège #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                         // /*spanish*/ Según dicen, un #círculo de reflectante luz# del Templo del Espíritu guarda #[[1]]#.
 
-    hintTable[RHT_SPIRIT_TEMPLE_MAP_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#before a giant statue# in the Spirit Temple lies", /*french*/"#devant la statue# dans le colosse gît", /*spanish*/"#ante una gran estatua# del Templo del Espíritu aguarda"},
-  });
+    hintTextTable[RHT_SPIRIT_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say that #before a giant statue# in the Spirit Temple lies #[[1]]#.",
+                                                             /*german*/ "",
+                                                             /*french*/ "Selon moi, #devant la statue# dans le colosse gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                          // /*spanish*/ Según dicen, #ante una gran estatua# del Templo del Espíritu aguarda #[[1]]#.
 
-    hintTable[RHT_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#lizards in the Spirit Temple# guard", /*french*/"les #lézards dans le colosse# protègent", /*spanish*/"los #reptiles del Templo del Espíritu# guardan"},
-  });
+    hintTextTable[RHT_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST] = HintText(CustomMessage("They say that #lizards in the Spirit Temple# guard #[[1]]#.",
+                                                                           /*german*/ "",
+                                                                           /*french*/ "Selon moi, les #lézards dans le colosse# protègent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                        // /*spanish*/ Según dicen, los #reptiles del Templo del Espíritu# guardan #[[1]]#.
 
-    hintTable[RHT_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#lizards in the Spirit Temple# guard", /*french*/"les #lézards dans le colosse# protègent", /*spanish*/"los #reptiles del Templo del Espíritu# guardan"},
-  });
+    hintTextTable[RHT_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST] = HintText(CustomMessage("They say that #lizards in the Spirit Temple# guard #[[1]]#.",
+                                                                          /*german*/ "",
+                                                                          /*french*/ "Selon moi, les #lézards dans le colosse# protègent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                       // /*spanish*/ Según dicen, los #reptiles del Templo del Espíritu# guardan #[[1]]#.
 
-    hintTable[RHT_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#torchlight among Beamos# in the Spirit Temple reveals", /*french*/"les #torches autour des Sentinelles# éclairent", /*spanish*/"las #antorchas junto a Beamos# del Templo del Espíritu revelan"},
-  });
+    hintTextTable[RHT_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST] = HintText(CustomMessage("They say that #torchlight among Beamos# in the Spirit Temple reveals #[[1]]#.",
+                                                                        /*german*/ "",
+                                                                        /*french*/ "Selon moi, les #torches autour des Sentinelles# éclairent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                     // /*spanish*/ Según dicen, las #antorchas junto a Beamos# del Templo del Espíritu revelan #[[1]]#.
 
-    hintTable[RHT_SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #statue in the Spirit Temple# holds", /*french*/"la #statue dans le colosse# tient", /*spanish*/"una #estatua del Templo del Espíritu# esconde"},
-  });
+    hintTextTable[RHT_SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST] = HintText(CustomMessage("They say that a #statue in the Spirit Temple# holds #[[1]]#.",
+                                                                          /*german*/ "",
+                                                                          /*french*/ "Selon moi, la #statue dans le colosse# tient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                       // /*spanish*/ Según dicen, una #estatua del Templo del Espíritu# esconde #[[1]]#.
 
-    hintTable[RHT_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"on a #ledge by a statue# in the Spirit Temple rests", /*french*/"#haut perché près de la statue# dans le colosse gît", /*spanish*/"al #borde de una estatua# del Templo del Espíritu yace"},
-  });
+    hintTextTable[RHT_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST] = HintText(CustomMessage("They say that on a #ledge by a statue# in the Spirit Temple rests #[[1]]#.",
+                                                                               /*german*/ "",
+                                                                               /*french*/ "Selon moi, #haut perché près de la statue# dans le colosse gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                            // /*spanish*/ Según dicen, al #borde de una estatua# del Templo del Espíritu yace #[[1]]#.
 
-    hintTable[RHT_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"those who #show the light among statues# in the Spirit Temple find", /*french*/"le #soleil près des statues# cache", /*spanish*/"aquellos que #iluminen ante las estatuas# del Templo del Espíritu encontrarán"},
-  });
+    hintTextTable[RHT_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST] = HintText(CustomMessage("They say that those who #show the light among statues# in the Spirit Temple find #[[1]]#.",
+                                                                         /*german*/ "",
+                                                                         /*french*/ "Selon moi, le #soleil près des statues# cache #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                      // /*spanish*/ Según dicen, aquellos que #iluminen ante las estatuas# del Templo del Espíritu encontrarán #[[1]]#.
 
-    hintTable[RHT_SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #Eye of Truth in the Spirit Temple# reveals", /*french*/"le #trésor invisible près du Hache-Viande# contient", /*spanish*/"el #Ojo de la Verdad# en el Templo del Espíritu revela"},
-  });
+    hintTextTable[RHT_SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST] = HintText(CustomMessage("They say that the #Eye of Truth in the Spirit Temple# reveals #[[1]]#.",
+                                                                                 /*german*/ "",
+                                                                                 /*french*/ "Selon moi, le #trésor invisible près du Hache-Viande# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                              // /*spanish*/ Según dicen, el #Ojo de la Verdad# en el Templo del Espíritu revela #[[1]]#.
 
-    hintTable[RHT_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #Eye of Truth in the Spirit Temple# reveals", /*french*/"le #trésor invisible près du Hache-Viande# contient", /*spanish*/"el #Ojo de la Verdad# en el Templo del Espíritu revela"},
-  });
+    hintTextTable[RHT_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST] = HintText(CustomMessage("They say that the #Eye of Truth in the Spirit Temple# reveals #[[1]]#.",
+                                                                                /*german*/ "",
+                                                                                /*french*/ "Selon moi, le #trésor invisible près du Hache-Viande# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                             // /*spanish*/ Según dicen, el #Ojo de la Verdad# en el Templo del Espíritu revela #[[1]]#.
 
-    hintTable[RHT_SPIRIT_TEMPLE_BOSS_KEY_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #chest engulfed in flame# in the Spirit Temple holds", /*french*/"le #coffre enflammé dans le colosse# contient", /*spanish*/"un #cofre rodeado de llamas# del Templo del Espíritu contiene"},
-  });
+    hintTextTable[RHT_SPIRIT_TEMPLE_BOSS_KEY_CHEST] = HintText(CustomMessage("They say that a #chest engulfed in flame# in the Spirit Temple holds #[[1]]#.",
+                                                                  /*german*/ "",
+                                                                  /*french*/ "Selon moi, le #coffre enflammé dans le colosse# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                               // /*spanish*/ Según dicen, un #cofre rodeado de llamas# del Templo del Espíritu contiene #[[1]]#.
 
-    hintTable[RHT_SPIRIT_TEMPLE_TOPMOST_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"those who #show the light above the Colossus# find", /*french*/"le #soleil au sommet du colosse# révèle", /*spanish*/"aquellos que #iluminen en lo alto del Coloso# encontrarán"},
-  });
+    hintTextTable[RHT_SPIRIT_TEMPLE_TOPMOST_CHEST] = HintText(CustomMessage("They say that those who #show the light above the Colossus# find #[[1]]#.",
+                                                                 /*german*/ "",
+                                                                 /*french*/ "Selon moi, le #soleil au sommet du colosse# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                              // /*spanish*/ Según dicen, aquellos que #iluminen en lo alto del Coloso# encontrarán #[[1]]#.
 
+    hintTextTable[RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST] = HintText(CustomMessage("They say that #lying unguarded# in the Spirit Temple is #[[1]]#.",
+                                                                                /*german*/ "",
+                                                                                /*french*/ "Selon moi, dans #l'entrée du colosse# se trouve #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                             // /*spanish*/ Según dicen, en la #entrada del Templo del Espíritu# yace #[[1]]#.
 
-    hintTable[RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#lying unguarded# in the Spirit Temple is", /*french*/"dans #l'entrée du colosse# se trouve", /*spanish*/"en la #entrada del Templo del Espíritu# yace"},
-  });
+    hintTextTable[RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST] = HintText(CustomMessage("They say that a #switch in a pillar# within the Spirit Temple drops #[[1]]#.",
+                                                                                /*german*/ "",
+                                                                                /*french*/ "Selon moi, l'#interrupteur dans un pilier# du colosse cache #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                             // /*spanish*/ Según dicen, el #interruptor de un pilar# del Templo del Espíritu revela #[[1]]#.
 
-    hintTable[RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #switch in a pillar# within the Spirit Temple drops", /*french*/"l'#interrupteur dans un pilier# du colosse cache", /*spanish*/"el #interruptor de un pilar# del Templo del Espíritu revela"},
-  });
+    hintTextTable[RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST] = HintText(CustomMessage("They say that #collecting rupees through a water jet# reveals #[[1]]#.",
+                                                                                 /*german*/ "",
+                                                                                 /*french*/ "Selon moi, les #pièces argentées dans le jet d'eau# du colosse révèlent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                              // /*spanish*/ Según dicen, #hacerte con rupias tras un géiser# revela #[[1]]#.
 
-    hintTable[RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#collecting rupees through a water jet# reveals", /*french*/"les #pièces argentées dans le jet d'eau# du colosse révèlent", /*spanish*/"#hacerte con rupias tras un géiser# revela"},
-  });
+    hintTextTable[RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST] = HintText(CustomMessage("They say that an #eye blinded by stone# within the Spirit Temple conceals #[[1]]#.",
+                                                                               /*german*/ "",
+                                                                               /*french*/ "Selon moi, #l'oeil derrière le rocher# dans le colosse voit #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                            // /*spanish*/ Según dicen, #cegar a un ojo# del Templo del Espíritu revela #[[1]]#.
 
-    hintTable[RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"an #eye blinded by stone# within the Spirit Temple conceals", /*french*/"#l'oeil derrière le rocher# dans le colosse voit", /*spanish*/"#cegar a un ojo# del Templo del Espíritu revela"},
-  });
+    hintTextTable[RHT_SPIRIT_TEMPLE_MQ_MAP_CHEST] = HintText(CustomMessage("They say that surrounded by #fire and wrappings# lies #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, près des #pierres tombales dans le colosse# gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                             // /*spanish*/ Según dicen, rodeado de #fuego y vendas# yace #[[1]]#.
 
-    hintTable[RHT_SPIRIT_TEMPLE_MQ_MAP_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"surrounded by #fire and wrappings# lies", /*french*/"près des #pierres tombales dans le colosse# gît", /*spanish*/"rodeado de #fuego y vendas# yace"},
-  });
+    hintTextTable[RHT_SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST] = HintText(CustomMessage("They say that a child defeats a #gauntlet of monsters# within the Spirit Temple to find #[[1]]#.",
+                                                                           /*german*/ "",
+                                                                           /*french*/ "Selon moi, l'enfant qui vainc #plusieurs monstres# dans le colosse trouvera #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                        // /*spanish*/ Según dicen, el joven que derrote #unos monstruos# del Templo del Espíritu encontrará #[[1]]#.
 
-    hintTable[RHT_SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a child defeats a #gauntlet of monsters# within the Spirit Temple to find", /*french*/"l'enfant qui vainc #plusieurs monstres# dans le colosse trouvera", /*spanish*/"el joven que derrote #unos monstruos# del Templo del Espíritu encontrará"},
-  });
+    hintTextTable[RHT_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST] = HintText(CustomMessage("They say that #explosive sunlight# within the Spirit Temple uncovers #[[1]]#.",
+                                                                              /*german*/ "",
+                                                                              /*french*/ "Selon moi, le #rayon de lumière explosif dans le colosse# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                           // /*spanish*/ Según dicen, una #explosiva luz solar# del Templo del Espíritu revela #[[1]]#.
 
-    hintTable[RHT_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#explosive sunlight# within the Spirit Temple uncovers", /*french*/"le #rayon de lumière explosif dans le colosse# révèle", /*spanish*/"una #explosiva luz solar# del Templo del Espíritu revela"},
-  });
+    hintTextTable[RHT_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST] = HintText(CustomMessage("They say that #trapped by falling enemies# within the Spirit Temple is #[[1]]#.",
+                                                                              /*german*/ "",
+                                                                              /*french*/ "Selon moi, des #ennemis tombants# dans le colosse protègent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                           // /*spanish*/ Según dicen, #rodeado de enemigos del cielo# del Templo del Espíritu yace #[[1]]#.
 
-    hintTable[RHT_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#trapped by falling enemies# within the Spirit Temple is", /*french*/"des #ennemis tombants# dans le colosse protègent", /*spanish*/"#rodeado de enemigos del cielo# del Templo del Espíritu yace"},
-  });
+    hintTextTable[RHT_SPIRIT_TEMPLE_MQ_COMPASS_CHEST] = HintText(CustomMessage("They say that #blinding the colossus# unveils #[[1]]#.",
+                                                                    /*german*/ "",
+                                                                    /*french*/ "Selon moi, #l'oeil dans le colosse# voit #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                 // /*spanish*/ Según dicen, #cegar al coloso# revela #[[1]]#.
 
-    hintTable[RHT_SPIRIT_TEMPLE_MQ_COMPASS_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#blinding the colossus# unveils", /*french*/"#l'oeil dans le colosse# voit", /*spanish*/"#cegar al coloso# revela"},
-  });
+    hintTextTable[RHT_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST] = HintText(CustomMessage("They say that a #royal melody awakens the colossus# to reveal #[[1]]#.",
+                                                                                /*german*/ "",
+                                                                                /*french*/ "Selon moi, la #mélodie royale éveille le colosse# et révèle #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                             // /*spanish*/ Según dicen, la #melodía real que despierte al coloso# revelará #[[1]]#.
 
-    hintTable[RHT_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #royal melody awakens the colossus# to reveal", /*french*/"la #mélodie royale éveille le colosse# et révèle", /*spanish*/"la #melodía real que despierte al coloso# revelará"},
-  });
+    hintTextTable[RHT_SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST] = HintText(CustomMessage("They say that the #Eye of Truth# finds the colossus's hidden #[[1]]#.",
+                                                                                  /*german*/ "",
+                                                                                  /*french*/ "Selon moi, #l'oeil de vérité# verra dans le colosse #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                               // /*spanish*/ Según dicen, el #Ojo de la Verdad# en el Templo del Espíritu encontrará #[[1]]#.
 
-    hintTable[RHT_SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #Eye of Truth# finds the colossus's hidden", /*french*/"#l'oeil de vérité# verra dans le colosse", /*spanish*/"el #Ojo de la Verdad# en el Templo del Espíritu encontrará"},
-  });
+    hintTextTable[RHT_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST] = HintText(CustomMessage("They say that #the old hide what the young find# to reveal #[[1]]#.",
+                                                                                 /*german*/ "",
+                                                                                 /*french*/ "Selon moi, l'#oeil dans le trou du bloc argent# dans le colosse voit #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                              // /*spanish*/ Según dicen, el #adulto esconde lo que el joven anhela#, revelando #[[1]]#.
 
-    hintTable[RHT_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#the old hide what the young find# to reveal", /*french*/"l'#oeil dans le trou du bloc argent# dans le colosse voit", /*spanish*/"el #adulto esconde lo que el joven anhela#, revelando"},
-  });
+    hintTextTable[RHT_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST] = HintText(CustomMessage("They say that #sunlight in a maze of fire# hides #[[1]]#.",
+                                                                           /*german*/ "",
+                                                                           /*french*/ "Selon moi, #la lumière dans le labyrinthe de feu# du colosse révèle #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                        // /*spanish*/ Según dicen, la #luz solar de un ígneo laberinto# esconde #[[1]]#.
 
-    hintTable[RHT_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#sunlight in a maze of fire# hides", /*french*/"#la lumière dans le labyrinthe de feu# du colosse révèle", /*spanish*/"la #luz solar de un ígneo laberinto# esconde"},
-  });
+    hintTextTable[RHT_SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST] = HintText(CustomMessage("They say that #across a pit of sand# in the Spirit Temple lies #[[1]]#.",
+                                                                        /*german*/ "",
+                                                                        /*french*/ "Selon moi, le #trou sableux# dans le colosse a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                     // /*spanish*/ Según dicen, #a través del pozo de arena# del Templo del Espíritu yace #[[1]]#.
 
-    hintTable[RHT_SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#across a pit of sand# in the Spirit Temple lies", /*french*/"le #trou sableux# dans le colosse a", /*spanish*/"#a través del pozo de arena# del Templo del Espíritu yace"},
-  });
+    hintTextTable[RHT_SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST] = HintText(CustomMessage("They say that where #temporal stone blocks the path# within the Spirit Temple lies #[[1]]#.",
+                                                                        /*german*/ "",
+                                                                        /*french*/ "Selon moi, les #pierres temporelles# dans le colosse cachent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                     // /*spanish*/ Según dicen, donde los #bloques temporales bloquean# en el Templo del Espíritu yace #[[1]]#.
 
-    hintTable[RHT_SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"where #temporal stone blocks the path# within the Spirit Temple lies", /*french*/"les #pierres temporelles# dans le colosse cachent", /*spanish*/"donde los #bloques temporales bloquean# en el Templo del Espíritu yace"},
-  });
+    hintTextTable[RHT_SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST] = HintText(CustomMessage("They say that a #chest of double purpose# holds #[[1]]#.",
+                                                                         /*german*/ "",
+                                                                         /*french*/ "Selon moi, le #coffre à usage double# du colosse contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                      // /*spanish*/ Según dicen, un #cofre de doble uso# contiene #[[1]]#.
 
-    hintTable[RHT_SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #chest of double purpose# holds", /*french*/"le #coffre à usage double# du colosse contient", /*spanish*/"un #cofre de doble uso# contiene"},
-  });
+    hintTextTable[RHT_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST] = HintText(CustomMessage("They say that a #temporal stone blocks the light# leading to #[[1]]#.",
+                                                                     /*german*/ "",
+                                                                     /*french*/ "Selon moi, la #pierre temporelle# le colosse fait ombre sur #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                  // /*spanish*/ Según dicen, un #bloque temporal bloquea la luz# que conduce a #[[1]]#.
 
-    hintTable[RHT_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #temporal stone blocks the light# leading to", /*french*/"la #pierre temporelle# le colosse fait ombre sur", /*spanish*/"un #bloque temporal bloquea la luz# que conduce a"},
-  });
+    hintTextTable[RHT_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST] = HintText(CustomMessage("They say that those who #show the light above the Colossus# find #[[1]]#.",
+                                                                                    /*german*/ "",
+                                                                                    /*french*/ "Selon moi, le trésor invisible #au sommet du colosse# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                 // /*spanish*/ Según dicen, aquellos que #revelen la luz sobre el Coloso# encontrarán #[[1]]#.
 
-    hintTable[RHT_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"those who #show the light above the Colossus# find", /*french*/"le trésor invisible #au sommet du colosse# contient", /*spanish*/"aquellos que #revelen la luz sobre el Coloso# encontrarán"},
-  });
+    hintTextTable[RHT_SPIRIT_TEMPLE_TWINROVA_HEART] = HintText(CustomMessage("They say that #Twinrova# holds #[[1]]#.",
+                                                                  /*german*/ "",
+                                                                  /*french*/ "Selon moi, #Twinrova# possède #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                               // /*spanish*/ Según dicen, #Birova# porta #[[1]]#.
+                                                               {}, {
+                                                               CustomMessage("They say that the #Sorceress Sisters# hold #[[1]]#.",
+                                                                   /*german*/ "",
+                                                                   /*french*/ "Selon moi, #les sorcières jumelles# possède #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                // /*spanish*/ Según dicen, las #hermanas hechiceras# portan #[[1]]#.
 
-    hintTable[RHT_SPIRIT_TEMPLE_TWINROVA_HEART] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #Sorceress Sisters# hold", /*french*/"#les sorcières jumelles# possède", /*spanish*/"las #hermanas hechiceras# portan"},
-                     }, {},
-                       //clear text
-                       Text{"#Twinrova# holds", /*french*/"#Twinrova# possède", /*spanish*/"#Birova# porta"}
-    );
+    hintTextTable[RHT_SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM] = HintText(CustomMessage("They say that a spider in the #hall of a knight# guards #[[1]]#.",
+                                                                                /*german*/ "",
+                                                                                /*french*/ "Selon moi, une #Skulltula au dessus d'un escalier du Temple de l'Esprit# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                             // /*spanish*/ Según dicen, una #Skulltula en el salón de un guerrero# otorga #[[1]]#.
 
-    hintTable[RHT_SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM] = HintText::Exclude({
-                       //obscure text
-                       Text{"a spider in the #hall of a knight# guards", /*french*/"une #Skulltula au dessus d'un escalier du Temple de l'Esprit# a", /*spanish*/"una #Skulltula en el salón de un guerrero# otorga"},
-  });
+    hintTextTable[RHT_SPIRIT_TEMPLE_GS_BOULDER_ROOM] = HintText(CustomMessage("They say that a #spider behind a temporal stone# in the Spirit Temple yields #[[1]]#.",
+                                                                   /*german*/ "",
+                                                                   /*french*/ "Selon moi, une #Skulltula derrière une pierre temporelle du Temple de l'Esprit# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                // /*spanish*/ Según dicen, una #Skulltula tras un bloque temporal# del Templo del Espíritu otorga #[[1]]#.
 
-    hintTable[RHT_SPIRIT_TEMPLE_GS_BOULDER_ROOM] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider behind a temporal stone# in the Spirit Temple yields", /*french*/"une #Skulltula derrière une pierre temporelle du Temple de l'Esprit# a", /*spanish*/"una #Skulltula tras un bloque temporal# del Templo del Espíritu otorga"},
-  });
+    hintTextTable[RHT_SPIRIT_TEMPLE_GS_LOBBY] = HintText(CustomMessage("They say that a #spider beside a statue# holds #[[1]]#.",
+                                                            /*german*/ "",
+                                                            /*french*/ "Selon moi, une #Skulltula dans la grande salle du Temple de l'Esprit# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                         // /*spanish*/ Según dicen, una #Skulltula junto a una estatua# del Templo del Espíritu otorga #[[1]]#.
 
-    hintTable[RHT_SPIRIT_TEMPLE_GS_LOBBY] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider beside a statue# holds", /*french*/"une #Skulltula dans la grande salle du Temple de l'Esprit# a", /*spanish*/"una #Skulltula junto a una estatua# del Templo del Espíritu otorga"},
-  });
+    hintTextTable[RHT_SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM] = HintText(CustomMessage("They say that a #spider at the top of a deep shaft# in the Spirit Temple holds #[[1]]#.",
+                                                                        /*german*/ "",
+                                                                        /*french*/ "Selon moi, une #Skulltula près d'un mur d'escalade du Temple de l'Esprit# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                     // /*spanish*/ Según dicen, una #Skulltula en lo alto de un gran hueco# del Templo del Espíritu otorga #[[1]]#.
 
-    hintTable[RHT_SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider at the top of a deep shaft# in the Spirit Temple holds", /*french*/"une #Skulltula près d'un mur d'escalade du Temple de l'Esprit# a", /*spanish*/"una #Skulltula en lo alto de un gran hueco# del Templo del Espíritu otorga"},
-  });
+    hintTextTable[RHT_SPIRIT_TEMPLE_GS_METAL_FENCE] = HintText(CustomMessage("They say that a child defeats a #spider among bats# in the Spirit Temple to gain #[[1]]#.",
+                                                                  /*german*/ "",
+                                                                  /*french*/ "Selon moi, une #Skulltula sur le grillage du Temple de l'Esprit# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                               // /*spanish*/ Según dicen, el joven que derrote la #Skulltula entre murciélagos# del Templo del Espíritu hallará #[[1]]#.
 
-    hintTable[RHT_SPIRIT_TEMPLE_GS_METAL_FENCE] = HintText::Exclude({
-                       //obscure text
-                       Text{"a child defeats a #spider among bats# in the Spirit Temple to gain", /*french*/"une #Skulltula sur le grillage du Temple de l'Esprit# a", /*spanish*/"el joven que derrote la #Skulltula entre murciélagos# del Templo del Espíritu hallará"},
-  });
+    hintTextTable[RHT_SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM] = HintText(CustomMessage("They say that #above a pit of sand# in the Spirit Temple hides #[[1]]#.",
+                                                                     /*german*/ "",
+                                                                     /*french*/ "Selon moi, une #Skulltula au dessus du trou sableux du Temple de l'Esprit# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                  // /*spanish*/ Según dicen, una #Skulltula sobre un pozo de arena# del Templo del Espíritu otorga #[[1]]#.
 
+    hintTextTable[RHT_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST] = HintText(CustomMessage("They say that a spider in the #hall of a knight# guards #[[1]]#.",
+                                                                                /*german*/ "",
+                                                                                /*french*/ "Selon moi, une #Skulltula dans la salle aux neuf trônes du Temple de l'Esprit# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                             // /*spanish*/ Según dicen, una #Skulltula en el salón de un guerrero# otorga #[[1]]#.
 
-    hintTable[RHT_SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM] = HintText::Exclude({
-                       //obscure text
-                       Text{"#above a pit of sand# in the Spirit Temple hides", /*french*/"une #Skulltula au dessus du trou sableux du Temple de l'Esprit# a", /*spanish*/"una #Skulltula sobre un pozo de arena# del Templo del Espíritu otorga"},
-  });
+    hintTextTable[RHT_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH] = HintText(CustomMessage("They say that a spider in the #hall of a knight# guards #[[1]]#.",
+                                                                                 /*german*/ "",
+                                                                                 /*french*/ "Selon moi, une #Skulltula dans la salle aux neuf trônes du Temple de l'Esprit# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                              // /*spanish*/ Según dicen, una #Skulltula en el salón de un guerrero# otorga #[[1]]#.
 
-    hintTable[RHT_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a spider in the #hall of a knight# guards", /*french*/"une #Skulltula dans la salle aux neuf trônes du Temple de l'Esprit# a", /*spanish*/"una #Skulltula en el salón de un guerrero# otorga"},
-  });
-
-    hintTable[RHT_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH] = HintText::Exclude({
-                       //obscure text
-                       Text{"a spider in the #hall of a knight# guards", /*french*/"une #Skulltula dans la salle aux neuf trônes du Temple de l'Esprit# a", /*spanish*/"una #Skulltula en el salón de un guerrero# otorga"},
-  });
-
-    hintTable[RHT_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM] = HintText::Exclude({
-                       //obscure text
-                       Text{"#upon a web of glass# in the Spirit Temple sits a spider holding", /*french*/"une #Skulltula sur une paroi de verre du Temple de l'Esprit# a", /*spanish*/"#sobre una plataforma de cristal# yace una Skulltula que otorga"},
-  });
+    hintTextTable[RHT_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM] = HintText(CustomMessage("They say that #upon a web of glass# in the Spirit Temple sits a spider holding #[[1]]#.",
+                                                                        /*german*/ "",
+                                                                        /*french*/ "Selon moi, une #Skulltula sur une paroi de verre du Temple de l'Esprit# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                     // /*spanish*/ Según dicen, #sobre una plataforma de cristal# yace una Skulltula que otorga #[[1]]#.
 
   /*--------------------------
   |      SHADOW TEMPLE       |
   ---------------------------*/
-    hintTable[RHT_SHADOW_TEMPLE_MAP_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #Eye of Truth# pierces a hall of faces to reveal", /*french*/"l'#oeil de vérité# voit dans les couloirs du Temple de l'Ombre", /*spanish*/"el #Ojo de la Verdad# descubrirá un pasillo de facetas con"},
-  });
+hintTextTable[RHT_SHADOW_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say that the #Eye of Truth# pierces a hall of faces to reveal #[[1]]#.",
+                                                             /*german*/ "",
+                                                             /*french*/ "Selon moi, l'#oeil de vérité# voit dans les couloirs du Temple de l'Ombre #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                          // /*spanish*/ Según dicen, el #Ojo de la Verdad# descubrirá un pasillo de facetas con #[[1]]#.
 
-    hintTable[RHT_SHADOW_TEMPLE_HOVER_BOOTS_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #nether dweller in the Shadow Temple# holds", /*french*/"le #spectre du Temple de l'Ombre# a", /*spanish*/"un #temido morador del Templo de las Sombras# guarda"},
-                     }, {},
-                       //clear text
-                       Text{"#Dead Hand in the Shadow Temple# holds", /*french*/"le #Poigneur dans le Temple de l'Ombre# cache", /*spanish*/"la #Mano Muerta del Templo de las Sombras# guarda"}
-  );
+    hintTextTable[RHT_SHADOW_TEMPLE_HOVER_BOOTS_CHEST] = HintText(CustomMessage("They say that #Dead Hand in the Shadow Temple# holds #[[1]]#.",
+                                                                     /*german*/ "",
+                                                                     /*french*/ "Selon moi, le #Poigneur dans le Temple de l'Ombre# cache #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                  // /*spanish*/ Según dicen, la #Mano Muerta del Templo de las Sombras# guarda #[[1]]#.
+                                                                  {}, {
+                                                                  CustomMessage("They say that a #nether dweller in the Shadow Temple# holds #[[1]]#.",
+                                                                      /*german*/ "",
+                                                                      /*french*/ "Selon moi, le #spectre du Temple de l'Ombre# a #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                   // /*spanish*/ Según dicen, un #temido morador del Templo de las Sombras# guarda #[[1]]#.
 
-    hintTable[RHT_SHADOW_TEMPLE_COMPASS_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#mummies revealed by the Eye of Truth# guard", /*french*/"les #Gibdos dans les couloirs# du Temple de l'Ombre protègent", /*spanish*/"las #momias reveladas por el Ojo de la Verdad# guardan"},
-  });
+    hintTextTable[RHT_SHADOW_TEMPLE_COMPASS_CHEST] = HintText(CustomMessage("They say that #mummies revealed by the Eye of Truth# guard #[[1]]#.",
+                                                                 /*german*/ "",
+                                                                 /*french*/ "Selon moi, les #Gibdos dans les couloirs# du Temple de l'Ombre protègent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                              // /*spanish*/ Según dicen, las #momias reveladas por el Ojo de la Verdad# guardan #[[1]]#.
 
-    hintTable[RHT_SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#spinning scythes# protect", /*french*/"les #faucheurs danseurs# du Temple de l'Ombre protègent", /*spanish*/"las #giratorias guadañas# protegen"},
-  });
+    hintTextTable[RHT_SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST] = HintText(CustomMessage("They say that #spinning scythes# protect #[[1]]#.",
+                                                                            /*german*/ "",
+                                                                            /*french*/ "Selon moi, les #faucheurs danseurs# du Temple de l'Ombre protègent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                         // /*spanish*/ Según dicen, las #giratorias guadañas# protegen #[[1]]#.
 
-    hintTable[RHT_SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#invisible blades# guard", /*french*/"les #faucheurs invisibles# du Temple de l'Ombre protègent", /*spanish*/"las #hojas invisibles# guardan"},
-  });
+    hintTextTable[RHT_SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST] = HintText(CustomMessage("They say that #invisible blades# guard #[[1]]#.",
+                                                                                  /*german*/ "",
+                                                                                  /*french*/ "Selon moi, les #faucheurs invisibles# du Temple de l'Ombre protègent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                               // /*spanish*/ Según dicen, las #hojas invisibles# guardan #[[1]]#.
 
-    hintTable[RHT_SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#invisible blades# guard", /*french*/"les #faucheurs invisibles# du Temple de l'Ombre protègent", /*spanish*/"las #hojas invisibles# guardan"},
-  });
+    hintTextTable[RHT_SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST] = HintText(CustomMessage("They say that #invisible blades# guard #[[1]]#.",
+                                                                                    /*german*/ "",
+                                                                                    /*french*/ "Selon moi, les #faucheurs invisibles# du Temple de l'Ombre protègent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                 // /*spanish*/ Según dicen, las #hojas invisibles# guardan #[[1]]#.
 
-    hintTable[RHT_SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#falling spikes# block the path to", /*french*/"la #pluie de clous# surplombe", /*spanish*/"los #pinchos de un techo# conducen a"},
-  });
+    hintTextTable[RHT_SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST] = HintText(CustomMessage("They say that #falling spikes# block the path to #[[1]]#.",
+                                                                              /*german*/ "",
+                                                                              /*french*/ "Selon moi, la #pluie de clous# surplombe #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                           // /*spanish*/ Según dicen, los #pinchos de un techo# conducen a #[[1]]#.
 
-    hintTable[RHT_SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#falling spikes# block the path to", /*french*/"la #pluie de clous# surplombe", /*spanish*/"los #pinchos de un techo# conducen a"},
-  });
+    hintTextTable[RHT_SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST] = HintText(CustomMessage("They say that #falling spikes# block the path to #[[1]]#.",
+                                                                              /*german*/ "",
+                                                                              /*french*/ "Selon moi, la #pluie de clous# surplombe #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                           // /*spanish*/ Según dicen, los #pinchos de un techo# conducen a #[[1]]#.
 
-    hintTable[RHT_SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#falling spikes# block the path to", /*french*/"la #pluie de clous# surplombe", /*spanish*/"los #pinchos de un techo# conducen a"},
-  });
+    hintTextTable[RHT_SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST] = HintText(CustomMessage("They say that #falling spikes# block the path to #[[1]]#.",
+                                                                               /*german*/ "",
+                                                                               /*french*/ "Selon moi, la #pluie de clous# surplombe #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                            // /*spanish*/ Según dicen, los #pinchos de un techo# conducen a #[[1]]#.
 
-    hintTable[RHT_SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #dead roam among invisible spikes# guarding", /*french*/"#parmi les clous invisibles# du Temple de l'Ombre se cache", /*spanish*/"los #muertos que vagan por pinchos invisibles# protegen"},
-  });
+    hintTextTable[RHT_SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST] = HintText(CustomMessage("They say that the #dead roam among invisible spikes# guarding #[[1]]#.",
+                                                                          /*german*/ "",
+                                                                          /*french*/ "Selon moi, #parmi les clous invisibles# du Temple de l'Ombre se cache #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                       // /*spanish*/ Según dicen, los #muertos que vagan por pinchos invisibles# protegen #[[1]]#.
 
-    hintTable[RHT_SHADOW_TEMPLE_WIND_HINT_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"an #invisible chest guarded by the dead# holds", /*french*/"le #trésor invisible du cul-de-sac# du Temple de l'Ombre contient", /*spanish*/"un #cofre invisible custodiado por los del más allá# contiene"},
-  });
+    hintTextTable[RHT_SHADOW_TEMPLE_WIND_HINT_CHEST] = HintText(CustomMessage("They say that an #invisible chest guarded by the dead# holds #[[1]]#.",
+                                                                   /*german*/ "",
+                                                                   /*french*/ "Selon moi, le #trésor invisible du cul-de-sac# du Temple de l'Ombre contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                // /*spanish*/ Según dicen, un #cofre invisible custodiado por los del más allá# contiene #[[1]]#.
 
-    hintTable[RHT_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#mummies guarding a ferry# hide", /*french*/"les #Gibdos qui bloquent le traversier# cachent", /*spanish*/"las #momias que protegen un navío# esconden"},
-  });
+    hintTextTable[RHT_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST] = HintText(CustomMessage("They say that #mummies guarding a ferry# hide #[[1]]#.",
+                                                                          /*german*/ "",
+                                                                          /*french*/ "Selon moi, les #Gibdos qui bloquent le traversier# cachent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                       // /*spanish*/ Según dicen, las #momias que protegen un navío# esconden #[[1]]#.
 
-    hintTable[RHT_SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#mummies guarding a ferry# hide", /*french*/"les #Gibdos qui bloquent le traversier# cachent", /*spanish*/"las #momias que protegen un navío# esconden"},
-  });
+    hintTextTable[RHT_SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST] = HintText(CustomMessage("They say that #mummies guarding a ferry# hide #[[1]]#.",
+                                                                           /*german*/ "",
+                                                                           /*french*/ "Selon moi, les #Gibdos qui bloquent le traversier# cachent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                        // /*spanish*/ Según dicen, las #momias que protegen un navío# esconden #[[1]]#.
 
-    hintTable[RHT_SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#walls consumed by a ball of fire# reveal", /*french*/"le #piège de bois# du Temple de l'Ombre cache", /*spanish*/"las #paredes consumidas por una esfera ígnea# revelan"},
-  });
+    hintTextTable[RHT_SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST] = HintText(CustomMessage("They say that #walls consumed by a ball of fire# reveal #[[1]]#.",
+                                                                          /*german*/ "",
+                                                                          /*french*/ "Selon moi, le #piège de bois# du Temple de l'Ombre cache #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                       // /*spanish*/ Según dicen, las #paredes consumidas por una esfera ígnea# revelan #[[1]]#.
 
-    hintTable[RHT_SHADOW_TEMPLE_BOSS_KEY_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#walls consumed by a ball of fire# reveal", /*french*/"le #piège de bois# du Temple de l'Ombre cache", /*spanish*/"las #paredes consumidas por una esfera ígnea# revelan"},
-  });
+    hintTextTable[RHT_SHADOW_TEMPLE_BOSS_KEY_CHEST] = HintText(CustomMessage("They say that #walls consumed by a ball of fire# reveal #[[1]]#.",
+                                                                  /*german*/ "",
+                                                                  /*french*/ "Selon moi, le #piège de bois# du Temple de l'Ombre cache #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                               // /*spanish*/ Según dicen, las #paredes consumidas por una esfera ígnea# revelan #[[1]]#.
 
-    hintTable[RHT_SHADOW_TEMPLE_FREESTANDING_KEY] = HintText::Exclude({
-                       //obscure text
-                       Text{"#inside a burning skull# lies", /*french*/"#dans un crâne enflammé# gît", /*spanish*/"en el #interior de una calavera en llamas# aguarda"},
-  });
+    hintTextTable[RHT_SHADOW_TEMPLE_FREESTANDING_KEY] = HintText(CustomMessage("They say that #inside a burning skull# lies #[[1]]#.",
+                                                                    /*german*/ "",
+                                                                    /*french*/ "Selon moi, #dans un crâne enflammé# gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                 // /*spanish*/ Según dicen, en el #interior de una calavera en llamas# aguarda #[[1]]#.
 
+    hintTextTable[RHT_SHADOW_TEMPLE_MQ_COMPASS_CHEST] = HintText(CustomMessage("They say that the #Eye of Truth# pierces a hall of faces to reveal #[[1]]#.",
+                                                                    /*german*/ "",
+                                                                    /*french*/ "Selon moi, l'#oeil de vérité# voit dans les couloirs du Temple de l'Ombre #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                 // /*spanish*/ Según dicen, el #Ojo de la Verdad# descubre un pasillo de facetas con #[[1]]#.
 
-    hintTable[RHT_SHADOW_TEMPLE_MQ_COMPASS_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #Eye of Truth# pierces a hall of faces to reveal", /*french*/"l'#oeil de vérité# voit dans les couloirs du Temple de l'Ombre", /*spanish*/"el #Ojo de la Verdad# descubre un pasillo de facetas con"},
-  });
+    hintTextTable[RHT_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST] = HintText(CustomMessage("They say that #Dead Hand in the Shadow Temple# holds #[[1]]#.",
+                                                                        /*german*/ "",
+                                                                        /*french*/ "Selon moi, le #Poigneur dans le Temple de l'Ombre# cache #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                     // /*spanish*/ Según dicen, la #Mano Muerta del Templo de las Sombras# guarda #[[1]]#.
 
-    hintTable[RHT_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#Dead Hand in the Shadow Temple# holds", /*french*/"le #Poigneur dans le Temple de l'Ombre# cache", /*spanish*/"la #Mano Muerta del Templo de las Sombras# guarda"},
-  });
+    hintTextTable[RHT_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST] = HintText(CustomMessage("They say that #mummies revealed by the Eye of Truth# guard #[[1]]#.",
+                                                                         /*german*/ "",
+                                                                         /*french*/ "Selon moi, les #Gibdos dans les couloirs# du Temple de l'Ombre protègent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                      // /*spanish*/ Según dicen, las #momias reveladas por el Ojo de la Verdad# guardan #[[1]]#.
 
-    hintTable[RHT_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#mummies revealed by the Eye of Truth# guard", /*french*/"les #Gibdos dans les couloirs# du Temple de l'Ombre protègent", /*spanish*/"las #momias reveladas por el Ojo de la Verdad# guardan"},
-  });
+    hintTextTable[RHT_SHADOW_TEMPLE_MQ_MAP_CHEST] = HintText(CustomMessage("They say that #spinning scythes# protect #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, les #faucheurs danseurs# du Temple de l'Ombre protègent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                             // /*spanish*/ Según dicen, las #giratorias guadañas# protegen #[[1]]#.
 
-    hintTable[RHT_SHADOW_TEMPLE_MQ_MAP_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#spinning scythes# protect", /*french*/"les #faucheurs danseurs# du Temple de l'Ombre protègent", /*spanish*/"las #giratorias guadañas# protegen"},
-  });
+    hintTextTable[RHT_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST] = HintText(CustomMessage("They say that #collecting rupees in a vast cavern# with the Shadow Temple unveils #[[1]]#.",
+                                                                                 /*german*/ "",
+                                                                                 /*french*/ "Selon moi, les #pièces argentées dans le Temple de l'Ombre# révèlent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                              // /*spanish*/ Según dicen, hacerte con las #rupias en una gran caverna# del Templo de las Sombras revela #[[1]]#.
 
-    hintTable[RHT_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#collecting rupees in a vast cavern# with the Shadow Temple unveils", /*french*/"les #pièces argentées dans le Temple de l'Ombre# révèlent", /*spanish*/"hacerte con las #rupias en una gran caverna# del Templo de las Sombras revela"},
-  });
+    hintTextTable[RHT_SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST] = HintText(CustomMessage("They say that #falling spikes# block the path to #[[1]]#.",
+                                                                                  /*german*/ "",
+                                                                                  /*french*/ "Selon moi, la #pluie de clous# surplombe #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                               // /*spanish*/ Según dicen, los #pinchos de un techo# conducen a #[[1]]#.
 
-    hintTable[RHT_SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#falling spikes# block the path to", /*french*/"la #pluie de clous# surplombe", /*spanish*/"los #pinchos de un techo# conducen a"},
-  });
+    hintTextTable[RHT_SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST] = HintText(CustomMessage("They say that #falling spikes# block the path to #[[1]]#.",
+                                                                                 /*german*/ "",
+                                                                                 /*french*/ "Selon moi, la #pluie de clous# surplombe #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                              // /*spanish*/ Según dicen, los #pinchos de un techo# conducen a #[[1]]#.
 
-    hintTable[RHT_SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#falling spikes# block the path to", /*french*/"la #pluie de clous# surplombe", /*spanish*/"los #pinchos de un techo# conducen a"},
-  });
+    hintTextTable[RHT_SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST] = HintText(CustomMessage("They say that #falling spikes# block the path to #[[1]]#.",
+                                                                                 /*german*/ "",
+                                                                                 /*french*/ "Selon moi, la #pluie de clous# surplombe #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                              // /*spanish*/ Según dicen, los #pinchos de un techo# conducen a #[[1]]#.
 
-    hintTable[RHT_SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#falling spikes# block the path to", /*french*/"la #pluie de clous# surplombe", /*spanish*/"los #pinchos de un techo# conducen a"},
-  });
+    hintTextTable[RHT_SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST] = HintText(CustomMessage("They say that the #dead roam among invisible spikes# guarding #[[1]]#.",
+                                                                             /*german*/ "",
+                                                                             /*french*/ "Selon moi, #parmi les clous invisibles# du Temple de l'Ombre se cache #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                          // /*spanish*/ Según dicen, los #muertos que vagan por pinchos invisibles# protegen #[[1]]#.
 
-    hintTable[RHT_SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #dead roam among invisible spikes# guarding", /*french*/"#parmi les clous invisibles# du Temple de l'Ombre se cache", /*spanish*/"los #muertos que vagan por pinchos invisibles# protegen"},
-  });
+    hintTextTable[RHT_SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST] = HintText(CustomMessage("They say that #walls consumed by a ball of fire# reveal #[[1]]#.",
+                                                                     /*german*/ "",
+                                                                     /*french*/ "Selon moi, le #piège de bois# du Temple de l'Ombre cache #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                  // /*spanish*/ Según dicen, las #paredes consumidas por una esfera ígnea# revelan #[[1]]#.
 
-    hintTable[RHT_SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#walls consumed by a ball of fire# reveal", /*french*/"le #piège de bois# du Temple de l'Ombre cache", /*spanish*/"las #paredes consumidas por una esfera ígnea# revelan"},
-  });
+    hintTextTable[RHT_SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST] = HintText(CustomMessage("They say that #walls consumed by a ball of fire# reveal #[[1]]#.",
+                                                                             /*german*/ "",
+                                                                             /*french*/ "Selon moi, le #piège de bois# du Temple de l'Ombre cache #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                          // /*spanish*/ Según dicen, las #paredes consumidas por una esfera ígnea# revelan #[[1]]#.
 
-    hintTable[RHT_SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#walls consumed by a ball of fire# reveal", /*french*/"le #piège de bois# du Temple de l'Ombre cache", /*spanish*/"las #paredes consumidas por una esfera ígnea# revelan"},
-  });
+    hintTextTable[RHT_SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST] = HintText(CustomMessage("They say that near an #empty pedestal# within the Shadow Temple lies #[[1]]#.",
+                                                                         /*german*/ "",
+                                                                         /*french*/ "Selon moi, #près d'un pédestal vide du Temple de l'Ombre# gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                      // /*spanish*/ Según dicen, cerca de un #vacío pedestal# del Templo de las Sombras yace #[[1]]#.
 
-    hintTable[RHT_SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"near an #empty pedestal# within the Shadow Temple lies", /*french*/"#près d'un pédestal vide du Temple de l'Ombre# gît", /*spanish*/"cerca de un #vacío pedestal# del Templo de las Sombras yace"},
-  });
+    hintTextTable[RHT_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST] = HintText(CustomMessage("They say that #invisible blades# guard #[[1]]#.",
+                                                                                       /*german*/ "",
+                                                                                       /*french*/ "Selon moi, les #faucheurs invisibles# du Temple de l'Ombre protègent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                    // /*spanish*/ Según dicen, unas #hojas invisibles# guardan #[[1]]#.
 
-    hintTable[RHT_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#invisible blades# guard", /*french*/"les #faucheurs invisibles# du Temple de l'Ombre protègent", /*spanish*/"unas #hojas invisibles# guardan"},
-  });
+    hintTextTable[RHT_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST] = HintText(CustomMessage("They say that #invisible blades# guard #[[1]]#.",
+                                                                                     /*german*/ "",
+                                                                                     /*french*/ "Selon moi, les #faucheurs invisibles# du Temple de l'Ombre protègent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                  // /*spanish*/ Según dicen, unas #hojas invisibles# guardan #[[1]]#.
 
-    hintTable[RHT_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#invisible blades# guard", /*french*/"les #faucheurs invisibles# du Temple de l'Ombre protègent", /*spanish*/"unas #hojas invisibles# guardan"},
-  });
+    hintTextTable[RHT_SHADOW_TEMPLE_MQ_WIND_HINT_CHEST] = HintText(CustomMessage("They say that an #invisible chest guarded by the dead# holds #[[1]]#.",
+                                                                      /*german*/ "",
+                                                                      /*french*/ "Selon moi, le #trésor invisible du cul-de-sac# du Temple de l'Ombre contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                   // /*spanish*/ Según dicen, un #cofre invisible custodiado por los del más allá# contiene #[[1]]#.
 
-    hintTable[RHT_SHADOW_TEMPLE_MQ_WIND_HINT_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"an #invisible chest guarded by the dead# holds", /*french*/"le #trésor invisible du cul-de-sac# du Temple de l'Ombre contient", /*spanish*/"un #cofre invisible custodiado por los del más allá# contiene"},
-  });
+    hintTextTable[RHT_SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST] = HintText(CustomMessage("They say that #mummies guarding a ferry# hide #[[1]]#.",
+                                                                              /*german*/ "",
+                                                                              /*french*/ "Selon moi, les #Gibdos qui bloquent le traversier# cachent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                           // /*spanish*/ Según dicen, las #momias que protegen un navío# esconden #[[1]]#.
 
-    hintTable[RHT_SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#mummies guarding a ferry# hide", /*french*/"les #Gibdos qui bloquent le traversier# cachent", /*spanish*/"las #momias que protegen un navío# esconden"},
-  });
+    hintTextTable[RHT_SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST] = HintText(CustomMessage("They say that #mummies guarding a ferry# hide #[[1]]#.",
+                                                                             /*german*/ "",
+                                                                             /*french*/ "Selon moi, les #Gibdos qui bloquent le traversier# cachent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                          // /*spanish*/ Según dicen, las #momias que protegen un navío# esconden #[[1]]#.
 
-    hintTable[RHT_SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#mummies guarding a ferry# hide", /*french*/"les #Gibdos qui bloquent le traversier# cachent", /*spanish*/"las #momias que protegen un navío# esconden"},
-  });
+    hintTextTable[RHT_SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST] = HintText(CustomMessage("They say that #caged near a ship# lies #[[1]]#.",
+                                                                                /*german*/ "",
+                                                                                /*french*/ "Selon moi, #dans une cage près du traversier# gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                             // /*spanish*/ Según dicen, #entre rejas al lado de un navío# yace #[[1]]#.
 
-    hintTable[RHT_SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#caged near a ship# lies", /*french*/"#dans une cage près du traversier# gît", /*spanish*/"#entre rejas al lado de un navío# yace"},
-  });
+    hintTextTable[RHT_SHADOW_TEMPLE_MQ_FREESTANDING_KEY] = HintText(CustomMessage("They say that #behind three burning skulls# lies #[[1]]#.",
+                                                                       /*german*/ "",
+                                                                       /*french*/ "Selon moi, #derrière trois crânes enflammés# gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                    // /*spanish*/ Según dicen, tras #tres ardientes calaveras# yace #[[1]]#.
 
-    hintTable[RHT_SHADOW_TEMPLE_MQ_FREESTANDING_KEY] = HintText::Exclude({
-                       //obscure text
-                       Text{"#behind three burning skulls# lies", /*french*/"#derrière trois crânes enflammés# gît", /*spanish*/"tras #tres ardientes calaveras# yace"},
-  });
+    hintTextTable[RHT_SHADOW_TEMPLE_BONGO_BONGO_HEART] = HintText(CustomMessage("They say that #Bongo Bongo# holds #[[1]]#.",
+                                                                     /*german*/ "",
+                                                                     /*french*/ "Selon moi, #Bongo Bongo# possède #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                  // /*spanish*/ Según dicen, #Bongo Bongo# porta #[[1]]#.
+                                                                  {}, {
+                                                                  CustomMessage("They say that the #Phantom Shadow Beast# holds #[[1]]#.",
+                                                                      /*german*/ "",
+                                                                      /*french*/ "Selon moi, le #monstre de l'ombre# possède #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                   // /*spanish*/ Según dicen, la #alimaña oscura espectral# porta #[[1]]#.
 
-    hintTable[RHT_SHADOW_TEMPLE_BONGO_BONGO_HEART] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #Phantom Shadow Beast# holds", /*french*/"le #monstre de l'ombre# possède", /*spanish*/"la #alimaña oscura espectral# porta"},
-                     }, {},
-                       //clear text
-                       Text{"#Bongo Bongo# holds", /*french*/"#Bongo Bongo# possède", /*spanish*/"#Bongo Bongo# porta"}
-    );
+    hintTextTable[RHT_SHADOW_TEMPLE_GS_SINGLE_GIANT_POT] = HintText(CustomMessage("They say that #beyond a burning skull# lies a spider with #[[1]]#.",
+                                                                       /*german*/ "",
+                                                                       /*french*/ "Selon moi, une #Skulltula derrière un crâne enflammé du Temple de l'Ombre# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                    // /*spanish*/ Según dicen, #tras una ardiente calavera# yace una Skulltula que otorga #[[1]]#.
 
-    hintTable[RHT_SHADOW_TEMPLE_GS_SINGLE_GIANT_POT] = HintText::Exclude({
-                       //obscure text
-                       Text{"#beyond a burning skull# lies a spider with", /*french*/"une #Skulltula derrière un crâne enflammé du Temple de l'Ombre# a", /*spanish*/"#tras una ardiente calavera# yace una Skulltula que otorga"},
-  });
+    hintTextTable[RHT_SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM] = HintText(CustomMessage("They say that a #spider beyond falling spikes# holds #[[1]]#.",
+                                                                          /*german*/ "",
+                                                                          /*french*/ "Selon moi, une #Skulltula au delà de la pluie de clous du Temple de l'Ombre# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                       // /*spanish*/ Según dicen, una #Skulltula tras los pinchos del techo# otorga #[[1]]#.
 
-    hintTable[RHT_SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider beyond falling spikes# holds", /*french*/"une #Skulltula au delà de la pluie de clous du Temple de l'Ombre# a", /*spanish*/"una #Skulltula tras los pinchos del techo# otorga"},
-  });
+    hintTextTable[RHT_SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT] = HintText(CustomMessage("They say that #beyond three burning skulls# lies a spider with #[[1]]#.",
+                                                                       /*german*/ "",
+                                                                       /*french*/ "Selon moi, une #Skulltula derrière trois crânes enflammés du Temple de l'Ombre# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                    // /*spanish*/ Según dicen, #tras tres ardientes calaveras# yace una Skulltula que otorga #[[1]]#.
 
-    hintTable[RHT_SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT] = HintText::Exclude({
-                       //obscure text
-                       Text{"#beyond three burning skulls# lies a spider with", /*french*/"une #Skulltula derrière trois crânes enflammés du Temple de l'Ombre# a", /*spanish*/"#tras tres ardientes calaveras# yace una Skulltula que otorga"},
-  });
+    hintTextTable[RHT_SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM] = HintText(CustomMessage("They say that a spider guarded by #invisible blades# holds #[[1]]#.",
+                                                                     /*german*/ "",
+                                                                     /*french*/ "Selon moi, une #Skulltula protégée par les faucheurs invisibles du Temple de l'Ombre# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                  // /*spanish*/ Según dicen, una #Skulltula custodiada por hojas invisibles# otorga #[[1]]#.
 
-    hintTable[RHT_SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM] = HintText::Exclude({
-                       //obscure text
-                       Text{"a spider guarded by #invisible blades# holds", /*french*/"une #Skulltula protégée par les faucheurs invisibles du Temple de l'Ombre# a", /*spanish*/"una #Skulltula custodiada por hojas invisibles# otorga"},
-  });
+    hintTextTable[RHT_SHADOW_TEMPLE_GS_NEAR_SHIP] = HintText(CustomMessage("They say that a spider near a #docked ship# hoards #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, une #Skulltula près du traversier du Temple de l'Ombre# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                             // /*spanish*/ Según dicen, una #Skulltula cercana a un navío# otorga #[[1]]#.
 
-    hintTable[RHT_SHADOW_TEMPLE_GS_NEAR_SHIP] = HintText::Exclude({
-                       //obscure text
-                       Text{"a spider near a #docked ship# hoards", /*french*/"une #Skulltula près du traversier du Temple de l'Ombre# a", /*spanish*/"una #Skulltula cercana a un navío# otorga"},
-  });
+    hintTextTable[RHT_SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM] = HintText(CustomMessage("They say that a #spider beyond falling spikes# holds #[[1]]#.",
+                                                                             /*german*/ "",
+                                                                             /*french*/ "Selon moi, une #Skulltula au delà de la pluie de clous du Temple de l'Ombre# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                          // /*spanish*/ Según dicen, una #Skulltula tras los pinchos del techo# otorga #[[1]]#.
 
+    hintTextTable[RHT_SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM] = HintText(CustomMessage("They say that a #spider amidst roaring winds# in the Shadow Temple holds #[[1]]#.",
+                                                                        /*german*/ "",
+                                                                        /*french*/ "Selon moi, une #Skulltula près des vents du Temple de l'Ombre# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                     // /*spanish*/ Según dicen, una #Skulltula entre ventarrones# del Templo de las Sombras otorga #[[1]]#.
 
-    hintTable[RHT_SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider beyond falling spikes# holds", /*french*/"une #Skulltula au delà de la pluie de clous du Temple de l'Ombre# a", /*spanish*/"una #Skulltula tras los pinchos del techo# otorga"},
-  });
+    hintTextTable[RHT_SHADOW_TEMPLE_MQ_GS_AFTER_WIND] = HintText(CustomMessage("They say that a #spider beneath gruesome debris# in the Shadow Temple hides #[[1]]#.",
+                                                                    /*german*/ "",
+                                                                    /*french*/ "Selon moi, une #Skulltula sous des débris du Temple de l'Ombre# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                 // /*spanish*/ Según dicen, una #Skulltula bajo unos horripilantes escombros# del Templo de las Sombras otorga #[[1]]#.
 
-    hintTable[RHT_SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider amidst roaring winds# in the Shadow Temple holds", /*french*/"une #Skulltula près des vents du Temple de l'Ombre# a", /*spanish*/"una #Skulltula entre ventarrones# del Templo de las Sombras otorga"},
-  });
+    hintTextTable[RHT_SHADOW_TEMPLE_MQ_GS_AFTER_SHIP] = HintText(CustomMessage("They say that a #fallen statue# reveals a spider with #[[1]]#.",
+                                                                    /*german*/ "",
+                                                                    /*french*/ "Selon moi, une #Skulltula près de la statue écroulée du Temple de l'Ombre# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                 // /*spanish*/ Según dicen, una #estatua caída# revelará una Skulltula que otorgue #[[1]]#.
 
-    hintTable[RHT_SHADOW_TEMPLE_MQ_GS_AFTER_WIND] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider beneath gruesome debris# in the Shadow Temple hides", /*french*/"une #Skulltula sous des débris du Temple de l'Ombre# a", /*spanish*/"una #Skulltula bajo unos horripilantes escombros# del Templo de las Sombras otorga"},
-  });
-
-    hintTable[RHT_SHADOW_TEMPLE_MQ_GS_AFTER_SHIP] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #fallen statue# reveals a spider with", /*french*/"une #Skulltula près de la statue écroulée du Temple de l'Ombre# a", /*spanish*/"una #estatua caída# revelará una Skulltula que otorgue"},
-  });
-
-    hintTable[RHT_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #suspended spider# guards", /*french*/"une #Skulltula près du repère du Temple de l'Ombre# a", /*spanish*/"una #Skulltula flotante# del Templo de las Sombras otorga"},
-  });
+    hintTextTable[RHT_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS] = HintText(CustomMessage("They say that a #suspended spider# guards #[[1]]#.",
+                                                                   /*german*/ "",
+                                                                   /*french*/ "Selon moi, une #Skulltula près du repère du Temple de l'Ombre# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                // /*spanish*/ Según dicen, una #Skulltula flotante# del Templo de las Sombras otorga #[[1]]#.
 
   /*--------------------------
   |    BOTTOM OF THE WELL    |
   ---------------------------*/
-    hintTable[RHT_BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #Eye of Truth in the well# reveals", /*french*/"l'#oeil de vérité dans le Puits# révèle", /*spanish*/"el #Ojo de la Verdad en el pozo# revela"},
-  });
+    hintTextTable[RHT_BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST] = HintText(CustomMessage("They say that the #Eye of Truth in the well# reveals #[[1]]#.",
+                                                                                   /*german*/ "",
+                                                                                   /*french*/ "Selon moi, l'#oeil de vérité dans le Puits# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                // /*spanish*/ Según dicen, el #Ojo de la Verdad en el pozo# revela #[[1]]#.
 
-    hintTable[RHT_BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#gruesome debris# in the well hides", /*french*/"des #débris dans le Puits# cachent", /*spanish*/"unos #horripilantes escombros# del pozo esconden"},
-  });
+    hintTextTable[RHT_BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST] = HintText(CustomMessage("They say that #gruesome debris# in the well hides #[[1]]#.",
+                                                                                    /*german*/ "",
+                                                                                    /*french*/ "Selon moi, des #débris dans le Puits# cachent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                 // /*spanish*/ Según dicen, unos #horripilantes escombros# del pozo esconden #[[1]]#.
 
-    hintTable[RHT_BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #Eye of Truth in the well# reveals", /*french*/"l'#oeil de vérité dans le Puits# révèle", /*spanish*/"el #Ojo de la Verdad en el pozo# revela"},
-  });
+    hintTextTable[RHT_BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST] = HintText(CustomMessage("They say that the #Eye of Truth in the well# reveals #[[1]]#.",
+                                                                                     /*german*/ "",
+                                                                                     /*french*/ "Selon moi, l'#oeil de vérité dans le Puits# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                  // /*spanish*/ Según dicen, el #Ojo de la Verdad en el pozo# revela #[[1]]#.
 
-    hintTable[RHT_BOTTOM_OF_THE_WELL_COMPASS_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #hidden entrance to a cage# in the well leads to", /*french*/"dans un #chemin caché dans le Puits# gît", /*spanish*/"la #entrada oculta de una celda# del pozo conduce a"},
-  });
+    hintTextTable[RHT_BOTTOM_OF_THE_WELL_COMPASS_CHEST] = HintText(CustomMessage("They say that a #hidden entrance to a cage# in the well leads to #[[1]]#.",
+                                                                      /*german*/ "",
+                                                                      /*french*/ "Selon moi, dans un #chemin caché dans le Puits# gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                   // /*spanish*/ Según dicen, la #entrada oculta de una celda# del pozo conduce a #[[1]]#.
 
-    hintTable[RHT_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider guarding a cage# in the well protects", /*french*/"l'#araignée dans la cage du Puits# protège", /*spanish*/"una #araña protegiendo una celda# del pozo guarda"},
-  });
+    hintTextTable[RHT_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST] = HintText(CustomMessage("They say that a #spider guarding a cage# in the well protects #[[1]]#.",
+                                                                               /*german*/ "",
+                                                                               /*french*/ "Selon moi, l'#araignée dans la cage du Puits# protège #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                            // /*spanish*/ Según dicen, una #araña protegiendo una celda# del pozo guarda #[[1]]#.
 
-    hintTable[RHT_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#gruesome debris# in the well hides", /*french*/"des #débris dans le Puits# cachent", /*spanish*/"unos #horripilantes escombros# del pozo esconden"},
-  });
+    hintTextTable[RHT_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST] = HintText(CustomMessage("They say that #gruesome debris# in the well hides #[[1]]#.",
+                                                                                 /*german*/ "",
+                                                                                 /*french*/ "Selon moi, des #débris dans le Puits# cachent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                              // /*spanish*/ Según dicen, unos #horripilantes escombros# del pozo esconden #[[1]]#.
 
-    hintTable[RHT_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#Dead Hand's invisible secret# is", /*french*/"le #trésor invisible du Poigneur# est", /*spanish*/"el #secreto invisible de la Mano Muerta# esconde"},
-  });
+    hintTextTable[RHT_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST] = HintText(CustomMessage("They say that #Dead Hand's invisible secret# is #[[1]]#.",
+                                                                        /*german*/ "",
+                                                                        /*french*/ "Selon moi, le #trésor invisible du Poigneur# est #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                     // /*spanish*/ Según dicen, el #secreto invisible de la Mano Muerta# esconde #[[1]]#.
 
-    hintTable[RHT_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #royal melody in the well# uncovers", /*french*/"la #mélodie royale révèle dans le Puits#", /*spanish*/"una #melodía real en el pozo# revela"},
-  });
+    hintTextTable[RHT_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST] = HintText(CustomMessage("They say that a #royal melody in the well# uncovers #[[1]]#.",
+                                                                               /*german*/ "",
+                                                                               /*french*/ "Selon moi, la #mélodie royale révèle dans le Puits# #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                            // /*spanish*/ Según dicen, una #melodía real en el pozo# revela #[[1]]#.
 
-    hintTable[RHT_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #royal melody in the well# uncovers", /*french*/"la #mélodie royale révèle dans le Puits#", /*spanish*/"una #melodía real en el pozo# revela"},
-  });
+    hintTextTable[RHT_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST] = HintText(CustomMessage("They say that a #royal melody in the well# uncovers #[[1]]#.",
+                                                                              /*german*/ "",
+                                                                              /*french*/ "Selon moi, la #mélodie royale révèle dans le Puits# #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                           // /*spanish*/ Según dicen, una #melodía real en el pozo# revela #[[1]]#.
 
-    hintTable[RHT_BOTTOM_OF_THE_WELL_MAP_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"in the #depths of the well# lies", /*french*/"#dans le coeur du Puits# gît", /*spanish*/"en las #profundidades del pozo# yace"},
-  });
+    hintTextTable[RHT_BOTTOM_OF_THE_WELL_MAP_CHEST] = HintText(CustomMessage("They say that in the #depths of the well# lies #[[1]]#.",
+                                                                  /*german*/ "",
+                                                                  /*french*/ "Selon moi, #dans le coeur du Puits# gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                               // /*spanish*/ Según dicen, en las #profundidades del pozo# yace #[[1]]#.
 
-    hintTable[RHT_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#perilous pits# in the well guard the path to", /*french*/"#trois trous# dans le Puits protègent", /*spanish*/"#peligrosos fosos# del pozo conducen a"},
-  });
+    hintTextTable[RHT_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST] = HintText(CustomMessage("They say that #perilous pits# in the well guard the path to #[[1]]#.",
+                                                                         /*german*/ "",
+                                                                         /*french*/ "Selon moi, #trois trous# dans le Puits protègent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                      // /*spanish*/ Según dicen, #peligrosos fosos# del pozo conducen a #[[1]]#.
 
-    hintTable[RHT_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#locked in a cage# in the well lies", /*french*/"#dans une cage# du Puits gît", /*spanish*/"#entre rejas# en el pozo yace"},
-  });
+    hintTextTable[RHT_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST] = HintText(CustomMessage("They say that #locked in a cage# in the well lies #[[1]]#.",
+                                                                        /*german*/ "",
+                                                                        /*french*/ "Selon moi, #dans une cage# du Puits gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                     // /*spanish*/ Según dicen, #entre rejas# en el pozo yace #[[1]]#.
 
-    hintTable[RHT_BOTTOM_OF_THE_WELL_FREESTANDING_KEY] = HintText::Exclude({
-                       //obscure text
-                       Text{"#inside a coffin# hides", /*french*/"dans #un cercueil# gît", /*spanish*/"en el #interior de un ataúd# yace"},
-  });
+    hintTextTable[RHT_BOTTOM_OF_THE_WELL_FREESTANDING_KEY] = HintText(CustomMessage("They say that #inside a coffin# hides #[[1]]#.",
+                                                                         /*german*/ "",
+                                                                         /*french*/ "Selon moi, dans #un cercueil# gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                      // /*spanish*/ Según dicen, en el #interior de un ataúd# yace #[[1]]#.
 
+    hintTextTable[RHT_BOTTOM_OF_THE_WELL_MQ_MAP_CHEST] = HintText(CustomMessage("They say that a #royal melody in the well# uncovers #[[1]]#.",
+                                                                     /*german*/ "",
+                                                                     /*french*/ "Selon moi, la #mélodie royale révèle dans le Puits# #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                  // /*spanish*/ Según dicen, una #melodía real en el pozo# revela #[[1]]#.
 
-    hintTable[RHT_BOTTOM_OF_THE_WELL_MQ_MAP_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #royal melody in the well# uncovers", /*french*/"la #mélodie royale révèle dans le Puits#", /*spanish*/"una #melodía real en el pozo# revela"},
-  });
+    hintTextTable[RHT_BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST] = HintText(CustomMessage("They say that an #army of the dead# in the well guards #[[1]]#.",
+                                                                               /*german*/ "",
+                                                                               /*french*/ "Selon moi, l'#armée des morts# dans le Puits protège #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                            // /*spanish*/ Según dicen, un #ejército del más allá# del pozo guarda #[[1]]#.
 
-    hintTable[RHT_BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"an #army of the dead# in the well guards", /*french*/"l'#armée des morts# dans le Puits protège", /*spanish*/"un #ejército del más allá# del pozo guarda"},
-  });
+    hintTextTable[RHT_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY] = HintText(CustomMessage("They say that #Dead Hand's explosive secret# is #[[1]]#.",
+                                                                                      /*german*/ "",
+                                                                                      /*french*/ "Selon moi, le #secret explosif du Poigneur# est #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                   // /*spanish*/ Según dicen, el #explosivo secreto de la Mano Muerta# esconde #[[1]]#.
 
-    hintTable[RHT_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY] = HintText::Exclude({
-                       //obscure text
-                       Text{"#Dead Hand's explosive secret# is", /*french*/"le #secret explosif du Poigneur# est", /*spanish*/"el #explosivo secreto de la Mano Muerta# esconde"},
-  });
+    hintTextTable[RHT_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY] = HintText(CustomMessage("They say that an #invisible path in the well# leads to #[[1]]#.",
+                                                                                            /*german*/ "",
+                                                                                            /*french*/ "Selon moi, dans un #chemin caché dans le Puits# gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                         // /*spanish*/ Según dicen, un #camino invisible del pozo# conduce a #[[1]]#.
 
-    hintTable[RHT_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY] = HintText::Exclude({
-                       //obscure text
-                       Text{"an #invisible path in the well# leads to", /*french*/"dans un #chemin caché dans le Puits# gît", /*spanish*/"un #camino invisible del pozo# conduce a"},
-  });
+    hintTextTable[RHT_BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE] = HintText(CustomMessage("They say that a #spider locked in a cage# in the well holds #[[1]]#.",
+                                                                          /*german*/ "",
+                                                                          /*french*/ "Selon moi, une #Skulltula dans une cage au fonds du Puits# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                       // /*spanish*/ Según dicen, una #Skulltula enjaulada# del pozo otorga #[[1]]#.
 
-    hintTable[RHT_BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider locked in a cage# in the well holds", /*french*/"une #Skulltula dans une cage au fonds du Puits# a", /*spanish*/"una #Skulltula enjaulada# del pozo otorga"},
-  });
+    hintTextTable[RHT_BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM] = HintText(CustomMessage("They say that an #invisible path in the well# leads to #[[1]]#.",
+                                                                           /*german*/ "",
+                                                                           /*french*/ "Selon moi, une #Skulltula dans le chemin invisible au fonds du Puits# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                        // /*spanish*/ Según dicen, un #camino invisible del pozo# conduce a una Skulltula que otorga #[[1]]#.
 
-    hintTable[RHT_BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM] = HintText::Exclude({
-                       //obscure text
-                       Text{"an #invisible path in the well# leads to", /*french*/"une #Skulltula dans le chemin invisible au fonds du Puits# a", /*spanish*/"un #camino invisible del pozo# conduce a una Skulltula que otorga"},
-  });
+    hintTextTable[RHT_BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM] = HintText(CustomMessage("They say that a #spider locked in a crypt# within the well guards #[[1]]#.",
+                                                                           /*german*/ "",
+                                                                           /*french*/ "Selon moi, une #Skulltula embarrée dans la crypte au fonds du Puits# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                        // /*spanish*/ Según dicen, una #Skulltula encerrada en una cripta# del pozo otorga #[[1]]#.
 
-    hintTable[RHT_BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider locked in a crypt# within the well guards", /*french*/"une #Skulltula embarrée dans la crypte au fonds du Puits# a", /*spanish*/"una #Skulltula encerrada en una cripta# del pozo otorga"},
-  });
+    hintTextTable[RHT_BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT] = HintText(CustomMessage("They say that a #gauntlet of invisible spiders# protects #[[1]]#.",
+                                                                       /*german*/ "",
+                                                                       /*french*/ "Selon moi, une #Skulltula protégée par les araignées invisibles au fonds du Puits# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                    // /*spanish*/ Según dicen, unas #arañas invisibles# custodian una Skulltula que otorga #[[1]]#.
 
+    hintTextTable[RHT_BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM] = HintText(CustomMessage("They say that a #spider crawling near the dead# in the well holds #[[1]]#.",
+                                                                          /*german*/ "",
+                                                                          /*french*/ "Selon moi, une #Skulltula près des cercueils au fonds du Puits# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                       // /*spanish*/ Según dicen, una #Skulltula junto a los muertos# del pozo otorga #[[1]]#.
 
-    hintTable[RHT_BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #gauntlet of invisible spiders# protects", /*french*/"une #Skulltula protégée par les araignées invisibles au fonds du Puits# a", /*spanish*/"unas #arañas invisibles# custodian una Skulltula que otorga"},
-  });
-
-    hintTable[RHT_BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider crawling near the dead# in the well holds", /*french*/"une #Skulltula près des cercueils au fonds du Puits# a", /*spanish*/"una #Skulltula junto a los muertos# del pozo otorga"},
-  });
-
-    hintTable[RHT_BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider locked in a crypt# within the well guards", /*french*/"une #Skulltula embarrée dans la crypte au fonds du Puits# a", /*spanish*/"una #Skulltula encerrada en una cripta# del pozo otorga"},
-  });
+    hintTextTable[RHT_BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM] = HintText(CustomMessage("They say that a #spider locked in a crypt# within the well guards #[[1]]#.",
+                                                                              /*german*/ "",
+                                                                              /*french*/ "Selon moi, une #Skulltula embarrée dans la crypte au fonds du Puits# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                           // /*spanish*/ Según dicen, una #Skulltula encerrada en una cripta# del pozo otorga #[[1]]#.
 
   /*--------------------------
   |        ICE CAVERN        |
   ---------------------------*/
-    hintTable[RHT_ICE_CAVERN_MAP_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#winds of ice# surround", /*french*/"#figé dans la glace rouge# gît", /*spanish*/"#heladas borrascas# rodean"},
-  });
+    hintTextTable[RHT_ICE_CAVERN_MAP_CHEST] = HintText(CustomMessage("They say that #winds of ice# surround #[[1]]#.",
+                                                          /*german*/ "",
+                                                          /*french*/ "Selon moi, #figé dans la glace rouge# gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                       // /*spanish*/ Según dicen, #heladas borrascas# rodean #[[1]]#.
 
-    hintTable[RHT_ICE_CAVERN_COMPASS_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #wall of ice# protects", /*french*/"#un mur de glace rouge# cache", /*spanish*/"una #gélida pared# protege"},
-  });
+    hintTextTable[RHT_ICE_CAVERN_COMPASS_CHEST] = HintText(CustomMessage("They say that a #wall of ice# protects #[[1]]#.",
+                                                              /*german*/ "",
+                                                              /*french*/ "Selon moi, #un mur de glace rouge# cache #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                           // /*spanish*/ Según dicen, una #gélida pared# protege #[[1]]#.
 
-    hintTable[RHT_ICE_CAVERN_IRON_BOOTS_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #monster in a frozen cavern# guards", /*french*/"le #monstre de la caverne de glace# protège", /*spanish*/"un #monstruo de una helada caverna# guarda"},
-  });
+    hintTextTable[RHT_ICE_CAVERN_IRON_BOOTS_CHEST] = HintText(CustomMessage("They say that a #monster in a frozen cavern# guards #[[1]]#.",
+                                                                 /*german*/ "",
+                                                                 /*french*/ "Selon moi, le #monstre de la caverne de glace# protège #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                              // /*spanish*/ Según dicen, un #monstruo de una helada caverna# guarda #[[1]]#.
 
-    hintTable[RHT_ICE_CAVERN_FREESTANDING_POH] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #wall of ice# protects", /*french*/"un #mur de glace rouge# cache", /*spanish*/"una #gélida pared# protege"},
-  });
+    hintTextTable[RHT_ICE_CAVERN_FREESTANDING_POH] = HintText(CustomMessage("They say that a #wall of ice# protects #[[1]]#.",
+                                                                 /*german*/ "",
+                                                                 /*french*/ "Selon moi, un #mur de glace rouge# cache #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                              // /*spanish*/ Según dicen, una #gélida pared# protege #[[1]]#.
 
+    hintTextTable[RHT_ICE_CAVERN_MQ_IRON_BOOTS_CHEST] = HintText(CustomMessage("They say that a #monster in a frozen cavern# guards #[[1]]#.",
+                                                                    /*german*/ "",
+                                                                    /*french*/ "Selon moi, le #monstre de la caverne de glace# protège #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                 // /*spanish*/ Según dicen, un #monstruo de una helada caverna# guarda #[[1]]#.
 
-    hintTable[RHT_ICE_CAVERN_MQ_IRON_BOOTS_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #monster in a frozen cavern# guards", /*french*/"le #monstre de la caverne de glace# protège", /*spanish*/"un #monstruo de una helada caverna# guarda"},
-  });
+    hintTextTable[RHT_ICE_CAVERN_MQ_COMPASS_CHEST] = HintText(CustomMessage("They say that #winds of ice# surround #[[1]]#.",
+                                                                 /*german*/ "",
+                                                                 /*french*/ "Selon moi, #entouré de vent glacial# gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                              // /*spanish*/ Según dicen, #heladas borrascas# rodean #[[1]]#.
 
-    hintTable[RHT_ICE_CAVERN_MQ_COMPASS_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#winds of ice# surround", /*french*/"#entouré de vent glacial# gît", /*spanish*/"#heladas borrascas# rodean"},
-  });
+    hintTextTable[RHT_ICE_CAVERN_MQ_MAP_CHEST] = HintText(CustomMessage("They say that a #wall of ice# protects #[[1]]#.",
+                                                             /*german*/ "",
+                                                             /*french*/ "Selon moi, #un mur de glace rouge# cache #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                          // /*spanish*/ Según dicen, una #gélida pared# protege #[[1]]#.
 
-    hintTable[RHT_ICE_CAVERN_MQ_MAP_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #wall of ice# protects", /*french*/"#un mur de glace rouge# cache", /*spanish*/"una #gélida pared# protege"},
-  });
+    hintTextTable[RHT_ICE_CAVERN_MQ_FREESTANDING_POH] = HintText(CustomMessage("They say that #winds of ice# surround #[[1]]#.",
+                                                                    /*german*/ "",
+                                                                    /*french*/ "Selon moi, #entouré de vent glacial# gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                 // /*spanish*/ Según dicen, #heladas borrascas# rodean #[[1]]#.
 
-    hintTable[RHT_ICE_CAVERN_MQ_FREESTANDING_POH] = HintText::Exclude({
-                       //obscure text
-                       Text{"#winds of ice# surround", /*french*/"#entouré de vent glacial# gît", /*spanish*/"#heladas borrascas# rodean"},
-  });
+    hintTextTable[RHT_ICE_CAVERN_GS_PUSH_BLOCK_ROOM] = HintText(CustomMessage("They say that a #spider above icy pits# holds #[[1]]#.",
+                                                                   /*german*/ "",
+                                                                   /*french*/ "Selon moi, une #Skulltula au dessus d'un goufre glacial# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                // /*spanish*/ Según dicen, una #Skulltula sobre gélidos vacíos# otorga #[[1]]#.
 
-    hintTable[RHT_ICE_CAVERN_GS_PUSH_BLOCK_ROOM] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider above icy pits# holds", /*french*/"une #Skulltula au dessus d'un goufre glacial# a", /*spanish*/"una #Skulltula sobre gélidos vacíos# otorga"},
-  });
+    hintTextTable[RHT_ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM] = HintText(CustomMessage("They say that #spinning ice# guards a spider holding #[[1]]#.",
+                                                                        /*german*/ "",
+                                                                        /*french*/ "Selon moi, une #Skulltula près de deux lames de glace# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                     // /*spanish*/ Según dicen, unos #témpanos giratorios# custodian una Skulltula que otorga #[[1]]#.
 
-    hintTable[RHT_ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM] = HintText::Exclude({
-                       //obscure text
-                       Text{"#spinning ice# guards a spider holding", /*french*/"une #Skulltula près de deux lames de glace# a", /*spanish*/"unos #témpanos giratorios# custodian una Skulltula que otorga"},
-  });
+    hintTextTable[RHT_ICE_CAVERN_GS_HEART_PIECE_ROOM] = HintText(CustomMessage("They say that a #spider behind a wall of ice# hides #[[1]]#.",
+                                                                    /*german*/ "",
+                                                                    /*french*/ "Selon moi, une #Skulltula derrière un mur de glace# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                 // /*spanish*/ Según dicen, una #Skulltula tras una gélida pared# otorga #[[1]]#.
 
-    hintTable[RHT_ICE_CAVERN_GS_HEART_PIECE_ROOM] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider behind a wall of ice# hides", /*french*/"une #Skulltula derrière un mur de glace# a", /*spanish*/"una #Skulltula tras una gélida pared# otorga"},
-  });
+    hintTextTable[RHT_ICE_CAVERN_MQ_GS_SCARECROW] = HintText(CustomMessage("They say that a #spider above icy pits# holds #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, une #Skulltula au dessus d'un goufre glacial# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                             // /*spanish*/ Según dicen, una #Skulltula sobre gélidos vacíos# otorga #[[1]]#.
 
+    hintTextTable[RHT_ICE_CAVERN_MQ_GS_ICE_BLOCK] = HintText(CustomMessage("They say that a #web of ice# surrounds a spider with #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, une #Skulltula protégée d'une toile glacée# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                             // /*spanish*/ Según dicen, una #gélida red# rodea a una Skulltula que otorga #[[1]]#.
 
-    hintTable[RHT_ICE_CAVERN_MQ_GS_SCARECROW] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider above icy pits# holds", /*french*/"une #Skulltula au dessus d'un goufre glacial# a", /*spanish*/"una #Skulltula sobre gélidos vacíos# otorga"},
-  });
-
-    hintTable[RHT_ICE_CAVERN_MQ_GS_ICE_BLOCK] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #web of ice# surrounds a spider with", /*french*/"une #Skulltula protégée d'une toile glacée# a", /*spanish*/"una #gélida red# rodea a una Skulltula que otorga"},
-  });
-
-    hintTable[RHT_ICE_CAVERN_MQ_GS_RED_ICE] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider in fiery ice# hoards", /*french*/"une #Skulltula figée dans la glace rouge# a", /*spanish*/"una #Skulltula tras un ardiente hielo# otorga"},
-  });
+    hintTextTable[RHT_ICE_CAVERN_MQ_GS_RED_ICE] = HintText(CustomMessage("They say that a #spider in fiery ice# hoards #[[1]]#.",
+                                                              /*german*/ "",
+                                                              /*french*/ "Selon moi, une #Skulltula figée dans la glace rouge# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                           // /*spanish*/ Según dicen, una #Skulltula tras un ardiente hielo# otorga #[[1]]#.
 
   /*--------------------------
   | GERUDO TRAINING GROUNDS  |
   ---------------------------*/
-    hintTable[RHT_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #blinded eye in the Gerudo Training Grounds# drops", /*french*/"l'#Oeil dans le Gymnase Gerudo# voit", /*spanish*/"#cegar un ojo en el Centro de Instrucción Gerudo# revela"},
-  });
+    hintTextTable[RHT_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST] = HintText(CustomMessage("They say that a #blinded eye in the Gerudo Training Grounds# drops #[[1]]#.",
+                                                                             /*german*/ "",
+                                                                             /*french*/ "Selon moi, l'#Oeil dans le Gymnase Gerudo# voit #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                          // /*spanish*/ Según dicen, #cegar un ojo en el Centro de Instrucción Gerudo# revela #[[1]]#.
 
-    hintTable[RHT_GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #blinded eye in the Gerudo Training Grounds# drops", /*french*/"l'#Oeil dans le Gymnase Gerudo# voit", /*spanish*/"#cegar un ojo en el Centro de Instrucción Gerudo# revela"},
-  });
+    hintTextTable[RHT_GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST] = HintText(CustomMessage("They say that a #blinded eye in the Gerudo Training Grounds# drops #[[1]]#.",
+                                                                              /*german*/ "",
+                                                                              /*french*/ "Selon moi, l'#Oeil dans le Gymnase Gerudo# voit #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                           // /*spanish*/ Según dicen, #cegar un ojo en el Centro de Instrucción Gerudo# revela #[[1]]#.
 
-    hintTable[RHT_GERUDO_TRAINING_GROUND_STALFOS_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#soldiers walking on shifting sands# in the Gerudo Training Grounds guard", /*french*/"les #squelettes# du Gymnase Gerudo protègent", /*spanish*/"#soldados en resbaladizas arenas# del Centro de Instrucción Gerudo protegen"},
-  });
+    hintTextTable[RHT_GERUDO_TRAINING_GROUND_STALFOS_CHEST] = HintText(CustomMessage("They say that #soldiers walking on shifting sands# in the Gerudo Training Grounds guard #[[1]]#.",
+                                                                          /*german*/ "",
+                                                                          /*french*/ "Selon moi, les #squelettes# du Gymnase Gerudo protègent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                       // /*spanish*/ Según dicen, #soldados en resbaladizas arenas# del Centro de Instrucción Gerudo protegen #[[1]]#.
 
-    hintTable[RHT_GERUDO_TRAINING_GROUND_BEAMOS_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#reptilian warriors# in the Gerudo Training Grounds protect", /*french*/"les #lézards# dans le Gymnase Gerudo protègent", /*spanish*/"#unos escamosos guerreros# del Centro de Instrucción Gerudo protegen"},
-  });
+    hintTextTable[RHT_GERUDO_TRAINING_GROUND_BEAMOS_CHEST] = HintText(CustomMessage("They say that #reptilian warriors# in the Gerudo Training Grounds protect #[[1]]#.",
+                                                                         /*german*/ "",
+                                                                         /*french*/ "Selon moi, les #lézards# dans le Gymnase Gerudo protègent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                      // /*spanish*/ Según dicen, #unos escamosos guerreros# del Centro de Instrucción Gerudo protegen #[[1]]#.
 
-    hintTable[RHT_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #Eye of Truth# in the Gerudo Training Grounds reveals", /*french*/"#bien caché# dans le Gymnase Gerudo gît", /*spanish*/"el #Ojo de la Verdad# en el Centro de Instrucción Gerudo revela"},
-  });
+    hintTextTable[RHT_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST] = HintText(CustomMessage("They say that the #Eye of Truth# in the Gerudo Training Grounds reveals #[[1]]#.",
+                                                                                 /*german*/ "",
+                                                                                 /*french*/ "Selon moi, #bien caché# dans le Gymnase Gerudo gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                              // /*spanish*/ Según dicen, el #Ojo de la Verdad# en el Centro de Instrucción Gerudo revela #[[1]]#.
 
-    hintTable[RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the first prize of #the thieves' training# is", /*french*/"le #premier trésor du Gymnase Gerudo# est", /*spanish*/"el primer premio de la #instrucción bandida# se trata de"},
-  });
+    hintTextTable[RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST] = HintText(CustomMessage("They say that the first prize of #the thieves' training# is #[[1]]#.",
+                                                                                  /*german*/ "",
+                                                                                  /*french*/ "Selon moi, le #premier trésor du Gymnase Gerudo# est #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                               // /*spanish*/ Según dicen, el primer premio de la #instrucción bandida# se trata de #[[1]]#.
 
-    hintTable[RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_SECOND_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the second prize of #the thieves' training# is", /*french*/"le #deuxième trésor du Gymnase Gerudo# est", /*spanish*/"el segundo premio de la #instrucción bandida# se trata de"},
-  });
+    hintTextTable[RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_SECOND_CHEST] = HintText(CustomMessage("They say that the second prize of #the thieves' training# is #[[1]]#.",
+                                                                                   /*german*/ "",
+                                                                                   /*french*/ "Selon moi, le #deuxième trésor du Gymnase Gerudo# est #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                // /*spanish*/ Según dicen, el segundo premio de la #instrucción bandida# se trata de #[[1]]#.
 
-    hintTable[RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_THIRD_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the third prize of #the thieves' training# is", /*french*/"le #troisième trésor du Gymnase Gerudo# est", /*spanish*/"el tercer premio de la #instrucción bandida# se trata de"},
-  });
+    hintTextTable[RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_THIRD_CHEST] = HintText(CustomMessage("They say that the third prize of #the thieves' training# is #[[1]]#.",
+                                                                                  /*german*/ "",
+                                                                                  /*french*/ "Selon moi, le #troisième trésor du Gymnase Gerudo# est #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                               // /*spanish*/ Según dicen, el tercer premio de la #instrucción bandida# se trata de #[[1]]#.
 
-    hintTable[RHT_GERUDO_TRAINING_GROUND_MAZE_RIGHT_CENTRAL_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #Song of Time# in the Gerudo Training Grounds leads to", /*french*/"le #chant du temps# révèle dans le Gymnase Gerudo", /*spanish*/"la #Canción del Tiempo# en el Centro de Instrucción Gerudo conduce a"},
-  });
+    hintTextTable[RHT_GERUDO_TRAINING_GROUND_MAZE_RIGHT_CENTRAL_CHEST] = HintText(CustomMessage("They say that the #Song of Time# in the Gerudo Training Grounds leads to #[[1]]#.",
+                                                                                     /*german*/ "",
+                                                                                     /*french*/ "Selon moi, le #chant du temps# révèle dans le Gymnase Gerudo #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                  // /*spanish*/ Según dicen, la #Canción del Tiempo# en el Centro de Instrucción Gerudo conduce a #[[1]]#.
 
-    hintTable[RHT_GERUDO_TRAINING_GROUND_MAZE_RIGHT_SIDE_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #Song of Time# in the Gerudo Training Grounds leads to", /*french*/"le #chant du temps# révèle dans le Gymnase Gerudo", /*spanish*/"la #Canción del Tiempo# en el Centro de Instrucción Gerudo conduce a"},
-  });
+    hintTextTable[RHT_GERUDO_TRAINING_GROUND_MAZE_RIGHT_SIDE_CHEST] = HintText(CustomMessage("They say that the #Song of Time# in the Gerudo Training Grounds leads to #[[1]]#.",
+                                                                                  /*german*/ "",
+                                                                                  /*french*/ "Selon moi, le #chant du temps# révèle dans le Gymnase Gerudo #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                               // /*spanish*/ Según dicen, la #Canción del Tiempo# en el Centro de Instrucción Gerudo conduce a #[[1]]#.
 
-    hintTable[RHT_GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#fiery foes# in the Gerudo Training Grounds guard", /*french*/"les #limaces de feu# du Gymnase Gerudo protègent", /*spanish*/"unos #flamígeros enemigos# del Centro de Instrucción Gerudo guardan"},
-  });
+    hintTextTable[RHT_GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST] = HintText(CustomMessage("They say that #fiery foes# in the Gerudo Training Grounds guard #[[1]]#.",
+                                                                                    /*german*/ "",
+                                                                                    /*french*/ "Selon moi, les #limaces de feu# du Gymnase Gerudo protègent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                 // /*spanish*/ Según dicen, unos #flamígeros enemigos# del Centro de Instrucción Gerudo guardan #[[1]]#.
 
-    hintTable[RHT_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#engulfed in flame# where thieves train lies", /*french*/"le #trésor enflammé# du Gymnase Gerudo est", /*spanish*/"donde entrenan las bandidas #entre llamas# yace"},
-  });
+    hintTextTable[RHT_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST] = HintText(CustomMessage("They say that #engulfed in flame# where thieves train lies #[[1]]#.",
+                                                                                     /*german*/ "",
+                                                                                     /*french*/ "Selon moi, le #trésor enflammé# du Gymnase Gerudo est #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                  // /*spanish*/ Según dicen, donde entrenan las bandidas #entre llamas# yace #[[1]]#.
 
-    hintTable[RHT_GERUDO_TRAINING_GROUND_EYE_STATUE_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"thieves #blind four faces# to find", /*french*/"l'#épreuve d'archerie# du Gymnase Gerudo donne", /*spanish*/"las bandidas #ciegan cuatro bustos# para hallar"},
-  });
+    hintTextTable[RHT_GERUDO_TRAINING_GROUND_EYE_STATUE_CHEST] = HintText(CustomMessage("They say that thieves #blind four faces# to find #[[1]]#.",
+                                                                             /*german*/ "",
+                                                                             /*french*/ "Selon moi, l'#épreuve d'archerie# du Gymnase Gerudo donne #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                          // /*spanish*/ Según dicen, las bandidas #ciegan cuatro bustos# para hallar #[[1]]#.
 
-    hintTable[RHT_GERUDO_TRAINING_GROUND_NEAR_SCARECROW_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"thieves #blind four faces# to find", /*french*/"l'#épreuve d'archerie# du Gymnase Gerudo donne", /*spanish*/"las bandidas #ciegan cuatro bustos# para hallar"},
-  });
+    hintTextTable[RHT_GERUDO_TRAINING_GROUND_NEAR_SCARECROW_CHEST] = HintText(CustomMessage("They say that thieves #blind four faces# to find #[[1]]#.",
+                                                                                 /*german*/ "",
+                                                                                 /*french*/ "Selon moi, l'#épreuve d'archerie# du Gymnase Gerudo donne #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                              // /*spanish*/ Según dicen, las bandidas #ciegan cuatro bustos# para hallar #[[1]]#.
 
-    hintTable[RHT_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#before a block of silver# thieves can find", /*french*/"#près d'un bloc argent# dans le Gymnase Gerudo gît", /*spanish*/"#ante un plateado bloque# las bandidas hallan"},
-  });
+    hintTextTable[RHT_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST] = HintText(CustomMessage("They say that #before a block of silver# thieves can find #[[1]]#.",
+                                                                                     /*german*/ "",
+                                                                                     /*french*/ "Selon moi, #près d'un bloc argent# dans le Gymnase Gerudo gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                  // /*spanish*/ Según dicen, #ante un plateado bloque# las bandidas hallan #[[1]]#.
 
-    hintTable[RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #feat of strength# rewards thieves with", /*french*/"#derrière un bloc argent# dans le Gymnase Gerudo gît", /*spanish*/"una #hazaña de fuerza# premia a las bandidas con"},
-  });
+    hintTextTable[RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST] = HintText(CustomMessage("They say that a #feat of strength# rewards thieves with #[[1]]#.",
+                                                                                    /*german*/ "",
+                                                                                    /*french*/ "Selon moi, #derrière un bloc argent# dans le Gymnase Gerudo gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                 // /*spanish*/ Según dicen, una #hazaña de fuerza# premia a las bandidas con #[[1]]#.
 
-    hintTable[RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #feat of strength# rewards thieves with", /*french*/"#derrière un bloc argent# dans le Gymnase Gerudo gît", /*spanish*/"una #hazaña de fuerza# premia a las bandidas con"},
-  });
+    hintTextTable[RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST] = HintText(CustomMessage("They say that a #feat of strength# rewards thieves with #[[1]]#.",
+                                                                                     /*german*/ "",
+                                                                                     /*french*/ "Selon moi, #derrière un bloc argent# dans le Gymnase Gerudo gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                  // /*spanish*/ Según dicen, una #hazaña de fuerza# premia a las bandidas con #[[1]]#.
 
-    hintTable[RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_THIRD_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #feat of strength# rewards thieves with", /*french*/"#derrière un bloc argent# dans le Gymnase Gerudo gît", /*spanish*/"una #hazaña de fuerza# premia a las bandidas con"},
-  });
+    hintTextTable[RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_THIRD_CHEST] = HintText(CustomMessage("They say that a #feat of strength# rewards thieves with #[[1]]#.",
+                                                                                    /*german*/ "",
+                                                                                    /*french*/ "Selon moi, #derrière un bloc argent# dans le Gymnase Gerudo gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                 // /*spanish*/ Según dicen, una #hazaña de fuerza# premia a las bandidas con #[[1]]#.
 
-    hintTable[RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FOURTH_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #feat of strength# rewards thieves with", /*french*/"#derrière un bloc argent# dans le Gymnase Gerudo gît", /*spanish*/"una #hazaña de fuerza# premia a las bandidas con"},
-  });
+    hintTextTable[RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FOURTH_CHEST] = HintText(CustomMessage("They say that a #feat of strength# rewards thieves with #[[1]]#.",
+                                                                                     /*german*/ "",
+                                                                                     /*french*/ "Selon moi, #derrière un bloc argent# dans le Gymnase Gerudo gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                  // /*spanish*/ Según dicen, una #hazaña de fuerza# premia a las bandidas con #[[1]]#.
 
-    hintTable[RHT_GERUDO_TRAINING_GROUND_FREESTANDING_KEY] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #Song of Time# in the Gerudo Training Grounds leads to", /*french*/"le #chant du temps# révèle dans le Gymnase Gerudo", /*spanish*/"la #Canción del Tiempo# en el Centro de Instrucción Gerudo conduce a"},
-  });
+    hintTextTable[RHT_GERUDO_TRAINING_GROUND_FREESTANDING_KEY] = HintText(CustomMessage("They say that the #Song of Time# in the Gerudo Training Grounds leads to #[[1]]#.",
+                                                                             /*german*/ "",
+                                                                             /*french*/ "Selon moi, le #chant du temps# révèle dans le Gymnase Gerudo #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                          // /*spanish*/ Según dicen, la #Canción del Tiempo# en el Centro de Instrucción Gerudo conduce a #[[1]]#.
 
+    hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST] = HintText(CustomMessage("They say that #thieves prepare for training# with #[[1]]#.",
+                                                                                 /*german*/ "",
+                                                                                 /*french*/ "Selon moi, dans #l'entrée du Gymnase Gerudo# gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                              // /*spanish*/ Según dicen, las #bandidas se instruyen# con #[[1]]#.
 
-    hintTable[RHT_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#thieves prepare for training# with", /*french*/"dans #l'entrée du Gymnase Gerudo# gît", /*spanish*/"las #bandidas se instruyen# con"},
-  });
+    hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST] = HintText(CustomMessage("They say that #thieves prepare for training# with #[[1]]#.",
+                                                                                /*german*/ "",
+                                                                                /*french*/ "Selon moi, dans #l'entrée du Gymnase Gerudo# gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                             // /*spanish*/ Según dicen, las #bandidas se instruyen# con #[[1]]#.
 
-    hintTable[RHT_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#thieves prepare for training# with", /*french*/"dans #l'entrée du Gymnase Gerudo# gît", /*spanish*/"las #bandidas se instruyen# con"},
-  });
+    hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST] = HintText(CustomMessage("They say that #soldiers walking on shifting sands# in the Gerudo Training Grounds guard #[[1]]#.",
+                                                                                        /*german*/ "",
+                                                                                        /*french*/ "Selon moi, les #squelettes# du Gymnase Gerudo protègent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                     // /*spanish*/ Según dicen, #soldados en resbaladizas arenas# del Centro de Instrucción Gerudo protegen #[[1]]#.
 
-    hintTable[RHT_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#soldiers walking on shifting sands# in the Gerudo Training Grounds guard", /*french*/"les #squelettes# du Gymnase Gerudo protègent", /*spanish*/"#soldados en resbaladizas arenas# del Centro de Instrucción Gerudo protegen"},
-  });
+    hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_BEFORE_HEAVY_BLOCK_CHEST] = HintText(CustomMessage("They say that #before a block of silver# thieves can find #[[1]]#.",
+                                                                                        /*german*/ "",
+                                                                                        /*french*/ "Selon moi, #près d'un bloc argent# dans le Gymnase Gerudo gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                     // /*spanish*/ Según dicen, #ante un plateado bloque# las bandidas hallan #[[1]]#.
 
-    hintTable[RHT_GERUDO_TRAINING_GROUND_MQ_BEFORE_HEAVY_BLOCK_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#before a block of silver# thieves can find", /*french*/"#près d'un bloc argent# dans le Gymnase Gerudo gît", /*spanish*/"#ante un plateado bloque# las bandidas hallan"},
-  });
+    hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_EYE_STATUE_CHEST] = HintText(CustomMessage("They say that thieves #blind four faces# to find #[[1]]#.",
+                                                                                /*german*/ "",
+                                                                                /*french*/ "Selon moi, l'#épreuve d'archerie# du Gymnase Gerudo donne #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                             // /*spanish*/ Según dicen, las bandidas #ciegan cuatro bustos# para hallar #[[1]]#.
 
-    hintTable[RHT_GERUDO_TRAINING_GROUND_MQ_EYE_STATUE_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"thieves #blind four faces# to find", /*french*/"l'#épreuve d'archerie# du Gymnase Gerudo donne", /*spanish*/"las bandidas #ciegan cuatro bustos# para hallar"},
-  });
+    hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_FLAME_CIRCLE_CHEST] = HintText(CustomMessage("They say that #engulfed in flame# where thieves train lies #[[1]]#.",
+                                                                                  /*german*/ "",
+                                                                                  /*french*/ "Selon moi, le #trésor enflammé# du Gymnase Gerudo est #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                               // /*spanish*/ Según dicen, donde entrenan las bandidas #entre llamas# yace #[[1]]#.
 
-    hintTable[RHT_GERUDO_TRAINING_GROUND_MQ_FLAME_CIRCLE_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#engulfed in flame# where thieves train lies", /*french*/"le #trésor enflammé# du Gymnase Gerudo est", /*spanish*/"donde entrenan las bandidas #entre llamas# yace"},
-  });
+    hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_SECOND_IRON_KNUCKLE_CHEST] = HintText(CustomMessage("They say that #fiery foes# in the Gerudo Training Grounds guard #[[1]]#.",
+                                                                                         /*german*/ "",
+                                                                                         /*french*/ "Selon moi, les #ennemis de feu# du Gymnase Gerudo protègent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                      // /*spanish*/ Según dicen, unos #flamígeros enemigos# del Centro de Instrucción Gerudo guardan #[[1]]#.
 
-    hintTable[RHT_GERUDO_TRAINING_GROUND_MQ_SECOND_IRON_KNUCKLE_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#fiery foes# in the Gerudo Training Grounds guard", /*french*/"les #ennemis de feu# du Gymnase Gerudo protègent", /*spanish*/"unos #flamígeros enemigos# del Centro de Instrucción Gerudo guardan"},
-  });
+    hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_DINOLFOS_CHEST] = HintText(CustomMessage("They say that #reptilian warriors# in the Gerudo Training Grounds protect #[[1]]#.",
+                                                                              /*german*/ "",
+                                                                              /*french*/ "Selon moi, les #lézards# dans le Gymnase Gerudo protègent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                           // /*spanish*/ Según dicen, #unos escamosos guerreros# del Centro de Instrucción Gerudo protegen #[[1]]#.
 
-    hintTable[RHT_GERUDO_TRAINING_GROUND_MQ_DINOLFOS_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#reptilian warriors# in the Gerudo Training Grounds protect", /*french*/"les #lézards# dans le Gymnase Gerudo protègent", /*spanish*/"#unos escamosos guerreros# del Centro de Instrucción Gerudo protegen"},
-  });
+    hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_CENTRAL_CHEST] = HintText(CustomMessage("They say that a #path of fire# leads thieves to #[[1]]#.",
+                                                                                        /*german*/ "",
+                                                                                        /*french*/ "Selon moi, dans le #chemin enflammé# dans le Gymnase Gerudo gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                     // /*spanish*/ Según dicen, un #camino de fuego# conduce a las bandidas a #[[1]]#.
 
-    hintTable[RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_CENTRAL_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #path of fire# leads thieves to", /*french*/"dans le #chemin enflammé# dans le Gymnase Gerudo gît", /*spanish*/"un #camino de fuego# conduce a las bandidas a"},
-  });
+    hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_FIRST_CHEST] = HintText(CustomMessage("They say that the first prize of #the thieves' training# is #[[1]]#.",
+                                                                                     /*german*/ "",
+                                                                                     /*french*/ "Selon moi, le #premier trésor du Gymnase Gerudo# est #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                  // /*spanish*/ Según dicen, el primer premio de la #instrucción bandida# se trata de #[[1]]#.
 
-    hintTable[RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_FIRST_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the first prize of #the thieves' training# is", /*french*/"le #premier trésor du Gymnase Gerudo# est", /*spanish*/"el primer premio de la #instrucción bandida# se trata de"},
-  });
+    hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_SIDE_CHEST] = HintText(CustomMessage("They say that a #path of fire# leads thieves to #[[1]]#.",
+                                                                                     /*german*/ "",
+                                                                                     /*french*/ "Selon moi, dans le #chemin enflammé# dans le Gymnase Gerudo gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                  // /*spanish*/ Según dicen, un #camino de fuego# conduce a las bandidas a #[[1]]#.
 
-    hintTable[RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_SIDE_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #path of fire# leads thieves to", /*french*/"dans le #chemin enflammé# dans le Gymnase Gerudo gît", /*spanish*/"un #camino de fuego# conduce a las bandidas a"},
-  });
+    hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_THIRD_CHEST] = HintText(CustomMessage("They say that the third prize of #the thieves' training# is #[[1]]#.",
+                                                                                     /*german*/ "",
+                                                                                     /*french*/ "Selon moi, le #troisième trésor du Gymnase Gerudo# est #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                  // /*spanish*/ Según dicen, el tercer premio de la #instrucción bandida# se trata de #[[1]]#.
 
-    hintTable[RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_THIRD_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the third prize of #the thieves' training# is", /*french*/"le #troisième trésor du Gymnase Gerudo# est", /*spanish*/"el tercer premio de la #instrucción bandida# se trata de"},
-  });
+    hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_SECOND_CHEST] = HintText(CustomMessage("They say that the second prize of #the thieves' training# is #[[1]]#.",
+                                                                                      /*german*/ "",
+                                                                                      /*french*/ "Selon moi, le #deuxième trésor du Gymnase Gerudo# est #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                   // /*spanish*/ Según dicen, el segundo premio de la #instrucción bandida# se trata de #[[1]]#.
 
-    hintTable[RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_SECOND_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the second prize of #the thieves' training# is", /*french*/"le #deuxième trésor du Gymnase Gerudo# est", /*spanish*/"el segundo premio de la #instrucción bandida# se trata de"},
-  });
+    hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_HIDDEN_CEILING_CHEST] = HintText(CustomMessage("They say that the #Eye of Truth# in the Gerudo Training Grounds reveals #[[1]]#.",
+                                                                                    /*german*/ "",
+                                                                                    /*french*/ "Selon moi, #bien caché# dans le Gymnase Gerudo gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                 // /*spanish*/ Según dicen, el #Ojo de la Verdad# en el Centro de Instrucción Gerudo revela #[[1]]#.
 
-    hintTable[RHT_GERUDO_TRAINING_GROUND_MQ_HIDDEN_CEILING_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #Eye of Truth# in the Gerudo Training Grounds reveals", /*french*/"#bien caché# dans le Gymnase Gerudo gît", /*spanish*/"el #Ojo de la Verdad# en el Centro de Instrucción Gerudo revela"},
-  });
-
-    hintTable[RHT_GERUDO_TRAINING_GROUND_MQ_HEAVY_BLOCK_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #feat of strength# rewards thieves with", /*french*/"#derrière un bloc argent# dans le Gymnase Gerudo gît", /*spanish*/"una #hazaña de fuerza# premia a las bandidas con"},
-  });
+    hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_HEAVY_BLOCK_CHEST] = HintText(CustomMessage("They say that a #feat of strength# rewards thieves with #[[1]]#.",
+                                                                                 /*german*/ "",
+                                                                                 /*french*/ "Selon moi, #derrière un bloc argent# dans le Gymnase Gerudo gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                              // /*spanish*/ Según dicen, una #hazaña de fuerza# premia a las bandidas con #[[1]]#.
 
   /*--------------------------
   |      GANONS CASTLE       |
   ---------------------------*/
-    hintTable[RHT_GANONS_TOWER_BOSS_KEY_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #Evil King# hoards", /*french*/"le #Roi du Mal# possède", /*spanish*/"el #Rey del Mal# acapara"},
-  });
+    hintTextTable[RHT_GANONS_TOWER_BOSS_KEY_CHEST] = HintText(CustomMessage("They say that the #Evil King# hoards #[[1]]#.",
+                                                                 /*german*/ "",
+                                                                 /*french*/ "Selon moi, le #Roi du Mal# possède #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                              // /*spanish*/ Según dicen, el #Rey del Mal# acapara #[[1]]#.
 
+    hintTextTable[RHT_GANONS_CASTLE_FOREST_TRIAL_CHEST] = HintText(CustomMessage("They say that the #test of the wilds# holds #[[1]]#.",
+                                                                      /*german*/ "",
+                                                                      /*french*/ "Selon moi, l'#épreuve des bois# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                   // /*spanish*/ Según dicen, la #prueba de la naturaleza# brinda #[[1]]#.
 
-    hintTable[RHT_GANONS_CASTLE_FOREST_TRIAL_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #test of the wilds# holds", /*french*/"l'#épreuve des bois# contient", /*spanish*/"la #prueba de la naturaleza# brinda"},
-  });
+    hintTextTable[RHT_GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST] = HintText(CustomMessage("They say that the #test of the seas# holds #[[1]]#.",
+                                                                          /*german*/ "",
+                                                                          /*french*/ "Selon moi, l'#épreuve des mers# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                       // /*spanish*/ Según dicen, la #prueba del mar# brinda #[[1]]#.
 
-    hintTable[RHT_GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #test of the seas# holds", /*french*/"l'#épreuve des mers# contient", /*spanish*/"la #prueba del mar# brinda"},
-  });
+    hintTextTable[RHT_GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST] = HintText(CustomMessage("They say that the #test of the seas# holds #[[1]]#.",
+                                                                           /*german*/ "",
+                                                                           /*french*/ "Selon moi, l'#épreuve des mers# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                        // /*spanish*/ Según dicen, la #prueba del mar# brinda #[[1]]#.
 
-    hintTable[RHT_GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #test of the seas# holds", /*french*/"l'#épreuve des mers# contient", /*spanish*/"la #prueba del mar# brinda"},
-  });
+    hintTextTable[RHT_GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST] = HintText(CustomMessage("They say that #music in the test of darkness# unveils #[[1]]#.",
+                                                                            /*german*/ "",
+                                                                            /*french*/ "Selon moi, la #musique dans l'épreuve des ténèbres# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                         // /*spanish*/ Según dicen, la #música en la prueba de la oscuridad# revela #[[1]]#.
 
-    hintTable[RHT_GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#music in the test of darkness# unveils", /*french*/"la #musique dans l'épreuve des ténèbres# révèle", /*spanish*/"la #música en la prueba de la oscuridad# revela"},
-  });
+    hintTextTable[RHT_GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST] = HintText(CustomMessage("They say that #light in the test of darkness# unveils #[[1]]#.",
+                                                                                       /*german*/ "",
+                                                                                       /*french*/ "Selon moi, la #lumière dans l'épreuve des ténèbres# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                    // /*spanish*/ Según dicen, la #luz en la prueba de la oscuridad# revela #[[1]]#.
 
-    hintTable[RHT_GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#light in the test of darkness# unveils", /*french*/"la #lumière dans l'épreuve des ténèbres# révèle", /*spanish*/"la #luz en la prueba de la oscuridad# revela"},
-  });
+    hintTextTable[RHT_GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST] = HintText(CustomMessage("They say that the #test of the sands# holds #[[1]]#.",
+                                                                                     /*german*/ "",
+                                                                                     /*french*/ "Selon moi, l'#épreuve des sables# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                  // /*spanish*/ Según dicen, la #prueba de las arenas# brinda #[[1]]#.
 
-    hintTable[RHT_GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #test of the sands# holds", /*french*/"l'#épreuve des sables# contient", /*spanish*/"la #prueba de las arenas# brinda"},
-  });
+    hintTextTable[RHT_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST] = HintText(CustomMessage("They say that the #test of the sands# holds #[[1]]#.",
+                                                                                /*german*/ "",
+                                                                                /*french*/ "Selon moi, l'#épreuve des sables# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                             // /*spanish*/ Según dicen, la #prueba de las arenas# brinda #[[1]]#.
 
-    hintTable[RHT_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #test of the sands# holds", /*french*/"l'#épreuve des sables# contient", /*spanish*/"la #prueba de las arenas# brinda"},
-  });
+    hintTextTable[RHT_GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST] = HintText(CustomMessage("They say that the #test of radiance# holds #[[1]]#.",
+                                                                                /*german*/ "",
+                                                                                /*french*/ "Selon moi, l'#épreuve du ciel# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                             // /*spanish*/ Según dicen, la #prueba del resplandor# brinda #[[1]]#.
 
-    hintTable[RHT_GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #test of radiance# holds", /*french*/"l'#épreuve du ciel# contient", /*spanish*/"la #prueba del resplandor# brinda"},
-  });
+    hintTextTable[RHT_GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST] = HintText(CustomMessage("They say that the #test of radiance# holds #[[1]]#.",
+                                                                                 /*german*/ "",
+                                                                                 /*french*/ "Selon moi, l'#épreuve du ciel# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                              // /*spanish*/ Según dicen, la #prueba del resplandor# brinda #[[1]]#.
 
-    hintTable[RHT_GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #test of radiance# holds", /*french*/"l'#épreuve du ciel# contient", /*spanish*/"la #prueba del resplandor# brinda"},
-  });
+    hintTextTable[RHT_GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST] = HintText(CustomMessage("They say that the #test of radiance# holds #[[1]]#.",
+                                                                                /*german*/ "",
+                                                                                /*french*/ "Selon moi, l'#épreuve du ciel# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                             // /*spanish*/ Según dicen, la #prueba del resplandor# brinda #[[1]]#.
 
-    hintTable[RHT_GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #test of radiance# holds", /*french*/"l'#épreuve du ciel# contient", /*spanish*/"la #prueba del resplandor# brinda"},
-  });
+    hintTextTable[RHT_GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST] = HintText(CustomMessage("They say that the #test of radiance# holds #[[1]]#.",
+                                                                                 /*german*/ "",
+                                                                                 /*french*/ "Selon moi, l'#épreuve du ciel# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                              // /*spanish*/ Según dicen, la #prueba del resplandor# brinda #[[1]]#.
 
-    hintTable[RHT_GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #test of radiance# holds", /*french*/"l'#épreuve du ciel# contient", /*spanish*/"la #prueba del resplandor# brinda"},
-  });
+    hintTextTable[RHT_GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST] = HintText(CustomMessage("They say that the #test of radiance# holds #[[1]]#.",
+                                                                                  /*german*/ "",
+                                                                                  /*french*/ "Selon moi, l'#épreuve du ciel# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                               // /*spanish*/ Según dicen, la #prueba del resplandor# brinda #[[1]]#.
 
-    hintTable[RHT_GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #test of radiance# holds", /*french*/"l'#épreuve du ciel# contient", /*spanish*/"la #prueba del resplandor# brinda"},
-  });
+    hintTextTable[RHT_GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST] = HintText(CustomMessage("They say that the #test of radiance# holds #[[1]]#.",
+                                                                                 /*german*/ "",
+                                                                                 /*french*/ "Selon moi, l'#épreuve du ciel# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                              // /*spanish*/ Según dicen, la #prueba del resplandor# brinda #[[1]]#.
 
-    hintTable[RHT_GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #test of radiance# holds", /*french*/"l'#épreuve du ciel# contient", /*spanish*/"la #prueba del resplandor# brinda"},
-  });
+    hintTextTable[RHT_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST] = HintText(CustomMessage("They say that the #test of radiance# holds #[[1]]#.",
+                                                                                       /*german*/ "",
+                                                                                       /*french*/ "Selon moi, l'#épreuve du ciel# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                    // /*spanish*/ Según dicen, la #prueba del resplandor# brinda #[[1]]#.
 
-    hintTable[RHT_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #test of radiance# holds", /*french*/"l'#épreuve du ciel# contient", /*spanish*/"la #prueba del resplandor# brinda"},
-  });
+    hintTextTable[RHT_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST] = HintText(CustomMessage("They say that #music in the test of radiance# reveals #[[1]]#.",
+                                                                             /*german*/ "",
+                                                                             /*french*/ "Selon moi, la #musique dans l'épreuve du ciel# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                          // /*spanish*/ Según dicen, la #música en la prueba del resplandor# revela #[[1]]#.
 
-    hintTable[RHT_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#music in the test of radiance# reveals", /*french*/"la #musique dans l'épreuve du ciel# révèle", /*spanish*/"la #música en la prueba del resplandor# revela"},
-  });
+    hintTextTable[RHT_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST] = HintText(CustomMessage("They say that the #test of the seas# holds #[[1]]#.",
+                                                                        /*german*/ "",
+                                                                        /*french*/ "Selon moi, l'#épreuve des mers# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                     // /*spanish*/ Según dicen, la #prueba del mar# brinda #[[1]]#.
 
+    hintTextTable[RHT_GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST] = HintText(CustomMessage("They say that the #test of the wilds# holds #[[1]]#.",
+                                                                                    /*german*/ "",
+                                                                                    /*french*/ "Selon moi, l'#épreuve des bois# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                 // /*spanish*/ Según dicen, la #prueba de la naturaleza# brinda #[[1]]#.
 
-    hintTable[RHT_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #test of the seas# holds", /*french*/"l'#épreuve des mers# contient", /*spanish*/"la #prueba del mar# brinda"},
-  });
+    hintTextTable[RHT_GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST] = HintText(CustomMessage("They say that the #test of the wilds# holds #[[1]]#.",
+                                                                                           /*german*/ "",
+                                                                                           /*french*/ "Selon moi, l'#épreuve des bois# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                        // /*spanish*/ Según dicen, la #prueba de la naturaleza# brinda #[[1]]#.
 
-    hintTable[RHT_GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #test of the wilds# holds", /*french*/"l'#épreuve des bois# contient", /*spanish*/"la #prueba de la naturaleza# brinda"},
-  });
+    hintTextTable[RHT_GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST] = HintText(CustomMessage("They say that #music in the test of radiance# reveals #[[1]]#.",
+                                                                                /*german*/ "",
+                                                                                /*french*/ "Selon moi, la #musique dans l'épreuve du ciel# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                             // /*spanish*/ Según dicen, la #música en la prueba del resplandor# revela #[[1]]#.
 
-    hintTable[RHT_GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #test of the wilds# holds", /*french*/"l'#épreuve des bois# contient", /*spanish*/"la #prueba de la naturaleza# brinda"},
-  });
+    hintTextTable[RHT_GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST] = HintText(CustomMessage("They say that the #test of darkness# holds #[[1]]#.",
+                                                                                     /*german*/ "",
+                                                                                     /*french*/ "Selon moi, l'#épreuve des ténèbres# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                  // /*spanish*/ Según dicen, la #prueba de la oscuridad# brinda #[[1]]#.
 
-    hintTable[RHT_GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#music in the test of radiance# reveals", /*french*/"la #musique dans l'épreuve du ciel# révèle", /*spanish*/"la #música en la prueba del resplandor# revela"},
-  });
+    hintTextTable[RHT_GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST] = HintText(CustomMessage("They say that the #test of darkness# holds #[[1]]#.",
+                                                                                    /*german*/ "",
+                                                                                    /*french*/ "Selon moi, l'#épreuve des ténèbres# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                 // /*spanish*/ Según dicen, la #prueba de la oscuridad# brinda #[[1]]#.
 
-    hintTable[RHT_GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #test of darkness# holds", /*french*/"l'#épreuve des ténèbres# contient", /*spanish*/"la #prueba de la oscuridad# brinda"},
-  });
+    hintTextTable[RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST] = HintText(CustomMessage("They say that #reflected light in the test of the sands# reveals #[[1]]#.",
+                                                                                          /*german*/ "",
+                                                                                          /*french*/ "Selon moi, le #soleil dans l'épreuve des sables# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                       // /*spanish*/ Según dicen, #reflejar la luz en la prueba de las arenas# revela #[[1]]#.
 
-    hintTable[RHT_GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #test of darkness# holds", /*french*/"l'#épreuve des ténèbres# contient", /*spanish*/"la #prueba de la oscuridad# brinda"},
-  });
+    hintTextTable[RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST] = HintText(CustomMessage("They say that #reflected light in the test of the sands# reveals #[[1]]#.",
+                                                                                        /*german*/ "",
+                                                                                        /*french*/ "Selon moi, le #soleil dans l'épreuve des sables# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                     // /*spanish*/ Según dicen, #reflejar la luz en la prueba de las arenas# revela #[[1]]#.
 
-    hintTable[RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#reflected light in the test of the sands# reveals", /*french*/"le #soleil dans l'épreuve des sables# révèle", /*spanish*/"#reflejar la luz en la prueba de las arenas# revela"},
-  });
+    hintTextTable[RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST] = HintText(CustomMessage("They say that #reflected light in the test of the sands# reveals #[[1]]#.",
+                                                                                       /*german*/ "",
+                                                                                       /*french*/ "Selon moi, le #soleil dans l'épreuve des sables# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                    // /*spanish*/ Según dicen, #reflejar la luz en la prueba de las arenas# revela #[[1]]#.
 
-    hintTable[RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#reflected light in the test of the sands# reveals", /*french*/"le #soleil dans l'épreuve des sables# révèle", /*spanish*/"#reflejar la luz en la prueba de las arenas# revela"},
-  });
+    hintTextTable[RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST] = HintText(CustomMessage("They say that #reflected light in the test of the sands# reveals #[[1]]#.",
+                                                                                        /*german*/ "",
+                                                                                        /*french*/ "Selon moi, le #soleil dans l'épreuve des sables# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                     // /*spanish*/ Según dicen, #reflejar la luz en la prueba de las arenas# revela #[[1]]#.
 
-    hintTable[RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#reflected light in the test of the sands# reveals", /*french*/"le #soleil dans l'épreuve des sables# révèle", /*spanish*/"#reflejar la luz en la prueba de las arenas# revela"},
-  });
+    hintTextTable[RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST] = HintText(CustomMessage("They say that #reflected light in the test of the sands# reveals #[[1]]#.",
+                                                                               /*german*/ "",
+                                                                               /*french*/ "Selon moi, le #soleil dans l'épreuve des sables# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                            // /*spanish*/ Según dicen, #reflejar la luz en la prueba de las arenas# revela #[[1]]#.
 
-    hintTable[RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#reflected light in the test of the sands# reveals", /*french*/"le #soleil dans l'épreuve des sables# révèle", /*spanish*/"#reflejar la luz en la prueba de las arenas# revela"},
-  });
+    hintTextTable[RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST] = HintText(CustomMessage("They say that #reflected light in the test of the sands# reveals #[[1]]#.",
+                                                                                   /*german*/ "",
+                                                                                   /*french*/ "Selon moi, le #soleil dans l'épreuve des sables# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                // /*spanish*/ Según dicen, #reflejar la luz en la prueba de las arenas# revela #[[1]]#.
 
-    hintTable[RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#reflected light in the test of the sands# reveals", /*french*/"le #soleil dans l'épreuve des sables# révèle", /*spanish*/"#reflejar la luz en la prueba de las arenas# revela"},
-  });
+    hintTextTable[RHT_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY] = HintText(CustomMessage("They say that the #test of the wilds# holds #[[1]]#.",
+                                                                                    /*german*/ "",
+                                                                                    /*french*/ "Selon moi, l'#épreuve des bois# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                                 // /*spanish*/ Según dicen, la #prueba de la naturaleza# brinda #[[1]]#.
 
-    hintTable[RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#reflected light in the test of the sands# reveals", /*french*/"le #soleil dans l'épreuve des sables# révèle", /*spanish*/"#reflejar la luz en la prueba de las arenas# revela"},
-  });
+    hintTextTable[RHT_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT] = HintText(CustomMessage("They say that #scrubs in Ganon's Castle# sell #[[1]]#.",
+                                                                          /*german*/ "",
+                                                                          /*french*/ "Selon moi, les #pestes Mojo dans le Château de Ganon# vendent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                       // /*spanish*/ Según dicen, los #dekus del Castillo de Ganon# venden #[[1]]#.
 
-    hintTable[RHT_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #test of the wilds# holds", /*french*/"l'#épreuve des bois# révèle", /*spanish*/"la #prueba de la naturaleza# brinda"},
-  });
+    hintTextTable[RHT_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT] = HintText(CustomMessage("They say that #scrubs in Ganon's Castle# sell #[[1]]#.",
+                                                                           /*german*/ "",
+                                                                           /*french*/ "Selon moi, les #pestes Mojo dans le Château de Ganon# vendent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                        // /*spanish*/ Según dicen, los #dekus del Castillo de Ganon# venden #[[1]]#.
 
-    hintTable[RHT_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT] = HintText::Exclude({
-                       //obscure text
-                       Text{"#scrubs in Ganon's Castle# sell", /*french*/"les #pestes Mojo dans le Château de Ganon# vendent", /*spanish*/"los #dekus del Castillo de Ganon# venden"},
-  });
+    hintTextTable[RHT_GANONS_CASTLE_DEKU_SCRUB_RIGHT] = HintText(CustomMessage("They say that #scrubs in Ganon's Castle# sell #[[1]]#.",
+                                                                    /*german*/ "",
+                                                                    /*french*/ "Selon moi, les #pestes Mojo dans le Château de Ganon# vendent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                 // /*spanish*/ Según dicen, los #dekus del Castillo de Ganon# venden #[[1]]#.
 
-    hintTable[RHT_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT] = HintText::Exclude({
-                       //obscure text
-                       Text{"#scrubs in Ganon's Castle# sell", /*french*/"les #pestes Mojo dans le Château de Ganon# vendent", /*spanish*/"los #dekus del Castillo de Ganon# venden"},
-  });
+    hintTextTable[RHT_GANONS_CASTLE_DEKU_SCRUB_LEFT] = HintText(CustomMessage("They say that #scrubs in Ganon's Castle# sell #[[1]]#.",
+                                                                   /*german*/ "",
+                                                                   /*french*/ "Selon moi, les #pestes Mojo dans le Château de Ganon# vendent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                // /*spanish*/ Según dicen, los #dekus del Castillo de Ganon# venden #[[1]]#.
 
-    hintTable[RHT_GANONS_CASTLE_DEKU_SCRUB_RIGHT] = HintText::Exclude({
-                       //obscure text
-                       Text{"#scrubs in Ganon's Castle# sell", /*french*/"les #pestes Mojo dans le Château de Ganon# vendent", /*spanish*/"los #dekus del Castillo de Ganon# venden"},
-  });
+    hintTextTable[RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT] = HintText(CustomMessage("They say that #scrubs in Ganon's Castle# sell #[[1]]#.",
+                                                                       /*german*/ "",
+                                                                       /*french*/ "Selon moi, les #pestes Mojo dans le Château de Ganon# vendent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                    // /*spanish*/ Según dicen, los #dekus del Castillo de Ganon# venden #[[1]]#.
 
-    hintTable[RHT_GANONS_CASTLE_DEKU_SCRUB_LEFT] = HintText::Exclude({
-                       //obscure text
-                       Text{"#scrubs in Ganon's Castle# sell", /*french*/"les #pestes Mojo dans le Château de Ganon# vendent", /*spanish*/"los #dekus del Castillo de Ganon# venden"},
-  });
+    hintTextTable[RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT] = HintText(CustomMessage("They say that #scrubs in Ganon's Castle# sell #[[1]]#.",
+                                                                             /*german*/ "",
+                                                                             /*french*/ "Selon moi, les #pestes Mojo dans le Château de Ganon# vendent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                          // /*spanish*/ Según dicen, los #dekus del Castillo de Ganon# venden #[[1]]#.
 
+    hintTextTable[RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER] = HintText(CustomMessage("They say that #scrubs in Ganon's Castle# sell #[[1]]#.",
+                                                                        /*german*/ "",
+                                                                        /*french*/ "Selon moi, les #pestes Mojo dans le Château de Ganon# vendent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                     // /*spanish*/ Según dicen, los #dekus del Castillo de Ganon# venden #[[1]]#.
 
-    hintTable[RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT] = HintText::Exclude({
-                       //obscure text
-                       Text{"#scrubs in Ganon's Castle# sell", /*french*/"les #pestes Mojo dans le Château de Ganon# vendent", /*spanish*/"los #dekus del Castillo de Ganon# venden"},
-  });
+    hintTextTable[RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT] = HintText(CustomMessage("They say that #scrubs in Ganon's Castle# sell #[[1]]#.",
+                                                                              /*german*/ "",
+                                                                              /*french*/ "Selon moi, les #pestes Mojo dans le Château de Ganon# vendent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                           // /*spanish*/ Según dicen, los #dekus del Castillo de Ganon# venden #[[1]]#.
 
-    hintTable[RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT] = HintText::Exclude({
-                       //obscure text
-                       Text{"#scrubs in Ganon's Castle# sell", /*french*/"les #pestes Mojo dans le Château de Ganon# vendent", /*spanish*/"los #dekus del Castillo de Ganon# venden"},
-  });
-
-    hintTable[RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER] = HintText::Exclude({
-                       //obscure text
-                       Text{"#scrubs in Ganon's Castle# sell", /*french*/"les #pestes Mojo dans le Château de Ganon# vendent", /*spanish*/"los #dekus del Castillo de Ganon# venden"},
-  });
-
-    hintTable[RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT] = HintText::Exclude({
-                       //obscure text
-                       Text{"#scrubs in Ganon's Castle# sell", /*french*/"les #pestes Mojo dans le Château de Ganon# vendent", /*spanish*/"los #dekus del Castillo de Ganon# venden"},
-  });
-
-    hintTable[RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT] = HintText::Exclude({
-                       //obscure text
-                       Text{"#scrubs in Ganon's Castle# sell", /*french*/"les #pestes Mojo dans le Château de Ganon# vendent", /*spanish*/"los #dekus del Castillo de Ganon# venden"},
-  });
+    hintTextTable[RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT] = HintText(CustomMessage("They say that #scrubs in Ganon's Castle# sell #[[1]]#.",
+                                                                      /*german*/ "",
+                                                                      /*french*/ "Selon moi, les #pestes Mojo dans le Château de Ganon# vendent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                   // /*spanish*/ Según dicen, los #dekus del Castillo de Ganon# venden #[[1]]#.
+}
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_overworld.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_overworld.cpp
index c705bb2b6..570101b4e 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_overworld.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_overworld.cpp
@@ -1,1467 +1,1491 @@
-#include "../hint_list.hpp"
-#include <soh/Enhancements/randomizer/static_data.h>
-
-void HintTable_Init_Exclude_Overworld() {
-    hintTable[RHT_KF_KOKIRI_SWORD_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #hidden treasure of the Kokiri# is", /*french*/"le #trésor des Kokiri# est", /*spanish*/"el #tesoro oculto de los Kokiri# esconde"},
-  });
-
-    hintTable[RHT_KF_MIDOS_TOP_LEFT_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #leader of the Kokiri# hides", /*french*/"le #chef des Kokiri# possède", /*spanish*/"el #líder de los Kokiri# esconde"},
-                     }, {},
-                       //clear text
-                       Text{"#inside Mido's house# is", /*french*/"#dans la maison de Mido# gît", /*spanish*/"en la #casa de Mido# yace"}
-  );
-
-    hintTable[RHT_KF_MIDOS_TOP_RIGHT_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #leader of the Kokiri# hides", /*french*/"le #chef des Kokiri# possède", /*spanish*/"el #líder de los Kokiri# esconde"},
-                     }, {},
-                       //clear text
-                       Text{"#inside Mido's house# is", /*french*/"#dans la maison de Mido# gît", /*spanish*/"en la #casa de Mido# yace"}
-  );
-
-    hintTable[RHT_KF_MIDOS_BOTTOM_LEFT_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #leader of the Kokiri# hides", /*french*/"le #chef des Kokiri# possède", /*spanish*/"el #líder de los Kokiri# esconde"},
-                     }, {},
-                       //clear text
-                       Text{"#inside Mido's house# is", /*french*/"#dans la maison de Mido# gît", /*spanish*/"en la #casa de Mido# yace"}
-  );
-
-    hintTable[RHT_KF_MIDOS_BOTTOM_RIGHT_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #leader of the Kokiri# hides", /*french*/"le #chef des Kokiri# possède", /*spanish*/"el #líder de los Kokiri# esconde"},
-                     }, {},
-                       //clear text
-                       Text{"#inside Mido's house# is", /*french*/"#dans la maison de Mido# gît", /*spanish*/"en la #casa de Mido# yace"}
-  );
-
-    hintTable[RHT_GRAVEYARD_SHIELD_GRAVE_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #treasure of a fallen soldier# is", /*french*/"le #trésor du soldat mort# est", /*spanish*/"el #tesoro de un soldado caído# esconde"},
-  });
-
-    hintTable[RHT_DMT_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"hidden behind a wall on a #mountain trail# is", /*french*/"derrière une façade du #chemin montagneux# est", /*spanish*/"tras una pared del #sendero de la montaña# yace"},
-  });
-
-    hintTable[RHT_GC_MAZE_RIGHT_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"in #Goron City# explosives unlock", /*french*/"des explosions dans le #village Goron# révèlent", /*spanish*/"en la #Ciudad Goron# unos explosivos desbloquean"},
-  });
-
-    hintTable[RHT_GC_MAZE_CENTER_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"in #Goron City# explosives unlock", /*french*/"des explosions dans le #village Goron# révèlent", /*spanish*/"en la #Ciudad Goron# unos explosivos desbloquean"},
-  });
-
-    hintTable[RHT_ZD_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"fire #beyond a waterfall# reveals", /*french*/"du feu #derrière la cascade# éclaire", /*spanish*/"las #llamas tras una una cascada# revelan"},
-  });
-
-    hintTable[RHT_GRAVEYARD_HOOKSHOT_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a chest hidden by a #speedy spectre# holds", /*french*/"le #coffre du rapide revenant# contient", /*spanish*/"un cofre custodiado por un #espectro veloz# contiene"},
-                     }, {},
-                       //clear text
-                       Text{"#dead Dampé's first prize# is", /*french*/"la #première course d'Igor# donne", /*spanish*/"el primer premio de #la carrera de Dampé# se trata de"}
-  );
-
-    hintTable[RHT_GF_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"on a #rooftop in the desert# lies", /*french*/"sur un #toit du désert# gît", /*spanish*/"en una #azotea del desierto# yace"},
-  });
-
-    hintTable[RHT_KAK_REDEAD_GROTTO_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#zombies beneath the earth# guard", /*french*/"les #revenants sous terre# protègent", /*spanish*/"unos #zombis subterráneos# esconden"},
-  });
-
-    hintTable[RHT_SFM_WOLFOS_GROTTO_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#wolves beneath the earth# guard", /*french*/"les #loups sous terre# protègent", /*spanish*/"unos #lobos subterráneos# esconden"},
-  });
-
-    hintTable[RHT_HF_NEAR_MARKET_GROTTO_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #hole in a field near a drawbridge# holds", /*french*/"la #grotte près d'un pont# contient", /*spanish*/"bajo el #hoyo de una llanura cercano a un puente# yace"},
-  });
-
-    hintTable[RHT_HF_NEAR_MARKET_GROTTO_FISH] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #fish in a hole in a field near a drawbridge# holds", /*french*/"la #grotte près d'un pont# contient", /*spanish*/"bajo el #hoyo de una llanura cercano a un puente# yace"},
-  });
-
-    hintTable[RHT_HF_SOUTHEAST_GROTTO_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #hole amongst trees in a field# holds", /*french*/"la #grotte près des arbres# contient", /*spanish*/"bajo el #hoyo de una llanura rodeado de árboles# yace"},
-  });
-    
-    hintTable[RHT_HF_SOUTHEAST_GROTTO_FISH] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #fish in a hole amongst trees in a field# holds", /*french*/"la #grotte près des arbres# contient", /*spanish*/"bajo el #hoyo de una llanura rodeado de árboles# yace"},
-  });
-
-    hintTable[RHT_HF_OPEN_GROTTO_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"an #open hole in a field# holds", /*french*/"la #grotte dans les plaines# contient", /*spanish*/"bajo el #hoyo descubierto de una llanura# yace"},
-  });
-
-    hintTable[RHT_HF_OPEN_GROTTO_FISH] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #fish in an open hole in a field# holds", /*french*/"la #grotte dans les plaines# contient", /*spanish*/"bajo el #hoyo descubierto de una llanura# yace"},
-  });
-
-    hintTable[RHT_KAK_OPEN_GROTTO_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"an #open hole in a town# holds", /*french*/"la #grotte dans le village# contient", /*spanish*/"bajo el #hoyo descubierto de un pueblo# yace"},
-  });
-
-    hintTable[RHT_KAK_OPEN_GROTTO_FISH] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #fish in an open hole in a town# holds", /*french*/"la #grotte dans le village# contient", /*spanish*/"bajo el #hoyo descubierto de un pueblo# yace"},
-  });
-
-    hintTable[RHT_ZR_OPEN_GROTTO_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #hole along a river# holds", /*french*/"la #grotte près du fleuve# contient", /*spanish*/"bajo un #hoyo junto a un río# yace"},
-  });
-
-    hintTable[RHT_ZR_OPEN_GROTTO_FISH] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #fish in a hole along a river# holds", /*french*/"la #grotte près du fleuve# contient", /*spanish*/"bajo un #hoyo junto a un río# yace"},
-  });
-
-    hintTable[RHT_KF_STORMS_GROTTO_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #hole in a forest village# holds", /*french*/"la #grotte inondée de pluie dans le Village Kokiri# révèle", /*spanish*/"bajo el #hoyo de una tribu del bosque# yace"},
-  });
-
-    hintTable[RHT_KF_STORMS_GROTTO_FISH] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #fish in a hole in a forest village# holds", /*french*/"la #grotte inondée de pluie dans le Village Kokiri# révèle", /*spanish*/"bajo el #hoyo de una tribu del bosque# yace"},
-  });
-
-    hintTable[RHT_LW_NEAR_SHORTCUTS_GROTTO_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #hole in a wooded maze# holds", /*french*/"la #grotte dans le labyrinthe sylvestre# contient", /*spanish*/"bajo un #hoyo de un laberinto forestal# yace"},
-  });
-
-    hintTable[RHT_LW_NEAR_SHORTCUTS_GROTTO_FISH] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #fish in a hole in a wooded maze# holds", /*french*/"la #grotte dans le labyrinthe sylvestre# contient", /*spanish*/"bajo un #hoyo de un laberinto forestal# yace"},
-  });
-
-    hintTable[RHT_DMT_STORMS_GROTTO_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"#hole flooded with rain on a mountain# holds", /*french*/"la #grotte inondée de pluie sur la montagne# contient", /*spanish*/"bajo un #hoyo de una montaña inundado de lluvia# yace"},
-  });
-
-    hintTable[RHT_DMT_STORMS_GROTTO_FISH] = HintText::Exclude({
-                       //obscure text
-                       Text{"#fish in a hole flooded with rain on a mountain# holds", /*french*/"la #grotte inondée de pluie sur la montagne# contient", /*spanish*/"bajo un #hoyo de una montaña inundado de lluvia# yace"},
-  });
-
-    hintTable[RHT_DMC_UPPER_GROTTO_CHEST] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #hole in a volcano# holds", /*french*/"la #grotte dans le volcan# contient", /*spanish*/"bajo el #hoyo de un volcán# yace"},
-  });
-
-    hintTable[RHT_DMC_UPPER_GROTTO_FISH] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #fish in a hole in a volcano# holds", /*french*/"la #grotte dans le volcan# contient", /*spanish*/"bajo el #hoyo de un volcán# yace"},
-  });
-
-    hintTable[RHT_TOT_MASTER_SWORD] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #pedestal in a temple# holds", /*french*/"un #piédestal dans un temple# contient", /*spanish*/"un #pedestal en un templo# sostiene"},
-  });
-
-    hintTable[RHT_TOT_LIGHT_ARROWS_CUTSCENE] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #final gift of a princess# is", /*french*/"le #cadeau d'adieu de la princesse# est", /*spanish*/"el #obsequio final de la princesa# se trata de"},
-  });
-
-    hintTable[RHT_LW_GIFT_FROM_SARIA] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #potato hoarder# holds",           /*french*/"le #panini mélodieux# est en fait", /*spanish*/"cierta #jovencita verde# concede"},
-                       Text{"a rooty tooty #flutey cutey# gifts", /*french*/"la #patate musicale# est en fait",  /*spanish*/"una #gran amiga# concede"},
-                     }, {},
-                       //clear text
-                       Text{"#Saria's Gift# is", /*french*/"le #cadeau de Saria# est", /*spanish*/"el #regalo de Saria# se trata de"}
-  );
-
-    hintTable[RHT_ZF_GREAT_FAIRY_REWARD] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #fairy of winds# holds", /*french*/"la #fée du vent# a", /*spanish*/"el #hada del viento# brinda"},
-  });
-
-    hintTable[RHT_HC_GREAT_FAIRY_REWARD] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #fairy of fire# holds", /*french*/"la #fée du feu# a", /*spanish*/"el #hada del fuego# brinda"},
-  });
-
-    hintTable[RHT_COLOSSUS_GREAT_FAIRY_REWARD] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #fairy of love# holds", /*french*/"la #fée de l'amour# a", /*spanish*/"el #hada del amor# brinda"},
-  });
-
-    hintTable[RHT_DMT_GREAT_FAIRY_REWARD] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #magical fairy# gifts", /*french*/"la #fée de la magie# a", /*spanish*/"un #hada mágica# brinda"},
-  });
-
-    hintTable[RHT_DMC_GREAT_FAIRY_REWARD] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #magical fairy# gifts", /*french*/"la #fée de la magie# a", /*spanish*/"un #hada mágica# brinda"},
-  });
-
-    hintTable[RHT_OGC_GREAT_FAIRY_REWARD] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #fairy of strength# holds", /*french*/"la #fée de la force# a", /*spanish*/"el #hada de la fuerza# brinda"},
-  });
-
-
-    hintTable[RHT_SONG_FROM_IMPA] = HintText::Exclude({
-                       //obscure text
-                       Text{"#deep in a castle#, Impa teaches", /*french*/"#la gardienne de la princesse# donne", /*spanish*/"en el #jardín del castillo Impa enseña#"},
-  });
-
-    hintTable[RHT_SONG_FROM_MALON] = HintText::Exclude({
-                       //obscure text
-                       Text{"#a farm girl# sings", /*french*/"la #fillette de la ferme# donne", /*spanish*/"una #chica rupestre# canta"},
-  });
-
-    hintTable[RHT_SONG_FROM_SARIA] = HintText::Exclude({
-                       //obscure text
-                       Text{"#deep in the forest#, Saria teaches", /*french*/"la #fille de la forêt# donne", /*spanish*/"al #fondo del bosque# Saria enseña"},
-  });
-
-    hintTable[RHT_SONG_FROM_WINDMILL] = HintText::Exclude({
-                       //obscure text
-                       Text{"a man #in a windmill# is obsessed with", /*french*/"l'#homme du moulin# donne", /*spanish*/"el #hombre del molino# está obsesionado con"},
-  });
-
-
-    hintTable[RHT_HC_MALON_EGG] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #girl looking for her father# gives", /*french*/"la #fillette qui cherche son père# donne", /*spanish*/"una #chica en busca de su padre# otorga"},
-  });
-
-    hintTable[RHT_HC_ZELDAS_LETTER] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #princess in a castle# gifts", /*french*/"la #princesse dans le château# donne", /*spanish*/"la #princesa de un castillo# otorga"},
-  });
-
-    hintTable[RHT_ZD_DIVING_MINIGAME] = HintText::Exclude({
-                       //obscure text
-                       Text{"an #unsustainable business model# gifts", /*french*/"le #mauvais modèle d'affaires# donne", /*spanish*/"un #mal modelo de negocio# premia con"},
-                     }, {},
-                       //clear text
-                       Text{"those who #dive for Zora rupees# will find", /*french*/"ceux qui #plongent pour des rubis Zora# trouveront", /*spanish*/"aquellos que se #sumergan por las rupias zora# encontrarán"}
-  );
-
-    hintTable[RHT_LH_CHILD_FISHING] = HintText::Exclude({
-                       //obscure text
-                       Text{"#fishing in youth# bestows", /*french*/"#pêcher dans sa jeunesse# promet", /*spanish*/"#pescar en la juventud# conduce a"},
-  });
-
-    // TODO: needs french + spanish translation
-    hintTable[RHT_LH_POND_FISH] = HintText::Exclude({
-                       //obscure text
-                       Text{"#hitting the pond# reveals", /*french*/ "", /*spanish*/ ""},
-                       {},
-                       //clear text
-                       Text{"#the fishing pond's bounty# includes", /*french*/ "", /*spanish*/ ""}
-    });
-
-    // TODO: needs french translation
-    hintTable[RHT_LH_HYRULE_LOACH] = HintText::Exclude(
-        {
-            // obscure text
-            Text{ "#fishing the legend# bestows", /*french*/ "!!!", /*spanish*/ "#pescar a la leyenda# conduce a" },
-        },
-        {},
-        // clear text
-        Text{ "#fishing the hyrule loach# will give you", /*french*/ "!!!",
-              /*spanish*/ "si #pescas a la Locha de Hyrule# encontrarás" });
-
-
-    hintTable[RHT_LH_ADULT_FISHING] = HintText::Exclude({
-                       //obscure text
-                       Text{"#fishing in maturity# bestows", /*french*/"#pêcher dans sa maturité# promet", /*spanish*/"#pescar en la madurez# conduce a"},
-  });
-
-    hintTable[RHT_LH_LAB_DIVE] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #diving experiment# is rewarded with", /*french*/"l'#expérience de plongée# donne", /*spanish*/"#bucear para un experimento# se premia con"},
-  });
-
-    // TODO: needs translation
-    hintTable[RHT_ZD_FISH] = HintText::Exclude({
-        // obscure text
-        Text{"a #fish by a waterfall# hoards", /*french*/"", /*spanish*/""}
-    });
-
-    hintTable[RHT_GC_ROLLING_GORON_AS_ADULT] = HintText::Exclude({
-                       //obscure text
-                       Text{"#comforting yourself# provides", /*french*/"se #réconforter soi-même# donne", /*spanish*/"#confrontarte a ti mismo# otorga"},
-                     }, {},
-                       //clear text
-                       Text{"#reassuring a young Goron# is rewarded with", /*french*/"#rassurer un jeune Goron# donne", /*spanish*/"#calmar a un joven Goron# otorga"}
-  );
-
-    hintTable[RHT_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #first explosive prize# is", /*french*/"le #premier prix explosif# est", /*spanish*/"el #primer premio explosivo# se trata de"},
-  });
-
-    hintTable[RHT_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #second explosive prize# is", /*french*/"le #deuxième prix explosif# est", /*spanish*/"el #segundo premio explosivo# se trata de"},
-  });
-
-    hintTable[RHT_MARKET_LOST_DOG] = HintText::Exclude({
-                       //obscure text
-                       Text{"#puppy lovers# will find", /*french*/"les #amoureux canins# trouveront", /*spanish*/"los #amantes caninos# encontrarán"},
-                     }, {},
-                       //clear text
-                       Text{"#rescuing Richard the Dog# is rewarded with", /*french*/"#retrouver Kiki le chien# promet", /*spanish*/"#rescatar al perrito Ricardo# conduce a"}
-  );
-
-    hintTable[RHT_LW_OCARINA_MEMORY_GAME] = HintText::Exclude({
-                       //obscure text
-                       Text{"the prize for a #game of Simon Says# is", /*french*/"la #récompense de Jean Dit# est", /*spanish*/"#repetir ciertas melodías# otorga"},
-                       Text{"a #child sing-a-long# holds",             /*french*/"les #jeunes flûtistes# donnent",  /*spanish*/"#tocar junto a otros# otorga"},
-                     }, {},
-                       //clear text
-                       Text{"#playing an Ocarina in Lost Woods# is rewarded with", /*french*/"#jouer l'ocarina dans les Bois Perdus# donne", /*spanish*/"#tocar la ocarina en el Bosque Perdido# otorga"}
-  );
-
-    hintTable[RHT_KAK_10_GOLD_SKULLTULA_REWARD] = HintText::Exclude({
-                       //obscure text
-                       Text{"#10 bug badges# rewards",           /*french*/"#10 écussons# donnent",             /*spanish*/"#10 medallas de insectos# otorgan"},
-                       Text{"#10 spider souls# yields",          /*french*/"#10 âmes# donnent",                 /*spanish*/"#10 almas de araña# otorgan"},
-                       Text{"#10 auriferous arachnids# lead to", /*french*/"#10 arachnides aurifères# donnent", /*spanish*/"#10 arácnidos auríferos# otorgan"},
-                     }, {},
-                       //clear text
-                       Text{"slaying #10 Gold Skulltulas# reveals", /*french*/"détruire #10 Skulltulas d'or# donne", /*spanish*/"#exterminar 10 skulltulas doradas# revela"}
-  );
-
-    hintTable[RHT_KAK_MAN_ON_ROOF] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #rooftop wanderer# holds", /*french*/"une #rencontre sur un toit# donne", /*spanish*/"#alguien sobre un tejado# otorga"},
-  });
-
-    hintTable[RHT_ZR_MAGIC_BEAN_SALESMAN] = HintText::Exclude({
-                       //obscure text
-                       Text{"a seller of #colorful crops# has", /*french*/"le #marchand de légumes# vend", /*spanish*/"el vendedor de un #colorido cultivo# ofrece"},
-                     }, {},
-                       //clear text
-                       Text{"a #bean seller# offers", /*french*/"le #marchand de haricots magiques# vend en fait", /*spanish*/"el #vendedor de judías# ofrece"}
-  );
-
-    hintTable[RHT_ZR_FROGS_IN_THE_RAIN] = HintText::Exclude({
-                       //obscure text
-                       Text{"#frogs in a storm# gift", /*french*/"#des grenouilles mouillées# donnent", /*spanish*/"las #ancas bajo la tormenta# otorgan"},
-  });
-    hintTable[RHT_ZR_FROGS_ZELDAS_LULLABY] = HintText::Exclude(
-        {
-            // obscure text
-            Text{ "#sleepy frogs# gift", /*french*/ "#les grenouilles somnolentes# donnent",
-                  /*spanish*/ "las #ranas somnolientas# regalan" },
-            Text{ "#the Froggish Tenor in the back-left# gifts",
-                  /*french*/ "#le ténor grenouillesque au fond à gauche# donne",
-                  /*spanish*/ "el #Sapo Tenore al fondo, a la izquierda#, regala" },
-        },
-        {},
-        // clear text
-        Text{ "after hearing #Zelda's Lullaby, the frogs# gift",
-              /*french*/ "à l'écoute de #la berceuse de Zelda, les grenouilles# donnent",
-              /*spanish*/ "después de escuchar #la Nana de Zelda, las ranas# regalan" });
-
-    hintTable[RHT_ZR_FROGS_EPONAS_SONG] = HintText::Exclude(
-        {
-            // obscure text
-            Text{ "#equine frogs# gift", /*french*/ "#les grenouilles équestres# donnent",
-                  /*spanish*/ "las #ranas equinas# regalan" },
-            Text{ "#the Froggish Tenor in the back-right# gifts",
-                  /*french*/ "#le ténor grenouillesque au fond à droite# donne",
-                  /*spanish*/ "el #Sapo Tenore al fondo, a la derecha#, regala" },
-        },
-        {},
-        // clear text
-        Text{ "after hearing #Epona's Song, the frogs# gift",
-              /*french*/ "à l'écoute du #chant d'Epona, les grenouilles# donnent",
-              /*spanish*/ "después de escuchar #la Canción de Epona, las ranas# regalan" });
-
-    hintTable[RHT_ZR_FROGS_SARIAS_SONG] = HintText::Exclude(
-        {
-            // obscure text
-            Text{ "#sylvan frogs# gift", /*french*/ "#les grenouilles sylvestres# donnent",
-                  /*spanish*/ "las #ranas silvestres# regalan" },
-            Text{ "#the Froggish Tenor in the center# gifts",
-                  /*french*/ "#le ténor grenouillesque dans le centre# donne",
-                  /*spanish*/ "el #Sapo Tenore en el centro# regala" },
-        },
-        {},
-        // clear text
-        Text{ "after hearing #Saria's Song, the frogs# gift",
-              /*french*/ "à l'écoute du #chant de Saria, les grenouilles# donnent",
-              /*spanish*/ "después de escuchar #la Canción de Saria, las ranas# regalan" });
-
-    hintTable[RHT_ZR_FROGS_SUNS_SONG] = HintText::Exclude(
-        {
-            // obscure text
-            Text{ "#enlightened frogs# gift", /*french*/ "#les grenouilles éclairées# donnent",
-                  /*spanish*/ "las #ranas alumbradas# regalan" },
-            Text{ "#the Froggish Tenor in the front-left# gifts",
-                  /*french*/ "#le ténor grenouillesque à l'avant gauche# donne",
-                  /*spanish*/ "el #Sapo Tenore al frente, a la izquierda#, regala" },
-        },
-        {},
-        // clear text
-        Text{ "after hearing #the Sun's Song, the frogs# gift",
-              /*french*/ "à l'écoute du #chant du soleil, les grenouilles# donnent",
-              /*spanish*/ "después de escuchar #la Canción del Sol, las ranas# regalan" });
-
-    hintTable[RHT_ZR_FROGS_SONG_OF_TIME] = HintText::Exclude(
-        {
-            // obscure text
-            Text{ "#time-traveling frogs# gift", /*french*/ "#les grenouilles voyageuses dans le temps# donnent",
-                  /*spanish*/ "las #ranas viajeras del tiempo# regalan" },
-            Text{ "#the Froggish Tenor in the front-right# gifts",
-                  /*french*/ "#le ténor grenouillesque à l'avant droite# donne",
-                  /*spanish*/ "el #Sapo Tenore al frente, a la derecha#, regala" },
-        },
-        {},
-        // clear text
-        Text{ "after hearing #the Song of Time, the frogs# gift",
-              /*french*/ "à l'écoute du #chant du temps, les grenouilles# donnent",
-              /*spanish*/ "después de escuchar #la Canción del tiempo, las ranas# regalan" });
-
-    hintTable[RHT_GF_HBA_1000_POINTS] = HintText::Exclude({
-                       //obscure text
-                       Text{"scoring 1000 in #horseback archery# grants", /*french*/"obtenir 1000 points dans l'#archerie équestre# donne", /*spanish*/"conseguir 1000 puntos en el #tiro con arco a caballo# premia"},
-  });
-
-    hintTable[RHT_MARKET_SHOOTING_GALLERY_REWARD] = HintText::Exclude({
-                       //obscure text
-                       Text{"#shooting in youth# grants", /*french*/"#faire du tir dans sa jeunesse# donne", /*spanish*/"#disparar en la juventud# otorga"},
-  });
-
-    hintTable[RHT_KAK_SHOOTING_GALLERY_REWARD] = HintText::Exclude({
-                       //obscure text
-                       Text{"#shooting in maturity# grants", /*french*/"#faire du tir dans sa maturité# donne", /*spanish*/"#disparar en la madurez# otorga"},
-  });
-
-    hintTable[RHT_LW_TARGET_IN_WOODS] = HintText::Exclude({
-                       //obscure text
-                       Text{"shooting a #target in the woods# grants", /*french*/"#tirer une cible dans les bois# donne", /*spanish*/"disparar a un #blanco forestal# brinda"},
-  });
-
-    hintTable[RHT_KAK_ANJU_AS_ADULT] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #chicken caretaker# offers adults", /*french*/"devenir un #éleveur de Cocottes# donne", /*spanish*/"una #cuidadora de emplumados# le ofrece a los mayores"},
-  });
-
-    hintTable[RHT_LLR_TALONS_CHICKENS] = HintText::Exclude({
-                       //obscure text
-                       Text{"#finding Super Cuccos# is rewarded with", /*french*/"#trouver des Super Cocottes# donne", /*spanish*/"#hallar los supercucos# conduce a"},
-  });
-
-    hintTable[RHT_GC_ROLLING_GORON_AS_CHILD] = HintText::Exclude({
-                       //obscure text
-                       Text{"the prize offered by a #large rolling Goron# is", /*french*/"la récompense d'un #gros Goron roulant# est", /*spanish*/"un #gran Goron rodante# otorga"},
-  });
-
-    hintTable[RHT_LH_UNDERWATER_ITEM] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #sunken treasure in a lake# is", /*french*/"le #trésor au fond du lac# est", /*spanish*/"el #tesoro hundido del lago# se trata de"},
-  });
-
-    hintTable[RHT_GF_GERUDO_MEMBERSHIP_CARD] = HintText::Exclude({
-                       //obscure text
-                       Text{"#rescuing captured carpenters# is rewarded with", /*french*/"#secourir les charpentiers capturés# assure", /*spanish*/"#rescatar los apresados carpinteros# se premia con"},
-  });
-
-    hintTable[RHT_WASTELAND_BOMBCHU_SALESMAN] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #carpet guru# sells", /*french*/"#un marchand du désert# vend", /*spanish*/"el #genio de una alfombra# vende"},
-  });
-
-    hintTable[RHT_GC_MEDIGORON] = HintText::Exclude({
-                       //obscure text
-                       Text{"#Medigoron# sells", /*french*/"#Medigoron# vend", /*spanish*/"#Medigoron# vende"},
-  });
-
-  hintTable[RHT_KAK_GRANNYS_SHOP] = HintText::Exclude({
-                       // obscure text
-                       Text{"the #potion shop lady# sells", /*french*/"la #dame du magasin de potion# vend", /*spanish*/"la #señora de la tienda de pociones# vende" },
-  });
-
-    hintTable[RHT_KAK_IMPAS_HOUSE_FREESTANDING_POH] = HintText::Exclude({
-                       //obscure text
-                       Text{"#imprisoned in a house# lies", /*french*/"#encagé dans une maison# gît", /*spanish*/"#en una casa entre rejas# yace"},
-  });
-
-    hintTable[RHT_HF_TEKTITE_GROTTO_FREESTANDING_POH] = HintText::Exclude({
-                       //obscure text
-                       Text{"#deep underwater in a hole# is", /*french*/"#dans les profondeurs d'une grotte# gît", /*spanish*/"#en lo hondo bajo un hoyo# yace"},
-  });
-
-    hintTable[RHT_KAK_WINDMILL_FREESTANDING_POH] = HintText::Exclude({
-                       //obscure text
-                       Text{"on a #windmill ledge# lies", /*french*/"#haut perché dans le moulin# gît", /*spanish*/"al #borde de un molino# yace"},
-  });
-
-    hintTable[RHT_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH] = HintText::Exclude({
-                       //obscure text
-                       Text{"#racing a ghost# leads to", /*french*/"le défi du #revenant rapide# donne", /*spanish*/"#perseguir a un fantasma# conduce a"},
-                     }, {},
-                       //clear text
-                       Text{"#dead Dampe's second# prize is", /*french*/"la #deuxième course d'Igor# donne", /*spanish*/"el segundo premio de #la carrera de Dampé# se trata de"}
-  );
-
-    hintTable[RHT_LLR_FREESTANDING_POH] = HintText::Exclude({
-                       //obscure text
-                       Text{"in a #ranch silo# lies", /*french*/"#dans l'entrepôt de la ferme# gît", /*spanish*/"en un #granero rupestre# yace"},
-  });
-
-    hintTable[RHT_GRAVEYARD_FREESTANDING_POH] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #crate in a graveyard# hides", /*french*/"#la boîte dans le Cimetière# contient", /*spanish*/"bajo la #caja de un cementerio# yace"},
-  });
-
-    hintTable[RHT_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #gravekeeper digs up#", /*french*/"#le jeu du fossoyeur# cache", /*spanish*/"cierto #sepultero desentierra#"},
-  });
-
-    hintTable[RHT_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH] = HintText::Exclude({
-                       //obscure text
-                       Text{"on top of a #pillar in a river# lies", /*french*/"#sur un pilier au dessus du fleuve# gît", /*spanish*/"en lo alto del #pilar de un río# yace"},
-  });
-
-    hintTable[RHT_ZR_NEAR_DOMAIN_FREESTANDING_POH] = HintText::Exclude({
-                       //obscure text
-                       Text{"on a #river ledge by a waterfall# lies", /*french*/"#sur la falaise au dessus du fleuve# gît", /*spanish*/"al borde de #la entrada a una cascada# yace"},
-  });
-
-    hintTable[RHT_LH_FREESTANDING_POH] = HintText::Exclude({
-                       //obscure text
-                       Text{"high on a #lab rooftop# one can find", /*french*/"#la tour d'observation du lac# cache", /*spanish*/"en lo #alto de un laboratorio# yace"},
-  });
-
-    hintTable[RHT_ZF_ICEBERG_FREESTANDING_POH] = HintText::Exclude({
-                       //obscure text
-                       Text{"#floating on ice# is", /*french*/"#gisant sur la glace# gît", /*spanish*/"#flotando sobre hielo# yace"},
-  });
-
-    hintTable[RHT_GV_WATERFALL_FREESTANDING_POH] = HintText::Exclude({
-                       //obscure text
-                       Text{"behind a #valley waterfall# is", /*french*/"#derrière la cascade du désert# se cache", /*spanish*/"tras una #desierta cascada# yace"},
-  });
-
-    hintTable[RHT_GV_CRATE_FREESTANDING_POH] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #crate in a valley# hides", /*french*/"la #boîte dans la vallée# contient", /*spanish*/"bajo la #caja de un valle# yace"},
-  });
-
-    hintTable[RHT_COLOSSUS_FREESTANDING_POH] = HintText::Exclude({
-                       //obscure text
-                       Text{"on top of an #arch of stone# lies", /*french*/"#gisant sur une arche de pierre# gît", /*spanish*/"en lo alto de un #arco de piedra# yace"},
-  });
-
-    hintTable[RHT_DMT_FREESTANDING_POH] = HintText::Exclude({
-                       //obscure text
-                       Text{"above a #mountain cavern entrance# is", /*french*/"gisant #au dessus de la caverne montagneuse# gît", /*spanish*/"en lo alto de la #entrada de una cueva en la montaña# yace"},
-  });
-
-    hintTable[RHT_DMC_WALL_FREESTANDING_POH] = HintText::Exclude({
-                       //obscure text
-                       Text{"nestled in a #volcanic wall# is", /*french*/"dans une #alcove volcanique# gît", /*spanish*/"entre unas #murallas volcánicas# yace"},
-  });
-
-    hintTable[RHT_DMC_VOLCANO_FREESTANDING_POH] = HintText::Exclude({
-                       //obscure text
-                       Text{"obscured by #volcanic ash# is", /*french*/"#recouvert de cendres volcaniques# gît", /*spanish*/"bajo la #ceniza volcánica# yace"},
-  });
-
-    hintTable[RHT_GF_NORTH_F1_CARPENTER] = HintText::Exclude({
-                       //obscure text
-                       Text{"#defeating Gerudo guards# reveals", /*french*/"les #geôliers Gerudo# détiennent", /*spanish*/"#derrotar a las guardas Gerudo# revela"},
-  });
-
-    hintTable[RHT_GF_NORTH_F2_CARPENTER] = HintText::Exclude({
-                       //obscure text
-                       Text{"#defeating Gerudo guards# reveals", /*french*/"les #geôliers Gerudo# détiennent", /*spanish*/"#derrotar a las guardas Gerudo# revela"},
-  });
-
-    hintTable[RHT_GF_SOUTH_F1_CARPENTER] = HintText::Exclude({
-                       //obscure text
-                       Text{"#defeating Gerudo guards# reveals", /*french*/"les #geôliers Gerudo# détiennent", /*spanish*/"#derrotar a las guardas Gerudo# revela"},
-  });
-
-    hintTable[RHT_GF_SOUTH_F2_CARPENTER] = HintText::Exclude({
-                       //obscure text
-                       Text{"#defeating Gerudo guards# reveals", /*french*/"les #geôliers Gerudo# détiennent", /*spanish*/"#derrotar a las guardas Gerudo# revela"},
-  });
-
-
-    hintTable[RHT_HF_GS_NEAR_KAK_GROTTO] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider-guarded spider in a hole# hoards", /*french*/"une #Skulltula dans un trou d'arachnides# a", /*spanish*/"una #Skulltula custodiada por otra# de un hoyo otorga"},
-  });
-
-
-    hintTable[RHT_LLR_GS_BACK_WALL] = HintText::Exclude({
-                       //obscure text
-                       Text{"night reveals a #spider in a ranch# holding", /*french*/"une #Skulltula sur la façade de la ferme# a", /*spanish*/"la noche revela una #Skulltula del rancho# que otorga"},
-  });
-
-    hintTable[RHT_LLR_GS_RAIN_SHED] = HintText::Exclude({
-                       //obscure text
-                       Text{"night reveals a #spider in a ranch# holding", /*french*/"une #Skulltula sur le mur de l'enclos# a", /*spanish*/"la noche revela una #Skulltula del rancho# que otorga"},
-  });
-
-    hintTable[RHT_LLR_GS_HOUSE_WINDOW] = HintText::Exclude({
-                       //obscure text
-                       Text{"night reveals a #spider in a ranch# holding", /*french*/"une #Skulltula sur la maison de ferme# a", /*spanish*/"la noche revela una #Skulltula del rancho# que otorga"},
-  });
-
-    hintTable[RHT_LLR_GS_TREE] = HintText::Exclude({
-                       //obscure text
-                       Text{"a spider hiding in a #ranch tree# holds", /*french*/"une #Skulltula dans l'arbre de la ferme# a", /*spanish*/"una Skulltula escondida en el #árbol de un rancho# otorga"},
-  });
-
-
-    hintTable[RHT_KF_GS_BEAN_PATCH] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider buried in a forest# holds", /*french*/"une #Skulltula enterrée dans la forêt# a", /*spanish*/"una #Skulltula enterrada en un bosque# otorga"},
-  });
-
-    hintTable[RHT_KF_GS_KNOW_IT_ALL_HOUSE] = HintText::Exclude({
-                       //obscure text
-                       Text{"night in the past reveals a #spider in a forest# holding", /*french*/"une #Skulltula derrière une cabane de la forêt# a", /*spanish*/"la noche revela en el pasado una #Skulltula del bosque# que otorga"},
-  });
-
-    hintTable[RHT_KF_GS_HOUSE_OF_TWINS] = HintText::Exclude({
-                       //obscure text
-                       Text{"night in the future reveals a #spider in a forest# holding", /*french*/"une #Skulltula sur une cabane de la forêt# a", /*spanish*/"la noche revela en el futuro una #Skulltula del rancho# que otorga"},
-  });
-
-
-    hintTable[RHT_LW_GS_BEAN_PATCH_NEAR_BRIDGE] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider buried deep in a forest maze# holds", /*french*/"une #Skulltula enterrée dans les bois# a", /*spanish*/"una #Skulltula enterrada en un laberinto forestal# otorga"},
-  });
-
-    hintTable[RHT_LW_GS_BEAN_PATCH_NEAR_THEATER] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider buried deep in a forest maze# holds", /*french*/"une #Skulltula enterrée dans les bois# a", /*spanish*/"una #Skulltula enterrada en un laberinto forestal# otorga"},
-  });
-
-    hintTable[RHT_LW_GS_ABOVE_THEATER] = HintText::Exclude({
-                       //obscure text
-                       Text{"night reveals a #spider deep in a forest maze# holding", /*french*/"une #Skulltula haut perchée dans les bois# a", /*spanish*/"la noche revela una #Skulltula del laberinto forestal# que otorga"},
-  });
-
-    hintTable[RHT_SFM_GS] = HintText::Exclude({
-                       //obscure text
-                       Text{"night reveals a #spider in a forest meadow# holding", /*french*/"une #Skulltula dans le sanctuaire des bois# a", /*spanish*/"la noche revela una #Skulltula de la pradera del bosque# que otorga"},
-  });
-
-
-    hintTable[RHT_OGC_GS] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider outside a tyrant's tower# holds", /*french*/"une #Skulltula parmi les ruines du château# a", /*spanish*/"una #Skulltula a las afueras de la torre de un tirano# otorga"},
-  });
-
-    hintTable[RHT_HC_GS_TREE] = HintText::Exclude({
-                       //obscure text
-                       Text{"a spider hiding in a #tree outside of a castle# holds", /*french*/"une #Skulltula dans l'arbre près du château# a", /*spanish*/"una Skulltula escondida en el #árbol de las afueras de un castillo# otorga"},
-  });
-
-    hintTable[RHT_MARKET_GS_GUARD_HOUSE] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider in a guarded crate# holds", /*french*/"une #Skulltula dans une boîte en ville# a", /*spanish*/"una #Skulltula bajo una custodiada caja# otorga"},
-  });
-
-
-    hintTable[RHT_DMC_GS_BEAN_PATCH] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider buried in a volcano# holds", /*french*/"une #Skulltula enterrée dans un volcan# a", /*spanish*/"una #Skulltula enterrada en un volcán# otorga"},
-  });
-
-
-    hintTable[RHT_DMT_GS_BEAN_PATCH] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider buried outside a cavern# holds", /*french*/"une #Skulltula enterrée près d'une caverne# a", /*spanish*/"una #Skulltula enterrada a la entrada de una cueva# otorga"},
-  });
-
-    hintTable[RHT_DMT_GS_NEAR_KAK] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider hidden in a mountain nook# holds", /*french*/"une #Skulltula cachée dans le flanc d'une montagne# a", /*spanish*/"una #Skulltula oculta en el rincón de la montaña# otorga"},
-  });
-
-    hintTable[RHT_DMT_GS_ABOVE_DODONGOS_CAVERN] = HintText::Exclude({
-                       //obscure text
-                       Text{"the hammer reveals a #spider on a mountain# holding", /*french*/"une #Skulltula derrière un rocher massif près d'une caverne# a", /*spanish*/"el martillo revela #una Skulltula de la montaña# que otorga"},
-  });
-
-    hintTable[RHT_DMT_GS_FALLING_ROCKS_PATH] = HintText::Exclude({
-                       //obscure text
-                       Text{"the hammer reveals a #spider on a mountain# holding", /*french*/"une #Skulltula derrière un rocher massif près du sommet d'un volcan# a", /*spanish*/"el martillo revela #una Skulltula de la montaña# que otorga"},
-  });
-
-
-    hintTable[RHT_GC_GS_CENTER_PLATFORM] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #suspended spider# in Goron City holds", /*french*/"une #Skulltula perchée dans le village Goron# a", /*spanish*/"una #Skulltula suspendida# en la Ciudad Goron otorga"},
-  });
-
-    hintTable[RHT_GC_GS_BOULDER_MAZE] = HintText::Exclude({
-                       //obscure text
-                       Text{"a spider in a #Goron City crate# holds", /*french*/"une #Skulltula dans une boîte du village Goron# a", /*spanish*/"una #Skulltula bajo una caja# de la Ciudad Goron otorga"},
-  });
-
-
-    hintTable[RHT_KAK_GS_HOUSE_UNDER_CONSTRUCTION] = HintText::Exclude({
-                       //obscure text
-                       Text{"night in the past reveals a #spider in a town# holding", /*french*/"une #Skulltula dans le chantier de construction# a", /*spanish*/"la noche del pasado revela una #Skulltula del pueblo# que otorga"},
-  });
-
-    hintTable[RHT_KAK_GS_SKULLTULA_HOUSE] = HintText::Exclude({
-                       //obscure text
-                       Text{"night in the past reveals a #spider in a town# holding", /*french*/"une #Skulltula sur une maison maudite# a", /*spanish*/"la noche del pasado revela una #Skulltula del pueblo# que otorga"},
-  });
-
-    hintTable[RHT_KAK_GS_GUARDS_HOUSE] = HintText::Exclude({
-                       //obscure text
-                       Text{"night in the past reveals a #spider in a town# holding", /*french*/"une #Skulltula sur une maison de village# a", /*spanish*/"la noche del pasado revela una #Skulltula del pueblo# que otorga"},
-  });
-
-    hintTable[RHT_KAK_GS_TREE] = HintText::Exclude({
-                       //obscure text
-                       Text{"night in the past reveals a #spider in a town# holding", /*french*/"une #Skulltula dans un arbre de village# a", /*spanish*/"la noche del pasado revela una #Skulltula del pueblo# que otorga"},
-  });
-
-    hintTable[RHT_KAK_GS_WATCHTOWER] = HintText::Exclude({
-                       //obscure text
-                       Text{"night in the past reveals a #spider in a town# holding", /*french*/"une #Skulltula sur une échelle dans un village# a", /*spanish*/"la noche del pasado revela una #Skulltula del pueblo# que otorga"},
-  });
-
-    hintTable[RHT_KAK_GS_ABOVE_IMPAS_HOUSE] = HintText::Exclude({
-                       //obscure text
-                       Text{"night in the future reveals a #spider in a town# holding", /*french*/"une #Skulltula au dessus d'une grande maison# a", /*spanish*/"la noche del futuro revela una #Skulltula del pueblo# que otorga"},
-  });
-
-
-    hintTable[RHT_GRAVEYARD_GS_WALL] = HintText::Exclude({
-                       //obscure text
-                       Text{"night reveals a #spider in a graveyard# holding", /*french*/"une #Skulltula sur une façade du Cimetière# a", /*spanish*/"la noche revela una #Skulltula del cementerio# que otorga"},
-  });
-
-    hintTable[RHT_GRAVEYARD_GS_BEAN_PATCH] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider buried in a graveyard# holds", /*french*/"une #Skulltula enterrée dans le Cimetière# a", /*spanish*/"una #Skulltula enterrada en el cementerio# otorga"},
-  });
-
-
-    hintTable[RHT_ZR_GS_LADDER] = HintText::Exclude({
-                       //obscure text
-                       Text{"night in the past reveals a #spider in a river# holding", /*french*/"une #Skulltula sur une échelle près d'une cascade# a", /*spanish*/"la noche del pasado revela una #Skulltula del río# que otorga"},
-  });
-
-    hintTable[RHT_ZR_GS_TREE] = HintText::Exclude({
-                       //obscure text
-                       Text{"a spider hiding in a #tree by a river# holds", /*french*/"une #Skulltula dans un arbre près du fleuve# a", /*spanish*/"una Skulltula escondida en el #árbol de un río# otorga"},
-  });
-
-    hintTable[RHT_ZR_GS_ABOVE_BRIDGE] = HintText::Exclude({
-                       //obscure text
-                       Text{"night in the future reveals a #spider in a river# holding", /*french*/"une #Skulltula sur une façade près d'une cascade# a", /*spanish*/"la noche del futuro revela una #Skulltula del río# que otorga"},
-  });
-
-    hintTable[RHT_ZR_GS_NEAR_RAISED_GROTTOS] = HintText::Exclude({
-                       //obscure text
-                       Text{"night in the future reveals a #spider in a river# holding", /*french*/"une #Skulltula sur une façade près d'une grotte du fleuve# a", /*spanish*/"la noche del futuro revela una #Skulltula del río# que otorga"},
-  });
-
-
-    hintTable[RHT_ZD_GS_FROZEN_WATERFALL] = HintText::Exclude({
-                       //obscure text
-                       Text{"night reveals a #spider by a frozen waterfall# holding", /*french*/"une #Skulltula près d'une cascade gelée# a", /*spanish*/"la noche revela una #Skulltula junto a una congelada cascada# que otorga"},
-  });
-
-    hintTable[RHT_ZF_GS_ABOVE_THE_LOG] = HintText::Exclude({
-                       //obscure text
-                       Text{"night reveals a #spider near a deity# holding", /*french*/"une #Skulltula près du gardien aquatique# a", /*spanish*/"la noche revela una #Skulltula junto a cierta deidad# que otorga"},
-  });
-
-    hintTable[RHT_ZF_GS_TREE] = HintText::Exclude({
-                       //obscure text
-                       Text{"a spider hiding in a #tree near a deity# holds", /*french*/"une #Skulltula dans un arbre dans un réservoir# a", /*spanish*/"una Skulltula escondida en el #árbol junto a cierta deidad# otorga"},
-  });
-
-
-    hintTable[RHT_LH_GS_BEAN_PATCH] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider buried by a lake# holds", /*french*/"une #Skulltula enterrée près d'un lac# a", /*spanish*/"una #Skulltula enterrada junto a un lago# otorga"},
-  });
-
-    hintTable[RHT_LH_GS_SMALL_ISLAND] = HintText::Exclude({
-                       //obscure text
-                       Text{"night reveals a #spider by a lake# holding", /*french*/"une #Skulltula sur un îlot du lac# a", /*spanish*/"la noche revela una #Skulltula junto a un lago# que otorga"},
-  });
-
-    hintTable[RHT_LH_GS_LAB_WALL] = HintText::Exclude({
-                       //obscure text
-                       Text{"night reveals a #spider by a lake# holding", /*french*/"une #Skulltula sur le mur d'un centre de recherche# a", /*spanish*/"la noche revela una #Skulltula junto a un lago# que otorga"},
-  });
-
-    hintTable[RHT_LH_GS_LAB_CRATE] = HintText::Exclude({
-                       //obscure text
-                       Text{"a spider deed underwater in a #lab crate# holds", /*french*/"une #Skulltula dans une boîte au fond d'une cuve d'eau# a", /*spanish*/"una #Skulltula bajo la sumergida caja de un laboratorio# otorga"},
-  });
-
-    hintTable[RHT_LH_GS_TREE] = HintText::Exclude({
-                       //obscure text
-                       Text{"night reveals a #spider by a lake high in a tree# holding", /*french*/"une #Skulltula dans un grand arbre du lac# a", /*spanish*/"la noche revela #una Skulltula del lago sobre un árbol# que otorga"},
-  });
-
-
-    hintTable[RHT_GV_GS_BEAN_PATCH] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider buried in a valley# holds", /*french*/"une #Skulltula enterré dans une vallée# a", /*spanish*/"una #Skulltula enterrada en un valle# otorga"},
-  });
-
-    hintTable[RHT_GV_GS_SMALL_BRIDGE] = HintText::Exclude({
-                       //obscure text
-                       Text{"night in the past reveals a #spider in a valley# holding", /*french*/"une #Skulltula au dessus d'une petite cascade# a", /*spanish*/"la noche del pasado revela una #Skulltula del valle# que otorga"},
-  });
-
-    hintTable[RHT_GV_GS_PILLAR] = HintText::Exclude({
-                       //obscure text
-                       Text{"night in the future reveals a #spider in a valley# holding", /*french*/"une #Skulltula sur une arche de pierre dans une vallée# a", /*spanish*/"la noche del futuro revela una #Skulltula del valle# que otorga"},
-  });
-
-    hintTable[RHT_GV_GS_BEHIND_TENT] = HintText::Exclude({
-                       //obscure text
-                       Text{"night in the future reveals a #spider in a valley# holding", /*french*/"une #Skulltula derrière une tente# a", /*spanish*/"la noche del futuro revela una #Skulltula del valle# que otorga"},
-  });
-
-
-    hintTable[RHT_GF_GS_ARCHERY_RANGE] = HintText::Exclude({
-                       //obscure text
-                       Text{"night reveals a #spider in a fortress# holding", /*french*/"une #Skulltula sur une cible de tir# a", /*spanish*/"la noche revela una #Skulltula de una fortaleza# que otorga"},
-  });
-
-    hintTable[RHT_GF_GS_TOP_FLOOR] = HintText::Exclude({
-                       //obscure text
-                       Text{"night reveals a #spider in a fortress# holding", /*french*/"une #Skulltula au sommet d'une forteresse# a", /*spanish*/"la noche revela una #Skulltula de una fortaleza# que otorga"},
-  });
-
-
-    hintTable[RHT_COLOSSUS_GS_BEAN_PATCH] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #spider buried in the desert# holds", /*french*/"une #Skulltula enterrée au pied du colosse# a", /*spanish*/"una #Skulltula enterrada en el desierto# otorga"},
-  });
-
-    hintTable[RHT_COLOSSUS_GS_HILL] = HintText::Exclude({
-                       //obscure text
-                       Text{"night reveals a #spider deep in the desert# holding", /*french*/"une #Skulltula sur une colline dans le désert# a", /*spanish*/"la noche revela una #Skulltula en las profundidades del desierto# que otorga"},
-  });
-
-    hintTable[RHT_COLOSSUS_GS_TREE] = HintText::Exclude({
-                       //obscure text
-                       Text{"night reveals a #spider deep in the desert# holding", /*french*/"une #Skulltula dans un arbre du désert# a", /*spanish*/"la noche revela una #Skulltula en las profundidades del desierto# que otorga"},
-  });
-
-
-    hintTable[RHT_KF_SHOP_ITEM_1] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #child shopkeeper# sells", /*french*/"la #boutique Kokiri# vend", /*spanish*/"un #joven dependiente# vende"},
-  });
-
-    hintTable[RHT_KF_SHOP_ITEM_2] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #child shopkeeper# sells", /*french*/"la #boutique Kokiri# vend", /*spanish*/"un #joven dependiente# vende"},
-  });
-
-    hintTable[RHT_KF_SHOP_ITEM_3] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #child shopkeeper# sells", /*french*/"la #boutique Kokiri# vend", /*spanish*/"un #joven dependiente# vende"},
-  });
-
-    hintTable[RHT_KF_SHOP_ITEM_4] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #child shopkeeper# sells", /*french*/"la #boutique Kokiri# vend", /*spanish*/"un #joven dependiente# vende"},
-  });
-
-    hintTable[RHT_KF_SHOP_ITEM_5] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #child shopkeeper# sells", /*french*/"la #boutique Kokiri# vend", /*spanish*/"un #joven dependiente# vende"},
-  });
-
-    hintTable[RHT_KF_SHOP_ITEM_6] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #child shopkeeper# sells", /*french*/"la #boutique Kokiri# vend", /*spanish*/"un #joven dependiente# vende"},
-  });
-
-    hintTable[RHT_KF_SHOP_ITEM_7] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #child shopkeeper# sells", /*french*/"la #boutique Kokiri# vend", /*spanish*/"un #joven dependiente# vende"},
-  });
-
-    hintTable[RHT_KF_SHOP_ITEM_8] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #child shopkeeper# sells", /*french*/"la #boutique Kokiri# vend", /*spanish*/"un #joven dependiente# vende"},
-  });
-
-
-    hintTable[RHT_KAK_POTION_SHOP_ITEM_1] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #potion seller# offers", /*french*/"l'#apothicaire# vend", /*spanish*/"un #vendedor de pociones# ofrece"},
-                     }, {},
-                       //clear text
-                       Text{"the #Kakariko Potion Shop# offers", /*french*/"l'#apothicaire de Kakariko# vend", /*spanish*/"la #tienda de pociones de Kakariko# ofrece"}
-  );
-
-    hintTable[RHT_KAK_POTION_SHOP_ITEM_2] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #potion seller# offers", /*french*/"l'#apothicaire# vend", /*spanish*/"un #vendedor de pociones# ofrece"},
-                     }, {},
-                       //clear text
-                       Text{"the #Kakariko Potion Shop# offers", /*french*/"l'#apothicaire de Kakariko# vend", /*spanish*/"la #tienda de pociones de Kakariko# ofrece"}
-  );
-
-    hintTable[RHT_KAK_POTION_SHOP_ITEM_3] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #potion seller# offers", /*french*/"l'#apothicaire# vend", /*spanish*/"un #vendedor de pociones# ofrece"},
-                     }, {},
-                       //clear text
-                       Text{"the #Kakariko Potion Shop# offers", /*french*/"l'#apothicaire de Kakariko# vend", /*spanish*/"la #tienda de pociones de Kakariko# ofrece"}
-  );
-
-    hintTable[RHT_KAK_POTION_SHOP_ITEM_4] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #potion seller# offers", /*french*/"l'#apothicaire# vend", /*spanish*/"un #vendedor de pociones# ofrece"},
-                     }, {},
-                       //clear text
-                       Text{"the #Kakariko Potion Shop# offers", /*french*/"l'#apothicaire de Kakariko# vend", /*spanish*/"la #tienda de pociones de Kakariko# ofrece"}
-  );
-
-    hintTable[RHT_KAK_POTION_SHOP_ITEM_5] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #potion seller# offers", /*french*/"l'#apothicaire# vend", /*spanish*/"un #vendedor de pociones# ofrece"},
-                     }, {},
-                       //clear text
-                       Text{"the #Kakariko Potion Shop# offers", /*french*/"l'#apothicaire de Kakariko# vend", /*spanish*/"la #tienda de pociones de Kakariko# ofrece"}
-  );
-
-    hintTable[RHT_KAK_POTION_SHOP_ITEM_6] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #potion seller# offers", /*french*/"l'#apothicaire# vend", /*spanish*/"un #vendedor de pociones# ofrece"},
-                     }, {},
-                       //clear text
-                       Text{"the #Kakariko Potion Shop# offers", /*french*/"l'#apothicaire de Kakariko# vend", /*spanish*/"la #tienda de pociones de Kakariko# ofrece"}
-  );
-
-    hintTable[RHT_KAK_POTION_SHOP_ITEM_7] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #potion seller# offers", /*french*/"l'#apothicaire# vend", /*spanish*/"un #vendedor de pociones# ofrece"},
-                     }, {},
-                       //clear text
-                       Text{"the #Kakariko Potion Shop# offers", /*french*/"l'#apothicaire de Kakariko# vend", /*spanish*/"la #tienda de pociones de Kakariko# ofrece"}
-  );
-
-    hintTable[RHT_KAK_POTION_SHOP_ITEM_8] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #potion seller# offers", /*french*/"l'#apothicaire# vend", /*spanish*/"un #vendedor de pociones# ofrece"},
-                     }, {},
-                       //clear text
-                       Text{"the #Kakariko Potion Shop# offers", /*french*/"l'#apothicaire de Kakariko# vend", /*spanish*/"la #tienda de pociones de Kakariko# ofrece"}
-  );
-
-
-    hintTable[RHT_MARKET_BOMBCHU_SHOP_ITEM_1] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #Bombchu merchant# sells", /*french*/"le #marchand de Missiles# vend", /*spanish*/"un #mercader de bombchus# vende"},
-  });
-
-    hintTable[RHT_MARKET_BOMBCHU_SHOP_ITEM_2] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #Bombchu merchant# sells", /*french*/"le #marchand de Missiles# vend", /*spanish*/"un #mercader de bombchus# vende"},
-  });
-
-    hintTable[RHT_MARKET_BOMBCHU_SHOP_ITEM_3] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #Bombchu merchant# sells", /*french*/"le #marchand de Missiles# vend", /*spanish*/"un #mercader de bombchus# vende"},
-  });
-
-    hintTable[RHT_MARKET_BOMBCHU_SHOP_ITEM_4] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #Bombchu merchant# sells", /*french*/"le #marchand de Missiles# vend", /*spanish*/"un #mercader de bombchus# vende"},
-  });
-
-    hintTable[RHT_MARKET_BOMBCHU_SHOP_ITEM_5] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #Bombchu merchant# sells", /*french*/"le #marchand de Missiles# vend", /*spanish*/"un #mercader de bombchus# vende"},
-  });
-
-    hintTable[RHT_MARKET_BOMBCHU_SHOP_ITEM_6] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #Bombchu merchant# sells", /*french*/"le #marchand de Missiles# vend", /*spanish*/"un #mercader de bombchus# vende"},
-  });
-
-    hintTable[RHT_MARKET_BOMBCHU_SHOP_ITEM_7] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #Bombchu merchant# sells", /*french*/"le #marchand de Missiles# vend", /*spanish*/"un #mercader de bombchus# vende"},
-  });
-
-    hintTable[RHT_MARKET_BOMBCHU_SHOP_ITEM_8] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #Bombchu merchant# sells", /*french*/"le #marchand de Missiles# vend", /*spanish*/"un #mercader de bombchus# vende"},
-  });
-
-
-    hintTable[RHT_MARKET_POTION_SHOP_ITEM_1] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #potion seller# offers", /*french*/"l'#apothicaire# vend", /*spanish*/"un #vendedor de pociones# ofrece"},
-                     }, {},
-                       //clear text
-                       Text{"the #Market Potion Shop# offers", /*french*/"l'#apothicaire dans la Place du Marché# vend", /*spanish*/"la #tienda de pociones del mercado# ofrece"}
-  );
-
-    hintTable[RHT_MARKET_POTION_SHOP_ITEM_2] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #potion seller# offers", /*french*/"l'#apothicaire# vend", /*spanish*/"un #vendedor de pociones# ofrece"},
-                     }, {},
-                       //clear text
-                       Text{"the #Market Potion Shop# offers", /*french*/"l'#apothicaire dans la Place du Marché# vend", /*spanish*/"la #tienda de pociones del mercado# ofrece"}
-  );
-
-    hintTable[RHT_MARKET_POTION_SHOP_ITEM_3] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #potion seller# offers", /*french*/"l'#apothicaire# vend", /*spanish*/"un #vendedor de pociones# ofrece"},
-                     }, {},
-                       //clear text
-                       Text{"the #Market Potion Shop# offers", /*french*/"l'#apothicaire dans la Place du Marché# vend", /*spanish*/"la #tienda de pociones del mercado# ofrece"}
-  );
-
-    hintTable[RHT_MARKET_POTION_SHOP_ITEM_4] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #potion seller# offers", /*french*/"l'#apothicaire# vend", /*spanish*/"un #vendedor de pociones# ofrece"},
-                     }, {},
-                       //clear text
-                       Text{"the #Market Potion Shop# offers", /*french*/"l'#apothicaire dans la Place du Marché# vend", /*spanish*/"la #tienda de pociones del mercado# ofrece"}
-  );
-
-    hintTable[RHT_MARKET_POTION_SHOP_ITEM_5] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #potion seller# offers", /*french*/"l'#apothicaire# vend", /*spanish*/"un #vendedor de pociones# ofrece"},
-                     }, {},
-                       //clear text
-                       Text{"the #Market Potion Shop# offers", /*french*/"l'#apothicaire dans la Place du Marché# vend", /*spanish*/"la #tienda de pociones del mercado# ofrece"}
-  );
-
-    hintTable[RHT_MARKET_POTION_SHOP_ITEM_6] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #potion seller# offers", /*french*/"l'#apothicaire# vend", /*spanish*/"un #vendedor de pociones# ofrece"},
-                     }, {},
-                       //clear text
-                       Text{"the #Market Potion Shop# offers", /*french*/"l'#apothicaire dans la Place du Marché# vend", /*spanish*/"la #tienda de pociones del mercado# ofrece"}
-  );
-
-    hintTable[RHT_MARKET_POTION_SHOP_ITEM_7] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #potion seller# offers", /*french*/"l'#apothicaire# vend", /*spanish*/"un #vendedor de pociones# ofrece"},
-                     }, {},
-                       //clear text
-                       Text{"the #Market Potion Shop# offers", /*french*/"l'#apothicaire dans la Place du Marché# vend", /*spanish*/"la #tienda de pociones del mercado# ofrece"}
-  );
-
-    hintTable[RHT_MARKET_POTION_SHOP_ITEM_8] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #potion seller# offers", /*french*/"l'#apothicaire# vend", /*spanish*/"un #vendedor de pociones# ofrece"},
-                     }, {},
-                       //clear text
-                       Text{"the #Market Potion Shop# offers", /*french*/"l'#apothicaire dans la Place du Marché# vend", /*spanish*/"la #tienda de pociones del mercado# ofrece"}
-  );
-
-
-    hintTable[RHT_MARKET_BAZAAR_ITEM_1] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #Market Bazaar# offers", /*french*/"le #bazar de la Place du Marché# vend", /*spanish*/"el #bazar del mercado# ofrece"},
-  });
-
-    hintTable[RHT_MARKET_BAZAAR_ITEM_2] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #Market Bazaar# offers", /*french*/"le #bazar de la Place du Marché# vend", /*spanish*/"el #bazar del mercado# ofrece"},
-  });
-
-    hintTable[RHT_MARKET_BAZAAR_ITEM_3] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #Market Bazaar# offers", /*french*/"le #bazar de la Place du Marché# vend", /*spanish*/"el #bazar del mercado# ofrece"},
-  });
-
-    hintTable[RHT_MARKET_BAZAAR_ITEM_4] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #Market Bazaar# offers", /*french*/"le #bazar de la Place du Marché# vend", /*spanish*/"el #bazar del mercado# ofrece"},
-  });
-
-    hintTable[RHT_MARKET_BAZAAR_ITEM_5] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #Market Bazaar# offers", /*french*/"le #bazar de la Place du Marché# vend", /*spanish*/"el #bazar del mercado# ofrece"},
-  });
-
-    hintTable[RHT_MARKET_BAZAAR_ITEM_6] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #Market Bazaar# offers", /*french*/"le #bazar de la Place du Marché# vend", /*spanish*/"el #bazar del mercado# ofrece"},
-  });
-
-    hintTable[RHT_MARKET_BAZAAR_ITEM_7] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #Market Bazaar# offers", /*french*/"le #bazar de la Place du Marché# vend", /*spanish*/"el #bazar del mercado# ofrece"},
-  });
-
-    hintTable[RHT_MARKET_BAZAAR_ITEM_8] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #Market Bazaar# offers", /*french*/"le #bazar de la Place du Marché# vend", /*spanish*/"el #bazar del mercado# ofrece"},
-  });
-
-
-    hintTable[RHT_KAK_BAZAAR_ITEM_1] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #Kakariko Bazaar# offers", /*french*/"le #bazar de Kakariko# vend", /*spanish*/"el #bazar de Kakariko# ofrece"},
-  });
-
-    hintTable[RHT_KAK_BAZAAR_ITEM_2] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #Kakariko Bazaar# offers", /*french*/"le #bazar de Kakariko# vend", /*spanish*/"el #bazar de Kakariko# ofrece"},
-  });
-
-    hintTable[RHT_KAK_BAZAAR_ITEM_3] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #Kakariko Bazaar# offers", /*french*/"le #bazar de Kakariko# vend", /*spanish*/"el #bazar de Kakariko# ofrece"},
-  });
-
-    hintTable[RHT_KAK_BAZAAR_ITEM_4] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #Kakariko Bazaar# offers", /*french*/"le #bazar de Kakariko# vend", /*spanish*/"el #bazar de Kakariko# ofrece"},
-  });
-
-    hintTable[RHT_KAK_BAZAAR_ITEM_5] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #Kakariko Bazaar# offers", /*french*/"le #bazar de Kakariko# vend", /*spanish*/"el #bazar de Kakariko# ofrece"},
-  });
-
-    hintTable[RHT_KAK_BAZAAR_ITEM_6] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #Kakariko Bazaar# offers", /*french*/"le #bazar de Kakariko# vend", /*spanish*/"el #bazar de Kakariko# ofrece"},
-  });
-
-    hintTable[RHT_KAK_BAZAAR_ITEM_7] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #Kakariko Bazaar# offers", /*french*/"le #bazar de Kakariko# vend", /*spanish*/"el #bazar de Kakariko# ofrece"},
-  });
-
-    hintTable[RHT_KAK_BAZAAR_ITEM_8] = HintText::Exclude({
-                       //obscure text
-                       Text{"the #Kakariko Bazaar# offers", /*french*/"le #bazar de Kakariko# vend", /*spanish*/"el #bazar de Kakariko# ofrece"},
-  });
-
-
-    hintTable[RHT_ZD_SHOP_ITEM_1] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #Zora shopkeeper# sells", /*french*/"la #boutique Zora# vend", /*spanish*/"el #dependiente Zora# vende"},
-  });
-
-    hintTable[RHT_ZD_SHOP_ITEM_2] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #Zora shopkeeper# sells", /*french*/"la #boutique Zora# vend", /*spanish*/"el #dependiente Zora# vende"},
-  });
-
-    hintTable[RHT_ZD_SHOP_ITEM_3] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #Zora shopkeeper# sells", /*french*/"la #boutique Zora# vend", /*spanish*/"el #dependiente Zora# vende"},
-  });
-
-    hintTable[RHT_ZD_SHOP_ITEM_4] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #Zora shopkeeper# sells", /*french*/"la #boutique Zora# vend", /*spanish*/"el #dependiente Zora# vende"},
-  });
-
-    hintTable[RHT_ZD_SHOP_ITEM_5] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #Zora shopkeeper# sells", /*french*/"la #boutique Zora# vend", /*spanish*/"el #dependiente Zora# vende"},
-  });
-
-    hintTable[RHT_ZD_SHOP_ITEM_6] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #Zora shopkeeper# sells", /*french*/"la #boutique Zora# vend", /*spanish*/"el #dependiente Zora# vende"},
-  });
-
-    hintTable[RHT_ZD_SHOP_ITEM_7] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #Zora shopkeeper# sells", /*french*/"la #boutique Zora# vend", /*spanish*/"el #dependiente Zora# vende"},
-  });
-
-    hintTable[RHT_ZD_SHOP_ITEM_8] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #Zora shopkeeper# sells", /*french*/"la #boutique Zora# vend", /*spanish*/"el #dependiente Zora# vende"},
-  });
-
-
-    hintTable[RHT_GC_SHOP_ITEM_1] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #Goron shopkeeper# sells", /*french*/"la #boutique Goron# vend", /*spanish*/"el #dependiente Goron# vende"},
-  });
-
-    hintTable[RHT_GC_SHOP_ITEM_2] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #Goron shopkeeper# sells", /*french*/"la #boutique Goron# vend", /*spanish*/"el #dependiente Goron# vende"},
-  });
-
-    hintTable[RHT_GC_SHOP_ITEM_3] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #Goron shopkeeper# sells", /*french*/"la #boutique Goron# vend", /*spanish*/"el #dependiente Goron# vende"},
-  });
-
-    hintTable[RHT_GC_SHOP_ITEM_4] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #Goron shopkeeper# sells", /*french*/"la #boutique Goron# vend", /*spanish*/"el #dependiente Goron# vende"},
-  });
-
-    hintTable[RHT_GC_SHOP_ITEM_5] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #Goron shopkeeper# sells", /*french*/"la #boutique Goron# vend", /*spanish*/"el #dependiente Goron# vende"},
-  });
-
-    hintTable[RHT_GC_SHOP_ITEM_6] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #Goron shopkeeper# sells", /*french*/"la #boutique Goron# vend", /*spanish*/"el #dependiente Goron# vende"},
-  });
-
-    hintTable[RHT_GC_SHOP_ITEM_7] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #Goron shopkeeper# sells", /*french*/"la #boutique Goron# vend", /*spanish*/"el #dependiente Goron# vende"},
-  });
-
-    hintTable[RHT_GC_SHOP_ITEM_8] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #Goron shopkeeper# sells", /*french*/"la #boutique Goron# vend", /*spanish*/"el #dependiente Goron# vende"},
-  });
-
-
-    hintTable[RHT_HF_DEKU_SCRUB_GROTTO] = HintText::Exclude({
-                       //obscure text
-                       Text{"a lonely #scrub in a hole# sells", /*french*/"la #peste Mojo dans une grotte de la plaine# vend", /*spanish*/"un #singular deku bajo un hoyo# de la llanura vende"},
-  });
-
-    hintTable[RHT_LLR_DEKU_SCRUB_GROTTO_LEFT] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #trio of scrubs# sells", /*french*/"le #trio de peste Mojo à la ferme# vend", /*spanish*/"un #trío de dekus# de una granja venden"},
-  });
-
-    hintTable[RHT_LLR_DEKU_SCRUB_GROTTO_RIGHT] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #trio of scrubs# sells", /*french*/"le #trio de peste Mojo à la ferme# vend", /*spanish*/"un #trío de dekus# de una granja venden"},
-  });
-
-    hintTable[RHT_LLR_DEKU_SCRUB_GROTTO_CENTER] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #trio of scrubs# sells", /*french*/"le #trio de peste Mojo à la ferme# vend", /*spanish*/"un #trío de dekus# de una granja venden"},
-  });
-
-
-    hintTable[RHT_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT] = HintText::Exclude({
-                       //obscure text
-                       Text{"a pair of #scrubs in the woods# sells", /*french*/"le #duo de peste Mojo près du théâtre# vend", /*spanish*/"un par de #dekus del bosque# venden"},
-  });
-
-    hintTable[RHT_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT] = HintText::Exclude({
-                       //obscure text
-                       Text{"a pair of #scrubs in the woods# sells", /*french*/"le #duo de peste Mojo près du théâtre# vend", /*spanish*/"un par de #dekus del bosque# venden"},
-  });
-
-    hintTable[RHT_LW_DEKU_SCRUB_NEAR_BRIDGE] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #scrub by a bridge# sells", /*french*/"la #peste Mojo près du pont dans les bois# vend", /*spanish*/"un #deku bajo un puente# del bosque venden"},
-  });
-
-    hintTable[RHT_LW_DEKU_SCRUB_GROTTO_REAR] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #scrub underground duo# sells", /*french*/"le #duo de peste Mojo dans les sous-bois# vend", /*spanish*/"un #par de dekus subterráneos# del bosque venden"},
-  });
-
-    hintTable[RHT_LW_DEKU_SCRUB_GROTTO_FRONT] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #scrub underground duo# sells", /*french*/"le #duo de peste Mojo dans les sous-bois# vend", /*spanish*/"un #par de dekus subterráneos# del bosque venden"},
-  });
-
-
-    hintTable[RHT_SFM_DEKU_SCRUB_GROTTO_REAR] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #scrub underground duo# sells", /*french*/"le #duo de peste Mojo au cœur du sanctuaire sylvestre# vend", /*spanish*/"un #par de dekus subterráneos# de la pradera sagrada venden"},
-  });
-
-    hintTable[RHT_SFM_DEKU_SCRUB_GROTTO_FRONT] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #scrub underground duo# sells", /*french*/"le #duo de peste Mojo au cœur du sanctuaire sylvestre# vend", /*spanish*/"un #par de dekus subterráneos# de la pradera sagrada venden"},
-  });
-
-
-    hintTable[RHT_GC_DEKU_SCRUB_GROTTO_LEFT] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #trio of scrubs# sells", /*french*/"le #trio de peste Mojo dans le village Goron# vend", /*spanish*/"un #trío de dekus# de la Ciudad Goron venden"},
-  });
-
-    hintTable[RHT_GC_DEKU_SCRUB_GROTTO_RIGHT] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #trio of scrubs# sells", /*french*/"le #trio de peste Mojo dans le village Goron# vend", /*spanish*/"un #trío de dekus# de la Ciudad Goron venden"},
-  });
-
-    hintTable[RHT_GC_DEKU_SCRUB_GROTTO_CENTER] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #trio of scrubs# sells", /*french*/"le #trio de peste Mojo dans le village Goron# vend", /*spanish*/"un #trío de dekus# de la Ciudad Goron venden"},
-  });
-
-
-    hintTable[RHT_DMC_DEKU_SCRUB_GROTTO_LEFT] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #trio of scrubs# sells", /*french*/"le #trio de peste Mojo dans le volcan# vend", /*spanish*/"un #trío de dekus# del volcán venden"},
-  });
-
-    hintTable[RHT_DMC_DEKU_SCRUB_GROTTO_RIGHT] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #trio of scrubs# sells", /*french*/"le #trio de peste Mojo dans le volcan# vend", /*spanish*/"un #trío de dekus# del volcán venden"},
-  });
-
-    hintTable[RHT_DMC_DEKU_SCRUB_GROTTO_CENTER] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #trio of scrubs# sells", /*french*/"le #trio de peste Mojo dans le volcan# vend", /*spanish*/"un #trío de dekus# del volcán venden"},
-  });
-
-
-    hintTable[RHT_ZR_DEKU_SCRUB_GROTTO_REAR] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #scrub underground duo# sells", /*french*/"le #duo de peste Mojo près du fleuve# vend", /*spanish*/"un #par de dekus subterráneos# del río venden"},
-  });
-
-    hintTable[RHT_ZR_DEKU_SCRUB_GROTTO_FRONT] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #scrub underground duo# sells", /*french*/"le #duo de peste Mojo près du fleuve# vend", /*spanish*/"un #par de dekus subterráneos# del río venden"},
-  });
-
-
-    hintTable[RHT_LH_DEKU_SCRUB_GROTTO_LEFT] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #trio of scrubs# sells", /*french*/"le #trio de peste Mojo près du lac# vend", /*spanish*/"un #trío de dekus# del lago venden"},
-  });
-
-    hintTable[RHT_LH_DEKU_SCRUB_GROTTO_RIGHT] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #trio of scrubs# sells", /*french*/"le #trio de peste Mojo près du lac# vend", /*spanish*/"un #trío de dekus# del lago venden"},
-  });
-
-    hintTable[RHT_LH_DEKU_SCRUB_GROTTO_CENTER] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #trio of scrubs# sells", /*french*/"le #trio de peste Mojo près du lac# vend", /*spanish*/"un #trío de dekus# del lago venden"},
-  });
-
-
-    hintTable[RHT_GV_DEKU_SCRUB_GROTTO_REAR] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #scrub underground duo# sells", /*french*/"le #duo de peste Mojo près de la vallée# vend", /*spanish*/"un #par de dekus subterráneos# del valle venden"},
-  });
-
-    hintTable[RHT_GV_DEKU_SCRUB_GROTTO_FRONT] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #scrub underground duo# sells", /*french*/"le #duo de peste Mojo près de la vallée# vend", /*spanish*/"un #par de dekus subterráneos# del valle venden"},
-  });
-
-
-    hintTable[RHT_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #scrub underground duo# sells", /*french*/"le #duo de peste Mojo dans le désert# vend", /*spanish*/"un #par de dekus subterráneos# del desierto venden"},
-  });
-
-    hintTable[RHT_COLOSSUS_DEKU_SCRUB_GROTTO_REAR] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #scrub underground duo# sells", /*french*/"le #duo de peste Mojo dans le désert# vend", /*spanish*/"un #par de dekus subterráneos# del desierto venden"},
-  });
-
-
-    hintTable[RHT_LLR_STABLES_LEFT_COW] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #cow in a stable# gifts", /*french*/"la #vache dans l'étable# donne", /*spanish*/"una #vaca del establo# brinda"},
-  });
-
-    hintTable[RHT_LLR_STABLES_RIGHT_COW] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #cow in a stable# gifts", /*french*/"la #vache dans l'étable# donne", /*spanish*/"una #vaca del establo# brinda"},
-  });
-
-    hintTable[RHT_LLR_TOWER_RIGHT_COW] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #cow in a ranch silo# gifts", /*french*/"la #vache dans le silo de la ferme# donne", /*spanish*/"una #vaca del granero# brinda"},
-  });
-
-    hintTable[RHT_LLR_TOWER_LEFT_COW] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #cow in a ranch silo# gifts", /*french*/"la #vache dans le silo de la ferme# donne", /*spanish*/"una #vaca del granero# brinda"},
-  });
-
-    hintTable[RHT_KAK_IMPAS_HOUSE_COW] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #cow imprisoned in a house# protects", /*french*/"la #vache en cage# donne", /*spanish*/"una #vaca enjaulada de una casa# brinda"},
-  });
-
-    hintTable[RHT_DMT_COW_GROTTO_COW] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #cow in a luxurious hole# offers", /*french*/"la #vache dans une grotte luxueuse# donne", /*spanish*/"una #vaca de un lujoso hoyo# brinda"},
-  });
-
-    hintTable[RHT_BEEHIVE_CHEST_GROTTO] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #beehive above a chest# hides", /*french*/"", /*spanish*/"una #colmena sobre un cofre# esconde"},
-  });
-
-    hintTable[RHT_BEEHIVE_LONELY_SCRUB_GROTTO] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #beehive above a lonely scrub# hides", /*french*/"", /*spanish*/"una #colmena sobre un deku solitario# esconde"},
-  });
-
-    hintTable[RHT_BEEHIVE_SCRUB_PAIR_GROTTO] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #beehive above a pair of scrubs# hides", /*french*/"", /*spanish*/"una #colmena sobre un par de dekus# esconde"},
-  });
-
-    hintTable[RHT_BEEHIVE_SCRUB_TRIO_GROTTO] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #beehive above a trio of scrubs# hides", /*french*/"", /*spanish*/"una #colmena sobre un trío de dekus# esconde"},
-  });
-
-    hintTable[RHT_BEEHIVE_COW_GROTTO] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #beehive above a cow# hides", /*french*/"", /*spanish*/"una #colmena sobre una vaca# esconde"},
-  });
-
-    hintTable[RHT_BEEHIVE_IN_FRONT_OF_KING_ZORA] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #beehive in front of the king of the zoras# hides", /*french*/"", /*spanish*/"una #colmena delante del rey de los zoras# esconde"},
-  });
-
-    hintTable[RHT_BEEHIVE_BEHIND_KING_ZORA] = HintText::Exclude({
-                       //obscure text
-                       Text{"a #beehive behind the king of the zoras# hides", /*french*/"", /*spanish*/"una #colmena detrás del rey de los zoras# esconde"},
-  });
+#include "../../static_data.h"
+#include "../hints.hpp"
+#include "../../../custom-message/CustomMessageManager.h"
+
+namespace Rando {
+void StaticData::HintTable_Init_Exclude_Overworld() {
+
+   hintTextTable[RHT_KF_KOKIRI_SWORD_CHEST] = HintText(CustomMessage("They say that the #hidden treasure of the Kokiri# is #[[1]]#.",
+                                                           /*german*/ "",
+                                                           /*french*/ "Selon moi, le #trésor des Kokiri# est #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                        // /*spanish*/ Según dicen, el #tesoro oculto de los Kokiri# esconde #[[1]]#.
+
+    hintTextTable[RHT_KF_MIDOS_TOP_LEFT_CHEST] = HintText(CustomMessage("They say that #inside Mido's house# is #[[1]]#.",
+                                                             /*german*/ "",
+                                                             /*french*/ "Selon moi, #dans la maison de Mido# gît #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                          // /*spanish*/ Según dicen, en la #casa de Mido# yace #[[1]]#.
+                                                          {}, {
+                                                          CustomMessage("They say that the #leader of the Kokiri# hides #[[1]]#.",
+                                                              /*german*/ "",
+                                                              /*french*/ "Selon moi, le #chef des Kokiri# possède #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                           // /*spanish*/ Según dicen, el #líder de los Kokiri# esconde #[[1]]#.
+
+    hintTextTable[RHT_KF_MIDOS_TOP_RIGHT_CHEST] = HintText(CustomMessage("They say that #inside Mido's house# is #[[1]]#.",
+                                                              /*german*/ "",
+                                                              /*french*/ "Selon moi, #dans la maison de Mido# gît #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                           // /*spanish*/ Según dicen, en la #casa de Mido# yace #[[1]]#.
+                                                           {}, {
+                                                           CustomMessage("They say that the #leader of the Kokiri# hides #[[1]]#.",
+                                                               /*german*/ "",
+                                                               /*french*/ "Selon moi, le #chef des Kokiri# possède #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                            // /*spanish*/ Según dicen, el #líder de los Kokiri# esconde #[[1]]#.
+
+    hintTextTable[RHT_KF_MIDOS_BOTTOM_LEFT_CHEST] = HintText(CustomMessage("They say that #inside Mido's house# is #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, #dans la maison de Mido# gît #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                             // /*spanish*/ Según dicen, en la #casa de Mido# yace #[[1]]#.
+                                                             {}, {
+                                                             CustomMessage("They say that the #leader of the Kokiri# hides #[[1]]#.",
+                                                                 /*german*/ "",
+                                                                 /*french*/ "Selon moi, le #chef des Kokiri# possède #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                              // /*spanish*/ Según dicen, el #líder de los Kokiri# esconde #[[1]]#.
+
+    hintTextTable[RHT_KF_MIDOS_BOTTOM_RIGHT_CHEST] = HintText(CustomMessage("They say that #inside Mido's house# is #[[1]]#.",
+                                                                 /*german*/ "",
+                                                                 /*french*/ "Selon moi, #dans la maison de Mido# gît #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                              // /*spanish*/ Según dicen, en la #casa de Mido# yace #[[1]]#.
+                                                              {}, {
+                                                              CustomMessage("They say that the #leader of the Kokiri# hides #[[1]]#.",
+                                                                  /*german*/ "",
+                                                                  /*french*/ "Selon moi, le #chef des Kokiri# possède #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                               // /*spanish*/ Según dicen, el #líder de los Kokiri# esconde #[[1]]#.
+
+    hintTextTable[RHT_GRAVEYARD_SHIELD_GRAVE_CHEST] = HintText(CustomMessage("They say that the #treasure of a fallen soldier# is #[[1]]#.",
+                                                                  /*german*/ "",
+                                                                  /*french*/ "Selon moi, le #trésor du soldat mort# est #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                               // /*spanish*/ Según dicen, el #tesoro de un soldado caído# esconde #[[1]]#.
+
+    hintTextTable[RHT_DMT_CHEST] = HintText(CustomMessage("They say that hidden behind a wall on a #mountain trail# is #[[1]]#.",
+                                               /*german*/ "",
+                                               /*french*/ "Selon moi, derrière une façade du #chemin montagneux# est #[[1]]#.", {QM_RED, QM_GREEN}));
+                                            // /*spanish*/ Según dicen, tras una pared del #sendero de la montaña# yace #[[1]]#.
+
+    hintTextTable[RHT_GC_MAZE_RIGHT_CHEST] = HintText(CustomMessage("They say that in #Goron City# explosives unlock #[[1]]#.",
+                                                         /*german*/ "",
+                                                         /*french*/ "Selon moi, des explosions dans le #village Goron# révèlent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                      // /*spanish*/ Según dicen, en la #Ciudad Goron# unos explosivos desbloquean #[[1]]#.
+
+    hintTextTable[RHT_GC_MAZE_CENTER_CHEST] = HintText(CustomMessage("They say that in #Goron City# explosives unlock #[[1]]#.",
+                                                          /*german*/ "",
+                                                          /*french*/ "Selon moi, des explosions dans le #village Goron# révèlent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                       // /*spanish*/ Según dicen, en la #Ciudad Goron# unos explosivos desbloquean #[[1]]#.
+
+    hintTextTable[RHT_ZD_CHEST] = HintText(CustomMessage("They say that fire #beyond a waterfall# reveals #[[1]]#.",
+                                              /*german*/ "",
+                                              /*french*/ "Selon moi, du feu #derrière la cascade# éclaire #[[1]]#.", {QM_RED, QM_GREEN}));
+                                           // /*spanish*/ Según dicen, las #llamas tras una una cascada# revelan #[[1]]#.
+
+    hintTextTable[RHT_GRAVEYARD_HOOKSHOT_CHEST] = HintText(CustomMessage("They say that #dead Dampé's first prize# is #[[1]]#.",
+                                                              /*german*/ "",
+                                                              /*french*/ "Selon moi, la #première course d'Igor# donne #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                           // /*spanish*/ Según dicen, el primer premio de #la carrera de Dampé# se trata de #[[1]]#.
+                                                           {}, {
+                                                           CustomMessage("They say that a chest hidden by a #speedy spectre# holds #[[1]]#.",
+                                                               /*german*/ "",
+                                                               /*french*/ "Selon moi, le #coffre du rapide revenant# contient #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                            // /*spanish*/ Según dicen, un cofre custodiado por un #espectro veloz# contiene #[[1]]#.
+
+    hintTextTable[RHT_GF_CHEST] = HintText(CustomMessage("They say that on a #rooftop in the desert# lies #[[1]]#.",
+                                              /*german*/ "",
+                                              /*french*/ "Selon moi, sur un #toit du désert# gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                           // /*spanish*/ Según dicen, en una #azotea del desierto# yace #[[1]]#.
+
+    hintTextTable[RHT_KAK_REDEAD_GROTTO_CHEST] = HintText(CustomMessage("They say that #zombies beneath the earth# guard #[[1]]#.",
+                                                             /*german*/ "",
+                                                             /*french*/ "Selon moi, les #revenants sous terre# protègent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                          // /*spanish*/ Según dicen, unos #zombis subterráneos# esconden #[[1]]#.
+
+    hintTextTable[RHT_SFM_WOLFOS_GROTTO_CHEST] = HintText(CustomMessage("They say that #wolves beneath the earth# guard #[[1]]#.",
+                                                             /*german*/ "",
+                                                             /*french*/ "Selon moi, les #loups sous terre# protègent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                          // /*spanish*/ Según dicen, unos #lobos subterráneos# esconden #[[1]]#.
+
+    hintTextTable[RHT_HF_NEAR_MARKET_GROTTO_CHEST] = HintText(CustomMessage("They say that a #hole in a field near a drawbridge# holds #[[1]]#.",
+                                                                 /*german*/ "",
+                                                                 /*french*/ "Selon moi, la #grotte près d'un pont# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                              // /*spanish*/ Según dicen, bajo el #hoyo de una llanura cercano a un puente# yace #[[1]]#.
+
+    hintTextTable[RHT_HF_NEAR_MARKET_GROTTO_FISH] = HintText(CustomMessage("They say that a #fish in a hole in a field near a drawbridge# holds #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, la #grotte près d'un pont# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                             // /*spanish*/ Según dicen, bajo el #hoyo de una llanura cercano a un puente# yace #[[1]]#.
+
+    hintTextTable[RHT_HF_SOUTHEAST_GROTTO_CHEST] = HintText(CustomMessage("They say that a #hole amongst trees in a field# holds #[[1]]#.",
+                                                               /*german*/ "",
+                                                               /*french*/ "Selon moi, la #grotte près des arbres# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                            // /*spanish*/ Según dicen, bajo el #hoyo de una llanura rodeado de árboles# yace #[[1]]#.
+
+    hintTextTable[RHT_HF_SOUTHEAST_GROTTO_FISH] = HintText(CustomMessage("They say that a #fish in a hole amongst trees in a field# holds #[[1]]#.",
+                                                              /*german*/ "",
+                                                              /*french*/ "Selon moi, la #grotte près des arbres# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                           // /*spanish*/ Según dicen, bajo el #hoyo de una llanura rodeado de árboles# yace #[[1]]#.
+
+    hintTextTable[RHT_HF_OPEN_GROTTO_CHEST] = HintText(CustomMessage("They say that an #open hole in a field# holds #[[1]]#.",
+                                                          /*german*/ "",
+                                                          /*french*/ "Selon moi, la #grotte dans les plaines# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                       // /*spanish*/ Según dicen, bajo el #hoyo descubierto de una llanura# yace #[[1]]#.
+
+    hintTextTable[RHT_HF_OPEN_GROTTO_FISH] = HintText(CustomMessage("They say that a #fish in an open hole in a field# holds #[[1]]#.",
+                                                         /*german*/ "",
+                                                         /*french*/ "Selon moi, la #grotte dans les plaines# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                      // /*spanish*/ Según dicen, bajo el #hoyo descubierto de una llanura# yace #[[1]]#.
+
+    hintTextTable[RHT_KAK_OPEN_GROTTO_CHEST] = HintText(CustomMessage("They say that an #open hole in a town# holds #[[1]]#.",
+                                                           /*german*/ "",
+                                                           /*french*/ "Selon moi, la #grotte dans le village# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                        // /*spanish*/ Según dicen, bajo el #hoyo descubierto de un pueblo# yace #[[1]]#.
+
+    hintTextTable[RHT_KAK_OPEN_GROTTO_FISH] = HintText(CustomMessage("They say that a #fish in an open hole in a town# holds #[[1]]#.",
+                                                          /*german*/ "",
+                                                          /*french*/ "Selon moi, la #grotte dans le village# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                       // /*spanish*/ Según dicen, bajo el #hoyo descubierto de un pueblo# yace #[[1]]#.
+
+    hintTextTable[RHT_ZR_OPEN_GROTTO_CHEST] = HintText(CustomMessage("They say that a #hole along a river# holds #[[1]]#.",
+                                                          /*german*/ "",
+                                                          /*french*/ "Selon moi, la #grotte près du fleuve# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                       // /*spanish*/ Según dicen, bajo un #hoyo junto a un río# yace #[[1]]#.
+
+    hintTextTable[RHT_ZR_OPEN_GROTTO_FISH] = HintText(CustomMessage("They say that a #fish in a hole along a river# holds #[[1]]#.",
+                                                         /*german*/ "",
+                                                         /*french*/ "Selon moi, la #grotte près du fleuve# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                      // /*spanish*/ Según dicen, bajo un #hoyo junto a un río# yace #[[1]]#.
+
+    hintTextTable[RHT_KF_STORMS_GROTTO_CHEST] = HintText(CustomMessage("They say that a #hole in a forest village# holds #[[1]]#.",
+                                                            /*german*/ "",
+                                                            /*french*/ "Selon moi, la #grotte inondée de pluie dans le Village Kokiri# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                         // /*spanish*/ Según dicen, bajo el #hoyo de una tribu del bosque# yace #[[1]]#.
+
+    hintTextTable[RHT_KF_STORMS_GROTTO_FISH] = HintText(CustomMessage("They say that a #fish in a hole in a forest village# holds #[[1]]#.",
+                                                           /*german*/ "",
+                                                           /*french*/ "Selon moi, la #grotte inondée de pluie dans le Village Kokiri# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                        // /*spanish*/ Según dicen, bajo el #hoyo de una tribu del bosque# yace #[[1]]#.
+
+    hintTextTable[RHT_LW_NEAR_SHORTCUTS_GROTTO_CHEST] = HintText(CustomMessage("They say that a #hole in a wooded maze# holds #[[1]]#.",
+                                                                    /*german*/ "",
+                                                                    /*french*/ "Selon moi, la #grotte dans le labyrinthe sylvestre# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                 // /*spanish*/ Según dicen, bajo un #hoyo de un laberinto forestal# yace #[[1]]#.
+
+    hintTextTable[RHT_LW_NEAR_SHORTCUTS_GROTTO_FISH] = HintText(CustomMessage("They say that a #fish in a hole in a wooded maze# holds #[[1]]#.",
+                                                                   /*german*/ "",
+                                                                   /*french*/ "Selon moi, la #grotte dans le labyrinthe sylvestre# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                // /*spanish*/ Según dicen, bajo un #hoyo de un laberinto forestal# yace #[[1]]#.
+
+    hintTextTable[RHT_DMT_STORMS_GROTTO_CHEST] = HintText(CustomMessage("They say that #hole flooded with rain on a mountain# holds #[[1]]#.",
+                                                             /*german*/ "",
+                                                             /*french*/ "Selon moi, la #grotte inondée de pluie sur la montagne# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                          // /*spanish*/ Según dicen, bajo un #hoyo de una montaña inundado de lluvia# yace #[[1]]#.
+
+    hintTextTable[RHT_DMT_STORMS_GROTTO_FISH] = HintText(CustomMessage("They say that #fish in a hole flooded with rain on a mountain# holds #[[1]]#.",
+                                                            /*german*/ "",
+                                                            /*french*/ "Selon moi, la #grotte inondée de pluie sur la montagne# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                         // /*spanish*/ Según dicen, bajo un #hoyo de una montaña inundado de lluvia# yace #[[1]]#.
+
+    hintTextTable[RHT_DMC_UPPER_GROTTO_CHEST] = HintText(CustomMessage("They say that a #hole in a volcano# holds #[[1]]#.",
+                                                            /*german*/ "",
+                                                            /*french*/ "Selon moi, la #grotte dans le volcan# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                         // /*spanish*/ Según dicen, bajo el #hoyo de un volcán# yace #[[1]]#.
+
+    hintTextTable[RHT_DMC_UPPER_GROTTO_FISH] = HintText(CustomMessage("They say that a #fish in a hole in a volcano# holds #[[1]]#.",
+                                                           /*german*/ "",
+                                                           /*french*/ "Selon moi, la #grotte dans le volcan# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                        // /*spanish*/ Según dicen, bajo el #hoyo de un volcán# yace #[[1]]#.
+
+    hintTextTable[RHT_TOT_MASTER_SWORD] = HintText(CustomMessage("They say that a #pedestal in a temple# holds #[[1]]#.",
+                                                      /*german*/ "",
+                                                      /*french*/ "Selon moi, un #piédestal dans un temple# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                   // /*spanish*/ Según dicen, un #pedestal en un templo# sostiene #[[1]]#.
+
+    hintTextTable[RHT_TOT_LIGHT_ARROWS_CUTSCENE] = HintText(CustomMessage("They say that the #final gift of a princess# is #[[1]]#.",
+                                                               /*german*/ "",
+                                                               /*french*/ "Selon moi, le #cadeau d'adieu de la princesse# est #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                            // /*spanish*/ Según dicen, el #obsequio final de la princesa# se trata de #[[1]]#.
+
+    hintTextTable[RHT_LW_GIFT_FROM_SARIA] = HintText(CustomMessage("They say that #Saria's Gift# is #[[1]]#.",
+                                                        /*german*/ "",
+                                                        /*french*/ "Selon moi, le #cadeau de Saria# est #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                     // /*spanish*/ Según dicen, el #regalo de Saria# se trata de #[[1]]#.
+                                                     {}, {
+                                                     CustomMessage("They say that a #potato hoarder# holds #[[1]]#.",
+                                                         /*german*/ "",
+                                                         /*french*/ "Selon moi, le #panini mélodieux# est en fait #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                      // /*spanish*/ Según dicen, cierta #jovencita verde# concede #[[1]]#.
+                                                     CustomMessage("They say that a rooty tooty #flutey cutey# gifts #[[1]]#.",
+                                                         /*german*/ "",
+                                                         /*french*/ "Selon moi, la #patate musicale# est en fait #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                      // /*spanish*/ Según dicen, una #gran amiga# concede #[[1]]#.
+
+    hintTextTable[RHT_ZF_GREAT_FAIRY_REWARD] = HintText(CustomMessage("They say that the #fairy of winds# holds #[[1]]#.",
+                                                           /*german*/ "",
+                                                           /*french*/ "Selon moi, la #fée du vent# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                        // /*spanish*/ Según dicen, el #hada del viento# brinda #[[1]]#.
+
+    hintTextTable[RHT_HC_GREAT_FAIRY_REWARD] = HintText(CustomMessage("They say that the #fairy of fire# holds #[[1]]#.",
+                                                           /*german*/ "",
+                                                           /*french*/ "Selon moi, la #fée du feu# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                        // /*spanish*/ Según dicen, el #hada del fuego# brinda #[[1]]#.
+
+    hintTextTable[RHT_COLOSSUS_GREAT_FAIRY_REWARD] = HintText(CustomMessage("They say that the #fairy of love# holds #[[1]]#.",
+                                                                 /*german*/ "",
+                                                                 /*french*/ "Selon moi, la #fée de l'amour# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                              // /*spanish*/ Según dicen, el #hada del amor# brinda #[[1]]#.
+
+    hintTextTable[RHT_DMT_GREAT_FAIRY_REWARD] = HintText(CustomMessage("They say that a #magical fairy# gifts #[[1]]#.",
+                                                            /*german*/ "",
+                                                            /*french*/ "Selon moi, la #fée de la magie# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                         // /*spanish*/ Según dicen, un #hada mágica# brinda #[[1]]#.
+
+    hintTextTable[RHT_DMC_GREAT_FAIRY_REWARD] = HintText(CustomMessage("They say that a #magical fairy# gifts #[[1]]#.",
+                                                            /*german*/ "",
+                                                            /*french*/ "Selon moi, la #fée de la magie# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                         // /*spanish*/ Según dicen, un #hada mágica# brinda #[[1]]#.
+
+    hintTextTable[RHT_OGC_GREAT_FAIRY_REWARD] = HintText(CustomMessage("They say that the #fairy of strength# holds #[[1]]#.",
+                                                            /*german*/ "",
+                                                            /*french*/ "Selon moi, la #fée de la force# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                         // /*spanish*/ Según dicen, el #hada de la fuerza# brinda #[[1]]#.
+
+    hintTextTable[RHT_SONG_FROM_IMPA] = HintText(CustomMessage("They say that #deep in a castle#, Impa teaches #[[1]]#.",
+                                                    /*german*/ "",
+                                                    /*french*/ "Selon moi, #la gardienne de la princesse# donne #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                 // /*spanish*/ Según dicen, en el #jardín del castillo Impa enseña# #[[1]]#.
+
+    hintTextTable[RHT_SONG_FROM_MALON] = HintText(CustomMessage("They say that #a farm girl# sings #[[1]]#.",
+                                                     /*german*/ "",
+                                                     /*french*/ "Selon moi, la #fillette de la ferme# donne #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                  // /*spanish*/ Según dicen, una #chica rupestre# canta #[[1]]#.
+
+    hintTextTable[RHT_SONG_FROM_SARIA] = HintText(CustomMessage("They say that #deep in the forest#, Saria teaches #[[1]]#.",
+                                                     /*german*/ "",
+                                                     /*french*/ "Selon moi, la #fille de la forêt# donne #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                  // /*spanish*/ Según dicen, al #fondo del bosque# Saria enseña #[[1]]#.
+
+    hintTextTable[RHT_SONG_FROM_WINDMILL] = HintText(CustomMessage("They say that a man #in a windmill# is obsessed with #[[1]]#.",
+                                                        /*german*/ "",
+                                                        /*french*/ "Selon moi, l'#homme du moulin# donne #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                     // /*spanish*/ Según dicen, el #hombre del molino# está obsesionado con #[[1]]#.
+
+    hintTextTable[RHT_HC_MALON_EGG] = HintText(CustomMessage("They say that a #girl looking for her father# gives #[[1]]#.",
+                                                  /*german*/ "",
+                                                  /*french*/ "Selon moi, la #fillette qui cherche son père# donne #[[1]]#.", {QM_RED, QM_GREEN}));
+                                               // /*spanish*/ Según dicen, una #chica en busca de su padre# otorga #[[1]]#.
+
+    hintTextTable[RHT_HC_ZELDAS_LETTER] = HintText(CustomMessage("They say that a #princess in a castle# gifts #[[1]]#.",
+                                                      /*german*/ "",
+                                                      /*french*/ "Selon moi, la #princesse dans le château# donne #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                   // /*spanish*/ Según dicen, la #princesa de un castillo# otorga #[[1]]#.
+
+    hintTextTable[RHT_ZD_DIVING_MINIGAME] = HintText(CustomMessage("They say that those who #dive for Zora rupees# will find #[[1]]#.",
+                                                        /*german*/ "",
+                                                        /*french*/ "Selon moi, ceux qui #plongent pour des rubis Zora# trouveront #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                     // /*spanish*/ Según dicen, aquellos que se #sumergan por las rupias zora# encontrarán #[[1]]#.
+                                                     {}, {
+                                                     CustomMessage("They say that an #unsustainable business model# gifts #[[1]]#.",
+                                                         /*german*/ "",
+                                                         /*french*/ "Selon moi, le #mauvais modèle d'affaires# donne #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                      // /*spanish*/ Según dicen, un #mal modelo de negocio# premia con #[[1]]#.
+
+    hintTextTable[RHT_LH_CHILD_FISHING] = HintText(CustomMessage("They say that #fishing in youth# bestows #[[1]]#.",
+                                                      /*german*/ "",
+                                                      /*french*/ "Selon moi, #pêcher dans sa jeunesse# promet #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                   // /*spanish*/ Según dicen, #pescar en la juventud# conduce a #[[1]]#.
+
+    hintTextTable[RHT_LH_POND_FISH] = HintText(CustomMessage("They say that #hitting the pond# reveals #[[1]]#.",
+                                                  /*german*/ "",
+                                                  /*french*/ "Selon moi,  #[[1]]#.", {QM_RED, QM_GREEN}));
+
+    hintTextTable[RHT_LH_HYRULE_LOACH] = HintText(CustomMessage("They say that #fishing the hyrule loach# will give you #[[1]]#.",
+                                                     /*german*/ "",
+                                                     /*french*/ "Selon moi, !!! #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                  // /*spanish*/ Según dicen, si #pescas a la Locha de Hyrule# encontrarás #[[1]]#.
+                                                  {}, {
+                                                  CustomMessage("They say that #fishing the legend# bestows #[[1]]#.",
+                                                      /*german*/ "",
+                                                      /*french*/ "Selon moi, !!! #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                   // /*spanish*/ Según dicen, #pescar a la leyenda# conduce a #[[1]]#.
+
+    hintTextTable[RHT_LH_ADULT_FISHING] = HintText(CustomMessage("They say that #fishing in maturity# bestows #[[1]]#.",
+                                                      /*german*/ "",
+                                                      /*french*/ "Selon moi, #pêcher dans sa maturité# promet #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                   // /*spanish*/ Según dicen, #pescar en la madurez# conduce a #[[1]]#.
+
+    hintTextTable[RHT_LH_LAB_DIVE] = HintText(CustomMessage("They say that a #diving experiment# is rewarded with #[[1]]#.",
+                                                 /*german*/ "",
+                                                 /*french*/ "Selon moi, l'#expérience de plongée# donne #[[1]]#.", {QM_RED, QM_GREEN}));
+                                              // /*spanish*/ Según dicen, #bucear para un experimento# se premia con #[[1]]#.
+    // RANDOTODO: needs translation
+    hintTextTable[RHT_ZD_FISH] = HintText(CustomMessage("They say that a #fish by a waterfall# hoards #[[1]]#.", {QM_RED, QM_GREEN}));
+
+ 
+    hintTextTable[RHT_GC_ROLLING_GORON_AS_ADULT] = HintText(CustomMessage("They say that #reassuring a young Goron# is rewarded with #[[1]]#.",
+                                                               /*german*/ "",
+                                                               /*french*/ "Selon moi, #rassurer un jeune Goron# donne #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                            // /*spanish*/ Según dicen, #calmar a un joven Goron# otorga #[[1]]#.
+                                                            {}, {
+                                                            CustomMessage("They say that #comforting yourself# provides #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, se #réconforter soi-même# donne #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                             // /*spanish*/ Según dicen, #confrontarte a ti mismo# otorga #[[1]]#.
+
+    hintTextTable[RHT_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE] = HintText(CustomMessage("They say that the #first explosive prize# is #[[1]]#.",
+                                                                        /*german*/ "",
+                                                                        /*french*/ "Selon moi, le #premier prix explosif# est #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                     // /*spanish*/ Según dicen, el #primer premio explosivo# se trata de #[[1]]#.
+
+    hintTextTable[RHT_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE] = HintText(CustomMessage("They say that the #second explosive prize# is #[[1]]#.",
+                                                                         /*german*/ "",
+                                                                         /*french*/ "Selon moi, le #deuxième prix explosif# est #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                      // /*spanish*/ Según dicen, el #segundo premio explosivo# se trata de #[[1]]#.
+
+    hintTextTable[RHT_MARKET_LOST_DOG] = HintText(CustomMessage("They say that #rescuing Richard the Dog# is rewarded with #[[1]]#.",
+                                                     /*german*/ "",
+                                                     /*french*/ "Selon moi, #retrouver Kiki le chien# promet #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                  // /*spanish*/ Según dicen, #rescatar al perrito Ricardo# conduce a #[[1]]#.
+                                                  {}, {
+                                                  CustomMessage("They say that #puppy lovers# will find #[[1]]#.",
+                                                      /*german*/ "",
+                                                      /*french*/ "Selon moi, les #amoureux canins# trouveront #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                   // /*spanish*/ Según dicen, los #amantes caninos# encontrarán #[[1]]#.
+
+    hintTextTable[RHT_LW_OCARINA_MEMORY_GAME] = HintText(CustomMessage("They say that #playing an Ocarina in Lost Woods# is rewarded with #[[1]]#.",
+                                                            /*german*/ "",
+                                                            /*french*/ "Selon moi, #jouer l'ocarina dans les Bois Perdus# donne #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                         // /*spanish*/ Según dicen, #tocar la ocarina en el Bosque Perdido# otorga #[[1]]#.
+                                                         {}, {
+                                                         CustomMessage("They say that the prize for a #game of Simon Says# is #[[1]]#.",
+                                                             /*german*/ "",
+                                                             /*french*/ "Selon moi, la #récompense de Jean Dit# est #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                          // /*spanish*/ Según dicen, #repetir ciertas melodías# otorga #[[1]]#.
+                                                         CustomMessage("They say that a #child sing-a-long# holds #[[1]]#.",
+                                                             /*german*/ "",
+                                                             /*french*/ "Selon moi, les #jeunes flûtistes# donnent #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                          // /*spanish*/ Según dicen, #tocar junto a otros# otorga #[[1]]#.
+
+    hintTextTable[RHT_KAK_10_GOLD_SKULLTULA_REWARD] = HintText(CustomMessage("They say that slaying #10 Gold Skulltulas# reveals #[[1]]#.",
+                                                                  /*german*/ "",
+                                                                  /*french*/ "Selon moi, détruire #10 Skulltulas d'or# donne #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                               // /*spanish*/ Según dicen, #exterminar 10 skulltulas doradas# revela #[[1]]#.
+                                                               {}, {
+                                                               CustomMessage("They say that #10 bug badges# rewards #[[1]]#.",
+                                                                   /*german*/ "",
+                                                                   /*french*/ "Selon moi, #10 écussons# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                // /*spanish*/ Según dicen, #10 medallas de insectos# otorgan #[[1]]#.
+                                                               CustomMessage("They say that #10 spider souls# yields #[[1]]#.",
+                                                                   /*german*/ "",
+                                                                   /*french*/ "Selon moi, #10 âmes# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                // /*spanish*/ Según dicen, #10 almas de araña# otorgan #[[1]]#.
+                                                               CustomMessage("They say that #10 auriferous arachnids# lead to #[[1]]#.",
+                                                                   /*german*/ "",
+                                                                   /*french*/ "Selon moi, #10 arachnides aurifères# donnent #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                // /*spanish*/ Según dicen, #10 arácnidos auríferos# otorgan #[[1]]#.
+
+    hintTextTable[RHT_KAK_MAN_ON_ROOF] = HintText(CustomMessage("They say that a #rooftop wanderer# holds #[[1]]#.",
+                                                     /*german*/ "",
+                                                     /*french*/ "Selon moi, une #rencontre sur un toit# donne #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                  // /*spanish*/ Según dicen, #alguien sobre un tejado# otorga #[[1]]#.
+
+    hintTextTable[RHT_ZR_MAGIC_BEAN_SALESMAN] = HintText(CustomMessage("They say that a #bean seller# offers #[[1]]#.",
+                                                            /*german*/ "",
+                                                            /*french*/ "Selon moi, le #marchand de haricots magiques# vend en fait #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                         // /*spanish*/ Según dicen, el #vendedor de judías# ofrece #[[1]]#.
+                                                         {}, {
+                                                         CustomMessage("They say that a seller of #colorful crops# has #[[1]]#.",
+                                                             /*german*/ "",
+                                                             /*french*/ "Selon moi, le #marchand de légumes# vend #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                          // /*spanish*/ Según dicen, el vendedor de un #colorido cultivo# ofrece #[[1]]#.
+
+    hintTextTable[RHT_ZR_FROGS_IN_THE_RAIN] = HintText(CustomMessage("They say that #frogs in a storm# gift #[[1]]#.",
+                                                          /*german*/ "",
+                                                          /*french*/ "Selon moi, #des grenouilles mouillées# donnent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                       // /*spanish*/ Según dicen, las #ancas bajo la tormenta# otorgan #[[1]]#.
+
+    hintTextTable[RHT_ZR_FROGS_ZELDAS_LULLABY] = HintText(CustomMessage("They say that after hearing #Zelda's Lullaby, the frogs# gift #[[1]]#.",
+                                                             /*german*/ "",
+                                                             /*french*/ "Selon moi, à l'écoute de #la berceuse de Zelda, les grenouilles# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                          // /*spanish*/ Según dicen, después de escuchar #la Nana de Zelda, las ranas# regalan #[[1]]#.
+                                                          {}, {
+                                                          CustomMessage("They say that #sleepy frogs# gift #[[1]]#.",
+                                                              /*german*/ "",
+                                                              /*french*/ "Selon moi, #les grenouilles somnolentes# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                           // /*spanish*/ Según dicen, las #ranas somnolientas# regalan #[[1]]#.
+                                                          CustomMessage("They say that #the Froggish Tenor in the back-left# gifts #[[1]]#.",
+                                                              /*german*/ "",
+                                                              /*french*/ "Selon moi, #le ténor grenouillesque au fond à gauche# donne #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                           // /*spanish*/ Según dicen, el #Sapo Tenore al fondo, a la izquierda#, regala #[[1]]#.
+
+    hintTextTable[RHT_ZR_FROGS_EPONAS_SONG] = HintText(CustomMessage("They say that after hearing #Epona's Song, the frogs# gift #[[1]]#.",
+                                                          /*german*/ "",
+                                                          /*french*/ "Selon moi, à l'écoute du #chant d'Epona, les grenouilles# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                       // /*spanish*/ Según dicen, después de escuchar #la Canción de Epona, las ranas# regalan #[[1]]#.
+                                                       {}, {
+                                                       CustomMessage("They say that #equine frogs# gift #[[1]]#.",
+                                                           /*german*/ "",
+                                                           /*french*/ "Selon moi, #les grenouilles équestres# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                        // /*spanish*/ Según dicen, las #ranas equinas# regalan #[[1]]#.
+                                                       CustomMessage("They say that #the Froggish Tenor in the back-right# gifts #[[1]]#.",
+                                                           /*german*/ "",
+                                                           /*french*/ "Selon moi, #le ténor grenouillesque au fond à droite# donne #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                        // /*spanish*/ Según dicen, el #Sapo Tenore al fondo, a la derecha#, regala #[[1]]#.
+
+    hintTextTable[RHT_ZR_FROGS_SARIAS_SONG] = HintText(CustomMessage("They say that after hearing #Saria's Song, the frogs# gift #[[1]]#.",
+                                                          /*german*/ "",
+                                                          /*french*/ "Selon moi, à l'écoute du #chant de Saria, les grenouilles# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                       // /*spanish*/ Según dicen, después de escuchar #la Canción de Saria, las ranas# regalan #[[1]]#.
+                                                       {}, {
+                                                       CustomMessage("They say that #sylvan frogs# gift #[[1]]#.",
+                                                           /*german*/ "",
+                                                           /*french*/ "Selon moi, #les grenouilles sylvestres# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                        // /*spanish*/ Según dicen, las #ranas silvestres# regalan #[[1]]#.
+                                                       CustomMessage("They say that #the Froggish Tenor in the center# gifts #[[1]]#.",
+                                                           /*german*/ "",
+                                                           /*french*/ "Selon moi, #le ténor grenouillesque dans le centre# donne #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                        // /*spanish*/ Según dicen, el #Sapo Tenore en el centro# regala #[[1]]#.
+
+    hintTextTable[RHT_ZR_FROGS_SUNS_SONG] = HintText(CustomMessage("They say that after hearing #the Sun's Song, the frogs# gift #[[1]]#.",
+                                                        /*german*/ "",
+                                                        /*french*/ "Selon moi, à l'écoute du #chant du soleil, les grenouilles# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                     // /*spanish*/ Según dicen, después de escuchar #la Canción del Sol, las ranas# regalan #[[1]]#.
+                                                     {}, {
+                                                     CustomMessage("They say that #enlightened frogs# gift #[[1]]#.",
+                                                         /*german*/ "",
+                                                         /*french*/ "Selon moi, #les grenouilles éclairées# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                      // /*spanish*/ Según dicen, las #ranas alumbradas# regalan #[[1]]#.
+                                                     CustomMessage("They say that #the Froggish Tenor in the front-left# gifts #[[1]]#.",
+                                                         /*german*/ "",
+                                                         /*french*/ "Selon moi, #le ténor grenouillesque à l'avant gauche# donne #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                      // /*spanish*/ Según dicen, el #Sapo Tenore al frente, a la izquierda#, regala #[[1]]#.
+
+    hintTextTable[RHT_ZR_FROGS_SONG_OF_TIME] = HintText(CustomMessage("They say that after hearing #the Song of Time, the frogs# gift #[[1]]#.",
+                                                           /*german*/ "",
+                                                           /*french*/ "Selon moi, à l'écoute du #chant du temps, les grenouilles# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                        // /*spanish*/ Según dicen, después de escuchar #la Canción del tiempo, las ranas# regalan #[[1]]#.
+                                                        {}, {
+                                                        CustomMessage("They say that #time-traveling frogs# gift #[[1]]#.",
+                                                            /*german*/ "",
+                                                            /*french*/ "Selon moi, #les grenouilles voyageuses dans le temps# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                         // /*spanish*/ Según dicen, las #ranas viajeras del tiempo# regalan #[[1]]#.
+                                                        CustomMessage("They say that #the Froggish Tenor in the front-right# gifts #[[1]]#.",
+                                                            /*german*/ "",
+                                                            /*french*/ "Selon moi, #le ténor grenouillesque à l'avant droite# donne #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                         // /*spanish*/ Según dicen, el #Sapo Tenore al frente, a la derecha#, regala #[[1]]#.
+
+    hintTextTable[RHT_GF_HBA_1000_POINTS] = HintText(CustomMessage("They say that scoring 1000 in #horseback archery# grants #[[1]]#.",
+                                                        /*german*/ "",
+                                                        /*french*/ "Selon moi, obtenir 1000 points dans l'#archerie équestre# donne #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                     // /*spanish*/ Según dicen, conseguir 1000 puntos en el #tiro con arco a caballo# premia #[[1]]#.
+
+    hintTextTable[RHT_MARKET_SHOOTING_GALLERY_REWARD] = HintText(CustomMessage("They say that #shooting in youth# grants #[[1]]#.",
+                                                                    /*german*/ "",
+                                                                    /*french*/ "Selon moi, #faire du tir dans sa jeunesse# donne #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                 // /*spanish*/ Según dicen, #disparar en la juventud# otorga #[[1]]#.
+
+    hintTextTable[RHT_KAK_SHOOTING_GALLERY_REWARD] = HintText(CustomMessage("They say that #shooting in maturity# grants #[[1]]#.",
+                                                                 /*german*/ "",
+                                                                 /*french*/ "Selon moi, #faire du tir dans sa maturité# donne #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                              // /*spanish*/ Según dicen, #disparar en la madurez# otorga #[[1]]#.
+
+    hintTextTable[RHT_LW_TARGET_IN_WOODS] = HintText(CustomMessage("They say that shooting a #target in the woods# grants #[[1]]#.",
+                                                        /*german*/ "",
+                                                        /*french*/ "Selon moi, #tirer une cible dans les bois# donne #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                     // /*spanish*/ Según dicen, disparar a un #blanco forestal# brinda #[[1]]#.
+
+    hintTextTable[RHT_KAK_ANJU_AS_ADULT] = HintText(CustomMessage("They say that a #chicken caretaker# offers adults #[[1]]#.",
+                                                       /*german*/ "",
+                                                       /*french*/ "Selon moi, devenir un #éleveur de Cocottes# donne #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                    // /*spanish*/ Según dicen, una #cuidadora de emplumados# le ofrece a los mayores #[[1]]#.
+
+    hintTextTable[RHT_LLR_TALONS_CHICKENS] = HintText(CustomMessage("They say that #finding Super Cuccos# is rewarded with #[[1]]#.",
+                                                         /*german*/ "",
+                                                         /*french*/ "Selon moi, #trouver des Super Cocottes# donne #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                      // /*spanish*/ Según dicen, #hallar los supercucos# conduce a #[[1]]#.
+
+    hintTextTable[RHT_GC_ROLLING_GORON_AS_CHILD] = HintText(CustomMessage("They say that the prize offered by a #large rolling Goron# is #[[1]]#.",
+                                                               /*german*/ "",
+                                                               /*french*/ "Selon moi, la récompense d'un #gros Goron roulant# est #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                            // /*spanish*/ Según dicen, un #gran Goron rodante# otorga #[[1]]#.
+
+    hintTextTable[RHT_LH_UNDERWATER_ITEM] = HintText(CustomMessage("They say that the #sunken treasure in a lake# is #[[1]]#.",
+                                                        /*german*/ "",
+                                                        /*french*/ "Selon moi, le #trésor au fond du lac# est #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                     // /*spanish*/ Según dicen, el #tesoro hundido del lago# se trata de #[[1]]#.
+
+    hintTextTable[RHT_GF_GERUDO_MEMBERSHIP_CARD] = HintText(CustomMessage("They say that #rescuing captured carpenters# is rewarded with #[[1]]#.",
+                                                               /*german*/ "",
+                                                               /*french*/ "Selon moi, #secourir les charpentiers capturés# assure #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                            // /*spanish*/ Según dicen, #rescatar los apresados carpinteros# se premia con #[[1]]#.
+
+    hintTextTable[RHT_WASTELAND_BOMBCHU_SALESMAN] = HintText(CustomMessage("They say that a #carpet guru# sells #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, #un marchand du désert# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                             // /*spanish*/ Según dicen, el #genio de una alfombra# vende #[[1]]#.
+
+    hintTextTable[RHT_GC_MEDIGORON] = HintText(CustomMessage("They say that #Medigoron# sells #[[1]]#.",
+                                                  /*german*/ "",
+                                                  /*french*/ "Selon moi, #Medigoron# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                               // /*spanish*/ Según dicen, #Medigoron# vende #[[1]]#.
+
+    hintTextTable[RHT_KAK_GRANNYS_SHOP] = HintText(CustomMessage("They say that the #potion shop lady# sells #[[1]]#.",
+                                                      /*german*/ "",
+                                                      /*french*/ "Selon moi, la #dame du magasin de potion# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                   // /*spanish*/ Según dicen, la #señora de la tienda de pociones# vende #[[1]]#.
+
+    hintTextTable[RHT_KAK_IMPAS_HOUSE_FREESTANDING_POH] = HintText(CustomMessage("They say that #imprisoned in a house# lies #[[1]]#.",
+                                                                      /*german*/ "",
+                                                                      /*french*/ "Selon moi, #encagé dans une maison# gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                   // /*spanish*/ Según dicen, #en una casa entre rejas# yace #[[1]]#.
+
+    hintTextTable[RHT_HF_TEKTITE_GROTTO_FREESTANDING_POH] = HintText(CustomMessage("They say that #deep underwater in a hole# is #[[1]]#.",
+                                                                        /*german*/ "",
+                                                                        /*french*/ "Selon moi, #dans les profondeurs d'une grotte# gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                     // /*spanish*/ Según dicen, #en lo hondo bajo un hoyo# yace #[[1]]#.
+
+    hintTextTable[RHT_KAK_WINDMILL_FREESTANDING_POH] = HintText(CustomMessage("They say that on a #windmill ledge# lies #[[1]]#.",
+                                                                   /*german*/ "",
+                                                                   /*french*/ "Selon moi, #haut perché dans le moulin# gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                // /*spanish*/ Según dicen, al #borde de un molino# yace #[[1]]#.
+
+    hintTextTable[RHT_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH] = HintText(CustomMessage("They say that #dead Dampe's second# prize is #[[1]]#.",
+                                                                           /*german*/ "",
+                                                                           /*french*/ "Selon moi, la #deuxième course d'Igor# donne #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                        // /*spanish*/ Según dicen, el segundo premio de #la carrera de Dampé# se trata de #[[1]]#.
+                                                                        {}, {
+                                                                        CustomMessage("They say that #racing a ghost# leads to #[[1]]#.",
+                                                                            /*german*/ "",
+                                                                            /*french*/ "Selon moi, le défi du #revenant rapide# donne #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                                         // /*spanish*/ Según dicen, #perseguir a un fantasma# conduce a #[[1]]#.
+
+    hintTextTable[RHT_LLR_FREESTANDING_POH] = HintText(CustomMessage("They say that in a #ranch silo# lies #[[1]]#.",
+                                                          /*german*/ "",
+                                                          /*french*/ "Selon moi, #dans l'entrepôt de la ferme# gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                       // /*spanish*/ Según dicen, en un #granero rupestre# yace #[[1]]#.
+
+    hintTextTable[RHT_GRAVEYARD_FREESTANDING_POH] = HintText(CustomMessage("They say that a #crate in a graveyard# hides #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, #la boîte dans le Cimetière# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                             // /*spanish*/ Según dicen, bajo la #caja de un cementerio# yace #[[1]]#.
+
+    hintTextTable[RHT_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR] = HintText(CustomMessage("They say that a #gravekeeper digs up# #[[1]]#.",
+                                                                       /*german*/ "",
+                                                                       /*french*/ "Selon moi, #le jeu du fossoyeur# cache #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                    // /*spanish*/ Según dicen, cierto #sepultero desentierra# #[[1]]#.
+
+    hintTextTable[RHT_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH] = HintText(CustomMessage("They say that on top of a #pillar in a river# lies #[[1]]#.",
+                                                                          /*german*/ "",
+                                                                          /*french*/ "Selon moi, #sur un pilier au dessus du fleuve# gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                       // /*spanish*/ Según dicen, en lo alto del #pilar de un río# yace #[[1]]#.
+
+    hintTextTable[RHT_ZR_NEAR_DOMAIN_FREESTANDING_POH] = HintText(CustomMessage("They say that on a #river ledge by a waterfall# lies #[[1]]#.",
+                                                                     /*german*/ "",
+                                                                     /*french*/ "Selon moi, #sur la falaise au dessus du fleuve# gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                  // /*spanish*/ Según dicen, al borde de #la entrada a una cascada# yace #[[1]]#.
+
+    hintTextTable[RHT_LH_FREESTANDING_POH] = HintText(CustomMessage("They say that high on a #lab rooftop# one can find #[[1]]#.",
+                                                         /*german*/ "",
+                                                         /*french*/ "Selon moi, #la tour d'observation du lac# cache #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                      // /*spanish*/ Según dicen, en lo #alto de un laboratorio# yace #[[1]]#.
+
+    hintTextTable[RHT_ZF_ICEBERG_FREESTANDING_POH] = HintText(CustomMessage("They say that #floating on ice# is #[[1]]#.",
+                                                                 /*german*/ "",
+                                                                 /*french*/ "Selon moi, #gisant sur la glace# gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                              // /*spanish*/ Según dicen, #flotando sobre hielo# yace #[[1]]#.
+
+    hintTextTable[RHT_GV_WATERFALL_FREESTANDING_POH] = HintText(CustomMessage("They say that behind a #valley waterfall# is #[[1]]#.",
+                                                                   /*german*/ "",
+                                                                   /*french*/ "Selon moi, #derrière la cascade du désert# se cache #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                // /*spanish*/ Según dicen, tras una #desierta cascada# yace #[[1]]#.
+
+    hintTextTable[RHT_GV_CRATE_FREESTANDING_POH] = HintText(CustomMessage("They say that a #crate in a valley# hides #[[1]]#.",
+                                                               /*german*/ "",
+                                                               /*french*/ "Selon moi, la #boîte dans la vallée# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                            // /*spanish*/ Según dicen, bajo la #caja de un valle# yace #[[1]]#.
+
+    hintTextTable[RHT_COLOSSUS_FREESTANDING_POH] = HintText(CustomMessage("They say that on top of an #arch of stone# lies #[[1]]#.",
+                                                               /*german*/ "",
+                                                               /*french*/ "Selon moi, #gisant sur une arche de pierre# gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                            // /*spanish*/ Según dicen, en lo alto de un #arco de piedra# yace #[[1]]#.
+
+    hintTextTable[RHT_DMT_FREESTANDING_POH] = HintText(CustomMessage("They say that above a #mountain cavern entrance# is #[[1]]#.",
+                                                          /*german*/ "",
+                                                          /*french*/ "Selon moi, gisant #au dessus de la caverne montagneuse# gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                       // /*spanish*/ Según dicen, en lo alto de la #entrada de una cueva en la montaña# yace #[[1]]#.
+
+    hintTextTable[RHT_DMC_WALL_FREESTANDING_POH] = HintText(CustomMessage("They say that nestled in a #volcanic wall# is #[[1]]#.",
+                                                               /*german*/ "",
+                                                               /*french*/ "Selon moi, dans une #alcove volcanique# gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                            // /*spanish*/ Según dicen, entre unas #murallas volcánicas# yace #[[1]]#.
+
+    hintTextTable[RHT_DMC_VOLCANO_FREESTANDING_POH] = HintText(CustomMessage("They say that obscured by #volcanic ash# is #[[1]]#.",
+                                                                  /*german*/ "",
+                                                                  /*french*/ "Selon moi, #recouvert de cendres volcaniques# gît #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                               // /*spanish*/ Según dicen, bajo la #ceniza volcánica# yace #[[1]]#.
+
+    hintTextTable[RHT_GF_NORTH_F1_CARPENTER] = HintText(CustomMessage("They say that #defeating Gerudo guards# reveals #[[1]]#.",
+                                                           /*german*/ "",
+                                                           /*french*/ "Selon moi, les #geôliers Gerudo# détiennent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                        // /*spanish*/ Según dicen, #derrotar a las guardas Gerudo# revela #[[1]]#.
+
+    hintTextTable[RHT_GF_NORTH_F2_CARPENTER] = HintText(CustomMessage("They say that #defeating Gerudo guards# reveals #[[1]]#.",
+                                                           /*german*/ "",
+                                                           /*french*/ "Selon moi, les #geôliers Gerudo# détiennent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                        // /*spanish*/ Según dicen, #derrotar a las guardas Gerudo# revela #[[1]]#.
+
+    hintTextTable[RHT_GF_SOUTH_F1_CARPENTER] = HintText(CustomMessage("They say that #defeating Gerudo guards# reveals #[[1]]#.",
+                                                           /*german*/ "",
+                                                           /*french*/ "Selon moi, les #geôliers Gerudo# détiennent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                        // /*spanish*/ Según dicen, #derrotar a las guardas Gerudo# revela #[[1]]#.
+
+    hintTextTable[RHT_GF_SOUTH_F2_CARPENTER] = HintText(CustomMessage("They say that #defeating Gerudo guards# reveals #[[1]]#.",
+                                                           /*german*/ "",
+                                                           /*french*/ "Selon moi, les #geôliers Gerudo# détiennent #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                        // /*spanish*/ Según dicen, #derrotar a las guardas Gerudo# revela #[[1]]#.
+
+    hintTextTable[RHT_HF_GS_NEAR_KAK_GROTTO] = HintText(CustomMessage("They say that a #spider-guarded spider in a hole# hoards #[[1]]#.",
+                                                           /*german*/ "",
+                                                           /*french*/ "Selon moi, une #Skulltula dans un trou d'arachnides# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                        // /*spanish*/ Según dicen, una #Skulltula custodiada por otra# de un hoyo otorga #[[1]]#.
+
+    hintTextTable[RHT_LLR_GS_BACK_WALL] = HintText(CustomMessage("They say that night reveals a #spider in a ranch# holding #[[1]]#.",
+                                                      /*german*/ "",
+                                                      /*french*/ "Selon moi, une #Skulltula sur la façade de la ferme# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                   // /*spanish*/ Según dicen, la noche revela una #Skulltula del rancho# que otorga #[[1]]#.
+
+    hintTextTable[RHT_LLR_GS_RAIN_SHED] = HintText(CustomMessage("They say that night reveals a #spider in a ranch# holding #[[1]]#.",
+                                                      /*german*/ "",
+                                                      /*french*/ "Selon moi, une #Skulltula sur le mur de l'enclos# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                   // /*spanish*/ Según dicen, la noche revela una #Skulltula del rancho# que otorga #[[1]]#.
+
+    hintTextTable[RHT_LLR_GS_HOUSE_WINDOW] = HintText(CustomMessage("They say that night reveals a #spider in a ranch# holding #[[1]]#.",
+                                                         /*german*/ "",
+                                                         /*french*/ "Selon moi, une #Skulltula sur la maison de ferme# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                      // /*spanish*/ Según dicen, la noche revela una #Skulltula del rancho# que otorga #[[1]]#.
+
+    hintTextTable[RHT_LLR_GS_TREE] = HintText(CustomMessage("They say that a spider hiding in a #ranch tree# holds #[[1]]#.",
+                                                 /*german*/ "",
+                                                 /*french*/ "Selon moi, une #Skulltula dans l'arbre de la ferme# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                              // /*spanish*/ Según dicen, una Skulltula escondida en el #árbol de un rancho# otorga #[[1]]#.
+
+    hintTextTable[RHT_KF_GS_BEAN_PATCH] = HintText(CustomMessage("They say that a #spider buried in a forest# holds #[[1]]#.",
+                                                      /*german*/ "",
+                                                      /*french*/ "Selon moi, une #Skulltula enterrée dans la forêt# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                   // /*spanish*/ Según dicen, una #Skulltula enterrada en un bosque# otorga #[[1]]#.
+
+    hintTextTable[RHT_KF_GS_KNOW_IT_ALL_HOUSE] = HintText(CustomMessage("They say that night in the past reveals a #spider in a forest# holding #[[1]]#.",
+                                                             /*german*/ "",
+                                                             /*french*/ "Selon moi, une #Skulltula derrière une cabane de la forêt# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                          // /*spanish*/ Según dicen, la noche revela en el pasado una #Skulltula del bosque# que otorga #[[1]]#.
+
+    hintTextTable[RHT_KF_GS_HOUSE_OF_TWINS] = HintText(CustomMessage("They say that night in the future reveals a #spider in a forest# holding #[[1]]#.",
+                                                          /*german*/ "",
+                                                          /*french*/ "Selon moi, une #Skulltula sur une cabane de la forêt# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                       // /*spanish*/ Según dicen, la noche revela en el futuro una #Skulltula del rancho# que otorga #[[1]]#.
+
+    hintTextTable[RHT_LW_GS_BEAN_PATCH_NEAR_BRIDGE] = HintText(CustomMessage("They say that a #spider buried deep in a forest maze# holds #[[1]]#.",
+                                                                  /*german*/ "",
+                                                                  /*french*/ "Selon moi, une #Skulltula enterrée dans les bois# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                               // /*spanish*/ Según dicen, una #Skulltula enterrada en un laberinto forestal# otorga #[[1]]#.
+
+    hintTextTable[RHT_LW_GS_BEAN_PATCH_NEAR_THEATER] = HintText(CustomMessage("They say that a #spider buried deep in a forest maze# holds #[[1]]#.",
+                                                                   /*german*/ "",
+                                                                   /*french*/ "Selon moi, une #Skulltula enterrée dans les bois# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                // /*spanish*/ Según dicen, una #Skulltula enterrada en un laberinto forestal# otorga #[[1]]#.
+
+    hintTextTable[RHT_LW_GS_ABOVE_THEATER] = HintText(CustomMessage("They say that night reveals a #spider deep in a forest maze# holding #[[1]]#.",
+                                                         /*german*/ "",
+                                                         /*french*/ "Selon moi, une #Skulltula haut perchée dans les bois# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                      // /*spanish*/ Según dicen, la noche revela una #Skulltula del laberinto forestal# que otorga #[[1]]#.
+
+    hintTextTable[RHT_SFM_GS] = HintText(CustomMessage("They say that night reveals a #spider in a forest meadow# holding #[[1]]#.",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, une #Skulltula dans le sanctuaire des bois# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                         // /*spanish*/ Según dicen, la noche revela una #Skulltula de la pradera del bosque# que otorga #[[1]]#.
+
+    hintTextTable[RHT_OGC_GS] = HintText(CustomMessage("They say that a #spider outside a tyrant's tower# holds #[[1]]#.",
+                                            /*german*/ "",
+                                            /*french*/ "Selon moi, une #Skulltula parmi les ruines du château# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                         // /*spanish*/ Según dicen, una #Skulltula a las afueras de la torre de un tirano# otorga #[[1]]#.
+
+    hintTextTable[RHT_HC_GS_TREE] = HintText(CustomMessage("They say that a spider hiding in a #tree outside of a castle# holds #[[1]]#.",
+                                                /*german*/ "",
+                                                /*french*/ "Selon moi, une #Skulltula dans l'arbre près du château# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                             // /*spanish*/ Según dicen, una Skulltula escondida en el #árbol de las afueras de un castillo# otorga #[[1]]#.
+
+    hintTextTable[RHT_MARKET_GS_GUARD_HOUSE] = HintText(CustomMessage("They say that a #spider in a guarded crate# holds #[[1]]#.",
+                                                           /*german*/ "",
+                                                           /*french*/ "Selon moi, une #Skulltula dans une boîte en ville# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                        // /*spanish*/ Según dicen, una #Skulltula bajo una custodiada caja# otorga #[[1]]#.
+
+    hintTextTable[RHT_DMC_GS_BEAN_PATCH] = HintText(CustomMessage("They say that a #spider buried in a volcano# holds #[[1]]#.",
+                                                       /*german*/ "",
+                                                       /*french*/ "Selon moi, une #Skulltula enterrée dans un volcan# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                    // /*spanish*/ Según dicen, una #Skulltula enterrada en un volcán# otorga #[[1]]#.
+
+    hintTextTable[RHT_DMT_GS_BEAN_PATCH] = HintText(CustomMessage("They say that a #spider buried outside a cavern# holds #[[1]]#.",
+                                                       /*german*/ "",
+                                                       /*french*/ "Selon moi, une #Skulltula enterrée près d'une caverne# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                    // /*spanish*/ Según dicen, una #Skulltula enterrada a la entrada de una cueva# otorga #[[1]]#.
+
+    hintTextTable[RHT_DMT_GS_NEAR_KAK] = HintText(CustomMessage("They say that a #spider hidden in a mountain nook# holds #[[1]]#.",
+                                                     /*german*/ "",
+                                                     /*french*/ "Selon moi, une #Skulltula cachée dans le flanc d'une montagne# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                  // /*spanish*/ Según dicen, una #Skulltula oculta en el rincón de la montaña# otorga #[[1]]#.
+
+    hintTextTable[RHT_DMT_GS_ABOVE_DODONGOS_CAVERN] = HintText(CustomMessage("They say that the hammer reveals a #spider on a mountain# holding #[[1]]#.",
+                                                                  /*german*/ "",
+                                                                  /*french*/ "Selon moi, une #Skulltula derrière un rocher massif près d'une caverne# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                               // /*spanish*/ Según dicen, el martillo revela #una Skulltula de la montaña# que otorga #[[1]]#.
+
+    hintTextTable[RHT_DMT_GS_FALLING_ROCKS_PATH] = HintText(CustomMessage("They say that the hammer reveals a #spider on a mountain# holding #[[1]]#.",
+                                                               /*german*/ "",
+                                                               /*french*/ "Selon moi, une #Skulltula derrière un rocher massif près du sommet d'un volcan# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                            // /*spanish*/ Según dicen, el martillo revela #una Skulltula de la montaña# que otorga #[[1]]#.
+
+    hintTextTable[RHT_GC_GS_CENTER_PLATFORM] = HintText(CustomMessage("They say that a #suspended spider# in Goron City holds #[[1]]#.",
+                                                           /*german*/ "",
+                                                           /*french*/ "Selon moi, une #Skulltula perchée dans le village Goron# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                        // /*spanish*/ Según dicen, una #Skulltula suspendida# en la Ciudad Goron otorga #[[1]]#.
+
+    hintTextTable[RHT_GC_GS_BOULDER_MAZE] = HintText(CustomMessage("They say that a spider in a #Goron City crate# holds #[[1]]#.",
+                                                        /*german*/ "",
+                                                        /*french*/ "Selon moi, une #Skulltula dans une boîte du village Goron# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                     // /*spanish*/ Según dicen, una #Skulltula bajo una caja# de la Ciudad Goron otorga #[[1]]#.
+
+    hintTextTable[RHT_KAK_GS_HOUSE_UNDER_CONSTRUCTION] = HintText(CustomMessage("They say that night in the past reveals a #spider in a town# holding #[[1]]#.",
+                                                                     /*german*/ "",
+                                                                     /*french*/ "Selon moi, une #Skulltula dans le chantier de construction# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                  // /*spanish*/ Según dicen, la noche del pasado revela una #Skulltula del pueblo# que otorga #[[1]]#.
+
+    hintTextTable[RHT_KAK_GS_SKULLTULA_HOUSE] = HintText(CustomMessage("They say that night in the past reveals a #spider in a town# holding #[[1]]#.",
+                                                            /*german*/ "",
+                                                            /*french*/ "Selon moi, une #Skulltula sur une maison maudite# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                         // /*spanish*/ Según dicen, la noche del pasado revela una #Skulltula del pueblo# que otorga #[[1]]#.
+
+    hintTextTable[RHT_KAK_GS_GUARDS_HOUSE] = HintText(CustomMessage("They say that night in the past reveals a #spider in a town# holding #[[1]]#.",
+                                                         /*german*/ "",
+                                                         /*french*/ "Selon moi, une #Skulltula sur une maison de village# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                      // /*spanish*/ Según dicen, la noche del pasado revela una #Skulltula del pueblo# que otorga #[[1]]#.
+
+    hintTextTable[RHT_KAK_GS_TREE] = HintText(CustomMessage("They say that night in the past reveals a #spider in a town# holding #[[1]]#.",
+                                                 /*german*/ "",
+                                                 /*french*/ "Selon moi, une #Skulltula dans un arbre de village# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                              // /*spanish*/ Según dicen, la noche del pasado revela una #Skulltula del pueblo# que otorga #[[1]]#.
+
+    hintTextTable[RHT_KAK_GS_WATCHTOWER] = HintText(CustomMessage("They say that night in the past reveals a #spider in a town# holding #[[1]]#.",
+                                                       /*german*/ "",
+                                                       /*french*/ "Selon moi, une #Skulltula sur une échelle dans un village# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                    // /*spanish*/ Según dicen, la noche del pasado revela una #Skulltula del pueblo# que otorga #[[1]]#.
+
+    hintTextTable[RHT_KAK_GS_ABOVE_IMPAS_HOUSE] = HintText(CustomMessage("They say that night in the future reveals a #spider in a town# holding #[[1]]#.",
+                                                              /*german*/ "",
+                                                              /*french*/ "Selon moi, une #Skulltula au dessus d'une grande maison# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                           // /*spanish*/ Según dicen, la noche del futuro revela una #Skulltula del pueblo# que otorga #[[1]]#.
+
+    hintTextTable[RHT_GRAVEYARD_GS_WALL] = HintText(CustomMessage("They say that night reveals a #spider in a graveyard# holding #[[1]]#.",
+                                                       /*german*/ "",
+                                                       /*french*/ "Selon moi, une #Skulltula sur une façade du Cimetière# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                    // /*spanish*/ Según dicen, la noche revela una #Skulltula del cementerio# que otorga #[[1]]#.
+
+    hintTextTable[RHT_GRAVEYARD_GS_BEAN_PATCH] = HintText(CustomMessage("They say that a #spider buried in a graveyard# holds #[[1]]#.",
+                                                             /*german*/ "",
+                                                             /*french*/ "Selon moi, une #Skulltula enterrée dans le Cimetière# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                          // /*spanish*/ Según dicen, una #Skulltula enterrada en el cementerio# otorga #[[1]]#.
+
+    hintTextTable[RHT_ZR_GS_LADDER] = HintText(CustomMessage("They say that night in the past reveals a #spider in a river# holding #[[1]]#.",
+                                                  /*german*/ "",
+                                                  /*french*/ "Selon moi, une #Skulltula sur une échelle près d'une cascade# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                               // /*spanish*/ Según dicen, la noche del pasado revela una #Skulltula del río# que otorga #[[1]]#.
+
+    hintTextTable[RHT_ZR_GS_TREE] = HintText(CustomMessage("They say that a spider hiding in a #tree by a river# holds #[[1]]#.",
+                                                /*german*/ "",
+                                                /*french*/ "Selon moi, une #Skulltula dans un arbre près du fleuve# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                             // /*spanish*/ Según dicen, una Skulltula escondida en el #árbol de un río# otorga #[[1]]#.
+
+    hintTextTable[RHT_ZR_GS_ABOVE_BRIDGE] = HintText(CustomMessage("They say that night in the future reveals a #spider in a river# holding #[[1]]#.",
+                                                        /*german*/ "",
+                                                        /*french*/ "Selon moi, une #Skulltula sur une façade près d'une cascade# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                     // /*spanish*/ Según dicen, la noche del futuro revela una #Skulltula del río# que otorga #[[1]]#.
+
+    hintTextTable[RHT_ZR_GS_NEAR_RAISED_GROTTOS] = HintText(CustomMessage("They say that night in the future reveals a #spider in a river# holding #[[1]]#.",
+                                                               /*german*/ "",
+                                                               /*french*/ "Selon moi, une #Skulltula sur une façade près d'une grotte du fleuve# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                            // /*spanish*/ Según dicen, la noche del futuro revela una #Skulltula del río# que otorga #[[1]]#.
+
+    hintTextTable[RHT_ZD_GS_FROZEN_WATERFALL] = HintText(CustomMessage("They say that night reveals a #spider by a frozen waterfall# holding #[[1]]#.",
+                                                            /*german*/ "",
+                                                            /*french*/ "Selon moi, une #Skulltula près d'une cascade gelée# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                         // /*spanish*/ Según dicen, la noche revela una #Skulltula junto a una congelada cascada# que otorga #[[1]]#.
+
+    hintTextTable[RHT_ZF_GS_ABOVE_THE_LOG] = HintText(CustomMessage("They say that night reveals a #spider near a deity# holding #[[1]]#.",
+                                                         /*german*/ "",
+                                                         /*french*/ "Selon moi, une #Skulltula près du gardien aquatique# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                      // /*spanish*/ Según dicen, la noche revela una #Skulltula junto a cierta deidad# que otorga #[[1]]#.
+
+    hintTextTable[RHT_ZF_GS_TREE] = HintText(CustomMessage("They say that a spider hiding in a #tree near a deity# holds #[[1]]#.",
+                                                /*german*/ "",
+                                                /*french*/ "Selon moi, une #Skulltula dans un arbre dans un réservoir# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                             // /*spanish*/ Según dicen, una Skulltula escondida en el #árbol junto a cierta deidad# otorga #[[1]]#.
+
+    hintTextTable[RHT_LH_GS_BEAN_PATCH] = HintText(CustomMessage("They say that a #spider buried by a lake# holds #[[1]]#.",
+                                                      /*german*/ "",
+                                                      /*french*/ "Selon moi, une #Skulltula enterrée près d'un lac# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                   // /*spanish*/ Según dicen, una #Skulltula enterrada junto a un lago# otorga #[[1]]#.
+
+    hintTextTable[RHT_LH_GS_SMALL_ISLAND] = HintText(CustomMessage("They say that night reveals a #spider by a lake# holding #[[1]]#.",
+                                                        /*german*/ "",
+                                                        /*french*/ "Selon moi, une #Skulltula sur un îlot du lac# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                     // /*spanish*/ Según dicen, la noche revela una #Skulltula junto a un lago# que otorga #[[1]]#.
+
+    hintTextTable[RHT_LH_GS_LAB_WALL] = HintText(CustomMessage("They say that night reveals a #spider by a lake# holding #[[1]]#.",
+                                                    /*german*/ "",
+                                                    /*french*/ "Selon moi, une #Skulltula sur le mur d'un centre de recherche# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                 // /*spanish*/ Según dicen, la noche revela una #Skulltula junto a un lago# que otorga #[[1]]#.
+
+    hintTextTable[RHT_LH_GS_LAB_CRATE] = HintText(CustomMessage("They say that a spider deed underwater in a #lab crate# holds #[[1]]#.",
+                                                     /*german*/ "",
+                                                     /*french*/ "Selon moi, une #Skulltula dans une boîte au fond d'une cuve d'eau# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                  // /*spanish*/ Según dicen, una #Skulltula bajo la sumergida caja de un laboratorio# otorga #[[1]]#.
+
+    hintTextTable[RHT_LH_GS_TREE] = HintText(CustomMessage("They say that night reveals a #spider by a lake high in a tree# holding #[[1]]#.",
+                                                /*german*/ "",
+                                                /*french*/ "Selon moi, une #Skulltula dans un grand arbre du lac# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                             // /*spanish*/ Según dicen, la noche revela #una Skulltula del lago sobre un árbol# que otorga #[[1]]#.
+
+    hintTextTable[RHT_GV_GS_BEAN_PATCH] = HintText(CustomMessage("They say that a #spider buried in a valley# holds #[[1]]#.",
+                                                      /*german*/ "",
+                                                      /*french*/ "Selon moi, une #Skulltula enterré dans une vallée# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                   // /*spanish*/ Según dicen, una #Skulltula enterrada en un valle# otorga #[[1]]#.
+
+    hintTextTable[RHT_GV_GS_SMALL_BRIDGE] = HintText(CustomMessage("They say that night in the past reveals a #spider in a valley# holding #[[1]]#.",
+                                                        /*german*/ "",
+                                                        /*french*/ "Selon moi, une #Skulltula au dessus d'une petite cascade# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                     // /*spanish*/ Según dicen, la noche del pasado revela una #Skulltula del valle# que otorga #[[1]]#.
+
+    hintTextTable[RHT_GV_GS_PILLAR] = HintText(CustomMessage("They say that night in the future reveals a #spider in a valley# holding #[[1]]#.",
+                                                  /*german*/ "",
+                                                  /*french*/ "Selon moi, une #Skulltula sur une arche de pierre dans une vallée# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                               // /*spanish*/ Según dicen, la noche del futuro revela una #Skulltula del valle# que otorga #[[1]]#.
+
+    hintTextTable[RHT_GV_GS_BEHIND_TENT] = HintText(CustomMessage("They say that night in the future reveals a #spider in a valley# holding #[[1]]#.",
+                                                       /*german*/ "",
+                                                       /*french*/ "Selon moi, une #Skulltula derrière une tente# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                    // /*spanish*/ Según dicen, la noche del futuro revela una #Skulltula del valle# que otorga #[[1]]#.
+
+    hintTextTable[RHT_GF_GS_ARCHERY_RANGE] = HintText(CustomMessage("They say that night reveals a #spider in a fortress# holding #[[1]]#.",
+                                                         /*german*/ "",
+                                                         /*french*/ "Selon moi, une #Skulltula sur une cible de tir# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                      // /*spanish*/ Según dicen, la noche revela una #Skulltula de una fortaleza# que otorga #[[1]]#.
+
+    hintTextTable[RHT_GF_GS_TOP_FLOOR] = HintText(CustomMessage("They say that night reveals a #spider in a fortress# holding #[[1]]#.",
+                                                     /*german*/ "",
+                                                     /*french*/ "Selon moi, une #Skulltula au sommet d'une forteresse# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                  // /*spanish*/ Según dicen, la noche revela una #Skulltula de una fortaleza# que otorga #[[1]]#.
+
+    hintTextTable[RHT_COLOSSUS_GS_BEAN_PATCH] = HintText(CustomMessage("They say that a #spider buried in the desert# holds #[[1]]#.",
+                                                            /*german*/ "",
+                                                            /*french*/ "Selon moi, une #Skulltula enterrée au pied du colosse# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                         // /*spanish*/ Según dicen, una #Skulltula enterrada en el desierto# otorga #[[1]]#.
+
+    hintTextTable[RHT_COLOSSUS_GS_HILL] = HintText(CustomMessage("They say that night reveals a #spider deep in the desert# holding #[[1]]#.",
+                                                      /*german*/ "",
+                                                      /*french*/ "Selon moi, une #Skulltula sur une colline dans le désert# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                   // /*spanish*/ Según dicen, la noche revela una #Skulltula en las profundidades del desierto# que otorga #[[1]]#.
+
+    hintTextTable[RHT_COLOSSUS_GS_TREE] = HintText(CustomMessage("They say that night reveals a #spider deep in the desert# holding #[[1]]#.",
+                                                      /*german*/ "",
+                                                      /*french*/ "Selon moi, une #Skulltula dans un arbre du désert# a #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                   // /*spanish*/ Según dicen, la noche revela una #Skulltula en las profundidades del desierto# que otorga #[[1]]#.
+
+    hintTextTable[RHT_KF_SHOP_ITEM_1] = HintText(CustomMessage("They say that a #child shopkeeper# sells #[[1]]#.",
+                                                    /*german*/ "",
+                                                    /*french*/ "Selon moi, la #boutique Kokiri# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                 // /*spanish*/ Según dicen, un #joven dependiente# vende #[[1]]#.
+
+    hintTextTable[RHT_KF_SHOP_ITEM_2] = HintText(CustomMessage("They say that a #child shopkeeper# sells #[[1]]#.",
+                                                    /*german*/ "",
+                                                    /*french*/ "Selon moi, la #boutique Kokiri# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                 // /*spanish*/ Según dicen, un #joven dependiente# vende #[[1]]#.
+
+    hintTextTable[RHT_KF_SHOP_ITEM_3] = HintText(CustomMessage("They say that a #child shopkeeper# sells #[[1]]#.",
+                                                    /*german*/ "",
+                                                    /*french*/ "Selon moi, la #boutique Kokiri# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                 // /*spanish*/ Según dicen, un #joven dependiente# vende #[[1]]#.
+
+    hintTextTable[RHT_KF_SHOP_ITEM_4] = HintText(CustomMessage("They say that a #child shopkeeper# sells #[[1]]#.",
+                                                    /*german*/ "",
+                                                    /*french*/ "Selon moi, la #boutique Kokiri# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                 // /*spanish*/ Según dicen, un #joven dependiente# vende #[[1]]#.
+
+    hintTextTable[RHT_KF_SHOP_ITEM_5] = HintText(CustomMessage("They say that a #child shopkeeper# sells #[[1]]#.",
+                                                    /*german*/ "",
+                                                    /*french*/ "Selon moi, la #boutique Kokiri# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                 // /*spanish*/ Según dicen, un #joven dependiente# vende #[[1]]#.
+
+    hintTextTable[RHT_KF_SHOP_ITEM_6] = HintText(CustomMessage("They say that a #child shopkeeper# sells #[[1]]#.",
+                                                    /*german*/ "",
+                                                    /*french*/ "Selon moi, la #boutique Kokiri# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                 // /*spanish*/ Según dicen, un #joven dependiente# vende #[[1]]#.
+
+    hintTextTable[RHT_KF_SHOP_ITEM_7] = HintText(CustomMessage("They say that a #child shopkeeper# sells #[[1]]#.",
+                                                    /*german*/ "",
+                                                    /*french*/ "Selon moi, la #boutique Kokiri# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                 // /*spanish*/ Según dicen, un #joven dependiente# vende #[[1]]#.
+
+    hintTextTable[RHT_KF_SHOP_ITEM_8] = HintText(CustomMessage("They say that a #child shopkeeper# sells #[[1]]#.",
+                                                    /*german*/ "",
+                                                    /*french*/ "Selon moi, la #boutique Kokiri# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                 // /*spanish*/ Según dicen, un #joven dependiente# vende #[[1]]#.
+
+    hintTextTable[RHT_KAK_POTION_SHOP_ITEM_1] = HintText(CustomMessage("They say that the #Kakariko Potion Shop# offers #[[1]]#.",
+                                                            /*german*/ "",
+                                                            /*french*/ "Selon moi, l'#apothicaire de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                         // /*spanish*/ Según dicen, la #tienda de pociones de Kakariko# ofrece #[[1]]#.
+                                                         {}, {
+                                                         CustomMessage("They say that a #potion seller# offers #[[1]]#.",
+                                                             /*german*/ "",
+                                                             /*french*/ "Selon moi, l'#apothicaire# vend #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                          // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
+
+    hintTextTable[RHT_KAK_POTION_SHOP_ITEM_2] = HintText(CustomMessage("They say that the #Kakariko Potion Shop# offers #[[1]]#.",
+                                                            /*german*/ "",
+                                                            /*french*/ "Selon moi, l'#apothicaire de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                         // /*spanish*/ Según dicen, la #tienda de pociones de Kakariko# ofrece #[[1]]#.
+                                                         {}, {
+                                                         CustomMessage("They say that a #potion seller# offers #[[1]]#.",
+                                                             /*german*/ "",
+                                                             /*french*/ "Selon moi, l'#apothicaire# vend #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                          // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
+
+    hintTextTable[RHT_KAK_POTION_SHOP_ITEM_3] = HintText(CustomMessage("They say that the #Kakariko Potion Shop# offers #[[1]]#.",
+                                                            /*german*/ "",
+                                                            /*french*/ "Selon moi, l'#apothicaire de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                         // /*spanish*/ Según dicen, la #tienda de pociones de Kakariko# ofrece #[[1]]#.
+                                                         {}, {
+                                                         CustomMessage("They say that a #potion seller# offers #[[1]]#.",
+                                                             /*german*/ "",
+                                                             /*french*/ "Selon moi, l'#apothicaire# vend #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                          // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
+
+    hintTextTable[RHT_KAK_POTION_SHOP_ITEM_4] = HintText(CustomMessage("They say that the #Kakariko Potion Shop# offers #[[1]]#.",
+                                                            /*german*/ "",
+                                                            /*french*/ "Selon moi, l'#apothicaire de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                         // /*spanish*/ Según dicen, la #tienda de pociones de Kakariko# ofrece #[[1]]#.
+                                                         {}, {
+                                                         CustomMessage("They say that a #potion seller# offers #[[1]]#.",
+                                                             /*german*/ "",
+                                                             /*french*/ "Selon moi, l'#apothicaire# vend #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                          // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
+
+    hintTextTable[RHT_KAK_POTION_SHOP_ITEM_5] = HintText(CustomMessage("They say that the #Kakariko Potion Shop# offers #[[1]]#.",
+                                                            /*german*/ "",
+                                                            /*french*/ "Selon moi, l'#apothicaire de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                         // /*spanish*/ Según dicen, la #tienda de pociones de Kakariko# ofrece #[[1]]#.
+                                                         {}, {
+                                                         CustomMessage("They say that a #potion seller# offers #[[1]]#.",
+                                                             /*german*/ "",
+                                                             /*french*/ "Selon moi, l'#apothicaire# vend #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                          // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
+
+    hintTextTable[RHT_KAK_POTION_SHOP_ITEM_6] = HintText(CustomMessage("They say that the #Kakariko Potion Shop# offers #[[1]]#.",
+                                                            /*german*/ "",
+                                                            /*french*/ "Selon moi, l'#apothicaire de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                         // /*spanish*/ Según dicen, la #tienda de pociones de Kakariko# ofrece #[[1]]#.
+                                                         {}, {
+                                                         CustomMessage("They say that a #potion seller# offers #[[1]]#.",
+                                                             /*german*/ "",
+                                                             /*french*/ "Selon moi, l'#apothicaire# vend #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                          // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
+
+    hintTextTable[RHT_KAK_POTION_SHOP_ITEM_7] = HintText(CustomMessage("They say that the #Kakariko Potion Shop# offers #[[1]]#.",
+                                                            /*german*/ "",
+                                                            /*french*/ "Selon moi, l'#apothicaire de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                         // /*spanish*/ Según dicen, la #tienda de pociones de Kakariko# ofrece #[[1]]#.
+                                                         {}, {
+                                                         CustomMessage("They say that a #potion seller# offers #[[1]]#.",
+                                                             /*german*/ "",
+                                                             /*french*/ "Selon moi, l'#apothicaire# vend #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                          // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
+
+    hintTextTable[RHT_KAK_POTION_SHOP_ITEM_8] = HintText(CustomMessage("They say that the #Kakariko Potion Shop# offers #[[1]]#.",
+                                                            /*german*/ "",
+                                                            /*french*/ "Selon moi, l'#apothicaire de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                         // /*spanish*/ Según dicen, la #tienda de pociones de Kakariko# ofrece #[[1]]#.
+                                                         {}, {
+                                                         CustomMessage("They say that a #potion seller# offers #[[1]]#.",
+                                                             /*german*/ "",
+                                                             /*french*/ "Selon moi, l'#apothicaire# vend #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                          // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
+
+    hintTextTable[RHT_MARKET_BOMBCHU_SHOP_ITEM_1] = HintText(CustomMessage("They say that a #Bombchu merchant# sells #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, le #marchand de Missiles# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                             // /*spanish*/ Según dicen, un #mercader de bombchus# vende #[[1]]#.
+
+    hintTextTable[RHT_MARKET_BOMBCHU_SHOP_ITEM_2] = HintText(CustomMessage("They say that a #Bombchu merchant# sells #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, le #marchand de Missiles# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                             // /*spanish*/ Según dicen, un #mercader de bombchus# vende #[[1]]#.
+
+    hintTextTable[RHT_MARKET_BOMBCHU_SHOP_ITEM_3] = HintText(CustomMessage("They say that a #Bombchu merchant# sells #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, le #marchand de Missiles# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                             // /*spanish*/ Según dicen, un #mercader de bombchus# vende #[[1]]#.
+
+    hintTextTable[RHT_MARKET_BOMBCHU_SHOP_ITEM_4] = HintText(CustomMessage("They say that a #Bombchu merchant# sells #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, le #marchand de Missiles# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                             // /*spanish*/ Según dicen, un #mercader de bombchus# vende #[[1]]#.
+
+    hintTextTable[RHT_MARKET_BOMBCHU_SHOP_ITEM_5] = HintText(CustomMessage("They say that a #Bombchu merchant# sells #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, le #marchand de Missiles# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                             // /*spanish*/ Según dicen, un #mercader de bombchus# vende #[[1]]#.
+
+    hintTextTable[RHT_MARKET_BOMBCHU_SHOP_ITEM_6] = HintText(CustomMessage("They say that a #Bombchu merchant# sells #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, le #marchand de Missiles# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                             // /*spanish*/ Según dicen, un #mercader de bombchus# vende #[[1]]#.
+
+    hintTextTable[RHT_MARKET_BOMBCHU_SHOP_ITEM_7] = HintText(CustomMessage("They say that a #Bombchu merchant# sells #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, le #marchand de Missiles# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                             // /*spanish*/ Según dicen, un #mercader de bombchus# vende #[[1]]#.
+
+    hintTextTable[RHT_MARKET_BOMBCHU_SHOP_ITEM_8] = HintText(CustomMessage("They say that a #Bombchu merchant# sells #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, le #marchand de Missiles# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                             // /*spanish*/ Según dicen, un #mercader de bombchus# vende #[[1]]#.
+
+    hintTextTable[RHT_MARKET_POTION_SHOP_ITEM_1] = HintText(CustomMessage("They say that the #Market Potion Shop# offers #[[1]]#.",
+                                                               /*german*/ "",
+                                                               /*french*/ "Selon moi, l'#apothicaire dans la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                            // /*spanish*/ Según dicen, la #tienda de pociones del mercado# ofrece #[[1]]#.
+                                                            {}, {
+                                                            CustomMessage("They say that a #potion seller# offers #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, l'#apothicaire# vend #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                             // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
+
+    hintTextTable[RHT_MARKET_POTION_SHOP_ITEM_2] = HintText(CustomMessage("They say that the #Market Potion Shop# offers #[[1]]#.",
+                                                               /*german*/ "",
+                                                               /*french*/ "Selon moi, l'#apothicaire dans la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                            // /*spanish*/ Según dicen, la #tienda de pociones del mercado# ofrece #[[1]]#.
+                                                            {}, {
+                                                            CustomMessage("They say that a #potion seller# offers #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, l'#apothicaire# vend #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                             // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
+
+    hintTextTable[RHT_MARKET_POTION_SHOP_ITEM_3] = HintText(CustomMessage("They say that the #Market Potion Shop# offers #[[1]]#.",
+                                                               /*german*/ "",
+                                                               /*french*/ "Selon moi, l'#apothicaire dans la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                            // /*spanish*/ Según dicen, la #tienda de pociones del mercado# ofrece #[[1]]#.
+                                                            {}, {
+                                                            CustomMessage("They say that a #potion seller# offers #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, l'#apothicaire# vend #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                             // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
+
+    hintTextTable[RHT_MARKET_POTION_SHOP_ITEM_4] = HintText(CustomMessage("They say that the #Market Potion Shop# offers #[[1]]#.",
+                                                               /*german*/ "",
+                                                               /*french*/ "Selon moi, l'#apothicaire dans la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                            // /*spanish*/ Según dicen, la #tienda de pociones del mercado# ofrece #[[1]]#.
+                                                            {}, {
+                                                            CustomMessage("They say that a #potion seller# offers #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, l'#apothicaire# vend #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                             // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
+
+    hintTextTable[RHT_MARKET_POTION_SHOP_ITEM_5] = HintText(CustomMessage("They say that the #Market Potion Shop# offers #[[1]]#.",
+                                                               /*german*/ "",
+                                                               /*french*/ "Selon moi, l'#apothicaire dans la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                            // /*spanish*/ Según dicen, la #tienda de pociones del mercado# ofrece #[[1]]#.
+                                                            {}, {
+                                                            CustomMessage("They say that a #potion seller# offers #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, l'#apothicaire# vend #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                             // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
+
+    hintTextTable[RHT_MARKET_POTION_SHOP_ITEM_6] = HintText(CustomMessage("They say that the #Market Potion Shop# offers #[[1]]#.",
+                                                               /*german*/ "",
+                                                               /*french*/ "Selon moi, l'#apothicaire dans la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                            // /*spanish*/ Según dicen, la #tienda de pociones del mercado# ofrece #[[1]]#.
+                                                            {}, {
+                                                            CustomMessage("They say that a #potion seller# offers #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, l'#apothicaire# vend #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                             // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
+
+    hintTextTable[RHT_MARKET_POTION_SHOP_ITEM_7] = HintText(CustomMessage("They say that the #Market Potion Shop# offers #[[1]]#.",
+                                                               /*german*/ "",
+                                                               /*french*/ "Selon moi, l'#apothicaire dans la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                            // /*spanish*/ Según dicen, la #tienda de pociones del mercado# ofrece #[[1]]#.
+                                                            {}, {
+                                                            CustomMessage("They say that a #potion seller# offers #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, l'#apothicaire# vend #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                             // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
+
+    hintTextTable[RHT_MARKET_POTION_SHOP_ITEM_8] = HintText(CustomMessage("They say that the #Market Potion Shop# offers #[[1]]#.",
+                                                               /*german*/ "",
+                                                               /*french*/ "Selon moi, l'#apothicaire dans la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                            // /*spanish*/ Según dicen, la #tienda de pociones del mercado# ofrece #[[1]]#.
+                                                            {}, {
+                                                            CustomMessage("They say that a #potion seller# offers #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, l'#apothicaire# vend #[[1]]#.", {QM_RED, QM_GREEN})});
+                                                             // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
+
+    hintTextTable[RHT_MARKET_BAZAAR_ITEM_1] = HintText(CustomMessage("They say that the #Market Bazaar# offers #[[1]]#.",
+                                                          /*german*/ "",
+                                                          /*french*/ "Selon moi, le #bazar de la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                       // /*spanish*/ Según dicen, el #bazar del mercado# ofrece #[[1]]#.
+
+    hintTextTable[RHT_MARKET_BAZAAR_ITEM_2] = HintText(CustomMessage("They say that the #Market Bazaar# offers #[[1]]#.",
+                                                          /*german*/ "",
+                                                          /*french*/ "Selon moi, le #bazar de la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                       // /*spanish*/ Según dicen, el #bazar del mercado# ofrece #[[1]]#.
+
+    hintTextTable[RHT_MARKET_BAZAAR_ITEM_3] = HintText(CustomMessage("They say that the #Market Bazaar# offers #[[1]]#.",
+                                                          /*german*/ "",
+                                                          /*french*/ "Selon moi, le #bazar de la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                       // /*spanish*/ Según dicen, el #bazar del mercado# ofrece #[[1]]#.
+
+    hintTextTable[RHT_MARKET_BAZAAR_ITEM_4] = HintText(CustomMessage("They say that the #Market Bazaar# offers #[[1]]#.",
+                                                          /*german*/ "",
+                                                          /*french*/ "Selon moi, le #bazar de la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                       // /*spanish*/ Según dicen, el #bazar del mercado# ofrece #[[1]]#.
+
+    hintTextTable[RHT_MARKET_BAZAAR_ITEM_5] = HintText(CustomMessage("They say that the #Market Bazaar# offers #[[1]]#.",
+                                                          /*german*/ "",
+                                                          /*french*/ "Selon moi, le #bazar de la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                       // /*spanish*/ Según dicen, el #bazar del mercado# ofrece #[[1]]#.
+
+    hintTextTable[RHT_MARKET_BAZAAR_ITEM_6] = HintText(CustomMessage("They say that the #Market Bazaar# offers #[[1]]#.",
+                                                          /*german*/ "",
+                                                          /*french*/ "Selon moi, le #bazar de la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                       // /*spanish*/ Según dicen, el #bazar del mercado# ofrece #[[1]]#.
+
+    hintTextTable[RHT_MARKET_BAZAAR_ITEM_7] = HintText(CustomMessage("They say that the #Market Bazaar# offers #[[1]]#.",
+                                                          /*german*/ "",
+                                                          /*french*/ "Selon moi, le #bazar de la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                       // /*spanish*/ Según dicen, el #bazar del mercado# ofrece #[[1]]#.
+
+    hintTextTable[RHT_MARKET_BAZAAR_ITEM_8] = HintText(CustomMessage("They say that the #Market Bazaar# offers #[[1]]#.",
+                                                          /*german*/ "",
+                                                          /*french*/ "Selon moi, le #bazar de la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                       // /*spanish*/ Según dicen, el #bazar del mercado# ofrece #[[1]]#.
+
+    hintTextTable[RHT_KAK_BAZAAR_ITEM_1] = HintText(CustomMessage("They say that the #Kakariko Bazaar# offers #[[1]]#.",
+                                                       /*german*/ "",
+                                                       /*french*/ "Selon moi, le #bazar de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                    // /*spanish*/ Según dicen, el #bazar de Kakariko# ofrece #[[1]]#.
+
+    hintTextTable[RHT_KAK_BAZAAR_ITEM_2] = HintText(CustomMessage("They say that the #Kakariko Bazaar# offers #[[1]]#.",
+                                                       /*german*/ "",
+                                                       /*french*/ "Selon moi, le #bazar de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                    // /*spanish*/ Según dicen, el #bazar de Kakariko# ofrece #[[1]]#.
+
+    hintTextTable[RHT_KAK_BAZAAR_ITEM_3] = HintText(CustomMessage("They say that the #Kakariko Bazaar# offers #[[1]]#.",
+                                                       /*german*/ "",
+                                                       /*french*/ "Selon moi, le #bazar de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                    // /*spanish*/ Según dicen, el #bazar de Kakariko# ofrece #[[1]]#.
+
+    hintTextTable[RHT_KAK_BAZAAR_ITEM_4] = HintText(CustomMessage("They say that the #Kakariko Bazaar# offers #[[1]]#.",
+                                                       /*german*/ "",
+                                                       /*french*/ "Selon moi, le #bazar de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                    // /*spanish*/ Según dicen, el #bazar de Kakariko# ofrece #[[1]]#.
+
+    hintTextTable[RHT_KAK_BAZAAR_ITEM_5] = HintText(CustomMessage("They say that the #Kakariko Bazaar# offers #[[1]]#.",
+                                                       /*german*/ "",
+                                                       /*french*/ "Selon moi, le #bazar de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                    // /*spanish*/ Según dicen, el #bazar de Kakariko# ofrece #[[1]]#.
+
+    hintTextTable[RHT_KAK_BAZAAR_ITEM_6] = HintText(CustomMessage("They say that the #Kakariko Bazaar# offers #[[1]]#.",
+                                                       /*german*/ "",
+                                                       /*french*/ "Selon moi, le #bazar de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                    // /*spanish*/ Según dicen, el #bazar de Kakariko# ofrece #[[1]]#.
+
+    hintTextTable[RHT_KAK_BAZAAR_ITEM_7] = HintText(CustomMessage("They say that the #Kakariko Bazaar# offers #[[1]]#.",
+                                                       /*german*/ "",
+                                                       /*french*/ "Selon moi, le #bazar de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                    // /*spanish*/ Según dicen, el #bazar de Kakariko# ofrece #[[1]]#.
+
+    hintTextTable[RHT_KAK_BAZAAR_ITEM_8] = HintText(CustomMessage("They say that the #Kakariko Bazaar# offers #[[1]]#.",
+                                                       /*german*/ "",
+                                                       /*french*/ "Selon moi, le #bazar de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                    // /*spanish*/ Según dicen, el #bazar de Kakariko# ofrece #[[1]]#.
+
+    hintTextTable[RHT_ZD_SHOP_ITEM_1] = HintText(CustomMessage("They say that a #Zora shopkeeper# sells #[[1]]#.",
+                                                    /*german*/ "",
+                                                    /*french*/ "Selon moi, la #boutique Zora# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                 // /*spanish*/ Según dicen, el #dependiente Zora# vende #[[1]]#.
+
+    hintTextTable[RHT_ZD_SHOP_ITEM_2] = HintText(CustomMessage("They say that a #Zora shopkeeper# sells #[[1]]#.",
+                                                    /*german*/ "",
+                                                    /*french*/ "Selon moi, la #boutique Zora# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                 // /*spanish*/ Según dicen, el #dependiente Zora# vende #[[1]]#.
+
+    hintTextTable[RHT_ZD_SHOP_ITEM_3] = HintText(CustomMessage("They say that a #Zora shopkeeper# sells #[[1]]#.",
+                                                    /*german*/ "",
+                                                    /*french*/ "Selon moi, la #boutique Zora# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                 // /*spanish*/ Según dicen, el #dependiente Zora# vende #[[1]]#.
+
+    hintTextTable[RHT_ZD_SHOP_ITEM_4] = HintText(CustomMessage("They say that a #Zora shopkeeper# sells #[[1]]#.",
+                                                    /*german*/ "",
+                                                    /*french*/ "Selon moi, la #boutique Zora# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                 // /*spanish*/ Según dicen, el #dependiente Zora# vende #[[1]]#.
+
+    hintTextTable[RHT_ZD_SHOP_ITEM_5] = HintText(CustomMessage("They say that a #Zora shopkeeper# sells #[[1]]#.",
+                                                    /*german*/ "",
+                                                    /*french*/ "Selon moi, la #boutique Zora# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                 // /*spanish*/ Según dicen, el #dependiente Zora# vende #[[1]]#.
+
+    hintTextTable[RHT_ZD_SHOP_ITEM_6] = HintText(CustomMessage("They say that a #Zora shopkeeper# sells #[[1]]#.",
+                                                    /*german*/ "",
+                                                    /*french*/ "Selon moi, la #boutique Zora# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                 // /*spanish*/ Según dicen, el #dependiente Zora# vende #[[1]]#.
+
+    hintTextTable[RHT_ZD_SHOP_ITEM_7] = HintText(CustomMessage("They say that a #Zora shopkeeper# sells #[[1]]#.",
+                                                    /*german*/ "",
+                                                    /*french*/ "Selon moi, la #boutique Zora# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                 // /*spanish*/ Según dicen, el #dependiente Zora# vende #[[1]]#.
+
+    hintTextTable[RHT_ZD_SHOP_ITEM_8] = HintText(CustomMessage("They say that a #Zora shopkeeper# sells #[[1]]#.",
+                                                    /*german*/ "",
+                                                    /*french*/ "Selon moi, la #boutique Zora# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                 // /*spanish*/ Según dicen, el #dependiente Zora# vende #[[1]]#.
+
+    hintTextTable[RHT_GC_SHOP_ITEM_1] = HintText(CustomMessage("They say that a #Goron shopkeeper# sells #[[1]]#.",
+                                                    /*german*/ "",
+                                                    /*french*/ "Selon moi, la #boutique Goron# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                 // /*spanish*/ Según dicen, el #dependiente Goron# vende #[[1]]#.
+
+    hintTextTable[RHT_GC_SHOP_ITEM_2] = HintText(CustomMessage("They say that a #Goron shopkeeper# sells #[[1]]#.",
+                                                    /*german*/ "",
+                                                    /*french*/ "Selon moi, la #boutique Goron# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                 // /*spanish*/ Según dicen, el #dependiente Goron# vende #[[1]]#.
+
+    hintTextTable[RHT_GC_SHOP_ITEM_3] = HintText(CustomMessage("They say that a #Goron shopkeeper# sells #[[1]]#.",
+                                                    /*german*/ "",
+                                                    /*french*/ "Selon moi, la #boutique Goron# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                 // /*spanish*/ Según dicen, el #dependiente Goron# vende #[[1]]#.
+
+    hintTextTable[RHT_GC_SHOP_ITEM_4] = HintText(CustomMessage("They say that a #Goron shopkeeper# sells #[[1]]#.",
+                                                    /*german*/ "",
+                                                    /*french*/ "Selon moi, la #boutique Goron# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                 // /*spanish*/ Según dicen, el #dependiente Goron# vende #[[1]]#.
+
+    hintTextTable[RHT_GC_SHOP_ITEM_5] = HintText(CustomMessage("They say that a #Goron shopkeeper# sells #[[1]]#.",
+                                                    /*german*/ "",
+                                                    /*french*/ "Selon moi, la #boutique Goron# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                 // /*spanish*/ Según dicen, el #dependiente Goron# vende #[[1]]#.
+
+    hintTextTable[RHT_GC_SHOP_ITEM_6] = HintText(CustomMessage("They say that a #Goron shopkeeper# sells #[[1]]#.",
+                                                    /*german*/ "",
+                                                    /*french*/ "Selon moi, la #boutique Goron# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                 // /*spanish*/ Según dicen, el #dependiente Goron# vende #[[1]]#.
+
+    hintTextTable[RHT_GC_SHOP_ITEM_7] = HintText(CustomMessage("They say that a #Goron shopkeeper# sells #[[1]]#.",
+                                                    /*german*/ "",
+                                                    /*french*/ "Selon moi, la #boutique Goron# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                 // /*spanish*/ Según dicen, el #dependiente Goron# vende #[[1]]#.
+
+    hintTextTable[RHT_GC_SHOP_ITEM_8] = HintText(CustomMessage("They say that a #Goron shopkeeper# sells #[[1]]#.",
+                                                    /*german*/ "",
+                                                    /*french*/ "Selon moi, la #boutique Goron# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                 // /*spanish*/ Según dicen, el #dependiente Goron# vende #[[1]]#.
+
+    hintTextTable[RHT_HF_DEKU_SCRUB_GROTTO] = HintText(CustomMessage("They say that a lonely #scrub in a hole# sells #[[1]]#.",
+                                                          /*german*/ "",
+                                                          /*french*/ "Selon moi, la #peste Mojo dans une grotte de la plaine# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                       // /*spanish*/ Según dicen, un #singular deku bajo un hoyo# de la llanura vende #[[1]]#.
+
+    hintTextTable[RHT_LLR_DEKU_SCRUB_GROTTO_LEFT] = HintText(CustomMessage("They say that a #trio of scrubs# sells #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, le #trio de peste Mojo à la ferme# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                             // /*spanish*/ Según dicen, un #trío de dekus# de una granja venden #[[1]]#.
+
+    hintTextTable[RHT_LLR_DEKU_SCRUB_GROTTO_RIGHT] = HintText(CustomMessage("They say that a #trio of scrubs# sells #[[1]]#.",
+                                                                 /*german*/ "",
+                                                                 /*french*/ "Selon moi, le #trio de peste Mojo à la ferme# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                              // /*spanish*/ Según dicen, un #trío de dekus# de una granja venden #[[1]]#.
+
+    hintTextTable[RHT_LLR_DEKU_SCRUB_GROTTO_CENTER] = HintText(CustomMessage("They say that a #trio of scrubs# sells #[[1]]#.",
+                                                                  /*german*/ "",
+                                                                  /*french*/ "Selon moi, le #trio de peste Mojo à la ferme# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                               // /*spanish*/ Según dicen, un #trío de dekus# de una granja venden #[[1]]#.
+
+    hintTextTable[RHT_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT] = HintText(CustomMessage("They say that a pair of #scrubs in the woods# sells #[[1]]#.",
+                                                                           /*german*/ "",
+                                                                           /*french*/ "Selon moi, le #duo de peste Mojo près du théâtre# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                        // /*spanish*/ Según dicen, un par de #dekus del bosque# venden #[[1]]#.
+
+    hintTextTable[RHT_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT] = HintText(CustomMessage("They say that a pair of #scrubs in the woods# sells #[[1]]#.",
+                                                                          /*german*/ "",
+                                                                          /*french*/ "Selon moi, le #duo de peste Mojo près du théâtre# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                       // /*spanish*/ Según dicen, un par de #dekus del bosque# venden #[[1]]#.
+
+    hintTextTable[RHT_LW_DEKU_SCRUB_NEAR_BRIDGE] = HintText(CustomMessage("They say that a #scrub by a bridge# sells #[[1]]#.",
+                                                               /*german*/ "",
+                                                               /*french*/ "Selon moi, la #peste Mojo près du pont dans les bois# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                            // /*spanish*/ Según dicen, un #deku bajo un puente# del bosque venden #[[1]]#.
+
+    hintTextTable[RHT_LW_DEKU_SCRUB_GROTTO_REAR] = HintText(CustomMessage("They say that a #scrub underground duo# sells #[[1]]#.",
+                                                               /*german*/ "",
+                                                               /*french*/ "Selon moi, le #duo de peste Mojo dans les sous-bois# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                            // /*spanish*/ Según dicen, un #par de dekus subterráneos# del bosque venden #[[1]]#.
+
+    hintTextTable[RHT_LW_DEKU_SCRUB_GROTTO_FRONT] = HintText(CustomMessage("They say that a #scrub underground duo# sells #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, le #duo de peste Mojo dans les sous-bois# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                             // /*spanish*/ Según dicen, un #par de dekus subterráneos# del bosque venden #[[1]]#.
+
+    hintTextTable[RHT_SFM_DEKU_SCRUB_GROTTO_REAR] = HintText(CustomMessage("They say that a #scrub underground duo# sells #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, le #duo de peste Mojo au cœur du sanctuaire sylvestre# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                             // /*spanish*/ Según dicen, un #par de dekus subterráneos# de la pradera sagrada venden #[[1]]#.
+
+    hintTextTable[RHT_SFM_DEKU_SCRUB_GROTTO_FRONT] = HintText(CustomMessage("They say that a #scrub underground duo# sells #[[1]]#.",
+                                                                 /*german*/ "",
+                                                                 /*french*/ "Selon moi, le #duo de peste Mojo au cœur du sanctuaire sylvestre# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                              // /*spanish*/ Según dicen, un #par de dekus subterráneos# de la pradera sagrada venden #[[1]]#.
+
+    hintTextTable[RHT_GC_DEKU_SCRUB_GROTTO_LEFT] = HintText(CustomMessage("They say that a #trio of scrubs# sells #[[1]]#.",
+                                                               /*german*/ "",
+                                                               /*french*/ "Selon moi, le #trio de peste Mojo dans le village Goron# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                            // /*spanish*/ Según dicen, un #trío de dekus# de la Ciudad Goron venden #[[1]]#.
+
+    hintTextTable[RHT_GC_DEKU_SCRUB_GROTTO_RIGHT] = HintText(CustomMessage("They say that a #trio of scrubs# sells #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, le #trio de peste Mojo dans le village Goron# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                             // /*spanish*/ Según dicen, un #trío de dekus# de la Ciudad Goron venden #[[1]]#.
+
+    hintTextTable[RHT_GC_DEKU_SCRUB_GROTTO_CENTER] = HintText(CustomMessage("They say that a #trio of scrubs# sells #[[1]]#.",
+                                                                 /*german*/ "",
+                                                                 /*french*/ "Selon moi, le #trio de peste Mojo dans le village Goron# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                              // /*spanish*/ Según dicen, un #trío de dekus# de la Ciudad Goron venden #[[1]]#.
+
+    hintTextTable[RHT_DMC_DEKU_SCRUB_GROTTO_LEFT] = HintText(CustomMessage("They say that a #trio of scrubs# sells #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, le #trio de peste Mojo dans le volcan# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                             // /*spanish*/ Según dicen, un #trío de dekus# del volcán venden #[[1]]#.
+
+    hintTextTable[RHT_DMC_DEKU_SCRUB_GROTTO_RIGHT] = HintText(CustomMessage("They say that a #trio of scrubs# sells #[[1]]#.",
+                                                                 /*german*/ "",
+                                                                 /*french*/ "Selon moi, le #trio de peste Mojo dans le volcan# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                              // /*spanish*/ Según dicen, un #trío de dekus# del volcán venden #[[1]]#.
+
+    hintTextTable[RHT_DMC_DEKU_SCRUB_GROTTO_CENTER] = HintText(CustomMessage("They say that a #trio of scrubs# sells #[[1]]#.",
+                                                                  /*german*/ "",
+                                                                  /*french*/ "Selon moi, le #trio de peste Mojo dans le volcan# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                               // /*spanish*/ Según dicen, un #trío de dekus# del volcán venden #[[1]]#.
+
+    hintTextTable[RHT_ZR_DEKU_SCRUB_GROTTO_REAR] = HintText(CustomMessage("They say that a #scrub underground duo# sells #[[1]]#.",
+                                                               /*german*/ "",
+                                                               /*french*/ "Selon moi, le #duo de peste Mojo près du fleuve# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                            // /*spanish*/ Según dicen, un #par de dekus subterráneos# del río venden #[[1]]#.
+
+    hintTextTable[RHT_ZR_DEKU_SCRUB_GROTTO_FRONT] = HintText(CustomMessage("They say that a #scrub underground duo# sells #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, le #duo de peste Mojo près du fleuve# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                             // /*spanish*/ Según dicen, un #par de dekus subterráneos# del río venden #[[1]]#.
+
+    hintTextTable[RHT_LH_DEKU_SCRUB_GROTTO_LEFT] = HintText(CustomMessage("They say that a #trio of scrubs# sells #[[1]]#.",
+                                                               /*german*/ "",
+                                                               /*french*/ "Selon moi, le #trio de peste Mojo près du lac# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                            // /*spanish*/ Según dicen, un #trío de dekus# del lago venden #[[1]]#.
+
+    hintTextTable[RHT_LH_DEKU_SCRUB_GROTTO_RIGHT] = HintText(CustomMessage("They say that a #trio of scrubs# sells #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, le #trio de peste Mojo près du lac# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                             // /*spanish*/ Según dicen, un #trío de dekus# del lago venden #[[1]]#.
+
+    hintTextTable[RHT_LH_DEKU_SCRUB_GROTTO_CENTER] = HintText(CustomMessage("They say that a #trio of scrubs# sells #[[1]]#.",
+                                                                 /*german*/ "",
+                                                                 /*french*/ "Selon moi, le #trio de peste Mojo près du lac# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                              // /*spanish*/ Según dicen, un #trío de dekus# del lago venden #[[1]]#.
+
+    hintTextTable[RHT_GV_DEKU_SCRUB_GROTTO_REAR] = HintText(CustomMessage("They say that a #scrub underground duo# sells #[[1]]#.",
+                                                               /*german*/ "",
+                                                               /*french*/ "Selon moi, le #duo de peste Mojo près de la vallée# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                            // /*spanish*/ Según dicen, un #par de dekus subterráneos# del valle venden #[[1]]#.
+
+    hintTextTable[RHT_GV_DEKU_SCRUB_GROTTO_FRONT] = HintText(CustomMessage("They say that a #scrub underground duo# sells #[[1]]#.",
+                                                                /*german*/ "",
+                                                                /*french*/ "Selon moi, le #duo de peste Mojo près de la vallée# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                             // /*spanish*/ Según dicen, un #par de dekus subterráneos# del valle venden #[[1]]#.
+
+    hintTextTable[RHT_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT] = HintText(CustomMessage("They say that a #scrub underground duo# sells #[[1]]#.",
+                                                                      /*german*/ "",
+                                                                      /*french*/ "Selon moi, le #duo de peste Mojo dans le désert# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                   // /*spanish*/ Según dicen, un #par de dekus subterráneos# del desierto venden #[[1]]#.
+
+    hintTextTable[RHT_COLOSSUS_DEKU_SCRUB_GROTTO_REAR] = HintText(CustomMessage("They say that a #scrub underground duo# sells #[[1]]#.",
+                                                                     /*german*/ "",
+                                                                     /*french*/ "Selon moi, le #duo de peste Mojo dans le désert# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                  // /*spanish*/ Según dicen, un #par de dekus subterráneos# del desierto venden #[[1]]#.
+
+    hintTextTable[RHT_LLR_STABLES_LEFT_COW] = HintText(CustomMessage("They say that a #cow in a stable# gifts #[[1]]#.",
+                                                          /*german*/ "",
+                                                          /*french*/ "Selon moi, la #vache dans l'étable# donne #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                       // /*spanish*/ Según dicen, una #vaca del establo# brinda #[[1]]#.
+
+    hintTextTable[RHT_LLR_STABLES_RIGHT_COW] = HintText(CustomMessage("They say that a #cow in a stable# gifts #[[1]]#.",
+                                                           /*german*/ "",
+                                                           /*french*/ "Selon moi, la #vache dans l'étable# donne #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                        // /*spanish*/ Según dicen, una #vaca del establo# brinda #[[1]]#.
+
+    hintTextTable[RHT_LLR_TOWER_RIGHT_COW] = HintText(CustomMessage("They say that a #cow in a ranch silo# gifts #[[1]]#.",
+                                                         /*german*/ "",
+                                                         /*french*/ "Selon moi, la #vache dans le silo de la ferme# donne #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                      // /*spanish*/ Según dicen, una #vaca del granero# brinda #[[1]]#.
+
+    hintTextTable[RHT_LLR_TOWER_LEFT_COW] = HintText(CustomMessage("They say that a #cow in a ranch silo# gifts #[[1]]#.",
+                                                        /*german*/ "",
+                                                        /*french*/ "Selon moi, la #vache dans le silo de la ferme# donne #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                     // /*spanish*/ Según dicen, una #vaca del granero# brinda #[[1]]#.
+
+    hintTextTable[RHT_KAK_IMPAS_HOUSE_COW] = HintText(CustomMessage("They say that a #cow imprisoned in a house# protects #[[1]]#.",
+                                                         /*german*/ "",
+                                                         /*french*/ "Selon moi, la #vache en cage# donne #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                      // /*spanish*/ Según dicen, una #vaca enjaulada de una casa# brinda #[[1]]#.
+
+    hintTextTable[RHT_DMT_COW_GROTTO_COW] = HintText(CustomMessage("They say that a #cow in a luxurious hole# offers #[[1]]#.",
+                                                        /*german*/ "",
+                                                        /*french*/ "Selon moi, la #vache dans une grotte luxueuse# donne #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                     // /*spanish*/ Según dicen, una #vaca de un lujoso hoyo# brinda #[[1]]#.
+
+    hintTextTable[RHT_BEEHIVE_CHEST_GROTTO] = HintText(CustomMessage("They say that a #beehive above a chest# hides #[[1]]#.",
+                                                          /*german*/ "",
+                                                          /*french*/ "Selon moi,  #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                       // /*spanish*/ Según dicen, una #colmena sobre un cofre# esconde #[[1]]#.
+
+    hintTextTable[RHT_BEEHIVE_LONELY_SCRUB_GROTTO] = HintText(CustomMessage("They say that a #beehive above a lonely scrub# hides #[[1]]#.",
+                                                                 /*german*/ "",
+                                                                 /*french*/ "Selon moi,  #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                              // /*spanish*/ Según dicen, una #colmena sobre un deku solitario# esconde #[[1]]#.
+
+    hintTextTable[RHT_BEEHIVE_SCRUB_PAIR_GROTTO] = HintText(CustomMessage("They say that a #beehive above a pair of scrubs# hides #[[1]]#.",
+                                                               /*german*/ "",
+                                                               /*french*/ "Selon moi,  #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                            // /*spanish*/ Según dicen, una #colmena sobre un par de dekus# esconde #[[1]]#.
+
+    hintTextTable[RHT_BEEHIVE_SCRUB_TRIO_GROTTO] = HintText(CustomMessage("They say that a #beehive above a trio of scrubs# hides #[[1]]#.",
+                                                               /*german*/ "",
+                                                               /*french*/ "Selon moi,  #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                            // /*spanish*/ Según dicen, una #colmena sobre un trío de dekus# esconde #[[1]]#.
+
+    hintTextTable[RHT_BEEHIVE_COW_GROTTO] = HintText(CustomMessage("They say that a #beehive above a cow# hides #[[1]]#.",
+                                                        /*german*/ "",
+                                                        /*french*/ "Selon moi,  #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                     // /*spanish*/ Según dicen, una #colmena sobre una vaca# esconde #[[1]]#.
+
+    hintTextTable[RHT_BEEHIVE_IN_FRONT_OF_KING_ZORA] = HintText(CustomMessage("They say that a #beehive in front of the king of the zoras# hides #[[1]]#.",
+                                                                   /*german*/ "",
+                                                                   /*french*/ "Selon moi,  #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                // /*spanish*/ Según dicen, una #colmena delante del rey de los zoras# esconde #[[1]]#.
+
+    hintTextTable[RHT_BEEHIVE_BEHIND_KING_ZORA] = HintText(CustomMessage("They say that a #beehive behind the king of the zoras# hides #[[1]]#.",
+                                                              /*german*/ "",
+                                                              /*french*/ "Selon moi,  #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                           // /*spanish*/ Según dicen, una #colmena detrás del rey de los zoras# esconde #[[1]]#.
+}
 }
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp
index be20b95a3..e99b6fd71 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp
@@ -1,2142 +1,2084 @@
-#include "../hint_list.hpp"
-
-void HintTable_Init_Item() {
-    hintTable[RHT_KOKIRI_SWORD] = HintText::Item({
-                       //obscure text
-                       Text{"a butter knife",    /*french*/"un couteau à beurre",  /*spanish*/"un ágil puñal"},
-                       Text{"a starter slasher", /*french*/"une arme de débutant", /*spanish*/"una hoja de principiantes"},
-                       Text{"a switchblade",     /*french*/"un canif",             /*spanish*/"una navaja"},
-                     }, {
-                       //ambiguous text
-                       Text{"a sword", /*french*/"une épée", /*spanish*/"una espada"},
-                     },
-                       //clear text
-                       Text{"the Kokiri Sword", /*french*/"l'Épée Kokiri", /*spanish*/"la Espada Kokiri"}
-    );
-
-    hintTable[RHT_MASTER_SWORD] = HintText::Item({
-                       //obscure text
-                       Text{"evil's bane",        /*french*/"le fléau du mal",       /*spanish*/"la destructora del mal"},
-                       Text{"a seven year limbo", /*french*/"une stase de sept ans",  /*spanish*/"unos siete años de espera"},
-                     }, {
-                       //ambiguous text
-                       Text{"a sword", /*french*/"une épée", /*spanish*/"una espada"},
-                     },
-                       //clear text
-                       Text{"the Master Sword", /*french*/"l'Épée de Légende", /*spanish*/"la Espada Maestra"}
-    );
-
-    hintTable[RHT_GIANTS_KNIFE] = HintText::Item({
-                       //obscure text
-                       Text{"a fragile blade",     /*french*/"une lame fragile",    /*spanish*/"una frágil hoja"},
-                       Text{"a breakable cleaver", /*french*/"un espadon de verre", /*spanish*/"un rompible acero"},
-                     }, {
-                       //ambiguous text
-                       Text{"a sword", /*french*/"une épée", /*spanish*/"una espada"},
-                     },
-                       //clear text
-                       Text{"the Giant's Knife", /*french*/"la Lame des Géants", /*spanish*/"la daga gigante"}
-    );
-
-    hintTable[RHT_BIGGORON_SWORD] = HintText::Item({
-                       //obscure text
-                       Text{"the biggest blade",  /*french*/"une lame gigantesque", /*spanish*/"el mayor mandoble"},
-                       Text{"a colossal cleaver", /*french*/"un espadon colossal",  /*spanish*/"un estoque colosal"},
-                     }, {
-                       //ambiguous text
-                       Text{"a sword", /*french*/"une épée", /*spanish*/"una espada"},
-                     },
-                       //clear text
-                       Text{"the Biggoron Sword", /*french*/"l'Épée de Biggoron", /*spanish*/"la Espada de Biggoron"}
-    );
-
-    hintTable[RHT_DEKU_SHIELD] = HintText::Item({
-                       //obscure text
-                       Text{"a wooden ward",      /*french*/"un écu d'écorce",            /*spanish*/"una protección del bosque"},
-                       Text{"a burnable barrier", /*french*/"une protection inflammable", /*spanish*/"una barrera quemable"},
-                     }, {
-                       //ambiguous text
-                       Text{"a shield", /*french*/"un bouclier", /*spanish*/"un escudo"},
-                     },
-                       //clear text
-                       Text{"a Deku Shield", /*french*/"un Bouclier Mojo", /*spanish*/"un escudo deku"}
-    );
-
-    hintTable[RHT_HYLIAN_SHIELD] = HintText::Item({
-                       //obscure text
-                       Text{"a steel safeguard",      /*french*/"une carapace d'acier",       /*spanish*/"una protección de acero"},
-                       Text{"Like Like's metal meal", /*french*/"un amuse-gueule de Pudding", /*spanish*/"un alimento de Like Like"},
-                     }, {
-                       //ambiguous text
-                       Text{"a shield", /*french*/"un bouclier", /*spanish*/"un escudo"},
-                     },
-                       //clear text
-                       Text{"a Hylian Shield", /*french*/"un Bouclier Hylien", /*spanish*/"un escudo hyliano"}
-    );
-
-    hintTable[RHT_MIRROR_SHIELD] = HintText::Item({
-                       //obscure text
-                       Text{"a reflective rampart", /*french*/"un capteur de lumière",   /*spanish*/"una muralla reflectora"},
-                       Text{"Medusa's weakness",    /*french*/"la faiblesse de Méduse", /*spanish*/"la debilidad de Medusa"},
-                       Text{"a silvered surface",   /*french*/"une surface argentée",    /*spanish*/"una superficie plateada"},
-                     }, {
-                       //ambiguous text
-                       Text{"a shield", /*french*/"un bouclier", /*spanish*/"un escudo"},
-                     },
-                       //clear text
-                       Text{"the Mirror Shield", /*french*/"le Bouclier Miroir", /*spanish*/"el escudo espejo"}
-    );
-
-    hintTable[RHT_GORON_TUNIC] = HintText::Item({
-                       //obscure text
-                       Text{"ruby robes",       /*french*/"un pigment rouge",      /*spanish*/"una vestimenta rubí"},
-                       Text{"fireproof fabric", /*french*/"un trésor anti-flamme", /*spanish*/"una ignífuga prenda"},
-                       Text{"cooking clothes",  /*french*/"une tenue de cuisine",  /*spanish*/"unos abrasantes ropajes"},
-                     }, {
-                       //ambiguous text
-                       Text{"a tunic", /*french*/"une tunique", /*spanish*/"un sayo"},
-                     },
-                       //clear text
-                       Text{"a Goron Tunic", /*french*/"une Tunique Goron", /*spanish*/"un sayo goron"}
-    );
-
-    hintTable[RHT_ZORA_TUNIC] = HintText::Item({
-                       //obscure text
-                       Text{"a sapphire suit", /*french*/"un pigment bleuté",      /*spanish*/"una vestidura zafiro"},
-                       Text{"scuba gear",      /*french*/"un habit de plongée",    /*spanish*/"un traje impermeable"},
-                       Text{"a swimsuit",      /*french*/"un costume de baignade", /*spanish*/"unos ropajes sumergibles"},
-                     }, {
-                       //ambiguous text
-                       Text{"a tunic", /*french*/"une tunique", /*spanish*/"un sayo"},
-                       Text{"something expensive", /*french*/"une chose dispendieuse", /*spanish*/"algo caro"},
-                     },
-                       //clear text
-                       Text{"a Zora Tunic", /*french*/"une Tunique Zora", /*spanish*/"un sayo zora"}
-    );
-
-    hintTable[RHT_IRON_BOOTS] = HintText::Item({
-                       //obscure text
-                       Text{"sink shoes",   /*french*/"un boulet de fer", /*spanish*/"un calzado de las profundidades"},
-                       Text{"clank cleats", /*french*/"une paire de talons bruyants", /*spanish*/"unas suelas férreas"},
-                     }, {
-                       //ambiguous text
-                       Text{"some boots", /*french*/"une paire de bottes", /*spanish*/"un par de botas"},
-                       Text{"a feature of the Water Temple", /*french*/"une particularité du Temple de l'Eau", /*spanish*/"algo particular del Templo del Agua"},
-                       Text{"something heavy", /*french*/"une chose pesante", /*spanish*/"algo de lo más pesado"},
-                     },
-                       //clear text
-                       Text{"the Iron Boots", /*french*/"une paire de Bottes de plomb", /*spanish*/"las botas de hierro"}
-    );
-
-    hintTable[RHT_HOVER_BOOTS] = HintText::Item({
-                       //obscure text
-                       Text{"butter boots",    /*french*/"une paire de patins de beurre",   /*spanish*/"unas suelas resvaladizas"},
-                       Text{"sacred slippers", /*french*/"une paire de pantoufles sacrées", /*spanish*/"unos escurridizos botines"},
-                       Text{"spacewalkers",    /*french*/"une paire de bottes spatiales",   /*spanish*/"un calzado antigravitatorio"},
-                     }, {
-                       //ambiguous text
-                       Text{"some boots", /*french*/"une paire de bottes", /*spanish*/"un par de botas"},
-                     },
-                       //clear text
-                       Text{"the Hover Boots", /*french*/"une paire de Bottes des airs", /*spanish*/"las botas voladoras"}
-    );
-
-
-    hintTable[RHT_ZELDAS_LETTER] = HintText::Item({
-                       //obscure text
-                       Text{"an autograph",     /*french*/"un autographe",        /*spanish*/"un autógrafo"},
-                       Text{"royal stationery", /*french*/"du papier royal",      /*spanish*/"un escrito real"},
-                       Text{"royal snail mail", /*french*/"une enveloppe royale", /*spanish*/"correo de la realeza"},
-                     }, {},
-                       //clear text
-                       Text{"Zelda's Letter", /*french*/"la Lettre de Zelda", /*spanish*/"la carta de Zelda"}
-    );
-
-    hintTable[RHT_WEIRD_EGG] = HintText::Item({
-                       //obscure text
-                       Text{"a chicken dilemma", /*french*/"un drôle d'ovale", /*spanish*/"el dilema de la gallina"},
-                     }, {
-                       //ambiguous text
-                       Text{"an egg", /*french*/"un oeuf", /*spanish*/"un huevo"},
-                     },
-                       //clear text
-                       Text{"the Weird Egg", /*french*/"l'Oeuf Curieux", /*spanish*/"el huevo extraño"}
-    );
-
-    hintTable[RHT_BOOMERANG] = HintText::Item({
-                       //obscure text
-                       Text{"a banana",       /*french*/"une banane",            /*spanish*/"un plátano"},
-                       Text{"a stun stick",   /*french*/"un bâton étourdissant", /*spanish*/"un palo aturdidor"},
-                       Text{"a yellow angle", /*french*/"un angle jaune",        /*spanish*/"un ángulo amarillo"},
-                     }, {
-                       //ambiguous text
-                       Text{"something that can grab things", /*french*/"une chose qui peut attraper", /*spanish*/"algo que pueda agarrar cosas"},
-                       Text{"something that can stun", /*french*/"une chose qui peut paralyser", /*spanish*/"algo que pueda paralizar"},
-                     },
-                       //clear text
-                       Text{"the Boomerang", /*french*/"le Boomerang", /*spanish*/"el bumerán"}
-    );
-
-    hintTable[RHT_LENS_OF_TRUTH] = HintText::Item({
-                       //obscure text
-                       Text{"a lie detector",     /*french*/"un détecteur de mensonges", /*spanish*/"el detector de ilusiones"},
-                       Text{"a ghost tracker",    /*french*/"un trouve-fantôme",         /*spanish*/"el rastreador paranormal"},
-                       Text{"true sight",         /*french*/"le troisième œil",         /*spanish*/"el ojo que todo ve"},
-                       Text{"a detective's tool", /*french*/"un trésor Sheikah",         /*spanish*/"la revelación verdadera"},
-                     }, {
-                       //ambiguous text
-                       Text{"a secret-finding tool", /*french*/"un cherche-secrets", /*spanish*/"un instrumento para hallar objetos"},
-                     },
-                       //clear text
-                       Text{"the Lens of Truth", /*french*/"le Monocle de Vérité", /*spanish*/"la Lupa de la Verdad"}
-    );
-
-    hintTable[RHT_MEGATON_HAMMER] = HintText::Item({
-                       //obscure text
-                       Text{"the dragon smasher", /*french*/"le tueur de dragons",     /*spanish*/"un destructor de dragones"},
-                       Text{"the metal mallet",   /*french*/"un outil de construction", /*spanish*/"un mazo de metal"},
-                       Text{"the heavy hitter",   /*french*/"un poids lourd",           /*spanish*/"un machacador"},
-                     }, {
-                       //ambiguous text
-                       Text{"something that can remove boulders", /*french*/"une chose qui enlève les rochers", /*spanish*/"algo que pueda quitar rocas"},
-                     },
-                       //clear text
-                       Text{"the Megaton Hammer", /*french*/"la Masse des Titans", /*spanish*/"el martillo Megatón"}
-    );
-
-    hintTable[RHT_STONE_OF_AGONY] = HintText::Item({
-                       //obscure text
-                       Text{"the shake stone", /*french*/"le fragment vibrant", /*spanish*/"el fragmento tintineante"},
-                       Text{"a gray alarm",    /*french*/"une alerte bleue",    /*spanish*/"una azul alarma"},
-                     }, {
-                       //ambiguous text
-                       Text{"a prize of the House of Skulltulas", /*french*/"un prix de la maison des Skulltulas", /*spanish*/"un obsequio de la Casa Skulltula"},
-                       Text{"a secret-finding tool", /*french*/"un cherche-secrets", /*spanish*/"un instrumento para hallar objetos"},
-                     },
-                       //clear text
-                       Text{"the Stone of Agony", /*french*/"la Pierre de Souffrance", /*spanish*/"la Piedra de la Agonía"}
-    );
-
-    hintTable[RHT_DINS_FIRE] = HintText::Item({
-                       //obscure text
-                       Text{"an inferno",  /*french*/"un brasier",               /*spanish*/"un incendio"},
-                       Text{"a heat wave", /*french*/"une vague de chaleur",     /*spanish*/"una onda de calor"},
-                       Text{"a red ball",  /*french*/"une explosion de flammes", /*spanish*/"una roja esfera"},
-                     }, {
-                       //ambiguous text
-                       Text{"a Great Fairy's power", /*french*/"le pouvoir d'une grande fée", /*spanish*/"el poder de una Gran Hada"},
-                     },
-                       //clear text
-                       Text{"Din's Fire", /*french*/"le Feu de Din", /*spanish*/"el Fuego de Din"}
-    );
-
-    hintTable[RHT_FARORES_WIND] = HintText::Item({
-                       //obscure text
-                       Text{"teleportation",     /*french*/"la téléportation",      /*spanish*/"un teletransportador"},
-                       Text{"a relocation rune", /*french*/"une rune de relocation", /*spanish*/"una runa de transporte"},
-                       Text{"a green ball",      /*french*/"une boule verte",        /*spanish*/"una verde esfera"},
-                     }, {
-                       //ambiguous text
-                       Text{"a Great Fairy's power", /*french*/"le pouvoir d'une grande fée", /*spanish*/"el poder de una Gran Hada"},
-                     },
-                       //clear text
-                       Text{"Farore's Wind", /*french*/"le Vent de Farore", /*spanish*/"el Viento de Farore"}
-    );
-
-    hintTable[RHT_NAYRUS_LOVE] = HintText::Item({
-                       //obscure text
-                       Text{"a safe space",        /*french*/"une bulle de cristal", /*spanish*/"una seguridad temporal"},
-                       Text{"an impregnable aura", /*french*/"un aura impénétrable", /*spanish*/"un aura impenetrable"},
-                       Text{"a blue barrier",      /*french*/"une toison bleu",      /*spanish*/"una barrera azul"},
-                     }, {
-                       //ambiguous text
-                       Text{"a Great Fairy's power", /*french*/"le pouvoir d'une grande fée", /*spanish*/"el poder de una Gran Hada"},
-                     },
-                       //clear text
-                       Text{"Nayru's Love", /*french*/"l'Amour de Nayru", /*spanish*/"el Amor de Nayru"}
-    );
-
-    hintTable[RHT_FIRE_ARROWS] = HintText::Item({
-                       //obscure text
-                       Text{"the furnace firearm" , /*french*/"une fusée solaire",     /*spanish*/"el ardiente aguijón"},
-                       Text{"the burning bolts",    /*french*/"un obus enflammé",      /*spanish*/"las puntas ígneas"},
-                       Text{"a magma missile",      /*french*/"un missile volcanique", /*spanish*/"el misil abrasador"},
-                     }, {
-                       //ambiguous text
-                       Text{"a magic arrow", /*french*/"une flèche magique", /*spanish*/"una flecha mágica"},
-                     },
-                       //clear text
-                       Text{"the Fire Arrows", /*french*/"les Flèches de Feu", /*spanish*/"la flecha de fuego"}
-    );
-
-    hintTable[RHT_ICE_ARROWS] = HintText::Item({
-                       //obscure text
-                       Text{"the refrigerator rocket", /*french*/"un missile pétrifiant", /*spanish*/"el misil congelador"},
-                       Text{"the frostbite bolts",     /*french*/"un froid mordant",      /*spanish*/"las puntas gélidas"},
-                       Text{"an iceberg maker",        /*french*/"une aiguille glaciale", /*spanish*/"el control de escarcha"},
-                     }, {
-                       //ambiguous text
-                       Text{"a magic arrow", /*french*/"une flèche magique", /*spanish*/"una flecha mágica"},
-                       Text{"something that can stun", /*french*/"une chose qui peut paralyser", /*spanish*/"algo que pueda paralizar"},
-                     },
-                       //clear text
-                       Text{"the Ice Arrows", /*french*/"les Flèches de Glace", /*spanish*/"la flecha de hielo"}
-    );
-
-    hintTable[RHT_LIGHT_ARROWS] = HintText::Item({
-                       //obscure text
-                       Text{"the shining shot",      /*french*/"l'arme brillante",      /*spanish*/"el haz de luz"},
-                       Text{"the luminous launcher", /*french*/"un jet de lumière",      /*spanish*/"el disparo luminoso"},
-                       Text{"Ganondorf's bane",      /*french*/"le fléau de Ganondorf", /*spanish*/"la perdición de Ganondorf"},
-                       Text{"the lighting bolts",    /*french*/"l'éclair sacré",        /*spanish*/"las puntas resplandecientes"},
-                     }, {
-                       //ambiguous text
-                       Text{"a magic arrow", /*french*/"une flèche magique", /*spanish*/"una flecha mágica"},
-                     },
-                       //clear text
-                       Text{"the Light Arrows", /*french*/"les Flèches de Lumière", /*spanish*/"la flecha de luz"}
-    );
-
-    hintTable[RHT_GERUDO_MEMBERSHIP_CARD] = HintText::Item({
-                       //obscure text
-                       Text{"a girl club membership", /*french*/"une carte de membre", /*spanish*/"una fémina membresía"},
-                       Text{"a desert tribe's pass",  /*french*/"un laissez-passer",   /*spanish*/"el vale del desierto"},
-                     }, {
-                       Text{"a token of recognition", /*french*/"une preuve de reconnaissance", /*spanish*/"una prueba de reconocimiento"},
-                     },
-                       //clear text
-                       Text{"the Gerudo Membership Card", /*french*/"la Carte Gerudo", /*spanish*/"el pase de socio gerudo"}
-    );
-
-    hintTable[RHT_MAGIC_BEAN] = HintText::Item({
-                       //obscure text
-                       Text{"a wizardly legume", /*french*/"un légume ensorcelé", /*spanish*/"una legumbre hechizada"},
-                     }, {
-                       //ambiguous text
-                       Text{"something sometimes buried", /*french*/"une chose parfois enterrée", /*spanish*/"algo a veces enterrado"},
-                     },
-                       //clear text
-                       Text{"a Magic Bean", /*french*/"un Haricot Magique", /*spanish*/"una judía mágica"}
-    );
-
-    hintTable[RHT_MAGIC_BEAN_PACK] = HintText::Item({
-                       //obscure text
-                       Text{"wizardly legumes", /*french*/"un paquet de légumes ensorcelés", /*spanish*/"unas legumbres hechizadas"},
-                     }, {
-                       //ambiguous text
-                       Text{"something sometimes buried", /*french*/"une chose parfois enterrée", /*spanish*/"algo a veces enterrado"},
-                     },
-                       //clear text
-                       Text{"Magic Beans", /*french*/"un Paquet de Haricots Magiques", /*spanish*/"unas judías mágicas"}
-    );
-
-    hintTable[RHT_DOUBLE_DEFENSE] = HintText::Item({
-                       //obscure text
-                       Text{"a white outline",   /*french*/"un rebord blanc",               /*spanish*/"un contorno blanco"},
-                       Text{"damage decrease",   /*french*/"une protection supplémentaire", /*spanish*/"una reducción de daño"},
-                       Text{"strengthened love", /*french*/"un amour coriace",              /*spanish*/"un amor fortalecido"},
-                     }, {
-                       //ambiguous text
-                       Text{"a Great Fairy's power", /*french*/"le pouvoir d'une grande fée", /*spanish*/"el poder de una Gran Hada"},
-                       Text{"something heart-shaped", /*french*/"une chose en forme de coeur", /*spanish*/"algo con forma de corazón"},
-                     },
-                       //clear text
-                       Text{"Double Defense", /*french*/"la Double Défence", /*spanish*/"la doble defensa"}
-    );
-
-    hintTable[RHT_GOLD_SKULLTULA_TOKEN] = HintText::Item({
-                       //obscure text
-                       Text{"proof of destruction",   /*french*/"un certificat d'élimination", /*spanish*/"una prueba de la destrucción"},
-                       Text{"an arachnid chip",       /*french*/"un symbole cranien",            /*spanish*/"una figura arácnida"},
-                       Text{"spider remains",         /*french*/"une dépouille dorée",         /*spanish*/"unos restos dorados"},
-                       Text{"one percent of a curse", /*french*/"un centième de malédiction",  /*spanish*/"una centésima de una maldición"},
-                     }, {
-                       //ambiguous text
-                       Text{"a token of recognition", /*french*/"une preuve de reconnaissance", /*spanish*/"una prueba de reconocimiento"},
-                       Text{"something sometimes buried", /*french*/"une chose parfois enterrée", /*spanish*/"algo a veces enterrado"},
-                     },
-                       //clear text
-                       Text{"a Gold Skulltula Token", /*french*/"un Symbole de Skulltula d'or", /*spanish*/"un símbolo de skulltula dorada"}
-    );
-
-    hintTable[RHT_POCKET_EGG] = HintText::Item({
-                       //obscure text
-                       Text{"a Cucco container",   /*french*/"un réservoir à Cocotte", /*spanish*/"cuco contenido"},
-                       Text{"a Cucco, eventually", /*french*/"un poussin éventuel",    /*spanish*/"un futuro cuco"},
-                       Text{"a fowl youth",        /*french*/"une omelette crue",      /*spanish*/"una dulce juventud"},
-                     }, {
-                       //ambiguous text
-                       Text{"a trade quest item", /*french*/"un objet de quête d'échanges", /*spanish*/"un objeto de una misión secundaria"},
-                       Text{"an egg", /*french*/"un oeuf", /*spanish*/"un huevo"},
-                     },
-                       //clear text
-                       Text{"the Pocket Egg", /*french*/"l'Oeuf de Poche", /*spanish*/"el huevo de bolsillo"}
-    );
-
-    hintTable[RHT_POCKET_CUCCO] = HintText::Item({
-                       //obscure text
-                       Text{"a little clucker", /*french*/"un petit glousseur", /*spanish*/"un pollito chiquito"},
-                     }, {
-                       //ambiguous text
-                       Text{"a trade quest item", /*french*/"un objet de quête d'échanges", /*spanish*/"un objeto de una misión secundaria"},
-                     },
-                       //clear text
-                       Text{"the Pocket Cucco", /*french*/"la Cocotte de Poche", /*spanish*/"el cuco de bolsillo"}
-    );
-
-    hintTable[RHT_COJIRO] = HintText::Item({
-                       //obscure text
-                       Text{"a cerulean capon", /*french*/"un paon azur", /*spanish*/"un cerúleo capón"},
-                     }, {
-                       //ambiguous text
-                       Text{"a trade quest item", /*french*/"un objet de quête d'échanges", /*spanish*/"un objeto de una misión secundaria"},
-                     },
-                       //clear text
-                       Text{"Cojiro", /*french*/"le p'tit poulet", /*spanish*/"a Cojiro"}
-    );
-
-    hintTable[RHT_ODD_MUSHROOM] = HintText::Item({
-                       //obscure text
-                       Text{"a powder ingredient", /*french*/"un ingrédient à poudre", /*spanish*/"un oloroso ingrediente"},
-                     }, {
-                       //ambiguous text
-                       Text{"a trade quest item", /*french*/"un objet de quête d'échanges", /*spanish*/"un objeto de una misión secundaria"},
-                     },
-                       //clear text
-                       Text{"an Odd Mushroom", /*french*/"un Champignon Suspect", /*spanish*/"un champiñón extraño"}
-    );
-
-    hintTable[RHT_ODD_POTION] = HintText::Item({
-                       //obscure text
-                       Text{"Granny's goodies", /*french*/"la confiserie de mamie", /*spanish*/"la especialidad de la abuela"},
-                     }, {
-                       //ambiguous text
-                       Text{"something that contains medicine", /*french*/"une chose médicamenteuse", /*spanish*/"algo que contenga medicina"},
-                       Text{"something with a strange smell", /*french*/"une chose qui sent bizarre", /*spanish*/"algo con un olor extraño"},
-                       Text{"a trade quest item", /*french*/"un objet de quête d'échanges", /*spanish*/"un objeto de una misión secundaria"},
-                     },
-                       //clear text
-                       Text{"an Odd Potion", /*french*/"une Mixture Suspecte", /*spanish*/"una medicina rara"}
-    );
-
-    hintTable[RHT_POACHERS_SAW] = HintText::Item({
-                       //obscure text
-                       Text{"a tree killer", /*french*/"un coupeur d'arbres", /*spanish*/"un destructor de árboles"},
-                     }, {
-                       //ambiguous text
-                       Text{"a trade quest item", /*french*/"un objet de quête d'échanges", /*spanish*/"un objeto de una misión secundaria"},
-                     },
-                       //clear text
-                       Text{"the Poacher's Saw", /*french*/"la Scie du Chasseur", /*spanish*/"la sierra del furtivo"}
-    );
-
-    hintTable[RHT_BROKEN_SWORD] = HintText::Item({
-                       //obscure text
-                       Text{"a shattered slicer", /*french*/"une arme cassée", /*spanish*/"una rebanadora rota"},
-                     }, {
-                       //ambiguous text
-                       Text{"a trade quest item", /*french*/"un objet de quête d'échanges", /*spanish*/"un objeto de una misión secundaria"},
-                       Text{"a sword", /*french*/"une épée", /*spanish*/"una espada"},
-                     },
-                       //clear text
-                       Text{"the Broken Goron's Sword", /*french*/"l'Épée Brisée de Goron", /*spanish*/"la espada goron rota"}
-    );
-
-    hintTable[RHT_PRESCRIPTION] = HintText::Item({
-                       //obscure text
-                       Text{"a pill pamphlet", /*french*/"un document urgent", /*spanish*/"un instructivo medicinal"},
-                       Text{"a doctor's note", /*french*/"un papier médical",  /*spanish*/"unas notas del doctor"},
-                     }, {
-                       //ambiguous text
-                       Text{"a trade quest item", /*french*/"un objet de quête d'échanges", /*spanish*/"un objeto de una misión secundaria"},
-                     },
-                       //clear text
-                       Text{"the Prescription", /*french*/"une Ordonnance", /*spanish*/"la receta"}
-    );
-
-    hintTable[RHT_EYEBALL_FROG] = HintText::Item({
-                       //obscure text
-                       Text{"a perceiving polliwog", /*french*/"un amphibien", /*spanish*/"un variopinto batracio"},
-                     }, {
-                       //ambiguous text
-                       Text{"a trade quest item", /*french*/"un objet de quête d'échanges", /*spanish*/"un objeto de una misión secundaria"},
-                     },
-                       //clear text
-                       Text{"the Eyeball Frog", /*french*/"le Crapaud-qui-louche", /*spanish*/"la rana de ojos saltones"}
-    );
-
-    hintTable[RHT_EYEDROPS] = HintText::Item({
-                       //obscure text
-                       Text{"a vision vial", /*french*/"une solution oculaire", /*spanish*/"un remedio para la vista"},
-                     }, {
-                       //ambiguous text
-                       Text{"a trade quest item", /*french*/"un objet de quête d'échanges", /*spanish*/"un objeto de una misión secundaria"},
-                     },
-                       //clear text
-                       Text{"the Eyedrops", /*french*/"une phiole de Super-Gouttes", /*spanish*/"las supergotas oculares"}
-    );
-
-    hintTable[RHT_CLAIM_CHECK] = HintText::Item({
-                       //obscure text
-                       Text{"a three day wait", /*french*/"un rendez-vous dans trois jours", /*spanish*/"unos tres días de espera"},
-                     }, {
-                       //ambiguous text
-                       Text{"a trade quest item", /*french*/"un objet de quête d'échanges", /*spanish*/"un objeto de una misión secundaria"},
-                     },
-                       //clear text
-                       Text{"the Claim Check", /*french*/"un Certificat", /*spanish*/"el recibo"}
-    );
-
-    hintTable[RHT_PROGRESSIVE_HOOKSHOT] = HintText::Item({
-                       //obscure text
-                       Text{"Dampé's keepsake", /*french*/"l'héritage d'Igor",   /*spanish*/"un recuerdo de Dampé"},
-                       Text{"the Grapple Beam", /*french*/"le rayon grippeur",   /*spanish*/"una garra metálica"},
-                       Text{"the RHT_BOING! chain", /*french*/"la chaîne de RHT_BOING!", /*spanish*/"una cadena retráctil"},
-                     }, {
-                       //ambiguous text
-                       Text{"something that can grab things", /*french*/"une chose qui peut attraper", /*spanish*/"algo que pueda agarrar cosas"},
-                       Text{"something that can stun", /*french*/"une chose qui peut paralyser", /*spanish*/"algo que pueda paralizar"},
-                     },
-                       //clear text
-                       Text{"a Hookshot", /*french*/"un Grappin", /*spanish*/"un gancho"}
-    );
-
-    hintTable[RHT_PROGRESSIVE_STRENGTH] = HintText::Item({
-                       //obscure text
-                       Text{"power gloves",    /*french*/"une paire de gants de travail",       /*spanish*/"unos poderosos guanteletes"},
-                       Text{"metal mittens",   /*french*/"une paire de mitaines",               /*spanish*/"unas manoplas metálicas"},
-                       Text{"the heavy lifty", /*french*/"la puissance de dix hommes", /*spanish*/"un levantamiento pesado"},
-                     }, {
-                       //ambiguous text
-                       Text{"something that can remove boulders", /*french*/"une chose qui enlève les rochers", /*spanish*/"algo que pueda quitar rocas"},
-                     },
-                       //clear text
-                       Text{"a Strength Upgrade", /*french*/"une Amélioration de Force", /*spanish*/"un aumento de fuerza"}
-    );
-
-    hintTable[RHT_PROGRESSIVE_BOMB_BAG] = HintText::Item({
-                       //obscure text
-                       Text{"an explosive container", /*french*/"un porte-grenade",      /*spanish*/"un recipiente explosivo"},
-                       Text{"a blast bag",            /*french*/"un estomac de Dodongo", /*spanish*/"un zurrón de estallidos"},
-                     }, {
-                       //ambiguous text
-                       Text{"explosives", /*french*/"un paquet d'explosifs", /*spanish*/"un montón de explosivos"},
-                       Text{"something that can remove boulders", /*french*/"une chose qui enlève les rochers", /*spanish*/"algo que pueda quitar rocas"},
-                     },
-                       //clear text
-                       Text{"a Bomb Bag", /*french*/"un Sac de Bombes", /*spanish*/"un saco de bombas"}
-    );
-
-    hintTable[RHT_PROGRESSIVE_BOW] = HintText::Item({
-                       //obscure text
-                       Text{"an archery enabler",     /*french*/"un facilitateur de tir", /*spanish*/"un tiro al blanco"},
-                       Text{"a danger dart launcher", /*french*/"un tire-fléchette",      /*spanish*/"un peligroso lanzadardos"},
-                     }, {
-                       //ambiguous text
-                       Text{"a projectile shooter", /*french*/"un tire-projectile", /*spanish*/"un arma de proyectil"},
-                     },
-                       //clear text
-                       Text{"a Bow", /*french*/"l'Arc des Fées", /*spanish*/"un arco de las hadas"}
-    );
-
-    hintTable[RHT_PROGRESSIVE_SLINGSHOT] = HintText::Item({
-                       //obscure text
-                       Text{"a seed shooter",     /*french*/"un lance-noix",     /*spanish*/"un lanzasemillas"},
-                       Text{"a rubberband",       /*french*/"un élastique",      /*spanish*/"un tirachinas"},
-                       Text{"a child's catapult", /*french*/"un jouet d'enfant", /*spanish*/"una catapulta infantil"},
-                     }, {
-                       //ambiguous text
-                       Text{"a projectile shooter", /*french*/"un tire-projectile", /*spanish*/"un arma de proyectil"},
-                     },
-                       //clear text
-                       Text{"a Slingshot", /*french*/"un Lance-Pierre", /*spanish*/"una resortera de las hadas"}
-    );
-
-    hintTable[RHT_PROGRESSIVE_WALLET] = HintText::Item({
-                       //obscure text
-                       Text{"a mo' money holder", /*french*/"un sac à sous",     /*spanish*/"una cartera de dinero"},
-                       Text{"a gem purse",        /*french*/"une sacoche",       /*spanish*/"un zurrón de gemas"},
-                       Text{"a portable bank",    /*french*/"une petite banque", /*spanish*/"un banco portable"},
-                     }, {
-                       //ambiguous text
-                       Text{"a prize of the House of Skulltulas", /*french*/"un prix de la maison des Skulltulas", /*spanish*/"un obsequio de la Casa Skulltula"},
-                     },
-                       //clear text
-                       Text{"a Wallet", /*french*/"une Bourse", /*spanish*/"una bolsa de rupias"}
-    );
-
-    hintTable[RHT_PROGRESSIVE_SCALE] = HintText::Item({
-                       //obscure text
-                       Text{"a deeper dive",   /*french*/"une bulle de plongée", /*spanish*/"un profundo buceo"},
-                       Text{"a piece of Zora", /*french*/"un morceau de Zora",   /*spanish*/"un fragmento de Zora"},
-                     }, {
-                       //ambiguous text
-                       Text{"a diving tool", /*french*/"un outil de plongée", /*spanish*/"un instrumento de buceo"},
-                     },
-                       //clear text
-                       Text{"a Zora Scale", /*french*/"une Écaille Zora", /*spanish*/"una escama Zora"}
-    );
-
-    hintTable[RHT_PROGRESSIVE_NUT_UPGRADE] = HintText::Item({
-                       //obscure text
-                       Text{"more nuts",         /*french*/"ecnore plus de noix", /*spanish*/"más semillas de nogal"},
-                       Text{"flashbang storage", /*french*/"un sac à noix",       /*spanish*/"más frutos aturdidores"},
-                     }, {
-                       //ambiguous text
-                       Text{"some Deku munitions", /*french*/"un paquet de munitions Mojo", /*spanish*/"un montón de municiones Deku"},
-                       Text{"something that can stun", /*french*/"une chose qui peut paralyser", /*spanish*/"algo que pueda paralizar"},
-                     },
-                       //clear text
-                       Text{"Deku Nut Capacity", /*french*/"une Augmentation de Noix Mojo", /*spanish*/"un aumento de nueces deku"}
-    );
-
-    hintTable[RHT_PROGRESSIVE_STICK_UPGRADE] = HintText::Item({
-                       //obscure text
-                       Text{"a lumber rack",        /*french*/"un paquet de bois",    /*spanish*/"más bastones"},
-                       Text{"more flammable twigs", /*french*/"beaucoup de branches", /*spanish*/"más varas"},
-                     }, {
-                       //ambiguous text
-                       Text{"some Deku munitions", /*french*/"un paquet de munitions Mojo", /*spanish*/"un montón de municiones Deku"},
-                     },
-                       //clear text
-                       Text{"Deku Stick Capacity", /*french*/"une augmentation de bâtons Mojo", /*spanish*/"un aumento de palos deku"}
-    );
-
-    hintTable[RHT_PROGRESSIVE_MAGIC_METER] = HintText::Item({
-                       //obscure text
-                       Text{"mystic training",    /*french*/"un potentiel magique", /*spanish*/"una maestría mística"},
-                       Text{"pixie dust",         /*french*/"de la poudre de fée", /*spanish*/"un polvo de hada"},
-                       Text{"a green rectangle",  /*french*/"un rectangle vert",    /*spanish*/"una verduzca barra"},
-                     }, {
-                       //ambiguous text
-                       Text{"a Great Fairy's power", /*french*/"le pouvoir d'une grande fée", /*spanish*/"el poder de una Gran Hada"},
-                     },
-                       //clear text
-                       Text{"a Magic Meter", /*french*/"une Jauge de Magie", /*spanish*/"un aumento de poder mágico"}
-    );
-
-    hintTable[RHT_PROGRESSIVE_OCARINA] = HintText::Item({
-                       //obscure text
-                       Text{"a flute",       /*french*/"un bec musical",         /*spanish*/"un utensilio musical"},
-                       Text{"a music maker", /*french*/"un porteur de chansons", /*spanish*/"un instrumento"},
-                     }, {
-                       //ambiguous text
-                       Text{"something given by Saria", /*french*/"un cadeau de Saria", /*spanish*/"un obsequio de Saria"},
-                       Text{"something kept by the royal family", /*french*/"une chose qui paralyse", /*spanish*/"algo guardado por la familia real"},
-                     },
-                       //clear text
-                       Text{"an Ocarina", /*french*/"un ocarina", /*spanish*/"una ocarina"}
-    );
-
-    hintTable[RHT_PROGRESSIVE_BOMBCHUS] = HintText::Item({
-                       //obscure text
-                       Text{"mice bombs",     /*french*/"un adorable explosif",  /*spanish*/"unas bombas roedoras"},
-                       Text{"proximity mice", /*french*/"une mine anti-rongeur",    /*spanish*/"unos explosivos ratoncitos"},
-                       Text{"wall crawlers",  /*french*/"un rapide grimpeur",  /*spanish*/"unos trepaparedes"},
-                       Text{"trail blazers",  /*french*/"un zigzag éclatant", /*spanish*/"unas ratas propulsadas"},
-                     }, {
-                       //ambiguous text
-                       Text{"a prize of the House of Skulltulas", /*french*/"un prix de la maison des Skulltulas", /*spanish*/"un obsequio de la Casa Skulltula"},
-                       Text{"explosives", /*french*/"un paquet d'explosifs", /*spanish*/"un montón de explosivos"},
-                     },
-                       //clear text
-                       Text{"Bombchus", /*french*/"un paquet de Missiles", /*spanish*/"unos bombchus"}
-    );
-
-    hintTable[RHT_PROGRESSIVE_GORONSWORD] = HintText::Item({
-                       //obscure text
-                       Text{"a long blade",   /*french*/"une longue lame", /*spanish*/"una gran hoja"},
-                       Text{"a Goron weapon", /*french*/"une arme Goron",  /*spanish*/"un arma goron"},
-                     }, {
-                       //ambiguous text
-                       Text{"a sword", /*french*/"une épée", /*spanish*/"una espada"},
-                     },
-                       //clear text
-                       Text{"a Goron Sword", /*french*/"une épée Goron", /*spanish*/"una espada goron"}
-    );
-
-    hintTable[RHT_EMPTY_BOTTLE] = HintText::Item({
-                       //obscure text
-                       Text{"a glass container", /*french*/"un cylindre de cristal", /*spanish*/"un recipiente de cristal"},
-                       Text{"an empty jar",      /*french*/"une jarre incassable",   /*spanish*/"un frasco vacío"},
-                       Text{"encased air",       /*french*/"un bocal d'air",         /*spanish*/"aire a presión"},
-                     }, {
-                       //ambiguous text
-                       Text{"a bottle", /*french*/"un flacon", /*spanish*/"una botella"},
-                     },
-                       //clear text
-                       Text{"a Bottle", /*french*/"un flacon vide", /*spanish*/"una botella"}
-    );
-
-    hintTable[RHT_BOTTLE_WITH_MILK] = HintText::Item({
-                       //obscure text
-                       Text{"cow juice",          /*french*/"une source de calcium", /*spanish*/"una fuente de calcio"},
-                       Text{"a white liquid",     /*french*/"un liquide blanc",      /*spanish*/"una bebida nutritiva"},
-                       Text{"a baby's breakfast", /*french*/"du jus pour bébé",     /*spanish*/"un trago para bebés"},
-                     }, {
-                       //ambiguous text
-                       Text{"a bottle", /*french*/"un flacon", /*spanish*/"una botella"},
-                     },
-                       //clear text
-                       Text{"a Milk Bottle", /*french*/"un flacon de lait", /*spanish*/"una botella de leche"}
-    );
-
-    hintTable[RHT_BOTTLE_WITH_RED_POTION] = HintText::Item({
-                       //obscure text
-                       Text{"a vitality vial", /*french*/"un mélange de vitalité", /*spanish*/"una pócima vitalicia"},
-                       Text{"a red liquid",    /*french*/"un liquide rouge",       /*spanish*/"un remedio rojizo"},
-                     }, {
-                       //ambiguous text
-                       Text{"a bottle", /*french*/"un flacon", /*spanish*/"una botella"},
-                     },
-                       //clear text
-                       Text{"a Red Potion Bottle", /*french*/"un flacon de potion rouge", /*spanish*/"una botella de poción roja"}
-    );
-
-    hintTable[RHT_BOTTLE_WITH_GREEN_POTION] = HintText::Item({
-                       //obscure text
-                       Text{"a magic mixture", /*french*/"une réserve magique", /*spanish*/"un potingue mágico"},
-                       Text{"a green liquid",  /*french*/"un liquide vert",     /*spanish*/"un remedio verduzco"},
-                     }, {
-                       //ambiguous text
-                       Text{"a bottle", /*french*/"un flacon", /*spanish*/"una botella"},
-                     },
-                       //clear text
-                       Text{"a Green Potion Bottle", /*french*/"un flacon de potion verte", /*spanish*/"una botella de poción verde"}
-    );
-
-    hintTable[RHT_BOTTLE_WITH_BLUE_POTION] = HintText::Item({
-                       //obscure text
-                       Text{"an ailment antidote", /*french*/"l'élixir ultime", /*spanish*/"un antídoto para el dolor"},
-                       Text{"a blue liquid",       /*french*/"un liquide bleu", /*spanish*/"un remedio índigo"},
-                     }, {
-                       //ambiguous text
-                       Text{"a bottle", /*french*/"un flacon", /*spanish*/"una botella"},
-                     },
-                       //clear text
-                       Text{"a Blue Potion Bottle", /*french*/"un flacon de potion bleue", /*spanish*/"una botella de poción azul"}
-    );
-
-    hintTable[RHT_BOTTLE_WITH_FAIRY] = HintText::Item({
-                       //obscure text
-                       Text{"an imprisoned fairy", /*french*/"une fée emprisonnée", /*spanish*/"un hada atrapada"},
-                       Text{"an extra life",       /*french*/"une vie de rechange", /*spanish*/"una oportunidad más"},
-                       Text{"Navi's cousin",       /*french*/"le cousin de Navi",  /*spanish*/"una prima de Navi"},
-                     }, {
-                       //ambiguous text
-                       Text{"a bottle", /*french*/"un flacon", /*spanish*/"una botella"},
-                     },
-                       //clear text
-                       Text{"a Fairy Bottle", /*french*/"une fée en flacon", /*spanish*/"un hada en una botella"}
-    );
-
-    hintTable[RHT_BOTTLE_WITH_FISH] = HintText::Item({
-                       //obscure text
-                       Text{"an aquarium",     /*french*/"un aquarium",               /*spanish*/"un escamado ser"},
-                       Text{"a deity's snack", /*french*/"le repas d'un dieu marin", /*spanish*/"un tentempié de cierta deidad"},
-                     }, {
-                       //ambiguous text
-                       Text{"a bottle", /*french*/"un flacon", /*spanish*/"una botella"},
-                     },
-                       //clear text
-                       Text{"a Fish Bottle", /*french*/"un poisson en flacon", /*spanish*/"un pez en una botella"}
-    );
-
-    hintTable[RHT_BOTTLE_WITH_BLUE_FIRE] = HintText::Item({
-                       //obscure text
-                       Text{"a conflagration canteen", /*french*/"une mystérieuse flamme", /*spanish*/"un incendio retenido"},
-                       Text{"an icemelt jar",          /*french*/"un brasier glacial",     /*spanish*/"unas brasas enfrascadas"},
-                     }, {
-                       //ambiguous text
-                       Text{"a bottle", /*french*/"un flacon", /*spanish*/"una botella"},
-                     },
-                       //clear text
-                       Text{"a Blue Fire Bottle", /*french*/"une flamme bleue en flacon", /*spanish*/"una botella de fuego azul"}
-    );
-
-    hintTable[RHT_BOTTLE_WITH_BUGS] = HintText::Item({
-                       //obscure text
-                       Text{"an insectarium",    /*french*/"un insectarium",       /*spanish*/"unos invertebrados seres"},
-                       Text{"Skulltula finders", /*french*/"une poignée de trouve-Skulltula", /*spanish*/"unos rastreadores de skulltulas"},
-                     }, {
-                       //ambiguous text
-                       Text{"a bottle", /*french*/"un flacon", /*spanish*/"una botella"},
-                     },
-                       //clear text
-                       Text{"a Bug Bottle", /*french*/"un insecte en flacon", /*spanish*/"unos insectos en una botella"}
-    );
-
-    hintTable[RHT_BOTTLE_WITH_POE] = HintText::Item({
-                       //obscure text
-                       Text{"a spooky ghost",    /*french*/"un effroyable fantôme",   /*spanish*/"un espantoso espectro"},
-                       Text{"a face in the jar", /*french*/"un visage dans un bocal", /*spanish*/"una expresión enfrascada"},
-                     }, {
-                       //ambiguous text
-                       Text{"a bottle", /*french*/"un flacon", /*spanish*/"una botella"},
-                     },
-                       //clear text
-                       Text{"a Poe Bottle", /*french*/"un Esprit en flacon", /*spanish*/"un Poe en una botella"}
-    );
-
-    hintTable[RHT_BOTTLE_WITH_BIG_POE] = HintText::Item({
-                       //obscure text
-                       Text{"the spookiest ghost", /*french*/"un épouvantable spectre", /*spanish*/"el espectro más espeluznante"},
-                       Text{"a sidequest spirit",  /*french*/"un précieux esprit",      /*spanish*/"un buen valorado espíritu"},
-                     }, {
-                       //ambiguous text
-                       Text{"a bottle", /*french*/"un flacon", /*spanish*/"una botella"},
-                     },
-                       //clear text
-                       Text{"a Big Poe Bottle", /*french*/"une Ame en flacon", /*spanish*/"un Gran Poe en una botella"}
-    );
-
-    hintTable[RHT_RUTOS_LETTER] = HintText::Item({
-                       //obscure text
-                       Text{"a call for help",      /*french*/"un appel au secours", /*spanish*/"una llamada de auxilio"},
-                       Text{"the note that Mweeps", /*french*/"un message qui fait mwip",          /*spanish*/"un escrito mweep"},
-                       Text{"an RHT_SOS call",          /*french*/"un signal RHT_SOS",       /*spanish*/"una nota de socorro"},
-                       Text{"a fishy stationery",   /*french*/"un papier mouillé",  /*spanish*/"un mensaje de ayuda"},
-                     }, {
-                       //ambiguous text
-                       Text{"a bottle", /*french*/"un flacon", /*spanish*/"una botella"},
-                     },
-                       //clear text
-                       Text{"Ruto's Letter", /*french*/"la lettre de Ruto", /*spanish*/"la carta de Ruto"}
-    );
-
-    hintTable[RHT_ZELDAS_LULLABY] = HintText::Item({
-                       //obscure text
-                       Text{"a song of royal slumber", /*french*/"une chanson royale", /*spanish*/"la canción real"},
-                       Text{"a triforce tune",         /*french*/"la musique sacrée", /*spanish*/"la melodía de la trifuerza"},
-                     }, {
-                       //ambiguous text
-                       Text{"a regular song", /*french*/"une chanson normale", /*spanish*/"una cancion normal"},
-                       Text{"something kept by the royal family", /*french*/"une chose qui paralyse", /*spanish*/"algo guardado por la familia real"},
-                     },
-                       //clear text
-                       Text{"Zelda's Lullaby", /*french*/"la berceuse de Zelda", /*spanish*/"la Nana de Zelda"}
-    );
-
-    hintTable[RHT_EPONAS_SONG] = HintText::Item({
-                       //obscure text
-                       Text{"an equestrian etude", /*french*/"une hymne équestre",     /*spanish*/"una copla ecuestre"},
-                       Text{"Malon's melody",      /*french*/"la mélodie des vaches", /*spanish*/"la sonata de Malon"},
-                       Text{"a ranch song",        /*french*/"le chant des champs",   /*spanish*/"un canto rupestre"},
-                     }, {
-                       //ambiguous text
-                       Text{"a regular song", /*french*/"une chanson normale", /*spanish*/"una cancion normal"},
-                     },
-                       //clear text
-                       Text{"Epona's Song", /*french*/"le chant d'Epona", /*spanish*/"la Canción de Epona"}
-    );
-
-    hintTable[RHT_SARIAS_SONG] = HintText::Item({
-                       //obscure text
-                       Text{"a song of dancing Gorons", /*french*/"une chanson danceuse",     /*spanish*/"un pegadizo tono goron"},
-                       Text{"Saria's phone number",     /*french*/"le téléphone d'une amie", /*spanish*/"una consulta de asistencia"},
-                     }, {
-                       //ambiguous text
-                       Text{"a regular song", /*french*/"une chanson normale", /*spanish*/"una cancion normal"},
-                       Text{"something given by Saria", /*french*/"un cadeau de Saria", /*spanish*/"un obsequio de Saria"},
-                     },
-                       //clear text
-                       Text{"Saria's Song", /*french*/"le chant de Saria", /*spanish*/"la Canción de Saria"}
-    );
-
-    hintTable[RHT_SUNS_SONG] = HintText::Item({
-                       //obscure text
-                       Text{"Sunny Day",         /*french*/"Zénith",               /*spanish*/"un día soleado"},
-                       Text{"the ReDead's bane", /*french*/"le fléau des Éffrois", /*spanish*/"la destructora de Redeads"},
-                       Text{"the Gibdo's bane",  /*french*/"le fléau des Gibdo",   /*spanish*/"la destructora de Gibdos"},
-                     }, {
-                       //ambiguous text
-                       Text{"a regular song", /*french*/"une chanson normale", /*spanish*/"una cancion normal"},
-                       Text{"something that can stun", /*french*/"une chose qui peut paralyser", /*spanish*/"algo que pueda paralizar"},
-                     },
-                       //clear text
-                       Text{"the Sun's Song", /*french*/"le chant du soleil", /*spanish*/"la Canción del Sol"}
-    );
-
-    hintTable[RHT_SONG_OF_TIME] = HintText::Item({
-                       //obscure text
-                       Text{"a song 7 years long", /*french*/"le flot du temps", /*spanish*/"la setenada canción"},
-                       Text{"the tune of ages",    /*french*/"le Chant des Âges",  /*spanish*/"la melodía eónica"},
-                     }, {
-                       //ambiguous text
-                       Text{"a regular song", /*french*/"une chanson normale", /*spanish*/"una cancion normal"},
-                     },
-                       //clear text
-                       Text{"the Song of Time", /*french*/"le chant du temps", /*spanish*/"la Canción del tiempo"}
-    );
-
-    hintTable[RHT_SONG_OF_STORMS] = HintText::Item({
-                       //obscure text
-                       Text{"Rain Dance",            /*french*/"Danse Pluie",               /*spanish*/"la danza de la lluvia"},
-                       Text{"a thunderstorm tune",   /*french*/"une hymne foudroyante",      /*spanish*/"una sonata tormentosa"},
-                       Text{"windmill acceleration", /*french*/"l'accélérateur de moulins", /*spanish*/"el arranque de molinos"},
-                     }, {
-                       //ambiguous text
-                       Text{"a regular song", /*french*/"une chanson normale", /*spanish*/"una cancion normal"},
-                     },
-                       //clear text
-                       Text{"the Song of Storms", /*french*/"le chant des tempêtes", /*spanish*/"la Canción de la Tormenta"}
-    );
-
-    hintTable[RHT_MINUET_OF_FOREST] = HintText::Item({
-                       //obscure text
-                       Text{"the song of tall trees", /*french*/"le bruit des arbres", /*spanish*/"la canción de las copas"},
-                       Text{"an arboreal anthem",     /*french*/"l'hymne sylvestre",   /*spanish*/"el himno forestal"},
-                       Text{"a green spark trail",    /*french*/"une comète verte",     /*spanish*/"el sendero esmeralda"},
-                     }, {
-                       //ambiguous text
-                       Text{"a warp song", /*french*/"une chanson de téléportation", /*spanish*/"una canción de teletransportación"},
-                     },
-                       //clear text
-                       Text{"the Minuet of Forest", /*french*/"le menuet de la forêt", /*spanish*/"el Minueto del bosque"}
-    );
-
-    hintTable[RHT_BOLERO_OF_FIRE] = HintText::Item({
-                       //obscure text
-                       Text{"a song of lethal lava", /*french*/"une musique enflammée",          /*spanish*/"la canción de la lava"},
-                       Text{"a red spark trail",     /*french*/"une comète rouge",      /*spanish*/"el sendero rubí"},
-                       Text{"a volcanic verse",      /*french*/"le souffle du volcan", /*spanish*/"el verso volcánico"},
-                     }, {
-                       //ambiguous text
-                       Text{"a warp song", /*french*/"une chanson de téléportation", /*spanish*/"una canción de teletransportación"},
-                     },
-                       //clear text
-                       Text{"the Bolero of Fire", /*french*/"le boléro du feu", /*spanish*/"el Bolero del fuego"}
-    );
-
-    hintTable[RHT_SERENADE_OF_WATER] = HintText::Item({
-                       //obscure text
-                       Text{"a song of a damp ditch", /*french*/"le calme de l'eau", /*spanish*/"la canción del estanque"},
-                       Text{"a blue spark trail",     /*french*/"une comète bleue",   /*spanish*/"el sendero zafiro"},
-                       Text{"the lake's lyric",       /*french*/"la voix du lac",    /*spanish*/"la letra del lago"},
-                     }, {
-                       //ambiguous text
-                       Text{"a warp song", /*french*/"une chanson de téléportation", /*spanish*/"una canción de teletransportación"},
-                     },
-                       //clear text
-                       Text{"the Serenade of Water", /*french*/"la sérénade de l'eau", /*spanish*/"la Serenata del agua"}
-    );
-
-    hintTable[RHT_REQUIEM_OF_SPIRIT] = HintText::Item({
-                       //obscure text
-                       Text{"a song of sandy statues", /*french*/"la mélodie d'une grande statue", /*spanish*/"la canción de la gran estatua"},
-                       Text{"an orange spark trail",   /*french*/"une comète orange",               /*spanish*/"el sendero ámbar"},
-                       Text{"the desert ditty",        /*french*/"le vent du désert",              /*spanish*/"la estrofa del desierto"},
-                     }, {
-                       //ambiguous text
-                       Text{"a warp song", /*french*/"une chanson de téléportation", /*spanish*/"una canción de teletransportación"},
-                     },
-                       //clear text
-                       Text{"the Requiem of Spirit", /*french*/"le requiem des esprits", /*spanish*/"el Réquiem del espíritu"}
-    );
-
-    hintTable[RHT_NOCTURNE_OF_SHADOW] = HintText::Item({
-                       //obscure text
-                       Text{"a song of spooky spirits", /*french*/"une hymne de chair de poule", /*spanish*/"la canción de los espectros"},
-                       Text{"a graveyard boogie",       /*french*/"un boogie de fantômes",       /*spanish*/"una honra fúnebre"},
-                       Text{"a haunted hymn",           /*french*/"une chanson lugubre",         /*spanish*/"una estrofa encantada"},
-                       Text{"a purple spark trail",     /*french*/"une comète mauve",            /*spanish*/"el sendero malva"},
-                     }, {
-                       //ambiguous text
-                       Text{"a warp song", /*french*/"une chanson de téléportation", /*spanish*/"una canción de teletransportación"},
-                     },
-                       //clear text
-                       Text{"the Nocturne of Shadow", /*french*/"le nocturne de l'ombre", /*spanish*/"el Nocturno de la sombra"}
-    );
-
-    hintTable[RHT_PRELUDE_OF_LIGHT] = HintText::Item({
-                       //obscure text
-                       Text{"a luminous prologue melody", /*french*/"une matine illuminée", /*spanish*/"la melodía refulgente"},
-                       Text{"a yellow spark trail",       /*french*/"une comète jaune",        /*spanish*/"el sendero resplandeciente"},
-                       Text{"the temple traveler",        /*french*/"un chant de sanctuaire",  /*spanish*/"la ruta del templo"},
-                     }, {
-                       //ambiguous text
-                       Text{"a warp song", /*french*/"une chanson de téléportation", /*spanish*/"una canción de teletransportación"},
-                     },
-                       //clear text
-                       Text{"the Prelude of Light", /*french*/"le prélude de la lumière", /*spanish*/"el Preludio de la luz"}
-    );
-    hintTable[RHT_DEKU_TREE_MAP] = HintText::Item({
-                        //obscure text
-                        Text{"a mossy atlas", /*french*/"un atlas boisé",  /*spanish*/"un atlas musgoso"},
-                        Text{"some mossy blueprints",      /*french*/"un plan boisé",             /*spanish*/"unos planos musgosos"},
-                      }, {
-                        //ambiguous text
-                        Text{"a dungeon map", /*french*/"une carte", /*spanish*/"un mapa"},
-                      },
-                        //clear text
-                        Text{"the Deku Tree Map", /*french*/"la carte de l'Arbre Mojo", /*spanish*/"el mapa del Gran Árbol Deku"}
-     );
-    hintTable[RHT_DODONGOS_CAVERN_MAP] = HintText::Item({
-                        //obscure text
-                        Text{"a rocky atlas", /*french*/"un atlas rocheux",  /*spanish*/"un atlas rocoso"},
-                        Text{"some rocky blueprints",      /*french*/"un plan rocheux",             /*spanish*/"unos planos rocosos"},
-                      }, {
-                        //ambiguous text
-                        Text{"a dungeon map", /*french*/"une carte", /*spanish*/"un mapa"},
-                      },
-                        //clear text
-                        Text{"the Dodongo's Cavern Map", /*french*/"la carte de la Caverne Dodongo", /*spanish*/"el mapa de la Cueva de los Dodongos"}
-     );
-    hintTable[RHT_JABU_JABUS_BELLY_MAP] = HintText::Item({
-                        //obscure text
-                        Text{"a fishy atlas", /*french*/"un atlas digéré",  /*spanish*/"un atlas digesto"},
-                        Text{"some fishy blueprints",      /*french*/"un plan digéré",             /*spanish*/"unos planos digestos"},
-                      }, {
-                        //ambiguous text
-                        Text{"a dungeon map", /*french*/"une carte", /*spanish*/"un mapa"},
-                      },
-                        //clear text
-                        Text{"the Jabu-Jabu's Belly Map", /*french*/"la carte de Jabu-Jabu", /*spanish*/"el mapa de la Tripa de Jabu-Jabu"}
-     );
-    hintTable[RHT_FOREST_TEMPLE_MAP] = HintText::Item({
-                        //obscure text
-                        Text{"a sylvan atlas", /*french*/"un atlas sylvestre",  /*spanish*/"un atlas enselvado"},
-                        Text{"some sylvan blueprints",      /*french*/"un plan sylvestre",             /*spanish*/"unos planos enselvados"},
-                      }, {
-                        //ambiguous text
-                        Text{"a dungeon map", /*french*/"une carte", /*spanish*/"un mapa"},
-                      },
-                        //clear text
-                        Text{"the Forest Temple Map", /*french*/"la carte du Temple de la Forêt", /*spanish*/"el mapa del Templo del Bosque"}
-     );
-    hintTable[RHT_FIRE_TEMPLE_MAP] = HintText::Item({
-                        //obscure text
-                        Text{"a molten atlas", /*french*/"un atlas fondu",  /*spanish*/"un atlas fundido"},
-                        Text{"some molten blueprints",      /*french*/"un plan fondu",             /*spanish*/"unos planos fundidos"},
-                      }, {
-                        //ambiguous text
-                        Text{"a dungeon map", /*french*/"une carte", /*spanish*/"un mapa"},
-                      },
-                        //clear text
-                        Text{"the Fire Temple Map", /*french*/"la carte du Temple du Feu", /*spanish*/"el mapa del Templo del Fuego"}
-     );
-    hintTable[RHT_WATER_TEMPLE_MAP] = HintText::Item({
-                        //obscure text
-                        Text{"a wet atlas", /*french*/"un atlas humide",  /*spanish*/"un atlas mojado"},
-                        Text{"some wet blueprints",      /*french*/"un plan humide",             /*spanish*/"unos planos mojados"},
-                      }, {
-                        //ambiguous text
-                        Text{"a dungeon map", /*french*/"une carte", /*spanish*/"un mapa"},
-                      },
-                        //clear text
-                        Text{"the Water Temple Map", /*french*/"la carte du Temple de l'Eau", /*spanish*/"el mapa del Templo del Agua"}
-     );
-    hintTable[RHT_SPIRIT_TEMPLE_MAP] = HintText::Item({
-                        //obscure text
-                        Text{"a sandy atlas", /*french*/"un atlas sableux",  /*spanish*/"un atlas arenoso"},
-                        Text{"some sandy blueprints",      /*french*/"un plan sableux",             /*spanish*/"unos planos arenosos"},
-                      }, {
-                        //ambiguous text
-                        Text{"a dungeon map", /*french*/"une carte", /*spanish*/"un mapa"},
-                      },
-                        //clear text
-                        Text{"the Spirit Temple Map", /*french*/"la carte du Temple de l'Esprit", /*spanish*/"el mapa del Templo del Espíritu"}
-     );
-    hintTable[RHT_SHADOW_TEMPLE_MAP] = HintText::Item({
-                        //obscure text
-                        Text{"a creepy atlas", /*french*/"un atlas sinistre",  /*spanish*/"un atlas siniestra"},
-                        Text{"some creepy blueprints",      /*french*/"un plan sinistre",             /*spanish*/"unos planos siniestras"},
-                      }, {
-                        //ambiguous text
-                        Text{"a dungeon map", /*french*/"une carte", /*spanish*/"un mapa"},
-                      },
-                        //clear text
-                        Text{"the Shadow Temple Map", /*french*/"la carte du Temple de l'Ombre", /*spanish*/"el mapa del Templo de las Sombras"}
-     );
-    hintTable[RHT_BOTTOM_OF_THE_WELL_MAP] = HintText::Item({
-                        //obscure text
-                        Text{"a moldy atlas", /*french*/"un atlas moisi",  /*spanish*/"un atlas mohoso"},
-                        Text{"some moldy blueprints",      /*french*/"un plan moisi",             /*spanish*/"unos planos mohosos"},
-                      }, {
-                        //ambiguous text
-                        Text{"a dungeon map", /*french*/"une carte", /*spanish*/"un mapa"},
-                      },
-                        //clear text
-                        Text{"the Bottom of the Well Map", /*french*/"la carte du fond du Puits", /*spanish*/"el mapa del Fondo del pozo"}
-     );
-    hintTable[RHT_ICE_CAVERN_MAP] = HintText::Item({
-                        //obscure text
-                        Text{"a polar atlas", /*french*/"un atlas polaire",  /*spanish*/"un atlas polar"},
-                        Text{"some polar blueprints",      /*french*/"un plan polaire",             /*spanish*/"unos planos polars"},
-                      }, {
-                        //ambiguous text
-                        Text{"a dungeon map", /*french*/"une carte", /*spanish*/"un mapa"},
-                      },
-                        //clear text
-                        Text{"the Ice Cavern Map", /*french*/"la carte de la Caverne Polaire", /*spanish*/"el mapa de la Caverna de hielo"}
-     );
-    hintTable[RHT_DEKU_TREE_COMPASS] = HintText::Item({
-                        //obscure text
-                        Text{"a mossy treasure tracker", /*french*/"un cherche-trésor boisé",  /*spanish*/"un zahorí musgoso"},
-                        Text{"a mossy magnetic needle",      /*french*/"une aimant boisée",             /*spanish*/"un imán musgoso"},
-                      }, {
-                        //ambiguous text
-                        Text{"a compass", /*french*/"une boussole", /*spanish*/"una brújula"},
-                      },
-                        //clear text
-                        Text{"the Deku Tree Compass", /*french*/"la boussole de l'Arbre Mojo", /*spanish*/"la brújula del Gran Árbol Deku"}
-     );
-    hintTable[RHT_DODONGOS_CAVERN_COMPASS] = HintText::Item({
-                        //obscure text
-                        Text{"a rocky treasure tracker", /*french*/"un cherche-trésor rocheux",  /*spanish*/"un zahorí rocoso"},
-                        Text{"a rocky magnetic needle",      /*french*/"une aimant rocheux",             /*spanish*/"un imán rocoso"},
-                      }, {
-                        //ambiguous text
-                        Text{"a compass", /*french*/"une boussole", /*spanish*/"una brújula"},
-                      },
-                        //clear text
-                        Text{"the Dodongo's Cavern Compass", /*french*/"la boussole de la Caverne Dodongo", /*spanish*/"la brújula de la Cueva de los Dodongos"}
-     );
-    hintTable[RHT_JABU_JABUS_BELLY_COMPASS] = HintText::Item({
-                        //obscure text
-                        Text{"a fishy treasure tracker", /*french*/"un cherche-trésor digéré",  /*spanish*/"un zahorí digesto"},
-                        Text{"a fishy magnetic needle",      /*french*/"une aimant digéré",             /*spanish*/"un imán digesto"},
-                      }, {
-                        //ambiguous text
-                        Text{"a compass", /*french*/"une boussole", /*spanish*/"una brújula"},
-                      },
-                        //clear text
-                        Text{"the Jabu-Jabu's Belly Compass", /*french*/"la boussole de Jabu-Jabu", /*spanish*/"la brújula de la Tripa de Jabu-Jabu"}
-     );
-    hintTable[RHT_FOREST_TEMPLE_COMPASS] = HintText::Item({
-                        //obscure text
-                        Text{"a sylvan treasure tracker", /*french*/"un cherche-trésor sylvestre",  /*spanish*/"un zahorí enselvado"},
-                        Text{"a sylvan magnetic needle",      /*french*/"une aimant sylvestre",             /*spanish*/"un imán enselvado"},
-                      }, {
-                        //ambiguous text
-                        Text{"a compass", /*french*/"une boussole", /*spanish*/"una brújula"},
-                      },
-                        //clear text
-                        Text{"the Forest Temple Compass", /*french*/"la boussole du Temple de la Forêt", /*spanish*/"la brújula del Templo del Bosque"}
-     );
-    hintTable[RHT_FIRE_TEMPLE_COMPASS] = HintText::Item({
-                        //obscure text
-                        Text{"a molten treasure tracker", /*french*/"un cherche-trésor fondu",  /*spanish*/"un zahorí fundido"},
-                        Text{"a molten magnetic needle",      /*french*/"une aimant fondu",             /*spanish*/"un imán fundido"},
-                      }, {
-                        //ambiguous text
-                        Text{"a compass", /*french*/"une boussole", /*spanish*/"una brújula"},
-                      },
-                        //clear text
-                        Text{"the Fire Temple Compass", /*french*/"la boussole du Temple du Feu", /*spanish*/"la brújula del Templo del Fuego"}
-     );
-    hintTable[RHT_WATER_TEMPLE_COMPASS] = HintText::Item({
-                        //obscure text
-                        Text{"a wet treasure tracker", /*french*/"un cherche-trésor humide",  /*spanish*/"un zahorí mojado"},
-                        Text{"a wet magnetic needle",      /*french*/"une aimant humide",             /*spanish*/"un imán mojado"},
-                      }, {
-                        //ambiguous text
-                        Text{"a compass", /*french*/"une boussole", /*spanish*/"una brújula"},
-                      },
-                        //clear text
-                        Text{"the Water Temple Compass", /*french*/"la boussole du Temple de l'Eau", /*spanish*/"la brújula del Templo del Agua"}
-     );
-    hintTable[RHT_SPIRIT_TEMPLE_COMPASS] = HintText::Item({
-                        //obscure text
-                        Text{"a sandy treasure tracker", /*french*/"un cherche-trésor sableux",  /*spanish*/"un zahorí arenoso"},
-                        Text{"a sandy magnetic needle",      /*french*/"une aimant sableux",             /*spanish*/"un imán arenoso"},
-                      }, {
-                        //ambiguous text
-                        Text{"a compass", /*french*/"une boussole", /*spanish*/"una brújula"},
-                      },
-                        //clear text
-                        Text{"the Spirit Temple Compass", /*french*/"la boussole du Temple de l'Esprit", /*spanish*/"la brújula del Templo del Espíritu"}
-     );
-    hintTable[RHT_SHADOW_TEMPLE_COMPASS] = HintText::Item({
-                        //obscure text
-                        Text{"a creepy treasure tracker", /*french*/"un cherche-trésor sinistre",  /*spanish*/"un zahorí siniestra"},
-                        Text{"a creepy magnetic needle",      /*french*/"une aimant sinistre",             /*spanish*/"un imán siniestra"},
-                      }, {
-                        //ambiguous text
-                        Text{"a compass", /*french*/"une boussole", /*spanish*/"una brújula"},
-                      },
-                        //clear text
-                        Text{"the Shadow Temple Compass", /*french*/"la boussole du Temple de l'Ombre", /*spanish*/"la brújula del Templo de las Sombras"}
-     );
-    hintTable[RHT_BOTTOM_OF_THE_WELL_COMPASS] = HintText::Item({
-                        //obscure text
-                        Text{"a dank treasure tracker", /*french*/"un cherche-trésor moisi",  /*spanish*/"un zahorí mohoso"},
-                        Text{"a dank magnetic needle",      /*french*/"une aimant moisi",             /*spanish*/"un imán mohoso"},
-                      }, {
-                        //ambiguous text
-                        Text{"a compass", /*french*/"une boussole", /*spanish*/"una brújula"},
-                      },
-                        //clear text
-                        Text{"the Bottom of the Well Compass", /*french*/"la boussole du fond du Puits", /*spanish*/"la brújula del Fondo del pozo"}
-     );
-    hintTable[RHT_ICE_CAVERN_COMPASS] = HintText::Item({
-                        //obscure text
-                        Text{"a polar treasure tracker", /*french*/"un cherche-trésor polaire",  /*spanish*/"un zahorí polar"},
-                        Text{"a polar magnetic needle",      /*french*/"une aimant polaire",             /*spanish*/"un imán polar"},
-                      }, {
-                        //ambiguous text
-                        Text{"a compass", /*french*/"une boussole", /*spanish*/"una brújula"},
-                      },
-                        //clear text
-                        Text{"the Ice Cavern Compass", /*french*/"la Boussole de la Caverne Polaire", /*spanish*/"la brújula de la Caverna de hielo"}
-     );
-    hintTable[RHT_FOREST_TEMPLE_BOSS_KEY] = HintText::Item({
-                        //obscure text
-                        Text{"a sylvan master of unlocking", /*french*/"un anti-grosse porte sylvestre",  /*spanish*/"la clave enselvada de un jefe"},
-                        Text{"a sylvan dungeon's master pass",      /*french*/"une clé maléfique sylvestree",             /*spanish*/"el pase maestro enselvado"},
-                      }, {
-                        //ambiguous text
-                        Text{"a boss key", /*french*/"une Clé d'Or", /*spanish*/"una gran llave"},
-                      },
-                        //clear text
-                        Text{"the Forest Temple Boss Key", /*french*/"la Clé d'Or du Temple de la Forêt", /*spanish*/"la gran llave del Templo del Bosque"}
-     );
-    hintTable[RHT_FIRE_TEMPLE_BOSS_KEY] = HintText::Item({
-                        //obscure text
-                        Text{"a molten master of unlocking", /*french*/"un anti-grosse porte fondu",  /*spanish*/"la clave fundido de un jefe"},
-                        Text{"a molten dungeon's master pass",      /*french*/"une clé maléfique fondu",             /*spanish*/"el pase maestro fundido"},
-                      }, {
-                        //ambiguous text
-                        Text{"a boss key", /*french*/"une Clé d'Or", /*spanish*/"una gran llave"},
-                      },
-                        //clear text
-                        Text{"the Fire Temple Boss Key", /*french*/"la Clé d'Or du Temple du Feu", /*spanish*/"la gran llave del Templo del Fuego"}
-     );
-    hintTable[RHT_WATER_TEMPLE_BOSS_KEY] = HintText::Item({
-                        //obscure text
-                        Text{"a wet master of unlocking", /*french*/"un anti-grosse porte humide",  /*spanish*/"la clave mojado de un jefe"},
-                        Text{"a wet dungeon's master pass",      /*french*/"une clé maléfique humide",             /*spanish*/"el pase maestro mojado"},
-                      }, {
-                        //ambiguous text
-                        Text{"a boss key", /*french*/"une Clé d'Or", /*spanish*/"una gran llave"},
-                      },
-                        //clear text
-                        Text{"the Water Temple Boss Key", /*french*/"la Clé d'Or du Temple de l'Eau", /*spanish*/"la gran llave del Templo del Agua"}
-     );
-    hintTable[RHT_SPIRIT_TEMPLE_BOSS_KEY] = HintText::Item({
-                        //obscure text
-                        Text{"a sandy master of unlocking", /*french*/"un anti-grosse porte sableux",  /*spanish*/"la clave arenoso de un jefe"},
-                        Text{"a sandy dungeon's master pass",      /*french*/"une clé maléfique sableux",             /*spanish*/"el pase maestro arenoso"},
-                      }, {
-                        //ambiguous text
-                        Text{"a boss key", /*french*/"une Clé d'Or", /*spanish*/"una gran llave"},
-                      },
-                        //clear text
-                        Text{"the Spirit Temple Boss Key", /*french*/"la Clé d'Or du Temple de l'Esprit", /*spanish*/"la gran llave del Templo del Espíritu"}
-     );
-    hintTable[RHT_SHADOW_TEMPLE_BOSS_KEY] = HintText::Item({
-                        //obscure text
-                        Text{"a creepy master of unlocking", /*french*/"un anti-grosse porte sinistre",  /*spanish*/"la clave siniestra de un jefe"},
-                        Text{"a creepy dungeon's master pass",      /*french*/"une clé maléfique sinistre",             /*spanish*/"el pase maestro siniestra"},
-                      }, {
-                        //ambiguous text
-                        Text{"a boss key", /*french*/"une Clé d'Or", /*spanish*/"una gran llave"},
-                      },
-                        //clear text
-                        Text{"the Shadow Temple Boss Key", /*french*/"la Clé d'Or du Temple de l'Ombre", /*spanish*/"la gran llave del Templo de las Sombras"}
-     );
-    hintTable[RHT_GANONS_CASTLE_BOSS_KEY] = HintText::Item({
-                        //obscure text
-                        Text{"a final master of unlocking", /*french*/"un anti-grosse porte final",  /*spanish*/"la clave final de un jefe"},
-                        Text{"a final dungeon's master pass",      /*french*/"une clé maléfique final",             /*spanish*/"el pase maestro final"},
-                      }, {
-                        //ambiguous text
-                        Text{"a boss key", /*french*/"une Clé d'Or", /*spanish*/"una gran llave"},
-                      },
-                        //clear text
-                        Text{"the Ganon's Castle Boss Key", /*french*/"la Clé d'Or du Château de Ganon", /*spanish*/"la gran llave del Castillo de Ganon"}
-     );
-    hintTable[RHT_FOREST_TEMPLE_SMALL_KEY] = HintText::Item({
-                        //obscure text
-                        Text{"a sylvan tool for unlocking", /*french*/"un anti-porte sylvestre",            /*spanish*/"una clave de una entrada enselvada"},
-                        Text{"a sylvan dungeon pass",       /*french*/"le rêve sylvestre d'un prisonnier",  /*spanish*/"un pase de una mazmorra enselvada"},
-                        Text{"a sylvan lock remover",       /*french*/"un efface-serrure sylvestre",        /*spanish*/"un destructor de cerraduras enselvada"},
-                        Text{"a sylvan lockpick",           /*french*/"un crochet à porte sylvestre",       /*spanish*/"una apertura portentosa enselvada"},
-                      }, {
-                        //ambiguous text
-                        Text{"a small key", /*french*/"une petite clé", /*spanish*/"una llave pequeña"},
-                      },
-                        //clear text
-                        Text{"a Forest Temple Small Key", /*french*/"une petite clé du Temple de la Forêt", /*spanish*/"una llave pequeña del Templo del Bosque"}
-     );
-    hintTable[RHT_FIRE_TEMPLE_SMALL_KEY] = HintText::Item({
-                        //obscure text
-                        Text{"a molten tool for unlocking", /*french*/"un anti-porte fondu",            /*spanish*/"una clave de una entrada fundida"},
-                        Text{"a molten dungeon pass",       /*french*/"le rêve fondu d'un prisonnier",  /*spanish*/"un pase de una mazmorra fundida"},
-                        Text{"a molten lock remover",       /*french*/"un efface-serrure fondu",        /*spanish*/"un destructor de cerraduras fundida"},
-                        Text{"a molten lockpick",           /*french*/"un crochet à porte fondu",       /*spanish*/"una apertura portentosa fundida"},
-                      }, {
-                        //ambiguous text
-                        Text{"a small key", /*french*/"une petite clé", /*spanish*/"una llave pequeña"},
-                      },
-                        //clear text
-                        Text{"a Fire Temple Small Key", /*french*/"une petite clé du Temple du Feu", /*spanish*/"una llave pequeña del Templo del Fuego"}
-     );
-    hintTable[RHT_WATER_TEMPLE_SMALL_KEY] = HintText::Item({
-                        //obscure text
-                        Text{"a wet tool for unlocking", /*french*/"un anti-porte humide",            /*spanish*/"una clave de una entrada mojada"},
-                        Text{"a wet dungeon pass",       /*french*/"le rêve humide d'un prisonnier",  /*spanish*/"un pase de una mazmorra mojada"},
-                        Text{"a wet lock remover",       /*french*/"un efface-serrure humide",        /*spanish*/"un destructor de cerraduras mojada"},
-                        Text{"a wet lockpick",           /*french*/"un crochet à porte humide",       /*spanish*/"una apertura portentosa mojada"},
-                      }, {
-                        //ambiguous text
-                        Text{"a small key", /*french*/"une petite clé", /*spanish*/"una llave pequeña"},
-                      },
-                        //clear text
-                        Text{"a Water Temple Small Key", /*french*/"une petite clé du Temple de l'Eau", /*spanish*/"una llave pequeña del Templo del Agua"}
-     );
-    hintTable[RHT_SPIRIT_TEMPLE_SMALL_KEY] = HintText::Item({
-                        //obscure text
-                        Text{"a sandy tool for unlocking", /*french*/"un anti-porte sableux",            /*spanish*/"una clave de una entrada arenosa"},
-                        Text{"a sandy dungeon pass",       /*french*/"le rêve sableux d'un prisonnier",  /*spanish*/"un pase de una mazmorra arenosa"},
-                        Text{"a sandy lock remover",       /*french*/"un efface-serrure sableux",        /*spanish*/"un destructor de cerraduras arenosa"},
-                        Text{"a sandy lockpick",           /*french*/"un crochet à porte sableux",       /*spanish*/"una apertura portentosa arenosa"},
-                      }, {
-                        //ambiguous text
-                        Text{"a small key", /*french*/"une petite clé", /*spanish*/"una llave pequeña"},
-                      },
-                        //clear text
-                        Text{"a Spirit Temple Small Key", /*french*/"une petite clé du Temple de l'Esprit", /*spanish*/"una llave pequeña del Templo del Espíritu"}
-     );
-    hintTable[RHT_SHADOW_TEMPLE_SMALL_KEY] = HintText::Item({
-                        //obscure text
-                        Text{"a creepy tool for unlocking", /*french*/"un anti-porte sinistre",            /*spanish*/"una clave de una entrada siniestra:a"},
-                        Text{"a creepy dungeon pass",       /*french*/"le rêve sinistre d'un prisonnier",  /*spanish*/"un pase de una mazmorra siniestra:a"},
-                        Text{"a creepy lock remover",       /*french*/"un efface-serrure sinistre",        /*spanish*/"un destructor de cerraduras siniestra:a"},
-                        Text{"a creepy lockpick",           /*french*/"un crochet à porte sinistre",       /*spanish*/"una apertura portentosa siniestra:a"},
-                      }, {
-                        //ambiguous text
-                        Text{"a small key", /*french*/"une petite clé", /*spanish*/"una llave pequeña"},
-                      },
-                        //clear text
-                        Text{"a Shadow Temple Small Key", /*french*/"une petite clé du Temple de l'Ombre", /*spanish*/"una llave pequeña del Templo de las Sombras"}
-     );
-    hintTable[RHT_GERUDO_TRAINING_GROUNDS_SMALL_KEY] = HintText::Item({
-                        //obscure text
-                        Text{"a labyrinthian tool for unlocking", /*french*/"un anti-porte labyrinthique",            /*spanish*/"una clave de una entrada laberíntica"},
-                        Text{"a labyrinthian dungeon pass",       /*french*/"le rêve labyrinthique d'un prisonnier",  /*spanish*/"un pase de una mazmorra laberíntica"},
-                        Text{"a labyrinthian lock remover",       /*french*/"un efface-serrure labyrinthique",        /*spanish*/"un destructor de cerraduras laberíntica"},
-                        Text{"a labyrinthian lockpick",           /*french*/"un crochet à porte labyrinthique",       /*spanish*/"una apertura portentosa laberíntica"},
-                      }, {
-                        //ambiguous text
-                        Text{"a small key", /*french*/"une petite clé", /*spanish*/"una llave pequeña"},
-                      },
-                        //clear text
-                        Text{"a Gerudo Training Ground Small Key", /*french*/"une petite clé du Gymnase Gerudo", /*spanish*/"una llave pequeña del Centro de Instrucción Gerudo"}
-     );
-    hintTable[RHT_GERUDO_FORTRESS_SMALL_KEY] = HintText::Item({
-                        //obscure text
-                        Text{"an imprisoned tool for unlocking", /*french*/"un anti-porte emprisonné",            /*spanish*/"una clave de una entrada encarcelada"},
-                        Text{"an imprisoned dungeon pass",       /*french*/"le rêve emprisonné d'un prisonnier",  /*spanish*/"un pase de una mazmorra encarcelada"},
-                        Text{"an imprisoned lock remover",       /*french*/"un efface-serrure emprisonné",        /*spanish*/"un destructor de cerraduras encarcelada"},
-                        Text{"an imprisoned lockpick",           /*french*/"un crochet à porte emprisonné",       /*spanish*/"una apertura portentosa encarcelada"},
-                      }, {
-                        //ambiguous text
-                        Text{"a small key", /*french*/"une petite clé", /*spanish*/"una llave pequeña"},
-                      },
-                        //clear text
-                        Text{"a Gerudo Fortress Small Key", /*french*/"une petite clé de la Repaire des Voleurs", /*spanish*/"una llave pequeña de la Fortaleza Gerudo"}
-     );
-    hintTable[RHT_BOTTOM_OF_THE_WELL_SMALL_KEY] = HintText::Item({
-                        //obscure text
-                        Text{"a moldy tool for unlocking", /*french*/"un anti-porte moisi",            /*spanish*/"una clave de una entrada mohosa"},
-                        Text{"a moldy dungeon pass",       /*french*/"le rêve moisi d'un prisonnier",  /*spanish*/"un pase de una mazmorra mohosa"},
-                        Text{"a moldy lock remover",       /*french*/"un efface-serrure moisi",        /*spanish*/"un destructor de cerraduras mohosa"},
-                        Text{"a moldy lockpick",           /*french*/"un crochet à porte moisi",       /*spanish*/"una apertura portentosa mohosa"},
-                      }, {
-                        //ambiguous text
-                        Text{"a small key", /*french*/"une petite clé", /*spanish*/"una llave pequeña"},
-                      },
-                        //clear text
-                        Text{"a Bottom of the Well Small Key", /*french*/"une petite clé du fond du Puits", /*spanish*/"una llave pequeña del Fondo del pozo"}
-     );
-    hintTable[RHT_GANONS_CASTLE_SMALL_KEY] = HintText::Item({
-                        //obscure text
-                        Text{"a final tool for unlocking", /*french*/"un anti-porte final",            /*spanish*/"una clave de una entrada final"},
-                        Text{"a final dungeon pass",       /*french*/"le rêve final d'un prisonnier",  /*spanish*/"un pase de una mazmorra final"},
-                        Text{"a final lock remover",       /*french*/"un efface-serrure final",        /*spanish*/"un destructor de cerraduras final"},
-                        Text{"a final lockpick",           /*french*/"un crochet à porte final",       /*spanish*/"una apertura portentosa final"},
-                      }, {
-                        //ambiguous text
-                        Text{"a small key", /*french*/"une petite clé", /*spanish*/"una llave pequeña"},
-                      },
-                        //clear text
-                        Text{"a Ganon's Castle Small Key", /*french*/"une petite clé du Château de Ganon", /*spanish*/"una llave pequeña del Castillo de Ganon"}
-     );
-     hintTable[RHT_FOREST_TEMPLE_KEY_RING] = HintText::Item({
-                        //obscure text
-                        Text{"a sylvan toolbox for unlocking", /*french*/"des anti-portes sylvestres",            /*spanish*/"un conjunto silvestre de cerrajero"},
-                        Text{"a sylvan dungeon season pass",   /*french*/"les rêves sylvestres d'un prisonnier",  /*spanish*/"un pase vip de mazmorras silvestre"},
-                        Text{"a sylvan jingling ring",         /*french*/"des efface-serrures sylvestres",        /*spanish*/"una cadena multiusos silvestre"},
-                        Text{"a sylvan skeleton key",          /*french*/"des crochets à porte sylvestres",       /*spanish*/"un anillo silvestre contra cerrojos"},
-                      }, {
-                        //ambiguous text
-                        Text{"a key ring", /*french*/"un trousseau de clés", /*spanish*/"un llavero"},
-                      },
-                        //clear text
-                        Text{"a Forest Temple Key Ring", /*french*/"un trousseau de clés du Temple de la Forêt", /*spanish*/"un llavero del Templo del Bosque"}
-     );
-    hintTable[RHT_FIRE_TEMPLE_KEY_RING] = HintText::Item({
-                        //obscure text
-                        Text{"a molten toolbox for unlocking", /*french*/"des anti-portes fondus",            /*spanish*/"un conjunto fundido de cerrajero"},
-                        Text{"a molten dungeon season pass",   /*french*/"les rêves fondus d'un prisonnier",  /*spanish*/"un pase vip de mazmorras fundido"},
-                        Text{"a molten jingling ring",         /*french*/"des efface-serrures fondus",        /*spanish*/"una cadena multiusos fundida"},
-                        Text{"a molten skeleton key",          /*french*/"des crochets à porte fondus",       /*spanish*/"un anillo fundido contra cerrojos"},
-                      }, {
-                        //ambiguous text
-                        Text{"a key ring", /*french*/"un trousseau de clés", /*spanish*/"un llavero"},
-                      },
-                        //clear text
-                        Text{"a Fire Temple Key Ring", /*french*/"un trousseau de clés du Temple du Feu", /*spanish*/"un llavero del Templo del Fuego"}
-     );
-    hintTable[RHT_WATER_TEMPLE_KEY_RING] = HintText::Item({
-                        //obscure text
-                        Text{"a wet toolbox for unlocking", /*french*/"des anti-portes humides",            /*spanish*/"un conjunto abisal de cerrajero"},
-                        Text{"a wet dungeon season pass",   /*french*/"les rêves humides d'un prisonnier",  /*spanish*/"un pase vip de mazmorras abisal"},
-                        Text{"a wet jingling ring",         /*french*/"des efface-serrures humides",        /*spanish*/"una cadena multiusos abisal"},
-                        Text{"a wet skeleton key",          /*french*/"des crochets à porte humides",       /*spanish*/"un anillo abisal contra cerrojos"},
-                      }, {
-                        //ambiguous text
-                        Text{"a key ring", /*french*/"un trousseau de clés", /*spanish*/"un llavero"},
-                      },
-                        //clear text
-                        Text{"a Water Temple Key Ring", /*french*/"un trousseau de clés du Temple de l'Eau", /*spanish*/"un llavero del Templo del Agua"}
-     );
-    hintTable[RHT_SPIRIT_TEMPLE_KEY_RING] = HintText::Item({
-                        //obscure text
-                        Text{"a sandy toolbox for unlocking", /*french*/"des anti-portes sableux",            /*spanish*/"un conjunto arenoso de cerrajero"},
-                        Text{"a sandy dungeon season pass",   /*french*/"les rêves sableux d'un prisonnier",  /*spanish*/"un pase vip de mazmorras arenoso"},
-                        Text{"a sandy jingling ring",         /*french*/"des efface-serrures sableux",        /*spanish*/"una cadena multiusos arenosa"},
-                        Text{"a sandy skeleton key",          /*french*/"des crochets à porte sableux",       /*spanish*/"un anillo arenoso contra cerrojos"},
-                      }, {
-                        //ambiguous text
-                        Text{"a key ring", /*french*/"un trousseau de clés", /*spanish*/"un llavero"},
-                      },
-                        //clear text
-                        Text{"a Spirit Temple Key Ring", /*french*/"un trousseau de clés du Temple de l'Esprit", /*spanish*/"un llavero del Templo del Espíritu"}
-     );
-    hintTable[RHT_SHADOW_TEMPLE_KEY_RING] = HintText::Item({
-                        //obscure text
-                        Text{"a creepy toolbox for unlocking", /*french*/"des anti-portes sinistres",            /*spanish*/"un conjunto tenebroso de cerrajero"},
-                        Text{"a creepy dungeon season pass",   /*french*/"les rêves sinistres d'un prisonnier",  /*spanish*/"un pase vip de mazmorras tenebroso"},
-                        Text{"a creepy jingling ring",         /*french*/"des efface-serrures sinistres",        /*spanish*/"una cadena multiusos tenebrosa"},
-                        Text{"a creepy skeleton key",          /*french*/"des crochets à porte sinistres",       /*spanish*/"un anillo tenebroso contra cerrojos"},
-                      }, {
-                        //ambiguous text
-                        Text{"a key ring", /*french*/"un trousseau de clés", /*spanish*/"un llavero"},
-                      },
-                        //clear text
-                        Text{"a Shadow Temple Key Ring", /*french*/"un trousseau de clés du Temple de l'Ombre", /*spanish*/"un llavero del Templo de las Sombras"}
-     );
-    hintTable[RHT_GERUDO_TRAINING_GROUNDS_KEY_RING] = HintText::Item({
-                        //obscure text
-                        Text{"a labyrinthian toolbox for unlocking", /*french*/"des anti-portes labyrinthiques",            /*spanish*/"un conjunto laberíntico de cerrajero"},
-                        Text{"a labyrinthian dungeon season pass",   /*french*/"les rêves labyrinthiques d'un prisonnier",  /*spanish*/"un pase vip de mazmorras laberíntico"},
-                        Text{"a labyrinthian jingling ring",         /*french*/"des efface-serrures labyrinthiques",        /*spanish*/"una cadena multiusos laberíntica"},
-                        Text{"a labyrinthian skeleton key",          /*french*/"des crochets à porte labyrinthiques",       /*spanish*/"un anillo laberíntico contra cerrojos"},
-                      }, {
-                        //ambiguous text
-                        Text{"a key ring", /*french*/"un trousseau de clés", /*spanish*/"un llavero"},
-                      },
-                        //clear text
-                        Text{"a Gerudo Training Ground Key Ring", /*french*/"un trousseau de clés du Gymnase Gerudo", /*spanish*/"un llavero del Centro de Instrucción Gerudo"}
-     );
-    hintTable[RHT_GERUDO_FORTRESS_KEY_RING] = HintText::Item({
-                        //obscure text
-                        Text{"an imprisoned toolbox for unlocking", /*french*/"des anti-portes emprisonnés",            /*spanish*/"un conjunto enjaulado de cerrajero"},
-                        Text{"an imprisoned dungeon season pass",   /*french*/"les rêves emprisonnés d'un prisonnier",  /*spanish*/"un pase vip de una mazmorra enjaulado"},
-                        Text{"an imprisoned jingling ring",         /*french*/"des efface-serrures emprisonnés",        /*spanish*/"una cadena multiusos enjaulada"},
-                        Text{"an imprisoned skeleton key",          /*french*/"des crochets à porte emprisonnés",       /*spanish*/"un anillo enjaulado contra cerrojos"},
-                      }, {
-                        //ambiguous text
-                        Text{"a key ring", /*french*/"un trousseau de clés", /*spanish*/"un llavero"},
-                      },
-                        //clear text
-                        Text{"a Gerudo Fortress Key Ring", /*french*/"un trousseau de clés de la Repaire des Voleurs", /*spanish*/"un llavero de la Fortaleza Gerudo"}
-     );
-    hintTable[RHT_BOTTOM_OF_THE_WELL_KEY_RING] = HintText::Item({
-                        //obscure text
-                        Text{"a moldy toolbox for unlocking", /*french*/"des anti-portes moisis",            /*spanish*/"un conjunto subterráneo de cerrajero"},
-                        Text{"a moldy dungeon season pass",   /*french*/"les rêves moisis d'un prisonnier",  /*spanish*/"un pase vip de una mazmorra subterráneo"},
-                        Text{"a moldy jingling ring",         /*french*/"des efface-serrures moisis",        /*spanish*/"una cadena multiusos subterránea"},
-                        Text{"a moldy skeleton key",          /*french*/"des crochets à porte moisis",       /*spanish*/"un anillo subterráneo contra cerrojos"},
-                      }, {
-                        //ambiguous text
-                        Text{"a key ring", /*french*/"un trousseau de clés", /*spanish*/"un llavero"},
-                      },
-                        //clear text
-                        Text{"a Bottom of the Well Key Ring", /*french*/"un trousseau de clés du fond du Puits", /*spanish*/"un llavero del Fondo del pozo"}
-     );
-    hintTable[RHT_GANONS_CASTLE_KEY_RING] = HintText::Item({
-                        //obscure text
-                        Text{"a final toolbox for unlocking", /*french*/"des anti-portes finaux",            /*spanish*/"un conjunto decisivo de cerrajero"},
-                        Text{"a final dungeon season pass",   /*french*/"les rêves finaux d'un prisonnier",  /*spanish*/"un pase vip de una mazmorra decisivo"},
-                        Text{"a final jingling ring",         /*french*/"des efface-serrures finaux",        /*spanish*/"una cadena multiusos decisiva"},
-                        Text{"a final skeleton key",          /*french*/"des crochets à porte finaux",       /*spanish*/"un anillo decisivo multiusos"},
-                      }, {
-                        //ambiguous text
-                        Text{"a key ring", /*french*/"un trousseau de clés", /*spanish*/"un llavero"},
-                      },
-                        //clear text
-                        Text{"a Ganon's Castle Key Ring", /*french*/"un trousseau de clés du Château de Ganon", /*spanish*/"un llavero del Castillo de Ganon"}
-     );
-
-    hintTable[RHT_TREASURE_GAME_SMALL_KEY] = HintText::Item({
-                        //obscure text
-                        Text{"a gambler's tool for unlocking", /*french*/"un anti-porte de parieur",        /*spanish*/"una clave de un juego de azar"},
-                        Text{"a gambler's dungeon pass",       /*french*/"le rêve d'un prisonnier parieur", /*spanish*/"un pase de un juego de azar"},
-                        Text{"a gambler's lock remover",       /*french*/"un efface-serrure de parieur",    /*spanish*/"un destructor de cerraduras del juego de azar"},
-                        Text{"a gambler's lockpick",           /*french*/"un crochet à serrure de parieur", /*spanish*/"una apertura portentosa del juego de azar"},
-                      }, {
-                        //ambiguous text
-                        Text{"a small key", /*french*/"une petite clé", /*spanish*/"una llave pequeña"},
-                      },
-                        //clear text
-                        Text{"a Treasure Chest Shop Small Key", /*french*/"une petite clé de la chasse aux trésors", /*spanish*/"una llave pequeña del Cofre del Tesoro"}
-    );
-
-    hintTable[RHT_KOKIRI_EMERALD] = HintText::Item({
-                       //obscure text
-                       Text{"a green stone",       /*french*/"une pierre verte",               /*spanish*/"una piedra verde"},
-                       Text{"a gift before death", /*french*/"le dernier souffle d'un arbre", /*spanish*/"un obsequio testamentario"},
-                     }, {
-                       //ambiguous text
-                       Text{"a spiritual stone", /*french*/"une Pierre Ancestrale", /*spanish*/"una piedra espiritual"},
-                     },
-                       //clear text
-                       Text{"the Kokiri Emerald", /*french*/"l'Émeraude Kokiri", /*spanish*/"la Esmeralda de los Kokiri"}
-    );
-
-    hintTable[RHT_GORON_RUBY] = HintText::Item({
-                       //obscure text
-                       Text{"a red stone",       /*french*/"une pierre rouge",         /*spanish*/"una piedra carmín"},
-                       Text{"sworn brotherhood", /*french*/"un serment de fraternité", /*spanish*/"el juramento de hermanos de sangre"},
-                     }, {
-                       //ambiguous text
-                       Text{"a spiritual stone", /*french*/"une Pierre Ancestrale", /*spanish*/"una piedra espiritual"},
-                     },
-                       //clear text
-                       Text{"the Goron Ruby", /*french*/"le Rubis Goron", /*spanish*/"el Rubí de los Goron"}
-    );
-
-    hintTable[RHT_ZORA_SAPPHIRE] = HintText::Item({
-                       //obscure text
-                       Text{"a blue stone",       /*french*/"une pierre bleue",     /*spanish*/"una piedra celeste"},
-                       Text{"an engagement gift", /*french*/"un cadeau de mariage", /*spanish*/"un regalo de compromiso"},
-                     }, {
-                       //ambiguous text
-                       Text{"a spiritual stone", /*french*/"une Pierre Ancestrale", /*spanish*/"una piedra espiritual"},
-                     },
-                       //clear text
-                       Text{"the Zora Sapphire", /*french*/"le Saphir Zora", /*spanish*/"el Zafiro de los Zora"}
-    );
-
-    hintTable[RHT_FOREST_MEDALLION] = HintText::Item({
-                       //obscure text
-                       Text{"a green coin",       /*french*/"une pièce verte",    /*spanish*/"una moneda esmeralda"},
-                       Text{"Saria's friendship", /*french*/"l'amitié de Saria", /*spanish*/"la amistad de Saria"},
-                     }, {
-                       //ambiguous text
-                       Text{"a medallion", /*french*/"un médaillon", /*spanish*/"un medallón"},
-                     },
-                       //clear text
-                       Text{"the Forest Medallion", /*french*/"le Médaillon de la Forêt", /*spanish*/"el Medallón del Bosque"}
-    );
-
-    hintTable[RHT_FIRE_MEDALLION] = HintText::Item({
-                       //obscure text
-                       Text{"a red coin",      /*french*/"une pièce rouge",           /*spanish*/"una moneda rubí"},
-                       Text{"Darunia's power", /*french*/"la fraternité de Darunia", /*spanish*/"la fraternidad de Darunia"},
-                     }, {
-                       //ambiguous text
-                       Text{"a medallion", /*french*/"un médaillon", /*spanish*/"un medallón"},
-                     },
-                       //clear text
-                       Text{"the Fire Medallion", /*french*/"le Médaillon du Feu", /*spanish*/"el Medallón del Fuego"}
-    );
-
-    hintTable[RHT_WATER_MEDALLION] = HintText::Item({
-                       //obscure text
-                       Text{"a blue coin",  /*french*/"une pièce bleue",  /*spanish*/"una moneda zafiro"},
-                       Text{"Ruto's power", /*french*/"l'amour de Ruto", /*spanish*/"el amor de Ruto"},
-                     }, {
-                       //ambiguous text
-                       Text{"a medallion", /*french*/"un médaillon", /*spanish*/"un medallón"},
-                     },
-                       //clear text
-                       Text{"the Water Medallion", /*french*/"le Médaillon de l'Eau", /*spanish*/"el Medallón del Agua"}
-    );
-
-    hintTable[RHT_SPIRIT_MEDALLION] = HintText::Item({
-                       //obscure text
-                       Text{"an orange coin",  /*french*/"une pièce orange",       /*spanish*/"una moneda ámbar"},
-                       Text{"Nabooru's power", /*french*/"le respect de Nabooru", /*spanish*/"el respeto de Nabooru"},
-                     }, {
-                       //ambiguous text
-                       Text{"a medallion", /*french*/"un médaillon", /*spanish*/"un medallón"},
-                     },
-                       //clear text
-                       Text{"the Spirit Medallion", /*french*/"le Médaillon de l'Esprit", /*spanish*/"el Medallón del Espíritu"}
-    );
-
-    hintTable[RHT_SHADOW_MEDALLION] = HintText::Item({
-                       //obscure text
-                       Text{"a purple coin", /*french*/"une pièce pourpre",    /*spanish*/"una moneda malva"},
-                       Text{"Impa's power",  /*french*/"la confiance d'Impa", /*spanish*/"la confianza de Impa"},
-                     }, {
-                       //ambiguous text
-                       Text{"a medallion", /*french*/"un médaillon", /*spanish*/"un medallón"},
-                     },
-                       //clear text
-                       Text{"the Shadow Medallion", /*french*/"le Médaillon de l'Ombre", /*spanish*/"el Medallón de la Sombra"}
-    );
-
-    hintTable[RHT_LIGHT_MEDALLION] = HintText::Item({
-                       //obscure text
-                       Text{"a yellow coin", /*french*/"une pièce jaune",  /*spanish*/"una moneda resplandeciente"},
-                       Text{"Rauru's power", /*french*/"la foi de Rauru", /*spanish*/"la fe de Rauru"},
-                     }, {
-                       //ambiguous text
-                       Text{"a medallion", /*french*/"un médaillon", /*spanish*/"un medallón"},
-                     },
-                       //clear text
-                       Text{"the Light Medallion", /*french*/"le Médaillon de la Lumière", /*spanish*/"el Medallón de la Luz"}
-    );
-
-    hintTable[RHT_RECOVERY_HEART] = HintText::Item({
-                       //obscure text
-                       Text{"a free heal",   /*french*/"un bec-au-bobo", /*spanish*/"una cura de regalo"},
-                       Text{"a hearty meal", /*french*/"un petit amour",   /*spanish*/"una sanación romántica"},
-                       Text{"a Band-Aid",    /*french*/"un diachylon",     /*spanish*/"un corazoncito sanador"},
-                     }, {
-                       //ambiguous text
-                       Text{"something heart-shaped", /*french*/"une chose en forme de coeur", /*spanish*/"algo con forma de corazón"},
-                     },
-                       //clear text
-                       Text{"a Recovery Heart", /*french*/"un coeur de vie", /*spanish*/"un corazón"}
-    );
-
-    hintTable[RHT_GREEN_RUPEE] = HintText::Item({
-                       //obscure text
-                       Text{"a unique coin", /*french*/"un rubis bien mérité", /*spanish*/"una singular moneda"},
-                       Text{"a penny",       /*french*/"un sou",               /*spanish*/"un peso hyliano"},
-                       Text{"a green gem",   /*french*/"un joyau vert",        /*spanish*/"una gema verde"},
-                     }, {
-                       //ambiguous text
-                       Text{"some rupees", /*french*/"une quantité de rubis", /*spanish*/"una cantidad de rupias"},
-                     },
-                       //clear text
-                       Text{"a Green Rupee", /*french*/"un rubis vert", /*spanish*/"una rupia verde"}
-    );
-
-    hintTable[RHT_GREG_RUPEE] = HintText::Item({
-                       //obscure text
-                       Text{"an old friend",  /*french*/"Greg", /*spanish*/"Greg"},
-                       Text{"a glorious gem", /*french*/"Greg", /*spanish*/"Greg"},
-                     }, {
-                       //ambiguous text
-                       Text{"a Green Rupee", /*french*/"un rubis vert", /*spanish*/"una rupia verde"}
-                     },
-                       //clear text
-                       Text{"Greg", /*french*/"Greg", /*spanish*/"Greg"}
-    );
-
-    hintTable[RHT_BLUE_RUPEE] = HintText::Item({
-                       //obscure text
-                       Text{"a common coin", /*french*/"quelques sous", /*spanish*/"una moneda usual"},
-                       Text{"a blue gem",    /*french*/"un joyau bleu",  /*spanish*/"una gema azul"},
-                     }, {
-                       //ambiguous text
-                       Text{"some rupees", /*french*/"une quantité de rubis", /*spanish*/"una cantidad de rupias"},
-                     },
-                       //clear text
-                       Text{"a Blue Rupee", /*french*/"un rubis bleu", /*spanish*/"una rupia azul"}
-    );
-
-    hintTable[RHT_RED_RUPEE] = HintText::Item({
-                       //obscure text
-                       Text{"couch cash", /*french*/"un peu de fric", /*spanish*/"una buena moneda"},
-                       Text{"a red gem",  /*french*/"un joyau rouge", /*spanish*/"una gema roja"},
-                     }, {
-                       //ambiguous text
-                       Text{"some rupees", /*french*/"une quantité de rubis", /*spanish*/"una cantidad de rupias"},
-                     },
-                       //clear text
-                       Text{"a Red Rupee", /*french*/"un rubis rouge", /*spanish*/"una rupia roja"}
-    );
-
-    hintTable[RHT_PURPLE_RUPEE] = HintText::Item({
-                       //obscure text
-                       Text{"big bucks",    /*french*/"plein de fric",  /*spanish*/"plata de calidad"},
-                       Text{"a purple gem", /*french*/"un joyau mauve", /*spanish*/"una gema morada"},
-                       Text{"wealth",       /*french*/"la richesse",    /*spanish*/"una buena riqueza"},
-                     }, {
-                       //ambiguous text
-                       Text{"some rupees", /*french*/"une quantité de rubis", /*spanish*/"una cantidad de rupias"},
-                     },
-                       //clear text
-                       Text{"a Purple Rupee", /*french*/"un rubis pourpre", /*spanish*/"una rupia morada"}
-    );
-
-    hintTable[RHT_HUGE_RUPEE] = HintText::Item({
-                       //obscure text
-                       Text{"a juicy jackpot", /*french*/"le jackpot",           /*spanish*/"el premio gordo"},
-                       Text{"a yellow gem",    /*french*/"un joyau doré",         /*spanish*/"una gema amarilla"},
-                       Text{"a giant gem",     /*french*/"un gros joyau",         /*spanish*/"una gema descomunal"},
-                       Text{"great wealth",    /*french*/"l'aisance financière", /*spanish*/"dinero a caudales"},
-                     }, {
-                       //ambiguous text
-                       Text{"some rupees", /*french*/"une quantité de rubis", /*spanish*/"una cantidad de rupias"},
-                     },
-                       //clear text
-                       Text{"a Huge Rupee", /*french*/"un énorme rubis", /*spanish*/"una rupia gigante"}
-    );
-
-    hintTable[RHT_PIECE_OF_HEART] = HintText::Item({
-                       //obscure text
-                       Text{"a little love",  /*french*/"un peu plus d'amour", /*spanish*/"un cuarto de amor"},
-                       Text{"a broken heart", /*french*/"un coeur brisé",       /*spanish*/"un corazón roto"},
-                     }, {
-                       //ambiguous text
-                       Text{"something heart-shaped", /*french*/"une chose en forme de coeur", /*spanish*/"algo con forma de corazón"},
-                     },
-                       //clear text
-                       Text{"a Piece of Heart", /*french*/"un Quart de Coeur", /*spanish*/"una pieza de corazón"}
-    );
-
-    hintTable[RHT_HEART_CONTAINER] = HintText::Item({
-                       //obscure text
-                       Text{"a lot of love",      /*french*/"le grand amour",             /*spanish*/"amor por doquier"},
-                       Text{"a Valentine's gift", /*french*/"un cadeau de Saint-Valentin", /*spanish*/"un contenedor de afección"},
-                       Text{"a boss's organ",     /*french*/"un organe de monstre",        /*spanish*/"los órganos de un jefe"},
-                     }, {
-                       //ambiguous text
-                       Text{"something heart-shaped", /*french*/"une chose en forme de coeur", /*spanish*/"algo con forma de corazón"},
-                     },
-                       //clear text
-                       Text{"a Heart Container", /*french*/"un Réceptacle de Coeur", /*spanish*/"un contenedor de corazón"}
-    );
-
-    hintTable[RHT_ICE_TRAP] = HintText::Item({
-                       //obscure text
-                       Text{"a gift from Ganon",    /*french*/"un cadeau de Ganon",         /*spanish*/"un regalo de Ganon"},
-                       Text{"a chilling discovery", /*french*/"une frissonante découverte", /*spanish*/"un escalofriante hallazgo"},
-                       Text{"frosty fun",           /*french*/"une engelure",               /*spanish*/"una gélida diversión"},
-                     }, {
-                       //ambiguous text
-                       Text{"a Great Fairy's power", /*french*/"le pouvoir d'une grande fée", /*spanish*/"el poder de una Gran Hada"},
-                       Text{"a magic arrow", /*french*/"une flèche magique", /*spanish*/"una flecha mágica"},
-                       Text{"a medallion", /*french*/"un médaillon", /*spanish*/"un medallón"},
-                       Text{"a spiritual stone", /*french*/"une Pierre Ancestrale", /*spanish*/"una piedra espiritual"},
-                       Text{"something that can stun", /*french*/"une chose qui peut paralyser", /*spanish*/"algo que pueda paralizar"},
-                     },
-                       //clear text
-                       Text{"an Ice Trap", /*french*/"un Piège de Glace", /*spanish*/"una trampa de hielo"}
-    );
-
-  //RHT_MILK
-
-    hintTable[RHT_BOMBS_5] = HintText::Item({
-                       //obscure text
-                       Text{"a few explosives",  /*french*/"une poignée de pétards",       /*spanish*/"un par de explosivos"},
-                       Text{"a few blast balls", /*french*/"une poignée de boules bleues", /*spanish*/"un par de estallidos"},
-                     }, {
-                       //ambiguous text
-                       Text{"explosives", /*french*/"un paquet d'explosifs", /*spanish*/"un montón de explosivos"},
-                     },
-                       //clear text
-                       Text{"Bombs (5 pieces)", /*french*/"une demi-dizaine de bombes", /*spanish*/"unas (5) bombas"}
-    );
-
-    hintTable[RHT_BOMBS_10] = HintText::Item({
-                       //obscure text
-                       Text{"some explosives",  /*french*/"un paquet de pétards",       /*spanish*/"unos cuantos explosivos"},
-                       Text{"some blast balls", /*french*/"un paquet de boules bleues", /*spanish*/"unos cuantos estallidos"},
-                     }, {
-                       //ambiguous text
-                       Text{"explosives", /*french*/"un paquet d'explosifs", /*spanish*/"un montón de explosivos"},
-                     },
-                       //clear text
-                       Text{"Bombs (10 pieces)", /*french*/"une dizaine de bombes", /*spanish*/"unas (10) bombas"}
-    );
-
-    hintTable[RHT_BOMBS_20] = HintText::Item({
-                       //obscure text
-                       Text{"lots-o-explosives",     /*french*/"une abondance de pétards",       /*spanish*/"un puñado de explosivos"},
-                       Text{"plenty of blast balls", /*french*/"une abondance de boules bleues", /*spanish*/"bastantes estallidos"},
-                     }, {
-                       //ambiguous text
-                       Text{"explosives", /*french*/"un paquet d'explosifs", /*spanish*/"un montón de explosivos"},
-                     },
-                       //clear text
-                       Text{"Bombs (20 pieces)", /*french*/"une vingtaine de bombes", /*spanish*/"unas (20) bombas"}
-    );
-
-    hintTable[RHT_BOMBCHU_5] = HintText::Item({
-                       //obscure text
-                       Text{"a few mice bombs",     /*french*/"une poignée de mignons explosifs", /*spanish*/"un par de bombas roedoras"},
-                       Text{"a few proximity mice", /*french*/"une poignée de jouets à remonter", /*spanish*/"un par de explosivos ratoncitos"},
-                       Text{"a few wall crawlers",  /*french*/"une poignée de rapides grimpeurs", /*spanish*/"un par de trepaparedes"},
-                       Text{"a few trail blazers",  /*french*/"une poignée de zigzags éclatants", /*spanish*/"un par de ratas propulsadas"},
-                     }, {
-                       //ambiguous text
-                       Text{"a prize of the House of Skulltulas", /*french*/"un prix de la maison des Skulltulas", /*spanish*/"un obsequio de la Casa Skulltula"},
-                       Text{"explosives", /*french*/"un paquet d'explosifs", /*spanish*/"un montón de explosivos"},
-                     },
-                       //clear text
-                       Text{"Bombchus (5 pieces)", /*french*/"une demi-dizaine de Missiles", /*spanish*/"unos (5) bombchus"}
-    );
-
-    hintTable[RHT_BOMBCHU_10] = HintText::Item({
-                       //obscure text
-                       Text{"some mice bombs",     /*french*/"un paquet de mignons explosifs", /*spanish*/"unas cuantas bombas roedoras"},
-                       Text{"some proximity mice", /*french*/"un paquet de jouets à remonter", /*spanish*/"unos cuantos explosivos ratoncitos"},
-                       Text{"some wall crawlers",  /*french*/"un paquet de rapides grimpeurs", /*spanish*/"unos cuantos trepaparedes"},
-                       Text{"some trail blazers",  /*french*/"un paquet de zigzags éclatants", /*spanish*/"unas cuantas ratas propulsadas"},
-                     }, {
-                       //ambiguous text
-                       Text{"a prize of the House of Skulltulas", /*french*/"un prix de la maison des Skulltulas", /*spanish*/"un obsequio de la Casa Skulltula"},
-                       Text{"explosives", /*french*/"un paquet d'explosifs", /*spanish*/"un montón de explosivos"},
-                     },
-                       //clear text
-                       Text{"Bombchus (10 pieces)", /*french*/"une dizaine de Missiles", /*spanish*/"unos (10) bombchus"}
-    );
-
-    hintTable[RHT_BOMBCHU_20] = HintText::Item({
-                       //obscure text
-                       Text{"plenty of mice bombs",     /*french*/"une abondance de mignons explosifs", /*spanish*/"bastantes bombas roedoras"},
-                       Text{"plenty of proximity mice", /*french*/"une abondance de jouets à remonter", /*spanish*/"bastantes explosivos ratoncitos"},
-                       Text{"plenty of wall crawlers",  /*french*/"une abondance de rapides grimpeurs", /*spanish*/"bastantes trepaparedes"},
-                       Text{"plenty of trail blazers",  /*french*/"une abondance de zigzags éclatants", /*spanish*/"bastantes ratas propulsadas"},
-                     }, {
-                       //ambiguous text
-                       Text{"a prize of the House of Skulltulas", /*french*/"un prix de la maison des Skulltulas", /*spanish*/"un obsequio de la Casa Skulltula"},
-                       Text{"explosives", /*french*/"un paquet d'explosifs", /*spanish*/"un montón de explosivos"},
-                     },
-                       //clear text
-                       Text{"Bombchus (20 pieces)", /*french*/"une vingtaine de Missiles", /*spanish*/"unos (20) bombchus"}
-    );
-
-  //RHT_BOMBCHU_DROP
-
-    hintTable[RHT_ARROWS_5] = HintText::Item({
-                       //obscure text
-                       Text{"a few danger darts", /*french*/"une poignée d'obus",    /*spanish*/"un par de peligrosos dardos"},
-                       Text{"a few sharp shafts", /*french*/"une poignée de piquets", /*spanish*/"un par de puntas afiladas"},
-                     }, {
-                       //ambiguous text
-                       Text{"a projectile", /*french*/"un projectile", /*spanish*/"un proyectil"},
-                     },
-                       //clear text
-                       Text{"Arrows (5 pieces)", /*french*/"une demi-dizaine de flèches", /*spanish*/"unas (5) flechas"}
-    );
-
-    hintTable[RHT_ARROWS_10] = HintText::Item({
-                       //obscure text
-                       Text{"some danger darts", /*french*/"un paquet d'obus",     /*spanish*/"unos cuantos peligrosos dardos"},
-                       Text{"some sharp shafts", /*french*/"un paquet de piquets", /*spanish*/"unas cuantas puntas afiladas"},
-                     }, {
-                       //ambiguous text
-                       Text{"a projectile", /*french*/"un projectile", /*spanish*/"un proyectil"},
-                     },
-                       //clear text
-                       Text{"Arrows (10 pieces)", /*french*/"une dizaine de flèches", /*spanish*/"unas (10) flechas"}
-    );
-
-    hintTable[RHT_ARROWS_30] = HintText::Item({
-                       //obscure text
-                       Text{"plenty of danger darts", /*french*/"une abondance d'obus",     /*spanish*/"bastantes peligrosos dardos"},
-                       Text{"plenty of sharp shafts", /*french*/"une abondance de piquets", /*spanish*/"bastantes puntas afiladas"},
-                     }, {
-                       //ambiguous text
-                       Text{"a projectile", /*french*/"un projectile", /*spanish*/"un proyectil"},
-                     },
-                       //clear text
-                       Text{"Arrows (30 pieces)", /*french*/"une trentaine de flèches", /*spanish*/"unas (30) flechas"}
-    );
-
-    hintTable[RHT_DEKU_NUTS_5] = HintText::Item({
-                       //obscure text
-                       Text{"some nuts",       /*french*/"une poignée de noisettes",     /*spanish*/"un par de nueces"},
-                       Text{"some flashbangs", /*french*/"une poignée d'éclats",        /*spanish*/"un par de semillas aturdidoras"},
-                       Text{"some scrub spit", /*french*/"une poignée de crachats Mojo", /*spanish*/"un par de escupitajos deku"},
-                     }, {
-                       //ambiguous text
-                       Text{"some Deku munitions", /*french*/"un paquet de munitions Mojo", /*spanish*/"un montón de municiones Deku"},
-                       Text{"something that can stun", /*french*/"une chose qui peut paralyser", /*spanish*/"algo que pueda paralizar"},
-                     },
-                       //clear text
-                       Text{"Deku Nuts (5 pieces)", /*french*/"une demi-dizaine de noix Mojo", /*spanish*/"unas (5) nueces deku"}
-    );
-
-    hintTable[RHT_DEKU_NUTS_10] = HintText::Item({
-                       //obscure text
-                       Text{"lots-o-nuts",          /*french*/"un paquet de noisettes",     /*spanish*/"un puñado de nueces"},
-                       Text{"plenty of flashbangs", /*french*/"un paquet d'éclats",         /*spanish*/"unas cuantas semillas aturdidoras"},
-                       Text{"plenty of scrub spit", /*french*/"un paquet de crachats Mojo", /*spanish*/"unos cuantos escupitajos deku"},
-                     }, {
-                       //ambiguous text
-                       Text{"some Deku munitions", /*french*/"un paquet de munitions Mojo", /*spanish*/"un montón de municiones Deku"},
-                       Text{"something that can stun", /*french*/"une chose qui peut paralyser", /*spanish*/"algo que pueda paralizar"},
-                     },
-                       //clear text
-                       Text{"Deku Nuts (10 pieces)", /*french*/"une dizaine de noix Mojo", /*spanish*/"unas (10) nueces deku"}
-    );
-
-    hintTable[RHT_DEKU_SEEDS_30] = HintText::Item({
-                       //obscure text
-                       Text{"catapult ammo", /*french*/"un paquet de délicieuses munitions", /*spanish*/"un par de munición infantil"},
-                       Text{"lots-o-seeds",  /*french*/"un paquet de germes séchés",   /*spanish*/"un puñado de semillas"},
-                     }, {
-                       //ambiguous text
-                       Text{"a projectile", /*french*/"un projectile", /*spanish*/"un proyectil"},
-                       Text{"some Deku munitions", /*french*/"un paquet de munitions Mojo", /*spanish*/"un montón de municiones Deku"},
-                     },
-                       //clear text
-                       Text{"Deku Seeds (30 pieces)", /*french*/"une trentaine de graines Mojo", /*spanish*/"unas (30) semillas deku"}
-    );
-
-    hintTable[RHT_DEKU_STICK_1] = HintText::Item({
-                       //obscure text
-                       Text{"a breakable branch", /*french*/"un bout de bois", /*spanish*/"un pequeño báculo"},
-                     }, {
-                       //ambiguous text
-                       Text{"some Deku munitions", /*french*/"un paquet de munitions Mojo", /*spanish*/"un montón de municiones Deku"},
-                     },
-                       //clear text
-                       Text{"a Deku Stick", /*french*/"un bâton Mojo", /*spanish*/"un palo deku"}
-    );
-
-    hintTable[RHT_TREASURE_GAME_HEART] = HintText::Item({
-                       //obscure text
-                       Text{"a victory valentine", /*french*/"un amour gagnant", /*spanish*/"el amor victorioso"},
-                     }, {
-                       //ambiguous text
-                       Text{"something heart-shaped", /*french*/"une chose en forme de coeur", /*spanish*/"algo con forma de corazón"},
-                     },
-                       //clear text
-                       Text{"a Piece of Heart", /*french*/"un Quart de Coeur", /*spanish*/"el amor de la victoria"}
-    );
-
-    hintTable[RHT_TREASURE_GAME_GREEN_RUPEE] = HintText::Item({
-                       //obscure text
-                       Text{"the dollar of defeat", /*french*/"le rubis de la défaite", /*spanish*/"el peso de la derrota"},
-                     }, {
-                       //ambiguous text
-                       Text{"some rupees", /*french*/"une quantité de rubis", /*spanish*/"una cantidad de rupias"},
-                     },
-                       //clear text
-                       Text{"a Green Rupee", /*french*/"un rubis vert", /*spanish*/"una rupia verde"}
-    );
-
-    hintTable[RHT_TRIFORCE_PIECE] = HintText::Item({
-                       //obscure text
-                       Text{"a triumph fork",  /*french*/"la Tribosse",     /*spanish*/"un trígono del triunfo"},
-                       Text{"cheese",          /*french*/"du fromage",      /*spanish*/"un porción de queso"},
-                       Text{"a gold fragment", /*french*/"un fragment d'or", /*spanish*/"un fragmento dorado"},
-                     }, {},
-                       //clear text
-                       Text{"a Piece of the Triforce", /*french*/"un fragment de la Triforce", /*spanish*/"un fragmento de la Trifuerza"}
-    );
-
-    hintTable[RHT_GOHMA_SOUL] = HintText::Item({
-                      //obscure text
-                      Text{"an invasive soul", "", ""},
-                      Text{"some spider essence", "", ""},
-                    }, {
-                      //ambiguous text
-                      Text{"something webbed", "", ""}
-                    }, {
-                      //clear text
-                      Text{"the soul of Gohma", "", ""}}
-    );
-
-    hintTable[RHT_KING_DODONGO_SOUL] = HintText::Item({
-                      //obscure text
-                      Text{"a royal soul", "", ""},
-                      Text{"some reptile essence", "", ""},
-                    }, {
-                      //ambiguous text
-                      Text{"something explosive", "", ""}
-                    }, {
-                      //clear text
-                      Text{"the soul of King Dodongo", "", ""}}
-      );
-
-    hintTable[RHT_BARINADE_SOUL] = HintText::Item({
-                      //obscure text
-                      Text{"an infectuous soul", "", ""},
-                      Text{"some parasitic essence", "", ""},
-                    }, {
-                      //ambiguous text
-                      Text{"something fishy", "", ""}
-                    }, {
-                      //clear text
-                      Text("the soul of Barinade", "", "")}
-      );
-
-    hintTable[RHT_PHANTOM_GANON_SOUL] = HintText::Item({
-                      //obscure text
-                      Text{"a duplicate soul", "", ""},
-                      Text{"some illusionary essence", "", ""},
-                    }, {
-                      //ambiguous text
-                      Text{"something spectral", "", ""}
-                    }, {
-                      //clear text
-                      Text{"the soul of Phantom Ganon", "", ""}}
-      );
-
-    hintTable[RHT_VOLVAGIA_SOUL] = HintText::Item({
-                      //obscure text
-                      Text{"a draconic soul", "", ""},
-                      Text{"some magmatic essence", "", ""},
-                    }, {
-                      //ambiguous text
-                      Text{"something hot", "", ""}
-                    }, {
-                      //clear text
-                      Text{"the soul of Volvagia", "", ""}}
-     );
-
-    hintTable[RHT_MORPHA_SOUL] = HintText::Item({
-                      //obscure text
-                      Text{"an aquatic soul", "", ""},
-                      Text{"some liquid essence", "", ""},
-                    }, {
-                      //ambiguous text
-                      Text{"something wet", "", ""}
-                    }, {
-                      //clear text
-                      Text{"the soul of Barinade", "", ""}}
-     );
-
-    hintTable[RHT_BONGO_BONGO_SOUL] = HintText::Item({
-                      //obscure text
-                      Text{"a shadowy soul", "", ""},
-                      Text{"some handy essence", "", ""},
-                    }, {
-                      //ambiguous text
-                      Text{"something dark", "", ""}
-                    }, {
-                      //clear text
-                      Text{"the soul of Bongo Bongo", "", ""}}
-     );
-
-    hintTable[RHT_TWINROVA_SOUL] = HintText::Item({
-                      //obscure text
-                      Text{"old souls", "", ""},
-                      Text{"twin essences", "", ""},
-                    }, {
-                      //ambiguous text
-                      Text{"something spiritual", "", ""}
-                    }, {
-                      //clear text
-                      Text{"the soul of Twinrova", "", ""}}
-     );
-
-    hintTable[RHT_GANON_SOUL] = HintText::Item({
-                      //obscure text
-                      Text{"an evil soul", "", ""},
-                      Text{"some powerful essence", "", ""},
-                    }, {
-                      //ambiguous text
-                      Text{"something strong", "", ""}
-                    }, {
-                      //clear text
-                      Text{"the soul of Ganon", "", ""}}
-     );
-
-    hintTable[RHT_OCARINA_A_BUTTON] = HintText::Item({
-                      //obscure text
-                      Text{"a musical letter", /*french*/"une lettre musicale", /*spanish*/"una letra musical"},
-                    }, {
-                      //ambiguous text
-                      Text{"something melodic", /*french*/"quelque chose de mélodieux", /*spanish*/"algo melódico"}
-                    }, {
-                      //clear text
-                      Text{"an Ocarina A Button", /*french*/"la Touche A de l'Ocarina", /*spanish*/"un botón A de Ocarina"}}
-     );
-
-    hintTable[RHT_OCARINA_C_UP_BUTTON] = HintText::Item({
-                      //obscure text
-                      Text{"a high tone", /*french*/"une tonalité élevée", /*spanish*/"un tono alto"},
-                    }, {
-                      //ambiguous text
-                      Text{"something melodic", /*french*/"quelque chose de mélodieux", /*spanish*/"algo melódico"}
-                    }, {
-                      //clear text
-                      Text{"an Ocarina C Up Button", /*french*/"la Touche C-Haut de l'Ocarina", /*spanish*/"un botón C superior de Ocarina"}}
-     );
-
-    hintTable[RHT_OCARINA_C_DOWN_BUTTON] = HintText::Item({
-                      //obscure text
-                      Text{"a low tone", /*french*/"une tonalité basse", /*spanish*/"un tono bajo"},
-                    }, {
-                      //ambiguous text
-                      Text{"something melodic", /*french*/"quelque chose de mélodieux", /*spanish*/"algo melódico"}
-                    }, {
-                      //clear text
-                      Text{"an Ocarina C Down Button", /*french*/"la Touche C-Bas de l'Ocarina", /*spanish*/"un botón C inferior de Ocarina"}}
-     );
-
-    hintTable[RHT_OCARINA_C_LEFT_BUTTON] = HintText::Item({
-                      //obscure text
-                      Text{"a leftward tone", /*french*/"une tonalité vers la gauche", /*spanish*/"un tono hacia la izquierda"},
-                    }, {
-                      //ambiguous text
-                      Text{"something melodic", /*french*/"quelque chose de mélodieux", /*spanish*/"algo melódico"}
-                    }, {
-                      //clear text
-                      Text{"an Ocarina C Left Button", /*french*/"la Touche C-Gauche de l'Ocarina", /*spanish*/"un botón C izquierdo de Ocarina"}}
-     );
-
-    hintTable[RHT_OCARINA_C_RIGHT_BUTTON] = HintText::Item({
-                      //obscure text
-                      Text{"a rightward tone", /*french*/"une tonalité vers la droite", /*spanish*/"un tono hacia la derecha"},
-                    }, {
-                      //ambiguous text
-                      Text{"something melodic", /*french*/"quelque chose de mélodieux", /*spanish*/"algo melódico"}
-                    }, {
-                      //clear text
-                      Text{"an Ocarina C Right Button", /*french*/"la Touche C-Droit de l'Ocarina", /*spanish*/"un botón C derecho de Ocarina"}}
-     );
-
-    hintTable[RHT_FISHING_POLE] = HintText::Item({
-                       //obscure text
-                       Text{"a fish-puller", /*french*/"(canne à pêche)", /*spanish*/"(caña de pescar)"},
-                     }, {
-                       //ambiguous text
-                       Text{"the pond owner's property", /*french*/"(canne à pêche)", /*spanish*/"(caña de pescar)"},
-                     },
-                       //clear text
-                       Text{"a fishing pole", /*french*/"canne à pêche", /*spanish*/"caña de pescar"}
-    );
-
-    hintTable[RHT_EPONA] = HintText::Item({
-                       //obscure text
-                       Text{"a horse",              /*french*/"un fidèle destrier", /*spanish*/"una yegua"},
-                       Text{"a four legged friend", /*french*/"un puissant animal", /*spanish*/"una amiga cuadrúpeda"},
-                     }, {
-                       //ambiguous text
-                       Text{"something from Malon", /*french*/"un cadeau de Malon", /*spanish*/"un obsequio de Malon"},
-                       Text{"a song sung by frogs", /*french*/"une chanson aimée des grenouilles", /*spanish*/"una melodía de ranas"},
-                       Text{"something to cross a broken bridge", /*french*/"une chose pour traverser un pont brisé", /*spanish*/"algo para cruzar un puente roto"},
-                     },
-                       //clear text
-                       Text{"Epona", /*french*/"Epona", /*spanish*/"a Epona"}
-    );
-    hintTable[RHT_HINT_MYSTERIOUS] = HintText::Item({
-      Text{"something mysterious", /*french*/"un sacré mystère",  /*spanish*/"algo misterioso", /*german*/"etwas Unvorhergesehenes"},
-      Text{"an unknown treasure",  /*french*/"un trésor inconnu", /*spanish*/"un desconocido tesoro", /*german*/"ein unbekannter Schatz"},
-    });
-
-    // [RHT_HINT_ERROR] = HintText::Item({
-    //                      //obscure text
-    //                      Text{"something mysterious", /*french*/"un sacré mystère", /*spanish*/"algo misterioso"},
-    //                      Text{"an unknown treasure",  /*french*/"un trésor inconnu", /*spanish*/"un desconocido tesoro"},
-    //                    },
-    //                      //clear text
-    //                      Text{"An Error (Please Report This)", /*french*/"une erreur (signaler S.V.P.)", /*spanish*/"un error (repórtelo si es posible)"}
-    // );
+#include "../../static_data.h"
+#include "../hints.hpp"
+#include "../../../custom-message/CustomMessageManager.h"
+
+namespace Rando {
+
+void StaticData::HintTable_Init_Item() {
+    
+    hintTextTable[RHT_KOKIRI_SWORD] = HintText(CustomMessage("the Kokiri Sword", /*german*/"", /*french*/"l'Épée Kokiri"),
+                                               // /*spanish*/la Espada Kokiri
+                                               {
+                                               CustomMessage("a sword", /*german*/"", /*french*/"une épée")
+                                                // /*spanish*/una espada
+                                               }, {
+                                               CustomMessage("a butter knife", /*german*/"", /*french*/"un couteau à beurre"),
+                                                // /*spanish*/un ágil puñal
+                                               CustomMessage("a starter slasher", /*german*/"", /*french*/"une arme de débutant"),
+                                                // /*spanish*/una hoja de principiantes
+                                               CustomMessage("a switchblade", /*german*/"", /*french*/"un canif")});
+                                                // /*spanish*/una navaja
+
+    hintTextTable[RHT_MASTER_SWORD] = HintText(CustomMessage("the Master Sword", /*german*/"", /*french*/"l'Épée de Légende"),
+                                               // /*spanish*/la Espada Maestra
+                                               {
+                                               CustomMessage("a sword", /*german*/"", /*french*/"une épée")
+                                                // /*spanish*/una espada
+                                               }, {
+                                               CustomMessage("evil's bane", /*german*/"", /*french*/"le fléau du mal"),
+                                                // /*spanish*/la destructora del mal
+                                               CustomMessage("a seven year limbo", /*german*/"", /*french*/"une stase de sept ans")});
+                                                // /*spanish*/unos siete años de espera
+
+    hintTextTable[RHT_GIANTS_KNIFE] = HintText(CustomMessage("the Giant's Knife", /*german*/"", /*french*/"la Lame des Géants"),
+                                               // /*spanish*/la daga gigante
+                                               {
+                                               CustomMessage("a sword", /*german*/"", /*french*/"une épée")
+                                                // /*spanish*/una espada
+                                               }, {
+                                               CustomMessage("a fragile blade", /*german*/"", /*french*/"une lame fragile"),
+                                                // /*spanish*/una frágil hoja
+                                               CustomMessage("a breakable cleaver", /*german*/"", /*french*/"un espadon de verre")});
+                                                // /*spanish*/un rompible acero
+
+    hintTextTable[RHT_BIGGORON_SWORD] = HintText(CustomMessage("the Biggoron Sword", /*german*/"", /*french*/"l'Épée de Biggoron"),
+                                                 // /*spanish*/la Espada de Biggoron
+                                                 {
+                                                 CustomMessage("a sword", /*german*/"", /*french*/"une épée")
+                                                  // /*spanish*/una espada
+                                                 }, {
+                                                 CustomMessage("the biggest blade", /*german*/"", /*french*/"une lame gigantesque"),
+                                                  // /*spanish*/el mayor mandoble
+                                                 CustomMessage("a colossal cleaver", /*german*/"", /*french*/"un espadon colossal")});
+                                                  // /*spanish*/un estoque colosal
+
+    hintTextTable[RHT_DEKU_SHIELD] = HintText(CustomMessage("a Deku Shield", /*german*/"", /*french*/"un Bouclier Mojo"),
+                                              // /*spanish*/un escudo deku
+                                              {
+                                              CustomMessage("a shield", /*german*/"", /*french*/"un bouclier")
+                                               // /*spanish*/un escudo
+                                              }, {
+                                              CustomMessage("a wooden ward", /*german*/"", /*french*/"un écu d'écorce"),
+                                               // /*spanish*/una protección del bosque
+                                              CustomMessage("a burnable barrier", /*german*/"", /*french*/"une protection inflammable")});
+                                               // /*spanish*/una barrera quemable
+
+    hintTextTable[RHT_HYLIAN_SHIELD] = HintText(CustomMessage("a Hylian Shield", /*german*/"", /*french*/"un Bouclier Hylien"),
+                                                // /*spanish*/un escudo hyliano
+                                                {
+                                                CustomMessage("a shield", /*german*/"", /*french*/"un bouclier")
+                                                 // /*spanish*/un escudo
+                                                }, {
+                                                CustomMessage("a steel safeguard", /*german*/"", /*french*/"une carapace d'acier"),
+                                                 // /*spanish*/una protección de acero
+                                                CustomMessage("Like Like's metal meal", /*german*/"", /*french*/"un amuse-gueule de Pudding")});
+                                                 // /*spanish*/un alimento de Like Like
+
+    hintTextTable[RHT_MIRROR_SHIELD] = HintText(CustomMessage("the Mirror Shield", /*german*/"", /*french*/"le Bouclier Miroir"),
+                                                // /*spanish*/el escudo espejo
+                                                {
+                                                CustomMessage("a shield", /*german*/"", /*french*/"un bouclier")
+                                                 // /*spanish*/un escudo
+                                                }, {
+                                                CustomMessage("a reflective rampart", /*german*/"", /*french*/"un capteur de lumière"),
+                                                 // /*spanish*/una muralla reflectora
+                                                CustomMessage("Medusa's weakness", /*german*/"", /*french*/"la faiblesse de Méduse"),
+                                                 // /*spanish*/la debilidad de Medusa
+                                                CustomMessage("a silvered surface", /*german*/"", /*french*/"une surface argentée")});
+                                                 // /*spanish*/una superficie plateada
+
+    hintTextTable[RHT_GORON_TUNIC] = HintText(CustomMessage("a Goron Tunic", /*german*/"", /*french*/"une Tunique Goron"),
+                                              // /*spanish*/un sayo goron
+                                              {
+                                              CustomMessage("a tunic", /*german*/"", /*french*/"une tunique")
+                                               // /*spanish*/un sayo
+                                              }, {
+                                              CustomMessage("ruby robes", /*german*/"", /*french*/"un pigment rouge"),
+                                               // /*spanish*/una vestimenta rubí
+                                              CustomMessage("fireproof fabric", /*german*/"", /*french*/"un trésor anti-flamme"),
+                                               // /*spanish*/una ignífuga prenda
+                                              CustomMessage("cooking clothes", /*german*/"", /*french*/"une tenue de cuisine")});
+                                               // /*spanish*/unos abrasantes ropajes
+
+    hintTextTable[RHT_ZORA_TUNIC] = HintText(CustomMessage("a Zora Tunic", /*german*/"", /*french*/"une Tunique Zora"),
+                                             // /*spanish*/un sayo zora
+                                             {
+                                             CustomMessage("a tunic", /*german*/"", /*french*/"une tunique"),
+                                              // /*spanish*/un sayo
+                                             CustomMessage("something expensive", /*german*/"", /*french*/"une chose dispendieuse")
+                                              // /*spanish*/algo caro
+                                             }, {
+                                             CustomMessage("a sapphire suit", /*german*/"", /*french*/"un pigment bleuté"),
+                                              // /*spanish*/una vestidura zafiro
+                                             CustomMessage("scuba gear", /*german*/"", /*french*/"un habit de plongée"),
+                                              // /*spanish*/un traje impermeable
+                                             CustomMessage("a swimsuit", /*german*/"", /*french*/"un costume de baignade")});
+                                              // /*spanish*/unos ropajes sumergibles
+
+    hintTextTable[RHT_IRON_BOOTS] = HintText(CustomMessage("the Iron Boots", /*german*/"", /*french*/"une paire de Bottes de plomb"),
+                                             // /*spanish*/las botas de hierro
+                                             {
+                                             CustomMessage("some boots", /*german*/"", /*french*/"une paire de bottes"),
+                                              // /*spanish*/un par de botas
+                                             CustomMessage("a feature of the Water Temple", /*german*/"", /*french*/"une particularité du Temple de l'Eau"),
+                                              // /*spanish*/algo particular del Templo del Agua
+                                             CustomMessage("something heavy", /*german*/"", /*french*/"une chose pesante")
+                                              // /*spanish*/algo de lo más pesado
+                                             }, {
+                                             CustomMessage("sink shoes", /*german*/"", /*french*/"un boulet de fer"),
+                                              // /*spanish*/un calzado de las profundidades
+                                             CustomMessage("clank cleats", /*german*/"", /*french*/"une paire de talons bruyants")});
+                                              // /*spanish*/unas suelas férreas
+
+    hintTextTable[RHT_HOVER_BOOTS] = HintText(CustomMessage("the Hover Boots", /*german*/"", /*french*/"une paire de Bottes des airs"),
+                                              // /*spanish*/las botas voladoras
+                                              {
+                                              CustomMessage("some boots", /*german*/"", /*french*/"une paire de bottes")
+                                               // /*spanish*/un par de botas
+                                              }, {
+                                              CustomMessage("butter boots", /*german*/"", /*french*/"une paire de patins de beurre"),
+                                               // /*spanish*/unas suelas resvaladizas
+                                              CustomMessage("sacred slippers", /*german*/"", /*french*/"une paire de pantoufles sacrées"),
+                                               // /*spanish*/unos escurridizos botines
+                                              CustomMessage("spacewalkers", /*german*/"", /*french*/"une paire de bottes spatiales")});
+                                               // /*spanish*/un calzado antigravitatorio
+
+    hintTextTable[RHT_ZELDAS_LETTER] = HintText(CustomMessage("Zelda's Letter", /*german*/"", /*french*/"la Lettre de Zelda"),
+                                                // /*spanish*/la carta de Zelda
+                                                {}, {
+                                                CustomMessage("an autograph", /*german*/"", /*french*/"un autographe"),
+                                                 // /*spanish*/un autógrafo
+                                                CustomMessage("royal stationery", /*german*/"", /*french*/"du papier royal"),
+                                                 // /*spanish*/un escrito real
+                                                CustomMessage("royal snail mail", /*german*/"", /*french*/"une enveloppe royale")});
+                                                 // /*spanish*/correo de la realeza
+
+    hintTextTable[RHT_WEIRD_EGG] = HintText(CustomMessage("the Weird Egg", /*german*/"", /*french*/"l'Oeuf Curieux"),
+                                            // /*spanish*/el huevo extraño
+                                            {
+                                            CustomMessage("an egg", /*german*/"", /*french*/"un oeuf")
+                                             // /*spanish*/un huevo
+                                            }, {
+                                            CustomMessage("a chicken dilemma", /*german*/"", /*french*/"un drôle d'ovale")});
+                                             // /*spanish*/el dilema de la gallina
+
+    hintTextTable[RHT_BOOMERANG] = HintText(CustomMessage("the Boomerang", /*german*/"", /*french*/"le Boomerang"),
+                                            // /*spanish*/el bumerán
+                                            {
+                                            CustomMessage("something that can grab things", /*german*/"", /*french*/"une chose qui peut attraper"),
+                                             // /*spanish*/algo que pueda agarrar cosas
+                                            CustomMessage("something that can stun", /*german*/"", /*french*/"une chose qui peut paralyser")
+                                             // /*spanish*/algo que pueda paralizar
+                                            }, {
+                                            CustomMessage("a banana", /*german*/"", /*french*/"une banane"),
+                                             // /*spanish*/un plátano
+                                            CustomMessage("a stun stick", /*german*/"", /*french*/"un bâton étourdissant"),
+                                             // /*spanish*/un palo aturdidor
+                                            CustomMessage("a yellow angle", /*german*/"", /*french*/"un angle jaune")});
+                                             // /*spanish*/un ángulo amarillo
+
+    hintTextTable[RHT_LENS_OF_TRUTH] = HintText(CustomMessage("the Lens of Truth", /*german*/"", /*french*/"le Monocle de Vérité"),
+                                                // /*spanish*/la Lupa de la Verdad
+                                                {
+                                                CustomMessage("a secret-finding tool", /*german*/"", /*french*/"un cherche-secrets")
+                                                 // /*spanish*/un instrumento para hallar objetos
+                                                }, {
+                                                CustomMessage("a lie detector", /*german*/"", /*french*/"un détecteur de mensonges"),
+                                                 // /*spanish*/el detector de ilusiones
+                                                CustomMessage("a ghost tracker", /*german*/"", /*french*/"un trouve-fantôme"),
+                                                 // /*spanish*/el rastreador paranormal
+                                                CustomMessage("true sight", /*german*/"", /*french*/"le troisième œil"),
+                                                 // /*spanish*/el ojo que todo ve
+                                                CustomMessage("a detective's tool", /*german*/"", /*french*/"un trésor Sheikah")});
+                                                 // /*spanish*/la revelación verdadera
+
+    hintTextTable[RHT_MEGATON_HAMMER] = HintText(CustomMessage("the Megaton Hammer", /*german*/"", /*french*/"la Masse des Titans"),
+                                                 // /*spanish*/el martillo Megatón
+                                                 {
+                                                 CustomMessage("something that can remove boulders", /*german*/"", /*french*/"une chose qui enlève les rochers")
+                                                  // /*spanish*/algo que pueda quitar rocas
+                                                 }, {
+                                                 CustomMessage("the dragon smasher", /*german*/"", /*french*/"le tueur de dragons"),
+                                                  // /*spanish*/un destructor de dragones
+                                                 CustomMessage("the metal mallet", /*german*/"", /*french*/"un outil de construction"),
+                                                  // /*spanish*/un mazo de metal
+                                                 CustomMessage("the heavy hitter", /*german*/"", /*french*/"un poids lourd")});
+                                                  // /*spanish*/un machacador
+
+    hintTextTable[RHT_STONE_OF_AGONY] = HintText(CustomMessage("the Stone of Agony", /*german*/"", /*french*/"la Pierre de Souffrance"),
+                                                 // /*spanish*/la Piedra de la Agonía
+                                                 {
+                                                 CustomMessage("a prize of the House of Skulltulas", /*german*/"", /*french*/"un prix de la maison des Skulltulas"),
+                                                  // /*spanish*/un obsequio de la Casa Skulltula
+                                                 CustomMessage("a secret-finding tool", /*german*/"", /*french*/"un cherche-secrets")
+                                                  // /*spanish*/un instrumento para hallar objetos
+                                                 }, {
+                                                 CustomMessage("the shake stone", /*german*/"", /*french*/"le fragment vibrant"),
+                                                  // /*spanish*/el fragmento tintineante
+                                                 CustomMessage("a gray alarm", /*german*/"", /*french*/"une alerte bleue")});
+                                                  // /*spanish*/una azul alarma
+
+    hintTextTable[RHT_DINS_FIRE] = HintText(CustomMessage("Din's Fire", /*german*/"", /*french*/"le Feu de Din"),
+                                            // /*spanish*/el Fuego de Din
+                                            {
+                                            CustomMessage("a Great Fairy's power", /*german*/"", /*french*/"le pouvoir d'une grande fée")
+                                             // /*spanish*/el poder de una Gran Hada
+                                            }, {
+                                            CustomMessage("an inferno", /*german*/"", /*french*/"un brasier"),
+                                             // /*spanish*/un incendio
+                                            CustomMessage("a heat wave", /*german*/"", /*french*/"une vague de chaleur"),
+                                             // /*spanish*/una onda de calor
+                                            CustomMessage("a red ball", /*german*/"", /*french*/"une explosion de flammes")});
+                                             // /*spanish*/una roja esfera
+
+    hintTextTable[RHT_FARORES_WIND] = HintText(CustomMessage("Farore's Wind", /*german*/"", /*french*/"le Vent de Farore"),
+                                               // /*spanish*/el Viento de Farore
+                                               {
+                                               CustomMessage("a Great Fairy's power", /*german*/"", /*french*/"le pouvoir d'une grande fée")
+                                                // /*spanish*/el poder de una Gran Hada
+                                               }, {
+                                               CustomMessage("teleportation", /*german*/"", /*french*/"la téléportation"),
+                                                // /*spanish*/un teletransportador
+                                               CustomMessage("a relocation rune", /*german*/"", /*french*/"une rune de relocation"),
+                                                // /*spanish*/una runa de transporte
+                                               CustomMessage("a green ball", /*german*/"", /*french*/"une boule verte")});
+                                                // /*spanish*/una verde esfera
+
+    hintTextTable[RHT_NAYRUS_LOVE] = HintText(CustomMessage("Nayru's Love", /*german*/"", /*french*/"l'Amour de Nayru"),
+                                              // /*spanish*/el Amor de Nayru
+                                              {
+                                              CustomMessage("a Great Fairy's power", /*german*/"", /*french*/"le pouvoir d'une grande fée")
+                                               // /*spanish*/el poder de una Gran Hada
+                                              }, {
+                                              CustomMessage("a safe space", /*german*/"", /*french*/"une bulle de cristal"),
+                                               // /*spanish*/una seguridad temporal
+                                              CustomMessage("an impregnable aura", /*german*/"", /*french*/"un aura impénétrable"),
+                                               // /*spanish*/un aura impenetrable
+                                              CustomMessage("a blue barrier", /*german*/"", /*french*/"une toison bleu")});
+                                               // /*spanish*/una barrera azul
+
+    hintTextTable[RHT_FIRE_ARROWS] = HintText(CustomMessage("the Fire Arrows", /*german*/"", /*french*/"les Flèches de Feu"),
+                                              // /*spanish*/la flecha de fuego
+                                              {
+                                              CustomMessage("a magic arrow", /*german*/"", /*french*/"une flèche magique")
+                                               // /*spanish*/una flecha mágica
+                                              }, {
+                                              CustomMessage("the furnace firearm", /*german*/"", /*french*/"une fusée solaire"),
+                                               // /*spanish*/el ardiente aguijón
+                                              CustomMessage("the burning bolts", /*german*/"", /*french*/"un obus enflammé"),
+                                               // /*spanish*/las puntas ígneas
+                                              CustomMessage("a magma missile", /*german*/"", /*french*/"un missile volcanique")});
+                                               // /*spanish*/el misil abrasador
+
+    hintTextTable[RHT_ICE_ARROWS] = HintText(CustomMessage("the Ice Arrows", /*german*/"", /*french*/"les Flèches de Glace"),
+                                             // /*spanish*/la flecha de hielo
+                                             {
+                                             CustomMessage("a magic arrow", /*german*/"", /*french*/"une flèche magique"),
+                                              // /*spanish*/una flecha mágica
+                                             CustomMessage("something that can stun", /*german*/"", /*french*/"une chose qui peut paralyser")
+                                              // /*spanish*/algo que pueda paralizar
+                                             }, {
+                                             CustomMessage("the refrigerator rocket", /*german*/"", /*french*/"un missile pétrifiant"),
+                                              // /*spanish*/el misil congelador
+                                             CustomMessage("the frostbite bolts", /*german*/"", /*french*/"un froid mordant"),
+                                              // /*spanish*/las puntas gélidas
+                                             CustomMessage("an iceberg maker", /*german*/"", /*french*/"une aiguille glaciale")});
+                                              // /*spanish*/el control de escarcha
+
+    hintTextTable[RHT_LIGHT_ARROWS] = HintText(CustomMessage("the Light Arrows", /*german*/"", /*french*/"les Flèches de Lumière"),
+                                               // /*spanish*/la flecha de luz
+                                               {
+                                               CustomMessage("a magic arrow", /*german*/"", /*french*/"une flèche magique")
+                                                // /*spanish*/una flecha mágica
+                                               }, {
+                                               CustomMessage("the shining shot", /*german*/"", /*french*/"l'arme brillante"),
+                                                // /*spanish*/el haz de luz
+                                               CustomMessage("the luminous launcher", /*german*/"", /*french*/"un jet de lumière"),
+                                                // /*spanish*/el disparo luminoso
+                                               CustomMessage("Ganondorf's bane", /*german*/"", /*french*/"le fléau de Ganondorf"),
+                                                // /*spanish*/la perdición de Ganondorf
+                                               CustomMessage("the lighting bolts", /*german*/"", /*french*/"l'éclair sacré")});
+                                                // /*spanish*/las puntas resplandecientes
+
+    hintTextTable[RHT_GERUDO_MEMBERSHIP_CARD] = HintText(CustomMessage("the Gerudo Membership Card", /*german*/"", /*french*/"la Carte Gerudo"),
+                                                         // /*spanish*/el pase de socio gerudo
+                                                         {
+                                                         CustomMessage("a token of recognition", /*german*/"", /*french*/"une preuve de reconnaissance")
+                                                          // /*spanish*/una prueba de reconocimiento
+                                                         }, {
+                                                         CustomMessage("a girl club membership", /*german*/"", /*french*/"une carte de membre"),
+                                                          // /*spanish*/una fémina membresía
+                                                         CustomMessage("a desert tribe's pass", /*german*/"", /*french*/"un laissez-passer")});
+                                                          // /*spanish*/el vale del desierto
+
+    hintTextTable[RHT_MAGIC_BEAN] = HintText(CustomMessage("a Magic Bean", /*german*/"", /*french*/"un Haricot Magique"),
+                                             // /*spanish*/una judía mágica
+                                             {
+                                             CustomMessage("something sometimes buried", /*german*/"", /*french*/"une chose parfois enterrée")
+                                              // /*spanish*/algo a veces enterrado
+                                             }, {
+                                             CustomMessage("a wizardly legume", /*german*/"", /*french*/"un légume ensorcelé")});
+                                              // /*spanish*/una legumbre hechizada
+
+    hintTextTable[RHT_MAGIC_BEAN_PACK] = HintText(CustomMessage("Magic Beans", /*german*/"", /*french*/"un Paquet de Haricots Magiques"),
+                                                  // /*spanish*/unas judías mágicas
+                                                  {
+                                                  CustomMessage("something sometimes buried", /*german*/"", /*french*/"une chose parfois enterrée")
+                                                   // /*spanish*/algo a veces enterrado
+                                                  }, {
+                                                  CustomMessage("wizardly legumes", /*german*/"", /*french*/"un paquet de légumes ensorcelés")});
+                                                   // /*spanish*/unas legumbres hechizadas
+
+    hintTextTable[RHT_DOUBLE_DEFENSE] = HintText(CustomMessage("Double Defense", /*german*/"", /*french*/"la Double Défence"),
+                                                 // /*spanish*/la doble defensa
+                                                 {
+                                                 CustomMessage("a Great Fairy's power", /*german*/"", /*french*/"le pouvoir d'une grande fée"),
+                                                  // /*spanish*/el poder de una Gran Hada
+                                                 CustomMessage("something heart-shaped", /*german*/"", /*french*/"une chose en forme de coeur")
+                                                  // /*spanish*/algo con forma de corazón
+                                                 }, {
+                                                 CustomMessage("a white outline", /*german*/"", /*french*/"un rebord blanc"),
+                                                  // /*spanish*/un contorno blanco
+                                                 CustomMessage("damage decrease", /*german*/"", /*french*/"une protection supplémentaire"),
+                                                  // /*spanish*/una reducción de daño
+                                                 CustomMessage("strengthened love", /*german*/"", /*french*/"un amour coriace")});
+                                                  // /*spanish*/un amor fortalecido
+
+    hintTextTable[RHT_GOLD_SKULLTULA_TOKEN] = HintText(CustomMessage("a Gold Skulltula Token", /*german*/"", /*french*/"un Symbole de Skulltula d'or"),
+                                                       // /*spanish*/un símbolo de skulltula dorada
+                                                       {
+                                                       CustomMessage("a token of recognition", /*german*/"", /*french*/"une preuve de reconnaissance"),
+                                                        // /*spanish*/una prueba de reconocimiento
+                                                       CustomMessage("something sometimes buried", /*german*/"", /*french*/"une chose parfois enterrée")
+                                                        // /*spanish*/algo a veces enterrado
+                                                       }, {
+                                                       CustomMessage("proof of destruction", /*german*/"", /*french*/"un certificat d'élimination"),
+                                                        // /*spanish*/una prueba de la destrucción
+                                                       CustomMessage("an arachnid chip", /*german*/"", /*french*/"un symbole cranien"),
+                                                        // /*spanish*/una figura arácnida
+                                                       CustomMessage("spider remains", /*german*/"", /*french*/"une dépouille dorée"),
+                                                        // /*spanish*/unos restos dorados
+                                                       CustomMessage("one percent of a curse", /*german*/"", /*french*/"un centième de malédiction")});
+                                                        // /*spanish*/una centésima de una maldición
+
+    hintTextTable[RHT_POCKET_EGG] = HintText(CustomMessage("the Pocket Egg", /*german*/"", /*french*/"l'Oeuf de Poche"),
+                                             // /*spanish*/el huevo de bolsillo
+                                             {
+                                             CustomMessage("a trade quest item", /*german*/"", /*french*/"un objet de quête d'échanges"),
+                                              // /*spanish*/un objeto de una misión secundaria
+                                             CustomMessage("an egg", /*german*/"", /*french*/"un oeuf")
+                                              // /*spanish*/un huevo
+                                             }, {
+                                             CustomMessage("a Cucco container", /*german*/"", /*french*/"un réservoir à Cocotte"),
+                                              // /*spanish*/cuco contenido
+                                             CustomMessage("a Cucco, eventually", /*german*/"", /*french*/"un poussin éventuel"),
+                                              // /*spanish*/un futuro cuco
+                                             CustomMessage("a fowl youth", /*german*/"", /*french*/"une omelette crue")});
+                                              // /*spanish*/una dulce juventud
+
+    hintTextTable[RHT_POCKET_CUCCO] = HintText(CustomMessage("the Pocket Cucco", /*german*/"", /*french*/"la Cocotte de Poche"),
+                                               // /*spanish*/el cuco de bolsillo
+                                               {
+                                               CustomMessage("a trade quest item", /*german*/"", /*french*/"un objet de quête d'échanges")
+                                                // /*spanish*/un objeto de una misión secundaria
+                                               }, {
+                                               CustomMessage("a little clucker", /*german*/"", /*french*/"un petit glousseur")});
+                                                // /*spanish*/un pollito chiquito
+
+    hintTextTable[RHT_COJIRO] = HintText(CustomMessage("Cojiro", /*german*/"", /*french*/"le p'tit poulet"),
+                                         // /*spanish*/a Cojiro
+                                         {
+                                         CustomMessage("a trade quest item", /*german*/"", /*french*/"un objet de quête d'échanges")
+                                          // /*spanish*/un objeto de una misión secundaria
+                                         }, {
+                                         CustomMessage("a cerulean capon", /*german*/"", /*french*/"un paon azur")});
+                                          // /*spanish*/un cerúleo capón
+
+    hintTextTable[RHT_ODD_MUSHROOM] = HintText(CustomMessage("an Odd Mushroom", /*german*/"", /*french*/"un Champignon Suspect"),
+                                               // /*spanish*/un champiñón extraño
+                                               {
+                                               CustomMessage("a trade quest item", /*german*/"", /*french*/"un objet de quête d'échanges")
+                                                // /*spanish*/un objeto de una misión secundaria
+                                               }, {
+                                               CustomMessage("a powder ingredient", /*german*/"", /*french*/"un ingrédient à poudre")});
+                                                // /*spanish*/un oloroso ingrediente
+
+    hintTextTable[RHT_ODD_POTION] = HintText(CustomMessage("an Odd Potion", /*german*/"", /*french*/"une Mixture Suspecte"),
+                                             // /*spanish*/una medicina rara
+                                             {
+                                             CustomMessage("something that contains medicine", /*german*/"", /*french*/"une chose médicamenteuse"),
+                                              // /*spanish*/algo que contenga medicina
+                                             CustomMessage("something with a strange smell", /*german*/"", /*french*/"une chose qui sent bizarre"),
+                                              // /*spanish*/algo con un olor extraño
+                                             CustomMessage("a trade quest item", /*german*/"", /*french*/"un objet de quête d'échanges")
+                                              // /*spanish*/un objeto de una misión secundaria
+                                             }, {
+                                             CustomMessage("Granny's goodies", /*german*/"", /*french*/"la confiserie de mamie")});
+                                              // /*spanish*/la especialidad de la abuela
+
+    hintTextTable[RHT_POACHERS_SAW] = HintText(CustomMessage("the Poacher's Saw", /*german*/"", /*french*/"la Scie du Chasseur"),
+                                               // /*spanish*/la sierra del furtivo
+                                               {
+                                               CustomMessage("a trade quest item", /*german*/"", /*french*/"un objet de quête d'échanges")
+                                                // /*spanish*/un objeto de una misión secundaria
+                                               }, {
+                                               CustomMessage("a tree killer", /*german*/"", /*french*/"un coupeur d'arbres")});
+                                                // /*spanish*/un destructor de árboles
+
+    hintTextTable[RHT_BROKEN_SWORD] = HintText(CustomMessage("the Broken Goron's Sword", /*german*/"", /*french*/"l'Épée Brisée de Goron"),
+                                               // /*spanish*/la espada goron rota
+                                               {
+                                               CustomMessage("a trade quest item", /*german*/"", /*french*/"un objet de quête d'échanges"),
+                                                // /*spanish*/un objeto de una misión secundaria
+                                               CustomMessage("a sword", /*german*/"", /*french*/"une épée")
+                                                // /*spanish*/una espada
+                                               }, {
+                                               CustomMessage("a shattered slicer", /*german*/"", /*french*/"une arme cassée")});
+                                                // /*spanish*/una rebanadora rota
+
+    hintTextTable[RHT_PRESCRIPTION] = HintText(CustomMessage("the Prescription", /*german*/"", /*french*/"une Ordonnance"),
+                                               // /*spanish*/la receta
+                                               {
+                                               CustomMessage("a trade quest item", /*german*/"", /*french*/"un objet de quête d'échanges")
+                                                // /*spanish*/un objeto de una misión secundaria
+                                               }, {
+                                               CustomMessage("a pill pamphlet", /*german*/"", /*french*/"un document urgent"),
+                                                // /*spanish*/un instructivo medicinal
+                                               CustomMessage("a doctor's note", /*german*/"", /*french*/"un papier médical")});
+                                                // /*spanish*/unas notas del doctor
+
+    hintTextTable[RHT_EYEBALL_FROG] = HintText(CustomMessage("the Eyeball Frog", /*german*/"", /*french*/"le Crapaud-qui-louche"),
+                                               // /*spanish*/la rana de ojos saltones
+                                               {
+                                               CustomMessage("a trade quest item", /*german*/"", /*french*/"un objet de quête d'échanges")
+                                                // /*spanish*/un objeto de una misión secundaria
+                                               }, {
+                                               CustomMessage("a perceiving polliwog", /*german*/"", /*french*/"un amphibien")});
+                                                // /*spanish*/un variopinto batracio
+
+    hintTextTable[RHT_EYEDROPS] = HintText(CustomMessage("the Eyedrops", /*german*/"", /*french*/"une phiole de Super-Gouttes"),
+                                           // /*spanish*/las supergotas oculares
+                                           {
+                                           CustomMessage("a trade quest item", /*german*/"", /*french*/"un objet de quête d'échanges")
+                                            // /*spanish*/un objeto de una misión secundaria
+                                           }, {
+                                           CustomMessage("a vision vial", /*german*/"", /*french*/"une solution oculaire")});
+                                            // /*spanish*/un remedio para la vista
+
+    hintTextTable[RHT_CLAIM_CHECK] = HintText(CustomMessage("the Claim Check", /*german*/"", /*french*/"un Certificat"),
+                                              // /*spanish*/el recibo
+                                              {
+                                              CustomMessage("a trade quest item", /*german*/"", /*french*/"un objet de quête d'échanges")
+                                               // /*spanish*/un objeto de una misión secundaria
+                                              }, {
+                                              CustomMessage("a three day wait", /*german*/"", /*french*/"un rendez-vous dans trois jours")});
+                                               // /*spanish*/unos tres días de espera
+
+    hintTextTable[RHT_PROGRESSIVE_HOOKSHOT] = HintText(CustomMessage("a Hookshot", /*german*/"", /*french*/"un Grappin"),
+                                                       // /*spanish*/un gancho
+                                                       {
+                                                       CustomMessage("something that can grab things", /*german*/"", /*french*/"une chose qui peut attraper"),
+                                                        // /*spanish*/algo que pueda agarrar cosas
+                                                       CustomMessage("something that can stun", /*german*/"", /*french*/"une chose qui peut paralyser")
+                                                        // /*spanish*/algo que pueda paralizar
+                                                       }, {
+                                                       CustomMessage("Dampé's keepsake", /*german*/"", /*french*/"l'héritage d'Igor"),
+                                                        // /*spanish*/un recuerdo de Dampé
+                                                       CustomMessage("the Grapple Beam", /*german*/"", /*french*/"le rayon grippeur"),
+                                                        // /*spanish*/una garra metálica
+                                                       CustomMessage("the RHT_BOING! chain", /*german*/"", /*french*/"la chaîne de RHT_BOING!")});
+                                                        // /*spanish*/una cadena retráctil
+
+    hintTextTable[RHT_PROGRESSIVE_STRENGTH] = HintText(CustomMessage("a Strength Upgrade", /*german*/"", /*french*/"une Amélioration de Force"),
+                                                       // /*spanish*/un aumento de fuerza
+                                                       {
+                                                       CustomMessage("something that can remove boulders", /*german*/"", /*french*/"une chose qui enlève les rochers")
+                                                        // /*spanish*/algo que pueda quitar rocas
+                                                       }, {
+                                                       CustomMessage("power gloves", /*german*/"", /*french*/"une paire de gants de travail"),
+                                                        // /*spanish*/unos poderosos guanteletes
+                                                       CustomMessage("metal mittens", /*german*/"", /*french*/"une paire de mitaines"),
+                                                        // /*spanish*/unas manoplas metálicas
+                                                       CustomMessage("the heavy lifty", /*german*/"", /*french*/"la puissance de dix hommes")});
+                                                        // /*spanish*/un levantamiento pesado
+
+    hintTextTable[RHT_PROGRESSIVE_BOMB_BAG] = HintText(CustomMessage("a Bomb Bag", /*german*/"", /*french*/"un Sac de Bombes"),
+                                                       // /*spanish*/un saco de bombas
+                                                       {
+                                                       CustomMessage("explosives", /*german*/"", /*french*/"un paquet d'explosifs"),
+                                                        // /*spanish*/un montón de explosivos
+                                                       CustomMessage("something that can remove boulders", /*german*/"", /*french*/"une chose qui enlève les rochers")
+                                                        // /*spanish*/algo que pueda quitar rocas
+                                                       }, {
+                                                       CustomMessage("an explosive container", /*german*/"", /*french*/"un porte-grenade"),
+                                                        // /*spanish*/un recipiente explosivo
+                                                       CustomMessage("a blast bag", /*german*/"", /*french*/"un estomac de Dodongo")});
+                                                        // /*spanish*/un zurrón de estallidos
+
+    hintTextTable[RHT_PROGRESSIVE_BOW] = HintText(CustomMessage("a Bow", /*german*/"", /*french*/"l'Arc des Fées"),
+                                                  // /*spanish*/un arco de las hadas
+                                                  {
+                                                  CustomMessage("a projectile shooter", /*german*/"", /*french*/"un tire-projectile")
+                                                   // /*spanish*/un arma de proyectil
+                                                  }, {
+                                                  CustomMessage("an archery enabler", /*german*/"", /*french*/"un facilitateur de tir"),
+                                                   // /*spanish*/un tiro al blanco
+                                                  CustomMessage("a danger dart launcher", /*german*/"", /*french*/"un tire-fléchette")});
+                                                   // /*spanish*/un peligroso lanzadardos
+
+    hintTextTable[RHT_PROGRESSIVE_SLINGSHOT] = HintText(CustomMessage("a Slingshot", /*german*/"", /*french*/"un Lance-Pierre"),
+                                                        // /*spanish*/una resortera de las hadas
+                                                        {
+                                                        CustomMessage("a projectile shooter", /*german*/"", /*french*/"un tire-projectile")
+                                                         // /*spanish*/un arma de proyectil
+                                                        }, {
+                                                        CustomMessage("a seed shooter", /*german*/"", /*french*/"un lance-noix"),
+                                                         // /*spanish*/un lanzasemillas
+                                                        CustomMessage("a rubberband", /*german*/"", /*french*/"un élastique"),
+                                                         // /*spanish*/un tirachinas
+                                                        CustomMessage("a child's catapult", /*german*/"", /*french*/"un jouet d'enfant")});
+                                                         // /*spanish*/una catapulta infantil
+
+    hintTextTable[RHT_PROGRESSIVE_WALLET] = HintText(CustomMessage("a Wallet", /*german*/"", /*french*/"une Bourse"),
+                                                     // /*spanish*/una bolsa de rupias
+                                                     {
+                                                     CustomMessage("a prize of the House of Skulltulas", /*german*/"", /*french*/"un prix de la maison des Skulltulas")
+                                                      // /*spanish*/un obsequio de la Casa Skulltula
+                                                     }, {
+                                                     CustomMessage("a mo' money holder", /*german*/"", /*french*/"un sac à sous"),
+                                                      // /*spanish*/una cartera de dinero
+                                                     CustomMessage("a gem purse", /*german*/"", /*french*/"une sacoche"),
+                                                      // /*spanish*/un zurrón de gemas
+                                                     CustomMessage("a portable bank", /*german*/"", /*french*/"une petite banque")});
+                                                      // /*spanish*/un banco portable
+
+    hintTextTable[RHT_PROGRESSIVE_SCALE] = HintText(CustomMessage("a Zora Scale", /*german*/"", /*french*/"une Écaille Zora"),
+                                                    // /*spanish*/una escama Zora
+                                                    {
+                                                    CustomMessage("a diving tool", /*german*/"", /*french*/"un outil de plongée")
+                                                     // /*spanish*/un instrumento de buceo
+                                                    }, {
+                                                    CustomMessage("a deeper dive", /*german*/"", /*french*/"une bulle de plongée"),
+                                                     // /*spanish*/un profundo buceo
+                                                    CustomMessage("a piece of Zora", /*german*/"", /*french*/"un morceau de Zora")});
+                                                     // /*spanish*/un fragmento de Zora
+
+    hintTextTable[RHT_PROGRESSIVE_NUT_UPGRADE] = HintText(CustomMessage("Deku Nut Capacity", /*german*/"", /*french*/"une Augmentation de Noix Mojo"),
+                                                          // /*spanish*/un aumento de nueces deku
+                                                          {
+                                                          CustomMessage("some Deku munitions", /*german*/"", /*french*/"un paquet de munitions Mojo"),
+                                                           // /*spanish*/un montón de municiones Deku
+                                                          CustomMessage("something that can stun", /*german*/"", /*french*/"une chose qui peut paralyser")
+                                                           // /*spanish*/algo que pueda paralizar
+                                                          }, {
+                                                          CustomMessage("more nuts", /*german*/"", /*french*/"ecnore plus de noix"),
+                                                           // /*spanish*/más semillas de nogal
+                                                          CustomMessage("flashbang storage", /*german*/"", /*french*/"un sac à noix")});
+                                                           // /*spanish*/más frutos aturdidores
+
+    hintTextTable[RHT_PROGRESSIVE_STICK_UPGRADE] = HintText(CustomMessage("Deku Stick Capacity", /*german*/"", /*french*/"une augmentation de bâtons Mojo"),
+                                                            // /*spanish*/un aumento de palos deku
+                                                            {
+                                                            CustomMessage("some Deku munitions", /*german*/"", /*french*/"un paquet de munitions Mojo")
+                                                             // /*spanish*/un montón de municiones Deku
+                                                            }, {
+                                                            CustomMessage("a lumber rack", /*german*/"", /*french*/"un paquet de bois"),
+                                                             // /*spanish*/más bastones
+                                                            CustomMessage("more flammable twigs", /*german*/"", /*french*/"beaucoup de branches")});
+                                                             // /*spanish*/más varas
+
+    hintTextTable[RHT_PROGRESSIVE_MAGIC_METER] = HintText(CustomMessage("a Magic Meter", /*german*/"", /*french*/"une Jauge de Magie"),
+                                                          // /*spanish*/un aumento de poder mágico
+                                                          {
+                                                          CustomMessage("a Great Fairy's power", /*german*/"", /*french*/"le pouvoir d'une grande fée")
+                                                           // /*spanish*/el poder de una Gran Hada
+                                                          }, {
+                                                          CustomMessage("mystic training", /*german*/"", /*french*/"un potentiel magique"),
+                                                           // /*spanish*/una maestría mística
+                                                          CustomMessage("pixie dust", /*german*/"", /*french*/"de la poudre de fée"),
+                                                           // /*spanish*/un polvo de hada
+                                                          CustomMessage("a green rectangle", /*german*/"", /*french*/"un rectangle vert")});
+                                                           // /*spanish*/una verduzca barra
+
+    hintTextTable[RHT_PROGRESSIVE_OCARINA] = HintText(CustomMessage("an Ocarina", /*german*/"", /*french*/"un ocarina"),
+                                                      // /*spanish*/una ocarina
+                                                      {
+                                                      CustomMessage("something given by Saria", /*german*/"", /*french*/"un cadeau de Saria"),
+                                                       // /*spanish*/un obsequio de Saria
+                                                      CustomMessage("something kept by the royal family", /*german*/"", /*french*/"une chose qui paralyse")
+                                                       // /*spanish*/algo guardado por la familia real
+                                                      }, {
+                                                      CustomMessage("a flute", /*german*/"", /*french*/"un bec musical"),
+                                                       // /*spanish*/un utensilio musical
+                                                      CustomMessage("a music maker", /*german*/"", /*french*/"un porteur de chansons")});
+                                                       // /*spanish*/un instrumento
+
+    hintTextTable[RHT_PROGRESSIVE_BOMBCHUS] = HintText(CustomMessage("Bombchus", /*german*/"", /*french*/"un paquet de Missiles"),
+                                                       // /*spanish*/unos bombchus
+                                                       {
+                                                       CustomMessage("a prize of the House of Skulltulas", /*german*/"", /*french*/"un prix de la maison des Skulltulas"),
+                                                        // /*spanish*/un obsequio de la Casa Skulltula
+                                                       CustomMessage("explosives", /*german*/"", /*french*/"un paquet d'explosifs")
+                                                        // /*spanish*/un montón de explosivos
+                                                       }, {
+                                                       CustomMessage("mice bombs", /*german*/"", /*french*/"un adorable explosif"),
+                                                        // /*spanish*/unas bombas roedoras
+                                                       CustomMessage("proximity mice", /*german*/"", /*french*/"une mine anti-rongeur"),
+                                                        // /*spanish*/unos explosivos ratoncitos
+                                                       CustomMessage("wall crawlers", /*german*/"", /*french*/"un rapide grimpeur"),
+                                                        // /*spanish*/unos trepaparedes
+                                                       CustomMessage("trail blazers", /*german*/"", /*french*/"un zigzag éclatant")});
+                                                        // /*spanish*/unas ratas propulsadas
+
+    hintTextTable[RHT_PROGRESSIVE_GORONSWORD] = HintText(CustomMessage("a Goron Sword", /*german*/"", /*french*/"une épée Goron"),
+                                                         // /*spanish*/una espada goron
+                                                         {
+                                                         CustomMessage("a sword", /*german*/"", /*french*/"une épée")
+                                                          // /*spanish*/una espada
+                                                         }, {
+                                                         CustomMessage("a long blade", /*german*/"", /*french*/"une longue lame"),
+                                                          // /*spanish*/una gran hoja
+                                                         CustomMessage("a Goron weapon", /*german*/"", /*french*/"une arme Goron")});
+                                                          // /*spanish*/un arma goron
+
+    hintTextTable[RHT_EMPTY_BOTTLE] = HintText(CustomMessage("a Bottle", /*german*/"", /*french*/"un flacon vide"),
+                                               // /*spanish*/una botella
+                                               {
+                                               CustomMessage("a bottle", /*german*/"", /*french*/"un flacon")
+                                                // /*spanish*/una botella
+                                               }, {
+                                               CustomMessage("a glass container", /*german*/"", /*french*/"un cylindre de cristal"),
+                                                // /*spanish*/un recipiente de cristal
+                                               CustomMessage("an empty jar", /*german*/"", /*french*/"une jarre incassable"),
+                                                // /*spanish*/un frasco vacío
+                                               CustomMessage("encased air", /*german*/"", /*french*/"un bocal d'air")});
+                                                // /*spanish*/aire a presión
+
+    hintTextTable[RHT_BOTTLE_WITH_MILK] = HintText(CustomMessage("a Milk Bottle", /*german*/"", /*french*/"un flacon de lait"),
+                                                   // /*spanish*/una botella de leche
+                                                   {
+                                                   CustomMessage("a bottle", /*german*/"", /*french*/"un flacon")
+                                                    // /*spanish*/una botella
+                                                   }, {
+                                                   CustomMessage("cow juice", /*german*/"", /*french*/"une source de calcium"),
+                                                    // /*spanish*/una fuente de calcio
+                                                   CustomMessage("a white liquid", /*german*/"", /*french*/"un liquide blanc"),
+                                                    // /*spanish*/una bebida nutritiva
+                                                   CustomMessage("a baby's breakfast", /*german*/"", /*french*/"du jus pour bébé")});
+                                                    // /*spanish*/un trago para bebés
+
+    hintTextTable[RHT_BOTTLE_WITH_RED_POTION] = HintText(CustomMessage("a Red Potion Bottle", /*german*/"", /*french*/"un flacon de potion rouge"),
+                                                         // /*spanish*/una botella de poción roja
+                                                         {
+                                                         CustomMessage("a bottle", /*german*/"", /*french*/"un flacon")
+                                                          // /*spanish*/una botella
+                                                         }, {
+                                                         CustomMessage("a vitality vial", /*german*/"", /*french*/"un mélange de vitalité"),
+                                                          // /*spanish*/una pócima vitalicia
+                                                         CustomMessage("a red liquid", /*german*/"", /*french*/"un liquide rouge")});
+                                                          // /*spanish*/un remedio rojizo
+
+    hintTextTable[RHT_BOTTLE_WITH_GREEN_POTION] = HintText(CustomMessage("a Green Potion Bottle", /*german*/"", /*french*/"un flacon de potion verte"),
+                                                           // /*spanish*/una botella de poción verde
+                                                           {
+                                                           CustomMessage("a bottle", /*german*/"", /*french*/"un flacon")
+                                                            // /*spanish*/una botella
+                                                           }, {
+                                                           CustomMessage("a magic mixture", /*german*/"", /*french*/"une réserve magique"),
+                                                            // /*spanish*/un potingue mágico
+                                                           CustomMessage("a green liquid", /*german*/"", /*french*/"un liquide vert")});
+                                                            // /*spanish*/un remedio verduzco
+
+    hintTextTable[RHT_BOTTLE_WITH_BLUE_POTION] = HintText(CustomMessage("a Blue Potion Bottle", /*german*/"", /*french*/"un flacon de potion bleue"),
+                                                          // /*spanish*/una botella de poción azul
+                                                          {
+                                                          CustomMessage("a bottle", /*german*/"", /*french*/"un flacon")
+                                                           // /*spanish*/una botella
+                                                          }, {
+                                                          CustomMessage("an ailment antidote", /*german*/"", /*french*/"l'élixir ultime"),
+                                                           // /*spanish*/un antídoto para el dolor
+                                                          CustomMessage("a blue liquid", /*german*/"", /*french*/"un liquide bleu")});
+                                                           // /*spanish*/un remedio índigo
+
+    hintTextTable[RHT_BOTTLE_WITH_FAIRY] = HintText(CustomMessage("a Fairy Bottle", /*german*/"", /*french*/"une fée en flacon"),
+                                                    // /*spanish*/un hada en una botella
+                                                    {
+                                                    CustomMessage("a bottle", /*german*/"", /*french*/"un flacon")
+                                                     // /*spanish*/una botella
+                                                    }, {
+                                                    CustomMessage("an imprisoned fairy", /*german*/"", /*french*/"une fée emprisonnée"),
+                                                     // /*spanish*/un hada atrapada
+                                                    CustomMessage("an extra life", /*german*/"", /*french*/"une vie de rechange"),
+                                                     // /*spanish*/una oportunidad más
+                                                    CustomMessage("Navi's cousin", /*german*/"", /*french*/"le cousin de Navi")});
+                                                     // /*spanish*/una prima de Navi
+
+    hintTextTable[RHT_BOTTLE_WITH_FISH] = HintText(CustomMessage("a Fish Bottle", /*german*/"", /*french*/"un poisson en flacon"),
+                                                   // /*spanish*/un pez en una botella
+                                                   {
+                                                   CustomMessage("a bottle", /*german*/"", /*french*/"un flacon")
+                                                    // /*spanish*/una botella
+                                                   }, {
+                                                   CustomMessage("an aquarium", /*german*/"", /*french*/"un aquarium"),
+                                                    // /*spanish*/un escamado ser
+                                                   CustomMessage("a deity's snack", /*german*/"", /*french*/"le repas d'un dieu marin")});
+                                                    // /*spanish*/un tentempié de cierta deidad
+
+    hintTextTable[RHT_BOTTLE_WITH_BLUE_FIRE] = HintText(CustomMessage("a Blue Fire Bottle", /*german*/"", /*french*/"une flamme bleue en flacon"),
+                                                        // /*spanish*/una botella de fuego azul
+                                                        {
+                                                        CustomMessage("a bottle", /*german*/"", /*french*/"un flacon")
+                                                         // /*spanish*/una botella
+                                                        }, {
+                                                        CustomMessage("a conflagration canteen", /*german*/"", /*french*/"une mystérieuse flamme"),
+                                                         // /*spanish*/un incendio retenido
+                                                        CustomMessage("an icemelt jar", /*german*/"", /*french*/"un brasier glacial")});
+                                                         // /*spanish*/unas brasas enfrascadas
+
+    hintTextTable[RHT_BOTTLE_WITH_BUGS] = HintText(CustomMessage("a Bug Bottle", /*german*/"", /*french*/"un insecte en flacon"),
+                                                   // /*spanish*/unos insectos en una botella
+                                                   {
+                                                   CustomMessage("a bottle", /*german*/"", /*french*/"un flacon")
+                                                    // /*spanish*/una botella
+                                                   }, {
+                                                   CustomMessage("an insectarium", /*german*/"", /*french*/"un insectarium"),
+                                                    // /*spanish*/unos invertebrados seres
+                                                   CustomMessage("Skulltula finders", /*german*/"", /*french*/"une poignée de trouve-Skulltula")});
+                                                    // /*spanish*/unos rastreadores de skulltulas
+
+    hintTextTable[RHT_BOTTLE_WITH_POE] = HintText(CustomMessage("a Poe Bottle", /*german*/"", /*french*/"un Esprit en flacon"),
+                                                  // /*spanish*/un Poe en una botella
+                                                  {
+                                                  CustomMessage("a bottle", /*german*/"", /*french*/"un flacon")
+                                                   // /*spanish*/una botella
+                                                  }, {
+                                                  CustomMessage("a spooky ghost", /*german*/"", /*french*/"un effroyable fantôme"),
+                                                   // /*spanish*/un espantoso espectro
+                                                  CustomMessage("a face in the jar", /*german*/"", /*french*/"un visage dans un bocal")});
+                                                   // /*spanish*/una expresión enfrascada
+
+    hintTextTable[RHT_BOTTLE_WITH_BIG_POE] = HintText(CustomMessage("a Big Poe Bottle", /*german*/"", /*french*/"une Ame en flacon"),
+                                                      // /*spanish*/un Gran Poe en una botella
+                                                      {
+                                                      CustomMessage("a bottle", /*german*/"", /*french*/"un flacon")
+                                                       // /*spanish*/una botella
+                                                      }, {
+                                                      CustomMessage("the spookiest ghost", /*german*/"", /*french*/"un épouvantable spectre"),
+                                                       // /*spanish*/el espectro más espeluznante
+                                                      CustomMessage("a sidequest spirit", /*german*/"", /*french*/"un précieux esprit")});
+                                                       // /*spanish*/un buen valorado espíritu
+
+    hintTextTable[RHT_RUTOS_LETTER] = HintText(CustomMessage("Ruto's Letter", /*german*/"", /*french*/"la lettre de Ruto"),
+                                               // /*spanish*/la carta de Ruto
+                                               {
+                                               CustomMessage("a bottle", /*german*/"", /*french*/"un flacon")
+                                                // /*spanish*/una botella
+                                               }, {
+                                               CustomMessage("a call for help", /*german*/"", /*french*/"un appel au secours"),
+                                                // /*spanish*/una llamada de auxilio
+                                               CustomMessage("the note that Mweeps", /*german*/"", /*french*/"un message qui fait mwip"),
+                                                // /*spanish*/un escrito mweep
+                                               CustomMessage("an RHT_SOS call", /*german*/"", /*french*/"un signal RHT_SOS"),
+                                                // /*spanish*/una nota de socorro
+                                               CustomMessage("a fishy stationery", /*german*/"", /*french*/"un papier mouillé")});
+                                                // /*spanish*/un mensaje de ayuda
+
+    hintTextTable[RHT_ZELDAS_LULLABY] = HintText(CustomMessage("Zelda's Lullaby", /*german*/"", /*french*/"la berceuse de Zelda"),
+                                                 // /*spanish*/la Nana de Zelda
+                                                 {
+                                                 CustomMessage("a regular song", /*german*/"", /*french*/"une chanson normale"),
+                                                  // /*spanish*/una cancion normal
+                                                 CustomMessage("something kept by the royal family", /*german*/"", /*french*/"une chose qui paralyse")
+                                                  // /*spanish*/algo guardado por la familia real
+                                                 }, {
+                                                 CustomMessage("a song of royal slumber", /*german*/"", /*french*/"une chanson royale"),
+                                                  // /*spanish*/la canción real
+                                                 CustomMessage("a triforce tune", /*german*/"", /*french*/"la musique sacrée")});
+                                                  // /*spanish*/la melodía de la trifuerza
+
+    hintTextTable[RHT_EPONAS_SONG] = HintText(CustomMessage("Epona's Song", /*german*/"", /*french*/"le chant d'Epona"),
+                                              // /*spanish*/la Canción de Epona
+                                              {
+                                              CustomMessage("a regular song", /*german*/"", /*french*/"une chanson normale")
+                                               // /*spanish*/una cancion normal
+                                              }, {
+                                              CustomMessage("an equestrian etude", /*german*/"", /*french*/"une hymne équestre"),
+                                               // /*spanish*/una copla ecuestre
+                                              CustomMessage("Malon's melody", /*german*/"", /*french*/"la mélodie des vaches"),
+                                               // /*spanish*/la sonata de Malon
+                                              CustomMessage("a ranch song", /*german*/"", /*french*/"le chant des champs")});
+                                               // /*spanish*/un canto rupestre
+
+    hintTextTable[RHT_SARIAS_SONG] = HintText(CustomMessage("Saria's Song", /*german*/"", /*french*/"le chant de Saria"),
+                                              // /*spanish*/la Canción de Saria
+                                              {
+                                              CustomMessage("a regular song", /*german*/"", /*french*/"une chanson normale"),
+                                               // /*spanish*/una cancion normal
+                                              CustomMessage("something given by Saria", /*german*/"", /*french*/"un cadeau de Saria")
+                                               // /*spanish*/un obsequio de Saria
+                                              }, {
+                                              CustomMessage("a song of dancing Gorons", /*german*/"", /*french*/"une chanson danceuse"),
+                                               // /*spanish*/un pegadizo tono goron
+                                              CustomMessage("Saria's phone number", /*german*/"", /*french*/"le téléphone d'une amie")});
+                                               // /*spanish*/una consulta de asistencia
+
+    hintTextTable[RHT_SUNS_SONG] = HintText(CustomMessage("the Sun's Song", /*german*/"", /*french*/"le chant du soleil"),
+                                            // /*spanish*/la Canción del Sol
+                                            {
+                                            CustomMessage("a regular song", /*german*/"", /*french*/"une chanson normale"),
+                                             // /*spanish*/una cancion normal
+                                            CustomMessage("something that can stun", /*german*/"", /*french*/"une chose qui peut paralyser")
+                                             // /*spanish*/algo que pueda paralizar
+                                            }, {
+                                            CustomMessage("Sunny Day", /*german*/"", /*french*/"Zénith"),
+                                             // /*spanish*/un día soleado
+                                            CustomMessage("the ReDead's bane", /*german*/"", /*french*/"le fléau des Éffrois"),
+                                             // /*spanish*/la destructora de Redeads
+                                            CustomMessage("the Gibdo's bane", /*german*/"", /*french*/"le fléau des Gibdo")});
+                                             // /*spanish*/la destructora de Gibdos
+
+    hintTextTable[RHT_SONG_OF_TIME] = HintText(CustomMessage("the Song of Time", /*german*/"", /*french*/"le chant du temps"),
+                                               // /*spanish*/la Canción del tiempo
+                                               {
+                                               CustomMessage("a regular song", /*german*/"", /*french*/"une chanson normale")
+                                                // /*spanish*/una cancion normal
+                                               }, {
+                                               CustomMessage("a song 7 years long", /*german*/"", /*french*/"le flot du temps"),
+                                                // /*spanish*/la setenada canción
+                                               CustomMessage("the tune of ages", /*german*/"", /*french*/"le Chant des Âges")});
+                                                // /*spanish*/la melodía eónica
+
+    hintTextTable[RHT_SONG_OF_STORMS] = HintText(CustomMessage("the Song of Storms", /*german*/"", /*french*/"le chant des tempêtes"),
+                                                 // /*spanish*/la Canción de la Tormenta
+                                                 {
+                                                 CustomMessage("a regular song", /*german*/"", /*french*/"une chanson normale")
+                                                  // /*spanish*/una cancion normal
+                                                 }, {
+                                                 CustomMessage("Rain Dance", /*german*/"", /*french*/"Danse Pluie"),
+                                                  // /*spanish*/la danza de la lluvia
+                                                 CustomMessage("a thunderstorm tune", /*german*/"", /*french*/"une hymne foudroyante"),
+                                                  // /*spanish*/una sonata tormentosa
+                                                 CustomMessage("windmill acceleration", /*german*/"", /*french*/"l'accélérateur de moulins")});
+                                                  // /*spanish*/el arranque de molinos
+
+    hintTextTable[RHT_MINUET_OF_FOREST] = HintText(CustomMessage("the Minuet of Forest", /*german*/"", /*french*/"le menuet de la forêt"),
+                                                   // /*spanish*/el Minueto del bosque
+                                                   {
+                                                   CustomMessage("a warp song", /*german*/"", /*french*/"une chanson de téléportation")
+                                                    // /*spanish*/una canción de teletransportación
+                                                   }, {
+                                                   CustomMessage("the song of tall trees", /*german*/"", /*french*/"le bruit des arbres"),
+                                                    // /*spanish*/la canción de las copas
+                                                   CustomMessage("an arboreal anthem", /*german*/"", /*french*/"l'hymne sylvestre"),
+                                                    // /*spanish*/el himno forestal
+                                                   CustomMessage("a green spark trail", /*german*/"", /*french*/"une comète verte")});
+                                                    // /*spanish*/el sendero esmeralda
+
+    hintTextTable[RHT_BOLERO_OF_FIRE] = HintText(CustomMessage("the Bolero of Fire", /*german*/"", /*french*/"le boléro du feu"),
+                                                 // /*spanish*/el Bolero del fuego
+                                                 {
+                                                 CustomMessage("a warp song", /*german*/"", /*french*/"une chanson de téléportation")
+                                                  // /*spanish*/una canción de teletransportación
+                                                 }, {
+                                                 CustomMessage("a song of lethal lava", /*german*/"", /*french*/"une musique enflammée"),
+                                                  // /*spanish*/la canción de la lava
+                                                 CustomMessage("a red spark trail", /*german*/"", /*french*/"une comète rouge"),
+                                                  // /*spanish*/el sendero rubí
+                                                 CustomMessage("a volcanic verse", /*german*/"", /*french*/"le souffle du volcan")});
+                                                  // /*spanish*/el verso volcánico
+
+    hintTextTable[RHT_SERENADE_OF_WATER] = HintText(CustomMessage("the Serenade of Water", /*german*/"", /*french*/"la sérénade de l'eau"),
+                                                    // /*spanish*/la Serenata del agua
+                                                    {
+                                                    CustomMessage("a warp song", /*german*/"", /*french*/"une chanson de téléportation")
+                                                     // /*spanish*/una canción de teletransportación
+                                                    }, {
+                                                    CustomMessage("a song of a damp ditch", /*german*/"", /*french*/"le calme de l'eau"),
+                                                     // /*spanish*/la canción del estanque
+                                                    CustomMessage("a blue spark trail", /*german*/"", /*french*/"une comète bleue"),
+                                                     // /*spanish*/el sendero zafiro
+                                                    CustomMessage("the lake's lyric", /*german*/"", /*french*/"la voix du lac")});
+                                                     // /*spanish*/la letra del lago
+
+    hintTextTable[RHT_REQUIEM_OF_SPIRIT] = HintText(CustomMessage("the Requiem of Spirit", /*german*/"", /*french*/"le requiem des esprits"),
+                                                    // /*spanish*/el Réquiem del espíritu
+                                                    {
+                                                    CustomMessage("a warp song", /*german*/"", /*french*/"une chanson de téléportation")
+                                                     // /*spanish*/una canción de teletransportación
+                                                    }, {
+                                                    CustomMessage("a song of sandy statues", /*german*/"", /*french*/"la mélodie d'une grande statue"),
+                                                     // /*spanish*/la canción de la gran estatua
+                                                    CustomMessage("an orange spark trail", /*german*/"", /*french*/"une comète orange"),
+                                                     // /*spanish*/el sendero ámbar
+                                                    CustomMessage("the desert ditty", /*german*/"", /*french*/"le vent du désert")});
+                                                     // /*spanish*/la estrofa del desierto
+
+    hintTextTable[RHT_NOCTURNE_OF_SHADOW] = HintText(CustomMessage("the Nocturne of Shadow", /*german*/"", /*french*/"le nocturne de l'ombre"),
+                                                     // /*spanish*/el Nocturno de la sombra
+                                                     {
+                                                     CustomMessage("a warp song", /*german*/"", /*french*/"une chanson de téléportation")
+                                                      // /*spanish*/una canción de teletransportación
+                                                     }, {
+                                                     CustomMessage("a song of spooky spirits", /*german*/"", /*french*/"une hymne de chair de poule"),
+                                                      // /*spanish*/la canción de los espectros
+                                                     CustomMessage("a graveyard boogie", /*german*/"", /*french*/"un boogie de fantômes"),
+                                                      // /*spanish*/una honra fúnebre
+                                                     CustomMessage("a haunted hymn", /*german*/"", /*french*/"une chanson lugubre"),
+                                                      // /*spanish*/una estrofa encantada
+                                                     CustomMessage("a purple spark trail", /*german*/"", /*french*/"une comète mauve")});
+                                                      // /*spanish*/el sendero malva
+
+    hintTextTable[RHT_PRELUDE_OF_LIGHT] = HintText(CustomMessage("the Prelude of Light", /*german*/"", /*french*/"le prélude de la lumière"),
+                                                   // /*spanish*/el Preludio de la luz
+                                                   {
+                                                   CustomMessage("a warp song", /*german*/"", /*french*/"une chanson de téléportation")
+                                                    // /*spanish*/una canción de teletransportación
+                                                   }, {
+                                                   CustomMessage("a luminous prologue melody", /*german*/"", /*french*/"une matine illuminée"),
+                                                    // /*spanish*/la melodía refulgente
+                                                   CustomMessage("a yellow spark trail", /*german*/"", /*french*/"une comète jaune"),
+                                                    // /*spanish*/el sendero resplandeciente
+                                                   CustomMessage("the temple traveler", /*german*/"", /*french*/"un chant de sanctuaire")});
+                                                    // /*spanish*/la ruta del templo
+
+    hintTextTable[RHT_DEKU_TREE_MAP] = HintText(CustomMessage("the Deku Tree Map", /*german*/"", /*french*/"la carte de l'Arbre Mojo"),
+                                                // /*spanish*/el mapa del Gran Árbol Deku
+                                                {
+                                                CustomMessage("a dungeon map", /*german*/"", /*french*/"une carte")
+                                                 // /*spanish*/un mapa
+                                                }, {
+                                                CustomMessage("a mossy atlas", /*german*/"", /*french*/"un atlas boisé"),
+                                                 // /*spanish*/un atlas musgoso
+                                                CustomMessage("some mossy blueprints", /*german*/"", /*french*/"un plan boisé")});
+                                                 // /*spanish*/unos planos musgosos
+
+    hintTextTable[RHT_DODONGOS_CAVERN_MAP] = HintText(CustomMessage("the Dodongo's Cavern Map", /*german*/"", /*french*/"la carte de la Caverne Dodongo"),
+                                                      // /*spanish*/el mapa de la Cueva de los Dodongos
+                                                      {
+                                                      CustomMessage("a dungeon map", /*german*/"", /*french*/"une carte")
+                                                       // /*spanish*/un mapa
+                                                      }, {
+                                                      CustomMessage("a rocky atlas", /*german*/"", /*french*/"un atlas rocheux"),
+                                                       // /*spanish*/un atlas rocoso
+                                                      CustomMessage("some rocky blueprints", /*german*/"", /*french*/"un plan rocheux")});
+                                                       // /*spanish*/unos planos rocosos
+
+    hintTextTable[RHT_JABU_JABUS_BELLY_MAP] = HintText(CustomMessage("the Jabu-Jabu's Belly Map", /*german*/"", /*french*/"la carte de Jabu-Jabu"),
+                                                       // /*spanish*/el mapa de la Tripa de Jabu-Jabu
+                                                       {
+                                                       CustomMessage("a dungeon map", /*german*/"", /*french*/"une carte")
+                                                        // /*spanish*/un mapa
+                                                       }, {
+                                                       CustomMessage("a fishy atlas", /*german*/"", /*french*/"un atlas digéré"),
+                                                        // /*spanish*/un atlas digesto
+                                                       CustomMessage("some fishy blueprints", /*german*/"", /*french*/"un plan digéré")});
+                                                        // /*spanish*/unos planos digestos
+
+    hintTextTable[RHT_FOREST_TEMPLE_MAP] = HintText(CustomMessage("the Forest Temple Map", /*german*/"", /*french*/"la carte du Temple de la Forêt"),
+                                                    // /*spanish*/el mapa del Templo del Bosque
+                                                    {
+                                                    CustomMessage("a dungeon map", /*german*/"", /*french*/"une carte")
+                                                     // /*spanish*/un mapa
+                                                    }, {
+                                                    CustomMessage("a sylvan atlas", /*german*/"", /*french*/"un atlas sylvestre"),
+                                                     // /*spanish*/un atlas enselvado
+                                                    CustomMessage("some sylvan blueprints", /*german*/"", /*french*/"un plan sylvestre")});
+                                                     // /*spanish*/unos planos enselvados
+
+    hintTextTable[RHT_FIRE_TEMPLE_MAP] = HintText(CustomMessage("the Fire Temple Map", /*german*/"", /*french*/"la carte du Temple du Feu"),
+                                                  // /*spanish*/el mapa del Templo del Fuego
+                                                  {
+                                                  CustomMessage("a dungeon map", /*german*/"", /*french*/"une carte")
+                                                   // /*spanish*/un mapa
+                                                  }, {
+                                                  CustomMessage("a molten atlas", /*german*/"", /*french*/"un atlas fondu"),
+                                                   // /*spanish*/un atlas fundido
+                                                  CustomMessage("some molten blueprints", /*german*/"", /*french*/"un plan fondu")});
+                                                   // /*spanish*/unos planos fundidos
+
+    hintTextTable[RHT_WATER_TEMPLE_MAP] = HintText(CustomMessage("the Water Temple Map", /*german*/"", /*french*/"la carte du Temple de l'Eau"),
+                                                   // /*spanish*/el mapa del Templo del Agua
+                                                   {
+                                                   CustomMessage("a dungeon map", /*german*/"", /*french*/"une carte")
+                                                    // /*spanish*/un mapa
+                                                   }, {
+                                                   CustomMessage("a wet atlas", /*german*/"", /*french*/"un atlas humide"),
+                                                    // /*spanish*/un atlas mojado
+                                                   CustomMessage("some wet blueprints", /*german*/"", /*french*/"un plan humide")});
+                                                    // /*spanish*/unos planos mojados
+
+    hintTextTable[RHT_SPIRIT_TEMPLE_MAP] = HintText(CustomMessage("the Spirit Temple Map", /*german*/"", /*french*/"la carte du Temple de l'Esprit"),
+                                                    // /*spanish*/el mapa del Templo del Espíritu
+                                                    {
+                                                    CustomMessage("a dungeon map", /*german*/"", /*french*/"une carte")
+                                                     // /*spanish*/un mapa
+                                                    }, {
+                                                    CustomMessage("a sandy atlas", /*german*/"", /*french*/"un atlas sableux"),
+                                                     // /*spanish*/un atlas arenoso
+                                                    CustomMessage("some sandy blueprints", /*german*/"", /*french*/"un plan sableux")});
+                                                     // /*spanish*/unos planos arenosos
+
+    hintTextTable[RHT_SHADOW_TEMPLE_MAP] = HintText(CustomMessage("the Shadow Temple Map", /*german*/"", /*french*/"la carte du Temple de l'Ombre"),
+                                                    // /*spanish*/el mapa del Templo de las Sombras
+                                                    {
+                                                    CustomMessage("a dungeon map", /*german*/"", /*french*/"une carte")
+                                                     // /*spanish*/un mapa
+                                                    }, {
+                                                    CustomMessage("a creepy atlas", /*german*/"", /*french*/"un atlas sinistre"),
+                                                     // /*spanish*/un atlas siniestra
+                                                    CustomMessage("some creepy blueprints", /*german*/"", /*french*/"un plan sinistre")});
+                                                     // /*spanish*/unos planos siniestras
+
+    hintTextTable[RHT_BOTTOM_OF_THE_WELL_MAP] = HintText(CustomMessage("the Bottom of the Well Map", /*german*/"", /*french*/"la carte du fond du Puits"),
+                                                         // /*spanish*/el mapa del Fondo del pozo
+                                                         {
+                                                         CustomMessage("a dungeon map", /*german*/"", /*french*/"une carte")
+                                                          // /*spanish*/un mapa
+                                                         }, {
+                                                         CustomMessage("a moldy atlas", /*german*/"", /*french*/"un atlas moisi"),
+                                                          // /*spanish*/un atlas mohoso
+                                                         CustomMessage("some moldy blueprints", /*german*/"", /*french*/"un plan moisi")});
+                                                          // /*spanish*/unos planos mohosos
+
+    hintTextTable[RHT_ICE_CAVERN_MAP] = HintText(CustomMessage("the Ice Cavern Map", /*german*/"", /*french*/"la carte de la Caverne Polaire"),
+                                                 // /*spanish*/el mapa de la Caverna de hielo
+                                                 {
+                                                 CustomMessage("a dungeon map", /*german*/"", /*french*/"une carte")
+                                                  // /*spanish*/un mapa
+                                                 }, {
+                                                 CustomMessage("a polar atlas", /*german*/"", /*french*/"un atlas polaire"),
+                                                  // /*spanish*/un atlas polar
+                                                 CustomMessage("some polar blueprints", /*german*/"", /*french*/"un plan polaire")});
+                                                  // /*spanish*/unos planos polars
+
+    hintTextTable[RHT_DEKU_TREE_COMPASS] = HintText(CustomMessage("the Deku Tree Compass", /*german*/"", /*french*/"la boussole de l'Arbre Mojo"),
+                                                    // /*spanish*/la brújula del Gran Árbol Deku
+                                                    {
+                                                    CustomMessage("a compass", /*german*/"", /*french*/"une boussole")
+                                                     // /*spanish*/una brújula
+                                                    }, {
+                                                    CustomMessage("a mossy treasure tracker", /*german*/"", /*french*/"un cherche-trésor boisé"),
+                                                     // /*spanish*/un zahorí musgoso
+                                                    CustomMessage("a mossy magnetic needle", /*german*/"", /*french*/"une aimant boisée")});
+                                                     // /*spanish*/un imán musgoso
+
+    hintTextTable[RHT_DODONGOS_CAVERN_COMPASS] = HintText(CustomMessage("the Dodongo's Cavern Compass", /*german*/"", /*french*/"la boussole de la Caverne Dodongo"),
+                                                          // /*spanish*/la brújula de la Cueva de los Dodongos
+                                                          {
+                                                          CustomMessage("a compass", /*german*/"", /*french*/"une boussole")
+                                                           // /*spanish*/una brújula
+                                                          }, {
+                                                          CustomMessage("a rocky treasure tracker", /*german*/"", /*french*/"un cherche-trésor rocheux"),
+                                                           // /*spanish*/un zahorí rocoso
+                                                          CustomMessage("a rocky magnetic needle", /*german*/"", /*french*/"une aimant rocheux")});
+                                                           // /*spanish*/un imán rocoso
+
+    hintTextTable[RHT_JABU_JABUS_BELLY_COMPASS] = HintText(CustomMessage("the Jabu-Jabu's Belly Compass", /*german*/"", /*french*/"la boussole de Jabu-Jabu"),
+                                                           // /*spanish*/la brújula de la Tripa de Jabu-Jabu
+                                                           {
+                                                           CustomMessage("a compass", /*german*/"", /*french*/"une boussole")
+                                                            // /*spanish*/una brújula
+                                                           }, {
+                                                           CustomMessage("a fishy treasure tracker", /*german*/"", /*french*/"un cherche-trésor digéré"),
+                                                            // /*spanish*/un zahorí digesto
+                                                           CustomMessage("a fishy magnetic needle", /*german*/"", /*french*/"une aimant digéré")});
+                                                            // /*spanish*/un imán digesto
+
+    hintTextTable[RHT_FOREST_TEMPLE_COMPASS] = HintText(CustomMessage("the Forest Temple Compass", /*german*/"", /*french*/"la boussole du Temple de la Forêt"),
+                                                        // /*spanish*/la brújula del Templo del Bosque
+                                                        {
+                                                        CustomMessage("a compass", /*german*/"", /*french*/"une boussole")
+                                                         // /*spanish*/una brújula
+                                                        }, {
+                                                        CustomMessage("a sylvan treasure tracker", /*german*/"", /*french*/"un cherche-trésor sylvestre"),
+                                                         // /*spanish*/un zahorí enselvado
+                                                        CustomMessage("a sylvan magnetic needle", /*german*/"", /*french*/"une aimant sylvestre")});
+                                                         // /*spanish*/un imán enselvado
+
+    hintTextTable[RHT_FIRE_TEMPLE_COMPASS] = HintText(CustomMessage("the Fire Temple Compass", /*german*/"", /*french*/"la boussole du Temple du Feu"),
+                                                      // /*spanish*/la brújula del Templo del Fuego
+                                                      {
+                                                      CustomMessage("a compass", /*german*/"", /*french*/"une boussole")
+                                                       // /*spanish*/una brújula
+                                                      }, {
+                                                      CustomMessage("a molten treasure tracker", /*german*/"", /*french*/"un cherche-trésor fondu"),
+                                                       // /*spanish*/un zahorí fundido
+                                                      CustomMessage("a molten magnetic needle", /*german*/"", /*french*/"une aimant fondu")});
+                                                       // /*spanish*/un imán fundido
+
+    hintTextTable[RHT_WATER_TEMPLE_COMPASS] = HintText(CustomMessage("the Water Temple Compass", /*german*/"", /*french*/"la boussole du Temple de l'Eau"),
+                                                       // /*spanish*/la brújula del Templo del Agua
+                                                       {
+                                                       CustomMessage("a compass", /*german*/"", /*french*/"une boussole")
+                                                        // /*spanish*/una brújula
+                                                       }, {
+                                                       CustomMessage("a wet treasure tracker", /*german*/"", /*french*/"un cherche-trésor humide"),
+                                                        // /*spanish*/un zahorí mojado
+                                                       CustomMessage("a wet magnetic needle", /*german*/"", /*french*/"une aimant humide")});
+                                                        // /*spanish*/un imán mojado
+
+    hintTextTable[RHT_SPIRIT_TEMPLE_COMPASS] = HintText(CustomMessage("the Spirit Temple Compass", /*german*/"", /*french*/"la boussole du Temple de l'Esprit"),
+                                                        // /*spanish*/la brújula del Templo del Espíritu
+                                                        {
+                                                        CustomMessage("a compass", /*german*/"", /*french*/"une boussole")
+                                                         // /*spanish*/una brújula
+                                                        }, {
+                                                        CustomMessage("a sandy treasure tracker", /*german*/"", /*french*/"un cherche-trésor sableux"),
+                                                         // /*spanish*/un zahorí arenoso
+                                                        CustomMessage("a sandy magnetic needle", /*german*/"", /*french*/"une aimant sableux")});
+                                                         // /*spanish*/un imán arenoso
+
+    hintTextTable[RHT_SHADOW_TEMPLE_COMPASS] = HintText(CustomMessage("the Shadow Temple Compass", /*german*/"", /*french*/"la boussole du Temple de l'Ombre"),
+                                                        // /*spanish*/la brújula del Templo de las Sombras
+                                                        {
+                                                        CustomMessage("a compass", /*german*/"", /*french*/"une boussole")
+                                                         // /*spanish*/una brújula
+                                                        }, {
+                                                        CustomMessage("a creepy treasure tracker", /*german*/"", /*french*/"un cherche-trésor sinistre"),
+                                                         // /*spanish*/un zahorí siniestra
+                                                        CustomMessage("a creepy magnetic needle", /*german*/"", /*french*/"une aimant sinistre")});
+                                                         // /*spanish*/un imán siniestra
+
+    hintTextTable[RHT_BOTTOM_OF_THE_WELL_COMPASS] = HintText(CustomMessage("the Bottom of the Well Compass", /*german*/"", /*french*/"la boussole du fond du Puits"),
+                                                             // /*spanish*/la brújula del Fondo del pozo
+                                                             {
+                                                             CustomMessage("a compass", /*german*/"", /*french*/"une boussole")
+                                                              // /*spanish*/una brújula
+                                                             }, {
+                                                             CustomMessage("a dank treasure tracker", /*german*/"", /*french*/"un cherche-trésor moisi"),
+                                                              // /*spanish*/un zahorí mohoso
+                                                             CustomMessage("a dank magnetic needle", /*german*/"", /*french*/"une aimant moisi")});
+                                                              // /*spanish*/un imán mohoso
+
+    hintTextTable[RHT_ICE_CAVERN_COMPASS] = HintText(CustomMessage("the Ice Cavern Compass", /*german*/"", /*french*/"la Boussole de la Caverne Polaire"),
+                                                     // /*spanish*/la brújula de la Caverna de hielo
+                                                     {
+                                                     CustomMessage("a compass", /*german*/"", /*french*/"une boussole")
+                                                      // /*spanish*/una brújula
+                                                     }, {
+                                                     CustomMessage("a polar treasure tracker", /*german*/"", /*french*/"un cherche-trésor polaire"),
+                                                      // /*spanish*/un zahorí polar
+                                                     CustomMessage("a polar magnetic needle", /*german*/"", /*french*/"une aimant polaire")});
+                                                      // /*spanish*/un imán polar
+
+    hintTextTable[RHT_FOREST_TEMPLE_BOSS_KEY] = HintText(CustomMessage("the Forest Temple Boss Key", /*german*/"", /*french*/"la Clé d'Or du Temple de la Forêt"),
+                                                         // /*spanish*/la gran llave del Templo del Bosque
+                                                         {
+                                                         CustomMessage("a boss key", /*german*/"", /*french*/"une Clé d'Or")
+                                                          // /*spanish*/una gran llave
+                                                         }, {
+                                                         CustomMessage("a sylvan master of unlocking", /*german*/"", /*french*/"un anti-grosse porte sylvestre"),
+                                                          // /*spanish*/la clave enselvada de un jefe
+                                                         CustomMessage("a sylvan dungeon's master pass", /*german*/"", /*french*/"une clé maléfique sylvestree")});
+                                                          // /*spanish*/el pase maestro enselvado
+
+    hintTextTable[RHT_FIRE_TEMPLE_BOSS_KEY] = HintText(CustomMessage("the Fire Temple Boss Key", /*german*/"", /*french*/"la Clé d'Or du Temple du Feu"),
+                                                       // /*spanish*/la gran llave del Templo del Fuego
+                                                       {
+                                                       CustomMessage("a boss key", /*german*/"", /*french*/"une Clé d'Or")
+                                                        // /*spanish*/una gran llave
+                                                       }, {
+                                                       CustomMessage("a molten master of unlocking", /*german*/"", /*french*/"un anti-grosse porte fondu"),
+                                                        // /*spanish*/la clave fundido de un jefe
+                                                       CustomMessage("a molten dungeon's master pass", /*german*/"", /*french*/"une clé maléfique fondu")});
+                                                        // /*spanish*/el pase maestro fundido
+
+    hintTextTable[RHT_WATER_TEMPLE_BOSS_KEY] = HintText(CustomMessage("the Water Temple Boss Key", /*german*/"", /*french*/"la Clé d'Or du Temple de l'Eau"),
+                                                        // /*spanish*/la gran llave del Templo del Agua
+                                                        {
+                                                        CustomMessage("a boss key", /*german*/"", /*french*/"une Clé d'Or")
+                                                         // /*spanish*/una gran llave
+                                                        }, {
+                                                        CustomMessage("a wet master of unlocking", /*german*/"", /*french*/"un anti-grosse porte humide"),
+                                                         // /*spanish*/la clave mojado de un jefe
+                                                        CustomMessage("a wet dungeon's master pass", /*german*/"", /*french*/"une clé maléfique humide")});
+                                                         // /*spanish*/el pase maestro mojado
+
+    hintTextTable[RHT_SPIRIT_TEMPLE_BOSS_KEY] = HintText(CustomMessage("the Spirit Temple Boss Key", /*german*/"", /*french*/"la Clé d'Or du Temple de l'Esprit"),
+                                                         // /*spanish*/la gran llave del Templo del Espíritu
+                                                         {
+                                                         CustomMessage("a boss key", /*german*/"", /*french*/"une Clé d'Or")
+                                                          // /*spanish*/una gran llave
+                                                         }, {
+                                                         CustomMessage("a sandy master of unlocking", /*german*/"", /*french*/"un anti-grosse porte sableux"),
+                                                          // /*spanish*/la clave arenoso de un jefe
+                                                         CustomMessage("a sandy dungeon's master pass", /*german*/"", /*french*/"une clé maléfique sableux")});
+                                                          // /*spanish*/el pase maestro arenoso
+
+    hintTextTable[RHT_SHADOW_TEMPLE_BOSS_KEY] = HintText(CustomMessage("the Shadow Temple Boss Key", /*german*/"", /*french*/"la Clé d'Or du Temple de l'Ombre"),
+                                                         // /*spanish*/la gran llave del Templo de las Sombras
+                                                         {
+                                                         CustomMessage("a boss key", /*german*/"", /*french*/"une Clé d'Or")
+                                                          // /*spanish*/una gran llave
+                                                         }, {
+                                                         CustomMessage("a creepy master of unlocking", /*german*/"", /*french*/"un anti-grosse porte sinistre"),
+                                                          // /*spanish*/la clave siniestra de un jefe
+                                                         CustomMessage("a creepy dungeon's master pass", /*german*/"", /*french*/"une clé maléfique sinistre")});
+                                                          // /*spanish*/el pase maestro siniestra
+
+    hintTextTable[RHT_GANONS_CASTLE_BOSS_KEY] = HintText(CustomMessage("the Ganon's Castle Boss Key", /*german*/"", /*french*/"la Clé d'Or du Château de Ganon"),
+                                                         // /*spanish*/la gran llave del Castillo de Ganon
+                                                         {
+                                                         CustomMessage("a boss key", /*german*/"", /*french*/"une Clé d'Or")
+                                                          // /*spanish*/una gran llave
+                                                         }, {
+                                                         CustomMessage("a final master of unlocking", /*german*/"", /*french*/"un anti-grosse porte final"),
+                                                          // /*spanish*/la clave final de un jefe
+                                                         CustomMessage("a final dungeon's master pass", /*german*/"", /*french*/"une clé maléfique final")});
+                                                          // /*spanish*/el pase maestro final
+
+    hintTextTable[RHT_FOREST_TEMPLE_SMALL_KEY] = HintText(CustomMessage("a Forest Temple Small Key", /*german*/"", /*french*/"une petite clé du Temple de la Forêt"),
+                                                          // /*spanish*/una llave pequeña del Templo del Bosque
+                                                          {
+                                                          CustomMessage("a small key", /*german*/"", /*french*/"une petite clé")
+                                                           // /*spanish*/una llave pequeña
+                                                          }, {
+                                                          CustomMessage("a sylvan tool for unlocking", /*german*/"", /*french*/"un anti-porte sylvestre"),
+                                                           // /*spanish*/una clave de una entrada enselvada
+                                                          CustomMessage("a sylvan dungeon pass", /*german*/"", /*french*/"le rêve sylvestre d'un prisonnier"),
+                                                           // /*spanish*/un pase de una mazmorra enselvada
+                                                          CustomMessage("a sylvan lock remover", /*german*/"", /*french*/"un efface-serrure sylvestre"),
+                                                           // /*spanish*/un destructor de cerraduras enselvada
+                                                          CustomMessage("a sylvan lockpick", /*german*/"", /*french*/"un crochet à porte sylvestre")});
+                                                           // /*spanish*/una apertura portentosa enselvada
+
+    hintTextTable[RHT_FIRE_TEMPLE_SMALL_KEY] = HintText(CustomMessage("a Fire Temple Small Key", /*german*/"", /*french*/"une petite clé du Temple du Feu"),
+                                                        // /*spanish*/una llave pequeña del Templo del Fuego
+                                                        {
+                                                        CustomMessage("a small key", /*german*/"", /*french*/"une petite clé")
+                                                         // /*spanish*/una llave pequeña
+                                                        }, {
+                                                        CustomMessage("a molten tool for unlocking", /*german*/"", /*french*/"un anti-porte fondu"),
+                                                         // /*spanish*/una clave de una entrada fundida
+                                                        CustomMessage("a molten dungeon pass", /*german*/"", /*french*/"le rêve fondu d'un prisonnier"),
+                                                         // /*spanish*/un pase de una mazmorra fundida
+                                                        CustomMessage("a molten lock remover", /*german*/"", /*french*/"un efface-serrure fondu"),
+                                                         // /*spanish*/un destructor de cerraduras fundida
+                                                        CustomMessage("a molten lockpick", /*german*/"", /*french*/"un crochet à porte fondu")});
+                                                         // /*spanish*/una apertura portentosa fundida
+
+    hintTextTable[RHT_WATER_TEMPLE_SMALL_KEY] = HintText(CustomMessage("a Water Temple Small Key", /*german*/"", /*french*/"une petite clé du Temple de l'Eau"),
+                                                         // /*spanish*/una llave pequeña del Templo del Agua
+                                                         {
+                                                         CustomMessage("a small key", /*german*/"", /*french*/"une petite clé")
+                                                          // /*spanish*/una llave pequeña
+                                                         }, {
+                                                         CustomMessage("a wet tool for unlocking", /*german*/"", /*french*/"un anti-porte humide"),
+                                                          // /*spanish*/una clave de una entrada mojada
+                                                         CustomMessage("a wet dungeon pass", /*german*/"", /*french*/"le rêve humide d'un prisonnier"),
+                                                          // /*spanish*/un pase de una mazmorra mojada
+                                                         CustomMessage("a wet lock remover", /*german*/"", /*french*/"un efface-serrure humide"),
+                                                          // /*spanish*/un destructor de cerraduras mojada
+                                                         CustomMessage("a wet lockpick", /*german*/"", /*french*/"un crochet à porte humide")});
+                                                          // /*spanish*/una apertura portentosa mojada
+
+    hintTextTable[RHT_SPIRIT_TEMPLE_SMALL_KEY] = HintText(CustomMessage("a Spirit Temple Small Key", /*german*/"", /*french*/"une petite clé du Temple de l'Esprit"),
+                                                          // /*spanish*/una llave pequeña del Templo del Espíritu
+                                                          {
+                                                          CustomMessage("a small key", /*german*/"", /*french*/"une petite clé")
+                                                           // /*spanish*/una llave pequeña
+                                                          }, {
+                                                          CustomMessage("a sandy tool for unlocking", /*german*/"", /*french*/"un anti-porte sableux"),
+                                                           // /*spanish*/una clave de una entrada arenosa
+                                                          CustomMessage("a sandy dungeon pass", /*german*/"", /*french*/"le rêve sableux d'un prisonnier"),
+                                                           // /*spanish*/un pase de una mazmorra arenosa
+                                                          CustomMessage("a sandy lock remover", /*german*/"", /*french*/"un efface-serrure sableux"),
+                                                           // /*spanish*/un destructor de cerraduras arenosa
+                                                          CustomMessage("a sandy lockpick", /*german*/"", /*french*/"un crochet à porte sableux")});
+                                                           // /*spanish*/una apertura portentosa arenosa
+
+    hintTextTable[RHT_SHADOW_TEMPLE_SMALL_KEY] = HintText(CustomMessage("a Shadow Temple Small Key", /*german*/"", /*french*/"une petite clé du Temple de l'Ombre"),
+                                                          // /*spanish*/una llave pequeña del Templo de las Sombras
+                                                          {
+                                                          CustomMessage("a small key", /*german*/"", /*french*/"une petite clé")
+                                                           // /*spanish*/una llave pequeña
+                                                          }, {
+                                                          CustomMessage("a creepy tool for unlocking", /*german*/"", /*french*/"un anti-porte sinistre"),
+                                                           // /*spanish*/una clave de una entrada siniestra:a
+                                                          CustomMessage("a creepy dungeon pass", /*german*/"", /*french*/"le rêve sinistre d'un prisonnier"),
+                                                           // /*spanish*/un pase de una mazmorra siniestra:a
+                                                          CustomMessage("a creepy lock remover", /*german*/"", /*french*/"un efface-serrure sinistre"),
+                                                           // /*spanish*/un destructor de cerraduras siniestra:a
+                                                          CustomMessage("a creepy lockpick", /*german*/"", /*french*/"un crochet à porte sinistre")});
+                                                           // /*spanish*/una apertura portentosa siniestra:a
+
+    hintTextTable[RHT_GERUDO_TRAINING_GROUNDS_SMALL_KEY] = HintText(CustomMessage("a Gerudo Training Ground Small Key", /*german*/"", /*french*/"une petite clé du Gymnase Gerudo"),
+                                                                    // /*spanish*/una llave pequeña del Centro de Instrucción Gerudo
+                                                                    {
+                                                                    CustomMessage("a small key", /*german*/"", /*french*/"une petite clé")
+                                                                     // /*spanish*/una llave pequeña
+                                                                    }, {
+                                                                    CustomMessage("a labyrinthian tool for unlocking", /*german*/"", /*french*/"un anti-porte labyrinthique"),
+                                                                     // /*spanish*/una clave de una entrada laberíntica
+                                                                    CustomMessage("a labyrinthian dungeon pass", /*german*/"", /*french*/"le rêve labyrinthique d'un prisonnier"),
+                                                                     // /*spanish*/un pase de una mazmorra laberíntica
+                                                                    CustomMessage("a labyrinthian lock remover", /*german*/"", /*french*/"un efface-serrure labyrinthique"),
+                                                                     // /*spanish*/un destructor de cerraduras laberíntica
+                                                                    CustomMessage("a labyrinthian lockpick", /*german*/"", /*french*/"un crochet à porte labyrinthique")});
+                                                                     // /*spanish*/una apertura portentosa laberíntica
+
+    hintTextTable[RHT_GERUDO_FORTRESS_SMALL_KEY] = HintText(CustomMessage("a Gerudo Fortress Small Key", /*german*/"", /*french*/"une petite clé de la Repaire des Voleurs"),
+                                                            // /*spanish*/una llave pequeña de la Fortaleza Gerudo
+                                                            {
+                                                            CustomMessage("a small key", /*german*/"", /*french*/"une petite clé")
+                                                             // /*spanish*/una llave pequeña
+                                                            }, {
+                                                            CustomMessage("an imprisoned tool for unlocking", /*german*/"", /*french*/"un anti-porte emprisonné"),
+                                                             // /*spanish*/una clave de una entrada encarcelada
+                                                            CustomMessage("an imprisoned dungeon pass", /*german*/"", /*french*/"le rêve emprisonné d'un prisonnier"),
+                                                             // /*spanish*/un pase de una mazmorra encarcelada
+                                                            CustomMessage("an imprisoned lock remover", /*german*/"", /*french*/"un efface-serrure emprisonné"),
+                                                             // /*spanish*/un destructor de cerraduras encarcelada
+                                                            CustomMessage("an imprisoned lockpick", /*german*/"", /*french*/"un crochet à porte emprisonné")});
+                                                             // /*spanish*/una apertura portentosa encarcelada
+
+    hintTextTable[RHT_BOTTOM_OF_THE_WELL_SMALL_KEY] = HintText(CustomMessage("a Bottom of the Well Small Key", /*german*/"", /*french*/"une petite clé du fond du Puits"),
+                                                               // /*spanish*/una llave pequeña del Fondo del pozo
+                                                               {
+                                                               CustomMessage("a small key", /*german*/"", /*french*/"une petite clé")
+                                                                // /*spanish*/una llave pequeña
+                                                               }, {
+                                                               CustomMessage("a moldy tool for unlocking", /*german*/"", /*french*/"un anti-porte moisi"),
+                                                                // /*spanish*/una clave de una entrada mohosa
+                                                               CustomMessage("a moldy dungeon pass", /*german*/"", /*french*/"le rêve moisi d'un prisonnier"),
+                                                                // /*spanish*/un pase de una mazmorra mohosa
+                                                               CustomMessage("a moldy lock remover", /*german*/"", /*french*/"un efface-serrure moisi"),
+                                                                // /*spanish*/un destructor de cerraduras mohosa
+                                                               CustomMessage("a moldy lockpick", /*german*/"", /*french*/"un crochet à porte moisi")});
+                                                                // /*spanish*/una apertura portentosa mohosa
+
+    hintTextTable[RHT_GANONS_CASTLE_SMALL_KEY] = HintText(CustomMessage("a Ganon's Castle Small Key", /*german*/"", /*french*/"une petite clé du Château de Ganon"),
+                                                          // /*spanish*/una llave pequeña del Castillo de Ganon
+                                                          {
+                                                          CustomMessage("a small key", /*german*/"", /*french*/"une petite clé")
+                                                           // /*spanish*/una llave pequeña
+                                                          }, {
+                                                          CustomMessage("a final tool for unlocking", /*german*/"", /*french*/"un anti-porte final"),
+                                                           // /*spanish*/una clave de una entrada final
+                                                          CustomMessage("a final dungeon pass", /*german*/"", /*french*/"le rêve final d'un prisonnier"),
+                                                           // /*spanish*/un pase de una mazmorra final
+                                                          CustomMessage("a final lock remover", /*german*/"", /*french*/"un efface-serrure final"),
+                                                           // /*spanish*/un destructor de cerraduras final
+                                                          CustomMessage("a final lockpick", /*german*/"", /*french*/"un crochet à porte final")});
+                                                           // /*spanish*/una apertura portentosa final
+
+    hintTextTable[RHT_FOREST_TEMPLE_KEY_RING] = HintText(CustomMessage("a Forest Temple Key Ring", /*german*/"", /*french*/"un trousseau de clés du Temple de la Forêt"),
+                                                         // /*spanish*/un llavero del Templo del Bosque
+                                                         {
+                                                         CustomMessage("a key ring", /*german*/"", /*french*/"un trousseau de clés")
+                                                          // /*spanish*/un llavero
+                                                         }, {
+                                                         CustomMessage("a sylvan toolbox for unlocking", /*german*/"", /*french*/"des anti-portes sylvestres"),
+                                                          // /*spanish*/un conjunto silvestre de cerrajero
+                                                         CustomMessage("a sylvan dungeon season pass", /*german*/"", /*french*/"les rêves sylvestres d'un prisonnier"),
+                                                          // /*spanish*/un pase vip de mazmorras silvestre
+                                                         CustomMessage("a sylvan jingling ring", /*german*/"", /*french*/"des efface-serrures sylvestres"),
+                                                          // /*spanish*/una cadena multiusos silvestre
+                                                         CustomMessage("a sylvan skeleton key", /*german*/"", /*french*/"des crochets à porte sylvestres")});
+                                                          // /*spanish*/un anillo silvestre contra cerrojos
+
+    hintTextTable[RHT_FIRE_TEMPLE_KEY_RING] = HintText(CustomMessage("a Fire Temple Key Ring", /*german*/"", /*french*/"un trousseau de clés du Temple du Feu"),
+                                                       // /*spanish*/un llavero del Templo del Fuego
+                                                       {
+                                                       CustomMessage("a key ring", /*german*/"", /*french*/"un trousseau de clés")
+                                                        // /*spanish*/un llavero
+                                                       }, {
+                                                       CustomMessage("a molten toolbox for unlocking", /*german*/"", /*french*/"des anti-portes fondus"),
+                                                        // /*spanish*/un conjunto fundido de cerrajero
+                                                       CustomMessage("a molten dungeon season pass", /*german*/"", /*french*/"les rêves fondus d'un prisonnier"),
+                                                        // /*spanish*/un pase vip de mazmorras fundido
+                                                       CustomMessage("a molten jingling ring", /*german*/"", /*french*/"des efface-serrures fondus"),
+                                                        // /*spanish*/una cadena multiusos fundida
+                                                       CustomMessage("a molten skeleton key", /*german*/"", /*french*/"des crochets à porte fondus")});
+                                                        // /*spanish*/un anillo fundido contra cerrojos
+
+    hintTextTable[RHT_WATER_TEMPLE_KEY_RING] = HintText(CustomMessage("a Water Temple Key Ring", /*german*/"", /*french*/"un trousseau de clés du Temple de l'Eau"),
+                                                        // /*spanish*/un llavero del Templo del Agua
+                                                        {
+                                                        CustomMessage("a key ring", /*german*/"", /*french*/"un trousseau de clés")
+                                                         // /*spanish*/un llavero
+                                                        }, {
+                                                        CustomMessage("a wet toolbox for unlocking", /*german*/"", /*french*/"des anti-portes humides"),
+                                                         // /*spanish*/un conjunto abisal de cerrajero
+                                                        CustomMessage("a wet dungeon season pass", /*german*/"", /*french*/"les rêves humides d'un prisonnier"),
+                                                         // /*spanish*/un pase vip de mazmorras abisal
+                                                        CustomMessage("a wet jingling ring", /*german*/"", /*french*/"des efface-serrures humides"),
+                                                         // /*spanish*/una cadena multiusos abisal
+                                                        CustomMessage("a wet skeleton key", /*german*/"", /*french*/"des crochets à porte humides")});
+                                                         // /*spanish*/un anillo abisal contra cerrojos
+
+    hintTextTable[RHT_SPIRIT_TEMPLE_KEY_RING] = HintText(CustomMessage("a Spirit Temple Key Ring", /*german*/"", /*french*/"un trousseau de clés du Temple de l'Esprit"),
+                                                         // /*spanish*/un llavero del Templo del Espíritu
+                                                         {
+                                                         CustomMessage("a key ring", /*german*/"", /*french*/"un trousseau de clés")
+                                                          // /*spanish*/un llavero
+                                                         }, {
+                                                         CustomMessage("a sandy toolbox for unlocking", /*german*/"", /*french*/"des anti-portes sableux"),
+                                                          // /*spanish*/un conjunto arenoso de cerrajero
+                                                         CustomMessage("a sandy dungeon season pass", /*german*/"", /*french*/"les rêves sableux d'un prisonnier"),
+                                                          // /*spanish*/un pase vip de mazmorras arenoso
+                                                         CustomMessage("a sandy jingling ring", /*german*/"", /*french*/"des efface-serrures sableux"),
+                                                          // /*spanish*/una cadena multiusos arenosa
+                                                         CustomMessage("a sandy skeleton key", /*german*/"", /*french*/"des crochets à porte sableux")});
+                                                          // /*spanish*/un anillo arenoso contra cerrojos
+
+    hintTextTable[RHT_SHADOW_TEMPLE_KEY_RING] = HintText(CustomMessage("a Shadow Temple Key Ring", /*german*/"", /*french*/"un trousseau de clés du Temple de l'Ombre"),
+                                                         // /*spanish*/un llavero del Templo de las Sombras
+                                                         {
+                                                         CustomMessage("a key ring", /*german*/"", /*french*/"un trousseau de clés")
+                                                          // /*spanish*/un llavero
+                                                         }, {
+                                                         CustomMessage("a creepy toolbox for unlocking", /*german*/"", /*french*/"des anti-portes sinistres"),
+                                                          // /*spanish*/un conjunto tenebroso de cerrajero
+                                                         CustomMessage("a creepy dungeon season pass", /*german*/"", /*french*/"les rêves sinistres d'un prisonnier"),
+                                                          // /*spanish*/un pase vip de mazmorras tenebroso
+                                                         CustomMessage("a creepy jingling ring", /*german*/"", /*french*/"des efface-serrures sinistres"),
+                                                          // /*spanish*/una cadena multiusos tenebrosa
+                                                         CustomMessage("a creepy skeleton key", /*german*/"", /*french*/"des crochets à porte sinistres")});
+                                                          // /*spanish*/un anillo tenebroso contra cerrojos
+
+    hintTextTable[RHT_GERUDO_TRAINING_GROUNDS_KEY_RING] = HintText(CustomMessage("a Gerudo Training Ground Key Ring", /*german*/"", /*french*/"un trousseau de clés du Gymnase Gerudo"),
+                                                                   // /*spanish*/un llavero del Centro de Instrucción Gerudo
+                                                                   {
+                                                                   CustomMessage("a key ring", /*german*/"", /*french*/"un trousseau de clés")
+                                                                    // /*spanish*/un llavero
+                                                                   }, {
+                                                                   CustomMessage("a labyrinthian toolbox for unlocking", /*german*/"", /*french*/"des anti-portes labyrinthiques"),
+                                                                    // /*spanish*/un conjunto laberíntico de cerrajero
+                                                                   CustomMessage("a labyrinthian dungeon season pass", /*german*/"", /*french*/"les rêves labyrinthiques d'un prisonnier"),
+                                                                    // /*spanish*/un pase vip de mazmorras laberíntico
+                                                                   CustomMessage("a labyrinthian jingling ring", /*german*/"", /*french*/"des efface-serrures labyrinthiques"),
+                                                                    // /*spanish*/una cadena multiusos laberíntica
+                                                                   CustomMessage("a labyrinthian skeleton key", /*german*/"", /*french*/"des crochets à porte labyrinthiques")});
+                                                                    // /*spanish*/un anillo laberíntico contra cerrojos
+
+    hintTextTable[RHT_GERUDO_FORTRESS_KEY_RING] = HintText(CustomMessage("a Gerudo Fortress Key Ring", /*german*/"", /*french*/"un trousseau de clés de la Repaire des Voleurs"),
+                                                           // /*spanish*/un llavero de la Fortaleza Gerudo
+                                                           {
+                                                           CustomMessage("a key ring", /*german*/"", /*french*/"un trousseau de clés")
+                                                            // /*spanish*/un llavero
+                                                           }, {
+                                                           CustomMessage("an imprisoned toolbox for unlocking", /*german*/"", /*french*/"des anti-portes emprisonnés"),
+                                                            // /*spanish*/un conjunto enjaulado de cerrajero
+                                                           CustomMessage("an imprisoned dungeon season pass", /*german*/"", /*french*/"les rêves emprisonnés d'un prisonnier"),
+                                                            // /*spanish*/un pase vip de una mazmorra enjaulado
+                                                           CustomMessage("an imprisoned jingling ring", /*german*/"", /*french*/"des efface-serrures emprisonnés"),
+                                                            // /*spanish*/una cadena multiusos enjaulada
+                                                           CustomMessage("an imprisoned skeleton key", /*german*/"", /*french*/"des crochets à porte emprisonnés")});
+                                                            // /*spanish*/un anillo enjaulado contra cerrojos
+
+    hintTextTable[RHT_BOTTOM_OF_THE_WELL_KEY_RING] = HintText(CustomMessage("a Bottom of the Well Key Ring", /*german*/"", /*french*/"un trousseau de clés du fond du Puits"),
+                                                              // /*spanish*/un llavero del Fondo del pozo
+                                                              {
+                                                              CustomMessage("a key ring", /*german*/"", /*french*/"un trousseau de clés")
+                                                               // /*spanish*/un llavero
+                                                              }, {
+                                                              CustomMessage("a moldy toolbox for unlocking", /*german*/"", /*french*/"des anti-portes moisis"),
+                                                               // /*spanish*/un conjunto subterráneo de cerrajero
+                                                              CustomMessage("a moldy dungeon season pass", /*german*/"", /*french*/"les rêves moisis d'un prisonnier"),
+                                                               // /*spanish*/un pase vip de una mazmorra subterráneo
+                                                              CustomMessage("a moldy jingling ring", /*german*/"", /*french*/"des efface-serrures moisis"),
+                                                               // /*spanish*/una cadena multiusos subterránea
+                                                              CustomMessage("a moldy skeleton key", /*german*/"", /*french*/"des crochets à porte moisis")});
+                                                               // /*spanish*/un anillo subterráneo contra cerrojos
+
+    hintTextTable[RHT_GANONS_CASTLE_KEY_RING] = HintText(CustomMessage("a Ganon's Castle Key Ring", /*german*/"", /*french*/"un trousseau de clés du Château de Ganon"),
+                                                         // /*spanish*/un llavero del Castillo de Ganon
+                                                         {
+                                                         CustomMessage("a key ring", /*german*/"", /*french*/"un trousseau de clés")
+                                                          // /*spanish*/un llavero
+                                                         }, {
+                                                         CustomMessage("a final toolbox for unlocking", /*german*/"", /*french*/"des anti-portes finaux"),
+                                                          // /*spanish*/un conjunto decisivo de cerrajero
+                                                         CustomMessage("a final dungeon season pass", /*german*/"", /*french*/"les rêves finaux d'un prisonnier"),
+                                                          // /*spanish*/un pase vip de una mazmorra decisivo
+                                                         CustomMessage("a final jingling ring", /*german*/"", /*french*/"des efface-serrures finaux"),
+                                                          // /*spanish*/una cadena multiusos decisiva
+                                                         CustomMessage("a final skeleton key", /*german*/"", /*french*/"des crochets à porte finaux")});
+                                                          // /*spanish*/un anillo decisivo multiusos
+
+    hintTextTable[RHT_TREASURE_GAME_SMALL_KEY] = HintText(CustomMessage("a Treasure Chest Shop Small Key", /*german*/"", /*french*/"une petite clé de la chasse aux trésors"),
+                                                          // /*spanish*/una llave pequeña del Cofre del Tesoro
+                                                          {
+                                                          CustomMessage("a small key", /*german*/"", /*french*/"une petite clé")
+                                                           // /*spanish*/una llave pequeña
+                                                          }, {
+                                                          CustomMessage("a gambler's tool for unlocking", /*german*/"", /*french*/"un anti-porte de parieur"),
+                                                           // /*spanish*/una clave de un juego de azar
+                                                          CustomMessage("a gambler's dungeon pass", /*german*/"", /*french*/"le rêve d'un prisonnier parieur"),
+                                                           // /*spanish*/un pase de un juego de azar
+                                                          CustomMessage("a gambler's lock remover", /*german*/"", /*french*/"un efface-serrure de parieur"),
+                                                           // /*spanish*/un destructor de cerraduras del juego de azar
+                                                          CustomMessage("a gambler's lockpick", /*german*/"", /*french*/"un crochet à serrure de parieur")});
+                                                           // /*spanish*/una apertura portentosa del juego de azar
+
+    hintTextTable[RHT_KOKIRI_EMERALD] = HintText(CustomMessage("the Kokiri Emerald", /*german*/"", /*french*/"l'Émeraude Kokiri"),
+                                                 // /*spanish*/la Esmeralda de los Kokiri
+                                                 {
+                                                 CustomMessage("a spiritual stone", /*german*/"", /*french*/"une Pierre Ancestrale")
+                                                  // /*spanish*/una piedra espiritual
+                                                 }, {
+                                                 CustomMessage("a green stone", /*german*/"", /*french*/"une pierre verte"),
+                                                  // /*spanish*/una piedra verde
+                                                 CustomMessage("a gift before death", /*german*/"", /*french*/"le dernier souffle d'un arbre")});
+                                                  // /*spanish*/un obsequio testamentario
+
+    hintTextTable[RHT_GORON_RUBY] = HintText(CustomMessage("the Goron Ruby", /*german*/"", /*french*/"le Rubis Goron"),
+                                             // /*spanish*/el Rubí de los Goron
+                                             {
+                                             CustomMessage("a spiritual stone", /*german*/"", /*french*/"une Pierre Ancestrale")
+                                              // /*spanish*/una piedra espiritual
+                                             }, {
+                                             CustomMessage("a red stone", /*german*/"", /*french*/"une pierre rouge"),
+                                              // /*spanish*/una piedra carmín
+                                             CustomMessage("sworn brotherhood", /*german*/"", /*french*/"un serment de fraternité")});
+                                              // /*spanish*/el juramento de hermanos de sangre
+
+    hintTextTable[RHT_ZORA_SAPPHIRE] = HintText(CustomMessage("the Zora Sapphire", /*german*/"", /*french*/"le Saphir Zora"),
+                                                // /*spanish*/el Zafiro de los Zora
+                                                {
+                                                CustomMessage("a spiritual stone", /*german*/"", /*french*/"une Pierre Ancestrale")
+                                                 // /*spanish*/una piedra espiritual
+                                                }, {
+                                                CustomMessage("a blue stone", /*german*/"", /*french*/"une pierre bleue"),
+                                                 // /*spanish*/una piedra celeste
+                                                CustomMessage("an engagement gift", /*german*/"", /*french*/"un cadeau de mariage")});
+                                                 // /*spanish*/un regalo de compromiso
+
+    hintTextTable[RHT_FOREST_MEDALLION] = HintText(CustomMessage("the Forest Medallion", /*german*/"", /*french*/"le Médaillon de la Forêt"),
+                                                   // /*spanish*/el Medallón del Bosque
+                                                   {
+                                                   CustomMessage("a medallion", /*german*/"", /*french*/"un médaillon")
+                                                    // /*spanish*/un medallón
+                                                   }, {
+                                                   CustomMessage("a green coin", /*german*/"", /*french*/"une pièce verte"),
+                                                    // /*spanish*/una moneda esmeralda
+                                                   CustomMessage("Saria's friendship", /*german*/"", /*french*/"l'amitié de Saria")});
+                                                    // /*spanish*/la amistad de Saria
+
+    hintTextTable[RHT_FIRE_MEDALLION] = HintText(CustomMessage("the Fire Medallion", /*german*/"", /*french*/"le Médaillon du Feu"),
+                                                 // /*spanish*/el Medallón del Fuego
+                                                 {
+                                                 CustomMessage("a medallion", /*german*/"", /*french*/"un médaillon")
+                                                  // /*spanish*/un medallón
+                                                 }, {
+                                                 CustomMessage("a red coin", /*german*/"", /*french*/"une pièce rouge"),
+                                                  // /*spanish*/una moneda rubí
+                                                 CustomMessage("Darunia's power", /*german*/"", /*french*/"la fraternité de Darunia")});
+                                                  // /*spanish*/la fraternidad de Darunia
+
+    hintTextTable[RHT_WATER_MEDALLION] = HintText(CustomMessage("the Water Medallion", /*german*/"", /*french*/"le Médaillon de l'Eau"),
+                                                  // /*spanish*/el Medallón del Agua
+                                                  {
+                                                  CustomMessage("a medallion", /*german*/"", /*french*/"un médaillon")
+                                                   // /*spanish*/un medallón
+                                                  }, {
+                                                  CustomMessage("a blue coin", /*german*/"", /*french*/"une pièce bleue"),
+                                                   // /*spanish*/una moneda zafiro
+                                                  CustomMessage("Ruto's power", /*german*/"", /*french*/"l'amour de Ruto")});
+                                                   // /*spanish*/el amor de Ruto
+
+    hintTextTable[RHT_SPIRIT_MEDALLION] = HintText(CustomMessage("the Spirit Medallion", /*german*/"", /*french*/"le Médaillon de l'Esprit"),
+                                                   // /*spanish*/el Medallón del Espíritu
+                                                   {
+                                                   CustomMessage("a medallion", /*german*/"", /*french*/"un médaillon")
+                                                    // /*spanish*/un medallón
+                                                   }, {
+                                                   CustomMessage("an orange coin", /*german*/"", /*french*/"une pièce orange"),
+                                                    // /*spanish*/una moneda ámbar
+                                                   CustomMessage("Nabooru's power", /*german*/"", /*french*/"le respect de Nabooru")});
+                                                    // /*spanish*/el respeto de Nabooru
+
+    hintTextTable[RHT_SHADOW_MEDALLION] = HintText(CustomMessage("the Shadow Medallion", /*german*/"", /*french*/"le Médaillon de l'Ombre"),
+                                                   // /*spanish*/el Medallón de la Sombra
+                                                   {
+                                                   CustomMessage("a medallion", /*german*/"", /*french*/"un médaillon")
+                                                    // /*spanish*/un medallón
+                                                   }, {
+                                                   CustomMessage("a purple coin", /*german*/"", /*french*/"une pièce pourpre"),
+                                                    // /*spanish*/una moneda malva
+                                                   CustomMessage("Impa's power", /*german*/"", /*french*/"la confiance d'Impa")});
+                                                    // /*spanish*/la confianza de Impa
+
+    hintTextTable[RHT_LIGHT_MEDALLION] = HintText(CustomMessage("the Light Medallion", /*german*/"", /*french*/"le Médaillon de la Lumière"),
+                                                  // /*spanish*/el Medallón de la Luz
+                                                  {
+                                                  CustomMessage("a medallion", /*german*/"", /*french*/"un médaillon")
+                                                   // /*spanish*/un medallón
+                                                  }, {
+                                                  CustomMessage("a yellow coin", /*german*/"", /*french*/"une pièce jaune"),
+                                                   // /*spanish*/una moneda resplandeciente
+                                                  CustomMessage("Rauru's power", /*german*/"", /*french*/"la foi de Rauru")});
+                                                   // /*spanish*/la fe de Rauru
+
+    hintTextTable[RHT_RECOVERY_HEART] = HintText(CustomMessage("a Recovery Heart", /*german*/"", /*french*/"un coeur de vie"),
+                                                 // /*spanish*/un corazón
+                                                 {
+                                                 CustomMessage("something heart-shaped", /*german*/"", /*french*/"une chose en forme de coeur")
+                                                  // /*spanish*/algo con forma de corazón
+                                                 }, {
+                                                 CustomMessage("a free heal", /*german*/"", /*french*/"un bec-au-bobo"),
+                                                  // /*spanish*/una cura de regalo
+                                                 CustomMessage("a hearty meal", /*german*/"", /*french*/"un petit amour"),
+                                                  // /*spanish*/una sanación romántica
+                                                 CustomMessage("a Band-Aid", /*german*/"", /*french*/"un diachylon")});
+                                                  // /*spanish*/un corazoncito sanador
+
+    hintTextTable[RHT_GREEN_RUPEE] = HintText(CustomMessage("a Green Rupee", /*german*/"", /*french*/"un rubis vert"),
+                                              // /*spanish*/una rupia verde
+                                              {
+                                              CustomMessage("some rupees", /*german*/"", /*french*/"une quantité de rubis")
+                                               // /*spanish*/una cantidad de rupias
+                                              }, {
+                                              CustomMessage("a unique coin", /*german*/"", /*french*/"un rubis bien mérité"),
+                                               // /*spanish*/una singular moneda
+                                              CustomMessage("a penny", /*german*/"", /*french*/"un sou"),
+                                               // /*spanish*/un peso hyliano
+                                              CustomMessage("a green gem", /*german*/"", /*french*/"un joyau vert")});
+                                               // /*spanish*/una gema verde
+
+    hintTextTable[RHT_GREG_RUPEE] = HintText(CustomMessage("Greg", /*german*/"", /*french*/"Greg"),
+                                             // /*spanish*/Greg
+                                             {
+                                             CustomMessage("a Green Rupee", /*german*/"", /*french*/"un rubis vert")
+                                              // /*spanish*/una rupia verde
+                                             }, {
+                                             CustomMessage("an old friend", /*german*/"", /*french*/"Greg"),
+                                              // /*spanish*/Greg
+                                             CustomMessage("a glorious gem", /*german*/"", /*french*/"Greg")});
+                                              // /*spanish*/Greg
+
+    hintTextTable[RHT_BLUE_RUPEE] = HintText(CustomMessage("a Blue Rupee", /*german*/"", /*french*/"un rubis bleu"),
+                                             // /*spanish*/una rupia azul
+                                             {
+                                             CustomMessage("some rupees", /*german*/"", /*french*/"une quantité de rubis")
+                                              // /*spanish*/una cantidad de rupias
+                                             }, {
+                                             CustomMessage("a common coin", /*german*/"", /*french*/"quelques sous"),
+                                              // /*spanish*/una moneda usual
+                                             CustomMessage("a blue gem", /*german*/"", /*french*/"un joyau bleu")});
+                                              // /*spanish*/una gema azul
+
+    hintTextTable[RHT_RED_RUPEE] = HintText(CustomMessage("a Red Rupee", /*german*/"", /*french*/"un rubis rouge"),
+                                            // /*spanish*/una rupia roja
+                                            {
+                                            CustomMessage("some rupees", /*german*/"", /*french*/"une quantité de rubis")
+                                             // /*spanish*/una cantidad de rupias
+                                            }, {
+                                            CustomMessage("couch cash", /*german*/"", /*french*/"un peu de fric"),
+                                             // /*spanish*/una buena moneda
+                                            CustomMessage("a red gem", /*german*/"", /*french*/"un joyau rouge")});
+                                             // /*spanish*/una gema roja
+
+    hintTextTable[RHT_PURPLE_RUPEE] = HintText(CustomMessage("a Purple Rupee", /*german*/"", /*french*/"un rubis pourpre"),
+                                               // /*spanish*/una rupia morada
+                                               {
+                                               CustomMessage("some rupees", /*german*/"", /*french*/"une quantité de rubis")
+                                                // /*spanish*/una cantidad de rupias
+                                               }, {
+                                               CustomMessage("big bucks", /*german*/"", /*french*/"plein de fric"),
+                                                // /*spanish*/plata de calidad
+                                               CustomMessage("a purple gem", /*german*/"", /*french*/"un joyau mauve"),
+                                                // /*spanish*/una gema morada
+                                               CustomMessage("wealth", /*german*/"", /*french*/"la richesse")});
+                                                // /*spanish*/una buena riqueza
+
+    hintTextTable[RHT_HUGE_RUPEE] = HintText(CustomMessage("a Huge Rupee", /*german*/"", /*french*/"un énorme rubis"),
+                                             // /*spanish*/una rupia gigante
+                                             {
+                                             CustomMessage("some rupees", /*german*/"", /*french*/"une quantité de rubis")
+                                              // /*spanish*/una cantidad de rupias
+                                             }, {
+                                             CustomMessage("a juicy jackpot", /*german*/"", /*french*/"le jackpot"),
+                                              // /*spanish*/el premio gordo
+                                             CustomMessage("a yellow gem", /*german*/"", /*french*/"un joyau doré"),
+                                              // /*spanish*/una gema amarilla
+                                             CustomMessage("a giant gem", /*german*/"", /*french*/"un gros joyau"),
+                                              // /*spanish*/una gema descomunal
+                                             CustomMessage("great wealth", /*german*/"", /*french*/"l'aisance financière")});
+                                              // /*spanish*/dinero a caudales
+
+    hintTextTable[RHT_PIECE_OF_HEART] = HintText(CustomMessage("a Piece of Heart", /*german*/"", /*french*/"un Quart de Coeur"),
+                                                 // /*spanish*/una pieza de corazón
+                                                 {
+                                                 CustomMessage("something heart-shaped", /*german*/"", /*french*/"une chose en forme de coeur")
+                                                  // /*spanish*/algo con forma de corazón
+                                                 }, {
+                                                 CustomMessage("a little love", /*german*/"", /*french*/"un peu plus d'amour"),
+                                                  // /*spanish*/un cuarto de amor
+                                                 CustomMessage("a broken heart", /*german*/"", /*french*/"un coeur brisé")});
+                                                  // /*spanish*/un corazón roto
+
+    hintTextTable[RHT_HEART_CONTAINER] = HintText(CustomMessage("a Heart Container", /*german*/"", /*french*/"un Réceptacle de Coeur"),
+                                                  // /*spanish*/un contenedor de corazón
+                                                  {
+                                                  CustomMessage("something heart-shaped", /*german*/"", /*french*/"une chose en forme de coeur")
+                                                   // /*spanish*/algo con forma de corazón
+                                                  }, {
+                                                  CustomMessage("a lot of love", /*german*/"", /*french*/"le grand amour"),
+                                                   // /*spanish*/amor por doquier
+                                                  CustomMessage("a Valentine's gift", /*german*/"", /*french*/"un cadeau de Saint-Valentin"),
+                                                   // /*spanish*/un contenedor de afección
+                                                  CustomMessage("a boss's organ", /*german*/"", /*french*/"un organe de monstre")});
+                                                   // /*spanish*/los órganos de un jefe
+
+    hintTextTable[RHT_ICE_TRAP] = HintText(CustomMessage("an Ice Trap", /*german*/"", /*french*/"un Piège de Glace"),
+                                           // /*spanish*/una trampa de hielo
+                                           {
+                                           CustomMessage("a Great Fairy's power", /*german*/"", /*french*/"le pouvoir d'une grande fée"),
+                                            // /*spanish*/el poder de una Gran Hada
+                                           CustomMessage("a magic arrow", /*german*/"", /*french*/"une flèche magique"),
+                                            // /*spanish*/una flecha mágica
+                                           CustomMessage("a medallion", /*german*/"", /*french*/"un médaillon"),
+                                            // /*spanish*/un medallón
+                                           CustomMessage("a spiritual stone", /*german*/"", /*french*/"une Pierre Ancestrale"),
+                                            // /*spanish*/una piedra espiritual
+                                           CustomMessage("something that can stun", /*german*/"", /*french*/"une chose qui peut paralyser")
+                                            // /*spanish*/algo que pueda paralizar
+                                           }, {
+                                           CustomMessage("a gift from Ganon", /*german*/"", /*french*/"un cadeau de Ganon"),
+                                            // /*spanish*/un regalo de Ganon
+                                           CustomMessage("a chilling discovery", /*german*/"", /*french*/"une frissonante découverte"),
+                                            // /*spanish*/un escalofriante hallazgo
+                                           CustomMessage("frosty fun", /*german*/"", /*french*/"une engelure")});
+                                            // /*spanish*/una gélida diversión
+
+    hintTextTable[RHT_BOMBS_5] = HintText(CustomMessage("Bombs (5 pieces)", /*german*/"", /*french*/"une demi-dizaine de bombes"),
+                                          // /*spanish*/unas (5) bombas
+                                          {
+                                          CustomMessage("explosives", /*german*/"", /*french*/"un paquet d'explosifs")
+                                           // /*spanish*/un montón de explosivos
+                                          }, {
+                                          CustomMessage("a few explosives", /*german*/"", /*french*/"une poignée de pétards"),
+                                           // /*spanish*/un par de explosivos
+                                          CustomMessage("a few blast balls", /*german*/"", /*french*/"une poignée de boules bleues")});
+                                           // /*spanish*/un par de estallidos
+
+    hintTextTable[RHT_BOMBS_10] = HintText(CustomMessage("Bombs (10 pieces)", /*german*/"", /*french*/"une dizaine de bombes"),
+                                           // /*spanish*/unas (10) bombas
+                                           {
+                                           CustomMessage("explosives", /*german*/"", /*french*/"un paquet d'explosifs")
+                                            // /*spanish*/un montón de explosivos
+                                           }, {
+                                           CustomMessage("some explosives", /*german*/"", /*french*/"un paquet de pétards"),
+                                            // /*spanish*/unos cuantos explosivos
+                                           CustomMessage("some blast balls", /*german*/"", /*french*/"un paquet de boules bleues")});
+                                            // /*spanish*/unos cuantos estallidos
+
+    hintTextTable[RHT_BOMBS_20] = HintText(CustomMessage("Bombs (20 pieces)", /*german*/"", /*french*/"une vingtaine de bombes"),
+                                           // /*spanish*/unas (20) bombas
+                                           {
+                                           CustomMessage("explosives", /*german*/"", /*french*/"un paquet d'explosifs")
+                                            // /*spanish*/un montón de explosivos
+                                           }, {
+                                           CustomMessage("lots-o-explosives", /*german*/"", /*french*/"une abondance de pétards"),
+                                            // /*spanish*/un puñado de explosivos
+                                           CustomMessage("plenty of blast balls", /*german*/"", /*french*/"une abondance de boules bleues")});
+                                            // /*spanish*/bastantes estallidos
+
+    hintTextTable[RHT_BOMBCHU_5] = HintText(CustomMessage("Bombchus (5 pieces)", /*german*/"", /*french*/"une demi-dizaine de Missiles"),
+                                            // /*spanish*/unos (5) bombchus
+                                            {
+                                            CustomMessage("a prize of the House of Skulltulas", /*german*/"", /*french*/"un prix de la maison des Skulltulas"),
+                                             // /*spanish*/un obsequio de la Casa Skulltula
+                                            CustomMessage("explosives", /*german*/"", /*french*/"un paquet d'explosifs")
+                                             // /*spanish*/un montón de explosivos
+                                            }, {
+                                            CustomMessage("a few mice bombs", /*german*/"", /*french*/"une poignée de mignons explosifs"),
+                                             // /*spanish*/un par de bombas roedoras
+                                            CustomMessage("a few proximity mice", /*german*/"", /*french*/"une poignée de jouets à remonter"),
+                                             // /*spanish*/un par de explosivos ratoncitos
+                                            CustomMessage("a few wall crawlers", /*german*/"", /*french*/"une poignée de rapides grimpeurs"),
+                                             // /*spanish*/un par de trepaparedes
+                                            CustomMessage("a few trail blazers", /*german*/"", /*french*/"une poignée de zigzags éclatants")});
+                                             // /*spanish*/un par de ratas propulsadas
+
+    hintTextTable[RHT_BOMBCHU_10] = HintText(CustomMessage("Bombchus (10 pieces)", /*german*/"", /*french*/"une dizaine de Missiles"),
+                                             // /*spanish*/unos (10) bombchus
+                                             {
+                                             CustomMessage("a prize of the House of Skulltulas", /*german*/"", /*french*/"un prix de la maison des Skulltulas"),
+                                              // /*spanish*/un obsequio de la Casa Skulltula
+                                             CustomMessage("explosives", /*german*/"", /*french*/"un paquet d'explosifs")
+                                              // /*spanish*/un montón de explosivos
+                                             }, {
+                                             CustomMessage("some mice bombs", /*german*/"", /*french*/"un paquet de mignons explosifs"),
+                                              // /*spanish*/unas cuantas bombas roedoras
+                                             CustomMessage("some proximity mice", /*german*/"", /*french*/"un paquet de jouets à remonter"),
+                                              // /*spanish*/unos cuantos explosivos ratoncitos
+                                             CustomMessage("some wall crawlers", /*german*/"", /*french*/"un paquet de rapides grimpeurs"),
+                                              // /*spanish*/unos cuantos trepaparedes
+                                             CustomMessage("some trail blazers", /*german*/"", /*french*/"un paquet de zigzags éclatants")});
+                                              // /*spanish*/unas cuantas ratas propulsadas
+
+    hintTextTable[RHT_BOMBCHU_20] = HintText(CustomMessage("Bombchus (20 pieces)", /*german*/"", /*french*/"une vingtaine de Missiles"),
+                                             // /*spanish*/unos (20) bombchus
+                                             {
+                                             CustomMessage("a prize of the House of Skulltulas", /*german*/"", /*french*/"un prix de la maison des Skulltulas"),
+                                              // /*spanish*/un obsequio de la Casa Skulltula
+                                             CustomMessage("explosives", /*german*/"", /*french*/"un paquet d'explosifs")
+                                              // /*spanish*/un montón de explosivos
+                                             }, {
+                                             CustomMessage("plenty of mice bombs", /*german*/"", /*french*/"une abondance de mignons explosifs"),
+                                              // /*spanish*/bastantes bombas roedoras
+                                             CustomMessage("plenty of proximity mice", /*german*/"", /*french*/"une abondance de jouets à remonter"),
+                                              // /*spanish*/bastantes explosivos ratoncitos
+                                             CustomMessage("plenty of wall crawlers", /*german*/"", /*french*/"une abondance de rapides grimpeurs"),
+                                              // /*spanish*/bastantes trepaparedes
+                                             CustomMessage("plenty of trail blazers", /*german*/"", /*french*/"une abondance de zigzags éclatants")});
+                                              // /*spanish*/bastantes ratas propulsadas
+
+    hintTextTable[RHT_ARROWS_5] = HintText(CustomMessage("Arrows (5 pieces)", /*german*/"", /*french*/"une demi-dizaine de flèches"),
+                                           // /*spanish*/unas (5) flechas
+                                           {
+                                           CustomMessage("a projectile", /*german*/"", /*french*/"un projectile")
+                                            // /*spanish*/un proyectil
+                                           }, {
+                                           CustomMessage("a few danger darts", /*german*/"", /*french*/"une poignée d'obus"),
+                                            // /*spanish*/un par de peligrosos dardos
+                                           CustomMessage("a few sharp shafts", /*german*/"", /*french*/"une poignée de piquets")});
+                                            // /*spanish*/un par de puntas afiladas
+
+    hintTextTable[RHT_ARROWS_10] = HintText(CustomMessage("Arrows (10 pieces)", /*german*/"", /*french*/"une dizaine de flèches"),
+                                            // /*spanish*/unas (10) flechas
+                                            {
+                                            CustomMessage("a projectile", /*german*/"", /*french*/"un projectile")
+                                             // /*spanish*/un proyectil
+                                            }, {
+                                            CustomMessage("some danger darts", /*german*/"", /*french*/"un paquet d'obus"),
+                                             // /*spanish*/unos cuantos peligrosos dardos
+                                            CustomMessage("some sharp shafts", /*german*/"", /*french*/"un paquet de piquets")});
+                                             // /*spanish*/unas cuantas puntas afiladas
+
+    hintTextTable[RHT_ARROWS_30] = HintText(CustomMessage("Arrows (30 pieces)", /*german*/"", /*french*/"une trentaine de flèches"),
+                                            // /*spanish*/unas (30) flechas
+                                            {
+                                            CustomMessage("a projectile", /*german*/"", /*french*/"un projectile")
+                                             // /*spanish*/un proyectil
+                                            }, {
+                                            CustomMessage("plenty of danger darts", /*german*/"", /*french*/"une abondance d'obus"),
+                                             // /*spanish*/bastantes peligrosos dardos
+                                            CustomMessage("plenty of sharp shafts", /*german*/"", /*french*/"une abondance de piquets")});
+                                             // /*spanish*/bastantes puntas afiladas
+
+    hintTextTable[RHT_DEKU_NUTS_5] = HintText(CustomMessage("Deku Nuts (5 pieces)", /*german*/"", /*french*/"une demi-dizaine de noix Mojo"),
+                                              // /*spanish*/unas (5) nueces deku
+                                              {
+                                              CustomMessage("some Deku munitions", /*german*/"", /*french*/"un paquet de munitions Mojo"),
+                                               // /*spanish*/un montón de municiones Deku
+                                              CustomMessage("something that can stun", /*german*/"", /*french*/"une chose qui peut paralyser")
+                                               // /*spanish*/algo que pueda paralizar
+                                              }, {
+                                              CustomMessage("some nuts", /*german*/"", /*french*/"une poignée de noisettes"),
+                                               // /*spanish*/un par de nueces
+                                              CustomMessage("some flashbangs", /*german*/"", /*french*/"une poignée d'éclats"),
+                                               // /*spanish*/un par de semillas aturdidoras
+                                              CustomMessage("some scrub spit", /*german*/"", /*french*/"une poignée de crachats Mojo")});
+                                               // /*spanish*/un par de escupitajos deku
+
+    hintTextTable[RHT_DEKU_NUTS_10] = HintText(CustomMessage("Deku Nuts (10 pieces)", /*german*/"", /*french*/"une dizaine de noix Mojo"),
+                                               // /*spanish*/unas (10) nueces deku
+                                               {
+                                               CustomMessage("some Deku munitions", /*german*/"", /*french*/"un paquet de munitions Mojo"),
+                                                // /*spanish*/un montón de municiones Deku
+                                               CustomMessage("something that can stun", /*german*/"", /*french*/"une chose qui peut paralyser")
+                                                // /*spanish*/algo que pueda paralizar
+                                               }, {
+                                               CustomMessage("lots-o-nuts", /*german*/"", /*french*/"un paquet de noisettes"),
+                                                // /*spanish*/un puñado de nueces
+                                               CustomMessage("plenty of flashbangs", /*german*/"", /*french*/"un paquet d'éclats"),
+                                                // /*spanish*/unas cuantas semillas aturdidoras
+                                               CustomMessage("plenty of scrub spit", /*german*/"", /*french*/"un paquet de crachats Mojo")});
+                                                // /*spanish*/unos cuantos escupitajos deku
+
+    hintTextTable[RHT_DEKU_SEEDS_30] = HintText(CustomMessage("Deku Seeds (30 pieces)", /*german*/"", /*french*/"une trentaine de graines Mojo"),
+                                                // /*spanish*/unas (30) semillas deku
+                                                {
+                                                CustomMessage("a projectile", /*german*/"", /*french*/"un projectile"),
+                                                 // /*spanish*/un proyectil
+                                                CustomMessage("some Deku munitions", /*german*/"", /*french*/"un paquet de munitions Mojo")
+                                                 // /*spanish*/un montón de municiones Deku
+                                                }, {
+                                                CustomMessage("catapult ammo", /*german*/"", /*french*/"un paquet de délicieuses munitions"),
+                                                 // /*spanish*/un par de munición infantil
+                                                CustomMessage("lots-o-seeds", /*german*/"", /*french*/"un paquet de germes séchés")});
+                                                 // /*spanish*/un puñado de semillas
+
+    hintTextTable[RHT_DEKU_STICK_1] = HintText(CustomMessage("a Deku Stick", /*german*/"", /*french*/"un bâton Mojo"),
+                                               // /*spanish*/un palo deku
+                                               {
+                                               CustomMessage("some Deku munitions", /*german*/"", /*french*/"un paquet de munitions Mojo")
+                                                // /*spanish*/un montón de municiones Deku
+                                               }, {
+                                               CustomMessage("a breakable branch", /*german*/"", /*french*/"un bout de bois")});
+                                                // /*spanish*/un pequeño báculo
+
+    hintTextTable[RHT_TREASURE_GAME_HEART] = HintText(CustomMessage("a Piece of Heart", /*german*/"", /*french*/"un Quart de Coeur"),
+                                                      // /*spanish*/el amor de la victoria
+                                                      {
+                                                      CustomMessage("something heart-shaped", /*german*/"", /*french*/"une chose en forme de coeur")
+                                                       // /*spanish*/algo con forma de corazón
+                                                      }, {
+                                                      CustomMessage("a victory valentine", /*german*/"", /*french*/"un amour gagnant")});
+                                                       // /*spanish*/el amor victorioso
+
+    hintTextTable[RHT_TREASURE_GAME_GREEN_RUPEE] = HintText(CustomMessage("a Green Rupee", /*german*/"", /*french*/"un rubis vert"),
+                                                            // /*spanish*/una rupia verde
+                                                            {
+                                                            CustomMessage("some rupees", /*german*/"", /*french*/"une quantité de rubis")
+                                                             // /*spanish*/una cantidad de rupias
+                                                            }, {
+                                                            CustomMessage("the dollar of defeat", /*german*/"", /*french*/"le rubis de la défaite")});
+                                                             // /*spanish*/el peso de la derrota
+
+    hintTextTable[RHT_TRIFORCE_PIECE] = HintText(CustomMessage("a Piece of the Triforce", /*german*/"", /*french*/"un fragment de la Triforce"),
+                                                 // /*spanish*/un fragmento de la Trifuerza
+                                                 {}, {
+                                                 CustomMessage("a triumph fork", /*german*/"", /*french*/"la Tribosse"),
+                                                  // /*spanish*/un trígono del triunfo
+                                                 CustomMessage("cheese", /*german*/"", /*french*/"du fromage"),
+                                                  // /*spanish*/un porción de queso
+                                                 CustomMessage("a gold fragment", /*german*/"", /*french*/"un fragment d'or")});
+                                                  // /*spanish*/un fragmento dorado
+
+    hintTextTable[RHT_GOHMA_SOUL] = HintText(CustomMessage("the soul of Gohma", /*german*/"", /*french*/""),
+                                             {
+                                             CustomMessage("something webbed", /*german*/"", /*french*/"")
+                                             }, {
+                                             CustomMessage("an invasive soul", /*german*/"", /*french*/""),
+                                             CustomMessage("some spider essence", /*german*/"", /*french*/"")});
+
+    hintTextTable[RHT_KING_DODONGO_SOUL] = HintText(CustomMessage("the soul of King Dodongo", /*german*/"", /*french*/""),
+                                                    {
+                                                    CustomMessage("something explosive", /*german*/"", /*french*/"")
+                                                    }, {
+                                                    CustomMessage("a royal soul", /*german*/"", /*french*/""),
+                                                    CustomMessage("some reptile essence", /*german*/"", /*french*/"")});
+
+    hintTextTable[RHT_BARINADE_SOUL] = HintText(CustomMessage("the soul of Barinade", /*german*/"", /*french*/""),
+                                                {
+                                                CustomMessage("something fishy", /*german*/"", /*french*/"")
+                                                }, {
+                                                CustomMessage("an infectuous soul", /*german*/"", /*french*/""),
+                                                CustomMessage("some parasitic essence", /*german*/"", /*french*/"")});
+
+    hintTextTable[RHT_PHANTOM_GANON_SOUL] = HintText(CustomMessage("the soul of Phantom Ganon", /*german*/"", /*french*/""),
+                                                     {
+                                                     CustomMessage("something spectral", /*german*/"", /*french*/"")
+                                                     }, {
+                                                     CustomMessage("a duplicate soul", /*german*/"", /*french*/""),
+
+                                                     CustomMessage("some illusionary essence", /*german*/"", /*french*/"")});
+
+    hintTextTable[RHT_VOLVAGIA_SOUL] = HintText(CustomMessage("the soul of Volvagia", /*german*/"", /*french*/""),
+                                                {
+                                                CustomMessage("something hot", /*german*/"", /*french*/"")
+                                                }, {
+                                                CustomMessage("a draconic soul", /*german*/"", /*french*/""),
+                                                CustomMessage("some magmatic essence", /*german*/"", /*french*/"")});
+
+    hintTextTable[RHT_MORPHA_SOUL] = HintText(CustomMessage("the soul of Barinade", /*german*/"", /*french*/""),
+                                              {
+                                              CustomMessage("something wet", /*german*/"", /*french*/"")
+                                              }, {
+                                              CustomMessage("an aquatic soul", /*german*/"", /*french*/""),
+                                              CustomMessage("some liquid essence", /*german*/"", /*french*/"")});
+
+    hintTextTable[RHT_BONGO_BONGO_SOUL] = HintText(CustomMessage("the soul of Bongo Bongo", /*german*/"", /*french*/""),
+                                                   {
+                                                   CustomMessage("something dark", /*german*/"", /*french*/"")
+                                                   }, {
+                                                   CustomMessage("a shadowy soul", /*german*/"", /*french*/""),
+                                                   CustomMessage("some handy essence", /*german*/"", /*french*/"")});
+
+    hintTextTable[RHT_TWINROVA_SOUL] = HintText(CustomMessage("the soul of Twinrova", /*german*/"", /*french*/""),
+                                                {
+                                                CustomMessage("something spiritual", /*german*/"", /*french*/"")
+                                                }, {
+                                                CustomMessage("old souls", /*german*/"", /*french*/""),
+                                                CustomMessage("twin essences", /*german*/"", /*french*/"")});
+
+    hintTextTable[RHT_GANON_SOUL] = HintText(CustomMessage("the soul of Ganon", /*german*/"", /*french*/""),
+                                             {
+                                             CustomMessage("something strong", /*german*/"", /*french*/"")
+                                             }, {
+                                             CustomMessage("an evil soul", /*german*/"", /*french*/""),
+                                             CustomMessage("some powerful essence", /*german*/"", /*french*/"")});
+
+    hintTextTable[RHT_OCARINA_A_BUTTON] = HintText(CustomMessage("an Ocarina A Button", /*german*/"", /*french*/"la Touche A de l'Ocarina"),
+                                                   // /*spanish*/un botón A de Ocarina
+                                                   {
+                                                   CustomMessage("something melodic", /*german*/"", /*french*/"quelque chose de mélodieux")
+                                                    // /*spanish*/algo melódico
+                                                   }, {
+                                                   CustomMessage("a musical letter", /*german*/"", /*french*/"une lettre musicale")});
+                                                    // /*spanish*/una letra musical
+
+    hintTextTable[RHT_OCARINA_C_UP_BUTTON] = HintText(CustomMessage("an Ocarina C Up Button", /*german*/"", /*french*/"la Touche C-Haut de l'Ocarina"),
+                                                      // /*spanish*/un botón C superior de Ocarina
+                                                      {
+                                                      CustomMessage("something melodic", /*german*/"", /*french*/"quelque chose de mélodieux")
+                                                       // /*spanish*/algo melódico
+                                                      }, {
+                                                      CustomMessage("a high tone", /*german*/"", /*french*/"une tonalité élevée")});
+                                                       // /*spanish*/un tono alto
+
+    hintTextTable[RHT_OCARINA_C_DOWN_BUTTON] = HintText(CustomMessage("an Ocarina C Down Button", /*german*/"", /*french*/"la Touche C-Bas de l'Ocarina"),
+                                                        // /*spanish*/un botón C inferior de Ocarina
+                                                        {
+                                                        CustomMessage("something melodic", /*german*/"", /*french*/"quelque chose de mélodieux")
+                                                         // /*spanish*/algo melódico
+                                                        }, {
+                                                        CustomMessage("a low tone", /*german*/"", /*french*/"une tonalité basse")});
+                                                         // /*spanish*/un tono bajo
+
+    hintTextTable[RHT_OCARINA_C_LEFT_BUTTON] = HintText(CustomMessage("an Ocarina C Left Button", /*german*/"", /*french*/"la Touche C-Gauche de l'Ocarina"),
+                                                        // /*spanish*/un botón C izquierdo de Ocarina
+                                                        {
+                                                        CustomMessage("something melodic", /*german*/"", /*french*/"quelque chose de mélodieux")
+                                                         // /*spanish*/algo melódico
+                                                        }, {
+                                                        CustomMessage("a leftward tone", /*german*/"", /*french*/"une tonalité vers la gauche")});
+                                                         // /*spanish*/un tono hacia la izquierda
+
+    hintTextTable[RHT_OCARINA_C_RIGHT_BUTTON] = HintText(CustomMessage("an Ocarina C Right Button", /*german*/"", /*french*/"la Touche C-Droit de l'Ocarina"),
+                                                         // /*spanish*/un botón C derecho de Ocarina
+                                                         {
+                                                         CustomMessage("something melodic", /*german*/"", /*french*/"quelque chose de mélodieux")
+                                                          // /*spanish*/algo melódico
+                                                         }, {
+                                                         CustomMessage("a rightward tone", /*german*/"", /*french*/"une tonalité vers la droite")});
+                                                          // /*spanish*/un tono hacia la derecha
+
+    hintTextTable[RHT_FISHING_POLE] = HintText(CustomMessage("a fishing pole", /*german*/"", /*french*/"canne à pêche"),
+                                               // /*spanish*/caña de pescar
+                                               {
+                                               CustomMessage("the pond owner's property", /*german*/"", /*french*/"(canne à pêche)")
+                                                // /*spanish*/(caña de pescar)
+                                               }, {
+                                               CustomMessage("a fish-puller", /*german*/"", /*french*/"(canne à pêche)")});
+                                                // /*spanish*/(caña de pescar)
+
+    hintTextTable[RHT_EPONA] = HintText(CustomMessage("Epona", /*german*/"", /*french*/"Epona"),
+                                    // /*spanish*/a Epona
+                                    {
+                                    CustomMessage("something from Malon", /*german*/"", /*french*/"un cadeau de Malon"),
+                                         // /*spanish*/un obsequio de Malon
+                                    CustomMessage("a song sung by frogs", /*german*/"", /*french*/"une chanson aimée des grenouilles"),
+                                         // /*spanish*/una melodía de ranas
+                                    CustomMessage("something to cross a broken bridge", /*german*/"", /*french*/"une chose pour traverser un pont brisé")
+                                         // /*spanish*/algo para cruzar un puente roto
+                                    }, {
+                                    CustomMessage("a horse", /*german*/"", /*french*/"un fidèle destrier"),
+                                         // /*spanish*/una yegua
+                                    CustomMessage("a four legged friend", /*german*/"", /*french*/"un puissant animal")});
+                                         // /*spanish*/una amiga cuadrúpeda
+
+    //What is this used for?
+    hintTextTable[RHT_HINT_MYSTERIOUS] = HintText(CustomMessage("something mysterious", /*german*/"etwas Unvorhergesehenes", /*french*/"un sacré mystère"));
+                                                  // /*spanish*/algo misterioso
+
+    hintTextTable[RHT_MYSTERIOUS_ITEM] = HintText(CustomMessage("mysterious item", /*german*/"mysteriösen Gegenstand", /*french*/"objet mystérieux"));
+                                                  // /*spanish*/algo misterioso
+
 }
+}
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.cpp b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
index e007c06af..1c1edd62d 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hints.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
@@ -4,38 +4,87 @@
 #include "random.hpp"
 #include "spoiler_log.hpp"
 #include "fill.hpp"
-#include "hint_list.hpp"
 #include "../trial.h"
 #include "../entrance.h"
 #include "z64item.h"
 #include <spdlog/spdlog.h>
 #include "../randomizerTypes.h"
-#include "../context.h"
 #include "pool_functions.hpp"
+#include "../hint.h"
+#include "../static_data.h"
 
-#define QM_WHITE "%w"
-#define QM_RED "%r"
-#define QM_GREEN "%g"
-#define QM_BLUE "%b"
-#define QM_LBLUE "%c"
-#define QM_PINK "%p"
-#define QM_YELLOW "%y"
-#define QM_BLACK "%B"
 
 using namespace Rando;
 
-const Text& HintText::GetText() const {
-  auto ctx = Rando::Context::GetInstance();
+HintDistributionSetting::HintDistributionSetting(std::string _name, 
+                          HintType _type, 
+                          uint32_t _weight, 
+                          uint8_t _fixed, 
+                          uint8_t _copies, 
+                          std::function<bool(RandomizerCheck)> _filter,
+                          uint8_t _dungeonLimit){
+    name = _name;
+    type = _type;
+    weight = _weight;
+    fixed = _fixed;
+    copies = _copies;
+    filter = _filter;
+    dungeonLimit = _dungeonLimit;
+  }
+
+HintText::HintText(CustomMessage clearText_, std::vector<CustomMessage> ambiguousText_, std::vector<CustomMessage> obscureText_)
+: clearText(std::move(clearText_)), ambiguousText(std::move(ambiguousText_)), obscureText(std::move(obscureText_)){}
+
+const CustomMessage& HintText::GetClear() const {
+    return clearText;
+}
+
+const CustomMessage& HintText::GetObscure() const {
+    return obscureText.size() > 0 ? RandomElement(obscureText) : clearText;
+}
+
+const CustomMessage& HintText::GetObscure(uint8_t selection) const {
+    if (obscureText.size() > selection){
+        return obscureText[selection];
+    } else if (obscureText.size() > 0) {
+        return obscureText[0];
+    }
+    return clearText;
+}
+
+const CustomMessage& HintText::GetAmbiguous() const {
+    return ambiguousText.size() > 0 ? RandomElement(ambiguousText) : clearText;
+}
+
+const CustomMessage& HintText::GetAmbiguous(uint8_t selection) const {
+    if (ambiguousText.size() > selection){
+        return ambiguousText[selection];
+    } else if (ambiguousText.size() > 0) {
+        return ambiguousText[0];
+    }
+    return clearText;
+}
+
+uint8_t HintText::GetAmbiguousSize() const{
+    return ambiguousText.size();
+}
+
+uint8_t HintText::GetObscureSize() const{
+    return obscureText.size();
+}
+
+const CustomMessage& HintText::GetHintMessage(uint8_t selection) const {
+    auto ctx = Rando::Context::GetInstance();
     if (ctx->GetOption(RSK_HINT_CLARITY).Is(RO_HINT_CLARITY_OBSCURE)) {
-        return GetObscure();
+        return GetObscure(selection);
     } else if (ctx->GetOption(RSK_HINT_CLARITY).Is(RO_HINT_CLARITY_AMBIGUOUS)) {
-        return GetAmbiguous();
+        return GetAmbiguous(selection);
     } else {
         return GetClear();
     }
 }
 
-const Text HintText::GetTextCopy() const {
+const CustomMessage HintText::GetMessageCopy() const {
     auto ctx = Rando::Context::GetInstance();
     if (ctx->GetOption(RSK_HINT_CLARITY).Is(RO_HINT_CLARITY_OBSCURE)) {
         return GetObscure();
@@ -46,33 +95,34 @@ const Text HintText::GetTextCopy() const {
     }
 }
 
-std::array<std::string, HINT_TYPE_MAX> hintTypeNames = {
-    "Static",
-    "Trial",
-    "WotH",
-    "Barren",
-    "Entrance",
-    "Item Area",
-    "Item Location",
-    "Junk"
-};
+bool HintText::operator==(const HintText& right) const {
+    return obscureText == right.obscureText &&
+            ambiguousText == right.ambiguousText &&
+            clearText == right.clearText;
+}
+
+bool HintText::operator!=(const HintText& right) const {
+    return !operator==(right);
+}
+
+StaticHintInfo::StaticHintInfo(HintType _type, std::vector<RandomizerHintTextKey> _hintKeys, RandomizerSettingKey _setting,
+                               std::variant<bool, uint8_t> _condition, std::vector<RandomizerCheck> _targetChecks,
+                               std::vector<RandomizerGet> _targetItems, std::vector<RandomizerCheck> _hintChecks, bool _yourPocket, int _num):
+                               type(_type), hintKeys(_hintKeys), setting(_setting), condition(_condition), targetChecks(_targetChecks),
+                               targetItems(_targetItems), hintChecks(_hintChecks), yourPocket(_yourPocket), num(_num){}
+
+RandomizerHintTextKey GetRandomJunkHint(){ 
+  //temp code to handle random junk hints now I work in keys instead of a vector of HintText
+  // Will be replaced with a better system once more customisable hint pools are added
+  uint32_t range = RHT_JUNK_SG_8 - RHT_JUNK02;
+  return (RandomizerHintTextKey)(Random(0, range) + RHT_JUNK02);
+}
+
+RandomizerHintTextKey GetRandomGanonJoke(){ 
+  uint32_t range = RHT_GANON_JOKE11 - RHT_GANON_JOKE01;
+  return (RandomizerHintTextKey)(Random(0, range) + RHT_GANON_JOKE01);
+}
 
-std::array<std::pair<RandomizerCheck,RandomizerSettingKey>, 14> staticHintLocations = {{
-  {RC_KAK_10_GOLD_SKULLTULA_REWARD,  RSK_KAK_10_SKULLS_HINT},
-  {RC_KAK_20_GOLD_SKULLTULA_REWARD,  RSK_KAK_20_SKULLS_HINT},
-  {RC_KAK_30_GOLD_SKULLTULA_REWARD,  RSK_KAK_30_SKULLS_HINT},
-  {RC_KAK_40_GOLD_SKULLTULA_REWARD,  RSK_KAK_40_SKULLS_HINT},
-  {RC_KAK_50_GOLD_SKULLTULA_REWARD,  RSK_KAK_50_SKULLS_HINT},
-  {RC_KAK_100_GOLD_SKULLTULA_REWARD, RSK_KAK_100_SKULLS_HINT},
-  {RC_SONG_FROM_IMPA,                RSK_SKIP_CHILD_ZELDA},
-  {RC_ZR_FROGS_OCARINA_GAME,         RSK_FROGS_HINT},
-  {RC_DMT_TRADE_CLAIM_CHECK,         RSK_BIGGORON_HINT},
-  {RC_MARKET_10_BIG_POES,            RSK_BIG_POES_HINT},
-  {RC_KAK_ANJU_AS_CHILD,             RSK_CHICKENS_HINT},
-  {RC_KF_LINKS_HOUSE_COW,            RSK_MALON_HINT},
-  {RC_GF_HBA_1000_POINTS,            RSK_HBA_HINT},
-  {RC_GF_HBA_1500_POINTS,            RSK_HBA_HINT},
-  }};
 
 bool FilterWotHLocations(RandomizerCheck loc){
   auto ctx = Rando::Context::GetInstance();
@@ -125,14 +175,14 @@ const std::array<HintSetting, 4> hintSettingTable{{
     .trialCopies = 1,
     .junkWeight = 6,
     .distTable = {
-      {"WotH",       HINT_TYPE_WOTH,          7,  0, 1, FilterWotHLocations,      2},
-      {"Barren",     HINT_TYPE_BARREN,        4,  0, 1, FilterBarrenLocations,    1},
+      {"WotH",       HINT_TYPE_WOTH,      7,   0, 1, FilterWotHLocations,      2},
+      {"Barren",     HINT_TYPE_FOOLISH,   4,   0, 1, FilterBarrenLocations,    1},
       //("Entrance",   HINT_TYPE_ENTRANCE,      6,  0, 1), //not yet implemented
-      {"Song",       HINT_TYPE_ITEM_LOCATION, 2,  0, 1, FilterSongLocations},
-      {"Overworld",  HINT_TYPE_ITEM_LOCATION, 4,  0, 1, FilterOverworldLocations},
-      {"Dungeon",    HINT_TYPE_ITEM_LOCATION, 3,  0, 1, FilterDungeonLocations},
-      {"Named Item", HINT_TYPE_ITEM_AREA,    10,  0, 1, FilterGoodItems},
-      {"Random"    , HINT_TYPE_ITEM_AREA,    12,  0, 1, NoFilter}
+      {"Song",       HINT_TYPE_ITEM,      2,   0, 1, FilterSongLocations},
+      {"Overworld",  HINT_TYPE_ITEM,      4,   0, 1, FilterOverworldLocations},
+      {"Dungeon",    HINT_TYPE_ITEM,      3,   0, 1, FilterDungeonLocations},
+      {"Named Item", HINT_TYPE_ITEM_AREA, 10,  0, 1, FilterGoodItems},
+      {"Random"    , HINT_TYPE_ITEM_AREA, 12,  0, 1, NoFilter}
     }
   },
   // Strong hints
@@ -141,14 +191,14 @@ const std::array<HintSetting, 4> hintSettingTable{{
     .trialCopies = 1,
     .junkWeight = 0,
     .distTable = {
-      {"WotH",       HINT_TYPE_WOTH,         12, 0, 2, FilterWotHLocations,      2},
-      {"Barren",     HINT_TYPE_BARREN,       12, 0, 1, FilterBarrenLocations,    1},
+      {"WotH",       HINT_TYPE_WOTH,      12, 0, 2, FilterWotHLocations,      2},
+      {"Barren",     HINT_TYPE_FOOLISH,   12, 0, 1, FilterBarrenLocations,    1},
       //{"Entrance",   HINT_TYPE_ENTRANCE,      4, 0, 1}, //not yet implemented
-      {"Song",       HINT_TYPE_ITEM_LOCATION, 4, 0, 1, FilterSongLocations},
-      {"Overworld",  HINT_TYPE_ITEM_LOCATION, 6, 0, 1, FilterOverworldLocations},
-      {"Dungeon",    HINT_TYPE_ITEM_LOCATION, 6, 0, 1, FilterDungeonLocations},
-      {"Named Item", HINT_TYPE_ITEM_AREA,     8, 0, 1, FilterGoodItems},
-      {"Random"    , HINT_TYPE_ITEM_AREA,     8, 0, 1, NoFilter},
+      {"Song",       HINT_TYPE_ITEM,      4,  0, 1, FilterSongLocations},
+      {"Overworld",  HINT_TYPE_ITEM,      6,  0, 1, FilterOverworldLocations},
+      {"Dungeon",    HINT_TYPE_ITEM,      6,  0, 1, FilterDungeonLocations},
+      {"Named Item", HINT_TYPE_ITEM_AREA, 8,  0, 1, FilterGoodItems},
+      {"Random"    , HINT_TYPE_ITEM_AREA, 8,  0, 1, NoFilter},
     },
   },
   // Very strong hints
@@ -157,169 +207,111 @@ const std::array<HintSetting, 4> hintSettingTable{{
     .trialCopies = 1,
     .junkWeight = 0,
     .distTable = {
-      {"WotH",       HINT_TYPE_WOTH,         15, 0, 2, FilterWotHLocations},
-      {"Barren",     HINT_TYPE_BARREN,       15, 0, 1, FilterBarrenLocations},
+      {"WotH",       HINT_TYPE_WOTH,      15, 0, 2, FilterWotHLocations},
+      {"Barren",     HINT_TYPE_FOOLISH,   15, 0, 1, FilterBarrenLocations},
       //{"Entrance",   HINT_TYPE_ENTRANCE,     10, 0, 1}, //not yet implemented
-      {"Song",       HINT_TYPE_ITEM_LOCATION, 2, 0, 1, FilterSongLocations},
-      {"Overworld",  HINT_TYPE_ITEM_LOCATION, 7, 0, 1, FilterOverworldLocations},
-      {"Dungeon",    HINT_TYPE_ITEM_LOCATION, 7, 0, 1, FilterDungeonLocations},
-      {"Named Item", HINT_TYPE_ITEM_AREA,     5, 0, 1, FilterGoodItems},
+      {"Song",       HINT_TYPE_ITEM,      2,  0, 1, FilterSongLocations},
+      {"Overworld",  HINT_TYPE_ITEM,      7,  0, 1, FilterOverworldLocations},
+      {"Dungeon",    HINT_TYPE_ITEM,      7,  0, 1, FilterDungeonLocations},
+      {"Named Item", HINT_TYPE_ITEM_AREA, 5,  0, 1, FilterGoodItems},
     },
   },
 }};
 
-static std::map<std::string, int> pixelWidthTable = {
-    { " ", 6 },  { "!", 6 },  { "\"", 5 },     { "#", 7 },  { "$", 7 },  { "%", 11 }, { "&", 9 },  { "\'", 3 },
-    { "(", 6 },  { ")", 6 },  { "*", 6 },      { "+", 7 },  { ",", 3 },  { "-", 5 },  { ".", 3 },  { "/", 7 },
-    { "0", 8 },  { "1", 4 },  { "2", 7 },      { "3", 7 },  { "4", 8 },  { "5", 7 },  { "6", 7 },  { "7", 7 },
-    { "8", 7 },  { "9", 7 },  { ":", 5 },      { ";", 5 },  { "<", 7 },  { "=", 9 },  { ">", 7 },  { "?", 9 },
-    { "@", 10 }, { "A", 9 },  { "B", 7 },      { "C", 9 },  { "D", 9 },  { "E", 6 },  { "F", 6 },  { "G", 9 },
-    { "H", 8 },  { "I", 3 },  { "J", 6 },      { "K", 8 },  { "L", 6 },  { "M", 10 }, { "N", 9 },  { "O", 10 },
-    { "P", 7 },  { "Q", 10 }, { "R", 8 },      { "S", 8 },  { "T", 7 },  { "U", 8 },  { "V", 9 },  { "W", 12 },
-    { "X", 9 },  { "Y", 8 },  { "Z", 8 },      { "[", 6 },  { "\\", 8 }, { "]", 6 },  { "^", 8 },  { "_", 7 },
-    { "`", 4 },  { "a", 6 },  { "b", 7 },      { "c", 6 },  { "d", 7 },  { "e", 7 },  { "f", 5 },  { "g", 7 },
-    { "h", 6 },  { "i", 3 },  { "j", 5 },      { "k", 6 },  { "l", 3 },  { "m", 9 },  { "n", 7 },  { "o", 7 },
-    { "p", 7 },  { "q", 7 },  { "r", 6 },      { "s", 6 },  { "t", 6 },  { "u", 6 },  { "v", 7 },  { "w", 9 },
-    { "x", 6 },  { "y", 7 },  { "z", 6 },      { "{", 6 },  { "¦", 4 },  { "}", 6 },  { "¡", 5 },  { "¢", 7 },
-    { "£", 8 },  { "¤", 7 },  { "¥", 8 },      { "|", 4 },  { "§", 12 }, { "¨", 12 }, { "©", 10 }, { "ª", 5 },
-    { "«", 8 },  { "¬", 7 },  { "\u00AD", 6 }, { "®", 10 }, { "¯", 8 },  { "°", 12 }, { "±", 12 }, { "²", 5 },
-    { "³", 5 },  { "µ", 6 },  { "¶", 8 },      { "·", 4 },  { "¹", 4 },  { "º", 5 },  { "»", 9 },  { "¼", 9 },
-    { "½", 9 },  { "¾", 10 }, { "¿", 7 },      { "À", 11 }, { "Á", 9 },  { "Â", 9 },  { "Ã", 9 },  { "Ä", 9 },
-    { "Å", 9 },  { "Æ", 12 }, { "Ç", 9 },      { "È", 6 },  { "É", 6 },  { "Ê", 6 },  { "Ë", 6 },  { "Ì", 5 },
-    { "Í", 5 },  { "Î", 5 },  { "Ï", 5 },      { "Ð", 10 }, { "Ñ", 9 },  { "Ò", 10 }, { "Ó", 10 }, { "Ô", 10 },
-    { "Õ", 10 }, { "Ö", 10 }, { "×", 9 },      { "Ø", 10 }, { "Ù", 8 },  { "Ú", 8 },  { "Û", 8 },  { "Ü", 8 },
-    { "Ý", 10 }, { "Þ", 8 },  { "ß", 7 },      { "à", 6 },  { "á", 6 },  { "â", 6 },  { "ã", 6 },  { "ä", 6 },
-    { "å", 6 },  { "æ", 11 }, { "ç", 6 },      { "è", 7 },  { "é", 7 },  { "ê", 7 },  { "ë", 7 },  { "ì", 5 },
-    { "í", 5 },  { "î", 5 },  { "ï", 5 },      { "ð", 7 },  { "ñ", 7 },  { "ò", 7 },  { "ó", 7 },  { "ô", 7 },
-    { "õ", 7 },  { "ö", 7 },  { "÷", 11 },     { "ø", 9 },  { "ù", 7 },  { "ú", 7 },  { "û", 7 },  { "ü", 7 },
-    { "ý", 8 },  { "þ", 8 },  { "ÿ", 8 },      { "Œ", 11 }, { "œ", 11 }, { "„", 5 },  { "”", 5 },  { "€", 10 },
-    { "Ÿ", 10 }, { "~", 8 }
+uint8_t StonesRequiredBySettings() {
+    auto ctx = Rando::Context::GetInstance();
+    uint8_t stones = 0;
+    if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_STONES)) {
+        stones = ctx->GetOption(RSK_RAINBOW_BRIDGE_STONE_COUNT).Value<uint8_t>();
+    } else if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_DUNGEON_REWARDS)) {
+        stones = ctx->GetOption(RSK_RAINBOW_BRIDGE_REWARD_COUNT).Value<uint8_t>() - 6;
+    } else if ((ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_DUNGEONS)) && (ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_END_OF_DUNGEON))) {
+        stones = ctx->GetOption(RSK_RAINBOW_BRIDGE_DUNGEON_COUNT).Value<uint8_t>() - 6;
+    }
+    if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_STONES)) {
+        stones = std::max<uint8_t>({ stones, ctx->GetOption(RSK_LACS_STONE_COUNT).Value<uint8_t>() });
+    } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_STONES)) {
+        stones = std::max<uint8_t>({ stones, (uint8_t)(ctx->GetOption(RSK_LACS_REWARD_COUNT).Value<uint8_t>() - 6 )});
+    } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_DUNGEONS)) {
+        stones = std::max<uint8_t>({ stones, (uint8_t)(ctx->GetOption(RSK_LACS_DUNGEON_COUNT).Value<uint8_t>() - 6 )});
+    }
+    return stones;
+}
+
+uint8_t MedallionsRequiredBySettings() {
+    auto ctx = Rando::Context::GetInstance();
+    uint8_t medallions = 0;
+    if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_MEDALLIONS)) {
+        medallions = ctx->GetOption(RSK_RAINBOW_BRIDGE_MEDALLION_COUNT).Value<uint8_t>();
+    } else if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_DUNGEON_REWARDS)) {
+        medallions = ctx->GetOption(RSK_RAINBOW_BRIDGE_REWARD_COUNT).Value<uint8_t>() - 3;
+    } else if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_DUNGEONS) && ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_END_OF_DUNGEON)) {
+        medallions = ctx->GetOption(RSK_RAINBOW_BRIDGE_DUNGEON_COUNT).Value<uint8_t>() - 3;
+    }
+    if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_MEDALLIONS)) {
+        medallions = std::max({ medallions, ctx->GetOption(RSK_LACS_MEDALLION_COUNT).Value<uint8_t>() });
+    } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_REWARDS)) {
+        medallions = std::max({ medallions, (uint8_t)(ctx->GetOption(RSK_LACS_REWARD_COUNT).Value<uint8_t>() - 3 )});
+    } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_DUNGEONS) && ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_END_OF_DUNGEON)) {
+        medallions = std::max({ medallions, (uint8_t)(ctx->GetOption(RSK_LACS_DUNGEON_COUNT).Value<uint8_t>() - 3 )});
+    }
+    return medallions;
+}
+
+uint8_t TokensRequiredBySettings() {
+    auto ctx = Rando::Context::GetInstance();
+    uint8_t tokens = 0;
+    if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_TOKENS)) {
+        tokens = ctx->GetOption(RSK_RAINBOW_BRIDGE_TOKEN_COUNT).Value<uint8_t>();
+    }
+    if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_TOKENS)) {
+        tokens = std::max<uint8_t>({ tokens, ctx->GetOption(RSK_LACS_TOKEN_COUNT).Value<uint8_t>() });
+    }
+    return tokens;
+}
+
+std::vector<std::pair<RandomizerCheck, std::function<bool()>>> conditionalAlwaysHints = {
+    std::make_pair(RC_MARKET_10_BIG_POES, []() {
+                       auto ctx = Rando::Context::GetInstance();
+                       return ctx->GetOption(RSK_BIG_POE_COUNT).Value<uint8_t>() >= 3 && !ctx->GetOption(RSK_BIG_POES_HINT);
+                   }), // Remember, the option's value being 3 means 4 are required
+    std::make_pair(RC_DEKU_THEATER_MASK_OF_TRUTH, []() {
+                       auto ctx = Rando::Context::GetInstance();
+                       return !ctx->GetOption(RSK_COMPLETE_MASK_QUEST);
+                   }),
+    std::make_pair(RC_SONG_FROM_OCARINA_OF_TIME, []() { return StonesRequiredBySettings() < 2; }),
+    std::make_pair(RC_HF_OCARINA_OF_TIME_ITEM, []() { return StonesRequiredBySettings() < 2; }),
+    std::make_pair(RC_SHEIK_IN_KAKARIKO, []() { return MedallionsRequiredBySettings() < 5; }),
+    std::make_pair(RC_DMT_TRADE_CLAIM_CHECK, []() {
+                       auto ctx = Rando::Context::GetInstance();
+                       return !ctx->GetOption(RSK_BIGGORON_HINT);
+                   }),
+    std::make_pair(RC_KAK_30_GOLD_SKULLTULA_REWARD, []() {
+                       auto ctx = Rando::Context::GetInstance();
+                       return !ctx->GetOption(RSK_KAK_30_SKULLS_HINT) && TokensRequiredBySettings() < 30;
+                   }),
+    std::make_pair(RC_KAK_40_GOLD_SKULLTULA_REWARD, []() {
+                       auto ctx = Rando::Context::GetInstance();
+                       return !ctx->GetOption(RSK_KAK_40_SKULLS_HINT) && TokensRequiredBySettings() < 40;
+                   }),
+    std::make_pair(RC_KAK_50_GOLD_SKULLTULA_REWARD, []() {
+                       auto ctx = Rando::Context::GetInstance();
+                       return !ctx->GetOption(RSK_KAK_50_SKULLS_HINT) && TokensRequiredBySettings() < 50;
+                   }),
+    std::make_pair(RC_ZR_FROGS_OCARINA_GAME, []() {
+                       auto ctx = Rando::Context::GetInstance();
+                       return !ctx->GetOption(RSK_FROGS_HINT);
+                   }),
+    std::make_pair(RC_KF_LINKS_HOUSE_COW, []() {
+                       auto ctx = Rando::Context::GetInstance();
+                       return !ctx->GetOption(RSK_MALON_HINT);
+                   }),
+    std::make_pair(RC_KAK_100_GOLD_SKULLTULA_REWARD, []() {
+                       auto ctx = Rando::Context::GetInstance();
+                       return !ctx->GetOption(RSK_KAK_100_SKULLS_HINT) && TokensRequiredBySettings() < 100;
+                   }),
 };
 
-static size_t NextLineLength(const std::string* textStr, const size_t lastNewline, bool hasIcon = false) {
-  const  size_t maxLinePixelWidth = hasIcon ? 200 : 216;
-
-
-  size_t totalPixelWidth = 0;
-  size_t currentPos = lastNewline;
-
-  // Looping through the string from the lastNewline until the total
-  // width of counted characters exceeds the maximum pixels in a line.
-  size_t nextPosJump = 0;
-  while (totalPixelWidth < maxLinePixelWidth && currentPos < textStr->length()) {
-    // Skip over control codes
-    if (textStr->at(currentPos) == '%') {
-      nextPosJump = 2;
-    } else if (textStr->at(currentPos) == '$') {
-      nextPosJump = 2;
-    } else if (textStr->at(currentPos) == '@') {
-      nextPosJump = 1;
-      // Assume worst case for player name 12 * 8 (widest character * longest name length)
-      totalPixelWidth += 96;
-    } else {
-      // Some characters only one byte while others are two bytes
-      // So check both possibilities when checking for a character
-      if (pixelWidthTable.count(textStr->substr(currentPos, 1))) {
-        totalPixelWidth += pixelWidthTable[textStr->substr(currentPos, 1)];
-        nextPosJump = 1;
-      } else if (pixelWidthTable.count(textStr->substr(currentPos, 2))) {
-        totalPixelWidth += pixelWidthTable[textStr->substr(currentPos, 2)];
-        nextPosJump = 2;
-      } else {
-        SPDLOG_DEBUG("Table does not contain " + textStr->substr(currentPos, 1) + "/" + textStr->substr(currentPos, 2));
-        SPDLOG_DEBUG("Full string: " + *textStr);
-        nextPosJump = 1;
-      }
-    }
-    currentPos += nextPosJump;
-  }
-  // return the total number of characters we looped through
-  if (totalPixelWidth > maxLinePixelWidth && textStr->at(currentPos - nextPosJump) != ' ') {
-    return currentPos - lastNewline - nextPosJump;
-  } else {
-    return currentPos - lastNewline;
-  }
-}
-
-Text AutoFormatHintText(const Text& unformattedHintText, const std::vector<std::string>& colors = {}) {
-    std::array<std::string, LANGUAGE_MAX> strings;
-    for (int i = 0; i < LANGUAGE_MAX; i++) {
-        std::string textStr = unformattedHintText.GetForLanguage(i);
-
-        for (const auto& color: colors) {
-          if (const size_t firstHashtag = textStr.find('#'); firstHashtag != std::string::npos) {
-            textStr.replace(firstHashtag, 1, color);
-            if (const size_t secondHashtag = textStr.find('#', firstHashtag + 1); secondHashtag != std::string::npos) {
-              textStr.replace(secondHashtag, 1, QM_WHITE);
-            } else {
-              SPDLOG_DEBUG("non-matching hashtags in string: \"%s\"", textStr);
-            }
-          }
-        }
-        // Remove any remaining '#' characters.
-        std::erase(textStr, '#');
-
-        // insert newlines either manually or when encountering a '&'
-        size_t lastNewline = 0;
-        const bool hasIcon = textStr.find('$', 0) != std::string::npos;
-        size_t lineLength = NextLineLength(&textStr, lastNewline, hasIcon);
-        while (lastNewline + lineLength < textStr.length()) {
-            const size_t carrot = textStr.find('^', lastNewline);
-            const size_t ampersand = textStr.find('&', lastNewline);
-            const size_t lastSpace = textStr.rfind(' ', lastNewline + lineLength);
-            const size_t lastPeriod = textStr.rfind('.', lastNewline + lineLength);
-            // replace '&' first if it's within the newline range
-            if (ampersand < lastNewline + lineLength) {
-                lastNewline = ampersand + 1;
-                // or move the lastNewline cursor to the next line if a '^' is encountered
-            } else if (carrot < lastNewline + lineLength) {
-                lastNewline = carrot + 1;
-                // some lines need to be split but don't have spaces, look for periods instead
-            } else if (lastSpace == std::string::npos) {
-                textStr.replace(lastPeriod, 1, ".&");
-                lastNewline = lastPeriod + 2;
-            } else {
-                textStr.replace(lastSpace, 1, "&");
-                lastNewline = lastSpace + 1;
-            }
-          lineLength = NextLineLength(&textStr, lastNewline, hasIcon);
-        }
-        strings[i] = textStr;
-    }
-
-    return {strings[0], strings[2], ""/*spanish*/, strings[1]};
-}
-
-std::array<DungeonHintInfo, 10> dungeonInfoData;
-
-Text childAltarText;
-Text adultAltarText;
-Text ganonText;
-Text ganonHintText;
-Text sheikText;
-Text warpMinuetText;
-Text warpBoleroText;
-Text warpSerenadeText;
-Text warpRequiemText;
-Text warpNocturneText;
-Text warpPreludeText;
-
-std::string masterSwordHintLoc;
-std::string lightArrowHintLoc;
-
-void SetGanonText(Text text){
-  ganonText = text;
-}
-
-
-std::string GetMasterSwordHintLoc() {
-    return masterSwordHintLoc;
-}
-
-std::string GetLightArrowHintLoc() {
-    return lightArrowHintLoc;
-}
-
 static std::vector<RandomizerCheck> GetEmptyGossipStones() {
   auto emptyGossipStones = GetEmptyLocations(Rando::StaticData::gossipStoneLocations);
   return emptyGossipStones;
@@ -365,34 +357,32 @@ static void SetAllInRegionAsHinted(RandomizerArea area, std::vector<RandomizerCh
                                         return ctx->GetItemLocation(loc)->GetArea() == area;
                                       });
   for(RandomizerCheck loc: locsInRegion){
-    ctx->GetItemLocation(loc)->SetAsHinted();
+    ctx->GetItemLocation(loc)->SetHintAccesible();
   }
 }
 
-static void AddGossipStoneHint(Text hint,
-                                const RandomizerCheck gossipStone,
-                                const std::vector<std::string>& colors,
-                                HintType hintType,
-                                std::string distributionName,
-                                const RandomizerCheck hintedLocation) {
-  //save hints as dummy items for writing to the spoiler log
-  //NewItem(gossipStone, Item{RG_HINT, hint, ITEMTYPE_EVENT, GI_RUPEE_BLUE_LOSE, false, &noVariable, NONE});
-  //GetLocation(gossipStone)->SetPlacedItem(gossipStone);
+static void AddGossipStoneHint( const RandomizerCheck gossipStone,
+                                const HintType hintType,
+                                const std::string distributionName,
+                                const std::vector<RandomizerHintTextKey> hintKeys,
+                                const std::vector<RandomizerCheck> locations,
+                                const std::vector<TrialKey> trials) {
 
   auto ctx = Rando::Context::GetInstance();
-  ctx->AddHint((RandomizerHintKey)((gossipStone - RC_COLOSSUS_GOSSIP_STONE) + 1), AutoFormatHintText(hint, colors), hintedLocation, hintType, distributionName, ctx->GetItemLocation(hintedLocation)->GetArea());
+  ctx->AddHint(StaticData::gossipStoneCheckToHint[gossipStone], Hint(StaticData::gossipStoneCheckToHint[gossipStone], hintType, distributionName, hintKeys, locations, {}, trials));
   ctx->GetItemLocation(gossipStone)->SetPlacedItem(RG_HINT); //RANDOTODO, better gossip stone to location to hint key system
 }
 
 static void AddGossipStoneHintCopies(uint8_t copies,
-                                      Text hint,
-                                      std::vector<std::string> colours,
-                                      HintType type,
-                                      std::string distributionName,
-                                      RandomizerCheck location = RC_UNKNOWN_CHECK,
-                                      RandomizerCheck firstStone = RC_UNKNOWN_CHECK){
+                                     const HintType hintType,
+                                     const std::string distributionName,
+                                     const std::vector<RandomizerHintTextKey> hintKeys = {},
+                                     const std::vector<RandomizerCheck> locations = {},
+                                     const std::vector<TrialKey> trials = {},
+                                     RandomizerCheck firstStone = RC_UNKNOWN_CHECK){
+
   if (firstStone != RC_UNKNOWN_CHECK && copies > 0){
-      AddGossipStoneHint(hint, firstStone, colours, type, distributionName, location);
+      AddGossipStoneHint(firstStone, hintType, distributionName, hintKeys, locations, trials);
       copies -= 1;
   }
   for(int c=0; c<copies; c++){
@@ -403,69 +393,26 @@ static void AddGossipStoneHintCopies(uint8_t copies,
       return;
     }
     auto gossipStone = RandomElement(gossipStones, false);
-
-    AddGossipStoneHint(hint, gossipStone, colours, type, distributionName, location);
+    AddGossipStoneHint(gossipStone, hintType, distributionName, hintKeys, locations, trials);
   }
 }
 
-static bool CreateHint(RandomizerCheck hintedLocation, uint8_t copies, HintType type, std::string distributionName){
+static bool CreateHint(RandomizerCheck location, uint8_t copies, HintType type, std::string distribution){
   auto ctx = Rando::Context::GetInstance();
-  //get a gossip stone accessible without the hinted item
-  std::vector<RandomizerCheck> gossipStoneLocations;
-  gossipStoneLocations = GetAccessibleGossipStones(hintedLocation);
 
+  //get a gossip stone accessible without the hinted item
+  std::vector<RandomizerCheck> gossipStoneLocations = GetAccessibleGossipStones(location);
   if (gossipStoneLocations.empty()) { 
       SPDLOG_DEBUG("\tNO IN LOGIC GOSSIP STONE\n\n"); 
       return false;
   }
-
   RandomizerCheck gossipStone = RandomElement(gossipStoneLocations);
 
   //make hint text
-  Text finalHint;
-  Text prefix = ::Hint(RHT_PREFIX).GetText();
-  std::vector<std::string> colours;
-  if (type == HINT_TYPE_WOTH){
-    Text areaText = ::Hint(ctx->GetItemLocation(hintedLocation)->GetArea()).GetText();
-    finalHint = prefix + "#" + areaText + "#" + ::Hint(RHT_WAY_OF_THE_HERO).GetText();
-    colours = {QM_RED, QM_LBLUE};
-  }
-  else if(type == HINT_TYPE_BARREN){
-    Text areaText = ::Hint(ctx->GetItemLocation(hintedLocation)->GetArea()).GetText();
-    finalHint = prefix + ::Hint(RHT_PLUNDERING).GetText() + "#" + areaText + "#" + ::Hint(RHT_FOOLISH).GetText();
-    colours = {QM_RED, QM_PINK};
-  }
-  else {
-    Text itemText = ctx->GetItemLocation(hintedLocation)->GetPlacedItem().GetHint().GetText();
-    if (type == HINT_TYPE_ITEM_LOCATION){
-      Text locationText = Rando::StaticData::GetLocation(hintedLocation)->GetHint()->GetText();
-      finalHint = prefix + locationText + " #"+itemText+"#.";
-      colours = {QM_RED, QM_GREEN};
-    }
-    else if (type == HINT_TYPE_ITEM_AREA){
-      Text areaText = ::Hint(ctx->GetItemLocation(hintedLocation)->GetArea()).GetText();
-      if (Rando::StaticData::GetLocation(hintedLocation)->IsDungeon()) {
-        finalHint = prefix+"#"+areaText+"# "+::Hint(RHT_HOARDS).GetText()+" #"+itemText+"#.";
-        colours = {QM_RED, QM_GREEN};
-      } else {
-        finalHint = prefix+"#"+itemText+"# "+::Hint(RHT_CAN_BE_FOUND_AT).GetText()+" #"+areaText+"#.";
-        colours = {QM_GREEN, QM_RED};
-      }
-    }
-    else{
-      SPDLOG_DEBUG("\tINVALID HINT TYPE\n\n");
-      return false;
-    }
-  }
-  
-  ctx->GetItemLocation(hintedLocation)->SetAsHinted();
 
-  SPDLOG_DEBUG("\tMessage: ");
-  SPDLOG_DEBUG(finalHint.english);
-  SPDLOG_DEBUG("\n\n");
-
-  AddGossipStoneHintCopies(copies, finalHint, colours, type, distributionName, hintedLocation, gossipStone);
+  ctx->GetItemLocation(location)->SetHintAccesible();
 
+  AddGossipStoneHintCopies(copies, type, distribution, {}, {location}, {}, gossipStone);
   return true;
 }
 
@@ -501,7 +448,7 @@ static RandomizerCheck CreateRandomHint(std::vector<RandomizerCheck>& possibleHi
 
     placed = CreateHint(hintedLocation, copies, type, distributionName);
   }
-  if (type == HINT_TYPE_BARREN){
+  if (type == HINT_TYPE_FOOLISH){
      SetAllInRegionAsHinted(ctx->GetItemLocation(hintedLocation)->GetArea(), possibleHintLocations);
   }
   return hintedLocation;
@@ -511,7 +458,7 @@ static std::vector<RandomizerCheck> FilterHintability(std::vector<RandomizerChec
                                                       std::function<bool(RandomizerCheck)> extraFilter = NoFilter){
   auto ctx = Rando::Context::GetInstance();
   return FilterFromPool(locations, [extraFilter, ctx](const RandomizerCheck loc) {
-    return ctx->GetItemLocation(loc)->IsHintable() && !(ctx->GetItemLocation(loc)->IsHintedAt())
+    return ctx->GetItemLocation(loc)->IsHintable() && !(ctx->GetItemLocation(loc)->IsAHintAccessible())
     && extraFilter(loc);
   });
 }
@@ -519,426 +466,60 @@ static std::vector<RandomizerCheck> FilterHintability(std::vector<RandomizerChec
 static void CreateJunkHints(uint8_t numHints) {
   for(uint8_t c = 0; c < numHints; c++){
     //duplicate junk hints are possible for now
-    const HintText junkHint = RandomElement(GetHintCategory(HintCategory::Junk));
-    Text hint = junkHint.GetText();
-
-    SPDLOG_DEBUG("\tMessage: ");
-    SPDLOG_DEBUG(hint.english);
-    SPDLOG_DEBUG("\n\n");
-
-    AddGossipStoneHintCopies(1, hint, {QM_PINK}, HINT_TYPE_JUNK, "Junk");
+    AddGossipStoneHintCopies(1, HINT_TYPE_HINT_KEY, "Junk", {GetRandomJunkHint()});
   }
 }
 
 static void CreateTrialHints(uint8_t copies) {
   if (copies > 0) {
     auto ctx = Rando::Context::GetInstance();
-  Text prefix = ::Hint(RHT_PREFIX).GetText();
-      //six trials
-    if (ctx->GetOption(RSK_GANONS_TRIALS).IsNot(RO_GANONS_TRIALS_SKIP) && ctx->GetOption(RSK_TRIAL_COUNT).Is(6)) {
-      AddGossipStoneHintCopies(copies, prefix + ::Hint(RHT_SIX_TRIALS).GetText(), {QM_PINK}, HINT_TYPE_TRIAL, "Trial");
-      //zero trials
-    } else if (ctx->GetOption(RSK_GANONS_TRIALS).IsNot(RO_GANONS_TRIALS_SKIP) && ctx->GetOption(RSK_TRIAL_COUNT).Is(0)) {
-      AddGossipStoneHintCopies(copies, prefix + ::Hint(RHT_ZERO_TRIALS).GetText(), {QM_YELLOW}, HINT_TYPE_TRIAL, "Trial");
-      //4 or 5 required trials
-    } else if (ctx->GetOption(RSK_TRIAL_COUNT).Is(5) || ctx->GetOption(RSK_TRIAL_COUNT).Is(4)) {
-      //get skipped trials
-      std::vector<TrialInfo*> trials = {};
-      auto trialList = ctx->GetTrials()->GetTrialList();
-    trials.assign(trialList.begin(), trialList.end());
-      auto skippedTrials = FilterFromPool(trials, [](TrialInfo* trial){return trial->IsSkipped();});
-
-      //create a hint for each skipped trial
-      for (auto& trial : skippedTrials) {
-        //make hint
-        auto hint = prefix+"#"+trial->GetName()+"#"+::Hint(RHT_FOUR_TO_FIVE_TRIALS).GetText();
-        AddGossipStoneHintCopies(copies, hint, {QM_YELLOW}, HINT_TYPE_TRIAL, "Trial");
-      }
-      //1 to 3 trials
-    } else if (ctx->GetOption(RSK_TRIAL_COUNT).Value<uint8_t>() >= 1 && ctx->GetOption(RSK_TRIAL_COUNT).Value<uint8_t>() <= 3) {
-      //get requried trials
-      std::vector<TrialInfo*> trials = {};
-      auto trialList = ctx->GetTrials()->GetTrialList();
-    trials.assign(trialList.begin(), trialList.end());
-      auto requiredTrials = FilterFromPool(trials, [](TrialInfo* trial){return trial->IsRequired();});
-
-      //create a hint for each required trial
-      for (auto& trial : requiredTrials) {
-        //make hint
-        auto hint = prefix+"#"+trial->GetName()+"#"+::Hint(RHT_ONE_TO_THREE_TRIALS).GetText();
-        AddGossipStoneHintCopies(copies, hint, {QM_PINK}, HINT_TYPE_TRIAL, "Trial");
-      }
-    }
-  }
-}
-
-//RANDOTODO clean this mess up once starting items are expanded
-void CreateGanonAndSheikText() {
-  auto ctx = Rando::Context::GetInstance();
-  if(ctx->GetOption(RSK_LIGHT_ARROWS_HINT)){
-    //Get the location of the light arrows
-    auto lightArrowLocation = FilterFromPool(ctx->allLocations, [ctx](const RandomizerCheck loc) {
-      return ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == RG_LIGHT_ARROWS;
-    });
-    RandomizerArea lightArrowArea = ctx->GetItemLocation(lightArrowLocation[0])->GetArea();
-    Text LightArrowAreaText = ::Hint(lightArrowArea).GetText();
-    std::vector<RandomizerCheck> locsToCheck = {RC_GANONDORF_HINT};
-
-    //If there is no light arrow location, it was in the player's inventory at the start
-    auto hint = ::Hint(RHT_LIGHT_ARROW_LOCATION_HINT);
-    if (lightArrowLocation.empty()) {
-      ganonHintText = hint.GetText()+::Hint(RHT_YOUR_POCKET).GetText();
-      lightArrowHintLoc = "Link's Pocket";
+    if (ctx->GetOption(RSK_TRIAL_COUNT).Is(6)) {//six trials
+      AddGossipStoneHintCopies(copies, HINT_TYPE_HINT_KEY, "Trial", {RHT_SIX_TRIALS});
+    } else if (ctx->GetOption(RSK_TRIAL_COUNT).Is(0)) {//zero trials
+      AddGossipStoneHintCopies(copies, HINT_TYPE_HINT_KEY, "Trial", {RHT_ZERO_TRIALS});
     } else {
-      ganonHintText = hint.GetText() + "%r" + LightArrowAreaText + "%w";
-      lightArrowHintLoc = Rando::StaticData::GetLocation(lightArrowLocation[0])->GetName();
-    }
-    ganonHintText = ganonHintText + "!";
-
-    //Get the location of the master sword
-    auto masterSwordLocation = FilterFromPool(ctx->allLocations, [ctx](const RandomizerCheck loc) {
-      return ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == RG_MASTER_SWORD;
-    });
-    Text masterSwordArea = ::Hint(ctx->GetItemLocation(masterSwordLocation[0])->GetArea()).GetText();
-
-    if (ctx->GetOption(RSK_SHUFFLE_MASTER_SWORD)) {
-      // Add second text box
-      ganonHintText = ganonHintText + "^";
-      if (masterSwordLocation.empty()) {
-        ganonHintText = ganonHintText + ::Hint(RHT_MASTER_SWORD_LOCATION_HINT).GetText() + "%r" + ::Hint(RHT_YOUR_POCKET).GetText() + "%w";
-        masterSwordHintLoc = "Link's Pocket";
-      } else {
-        ganonHintText = ganonHintText + ::Hint(RHT_MASTER_SWORD_LOCATION_HINT).GetText() + "%r" + masterSwordArea + "%w";
-        masterSwordHintLoc = Rando::StaticData::GetLocation(masterSwordLocation[0])->GetName();
+      std::vector<TrialInfo*> trials = ctx->GetTrials()->GetTrialList(); //there's probably a way to remove this assignment
+      if (ctx->GetOption(RSK_TRIAL_COUNT).Value<uint8_t>() >= 4) {//4 or 5 required trials, get skipped trials
+        trials = FilterFromPool(trials, [](TrialInfo* trial){return trial->IsSkipped();});
+      } else {//1 to 3 trials, get requried trials
+        auto requiredTrials = FilterFromPool(trials, [](TrialInfo* trial){return trial->IsRequired();});
       }
-      ganonHintText = ganonHintText + "!";
-    }
-
-    ctx->AddHint(RH_GANONDORF_HINT, AutoFormatHintText(ganonHintText), lightArrowLocation[0], HINT_TYPE_STATIC, "Static", lightArrowArea);
-    ctx->AddHint(RH_GANONDORF_NOHINT, AutoFormatHintText(ganonText), lightArrowLocation[0], HINT_TYPE_STATIC, "Static", lightArrowArea);
-
-    if (!ctx->GetOption(RSK_TRIAL_COUNT).Is(0)) {
-      sheikText = ::Hint(RHT_SHEIK_LIGHT_ARROW_HINT).GetText() + LightArrowAreaText + "%w.";
-      locsToCheck = {RC_GANONDORF_HINT, RC_SHEIK_HINT_GC, RC_SHEIK_HINT_MQ_GC};
-
-      if (ctx->GetOption(RSK_SHUFFLE_MASTER_SWORD)) {
-        sheikText = sheikText + "^" + ::Hint(RHT_SHEIK_MASTER_SWORD_LOCATION_HINT).GetText() + masterSwordArea + "%w.";
-      }
-    }
-
-    if (IsReachableWithout(locsToCheck, lightArrowLocation[0], true)) {
-      ctx->GetItemLocation(lightArrowLocation[0])->SetAsHinted();
-    }
-    ctx->AddHint(RH_SHEIK_LIGHT_ARROWS, AutoFormatHintText(sheikText), lightArrowLocation[0], HINT_TYPE_STATIC, "Static", lightArrowArea);
-
-    if (ctx->GetOption(RSK_SHUFFLE_MASTER_SWORD)) {
-      if (IsReachableWithout(locsToCheck, masterSwordLocation[0], true)) {
-        ctx->GetItemLocation(masterSwordLocation[0])->AddHintedBy(RH_GANONDORF_HINT);
-        ctx->GetItemLocation(masterSwordLocation[0])->SetAsHinted();
+      for (auto& trial : trials) {//create a hint for each hinted trial
+        AddGossipStoneHintCopies(copies, HINT_TYPE_TRIAL, "Trial", {}, {}, {trial->GetTrialKey()});
       }
     }
   }
 }
 
-//Find the location which has the given itemKey and create the generic altar text for the reward
-static Text BuildDungeonRewardText(const ItemID itemID, const RandomizerGet itemKey) {
-    auto ctx = Rando::Context::GetInstance();
-    RandomizerCheck altarLoc = RC_ALTAR_HINT_ADULT;
-    if (itemKey == RG_KOKIRI_EMERALD || itemKey == RG_GORON_RUBY || itemKey == RG_ZORA_SAPPHIRE) {
-      altarLoc = RC_ALTAR_HINT_CHILD;
-    }
-    const RandomizerCheck location = FilterFromPool(ctx->allLocations, [itemKey, ctx](const RandomizerCheck loc) {
-        return ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == itemKey;
-    })[0];
-    if (IsReachableWithout({altarLoc}, location, true) || ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_END_OF_DUNGEON)){ //RANDOTODO check if works properly
-      ctx->GetItemLocation(location)->SetAsHinted();
-    }
-
-    std::string rewardString = "$" + std::to_string(itemKey - RG_KOKIRI_EMERALD);
-
-    // RANDOTODO implement colors for locations
-    return Text() + rewardString + "#" +
-           ::Hint(ctx->GetItemLocation(location)->GetArea()).GetText().Capitalize() +
-           "#...^";
-}
-
-static Text BuildDoorOfTimeText() {
-  auto ctx = Rando::Context::GetInstance();
-  std::string itemObtained;
-  Text doorOfTimeText;
-
-  if (ctx->GetOption(RSK_DOOR_OF_TIME).Is(RO_DOOROFTIME_OPEN)) {
-    itemObtained = "$o";
-    doorOfTimeText = ::Hint(RHT_CHILD_ALTAR_TEXT_END_DOTOPEN).GetText();
-
-  } else if (ctx->GetOption(RSK_DOOR_OF_TIME).Is(RO_DOOROFTIME_SONGONLY)) {
-    itemObtained = "$c";
-    doorOfTimeText = ::Hint(RHT_CHILD_ALTAR_TEXT_END_DOTSONGONLY).GetText();
-
-  } else if (ctx->GetOption(RSK_DOOR_OF_TIME).Is(RO_DOOROFTIME_CLOSED)) {
-    itemObtained = "$i";
-    doorOfTimeText = ::Hint(RHT_CHILD_ALTAR_TEXT_END_DOTCLOSED).GetText();
-  }
-
-  return Text()+itemObtained+doorOfTimeText;
-}
-
-//insert the required number into the hint and set the singular/plural form
-static Text BuildCountReq(const RandomizerHintTextKey req, const Rando::Option& count) {
-  Text requirement = ::Hint(req).GetTextCopy();
-    if (count.Value<uint8_t>() == 1) {
-    requirement.SetForm(SINGULAR);
-  } else {
-    requirement.SetForm(PLURAL);
-  }
-  requirement.Replace("%d", std::to_string(count.Value<uint8_t>()));
-  return requirement;
-}
-
-static Text BuildBridgeReqsText() {
-  auto ctx = Rando::Context::GetInstance();
-  Text bridgeText;
-
-  if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_ALWAYS_OPEN)) {
-    bridgeText = ::Hint(RHT_BRIDGE_OPEN_HINT).GetText();
-
-  } else if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_VANILLA)) {
-      bridgeText = ::Hint(RHT_BRIDGE_VANILLA_HINT).GetText();
-
-  } else if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_STONES)) {
-      bridgeText = BuildCountReq(RHT_BRIDGE_STONES_HINT, ctx->GetOption(RSK_RAINBOW_BRIDGE_STONE_COUNT));
-
-  } else if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_MEDALLIONS)) {
-      bridgeText = BuildCountReq(RHT_BRIDGE_MEDALLIONS_HINT, ctx->GetOption(RSK_RAINBOW_BRIDGE_MEDALLION_COUNT));
-
-  } else if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_DUNGEON_REWARDS)) {
-      bridgeText = BuildCountReq(RHT_BRIDGE_REWARDS_HINT, ctx->GetOption(RSK_RAINBOW_BRIDGE_REWARD_COUNT));
-
-  } else if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_DUNGEONS)) {
-      bridgeText = BuildCountReq(RHT_BRIDGE_DUNGEONS_HINT, ctx->GetOption(RSK_RAINBOW_BRIDGE_DUNGEON_COUNT));
-
-  } else if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_TOKENS)) {
-      bridgeText = BuildCountReq(RHT_BRIDGE_TOKENS_HINT, ctx->GetOption(RSK_RAINBOW_BRIDGE_TOKEN_COUNT));
-
-  } else if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_GREG)) {
-      bridgeText = ::Hint(RHT_BRIDGE_GREG_HINT).GetText();
-  }
-
-  return Text()+"$l"+bridgeText+"^";
-}
-
-static Text BuildGanonBossKeyText() {
-  auto ctx = Rando::Context::GetInstance();
-  Text ganonBossKeyText;
-
-  if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_STARTWITH)) {
-    ganonBossKeyText = ::Hint(RHT_GANON_BK_START_WITH_HINT).GetText();
-
-  } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_VANILLA)) {
-    ganonBossKeyText = ::Hint(RHT_GANON_BK_VANILLA_HINT).GetText();
-
-  } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_OWN_DUNGEON)) {
-    ganonBossKeyText = ::Hint(RHT_GANON_BK_OWN_DUNGEON_HINT).GetText();
-
-  } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_ANY_DUNGEON)) {
-    ganonBossKeyText = ::Hint(RHT_GANON_BK_ANY_DUNGEON_HINT).GetText();
-
-  } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_OVERWORLD)) {
-    ganonBossKeyText = ::Hint(RHT_GANON_BK_OVERWORLD_HINT).GetText();
-
-  } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_ANYWHERE)) {
-    ganonBossKeyText = ::Hint(RHT_GANON_BK_ANYWHERE_HINT).GetText();
-
-  } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_KAK_TOKENS)) {
-    ganonBossKeyText = ::Hint(RHT_GANON_BK_SKULLTULA_HINT).GetText();
-
-  } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_VANILLA)) {
-    ganonBossKeyText = ::Hint(RHT_LACS_VANILLA_HINT).GetText();
-
-  } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_STONES)) {
-    ganonBossKeyText = BuildCountReq(RHT_LACS_STONES_HINT, ctx->GetOption(RSK_LACS_STONE_COUNT));
-
-  } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_MEDALLIONS)) {
-    ganonBossKeyText = BuildCountReq(RHT_LACS_MEDALLIONS_HINT, ctx->GetOption(RSK_LACS_MEDALLION_COUNT));
-
-  } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_REWARDS)) {
-    ganonBossKeyText = BuildCountReq(RHT_LACS_REWARDS_HINT, ctx->GetOption(RSK_LACS_REWARD_COUNT));
-
-  } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_DUNGEONS)) {
-    ganonBossKeyText = BuildCountReq(RHT_LACS_DUNGEONS_HINT, ctx->GetOption(RSK_LACS_DUNGEON_COUNT));
-
-  } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_TOKENS)) {
-    ganonBossKeyText = BuildCountReq(RHT_LACS_TOKENS_HINT, ctx->GetOption(RSK_LACS_TOKEN_COUNT));
-
-  } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_TRIFORCE_HUNT)) {
-    ganonBossKeyText = ::Hint(RHT_GANON_BK_TRIFORCE_HINT).GetText();
-  }
-
-  return Text()+"$b"+ganonBossKeyText+"^";
-}
-
-void CreateAltarText() {
-  auto ctx = Rando::Context::GetInstance();
-
-  //Child Altar Text
-  if (ctx->GetOption(RSK_TOT_ALTAR_HINT)) {
-    childAltarText = ::Hint(RHT_SPIRITUAL_STONE_TEXT_START).GetText()+"^"+
-    //Spiritual Stones
-    // TODO: Starting Inventory Dungeon Rewards
-        (/*StartingKokiriEmerald.Value<uint8_t>()*/false ? Text{ "##", "##", "##" }
-                                                : BuildDungeonRewardText(ITEM_KOKIRI_EMERALD, RG_KOKIRI_EMERALD)) +
-        (/*StartingGoronRuby.Value<uint8_t>()*/false ? Text{ "##", "##", "##" }
-                                            : BuildDungeonRewardText(ITEM_GORON_RUBY, RG_GORON_RUBY)) +
-        (/*StartingZoraSapphire.Value<uint8_t>()*/false ? Text{ "##", "##", "##" }
-                                              : BuildDungeonRewardText(ITEM_ZORA_SAPPHIRE, RG_ZORA_SAPPHIRE)) +
-    //How to open Door of Time, the event trigger is necessary to read the altar multiple times
-    BuildDoorOfTimeText();
-  } else {
-    childAltarText = BuildDoorOfTimeText();
-  }
-  ctx->AddHint(RH_ALTAR_CHILD, AutoFormatHintText(childAltarText, { QM_GREEN, QM_RED, QM_BLUE }), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static");
-
-  //CreateMessageFromTextObject(0x7040, 0, 2, 3, AddColorsAndFormat(childAltarText, {QM_GREEN, QM_RED, QM_BLUE}));
-
-  //Adult Altar Text
-  adultAltarText = ::Hint(RHT_ADULT_ALTAR_TEXT_START).GetText() + "^";
-  if (ctx->GetOption(RSK_TOT_ALTAR_HINT)) {
-    adultAltarText = adultAltarText +
-    //Medallion Areas
-        (/*StartingLightMedallion.Value<uint8_t>()*/false ? Text{ "##", "##", "##" }
-                                                : BuildDungeonRewardText(ITEM_MEDALLION_LIGHT, RG_LIGHT_MEDALLION)) +
-        (/*StartingForestMedallion.Value<uint8_t>()*/false ? Text{ "##", "##", "##" }
-                                                  : BuildDungeonRewardText(ITEM_MEDALLION_FOREST, RG_FOREST_MEDALLION)) +
-        (/*StartingFireMedallion.Value<uint8_t>()*/false ? Text{ "##", "##", "##" }
-                                                : BuildDungeonRewardText(ITEM_MEDALLION_FIRE, RG_FIRE_MEDALLION)) +
-        (/*StartingWaterMedallion.Value<uint8_t>()*/false ? Text{ "##", "##", "##" }
-                                                : BuildDungeonRewardText(ITEM_MEDALLION_WATER, RG_WATER_MEDALLION)) +
-        (/*StartingSpiritMedallion.Value<uint8_t>()*/false ? Text{ "##", "##", "##" }
-                                                  : BuildDungeonRewardText(ITEM_MEDALLION_SPIRIT, RG_SPIRIT_MEDALLION)) +
-        (/*StartingShadowMedallion.Value<uint8_t>()*/false ? Text{ "##", "##", "##" }
-                                                  : BuildDungeonRewardText(ITEM_MEDALLION_SHADOW, RG_SHADOW_MEDALLION));
-  }
-  adultAltarText = adultAltarText + 
-  //Bridge requirement
-  BuildBridgeReqsText()+
-
-  //Ganons Boss Key requirement
-  BuildGanonBossKeyText()+
-
-  //End
-  ::Hint(RHT_ADULT_ALTAR_TEXT_END).GetText();
-  //CreateMessageFromTextObject(0x7088, 0, 2, 3, AddColorsAndFormat(adultAltarText, {QM_RED, QM_YELLOW, QM_GREEN, QM_RED, QM_BLUE, QM_YELLOW, QM_PINK, QM_RED, QM_RED, QM_RED, QM_RED}));
-  ctx->AddHint(RH_ALTAR_ADULT, AutoFormatHintText(adultAltarText, { QM_RED, QM_YELLOW, QM_GREEN, QM_RED, QM_BLUE, QM_YELLOW, QM_PINK, QM_RED, QM_RED, QM_RED, QM_RED }), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static");
-}
-
-void CreateMerchantsHints() {
-    auto ctx = Rando::Context::GetInstance();
-    Text beanSalesmanItemText, medigoronItemText, grannyItemText, carpetSalesmanItemText, carpetSalesmanAfterItemText;
-    if (ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ON_HINT)) {
-      RandomizerGet beanSalesmanItem = ctx->GetItemLocation(RC_ZR_MAGIC_BEAN_SALESMAN)->GetPlacedRandomizerGet();
-      beanSalesmanItemText = ctx->GetItemLocation(RC_ZR_MAGIC_BEAN_SALESMAN)->GetPlacedItem().GetHint().GetText();
-      if (beanSalesmanItem == RG_ICE_TRAP) {
-        beanSalesmanItemText = ctx->overrides[RC_ZR_MAGIC_BEAN_SALESMAN].GetTrickName();
-      }
-      RandomizerGet medigoronItem = ctx->GetItemLocation(RC_GC_MEDIGORON)->GetPlacedRandomizerGet();
-      medigoronItemText = ctx->GetItemLocation(RC_GC_MEDIGORON)->GetPlacedItem().GetHint().GetText();
-      if (medigoronItem == RG_ICE_TRAP) {
-        medigoronItemText = ctx->overrides[RC_GC_MEDIGORON].GetTrickName();
-      }
-      RandomizerGet grannyItem = ctx->GetItemLocation(RC_KAK_GRANNYS_SHOP)->GetPlacedRandomizerGet();
-      grannyItemText = ctx->GetItemLocation(RC_KAK_GRANNYS_SHOP)->GetPlacedItem().GetHint().GetText().Capitalize();
-      if (grannyItem == RG_ICE_TRAP) {
-        grannyItemText = ctx->overrides[RC_KAK_GRANNYS_SHOP].GetTrickName();
-      }
-      RandomizerGet carpetSalesmanItem = ctx->GetItemLocation(RC_WASTELAND_BOMBCHU_SALESMAN)->GetPlacedRandomizerGet();
-      carpetSalesmanItemText =
-          ctx->GetItemLocation(RC_WASTELAND_BOMBCHU_SALESMAN)->GetPlacedItem().GetHint().GetText();
-      if (carpetSalesmanItem == RG_ICE_TRAP) {
-        carpetSalesmanItemText = ctx->overrides[RC_WASTELAND_BOMBCHU_SALESMAN].GetTrickName();
-      }
-      carpetSalesmanAfterItemText = ::Hint(RHT_CARPET_SALESMAN_DIALOG_HINTED).GetText();
-    } else {
-      medigoronItemText = grannyItemText = carpetSalesmanItemText = hintTable[RHT_HINT_MYSTERIOUS].GetTextCopy();
-      carpetSalesmanAfterItemText = ::Hint(RHT_CARPET_SALESMAN_DIALOG_MYSTERIOUS).GetText();
-      beanSalesmanItemText = Text{ "mysterious item", "objet mystérieux", "objeto misterioso", "mysteriöser gegenstand" };
-    }
-
-    Text medigoronText =
-        ::Hint(RHT_MEDIGORON_DIALOG_FIRST).GetText() + medigoronItemText + ::Hint(RHT_MEDIGORON_DIALOG_SECOND).GetText();
-    Text grannyText = Text{"#"} + grannyItemText + "#" + ::Hint(RHT_GRANNY_DIALOG).GetText();
-    Text carpetSalesmanTextOne = ::Hint(RHT_CARPET_SALESMAN_DIALOG_FIRST).GetText() + carpetSalesmanItemText +
-                                 carpetSalesmanAfterItemText;
-    Text carpetSalesmanTextTwo = ::Hint(RHT_CARPET_SALESMAN_DIALOG_FINAL).GetText();
-    medigoronText = AutoFormatHintText(medigoronText, {QM_GREEN, QM_YELLOW, QM_GREEN });
-    grannyText = AutoFormatHintText(grannyText, { QM_GREEN, QM_YELLOW, QM_GREEN });
-    carpetSalesmanTextOne = AutoFormatHintText(carpetSalesmanTextOne, { QM_GREEN, QM_RED, QM_YELLOW, QM_GREEN });
-
-    if (ctx->GetOption(RSK_SHUFFLE_MAGIC_BEANS)) {
-      Text beanSalesmanText = ::Hint(RHT_BEAN_SALESMAN_FIRST).GetText() + beanSalesmanItemText + ::Hint(RHT_BEAN_SALESMAN_SECOND).GetText();
-      ctx->AddHint(RH_BEAN_SALESMAN, AutoFormatHintText(beanSalesmanText, { QM_RED, QM_GREEN, QM_YELLOW, QM_GREEN }), RC_ZR_MAGIC_BEAN_SALESMAN, HINT_TYPE_STATIC, "Static", RA_ZORAS_RIVER);
-    }
-
-    ctx->AddHint(RH_MEDIGORON, medigoronText, RC_GC_MEDIGORON, HINT_TYPE_STATIC, "Static", RA_GORON_CITY);
-    ctx->AddHint(RH_GRANNYS_SHOP, grannyText, RC_KAK_GRANNYS_SHOP, HINT_TYPE_STATIC, "Static", RA_KAKARIKO_VILLAGE);
-    ctx->AddHint(RH_WASTELAND_BOMBCHU_SALESMAN, carpetSalesmanTextOne, RC_WASTELAND_BOMBCHU_SALESMAN, HINT_TYPE_STATIC, "Static", RA_HAUNTED_WASTELAND);
-    // Technically not a hint but this is probably the best place we have to store it for now.
-    ctx->AddHint(RH_WASTELAND_BOMBCHU_SALESMAN_POST, carpetSalesmanTextTwo, RC_WASTELAND_BOMBCHU_SALESMAN, HINT_TYPE_STATIC, "Static", RA_HAUNTED_WASTELAND);
-}
-
-//RANDOTODO add Better Links Pocket and starting item handling once more starting items are added
-void CreateSpecialItemHint(uint32_t item, RandomizerHintKey hintKey, std::vector<RandomizerCheck> hints, RandomizerHintTextKey text1, RandomizerHintTextKey text2, bool condition, bool yourpocket = false) {
-  auto ctx = Rando::Context::GetInstance();
-  if(condition){
-      RandomizerCheck location = FilterFromPool(ctx->allLocations, [item, ctx](const RandomizerCheck loc) {
-      return ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == item;
-  })[0];
-
-    if (IsReachableWithout(hints,location,true)){
-      ctx->GetItemLocation(location)->SetAsHinted();
-    }
-
-    RandomizerArea area = ctx->GetItemLocation(location)->GetArea();
-    ctx->AddHint(hintKey, AutoFormatHintText(::Hint(text1).GetText() + ::Hint(area).GetText() + ::Hint(text2).GetText()),
-                 location, HINT_TYPE_STATIC, "Static", area);
-  } 
-}
-
 void CreateWarpSongTexts() {
   auto ctx = Rando::Context::GetInstance();
-
-  auto warpSongEntrances = GetShuffleableEntrances(EntranceType::WarpSong, false);
-  for (auto entrance : warpSongEntrances) {
-    auto destination = entrance->GetConnectedRegion()->GetArea();
-    Text resolvedHint = ::Hint(destination).GetText();
-    // If no Hint Area, use Region text
-    if (destination == RA_NONE) {
-      resolvedHint = Text{"","",""} + entrance->GetConnectedRegion()->regionName;
+  if (ctx->GetOption(RSK_WARP_SONG_HINTS)){
+    auto warpSongEntrances = GetShuffleableEntrances(EntranceType::WarpSong, false);
+    for (auto entrance : warpSongEntrances) {
+      auto destination = entrance->GetConnectedRegion()->GetArea();//KNOWN ISSUE: says links pocket sometimes, putting off as this will need rewriting when entrance hits are added anyway
+      switch (entrance->GetIndex()) {
+        case 0x0600: // minuet RANDOTODO make into entrance hints when they are added
+          ctx->AddHint(RH_MINUET_WARP_LOC, Hint(RH_MINUET_WARP_LOC, HINT_TYPE_AREA, "", {RHT_WARP_SONG}, {}, {destination}));
+          break;
+        case 0x04F6: // bolero
+          ctx->AddHint(RH_BOLERO_WARP_LOC, Hint(RH_BOLERO_WARP_LOC, HINT_TYPE_AREA, "", {RHT_WARP_SONG}, {}, {destination}));
+          break;
+        case 0x0604: // serenade
+          ctx->AddHint(RH_SERENADE_WARP_LOC, Hint(RH_SERENADE_WARP_LOC, HINT_TYPE_AREA, "", {RHT_WARP_SONG}, {}, {destination}));
+          break;
+        case 0x01F1: // requiem
+          ctx->AddHint(RH_REQUIEM_WARP_LOC, Hint(RH_REQUIEM_WARP_LOC, HINT_TYPE_AREA, "", {RHT_WARP_SONG}, {}, {destination}));
+          break;
+        case 0x0568: // nocturne
+          ctx->AddHint(RH_NOCTURNE_WARP_LOC, Hint(RH_NOCTURNE_WARP_LOC, HINT_TYPE_AREA, "", {RHT_WARP_SONG}, {}, {destination}));
+          break;
+        case 0x05F4: // prelude
+          ctx->AddHint(RH_PRELUDE_WARP_LOC, Hint(RH_PRELUDE_WARP_LOC, HINT_TYPE_AREA, "", {RHT_WARP_SONG}, {}, {destination}));
+          break;
+        default:
+          break;
+      }
     }
-    resolvedHint = ::Hint(RHT_WARP_TO).GetText() + resolvedHint + ::Hint(RHT_WARP_CHOICE).GetText();
-    RandomizerHintKey hintKey = RH_NONE;
-    switch (entrance->GetIndex()) {
-      case 0x0600: // minuet
-        hintKey = RH_MINUET_WARP_LOC;
-        break;
-      case 0x04F6: // bolero
-        hintKey = RH_BOLERO_WARP_LOC;
-        break;
-      case 0x0604: // serenade
-        hintKey = RH_SERENADE_WARP_LOC;
-        break;
-      case 0x01F1: // requiem
-        hintKey = RH_REQUIEM_WARP_LOC;
-        break;
-      case 0x0568: // nocturne
-        hintKey = RH_NOCTURNE_WARP_LOC;
-        break;
-      case 0x05F4: // prelude
-        hintKey = RH_PRELUDE_WARP_LOC;
-        break;
-      default:
-        break;
-    }
-    ctx->AddHint(hintKey, AutoFormatHintText(resolvedHint, { QM_RED, QM_GREEN }), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", destination);
   }
 }
 
@@ -973,8 +554,7 @@ static void DistributeHints(std::vector<uint8_t>& selected, size_t stoneCount, s
           selected[distribution] += 1;
           stoneCount -= distTable[distribution].copies;
           break;
-        }
-        else {
+        } else {
           totalWeight -= distTable[distribution].weight;
           distTable[distribution].weight = 0;
           break;
@@ -1002,10 +582,7 @@ uint8_t PlaceHints(std::vector<uint8_t>& selectedHints,
     std::vector<RandomizerCheck> hintTypePool = FilterHintability(ctx->allLocations, distribution.filter);
     for (uint8_t numHint = 0; numHint < selectedHints[curSlot]; numHint++){
 
-      SPDLOG_DEBUG("Attempting to make hint of type: ");
-      SPDLOG_DEBUG(hintTypeNames[static_cast<int>(distribution.type)]);
-      SPDLOG_DEBUG("\n");
-
+      SPDLOG_DEBUG("Attempting to make hint of type: " + StaticData::hintTypeNames[distribution.type].GetEnglish(MF_CLEAN) + "\n");
       RandomizerCheck hintedLocation = RC_UNKNOWN_CHECK;
 
       hintedLocation = CreateRandomHint(hintTypePool, distribution.copies, distribution.type, distribution.name);
@@ -1035,40 +612,44 @@ void CreateStoneHints() {
   const HintSetting& hintSetting = hintSettingTable[ctx->GetOption(RSK_HINT_DISTRIBUTION).Value<uint8_t>()];
   std::vector<HintDistributionSetting> distTable = hintSetting.distTable;
 
-  // Apply Static hint exclusions with no in-game requirements
-  for (int c = 0; c < staticHintLocations.size(); c++){
-      if(ctx->GetOption(staticHintLocations[c].second)){
-          ctx->GetItemLocation(staticHintLocations[c].first)->SetAsHinted();
-      }
+  // Apply impa's song exclusions when zelda is skipped
+  if(ctx->GetOption(RSK_SKIP_CHILD_ZELDA)){
+    ctx->GetItemLocation(RC_SONG_FROM_IMPA)->SetHintAccesible();
   }
 
   // Add 'always' location hints
+  std::vector<RandomizerCheck> alwaysHintLocations = {};
   if (hintSetting.alwaysCopies > 0) {
-      // Only filter locations that had a random item placed at them (e.g. don't get cow locations if shuffle cows is
-      // off)
-      auto alwaysHintLocations = FilterFromPool(ctx->allLocations, [ctx](const RandomizerCheck loc) {
-          return ((Rando::StaticData::GetLocation(loc)->GetHint()->GetType() == HintCategory::Always) ||
-                  // If we have Rainbow Bridge set to Greg, add a hint for where Greg is
-                  (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_GREG) &&
-                   ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == RG_GREG_RUPEE)) &&
-                  ctx->GetItemLocation(loc)->IsHintable() &&
-                  !(ctx->GetOption(RSK_GREG_HINT) && (IsReachableWithout({RC_GREG_HINT}, loc, true)));
+    if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_GREG)){
+      // If we have Rainbow Bridge set to Greg and the greg hint isn't useful, add a hint for where Greg is
+      // Do we really need this with the greg hint?
+      auto gregLocations = FilterFromPool(ctx->allLocations, [ctx](const RandomizerCheck loc) {
+      return (
+              (ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == RG_GREG_RUPEE)) &&
+               ctx->GetItemLocation(loc)->IsHintable() &&
+               !(ctx->GetOption(RSK_GREG_HINT) && (IsReachableWithout({RC_GREG_HINT}, loc, true)));
       });
-
-      for (auto& hint : conditionalAlwaysHints) {
-          RandomizerCheck loc = hint.first;
-          if (hint.second() && ctx->GetItemLocation(loc)->IsHintable()) {
-              alwaysHintLocations.push_back(loc);
-          }
+      if (gregLocations.size() > 0){
+        alwaysHintLocations.push_back(gregLocations[0]);
       }
+    }
+
+    for (auto& hint : conditionalAlwaysHints) {
+        RandomizerCheck loc = hint.first;
+        if (hint.second() && ctx->GetItemLocation(loc)->IsHintable()) {
+            alwaysHintLocations.push_back(loc);
+        }
+    }
 
     for (RandomizerCheck location : alwaysHintLocations) {
-      CreateHint(location, hintSetting.alwaysCopies, HINT_TYPE_ITEM_LOCATION, "Always");
+      CreateHint(location, hintSetting.alwaysCopies, HINT_TYPE_ITEM, "Always");
     }
   }
 
   //Add 'trial' location hints
-  CreateTrialHints(hintSetting.trialCopies);
+  if (ctx->GetOption(RSK_GANONS_TRIALS).IsNot(RO_GANONS_TRIALS_SKIP)) {
+    CreateTrialHints(hintSetting.trialCopies);
+  }
 
   size_t totalStones = GetEmptyGossipStones().size();
   std::vector<uint8_t> selectedHints = {};
@@ -1077,7 +658,7 @@ void CreateStoneHints() {
   }
   selectedHints.push_back(0);
   DistributeHints(selectedHints, totalStones, distTable, hintSetting.junkWeight);
-
+  
   while(totalStones != 0){
     totalStones = PlaceHints(selectedHints, distTable);
     while (totalStones != 0){
@@ -1092,34 +673,114 @@ void CreateStoneHints() {
   GetAccessibleLocations({});
 }
 
-void CreateFrogsHint() {
-  const auto ctx = Rando::Context::GetInstance();
-  Rando::ItemLocation* itemLoc = ctx->GetItemLocation(RC_ZR_FROGS_OCARINA_GAME);
-  Text itemText = itemLoc->GetPlacedItem().GetHint().GetText();
-  if (itemLoc->GetPlacedRandomizerGet() == RG_ICE_TRAP) {
-    itemText = ctx->overrides[RC_ZR_FROGS_OCARINA_GAME].GetTrickName();
+std::vector<RandomizerCheck> FindItemsAndMarkHinted(std::vector<RandomizerGet> items, std::vector<RandomizerCheck> hintChecks){
+  std::vector<RandomizerCheck> locations = {};
+  auto ctx = Rando::Context::GetInstance();
+  for (uint8_t c = 0; c < items.size(); c++){
+    std::vector<RandomizerCheck> found = FilterFromPool(ctx->allLocations, [items, ctx, c](const RandomizerCheck loc) {
+      return ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == items[c];});
+    if (found.size() > 0){
+      locations.push_back(found[0]);
+    }
+    //RANDOTODO make the called functions of this always return true if empty hintChecks are provided
+    if (hintChecks.size() == 0 || (!ctx->GetItemLocation(found[0])->IsAHintAccessible() && IsReachableWithout(hintChecks,found[0],true))){
+      ctx->GetItemLocation(found[0])->SetHintAccesible();
+    }
+  }
+  return locations;
+}
+
+void CreateChildAltarHint() {
+  auto ctx = Rando::Context::GetInstance();
+  if (!ctx->GetHint(RH_ALTAR_CHILD)->IsEnabled()){
+    std::vector<RandomizerCheck> stoneLocs = {};
+    if (ctx->GetOption(RSK_TOT_ALTAR_HINT)) {
+      //force marking the rewards as hinted if they are at the end of dungeons as they can be inffered
+      if (ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_END_OF_DUNGEON)){
+        stoneLocs = FindItemsAndMarkHinted({RG_KOKIRI_EMERALD, RG_GORON_RUBY, RG_ZORA_SAPPHIRE}, {});
+      } else {
+        stoneLocs = FindItemsAndMarkHinted({RG_KOKIRI_EMERALD, RG_GORON_RUBY, RG_ZORA_SAPPHIRE}, {RC_ALTAR_HINT_CHILD});
+      }
+    }
+    ctx->AddHint(RH_ALTAR_CHILD, Hint(RH_ALTAR_CHILD, HINT_TYPE_ALTAR_CHILD, {}, stoneLocs));
+  }
+}
+
+void CreateAdultAltarHint() {
+  auto ctx = Rando::Context::GetInstance();
+  if (!ctx->GetHint(RH_ALTAR_ADULT)->IsEnabled()){
+    std::vector<RandomizerCheck> medallionLocs = {};
+    if (ctx->GetOption(RSK_TOT_ALTAR_HINT)) {
+      //force marking the rewards as hinted if they are at the end of dungeons as they can be inffered
+      if (ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_END_OF_DUNGEON)){
+      medallionLocs = FindItemsAndMarkHinted({RG_LIGHT_MEDALLION, RG_FOREST_MEDALLION, RG_FIRE_MEDALLION, RG_WATER_MEDALLION, RG_SPIRIT_MEDALLION, RG_SHADOW_MEDALLION},
+                                              {});
+      } else {
+        medallionLocs = FindItemsAndMarkHinted({RG_LIGHT_MEDALLION, RG_FOREST_MEDALLION, RG_FIRE_MEDALLION, RG_WATER_MEDALLION, RG_SPIRIT_MEDALLION, RG_SHADOW_MEDALLION},
+                                              {RC_ALTAR_HINT_ADULT});
+      }
+    }
+    ctx->AddHint(RH_ALTAR_ADULT, Hint(RH_ALTAR_ADULT, HINT_TYPE_ALTAR_ADULT, {}, medallionLocs));
+  }
+}
+
+void CreateStaticHintFromData(RandomizerHint hint, StaticHintInfo staticData){
+  auto ctx = Rando::Context::GetInstance();
+  if (!ctx->GetHint(hint)->IsEnabled()){
+    Option option = ctx->GetOption(staticData.setting);
+    if ((std::holds_alternative<bool>(staticData.condition) && option.Is(std::get<bool>(staticData.condition))) ||
+        (std::holds_alternative<uint8_t>(staticData.condition) && option.Is(std::get<uint8_t>(staticData.condition)))){
+      std::vector<RandomizerCheck> locations = {};
+      if (staticData.targetItems.size() > 0){
+        locations = FindItemsAndMarkHinted(staticData.targetItems, staticData.hintChecks);
+      }
+      //hintKeys are defaulted to in the hint object and do not need to be specified
+      ctx->AddHint(hint, Hint(hint, staticData.type, {}, locations, {}, {}, staticData.yourPocket, staticData.num));
+    }
+  }
+}
+
+void CreateStaticItemHint(RandomizerHint hintKey, std::vector<RandomizerHintTextKey> hintTextKeys,
+                          std::vector<RandomizerGet> items, std::vector<RandomizerCheck> hintChecks, bool yourPocket = false) {
+  auto ctx = Rando::Context::GetInstance();
+  std::vector<RandomizerCheck> locations = FindItemsAndMarkHinted(items, hintChecks);
+  ctx->AddHint(hintKey, Hint(hintKey, HINT_TYPE_AREA, hintTextKeys, locations, {}, {}, yourPocket));
+}
+
+void CreateGanondorfJoke(){
+  auto ctx = Rando::Context::GetInstance();
+  if (!ctx->GetHint(RH_GANONDORF_JOKE)->IsEnabled()){
+    ctx->AddHint(RH_GANONDORF_JOKE, Hint(RH_GANONDORF_JOKE, HINT_TYPE_HINT_KEY, {GetRandomGanonJoke()}));
+  }
+}
+
+void CreateGanondorfHint(){
+  auto ctx = Rando::Context::GetInstance();
+  if (ctx->GetOption(RSK_GANONDORF_HINT) && !ctx->GetHint(RH_GANONDORF_HINT)->IsEnabled()){
+    if (ctx->GetOption(RSK_SHUFFLE_MASTER_SWORD)) {
+      CreateStaticItemHint(RH_GANONDORF_HINT, {RHT_GANONDORF_HINT_LA_ONLY, RHT_GANONDORF_HINT_MS_ONLY, RHT_GANONDORF_HINT_LA_AND_MS}, 
+                           {RG_LIGHT_ARROWS, RG_MASTER_SWORD}, {RC_GANONDORF_HINT}, true);
+    } else {
+      CreateStaticItemHint(RH_GANONDORF_HINT, {RHT_GANONDORF_HINT_LA_ONLY}, {RG_LIGHT_ARROWS}, {RC_GANONDORF_HINT}, true);
+    }
+  }
+}
+
+void CreateStaticHints(){
+  CreateChildAltarHint();
+  CreateAdultAltarHint();
+  CreateGanondorfJoke();
+  CreateGanondorfHint();
+  for (auto[hint, staticData] : StaticData::staticHintInfoMap){
+    CreateStaticHintFromData(hint, staticData);
   }
-  Text hintText = ::Hint(RHT_FROGS_HINT01).GetText() + itemText + ::Hint(RHT_FROGS_HINT02).GetText();
-  RandomizerArea area = itemLoc->GetArea();
-  itemLoc->SetAsHinted();
-  ctx->AddHint(RH_FROGS, AutoFormatHintText(hintText, { QM_GREEN }), RC_ZR_FROGS_OCARINA_GAME, HINT_TYPE_STATIC, "Static", area);
 }
 
 void CreateAllHints(){
   auto ctx = Rando::Context::GetInstance();
-  CreateGanonAndSheikText();
-  CreateAltarText();
-  CreateSpecialItemHint(RG_PROGRESSIVE_HOOKSHOT, RH_DAMPES_DIARY, {RC_DAMPE_HINT}, RHT_DAMPE_DIARY01, RHT_DAMPE_DIARY02, (bool)ctx->GetOption(RSK_DAMPES_DIARY_HINT));
-  CreateSpecialItemHint(RG_GREG_RUPEE, RH_GREG_RUPEE, {RC_GREG_HINT}, RHT_GREG_HINT01, RHT_GREG_HINT02, (bool)ctx->GetOption(RSK_GREG_HINT));
-  CreateSpecialItemHint(RG_PROGRESSIVE_MAGIC_METER, RH_SARIA, {RC_SARIA_SONG_HINT, RC_SONG_FROM_SARIA}, RHT_SARIA_TEXT01, RHT_SARIA_TEXT02, (bool)ctx->GetOption(RSK_SARIA_HINT));
-  CreateSpecialItemHint(RG_FISHING_POLE, RH_FISHING_POLE, {RC_FISHING_POLE_HINT}, RHT_FISHING_POLE_HINT01, RHT_FISHING_POLE_HINT02, (bool)ctx->GetOption(RSK_FISHING_POLE_HINT));
 
-  if (ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ON_HINT)) {
-    CreateMerchantsHints();
-  }
-  if (ctx->GetOption(RSK_FROGS_HINT)) {
-    CreateFrogsHint();
-  }
+  CreateStaticHints();
+
   if (ctx->GetOption(RSK_GOSSIP_STONE_HINTS).IsNot(RO_GOSSIP_STONES_NONE)) {
     SPDLOG_INFO("Creating Hints...");
     CreateStoneHints();
diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.hpp b/soh/soh/Enhancements/randomizer/3drando/hints.hpp
index ed23c1e9a..d111c78ca 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hints.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hints.hpp
@@ -1,12 +1,15 @@
 #pragma once
 
-#include <array>
 #include <string>
 #include <vector>
+#include <variant>
 
 #include "text.hpp"
 #include "random.hpp"
 #include <functional>
+#include "../randomizerTypes.h"
+#include "../../custom-message/CustomMessageManager.h"
+
 struct HintDistributionSetting {
   std::string name;
   HintType type;
@@ -16,21 +19,8 @@ struct HintDistributionSetting {
   std::function<bool(RandomizerCheck)> filter;
   uint8_t dungeonLimit;
 
-  HintDistributionSetting(std::string _name, 
-                          HintType _type, 
-                          uint32_t _weight, 
-                          uint8_t _fixed, 
-                          uint8_t _copies, 
-                          std::function<bool(RandomizerCheck)> _filter,
-                          uint8_t _dungeonLimit = 40){
-    name = _name;
-    type = _type;
-    weight = _weight;
-    fixed = _fixed;
-    copies = _copies;
-    filter = _filter;
-    dungeonLimit = _dungeonLimit;
-  }
+  HintDistributionSetting(std::string _name, HintType _type, uint32_t _weight, uint8_t _fixed, uint8_t _copies, 
+                          std::function<bool(RandomizerCheck)> _filter, uint8_t _dungeonLimit = 40);
 };
 
 struct HintSetting {
@@ -40,185 +30,45 @@ struct HintSetting {
   std::vector<HintDistributionSetting> distTable;
 };
 
-enum class HintCategory {
-  Item,
-  Always,
-  Sometimes,
-  Exclude,
-  Entrance,
-  Region,
-  Junk,
-  DungeonName,
-  Boss,
-  Bridge,
-  GanonsBossKey,
-  LACS,
-  Altar,
-  Validation,
-  OtherHint,
-  MasterSword,
-  GanonLine,
-  SheikLine,
-  MerchantsDialogs,
-};
-
 class HintText {
 public:
     HintText() = default;
-    HintText(std::vector<Text> obscureText_, std::vector<Text> ambiguousText_, Text clearText_, HintCategory type_)
-    : obscureText(std::move(obscureText_)),
-      ambiguousText(std::move(ambiguousText_)),
-      clearText(std::move(clearText_)),
-      type(type_) {
-      }
-
-    static auto Item(std::vector<Text>&& obscureText, std::vector<Text>&& ambiguousText = {}, Text&& clearText = {}) {
-        return HintText{std::move(obscureText), std::move(ambiguousText), std::move(clearText), HintCategory::Item};
-    }
-
-    static auto Always(std::vector<Text>&& obscureText, std::vector<Text>&& ambiguousText = {}, Text&& clearText = {}) {
-        return HintText{std::move(obscureText), std::move(ambiguousText), std::move(clearText), HintCategory::Always};
-    }
-
-    static auto Sometimes(std::vector<Text>&& obscureText, std::vector<Text>&& ambiguousText = {}, Text&& clearText = {}) {
-        return HintText{std::move(obscureText), std::move(ambiguousText), std::move(clearText), HintCategory::Sometimes};
-    }
-
-    static auto Exclude(std::vector<Text>&& obscureText, std::vector<Text>&& ambiguousText = {}, Text&& clearText = {}) {
-        return HintText{std::move(obscureText), std::move(ambiguousText), std::move(clearText), HintCategory::Exclude};
-    }
-
-    static auto Entrance(std::vector<Text>&& obscureText, std::vector<Text>&& ambiguousText = {}, Text&& clearText = {}) {
-        return HintText{std::move(obscureText), std::move(ambiguousText), std::move(clearText), HintCategory::Entrance};
-    }
-
-    static auto Region(std::vector<Text>&& obscureText, std::vector<Text>&& ambiguousText = {}, Text&& clearText = {}) {
-        return HintText{std::move(obscureText), std::move(ambiguousText), std::move(clearText), HintCategory::Region};
-    }
-
-    static auto Junk(std::vector<Text>&& obscureText, std::vector<Text>&& ambiguousText = {}, Text&& clearText = {}) {
-        return HintText{std::move(obscureText), std::move(ambiguousText), std::move(clearText), HintCategory::Junk};
-    }
-
-    static auto DungeonName(std::vector<Text>&& obscureText, std::vector<Text>&& ambiguousText = {}, Text&& clearText = {}) {
-        return HintText{std::move(obscureText), std::move(ambiguousText), std::move(clearText), HintCategory::DungeonName};
-    }
-
-    static auto Boss(std::vector<Text>&& obscureText, std::vector<Text>&& ambiguousText = {}, Text&& clearText = {}) {
-        return HintText{std::move(obscureText), std::move(ambiguousText), std::move(clearText), HintCategory::Boss};
-    }
-
-    static auto Bridge(std::vector<Text>&& obscureText, std::vector<Text>&& ambiguousText = {}, Text&& clearText = {}) {
-        return HintText{std::move(obscureText), std::move(ambiguousText), std::move(clearText), HintCategory::Bridge};
-    }
-
-    static auto GanonsBossKey(std::vector<Text>&& obscureText, std::vector<Text>&& ambiguousText = {}, Text&& clearText = {}) {
-        return HintText{std::move(obscureText), std::move(ambiguousText), std::move(clearText), HintCategory::GanonsBossKey};
-    }
-
-    static auto LACS(std::vector<Text>&& obscureText, std::vector<Text>&& ambiguousText = {}, Text&& clearText = {}) {
-        return HintText{std::move(obscureText), std::move(ambiguousText), std::move(clearText), HintCategory::LACS};
-    }
-
-    static auto Altar(std::vector<Text>&& obscureText, std::vector<Text>&& ambiguousText = {}, Text&& clearText = {}) {
-        return HintText{std::move(obscureText), std::move(ambiguousText), std::move(clearText), HintCategory::Altar};
-    }
-
-    static auto Validation(std::vector<Text>&& obscureText, std::vector<Text>&& ambiguousText = {}, Text&& clearText = {}) {
-        return HintText{std::move(obscureText), std::move(ambiguousText), std::move(clearText), HintCategory::Validation};
-    }
-
-    static auto OtherHint(std::vector<Text>&& obscureText, std::vector<Text>&& ambiguousText = {}, Text&& clearText = {}) {
-        return HintText{std::move(obscureText), std::move(ambiguousText), std::move(clearText), HintCategory::OtherHint};
-    }
-
-    static auto MasterSword(std::vector<Text>&& obscureText, std::vector<Text>&& ambiguousText = {}, Text&& clearText = {}) {
-        return HintText{std::move(obscureText), std::move(ambiguousText), std::move(clearText), HintCategory::MasterSword};
-    }
-
-    static auto GanonLine(std::vector<Text>&& obscureText, std::vector<Text>&& ambiguousText = {}, Text&& clearText = {}) {
-        return HintText{std::move(obscureText), std::move(ambiguousText), std::move(clearText), HintCategory::GanonLine};
-    }
-
-    static auto SheikLine(std::vector<Text>&& obscureText, std::vector<Text>&& ambiguousText = {}, Text&& clearText = {}) {
-        return HintText{std::move(obscureText), std::move(ambiguousText), std::move(clearText), HintCategory::SheikLine};
-    }
-
-    static auto MerchantsDialogs(std::vector<Text>&& obscureText, std::vector<Text>&& ambiguousText = {}, Text&& clearText = {}) {
-        return HintText{std::move(obscureText), std::move(ambiguousText), std::move(clearText), HintCategory::MerchantsDialogs};
-    }
-
-    Text& GetObscure() {
-        return RandomElement(obscureText);
-    }
-
-    const Text& GetObscure() const {
-        return RandomElement(obscureText);
-    }
-
-    Text& GetAmbiguous() {
-        if (ambiguousText.size() > 0)   {
-            return RandomElement(ambiguousText);
-        }
-        return RandomElement(obscureText);
-    }
-
-    const Text& GetAmbiguous() const {
-        if (ambiguousText.size() > 0) {
-            return RandomElement(ambiguousText);
-        }
-        return RandomElement(obscureText);
-    }
-
-    const Text& GetClear() const {
-        if (clearText.GetEnglish().empty()) {
-            return GetObscure();
-        }
-        return clearText;
-    }
-
-    const Text& GetText() const;
-
-    const Text GetTextCopy() const;
-
-    HintCategory GetType() const {
-        return type;
-    }
-
-    bool operator==(const HintText& right) const {
-        return obscureText == right.obscureText &&
-               ambiguousText == right.ambiguousText &&
-               clearText == right.clearText;
-    }
-    bool operator!=(const HintText& right) const {
-        return !operator==(right);
-    }
+    HintText(CustomMessage clearText_, std::vector<CustomMessage> ambiguousText_ = {}, std::vector<CustomMessage> obscureText_ = {});
+    const CustomMessage& GetClear() const;
+    const CustomMessage& GetObscure() const;
+    const CustomMessage& GetObscure(uint8_t selection) const;
+    const CustomMessage& GetAmbiguous() const;
+    const CustomMessage& GetAmbiguous(uint8_t selection) const;
+    uint8_t GetAmbiguousSize() const;
+    uint8_t GetObscureSize() const;
+    const CustomMessage& GetHintMessage(uint8_t selection = 0) const;
+    const CustomMessage GetMessageCopy() const;
+    bool operator==(const HintText& right) const;
+    bool operator!=(const HintText& right) const;
 
 private:
-    std::vector<Text> obscureText = {};
-    std::vector<Text> ambiguousText = {};
-    Text clearText;
-    HintCategory type;
+    CustomMessage clearText;
+    std::vector<CustomMessage> ambiguousText = {};
+    std::vector<CustomMessage> obscureText = {};
 };
 
-using ConditionalAlwaysHint = std::pair<RandomizerCheck, std::function<bool()>>;
+struct StaticHintInfo{
+  HintType type;
+  std::vector<RandomizerHintTextKey> hintKeys;
+  RandomizerSettingKey setting;
+  std::variant<bool, uint8_t> condition;
+  std::vector<RandomizerCheck> targetChecks;
+  std::vector<RandomizerGet> targetItems;
+  std::vector<RandomizerCheck> hintChecks;
+  bool yourPocket;
+  int num;
 
-typedef enum {
-    DUNGEON_NEITHER,
-    DUNGEON_BARREN,
-    DUNGEON_WOTH,
-} DungeonHintInfo;
-
-//10 dungeons as GTG and GC are excluded
-extern std::array<DungeonHintInfo, 10> dungeonInfoData;
-
-extern std::array<ConditionalAlwaysHint, 12> conditionalAlwaysHints;
+  StaticHintInfo() = default;
+  StaticHintInfo(HintType _type, std::vector<RandomizerHintTextKey> _hintKeys, RandomizerSettingKey _setting, std::variant<bool, uint8_t> _condition,
+                 std::vector<RandomizerCheck> _targetChecks, std::vector<RandomizerGet> _targetItems = {},
+                 std::vector<RandomizerCheck> _hintChecks = {}, bool _yourPocket = false, int _num = 0);
+};
 
 extern void CreateAllHints();
 extern void CreateWarpSongTexts();
-
-void SetGanonText(Text text);
-
-std::string GetMasterSwordHintLoc();
-std::string GetLightArrowHintLoc();
-
+void CreateStaticHints();
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access.hpp b/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
index 09fc5209e..82b3817bf 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
@@ -4,7 +4,6 @@
 #include <vector>
 #include <list>
 
-#include "hint_list.hpp"
 #include "fill.hpp"
 #include "../randomizerTypes.h"
 #include "../context.h"
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
index 874cc76c1..dacd8127e 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
@@ -38,10 +38,10 @@ void AreaTable_Init_CastleTown() {
                   EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CanSummonGossipFairyWithoutSuns;}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_TOT_LEFT_GOSSIP_STONE,         {[]{return true;}}),
+                  LocationAccess(RC_TOT_LEFTMOST_GOSSIP_STONE,         {[]{return true;}}),
                   LocationAccess(RC_TOT_LEFT_CENTER_GOSSIP_STONE,  {[]{return true;}}),
                   LocationAccess(RC_TOT_RIGHT_CENTER_GOSSIP_STONE, {[]{return true;}}),
-                  LocationAccess(RC_TOT_RIGHT_GOSSIP_STONE,        {[]{return true;}}),
+                  LocationAccess(RC_TOT_RIGHTMOST_GOSSIP_STONE,        {[]{return true;}}),
                 }, {
                   //Exits
                   Entrance(RR_THE_MARKET,  {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
index e91513b79..baa3cb0fc 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
@@ -32,12 +32,12 @@ void AreaTable_Init_GanonsCastle() {
                   Entrance(RR_GANONS_CASTLE_SHADOW_TRIAL, {[]{return true;}}),
                   Entrance(RR_GANONS_CASTLE_SPIRIT_TRIAL, {[]{return true;}}),
                   Entrance(RR_GANONS_CASTLE_LIGHT_TRIAL,  {[]{return logic->CanUse(RG_GOLDEN_GAUNTLETS);}}),
-                  Entrance(RR_GANONS_CASTLE_TOWER,        {[]{return (logic->ForestTrialClear || randoCtx->GetTrial(Rando::FOREST_TRIAL)->IsSkipped()) &&
-                                                                         (logic->FireTrialClear   || randoCtx->GetTrial(Rando::FIRE_TRIAL)->IsSkipped())   &&
-                                                                         (logic->WaterTrialClear  || randoCtx->GetTrial(Rando::WATER_TRIAL)->IsSkipped())  &&
-                                                                         (logic->ShadowTrialClear || randoCtx->GetTrial(Rando::SHADOW_TRIAL)->IsSkipped()) &&
-                                                                         (logic->SpiritTrialClear || randoCtx->GetTrial(Rando::SPIRIT_TRIAL)->IsSkipped()) &&
-                                                                         (logic->LightTrialClear  || randoCtx->GetTrial(Rando::LIGHT_TRIAL)->IsSkipped());}}),
+                  Entrance(RR_GANONS_CASTLE_TOWER,        {[]{return (logic->ForestTrialClear || randoCtx->GetTrial(TK_FOREST_TRIAL)->IsSkipped()) &&
+                                                                         (logic->FireTrialClear   || randoCtx->GetTrial(TK_FIRE_TRIAL)->IsSkipped())   &&
+                                                                         (logic->WaterTrialClear  || randoCtx->GetTrial(TK_WATER_TRIAL)->IsSkipped())  &&
+                                                                         (logic->ShadowTrialClear || randoCtx->GetTrial(TK_SHADOW_TRIAL)->IsSkipped()) &&
+                                                                         (logic->SpiritTrialClear || randoCtx->GetTrial(TK_SPIRIT_TRIAL)->IsSkipped()) &&
+                                                                         (logic->LightTrialClear  || randoCtx->GetTrial(TK_LIGHT_TRIAL)->IsSkipped());}}),
                   Entrance(RR_GANONS_CASTLE_DEKU_SCRUBS,  {[]{return randoCtx->GetTrickOption(RT_LENS_GANON) || logic->CanUse(RG_LENS_OF_TRUTH);}}),
   });
 
@@ -134,12 +134,12 @@ void AreaTable_Init_GanonsCastle() {
                   Entrance(RR_GANONS_CASTLE_MQ_SHADOW_TRIAL, {[]{return true;}}),
                   Entrance(RR_GANONS_CASTLE_MQ_SPIRIT_TRIAL, {[]{return true;}}),
                   Entrance(RR_GANONS_CASTLE_MQ_LIGHT_TRIAL,  {[]{return logic->CanUse(RG_GOLDEN_GAUNTLETS);}}),
-                  Entrance(RR_GANONS_CASTLE_TOWER,           {[]{return (logic->ForestTrialClear || randoCtx->GetTrial(Rando::FOREST_TRIAL)->IsSkipped()) &&
-                                                                            (logic->FireTrialClear   || randoCtx->GetTrial(Rando::FIRE_TRIAL)->IsSkipped())   &&
-                                                                            (logic->WaterTrialClear  || randoCtx->GetTrial(Rando::WATER_TRIAL)->IsSkipped())  &&
-                                                                            (logic->ShadowTrialClear || randoCtx->GetTrial(Rando::SHADOW_TRIAL)->IsSkipped()) &&
-                                                                            (logic->SpiritTrialClear || randoCtx->GetTrial(Rando::SPIRIT_TRIAL)->IsSkipped()) &&
-                                                                            (logic->LightTrialClear  || randoCtx->GetTrial(Rando::LIGHT_TRIAL)->IsSkipped());}}),
+                  Entrance(RR_GANONS_CASTLE_TOWER,           {[]{return (logic->ForestTrialClear || randoCtx->GetTrial(TK_FOREST_TRIAL)->IsSkipped()) &&
+                                                                            (logic->FireTrialClear   || randoCtx->GetTrial(TK_FIRE_TRIAL)->IsSkipped())   &&
+                                                                            (logic->WaterTrialClear  || randoCtx->GetTrial(TK_WATER_TRIAL)->IsSkipped())  &&
+                                                                            (logic->ShadowTrialClear || randoCtx->GetTrial(TK_SHADOW_TRIAL)->IsSkipped()) &&
+                                                                            (logic->SpiritTrialClear || randoCtx->GetTrial(TK_SPIRIT_TRIAL)->IsSkipped()) &&
+                                                                            (logic->LightTrialClear  || randoCtx->GetTrial(TK_LIGHT_TRIAL)->IsSkipped());}}),
                   Entrance(RR_GANONS_CASTLE_MQ_DEKU_SCRUBS,  {[]{return randoCtx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH);}}),
   });
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
index 777154bab..8c3d6a5b1 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
@@ -34,7 +34,7 @@ void AreaTable_Init_HyruleField() {
                   //Locations
                   LocationAccess(RC_HF_SOUTHEAST_GROTTO_CHEST,         {[]{return true;}}),
                   LocationAccess(RC_HF_SOUTHEAST_GROTTO_FISH,          {[]{return logic->HasBottle;}}),
-                  LocationAccess(RC_HF_SOUTHEAST_GOSSIP_STONE,         {[]{return true;}}),
+                  LocationAccess(RC_HF_SOUTHEAST_GROTTO_GOSSIP_STONE,         {[]{return true;}}),
                   LocationAccess(RC_HF_SOUTHEAST_GROTTO_BEEHIVE_LEFT,  {[]{return logic->CanBreakLowerBeehives;}}),
                   LocationAccess(RC_HF_SOUTHEAST_GROTTO_BEEHIVE_RIGHT, {[]{return logic->CanBreakLowerBeehives;}}),
                 }, {
@@ -77,7 +77,7 @@ void AreaTable_Init_HyruleField() {
                   //Locations
                   LocationAccess(RC_HF_NEAR_MARKET_GROTTO_CHEST,         {[]{return true;}}),
                   LocationAccess(RC_HF_NEAR_MARKET_GROTTO_FISH,          {[]{return logic->HasBottle;}}),
-                  LocationAccess(RC_HF_NEAR_MARKET_GOSSIP_STONE,         {[]{return true;}}),
+                  LocationAccess(RC_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE,         {[]{return true;}}),
                   LocationAccess(RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_LEFT,  {[]{return logic->CanBreakLowerBeehives;}}),
                   LocationAccess(RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_RIGHT, {[]{return logic->CanBreakLowerBeehives;}}),
                 }, {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
index 809a439f8..b33cc9381 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
@@ -281,7 +281,7 @@ void AreaTable_Init_Kakariko() {
                   EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CanSummonGossipFairyWithoutSuns;}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_GY_GOSSIP_STONE, {[]{return true;}}),
+                  LocationAccess(RC_GRAVEYARD_GOSSIP_STONE, {[]{return true;}}),
                 }, {
                   //Exits
                   Entrance(RR_THE_GRAVEYARD,             {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
index 6dc417727..c7214d6ca 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
@@ -98,7 +98,7 @@ void AreaTable_Init_LostWoods() {
                   //Locations
                   LocationAccess(RC_KF_STORMS_GROTTO_CHEST,         {[]{return true;}}),
                   LocationAccess(RC_KF_STORMS_GROTTO_FISH,          {[]{return logic->HasBottle;}}),
-                  LocationAccess(RC_KF_STORMS_GOSSIP_STONE,         {[]{return true;}}),
+                  LocationAccess(RC_KF_STORMS_GROTTO_GOSSIP_STONE,         {[]{return true;}}),
                   LocationAccess(RC_KF_STORMS_GROTTO_BEEHIVE_LEFT,  {[]{return logic->CanBreakLowerBeehives;}}),
                   LocationAccess(RC_KF_STORMS_GROTTO_BEEHIVE_RIGHT, {[]{return logic->CanBreakLowerBeehives;}}),
                 }, {
@@ -168,7 +168,7 @@ void AreaTable_Init_LostWoods() {
                   //Locations
                   LocationAccess(RC_LW_NEAR_SHORTCUTS_GROTTO_CHEST,         {[]{return true;}}),
                   LocationAccess(RC_LW_NEAR_SHORTCUTS_GROTTO_FISH,          {[]{return logic->HasBottle;}}),
-                  LocationAccess(RC_LW_NEAR_SHORTCUTS_GOSSIP_STONE,         {[]{return true;}}),
+                  LocationAccess(RC_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE,         {[]{return true;}}),
                   LocationAccess(RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_LEFT,  {[]{return logic->CanBreakLowerBeehives;}}),
                   LocationAccess(RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_RIGHT, {[]{return logic->CanBreakLowerBeehives;}}),
                 }, {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
index c20667c47..dddad29a1 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
@@ -158,8 +158,8 @@ void AreaTable_Init_ZorasDomain() {
                   LocationAccess(RC_ZF_GS_TREE,                  {[]{return logic->IsChild;}}),
                   LocationAccess(RC_ZF_GS_ABOVE_THE_LOG,         {[]{return logic->IsChild && logic->HookshotOrBoomerang && logic->AtNight && logic->CanGetNightTimeGS;}}),
                   LocationAccess(RC_ZF_GS_HIDDEN_CAVE,           {[]{return logic->CanUse(RG_SILVER_GAUNTLETS) && logic->CanBlastOrSmash && logic->HookshotOrBoomerang && logic->IsAdult && logic->AtNight && logic->CanGetNightTimeGS;}}),
-                  LocationAccess(RC_FAIRY_GOSSIP_STONE,       {[]{return true;}}),
-                  LocationAccess(RC_JABU_GOSSIP_STONE,        {[]{return true;}}),
+                  LocationAccess(RC_ZF_FAIRY_GOSSIP_STONE,       {[]{return true;}}),
+                  LocationAccess(RC_ZF_JABU_GOSSIP_STONE,        {[]{return true;}}),
                 }, {
                   //Exits
                   Entrance(RR_ZD_BEHIND_KING_ZORA,       {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/rando_main.cpp b/soh/soh/Enhancements/randomizer/3drando/rando_main.cpp
index 349995177..e3c757ba5 100644
--- a/soh/soh/Enhancements/randomizer/3drando/rando_main.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/rando_main.cpp
@@ -1,5 +1,4 @@
 #include "menu.hpp"
-#include "hint_list.hpp"
 #include "../static_data.h"
 #include "../item_location.h"
 #include "location_access.hpp"
@@ -12,7 +11,6 @@
 
 void RandoMain::GenerateRando(std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks,
     std::string seedString) {
-    HintTable_Init();
 
     // std::string settingsFileName = "./randomizer/latest_settings.json";
     // CVarSetString("gLoadedPreset", settingsFileName.c_str());
diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
index 3fdf56b60..1835dfe03 100644
--- a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
@@ -38,7 +38,6 @@ using namespace Rando;
 json jsonData;
 std::map<RandomizerHintTextKey, Rando::ItemLocation*> hintedLocations;
 
-extern std::array<std::string, HINT_TYPE_MAX> hintTypeNames;
 extern std::array<std::string, 17> hintCategoryNames;
 extern Area* GetHintRegion(uint32_t);
 
@@ -499,16 +498,7 @@ static void WriteRequiredTrials() {
     auto ctx = Rando::Context::GetInstance();
     for (const auto& trial : ctx->GetTrials()->GetTrialList()) {
         if (trial->IsRequired()) {
-            std::string trialName;
-            switch (gSaveContext.language) {
-                case LANGUAGE_FRA:
-                    trialName = trial->GetName().GetFrench();
-                    break;
-                case LANGUAGE_ENG:
-                default:
-                    trialName = trial->GetName().GetEnglish();
-                    break;
-            }
+            std::string trialName = trial->GetName().GetForCurrentLanguage(MF_CLEAN);
             jsonData["requiredTrials"].push_back(RemoveLineBreaks(trialName));
         }
     }
@@ -553,117 +543,13 @@ Rando::ItemLocation* GetItemLocation(RandomizerGet item) {
     })[0]);
 }
 
-// Writes the hints to the spoiler log, if they are enabled.
-static void WriteHints() {
-    auto ctx = Rando::Context::GetInstance();
-
-    uint8_t language = ctx->GetOption(RSK_LANGUAGE).GetSelectedOptionIndex();
-
-    if (ctx->GetOption(RSK_SHUFFLE_WARP_SONGS)) {
-        jsonData["warpMinuetText"] = ctx->GetHint(RH_MINUET_WARP_LOC)->GetText().GetForLanguage(language);
-        jsonData["warpBoleroText"] = ctx->GetHint(RH_BOLERO_WARP_LOC)->GetText().GetForLanguage(language);
-        jsonData["warpSerenadeText"] = ctx->GetHint(RH_SERENADE_WARP_LOC)->GetText().GetForLanguage(language);
-        jsonData["warpRequiemText"] = ctx->GetHint(RH_REQUIEM_WARP_LOC)->GetText().GetForLanguage(language);
-        jsonData["warpNocturneText"] = ctx->GetHint(RH_NOCTURNE_WARP_LOC)->GetText().GetForLanguage(language);
-        jsonData["warpPreludeText"] = ctx->GetHint(RH_PRELUDE_WARP_LOC)->GetText().GetForLanguage(language);
-    }
-    jsonData["childAltar"]["hintText"] = ctx->GetHint(RH_ALTAR_CHILD)->GetText().GetForLanguage(language);
-    jsonData["adultAltar"]["hintText"] = ctx->GetHint(RH_ALTAR_ADULT)->GetText().GetForLanguage(language);
-
-    Rando::ItemLocation* emeraldLoc = GetItemLocation(RG_KOKIRI_EMERALD);
-    Rando::ItemLocation* rubyLoc = GetItemLocation(RG_GORON_RUBY);
-    Rando::ItemLocation* sapphireLoc = GetItemLocation(RG_ZORA_SAPPHIRE);
-    std::string emeraldArea;
-    std::string erubyArea;
-    std::string sapphireArea;
-
-    jsonData["childAltar"]["rewards"]["emeraldLoc"] = Rando::StaticData::GetLocation(emeraldLoc->GetRandomizerCheck())->GetName();
-    jsonData["childAltar"]["rewards"]["rubyLoc"] = Rando::StaticData::GetLocation(rubyLoc->GetRandomizerCheck())->GetName();
-    jsonData["childAltar"]["rewards"]["sapphireLoc"] =
-        Rando::StaticData::GetLocation(sapphireLoc->GetRandomizerCheck())->GetName();
-
-    Rando::ItemLocation* forestMedallionLoc = GetItemLocation(RG_FOREST_MEDALLION);
-    Rando::ItemLocation* fireMedallionLoc = GetItemLocation(RG_FIRE_MEDALLION);
-    Rando::ItemLocation* waterMedallionLoc = GetItemLocation(RG_WATER_MEDALLION);
-    Rando::ItemLocation* shadowMedallionLoc = GetItemLocation(RG_SHADOW_MEDALLION);
-    Rando::ItemLocation* spiritMedallionLoc = GetItemLocation(RG_SPIRIT_MEDALLION);
-    Rando::ItemLocation* lightMedallionLoc = GetItemLocation(RG_LIGHT_MEDALLION);
-
-    jsonData["adultAltar"]["rewards"]["forestMedallionLoc"] =
-        Rando::StaticData::GetLocation(forestMedallionLoc->GetRandomizerCheck())->GetName();
-    jsonData["adultAltar"]["rewards"]["fireMedallionLoc"] =
-        Rando::StaticData::GetLocation(fireMedallionLoc->GetRandomizerCheck())->GetName();
-    jsonData["adultAltar"]["rewards"]["waterMedallionLoc"] =
-        Rando::StaticData::GetLocation(waterMedallionLoc->GetRandomizerCheck())->GetName();
-    jsonData["adultAltar"]["rewards"]["shadowMedallionLoc"] =
-        Rando::StaticData::GetLocation(shadowMedallionLoc->GetRandomizerCheck())->GetName();
-    jsonData["adultAltar"]["rewards"]["spiritMedallionLoc"] =
-        Rando::StaticData::GetLocation(spiritMedallionLoc->GetRandomizerCheck())->GetName();
-    jsonData["adultAltar"]["rewards"]["lightMedallionLoc"] =
-        Rando::StaticData::GetLocation(lightMedallionLoc->GetRandomizerCheck())->GetName();
-
-    jsonData["ganonText"] = ctx->GetHint(RH_GANONDORF_NOHINT)->GetText().GetForLanguage(language);
-    if (ctx->GetOption(RSK_LIGHT_ARROWS_HINT)){
-      jsonData["ganonHintText"] = ctx->GetHint(RH_GANONDORF_HINT)->GetText().GetForLanguage(language);
-      jsonData["lightArrowHintLoc"] = GetLightArrowHintLoc();
-      jsonData["lightArrowArea"] = ::Hint(ctx->GetHint(RH_GANONDORF_HINT)->GetHintedArea()).GetText().GetEnglish();
-      jsonData["masterSwordHintLoc"] = GetMasterSwordHintLoc();
-      if (!ctx->GetOption(RSK_TRIAL_COUNT).Is(0)) {
-          jsonData["sheikText"] = ctx->GetHint(RH_SHEIK_LIGHT_ARROWS)->GetText().GetForLanguage(language);
-      }
-    }
-    if (ctx->GetOption(RSK_DAMPES_DIARY_HINT)){
-      jsonData["dampeText"] = ctx->GetHint(RH_DAMPES_DIARY)->GetText().GetForLanguage(language);
-      jsonData["dampeHintLoc"] = Rando::StaticData::GetLocation(ctx->GetHint(RH_DAMPES_DIARY)->GetHintedLocation())->GetName();
-      jsonData["dampeRegion"] = ::Hint(ctx->GetHint(RH_DAMPES_DIARY)->GetHintedArea()).GetText().GetEnglish();
-    }
-    if (ctx->GetOption(RSK_GREG_HINT)){
-      jsonData["gregText"] = ctx->GetHint(RH_GREG_RUPEE)->GetText().GetForLanguage(language);
-      jsonData["gregLoc"] = Rando::StaticData::GetLocation(ctx->GetHint(RH_GREG_RUPEE)->GetHintedLocation())->GetName();
-      jsonData["gregRegion"] = ::Hint(ctx->GetHint(RH_GREG_RUPEE)->GetHintedArea()).GetText().GetEnglish();
-    }
-    if (ctx->GetOption(RSK_SARIA_HINT)){
-      jsonData["sariaText"] = ctx->GetHint(RH_SARIA)->GetText().GetForLanguage(language);
-      jsonData["sariaHintLoc"] = Rando::StaticData::GetLocation(ctx->GetHint(RH_SARIA)->GetHintedLocation())->GetName();
-      jsonData["sariaRegion"] = ::Hint(ctx->GetHint(RH_SARIA)->GetHintedArea()).GetText().GetEnglish();
-    }
-    if (ctx->GetOption(RSK_FISHING_POLE_HINT)) {
-      jsonData["fishingPoleText"] = ctx->GetHint(RH_FISHING_POLE)->GetText().GetForLanguage(language);
-      jsonData["fishingPoleHintLoc"] = Rando::StaticData::GetLocation(ctx->GetHint(RH_FISHING_POLE)->GetHintedLocation())->GetName();
-      jsonData["fishingPoleRegion"] = ::Hint(ctx->GetHint(RH_FISHING_POLE)->GetHintedArea()).GetText().GetEnglish();
-    }
-
-    if (ctx->GetOption(RSK_GOSSIP_STONE_HINTS).Is(RO_GOSSIP_STONES_NONE)) {
-        return;
-    }
-    for (const RandomizerCheck key : Rando::StaticData::gossipStoneLocations) { //RANDOTODO should be merged with static hints, iterate over hint keys
-        Rando::Hint* hint = ctx->GetHint((RandomizerHintKey)(key - RC_COLOSSUS_GOSSIP_STONE + 1));
-        Rando::ItemLocation* hintedLocation = ctx->GetItemLocation(hint->GetHintedLocation());
-        std::string hintTextString = hint->GetText().GetForLanguage(language);
-        HintType hintType = hint->GetHintType();
-
-        std::string textStr = hintTextString;
-        std::string name = Rando::StaticData::GetLocation(key)->GetName();
-        jsonData["hints"][name]["hint"] = textStr;
-        jsonData["hints"][name]["distribution"] = hint->GetDistribution();
-        jsonData["hints"][name]["type"] = hintTypeNames[(int)hintType];
-        if (hintType == HINT_TYPE_ITEM_LOCATION || hintType == HINT_TYPE_ITEM_AREA || hintType == HINT_TYPE_WOTH) {
-            jsonData["hints"][name]["item"] = hintedLocation->GetPlacedItemName().GetEnglish();
-            jsonData["hints"][name]["location"] = Rando::StaticData::GetLocation(hintedLocation->GetRandomizerCheck())->GetName();
-        }
-        if (hintType != HINT_TYPE_TRIAL && hintType != HINT_TYPE_JUNK) {
-            jsonData["hints"][name]["area"] = ::Hint(hint->GetHintedArea()).GetText().Capitalize().GetEnglish();
-        }
-    }
-}
-
 static void WriteAllLocations() {
     auto ctx = Rando::Context::GetInstance();
     for (const RandomizerCheck key : ctx->allLocations) {
         Rando::ItemLocation* location = ctx->GetItemLocation(key);
         std::string placedItemName;
 
-        switch (ctx->GetOption(RSK_LANGUAGE).GetSelectedOptionIndex()) {
+        switch (gSaveContext.language) {
           case 0:
           default:
             placedItemName = location->GetPlacedItemName().english;
@@ -689,12 +575,12 @@ static void WriteAllLocations() {
             jsonData["locations"][Rando::StaticData::GetLocation(location->GetRandomizerCheck())->GetName()]["price"] =
                 location->GetPrice();
         }
-        if (location->IsHintedAt()) {
+        if (location->IsAHintAccessible()) {
           hintedLocations.emplace(Rando::StaticData::GetLocation(key)->GetHintKey(), location);
         }
 
         if (location->GetPlacedRandomizerGet() == RG_ICE_TRAP) {
-          switch (ctx->GetOption(RSK_LANGUAGE).GetSelectedOptionIndex()) {
+          switch (gSaveContext.language) {
               case 0:
               default:
                   jsonData["locations"][Rando::StaticData::GetLocation(location->GetRandomizerCheck())->GetName()]["model"] =
@@ -737,7 +623,7 @@ const char* SpoilerLog_Write() {
     WriteSettings();
     WriteExcludedLocations();
     WriteStartingInventory();
-    WriteEnabledTricks(spoilerLog);
+    WriteEnabledTricks(spoilerLog); //RANDOTODO clean up spoilerLog refernces
     //if (Settings::Logic.Is(LOGIC_GLITCHED)) {
     //    WriteEnabledGlitches(spoilerLog);
     //}
@@ -748,7 +634,7 @@ const char* SpoilerLog_Write() {
     ctx->playthroughLocations.clear();
     ctx->playthroughBeatable = false;
 
-    WriteHints();
+    ctx->WriteHintJson(jsonData);
     WriteShuffledEntrances();
     WriteAllLocations();
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/text.hpp b/soh/soh/Enhancements/randomizer/3drando/text.hpp
index 49e598f63..46c0196bb 100644
--- a/soh/soh/Enhancements/randomizer/3drando/text.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/text.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <string>
-#include "z64.h"
+#include <stdint.h>
 
 #define PLURAL 0
 #define SINGULAR 1
@@ -54,11 +54,11 @@ public:
 
     const std::string& GetForLanguage(uint8_t language) const {
         switch (language) {
-            case LANGUAGE_ENG:
+            case 0: //LANGUAGE_ENG: changed to resolve #include loops
                 return GetEnglish();
-            case LANGUAGE_FRA:
+            case 2: //LANGUAGE_FRA:
                 return GetFrench();
-            case LANGUAGE_GER:
+            case 1: //LANGUAGE_GER:
                 return GetGerman();
             default:
                 return GetEnglish();
@@ -97,6 +97,29 @@ public:
         }
     }
 
+    void Replace(std::string oldStr, Text newText) {
+        size_t position = english.find(oldStr);
+        while (position != std::string::npos) {
+            english.replace(position, oldStr.length(), newText.GetEnglish());
+            position = english.find(oldStr);
+        }
+        position = french.find(oldStr);
+        while (position != std::string::npos) {
+            french.replace(position, oldStr.length(), newText.GetFrench());
+            position = french.find(oldStr);
+        }
+        position = spanish.find(oldStr);
+        while (position != std::string::npos) {
+            spanish.replace(position, oldStr.length(), newText.GetSpanish());
+            position = spanish.find(oldStr);
+        }
+        position = german.find(oldStr);
+        while (position != std::string::npos) {
+            german.replace(position, oldStr.length(), newText.GetGerman());
+            position = german.find(oldStr);
+        }
+    }
+
     // Convert first char to upper case
     Text Capitalize(void) const {
         Text cap = *this + "";
diff --git a/soh/soh/Enhancements/randomizer/context.cpp b/soh/soh/Enhancements/randomizer/context.cpp
index 3f5e09db3..35c856d60 100644
--- a/soh/soh/Enhancements/randomizer/context.cpp
+++ b/soh/soh/Enhancements/randomizer/context.cpp
@@ -5,11 +5,11 @@
 #include "3drando/shops.hpp"
 #include "dungeon.h"
 #include "logic.h"
-#include "trial.h"
 #include "entrance.h"
 #include "settings.h"
 #include "rando_hash.h"
 #include "fishsanity.h"
+#include "3drando/hints.hpp"
 
 #include <fstream>
 #include <spdlog/spdlog.h>
@@ -20,56 +20,6 @@ namespace Rando {
 std::weak_ptr<Context> Context::mContext;
 
 Context::Context() {
-    mSpoilerfileHintTypeNameToEnum = {
-        { "Static", HINT_TYPE_STATIC },
-        { "Trial", HINT_TYPE_TRIAL },
-        { "WotH", HINT_TYPE_WOTH },
-        { "Barren", HINT_TYPE_BARREN },
-        { "Entrance", HINT_TYPE_ENTRANCE },
-        { "Item Area", HINT_TYPE_ITEM_AREA },
-        { "Item Location", HINT_TYPE_ITEM_LOCATION },
-        { "Junk", HINT_TYPE_JUNK },
-    };
-
-    mSpoilerfileAreaNameToEnum = {
-        {"No Hint", RA_NONE},
-        {"Link's Pocket", RA_LINKS_POCKET},
-        {"Kokiri Forest", RA_KOKIRI_FOREST},
-        {"The Lost Woods", RA_THE_LOST_WOODS},
-        {"Sacred Forest Meadow", RA_SACRED_FOREST_MEADOW},
-        {"Hyrule Field", RA_HYRULE_FIELD},
-        {"Lake Hylia", RA_LAKE_HYLIA},
-        {"Gerudo Valley", RA_GERUDO_VALLEY},
-        {"Gerudo Fortress", RA_GERUDO_FORTRESS},
-        {"Haunted Wasteland", RA_HAUNTED_WASTELAND},
-        {"Desert Colossus", RA_DESERT_COLOSSUS},
-        {"The Market", RA_THE_MARKET},
-        {"Temple of Time", RA_TEMPLE_OF_TIME},
-        {"Hyrule Castle", RA_HYRULE_CASTLE},
-        {"Outside Ganon's Castle", RA_OUTSIDE_GANONS_CASTLE},
-        {"Castle Grounds", RA_CASTLE_GROUNDS},
-        {"Kakariko Village", RA_KAKARIKO_VILLAGE},
-        {"the Graveyard", RA_THE_GRAVEYARD},
-        {"Death Mountain Trail", RA_DEATH_MOUNTAIN_TRAIL},
-        {"Goron City", RA_GORON_CITY},
-        {"Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER},
-        {"Zora's River", RA_ZORAS_RIVER},
-        {"Zora's Domain", RA_ZORAS_DOMAIN},
-        {"Zora's Fountain", RA_ZORAS_FOUNTAIN},
-        {"Lon Lon Ranch", RA_LON_LON_RANCH},
-        {"Deku Tree", RA_DEKU_TREE},
-        {"Dodongo's Cavern", RA_DODONGOS_CAVERN},
-        {"Jabu-Jabu's Belly", RA_JABU_JABUS_BELLY},
-        {"Forest Temple", RA_FOREST_TEMPLE},
-        {"Fire Temple", RA_FIRE_TEMPLE},
-        {"Water Temple", RA_WATER_TEMPLE},
-        {"Spirit Temple", RA_SPIRIT_TEMPLE},
-        {"Shadow Temple", RA_SHADOW_TEMPLE},
-        {"Bottom of the Well", RA_BOTTOM_OF_THE_WELL},
-        {"Ice Cavern", RA_ICE_CAVERN},
-        {"Gerudo training Grounds", RA_GERUDO_TRAINING_GROUND},
-        {"Inside Ganon's Castle", RA_GANONS_CASTLE},
-    };
 
     for (int i = 0; i < RC_MAX; i++) {
         itemLocationTable[i] = ItemLocation(static_cast<RandomizerCheck>(i));
@@ -83,11 +33,15 @@ Context::Context() {
 }
 
 RandomizerArea Context::GetAreaFromString(std::string str) {
-    return mSpoilerfileAreaNameToEnum[str];
+    return (RandomizerArea)StaticData::areaNameToEnum[str];
 }
 
 void Context::InitStaticData() {
-    StaticData::InitItemTable();
+    StaticData::HintTable_Init();
+    StaticData::trialNameToEnum = StaticData::PopulateTranslationMap(StaticData::trialData);
+    StaticData::hintNameToEnum = StaticData::PopulateTranslationMap(StaticData::hintNames);
+    StaticData::hintTypeNameToEnum = StaticData::PopulateTranslationMap(StaticData::hintTypeNames);
+    StaticData::areaNameToEnum = StaticData::PopulateTranslationMap(StaticData::areaNames);
     StaticData::InitLocationTable();
 }
 
@@ -104,14 +58,12 @@ std::shared_ptr<Context> Context::GetInstance() {
     return mContext.lock();
 }
 
-Hint* Context::GetHint(const RandomizerHintKey hintKey) {
+Hint* Context::GetHint(const RandomizerHint hintKey) {
     return &hintTable[hintKey];
 }
 
-void Context::AddHint(const RandomizerHintKey hintId, const Text& text, const RandomizerCheck hintedLocation, const HintType hintType,
-                      std::string distributionName, RandomizerArea hintedArea) {
-    hintTable[hintId] = Hint(text, hintedLocation, hintType, distributionName, hintedArea);
-    GetItemLocation(hintedLocation)->AddHintedBy(hintId);
+void Context::AddHint(const RandomizerHint hintId, const Hint hint) {
+    hintTable[hintId] = hint; //RANDOTODO this should probably be an rvalue
 }
 
 ItemLocation* Context::GetItemLocation(const RandomizerCheck locKey) {
@@ -222,7 +174,7 @@ std::vector<RandomizerCheck> Context::GetLocations(const std::vector<RandomizerC
 }
 
 void Context::ClearItemLocations() {
-    for (int i = 0; i < itemLocationTable.size(); i++) {
+    for (size_t i = 0; i < itemLocationTable.size(); i++) {
         GetItemLocation(static_cast<RandomizerCheck>(i))->ResetVariables();
     }
 }
@@ -250,7 +202,7 @@ void Context::LocationReset() {
         GetItemLocation(il)->RemoveFromPool();
     }
 
-    for (const RandomizerCheck il : StaticData::otherHintLocations) {
+    for (const RandomizerCheck il : StaticData::staticHintLocations) {
         GetItemLocation(il)->RemoveFromPool();
     }
 }
@@ -258,7 +210,9 @@ void Context::LocationReset() {
 void Context::HintReset() {
     for (const RandomizerCheck il : StaticData::gossipStoneLocations) {
         GetItemLocation(il)->ResetVariables();
-        GetHint(static_cast<RandomizerHintKey>(il - RC_COLOSSUS_GOSSIP_STONE + 1))->ResetVariables();
+    }
+    for (Hint& hint : hintTable){
+        hint.ResetVariables();
     }
 }
 
@@ -393,126 +347,52 @@ void Context::ParseHashIconIndexesJson(nlohmann::json spoilerFileJson) {
 void Context::ParseItemLocationsJson(nlohmann::json spoilerFileJson) {
     nlohmann::json locationsJson = spoilerFileJson["locations"];
     for (auto it = locationsJson.begin(); it != locationsJson.end(); ++it) {
-        RandomizerCheck rc = StaticData::SpoilerfileCheckNameToEnum[it.key()];
+        RandomizerCheck rc = StaticData::locationNameToEnum[it.key()];
         if (it->is_structured()) {
             nlohmann::json itemJson = *it;
             for (auto itemit = itemJson.begin(); itemit != itemJson.end(); ++itemit) {
                 if (itemit.key() == "item") {
-                    itemLocationTable[rc].SetPlacedItem(StaticData::SpoilerfileItemNameToEnum[itemit.value().get<std::string>()]);
+                    itemLocationTable[rc].SetPlacedItem(StaticData::itemNameToEnum[itemit.value().get<std::string>()]);
                 } else if (itemit.key() == "price") {
                     itemLocationTable[rc].SetCustomPrice(itemit.value().get<uint16_t>());
                 } else if (itemit.key() == "model") {
-                    overrides[rc] = ItemOverride(rc, StaticData::SpoilerfileItemNameToEnum[itemit.value().get<std::string>()]);
+                    overrides[rc] = ItemOverride(rc, StaticData::itemNameToEnum[itemit.value().get<std::string>()]);
                 } else if (itemit.key() == "trickName") {
                     overrides[rc].SetTrickName(Text(itemit.value().get<std::string>()));
                 }
             }
         } else {
-            itemLocationTable[rc].SetPlacedItem(StaticData::SpoilerfileItemNameToEnum[it.value().get<std::string>()]);
+            itemLocationTable[rc].SetPlacedItem(StaticData::itemNameToEnum[it.value().get<std::string>()]);
         }
     }
 }
 
+void Context::WriteHintJson(nlohmann::ordered_json& spoilerFileJson){
+    for (Hint hint: hintTable){
+        hint.logHint(spoilerFileJson);
+    }
+}
+
+nlohmann::json getValueForMessage(std::unordered_map<std::string, nlohmann::json> map, CustomMessage message){
+    std::vector<std::string> strings = message.GetAllMessages();
+    for (uint8_t language = 0; language < LANGUAGE_MAX; language++){
+        if (map.contains(strings[language])){
+            return strings[language];
+        }
+    }
+    return {};
+}
+
 void Context::ParseHintJson(nlohmann::json spoilerFileJson) {
-    // Child Altar
-    std::string childAltarText = spoilerFileJson["childAltar"]["hintText"].get<std::string>();
-    AddHint(RH_ALTAR_CHILD, Text(childAltarText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", RA_NONE);
-    mEmeraldLoc = StaticData::SpoilerfileCheckNameToEnum[spoilerFileJson["childAltar"]["rewards"]["emeraldLoc"]];
-    mRubyLoc = StaticData::SpoilerfileCheckNameToEnum[spoilerFileJson["childAltar"]["rewards"]["rubyLoc"]];
-    mSapphireLoc = StaticData::SpoilerfileCheckNameToEnum[spoilerFileJson["childAltar"]["rewards"]["sapphireLoc"]];
-
-    // Adult Altar
-    std::string adultAltarText = spoilerFileJson["adultAltar"]["hintText"].get<std::string>();
-    AddHint(RH_ALTAR_ADULT, Text(adultAltarText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", RA_NONE);
-    mForestMedallionLoc = StaticData::SpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["forestMedallionLoc"].get<std::string>()];
-    mFireMedallionLoc = StaticData::SpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["fireMedallionLoc"].get<std::string>()];
-    mWaterMedallionLoc = StaticData::SpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["waterMedallionLoc"].get<std::string>()];
-    mShadowMedallionLoc = StaticData::SpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["shadowMedallionLoc"].get<std::string>()];
-    mSpiritMedallionLoc = StaticData::SpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["spiritMedallionLoc"].get<std::string>()];
-    mLightMedallionLoc = StaticData::SpoilerfileCheckNameToEnum[spoilerFileJson["adultAltar"]["rewards"]["lightMedallionLoc"].get<std::string>()];
-
-    // Ganondorf and Sheik Light Arrow Hints
-    std::string ganonHintText = spoilerFileJson["ganonHintText"].get<std::string>();
-    RandomizerCheck lightArrowLoc = StaticData::SpoilerfileCheckNameToEnum[spoilerFileJson["lightArrowHintLoc"].get<std::string>()];
-    std::string lightArrowRegion = spoilerFileJson["lightArrowArea"].get<std::string>();
-    AddHint(RH_GANONDORF_HINT, Text(ganonHintText), lightArrowLoc, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[lightArrowRegion]);
-    if (spoilerFileJson.contains("sheikText")) {
-        std::string sheikText = spoilerFileJson["sheikText"].get<std::string>();
-        AddHint(RH_SHEIK_LIGHT_ARROWS, Text(sheikText), lightArrowLoc, HINT_TYPE_STATIC, lightArrowRegion);
+    for (auto hintData : spoilerFileJson["Gossip Stone Hints"].items()){
+        RandomizerHint hint = (RandomizerHint)StaticData::hintNameToEnum[hintData.key()];
+        AddHint(hint, Hint(hint, hintData.value()));
     }
-    std::string ganonText = spoilerFileJson["ganonText"].get<std::string>();
-    AddHint(RH_GANONDORF_NOHINT, Text(ganonText), RC_UNKNOWN_CHECK, HINT_TYPE_JUNK, "Static", RA_GANONS_CASTLE);
-
-    // Dampe Hookshot Hint
-    if (spoilerFileJson.contains("dampeText")) {
-        std::string dampeText = spoilerFileJson["dampeText"].get<std::string>();
-        std::string dampeRegion = spoilerFileJson["dampeRegion"].get<std::string>();
-        RandomizerCheck dampeHintLoc = StaticData::SpoilerfileCheckNameToEnum[spoilerFileJson["dampeHintLoc"].get<std::string>()];
-        AddHint(RH_DAMPES_DIARY, Text(dampeText), dampeHintLoc, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[dampeRegion]);
-    }
-
-    // Greg Hint
-    if (spoilerFileJson.contains("gregText")) {
-        std::string gregText = spoilerFileJson["gregText"].get<std::string>();
-        std::string gregRegion = spoilerFileJson["gregRegion"].get<std::string>();
-        RandomizerCheck gregLoc = StaticData::SpoilerfileCheckNameToEnum[spoilerFileJson["gregLoc"].get<std::string>()];
-        AddHint(RH_GREG_RUPEE, Text(gregText), gregLoc, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[gregRegion]);
-    }
-
-    // Saria Magic Hint
-    if (spoilerFileJson.contains("sariaText")) {
-        std::string sariaText = spoilerFileJson["sariaText"].get<std::string>();
-        std::string sariaRegion = spoilerFileJson["sariaRegion"].get<std::string>();
-        RandomizerCheck sariaHintLoc = StaticData::SpoilerfileCheckNameToEnum[spoilerFileJson["sariaHintLoc"].get<std::string>()];
-        AddHint(RH_SARIA, Text(sariaText), sariaHintLoc, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[sariaRegion]);
-    }
-
-    // Fishing Pole Hint
-    if(spoilerFileJson.contains("fishingPoleText")) {
-        std::string fishingPoleText = spoilerFileJson["fishingPoleText"].get<std::string>();
-        std::string fishingPoleRegion = spoilerFileJson["fishingPoleRegion"].get<std::string>();
-        RandomizerCheck fishingPoleHintLoc = StaticData::SpoilerfileCheckNameToEnum[spoilerFileJson["fishingPoleHintLoc"].get<std::string>()];
-        AddHint(RH_FISHING_POLE, Text(fishingPoleText), fishingPoleHintLoc, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[fishingPoleRegion]);
-    }
-
-    // Warp Songs
-    if (spoilerFileJson.contains("warpMinuetText")) {
-        std::string warpMinuetText = spoilerFileJson["warpMinuetText"].get<std::string>(); //RANDOTODO fall back for if location is used
-        AddHint(RH_MINUET_WARP_LOC, Text(warpMinuetText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[warpMinuetText]);
-    }
-    if (spoilerFileJson.contains("warpBoleroText")) {
-        std::string warpBoleroText = spoilerFileJson["warpBoleroText"].get<std::string>();
-        AddHint(RH_BOLERO_WARP_LOC, Text(warpBoleroText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[warpBoleroText]);
-    }
-    if (spoilerFileJson.contains("warpSerenadeText")) {
-        std::string warpSerenadeText = spoilerFileJson["warpSerenadeText"].get<std::string>();
-        AddHint(RH_SERENADE_WARP_LOC, Text(warpSerenadeText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[warpSerenadeText]);
-    }
-    if (spoilerFileJson.contains("warpRequiemText")) {
-        std::string warpRequiemText = spoilerFileJson["warpRequiemText"].get<std::string>();
-        AddHint(RH_REQUIEM_WARP_LOC, Text(warpRequiemText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[warpRequiemText]);
-    }
-    if (spoilerFileJson.contains("warpNocturneText")) {
-        std::string warpNocturneText = spoilerFileJson["warpNocturneText"].get<std::string>();
-        AddHint(RH_NOCTURNE_WARP_LOC, Text(warpNocturneText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[warpNocturneText]);
-    }
-    if (spoilerFileJson.contains("warpPreludeText")) {
-        std::string warpPreludeText = spoilerFileJson["warpPreludeText"].get<std::string>();
-        AddHint(RH_PRELUDE_WARP_LOC, Text(warpPreludeText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", mSpoilerfileAreaNameToEnum[warpPreludeText]);
-    }
-
-    // Gossip Stones
-    nlohmann::json hintsJson = spoilerFileJson["hints"];
-    for (auto it = hintsJson.begin(); it != hintsJson.end(); ++it) {
-        RandomizerCheck gossipStoneLoc = StaticData::SpoilerfileCheckNameToEnum[it.key()];
-        nlohmann::json hintInfo = it.value();
-        std::string hintText = hintInfo["hint"].get<std::string>();
-        HintType hintType = mSpoilerfileHintTypeNameToEnum[hintInfo["type"].get<std::string>()];
-        RandomizerCheck hintedLocation = hintInfo.contains("location") ? StaticData::SpoilerfileCheckNameToEnum[hintInfo["location"]] : RC_UNKNOWN_CHECK;
-        RandomizerArea hintedArea = hintInfo.contains("area") ? mSpoilerfileAreaNameToEnum[hintInfo["area"].get<std::string>()] : RA_NONE;
-        std::string distribution = hintInfo["distribution"].get<std::string>();
-        AddHint(static_cast<RandomizerHintKey>(gossipStoneLoc - RC_COLOSSUS_GOSSIP_STONE + 1), Text(hintText), hintedLocation, hintType, distribution, hintedArea);
+    for (auto hintData : spoilerFileJson["Static Hints"].items()){
+        RandomizerHint hint = (RandomizerHint)StaticData::hintNameToEnum[hintData.key()];
+        AddHint(hint, Hint(hint, hintData.value()));
     }
+    CreateStaticHints();
 }
 
 std::shared_ptr<Settings> Context::GetSettings() {
@@ -554,6 +434,10 @@ TrialInfo* Context::GetTrial(size_t key) const {
     return mTrials->GetTrial(static_cast<TrialKey>(key));
 }
 
+TrialInfo* Context::GetTrial(TrialKey key) const {
+    return mTrials->GetTrial(key);
+}
+
 Sprite* Context::GetSeedTexture(const uint8_t index) {
     return &gSeedTextures[index];
 }
diff --git a/soh/soh/Enhancements/randomizer/context.h b/soh/soh/Enhancements/randomizer/context.h
index 06dd44628..2deb4e365 100644
--- a/soh/soh/Enhancements/randomizer/context.h
+++ b/soh/soh/Enhancements/randomizer/context.h
@@ -7,6 +7,7 @@
 #include "3drando/text.hpp"
 #include "hint.h"
 #include "fishsanity.h"
+#include "trial.h"
 
 #include <memory>
 #include <array>
@@ -36,9 +37,8 @@ class Context {
     static std::shared_ptr<Context> CreateInstance();
     static std::shared_ptr<Context> GetInstance();
     void InitStaticData();
-    Hint* GetHint(RandomizerHintKey hintKey);
-    void AddHint(RandomizerHintKey hintId, const Text& text, RandomizerCheck hintedLocation, HintType hintType, std::string distributionName,
-                 RandomizerArea hintedArea = RA_NONE);
+    Hint* GetHint(RandomizerHint hintKey);
+    void AddHint(const RandomizerHint hintId, const Hint hint);
     ItemLocation* GetItemLocation(RandomizerCheck locKey);
     ItemLocation* GetItemLocation(size_t locKey);
     ItemOverride& GetItemOverride(RandomizerCheck locKey);
@@ -73,6 +73,7 @@ class Context {
     void ResetLogic();
     std::shared_ptr<Trials> GetTrials();
     TrialInfo* GetTrial(size_t key) const;
+    TrialInfo* GetTrial(TrialKey key) const;
     static Sprite* GetSeedTexture(uint8_t index);
     Option& GetOption(RandomizerSettingKey key) const;
     TrickOption& GetTrickOption(RandomizerTrick key) const;
@@ -80,6 +81,7 @@ class Context {
     void ParseSpoiler(const char* spoilerFileName, bool plandoMode);
     void ParseHashIconIndexesJson(nlohmann::json spoilerFileJson);
     void ParseItemLocationsJson(nlohmann::json spoilerFileJson);
+    void WriteHintJson(nlohmann::ordered_json& spoilerFileJson);
     void ParseHintJson(nlohmann::json spoilerFileJson);
     std::map<RandomizerCheck, ItemOverride> overrides = {};
     std::vector<std::vector<RandomizerCheck>> playthroughLocations = {};
@@ -93,18 +95,7 @@ class Context {
 
   private:
     static std::weak_ptr<Context> mContext;
-    std::unordered_map<std::string, HintType> mSpoilerfileHintTypeNameToEnum;
-    std::unordered_map<std::string, RandomizerArea> mSpoilerfileAreaNameToEnum;
     std::array<Hint, RH_MAX> hintTable = {};
-    RandomizerCheck mEmeraldLoc = RC_UNKNOWN_CHECK;
-    RandomizerCheck mRubyLoc = RC_UNKNOWN_CHECK;
-    RandomizerCheck mSapphireLoc = RC_UNKNOWN_CHECK;
-    RandomizerCheck mForestMedallionLoc = RC_UNKNOWN_CHECK;
-    RandomizerCheck mFireMedallionLoc = RC_UNKNOWN_CHECK;
-    RandomizerCheck mWaterMedallionLoc = RC_UNKNOWN_CHECK;
-    RandomizerCheck mShadowMedallionLoc = RC_UNKNOWN_CHECK;
-    RandomizerCheck mSpiritMedallionLoc = RC_UNKNOWN_CHECK;
-    RandomizerCheck mLightMedallionLoc = RC_UNKNOWN_CHECK;
     std::array<ItemLocation, RC_MAX> itemLocationTable = {};
     std::shared_ptr<Settings> mSettings;
     std::shared_ptr<EntranceShuffler> mEntranceShuffler;
diff --git a/soh/soh/Enhancements/randomizer/hint.cpp b/soh/soh/Enhancements/randomizer/hint.cpp
index ff9dfdf81..7d62d29c7 100644
--- a/soh/soh/Enhancements/randomizer/hint.cpp
+++ b/soh/soh/Enhancements/randomizer/hint.cpp
@@ -1,56 +1,729 @@
 #include "hint.h"
+#include "map"
+#include "string"
+#include "context.h"
+#include <spdlog/spdlog.h>
+#include "static_data.h"
 
 namespace Rando {
-Hint::Hint() : text(std::move(Text())) {}
-Hint::Hint(Text text_): text(std::move(text_)) {}
-Hint::Hint(Text text_, RandomizerCheck hintedLocation_, HintType hintType_, std::string distributionName_, RandomizerArea hintedArea_)
-    : text(std::move(text_)), hintedLocation(hintedLocation_), hintType(hintType_),
-      hintedArea(hintedArea_), distribution(std::move(distributionName_)) {
+Hint::Hint(){}
+
+Hint::Hint(RandomizerHint ownKey_, 
+           HintType hintType_,
+           std::string distribution_,
+           std::vector<RandomizerHintTextKey> hintKeys_,
+           std::vector<RandomizerCheck> locations_,
+           std::vector<RandomizerArea> areas_,
+           std::vector<TrialKey> trials_)
+    : ownKey(ownKey_), hintType(hintType_), distribution(std::move(distribution_)), hintKeys(hintKeys_), locations(locations_), areas(areas_), trials(trials_) {
+  FillGapsInData();
+  SetLocationsAsHinted();
+  NamesChosen();
+  enabled = true;
 }
 
-const Text& Hint::GetText() const {
-    return text;
+Hint::Hint(RandomizerHint ownKey_, 
+           HintType hintType_,
+           std::vector<RandomizerHintTextKey> hintKeys_,
+           std::vector<RandomizerCheck> locations_,
+           std::vector<RandomizerArea> areas_,
+           std::vector<TrialKey> trials_,
+           bool yourPocket_,
+           int num_)
+    : ownKey(ownKey_), hintType(hintType_), hintKeys(hintKeys_), locations(locations_), areas(areas_), trials(trials_), yourPocket(yourPocket_), num(num_) {
+  FillGapsInData();
+  SetLocationsAsHinted();
+  NamesChosen();
+  enabled = true;
 }
 
-void Hint::SetHintedLocation(RandomizerCheck location) {
-    hintedLocation = location;
+Hint::Hint(RandomizerHint ownKey_, std::vector<CustomMessage> messages_) 
+: ownKey(ownKey_), messages(messages_){
+  hintType = HINT_TYPE_MESSAGE;
+  enabled = true;
 }
 
-RandomizerCheck Hint::GetHintedLocation() {
-    return hintedLocation;
+Hint::Hint(RandomizerHint ownKey_, nlohmann::json json_){
+  ownKey = ownKey_;
+  if (json_.contains("enabled") && !json_["enabled"].get<bool>()){
+    return;
+  }
+  enabled = true;
+
+  if (json_.contains("type")){
+    hintType = (HintType)StaticData::hintTypeNameToEnum[json_["type"].get<std::string>()];
+  }
+
+  if (hintType == HINT_TYPE_MESSAGE){
+    if (json_.contains("messages")){
+      for (auto message: json_["messages"]){
+        messages.push_back(CustomMessage(message.get<std::string>()));
+      }
+    } else if (json_.contains("message")){
+      messages.push_back(CustomMessage(json_["message"].get<std::string>()));
+    }
+  }
+  
+  if (json_.contains("distribution")){
+    distribution = json_["distribution"].get<std::string>();
+  }
+
+  if (json_.contains("locations")){
+    for (auto loc: json_["locations"]){
+      locations.push_back(StaticData::locationNameToEnum[loc.get<std::string>()]);
+    }
+  } else if (json_.contains("location")){
+    locations.push_back(StaticData::locationNameToEnum[json_["location"].get<std::string>()]);
+  }
+
+  if (json_.contains("itemNamesChosen")){
+    for (auto name: json_["itemNamesChosen"]){
+      itemNamesChosen.push_back(name.get<uint8_t>());
+    }
+  } else if (json_.contains("itemNameChosen")){
+    itemNamesChosen.push_back(json_["itemNameChosen"].get<uint8_t>());
+  }
+
+  if (json_.contains("areas")){
+    for (auto area: json_["areas"]){
+      areas.push_back((RandomizerArea)Rando::StaticData::areaNameToEnum[area]);
+    }
+  } else if (json_.contains("area")){
+    areas.push_back((RandomizerArea)Rando::StaticData::areaNameToEnum[json_["area"]]);
+  }
+
+  if (json_.contains("areaNamesChosen")){
+    for (auto name: json_["areaNamesChosen"]){
+      areaNamesChosen.push_back(name.get<uint8_t>());
+    }
+  } else if (json_.contains("areaNameChosen")){
+    areaNamesChosen.push_back(json_["areaNameChosen"].get<uint8_t>());
+  }
+
+  if (json_.contains("trials")){
+    for (auto trial: json_["trials"]){
+      trials.push_back((TrialKey)Rando::StaticData::trialNameToEnum[trial]);
+    }
+  } else if (json_.contains("trial")){
+    trials.push_back((TrialKey)Rando::StaticData::trialNameToEnum[json_["trial"]]);
+  }
+
+  if (json_.contains("hintKeys")){
+    for (auto hintKey: json_["hintKeys"]){
+      hintKeys.push_back((RandomizerHintTextKey)hintKey.get<uint32_t>());
+    }
+  } else if (json_.contains("hintKey")){
+    hintKeys.push_back((RandomizerHintTextKey)json_["hintKey"].get<uint32_t>());
+  }
+
+  if (json_.contains("hintTextsChosen")){
+    for (auto name: json_["hintTextsChosen"]){
+      hintTextsChosen.push_back(name.get<uint8_t>());
+    }
+  } else if (json_.contains("hintTextChosen")){
+    hintTextsChosen.push_back(json_["hintTextChosen"].get<uint8_t>());
+  }
+
+  if (json_.contains("num")){
+    num = json_["num"].get<int>();
+  }
+
+  FillGapsInData();
+  SetLocationsAsHinted();
+}
+
+void Hint::FillGapsInData(){
+  auto ctx = Rando::Context::GetInstance();
+  if (locations.size() == 0 && StaticData::staticHintInfoMap.contains(ownKey)){
+    locations = StaticData::staticHintInfoMap[ownKey].targetChecks;
+  }
+  bool fillAreas = true;
+  bool fillItems = true;
+  if (areas.size() > 0){
+    fillAreas = false;
+  }
+  if (items.size() > 0){
+    fillItems = false;
+  }
+  for(uint8_t c = 0; c < locations.size(); c++){
+    if (fillAreas){
+      areas.push_back(ctx->GetItemLocation(locations[c])->GetArea());
+    }
+    if (fillItems){
+      items.push_back(ctx->GetItemLocation(locations[c])->GetPlacedRandomizerGet());
+    }
+  }
+}
+
+void Hint::SetLocationsAsHinted() const {
+  auto ctx = Rando::Context::GetInstance();
+  for (uint8_t count = 0; count < locations.size(); count++){
+      ctx->GetItemLocation(locations[count])->AddHintedBy(ownKey);
+  }
+}
+
+uint8_t GetRandomHintTextEntry(const HintText hintText){
+  auto ctx = Rando::Context::GetInstance();
+  uint8_t size = 0;
+  if (ctx->GetOption(RSK_HINT_CLARITY).Is(RO_HINT_CLARITY_AMBIGUOUS)){
+    size = hintText.GetAmbiguousSize();
+  } else if (ctx->GetOption(RSK_HINT_CLARITY).Is(RO_HINT_CLARITY_OBSCURE)){
+    size = hintText.GetObscureSize();
+  }
+  if (size > 0){
+    return Random(0, size);
+  }
+  return 0;
+}
+
+void Hint::NamesChosen(){
+  auto ctx = Rando::Context::GetInstance();
+  std::vector<uint8_t> namesTemp = {};
+  bool saveNames = false;
+  uint8_t numMessages = GetNumberOfMessages();
+  for (uint8_t c = 0; c < numMessages; c++){
+    uint8_t selection = GetRandomHintTextEntry(GetHintText(c));
+    if (selection > 0){
+      saveNames = true;
+    }
+    namesTemp.push_back(selection);
+  }
+  if (saveNames) {
+    hintTextsChosen = namesTemp;
+  }
+
+  if (hintType == HINT_TYPE_ITEM || hintType == HINT_TYPE_ITEM_AREA || hintType == HINT_TYPE_MERCHANT){
+    bool mysterious = hintType == HINT_TYPE_MERCHANT && ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ON_NO_HINT);
+    for(uint8_t c = 0; c < locations.size(); c++){
+      namesTemp = {};
+      saveNames = false;
+      uint8_t selection = GetRandomHintTextEntry(GetItemHintText(c, mysterious));
+      if (selection > 0){
+        saveNames = true;
+      }
+      namesTemp.push_back(selection);
+    }
+    if (saveNames) {
+      itemNamesChosen = namesTemp;
+    }
+  }
+
+  if (hintType == HINT_TYPE_FOOLISH || hintType == HINT_TYPE_ITEM_AREA || hintType == HINT_TYPE_WOTH ||
+      hintType == HINT_TYPE_ALTAR_CHILD || hintType == HINT_TYPE_ALTAR_ADULT){
+    namesTemp = {};
+    saveNames = false;
+    for(uint8_t c = 0; c < areas.size(); c++){
+      uint8_t selection = GetRandomHintTextEntry(GetAreaHintText(c));
+      if (selection > 0){
+        saveNames = true;
+      }
+      namesTemp.push_back(selection);
+    }
+    if (saveNames) {
+      areaNamesChosen = namesTemp;
+    }
+  }
+}
+
+uint8_t Hint::GetNumberOfMessages() const {
+  size_t numMessages = std::max(messages.size(), hintKeys.size());
+  if (StaticData::staticHintInfoMap.contains(ownKey)){
+    numMessages = std::max(StaticData::staticHintInfoMap[ownKey].hintKeys.size(), numMessages);
+  }
+  if (numMessages == 0){
+      numMessages = 1; //RANDOTODO make std::max actually fucking work for 3 arguments
+  }
+  return numMessages;
+}
+
+const std::vector<std::string> Hint::GetAllMessageStrings(MessageFormat format) const {
+  std::vector<std::string> hintMessages = {};
+  uint8_t numMessages = GetNumberOfMessages();
+  for (int c = 0; c < numMessages; c++){
+    hintMessages.push_back(GetHintMessage(format, c).GetForCurrentLanguage(format));
+  }
+  return hintMessages;
+}
+
+const HintText Hint::GetHintText(uint8_t id) const {
+  auto ctx = Rando::Context::GetInstance();
+  if (hintKeys.size() > id){
+    return StaticData::hintTextTable[hintKeys[id]];
+  }
+// If a static hint, load default from staticHintInfoMap
+  if (StaticData::staticHintInfoMap.contains(ownKey) && StaticData::staticHintInfoMap[ownKey].hintKeys.size() > id){
+    return StaticData::hintTextTable[StaticData::staticHintInfoMap[ownKey].hintKeys[id]];
+  }
+
+  switch (hintType){
+    case HINT_TYPE_HINT_KEY:
+      return StaticData::hintTextTable[0]; 
+      break;
+    case HINT_TYPE_TRIAL:
+      if (ctx->GetTrial(trials[0])->IsRequired()) {
+        return StaticData::hintTextTable[RHT_TRIAL_ON];
+      } else {
+        return StaticData::hintTextTable[RHT_TRIAL_OFF];
+      }
+    case HINT_TYPE_WOTH:
+      return StaticData::hintTextTable[RHT_WAY_OF_THE_HERO];
+    case HINT_TYPE_FOOLISH:
+      return StaticData::hintTextTable[RHT_FOOLISH];
+    case HINT_TYPE_ITEM:
+      if (locations.size() > 0) {
+        return *StaticData::GetLocation(locations[0])->GetHint();
+      } else {
+        return CustomMessage("ERROR: ITEM HINT WITH NO LOCATIONS OR HINT KEY");
+      }
+    case HINT_TYPE_ITEM_AREA:
+      if (locations.size() > 0) {
+        if (StaticData::GetLocation(locations[0])->IsDungeon()) {
+          return StaticData::hintTextTable[RHT_HOARDS];
+        } else {
+          return StaticData::hintTextTable[RHT_CAN_BE_FOUND_AT];
+        }
+      } else {
+        return CustomMessage("ERROR: ITEM AREA HINT WITH NO LOCATION"); //RANDOTODO get isDungeon from area?
+      }
+    default:
+      return CustomMessage("ERROR: NO HINTKEY PROVIDED AND HINT TYPE HAS NO DEFAULT");
+  }
+}
+
+const CustomMessage Hint::GetHintMessage(MessageFormat format, uint8_t id) const {
+  auto ctx = Rando::Context::GetInstance();
+  CustomMessage hintText = CustomMessage("");
+
+  uint8_t chosenMessage = 0;
+  if (hintTextsChosen.size() > id){
+    chosenMessage = id;
+  }
+
+  if (hintType == HINT_TYPE_MESSAGE){
+    if (id < messages.size()){
+      hintText = messages[id];
+    }
+  } else if (hintType == HINT_TYPE_ALTAR_CHILD){
+    if (ctx->GetOption(RSK_TOT_ALTAR_HINT)){
+      hintText = StaticData::hintTextTable[RHT_CHILD_ALTAR_STONES].GetHintMessage();
+    }
+    if (ctx->GetOption(RSK_DOOR_OF_TIME).Is(RO_DOOROFTIME_OPEN)) {
+        hintText += CustomMessage(StaticData::hintTextTable[RHT_CHILD_ALTAR_TEXT_END_DOTOPEN].GetHintMessage());
+    } else if (ctx->GetOption(RSK_DOOR_OF_TIME).Is(RO_DOOROFTIME_SONGONLY)) {
+        hintText += CustomMessage(StaticData::hintTextTable[RHT_CHILD_ALTAR_TEXT_END_DOTSONGONLY].GetHintMessage());
+    } else {
+        hintText += CustomMessage(StaticData::hintTextTable[RHT_CHILD_ALTAR_TEXT_END_DOTCLOSED].GetHintMessage());
+    }
+  } else if (hintType == HINT_TYPE_ALTAR_ADULT){
+    if (ctx->GetOption(RSK_TOT_ALTAR_HINT)){
+      hintText = StaticData::hintTextTable[RHT_ADULT_ALTAR_MEDALLIONS].GetHintMessage();
+    }
+    hintText += GetBridgeReqsText() + GetGanonBossKeyText() + StaticData::hintTextTable[RHT_ADULT_ALTAR_TEXT_END].GetHintMessage();
+  } else {
+    hintText = GetHintText(id).GetHintMessage(chosenMessage);
+  }
+
+  std::vector<CustomMessage> toInsert = {};
+
+  switch (hintType){
+    case HINT_TYPE_ITEM:{
+      //if we write items
+      for(uint8_t b = 0; b < locations.size(); b++){
+        toInsert.push_back(GetItemName(b)); 
+      }
+      break;}
+    case HINT_TYPE_MERCHANT:{
+        //if we write items, but need to adjust for merchants
+        bool mysterious = hintType == HINT_TYPE_MERCHANT && ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ON_NO_HINT);
+        for(uint8_t b = 0; b < locations.size(); b++){
+          toInsert.push_back(GetItemName(b, mysterious));
+        }
+        break;}
+    case HINT_TYPE_TRIAL:{
+      //If we write trials
+      for(uint8_t b = 0; b < trials.size(); b++){
+        toInsert.push_back(ctx->GetTrial(trials[b])->GetName());
+      }
+      break;}
+    case HINT_TYPE_ITEM_AREA:{
+      //If we write items and areas
+      for(uint8_t b = 0; b < items.size(); b++){
+        toInsert.push_back(GetItemName(b));
+        toInsert.push_back(GetAreaName(b));
+      }
+      break;}
+    case HINT_TYPE_ALTAR_CHILD:
+    case HINT_TYPE_ALTAR_ADULT:
+    case HINT_TYPE_AREA:
+    case HINT_TYPE_WOTH:
+    case HINT_TYPE_FOOLISH:{
+      //If we write areas
+      for(uint8_t b = 0; b < areas.size(); b++){
+        toInsert.push_back(GetAreaName(b));
+      }
+      break;}
+    default:
+      break;
+  }
+
+  hintText.InsertNames(toInsert);
+
+  if (num != 0){
+    hintText.InsertNumber(num);
+  }
+
+  if (format == MF_FORMATTED){
+    hintText.Format();
+  } else if (format == MF_AUTO_FORMAT){
+    hintText.AutoFormat();
+  } else if (format == MF_CLEAN){
+    hintText.Clean();
+  }
+
+  return hintText;
+}
+
+oJson Hint::toJSON() {
+  auto ctx = Rando::Context::GetInstance();
+  nlohmann::ordered_json log = {};
+  if (enabled){
+    log["type"] = StaticData::hintTypeNames[hintType].GetForCurrentLanguage(MF_CLEAN);
+    
+    std::vector<std::string> hintMessages = GetAllMessageStrings(MF_CLEAN);
+    if (hintMessages.size() == 1){
+      log["message"] = hintMessages[0];
+    } else if (hintMessages.size() > 1){
+      log["messages"] = hintMessages;
+    }
+
+    if (distribution != ""){
+      log["distribution"] = distribution;
+    }
+    
+    if (hintType != HINT_TYPE_FOOLISH){
+      if (!(StaticData::staticHintInfoMap.contains(ownKey) && 
+          StaticData::staticHintInfoMap[ownKey].targetChecks.size() > 0)){
+        if (locations.size() == 1){
+          log["location"] = StaticData::GetLocation(locations[0])->GetName();//RANDOTODO change to CustomMessage when VB is done;
+        } else if (locations.size() > 1){
+          //If we have defaults, no need to write more
+          std::vector<std::string> locStrings = {};
+          for (size_t c = 0; c < locations.size(); c++){
+            locStrings.push_back(StaticData::GetLocation(locations[c])->GetName());//RANDOTODO change to CustomMessage when VB is done
+          }
+          log["locations"] = locStrings;
+        }
+      }
+      
+      if (!(StaticData::staticHintInfoMap.contains(ownKey) &&
+          StaticData::staticHintInfoMap[ownKey].targetItems.size() > 0)){
+        if (items.size() == 1){
+          log["item"] = StaticData::GetItemTable()[items[0]].GetName().GetEnglish();//RANDOTODO change to CustomMessage;
+        } else if (items.size() > 1){
+          std::vector<std::string> itemStrings = {};
+          for (size_t c = 0; c < items.size(); c++){
+            itemStrings.push_back(StaticData::GetItemTable()[items[c]].GetName().GetEnglish());//RANDOTODO change to CustomMessage
+          }
+          log["items"] = itemStrings;
+        }
+      }
+
+      if (itemNamesChosen.size() == 1){
+        log["itemNameChosen"] = itemNamesChosen[0];
+      } else if (itemNamesChosen.size() > 1){
+        std::vector<uint8_t> nameNums = {};
+        for (size_t c = 0; c < itemNamesChosen.size(); c++){
+          nameNums.push_back(itemNamesChosen[c]);
+        }
+        log["itemNamesChosen"] = nameNums;
+      }
+    }
+    if (areas.size() == 1){
+      log["area"] = StaticData::hintTextTable[StaticData::areaNames[areas[0]]].GetClear().GetForCurrentLanguage(MF_CLEAN);
+    } else if (areas.size() > 0 && 
+          !(StaticData::staticHintInfoMap.contains(ownKey) && StaticData::staticHintInfoMap[ownKey].targetChecks.size() > 0)){
+      // If we got locations from defaults, areas are derived from them and don't need logging
+      std::vector<std::string> areaStrings = {};
+      for (size_t c = 0; c < areas.size(); c++){
+        areaStrings.push_back(StaticData::hintTextTable[StaticData::areaNames[areas[c]]].GetClear().GetForCurrentLanguage(MF_CLEAN));
+      }
+      log["areas"] = areaStrings;
+    }
+
+    if (areaNamesChosen.size() == 1){
+      log["areaNameChosen"] = areaNamesChosen[0];
+    } else if (areaNamesChosen.size() > 1){
+      std::vector<uint8_t> nameNums = {};
+      for (size_t c = 0; c < areaNamesChosen.size(); c++){
+        nameNums.push_back(areaNamesChosen[c]);
+      }
+      log["areaNamesChosen"] = nameNums;
+    }
+
+    if (trials.size() == 1){
+      log["trial"] = ctx->GetTrial(trials[0])->GetName().GetForCurrentLanguage(MF_CLEAN);
+    } else if (trials.size() > 0){
+      std::vector<std::string> trialStrings = {};
+      for (size_t c = 0; c < trials.size(); c++){
+        trialStrings.push_back(ctx->GetTrial(trials[c])->GetName().GetForCurrentLanguage(MF_CLEAN));
+      }
+      log["trials"] = trialStrings;
+    }
+
+    if (hintKeys.size() == 1){
+      log["hintKey"] = hintKeys[0];
+    } else if (hintKeys.size() > 1){
+      std::vector<uint32_t> hintKeyNums = {};
+      for (size_t c = 0; c < hintKeys.size(); c++){
+        hintKeyNums.push_back(hintKeys[c]);
+      }
+      log["hintKeys"] = hintKeyNums;
+    }
+
+    if (hintTextsChosen.size() == 1){
+      log["hintTextChosen"] = hintTextsChosen[0];
+    } else if (hintTextsChosen.size() > 1){
+      std::vector<uint8_t> nameNums = {};
+      for (size_t c = 0; c < hintTextsChosen.size(); c++){
+        nameNums.push_back(hintTextsChosen[c]);
+      }
+      log["hintTextsChosen"] = nameNums;
+    }
+
+    if (num != 0){
+      log["num"] = num;
+    }
+
+  }
+  return log;
+}
+
+void Hint::logHint(oJson& jsonData){
+  auto ctx = Rando::Context::GetInstance();
+  std::string logMap = "Static Hints";
+  bool staticHint = true;
+  if (ownKey < RH_GANONDORF_HINT){
+    logMap = "Gossip Stone Hints";
+    staticHint = false;
+  }
+  if (enabled &&
+      (!(staticHint && (hintType == HINT_TYPE_ITEM || hintType == HINT_TYPE_MERCHANT) && ctx->GetOption(RSK_HINT_CLARITY).Is(RO_HINT_CLARITY_CLEAR)))){
+      //skip if not enabled or if a static hint with no possible variance
+    jsonData[logMap][Rando::StaticData::hintNames[ownKey].GetForCurrentLanguage(MF_CLEAN)] = toJSON();
+  }
+}
+
+const HintText Hint::GetItemHintText(uint8_t slot, bool mysterious) const {
+  //RANDOTODO make unreliant on locations, or make Hint accept ItemLocation
+  auto ctx = Rando::Context::GetInstance();
+  RandomizerCheck hintedCheck = locations[slot];
+  RandomizerGet targetRG = ctx->GetItemLocation(hintedCheck)->GetPlacedRandomizerGet();
+  if (mysterious){
+    return StaticData::hintTextTable[RHT_MYSTERIOUS_ITEM];
+  } else if (!ctx->GetOption(RSK_HINT_CLARITY).Is(RO_HINT_CLARITY_AMBIGUOUS) && targetRG == RG_ICE_TRAP) { //RANDOTODO store in item hint instead of item
+      return HintText(CustomMessage({ctx->overrides[hintedCheck].GetTrickName()}));
+  } else {
+    return ctx->GetItemLocation(hintedCheck)->GetPlacedItem().GetHint();
+  }
+}
+
+const HintText Hint::GetAreaHintText(uint8_t slot) const { 
+  CustomMessage areaText;
+  if (yourPocket && (areas[slot] == RA_LINKS_POCKET || areas[slot] == RA_NONE)){
+    return StaticData::hintTextTable[RHT_YOUR_POCKET];
+  } else {
+    return StaticData::hintTextTable[Rando::StaticData::areaNames[areas[slot]]];
+  }
+}
+
+
+const CustomMessage Hint::GetItemName(uint8_t slot, bool mysterious) const { 
+  uint8_t nameNum = 0;
+  if (itemNamesChosen.size() > slot){
+    nameNum = itemNamesChosen[slot];
+  }
+  return GetItemHintText(slot, mysterious).GetHintMessage(nameNum);
+}
+
+const CustomMessage Hint::GetAreaName(uint8_t slot) const { 
+  uint8_t nameNum = 0;
+  if (areaNamesChosen.size() > slot){
+    nameNum = areaNamesChosen[slot];
+  }
+  return GetAreaHintText(slot).GetHintMessage(nameNum);
+}
+
+
+CustomMessage Hint::GetBridgeReqsText() {
+  auto ctx = Rando::Context::GetInstance();
+  CustomMessage bridgeMessage;
+
+  if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_ALWAYS_OPEN)) {
+    return StaticData::hintTextTable[RHT_BRIDGE_OPEN_HINT].GetHintMessage();
+  } 
+  else if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_VANILLA)) {
+    return StaticData::hintTextTable[RHT_BRIDGE_VANILLA_HINT].GetHintMessage();
+  } 
+  else if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_STONES)) {
+    bridgeMessage = StaticData::hintTextTable[RHT_BRIDGE_STONES_HINT].GetHintMessage();
+    bridgeMessage.InsertNumber(ctx->GetOption(RSK_RAINBOW_BRIDGE_STONE_COUNT).Value<uint8_t>());
+  } 
+  else if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_MEDALLIONS)) {
+    bridgeMessage = StaticData::hintTextTable[RHT_BRIDGE_MEDALLIONS_HINT].GetHintMessage();
+    bridgeMessage.InsertNumber(ctx->GetOption(RSK_RAINBOW_BRIDGE_MEDALLION_COUNT).Value<uint8_t>());
+  } 
+  else if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_DUNGEON_REWARDS)) {
+    bridgeMessage = StaticData::hintTextTable[RHT_BRIDGE_REWARDS_HINT].GetHintMessage();
+    bridgeMessage.InsertNumber(ctx->GetOption(RSK_RAINBOW_BRIDGE_REWARD_COUNT).Value<uint8_t>());
+  } 
+  else if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_DUNGEONS)) {
+    bridgeMessage = StaticData::hintTextTable[RHT_BRIDGE_DUNGEONS_HINT].GetHintMessage();
+    bridgeMessage.InsertNumber(ctx->GetOption(RSK_RAINBOW_BRIDGE_DUNGEON_COUNT).Value<uint8_t>());
+  } 
+  else if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_TOKENS)) {
+    bridgeMessage = StaticData::hintTextTable[RHT_BRIDGE_TOKENS_HINT].GetHintMessage();
+    bridgeMessage.InsertNumber(ctx->GetOption(RSK_RAINBOW_BRIDGE_TOKEN_COUNT).Value<uint8_t>());
+  } 
+  else if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_GREG)) {
+    return  StaticData::hintTextTable[RHT_BRIDGE_GREG_HINT].GetHintMessage();
+  }
+  return bridgeMessage;
+}
+
+CustomMessage Hint::GetGanonBossKeyText() {
+  auto ctx = Rando::Context::GetInstance();
+  CustomMessage ganonBossKeyMessage;
+
+  if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_STARTWITH)) {
+    return StaticData::hintTextTable[RHT_GANON_BK_START_WITH_HINT].GetHintMessage();
+  } 
+  else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_VANILLA)) {
+    return StaticData::hintTextTable[RHT_GANON_BK_VANILLA_HINT].GetHintMessage();
+  } 
+  else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_OWN_DUNGEON)) {
+    return StaticData::hintTextTable[RHT_GANON_BK_OWN_DUNGEON_HINT].GetHintMessage();
+  } 
+  else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_ANY_DUNGEON)) {
+    return StaticData::hintTextTable[RHT_GANON_BK_ANY_DUNGEON_HINT].GetHintMessage();
+  } 
+  else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_OVERWORLD)) {
+    return StaticData::hintTextTable[RHT_GANON_BK_OVERWORLD_HINT].GetHintMessage();
+  } 
+  else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_ANYWHERE)) {
+    return StaticData::hintTextTable[RHT_GANON_BK_ANYWHERE_HINT].GetHintMessage();
+  } 
+  else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_KAK_TOKENS)) {
+    return StaticData::hintTextTable[RHT_GANON_BK_SKULLTULA_HINT].GetHintMessage();
+  } 
+  else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_VANILLA)) {
+    return StaticData::hintTextTable[RHT_LACS_VANILLA_HINT].GetHintMessage();
+  } 
+  else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_STONES)) {
+    ganonBossKeyMessage = StaticData::hintTextTable[RHT_LACS_STONES_HINT].GetHintMessage();
+    ganonBossKeyMessage.InsertNumber(ctx->GetOption(RSK_LACS_STONE_COUNT).Value<uint8_t>());
+  } 
+  else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_MEDALLIONS)) {
+    ganonBossKeyMessage = StaticData::hintTextTable[RHT_LACS_MEDALLIONS_HINT].GetHintMessage();
+    ganonBossKeyMessage.InsertNumber(ctx->GetOption(RSK_LACS_MEDALLION_COUNT).Value<uint8_t>());
+  }
+  else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_REWARDS)) {
+    ganonBossKeyMessage = StaticData::hintTextTable[RHT_LACS_REWARDS_HINT].GetHintMessage();
+    ganonBossKeyMessage.InsertNumber(ctx->GetOption(RSK_LACS_REWARD_COUNT).Value<uint8_t>());
+  } 
+  else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_DUNGEONS)) {
+    ganonBossKeyMessage = StaticData::hintTextTable[RHT_LACS_DUNGEONS_HINT].GetHintMessage();
+    ganonBossKeyMessage.InsertNumber(ctx->GetOption(RSK_LACS_DUNGEON_COUNT).Value<uint8_t>());
+  } 
+  else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_TOKENS)) {
+    ganonBossKeyMessage = StaticData::hintTextTable[RHT_LACS_TOKENS_HINT].GetHintMessage();
+    ganonBossKeyMessage.InsertNumber(ctx->GetOption(RSK_LACS_TOKEN_COUNT).Value<uint8_t>());
+  }
+  else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_TRIFORCE_HUNT)) {
+    return StaticData::hintTextTable[RHT_GANON_BK_TRIFORCE_HINT].GetHintMessage();
+  }
+  return ganonBossKeyMessage;
+}
+
+
+void Hint::AddHintedLocation(RandomizerCheck location) {
+    locations.push_back(location);
+}
+
+std::vector<RandomizerCheck> Hint::GetHintedLocations() const {
+    return locations;
 }
 
 void Hint::SetHintType(HintType type) {
     hintType = type;
 }
 
-HintType Hint::GetHintType() {
+HintType Hint::GetHintType() const {
     return hintType;
 }
 
-void Hint::SetHintedArea(RandomizerArea area) {
-    hintedArea = area;
+void Hint::AddHintedArea(RandomizerArea area) {
+    areas.push_back(area);
 }
 
-RandomizerArea Hint::GetHintedArea() {
-    return hintedArea;
+std::vector<RandomizerArea> Hint::GetHintedAreas() const {
+    return areas;
 }
 
 void Hint::SetDistribution(std::string distributionName) {
     distribution = distributionName;
 }
 
-const std::string& Hint::GetDistribution() {
+const std::string& Hint::GetDistribution() const {
     return distribution;
 }
 
+bool Hint::IsEnabled() const{
+  return enabled;
+}
+
+std::vector<RandomizerHintTextKey> Hint::GetHintTextKeys() const{
+  return hintKeys;
+}
+
+std::vector<RandomizerGet> Hint::GetHintedItems() const{
+  return items;
+}
+
+std::vector<uint8_t> Hint::GetItemNamesChosen() const{
+  return itemNamesChosen;
+}
+
+std::vector<uint8_t> Hint::GetHintTextsChosen() const{
+  return hintTextsChosen;
+}
+std::vector<uint8_t> Hint::GetAreaTextsChosen() const{
+  return areaNamesChosen;
+}
+
+std::vector<TrialKey> Hint::GetHintedTrials() const{
+  return trials;
+}
+
+int Hint::GetNum(){
+  return num;
+}
 
 void Hint::ResetVariables() {
-    hintedLocation = RC_UNKNOWN_CHECK;
-    text = Text{};
-    distribution = "";
-    hintedArea = RA_NONE;
-    hintType = HINT_TYPE_STATIC;
-    addedToPool = false;
+  ownKey = RH_NONE;
+  num = 0;
+  yourPocket = false;
+  messages = {};
+  hintKeys = {};
+  locations = {};
+  items = {};
+  trials = {};
+  hintType = HINT_TYPE_HINT_KEY;
+  areas = {};
+  distribution = "";
+  enabled = false;
+  itemNamesChosen = {};
+  hintTextsChosen = {};
+  areaNamesChosen = {};
 }
+
 }
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/hint.h b/soh/soh/Enhancements/randomizer/hint.h
index 4b76cd691..dc626ebf9 100644
--- a/soh/soh/Enhancements/randomizer/hint.h
+++ b/soh/soh/Enhancements/randomizer/hint.h
@@ -1,33 +1,82 @@
 #pragma once
 
 #include "3drando/text.hpp"
+#include "3drando/hints.hpp"
+#include "../custom-message/CustomMessageManager.h"
 #include "randomizerTypes.h"
+#include <vector>
+#include "nlohmann/json.hpp"
+using oJson = nlohmann::ordered_json;
 
 namespace Rando {
 class Hint {
-    public:
-    Hint();
-    Hint(Text text_);
-    Hint(Text text_, RandomizerCheck hintedLocation_, HintType hintType_, std::string distributionName_, RandomizerArea hintedArea_);
-    const Text& GetText() const;
-    RandomizerCheck GetHintedLocation();
-    void SetHintedLocation (RandomizerCheck location);
-    HintType GetHintType();
-    void SetHintType (HintType type);
-    RandomizerArea GetHintedArea();
-    void SetHintedArea (RandomizerArea area);
-    const std::string& GetDistribution();
-    void SetDistribution (std::string distribution);
-    void ResetVariables();
-    bool IsAddedToPool();
-    void AddToPool();
+     public:
+     Hint();
+     Hint(RandomizerHint ownKey_, 
+          HintType hintType_,
+          std::string distributionName_,
+          std::vector<RandomizerHintTextKey> hintKeys_,
+          std::vector<RandomizerCheck> locations_,
+          std::vector<RandomizerArea> areas_ = {},
+          std::vector<TrialKey> trials_ = {});
+     Hint(RandomizerHint ownKey_, 
+          HintType hintType_,
+          std::vector<RandomizerHintTextKey> hintKeys_,
+          std::vector<RandomizerCheck> locations_ = {},
+          std::vector<RandomizerArea> areas_ = {},
+          std::vector<TrialKey> trials_ = {},
+          bool yourPocket_ = false, 
+          int num_ = 0);
+     Hint(RandomizerHint ownKey_, std::vector<CustomMessage> messages_);
+     Hint(RandomizerHint ownKey_, nlohmann::json json_);
+     void FillGapsInData();
+     void SetLocationsAsHinted() const;
+     void NamesChosen();
+     uint8_t GetNumberOfMessages() const;
+     const std::vector<std::string> GetAllMessageStrings(MessageFormat format = MF_AUTO_FORMAT) const ;
+     const CustomMessage GetHintMessage(MessageFormat format = MF_AUTO_FORMAT, uint8_t id = 0) const ;
+     const HintText GetHintText(uint8_t id = 0) const;
+     oJson toJSON();
+     void logHint(oJson& jsonData);
+     const HintText GetItemHintText(uint8_t slot, bool mysterious) const;
+     const HintText GetAreaHintText(uint8_t slot) const;
+     const CustomMessage GetItemName(uint8_t slot, bool mysterious = false) const;
+     const CustomMessage GetAreaName(uint8_t slot) const;
+     static CustomMessage GetBridgeReqsText();
+     static CustomMessage GetGanonBossKeyText();
+     void AddHintedLocation (RandomizerCheck location);
+     std::vector<RandomizerCheck> GetHintedLocations() const;
+     void SetHintType (HintType type);
+     HintType GetHintType() const;
+     void AddHintedArea (RandomizerArea area);
+     std::vector<RandomizerArea> GetHintedAreas() const;
+     void SetDistribution (std::string distribution);
+     const std::string& GetDistribution() const;
+     bool IsEnabled() const;
+     std::vector<RandomizerHintTextKey> GetHintTextKeys() const;
+     std::vector<RandomizerGet> GetHintedItems() const;
+     std::vector<uint8_t> GetItemNamesChosen() const;
+     std::vector<uint8_t> GetHintTextsChosen() const;
+     std::vector<uint8_t> GetAreaTextsChosen() const;
+     std::vector<TrialKey> GetHintedTrials() const;
+     int GetNum();
+     void ResetVariables();
 
-    private:
-    Text text = Text();
-    RandomizerCheck hintedLocation = RC_UNKNOWN_CHECK;
-    HintType hintType = HINT_TYPE_STATIC;
-    RandomizerArea hintedArea = RA_NONE;
-    std::string distribution = "";
-    bool addedToPool = false;
+     private:
+     RandomizerHint ownKey = RH_NONE;
+     HintType hintType = HINT_TYPE_HINT_KEY;
+     std::string distribution = "";
+     std::vector<RandomizerHintTextKey> hintKeys = {};
+     std::vector<RandomizerCheck> locations = {};
+     std::vector<RandomizerArea> areas = {};
+     std::vector<TrialKey> trials = {};
+     bool yourPocket = false;
+     int num = 0;
+     std::vector<CustomMessage> messages = {};
+     std::vector<RandomizerGet> items = {};
+     bool enabled = false;
+     std::vector<uint8_t> itemNamesChosen = {};
+     std::vector<uint8_t> hintTextsChosen = {};
+     std::vector<uint8_t> areaNamesChosen = {};
 };
 }
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/item.cpp b/soh/soh/Enhancements/randomizer/item.cpp
index 970d7a347..16396c072 100644
--- a/soh/soh/Enhancements/randomizer/item.cpp
+++ b/soh/soh/Enhancements/randomizer/item.cpp
@@ -378,7 +378,7 @@ RandomizerHintTextKey Item::GetHintKey() const {
 }
 
 const HintText& Item::GetHint() const {
-    return ::Hint(hintKey);
+    return StaticData::hintTextTable[hintKey];
 }
 
 bool Item::operator==(const Item& right) const {
diff --git a/soh/soh/Enhancements/randomizer/item.h b/soh/soh/Enhancements/randomizer/item.h
index d1610a7bc..8986d1146 100644
--- a/soh/soh/Enhancements/randomizer/item.h
+++ b/soh/soh/Enhancements/randomizer/item.h
@@ -5,9 +5,9 @@
 #include <memory>
 
 #include "3drando/text.hpp"
-#include "3drando/hint_list.hpp"
 #include "randomizerTypes.h"
 #include "soh/Enhancements/item-tables/ItemTableTypes.h"
+#include "3drando/hints.hpp"
 
 enum ItemType {
     ITEMTYPE_ITEM,
diff --git a/soh/soh/Enhancements/randomizer/item_list.cpp b/soh/soh/Enhancements/randomizer/item_list.cpp
index 4541550e8..2b6c42d34 100644
--- a/soh/soh/Enhancements/randomizer/item_list.cpp
+++ b/soh/soh/Enhancements/randomizer/item_list.cpp
@@ -8,7 +8,7 @@
 using namespace Rando;
 
 std::array<Item, RG_MAX> Rando::StaticData::itemTable;
-std::unordered_map<std::string, RandomizerGet> Rando::StaticData::SpoilerfileItemNameToEnum;
+std::unordered_map<std::string, RandomizerGet> Rando::StaticData::itemNameToEnum;
 
 void Rando::StaticData::InitItemTable() {
     auto logic = Context::GetInstance()->GetLogic();
@@ -322,15 +322,15 @@ void Rando::StaticData::InitItemTable() {
     itemTable[RG_MAGIC_DOUBLE] =                        Item(RG_MAGIC_DOUBLE,                     Text{ "Enhanced Magic Meter", "Jauge de Magie améliorée", "Verbesserte Magieanzeige" },                           ITEMTYPE_ITEM,              0x8A,               true,  &logic->ProgressiveMagic,    RHT_MAGIC_DOUBLE,           RG_MAGIC_DOUBLE,                OBJECT_GI_MAGICPOT,     GID_MAGIC_LARGE,    0xE8,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
     itemTable[RG_TRIFORCE_PIECE] =                      Item(RG_TRIFORCE_PIECE,                   Text{ "Triforce Piece", "Triforce Piece", "Triforce Piece" },                                                     ITEMTYPE_ITEM,              0xDF,               true,  &logic->TriforcePieces,      RHT_TRIFORCE_PIECE,         RG_TRIFORCE_PIECE,              OBJECT_GI_BOMB_2,       GID_TRIFORCE_PIECE, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
 
-    // Init SpoilerfileItemNameToEnum
+    // Init itemNameToEnum
     for (auto& item : itemTable) {
         // Easiest way to filter out all the empty values from the array, since we still technically want the 0/RG_NONE
         // entry
         if (item.GetName().english.empty()) {
             continue;
         }
-        SpoilerfileItemNameToEnum[item.GetName().english] = item.GetRandomizerGet();
-        SpoilerfileItemNameToEnum[item.GetName().french] = item.GetRandomizerGet();
+        itemNameToEnum[item.GetName().english] = item.GetRandomizerGet();
+        itemNameToEnum[item.GetName().french] = item.GetRandomizerGet();
     }
 }
 
diff --git a/soh/soh/Enhancements/randomizer/item_location.cpp b/soh/soh/Enhancements/randomizer/item_location.cpp
index 736778786..59bceb8d5 100644
--- a/soh/soh/Enhancements/randomizer/item_location.cpp
+++ b/soh/soh/Enhancements/randomizer/item_location.cpp
@@ -109,19 +109,19 @@ void ItemLocation::SetAsHintable() {
     isHintable = true;
 }
 
-bool ItemLocation::IsHintedAt() const {
-    return hintedAt;
+bool ItemLocation::IsAHintAccessible() const {
+    return hintAccesible;
 }
 
-void ItemLocation::SetAsHinted() {
-    hintedAt = true;
+void ItemLocation::SetHintAccesible() {
+    hintAccesible = true;
 }
 
-const std::vector<RandomizerHintKey>& ItemLocation::GetHintedBy() const {
+const std::vector<RandomizerHint>& ItemLocation::GetHintedBy() const {
     return hintedBy;
 }
 
-void ItemLocation::AddHintedBy(const RandomizerHintKey hintKey) {
+void ItemLocation::AddHintedBy(const RandomizerHint hintKey) {
     hintedBy.push_back(hintKey);
 } 
 
@@ -193,7 +193,7 @@ void ItemLocation::ResetVariables() {
     placedItem = RG_NONE;
     delayedItem = RG_NONE;
     isHintable = false;
-    hintedAt = false;
+    hintAccesible = false;
     hintedBy = {};
     price = 0;
     hasCustomPrice = false;
diff --git a/soh/soh/Enhancements/randomizer/item_location.h b/soh/soh/Enhancements/randomizer/item_location.h
index a4b60a5d3..dd5ec8a00 100644
--- a/soh/soh/Enhancements/randomizer/item_location.h
+++ b/soh/soh/Enhancements/randomizer/item_location.h
@@ -33,10 +33,10 @@ class ItemLocation {
     void SetCustomPrice(uint16_t price_);
     bool IsHintable() const;
     void SetAsHintable();
-    bool IsHintedAt() const;
-    void SetAsHinted();
-    const std::vector<RandomizerHintKey>& GetHintedBy() const;
-    void AddHintedBy(RandomizerHintKey hintKey);
+    bool IsAHintAccessible() const;
+    void SetHintAccesible();
+    const std::vector<RandomizerHint>& GetHintedBy() const;
+    void AddHintedBy(RandomizerHint hintKey);
     bool IsHidden() const;
     bool IsExcluded() const;
     void AddExcludeOption();
@@ -52,8 +52,8 @@ class ItemLocation {
 
   private:
     RandomizerCheck rc;
-    std::vector<RandomizerHintKey> hintedBy = {};
-    bool hintedAt = false;
+    std::vector<RandomizerHint> hintedBy = {};
+    bool hintAccesible = false;
     bool isHintable = false;
     bool addedToPool = false;
     RandomizerGet placedItem = RG_NONE;
diff --git a/soh/soh/Enhancements/randomizer/location.cpp b/soh/soh/Enhancements/randomizer/location.cpp
index a0783f4ad..24d6ac9cb 100644
--- a/soh/soh/Enhancements/randomizer/location.cpp
+++ b/soh/soh/Enhancements/randomizer/location.cpp
@@ -1,5 +1,5 @@
 #include "location.h"
-#include "3drando/hint_list.hpp"
+#include "static_data.h"
 #include <algorithm>
 
 RandomizerCheck Rando::Location::GetRandomizerCheck() const {
@@ -47,7 +47,7 @@ RandomizerHintTextKey Rando::Location::GetHintKey() const {
 }
 
 HintText* Rando::Location::GetHint() {
-    return &hintTable[hintKey];
+    return &StaticData::hintTextTable[hintKey];
 }
 
 const std::string& Rando::Location::GetName() const {
@@ -90,7 +90,7 @@ uint32_t Rando::Location::Getuint32_t() const {
 }
 
 const HintText& Rando::Location::GetHint() const {
-    return Hint(hintKey);
+    return StaticData::hintTextTable[hintKey];
 }
 
 RandomizerGet Rando::Location::GetVanillaItem() const {
diff --git a/soh/soh/Enhancements/randomizer/location_list.cpp b/soh/soh/Enhancements/randomizer/location_list.cpp
index c5418dda2..f990bb1fb 100644
--- a/soh/soh/Enhancements/randomizer/location_list.cpp
+++ b/soh/soh/Enhancements/randomizer/location_list.cpp
@@ -3,7 +3,6 @@
 #define TWO_ACTOR_PARAMS(a, b) (abs(a) << 16) | abs(b)
 
 std::array<Rando::Location, RC_MAX> Rando::StaticData::locationTable;
-std::unordered_map<std::string, RandomizerCheck> Rando::StaticData::SpoilerfileCheckNameToEnum;
 std::multimap<std::tuple<s16, s16, s32>, RandomizerCheck> Rando::StaticData::CheckFromActorMultimap;
 
 std::vector<RandomizerCheck> KF_ShopLocations = {
@@ -501,49 +500,49 @@ std::vector<RandomizerCheck> Rando::StaticData::overworldLocations = {
 };
 
 std::vector<RandomizerCheck> Rando::StaticData::gossipStoneLocations = {
-    RC_COLOSSUS_GOSSIP_STONE,
-    RC_DMC_GOSSIP_STONE,
-    RC_DMC_UPPER_GROTTO_GOSSIP_STONE,
-    RC_DMT_GOSSIP_STONE,
-    RC_DMT_STORMS_GROTTO_GOSSIP_STONE,
-    RC_DODONGOS_CAVERN_GOSSIP_STONE,
-    RC_FAIRY_GOSSIP_STONE,
-    RC_GC_MAZE_GOSSIP_STONE,
-    RC_GC_MEDIGORON_GOSSIP_STONE,
-    RC_GV_GOSSIP_STONE,
-    RC_GY_GOSSIP_STONE,
-    RC_HC_MALON_GOSSIP_STONE,
-    RC_HC_ROCK_WALL_GOSSIP_STONE,
-    RC_HC_STORMS_GROTTO_GOSSIP_STONE,
-    RC_HF_COW_GROTTO_GOSSIP_STONE,
-    RC_HF_NEAR_MARKET_GOSSIP_STONE,
-    RC_HF_OPEN_GROTTO_GOSSIP_STONE,
-    RC_HF_SOUTHEAST_GOSSIP_STONE,
-    RC_JABU_GOSSIP_STONE,
     RC_KF_DEKU_TREE_LEFT_GOSSIP_STONE,
     RC_KF_DEKU_TREE_RIGHT_GOSSIP_STONE,
     RC_KF_GOSSIP_STONE,
-    RC_KF_STORMS_GOSSIP_STONE,
-    RC_KAK_OPEN_GROTTO_GOSSIP_STONE,
-    RC_LH_LAB_GOSSIP_STONE,
-    RC_LH_SOUTHEAST_GOSSIP_STONE,
-    RC_LH_SOUTHWEST_GOSSIP_STONE,
+    RC_KF_STORMS_GROTTO_GOSSIP_STONE,
     RC_LW_GOSSIP_STONE,
-    RC_LW_NEAR_SHORTCUTS_GOSSIP_STONE,
+    RC_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE,
     RC_SFM_MAZE_LOWER_GOSSIP_STONE,
     RC_SFM_MAZE_UPPER_GOSSIP_STONE,
     RC_SFM_SARIA_GOSSIP_STONE,
+    RC_HF_COW_GROTTO_GOSSIP_STONE,
+    RC_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE,
+    RC_HF_OPEN_GROTTO_GOSSIP_STONE,
+    RC_HF_SOUTHEAST_GROTTO_GOSSIP_STONE,
     RC_TOT_LEFT_CENTER_GOSSIP_STONE,
-    RC_TOT_LEFT_GOSSIP_STONE,
+    RC_TOT_LEFTMOST_GOSSIP_STONE,
     RC_TOT_RIGHT_CENTER_GOSSIP_STONE,
-    RC_TOT_RIGHT_GOSSIP_STONE,
-    RC_ZD_GOSSIP_STONE,
+    RC_TOT_RIGHTMOST_GOSSIP_STONE,
+    RC_HC_MALON_GOSSIP_STONE,
+    RC_HC_ROCK_WALL_GOSSIP_STONE,
+    RC_HC_STORMS_GROTTO_GOSSIP_STONE,
+    RC_KAK_OPEN_GROTTO_GOSSIP_STONE,
+    RC_GRAVEYARD_GOSSIP_STONE,
+    RC_DMT_GOSSIP_STONE,
+    RC_DMT_STORMS_GROTTO_GOSSIP_STONE,
+    RC_GC_MAZE_GOSSIP_STONE,
+    RC_GC_MEDIGORON_GOSSIP_STONE,
+    RC_DMC_GOSSIP_STONE,
+    RC_DMC_UPPER_GROTTO_GOSSIP_STONE,
     RC_ZR_NEAR_DOMAIN_GOSSIP_STONE,
     RC_ZR_NEAR_GROTTOS_GOSSIP_STONE,
     RC_ZR_OPEN_GROTTO_GOSSIP_STONE,
+    RC_ZD_GOSSIP_STONE,
+    RC_ZF_JABU_GOSSIP_STONE,
+    RC_ZF_FAIRY_GOSSIP_STONE,
+    RC_LH_LAB_GOSSIP_STONE,
+    RC_LH_SOUTHEAST_GOSSIP_STONE,
+    RC_LH_SOUTHWEST_GOSSIP_STONE,
+    RC_GV_GOSSIP_STONE,
+    RC_COLOSSUS_GOSSIP_STONE,
+    RC_DODONGOS_CAVERN_GOSSIP_STONE,
 };
 
-std::vector<RandomizerCheck> Rando::StaticData::otherHintLocations = {
+std::vector<RandomizerCheck> Rando::StaticData::staticHintLocations = {
     RC_GANONDORF_HINT,
     RC_SHEIK_HINT_GC,
     RC_SHEIK_HINT_MQ_GC,
@@ -1515,48 +1514,48 @@ void Rando::StaticData::InitLocationTable() {
     locationTable[RC_ZD_FISH_5] =                       Location::Base(RC_ZD_FISH_5,                        RCQUEST_BOTH, RCTYPE_FISH, RCAREA_ZORAS_DOMAIN,         ACTOR_EN_FISH,  SCENE_ZORAS_DOMAIN, -1 ^ 4, 0x00, "Fish 5",                 "ZD Fish 5",                        RHT_ZD_FISH,                      RG_FISH, { Category::cFish }, SpoilerCollectionCheck::Fish(0xFF, SCENE_ZORAS_DOMAIN), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
 
 
-    // Gossip Stones
-    //            RandomizerCheck                                           Randomizer Check                    Quest            Area                          Scene                        Params  Flag  Short Name                       Spoiler name                       Categories
-    locationTable[RC_DMC_GOSSIP_STONE] =                Location::HintStone(RC_DMC_GOSSIP_STONE,                RCQUEST_BOTH,    RCAREA_DEATH_MOUNTAIN_CRATER, SCENE_DEATH_MOUNTAIN_CRATER, 14341,  0x05, "Gossip Stone",                  "DMC Gossip Stone",                {});
-    locationTable[RC_DMT_GOSSIP_STONE] =                Location::HintStone(RC_DMT_GOSSIP_STONE,                RCQUEST_BOTH,    RCAREA_DEATH_MOUNTAIN_TRAIL,  SCENE_DEATH_MOUNTAIN_TRAIL,  14340,  0x04, "Gossip Stone",                  "DMT Gossip Stone",                {});
-    locationTable[RC_COLOSSUS_GOSSIP_STONE] =           Location::HintStone(RC_COLOSSUS_GOSSIP_STONE,           RCQUEST_BOTH,    RCAREA_DESERT_COLOSSUS,       SCENE_DESERT_COLOSSUS,       14362,  0x1A, "Gossip Stone",                  "Colossus Gossip Stone",           {});
-    locationTable[RC_DODONGOS_CAVERN_GOSSIP_STONE] =    Location::HintStone(RC_DODONGOS_CAVERN_GOSSIP_STONE,    RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,       SCENE_DODONGOS_CAVERN,       4372,   0x14, "Gossip Stone",                  "Dodongo's Cavern Gossip Stone",   {});
-    locationTable[RC_GV_GOSSIP_STONE] =                 Location::HintStone(RC_GV_GOSSIP_STONE,                 RCQUEST_BOTH,    RCAREA_GERUDO_VALLEY,         SCENE_GERUDO_VALLEY,         14353,  0x11, "Gossip Stone",                  "GV Gossip Stone",                 {});
-    locationTable[RC_GC_MAZE_GOSSIP_STONE] =            Location::HintStone(RC_GC_MAZE_GOSSIP_STONE,            RCQUEST_BOTH,    RCAREA_GORON_CITY,            SCENE_GORON_CITY,            14357,  0x15, "Maze Gossip Stone",             "GC Maze Gossip Stone",            {});
-    locationTable[RC_GC_MEDIGORON_GOSSIP_STONE] =       Location::HintStone(RC_GC_MEDIGORON_GOSSIP_STONE,       RCQUEST_BOTH,    RCAREA_GORON_CITY,            SCENE_GORON_CITY,            14873,  0x19, "Medigoron Gossip Stone",        "GC Medigoron Gossip Stone",       {});
-    locationTable[RC_GY_GOSSIP_STONE] =                 Location::HintStone(RC_GY_GOSSIP_STONE,                 RCQUEST_BOTH,    RCAREA_GRAVEYARD,             SCENE_GRAVEYARD,             14346,  0x0A, "Gossip Stone",                  "GY Gossip Stone",                 {});
-    locationTable[RC_HC_MALON_GOSSIP_STONE] =           Location::HintStone(RC_HC_MALON_GOSSIP_STONE,           RCQUEST_BOTH,    RCAREA_HYRULE_CASTLE,         SCENE_HYRULE_CASTLE,         14610,  0x12, "Malon Gossip Stone",            "HC Malon Gossip Stone",           {});
-    locationTable[RC_HC_ROCK_WALL_GOSSIP_STONE] =       Location::HintStone(RC_HC_ROCK_WALL_GOSSIP_STONE,       RCQUEST_BOTH,    RCAREA_HYRULE_CASTLE,         SCENE_HYRULE_CASTLE,         14347,  0x0B, "Rock Wall Gossip Stone",        "HC Rock Wall Gossip Stone",       {});
-    locationTable[RC_HC_STORMS_GROTTO_GOSSIP_STONE] =   Location::HintStone(RC_HC_STORMS_GROTTO_GOSSIP_STONE,   RCQUEST_BOTH,    RCAREA_HYRULE_CASTLE,         SCENE_GROTTOS,               14355,  0x13, "Storms Grotto Gossip Stone",    "HC Storms Grotto Gossip Stone",   {});
-    locationTable[RC_KF_DEKU_TREE_LEFT_GOSSIP_STONE] =  Location::HintStone(RC_KF_DEKU_TREE_LEFT_GOSSIP_STONE,  RCQUEST_BOTH,    RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,         14623,  0x1F, "Deku Tree Left Gossip Stone",   "KF Deku Tree Left Gossip Stone",  {});
-    locationTable[RC_KF_DEKU_TREE_RIGHT_GOSSIP_STONE] = Location::HintStone(RC_KF_DEKU_TREE_RIGHT_GOSSIP_STONE, RCQUEST_BOTH,    RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,         14880,  0x20, "Deku Tree Right Gossip Stone",  "KF Deku Tree Right Gossip Stone", {});
-    locationTable[RC_KF_GOSSIP_STONE] =                 Location::HintStone(RC_KF_GOSSIP_STONE,                 RCQUEST_BOTH,    RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,         14366,  0x1E, "Gossip Stone",                  "KF Gossip Stone",                 {});
-    locationTable[RC_KF_STORMS_GOSSIP_STONE] =          Location::HintStone(RC_KF_STORMS_GOSSIP_STONE,          RCQUEST_BOTH,    RCAREA_KOKIRI_FOREST,         SCENE_GROTTOS,               -22988, 0x3C, "Storms Gossip Stone",           "KF Storms Gossip Stone",          {});
-    locationTable[RC_LH_LAB_GOSSIP_STONE] =             Location::HintStone(RC_LH_LAB_GOSSIP_STONE,             RCQUEST_BOTH,    RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,            14339,  0x03, "Lab Gossip Stone",              "LH Lab Gossip Stone",             {});
-    locationTable[RC_LH_SOUTHEAST_GOSSIP_STONE] =       Location::HintStone(RC_LH_SOUTHEAST_GOSSIP_STONE,       RCQUEST_BOTH,    RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,            14863,  0x0F, "Southeast Gossip Stone",        "LH Southeast Gossip Stone",       {});
-    locationTable[RC_LH_SOUTHWEST_GOSSIP_STONE] =       Location::HintStone(RC_LH_SOUTHWEST_GOSSIP_STONE,       RCQUEST_BOTH,    RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,            14600,  0x08, "Southwest Gossip Stone",        "LH Southwest Gossip Stone",       {});
-    locationTable[RC_LW_GOSSIP_STONE] =                 Location::HintStone(RC_LW_GOSSIP_STONE,                 RCQUEST_BOTH,    RCAREA_LOST_WOODS,            SCENE_LOST_WOODS,            14365,  0x1D, "Gossip Stone",                  "LW Gossip Stone",                 {});
-    locationTable[RC_SFM_MAZE_LOWER_GOSSIP_STONE] =     Location::HintStone(RC_SFM_MAZE_LOWER_GOSSIP_STONE,     RCQUEST_BOTH,    RCAREA_SACRED_FOREST_MEADOW,  SCENE_SACRED_FOREST_MEADOW,  14358,  0x16, "Maze Lower Gossip Stone",       "SFM Maze Lower Gossip Stone",     {});
-    locationTable[RC_SFM_MAZE_UPPER_GOSSIP_STONE] =     Location::HintStone(RC_SFM_MAZE_UPPER_GOSSIP_STONE,     RCQUEST_BOTH,    RCAREA_SACRED_FOREST_MEADOW,  SCENE_SACRED_FOREST_MEADOW,  14615,  0x17, "Maze Upper Gossip Stone",       "SFM Maze Upper Gossip Stone",     {});
-    locationTable[RC_SFM_SARIA_GOSSIP_STONE] =          Location::HintStone(RC_SFM_SARIA_GOSSIP_STONE,          RCQUEST_BOTH,    RCAREA_SACRED_FOREST_MEADOW,  SCENE_SACRED_FOREST_MEADOW,  14876,  0x1C, "Saria Gossip Stone",            "SFM Saria Gossip Stone",          {});
-    locationTable[RC_TOT_LEFT_GOSSIP_STONE] =           Location::HintStone(RC_TOT_LEFT_GOSSIP_STONE,           RCQUEST_BOTH,    RCAREA_MARKET,                SCENE_ID_MAX,                0x00,   0x06, "ToT Left Gossip Stone",         "ToT Left Gossip Stone",           {});
-    locationTable[RC_TOT_RIGHT_GOSSIP_STONE] =          Location::HintStone(RC_TOT_RIGHT_GOSSIP_STONE,          RCQUEST_BOTH,    RCAREA_MARKET,                SCENE_ID_MAX,                0x00,   0x07, "ToT Right Gossip Stone",        "ToT Right Gossip Stone",          {});
-    locationTable[RC_TOT_RIGHT_CENTER_GOSSIP_STONE] =   Location::HintStone(RC_TOT_RIGHT_CENTER_GOSSIP_STONE,   RCQUEST_BOTH,    RCAREA_MARKET,                SCENE_ID_MAX,                0x00,   0x10, "ToT Right Center Gossip Stone", "ToT Right Center Gossip Stone",   {});
-    locationTable[RC_TOT_LEFT_CENTER_GOSSIP_STONE] =    Location::HintStone(RC_TOT_LEFT_CENTER_GOSSIP_STONE,    RCQUEST_BOTH,    RCAREA_MARKET,                SCENE_ID_MAX,                0x00,   0x0E, "ToT Left Center Gossip Stone",  "ToT Left Center Gossip Stone",    {});
-    locationTable[RC_ZD_GOSSIP_STONE] =                 Location::HintStone(RC_ZD_GOSSIP_STONE,                 RCQUEST_BOTH,    RCAREA_ZORAS_DOMAIN,          SCENE_ZORAS_DOMAIN,          14345,  0x09, "Gossip Stone",                  "ZD Gossip Stone",                 {});
-    locationTable[RC_FAIRY_GOSSIP_STONE] =              Location::HintStone(RC_FAIRY_GOSSIP_STONE,              RCQUEST_BOTH,    RCAREA_ZORAS_FOUNTAIN,        SCENE_ZORAS_FOUNTAIN,        0x00,   0x01, "Fairy Gossip Stone",            "Fairy Gossip Stone",              {});
-    locationTable[RC_JABU_GOSSIP_STONE] =               Location::HintStone(RC_JABU_GOSSIP_STONE,               RCQUEST_BOTH,    RCAREA_ZORAS_FOUNTAIN,        SCENE_ZORAS_FOUNTAIN,        0x00,   0x02, "Jabu Gossip Stone",             "Jabu Gossip Stone",               {});
-    locationTable[RC_ZR_NEAR_GROTTOS_GOSSIP_STONE] =    Location::HintStone(RC_ZR_NEAR_GROTTOS_GOSSIP_STONE,    RCQUEST_BOTH,    RCAREA_ZORAS_RIVER,           SCENE_ZORAS_RIVER,           14605,  0x0D, "Near Grottos Gossip Stone",     "ZR Near Grottos Gossip Stone",    {});
-    locationTable[RC_ZR_NEAR_DOMAIN_GOSSIP_STONE] =     Location::HintStone(RC_ZR_NEAR_DOMAIN_GOSSIP_STONE,     RCQUEST_BOTH,    RCAREA_ZORAS_RIVER,           SCENE_ZORAS_RIVER,           14860,  0x0C, "Near Domain Gossip Stone",      "ZR Near Domain Gossip Stone",     {});
-    locationTable[RC_HF_COW_GROTTO_GOSSIP_STONE] =      Location::HintStone(RC_HF_COW_GROTTO_GOSSIP_STONE,      RCQUEST_BOTH,    RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,               14363,  0x1B, "Cow Grotto Gossip Stone",       "HF Cow Grotto Gossip Stone",      {});
-    locationTable[RC_HF_NEAR_MARKET_GOSSIP_STONE] =     Location::HintStone(RC_HF_NEAR_MARKET_GOSSIP_STONE,     RCQUEST_BOTH,    RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,               -22944, 0x30, "Near Market Gossip Stone",      "HF Near Market Gossip Stone",     {});
-    locationTable[RC_HF_SOUTHEAST_GOSSIP_STONE] =       Location::HintStone(RC_HF_SOUTHEAST_GOSSIP_STONE,       RCQUEST_BOTH,    RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,               -22978, 0x32, "Southeast Gossip Stone",        "HF Southeast Gossip Stone",       {});
-    locationTable[RC_HF_OPEN_GROTTO_GOSSIP_STONE] =     Location::HintStone(RC_HF_OPEN_GROTTO_GOSSIP_STONE,     RCQUEST_BOTH,    RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,               -22947, 0x33, "Open Grotto Gossip Stone",      "HF Open Grotto Gossip Stone",     {});
-    locationTable[RC_KAK_OPEN_GROTTO_GOSSIP_STONE] =    Location::HintStone(RC_KAK_OPEN_GROTTO_GOSSIP_STONE,    RCQUEST_BOTH,    RCAREA_KAKARIKO_VILLAGE,      SCENE_GROTTOS,               -22984, 0x38, "Open Grotto Gossip Stone",      "Kak Open Grotto Gossip Stone",    {});
-    locationTable[RC_ZR_OPEN_GROTTO_GOSSIP_STONE] =     Location::HintStone(RC_ZR_OPEN_GROTTO_GOSSIP_STONE,     RCQUEST_BOTH,    RCAREA_ZORAS_RIVER,           SCENE_GROTTOS,               -22985, 0x39, "Open Grotto Gossip Stone",      "ZR Open Grotto Gossip Stone",     {});
-    locationTable[RC_LW_NEAR_SHORTCUTS_GOSSIP_STONE] =  Location::HintStone(RC_LW_NEAR_SHORTCUTS_GOSSIP_STONE,  RCQUEST_BOTH,    RCAREA_LOST_WOODS,            SCENE_GROTTOS,               -22964, 0x34, "Near Shortcuts Gossip Stone",   "LW Near Shortcuts Gossip Stone",  {});
-    locationTable[RC_DMT_STORMS_GROTTO_GOSSIP_STONE] =  Location::HintStone(RC_DMT_STORMS_GROTTO_GOSSIP_STONE,  RCQUEST_BOTH,    RCAREA_DEATH_MOUNTAIN_TRAIL,  SCENE_GROTTOS,               -23255, 0x37, "Storms Grotto Gossip Stone",    "DMT Storms Grotto Gossip Stone",  {});
-    locationTable[RC_DMC_UPPER_GROTTO_GOSSIP_STONE] =   Location::HintStone(RC_DMC_UPPER_GROTTO_GOSSIP_STONE,   RCQUEST_BOTH,    RCAREA_DEATH_MOUNTAIN_CRATER, SCENE_GROTTOS,               -23802, 0x3A, "Upper Grotto Gossip Stone",     "DMC Upper Grotto Gossip Stone",   {});
+    // Gossip Stones RANDOTODO work towards removing and replacing with event access
+    //            RandomizerCheck                             Randomizer Check                                              Quest            Area                          Scene                        Params  Flag  Short Name                       Spoiler name                       Categories
+    locationTable[RC_DMC_GOSSIP_STONE] =                      Location::HintStone(RC_DMC_GOSSIP_STONE,                      RCQUEST_BOTH,    RCAREA_DEATH_MOUNTAIN_CRATER, SCENE_DEATH_MOUNTAIN_CRATER, 14341,  0x05, "Gossip Stone",                  "DMC Gossip Stone",                {});
+    locationTable[RC_DMT_GOSSIP_STONE] =                      Location::HintStone(RC_DMT_GOSSIP_STONE,                      RCQUEST_BOTH,    RCAREA_DEATH_MOUNTAIN_TRAIL,  SCENE_DEATH_MOUNTAIN_TRAIL,  14340,  0x04, "Gossip Stone",                  "DMT Gossip Stone",                {});
+    locationTable[RC_COLOSSUS_GOSSIP_STONE] =                 Location::HintStone(RC_COLOSSUS_GOSSIP_STONE,                 RCQUEST_BOTH,    RCAREA_DESERT_COLOSSUS,       SCENE_DESERT_COLOSSUS,       14362,  0x1A, "Gossip Stone",                  "Colossus Gossip Stone",           {});
+    locationTable[RC_DODONGOS_CAVERN_GOSSIP_STONE] =          Location::HintStone(RC_DODONGOS_CAVERN_GOSSIP_STONE,          RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,       SCENE_DODONGOS_CAVERN,       4372,   0x14, "Gossip Stone",                  "Dodongo's Cavern Gossip Stone",   {});
+    locationTable[RC_GV_GOSSIP_STONE] =                       Location::HintStone(RC_GV_GOSSIP_STONE,                       RCQUEST_BOTH,    RCAREA_GERUDO_VALLEY,         SCENE_GERUDO_VALLEY,         14353,  0x11, "Gossip Stone",                  "GV Gossip Stone",                 {});
+    locationTable[RC_GC_MAZE_GOSSIP_STONE] =                  Location::HintStone(RC_GC_MAZE_GOSSIP_STONE,                  RCQUEST_BOTH,    RCAREA_GORON_CITY,            SCENE_GORON_CITY,            14357,  0x15, "Maze Gossip Stone",             "GC Maze Gossip Stone",            {});
+    locationTable[RC_GC_MEDIGORON_GOSSIP_STONE] =             Location::HintStone(RC_GC_MEDIGORON_GOSSIP_STONE,             RCQUEST_BOTH,    RCAREA_GORON_CITY,            SCENE_GORON_CITY,            14873,  0x19, "Medigoron Gossip Stone",        "GC Medigoron Gossip Stone",       {});
+    locationTable[RC_GRAVEYARD_GOSSIP_STONE] =                Location::HintStone(RC_GRAVEYARD_GOSSIP_STONE,                RCQUEST_BOTH,    RCAREA_GRAVEYARD,             SCENE_GRAVEYARD,             14346,  0x0A, "Gossip Stone",                  "GY Gossip Stone",                 {});
+    locationTable[RC_HC_MALON_GOSSIP_STONE] =                 Location::HintStone(RC_HC_MALON_GOSSIP_STONE,                 RCQUEST_BOTH,    RCAREA_HYRULE_CASTLE,         SCENE_HYRULE_CASTLE,         14610,  0x12, "Malon Gossip Stone",            "HC Malon Gossip Stone",           {});
+    locationTable[RC_HC_ROCK_WALL_GOSSIP_STONE] =             Location::HintStone(RC_HC_ROCK_WALL_GOSSIP_STONE,             RCQUEST_BOTH,    RCAREA_HYRULE_CASTLE,         SCENE_HYRULE_CASTLE,         14347,  0x0B, "Rock Wall Gossip Stone",        "HC Rock Wall Gossip Stone",       {});
+    locationTable[RC_HC_STORMS_GROTTO_GOSSIP_STONE] =         Location::HintStone(RC_HC_STORMS_GROTTO_GOSSIP_STONE,         RCQUEST_BOTH,    RCAREA_HYRULE_CASTLE,         SCENE_GROTTOS,               14355,  0x13, "Storms Grotto Gossip Stone",    "HC Storms Grotto Gossip Stone",   {});
+    locationTable[RC_KF_DEKU_TREE_LEFT_GOSSIP_STONE] =        Location::HintStone(RC_KF_DEKU_TREE_LEFT_GOSSIP_STONE,        RCQUEST_BOTH,    RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,         14623,  0x1F, "Deku Tree Left Gossip Stone",   "KF Deku Tree Left Gossip Stone",  {});
+    locationTable[RC_KF_DEKU_TREE_RIGHT_GOSSIP_STONE] =       Location::HintStone(RC_KF_DEKU_TREE_RIGHT_GOSSIP_STONE,       RCQUEST_BOTH,    RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,         14880,  0x20, "Deku Tree Right Gossip Stone",  "KF Deku Tree Right Gossip Stone", {});
+    locationTable[RC_KF_GOSSIP_STONE] =                       Location::HintStone(RC_KF_GOSSIP_STONE,                       RCQUEST_BOTH,    RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,         14366,  0x1E, "Gossip Stone",                  "KF Gossip Stone",                 {});
+    locationTable[RC_KF_STORMS_GROTTO_GOSSIP_STONE] =         Location::HintStone(RC_KF_STORMS_GROTTO_GOSSIP_STONE,         RCQUEST_BOTH,    RCAREA_KOKIRI_FOREST,         SCENE_GROTTOS,               -22988, 0x3C, "Storms Gossip Stone",           "KF Storms Gossip Stone",          {});
+    locationTable[RC_LH_LAB_GOSSIP_STONE] =                   Location::HintStone(RC_LH_LAB_GOSSIP_STONE,                   RCQUEST_BOTH,    RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,            14339,  0x03, "Lab Gossip Stone",              "LH Lab Gossip Stone",             {});
+    locationTable[RC_LH_SOUTHEAST_GOSSIP_STONE] =             Location::HintStone(RC_LH_SOUTHEAST_GOSSIP_STONE,             RCQUEST_BOTH,    RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,            14863,  0x0F, "Southeast Gossip Stone",        "LH Southeast Gossip Stone",       {});
+    locationTable[RC_LH_SOUTHWEST_GOSSIP_STONE] =             Location::HintStone(RC_LH_SOUTHWEST_GOSSIP_STONE,             RCQUEST_BOTH,    RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,            14600,  0x08, "Southwest Gossip Stone",        "LH Southwest Gossip Stone",       {});
+    locationTable[RC_LW_GOSSIP_STONE] =                       Location::HintStone(RC_LW_GOSSIP_STONE,                       RCQUEST_BOTH,    RCAREA_LOST_WOODS,            SCENE_LOST_WOODS,            14365,  0x1D, "Gossip Stone",                  "LW Gossip Stone",                 {});
+    locationTable[RC_SFM_MAZE_LOWER_GOSSIP_STONE] =           Location::HintStone(RC_SFM_MAZE_LOWER_GOSSIP_STONE,           RCQUEST_BOTH,    RCAREA_SACRED_FOREST_MEADOW,  SCENE_SACRED_FOREST_MEADOW,  14358,  0x16, "Maze Lower Gossip Stone",       "SFM Maze Lower Gossip Stone",     {});
+    locationTable[RC_SFM_MAZE_UPPER_GOSSIP_STONE] =           Location::HintStone(RC_SFM_MAZE_UPPER_GOSSIP_STONE,           RCQUEST_BOTH,    RCAREA_SACRED_FOREST_MEADOW,  SCENE_SACRED_FOREST_MEADOW,  14615,  0x17, "Maze Upper Gossip Stone",       "SFM Maze Upper Gossip Stone",     {});
+    locationTable[RC_SFM_SARIA_GOSSIP_STONE] =                Location::HintStone(RC_SFM_SARIA_GOSSIP_STONE,                RCQUEST_BOTH,    RCAREA_SACRED_FOREST_MEADOW,  SCENE_SACRED_FOREST_MEADOW,  14876,  0x1C, "Saria Gossip Stone",            "SFM Saria Gossip Stone",          {});
+    locationTable[RC_TOT_LEFTMOST_GOSSIP_STONE] =             Location::HintStone(RC_TOT_LEFTMOST_GOSSIP_STONE,             RCQUEST_BOTH,    RCAREA_MARKET,                SCENE_ID_MAX,                0x00,   0x06, "ToT Left Gossip Stone",         "ToT Left Gossip Stone",           {});
+    locationTable[RC_TOT_RIGHTMOST_GOSSIP_STONE] =            Location::HintStone(RC_TOT_RIGHTMOST_GOSSIP_STONE,            RCQUEST_BOTH,    RCAREA_MARKET,                SCENE_ID_MAX,                0x00,   0x07, "ToT Right Gossip Stone",        "ToT Right Gossip Stone",          {});
+    locationTable[RC_TOT_RIGHT_CENTER_GOSSIP_STONE] =         Location::HintStone(RC_TOT_RIGHT_CENTER_GOSSIP_STONE,         RCQUEST_BOTH,    RCAREA_MARKET,                SCENE_ID_MAX,                0x00,   0x10, "ToT Right Center Gossip Stone", "ToT Right Center Gossip Stone",   {});
+    locationTable[RC_TOT_LEFT_CENTER_GOSSIP_STONE] =          Location::HintStone(RC_TOT_LEFT_CENTER_GOSSIP_STONE,          RCQUEST_BOTH,    RCAREA_MARKET,                SCENE_ID_MAX,                0x00,   0x0E, "ToT Left Center Gossip Stone",  "ToT Left Center Gossip Stone",    {});
+    locationTable[RC_ZD_GOSSIP_STONE] =                       Location::HintStone(RC_ZD_GOSSIP_STONE,                       RCQUEST_BOTH,    RCAREA_ZORAS_DOMAIN,          SCENE_ZORAS_DOMAIN,          14345,  0x09, "Gossip Stone",                  "ZD Gossip Stone",                 {});
+    locationTable[RC_ZF_FAIRY_GOSSIP_STONE] =                 Location::HintStone(RC_ZF_FAIRY_GOSSIP_STONE,                 RCQUEST_BOTH,    RCAREA_ZORAS_FOUNTAIN,        SCENE_ZORAS_FOUNTAIN,        0x00,   0x01, "Fairy Gossip Stone",            "Fairy Gossip Stone",              {});
+    locationTable[RC_ZF_JABU_GOSSIP_STONE] =                  Location::HintStone(RC_ZF_JABU_GOSSIP_STONE,                  RCQUEST_BOTH,    RCAREA_ZORAS_FOUNTAIN,        SCENE_ZORAS_FOUNTAIN,        0x00,   0x02, "Jabu Gossip Stone",             "Jabu Gossip Stone",               {});
+    locationTable[RC_ZR_NEAR_GROTTOS_GOSSIP_STONE] =          Location::HintStone(RC_ZR_NEAR_GROTTOS_GOSSIP_STONE,          RCQUEST_BOTH,    RCAREA_ZORAS_RIVER,           SCENE_ZORAS_RIVER,           14605,  0x0D, "Near Grottos Gossip Stone",     "ZR Near Grottos Gossip Stone",    {});
+    locationTable[RC_ZR_NEAR_DOMAIN_GOSSIP_STONE] =           Location::HintStone(RC_ZR_NEAR_DOMAIN_GOSSIP_STONE,           RCQUEST_BOTH,    RCAREA_ZORAS_RIVER,           SCENE_ZORAS_RIVER,           14860,  0x0C, "Near Domain Gossip Stone",      "ZR Near Domain Gossip Stone",     {});
+    locationTable[RC_HF_COW_GROTTO_GOSSIP_STONE] =            Location::HintStone(RC_HF_COW_GROTTO_GOSSIP_STONE,            RCQUEST_BOTH,    RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,               14363,  0x1B, "Cow Grotto Gossip Stone",       "HF Cow Grotto Gossip Stone",      {});
+    locationTable[RC_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE] =    Location::HintStone(RC_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE,    RCQUEST_BOTH,    RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,               -22944, 0x30, "Near Market Gossip Stone",      "HF Near Market Gossip Stone",     {});
+    locationTable[RC_HF_SOUTHEAST_GROTTO_GOSSIP_STONE] =      Location::HintStone(RC_HF_SOUTHEAST_GROTTO_GOSSIP_STONE,      RCQUEST_BOTH,    RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,               -22978, 0x32, "Southeast Gossip Stone",        "HF Southeast Gossip Stone",       {});
+    locationTable[RC_HF_OPEN_GROTTO_GOSSIP_STONE] =           Location::HintStone(RC_HF_OPEN_GROTTO_GOSSIP_STONE,           RCQUEST_BOTH,    RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,               -22947, 0x33, "Open Grotto Gossip Stone",      "HF Open Grotto Gossip Stone",     {});
+    locationTable[RC_KAK_OPEN_GROTTO_GOSSIP_STONE] =          Location::HintStone(RC_KAK_OPEN_GROTTO_GOSSIP_STONE,          RCQUEST_BOTH,    RCAREA_KAKARIKO_VILLAGE,      SCENE_GROTTOS,               -22984, 0x38, "Open Grotto Gossip Stone",      "Kak Open Grotto Gossip Stone",    {});
+    locationTable[RC_ZR_OPEN_GROTTO_GOSSIP_STONE] =           Location::HintStone(RC_ZR_OPEN_GROTTO_GOSSIP_STONE,           RCQUEST_BOTH,    RCAREA_ZORAS_RIVER,           SCENE_GROTTOS,               -22985, 0x39, "Open Grotto Gossip Stone",      "ZR Open Grotto Gossip Stone",     {});
+    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE] = Location::HintStone(RC_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE, RCQUEST_BOTH,    RCAREA_LOST_WOODS,            SCENE_GROTTOS,               -22964, 0x34, "Near Shortcuts Gossip Stone",   "LW Near Shortcuts Gossip Stone",  {});
+    locationTable[RC_DMT_STORMS_GROTTO_GOSSIP_STONE] =        Location::HintStone(RC_DMT_STORMS_GROTTO_GOSSIP_STONE,        RCQUEST_BOTH,    RCAREA_DEATH_MOUNTAIN_TRAIL,  SCENE_GROTTOS,               -23255, 0x37, "Storms Grotto Gossip Stone",    "DMT Storms Grotto Gossip Stone",  {});
+    locationTable[RC_DMC_UPPER_GROTTO_GOSSIP_STONE] =         Location::HintStone(RC_DMC_UPPER_GROTTO_GOSSIP_STONE,         RCQUEST_BOTH,    RCAREA_DEATH_MOUNTAIN_CRATER, SCENE_GROTTOS,               -23802, 0x3A, "Upper Grotto Gossip Stone",     "DMC Upper Grotto Gossip Stone",   {});
 
     // Other Hints
     locationTable[RC_GANONDORF_HINT]    = Location::OtherHint(RC_GANONDORF_HINT,   RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE, RCAREA_GANONS_CASTLE, ACTOR_EN_GANON_MANT, SCENE_GANON_BOSS,           "Ganondorf Hint",   "Ganondorf Hint");
@@ -1572,12 +1571,12 @@ void Rando::StaticData::InitLocationTable() {
     locationTable[RC_TRIFORCE_COMPLETED] = Location::Reward(RC_TRIFORCE_COMPLETED, RCQUEST_BOTH, RCTYPE_STANDARD, RCAREA_MARKET, ACTOR_ID_MAX, SCENE_ID_MAX, 0x00, 0x00, "Completed Triforce", "Completed Triforce", RHT_NONE, RG_NONE, {}, SpoilerCollectionCheck::None(), SpoilerCollectionCheckGroup::GROUP_NO_GROUP);
     // clang-format on
 
-    // Init SpoilerfileCheckNameToEnum
-    SpoilerfileCheckNameToEnum["Invalid Location"] = RC_UNKNOWN_CHECK;
-    SpoilerfileCheckNameToEnum["Link's Pocket"] = RC_LINKS_POCKET;
+    // Init locationNameToEnum
+    locationNameToEnum["Invalid Location"] = RC_UNKNOWN_CHECK;
+    locationNameToEnum["Link's Pocket"] = RC_LINKS_POCKET;
 
     for (auto& location : locationTable) {
-        SpoilerfileCheckNameToEnum[location.GetName()] = location.GetRandomizerCheck();
+        locationNameToEnum[location.GetName()] = location.GetRandomizerCheck();
         CheckFromActorMultimap.emplace(std::make_tuple((int16_t)location.GetActorID(), (int16_t)location.GetScene(), location.GetActorParams()), location.GetRandomizerCheck());
     }
 }
diff --git a/soh/soh/Enhancements/randomizer/option_descriptions.cpp b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
index e50846005..d3f1fa8e4 100644
--- a/soh/soh/Enhancements/randomizer/option_descriptions.cpp
+++ b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
@@ -503,10 +503,13 @@ void Settings::CreateOptionDescriptions() {
         "Reading the Temple of Time altar as child will tell you the locations of the Spiritual Stones.\n"
         "Reading the Temple of Time altar as adult will tell you the locations of the Medallions, as well as the "
         "conditions for building the Rainbow Bridge and getting the Boss Key for Ganon's Castle.";
-    mOptionDescriptions[RSK_LIGHT_ARROWS_HINT] =
-        "Talking to Ganondorf in his boss room or Sheik inside Ganon's Castle (when trials are enabled) will tell you "
-        "the location of the Light Arrows."
-        "If this option is enabled and Ganondorf is reachable without Light Arrows, Gossip Stones will never hint the "
+    mOptionDescriptions[RSK_GANONDORF_HINT] =
+        "Talking to Ganondorf in his boss room will tell you the location of the Light Arrows and Master Sword."
+        "If this option is enabled and Ganondorf is reachable without these items, Gossip Stones will never hint the "
+        "appropriote items.";//RANDOTODO make this hint text about no dupe hints a global hint for static hints. Add to navi?
+    mOptionDescriptions[RSK_SHEIK_LA_HINT] =
+        "Talking to Sheik inside Ganon's Castle will tell you the location of the Light Arrows."
+        "If this option is enabled and Sheik is reachable without Light Arrows, Gossip Stones will never hint the "
         "Light Arrows.";
     mOptionDescriptions[RSK_DAMPES_DIARY_HINT] =
         "Reading the diary of Dampé the gravekeeper as adult will tell you the location of one of the Hookshots.";
@@ -546,7 +549,7 @@ void Settings::CreateOptionDescriptions() {
     mOptionDescriptions[RSK_BLUE_FIRE_ARROWS] =
         "Ice Arrows act like Blue Fire, making them able to melt red ice. "
         "Item placement logic will respect this option, so it might be required to use this to progress.";
-    mOptionDescriptions[RSK_LIGHT_ARROWS_HINT] =
+    mOptionDescriptions[RSK_SUNLIGHT_ARROWS] =
         "Light Arrows can be used to light up the sun switches instead of using the Mirror Shield. "
         "Item placement logic will respect this option, so it might be required to use this to progress.";
     mOptionDescriptions[RSK_LOGIC_RULES] =
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index 99d8961a5..868a9dea3 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -10,6 +10,7 @@
 #include <textures/icon_item_24_static/icon_item_24_static.h>
 #include "3drando/rando_main.hpp"
 #include "3drando/random.hpp"
+#include "3drando/custom_messages.hpp" 
 #include "../../UIWidgets.hpp"
 #ifndef IMGUI_DEFINE_MATH_OPERATORS
 #define IMGUI_DEFINE_MATH_OPERATORS
@@ -37,12 +38,12 @@
 #include "settings.h"
 #include "soh/util.h"
 #include "fishsanity.h"
+#include "randomizerTypes.h"
 
 extern "C" uint32_t ResourceMgr_IsGameMasterQuest();
 extern "C" uint32_t ResourceMgr_IsSceneMasterQuest(s16 sceneNum);
 
 extern std::map<RandomizerCheckArea, std::string> rcAreaNames;
-extern std::array<std::string, HINT_TYPE_MAX> hintTypeNames;
 
 using json = nlohmann::json;
 using namespace std::literals::string_literals;
@@ -136,8 +137,8 @@ Randomizer::Randomizer() {
     SpoilerfileAreaNameToEnum["the Graveyard"] = RCAREA_GRAVEYARD;
     SpoilerfileAreaNameToEnum["Haunted Wasteland"] = RCAREA_WASTELAND;
     SpoilerfileAreaNameToEnum["outside Ganon's Castle"] = RCAREA_HYRULE_CASTLE;
-    for (int c = 0; c < hintTypeNames.size(); c++) {
-        SpoilerfileHintTypeNameToEnum[hintTypeNames[c]] = (HintType)c;
+    for (int c = 0; c < Rando::StaticData::hintTypeNames.size(); c++) {
+        SpoilerfileHintTypeNameToEnum[Rando::StaticData::hintTypeNames[(HintType)c].GetEnglish(MF_CLEAN)] = (HintType)c;
     }
 }
 
@@ -240,187 +241,10 @@ void Randomizer::LoadHintMessages() {
     CustomMessageManager::Instance->ClearMessageTable(Randomizer::hintMessageTableID);
     CustomMessageManager::Instance->AddCustomMessageTable(Randomizer::hintMessageTableID);
 
-    CustomMessageManager::Instance->CreateMessage(
-        Randomizer::hintMessageTableID, TEXT_ALTAR_CHILD,
-        CustomMessage(ctx->GetHint(RH_ALTAR_CHILD)->GetText(), TEXTBOX_TYPE_BLUE));
-    CustomMessageManager::Instance->CreateMessage(
-        Randomizer::hintMessageTableID, TEXT_ALTAR_ADULT,
-        CustomMessage(ctx->GetHint(RH_ALTAR_ADULT)->GetText(), TEXTBOX_TYPE_BLUE));
-    CustomMessageManager::Instance->CreateMessage(
-        Randomizer::hintMessageTableID, TEXT_GANONDORF,
-        CustomMessage(ctx->GetHint(RH_GANONDORF_HINT)->GetText()));
-    CustomMessageManager::Instance->CreateMessage(
-        Randomizer::hintMessageTableID, TEXT_GANONDORF_NOHINT,
-        CustomMessage(ctx->GetHint(RH_GANONDORF_NOHINT)->GetText()));
-    CustomMessageManager::Instance->CreateMessage(
-        Randomizer::hintMessageTableID, TEXT_SHEIK_NEED_HOOK,
-        CustomMessage("{{message}}", "{{message}}", "{{message}}"));
-    CustomMessageManager::Instance->CreateMessage(
-        Randomizer::hintMessageTableID, TEXT_SHEIK_HAVE_HOOK,
-        CustomMessage("{{message}}", "{{message}}", "{{message}}"));
-    CustomMessageManager::Instance->CreateMessage(
-        Randomizer::hintMessageTableID, TEXT_SARIAS_SONG_FACE_TO_FACE,
-        CustomMessage(ctx->GetHint(RH_SARIA)->GetText(), TEXTBOX_TYPE_BLUE));
-
-    for (int i : Rando::StaticData::gossipStoneLocations) {
-        RandomizerHintKey rhk = RandomizerHintKey(i - RC_COLOSSUS_GOSSIP_STONE + 1);
-        CustomMessageManager::Instance->CreateMessage(
-            Randomizer::hintMessageTableID, i, CustomMessage(ctx->GetHint(rhk)->GetText()));
-    }
-
     //Extra Hints
     CustomMessageManager::Instance->ClearMessageTable(Randomizer::randoMiscHintsTableID);
     CustomMessageManager::Instance->AddCustomMessageTable(Randomizer::randoMiscHintsTableID);
 
-    CustomMessageManager::Instance->CreateMessage(
-            Randomizer::randoMiscHintsTableID, TEXT_SKULLTULA_PEOPLE_IM_CURSED,
-            CustomMessage("Yeaaarrgh! I'm cursed!!^Please save me by destroying&%r{{params}} Spiders of the Curse%w&and I will give you my&%g{{item1}}%w!",
-                "Yeaaarrgh! Ich bin verflucht!^Bitte rette mich, indem du %r{{params}} Skulltulas&%wzerstörst und ich werde dir dafür&%g{{item1}} %wgeben!",
-                "Yeaaarrgh! Je suis maudit!^Détruit encore %r{{params}} Araignées de&la Malédiction%w et j'aurai quelque&chose à te donner!&%g({{item1}})")
-        );
-    CustomMessageManager::Instance->CreateMessage(
-            Randomizer::randoMiscHintsTableID, TEXT_DAMPES_DIARY,
-            CustomMessage(ctx->GetHint(RH_DAMPES_DIARY)->GetText())
-        );
-    CustomMessageManager::Instance->CreateMessage(
-            Randomizer::randoMiscHintsTableID, TEXT_CHEST_GAME_PROCEED,
-            CustomMessage(ctx->GetHint(RH_GREG_RUPEE)->GetText())
-        );
-    CustomMessageManager::Instance->CreateMessage(
-            Randomizer::randoMiscHintsTableID, TEXT_FROGS_UNDERWATER,
-            CustomMessage(ctx->GetHint(RH_FROGS)->GetText().GetEnglish(),
-                ctx->GetHint(RH_FROGS)->GetText().GetGerman(),
-                ctx->GetHint(RH_FROGS)->GetText().GetFrench(), TEXTBOX_TYPE_BLUE)
-        );
-    CustomMessageManager::Instance->CreateMessage(Randomizer::randoMiscHintsTableID, TEXT_WARP_MINUET_OF_FOREST,
-        CustomMessage(ctx->GetHint(RH_MINUET_WARP_LOC)->GetText().GetEnglish(),
-            ctx->GetHint(RH_MINUET_WARP_LOC)->GetText().GetGerman(),
-            ctx->GetHint(RH_MINUET_WARP_LOC)->GetText().GetFrench()));
-    CustomMessageManager::Instance->CreateMessage(Randomizer::randoMiscHintsTableID, TEXT_WARP_BOLERO_OF_FIRE,
-        CustomMessage(ctx->GetHint(RH_BOLERO_WARP_LOC)->GetText().GetEnglish(),
-            ctx->GetHint(RH_BOLERO_WARP_LOC)->GetText().GetGerman(),
-            ctx->GetHint(RH_BOLERO_WARP_LOC)->GetText().GetFrench()));
-    CustomMessageManager::Instance->CreateMessage(Randomizer::randoMiscHintsTableID, TEXT_WARP_SERENADE_OF_WATER,
-        CustomMessage(ctx->GetHint(RH_SERENADE_WARP_LOC)->GetText().GetEnglish(),
-            ctx->GetHint(RH_SERENADE_WARP_LOC)->GetText().GetGerman(),
-            ctx->GetHint(RH_SERENADE_WARP_LOC)->GetText().GetFrench()));
-    CustomMessageManager::Instance->CreateMessage(Randomizer::randoMiscHintsTableID, TEXT_WARP_REQUIEM_OF_SPIRIT,
-        CustomMessage(ctx->GetHint(RH_REQUIEM_WARP_LOC)->GetText().GetEnglish(),
-            ctx->GetHint(RH_REQUIEM_WARP_LOC)->GetText().GetGerman(),
-            ctx->GetHint(RH_REQUIEM_WARP_LOC)->GetText().GetFrench()));
-
-    CustomMessageManager::Instance->CreateMessage(
-        Randomizer::randoMiscHintsTableID, TEXT_SARIAS_SONG_FOREST_SOUNDS,
-            CustomMessage("{{message}}", "{{message}}", "{{message}}", TEXTBOX_TYPE_BLUE)
-        );
-
-    CustomMessageManager::Instance->CreateMessage(
-            Randomizer::randoMiscHintsTableID, TEXT_BIGGORON_BETTER_AT_SMITHING,
-            CustomMessage("Arrrrrre you here to claim my finest&%g{{item1}}%w?&Shoooooow me your %rClaim Check.%w",
-            "",
-            "")
-        );
-
-    CustomMessageManager::Instance->CreateMessage(
-            Randomizer::randoMiscHintsTableID, TEXT_GHOST_SHOP_CARD_HAS_POINTS,
-            CustomMessage("You have %g\x1E\x01%r Poe Points%w!&Reach 1000 and you'll get a&%g{{item1}}%w!",
-            "",
-            "")
-        );
-
-    CustomMessageManager::Instance->CreateMessage(
-            Randomizer::randoMiscHintsTableID, TEXT_ANJU_PLEASE_BRING_MY_CUCCOS_BACK,
-            CustomMessage("You! Please!&Bring my Cucco's back to my pen!&I'll give you my %g{{item1}}%w!",
-            "",
-            "")
-        );
-
-    CustomMessageManager::Instance->CreateMessage(
-            Randomizer::randoMiscHintsTableID, TEXT_MALON_OBSTICLE_COURSE,
-            CustomMessage("How about trying the %rObsticle Course?%w&If you beat my time I'll let you keep&my favourite cow Elsie and&her toy %g{{item1}}%w!^"
-            "Challenge the %rObsticle Course?&\x1B&%gLet's go&No thanks%w",
-            "",
-            "")
-        );
-
-    CustomMessageManager::Instance->CreateMessage(
-            Randomizer::randoMiscHintsTableID, TEXT_MALON_HOW_IS_EPONA_DOING,
-            CustomMessage("@! You should come back &with Epona and try to beat my time&on the %rObsticle Course%w!^If you beat my time, I'll give you&my favourite %rcow%w Elsie and&her toy %g{{item1}}%w!",
-            "",
-            "")
-        );
-
-    CustomMessageManager::Instance->CreateMessage(
-            Randomizer::randoMiscHintsTableID, TEXT_MALON_EVERYONE_TURNING_EVIL,
-            CustomMessage("@? Is that you? ^If I ran the ranch, I'd build an &%rObsticle Course%w, and whoever gets&the best time would win a %rcow%w!^Elsie loves sharing her %g{{item1}}%w&with new people, It'll be fun!^...But Ingo won't let me...",
-            "",
-            "")
-        );
-
-    CustomMessageManager::Instance->CreateMessage(
-            Randomizer::randoMiscHintsTableID, TEXT_MALON_INGO_MUST_HAVE_BEEN_TEMPTED,
-            CustomMessage("@! You should come back in&the morning and try to beat my time&on the %rObsticle Course%w!^If you beat my time, I'll give you&my favourite %rcow%w Elsie and&her toy %g{{item1}}%w!",
-            "",
-            "")
-        );
-
-    CustomMessageManager::Instance->CreateMessage(
-            Randomizer::randoMiscHintsTableID, TEXT_HBA_NOT_ON_HORSE,
-            CustomMessage("Hey, rookie!&Come back on your %rhorse%w&and take on the&%rHorseback Archery%w challenge!^Impress me with a high score of 1000&to win a %g{{item1}}%w&or score 1500 for my&%g{{item2}}%w!",
-            "",
-            "")
-        );
-
-    CustomMessageManager::Instance->CreateMessage(
-            Randomizer::randoMiscHintsTableID, TEXT_HBA_INITIAL_EXPLAINATION,
-            CustomMessage("Hey, rookie!&Want to take on the&%rHorseback Archery%w challenge?^Impress me with a high score of 1000&to win a %g{{item1}}%w&or score 1500 for my&%g{{item2}}%w!\x0B",
-            "",
-            "")
-        );
-
-    CustomMessageManager::Instance->CreateMessage(
-            Randomizer::randoMiscHintsTableID, TEXT_HBA_ALREADY_HAVE_1000,
-            CustomMessage("Hey, newcomer!&Want to take on the&%rHorseback Archery%w challenge?^Prove yourself to be a horsemaster&by scoring 1500 points to win &my %g{{item1}}%w!\x0B",
-            "",
-            "")
-        );
-
-    CustomMessageManager::Instance->CreateMessage(
-            Randomizer::randoMiscHintsTableID, TEXT_GF_HBA_SIGN,
-            CustomMessage("%rHorseback Archery%w Range Prizes:&1000: %g{{item1}}%w&1500: %g{{item2}}%w^@'s Record: %g\x1E\x00%w",
-            "",
-            "")
-        );
-
-    CustomMessageManager::Instance->CreateMessage(
-            Randomizer::randoMiscHintsTableID, TEXT_MALON_OBSTICLE_COURSE,
-            CustomMessage("How about trying your skill on the %rObsticle Course?%w& If you beat my time I'll let you keep my favourite cow Elsie and& her toy %g{{item1}}%w!&x1B&%gLet's go&No thanks%w",
-            "",
-            "")
-        );
-
-    CustomMessageManager::Instance->CreateMessage(
-            Randomizer::randoMiscHintsTableID, TEXT_MALON_EVERYONE_TURNING_EVIL,
-            CustomMessage("@? Is that you? &If I ran the ranch, I'd build an %rObsticle Course%w, and whoever gets the best time would win a cow!& Elsie loves sharing her %g{{item1}}%w&with new people, It'll be fun!&...But Ingo won't let me...",
-            "",
-            "")
-        );
-
-    CustomMessageManager::Instance->CreateMessage(
-            Randomizer::randoMiscHintsTableID, TEXT_MALON_INGO_MUST_HAVE_BEEN_TEMPTED,
-            CustomMessage("@! You should come back in the morning and try to beat my time on the %rObsticle Course%w!&If you beat my time, I'll let you keep Elsie and& her toy %g{{item1}}%w!",
-            "",
-            "")
-        );
-
-    CustomMessageManager::Instance->CreateMessage(Randomizer::randoMiscHintsTableID, TEXT_WARP_NOCTURNE_OF_SHADOW,
-        CustomMessage(ctx->GetHint(RH_NOCTURNE_WARP_LOC)->GetText().GetEnglish(),
-            ctx->GetHint(RH_NOCTURNE_WARP_LOC)->GetText().GetGerman(),
-            ctx->GetHint(RH_NOCTURNE_WARP_LOC)->GetText().GetFrench()));
-    CustomMessageManager::Instance->CreateMessage(Randomizer::randoMiscHintsTableID, TEXT_WARP_PRELUDE_OF_LIGHT,
-        CustomMessage(ctx->GetHint(RH_PRELUDE_WARP_LOC)->GetText().GetEnglish(),
-            ctx->GetHint(RH_PRELUDE_WARP_LOC)->GetText().GetGerman(),
-            ctx->GetHint(RH_PRELUDE_WARP_LOC)->GetText().GetFrench()));
 
     // Bow Shooting Gallery reminder
     CustomMessageManager::Instance->CreateMessage(Randomizer::hintMessageTableID, TEXT_SHOOTING_GALLERY_MAN_COME_BACK_WITH_BOW,
@@ -428,19 +252,12 @@ void Randomizer::LoadHintMessages() {
         "Komm wieder sobald du deinen eigenen&Bogen hast, um einen %rspeziellen Preis%w zu&erhalten!",
         "J'aurai %rune autre récompense%w pour toi&lorsque tu auras ton propre arc."));
 
-    // Fishing pond pole hint
-    CustomMessageManager::Instance->CreateMessage(
-            Randomizer::randoMiscHintsTableID, TEXT_FISHING_POND_START,
-            CustomMessage(ctx->GetHint(RH_FISHING_POLE)->GetText().GetEnglish(),
-                ctx->GetHint(RH_FISHING_POLE)->GetText().GetEnglish(),
-                ctx->GetHint(RH_FISHING_POLE)->GetText().GetFrench())
-        );
-        CustomMessageManager::Instance->CreateMessage(
-            Randomizer::randoMiscHintsTableID, TEXT_FISHING_POND_START_MET,
-            CustomMessage(ctx->GetHint(RH_FISHING_POLE)->GetText().GetEnglish(),
-                ctx->GetHint(RH_FISHING_POLE)->GetText().GetEnglish(),
-                ctx->GetHint(RH_FISHING_POLE)->GetText().GetFrench())
-        );
+    // Warp Song Mysterious text
+    CustomMessageManager::Instance->CreateMessage(Randomizer::hintMessageTableID, TEXT_WARP_MINUET_OF_FOREST,
+        CustomMessage("Warp to&#a mysterious place?#&" + CustomMessages::TWO_WAY_CHOICE() + "#OK&No#",
+            "Zu&#ein mysteriöser Ort#?&" + CustomMessages::TWO_WAY_CHOICE() + "#OK&No#",
+            "Se téléporter vers&#un endroit mystérieux#?&" + CustomMessages::TWO_WAY_CHOICE() + "#OK!&Non#",
+            {QM_RED, QM_GREEN}));
 
     // Lake Hylia water level system
     CustomMessageManager::Instance->CreateMessage(Randomizer::hintMessageTableID, TEXT_LAKE_HYLIA_WATER_SWITCH_SIGN,
@@ -493,67 +310,38 @@ void Randomizer::LoadMerchantMessages() {
 
     // Prices have a chance of being 0, and the "sell" message below doesn't really make sense for a free item, so adding a "free" variation here
     CustomMessageManager::Instance->CreateMessage(Randomizer::merchantMessageTableID, TEXT_SCRUB_RANDOM_FREE,
-        CustomMessage("\x12\x38\x82" "All right! You win! In return for&sparing me, I will give you a&%g{{item}}%w!&Please, take it!\x07\x10\xA3",
-            "\x12\x38\x82" "In Ordnung! Du gewinnst! Im Austausch&dafür, dass du mich verschont hast,&werde ich dir einen &%g{{item}}%w geben!\x07\x10\xA3",
-            "\x12\x38\x82" "J'me rends! Laisse-moi partir et en&échange, je te donne un &%g{{item}}%w! Vas-y prends le!\x07\x10\xA3"));
+        CustomMessage("\x12\x38\x82" "All right! You win! In return for&sparing me, I will give you a&%g[[item]]%w!&Please, take it!\x07\x10\xA3",
+            "\x12\x38\x82" "In Ordnung! Du gewinnst! Im Austausch&dafür, dass du mich verschont hast,&werde ich dir einen &%g[[item]]%w geben!\x07\x10\xA3",
+            "\x12\x38\x82" "J'me rends! Laisse-moi partir et en&échange, je te donne un &%g[[item]]%w! Vas-y prends le!\x07\x10\xA3"));
     CustomMessageManager::Instance->CreateMessage(Randomizer::merchantMessageTableID, TEXT_SCRUB_RANDOM,
-        CustomMessage("\x12\x38\x82" "All right! You win! In return for&sparing me, I will sell you a&%g{{item}}%w!&%r{{price}} Rupees%w it is!\x07\x10\xA3",
-            "\x12\x38\x82" "Aufgeben! Ich verkaufe dir einen&%g{{item}}%w&für %r{{price}} Rubine%w!\x07\x10\xA3",
-            "\x12\x38\x82" "J'abandonne! Tu veux bien m'acheter&un %g{{item}}%w?&Ça fera %r{{price}} Rubis%w!\x07\x10\xA3"));
+        CustomMessage("\x12\x38\x82" "All right! You win! In return for&sparing me, I will sell you a&%g[[item]]%w!&%r[[price]] Rupees%w it is!\x07\x10\xA3",
+            "\x12\x38\x82" "Aufgeben! Ich verkaufe dir einen&%g[[item]]%w&für %r[[price]] Rubine%w!\x07\x10\xA3",
+            "\x12\x38\x82" "J'abandonne! Tu veux bien m'acheter&un %g[[item]]%w?&Ça fera %r[[price]] Rubis%w!\x07\x10\xA3"));
+
+    //Carpet Salesman
     CustomMessageManager::Instance->CreateMessage(
-        Randomizer::merchantMessageTableID, TEXT_BEAN_SALESMAN_BUY_FOR_10,
-        CustomMessage(ctx->GetHint(RH_BEAN_SALESMAN)->GetText().GetEnglish(),
-            ctx->GetHint(RH_BEAN_SALESMAN)->GetText().GetGerman(),
-            ctx->GetHint(RH_BEAN_SALESMAN)->GetText().GetFrench()));
+        Randomizer::merchantMessageTableID, TEXT_CARPET_SALESMAN_2,
+        CustomMessage("Finally! Now I can go back to being &an %rarms dealer%w!",
+            /*german*/"Endlich! Schon bald kann ich wieder &%rKrabbelminen-Händler%w sein!",
+            /*french*/ "Squalala! Je vais enfin pouvoir &%rprendre des vacances%w!"));
+
+    // Each shop item has two messages, one for when the cursor is over it, and one for when you select it and are
+    // prompted buy/don't buy
+    CustomMessageManager::Instance->CreateMessage(
+        Randomizer::merchantMessageTableID, TEXT_SHOP_ITEM_RANDOM,
+        CustomMessage("\x08%r[[item]]  [[price]] Rupees&%wSpecial deal! ONE LEFT!&Get it while it lasts!\x0A\x02",
+            "\x08%r[[item]]  [[price]] Rubine&%wSonderangebot! NUR NOCH EINES VERFÜGBAR!&Beeilen Sie sich!\x0A\x02",
+            "\x08%r[[item]]  [[price]] Rubis&%wOffre spéciale! DERNIER EN STOCK!&Faites vite!\x0A\x02"));
+    CustomMessageManager::Instance->CreateMessage(
+        Randomizer::merchantMessageTableID, TEXT_SHOP_ITEM_RANDOM_CONFIRM,
+        CustomMessage("\x08[[item]]  [[price]] Rupees\x09&&\x1B%gBuy&Don't buy%w\x09\x02",
+            "\x08[[item]]  [[price]] Rubine\x09&&\x1B%gKaufen&Nicht kaufen%w\x09\x02",
+            "\x08[[item]]  [[price]] Rubis\x09&&\x1B%gAcheter&Ne pas acheter%w\x09\x02"));
     CustomMessageManager::Instance->CreateMessage(
         Randomizer::merchantMessageTableID, TEXT_BEAN_SALESMAN_BUY_FOR_100,
         CustomMessage("I never thought I'd say this, but I'm &selling the last %rMagic Bean%w. %r99%w Rupees...\x1B&%gYes&No%w",
-            "\x1B&%gJa&Nein%w",
-            "Je te vends mon dernier %rHaricot&magique%w pour %r99 Rubis%w.\x1B&%gAcheter&Ne pas acheter%w"));
-
-
-    //Setup for merchant text boxes
-    //Medigoron
-    //RANDOTODO: Implement obscure/ambiguous hints
-    CustomMessageManager::Instance->CreateMessage(
-        Randomizer::merchantMessageTableID, TEXT_MEDIGORON,
-        CustomMessage(ctx->GetHint(RH_MEDIGORON)->GetText().GetEnglish(),
-            ctx->GetHint(RH_MEDIGORON)->GetText().GetGerman(),
-            ctx->GetHint(RH_MEDIGORON)->GetText().GetFrench()));
-
-    //Granny Shop
-    //RANDOTODO: Implement obscure/ambiguous hints
-    CustomMessageManager::Instance->CreateMessage(
-        Randomizer::merchantMessageTableID, TEXT_GRANNYS_SHOP,
-        CustomMessage(ctx->GetHint(RH_GRANNYS_SHOP)->GetText().GetEnglish(),
-            ctx->GetHint(RH_GRANNYS_SHOP)->GetText().GetGerman(),
-            ctx->GetHint(RH_GRANNYS_SHOP)->GetText().GetFrench()));
-
-    //Carpet Salesman
-    //RANDOTODO: Implement obscure/ambiguous hints
-    CustomMessageManager::Instance->CreateMessage(
-        Randomizer::merchantMessageTableID, TEXT_CARPET_SALESMAN_1,
-        CustomMessage(ctx->GetHint(RH_WASTELAND_BOMBCHU_SALESMAN)->GetText().GetEnglish(),
-            ctx->GetHint(RH_WASTELAND_BOMBCHU_SALESMAN)->GetText().GetGerman(),
-            ctx->GetHint(RH_WASTELAND_BOMBCHU_SALESMAN)->GetText().GetFrench()));
-    CustomMessageManager::Instance->CreateMessage(
-        Randomizer::merchantMessageTableID, TEXT_CARPET_SALESMAN_2,
-        CustomMessage(ctx->GetHint(RH_WASTELAND_BOMBCHU_SALESMAN_POST)->GetText().GetEnglish(),
-            ctx->GetHint(RH_WASTELAND_BOMBCHU_SALESMAN_POST)->GetText().GetGerman(),
-            ctx->GetHint(RH_WASTELAND_BOMBCHU_SALESMAN_POST)->GetText().GetFrench()));
-
-        // Each shop item has two messages, one for when the cursor is over it, and one for when you select it and are
-        // prompted buy/don't buy
-        CustomMessageManager::Instance->CreateMessage(
-            Randomizer::merchantMessageTableID, TEXT_SHOP_ITEM_RANDOM,
-            CustomMessage("\x08%r{{item}}  {{price}} Rupees&%wSpecial deal! ONE LEFT!&Get it while it lasts!\x0A\x02",
-                "\x08%r{{item}}  {{price}} Rubine&%wSonderangebot! NUR NOCH EINES VERFÜGBAR!&Beeilen Sie sich!\x0A\x02",
-                "\x08%r{{item}}  {{price}} Rubis&%wOffre spéciale! DERNIER EN STOCK!&Faites vite!\x0A\x02"));
-        CustomMessageManager::Instance->CreateMessage(
-            Randomizer::merchantMessageTableID, TEXT_SHOP_ITEM_RANDOM_CONFIRM,
-            CustomMessage("\x08{{item}}  {{price}} Rupees\x09&&\x1B%gBuy&Don't buy%w\x09\x02",
-                "\x08{{item}}  {{price}} Rubine\x09&&\x1B%gKaufen&Nicht kaufen%w\x09\x02",
-                "\x08{{item}}  {{price}} Rubis\x09&&\x1B%gAcheter&Ne pas acheter%w\x09\x02"));
+                      "\x1B&%gJa&Nein%w",
+                      "Je te vends mon dernier %rHaricot&magique%w pour %r99 Rubis%w.\x1B&%gAcheter&Ne pas acheter%w"));
 }
 
 bool Randomizer::IsTrialRequired(RandomizerInf trial) {
@@ -1654,7 +1442,7 @@ Rando::Location* Randomizer::GetCheckObjectFromActor(s16 actorId, s16 sceneNum,
         case SCENE_TEMPLE_OF_TIME_EXTERIOR_RUINS:
             switch (actorParams) {
                 case 14342:
-                    specialRc = RC_TOT_LEFT_GOSSIP_STONE;
+                    specialRc = RC_TOT_LEFTMOST_GOSSIP_STONE;
                     break;
                 case 14599:
                     specialRc = RC_TOT_LEFT_CENTER_GOSSIP_STONE;
@@ -1663,7 +1451,7 @@ Rando::Location* Randomizer::GetCheckObjectFromActor(s16 actorId, s16 sceneNum,
                     specialRc = RC_TOT_RIGHT_CENTER_GOSSIP_STONE;
                     break;
                 case 15120:
-                    specialRc = RC_TOT_RIGHT_GOSSIP_STONE;
+                    specialRc = RC_TOT_RIGHTMOST_GOSSIP_STONE;
                     break;
             }
             break;
@@ -1702,11 +1490,11 @@ Rando::Location* Randomizer::GetCheckObjectFromActor(s16 actorId, s16 sceneNum,
             switch (actorParams) {
                 case 15362:
                 case 14594:
-                    specialRc = RC_JABU_GOSSIP_STONE;
+                    specialRc = RC_ZF_JABU_GOSSIP_STONE;
                     break;
                 case 14849:
                 case 14337:
-                    specialRc = RC_FAIRY_GOSSIP_STONE;
+                    specialRc = RC_ZF_FAIRY_GOSSIP_STONE;
                     break;
             }
             break;
@@ -2601,109 +2389,51 @@ void RandomizerSettingsWindow::UpdateElement() {
     }
 }
 
-CustomMessage Randomizer::ReplaceWithItemName(CustomMessage message, std::string&& toReplace, RandomizerCheck hintedCheck){
-    auto ctx = Rando::Context::GetInstance();
-    RandomizerGet targetRG = ctx->GetItemLocation(hintedCheck)->GetPlacedRandomizerGet();
-    std::array<std::string, LANGUAGE_MAX> itemName;
-        if (targetRG == RG_ICE_TRAP) {
-            targetRG = ctx->overrides[hintedCheck].LooksLike();
-            itemName = {
-                ctx->overrides[hintedCheck].GetTrickName().english,
-                ctx->overrides[hintedCheck].GetTrickName().french,
-                ctx->overrides[hintedCheck].GetTrickName().english
-            };
-        } else {
-            itemName = {
-                Rando::StaticData::RetrieveItem(targetRG).GetName().english,
-                Rando::StaticData::RetrieveItem(targetRG).GetName().french,
-                Rando::StaticData::RetrieveItem(targetRG).GetName().english,
-            };
-        }
-    message.Replace(std::move(toReplace), std::move(itemName[0]), std::move(itemName[1]), std::move(itemName[2]));
-    return message;
-}
-
-
-CustomMessage Randomizer::GetMiscHintMessage(TextIDs textToGet, RandomizerCheck hintedCheck, RandomizerCheck otherCheck) {
-    CustomMessage messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::randoMiscHintsTableID, textToGet);
-    messageEntry = ReplaceWithItemName(messageEntry, "{{item1}}", hintedCheck);
-    if (otherCheck != RC_UNKNOWN_CHECK){
-        messageEntry = ReplaceWithItemName(messageEntry, "{{item2}}", otherCheck);
-    }
-    return messageEntry;
-}
-
-CustomMessage Randomizer::GetCursedSkullMessage(s16 params, RandomizerCheck hintedCheck) {
-    auto ctx = Rando::Context::GetInstance();
-    CustomMessage messageEntry = GetMiscHintMessage(TEXT_SKULLTULA_PEOPLE_IM_CURSED, hintedCheck);
-    messageEntry.Replace("{{params}}", std::to_string(params*10));
-    return messageEntry;
-}
-
 CustomMessage Randomizer::GetSheikMessage(s16 scene, u16 originalTextId) {
     auto ctx = Rando::Context::GetInstance();
-    CustomMessage messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::hintMessageTableID, originalTextId);
+    CustomMessage messageEntry;
     switch (scene) {
         case SCENE_TEMPLE_OF_TIME:
-            if (originalTextId == TEXT_SHEIK_NEED_HOOK) {
-                messageEntry.Replace("{{message}}", 
+            if (!CHECK_DUNGEON_ITEM(DUNGEON_KEY_BOSS, SCENE_GANONS_TOWER)) {
+                messageEntry = CustomMessage(
                 "@,&meet me at %gGanon's Castle%w&once you obtain the %rkey to his lair%w.",
                 "@, wir treffen uns bei %gGanons Schloß%w,&sobald Du den %rSchlüssel zu&seinem Verließ%w hast.",
                 "Retrouve-moi au %gChâteau de Ganon%w une&fois que tu auras obtenu la&Mrclé de son repaire%w.");
             } else {
-                messageEntry.Replace("{{message}}",
+                messageEntry = CustomMessage(
                 "The time has come. Prepare yourself.",
                 "Die Zeit ist gekommen.&Mach Dich bereit.",
                 "Le moment est venu @.&Tu ferais bien de te préparer.");
             }
             break;
         case SCENE_INSIDE_GANONS_CASTLE:
-            if (originalTextId == TEXT_SHEIK_NEED_HOOK) {
-                //If MS shuffle is on, Sheik will hint both MS and LA as long as Link doesn't have both, to prevent hint lockout.
-                //Otherwise, she'll only give LA hint so only LA is required to move on.
-                bool needRequirements = GetRandoSettingValue(RSK_SHUFFLE_MASTER_SWORD) ? 
-                  (!CHECK_OWNED_EQUIP(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_MASTER) || INV_CONTENT(ITEM_ARROW_LIGHT) != ITEM_ARROW_LIGHT) :
-                  (INV_CONTENT(ITEM_ARROW_LIGHT) != ITEM_ARROW_LIGHT);
-                if (needRequirements) {
-                    messageEntry.Replace("{{message}}", ctx->GetHint(RH_SHEIK_LIGHT_ARROWS)->GetText().GetEnglish().c_str(), ctx->GetHint(RH_SHEIK_LIGHT_ARROWS)->GetText().GetEnglish().c_str(), ctx->GetHint(RH_SHEIK_LIGHT_ARROWS)->GetText().GetFrench().c_str());
-                } else {
-                    messageEntry.Replace("{{message}}", "You are still ill-equipped to&face %rGanondorf%w."
+            if (ctx->GetOption(RSK_SHEIK_LA_HINT) && INV_CONTENT(ITEM_ARROW_LIGHT) != ITEM_ARROW_LIGHT) {
+                messageEntry = ctx->GetHint(RH_SHEIK_HINT)->GetHintMessage(MF_AUTO_FORMAT);
+            } else if (!(CHECK_OWNED_EQUIP(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_MASTER) && INV_CONTENT(ITEM_ARROW_LIGHT) == ITEM_ARROW_LIGHT &&
+                       CUR_CAPACITY(UPG_QUIVER) >= 30 && gSaveContext.isMagicAcquired)) {
+                messageEntry = CustomMessage("You are still ill-equipped to&face %rGanondorf%w."
                     "^Seek out the %cMaster Sword%w,&%rsomething to hold your arrows%w,&and %gmagic%w to summon the %ylight%w.",
                     "Du bist noch nicht gewappnet um Dich&%rGanondorf%w stellen zu können.^"
                     "Begib Dich auf die Suche nach dem&%cMaster-Schwert%w, %retwas um deine Pfeilen&einen Sinn zu geben%w,^sowie %gdie Magie%w, um das %yLicht%w&herauf beschwören zu können.",
                     "@, tu n'es toujours pas prêt à affronter&%rGanondorf%w.^"
                     "Cherche l'%cÉpée de Légende%w,&%rquelque chose pour ranger tes flèches%w&et de la %gmagie%w pour invoquer la&%ylumière%w.");
-                }                   
-            } else {
-                if (!Flags_GetEventChkInf(EVENTCHKINF_DISPELLED_GANONS_TOWER_BARRIER)) {
-                    messageEntry.Replace("{{message}}",
+            } else if (!Flags_GetEventChkInf(EVENTCHKINF_DISPELLED_GANONS_TOWER_BARRIER)){
+                messageEntry = CustomMessage(
                     "You may have what you need to defeat&%rthe Evil King%w, but the %cbarrier%w still&stands.^Complete the remaining %gtrials%w&to destroy it."
-                    );
-
-                } else {
-                    messageEntry.Replace("{{message}}",
+                );
+            } else {
+                messageEntry = CustomMessage(
                     "If you're ready, then proceed.^Good luck.",
                     "Wenn Du bereit bist, so schreite&voran.^Viel Glück.",
                     "Si tu es prêt, tu peux y aller.^Bonne chance.");
-                }
             }
             break;
     }
         return messageEntry;
 }
 
-CustomMessage Randomizer::GetSariaMessage(u16 originalTextId) {
-    if (originalTextId == TEXT_SARIA_SFM || (originalTextId >= TEXT_SARIAS_SONG_FACE_TO_FACE && originalTextId <= TEXT_SARIAS_SONG_CHANNELING_POWER)) {
-        CustomMessage messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::hintMessageTableID, TEXT_SARIAS_SONG_FACE_TO_FACE);
-        CustomMessage messageEntry2 = messageEntry;
-        std::string code = originalTextId == TEXT_SARIA_SFM ? "" : "\x0B";
-        messageEntry2.Replace("$C", std::move(code));
-        return messageEntry2;
-    }
-}
-
 CustomMessage Randomizer::GetFishingPondOwnerMessage(u16 originalTextId) {
-    CustomMessage hintMessageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::randoMiscHintsTableID, TEXT_FISHING_POND_START);
+    auto ctx = Rando::Context::GetInstance();
     CustomMessage messageEntry = CustomMessage(
       "Sorry, but the pond is closed.&I've lost my good %rfishing pole%w...&Can't go fishing without it!",
       "",
@@ -2711,7 +2441,7 @@ CustomMessage Randomizer::GetFishingPondOwnerMessage(u16 originalTextId) {
     );
 
     if (Rando::Context::GetInstance()->GetOption(RSK_FISHING_POLE_HINT)) {
-        messageEntry = messageEntry + hintMessageEntry;
+        messageEntry = messageEntry + CustomMessage(ctx->GetHint(RH_FISHING_POLE)->GetHintMessage());
     }
 
     // if the fishing pond guy doesnt remember me i will cry :(
@@ -2723,61 +2453,38 @@ CustomMessage Randomizer::GetFishingPondOwnerMessage(u16 originalTextId) {
         ) + messageEntry;
     }
 
-    messageEntry.Format();
+    messageEntry.Format(); //RANDOTODO why is this needed when it's not elsewhere....
 
     return messageEntry;
 }
 
 CustomMessage Randomizer::GetMerchantMessage(RandomizerInf randomizerInf, u16 textId, bool mysterious) {
-    auto ctx = Rando::Context::GetInstance();
+    auto ctx = Rando::Context::GetInstance(); //RANDOTODO If scrubs are allowed to have ambiguous hints, they need to be RandomiserHint objects for logging
     CustomMessage messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::merchantMessageTableID, textId);
     RandomizerCheck rc = GetCheckFromRandomizerInf(randomizerInf);
     RandomizerGet shopItemGet = ctx->GetItemLocation(rc)->GetPlacedRandomizerGet();
-    std::array<std::string, LANGUAGE_MAX> shopItemName;
+    CustomMessage shopItemName;
     if (mysterious) {
-        shopItemName = {
-            "mysterious item",
-            "mysteriösen Gegenstand",
-            "objet mystérieux"
-        };
+        shopItemName = Rando::StaticData::hintTextTable[RHT_MYSTERIOUS_ITEM].GetHintMessage(); 
     // TODO: This should eventually be replaced with a full fledged trick model & trick name system
     } else if (shopItemGet == RG_ICE_TRAP) {
         shopItemGet = ctx->overrides[rc].LooksLike();
-        shopItemName = {
-            std::string(ctx->overrides[rc].GetTrickName().english),
-            std::string(ctx->overrides[rc].GetTrickName().french),
-            std::string(ctx->overrides[rc].GetTrickName().english)
-        };
+        shopItemName = CustomMessage(ctx->overrides[rc].GetTrickName());
     } else { 
         auto shopItem = Rando::StaticData::RetrieveItem(shopItemGet);
-        shopItemName = {
-            shopItem.GetName().english,
-            shopItem.GetName().french,
-            shopItem.GetName().english,
-        };
+        shopItemName = {shopItem.GetName()};
     }
     u16 shopItemPrice = ctx->GetItemLocation(rc)->GetPrice();
 
     if (textId == TEXT_SCRUB_RANDOM && shopItemPrice == 0) {
         messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::merchantMessageTableID, TEXT_SCRUB_RANDOM_FREE);
-    } else if (textId == TEXT_GRANNYS_SHOP) {
-        // Capitalize the first letter for the item in Granny's text as the item is the first word presented
-        for (auto &itemName : shopItemName) {
-            itemName[0] = std::toupper(itemName[0]);
-        }
     }
 
-    messageEntry.Replace("{{item}}", std::move(shopItemName[0]), std::move(shopItemName[1]), std::move(shopItemName[2]));
-    messageEntry.Replace("{{price}}", std::to_string(shopItemPrice));
+    messageEntry.Replace("[[item]]", shopItemName);
+    messageEntry.Replace("[[price]]", std::to_string(shopItemPrice));
     return messageEntry;
 }
 
-static const char* mapGetItemHints[3][2] = {
-    { " It's ordinary.", " It's masterful!" },
-    { "&Sieht aus wie immer.", " &Man kann darauf die Worte&%r\"Master Quest\"%w entziffern..." },
-    { "&Elle vous semble %rordinaire%w.", "&Étrange... les mots %r\"Master&Quest\"%w sont gravés dessus." },
-};
-
 CustomMessage Randomizer::GetMapGetItemMessageWithHint(GetItemEntry itemEntry) {
     CustomMessage messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::getItemMessageTableID, itemEntry.getItemId);
     int sceneNum;
@@ -2818,11 +2525,11 @@ CustomMessage Randomizer::GetMapGetItemMessageWithHint(GetItemEntry itemEntry) {
         (GetRandoSettingValue(RSK_MQ_DUNGEON_RANDOM) == RO_MQ_DUNGEONS_SET_NUMBER &&
          GetRandoSettingValue(RSK_MQ_DUNGEON_COUNT) == 12)
        ) {
-        messageEntry.Replace("{{typeHint}}", "");
+        messageEntry.Replace("[[typeHint]]", "");
     } else if (ResourceMgr_IsSceneMasterQuest(sceneNum)) {
-        messageEntry.Replace("{{typeHint}}", mapGetItemHints[0][1], mapGetItemHints[1][1], mapGetItemHints[2][1]);
+        messageEntry.Replace("[[typeHint]]", Rando::StaticData::hintTextTable[RHT_DUNGEON_MASTERFUL].GetHintMessage());
     } else {
-        messageEntry.Replace("{{typeHint}}", mapGetItemHints[0][0], mapGetItemHints[1][0], mapGetItemHints[2][0]);
+        messageEntry.Replace("[[typeHint]]", Rando::StaticData::hintTextTable[RHT_DUNGEON_ORDINARY].GetHintMessage());
     }
 
     return messageEntry;
@@ -2848,16 +2555,16 @@ void CreateRupeeMessages() {
     for (u8 rupee : rupees) {
         switch (rupee) {
             case TEXT_BLUE_RUPEE:
-                rupeeText = "\x05\x03 5 {{rupee}}\x05\x00";
+                rupeeText = "\x05\x03 5 [[rupee]]\x05\x00";
                 break;
             case TEXT_RED_RUPEE:
-                rupeeText = "\x05\x01 20 {{rupee}}\x05\x00";
+                rupeeText = "\x05\x01 20 [[rupee]]\x05\x00";
                 break;
             case TEXT_PURPLE_RUPEE:
-                rupeeText = "\x05\x05 50 {{rupee}}\x05\x00";
+                rupeeText = "\x05\x05 50 [[rupee]]\x05\x00";
                 break;
             case TEXT_HUGE_RUPEE:
-                rupeeText = "\x05\x06 200 {{rupee}}\x05\x00";
+                rupeeText = "\x05\x06 200 [[rupee]]\x05\x00";
                 break;
         }
         customMessageManager->CreateMessage(
@@ -2869,37 +2576,38 @@ void CreateRupeeMessages() {
 
 CustomMessage Randomizer::GetRupeeMessage(u16 rupeeTextId) {
     CustomMessage messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::rupeeMessageTableID, rupeeTextId);
-    messageEntry.Replace("{{rupee}}", RandomElement(englishRupeeNames),
-                                                 RandomElement(germanRupeeNames), RandomElement(frenchRupeeNames));
+    messageEntry.Replace("[[rupee]]", CustomMessage(RandomElement(englishRupeeNames),
+                                                    RandomElement(germanRupeeNames),
+                                                    RandomElement(frenchRupeeNames)));
     return messageEntry;
 }
 
 void CreateTriforcePieceMessages() {
     CustomMessage TriforcePieceMessages[NUM_TRIFORCE_PIECE_MESSAGES] = {
 
-        { "You found a %yTriforce Piece%w!&%g{{current}}%w down, %c{{remaining}}%w to go. It's a start!",
-          "Ein %yTriforce-Splitter%w! Du hast&%g{{current}}%w von %c{{required}}%w gefunden. Es ist ein&Anfang!",
-          "Vous trouvez un %yFragment de la&Triforce%w! Vous en avez %g{{current}}%w, il en&reste %c{{remaining}}%w à trouver. C'est un début!" },
+        { "You found a %yTriforce Piece%w!&%g[[current]]%w down, %c[[remaining]]%w to go. It's a start!",
+          "Ein %yTriforce-Splitter%w! Du hast&%g[[current]]%w von %c[[required]]%w gefunden. Es ist ein&Anfang!",
+          "Vous trouvez un %yFragment de la&Triforce%w! Vous en avez %g[[current]]%w, il en&reste %c[[remaining]]%w à trouver. C'est un début!" },
 
-        { "You found a %yTriforce Piece%w!&%g{{current}}%w down, %c{{remaining}}%w to go. Progress!",
-          "Ein %yTriforce-Splitter%w! Du hast&%g{{current}}%w von %c{{required}}%w gefunden. Es geht voran!",
-          "Vous trouvez un %yFragment de la&Triforce%w! Vous en avez %g{{current}}%w, il en&reste %c{{remaining}}%w à trouver. Ça avance!" },
+        { "You found a %yTriforce Piece%w!&%g[[current]]%w down, %c[[remaining]]%w to go. Progress!",
+          "Ein %yTriforce-Splitter%w! Du hast&%g[[current]]%w von %c[[required]]%w gefunden. Es geht voran!",
+          "Vous trouvez un %yFragment de la&Triforce%w! Vous en avez %g[[current]]%w, il en&reste %c[[remaining]]%w à trouver. Ça avance!" },
 
-        { "You found a %yTriforce Piece%w!&%g{{current}}%w down, %c{{remaining}}%w to go. Over half-way&there!",
-          "Ein %yTriforce-Splitter%w! Du hast&schon %g{{current}}%w von %c{{required}}%w gefunden. Schon&über die Hälfte!",
-          "Vous trouvez un %yFragment de la&Triforce%w! Vous en avez %g{{current}}%w, il en&reste %c{{remaining}}%w à trouver. Il en reste un&peu moins que la moitié!" },
+        { "You found a %yTriforce Piece%w!&%g[[current]]%w down, %c[[remaining]]%w to go. Over half-way&there!",
+          "Ein %yTriforce-Splitter%w! Du hast&schon %g[[current]]%w von %c[[required]]%w gefunden. Schon&über die Hälfte!",
+          "Vous trouvez un %yFragment de la&Triforce%w! Vous en avez %g[[current]]%w, il en&reste %c[[remaining]]%w à trouver. Il en reste un&peu moins que la moitié!" },
 
-        { "You found a %yTriforce Piece%w!&%g{{current}}%w down, %c{{remaining}}%w to go. Almost done!",
-          "Ein %yTriforce-Splitter%w! Du hast&schon %g{{current}}%w von %c{{required}}%w gefunden. Fast&geschafft!",
-          "Vous trouvez un %yFragment de la&Triforce%w! Vous en avez %g{{current}}%w, il en&reste %c{{remaining}}%w à trouver. C'est presque&terminé!" },
+        { "You found a %yTriforce Piece%w!&%g[[current]]%w down, %c[[remaining]]%w to go. Almost done!",
+          "Ein %yTriforce-Splitter%w! Du hast&schon %g[[current]]%w von %c[[required]]%w gefunden. Fast&geschafft!",
+          "Vous trouvez un %yFragment de la&Triforce%w! Vous en avez %g[[current]]%w, il en&reste %c[[remaining]]%w à trouver. C'est presque&terminé!" },
 
         { "You completed the %yTriforce of&Courage%w! %gGG%w!",
           "Das %yTriforce des Mutes%w! Du hast&alle Splitter gefunden. %gGut gemacht%w!",
           "Vous avez complété la %yTriforce&du Courage%w! %gFélicitations%w!" },
 
-        { "You found a spare %yTriforce Piece%w!&You only needed %c{{required}}%w, but you have %g{{current}}%w!",
-          "Ein übriger %yTriforce-Splitter%w! Du&hast nun %g{{current}}%w von %c{{required}}%w nötigen gefunden.",
-          "Vous avez trouvé un %yFragment de&Triforce%w en plus! Vous n'aviez besoin&que de %c{{required}}%w, mais vous en avez %g{{current}}%w en&tout!" },
+        { "You found a spare %yTriforce Piece%w!&You only needed %c[[required]]%w, but you have %g[[current]]%w!",
+          "Ein übriger %yTriforce-Splitter%w! Du&hast nun %g[[current]]%w von %c[[required]]%w nötigen gefunden.",
+          "Vous avez trouvé un %yFragment de&Triforce%w en plus! Vous n'aviez besoin&que de %c[[required]]%w, mais vous en avez %g[[current]]%w en&tout!" },
     };
     CustomMessageManager* customMessageManager = CustomMessageManager::Instance;
     customMessageManager->AddCustomMessageTable(Randomizer::triforcePieceMessageTableID);
@@ -2932,9 +2640,9 @@ CustomMessage Randomizer::GetTriforcePieceMessage() {
 
     CustomMessage messageEntry =
         CustomMessageManager::Instance->RetrieveMessage(Randomizer::triforcePieceMessageTableID, messageIndex);
-    messageEntry.Replace("{{current}}", std::to_string(current), std::to_string(current), std::to_string(current));
-    messageEntry.Replace("{{remaining}}", std::to_string(remaining), std::to_string(remaining), std::to_string(remaining));
-    messageEntry.Replace("{{required}}", std::to_string(required), std::to_string(required), std::to_string(required));
+    messageEntry.Replace("[[current]]", std::to_string(current));
+    messageEntry.Replace("[[remaining]]", std::to_string(remaining));
+    messageEntry.Replace("[[required]]", std::to_string(required));
     return messageEntry;
 }
 
@@ -3156,11 +2864,11 @@ void CreateFireTempleGoronMessages() {
             "je&ressemble à n'importe quel Goron?",
         },
         {
-            "How long has it been, do you know?^%r{{days}}%w days!?^Oh no, and it's %r\x1F%w?&I have to check on my "
+            "How long has it been, do you know?^%r[[days]]%w days!?^Oh no, and it's %r\x1F%w?&I have to check on my "
             "cake!!",
-            "Weißt du zufällig, wie viele Tage&vergangen sind?^%r{{days}}%w Tage!?^Oh je, und es ist %r\x1F%w Uhr? "
+            "Weißt du zufällig, wie viele Tage&vergangen sind?^%r[[days]]%w Tage!?^Oh je, und es ist %r\x1F%w Uhr? "
             "Ich&muss dringend nach meinem Kuchen&sehen!!!",
-            "Cela fait combien de temps que&je suis enfermé ici?&Non mais je ne vais pas crier.^COMBIEN?! %r{{days}}%w "
+            "Cela fait combien de temps que&je suis enfermé ici?&Non mais je ne vais pas crier.^COMBIEN?! %r[[days]]%w "
             "JOURS!?^En plus il est %r\x1F%w...&Il faut vraiment que je rentre...",
         },
         {
@@ -3182,11 +2890,11 @@ void CreateFireTempleGoronMessages() {
             "aller.&A plus tard.",
         },
         { "Do you know about %b\x9f%w?&It's this weird symbol that's been&in my dreams lately...^Apparently, you "
-          "pressed it %b{{a_btn}}%w times.^Wow.",
+          "pressed it %b[[a_btn]]%w times.^Wow.",
           "Weißt du über %b\x9f%w bescheid?&Es sind Symbole, die mir&in letzter Zeit öfter in&meinen Träumen "
-          "erschienen sind...^Es scheint, dass du sie schon&%b{{a_btn}}%w mal betätigt hast.^Faszinierend...",
+          "erschienen sind...^Es scheint, dass du sie schon&%b[[a_btn]]%w mal betätigt hast.^Faszinierend...",
           "Tu as déjà entendu parler du&symbole %b\x9f%w?&C'est un symbole bizarre qui est&apparu dans mes rêves "
-          "dernièrement...^Apparemment, tu as appuyé dessus&%b{{a_btn}}%w fois.^Wow..." },
+          "dernièrement...^Apparemment, tu as appuyé dessus&%b[[a_btn]]%w fois.^Wow..." },
         {
             "\x13\x1A"
             "Boy, you must be hot!&Get yourself a bottle of&%rLon Lon Milk%w right away and cool&down, for only %g30%w "
@@ -3223,8 +2931,8 @@ void CreateFireTempleGoronMessages() {
 
 CustomMessage Randomizer::GetGoronMessage(u16 index) {
     CustomMessage messageEntry = CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, goronIDs[index]);
-    messageEntry.Replace("{{days}}", std::to_string(gSaveContext.totalDays));
-    messageEntry.Replace("{{a_btn}}", std::to_string(gSaveContext.sohStats.count[COUNT_BUTTON_PRESSES_A]));
+    messageEntry.Replace("[[days]]", std::to_string(gSaveContext.totalDays));
+    messageEntry.Replace("[[a_btn]]", std::to_string(gSaveContext.sohStats.count[COUNT_BUTTON_PRESSES_A]));
     return messageEntry;
 }
 
@@ -3377,45 +3085,45 @@ void Randomizer::CreateCustomMessages() {
 			"Vous obtenez la %rClé d'or %wdu&%rChâteau de Ganon%w!"),
 
         GIMESSAGE(RG_DEKU_TREE_MAP, ITEM_DUNGEON_MAP,
-			"You found the %gDeku Tree &%wMap!{{typeHint}}",
-			"Du erhältst die %rKarte%w für den&%gDeku-Baum%w!{{typeHint}}",
-			"Vous obtenez la %rCarte %wde&l'%gArbre Mojo%w!{{typeHint}}"),
+			"You found the %gDeku Tree &%wMap![[typeHint]]",
+			"Du erhältst die %rKarte%w für den&%gDeku-Baum%w![[typeHint]]",
+			"Vous obtenez la %rCarte %wde&l'%gArbre Mojo%w![[typeHint]]"),
         GIMESSAGE(RG_DODONGOS_CAVERN_MAP, ITEM_DUNGEON_MAP,
-			"You found the %rDodongo's Cavern &%wMap!{{typeHint}}",
-			"Du erhältst die %rKarte%w für&%rDodongos Höhle%w!{{typeHint}}",
-			"Vous obtenez la %rCarte %wde la&%rCaverne Dodongo%w!{{typeHint}}"),
+			"You found the %rDodongo's Cavern &%wMap![[typeHint]]",
+			"Du erhältst die %rKarte%w für&%rDodongos Höhle%w![[typeHint]]",
+			"Vous obtenez la %rCarte %wde la&%rCaverne Dodongo%w![[typeHint]]"),
         GIMESSAGE(RG_JABU_JABUS_BELLY_MAP, ITEM_DUNGEON_MAP,
-			"You found the %bJabu Jabu's Belly &%wMap!{{typeHint}}",
-			"Du erhältst die %rKarte%w für&%bJabu-Jabus Bauch%w!{{typeHint}}",
-			"Vous obtenez la %rCarte %wdu &%bVentre de Jabu-Jabu%w!{{typeHint}}"),
+			"You found the %bJabu Jabu's Belly &%wMap![[typeHint]]",
+			"Du erhältst die %rKarte%w für&%bJabu-Jabus Bauch%w![[typeHint]]",
+			"Vous obtenez la %rCarte %wdu &%bVentre de Jabu-Jabu%w![[typeHint]]"),
         GIMESSAGE(RG_FOREST_TEMPLE_MAP, ITEM_DUNGEON_MAP,
-			"You found the %gForest Temple &%wMap!{{typeHint}}",
-			"Du erhältst die %rKarte%w für den&%gWaldtempel%w!{{typeHint}}",
-			"Vous obtenez la %rCarte %wdu &%gTemple de la Forêt%w!{{typeHint}}"),
+			"You found the %gForest Temple &%wMap![[typeHint]]",
+			"Du erhältst die %rKarte%w für den&%gWaldtempel%w![[typeHint]]",
+			"Vous obtenez la %rCarte %wdu &%gTemple de la Forêt%w![[typeHint]]"),
         GIMESSAGE(RG_FIRE_TEMPLE_MAP, ITEM_DUNGEON_MAP,
-			"You found the %rFire Temple &%wMap!{{typeHint}}",
-			"Du erhältst die %rKarte%w für den&%rFeuertempel%w!{{typeHint}}",
-			"Vous obtenez la %rCarte %wdu &%rTemple du Feu%w!{{typeHint}}"),
+			"You found the %rFire Temple &%wMap![[typeHint]]",
+			"Du erhältst die %rKarte%w für den&%rFeuertempel%w![[typeHint]]",
+			"Vous obtenez la %rCarte %wdu &%rTemple du Feu%w![[typeHint]]"),
         GIMESSAGE(RG_WATER_TEMPLE_MAP, ITEM_DUNGEON_MAP,
-			"You found the %bWater Temple &%wMap!{{typeHint}}",
-			"Du erhältst die %rKarte%w für den&%bWassertempel%w!{{typeHint}}",
-			"Vous obtenez la %rCarte %wdu &%bTemple de l'Eau%w!{{typeHint}}"),
+			"You found the %bWater Temple &%wMap![[typeHint]]",
+			"Du erhältst die %rKarte%w für den&%bWassertempel%w![[typeHint]]",
+			"Vous obtenez la %rCarte %wdu &%bTemple de l'Eau%w![[typeHint]]"),
         GIMESSAGE(RG_SPIRIT_TEMPLE_MAP, ITEM_DUNGEON_MAP,
-			"You found the %ySpirit Temple &%wMap!{{typeHint}}",
-			"Du erhältst die %rKarte%w für den&%yGeistertempel%w!{{typeHint}}",
-			"Vous obtenez la %rCarte %wdu &%yTemple de l'Esprit%w!{{typeHint}}"),
+			"You found the %ySpirit Temple &%wMap![[typeHint]]",
+			"Du erhältst die %rKarte%w für den&%yGeistertempel%w![[typeHint]]",
+			"Vous obtenez la %rCarte %wdu &%yTemple de l'Esprit%w![[typeHint]]"),
         GIMESSAGE(RG_SHADOW_TEMPLE_MAP, ITEM_DUNGEON_MAP,
-			"You found the %pShadow Temple &%wMap!{{typeHint}}",
-			"Du erhältst die %rKarte%w für den&%pSchattentempel%w!{{typeHint}}",
-			"Vous obtenez la %rCarte %wdu &%pTemple de l'Ombre%w!{{typeHint}}"),
+			"You found the %pShadow Temple &%wMap![[typeHint]]",
+			"Du erhältst die %rKarte%w für den&%pSchattentempel%w![[typeHint]]",
+			"Vous obtenez la %rCarte %wdu &%pTemple de l'Ombre%w![[typeHint]]"),
         GIMESSAGE(RG_BOTTOM_OF_THE_WELL_MAP, ITEM_DUNGEON_MAP,
-			"You found the %pBottom of the &Well %wMap!{{typeHint}}",
-			"Du erhältst die %rKarte%w für den&%pGrund des Brunnens%w!{{typeHint}}",
-			"Vous obtenez la %rCarte %wdu &%pPuits%w!{{typeHint}}"),
+			"You found the %pBottom of the &Well %wMap![[typeHint]]",
+			"Du erhältst die %rKarte%w für den&%pGrund des Brunnens%w![[typeHint]]",
+			"Vous obtenez la %rCarte %wdu &%pPuits%w![[typeHint]]"),
         GIMESSAGE(RG_ICE_CAVERN_MAP, ITEM_DUNGEON_MAP,
-			"You found the %cIce Cavern &%wMap!{{typeHint}}",
-			"Du erhältst die %rKarte%w für die&%cEishöhle%w!{{typeHint}}",
-			"Vous obtenez la %rCarte %wde &la %cCaverne Polaire%w!{{typeHint}}"),
+			"You found the %cIce Cavern &%wMap![[typeHint]]",
+			"Du erhältst die %rKarte%w für die&%cEishöhle%w![[typeHint]]",
+			"Vous obtenez la %rCarte %wde &la %cCaverne Polaire%w![[typeHint]]"),
 
         GIMESSAGE(RG_DEKU_TREE_COMPASS, ITEM_COMPASS,
 			"You found the %gDeku Tree &%wCompass!",
diff --git a/soh/soh/Enhancements/randomizer/randomizer.h b/soh/soh/Enhancements/randomizer/randomizer.h
index 5f567cd54..866f4cd7f 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.h
+++ b/soh/soh/Enhancements/randomizer/randomizer.h
@@ -59,13 +59,9 @@ class Randomizer {
     ItemObtainability GetItemObtainabilityFromRandomizerCheck(RandomizerCheck randomizerCheck);
     ItemObtainability GetItemObtainabilityFromRandomizerGet(RandomizerGet randomizerCheck);
     CustomMessage GetSheikMessage(s16 scene, u16 originalTextId);
-    CustomMessage ReplaceWithItemName(CustomMessage message, std::string&& toReplace, RandomizerCheck hintedCheck);
-    CustomMessage GetMiscHintMessage(TextIDs textToGet, RandomizerCheck hintedCheck, RandomizerCheck otherCheck = RC_UNKNOWN_CHECK);
-    CustomMessage GetSariaMessage(u16 originalTextId);
     CustomMessage GetFishingPondOwnerMessage(u16 originalTextId);
     CustomMessage GetMerchantMessage(RandomizerInf randomizerInf, u16 textId, bool mysterious = false);
     RandomizerCheck GetCheckFromActor(s16 actorId, s16 sceneNum, s16 actorParams);
-    CustomMessage GetCursedSkullMessage(s16 params, RandomizerCheck hintedCheck);
     CustomMessage GetGoronMessage(u16 index);
     CustomMessage GetMapGetItemMessageWithHint(GetItemEntry itemEntry);
     static void CreateCustomMessages();
diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h
index 91906d127..5e651e807 100644
--- a/soh/soh/Enhancements/randomizer/randomizerTypes.h
+++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@@ -38,14 +38,18 @@ typedef enum {
 } RandomizerCheckStatus;
 
 typedef enum {
-    HINT_TYPE_STATIC,
+    HINT_TYPE_HINT_KEY,
+    HINT_TYPE_AREA,
+    HINT_TYPE_ITEM,
     HINT_TYPE_TRIAL,
-    HINT_TYPE_WOTH, // Way of the Hero
-    HINT_TYPE_BARREN,
     HINT_TYPE_ENTRANCE,
     HINT_TYPE_ITEM_AREA,
-    HINT_TYPE_ITEM_LOCATION,
-    HINT_TYPE_JUNK,
+    HINT_TYPE_MERCHANT,
+    HINT_TYPE_ALTAR_CHILD,
+    HINT_TYPE_ALTAR_ADULT,
+    HINT_TYPE_WOTH, // Way of the Hero
+    HINT_TYPE_FOOLISH,
+    HINT_TYPE_MESSAGE,
     HINT_TYPE_MAX
 } HintType;
 
@@ -90,24 +94,34 @@ typedef enum {
     RA_MAX
 } RandomizerArea;
 
+typedef enum {
+    TK_LIGHT_TRIAL,
+    TK_FOREST_TRIAL,
+    TK_FIRE_TRIAL,
+    TK_WATER_TRIAL,
+    TK_SPIRIT_TRIAL,
+    TK_SHADOW_TRIAL,
+    TK_MAX
+} TrialKey;
+
 // Check types based on main settings
 typedef enum {
-    RCTYPE_STANDARD,       // Base set of rando checks
-    RCTYPE_SKULL_TOKEN,    // Gold Skulltulas
-    RCTYPE_COW,            // Cows
-    RCTYPE_ADULT_TRADE,    // Adult trade quest checks
-    RCTYPE_FROG_SONG,      // Frog song purple rupee checks
-    RCTYPE_MAP_COMPASS,    // Maps/Compasses
-    RCTYPE_SMALL_KEY,      // Small Keys
-    RCTYPE_GF_KEY,         // Gerudo Fortress Keys
-    RCTYPE_BOSS_KEY,       // Boss Keys
-    RCTYPE_GANON_BOSS_KEY, // Ganon's boss key
-    RCTYPE_SHOP,           // shops
-    RCTYPE_SCRUB,          // scrubs
-    RCTYPE_MERCHANT,       // merchants
-    RCTYPE_CHEST_GAME,     // todo replace this once we implement it, just using it to exclude for now
-    RCTYPE_LINKS_POCKET,   // todo this feels hacky
-    RCTYPE_GOSSIP_STONE,
+    RCTYPE_STANDARD,                   // Base set of rando checks
+    RCTYPE_SKULL_TOKEN,                // Gold Skulltulas
+    RCTYPE_COW,                        // Cows
+    RCTYPE_ADULT_TRADE,                // Adult trade quest checks
+    RCTYPE_FROG_SONG,                  // Frog song purple rupee checks
+    RCTYPE_MAP_COMPASS,                // Maps/Compasses
+    RCTYPE_SMALL_KEY,                  // Small Keys
+    RCTYPE_GF_KEY,                     // Gerudo Fortress Keys
+    RCTYPE_BOSS_KEY,                   // Boss Keys
+    RCTYPE_GANON_BOSS_KEY,             // Ganon's boss key
+    RCTYPE_SHOP,                       // shops
+    RCTYPE_SCRUB,                      // scrubs
+    RCTYPE_MERCHANT,                   // merchants
+    RCTYPE_CHEST_GAME,                 // RANDOTODO replace this once we implement it, just using it to exclude for now
+    RCTYPE_LINKS_POCKET,               // RANDOTODO this feels hacky, replace with better starting items
+    RCTYPE_GOSSIP_STONE,               // RANDOTODO make these into event access
     RCTYPE_SONG_LOCATION,              // Song locations
     RCTYPE_BOSS_HEART_OR_OTHER_REWARD, // Boss heart container or lesser dungeon rewards (lens, ice arrow)
     RCTYPE_DUNGEON_REWARD,             // Dungeon rewards (blue warps)
@@ -1388,46 +1402,46 @@ typedef enum {
     RC_PIERRE,
     RC_DELIVER_RUTOS_LETTER,
     RC_MASTER_SWORD_PEDESTAL,
-    RC_COLOSSUS_GOSSIP_STONE,
-    RC_DMC_GOSSIP_STONE,
-    RC_DMC_UPPER_GROTTO_GOSSIP_STONE,
-    RC_DMT_GOSSIP_STONE,
-    RC_DMT_STORMS_GROTTO_GOSSIP_STONE,
-    RC_DODONGOS_CAVERN_GOSSIP_STONE,
-    RC_FAIRY_GOSSIP_STONE,
-    RC_GC_MAZE_GOSSIP_STONE,
-    RC_GC_MEDIGORON_GOSSIP_STONE,
-    RC_GV_GOSSIP_STONE,
-    RC_GY_GOSSIP_STONE,
-    RC_HC_MALON_GOSSIP_STONE,
-    RC_HC_ROCK_WALL_GOSSIP_STONE,
-    RC_HC_STORMS_GROTTO_GOSSIP_STONE,
-    RC_HF_COW_GROTTO_GOSSIP_STONE,
-    RC_HF_NEAR_MARKET_GOSSIP_STONE,
-    RC_HF_OPEN_GROTTO_GOSSIP_STONE,
-    RC_HF_SOUTHEAST_GOSSIP_STONE,
-    RC_JABU_GOSSIP_STONE,
     RC_KF_DEKU_TREE_LEFT_GOSSIP_STONE,
     RC_KF_DEKU_TREE_RIGHT_GOSSIP_STONE,
     RC_KF_GOSSIP_STONE,
-    RC_KF_STORMS_GOSSIP_STONE,
-    RC_KAK_OPEN_GROTTO_GOSSIP_STONE,
-    RC_LH_LAB_GOSSIP_STONE,
-    RC_LH_SOUTHEAST_GOSSIP_STONE,
-    RC_LH_SOUTHWEST_GOSSIP_STONE,
+    RC_KF_STORMS_GROTTO_GOSSIP_STONE,
     RC_LW_GOSSIP_STONE,
-    RC_LW_NEAR_SHORTCUTS_GOSSIP_STONE,
+    RC_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE,
     RC_SFM_MAZE_LOWER_GOSSIP_STONE,
     RC_SFM_MAZE_UPPER_GOSSIP_STONE,
     RC_SFM_SARIA_GOSSIP_STONE,
+    RC_HF_COW_GROTTO_GOSSIP_STONE,
+    RC_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE,
+    RC_HF_OPEN_GROTTO_GOSSIP_STONE,
+    RC_HF_SOUTHEAST_GROTTO_GOSSIP_STONE,
     RC_TOT_LEFT_CENTER_GOSSIP_STONE,
-    RC_TOT_LEFT_GOSSIP_STONE,
+    RC_TOT_LEFTMOST_GOSSIP_STONE,
     RC_TOT_RIGHT_CENTER_GOSSIP_STONE,
-    RC_TOT_RIGHT_GOSSIP_STONE,
-    RC_ZD_GOSSIP_STONE,
+    RC_TOT_RIGHTMOST_GOSSIP_STONE,
+    RC_HC_MALON_GOSSIP_STONE,
+    RC_HC_ROCK_WALL_GOSSIP_STONE,
+    RC_HC_STORMS_GROTTO_GOSSIP_STONE,
+    RC_KAK_OPEN_GROTTO_GOSSIP_STONE,
+    RC_GRAVEYARD_GOSSIP_STONE,
+    RC_DMT_GOSSIP_STONE,
+    RC_DMT_STORMS_GROTTO_GOSSIP_STONE,
+    RC_GC_MAZE_GOSSIP_STONE,
+    RC_GC_MEDIGORON_GOSSIP_STONE,
+    RC_DMC_GOSSIP_STONE,
+    RC_DMC_UPPER_GROTTO_GOSSIP_STONE,
     RC_ZR_NEAR_DOMAIN_GOSSIP_STONE,
     RC_ZR_NEAR_GROTTOS_GOSSIP_STONE,
     RC_ZR_OPEN_GROTTO_GOSSIP_STONE,
+    RC_ZD_GOSSIP_STONE,
+    RC_ZF_JABU_GOSSIP_STONE,
+    RC_ZF_FAIRY_GOSSIP_STONE,
+    RC_LH_LAB_GOSSIP_STONE,
+    RC_LH_SOUTHEAST_GOSSIP_STONE,
+    RC_LH_SOUTHWEST_GOSSIP_STONE,
+    RC_GV_GOSSIP_STONE,
+    RC_COLOSSUS_GOSSIP_STONE,
+    RC_DODONGOS_CAVERN_GOSSIP_STONE,
     RC_KF_STORMS_GROTTO_BEEHIVE_LEFT,
     RC_KF_STORMS_GROTTO_BEEHIVE_RIGHT,
     RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_LEFT,
@@ -1996,75 +2010,83 @@ typedef enum {
 
 typedef enum {
     RH_NONE,
-    RH_COLOSSUS_GOSSIP_STONE,
-    RH_DMC_GOSSIP_STONE,
-    RH_DMC_UPPER_GROTTO_GOSSIP_STONE,
-    RH_DMT_GOSSIP_STONE,
-    RH_DMT_STORMS_GROTTO_GOSSIP_STONE,
-    RH_DODONGOS_CAVERN_GOSSIP_STONE,
-    RH_ZF_FAIRY_GOSSIP_STONE,
-    RH_GC_MAZE_GOSSIP_STONE,
-    RH_GC_MEDIGORON_GOSSIP_STONE,
-    RH_GV_GOSSIP_STONE,
-    RH_GRAVEYARD_GOSSIP_STONE,
-    RH_HC_MALON_GOSSIP_STONE,
-    RH_HC_ROCK_WALL_GOSSIP_STONE,
-    RH_HC_STORMS_GROTTO_GOSSIP_STONE,
+    RH_KF_DEKU_TREE_LEFT_GOSSIP_STONE,
+    RH_KF_DEKU_TREE_RIGHT_GOSSIP_STONE,
+    RH_KF_GOSSIP_STONE,
+    RH_KF_STORMS_GROTTO_GOSSIP_STONE,
+    RH_LW_GOSSIP_STONE,
+    RH_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE,
+    RH_SFM_MAZE_NEAR_LW_GOSSIP_STONE,
+    RH_SFM_MAZE_CENTER_GOSSIP_STONE,
+    RH_SFM_SARIA_GOSSIP_STONE,
     RH_HF_COW_GROTTO_GOSSIP_STONE,
     RH_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE,
     RH_HF_OPEN_GROTTO_GOSSIP_STONE,
     RH_HF_SOUTHEAST_GROTTO_GOSSIP_STONE,
-    RH_ZF_JABU_GOSSIP_STONE,
-    RH_KF_DEKU_TREE_GOSSIP_STONE_LEFT,
-    RH_KF_DEKU_TREE_GOSSIP_STONE_RIGHT,
-    RH_KF_GOSSIP_STONE,
-    RH_KF_STORMS_GROTTO_GOSSIP_STONE,
+    RH_TOT_LEFT_CENTER_GOSSIP_STONE,
+    RH_TOT_LEFTMOST_GOSSIP_STONE,
+    RH_TOT_RIGHT_CENTER_GOSSIP_STONE,
+    RH_TOT_RIGHTMOST_GOSSIP_STONE,
+    RH_HC_MALON_GOSSIP_STONE,
+    RH_HC_ROCK_WALL_GOSSIP_STONE,
+    RH_HC_STORMS_GROTTO_GOSSIP_STONE,
     RH_KAK_OPEN_GROTTO_GOSSIP_STONE,
-    RH_LH_LAB_GOSSIP_STONE,
-    RH_LH_SOUTHEAST_GOSSIP_STONE,
-    RH_LH_SOUTHWEST_GOSSIP_STONE,
-    RH_LW_GOSSIP_STONE,
-    RH_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE,
-    RH_SFM_MAZE_GOSSIP_STONE_LOWER,
-    RH_SFM_MAZE_GOSSIP_STONE_UPPER,
-    RH_SFM_SARIA_GOSSIP_STONE,
-    RH_TOT_GOSSIP_STONE_LEFT_CENTER,
-    RH_TOT_GOSSIP_STONE_LEFT,
-    RH_TOT_GOSSIP_STONE_RIGHT_CENTER,
-    RH_TOT_GOSSIP_STONE_RIGHT,
-    RH_ZD_GOSSIP_STONE,
+    RH_GRAVEYARD_GOSSIP_STONE,
+    RH_DMT_GOSSIP_STONE,
+    RH_DMT_STORMS_GROTTO_GOSSIP_STONE,
+    RH_GC_MAZE_GOSSIP_STONE,
+    RH_GC_MEDIGORON_GOSSIP_STONE,
+    RH_DMC_GOSSIP_STONE,
+    RH_DMC_UPPER_GROTTO_GOSSIP_STONE,
     RH_ZR_NEAR_DOMAIN_GOSSIP_STONE,
     RH_ZR_NEAR_GROTTOS_GOSSIP_STONE,
     RH_ZR_OPEN_GROTTO_GOSSIP_STONE,
+    RH_ZD_GOSSIP_STONE,
+    RH_ZF_JABU_GOSSIP_STONE,
+    RH_ZF_FAIRY_GOSSIP_STONE,
+    RH_LH_LAB_GOSSIP_STONE,
+    RH_LH_SOUTHEAST_GOSSIP_STONE,
+    RH_LH_SOUTHWEST_GOSSIP_STONE,
+    RH_GV_GOSSIP_STONE,
+    RH_COLOSSUS_GOSSIP_STONE,
+    RH_DODONGOS_CAVERN_GOSSIP_STONE,
     RH_GANONDORF_HINT,
-    RH_GANONDORF_NOHINT,
+    RH_GANONDORF_JOKE,
+    RH_SHEIK_HINT,
     RH_DAMPES_DIARY,
     RH_GREG_RUPEE,
-    RH_BEAN_SALESMAN,
-    RH_MEDIGORON,
-    RH_GRANNYS_SHOP,
-    RH_WASTELAND_BOMBCHU_SALESMAN,
-    RH_WASTELAND_BOMBCHU_SALESMAN_POST,
     RH_ALTAR_CHILD,
     RH_ALTAR_ADULT,
-    RH_SARIA,
+    RH_SARIA_HINT,
     RH_FISHING_POLE,
-    RH_SHEIK_LIGHT_ARROWS,
     RH_MINUET_WARP_LOC,
     RH_BOLERO_WARP_LOC,
     RH_SERENADE_WARP_LOC,
     RH_REQUIEM_WARP_LOC,
     RH_NOCTURNE_WARP_LOC,
     RH_PRELUDE_WARP_LOC,
-    RH_FROGS,
+    RH_MEDIGORON,
+    RH_CARPET_SALESMAN,
+    RH_BEAN_SALESMAN,
+    RH_GRANNY,
+    RH_HBA_HINT,
+    RH_MALON_HINT,
+    RH_CHICKENS_HINT,
+    RH_BIG_POES_HINT,
+    RH_BIGGORON_HINT,
+    RH_FROGS_HINT,
+    RH_KAK_10_SKULLS_HINT,
+    RH_KAK_20_SKULLS_HINT,
+    RH_KAK_30_SKULLS_HINT,
+    RH_KAK_40_SKULLS_HINT,
+    RH_KAK_50_SKULLS_HINT,
+    RH_KAK_100_SKULLS_HINT,
     RH_MAX,
-} RandomizerHintKey;
+} RandomizerHint;
 
 typedef enum {
     RHT_NONE,
-    RHT_PREFIX,
     RHT_WAY_OF_THE_HERO,
-    RHT_PLUNDERING,
     RHT_FOOLISH,
     RHT_CAN_BE_FOUND_AT,
     RHT_HOARDS,
@@ -3163,7 +3185,6 @@ typedef enum {
     RHT_BUY_RED_POTION_50,
     RHT_TRIFORCE,
     RHT_HINT,
-    RHT_HINT_MYSTERIOUS,
     RHT_TYCOON_WALLET,
     RHT_CHILD_WALLET,
     RHT_HOOKSHOT,
@@ -3208,6 +3229,8 @@ typedef enum {
     RHT_BRONZE_SCALE,
     RHT_FISHING_POLE,
     RHT_EPONA,
+    RHT_HINT_MYSTERIOUS,
+    RHT_MYSTERIOUS_ITEM,
     // Entrances
     RHT_DESERT_COLOSSUS_TO_COLOSSUS_GROTTO,
     RHT_GV_GROTTO_LEDGE_TO_GV_OCTOROK_GROTTO,
@@ -3367,60 +3390,69 @@ typedef enum {
     // Trials
     RHT_SIX_TRIALS,
     RHT_ZERO_TRIALS,
-    RHT_FOUR_TO_FIVE_TRIALS,
-    RHT_ONE_TO_THREE_TRIALS,
+    RHT_TRIAL_OFF,
+    RHT_TRIAL_ON,
+    RHT_LIGHT_TRIAL,
+    RHT_FOREST_TRIAL,
+    RHT_FIRE_TRIAL,
+    RHT_WATER_TRIAL,
+    RHT_SPIRIT_TRIAL,
+    RHT_SHADOW_TRIAL,
     // Altar
-    RHT_SPIRITUAL_STONE_TEXT_START,
+    RHT_CHILD_ALTAR_STONES,
     RHT_CHILD_ALTAR_TEXT_END_DOTOPEN,
     RHT_CHILD_ALTAR_TEXT_END_DOTSONGONLY,
     RHT_CHILD_ALTAR_TEXT_END_DOTCLOSED,
-    RHT_ADULT_ALTAR_TEXT_START,
+    RHT_ADULT_ALTAR_MEDALLIONS,
     RHT_ADULT_ALTAR_TEXT_END,
-    // Validation Line
-    RHT_VALIDATION_LINE,
-    // Light Arrow Location
-    RHT_LIGHT_ARROW_LOCATION_HINT,
-    RHT_SHEIK_LIGHT_ARROW_HINT,
-    // Master Sword Location
-    RHT_MASTER_SWORD_LOCATION_HINT,
-    RHT_SHEIK_MASTER_SWORD_LOCATION_HINT,
-    // Your Pocket
-    RHT_YOUR_POCKET,
-    // Other Hints
-    RHT_DAMPE_DIARY01,
-    RHT_DAMPE_DIARY02,
-    RHT_GREG_HINT01,
-    RHT_GREG_HINT02,
-    RHT_SARIA_TEXT01,
-    RHT_SARIA_TEXT02,
-    RHT_WARP_TO,
-    RHT_WARP_CHOICE,
-    RHT_FROGS_HINT01,
-    RHT_FROGS_HINT02,
-    RHT_FISHING_POLE_HINT01,
-    RHT_FISHING_POLE_HINT02,
-    // Ganon Line
-    RHT_GANON_LINE01,
-    RHT_GANON_LINE02,
-    RHT_GANON_LINE03,
-    RHT_GANON_LINE04,
-    RHT_GANON_LINE05,
-    RHT_GANON_LINE06,
-    RHT_GANON_LINE07,
-    RHT_GANON_LINE08,
-    RHT_GANON_LINE09,
-    RHT_GANON_LINE10,
-    RHT_GANON_LINE11,
-    // Merchants
-    RHT_BEAN_SALESMAN_FIRST,
-    RHT_BEAN_SALESMAN_SECOND,
-    RHT_MEDIGORON_DIALOG_FIRST,
-    RHT_MEDIGORON_DIALOG_SECOND,
+    // Static Item Hints
+    RHT_GANONDORF_HINT_LA_ONLY,
+    RHT_GANONDORF_HINT_MS_ONLY,
+    RHT_GANONDORF_HINT_LA_AND_MS,
+    RHT_SHEIK_HINT_LA_ONLY,
+    RHT_DAMPE_DIARY,
+    RHT_GREG_HINT,
+    RHT_SARIA_TALK_HINT,
+    RHT_SARIA_SONG_HINT,
+    RHT_FISHING_POLE_HINT,
+    // Static Entrance Hints
+    RHT_WARP_SONG,
+    // Static Location Hints
+    RHT_MEDIGORON_HINT,
     RHT_CARPET_SALESMAN_DIALOG_FIRST,
     RHT_CARPET_SALESMAN_DIALOG_MYSTERIOUS,
     RHT_CARPET_SALESMAN_DIALOG_HINTED,
-    RHT_CARPET_SALESMAN_DIALOG_FINAL,
-    RHT_GRANNY_DIALOG,
+    RHT_BEAN_SALESMAN_HINT,
+    RHT_GRANNY_HINT,
+    RHT_HBA_HINT_SIGN,
+    RHT_HBA_HINT_NOT_ON_HORSE,
+    RHT_HBA_HINT_INITIAL,
+    RHT_HBA_HINT_HAVE_1000,
+    RHT_MALON_HINT_HOW_IS_EPONA,
+    RHT_MALON_HINT_OBSTICLE_COURSE,
+    RHT_MALON_HINT_TURNING_EVIL,
+    RHT_MALON_HINT_INGO_TEMPTED,
+    RHT_CHICKENS_HINT,
+    RHT_BIG_POES_HINT,
+    RHT_BIGGORON_HINT,
+    RHT_FROGS_HINT,
+    RHT_SKULLS_HINT,
+    // Ganon Line
+    RHT_GANON_JOKE01,
+    RHT_GANON_JOKE02,
+    RHT_GANON_JOKE03,
+    RHT_GANON_JOKE04,
+    RHT_GANON_JOKE05,
+    RHT_GANON_JOKE06,
+    RHT_GANON_JOKE07,
+    RHT_GANON_JOKE08,
+    RHT_GANON_JOKE09,
+    RHT_GANON_JOKE10,
+    RHT_GANON_JOKE11,
+    // Misc utilities
+    RHT_YOUR_POCKET,
+    RHT_DUNGEON_ORDINARY,
+    RHT_DUNGEON_MASTERFUL,
     RHT_MAX
 } RandomizerHintTextKey;
 
@@ -3553,7 +3585,8 @@ typedef enum {
     RSK_ICE_TRAPS,
     RSK_GOSSIP_STONE_HINTS,
     RSK_TOT_ALTAR_HINT,
-    RSK_LIGHT_ARROWS_HINT,
+    RSK_GANONDORF_HINT,
+    RSK_SHEIK_LA_HINT,
     RSK_DAMPES_DIARY_HINT,
     RSK_GREG_HINT,
     RSK_SARIA_HINT,
@@ -3583,7 +3616,6 @@ typedef enum {
     RSK_SKIP_CHILD_ZELDA,
     RSK_STARTING_CONSUMABLES,
     RSK_FULL_WALLETS,
-    RSK_LANGUAGE,
     RSK_SHUFFLE_CHEST_MINIGAME,
     RSK_CUCCO_COUNT,
     RSK_BIG_POE_COUNT,
@@ -4095,3 +4127,5 @@ typedef enum {
     TH_MESSAGE_FINISHED,
     TH_MESSAGE_SURPLUS,
 } TriforceHuntMessages;
+
+
diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
index b664b0898..f00179ef7 100644
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -158,7 +158,8 @@ void Settings::CreateOptions() {
     mOptions[RSK_HINT_CLARITY] = Option::U8("Hint Clarity", {"Obscure", "Ambiguous", "Clear"}, OptionCategory::Setting, "gRandomizeHintClarity", mOptionDescriptions[RSK_HINT_CLARITY], WidgetType::Combobox, RO_HINT_CLARITY_CLEAR, true, IMFLAG_INDENT);
     mOptions[RSK_HINT_DISTRIBUTION] = Option::U8("Hint Distribution", {"Useless", "Balanced", "Strong", "Very Strong"}, OptionCategory::Setting, "gRandomizeHintDistribution", mOptionDescriptions[RSK_HINT_DISTRIBUTION], WidgetType::Combobox, RO_HINT_DIST_BALANCED, true, IMFLAG_UNINDENT);
     mOptions[RSK_TOT_ALTAR_HINT] = Option::Bool("ToT Altar Hint", {"Off", "On"}, OptionCategory::Setting, "gRandomizeAltarHint", mOptionDescriptions[RSK_TOT_ALTAR_HINT], WidgetType::Checkbox, RO_GENERIC_ON, false, IMFLAG_INDENT);
-    mOptions[RSK_LIGHT_ARROWS_HINT] = Option::Bool("Light Arrow Hint", {"Off", "On"}, OptionCategory::Setting, "gRandomizeLAHint", mOptionDescriptions[RSK_LIGHT_ARROWS_HINT], WidgetType::Checkbox, RO_GENERIC_ON, false, IMFLAG_NONE);
+    mOptions[RSK_GANONDORF_HINT] = Option::Bool("Ganondorf Hint", {"Off", "On"}, OptionCategory::Setting, "gRandomizeGanondorfHint", mOptionDescriptions[RSK_GANONDORF_HINT], WidgetType::Checkbox, RO_GENERIC_ON, false, IMFLAG_NONE);
+    mOptions[RSK_SHEIK_LA_HINT] = Option::Bool("Sheik Light Arrow Hint", {"Off", "On"}, OptionCategory::Setting, "gRandomizeSheikLAHint", mOptionDescriptions[RSK_SHEIK_LA_HINT], WidgetType::Checkbox, RO_GENERIC_ON, false, IMFLAG_NONE);
     mOptions[RSK_DAMPES_DIARY_HINT] = Option::Bool("Dampe's Diary Hint", "gRandomizeDampeHint", mOptionDescriptions[RSK_DAMPES_DIARY_HINT], IMFLAG_NONE);
     mOptions[RSK_GREG_HINT] = Option::Bool("Greg the Green Rupee Hint", "gRandomizeGregHint", mOptionDescriptions[RSK_GREG_HINT], IMFLAG_NONE);
     mOptions[RSK_SARIA_HINT] = Option::Bool("Saria's Hint", "gRandomizeSariaHint", mOptionDescriptions[RSK_SARIA_HINT], IMFLAG_NONE);
@@ -208,8 +209,6 @@ void Settings::CreateOptions() {
     mOptions[RSK_ALL_LOCATIONS_REACHABLE] = Option::Bool("All Locations Reachable", {"Off", "On"}, OptionCategory::Setting, "gRandomizeAllLocationsReachable", mOptionDescriptions[RSK_ALL_LOCATIONS_REACHABLE], WidgetType::Checkbox, RO_GENERIC_ON);
     mOptions[RSK_SKULLS_SUNS_SONG] = Option::Bool("Night Skulltula's Expect Sun's Song", "gRandomizeGsExpectSunsSong", mOptionDescriptions[RSK_SKULLS_SUNS_SONG]);
     mOptions[RSK_DAMAGE_MULTIPLIER] = Option::U8("Damage Multiplier", {"x1/2", "x1", "x2", "x4", "x8", "x16", "OHKO"}, OptionCategory::Setting, "", "", WidgetType::Slider, RO_DAMAGE_MULTIPLIER_DEFAULT);
-
-    mOptions[RSK_LANGUAGE] = Option::U8("Language", {"English", "German", "French"}, OptionCategory::Setting, "gLanguages", "", WidgetType::Combobox, LANGUAGE_ENG);
     // clang-format on
 
     mExcludeLocationsOptionsGroups.reserve(SPOILER_COLLECTION_GROUP_COUNT);
@@ -729,7 +728,8 @@ void Settings::CreateOptions() {
     }, false, WidgetContainerType::SECTION);
     mOptionGroups[RSG_EXTRA_HINTS_IMGUI] = OptionGroup::SubGroup("Extra Hints", {
         &mOptions[RSK_TOT_ALTAR_HINT],
-        &mOptions[RSK_LIGHT_ARROWS_HINT],
+        &mOptions[RSK_GANONDORF_HINT],
+        &mOptions[RSK_SHEIK_LA_HINT],
         &mOptions[RSK_DAMPES_DIARY_HINT],
         &mOptions[RSK_GREG_HINT],
         &mOptions[RSK_SARIA_HINT],
@@ -956,7 +956,8 @@ void Settings::CreateOptions() {
         &mOptions[RSK_HINT_CLARITY],
         &mOptions[RSK_HINT_DISTRIBUTION],
         &mOptions[RSK_TOT_ALTAR_HINT],
-        &mOptions[RSK_LIGHT_ARROWS_HINT],
+        &mOptions[RSK_GANONDORF_HINT],
+        &mOptions[RSK_SHEIK_LA_HINT],
         &mOptions[RSK_DAMPES_DIARY_HINT],
         &mOptions[RSK_GREG_HINT],
         &mOptions[RSK_SARIA_HINT],
@@ -1173,7 +1174,8 @@ void Settings::CreateOptions() {
         { "Miscellaneous Settings:Gossip Stone Hints", RSK_GOSSIP_STONE_HINTS },
         { "Miscellaneous Settings:Hint Clarity", RSK_HINT_CLARITY },
         { "Miscellaneous Settings:ToT Altar Hint", RSK_TOT_ALTAR_HINT },
-        { "Miscellaneous Settings:Light Arrow Hint", RSK_LIGHT_ARROWS_HINT },
+        { "Miscellaneous Settings:Ganondorf Hint", RSK_GANONDORF_HINT },
+        { "Miscellaneous Settings:Sheik Light Arrow Hint", RSK_SHEIK_LA_HINT },
         { "Miscellaneous Settings:Dampe's Diary Hint", RSK_DAMPES_DIARY_HINT },
         { "Miscellaneous Settings:Greg the Rupee Hint", RSK_GREG_HINT },
         { "Miscellaneous Settings:Saria's Hint", RSK_SARIA_HINT },
@@ -2280,7 +2282,8 @@ void Settings::ParseJson(nlohmann::json spoilerFileJson) {
                 case RSK_SUNLIGHT_ARROWS:
                 case RSK_BOMBCHUS_IN_LOGIC:
                 case RSK_TOT_ALTAR_HINT:
-                case RSK_LIGHT_ARROWS_HINT:
+                case RSK_GANONDORF_HINT:
+                case RSK_SHEIK_LA_HINT:
                 case RSK_DAMPES_DIARY_HINT:
                 case RSK_GREG_HINT:
                 case RSK_SARIA_HINT:
@@ -2644,7 +2647,7 @@ void Settings::ParseJson(nlohmann::json spoilerFileJson) {
 
     ctx->AddExcludedOptions();
     for (auto it = jsonExcludedLocations.begin(); it != jsonExcludedLocations.end(); ++it) {
-        const RandomizerCheck rc = StaticData::SpoilerfileCheckNameToEnum[it.value()];
+        const RandomizerCheck rc = Rando::StaticData::locationNameToEnum[it.value()];
         ctx->GetItemLocation(rc)->GetExcludedOption()->SetSelectedIndex(RO_GENERIC_ON);
     }
 
diff --git a/soh/soh/Enhancements/randomizer/static_data.cpp b/soh/soh/Enhancements/randomizer/static_data.cpp
new file mode 100644
index 000000000..524ab4700
--- /dev/null
+++ b/soh/soh/Enhancements/randomizer/static_data.cpp
@@ -0,0 +1,307 @@
+#include <unordered_map>
+#include "static_data.h"
+#include <spdlog/spdlog.h>
+
+namespace Rando {
+
+std::unordered_map<uint32_t, CustomMessage> StaticData::hintTypeNames = {
+    {HINT_TYPE_HINT_KEY, CustomMessage("Message")},
+    {HINT_TYPE_AREA, CustomMessage("Area")},
+    {HINT_TYPE_ITEM, CustomMessage("Item")},
+    {HINT_TYPE_TRIAL, CustomMessage("Trial")},
+    {HINT_TYPE_ENTRANCE, CustomMessage("Entrance")},
+    {HINT_TYPE_ITEM_AREA, CustomMessage("Item Area")},
+    {HINT_TYPE_MERCHANT, CustomMessage("Merchant")},
+    {HINT_TYPE_ALTAR_CHILD, CustomMessage("Child Altar")},
+    {HINT_TYPE_ALTAR_ADULT, CustomMessage("Adult Altar")},
+    {HINT_TYPE_WOTH,  CustomMessage("Way of the Hero")},
+    {HINT_TYPE_FOOLISH, CustomMessage("Foolish")},
+    {HINT_TYPE_MESSAGE, CustomMessage("Hardcoded Message")}
+};
+
+//RANDOTODO When dynamic grotto check names are done, apply it to these hints
+//RANDOTODO Translations
+std::unordered_map<uint32_t, CustomMessage> StaticData::hintNames = {
+    {RH_NONE, CustomMessage("ERROR HINT")},
+    {RH_KF_DEKU_TREE_LEFT_GOSSIP_STONE, CustomMessage("KF Left Near Deku Gossip Stone")}, //RANDOTODO find cardinal direction
+    {RH_KF_DEKU_TREE_RIGHT_GOSSIP_STONE, CustomMessage("KF Right Near Deku Gossip Stone")},
+    {RH_KF_GOSSIP_STONE, CustomMessage("KF Gossip Stone")},
+    {RH_KF_STORMS_GROTTO_GOSSIP_STONE, CustomMessage("KF Storms Grotto Gossip Stone")},
+    {RH_LW_GOSSIP_STONE, CustomMessage("LW Gossip Stone")},
+    {RH_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE, CustomMessage("LW Near Shortcuts Grotto Gossip Stone")},
+    {RH_SFM_MAZE_NEAR_LW_GOSSIP_STONE, CustomMessage("SFM Near LW Gossip Stone")},
+    {RH_SFM_MAZE_CENTER_GOSSIP_STONE, CustomMessage("SFM Center Gossip Stone")},
+    {RH_SFM_SARIA_GOSSIP_STONE, CustomMessage("SFM Near Saria Gossip Stone")},
+    {RH_HF_COW_GROTTO_GOSSIP_STONE, CustomMessage("HF Cow Grotto Gossip Stone")},
+    {RH_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE, CustomMessage("HF Near Market Grotto Gossip Stone")},
+    {RH_HF_OPEN_GROTTO_GOSSIP_STONE, CustomMessage("HF Open Grotto Gossip Stone")},
+    {RH_HF_SOUTHEAST_GROTTO_GOSSIP_STONE, CustomMessage("HF Southeast Grotto Gossip Stone")},
+    {RH_TOT_LEFT_CENTER_GOSSIP_STONE, CustomMessage("Market Left Center Gossip Stone")},
+    {RH_TOT_LEFTMOST_GOSSIP_STONE, CustomMessage("Market Leftmost Center Gossip Stone")},
+    {RH_TOT_RIGHT_CENTER_GOSSIP_STONE, CustomMessage("Market Right Center Gossip Stone")},
+    {RH_TOT_RIGHTMOST_GOSSIP_STONE, CustomMessage("Market Rightmost Gossip Stone")},
+    {RH_HC_MALON_GOSSIP_STONE, CustomMessage("HC Near Malon Gossip Stone")},
+    {RH_HC_ROCK_WALL_GOSSIP_STONE, CustomMessage("HC Rock Wall Gossip Stone")},
+    {RH_HC_STORMS_GROTTO_GOSSIP_STONE, CustomMessage("HC Storm Grotto Gossip Stone")},
+    {RH_KAK_OPEN_GROTTO_GOSSIP_STONE, CustomMessage("Kak Open Grotto Gossip Stone")},
+    {RH_GRAVEYARD_GOSSIP_STONE, CustomMessage("Graveyard Gossip Stone")},
+    {RH_DMT_GOSSIP_STONE, CustomMessage("DMT Gossip Stone")},
+    {RH_DMT_STORMS_GROTTO_GOSSIP_STONE, CustomMessage("DMT Storms Grotto Gossip Stone")},
+    {RH_GC_MAZE_GOSSIP_STONE, CustomMessage("GC Maze Gossip Stone")},
+    {RH_GC_MEDIGORON_GOSSIP_STONE, CustomMessage("GC Medigoron Gossip Stone")},
+    {RH_DMC_GOSSIP_STONE, CustomMessage("DMC Gossip Stone")},
+    {RH_DMC_UPPER_GROTTO_GOSSIP_STONE, CustomMessage("DMC Upper Grotto Gossip Stone")},
+    {RH_ZR_NEAR_DOMAIN_GOSSIP_STONE, CustomMessage("ZR Near Domain Gossip Stone")},
+    {RH_ZR_NEAR_GROTTOS_GOSSIP_STONE, CustomMessage("ZR Near Grottos Gossip Stone")},
+    {RH_ZR_OPEN_GROTTO_GOSSIP_STONE, CustomMessage("ZR Open Grotto Gossip Stone")},
+    {RH_ZD_GOSSIP_STONE, CustomMessage("ZD Gossip Stone")},
+    {RH_ZF_JABU_GOSSIP_STONE, CustomMessage("ZF Near Jabu Gossip Stone")},
+    {RH_ZF_FAIRY_GOSSIP_STONE, CustomMessage("ZF Near Fairy Gossip Stone")},
+    {RH_LH_LAB_GOSSIP_STONE, CustomMessage("LH Near Lab Gossip Stone")},
+    {RH_LH_SOUTHEAST_GOSSIP_STONE, CustomMessage("LH Southeast Gossip Stone")},
+    {RH_LH_SOUTHWEST_GOSSIP_STONE, CustomMessage("LH Southwest Gossip Stone")},
+    {RH_GV_GOSSIP_STONE, CustomMessage("Gerudo Valley Gossip Stone")},
+    {RH_COLOSSUS_GOSSIP_STONE, CustomMessage("Desert Collosus Gossip Stone")},
+    {RH_DODONGOS_CAVERN_GOSSIP_STONE, CustomMessage("Dodongo's Cavern Gossip Stone")},
+    {RH_GANONDORF_HINT, CustomMessage("Ganondorf Hint")},
+    {RH_GANONDORF_JOKE, CustomMessage("Ganondorf Joke")},
+    {RH_SHEIK_HINT, CustomMessage("Sheik in Ganons Castle Hint")},
+    {RH_DAMPES_DIARY, CustomMessage("Dampe's Diary Hint")},
+    {RH_GREG_RUPEE, CustomMessage("Treasure Chest Game Greg Hint")},
+    {RH_ALTAR_CHILD, CustomMessage("ToT Altar as Child")},
+    {RH_ALTAR_ADULT, CustomMessage("ToT Altar as Adult")},
+    {RH_SARIA_HINT, CustomMessage("Saria's Magic Hint")},
+    {RH_FISHING_POLE, CustomMessage("Fishing Pole Hint")},
+    {RH_MINUET_WARP_LOC, CustomMessage("Minuet of Forest Destination")},
+    {RH_BOLERO_WARP_LOC, CustomMessage("Bolero of Fire Destination")},
+    {RH_SERENADE_WARP_LOC, CustomMessage("Serenade of Water Destination")},
+    {RH_REQUIEM_WARP_LOC, CustomMessage("Requiem of Spirit Destination")},
+    {RH_NOCTURNE_WARP_LOC, CustomMessage("Nocturne of Shadow Destination")},
+    {RH_PRELUDE_WARP_LOC, CustomMessage("Prelude of Light Destination")},
+    {RH_MEDIGORON, CustomMessage("Medigoron Hint")},
+    {RH_CARPET_SALESMAN, CustomMessage("Carpet Salseman Hint")},
+    {RH_BEAN_SALESMAN, CustomMessage("Bean Salseman Hint")},
+    {RH_GRANNY, CustomMessage("Granny Hint")},
+    {RH_HBA_HINT, CustomMessage("Horseback Archery Hint")},
+    {RH_MALON_HINT, CustomMessage("Malon Hint")},
+    {RH_CHICKENS_HINT, CustomMessage("Anju's Child Chickens Hint")},
+    {RH_BIG_POES_HINT, CustomMessage("Big Poe Reward Hint")},
+    {RH_BIGGORON_HINT, CustomMessage("Biggoron Claim Check Hint")},
+    {RH_FROGS_HINT, CustomMessage("Final Frogs in River Hint")},
+    {RH_KAK_10_SKULLS_HINT, CustomMessage("10 Skulls Hint")},
+    {RH_KAK_20_SKULLS_HINT, CustomMessage("20 Skulls Hint")},
+    {RH_KAK_30_SKULLS_HINT, CustomMessage("30 Skulls Hint")},
+    {RH_KAK_40_SKULLS_HINT, CustomMessage("40 Skulls Hint")},
+    {RH_KAK_50_SKULLS_HINT, CustomMessage("50 Skulls Hint")},
+    {RH_KAK_100_SKULLS_HINT, CustomMessage("100 Skulls Hint")}
+};
+
+std::unordered_map<RandomizerCheck, RandomizerHint> StaticData::gossipStoneCheckToHint {
+  {RC_COLOSSUS_GOSSIP_STONE,                 RH_COLOSSUS_GOSSIP_STONE},
+  {RC_DMC_GOSSIP_STONE,                      RH_DMC_GOSSIP_STONE},
+  {RC_DMC_UPPER_GROTTO_GOSSIP_STONE,         RH_DMC_UPPER_GROTTO_GOSSIP_STONE},
+  {RC_DMT_GOSSIP_STONE,                      RH_DMT_GOSSIP_STONE},
+  {RC_DMT_STORMS_GROTTO_GOSSIP_STONE,        RH_DMT_STORMS_GROTTO_GOSSIP_STONE},
+  {RC_DODONGOS_CAVERN_GOSSIP_STONE,          RH_DODONGOS_CAVERN_GOSSIP_STONE},
+  {RC_ZF_FAIRY_GOSSIP_STONE,                 RH_ZF_FAIRY_GOSSIP_STONE},
+  {RC_GC_MAZE_GOSSIP_STONE,                  RH_GC_MAZE_GOSSIP_STONE},
+  {RC_GC_MEDIGORON_GOSSIP_STONE,             RH_GC_MEDIGORON_GOSSIP_STONE},
+  {RC_GV_GOSSIP_STONE,                       RH_GV_GOSSIP_STONE},
+  {RC_GRAVEYARD_GOSSIP_STONE,                RH_GRAVEYARD_GOSSIP_STONE},
+  {RC_HC_MALON_GOSSIP_STONE,                 RH_HC_MALON_GOSSIP_STONE},
+  {RC_HC_ROCK_WALL_GOSSIP_STONE,             RH_HC_ROCK_WALL_GOSSIP_STONE},
+  {RC_HC_STORMS_GROTTO_GOSSIP_STONE,         RH_HC_STORMS_GROTTO_GOSSIP_STONE},
+  {RC_HF_COW_GROTTO_GOSSIP_STONE,            RH_HF_COW_GROTTO_GOSSIP_STONE},
+  {RC_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE,    RH_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE},
+  {RC_HF_OPEN_GROTTO_GOSSIP_STONE,           RH_HF_OPEN_GROTTO_GOSSIP_STONE},
+  {RC_HF_SOUTHEAST_GROTTO_GOSSIP_STONE,      RH_HF_SOUTHEAST_GROTTO_GOSSIP_STONE},
+  {RC_ZF_JABU_GOSSIP_STONE,                  RH_ZF_JABU_GOSSIP_STONE},
+  {RC_KF_DEKU_TREE_LEFT_GOSSIP_STONE,        RH_KF_DEKU_TREE_LEFT_GOSSIP_STONE},
+  {RC_KF_DEKU_TREE_RIGHT_GOSSIP_STONE,       RH_KF_DEKU_TREE_RIGHT_GOSSIP_STONE},
+  {RC_KF_GOSSIP_STONE,                       RH_KF_GOSSIP_STONE},
+  {RC_KF_STORMS_GROTTO_GOSSIP_STONE,         RH_KF_STORMS_GROTTO_GOSSIP_STONE},
+  {RC_KAK_OPEN_GROTTO_GOSSIP_STONE,          RH_KAK_OPEN_GROTTO_GOSSIP_STONE},
+  {RC_LH_LAB_GOSSIP_STONE,                   RH_LH_LAB_GOSSIP_STONE},
+  {RC_LH_SOUTHEAST_GOSSIP_STONE,             RH_LH_SOUTHEAST_GOSSIP_STONE},
+  {RC_LH_SOUTHWEST_GOSSIP_STONE,             RH_LH_SOUTHWEST_GOSSIP_STONE},
+  {RC_LW_GOSSIP_STONE,                       RH_LW_GOSSIP_STONE},
+  {RC_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE, RH_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE},
+  {RC_SFM_MAZE_LOWER_GOSSIP_STONE,           RH_SFM_MAZE_NEAR_LW_GOSSIP_STONE},
+  {RC_SFM_MAZE_UPPER_GOSSIP_STONE,           RH_SFM_MAZE_CENTER_GOSSIP_STONE},
+  {RC_SFM_SARIA_GOSSIP_STONE,                RH_SFM_SARIA_GOSSIP_STONE},
+  {RC_TOT_LEFT_CENTER_GOSSIP_STONE,          RH_TOT_LEFT_CENTER_GOSSIP_STONE},
+  {RC_TOT_LEFTMOST_GOSSIP_STONE,             RH_TOT_LEFTMOST_GOSSIP_STONE},
+  {RC_TOT_RIGHT_CENTER_GOSSIP_STONE,         RH_TOT_RIGHT_CENTER_GOSSIP_STONE},
+  {RC_TOT_RIGHTMOST_GOSSIP_STONE,            RH_TOT_RIGHTMOST_GOSSIP_STONE},
+  {RC_ZD_GOSSIP_STONE,                       RH_ZD_GOSSIP_STONE},
+  {RC_ZR_NEAR_DOMAIN_GOSSIP_STONE,           RH_ZR_NEAR_DOMAIN_GOSSIP_STONE},
+  {RC_ZR_NEAR_GROTTOS_GOSSIP_STONE,          RH_ZR_NEAR_GROTTOS_GOSSIP_STONE},
+  {RC_ZR_OPEN_GROTTO_GOSSIP_STONE,           RH_ZR_OPEN_GROTTO_GOSSIP_STONE}
+};
+
+std::unordered_map<uint32_t, RandomizerHintTextKey> StaticData::areaNames = { //RANDOTODO resolve None in area
+    {RA_NONE, RHT_LINKS_POCKET}, //explicit none in area hints usually means it's a starting item, so say Link's pocket
+    {RA_LINKS_POCKET, RHT_LINKS_POCKET},
+    {RA_KOKIRI_FOREST, RHT_KOKIRI_FOREST},
+    {RA_THE_LOST_WOODS, RHT_THE_LOST_WOODS},
+    {RA_SACRED_FOREST_MEADOW, RHT_SACRED_FOREST_MEADOW},
+    {RA_HYRULE_FIELD, RHT_HYRULE_FIELD},
+    {RA_LAKE_HYLIA, RHT_LAKE_HYLIA},
+    {RA_GERUDO_VALLEY, RHT_GERUDO_VALLEY},
+    {RA_GERUDO_FORTRESS, RHT_GERUDO_FORTRESS},
+    {RA_HAUNTED_WASTELAND, RHT_HAUNTED_WASTELAND},
+    {RA_DESERT_COLOSSUS, RHT_DESERT_COLOSSUS},
+    {RA_THE_MARKET, RHT_THE_MARKET},
+    {RA_TEMPLE_OF_TIME, RHT_TEMPLE_OF_TIME},
+    {RA_HYRULE_CASTLE, RHT_HYRULE_CASTLE},
+    {RA_OUTSIDE_GANONS_CASTLE, RHT_OUTSIDE_GANONS_CASTLE},
+    {RA_CASTLE_GROUNDS, RHT_CASTLE_GROUNDS},
+    {RA_KAKARIKO_VILLAGE, RHT_KAKARIKO_VILLAGE},
+    {RA_THE_GRAVEYARD, RHT_THE_GRAVEYARD},
+    {RA_DEATH_MOUNTAIN_TRAIL, RHT_DEATH_MOUNTAIN_TRAIL},
+    {RA_GORON_CITY, RHT_GORON_CITY},
+    {RA_DEATH_MOUNTAIN_CRATER, RHT_DEATH_MOUNTAIN_CRATER},
+    {RA_ZORAS_RIVER, RHT_ZORAS_RIVER},
+    {RA_ZORAS_DOMAIN, RHT_ZORAS_DOMAIN},
+    {RA_ZORAS_FOUNTAIN, RHT_ZORAS_FOUNTAIN},
+    {RA_LON_LON_RANCH, RHT_LON_LON_RANCH},
+    {RA_DEKU_TREE, RHT_DEKU_TREE},
+    {RA_DODONGOS_CAVERN, RHT_DODONGOS_CAVERN},
+    {RA_JABU_JABUS_BELLY, RHT_JABU_JABUS_BELLY},
+    {RA_FOREST_TEMPLE, RHT_FOREST_TEMPLE},
+    {RA_FIRE_TEMPLE, RHT_FIRE_TEMPLE},
+    {RA_WATER_TEMPLE, RHT_WATER_TEMPLE},
+    {RA_SPIRIT_TEMPLE, RHT_SPIRIT_TEMPLE},
+    {RA_SHADOW_TEMPLE, RHT_SHADOW_TEMPLE},
+    {RA_BOTTOM_OF_THE_WELL, RHT_BOTTOM_OF_THE_WELL},
+    {RA_ICE_CAVERN, RHT_ICE_CAVERN},
+    {RA_GERUDO_TRAINING_GROUND, RHT_GERUDO_TRAINING_GROUND},
+    {RA_GANONS_CASTLE, RHT_GANONS_CASTLE}
+};
+
+std::unordered_map<uint32_t, RandomizerHintTextKey> StaticData::trialData = {
+    {TK_LIGHT_TRIAL, RHT_LIGHT_TRIAL}, 
+    {TK_FOREST_TRIAL, RHT_FOREST_TRIAL},
+    {TK_FIRE_TRIAL, RHT_FIRE_TRIAL},
+    {TK_WATER_TRIAL, RHT_WATER_TRIAL},
+    {TK_SHADOW_TRIAL, RHT_SHADOW_TRIAL},
+    {TK_SPIRIT_TRIAL, RHT_SPIRIT_TRIAL}
+};
+
+std::unordered_map<RandomizerHint, StaticHintInfo> StaticData::staticHintInfoMap = {
+  // RH_GANONDORF_HINT is special cased due to being different based on master sword shuffle
+  // Altar hints are special cased due to special hint marking rules
+  // warp song hints are special cased due to entrences not being done properly yet
+  // Ganondorf Joke is special Cased as the text is random
+  {RH_SHEIK_HINT,          StaticHintInfo(HINT_TYPE_AREA,     {RHT_SHEIK_HINT_LA_ONLY},            RSK_SHEIK_LA_HINT,       true, {}, {RG_LIGHT_ARROWS},            {RC_SHEIK_HINT_GC, RC_SHEIK_HINT_MQ_GC}, true)},
+  {RH_DAMPES_DIARY,        StaticHintInfo(HINT_TYPE_AREA,     {RHT_DAMPE_DIARY},                   RSK_DAMPES_DIARY_HINT,   true, {}, {RG_PROGRESSIVE_HOOKSHOT},    {RC_DAMPE_HINT})},
+  {RH_GREG_RUPEE,          StaticHintInfo(HINT_TYPE_AREA,     {RHT_GREG_HINT},                     RSK_GREG_HINT,           true, {}, {RG_GREG_RUPEE},              {RC_GREG_HINT})},
+  {RH_SARIA_HINT,          StaticHintInfo(HINT_TYPE_AREA,     {RHT_SARIA_TALK_HINT, RHT_SARIA_SONG_HINT}, RSK_SARIA_HINT,   true, {}, {RG_PROGRESSIVE_MAGIC_METER}, {RC_SARIA_SONG_HINT, RC_SONG_FROM_SARIA}, true)},
+  {RH_FISHING_POLE,        StaticHintInfo(HINT_TYPE_AREA,     {RHT_FISHING_POLE_HINT},             RSK_FISHING_POLE_HINT,   true, {}, {RG_FISHING_POLE},            {RC_FISHING_POLE_HINT}, true)},
+  {RH_MEDIGORON,           StaticHintInfo(HINT_TYPE_MERCHANT, {RHT_MEDIGORON_HINT},                RSK_SHUFFLE_MERCHANTS,   (uint8_t)RO_SHUFFLE_MERCHANTS_ON_HINT,  {RC_GC_MEDIGORON})},
+  {RH_GRANNY,              StaticHintInfo(HINT_TYPE_MERCHANT, {RHT_GRANNY_HINT},                   RSK_SHUFFLE_MERCHANTS,   (uint8_t)RO_SHUFFLE_MERCHANTS_ON_HINT,  {RC_KAK_GRANNYS_SHOP})},
+  {RH_CARPET_SALESMAN,     StaticHintInfo(HINT_TYPE_MERCHANT, {RHT_CARPET_SALESMAN_DIALOG_HINTED}, RSK_SHUFFLE_MERCHANTS,   (uint8_t)RO_SHUFFLE_MERCHANTS_ON_HINT,  {RC_WASTELAND_BOMBCHU_SALESMAN})},
+  {RH_BEAN_SALESMAN,       StaticHintInfo(HINT_TYPE_MERCHANT, {RHT_BEAN_SALESMAN_HINT},            RSK_SHUFFLE_MAGIC_BEANS, true,                                   {RC_ZR_MAGIC_BEAN_SALESMAN})},
+  {RH_HBA_HINT,            StaticHintInfo(HINT_TYPE_ITEM,     {RHT_HBA_HINT_SIGN, RHT_HBA_HINT_NOT_ON_HORSE, RHT_HBA_HINT_INITIAL, RHT_HBA_HINT_HAVE_1000}, RSK_HBA_HINT, true, {RC_GF_HBA_1000_POINTS, RC_GF_HBA_1500_POINTS})},
+  {RH_MALON_HINT,          StaticHintInfo(HINT_TYPE_ITEM,     {RHT_MALON_HINT_TURNING_EVIL, RHT_MALON_HINT_HOW_IS_EPONA, RHT_MALON_HINT_OBSTICLE_COURSE, RHT_MALON_HINT_INGO_TEMPTED},RSK_MALON_HINT, true, {RC_KF_LINKS_HOUSE_COW})},
+  {RH_BIG_POES_HINT,       StaticHintInfo(HINT_TYPE_ITEM,     {RHT_BIG_POES_HINT},                 RSK_BIG_POES_HINT,       true, {RC_MARKET_10_BIG_POES})},
+  {RH_CHICKENS_HINT,       StaticHintInfo(HINT_TYPE_ITEM,     {RHT_CHICKENS_HINT},                 RSK_CHICKENS_HINT,       true, {RC_KAK_ANJU_AS_CHILD})},
+  {RH_BIGGORON_HINT,       StaticHintInfo(HINT_TYPE_ITEM,     {RHT_BIGGORON_HINT},                 RSK_BIGGORON_HINT,       true, {RC_DMT_TRADE_CLAIM_CHECK})},
+  {RH_FROGS_HINT,          StaticHintInfo(HINT_TYPE_ITEM,     {RHT_FROGS_HINT},                    RSK_FROGS_HINT,          true, {RC_ZR_FROGS_OCARINA_GAME})},
+  {RH_KAK_10_SKULLS_HINT,  StaticHintInfo(HINT_TYPE_ITEM,     {RHT_SKULLS_HINT},                   RSK_KAK_10_SKULLS_HINT,  true, {RC_KAK_10_GOLD_SKULLTULA_REWARD},  {}, {}, false, 10)},
+  {RH_KAK_20_SKULLS_HINT,  StaticHintInfo(HINT_TYPE_ITEM,     {RHT_SKULLS_HINT},                   RSK_KAK_20_SKULLS_HINT,  true, {RC_KAK_20_GOLD_SKULLTULA_REWARD},  {}, {}, false, 20)},
+  {RH_KAK_30_SKULLS_HINT,  StaticHintInfo(HINT_TYPE_ITEM,     {RHT_SKULLS_HINT},                   RSK_KAK_30_SKULLS_HINT,  true, {RC_KAK_30_GOLD_SKULLTULA_REWARD},  {}, {}, false, 30)},
+  {RH_KAK_40_SKULLS_HINT,  StaticHintInfo(HINT_TYPE_ITEM,     {RHT_SKULLS_HINT},                   RSK_KAK_40_SKULLS_HINT,  true, {RC_KAK_40_GOLD_SKULLTULA_REWARD},  {}, {}, false, 40)},
+  {RH_KAK_50_SKULLS_HINT,  StaticHintInfo(HINT_TYPE_ITEM,     {RHT_SKULLS_HINT},                   RSK_KAK_50_SKULLS_HINT,  true, {RC_KAK_50_GOLD_SKULLTULA_REWARD},  {}, {}, false, 50)},
+  {RH_KAK_100_SKULLS_HINT, StaticHintInfo(HINT_TYPE_ITEM,     {RHT_SKULLS_HINT},                   RSK_KAK_100_SKULLS_HINT, true, {RC_KAK_100_GOLD_SKULLTULA_REWARD}, {}, {}, false, 100)}
+};
+
+std::unordered_map<std::string, uint32_t> StaticData::PopulateTranslationMap(std::unordered_map<uint32_t, CustomMessage> input){
+  std::unordered_map<std::string, uint32_t> output = {};
+  for (const auto& [key, message] : input) {
+    std::vector<std::string> strings = message.GetAllMessages();
+    for (std::string string: strings){
+      if (output.contains(string)){
+        if (output[string] != key){
+          SPDLOG_DEBUG("\tREPEATED STRING IN " + message.GetEnglish(MF_CLEAN) + "\n\n"); //RANDOTODO should this cause an error of some kind?
+        }
+      } else {
+        output[string] = key;
+      }
+    }
+  }
+  return output;
+}
+
+std::unordered_map<std::string, uint32_t> StaticData::PopulateTranslationMap(std::unordered_map<uint32_t, RandomizerHintTextKey> input){
+  std::unordered_map<std::string, uint32_t> output = {};
+  for (const auto& [key, text] : input) {
+    std::vector<std::string> strings = hintTextTable[text].GetClear().GetAllMessages();
+    for (std::string string: strings){
+      if (output.contains(string)){
+        if (output[string] != key){
+          SPDLOG_DEBUG("\tREPEATED STRING WITH " + string + "\n\n"); //RANDOTODO should this cause an error of some kind?
+        }
+      } else {
+        output[string] = key;
+      }
+    }
+  }
+  return output;
+}
+
+std::unordered_map<std::string, uint32_t> StaticData::hintNameToEnum = {};
+std::unordered_map<std::string, uint32_t> StaticData::hintTypeNameToEnum = {};
+std::unordered_map<std::string, uint32_t> StaticData::areaNameToEnum = {};
+std::unordered_map<std::string, uint32_t> StaticData::trialNameToEnum = {};
+std::unordered_map<std::string, RandomizerCheck> StaticData::locationNameToEnum = {}; //is filled in context based on location table, not touching that because of VB 
+
+std::unordered_map<u32, RandomizerHint> StaticData::stoneParamsToHint{
+  {0x1,  RH_ZF_FAIRY_GOSSIP_STONE},
+  {0x2,  RH_ZF_JABU_GOSSIP_STONE},
+  {0x3,  RH_LH_LAB_GOSSIP_STONE},
+  {0x4,  RH_DMT_GOSSIP_STONE},
+  {0x5,  RH_DMC_GOSSIP_STONE},
+  {0x6,  RH_TOT_LEFTMOST_GOSSIP_STONE},
+  {0x7,  RH_TOT_LEFT_CENTER_GOSSIP_STONE},
+  {0x8,  RH_LH_SOUTHWEST_GOSSIP_STONE},
+  {0x9,  RH_ZD_GOSSIP_STONE}, 
+  {0xA,  RH_GRAVEYARD_GOSSIP_STONE},
+  {0xB,  RH_HC_ROCK_WALL_GOSSIP_STONE},
+  {0xC,  RH_ZR_NEAR_DOMAIN_GOSSIP_STONE},
+  {0xD,  RH_ZR_NEAR_GROTTOS_GOSSIP_STONE},
+  {0xE,  RH_TOT_RIGHT_CENTER_GOSSIP_STONE },
+  {0xF,  RH_LH_SOUTHEAST_GOSSIP_STONE},
+  {0x10, RH_TOT_RIGHTMOST_GOSSIP_STONE },
+  {0x11, RH_GV_GOSSIP_STONE},
+  {0x12, RH_HC_MALON_GOSSIP_STONE},
+  {0x13, RH_HC_STORMS_GROTTO_GOSSIP_STONE},
+  {0x14, RH_DODONGOS_CAVERN_GOSSIP_STONE},
+  {0x15, RH_GC_MAZE_GOSSIP_STONE},
+  {0x16, RH_SFM_MAZE_NEAR_LW_GOSSIP_STONE},
+  {0x17, RH_SFM_MAZE_CENTER_GOSSIP_STONE},
+  //generic grottos all use 0x18, grottoChestParamsToHint is used for conversion
+  {0x19, RH_GC_MEDIGORON_GOSSIP_STONE},
+  {0x1A, RH_COLOSSUS_GOSSIP_STONE},
+  {0x1B, RH_HF_COW_GROTTO_GOSSIP_STONE},
+  {0x1C, RH_SFM_SARIA_GOSSIP_STONE},
+  {0x1D, RH_LW_GOSSIP_STONE},
+  {0x1E, RH_KF_GOSSIP_STONE},
+  {0x1F, RH_KF_DEKU_TREE_LEFT_GOSSIP_STONE},
+  {0x20, RH_KF_DEKU_TREE_RIGHT_GOSSIP_STONE},
+};
+
+std::unordered_map<u32, RandomizerHint> StaticData::grottoChestParamsToHint{
+  {22944, RH_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE},
+  {22978, RH_HF_SOUTHEAST_GROTTO_GOSSIP_STONE},
+  {22947, RH_HF_OPEN_GROTTO_GOSSIP_STONE},
+  {22964, RH_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE},
+  {23255, RH_DMT_STORMS_GROTTO_GOSSIP_STONE},
+  {22984, RH_KAK_OPEN_GROTTO_GOSSIP_STONE},
+  {22985, RH_ZR_OPEN_GROTTO_GOSSIP_STONE},
+  {23802, RH_DMC_UPPER_GROTTO_GOSSIP_STONE},
+  {22988, RH_KF_STORMS_GROTTO_GOSSIP_STONE}
+};
+
+std::array<HintText, RHT_MAX> StaticData::hintTextTable = {};
+}
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/static_data.h b/soh/soh/Enhancements/randomizer/static_data.h
index 0e5ba4c03..44e1ff1ff 100644
--- a/soh/soh/Enhancements/randomizer/static_data.h
+++ b/soh/soh/Enhancements/randomizer/static_data.h
@@ -22,25 +22,47 @@ class StaticData {
 
     public:
       static void InitItemTable();
+      static void HintTable_Init();
+      static void HintTable_Init_Item();
+      static void HintTable_Init_Exclude_Overworld();
+      static void HintTable_Init_Exclude_Dungeon();
       static Item& RetrieveItem(const RandomizerGet rgid);
       static Item& ItemFromGIID(const int giid);
-      static std::array<Item, RG_MAX>& GetItemTable();
+      static std::array<Item, RG_MAX>& GetItemTable();// is there a reason this is a function and not just an exposed table?
       static void InitLocationTable();
       static Location* GetLocation(RandomizerCheck locKey);
       static std::array<Rando::Location, RC_MAX>& GetLocationTable();
-      static std::unordered_map<std::string, RandomizerCheck> SpoilerfileCheckNameToEnum;
-      static std::unordered_map<std::string, RandomizerGet> SpoilerfileItemNameToEnum;
+      static std::unordered_map<std::string, uint32_t> PopulateTranslationMap(std::unordered_map<uint32_t, CustomMessage> input);
+      static std::unordered_map<std::string, uint32_t> PopulateTranslationMap(std::unordered_map<uint32_t, RandomizerHintTextKey> input);
       static std::multimap<std::tuple<s16, s16, s32>, RandomizerCheck> CheckFromActorMultimap;
       static std::vector<RandomizerCheck> overworldLocations;
       static std::vector<RandomizerCheck> dungeonRewardLocations;
       static std::vector<std::vector<RandomizerCheck>> shopLocationLists;
       static std::vector<RandomizerCheck> scrubLocations;
       static std::vector<RandomizerCheck> gossipStoneLocations;
-      static std::vector<RandomizerCheck> otherHintLocations;
+      static std::vector<RandomizerCheck> staticHintLocations;
       static std::vector<RandomizerCheck> pondFishLocations;
       static std::vector<RandomizerCheck> overworldFishLocations;
       static std::array<std::pair<RandomizerCheck, RandomizerCheck>, 17> randomizerFishingPondFish;
       static std::unordered_map<int8_t, RandomizerCheck> randomizerGrottoFishMap;
+      static std::vector<RandomizerHint> oldVerHintOrder;
+      static uint16_t oldVerGossipStoneStart;
+      static std::unordered_map<std::string, RandomizerCheck> locationNameToEnum;
+      static std::unordered_map<std::string, RandomizerGet> itemNameToEnum;
+      static std::unordered_map<uint32_t, CustomMessage> hintNames;
+      static std::unordered_map<std::string, uint32_t> hintNameToEnum;
+      static std::unordered_map<uint32_t, CustomMessage> hintTypeNames;
+      static std::unordered_map<std::string, uint32_t> hintTypeNameToEnum;
+      static std::unordered_map<RandomizerCheck, RandomizerHint> gossipStoneCheckToHint;
+      static std::unordered_map<uint32_t, RandomizerHintTextKey> areaNames;
+      static std::unordered_map<std::string, uint32_t> areaNameToEnum;
+      static std::unordered_map<uint32_t, RandomizerHintTextKey> trialData;
+      static std::unordered_map<std::string, uint32_t> trialNameToEnum;
+      static std::unordered_map<RandomizerHint, StaticHintInfo> staticHintInfoMap;
+      static std::unordered_map<u32, RandomizerHint> stoneParamsToHint;
+      static std::unordered_map<u32, RandomizerHint> grottoChestParamsToHint;
+      static std::array<HintText, RHT_MAX> hintTextTable;
+
       StaticData();
       ~StaticData();
 };
diff --git a/soh/soh/Enhancements/randomizer/trial.cpp b/soh/soh/Enhancements/randomizer/trial.cpp
index d3fc99951..1110d37d8 100644
--- a/soh/soh/Enhancements/randomizer/trial.cpp
+++ b/soh/soh/Enhancements/randomizer/trial.cpp
@@ -1,12 +1,21 @@
 #include "trial.h"
+#include "static_data.h"
 
 namespace Rando {
-TrialInfo::TrialInfo(Text name_) : name(std::move(name_)) {}
+TrialInfo::TrialInfo(RandomizerHintTextKey nameKey_, TrialKey trialKey_) : nameKey(std::move(nameKey_)), trialKey(std::move(trialKey_)) {}
 TrialInfo::TrialInfo() = default;
 TrialInfo::~TrialInfo() = default;
 
-Text TrialInfo::GetName() const {
-    return name;
+CustomMessage TrialInfo::GetName() const {
+    return StaticData::hintTextTable[nameKey].GetHintMessage();
+}
+
+RandomizerHintTextKey TrialInfo::GetNameKey() const {
+    return nameKey;
+}
+
+TrialKey TrialInfo::GetTrialKey() const {
+    return trialKey;
 }
 
 bool TrialInfo::IsSkipped() const {
@@ -26,12 +35,9 @@ void TrialInfo::SetAsSkipped() {
 }
 
 Trials::Trials() {
-    mTrials[FOREST_TRIAL] = TrialInfo(Text{"the Forest Trial", "l'épreuve de la Forêt", "la prueba del bosque"});
-    mTrials[FIRE_TRIAL] = TrialInfo(Text{"the Fire Trial",   "l'épreuve du Feu", "la prueba del fuego"});
-    mTrials[WATER_TRIAL] = TrialInfo(Text{"the Water Trial",  "l'épreuve de l'Eau", "la prueba del agua"});
-    mTrials[SPIRIT_TRIAL] = TrialInfo(Text{"the Spirit Trial", "l'épreuve de l'Esprit", "la prueba del espíritu"});
-    mTrials[SHADOW_TRIAL] = TrialInfo(Text{"the Shadow Trial", "l'épreuve de l'Ombre", "la prueba de las sombras"});
-    mTrials[LIGHT_TRIAL] = TrialInfo(Text{"the Light Trial",  "l'épreuve de la Lumière", "la prueba de la luz"});
+    for (const auto trial : StaticData::trialData){
+        mTrials[trial.first] = TrialInfo(trial.second, static_cast<TrialKey>(trial.first));
+    }
 }
 Trials::~Trials() = default;
 
@@ -51,10 +57,10 @@ void Trials::RequireAll() {
     }
 }
 
-std::array<TrialInfo*, 6> Trials::GetTrialList() {
-    std::array<TrialInfo*, 6> trialList{};
+std::vector<TrialInfo*> Trials::GetTrialList() {
+    std::vector<TrialInfo*> trialList{};
     for (size_t i = 0; i < mTrials.size(); i++) {
-        trialList[i] = &mTrials[i];
+        trialList.push_back(&mTrials[i]);
     }
     return trialList;
 }
@@ -62,6 +68,7 @@ std::array<TrialInfo*, 6> Trials::GetTrialList() {
 size_t Trials::GetTrialListSize() const {
     return mTrials.size();
 }
+
 void Trials::ParseJson(nlohmann::json spoilerFileJson) {
     nlohmann::json trialsJson = spoilerFileJson["requiredTrials"];
     for (auto it = trialsJson.begin(); it != trialsJson.end(); ++it) {
@@ -75,4 +82,13 @@ void Trials::ParseJson(nlohmann::json spoilerFileJson) {
         }
     }
 }
+
+std::unordered_map<uint32_t, RandomizerHintTextKey> Trials::GetAllTrialHintHeys() const {
+    std::unordered_map<uint32_t, RandomizerHintTextKey> output = {};
+    for (auto trial: mTrials){
+        output[(uint32_t)trial.GetTrialKey()] = trial.GetNameKey();
+    }
+    return output;
+}
+
 } // namespace Rando
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/trial.h b/soh/soh/Enhancements/randomizer/trial.h
index 9e282f45d..2cc483898 100644
--- a/soh/soh/Enhancements/randomizer/trial.h
+++ b/soh/soh/Enhancements/randomizer/trial.h
@@ -1,36 +1,31 @@
 #pragma once
 
-#include "3drando/text.hpp"
-
-#include <array>
+#include "randomizerTypes.h"
+#include "../custom-message/CustomMessageManager.h"
 #include <nlohmann/json.hpp>
+#include "static_data.h"
+#include <unordered_map>
 
 namespace Rando {
 class TrialInfo {
   public:
-    explicit TrialInfo(Text name_);
+    explicit TrialInfo(RandomizerHintTextKey nameKey_, TrialKey key_);
     TrialInfo();
     ~TrialInfo();
 
-    Text GetName() const;
+    CustomMessage GetName() const;
+    RandomizerHintTextKey GetNameKey() const;
+    TrialKey GetTrialKey() const;
     bool IsSkipped() const;
     bool IsRequired() const;
     void SetAsRequired();
     void SetAsSkipped();
   private:
-    Text name;
+    RandomizerHintTextKey nameKey;
+    TrialKey trialKey;
     bool skipped = true;
 };
 
-typedef enum {
-    LIGHT_TRIAL,
-    FOREST_TRIAL,
-    FIRE_TRIAL,
-    WATER_TRIAL,
-    SPIRIT_TRIAL,
-    SHADOW_TRIAL,
-} TrialKey;
-
 class Trials {
   public:
     Trials();
@@ -38,10 +33,11 @@ class Trials {
     TrialInfo* GetTrial(TrialKey key);
     void SkipAll();
     void RequireAll();
-    std::array<TrialInfo*, 6> GetTrialList();
+    std::vector<TrialInfo*> GetTrialList();
     size_t GetTrialListSize() const;
     void ParseJson(nlohmann::json spoilerFileJson);
+    std::unordered_map<uint32_t, RandomizerHintTextKey> GetAllTrialHintHeys() const;
   private:
-    std::array<TrialInfo, 6> mTrials;
+    std::array<TrialInfo, TK_MAX> mTrials;
 };
 }
\ No newline at end of file
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
index 2222d0007..f8c292b59 100644
--- a/soh/soh/OTRGlobals.cpp
+++ b/soh/soh/OTRGlobals.cpp
@@ -348,8 +348,9 @@ OTRGlobals::OTRGlobals() {
     loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryBinaryRawJsonV0>(), RESOURCE_FORMAT_BINARY, "RawJson", static_cast<uint32_t>(SOH::ResourceType::SOH_RawJson), 0);
 
     gSaveStateMgr = std::make_shared<SaveStateMgr>();
-    gRandoContext = Rando::Context::CreateInstance();
     gRandoContext->InitStaticData();
+    gRandoContext = Rando::Context::CreateInstance();
+    Rando::StaticData::InitItemTable();//RANDOTODO make this not rely on context's logic so it can be initialised in InitStaticData
     gRandoContext->AddExcludedOptions();
     gRandoContext->GetSettings()->CreateOptions();
     gRandomizer = std::make_shared<Randomizer>();
@@ -2245,8 +2246,8 @@ extern "C" float OTRGetDimensionFromRightEdge(float v) {
     return (SCREEN_WIDTH / 2 + SCREEN_HEIGHT / 2 * OTRGetAspectRatio() - (SCREEN_WIDTH - v));
 }
 
-f32 floorf(f32 x);
-f32 ceilf(f32 x);
+f32 floorf(f32 x);// RANDOTODO False positive error "allowing all exceptions is incompatible with previous function"
+f32 ceilf(f32 x); // This gets annoying
 
 extern "C" int16_t OTRGetRectDimensionFromLeftEdge(float v) {
     return ((int)floorf(OTRGetDimensionFromLeftEdge(v)));
@@ -2316,15 +2317,7 @@ extern "C" int GetEquipNowMessage(char* buffer, char* src, const int maxBufferSi
                                 "%w\x02");
     customMessage.Format();
 
-    std::string postfix;
-
-    if (gSaveContext.language == LANGUAGE_FRA) {
-        postfix = customMessage.GetFrench();
-    } else if (gSaveContext.language == LANGUAGE_GER) {
-        postfix = customMessage.GetGerman();
-    } else {
-        postfix = customMessage.GetEnglish();
-    }
+    std::string postfix = customMessage.GetForCurrentLanguage();
     std::string str;
     std::string FixedBaseStr(src);
     int RemoveControlChar = FixedBaseStr.find_first_of("\x02");
@@ -2478,6 +2471,7 @@ extern "C" int CustomMessage_RetrieveIfExists(PlayState* play) {
     CustomMessage messageEntry;
     s16 actorParams = 0;
     if (IS_RANDO) {
+        auto ctx = Rando::Context::GetInstance();
         Player* player = GET_PLAYER(play);
         if (textId == TEXT_RANDOMIZER_CUSTOM_ITEM) {
             if (player->getItemEntry.getItemId == RG_ICE_TRAP) {
@@ -2526,39 +2520,45 @@ extern "C" int CustomMessage_RetrieveIfExists(PlayState* play) {
              (Randomizer_GetSettingValue(RSK_GOSSIP_STONE_HINTS) == RO_GOSSIP_STONES_NEED_STONE && CHECK_QUEST_ITEM(QUEST_STONE_OF_AGONY)))) {
 
             Actor* stone = GET_PLAYER(play)->targetActor; 
-            actorParams = stone->params;
-
-            // if we're in a generic grotto
-            if (play->sceneNum == SCENE_GROTTOS && actorParams == 14360) {
+            RandomizerHint stoneHint = RH_NONE;
+            s16 hintParams = stone->params & 0xFF;
+            
+            if (Rando::StaticData::stoneParamsToHint.contains(hintParams)){
+                stoneHint = Rando::StaticData::stoneParamsToHint[hintParams];
+            } else if (hintParams == 0x18){
                 // look for the chest in the actorlist to determine
                 // which grotto we're in
                 int numOfActorLists =
                     sizeof(play->actorCtx.actorLists) / sizeof(play->actorCtx.actorLists[0]);
                 for (int i = 0; i < numOfActorLists; i++) {
                     if (play->actorCtx.actorLists[i].length) {
-                        if (play->actorCtx.actorLists[i].head->id == 10) {
-                            // set the params for the hint check to be negative chest params
-                            actorParams = 0 - play->actorCtx.actorLists[i].head->params;
+                        if (play->actorCtx.actorLists[i].head->id == 10 && 
+                            Rando::StaticData::grottoChestParamsToHint.contains(play->actorCtx.actorLists[i].head->params)) {
+                            //use the chest params to find the stone hint
+                            stoneHint = Rando::StaticData::grottoChestParamsToHint[play->actorCtx.actorLists[i].head->params];
                         }
                     }
                 }
             }
-
-            RandomizerCheck hintCheck =
-                Randomizer_GetCheckFromActor(stone->id, play->sceneNum, actorParams);
-
-            messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::hintMessageTableID, hintCheck);
+            if (stoneHint == RH_NONE){
+                messageEntry = CustomMessage("INVALID STONE. PARAMS: " + std::to_string(hintParams));
+            } else {
+                messageEntry = ctx->GetHint(stoneHint)->GetHintMessage(MF_AUTO_FORMAT);
+            }
         } else if ((textId == TEXT_ALTAR_CHILD || textId == TEXT_ALTAR_ADULT)) {
             // rando hints at altar
-            messageEntry = (LINK_IS_ADULT)
-               ? CustomMessageManager::Instance->RetrieveMessage(Randomizer::hintMessageTableID, TEXT_ALTAR_ADULT)
-               : CustomMessageManager::Instance->RetrieveMessage(Randomizer::hintMessageTableID, TEXT_ALTAR_CHILD);
+            messageEntry = (LINK_IS_ADULT) ? ctx->GetHint(RH_ALTAR_ADULT)->GetHintMessage() : ctx->GetHint(RH_ALTAR_CHILD)->GetHintMessage(MF_AUTO_FORMAT);
         } else if (textId == TEXT_GANONDORF) {
-            if ((INV_CONTENT(ITEM_ARROW_LIGHT) == ITEM_ARROW_LIGHT && CHECK_OWNED_EQUIP(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_MASTER)) ||
-              !Randomizer_GetSettingValue(RSK_LIGHT_ARROWS_HINT)) {
-                messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::hintMessageTableID, TEXT_GANONDORF_NOHINT);
-            } else {
-                messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::hintMessageTableID, TEXT_GANONDORF);
+            if (ctx->GetOption(RSK_GANONDORF_HINT)){
+                if (ctx->GetOption(RSK_SHUFFLE_MASTER_SWORD) && !CHECK_OWNED_EQUIP(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_MASTER)){
+                    messageEntry = INV_CONTENT(ITEM_ARROW_LIGHT) == ITEM_ARROW_LIGHT ?
+                                   ctx->GetHint(RH_GANONDORF_HINT)->GetHintMessage(MF_AUTO_FORMAT, 1):
+                                   ctx->GetHint(RH_GANONDORF_HINT)->GetHintMessage(MF_AUTO_FORMAT, 2);
+                } else {
+                    messageEntry = INV_CONTENT(ITEM_ARROW_LIGHT) == ITEM_ARROW_LIGHT ?
+                                   ctx->GetHint(RH_GANONDORF_JOKE)->GetHintMessage(MF_AUTO_FORMAT):
+                                   ctx->GetHint(RH_GANONDORF_HINT)->GetHintMessage(MF_AUTO_FORMAT, 0);
+                }
             }
         } else if (textId == TEXT_SHEIK_NEED_HOOK || textId == TEXT_SHEIK_HAVE_HOOK) {
             messageEntry = OTRGlobals::Instance->gRandomizer->GetSheikMessage(gPlayState->sceneNum, textId);            
@@ -2585,74 +2585,131 @@ extern "C" int CustomMessage_RetrieveIfExists(PlayState* play) {
         } else if (CVarGetInteger("gRandoRelevantNavi", 1) && textId >= TEXT_NAVI_DEKU_TREE_SUMMONS && textId <= TEXT_NAVI_TRY_TO_KEEP_MOVING) {
             u16 naviTextId = Random(0, NUM_NAVI_MESSAGES);
             messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::NaviRandoMessageTableID, naviTextId);
-        } else if (Randomizer_GetSettingValue(RSK_SHUFFLE_MAGIC_BEANS) && textId == TEXT_BEAN_SALESMAN_BUY_FOR_10) {
-            messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::merchantMessageTableID, TEXT_BEAN_SALESMAN_BUY_FOR_10);
-        } else if (Randomizer_GetSettingValue(RSK_SHUFFLE_MERCHANTS) != RO_SHUFFLE_MERCHANTS_OFF && (textId == TEXT_MEDIGORON ||
-          (textId == TEXT_GRANNYS_SHOP && !Flags_GetRandomizerInf(RAND_INF_MERCHANTS_GRANNYS_SHOP) &&
-                    (Randomizer_GetSettingValue(RSK_SHUFFLE_ADULT_TRADE) || INV_CONTENT(ITEM_CLAIM_CHECK) == ITEM_CLAIM_CHECK)) ||
-          (textId == TEXT_CARPET_SALESMAN_1 && !Flags_GetRandomizerInf(RAND_INF_MERCHANTS_CARPET_SALESMAN)) ||
-          (textId == TEXT_CARPET_SALESMAN_2 && !Flags_GetRandomizerInf(RAND_INF_MERCHANTS_CARPET_SALESMAN)))) {
+        } 
+        else if (textId == TEXT_BEAN_SALESMAN_BUY_FOR_10 && ctx->GetOption(RSK_SHUFFLE_MAGIC_BEANS)) {
+            messageEntry = ctx->GetHint(RH_BEAN_SALESMAN)->GetHintMessage(MF_AUTO_FORMAT);
+        } 
+        else if (textId == TEXT_BEAN_SALESMAN_BUY_FOR_100) {
+            messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::merchantMessageTableID, TEXT_BEAN_SALESMAN_BUY_FOR_100);
+        } 
+        else if (textId == TEXT_GRANNYS_SHOP && !Flags_GetRandomizerInf(RAND_INF_MERCHANTS_GRANNYS_SHOP) && Randomizer_GetSettingValue(RSK_SHUFFLE_MERCHANTS) != RO_SHUFFLE_MERCHANTS_OFF &&
+            (ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) || INV_CONTENT(ITEM_CLAIM_CHECK) == ITEM_CLAIM_CHECK)){
+            messageEntry = messageEntry = ctx->GetHint(RH_GRANNY)->GetHintMessage(MF_AUTO_FORMAT);
+        } 
+        else if (textId == TEXT_MEDIGORON && Randomizer_GetSettingValue(RSK_SHUFFLE_MERCHANTS) != RO_SHUFFLE_MERCHANTS_OFF){
+            messageEntry = messageEntry = ctx->GetHint(RH_MEDIGORON)->GetHintMessage(MF_AUTO_FORMAT);
+        } 
+        else if (textId == TEXT_CARPET_SALESMAN_1 && Randomizer_GetSettingValue(RSK_SHUFFLE_MERCHANTS) != RO_SHUFFLE_MERCHANTS_OFF){
+            messageEntry = messageEntry = ctx->GetHint(RH_CARPET_SALESMAN)->GetHintMessage(MF_AUTO_FORMAT);
+        } 
+        else if (textId == TEXT_CARPET_SALESMAN_2 && Randomizer_GetSettingValue(RSK_SHUFFLE_MERCHANTS) != RO_SHUFFLE_MERCHANTS_OFF){
             messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::merchantMessageTableID, textId);
-        } else if (Randomizer_GetSettingValue(RSK_BOMBCHUS_IN_LOGIC) &&
-                   (textId == TEXT_BUY_BOMBCHU_10_DESC || textId == TEXT_BUY_BOMBCHU_10_PROMPT)) {
+        } 
+        else if ((textId == TEXT_BUY_BOMBCHU_10_DESC || textId == TEXT_BUY_BOMBCHU_10_PROMPT) 
+                    && ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC)) {
             messageEntry = CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, textId);
-        } else if (textId == TEXT_SKULLTULA_PEOPLE_IM_CURSED) {
+        } 
+        else if (textId == TEXT_SKULLTULA_PEOPLE_IM_CURSED) {
             actorParams = GET_PLAYER(play)->targetActor->params;
-            RandomizerSettingKey rsk = (RandomizerSettingKey)(RSK_KAK_10_SKULLS_HINT + (actorParams - 1));
-            if (Randomizer_GetSettingValue(rsk)) {
-                messageEntry = OTRGlobals::Instance->gRandomizer->GetCursedSkullMessage(actorParams, 
-                OTRGlobals::Instance->gRandomizer->GetCheckFromActor(ACTOR_EN_SSH, SCENE_HOUSE_OF_SKULLTULA, actorParams));
+            if (actorParams == 1 && ctx->GetOption(RSK_KAK_10_SKULLS_HINT)){
+                messageEntry = ctx->GetHint(RH_KAK_10_SKULLS_HINT)->GetHintMessage(MF_AUTO_FORMAT);
+            } else if (actorParams == 2 && ctx->GetOption(RSK_KAK_20_SKULLS_HINT)){
+                messageEntry = ctx->GetHint(RH_KAK_20_SKULLS_HINT)->GetHintMessage(MF_AUTO_FORMAT);
+            } else if (actorParams == 3 && ctx->GetOption(RSK_KAK_30_SKULLS_HINT)){
+                messageEntry = ctx->GetHint(RH_KAK_30_SKULLS_HINT)->GetHintMessage(MF_AUTO_FORMAT);
+            } else if (actorParams == 4 && ctx->GetOption(RSK_KAK_40_SKULLS_HINT)){
+                messageEntry = ctx->GetHint(RH_KAK_40_SKULLS_HINT)->GetHintMessage(MF_AUTO_FORMAT);
+            } else if (ctx->GetOption(RSK_KAK_50_SKULLS_HINT)){
+                messageEntry = ctx->GetHint(RH_KAK_50_SKULLS_HINT)->GetHintMessage(MF_AUTO_FORMAT);
             }
-        } else if (Randomizer_GetSettingValue(RSK_DAMPES_DIARY_HINT) && textId == TEXT_DAMPES_DIARY) {
-            messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::randoMiscHintsTableID, TEXT_DAMPES_DIARY);
-        } else if (play->sceneNum == SCENE_TREASURE_BOX_SHOP &&
-                   Randomizer_GetSettingValue(RSK_GREG_HINT) &&
-                   (textId == TEXT_CHEST_GAME_PROCEED || textId == TEXT_CHEST_GAME_REAL_GAMBLER || textId == TEXT_CHEST_GAME_THANKS_A_LOT)) {
-            messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::randoMiscHintsTableID, TEXT_CHEST_GAME_PROCEED);
-        } else if (Randomizer_GetSettingValue(RSK_SHUFFLE_WARP_SONGS) &&
-                   (textId >= TEXT_WARP_MINUET_OF_FOREST && textId <= TEXT_WARP_PRELUDE_OF_LIGHT)) {
-            messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::randoMiscHintsTableID, textId);
-        } else if (textId == TEXT_LAKE_HYLIA_WATER_SWITCH_NAVI || textId == TEXT_LAKE_HYLIA_WATER_SWITCH_SIGN) {
+        } else if (textId == TEXT_DAMPES_DIARY && ctx->GetOption(RSK_DAMPES_DIARY_HINT)) {
+            messageEntry = ctx->GetHint(RH_DAMPES_DIARY)->GetHintMessage(MF_AUTO_FORMAT);
+        }
+        else if ((textId == TEXT_CHEST_GAME_PROCEED || textId == TEXT_CHEST_GAME_REAL_GAMBLER || textId == TEXT_CHEST_GAME_THANKS_A_LOT) &&
+                   play->sceneNum == SCENE_TREASURE_BOX_SHOP && ctx->GetOption(RSK_GREG_HINT)) {
+            messageEntry = ctx->GetHint(RH_GREG_RUPEE)->GetHintMessage(MF_AUTO_FORMAT);
+        }
+        else if (textId == TEXT_WARP_MINUET_OF_FOREST && ctx->GetOption(RSK_WARP_SONG_HINTS)) {
+            messageEntry = ctx->GetHint(RH_MINUET_WARP_LOC)->GetHintMessage(MF_FORMATTED);
+        }
+        else if (textId == TEXT_WARP_BOLERO_OF_FIRE && ctx->GetOption(RSK_WARP_SONG_HINTS)) {
+            messageEntry = ctx->GetHint(RH_BOLERO_WARP_LOC)->GetHintMessage(MF_FORMATTED);
+        }
+        else if (textId == TEXT_WARP_SERENADE_OF_WATER && ctx->GetOption(RSK_WARP_SONG_HINTS)) {
+            messageEntry = ctx->GetHint(RH_SERENADE_WARP_LOC)->GetHintMessage(MF_FORMATTED);
+        }
+        else if (textId == TEXT_WARP_REQUIEM_OF_SPIRIT && ctx->GetOption(RSK_WARP_SONG_HINTS)) {
+            messageEntry = ctx->GetHint(RH_REQUIEM_WARP_LOC)->GetHintMessage(MF_FORMATTED);
+        }
+        else if (textId == TEXT_WARP_NOCTURNE_OF_SHADOW && ctx->GetOption(RSK_WARP_SONG_HINTS)) {
+            messageEntry = ctx->GetHint(RH_NOCTURNE_WARP_LOC)->GetHintMessage(MF_FORMATTED);
+        }
+        else if (textId == TEXT_WARP_PRELUDE_OF_LIGHT && ctx->GetOption(RSK_WARP_SONG_HINTS)) {
+            messageEntry = ctx->GetHint(RH_PRELUDE_WARP_LOC)->GetHintMessage(MF_FORMATTED);
+        }
+        else if (textId >= TEXT_WARP_MINUET_OF_FOREST &&  textId <= TEXT_WARP_PRELUDE_OF_LIGHT 
+                 && ctx->GetOption(RSK_SHUFFLE_WARP_SONGS)) {
+            messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::hintMessageTableID, TEXT_WARP_MINUET_OF_FOREST);
+        }
+        else if (textId == TEXT_LAKE_HYLIA_WATER_SWITCH_NAVI || textId == TEXT_LAKE_HYLIA_WATER_SWITCH_SIGN) {
             messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::hintMessageTableID, textId);
-        } else if (textId == TEXT_SHOOTING_GALLERY_MAN_COME_BACK_WITH_BOW) {
+        }
+        else if (textId == TEXT_SHOOTING_GALLERY_MAN_COME_BACK_WITH_BOW) {
             messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::hintMessageTableID, TEXT_SHOOTING_GALLERY_MAN_COME_BACK_WITH_BOW);
-        } else if (textId == TEXT_FIRE_TEMPLE_GORON_OWE_YOU_BIG_TIME || (textId >= TEXT_FIRE_TEMPLE_GORON_FALLING_DOORS_SECRET && textId <= TEXT_FIRE_TEMPLE_GORON_SOUNDS_DIFFERENT_SECRET)) {
+        }
+        else if (textId == TEXT_FIRE_TEMPLE_GORON_OWE_YOU_BIG_TIME || (textId >= TEXT_FIRE_TEMPLE_GORON_FALLING_DOORS_SECRET && textId <= TEXT_FIRE_TEMPLE_GORON_SOUNDS_DIFFERENT_SECRET)) {
             u16 choice = Random(0, NUM_GORON_MESSAGES);
             messageEntry = OTRGlobals::Instance->gRandomizer->GetGoronMessage(choice);
-        } else if (Randomizer_GetSettingValue(RSK_FROGS_HINT) && textId == TEXT_FROGS_UNDERWATER) {
-            messageEntry = OTRGlobals::Instance->gRandomizer->GetMiscHintMessage(TEXT_FROGS_UNDERWATER, RC_ZR_FROGS_OCARINA_GAME);
-        } else if (Randomizer_GetSettingValue(RSK_FISHING_POLE_HINT) && !Flags_GetRandomizerInf(RAND_INF_FISHING_POLE_FOUND) &&
-                (textId == TEXT_FISHING_POND_START || textId == TEXT_FISHING_POND_START_MET)) {
+        }
+        else if (textId == TEXT_FROGS_UNDERWATER && ctx->GetOption(RSK_FROGS_HINT)) {
+           messageEntry = ctx->GetHint(RH_FROGS_HINT)->GetHintMessage(MF_AUTO_FORMAT), TEXTBOX_TYPE_BLUE;
+        }
+        else if ((textId == TEXT_FISHING_POND_START || textId == TEXT_FISHING_POND_START_MET) && 
+                   ctx->GetOption(RSK_SHUFFLE_FISHING_POLE) && !Flags_GetRandomizerInf(RAND_INF_FISHING_POLE_FOUND)) {
             messageEntry = OTRGlobals::Instance->gRandomizer->GetFishingPondOwnerMessage(textId);
-        } else if (Randomizer_GetSettingValue(RSK_SARIA_HINT) &&
-        (gPlayState->sceneNum == SCENE_SACRED_FOREST_MEADOW && textId == TEXT_SARIA_SFM) || (textId >= TEXT_SARIAS_SONG_FACE_TO_FACE && textId <= TEXT_SARIAS_SONG_CHANNELING_POWER)) {
-            messageEntry = OTRGlobals::Instance->gRandomizer->GetSariaMessage(textId);
-        } else if (textId == TEXT_BEAN_SALESMAN_BUY_FOR_100) {
-            messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::merchantMessageTableID, TEXT_BEAN_SALESMAN_BUY_FOR_100);
-        } else if (Randomizer_GetSettingValue(RSK_BIGGORON_HINT) && (textId == TEXT_BIGGORON_BETTER_AT_SMITHING || textId ==  TEXT_BIGGORON_WAITING_FOR_YOU || textId ==  TEXT_BIGGORON_RETURN_AFTER_A_FEW_DAYS)) {
-            messageEntry = OTRGlobals::Instance->gRandomizer->GetMiscHintMessage(TEXT_BIGGORON_BETTER_AT_SMITHING, RC_DMT_TRADE_CLAIM_CHECK);
-        } else if (Randomizer_GetSettingValue(RSK_BIG_POES_HINT) && (textId == TEXT_GHOST_SHOP_EXPLAINATION || textId == TEXT_GHOST_SHOP_CARD_HAS_POINTS)) {
-            messageEntry = OTRGlobals::Instance->gRandomizer->GetMiscHintMessage(TEXT_GHOST_SHOP_CARD_HAS_POINTS, RC_MARKET_10_BIG_POES);
-        } else if (Randomizer_GetSettingValue(RSK_CHICKENS_HINT) && (textId >= TEXT_ANJU_PLEASE_BRING_MY_CUCCOS_BACK && textId <= TEXT_ANJU_PLEASE_BRING_1_CUCCO)) {
-            messageEntry = OTRGlobals::Instance->gRandomizer->GetMiscHintMessage(TEXT_ANJU_PLEASE_BRING_MY_CUCCOS_BACK, RC_KAK_ANJU_AS_CHILD);
-        } else if (Randomizer_GetSettingValue(RSK_MALON_HINT) && (textId == TEXT_MALON_EVERYONE_TURNING_EVIL || textId == TEXT_MALON_I_SING_THIS_SONG)) {
-            messageEntry = OTRGlobals::Instance->gRandomizer->GetMiscHintMessage(TEXT_MALON_EVERYONE_TURNING_EVIL, RC_KF_LINKS_HOUSE_COW);
-        } else if (Randomizer_GetSettingValue(RSK_MALON_HINT) && textId == TEXT_MALON_HOW_IS_EPONA_DOING) {
-            messageEntry = OTRGlobals::Instance->gRandomizer->GetMiscHintMessage(TEXT_MALON_HOW_IS_EPONA_DOING, RC_KF_LINKS_HOUSE_COW);
-        } else if (Randomizer_GetSettingValue(RSK_MALON_HINT) && textId == TEXT_MALON_OBSTICLE_COURSE) {
-            messageEntry = OTRGlobals::Instance->gRandomizer->GetMiscHintMessage(TEXT_MALON_OBSTICLE_COURSE, RC_KF_LINKS_HOUSE_COW);
-        } else if (Randomizer_GetSettingValue(RSK_MALON_HINT) && textId == TEXT_MALON_INGO_MUST_HAVE_BEEN_TEMPTED) {
-            messageEntry = OTRGlobals::Instance->gRandomizer->GetMiscHintMessage(TEXT_MALON_INGO_MUST_HAVE_BEEN_TEMPTED, RC_KF_LINKS_HOUSE_COW);
-        } else if (Randomizer_GetSettingValue(RSK_KAK_100_SKULLS_HINT) && textId == TEXT_SKULLTULA_PEOPLE_MAKE_YOU_VERY_RICH) {
-            messageEntry = OTRGlobals::Instance->gRandomizer->GetCursedSkullMessage(10, RC_KAK_100_GOLD_SKULLTULA_REWARD);
-        } else if (Randomizer_GetSettingValue(RSK_HBA_HINT) && textId == TEXT_GF_HBA_SIGN) {
-            messageEntry = OTRGlobals::Instance->gRandomizer->GetMiscHintMessage(TEXT_GF_HBA_SIGN, RC_GF_HBA_1000_POINTS, RC_GF_HBA_1500_POINTS);
-        } else if (Randomizer_GetSettingValue(RSK_HBA_HINT) && textId == TEXT_HBA_NOT_ON_HORSE) {
-            messageEntry = OTRGlobals::Instance->gRandomizer->GetMiscHintMessage(TEXT_HBA_NOT_ON_HORSE, RC_GF_HBA_1000_POINTS, RC_GF_HBA_1500_POINTS);
-        } else if (Randomizer_GetSettingValue(RSK_HBA_HINT) && textId == TEXT_HBA_INITIAL_EXPLAINATION) {
-            messageEntry = OTRGlobals::Instance->gRandomizer->GetMiscHintMessage(TEXT_HBA_INITIAL_EXPLAINATION, RC_GF_HBA_1000_POINTS, RC_GF_HBA_1500_POINTS);
-        } else if (Randomizer_GetSettingValue(RSK_HBA_HINT) && textId == TEXT_HBA_ALREADY_HAVE_1000) {
-            messageEntry = OTRGlobals::Instance->gRandomizer->GetMiscHintMessage(TEXT_HBA_ALREADY_HAVE_1000, RC_GF_HBA_1500_POINTS);
+        }
+        else if (textId == TEXT_SARIA_SFM && gPlayState->sceneNum == SCENE_SACRED_FOREST_MEADOW && ctx->GetOption(RSK_SARIA_HINT)){
+            messageEntry = ctx->GetHint(RH_SARIA_HINT)->GetHintMessage(MF_AUTO_FORMAT, 0);
+        }
+        else if ((textId >= TEXT_SARIAS_SONG_FACE_TO_FACE && textId <= TEXT_SARIAS_SONG_CHANNELING_POWER) && ctx->GetOption(RSK_SARIA_HINT)){
+            messageEntry = ctx->GetHint(RH_SARIA_HINT)->GetHintMessage(MF_AUTO_FORMAT, 1);
+        }
+        else if (ctx->GetOption(RSK_BIGGORON_HINT) && (textId == TEXT_BIGGORON_BETTER_AT_SMITHING || textId ==  TEXT_BIGGORON_WAITING_FOR_YOU ||
+                                                       textId == TEXT_BIGGORON_RETURN_AFTER_A_FEW_DAYS || textId == TEXT_BIGGORON_I_MAAAADE_THISSSS)) {
+           messageEntry = ctx->GetHint(RH_BIGGORON_HINT)->GetHintMessage(MF_AUTO_FORMAT);
+        }
+        else if (ctx->GetOption(RSK_BIG_POES_HINT) && (textId == TEXT_GHOST_SHOP_EXPLAINATION || textId == TEXT_GHOST_SHOP_CARD_HAS_POINTS)) {
+            messageEntry = ctx->GetHint(RH_BIG_POES_HINT)->GetHintMessage(MF_AUTO_FORMAT);
+        }
+        else if (ctx->GetOption(RSK_CHICKENS_HINT) && (textId >= TEXT_ANJU_PLEASE_BRING_MY_CUCCOS_BACK && textId <= TEXT_ANJU_PLEASE_BRING_1_CUCCO)) {
+            messageEntry = ctx->GetHint(RH_CHICKENS_HINT)->GetHintMessage(MF_AUTO_FORMAT);
+        }
+        else if ((textId == TEXT_MALON_EVERYONE_TURNING_EVIL || textId == TEXT_MALON_I_SING_THIS_SONG)&& ctx->GetOption(RSK_MALON_HINT)){
+            messageEntry = ctx->GetHint(RH_MALON_HINT)->GetHintMessage(MF_AUTO_FORMAT, 0);
+        }
+        else if (textId == TEXT_MALON_HOW_IS_EPONA_DOING && ctx->GetOption(RSK_MALON_HINT)){
+            messageEntry = ctx->GetHint(RH_MALON_HINT)->GetHintMessage(MF_AUTO_FORMAT, 1);
+        }
+        else if (textId == TEXT_MALON_OBSTICLE_COURSE && ctx->GetOption(RSK_MALON_HINT)){
+            messageEntry = ctx->GetHint(RH_MALON_HINT)->GetHintMessage(MF_AUTO_FORMAT, 2);
+        }
+        else if (textId == TEXT_MALON_INGO_MUST_HAVE_BEEN_TEMPTED && ctx->GetOption(RSK_MALON_HINT)){
+            messageEntry = ctx->GetHint(RH_MALON_HINT)->GetHintMessage(MF_AUTO_FORMAT, 3);
+        }
+        else if (ctx->GetOption(RSK_KAK_100_SKULLS_HINT) && textId == TEXT_SKULLTULA_PEOPLE_MAKE_YOU_VERY_RICH) {
+            messageEntry = ctx->GetHint(RH_KAK_100_SKULLS_HINT)->GetHintMessage(MF_AUTO_FORMAT);
+        }
+        else if (textId == TEXT_GF_HBA_SIGN && ctx->GetOption(RSK_HBA_HINT)) {
+            messageEntry = ctx->GetHint(RH_HBA_HINT)->GetHintMessage(MF_AUTO_FORMAT, 0);
+        }
+        else if (textId == TEXT_HBA_NOT_ON_HORSE && ctx->GetOption(RSK_HBA_HINT)) {
+            messageEntry = ctx->GetHint(RH_HBA_HINT)->GetHintMessage(MF_AUTO_FORMAT, 1);
+        }
+        else if (textId == TEXT_HBA_INITIAL_EXPLAINATION && ctx->GetOption(RSK_HBA_HINT)) {
+            messageEntry = ctx->GetHint(RH_HBA_HINT)->GetHintMessage(MF_AUTO_FORMAT, 2);
+        }
+        else if (textId == TEXT_HBA_ALREADY_HAVE_1000 && ctx->GetOption(RSK_HBA_HINT)) {
+            messageEntry = ctx->GetHint(RH_HBA_HINT)->GetHintMessage(MF_AUTO_FORMAT, 3);
         }
     }
     if (textId == TEXT_GS_NO_FREEZE || textId == TEXT_GS_FREEZE) {
@@ -2674,16 +2731,16 @@ extern "C" int CustomMessage_RetrieveIfExists(PlayState* play) {
             // In rando we need to bump the token count by one to show the correct count
             s16 gsCount = gSaveContext.inventory.gsTokens + (IS_RANDO ? 1 : 0);
             messageEntry = CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, textId);
-            messageEntry.Replace("{{gsCount}}", std::to_string(gsCount));
+            messageEntry.Replace("[[gsCount]]", std::to_string(gsCount));
         }
     }
     if (textId == TEXT_HEART_CONTAINER && CVarGetInteger("gInjectItemCounts", 0)) {
         messageEntry = CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, TEXT_HEART_CONTAINER);
-        messageEntry.Replace("{{heartContainerCount}}", std::to_string(gSaveContext.sohStats.heartContainers + 1));
+        messageEntry.Replace("[[heartContainerCount]]", std::to_string(gSaveContext.sohStats.heartContainers + 1));
     }
     if (textId == TEXT_HEART_PIECE && CVarGetInteger("gInjectItemCounts", 0)) {
         messageEntry = CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, TEXT_HEART_PIECE);
-        messageEntry.Replace("{{heartPieceCount}}", std::to_string(gSaveContext.sohStats.heartPieces + 1));
+        messageEntry.Replace("[[heartPieceCount]]", std::to_string(gSaveContext.sohStats.heartPieces + 1));
     }
     if (textId == TEXT_MARKET_GUARD_NIGHT && CVarGetInteger("gMarketSneak", 0) && play->sceneNum == SCENE_MARKET_ENTRANCE_NIGHT) {
         messageEntry = CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, TEXT_MARKET_GUARD_NIGHT);
@@ -2695,14 +2752,14 @@ extern "C" int CustomMessage_RetrieveIfExists(PlayState* play) {
     switch (gSaveContext.language) {
         case LANGUAGE_FRA:
             return msgCtx->msgLength = font->msgLength =
-                       CopyStringToCharBuffer(messageEntry.GetFrench(), buffer, maxBufferSize);
+                       CopyStringToCharBuffer(messageEntry.GetFrench(MF_RAW), buffer, maxBufferSize);
         case LANGUAGE_GER:
             return msgCtx->msgLength = font->msgLength =
-                       CopyStringToCharBuffer(messageEntry.GetGerman(), buffer, maxBufferSize);
+                       CopyStringToCharBuffer(messageEntry.GetGerman(MF_RAW), buffer, maxBufferSize);
         case LANGUAGE_ENG:
         default:
             return msgCtx->msgLength = font->msgLength =
-                       CopyStringToCharBuffer(messageEntry.GetEnglish(), buffer, maxBufferSize);
+                       CopyStringToCharBuffer(messageEntry.GetEnglish(MF_RAW), buffer, maxBufferSize);
     }
     return false;
 }
diff --git a/soh/soh/SaveManager.cpp b/soh/soh/SaveManager.cpp
index 598a51139..a164c8a3d 100644
--- a/soh/soh/SaveManager.cpp
+++ b/soh/soh/SaveManager.cpp
@@ -6,6 +6,8 @@
 #include "Enhancements/randomizer/dungeon.h"
 #include "Enhancements/randomizer/trial.h"
 #include "soh/util.h"
+#include "Enhancements/randomizer/hint.h"
+#include "Enhancements/randomizer/item.h"
 
 #include "z64.h"
 #include "functions.h"
@@ -57,6 +59,51 @@ std::filesystem::path SaveManager::GetFileTempName(int fileNum) {
     return sSavePath / ("file" + std::to_string(fileNum + 1) + ".temp");
 }
 
+std::vector<RandomizerHint> Rando::StaticData::oldVerHintOrder {
+    RH_COLOSSUS_GOSSIP_STONE,
+    RH_DMC_GOSSIP_STONE,
+    RH_DMC_UPPER_GROTTO_GOSSIP_STONE,
+    RH_DMT_GOSSIP_STONE,
+    RH_DMT_STORMS_GROTTO_GOSSIP_STONE,
+    RH_DODONGOS_CAVERN_GOSSIP_STONE,
+    RH_ZF_FAIRY_GOSSIP_STONE,
+    RH_GC_MAZE_GOSSIP_STONE,
+    RH_GC_MEDIGORON_GOSSIP_STONE,
+    RH_GV_GOSSIP_STONE,
+    RH_GRAVEYARD_GOSSIP_STONE,
+    RH_HC_MALON_GOSSIP_STONE,
+    RH_HC_ROCK_WALL_GOSSIP_STONE,
+    RH_HC_STORMS_GROTTO_GOSSIP_STONE,
+    RH_HF_COW_GROTTO_GOSSIP_STONE,
+    RH_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE,
+    RH_HF_OPEN_GROTTO_GOSSIP_STONE,
+    RH_HF_SOUTHEAST_GROTTO_GOSSIP_STONE,
+    RH_ZF_JABU_GOSSIP_STONE,
+    RH_KF_DEKU_TREE_LEFT_GOSSIP_STONE,
+    RH_KF_DEKU_TREE_RIGHT_GOSSIP_STONE,
+    RH_KF_GOSSIP_STONE,
+    RH_KF_STORMS_GROTTO_GOSSIP_STONE,
+    RH_KAK_OPEN_GROTTO_GOSSIP_STONE,
+    RH_LH_LAB_GOSSIP_STONE,
+    RH_LH_SOUTHEAST_GOSSIP_STONE,
+    RH_LH_SOUTHWEST_GOSSIP_STONE,
+    RH_LW_GOSSIP_STONE,
+    RH_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE,
+    RH_SFM_MAZE_NEAR_LW_GOSSIP_STONE,
+    RH_SFM_MAZE_CENTER_GOSSIP_STONE,
+    RH_SFM_SARIA_GOSSIP_STONE,
+    RH_TOT_LEFT_CENTER_GOSSIP_STONE,
+    RH_TOT_LEFTMOST_GOSSIP_STONE,
+    RH_TOT_RIGHT_CENTER_GOSSIP_STONE,
+    RH_TOT_RIGHTMOST_GOSSIP_STONE,
+    RH_ZD_GOSSIP_STONE,
+    RH_ZR_NEAR_DOMAIN_GOSSIP_STONE,
+    RH_ZR_NEAR_GROTTOS_GOSSIP_STONE,
+    RH_ZR_OPEN_GROTTO_GOSSIP_STONE,
+};
+
+uint16_t Rando::StaticData::oldVerGossipStoneStart = 740;
+
 SaveManager::SaveManager() {
     coreSectionIDsByName["base"] = SECTION_ID_BASE;
     coreSectionIDsByName["randomizer"] = SECTION_ID_RANDOMIZER;
@@ -106,6 +153,7 @@ SaveManager::SaveManager() {
     }
 }
 
+// RANDOTODO should we just have dummy functions that raise warnings instead if these aren't supported?
 void SaveManager::LoadRandomizerVersion1() {
     auto randoContext = Rando::Context::GetInstance();
     RandomizerCheck location = RC_UNKNOWN_CHECK;
@@ -140,32 +188,33 @@ void SaveManager::LoadRandomizerVersion1() {
         for (int j = 0; j < ARRAY_COUNT(hintText); j++) {
             SaveManager::Instance->LoadData("ht" + std::to_string(i) + "-" + std::to_string(j), hintText[j]);
         }
-        randoContext->AddHint(RandomizerHintKey(check - RC_COLOSSUS_GOSSIP_STONE + 1), Text(hintText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static");
+        RandomizerHint stoneHint = Rando::StaticData::oldVerHintOrder[Rando::StaticData::oldVerGossipStoneStart];
+        randoContext->AddHint(stoneHint, Rando::Hint(stoneHint, {CustomMessage(hintText)}));
     }
 
     char childAltarText[250];
     for (int i = 0; i < ARRAY_COUNT(childAltarText); i++) {
         SaveManager::Instance->LoadData("cat" + std::to_string(i), childAltarText[i]);
     }
-    randoContext->AddHint(RH_ALTAR_CHILD, Text(childAltarText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static");
+    randoContext->AddHint(RH_ALTAR_CHILD, Rando::Hint(RH_ALTAR_CHILD, {CustomMessage(childAltarText)}));
 
     char adultAltarText[750];
     for (int i = 0; i < ARRAY_COUNT(adultAltarText); i++) {
         SaveManager::Instance->LoadData("aat" + std::to_string(i), adultAltarText[i]);
     }
-    randoContext->AddHint(RH_ALTAR_ADULT, Text(adultAltarText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static");
+    randoContext->AddHint(RH_ALTAR_ADULT, Rando::Hint(RH_ALTAR_ADULT, {CustomMessage(adultAltarText)}));
 
     char ganonHintText[150];
     for (int i = 0; i < ARRAY_COUNT(ganonHintText); i++) {
         SaveManager::Instance->LoadData("ght" + std::to_string(i), ganonHintText[i]);
     }
-    randoContext->AddHint(RH_GANONDORF_HINT, Text(ganonHintText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static");
+    randoContext->AddHint(RH_GANONDORF_HINT, Rando::Hint(RH_GANONDORF_HINT, {CustomMessage(ganonHintText)}));
 
     char ganonText[250];
     for (int i = 0; i < ARRAY_COUNT(ganonText); i++) {
         SaveManager::Instance->LoadData("gt" + std::to_string(i), ganonText[i]);
     }
-    randoContext->AddHint(RH_GANONDORF_NOHINT, Text(ganonText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static");
+    randoContext->AddHint(RH_GANONDORF_JOKE, Rando::Hint(RH_GANONDORF_JOKE, {CustomMessage(ganonText)}));
 
     SaveManager::Instance->LoadData("adultTradeItems", gSaveContext.adultTradeItems);
 
@@ -193,6 +242,7 @@ void SaveManager::LoadRandomizerVersion1() {
     });
 }
 
+//RANDOTODO if we actually support this, be less lazy
 void SaveManager::LoadRandomizerVersion2() {
     auto randoContext = Rando::Context::GetInstance();
     SaveManager::Instance->LoadArray("itemLocations", RC_MAX, [&](size_t i) {
@@ -244,56 +294,57 @@ void SaveManager::LoadRandomizerVersion2() {
             if (rc != RC_UNKNOWN_CHECK) {
                 std::string hintText;
                 SaveManager::Instance->LoadData("hintText", hintText);
-                randoContext->AddHint(RandomizerHintKey(rc - RC_COLOSSUS_GOSSIP_STONE + 1), Text(hintText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static");
+                RandomizerHint stoneHint = Rando::StaticData::oldVerHintOrder[Rando::StaticData::oldVerGossipStoneStart];
+                randoContext->AddHint(stoneHint, Rando::Hint(stoneHint, {CustomMessage(hintText)}));
             }
         });
     });
 
     std::string childAltarText;
     SaveManager::Instance->LoadData("childAltarText", childAltarText);
-    randoContext->AddHint(RH_ALTAR_CHILD, Text(childAltarText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static");
+    randoContext->AddHint(RH_ALTAR_CHILD, Rando::Hint(RH_ALTAR_CHILD, {CustomMessage(childAltarText)}));
     std::string adultAltarText;
     SaveManager::Instance->LoadData("adultAltarText", adultAltarText);
-    randoContext->AddHint(RH_ALTAR_ADULT, Text(adultAltarText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static");
+    randoContext->AddHint(RH_ALTAR_ADULT, Rando::Hint(RH_ALTAR_ADULT, {CustomMessage(adultAltarText)}));
     std::string ganonHintText;
     SaveManager::Instance->LoadData("ganonHintText", ganonHintText);
-    randoContext->AddHint(RH_GANONDORF_HINT, Text(ganonHintText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static");
+    randoContext->AddHint(RH_GANONDORF_HINT, Rando::Hint(RH_GANONDORF_HINT, {CustomMessage(ganonHintText)}));
     std::string ganonText;
     SaveManager::Instance->LoadData("ganonText", ganonText);
-    randoContext->AddHint(RH_GANONDORF_NOHINT, Text(ganonText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static");
+    randoContext->AddHint(RH_GANONDORF_JOKE, Rando::Hint(RH_GANONDORF_JOKE, {CustomMessage(ganonText)}));
     std::string dampeText;
     SaveManager::Instance->LoadData("dampeText", dampeText);
-    randoContext->AddHint(RH_DAMPES_DIARY, Text(dampeText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static");
+    randoContext->AddHint(RH_DAMPES_DIARY, Rando::Hint(RH_DAMPES_DIARY, {CustomMessage(dampeText)}));
     std::string gregHintText;
     SaveManager::Instance->LoadData("gregHintText", gregHintText);
-    randoContext->AddHint(RH_GREG_RUPEE, Text(gregHintText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static");
+    randoContext->AddHint(RH_GREG_RUPEE, Rando::Hint(RH_GREG_RUPEE, {CustomMessage(gregHintText)}));
     std::string sheikText;
     SaveManager::Instance->LoadData("sheikText", sheikText);
-    randoContext->AddHint(RH_SHEIK_LIGHT_ARROWS, Text(sheikText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static");
+    randoContext->AddHint(RH_SHEIK_HINT, Rando::Hint(RH_SHEIK_HINT, {CustomMessage(sheikText)}));
     std::string sariaText;
     SaveManager::Instance->LoadData("sariaText", sariaText);
-    randoContext->AddHint(RH_SARIA, Text(sariaText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static");
+    randoContext->AddHint(RH_SARIA_HINT, Rando::Hint(RH_SARIA_HINT, {CustomMessage(sariaText)}));
     std::string fishingPoleText;
     SaveManager::Instance->LoadData("fishingPoleText", fishingPoleText);
-    randoContext->AddHint(RH_FISHING_POLE, Text(fishingPoleText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static");
+    randoContext->AddHint(RH_FISHING_POLE, Rando::Hint(RH_FISHING_POLE, {CustomMessage(fishingPoleText)}));
     std::string warpMinuetText;
     SaveManager::Instance->LoadData("warpMinuetText", warpMinuetText);
-    randoContext->AddHint(RH_MINUET_WARP_LOC, Text(warpMinuetText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", randoContext->GetAreaFromString(warpMinuetText));
+    randoContext->AddHint(RH_MINUET_WARP_LOC, Rando::Hint(RH_MINUET_WARP_LOC, {CustomMessage(warpMinuetText)}));
     std::string warpBoleroText;
     SaveManager::Instance->LoadData("warpBoleroText", warpBoleroText);
-    randoContext->AddHint(RH_BOLERO_WARP_LOC, Text(warpBoleroText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", randoContext->GetAreaFromString(warpBoleroText));
+    randoContext->AddHint(RH_BOLERO_WARP_LOC, Rando::Hint(RH_BOLERO_WARP_LOC, {CustomMessage(warpBoleroText)}));
     std::string warpSerenadeText;
     SaveManager::Instance->LoadData("warpSerenadeText", warpSerenadeText);
-    randoContext->AddHint(RH_SERENADE_WARP_LOC, Text(warpSerenadeText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", randoContext->GetAreaFromString(warpSerenadeText));
+    randoContext->AddHint(RH_SERENADE_WARP_LOC, Rando::Hint(RH_SERENADE_WARP_LOC, {CustomMessage(warpSerenadeText)}));
     std::string warpRequiemText;
     SaveManager::Instance->LoadData("warpRequiemText", warpRequiemText);
-    randoContext->AddHint(RH_REQUIEM_WARP_LOC, Text(warpRequiemText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", randoContext->GetAreaFromString(warpRequiemText));
+    randoContext->AddHint(RH_REQUIEM_WARP_LOC, Rando::Hint(RH_REQUIEM_WARP_LOC, {CustomMessage(warpRequiemText)}));
     std::string warpNocturneText;
     SaveManager::Instance->LoadData("warpNocturneText", warpNocturneText);
-    randoContext->AddHint(RH_NOCTURNE_WARP_LOC, Text(warpNocturneText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", randoContext->GetAreaFromString(warpNocturneText));
+    randoContext->AddHint(RH_NOCTURNE_WARP_LOC, Rando::Hint(RH_NOCTURNE_WARP_LOC, {CustomMessage(warpNocturneText)}));
     std::string warpPreludeText;
     SaveManager::Instance->LoadData("warpPreludeText", warpPreludeText);
-    randoContext->AddHint(RH_PRELUDE_WARP_LOC, Text(warpPreludeText), RC_UNKNOWN_CHECK, HINT_TYPE_STATIC, "Static", randoContext->GetAreaFromString(warpPreludeText));
+    randoContext->AddHint(RH_PRELUDE_WARP_LOC, Rando::Hint(RH_PRELUDE_WARP_LOC, {CustomMessage(warpPreludeText)}));
 
     SaveManager::Instance->LoadData("adultTradeItems", gSaveContext.adultTradeItems);
 
@@ -386,23 +437,10 @@ void SaveManager::LoadRandomizerVersion3() {
     });
 
     SaveManager::Instance->LoadArray("hintLocations", RH_MAX, [&](size_t i) {
-        SaveManager::Instance->LoadStruct("", [&]() {
-            RandomizerHintKey rhk = RH_NONE;
-            SaveManager::Instance->LoadData("hintKey", rhk);
-            std::string english, french, german;
-            SaveManager::Instance->LoadStruct("hintText", [&]() {
-                SaveManager::Instance->LoadData("english", english);
-                SaveManager::Instance->LoadData("french", french);
-                SaveManager::Instance->LoadData("german", german);
-            });
-            RandomizerCheck rc = RC_UNKNOWN_CHECK;
-            SaveManager::Instance->LoadData("hintedCheck", rc);
-            HintType ht = HINT_TYPE_STATIC;
-            SaveManager::Instance->LoadData("hintType", ht);
-            RandomizerArea savedArea;
-            SaveManager::Instance->LoadData("hintedArea", savedArea);
-            randoContext->AddHint(rhk, Text(english, french, /*spanish*/"", german), rc, ht, "Unknown", savedArea);//RANDOTODO, maybe store and load distrabution, but it's a string...
-        });
+        auto hint = RandomizerHint(i);
+        nlohmann::ordered_json json;
+        SaveManager::Instance->LoadData("", json);
+        randoContext->AddHint(hint, Rando::Hint(hint, json));
     });
 
     SaveManager::Instance->LoadData("adultTradeItems", gSaveContext.adultTradeItems);
@@ -477,17 +515,68 @@ void SaveManager::SaveRandomizer(SaveContext* saveContext, int sectionID, bool f
     });
 
     SaveManager::Instance->SaveArray("hintLocations", RH_MAX, [&](size_t i) {
+        auto hint = randoContext->GetHint(RandomizerHint(i));
+        // RANDOTODO a way for saveData to accept a raw JSON would make maintaining hint code nicer.
+        // save manager forces code rewrites between the spoiler log and internal saves, when the code needs to do the exact same thing
+        // in cases where data needs to be loaded in from the spoiler log for plando mode.
+        // fails as push_back is ambiguous
+        // SaveManager::Instance->SaveData(Rando::StaticData::hintNames[(uint32_t)hint].GetEnglish(), hint->toJSON());
         SaveManager::Instance->SaveStruct("", [&]() {
-            auto hint = randoContext->GetHint(RandomizerHintKey(i));
-            SaveManager::Instance->SaveData("hintKey", RandomizerHintKey(i));
-            SaveManager::Instance->SaveStruct("hintText", [&]() {
-                SaveManager::Instance->SaveData("english", hint->GetText().GetEnglish());
-                SaveManager::Instance->SaveData("french", hint->GetText().GetFrench());
-                SaveManager::Instance->SaveData("german", hint->GetText().GetGerman());
-            });
-            SaveManager::Instance->SaveData("hintedCheck", hint->GetHintedLocation());
-            SaveManager::Instance->SaveData("hintType", hint->GetHintType());
-            SaveManager::Instance->SaveData("hintedArea", hint->GetHintedArea());
+            bool enabled = hint->IsEnabled();
+            SaveManager::Instance->SaveData("enabled", enabled);
+            if (enabled){
+                std::vector<std::string> messages = hint->GetAllMessageStrings(MF_RAW);
+                SaveManager::Instance->SaveArray("messages", messages.size(), [&](size_t i) {
+                    SaveManager::Instance->SaveData("", messages[i]);
+                });
+
+                SaveManager::Instance->SaveData("distribution", hint->GetDistribution());
+                SaveManager::Instance->SaveData("type", Rando::StaticData::hintTypeNames[hint->GetHintType()].GetEnglish(MF_CLEAN));
+                
+                std::vector<RandomizerHintTextKey> hintKeys = hint->GetHintTextKeys();
+                SaveManager::Instance->SaveArray("hintKeys", hintKeys.size(), [&](size_t i) {
+                    SaveManager::Instance->SaveData("", hintKeys[i]);
+                });
+
+                std::vector<RandomizerCheck> locations = hint->GetHintedLocations();
+                SaveManager::Instance->SaveArray("locations", locations.size(), [&](size_t i) {
+                    SaveManager::Instance->SaveData("", Rando::StaticData::GetLocation(locations[i])->GetName());
+                });
+
+                std::vector<RandomizerGet> items = hint->GetHintedItems();
+                SaveManager::Instance->SaveArray("items", items.size(), [&](size_t i) {
+                    SaveManager::Instance->SaveData("", Rando::StaticData::GetItemTable()[items[i]].GetName().GetEnglish());
+                });
+                
+                std::vector<uint8_t> itemNamesChosen = hint->GetItemNamesChosen();
+                SaveManager::Instance->SaveArray("itemNamesChosen", itemNamesChosen.size(), [&](size_t i) {
+                    SaveManager::Instance->SaveData("", itemNamesChosen[i]);
+                });
+                
+                std::vector<uint8_t> hintTextsChosen = hint->GetHintTextsChosen();
+                SaveManager::Instance->SaveArray("hintTextsChosen", hintTextsChosen.size(), [&](size_t i) {
+                    SaveManager::Instance->SaveData("", hintTextsChosen[i]);
+                });
+
+                std::vector<uint8_t> areaTextsChosen = hint->GetAreaTextsChosen();
+                SaveManager::Instance->SaveArray("areaTextsChosen", areaTextsChosen.size(), [&](size_t i) {
+                    SaveManager::Instance->SaveData("", areaTextsChosen[i]);
+                });
+                
+                std::vector<RandomizerArea> areas = hint->GetHintedAreas();
+                SaveManager::Instance->SaveArray("areas", areas.size(), [&](size_t i) {
+                    SaveManager::Instance->SaveData("", Rando::StaticData::hintTextTable[Rando::StaticData::areaNames[areas[i]]].GetClear().GetForCurrentLanguage(MF_CLEAN));
+                });
+                
+                std::vector<TrialKey> trials = hint->GetHintedTrials();
+                SaveManager::Instance->SaveArray("trials", trials.size(), [&](size_t i) {
+                    SaveManager::Instance->SaveData("", randoContext->GetTrial(trials[i])->GetName().GetForCurrentLanguage(MF_CLEAN));
+                });
+
+                SaveManager::Instance->SaveData("num", hint->GetNum());
+
+
+            }
         });
     });
 
diff --git a/soh/soh/SaveManager.h b/soh/soh/SaveManager.h
index 935a6366e..f7d0910f6 100644
--- a/soh/soh/SaveManager.h
+++ b/soh/soh/SaveManager.h
@@ -183,6 +183,7 @@ class SaveManager {
     nlohmann::json* currentJsonContext = nullptr;
     nlohmann::json::iterator currentJsonArrayContext;
     std::shared_ptr<BS::thread_pool> smThreadPool;
+
 };
 
 #else
diff --git a/soh/soh/z_message_OTR.cpp b/soh/soh/z_message_OTR.cpp
index 05432fc53..ce0255436 100644
--- a/soh/soh/z_message_OTR.cpp
+++ b/soh/soh/z_message_OTR.cpp
@@ -137,19 +137,19 @@ extern "C" void OTRMessage_Init()
     CustomMessageManager::Instance->AddCustomMessageTable(customMessageTableID);
     CustomMessageManager::Instance->CreateGetItemMessage(
         customMessageTableID, (GetItemID)TEXT_GS_NO_FREEZE, ITEM_SKULL_TOKEN,
-        CustomMessage("You got a %rGold Skulltula Token%w!&You've collected %r{{gsCount}}%w tokens&in total!\x0E\x3C",
-                      "Ein %rGoldenes Skulltula-Symbol%w!&Du hast nun insgesamt %r{{gsCount}}&%wGoldene "
+        CustomMessage("You got a %rGold Skulltula Token%w!&You've collected %r[[gsCount]]%w tokens&in total!\x0E\x3C",
+                      "Ein %rGoldenes Skulltula-Symbol%w!&Du hast nun insgesamt %r[[gsCount]]&%wGoldene "
                       "Skulltula-Symbole&gesammelt!\x0E\x3C",
-                      "Vous obtenez un %rSymbole de&Skulltula d'or%w! Vous avez&collecté %r{{gsCount}}%w symboles en "
+                      "Vous obtenez un %rSymbole de&Skulltula d'or%w! Vous avez&collecté %r[[gsCount]]%w symboles en "
                       "tout!\x0E\x3C",
                       TEXTBOX_TYPE_BLUE));
     CustomMessageManager::Instance->CreateGetItemMessage(
         customMessageTableID, (GetItemID)TEXT_GS_FREEZE, ITEM_SKULL_TOKEN,
         CustomMessage(
-            "You got a %rGold Skulltula Token%w!&You've collected %r{{gsCount}}%w tokens&in total!",
-            "Ein %rGoldenes Skulltula-Symbol%w!&Du hast nun insgesamt %r{{gsCount}}&%wGoldene "
+            "You got a %rGold Skulltula Token%w!&You've collected %r[[gsCount]]%w tokens&in total!",
+            "Ein %rGoldenes Skulltula-Symbol%w!&Du hast nun insgesamt %r[[gsCount]]&%wGoldene "
             "Skulltula-Symbole&gesammelt!",
-            "Vous obtenez un %rSymbole de&Skulltula d'or%w! Vous avez&collecté %r{{gsCount}}%w symboles en tout!",
+            "Vous obtenez un %rSymbole de&Skulltula d'or%w! Vous avez&collecté %r[[gsCount]]%w symboles en tout!",
             TEXTBOX_TYPE_BLUE));
     CustomMessageManager::Instance->CreateMessage(
         customMessageTableID, TEXT_BUY_BOMBCHU_10_DESC,
@@ -168,14 +168,14 @@ extern "C" void OTRMessage_Init()
     CustomMessageManager::Instance->CreateGetItemMessage(
         customMessageTableID, (GetItemID)TEXT_HEART_CONTAINER, ITEM_HEART_CONTAINER,
         CustomMessage(
-            "You got a %rHeart Container%w!&You've collected %r{{heartContainerCount}}%w containers&in total!",
-            "Ein %rHerzcontainer%w!&Du hast nun insgesamt %r{{heartContainerCount}}%w&Herzcontainer gesammelt!",
-            "Vous obtenez un %rCoeur&d'Energie%w! Vous en avez&collecté %r{{heartContainerCount}}%w en tout!"));
+            "You got a %rHeart Container%w!&You've collected %r[[heartContainerCount]]%w containers&in total!",
+            "Ein %rHerzcontainer%w!&Du hast nun insgesamt %r[[heartContainerCount]]%w&Herzcontainer gesammelt!",
+            "Vous obtenez un %rCoeur&d'Energie%w! Vous en avez&collecté %r[[heartContainerCount]]%w en tout!"));
     CustomMessageManager::Instance->CreateGetItemMessage(
         customMessageTableID, (GetItemID)TEXT_HEART_PIECE, ITEM_HEART_PIECE,
-        CustomMessage("You got a %rHeart Piece%w!&You've collected %r{{heartPieceCount}}%w pieces&in total!",
-                      "Ein %rHerzteil%w!&Du hast nun insgesamt %r{{heartPieceCount}}%w&Herteile gesammelt!",
-                      "Vous obtenez un %rQuart de&Coeur%w! Vous en avez collecté&%r{{heartPieceCount}}%w en tout!",
+        CustomMessage("You got a %rHeart Piece%w!&You've collected %r[[heartPieceCount]]%w pieces&in total!",
+                      "Ein %rHerzteil%w!&Du hast nun insgesamt %r[[heartPieceCount]]%w&Herteile gesammelt!",
+                      "Vous obtenez un %rQuart de&Coeur%w! Vous en avez collecté&%r[[heartPieceCount]]%w en tout!",
                       TEXTBOX_TYPE_BLUE));
     CustomMessageManager::Instance->CreateMessage(
         customMessageTableID, TEXT_MARKET_GUARD_NIGHT,
diff --git a/soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c b/soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c
index f0cdc2249..012531f66 100644
--- a/soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c
+++ b/soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c
@@ -16,9 +16,6 @@
 
 #define FLAGS ACTOR_FLAG_UPDATE_WHILE_CULLED
 
-#define TEXT_SHEIK_NEED_HOOK 0x700F
-#define TEXT_SHEIK_HAVE_HOOK 0x7010
-
 void EnXc_Init(Actor* thisx, PlayState* play);
 void EnXc_Destroy(Actor* thisx, PlayState* play);
 void EnXc_Update(Actor* thisx, PlayState* play);
@@ -2239,27 +2236,11 @@ void EnXc_SetupDialogueAction(EnXc* this, PlayState* play) {
     if (Actor_ProcessTalkRequest(&this->actor, play)) {
         this->action = SHEIK_ACTION_IN_DIALOGUE;
     } else {
-         this->actor.flags |= ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY;
-        if (IS_RANDO && gPlayState->sceneNum == SCENE_TEMPLE_OF_TIME) {
-            if (!CHECK_DUNGEON_ITEM(DUNGEON_KEY_BOSS, SCENE_GANONS_TOWER)) {
-                this->actor.textId = TEXT_SHEIK_NEED_HOOK;
-            } else {
-                this->actor.textId = TEXT_SHEIK_HAVE_HOOK;
-            }
-        } else if (IS_RANDO && gPlayState->sceneNum == SCENE_INSIDE_GANONS_CASTLE) {
-            if (CHECK_OWNED_EQUIP(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_MASTER) && INV_CONTENT(ITEM_ARROW_LIGHT) == ITEM_ARROW_LIGHT &&
-            CUR_CAPACITY(UPG_QUIVER) >= 30 && gSaveContext.isMagicAcquired) {
-                this->actor.textId = TEXT_SHEIK_HAVE_HOOK;
-            } else {
-                this->actor.textId = TEXT_SHEIK_NEED_HOOK;
-            }
-        }
-        else {
-            if (INV_CONTENT(ITEM_HOOKSHOT) != ITEM_NONE) {
-                this->actor.textId = 0x7010; //"You have what you need"
-            } else {
-                this->actor.textId = 0x700F; //"You need another skill"
-            }
+         this->actor.flags |= ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY; //this arrangment is cute but I would rather handle all message selection in ship code
+        if (INV_CONTENT(ITEM_HOOKSHOT) != ITEM_NONE) {
+            this->actor.textId = 0x7010; //"You have what you need"
+        } else {
+            this->actor.textId = 0x700F; //"You need another skill"
         }
         func_8002F2F4(&this->actor, play);
     }

From baaa00569d13ab690fa837295091a6efba0e4907 Mon Sep 17 00:00:00 2001
From: Christopher Leggett <chris@leggett.dev>
Date: Tue, 30 Apr 2024 23:31:08 -0400
Subject: [PATCH 129/230] Adds Quick Boss Death checkbox and implements Phantom
 Ganon's quick death (#119)

* Adds Quick Boss Death checkbox and implements Phantom Ganon's quick death.

* Clarifies relocation comment.
---
 .../game-interactor/GameInteractor.h          |  4 +
 .../Enhancements/timesaver_hook_handlers.cpp  | 27 ++++++
 soh/soh/SohMenuBar.cpp                        |  5 ++
 .../ovl_Boss_Ganondrof/z_boss_ganondrof.c     | 83 ++++++-------------
 .../ovl_Boss_Ganondrof/z_boss_ganondrof.h     | 17 ++++
 5 files changed, 80 insertions(+), 56 deletions(-)

diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h
index fd5611df8..716d20b08 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h
@@ -376,6 +376,10 @@ typedef enum {
     /*** Fixes ***/
     // Vanilla condition: false
     GI_VB_FIX_SAW_SOFTLOCK,
+
+    /*** Quick Boss Deaths ***/
+    // Vanilla condition: true
+    GI_VB_PHANTOM_GANON_DEATH_SCENE,
 } GIVanillaBehavior;
 
 #ifdef __cplusplus
diff --git a/soh/soh/Enhancements/timesaver_hook_handlers.cpp b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
index 46b4353ee..52e14ab8c 100644
--- a/soh/soh/Enhancements/timesaver_hook_handlers.cpp
+++ b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
@@ -24,6 +24,8 @@ extern "C" {
 #include "src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h"
 #include "src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h"
 #include "src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h"
+#include <overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.h>
+#include <objects/object_gnd/object_gnd.h>
 extern SaveContext gSaveContext;
 extern PlayState* gPlayState;
 extern int32_t D_8011D3AC;
@@ -719,6 +721,31 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             }
             break;
         }
+        case GI_VB_PHANTOM_GANON_DEATH_SCENE: {
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.QuickBossDeaths", IS_RANDO || IS_BOSS_RUSH)) {
+                *should = false;
+                BossGanondrof* pg = static_cast<BossGanondrof*>(opt);
+                Player* player = GET_PLAYER(gPlayState);
+                if (pg != nullptr && pg->work[GND_ACTION_STATE] == DEATH_SPASM) {
+                    // Skip to death scream animation and move ganondrof to middle
+                    pg->deathState = DEATH_SCREAM;
+                    pg->timers[0] = 50;
+                    AnimationHeader* screamAnim = (AnimationHeader*)gPhantomGanonScreamAnim;
+                    Animation_MorphToLoop(&pg->skelAnime, screamAnim, -10.0f);
+                    pg->actor.world.pos.x = GND_BOSSROOM_CENTER_X;
+                    pg->actor.world.pos.y = GND_BOSSROOM_CENTER_Y + 83.0f;
+                    pg->actor.world.pos.z = GND_BOSSROOM_CENTER_Z;
+                    pg->actor.shape.rot.y = 0;
+                    pg->work[GND_BODY_DECAY_INDEX] = 0;
+                    Audio_PlayActorSound2(&pg->actor, NA_SE_EN_FANTOM_LAST);
+
+                    // Move Player out of the center of the room
+                    player->actor.world.pos.x = GND_BOSSROOM_CENTER_X - 200.0f;
+                    player->actor.world.pos.z = GND_BOSSROOM_CENTER_Z;
+                }
+            }
+            break;
+        }
     }
 }
 
diff --git a/soh/soh/SohMenuBar.cpp b/soh/soh/SohMenuBar.cpp
index 3821f9df4..98de7a48c 100644
--- a/soh/soh/SohMenuBar.cpp
+++ b/soh/soh/SohMenuBar.cpp
@@ -581,6 +581,7 @@ void DrawEnhancementsMenu() {
                     CVarGetInteger("gTimeSavers.SkipCutscene.Story", IS_RANDO) &&
                     CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", IS_RANDO) &&
                     CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", IS_RANDO) &&
+                    CVarGetInteger("gTimeSavers.SkipCutscene.QuickBossDeaths", IS_RANDO) &&
                     CVarGetInteger("gTimeSavers.SkipCutscene.OnePoint", IS_RANDO) &&
                     CVarGetInteger("gTimeSavers.NoForcedDialog", IS_RANDO) &&
                     CVarGetInteger("gTimeSavers.SkipOwlInteractions", IS_RANDO) &&
@@ -592,6 +593,7 @@ void DrawEnhancementsMenu() {
                     CVarGetInteger("gTimeSavers.SkipCutscene.Story", IS_RANDO) ||
                     CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", IS_RANDO) ||
                     CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", IS_RANDO) ||
+                    CVarGetInteger("gTimeSavers.SkipCutscene.QuickBossDeaths", IS_RANDO) ||
                     CVarGetInteger("gTimeSavers.SkipCutscene.OnePoint", IS_RANDO) ||
                     CVarGetInteger("gTimeSavers.NoForcedDialog", IS_RANDO) ||
                     CVarGetInteger("gTimeSavers.SkipOwlInteractions", IS_RANDO) ||
@@ -608,6 +610,7 @@ void DrawEnhancementsMenu() {
                         CVarSetInteger("gTimeSavers.SkipCutscene.Story", 1);
                         CVarSetInteger("gTimeSavers.SkipCutscene.LearnSong", 1);
                         CVarSetInteger("gTimeSavers.SkipCutscene.BossIntro", 1);
+                        CVarSetInteger("gTimeSavers.SkipCutscene.QuickBossDeaths", 1);
                         CVarSetInteger("gTimeSavers.SkipCutscene.OnePoint", 1);
                         CVarSetInteger("gTimeSavers.NoForcedDialog", 1);
                         CVarSetInteger("gTimeSavers.SkipOwlInteractions", 1);
@@ -619,6 +622,7 @@ void DrawEnhancementsMenu() {
                         CVarSetInteger("gTimeSavers.SkipCutscene.Story", 0);
                         CVarSetInteger("gTimeSavers.SkipCutscene.LearnSong", 0);
                         CVarSetInteger("gTimeSavers.SkipCutscene.BossIntro", 0);
+                        CVarSetInteger("gTimeSavers.SkipCutscene.QuickBossDeaths", 0);
                         CVarSetInteger("gTimeSavers.SkipCutscene.OnePoint", 0);
                         CVarSetInteger("gTimeSavers.NoForcedDialog", 0);
                         CVarSetInteger("gTimeSavers.SkipOwlInteractions", 0);
@@ -633,6 +637,7 @@ void DrawEnhancementsMenu() {
                 UIWidgets::PaddedEnhancementCheckbox("Skip Story Cutscenes", "gTimeSavers.SkipCutscene.Story", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
                 UIWidgets::PaddedEnhancementCheckbox("Skip Song Cutscenes", "gTimeSavers.SkipCutscene.LearnSong", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
                 UIWidgets::PaddedEnhancementCheckbox("Skip Boss Introductions", "gTimeSavers.SkipCutscene.BossIntro", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
+                UIWidgets::PaddedEnhancementCheckbox("Quick Boss Deaths", "gTimeSavers.SkipCutscene.QuickBossDeaths", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
                 UIWidgets::PaddedEnhancementCheckbox("Skip One Point Cutscenes (Chests, Door Unlocks, etc)", "gTimeSavers.SkipCutscene.OnePoint", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
                 UIWidgets::PaddedEnhancementCheckbox("No Forced Dialog", "gTimeSavers.NoForcedDialog", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
                 UIWidgets::Tooltip("Prevent forced conversations with Navi or other NPCs");
diff --git a/soh/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c b/soh/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c
index 82fe2c131..0b025dcd6 100644
--- a/soh/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c
+++ b/soh/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c
@@ -12,19 +12,10 @@
 #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h"
 #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h"
 #include "soh/Enhancements/boss-rush/BossRush.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_WHILE_CULLED | ACTOR_FLAG_DRAW_WHILE_CULLED)
 
-typedef enum {
-    /* 0 */ NOT_DEAD,
-    /* 1 */ DEATH_START,
-    /* 2 */ DEATH_THROES,
-    /* 3 */ DEATH_WARP,
-    /* 4 */ DEATH_SCREAM,
-    /* 5 */ DEATH_DISINTEGRATE,
-    /* 6 */ DEATH_FINISH
-} BossGanondrofDeathState;
-
 typedef enum {
     /* 0 */ THROW_NORMAL,
     /* 1 */ THROW_SLOW
@@ -42,12 +33,6 @@ typedef enum {
     /* 3 */ CHARGE_FINISH
 } BossGanondrofChargeAction;
 
-typedef enum {
-    /* 0 */ DEATH_SPASM,
-    /* 1 */ DEATH_LIMP,
-    /* 2 */ DEATH_HUNCHED
-} BossGanondrofDeathAction;
-
 void BossGanondrof_Init(Actor* thisx, PlayState* play);
 void BossGanondrof_Destroy(Actor* thisx, PlayState* play);
 void BossGanondrof_Update(Actor* thisx, PlayState* play);
@@ -959,26 +944,13 @@ void BossGanondrof_Death(BossGanondrof* this, PlayState* play) {
         case DEATH_THROES:
             switch (this->work[GND_ACTION_STATE]) {
                 case DEATH_SPASM:
-                    if (Animation_OnFrame(&this->skelAnime, this->fwork[GND_END_FRAME]) && !IS_RANDO && !IS_BOSS_RUSH) {
-                        this->fwork[GND_END_FRAME] = Animation_GetLastFrame(&gPhantomGanonAirDamageAnim);
-                        Animation_Change(&this->skelAnime, &gPhantomGanonAirDamageAnim, 0.5f, 0.0f,
-                                            this->fwork[GND_END_FRAME], ANIMMODE_ONCE_INTERP, 0.0f);
-                        this->work[GND_ACTION_STATE] = DEATH_LIMP;
-                    } else if (IS_RANDO || IS_BOSS_RUSH) {
-                        // Skip to death scream animation and move ganondrof to middle
-                        this->deathState = DEATH_SCREAM;
-                        this->timers[0] = 50;
-                        Animation_MorphToLoop(&this->skelAnime, &gPhantomGanonScreamAnim, -10.0f);
-                        this->actor.world.pos.x = GND_BOSSROOM_CENTER_X;
-                        this->actor.world.pos.y = GND_BOSSROOM_CENTER_Y + 83.0f;
-                        this->actor.world.pos.z = GND_BOSSROOM_CENTER_Z;
-                        this->actor.shape.rot.y = 0;
-                        this->work[GND_BODY_DECAY_INDEX] = 0;
-                        Audio_PlayActorSound2(&this->actor, NA_SE_EN_FANTOM_LAST);
-
-                        // Move Player out of the center of the room
-                        player->actor.world.pos.x = GND_BOSSROOM_CENTER_X - 200.0f;
-                        player->actor.world.pos.z = GND_BOSSROOM_CENTER_Z;
+                    if (GameInteractor_Should(GI_VB_PHANTOM_GANON_DEATH_SCENE, true, this)) {
+                        if (Animation_OnFrame(&this->skelAnime, this->fwork[GND_END_FRAME])) {
+                            this->fwork[GND_END_FRAME] = Animation_GetLastFrame(&gPhantomGanonAirDamageAnim);
+                            Animation_Change(&this->skelAnime, &gPhantomGanonAirDamageAnim, 0.5f, 0.0f,
+                                                this->fwork[GND_END_FRAME], ANIMMODE_ONCE_INTERP, 0.0f);
+                            this->work[GND_ACTION_STATE] = DEATH_LIMP;
+                        }
                     }
                     break;
                 case DEATH_LIMP:
@@ -991,26 +963,25 @@ void BossGanondrof_Death(BossGanondrof* this, PlayState* play) {
                     bodyDecayLevel = 1;
                     break;
             }
-            if (IS_RANDO || IS_BOSS_RUSH) {
-                break;
-            }
-            Math_ApproachS(&this->actor.shape.rot.y, this->work[GND_VARIANCE_TIMER] * -100, 5, 0xBB8);
-            Math_ApproachF(&this->cameraNextEye.z, this->targetPos.z + 60.0f, 0.02f, 0.5f);
-            Math_ApproachF(&this->actor.world.pos.y, GND_BOSSROOM_CENTER_Y + 133.0f, 0.05f, 100.0f);
-            this->actor.world.pos.y += Math_SinS(this->work[GND_VARIANCE_TIMER] * 1500);
-            this->cameraNextAt.x = this->targetPos.x;
-            this->cameraNextAt.y = this->targetPos.y - 10.0f;
-            this->cameraNextAt.z = this->targetPos.z;
-            if (this->timers[0] == 0) {
-                this->deathState = DEATH_WARP;
-                this->timers[0] = 350;
-                this->timers[1] = 50;
-                this->fwork[GND_CAMERA_ZOOM] = 300.0f;
-                this->cameraNextEye.y = GND_BOSSROOM_CENTER_Y + 233.0f;
-                player->actor.world.pos.x = GND_BOSSROOM_CENTER_X - 200.0f;
-                player->actor.world.pos.z = GND_BOSSROOM_CENTER_Z;
-                holdCamera = true;
-                bodyDecayLevel = 1;
+            if (GameInteractor_Should(GI_VB_PHANTOM_GANON_DEATH_SCENE, true, NULL)) {
+                Math_ApproachS(&this->actor.shape.rot.y, this->work[GND_VARIANCE_TIMER] * -100, 5, 0xBB8);
+                Math_ApproachF(&this->cameraNextEye.z, this->targetPos.z + 60.0f, 0.02f, 0.5f);
+                Math_ApproachF(&this->actor.world.pos.y, GND_BOSSROOM_CENTER_Y + 133.0f, 0.05f, 100.0f);
+                this->actor.world.pos.y += Math_SinS(this->work[GND_VARIANCE_TIMER] * 1500);
+                this->cameraNextAt.x = this->targetPos.x;
+                this->cameraNextAt.y = this->targetPos.y - 10.0f;
+                this->cameraNextAt.z = this->targetPos.z;
+                if (this->timers[0] == 0) {
+                    this->deathState = DEATH_WARP;
+                    this->timers[0] = 350;
+                    this->timers[1] = 50;
+                    this->fwork[GND_CAMERA_ZOOM] = 300.0f;
+                    this->cameraNextEye.y = GND_BOSSROOM_CENTER_Y + 233.0f;
+                    player->actor.world.pos.x = GND_BOSSROOM_CENTER_X - 200.0f;
+                    player->actor.world.pos.z = GND_BOSSROOM_CENTER_Z;
+                    holdCamera = true;
+                    bodyDecayLevel = 1;
+                }
             }
             break;
         case DEATH_WARP:
diff --git a/soh/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.h b/soh/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.h
index ff4a841d6..1e45ca766 100644
--- a/soh/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.h
+++ b/soh/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.h
@@ -61,6 +61,23 @@ typedef enum {
     /* 13 */ GND_FLOAT_COUNT = 13
 } BossGanondrofF32Var;
 
+// SOH [Enhancements] Relocated from z_boss_ganondrof.c to use in time saver.
+typedef enum {
+    /* 0 */ NOT_DEAD,
+    /* 1 */ DEATH_START,
+    /* 2 */ DEATH_THROES,
+    /* 3 */ DEATH_WARP,
+    /* 4 */ DEATH_SCREAM,
+    /* 5 */ DEATH_DISINTEGRATE,
+    /* 6 */ DEATH_FINISH
+} BossGanondrofDeathState;
+
+typedef enum {
+    /* 0 */ DEATH_SPASM,
+    /* 1 */ DEATH_LIMP,
+    /* 2 */ DEATH_HUNCHED
+} BossGanondrofDeathAction;
+
 typedef struct BossGanondrof {
     /* 0x0000 */ Actor actor;
     /* 0x014C */ SkelAnime skelAnime;

From 7da6a5b604f3fe2143fabdea9b5dcd154aaa5edd Mon Sep 17 00:00:00 2001
From: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Date: Tue, 30 Apr 2024 23:36:26 -0400
Subject: [PATCH 130/230] vb deku stick cheat (#115)

* vb deku stick cheat

* it's the 21st now

---------

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
---
 soh/soh/Enhancements/cheat_hook_handlers.cpp  | 56 +++++++++++++++++++
 soh/soh/Enhancements/cheat_hook_handlers.h    |  6 ++
 .../game-interactor/GameInteractor.h          |  7 +++
 soh/soh/Enhancements/mods.cpp                 |  2 +
 .../actors/ovl_player_actor/z_player.c        | 37 +++++-------
 5 files changed, 86 insertions(+), 22 deletions(-)
 create mode 100644 soh/soh/Enhancements/cheat_hook_handlers.cpp
 create mode 100644 soh/soh/Enhancements/cheat_hook_handlers.h

diff --git a/soh/soh/Enhancements/cheat_hook_handlers.cpp b/soh/soh/Enhancements/cheat_hook_handlers.cpp
new file mode 100644
index 000000000..cdc8333ce
--- /dev/null
+++ b/soh/soh/Enhancements/cheat_hook_handlers.cpp
@@ -0,0 +1,56 @@
+#include <libultraship/bridge.h>
+#include "soh/OTRGlobals.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/enhancementTypes.h"
+
+extern "C" {
+#include "macros.h"
+#include "variables.h"
+
+extern SaveContext gSaveContext;
+extern PlayState* gPlayState;
+}
+
+void CheatsOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void* opt) {
+    switch (id) {
+        case GI_VB_DEKU_STICK_BREAK: {
+            if (CVarGetInteger("gDekuStickCheat", DEKU_STICK_NORMAL) != DEKU_STICK_NORMAL) {
+                *should = false;
+            }
+            break;
+        }
+        case GI_VB_DEKU_STICK_BE_ON_FIRE: {
+            if (CVarGetInteger("gDekuStickCheat", DEKU_STICK_NORMAL) == DEKU_STICK_UNBREAKABLE_AND_ALWAYS_ON_FIRE) {
+                Player* player = GET_PLAYER(gPlayState);
+                player->unk_860 = 200;    // Keeps the stick's flame lit
+                player->unk_85C = 1.0f;   // Ensures the stick is the proper length
+                *should = true;
+            }
+            break;
+        }
+        case GI_VB_DEKU_STICK_BURN_OUT: {
+            if (CVarGetInteger("gDekuStickCheat", DEKU_STICK_NORMAL) != DEKU_STICK_NORMAL) {
+                *should = false;
+            }
+            break;
+        }
+        case GI_VB_DEKU_STICK_BURN_DOWN: {
+            if (CVarGetInteger("gDekuStickCheat", DEKU_STICK_NORMAL) != DEKU_STICK_NORMAL) {
+                *should = false;
+            }
+            break;
+        }
+    }
+}
+
+static uint32_t onVanillaBehaviorHook = 0;
+void CheatsRegisterHooks() {
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnLoadGame>([](int32_t fileNum) mutable {
+
+        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnVanillaBehavior>(onVanillaBehaviorHook);
+        onVanillaBehaviorHook = 0;
+        onVanillaBehaviorHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnVanillaBehavior>(CheatsOnVanillaBehaviorHandler);
+
+    });
+}
diff --git a/soh/soh/Enhancements/cheat_hook_handlers.h b/soh/soh/Enhancements/cheat_hook_handlers.h
new file mode 100644
index 000000000..88a79f285
--- /dev/null
+++ b/soh/soh/Enhancements/cheat_hook_handlers.h
@@ -0,0 +1,6 @@
+#ifndef CHEAT_HOOK_HANDLERS_H
+#define CHEAT_HOOK_HANDLERS_H
+
+void CheatsRegisterHooks();
+
+#endif // CHEAT_HOOK_HANDLERS_H
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h
index 716d20b08..17b6198b3 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h
@@ -377,6 +377,13 @@ typedef enum {
     // Vanilla condition: false
     GI_VB_FIX_SAW_SOFTLOCK,
 
+    /*** Cheats? ***/
+    GI_VB_DEKU_STICK_BE_ON_FIRE,
+    GI_VB_DEKU_STICK_BREAK,
+    GI_VB_DEKU_STICK_BURN_DOWN,
+    GI_VB_DEKU_STICK_BURN_OUT,
+    GI_VB_DEKU_UPDATE_BURNING_DEKU_STICK,
+
     /*** Quick Boss Deaths ***/
     // Vanilla condition: true
     GI_VB_PHANTOM_GANON_DEATH_SCENE,
diff --git a/soh/soh/Enhancements/mods.cpp b/soh/soh/Enhancements/mods.cpp
index 580c29b3c..c0425f148 100644
--- a/soh/soh/Enhancements/mods.cpp
+++ b/soh/soh/Enhancements/mods.cpp
@@ -11,6 +11,7 @@
 #include <soh/Enhancements/item-tables/ItemTableManager.h>
 #include "soh/Enhancements/nametag.h"
 #include "soh/Enhancements/timesaver_hook_handlers.h"
+#include "soh/Enhancements/cheat_hook_handlers.h"
 #include "soh/Enhancements/randomizer/hook_handlers.h"
 #include "objects/object_gi_compass/object_gi_compass.h"
 
@@ -1715,6 +1716,7 @@ void RegisterRandomizerCompasses() {
 void InitMods() {
     RandomizerRegisterHooks();
     TimeSaverRegisterHooks();
+    CheatsRegisterHooks();
     RegisterTTS();
     RegisterInfiniteMoney();
     RegisterInfiniteHealth();
diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c
index 2b994f56f..43a34c778 100644
--- a/soh/src/overlays/actors/ovl_player_actor/z_player.c
+++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c
@@ -8515,15 +8515,14 @@ void func_80842A28(PlayState* play, Player* this) {
 }
 
 void func_80842A88(PlayState* play, Player* this) {
-    if (CVarGetInteger("gDekuStickCheat", DEKU_STICK_NORMAL) == DEKU_STICK_NORMAL) {
-        Inventory_ChangeAmmo(ITEM_STICK, -1);
-        Player_UseItem(play, this, ITEM_NONE);
-    }
+    Inventory_ChangeAmmo(ITEM_STICK, -1);
+    Player_UseItem(play, this, ITEM_NONE);
 }
 
 s32 func_80842AC4(PlayState* play, Player* this) {
     if ((this->heldItemAction == PLAYER_IA_DEKU_STICK) && (this->unk_85C > 0.5f)) {
-        if (AMMO(ITEM_STICK) != 0 && CVarGetInteger("gDekuStickCheat", DEKU_STICK_NORMAL) == DEKU_STICK_NORMAL) {
+
+        if (GameInteractor_Should(GI_VB_DEKU_STICK_BREAK, AMMO(ITEM_STICK) != 0, NULL)) {
             EffectSsStick_Spawn(play, &this->bodyPartsPos[PLAYER_BODYPART_R_HAND],
                                 this->actor.shape.rot.y + 0x8000);
             this->unk_85C = 0.5f;
@@ -10942,37 +10941,30 @@ static Vec3f D_808547B0 = { 0.0f, 0.5f, 0.0f };
 static Color_RGBA8 D_808547BC = { 255, 255, 100, 255 };
 static Color_RGBA8 D_808547C0 = { 255, 50, 0, 0 };
 
-void func_80848A04(PlayState* play, Player* this) {
+void Player_UpdateBurningDekuStick(PlayState* play, Player* this) {
     f32 temp;
 
-    if (CVarGetInteger("gDekuStickCheat", DEKU_STICK_NORMAL) == DEKU_STICK_UNBREAKABLE_AND_ALWAYS_ON_FIRE) {
-        f32 temp2 = 1.0f;       // Secondary temporary variable to use with the alleged draw flame function
-        this->unk_860 = 200;    // Keeps the stick's flame lit
-        this->unk_85C = 1.0f;   // Ensures the stick is the proper length
-        func_8002836C(play, &this->meleeWeaponInfo[0].tip, &D_808547A4, &D_808547B0, &D_808547BC, &D_808547C0, temp2 * 200.0f,
-                      0, 8);      // I believe this draws the flame effect
-    }
-
-    if (this->unk_85C == 0.0f && CVarGetInteger("gDekuStickCheat", DEKU_STICK_NORMAL) == DEKU_STICK_NORMAL) {
-        Player_UseItem(play, this, 0xFF);
+    if (GameInteractor_Should(GI_VB_DEKU_STICK_BURN_OUT, this->unk_85C == 0.0f, NULL)) {
+        Player_UseItem(play, this, ITEM_NONE);
         return;
     }
 
     temp = 1.0f;
-    if (DECR(this->unk_860) == 0 && CVarGetInteger("gDekuStickCheat", DEKU_STICK_NORMAL) == DEKU_STICK_NORMAL) {
+    uint8_t vanillaShouldBurnOutCondition = DECR(this->unk_860) == 0;
+    if (GameInteractor_Should(GI_VB_DEKU_STICK_BURN_OUT, vanillaShouldBurnOutCondition, NULL)) {
         Inventory_ChangeAmmo(ITEM_STICK, -1);
         this->unk_860 = 1;
         temp = 0.0f;
         this->unk_85C = temp;
     } else if (this->unk_860 > 200) {
         temp = (210 - this->unk_860) / 10.0f;
-    } else if (this->unk_860 < 20 && CVarGetInteger("gDekuStickCheat", DEKU_STICK_NORMAL) == DEKU_STICK_NORMAL) {
+    } else if (GameInteractor_Should(GI_VB_DEKU_STICK_BURN_DOWN, this->unk_860 < 20, NULL)) {
         temp = this->unk_860 / 20.0f;
         this->unk_85C = temp;
     }
 
-    func_8002836C(play, &this->meleeWeaponInfo[0].tip, &D_808547A4, &D_808547B0, &D_808547BC, &D_808547C0, temp * 200.0f,
-                  0, 8);
+    func_8002836C(play, &this->meleeWeaponInfo[0].tip, &D_808547A4, &D_808547B0, &D_808547BC, &D_808547C0,
+                  temp * 200.0f, 0, 8);
 }
 
 void Player_UpdateBodyShock(PlayState* play, Player* this) {
@@ -11267,8 +11259,9 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) {
     func_808473D4(play, this);
     func_80836BEC(this, play);
 
-    if ((this->heldItemAction == PLAYER_IA_DEKU_STICK) && ((this->unk_860 != 0) || CVarGetInteger("gDekuStickCheat", DEKU_STICK_NORMAL) == DEKU_STICK_UNBREAKABLE_AND_ALWAYS_ON_FIRE)) {
-        func_80848A04(play, this);
+    if (this->heldItemAction == PLAYER_IA_DEKU_STICK &&
+        GameInteractor_Should(GI_VB_DEKU_STICK_BE_ON_FIRE, this->unk_860 != 0, NULL)) {
+        Player_UpdateBurningDekuStick(play, this);
     } else if ((this->heldItemAction == PLAYER_IA_FISHING_POLE) && (this->unk_860 < 0)) {
         this->unk_860++;
     }

From de715da1842ac3df36badacc9b66b50f7e850565 Mon Sep 17 00:00:00 2001
From: Archez <Archez@users.noreply.github.com>
Date: Sat, 4 May 2024 17:49:36 -0400
Subject: [PATCH 131/230] explicitly include unordered_map header (#122)

---
 soh/soh/Enhancements/game-interactor/GameInteractor.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h
index 17b6198b3..e0b1c1ce1 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h
@@ -420,6 +420,7 @@ void GameInteractor_SetTriforceHuntCreditsWarpActive(uint8_t state);
 
 #ifdef __cplusplus
 #include <thread>
+#include <unordered_map>
 #include <vector>
 #include <functional>
 #include <string>

From e71839ed8f90a902679f2533fde78d44e3000e6a Mon Sep 17 00:00:00 2001
From: Christopher Leggett <chris@leggett.dev>
Date: Sat, 4 May 2024 17:50:19 -0400
Subject: [PATCH 132/230] Conversion of Nabooru Quick Death to VB hook (#120)

* Nabooru quick death conversion

* Fix brackets, not sure exactly how this was working before.
---
 .../game-interactor/GameInteractor.h          |  1 +
 .../Enhancements/timesaver_hook_handlers.cpp  | 24 +++++++++++++++++++
 soh/src/overlays/actors/ovl_En_Ik/z_en_ik.c   | 20 +---------------
 3 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h
index e0b1c1ce1..84126099f 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h
@@ -387,6 +387,7 @@ typedef enum {
     /*** Quick Boss Deaths ***/
     // Vanilla condition: true
     GI_VB_PHANTOM_GANON_DEATH_SCENE,
+    GI_VB_NABOORU_KNUCKLE_DEATH_SCENE,
 } GIVanillaBehavior;
 
 #ifdef __cplusplus
diff --git a/soh/soh/Enhancements/timesaver_hook_handlers.cpp b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
index 52e14ab8c..642eae7cc 100644
--- a/soh/soh/Enhancements/timesaver_hook_handlers.cpp
+++ b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
@@ -25,6 +25,7 @@ extern "C" {
 #include "src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h"
 #include "src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h"
 #include <overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.h>
+#include <overlays/actors/ovl_En_Ik/z_en_ik.h>
 #include <objects/object_gnd/object_gnd.h>
 extern SaveContext gSaveContext;
 extern PlayState* gPlayState;
@@ -746,6 +747,29 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             }
             break;
         }
+        case GI_VB_NABOORU_KNUCKLE_DEATH_SCENE: {
+            EnIk* ik = static_cast<EnIk*>(opt);
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.QuickBossDeaths", IS_RANDO)) {
+                // Because no CS in rando, we hide the death of the knuckle by spawning flames and kill the actor
+                if ((ik->actor.colChkInfo.health <= 10)) {
+                    s32 i;
+                    Vec3f pos;
+                    Vec3f sp7C = { 0.0f, 0.5f, 0.0f };
+                    int flameAmount = 100;
+
+                    for (i = flameAmount; i >= 0; i--) {
+                        pos.x = ik->actor.world.pos.x + Rand_CenteredFloat(120.0f);
+                        pos.z = ik->actor.world.pos.z + Rand_CenteredFloat(120.0f);
+                        pos.y = ik->actor.world.pos.y + 20.0f + Rand_CenteredFloat(120.0f);
+                        EffectSsDeadDb_Spawn(gPlayState, &pos, &sp7C, &sp7C, 100, 0, 255, 255, 255, 255, 0, 0, 255, 1, 9,
+                                             true);
+                    }
+                    Actor_Kill(&ik->actor);
+                }
+                *should = false;
+            }
+            break;
+        }
     }
 }
 
diff --git a/soh/src/overlays/actors/ovl_En_Ik/z_en_ik.c b/soh/src/overlays/actors/ovl_En_Ik/z_en_ik.c
index aaf0e0342..5f1634237 100644
--- a/soh/src/overlays/actors/ovl_En_Ik/z_en_ik.c
+++ b/soh/src/overlays/actors/ovl_En_Ik/z_en_ik.c
@@ -1439,28 +1439,10 @@ void func_80A781CC(Actor* thisx, PlayState* play) {
     if (!Play_InCsMode(play)) {
         this->actor.update = EnIk_Update;
         this->actor.draw = EnIk_Draw;
-        // Don't initiate nabooru defeat CS in rando
-        if (!(IS_RANDO)) {
+        if (GameInteractor_Should(GI_VB_NABOORU_KNUCKLE_DEATH_SCENE, true, this)) {
             Cutscene_SetSegment(play, gSpiritBossNabooruKnuckleDefeatCs);
             gSaveContext.cutsceneTrigger = 1;
             Actor_SetScale(&this->actor, 0.01f);
-        } else {
-        // Because no CS in rando, we hide the death of the knuckle by spawning flames and kill the actor
-            if ((this->actor.colChkInfo.health <= 10)) {
-                s32 i;
-                Vec3f pos;
-                Vec3f sp7C = { 0.0f, 0.5f, 0.0f };
-                int flameAmount = 100;
-
-                for (i = flameAmount; i >= 0; i--) {
-                    pos.x = this->actor.world.pos.x + Rand_CenteredFloat(120.0f);
-                    pos.z = this->actor.world.pos.z + Rand_CenteredFloat(120.0f);
-                    pos.y = this->actor.world.pos.y + 20.0f + Rand_CenteredFloat(120.0f);
-                    EffectSsDeadDb_Spawn(play, &pos, &sp7C, &sp7C, 100, 0, 255, 255, 255, 255, 0, 0, 255, 1, 9,
-                                            true);
-                }
-                Actor_Kill(&this->actor);
-            }
         }
         Flags_SetEventChkInf(EVENTCHKINF_FINISHED_NABOORU_BATTLE);
         func_80A7735C(this, play);

From 0c69ff17c2525607cc28acc9d2097879218b3fae Mon Sep 17 00:00:00 2001
From: Garrett Cox <garrettjcox@gmail.com>
Date: Sun, 5 May 2024 14:46:23 -0500
Subject: [PATCH 133/230] Fix two minor issues from merge

---
 soh/soh/Enhancements/randomizer/location_list.cpp |  1 +
 soh/soh/Enhancements/randomizer/randomizer.cpp    | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/location_list.cpp b/soh/soh/Enhancements/randomizer/location_list.cpp
index 97d432de3..92a91f32a 100644
--- a/soh/soh/Enhancements/randomizer/location_list.cpp
+++ b/soh/soh/Enhancements/randomizer/location_list.cpp
@@ -1,4 +1,5 @@
 #include "static_data.h"
+#include "z64save.h"
 
 #define TWO_ACTOR_PARAMS(a, b) (abs(a) << 16) | abs(b)
 
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index ea0b30bfb..de0295b30 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -329,13 +329,13 @@ void Randomizer::LoadMerchantMessages() {
                       "Je te vends mon dernier %rHaricot&magique%w pour %r99 Rubis%w.\x1B&%gAcheter&Ne pas acheter%w"));
 }
 
-std::map<s32, Rando::TrialKey> trialFlagToTrialKey = {
-    { EVENTCHKINF_COMPLETED_LIGHT_TRIAL, Rando::TrialKey::LIGHT_TRIAL, },
-    { EVENTCHKINF_COMPLETED_FOREST_TRIAL, Rando::TrialKey::FOREST_TRIAL, },
-    { EVENTCHKINF_COMPLETED_FIRE_TRIAL, Rando::TrialKey::FIRE_TRIAL, },
-    { EVENTCHKINF_COMPLETED_WATER_TRIAL, Rando::TrialKey::WATER_TRIAL, },
-    { EVENTCHKINF_COMPLETED_SPIRIT_TRIAL, Rando::TrialKey::SPIRIT_TRIAL, },
-    { EVENTCHKINF_COMPLETED_SHADOW_TRIAL, Rando::TrialKey::SHADOW_TRIAL, }
+std::map<s32, TrialKey> trialFlagToTrialKey = {
+    { EVENTCHKINF_COMPLETED_LIGHT_TRIAL, TK_LIGHT_TRIAL, },
+    { EVENTCHKINF_COMPLETED_FOREST_TRIAL, TK_FOREST_TRIAL, },
+    { EVENTCHKINF_COMPLETED_FIRE_TRIAL, TK_FIRE_TRIAL, },
+    { EVENTCHKINF_COMPLETED_WATER_TRIAL, TK_WATER_TRIAL, },
+    { EVENTCHKINF_COMPLETED_SPIRIT_TRIAL, TK_SPIRIT_TRIAL, },
+    { EVENTCHKINF_COMPLETED_SHADOW_TRIAL, TK_SHADOW_TRIAL, }
 };
 
 bool Randomizer::IsTrialRequired(s32 trialFlag) {

From b4a30f708f9d3e0949214573ded543a0f4ef12a6 Mon Sep 17 00:00:00 2001
From: Garrett Cox <garrettjcox@gmail.com>
Date: Sun, 5 May 2024 16:29:02 -0500
Subject: [PATCH 134/230] Change GI_VB_ to VB_ (#4116)

---
 soh/soh/Enhancements/cheat_hook_handlers.cpp  |   8 +-
 .../game-interactor/GameInteractor.h          | 302 +++++++++---------
 .../Enhancements/randomizer/hook_handlers.cpp | 188 +++++------
 .../Enhancements/timesaver_hook_handlers.cpp  | 136 ++++----
 soh/src/code/z_demo.c                         |  22 +-
 soh/src/code/z_en_item00.c                    |   6 +-
 soh/src/code/z_message_PAL.c                  |  24 +-
 soh/src/code/z_onepointdemo.c                 |   4 +-
 .../ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c     |   4 +-
 .../actors/ovl_Bg_Breakwall/z_bg_breakwall.c  |   2 +-
 .../ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c       |   2 +-
 .../ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c     |   6 +-
 .../ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c       |   4 +-
 .../z_bg_spot02_objects.c                     |   2 +-
 .../ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c     |   4 +-
 .../actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c    |   4 +-
 .../actors/ovl_Bg_Treemouth/z_bg_treemouth.c  |   2 +-
 .../ovl_Boss_Ganondrof/z_boss_ganondrof.c     |   4 +-
 .../overlays/actors/ovl_Demo_Du/z_demo_du.c   |   4 +-
 .../overlays/actors/ovl_Demo_Im/z_demo_im.c   |   8 +-
 .../overlays/actors/ovl_Demo_Sa/z_demo_sa.c   |   4 +-
 .../actors/ovl_Door_Shutter/z_door_shutter.c  |   4 +-
 .../actors/ovl_Door_Warp1/z_door_warp1.c      |  32 +-
 .../overlays/actors/ovl_Elf_Msg/z_elf_msg.c   |   4 +-
 soh/src/overlays/actors/ovl_En_Ani/z_en_ani.c |   6 +-
 .../ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c   |   4 +-
 soh/src/overlays/actors/ovl_En_Box/z_en_box.c |   2 +-
 soh/src/overlays/actors/ovl_En_Cow/z_en_cow.c |   4 +-
 .../ovl_En_Diving_Game/z_en_diving_game.c     |   8 +-
 soh/src/overlays/actors/ovl_En_Dns/z_en_dns.c |   4 +-
 .../actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c  |   2 +-
 soh/src/overlays/actors/ovl_En_Ds/z_en_ds.c   |  18 +-
 soh/src/overlays/actors/ovl_En_Du/z_en_du.c   |   8 +-
 .../actors/ovl_En_Ex_Item/z_en_ex_item.c      |  10 +-
 soh/src/overlays/actors/ovl_En_Fr/z_en_fr.c   |  10 +-
 soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c |  14 +-
 soh/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c |  12 +-
 soh/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c |   4 +-
 soh/src/overlays/actors/ovl_En_Gm/z_en_gm.c   |   6 +-
 soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c |  62 ++--
 soh/src/overlays/actors/ovl_En_Hs/z_en_hs.c   |   8 +-
 soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c   |   2 +-
 soh/src/overlays/actors/ovl_En_Ik/z_en_ik.c   |   2 +-
 soh/src/overlays/actors/ovl_En_Js/z_en_js.c   |   2 +-
 soh/src/overlays/actors/ovl_En_Ko/z_en_ko.c   |   6 +-
 soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c   |  18 +-
 soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c |  18 +-
 soh/src/overlays/actors/ovl_En_Md/z_en_md.c   |   4 +-
 soh/src/overlays/actors/ovl_En_Mk/z_en_mk.c   |  18 +-
 soh/src/overlays/actors/ovl_En_Ms/z_en_ms.c   |   4 +-
 soh/src/overlays/actors/ovl_En_Nb/z_en_nb.c   |   4 +-
 .../actors/ovl_En_Niw_Lady/z_en_niw_lady.c    |  10 +-
 .../ovl_En_Okarina_Tag/z_en_okarina_tag.c     |  10 +-
 soh/src/overlays/actors/ovl_En_Owl/z_en_owl.c |   2 +-
 soh/src/overlays/actors/ovl_En_Rl/z_en_rl.c   |   2 +-
 soh/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c |   4 +-
 soh/src/overlays/actors/ovl_En_Sa/z_en_sa.c   |   8 +-
 .../actors/ovl_En_Shopnuts/z_en_shopnuts.c    |   2 +-
 soh/src/overlays/actors/ovl_En_Si/z_en_si.c   |   6 +-
 soh/src/overlays/actors/ovl_En_Skj/z_en_skj.c |  10 +-
 soh/src/overlays/actors/ovl_En_Sth/z_en_sth.c |   6 +-
 .../ovl_En_Syateki_Man/z_en_syateki_man.c     |   8 +-
 soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c   |   8 +-
 soh/src/overlays/actors/ovl_En_Tk/z_en_tk.c   |   8 +-
 .../overlays/actors/ovl_En_Toryo/z_en_toryo.c |   4 +-
 .../ovl_En_Wonder_Talk2/z_en_wonder_talk2.c   |   4 +-
 soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c   |  30 +-
 soh/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c |   2 +-
 soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c |   4 +-
 .../actors/ovl_Item_Ocarina/z_item_ocarina.c  |   4 +-
 .../actors/ovl_Obj_Dekujr/z_obj_dekujr.c      |   2 +-
 .../actors/ovl_Obj_Switch/z_obj_switch.c      |   4 +-
 .../actors/ovl_player_actor/z_player.c        |  16 +-
 73 files changed, 597 insertions(+), 597 deletions(-)

diff --git a/soh/soh/Enhancements/cheat_hook_handlers.cpp b/soh/soh/Enhancements/cheat_hook_handlers.cpp
index cdc8333ce..c8565e8ab 100644
--- a/soh/soh/Enhancements/cheat_hook_handlers.cpp
+++ b/soh/soh/Enhancements/cheat_hook_handlers.cpp
@@ -14,13 +14,13 @@ extern PlayState* gPlayState;
 
 void CheatsOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void* opt) {
     switch (id) {
-        case GI_VB_DEKU_STICK_BREAK: {
+        case VB_DEKU_STICK_BREAK: {
             if (CVarGetInteger("gDekuStickCheat", DEKU_STICK_NORMAL) != DEKU_STICK_NORMAL) {
                 *should = false;
             }
             break;
         }
-        case GI_VB_DEKU_STICK_BE_ON_FIRE: {
+        case VB_DEKU_STICK_BE_ON_FIRE: {
             if (CVarGetInteger("gDekuStickCheat", DEKU_STICK_NORMAL) == DEKU_STICK_UNBREAKABLE_AND_ALWAYS_ON_FIRE) {
                 Player* player = GET_PLAYER(gPlayState);
                 player->unk_860 = 200;    // Keeps the stick's flame lit
@@ -29,13 +29,13 @@ void CheatsOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void* op
             }
             break;
         }
-        case GI_VB_DEKU_STICK_BURN_OUT: {
+        case VB_DEKU_STICK_BURN_OUT: {
             if (CVarGetInteger("gDekuStickCheat", DEKU_STICK_NORMAL) != DEKU_STICK_NORMAL) {
                 *should = false;
             }
             break;
         }
-        case GI_VB_DEKU_STICK_BURN_DOWN: {
+        case VB_DEKU_STICK_BURN_DOWN: {
             if (CVarGetInteger("gDekuStickCheat", DEKU_STICK_NORMAL) != DEKU_STICK_NORMAL) {
                 *should = false;
             }
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h
index 84126099f..3a3a30d18 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h
@@ -70,32 +70,32 @@ typedef enum {
 
 typedef enum {
     // Vanilla condition: gSaveContext.showTitleCard
-    GI_VB_SHOW_TITLE_CARD,
+    VB_SHOW_TITLE_CARD,
     // Opt: *EnWonderTalk2
-    GI_VB_WONDER_TALK,
+    VB_WONDER_TALK,
     // Opt: *ElfMsg
-    GI_VB_NAVI_TALK,
+    VB_NAVI_TALK,
     // Vanilla condition: INFTABLE_GREETED_BY_SARIA
-    GI_VB_NOT_BE_GREETED_BY_SARIA,
+    VB_NOT_BE_GREETED_BY_SARIA,
     // Opt: *EnMd
     // Vanilla condition: EnMd->interactInfo.talkState == NPC_TALK_STATE_ACTION
-    GI_VB_MOVE_MIDO_IN_KOKIRI_FOREST,
+    VB_MOVE_MIDO_IN_KOKIRI_FOREST,
     // Opt: *EnMd
     // Vanilla condition: CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD)
-    GI_VB_MIDO_CONSIDER_DEKU_TREE_DEAD,
+    VB_MIDO_CONSIDER_DEKU_TREE_DEAD,
     // Opt: *ObjDekujr
     // Vanilla condition: CHECK_QUEST_ITEM(QUEST_MEDALLION_FOREST)
-    GI_VB_DEKU_JR_CONSIDER_FOREST_TEMPLE_FINISHED,
+    VB_DEKU_JR_CONSIDER_FOREST_TEMPLE_FINISHED,
     // Opt: *EnKo
     // Vanilla condition: CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD)
-    GI_VB_OPEN_KOKIRI_FOREST,
+    VB_OPEN_KOKIRI_FOREST,
     // Opt: *EnOwl
     // Vanilla condition: EnOwl->actor.xzDistToPlayer < targetDist
-    GI_VB_OWL_INTERACTION,
+    VB_OWL_INTERACTION,
     // Vanilla condition: EVENTCHKINF_TALON_RETURNED_FROM_CASTLE
-    GI_VB_MALON_RETURN_FROM_CASTLE,
+    VB_MALON_RETURN_FROM_CASTLE,
     // Vanilla condition: CUR_UPG_VALUE(UPG_STRENGTH) <= 0
-    GI_VB_BE_ELIGIBLE_FOR_DARUNIAS_JOY_REWARD,
+    VB_BE_ELIGIBLE_FOR_DARUNIAS_JOY_REWARD,
     /* Vanilla condition:
     ```
         LINK_IS_ADULT &&
@@ -105,18 +105,18 @@ typedef enum {
         !Flags_GetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS);
     ```
     */
-    GI_VB_BE_ELIGIBLE_FOR_LIGHT_ARROWS,
+    VB_BE_ELIGIBLE_FOR_LIGHT_ARROWS,
     // Vanilla condition: !CHECK_QUEST_ITEM(QUEST_SONG_SARIA)
-    GI_VB_BE_ELIGIBLE_FOR_SARIAS_SONG,
+    VB_BE_ELIGIBLE_FOR_SARIAS_SONG,
     // Vanilla condition: CHECK_QUEST_ITEM(QUEST_SONG_EPONA)
-    GI_VB_MALON_ALREADY_TAUGHT_EPONAS_SONG,
+    VB_MALON_ALREADY_TAUGHT_EPONAS_SONG,
     // Vanilla condition: CHECK_OWNED_EQUIP(EQUIP_TYPE_BOOTS, EQUIP_INV_BOOTS_IRON) && !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_SERENADE_OF_WATER)
-    GI_VB_BE_ELIGIBLE_FOR_SERENADE_OF_WATER,
+    VB_BE_ELIGIBLE_FOR_SERENADE_OF_WATER,
     // Vanilla condition: (!CHECK_OWNED_EQUIP(EQUIP_TYPE_BOOTS, EQUIP_INV_BOOTS_IRON) && !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_SERENADE_OF_WATER)) && LINK_IS_ADULT
-    GI_VB_SHIEK_PREPARE_TO_GIVE_SERENADE_OF_WATER,
+    VB_SHIEK_PREPARE_TO_GIVE_SERENADE_OF_WATER,
     // Vanilla condition: !EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT and EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP
-    GI_VB_BE_ELIGIBLE_FOR_PRELUDE_OF_LIGHT,
-    GI_VB_BE_ELIGIBLE_FOR_RAINBOW_BRIDGE,
+    VB_BE_ELIGIBLE_FOR_PRELUDE_OF_LIGHT,
+    VB_BE_ELIGIBLE_FOR_RAINBOW_BRIDGE,
     /* Vanilla Condition: 
     ```
         LINK_IS_ADULT &&
@@ -127,30 +127,30 @@ typedef enum {
         !Flags_GetEventChkInf(EVENTCHKINF_BONGO_BONGO_ESCAPED_FROM_WELL);
     ```
     */
-    GI_VB_BE_ELIGIBLE_FOR_NOCTURNE_OF_SHADOW,
+    VB_BE_ELIGIBLE_FOR_NOCTURNE_OF_SHADOW,
     // Opt: *EnGo2
     // Vanilla condition: CUR_CAPACITY(UPG_BOMB_BAG) >= 20 && this->waypoint > 7 && this->waypoint < 12
-    GI_VB_BE_ELIGIBLE_FOR_CHILD_ROLLING_GORON_REWARD,
+    VB_BE_ELIGIBLE_FOR_CHILD_ROLLING_GORON_REWARD,
     // Vanilla condition: !CHECK_OWNED_EQUIP_ALT(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_BIGGORON)
-    GI_VB_BE_ELIGIBLE_FOR_GIANTS_KNIFE_PURCHASE,
+    VB_BE_ELIGIBLE_FOR_GIANTS_KNIFE_PURCHASE,
     // Opt: *EnMs
     // Vanilla condition: gSaveContext.rupees >= sPrices[BEANS_BOUGHT]
-    GI_VB_BE_ELIGIBLE_FOR_MAGIC_BEANS_PURCHASE,
+    VB_BE_ELIGIBLE_FOR_MAGIC_BEANS_PURCHASE,
     // Opt: *EnItem00
     // Vanilla condition: Flags_GetCollectible(play, this->collectibleFlag)
-    GI_VB_ITEM00_DESPAWN,
+    VB_ITEM00_DESPAWN,
     // Opt: *EnTk
     // Vanilla condition: gSaveContext.dayTime <= 0xC000 || gSaveContext.dayTime >= 0xE000 || LINK_IS_ADULT || play->sceneNum != SCENE_GRAVEYARD
-    GI_VB_DAMPE_IN_GRAVEYARD_DESPAWN,
+    VB_DAMPE_IN_GRAVEYARD_DESPAWN,
     // Opt: *EnTk
     // Vanilla condition: this->validDigHere == 1
-    GI_VB_BE_VALID_GRAVEDIGGING_SPOT,
+    VB_BE_VALID_GRAVEDIGGING_SPOT,
     // Opt: *EnTk
     // Vanilla condition: this->currentReward == 3
-    GI_VB_BE_DAMPE_GRAVEDIGGING_GRAND_PRIZE,
+    VB_BE_DAMPE_GRAVEDIGGING_GRAND_PRIZE,
     // Opt: *EnTk
     // Vanilla condition: !Flags_GetItemGetInf(ITEMGETINF_1C)
-    GI_VB_DAMPE_GRAVEDIGGING_GRAND_PRIZE_BE_HEART_PIECE,
+    VB_DAMPE_GRAVEDIGGING_GRAND_PRIZE_BE_HEART_PIECE,
     // Opt: *EnShopnuts
     /* Vanilla Condition:
     ```
@@ -159,235 +159,235 @@ typedef enum {
         ((this->actor.params == 0x000A) && (Flags_GetInfTable(INFTABLE_193)))
     ```
     */
-    GI_VB_BUSINESS_SCRUB_DESPAWN,
+    VB_BUSINESS_SCRUB_DESPAWN,
     // Opt: *EnCow
     // Vanilla condition: play->sceneNum == SCENE_LINKS_HOUSE && (!LINK_IS_ADULT || !Flags_GetEventChkInf(EVENTCHKINF_WON_COW_IN_MALONS_RACE))
-    GI_VB_DESPAWN_HORSE_RACE_COW,
+    VB_DESPAWN_HORSE_RACE_COW,
     // Opt: *EnHs
     // Vanilla condition: Flags_GetItemGetInf(ITEMGETINF_30)
-    GI_VB_DESPAWN_GROG,
+    VB_DESPAWN_GROG,
     // Opt: *EnKo
     // Vanilla condition: (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_ODD_POTION) ? true : false;
-    GI_VB_SPAWN_LW_FADO,
+    VB_SPAWN_LW_FADO,
     // Opt: *EnMk
-    GI_VB_PLAY_EYEDROP_CREATION_ANIM,
+    VB_PLAY_EYEDROP_CREATION_ANIM,
     // Opt: *EnDs
-    GI_VB_PLAY_ODD_POTION_ANIM,
+    VB_PLAY_ODD_POTION_ANIM,
     // Opt: *EnMk
     // Vanilla condition: INV_CONTENT(ITEM_ODD_MUSHROOM) == ITEM_EYEDROPS
-    GI_VB_USE_EYEDROP_DIALOGUE,
+    VB_USE_EYEDROP_DIALOGUE,
     // Opt: *EnMk
     // Vanilla condition: Flags_GetItemGetInf(ITEMGETINF_30)
-    GI_VB_OFFER_BLUE_POTION,
+    VB_OFFER_BLUE_POTION,
     // Vanilla condition: Inventory_HasEmptyBottle() == 0
-    GI_VB_NEED_BOTTLE_FOR_GRANNYS_ITEM,
+    VB_NEED_BOTTLE_FOR_GRANNYS_ITEM,
     // Opt: *EnNiwLady
-    GI_VB_SET_CUCCO_COUNT,
+    VB_SET_CUCCO_COUNT,
     // Opt: *EnKz
     // Vanilla condition: CHECK_QUEST_ITEM(QUEST_ZORA_SAPPHIRE)
-    GI_VB_KING_ZORA_THANK_CHILD,
+    VB_KING_ZORA_THANK_CHILD,
     // Opt: *EnKz
     // Vanilla condition: this->actor.textId == 0x401A
-    GI_VB_BE_ABLE_TO_EXCHANGE_RUTOS_LETTER,
+    VB_BE_ABLE_TO_EXCHANGE_RUTOS_LETTER,
     // Opt: *EnKz
     // Vanilla condition: Flags_GetEventChkInf(EVENTCHKINF_KING_ZORA_MOVED)
-    GI_VB_KING_ZORA_BE_MOVED,
+    VB_KING_ZORA_BE_MOVED,
     // Vanilla condition: gSaveState.bgsFlag
-    GI_VB_BIGGORON_CONSIDER_TRADE_COMPLETE,
+    VB_BIGGORON_CONSIDER_TRADE_COMPLETE,
     // Vanilla condition: gSaveState.bgsFlag
-    GI_VB_BIGGORON_CONSIDER_SWORD_COLLECTED,
+    VB_BIGGORON_CONSIDER_SWORD_COLLECTED,
     // Vanilla condition: Environment_GetBgsDayCount() >= 3
-    GI_VB_BIGGORON_CONSIDER_SWORD_FORGED,
+    VB_BIGGORON_CONSIDER_SWORD_FORGED,
     // Vanilla condition: CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)
-    GI_VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED,
+    VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED,
     // Vanilla condition: CHECK_QUEST_ITEM(QUEST_GORON_RUBY)
-    GI_VB_GORONS_CONSIDER_DODONGOS_CAVERN_FINISHED,
+    VB_GORONS_CONSIDER_DODONGOS_CAVERN_FINISHED,
     // Opt: *uint16_t
     // Vanilla condition: false
-    GI_VB_OVERRIDE_LINK_THE_GORON_DIALOGUE,
+    VB_OVERRIDE_LINK_THE_GORON_DIALOGUE,
     // Vanilla condition: CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON)
-    GI_VB_GORONS_CONSIDER_TUNIC_COLLECTED,
+    VB_GORONS_CONSIDER_TUNIC_COLLECTED,
     // Opt: *EnSyatekiMan
     // Vanilla condition: (this->getItemId == GI_QUIVER_40) || (this->getItemId == GI_QUIVER_50)
-    GI_VB_BE_ELIGIBLE_FOR_ADULT_SHOOTING_GAME_REWARD,
+    VB_BE_ELIGIBLE_FOR_ADULT_SHOOTING_GAME_REWARD,
     // Opt: *EnOkarinaTag
     // Vanilla condition: !Flags_GetEventChkInf(EVENTCHKINF_OPENED_THE_DOOR_OF_TIME)
-    GI_VB_BE_ELIGIBLE_TO_OPEN_DOT,
+    VB_BE_ELIGIBLE_TO_OPEN_DOT,
     // Opt: *BgDyYoseizo
     // Vanilla condition: see soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
-    GI_VB_BE_ELIGIBLE_FOR_GREAT_FAIRY_REWARD,
+    VB_BE_ELIGIBLE_FOR_GREAT_FAIRY_REWARD,
     // Vanilla condition: see CheckCarpentersFreed in z_en_ge1 and z_en_ge2
-    GI_VB_GERUDOS_BE_FRIENDLY,
+    VB_GERUDOS_BE_FRIENDLY,
     // Vanilla condition: switch
-    GI_VB_GTG_GATE_BE_OPEN,
+    VB_GTG_GATE_BE_OPEN,
 
     /*** Play Cutscenes ***/
 
-    GI_VB_PLAY_TRANSITION_CS,
+    VB_PLAY_TRANSITION_CS,
     // Opt: *EventChkInf flag
-    GI_VB_PLAY_ENTRANCE_CS,
+    VB_PLAY_ENTRANCE_CS,
     // Opt: *cutsceneId
-    GI_VB_PLAY_ONEPOINT_CS,
+    VB_PLAY_ONEPOINT_CS,
     // Opt: *actor
-    GI_VB_PLAY_ONEPOINT_ACTOR_CS,
+    VB_PLAY_ONEPOINT_ACTOR_CS,
     // Opt: *BgTreemouth
-    GI_VB_PLAY_DEKU_TREE_INTRO_CS,
+    VB_PLAY_DEKU_TREE_INTRO_CS,
     // Vanilla condition: !EventChkInf except for spirit & shadow temple which are !medallion, and Jabu which always is true
-    GI_VB_PLAY_BLUE_WARP_CS,
-    GI_VB_PLAY_DARUNIAS_JOY_CS,
-    GI_VB_PLAY_SHIEK_BLOCK_MASTER_SWORD_CS,
+    VB_PLAY_BLUE_WARP_CS,
+    VB_PLAY_DARUNIAS_JOY_CS,
+    VB_PLAY_SHIEK_BLOCK_MASTER_SWORD_CS,
     // Vanilla condition: !EVENTCHKINF_PULLED_MASTER_SWORD_FROM_PEDESTAL
-    GI_VB_PLAY_PULL_MASTER_SWORD_CS,
-    GI_VB_PLAY_DROP_FISH_FOR_JABU_CS,
+    VB_PLAY_PULL_MASTER_SWORD_CS,
+    VB_PLAY_DROP_FISH_FOR_JABU_CS,
     // Vanilla condition: player->getItemId == GI_GAUNTLETS_SILVER
-    GI_VB_PLAY_NABOORU_CAPTURED_CS,
-    GI_VB_PLAY_ZELDAS_LULLABY_CS,
+    VB_PLAY_NABOORU_CAPTURED_CS,
+    VB_PLAY_ZELDAS_LULLABY_CS,
     // Opt: *EnSa
-    GI_VB_PLAY_SARIAS_SONG_CS,
-    GI_VB_PLAY_PRELUDE_OF_LIGHT_CS,
-    GI_VB_PLAY_MINUET_OF_FOREST_CS,
-    GI_VB_PLAY_BOLERO_OF_FIRE_CS,
-    GI_VB_PLAY_SERENADE_OF_WATER_CS,
-    GI_VB_PLAY_EYEDROPS_CS,
+    VB_PLAY_SARIAS_SONG_CS,
+    VB_PLAY_PRELUDE_OF_LIGHT_CS,
+    VB_PLAY_MINUET_OF_FOREST_CS,
+    VB_PLAY_BOLERO_OF_FIRE_CS,
+    VB_PLAY_SERENADE_OF_WATER_CS,
+    VB_PLAY_EYEDROPS_CS,
     // Opt: *EnOkarinaTag
-    GI_VB_PLAY_DRAIN_WELL_CS,
+    VB_PLAY_DRAIN_WELL_CS,
     // Opt: *EnOkarinaTag
     // Vanilla condition: !CHECK_QUEST_ITEM(QUEST_SONG_SUN)
-    GI_VB_PLAY_SUNS_SONG_CS,
+    VB_PLAY_SUNS_SONG_CS,
     // Opt: *EnOkarinaTag
-    GI_VB_PLAY_ROYAL_FAMILY_TOMB_CS,
-    GI_VB_PLAY_ROYAL_FAMILY_TOMB_EXPLODE,
+    VB_PLAY_ROYAL_FAMILY_TOMB_CS,
+    VB_PLAY_ROYAL_FAMILY_TOMB_EXPLODE,
     // Opt: *EnOkarinaTag
-    GI_VB_PLAY_DOOR_OF_TIME_CS,
-    GI_VB_PLAY_RAINBOW_BRIDGE_CS,
+    VB_PLAY_DOOR_OF_TIME_CS,
+    VB_PLAY_RAINBOW_BRIDGE_CS,
 
     /*** Give Items ***/
 
     // Opt: *EnBox
-    GI_VB_GIVE_ITEM_FROM_CHEST,
-    GI_VB_GIVE_ITEM_FROM_BLUE_WARP,
+    VB_GIVE_ITEM_FROM_CHEST,
+    VB_GIVE_ITEM_FROM_BLUE_WARP,
     // Opt: *EnItem00
-    GI_VB_GIVE_ITEM_FROM_ITEM_00,
+    VB_GIVE_ITEM_FROM_ITEM_00,
     // Opt: *EnSi
-    GI_VB_GIVE_ITEM_SKULL_TOKEN,
+    VB_GIVE_ITEM_SKULL_TOKEN,
     // Opt: *EnCow
-    GI_VB_GIVE_ITEM_FROM_COW,
+    VB_GIVE_ITEM_FROM_COW,
     // Opt: *EnDns
-    GI_VB_GIVE_ITEM_FROM_BUSINESS_SCRUB,
+    VB_GIVE_ITEM_FROM_BUSINESS_SCRUB,
     // Opt: *EnMk
-    GI_VB_GIVE_ITEM_FROM_LAB_DIVE,
+    VB_GIVE_ITEM_FROM_LAB_DIVE,
     // Opt: *EnDs
-    GI_VB_GIVE_ITEM_FROM_GRANNYS_SHOP,
+    VB_GIVE_ITEM_FROM_GRANNYS_SHOP,
     // Opt: *EnNiwLady
-    GI_VB_GIVE_ITEM_FROM_ANJU_AS_CHILD,
+    VB_GIVE_ITEM_FROM_ANJU_AS_CHILD,
     // Opt: *EnNiwLady
-    GI_VB_GIVE_ITEM_FROM_ANJU_AS_ADULT,
+    VB_GIVE_ITEM_FROM_ANJU_AS_ADULT,
     // Opt: *EnKz
     // Vanilla condition: !CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_ZORA)
-    GI_VB_GIVE_ITEM_FROM_THAWING_KING_ZORA,
+    VB_GIVE_ITEM_FROM_THAWING_KING_ZORA,
     // Opt: *EnGo2
-    GI_VB_GIVE_ITEM_FROM_GORON,
+    VB_GIVE_ITEM_FROM_GORON,
     // Opt: *EnJs
-    GI_VB_GIVE_ITEM_FROM_CARPET_SALESMAN,
+    VB_GIVE_ITEM_FROM_CARPET_SALESMAN,
     // Opt: *EnGm
-    GI_VB_GIVE_ITEM_FROM_MEDIGORON,
+    VB_GIVE_ITEM_FROM_MEDIGORON,
     // Opt: *EnMs
-    GI_VB_GIVE_ITEM_FROM_MAGIC_BEAN_SALESMAN,
+    VB_GIVE_ITEM_FROM_MAGIC_BEAN_SALESMAN,
     // Opt: *EnFr
-    GI_VB_GIVE_ITEM_FROM_FROGS,
+    VB_GIVE_ITEM_FROM_FROGS,
     // Opt: *EnSkj
-    GI_VB_GIVE_ITEM_FROM_OCARINA_MEMORY_GAME,
+    VB_GIVE_ITEM_FROM_OCARINA_MEMORY_GAME,
     // Opt: *EnSkj
-    GI_VB_GIVE_ITEM_FROM_SKULL_KID_SARIAS_SONG,
-    GI_VB_GIVE_ITEM_FROM_MAN_ON_ROOF,
+    VB_GIVE_ITEM_FROM_SKULL_KID_SARIAS_SONG,
+    VB_GIVE_ITEM_FROM_MAN_ON_ROOF,
     // Opt: *EnSyatekiMan
-    GI_VB_GIVE_ITEM_FROM_SHOOTING_GALLERY,
+    VB_GIVE_ITEM_FROM_SHOOTING_GALLERY,
     // Opt: *EnExItem
-    GI_VB_GIVE_ITEM_FROM_TARGET_IN_WOODS,
+    VB_GIVE_ITEM_FROM_TARGET_IN_WOODS,
     // Opt: *EnTa
-    GI_VB_GIVE_ITEM_FROM_TALONS_CHICKENS,
+    VB_GIVE_ITEM_FROM_TALONS_CHICKENS,
     // Opt: *EnDivingGame
-    GI_VB_GIVE_ITEM_FROM_DIVING_MINIGAME,
+    VB_GIVE_ITEM_FROM_DIVING_MINIGAME,
     // Opt: *EnGe1
-    GI_VB_GIVE_ITEM_FROM_HORSEBACK_ARCHERY,
+    VB_GIVE_ITEM_FROM_HORSEBACK_ARCHERY,
     // Opt: *EnSth
-    GI_VB_GIVE_ITEM_FROM_SKULLTULA_REWARD,
+    VB_GIVE_ITEM_FROM_SKULLTULA_REWARD,
     // Opt: *EnHy
-    GI_VB_GIVE_ITEM_FROM_LOST_DOG,
+    VB_GIVE_ITEM_FROM_LOST_DOG,
     // Opt: *EnBomBowlPit
-    GI_VB_GIVE_ITEM_FROM_BOMBCHU_BOWLING,
+    VB_GIVE_ITEM_FROM_BOMBCHU_BOWLING,
 
-    GI_VB_GIVE_ITEM_GERUDO_MEMBERSHIP_CARD,
+    VB_GIVE_ITEM_GERUDO_MEMBERSHIP_CARD,
 
-    GI_VB_GIVE_ITEM_FAIRY_OCARINA,
-    GI_VB_GIVE_ITEM_WEIRD_EGG,
-    GI_VB_GIVE_ITEM_LIGHT_ARROW,
-    GI_VB_GIVE_ITEM_STRENGTH_1,
-    GI_VB_GIVE_ITEM_ZELDAS_LETTER,
-    GI_VB_GIVE_ITEM_MASTER_SWORD,
-    GI_VB_GIVE_ITEM_OCARINA_OF_TIME,
-    GI_VB_GIVE_ITEM_KOKIRI_EMERALD,
-    GI_VB_GIVE_ITEM_GORON_RUBY,
-    GI_VB_GIVE_ITEM_ZORA_SAPPHIRE,
-    GI_VB_GIVE_ITEM_LIGHT_MEDALLION,
-    GI_VB_GIVE_ITEM_FOREST_MEDALLION,
-    GI_VB_GIVE_ITEM_FIRE_MEDALLION,
-    GI_VB_GIVE_ITEM_WATER_MEDALLION,
-    GI_VB_GIVE_ITEM_SPIRIT_MEDALLION,
-    GI_VB_GIVE_ITEM_SHADOW_MEDALLION,
+    VB_GIVE_ITEM_FAIRY_OCARINA,
+    VB_GIVE_ITEM_WEIRD_EGG,
+    VB_GIVE_ITEM_LIGHT_ARROW,
+    VB_GIVE_ITEM_STRENGTH_1,
+    VB_GIVE_ITEM_ZELDAS_LETTER,
+    VB_GIVE_ITEM_MASTER_SWORD,
+    VB_GIVE_ITEM_OCARINA_OF_TIME,
+    VB_GIVE_ITEM_KOKIRI_EMERALD,
+    VB_GIVE_ITEM_GORON_RUBY,
+    VB_GIVE_ITEM_ZORA_SAPPHIRE,
+    VB_GIVE_ITEM_LIGHT_MEDALLION,
+    VB_GIVE_ITEM_FOREST_MEDALLION,
+    VB_GIVE_ITEM_FIRE_MEDALLION,
+    VB_GIVE_ITEM_WATER_MEDALLION,
+    VB_GIVE_ITEM_SPIRIT_MEDALLION,
+    VB_GIVE_ITEM_SHADOW_MEDALLION,
 
     /*** Give Songs ***/
 
-    GI_VB_GIVE_ITEM_ZELDAS_LULLABY,
-    GI_VB_GIVE_ITEM_SARIAS_SONG,
-    GI_VB_GIVE_ITEM_EPONAS_SONG,
-    GI_VB_GIVE_ITEM_SUNS_SONG,
-    GI_VB_GIVE_ITEM_SONG_OF_TIME,
-    GI_VB_GIVE_ITEM_SONG_OF_STORMS,
-    GI_VB_GIVE_ITEM_MINUET_OF_FOREST,
-    GI_VB_GIVE_ITEM_BOLERO_OF_FIRE,
-    GI_VB_GIVE_ITEM_SERENADE_OF_WATER,
-    GI_VB_GIVE_ITEM_REQUIEM_OF_SPIRIT,
-    GI_VB_GIVE_ITEM_NOCTURNE_OF_SHADOW,
-    GI_VB_GIVE_ITEM_PRELUDE_OF_LIGHT,
+    VB_GIVE_ITEM_ZELDAS_LULLABY,
+    VB_GIVE_ITEM_SARIAS_SONG,
+    VB_GIVE_ITEM_EPONAS_SONG,
+    VB_GIVE_ITEM_SUNS_SONG,
+    VB_GIVE_ITEM_SONG_OF_TIME,
+    VB_GIVE_ITEM_SONG_OF_STORMS,
+    VB_GIVE_ITEM_MINUET_OF_FOREST,
+    VB_GIVE_ITEM_BOLERO_OF_FIRE,
+    VB_GIVE_ITEM_SERENADE_OF_WATER,
+    VB_GIVE_ITEM_REQUIEM_OF_SPIRIT,
+    VB_GIVE_ITEM_NOCTURNE_OF_SHADOW,
+    VB_GIVE_ITEM_PRELUDE_OF_LIGHT,
 
     /*** Adult Trade ***/
     // Opt: *EnNiwLady
-    GI_VB_TRADE_POCKET_CUCCO,
+    VB_TRADE_POCKET_CUCCO,
     // Opt: *EnHs
-    GI_VB_TRADE_COJIRO,
+    VB_TRADE_COJIRO,
     // Opt: *EnDs
-    GI_VB_TRADE_ODD_MUSHROOM,
+    VB_TRADE_ODD_MUSHROOM,
     // Opt: *EnKo
-    GI_VB_TRADE_ODD_POTION,
+    VB_TRADE_ODD_POTION,
     // Opt: *EnToryo
-    GI_VB_TRADE_SAW,
+    VB_TRADE_SAW,
     // Opt: *EnKz,
-    GI_VB_TRADE_PRESCRIPTION,
+    VB_TRADE_PRESCRIPTION,
     // Opt: *EnMk
-    GI_VB_TRADE_FROG,
+    VB_TRADE_FROG,
 
-    GI_VB_TRADE_TIMER_ODD_MUSHROOM,
-    GI_VB_TRADE_TIMER_EYEDROPS,
-    GI_VB_TRADE_TIMER_FROG,
+    VB_TRADE_TIMER_ODD_MUSHROOM,
+    VB_TRADE_TIMER_EYEDROPS,
+    VB_TRADE_TIMER_FROG,
     // Opt: *EnNiwLady
-    GI_VB_ANJU_SET_OBTAINED_TRADE_ITEM,
+    VB_ANJU_SET_OBTAINED_TRADE_ITEM,
 
     /*** Fixes ***/
     // Vanilla condition: false
-    GI_VB_FIX_SAW_SOFTLOCK,
+    VB_FIX_SAW_SOFTLOCK,
 
     /*** Cheats? ***/
-    GI_VB_DEKU_STICK_BE_ON_FIRE,
-    GI_VB_DEKU_STICK_BREAK,
-    GI_VB_DEKU_STICK_BURN_DOWN,
-    GI_VB_DEKU_STICK_BURN_OUT,
-    GI_VB_DEKU_UPDATE_BURNING_DEKU_STICK,
+    VB_DEKU_STICK_BE_ON_FIRE,
+    VB_DEKU_STICK_BREAK,
+    VB_DEKU_STICK_BURN_DOWN,
+    VB_DEKU_STICK_BURN_OUT,
+    VB_DEKU_UPDATE_BURNING_DEKU_STICK,
 
     /*** Quick Boss Deaths ***/
     // Vanilla condition: true
-    GI_VB_PHANTOM_GANON_DEATH_SCENE,
-    GI_VB_NABOORU_KNUCKLE_DEATH_SCENE,
+    VB_PHANTOM_GANON_DEATH_SCENE,
+    VB_NABOORU_KNUCKLE_DEATH_SCENE,
 } GIVanillaBehavior;
 
 #ifdef __cplusplus
diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index bd71f7e0c..8360ece10 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -539,7 +539,7 @@ void RandomizerSetChestGameRandomizerInf(RandomizerCheck rc) {
 
 void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void* optionalArg) {
     switch (id) {
-        case GI_VB_GIVE_ITEM_FROM_CHEST: {
+        case VB_GIVE_ITEM_FROM_CHEST: {
             EnBox* chest = static_cast<EnBox*>(optionalArg);
             RandomizerCheck rc = OTRGlobals::Instance->gRandomizer->GetCheckFromActor(chest->dyna.actor.id, gPlayState->sceneNum, chest->dyna.actor.params);
             
@@ -553,38 +553,38 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             *should = false;
             break;
         }
-        case GI_VB_PLAY_NABOORU_CAPTURED_CS:
+        case VB_PLAY_NABOORU_CAPTURED_CS:
             // This behavior is replicated for randomizer in RandomizerOnItemReceiveHandler
             *should = false;
             break;
-        case GI_VB_SHIEK_PREPARE_TO_GIVE_SERENADE_OF_WATER: {
+        case VB_SHIEK_PREPARE_TO_GIVE_SERENADE_OF_WATER: {
             *should = !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_SERENADE_OF_WATER) && !Flags_GetTreasure(gPlayState, 0x2);
             break;
         }
-        case GI_VB_BE_ELIGIBLE_FOR_SERENADE_OF_WATER:
+        case VB_BE_ELIGIBLE_FOR_SERENADE_OF_WATER:
             *should = !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_SERENADE_OF_WATER) && Flags_GetTreasure(gPlayState, 0x2);
             break;
-        case GI_VB_BE_ELIGIBLE_FOR_PRELUDE_OF_LIGHT:
+        case VB_BE_ELIGIBLE_FOR_PRELUDE_OF_LIGHT:
             *should = !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT) && CHECK_QUEST_ITEM(QUEST_MEDALLION_FOREST);
             break;
-        case GI_VB_MOVE_MIDO_IN_KOKIRI_FOREST:
+        case VB_MOVE_MIDO_IN_KOKIRI_FOREST:
             if (RAND_GET_OPTION(RSK_FOREST) == RO_FOREST_OPEN) {
                 *should = true;
             }
             break;
-        case GI_VB_MIDO_CONSIDER_DEKU_TREE_DEAD:
+        case VB_MIDO_CONSIDER_DEKU_TREE_DEAD:
             *should = Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_KOKIRI_EMERALD_DEKU_TREE_DEAD);
             break;
-        case GI_VB_OPEN_KOKIRI_FOREST:
+        case VB_OPEN_KOKIRI_FOREST:
             *should = Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_KOKIRI_EMERALD_DEKU_TREE_DEAD) || RAND_GET_OPTION(RSK_FOREST) != RO_FOREST_CLOSED;
             break;
-        case GI_VB_BE_ELIGIBLE_FOR_DARUNIAS_JOY_REWARD:
+        case VB_BE_ELIGIBLE_FOR_DARUNIAS_JOY_REWARD:
             *should = !Flags_GetRandomizerInf(RAND_INF_DARUNIAS_JOY);
             break;
-        case GI_VB_BE_ELIGIBLE_FOR_LIGHT_ARROWS:
+        case VB_BE_ELIGIBLE_FOR_LIGHT_ARROWS:
             *should = !Flags_GetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS) && MeetsLACSRequirements();
             break;
-        case GI_VB_BE_ELIGIBLE_FOR_NOCTURNE_OF_SHADOW:
+        case VB_BE_ELIGIBLE_FOR_NOCTURNE_OF_SHADOW:
             *should =
                     !Flags_GetEventChkInf(EVENTCHKINF_BONGO_BONGO_ESCAPED_FROM_WELL) &&
                     LINK_IS_ADULT &&
@@ -593,18 +593,18 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
                     CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE) &&
                     CHECK_QUEST_ITEM(QUEST_MEDALLION_WATER);
             break;
-        case GI_VB_BE_ELIGIBLE_FOR_CHILD_ROLLING_GORON_REWARD: {
+        case VB_BE_ELIGIBLE_FOR_CHILD_ROLLING_GORON_REWARD: {
             // Don't require a bomb bag to get prize in rando
             *should = true;
             break;
         }
-        case GI_VB_BE_ELIGIBLE_FOR_MAGIC_BEANS_PURCHASE: {
+        case VB_BE_ELIGIBLE_FOR_MAGIC_BEANS_PURCHASE: {
             if (RAND_GET_OPTION(RSK_SHUFFLE_MAGIC_BEANS)) {
                 *should = gSaveContext.rupees >= 60;
             }
             break;
         }
-        case GI_VB_GIVE_ITEM_MASTER_SWORD:
+        case VB_GIVE_ITEM_MASTER_SWORD:
             if (RAND_GET_OPTION(RSK_SHUFFLE_MASTER_SWORD)) {
                 *should = false;
             } else {
@@ -612,7 +612,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
                 Rando::Context::GetInstance()->GetItemLocation(RC_TOT_MASTER_SWORD)->MarkAsObtained();
             }
             break;
-        case GI_VB_ITEM00_DESPAWN: {
+        case VB_ITEM00_DESPAWN: {
             EnItem00* item00 = static_cast<EnItem00*>(optionalArg);
             if (item00->actor.params == ITEM00_HEART_PIECE || item00->actor.params == ITEM00_SMALL_KEY) {
                 RandomizerCheck rc = OTRGlobals::Instance->gRandomizer->GetCheckFromActor(item00->actor.id, gPlayState->sceneNum, item00->ogParams);
@@ -629,18 +629,18 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             }
             break;
         }
-        case GI_VB_MALON_ALREADY_TAUGHT_EPONAS_SONG: {
+        case VB_MALON_ALREADY_TAUGHT_EPONAS_SONG: {
             *should = Flags_GetRandomizerInf(RAND_INF_LEARNED_EPONA_SONG);
             break;
         }
-        case GI_VB_SET_CUCCO_COUNT: {
+        case VB_SET_CUCCO_COUNT: {
             EnNiwLady* enNiwLady = static_cast<EnNiwLady*>(optionalArg);
             // Override starting Cucco count using setting value
             enNiwLady->cuccosInPen = 7 - RAND_GET_OPTION(RSK_CUCCO_COUNT);
             *should = false;
             break;
         }
-        case GI_VB_KING_ZORA_THANK_CHILD: {
+        case VB_KING_ZORA_THANK_CHILD: {
             // Allow turning in Ruto's letter even if you have already rescued her
             if (!Flags_GetEventChkInf(EVENTCHKINF_KING_ZORA_MOVED)) {
                 GET_PLAYER(gPlayState)->exchangeItemId = EXCH_ITEM_LETTER_RUTO;
@@ -648,11 +648,11 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             *should = Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP);
             break;
         }
-        case GI_VB_BE_ABLE_TO_EXCHANGE_RUTOS_LETTER: {
+        case VB_BE_ABLE_TO_EXCHANGE_RUTOS_LETTER: {
             *should = LINK_IS_CHILD;
             break;
         }
-        case GI_VB_KING_ZORA_BE_MOVED: {
+        case VB_KING_ZORA_BE_MOVED: {
             *should = false;
             switch (RAND_GET_OPTION(RSK_ZORAS_FOUNTAIN)) {
                 case RO_ZF_CLOSED:
@@ -673,29 +673,29 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             }
             break;
         }
-        case GI_VB_BIGGORON_CONSIDER_SWORD_COLLECTED: {
+        case VB_BIGGORON_CONSIDER_SWORD_COLLECTED: {
             *should = Flags_GetRandomizerInf(RAND_INF_ADULT_TRADES_DMT_TRADE_CLAIM_CHECK);
             break;
         }
-        case GI_VB_BIGGORON_CONSIDER_TRADE_COMPLETE: {
+        case VB_BIGGORON_CONSIDER_TRADE_COMPLETE: {
             // This being true will prevent other biggoron trades, there are already safegaurds in place to prevent
             // claim check from being traded multiple times, so we don't really need the quest to ever be considered "complete"
             *should = false;
             break;
         }
-        case GI_VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED: {
+        case VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED: {
             *should = Flags_GetEventChkInf(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP);
             break;
         }
-        case GI_VB_GORONS_CONSIDER_DODONGOS_CAVERN_FINISHED: {
+        case VB_GORONS_CONSIDER_DODONGOS_CAVERN_FINISHED: {
             *should = Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP);
             break;
         }
-        case GI_VB_GORONS_CONSIDER_TUNIC_COLLECTED: {
+        case VB_GORONS_CONSIDER_TUNIC_COLLECTED: {
             *should = Flags_GetInfTable(INFTABLE_GORON_CITY_DOORS_UNLOCKED);
             break;
         }
-        case GI_VB_GIVE_ITEM_FROM_ITEM_00: {
+        case VB_GIVE_ITEM_FROM_ITEM_00: {
             EnItem00* item00 = static_cast<EnItem00*>(optionalArg);
             if (item00->actor.params == ITEM00_SOH_DUMMY) {
                 if (item00->randoInf != RAND_INF_MAX) {
@@ -730,11 +730,11 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             }
             break;
         }
-        case GI_VB_BE_ELIGIBLE_FOR_SARIAS_SONG: {
+        case VB_BE_ELIGIBLE_FOR_SARIAS_SONG: {
             *should = !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_SARIAS_SONG);
             break;
         }
-        case GI_VB_GIVE_ITEM_FROM_COW: {
+        case VB_GIVE_ITEM_FROM_COW: {
             if (!RAND_GET_OPTION(RSK_SHUFFLE_COWS)) {
                 break;
             }
@@ -751,7 +751,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             *should = false;
             break;
         }
-        case GI_VB_GIVE_ITEM_FROM_GRANNYS_SHOP: {
+        case VB_GIVE_ITEM_FROM_GRANNYS_SHOP: {
             if (!EnDs_RandoCanGetGrannyItem()) {
                 break;
             }
@@ -760,7 +760,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             *should = false;
             break;
         }
-        case GI_VB_GIVE_ITEM_FROM_THAWING_KING_ZORA: {
+        case VB_GIVE_ITEM_FROM_THAWING_KING_ZORA: {
             EnKz* enKz = static_cast<EnKz*>(optionalArg);
             // If we aren't setting up the item offer, then we're just checking if it should be possible.
             if (enKz->actionFunc != (EnKzActionFunc)EnKz_SetupGetItem) {
@@ -771,28 +771,28 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             *should = false;
             break;
         }
-        case GI_VB_GIVE_ITEM_FROM_ANJU_AS_CHILD: {
+        case VB_GIVE_ITEM_FROM_ANJU_AS_CHILD: {
             Flags_SetItemGetInf(ITEMGETINF_0C);
             *should = false;
             break;
         }
-        case GI_VB_GIVE_ITEM_FROM_ANJU_AS_ADULT: {
+        case VB_GIVE_ITEM_FROM_ANJU_AS_ADULT: {
             Flags_SetItemGetInf(ITEMGETINF_2C);
             *should = false;
             break;
         }
-        case GI_VB_GIVE_ITEM_FROM_CARPET_SALESMAN: {
+        case VB_GIVE_ITEM_FROM_CARPET_SALESMAN: {
             *should = RAND_GET_OPTION(RSK_SHUFFLE_MERCHANTS) == RO_SHUFFLE_MERCHANTS_OFF ||
                       // If the rando check has already been awarded, use vanilla behavior.
                       Flags_GetRandomizerInf(RAND_INF_MERCHANTS_CARPET_SALESMAN);
             break;
         }
-        case GI_VB_GIVE_ITEM_FROM_MEDIGORON: {
+        case VB_GIVE_ITEM_FROM_MEDIGORON: {
             // fallthrough
-        case GI_VB_BE_ELIGIBLE_FOR_GIANTS_KNIFE_PURCHASE:
+        case VB_BE_ELIGIBLE_FOR_GIANTS_KNIFE_PURCHASE:
             if (RAND_GET_OPTION(RSK_SHUFFLE_MERCHANTS) != RO_SHUFFLE_MERCHANTS_OFF &&
                 !Flags_GetRandomizerInf(RAND_INF_MERCHANTS_MEDIGORON)) {
-                if (id == GI_VB_GIVE_ITEM_FROM_MEDIGORON) {
+                if (id == VB_GIVE_ITEM_FROM_MEDIGORON) {
                     Flags_SetInfTable(INFTABLE_B1);
                     *should = false;
                 } else {
@@ -803,7 +803,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             }
             break;
         }
-        case GI_VB_GIVE_ITEM_FROM_MAGIC_BEAN_SALESMAN: {
+        case VB_GIVE_ITEM_FROM_MAGIC_BEAN_SALESMAN: {
             EnMs* enMs = static_cast<EnMs*>(optionalArg);
             if (RAND_GET_OPTION(RSK_SHUFFLE_MAGIC_BEANS)) {
                 Rupees_ChangeBy(-60);
@@ -815,7 +815,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             }
             break;
         }
-        case GI_VB_GIVE_ITEM_FROM_FROGS: {
+        case VB_GIVE_ITEM_FROM_FROGS: {
             EnFr* enFr = static_cast<EnFr*>(optionalArg);
 
             // Skip GiveReward+SetIdle action func if the reward is an ice trap
@@ -830,26 +830,26 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             *should = false;
             break;
         }
-        case GI_VB_TRADE_POCKET_CUCCO: {
+        case VB_TRADE_POCKET_CUCCO: {
             Randomizer_ConsumeAdultTradeItem(gPlayState, ITEM_POCKET_CUCCO);
             // Trigger the reward now
             Flags_SetItemGetInf(ITEMGETINF_2E);
             *should = false;
             break;
         }
-        case GI_VB_TRADE_COJIRO: {
+        case VB_TRADE_COJIRO: {
             Randomizer_ConsumeAdultTradeItem(gPlayState, ITEM_COJIRO);
             *should = false;
             break;
         }
-        case GI_VB_TRADE_ODD_MUSHROOM: {
+        case VB_TRADE_ODD_MUSHROOM: {
             Randomizer_ConsumeAdultTradeItem(gPlayState, ITEM_ODD_MUSHROOM);
             // Trigger the reward now
             Flags_SetItemGetInf(ITEMGETINF_30);
             *should = false;
             break;
         }
-        case GI_VB_TRADE_ODD_POTION: {
+        case VB_TRADE_ODD_POTION: {
             EnKo* enKo = static_cast<EnKo*>(optionalArg);
             Randomizer_ConsumeAdultTradeItem(gPlayState, ITEM_ODD_POTION);
             // Trigger the reward now
@@ -857,12 +857,12 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             *should = false;
             break;
         }
-        case GI_VB_TRADE_SAW: {
+        case VB_TRADE_SAW: {
             Randomizer_ConsumeAdultTradeItem(gPlayState, ITEM_SAW);
             *should = false;
             break;
         }
-        case GI_VB_TRADE_PRESCRIPTION: {
+        case VB_TRADE_PRESCRIPTION: {
             EnKz* enKz = static_cast<EnKz*>(optionalArg);
             // If we aren't setting up the item offer, then we're just checking if it should be possible.
             if (enKz->actionFunc != (EnKzActionFunc)EnKz_SetupGetItem) {
@@ -873,12 +873,12 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             *should = false;
             break;
         }
-        case GI_VB_TRADE_FROG: {
+        case VB_TRADE_FROG: {
             Randomizer_ConsumeAdultTradeItem(gPlayState, ITEM_FROG);
             *should = false;
             break;
         }
-        case GI_VB_DESPAWN_HORSE_RACE_COW: {
+        case VB_DESPAWN_HORSE_RACE_COW: {
             if (!RAND_GET_OPTION(RSK_SHUFFLE_COWS)) {
                 break;
             }
@@ -887,7 +887,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             EnCow_MoveForRandomizer(enCow, gPlayState);
             break;
         }
-        case GI_VB_BUSINESS_SCRUB_DESPAWN: {
+        case VB_BUSINESS_SCRUB_DESPAWN: {
             EnShopnuts* enShopnuts = static_cast<EnShopnuts*>(optionalArg);
             s16 respawnData = gSaveContext.respawn[RESPAWN_MODE_RETURN].data & ((1 << 8) - 1);
             ScrubIdentity scrubIdentity = OTRGlobals::Instance->gRandomizer->IdentifyScrub(gPlayState->sceneNum, enShopnuts->actor.params, respawnData);
@@ -897,7 +897,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             }
             break;
         }
-        case GI_VB_GIVE_ITEM_FROM_BUSINESS_SCRUB: {
+        case VB_GIVE_ITEM_FROM_BUSINESS_SCRUB: {
             EnDns* enDns = static_cast<EnDns*>(optionalArg);
             *should = !enDns->sohScrubIdentity.isShuffled;
             break;
@@ -907,7 +907,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
         // - If you don't have Cojiro but do have Odd Potion, spawn Fado and not Grog.
         // - If you don't have either, spawn Grog if you haven't traded the Odd Mushroom.
         // - If you don't have either but have traded the mushroom, don't spawn either.
-        case GI_VB_DESPAWN_GROG: {
+        case VB_DESPAWN_GROG: {
             if (!RAND_GET_OPTION(RSK_SHUFFLE_ADULT_TRADE)) {
                 break;
             }
@@ -920,7 +920,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             }
             break;
         }
-        case GI_VB_SPAWN_LW_FADO: {
+        case VB_SPAWN_LW_FADO: {
             if (!RAND_GET_OPTION(RSK_SHUFFLE_ADULT_TRADE)) {
                 break;
             }
@@ -933,23 +933,23 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
 
             break;
         }
-        case GI_VB_USE_EYEDROP_DIALOGUE: {
+        case VB_USE_EYEDROP_DIALOGUE: {
             // Skip eye drop text on rando if Link went in the water, so you can still receive the dive check
             EnMk* enMk = static_cast<EnMk*>(optionalArg);
             *should &= enMk->swimFlag == 0;
             break;
         }
-        case GI_VB_OFFER_BLUE_POTION: {
+        case VB_OFFER_BLUE_POTION: {
             // Always offer blue potion when adult trade is off
             *should |= RAND_GET_OPTION(RSK_SHUFFLE_ADULT_TRADE) == RO_GENERIC_OFF;
             break;
         }
-        case GI_VB_NEED_BOTTLE_FOR_GRANNYS_ITEM: {
+        case VB_NEED_BOTTLE_FOR_GRANNYS_ITEM: {
             // Allow buying the rando item regardless of having a bottle
             *should &= !EnDs_RandoCanGetGrannyItem();
             break;
         }
-        case GI_VB_GIVE_ITEM_FROM_SHOOTING_GALLERY: {
+        case VB_GIVE_ITEM_FROM_SHOOTING_GALLERY: {
             EnSyatekiMan* enSyatekiMan = static_cast<EnSyatekiMan*>(optionalArg);
             enSyatekiMan->getItemId = GI_RUPEE_PURPLE;
             if (LINK_IS_ADULT) {
@@ -961,7 +961,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             }
             break;
         }
-        case GI_VB_BE_ELIGIBLE_FOR_ADULT_SHOOTING_GAME_REWARD: {
+        case VB_BE_ELIGIBLE_FOR_ADULT_SHOOTING_GAME_REWARD: {
             *should = CUR_UPG_VALUE(UPG_QUIVER) > 0;
             if (!*should) {
                 // In Rando without a quiver, display a message reminding the player to come back with a bow
@@ -969,7 +969,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             }
             break;
         }
-        case GI_VB_BE_ELIGIBLE_TO_OPEN_DOT: {
+        case VB_BE_ELIGIBLE_TO_OPEN_DOT: {
             bool eligible = RAND_GET_OPTION(RSK_DOOR_OF_TIME) != RO_DOOROFTIME_CLOSED || (
                 INV_CONTENT(ITEM_OCARINA_FAIRY) == ITEM_OCARINA_TIME &&
                 CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD) &&
@@ -979,7 +979,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             *should = eligible;
             break;
         }
-        case GI_VB_GIVE_ITEM_FROM_HORSEBACK_ARCHERY: {
+        case VB_GIVE_ITEM_FROM_HORSEBACK_ARCHERY: {
             // give both rewards at the same time
             if (gSaveContext.minigameScore >= 1500) {
                 Flags_SetItemGetInf(ITEMGETINF_0F);
@@ -987,7 +987,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             *should = false;
             break;
         }
-        case GI_VB_GIVE_ITEM_FROM_SKULLTULA_REWARD: {
+        case VB_GIVE_ITEM_FROM_SKULLTULA_REWARD: {
             // In z_en_sth.c the rewards are stored in sGetItemIds, the first entry
             // in that array is GI_RUPEE_GOLD, and the reward is picked in EnSth_GivePlayerItem
             // via sGetItemIds[this->actor.params]. This means if actor.params == 0 we're looking
@@ -1014,14 +1014,14 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             *should = false;
             break;
         }
-        case GI_VB_GIVE_ITEM_FROM_OCARINA_MEMORY_GAME: {
+        case VB_GIVE_ITEM_FROM_OCARINA_MEMORY_GAME: {
             EnSkj* enSkj = static_cast<EnSkj*>(optionalArg);
             Flags_SetItemGetInf(ITEMGETINF_17);
             enSkj->actionFunc = (EnSkjActionFunc)EnSkj_CleanupOcarinaGame;
             *should = false;
             break;
         }
-        case GI_VB_GIVE_ITEM_FROM_LOST_DOG: {
+        case VB_GIVE_ITEM_FROM_LOST_DOG: {
             EnHy* enHy = static_cast<EnHy*>(optionalArg);
             Flags_SetInfTable(INFTABLE_191);
             gSaveContext.dogParams = 0;
@@ -1030,33 +1030,33 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             *should = false;
             break;
         }
-        case GI_VB_GIVE_ITEM_FROM_BOMBCHU_BOWLING: {
+        case VB_GIVE_ITEM_FROM_BOMBCHU_BOWLING: {
             EnBomBowlPit* enBomBowlPit = static_cast<EnBomBowlPit*>(optionalArg);
             if (enBomBowlPit->prizeIndex == EXITEM_BOMB_BAG_BOWLING || enBomBowlPit->prizeIndex == EXITEM_HEART_PIECE_BOWLING) {
                 *should = false;
             }
             break;
         }
-        case GI_VB_GERUDOS_BE_FRIENDLY: {
+        case VB_GERUDOS_BE_FRIENDLY: {
             *should = CHECK_QUEST_ITEM(QUEST_GERUDO_CARD);
             break;
         }
-        case GI_VB_GTG_GATE_BE_OPEN: {
+        case VB_GTG_GATE_BE_OPEN: {
             if (Flags_GetRandomizerInf(RAND_INF_GF_GTG_GATE_PERMANENTLY_OPEN)) {
                 *should = true;
             }
             break;
         }
-        case GI_VB_GIVE_ITEM_GERUDO_MEMBERSHIP_CARD: {
+        case VB_GIVE_ITEM_GERUDO_MEMBERSHIP_CARD: {
             Flags_SetRandomizerInf(RAND_INF_GF_ITEM_FROM_LEADER_OF_FORTRESS);
             *should = false;
             break;
         }
-        case GI_VB_BE_ELIGIBLE_FOR_RAINBOW_BRIDGE: {
+        case VB_BE_ELIGIBLE_FOR_RAINBOW_BRIDGE: {
             *should = MeetsRainbowBridgeRequirements();
             break;
         }
-        case GI_VB_PLAY_BLUE_WARP_CS: {
+        case VB_PLAY_BLUE_WARP_CS: {
             // We need to override just these two temples because they check medallions instead of flags
             if (gPlayState->sceneNum == SCENE_SPIRIT_TEMPLE_BOSS) {
                 *should = !Flags_GetRandomizerInf(RAND_INF_DUNGEONS_DONE_SPIRIT_TEMPLE);
@@ -1065,34 +1065,34 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             }
             break;
         }
-        case GI_VB_TRADE_TIMER_ODD_MUSHROOM:
-        case GI_VB_TRADE_TIMER_EYEDROPS:
-        case GI_VB_TRADE_TIMER_FROG:
-        case GI_VB_ANJU_SET_OBTAINED_TRADE_ITEM:
-        case GI_VB_GIVE_ITEM_FROM_TARGET_IN_WOODS:
-        case GI_VB_GIVE_ITEM_FROM_TALONS_CHICKENS:
-        case GI_VB_GIVE_ITEM_FROM_DIVING_MINIGAME:
-        case GI_VB_GIVE_ITEM_FROM_GORON:
-        case GI_VB_GIVE_ITEM_FROM_LAB_DIVE:
-        case GI_VB_GIVE_ITEM_FROM_SKULL_KID_SARIAS_SONG:
-        case GI_VB_GIVE_ITEM_FROM_MAN_ON_ROOF:
-        case GI_VB_GIVE_ITEM_SKULL_TOKEN:
-        case GI_VB_GIVE_ITEM_FROM_BLUE_WARP:
-        case GI_VB_GIVE_ITEM_FAIRY_OCARINA:
-        case GI_VB_GIVE_ITEM_WEIRD_EGG:
-        case GI_VB_GIVE_ITEM_LIGHT_ARROW:
-        case GI_VB_GIVE_ITEM_STRENGTH_1:
-        case GI_VB_GIVE_ITEM_ZELDAS_LETTER:
-        case GI_VB_GIVE_ITEM_OCARINA_OF_TIME:
-        case GI_VB_GIVE_ITEM_KOKIRI_EMERALD:
-        case GI_VB_GIVE_ITEM_GORON_RUBY:
-        case GI_VB_GIVE_ITEM_ZORA_SAPPHIRE:
-        case GI_VB_GIVE_ITEM_LIGHT_MEDALLION:
-        case GI_VB_GIVE_ITEM_FOREST_MEDALLION:
-        case GI_VB_GIVE_ITEM_FIRE_MEDALLION:
-        case GI_VB_GIVE_ITEM_WATER_MEDALLION:
-        case GI_VB_GIVE_ITEM_SPIRIT_MEDALLION:
-        case GI_VB_GIVE_ITEM_SHADOW_MEDALLION:
+        case VB_TRADE_TIMER_ODD_MUSHROOM:
+        case VB_TRADE_TIMER_EYEDROPS:
+        case VB_TRADE_TIMER_FROG:
+        case VB_ANJU_SET_OBTAINED_TRADE_ITEM:
+        case VB_GIVE_ITEM_FROM_TARGET_IN_WOODS:
+        case VB_GIVE_ITEM_FROM_TALONS_CHICKENS:
+        case VB_GIVE_ITEM_FROM_DIVING_MINIGAME:
+        case VB_GIVE_ITEM_FROM_GORON:
+        case VB_GIVE_ITEM_FROM_LAB_DIVE:
+        case VB_GIVE_ITEM_FROM_SKULL_KID_SARIAS_SONG:
+        case VB_GIVE_ITEM_FROM_MAN_ON_ROOF:
+        case VB_GIVE_ITEM_SKULL_TOKEN:
+        case VB_GIVE_ITEM_FROM_BLUE_WARP:
+        case VB_GIVE_ITEM_FAIRY_OCARINA:
+        case VB_GIVE_ITEM_WEIRD_EGG:
+        case VB_GIVE_ITEM_LIGHT_ARROW:
+        case VB_GIVE_ITEM_STRENGTH_1:
+        case VB_GIVE_ITEM_ZELDAS_LETTER:
+        case VB_GIVE_ITEM_OCARINA_OF_TIME:
+        case VB_GIVE_ITEM_KOKIRI_EMERALD:
+        case VB_GIVE_ITEM_GORON_RUBY:
+        case VB_GIVE_ITEM_ZORA_SAPPHIRE:
+        case VB_GIVE_ITEM_LIGHT_MEDALLION:
+        case VB_GIVE_ITEM_FOREST_MEDALLION:
+        case VB_GIVE_ITEM_FIRE_MEDALLION:
+        case VB_GIVE_ITEM_WATER_MEDALLION:
+        case VB_GIVE_ITEM_SPIRIT_MEDALLION:
+        case VB_GIVE_ITEM_SHADOW_MEDALLION:
             *should = false;
             break;
     }
diff --git a/soh/soh/Enhancements/timesaver_hook_handlers.cpp b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
index 642eae7cc..ad612a82e 100644
--- a/soh/soh/Enhancements/timesaver_hook_handlers.cpp
+++ b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
@@ -40,7 +40,7 @@ void EnKo_MoveWhenReady(EnKo* enKo, PlayState* play) {
     if ((enKo->actor.params & 0xFF) == ENKO_TYPE_CHILD_3) {
         // Typically this doesn't get get live updated in vanilla, but we need to
         // live update it if we're skipping a certain cutscene or in randomizer
-        if (GameInteractor_Should(GI_VB_OPEN_KOKIRI_FOREST, CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD), NULL)) {
+        if (GameInteractor_Should(VB_OPEN_KOKIRI_FOREST, CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD), NULL)) {
             enKo->collider.dim.height -= 200;
             Path_CopyLastPoint(enKo->path, &enKo->actor.world.pos);
             enKo->actionFunc = func_80A99384;
@@ -140,7 +140,7 @@ void TimeSaverOnGameFrameUpdateHandler() {
 
 void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void* opt) {
     switch (id) {
-        case GI_VB_PLAY_TRANSITION_CS: {
+        case VB_PLAY_TRANSITION_CS: {
             if (CVarGetInteger("gTimeSavers.SkipCutscene.Intro", IS_RANDO) && gSaveContext.entranceIndex == ENTR_LINKS_HOUSE_0 && gSaveContext.cutsceneIndex == 0xFFF1) {
                 gSaveContext.cutsceneIndex = 0;
                 *should = false;
@@ -160,7 +160,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
                     Flags_SetEventChkInf(EVENTCHKINF_LEARNED_REQUIEM_OF_SPIRIT);
                     // Normally happens in the cutscene
                     gSaveContext.dayTime = gSaveContext.skyboxTime = 0xAC60;
-                    if (GameInteractor_Should(GI_VB_GIVE_ITEM_REQUIEM_OF_SPIRIT, true, NULL)) {
+                    if (GameInteractor_Should(VB_GIVE_ITEM_REQUIEM_OF_SPIRIT, true, NULL)) {
                         Item_Give(gPlayState, ITEM_SONG_REQUIEM);
                     }
                     *should = false;
@@ -173,11 +173,11 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
                     Flags_GetEventChkInf(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP) &&
                     Flags_GetEventChkInf(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP) &&
                     !Flags_GetEventChkInf(EVENTCHKINF_BONGO_BONGO_ESCAPED_FROM_WELL);
-                if (GameInteractor_Should(GI_VB_BE_ELIGIBLE_FOR_NOCTURNE_OF_SHADOW, meetsBurningKakRequirements, NULL)) {
+                if (GameInteractor_Should(VB_BE_ELIGIBLE_FOR_NOCTURNE_OF_SHADOW, meetsBurningKakRequirements, NULL)) {
                     Flags_SetEventChkInf(EVENTCHKINF_BONGO_BONGO_ESCAPED_FROM_WELL);
                     // Normally happens in the cutscene
                     Flags_SetEventChkInf(EVENTCHKINF_LEARNED_NOCTURNE_OF_SHADOW);
-                    if (GameInteractor_Should(GI_VB_GIVE_ITEM_NOCTURNE_OF_SHADOW, true, NULL)) {
+                    if (GameInteractor_Should(VB_GIVE_ITEM_NOCTURNE_OF_SHADOW, true, NULL)) {
                         Item_Give(gPlayState, ITEM_SONG_NOCTURNE);
                     }
                     *should = false;
@@ -255,7 +255,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
                 // Lost Woods Bridge
                 if ((gSaveContext.entranceIndex == ENTR_LOST_WOODS_9) && !Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_SARIA_ON_BRIDGE)) {
                     Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_SARIA_ON_BRIDGE);
-                    if (GameInteractor_Should(GI_VB_GIVE_ITEM_FAIRY_OCARINA, true, NULL)) {
+                    if (GameInteractor_Should(VB_GIVE_ITEM_FAIRY_OCARINA, true, NULL)) {
                         Item_Give(gPlayState, ITEM_OCARINA_FAIRY);
                     }
                     *should = false;
@@ -268,9 +268,9 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
                     CHECK_QUEST_ITEM(QUEST_MEDALLION_SPIRIT) &&
                     CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW) &&
                     !Flags_GetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS);
-                if (GameInteractor_Should(GI_VB_BE_ELIGIBLE_FOR_LIGHT_ARROWS, meetsLACSRequirements, NULL)) {
+                if (GameInteractor_Should(VB_BE_ELIGIBLE_FOR_LIGHT_ARROWS, meetsLACSRequirements, NULL)) {
                     Flags_SetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS);
-                    if (GameInteractor_Should(GI_VB_GIVE_ITEM_LIGHT_ARROW, true, NULL)) {
+                    if (GameInteractor_Should(VB_GIVE_ITEM_LIGHT_ARROW, true, NULL)) {
                         Item_Give(gPlayState, ITEM_ARROW_LIGHT);
                     }
                     *should = false;
@@ -293,14 +293,14 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             }
             break;
         }
-        case GI_VB_PLAY_ENTRANCE_CS: {
+        case VB_PLAY_ENTRANCE_CS: {
             s32* entranceFlag = static_cast<s32*>(opt);
             if (CVarGetInteger("gTimeSavers.SkipCutscene.Entrances", IS_RANDO) && (*entranceFlag != EVENTCHKINF_EPONA_OBTAINED)) {
                 *should = false;
             }
             break;
         }
-        case GI_VB_PLAY_ONEPOINT_CS: {
+        case VB_PLAY_ONEPOINT_CS: {
             if (CVarGetInteger("gTimeSavers.SkipCutscene.OnePoint", IS_RANDO)) {
                 s16* csId = static_cast<s16*>(opt);
                 switch (*csId) {
@@ -310,13 +310,13 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
                         RateLimitedSuccessChime();
                         break;
                     default:
-                        SPDLOG_INFO("GI_VB_PLAY_ONEPOINT_CS {}", *csId);
+                        SPDLOG_INFO("VB_PLAY_ONEPOINT_CS {}", *csId);
                         break;
                 }
             }
             break;
         }
-        case GI_VB_PLAY_ONEPOINT_ACTOR_CS: {
+        case VB_PLAY_ONEPOINT_ACTOR_CS: {
             if (CVarGetInteger("gTimeSavers.SkipCutscene.OnePoint", IS_RANDO)) {
                 Actor* actor = static_cast<Actor*>(opt);
 
@@ -398,23 +398,23 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
                         break;
                 }
                 if (*should) {
-                    SPDLOG_INFO("GI_VB_PLAY_ONEPOINT_ACTOR_CS ID:{} Cat:{}", actor->id, actor->category);
+                    SPDLOG_INFO("VB_PLAY_ONEPOINT_ACTOR_CS ID:{} Cat:{}", actor->id, actor->category);
                 }
             }
             break;
         }
-        case GI_VB_SHOW_TITLE_CARD:
+        case VB_SHOW_TITLE_CARD:
             if (CVarGetInteger("gTimeSavers.DisableTitleCard", IS_RANDO)) {
                 *should = false;
             }
             break;
-        case GI_VB_WONDER_TALK: {
+        case VB_WONDER_TALK: {
             if (CVarGetInteger("gTimeSavers.NoForcedDialog", IS_RANDO)) {
                 *should = false;
             }
             break;
         }
-        case GI_VB_NAVI_TALK: {
+        case VB_NAVI_TALK: {
             if (CVarGetInteger("gTimeSavers.NoForcedDialog", IS_RANDO)) {
                 ElfMsg* naviTalk = static_cast<ElfMsg*>(opt);
                 Flags_SetSwitch(gPlayState, (naviTalk->actor.params >> 8) & 0x3F);
@@ -423,13 +423,13 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             }
             break;
         }
-        case GI_VB_NOT_BE_GREETED_BY_SARIA:
+        case VB_NOT_BE_GREETED_BY_SARIA:
             if (CVarGetInteger("gTimeSavers.SkipCutscene.Entrances", IS_RANDO) && !Flags_GetInfTable(INFTABLE_GREETED_BY_SARIA)) {
                 Flags_SetInfTable(INFTABLE_GREETED_BY_SARIA);
                 *should = true;
             }
             break;
-        case GI_VB_MOVE_MIDO_IN_KOKIRI_FOREST:
+        case VB_MOVE_MIDO_IN_KOKIRI_FOREST:
             if (
                 CVarGetInteger("gTimeSavers.SkipMiscInteractions", IS_RANDO) &&
                 !Flags_GetEventChkInf(EVENTCHKINF_SHOWED_MIDO_SWORD_SHIELD) &&
@@ -440,7 +440,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
                 *should = true;
             }
             break;
-        case GI_VB_PLAY_DEKU_TREE_INTRO_CS: {
+        case VB_PLAY_DEKU_TREE_INTRO_CS: {
             if (CVarGetInteger("gTimeSavers.SkipCutscene.Story", IS_RANDO)) {
                 BgTreemouth* treeMouth = static_cast<BgTreemouth*>(opt);
                 Flags_SetEventChkInf(EVENTCHKINF_DEKU_TREE_OPENED_MOUTH);
@@ -450,7 +450,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             }
             break;
         }
-        case GI_VB_DEKU_JR_CONSIDER_FOREST_TEMPLE_FINISHED: {
+        case VB_DEKU_JR_CONSIDER_FOREST_TEMPLE_FINISHED: {
             // We're overriding this so that the Deku JR doesn't despawn after skipping the forest temple blue warp cutscene.
             // It typically relies on the forest medallion being obtained, but that isn't given yet until after scene init
             if (CVarGetInteger("gTimeSavers.SkipCutscene.Story", IS_RANDO)) {
@@ -458,21 +458,21 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             }
             break;
         }
-        case GI_VB_GIVE_ITEM_FROM_BLUE_WARP:
-        case GI_VB_PLAY_SHIEK_BLOCK_MASTER_SWORD_CS:
-        case GI_VB_GIVE_ITEM_FAIRY_OCARINA:
-        case GI_VB_GIVE_ITEM_LIGHT_ARROW:
+        case VB_GIVE_ITEM_FROM_BLUE_WARP:
+        case VB_PLAY_SHIEK_BLOCK_MASTER_SWORD_CS:
+        case VB_GIVE_ITEM_FAIRY_OCARINA:
+        case VB_GIVE_ITEM_LIGHT_ARROW:
             if (CVarGetInteger("gTimeSavers.SkipCutscene.Story", IS_RANDO)) {
                 *should = false;
             }
             break;
-        case GI_VB_PLAY_NABOORU_CAPTURED_CS:
+        case VB_PLAY_NABOORU_CAPTURED_CS:
             if (*should == true && CVarGetInteger("gTimeSavers.SkipCutscene.Story", IS_RANDO)) {
                 Flags_SetEventChkInf(EVENTCHKINF_NABOORU_CAPTURED_BY_TWINROVA);
                 *should = false;
             }
             break;
-        case GI_VB_PLAY_PULL_MASTER_SWORD_CS:
+        case VB_PLAY_PULL_MASTER_SWORD_CS:
             if (CVarGetInteger("gTimeSavers.SkipCutscene.Story", IS_RANDO)) {
                 if (!Flags_GetEventChkInf(EVENTCHKINF_PULLED_MASTER_SWORD_FROM_PEDESTAL)) {
                     // Normally, these would be done in the cutscene, but we're skipping it
@@ -480,14 +480,14 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
                     Flags_SetEventChkInf(EVENTCHKINF_ENTERED_MASTER_SWORD_CHAMBER);
                     Flags_SetEventChkInf(EVENTCHKINF_SHEIK_SPAWNED_AT_MASTER_SWORD_PEDESTAL);
                     Flags_SetEventChkInf(EVENTCHKINF_TIME_TRAVELED_TO_ADULT);
-                    if (GameInteractor_Should(GI_VB_GIVE_ITEM_LIGHT_MEDALLION, true, NULL)) {
+                    if (GameInteractor_Should(VB_GIVE_ITEM_LIGHT_MEDALLION, true, NULL)) {
                         Item_Give(gPlayState, ITEM_MEDALLION_LIGHT);
                     }
                 }
                 *should = false;
             }
             break;
-        case GI_VB_OWL_INTERACTION: {
+        case VB_OWL_INTERACTION: {
             if (CVarGetInteger("gTimeSavers.SkipOwlInteractions", IS_RANDO) && *should) {
                 EnOwl* enOwl = static_cast<EnOwl*>(opt);
                 s32 owlType = (enOwl->actor.params & 0xFC0) >> 6;
@@ -501,7 +501,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             }
             break;
         }
-        case GI_VB_OVERRIDE_LINK_THE_GORON_DIALOGUE: {
+        case VB_OVERRIDE_LINK_THE_GORON_DIALOGUE: {
             if (CVarGetInteger("gTimeSavers.SkipMiscInteractions", IS_RANDO)) {
                 u16* textId = static_cast<u16*>(opt);
                 // If the doors are not open yet, prioritize opening them
@@ -512,15 +512,15 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             }
             break;
         }
-        case GI_VB_PLAY_EYEDROP_CREATION_ANIM:
-        case GI_VB_PLAY_EYEDROPS_CS:
-        case GI_VB_PLAY_DROP_FISH_FOR_JABU_CS:
-        case GI_VB_PLAY_DARUNIAS_JOY_CS:
+        case VB_PLAY_EYEDROP_CREATION_ANIM:
+        case VB_PLAY_EYEDROPS_CS:
+        case VB_PLAY_DROP_FISH_FOR_JABU_CS:
+        case VB_PLAY_DARUNIAS_JOY_CS:
             if (CVarGetInteger("gTimeSavers.SkipMiscInteractions", IS_RANDO)) {
                 *should = false;
             }
             break;
-        case GI_VB_PLAY_ZELDAS_LULLABY_CS: {
+        case VB_PLAY_ZELDAS_LULLABY_CS: {
             if (CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", IS_RANDO) || IS_RANDO) {
                 DemoIm* demoIm = static_cast<DemoIm*>(opt);
                 Player* player = GET_PLAYER(gPlayState);
@@ -570,7 +570,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             }
             break;
         }
-        case GI_VB_PLAY_SARIAS_SONG_CS: {
+        case VB_PLAY_SARIAS_SONG_CS: {
             if (CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", IS_RANDO) || IS_RANDO) {
                 EnSa* enSa = static_cast<EnSa*>(opt);
                 enSa->actionFunc = func_80AF6B20;
@@ -578,13 +578,13 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             }
             break;
         }
-        case GI_VB_DESPAWN_HORSE_RACE_COW: {
+        case VB_DESPAWN_HORSE_RACE_COW: {
             if (Flags_GetEventChkInf(EVENTCHKINF_WON_COW_IN_MALONS_RACE) && CVarGetInteger("gCowOfTime", 0)) {
                 *should = false;
             }
             break;
         }
-        case GI_VB_PLAY_DRAIN_WELL_CS: {
+        case VB_PLAY_DRAIN_WELL_CS: {
             if (CVarGetInteger("gTimeSavers.SkipCutscene.Story", IS_RANDO)) {
                 *should = false;
                 Flags_SetSwitch(gPlayState, 0x2);
@@ -593,7 +593,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             }
             break;
         }
-        case GI_VB_PLAY_SUNS_SONG_CS:
+        case VB_PLAY_SUNS_SONG_CS:
             if (CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", IS_RANDO) || IS_RANDO) {
                 *should = false;
                 Flags_SetEventChkInf(EVENTCHKINF_LEARNED_SUNS_SONG);
@@ -602,19 +602,19 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
                 // When it's 0x8000, it's changed to 0xC090
             }
             break;
-        case GI_VB_PLAY_ROYAL_FAMILY_TOMB_CS: {
+        case VB_PLAY_ROYAL_FAMILY_TOMB_CS: {
             if (CVarGetInteger("gTimeSavers.SkipMiscInteractions", IS_RANDO)) {
                 *should = false;
             }
             break;
         }
-        case GI_VB_PLAY_ROYAL_FAMILY_TOMB_EXPLODE: {
+        case VB_PLAY_ROYAL_FAMILY_TOMB_EXPLODE: {
             if (CVarGetInteger("gTimeSavers.SkipMiscInteractions", IS_RANDO)) {
                 *should = Flags_GetEventChkInf(EVENTCHKINF_DESTROYED_ROYAL_FAMILY_TOMB);
             }
             break;
         }
-        case GI_VB_PLAY_DOOR_OF_TIME_CS: {
+        case VB_PLAY_DOOR_OF_TIME_CS: {
             if (CVarGetInteger("gTimeSavers.SkipMiscInteractions", IS_RANDO)) {
                 *should = false;
                 Flags_SetEnv(gPlayState, 2);
@@ -622,59 +622,59 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             }
             break;
         }
-        case GI_VB_GIVE_ITEM_MINUET_OF_FOREST:
-        case GI_VB_GIVE_ITEM_BOLERO_OF_FIRE:
-        case GI_VB_GIVE_ITEM_SERENADE_OF_WATER:
-        case GI_VB_GIVE_ITEM_REQUIEM_OF_SPIRIT:
-        case GI_VB_GIVE_ITEM_NOCTURNE_OF_SHADOW:
-        case GI_VB_GIVE_ITEM_PRELUDE_OF_LIGHT:
-        case GI_VB_GIVE_ITEM_ZELDAS_LULLABY:
-        case GI_VB_GIVE_ITEM_EPONAS_SONG:
-        case GI_VB_GIVE_ITEM_SARIAS_SONG:
-        case GI_VB_GIVE_ITEM_SUNS_SONG:
-        case GI_VB_GIVE_ITEM_SONG_OF_TIME:
-        case GI_VB_GIVE_ITEM_SONG_OF_STORMS:
-        case GI_VB_PLAY_MINUET_OF_FOREST_CS:
-        case GI_VB_PLAY_BOLERO_OF_FIRE_CS:
-        case GI_VB_PLAY_SERENADE_OF_WATER_CS:
-        case GI_VB_PLAY_PRELUDE_OF_LIGHT_CS:
+        case VB_GIVE_ITEM_MINUET_OF_FOREST:
+        case VB_GIVE_ITEM_BOLERO_OF_FIRE:
+        case VB_GIVE_ITEM_SERENADE_OF_WATER:
+        case VB_GIVE_ITEM_REQUIEM_OF_SPIRIT:
+        case VB_GIVE_ITEM_NOCTURNE_OF_SHADOW:
+        case VB_GIVE_ITEM_PRELUDE_OF_LIGHT:
+        case VB_GIVE_ITEM_ZELDAS_LULLABY:
+        case VB_GIVE_ITEM_EPONAS_SONG:
+        case VB_GIVE_ITEM_SARIAS_SONG:
+        case VB_GIVE_ITEM_SUNS_SONG:
+        case VB_GIVE_ITEM_SONG_OF_TIME:
+        case VB_GIVE_ITEM_SONG_OF_STORMS:
+        case VB_PLAY_MINUET_OF_FOREST_CS:
+        case VB_PLAY_BOLERO_OF_FIRE_CS:
+        case VB_PLAY_SERENADE_OF_WATER_CS:
+        case VB_PLAY_PRELUDE_OF_LIGHT_CS:
             if (CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", IS_RANDO) || IS_RANDO) {
                 *should = false;
             }
             break;
-        case GI_VB_DAMPE_IN_GRAVEYARD_DESPAWN:
+        case VB_DAMPE_IN_GRAVEYARD_DESPAWN:
             if (CVarGetInteger("gDampeAllNight", 0)) {
                 *should = LINK_IS_ADULT || gPlayState->sceneNum != SCENE_GRAVEYARD;
             }
             break;
-        case GI_VB_BE_VALID_GRAVEDIGGING_SPOT:
+        case VB_BE_VALID_GRAVEDIGGING_SPOT:
             if (CVarGetInteger("gDampeWin", 0)) {
                 EnTk *enTk = static_cast<EnTk*>(opt);
                 enTk->validDigHere = true;
                 *should = true;
             }
             break;
-        case GI_VB_BE_DAMPE_GRAVEDIGGING_GRAND_PRIZE:
+        case VB_BE_DAMPE_GRAVEDIGGING_GRAND_PRIZE:
             if (CVarGetInteger("gDampeWin", 0)) {
                 EnTk *enTk = static_cast<EnTk*>(opt);
                 enTk->currentReward = 3;
                 *should = true;
             }
             break;
-        case GI_VB_DAMPE_GRAVEDIGGING_GRAND_PRIZE_BE_HEART_PIECE:
+        case VB_DAMPE_GRAVEDIGGING_GRAND_PRIZE_BE_HEART_PIECE:
             if (CVarGetInteger("gGravediggingTourFix", 0) || IS_RANDO) {
                 *should = !Flags_GetCollectible(gPlayState, COLLECTFLAG_GRAVEDIGGING_HEART_PIECE);
             }
             break;
-        case GI_VB_FIX_SAW_SOFTLOCK:
+        case VB_FIX_SAW_SOFTLOCK:
             // Animation Count should be no more than 1 to guarantee putaway is complete after giving the saw
             // As this is vanilla behavior, it only applies with the Fix toggle or Skip Text enabled.
             *should = (CVarGetInteger("gFixSawSoftlock", 0) != 0 || CVarGetInteger("gSkipText", 0) != 0) ? gPlayState->animationCtx.animationCount > 1 : *should;
             break;
-        case GI_VB_BIGGORON_CONSIDER_SWORD_FORGED:
+        case VB_BIGGORON_CONSIDER_SWORD_FORGED:
             *should = Environment_GetBgsDayCount() >= CVarGetInteger("gForgeTime", 3);
             break;
-        case GI_VB_BE_ELIGIBLE_FOR_GREAT_FAIRY_REWARD: {
+        case VB_BE_ELIGIBLE_FOR_GREAT_FAIRY_REWARD: {
             BgDyYoseizo* bgDyYoseizo = static_cast<BgDyYoseizo*>(opt);
             RandomizerInf flag = RAND_INF_MAX;
 
@@ -715,14 +715,14 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
 
             break;
         }
-        case GI_VB_PLAY_RAINBOW_BRIDGE_CS: {
+        case VB_PLAY_RAINBOW_BRIDGE_CS: {
             if (CVarGetInteger("gTimeSavers.SkipCutscene.Story", IS_RANDO)) {
                 *should = false;
                 func_800F595C(NA_BGM_BRIDGE_TO_GANONS);
             }
             break;
         }
-        case GI_VB_PHANTOM_GANON_DEATH_SCENE: {
+        case VB_PHANTOM_GANON_DEATH_SCENE: {
             if (CVarGetInteger("gTimeSavers.SkipCutscene.QuickBossDeaths", IS_RANDO || IS_BOSS_RUSH)) {
                 *should = false;
                 BossGanondrof* pg = static_cast<BossGanondrof*>(opt);
@@ -747,7 +747,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             }
             break;
         }
-        case GI_VB_NABOORU_KNUCKLE_DEATH_SCENE: {
+        case VB_NABOORU_KNUCKLE_DEATH_SCENE: {
             EnIk* ik = static_cast<EnIk*>(opt);
             if (CVarGetInteger("gTimeSavers.SkipCutscene.QuickBossDeaths", IS_RANDO)) {
                 // Because no CS in rando, we hide the death of the knuckle by spawning flames and kill the actor
@@ -964,7 +964,7 @@ void TimeSaverOnSceneInitHandler(int16_t sceneNum) {
             }
             break;
         case SCENE_LON_LON_RANCH:
-            if (CVarGetInteger("gTimeSavers.SkipMiscInteractions", IS_RANDO) && GameInteractor_Should(GI_VB_MALON_RETURN_FROM_CASTLE, Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE), NULL)) {
+            if (CVarGetInteger("gTimeSavers.SkipMiscInteractions", IS_RANDO) && GameInteractor_Should(VB_MALON_RETURN_FROM_CASTLE, Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE), NULL)) {
                 Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_CHILD_MALON_AT_RANCH);
                 Flags_SetInfTable(INFTABLE_CHILD_MALON_SAID_EPONA_WAS_AFRAID_OF_YOU);
                 Flags_SetEventChkInf(EVENTCHKINF_INVITED_TO_SING_WITH_CHILD_MALON);
diff --git a/soh/src/code/z_demo.c b/soh/src/code/z_demo.c
index 94b04580f..51d0053e1 100644
--- a/soh/src/code/z_demo.c
+++ b/soh/src/code/z_demo.c
@@ -497,11 +497,11 @@ void Cutscene_Command_Terminator(PlayState* play, CutsceneContext* csCtx, CsCmdB
 
     bool shouldSkipCommand = false;
 
-    if (cmd->base == 8 && !GameInteractor_Should(GI_VB_PLAY_PULL_MASTER_SWORD_CS, true, NULL)) {
+    if (cmd->base == 8 && !GameInteractor_Should(VB_PLAY_PULL_MASTER_SWORD_CS, true, NULL)) {
         shouldSkipCommand = true;
     }
 
-    if (cmd->base == 24 && !GameInteractor_Should(GI_VB_PLAY_DROP_FISH_FOR_JABU_CS, true, NULL)) {
+    if (cmd->base == 24 && !GameInteractor_Should(VB_PLAY_DROP_FISH_FOR_JABU_CS, true, NULL)) {
         shouldSkipCommand = true;
     }
 
@@ -631,7 +631,7 @@ void Cutscene_Command_Terminator(PlayState* play, CutsceneContext* csCtx, CsCmdB
                     gSaveContext.fw.set = 0;
                     gSaveContext.respawn[RESPAWN_MODE_TOP].data = 0;
                 }
-                if (GameInteractor_Should(GI_VB_PLAY_PULL_MASTER_SWORD_CS, !Flags_GetEventChkInf(EVENTCHKINF_PULLED_MASTER_SWORD_FROM_PEDESTAL), NULL)) {
+                if (GameInteractor_Should(VB_PLAY_PULL_MASTER_SWORD_CS, !Flags_GetEventChkInf(EVENTCHKINF_PULLED_MASTER_SWORD_FROM_PEDESTAL), NULL)) {
                     Flags_SetEventChkInf(EVENTCHKINF_PULLED_MASTER_SWORD_FROM_PEDESTAL);
                     play->nextEntranceIndex = ENTR_CUTSCENE_MAP_0;
                     play->transitionTrigger = TRANS_TRIGGER_START;
@@ -723,7 +723,7 @@ void Cutscene_Command_Terminator(PlayState* play, CutsceneContext* csCtx, CsCmdB
                 play->transitionType = TRANS_TYPE_FADE_WHITE;
                 break;
             case 22:
-                if (GameInteractor_Should(GI_VB_GIVE_ITEM_REQUIEM_OF_SPIRIT, true, NULL)) {
+                if (GameInteractor_Should(VB_GIVE_ITEM_REQUIEM_OF_SPIRIT, true, NULL)) {
                     Item_Give(play, ITEM_SONG_REQUIEM);
                 }
                 play->nextEntranceIndex = ENTR_DESERT_COLOSSUS_0;
@@ -777,7 +777,7 @@ void Cutscene_Command_Terminator(PlayState* play, CutsceneContext* csCtx, CsCmdB
                 play->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
                 play->transitionType = TRANS_TYPE_FADE_WHITE;
-                if (GameInteractor_Should(GI_VB_GIVE_ITEM_FIRE_MEDALLION, true, NULL)) {
+                if (GameInteractor_Should(VB_GIVE_ITEM_FIRE_MEDALLION, true, NULL)) {
                     Item_Give(play, ITEM_MEDALLION_FIRE);
                 }
                 gSaveContext.chamberCutsceneNum = 1;
@@ -859,7 +859,7 @@ void Cutscene_Command_Terminator(PlayState* play, CutsceneContext* csCtx, CsCmdB
                 play->transitionType = TRANS_TYPE_FADE_BLACK_FAST;
                 break;
             case 47:
-                if (GameInteractor_Should(GI_VB_GIVE_ITEM_NOCTURNE_OF_SHADOW, true, NULL)) {
+                if (GameInteractor_Should(VB_GIVE_ITEM_NOCTURNE_OF_SHADOW, true, NULL)) {
                     Item_Give(play, ITEM_SONG_NOCTURNE);
                 }
                 Flags_SetEventChkInf(EVENTCHKINF_LEARNED_NOCTURNE_OF_SHADOW);
@@ -2183,7 +2183,7 @@ void Cutscene_HandleEntranceTriggers(PlayState* play) {
             (gSaveContext.cutsceneIndex < 0xFFF0) && ((u8)gSaveContext.linkAge == requiredAge) &&
             (gSaveContext.respawnFlag <= 0)) {
             Flags_SetEventChkInf(entranceCutscene->flag);
-            if (GameInteractor_Should(GI_VB_PLAY_ENTRANCE_CS, true, &entranceCutscene->flag)) {
+            if (GameInteractor_Should(VB_PLAY_ENTRANCE_CS, true, &entranceCutscene->flag)) {
                 Cutscene_SetSegment(play, entranceCutscene->segAddr);
                 gSaveContext.cutsceneTrigger = 2;
                 gSaveContext.showTitleCard = false;
@@ -2197,7 +2197,7 @@ void Cutscene_HandleConditionalTriggers(PlayState* play) {
     osSyncPrintf("\ngame_info.mode=[%d] restart_flag", ((void)0, gSaveContext.respawnFlag));
     LUSLOG_INFO("Cutscene_HandleConditionalTriggers - entranceIndex: %#x cutsceneIndex: %#x", gSaveContext.entranceIndex, gSaveContext.cutsceneIndex);
 
-    if (!GameInteractor_Should(GI_VB_PLAY_TRANSITION_CS, true, NULL)) {
+    if (!GameInteractor_Should(VB_PLAY_TRANSITION_CS, true, NULL)) {
         return;
     }
 
@@ -2206,7 +2206,7 @@ void Cutscene_HandleConditionalTriggers(PlayState* play) {
             Flags_SetEventChkInf(EVENTCHKINF_LEARNED_REQUIEM_OF_SPIRIT);
             gSaveContext.entranceIndex = ENTR_DESERT_COLOSSUS_0;
             gSaveContext.cutsceneIndex = 0xFFF0;
-        } else if (GameInteractor_Should(GI_VB_BE_ELIGIBLE_FOR_NOCTURNE_OF_SHADOW, (
+        } else if (GameInteractor_Should(VB_BE_ELIGIBLE_FOR_NOCTURNE_OF_SHADOW, (
             (gSaveContext.entranceIndex == ENTR_KAKARIKO_VILLAGE_0) && 
             LINK_IS_ADULT &&
             Flags_GetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP) && 
@@ -2218,12 +2218,12 @@ void Cutscene_HandleConditionalTriggers(PlayState* play) {
             gSaveContext.cutsceneIndex = 0xFFF0;
         } else if ((gSaveContext.entranceIndex == ENTR_LOST_WOODS_9) && !Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_SARIA_ON_BRIDGE)) {
             Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_SARIA_ON_BRIDGE);
-            if (GameInteractor_Should(GI_VB_GIVE_ITEM_FAIRY_OCARINA, true, NULL)) {
+            if (GameInteractor_Should(VB_GIVE_ITEM_FAIRY_OCARINA, true, NULL)) {
                 Item_Give(play, ITEM_OCARINA_FAIRY);
             }
             gSaveContext.entranceIndex = ENTR_LOST_WOODS_0;
             gSaveContext.cutsceneIndex = 0xFFF0;
-        } else if (GameInteractor_Should(GI_VB_BE_ELIGIBLE_FOR_LIGHT_ARROWS, (
+        } else if (GameInteractor_Should(VB_BE_ELIGIBLE_FOR_LIGHT_ARROWS, (
             CHECK_QUEST_ITEM(QUEST_MEDALLION_SPIRIT) && 
             CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW) &&
             LINK_IS_ADULT &&
diff --git a/soh/src/code/z_en_item00.c b/soh/src/code/z_en_item00.c
index 873a91ec9..e6a3fd756 100644
--- a/soh/src/code/z_en_item00.c
+++ b/soh/src/code/z_en_item00.c
@@ -360,7 +360,7 @@ void EnItem00_Init(Actor* thisx, PlayState* play) {
 
     this->actor.params &= 0xFF;
 
-    if (GameInteractor_Should(GI_VB_ITEM00_DESPAWN, Flags_GetCollectible(play, this->collectibleFlag), this)) {
+    if (GameInteractor_Should(VB_ITEM00_DESPAWN, Flags_GetCollectible(play, this->collectibleFlag), this)) {
         Actor_Kill(&this->actor);
         return;
     }
@@ -512,7 +512,7 @@ void EnItem00_Init(Actor* thisx, PlayState* play) {
     this->actor.velocity.y = 0.0f;
     this->actor.gravity = 0.0f;
 
-    if (!GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_ITEM_00, true, this)) {
+    if (!GameInteractor_Should(VB_GIVE_ITEM_FROM_ITEM_00, true, this)) {
         return;
     }
 
@@ -866,7 +866,7 @@ void EnItem00_Update(Actor* thisx, PlayState* play) {
         return;
     }
 
-    if (!GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_ITEM_00, true, this)) {
+    if (!GameInteractor_Should(VB_GIVE_ITEM_FROM_ITEM_00, true, this)) {
         return;
     }
 
diff --git a/soh/src/code/z_message_PAL.c b/soh/src/code/z_message_PAL.c
index a025a2c0d..015d7c4b0 100644
--- a/soh/src/code/z_message_PAL.c
+++ b/soh/src/code/z_message_PAL.c
@@ -2610,18 +2610,18 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
                     u8 songItemId = ITEM_SONG_MINUET + gOcarinaSongItemMap[msgCtx->ocarinaStaff->state];
 
                     if (
-                        (songItemId == ITEM_SONG_MINUET && GameInteractor_Should(GI_VB_GIVE_ITEM_MINUET_OF_FOREST, true, NULL)) ||
-                        (songItemId == ITEM_SONG_BOLERO && GameInteractor_Should(GI_VB_GIVE_ITEM_BOLERO_OF_FIRE, true, NULL)) ||
-                        (songItemId == ITEM_SONG_SERENADE && GameInteractor_Should(GI_VB_GIVE_ITEM_SERENADE_OF_WATER, true, NULL)) ||
-                        (songItemId == ITEM_SONG_REQUIEM && GameInteractor_Should(GI_VB_GIVE_ITEM_REQUIEM_OF_SPIRIT, true, NULL)) ||
-                        (songItemId == ITEM_SONG_NOCTURNE && GameInteractor_Should(GI_VB_GIVE_ITEM_NOCTURNE_OF_SHADOW, true, NULL)) ||
-                        (songItemId == ITEM_SONG_PRELUDE && GameInteractor_Should(GI_VB_GIVE_ITEM_PRELUDE_OF_LIGHT, true, NULL)) ||
-                        (songItemId == ITEM_SONG_LULLABY && GameInteractor_Should(GI_VB_GIVE_ITEM_ZELDAS_LULLABY, true, NULL)) ||
-                        (songItemId == ITEM_SONG_EPONA && GameInteractor_Should(GI_VB_GIVE_ITEM_EPONAS_SONG, true, NULL)) ||
-                        (songItemId == ITEM_SONG_SARIA && GameInteractor_Should(GI_VB_GIVE_ITEM_SARIAS_SONG, true, NULL)) ||
-                        (songItemId == ITEM_SONG_SUN && GameInteractor_Should(GI_VB_GIVE_ITEM_SUNS_SONG, true, NULL)) ||
-                        (songItemId == ITEM_SONG_TIME && GameInteractor_Should(GI_VB_GIVE_ITEM_SONG_OF_TIME, true, NULL)) ||
-                        (songItemId == ITEM_SONG_STORMS && GameInteractor_Should(GI_VB_GIVE_ITEM_SONG_OF_STORMS, true, NULL))
+                        (songItemId == ITEM_SONG_MINUET && GameInteractor_Should(VB_GIVE_ITEM_MINUET_OF_FOREST, true, NULL)) ||
+                        (songItemId == ITEM_SONG_BOLERO && GameInteractor_Should(VB_GIVE_ITEM_BOLERO_OF_FIRE, true, NULL)) ||
+                        (songItemId == ITEM_SONG_SERENADE && GameInteractor_Should(VB_GIVE_ITEM_SERENADE_OF_WATER, true, NULL)) ||
+                        (songItemId == ITEM_SONG_REQUIEM && GameInteractor_Should(VB_GIVE_ITEM_REQUIEM_OF_SPIRIT, true, NULL)) ||
+                        (songItemId == ITEM_SONG_NOCTURNE && GameInteractor_Should(VB_GIVE_ITEM_NOCTURNE_OF_SHADOW, true, NULL)) ||
+                        (songItemId == ITEM_SONG_PRELUDE && GameInteractor_Should(VB_GIVE_ITEM_PRELUDE_OF_LIGHT, true, NULL)) ||
+                        (songItemId == ITEM_SONG_LULLABY && GameInteractor_Should(VB_GIVE_ITEM_ZELDAS_LULLABY, true, NULL)) ||
+                        (songItemId == ITEM_SONG_EPONA && GameInteractor_Should(VB_GIVE_ITEM_EPONAS_SONG, true, NULL)) ||
+                        (songItemId == ITEM_SONG_SARIA && GameInteractor_Should(VB_GIVE_ITEM_SARIAS_SONG, true, NULL)) ||
+                        (songItemId == ITEM_SONG_SUN && GameInteractor_Should(VB_GIVE_ITEM_SUNS_SONG, true, NULL)) ||
+                        (songItemId == ITEM_SONG_TIME && GameInteractor_Should(VB_GIVE_ITEM_SONG_OF_TIME, true, NULL)) ||
+                        (songItemId == ITEM_SONG_STORMS && GameInteractor_Should(VB_GIVE_ITEM_SONG_OF_STORMS, true, NULL))
                     ) {
                         Item_Give(play, songItemId);
                     }
diff --git a/soh/src/code/z_onepointdemo.c b/soh/src/code/z_onepointdemo.c
index 24a8820af..95030baf6 100644
--- a/soh/src/code/z_onepointdemo.c
+++ b/soh/src/code/z_onepointdemo.c
@@ -1173,11 +1173,11 @@ s16 OnePointCutscene_Init(PlayState* play, s16 csId, s16 timer, Actor* actor, s1
     Camera* csCam;
 
     if (actor != NULL && actor->id != ACTOR_PLAYER) {
-        if (!GameInteractor_Should(GI_VB_PLAY_ONEPOINT_ACTOR_CS, true, actor)) {
+        if (!GameInteractor_Should(VB_PLAY_ONEPOINT_ACTOR_CS, true, actor)) {
             return SUBCAM_NONE;
         }
     } else {
-        if (!GameInteractor_Should(GI_VB_PLAY_ONEPOINT_CS, true, &csId)) {
+        if (!GameInteractor_Should(VB_PLAY_ONEPOINT_CS, true, &csId)) {
             return SUBCAM_NONE;
         }
     }
diff --git a/soh/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c b/soh/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c
index e05c171f0..7e0781067 100644
--- a/soh/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c
+++ b/soh/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c
@@ -225,7 +225,7 @@ void func_8086D4B4(BgBdanSwitch* this, PlayState* play) {
     if (!Flags_GetSwitch(play, (this->dyna.actor.params >> 8) & 0x3F)) {
         type = this->dyna.actor.params & 0xFF;
         Flags_SetSwitch(play, (this->dyna.actor.params >> 8) & 0x3F);
-        if (GameInteractor_Should(GI_VB_PLAY_ONEPOINT_ACTOR_CS, true, this)) {
+        if (GameInteractor_Should(VB_PLAY_ONEPOINT_ACTOR_CS, true, this)) {
             if (type == BLUE || type == YELLOW_TALL_2) {
                 OnePointCutscene_AttentionSetSfx(play, &this->dyna.actor, NA_SE_SY_TRE_BOX_APPEAR);
             } else {
@@ -239,7 +239,7 @@ void func_8086D548(BgBdanSwitch* this, PlayState* play) {
     if (Flags_GetSwitch(play, (this->dyna.actor.params >> 8) & 0x3F)) {
         Flags_UnsetSwitch(play, (this->dyna.actor.params >> 8) & 0x3F);
         if ((this->dyna.actor.params & 0xFF) == YELLOW_TALL_2) {
-            if (GameInteractor_Should(GI_VB_PLAY_ONEPOINT_ACTOR_CS, true, this)) {
+            if (GameInteractor_Should(VB_PLAY_ONEPOINT_ACTOR_CS, true, this)) {
                 OnePointCutscene_AttentionSetSfx(play, &this->dyna.actor, NA_SE_SY_TRE_BOX_APPEAR);
             }
         }
diff --git a/soh/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c b/soh/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c
index 8b901339f..3e7f60da9 100644
--- a/soh/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c
+++ b/soh/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c
@@ -302,7 +302,7 @@ void BgBreakwall_Wait(BgBreakwall* this, PlayState* play) {
         if ((wallType == BWALL_DC_ENTRANCE) && (!Flags_GetEventChkInf(EVENTCHKINF_ENTERED_DODONGOS_CAVERN))) {
             Flags_SetEventChkInf(EVENTCHKINF_ENTERED_DODONGOS_CAVERN);
             s32 flag = EVENTCHKINF_ENTERED_DODONGOS_CAVERN;
-            if (GameInteractor_Should(GI_VB_PLAY_ENTRANCE_CS, true, &flag)) {
+            if (GameInteractor_Should(VB_PLAY_ENTRANCE_CS, true, &flag)) {
                 Cutscene_SetSegment(play, gDcOpeningCs);
                 gSaveContext.cutsceneTrigger = 1;
                 Player_SetCsActionWithHaltedActors(play, NULL, 0x31);
diff --git a/soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c b/soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
index 8e2139aed..799a46c62 100644
--- a/soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
+++ b/soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
@@ -198,7 +198,7 @@ void BgDyYoseizo_CheckMagicAcquired(BgDyYoseizo* this, PlayState* play) {
             }
         }
 
-        if (!GameInteractor_Should(GI_VB_BE_ELIGIBLE_FOR_GREAT_FAIRY_REWARD, isEligible, this)) {
+        if (!GameInteractor_Should(VB_BE_ELIGIBLE_FOR_GREAT_FAIRY_REWARD, isEligible, this)) {
             Actor_Kill(&this->actor);
             return;
         }
diff --git a/soh/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c b/soh/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c
index 543770505..afbe34053 100644
--- a/soh/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c
+++ b/soh/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c
@@ -70,7 +70,7 @@ void func_808787A4(BgGjyoBridge* this, PlayState* play) {
 }
 
 void LaunchBridgeCutscene(BgGjyoBridge* this, PlayState* play) {
-    if (GameInteractor_Should(GI_VB_PLAY_RAINBOW_BRIDGE_CS, true, NULL)) {
+    if (GameInteractor_Should(VB_PLAY_RAINBOW_BRIDGE_CS, true, NULL)) {
         play->csCtx.segment = SEGMENTED_TO_VIRTUAL(gRainbowBridgeCs);
         gSaveContext.cutsceneTrigger = 1;
     }
@@ -92,7 +92,7 @@ void BgGjyoBridge_TriggerCutscene(BgGjyoBridge* this, PlayState* play) {
         (INV_CONTENT(ITEM_ARROW_LIGHT) == ITEM_ARROW_LIGHT) &&
         CheckPlayerPosition(player, play);
 
-    if (GameInteractor_Should(GI_VB_BE_ELIGIBLE_FOR_RAINBOW_BRIDGE, vanillaBridgeCondition, NULL)) {
+    if (GameInteractor_Should(VB_BE_ELIGIBLE_FOR_RAINBOW_BRIDGE, vanillaBridgeCondition, NULL)) {
         LaunchBridgeCutscene(this, play);
     }
 }
@@ -103,7 +103,7 @@ void BgGjyoBridge_SpawnBridge(BgGjyoBridge* this, PlayState* play) {
         (play->csCtx.npcActions[2] != NULL) &&
         (play->csCtx.npcActions[2]->action == 2);
 
-    if (!GameInteractor_Should(GI_VB_PLAY_RAINBOW_BRIDGE_CS, true, NULL) || vanillaBridgeCondition) {
+    if (!GameInteractor_Should(VB_PLAY_RAINBOW_BRIDGE_CS, true, NULL) || vanillaBridgeCondition) {
         this->dyna.actor.draw = BgGjyoBridge_Draw;
         func_8003EC50(play, &play->colCtx.dyna, this->dyna.bgId);
         Flags_SetEventChkInf(EVENTCHKINF_RAINBOW_BRIDGE_BUILT);
diff --git a/soh/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c b/soh/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c
index 51b7dc622..5088334ed 100644
--- a/soh/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c
+++ b/soh/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c
@@ -150,7 +150,7 @@ void BgMoriBigst_StalfosFight(BgMoriBigst* this, PlayState* play) {
     if ((this->dyna.actor.home.rot.z == 0) &&
         ((this->dyna.actor.home.pos.y - 5.0f) <= GET_PLAYER(play)->actor.world.pos.y)) {
         BgMoriBigst_SetupFall(this, play);
-        if (GameInteractor_Should(GI_VB_PLAY_ONEPOINT_ACTOR_CS, true, this)) {
+        if (GameInteractor_Should(VB_PLAY_ONEPOINT_ACTOR_CS, true, this)) {
             OnePointCutscene_Init(play, 3220, 72, &this->dyna.actor, MAIN_CAM);
         }
     }
@@ -166,7 +166,7 @@ void BgMoriBigst_Fall(BgMoriBigst* this, PlayState* play) {
         this->dyna.actor.world.pos.y = this->dyna.actor.home.pos.y;
         BgMoriBigst_SetupLanding(this, play);
         Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_STONE_BOUND);
-        if (GameInteractor_Should(GI_VB_PLAY_ONEPOINT_ACTOR_CS, true, this)) {
+        if (GameInteractor_Should(VB_PLAY_ONEPOINT_ACTOR_CS, true, this)) {
             OnePointCutscene_Init(play, 1020, 8, &this->dyna.actor, MAIN_CAM);
             func_8002DF38(play, NULL, 0x3C);
         }
diff --git a/soh/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c b/soh/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c
index cc7d4c854..c2e8e1123 100644
--- a/soh/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c
+++ b/soh/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c
@@ -130,7 +130,7 @@ void func_808AC908(BgSpot02Objects* this, PlayState* play) {
     static Vec3f zeroVec = { 0.0f, 0.0f, 0.0f };
     Vec3f pos;
 
-    if (GameInteractor_Should(GI_VB_PLAY_ROYAL_FAMILY_TOMB_EXPLODE, play->csCtx.state != 0 && play->csCtx.npcActions[3] != NULL && play->csCtx.npcActions[3]->action == 2, this)) {
+    if (GameInteractor_Should(VB_PLAY_ROYAL_FAMILY_TOMB_EXPLODE, play->csCtx.state != 0 && play->csCtx.npcActions[3] != NULL && play->csCtx.npcActions[3]->action == 2, this)) {
             Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_GRAVE_EXPLOSION);
             Flags_SetEventChkInf(EVENTCHKINF_DESTROYED_ROYAL_FAMILY_TOMB);
             this->timer = 25;
diff --git a/soh/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c b/soh/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c
index 6d65c049f..571123057 100644
--- a/soh/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c
+++ b/soh/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c
@@ -61,7 +61,7 @@ void BgSpot12Saku_Init(Actor* thisx, PlayState* play) {
 
     func_808B3420(this, play, &gGerudoFortressGTGShutterCol, DPM_UNK);
     Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
-    if (GameInteractor_Should(GI_VB_GTG_GATE_BE_OPEN, Flags_GetSwitch(play, this->dyna.actor.params & 0x3F), NULL)) {
+    if (GameInteractor_Should(VB_GTG_GATE_BE_OPEN, Flags_GetSwitch(play, this->dyna.actor.params & 0x3F), NULL)) {
         func_808B3714(this);
     } else {
         func_808B3550(this);
@@ -82,7 +82,7 @@ void func_808B3550(BgSpot12Saku* this) {
 }
 
 void func_808B357C(BgSpot12Saku* this, PlayState* play) {
-    if (GameInteractor_Should(GI_VB_GTG_GATE_BE_OPEN, Flags_GetSwitch(play, this->dyna.actor.params & 0x3F), NULL)) {
+    if (GameInteractor_Should(VB_GTG_GATE_BE_OPEN, Flags_GetSwitch(play, this->dyna.actor.params & 0x3F), NULL)) {
         func_808B35E4(this);
         this->timer = 20;
         OnePointCutscene_Init(play, 4170, -99, &this->dyna.actor, MAIN_CAM);
diff --git a/soh/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c b/soh/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c
index b6d5ed15a..0d1c234b5 100644
--- a/soh/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c
+++ b/soh/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c
@@ -117,7 +117,7 @@ void func_808BAF40(BgTokiSwd* this, PlayState* play) {
         Actor_IsFacingAndNearPlayer(&this->actor, 800.0f, 0x7530) && !Play_InCsMode(play)) {
         Flags_SetEventChkInf(EVENTCHKINF_ENTERED_MASTER_SWORD_CHAMBER);
         s32 flag = EVENTCHKINF_ENTERED_MASTER_SWORD_CHAMBER;
-        if (GameInteractor_Should(GI_VB_PLAY_ENTRANCE_CS, true, &flag)) {
+        if (GameInteractor_Should(VB_PLAY_ENTRANCE_CS, true, &flag)) {
             play->csCtx.segment = D_808BBD90;
             gSaveContext.cutsceneTrigger = 1;
         }
@@ -126,7 +126,7 @@ void func_808BAF40(BgTokiSwd* this, PlayState* play) {
     if (!LINK_IS_ADULT || (Flags_GetEventChkInf(EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT) && !IS_RANDO) || IS_RANDO) {
         if (Actor_HasParent(&this->actor, play)) {
             if (!LINK_IS_ADULT) {
-                 if (GameInteractor_Should(GI_VB_GIVE_ITEM_MASTER_SWORD, true, NULL)) {
+                 if (GameInteractor_Should(VB_GIVE_ITEM_MASTER_SWORD, true, NULL)) {
                     Item_Give(play, ITEM_SWORD_MASTER);
                  }
                 play->csCtx.segment = D_808BB2F0;
diff --git a/soh/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c b/soh/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c
index 04d1d6c72..4c4d828f8 100644
--- a/soh/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c
+++ b/soh/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c
@@ -154,7 +154,7 @@ void func_808BC8B8(BgTreemouth* this, PlayState* play) {
                 }
             } else if (Actor_IsFacingAndNearPlayer(&this->dyna.actor, 1658.0f, 0x4E20)) {
                 Flags_SetEventChkInf(EVENTCHKINF_MET_DEKU_TREE);
-                if (GameInteractor_Should(GI_VB_PLAY_DEKU_TREE_INTRO_CS, true, this)) {
+                if (GameInteractor_Should(VB_PLAY_DEKU_TREE_INTRO_CS, true, this)) {
                     play->csCtx.segment = D_808BCE20;
                     gSaveContext.cutsceneTrigger = 1;
                     BgTreemouth_SetupAction(this, func_808BC9EC);
diff --git a/soh/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c b/soh/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c
index 0b025dcd6..05740bff9 100644
--- a/soh/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c
+++ b/soh/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c
@@ -944,7 +944,7 @@ void BossGanondrof_Death(BossGanondrof* this, PlayState* play) {
         case DEATH_THROES:
             switch (this->work[GND_ACTION_STATE]) {
                 case DEATH_SPASM:
-                    if (GameInteractor_Should(GI_VB_PHANTOM_GANON_DEATH_SCENE, true, this)) {
+                    if (GameInteractor_Should(VB_PHANTOM_GANON_DEATH_SCENE, true, this)) {
                         if (Animation_OnFrame(&this->skelAnime, this->fwork[GND_END_FRAME])) {
                             this->fwork[GND_END_FRAME] = Animation_GetLastFrame(&gPhantomGanonAirDamageAnim);
                             Animation_Change(&this->skelAnime, &gPhantomGanonAirDamageAnim, 0.5f, 0.0f,
@@ -963,7 +963,7 @@ void BossGanondrof_Death(BossGanondrof* this, PlayState* play) {
                     bodyDecayLevel = 1;
                     break;
             }
-            if (GameInteractor_Should(GI_VB_PHANTOM_GANON_DEATH_SCENE, true, NULL)) {
+            if (GameInteractor_Should(VB_PHANTOM_GANON_DEATH_SCENE, true, NULL)) {
                 Math_ApproachS(&this->actor.shape.rot.y, this->work[GND_VARIANCE_TIMER] * -100, 5, 0xBB8);
                 Math_ApproachF(&this->cameraNextEye.z, this->targetPos.z + 60.0f, 0.02f, 0.5f);
                 Math_ApproachF(&this->actor.world.pos.y, GND_BOSSROOM_CENTER_Y + 133.0f, 0.05f, 100.0f);
diff --git a/soh/src/overlays/actors/ovl_Demo_Du/z_demo_du.c b/soh/src/overlays/actors/ovl_Demo_Du/z_demo_du.c
index cffdbea38..b0804724a 100644
--- a/soh/src/overlays/actors/ovl_Demo_Du/z_demo_du.c
+++ b/soh/src/overlays/actors/ovl_Demo_Du/z_demo_du.c
@@ -185,7 +185,7 @@ void func_80969F38(DemoDu* this, PlayState* play) {
 
     Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DEMO_EFFECT, posX, posY, posZ, 0, 0, 0,
                        DEMO_EFFECT_MEDAL_FIRE);
-    if (GameInteractor_Should(GI_VB_GIVE_ITEM_FIRE_MEDALLION, true, NULL)) {
+    if (GameInteractor_Should(VB_GIVE_ITEM_FIRE_MEDALLION, true, NULL)) {
         Item_Give(play, ITEM_MEDALLION_FIRE);
     }
 }
@@ -204,7 +204,7 @@ void DemoDu_CsFireMedallion_AdvanceTo01(DemoDu* this, PlayState* play) {
         this->updateIndex = CS_FIREMEDALLION_SUBSCENE(1);
         play->csCtx.segment = D_8096C1A4;
         gSaveContext.cutsceneTrigger = 2;
-        if (GameInteractor_Should(GI_VB_GIVE_ITEM_FIRE_MEDALLION, true, NULL)) {
+        if (GameInteractor_Should(VB_GIVE_ITEM_FIRE_MEDALLION, true, NULL)) {
             Item_Give(play, ITEM_MEDALLION_FIRE);
         }
 
diff --git a/soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.c b/soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.c
index 1df2325e8..ca8713805 100644
--- a/soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.c
+++ b/soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.c
@@ -319,7 +319,7 @@ void func_809853B4(DemoIm* this, PlayState* play) {
 
     Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DEMO_EFFECT, playerX, playerY, playerZ, 0,
                        0, 0, 0xD);
-    if (GameInteractor_Should(GI_VB_GIVE_ITEM_SHADOW_MEDALLION, true, NULL)) {
+    if (GameInteractor_Should(VB_GIVE_ITEM_SHADOW_MEDALLION, true, NULL)) {
         Item_Give(play, ITEM_MEDALLION_SHADOW);
     }
 }
@@ -337,7 +337,7 @@ void func_8098544C(DemoIm* this, PlayState* play) {
         this->action = 1;
         play->csCtx.segment = D_8098786C;
         gSaveContext.cutsceneTrigger = 2;
-        if (GameInteractor_Should(GI_VB_GIVE_ITEM_SHADOW_MEDALLION, true, NULL)) {
+        if (GameInteractor_Should(VB_GIVE_ITEM_SHADOW_MEDALLION, true, NULL)) {
             Item_Give(play, ITEM_MEDALLION_SHADOW);
         }
         player->actor.world.rot.y = player->actor.shape.rot.y = this->actor.world.rot.y + 0x8000;
@@ -910,13 +910,13 @@ void func_80986BF8(DemoIm* this, PlayState* play) {
 
 void func_80986C30(DemoIm* this, PlayState* play) {
     if (func_80986A5C(this, play)) {
-        if (GameInteractor_Should(GI_VB_PLAY_ZELDAS_LULLABY_CS, true, this)) {
+        if (GameInteractor_Should(VB_PLAY_ZELDAS_LULLABY_CS, true, this)) {
             play->csCtx.segment = SEGMENTED_TO_VIRTUAL(gZeldasCourtyardLullabyCs);
             gSaveContext.cutsceneTrigger = 1;
             func_80985F54(this);
         }
         Flags_SetEventChkInf(EVENTCHKINF_LEARNED_ZELDAS_LULLABY);
-        if (GameInteractor_Should(GI_VB_GIVE_ITEM_ZELDAS_LULLABY, true, NULL)) {
+        if (GameInteractor_Should(VB_GIVE_ITEM_ZELDAS_LULLABY, true, NULL)) {
             Item_Give(play, ITEM_SONG_LULLABY);
         }
     }
diff --git a/soh/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c b/soh/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c
index 85dcb4ebe..b0d210bbc 100644
--- a/soh/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c
+++ b/soh/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c
@@ -242,7 +242,7 @@ void func_8098E8C8(DemoSa* this, PlayState* play) {
 
     Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DEMO_EFFECT, posX, posY, posZ, 0, 0, 0,
                        0xB);
-    if (GameInteractor_Should(GI_VB_GIVE_ITEM_FOREST_MEDALLION, true, NULL)) {
+    if (GameInteractor_Should(VB_GIVE_ITEM_FOREST_MEDALLION, true, NULL)) {
         Item_Give(play, ITEM_MEDALLION_FOREST);
     }
 }
@@ -261,7 +261,7 @@ void func_8098E960(DemoSa* this, PlayState* play) {
             this->action = 1;
             play->csCtx.segment = D_8099010C;
             gSaveContext.cutsceneTrigger = 2;
-            if (GameInteractor_Should(GI_VB_GIVE_ITEM_FOREST_MEDALLION, true, NULL)) {
+            if (GameInteractor_Should(VB_GIVE_ITEM_FOREST_MEDALLION, true, NULL)) {
                 Item_Give(play, ITEM_MEDALLION_FOREST);
             }
             player->actor.world.rot.y = player->actor.shape.rot.y = this->actor.world.rot.y + 0x8000;
diff --git a/soh/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c b/soh/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
index 34c0a0f20..843e95f25 100644
--- a/soh/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
+++ b/soh/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
@@ -355,7 +355,7 @@ void func_80996A54(DoorShutter* this, PlayState* play) {
     if (Flags_GetClear(play, this->dyna.actor.room) || Flags_GetTempClear(play, this->dyna.actor.room)) {
         Flags_SetClear(play, this->dyna.actor.room);
         DoorShutter_SetupAction(this, func_80997150);
-        if (GameInteractor_Should(GI_VB_PLAY_ONEPOINT_ACTOR_CS, true, this)) {
+        if (GameInteractor_Should(VB_PLAY_ONEPOINT_ACTOR_CS, true, this)) {
             OnePointCutscene_Attention(play, &this->dyna.actor);
             OnePointCutscene_Attention(play, &GET_PLAYER(play)->actor);
             this->unk_16F = -100;
@@ -473,7 +473,7 @@ void func_80996EE8(DoorShutter* this, PlayState* play) {
     if (func_80996E08(this, play, 1.0f)) {
         if (Flags_GetSwitch(play, this->dyna.actor.params & 0x3F)) {
             DoorShutter_SetupAction(this, func_80997150);
-            if (GameInteractor_Should(GI_VB_PLAY_ONEPOINT_ACTOR_CS, true, this)) {
+            if (GameInteractor_Should(VB_PLAY_ONEPOINT_ACTOR_CS, true, this)) {
                 OnePointCutscene_Attention(play, &this->dyna.actor);
                 this->unk_16F = -100;
             }
diff --git a/soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c b/soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
index 710c138e2..ff55bf65f 100644
--- a/soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
+++ b/soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
@@ -528,9 +528,9 @@ void DoorWarp1_ChildWarpOut(DoorWarp1* this, PlayState* play) {
         osSyncPrintf("\n\n\nじかんがきたからおーしまい fade_direction=[%d]", play->transitionTrigger, TRANS_TRIGGER_START);
 
         if (play->sceneNum == SCENE_DODONGOS_CAVERN_BOSS) {
-            if (GameInteractor_Should(GI_VB_PLAY_BLUE_WARP_CS, !Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP), EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP)) {
+            if (GameInteractor_Should(VB_PLAY_BLUE_WARP_CS, !Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP), EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP)) {
                 Flags_SetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP);
-                if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_BLUE_WARP, true, ITEM_GORON_RUBY)) {
+                if (GameInteractor_Should(VB_GIVE_ITEM_FROM_BLUE_WARP, true, ITEM_GORON_RUBY)) {
                     Item_Give(play, ITEM_GORON_RUBY);
                 }
                 play->nextEntranceIndex = ENTR_DEATH_MOUNTAIN_TRAIL_0;
@@ -540,10 +540,10 @@ void DoorWarp1_ChildWarpOut(DoorWarp1* this, PlayState* play) {
                 gSaveContext.nextCutsceneIndex = 0;
             }
         } else if (play->sceneNum == SCENE_DEKU_TREE_BOSS) {
-            if (GameInteractor_Should(GI_VB_PLAY_BLUE_WARP_CS, !Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_KOKIRI_EMERALD_DEKU_TREE_DEAD), EVENTCHKINF_OBTAINED_KOKIRI_EMERALD_DEKU_TREE_DEAD)) {
+            if (GameInteractor_Should(VB_PLAY_BLUE_WARP_CS, !Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_KOKIRI_EMERALD_DEKU_TREE_DEAD), EVENTCHKINF_OBTAINED_KOKIRI_EMERALD_DEKU_TREE_DEAD)) {
                 Flags_SetEventChkInf(EVENTCHKINF_OBTAINED_KOKIRI_EMERALD_DEKU_TREE_DEAD);
                 Flags_SetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP);
-                if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_BLUE_WARP, true, ITEM_KOKIRI_EMERALD)) {
+                if (GameInteractor_Should(VB_GIVE_ITEM_FROM_BLUE_WARP, true, ITEM_KOKIRI_EMERALD)) {
                     Item_Give(play, ITEM_KOKIRI_EMERALD);
                 }
                 play->nextEntranceIndex = ENTR_KOKIRI_FOREST_0;
@@ -645,9 +645,9 @@ void DoorWarp1_RutoWarpOut(DoorWarp1* this, PlayState* play) {
     this->warpTimer++;
 
     if (this->warpTimer > sWarpTimerTarget && gSaveContext.nextCutsceneIndex == 0xFFEF) {
-        if (GameInteractor_Should(GI_VB_PLAY_BLUE_WARP_CS, true, EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
+        if (GameInteractor_Should(VB_PLAY_BLUE_WARP_CS, true, EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
             Flags_SetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP);
-            if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_BLUE_WARP, true, ITEM_ZORA_SAPPHIRE)) {
+            if (GameInteractor_Should(VB_GIVE_ITEM_FROM_BLUE_WARP, true, ITEM_ZORA_SAPPHIRE)) {
                 Item_Give(play, ITEM_ZORA_SAPPHIRE);
             }
             gSaveContext.nextCutsceneIndex = 0xFFF0;
@@ -762,9 +762,9 @@ void DoorWarp1_AdultWarpOut(DoorWarp1* this, PlayState* play) {
         if (IS_BOSS_RUSH) {
             BossRush_HandleBlueWarp(play, this->actor.world.pos.x, this->actor.world.pos.z);
         } else if (play->sceneNum == SCENE_FOREST_TEMPLE_BOSS) {
-            if (GameInteractor_Should(GI_VB_PLAY_BLUE_WARP_CS, !Flags_GetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP), EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP)) {
+            if (GameInteractor_Should(VB_PLAY_BLUE_WARP_CS, !Flags_GetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP), EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP)) {
                 Flags_SetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP);
-                if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_BLUE_WARP, true, ITEM_MEDALLION_FOREST)) {
+                if (GameInteractor_Should(VB_GIVE_ITEM_FROM_BLUE_WARP, true, ITEM_MEDALLION_FOREST)) {
                     Item_Give(play, ITEM_MEDALLION_FOREST);
                 }
                 play->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0;
@@ -779,9 +779,9 @@ void DoorWarp1_AdultWarpOut(DoorWarp1* this, PlayState* play) {
                 gSaveContext.nextCutsceneIndex = 0;
             }
         } else if (play->sceneNum == SCENE_FIRE_TEMPLE_BOSS) {
-            if (GameInteractor_Should(GI_VB_PLAY_BLUE_WARP_CS, !Flags_GetEventChkInf(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP), EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP)) {
+            if (GameInteractor_Should(VB_PLAY_BLUE_WARP_CS, !Flags_GetEventChkInf(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP), EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP)) {
                 Flags_SetEventChkInf(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP);
-                if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_BLUE_WARP, true, ITEM_MEDALLION_FIRE)) {
+                if (GameInteractor_Should(VB_GIVE_ITEM_FROM_BLUE_WARP, true, ITEM_MEDALLION_FIRE)) {
                     Item_Give(play, ITEM_MEDALLION_FIRE);
                 }
                 play->nextEntranceIndex = ENTR_KAKARIKO_VILLAGE_0;
@@ -795,9 +795,9 @@ void DoorWarp1_AdultWarpOut(DoorWarp1* this, PlayState* play) {
                 gSaveContext.nextCutsceneIndex = 0;
             }
         } else if (play->sceneNum == SCENE_WATER_TEMPLE_BOSS) {
-            if (GameInteractor_Should(GI_VB_PLAY_BLUE_WARP_CS, !Flags_GetEventChkInf(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP), EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP)) {
+            if (GameInteractor_Should(VB_PLAY_BLUE_WARP_CS, !Flags_GetEventChkInf(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP), EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP)) {
                 Flags_SetEventChkInf(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP);
-                if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_BLUE_WARP, true, ITEM_MEDALLION_WATER)) {
+                if (GameInteractor_Should(VB_GIVE_ITEM_FROM_BLUE_WARP, true, ITEM_MEDALLION_WATER)) {
                     Item_Give(play, ITEM_MEDALLION_WATER);
                 }
                 play->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0;
@@ -812,9 +812,9 @@ void DoorWarp1_AdultWarpOut(DoorWarp1* this, PlayState* play) {
                 gSaveContext.nextCutsceneIndex = 0;
             }
         } else if (play->sceneNum == SCENE_SPIRIT_TEMPLE_BOSS) {
-            if (GameInteractor_Should(GI_VB_PLAY_BLUE_WARP_CS, !CHECK_QUEST_ITEM(QUEST_MEDALLION_SPIRIT), RAND_INF_DUNGEONS_DONE_SPIRIT_TEMPLE)) {
+            if (GameInteractor_Should(VB_PLAY_BLUE_WARP_CS, !CHECK_QUEST_ITEM(QUEST_MEDALLION_SPIRIT), RAND_INF_DUNGEONS_DONE_SPIRIT_TEMPLE)) {
                 Flags_SetRandomizerInf(RAND_INF_DUNGEONS_DONE_SPIRIT_TEMPLE);
-                if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_BLUE_WARP, true, ITEM_MEDALLION_SPIRIT)) {
+                if (GameInteractor_Should(VB_GIVE_ITEM_FROM_BLUE_WARP, true, ITEM_MEDALLION_SPIRIT)) {
                     Item_Give(play, ITEM_MEDALLION_SPIRIT);
                 }
                 play->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0;
@@ -829,9 +829,9 @@ void DoorWarp1_AdultWarpOut(DoorWarp1* this, PlayState* play) {
                 gSaveContext.nextCutsceneIndex = 0;
             }
         } else if (play->sceneNum == SCENE_SHADOW_TEMPLE_BOSS) {
-            if (GameInteractor_Should(GI_VB_PLAY_BLUE_WARP_CS, !CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW), RAND_INF_DUNGEONS_DONE_SHADOW_TEMPLE)) {
+            if (GameInteractor_Should(VB_PLAY_BLUE_WARP_CS, !CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW), RAND_INF_DUNGEONS_DONE_SHADOW_TEMPLE)) {
                 Flags_SetRandomizerInf(RAND_INF_DUNGEONS_DONE_SHADOW_TEMPLE);
-                if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_BLUE_WARP, true, ITEM_MEDALLION_SHADOW)) {
+                if (GameInteractor_Should(VB_GIVE_ITEM_FROM_BLUE_WARP, true, ITEM_MEDALLION_SHADOW)) {
                     Item_Give(play, ITEM_MEDALLION_SHADOW);
                 }
                 play->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0;
diff --git a/soh/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c b/soh/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c
index 495ef96b8..53a0d749c 100644
--- a/soh/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c
+++ b/soh/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c
@@ -126,7 +126,7 @@ void ElfMsg_CallNaviCuboid(ElfMsg* this, PlayState* play) {
         (this->actor.world.pos.y <= player->actor.world.pos.y) &&
         ((player->actor.world.pos.y - this->actor.world.pos.y) < (100.0f * this->actor.scale.y)) &&
         (fabsf(player->actor.world.pos.z - this->actor.world.pos.z) < (100.0f * this->actor.scale.z))) {
-        if (GameInteractor_Should(GI_VB_NAVI_TALK, true, this)) {
+        if (GameInteractor_Should(VB_NAVI_TALK, true, this)) {
             player->naviTextId = ElfMsg_GetMessageId(this);
             navi->elfMsg = this;
         }
@@ -148,7 +148,7 @@ void ElfMsg_CallNaviCylinder(ElfMsg* this, PlayState* play) {
     if (ElfMsg_WithinXZDistance(&player->actor.world.pos, &this->actor.world.pos, this->actor.scale.x * 100.0f) &&
         (this->actor.world.pos.y <= player->actor.world.pos.y) &&
         ((player->actor.world.pos.y - this->actor.world.pos.y) < (100.0f * this->actor.scale.y))) {
-        if (GameInteractor_Should(GI_VB_NAVI_TALK, true, this)) {
+        if (GameInteractor_Should(VB_NAVI_TALK, true, this)) {
             player->naviTextId = ElfMsg_GetMessageId(this);
             navi->elfMsg = this;
         }
diff --git a/soh/src/overlays/actors/ovl_En_Ani/z_en_ani.c b/soh/src/overlays/actors/ovl_En_Ani/z_en_ani.c
index 57cb6045e..8f4ee815c 100644
--- a/soh/src/overlays/actors/ovl_En_Ani/z_en_ani.c
+++ b/soh/src/overlays/actors/ovl_En_Ani/z_en_ani.c
@@ -120,7 +120,7 @@ void func_809B0524(EnAni* this, PlayState* play) {
 }
 
 void func_809B0558(EnAni* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_MAN_ON_ROOF, true, NULL)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_FROM_MAN_ON_ROOF, true, NULL)) {
         this->actor.parent = NULL;
         if (!LINK_IS_ADULT) {
             EnAni_SetupAction(this, func_809B04F0);
@@ -129,7 +129,7 @@ void func_809B0558(EnAni* this, PlayState* play) {
         }
         Flags_SetItemGetInf(ITEMGETINF_15);
     } else {
-        if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_MAN_ON_ROOF, true, NULL)) {
+        if (GameInteractor_Should(VB_GIVE_ITEM_FROM_MAN_ON_ROOF, true, NULL)) {
             Actor_OfferGetItem(&this->actor, play, GI_HEART_PIECE, 10000.0f, 200.0f);
         }
     }
@@ -140,7 +140,7 @@ void func_809B05F0(EnAni* this, PlayState* play) {
         EnAni_SetupAction(this, func_809B0558);
     }
 
-    if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_MAN_ON_ROOF, true, NULL)) {
+    if (GameInteractor_Should(VB_GIVE_ITEM_FROM_MAN_ON_ROOF, true, NULL)) {
         Actor_OfferGetItem(&this->actor, play, GI_HEART_PIECE, 10000.0f, 200.0f);
     }
 }
diff --git a/soh/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c b/soh/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c
index 7e5cc3ef1..1a1ed01a6 100644
--- a/soh/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c
+++ b/soh/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c
@@ -185,7 +185,7 @@ void EnBomBowlPit_GivePrize(EnBomBowlPit* this, PlayState* play) {
 
     player->stateFlags1 &= ~PLAYER_STATE1_IN_CUTSCENE;
     this->actor.parent = NULL;
-    if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_BOMBCHU_BOWLING, true, this)) {
+    if (GameInteractor_Should(VB_GIVE_ITEM_FROM_BOMBCHU_BOWLING, true, this)) {
         Actor_OfferGetItem(&this->actor, play, this->getItemId, 2000.0f, 1000.0f);
     }
     player->stateFlags1 |= PLAYER_STATE1_IN_CUTSCENE;
@@ -193,7 +193,7 @@ void EnBomBowlPit_GivePrize(EnBomBowlPit* this, PlayState* play) {
 }
 
 void EnBomBowlPit_WaitTillPrizeGiven(EnBomBowlPit* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_BOMBCHU_BOWLING, true, this)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_FROM_BOMBCHU_BOWLING, true, this)) {
         this->actionFunc = EnBomBowlPit_Reset;
     } else {
         Actor_OfferGetItem(&this->actor, play, this->getItemId, 2000.0f, 1000.0f);
diff --git a/soh/src/overlays/actors/ovl_En_Box/z_en_box.c b/soh/src/overlays/actors/ovl_En_Box/z_en_box.c
index f6deade38..a60b7c5ed 100644
--- a/soh/src/overlays/actors/ovl_En_Box/z_en_box.c
+++ b/soh/src/overlays/actors/ovl_En_Box/z_en_box.c
@@ -278,7 +278,7 @@ void EnBox_Fall(EnBox* this, PlayState* play) {
             this->dyna.actor.shape.rot.z = 0;
             this->dyna.actor.world.pos.y = this->dyna.actor.floorHeight;
             EnBox_SetupAction(this, EnBox_WaitOpen);
-            if (GameInteractor_Should(GI_VB_PLAY_ONEPOINT_ACTOR_CS, true, this)) {
+            if (GameInteractor_Should(VB_PLAY_ONEPOINT_ACTOR_CS, true, this)) {
                 OnePointCutscene_EndCutscene(play, this->unk_1AC);
             }
         }
diff --git a/soh/src/overlays/actors/ovl_En_Cow/z_en_cow.c b/soh/src/overlays/actors/ovl_En_Cow/z_en_cow.c
index 9869a0621..c01ac30b5 100644
--- a/soh/src/overlays/actors/ovl_En_Cow/z_en_cow.c
+++ b/soh/src/overlays/actors/ovl_En_Cow/z_en_cow.c
@@ -118,7 +118,7 @@ void EnCow_Init(Actor* thisx, PlayState* play) {
             Collider_SetCylinder(play, &this->colliders[1], &this->actor, &sCylinderInit);
             func_809DEE9C(this);
             this->actionFunc = func_809DF96C;
-            if (GameInteractor_Should(GI_VB_DESPAWN_HORSE_RACE_COW, (
+            if (GameInteractor_Should(VB_DESPAWN_HORSE_RACE_COW, (
                 play->sceneNum == SCENE_LINKS_HOUSE && (!LINK_IS_ADULT || !Flags_GetEventChkInf(EVENTCHKINF_WON_COW_IN_MALONS_RACE))
             ), this)) {
                 Actor_Kill(&this->actor);
@@ -260,7 +260,7 @@ void func_809DF96C(EnCow* this, PlayState* play) {
                 if ((this->actor.xzDistToPlayer < 150.0f) &&
                     (ABS((s16)(this->actor.yawTowardsPlayer - this->actor.shape.rot.y)) < 0x61A8)) {
                     DREG(53) = 0;
-                    if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_COW, true, this)) {
+                    if (GameInteractor_Should(VB_GIVE_ITEM_FROM_COW, true, this)) {
                         this->actionFunc = func_809DF8FC;
                         this->actor.flags |= ACTOR_FLAG_WILL_TALK;
                         func_8002F2CC(&this->actor, play, 170.0f);
diff --git a/soh/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c b/soh/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c
index b411c1427..0a2d4c6fe 100644
--- a/soh/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c
+++ b/soh/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c
@@ -456,7 +456,7 @@ void func_809EEA00(EnDivingGame* this, PlayState* play) {
     if ((this->unk_292 == Message_GetState(&play->msgCtx) && Message_ShouldAdvance(play))) {
         Message_CloseTextbox(play);
         this->actor.parent = NULL;
-        if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_DIVING_MINIGAME, true, &this->actor)) {
+        if (GameInteractor_Should(VB_GIVE_ITEM_FROM_DIVING_MINIGAME, true, &this->actor)) {
             Actor_OfferGetItem(&this->actor, play, GI_SCALE_SILVER, 90.0f, 10.0f);
         }
         this->actionFunc = func_809EEA90;
@@ -465,10 +465,10 @@ void func_809EEA00(EnDivingGame* this, PlayState* play) {
 
 void func_809EEA90(EnDivingGame* this, PlayState* play) {
     SkelAnime_Update(&this->skelAnime);
-    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_DIVING_MINIGAME, true, &this->actor)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_FROM_DIVING_MINIGAME, true, &this->actor)) {
         this->actionFunc = func_809EEAF8;
     } else {
-        if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_DIVING_MINIGAME, true, &this->actor)) {
+        if (GameInteractor_Should(VB_GIVE_ITEM_FROM_DIVING_MINIGAME, true, &this->actor)) {
             Actor_OfferGetItem(&this->actor, play, GI_SCALE_SILVER, 90.0f, 10.0f);
         }
     }
@@ -478,7 +478,7 @@ void func_809EEA90(EnDivingGame* this, PlayState* play) {
 void func_809EEAF8(EnDivingGame* this, PlayState* play) {
     SkelAnime_Update(&this->skelAnime);
     if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE && Message_ShouldAdvance(play)) ||
-         !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_DIVING_MINIGAME, true, &this->actor)) {
+         !GameInteractor_Should(VB_GIVE_ITEM_FROM_DIVING_MINIGAME, true, &this->actor)) {
         // "Successful completion"
         osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 正常終了 ☆☆☆☆☆ \n" VT_RST);
         this->allRupeesThrown = this->state = this->phase = this->unk_2A2 = this->grabbedRupeesCounter = 0;
diff --git a/soh/src/overlays/actors/ovl_En_Dns/z_en_dns.c b/soh/src/overlays/actors/ovl_En_Dns/z_en_dns.c
index 6ea9c26e1..d2d8963c3 100644
--- a/soh/src/overlays/actors/ovl_En_Dns/z_en_dns.c
+++ b/soh/src/overlays/actors/ovl_En_Dns/z_en_dns.c
@@ -397,7 +397,7 @@ void func_809EFDD0(EnDns* this, PlayState* play) {
 void func_809EFEE8(EnDns* this, PlayState* play) {
     if ((Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(play)) {
         Message_CloseTextbox(play);
-        if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_BUSINESS_SCRUB, true, this)) {
+        if (GameInteractor_Should(VB_GIVE_ITEM_FROM_BUSINESS_SCRUB, true, this)) {
             func_809EFDD0(this, play);
         }
         this->actionFunc = func_809EFF50;
@@ -405,7 +405,7 @@ void func_809EFEE8(EnDns* this, PlayState* play) {
 }
 
 void func_809EFF50(EnDns* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_BUSINESS_SCRUB, true, this)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_FROM_BUSINESS_SCRUB, true, this)) {
         this->actor.parent = NULL;
         this->actionFunc = func_809EFF98;
     } else {
diff --git a/soh/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c b/soh/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c
index 102a904cf..eaee07ae7 100644
--- a/soh/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c
+++ b/soh/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c
@@ -253,7 +253,7 @@ void EnDntNomal_TargetWait(EnDntNomal* this, PlayState* play) {
             if (!LINK_IS_ADULT && !Flags_GetItemGetInf(ITEMGETINF_1D)) {
                 this->hitCounter++;
                 if (this->hitCounter >= 3) {
-                    if (!GameInteractor_Should(GI_VB_PLAY_ONEPOINT_ACTOR_CS, true, &this->actor)) {
+                    if (!GameInteractor_Should(VB_PLAY_ONEPOINT_ACTOR_CS, true, &this->actor)) {
                         this->actionFunc = EnDntNomal_TargetGivePrize;
                     } else {
                         OnePointCutscene_Init(play, 4140, -99, &this->actor, MAIN_CAM);
diff --git a/soh/src/overlays/actors/ovl_En_Ds/z_en_ds.c b/soh/src/overlays/actors/ovl_En_Ds/z_en_ds.c
index e94ff9039..7e3f97856 100644
--- a/soh/src/overlays/actors/ovl_En_Ds/z_en_ds.c
+++ b/soh/src/overlays/actors/ovl_En_Ds/z_en_ds.c
@@ -90,7 +90,7 @@ void EnDs_DisplayOddPotionText(EnDs* this, PlayState* play) {
 }
 
 void EnDs_GiveOddPotion(EnDs* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_TRADE_ODD_MUSHROOM, true, this)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_TRADE_ODD_MUSHROOM, true, this)) {
         this->actor.parent = NULL;
         this->actionFunc = EnDs_DisplayOddPotionText;
         gSaveContext.timer2State = 0;
@@ -104,7 +104,7 @@ void EnDs_TalkAfterBrewOddPotion(EnDs* this, PlayState* play) {
         Message_CloseTextbox(play);
         this->actionFunc = EnDs_GiveOddPotion;
         u32 itemId = GI_ODD_POTION;
-        if (GameInteractor_Should(GI_VB_TRADE_ODD_MUSHROOM, true, this)) {
+        if (GameInteractor_Should(VB_TRADE_ODD_MUSHROOM, true, this)) {
             Actor_OfferGetItem(&this->actor, play, itemId, 10000.0f, 50.0f);
         }
     }
@@ -127,7 +127,7 @@ void EnDs_BrewOddPotion2(EnDs* this, PlayState* play) {
         this->brewTimer -= 1;
     } else {
         this->actionFunc = EnDs_BrewOddPotion3;
-        this->brewTimer = GameInteractor_Should(GI_VB_PLAY_EYEDROP_CREATION_ANIM, true, this) ? 60 : 0;
+        this->brewTimer = GameInteractor_Should(VB_PLAY_EYEDROP_CREATION_ANIM, true, this) ? 60 : 0;
         Flags_UnsetSwitch(play, 0x3F);
     }
 }
@@ -137,7 +137,7 @@ void EnDs_BrewOddPotion1(EnDs* this, PlayState* play) {
         this->brewTimer -= 1;
     } else {
         this->actionFunc = EnDs_BrewOddPotion2;
-        this->brewTimer = GameInteractor_Should(GI_VB_PLAY_EYEDROP_CREATION_ANIM, true, this) ? 20 : 0;
+        this->brewTimer = GameInteractor_Should(VB_PLAY_EYEDROP_CREATION_ANIM, true, this) ? 20 : 0;
     }
 
     Math_StepToF(&this->unk_1E4, 1.0f, 0.01f);
@@ -151,7 +151,7 @@ void EnDs_OfferOddPotion(EnDs* this, PlayState* play) {
         switch (play->msgCtx.choiceIndex) {
             case 0: // yes
                 this->actionFunc = EnDs_BrewOddPotion1;
-                this->brewTimer = GameInteractor_Should(GI_VB_PLAY_EYEDROP_CREATION_ANIM, true, this) ? 60 : 0;
+                this->brewTimer = GameInteractor_Should(VB_PLAY_EYEDROP_CREATION_ANIM, true, this) ? 60 : 0;
                 Flags_SetSwitch(play, 0x3F);
                 play->msgCtx.msgMode = MSGMODE_PAUSED;
                 player->exchangeItemId = EXCH_ITEM_NONE;
@@ -166,7 +166,7 @@ void EnDs_OfferOddPotion(EnDs* this, PlayState* play) {
 s32 EnDs_CheckRupeesAndBottle() {
     if (gSaveContext.rupees < 100) {
         return 0;
-    } else if (GameInteractor_Should(GI_VB_NEED_BOTTLE_FOR_GRANNYS_ITEM, Inventory_HasEmptyBottle() == 0, NULL)) {
+    } else if (GameInteractor_Should(VB_NEED_BOTTLE_FOR_GRANNYS_ITEM, Inventory_HasEmptyBottle() == 0, NULL)) {
         return 1;
     } else {
         return 2;
@@ -174,7 +174,7 @@ s32 EnDs_CheckRupeesAndBottle() {
 }
 
 void EnDs_GiveBluePotion(EnDs* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_GRANNYS_SHOP, true, this)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_FROM_GRANNYS_SHOP, true, this)) {
         this->actor.parent = NULL;
         this->actionFunc = EnDs_Talk;
     } else {
@@ -198,7 +198,7 @@ void EnDs_OfferBluePotion(EnDs* this, PlayState* play) {
                         Rupees_ChangeBy(-100);
                         this->actor.flags &= ~ACTOR_FLAG_WILL_TALK;
 
-                        if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_GRANNYS_SHOP, true, this)) {
+                        if (GameInteractor_Should(VB_GIVE_ITEM_FROM_GRANNYS_SHOP, true, this)) {
                             GetItemEntry itemEntry = ItemTable_Retrieve(GI_POTION_BLUE);
                             Actor_OfferGetItem(&this->actor, play, GI_POTION_BLUE, 10000.0f, 50.0f);
                             gSaveContext.pendingSale = itemEntry.itemId;
@@ -225,7 +225,7 @@ void EnDs_Wait(EnDs* this, PlayState* play) {
             Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
             player->actor.textId = 0x504A;
             this->actionFunc = EnDs_OfferOddPotion;
-        } else if (GameInteractor_Should(GI_VB_OFFER_BLUE_POTION, Flags_GetItemGetInf(ITEMGETINF_30), this)) { // Traded odd mushroom
+        } else if (GameInteractor_Should(VB_OFFER_BLUE_POTION, Flags_GetItemGetInf(ITEMGETINF_30), this)) { // Traded odd mushroom
             player->actor.textId = 0x500C;
             this->actionFunc = EnDs_OfferBluePotion;
         } else {
diff --git a/soh/src/overlays/actors/ovl_En_Du/z_en_du.c b/soh/src/overlays/actors/ovl_En_Du/z_en_du.c
index 781c09f79..2c7b1a2bb 100644
--- a/soh/src/overlays/actors/ovl_En_Du/z_en_du.c
+++ b/soh/src/overlays/actors/ovl_En_Du/z_en_du.c
@@ -377,7 +377,7 @@ void func_809FE4A4(EnDu* this, PlayState* play) {
         play->msgCtx.ocarinaMode = OCARINA_MODE_00;
         EnDu_SetupAction(this, func_809FE3C0);
     } else if (play->msgCtx.ocarinaMode >= OCARINA_MODE_06) {
-        if (GameInteractor_Should(GI_VB_PLAY_DARUNIAS_JOY_CS, true, NULL)) {
+        if (GameInteractor_Should(VB_PLAY_DARUNIAS_JOY_CS, true, NULL)) {
             play->csCtx.segment = SEGMENTED_TO_VIRTUAL(gGoronCityDaruniaWrongCs);
             gSaveContext.cutsceneTrigger = 1;
         }
@@ -386,7 +386,7 @@ void func_809FE4A4(EnDu* this, PlayState* play) {
         play->msgCtx.ocarinaMode = OCARINA_MODE_04;
     } else if (play->msgCtx.ocarinaMode == OCARINA_MODE_03) {
         Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
-        if (GameInteractor_Should(GI_VB_PLAY_DARUNIAS_JOY_CS, true, NULL)) {
+        if (GameInteractor_Should(VB_PLAY_DARUNIAS_JOY_CS, true, NULL)) {
             play->csCtx.segment = SEGMENTED_TO_VIRTUAL(gGoronCityDaruniaCorrectCs);
             gSaveContext.cutsceneTrigger = 1;
         }
@@ -554,7 +554,7 @@ void func_809FEB08(EnDu* this, PlayState* play) {
         EnDu_SetupAction(this, func_809FE3C0);
         return;
     }
-    if (GameInteractor_Should(GI_VB_BE_ELIGIBLE_FOR_DARUNIAS_JOY_REWARD, CUR_UPG_VALUE(UPG_STRENGTH) <= 0, NULL)) {
+    if (GameInteractor_Should(VB_BE_ELIGIBLE_FOR_DARUNIAS_JOY_REWARD, CUR_UPG_VALUE(UPG_STRENGTH) <= 0, NULL)) {
         Flags_SetRandomizerInf(RAND_INF_DARUNIAS_JOY);
         this->actor.textId = 0x301C;
         EnDu_SetupAction(this, func_809FEC14);
@@ -576,7 +576,7 @@ void func_809FEC14(EnDu* this, PlayState* play) {
 }
 
 void func_809FEC70(EnDu* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_STRENGTH_1, true, NULL)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_STRENGTH_1, true, NULL)) {
         this->actor.parent = NULL;
         EnDu_SetupAction(this, func_809FECE4);
     } else {
diff --git a/soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c b/soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c
index 28e89036d..8b3195d72 100644
--- a/soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c
+++ b/soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c
@@ -362,7 +362,7 @@ void EnExItem_TargetPrizeApproach(EnExItem* this, PlayState* play) {
         Math_SmoothStepToS(&this->actor.shape.rot.y, -0x4000, 5, 0x1000, 0);
     }
 
-    if (GameInteractor_Should(GI_VB_PLAY_ONEPOINT_ACTOR_CS, true, &this->actor) && this->timer != 0) {
+    if (GameInteractor_Should(VB_PLAY_ONEPOINT_ACTOR_CS, true, &this->actor) && this->timer != 0) {
         if (this->prizeRotateTimer != 0) {
             tmpf1 = play->view.lookAt.x - play->view.eye.x;
             tmpf2 = play->view.lookAt.y - 10.0f - play->view.eye.y;
@@ -388,7 +388,7 @@ void EnExItem_TargetPrizeApproach(EnExItem* this, PlayState* play) {
         Player_SetCsActionWithHaltedActors(play, NULL, 7);
         this->actor.parent = NULL;
 
-        if (!GameInteractor_Should(GI_VB_PLAY_ONEPOINT_ACTOR_CS, true, &this->actor)) {
+        if (!GameInteractor_Should(VB_PLAY_ONEPOINT_ACTOR_CS, true, &this->actor)) {
             GET_PLAYER(play)->stateFlags1 &= ~(PLAYER_STATE1_GETTING_ITEM | PLAYER_STATE1_ITEM_OVER_HEAD);
         }
 
@@ -398,7 +398,7 @@ void EnExItem_TargetPrizeApproach(EnExItem* this, PlayState* play) {
             getItemId = GI_BULLET_BAG_50;
         }
 
-        if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_TARGET_IN_WOODS, true, &this->actor)) {
+        if (GameInteractor_Should(VB_GIVE_ITEM_FROM_TARGET_IN_WOODS, true, &this->actor)) {
             Actor_OfferGetItem(&this->actor, play, getItemId, 2000.0f, 1000.0f);
         }
 
@@ -407,7 +407,7 @@ void EnExItem_TargetPrizeApproach(EnExItem* this, PlayState* play) {
 }
 
 void EnExItem_TargetPrizeGive(EnExItem* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_TARGET_IN_WOODS, true, &this->actor)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_FROM_TARGET_IN_WOODS, true, &this->actor)) {
         this->actionFunc = EnExItem_TargetPrizeFinish;
     } else {
         s32 getItemId = (CUR_UPG_VALUE(UPG_BULLET_BAG) == 2) ? GI_BULLET_BAG_50 : GI_BULLET_BAG_40;
@@ -416,7 +416,7 @@ void EnExItem_TargetPrizeGive(EnExItem* this, PlayState* play) {
 }
 
 void EnExItem_TargetPrizeFinish(EnExItem* this, PlayState* play) {
-    if (!GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_TARGET_IN_WOODS, true, &this->actor) || (Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) {
+    if (!GameInteractor_Should(VB_GIVE_ITEM_FROM_TARGET_IN_WOODS, true, &this->actor) || (Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) {
         // "Successful completion"
         osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 正常終了 ☆☆☆☆☆ \n" VT_RST);
         Flags_SetItemGetInf(ITEMGETINF_1D);
diff --git a/soh/src/overlays/actors/ovl_En_Fr/z_en_fr.c b/soh/src/overlays/actors/ovl_En_Fr/z_en_fr.c
index 646fc5668..8af56cd79 100644
--- a/soh/src/overlays/actors/ovl_En_Fr/z_en_fr.c
+++ b/soh/src/overlays/actors/ovl_En_Fr/z_en_fr.c
@@ -947,7 +947,7 @@ void EnFr_SetReward(EnFr* this, PlayState* play) {
         if (!(gSaveContext.eventChkInf[13] & sSongIndex[songIndex])) {
             gSaveContext.eventChkInf[13] |= sSongIndex[songIndex];
             GameInteractor_ExecuteOnFlagSet(FLAG_EVENT_CHECK_INF, (EVENTCHKINF_SONGS_FOR_FROGS_INDEX << 4) + sSongIndexShift[songIndex]);
-            if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_FROGS, true, this)) {
+            if (GameInteractor_Should(VB_GIVE_ITEM_FROM_FROGS, true, this)) {
                 this->reward = GI_RUPEE_PURPLE;
             }
         } else {
@@ -957,7 +957,7 @@ void EnFr_SetReward(EnFr* this, PlayState* play) {
         if (!(gSaveContext.eventChkInf[13] & sSongIndex[songIndex])) {
             gSaveContext.eventChkInf[13] |= sSongIndex[songIndex];
             GameInteractor_ExecuteOnFlagSet(FLAG_EVENT_CHECK_INF, (EVENTCHKINF_SONGS_FOR_FROGS_INDEX << 4) + sSongIndexShift[songIndex]);
-            if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_FROGS, true, this)) {
+            if (GameInteractor_Should(VB_GIVE_ITEM_FROM_FROGS, true, this)) {
                 this->reward = GI_HEART_PIECE;
             }
         } else {
@@ -967,7 +967,7 @@ void EnFr_SetReward(EnFr* this, PlayState* play) {
         if (!(gSaveContext.eventChkInf[13] & sSongIndex[songIndex])) {
             gSaveContext.eventChkInf[13] |= sSongIndex[songIndex];
             GameInteractor_ExecuteOnFlagSet(FLAG_EVENT_CHECK_INF, (EVENTCHKINF_SONGS_FOR_FROGS_INDEX << 4) + sSongIndexShift[songIndex]);
-            if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_FROGS, true, this)) {
+            if (GameInteractor_Should(VB_GIVE_ITEM_FROM_FROGS, true, this)) {
                 this->reward = GI_HEART_PIECE;
             }
         } else {
@@ -1019,14 +1019,14 @@ void EnFr_Deactivate(EnFr* this, PlayState* play) {
         this->actionFunc = EnFr_Idle;
     } else {
         this->actionFunc = EnFr_GiveReward;
-        if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_FROGS, true, this)) {
+        if (GameInteractor_Should(VB_GIVE_ITEM_FROM_FROGS, true, this)) {
             Actor_OfferGetItem(&this->actor, play, this->reward, 30.0f, 100.0f);
         }
     }
 }
 
 void EnFr_GiveReward(EnFr* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_FROGS, true, this)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_FROM_FROGS, true, this)) {
         this->actor.parent = NULL;
         this->actionFunc = EnFr_SetIdle;
     } else {
diff --git a/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c b/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
index 2086e528f..facd43466 100644
--- a/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
+++ b/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
@@ -134,7 +134,7 @@ void EnGe1_Init(Actor* thisx, PlayState* play) {
         case GE1_TYPE_GATE_OPERATOR:
             this->hairstyle = GE1_HAIR_STRAIGHT;
 
-            if (GameInteractor_Should(GI_VB_GERUDOS_BE_FRIENDLY, EnGe1_CheckCarpentersFreed(), NULL)) {
+            if (GameInteractor_Should(VB_GERUDOS_BE_FRIENDLY, EnGe1_CheckCarpentersFreed(), NULL)) {
                 this->actionFunc = EnGe1_CheckGate_GateOp;
             } else {
                 this->actionFunc = EnGe1_WatchForPlayerFrontOnly;
@@ -144,7 +144,7 @@ void EnGe1_Init(Actor* thisx, PlayState* play) {
         case GE1_TYPE_NORMAL:
             this->hairstyle = GE1_HAIR_STRAIGHT;
 
-            if (GameInteractor_Should(GI_VB_GERUDOS_BE_FRIENDLY, EnGe1_CheckCarpentersFreed(), NULL)) {
+            if (GameInteractor_Should(VB_GERUDOS_BE_FRIENDLY, EnGe1_CheckCarpentersFreed(), NULL)) {
                 this->actionFunc = EnGe1_SetNormalText;
             } else {
                 this->actionFunc = EnGe1_WatchForAndSensePlayer;
@@ -174,7 +174,7 @@ void EnGe1_Init(Actor* thisx, PlayState* play) {
 
             if (gSaveContext.eventInf[0] & 0x100) {
                 this->actionFunc = EnGe1_TalkAfterGame_Archery;
-            } else if (GameInteractor_Should(GI_VB_GERUDOS_BE_FRIENDLY, EnGe1_CheckCarpentersFreed(), NULL)) {
+            } else if (GameInteractor_Should(VB_GERUDOS_BE_FRIENDLY, EnGe1_CheckCarpentersFreed(), NULL)) {
                 this->actionFunc = EnGe1_Wait_Archery;
             } else {
                 this->actionFunc = EnGe1_WatchForPlayerFrontOnly;
@@ -184,7 +184,7 @@ void EnGe1_Init(Actor* thisx, PlayState* play) {
         case GE1_TYPE_TRAINING_GROUNDS_GUARD:
             this->hairstyle = GE1_HAIR_STRAIGHT;
 
-            if (GameInteractor_Should(GI_VB_GERUDOS_BE_FRIENDLY, EnGe1_CheckCarpentersFreed(), NULL)) {
+            if (GameInteractor_Should(VB_GERUDOS_BE_FRIENDLY, EnGe1_CheckCarpentersFreed(), NULL)) {
                 this->actionFunc = EnGe1_CheckForCard_GTGGuard;
             } else {
                 this->actionFunc = EnGe1_WatchForPlayerFrontOnly;
@@ -519,7 +519,7 @@ void EnGe1_WaitTillItemGiven_Archery(EnGe1* this, PlayState* play) {
     GetItemEntry getItemEntry = (GetItemEntry)GET_ITEM_NONE;
     s32 getItemId;
 
-    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_HORSEBACK_ARCHERY, true, this)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_FROM_HORSEBACK_ARCHERY, true, this)) {
         this->actionFunc = EnGe1_SetupWait_Archery;
 
         if (this->stateFlags & GE1_STATE_GIVE_QUIVER) {
@@ -542,7 +542,7 @@ void EnGe1_WaitTillItemGiven_Archery(EnGe1* this, PlayState* play) {
             getItemId = GI_HEART_PIECE;
         }
 
-        if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_HORSEBACK_ARCHERY, true, this)) {
+        if (GameInteractor_Should(VB_GIVE_ITEM_FROM_HORSEBACK_ARCHERY, true, this)) {
             Actor_OfferGetItem(&this->actor, play, getItemId, 10000.0f, 50.0f);
         }
     }
@@ -571,7 +571,7 @@ void EnGe1_BeginGiveItem_Archery(EnGe1* this, PlayState* play) {
         getItemId = GI_HEART_PIECE;
     }
 
-    if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_HORSEBACK_ARCHERY, true, this)) {
+    if (GameInteractor_Should(VB_GIVE_ITEM_FROM_HORSEBACK_ARCHERY, true, this)) {
         Actor_OfferGetItem(&this->actor, play, getItemId, 10000.0f, 50.0f);
     }
 }
diff --git a/soh/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c b/soh/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c
index 0b5b9c09e..9c4db10ac 100644
--- a/soh/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c
+++ b/soh/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c
@@ -140,14 +140,14 @@ void EnGe2_Init(Actor* thisx, PlayState* play) {
     switch (this->actor.params & 0xFF) {
         case GE2_TYPE_PATROLLING:
             EnGe2_ChangeAction(this, GE2_ACTION_WALK);
-            if (GameInteractor_Should(GI_VB_GERUDOS_BE_FRIENDLY, EnGe2_CheckCarpentersFreed(), NULL)) {
+            if (GameInteractor_Should(VB_GERUDOS_BE_FRIENDLY, EnGe2_CheckCarpentersFreed(), NULL)) {
                 this->actor.update = EnGe2_UpdateFriendly;
                 this->actor.targetMode = 6;
             }
             break;
         case GE2_TYPE_STATIONARY:
             EnGe2_ChangeAction(this, GE2_ACTION_STAND);
-            if (GameInteractor_Should(GI_VB_GERUDOS_BE_FRIENDLY, EnGe2_CheckCarpentersFreed(), NULL)) {
+            if (GameInteractor_Should(VB_GERUDOS_BE_FRIENDLY, EnGe2_CheckCarpentersFreed(), NULL)) {
                 this->actor.update = EnGe2_UpdateFriendly;
                 this->actor.targetMode = 6;
             }
@@ -460,7 +460,7 @@ void EnGe2_WaitLookAtPlayer(EnGe2* this, PlayState* play) {
 }
 
 void EnGe2_WaitTillCardGiven(EnGe2* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_GERUDO_MEMBERSHIP_CARD, true, NULL)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_GERUDO_MEMBERSHIP_CARD, true, NULL)) {
         this->actor.parent = NULL;
         this->actionFunc = EnGe2_SetActionAfterTalk;
     } else {
@@ -473,7 +473,7 @@ void EnGe2_GiveCard(EnGe2* this, PlayState* play) {
         Message_CloseTextbox(play);
         this->actor.flags &= ~ACTOR_FLAG_WILL_TALK;
         this->actionFunc = EnGe2_WaitTillCardGiven;
-        if (GameInteractor_Should(GI_VB_GIVE_ITEM_GERUDO_MEMBERSHIP_CARD, true, NULL)) {
+        if (GameInteractor_Should(VB_GIVE_ITEM_GERUDO_MEMBERSHIP_CARD, true, NULL)) {
             Actor_OfferGetItem(&this->actor, play, GI_GERUDO_CARD, 10000.0f, 50.0f);
         }
     }
@@ -605,7 +605,7 @@ void EnGe2_Update(Actor* thisx, PlayState* play) {
     }
     EnGe2_MoveAndBlink(this, play);
 
-    if (GameInteractor_Should(GI_VB_GERUDOS_BE_FRIENDLY, EnGe2_CheckCarpentersFreed(), NULL) && !(this->stateFlags & GE2_STATE_KO)) {
+    if (GameInteractor_Should(VB_GERUDOS_BE_FRIENDLY, EnGe2_CheckCarpentersFreed(), NULL) && !(this->stateFlags & GE2_STATE_KO)) {
         this->actor.update = EnGe2_UpdateFriendly;
         this->actor.targetMode = 6;
     }
@@ -630,7 +630,7 @@ void EnGe2_UpdateStunned(Actor* thisx, PlayState* play2) {
     }
     CollisionCheck_SetAC(play, &play->colChkCtx, &this->collider.base);
 
-    if (GameInteractor_Should(GI_VB_GERUDOS_BE_FRIENDLY, EnGe2_CheckCarpentersFreed(), NULL)) {
+    if (GameInteractor_Should(VB_GERUDOS_BE_FRIENDLY, EnGe2_CheckCarpentersFreed(), NULL)) {
         this->actor.update = EnGe2_UpdateFriendly;
         this->actor.targetMode = 6;
         this->actor.colorFilterTimer = 0;
diff --git a/soh/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c b/soh/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c
index 1265ba51e..835743b34 100644
--- a/soh/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c
+++ b/soh/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c
@@ -141,7 +141,7 @@ void EnGe3_WaitLookAtPlayer(EnGe3* this, PlayState* play) {
 }
 
 void EnGe3_WaitTillCardGiven(EnGe3* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_GERUDO_MEMBERSHIP_CARD, true, NULL)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_GERUDO_MEMBERSHIP_CARD, true, NULL)) {
         this->actor.parent = NULL;
         this->actionFunc = EnGe3_Wait;
     } else {
@@ -154,7 +154,7 @@ void EnGe3_GiveCard(EnGe3* this, PlayState* play) {
         Message_CloseTextbox(play);
         this->actor.flags &= ~ACTOR_FLAG_WILL_TALK;
         this->actionFunc = EnGe3_WaitTillCardGiven;
-        if (GameInteractor_Should(GI_VB_GIVE_ITEM_GERUDO_MEMBERSHIP_CARD, true, NULL)) {
+        if (GameInteractor_Should(VB_GIVE_ITEM_GERUDO_MEMBERSHIP_CARD, true, NULL)) {
             Actor_OfferGetItem(&this->actor, play, GI_GERUDO_CARD, 10000.0f, 50.0f);
         }
     }
diff --git a/soh/src/overlays/actors/ovl_En_Gm/z_en_gm.c b/soh/src/overlays/actors/ovl_En_Gm/z_en_gm.c
index 7174a63f1..2a54cf979 100644
--- a/soh/src/overlays/actors/ovl_En_Gm/z_en_gm.c
+++ b/soh/src/overlays/actors/ovl_En_Gm/z_en_gm.c
@@ -97,7 +97,7 @@ void EnGm_Destroy(Actor* thisx, PlayState* play) {
 s32 func_80A3D7C8(void) {
     if (LINK_AGE_IN_YEARS == YEARS_CHILD) {
         return 0;
-    } else if (GameInteractor_Should(GI_VB_BE_ELIGIBLE_FOR_GIANTS_KNIFE_PURCHASE, (
+    } else if (GameInteractor_Should(VB_BE_ELIGIBLE_FOR_GIANTS_KNIFE_PURCHASE, (
         !CHECK_OWNED_EQUIP_ALT(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_BIGGORON) // Don't have giant's knife
     ), NULL)) {
         return 1;
@@ -249,7 +249,7 @@ void EnGm_ProcessChoiceIndex(EnGm* this, PlayState* play) {
                     Message_ContinueTextbox(play, 0xC8);
                     this->actionFunc = func_80A3DD7C;
                 } else {
-                    if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_MEDIGORON, true, this)) {
+                    if (GameInteractor_Should(VB_GIVE_ITEM_FROM_MEDIGORON, true, this)) {
                         Actor_OfferGetItem(&this->actor, play, GI_SWORD_KNIFE, 415.0f, 10.0f);
                     }
 
@@ -265,7 +265,7 @@ void EnGm_ProcessChoiceIndex(EnGm* this, PlayState* play) {
 }
 
 void func_80A3DF00(EnGm* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_MEDIGORON, true, this)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_FROM_MEDIGORON, true, this)) {
         Flags_SetRandomizerInf(RAND_INF_MERCHANTS_MEDIGORON);
         this->actor.parent = NULL;
         this->actionFunc = func_80A3DF60;
diff --git a/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c b/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c
index 47d1d7b0d..4194e9ee5 100644
--- a/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c
+++ b/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c
@@ -283,7 +283,7 @@ s32 EnGo2_SpawnDust(EnGo2* this, u8 initialTimer, f32 scale, f32 scaleStep, s32
 
 void EnGo2_GetItem(EnGo2* this, PlayState* play, s32 getItemId) {
     this->getItemId = getItemId;
-    if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_GORON, true, this)) {
+    if (GameInteractor_Should(VB_GIVE_ITEM_FROM_GORON, true, this)) {
         Actor_OfferGetItem(&this->actor, play, getItemId, this->actor.xzDistToPlayer + 1.0f,
                     fabsf(this->actor.yDistToPlayer) + 1.0f);
     }
@@ -329,7 +329,7 @@ u16 EnGo2_GoronFireGenericGetTextId(EnGo2* this) {
 u16 EnGo2_GetTextIdGoronCityRollingBig(PlayState* play, EnGo2* this) {
     if (Flags_GetInfTable(INFTABLE_11E)) {
         return 0x3013;
-    } else if (GameInteractor_Should(GI_VB_BE_ELIGIBLE_FOR_CHILD_ROLLING_GORON_REWARD, CUR_CAPACITY(UPG_BOMB_BAG) >= 20, this)
+    } else if (GameInteractor_Should(VB_BE_ELIGIBLE_FOR_CHILD_ROLLING_GORON_REWARD, CUR_CAPACITY(UPG_BOMB_BAG) >= 20, this)
         && this->waypoint > 7 && this->waypoint < 12) {
         return 0x3012;
     } else {
@@ -407,9 +407,9 @@ s16 EnGo2_UpdateTalkStateGoronDmtRollingSmall(PlayState* play, EnGo2* this) {
 }
 
 u16 EnGo2_GetTextIdGoronDmtDcEntrance(PlayState* play, EnGo2* this) {
-    if (GameInteractor_Should(GI_VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE), NULL) && LINK_IS_ADULT) {
+    if (GameInteractor_Should(VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE), NULL) && LINK_IS_ADULT) {
         return 0x3043;
-    } else if (GameInteractor_Should(GI_VB_GORONS_CONSIDER_DODONGOS_CAVERN_FINISHED, CHECK_QUEST_ITEM(QUEST_GORON_RUBY), NULL)) {
+    } else if (GameInteractor_Should(VB_GORONS_CONSIDER_DODONGOS_CAVERN_FINISHED, CHECK_QUEST_ITEM(QUEST_GORON_RUBY), NULL)) {
         return 0x3027;
     } else {
         return Flags_GetEventChkInf(EVENTCHKINF_BOMBED_DODONGOS_CAVERN_ENTRANCE) ? 0x3021 : Flags_GetInfTable(INFTABLE_E0) ? 0x302A : 0x3008;
@@ -428,9 +428,9 @@ s16 EnGo2_UpdateTalkStateGoronDmtDcEntrance(PlayState* play, EnGo2* this) {
 }
 
 u16 EnGo2_GetTextIdGoronCityEntrance(PlayState* play, EnGo2* this) {
-    if (GameInteractor_Should(GI_VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE), NULL) && LINK_IS_ADULT) {
+    if (GameInteractor_Should(VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE), NULL) && LINK_IS_ADULT) {
         return 0x3043;
-    } else if (GameInteractor_Should(GI_VB_GORONS_CONSIDER_DODONGOS_CAVERN_FINISHED, CHECK_QUEST_ITEM(QUEST_GORON_RUBY), NULL)) {
+    } else if (GameInteractor_Should(VB_GORONS_CONSIDER_DODONGOS_CAVERN_FINISHED, CHECK_QUEST_ITEM(QUEST_GORON_RUBY), NULL)) {
         return 0x3027;
     } else {
         return Flags_GetInfTable(INFTABLE_F0) ? 0x3015 : 0x3014;
@@ -449,9 +449,9 @@ s16 EnGo2_UpdateTalkStateGoronCityEntrance(PlayState* play, EnGo2* this) {
 }
 
 u16 EnGo2_GetTextIdGoronCityIsland(PlayState* play, EnGo2* this) {
-    if (GameInteractor_Should(GI_VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE), NULL) && LINK_IS_ADULT) {
+    if (GameInteractor_Should(VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE), NULL) && LINK_IS_ADULT) {
         return 0x3043;
-    } else if (GameInteractor_Should(GI_VB_GORONS_CONSIDER_DODONGOS_CAVERN_FINISHED, CHECK_QUEST_ITEM(QUEST_GORON_RUBY), NULL)) {
+    } else if (GameInteractor_Should(VB_GORONS_CONSIDER_DODONGOS_CAVERN_FINISHED, CHECK_QUEST_ITEM(QUEST_GORON_RUBY), NULL)) {
         return 0x3027;
     } else {
         return Flags_GetInfTable(INFTABLE_F4) ? 0x3017 : 0x3016;
@@ -470,9 +470,9 @@ s16 EnGo2_UpdateTalkStateGoronCityIsland(PlayState* play, EnGo2* this) {
 }
 
 u16 EnGo2_GetTextIdGoronCityLowestFloor(PlayState* play, EnGo2* this) {
-    if (GameInteractor_Should(GI_VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE), NULL) && LINK_IS_ADULT) {
+    if (GameInteractor_Should(VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE), NULL) && LINK_IS_ADULT) {
         return 0x3043;
-    } else if (GameInteractor_Should(GI_VB_GORONS_CONSIDER_DODONGOS_CAVERN_FINISHED, CHECK_QUEST_ITEM(QUEST_GORON_RUBY), NULL)) {
+    } else if (GameInteractor_Should(VB_GORONS_CONSIDER_DODONGOS_CAVERN_FINISHED, CHECK_QUEST_ITEM(QUEST_GORON_RUBY), NULL)) {
         return 0x3027;
     } else {
         return CUR_UPG_VALUE(UPG_STRENGTH) != 0    ? 0x302C
@@ -496,13 +496,13 @@ s16 EnGo2_UpdateTalkStateGoronCityLowestFloor(PlayState* play, EnGo2* this) {
 u16 EnGo2_GetTextIdGoronCityLink(PlayState* play, EnGo2* this) {
     // In case a hook neglects to set the override, fall back to the first dialogue
     u16 overrideTextId = 0x3030;
-    if (GameInteractor_Should(GI_VB_OVERRIDE_LINK_THE_GORON_DIALOGUE, false, &overrideTextId)) {
+    if (GameInteractor_Should(VB_OVERRIDE_LINK_THE_GORON_DIALOGUE, false, &overrideTextId)) {
         return overrideTextId;
     }
 
-    if (GameInteractor_Should(GI_VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE), NULL)) {
+    if (GameInteractor_Should(VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE), NULL)) {
         return Flags_GetInfTable(INFTABLE_10F) ? 0x3042 : 0x3041;
-    } else if (GameInteractor_Should(GI_VB_GORONS_CONSIDER_TUNIC_COLLECTED, CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON), NULL)) {
+    } else if (GameInteractor_Should(VB_GORONS_CONSIDER_TUNIC_COLLECTED, CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON), NULL)) {
         return Flags_GetInfTable(INFTABLE_SPOKE_TO_GORON_LINK) ? 0x3038 : 0x3037;
     } else if (Flags_GetInfTable(INFTABLE_STOPPED_GORON_LINKS_ROLLING)) {
         this->unk_20C = 0;
@@ -568,7 +568,7 @@ s16 EnGo2_UpdateTalkStateGoronCityLink(PlayState* play, EnGo2* this) {
 u16 EnGo2_GetTextIdGoronDmtBiggoron(PlayState* play, EnGo2* this) {
     Player* player = GET_PLAYER(play);
 
-    if (GameInteractor_Should(GI_VB_BIGGORON_CONSIDER_TRADE_COMPLETE, gSaveContext.bgsFlag, NULL)) {
+    if (GameInteractor_Should(VB_BIGGORON_CONSIDER_TRADE_COMPLETE, gSaveContext.bgsFlag, NULL)) {
         player->exchangeItemId = EXCH_ITEM_CLAIM_CHECK;
         return 0x305E;
     } else if (INV_CONTENT(ITEM_TRADE_ADULT) >= ITEM_CLAIM_CHECK) {
@@ -590,7 +590,7 @@ s16 EnGo2_UpdateTalkStateGoronDmtBiggoron(PlayState* play, EnGo2* this) {
     switch (EnGo2_GetDialogState(this, play)) {
         case TEXT_STATE_DONE:
             if (this->actor.textId == 0x305E) {
-                if (!GameInteractor_Should(GI_VB_BIGGORON_CONSIDER_SWORD_COLLECTED, gSaveContext.bgsFlag, NULL)) {
+                if (!GameInteractor_Should(VB_BIGGORON_CONSIDER_SWORD_COLLECTED, gSaveContext.bgsFlag, NULL)) {
                     Flags_SetRandomizerInf(RAND_INF_ADULT_TRADES_DMT_TRADE_CLAIM_CHECK);
                     EnGo2_GetItem(this, play, GI_SWORD_BGS);
                     this->actionFunc = EnGo2_SetupGetItem;
@@ -1022,7 +1022,7 @@ void EnGo2_BiggoronSetTextId(EnGo2* this, PlayState* play, Player* player) {
     u16 textId;
 
     if ((this->actor.params & 0x1F) == GORON_DMT_BIGGORON) {
-        if (GameInteractor_Should(GI_VB_BIGGORON_CONSIDER_TRADE_COMPLETE, gSaveContext.bgsFlag, NULL)) {
+        if (GameInteractor_Should(VB_BIGGORON_CONSIDER_TRADE_COMPLETE, gSaveContext.bgsFlag, NULL)) {
             if (func_8002F368(play) == EXCH_ITEM_CLAIM_CHECK) {
                 this->actor.textId = 0x3003;
             } else {
@@ -1031,18 +1031,18 @@ void EnGo2_BiggoronSetTextId(EnGo2* this, PlayState* play, Player* player) {
             player->actor.textId = this->actor.textId;
 
         } else if (
-            !GameInteractor_Should(GI_VB_BIGGORON_CONSIDER_SWORD_COLLECTED, gSaveContext.bgsFlag, NULL) && 
+            !GameInteractor_Should(VB_BIGGORON_CONSIDER_SWORD_COLLECTED, gSaveContext.bgsFlag, NULL) && 
             (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_CLAIM_CHECK)
         ) {
             if (func_8002F368(play) == EXCH_ITEM_CLAIM_CHECK) {
-                if (GameInteractor_Should(GI_VB_BIGGORON_CONSIDER_SWORD_FORGED, Environment_GetBgsDayCount() >= 3, NULL)) {
+                if (GameInteractor_Should(VB_BIGGORON_CONSIDER_SWORD_FORGED, Environment_GetBgsDayCount() >= 3, NULL)) {
                     textId = 0x305E;
                 } else {
                     textId = 0x305D;
                 }
                 this->actor.textId = textId;
             } else {
-                if (GameInteractor_Should(GI_VB_BIGGORON_CONSIDER_SWORD_FORGED, Environment_GetBgsDayCount() >= 3, NULL)) {
+                if (GameInteractor_Should(VB_BIGGORON_CONSIDER_SWORD_FORGED, Environment_GetBgsDayCount() >= 3, NULL)) {
                     textId = 0x3002;
                 } else {
                     textId = 0x305D;
@@ -1171,8 +1171,8 @@ s32 EnGo2_IsCameraModified(EnGo2* this, PlayState* play) {
         (this->actor.params & 0x1F) == GORON_MARKET_BAZAAR) {
         return true;
     } else if (
-        !GameInteractor_Should(GI_VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE), NULL) &&
-        GameInteractor_Should(GI_VB_GORONS_CONSIDER_TUNIC_COLLECTED, CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON), NULL)
+        !GameInteractor_Should(VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE), NULL) &&
+        GameInteractor_Should(VB_GORONS_CONSIDER_TUNIC_COLLECTED, CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON), NULL)
     ) {
         return true;
     } else {
@@ -1231,8 +1231,8 @@ void EnGo2_SelectGoronWakingUp(EnGo2* this) {
             break;
         case GORON_CITY_LINK:
             if (
-                !GameInteractor_Should(GI_VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE), NULL) &&
-                GameInteractor_Should(GI_VB_GORONS_CONSIDER_TUNIC_COLLECTED, CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON), NULL)
+                !GameInteractor_Should(VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE), NULL) &&
+                GameInteractor_Should(VB_GORONS_CONSIDER_TUNIC_COLLECTED, CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON), NULL)
             ) {
                 EnGo2_WakingUp(this);
                 break;
@@ -1561,7 +1561,7 @@ void EnGo2_Init(Actor* thisx, PlayState* play) {
         case GORON_CITY_LOWEST_FLOOR:
         case GORON_CITY_STAIRWELL:
         case GORON_CITY_LOST_WOODS:
-            if (!GameInteractor_Should(GI_VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE), NULL) && LINK_IS_ADULT) {
+            if (!GameInteractor_Should(VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE), NULL) && LINK_IS_ADULT) {
                 Actor_Kill(&this->actor);
             }
             this->actionFunc = EnGo2_CurledUp;
@@ -1577,8 +1577,8 @@ void EnGo2_Init(Actor* thisx, PlayState* play) {
                 Path_CopyLastPoint(this->path, &this->actor.world.pos);
                 this->actor.home.pos = this->actor.world.pos;
                 if (
-                    !GameInteractor_Should(GI_VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE), NULL) &&
-                    GameInteractor_Should(GI_VB_GORONS_CONSIDER_TUNIC_COLLECTED, CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON), NULL)
+                    !GameInteractor_Should(VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE), NULL) &&
+                    GameInteractor_Should(VB_GORONS_CONSIDER_TUNIC_COLLECTED, CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON), NULL)
                 ) {
                     EnGo2_GetItemAnimation(this, play);
                 } else {
@@ -1795,7 +1795,7 @@ void EnGo2_ReverseRolling(EnGo2* this, PlayState* play) {
 }
 
 void EnGo2_SetupGetItem(EnGo2* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_GORON, true, NULL)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_FROM_GORON, true, NULL)) {
         this->actor.parent = NULL;
         this->actionFunc = EnGo2_SetGetItem;
     } else {
@@ -1804,7 +1804,7 @@ void EnGo2_SetupGetItem(EnGo2* this, PlayState* play) {
 }
 
 void EnGo2_SetGetItem(EnGo2* this, PlayState* play) {
-    if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_GORON, true, NULL)) {
+    if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play) || !GameInteractor_Should(VB_GIVE_ITEM_FROM_GORON, true, NULL)) {
         this->interactInfo.talkState = NPC_TALK_STATE_IDLE;
         switch (this->getItemId) {
             case GI_CLAIM_CHECK:
@@ -1816,7 +1816,7 @@ void EnGo2_SetGetItem(EnGo2* this, PlayState* play) {
                 EnGo2_GetItemAnimation(this, play);
                 return;
             case GI_SWORD_BGS:
-                if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_GORON, true, NULL)) {
+                if (GameInteractor_Should(VB_GIVE_ITEM_FROM_GORON, true, NULL)) {
                     gSaveContext.bgsFlag = true;
                 }
                 break;
@@ -1837,12 +1837,12 @@ void EnGo2_BiggoronEyedrops(EnGo2* this, PlayState* play) {
             this->actor.flags &= ~ACTOR_FLAG_TARGETABLE;
             this->actor.shape.rot.y += 0x5B0;
             this->trackingMode = NPC_TRACKING_NONE;
-            this->animTimer = !GameInteractor_Should(GI_VB_PLAY_EYEDROPS_CS, true, NULL) ? 0 : (this->skelAnime.endFrame + 60.0f + 60.0f); // eyeDrops animation timer
+            this->animTimer = !GameInteractor_Should(VB_PLAY_EYEDROPS_CS, true, NULL) ? 0 : (this->skelAnime.endFrame + 60.0f + 60.0f); // eyeDrops animation timer
             this->eyeMouthTexState = 2;
             this->unk_20C = 0;
             this->goronState++;
             func_800F483C(0x28, 5);
-            if (GameInteractor_Should(GI_VB_PLAY_EYEDROPS_CS, true, NULL)) {
+            if (GameInteractor_Should(VB_PLAY_EYEDROPS_CS, true, NULL)) {
                 OnePointCutscene_Init(play, 4190, -99, &this->actor, MAIN_CAM);
             }
             break;
diff --git a/soh/src/overlays/actors/ovl_En_Hs/z_en_hs.c b/soh/src/overlays/actors/ovl_En_Hs/z_en_hs.c
index eb3556a6e..f6e48a913 100644
--- a/soh/src/overlays/actors/ovl_En_Hs/z_en_hs.c
+++ b/soh/src/overlays/actors/ovl_En_Hs/z_en_hs.c
@@ -79,7 +79,7 @@ void EnHs_Init(Actor* thisx, PlayState* play) {
         // "chicken shop (adult era)"
         osSyncPrintf(VT_FGCOL(CYAN) " ヒヨコの店(大人の時) \n" VT_RST);
         func_80A6E3A0(this, func_80A6E9AC);
-        if (GameInteractor_Should(GI_VB_DESPAWN_GROG, Flags_GetItemGetInf(ITEMGETINF_30), this)) {
+        if (GameInteractor_Should(VB_DESPAWN_GROG, Flags_GetItemGetInf(ITEMGETINF_30), this)) {
             // "chicken shop closed"
             osSyncPrintf(VT_FGCOL(CYAN) " ヒヨコ屋閉店 \n" VT_RST);
             Actor_Kill(&this->actor);
@@ -130,7 +130,7 @@ void func_80A6E5EC(EnHs* this, PlayState* play) {
 
 void func_80A6E630(EnHs* this, PlayState* play) {
     if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) {
-        if (GameInteractor_Should(GI_VB_TRADE_TIMER_ODD_MUSHROOM, true, NULL)) {
+        if (GameInteractor_Should(VB_TRADE_TIMER_ODD_MUSHROOM, true, NULL)) {
             func_80088AA0(180);
             gSaveContext.eventInf[1] &= ~1;
         }
@@ -157,7 +157,7 @@ void func_80A6E70C(EnHs* this, PlayState* play) {
 }
 
 void func_80A6E740(EnHs* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_TRADE_COJIRO, true, this)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_TRADE_COJIRO, true, this)) {
         this->actor.parent = NULL;
         Flags_SetRandomizerInf(RAND_INF_ADULT_TRADES_LW_TRADE_COJIRO);
         func_80A6E3A0(this, func_80A6E630);
@@ -173,7 +173,7 @@ void func_80A6E7BC(EnHs* this, PlayState* play) {
         switch (play->msgCtx.choiceIndex) {
             case 0:
                 func_80A6E3A0(this, func_80A6E740);
-                if (GameInteractor_Should(GI_VB_TRADE_COJIRO, true, this)) {
+                if (GameInteractor_Should(VB_TRADE_COJIRO, true, this)) {
                     Actor_OfferGetItem(&this->actor, play, GI_ODD_MUSHROOM, 10000.0f, 50.0f);
                 }
                 break;
diff --git a/soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c b/soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c
index adb50441e..cbcd03e0e 100644
--- a/soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c
+++ b/soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c
@@ -660,7 +660,7 @@ s16 func_80A70058(PlayState* play, Actor* thisx) {
                     gSaveContext.dogParams = 0;
                     break;
                 case 0x709F:
-                    if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_LOST_DOG, true, this)) {
+                    if (GameInteractor_Should(VB_GIVE_ITEM_FROM_LOST_DOG, true, this)) {
                         func_80A6F7CC(this, play, Flags_GetInfTable(INFTABLE_191) ? GI_RUPEE_BLUE : GI_HEART_PIECE);
                         this->actionFunc = func_80A714C4;
                     }
diff --git a/soh/src/overlays/actors/ovl_En_Ik/z_en_ik.c b/soh/src/overlays/actors/ovl_En_Ik/z_en_ik.c
index 5f1634237..3da5dbe7b 100644
--- a/soh/src/overlays/actors/ovl_En_Ik/z_en_ik.c
+++ b/soh/src/overlays/actors/ovl_En_Ik/z_en_ik.c
@@ -1439,7 +1439,7 @@ void func_80A781CC(Actor* thisx, PlayState* play) {
     if (!Play_InCsMode(play)) {
         this->actor.update = EnIk_Update;
         this->actor.draw = EnIk_Draw;
-        if (GameInteractor_Should(GI_VB_NABOORU_KNUCKLE_DEATH_SCENE, true, this)) {
+        if (GameInteractor_Should(VB_NABOORU_KNUCKLE_DEATH_SCENE, true, this)) {
             Cutscene_SetSegment(play, gSpiritBossNabooruKnuckleDefeatCs);
             gSaveContext.cutsceneTrigger = 1;
             Actor_SetScale(&this->actor, 0.01f);
diff --git a/soh/src/overlays/actors/ovl_En_Js/z_en_js.c b/soh/src/overlays/actors/ovl_En_Js/z_en_js.c
index 1baf3413a..f9e18f315 100644
--- a/soh/src/overlays/actors/ovl_En_Js/z_en_js.c
+++ b/soh/src/overlays/actors/ovl_En_Js/z_en_js.c
@@ -128,7 +128,7 @@ void func_80A8910C(EnJs* this, PlayState* play) {
 }
 
 void func_80A89160(EnJs* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_CARPET_SALESMAN, true, this)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_FROM_CARPET_SALESMAN, true, this)) {
         this->actor.parent = NULL;
         En_Js_SetupAction(this, func_80A8910C);
         Flags_SetRandomizerInf(RAND_INF_MERCHANTS_CARPET_SALESMAN);
diff --git a/soh/src/overlays/actors/ovl_En_Ko/z_en_ko.c b/soh/src/overlays/actors/ovl_En_Ko/z_en_ko.c
index 4e83742c3..ddd197320 100644
--- a/soh/src/overlays/actors/ovl_En_Ko/z_en_ko.c
+++ b/soh/src/overlays/actors/ovl_En_Ko/z_en_ko.c
@@ -1027,7 +1027,7 @@ s32 EnKo_CanSpawn(EnKo* this, PlayState* play) {
             }
 
         case SCENE_LOST_WOODS:
-            return GameInteractor_Should(GI_VB_SPAWN_LW_FADO, (
+            return GameInteractor_Should(VB_SPAWN_LW_FADO, (
                 (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_ODD_POTION) ? true : false
             ), this);
         default:
@@ -1175,7 +1175,7 @@ void func_80A99048(EnKo* this, PlayState* play) {
         Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_ELF, this->actor.world.pos.x,
                            this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 3);
         if (ENKO_TYPE == ENKO_TYPE_CHILD_3) {
-            if (!GameInteractor_Should(GI_VB_OPEN_KOKIRI_FOREST, CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD), this)) {
+            if (!GameInteractor_Should(VB_OPEN_KOKIRI_FOREST, CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD), this)) {
                 this->collider.dim.height += 200;
                 this->actionFunc = func_80A995CC;
                 return;
@@ -1211,7 +1211,7 @@ void func_80A99438(EnKo* this, PlayState* play) {
 }
 
 void func_80A99504(EnKo* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_TRADE_ODD_POTION, true, this)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_TRADE_ODD_POTION, true, this)) {
         this->actor.parent = NULL;
         this->actionFunc = func_80A99560;
     } else {
diff --git a/soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c b/soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c
index 9ee9f6d0a..24abf54ff 100644
--- a/soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c
+++ b/soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c
@@ -73,7 +73,7 @@ static AnimationInfo sAnimationInfo[] = {
 u16 EnKz_GetTextNoMaskChild(PlayState* play, EnKz* this) {
     Player* player = GET_PLAYER(play);
 
-    if (GameInteractor_Should(GI_VB_KING_ZORA_THANK_CHILD, (
+    if (GameInteractor_Should(VB_KING_ZORA_THANK_CHILD, (
         CHECK_QUEST_ITEM(QUEST_ZORA_SAPPHIRE)
     ), this)) {
         return 0x402B;
@@ -91,7 +91,7 @@ u16 EnKz_GetTextNoMaskAdult(PlayState* play, EnKz* this) {
     // this works because both ITEM_NONE and later trade items are > ITEM_FROG
     if (INV_CONTENT(ITEM_TRADE_ADULT) >= ITEM_FROG) {
         if (!Flags_GetInfTable(INFTABLE_139)) {
-            if (!GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_THAWING_KING_ZORA, (
+            if (!GameInteractor_Should(VB_GIVE_ITEM_FROM_THAWING_KING_ZORA, (
                 !CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_ZORA)
             ), this)) {
                 return 0x401F;
@@ -242,7 +242,7 @@ void func_80A9CB18(EnKz* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
 
     if (func_80A9C95C(play, this, &this->interactInfo.talkState, 340.0f, EnKz_GetText, func_80A9C6C0)) {
-        if (GameInteractor_Should(GI_VB_BE_ABLE_TO_EXCHANGE_RUTOS_LETTER, (this->actor.textId == 0x401A), this) &&
+        if (GameInteractor_Should(VB_BE_ABLE_TO_EXCHANGE_RUTOS_LETTER, (this->actor.textId == 0x401A), this) &&
             !Flags_GetEventChkInf(EVENTCHKINF_KING_ZORA_MOVED))
         {
             if (func_8002F368(play) == EXCH_ITEM_LETTER_RUTO) {
@@ -258,7 +258,7 @@ void func_80A9CB18(EnKz* this, PlayState* play) {
         if (LINK_IS_ADULT) {
             if ((INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_PRESCRIPTION) &&
                 (func_8002F368(play) == EXCH_ITEM_PRESCRIPTION)) {
-                if (GameInteractor_Should(GI_VB_TRADE_PRESCRIPTION, true, this)) {
+                if (GameInteractor_Should(VB_TRADE_PRESCRIPTION, true, this)) {
                     this->actor.textId = 0x4014;
                     this->sfxPlayed = false;
                     player->actor.textId = this->actor.textId;
@@ -273,7 +273,7 @@ void func_80A9CB18(EnKz* this, PlayState* play) {
                 player->actor.textId = this->actor.textId;
             } else {
                 this->actor.textId =
-                    !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_THAWING_KING_ZORA,
+                    !GameInteractor_Should(VB_GIVE_ITEM_FROM_THAWING_KING_ZORA,
                                             (!CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_ZORA)), this)
                         ? 0x401F
                         : 0x4012;
@@ -345,7 +345,7 @@ void EnKz_Init(Actor* thisx, PlayState* play) {
     this->interactInfo.talkState = NPC_TALK_STATE_IDLE;
     Animation_ChangeByInfo(&this->skelanime, sAnimationInfo, ENKZ_ANIM_0);
 
-    if (GameInteractor_Should(GI_VB_KING_ZORA_BE_MOVED, (
+    if (GameInteractor_Should(VB_KING_ZORA_BE_MOVED, (
         Flags_GetEventChkInf(EVENTCHKINF_KING_ZORA_MOVED)
     ), this)) {
         EnKz_SetMovedPos(this, play);
@@ -448,8 +448,8 @@ void EnKz_SetupGetItem(EnKz* this, PlayState* play) {
     f32 yRange;
 
     if (Actor_HasParent(&this->actor, play) || (
-        (this->isTrading && !GameInteractor_Should(GI_VB_TRADE_PRESCRIPTION, true, this)) ||
-        (!this->isTrading && !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_THAWING_KING_ZORA, true, this))
+        (this->isTrading && !GameInteractor_Should(VB_TRADE_PRESCRIPTION, true, this)) ||
+        (!this->isTrading && !GameInteractor_Should(VB_GIVE_ITEM_FROM_THAWING_KING_ZORA, true, this))
     )) {
         this->actor.parent = NULL;
         this->interactInfo.talkState = NPC_TALK_STATE_TALKING;
@@ -469,7 +469,7 @@ void EnKz_SetupGetItem(EnKz* this, PlayState* play) {
 
 void EnKz_StartTimer(EnKz* this, PlayState* play) {
     if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) {
-        if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_FROG && GameInteractor_Should(GI_VB_TRADE_TIMER_FROG, true, NULL)) { 
+        if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_FROG && GameInteractor_Should(VB_TRADE_TIMER_FROG, true, NULL)) { 
             func_80088AA0(180); // start timer2 with 3 minutes
             gSaveContext.eventInf[1] &= ~1;
         }
diff --git a/soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c b/soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c
index 267a49bcd..c9521b133 100644
--- a/soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c
+++ b/soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c
@@ -91,8 +91,8 @@ static void* sEyeTextures[] = {
 };
 
 u16 EnMa1_GetText(PlayState* play, Actor* thisx) {
-    bool malonReturnedFromCastle = GameInteractor_Should(GI_VB_MALON_RETURN_FROM_CASTLE, Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE), NULL);
-    bool malonTaughtEponasSong = GameInteractor_Should(GI_VB_MALON_ALREADY_TAUGHT_EPONAS_SONG, CHECK_QUEST_ITEM(QUEST_SONG_EPONA), NULL);
+    bool malonReturnedFromCastle = GameInteractor_Should(VB_MALON_RETURN_FROM_CASTLE, Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE), NULL);
+    bool malonTaughtEponasSong = GameInteractor_Should(VB_MALON_ALREADY_TAUGHT_EPONAS_SONG, CHECK_QUEST_ITEM(QUEST_SONG_EPONA), NULL);
     u16 faceReaction = Text_GetFaceReaction(play, 0x17);
 
     if (faceReaction != 0) {
@@ -185,7 +185,7 @@ s16 func_80AA0778(PlayState* play, Actor* thisx) {
 }
 
 s32 func_80AA08C4(EnMa1* this, PlayState* play) {
-    bool malonReturnedFromCastle = GameInteractor_Should(GI_VB_MALON_RETURN_FROM_CASTLE, Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE), NULL);
+    bool malonReturnedFromCastle = GameInteractor_Should(VB_MALON_RETURN_FROM_CASTLE, Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE), NULL);
 
     if ((this->actor.shape.rot.z == 3) && (gSaveContext.sceneSetupIndex == 5)) {
         return 1;
@@ -269,8 +269,8 @@ void func_80AA0B74(EnMa1* this) {
 
 void EnMa1_Init(Actor* thisx, PlayState* play) {
     EnMa1* this = (EnMa1*)thisx;
-    bool malonReturnedFromCastle = GameInteractor_Should(GI_VB_MALON_RETURN_FROM_CASTLE, Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE), NULL);
-    bool malonTaughtEponasSong = GameInteractor_Should(GI_VB_MALON_ALREADY_TAUGHT_EPONAS_SONG, CHECK_QUEST_ITEM(QUEST_SONG_EPONA), NULL);
+    bool malonReturnedFromCastle = GameInteractor_Should(VB_MALON_RETURN_FROM_CASTLE, Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE), NULL);
+    bool malonTaughtEponasSong = GameInteractor_Should(VB_MALON_ALREADY_TAUGHT_EPONAS_SONG, CHECK_QUEST_ITEM(QUEST_SONG_EPONA), NULL);
     s32 pad;
 
     ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 18.0f);
@@ -306,8 +306,8 @@ void EnMa1_Destroy(Actor* thisx, PlayState* play) {
 }
 
 void func_80AA0D88(EnMa1* this, PlayState* play) {
-    bool malonReturnedFromCastle = GameInteractor_Should(GI_VB_MALON_RETURN_FROM_CASTLE, Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE), NULL);
-    bool malonTaughtEponasSong = GameInteractor_Should(GI_VB_MALON_ALREADY_TAUGHT_EPONAS_SONG, CHECK_QUEST_ITEM(QUEST_SONG_EPONA), NULL);
+    bool malonReturnedFromCastle = GameInteractor_Should(VB_MALON_RETURN_FROM_CASTLE, Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE), NULL);
+    bool malonTaughtEponasSong = GameInteractor_Should(VB_MALON_ALREADY_TAUGHT_EPONAS_SONG, CHECK_QUEST_ITEM(QUEST_SONG_EPONA), NULL);
 
     if (this->interactInfo.talkState != NPC_TALK_STATE_IDLE) {
         if (this->skelAnime.animation != &gMalonChildIdleAnim) {
@@ -331,7 +331,7 @@ void func_80AA0D88(EnMa1* this, PlayState* play) {
 }
 
 void func_80AA0EA0(EnMa1* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_WEIRD_EGG, true, NULL)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_WEIRD_EGG, true, NULL)) {
         this->actor.parent = NULL;
         this->actionFunc = func_80AA0EFC;
     } else {
@@ -340,7 +340,7 @@ void func_80AA0EA0(EnMa1* this, PlayState* play) {
 }
 
 void func_80AA0EFC(EnMa1* this, PlayState* play) {
-    if (this->interactInfo.talkState == NPC_TALK_STATE_ITEM_GIVEN || !GameInteractor_Should(GI_VB_GIVE_ITEM_WEIRD_EGG, true, NULL)) {
+    if (this->interactInfo.talkState == NPC_TALK_STATE_ITEM_GIVEN || !GameInteractor_Should(VB_GIVE_ITEM_WEIRD_EGG, true, NULL)) {
         this->interactInfo.talkState = NPC_TALK_STATE_IDLE;
         this->actionFunc = func_80AA0D88;
         Flags_SetEventChkInf(EVENTCHKINF_OBTAINED_POCKET_EGG);
diff --git a/soh/src/overlays/actors/ovl_En_Md/z_en_md.c b/soh/src/overlays/actors/ovl_En_Md/z_en_md.c
index d2e168ab1..280648aac 100644
--- a/soh/src/overlays/actors/ovl_En_Md/z_en_md.c
+++ b/soh/src/overlays/actors/ovl_En_Md/z_en_md.c
@@ -373,7 +373,7 @@ u16 EnMd_GetTextKokiriForest(PlayState* play, EnMd* this) {
     this->unk_208 = 0;
     this->unk_209 = TEXT_STATE_NONE;
 
-    if (GameInteractor_Should(GI_VB_MIDO_CONSIDER_DEKU_TREE_DEAD, CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD), this)) {
+    if (GameInteractor_Should(VB_MIDO_CONSIDER_DEKU_TREE_DEAD, CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD), this)) {
         return 0x1045;
     }
 
@@ -723,7 +723,7 @@ void func_80AAB948(EnMd* this, PlayState* play) {
     }
 
     if (
-        (GameInteractor_Should(GI_VB_MOVE_MIDO_IN_KOKIRI_FOREST, this->interactInfo.talkState == NPC_TALK_STATE_ACTION, this) && play->sceneNum == SCENE_KOKIRI_FOREST) ||
+        (GameInteractor_Should(VB_MOVE_MIDO_IN_KOKIRI_FOREST, this->interactInfo.talkState == NPC_TALK_STATE_ACTION, this) && play->sceneNum == SCENE_KOKIRI_FOREST) ||
         this->interactInfo.talkState == NPC_TALK_STATE_ACTION
     ) {
         if (CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD) && !Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_MIDO_AFTER_DEKU_TREES_DEATH) &&
diff --git a/soh/src/overlays/actors/ovl_En_Mk/z_en_mk.c b/soh/src/overlays/actors/ovl_En_Mk/z_en_mk.c
index 64510807c..148882730 100644
--- a/soh/src/overlays/actors/ovl_En_Mk/z_en_mk.c
+++ b/soh/src/overlays/actors/ovl_En_Mk/z_en_mk.c
@@ -93,11 +93,11 @@ void func_80AACA40(EnMk* this, PlayState* play) {
 }
 
 void func_80AACA94(EnMk* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play) != 0 || !GameInteractor_Should(GI_VB_TRADE_FROG, true, this)) {
+    if (Actor_HasParent(&this->actor, play) != 0 || !GameInteractor_Should(VB_TRADE_FROG, true, this)) {
         this->actor.parent = NULL;
         this->actionFunc = func_80AACA40;
         Flags_SetRandomizerInf(RAND_INF_ADULT_TRADES_LH_TRADE_FROG);
-        if (GameInteractor_Should(GI_VB_TRADE_TIMER_EYEDROPS, true, NULL)) {
+        if (GameInteractor_Should(VB_TRADE_TIMER_EYEDROPS, true, NULL)) {
             func_80088AA0(240);
             gSaveContext.eventInf[1] &= ~1;
         }
@@ -109,7 +109,7 @@ void func_80AACA94(EnMk* this, PlayState* play) {
 void func_80AACB14(EnMk* this, PlayState* play) {
     if (Actor_TextboxIsClosing(&this->actor, play)) {
         this->actionFunc = func_80AACA94;
-        if (GameInteractor_Should(GI_VB_TRADE_FROG, true, this)) {
+        if (GameInteractor_Should(VB_TRADE_FROG, true, this)) {
             Actor_OfferGetItem(&this->actor, play, GI_EYEDROPS, 10000.0f, 50.0f);
         }
     }
@@ -137,7 +137,7 @@ void func_80AACC04(EnMk* this, PlayState* play) {
     if (this->timer > 0) {
         this->timer--;
     } else {
-        this->timer = GameInteractor_Should(GI_VB_PLAY_EYEDROP_CREATION_ANIM, true, this) ? 16 : 0;
+        this->timer = GameInteractor_Should(VB_PLAY_EYEDROP_CREATION_ANIM, true, this) ? 16 : 0;
         this->actionFunc = func_80AACBAC;
         Animation_Change(&this->skelAnime, &object_mk_Anim_000D88, 1.0f, 0.0f,
                          Animation_GetLastFrame(&object_mk_Anim_000D88), ANIMMODE_LOOP, -4.0f);
@@ -150,7 +150,7 @@ void func_80AACCA0(EnMk* this, PlayState* play) {
         this->timer--;
         this->actor.shape.rot.y += 0x800;
     } else {
-        this->timer = GameInteractor_Should(GI_VB_PLAY_EYEDROP_CREATION_ANIM, true, this) ? 120 : 0;
+        this->timer = GameInteractor_Should(VB_PLAY_EYEDROP_CREATION_ANIM, true, this) ? 120 : 0;
         this->actionFunc = func_80AACC04;
         Animation_Change(&this->skelAnime, &object_mk_Anim_000724, 1.0f, 0.0f,
                          Animation_GetLastFrame(&object_mk_Anim_000724), ANIMMODE_LOOP, -4.0f);
@@ -166,7 +166,7 @@ void func_80AACD48(EnMk* this, PlayState* play) {
         this->actionFunc = func_80AACCA0;
         play->msgCtx.msgMode = MSGMODE_PAUSED;
         player->exchangeItemId = EXCH_ITEM_NONE;
-        this->timer = GameInteractor_Should(GI_VB_PLAY_EYEDROP_CREATION_ANIM, true, this) ? 16 : 0;
+        this->timer = GameInteractor_Should(VB_PLAY_EYEDROP_CREATION_ANIM, true, this) ? 16 : 0;
         Animation_Change(&this->skelAnime, &object_mk_Anim_000D88, 1.0f, 0.0f,
                          Animation_GetLastFrame(&object_mk_Anim_000D88), ANIMMODE_LOOP, -4.0f);
         this->flags &= ~2;
@@ -200,7 +200,7 @@ void func_80AACEE8(EnMk* this, PlayState* play) {
 }
 
 void func_80AACFA0(EnMk* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_LAB_DIVE, true, this)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_FROM_LAB_DIVE, true, this)) {
         this->actor.parent = NULL;
         this->actionFunc = func_80AACA40;
         Flags_SetItemGetInf(ITEMGETINF_10);
@@ -212,7 +212,7 @@ void func_80AACFA0(EnMk* this, PlayState* play) {
 void func_80AAD014(EnMk* this, PlayState* play) {
     if (Actor_TextboxIsClosing(&this->actor, play)) {
         this->actionFunc = func_80AACFA0;
-        if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_LAB_DIVE, true, this)) {
+        if (GameInteractor_Should(VB_GIVE_ITEM_FROM_LAB_DIVE, true, this)) {
             Actor_OfferGetItem(&this->actor, play, GI_HEART_PIECE, 10000.0f, 50.0f);
         }
     }
@@ -233,7 +233,7 @@ void EnMk_Wait(EnMk* this, PlayState* play) {
             player->actor.textId = this->actor.textId;
             this->actionFunc = func_80AACA40;
         } else {
-            if (GameInteractor_Should(GI_VB_USE_EYEDROP_DIALOGUE, (
+            if (GameInteractor_Should(VB_USE_EYEDROP_DIALOGUE, (
                 INV_CONTENT(ITEM_ODD_MUSHROOM) == ITEM_EYEDROPS
             ), this)) {
                 player->actor.textId = 0x4032;
diff --git a/soh/src/overlays/actors/ovl_En_Ms/z_en_ms.c b/soh/src/overlays/actors/ovl_En_Ms/z_en_ms.c
index 244be5cde..a28f1c19c 100644
--- a/soh/src/overlays/actors/ovl_En_Ms/z_en_ms.c
+++ b/soh/src/overlays/actors/ovl_En_Ms/z_en_ms.c
@@ -128,12 +128,12 @@ void EnMs_Talk(EnMs* this, PlayState* play) {
     } else if (Message_ShouldAdvance(play)) {
         switch (play->msgCtx.choiceIndex) {
             case 0: // yes
-                if (!GameInteractor_Should(GI_VB_BE_ELIGIBLE_FOR_MAGIC_BEANS_PURCHASE, (gSaveContext.rupees >= sPrices[BEANS_BOUGHT]), this)) {
+                if (!GameInteractor_Should(VB_BE_ELIGIBLE_FOR_MAGIC_BEANS_PURCHASE, (gSaveContext.rupees >= sPrices[BEANS_BOUGHT]), this)) {
                     Message_ContinueTextbox(play, 0x4069); // not enough rupees text
                     return;
                 }
     
-                if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_MAGIC_BEAN_SALESMAN, true, this)) {
+                if (GameInteractor_Should(VB_GIVE_ITEM_FROM_MAGIC_BEAN_SALESMAN, true, this)) {
                     Actor_OfferGetItem(&this->actor, play, GI_BEAN, 90.0f, 10.0f);
                     this->actionFunc = EnMs_Sell;
                 }
diff --git a/soh/src/overlays/actors/ovl_En_Nb/z_en_nb.c b/soh/src/overlays/actors/ovl_En_Nb/z_en_nb.c
index 9a3990cf8..1cb2d7908 100644
--- a/soh/src/overlays/actors/ovl_En_Nb/z_en_nb.c
+++ b/soh/src/overlays/actors/ovl_En_Nb/z_en_nb.c
@@ -327,7 +327,7 @@ void EnNb_GiveMedallion(EnNb* this, PlayState* play) {
 
     Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DEMO_EFFECT, posX, posY, posZ, 0, 0, 0,
                        0xC);
-    if (GameInteractor_Should(GI_VB_GIVE_ITEM_SPIRIT_MEDALLION, true, NULL)) {
+    if (GameInteractor_Should(VB_GIVE_ITEM_SPIRIT_MEDALLION, true, NULL)) {
         Item_Give(play, ITEM_MEDALLION_SPIRIT);
     }
 }
@@ -345,7 +345,7 @@ void EnNb_SetupChamberCsImpl(EnNb* this, PlayState* play) {
         this->action = NB_CHAMBER_UNDERGROUND;
         play->csCtx.segment = &D_80AB431C;
         gSaveContext.cutsceneTrigger = 2;
-        if (GameInteractor_Should(GI_VB_GIVE_ITEM_SPIRIT_MEDALLION, true, NULL)) {
+        if (GameInteractor_Should(VB_GIVE_ITEM_SPIRIT_MEDALLION, true, NULL)) {
             Item_Give(play, ITEM_MEDALLION_SPIRIT);
         }
         player->actor.world.rot.y = player->actor.shape.rot.y = this->actor.world.rot.y + 0x8000;
diff --git a/soh/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c b/soh/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c
index 612abcf0e..a03319dfc 100644
--- a/soh/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c
+++ b/soh/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c
@@ -204,7 +204,7 @@ void func_80ABA244(EnNiwLady* this, PlayState* play) {
     EnNiw* currentCucco;
     s32 phi_s1;
 
-    if (GameInteractor_Should(GI_VB_SET_CUCCO_COUNT, true, this)) {
+    if (GameInteractor_Should(VB_SET_CUCCO_COUNT, true, this)) {
         this->cuccosInPen = 0;
     }
     currentCucco = (EnNiw*)play->actorCtx.actorLists[ACTORCAT_PROP].head;
@@ -312,7 +312,7 @@ void func_80ABA654(EnNiwLady* this, PlayState* play) {
         if (!Flags_GetItemGetInf(ITEMGETINF_0C)) {
             this->actor.parent = NULL;
 
-            if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_ANJU_AS_CHILD, true, this)) {
+            if (GameInteractor_Should(VB_GIVE_ITEM_FROM_ANJU_AS_CHILD, true, this)) {
                 this->getItemId = GI_BOTTLE;
                 Actor_OfferGetItem(&this->actor, play, GI_BOTTLE, 100.0f, 50.0f);
             } else {
@@ -404,7 +404,7 @@ void func_80ABA9B8(EnNiwLady* this, PlayState* play) {
                 Message_CloseTextbox(play);
                 this->actor.parent = NULL;
 
-                if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_ANJU_AS_ADULT, true, this)) {
+                if (GameInteractor_Should(VB_GIVE_ITEM_FROM_ANJU_AS_ADULT, true, this)) {
                     Actor_OfferGetItem(&this->actor, play, GI_POCKET_EGG, 200.0f, 100.0f);
                     this->actionFunc = func_80ABAC00;
                 } else {
@@ -439,7 +439,7 @@ void func_80ABAB08(EnNiwLady* this, PlayState* play) {
             case 0:
                 Message_CloseTextbox(play);
                 this->actor.parent = NULL;
-                if (GameInteractor_Should(GI_VB_TRADE_POCKET_CUCCO, true, this)) {
+                if (GameInteractor_Should(VB_TRADE_POCKET_CUCCO, true, this)) {
                     Actor_OfferGetItem(&this->actor, play, GI_COJIRO, 200.0f, 100.0f);
                     this->actionFunc = func_80ABAC00;
                 } else {
@@ -481,7 +481,7 @@ void func_80ABAC84(EnNiwLady* this, PlayState* play) {
     }
     osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 正常終了 ☆☆☆☆☆ \n" VT_RST);
     if (LINK_IS_ADULT) {
-        if (GameInteractor_Should(GI_VB_ANJU_SET_OBTAINED_TRADE_ITEM, true, this)) {
+        if (GameInteractor_Should(VB_ANJU_SET_OBTAINED_TRADE_ITEM, true, this)) {
             if (!Flags_GetItemGetInf(ITEMGETINF_2C)) {
                 Flags_SetItemGetInf(ITEMGETINF_2C);
             } else {
diff --git a/soh/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c b/soh/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c
index 2a811ee9a..017c3fac1 100644
--- a/soh/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c
+++ b/soh/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c
@@ -193,7 +193,7 @@ void func_80ABF28C(EnOkarinaTag* this, PlayState* play) {
     if ((this->ocarinaSong != 6) || (gSaveContext.scarecrowSpawnSongSet)) {
         if ((this->switchFlag >= 0) && Flags_GetSwitch(play, this->switchFlag)) {
             this->actor.flags &= ~ACTOR_FLAG_TARGETABLE;
-        } else if (((this->type != 4) || GameInteractor_Should(GI_VB_BE_ELIGIBLE_TO_OPEN_DOT, !Flags_GetEventChkInf(EVENTCHKINF_OPENED_THE_DOOR_OF_TIME), this)) &&
+        } else if (((this->type != 4) || GameInteractor_Should(VB_BE_ELIGIBLE_TO_OPEN_DOT, !Flags_GetEventChkInf(EVENTCHKINF_OPENED_THE_DOOR_OF_TIME), this)) &&
                    ((this->type != 6) || !Flags_GetEventChkInf(EVENTCHKINF_DESTROYED_ROYAL_FAMILY_TOMB)) &&
                    (this->actor.xzDistToPlayer < (90.0f + this->interactRange)) &&
                    (fabsf(player->actor.world.pos.y - this->actor.world.pos.y) < 80.0f)) {
@@ -245,20 +245,20 @@ void func_80ABF4C8(EnOkarinaTag* this, PlayState* play) {
                 Flags_SetEventChkInf(EVENTCHKINF_OPENED_ZORAS_DOMAIN);
                 break;
             case 2: // Kakariko Windmill
-                if (GameInteractor_Should(GI_VB_PLAY_DRAIN_WELL_CS, true, this)) {
+                if (GameInteractor_Should(VB_PLAY_DRAIN_WELL_CS, true, this)) {
                     play->csCtx.segment = D_80ABF9D0;
                     gSaveContext.cutsceneTrigger = 1;
                 }
                 func_800F574C(1.18921f, 0x5A);
                 break;
             case 4: // Door of Time
-                if (GameInteractor_Should(GI_VB_PLAY_DOOR_OF_TIME_CS, true, this)) {
+                if (GameInteractor_Should(VB_PLAY_DOOR_OF_TIME_CS, true, this)) {
                     play->csCtx.segment = D_80ABFB40;
                     gSaveContext.cutsceneTrigger = 1;
                 }
                 break;
             case 6: // Royal Family Tomb
-                if (GameInteractor_Should(GI_VB_PLAY_ROYAL_FAMILY_TOMB_CS, true, this)) {
+                if (GameInteractor_Should(VB_PLAY_ROYAL_FAMILY_TOMB_CS, true, this)) {
                     play->csCtx.segment = LINK_IS_ADULT ? SEGMENTED_TO_VIRTUAL(&spot02_scene_Cs_003C80)
                                                              : SEGMENTED_TO_VIRTUAL(&spot02_scene_Cs_005020);
                     gSaveContext.cutsceneTrigger = 1;
@@ -313,7 +313,7 @@ void func_80ABF7CC(EnOkarinaTag* this, PlayState* play) {
 
     if ((Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(play)) {
         Message_CloseTextbox(play);
-        if (GameInteractor_Should(GI_VB_PLAY_SUNS_SONG_CS, !CHECK_QUEST_ITEM(QUEST_SONG_SUN), this)) {
+        if (GameInteractor_Should(VB_PLAY_SUNS_SONG_CS, !CHECK_QUEST_ITEM(QUEST_SONG_SUN), this)) {
             play->csCtx.segment = SEGMENTED_TO_VIRTUAL(&gSunSongGraveSunSongTeachCs);
             gSaveContext.cutsceneTrigger = 1;
         }
diff --git a/soh/src/overlays/actors/ovl_En_Owl/z_en_owl.c b/soh/src/overlays/actors/ovl_En_Owl/z_en_owl.c
index d46424b0b..c5f6acaee 100644
--- a/soh/src/overlays/actors/ovl_En_Owl/z_en_owl.c
+++ b/soh/src/overlays/actors/ovl_En_Owl/z_en_owl.c
@@ -283,7 +283,7 @@ s32 EnOwl_CheckInitTalk(EnOwl* this, PlayState* play, u16 textId, f32 targetDist
     } else {
         this->actor.textId = textId;
         distCheck = (flags & 2) ? 200.0f : 1000.0f;
-        if (GameInteractor_Should(GI_VB_OWL_INTERACTION, this->actor.xzDistToPlayer < targetDist, this)) {
+        if (GameInteractor_Should(VB_OWL_INTERACTION, this->actor.xzDistToPlayer < targetDist, this)) {
             this->actor.flags |= ACTOR_FLAG_WILL_TALK;
             func_8002F1C4(&this->actor, play, targetDist, distCheck, 0);
         }
diff --git a/soh/src/overlays/actors/ovl_En_Rl/z_en_rl.c b/soh/src/overlays/actors/ovl_En_Rl/z_en_rl.c
index eafa8b82e..e321540af 100644
--- a/soh/src/overlays/actors/ovl_En_Rl/z_en_rl.c
+++ b/soh/src/overlays/actors/ovl_En_Rl/z_en_rl.c
@@ -127,7 +127,7 @@ void func_80AE7590(EnRl* this, PlayState* play) {
         pos.y = player->actor.world.pos.y + 80.0f;
         pos.z = player->actor.world.pos.z;
         Actor_Spawn(&play->actorCtx, play, ACTOR_DEMO_EFFECT, pos.x, pos.y, pos.z, 0, 0, 0, 0xE, true);
-        if (GameInteractor_Should(GI_VB_GIVE_ITEM_LIGHT_MEDALLION, true, NULL)) {
+        if (GameInteractor_Should(VB_GIVE_ITEM_LIGHT_MEDALLION, true, NULL)) {
             Item_Give(play, ITEM_MEDALLION_LIGHT);
         }
         this->lightMedallionGiven = 1;
diff --git a/soh/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c b/soh/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c
index 93d1fd99c..008e0b6a5 100644
--- a/soh/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c
+++ b/soh/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c
@@ -261,7 +261,7 @@ void func_80AF2A38(EnRu2* this, PlayState* play) {
     f32 posZ = player->actor.world.pos.z;
 
     Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DEMO_EFFECT, posX, posY, posZ, 0, 0, 0, 10);
-    if (GameInteractor_Should(GI_VB_GIVE_ITEM_WATER_MEDALLION, true, NULL)) {
+    if (GameInteractor_Should(VB_GIVE_ITEM_WATER_MEDALLION, true, NULL)) {
         Item_Give(play, ITEM_MEDALLION_WATER);
     }
 }
@@ -276,7 +276,7 @@ void func_80AF2AB4(EnRu2* this, PlayState* play) {
         this->action = 1;
         play->csCtx.segment = &D_80AF411C;
         gSaveContext.cutsceneTrigger = 2;
-        if (GameInteractor_Should(GI_VB_GIVE_ITEM_WATER_MEDALLION, true, NULL)) {
+        if (GameInteractor_Should(VB_GIVE_ITEM_WATER_MEDALLION, true, NULL)) {
             Item_Give(play, ITEM_MEDALLION_WATER);
         }
         temp = this->actor.world.rot.y + 0x8000;
diff --git a/soh/src/overlays/actors/ovl_En_Sa/z_en_sa.c b/soh/src/overlays/actors/ovl_En_Sa/z_en_sa.c
index f2b2db3f9..616a4d700 100644
--- a/soh/src/overlays/actors/ovl_En_Sa/z_en_sa.c
+++ b/soh/src/overlays/actors/ovl_En_Sa/z_en_sa.c
@@ -391,10 +391,10 @@ s32 func_80AF5DFC(EnSa* this, PlayState* play) {
         return 1;
     }
     if (play->sceneNum == SCENE_SACRED_FOREST_MEADOW && (Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_ZELDAS_LETTER))) {
-        return GameInteractor_Should(GI_VB_BE_ELIGIBLE_FOR_SARIAS_SONG, !CHECK_QUEST_ITEM(QUEST_SONG_SARIA), NULL) ? 5 : 2;
+        return GameInteractor_Should(VB_BE_ELIGIBLE_FOR_SARIAS_SONG, !CHECK_QUEST_ITEM(QUEST_SONG_SARIA), NULL) ? 5 : 2;
     }
     if (play->sceneNum == SCENE_KOKIRI_FOREST && !CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD)) {
-        if (GameInteractor_Should(GI_VB_NOT_BE_GREETED_BY_SARIA, Flags_GetInfTable(INFTABLE_GREETED_BY_SARIA), NULL)) {
+        if (GameInteractor_Should(VB_NOT_BE_GREETED_BY_SARIA, Flags_GetInfTable(INFTABLE_GREETED_BY_SARIA), NULL)) {
             return 1;
         }
         return 4;
@@ -626,7 +626,7 @@ void func_80AF683C(EnSa* this, PlayState* play) {
     if (!(player->actor.world.pos.z >= -2220.0f) && !Play_InCsMode(play)) {
         // SOH [General] This flag was previously unused, but was named accordingly so we will make use of it. (Normally we should opt for soh_inf)
         Flags_SetEventChkInf(EVENTCHKINF_LEARNED_SARIAS_SONG);
-        if (GameInteractor_Should(GI_VB_PLAY_SARIAS_SONG_CS, true, this)) {
+        if (GameInteractor_Should(VB_PLAY_SARIAS_SONG_CS, true, this)) {
             play->csCtx.segment = SEGMENTED_TO_VIRTUAL(spot05_scene_Cs_005730);
             gSaveContext.cutsceneTrigger = 1;
             this->actionFunc = func_80AF68E4;
@@ -708,7 +708,7 @@ void func_80AF68E4(EnSa* this, PlayState* play) {
 
 void func_80AF6B20(EnSa* this, PlayState* play) {
     if (play->sceneNum == SCENE_SACRED_FOREST_MEADOW) {
-        if (GameInteractor_Should(GI_VB_GIVE_ITEM_SARIAS_SONG, true, NULL)) {
+        if (GameInteractor_Should(VB_GIVE_ITEM_SARIAS_SONG, true, NULL)) {
             Item_Give(play, ITEM_SONG_SARIA);
         }
         EnSa_ChangeAnim(this, ENSA_ANIM1_6);
diff --git a/soh/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c b/soh/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c
index 0f300d16f..c6aa6d56a 100644
--- a/soh/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c
+++ b/soh/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c
@@ -70,7 +70,7 @@ void EnShopnuts_Init(Actor* thisx, PlayState* play) {
     CollisionCheck_SetInfo(&this->actor.colChkInfo, NULL, &sColChkInfoInit);
     Collider_UpdateCylinder(&this->actor, &this->collider);
 
-    if (GameInteractor_Should(GI_VB_BUSINESS_SCRUB_DESPAWN,
+    if (GameInteractor_Should(VB_BUSINESS_SCRUB_DESPAWN,
         ((this->actor.params == 0x0002) && (Flags_GetItemGetInf(ITEMGETINF_0B))) ||
         ((this->actor.params == 0x0009) && (Flags_GetInfTable(INFTABLE_192))) ||
         ((this->actor.params == 0x000A) && (Flags_GetInfTable(INFTABLE_193))),
diff --git a/soh/src/overlays/actors/ovl_En_Si/z_en_si.c b/soh/src/overlays/actors/ovl_En_Si/z_en_si.c
index 8eb669d2d..170eed16e 100644
--- a/soh/src/overlays/actors/ovl_En_Si/z_en_si.c
+++ b/soh/src/overlays/actors/ovl_En_Si/z_en_si.c
@@ -94,7 +94,7 @@ void func_80AFB768(EnSi* this, PlayState* play) {
 
             if (this->collider.base.ocFlags2 & OC2_HIT_PLAYER) {
                 this->collider.base.ocFlags2 &= ~OC2_HIT_PLAYER;
-                if (GameInteractor_Should(GI_VB_GIVE_ITEM_SKULL_TOKEN, true, this)) {
+                if (GameInteractor_Should(VB_GIVE_ITEM_SKULL_TOKEN, true, this)) {
                     Item_Give(play, ITEM_SKULL_TOKEN);
                     player->actor.freezeTimer = 10;
                     Message_StartTextbox(play, 0xB4, NULL);
@@ -118,7 +118,7 @@ void func_80AFB89C(EnSi* this, PlayState* play) {
     this->actor.shape.rot.y += 0x400;
 
     if (!CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_HOOKSHOT_ATTACHED)) {
-        if (GameInteractor_Should(GI_VB_GIVE_ITEM_SKULL_TOKEN, true, this)) {
+        if (GameInteractor_Should(VB_GIVE_ITEM_SKULL_TOKEN, true, this)) {
             Item_Give(play, ITEM_SKULL_TOKEN);
             player->actor.freezeTimer = 10;
             Message_StartTextbox(play, 0xB4, NULL);
@@ -131,7 +131,7 @@ void func_80AFB89C(EnSi* this, PlayState* play) {
 void func_80AFB950(EnSi* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
 
-    if (Message_GetState(&play->msgCtx) != TEXT_STATE_CLOSING && GameInteractor_Should(GI_VB_GIVE_ITEM_SKULL_TOKEN, true, this)) {
+    if (Message_GetState(&play->msgCtx) != TEXT_STATE_CLOSING && GameInteractor_Should(VB_GIVE_ITEM_SKULL_TOKEN, true, this)) {
         player->actor.freezeTimer = 10;
     } else {
         SET_GS_FLAGS((this->actor.params & 0x1F00) >> 8, this->actor.params & 0xFF);
diff --git a/soh/src/overlays/actors/ovl_En_Skj/z_en_skj.c b/soh/src/overlays/actors/ovl_En_Skj/z_en_skj.c
index 94df7a49f..7398d00c0 100644
--- a/soh/src/overlays/actors/ovl_En_Skj/z_en_skj.c
+++ b/soh/src/overlays/actors/ovl_En_Skj/z_en_skj.c
@@ -1039,7 +1039,7 @@ void EnSkj_SariaSongTalk(EnSkj* this, PlayState* play) {
             EnSkj_SetupWaitInRange(this);
         } else {
             func_80AFFE24(this);
-            if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_SKULL_KID_SARIAS_SONG, true, this)) {
+            if (GameInteractor_Should(VB_GIVE_ITEM_FROM_SKULL_KID_SARIAS_SONG, true, this)) {
                 Actor_OfferGetItem(&this->actor, play, GI_HEART_PIECE, EnSkj_GetItemXzRange(this), EnSkj_GetItemYRange(this));
             }
         }
@@ -1051,11 +1051,11 @@ void func_80AFFE24(EnSkj* this) {
 }
 
 void func_80AFFE44(EnSkj* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_SKULL_KID_SARIAS_SONG, true, this)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_FROM_SKULL_KID_SARIAS_SONG, true, this)) {
         this->actor.parent = NULL;
         EnSkj_SetupPostSariasSong(this);
     } else {
-        if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_SKULL_KID_SARIAS_SONG, true, this)) {
+        if (GameInteractor_Should(VB_GIVE_ITEM_FROM_SKULL_KID_SARIAS_SONG, true, this)) {
             Actor_OfferGetItem(&this->actor, play, GI_HEART_PIECE, EnSkj_GetItemXzRange(this), EnSkj_GetItemYRange(this));
         }
     }
@@ -1066,7 +1066,7 @@ void EnSkj_SetupPostSariasSong(EnSkj* this) {
 }
 
 void EnSkj_ChangeModeAfterSong(EnSkj* this, PlayState* play) {
-    if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_SKULL_KID_SARIAS_SONG, true, this)) {
+    if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play) || !GameInteractor_Should(VB_GIVE_ITEM_FROM_SKULL_KID_SARIAS_SONG, true, this)) {
         Flags_SetItemGetInf(ITEMGETINF_16);
         EnSkj_SetNaviId(this);
         EnSkj_SetupWaitInRange(this);
@@ -1541,7 +1541,7 @@ void EnSkj_WaitForOfferResponse(EnSkj* this, PlayState* play) {
 
 void EnSkj_WonOcarinaMiniGame(EnSkj* this, PlayState* play) {
     if (D_80B01EA0) {
-        if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_OCARINA_MEMORY_GAME, true, this)) {
+        if (GameInteractor_Should(VB_GIVE_ITEM_FROM_OCARINA_MEMORY_GAME, true, this)) {
             this->actionFunc = EnSkj_WaitToGiveReward;
         }
     } else {
diff --git a/soh/src/overlays/actors/ovl_En_Sth/z_en_sth.c b/soh/src/overlays/actors/ovl_En_Sth/z_en_sth.c
index f8b50d823..c55af5cd4 100644
--- a/soh/src/overlays/actors/ovl_En_Sth/z_en_sth.c
+++ b/soh/src/overlays/actors/ovl_En_Sth/z_en_sth.c
@@ -277,14 +277,14 @@ void EnSth_GivePlayerItem(EnSth* this, PlayState* play) {
 }
 
 void EnSth_GiveReward(EnSth* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_SKULLTULA_REWARD, true, this)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_FROM_SKULLTULA_REWARD, true, this)) {
         this->actor.parent = NULL;
         EnSth_SetupAction(this, EnSth_RewardObtainedTalk);
         gSaveContext.eventChkInf[EVENTCHKINF_SKULLTULA_REWARD_INDEX] |= this->eventFlag;
         if (this->eventFlag != 0) {
             GameInteractor_ExecuteOnFlagSet(FLAG_EVENT_CHECK_INF, (EVENTCHKINF_SKULLTULA_REWARD_INDEX << 4) + sEventFlagsShift[this->actor.params]);
         }
-    } else if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_SKULLTULA_REWARD, true, this)) {
+    } else if (GameInteractor_Should(VB_GIVE_ITEM_FROM_SKULLTULA_REWARD, true, this)) {
         EnSth_GivePlayerItem(this, play);
     }
     EnSth_FacePlayer(this, play);
@@ -294,7 +294,7 @@ void EnSth_RewardUnobtainedTalk(EnSth* this, PlayState* play) {
     if ((Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(play)) {
         Message_CloseTextbox(play);
         EnSth_SetupAction(this, EnSth_GiveReward);
-        if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_SKULLTULA_REWARD, true, this)) {
+        if (GameInteractor_Should(VB_GIVE_ITEM_FROM_SKULLTULA_REWARD, true, this)) {
             EnSth_GivePlayerItem(this, play);
         }
     }
diff --git a/soh/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c b/soh/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
index a406049a9..4928048a3 100644
--- a/soh/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
+++ b/soh/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
@@ -386,7 +386,7 @@ void EnSyatekiMan_EndGame(EnSyatekiMan* this, PlayState* play) {
                             this->getItemId = GI_RUPEE_PURPLE;
                         }
                     }
-                    if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_SHOOTING_GALLERY, true, this)) {
+                    if (GameInteractor_Should(VB_GIVE_ITEM_FROM_SHOOTING_GALLERY, true, this)) {
                         Actor_OfferGetItem(&this->actor, play, this->getItemId, 2000.0f, 1000.0f);
                     }
                     this->actionFunc = EnSyatekiMan_GivePrize;
@@ -418,7 +418,7 @@ void EnSyatekiMan_EndGame(EnSyatekiMan* this, PlayState* play) {
 
 void EnSyatekiMan_GivePrize(EnSyatekiMan* this, PlayState* play) {
     SkelAnime_Update(&this->skelAnime);
-    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_SHOOTING_GALLERY, true, this)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_FROM_SHOOTING_GALLERY, true, this)) {
         this->actionFunc = EnSyatekiMan_FinishPrize;
     } else { 
         Actor_OfferGetItem(&this->actor, play, this->getItemId, 2000.0f, 1000.0f);
@@ -427,12 +427,12 @@ void EnSyatekiMan_GivePrize(EnSyatekiMan* this, PlayState* play) {
 
 void EnSyatekiMan_FinishPrize(EnSyatekiMan* this, PlayState* play) {
     SkelAnime_Update(&this->skelAnime);
-    if (((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) || !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_SHOOTING_GALLERY, true, this)) {
+    if (((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) || !GameInteractor_Should(VB_GIVE_ITEM_FROM_SHOOTING_GALLERY, true, this)) {
         // "Successful completion"
         osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 正常終了 ☆☆☆☆☆ \n" VT_RST);
         if (!LINK_IS_ADULT) {
             Flags_SetItemGetInf(ITEMGETINF_0D);
-        } else if (GameInteractor_Should(GI_VB_BE_ELIGIBLE_FOR_ADULT_SHOOTING_GAME_REWARD, (this->getItemId == GI_QUIVER_40) || (this->getItemId == GI_QUIVER_50), this)) {
+        } else if (GameInteractor_Should(VB_BE_ELIGIBLE_FOR_ADULT_SHOOTING_GAME_REWARD, (this->getItemId == GI_QUIVER_40) || (this->getItemId == GI_QUIVER_50), this)) {
             Flags_SetItemGetInf(ITEMGETINF_0E);
         }
         this->gameResult = SYATEKI_RESULT_NONE;
diff --git a/soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c b/soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c
index cdec042bc..0063b7c31 100644
--- a/soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c
+++ b/soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c
@@ -467,7 +467,7 @@ void func_80B14B6C(EnTa* this, PlayState* play) {
         EnTa_SetupAction(this, func_80B14AF4, EnTa_AnimRepeatCurrent);
         this->unk_2CC = 5;
         Flags_SetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE);
-        if (GameInteractor_Should(GI_VB_PLAY_ONEPOINT_ACTOR_CS, true, this)) {
+        if (GameInteractor_Should(VB_PLAY_ONEPOINT_ACTOR_CS, true, this)) {
             OnePointCutscene_EndCutscene(play, csCamIdx);
         }
         Animation_PlayOnce(&this->skelAnime, &gTalonRunTransitionAnim);
@@ -869,7 +869,7 @@ void EnTa_TalkGeneralInLonLonHouse(EnTa* this, PlayState* play) {
 }
 
 void EnTa_GiveItemInLonLonHouse(EnTa* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_TALONS_CHICKENS, true, &this->actor)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_FROM_TALONS_CHICKENS, true, &this->actor)) {
         this->actor.parent = NULL;
         this->actionFunc = EnTa_TalkGeneralInLonLonHouse;
         if (!(this->unk_2E0 & 0x2)) {
@@ -879,7 +879,7 @@ void EnTa_GiveItemInLonLonHouse(EnTa* this, PlayState* play) {
     } else if (this->unk_2E0 & 2) {
         Actor_OfferGetItem(&this->actor, play, GI_MILK, 10000.0f, 50.0f);
     } else {
-        if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_TALONS_CHICKENS, true, &this->actor)) {
+        if (GameInteractor_Should(VB_GIVE_ITEM_FROM_TALONS_CHICKENS, true, &this->actor)) {
             Actor_OfferGetItem(&this->actor, play, GI_MILK_BOTTLE, 10000.0f, 50.0f);
         }
     }
@@ -891,7 +891,7 @@ void EnTa_TalkAfterCuccoGameFirstWon(EnTa* this, PlayState* play) {
         Message_CloseTextbox(play);
         this->unk_2E0 &= ~0x2;
         EnTa_SetupAction(this, EnTa_GiveItemInLonLonHouse, EnTa_AnimRunToEnd);
-        if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_TALONS_CHICKENS, true, &this->actor)) {
+        if (GameInteractor_Should(VB_GIVE_ITEM_FROM_TALONS_CHICKENS, true, &this->actor)) {
             Actor_OfferGetItem(&this->actor, play, GI_MILK_BOTTLE, 10000.0f, 50.0f);
         }
     }
diff --git a/soh/src/overlays/actors/ovl_En_Tk/z_en_tk.c b/soh/src/overlays/actors/ovl_En_Tk/z_en_tk.c
index 342eed149..68979daca 100644
--- a/soh/src/overlays/actors/ovl_En_Tk/z_en_tk.c
+++ b/soh/src/overlays/actors/ovl_En_Tk/z_en_tk.c
@@ -495,7 +495,7 @@ void EnTk_Init(Actor* thisx, PlayState* play) {
 
     CollisionCheck_SetInfo2(&this->actor.colChkInfo, NULL, &sColChkInfoInit);
 
-    if (GameInteractor_Should(GI_VB_DAMPE_IN_GRAVEYARD_DESPAWN, gSaveContext.dayTime <= 0xC000 || gSaveContext.dayTime >= 0xE000 || LINK_IS_ADULT || play->sceneNum != SCENE_GRAVEYARD, this)) {
+    if (GameInteractor_Should(VB_DAMPE_IN_GRAVEYARD_DESPAWN, gSaveContext.dayTime <= 0xC000 || gSaveContext.dayTime >= 0xE000 || LINK_IS_ADULT || play->sceneNum != SCENE_GRAVEYARD, this)) {
         Actor_Kill(&this->actor);
         return;
     }
@@ -601,7 +601,7 @@ void EnTk_Dig(EnTk* this, PlayState* play) {
 
         this->rewardTimer = 0;
 
-        if (GameInteractor_Should(GI_VB_BE_VALID_GRAVEDIGGING_SPOT, this->validDigHere == 1, this)) {
+        if (GameInteractor_Should(VB_BE_VALID_GRAVEDIGGING_SPOT, this->validDigHere == 1, this)) {
             rewardOrigin.x = 0.0f;
             rewardOrigin.y = 0.0f;
             rewardOrigin.z = -40.0f;
@@ -615,12 +615,12 @@ void EnTk_Dig(EnTk* this, PlayState* play) {
 
             this->currentReward = EnTk_ChooseReward(this);
 
-            if (GameInteractor_Should(GI_VB_BE_DAMPE_GRAVEDIGGING_GRAND_PRIZE, this->currentReward == 3, this)) {
+            if (GameInteractor_Should(VB_BE_DAMPE_GRAVEDIGGING_GRAND_PRIZE, this->currentReward == 3, this)) {
                 /*
                  * Upgrade the purple rupee reward to the heart piece if this
                  * is the first grand prize dig.
                  */
-                if (GameInteractor_Should(GI_VB_DAMPE_GRAVEDIGGING_GRAND_PRIZE_BE_HEART_PIECE, !Flags_GetItemGetInf(ITEMGETINF_1C), this)) {
+                if (GameInteractor_Should(VB_DAMPE_GRAVEDIGGING_GRAND_PRIZE_BE_HEART_PIECE, !Flags_GetItemGetInf(ITEMGETINF_1C), this)) {
                     Flags_SetItemGetInf(ITEMGETINF_1C);
                     this->currentReward = 4;
                 }
diff --git a/soh/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c b/soh/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c
index 275b62ba1..88eeb6ebd 100644
--- a/soh/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c
+++ b/soh/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c
@@ -291,7 +291,7 @@ void func_80B20768(EnToryo* this, PlayState* play) {
     s16 sp32;
     s16 sp30;
 
-    if (this->unk_1E4 == 3 && !GameInteractor_Should(GI_VB_FIX_SAW_SOFTLOCK, false, NULL)) {
+    if (this->unk_1E4 == 3 && !GameInteractor_Should(VB_FIX_SAW_SOFTLOCK, false, NULL)) {
         Actor_ProcessTalkRequest(&this->actor, play);
         Message_ContinueTextbox(play, this->actor.textId);
         this->unk_1E4 = 1;
@@ -312,7 +312,7 @@ void func_80B20768(EnToryo* this, PlayState* play) {
     }
 
     if (this->unk_1E4 == 4) {
-        if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_TRADE_SAW, true, this)) {
+        if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_TRADE_SAW, true, this)) {
             this->actor.parent = NULL;
             this->unk_1E4 = 5;
             Flags_SetRandomizerInf(RAND_INF_ADULT_TRADES_GV_TRADE_SAW);
diff --git a/soh/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c b/soh/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c
index 5aeb0a86b..257ed2f86 100644
--- a/soh/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c
+++ b/soh/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c
@@ -195,7 +195,7 @@ void func_80B3A3D4(EnWonderTalk2* this, PlayState* play) {
                 this->unk_15A = true;
             }
             this->actor.flags &= ~(ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UPDATE_WHILE_CULLED);
-            if (GameInteractor_Should(GI_VB_WONDER_TALK, true, this)) {
+            if (GameInteractor_Should(VB_WONDER_TALK, true, this)) {
                 Player_SetCsActionWithHaltedActors(play, NULL, 7);
             }
             this->unk_156 = true;
@@ -255,7 +255,7 @@ void func_80B3A4F8(EnWonderTalk2* this, PlayState* play) {
             }
             this->unk_158 = 0;
             if (!this->unk_156) {
-                if (GameInteractor_Should(GI_VB_WONDER_TALK, true, this)) {
+                if (GameInteractor_Should(VB_WONDER_TALK, true, this)) {
                     Message_StartTextbox(play, this->actor.textId, NULL);
                     Player_SetCsActionWithHaltedActors(play, NULL, 8);
                 }
diff --git a/soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c b/soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c
index 283283804..b51b7f630 100644
--- a/soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c
+++ b/soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c
@@ -298,15 +298,15 @@ s32 EnXc_MinuetCS(EnXc* this, PlayState* play) {
 
         if (z < -2225.0f) {
             if (!Play_InCsMode(play)) {
-                if (GameInteractor_Should(GI_VB_PLAY_MINUET_OF_FOREST_CS, true, NULL)) {
+                if (GameInteractor_Should(VB_PLAY_MINUET_OF_FOREST_CS, true, NULL)) {
                     play->csCtx.segment = SEGMENTED_TO_VIRTUAL(&gMinuetCs);
                     gSaveContext.cutsceneTrigger = 1;
                 }
                 Flags_SetEventChkInf(EVENTCHKINF_LEARNED_MINUET_OF_FOREST);
-                if (GameInteractor_Should(GI_VB_GIVE_ITEM_MINUET_OF_FOREST, true, NULL)) {
+                if (GameInteractor_Should(VB_GIVE_ITEM_MINUET_OF_FOREST, true, NULL)) {
                     Item_Give(play, ITEM_SONG_MINUET);
                 }
-                if (GameInteractor_Should(GI_VB_PLAY_MINUET_OF_FOREST_CS, true, NULL)) {
+                if (GameInteractor_Should(VB_PLAY_MINUET_OF_FOREST_CS, true, NULL)) {
                     return true;
                 }
             }
@@ -335,15 +335,15 @@ s32 EnXc_BoleroCS(EnXc* this, PlayState* play) {
         if ((posRot->pos.x > -784.0f) && (posRot->pos.x < -584.0f) && (posRot->pos.y > 447.0f) &&
             (posRot->pos.y < 647.0f) && (posRot->pos.z > -446.0f) && (posRot->pos.z < -246.0f) &&
             !Play_InCsMode(play)) {
-            if (GameInteractor_Should(GI_VB_PLAY_BOLERO_OF_FIRE_CS, true, NULL)) {
+            if (GameInteractor_Should(VB_PLAY_BOLERO_OF_FIRE_CS, true, NULL)) {
                 play->csCtx.segment = SEGMENTED_TO_VIRTUAL(&gDeathMountainCraterBoleroCs);
                 gSaveContext.cutsceneTrigger = 1;
             }
             Flags_SetEventChkInf(EVENTCHKINF_LEARNED_BOLERO_OF_FIRE);
-            if (GameInteractor_Should(GI_VB_GIVE_ITEM_BOLERO_OF_FIRE, true, NULL)) {
+            if (GameInteractor_Should(VB_GIVE_ITEM_BOLERO_OF_FIRE, true, NULL)) {
                 Item_Give(play, ITEM_SONG_BOLERO);
             }
-            if (GameInteractor_Should(GI_VB_PLAY_BOLERO_OF_FIRE_CS, true, NULL)) {
+            if (GameInteractor_Should(VB_PLAY_BOLERO_OF_FIRE_CS, true, NULL)) {
                 return true;
             }
         }
@@ -354,7 +354,7 @@ s32 EnXc_BoleroCS(EnXc* this, PlayState* play) {
 
 void EnXc_SetupSerenadeAction(EnXc* this, PlayState* play) {
     // Player is adult and does not have iron boots and has not learned Serenade
-    if (GameInteractor_Should(GI_VB_SHIEK_PREPARE_TO_GIVE_SERENADE_OF_WATER, (!CHECK_OWNED_EQUIP(EQUIP_TYPE_BOOTS, EQUIP_INV_BOOTS_IRON) && !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_SERENADE_OF_WATER)) && LINK_IS_ADULT, NULL)) {
+    if (GameInteractor_Should(VB_SHIEK_PREPARE_TO_GIVE_SERENADE_OF_WATER, (!CHECK_OWNED_EQUIP(EQUIP_TYPE_BOOTS, EQUIP_INV_BOOTS_IRON) && !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_SERENADE_OF_WATER)) && LINK_IS_ADULT, NULL)) {
         this->action = SHEIK_ACTION_SERENADE;
         osSyncPrintf("水のセレナーデ シーク誕生!!!!!!!!!!!!!!!!!!\n");
     } else {
@@ -367,18 +367,18 @@ s32 EnXc_SerenadeCS(EnXc* this, PlayState* play) {
     if (this->actor.params == SHEIK_TYPE_SERENADE) {
         Player* player = GET_PLAYER(play);
         s32 stateFlags = player->stateFlags1;
-        if (GameInteractor_Should(GI_VB_BE_ELIGIBLE_FOR_SERENADE_OF_WATER, CHECK_OWNED_EQUIP(EQUIP_TYPE_BOOTS, EQUIP_INV_BOOTS_IRON) && !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_SERENADE_OF_WATER), NULL) &&
+        if (GameInteractor_Should(VB_BE_ELIGIBLE_FOR_SERENADE_OF_WATER, CHECK_OWNED_EQUIP(EQUIP_TYPE_BOOTS, EQUIP_INV_BOOTS_IRON) && !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_SERENADE_OF_WATER), NULL) &&
             !(stateFlags & PLAYER_STATE1_IN_CUTSCENE) && !Play_InCsMode(play)) {
-            if (GameInteractor_Should(GI_VB_PLAY_SERENADE_OF_WATER_CS, true, NULL)) {
+            if (GameInteractor_Should(VB_PLAY_SERENADE_OF_WATER_CS, true, NULL)) {
                 Cutscene_SetSegment(play, &gIceCavernSerenadeCs);
                 gSaveContext.cutsceneTrigger = 1;
             }
             Flags_SetEventChkInf(EVENTCHKINF_LEARNED_SERENADE_OF_WATER); // Learned Serenade of Water Flag
-            if (GameInteractor_Should(GI_VB_GIVE_ITEM_SERENADE_OF_WATER, true, NULL)) {
+            if (GameInteractor_Should(VB_GIVE_ITEM_SERENADE_OF_WATER, true, NULL)) {
                 Item_Give(play, ITEM_SONG_SERENADE);
             }
             osSyncPrintf("ブーツを取った!!!!!!!!!!!!!!!!!!\n");
-            if (GameInteractor_Should(GI_VB_PLAY_SERENADE_OF_WATER_CS, true, NULL)) {
+            if (GameInteractor_Should(VB_PLAY_SERENADE_OF_WATER_CS, true, NULL)) {
                 return true;
             }
         }
@@ -2185,17 +2185,17 @@ void EnXc_InitTempleOfTime(EnXc* this, PlayState* play) {
     if (LINK_IS_ADULT) {
         if (!Flags_GetEventChkInf(EVENTCHKINF_SHEIK_SPAWNED_AT_MASTER_SWORD_PEDESTAL)) {
             Flags_SetEventChkInf(EVENTCHKINF_SHEIK_SPAWNED_AT_MASTER_SWORD_PEDESTAL);
-            if (GameInteractor_Should(GI_VB_PLAY_SHIEK_BLOCK_MASTER_SWORD_CS, true, NULL)) {
+            if (GameInteractor_Should(VB_PLAY_SHIEK_BLOCK_MASTER_SWORD_CS, true, NULL)) {
                 play->csCtx.segment = SEGMENTED_TO_VIRTUAL(gTempleOfTimeFirstAdultCs);
                 gSaveContext.cutsceneTrigger = 1;
             }
             func_80B3EBF0(this, play);
-        } else if (GameInteractor_Should(GI_VB_BE_ELIGIBLE_FOR_PRELUDE_OF_LIGHT, !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT) && Flags_GetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP), NULL)) {
+        } else if (GameInteractor_Should(VB_BE_ELIGIBLE_FOR_PRELUDE_OF_LIGHT, !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT) && Flags_GetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP), NULL)) {
             Flags_SetEventChkInf(EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT);
-            if (GameInteractor_Should(GI_VB_GIVE_ITEM_PRELUDE_OF_LIGHT, true, NULL)) {
+            if (GameInteractor_Should(VB_GIVE_ITEM_PRELUDE_OF_LIGHT, true, NULL)) {
                 Item_Give(play, ITEM_SONG_PRELUDE);
             }
-            if (GameInteractor_Should(GI_VB_PLAY_PRELUDE_OF_LIGHT_CS, true, NULL)) {
+            if (GameInteractor_Should(VB_PLAY_PRELUDE_OF_LIGHT_CS, true, NULL)) {
                 play->csCtx.segment = SEGMENTED_TO_VIRTUAL(gTempleOfTimePreludeCs);
                 gSaveContext.cutsceneTrigger = 1;
             }
diff --git a/soh/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c b/soh/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c
index 9bc53169b..40351399e 100644
--- a/soh/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c
+++ b/soh/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c
@@ -634,7 +634,7 @@ void EnZl2_GiveLightArrows(EnZl2* this, PlayState* play) {
         posY = player->actor.world.pos.y + 80.0f;
         posZ = player->actor.world.pos.z;
         Actor_Spawn(&play->actorCtx, play, ACTOR_DEMO_EFFECT, posX, posY, posZ, 0, 0, 0, 0x17, true);
-        if (GameInteractor_Should(GI_VB_GIVE_ITEM_LIGHT_ARROW, true, NULL)) {
+        if (GameInteractor_Should(VB_GIVE_ITEM_LIGHT_ARROW, true, NULL)) {
             Item_Give(play, ITEM_ARROW_LIGHT);
         }
         this->unk_244 = 1;
diff --git a/soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c b/soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
index f2abefd97..215d6400c 100644
--- a/soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
+++ b/soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
@@ -1108,7 +1108,7 @@ s32 EnZl4_CsMakePlan(EnZl4* this, PlayState* play) {
                 Camera_ChangeSetting(GET_ACTIVE_CAM(play), 1);
                 this->talkState = 7;
                 play->talkWithPlayer(play, &this->actor);
-                if (GameInteractor_Should(GI_VB_GIVE_ITEM_ZELDAS_LETTER, true, NULL)) {
+                if (GameInteractor_Should(VB_GIVE_ITEM_ZELDAS_LETTER, true, NULL)) {
                     Actor_OfferGetItem(&this->actor, play, GI_LETTER_ZELDA, fabsf(this->actor.xzDistToPlayer) + 1.0f,
                                 fabsf(this->actor.yDistToPlayer) + 1.0f);
                 }
@@ -1117,7 +1117,7 @@ s32 EnZl4_CsMakePlan(EnZl4* this, PlayState* play) {
             }
             break;
         case 7:
-            if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_ZELDAS_LETTER, true, NULL)) {
+            if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_ZELDAS_LETTER, true, NULL)) {
                 Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ZL4_ANIM_0);
                 this->talkState++;
             } else {
diff --git a/soh/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c b/soh/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c
index d14862553..358a2efe7 100644
--- a/soh/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c
+++ b/soh/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c
@@ -179,7 +179,7 @@ void ItemOcarina_WaitInWater(ItemOcarina* this, PlayState* play) {
     if (
         Actor_HasParent(&this->actor, play) || 
         (
-            !GameInteractor_Should(GI_VB_GIVE_ITEM_OCARINA_OF_TIME, true, NULL) &&
+            !GameInteractor_Should(VB_GIVE_ITEM_OCARINA_OF_TIME, true, NULL) &&
             (this->actor.xzDistToPlayer < 20.0f) && (fabsf(this->actor.yDistToPlayer) < 10.0f) &&
             GET_PLAYER(play)->stateFlags2 & PLAYER_STATE2_DIVING
         )
@@ -189,7 +189,7 @@ void ItemOcarina_WaitInWater(ItemOcarina* this, PlayState* play) {
         this->actionFunc = ItemOcarina_StartSoTCutscene;
         this->actor.draw = NULL;
     } else {
-        if (GameInteractor_Should(GI_VB_GIVE_ITEM_OCARINA_OF_TIME, true, NULL)) {
+        if (GameInteractor_Should(VB_GIVE_ITEM_OCARINA_OF_TIME, true, NULL)) {
             Actor_OfferGetItem(&this->actor, play, GI_OCARINA_OOT, 30.0f, 50.0f);
         }
 
diff --git a/soh/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c b/soh/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c
index 9463d45af..94416ff5d 100644
--- a/soh/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c
+++ b/soh/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c
@@ -57,7 +57,7 @@ void ObjDekujr_Init(Actor* thisx, PlayState* play) {
         this->unk_19C = 0;
         this->unk_19B = 1;
     }
-    if (!GameInteractor_Should(GI_VB_DEKU_JR_CONSIDER_FOREST_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FOREST), this)) {
+    if (!GameInteractor_Should(VB_DEKU_JR_CONSIDER_FOREST_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FOREST), this)) {
         Actor_Kill(thisx);
     } else {
         ActorShape_Init(&thisx->shape, 0.0f, NULL, 0.0f);
diff --git a/soh/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c b/soh/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c
index 9220c6be4..e08291480 100644
--- a/soh/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c
+++ b/soh/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c
@@ -250,7 +250,7 @@ void ObjSwitch_SetOn(ObjSwitch* this, PlayState* play) {
         subType = (this->dyna.actor.params >> 4 & 7);
         Flags_SetSwitch(play, (this->dyna.actor.params >> 8 & 0x3F));
 
-        if (GameInteractor_Should(GI_VB_PLAY_ONEPOINT_ACTOR_CS, true, this)) {
+        if (GameInteractor_Should(VB_PLAY_ONEPOINT_ACTOR_CS, true, this)) {
             if (subType == 0 || subType == 4) {
                 OnePointCutscene_AttentionSetSfx(play, &this->dyna.actor, NA_SE_SY_CORRECT_CHIME);
             } else {
@@ -269,7 +269,7 @@ void ObjSwitch_SetOff(ObjSwitch* this, PlayState* play) {
         Flags_UnsetSwitch(play, (this->dyna.actor.params >> 8 & 0x3F));
 
         if ((this->dyna.actor.params >> 4 & 7) == 1) {
-            if (GameInteractor_Should(GI_VB_PLAY_ONEPOINT_ACTOR_CS, true, this)) {
+            if (GameInteractor_Should(VB_PLAY_ONEPOINT_ACTOR_CS, true, this)) {
                 OnePointCutscene_AttentionSetSfx(play, &this->dyna.actor, NA_SE_SY_TRE_BOX_APPEAR);
             }
             this->cooldownOn = true;
diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c
index 43a34c778..0b9b2303d 100644
--- a/soh/src/overlays/actors/ovl_player_actor/z_player.c
+++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c
@@ -6866,7 +6866,7 @@ s32 Player_ActionChange_2(Player* this, PlayState* play) {
                 }
 
                 func_80836898(play, this, func_8083A434);
-                if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_CHEST, true, chest)) {
+                if (GameInteractor_Should(VB_GIVE_ITEM_FROM_CHEST, true, chest)) {
                 this->stateFlags1 |= PLAYER_STATE1_GETTING_ITEM | PLAYER_STATE1_ITEM_OVER_HEAD | PLAYER_STATE1_IN_CUTSCENE;
                 func_8083AE40(this, giEntry.objectId);
                 }
@@ -8522,7 +8522,7 @@ void func_80842A88(PlayState* play, Player* this) {
 s32 func_80842AC4(PlayState* play, Player* this) {
     if ((this->heldItemAction == PLAYER_IA_DEKU_STICK) && (this->unk_85C > 0.5f)) {
 
-        if (GameInteractor_Should(GI_VB_DEKU_STICK_BREAK, AMMO(ITEM_STICK) != 0, NULL)) {
+        if (GameInteractor_Should(VB_DEKU_STICK_BREAK, AMMO(ITEM_STICK) != 0, NULL)) {
             EffectSsStick_Spawn(play, &this->bodyPartsPos[PLAYER_BODYPART_R_HAND],
                                 this->actor.shape.rot.y + 0x8000);
             this->unk_85C = 0.5f;
@@ -10238,7 +10238,7 @@ void Player_Init(Actor* thisx, PlayState* play2) {
 
     if ((sp50 == 0) || (sp50 < -1)) {
         titleFileSize = scene->titleFile.vromEnd - scene->titleFile.vromStart;
-        if (GameInteractor_Should(GI_VB_SHOW_TITLE_CARD, gSaveContext.showTitleCard, NULL)) {
+        if (GameInteractor_Should(VB_SHOW_TITLE_CARD, gSaveContext.showTitleCard, NULL)) {
             if ((gSaveContext.sceneSetupIndex < 4) &&
                 (gEntranceTable[((void)0, gSaveContext.entranceIndex) + ((void)0, gSaveContext.sceneSetupIndex)].field &
                  ENTRANCE_INFO_DISPLAY_TITLE_CARD_FLAG) &&
@@ -10944,21 +10944,21 @@ static Color_RGBA8 D_808547C0 = { 255, 50, 0, 0 };
 void Player_UpdateBurningDekuStick(PlayState* play, Player* this) {
     f32 temp;
 
-    if (GameInteractor_Should(GI_VB_DEKU_STICK_BURN_OUT, this->unk_85C == 0.0f, NULL)) {
+    if (GameInteractor_Should(VB_DEKU_STICK_BURN_OUT, this->unk_85C == 0.0f, NULL)) {
         Player_UseItem(play, this, ITEM_NONE);
         return;
     }
 
     temp = 1.0f;
     uint8_t vanillaShouldBurnOutCondition = DECR(this->unk_860) == 0;
-    if (GameInteractor_Should(GI_VB_DEKU_STICK_BURN_OUT, vanillaShouldBurnOutCondition, NULL)) {
+    if (GameInteractor_Should(VB_DEKU_STICK_BURN_OUT, vanillaShouldBurnOutCondition, NULL)) {
         Inventory_ChangeAmmo(ITEM_STICK, -1);
         this->unk_860 = 1;
         temp = 0.0f;
         this->unk_85C = temp;
     } else if (this->unk_860 > 200) {
         temp = (210 - this->unk_860) / 10.0f;
-    } else if (GameInteractor_Should(GI_VB_DEKU_STICK_BURN_DOWN, this->unk_860 < 20, NULL)) {
+    } else if (GameInteractor_Should(VB_DEKU_STICK_BURN_DOWN, this->unk_860 < 20, NULL)) {
         temp = this->unk_860 / 20.0f;
         this->unk_85C = temp;
     }
@@ -11260,7 +11260,7 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) {
     func_80836BEC(this, play);
 
     if (this->heldItemAction == PLAYER_IA_DEKU_STICK &&
-        GameInteractor_Should(GI_VB_DEKU_STICK_BE_ON_FIRE, this->unk_860 != 0, NULL)) {
+        GameInteractor_Should(VB_DEKU_STICK_BE_ON_FIRE, this->unk_860 != 0, NULL)) {
         Player_UpdateBurningDekuStick(play, this);
     } else if ((this->heldItemAction == PLAYER_IA_FISHING_POLE) && (this->unk_860 < 0)) {
         this->unk_860++;
@@ -13545,7 +13545,7 @@ s32 func_8084DFF4(PlayState* play, Player* this) {
         play->msgCtx.msgMode = MSGMODE_TEXT_DONE;
     } else {
         if (Message_GetState(&play->msgCtx) == TEXT_STATE_CLOSING) {
-            if (GameInteractor_Should(GI_VB_PLAY_NABOORU_CAPTURED_CS, this->getItemId == GI_GAUNTLETS_SILVER, NULL)) {
+            if (GameInteractor_Should(VB_PLAY_NABOORU_CAPTURED_CS, this->getItemId == GI_GAUNTLETS_SILVER, NULL)) {
                 play->nextEntranceIndex = ENTR_DESERT_COLOSSUS_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
                 gSaveContext.nextCutsceneIndex = 0xFFF1;

From 4bd0f2d2c1b176217909f10fdadb9c13121bdb06 Mon Sep 17 00:00:00 2001
From: Garrett Cox <garrettjcox@gmail.com>
Date: Sun, 5 May 2024 16:55:56 -0500
Subject: [PATCH 135/230] Port new hook filtering patterns from 2ship (#4117)

---
 .../game-interactor/GameInteractor.h          | 247 +++++++++++++-----
 .../game-interactor/GameInteractor_Hooks.cpp  |  27 ++
 2 files changed, 213 insertions(+), 61 deletions(-)

diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h
index 3a3a30d18..cca978b2d 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h
@@ -431,11 +431,17 @@ void GameInteractor_SetTriforceHuntCreditsWarpActive(uint8_t state);
 #include <nlohmann/json.hpp>
 #endif
 
-#define DEFINE_HOOK(name, type)         \
-    struct name {                       \
-        typedef std::function<type> fn; \
+typedef uint32_t HOOK_ID;
+
+#define DEFINE_HOOK(name, args)                  \
+    struct name {                                \
+        typedef std::function<void args> fn;     \
+        typedef std::function<bool args> filter; \
     }
 
+#define REGISTER_VB_SHOULD(flag, body) \
+    GameInteractor::Instance->RegisterGameHookForID<GameInteractor::ShouldVanillaBehavior>(flag, [](GIVanillaBehavior _, bool* should, void* opt) body)
+
 class GameInteractor {
 public:
     static GameInteractor* Instance;
@@ -487,11 +493,22 @@ public:
     static GameInteractionEffectQueryResult RemoveEffect(RemovableGameInteractionEffect* effect);
 
     // Game Hooks
-    uint32_t nextHookId = 1;
-    template <typename H> struct RegisteredGameHooks { inline static std::unordered_map<uint32_t, typename H::fn> functions; };
-    template <typename H> struct HooksToUnregister { inline static std::vector<uint32_t> hooks; };
-    template <typename H> uint32_t RegisterGameHook(typename H::fn h) {
-        // Ensure hook id is unique and not 0, which is reserved for invalid hooks
+    HOOK_ID nextHookId = 1;
+    template <typename H> struct RegisteredGameHooks {
+        inline static std::unordered_map<HOOK_ID, typename H::fn> functions;
+        inline static std::unordered_map<int32_t, std::unordered_map<HOOK_ID, typename H::fn>> functionsForID;
+        inline static std::unordered_map<uintptr_t, std::unordered_map<HOOK_ID, typename H::fn>> functionsForPtr;
+        inline static std::unordered_map<HOOK_ID, std::pair<typename H::filter, typename H::fn>> functionsForFilter;
+    };
+    template <typename H> struct HooksToUnregister {
+        inline static std::vector<HOOK_ID> hooks;
+        inline static std::vector<HOOK_ID> hooksForID;
+        inline static std::vector<HOOK_ID> hooksForPtr;
+        inline static std::vector<HOOK_ID> hooksForFilter;
+    };
+
+    // General Hooks
+    template <typename H> HOOK_ID RegisterGameHook(typename H::fn h) {
         if (this->nextHookId == 0 || this->nextHookId >= UINT32_MAX) this->nextHookId = 1;
         while (RegisteredGameHooks<H>::functions.find(this->nextHookId) != RegisteredGameHooks<H>::functions.end()) {
             this->nextHookId++;
@@ -500,10 +517,10 @@ public:
         RegisteredGameHooks<H>::functions[this->nextHookId] = h;
         return this->nextHookId++;
     }
-    template <typename H> void UnregisterGameHook(uint32_t id) {
-        HooksToUnregister<H>::hooks.push_back(id);
+    template <typename H> void UnregisterGameHook(HOOK_ID hookId) {
+        if (hookId == 0) return;
+        HooksToUnregister<H>::hooks.push_back(hookId);
     }
-
     template <typename H, typename... Args> void ExecuteHooks(Args&&... args) {
         for (auto& hookId : HooksToUnregister<H>::hooks) {
             RegisteredGameHooks<H>::functions.erase(hookId);
@@ -514,59 +531,167 @@ public:
         }
     }
 
-    DEFINE_HOOK(OnLoadGame, void(int32_t fileNum));
-    DEFINE_HOOK(OnExitGame, void(int32_t fileNum));
-    DEFINE_HOOK(OnGameFrameUpdate, void());
-    DEFINE_HOOK(OnItemReceive, void(GetItemEntry itemEntry));
-    DEFINE_HOOK(OnSaleEnd, void(GetItemEntry itemEntry));
-    DEFINE_HOOK(OnTransitionEnd, void(int16_t sceneNum));
-    DEFINE_HOOK(OnSceneInit, void(int16_t sceneNum));
-    DEFINE_HOOK(OnSceneFlagSet, void(int16_t sceneNum, int16_t flagType, int16_t flag));
-    DEFINE_HOOK(OnSceneFlagUnset, void(int16_t sceneNum, int16_t flagType, int16_t flag));
-    DEFINE_HOOK(OnFlagSet, void(int16_t flagType, int16_t flag));
-    DEFINE_HOOK(OnFlagUnset, void(int16_t flagType, int16_t flag));
-    DEFINE_HOOK(OnSceneSpawnActors, void());
-    DEFINE_HOOK(OnPlayerUpdate, void());
-    DEFINE_HOOK(OnOcarinaSongAction, void());
-    DEFINE_HOOK(OnShopSlotChange, void(uint8_t cursorIndex, int16_t price));
-    DEFINE_HOOK(OnActorInit, void(void* actor));
-    DEFINE_HOOK(OnActorUpdate, void(void* actor));
-    DEFINE_HOOK(OnActorKill, void(void* actor));
-    DEFINE_HOOK(OnEnemyDefeat, void(void* actor));
-    DEFINE_HOOK(OnPlayerBonk, void());
-    DEFINE_HOOK(OnPlayDestroy, void());
-    DEFINE_HOOK(OnPlayDrawEnd, void());
+    // ID based Hooks
+    template <typename H> HOOK_ID RegisterGameHookForID(int32_t id, typename H::fn h) {
+        if (this->nextHookId == 0 || this->nextHookId >= UINT32_MAX) this->nextHookId = 1;
+        while (RegisteredGameHooks<H>::functionsForID[id].find(this->nextHookId) != RegisteredGameHooks<H>::functionsForID[id].end()) {
+            this->nextHookId++;
+        }
 
-    DEFINE_HOOK(OnVanillaBehavior, void(GIVanillaBehavior flag, bool* result, void* opt));
+        RegisteredGameHooks<H>::functionsForID[id][this->nextHookId] = h;
+        return this->nextHookId++;
+    }
+    template <typename H> void UnregisterGameHookForID(HOOK_ID hookId) {
+        if (hookId == 0) return;
+        HooksToUnregister<H>::hooksForID.push_back(hookId);
+    }
+    template <typename H, typename... Args> void ExecuteHooksForID(int32_t id, Args&&... args) {
+        for (auto& hookId : HooksToUnregister<H>::hooksForID) {
+            for (auto it = RegisteredGameHooks<H>::functionsForID[id].begin(); it != RegisteredGameHooks<H>::functionsForID[id].end(); ) {
+                if (it->first == hookId) {
+                    it = RegisteredGameHooks<H>::functionsForID[id].erase(it);
+                    HooksToUnregister<H>::hooksForID.erase(std::remove(HooksToUnregister<H>::hooksForID.begin(), HooksToUnregister<H>::hooksForID.end(), hookId), HooksToUnregister<H>::hooksForID.end());
+                } else {
+                    ++it;
+                }
+            }
+        }
+        for (auto& hook : RegisteredGameHooks<H>::functionsForID[id]) {
+            hook.second(std::forward<Args>(args)...);
+        }
+    }
 
-    DEFINE_HOOK(OnSaveFile, void(int32_t fileNum));
-    DEFINE_HOOK(OnLoadFile, void(int32_t fileNum));
-    DEFINE_HOOK(OnDeleteFile, void(int32_t fileNum));
-    
-    DEFINE_HOOK(OnDialogMessage, void());
-    DEFINE_HOOK(OnPresentTitleCard, void());
-    DEFINE_HOOK(OnInterfaceUpdate, void());
-    DEFINE_HOOK(OnKaleidoscopeUpdate, void(int16_t inDungeonScene));
-    
-    DEFINE_HOOK(OnPresentFileSelect, void());
-    DEFINE_HOOK(OnUpdateFileSelectSelection, void(uint16_t optionIndex));
-    DEFINE_HOOK(OnUpdateFileSelectConfirmationSelection, void(uint16_t optionIndex));
-    DEFINE_HOOK(OnUpdateFileCopySelection, void(uint16_t optionIndex));
-    DEFINE_HOOK(OnUpdateFileCopyConfirmationSelection, void(uint16_t optionIndex));
-    DEFINE_HOOK(OnUpdateFileEraseSelection, void(uint16_t optionIndex));
-    DEFINE_HOOK(OnUpdateFileEraseConfirmationSelection, void(uint16_t optionIndex));
-    DEFINE_HOOK(OnUpdateFileAudioSelection, void(uint8_t optionIndex));
-    DEFINE_HOOK(OnUpdateFileTargetSelection, void(uint8_t optionIndex));
-    DEFINE_HOOK(OnUpdateFileLanguageSelection, void(uint8_t optionIndex));
-    DEFINE_HOOK(OnUpdateFileQuestSelection, void(uint8_t questIndex));
-    DEFINE_HOOK(OnUpdateFileBossRushOptionSelection, void(uint8_t optionIndex, uint8_t optionValue));
-    DEFINE_HOOK(OnUpdateFileNameSelection, void(int16_t charCode));
-    
-    DEFINE_HOOK(OnSetGameLanguage, void());
+    // PTR based Hooks
+    template <typename H> HOOK_ID RegisterGameHookForPtr(uintptr_t ptr, typename H::fn h) {
+        if (this->nextHookId == 0 || this->nextHookId >= UINT32_MAX) this->nextHookId = 1;
+        while (RegisteredGameHooks<H>::functionsForPtr[ptr].find(this->nextHookId) != RegisteredGameHooks<H>::functionsForPtr[ptr].end()) {
+            this->nextHookId++;
+        }
 
-    DEFINE_HOOK(OnFileDropped, void(std::string filePath));
-    DEFINE_HOOK(OnAssetAltChange, void());
-    DEFINE_HOOK(OnKaleidoUpdate, void());
+        RegisteredGameHooks<H>::functionsForPtr[ptr][this->nextHookId] = h;
+        return this->nextHookId++;
+    }
+    template <typename H> void UnregisterGameHookForPtr(HOOK_ID hookId) {
+        if (hookId == 0) return;
+        HooksToUnregister<H>::hooksForPtr.push_back(hookId);
+    }
+    template <typename H, typename... Args> void ExecuteHooksForPtr(uintptr_t ptr, Args&&... args) {
+        for (auto& hookId : HooksToUnregister<H>::hooksForPtr) {
+            for (auto it = RegisteredGameHooks<H>::functionsForPtr[ptr].begin(); it != RegisteredGameHooks<H>::functionsForPtr[ptr].end(); ) {
+                if (it->first == hookId) {
+                    it = RegisteredGameHooks<H>::functionsForPtr[ptr].erase(it);
+                    HooksToUnregister<H>::hooksForPtr.erase(std::remove(HooksToUnregister<H>::hooksForPtr.begin(), HooksToUnregister<H>::hooksForPtr.end(), hookId), HooksToUnregister<H>::hooksForPtr.end());
+                } else {
+                    ++it;
+                }
+            }
+        }
+        for (auto& hook : RegisteredGameHooks<H>::functionsForPtr[ptr]) {
+            hook.second(std::forward<Args>(args)...);
+        }
+    }
+
+    // Filter based Hooks
+    template <typename H> HOOK_ID RegisterGameHookForFilter(typename H::filter f, typename H::fn h) {
+        if (this->nextHookId == 0 || this->nextHookId >= UINT32_MAX) this->nextHookId = 1;
+        while (RegisteredGameHooks<H>::functionsForFilter.find(this->nextHookId) != RegisteredGameHooks<H>::functionsForFilter.end()) {
+            this->nextHookId++;
+        }
+
+        RegisteredGameHooks<H>::functionsForFilter[this->nextHookId] = std::make_pair(f, h);
+        return this->nextHookId++;
+    }
+    template <typename H> void UnregisterGameHookForFilter(HOOK_ID hookId) {
+        if (hookId == 0) return;
+        HooksToUnregister<H>::hooksForFilter.push_back(hookId);
+    }
+    template <typename H, typename... Args> void ExecuteHooksForFilter(Args&&... args) {
+        for (auto& hookId : HooksToUnregister<H>::hooksForFilter) {
+            RegisteredGameHooks<H>::functionsForFilter.erase(hookId);
+        }
+        HooksToUnregister<H>::hooksForFilter.clear();
+        for (auto& hook : RegisteredGameHooks<H>::functionsForFilter) {
+            if (hook.second.first(std::forward<Args>(args)...)) {
+                hook.second.second(std::forward<Args>(args)...);
+            }
+        }
+    }
+
+    class HookFilter {
+    public:
+        static auto ActorNotPlayer(Actor* actor) {
+            return actor->id != ACTOR_PLAYER;
+        }
+        // For use with Should hooks
+        static auto SActorNotPlayer(Actor* actor, bool* result) {
+            return actor->id != ACTOR_PLAYER;
+        }
+        static auto ActorMatchIdAndParams(int16_t id, int16_t params) {
+            return [id, params](Actor* actor) {
+                return actor->id == id && actor->params == params;
+            };
+        }
+        // For use with Should hooks
+        static auto SActorMatchIdAndParams(int16_t id, int16_t params) {
+            return [id, params](Actor* actor, bool* result) {
+                return actor->id == id && actor->params == params;
+            };
+        }
+    };
+
+    DEFINE_HOOK(OnLoadGame, (int32_t fileNum));
+    DEFINE_HOOK(OnExitGame, (int32_t fileNum));
+    DEFINE_HOOK(OnGameFrameUpdate, ());
+    DEFINE_HOOK(OnItemReceive, (GetItemEntry itemEntry));
+    DEFINE_HOOK(OnSaleEnd, (GetItemEntry itemEntry));
+    DEFINE_HOOK(OnTransitionEnd, (int16_t sceneNum));
+    DEFINE_HOOK(OnSceneInit, (int16_t sceneNum));
+    DEFINE_HOOK(OnSceneFlagSet, (int16_t sceneNum, int16_t flagType, int16_t flag));
+    DEFINE_HOOK(OnSceneFlagUnset, (int16_t sceneNum, int16_t flagType, int16_t flag));
+    DEFINE_HOOK(OnFlagSet, (int16_t flagType, int16_t flag));
+    DEFINE_HOOK(OnFlagUnset, (int16_t flagType, int16_t flag));
+    DEFINE_HOOK(OnSceneSpawnActors, ());
+    DEFINE_HOOK(OnPlayerUpdate, ());
+    DEFINE_HOOK(OnOcarinaSongAction, ());
+    DEFINE_HOOK(OnShopSlotChange, (uint8_t cursorIndex, int16_t price));
+    DEFINE_HOOK(OnActorInit, (void* actor));
+    DEFINE_HOOK(OnActorUpdate, (void* actor));
+    DEFINE_HOOK(OnActorKill, (void* actor));
+    DEFINE_HOOK(OnEnemyDefeat, (void* actor));
+    DEFINE_HOOK(OnPlayerBonk, ());
+    DEFINE_HOOK(OnPlayDestroy, ());
+    DEFINE_HOOK(OnPlayDrawEnd, ());
+
+    DEFINE_HOOK(OnVanillaBehavior, (GIVanillaBehavior flag, bool* result, void* opt));
+
+    DEFINE_HOOK(OnSaveFile, (int32_t fileNum));
+    DEFINE_HOOK(OnLoadFile, (int32_t fileNum));
+    DEFINE_HOOK(OnDeleteFile, (int32_t fileNum));
+    
+    DEFINE_HOOK(OnDialogMessage, ());
+    DEFINE_HOOK(OnPresentTitleCard, ());
+    DEFINE_HOOK(OnInterfaceUpdate, ());
+    DEFINE_HOOK(OnKaleidoscopeUpdate, (int16_t inDungeonScene));
+    
+    DEFINE_HOOK(OnPresentFileSelect, ());
+    DEFINE_HOOK(OnUpdateFileSelectSelection, (uint16_t optionIndex));
+    DEFINE_HOOK(OnUpdateFileSelectConfirmationSelection, (uint16_t optionIndex));
+    DEFINE_HOOK(OnUpdateFileCopySelection, (uint16_t optionIndex));
+    DEFINE_HOOK(OnUpdateFileCopyConfirmationSelection, (uint16_t optionIndex));
+    DEFINE_HOOK(OnUpdateFileEraseSelection, (uint16_t optionIndex));
+    DEFINE_HOOK(OnUpdateFileEraseConfirmationSelection, (uint16_t optionIndex));
+    DEFINE_HOOK(OnUpdateFileAudioSelection, (uint8_t optionIndex));
+    DEFINE_HOOK(OnUpdateFileTargetSelection, (uint8_t optionIndex));
+    DEFINE_HOOK(OnUpdateFileLanguageSelection, (uint8_t optionIndex));
+    DEFINE_HOOK(OnUpdateFileQuestSelection, (uint8_t questIndex));
+    DEFINE_HOOK(OnUpdateFileBossRushOptionSelection, (uint8_t optionIndex, uint8_t optionValue));
+    DEFINE_HOOK(OnUpdateFileNameSelection, (int16_t charCode));
+    
+    DEFINE_HOOK(OnSetGameLanguage, ());
+
+    DEFINE_HOOK(OnFileDropped, (std::string filePath));
+    DEFINE_HOOK(OnAssetAltChange, ());
+    DEFINE_HOOK(OnKaleidoUpdate, ());
 
     // Helpers
     static bool IsSaveLoaded(bool allowDbgSave = false);
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp
index b0c119798..93c8fc75e 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp
@@ -16,34 +16,44 @@ void GameInteractor_ExecuteOnGameFrameUpdate() {
 
 void GameInteractor_ExecuteOnItemReceiveHooks(GetItemEntry itemEntry) {
     GameInteractor::Instance->ExecuteHooks<GameInteractor::OnItemReceive>(itemEntry);
+    GameInteractor::Instance->ExecuteHooksForFilter<GameInteractor::OnItemReceive>(itemEntry);
 }
 
 void GameInteractor_ExecuteOnSaleEndHooks(GetItemEntry itemEntry) {
     GameInteractor::Instance->ExecuteHooks<GameInteractor::OnSaleEnd>(itemEntry);
+    GameInteractor::Instance->ExecuteHooksForFilter<GameInteractor::OnSaleEnd>(itemEntry);
 }
 
 void GameInteractor_ExecuteOnTransitionEndHooks(int16_t sceneNum) {
     GameInteractor::Instance->ExecuteHooks<GameInteractor::OnTransitionEnd>(sceneNum);
+    GameInteractor::Instance->ExecuteHooksForID<GameInteractor::OnTransitionEnd>(sceneNum, sceneNum);
+    GameInteractor::Instance->ExecuteHooksForFilter<GameInteractor::OnTransitionEnd>(sceneNum);
 }
 
 void GameInteractor_ExecuteOnSceneInitHooks(int16_t sceneNum) {
     GameInteractor::Instance->ExecuteHooks<GameInteractor::OnSceneInit>(sceneNum);
+    GameInteractor::Instance->ExecuteHooksForID<GameInteractor::OnSceneInit>(sceneNum, sceneNum);
+    GameInteractor::Instance->ExecuteHooksForFilter<GameInteractor::OnSceneInit>(sceneNum);
 }
 
 void GameInteractor_ExecuteOnSceneFlagSet(int16_t sceneNum, int16_t flagType, int16_t flag) {
     GameInteractor::Instance->ExecuteHooks<GameInteractor::OnSceneFlagSet>(sceneNum, flagType, flag);
+    GameInteractor::Instance->ExecuteHooksForFilter<GameInteractor::OnSceneFlagSet>(sceneNum, flagType, flag);
 }
 
 void GameInteractor_ExecuteOnSceneFlagUnset(int16_t sceneNum, int16_t flagType, int16_t flag) {
     GameInteractor::Instance->ExecuteHooks<GameInteractor::OnSceneFlagUnset>(sceneNum, flagType, flag);
+    GameInteractor::Instance->ExecuteHooksForFilter<GameInteractor::OnSceneFlagUnset>(sceneNum, flagType, flag);
 }
 
 void GameInteractor_ExecuteOnFlagSet(int16_t flagType, int16_t flag) {
     GameInteractor::Instance->ExecuteHooks<GameInteractor::OnFlagSet>(flagType, flag);
+    GameInteractor::Instance->ExecuteHooksForFilter<GameInteractor::OnFlagSet>(flagType, flag);
 }
 
 void GameInteractor_ExecuteOnFlagUnset(int16_t flagType, int16_t flag) {
     GameInteractor::Instance->ExecuteHooks<GameInteractor::OnFlagUnset>(flagType, flag);
+    GameInteractor::Instance->ExecuteHooksForFilter<GameInteractor::OnFlagUnset>(flagType, flag);
 }
 
 void GameInteractor_ExecuteOnSceneSpawnActors() {
@@ -64,18 +74,30 @@ void GameInteractor_ExecuteOnShopSlotChangeHooks(uint8_t cursorIndex, int16_t pr
 
 void GameInteractor_ExecuteOnActorInit(void* actor) {
     GameInteractor::Instance->ExecuteHooks<GameInteractor::OnActorInit>(actor);
+    GameInteractor::Instance->ExecuteHooksForID<GameInteractor::OnActorInit>(((Actor*)actor)->id, actor);
+    GameInteractor::Instance->ExecuteHooksForPtr<GameInteractor::OnActorInit>((uintptr_t)actor, actor);
+    GameInteractor::Instance->ExecuteHooksForFilter<GameInteractor::OnActorInit>(actor);
 }
 
 void GameInteractor_ExecuteOnActorUpdate(void* actor) {
     GameInteractor::Instance->ExecuteHooks<GameInteractor::OnActorUpdate>(actor);
+    GameInteractor::Instance->ExecuteHooksForID<GameInteractor::OnActorUpdate>(((Actor*)actor)->id, actor);
+    GameInteractor::Instance->ExecuteHooksForPtr<GameInteractor::OnActorUpdate>((uintptr_t)actor, actor);
+    GameInteractor::Instance->ExecuteHooksForFilter<GameInteractor::OnActorUpdate>(actor);
 }
 
 void GameInteractor_ExecuteOnActorKill(void* actor) {
     GameInteractor::Instance->ExecuteHooks<GameInteractor::OnActorKill>(actor);
+    GameInteractor::Instance->ExecuteHooksForID<GameInteractor::OnActorKill>(((Actor*)actor)->id, actor);
+    GameInteractor::Instance->ExecuteHooksForPtr<GameInteractor::OnActorKill>((uintptr_t)actor, actor);
+    GameInteractor::Instance->ExecuteHooksForFilter<GameInteractor::OnActorKill>(actor);
 }
 
 void GameInteractor_ExecuteOnEnemyDefeat(void* actor) {
     GameInteractor::Instance->ExecuteHooks<GameInteractor::OnEnemyDefeat>(actor);
+    GameInteractor::Instance->ExecuteHooksForID<GameInteractor::OnEnemyDefeat>(((Actor*)actor)->id, actor);
+    GameInteractor::Instance->ExecuteHooksForPtr<GameInteractor::OnEnemyDefeat>((uintptr_t)actor, actor);
+    GameInteractor::Instance->ExecuteHooksForFilter<GameInteractor::OnEnemyDefeat>(actor);
 }
 
 void GameInteractor_ExecuteOnPlayerBonk() {
@@ -92,6 +114,11 @@ void GameInteractor_ExecuteOnPlayDrawEnd() {
 
 bool GameInteractor_Should(GIVanillaBehavior flag, bool result, void* opt) {
     GameInteractor::Instance->ExecuteHooks<GameInteractor::OnVanillaBehavior>(flag, &result, opt);
+    GameInteractor::Instance->ExecuteHooksForID<GameInteractor::OnVanillaBehavior>(flag, flag, &result, opt);
+    if (opt != nullptr) {
+        GameInteractor::Instance->ExecuteHooksForPtr<GameInteractor::OnVanillaBehavior>((uintptr_t)opt, flag, &result, opt);
+    }
+    GameInteractor::Instance->ExecuteHooksForFilter<GameInteractor::OnVanillaBehavior>(flag, &result, opt);
     return result;
 }
 

From 69eebf09842f58b89c8da288dd329eeb58c6366b Mon Sep 17 00:00:00 2001
From: Malkierian <malkierian@gmail.com>
Date: Sun, 5 May 2024 22:27:33 -0700
Subject: [PATCH 136/230] CVar cleanup.

---
 soh/soh/Enhancements/cheat_hook_handlers.cpp  |   8 +-
 soh/soh/Enhancements/mods.cpp                 |   2 +-
 soh/soh/Enhancements/presets.h                |  40 +-
 .../randomizer/3drando/spoiler_log.cpp        |   3 +-
 soh/soh/Enhancements/randomizer/draw.cpp      |  26 +-
 .../Enhancements/randomizer/fishsanity.cpp    |   6 +-
 .../Enhancements/randomizer/hook_handlers.cpp |  10 +-
 .../Enhancements/randomizer/randomizer.cpp    |   2 +-
 .../randomizer/randomizer_item_tracker.cpp    |  26 +-
 soh/soh/Enhancements/randomizer/settings.cpp  | 382 +++++++++---------
 .../Enhancements/timesaver_hook_handlers.cpp  | 126 +++---
 soh/soh/OTRGlobals.cpp                        |   2 +-
 soh/soh/SohMenuBar.cpp                        | 132 +++---
 .../ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c   |   2 +-
 .../ovl_En_Syateki_Itm/z_en_syateki_itm.c     |   2 +-
 .../ovl_En_Syateki_Man/z_en_syateki_man.c     |   2 +-
 .../overlays/actors/ovl_Fishing/z_fishing.c   |   4 +-
 .../ovl_file_choose/z_file_choose.c           |   8 +-
 18 files changed, 392 insertions(+), 391 deletions(-)

diff --git a/soh/soh/Enhancements/cheat_hook_handlers.cpp b/soh/soh/Enhancements/cheat_hook_handlers.cpp
index c8565e8ab..a5a1a0d5a 100644
--- a/soh/soh/Enhancements/cheat_hook_handlers.cpp
+++ b/soh/soh/Enhancements/cheat_hook_handlers.cpp
@@ -15,13 +15,13 @@ extern PlayState* gPlayState;
 void CheatsOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void* opt) {
     switch (id) {
         case VB_DEKU_STICK_BREAK: {
-            if (CVarGetInteger("gDekuStickCheat", DEKU_STICK_NORMAL) != DEKU_STICK_NORMAL) {
+            if (CVarGetInteger(CVAR_CHEAT("DekuStickCheat"), DEKU_STICK_NORMAL) != DEKU_STICK_NORMAL) {
                 *should = false;
             }
             break;
         }
         case VB_DEKU_STICK_BE_ON_FIRE: {
-            if (CVarGetInteger("gDekuStickCheat", DEKU_STICK_NORMAL) == DEKU_STICK_UNBREAKABLE_AND_ALWAYS_ON_FIRE) {
+            if (CVarGetInteger(CVAR_CHEAT("DekuStickCheat"), DEKU_STICK_NORMAL) == DEKU_STICK_UNBREAKABLE_AND_ALWAYS_ON_FIRE) {
                 Player* player = GET_PLAYER(gPlayState);
                 player->unk_860 = 200;    // Keeps the stick's flame lit
                 player->unk_85C = 1.0f;   // Ensures the stick is the proper length
@@ -30,13 +30,13 @@ void CheatsOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void* op
             break;
         }
         case VB_DEKU_STICK_BURN_OUT: {
-            if (CVarGetInteger("gDekuStickCheat", DEKU_STICK_NORMAL) != DEKU_STICK_NORMAL) {
+            if (CVarGetInteger(CVAR_CHEAT("DekuStickCheat"), DEKU_STICK_NORMAL) != DEKU_STICK_NORMAL) {
                 *should = false;
             }
             break;
         }
         case VB_DEKU_STICK_BURN_DOWN: {
-            if (CVarGetInteger("gDekuStickCheat", DEKU_STICK_NORMAL) != DEKU_STICK_NORMAL) {
+            if (CVarGetInteger(CVAR_CHEAT("DekuStickCheat"), DEKU_STICK_NORMAL) != DEKU_STICK_NORMAL) {
                 *should = false;
             }
             break;
diff --git a/soh/soh/Enhancements/mods.cpp b/soh/soh/Enhancements/mods.cpp
index b08a7ef6d..f12b12174 100644
--- a/soh/soh/Enhancements/mods.cpp
+++ b/soh/soh/Enhancements/mods.cpp
@@ -1695,7 +1695,7 @@ extern "C" u8 Randomizer_GetSettingValue(RandomizerSettingKey randoSettingKey);
 
 void PatchCompasses() {
     s8 compassesCanBeOutsideDungeon = IS_RANDO && DUNGEON_ITEMS_CAN_BE_OUTSIDE_DUNGEON(RSK_SHUFFLE_MAPANDCOMPASS);
-    s8 isColoredCompassesEnabled = compassesCanBeOutsideDungeon && CVarGetInteger("gRandoEnhancement.MatchCompassColors", 1);
+    s8 isColoredCompassesEnabled = compassesCanBeOutsideDungeon && CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MatchCompassColors"), 1);
     if (isColoredCompassesEnabled) {
         ResourceMgr_PatchGfxByName(gGiCompassDL, "Compass_PrimColor", 5, gsDPNoOp());
         ResourceMgr_PatchGfxByName(gGiCompassDL, "Compass_EnvColor", 6, gsDPNoOp());
diff --git a/soh/soh/Enhancements/presets.h b/soh/soh/Enhancements/presets.h
index efe70a7f2..1f2888809 100644
--- a/soh/soh/Enhancements/presets.h
+++ b/soh/soh/Enhancements/presets.h
@@ -278,20 +278,20 @@ const std::vector<const char*> enhancementsCvars = {
     CVAR_ENHANCEMENT("PermanentHeartLoss"),
     CVAR_ENHANCEMENT("RemoveExplosiveLimit"),
     CVAR_ENHANCEMENT("ToggleStrength"),
-    "gTimeSavers.SkipCutscene.Intro",
-    "gTimeSavers.SkipCutscene.Entrances",
-    "gTimeSavers.SkipCutscene.Story",
-    "gTimeSavers.SkipCutscene.LearnSong",
-    "gTimeSavers.SkipCutscene.BossIntro",
-    "gTimeSavers.SkipCutscene.GlitchAiding",
-    "gTimeSavers.SkipCutscene.OnePoint",
-    "gTimeSavers.NoForcedDialog",
-    "gTimeSavers.SkipOwlInteractions",
-    "gTimeSavers.SkipMiscInteractions",
-    "gTimeSavers.DisableTitleCard",
-    "gTimeSavers.SkipGetItemAnimation",
-    "gTimeSavers.SkipChildStealth",
-    "gTimeSavers.SkipTowerEscape",
+    CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Intro"),
+    CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Entrances"),
+    CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"),
+    CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.LearnSong"),
+    CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.BossIntro"),
+    CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.GlitchAiding"),
+    CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.OnePoint"),
+    CVAR_ENHANCEMENT("TimeSavers.NoForcedDialog"),
+    CVAR_ENHANCEMENT("TimeSavers.SkipOwlInteractions"),
+    CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"),
+    CVAR_ENHANCEMENT("TimeSavers.DisableTitleCard"),
+    CVAR_ENHANCEMENT("TimeSavers.SkipGetItemAnimation"),
+    CVAR_ENHANCEMENT("TimeSavers.SkipChildStealth"),
+    CVAR_ENHANCEMENT("TimeSavers.SkipTowerEscape"),
 };
 
 const std::vector<const char*> cheatCvars = {
@@ -391,10 +391,10 @@ const std::vector<const char*> randomizerCvars = {
     CVAR_RANDOMIZER_SETTING("ExcludedLocations"),
     CVAR_RANDOMIZER_SETTING("Forest"),
     CVAR_RANDOMIZER_SETTING("FullWallets"),
-    "gRandomizeFishingPoleHint",
-    "gRandomizeFishsanity",
-    "gRandomizeFishsanityPondCount",
-    "gRandomizeFishsanityAgeSplit",
+    CVAR_RANDOMIZER_SETTING("FishingPoleHint"),
+    CVAR_RANDOMIZER_SETTING("Fishsanity"),
+    CVAR_RANDOMIZER_SETTING("FishsanityPondCount"),
+    CVAR_RANDOMIZER_SETTING("FishsanityAgeSplit"),
     CVAR_RANDOMIZER_SETTING("GanonTrial"),
     CVAR_RANDOMIZER_SETTING("GanonTrialCount"),
     CVAR_RANDOMIZER_SETTING("GerudoFortress"),
@@ -413,7 +413,7 @@ const std::vector<const char*> randomizerCvars = {
     CVAR_RANDOMIZER_SETTING("LacsRewardOptions"),
     CVAR_RANDOMIZER_SETTING("LacsStoneCount"),
     CVAR_RANDOMIZER_SETTING("LacsTokenCount"),
-    "gRandomizeGanondorfHint",
+    CVAR_RANDOMIZER_SETTING("GanondorfHint"),
     CVAR_RANDOMIZER_SETTING("LAHint"),
     CVAR_RANDOMIZER_SETTING("LinksPocket"),
     CVAR_RANDOMIZER_SETTING("LogicRules"),
@@ -437,7 +437,7 @@ const std::vector<const char*> randomizerCvars = {
     CVAR_RANDOMIZER_SETTING("ShuffleCows"),
     CVAR_RANDOMIZER_SETTING("ShuffleDungeonReward"),
     CVAR_RANDOMIZER_SETTING("ShuffleDungeonsEntrances"),
-    "gRandomizeShuffleFishingPole",
+    CVAR_RANDOMIZER_SETTING("ShuffleFishingPole"),
     CVAR_RANDOMIZER_SETTING("ShuffleFrogSongRupees"),
     CVAR_RANDOMIZER_SETTING("ShuffleGanonBossKey"),
     CVAR_RANDOMIZER_SETTING("ShuffleGerudoToken"),
diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
index 303d30574..c40031e74 100644
--- a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
@@ -29,6 +29,7 @@
 #include <variables.h>
 
 #include <Context.h>
+#include <soh/OTRGlobals.h>
 
 #include "consolevariablebridge.h"
 
@@ -659,7 +660,7 @@ const char* SpoilerLog_Write() {
     jsonFile << std::setw(4) << jsonString << std::endl;
     jsonFile.close();
 
-    CVarSetString("gSpoilerLog", (std::string("./Randomizer/") + fileName + std::string(".json")).c_str());
+    CVarSetString(CVAR_GENERAL("SpoilerLog"), (std::string("./Randomizer/") + fileName + std::string(".json")).c_str());
 
     // Note: probably shouldn't return this without making sure this string is stored somewhere, but
     // this return value is currently only used in playthrough.cpp as a true/false. Even if the pointer
diff --git a/soh/soh/Enhancements/randomizer/draw.cpp b/soh/soh/Enhancements/randomizer/draw.cpp
index b386b0226..338bfdb33 100644
--- a/soh/soh/Enhancements/randomizer/draw.cpp
+++ b/soh/soh/Enhancements/randomizer/draw.cpp
@@ -377,31 +377,31 @@ extern "C" void Randomizer_DrawBossSoul(PlayState* play, GetItemEntry* getItemEn
 
 extern "C" void Randomizer_DrawOcarinaButton(PlayState* play, GetItemEntry* getItemEntry) {
     Color_RGB8 aButtonColor = { 80, 150, 255 };
-    if (CVarGetInteger("gCosmetics.Hud_AButton.Changed", 0)) {
-        aButtonColor = CVarGetColor24("gCosmetics.Hud_AButton.Value", aButtonColor);
-    } else if (CVarGetInteger("gCosmetics.DefaultColorScheme", COLORSCHEME_N64) == COLORSCHEME_GAMECUBE) {
+    if (CVarGetInteger(CVAR_COSMETIC("HUD.AButton.Changed"), 0)) {
+        aButtonColor = CVarGetColor24(CVAR_COSMETIC("HUD.AButton.Value"), aButtonColor);
+    } else if (CVarGetInteger(CVAR_COSMETIC("DefaultColorScheme"), COLORSCHEME_N64) == COLORSCHEME_GAMECUBE) {
         aButtonColor = { 80, 255, 150 };
     }
 
     Color_RGB8 cButtonsColor = { 255, 255, 50 };
-    if (CVarGetInteger("gCosmetics.Hud_CButtons.Changed", 0)) {
-        cButtonsColor = CVarGetColor24("gCosmetics.Hud_CButtons.Value", cButtonsColor);
+    if (CVarGetInteger(CVAR_COSMETIC("HUD.CButtons.Changed"), 0)) {
+        cButtonsColor = CVarGetColor24(CVAR_COSMETIC("HUD.CButtons.Value"), cButtonsColor);
     }
     Color_RGB8 cUpButtonColor = cButtonsColor;
-    if (CVarGetInteger("gCosmetics.Hud_CUpButton.Changed", 0)) {
-        cUpButtonColor = CVarGetColor24("gCosmetics.Hud_CUpButton.Value", cUpButtonColor);
+    if (CVarGetInteger(CVAR_COSMETIC("HUD.CUpButton.Changed"), 0)) {
+        cUpButtonColor = CVarGetColor24(CVAR_COSMETIC("HUD.CUpButton.Value"), cUpButtonColor);
     }
     Color_RGB8 cDownButtonColor = cButtonsColor;
-    if (CVarGetInteger("gCosmetics.Hud_CDownButton.Changed", 0)) {
-        cDownButtonColor = CVarGetColor24("gCosmetics.Hud_CDownButton.Value", cDownButtonColor);
+    if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.Changed"), 0)) {
+        cDownButtonColor = CVarGetColor24(CVAR_COSMETIC("HUD.CDownButton.Value"), cDownButtonColor);
     }
     Color_RGB8 cLeftButtonColor = cButtonsColor;
-    if (CVarGetInteger("gCosmetics.Hud_CLeftButton.Changed", 0)) {
-        cLeftButtonColor = CVarGetColor24("gCosmetics.Hud_CLeftButton.Value", cLeftButtonColor);
+    if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.Changed"), 0)) {
+        cLeftButtonColor = CVarGetColor24(CVAR_COSMETIC("HUD.CLeftButton.Value"), cLeftButtonColor);
     }
     Color_RGB8 cRightButtonColor = cButtonsColor;
-    if (CVarGetInteger("gCosmetics.Hud_CRightButton.Changed", 0)) {
-        cRightButtonColor = CVarGetColor24("gCosmetics.Hud_CRightButton.Value", cRightButtonColor);
+    if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.Changed"), 0)) {
+        cRightButtonColor = CVarGetColor24(CVAR_COSMETIC("HUD.CRightButton.Value"), cRightButtonColor);
     }
 
     s16 slot = getItemEntry->drawItemId - RG_OCARINA_A_BUTTON;
diff --git a/soh/soh/Enhancements/randomizer/fishsanity.cpp b/soh/soh/Enhancements/randomizer/fishsanity.cpp
index 48ca2d703..52789f17e 100644
--- a/soh/soh/Enhancements/randomizer/fishsanity.cpp
+++ b/soh/soh/Enhancements/randomizer/fishsanity.cpp
@@ -167,9 +167,9 @@ namespace Rando {
         switch (optionsSource) {
             // Used in check tracker
             case FSO_SOURCE_CVARS:
-                options.mode = CVarGetInteger("gRandomizeFishsanity", RO_FISHSANITY_OFF);
-                options.numFish = CVarGetInteger("gRandomizeFishsanityPondCount", 0);
-                options.ageSplit = CVarGetInteger("gRandomizeFishsanityAgeSplit", 0) == 1;
+                options.mode = CVarGetInteger(CVAR_RANDOMIZER_SETTING("Fishsanity"), RO_FISHSANITY_OFF);
+                options.numFish = CVarGetInteger(CVAR_RANDOMIZER_SETTING("FishsanityPondCount"), 0);
+                options.ageSplit = CVarGetInteger(CVAR_RANDOMIZER_SETTING("FishsanityAgeSplit"), 0) == 1;
                 break;
             case FSO_SOURCE_RANDO:
             default:
diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index 8360ece10..257666a61 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -250,9 +250,9 @@ void RandomizerOnPlayerUpdateForRCQueueHandler() {
             // Always show ItemGet animation for ice traps
             !(getItemEntry.modIndex == MOD_RANDOMIZER && getItemEntry.getItemId == RG_ICE_TRAP) &&
             (
-                CVarGetInteger("gTimeSavers.SkipGetItemAnimation", SGIA_DISABLED) == SGIA_ALL ||
+                CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipGetItemAnimation"), SGIA_DISABLED) == SGIA_ALL ||
                 (
-                    CVarGetInteger("gTimeSavers.SkipGetItemAnimation", SGIA_DISABLED) == SGIA_JUNK &&
+                    CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipGetItemAnimation"), SGIA_DISABLED) == SGIA_JUNK &&
                     (
                         getItemEntry.getItemCategory == ITEM_CATEGORY_JUNK ||
                         getItemEntry.getItemCategory == ITEM_CATEGORY_SKULLTULA_TOKEN ||
@@ -311,7 +311,7 @@ void RandomizerOnItemReceiveHandler(GetItemEntry receivedItemEntry) {
         }
     }
 
-    if (loc->GetRandomizerCheck() == RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST && !CVarGetInteger("gTimeSavers.SkipCutscene.Story", IS_RANDO)) {
+    if (loc->GetRandomizerCheck() == RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST && !CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
         static uint32_t updateHook;
         updateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnPlayerUpdate>([]() {
             Player* player = GET_PLAYER(gPlayState);
@@ -355,7 +355,7 @@ void EnExItem_WaitForObjectRandomized(EnExItem* enExItem, PlayState* play) {
 }
 
 void EnItem00_DrawRandomizedItem(EnItem00* enItem00, PlayState* play) {
-    f32 mtxScale = CVarGetFloat("gTimeSavers.SkipGetItemAnimationScale", 10.0f);
+    f32 mtxScale = CVarGetFloat(CVAR_ENHANCEMENT("TimeSavers.SkipGetItemAnimationScale"), 10.0f);
     Matrix_Scale(mtxScale, mtxScale, mtxScale, MTXMODE_APPLY);
     EnItem00_CustomItemsParticles(&enItem00->actor, play, enItem00->itemEntry);
     GetItemEntry_Draw(play, enItem00->itemEntry);
@@ -1205,7 +1205,7 @@ void ObjComb_RandomizerChooseItemDrop(ObjComb* objComb, PlayState* play) {
         } else if (Rand_ZeroOne() < 0.5f) {
             params = -1;
         }
-        if (params >= 0 && !CVarGetInteger("gNoRandomDrops", 0)) {
+        if (params >= 0 && !CVarGetInteger(CVAR_ENHANCEMENT("NoRandomDrops"), 0)) {
             Item_DropCollectible(play, &objComb->actor.world.pos, params);
         }
     }
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index a35762354..77f1e7888 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -1819,7 +1819,7 @@ void RandomizerSettingsWindow::DrawElement() {
         ImGui::BeginDisabled(CVarGetInteger(CVAR_RANDOMIZER_SETTING("LogicRules"), RO_LOGIC_GLITCHLESS) == RO_LOGIC_VANILLA);
         if (ImGui::BeginTabItem("Items")) {
             ImGui::PushStyleVar(ImGuiStyleVar_CellPadding, cellPadding);
-            ImGui::BeginDisabled(CVarGetInteger("gRandomizeLogicRules", RO_LOGIC_GLITCHLESS) == RO_LOGIC_VANILLA);
+            ImGui::BeginDisabled(CVarGetInteger(CVAR_RANDOMIZER_SETTING("LogicRules"), RO_LOGIC_GLITCHLESS) == RO_LOGIC_VANILLA);
             if (mSettings->GetOptionGroup(RSG_ITEMS_IMGUI_TABLE).RenderImGui()) {
                 mNeedsUpdate = true;
             }
diff --git a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
index 940b62079..6371708d6 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
@@ -1127,15 +1127,15 @@ void UpdateVectors() {
     }
 
     // if misc is separate and fishing pole isn't added, add fishing pole to misc
-    if (CVarGetInteger("gItemTrackerFishingPoleDisplayType", SECTION_DISPLAY_EXTENDED_HIDDEN) == SECTION_DISPLAY_EXTENDED_MISC_WINDOW &&
-        CVarGetInteger("gItemTrackerMiscItemsDisplayType", SECTION_DISPLAY_MAIN_WINDOW) != SECTION_DISPLAY_MAIN_WINDOW) {
+    if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.FishingPole"), SECTION_DISPLAY_EXTENDED_HIDDEN) == SECTION_DISPLAY_EXTENDED_MISC_WINDOW &&
+        CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Misc"), SECTION_DISPLAY_MAIN_WINDOW) != SECTION_DISPLAY_MAIN_WINDOW) {
         if (std::none_of(miscItems.begin(), miscItems.end(), [](ItemTrackerItem item) { return item.id == ITEM_FISHING_POLE; }))
             miscItems.insert(miscItems.end(), fishingPoleItems.begin(), fishingPoleItems.end());
     } else {
         miscItems.erase(std::remove_if(miscItems.begin(), miscItems.end(), [](ItemTrackerItem i) { return i.id == ITEM_FISHING_POLE; }), miscItems.end());
     }
     // add fishing pole to main window
-    if (CVarGetInteger("gItemTrackerFishingPoleDisplayType", SECTION_DISPLAY_EXTENDED_HIDDEN) == SECTION_DISPLAY_EXTENDED_MAIN_WINDOW) {
+    if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.FishingPole"), SECTION_DISPLAY_EXTENDED_HIDDEN) == SECTION_DISPLAY_EXTENDED_MAIN_WINDOW) {
         if (!newRowAdded) {
             while (mainWindowItems.size() % 6) {
                 mainWindowItems.push_back(ITEM_TRACKER_ITEM(ITEM_NONE, 0, DrawItem));
@@ -1147,7 +1147,7 @@ void UpdateVectors() {
     }
 
     //If we're adding boss souls to the main window...
-    if (CVarGetInteger("gItemTrackerBossSoulsDisplayType", SECTION_DISPLAY_HIDDEN) == SECTION_DISPLAY_MAIN_WINDOW) {
+    if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.BossSouls"), SECTION_DISPLAY_HIDDEN) == SECTION_DISPLAY_MAIN_WINDOW) {
         //...add empty items on the main window to get the souls on their own row. (Too many to sit with Greg/Triforce pieces)
         while (mainWindowItems.size() % 6) {
             mainWindowItems.push_back(ITEM_TRACKER_ITEM(ITEM_NONE, 0, DrawItem));
@@ -1158,7 +1158,7 @@ void UpdateVectors() {
     }
 
     //If we're adding ocarina buttons to the main window...
-    if (CVarGetInteger("gItemTrackerOcarinaButtonsDisplayType", SECTION_DISPLAY_HIDDEN) == SECTION_DISPLAY_MAIN_WINDOW) {
+    if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.OcarinaButtons"), SECTION_DISPLAY_HIDDEN) == SECTION_DISPLAY_MAIN_WINDOW) {
         //...add empty items on the main window to get the buttons on their own row. (Too many to sit with Greg/Triforce pieces/boss souls)
         while (mainWindowItems.size() % 6) {
             mainWindowItems.push_back(ITEM_TRACKER_ITEM(ITEM_NONE, 0, DrawItem));
@@ -1212,7 +1212,7 @@ void ItemTrackerWindow::DrawElement() {
             (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.DungeonItems"), SECTION_DISPLAY_HIDDEN) == SECTION_DISPLAY_MAIN_WINDOW) ||
             (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Greg"), SECTION_DISPLAY_EXTENDED_HIDDEN) == SECTION_DISPLAY_EXTENDED_MAIN_WINDOW) ||
             (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.TriforcePieces"), SECTION_DISPLAY_HIDDEN) == SECTION_DISPLAY_MAIN_WINDOW) ||
-            (CVarGetInteger("gItemTrackerFishingPoleDisplayType", SECTION_DISPLAY_EXTENDED_HIDDEN) == SECTION_DISPLAY_EXTENDED_MAIN_WINDOW) ||
+            (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.FishingPole"), SECTION_DISPLAY_EXTENDED_HIDDEN) == SECTION_DISPLAY_EXTENDED_MAIN_WINDOW) ||
             (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Notes"), SECTION_DISPLAY_HIDDEN) == SECTION_DISPLAY_MAIN_WINDOW)
         ) {
             BeginFloatingWindows("Item Tracker##main window");
@@ -1289,19 +1289,19 @@ void ItemTrackerWindow::DrawElement() {
             EndFloatingWindows();
         }
 
-        if (CVarGetInteger("gItemTrackerBossSoulsDisplayType", SECTION_DISPLAY_HIDDEN) == SECTION_DISPLAY_SEPARATE) {
+        if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.BossSouls"), SECTION_DISPLAY_HIDDEN) == SECTION_DISPLAY_SEPARATE) {
             BeginFloatingWindows("Boss Soul Tracker");
             DrawItemsInRows(bossSoulItems);
             EndFloatingWindows();
         }
 
-        if (CVarGetInteger("gItemTrackerOcarinaButtonsDisplayType", SECTION_DISPLAY_HIDDEN) == SECTION_DISPLAY_SEPARATE) {
+        if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.OcarinaButtons"), SECTION_DISPLAY_HIDDEN) == SECTION_DISPLAY_SEPARATE) {
             BeginFloatingWindows("Ocarina Button Tracker");
             DrawItemsInRows(ocarinaButtonItems);
             EndFloatingWindows();
         }
 
-        if (CVarGetInteger("gItemTrackerFishingPoleDisplayType", SECTION_DISPLAY_EXTENDED_HIDDEN) == SECTION_DISPLAY_EXTENDED_SEPARATE) {
+        if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.FishingPole"), SECTION_DISPLAY_EXTENDED_HIDDEN) == SECTION_DISPLAY_EXTENDED_SEPARATE) {
             BeginFloatingWindows("Fishing Pole Tracker");
             DrawItemsInRows(fishingPoleItems);
             EndFloatingWindows();
@@ -1443,19 +1443,19 @@ void ItemTrackerSettingsWindow::DrawElement() {
         shouldUpdateVectors = true;
     }
 
-    if (UIWidgets::LabeledRightAlignedEnhancementCombobox("Triforce Pieces", "gItemTrackerTriforcePiecesDisplayType", displayTypes, SECTION_DISPLAY_HIDDEN)) {
+    if (UIWidgets::LabeledRightAlignedEnhancementCombobox("Triforce Pieces", CVAR_TRACKER_ITEM("DisplayType.TriforcePieces"), displayTypes, SECTION_DISPLAY_HIDDEN)) {
         shouldUpdateVectors = true;
     }
 
-    if (UIWidgets::LabeledRightAlignedEnhancementCombobox("Boss Souls", "gItemTrackerBossSoulsDisplayType", displayTypes, SECTION_DISPLAY_HIDDEN)) {
+    if (UIWidgets::LabeledRightAlignedEnhancementCombobox("Boss Souls", CVAR_TRACKER_ITEM("DisplayType.BossSouls"), displayTypes, SECTION_DISPLAY_HIDDEN)) {
         shouldUpdateVectors = true;
     }
 
-    if (UIWidgets::LabeledRightAlignedEnhancementCombobox("Ocarina Buttons", "gItemTrackerOcarinaButtonsDisplayType", displayTypes, SECTION_DISPLAY_HIDDEN)) {
+    if (UIWidgets::LabeledRightAlignedEnhancementCombobox("Ocarina Buttons", CVAR_TRACKER_ITEM("DisplayType.OcarinaButtons"), displayTypes, SECTION_DISPLAY_HIDDEN)) {
         shouldUpdateVectors = true;
     }
 
-    if (UIWidgets::LabeledRightAlignedEnhancementCombobox("Fishing Pole", "gItemTrackerFishingPoleDisplayType", extendedDisplayTypes, SECTION_DISPLAY_EXTENDED_HIDDEN)) {
+    if (UIWidgets::LabeledRightAlignedEnhancementCombobox("Fishing Pole", CVAR_TRACKER_ITEM("DisplayType.FishingPole"), extendedDisplayTypes, SECTION_DISPLAY_EXTENDED_HIDDEN)) {
         shouldUpdateVectors = true;
     }
 
diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
index 76cda498a..11a42aefb 100644
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -42,171 +42,171 @@ Settings::Settings() : mExcludeLocationsOptionsGroups(SPOILER_COLLECTION_GROUP_C
 void Settings::CreateOptions() {
     CreateOptionDescriptions();
     // clang-format off
-    mOptions[RSK_FOREST] = Option::U8("Forest", {"Closed", "Closed Deku", "Open"}, OptionCategory::Setting, "gRandomizeForest", mOptionDescriptions[RSK_FOREST], WidgetType::Combobox, RO_FOREST_CLOSED);
-    mOptions[RSK_KAK_GATE] = Option::U8("Kakariko Gate", {"Closed", "Open"}, OptionCategory::Setting, "gRandomizeKakarikoGate", mOptionDescriptions[RSK_KAK_GATE]);
-    mOptions[RSK_DOOR_OF_TIME] = Option::U8("Door of Time", {"Closed", "Song only", "Open"}, OptionCategory::Setting, "gRandomizeDoorOfTime", mOptionDescriptions[RSK_DOOR_OF_TIME], WidgetType::Combobox);
-    mOptions[RSK_ZORAS_FOUNTAIN] = Option::U8("Zora's Fountain", {"Closed", "Closed as child", "Open"}, OptionCategory::Setting, "gRandomizeZorasFountain", mOptionDescriptions[RSK_ZORAS_FOUNTAIN]);
-    mOptions[RSK_GERUDO_FORTRESS] = Option::U8("Gerudo Fortress", {"Normal", "Fast", "Open"}, OptionCategory::Setting, "gRandomizeGerudoFortress", mOptionDescriptions[RSK_GERUDO_FORTRESS]);
-    mOptions[RSK_RAINBOW_BRIDGE] = Option::U8("Rainbow Bridge", {"Vanilla", "Always open", "Stones", "Medallions", "Dungeon rewards", "Dungeons", "Tokens", "Greg"}, OptionCategory::Setting, "gRandomizeRainbowBridge", mOptionDescriptions[RSK_RAINBOW_BRIDGE], WidgetType::Combobox, RO_BRIDGE_VANILLA, false, IMFLAG_NONE);
-    mOptions[RSK_RAINBOW_BRIDGE_STONE_COUNT] = Option::U8("Stone Count", {NumOpts(0, 4)}, OptionCategory::Setting, "gRandomizeStoneCount", "", WidgetType::Slider, 3, true);
-    mOptions[RSK_RAINBOW_BRIDGE_MEDALLION_COUNT] = Option::U8("Medallion Count", {NumOpts(0, 7)}, OptionCategory::Setting, "gRandomizeMedallionCount", "", WidgetType::Slider, 6, true);
-    mOptions[RSK_RAINBOW_BRIDGE_REWARD_COUNT] = Option::U8("Reward Count", {NumOpts(0, 10)}, OptionCategory::Setting, "gRandomizeRewardCount", "", WidgetType::Slider, 9, true);
-    mOptions[RSK_RAINBOW_BRIDGE_DUNGEON_COUNT] = Option::U8("Dungeon Count", {NumOpts(0, 9)}, OptionCategory::Setting, "gRandomizeDungeonCount", "", WidgetType::Slider, 8, true);
-    mOptions[RSK_RAINBOW_BRIDGE_TOKEN_COUNT] = Option::U8("Token Count", {NumOpts(0, 100)}, OptionCategory::Setting, "gRandomizeTokenCount", "", WidgetType::Slider, 100, true);
-    mOptions[RSK_BRIDGE_OPTIONS] = Option::U8("Bridge Reward Options", {"Standard Rewards", "Greg as Reward", "Greg as Wildcard"}, OptionCategory::Setting, "gRandomizeBridgeRewardOptions", mOptionDescriptions[RSK_BRIDGE_OPTIONS], WidgetType::Combobox, RO_BRIDGE_STANDARD_REWARD, false, IMFLAG_NONE);
-    mOptions[RSK_GANONS_TRIALS] = Option::U8("Ganon's Trials", {"Skip", "Set Number", "Random Number"}, OptionCategory::Setting, "gRandomizeGanonTrial", mOptionDescriptions[RSK_GANONS_TRIALS], WidgetType::Combobox, RO_GANONS_TRIALS_SET_NUMBER);
-    mOptions[RSK_TRIAL_COUNT] = Option::U8("Ganon's Trials Count", {NumOpts(0, 6)}, OptionCategory::Setting, "gRandomizeGanonTrialCount", mOptionDescriptions[RSK_TRIAL_COUNT], WidgetType::Slider, 6, true);
-    mOptions[RSK_STARTING_AGE] = Option::U8("Starting Age", {"Child", "Adult", "Random"}, OptionCategory::Setting, "gRandomizeStartingAge", mOptionDescriptions[RSK_STARTING_AGE], WidgetType::Combobox, RO_AGE_CHILD);
+    mOptions[RSK_FOREST] = Option::U8("Forest", {"Closed", "Closed Deku", "Open"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("Forest"), mOptionDescriptions[RSK_FOREST], WidgetType::Combobox, RO_FOREST_CLOSED);
+    mOptions[RSK_KAK_GATE] = Option::U8("Kakariko Gate", {"Closed", "Open"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("KakarikoGate"), mOptionDescriptions[RSK_KAK_GATE]);
+    mOptions[RSK_DOOR_OF_TIME] = Option::U8("Door of Time", {"Closed", "Song only", "Open"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("DoorOfTime"), mOptionDescriptions[RSK_DOOR_OF_TIME], WidgetType::Combobox);
+    mOptions[RSK_ZORAS_FOUNTAIN] = Option::U8("Zora's Fountain", {"Closed", "Closed as child", "Open"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ZorasFountain"), mOptionDescriptions[RSK_ZORAS_FOUNTAIN]);
+    mOptions[RSK_GERUDO_FORTRESS] = Option::U8("Gerudo Fortress", {"Normal", "Fast", "Open"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("GerudoFortress"), mOptionDescriptions[RSK_GERUDO_FORTRESS]);
+    mOptions[RSK_RAINBOW_BRIDGE] = Option::U8("Rainbow Bridge", {"Vanilla", "Always open", "Stones", "Medallions", "Dungeon rewards", "Dungeons", "Tokens", "Greg"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("RainbowBridge"), mOptionDescriptions[RSK_RAINBOW_BRIDGE], WidgetType::Combobox, RO_BRIDGE_VANILLA, false, IMFLAG_NONE);
+    mOptions[RSK_RAINBOW_BRIDGE_STONE_COUNT] = Option::U8("Stone Count", {NumOpts(0, 4)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("StoneCount"), "", WidgetType::Slider, 3, true);
+    mOptions[RSK_RAINBOW_BRIDGE_MEDALLION_COUNT] = Option::U8("Medallion Count", {NumOpts(0, 7)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("MedallionCount"), "", WidgetType::Slider, 6, true);
+    mOptions[RSK_RAINBOW_BRIDGE_REWARD_COUNT] = Option::U8("Reward Count", {NumOpts(0, 10)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("RewardCount"), "", WidgetType::Slider, 9, true);
+    mOptions[RSK_RAINBOW_BRIDGE_DUNGEON_COUNT] = Option::U8("Dungeon Count", {NumOpts(0, 9)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("DungeonCount"), "", WidgetType::Slider, 8, true);
+    mOptions[RSK_RAINBOW_BRIDGE_TOKEN_COUNT] = Option::U8("Token Count", {NumOpts(0, 100)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("TokenCount"), "", WidgetType::Slider, 100, true);
+    mOptions[RSK_BRIDGE_OPTIONS] = Option::U8("Bridge Reward Options", {"Standard Rewards", "Greg as Reward", "Greg as Wildcard"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("BridgeRewardOptions"), mOptionDescriptions[RSK_BRIDGE_OPTIONS], WidgetType::Combobox, RO_BRIDGE_STANDARD_REWARD, false, IMFLAG_NONE);
+    mOptions[RSK_GANONS_TRIALS] = Option::U8("Ganon's Trials", {"Skip", "Set Number", "Random Number"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("GanonTrial"), mOptionDescriptions[RSK_GANONS_TRIALS], WidgetType::Combobox, RO_GANONS_TRIALS_SET_NUMBER);
+    mOptions[RSK_TRIAL_COUNT] = Option::U8("Ganon's Trials Count", {NumOpts(0, 6)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("GanonTrialCount"), mOptionDescriptions[RSK_TRIAL_COUNT], WidgetType::Slider, 6, true);
+    mOptions[RSK_STARTING_AGE] = Option::U8("Starting Age", {"Child", "Adult", "Random"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("StartingAge"), mOptionDescriptions[RSK_STARTING_AGE], WidgetType::Combobox, RO_AGE_CHILD);
     mOptions[RSK_SHUFFLE_ENTRANCES] = Option::Bool("Shuffle Entrances");
-    mOptions[RSK_SHUFFLE_DUNGEON_ENTRANCES] = Option::U8("Dungeon Entrances", {"Off", "On", "On + Ganon"}, OptionCategory::Setting, "gRandomizeShuffleDungeonsEntrances", mOptionDescriptions[RSK_SHUFFLE_DUNGEON_ENTRANCES], WidgetType::Combobox, RO_DUNGEON_ENTRANCE_SHUFFLE_OFF);
-    mOptions[RSK_SHUFFLE_BOSS_ENTRANCES] = Option::U8("Boss Entrances", {"Off", "Age Restricted", "Full"}, OptionCategory::Setting, "gRandomizeShuffleBossEntrances", mOptionDescriptions[RSK_SHUFFLE_BOSS_ENTRANCES], WidgetType::Combobox, RO_BOSS_ROOM_ENTRANCE_SHUFFLE_OFF);
-    mOptions[RSK_SHUFFLE_OVERWORLD_ENTRANCES] = Option::Bool("Overworld Entrances", "gRandomizeShuffleOverworldEntrances", mOptionDescriptions[RSK_SHUFFLE_OVERWORLD_ENTRANCES]);
-    mOptions[RSK_SHUFFLE_INTERIOR_ENTRANCES] = Option::U8("Interior Entrances", {"Off", "Simple", "All"}, OptionCategory::Setting, "gRandomizeShuffleInteriorsEntrances", mOptionDescriptions[RSK_SHUFFLE_INTERIOR_ENTRANCES], WidgetType::Combobox, RO_INTERIOR_ENTRANCE_SHUFFLE_OFF);
-    mOptions[RSK_SHUFFLE_GROTTO_ENTRANCES] = Option::Bool("Grottos Entrances", "gRandomizeShuffleGrottosEntrances", mOptionDescriptions[RSK_SHUFFLE_GROTTO_ENTRANCES]);
-    mOptions[RSK_SHUFFLE_OWL_DROPS] = Option::Bool("Owl Drops", "gRandomizeShuffleOwlDrops", mOptionDescriptions[RSK_SHUFFLE_OWL_DROPS]);
-    mOptions[RSK_SHUFFLE_WARP_SONGS] = Option::Bool("Warp Songs", "gRandomizeShuffleWarpSongs", mOptionDescriptions[RSK_SHUFFLE_WARP_SONGS]);
-    mOptions[RSK_SHUFFLE_OVERWORLD_SPAWNS] = Option::Bool("Overworld Spawns", "gRandomizeShuffleOverworldSpanws", mOptionDescriptions[RSK_SHUFFLE_OVERWORLD_SPAWNS]);
-    mOptions[RSK_MIXED_ENTRANCE_POOLS] = Option::Bool("Mixed Entrance Pools", "gRandomizeMixedEntrances", mOptionDescriptions[RSK_MIXED_ENTRANCE_POOLS]);
-    mOptions[RSK_MIX_DUNGEON_ENTRANCES] = Option::Bool("Mix Dungeons", "gRandomizeMixDungeons", mOptionDescriptions[RSK_MIX_DUNGEON_ENTRANCES], IMFLAG_NONE);
-    mOptions[RSK_MIX_BOSS_ENTRANCES] = Option::Bool("Mix Bosses", "gRandomizeMixBosses", mOptionDescriptions[RSK_MIX_BOSS_ENTRANCES], IMFLAG_NONE);
-    mOptions[RSK_MIX_OVERWORLD_ENTRANCES] = Option::Bool("Mix Overworld", "gRandomizeMixOverworld", mOptionDescriptions[RSK_MIX_OVERWORLD_ENTRANCES], IMFLAG_NONE);
-    mOptions[RSK_MIX_INTERIOR_ENTRANCES] = Option::Bool("Mix Interiors", "gRandomizeMixInteriors", mOptionDescriptions[RSK_MIX_INTERIOR_ENTRANCES], IMFLAG_NONE);
-    mOptions[RSK_MIX_GROTTO_ENTRANCES] = Option::Bool("Mix Grottos", "gRandomizeMixGrottos", mOptionDescriptions[RSK_MIX_GROTTO_ENTRANCES]);
-    mOptions[RSK_DECOUPLED_ENTRANCES] = Option::Bool("Decouple Entrances", "gRandomizeDecoupleEntrances", mOptionDescriptions[RSK_DECOUPLED_ENTRANCES]);
-    mOptions[RSK_BOMBCHUS_IN_LOGIC] = Option::Bool("Bombchus in Logic", "gRandomizeBombchusInLogic", mOptionDescriptions[RSK_BOMBCHUS_IN_LOGIC]);
-    mOptions[RSK_ENABLE_BOMBCHU_DROPS] = Option::U8("Bombchu Drops", {"No", "Yes"}, OptionCategory::Setting, "gRandomizeEnableBombchuDrops", mOptionDescriptions[RSK_ENABLE_BOMBCHU_DROPS], WidgetType::Combobox, RO_AMMO_DROPS_ON);
+    mOptions[RSK_SHUFFLE_DUNGEON_ENTRANCES] = Option::U8("Dungeon Entrances", {"Off", "On", "On + Ganon"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleDungeonsEntrances"), mOptionDescriptions[RSK_SHUFFLE_DUNGEON_ENTRANCES], WidgetType::Combobox, RO_DUNGEON_ENTRANCE_SHUFFLE_OFF);
+    mOptions[RSK_SHUFFLE_BOSS_ENTRANCES] = Option::U8("Boss Entrances", {"Off", "Age Restricted", "Full"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleBossEntrances"), mOptionDescriptions[RSK_SHUFFLE_BOSS_ENTRANCES], WidgetType::Combobox, RO_BOSS_ROOM_ENTRANCE_SHUFFLE_OFF);
+    mOptions[RSK_SHUFFLE_OVERWORLD_ENTRANCES] = Option::Bool("Overworld Entrances", CVAR_RANDOMIZER_SETTING("ShuffleOverworldEntrances"), mOptionDescriptions[RSK_SHUFFLE_OVERWORLD_ENTRANCES]);
+    mOptions[RSK_SHUFFLE_INTERIOR_ENTRANCES] = Option::U8("Interior Entrances", {"Off", "Simple", "All"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleInteriorsEntrances"), mOptionDescriptions[RSK_SHUFFLE_INTERIOR_ENTRANCES], WidgetType::Combobox, RO_INTERIOR_ENTRANCE_SHUFFLE_OFF);
+    mOptions[RSK_SHUFFLE_GROTTO_ENTRANCES] = Option::Bool("Grottos Entrances", CVAR_RANDOMIZER_SETTING("ShuffleGrottosEntrances"), mOptionDescriptions[RSK_SHUFFLE_GROTTO_ENTRANCES]);
+    mOptions[RSK_SHUFFLE_OWL_DROPS] = Option::Bool("Owl Drops", CVAR_RANDOMIZER_SETTING("ShuffleOwlDrops"), mOptionDescriptions[RSK_SHUFFLE_OWL_DROPS]);
+    mOptions[RSK_SHUFFLE_WARP_SONGS] = Option::Bool("Warp Songs", CVAR_RANDOMIZER_SETTING("ShuffleWarpSongs"), mOptionDescriptions[RSK_SHUFFLE_WARP_SONGS]);
+    mOptions[RSK_SHUFFLE_OVERWORLD_SPAWNS] = Option::Bool("Overworld Spawns", CVAR_RANDOMIZER_SETTING("ShuffleOverworldSpanws"), mOptionDescriptions[RSK_SHUFFLE_OVERWORLD_SPAWNS]);
+    mOptions[RSK_MIXED_ENTRANCE_POOLS] = Option::Bool("Mixed Entrance Pools", CVAR_RANDOMIZER_SETTING("MixedEntrances"), mOptionDescriptions[RSK_MIXED_ENTRANCE_POOLS]);
+    mOptions[RSK_MIX_DUNGEON_ENTRANCES] = Option::Bool("Mix Dungeons", CVAR_RANDOMIZER_SETTING("MixDungeons"), mOptionDescriptions[RSK_MIX_DUNGEON_ENTRANCES], IMFLAG_NONE);
+    mOptions[RSK_MIX_BOSS_ENTRANCES] = Option::Bool("Mix Bosses", CVAR_RANDOMIZER_SETTING("MixBosses"), mOptionDescriptions[RSK_MIX_BOSS_ENTRANCES], IMFLAG_NONE);
+    mOptions[RSK_MIX_OVERWORLD_ENTRANCES] = Option::Bool("Mix Overworld", CVAR_RANDOMIZER_SETTING("MixOverworld"), mOptionDescriptions[RSK_MIX_OVERWORLD_ENTRANCES], IMFLAG_NONE);
+    mOptions[RSK_MIX_INTERIOR_ENTRANCES] = Option::Bool("Mix Interiors", CVAR_RANDOMIZER_SETTING("MixInteriors"), mOptionDescriptions[RSK_MIX_INTERIOR_ENTRANCES], IMFLAG_NONE);
+    mOptions[RSK_MIX_GROTTO_ENTRANCES] = Option::Bool("Mix Grottos", CVAR_RANDOMIZER_SETTING("MixGrottos"), mOptionDescriptions[RSK_MIX_GROTTO_ENTRANCES]);
+    mOptions[RSK_DECOUPLED_ENTRANCES] = Option::Bool("Decouple Entrances", CVAR_RANDOMIZER_SETTING("DecoupleEntrances"), mOptionDescriptions[RSK_DECOUPLED_ENTRANCES]);
+    mOptions[RSK_BOMBCHUS_IN_LOGIC] = Option::Bool("Bombchus in Logic", CVAR_RANDOMIZER_SETTING("BombchusInLogic"), mOptionDescriptions[RSK_BOMBCHUS_IN_LOGIC]);
+    mOptions[RSK_ENABLE_BOMBCHU_DROPS] = Option::U8("Bombchu Drops", {"No", "Yes"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("EnableBombchuDrops"), mOptionDescriptions[RSK_ENABLE_BOMBCHU_DROPS], WidgetType::Combobox, RO_AMMO_DROPS_ON);
     // TODO: AmmoDrops and/or HeartDropRefill, combine with/separate Ammo Drops from Bombchu Drops?
-    mOptions[RSK_TRIFORCE_HUNT] = Option::Bool("Triforce Hunt", "gRandomizeTriforceHunt", mOptionDescriptions[RSK_TRIFORCE_HUNT], IMFLAG_NONE);
-    mOptions[RSK_TRIFORCE_HUNT_PIECES_TOTAL] = Option::U8("Triforce Hunt Total Pieces", {NumOpts(1, 100)}, OptionCategory::Setting, "gRandomizeTriforceHuntTotalPieces", mOptionDescriptions[RSK_TRIFORCE_HUNT_PIECES_TOTAL], WidgetType::Slider, 29, false, IMFLAG_NONE);
-    mOptions[RSK_TRIFORCE_HUNT_PIECES_REQUIRED] = Option::U8("Triforce Hunt Required Pieces", {NumOpts(1, 100)}, OptionCategory::Setting, "gRandomizeTriforceHuntRequiredPieces", mOptionDescriptions[RSK_TRIFORCE_HUNT_PIECES_REQUIRED], WidgetType::Slider, 19);
-    mOptions[RSK_MQ_DUNGEON_RANDOM] = Option::U8("MQ Dungeon Setting", {"None", "Set Number", "Random", "Selection Only"}, OptionCategory::Setting, "gRandomizeMqDungeons", mOptionDescriptions[RSK_MQ_DUNGEON_RANDOM], WidgetType::Combobox, RO_MQ_DUNGEONS_NONE, true, IMFLAG_NONE);
-    mOptions[RSK_MQ_DUNGEON_COUNT] = Option::U8("MQ Dungeon Count", {NumOpts(0, 12)}, OptionCategory::Setting, "gRandomizeMqDungeonCount", "", WidgetType::Slider, 12, true, IMFLAG_NONE);
-    mOptions[RSK_MQ_DUNGEON_SET] = Option::Bool("Set Dungeon Quests", {"Off", "On"}, OptionCategory::Setting, "gRandomizeMqDungeonsSelection", mOptionDescriptions[RSK_MQ_DUNGEON_SET], WidgetType::Checkbox, false, false, IMFLAG_NONE);
-    mOptions[RSK_MQ_DEKU_TREE] = Option::U8("Deku Tree", {"Vanilla", "Master Quest", "Random"}, OptionCategory::Setting, "gRandomizeMqDungeonsDekuTree", "", WidgetType::Combobox, RO_MQ_SET_VANILLA, false, IMFLAG_NONE);
-    mOptions[RSK_MQ_DODONGOS_CAVERN] = Option::U8("Dodongo's Cavern", {"Vanilla", "Master Quest", "Random"}, OptionCategory::Setting, "gRandomizeMqDungeonsDodongosCavern", "", WidgetType::Combobox, RO_MQ_SET_VANILLA, false, IMFLAG_NONE);
-    mOptions[RSK_MQ_JABU_JABU] = Option::U8("Jabu-Jabu's Belly", {"Vanilla", "Master Quest", "Random"}, OptionCategory::Setting, "gRandomizeMqDungeonsJabuJabu", "", WidgetType::Combobox, RO_MQ_SET_VANILLA, false, IMFLAG_NONE);
-    mOptions[RSK_MQ_FOREST_TEMPLE] = Option::U8("Forest Temple", {"Vanilla", "Master Quest", "Random"}, OptionCategory::Setting, "gRandomizeMqDungeonsForestTemple", "", WidgetType::Combobox, RO_MQ_SET_VANILLA, false, IMFLAG_NONE);
-    mOptions[RSK_MQ_FIRE_TEMPLE] = Option::U8("Fire Temple", {"Vanilla", "Master Quest", "Random"}, OptionCategory::Setting, "gRandomizeMqDungeonsFireTemple", "", WidgetType::Combobox, RO_MQ_SET_VANILLA, false, IMFLAG_NONE);
-    mOptions[RSK_MQ_WATER_TEMPLE] = Option::U8("Water Temple", {"Vanilla", "Master Quest", "Random"}, OptionCategory::Setting, "gRandomizeMqDungeonsWaterTemple", "", WidgetType::Combobox, RO_MQ_SET_VANILLA, false, IMFLAG_NONE);
-    mOptions[RSK_MQ_SPIRIT_TEMPLE] = Option::U8("Spirit Temple", {"Vanilla", "Master Quest", "Random"}, OptionCategory::Setting, "gRandomizeMqDungeonsSpiritTemple", "", WidgetType::Combobox, RO_MQ_SET_VANILLA, false, IMFLAG_NONE);
-    mOptions[RSK_MQ_SHADOW_TEMPLE] = Option::U8("Shadow Temple", {"Vanilla", "Master Quest", "Random"}, OptionCategory::Setting, "gRandomizeMqDungeonsShadowTemple", "", WidgetType::Combobox, RO_MQ_SET_VANILLA, false, IMFLAG_NONE);
-    mOptions[RSK_MQ_BOTTOM_OF_THE_WELL] = Option::U8("Bottom of the Well", {"Vanilla", "Master Quest", "Random"}, OptionCategory::Setting, "gRandomizeMqDungeonsBottomOfTheWell", "", WidgetType::Combobox, RO_MQ_SET_VANILLA, false, IMFLAG_NONE);
-    mOptions[RSK_MQ_ICE_CAVERN] = Option::U8("Ice Cavern", {"Vanilla", "Master Quest", "Random"}, OptionCategory::Setting, "gRandomizeMqDungeonsIceCavern", "", WidgetType::Combobox, RO_MQ_SET_VANILLA, false, IMFLAG_NONE);
-    mOptions[RSK_MQ_GTG] = Option::U8("Gerudo Training Grounds", {"Vanilla", "Master Quest", "Random"}, OptionCategory::Setting, "gRandomizeMqDungeonsGTG", "", WidgetType::Combobox, RO_MQ_SET_VANILLA, false, IMFLAG_NONE);
-    mOptions[RSK_MQ_GANONS_CASTLE] = Option::U8("Ganon's Castle", {"Vanilla", "Master Quest", "Random"}, OptionCategory::Setting, "gRandomizeMqDungeonsGanonsCastle", "", WidgetType::Combobox, RO_MQ_SET_VANILLA);
-    mOptions[RSK_SHUFFLE_DUNGEON_REWARDS] = Option::U8("Shuffle Dungeon Rewards", {"End of Dungeons", "Any Dungeon", "Overworld", "Anywhere"}, OptionCategory::Setting, "gRandomizeShuffleDungeonReward", mOptionDescriptions[RSK_SHUFFLE_DUNGEON_REWARDS], WidgetType::Combobox, RO_DUNGEON_REWARDS_END_OF_DUNGEON);
-    mOptions[RSK_LINKS_POCKET] = Option::U8("Link's Pocket", {"Dungeon Reward", "Advancement", "Anything", "Nothing"}, OptionCategory::Setting, "gRandomizeLinksPocket", "", WidgetType::Combobox, RO_LINKS_POCKET_DUNGEON_REWARD);
-    mOptions[RSK_SHUFFLE_SONGS] = Option::U8("Shuffle Songs", {"Song Locations", "Dungeon Rewards", "Anywhere"}, OptionCategory::Setting, "gRandomizeShuffleSongs", mOptionDescriptions[RSK_SHUFFLE_SONGS], WidgetType::Combobox, RO_SONG_SHUFFLE_SONG_LOCATIONS);
-    mOptions[RSK_SHOPSANITY] = Option::U8("Shopsanity", {"Off", "0 Items", "1 Item", "2 Items", "3 Items", "4 Items", "Random"}, OptionCategory::Setting, "gRandomizeShopsanity", mOptionDescriptions[RSK_SHOPSANITY], WidgetType::Combobox, RO_SHOPSANITY_OFF);
-    mOptions[RSK_SHOPSANITY_PRICES] = Option::U8("Shopsanity Prices", {"Balanced", "Starting Wallet", "Adult Wallet", "Giant's Wallet", "Tycoon's Wallet"}, OptionCategory::Setting, "gRandomizeShopsanityPrices", mOptionDescriptions[RSK_SHOPSANITY_PRICES], WidgetType::Combobox, RO_SHOPSANITY_PRICE_BALANCED, false, IMFLAG_NONE);
-    mOptions[RSK_SHOPSANITY_PRICES_AFFORDABLE] = Option::Bool("Affordable Prices", "gRandomizeShopsanityPricesAffordable", mOptionDescriptions[RSK_SHOPSANITY_PRICES_AFFORDABLE]);
-    mOptions[RSK_SHUFFLE_TOKENS] = Option::U8("Tokensanity", {"Off", "Dungeons", "Overworld", "All Tokens"}, OptionCategory::Setting, "gRandomizeShuffleTokens", mOptionDescriptions[RSK_SHUFFLE_TOKENS], WidgetType::Combobox, RO_TOKENSANITY_OFF);
-    mOptions[RSK_SHUFFLE_SCRUBS] = Option::U8("Scrub Shuffle", {"Off", "Affordable", "Expensive", "Random Prices"}, OptionCategory::Setting, "gRandomizeShuffleScrubs", mOptionDescriptions[RSK_SHUFFLE_SCRUBS], WidgetType::Combobox, RO_SCRUBS_OFF);
-    mOptions[RSK_SHUFFLE_BEEHIVES] = Option::Bool("Shuffle Beehives", "gRandomizeShuffleBeehives", mOptionDescriptions[RSK_SHUFFLE_BEEHIVES]);
-    mOptions[RSK_SHUFFLE_COWS] = Option::Bool("Shuffle Cows", "gRandomizeShuffleCows", mOptionDescriptions[RSK_SHUFFLE_COWS]);
-    mOptions[RSK_SHUFFLE_KOKIRI_SWORD] = Option::Bool("Shuffle Kokiri Sword", "gRandomizeShuffleKokiriSword", mOptionDescriptions[RSK_SHUFFLE_KOKIRI_SWORD]);
-    mOptions[RSK_SHUFFLE_MASTER_SWORD] = Option::Bool("Shuffle Master Sword", "gRandomizeShuffleMasterSword", mOptionDescriptions[RSK_SHUFFLE_MASTER_SWORD]);
-    mOptions[RSK_SHUFFLE_CHILD_WALLET] = Option::Bool("Shuffle Child's Wallet", "gRandomizeShuffleChildWallet", mOptionDescriptions[RSK_SHUFFLE_CHILD_WALLET]);
-    mOptions[RSK_SHUFFLE_OCARINA] = Option::Bool("Shuffle Ocarinas", "gRandomizeShuffleOcarinas", mOptionDescriptions[RSK_SHUFFLE_OCARINA]);
-    mOptions[RSK_SHUFFLE_OCARINA_BUTTONS] = Option::Bool("Shuffle Ocarina Buttons", "gRandomizeShuffleOcarinaButtons", mOptionDescriptions[RSK_SHUFFLE_OCARINA_BUTTONS]);
-    mOptions[RSK_SHUFFLE_SWIM] = Option::Bool("Shuffle Swim", "gRandomizeShuffleSwim", mOptionDescriptions[RSK_SHUFFLE_SWIM]);
-    mOptions[RSK_SHUFFLE_WEIRD_EGG] = Option::Bool("Shuffle Weird Egg", "gRandomizeShuffleWeirdEgg", mOptionDescriptions[RSK_SHUFFLE_WEIRD_EGG]);
-    mOptions[RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD] = Option::Bool("Shuffle Gerudo Membership Card", "gRandomizeShuffleGerudoToken", mOptionDescriptions[RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD]);
-    mOptions[RSK_SHUFFLE_FISHING_POLE] = Option::Bool("Shuffle Fishing Pole", "gRandomizeShuffleFishingPole", mOptionDescriptions[RSK_SHUFFLE_FISHING_POLE]);
-    mOptions[RSK_SHUFFLE_MAGIC_BEANS] = Option::Bool("Shuffle Magic Beans", "gRandomizeShuffleBeans", mOptionDescriptions[RSK_SHUFFLE_MAGIC_BEANS]);
-    mOptions[RSK_SHUFFLE_MERCHANTS] = Option::U8("Shuffle Merchants", {"Off", "On (No Hints)", "On (With Hints)"}, OptionCategory::Setting, "gRandomizeShuffleMerchants", mOptionDescriptions[RSK_SHUFFLE_MERCHANTS], WidgetType::Combobox, RO_SHUFFLE_MERCHANTS_OFF);
-    mOptions[RSK_SHUFFLE_FROG_SONG_RUPEES] = Option::Bool("Shuffle Frog Song Rupees", "gRandomizeShuffleFrogSongRupees", mOptionDescriptions[RSK_SHUFFLE_FROG_SONG_RUPEES]);
-    mOptions[RSK_SHUFFLE_ADULT_TRADE] = Option::Bool("Shuffle Adult Trade", "gRandomizeShuffleAdultTrade", mOptionDescriptions[RSK_SHUFFLE_ADULT_TRADE]);
+    mOptions[RSK_TRIFORCE_HUNT] = Option::Bool("Triforce Hunt", CVAR_RANDOMIZER_SETTING("TriforceHunt"), mOptionDescriptions[RSK_TRIFORCE_HUNT], IMFLAG_NONE);
+    mOptions[RSK_TRIFORCE_HUNT_PIECES_TOTAL] = Option::U8("Triforce Hunt Total Pieces", {NumOpts(1, 100)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("TriforceHuntTotalPieces"), mOptionDescriptions[RSK_TRIFORCE_HUNT_PIECES_TOTAL], WidgetType::Slider, 29, false, IMFLAG_NONE);
+    mOptions[RSK_TRIFORCE_HUNT_PIECES_REQUIRED] = Option::U8("Triforce Hunt Required Pieces", {NumOpts(1, 100)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("TriforceHuntRequiredPieces"), mOptionDescriptions[RSK_TRIFORCE_HUNT_PIECES_REQUIRED], WidgetType::Slider, 19);
+    mOptions[RSK_MQ_DUNGEON_RANDOM] = Option::U8("MQ Dungeon Setting", {"None", "Set Number", "Random", "Selection Only"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("MQDungeons"), mOptionDescriptions[RSK_MQ_DUNGEON_RANDOM], WidgetType::Combobox, RO_MQ_DUNGEONS_NONE, true, IMFLAG_NONE);
+    mOptions[RSK_MQ_DUNGEON_COUNT] = Option::U8("MQ Dungeon Count", {NumOpts(0, 12)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("MQDungeonCount"), "", WidgetType::Slider, 12, true, IMFLAG_NONE);
+    mOptions[RSK_MQ_DUNGEON_SET] = Option::Bool("Set Dungeon Quests", {"Off", "On"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("MQDungeonsSelection"), mOptionDescriptions[RSK_MQ_DUNGEON_SET], WidgetType::Checkbox, false, false, IMFLAG_NONE);
+    mOptions[RSK_MQ_DEKU_TREE] = Option::U8("Deku Tree", {"Vanilla", "Master Quest", "Random"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("MQDungeonsDekuTree"), "", WidgetType::Combobox, RO_MQ_SET_VANILLA, false, IMFLAG_NONE);
+    mOptions[RSK_MQ_DODONGOS_CAVERN] = Option::U8("Dodongo's Cavern", {"Vanilla", "Master Quest", "Random"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("MQDungeonsDodongosCavern"), "", WidgetType::Combobox, RO_MQ_SET_VANILLA, false, IMFLAG_NONE);
+    mOptions[RSK_MQ_JABU_JABU] = Option::U8("Jabu-Jabu's Belly", {"Vanilla", "Master Quest", "Random"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("MQDungeonsJabuJabu"), "", WidgetType::Combobox, RO_MQ_SET_VANILLA, false, IMFLAG_NONE);
+    mOptions[RSK_MQ_FOREST_TEMPLE] = Option::U8("Forest Temple", {"Vanilla", "Master Quest", "Random"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("MQDungeonsForestTemple"), "", WidgetType::Combobox, RO_MQ_SET_VANILLA, false, IMFLAG_NONE);
+    mOptions[RSK_MQ_FIRE_TEMPLE] = Option::U8("Fire Temple", {"Vanilla", "Master Quest", "Random"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("MQDungeonsFireTemple"), "", WidgetType::Combobox, RO_MQ_SET_VANILLA, false, IMFLAG_NONE);
+    mOptions[RSK_MQ_WATER_TEMPLE] = Option::U8("Water Temple", {"Vanilla", "Master Quest", "Random"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("MQDungeonsWaterTemple"), "", WidgetType::Combobox, RO_MQ_SET_VANILLA, false, IMFLAG_NONE);
+    mOptions[RSK_MQ_SPIRIT_TEMPLE] = Option::U8("Spirit Temple", {"Vanilla", "Master Quest", "Random"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("MQDungeonsSpiritTemple"), "", WidgetType::Combobox, RO_MQ_SET_VANILLA, false, IMFLAG_NONE);
+    mOptions[RSK_MQ_SHADOW_TEMPLE] = Option::U8("Shadow Temple", {"Vanilla", "Master Quest", "Random"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("MQDungeonsShadowTemple"), "", WidgetType::Combobox, RO_MQ_SET_VANILLA, false, IMFLAG_NONE);
+    mOptions[RSK_MQ_BOTTOM_OF_THE_WELL] = Option::U8("Bottom of the Well", {"Vanilla", "Master Quest", "Random"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("MQDungeonsBottomOfTheWell"), "", WidgetType::Combobox, RO_MQ_SET_VANILLA, false, IMFLAG_NONE);
+    mOptions[RSK_MQ_ICE_CAVERN] = Option::U8("Ice Cavern", {"Vanilla", "Master Quest", "Random"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("MQDungeonsIceCavern"), "", WidgetType::Combobox, RO_MQ_SET_VANILLA, false, IMFLAG_NONE);
+    mOptions[RSK_MQ_GTG] = Option::U8("Gerudo Training Grounds", {"Vanilla", "Master Quest", "Random"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("MQDungeonsGTG"), "", WidgetType::Combobox, RO_MQ_SET_VANILLA, false, IMFLAG_NONE);
+    mOptions[RSK_MQ_GANONS_CASTLE] = Option::U8("Ganon's Castle", {"Vanilla", "Master Quest", "Random"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("MQDungeonsGanonsCastle"), "", WidgetType::Combobox, RO_MQ_SET_VANILLA);
+    mOptions[RSK_SHUFFLE_DUNGEON_REWARDS] = Option::U8("Shuffle Dungeon Rewards", {"End of Dungeons", "Any Dungeon", "Overworld", "Anywhere"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleDungeonReward"), mOptionDescriptions[RSK_SHUFFLE_DUNGEON_REWARDS], WidgetType::Combobox, RO_DUNGEON_REWARDS_END_OF_DUNGEON);
+    mOptions[RSK_LINKS_POCKET] = Option::U8("Link's Pocket", {"Dungeon Reward", "Advancement", "Anything", "Nothing"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("LinksPocket"), "", WidgetType::Combobox, RO_LINKS_POCKET_DUNGEON_REWARD);
+    mOptions[RSK_SHUFFLE_SONGS] = Option::U8("Shuffle Songs", {"Song Locations", "Dungeon Rewards", "Anywhere"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleSongs"), mOptionDescriptions[RSK_SHUFFLE_SONGS], WidgetType::Combobox, RO_SONG_SHUFFLE_SONG_LOCATIONS);
+    mOptions[RSK_SHOPSANITY] = Option::U8("Shopsanity", {"Off", "0 Items", "1 Item", "2 Items", "3 Items", "4 Items", "Random"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("Shopsanity"), mOptionDescriptions[RSK_SHOPSANITY], WidgetType::Combobox, RO_SHOPSANITY_OFF);
+    mOptions[RSK_SHOPSANITY_PRICES] = Option::U8("Shopsanity Prices", {"Balanced", "Starting Wallet", "Adult Wallet", "Giant's Wallet", "Tycoon's Wallet"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShopsanityPrices"), mOptionDescriptions[RSK_SHOPSANITY_PRICES], WidgetType::Combobox, RO_SHOPSANITY_PRICE_BALANCED, false, IMFLAG_NONE);
+    mOptions[RSK_SHOPSANITY_PRICES_AFFORDABLE] = Option::Bool("Affordable Prices", CVAR_RANDOMIZER_SETTING("ShopsanityPricesAffordable"), mOptionDescriptions[RSK_SHOPSANITY_PRICES_AFFORDABLE]);
+    mOptions[RSK_SHUFFLE_TOKENS] = Option::U8("Tokensanity", {"Off", "Dungeons", "Overworld", "All Tokens"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleTokens"), mOptionDescriptions[RSK_SHUFFLE_TOKENS], WidgetType::Combobox, RO_TOKENSANITY_OFF);
+    mOptions[RSK_SHUFFLE_SCRUBS] = Option::U8("Scrub Shuffle", {"Off", "Affordable", "Expensive", "Random Prices"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleScrubs"), mOptionDescriptions[RSK_SHUFFLE_SCRUBS], WidgetType::Combobox, RO_SCRUBS_OFF);
+    mOptions[RSK_SHUFFLE_BEEHIVES] = Option::Bool("Shuffle Beehives", CVAR_RANDOMIZER_SETTING("ShuffleBeehives"), mOptionDescriptions[RSK_SHUFFLE_BEEHIVES]);
+    mOptions[RSK_SHUFFLE_COWS] = Option::Bool("Shuffle Cows", CVAR_RANDOMIZER_SETTING("ShuffleCows"), mOptionDescriptions[RSK_SHUFFLE_COWS]);
+    mOptions[RSK_SHUFFLE_KOKIRI_SWORD] = Option::Bool("Shuffle Kokiri Sword", CVAR_RANDOMIZER_SETTING("ShuffleKokiriSword"), mOptionDescriptions[RSK_SHUFFLE_KOKIRI_SWORD]);
+    mOptions[RSK_SHUFFLE_MASTER_SWORD] = Option::Bool("Shuffle Master Sword", CVAR_RANDOMIZER_SETTING("ShuffleMasterSword"), mOptionDescriptions[RSK_SHUFFLE_MASTER_SWORD]);
+    mOptions[RSK_SHUFFLE_CHILD_WALLET] = Option::Bool("Shuffle Child's Wallet", CVAR_RANDOMIZER_SETTING("ShuffleChildWallet"), mOptionDescriptions[RSK_SHUFFLE_CHILD_WALLET]);
+    mOptions[RSK_SHUFFLE_OCARINA] = Option::Bool("Shuffle Ocarinas", CVAR_RANDOMIZER_SETTING("ShuffleOcarinas"), mOptionDescriptions[RSK_SHUFFLE_OCARINA]);
+    mOptions[RSK_SHUFFLE_OCARINA_BUTTONS] = Option::Bool("Shuffle Ocarina Buttons", CVAR_RANDOMIZER_SETTING("ShuffleOcarinaButtons"), mOptionDescriptions[RSK_SHUFFLE_OCARINA_BUTTONS]);
+    mOptions[RSK_SHUFFLE_SWIM] = Option::Bool("Shuffle Swim", CVAR_RANDOMIZER_SETTING("ShuffleSwim"), mOptionDescriptions[RSK_SHUFFLE_SWIM]);
+    mOptions[RSK_SHUFFLE_WEIRD_EGG] = Option::Bool("Shuffle Weird Egg", CVAR_RANDOMIZER_SETTING("ShuffleWeirdEgg"), mOptionDescriptions[RSK_SHUFFLE_WEIRD_EGG]);
+    mOptions[RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD] = Option::Bool("Shuffle Gerudo Membership Card", CVAR_RANDOMIZER_SETTING("ShuffleGerudoToken"), mOptionDescriptions[RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD]);
+    mOptions[RSK_SHUFFLE_FISHING_POLE] = Option::Bool("Shuffle Fishing Pole", CVAR_RANDOMIZER_SETTING("ShuffleFishingPole"), mOptionDescriptions[RSK_SHUFFLE_FISHING_POLE]);
+    mOptions[RSK_SHUFFLE_MAGIC_BEANS] = Option::Bool("Shuffle Magic Beans", CVAR_RANDOMIZER_SETTING("ShuffleBeans"), mOptionDescriptions[RSK_SHUFFLE_MAGIC_BEANS]);
+    mOptions[RSK_SHUFFLE_MERCHANTS] = Option::U8("Shuffle Merchants", {"Off", "On (No Hints)", "On (With Hints)"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleMerchants"), mOptionDescriptions[RSK_SHUFFLE_MERCHANTS], WidgetType::Combobox, RO_SHUFFLE_MERCHANTS_OFF);
+    mOptions[RSK_SHUFFLE_FROG_SONG_RUPEES] = Option::Bool("Shuffle Frog Song Rupees", CVAR_RANDOMIZER_SETTING("ShuffleFrogSongRupees"), mOptionDescriptions[RSK_SHUFFLE_FROG_SONG_RUPEES]);
+    mOptions[RSK_SHUFFLE_ADULT_TRADE] = Option::Bool("Shuffle Adult Trade", CVAR_RANDOMIZER_SETTING("ShuffleAdultTrade"), mOptionDescriptions[RSK_SHUFFLE_ADULT_TRADE]);
     mOptions[RSK_SHUFFLE_CHEST_MINIGAME] = Option::U8("Shuffle Chest Minigame", {"Off", "On (Separate)", "On (Pack)"});
-    mOptions[RSK_SHUFFLE_100_GS_REWARD] = Option::Bool("Shuffle 100 GS Reward", "gRandomizeShuffle100GSReward", mOptionDescriptions[RSK_SHUFFLE_100_GS_REWARD], IMFLAG_SEPARATOR_BOTTOM, WidgetType::Checkbox, RO_GENERIC_OFF);
-    mOptions[RSK_SHUFFLE_BOSS_SOULS] = Option::U8("Shuffle Boss Souls", {"Off", "On", "On + Ganon"}, OptionCategory::Setting, "gRandomizeShuffleBossSouls", mOptionDescriptions[RSK_SHUFFLE_BOSS_SOULS], WidgetType::Combobox);
-    mOptions[RSK_FISHSANITY] = Option::U8("Fishsanity", {"Off", "Shuffle Fishing Pond", "Shuffle Overworld Fish", "Shuffle Both"}, OptionCategory::Setting, "gRandomizeFishsanity", mOptionDescriptions[RSK_FISHSANITY], WidgetType::Combobox, RO_FISHSANITY_OFF);
-    mOptions[RSK_FISHSANITY_POND_COUNT] = Option::U8("Pond Fish Count", {NumOpts(0,17,1)}, OptionCategory::Setting, "gRandomizeFishsanityPondCount", mOptionDescriptions[RSK_FISHSANITY_POND_COUNT], WidgetType::Slider, 0, true, IMFLAG_NONE);
-    mOptions[RSK_FISHSANITY_AGE_SPLIT] = Option::Bool("Pond Age Split", "gRandomizeFishsanityAgeSplit", mOptionDescriptions[RSK_FISHSANITY_AGE_SPLIT]);
-    mOptions[RSK_SHUFFLE_MAPANDCOMPASS] = Option::U8("Maps/Compasses", {"Start With", "Vanilla", "Own Dungeon", "Any Dungeon", "Overworld", "Anywhere"}, OptionCategory::Setting, "gRandomizeStartingMapsCompasses", mOptionDescriptions[RSK_SHUFFLE_MAPANDCOMPASS], WidgetType::Combobox, RO_DUNGEON_ITEM_LOC_OWN_DUNGEON);
-    mOptions[RSK_KEYSANITY] = Option::U8("Small Keys", {"Start With", "Vanilla", "Own Dungeon", "Any Dungeon", "Overworld", "Anywhere"}, OptionCategory::Setting, "gRandomizeKeysanity", mOptionDescriptions[RSK_KEYSANITY], WidgetType::Combobox, RO_DUNGEON_ITEM_LOC_OWN_DUNGEON);
-    mOptions[RSK_GERUDO_KEYS] = Option::U8("Gerudo Fortress Keys", {"Vanilla", "Any Dungeon", "Overworld", "Anywhere"}, OptionCategory::Setting, "gRandomizeGerudoKeys", mOptionDescriptions[RSK_GERUDO_KEYS], WidgetType::Combobox, RO_GERUDO_KEYS_VANILLA);
-    mOptions[RSK_BOSS_KEYSANITY] = Option::U8("Boss Keys", {"Start With", "Vanilla", "Own Dungeon", "Any Dungeon", "Overworld", "Anywhere"}, OptionCategory::Setting, "gRandomizeBossKeysanity", mOptionDescriptions[RSK_BOSS_KEYSANITY], WidgetType::Combobox, RO_DUNGEON_ITEM_LOC_OWN_DUNGEON);
-    mOptions[RSK_GANONS_BOSS_KEY] = Option::U8("Ganon's Boss Key", {"Vanilla", "Own Dungeon", "Start With", "Any Dungeon", "Overworld", "Anywhere", "LACS-Vanilla", "LACS-Stones", "LACS-Medallions", "LACS-Rewards", "LACS-Dungeons", "LACS-Tokens", "Triforce Hunt"}, OptionCategory::Setting, "gRandomizeShuffleGanonBossKey", mOptionDescriptions[RSK_GANONS_BOSS_KEY], WidgetType::Combobox, RO_GANON_BOSS_KEY_VANILLA);
-    mOptions[RSK_LACS_STONE_COUNT] = Option::U8("Stone Count", {NumOpts(0, 4)}, OptionCategory::Setting, "gRandomizeLacsStoneCount", "", WidgetType::Slider, 3, true);
-    mOptions[RSK_LACS_MEDALLION_COUNT] = Option::U8("Medallion Count", {NumOpts(0, 7)}, OptionCategory::Setting, "gRandomizeLacsMedallionCount", "", WidgetType::Slider, 6, true);
-    mOptions[RSK_LACS_REWARD_COUNT] = Option::U8("Reward Count", {NumOpts(0, 10)}, OptionCategory::Setting, "gRandomizeLacsRewardCount", "", WidgetType::Slider, 9, true);
-    mOptions[RSK_LACS_DUNGEON_COUNT] = Option::U8("Dungeon Count", {NumOpts(0, 9)}, OptionCategory::Setting, "gRandomizeLacsDungeonCount", "", WidgetType::Slider, 8, true);
-    mOptions[RSK_LACS_TOKEN_COUNT] = Option::U8("Token Count", {NumOpts(0, 100)}, OptionCategory::Setting, "gRandomizeLacsTokenCount", "", WidgetType::Slider, 100, true);
-    mOptions[RSK_LACS_OPTIONS] = Option::U8("LACS Reward Options", {"Standard Reward", "Greg as Reward", "Greg as Wildcard"}, OptionCategory::Setting, "gRandomizeLacsRewardOptions", "", WidgetType::Combobox, RO_LACS_STANDARD_REWARD);
-    mOptions[RSK_KEYRINGS] = Option::U8("Key Rings", {"Off", "Random", "Count", "Selection"}, OptionCategory::Setting, "gRandomizeShuffleKeyRings", mOptionDescriptions[RSK_KEYRINGS], WidgetType::Combobox, RO_KEYRINGS_OFF);
-    mOptions[RSK_KEYRINGS_RANDOM_COUNT] = Option::U8("Keyring Dungeon Count", {NumOpts(0, 9)}, OptionCategory::Setting, "gRandomizeShuffleKeyRingsRandomCount", "", WidgetType::Slider, 8);
-    mOptions[RSK_KEYRINGS_GERUDO_FORTRESS] = Option::Bool("Gerudo Fortress", "gRandomizeShuffleKeyRingsGerudoFortress", "", IMFLAG_NONE);
-    mOptions[RSK_KEYRINGS_FOREST_TEMPLE] = Option::Bool("Forest Temple", "gRandomizeShuffleKeyRingsForestTemple", "", IMFLAG_NONE);
-    mOptions[RSK_KEYRINGS_FIRE_TEMPLE] = Option::Bool("Fire Temple", "gRandomizeShuffleKeyRingsFireTemple", "", IMFLAG_NONE);
-    mOptions[RSK_KEYRINGS_WATER_TEMPLE] = Option::Bool("Water Temple", "gRandomizeShuffleKeyRingsWaterTemple", "", IMFLAG_NONE);
-    mOptions[RSK_KEYRINGS_SPIRIT_TEMPLE] = Option::Bool("Spirit Temple", "gRandomizeShuffleKeyRingsSpiritTemple", "", IMFLAG_NONE);
-    mOptions[RSK_KEYRINGS_SHADOW_TEMPLE] = Option::Bool("Shadow Temple", "gRandomizeShuffleKeyRingsShadowTemple", "", IMFLAG_NONE);
-    mOptions[RSK_KEYRINGS_BOTTOM_OF_THE_WELL] = Option::Bool("Bottom of the Well", "gRandomizeShuffleKeyRingsBottomOfTheWell", "", IMFLAG_NONE);
-    mOptions[RSK_KEYRINGS_GTG] = Option::Bool("Gerudo Training Grounds", "gRandomizeShuffleKeyRingsGTG", "", IMFLAG_NONE);
-    mOptions[RSK_KEYRINGS_GANONS_CASTLE] = Option::Bool("Ganon's Castle", "gRandomizeShuffleKeyRingsGanonsCastle");
-    mOptions[RSK_SKIP_CHILD_STEALTH] = Option::Bool("Skip Child Stealth", {"Don't Skip", "Skip"}, OptionCategory::Setting, "gRandomizeSkipChildStealth", mOptionDescriptions[RSK_SKIP_CHILD_STEALTH], WidgetType::Checkbox, RO_GENERIC_DONT_SKIP);
-    mOptions[RSK_SKIP_CHILD_ZELDA] = Option::Bool("Skip Child Zelda", {"Don't Skip", "Skip"}, OptionCategory::Setting, "gRandomizeSkipChildZelda", mOptionDescriptions[RSK_SKIP_CHILD_ZELDA], WidgetType::Checkbox, RO_GENERIC_DONT_SKIP);
-    mOptions[RSK_SKIP_EPONA_RACE] = Option::Bool("Skip Epona Race", {"Don't Skip", "Skip"}, OptionCategory::Setting, "gRandomizeSkipEponaRace", mOptionDescriptions[RSK_SKIP_EPONA_RACE], WidgetType::Checkbox, RO_GENERIC_DONT_SKIP);
-    mOptions[RSK_SKIP_SCARECROWS_SONG] = Option::Bool("Skip Scarecrow's Song", "gRandomizeSkipScarecrowsSong", mOptionDescriptions[RSK_SKIP_SCARECROWS_SONG]);
-    mOptions[RSK_BIG_POE_COUNT] = Option::U8("Big Poe Target Count", {NumOpts(1, 10)}, OptionCategory::Setting, "gRandomizeBigPoeTargetCount", mOptionDescriptions[RSK_BIG_POE_COUNT], WidgetType::Slider, 9);
-    mOptions[RSK_CUCCO_COUNT] = Option::U8("Cuccos to return", {NumOpts(0, 7)}, OptionCategory::Setting, "gRandomizeCuccosToReturn", mOptionDescriptions[RSK_CUCCO_COUNT], WidgetType::Slider, 7);
-    mOptions[RSK_COMPLETE_MASK_QUEST] = Option::Bool("Complete Mask Quest", "gRandomizeCompleteMaskQuest", mOptionDescriptions[RSK_COMPLETE_MASK_QUEST]);
-    mOptions[RSK_ENABLE_GLITCH_CUTSCENES] = Option::Bool("Enable Glitch-Useful Cutscenes", "gRandomizeEnableGlitchCutscenes", mOptionDescriptions[RSK_ENABLE_GLITCH_CUTSCENES]);
-    mOptions[RSK_GOSSIP_STONE_HINTS] = Option::U8("Gossip Stone Hints", {"No Hints", "Need Nothing", "Mask of Truth", "Stone of Agony"}, OptionCategory::Setting, "gRandomizeGossipStoneHints", mOptionDescriptions[RSK_GOSSIP_STONE_HINTS], WidgetType::Combobox, RO_GOSSIP_STONES_NEED_NOTHING, false, IMFLAG_NONE);
-    mOptions[RSK_HINT_CLARITY] = Option::U8("Hint Clarity", {"Obscure", "Ambiguous", "Clear"}, OptionCategory::Setting, "gRandomizeHintClarity", mOptionDescriptions[RSK_HINT_CLARITY], WidgetType::Combobox, RO_HINT_CLARITY_CLEAR, true, IMFLAG_INDENT);
-    mOptions[RSK_HINT_DISTRIBUTION] = Option::U8("Hint Distribution", {"Useless", "Balanced", "Strong", "Very Strong"}, OptionCategory::Setting, "gRandomizeHintDistribution", mOptionDescriptions[RSK_HINT_DISTRIBUTION], WidgetType::Combobox, RO_HINT_DIST_BALANCED, true, IMFLAG_UNINDENT);
-    mOptions[RSK_TOT_ALTAR_HINT] = Option::Bool("ToT Altar Hint", {"Off", "On"}, OptionCategory::Setting, "gRandomizeAltarHint", mOptionDescriptions[RSK_TOT_ALTAR_HINT], WidgetType::Checkbox, RO_GENERIC_ON, false, IMFLAG_INDENT);
-    mOptions[RSK_GANONDORF_HINT] = Option::Bool("Ganondorf Hint", {"Off", "On"}, OptionCategory::Setting, "gRandomizeGanondorfHint", mOptionDescriptions[RSK_GANONDORF_HINT], WidgetType::Checkbox, RO_GENERIC_ON, false, IMFLAG_NONE);
-    mOptions[RSK_SHEIK_LA_HINT] = Option::Bool("Sheik Light Arrow Hint", {"Off", "On"}, OptionCategory::Setting, "gRandomizeSheikLAHint", mOptionDescriptions[RSK_SHEIK_LA_HINT], WidgetType::Checkbox, RO_GENERIC_ON, false, IMFLAG_NONE);
-    mOptions[RSK_DAMPES_DIARY_HINT] = Option::Bool("Dampe's Diary Hint", "gRandomizeDampeHint", mOptionDescriptions[RSK_DAMPES_DIARY_HINT], IMFLAG_NONE);
-    mOptions[RSK_GREG_HINT] = Option::Bool("Greg the Green Rupee Hint", "gRandomizeGregHint", mOptionDescriptions[RSK_GREG_HINT], IMFLAG_NONE);
-    mOptions[RSK_SARIA_HINT] = Option::Bool("Saria's Hint", "gRandomizeSariaHint", mOptionDescriptions[RSK_SARIA_HINT], IMFLAG_NONE);
-    mOptions[RSK_FISHING_POLE_HINT] = Option::Bool("Fishing Pole Hint", "gRandomizeFishingPoleHint", mOptionDescriptions[RSK_FISHING_POLE_HINT], IMFLAG_NONE);
-    mOptions[RSK_FROGS_HINT] = Option::Bool("Frog Ocarina Game Hint", "gRandomizeFrogsHint", mOptionDescriptions[RSK_FROGS_HINT], IMFLAG_NONE);
-    mOptions[RSK_BIGGORON_HINT] = Option::Bool("Biggoron's Hint", "gRandomizeBiggoronHint", mOptionDescriptions[RSK_BIGGORON_HINT], IMFLAG_NONE);
-    mOptions[RSK_BIG_POES_HINT] = Option::Bool("Big Poes Hint", "gRandomizeBigPoesHint", mOptionDescriptions[RSK_BIG_POES_HINT], IMFLAG_NONE);
-    mOptions[RSK_CHICKENS_HINT] = Option::Bool("Chickens Hint", "gRandomizeChickensHint", mOptionDescriptions[RSK_CHICKENS_HINT], IMFLAG_NONE);
-    mOptions[RSK_MALON_HINT] = Option::Bool("Malon Hint", "gRandomizeMalonHint", mOptionDescriptions[RSK_MALON_HINT], IMFLAG_NONE);
-    mOptions[RSK_HBA_HINT] = Option::Bool("Horseback Archery Hint", "gRandomizeHBAHint", mOptionDescriptions[RSK_HBA_HINT], IMFLAG_NONE);
-    mOptions[RSK_WARP_SONG_HINTS] = Option::Bool("Warp Song Hints", "gRandomizeWarpSongText", mOptionDescriptions[RSK_WARP_SONG_HINTS], IMFLAG_NONE, WidgetType::Checkbox, RO_GENERIC_ON);
-    mOptions[RSK_SCRUB_TEXT_HINT] = Option::Bool("Scrub Hint Text", "gRandomizeScrubText", mOptionDescriptions[RSK_SCRUB_TEXT_HINT], IMFLAG_NONE);
-    mOptions[RSK_KAK_10_SKULLS_HINT] = Option::Bool("10 GS Hint", "gRandomize10GSHint", mOptionDescriptions[RSK_KAK_10_SKULLS_HINT], IMFLAG_NONE);
-    mOptions[RSK_KAK_20_SKULLS_HINT] = Option::Bool("20 GS Hint", "gRandomize20GSHint", mOptionDescriptions[RSK_KAK_20_SKULLS_HINT], IMFLAG_NONE);
-    mOptions[RSK_KAK_30_SKULLS_HINT] = Option::Bool("30 GS Hint", "gRandomize30GSHint", mOptionDescriptions[RSK_KAK_30_SKULLS_HINT], IMFLAG_NONE);
-    mOptions[RSK_KAK_40_SKULLS_HINT] = Option::Bool("40 GS Hint", "gRandomize40GSHint", mOptionDescriptions[RSK_KAK_40_SKULLS_HINT], IMFLAG_NONE);
-    mOptions[RSK_KAK_50_SKULLS_HINT] = Option::Bool("50 GS Hint", "gRandomize50GSHint", mOptionDescriptions[RSK_KAK_50_SKULLS_HINT], IMFLAG_NONE);
-    mOptions[RSK_KAK_100_SKULLS_HINT] = Option::Bool("100 GS Hint", "gRandomize100GSHint", mOptionDescriptions[RSK_KAK_100_SKULLS_HINT]);
+    mOptions[RSK_SHUFFLE_100_GS_REWARD] = Option::Bool("Shuffle 100 GS Reward", CVAR_RANDOMIZER_SETTING("Shuffle100GSReward"), mOptionDescriptions[RSK_SHUFFLE_100_GS_REWARD], IMFLAG_SEPARATOR_BOTTOM, WidgetType::Checkbox, RO_GENERIC_OFF);
+    mOptions[RSK_SHUFFLE_BOSS_SOULS] = Option::U8("Shuffle Boss Souls", {"Off", "On", "On + Ganon"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleBossSouls"), mOptionDescriptions[RSK_SHUFFLE_BOSS_SOULS], WidgetType::Combobox);
+    mOptions[RSK_FISHSANITY] = Option::U8("Fishsanity", {"Off", "Shuffle Fishing Pond", "Shuffle Overworld Fish", "Shuffle Both"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("Fishsanity"), mOptionDescriptions[RSK_FISHSANITY], WidgetType::Combobox, RO_FISHSANITY_OFF);
+    mOptions[RSK_FISHSANITY_POND_COUNT] = Option::U8("Pond Fish Count", {NumOpts(0,17,1)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("FishsanityPondCount"), mOptionDescriptions[RSK_FISHSANITY_POND_COUNT], WidgetType::Slider, 0, true, IMFLAG_NONE);
+    mOptions[RSK_FISHSANITY_AGE_SPLIT] = Option::Bool("Pond Age Split", CVAR_RANDOMIZER_SETTING("FishsanityAgeSplit"), mOptionDescriptions[RSK_FISHSANITY_AGE_SPLIT]);
+    mOptions[RSK_SHUFFLE_MAPANDCOMPASS] = Option::U8("Maps/Compasses", {"Start With", "Vanilla", "Own Dungeon", "Any Dungeon", "Overworld", "Anywhere"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("StartingMapsCompasses"), mOptionDescriptions[RSK_SHUFFLE_MAPANDCOMPASS], WidgetType::Combobox, RO_DUNGEON_ITEM_LOC_OWN_DUNGEON);
+    mOptions[RSK_KEYSANITY] = Option::U8("Small Keys", {"Start With", "Vanilla", "Own Dungeon", "Any Dungeon", "Overworld", "Anywhere"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("Keysanity"), mOptionDescriptions[RSK_KEYSANITY], WidgetType::Combobox, RO_DUNGEON_ITEM_LOC_OWN_DUNGEON);
+    mOptions[RSK_GERUDO_KEYS] = Option::U8("Gerudo Fortress Keys", {"Vanilla", "Any Dungeon", "Overworld", "Anywhere"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("GerudoKeys"), mOptionDescriptions[RSK_GERUDO_KEYS], WidgetType::Combobox, RO_GERUDO_KEYS_VANILLA);
+    mOptions[RSK_BOSS_KEYSANITY] = Option::U8("Boss Keys", {"Start With", "Vanilla", "Own Dungeon", "Any Dungeon", "Overworld", "Anywhere"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("BossKeysanity"), mOptionDescriptions[RSK_BOSS_KEYSANITY], WidgetType::Combobox, RO_DUNGEON_ITEM_LOC_OWN_DUNGEON);
+    mOptions[RSK_GANONS_BOSS_KEY] = Option::U8("Ganon's Boss Key", {"Vanilla", "Own Dungeon", "Start With", "Any Dungeon", "Overworld", "Anywhere", "LACS-Vanilla", "LACS-Stones", "LACS-Medallions", "LACS-Rewards", "LACS-Dungeons", "LACS-Tokens", "Triforce Hunt"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleGanonBossKey"), mOptionDescriptions[RSK_GANONS_BOSS_KEY], WidgetType::Combobox, RO_GANON_BOSS_KEY_VANILLA);
+    mOptions[RSK_LACS_STONE_COUNT] = Option::U8("Stone Count", {NumOpts(0, 4)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("LacsStoneCount"), "", WidgetType::Slider, 3, true);
+    mOptions[RSK_LACS_MEDALLION_COUNT] = Option::U8("Medallion Count", {NumOpts(0, 7)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("LacsMedallionCount"), "", WidgetType::Slider, 6, true);
+    mOptions[RSK_LACS_REWARD_COUNT] = Option::U8("Reward Count", {NumOpts(0, 10)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("LacsRewardCount"), "", WidgetType::Slider, 9, true);
+    mOptions[RSK_LACS_DUNGEON_COUNT] = Option::U8("Dungeon Count", {NumOpts(0, 9)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("LacsDungeonCount"), "", WidgetType::Slider, 8, true);
+    mOptions[RSK_LACS_TOKEN_COUNT] = Option::U8("Token Count", {NumOpts(0, 100)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("LacsTokenCount"), "", WidgetType::Slider, 100, true);
+    mOptions[RSK_LACS_OPTIONS] = Option::U8("LACS Reward Options", {"Standard Reward", "Greg as Reward", "Greg as Wildcard"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("LacsRewardOptions"), "", WidgetType::Combobox, RO_LACS_STANDARD_REWARD);
+    mOptions[RSK_KEYRINGS] = Option::U8("Key Rings", {"Off", "Random", "Count", "Selection"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleKeyRings"), mOptionDescriptions[RSK_KEYRINGS], WidgetType::Combobox, RO_KEYRINGS_OFF);
+    mOptions[RSK_KEYRINGS_RANDOM_COUNT] = Option::U8("Keyring Dungeon Count", {NumOpts(0, 9)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsRandomCount"), "", WidgetType::Slider, 8);
+    mOptions[RSK_KEYRINGS_GERUDO_FORTRESS] = Option::Bool("Gerudo Fortress", CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsGerudoFortress"), "", IMFLAG_NONE);
+    mOptions[RSK_KEYRINGS_FOREST_TEMPLE] = Option::Bool("Forest Temple", CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsForestTemple"), "", IMFLAG_NONE);
+    mOptions[RSK_KEYRINGS_FIRE_TEMPLE] = Option::Bool("Fire Temple", CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsFireTemple"), "", IMFLAG_NONE);
+    mOptions[RSK_KEYRINGS_WATER_TEMPLE] = Option::Bool("Water Temple", CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsWaterTemple"), "", IMFLAG_NONE);
+    mOptions[RSK_KEYRINGS_SPIRIT_TEMPLE] = Option::Bool("Spirit Temple", CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsSpiritTemple"), "", IMFLAG_NONE);
+    mOptions[RSK_KEYRINGS_SHADOW_TEMPLE] = Option::Bool("Shadow Temple", CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsShadowTemple"), "", IMFLAG_NONE);
+    mOptions[RSK_KEYRINGS_BOTTOM_OF_THE_WELL] = Option::Bool("Bottom of the Well", CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsBottomOfTheWell"), "", IMFLAG_NONE);
+    mOptions[RSK_KEYRINGS_GTG] = Option::Bool("Gerudo Training Grounds", CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsGTG"), "", IMFLAG_NONE);
+    mOptions[RSK_KEYRINGS_GANONS_CASTLE] = Option::Bool("Ganon's Castle", CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsGanonsCastle"));
+    mOptions[RSK_SKIP_CHILD_STEALTH] = Option::Bool("Skip Child Stealth", {"Don't Skip", "Skip"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("SkipChildStealth"), mOptionDescriptions[RSK_SKIP_CHILD_STEALTH], WidgetType::Checkbox, RO_GENERIC_DONT_SKIP);
+    mOptions[RSK_SKIP_CHILD_ZELDA] = Option::Bool("Skip Child Zelda", {"Don't Skip", "Skip"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("SkipChildZelda"), mOptionDescriptions[RSK_SKIP_CHILD_ZELDA], WidgetType::Checkbox, RO_GENERIC_DONT_SKIP);
+    mOptions[RSK_SKIP_EPONA_RACE] = Option::Bool("Skip Epona Race", {"Don't Skip", "Skip"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("SkipEponaRace"), mOptionDescriptions[RSK_SKIP_EPONA_RACE], WidgetType::Checkbox, RO_GENERIC_DONT_SKIP);
+    mOptions[RSK_SKIP_SCARECROWS_SONG] = Option::Bool("Skip Scarecrow's Song", CVAR_RANDOMIZER_SETTING("SkipScarecrowsSong"), mOptionDescriptions[RSK_SKIP_SCARECROWS_SONG]);
+    mOptions[RSK_BIG_POE_COUNT] = Option::U8("Big Poe Target Count", {NumOpts(1, 10)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("BigPoeTargetCount"), mOptionDescriptions[RSK_BIG_POE_COUNT], WidgetType::Slider, 9);
+    mOptions[RSK_CUCCO_COUNT] = Option::U8("Cuccos to return", {NumOpts(0, 7)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("CuccosToReturn"), mOptionDescriptions[RSK_CUCCO_COUNT], WidgetType::Slider, 7);
+    mOptions[RSK_COMPLETE_MASK_QUEST] = Option::Bool("Complete Mask Quest", CVAR_RANDOMIZER_SETTING("CompleteMaskQuest"), mOptionDescriptions[RSK_COMPLETE_MASK_QUEST]);
+    mOptions[RSK_ENABLE_GLITCH_CUTSCENES] = Option::Bool("Enable Glitch-Useful Cutscenes", CVAR_RANDOMIZER_SETTING("EnableGlitchCutscenes"), mOptionDescriptions[RSK_ENABLE_GLITCH_CUTSCENES]);
+    mOptions[RSK_GOSSIP_STONE_HINTS] = Option::U8("Gossip Stone Hints", {"No Hints", "Need Nothing", "Mask of Truth", "Stone of Agony"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("GossipStoneHints"), mOptionDescriptions[RSK_GOSSIP_STONE_HINTS], WidgetType::Combobox, RO_GOSSIP_STONES_NEED_NOTHING, false, IMFLAG_NONE);
+    mOptions[RSK_HINT_CLARITY] = Option::U8("Hint Clarity", {"Obscure", "Ambiguous", "Clear"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("HintClarity"), mOptionDescriptions[RSK_HINT_CLARITY], WidgetType::Combobox, RO_HINT_CLARITY_CLEAR, true, IMFLAG_INDENT);
+    mOptions[RSK_HINT_DISTRIBUTION] = Option::U8("Hint Distribution", {"Useless", "Balanced", "Strong", "Very Strong"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("HintDistribution"), mOptionDescriptions[RSK_HINT_DISTRIBUTION], WidgetType::Combobox, RO_HINT_DIST_BALANCED, true, IMFLAG_UNINDENT);
+    mOptions[RSK_TOT_ALTAR_HINT] = Option::Bool("ToT Altar Hint", {"Off", "On"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("AltarHint"), mOptionDescriptions[RSK_TOT_ALTAR_HINT], WidgetType::Checkbox, RO_GENERIC_ON, false, IMFLAG_INDENT);
+    mOptions[RSK_GANONDORF_HINT] = Option::Bool("Ganondorf Hint", {"Off", "On"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("GanondorfHint"), mOptionDescriptions[RSK_GANONDORF_HINT], WidgetType::Checkbox, RO_GENERIC_ON, false, IMFLAG_NONE);
+    mOptions[RSK_SHEIK_LA_HINT] = Option::Bool("Sheik Light Arrow Hint", {"Off", "On"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("SheikLAHint"), mOptionDescriptions[RSK_SHEIK_LA_HINT], WidgetType::Checkbox, RO_GENERIC_ON, false, IMFLAG_NONE);
+    mOptions[RSK_DAMPES_DIARY_HINT] = Option::Bool("Dampe's Diary Hint", CVAR_RANDOMIZER_SETTING("DampeHint"), mOptionDescriptions[RSK_DAMPES_DIARY_HINT], IMFLAG_NONE);
+    mOptions[RSK_GREG_HINT] = Option::Bool("Greg the Green Rupee Hint", CVAR_RANDOMIZER_SETTING("GregHint"), mOptionDescriptions[RSK_GREG_HINT], IMFLAG_NONE);
+    mOptions[RSK_SARIA_HINT] = Option::Bool("Saria's Hint", CVAR_RANDOMIZER_SETTING("SariaHint"), mOptionDescriptions[RSK_SARIA_HINT], IMFLAG_NONE);
+    mOptions[RSK_FISHING_POLE_HINT] = Option::Bool("Fishing Pole Hint", CVAR_RANDOMIZER_SETTING("FishingPoleHint"), mOptionDescriptions[RSK_FISHING_POLE_HINT], IMFLAG_NONE);
+    mOptions[RSK_FROGS_HINT] = Option::Bool("Frog Ocarina Game Hint", CVAR_RANDOMIZER_SETTING("FrogsHint"), mOptionDescriptions[RSK_FROGS_HINT], IMFLAG_NONE);
+    mOptions[RSK_BIGGORON_HINT] = Option::Bool("Biggoron's Hint", CVAR_RANDOMIZER_SETTING("BiggoronHint"), mOptionDescriptions[RSK_BIGGORON_HINT], IMFLAG_NONE);
+    mOptions[RSK_BIG_POES_HINT] = Option::Bool("Big Poes Hint", CVAR_RANDOMIZER_SETTING("BigPoesHint"), mOptionDescriptions[RSK_BIG_POES_HINT], IMFLAG_NONE);
+    mOptions[RSK_CHICKENS_HINT] = Option::Bool("Chickens Hint", CVAR_RANDOMIZER_SETTING("ChickensHint"), mOptionDescriptions[RSK_CHICKENS_HINT], IMFLAG_NONE);
+    mOptions[RSK_MALON_HINT] = Option::Bool("Malon Hint", CVAR_RANDOMIZER_SETTING("MalonHint"), mOptionDescriptions[RSK_MALON_HINT], IMFLAG_NONE);
+    mOptions[RSK_HBA_HINT] = Option::Bool("Horseback Archery Hint", CVAR_RANDOMIZER_SETTING("HBAHint"), mOptionDescriptions[RSK_HBA_HINT], IMFLAG_NONE);
+    mOptions[RSK_WARP_SONG_HINTS] = Option::Bool("Warp Song Hints", CVAR_RANDOMIZER_SETTING("WarpSongText"), mOptionDescriptions[RSK_WARP_SONG_HINTS], IMFLAG_NONE, WidgetType::Checkbox, RO_GENERIC_ON);
+    mOptions[RSK_SCRUB_TEXT_HINT] = Option::Bool("Scrub Hint Text", CVAR_RANDOMIZER_SETTING("ScrubText"), mOptionDescriptions[RSK_SCRUB_TEXT_HINT], IMFLAG_NONE);
+    mOptions[RSK_KAK_10_SKULLS_HINT] = Option::Bool("10 GS Hint", CVAR_RANDOMIZER_SETTING("10GSHint"), mOptionDescriptions[RSK_KAK_10_SKULLS_HINT], IMFLAG_NONE);
+    mOptions[RSK_KAK_20_SKULLS_HINT] = Option::Bool("20 GS Hint", CVAR_RANDOMIZER_SETTING("20GSHint"), mOptionDescriptions[RSK_KAK_20_SKULLS_HINT], IMFLAG_NONE);
+    mOptions[RSK_KAK_30_SKULLS_HINT] = Option::Bool("30 GS Hint", CVAR_RANDOMIZER_SETTING("30GSHint"), mOptionDescriptions[RSK_KAK_30_SKULLS_HINT], IMFLAG_NONE);
+    mOptions[RSK_KAK_40_SKULLS_HINT] = Option::Bool("40 GS Hint", CVAR_RANDOMIZER_SETTING("40GSHint"), mOptionDescriptions[RSK_KAK_40_SKULLS_HINT], IMFLAG_NONE);
+    mOptions[RSK_KAK_50_SKULLS_HINT] = Option::Bool("50 GS Hint", CVAR_RANDOMIZER_SETTING("50GSHint"), mOptionDescriptions[RSK_KAK_50_SKULLS_HINT], IMFLAG_NONE);
+    mOptions[RSK_KAK_100_SKULLS_HINT] = Option::Bool("100 GS Hint", CVAR_RANDOMIZER_SETTING("100GSHint"), mOptionDescriptions[RSK_KAK_100_SKULLS_HINT]);
     // TODO: Compasses show rewards/woth, maps show dungeon mode
-    mOptions[RSK_BLUE_FIRE_ARROWS] = Option::Bool("Blue Fire Arrows", "gRandomizeBlueFireArrows", mOptionDescriptions[RSK_BLUE_FIRE_ARROWS]);
-    mOptions[RSK_SUNLIGHT_ARROWS] = Option::Bool("Sunlight Arrows", "gRandomizeSunlightArrows", mOptionDescriptions[RSK_SUNLIGHT_ARROWS]);
-    mOptions[RSK_ITEM_POOL] = Option::U8("Item Pool", {"Plentiful", "Balanced", "Scarce", "Minimal"}, OptionCategory::Setting, "gRandomizeItemPool", mOptionDescriptions[RSK_ITEM_POOL], WidgetType::Combobox, RO_ITEM_POOL_BALANCED);
-    mOptions[RSK_ICE_TRAPS] = Option::U8("Ice Traps", {"Off", "Normal", "Extra", "Mayhem", "Onslaught"}, OptionCategory::Setting, "gRandomizeIceTraps", mOptionDescriptions[RSK_ICE_TRAPS], WidgetType::Combobox, RO_ICE_TRAPS_NORMAL);
+    mOptions[RSK_BLUE_FIRE_ARROWS] = Option::Bool("Blue Fire Arrows", CVAR_RANDOMIZER_SETTING("BlueFireArrows"), mOptionDescriptions[RSK_BLUE_FIRE_ARROWS]);
+    mOptions[RSK_SUNLIGHT_ARROWS] = Option::Bool("Sunlight Arrows", CVAR_RANDOMIZER_SETTING("SunlightArrows"), mOptionDescriptions[RSK_SUNLIGHT_ARROWS]);
+    mOptions[RSK_ITEM_POOL] = Option::U8("Item Pool", {"Plentiful", "Balanced", "Scarce", "Minimal"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ItemPool"), mOptionDescriptions[RSK_ITEM_POOL], WidgetType::Combobox, RO_ITEM_POOL_BALANCED);
+    mOptions[RSK_ICE_TRAPS] = Option::U8("Ice Traps", {"Off", "Normal", "Extra", "Mayhem", "Onslaught"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("IceTraps"), mOptionDescriptions[RSK_ICE_TRAPS], WidgetType::Combobox, RO_ICE_TRAPS_NORMAL);
     // TODO: Remove Double Defense, Progressive Goron Sword
-    mOptions[RSK_STARTING_OCARINA] = Option::U8("Start with Ocarina", {"Off", "Fairy Ocarina", "Ocarina of Time"}, OptionCategory::Setting, "gRandomizeStartingOcarina", "", WidgetType::Combobox, RO_STARTING_OCARINA_OFF);
-    mOptions[RSK_STARTING_DEKU_SHIELD] = Option::Bool("Start with Deku Shield", "gRandomizeStartingDekuShield");
-    mOptions[RSK_STARTING_KOKIRI_SWORD] = Option::Bool("Start with Kokiri Sword", "gRandomizeStartingKokiriSword");
-    mOptions[RSK_STARTING_MASTER_SWORD] = Option::Bool("Start with Master Sword", "gRandomizeStartingMasterSword");
-    mOptions[RSK_STARTING_CONSUMABLES] = Option::Bool("Start with Consumables", {"No", "Yes"}, OptionCategory::Setting, "gRandomizeStartingConsumables", "", WidgetType::Checkbox, RO_GENERIC_OFF);
-    mOptions[RSK_FULL_WALLETS] = Option::Bool("Full Wallets", {"No", "Yes"}, OptionCategory::Setting, "gRandomizeFullWallets", mOptionDescriptions[RSK_FULL_WALLETS], WidgetType::Checkbox, RO_GENERIC_OFF);
-    mOptions[RSK_STARTING_ZELDAS_LULLABY] = Option::Bool("Start with Zelda's Lullaby", "gRandomizeStartingZeldasLullaby", "", IMFLAG_NONE);
-    mOptions[RSK_STARTING_EPONAS_SONG] = Option::Bool("Start with Epona's Song", "gRandomizeStartingEponasSong", "", IMFLAG_NONE);
-    mOptions[RSK_STARTING_SARIAS_SONG] = Option::Bool("Start with Saria's Song", "gRandomizeStartingSariasSong", "", IMFLAG_NONE);
-    mOptions[RSK_STARTING_SUNS_SONG] = Option::Bool("Start with Sun's Song", "gRandomizeStartingSunsSong", "", IMFLAG_NONE);
-    mOptions[RSK_STARTING_SONG_OF_TIME] = Option::Bool("Start with Song of Time", "gRandomizeStartingSongOfTime", "", IMFLAG_NONE);
-    mOptions[RSK_STARTING_SONG_OF_STORMS] = Option::Bool("Start with Song of Storms", "gRandomizeStartingSongOfStorms", "", IMFLAG_NONE);
-    mOptions[RSK_STARTING_MINUET_OF_FOREST] = Option::Bool("Start with Minuet of Forest", "gRandomizeStartingMinuetOfForest", "", IMFLAG_NONE);
-    mOptions[RSK_STARTING_BOLERO_OF_FIRE] = Option::Bool("Start with Bolero of Fire", "gRandomizeStartingBoleroOfFire", "", IMFLAG_NONE);
-    mOptions[RSK_STARTING_SERENADE_OF_WATER] = Option::Bool("Start with Serenade of Water", "gRandomizeStartingSerenadeOfWater", "", IMFLAG_NONE);
-    mOptions[RSK_STARTING_REQUIEM_OF_SPIRIT] = Option::Bool("Start with Requiem of Spirit", "gRandomizeStartingRequiemOfSpirit", "", IMFLAG_NONE);
-    mOptions[RSK_STARTING_NOCTURNE_OF_SHADOW] = Option::Bool("Start with Nocturne of Shadow", "gRandomizeStartingNocturneOfShadow", "", IMFLAG_NONE);
-    mOptions[RSK_STARTING_PRELUDE_OF_LIGHT] = Option::Bool("Start with Prelude of Light", "gRandomizeStartingPreludeOfLight");
-    mOptions[RSK_STARTING_SKULLTULA_TOKEN] = Option::U8("Gold Skulltula Tokens", {NumOpts(0, 100)}, OptionCategory::Setting, "gRandomizeStartingSkulltulaToken", "", WidgetType::Slider);
+    mOptions[RSK_STARTING_OCARINA] = Option::U8("Start with Ocarina", {"Off", "Fairy Ocarina", "Ocarina of Time"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("StartingOcarina"), "", WidgetType::Combobox, RO_STARTING_OCARINA_OFF);
+    mOptions[RSK_STARTING_DEKU_SHIELD] = Option::Bool("Start with Deku Shield", CVAR_RANDOMIZER_SETTING("StartingDekuShield"));
+    mOptions[RSK_STARTING_KOKIRI_SWORD] = Option::Bool("Start with Kokiri Sword", CVAR_RANDOMIZER_SETTING("StartingKokiriSword"));
+    mOptions[RSK_STARTING_MASTER_SWORD] = Option::Bool("Start with Master Sword", CVAR_RANDOMIZER_SETTING("StartingMasterSword"));
+    mOptions[RSK_STARTING_CONSUMABLES] = Option::Bool("Start with Consumables", {"No", "Yes"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("StartingConsumables"), "", WidgetType::Checkbox, RO_GENERIC_OFF);
+    mOptions[RSK_FULL_WALLETS] = Option::Bool("Full Wallets", {"No", "Yes"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("FullWallets"), mOptionDescriptions[RSK_FULL_WALLETS], WidgetType::Checkbox, RO_GENERIC_OFF);
+    mOptions[RSK_STARTING_ZELDAS_LULLABY] = Option::Bool("Start with Zelda's Lullaby", CVAR_RANDOMIZER_SETTING("StartingZeldasLullaby"), "", IMFLAG_NONE);
+    mOptions[RSK_STARTING_EPONAS_SONG] = Option::Bool("Start with Epona's Song", CVAR_RANDOMIZER_SETTING("StartingEponasSong"), "", IMFLAG_NONE);
+    mOptions[RSK_STARTING_SARIAS_SONG] = Option::Bool("Start with Saria's Song", CVAR_RANDOMIZER_SETTING("StartingSariasSong"), "", IMFLAG_NONE);
+    mOptions[RSK_STARTING_SUNS_SONG] = Option::Bool("Start with Sun's Song", CVAR_RANDOMIZER_SETTING("StartingSunsSong"), "", IMFLAG_NONE);
+    mOptions[RSK_STARTING_SONG_OF_TIME] = Option::Bool("Start with Song of Time", CVAR_RANDOMIZER_SETTING("StartingSongOfTime"), "", IMFLAG_NONE);
+    mOptions[RSK_STARTING_SONG_OF_STORMS] = Option::Bool("Start with Song of Storms", CVAR_RANDOMIZER_SETTING("StartingSongOfStorms"), "", IMFLAG_NONE);
+    mOptions[RSK_STARTING_MINUET_OF_FOREST] = Option::Bool("Start with Minuet of Forest", CVAR_RANDOMIZER_SETTING("StartingMinuetOfForest"), "", IMFLAG_NONE);
+    mOptions[RSK_STARTING_BOLERO_OF_FIRE] = Option::Bool("Start with Bolero of Fire", CVAR_RANDOMIZER_SETTING("StartingBoleroOfFire"), "", IMFLAG_NONE);
+    mOptions[RSK_STARTING_SERENADE_OF_WATER] = Option::Bool("Start with Serenade of Water", CVAR_RANDOMIZER_SETTING("StartingSerenadeOfWater"), "", IMFLAG_NONE);
+    mOptions[RSK_STARTING_REQUIEM_OF_SPIRIT] = Option::Bool("Start with Requiem of Spirit", CVAR_RANDOMIZER_SETTING("StartingRequiemOfSpirit"), "", IMFLAG_NONE);
+    mOptions[RSK_STARTING_NOCTURNE_OF_SHADOW] = Option::Bool("Start with Nocturne of Shadow", CVAR_RANDOMIZER_SETTING("StartingNocturneOfShadow"), "", IMFLAG_NONE);
+    mOptions[RSK_STARTING_PRELUDE_OF_LIGHT] = Option::Bool("Start with Prelude of Light", CVAR_RANDOMIZER_SETTING("StartingPreludeOfLight"));
+    mOptions[RSK_STARTING_SKULLTULA_TOKEN] = Option::U8("Gold Skulltula Tokens", {NumOpts(0, 100)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("StartingSkulltulaToken"), "", WidgetType::Slider);
     mOptions[RSK_STARTING_HEARTS] = Option::U8("Hearts", {NumOpts(1, 20)}, OptionCategory::Setting, "", "", WidgetType::Slider, 2);
     // TODO: Remainder of Starting Items
-    mOptions[RSK_LOGIC_RULES] = Option::U8("Logic", {"Glitchless", "Glitched", "No Logic", "Vanilla"}, OptionCategory::Setting, "gRandomizeLogicRules", mOptionDescriptions[RSK_LOGIC_RULES], WidgetType::Combobox, RO_LOGIC_GLITCHLESS);
-    mOptions[RSK_ALL_LOCATIONS_REACHABLE] = Option::Bool("All Locations Reachable", {"Off", "On"}, OptionCategory::Setting, "gRandomizeAllLocationsReachable", mOptionDescriptions[RSK_ALL_LOCATIONS_REACHABLE], WidgetType::Checkbox, RO_GENERIC_ON);
-    mOptions[RSK_SKULLS_SUNS_SONG] = Option::Bool("Night Skulltula's Expect Sun's Song", "gRandomizeGsExpectSunsSong", mOptionDescriptions[RSK_SKULLS_SUNS_SONG]);
+    mOptions[RSK_LOGIC_RULES] = Option::U8("Logic", {"Glitchless", "Glitched", "No Logic", "Vanilla"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("LogicRules"), mOptionDescriptions[RSK_LOGIC_RULES], WidgetType::Combobox, RO_LOGIC_GLITCHLESS);
+    mOptions[RSK_ALL_LOCATIONS_REACHABLE] = Option::Bool("All Locations Reachable", {"Off", "On"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("AllLocationsReachable"), mOptionDescriptions[RSK_ALL_LOCATIONS_REACHABLE], WidgetType::Checkbox, RO_GENERIC_ON);
+    mOptions[RSK_SKULLS_SUNS_SONG] = Option::Bool("Night Skulltula's Expect Sun's Song", CVAR_RANDOMIZER_SETTING("GsExpectSunsSong"), mOptionDescriptions[RSK_SKULLS_SUNS_SONG]);
     mOptions[RSK_DAMAGE_MULTIPLIER] = Option::U8("Damage Multiplier", {"x1/2", "x1", "x2", "x4", "x8", "x16", "OHKO"}, OptionCategory::Setting, "", "", WidgetType::Slider, RO_DAMAGE_MULTIPLIER_DEFAULT);
     // clang-format on
 
@@ -1299,7 +1299,7 @@ void Settings::UpdateOptionProperties() {
     mOptions[RSK_RAINBOW_BRIDGE_REWARD_COUNT].Hide();
     mOptions[RSK_RAINBOW_BRIDGE_DUNGEON_COUNT].Hide();
     mOptions[RSK_RAINBOW_BRIDGE_TOKEN_COUNT].Hide();
-    if (CVarGetInteger("gRandomizeLogicRules", RO_LOGIC_GLITCHLESS) == RO_LOGIC_VANILLA) {
+    if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("LogicRules"), RO_LOGIC_GLITCHLESS) == RO_LOGIC_VANILLA) {
         mOptionGroups[RSG_AREA_ACCESS_IMGUI].Disable();
         mOptions[RSK_STARTING_AGE].Disable("");
         mOptions[RSK_GERUDO_FORTRESS].Disable("");
@@ -1322,9 +1322,9 @@ void Settings::UpdateOptionProperties() {
     } else {
         mOptionGroups[RSG_AREA_ACCESS_IMGUI].Enable();
         // Starting Age - Disabled when Forest is set to Closed or under very specific conditions
-        if (CVarGetInteger("gRandomizeForest", RO_FOREST_CLOSED) == RO_FOREST_CLOSED ||
-            (CVarGetInteger("gRandomizeDoorOfTime", RO_DOOROFTIME_CLOSED) == RO_DOOROFTIME_CLOSED &&
-            CVarGetInteger("gRandomizeShuffleOcarinas", RO_GENERIC_OFF) == RO_GENERIC_OFF)) /* closed door of time with ocarina shuffle off */ {
+        if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("Forest"), RO_FOREST_CLOSED) == RO_FOREST_CLOSED ||
+            (CVarGetInteger(CVAR_RANDOMIZER_SETTING("DoorOfTime"), RO_DOOROFTIME_CLOSED) == RO_DOOROFTIME_CLOSED &&
+            CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleOcarinas"), RO_GENERIC_OFF) == RO_GENERIC_OFF)) /* closed door of time with ocarina shuffle off */ {
             mOptions[RSK_STARTING_AGE].Disable("This option is disabled due to other options making the game unbeatable");
         } else {
             mOptions[RSK_STARTING_AGE].Enable();
@@ -1337,8 +1337,8 @@ void Settings::UpdateOptionProperties() {
         mOptions[RSK_RAINBOW_BRIDGE_REWARD_COUNT].Enable();
         mOptions[RSK_RAINBOW_BRIDGE_DUNGEON_COUNT].Enable();
         mOptions[RSK_RAINBOW_BRIDGE_TOKEN_COUNT].Enable();
-        const uint8_t bridgeOpt = CVarGetInteger("gRandomizeBridgeRewardOptions", RO_BRIDGE_STANDARD_REWARD);
-        switch (CVarGetInteger("gRandomizeRainbowBridge", RO_BRIDGE_VANILLA)) {
+        const uint8_t bridgeOpt = CVarGetInteger(CVAR_RANDOMIZER_SETTING("BridgeRewardOptions"), RO_BRIDGE_STANDARD_REWARD);
+        switch (CVarGetInteger(CVAR_RANDOMIZER_SETTING("RainbowBridge"), RO_BRIDGE_VANILLA)) {
             case RO_BRIDGE_STONES:
                 // Show Bridge Options and Stone Count slider
                 mOptions[RSK_RAINBOW_BRIDGE].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
@@ -1411,7 +1411,7 @@ void Settings::UpdateOptionProperties() {
         mOptions[RSK_GANONS_TRIALS].Enable();
         mOptions[RSK_TRIAL_COUNT].Enable();
         // Only show the trial count slider if Trials is set to Set Number
-        if (CVarGetInteger("gRandomizeGanonTrial", RO_GANONS_TRIALS_SKIP) == RO_GANONS_TRIALS_SET_NUMBER) {
+        if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("GanonTrial"), RO_GANONS_TRIALS_SKIP) == RO_GANONS_TRIALS_SET_NUMBER) {
             mOptions[RSK_GANONS_TRIALS].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
             mOptions[RSK_TRIAL_COUNT].Unhide();
         } else {
@@ -1422,7 +1422,7 @@ void Settings::UpdateOptionProperties() {
         mOptions[RSK_TRIFORCE_HUNT_PIECES_TOTAL].Enable();
         mOptions[RSK_TRIFORCE_HUNT_PIECES_REQUIRED].Enable();
         // Remove the pieces required/total sliders and add a separator after Tirforce Hunt if Triforce Hunt is off
-        if (CVarGetInteger("gRandomizeTriforceHunt", RO_GENERIC_OFF) == RO_GENERIC_OFF) {
+        if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("TriforceHunt"), RO_GENERIC_OFF) == RO_GENERIC_OFF) {
             mOptions[RSK_TRIFORCE_HUNT_PIECES_REQUIRED].Hide();
             mOptions[RSK_TRIFORCE_HUNT_PIECES_TOTAL].Hide();
             mOptions[RSK_TRIFORCE_HUNT].AddFlag(IMFLAG_SEPARATOR_BOTTOM);
@@ -1432,14 +1432,14 @@ void Settings::UpdateOptionProperties() {
             mOptions[RSK_TRIFORCE_HUNT].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
         }
         // Update triforce pieces required to be capped at the current value for pieces total.
-        const uint8_t triforceTotal = CVarGetInteger("gRandomizeTriforceHuntTotalPieces", 30);
+        const uint8_t triforceTotal = CVarGetInteger(CVAR_RANDOMIZER_SETTING("TriforceHuntTotalPieces"), 30);
         if (mOptions[RSK_TRIFORCE_HUNT_PIECES_REQUIRED].GetOptionCount() != triforceTotal + 1) {
             mOptions[RSK_TRIFORCE_HUNT_PIECES_REQUIRED].ChangeOptions(NumOpts(1, triforceTotal + 1));
         }
         mOptionGroups[RSG_ITEMS_IMGUI_TABLE].Enable();
         mOptionGroups[RSG_GAMEPLAY_IMGUI_TABLE].Enable();
         // Link's Pocket - Disabled when Dungeon Rewards are shuffled to End of Dungeon
-        if (CVarGetInteger("gRandomizeShuffleDungeonReward", RO_DUNGEON_REWARDS_END_OF_DUNGEON) == RO_DUNGEON_REWARDS_END_OF_DUNGEON) {
+        if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleDungeonReward"), RO_DUNGEON_REWARDS_END_OF_DUNGEON) == RO_DUNGEON_REWARDS_END_OF_DUNGEON) {
             mOptions[RSK_LINKS_POCKET].Disable("This option is disabled because \"Dungeon Rewards\" are shuffled to \"End of Dungeons\".");
         } else {
             mOptions[RSK_LINKS_POCKET].Enable();
@@ -1467,7 +1467,7 @@ void Settings::UpdateOptionProperties() {
     } else {
         // If any MQ Options are available, show the MQ Dungeon Randomization Combobox
         mOptions[RSK_MQ_DUNGEON_RANDOM].Unhide();
-        switch(CVarGetInteger("gRandomizeMqDungeons", RO_MQ_DUNGEONS_NONE)) {
+        switch(CVarGetInteger(CVAR_RANDOMIZER_SETTING("MqDungeons"), RO_MQ_DUNGEONS_NONE)) {
             // If No MQ Dungeons, add a separator after the combobx and hide
             // the count slider and the toggle for individual dungeon selections.
             case RO_MQ_DUNGEONS_NONE:
@@ -1494,8 +1494,8 @@ void Settings::UpdateOptionProperties() {
                 break;
         }
         // Controls whether or not to show the selectors for individual dungeons.
-        if (CVarGetInteger("gRandomizeMqDungeons", RO_MQ_DUNGEONS_NONE) != RO_MQ_DUNGEONS_NONE &&
-            CVarGetInteger("gRandomizeMqDungeonsSelection", RO_GENERIC_OFF) == RO_GENERIC_ON) {
+        if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("MqDungeons"), RO_MQ_DUNGEONS_NONE) != RO_MQ_DUNGEONS_NONE &&
+            CVarGetInteger(CVAR_RANDOMIZER_SETTING("MqDungeonsSelection"), RO_GENERIC_OFF) == RO_GENERIC_ON) {
             // if showing the dungeon selectors, remove the separator after the Set Dungeons checkbox.
             mOptions[RSK_MQ_DUNGEON_SET].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
             mOptions[RSK_MQ_DEKU_TREE].Unhide();
@@ -1528,13 +1528,13 @@ void Settings::UpdateOptionProperties() {
         }
     }
     // Disable interaction with Set Dungeons checkbox if MQ Dungeon Randomization is set to Selection Only.
-    if (CVarGetInteger("gRandomizeMqDungeons", RO_MQ_DUNGEONS_NONE) == RO_MQ_DUNGEONS_SELECTION) {
+    if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("MqDungeons"), RO_MQ_DUNGEONS_NONE) == RO_MQ_DUNGEONS_SELECTION) {
         mOptions[RSK_MQ_DUNGEON_SET].Disable("This option is force-enabled because Master Quest Dungeons is set to Selection Only", UIWidgets::CheckboxGraphics::Checkmark);
     } else {
         mOptions[RSK_MQ_DUNGEON_SET].Enable();
     }
     // Show mixed entrance pool options if mixed entrance pools are enabled at all.
-    if (CVarGetInteger("gRandomizeMixedEntrances", RO_GENERIC_OFF)) {
+    if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("MixedEntrances"), RO_GENERIC_OFF)) {
         mOptions[RSK_MIXED_ENTRANCE_POOLS].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
         mOptions[RSK_MIX_DUNGEON_ENTRANCES].Unhide();
         mOptions[RSK_MIX_BOSS_ENTRANCES].Unhide();
@@ -1550,13 +1550,13 @@ void Settings::UpdateOptionProperties() {
         mOptions[RSK_MIX_GROTTO_ENTRANCES].Hide();
     }
     // Shuffle Weird Egg - Disabled when Skip Child Zelda is active
-    if (CVarGetInteger("gRandomizeSkipChildZelda", RO_GENERIC_DONT_SKIP)) {
+    if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("SkipChildZelda"), RO_GENERIC_DONT_SKIP)) {
         mOptions[RSK_SHUFFLE_WEIRD_EGG].Disable("This option is disabled because \"Skip Child Zelda\" is enabled.");
     } else {
         mOptions[RSK_SHUFFLE_WEIRD_EGG].Enable();
     }
     // Hide shopsanity prices if shopsanity is off or zero
-    switch (CVarGetInteger("gRandomizeShopsanity", RO_SHOPSANITY_OFF)) {
+    switch (CVarGetInteger(CVAR_RANDOMIZER_SETTING("Shopsanity"), RO_SHOPSANITY_OFF)) {
         case RO_SHOPSANITY_OFF:
         case RO_SHOPSANITY_ZERO_ITEMS:
             mOptions[RSK_SHOPSANITY].AddFlag(IMFLAG_SEPARATOR_BOTTOM);
@@ -1570,7 +1570,7 @@ void Settings::UpdateOptionProperties() {
             break;
     }
     // Hide fishing pond settings if we aren't shuffling the fishing pond
-    switch (CVarGetInteger("gRandomizeFishsanity", RO_FISHSANITY_OFF)) {
+    switch (CVarGetInteger(CVAR_RANDOMIZER_SETTING("Fishsanity"), RO_FISHSANITY_OFF)) {
         case RO_FISHSANITY_POND:
         case RO_FISHSANITY_BOTH:
             mOptions[RSK_FISHSANITY].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
@@ -1583,13 +1583,13 @@ void Settings::UpdateOptionProperties() {
             mOptions[RSK_FISHSANITY_AGE_SPLIT].Hide();
     }
     // Disable fishing pole hint if the fishing pole is not shuffled
-    if (CVarGetInteger("gRandomizeShuffleFishingPole", RO_GENERIC_OFF)) {
+    if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleFishingPole"), RO_GENERIC_OFF)) {
         mOptions[RSK_FISHING_POLE_HINT].Enable();
     } else {
         mOptions[RSK_FISHING_POLE_HINT].Disable("This option is disabled since the fishing pole is not shuffled.");
     }
     // Shuffle 100 GS Reward - Force-Enabled if Ganon's Boss Key is on the 100 GS Reward
-    if (CVarGetInteger("gRandomizeShuffleGanonBossKey", RO_GANON_BOSS_KEY_VANILLA) == RO_GANON_BOSS_KEY_KAK_TOKENS) {
+    if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleGanonBossKey"), RO_GANON_BOSS_KEY_VANILLA) == RO_GANON_BOSS_KEY_KAK_TOKENS) {
         mOptions[RSK_SHUFFLE_100_GS_REWARD].Disable("This option is force-enabled because \"Ganon's Boss Key\" is set to \"100 GS Reward.\"", UIWidgets::CheckboxGraphics::Checkmark);
     } else {
         mOptions[RSK_SHUFFLE_100_GS_REWARD].Enable();
@@ -1606,7 +1606,7 @@ void Settings::UpdateOptionProperties() {
     mOptions[RSK_KEYRINGS_BOTTOM_OF_THE_WELL].Hide();
     mOptions[RSK_KEYRINGS_GTG].Hide();
     mOptions[RSK_KEYRINGS_GANONS_CASTLE].Hide();
-    switch (CVarGetInteger("gRandomizeShuffleKeyRings", RO_KEYRINGS_OFF)) {
+    switch (CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleKeyRings"), RO_KEYRINGS_OFF)) {
         case RO_KEYRINGS_COUNT:
             // Show count slider.
             mOptions[RSK_KEYRINGS].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
@@ -1627,20 +1627,20 @@ void Settings::UpdateOptionProperties() {
         default:
             break;
     }
-    const uint8_t maxKeyringCount = (CVarGetInteger("gRandomizeGerudoFortress", RO_GF_NORMAL) == RO_GF_NORMAL &&
-                               CVarGetInteger("gRandomizeGerudoKeys", RO_GERUDO_KEYS_VANILLA) != RO_GERUDO_KEYS_VANILLA) ? 9 : 8;
+    const uint8_t maxKeyringCount = (CVarGetInteger(CVAR_RANDOMIZER_SETTING("GerudoFortress"), RO_GF_NORMAL) == RO_GF_NORMAL &&
+                               CVarGetInteger(CVAR_RANDOMIZER_SETTING("GerudoKeys"), RO_GERUDO_KEYS_VANILLA) != RO_GERUDO_KEYS_VANILLA) ? 9 : 8;
     if (mOptions[RSK_KEYRINGS_RANDOM_COUNT].GetOptionCount() != maxKeyringCount + 1) {
         mOptions[RSK_KEYRINGS_RANDOM_COUNT].ChangeOptions(NumOpts(0, maxKeyringCount));
     }
-    if (CVarGetInteger("gRandomizeGerudoFortress", RO_GF_NORMAL) != RO_GF_NORMAL ||
-        CVarGetInteger("gRandomizeGerudoKeys", RO_GERUDO_KEYS_VANILLA) == RO_GERUDO_KEYS_VANILLA) {
+    if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("GerudoFortress"), RO_GF_NORMAL) != RO_GF_NORMAL ||
+        CVarGetInteger(CVAR_RANDOMIZER_SETTING("GerudoKeys"), RO_GERUDO_KEYS_VANILLA) == RO_GERUDO_KEYS_VANILLA) {
         mOptions[RSK_KEYRINGS_GERUDO_FORTRESS].Disable("Disabled because the currently selected Gerudo Fortress Carpenters\n"
             "setting and/or Gerudo Fortress Keys setting is incompatible with\n"
             "having a Gerudo Fortress Keyring.");
     } else {
         mOptions[RSK_KEYRINGS_GERUDO_FORTRESS].Enable();
     }
-    if (CVarGetInteger("gRandomizeTriforceHunt", RO_GENERIC_OFF)) {
+    if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("TriforceHunt"), RO_GENERIC_OFF)) {
         mOptions[RSK_GANONS_BOSS_KEY].Disable("This option is disabled because Triforce Hunt is enabled."
             "Ganon's Boss key\nwill instead be given to you after Triforce Hunt completion.");
     } else {
@@ -1653,8 +1653,8 @@ void Settings::UpdateOptionProperties() {
     mOptions[RSK_LACS_REWARD_COUNT].Hide();
     mOptions[RSK_LACS_DUNGEON_COUNT].Hide();
     mOptions[RSK_LACS_TOKEN_COUNT].Hide();
-    const uint8_t lacsOpts = CVarGetInteger("gRandomizeLacsRewardOptions", RO_LACS_STANDARD_REWARD);
-    switch (CVarGetInteger("gRandomizeShuffleGanonBossKey", RO_GANON_BOSS_KEY_VANILLA)) {
+    const uint8_t lacsOpts = CVarGetInteger(CVAR_RANDOMIZER_SETTING("LacsRewardOptions"), RO_LACS_STANDARD_REWARD);
+    switch (CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleGanonBossKey"), RO_GANON_BOSS_KEY_VANILLA)) {
         case RO_GANON_BOSS_KEY_LACS_STONES:
             mOptions[RSK_LACS_OPTIONS].Unhide();
             mOptions[RSK_LACS_STONE_COUNT].Unhide();
@@ -1715,12 +1715,12 @@ void Settings::UpdateOptionProperties() {
             break;
     }
     // Skip Child Stealth - Disabled when Skip Child Zelda is active
-    if (CVarGetInteger("gRandomizeSkipChildZelda", RO_GENERIC_DONT_SKIP)) {
+    if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("SkipChildZelda"), RO_GENERIC_DONT_SKIP)) {
         mOptions[RSK_SKIP_CHILD_STEALTH].Disable("This option is disabled because \"Skip Child Zelda\" is enabled.");
     } else {
         mOptions[RSK_SKIP_CHILD_STEALTH].Enable();
     }
-    if (CVarGetInteger("gRandomizeGossipStoneHints", RO_GOSSIP_STONES_NEED_NOTHING) == RO_GOSSIP_STONES_NONE) {
+    if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("GossipStoneHints"), RO_GOSSIP_STONES_NEED_NOTHING) == RO_GOSSIP_STONES_NONE) {
         mOptions[RSK_HINT_CLARITY].Hide();
         mOptions[RSK_HINT_DISTRIBUTION].Hide();
     } else {
@@ -1728,19 +1728,19 @@ void Settings::UpdateOptionProperties() {
         mOptions[RSK_HINT_DISTRIBUTION].Unhide();
     }
 
-    if (CVarGetInteger("gRandomizeShuffleCows", RO_GENERIC_OFF)) {
+    if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleCows"), RO_GENERIC_OFF)) {
         mOptions[RSK_MALON_HINT].Enable();
         } else {
         mOptions[RSK_MALON_HINT].Disable("Malon's hint points to a cow, so requires cows to be shuffled.");
     }
 
-    if (CVarGetInteger("gRandomizeShuffle100GSReward", RO_GENERIC_OFF)) {
+    if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("Shuffle100GSReward"), RO_GENERIC_OFF)) {
         mOptions[RSK_KAK_100_SKULLS_HINT].Enable();
         } else {
         mOptions[RSK_KAK_100_SKULLS_HINT].Disable("There is no point to hinting 100 skulls if it is not shuffled");
     }
 
-    if (CVarGetInteger("gRandomizeCuccosToReturn", 7) == 0) {
+    if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("CuccosToReturn"), 7) == 0) {
         mOptions[RSK_CHICKENS_HINT].Disable("Anju will just give you the item instead with 0 chickens");
     } else {
         mOptions[RSK_CHICKENS_HINT].Enable();
diff --git a/soh/soh/Enhancements/timesaver_hook_handlers.cpp b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
index ad612a82e..569459c67 100644
--- a/soh/soh/Enhancements/timesaver_hook_handlers.cpp
+++ b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
@@ -96,7 +96,7 @@ void EnZl4_SkipToGivingZeldasLetter(EnZl4* enZl4, PlayState* play) {
 void EnDntDemo_JudgeSkipToReward(EnDntDemo* enDntDemo, PlayState* play) {
     // todo: figure out a better way to handle toggling so we don't
     //       need to double check cvars like this
-    if(!(IS_RANDO || CVarGetInteger("gTimeSavers.SkipMiscInteractions", IS_RANDO))) {
+    if(!(IS_RANDO || CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO))) {
         EnDntDemo_Judge(enDntDemo, play);
         return;
     }
@@ -141,12 +141,12 @@ void TimeSaverOnGameFrameUpdateHandler() {
 void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void* opt) {
     switch (id) {
         case VB_PLAY_TRANSITION_CS: {
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.Intro", IS_RANDO) && gSaveContext.entranceIndex == ENTR_LINKS_HOUSE_0 && gSaveContext.cutsceneIndex == 0xFFF1) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Intro"), IS_RANDO) && gSaveContext.entranceIndex == ENTR_LINKS_HOUSE_0 && gSaveContext.cutsceneIndex == 0xFFF1) {
                 gSaveContext.cutsceneIndex = 0;
                 *should = false;
             }
 
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", IS_RANDO) || IS_RANDO) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.LearnSong"), IS_RANDO) || IS_RANDO) {
                 // Song of Time
                 if (gSaveContext.entranceIndex == ENTR_TEMPLE_OF_TIME_0 && gSaveContext.cutsceneIndex == 0xFFF7) {
                     gSaveContext.entranceIndex = ENTR_HYRULE_FIELD_16;
@@ -184,7 +184,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
                 }
             }
 
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.Story", IS_RANDO)) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
                 uint8_t isBlueWarp = 0;
                 // Deku Tree Blue warp
                 if (gSaveContext.entranceIndex == ENTR_KOKIRI_FOREST_0 && gSaveContext.cutsceneIndex == 0xFFF1) {
@@ -278,7 +278,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             }
 
             if (gSaveContext.entranceIndex == ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_0) {
-                if (CVarGetInteger("gTimeSavers.SkipTowerEscape", false) || IS_BOSS_RUSH) {
+                if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipTowerEscape"), false) || IS_BOSS_RUSH) {
                     Flags_SetEventChkInf(EVENTCHKINF_WATCHED_GANONS_CASTLE_COLLAPSE_CAUGHT_BY_GERUDO);
                     gSaveContext.entranceIndex = ENTR_GANON_BOSS_0;
                     *should = false;
@@ -286,7 +286,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             }
 
             if (gSaveContext.entranceIndex == ENTR_CASTLE_COURTYARD_GUARDS_DAY_0) {
-                if (CVarGetInteger("gTimeSavers.SkipChildStealth", false)) {
+                if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipChildStealth"), false)) {
                     gSaveContext.entranceIndex = ENTR_CASTLE_COURTYARD_ZELDA_0;
                     *should = false;
                 }
@@ -295,13 +295,13 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
         }
         case VB_PLAY_ENTRANCE_CS: {
             s32* entranceFlag = static_cast<s32*>(opt);
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.Entrances", IS_RANDO) && (*entranceFlag != EVENTCHKINF_EPONA_OBTAINED)) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Entrances"), IS_RANDO) && (*entranceFlag != EVENTCHKINF_EPONA_OBTAINED)) {
                 *should = false;
             }
             break;
         }
         case VB_PLAY_ONEPOINT_CS: {
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.OnePoint", IS_RANDO)) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.OnePoint"), IS_RANDO)) {
                 s16* csId = static_cast<s16*>(opt);
                 switch (*csId) {
                     case 4180:
@@ -317,7 +317,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             break;
         }
         case VB_PLAY_ONEPOINT_ACTOR_CS: {
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.OnePoint", IS_RANDO)) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.OnePoint"), IS_RANDO)) {
                 Actor* actor = static_cast<Actor*>(opt);
 
                 // there are a few checks throughout the game (such as chest spawns) that rely on this
@@ -404,18 +404,18 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             break;
         }
         case VB_SHOW_TITLE_CARD:
-            if (CVarGetInteger("gTimeSavers.DisableTitleCard", IS_RANDO)) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.DisableTitleCard"), IS_RANDO)) {
                 *should = false;
             }
             break;
         case VB_WONDER_TALK: {
-            if (CVarGetInteger("gTimeSavers.NoForcedDialog", IS_RANDO)) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.NoForcedDialog"), IS_RANDO)) {
                 *should = false;
             }
             break;
         }
         case VB_NAVI_TALK: {
-            if (CVarGetInteger("gTimeSavers.NoForcedDialog", IS_RANDO)) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.NoForcedDialog"), IS_RANDO)) {
                 ElfMsg* naviTalk = static_cast<ElfMsg*>(opt);
                 Flags_SetSwitch(gPlayState, (naviTalk->actor.params >> 8) & 0x3F);
                 Actor_Kill(&naviTalk->actor);
@@ -424,14 +424,14 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             break;
         }
         case VB_NOT_BE_GREETED_BY_SARIA:
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.Entrances", IS_RANDO) && !Flags_GetInfTable(INFTABLE_GREETED_BY_SARIA)) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Entrances"), IS_RANDO) && !Flags_GetInfTable(INFTABLE_GREETED_BY_SARIA)) {
                 Flags_SetInfTable(INFTABLE_GREETED_BY_SARIA);
                 *should = true;
             }
             break;
         case VB_MOVE_MIDO_IN_KOKIRI_FOREST:
             if (
-                CVarGetInteger("gTimeSavers.SkipMiscInteractions", IS_RANDO) &&
+                CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO) &&
                 !Flags_GetEventChkInf(EVENTCHKINF_SHOWED_MIDO_SWORD_SHIELD) &&
                 (CUR_EQUIP_VALUE(EQUIP_TYPE_SHIELD) == EQUIP_VALUE_SHIELD_DEKU) && 
                 (CUR_EQUIP_VALUE(EQUIP_TYPE_SWORD) == EQUIP_VALUE_SWORD_KOKIRI)
@@ -441,7 +441,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             }
             break;
         case VB_PLAY_DEKU_TREE_INTRO_CS: {
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.Story", IS_RANDO)) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
                 BgTreemouth* treeMouth = static_cast<BgTreemouth*>(opt);
                 Flags_SetEventChkInf(EVENTCHKINF_DEKU_TREE_OPENED_MOUTH);
                 Audio_PlaySoundGeneral(NA_SE_EV_WOODDOOR_OPEN, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
@@ -453,7 +453,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
         case VB_DEKU_JR_CONSIDER_FOREST_TEMPLE_FINISHED: {
             // We're overriding this so that the Deku JR doesn't despawn after skipping the forest temple blue warp cutscene.
             // It typically relies on the forest medallion being obtained, but that isn't given yet until after scene init
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.Story", IS_RANDO)) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
                 *should = Flags_GetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP);
             }
             break;
@@ -462,18 +462,18 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
         case VB_PLAY_SHIEK_BLOCK_MASTER_SWORD_CS:
         case VB_GIVE_ITEM_FAIRY_OCARINA:
         case VB_GIVE_ITEM_LIGHT_ARROW:
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.Story", IS_RANDO)) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
                 *should = false;
             }
             break;
         case VB_PLAY_NABOORU_CAPTURED_CS:
-            if (*should == true && CVarGetInteger("gTimeSavers.SkipCutscene.Story", IS_RANDO)) {
+            if (*should == true && CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
                 Flags_SetEventChkInf(EVENTCHKINF_NABOORU_CAPTURED_BY_TWINROVA);
                 *should = false;
             }
             break;
         case VB_PLAY_PULL_MASTER_SWORD_CS:
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.Story", IS_RANDO)) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
                 if (!Flags_GetEventChkInf(EVENTCHKINF_PULLED_MASTER_SWORD_FROM_PEDESTAL)) {
                     // Normally, these would be done in the cutscene, but we're skipping it
                     Flags_SetEventChkInf(EVENTCHKINF_PULLED_MASTER_SWORD_FROM_PEDESTAL);
@@ -488,7 +488,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             }
             break;
         case VB_OWL_INTERACTION: {
-            if (CVarGetInteger("gTimeSavers.SkipOwlInteractions", IS_RANDO) && *should) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipOwlInteractions"), IS_RANDO) && *should) {
                 EnOwl* enOwl = static_cast<EnOwl*>(opt);
                 s32 owlType = (enOwl->actor.params & 0xFC0) >> 6;
 
@@ -502,7 +502,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             break;
         }
         case VB_OVERRIDE_LINK_THE_GORON_DIALOGUE: {
-            if (CVarGetInteger("gTimeSavers.SkipMiscInteractions", IS_RANDO)) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO)) {
                 u16* textId = static_cast<u16*>(opt);
                 // If the doors are not open yet, prioritize opening them
                 if (!Flags_GetInfTable(INFTABLE_GORON_CITY_DOORS_UNLOCKED)) {
@@ -516,12 +516,12 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
         case VB_PLAY_EYEDROPS_CS:
         case VB_PLAY_DROP_FISH_FOR_JABU_CS:
         case VB_PLAY_DARUNIAS_JOY_CS:
-            if (CVarGetInteger("gTimeSavers.SkipMiscInteractions", IS_RANDO)) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO)) {
                 *should = false;
             }
             break;
         case VB_PLAY_ZELDAS_LULLABY_CS: {
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", IS_RANDO) || IS_RANDO) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.LearnSong"), IS_RANDO) || IS_RANDO) {
                 DemoIm* demoIm = static_cast<DemoIm*>(opt);
                 Player* player = GET_PLAYER(gPlayState);
                 player->stateFlags1 |= PLAYER_STATE1_IN_CUTSCENE;
@@ -532,7 +532,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
                 static uint32_t demoImKillHook = 0;
                 demoImUpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* actorRef) mutable {
                     Actor* actor = static_cast<Actor*>(actorRef);
-                    if (actor->id == ACTOR_DEMO_IM && (CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", IS_RANDO) || IS_RANDO)) {
+                    if (actor->id == ACTOR_DEMO_IM && (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.LearnSong"), IS_RANDO) || IS_RANDO)) {
                         DemoIm* demoIm = static_cast<DemoIm*>(actorRef);
                         Player* player = GET_PLAYER(gPlayState);
                         player->stateFlags1 |= PLAYER_STATE1_IN_CUTSCENE;
@@ -571,7 +571,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             break;
         }
         case VB_PLAY_SARIAS_SONG_CS: {
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", IS_RANDO) || IS_RANDO) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.LearnSong"), IS_RANDO) || IS_RANDO) {
                 EnSa* enSa = static_cast<EnSa*>(opt);
                 enSa->actionFunc = func_80AF6B20;
                 *should = false;
@@ -579,13 +579,13 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             break;
         }
         case VB_DESPAWN_HORSE_RACE_COW: {
-            if (Flags_GetEventChkInf(EVENTCHKINF_WON_COW_IN_MALONS_RACE) && CVarGetInteger("gCowOfTime", 0)) {
+            if (Flags_GetEventChkInf(EVENTCHKINF_WON_COW_IN_MALONS_RACE) && CVarGetInteger(CVAR_ENHANCEMENT("CowOfTime"), 0)) {
                 *should = false;
             }
             break;
         }
         case VB_PLAY_DRAIN_WELL_CS: {
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.Story", IS_RANDO)) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
                 *should = false;
                 Flags_SetSwitch(gPlayState, 0x2);
                 Flags_SetEventChkInf(EVENTCHKINF_PLAYED_SONG_OF_STORMS_IN_WINDMILL);
@@ -594,7 +594,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             break;
         }
         case VB_PLAY_SUNS_SONG_CS:
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", IS_RANDO) || IS_RANDO) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.LearnSong"), IS_RANDO) || IS_RANDO) {
                 *should = false;
                 Flags_SetEventChkInf(EVENTCHKINF_LEARNED_SUNS_SONG);
                 // SoH [Randomizer] TODO: Increment time X amount (find out X)
@@ -603,19 +603,19 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             }
             break;
         case VB_PLAY_ROYAL_FAMILY_TOMB_CS: {
-            if (CVarGetInteger("gTimeSavers.SkipMiscInteractions", IS_RANDO)) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO)) {
                 *should = false;
             }
             break;
         }
         case VB_PLAY_ROYAL_FAMILY_TOMB_EXPLODE: {
-            if (CVarGetInteger("gTimeSavers.SkipMiscInteractions", IS_RANDO)) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO)) {
                 *should = Flags_GetEventChkInf(EVENTCHKINF_DESTROYED_ROYAL_FAMILY_TOMB);
             }
             break;
         }
         case VB_PLAY_DOOR_OF_TIME_CS: {
-            if (CVarGetInteger("gTimeSavers.SkipMiscInteractions", IS_RANDO)) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO)) {
                 *should = false;
                 Flags_SetEnv(gPlayState, 2);
                 func_80078884(NA_SE_SY_CORRECT_CHIME);
@@ -638,41 +638,41 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
         case VB_PLAY_BOLERO_OF_FIRE_CS:
         case VB_PLAY_SERENADE_OF_WATER_CS:
         case VB_PLAY_PRELUDE_OF_LIGHT_CS:
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", IS_RANDO) || IS_RANDO) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.LearnSong"), IS_RANDO) || IS_RANDO) {
                 *should = false;
             }
             break;
         case VB_DAMPE_IN_GRAVEYARD_DESPAWN:
-            if (CVarGetInteger("gDampeAllNight", 0)) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("DampeAllNight"), 0)) {
                 *should = LINK_IS_ADULT || gPlayState->sceneNum != SCENE_GRAVEYARD;
             }
             break;
         case VB_BE_VALID_GRAVEDIGGING_SPOT:
-            if (CVarGetInteger("gDampeWin", 0)) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("DampeWin"), 0)) {
                 EnTk *enTk = static_cast<EnTk*>(opt);
                 enTk->validDigHere = true;
                 *should = true;
             }
             break;
         case VB_BE_DAMPE_GRAVEDIGGING_GRAND_PRIZE:
-            if (CVarGetInteger("gDampeWin", 0)) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("DampeWin"), 0)) {
                 EnTk *enTk = static_cast<EnTk*>(opt);
                 enTk->currentReward = 3;
                 *should = true;
             }
             break;
         case VB_DAMPE_GRAVEDIGGING_GRAND_PRIZE_BE_HEART_PIECE:
-            if (CVarGetInteger("gGravediggingTourFix", 0) || IS_RANDO) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("GravediggingTourFix"), 0) || IS_RANDO) {
                 *should = !Flags_GetCollectible(gPlayState, COLLECTFLAG_GRAVEDIGGING_HEART_PIECE);
             }
             break;
         case VB_FIX_SAW_SOFTLOCK:
             // Animation Count should be no more than 1 to guarantee putaway is complete after giving the saw
             // As this is vanilla behavior, it only applies with the Fix toggle or Skip Text enabled.
-            *should = (CVarGetInteger("gFixSawSoftlock", 0) != 0 || CVarGetInteger("gSkipText", 0) != 0) ? gPlayState->animationCtx.animationCount > 1 : *should;
+            *should = (CVarGetInteger(CVAR_ENHANCEMENT("FixSawSoftlock"), 0) != 0 || CVarGetInteger(CVAR_ENHANCEMENT("SkipText"), 0) != 0) ? gPlayState->animationCtx.animationCount > 1 : *should;
             break;
         case VB_BIGGORON_CONSIDER_SWORD_FORGED:
-            *should = Environment_GetBgsDayCount() >= CVarGetInteger("gForgeTime", 3);
+            *should = Environment_GetBgsDayCount() >= CVarGetInteger(CVAR_ENHANCEMENT("ForgeTime"), 3);
             break;
         case VB_BE_ELIGIBLE_FOR_GREAT_FAIRY_REWARD: {
             BgDyYoseizo* bgDyYoseizo = static_cast<BgDyYoseizo*>(opt);
@@ -704,7 +704,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
                 }
             }
 
-            if (flag != RAND_INF_MAX && (IS_RANDO || CVarGetInteger("gTimeSavers.SkipMiscInteractions", IS_RANDO))) {
+            if (flag != RAND_INF_MAX && (IS_RANDO || CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO))) {
                 if (IS_RANDO || *should) {
                     Flags_SetRandomizerInf(flag);
                     gSaveContext.healthAccumulator = 0x140;
@@ -716,14 +716,14 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             break;
         }
         case VB_PLAY_RAINBOW_BRIDGE_CS: {
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.Story", IS_RANDO)) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
                 *should = false;
                 func_800F595C(NA_BGM_BRIDGE_TO_GANONS);
             }
             break;
         }
         case VB_PHANTOM_GANON_DEATH_SCENE: {
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.QuickBossDeaths", IS_RANDO || IS_BOSS_RUSH)) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.QuickBossDeaths"), IS_RANDO || IS_BOSS_RUSH)) {
                 *should = false;
                 BossGanondrof* pg = static_cast<BossGanondrof*>(opt);
                 Player* player = GET_PLAYER(gPlayState);
@@ -749,7 +749,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
         }
         case VB_NABOORU_KNUCKLE_DEATH_SCENE: {
             EnIk* ik = static_cast<EnIk*>(opt);
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.QuickBossDeaths", IS_RANDO)) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.QuickBossDeaths"), IS_RANDO)) {
                 // Because no CS in rando, we hide the death of the knuckle by spawning flames and kill the actor
                 if ((ik->actor.colChkInfo.health <= 10)) {
                     s32 i;
@@ -791,7 +791,7 @@ void TimeSaverOnActorInitHandler(void* actorRef) {
     if (actor->id == ACTOR_EN_KO && (actor->params & 0xFF) == ENKO_TYPE_CHILD_3) {
         enKoUpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* innerActorRef) mutable {
             Actor* innerActor = static_cast<Actor*>(innerActorRef);
-            if (innerActor->id == ACTOR_EN_KO && (innerActor->params & 0xFF) == ENKO_TYPE_CHILD_3 && (CVarGetInteger("gTimeSavers.SkipCutscene.Story", IS_RANDO) || IS_RANDO)) {
+            if (innerActor->id == ACTOR_EN_KO && (innerActor->params & 0xFF) == ENKO_TYPE_CHILD_3 && (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO) || IS_RANDO)) {
                 EnKo* enKo = static_cast<EnKo*>(innerActorRef);
                 // They haven't moved yet, wrap their update function so we check every frame
                 if (enKo->actionFunc == func_80A995CC) {
@@ -817,7 +817,7 @@ void TimeSaverOnActorInitHandler(void* actorRef) {
         });
     }
 
-    if (actor->id == ACTOR_ITEM_OCARINA && actor->params == 3 && CVarGetInteger("gTimeSavers.SkipCutscene.Story", IS_RANDO)) {
+    if (actor->id == ACTOR_ITEM_OCARINA && actor->params == 3 && CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
         itemOcarinaframesSinceSpawn = 0;
         itemOcarinaUpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* innerActorRef) mutable {
             Actor* innerActor = static_cast<Actor*>(innerActorRef);
@@ -835,7 +835,7 @@ void TimeSaverOnActorInitHandler(void* actorRef) {
     if (actor->id == ACTOR_EN_MA1 && gPlayState->sceneNum == SCENE_LON_LON_RANCH) {
         enMa1UpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* innerActorRef) mutable {
             Actor* innerActor = static_cast<Actor*>(innerActorRef);
-            if (innerActor->id == ACTOR_EN_MA1 && (CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", IS_RANDO) || IS_RANDO)) {
+            if (innerActor->id == ACTOR_EN_MA1 && (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.LearnSong"), IS_RANDO) || IS_RANDO)) {
                 EnMa1* enMa1 = static_cast<EnMa1*>(innerActorRef);
                 if (enMa1->actionFunc == func_80AA106C) {
                     enMa1->actionFunc = EnMa1_EndTeachSong;
@@ -863,7 +863,7 @@ void TimeSaverOnActorInitHandler(void* actorRef) {
     if (actor->id == ACTOR_EN_FU) {
         enFuUpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* innerActorRef) mutable {
             Actor* innerActor = static_cast<Actor*>(innerActorRef);
-            if (innerActor->id == ACTOR_EN_FU && (CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", IS_RANDO) || IS_RANDO)) {
+            if (innerActor->id == ACTOR_EN_FU && (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.LearnSong"), IS_RANDO) || IS_RANDO)) {
                 EnFu* enFu = static_cast<EnFu*>(innerActorRef);
                 if (enFu->actionFunc == EnFu_TeachSong) {
                     enFu->actionFunc = EnFu_EndTeachSong;
@@ -885,7 +885,7 @@ void TimeSaverOnActorInitHandler(void* actorRef) {
     if (actor->id == ACTOR_BG_SPOT02_OBJECTS && actor->params == 2) {
         bgSpot02UpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* innerActorRef) mutable {
             Actor* innerActor = static_cast<Actor*>(innerActorRef);
-            if (innerActor->id == ACTOR_BG_SPOT02_OBJECTS && innerActor->params == 2 && (CVarGetInteger("gTimeSavers.SkipMiscInteractions", IS_RANDO))) {
+            if (innerActor->id == ACTOR_BG_SPOT02_OBJECTS && innerActor->params == 2 && (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO))) {
                 BgSpot02Objects* bgSpot02 = static_cast<BgSpot02Objects*>(innerActorRef);
                 if (bgSpot02->actionFunc == func_808ACC34) {
                     bgSpot02->actionFunc = func_808AC908;
@@ -904,14 +904,14 @@ void TimeSaverOnActorInitHandler(void* actorRef) {
         });
     }
 
-    if (actor->id == ACTOR_EN_ZL4 && CVarGetInteger("gTimeSavers.SkipCutscene.Story", IS_RANDO)) {
+    if (actor->id == ACTOR_EN_ZL4 && CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
         EnZl4* enZl4 = static_cast<EnZl4*>(actorRef);
         if (enZl4->actionFunc != EnZl4_Cutscene || enZl4->csState != 0) return;
 
         enZl4->actionFunc = EnZl4_SkipToGivingZeldasLetter;
     }
 
-    if (actor->id == ACTOR_EN_DNT_DEMO && (IS_RANDO || CVarGetInteger("gTimeSavers.SkipMiscInteractions", IS_RANDO))) {
+    if (actor->id == ACTOR_EN_DNT_DEMO && (IS_RANDO || CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO))) {
         EnDntDemo* enDntDemo = static_cast<EnDntDemo*>(actorRef);
         enDntDemo->actionFunc = EnDntDemo_JudgeSkipToReward;
     }
@@ -921,7 +921,7 @@ void TimeSaverOnActorInitHandler(void* actorRef) {
     // or poes from which the cutscene is triggered until we can have a "BeforeActorInit" hook.
     // So for now we're just going to set the flag before they get to the room the cutscene is in
     if (gPlayState->sceneNum == SCENE_FOREST_TEMPLE && actor->id == ACTOR_EN_ST && !Flags_GetSwitch(gPlayState, 0x1B)) {
-        if (CVarGetInteger("gTimeSavers.SkipCutscene.GlitchAiding", 0)) {
+        if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.GlitchAiding"), 0)) {
             Flags_SetSwitch(gPlayState, 0x1B);
         }
     }
@@ -930,7 +930,7 @@ void TimeSaverOnActorInitHandler(void* actorRef) {
     if (actor->id == ACTOR_EN_PO_SISTERS && actor->params == 28) {
         enPoSistersUpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* innerActorRef) mutable {
             Actor* innerActor = static_cast<Actor*>(innerActorRef);
-            if (innerActor->id == ACTOR_EN_PO_SISTERS && innerActor->params == 28 && (CVarGetInteger("gTimeSavers.SkipMiscInteractions", IS_RANDO))) {
+            if (innerActor->id == ACTOR_EN_PO_SISTERS && innerActor->params == 28 && (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO))) {
                 EnPoSisters* enPoSisters = static_cast<EnPoSisters*>(innerActorRef);
                 if (enPoSisters->actionFunc == func_80ADB338) {
                     enPoSisters->unk_19C = 0;
@@ -947,7 +947,7 @@ void TimeSaverOnActorInitHandler(void* actorRef) {
 
     // Fire Temple Darunia cutscene
     if (actor->id == ACTOR_EN_DU && gPlayState->sceneNum == SCENE_FIRE_TEMPLE) {
-        if (CVarGetInteger("gTimeSavers.SkipCutscene.GlitchAiding", 0)) {
+        if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.GlitchAiding"), 0)) {
             Flags_SetInfTable(INFTABLE_SPOKE_TO_DARUNIA_IN_FIRE_TEMPLE);
             Actor_Kill(actor);
         }
@@ -957,63 +957,63 @@ void TimeSaverOnActorInitHandler(void* actorRef) {
 void TimeSaverOnSceneInitHandler(int16_t sceneNum) {
     switch (sceneNum) {
         case SCENE_HYRULE_CASTLE:
-            if (CVarGetInteger("gTimeSavers.SkipMiscInteractions", IS_RANDO) && !Flags_GetInfTable(INFTABLE_ENTERED_HYRULE_CASTLE)) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO) && !Flags_GetInfTable(INFTABLE_ENTERED_HYRULE_CASTLE)) {
                 Flags_SetInfTable(INFTABLE_ENTERED_HYRULE_CASTLE);
                 Flags_SetInfTable(INFTABLE_MET_CHILD_MALON_AT_CASTLE_OR_MARKET);
                 Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_CHILD_MALON_AT_CASTLE_OR_MARKET);
             }
             break;
         case SCENE_LON_LON_RANCH:
-            if (CVarGetInteger("gTimeSavers.SkipMiscInteractions", IS_RANDO) && GameInteractor_Should(VB_MALON_RETURN_FROM_CASTLE, Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE), NULL)) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO) && GameInteractor_Should(VB_MALON_RETURN_FROM_CASTLE, Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE), NULL)) {
                 Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_CHILD_MALON_AT_RANCH);
                 Flags_SetInfTable(INFTABLE_CHILD_MALON_SAID_EPONA_WAS_AFRAID_OF_YOU);
                 Flags_SetEventChkInf(EVENTCHKINF_INVITED_TO_SING_WITH_CHILD_MALON);
             }
             break;
         case SCENE_DEKU_TREE_BOSS:
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", IS_RANDO)) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.BossIntro"), IS_RANDO)) {
                 if (!Flags_GetEventChkInf(EVENTCHKINF_BEGAN_GOHMA_BATTLE)) {
                     Flags_SetEventChkInf(EVENTCHKINF_BEGAN_GOHMA_BATTLE);
                 }
             }
             break;
         case SCENE_DODONGOS_CAVERN_BOSS:
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", IS_RANDO)) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.BossIntro"), IS_RANDO)) {
                 if (!Flags_GetEventChkInf(EVENTCHKINF_BEGAN_KING_DODONGO_BATTLE)) {
                     Flags_SetEventChkInf(EVENTCHKINF_BEGAN_KING_DODONGO_BATTLE);
                 }
             }
             break;
         case SCENE_JABU_JABU_BOSS:
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", IS_RANDO)) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.BossIntro"), IS_RANDO)) {
                 if (!Flags_GetEventChkInf(EVENTCHKINF_BEGAN_BARINA_BATTLE)) {
                     Flags_SetEventChkInf(EVENTCHKINF_BEGAN_BARINA_BATTLE);
                 }
             }
             break;
         case SCENE_FOREST_TEMPLE_BOSS:
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", IS_RANDO)) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.BossIntro"), IS_RANDO)) {
                 if (!Flags_GetEventChkInf(EVENTCHKINF_BEGAN_PHANTOM_GANON_BATTLE)) {
                     Flags_SetEventChkInf(EVENTCHKINF_BEGAN_PHANTOM_GANON_BATTLE);
                 }
             }
             break;
         case SCENE_FIRE_TEMPLE_BOSS:
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", IS_RANDO)) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.BossIntro"), IS_RANDO)) {
                 if (!Flags_GetEventChkInf(EVENTCHKINF_BEGAN_VOLVAGIA_BATTLE)) {
                     Flags_SetEventChkInf(EVENTCHKINF_BEGAN_VOLVAGIA_BATTLE);
                 }
             }
             break;
         case SCENE_WATER_TEMPLE_BOSS:
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", IS_RANDO)) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.BossIntro"), IS_RANDO)) {
                 if (!Flags_GetEventChkInf(EVENTCHKINF_BEGAN_MORPHA_BATTLE)) {
                     Flags_SetEventChkInf(EVENTCHKINF_BEGAN_MORPHA_BATTLE);
                 }
             }
             break;
         case SCENE_SPIRIT_TEMPLE_BOSS:
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", IS_RANDO)) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.BossIntro"), IS_RANDO)) {
                 if (!Flags_GetEventChkInf(EVENTCHKINF_BEGAN_TWINROVA_BATTLE)) {
                     Flags_SetEventChkInf(EVENTCHKINF_BEGAN_TWINROVA_BATTLE);
                     Flags_SetEventChkInf(EVENTCHKINF_BEGAN_NABOORU_BATTLE);
@@ -1022,7 +1022,7 @@ void TimeSaverOnSceneInitHandler(int16_t sceneNum) {
             }
             break;
         case SCENE_SHADOW_TEMPLE_BOSS:
-            if (CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", IS_RANDO)) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.BossIntro"), IS_RANDO)) {
                 if (!Flags_GetEventChkInf(EVENTCHKINF_BEGAN_BONGO_BONGO_BATTLE)) {
                     Flags_SetEventChkInf(EVENTCHKINF_BEGAN_BONGO_BONGO_BATTLE);
                 }
@@ -1034,7 +1034,7 @@ void TimeSaverOnSceneInitHandler(int16_t sceneNum) {
 static GetItemEntry vanillaQueuedItemEntry = GET_ITEM_NONE;
 
 void TimeSaverOnFlagSetHandler(int16_t flagType, int16_t flag) {
-    if (!CVarGetInteger("gTimeSavers.SkipCutscene.Story", IS_RANDO)) return;
+    if (!CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) return;
 
     switch (flagType) {
         case FLAG_EVENT_CHECK_INF:
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
index 657c51f79..41878bcce 100644
--- a/soh/soh/OTRGlobals.cpp
+++ b/soh/soh/OTRGlobals.cpp
@@ -2362,7 +2362,7 @@ extern "C" int GetEquipNowMessage(char* buffer, char* src, const int maxBufferSi
 }
 
 extern "C" void Randomizer_ParseSpoiler(const char* fileLoc) {
-    OTRGlobals::Instance->gRandoContext->ParseSpoiler(fileLoc, CVarGetInteger("gPlandoMode", 0));
+    OTRGlobals::Instance->gRandoContext->ParseSpoiler(fileLoc, CVarGetInteger(CVAR_GENERAL("PlandoMode"), 0));
 }
 
 extern "C" void Randomizer_LoadHintMessages() {
diff --git a/soh/soh/SohMenuBar.cpp b/soh/soh/SohMenuBar.cpp
index 8309ffc9a..7ac3e1e20 100644
--- a/soh/soh/SohMenuBar.cpp
+++ b/soh/soh/SohMenuBar.cpp
@@ -568,85 +568,85 @@ void DrawEnhancementsMenu() {
                 ImGui::Text("Speed-ups:");
                 UIWidgets::PaddedSeparator();
                 bool allChecked =
-                    CVarGetInteger("gTimeSavers.SkipCutscene.Intro", IS_RANDO) &&
-                    CVarGetInteger("gTimeSavers.SkipCutscene.Entrances", IS_RANDO) &&
-                    CVarGetInteger("gTimeSavers.SkipCutscene.Story", IS_RANDO) &&
-                    CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", IS_RANDO) &&
-                    CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", IS_RANDO) &&
-                    CVarGetInteger("gTimeSavers.SkipCutscene.QuickBossDeaths", IS_RANDO) &&
-                    CVarGetInteger("gTimeSavers.SkipCutscene.OnePoint", IS_RANDO) &&
-                    CVarGetInteger("gTimeSavers.NoForcedDialog", IS_RANDO) &&
-                    CVarGetInteger("gTimeSavers.SkipOwlInteractions", IS_RANDO) &&
-                    CVarGetInteger("gTimeSavers.SkipMiscInteractions", IS_RANDO) &&
-                    CVarGetInteger("gTimeSavers.DisableTitleCard", IS_RANDO);
+                    CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Intro"), IS_RANDO) &&
+                    CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Entrances"), IS_RANDO) &&
+                    CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO) &&
+                    CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.LearnSong"), IS_RANDO) &&
+                    CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.BossIntro"), IS_RANDO) &&
+                    CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.QuickBossDeaths"), IS_RANDO) &&
+                    CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.OnePoint"), IS_RANDO) &&
+                    CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.NoForcedDialog"), IS_RANDO) &&
+                    CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipOwlInteractions"), IS_RANDO) &&
+                    CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO) &&
+                    CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.DisableTitleCard"), IS_RANDO);
                 bool someChecked =
-                    CVarGetInteger("gTimeSavers.SkipCutscene.Intro", IS_RANDO) ||
-                    CVarGetInteger("gTimeSavers.SkipCutscene.Entrances", IS_RANDO) ||
-                    CVarGetInteger("gTimeSavers.SkipCutscene.Story", IS_RANDO) ||
-                    CVarGetInteger("gTimeSavers.SkipCutscene.LearnSong", IS_RANDO) ||
-                    CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", IS_RANDO) ||
-                    CVarGetInteger("gTimeSavers.SkipCutscene.QuickBossDeaths", IS_RANDO) ||
-                    CVarGetInteger("gTimeSavers.SkipCutscene.OnePoint", IS_RANDO) ||
-                    CVarGetInteger("gTimeSavers.NoForcedDialog", IS_RANDO) ||
-                    CVarGetInteger("gTimeSavers.SkipOwlInteractions", IS_RANDO) ||
-                    CVarGetInteger("gTimeSavers.SkipMiscInteractions", IS_RANDO) ||
-                    CVarGetInteger("gTimeSavers.DisableTitleCard", IS_RANDO);
+                    CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Intro"), IS_RANDO) ||
+                    CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Entrances"), IS_RANDO) ||
+                    CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO) ||
+                    CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.LearnSong"), IS_RANDO) ||
+                    CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.BossIntro"), IS_RANDO) ||
+                    CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.QuickBossDeaths"), IS_RANDO) ||
+                    CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.OnePoint"), IS_RANDO) ||
+                    CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.NoForcedDialog"), IS_RANDO) ||
+                    CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipOwlInteractions"), IS_RANDO) ||
+                    CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO) ||
+                    CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.DisableTitleCard"), IS_RANDO);
 
                 ImGuiContext* g = ImGui::GetCurrentContext();
                 ImGuiItemFlags backup_item_flags = g->CurrentItemFlags;
                 if (!allChecked && someChecked) g->CurrentItemFlags |= ImGuiItemFlags_MixedValue;
                 if (ImGui::Checkbox("All", &allChecked)) {
                     if (allChecked) {
-                        CVarSetInteger("gTimeSavers.SkipCutscene.Intro", 1);
-                        CVarSetInteger("gTimeSavers.SkipCutscene.Entrances", 1);
-                        CVarSetInteger("gTimeSavers.SkipCutscene.Story", 1);
-                        CVarSetInteger("gTimeSavers.SkipCutscene.LearnSong", 1);
-                        CVarSetInteger("gTimeSavers.SkipCutscene.BossIntro", 1);
-                        CVarSetInteger("gTimeSavers.SkipCutscene.QuickBossDeaths", 1);
-                        CVarSetInteger("gTimeSavers.SkipCutscene.OnePoint", 1);
-                        CVarSetInteger("gTimeSavers.NoForcedDialog", 1);
-                        CVarSetInteger("gTimeSavers.SkipOwlInteractions", 1);
-                        CVarSetInteger("gTimeSavers.SkipMiscInteractions", 1);
-                        CVarSetInteger("gTimeSavers.DisableTitleCard", 1);
+                        CVarSetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Intro"), 1);
+                        CVarSetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Entrances"), 1);
+                        CVarSetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), 1);
+                        CVarSetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.LearnSong"), 1);
+                        CVarSetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.BossIntro"), 1);
+                        CVarSetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.QuickBossDeaths"), 1);
+                        CVarSetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.OnePoint"), 1);
+                        CVarSetInteger(CVAR_ENHANCEMENT("TimeSavers.NoForcedDialog"), 1);
+                        CVarSetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipOwlInteractions"), 1);
+                        CVarSetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), 1);
+                        CVarSetInteger(CVAR_ENHANCEMENT("TimeSavers.DisableTitleCard"), 1);
                     } else {
-                        CVarSetInteger("gTimeSavers.SkipCutscene.Intro", 0);
-                        CVarSetInteger("gTimeSavers.SkipCutscene.Entrances", 0);
-                        CVarSetInteger("gTimeSavers.SkipCutscene.Story", 0);
-                        CVarSetInteger("gTimeSavers.SkipCutscene.LearnSong", 0);
-                        CVarSetInteger("gTimeSavers.SkipCutscene.BossIntro", 0);
-                        CVarSetInteger("gTimeSavers.SkipCutscene.QuickBossDeaths", 0);
-                        CVarSetInteger("gTimeSavers.SkipCutscene.OnePoint", 0);
-                        CVarSetInteger("gTimeSavers.NoForcedDialog", 0);
-                        CVarSetInteger("gTimeSavers.SkipOwlInteractions", 0);
-                        CVarSetInteger("gTimeSavers.SkipMiscInteractions", 0);
-                        CVarSetInteger("gTimeSavers.DisableTitleCard", 0);
+                        CVarSetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Intro"), 0);
+                        CVarSetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Entrances"), 0);
+                        CVarSetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), 0);
+                        CVarSetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.LearnSong"), 0);
+                        CVarSetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.BossIntro"), 0);
+                        CVarSetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.QuickBossDeaths"), 0);
+                        CVarSetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.OnePoint"), 0);
+                        CVarSetInteger(CVAR_ENHANCEMENT("TimeSavers.NoForcedDialog"), 0);
+                        CVarSetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipOwlInteractions"), 0);
+                        CVarSetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), 0);
+                        CVarSetInteger(CVAR_ENHANCEMENT("TimeSavers.DisableTitleCard"), 0);
                     }
-                    LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
+                    Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
                 }
                 g->CurrentItemFlags = backup_item_flags;
-                UIWidgets::PaddedEnhancementCheckbox("Skip Intro", "gTimeSavers.SkipCutscene.Intro", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
-                UIWidgets::PaddedEnhancementCheckbox("Skip Entrance Cutscenes", "gTimeSavers.SkipCutscene.Entrances", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
-                UIWidgets::PaddedEnhancementCheckbox("Skip Story Cutscenes", "gTimeSavers.SkipCutscene.Story", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
-                UIWidgets::PaddedEnhancementCheckbox("Skip Song Cutscenes", "gTimeSavers.SkipCutscene.LearnSong", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
-                UIWidgets::PaddedEnhancementCheckbox("Skip Boss Introductions", "gTimeSavers.SkipCutscene.BossIntro", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
-                UIWidgets::PaddedEnhancementCheckbox("Quick Boss Deaths", "gTimeSavers.SkipCutscene.QuickBossDeaths", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
-                UIWidgets::PaddedEnhancementCheckbox("Skip One Point Cutscenes (Chests, Door Unlocks, etc)", "gTimeSavers.SkipCutscene.OnePoint", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
-                UIWidgets::PaddedEnhancementCheckbox("No Forced Dialog", "gTimeSavers.NoForcedDialog", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
+                UIWidgets::PaddedEnhancementCheckbox("Skip Intro", CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Intro"), false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
+                UIWidgets::PaddedEnhancementCheckbox("Skip Entrance Cutscenes", CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Entrances"), false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
+                UIWidgets::PaddedEnhancementCheckbox("Skip Story Cutscenes", CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
+                UIWidgets::PaddedEnhancementCheckbox("Skip Song Cutscenes", CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.LearnSong"), false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
+                UIWidgets::PaddedEnhancementCheckbox("Skip Boss Introductions", CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.BossIntro"), false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
+                UIWidgets::PaddedEnhancementCheckbox("Quick Boss Deaths", CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.QuickBossDeaths"), false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
+                UIWidgets::PaddedEnhancementCheckbox("Skip One Point Cutscenes (Chests, Door Unlocks, etc)", CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.OnePoint"), false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
+                UIWidgets::PaddedEnhancementCheckbox("No Forced Dialog", CVAR_ENHANCEMENT("TimeSavers.NoForcedDialog"), false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
                 UIWidgets::Tooltip("Prevent forced conversations with Navi or other NPCs");
-                UIWidgets::PaddedEnhancementCheckbox("Skip Owl Interactions", "gTimeSavers.SkipOwlInteractions", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
-                UIWidgets::PaddedEnhancementCheckbox("Skip Misc Interactions", "gTimeSavers.SkipMiscInteractions", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
-                UIWidgets::PaddedEnhancementCheckbox("Disable Title Card", "gTimeSavers.DisableTitleCard", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
-                UIWidgets::PaddedEnhancementCheckbox("Skip Glitch-Aiding Cutscenes", "gTimeSavers.SkipCutscene.GlitchAiding", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, 0);
+                UIWidgets::PaddedEnhancementCheckbox("Skip Owl Interactions", CVAR_ENHANCEMENT("TimeSavers.SkipOwlInteractions"), false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
+                UIWidgets::PaddedEnhancementCheckbox("Skip Misc Interactions", CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
+                UIWidgets::PaddedEnhancementCheckbox("Disable Title Card", CVAR_ENHANCEMENT("TimeSavers.DisableTitleCard"), false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
+                UIWidgets::PaddedEnhancementCheckbox("Skip Glitch-Aiding Cutscenes", CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.GlitchAiding"), false, false, false, "", UIWidgets::CheckboxGraphics::Cross, 0);
                 UIWidgets::Tooltip("Skip cutscenes that are associated with useful glitches, currently this is only the Fire Temple Darunia CS and Forest Temple Poe Sisters CS");
-                UIWidgets::PaddedEnhancementCheckbox("Skip Child Stealth", "gTimeSavers.SkipChildStealth", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, false);
+                UIWidgets::PaddedEnhancementCheckbox("Skip Child Stealth", CVAR_ENHANCEMENT("TimeSavers.SkipChildStealth"), false, false, false, "", UIWidgets::CheckboxGraphics::Cross, false);
                 UIWidgets::Tooltip("The crawlspace into Hyrule Castle goes straight to Zelda, skipping the guards.");
-                UIWidgets::PaddedEnhancementCheckbox("Skip Tower Escape", "gTimeSavers.SkipTowerEscape", false, false, false, "", UIWidgets::CheckboxGraphics::Cross, false);
+                UIWidgets::PaddedEnhancementCheckbox("Skip Tower Escape", CVAR_ENHANCEMENT("TimeSavers.SkipTowerEscape"), false, false, false, "", UIWidgets::CheckboxGraphics::Cross, false);
                 UIWidgets::Tooltip("Skip the tower escape sequence between Ganondorf and Ganon.");
 
                 UIWidgets::PaddedText("Skip Get Item Animations", true, false);
-                UIWidgets::EnhancementCombobox("gTimeSavers.SkipGetItemAnimation", skipGetItemAnimationOptions, SGIA_DISABLED);
-                if (CVarGetInteger("gTimeSavers.SkipGetItemAnimation", SGIA_DISABLED) != SGIA_DISABLED) {
-                    UIWidgets::EnhancementSliderFloat("Item Scale: %f", "##ItemScale", "gTimeSavers.SkipGetItemAnimationScale", 5.0f, 15.0f, "", 10.0f, false);
+                UIWidgets::EnhancementCombobox(CVAR_ENHANCEMENT("TimeSavers.SkipGetItemAnimation"), skipGetItemAnimationOptions, SGIA_DISABLED);
+                if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipGetItemAnimation"), SGIA_DISABLED) != SGIA_DISABLED) {
+                    UIWidgets::EnhancementSliderFloat("Item Scale: %f", "##ItemScale", CVAR_ENHANCEMENT("TimeSavers.SkipGetItemAnimationScale"), 5.0f, 15.0f, "", 10.0f, false);
                     UIWidgets::Tooltip("The size of the item when it is picked up");
                 }
 
@@ -931,9 +931,9 @@ void DrawEnhancementsMenu() {
                     UIWidgets::Tooltip("When a line is stable, guarantee bite. Otherwise use default logic");
                     UIWidgets::PaddedEnhancementCheckbox("Fish Never Escape", CVAR_ENHANCEMENT("FishNeverEscape"), true, false, disabled, disabledTooltip);
                     UIWidgets::Tooltip("Once a hook has been set, fish will never let go while being reeled in.");
-                    UIWidgets::PaddedEnhancementCheckbox("Loaches Always Appear", "gLoachesAlwaysAppear", true, false, disabled, disabledTooltip);
+                    UIWidgets::PaddedEnhancementCheckbox("Loaches Always Appear", CVAR_ENHANCEMENT("LoachesAlwaysAppear"), true, false, disabled, disabledTooltip);
                     UIWidgets::Tooltip("Loaches will always appear in the fishing pond instead of every four visits.");
-                    UIWidgets::PaddedEnhancementCheckbox("Skip Keep Confirmation", "gSkipKeepConfirmation", true, false, disabled, disabledTooltip);
+                    UIWidgets::PaddedEnhancementCheckbox("Skip Keep Confirmation", CVAR_ENHANCEMENT("SkipKeepConfirmation"), true, false, disabled, disabledTooltip);
                     UIWidgets::Tooltip("The pond owner will not ask to confirm if you want to keep a smaller fish.");
                     UIWidgets::PaddedEnhancementSliderInt("Child Minimum Weight: %d", "##cMinimumWeight", CVAR_ENHANCEMENT("MinimumFishWeightChild"), 3, 10, "", 10, true, true, false, disabled, disabledTooltip);
                     UIWidgets::Tooltip("The minimum weight for the unique fishing reward as a child");
@@ -1968,7 +1968,7 @@ extern "C" u8 Randomizer_GetSettingValue(RandomizerSettingKey randoSettingKey);
 
 void DrawRandomizerMenu() {
     if (ImGui::BeginMenu("Randomizer")) {
-        UIWidgets::EnhancementCheckbox("Plando Mode", "gPlandoMode");
+        UIWidgets::EnhancementCheckbox("Plando Mode", CVAR_GENERAL("PlandoMode"));
         UIWidgets::Tooltip(
             "When dropping a spoiler file on the game window, parse the full spoiler file instead of just the "
             "necessary "
@@ -2072,7 +2072,7 @@ void DrawRandomizerMenu() {
                 "This setting is disabled because a savefile is loaded without the compass\n"
                 "shuffle settings set to \"Any Dungeon\", \"Overworld\" or \"Anywhere\"";
 
-            if (UIWidgets::PaddedEnhancementCheckbox("Compass Colors Match Dungeon", "gRandoEnhancement.MatchCompassColors", true, false,
+            if (UIWidgets::PaddedEnhancementCheckbox("Compass Colors Match Dungeon", CVAR_RANDOMIZER_ENHANCEMENT("MatchCompassColors"), true, false,
                                                   disableCompassColors, disableCompassColorsText, UIWidgets::CheckboxGraphics::Cross, true)) {
                 PatchCompasses();
             }
diff --git a/soh/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c b/soh/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c
index 6df2802f8..409a0d837 100644
--- a/soh/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c
+++ b/soh/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c
@@ -69,7 +69,7 @@ void EnBomBowlMan_Init(Actor* thisx, PlayState* play2) {
     Actor_SetScale(&this->actor, 0.013f);
 
     for (i = 0; i < 2; i++) {
-        if(CVarGetInteger(CVAR_ENHANCEMENT("CustomizeBombchuBowling"), 0) && CVarGetInteger(i == 0 ? CVAR_ENHANCEMENT("BombchuBowlingNoSmallCucco") : CVAR_ENHANCEMENT("BombchuBowlingNoBigCucco"), 0)) {
+        if(CVarGetInteger(CVAR_ENHANCEMENT("CustomizeBombchuBowling"), 0) && CVarGetInteger(i == 0 ? CVAR_ENHANCEMENT("BombchuBowlingNoSmallCucco"), : CVAR_ENHANCEMENT("BombchuBowlingNoBigCucco"), 0)) {
             continue;
         }
 
diff --git a/soh/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c b/soh/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c
index dbd6007a2..ec19d6503 100644
--- a/soh/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c
+++ b/soh/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c
@@ -112,7 +112,7 @@ void EnSyatekiItm_Idle(EnSyatekiItm* this, PlayState* play) {
             0;
         s32 ammunition = 15;
         if(CVarGetInteger(CVAR_ENHANCEMENT("CustomizeShootingGallery"), 0)) {
-            ammunition = CVarGetInteger(LINK_IS_ADULT ? CVAR_ENHANCEMENT("ShootingGalleryAmmoAdult") : CVAR_ENHANCEMENT("ShootingGalleryAmmoChild"), 15);
+            ammunition = CVarGetInteger(LINK_IS_ADULT ? CVAR_ENHANCEMENT("ShootingGalleryAmmoAdult"), : CVAR_ENHANCEMENT("ShootingGalleryAmmoChild"), 15);
         }
         func_8008EF44(play, ammunition);
         this->roundNum = this->hitCount = 0;
diff --git a/soh/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c b/soh/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
index eca7cc18c..500c60c51 100644
--- a/soh/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
+++ b/soh/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
@@ -395,7 +395,7 @@ void EnSyatekiMan_EndGame(EnSyatekiMan* this, PlayState* play) {
                     this->timer = 20;
                     s32 ammunition = 15;
                     if(CVarGetInteger(CVAR_ENHANCEMENT("CustomizeShootingGallery"), 0)) {
-                        ammunition = CVarGetInteger(LINK_IS_ADULT ? CVAR_ENHANCEMENT("ShootingGalleryAmmoAdult") : CVAR_ENHANCEMENT("ShootingGalleryAmmoChild"), 15);
+                        ammunition = CVarGetInteger(LINK_IS_ADULT ? CVAR_ENHANCEMENT("ShootingGalleryAmmoAdult"), : CVAR_ENHANCEMENT("ShootingGalleryAmmoChild"), 15);
                     }
                     func_8008EF44(play, ammunition);
                     this->actionFunc = EnSyatekiMan_RestartGame;
diff --git a/soh/src/overlays/actors/ovl_Fishing/z_fishing.c b/soh/src/overlays/actors/ovl_Fishing/z_fishing.c
index 1ff08fa96..a0ead103c 100644
--- a/soh/src/overlays/actors/ovl_Fishing/z_fishing.c
+++ b/soh/src/overlays/actors/ovl_Fishing/z_fishing.c
@@ -2943,12 +2943,12 @@ bool getFishNeverEscape() {
 }
 
 bool getShouldSpawnLoaches() {
-    return (CVarGetInteger("gCustomizeFishing", 0) && CVarGetInteger("gLoachesAlwaysAppear", 0))
+    return (CVarGetInteger(CVAR_ENHANCEMENT("CustomizeFishing"), 0) && CVarGetInteger(CVAR_ENHANCEMENT("LoachesAlwaysAppear"), 0))
         || ((KREG(1) == 1) || ((sFishGameNumber & 3) == 3));
 }
 
 bool getShouldConfirmKeep() {
-    return !CVarGetInteger("gCustomizeFishing", 0) || !CVarGetInteger("gSkipKeepConfirmation", 0);
+    return !CVarGetInteger(CVAR_ENHANCEMENT("CustomizeFishing"), 0) || !CVarGetInteger(CVAR_ENHANCEMENT("SkipKeepConfirmation"), 0);
 }
 
 void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
diff --git a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
index 81c6c7b71..dcf3209cb 100644
--- a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
+++ b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
@@ -1025,7 +1025,7 @@ void FileChoose_UpdateRandomizer() {
             return;
     }
 
-    if (!SpoilerFileExists(CVarGetString(CVAR_GENERAL("SpoilerLog"), "")) && !CVarGetInteger("gRandomizerDontGenerateSpoiler", 0)) {
+    if (!SpoilerFileExists(CVarGetString(CVAR_GENERAL("SpoilerLog"), "")) && !CVarGetInteger(CVAR_RANDOMIZER_SETTING("DontGenerateSpoiler"), 0)) {
             CVarSetString(CVAR_GENERAL("SpoilerLog"), "");
     }
 
@@ -1343,18 +1343,18 @@ void FileChoose_GenerateRandoSeed(GameState* thisx) {
         this->prevConfigMode = this->configMode;
         this->configMode = CM_ROTATE_TO_NAME_ENTRY;
         this->logoAlpha = 0;
-        CVarSetInteger("gOnFileSelectNameEntry", 1);
+        CVarSetInteger(CVAR_GENERAL("OnFileSelectNameEntry"), 1);
         this->kbdButton = FS_KBD_BTN_NONE;
         this->charPage = FS_CHAR_PAGE_ENG;
         this->kbdX = 0;
         this->kbdY = 0;
         this->charIndex = 0;
         this->charBgAlpha = 0;
-        this->newFileNameCharCount = CVarGetInteger("gLinkDefaultName", 0) ? 4 : 0;
+        this->newFileNameCharCount = CVarGetInteger(CVAR_GENERAL("LinkDefaultName"), 0) ? 4 : 0;
         this->nameEntryBoxPosX = 120;
         this->nameEntryBoxAlpha = 0;
         memcpy(Save_GetSaveMetaInfo(this->buttonIndex)->playerName,
-               CVarGetInteger("gLinkDefaultName", 0) ? &linkName : &emptyName, 8);
+               CVarGetInteger(CVAR_GENERAL("LinkDefaultName"), 0) ? &linkName : &emptyName, 8);
         return;
     }
     if (!generating) {

From f354460d042c1a58f62f0747de4eff088de72a85 Mon Sep 17 00:00:00 2001
From: Malkierian <malkierian@gmail.com>
Date: Sun, 5 May 2024 22:43:11 -0700
Subject: [PATCH 137/230] Make it build.

---
 .../Enhancements/randomizer/hook_handlers.cpp |  12 +-
 soh/soh/Enhancements/randomizer/option.cpp    |  10 +-
 .../Enhancements/randomizer/randomizer.cpp    |   6 +-
 .../randomizer/randomizer_check_tracker.cpp   |  16 +-
 soh/src/code/z_parameter.c                    | 149 +++++++++---------
 .../ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c   |   2 +-
 .../ovl_En_Syateki_Itm/z_en_syateki_itm.c     |   2 +-
 .../ovl_En_Syateki_Man/z_en_syateki_man.c     |   2 +-
 8 files changed, 100 insertions(+), 99 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index 257666a61..db388ae1c 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -193,7 +193,7 @@ void RandomizerOnFlagSetHandler(int16_t flagType, int16_t flag) {
     auto loc = Rando::Context::GetInstance()->GetItemLocation(rc);
     if (loc == nullptr || loc->HasObtained()) return;
 
-    SPDLOG_INFO("Queuing RC: {}", rc);
+    SPDLOG_INFO("Queuing RC: {}", static_cast<uint32_t>(rc));
     randomizerQueuedChecks.push(rc);
 }
 
@@ -211,7 +211,7 @@ void RandomizerOnSceneFlagSetHandler(int16_t sceneNum, int16_t flagType, int16_t
     auto loc = Rando::Context::GetInstance()->GetItemLocation(rc);
     if (loc == nullptr || loc->HasObtained()) return;
 
-    SPDLOG_INFO("Queuing RC: {}", rc);
+    SPDLOG_INFO("Queuing RC: {}", static_cast<uint32_t>(rc));
     randomizerQueuedChecks.push(rc);
 }
 
@@ -235,11 +235,11 @@ void RandomizerOnPlayerUpdateForRCQueueHandler() {
     GetItemEntry getItemEntry = Rando::Context::GetInstance()->GetFinalGIEntry(rc, true, (GetItemID)Rando::StaticData::GetLocation(rc)->GetVanillaItem());
 
     if (loc->HasObtained()) {
-        SPDLOG_INFO("RC {} already obtained, skipping", rc);
+        SPDLOG_INFO("RC {} already obtained, skipping", static_cast<uint32_t>(rc));
     } else {
         randomizerQueuedCheck = rc;
         randomizerQueuedItemEntry = getItemEntry;
-        SPDLOG_INFO("Queueing Item mod {} item {} from RC {}", getItemEntry.modIndex, getItemEntry.itemId, rc);
+        SPDLOG_INFO("Queueing Item mod {} item {} from RC {}", getItemEntry.modIndex, getItemEntry.itemId, static_cast<uint32_t>(rc));
         if (
             // Skipping ItemGet animation incompatible with checks that require closing a text box to finish
             rc != RC_HF_OCARINA_OF_TIME_ITEM &&
@@ -276,7 +276,7 @@ void RandomizerOnPlayerUpdateForItemQueueHandler() {
         return;
     }
 
-    SPDLOG_INFO("Attempting to give Item mod {} item {} from RC {}", randomizerQueuedItemEntry.modIndex, randomizerQueuedItemEntry.itemId, randomizerQueuedCheck);
+    SPDLOG_INFO("Attempting to give Item mod {} item {} from RC {}", randomizerQueuedItemEntry.modIndex, randomizerQueuedItemEntry.itemId, static_cast<uint32_t>(randomizerQueuedCheck));
     GiveItemEntryWithoutActor(gPlayState, randomizerQueuedItemEntry);
     if (player->stateFlags1 & PLAYER_STATE1_IN_WATER) {
         // Allow the player to receive the item while swimming
@@ -290,7 +290,7 @@ void RandomizerOnItemReceiveHandler(GetItemEntry receivedItemEntry) {
 
     auto loc = Rando::Context::GetInstance()->GetItemLocation(randomizerQueuedCheck);
     if (randomizerQueuedItemEntry.modIndex == receivedItemEntry.modIndex && randomizerQueuedItemEntry.itemId == receivedItemEntry.itemId) {
-        SPDLOG_INFO("Item received mod {} item {} from RC {}", receivedItemEntry.modIndex, receivedItemEntry.itemId, randomizerQueuedCheck);
+        SPDLOG_INFO("Item received mod {} item {} from RC {}", receivedItemEntry.modIndex, receivedItemEntry.itemId, static_cast<uint32_t>(randomizerQueuedCheck));
         loc->MarkAsObtained();
         randomizerQueuedCheck = RC_UNKNOWN_CHECK;
         randomizerQueuedItemEntry = GET_ITEM_NONE;
diff --git a/soh/soh/Enhancements/randomizer/option.cpp b/soh/soh/Enhancements/randomizer/option.cpp
index 950fa96cf..acccb9c5b 100644
--- a/soh/soh/Enhancements/randomizer/option.cpp
+++ b/soh/soh/Enhancements/randomizer/option.cpp
@@ -1,7 +1,7 @@
 #include "option.h"
 #include "libultraship/bridge.h"
 #include <Context.h>
-#include <ImGui/imgui.h>
+#include <imgui.h>
 #include "soh/UIWidgets.hpp"
 
 namespace Rando {
@@ -198,7 +198,7 @@ bool Option::RenderCheckbox() const {
     if (CustomCheckbox(name.c_str(), &val, disabled, disabledGraphic)) {
         CVarSetInteger(cvarName.c_str(), val);
         changed = true;
-        LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
     }
     if (!description.empty()) {
         UIWidgets::InsertHelpHoverText(description.c_str());
@@ -220,7 +220,7 @@ bool Option::RenderCombobox() const {
         selected--;
         CVarSetInteger(cvarName.c_str(), selected);
         changed = true;
-        LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
     }
     if (!description.empty()) {
         UIWidgets::InsertHelpHoverText(description.c_str());
@@ -233,7 +233,7 @@ bool Option::RenderCombobox() const {
                     CVarSetInteger(cvarName.c_str(), static_cast<int>(i));
                     changed = true;
                     selected = i;
-                    LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
+                    Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
                 }
             }
         }
@@ -296,7 +296,7 @@ bool Option::RenderSlider() const {
     }
     if (changed) {
         CVarSetInteger(cvarName.c_str(), val);
-        LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
     }
     return changed;
 }
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index 77f1e7888..6f5820952 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -2321,11 +2321,11 @@ void RandomizerSettingsWindow::DrawElement() {
                                                 enabledTrickString += ",";
                                         }
                                         if (enabledTrickString == "") {
-                                            CVarClear(CVarClear(CVAR_RANDOMIZER_SETTING("EnabledTricks"));
+                                            CVarClear(CVAR_RANDOMIZER_SETTING("EnabledTricks"));
                                         } else {
-                                            CVarSetString(CVarSetString(CVAR_RANDOMIZER_SETTING("EnabledTricks"), enabledTrickString.c_str());
+                                            CVarSetString(CVAR_RANDOMIZER_SETTING("EnabledTricks"), enabledTrickString.c_str());
                                         }
-                                        LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
+                                        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
                                     }
                                     Rando::Tricks::DrawTagChips(option.GetTags());
                                     ImGui::SameLine();
diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
index c49c56c7b..772d4d747 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
@@ -144,8 +144,8 @@ RandomizerCheckArea currentArea = RCAREA_INVALID;
 OSContPad* trackerButtonsPressed;
 std::unordered_map<RandomizerCheck, std::string> checkNameOverrides;
 
-bool passesTextFilter(ImGuiTextFilter& checkSearch, const RandomizerCheckObject rcObject);
-bool shouldHideArea(ImGuiTextFilter& checkSearch, std::map<RandomizerCheckArea, std::vector<RandomizerCheckObject>> checksByArea, const RandomizerCheckArea rcArea);
+bool passesTextFilter(ImGuiTextFilter& checkSearch, const RandomizerCheck check);
+bool shouldHideArea(ImGuiTextFilter& checkSearch, std::map<RandomizerCheckArea, std::vector<RandomizerCheck>> checksByArea, const RandomizerCheckArea rcArea);
 void BeginFloatWindows(std::string UniqueName, bool& open, ImGuiWindowFlags flags = 0);
 bool CompareChecks(RandomizerCheck, RandomizerCheck);
 bool CheckByArea(RandomizerCheckArea);
@@ -1056,7 +1056,7 @@ void CheckTrackerWindow::DrawElement() {
                 doAreaScroll = false;
             }
             for (auto rc : checks) {
-                if (doDraw && isThisAreaSpoiled && IsVisibleInCheckTracker(rc) && passesTextFilter(checkSearch, rcObject)) {
+                if (doDraw && isThisAreaSpoiled && IsVisibleInCheckTracker(rc) && passesTextFilter(checkSearch, rc)) {
                     DrawLocation(rc);
                 }
             }
@@ -1076,7 +1076,7 @@ void CheckTrackerWindow::DrawElement() {
     }
 }
 
-bool shouldHideArea(ImGuiTextFilter& checkSearch, std::map<RandomizerCheckArea, std::vector<RandomizerCheckObject>> checksByArea, RandomizerCheckArea rcArea) {
+bool shouldHideArea(ImGuiTextFilter& checkSearch, std::map<RandomizerCheckArea, std::vector<RandomizerCheck>> checksByArea, RandomizerCheckArea rcArea) {
     bool shouldHideFilteredAreas = CVarGetInteger(CVAR_TRACKER_CHECK("HideFilteredAreas"), 1);
     if (!shouldHideFilteredAreas) {
         return false;
@@ -1091,10 +1091,10 @@ bool shouldHideArea(ImGuiTextFilter& checkSearch, std::map<RandomizerCheckArea,
     return true;
 }
 
-bool passesTextFilter(ImGuiTextFilter& checkSearch, RandomizerCheckObject check) {
+bool passesTextFilter(ImGuiTextFilter& checkSearch, RandomizerCheck check) {
     return (
-        checkSearch.PassFilter(RandomizerCheckObjects::GetRCAreaName(check.rcArea).c_str()) ||
-        checkSearch.PassFilter(check.rcShortName.c_str())
+        checkSearch.PassFilter(RandomizerCheckObjects::GetRCAreaName(Rando::StaticData::GetLocation(check)->GetArea()).c_str()) ||
+        checkSearch.PassFilter(Rando::StaticData::GetLocation(check)->GetShortName().c_str())
     );
 }
 
@@ -1425,7 +1425,7 @@ void DrawLocation(RandomizerCheck rc) {
         mainColor =
             !IsHeartPiece((GetItemID)Rando::StaticData::RetrieveItem(loc->GetVanillaItem()).GetItemID()) && !IS_RANDO
                 ? CVarGetColor(CVAR_TRACKER_CHECK("Skipped.ExtraColor"), Color_Skipped_Extra_Default)
-                : CVarGetColor(CVAR_TRACKER_CHECK("Skipped.MainColor", Color_Main_Default);
+                : CVarGetColor(CVAR_TRACKER_CHECK("Skipped.MainColor"), Color_Main_Default);
         extraColor = CVarGetColor(CVAR_TRACKER_CHECK("Skipped.ExtraColor"), Color_Skipped_Extra_Default);
     } else if (status == RCSHOW_SEEN || status == RCSHOW_IDENTIFIED) {
         if (!showHidden && CVarGetInteger(CVAR_TRACKER_CHECK("Seen.Hide"), 0)) {
diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c
index 002521eaa..934b9486d 100644
--- a/soh/src/code/z_parameter.c
+++ b/soh/src/code/z_parameter.c
@@ -5178,83 +5178,84 @@ void Interface_Draw(PlayState* play) {
         Gfx_SetupDL_39Overlay(play->state.gfxCtx);
 
         if (fullUi) {
-            //when not having a wallet in rando, don't calculate the ruppe icon
-            if (!IS_RANDO || Flags_GetRandomizerInf(RAND_INF_HAS_WALLET)) {
-            // Rupee Icon
-            if (CVarGetInteger(CVAR_ENHANCEMENT("DynamicWalletIcon"), 0)) {
-                switch (CUR_UPG_VALUE(UPG_WALLET)) {
-                    case 0:
-                        if (CVarGetInteger(CVAR_COSMETIC("Consumable.GreenRupee.Changed"), 0)) {
-                            rColor = CVarGetColor24(CVAR_COSMETIC("Consumable.GreenRupee.Value"), rupeeWalletColors[0]);
-                        } else {
-                            rColor = rupeeWalletColors[0];
-                        }
-                        break;
-                    case 1:
-                        if (CVarGetInteger(CVAR_COSMETIC("Consumable.BlueRupee.Changed"), 0)) {
-                            rColor = CVarGetColor24(CVAR_COSMETIC("Consumable.BlueRupee.Value"), rupeeWalletColors[1]);
-                        } else {
-                            rColor = rupeeWalletColors[1];
-                        }
-                        break;
-                    case 2:
-                        if (CVarGetInteger(CVAR_COSMETIC("Consumable.RedRupee.Changed"), 0)) {
-                            rColor = CVarGetColor24(CVAR_COSMETIC("Consumable.RedRupee.Value"), rupeeWalletColors[2]);
-                        } else {
-                            rColor = rupeeWalletColors[2];
-                        }
-                        break;
-                    case 3:
-                        if (CVarGetInteger(CVAR_COSMETIC("Consumable.PurpleRupee.Changed"), 0)) {
-                            rColor = CVarGetColor24(CVAR_COSMETIC("Consumable.PurpleRupee.Value"), rupeeWalletColors[3]);
-                        } else {
-                            rColor = rupeeWalletColors[3];
-                        }
-                        break;
-                }
-            } else {
-                if (CVarGetInteger(CVAR_COSMETIC("Consumable.GreenRupee.Changed"), rupeeWalletColors)) {
-                     rColor = CVarGetColor24(CVAR_COSMETIC("Consumable.GreenRupee.Value"), rupeeWalletColors[0]);
-                } else {
-                     rColor = rupeeWalletColors[0];
-                }
-
-            //Rupee icon & counter
-            s16 X_Margins_RC;
-            s16 Y_Margins_RC;
-            if (CVarGetInteger(CVAR_COSMETIC("HUD.Rupees.UseMargins"), 0) != 0) {
-                if (CVarGetInteger(CVAR_COSMETIC("HUD.Rupees.PosType"), 0) == 0) {X_Margins_RC = Left_HUD_Margin;};
-                Y_Margins_RC = Bottom_HUD_Margin;
-            } else {
-                X_Margins_RC = 0;
-                Y_Margins_RC = 0;
-            }
-            s16 PosX_RC_ori = OTRGetRectDimensionFromLeftEdge(26+X_Margins_RC);
-            s16 PosY_RC_ori = 206+Y_Margins_RC;
             s16 PosX_RC;
             s16 PosY_RC;
-            if (CVarGetInteger(CVAR_COSMETIC("HUD.Rupees.PosType"), 0) != 0) {
-                PosY_RC = CVarGetInteger(CVAR_COSMETIC("HUD.Rupees.PosY"), 0)+Y_Margins_RC;
-                if (CVarGetInteger(CVAR_COSMETIC("HUD.Rupees.PosType"), 0) == 1) {//Anchor Left
-                    if (CVarGetInteger(CVAR_COSMETIC("HUD.Rupees.UseMargins"), 0) != 0) {X_Margins_RC = Left_HUD_Margin;};
-                    PosX_RC = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Rupees.PosX"), 0)+X_Margins_RC);
-                } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Rupees.PosType"), 0) == 2) {//Anchor Right
-                    if (CVarGetInteger(CVAR_COSMETIC("HUD.Rupees.UseMargins"), 0) != 0) {X_Margins_RC = Right_HUD_Margin;};
-                    PosX_RC = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Rupees.PosX"), 0)+X_Margins_RC);
-                } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Rupees.PosType"), 0) == 3) {//Anchor None
-                    PosX_RC = CVarGetInteger(CVAR_COSMETIC("HUD.Rupees.PosX"), 0);
-                } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Rupees.PosType"), 0) == 4) {//Hidden
-                PosX_RC = -9999;
+            //when not having a wallet in rando, don't calculate the ruppe icon
+            if (!IS_RANDO || Flags_GetRandomizerInf(RAND_INF_HAS_WALLET)) {
+                // Rupee Icon
+                if (CVarGetInteger(CVAR_ENHANCEMENT("DynamicWalletIcon"), 0)) {
+                    switch (CUR_UPG_VALUE(UPG_WALLET)) {
+                        case 0:
+                            if (CVarGetInteger(CVAR_COSMETIC("Consumable.GreenRupee.Changed"), 0)) {
+                                rColor = CVarGetColor24(CVAR_COSMETIC("Consumable.GreenRupee.Value"), rupeeWalletColors[0]);
+                            } else {
+                                rColor = rupeeWalletColors[0];
+                            }
+                            break;
+                        case 1:
+                            if (CVarGetInteger(CVAR_COSMETIC("Consumable.BlueRupee.Changed"), 0)) {
+                                rColor = CVarGetColor24(CVAR_COSMETIC("Consumable.BlueRupee.Value"), rupeeWalletColors[1]);
+                            } else {
+                                rColor = rupeeWalletColors[1];
+                            }
+                            break;
+                        case 2:
+                            if (CVarGetInteger(CVAR_COSMETIC("Consumable.RedRupee.Changed"), 0)) {
+                                rColor = CVarGetColor24(CVAR_COSMETIC("Consumable.RedRupee.Value"), rupeeWalletColors[2]);
+                            } else {
+                                rColor = rupeeWalletColors[2];
+                            }
+                            break;
+                        case 3:
+                            if (CVarGetInteger(CVAR_COSMETIC("Consumable.PurpleRupee.Changed"), 0)) {
+                                rColor = CVarGetColor24(CVAR_COSMETIC("Consumable.PurpleRupee.Value"), rupeeWalletColors[3]);
+                            } else {
+                                rColor = rupeeWalletColors[3];
+                            }
+                            break;
+                    }
+                } else {
+                    if (CVarGetInteger(CVAR_COSMETIC("Consumable.GreenRupee.Changed"), rupeeWalletColors)) {
+                        rColor = CVarGetColor24(CVAR_COSMETIC("Consumable.GreenRupee.Value"), rupeeWalletColors[0]);
+                    } else {
+                        rColor = rupeeWalletColors[0];
+                    }
+                }
+
+                //Rupee icon & counter
+                s16 X_Margins_RC;
+                s16 Y_Margins_RC;
+                if (CVarGetInteger(CVAR_COSMETIC("HUD.Rupees.UseMargins"), 0) != 0) {
+                    if (CVarGetInteger(CVAR_COSMETIC("HUD.Rupees.PosType"), 0) == 0) {X_Margins_RC = Left_HUD_Margin;};
+                    Y_Margins_RC = Bottom_HUD_Margin;
+                } else {
+                    X_Margins_RC = 0;
+                    Y_Margins_RC = 0;
+                }
+                s16 PosX_RC_ori = OTRGetRectDimensionFromLeftEdge(26+X_Margins_RC);
+                s16 PosY_RC_ori = 206+Y_Margins_RC;
+                if (CVarGetInteger(CVAR_COSMETIC("HUD.Rupees.PosType"), 0) != 0) {
+                    PosY_RC = CVarGetInteger(CVAR_COSMETIC("HUD.Rupees.PosY"), 0)+Y_Margins_RC;
+                    if (CVarGetInteger(CVAR_COSMETIC("HUD.Rupees.PosType"), 0) == 1) {//Anchor Left
+                        if (CVarGetInteger(CVAR_COSMETIC("HUD.Rupees.UseMargins"), 0) != 0) {X_Margins_RC = Left_HUD_Margin;};
+                        PosX_RC = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Rupees.PosX"), 0)+X_Margins_RC);
+                    } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Rupees.PosType"), 0) == 2) {//Anchor Right
+                        if (CVarGetInteger(CVAR_COSMETIC("HUD.Rupees.UseMargins"), 0) != 0) {X_Margins_RC = Right_HUD_Margin;};
+                        PosX_RC = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Rupees.PosX"), 0)+X_Margins_RC);
+                    } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Rupees.PosType"), 0) == 3) {//Anchor None
+                        PosX_RC = CVarGetInteger(CVAR_COSMETIC("HUD.Rupees.PosX"), 0);
+                    } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Rupees.PosType"), 0) == 4) {//Hidden
+                        PosX_RC = -9999;
+                    }
+                } else {
+                    PosY_RC = PosY_RC_ori;
+                    PosX_RC = PosX_RC_ori;
+                }
+                gDPSetPrimColor(OVERLAY_DISP++, 0, 0, rColor.r, rColor.g, rColor.b, interfaceCtx->magicAlpha);
+                // Draw Rupee icon. Hide in Boss Rush.
+                if (!IS_BOSS_RUSH) {
+                    OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, gRupeeCounterIconTex, 16, 16, PosX_RC, PosY_RC, 16, 16, 1 << 10, 1 << 10);
                 }
-            } else {
-                PosY_RC = PosY_RC_ori;
-                PosX_RC = PosX_RC_ori;
-            }
-            gDPSetPrimColor(OVERLAY_DISP++, 0, 0, rColor.r, rColor.g, rColor.b, interfaceCtx->magicAlpha);
-            // Draw Rupee icon. Hide in Boss Rush.
-            if (!IS_BOSS_RUSH) {
-                OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, gRupeeCounterIconTex, 16, 16, PosX_RC, PosY_RC, 16, 16, 1 << 10, 1 << 10);
-            }
             }
 
             switch (play->sceneNum) {
diff --git a/soh/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c b/soh/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c
index 409a0d837..6df2802f8 100644
--- a/soh/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c
+++ b/soh/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c
@@ -69,7 +69,7 @@ void EnBomBowlMan_Init(Actor* thisx, PlayState* play2) {
     Actor_SetScale(&this->actor, 0.013f);
 
     for (i = 0; i < 2; i++) {
-        if(CVarGetInteger(CVAR_ENHANCEMENT("CustomizeBombchuBowling"), 0) && CVarGetInteger(i == 0 ? CVAR_ENHANCEMENT("BombchuBowlingNoSmallCucco"), : CVAR_ENHANCEMENT("BombchuBowlingNoBigCucco"), 0)) {
+        if(CVarGetInteger(CVAR_ENHANCEMENT("CustomizeBombchuBowling"), 0) && CVarGetInteger(i == 0 ? CVAR_ENHANCEMENT("BombchuBowlingNoSmallCucco") : CVAR_ENHANCEMENT("BombchuBowlingNoBigCucco"), 0)) {
             continue;
         }
 
diff --git a/soh/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c b/soh/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c
index ec19d6503..dbd6007a2 100644
--- a/soh/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c
+++ b/soh/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c
@@ -112,7 +112,7 @@ void EnSyatekiItm_Idle(EnSyatekiItm* this, PlayState* play) {
             0;
         s32 ammunition = 15;
         if(CVarGetInteger(CVAR_ENHANCEMENT("CustomizeShootingGallery"), 0)) {
-            ammunition = CVarGetInteger(LINK_IS_ADULT ? CVAR_ENHANCEMENT("ShootingGalleryAmmoAdult"), : CVAR_ENHANCEMENT("ShootingGalleryAmmoChild"), 15);
+            ammunition = CVarGetInteger(LINK_IS_ADULT ? CVAR_ENHANCEMENT("ShootingGalleryAmmoAdult") : CVAR_ENHANCEMENT("ShootingGalleryAmmoChild"), 15);
         }
         func_8008EF44(play, ammunition);
         this->roundNum = this->hitCount = 0;
diff --git a/soh/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c b/soh/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
index 500c60c51..eca7cc18c 100644
--- a/soh/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
+++ b/soh/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
@@ -395,7 +395,7 @@ void EnSyatekiMan_EndGame(EnSyatekiMan* this, PlayState* play) {
                     this->timer = 20;
                     s32 ammunition = 15;
                     if(CVarGetInteger(CVAR_ENHANCEMENT("CustomizeShootingGallery"), 0)) {
-                        ammunition = CVarGetInteger(LINK_IS_ADULT ? CVAR_ENHANCEMENT("ShootingGalleryAmmoAdult"), : CVAR_ENHANCEMENT("ShootingGalleryAmmoChild"), 15);
+                        ammunition = CVarGetInteger(LINK_IS_ADULT ? CVAR_ENHANCEMENT("ShootingGalleryAmmoAdult") : CVAR_ENHANCEMENT("ShootingGalleryAmmoChild"), 15);
                     }
                     func_8008EF44(play, ammunition);
                     this->actionFunc = EnSyatekiMan_RestartGame;

From 89f119c566075cfceed104223a6254e2c60313eb Mon Sep 17 00:00:00 2001
From: Malkierian <malkierian@gmail.com>
Date: Mon, 6 May 2024 11:13:30 -0700
Subject: [PATCH 138/230] Fix ambiguity.

---
 soh/soh/SaveManager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/soh/soh/SaveManager.cpp b/soh/soh/SaveManager.cpp
index a3b2ff9a5..0aaf32e7c 100644
--- a/soh/soh/SaveManager.cpp
+++ b/soh/soh/SaveManager.cpp
@@ -445,7 +445,7 @@ void SaveManager::LoadRandomizerVersion3() {
 
     SaveManager::Instance->LoadArray("hintLocations", RH_MAX, [&](size_t i) {
         auto hint = RandomizerHint(i);
-        nlohmann::ordered_json json;
+        nlohmann::json json;
         SaveManager::Instance->LoadData("", json);
         randoContext->AddHint(hint, Rando::Hint(hint, json));
     });

From d0627dc73706305fa527ee112c8c6b77666f5319 Mon Sep 17 00:00:00 2001
From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Date: Mon, 6 May 2024 20:10:00 +0100
Subject: [PATCH 139/230] fix a V2 compatibility crash (#4119)

* Attempt to fix ambiguity issues and a V2 compatibility crash

* oops

* remove explicit call as it is fixed elsewhere
---
 soh/soh/SaveManager.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/soh/soh/SaveManager.cpp b/soh/soh/SaveManager.cpp
index 0aaf32e7c..50d77917e 100644
--- a/soh/soh/SaveManager.cpp
+++ b/soh/soh/SaveManager.cpp
@@ -102,7 +102,7 @@ std::vector<RandomizerHint> Rando::StaticData::oldVerHintOrder {
     RH_ZR_OPEN_GROTTO_GOSSIP_STONE,
 };
 
-uint16_t Rando::StaticData::oldVerGossipStoneStart = 740;
+uint16_t Rando::StaticData::oldVerGossipStoneStart = 706;
 
 SaveManager::SaveManager() {
     coreSectionIDsByName["base"] = SECTION_ID_BASE;
@@ -188,7 +188,7 @@ void SaveManager::LoadRandomizerVersion1() {
         for (int j = 0; j < ARRAY_COUNT(hintText); j++) {
             SaveManager::Instance->LoadData("ht" + std::to_string(i) + "-" + std::to_string(j), hintText[j]);
         }
-        RandomizerHint stoneHint = Rando::StaticData::oldVerHintOrder[Rando::StaticData::oldVerGossipStoneStart];
+        RandomizerHint stoneHint = Rando::StaticData::oldVerHintOrder[i - Rando::StaticData::oldVerGossipStoneStart];
         randoContext->AddHint(stoneHint, Rando::Hint(stoneHint, {CustomMessage(hintText)}));
     }
 
@@ -294,7 +294,7 @@ void SaveManager::LoadRandomizerVersion2() {
             if (rc != RC_UNKNOWN_CHECK) {
                 std::string hintText;
                 SaveManager::Instance->LoadData("hintText", hintText);
-                RandomizerHint stoneHint = Rando::StaticData::oldVerHintOrder[Rando::StaticData::oldVerGossipStoneStart];
+                RandomizerHint stoneHint = Rando::StaticData::oldVerHintOrder[rc - Rando::StaticData::oldVerGossipStoneStart];
                 randoContext->AddHint(stoneHint, Rando::Hint(stoneHint, {CustomMessage(hintText)}));
             }
         });

From 8e520e490cc4a56d72a67c847842da521e40b233 Mon Sep 17 00:00:00 2001
From: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>
Date: Tue, 7 May 2024 15:29:17 +0200
Subject: [PATCH 140/230] Spoiler name removal (#3814)

* Initial pass

* Rename "MK" to "Market"

* Remove more spoiler names

* Update location_list.cpp

* Replace vector with array

* Update location_list.cpp

* Re-run build

* Fix spacing
---
 soh/soh/Enhancements/randomizer/location.cpp  |  155 ++
 soh/soh/Enhancements/randomizer/location.h    |  118 +-
 .../Enhancements/randomizer/location_list.cpp | 1676 ++++++++---------
 soh/soh/util.cpp                              |   41 +
 soh/soh/util.h                                |    2 +
 5 files changed, 1153 insertions(+), 839 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/location.cpp b/soh/soh/Enhancements/randomizer/location.cpp
index 24d6ac9cb..ddc9f7fc2 100644
--- a/soh/soh/Enhancements/randomizer/location.cpp
+++ b/soh/soh/Enhancements/randomizer/location.cpp
@@ -108,6 +108,17 @@ Rando::Location Rando::Location::Base(RandomizerCheck rc, RandomizerCheckQuest q
                     isVanillaCompletion_, collectionCheck, collectionCheckGroup};
 }
 
+Rando::Location Rando::Location::Base(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
+                                      RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_, int32_t actorParams_,
+                                      uint8_t flag_, std::string&& shortName_,
+                                      const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
+                                      std::vector<Category>&& categories, SpoilerCollectionCheck collectionCheck,
+                                      SpoilerCollectionCheckGroup collectionCheckGroup, bool isVanillaCompletion_) {
+    return {rc, quest_, checkType_, area_, LocationType::Base, actorId_, scene_, actorParams_, flag_,
+                    std::move(shortName_), hintKey, vanillaItem, std::move(categories),
+                    isVanillaCompletion_, collectionCheck, collectionCheckGroup};
+}
+
 Rando::Location Rando::Location::Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
                                        RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_,
                                        int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
@@ -121,6 +132,19 @@ Rando::Location Rando::Location::Chest(RandomizerCheck rc, RandomizerCheckQuest
                     collectionCheckGroup};
 }
 
+Rando::Location Rando::Location::Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
+                                       RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_,
+                                       int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
+                                       const RandomizerHintTextKey hintKey,
+                                       const RandomizerGet vanillaItem, std::vector<Category>&& categories,
+                                       SpoilerCollectionCheckGroup collectionCheckGroup, bool isVanillaCompletion_) {
+    return {rc, quest_, checkType_, area_, LocationType::Chest, actorId_, scene_, actorParams_, flag_,
+                    std::move(shortName_), hintKey, vanillaItem, std::move(categories),
+                    isVanillaCompletion_,
+                    SpoilerCollectionCheck(SPOILER_CHK_CHEST, scene_, flag_),
+                    collectionCheckGroup};
+}
+
 Rando::Location Rando::Location::Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
                                        RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_,
                                        int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
@@ -133,6 +157,18 @@ Rando::Location Rando::Location::Chest(RandomizerCheck rc, RandomizerCheckQuest
                     isVanillaCompletion_, collectionCheck, collectionCheckGroup};
 }
 
+Rando::Location Rando::Location::Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
+                                       RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_,
+                                       int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
+                                       const RandomizerHintTextKey hintKey,
+                                       const RandomizerGet vanillaItem, std::vector<Category>&& categories,
+                                       SpoilerCollectionCheck collectionCheck,
+                                       SpoilerCollectionCheckGroup collectionCheckGroup, bool isVanillaCompletion_) {
+    return {rc, quest_, checkType_, area_, LocationType::Chest, actorId_, scene_, actorParams_, flag_,
+                    std::move(shortName_), hintKey, vanillaItem, std::move(categories),
+                    isVanillaCompletion_, collectionCheck, collectionCheckGroup};
+}
+
 Rando::Location Rando::Location::Collectable(
     RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_,
     ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
@@ -145,6 +181,18 @@ Rando::Location Rando::Location::Collectable(
                     collectionCheckGroup};
 }
 
+Rando::Location Rando::Location::Collectable(
+    RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_,
+    ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
+    const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
+    std::vector<Category>&& categories, SpoilerCollectionCheckGroup collectionCheckGroup, bool isVanillaCompletion_) {
+    return {rc, quest_, checkType_, area_, LocationType::Collectable, actorId_, scene_, actorParams_, flag_,
+                    std::move(shortName_), hintKey, vanillaItem, std::move(categories),
+                    isVanillaCompletion_,
+                    SpoilerCollectionCheck(SPOILER_CHK_COLLECTABLE, scene_, flag_),
+                    collectionCheckGroup};
+}
+
 Rando::Location Rando::Location::Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_,
                                              RandomizerCheckType checkType_, RandomizerCheckArea area_,
                                              ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_,
@@ -160,6 +208,21 @@ Rando::Location Rando::Location::Collectable(RandomizerCheck rc, RandomizerCheck
                     collectionCheckGroup};
 }
 
+Rando::Location Rando::Location::Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_,
+                                             RandomizerCheckType checkType_, RandomizerCheckArea area_,
+                                             ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_,
+                                             std::string&& shortName_,
+                                             const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
+                                             std::vector<Category>&& categories, const uint8_t collectFlag_,
+                                             SpoilerCollectionCheckGroup collectionCheckGroup,
+                                             bool isVanillaCompletion_) {
+    return {rc, quest_, checkType_, area_, LocationType::Collectable, actorId_, scene_, actorParams_, flag_,
+                    std::move(shortName_), hintKey, vanillaItem, std::move(categories),
+                    isVanillaCompletion_,
+                    SpoilerCollectionCheck(SPOILER_CHK_COLLECTABLE, scene_, collectFlag_),
+                    collectionCheckGroup};
+}
+
 Rando::Location Rando::Location::Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_,
                                              RandomizerCheckType checkType_, RandomizerCheckArea area_,
                                              ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_,
@@ -173,6 +236,19 @@ Rando::Location Rando::Location::Collectable(RandomizerCheck rc, RandomizerCheck
                     isVanillaCompletion_, collectionCheck, collectionCheckGroup};
 }
 
+Rando::Location Rando::Location::Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_,
+                                             RandomizerCheckType checkType_, RandomizerCheckArea area_,
+                                             ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_,
+                                             std::string&& shortName_,
+                                             const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
+                                             std::vector<Category>&& categories, SpoilerCollectionCheck collectionCheck,
+                                             SpoilerCollectionCheckGroup collectionCheckGroup,
+                                             bool isVanillaCompletion_) {
+    return {rc, quest_, checkType_, area_, LocationType::Collectable, actorId_, scene_, actorParams_, flag_,
+                    std::move(shortName_), hintKey, vanillaItem, std::move(categories),
+                    isVanillaCompletion_, collectionCheck, collectionCheckGroup};
+}
+
 Rando::Location Rando::Location::GSToken(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
                                          uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
                                          std::string&& spoilerName_, const RandomizerHintTextKey hintKey,
@@ -185,6 +261,18 @@ Rando::Location Rando::Location::GSToken(RandomizerCheck rc, RandomizerCheckQues
                     collectionCheckGroup};
 }
 
+Rando::Location Rando::Location::GSToken(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
+                                         uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
+                                         const RandomizerHintTextKey hintKey,
+                                         std::vector<Category>&& categories,
+                                         SpoilerCollectionCheckGroup collectionCheckGroup, bool isVanillaCompletion_) {
+    return {rc, quest_, RCTYPE_SKULL_TOKEN, area_, LocationType::GSToken, ACTOR_EN_SI, scene_, actorParams_,
+                    flag_, std::move(shortName_), hintKey, RG_GOLD_SKULLTULA_TOKEN,
+                    std::move(categories), isVanillaCompletion_,
+                    SpoilerCollectionCheck(SPOILER_CHK_GOLD_SKULLTULA, scene_, flag_),
+                    collectionCheckGroup};
+}
+
 Rando::Location Rando::Location::GSToken(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
                                          uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
                                          std::string&& spoilerName_, const RandomizerHintTextKey hintKey,
@@ -197,6 +285,18 @@ Rando::Location Rando::Location::GSToken(RandomizerCheck rc, RandomizerCheckQues
                     collectionCheckGroup};
 }
 
+Rando::Location Rando::Location::GSToken(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
+                                         uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
+                                         const RandomizerHintTextKey hintKey,
+                                         std::vector<Category>&& categories, const uint8_t skullScene_,
+                                         SpoilerCollectionCheckGroup collectionCheckGroup, bool isVanillaCompletion_) {
+    return {rc, quest_, RCTYPE_SKULL_TOKEN, area_, LocationType::GSToken, ACTOR_EN_SI, scene_, actorParams_,
+                    flag_, std::move(shortName_), hintKey, RG_GOLD_SKULLTULA_TOKEN,
+                    std::move(categories), isVanillaCompletion_,
+                    SpoilerCollectionCheck(SPOILER_CHK_GOLD_SKULLTULA, skullScene_, flag_),
+                    collectionCheckGroup};
+}
+
 Rando::Location Rando::Location::GrottoScrub(RandomizerCheck rc, RandomizerCheckQuest quest_,
                                              RandomizerCheckType checkType_, RandomizerCheckArea area_,
                                              ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_,
@@ -210,6 +310,19 @@ Rando::Location Rando::Location::GrottoScrub(RandomizerCheck rc, RandomizerCheck
                     isVanillaCompletion_, collectionCheck, collectionCheckGroup};
 }
 
+Rando::Location Rando::Location::GrottoScrub(RandomizerCheck rc, RandomizerCheckQuest quest_,
+                                             RandomizerCheckType checkType_, RandomizerCheckArea area_,
+                                             ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_,
+                                             std::string&& shortName_,
+                                             const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
+                                             std::vector<Category>&& categories, SpoilerCollectionCheck collectionCheck,
+                                             SpoilerCollectionCheckGroup collectionCheckGroup,
+                                             bool isVanillaCompletion_) {
+    return {rc, quest_, checkType_, area_, LocationType::GrottoScrub, actorId_, scene_, actorParams_, flag_,
+                    std::move(shortName_), hintKey, vanillaItem, std::move(categories),
+                    isVanillaCompletion_, collectionCheck, collectionCheckGroup};
+}
+
 Rando::Location Rando::Location::Delayed(RandomizerCheck rc, RandomizerCheckQuest quest_,
                                          RandomizerCheckType checkType_, RandomizerCheckArea area_, ActorID actorId_,
                                          uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
@@ -222,6 +335,18 @@ Rando::Location Rando::Location::Delayed(RandomizerCheck rc, RandomizerCheckQues
                     isVanillaCompletion_, collectionCheck, collectionCheckGroup};
 }
 
+Rando::Location Rando::Location::Delayed(RandomizerCheck rc, RandomizerCheckQuest quest_,
+                                         RandomizerCheckType checkType_, RandomizerCheckArea area_, ActorID actorId_,
+                                         uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
+                                         const RandomizerHintTextKey hintKey,
+                                         const RandomizerGet vanillaItem, std::vector<Category>&& categories,
+                                         SpoilerCollectionCheck collectionCheck,
+                                         SpoilerCollectionCheckGroup collectionCheckGroup, bool isVanillaCompletion_) {
+    return {rc, quest_, checkType_, area_, LocationType::Delayed, actorId_, scene_, actorParams_, flag_,
+                    std::move(shortName_), hintKey, vanillaItem, std::move(categories),
+                    isVanillaCompletion_, collectionCheck, collectionCheckGroup};
+}
+
 Rando::Location Rando::Location::Reward(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
                                         RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_,
                                         int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
@@ -234,6 +359,18 @@ Rando::Location Rando::Location::Reward(RandomizerCheck rc, RandomizerCheckQuest
                     isVanillaCompletion_, collectionCheck, collectionCheckGroup};
 }
 
+Rando::Location Rando::Location::Reward(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
+                                        RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_,
+                                        int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
+                                        const RandomizerHintTextKey hintKey,
+                                        const RandomizerGet vanillaItem, std::vector<Category>&& categories,
+                                        SpoilerCollectionCheck collectionCheck,
+                                        SpoilerCollectionCheckGroup collectionCheckGroup, bool isVanillaCompletion_) {
+    return {rc, quest_, checkType_, area_, LocationType::TempleReward, actorId_, scene_, actorParams_, flag_,
+                    std::move(shortName_), hintKey, vanillaItem, std::move(categories),
+                    isVanillaCompletion_, collectionCheck, collectionCheckGroup};
+}
+
 Rando::Location Rando::Location::OtherHint(RandomizerCheck rc, RandomizerCheckQuest quest_,
                                            RandomizerCheckType checkType_, RandomizerCheckArea area_, ActorID actorId_,
                                            uint8_t scene_,
@@ -243,6 +380,15 @@ Rando::Location Rando::Location::OtherHint(RandomizerCheck rc, RandomizerCheckQu
                     std::move(shortName_), std::move(spoilerName_), RHT_NONE, RG_NONE, {}, isVanillaCompletion_};
 }
 
+Rando::Location Rando::Location::OtherHint(RandomizerCheck rc, RandomizerCheckQuest quest_,
+                                           RandomizerCheckType checkType_, RandomizerCheckArea area_, ActorID actorId_,
+                                           uint8_t scene_,
+                                           std::string&& shortName_,
+                                           bool isVanillaCompletion_) {
+    return {rc, quest_, checkType_, area_, LocationType::OtherHint, actorId_, scene_, 0x00, 0x00,
+                    std::move(shortName_), RHT_NONE, RG_NONE, {}, isVanillaCompletion_};
+}
+
 Rando::Location Rando::Location::HintStone(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
                                            uint8_t scene_, int32_t actorParams_, uint8_t flag_,
                                            std::string&& shortName_, std::string&& spoilerName_,
@@ -251,3 +397,12 @@ Rando::Location Rando::Location::HintStone(RandomizerCheck rc, RandomizerCheckQu
                     std::move(shortName_), std::move(spoilerName_), RHT_NONE, RG_NONE, std::move(categories),
                     isVanillaCompletion_};
 }
+
+Rando::Location Rando::Location::HintStone(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
+                                           uint8_t scene_, int32_t actorParams_, uint8_t flag_,
+                                           std::string&& shortName_,
+                                           std::vector<Category>&& categories, bool isVanillaCompletion_) {
+    return {rc, quest_, RCTYPE_GOSSIP_STONE, area_, LocationType::Base, ACTOR_EN_GS, scene_, actorParams_, flag_,
+                    std::move(shortName_), RHT_NONE, RG_NONE, std::move(categories),
+                    isVanillaCompletion_};
+}
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/location.h b/soh/soh/Enhancements/randomizer/location.h
index 1731067cf..bd7f69a8b 100644
--- a/soh/soh/Enhancements/randomizer/location.h
+++ b/soh/soh/Enhancements/randomizer/location.h
@@ -10,6 +10,7 @@
 #include "randomizerTypes.h"
 #include "z64actor_enum.h"
 #include "z64scene.h"
+#include "../../util.h"
 
 namespace Rando {
 class SpoilerCollectionCheck {
@@ -110,6 +111,24 @@ class Location {
           isVanillaCompletion(isVanillaCompletion_), collectionCheck(collectionCheck_),
           collectionCheckGroup(collectionCheckGroup_) {
     }
+    Location(const RandomizerCheck rc_, const RandomizerCheckQuest quest_, const RandomizerCheckType checkType_,
+             const RandomizerCheckArea area_, const LocationType locationType_, const ActorID actorId_, const uint8_t scene_,
+             const int32_t actorParams_, const uint8_t flag_, std::string shortName_,
+             const RandomizerHintTextKey hintKey_, const RandomizerGet vanillaItem_, std::vector<Category> categories_,
+             const bool isVanillaCompletion_ = false, const SpoilerCollectionCheck collectionCheck_ = SpoilerCollectionCheck(),
+             const SpoilerCollectionCheckGroup collectionCheckGroup_ = GROUP_NO_GROUP)
+        : rc(rc_), quest(quest_), checkType(checkType_), area(area_), locationType(locationType_), actorId(actorId_),
+          scene(scene_), actorParams(actorParams_), flag(flag_), shortName(shortName_),
+          spoilerName(SpoilerNameFromShortName(shortName_, area_)), hintKey(hintKey_), vanillaItem(vanillaItem_), categories(std::move(categories_)),
+          isVanillaCompletion(isVanillaCompletion_), collectionCheck(collectionCheck_),
+          collectionCheckGroup(collectionCheckGroup_) {}
+
+    static std::string SpoilerNameFromShortName(std::string shortName, RandomizerCheckArea area) {
+        if (area < 0 || area >= RCAREA_INVALID) {
+            return shortName;
+        }
+        return SohUtils::GetRandomizerCheckAreaPrefix(area) + " " + shortName;
+    }
 
     RandomizerCheck GetRandomizerCheck() const;
     SpoilerCollectionCheck GetCollectionCheck() const;
@@ -144,6 +163,15 @@ class Location {
                          SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
                          bool isVanillaCompletion_ = false);
 
+    static Location Base(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
+                         RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_, int32_t actorParams_,
+                         uint8_t flag_, std::string&& shortName_,
+                         RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
+                         std::vector<Category>&& categories,
+                         SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(),
+                         SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
+                         bool isVanillaCompletion_ = false);
+
     static Location
     Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_,
           ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
@@ -152,6 +180,14 @@ class Location {
           SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
           bool isVanillaCompletion_ = false);
 
+    static Location
+    Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_,
+          ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
+          RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
+          std::vector<Category>&& categories,
+          SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
+          bool isVanillaCompletion_ = false);
+
     static Location
     Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_,
           ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
@@ -160,6 +196,14 @@ class Location {
           SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
           bool isVanillaCompletion_ = false);
 
+    static Location
+    Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_,
+          ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
+          RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
+          std::vector<Category>&& categories, SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(),
+          SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
+          bool isVanillaCompletion_ = false);
+
     static Location
     Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
                 RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_,
@@ -168,6 +212,14 @@ class Location {
                 SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
                 bool isVanillaCompletion_ = false);
 
+    static Location
+    Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
+                RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_,
+                std::string&& shortName_, RandomizerHintTextKey hintKey,
+                RandomizerGet vanillaItem, std::vector<Category>&& categories,
+                SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
+                bool isVanillaCompletion_ = false);
+
     static Location
     Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
                 RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_,
@@ -176,6 +228,14 @@ class Location {
                 SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
                 bool isVanillaCompletion_ = false);
 
+    static Location
+    Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
+                RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_,
+                std::string&& shortName_, RandomizerHintTextKey hintKey,
+                RandomizerGet vanillaItem, std::vector<Category>&& categories, uint8_t collectFlag_,
+                SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
+                bool isVanillaCompletion_ = false);
+
     static Location
     Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
                 RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_,
@@ -185,6 +245,15 @@ class Location {
                 SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
                 bool isVanillaCompletion_ = false);
 
+    static Location
+    Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
+                RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_,
+                std::string&& shortName_, RandomizerHintTextKey hintKey,
+                RandomizerGet vanillaItem, std::vector<Category>&& categories,
+                SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(),
+                SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
+                bool isVanillaCompletion_ = false);
+
     static Location
     GSToken(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
             uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
@@ -192,8 +261,15 @@ class Location {
             SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
             bool isVanillaCompletion_ = true);
 
+    static Location
+    GSToken(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
+            uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
+            RandomizerHintTextKey hintKey, std::vector<Category>&& categories,
+            SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
+            bool isVanillaCompletion_ = true);
+
     /// @brief For certain scenes, the sceneId and the "Scene" in spoiler collection check later used to check the
-    /// GS flags don't necessarily match. Use this constructor for those. scene_ should be the actual scene where
+    /// GS flags don't necessarily match. Use this constructor (or the next one) for those. scene_ should be the actual scene where
     /// the GS is located, skullScene_ is the value passed to GET_GS_FLAGS to get the correct skulltula. It is normal
     /// and expected that these don't always match, and the naming is a holdover from 3drando.
     /// @param rc 
@@ -218,6 +294,14 @@ class Location {
             SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
             bool isVanillaCompletion_ = true);
 
+    static Location
+    GSToken(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
+            uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
+            RandomizerHintTextKey hintKey, std::vector<Category>&& categories,
+            uint8_t skullScene_,
+            SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
+            bool isVanillaCompletion_ = true);
+
     static Location
     GrottoScrub(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
                 RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_,
@@ -227,6 +311,15 @@ class Location {
                 SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
                 bool isVanillaCompletion_ = false);
 
+    static Location
+    GrottoScrub(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
+                RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_,
+                std::string&& shortName_, RandomizerHintTextKey hintKey,
+                RandomizerGet vanillaItem, std::vector<Category>&& categories,
+                SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(),
+                SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
+                bool isVanillaCompletion_ = false);
+
     static Location
     Delayed(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_,
             ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
@@ -235,6 +328,14 @@ class Location {
             SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
             bool isVanillaCompletion_ = false);
 
+    static Location
+    Delayed(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_,
+            ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
+            RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
+            std::vector<Category>&& categories, SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(),
+            SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
+            bool isVanillaCompletion_ = false);
+
     static Location
     Reward(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_,
            ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
@@ -242,14 +343,29 @@ class Location {
            std::vector<Category>&& categories, SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(),
            SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP, bool isVanillaCompletion_ = false);
 
+    static Location
+    Reward(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_,
+           ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
+           RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
+           std::vector<Category>&& categories, SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(),
+           SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP, bool isVanillaCompletion_ = false);
+
     static Location OtherHint(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
                               RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_,
                               std::string&& shortName_, std::string&& spoilerName_, bool isVanillaCompletion_ = false);
 
+    static Location OtherHint(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
+                              RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_,
+                              std::string&& shortName_, bool isVanillaCompletion_ = false);
+
     static Location HintStone(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_, uint8_t scene_,
                               int32_t actorParams_, uint8_t flag_, std::string&& shortName_, std::string&& spoilerName_,
                               std::vector<Category>&& categories, bool isVanillaCompletion_ = false);
 
+    static Location HintStone(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_, uint8_t scene_,
+                              int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
+                              std::vector<Category>&& categories, bool isVanillaCompletion_ = false);
+
   private:
     RandomizerCheck rc;
     RandomizerCheckQuest quest;
diff --git a/soh/soh/Enhancements/randomizer/location_list.cpp b/soh/soh/Enhancements/randomizer/location_list.cpp
index 92a91f32a..454520d48 100644
--- a/soh/soh/Enhancements/randomizer/location_list.cpp
+++ b/soh/soh/Enhancements/randomizer/location_list.cpp
@@ -603,778 +603,778 @@ typedef enum {
 
 using namespace Rando;
 
-void Rando::StaticData::InitLocationTable() { //                                                      Randomizer Check                                                 Quest            Type                                Area                                 Actor ID              Scene ID                            Params                                             Flags Short Name                                     Spoiler Name                                                Hint Text Key                                                    Vanilla Item                          Categories                                              Spoiler Collection Check                                                                                                      Collection Check Group                                         Vanilla Progression
+void Rando::StaticData::InitLocationTable() { //                                                      Randomizer Check                                                 Quest            Type                                Area                                 Actor ID              Scene ID                            Params                                             Flags Short Name                                     Hint Text Key                                                    Vanilla Item                          Categories                                              Spoiler Collection Check                                                                                                      Collection Check Group                                         Vanilla Progression
     // clang-format off
-    locationTable[RC_UNKNOWN_CHECK] =                                                  Location::Base(RC_UNKNOWN_CHECK,                                                RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_INVALID,                      ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x00, "Invalid Location",                            "Invalid Location",                                         RHT_NONE,                                                        RG_NONE,                              {},                                                     SpoilerCollectionCheck::None());
+    locationTable[RC_UNKNOWN_CHECK] =                                                  Location::Base(RC_UNKNOWN_CHECK,                                                RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_INVALID,                      ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x00, "Invalid Location", "Invalid Location",        RHT_NONE,                                                        RG_NONE,                              {},                                                     SpoilerCollectionCheck::None());
     // Kokiri Forest
-    locationTable[RC_KF_KOKIRI_SWORD_CHEST] =                                         Location::Chest(RC_KF_KOKIRI_SWORD_CHEST,                                        RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KOKIRI_FOREST,                ACTOR_EN_BOX,         SCENE_KOKIRI_FOREST,                1248,                                              0x00, "Kokiri Sword Chest",                          "KF Kokiri Sword Chest",                                    RHT_KF_KOKIRI_SWORD_CHEST,                                       RG_KOKIRI_SWORD,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST,              true);
-    locationTable[RC_KF_MIDOS_TOP_LEFT_CHEST] =                                       Location::Chest(RC_KF_MIDOS_TOP_LEFT_CHEST,                                      RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KOKIRI_FOREST,                ACTOR_EN_BOX,         SCENE_MIDOS_HOUSE,                  22944,                                             0x00, "Mido Top Left Chest",                         "KF Mido Top Left Chest",                                   RHT_KF_MIDOS_TOP_LEFT_CHEST,                                     RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_MIDOS_TOP_RIGHT_CHEST] =                                      Location::Chest(RC_KF_MIDOS_TOP_RIGHT_CHEST,                                     RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KOKIRI_FOREST,                ACTOR_EN_BOX,         SCENE_MIDOS_HOUSE,                  22945,                                             0x01, "Mido Top Right Chest",                        "KF Mido Top Right Chest",                                  RHT_KF_MIDOS_TOP_RIGHT_CHEST,                                    RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_MIDOS_BOTTOM_LEFT_CHEST] =                                    Location::Chest(RC_KF_MIDOS_BOTTOM_LEFT_CHEST,                                   RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KOKIRI_FOREST,                ACTOR_EN_BOX,         SCENE_MIDOS_HOUSE,                  22914,                                             0x02, "Mido Bottom Left Chest",                      "KF Mido Bottom Left Chest",                                RHT_KF_MIDOS_BOTTOM_LEFT_CHEST,                                  RG_GREG_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_MIDOS_BOTTOM_RIGHT_CHEST] =                                   Location::Chest(RC_KF_MIDOS_BOTTOM_RIGHT_CHEST,                                  RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KOKIRI_FOREST,                ACTOR_EN_BOX,         SCENE_MIDOS_HOUSE,                  22787,                                             0x03, "Mido Bottom Right Chest",                     "KF Mido Bottom Right Chest",                               RHT_KF_MIDOS_BOTTOM_RIGHT_CHEST,                                 RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_STORMS_GROTTO_CHEST] =                                        Location::Chest(RC_KF_STORMS_GROTTO_CHEST,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KOKIRI_FOREST,                ACTOR_EN_BOX,         SCENE_GROTTOS,                      22988,                                             0x0C, "Storms Grotto Chest",                         "KF Storms Grotto Chest",                                   RHT_KF_STORMS_GROTTO_CHEST,                                      RG_RED_RUPEE,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_KOKIRI_SWORD_CHEST] =                                         Location::Chest(RC_KF_KOKIRI_SWORD_CHEST,                                        RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KOKIRI_FOREST,                ACTOR_EN_BOX,         SCENE_KOKIRI_FOREST,                1248,                                              0x00, "Kokiri Sword Chest",                          RHT_KF_KOKIRI_SWORD_CHEST,                                       RG_KOKIRI_SWORD,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST,              true);
+    locationTable[RC_KF_MIDOS_TOP_LEFT_CHEST] =                                       Location::Chest(RC_KF_MIDOS_TOP_LEFT_CHEST,                                      RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KOKIRI_FOREST,                ACTOR_EN_BOX,         SCENE_MIDOS_HOUSE,                  22944,                                             0x00, "Mido Top Left Chest",                         RHT_KF_MIDOS_TOP_LEFT_CHEST,                                     RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_MIDOS_TOP_RIGHT_CHEST] =                                      Location::Chest(RC_KF_MIDOS_TOP_RIGHT_CHEST,                                     RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KOKIRI_FOREST,                ACTOR_EN_BOX,         SCENE_MIDOS_HOUSE,                  22945,                                             0x01, "Mido Top Right Chest",                        RHT_KF_MIDOS_TOP_RIGHT_CHEST,                                    RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_MIDOS_BOTTOM_LEFT_CHEST] =                                    Location::Chest(RC_KF_MIDOS_BOTTOM_LEFT_CHEST,                                   RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KOKIRI_FOREST,                ACTOR_EN_BOX,         SCENE_MIDOS_HOUSE,                  22914,                                             0x02, "Mido Bottom Left Chest",                      RHT_KF_MIDOS_BOTTOM_LEFT_CHEST,                                  RG_GREG_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_MIDOS_BOTTOM_RIGHT_CHEST] =                                   Location::Chest(RC_KF_MIDOS_BOTTOM_RIGHT_CHEST,                                  RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KOKIRI_FOREST,                ACTOR_EN_BOX,         SCENE_MIDOS_HOUSE,                  22787,                                             0x03, "Mido Bottom Right Chest",                     RHT_KF_MIDOS_BOTTOM_RIGHT_CHEST,                                 RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_STORMS_GROTTO_CHEST] =                                        Location::Chest(RC_KF_STORMS_GROTTO_CHEST,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KOKIRI_FOREST,                ACTOR_EN_BOX,         SCENE_GROTTOS,                      22988,                                             0x0C, "Storms Grotto Chest",                         RHT_KF_STORMS_GROTTO_CHEST,                                      RG_RED_RUPEE,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
     // Lost Woods
-    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_CHEST] =                                Location::Chest(RC_LW_NEAR_SHORTCUTS_GROTTO_CHEST,                               RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LOST_WOODS,                   ACTOR_EN_BOX,         SCENE_GROTTOS,                      22964,                                             0x14, "Near Shortcuts Grotto Chest",                 "LW Near Shortcuts Grotto Chest",                           RHT_KF_STORMS_GROTTO_CHEST,                                      RG_RED_RUPEE,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_LW_SKULL_KID] =                                                   Location::Base(RC_LW_SKULL_KID,                                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LOST_WOODS,                   ACTOR_ID_MAX,         SCENE_LOST_WOODS,                   0x00,                                              0x3E, "Skull Kid",                                   "LW Skull Kid",                                             RHT_LW_SKULL_KID,                                                RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::ItemGetInf(22),                                                                                       SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
-    locationTable[RC_LW_TRADE_COJIRO] =                                                Location::Base(RC_LW_TRADE_COJIRO,                                              RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_LOST_WOODS,                   ACTOR_ID_MAX,         SCENE_LOST_WOODS,                   0x00,                                              0x1F, "Trade Cojiro",                                "LW Trade Cojiro",                                          RHT_LW_TRADE_COJIRO,                                             RG_ODD_MUSHROOM,                      { Category::cAdultTrade },                              SpoilerCollectionCheck::RandomizerInf(RAND_INF_ADULT_TRADES_LW_TRADE_COJIRO),                                                 SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
-    locationTable[RC_LW_TRADE_ODD_POTION] =                                            Location::Base(RC_LW_TRADE_ODD_POTION,                                          RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_LOST_WOODS,                   ACTOR_ID_MAX,         SCENE_LOST_WOODS,                   0x00,                                              0x21, "Trade Odd Potion",                            "LW Trade Odd Potion",                                      RHT_LW_TRADE_COJIRO,                                             RG_POACHERS_SAW,                      { Category::cAdultTrade },                              SpoilerCollectionCheck::ItemGetInf(49),                                                                                       SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
-    locationTable[RC_LW_OCARINA_MEMORY_GAME] =                                         Location::Base(RC_LW_OCARINA_MEMORY_GAME,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LOST_WOODS,                   ACTOR_ID_MAX,         SCENE_LOST_WOODS,                   0x00,                                              0x21, "Ocarina Memory Game",                         "LW Ocarina Memory Game",                                   RHT_LW_OCARINA_MEMORY_GAME,                                      RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::ItemGetInf(23),                                                                                       SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
-    locationTable[RC_LW_TARGET_IN_WOODS] =                                             Location::Base(RC_LW_TARGET_IN_WOODS,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LOST_WOODS,                   ACTOR_ID_MAX,         SCENE_LOST_WOODS,                   0x00,                                              0x60, "Target in Woods",                             "LW Target in Woods",                                       RHT_LW_TARGET_IN_WOODS,                                          RG_PROGRESSIVE_SLINGSHOT,             {},                                                     SpoilerCollectionCheck::ItemGetInf(29),                                                                                       SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
-    locationTable[RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT] =                          Location::Base(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT,                        RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LOST_WOODS,                   ACTOR_EN_DNS,         SCENE_LOST_WOODS,                   0x00,                                              0x30, "Deku Scrub Near Deku Theater Right",          "LW Deku Scrub Near Deku Theater Right",                    RHT_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT,                       RG_BUY_DEKU_NUTS_5,                   { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT),                       SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT] =                           Location::Base(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT,                         RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LOST_WOODS,                   ACTOR_EN_DNS,         SCENE_LOST_WOODS,                   0x01,                                              0x31, "Deku Scrub Near Deku Theater Left",           "LW Deku Scrub Near Deku Theater Left",                     RHT_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT,                        RG_BUY_DEKU_STICK_1,                  { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT),                        SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[RC_LW_DEKU_SCRUB_NEAR_BRIDGE] =                                      Location::Base(RC_LW_DEKU_SCRUB_NEAR_BRIDGE,                                    RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LOST_WOODS,                   ACTOR_EN_DNS,         SCENE_LOST_WOODS,                   0x09,                                              0x77, "Deku Scrub Near Bridge",                      "LW Deku Scrub Near Bridge",                                RHT_LW_DEKU_SCRUB_NEAR_BRIDGE,                                   RG_PROGRESSIVE_STICK_UPGRADE,         { Category::cDekuScrub, Category::cDekuScrubUpgrades }, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_NEAR_BRIDGE),                                   SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
-    locationTable[RC_LW_DEKU_SCRUB_GROTTO_REAR] =                               Location::GrottoScrub(RC_LW_DEKU_SCRUB_GROTTO_REAR,                                    RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LOST_WOODS,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x03, 0xF5),                      0x33, "Deku Scrub Grotto Rear",                      "LW Deku Scrub Grotto Rear",                                RHT_LW_DEKU_SCRUB_GROTTO_REAR,                                   RG_BUY_DEKU_SEEDS_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_GROTTO_REAR),                                   SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[RC_LW_DEKU_SCRUB_GROTTO_FRONT] =                              Location::GrottoScrub(RC_LW_DEKU_SCRUB_GROTTO_FRONT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LOST_WOODS,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x0A, 0xF5),                      0x79, "Deku Scrub Grotto Front",                     "LW Deku Scrub Grotto Front",                               RHT_LW_DEKU_SCRUB_GROTTO_FRONT,                                  RG_PROGRESSIVE_NUT_UPGRADE,           { Category::cDekuScrub, Category::cDekuScrubUpgrades }, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_GROTTO_FRONT),                                  SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[RC_DEKU_THEATER_SKULL_MASK] =                                        Location::Base(RC_DEKU_THEATER_SKULL_MASK,                                      RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LOST_WOODS,                   ACTOR_ID_MAX,         SCENE_GROTTOS,                      0x00,                                              0x77, "Deku Theater Skull Mask",                     "Deku Theater Skull Mask",                                  RHT_DEKU_THEATER_SKULL_MASK,                                     RG_PROGRESSIVE_STICK_UPGRADE,         {},                                                     SpoilerCollectionCheck::ItemGetInf(ITEMGETINF_OBTAINED_STICK_UPGRADE_FROM_STAGE),                                                                                    SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
-    locationTable[RC_DEKU_THEATER_MASK_OF_TRUTH] =                                     Location::Base(RC_DEKU_THEATER_MASK_OF_TRUTH,                                   RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LOST_WOODS,                   ACTOR_ID_MAX,         SCENE_GROTTOS,                      0x00,                                              0x7A, "Deku Theater Mask of Truth",                  "Deku Theater Mask of Truth",                               RHT_DEKU_THEATER_MASK_OF_TRUTH,                                  RG_PROGRESSIVE_NUT_UPGRADE,           {},                                                     SpoilerCollectionCheck::ItemGetInf(ITEMGETINF_OBTAINED_NUT_UPGRADE_FROM_STAGE),                                                                                    SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
+    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_CHEST] =                                Location::Chest(RC_LW_NEAR_SHORTCUTS_GROTTO_CHEST,                               RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LOST_WOODS,                   ACTOR_EN_BOX,         SCENE_GROTTOS,                      22964,                                             0x14, "Near Shortcuts Grotto Chest",                 RHT_KF_STORMS_GROTTO_CHEST,                                      RG_RED_RUPEE,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_LW_SKULL_KID] =                                                   Location::Base(RC_LW_SKULL_KID,                                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LOST_WOODS,                   ACTOR_ID_MAX,         SCENE_LOST_WOODS,                   0x00,                                              0x3E, "Skull Kid",                                   RHT_LW_SKULL_KID,                                                RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::ItemGetInf(22),                                                                                       SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
+    locationTable[RC_LW_TRADE_COJIRO] =                                                Location::Base(RC_LW_TRADE_COJIRO,                                              RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_LOST_WOODS,                   ACTOR_ID_MAX,         SCENE_LOST_WOODS,                   0x00,                                              0x1F, "Trade Cojiro",                                RHT_LW_TRADE_COJIRO,                                             RG_ODD_MUSHROOM,                      { Category::cAdultTrade },                              SpoilerCollectionCheck::RandomizerInf(RAND_INF_ADULT_TRADES_LW_TRADE_COJIRO),                                                 SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
+    locationTable[RC_LW_TRADE_ODD_POTION] =                                            Location::Base(RC_LW_TRADE_ODD_POTION,                                          RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_LOST_WOODS,                   ACTOR_ID_MAX,         SCENE_LOST_WOODS,                   0x00,                                              0x21, "Trade Odd Potion",                            RHT_LW_TRADE_COJIRO,                                             RG_POACHERS_SAW,                      { Category::cAdultTrade },                              SpoilerCollectionCheck::ItemGetInf(49),                                                                                       SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
+    locationTable[RC_LW_OCARINA_MEMORY_GAME] =                                         Location::Base(RC_LW_OCARINA_MEMORY_GAME,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LOST_WOODS,                   ACTOR_ID_MAX,         SCENE_LOST_WOODS,                   0x00,                                              0x21, "Ocarina Memory Game",                         RHT_LW_OCARINA_MEMORY_GAME,                                      RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::ItemGetInf(23),                                                                                       SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
+    locationTable[RC_LW_TARGET_IN_WOODS] =                                             Location::Base(RC_LW_TARGET_IN_WOODS,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LOST_WOODS,                   ACTOR_ID_MAX,         SCENE_LOST_WOODS,                   0x00,                                              0x60, "Target in Woods",                             RHT_LW_TARGET_IN_WOODS,                                          RG_PROGRESSIVE_SLINGSHOT,             {},                                                     SpoilerCollectionCheck::ItemGetInf(29),                                                                                       SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
+    locationTable[RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT] =                          Location::Base(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT,                        RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LOST_WOODS,                   ACTOR_EN_DNS,         SCENE_LOST_WOODS,                   0x00,                                              0x30, "Deku Scrub Near Deku Theater Right",          RHT_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT,                       RG_BUY_DEKU_NUTS_5,                   { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT),                       SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT] =                           Location::Base(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT,                         RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LOST_WOODS,                   ACTOR_EN_DNS,         SCENE_LOST_WOODS,                   0x01,                                              0x31, "Deku Scrub Near Deku Theater Left",           RHT_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT,                        RG_BUY_DEKU_STICK_1,                  { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT),                        SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_LW_DEKU_SCRUB_NEAR_BRIDGE] =                                      Location::Base(RC_LW_DEKU_SCRUB_NEAR_BRIDGE,                                    RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LOST_WOODS,                   ACTOR_EN_DNS,         SCENE_LOST_WOODS,                   0x09,                                              0x77, "Deku Scrub Near Bridge",                      RHT_LW_DEKU_SCRUB_NEAR_BRIDGE,                                   RG_PROGRESSIVE_STICK_UPGRADE,         { Category::cDekuScrub, Category::cDekuScrubUpgrades }, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_NEAR_BRIDGE),                                   SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
+    locationTable[RC_LW_DEKU_SCRUB_GROTTO_REAR] =                               Location::GrottoScrub(RC_LW_DEKU_SCRUB_GROTTO_REAR,                                    RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LOST_WOODS,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x03, 0xF5),                      0x33, "Deku Scrub Grotto Rear",                      RHT_LW_DEKU_SCRUB_GROTTO_REAR,                                   RG_BUY_DEKU_SEEDS_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_GROTTO_REAR),                                   SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_LW_DEKU_SCRUB_GROTTO_FRONT] =                              Location::GrottoScrub(RC_LW_DEKU_SCRUB_GROTTO_FRONT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LOST_WOODS,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x0A, 0xF5),                      0x79, "Deku Scrub Grotto Front",                     RHT_LW_DEKU_SCRUB_GROTTO_FRONT,                                  RG_PROGRESSIVE_NUT_UPGRADE,           { Category::cDekuScrub, Category::cDekuScrubUpgrades }, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_GROTTO_FRONT),                                  SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_DEKU_THEATER_SKULL_MASK] =                                        Location::Base(RC_DEKU_THEATER_SKULL_MASK,                                      RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LOST_WOODS,                   ACTOR_ID_MAX,         SCENE_GROTTOS,                      0x00,                                              0x77, "Deku Theater Skull Mask",                     RHT_DEKU_THEATER_SKULL_MASK,                                     RG_PROGRESSIVE_STICK_UPGRADE,         {},                                                     SpoilerCollectionCheck::ItemGetInf(ITEMGETINF_OBTAINED_STICK_UPGRADE_FROM_STAGE),                                             SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
+    locationTable[RC_DEKU_THEATER_MASK_OF_TRUTH] =                                     Location::Base(RC_DEKU_THEATER_MASK_OF_TRUTH,                                   RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LOST_WOODS,                   ACTOR_ID_MAX,         SCENE_GROTTOS,                      0x00,                                              0x7A, "Deku Theater Mask of Truth",                  RHT_DEKU_THEATER_MASK_OF_TRUTH,                                  RG_PROGRESSIVE_NUT_UPGRADE,           {},                                                     SpoilerCollectionCheck::ItemGetInf(ITEMGETINF_OBTAINED_NUT_UPGRADE_FROM_STAGE),                                               SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
     // Sacred Forest Meadow
-    locationTable[RC_SFM_WOLFOS_GROTTO_CHEST] =                                       Location::Chest(RC_SFM_WOLFOS_GROTTO_CHEST,                                      RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_SACRED_FOREST_MEADOW,         ACTOR_EN_BOX,         SCENE_GROTTOS,                      31409,                                             0x11, "Wolfos Grotto Chest",                         "SFM Wolfos Grotto Chest",                                  RHT_SFM_WOLFOS_GROTTO_CHEST,                                     RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[RC_SFM_DEKU_SCRUB_GROTTO_REAR] =                              Location::GrottoScrub(RC_SFM_DEKU_SCRUB_GROTTO_REAR,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_SACRED_FOREST_MEADOW,         ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x07, 0xEE),                      0x39, "Deku Scrub Grotto Rear",                      "SFM Deku Scrub Grotto Rear",                               RHT_SFM_DEKU_SCRUB_GROTTO_REAR,                                  RG_BUY_RED_POTION_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_SFM_DEKU_SCRUB_GROTTO_REAR),                                  SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[RC_SFM_DEKU_SCRUB_GROTTO_FRONT] =                             Location::GrottoScrub(RC_SFM_DEKU_SCRUB_GROTTO_FRONT,                                  RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_SACRED_FOREST_MEADOW,         ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x08, 0xEE),                      0x3A, "Deku Scrub Grotto Front",                     "SFM Deku Scrub Grotto Front",                              RHT_SFM_DEKU_SCRUB_GROTTO_FRONT,                                 RG_BUY_GREEN_POTION,                  { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_SFM_DEKU_SCRUB_GROTTO_FRONT),                                 SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_SFM_WOLFOS_GROTTO_CHEST] =                                       Location::Chest(RC_SFM_WOLFOS_GROTTO_CHEST,                                      RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_SACRED_FOREST_MEADOW,         ACTOR_EN_BOX,         SCENE_GROTTOS,                      31409,                                             0x11, "Wolfos Grotto Chest",                         RHT_SFM_WOLFOS_GROTTO_CHEST,                                     RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_SFM_DEKU_SCRUB_GROTTO_REAR] =                              Location::GrottoScrub(RC_SFM_DEKU_SCRUB_GROTTO_REAR,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_SACRED_FOREST_MEADOW,         ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x07, 0xEE),                      0x39, "Deku Scrub Grotto Rear",                      RHT_SFM_DEKU_SCRUB_GROTTO_REAR,                                  RG_BUY_RED_POTION_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_SFM_DEKU_SCRUB_GROTTO_REAR),                                  SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_SFM_DEKU_SCRUB_GROTTO_FRONT] =                             Location::GrottoScrub(RC_SFM_DEKU_SCRUB_GROTTO_FRONT,                                  RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_SACRED_FOREST_MEADOW,         ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x08, 0xEE),                      0x3A, "Deku Scrub Grotto Front",                     RHT_SFM_DEKU_SCRUB_GROTTO_FRONT,                                 RG_BUY_GREEN_POTION,                  { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_SFM_DEKU_SCRUB_GROTTO_FRONT),                                 SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
     // Hyrule Field
-    locationTable[RC_HF_SOUTHEAST_GROTTO_CHEST] =                                     Location::Chest(RC_HF_SOUTHEAST_GROTTO_CHEST,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_FIELD,                 ACTOR_EN_BOX,         SCENE_GROTTOS,                      22978,                                             0x02, "Southeast Grotto Chest",                      "HF Southeast Grotto Chest",                                RHT_HF_SOUTHEAST_GROTTO_CHEST,                                   RG_RED_RUPEE,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[RC_HF_OPEN_GROTTO_CHEST] =                                          Location::Chest(RC_HF_OPEN_GROTTO_CHEST,                                         RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_FIELD,                 ACTOR_EN_BOX,         SCENE_GROTTOS,                      22947,                                             0x03, "Open Grotto Chest",                           "HF Open Grotto Chest",                                     RHT_HF_OPEN_GROTTO_CHEST,                                        RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[RC_HF_NEAR_MARKET_GROTTO_CHEST] =                                   Location::Chest(RC_HF_NEAR_MARKET_GROTTO_CHEST,                                  RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_FIELD,                 ACTOR_EN_BOX,         SCENE_GROTTOS,                      22944,                                             0x00, "Near Market Grotto Chest",                    "HF Near Market Grotto Chest",                              RHT_HF_NEAR_MARKET_GROTTO_CHEST,                                 RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[RC_HF_OCARINA_OF_TIME_ITEM] =                                        Location::Base(RC_HF_OCARINA_OF_TIME_ITEM,                                      RCQUEST_BOTH,    RCTYPE_OCARINA,                     RCAREA_HYRULE_FIELD,                 ACTOR_ID_MAX,         SCENE_HYRULE_FIELD,                 0x00,                                              0x0C, "Ocarina of Time Item",                        "HF Ocarina of Time Item",                                  RHT_HF_OCARINA_OF_TIME_ITEM,                                     RG_PROGRESSIVE_OCARINA,               {},                                                     SpoilerCollectionCheck::EventChkInf(0x43),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[RC_HF_TEKTITE_GROTTO_FREESTANDING_POH] =                      Location::Collectable(RC_HF_TEKTITE_GROTTO_FREESTANDING_POH,                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_FIELD,                 ACTOR_EN_ITEM00,      SCENE_GROTTOS,                      262,                                               0x01, "Tektite Grotto Freestanding PoH",             "HF Tektite Grotto Freestanding PoH",                       RHT_HF_TEKTITE_GROTTO_FREESTANDING_POH,                          RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD,               true);
-    locationTable[RC_HF_DEKU_SCRUB_GROTTO] =                                    Location::GrottoScrub(RC_HF_DEKU_SCRUB_GROTTO,                                         RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_HYRULE_FIELD,                 ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x02, 0xE6),                      0x3E, "Deku Scrub Grotto",                           "HF Deku Scrub Grotto",                                     RHT_HF_DEKU_SCRUB_GROTTO,                                        RG_PIECE_OF_HEART,                    { Category::cDekuScrub, Category::cDekuScrubUpgrades }, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_HF_DEKU_SCRUB_GROTTO),                                        SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD,               true);
+    locationTable[RC_HF_SOUTHEAST_GROTTO_CHEST] =                                     Location::Chest(RC_HF_SOUTHEAST_GROTTO_CHEST,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_FIELD,                 ACTOR_EN_BOX,         SCENE_GROTTOS,                      22978,                                             0x02, "Southeast Grotto Chest",                      RHT_HF_SOUTHEAST_GROTTO_CHEST,                                   RG_RED_RUPEE,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_HF_OPEN_GROTTO_CHEST] =                                          Location::Chest(RC_HF_OPEN_GROTTO_CHEST,                                         RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_FIELD,                 ACTOR_EN_BOX,         SCENE_GROTTOS,                      22947,                                             0x03, "Open Grotto Chest",                           RHT_HF_OPEN_GROTTO_CHEST,                                        RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_HF_NEAR_MARKET_GROTTO_CHEST] =                                   Location::Chest(RC_HF_NEAR_MARKET_GROTTO_CHEST,                                  RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_FIELD,                 ACTOR_EN_BOX,         SCENE_GROTTOS,                      22944,                                             0x00, "Near Market Grotto Chest",                    RHT_HF_NEAR_MARKET_GROTTO_CHEST,                                 RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_HF_OCARINA_OF_TIME_ITEM] =                                        Location::Base(RC_HF_OCARINA_OF_TIME_ITEM,                                      RCQUEST_BOTH,    RCTYPE_OCARINA,                     RCAREA_HYRULE_FIELD,                 ACTOR_ID_MAX,         SCENE_HYRULE_FIELD,                 0x00,                                              0x0C, "Ocarina of Time Item",                        RHT_HF_OCARINA_OF_TIME_ITEM,                                     RG_PROGRESSIVE_OCARINA,               {},                                                     SpoilerCollectionCheck::EventChkInf(0x43),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_HF_TEKTITE_GROTTO_FREESTANDING_POH] =                      Location::Collectable(RC_HF_TEKTITE_GROTTO_FREESTANDING_POH,                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_FIELD,                 ACTOR_EN_ITEM00,      SCENE_GROTTOS,                      262,                                               0x01, "Tektite Grotto Freestanding PoH",             RHT_HF_TEKTITE_GROTTO_FREESTANDING_POH,                          RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD,               true);
+    locationTable[RC_HF_DEKU_SCRUB_GROTTO] =                                    Location::GrottoScrub(RC_HF_DEKU_SCRUB_GROTTO,                                         RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_HYRULE_FIELD,                 ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x02, 0xE6),                      0x3E, "Deku Scrub Grotto",                           RHT_HF_DEKU_SCRUB_GROTTO,                                        RG_PIECE_OF_HEART,                    { Category::cDekuScrub, Category::cDekuScrubUpgrades }, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_HF_DEKU_SCRUB_GROTTO),                                        SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD,               true);
     // Lake Hylia
-    locationTable[RC_LH_CHILD_FISHING] =                                               Location::Base(RC_LH_CHILD_FISHING,                                             RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LAKE_HYLIA,                   ACTOR_ID_MAX,         SCENE_FISHING_POND,                 0x00,                                              0x3E, "Child Fishing",                               "LH Child Fishing",                                         RHT_LH_CHILD_FISHING,                                            RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_CHILD_FISHING),                                                                SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,                 true);
-    locationTable[RC_LH_ADULT_FISHING] =                                               Location::Base(RC_LH_ADULT_FISHING,                                             RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LAKE_HYLIA,                   ACTOR_ID_MAX,         SCENE_FISHING_POND,                 0x00,                                              0x38, "Adult Fishing",                               "LH Adult Fishing",                                         RHT_LH_ADULT_FISHING,                                            RG_PROGRESSIVE_SCALE,                 {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ADULT_FISHING),                                                                SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,                 true);
-    locationTable[RC_LH_LAB_DIVE] =                                                    Location::Base(RC_LH_LAB_DIVE,                                                  RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LAKE_HYLIA,                   ACTOR_ID_MAX,         SCENE_LAKESIDE_LABORATORY,          0x00,                                              0x3E, "Lab Dive",                                    "LH Lab Dive",                                              RHT_LH_LAB_DIVE,                                                 RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::ItemGetInf(16),                                                                                       SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,                 true);
-    locationTable[RC_LH_TRADE_FROG] =                                                  Location::Base(RC_LH_TRADE_FROG,                                                RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_LAKE_HYLIA,                   ACTOR_ID_MAX,         SCENE_LAKESIDE_LABORATORY,          0x00,                                              0x25, "Lab Trade Eyeball Frog",                      "LH Lab Trade Eyeball Frog",                                RHT_LH_TRADE_FROG,                                               RG_EYEDROPS,                          { Category::cAdultTrade },                              SpoilerCollectionCheck::RandomizerInf(RAND_INF_ADULT_TRADES_LH_TRADE_FROG),                                                   SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,                 true);
-    locationTable[RC_LH_UNDERWATER_ITEM] =                                             Location::Base(RC_LH_UNDERWATER_ITEM,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LAKE_HYLIA,                   ACTOR_ID_MAX,         SCENE_LAKE_HYLIA,                   0x00,                                              0x15, "Underwater Item",                             "LH Underwater Item",                                       RHT_LH_UNDERWATER_ITEM,                                          RG_RUTOS_LETTER,                      {},                                                     SpoilerCollectionCheck::EventChkInf(0x31),                                                                                    SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,                 true);
-    locationTable[RC_LH_SUN] =                                                         Location::Base(RC_LH_SUN,                                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LAKE_HYLIA,                   ACTOR_ID_MAX,         SCENE_LAKE_HYLIA,                   0x00,                                              0x58, "Sun",                                         "LH Sun",                                                   RHT_LH_SUN,                                                      RG_FIRE_ARROWS,                       {},                                                     SpoilerCollectionCheck::Chest(0x57, 0x1F),                                                                                    SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,                 true);
-    locationTable[RC_LH_FREESTANDING_POH] =                                     Location::Collectable(RC_LH_FREESTANDING_POH,                                          RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LAKE_HYLIA,                   ACTOR_EN_ITEM00,      SCENE_LAKE_HYLIA,                   7686,                                              0x1E, "Freestanding PoH",                            "LH Freestanding PoH",                                      RHT_LH_FREESTANDING_POH,                                         RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,                 true);
-    locationTable[RC_LH_DEKU_SCRUB_GROTTO_LEFT] =                               Location::GrottoScrub(RC_LH_DEKU_SCRUB_GROTTO_LEFT,                                    RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LAKE_HYLIA,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x00, 0xEF),                      0x30, "Deku Scrub Grotto Left",                      "LH Deku Scrub Grotto Left",                                RHT_LH_DEKU_SCRUB_GROTTO_LEFT,                                   RG_BUY_DEKU_NUTS_5,                   { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LH_DEKU_SCRUB_GROTTO_LEFT),                                   SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_DEKU_SCRUB_GROTTO_RIGHT] =                              Location::GrottoScrub(RC_LH_DEKU_SCRUB_GROTTO_RIGHT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LAKE_HYLIA,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x05, 0xEF),                      0x37, "Deku Scrub Grotto Right",                     "LH Deku Scrub Grotto Right",                               RHT_LH_DEKU_SCRUB_GROTTO_RIGHT,                                  RG_BUY_BOMBS_535,                     { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LH_DEKU_SCRUB_GROTTO_RIGHT),                                  SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_DEKU_SCRUB_GROTTO_CENTER] =                             Location::GrottoScrub(RC_LH_DEKU_SCRUB_GROTTO_CENTER,                                  RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LAKE_HYLIA,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x03, 0xEF),                      0x33, "Deku Scrub Grotto Center",                    "LH Deku Scrub Grotto Center",                              RHT_LH_DEKU_SCRUB_GROTTO_CENTER,                                 RG_BUY_DEKU_SEEDS_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LH_DEKU_SCRUB_GROTTO_CENTER),                                 SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISHING] =                                               Location::Base(RC_LH_CHILD_FISHING,                                             RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LAKE_HYLIA,                   ACTOR_ID_MAX,         SCENE_FISHING_POND,                 0x00,                                              0x3E, "Child Fishing",                               RHT_LH_CHILD_FISHING,                                            RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_CHILD_FISHING),                                                                SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,                 true);
+    locationTable[RC_LH_ADULT_FISHING] =                                               Location::Base(RC_LH_ADULT_FISHING,                                             RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LAKE_HYLIA,                   ACTOR_ID_MAX,         SCENE_FISHING_POND,                 0x00,                                              0x38, "Adult Fishing",                               RHT_LH_ADULT_FISHING,                                            RG_PROGRESSIVE_SCALE,                 {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ADULT_FISHING),                                                                SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,                 true);
+    locationTable[RC_LH_LAB_DIVE] =                                                    Location::Base(RC_LH_LAB_DIVE,                                                  RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LAKE_HYLIA,                   ACTOR_ID_MAX,         SCENE_LAKESIDE_LABORATORY,          0x00,                                              0x3E, "Lab Dive",                                    RHT_LH_LAB_DIVE,                                                 RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::ItemGetInf(16),                                                                                       SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,                 true);
+    locationTable[RC_LH_TRADE_FROG] =                                                  Location::Base(RC_LH_TRADE_FROG,                                                RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_LAKE_HYLIA,                   ACTOR_ID_MAX,         SCENE_LAKESIDE_LABORATORY,          0x00,                                              0x25, "Lab Trade Eyeball Frog",                      RHT_LH_TRADE_FROG,                                               RG_EYEDROPS,                          { Category::cAdultTrade },                              SpoilerCollectionCheck::RandomizerInf(RAND_INF_ADULT_TRADES_LH_TRADE_FROG),                                                   SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,                 true);
+    locationTable[RC_LH_UNDERWATER_ITEM] =                                             Location::Base(RC_LH_UNDERWATER_ITEM,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LAKE_HYLIA,                   ACTOR_ID_MAX,         SCENE_LAKE_HYLIA,                   0x00,                                              0x15, "Underwater Item",                             RHT_LH_UNDERWATER_ITEM,                                          RG_RUTOS_LETTER,                      {},                                                     SpoilerCollectionCheck::EventChkInf(0x31),                                                                                    SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,                 true);
+    locationTable[RC_LH_SUN] =                                                         Location::Base(RC_LH_SUN,                                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LAKE_HYLIA,                   ACTOR_ID_MAX,         SCENE_LAKE_HYLIA,                   0x00,                                              0x58, "Sun",                                         RHT_LH_SUN,                                                      RG_FIRE_ARROWS,                       {},                                                     SpoilerCollectionCheck::Chest(0x57, 0x1F),                                                                                    SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,                 true);
+    locationTable[RC_LH_FREESTANDING_POH] =                                     Location::Collectable(RC_LH_FREESTANDING_POH,                                          RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LAKE_HYLIA,                   ACTOR_EN_ITEM00,      SCENE_LAKE_HYLIA,                   7686,                                              0x1E, "Freestanding PoH",                            RHT_LH_FREESTANDING_POH,                                         RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,                 true);
+    locationTable[RC_LH_DEKU_SCRUB_GROTTO_LEFT] =                               Location::GrottoScrub(RC_LH_DEKU_SCRUB_GROTTO_LEFT,                                    RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LAKE_HYLIA,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x00, 0xEF),                      0x30, "Deku Scrub Grotto Left",                      RHT_LH_DEKU_SCRUB_GROTTO_LEFT,                                   RG_BUY_DEKU_NUTS_5,                   { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LH_DEKU_SCRUB_GROTTO_LEFT),                                   SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_DEKU_SCRUB_GROTTO_RIGHT] =                              Location::GrottoScrub(RC_LH_DEKU_SCRUB_GROTTO_RIGHT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LAKE_HYLIA,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x05, 0xEF),                      0x37, "Deku Scrub Grotto Right",                     RHT_LH_DEKU_SCRUB_GROTTO_RIGHT,                                  RG_BUY_BOMBS_535,                     { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LH_DEKU_SCRUB_GROTTO_RIGHT),                                  SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_DEKU_SCRUB_GROTTO_CENTER] =                             Location::GrottoScrub(RC_LH_DEKU_SCRUB_GROTTO_CENTER,                                  RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LAKE_HYLIA,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x03, 0xEF),                      0x33, "Deku Scrub Grotto Center",                    RHT_LH_DEKU_SCRUB_GROTTO_CENTER,                                 RG_BUY_DEKU_SEEDS_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LH_DEKU_SCRUB_GROTTO_CENTER),                                 SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
     // Gerudo Valley
-    locationTable[RC_GV_CHEST] =                                                      Location::Chest(RC_GV_CHEST,                                                     RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GERUDO_VALLEY,                ACTOR_EN_BOX,         SCENE_GERUDO_VALLEY,                23200,                                             0x00, "Chest",                                       "GV Chest",                                                 RHT_GV_CHEST,                                                    RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[RC_GV_TRADE_SAW] =                                                   Location::Base(RC_GV_TRADE_SAW,                                                 RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_GERUDO_VALLEY,                ACTOR_ID_MAX,         SCENE_GERUDO_VALLEY,                0x00,                                              0x22, "Trade Saw",                                   "GV Trade Saw",                                             RHT_GV_TRADE_SAW,                                                RG_BROKEN_SWORD,                      { Category::cAdultTrade },                              SpoilerCollectionCheck::RandomizerInf(RAND_INF_ADULT_TRADES_GV_TRADE_SAW),                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
-    locationTable[RC_GV_WATERFALL_FREESTANDING_POH] =                           Location::Collectable(RC_GV_WATERFALL_FREESTANDING_POH,                                RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GERUDO_VALLEY,                ACTOR_EN_ITEM00,      SCENE_GERUDO_VALLEY,                262,                                               0x01, "Waterfall Freestanding PoH",                  "GV Waterfall Freestanding PoH",                            RHT_GV_WATERFALL_FREESTANDING_POH,                               RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
-    locationTable[RC_GV_CRATE_FREESTANDING_POH] =                               Location::Collectable(RC_GV_CRATE_FREESTANDING_POH,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GERUDO_VALLEY,                ACTOR_EN_ITEM00,      SCENE_GERUDO_VALLEY,                518,                                               0x02, "Crate Freestanding PoH",                      "GV Crate Freestanding PoH",                                RHT_GV_CRATE_FREESTANDING_POH,                                   RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
-    locationTable[RC_GV_DEKU_SCRUB_GROTTO_REAR] =                               Location::GrottoScrub(RC_GV_DEKU_SCRUB_GROTTO_REAR,                                    RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_GERUDO_VALLEY,                ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x07, 0xF0),                      0x39, "Deku Scrub Grotto Rear",                      "GV Deku Scrub Grotto Rear",                                RHT_GV_DEKU_SCRUB_GROTTO_FRONT,                                  RG_BUY_GREEN_POTION,                  { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GV_DEKU_SCRUB_GROTTO_REAR),                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[RC_GV_DEKU_SCRUB_GROTTO_FRONT] =                              Location::GrottoScrub(RC_GV_DEKU_SCRUB_GROTTO_FRONT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_GERUDO_VALLEY,                ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x08, 0xF0),                      0x3A, "Deku Scrub Grotto Front",                     "GV Deku Scrub Grotto Front",                               RHT_GV_DEKU_SCRUB_GROTTO_FRONT,                                  RG_BUY_GREEN_POTION,                  { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GV_DEKU_SCRUB_GROTTO_FRONT),                                  SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_GV_CHEST] =                                                      Location::Chest(RC_GV_CHEST,                                                     RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GERUDO_VALLEY,                ACTOR_EN_BOX,         SCENE_GERUDO_VALLEY,                23200,                                             0x00, "Chest",                                       RHT_GV_CHEST,                                                    RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_GV_TRADE_SAW] =                                                   Location::Base(RC_GV_TRADE_SAW,                                                 RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_GERUDO_VALLEY,                ACTOR_ID_MAX,         SCENE_GERUDO_VALLEY,                0x00,                                              0x22, "Trade Saw",                                   RHT_GV_TRADE_SAW,                                                RG_BROKEN_SWORD,                      { Category::cAdultTrade },                              SpoilerCollectionCheck::RandomizerInf(RAND_INF_ADULT_TRADES_GV_TRADE_SAW),                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
+    locationTable[RC_GV_WATERFALL_FREESTANDING_POH] =                           Location::Collectable(RC_GV_WATERFALL_FREESTANDING_POH,                                RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GERUDO_VALLEY,                ACTOR_EN_ITEM00,      SCENE_GERUDO_VALLEY,                262,                                               0x01, "Waterfall Freestanding PoH",                  RHT_GV_WATERFALL_FREESTANDING_POH,                               RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
+    locationTable[RC_GV_CRATE_FREESTANDING_POH] =                               Location::Collectable(RC_GV_CRATE_FREESTANDING_POH,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GERUDO_VALLEY,                ACTOR_EN_ITEM00,      SCENE_GERUDO_VALLEY,                518,                                               0x02, "Crate Freestanding PoH",                      RHT_GV_CRATE_FREESTANDING_POH,                                   RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
+    locationTable[RC_GV_DEKU_SCRUB_GROTTO_REAR] =                               Location::GrottoScrub(RC_GV_DEKU_SCRUB_GROTTO_REAR,                                    RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_GERUDO_VALLEY,                ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x07, 0xF0),                      0x39, "Deku Scrub Grotto Rear",                      RHT_GV_DEKU_SCRUB_GROTTO_FRONT,                                  RG_BUY_GREEN_POTION,                  { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GV_DEKU_SCRUB_GROTTO_REAR),                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_GV_DEKU_SCRUB_GROTTO_FRONT] =                              Location::GrottoScrub(RC_GV_DEKU_SCRUB_GROTTO_FRONT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_GERUDO_VALLEY,                ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x08, 0xF0),                      0x3A, "Deku Scrub Grotto Front",                     RHT_GV_DEKU_SCRUB_GROTTO_FRONT,                                  RG_BUY_GREEN_POTION,                  { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GV_DEKU_SCRUB_GROTTO_FRONT),                                  SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
     // Gerudo Fortress
-    locationTable[RC_GF_CHEST] =                                                      Location::Chest(RC_GF_CHEST,                                                     RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GERUDO_FORTRESS,              ACTOR_EN_BOX,         SCENE_GERUDOS_FORTRESS,             1984,                                              0x00, "Chest",                                       "GF Chest",                                                 RHT_GF_CHEST,                                                    RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
-    locationTable[RC_GF_HBA_1000_POINTS] =                                             Location::Base(RC_GF_HBA_1000_POINTS,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GERUDO_FORTRESS,              ACTOR_ID_MAX,         SCENE_GERUDOS_FORTRESS,             0x00,                                              0x3E, "GF HBA 1000 Points",                          "GF HBA 1000 Points",                                       RHT_GF_HBA_1000_POINTS,                                          RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::InfTable(INFTABLE_190),                                                                               SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
-    locationTable[RC_GF_HBA_1500_POINTS] =                                             Location::Base(RC_GF_HBA_1500_POINTS,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GERUDO_FORTRESS,              ACTOR_ID_MAX,         SCENE_GERUDOS_FORTRESS,             0x00,                                              0x30, "GF HBA 1500 Points",                          "GF HBA 1500 Points",                                       RHT_GF_HBA_1500_POINTS,                                          RG_PROGRESSIVE_BOW,                   {},                                                     SpoilerCollectionCheck::ItemGetInf(15),                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
+    locationTable[RC_GF_CHEST] =                                                      Location::Chest(RC_GF_CHEST,                                                     RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GERUDO_FORTRESS,              ACTOR_EN_BOX,         SCENE_GERUDOS_FORTRESS,             1984,                                              0x00, "Chest",                                       RHT_GF_CHEST,                                                    RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
+    locationTable[RC_GF_HBA_1000_POINTS] =                                             Location::Base(RC_GF_HBA_1000_POINTS,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GERUDO_FORTRESS,              ACTOR_ID_MAX,         SCENE_GERUDOS_FORTRESS,             0x00,                                              0x3E, "GF HBA 1000 Points",                          RHT_GF_HBA_1000_POINTS,                                          RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::InfTable(INFTABLE_190),                                                                               SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
+    locationTable[RC_GF_HBA_1500_POINTS] =                                             Location::Base(RC_GF_HBA_1500_POINTS,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GERUDO_FORTRESS,              ACTOR_ID_MAX,         SCENE_GERUDOS_FORTRESS,             0x00,                                              0x30, "GF HBA 1500 Points",                          RHT_GF_HBA_1500_POINTS,                                          RG_PROGRESSIVE_BOW,                   {},                                                     SpoilerCollectionCheck::ItemGetInf(15),                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
     // RandoTodo: Do we replace these with the RC_HIDEOUT keys or keep these?
-    locationTable[RC_GF_GERUDO_MEMBERSHIP_CARD] =                                      Location::Base(RC_GF_GERUDO_MEMBERSHIP_CARD,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GERUDO_FORTRESS,              ACTOR_ID_MAX,         SCENE_THIEVES_HIDEOUT,              0x00,                                              0x3A, "GF Gerudo Membership Card",                   "GF Gerudo Membership Card",                                RHT_GF_GERUDO_MEMBERSHIP_CARD,                                   RG_GERUDO_MEMBERSHIP_CARD,            {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_ITEM_FROM_LEADER_OF_FORTRESS),                                              SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
-    locationTable[RC_GF_NORTH_F1_CARPENTER] =                                   Location::Collectable(RC_GF_NORTH_F1_CARPENTER,                                        RCQUEST_BOTH,    RCTYPE_GF_KEY,                      RCAREA_GERUDO_FORTRESS,              ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,              3089,                                              0x0C, "GF North F1 Carpenter",                       "GF North F1 Carpenter",                                    RHT_GF_NORTH_F1_CARPENTER,                                       RG_GERUDO_FORTRESS_SMALL_KEY,         { Category::cVanillaGFSmallKey },                                                                                                                                                     SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
-    locationTable[RC_GF_NORTH_F2_CARPENTER] =                                   Location::Collectable(RC_GF_NORTH_F2_CARPENTER,                                        RCQUEST_BOTH,    RCTYPE_GF_KEY,                      RCAREA_GERUDO_FORTRESS,              ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,              2577,                                              0x0A, "GF North F2 Carpenter",                       "GF North F2 Carpenter",                                    RHT_GF_NORTH_F2_CARPENTER,                                       RG_GERUDO_FORTRESS_SMALL_KEY,         { Category::cVanillaGFSmallKey },                                                                                                                                                     SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
-    locationTable[RC_GF_SOUTH_F1_CARPENTER] =                                   Location::Collectable(RC_GF_SOUTH_F1_CARPENTER,                                        RCQUEST_BOTH,    RCTYPE_GF_KEY,                      RCAREA_GERUDO_FORTRESS,              ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,              3601,                                              0x0E, "GF South F1 Carpenter",                       "GF South F1 Carpenter",                                    RHT_GF_SOUTH_F1_CARPENTER,                                       RG_GERUDO_FORTRESS_SMALL_KEY,         { Category::cVanillaGFSmallKey },                                                                                                                                                     SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
-    locationTable[RC_GF_SOUTH_F2_CARPENTER] =                                   Location::Collectable(RC_GF_SOUTH_F2_CARPENTER,                                        RCQUEST_BOTH,    RCTYPE_GF_KEY,                      RCAREA_GERUDO_FORTRESS,              ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,              3857,                                              0x0F, "GF South F2 Carpenter",                       "GF South F2 Carpenter",                                    RHT_GF_SOUTH_F2_CARPENTER,                                       RG_GERUDO_FORTRESS_SMALL_KEY,         { Category::cVanillaGFSmallKey },                                                                                                                                                     SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
+    locationTable[RC_GF_GERUDO_MEMBERSHIP_CARD] =                                      Location::Base(RC_GF_GERUDO_MEMBERSHIP_CARD,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GERUDO_FORTRESS,              ACTOR_ID_MAX,         SCENE_THIEVES_HIDEOUT,              0x00,                                              0x3A, "GF Gerudo Membership Card",                   RHT_GF_GERUDO_MEMBERSHIP_CARD,                                   RG_GERUDO_MEMBERSHIP_CARD,            {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_ITEM_FROM_LEADER_OF_FORTRESS),                                              SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
+    locationTable[RC_GF_NORTH_F1_CARPENTER] =                                   Location::Collectable(RC_GF_NORTH_F1_CARPENTER,                                        RCQUEST_BOTH,    RCTYPE_GF_KEY,                      RCAREA_GERUDO_FORTRESS,              ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,              3089,                                              0x0C, "GF North F1 Carpenter",                       RHT_GF_NORTH_F1_CARPENTER,                                       RG_GERUDO_FORTRESS_SMALL_KEY,         { Category::cVanillaGFSmallKey },                                                                                                                                                     SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
+    locationTable[RC_GF_NORTH_F2_CARPENTER] =                                   Location::Collectable(RC_GF_NORTH_F2_CARPENTER,                                        RCQUEST_BOTH,    RCTYPE_GF_KEY,                      RCAREA_GERUDO_FORTRESS,              ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,              2577,                                              0x0A, "GF North F2 Carpenter",                       RHT_GF_NORTH_F2_CARPENTER,                                       RG_GERUDO_FORTRESS_SMALL_KEY,         { Category::cVanillaGFSmallKey },                                                                                                                                                     SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
+    locationTable[RC_GF_SOUTH_F1_CARPENTER] =                                   Location::Collectable(RC_GF_SOUTH_F1_CARPENTER,                                        RCQUEST_BOTH,    RCTYPE_GF_KEY,                      RCAREA_GERUDO_FORTRESS,              ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,              3601,                                              0x0E, "GF South F1 Carpenter",                       RHT_GF_SOUTH_F1_CARPENTER,                                       RG_GERUDO_FORTRESS_SMALL_KEY,         { Category::cVanillaGFSmallKey },                                                                                                                                                     SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
+    locationTable[RC_GF_SOUTH_F2_CARPENTER] =                                   Location::Collectable(RC_GF_SOUTH_F2_CARPENTER,                                        RCQUEST_BOTH,    RCTYPE_GF_KEY,                      RCAREA_GERUDO_FORTRESS,              ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,              3857,                                              0x0F, "GF South F2 Carpenter",                       RHT_GF_SOUTH_F2_CARPENTER,                                       RG_GERUDO_FORTRESS_SMALL_KEY,         { Category::cVanillaGFSmallKey },                                                                                                                                                     SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
     // Haunted Wasteland
-    locationTable[RC_WASTELAND_CHEST] =                                               Location::Chest(RC_WASTELAND_CHEST,                                              RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_WASTELAND,                    ACTOR_EN_BOX,         SCENE_HAUNTED_WASTELAND,            -30048,                                            0x00, "Chest",                                       "Wasteland Chest",                                          RHT_WASTELAND_CHEST,                                             RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[RC_WASTELAND_BOMBCHU_SALESMAN] =                                     Location::Base(RC_WASTELAND_BOMBCHU_SALESMAN,                                   RCQUEST_BOTH,    RCTYPE_MERCHANT,                    RCAREA_WASTELAND,                    ACTOR_ID_MAX,         SCENE_HAUNTED_WASTELAND,            0x00,                                              0x03, "Carpet Salesman",                             "Wasteland Carpet Salesman",                                RHT_WASTELAND_BOMBCHU_SALESMAN,                                  RG_BOMBCHU_10,                        { Category::cMerchant },                                SpoilerCollectionCheck::RandomizerInf(RAND_INF_MERCHANTS_CARPET_SALESMAN),                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_WASTELAND_CHEST] =                                               Location::Chest(RC_WASTELAND_CHEST,                                              RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_WASTELAND,                    ACTOR_EN_BOX,         SCENE_HAUNTED_WASTELAND,            -30048,                                            0x00, "Chest",                                       RHT_WASTELAND_CHEST,                                             RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_WASTELAND_BOMBCHU_SALESMAN] =                                     Location::Base(RC_WASTELAND_BOMBCHU_SALESMAN,                                   RCQUEST_BOTH,    RCTYPE_MERCHANT,                    RCAREA_WASTELAND,                    ACTOR_ID_MAX,         SCENE_HAUNTED_WASTELAND,            0x00,                                              0x03, "Carpet Salesman",                             RHT_WASTELAND_BOMBCHU_SALESMAN,                                  RG_BOMBCHU_10,                        { Category::cMerchant },                                SpoilerCollectionCheck::RandomizerInf(RAND_INF_MERCHANTS_CARPET_SALESMAN),                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
     // Desert Colossus
-    locationTable[RC_COLOSSUS_FREESTANDING_POH] =                               Location::Collectable(RC_COLOSSUS_FREESTANDING_POH,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DESERT_COLOSSUS,              ACTOR_EN_ITEM00,      SCENE_DESERT_COLOSSUS,              3334,                                              0x0D, "Freestanding PoH",                            "Colossus Freestanding PoH",                                RHT_COLOSSUS_FREESTANDING_POH,                                   RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
-    locationTable[RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR] =                         Location::GrottoScrub(RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,                              RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_DESERT_COLOSSUS,              ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x07, 0xFD),                      0x39, "Deku Scrub Grotto Rear",                      "Colossus Deku Scrub Grotto Rear",                          RHT_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,                             RG_BUY_RED_POTION_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_COLOSSUS_DEKU_SCRUB_GROTTO_REAR),                             SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT] =                        Location::GrottoScrub(RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT,                             RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_DESERT_COLOSSUS,              ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x08, 0xFD),                      0x3A, "Deku Scrub Grotto Front",                     "Colossus Deku Scrub Grotto Front",                         RHT_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT,                            RG_BUY_GREEN_POTION,                  { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT),                            SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_COLOSSUS_FREESTANDING_POH] =                               Location::Collectable(RC_COLOSSUS_FREESTANDING_POH,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DESERT_COLOSSUS,              ACTOR_EN_ITEM00,      SCENE_DESERT_COLOSSUS,              3334,                                              0x0D, "Freestanding PoH",                            RHT_COLOSSUS_FREESTANDING_POH,                                   RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
+    locationTable[RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR] =                         Location::GrottoScrub(RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,                              RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_DESERT_COLOSSUS,              ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x07, 0xFD),                      0x39, "Deku Scrub Grotto Rear",                      RHT_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,                             RG_BUY_RED_POTION_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_COLOSSUS_DEKU_SCRUB_GROTTO_REAR),                             SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT] =                        Location::GrottoScrub(RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT,                             RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_DESERT_COLOSSUS,              ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x08, 0xFD),                      0x3A, "Deku Scrub Grotto Front",                     RHT_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT,                            RG_BUY_GREEN_POTION,                  { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT),                            SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
     // Market
-    locationTable[RC_MARKET_TREASURE_CHEST_GAME_REWARD] =                             Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_REWARD,                            RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0x0A, "Treasure Chest Game Reward",                  "MK Treasure Chest Game Reward",                            RHT_MARKET_TREASURE_CHEST_GAME_REWARD,                           RG_TREASURE_GAME_HEART,               {},                                                     SpoilerCollectionCheck::ItemGetInf(27),                                                                                       SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
-    locationTable[RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE] =                             Location::Base(RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_BOMBCHU_BOWLING_ALLEY,        0x00,                                              0x33, "Bombchu Bowling First Prize",                 "MK Bombchu Bowling First Prize",                           RHT_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,                          RG_PROGRESSIVE_BOMB_BAG,              {},                                                     SpoilerCollectionCheck::ItemGetInf(17),                                                                                       SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
-    locationTable[RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE] =                            Location::Base(RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE,                          RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_BOMBCHU_BOWLING_ALLEY,        0x00,                                              0x3E, "Bombchu Bowling Second Prize",                "MK Bombchu Bowling Second Prize",                          RHT_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE,                         RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::ItemGetInf(18),                                                                                       SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
-    locationTable[RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS] =                                Location::Base(RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS,                              RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_BOMBCHU_BOWLING_ALLEY,        0x00,                                              0x00, "Bombchu Bowling Bombchus",                    "MK Bombchu Bowling Bombchus",                              RHT_MARKET_BOMBCHU_BOWLING_BOMBCHUS,                             RG_BOMBCHU_DROP,                      {},                                                     SpoilerCollectionCheck::None(),                                                                                               SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_LOST_DOG] =                                                Location::Base(RC_MARKET_LOST_DOG,                                              RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_DOG_LADY_HOUSE,               0x00,                                              0x3E, "Lost Dog",                                    "MK Lost Dog",                                              RHT_MARKET_LOST_DOG,                                             RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::InfTable(INFTABLE_191),                                                                               SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
-    locationTable[RC_MARKET_SHOOTING_GALLERY_REWARD] =                                 Location::Base(RC_MARKET_SHOOTING_GALLERY_REWARD,                               RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_SHOOTING_GALLERY,             0x00,                                              0x60, "Shooting Gallery",                            "MK Shooting Gallery",                                      RHT_MARKET_SHOOTING_GALLERY_REWARD,                              RG_PROGRESSIVE_SLINGSHOT,             {},                                                     SpoilerCollectionCheck::ItemGetInf(ITEMGETINF_0D),                                                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
-    locationTable[RC_MARKET_10_BIG_POES] =                                             Location::Base(RC_MARKET_10_BIG_POES,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_MARKET_GUARD_HOUSE,           0x00,                                              0x0F, "10 Big Poes",                                 "MK 10 Big Poes",                                           RHT_MARKET_10_BIG_POES,                                          RG_EMPTY_BOTTLE,                      {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_10_BIG_POES),                                                                  SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
-    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_1] =                             Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_1,                            RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0xFF, "Chest Game First Room Item",                  "MK Chest Game First Room Item",                            RHT_MARKET_TREASURE_CHEST_GAME_ITEM_1,                           RG_GREEN_RUPEE,                       { Category::cChestMinigame },                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_1),                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_2] =                             Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_2,                            RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0xFF, "Chest Game Second Room Item",                 "MK Chest Game Second Room Item",                           RHT_MARKET_TREASURE_CHEST_GAME_ITEM_2,                           RG_GREEN_RUPEE,                       { Category::cChestMinigame },                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_2),                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_3] =                             Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_3,                            RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0xFF, "Chest Game Third Room Item",                  "MK Chest Game Third Room Item",                            RHT_MARKET_TREASURE_CHEST_GAME_ITEM_3,                           RG_BLUE_RUPEE,                        { Category::cChestMinigame },                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_3),                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_4] =                             Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_4,                            RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0xFF, "Chest Game Fourth Room Item",                 "MK Chest Game Fourth Room Item",                           RHT_MARKET_TREASURE_CHEST_GAME_ITEM_4,                           RG_BLUE_RUPEE,                        { Category::cChestMinigame },                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_4),                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_5] =                             Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_5,                            RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0xFF, "Chest Game Fifth Room Item",                  "MK Chest Game Fifth Room Item",                            RHT_MARKET_TREASURE_CHEST_GAME_ITEM_5,                           RG_RED_RUPEE,                         { Category::cChestMinigame },                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_5),                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_TREASURE_CHEST_GAME_KEY_1] =                              Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_KEY_1,                             RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0xFF, "Chest Game First Room Key",                   "MK Chest Game First Room Key",                             RHT_MARKET_TREASURE_CHEST_GAME_KEY_1,                            RG_TREASURE_GAME_SMALL_KEY,           { Category::cChestMinigame },                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_1),                                             SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_TREASURE_CHEST_GAME_KEY_2] =                              Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_KEY_2,                             RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0xFF, "Chest Game Second Room Key",                  "MK Chest Game Second Room Key",                            RHT_MARKET_TREASURE_CHEST_GAME_KEY_2,                            RG_TREASURE_GAME_SMALL_KEY,           { Category::cChestMinigame },                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_2),                                             SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_TREASURE_CHEST_GAME_KEY_3] =                              Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_KEY_3,                             RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0xFF, "Chest Game Third Room Key",                   "MK Chest Game Third Room Key",                             RHT_MARKET_TREASURE_CHEST_GAME_KEY_3,                            RG_TREASURE_GAME_SMALL_KEY,           { Category::cChestMinigame },                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_3),                                             SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_TREASURE_CHEST_GAME_KEY_4] =                              Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_KEY_4,                             RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0xFF, "Chest Game Fourth Room Key",                  "MK Chest Game Fourth Room Key",                            RHT_MARKET_TREASURE_CHEST_GAME_KEY_4,                            RG_TREASURE_GAME_SMALL_KEY,           { Category::cChestMinigame },                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_4),                                             SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_TREASURE_CHEST_GAME_KEY_5] =                              Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_KEY_5,                             RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0xFF, "Chest Game Fifth Room Key",                   "MK Chest Game Fifth Room Key",                             RHT_MARKET_TREASURE_CHEST_GAME_KEY_5,                            RG_TREASURE_GAME_SMALL_KEY,           { Category::cChestMinigame },                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_5),                                             SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_REWARD] =                             Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_REWARD,                            RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0x0A, "Treasure Chest Game Reward",                  RHT_MARKET_TREASURE_CHEST_GAME_REWARD,                           RG_TREASURE_GAME_HEART,               {},                                                     SpoilerCollectionCheck::ItemGetInf(27),                                                                                       SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
+    locationTable[RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE] =                             Location::Base(RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_BOMBCHU_BOWLING_ALLEY,        0x00,                                              0x33, "Bombchu Bowling First Prize",                 RHT_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,                          RG_PROGRESSIVE_BOMB_BAG,              {},                                                     SpoilerCollectionCheck::ItemGetInf(17),                                                                                       SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
+    locationTable[RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE] =                            Location::Base(RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE,                          RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_BOMBCHU_BOWLING_ALLEY,        0x00,                                              0x3E, "Bombchu Bowling Second Prize",                RHT_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE,                         RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::ItemGetInf(18),                                                                                       SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
+    locationTable[RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS] =                                Location::Base(RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS,                              RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_BOMBCHU_BOWLING_ALLEY,        0x00,                                              0x00, "Bombchu Bowling Bombchus",                    RHT_MARKET_BOMBCHU_BOWLING_BOMBCHUS,                             RG_BOMBCHU_DROP,                      {},                                                     SpoilerCollectionCheck::None(),                                                                                               SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_LOST_DOG] =                                                Location::Base(RC_MARKET_LOST_DOG,                                              RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_DOG_LADY_HOUSE,               0x00,                                              0x3E, "Lost Dog",                                    RHT_MARKET_LOST_DOG,                                             RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::InfTable(INFTABLE_191),                                                                               SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
+    locationTable[RC_MARKET_SHOOTING_GALLERY_REWARD] =                                 Location::Base(RC_MARKET_SHOOTING_GALLERY_REWARD,                               RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_SHOOTING_GALLERY,             0x00,                                              0x60, "Shooting Gallery",                            RHT_MARKET_SHOOTING_GALLERY_REWARD,                              RG_PROGRESSIVE_SLINGSHOT,             {},                                                     SpoilerCollectionCheck::ItemGetInf(ITEMGETINF_0D),                                                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
+    locationTable[RC_MARKET_10_BIG_POES] =                                             Location::Base(RC_MARKET_10_BIG_POES,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_MARKET_GUARD_HOUSE,           0x00,                                              0x0F, "10 Big Poes",                                 RHT_MARKET_10_BIG_POES,                                          RG_EMPTY_BOTTLE,                      {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_10_BIG_POES),                                                                  SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_1] =                             Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_1,                            RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0xFF, "Chest Game First Room Item",                  RHT_MARKET_TREASURE_CHEST_GAME_ITEM_1,                           RG_GREEN_RUPEE,                       { Category::cChestMinigame },                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_1),                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_2] =                             Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_2,                            RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0xFF, "Chest Game Second Room Item",                 RHT_MARKET_TREASURE_CHEST_GAME_ITEM_2,                           RG_GREEN_RUPEE,                       { Category::cChestMinigame },                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_2),                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_3] =                             Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_3,                            RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0xFF, "Chest Game Third Room Item",                  RHT_MARKET_TREASURE_CHEST_GAME_ITEM_3,                           RG_BLUE_RUPEE,                        { Category::cChestMinigame },                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_3),                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_4] =                             Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_4,                            RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0xFF, "Chest Game Fourth Room Item",                 RHT_MARKET_TREASURE_CHEST_GAME_ITEM_4,                           RG_BLUE_RUPEE,                        { Category::cChestMinigame },                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_4),                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_5] =                             Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_5,                            RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0xFF, "Chest Game Fifth Room Item",                  RHT_MARKET_TREASURE_CHEST_GAME_ITEM_5,                           RG_RED_RUPEE,                         { Category::cChestMinigame },                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_5),                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_KEY_1] =                              Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_KEY_1,                             RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0xFF, "Chest Game First Room Key",                   RHT_MARKET_TREASURE_CHEST_GAME_KEY_1,                            RG_TREASURE_GAME_SMALL_KEY,           { Category::cChestMinigame },                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_1),                                             SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_KEY_2] =                              Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_KEY_2,                             RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0xFF, "Chest Game Second Room Key",                  RHT_MARKET_TREASURE_CHEST_GAME_KEY_2,                            RG_TREASURE_GAME_SMALL_KEY,           { Category::cChestMinigame },                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_2),                                             SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_KEY_3] =                              Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_KEY_3,                             RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0xFF, "Chest Game Third Room Key",                   RHT_MARKET_TREASURE_CHEST_GAME_KEY_3,                            RG_TREASURE_GAME_SMALL_KEY,           { Category::cChestMinigame },                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_3),                                             SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_KEY_4] =                              Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_KEY_4,                             RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0xFF, "Chest Game Fourth Room Key",                  RHT_MARKET_TREASURE_CHEST_GAME_KEY_4,                            RG_TREASURE_GAME_SMALL_KEY,           { Category::cChestMinigame },                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_4),                                             SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_KEY_5] =                              Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_KEY_5,                             RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0xFF, "Chest Game Fifth Room Key",                   RHT_MARKET_TREASURE_CHEST_GAME_KEY_5,                            RG_TREASURE_GAME_SMALL_KEY,           { Category::cChestMinigame },                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_5),                                             SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
     // Hyrule Castle
-    locationTable[RC_HC_MALON_EGG] =                                                   Location::Base(RC_HC_MALON_EGG,                                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_CASTLE,                ACTOR_ID_MAX,         SCENE_HYRULE_CASTLE,                0x00,                                              0x47, "Malon Egg",                                   "HC Malon Egg",                                             RHT_HC_MALON_EGG,                                                RG_WEIRD_EGG,                         {},                                                     SpoilerCollectionCheck::EventChkInf(0x12),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
-    locationTable[RC_HC_ZELDAS_LETTER] =                                               Location::Base(RC_HC_ZELDAS_LETTER,                                             RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_CASTLE,                ACTOR_ID_MAX,         SCENE_CASTLE_COURTYARD_ZELDA,       0x00,                                              0x0B, "Zeldas Letter",                               "HC Zeldas Letter",                                         RHT_HC_ZELDAS_LETTER,                                            RG_ZELDAS_LETTER,                     {},                                                     SpoilerCollectionCheck::EventChkInf(0x40),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
+    locationTable[RC_HC_MALON_EGG] =                                                   Location::Base(RC_HC_MALON_EGG,                                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_CASTLE,                ACTOR_ID_MAX,         SCENE_HYRULE_CASTLE,                0x00,                                              0x47, "Malon Egg",                                   RHT_HC_MALON_EGG,                                                RG_WEIRD_EGG,                         {},                                                     SpoilerCollectionCheck::EventChkInf(0x12),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
+    locationTable[RC_HC_ZELDAS_LETTER] =                                               Location::Base(RC_HC_ZELDAS_LETTER,                                             RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_CASTLE,                ACTOR_ID_MAX,         SCENE_CASTLE_COURTYARD_ZELDA,       0x00,                                              0x0B, "Zeldas Letter",                               RHT_HC_ZELDAS_LETTER,                                            RG_ZELDAS_LETTER,                     {},                                                     SpoilerCollectionCheck::EventChkInf(0x40),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
     // Kakariko
-    locationTable[RC_KAK_REDEAD_GROTTO_CHEST] =                                       Location::Chest(RC_KAK_REDEAD_GROTTO_CHEST,                                      RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_BOX,         SCENE_GROTTOS,                      31434,                                             0x0A, "Redead Grotto Chest",                         "Kak Redead Grotto Chest",                                  RHT_KAK_REDEAD_GROTTO_CHEST,                                     RG_HUGE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_OPEN_GROTTO_CHEST] =                                         Location::Chest(RC_KAK_OPEN_GROTTO_CHEST,                                        RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_BOX,         SCENE_GROTTOS,                      22984,                                             0x08, "Open Grotto Chest",                           "Kak Open Grotto Chest",                                    RHT_KAK_OPEN_GROTTO_CHEST,                                       RG_RED_RUPEE,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_10_GOLD_SKULLTULA_REWARD] =                                   Location::Base(RC_KAK_10_GOLD_SKULLTULA_REWARD,                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_HOUSE_OF_SKULLTULA,           0x00,                                              0x45, "10 Gold Skulltula Reward",                    "Kak 10 Gold Skulltula Reward",                             RHT_KAK_10_GOLD_SKULLTULA_REWARD,                                RG_PROGRESSIVE_WALLET,                {},                                                     SpoilerCollectionCheck::EventChkInf(0xDA),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
-    locationTable[RC_KAK_20_GOLD_SKULLTULA_REWARD] =                                   Location::Base(RC_KAK_20_GOLD_SKULLTULA_REWARD,                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_HOUSE_OF_SKULLTULA,           0x00,                                              0x39, "20 Gold Skulltula Reward",                    "Kak 20 Gold Skulltula Reward",                             RHT_KAK_20_GOLD_SKULLTULA_REWARD,                                RG_STONE_OF_AGONY,                    {},                                                     SpoilerCollectionCheck::EventChkInf(0xDB),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
-    locationTable[RC_KAK_30_GOLD_SKULLTULA_REWARD] =                                   Location::Base(RC_KAK_30_GOLD_SKULLTULA_REWARD,                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_HOUSE_OF_SKULLTULA,           0x00,                                              0x46, "30 Gold Skulltula Reward",                    "Kak 30 Gold Skulltula Reward",                             RHT_KAK_30_GOLD_SKULLTULA_REWARD,                                RG_PROGRESSIVE_WALLET,                {},                                                     SpoilerCollectionCheck::EventChkInf(0xDC),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
-    locationTable[RC_KAK_40_GOLD_SKULLTULA_REWARD] =                                   Location::Base(RC_KAK_40_GOLD_SKULLTULA_REWARD,                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_HOUSE_OF_SKULLTULA,           0x00,                                              0x03, "40 Gold Skulltula Reward",                    "Kak 40 Gold Skulltula Reward",                             RHT_KAK_40_GOLD_SKULLTULA_REWARD,                                RG_BOMBCHU_10,                        {},                                                     SpoilerCollectionCheck::EventChkInf(0xDD),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_50_GOLD_SKULLTULA_REWARD] =                                   Location::Base(RC_KAK_50_GOLD_SKULLTULA_REWARD,                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_HOUSE_OF_SKULLTULA,           0x00,                                              0x3E, "50 Gold Skulltula Reward",                    "Kak 50 Gold Skulltula Reward",                             RHT_KAK_50_GOLD_SKULLTULA_REWARD,                                RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::EventChkInf(0xDE),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
-    locationTable[RC_KAK_100_GOLD_SKULLTULA_REWARD] =                                  Location::Base(RC_KAK_100_GOLD_SKULLTULA_REWARD,                                RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_HOUSE_OF_SKULLTULA,           0x00,                                              0x3E, "100 Gold Skulltula Reward",                   "Kak 100 Gold Skulltula Reward",                            RHT_KAK_100_GOLD_SKULLTULA_REWARD,                               RG_HUGE_RUPEE,                        {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_100_GOLD_SKULLTULA_REWARD),                                                SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_MAN_ON_ROOF] =                                                Location::Base(RC_KAK_MAN_ON_ROOF,                                              RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_KAKARIKO_VILLAGE,             0x00,                                              0x3E, "Man on Roof",                                 "Kak Man on Roof",                                          RHT_KAK_MAN_ON_ROOF,                                             RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::ItemGetInf(21),                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
-    locationTable[RC_KAK_SHOOTING_GALLERY_REWARD] =                                    Location::Base(RC_KAK_SHOOTING_GALLERY_REWARD,                                  RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_SHOOTING_GALLERY,             0x00,                                              0x30, "Shooting Gallery Reward",                     "Kak Shooting Gallery Reward",                              RHT_KAK_SHOOTING_GALLERY_REWARD,                                 RG_PROGRESSIVE_BOW,                   {},                                                     SpoilerCollectionCheck::ItemGetInf(ITEMGETINF_0E),                                                                            SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
-    locationTable[RC_KAK_TRADE_ODD_MUSHROOM] =                                         Location::Base(RC_KAK_TRADE_ODD_MUSHROOM,                                       RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_POTION_SHOP_GRANNY,           0x00,                                              0x20, "Trade Odd Mushroom",                          "Kak Trade Odd Mushroom",                                   RHT_KAK_TRADE_ODD_MUSHROOM,                                      RG_ODD_POTION,                        { Category::cAdultTrade },                              SpoilerCollectionCheck::ItemGetInf(48),                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
-    locationTable[RC_KAK_GRANNYS_SHOP] =                                               Location::Base(RC_KAK_GRANNYS_SHOP,                                             RCQUEST_BOTH,    RCTYPE_MERCHANT,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_POTION_SHOP_GRANNY,           0x00,                                              0x4E, "Granny's Shop",                               "Kak Granny's Shop",                                        RHT_KAK_GRANNYS_SHOP,                                            RG_BUY_BLUE_POTION,                   {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MERCHANTS_GRANNYS_SHOP),                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
-    locationTable[RC_KAK_ANJU_AS_ADULT] =                                              Location::Base(RC_KAK_ANJU_AS_ADULT,                                            RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_KAKARIKO_VILLAGE,             0x00,                                              0x1D, "Anju as Adult",                               "Kak Anju as Adult",                                        RHT_KAK_ANJU_AS_ADULT,                                           RG_CLAIM_CHECK,                       {},                                                     SpoilerCollectionCheck::ItemGetInf(44),                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
-    locationTable[RC_KAK_ANJU_AS_CHILD] =                                              Location::Base(RC_KAK_ANJU_AS_CHILD,                                            RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_KAKARIKO_VILLAGE,             0x00,                                              0x0F, "Anju as Child",                               "Kak Anju as Child",                                        RHT_KAK_ANJU_AS_CHILD,                                           RG_EMPTY_BOTTLE,                      {},                                                     SpoilerCollectionCheck::ItemGetInf(12),                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
-    locationTable[RC_KAK_TRADE_POCKET_CUCCO] =                                         Location::Base(RC_KAK_TRADE_POCKET_CUCCO,                                       RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_KAKARIKO_VILLAGE,             0x00,                                              0x0E, "Trade Pocket Cucco",                          "Kak Trade Pocket Cucco",                                   RHT_KAK_TRADE_POCKET_CUCCO,                                      RG_COJIRO,                            { Category::cAdultTrade },                              SpoilerCollectionCheck::ItemGetInf(46),                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
-    locationTable[RC_KAK_IMPAS_HOUSE_FREESTANDING_POH] =                        Location::Collectable(RC_KAK_IMPAS_HOUSE_FREESTANDING_POH,                             RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_ITEM00,      SCENE_IMPAS_HOUSE,                  262,                                               0x01, "Impas House Freestanding PoH",                "Kak Impas House Freestanding PoH",                         RHT_KAK_IMPAS_HOUSE_FREESTANDING_POH,                            RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
-    locationTable[RC_KAK_WINDMILL_FREESTANDING_POH] =                           Location::Collectable(RC_KAK_WINDMILL_FREESTANDING_POH,                                RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_ITEM00,      SCENE_WINDMILL_AND_DAMPES_GRAVE,    262,                                               0x01, "Windmill Freestanding PoH",                   "Kak Windmill Freestanding PoH",                            RHT_KAK_WINDMILL_FREESTANDING_POH,                               RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
+    locationTable[RC_KAK_REDEAD_GROTTO_CHEST] =                                       Location::Chest(RC_KAK_REDEAD_GROTTO_CHEST,                                      RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_BOX,         SCENE_GROTTOS,                      31434,                                             0x0A, "Redead Grotto Chest",                         RHT_KAK_REDEAD_GROTTO_CHEST,                                     RG_HUGE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_OPEN_GROTTO_CHEST] =                                         Location::Chest(RC_KAK_OPEN_GROTTO_CHEST,                                        RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_BOX,         SCENE_GROTTOS,                      22984,                                             0x08, "Open Grotto Chest",                           RHT_KAK_OPEN_GROTTO_CHEST,                                       RG_RED_RUPEE,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_10_GOLD_SKULLTULA_REWARD] =                                   Location::Base(RC_KAK_10_GOLD_SKULLTULA_REWARD,                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_HOUSE_OF_SKULLTULA,           0x00,                                              0x45, "10 Gold Skulltula Reward",                    RHT_KAK_10_GOLD_SKULLTULA_REWARD,                                RG_PROGRESSIVE_WALLET,                {},                                                     SpoilerCollectionCheck::EventChkInf(0xDA),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
+    locationTable[RC_KAK_20_GOLD_SKULLTULA_REWARD] =                                   Location::Base(RC_KAK_20_GOLD_SKULLTULA_REWARD,                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_HOUSE_OF_SKULLTULA,           0x00,                                              0x39, "20 Gold Skulltula Reward",                    RHT_KAK_20_GOLD_SKULLTULA_REWARD,                                RG_STONE_OF_AGONY,                    {},                                                     SpoilerCollectionCheck::EventChkInf(0xDB),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
+    locationTable[RC_KAK_30_GOLD_SKULLTULA_REWARD] =                                   Location::Base(RC_KAK_30_GOLD_SKULLTULA_REWARD,                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_HOUSE_OF_SKULLTULA,           0x00,                                              0x46, "30 Gold Skulltula Reward",                    RHT_KAK_30_GOLD_SKULLTULA_REWARD,                                RG_PROGRESSIVE_WALLET,                {},                                                     SpoilerCollectionCheck::EventChkInf(0xDC),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
+    locationTable[RC_KAK_40_GOLD_SKULLTULA_REWARD] =                                   Location::Base(RC_KAK_40_GOLD_SKULLTULA_REWARD,                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_HOUSE_OF_SKULLTULA,           0x00,                                              0x03, "40 Gold Skulltula Reward",                    RHT_KAK_40_GOLD_SKULLTULA_REWARD,                                RG_BOMBCHU_10,                        {},                                                     SpoilerCollectionCheck::EventChkInf(0xDD),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_50_GOLD_SKULLTULA_REWARD] =                                   Location::Base(RC_KAK_50_GOLD_SKULLTULA_REWARD,                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_HOUSE_OF_SKULLTULA,           0x00,                                              0x3E, "50 Gold Skulltula Reward",                    RHT_KAK_50_GOLD_SKULLTULA_REWARD,                                RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::EventChkInf(0xDE),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
+    locationTable[RC_KAK_100_GOLD_SKULLTULA_REWARD] =                                  Location::Base(RC_KAK_100_GOLD_SKULLTULA_REWARD,                                RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_HOUSE_OF_SKULLTULA,           0x00,                                              0x3E, "100 Gold Skulltula Reward",                   RHT_KAK_100_GOLD_SKULLTULA_REWARD,                               RG_HUGE_RUPEE,                        {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_100_GOLD_SKULLTULA_REWARD),                                                SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_MAN_ON_ROOF] =                                                Location::Base(RC_KAK_MAN_ON_ROOF,                                              RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_KAKARIKO_VILLAGE,             0x00,                                              0x3E, "Man on Roof",                                 RHT_KAK_MAN_ON_ROOF,                                             RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::ItemGetInf(21),                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
+    locationTable[RC_KAK_SHOOTING_GALLERY_REWARD] =                                    Location::Base(RC_KAK_SHOOTING_GALLERY_REWARD,                                  RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_SHOOTING_GALLERY,             0x00,                                              0x30, "Shooting Gallery Reward",                     RHT_KAK_SHOOTING_GALLERY_REWARD,                                 RG_PROGRESSIVE_BOW,                   {},                                                     SpoilerCollectionCheck::ItemGetInf(ITEMGETINF_0E),                                                                            SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
+    locationTable[RC_KAK_TRADE_ODD_MUSHROOM] =                                         Location::Base(RC_KAK_TRADE_ODD_MUSHROOM,                                       RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_POTION_SHOP_GRANNY,           0x00,                                              0x20, "Trade Odd Mushroom",                          RHT_KAK_TRADE_ODD_MUSHROOM,                                      RG_ODD_POTION,                        { Category::cAdultTrade },                              SpoilerCollectionCheck::ItemGetInf(48),                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
+    locationTable[RC_KAK_GRANNYS_SHOP] =                                               Location::Base(RC_KAK_GRANNYS_SHOP,                                             RCQUEST_BOTH,    RCTYPE_MERCHANT,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_POTION_SHOP_GRANNY,           0x00,                                              0x4E, "Granny's Shop",                               RHT_KAK_GRANNYS_SHOP,                                            RG_BUY_BLUE_POTION,                   {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MERCHANTS_GRANNYS_SHOP),                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
+    locationTable[RC_KAK_ANJU_AS_ADULT] =                                              Location::Base(RC_KAK_ANJU_AS_ADULT,                                            RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_KAKARIKO_VILLAGE,             0x00,                                              0x1D, "Anju as Adult",                               RHT_KAK_ANJU_AS_ADULT,                                           RG_CLAIM_CHECK,                       {},                                                     SpoilerCollectionCheck::ItemGetInf(44),                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
+    locationTable[RC_KAK_ANJU_AS_CHILD] =                                              Location::Base(RC_KAK_ANJU_AS_CHILD,                                            RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_KAKARIKO_VILLAGE,             0x00,                                              0x0F, "Anju as Child",                               RHT_KAK_ANJU_AS_CHILD,                                           RG_EMPTY_BOTTLE,                      {},                                                     SpoilerCollectionCheck::ItemGetInf(12),                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
+    locationTable[RC_KAK_TRADE_POCKET_CUCCO] =                                         Location::Base(RC_KAK_TRADE_POCKET_CUCCO,                                       RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_KAKARIKO_VILLAGE,             0x00,                                              0x0E, "Trade Pocket Cucco",                          RHT_KAK_TRADE_POCKET_CUCCO,                                      RG_COJIRO,                            { Category::cAdultTrade },                              SpoilerCollectionCheck::ItemGetInf(46),                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
+    locationTable[RC_KAK_IMPAS_HOUSE_FREESTANDING_POH] =                        Location::Collectable(RC_KAK_IMPAS_HOUSE_FREESTANDING_POH,                             RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_ITEM00,      SCENE_IMPAS_HOUSE,                  262,                                               0x01, "Impas House Freestanding PoH",                RHT_KAK_IMPAS_HOUSE_FREESTANDING_POH,                            RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
+    locationTable[RC_KAK_WINDMILL_FREESTANDING_POH] =                           Location::Collectable(RC_KAK_WINDMILL_FREESTANDING_POH,                                RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_ITEM00,      SCENE_WINDMILL_AND_DAMPES_GRAVE,    262,                                               0x01, "Windmill Freestanding PoH",                   RHT_KAK_WINDMILL_FREESTANDING_POH,                               RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
     // Graveyard
-    locationTable[RC_GRAVEYARD_SHIELD_GRAVE_CHEST] =                                  Location::Chest(RC_GRAVEYARD_SHIELD_GRAVE_CHEST,                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GRAVEYARD,                    ACTOR_EN_BOX,         SCENE_GRAVE_WITH_FAIRYS_FOUNTAIN,   21824,                                             0x00, "Shield Grave Chest",                          "GY Shield Grave Chest",                                    RHT_GRAVEYARD_SHIELD_GRAVE_CHEST,                                RG_HYLIAN_SHIELD,                     {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_GRAVEYARD_HEART_PIECE_GRAVE_CHEST] =                             Location::Chest(RC_GRAVEYARD_HEART_PIECE_GRAVE_CHEST,                            RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GRAVEYARD,                    ACTOR_EN_BOX,         SCENE_REDEAD_GRAVE,                 -22592,                                            0x00, "Heart Piece Grave Chest",                     "GY Heart Piece Grave Chest",                               RHT_GRAVEYARD_HEART_PIECE_GRAVE_CHEST,                           RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
-    locationTable[RC_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST] =                            Location::Chest(RC_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST,                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GRAVEYARD,                    ACTOR_EN_BOX,         SCENE_ROYAL_FAMILYS_TOMB,           -32736,                                            0x00, "Composers Grave Chest",                       "GY Composers Grave Chest",                                 RHT_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST,                          RG_BOMBS_5,                           {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_GRAVEYARD_HOOKSHOT_CHEST] =                                      Location::Chest(RC_GRAVEYARD_HOOKSHOT_CHEST,                                     RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GRAVEYARD,                    ACTOR_EN_BOX,         SCENE_WINDMILL_AND_DAMPES_GRAVE,    4352,                                              0x00, "Hookshot Chest",                              "GY Hookshot Chest",                                        RHT_GRAVEYARD_HOOKSHOT_CHEST,                                    RG_PROGRESSIVE_HOOKSHOT,              {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
-    locationTable[RC_GRAVEYARD_FREESTANDING_POH] =                              Location::Collectable(RC_GRAVEYARD_FREESTANDING_POH,                                   RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GRAVEYARD,                    ACTOR_EN_ITEM00,      SCENE_GRAVEYARD,                    1030,                                              0x04, "Freestanding PoH",                            "GY Freestanding PoH",                                      RHT_GRAVEYARD_FREESTANDING_POH,                                  RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
-    locationTable[RC_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH] =                   Location::Collectable(RC_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH,                        RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GRAVEYARD,                    ACTOR_EN_ITEM00,      SCENE_WINDMILL_AND_DAMPES_GRAVE,    1798,                                              0x07, "Dampe Race Freestanding PoH",                 "GY Dampe Race Freestanding PoH",                           RHT_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH,                       RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
-    locationTable[RC_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR] =                       Location::Collectable(RC_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR,                            RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GRAVEYARD,                    ACTOR_EN_ITEM00,      SCENE_GRAVEYARD,                    6406,                                              0x19, "Dampe Gravedigging Tour",                     "GY Dampe Gravedigging Tour",                               RHT_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR,                           RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
+    locationTable[RC_GRAVEYARD_SHIELD_GRAVE_CHEST] =                                  Location::Chest(RC_GRAVEYARD_SHIELD_GRAVE_CHEST,                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GRAVEYARD,                    ACTOR_EN_BOX,         SCENE_GRAVE_WITH_FAIRYS_FOUNTAIN,   21824,                                             0x00, "Shield Grave Chest",                          RHT_GRAVEYARD_SHIELD_GRAVE_CHEST,                                RG_HYLIAN_SHIELD,                     {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_GRAVEYARD_HEART_PIECE_GRAVE_CHEST] =                             Location::Chest(RC_GRAVEYARD_HEART_PIECE_GRAVE_CHEST,                            RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GRAVEYARD,                    ACTOR_EN_BOX,         SCENE_REDEAD_GRAVE,                 -22592,                                            0x00, "Heart Piece Grave Chest",                     RHT_GRAVEYARD_HEART_PIECE_GRAVE_CHEST,                           RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
+    locationTable[RC_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST] =                            Location::Chest(RC_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST,                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GRAVEYARD,                    ACTOR_EN_BOX,         SCENE_ROYAL_FAMILYS_TOMB,           -32736,                                            0x00, "Composers Grave Chest",                       RHT_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST,                          RG_BOMBS_5,                           {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_GRAVEYARD_HOOKSHOT_CHEST] =                                      Location::Chest(RC_GRAVEYARD_HOOKSHOT_CHEST,                                     RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GRAVEYARD,                    ACTOR_EN_BOX,         SCENE_WINDMILL_AND_DAMPES_GRAVE,    4352,                                              0x00, "Hookshot Chest",                              RHT_GRAVEYARD_HOOKSHOT_CHEST,                                    RG_PROGRESSIVE_HOOKSHOT,              {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
+    locationTable[RC_GRAVEYARD_FREESTANDING_POH] =                              Location::Collectable(RC_GRAVEYARD_FREESTANDING_POH,                                   RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GRAVEYARD,                    ACTOR_EN_ITEM00,      SCENE_GRAVEYARD,                    1030,                                              0x04, "Freestanding PoH",                            RHT_GRAVEYARD_FREESTANDING_POH,                                  RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
+    locationTable[RC_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH] =                   Location::Collectable(RC_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH,                        RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GRAVEYARD,                    ACTOR_EN_ITEM00,      SCENE_WINDMILL_AND_DAMPES_GRAVE,    1798,                                              0x07, "Dampe Race Freestanding PoH",                 RHT_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH,                       RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
+    locationTable[RC_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR] =                       Location::Collectable(RC_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR,                            RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GRAVEYARD,                    ACTOR_EN_ITEM00,      SCENE_GRAVEYARD,                    6406,                                              0x19, "Dampe Gravedigging Tour",                     RHT_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR,                           RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
     // Death Mountain
-    locationTable[RC_DMT_CHEST] =                                                     Location::Chest(RC_DMT_CHEST,                                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_EN_BOX,         SCENE_DEATH_MOUNTAIN_TRAIL,         23201,                                             0x01, "Chest",                                       "DMT Chest",                                                RHT_DMT_CHEST,                                                   RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMT_STORMS_GROTTO_CHEST] =                                       Location::Chest(RC_DMT_STORMS_GROTTO_CHEST,                                      RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_EN_BOX,         SCENE_GROTTOS,                      23255,                                             0x17, "Storms Grotto Chest",                         "DMT Storms Grotto Chest",                                  RHT_DMT_STORMS_GROTTO_CHEST,                                     RG_HUGE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMT_TRADE_BROKEN_SWORD] =                                         Location::Base(RC_DMT_TRADE_BROKEN_SWORD,                                       RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_ID_MAX,         SCENE_DEATH_MOUNTAIN_TRAIL,         0x00,                                              0x23, "Trade Broken Sword",                          "DMT Trade Broken Sword",                                   RHT_DMT_TRADE_BROKEN_SWORD,                                      RG_PRESCRIPTION,                      { Category::cAdultTrade },                              SpoilerCollectionCheck::RandomizerInf(RAND_INF_ADULT_TRADES_DMT_TRADE_BROKEN_SWORD),                                          SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,             true);
-    locationTable[RC_DMT_TRADE_EYEDROPS] =                                             Location::Base(RC_DMT_TRADE_EYEDROPS,                                           RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_ID_MAX,         SCENE_DEATH_MOUNTAIN_TRAIL,         0x00,                                              0x26, "Trade Eyedrops",                              "DMT Trade Eyedrops",                                       RHT_DMT_TRADE_EYEDROPS,                                          RG_CLAIM_CHECK,                       { Category::cAdultTrade },                              SpoilerCollectionCheck::RandomizerInf(RAND_INF_ADULT_TRADES_DMT_TRADE_EYEDROPS),                                              SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,             true);
-    locationTable[RC_DMT_TRADE_CLAIM_CHECK] =                                          Location::Base(RC_DMT_TRADE_CLAIM_CHECK,                                        RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_ID_MAX,         SCENE_DEATH_MOUNTAIN_TRAIL,         0x00,                                              0x57, "Trade Claim Check",                           "DMT Trade Claim Check",                                    RHT_DMT_TRADE_CLAIM_CHECK,                                       RG_BIGGORON_SWORD,                    {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ADULT_TRADES_DMT_TRADE_CLAIM_CHECK),                                           SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,             true);
-    locationTable[RC_DMT_FREESTANDING_POH] =                                    Location::Collectable(RC_DMT_FREESTANDING_POH,                                         RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_EN_ITEM00,      SCENE_DEATH_MOUNTAIN_TRAIL,         7686,                                              0x1E, "Freestanding PoH",                            "DMT Freestanding PoH",                                     RHT_DMT_FREESTANDING_POH,                                        RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,             true);
+    locationTable[RC_DMT_CHEST] =                                                     Location::Chest(RC_DMT_CHEST,                                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_EN_BOX,         SCENE_DEATH_MOUNTAIN_TRAIL,         23201,                                             0x01, "Chest",                                       RHT_DMT_CHEST,                                                   RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMT_STORMS_GROTTO_CHEST] =                                       Location::Chest(RC_DMT_STORMS_GROTTO_CHEST,                                      RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_EN_BOX,         SCENE_GROTTOS,                      23255,                                             0x17, "Storms Grotto Chest",                         RHT_DMT_STORMS_GROTTO_CHEST,                                     RG_HUGE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMT_TRADE_BROKEN_SWORD] =                                         Location::Base(RC_DMT_TRADE_BROKEN_SWORD,                                       RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_ID_MAX,         SCENE_DEATH_MOUNTAIN_TRAIL,         0x00,                                              0x23, "Trade Broken Sword",                          RHT_DMT_TRADE_BROKEN_SWORD,                                      RG_PRESCRIPTION,                      { Category::cAdultTrade },                              SpoilerCollectionCheck::RandomizerInf(RAND_INF_ADULT_TRADES_DMT_TRADE_BROKEN_SWORD),                                          SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,             true);
+    locationTable[RC_DMT_TRADE_EYEDROPS] =                                             Location::Base(RC_DMT_TRADE_EYEDROPS,                                           RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_ID_MAX,         SCENE_DEATH_MOUNTAIN_TRAIL,         0x00,                                              0x26, "Trade Eyedrops",                              RHT_DMT_TRADE_EYEDROPS,                                          RG_CLAIM_CHECK,                       { Category::cAdultTrade },                              SpoilerCollectionCheck::RandomizerInf(RAND_INF_ADULT_TRADES_DMT_TRADE_EYEDROPS),                                              SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,             true);
+    locationTable[RC_DMT_TRADE_CLAIM_CHECK] =                                          Location::Base(RC_DMT_TRADE_CLAIM_CHECK,                                        RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_ID_MAX,         SCENE_DEATH_MOUNTAIN_TRAIL,         0x00,                                              0x57, "Trade Claim Check",                           RHT_DMT_TRADE_CLAIM_CHECK,                                       RG_BIGGORON_SWORD,                    {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ADULT_TRADES_DMT_TRADE_CLAIM_CHECK),                                           SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,             true);
+    locationTable[RC_DMT_FREESTANDING_POH] =                                    Location::Collectable(RC_DMT_FREESTANDING_POH,                                         RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_EN_ITEM00,      SCENE_DEATH_MOUNTAIN_TRAIL,         7686,                                              0x1E, "Freestanding PoH",                            RHT_DMT_FREESTANDING_POH,                                        RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,             true);
     // Goron City
-    locationTable[RC_GC_MAZE_LEFT_CHEST] =                                            Location::Chest(RC_GC_MAZE_LEFT_CHEST,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GORON_CITY,                   ACTOR_EN_BOX,         SCENE_GORON_CITY,                   23232,                                             0x00, "Maze Left Chest",                             "GC Maze Left Chest",                                       RHT_GC_MAZE_LEFT_CHEST,                                          RG_HUGE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_MAZE_RIGHT_CHEST] =                                           Location::Chest(RC_GC_MAZE_RIGHT_CHEST,                                          RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GORON_CITY,                   ACTOR_EN_BOX,         SCENE_GORON_CITY,                   23201,                                             0x01, "Maze Right Chest",                            "GC Maze Right Chest",                                      RHT_GC_MAZE_RIGHT_CHEST,                                         RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_MAZE_CENTER_CHEST] =                                          Location::Chest(RC_GC_MAZE_CENTER_CHEST,                                         RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GORON_CITY,                   ACTOR_EN_BOX,         SCENE_GORON_CITY,                   23202,                                             0x02, "Maze Center Chest",                           "GC Maze Center Chest",                                     RHT_GC_MAZE_CENTER_CHEST,                                        RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_ROLLING_GORON_AS_CHILD] =                                      Location::Base(RC_GC_ROLLING_GORON_AS_CHILD,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GORON_CITY,                   ACTOR_ID_MAX,         SCENE_GORON_CITY,                   0x00,                                              0x34, "Rolling Goron as Child",                      "GC Rolling Goron as Child",                                RHT_GC_ROLLING_GORON_AS_CHILD,                                   RG_PROGRESSIVE_BOMB_BAG,              {},                                                     SpoilerCollectionCheck::InfTable(INFTABLE_11E),                                                                               SpoilerCollectionCheckGroup::GROUP_GORON_CITY,                 true);
-    locationTable[RC_GC_ROLLING_GORON_AS_ADULT] =                                      Location::Base(RC_GC_ROLLING_GORON_AS_ADULT,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GORON_CITY,                   ACTOR_ID_MAX,         SCENE_GORON_CITY,                   0x00,                                              0x2C, "Rolling Goron as Adult",                      "GC Rolling Goron as Adult",                                RHT_GC_ROLLING_GORON_AS_ADULT,                                   RG_GORON_TUNIC,                       {},                                                     SpoilerCollectionCheck::InfTable(INFTABLE_GORON_CITY_DOORS_UNLOCKED),                                                         SpoilerCollectionCheckGroup::GROUP_GORON_CITY,                 true);
-    locationTable[RC_GC_DARUNIAS_JOY] =                                                Location::Base(RC_GC_DARUNIAS_JOY,                                              RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GORON_CITY,                   ACTOR_ID_MAX,         SCENE_GORON_CITY,                   0x00,                                              0x54, "Darunias Joy",                                "GC Darunias Joy",                                          RHT_GC_DARUNIAS_JOY,                                             RG_PROGRESSIVE_STRENGTH,              {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DARUNIAS_JOY),                                                                 SpoilerCollectionCheckGroup::GROUP_GORON_CITY,                 true);
-    locationTable[RC_GC_POT_FREESTANDING_POH] =                                 Location::Collectable(RC_GC_POT_FREESTANDING_POH,                                      RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GORON_CITY,                   ACTOR_EN_ITEM00,      SCENE_GORON_CITY,                   7942,                                              0x1F, "Pot Freestanding PoH",                        "GC Pot Freestanding PoH",                                  RHT_GC_POT_FREESTANDING_POH,                                     RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GORON_CITY,                 true);
-    locationTable[RC_GC_DEKU_SCRUB_GROTTO_LEFT] =                               Location::GrottoScrub(RC_GC_DEKU_SCRUB_GROTTO_LEFT,                                    RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_GORON_CITY,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x00, 0xFB),                      0x30, "Deku Scrub Grotto Left",                      "GC Deku Scrub Grotto Left",                                RHT_GC_DEKU_SCRUB_GROTTO_LEFT,                                   RG_BUY_DEKU_NUTS_5,                   { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GC_DEKU_SCRUB_GROTTO_LEFT),                                   SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_DEKU_SCRUB_GROTTO_RIGHT] =                              Location::GrottoScrub(RC_GC_DEKU_SCRUB_GROTTO_RIGHT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_GORON_CITY,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x05, 0xFB),                      0x37, "Deku Scrub Grotto Right",                     "GC Deku Scrub Grotto Right",                               RHT_GC_DEKU_SCRUB_GROTTO_RIGHT,                                  RG_BUY_BOMBS_535,                     { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GC_DEKU_SCRUB_GROTTO_RIGHT),                                  SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_DEKU_SCRUB_GROTTO_CENTER] =                             Location::GrottoScrub(RC_GC_DEKU_SCRUB_GROTTO_CENTER,                                  RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_GORON_CITY,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x03, 0xFB),                      0x33, "Deku Scrub Grotto Center",                    "GC Deku Scrub Grotto Center",                              RHT_GC_DEKU_SCRUB_GROTTO_CENTER,                                 RG_BUY_ARROWS_30,                     { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GC_DEKU_SCRUB_GROTTO_CENTER),                                 SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_MEDIGORON] =                                                   Location::Base(RC_GC_MEDIGORON,                                                 RCQUEST_BOTH,    RCTYPE_MERCHANT,                    RCAREA_GORON_CITY,                   ACTOR_ID_MAX,         SCENE_GORON_CITY,                   0x00,                                              0x51, "Medigoron",                                   "GC Medigoron",                                             RHT_GC_MEDIGORON,                                                RG_GIANTS_KNIFE,                      { Category::cMerchant },                                SpoilerCollectionCheck::RandomizerInf(RAND_INF_MERCHANTS_MEDIGORON),                                                          SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_MAZE_LEFT_CHEST] =                                            Location::Chest(RC_GC_MAZE_LEFT_CHEST,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GORON_CITY,                   ACTOR_EN_BOX,         SCENE_GORON_CITY,                   23232,                                             0x00, "Maze Left Chest",                             RHT_GC_MAZE_LEFT_CHEST,                                          RG_HUGE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_MAZE_RIGHT_CHEST] =                                           Location::Chest(RC_GC_MAZE_RIGHT_CHEST,                                          RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GORON_CITY,                   ACTOR_EN_BOX,         SCENE_GORON_CITY,                   23201,                                             0x01, "Maze Right Chest",                            RHT_GC_MAZE_RIGHT_CHEST,                                         RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_MAZE_CENTER_CHEST] =                                          Location::Chest(RC_GC_MAZE_CENTER_CHEST,                                         RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GORON_CITY,                   ACTOR_EN_BOX,         SCENE_GORON_CITY,                   23202,                                             0x02, "Maze Center Chest",                           RHT_GC_MAZE_CENTER_CHEST,                                        RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_ROLLING_GORON_AS_CHILD] =                                      Location::Base(RC_GC_ROLLING_GORON_AS_CHILD,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GORON_CITY,                   ACTOR_ID_MAX,         SCENE_GORON_CITY,                   0x00,                                              0x34, "Rolling Goron as Child",                      RHT_GC_ROLLING_GORON_AS_CHILD,                                   RG_PROGRESSIVE_BOMB_BAG,              {},                                                     SpoilerCollectionCheck::InfTable(INFTABLE_11E),                                                                               SpoilerCollectionCheckGroup::GROUP_GORON_CITY,                 true);
+    locationTable[RC_GC_ROLLING_GORON_AS_ADULT] =                                      Location::Base(RC_GC_ROLLING_GORON_AS_ADULT,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GORON_CITY,                   ACTOR_ID_MAX,         SCENE_GORON_CITY,                   0x00,                                              0x2C, "Rolling Goron as Adult",                      RHT_GC_ROLLING_GORON_AS_ADULT,                                   RG_GORON_TUNIC,                       {},                                                     SpoilerCollectionCheck::InfTable(INFTABLE_GORON_CITY_DOORS_UNLOCKED),                                                         SpoilerCollectionCheckGroup::GROUP_GORON_CITY,                 true);
+    locationTable[RC_GC_DARUNIAS_JOY] =                                                Location::Base(RC_GC_DARUNIAS_JOY,                                              RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GORON_CITY,                   ACTOR_ID_MAX,         SCENE_GORON_CITY,                   0x00,                                              0x54, "Darunias Joy",                                RHT_GC_DARUNIAS_JOY,                                             RG_PROGRESSIVE_STRENGTH,              {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DARUNIAS_JOY),                                                                 SpoilerCollectionCheckGroup::GROUP_GORON_CITY,                 true);
+    locationTable[RC_GC_POT_FREESTANDING_POH] =                                 Location::Collectable(RC_GC_POT_FREESTANDING_POH,                                      RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GORON_CITY,                   ACTOR_EN_ITEM00,      SCENE_GORON_CITY,                   7942,                                              0x1F, "Pot Freestanding PoH",                        RHT_GC_POT_FREESTANDING_POH,                                     RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GORON_CITY,                 true);
+    locationTable[RC_GC_DEKU_SCRUB_GROTTO_LEFT] =                               Location::GrottoScrub(RC_GC_DEKU_SCRUB_GROTTO_LEFT,                                    RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_GORON_CITY,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x00, 0xFB),                      0x30, "Deku Scrub Grotto Left",                      RHT_GC_DEKU_SCRUB_GROTTO_LEFT,                                   RG_BUY_DEKU_NUTS_5,                   { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GC_DEKU_SCRUB_GROTTO_LEFT),                                   SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_DEKU_SCRUB_GROTTO_RIGHT] =                              Location::GrottoScrub(RC_GC_DEKU_SCRUB_GROTTO_RIGHT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_GORON_CITY,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x05, 0xFB),                      0x37, "Deku Scrub Grotto Right",                     RHT_GC_DEKU_SCRUB_GROTTO_RIGHT,                                  RG_BUY_BOMBS_535,                     { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GC_DEKU_SCRUB_GROTTO_RIGHT),                                  SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_DEKU_SCRUB_GROTTO_CENTER] =                             Location::GrottoScrub(RC_GC_DEKU_SCRUB_GROTTO_CENTER,                                  RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_GORON_CITY,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x03, 0xFB),                      0x33, "Deku Scrub Grotto Center",                    RHT_GC_DEKU_SCRUB_GROTTO_CENTER,                                 RG_BUY_ARROWS_30,                     { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GC_DEKU_SCRUB_GROTTO_CENTER),                                 SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_MEDIGORON] =                                                   Location::Base(RC_GC_MEDIGORON,                                                 RCQUEST_BOTH,    RCTYPE_MERCHANT,                    RCAREA_GORON_CITY,                   ACTOR_ID_MAX,         SCENE_GORON_CITY,                   0x00,                                              0x51, "Medigoron",                                   RHT_GC_MEDIGORON,                                                RG_GIANTS_KNIFE,                      { Category::cMerchant },                                SpoilerCollectionCheck::RandomizerInf(RAND_INF_MERCHANTS_MEDIGORON),                                                          SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
     // Death Mountain Crater
-    locationTable[RC_DMC_UPPER_GROTTO_CHEST] =                                        Location::Chest(RC_DMC_UPPER_GROTTO_CHEST,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_EN_BOX,         SCENE_GROTTOS,                      23802,                                             0x1A, "Upper Grotto Chest",                          "DMC Upper Grotto Chest",                                   RHT_DMC_UPPER_GROTTO_CHEST,                                      RG_BOMBS_20,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMC_WALL_FREESTANDING_POH] =                               Location::Collectable(RC_DMC_WALL_FREESTANDING_POH,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_EN_ITEM00,      SCENE_DEATH_MOUNTAIN_CRATER,        518,                                               0x02, "Wall Freestanding PoH",                       "DMC Wall Freestanding PoH",                                RHT_DMC_WALL_FREESTANDING_POH,                                   RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,             true);
-    locationTable[RC_DMC_VOLCANO_FREESTANDING_POH] =                            Location::Collectable(RC_DMC_VOLCANO_FREESTANDING_POH,                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_EN_ITEM00,      SCENE_DEATH_MOUNTAIN_CRATER,        2054,                                              0x08, "Volcano Freestanding PoH",                    "DMC Volcano Freestanding PoH",                             RHT_DMC_WALL_FREESTANDING_POH,                                   RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,             true);
-    locationTable[RC_DMC_DEKU_SCRUB] =                                                 Location::Base(RC_DMC_DEKU_SCRUB,                                               RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_EN_DNS,         SCENE_DEATH_MOUNTAIN_CRATER,        0x05,                                              0x37, "Deku Scrub",                                  "DMC Deku Scrub",                                           RHT_DMC_DEKU_SCRUB,                                              RG_BUY_BOMBS_535,                     { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB),                                              SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMC_DEKU_SCRUB_GROTTO_LEFT] =                              Location::GrottoScrub(RC_DMC_DEKU_SCRUB_GROTTO_LEFT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x00, 0xF9),                      0x30, "Deku Scrub Grotto Left",                      "DMC Deku Scrub Grotto Left",                               RHT_DMC_DEKU_SCRUB_GROTTO_LEFT,                                  RG_BUY_DEKU_NUTS_5,                   { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB_GROTTO_LEFT),                                  SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMC_DEKU_SCRUB_GROTTO_RIGHT] =                             Location::GrottoScrub(RC_DMC_DEKU_SCRUB_GROTTO_RIGHT,                                  RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x05, 0xF9),                      0x37, "Deku Scrub Grotto Right",                     "DMC Deku Scrub Grotto Right",                              RHT_DMC_DEKU_SCRUB_GROTTO_RIGHT,                                 RG_BUY_BOMBS_535,                     { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB_GROTTO_RIGHT),                                 SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMC_DEKU_SCRUB_GROTTO_CENTER] =                            Location::GrottoScrub(RC_DMC_DEKU_SCRUB_GROTTO_CENTER,                                 RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x03, 0xF9),                      0x33, "Deku Scrub Grotto Center",                    "DMC Deku Scrub Grotto Center",                             RHT_DMC_DEKU_SCRUB_GROTTO_CENTER,                                RG_BUY_ARROWS_30,                     { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB_GROTTO_CENTER),                                SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMC_UPPER_GROTTO_CHEST] =                                        Location::Chest(RC_DMC_UPPER_GROTTO_CHEST,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_EN_BOX,         SCENE_GROTTOS,                      23802,                                             0x1A, "Upper Grotto Chest",                          RHT_DMC_UPPER_GROTTO_CHEST,                                      RG_BOMBS_20,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMC_WALL_FREESTANDING_POH] =                               Location::Collectable(RC_DMC_WALL_FREESTANDING_POH,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_EN_ITEM00,      SCENE_DEATH_MOUNTAIN_CRATER,        518,                                               0x02, "Wall Freestanding PoH",                       RHT_DMC_WALL_FREESTANDING_POH,                                   RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,             true);
+    locationTable[RC_DMC_VOLCANO_FREESTANDING_POH] =                            Location::Collectable(RC_DMC_VOLCANO_FREESTANDING_POH,                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_EN_ITEM00,      SCENE_DEATH_MOUNTAIN_CRATER,        2054,                                              0x08, "Volcano Freestanding PoH",                    RHT_DMC_WALL_FREESTANDING_POH,                                   RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,             true);
+    locationTable[RC_DMC_DEKU_SCRUB] =                                                 Location::Base(RC_DMC_DEKU_SCRUB,                                               RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_EN_DNS,         SCENE_DEATH_MOUNTAIN_CRATER,        0x05,                                              0x37, "Deku Scrub",                                  RHT_DMC_DEKU_SCRUB,                                              RG_BUY_BOMBS_535,                     { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB),                                              SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMC_DEKU_SCRUB_GROTTO_LEFT] =                              Location::GrottoScrub(RC_DMC_DEKU_SCRUB_GROTTO_LEFT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x00, 0xF9),                      0x30, "Deku Scrub Grotto Left",                      RHT_DMC_DEKU_SCRUB_GROTTO_LEFT,                                  RG_BUY_DEKU_NUTS_5,                   { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB_GROTTO_LEFT),                                  SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMC_DEKU_SCRUB_GROTTO_RIGHT] =                             Location::GrottoScrub(RC_DMC_DEKU_SCRUB_GROTTO_RIGHT,                                  RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x05, 0xF9),                      0x37, "Deku Scrub Grotto Right",                     RHT_DMC_DEKU_SCRUB_GROTTO_RIGHT,                                 RG_BUY_BOMBS_535,                     { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB_GROTTO_RIGHT),                                 SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMC_DEKU_SCRUB_GROTTO_CENTER] =                            Location::GrottoScrub(RC_DMC_DEKU_SCRUB_GROTTO_CENTER,                                 RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x03, 0xF9),                      0x33, "Deku Scrub Grotto Center",                    RHT_DMC_DEKU_SCRUB_GROTTO_CENTER,                                RG_BUY_ARROWS_30,                     { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB_GROTTO_CENTER),                                SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
     // Zoras River
-    locationTable[RC_ZR_OPEN_GROTTO_CHEST] =                                          Location::Chest(RC_ZR_OPEN_GROTTO_CHEST,                                         RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_RIVER,                  ACTOR_EN_BOX,         SCENE_GROTTOS,                      22985,                                             0x09, "Open Grotto Chest",                           "ZR Open Grotto Chest",                                     RHT_ZR_OPEN_GROTTO_CHEST,                                        RG_RED_RUPEE,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZR_MAGIC_BEAN_SALESMAN] =                                         Location::Base(RC_ZR_MAGIC_BEAN_SALESMAN,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_RIVER,                  ACTOR_ID_MAX,         SCENE_ZORAS_RIVER,                  0x00,                                              0x16, "Magic Bean Salesman",                         "ZR Magic Bean Salesman",                                   RHT_ZR_MAGIC_BEAN_SALESMAN,                                      RG_MAGIC_BEAN,                        {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MERCHANTS_MAGIC_BEAN_SALESMAN),                                                SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,                true);
-    locationTable[RC_ZR_FROGS_ZELDAS_LULLABY] =                                        Location::Base(RC_ZR_FROGS_ZELDAS_LULLABY,                                      RCQUEST_BOTH,    RCTYPE_FROG_SONG,                   RCAREA_ZORAS_RIVER,                  ACTOR_EN_FR,          SCENE_ZORAS_RIVER,                  0x00,                                              0x3E, "Frogs Zelda's Lullaby",                       "ZR Frogs Zelda's Lullaby",                                 RHT_ZR_FROGS_ZELDAS_LULLABY,                                     RG_PURPLE_RUPEE,                      {},                                                     SpoilerCollectionCheck::EventChkInf(0xD1),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZR_FROGS_EPONAS_SONG] =                                           Location::Base(RC_ZR_FROGS_EPONAS_SONG,                                         RCQUEST_BOTH,    RCTYPE_FROG_SONG,                   RCAREA_ZORAS_RIVER,                  ACTOR_EN_FR,          SCENE_ZORAS_RIVER,                  0x00,                                              0x3E, "Frogs Epona's Song",                          "ZR Frogs Epona's Song",                                    RHT_ZR_FROGS_EPONAS_SONG,                                        RG_PURPLE_RUPEE,                      {},                                                     SpoilerCollectionCheck::EventChkInf(0xD2),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZR_FROGS_SARIAS_SONG] =                                           Location::Base(RC_ZR_FROGS_SARIAS_SONG,                                         RCQUEST_BOTH,    RCTYPE_FROG_SONG,                   RCAREA_ZORAS_RIVER,                  ACTOR_EN_FR,          SCENE_ZORAS_RIVER,                  0x00,                                              0x3E, "Frogs Saria's Song",                          "ZR Frogs Saria's Song",                                    RHT_ZR_FROGS_SARIAS_SONG,                                        RG_PURPLE_RUPEE,                      {},                                                     SpoilerCollectionCheck::EventChkInf(0xD4),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZR_FROGS_SUNS_SONG] =                                             Location::Base(RC_ZR_FROGS_SUNS_SONG,                                           RCQUEST_BOTH,    RCTYPE_FROG_SONG,                   RCAREA_ZORAS_RIVER,                  ACTOR_EN_FR,          SCENE_ZORAS_RIVER,                  0x00,                                              0x3E, "Frogs Sun's Song",                            "ZR Frogs Sun's Song",                                      RHT_ZR_FROGS_SUNS_SONG,                                          RG_PURPLE_RUPEE,                      {},                                                     SpoilerCollectionCheck::EventChkInf(0xD3),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZR_FROGS_SONG_OF_TIME] =                                          Location::Base(RC_ZR_FROGS_SONG_OF_TIME,                                        RCQUEST_BOTH,    RCTYPE_FROG_SONG,                   RCAREA_ZORAS_RIVER,                  ACTOR_EN_FR,          SCENE_ZORAS_RIVER,                  0x00,                                              0x3E, "Frogs Song of Time",                          "ZR Frogs Song of Time",                                    RHT_ZR_FROGS_SONG_OF_TIME,                                       RG_PURPLE_RUPEE,                      {},                                                     SpoilerCollectionCheck::EventChkInf(0xD5),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZR_FROGS_IN_THE_RAIN] =                                           Location::Base(RC_ZR_FROGS_IN_THE_RAIN,                                         RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_RIVER,                  ACTOR_EN_FR,          SCENE_ZORAS_RIVER,                  0x00,                                              0x3E, "Frogs in the Rain",                           "ZR Frogs in the Rain",                                     RHT_ZR_FROGS_IN_THE_RAIN,                                        RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::EventChkInf(0xD6),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,                true);
-    locationTable[RC_ZR_FROGS_OCARINA_GAME] =                                          Location::Base(RC_ZR_FROGS_OCARINA_GAME,                                        RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_RIVER,                  ACTOR_EN_FR,          SCENE_ZORAS_RIVER,                  0x00,                                              0x76, "Frogs Ocarina Game",                          "ZR Frogs Ocarina Game",                                    RHT_ZR_FROGS_OCARINA_GAME,                                       RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::EventChkInf(0xD0),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,                true);
-    locationTable[RC_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH] =                    Location::Collectable(RC_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH,                         RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_RIVER,                  ACTOR_EN_ITEM00,      SCENE_ZORAS_RIVER,                  1030,                                              0x04, "Near Open Grotto Freestanding PoH",           "ZR Near Open Grotto Freestanding PoH",                     RHT_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH,                        RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,                true);
-    locationTable[RC_ZR_NEAR_DOMAIN_FREESTANDING_POH] =                         Location::Collectable(RC_ZR_NEAR_DOMAIN_FREESTANDING_POH,                              RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_RIVER,                  ACTOR_EN_ITEM00,      SCENE_ZORAS_RIVER,                  2822,                                              0x0B, "Near Domain Freestanding PoH",                "ZR Near Domain Freestanding PoH",                          RHT_ZR_NEAR_DOMAIN_FREESTANDING_POH,                             RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,                true);
-    locationTable[RC_ZR_DEKU_SCRUB_GROTTO_REAR] =                               Location::GrottoScrub(RC_ZR_DEKU_SCRUB_GROTTO_REAR,                                    RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_ZORAS_RIVER,                  ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x07, 0xEB),                      0x39, "Deku Scrub Grotto Rear",                      "ZR Deku Scrub Grotto Rear",                                RHT_ZR_DEKU_SCRUB_GROTTO_REAR,                                   RG_BUY_RED_POTION_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_ZR_DEKU_SCRUB_GROTTO_REAR),                                   SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZR_DEKU_SCRUB_GROTTO_FRONT] =                              Location::GrottoScrub(RC_ZR_DEKU_SCRUB_GROTTO_FRONT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_ZORAS_RIVER,                  ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x08, 0xEB),                      0x3A, "Deku Scrub Grotto Front",                     "ZR Deku Scrub Grotto Front",                               RHT_ZR_DEKU_SCRUB_GROTTO_FRONT,                                  RG_BUY_GREEN_POTION,                  { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_ZR_DEKU_SCRUB_GROTTO_FRONT),                                  SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZR_OPEN_GROTTO_CHEST] =                                          Location::Chest(RC_ZR_OPEN_GROTTO_CHEST,                                         RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_RIVER,                  ACTOR_EN_BOX,         SCENE_GROTTOS,                      22985,                                             0x09, "Open Grotto Chest",                           RHT_ZR_OPEN_GROTTO_CHEST,                                        RG_RED_RUPEE,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZR_MAGIC_BEAN_SALESMAN] =                                         Location::Base(RC_ZR_MAGIC_BEAN_SALESMAN,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_RIVER,                  ACTOR_ID_MAX,         SCENE_ZORAS_RIVER,                  0x00,                                              0x16, "Magic Bean Salesman",                         RHT_ZR_MAGIC_BEAN_SALESMAN,                                      RG_MAGIC_BEAN,                        {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MERCHANTS_MAGIC_BEAN_SALESMAN),                                                SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,                true);
+    locationTable[RC_ZR_FROGS_ZELDAS_LULLABY] =                                        Location::Base(RC_ZR_FROGS_ZELDAS_LULLABY,                                      RCQUEST_BOTH,    RCTYPE_FROG_SONG,                   RCAREA_ZORAS_RIVER,                  ACTOR_EN_FR,          SCENE_ZORAS_RIVER,                  0x00,                                              0x3E, "Frogs Zelda's Lullaby",                       RHT_ZR_FROGS_ZELDAS_LULLABY,                                     RG_PURPLE_RUPEE,                      {},                                                     SpoilerCollectionCheck::EventChkInf(0xD1),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZR_FROGS_EPONAS_SONG] =                                           Location::Base(RC_ZR_FROGS_EPONAS_SONG,                                         RCQUEST_BOTH,    RCTYPE_FROG_SONG,                   RCAREA_ZORAS_RIVER,                  ACTOR_EN_FR,          SCENE_ZORAS_RIVER,                  0x00,                                              0x3E, "Frogs Epona's Song",                          RHT_ZR_FROGS_EPONAS_SONG,                                        RG_PURPLE_RUPEE,                      {},                                                     SpoilerCollectionCheck::EventChkInf(0xD2),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZR_FROGS_SARIAS_SONG] =                                           Location::Base(RC_ZR_FROGS_SARIAS_SONG,                                         RCQUEST_BOTH,    RCTYPE_FROG_SONG,                   RCAREA_ZORAS_RIVER,                  ACTOR_EN_FR,          SCENE_ZORAS_RIVER,                  0x00,                                              0x3E, "Frogs Saria's Song",                          RHT_ZR_FROGS_SARIAS_SONG,                                        RG_PURPLE_RUPEE,                      {},                                                     SpoilerCollectionCheck::EventChkInf(0xD4),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZR_FROGS_SUNS_SONG] =                                             Location::Base(RC_ZR_FROGS_SUNS_SONG,                                           RCQUEST_BOTH,    RCTYPE_FROG_SONG,                   RCAREA_ZORAS_RIVER,                  ACTOR_EN_FR,          SCENE_ZORAS_RIVER,                  0x00,                                              0x3E, "Frogs Sun's Song",                            RHT_ZR_FROGS_SUNS_SONG,                                          RG_PURPLE_RUPEE,                      {},                                                     SpoilerCollectionCheck::EventChkInf(0xD3),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZR_FROGS_SONG_OF_TIME] =                                          Location::Base(RC_ZR_FROGS_SONG_OF_TIME,                                        RCQUEST_BOTH,    RCTYPE_FROG_SONG,                   RCAREA_ZORAS_RIVER,                  ACTOR_EN_FR,          SCENE_ZORAS_RIVER,                  0x00,                                              0x3E, "Frogs Song of Time",                          RHT_ZR_FROGS_SONG_OF_TIME,                                       RG_PURPLE_RUPEE,                      {},                                                     SpoilerCollectionCheck::EventChkInf(0xD5),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZR_FROGS_IN_THE_RAIN] =                                           Location::Base(RC_ZR_FROGS_IN_THE_RAIN,                                         RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_RIVER,                  ACTOR_EN_FR,          SCENE_ZORAS_RIVER,                  0x00,                                              0x3E, "Frogs in the Rain",                           RHT_ZR_FROGS_IN_THE_RAIN,                                        RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::EventChkInf(0xD6),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,                true);
+    locationTable[RC_ZR_FROGS_OCARINA_GAME] =                                          Location::Base(RC_ZR_FROGS_OCARINA_GAME,                                        RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_RIVER,                  ACTOR_EN_FR,          SCENE_ZORAS_RIVER,                  0x00,                                              0x76, "Frogs Ocarina Game",                          RHT_ZR_FROGS_OCARINA_GAME,                                       RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::EventChkInf(0xD0),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,                true);
+    locationTable[RC_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH] =                    Location::Collectable(RC_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH,                         RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_RIVER,                  ACTOR_EN_ITEM00,      SCENE_ZORAS_RIVER,                  1030,                                              0x04, "Near Open Grotto Freestanding PoH",           RHT_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH,                        RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,                true);
+    locationTable[RC_ZR_NEAR_DOMAIN_FREESTANDING_POH] =                         Location::Collectable(RC_ZR_NEAR_DOMAIN_FREESTANDING_POH,                              RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_RIVER,                  ACTOR_EN_ITEM00,      SCENE_ZORAS_RIVER,                  2822,                                              0x0B, "Near Domain Freestanding PoH",                RHT_ZR_NEAR_DOMAIN_FREESTANDING_POH,                             RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,                true);
+    locationTable[RC_ZR_DEKU_SCRUB_GROTTO_REAR] =                               Location::GrottoScrub(RC_ZR_DEKU_SCRUB_GROTTO_REAR,                                    RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_ZORAS_RIVER,                  ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x07, 0xEB),                      0x39, "Deku Scrub Grotto Rear",                      RHT_ZR_DEKU_SCRUB_GROTTO_REAR,                                   RG_BUY_RED_POTION_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_ZR_DEKU_SCRUB_GROTTO_REAR),                                   SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZR_DEKU_SCRUB_GROTTO_FRONT] =                              Location::GrottoScrub(RC_ZR_DEKU_SCRUB_GROTTO_FRONT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_ZORAS_RIVER,                  ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x08, 0xEB),                      0x3A, "Deku Scrub Grotto Front",                     RHT_ZR_DEKU_SCRUB_GROTTO_FRONT,                                  RG_BUY_GREEN_POTION,                  { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_ZR_DEKU_SCRUB_GROTTO_FRONT),                                  SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
     // Zoras Domain
-    locationTable[RC_ZD_CHEST] =                                                      Location::Chest(RC_ZD_CHEST,                                                     RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_BOX,         SCENE_ZORAS_DOMAIN,                 -18496,                                            0x00, "Chest",                                       "ZD Chest",                                                 RHT_ZD_CHEST,                                                    RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,               true);
-    locationTable[RC_ZD_DIVING_MINIGAME] =                                             Location::Base(RC_ZD_DIVING_MINIGAME,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_DOMAIN,                 ACTOR_ID_MAX,         SCENE_ZORAS_DOMAIN,                 0x00,                                              0x37, "Diving Minigame",                             "ZD Diving Minigame",                                       RHT_ZD_DIVING_MINIGAME,                                          RG_PROGRESSIVE_SCALE,                 {},                                                     SpoilerCollectionCheck::EventChkInf(0x38),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,               true);
-    locationTable[RC_ZD_KING_ZORA_THAWED] =                                            Location::Base(RC_ZD_KING_ZORA_THAWED,                                          RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_DOMAIN,                 ACTOR_ID_MAX,         SCENE_ZORAS_DOMAIN,                 0x00,                                              0x2D, "King Zora Thawed",                            "ZD King Zora Thawed",                                      RHT_ZD_KING_ZORA_THAWED,                                         RG_ZORA_TUNIC,                        {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KING_ZORA_THAWED),                                                             SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,               true);
-    locationTable[RC_ZD_TRADE_PRESCRIPTION] =                                          Location::Base(RC_ZD_TRADE_PRESCRIPTION,                                        RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_ZORAS_DOMAIN,                 ACTOR_ID_MAX,         SCENE_ZORAS_DOMAIN,                 0x00,                                              0x24, "Trade Prescription",                          "ZD Trade Prescription",                                    RHT_ZD_TRADE_PRESCRIPTION,                                       RG_EYEBALL_FROG,                      { Category::cAdultTrade },                              SpoilerCollectionCheck::RandomizerInf(RAND_INF_ADULT_TRADES_ZD_TRADE_PRESCRIPTION),                                           SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,               true);
+    locationTable[RC_ZD_CHEST] =                                                      Location::Chest(RC_ZD_CHEST,                                                     RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_BOX,         SCENE_ZORAS_DOMAIN,                 -18496,                                            0x00, "Chest",                                       RHT_ZD_CHEST,                                                    RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,               true);
+    locationTable[RC_ZD_DIVING_MINIGAME] =                                             Location::Base(RC_ZD_DIVING_MINIGAME,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_DOMAIN,                 ACTOR_ID_MAX,         SCENE_ZORAS_DOMAIN,                 0x00,                                              0x37, "Diving Minigame",                             RHT_ZD_DIVING_MINIGAME,                                          RG_PROGRESSIVE_SCALE,                 {},                                                     SpoilerCollectionCheck::EventChkInf(0x38),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,               true);
+    locationTable[RC_ZD_KING_ZORA_THAWED] =                                            Location::Base(RC_ZD_KING_ZORA_THAWED,                                          RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_DOMAIN,                 ACTOR_ID_MAX,         SCENE_ZORAS_DOMAIN,                 0x00,                                              0x2D, "King Zora Thawed",                            RHT_ZD_KING_ZORA_THAWED,                                         RG_ZORA_TUNIC,                        {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KING_ZORA_THAWED),                                                             SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,               true);
+    locationTable[RC_ZD_TRADE_PRESCRIPTION] =                                          Location::Base(RC_ZD_TRADE_PRESCRIPTION,                                        RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_ZORAS_DOMAIN,                 ACTOR_ID_MAX,         SCENE_ZORAS_DOMAIN,                 0x00,                                              0x24, "Trade Prescription",                          RHT_ZD_TRADE_PRESCRIPTION,                                       RG_EYEBALL_FROG,                      { Category::cAdultTrade },                              SpoilerCollectionCheck::RandomizerInf(RAND_INF_ADULT_TRADES_ZD_TRADE_PRESCRIPTION),                                           SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,               true);
     // Zora's Fountain
-    locationTable[RC_ZF_ICEBERC_FREESTANDING_POH] =                             Location::Collectable(RC_ZF_ICEBERC_FREESTANDING_POH,                                  RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_FOUNTAIN,               ACTOR_EN_ITEM00,      SCENE_ZORAS_FOUNTAIN,               262,                                               0x01, "Iceberg Freestanding PoH",                    "ZF Iceberg Freestanding PoH",                              RHT_ZF_ICEBERG_FREESTANDING_POH,                                 RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,               true);
-    locationTable[RC_ZF_BOTTOM_FREESTANDING_POH] =                              Location::Collectable(RC_ZF_BOTTOM_FREESTANDING_POH,                                   RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_FOUNTAIN,               ACTOR_EN_ITEM00,      SCENE_ZORAS_FOUNTAIN,               5126,                                              0x14, "Bottom Freestanding PoH",                     "ZF Bottom Freestanding PoH",                               RHT_ZF_BOTTOM_FREESTANDING_POH,                                  RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,               true);
+    locationTable[RC_ZF_ICEBERC_FREESTANDING_POH] =                             Location::Collectable(RC_ZF_ICEBERC_FREESTANDING_POH,                                  RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_FOUNTAIN,               ACTOR_EN_ITEM00,      SCENE_ZORAS_FOUNTAIN,               262,                                               0x01, "Iceberg Freestanding PoH",                    RHT_ZF_ICEBERG_FREESTANDING_POH,                                 RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,               true);
+    locationTable[RC_ZF_BOTTOM_FREESTANDING_POH] =                              Location::Collectable(RC_ZF_BOTTOM_FREESTANDING_POH,                                   RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_FOUNTAIN,               ACTOR_EN_ITEM00,      SCENE_ZORAS_FOUNTAIN,               5126,                                              0x14, "Bottom Freestanding PoH",                     RHT_ZF_BOTTOM_FREESTANDING_POH,                                  RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,               true);
     // Lon Lon Ranch
-    locationTable[RC_LLR_TALONS_CHICKENS] =                                            Location::Base(RC_LLR_TALONS_CHICKENS,                                          RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LON_LON_RANCH,                ACTOR_ID_MAX,         SCENE_LON_LON_BUILDINGS,            0x00,                                              0x14, "Talons Chickens",                             "LLR Talons Chickens",                                      RHT_LLR_TALONS_CHICKENS,                                         RG_BOTTLE_WITH_MILK,                  {},                                                     SpoilerCollectionCheck::ItemGetInf(2),                                                                                        SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH,              true);
-    locationTable[RC_LLR_FREESTANDING_POH] =                                    Location::Collectable(RC_LLR_FREESTANDING_POH,                                         RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LON_LON_RANCH,                ACTOR_EN_ITEM00,      SCENE_LON_LON_BUILDINGS,            262,                                               0x01, "Freestanding PoH",                            "LLR Freestanding PoH",                                     RHT_LLR_FREESTANDING_POH,                                        RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH,              true);
-    locationTable[RC_LLR_DEKU_SCRUB_GROTTO_LEFT] =                              Location::GrottoScrub(RC_LLR_DEKU_SCRUB_GROTTO_LEFT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LON_LON_RANCH,                ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x00, 0xFC),                      0x30, "Deku Scrub Grotto Left",                      "LLR Deku Scrub Grotto Left",                               RHT_LLR_DEKU_SCRUB_GROTTO_LEFT,                                  RG_BUY_DEKU_NUTS_5,                   { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LLR_DEKU_SCRUB_GROTTO_LEFT),                                  SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
-    locationTable[RC_LLR_DEKU_SCRUB_GROTTO_RIGHT] =                             Location::GrottoScrub(RC_LLR_DEKU_SCRUB_GROTTO_RIGHT,                                  RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LON_LON_RANCH,                ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x05, 0xFC),                      0x37, "Deku Scrub Grotto Right",                     "LLR Deku Scrub Grotto Right",                              RHT_LLR_DEKU_SCRUB_GROTTO_RIGHT,                                 RG_BUY_BOMBS_535,                     { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LLR_DEKU_SCRUB_GROTTO_RIGHT),                                 SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
-    locationTable[RC_LLR_DEKU_SCRUB_GROTTO_CENTER] =                            Location::GrottoScrub(RC_LLR_DEKU_SCRUB_GROTTO_CENTER,                                 RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LON_LON_RANCH,                ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x03, 0xFC),                      0x33, "Deku Scrub Grotto Center",                    "LLR Deku Scrub Grotto Center",                             RHT_LLR_DEKU_SCRUB_GROTTO_CENTER,                                RG_BUY_DEKU_SEEDS_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LLR_DEKU_SCRUB_GROTTO_CENTER),                                SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
+    locationTable[RC_LLR_TALONS_CHICKENS] =                                            Location::Base(RC_LLR_TALONS_CHICKENS,                                          RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LON_LON_RANCH,                ACTOR_ID_MAX,         SCENE_LON_LON_BUILDINGS,            0x00,                                              0x14, "Talons Chickens",                             RHT_LLR_TALONS_CHICKENS,                                         RG_BOTTLE_WITH_MILK,                  {},                                                     SpoilerCollectionCheck::ItemGetInf(2),                                                                                        SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH,              true);
+    locationTable[RC_LLR_FREESTANDING_POH] =                                    Location::Collectable(RC_LLR_FREESTANDING_POH,                                         RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LON_LON_RANCH,                ACTOR_EN_ITEM00,      SCENE_LON_LON_BUILDINGS,            262,                                               0x01, "Freestanding PoH",                            RHT_LLR_FREESTANDING_POH,                                        RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH,              true);
+    locationTable[RC_LLR_DEKU_SCRUB_GROTTO_LEFT] =                              Location::GrottoScrub(RC_LLR_DEKU_SCRUB_GROTTO_LEFT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LON_LON_RANCH,                ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x00, 0xFC),                      0x30, "Deku Scrub Grotto Left",                      RHT_LLR_DEKU_SCRUB_GROTTO_LEFT,                                  RG_BUY_DEKU_NUTS_5,                   { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LLR_DEKU_SCRUB_GROTTO_LEFT),                                  SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
+    locationTable[RC_LLR_DEKU_SCRUB_GROTTO_RIGHT] =                             Location::GrottoScrub(RC_LLR_DEKU_SCRUB_GROTTO_RIGHT,                                  RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LON_LON_RANCH,                ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x05, 0xFC),                      0x37, "Deku Scrub Grotto Right",                     RHT_LLR_DEKU_SCRUB_GROTTO_RIGHT,                                 RG_BUY_BOMBS_535,                     { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LLR_DEKU_SCRUB_GROTTO_RIGHT),                                 SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
+    locationTable[RC_LLR_DEKU_SCRUB_GROTTO_CENTER] =                            Location::GrottoScrub(RC_LLR_DEKU_SCRUB_GROTTO_CENTER,                                 RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LON_LON_RANCH,                ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x03, 0xFC),                      0x33, "Deku Scrub Grotto Center",                    RHT_LLR_DEKU_SCRUB_GROTTO_CENTER,                                RG_BUY_DEKU_SEEDS_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LLR_DEKU_SCRUB_GROTTO_CENTER),                                SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
 
     // Dungeons
     // Deku Tree Vanilla
-    locationTable[RC_DEKU_TREE_MAP_CHEST] =                                           Location::Chest(RC_DEKU_TREE_MAP_CHEST,                                          RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    2083,                                              0x03, "Map Chest",                                   "Deku Tree Map Chest",                                      RHT_DEKU_TREE_MAP_CHEST,                                         RG_DEKU_TREE_MAP,                     { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE,          true);
-    locationTable[RC_DEKU_TREE_COMPASS_CHEST] =                                       Location::Chest(RC_DEKU_TREE_COMPASS_CHEST,                                      RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    2050,                                              0x02, "Compass Chest",                               "Deku Tree Compass Chest",                                  RHT_DEKU_TREE_COMPASS_CHEST,                                     RG_DEKU_TREE_COMPASS,                 { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE,          true);
-    locationTable[RC_DEKU_TREE_COMPASS_ROOM_SIDE_CHEST] =                             Location::Chest(RC_DEKU_TREE_COMPASS_ROOM_SIDE_CHEST,                            RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    22790,                                             0x06, "Compass Room Side Chest",                     "Deku Tree Compass Room Side Chest",                        RHT_DEKU_TREE_COMPASS_ROOM_SIDE_CHEST,                           RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[RC_DEKU_TREE_BASEMENT_CHEST] =                                      Location::Chest(RC_DEKU_TREE_BASEMENT_CHEST,                                     RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    22788,                                             0x04, "Basement Chest",                              "Deku Tree Basement Chest",                                 RHT_DEKU_TREE_BASEMENT_CHEST,                                    RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[RC_DEKU_TREE_SLINGSHOT_CHEST] =                                     Location::Chest(RC_DEKU_TREE_SLINGSHOT_CHEST,                                    RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    161,                                               0x01, "Slingshot Chest",                             "Deku Tree Slingshot Chest",                                RHT_DEKU_TREE_SLINGSHOT_CHEST,                                   RG_PROGRESSIVE_SLINGSHOT,             {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE,          true);
-    locationTable[RC_DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST] =                           Location::Chest(RC_DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST,                          RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    22789,                                             0x05, "Slingshot Room Side Chest",                   "Deku Tree Slingshot Room Side Chest",                      RHT_DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST,                         RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_MAP_CHEST] =                                           Location::Chest(RC_DEKU_TREE_MAP_CHEST,                                          RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    2083,                                              0x03, "Map Chest",                                   RHT_DEKU_TREE_MAP_CHEST,                                         RG_DEKU_TREE_MAP,                     { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE,          true);
+    locationTable[RC_DEKU_TREE_COMPASS_CHEST] =                                       Location::Chest(RC_DEKU_TREE_COMPASS_CHEST,                                      RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    2050,                                              0x02, "Compass Chest",                               RHT_DEKU_TREE_COMPASS_CHEST,                                     RG_DEKU_TREE_COMPASS,                 { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE,          true);
+    locationTable[RC_DEKU_TREE_COMPASS_ROOM_SIDE_CHEST] =                             Location::Chest(RC_DEKU_TREE_COMPASS_ROOM_SIDE_CHEST,                            RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    22790,                                             0x06, "Compass Room Side Chest",                     RHT_DEKU_TREE_COMPASS_ROOM_SIDE_CHEST,                           RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_BASEMENT_CHEST] =                                      Location::Chest(RC_DEKU_TREE_BASEMENT_CHEST,                                     RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    22788,                                             0x04, "Basement Chest",                              RHT_DEKU_TREE_BASEMENT_CHEST,                                    RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_SLINGSHOT_CHEST] =                                     Location::Chest(RC_DEKU_TREE_SLINGSHOT_CHEST,                                    RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    161,                                               0x01, "Slingshot Chest",                             RHT_DEKU_TREE_SLINGSHOT_CHEST,                                   RG_PROGRESSIVE_SLINGSHOT,             {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE,          true);
+    locationTable[RC_DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST] =                           Location::Chest(RC_DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST,                          RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    22789,                                             0x05, "Slingshot Room Side Chest",                   RHT_DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST,                         RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
     // Deku Tree MQ
-    locationTable[RC_DEKU_TREE_MQ_MAP_CHEST] =                                        Location::Chest(RC_DEKU_TREE_MQ_MAP_CHEST,                                       RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    2083,                                              0x03, "MQ Map Chest",                                "Deku Tree MQ Map Chest",                                   RHT_DEKU_TREE_MQ_MAP_CHEST,                                      RG_DEKU_TREE_MAP,                     { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE,          true);
-    locationTable[RC_DEKU_TREE_MQ_COMPASS_CHEST] =                                    Location::Chest(RC_DEKU_TREE_MQ_COMPASS_CHEST,                                   RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    2049,                                              0x01, "MQ Compass Chest",                            "Deku Tree MQ Compass Chest",                               RHT_DEKU_TREE_MQ_COMPASS_CHEST,                                  RG_DEKU_TREE_COMPASS,                 { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE,          true);
-    locationTable[RC_DEKU_TREE_MQ_SLINGSHOT_CHEST] =                                  Location::Chest(RC_DEKU_TREE_MQ_SLINGSHOT_CHEST,                                 RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    4262,                                              0x06, "MQ Slingshot Chest",                          "Deku Tree MQ Slingshot Chest",                             RHT_DEKU_TREE_MQ_SLINGSHOT_CHEST,                                RG_PROGRESSIVE_SLINGSHOT,             {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE,          true);
-    locationTable[RC_DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST] =                        Location::Chest(RC_DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST,                       RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    -31454,                                            0x02, "MQ Slingshot Room Back Chest",                "Deku Tree MQ Slingshot Room Back Chest",                   RHT_DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST,                      RG_DEKU_SHIELD,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[RC_DEKU_TREE_MQ_BASEMENT_CHEST] =                                   Location::Chest(RC_DEKU_TREE_MQ_BASEMENT_CHEST,                                  RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    -31452,                                            0x04, "MQ Basement Chest",                           "Deku Tree MQ Basement Chest",                              RHT_DEKU_TREE_MQ_BASEMENT_CHEST,                                 RG_DEKU_SHIELD,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[RC_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST] =                        Location::Chest(RC_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST,                       RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    22789,                                             0x05, "MQ Before Spinning Log Chest",                "Deku Tree MQ Before Spinning Log Chest",                   RHT_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST,                      RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[RC_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST] =                         Location::Chest(RC_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST,                        RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    23200,                                             0x00, "MQ After Spinning Log Chest",                 "Deku Tree MQ After Spinning Log Chest",                    RHT_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST,                       RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[RC_DEKU_TREE_MQ_DEKU_SCRUB] =                                        Location::Base(RC_DEKU_TREE_MQ_DEKU_SCRUB,                                      RCQUEST_MQ,      RCTYPE_SCRUB,                       RCAREA_DEKU_TREE,                    ACTOR_EN_DNS,         SCENE_DEKU_TREE,                    0x04,                                              0x34, "MQ Deku Scrub",                               "Deku Tree MQ Deku Scrub",                                  RHT_DEKU_TREE_MQ_DEKU_SCRUB,                                     RG_BUY_DEKU_SHIELD,                   { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DEKU_TREE_MQ_DEKU_SCRUB),                                     SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_MQ_MAP_CHEST] =                                        Location::Chest(RC_DEKU_TREE_MQ_MAP_CHEST,                                       RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    2083,                                              0x03, "MQ Map Chest",                                RHT_DEKU_TREE_MQ_MAP_CHEST,                                      RG_DEKU_TREE_MAP,                     { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE,          true);
+    locationTable[RC_DEKU_TREE_MQ_COMPASS_CHEST] =                                    Location::Chest(RC_DEKU_TREE_MQ_COMPASS_CHEST,                                   RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    2049,                                              0x01, "MQ Compass Chest",                            RHT_DEKU_TREE_MQ_COMPASS_CHEST,                                  RG_DEKU_TREE_COMPASS,                 { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE,          true);
+    locationTable[RC_DEKU_TREE_MQ_SLINGSHOT_CHEST] =                                  Location::Chest(RC_DEKU_TREE_MQ_SLINGSHOT_CHEST,                                 RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    4262,                                              0x06, "MQ Slingshot Chest",                          RHT_DEKU_TREE_MQ_SLINGSHOT_CHEST,                                RG_PROGRESSIVE_SLINGSHOT,             {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE,          true);
+    locationTable[RC_DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST] =                        Location::Chest(RC_DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST,                       RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    -31454,                                            0x02, "MQ Slingshot Room Back Chest",                RHT_DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST,                      RG_DEKU_SHIELD,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_MQ_BASEMENT_CHEST] =                                   Location::Chest(RC_DEKU_TREE_MQ_BASEMENT_CHEST,                                  RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    -31452,                                            0x04, "MQ Basement Chest",                           RHT_DEKU_TREE_MQ_BASEMENT_CHEST,                                 RG_DEKU_SHIELD,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST] =                        Location::Chest(RC_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST,                       RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    22789,                                             0x05, "MQ Before Spinning Log Chest",                RHT_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST,                      RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST] =                         Location::Chest(RC_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST,                        RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    23200,                                             0x00, "MQ After Spinning Log Chest",                 RHT_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST,                       RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_MQ_DEKU_SCRUB] =                                        Location::Base(RC_DEKU_TREE_MQ_DEKU_SCRUB,                                      RCQUEST_MQ,      RCTYPE_SCRUB,                       RCAREA_DEKU_TREE,                    ACTOR_EN_DNS,         SCENE_DEKU_TREE,                    0x04,                                              0x34, "MQ Deku Scrub",                               RHT_DEKU_TREE_MQ_DEKU_SCRUB,                                     RG_BUY_DEKU_SHIELD,                   { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DEKU_TREE_MQ_DEKU_SCRUB),                                     SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
 
     // Dodongo's Cavern Shared
-    locationTable[RC_DODONGOS_CAVERN_BOSS_ROOM_CHEST] =                               Location::Chest(RC_DODONGOS_CAVERN_BOSS_ROOM_CHEST,                              RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN_BOSS,         20512,                                             0x00, "Boss Room Chest",                             "Dodongos Cavern Boss Room Chest",                          RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST,                             RG_BOMBS_5,                           {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_BOSS_ROOM_CHEST] =                               Location::Chest(RC_DODONGOS_CAVERN_BOSS_ROOM_CHEST,                              RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN_BOSS,         20512,                                             0x00, "Boss Room Chest",                             RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST,                             RG_BOMBS_5,                           {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
     // Dodongo's Cavern Vanilla
-    locationTable[RC_DODONGOS_CAVERN_MAP_CHEST] =                                     Location::Chest(RC_DODONGOS_CAVERN_MAP_CHEST,                                    RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              2088,                                              0x08, "Map Chest",                                   "Dodongos Cavern Map Chest",                                RHT_DODONGOS_CAVERN_MAP_CHEST,                                   RG_DODONGOS_CAVERN_MAP,               { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN,    true);
-    locationTable[RC_DODONGOS_CAVERN_COMPASS_CHEST] =                                 Location::Chest(RC_DODONGOS_CAVERN_COMPASS_CHEST,                                RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              2053,                                              0x05, "Compass Chest",                               "Dodongos Cavern Compass Chest",                            RHT_DODONGOS_CAVERN_COMPASS_CHEST,                               RG_DODONGOS_CAVERN_COMPASS,           { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN,    true);
-    locationTable[RC_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST] =                    Location::Chest(RC_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST,                   RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              22982,                                             0x06, "Bomb Flower Platform Chest",                  "Dodongos Cavern Bomb Flower Platform Chest",               RHT_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST,                  RG_RED_RUPEE,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_BOMB_BAG_CHEST] =                                Location::Chest(RC_DODONGOS_CAVERN_BOMB_BAG_CHEST,                               RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              1604,                                              0x04, "Bomb Bag Chest",                              "Dodongos Cavern Bomb Bag Chest",                           RHT_DODONGOS_CAVERN_BOMB_BAG_CHEST,                              RG_PROGRESSIVE_BOMB_BAG,              {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN,    true);
-    locationTable[RC_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST] =                           Location::Chest(RC_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST,                          RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              21802,                                             0x0A, "End Of Bridge Chest",                         "Dodongos Cavern End Of Bridge Chest",                      RHT_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST,                         RG_DEKU_SHIELD,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT] =                  Location::Base(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,                RCQUEST_VANILLA, RCTYPE_SCRUB,                       RCAREA_DODONGOS_CAVERN,              ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x00,                                              0x30, "Deku Scrub Near Bomb Bag Left",               "Dodongos Cavern Deku Scrub Near Bomb Bag Left",            RHT_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,               RG_BUY_DEKU_NUTS_5,                   { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT),               SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS] =             Location::Base(RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS,           RCQUEST_VANILLA, RCTYPE_SCRUB,                       RCAREA_DODONGOS_CAVERN,              ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x01,                                              0x31, "Deku Scrub Side Room Near Dodongos",          "Dodongos Cavern Deku Scrub Side Room Near Dodongos",       RHT_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS,          RG_BUY_DEKU_STICK_1,                  { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS),          SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT] =                 Location::Base(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT,               RCQUEST_VANILLA, RCTYPE_SCRUB,                       RCAREA_DODONGOS_CAVERN,              ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x03,                                              0x33, "Deku Scrub Near Bomb Bag Right",              "Dodongos Cavern Deku Scrub Near Bomb Bag Right",           RHT_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT,              RG_BUY_DEKU_SEEDS_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT),              SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY] =                               Location::Base(RC_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY,                             RCQUEST_VANILLA, RCTYPE_SCRUB,                       RCAREA_DODONGOS_CAVERN,              ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x04,                                              0x34, "Deku Scrub Lobby",                            "Dodongos Cavern Deku Scrub Lobby",                         RHT_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY,                            RG_BUY_DEKU_SHIELD,                   { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY),                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_MAP_CHEST] =                                     Location::Chest(RC_DODONGOS_CAVERN_MAP_CHEST,                                    RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              2088,                                              0x08, "Map Chest",                                   RHT_DODONGOS_CAVERN_MAP_CHEST,                                   RG_DODONGOS_CAVERN_MAP,               { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN,    true);
+    locationTable[RC_DODONGOS_CAVERN_COMPASS_CHEST] =                                 Location::Chest(RC_DODONGOS_CAVERN_COMPASS_CHEST,                                RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              2053,                                              0x05, "Compass Chest",                               RHT_DODONGOS_CAVERN_COMPASS_CHEST,                               RG_DODONGOS_CAVERN_COMPASS,           { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN,    true);
+    locationTable[RC_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST] =                    Location::Chest(RC_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST,                   RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              22982,                                             0x06, "Bomb Flower Platform Chest",                  RHT_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST,                  RG_RED_RUPEE,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_BOMB_BAG_CHEST] =                                Location::Chest(RC_DODONGOS_CAVERN_BOMB_BAG_CHEST,                               RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              1604,                                              0x04, "Bomb Bag Chest",                              RHT_DODONGOS_CAVERN_BOMB_BAG_CHEST,                              RG_PROGRESSIVE_BOMB_BAG,              {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN,    true);
+    locationTable[RC_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST] =                           Location::Chest(RC_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST,                          RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              21802,                                             0x0A, "End Of Bridge Chest",                         RHT_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST,                         RG_DEKU_SHIELD,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT] =                  Location::Base(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,                RCQUEST_VANILLA, RCTYPE_SCRUB,                       RCAREA_DODONGOS_CAVERN,              ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x00,                                              0x30, "Deku Scrub Near Bomb Bag Left",               RHT_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,               RG_BUY_DEKU_NUTS_5,                   { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT),               SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS] =             Location::Base(RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS,           RCQUEST_VANILLA, RCTYPE_SCRUB,                       RCAREA_DODONGOS_CAVERN,              ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x01,                                              0x31, "Deku Scrub Side Room Near Dodongos",          RHT_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS,          RG_BUY_DEKU_STICK_1,                  { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS),          SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT] =                 Location::Base(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT,               RCQUEST_VANILLA, RCTYPE_SCRUB,                       RCAREA_DODONGOS_CAVERN,              ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x03,                                              0x33, "Deku Scrub Near Bomb Bag Right",              RHT_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT,              RG_BUY_DEKU_SEEDS_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT),              SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY] =                               Location::Base(RC_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY,                             RCQUEST_VANILLA, RCTYPE_SCRUB,                       RCAREA_DODONGOS_CAVERN,              ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x04,                                              0x34, "Deku Scrub Lobby",                            RHT_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY,                            RG_BUY_DEKU_SHIELD,                   { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY),                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
     // Dodongo's Cavern MQ
-    locationTable[RC_DODONGOS_CAVERN_MQ_MAP_CHEST] =                                  Location::Chest(RC_DODONGOS_CAVERN_MQ_MAP_CHEST,                                 RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              2080,                                              0x00, "MQ Map Chest",                                "Dodongos Cavern MQ Map Chest",                             RHT_DODONGOS_CAVERN_MQ_MAP_CHEST,                                RG_DODONGOS_CAVERN_MAP,               { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN,    true);
-    locationTable[RC_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST] =                             Location::Chest(RC_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST,                            RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              1604,                                              0x04, "MQ Bomb Bag Chest",                           "Dodongos Cavern MQ Bomb Bag Chest",                        RHT_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST,                           RG_PROGRESSIVE_BOMB_BAG,              {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN,    true);
-    locationTable[RC_DODONGOS_CAVERN_MQ_COMPASS_CHEST] =                              Location::Chest(RC_DODONGOS_CAVERN_MQ_COMPASS_CHEST,                             RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              6149,                                              0x05, "MQ Compass Chest",                            "Dodongos Cavern MQ Compass Chest",                         RHT_DODONGOS_CAVERN_MQ_COMPASS_CHEST,                            RG_DODONGOS_CAVERN_COMPASS,           { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN,    true);
-    locationTable[RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST] =                          Location::Chest(RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST,                         RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              29986,                                             0x02, "MQ Larvae Room Chest",                        "Dodongos Cavern MQ Larvae Room Chest",                     RHT_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST,                        RG_DEKU_SHIELD,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST] =                    Location::Chest(RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST,                   RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              22947,                                             0x03, "MQ Torch Puzzle Room Chest",                  "Dodongos Cavern MQ Torch Puzzle Room Chest",               RHT_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST,                  RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST] =                          Location::Chest(RC_DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST,                         RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              21825,                                             0x01, "MQ Under Grave Chest",                        "Dodongos Cavern MQ Under Grave Chest",                     RHT_DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST,                        RG_HYLIAN_SHIELD,                     {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR] =                       Location::Base(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,                     RCQUEST_MQ,      RCTYPE_SCRUB,                       RCAREA_DODONGOS_CAVERN,              ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x01,                                              0x31, "MQ Deku Scrub Lobby Rear",                    "Dodongos Cavern Deku Scrub Lobby Rear",                    RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,                    RG_BUY_DEKU_STICK_1,                  { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR),                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT] =                      Location::Base(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT,                    RCQUEST_MQ,      RCTYPE_SCRUB,                       RCAREA_DODONGOS_CAVERN,              ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x03,                                              0x33, "MQ Deku Scrub Lobby Front",                   "Dodongos Cavern Deku Scrub Lobby Front",                   RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT,                   RG_BUY_DEKU_SEEDS_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT),                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE] =                        Location::Base(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,                      RCQUEST_MQ,      RCTYPE_SCRUB,                       RCAREA_DODONGOS_CAVERN,              ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x04,                                              0x34, "MQ Deku Scrub Staircase",                     "Dodongos Cavern Deku Scrub Staircase",                     RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,                     RG_BUY_DEKU_SHIELD,                   { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE),                     SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS] =    Location::Base(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS,  RCQUEST_MQ,      RCTYPE_SCRUB,                       RCAREA_DODONGOS_CAVERN,              ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x07,                                              0x39, "MQ Deku Scrub Side Room Near Lower Lizalfos", "Dodongos Cavern Deku Scrub Side Room Near Lower Lizalfos", RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS, RG_BUY_RED_POTION_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_MQ_MAP_CHEST] =                                  Location::Chest(RC_DODONGOS_CAVERN_MQ_MAP_CHEST,                                 RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              2080,                                              0x00, "MQ Map Chest",                                RHT_DODONGOS_CAVERN_MQ_MAP_CHEST,                                RG_DODONGOS_CAVERN_MAP,               { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN,    true);
+    locationTable[RC_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST] =                             Location::Chest(RC_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST,                            RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              1604,                                              0x04, "MQ Bomb Bag Chest",                           RHT_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST,                           RG_PROGRESSIVE_BOMB_BAG,              {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN,    true);
+    locationTable[RC_DODONGOS_CAVERN_MQ_COMPASS_CHEST] =                              Location::Chest(RC_DODONGOS_CAVERN_MQ_COMPASS_CHEST,                             RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              6149,                                              0x05, "MQ Compass Chest",                            RHT_DODONGOS_CAVERN_MQ_COMPASS_CHEST,                            RG_DODONGOS_CAVERN_COMPASS,           { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN,    true);
+    locationTable[RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST] =                          Location::Chest(RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST,                         RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              29986,                                             0x02, "MQ Larvae Room Chest",                        RHT_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST,                        RG_DEKU_SHIELD,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST] =                    Location::Chest(RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST,                   RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              22947,                                             0x03, "MQ Torch Puzzle Room Chest",                  RHT_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST,                  RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST] =                          Location::Chest(RC_DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST,                         RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              21825,                                             0x01, "MQ Under Grave Chest",                        RHT_DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST,                        RG_HYLIAN_SHIELD,                     {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR] =                       Location::Base(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,                     RCQUEST_MQ,      RCTYPE_SCRUB,                       RCAREA_DODONGOS_CAVERN,              ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x01,                                              0x31, "MQ Deku Scrub Lobby Rear",                    RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,                    RG_BUY_DEKU_STICK_1,                  { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR),                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT] =                      Location::Base(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT,                    RCQUEST_MQ,      RCTYPE_SCRUB,                       RCAREA_DODONGOS_CAVERN,              ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x03,                                              0x33, "MQ Deku Scrub Lobby Front",                   RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT,                   RG_BUY_DEKU_SEEDS_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT),                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE] =                        Location::Base(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,                      RCQUEST_MQ,      RCTYPE_SCRUB,                       RCAREA_DODONGOS_CAVERN,              ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x04,                                              0x34, "MQ Deku Scrub Staircase",                     RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,                     RG_BUY_DEKU_SHIELD,                   { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE),                     SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS] =    Location::Base(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS,  RCQUEST_MQ,      RCTYPE_SCRUB,                       RCAREA_DODONGOS_CAVERN,              ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x07,                                              0x39, "MQ Deku Scrub Side Room Near Lower Lizalfos", RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS, RG_BUY_RED_POTION_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
 
     // Jabu-Jabu's Belly Vanilla
-    locationTable[RC_JABU_JABUS_BELLY_MAP_CHEST] =                                    Location::Chest(RC_JABU_JABUS_BELLY_MAP_CHEST,                                   RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    6178,                                              0x02, "Map Chest",                                   "Jabu Jabus Belly Map Chest",                               RHT_JABU_JABUS_BELLY_MAP_CHEST,                                  RG_JABU_JABUS_BELLY_MAP,              { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY,    true);
-    locationTable[RC_JABU_JABUS_BELLY_COMPASS_CHEST] =                                Location::Chest(RC_JABU_JABUS_BELLY_COMPASS_CHEST,                               RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    -18428,                                            0x04, "Compass Chest",                               "Jabu Jabus Belly Compass Chest",                           RHT_JABU_JABUS_BELLY_COMPASS_CHEST,                              RG_JABU_JABUS_BELLY_COMPASS,          { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY,    true);
-    locationTable[RC_JABU_JABUS_BELLY_BOOMERANG_CHEST] =                              Location::Chest(RC_JABU_JABUS_BELLY_BOOMERANG_CHEST,                             RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    4289,                                              0x01, "Boomerang Chest",                             "Jabu Jabus Belly Boomerang Chest",                         RHT_JABU_JABUS_BELLY_BOOMERANG_CHEST,                            RG_BOOMERANG,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY,    true);
-    locationTable[RC_JABU_JABUS_BELLY_DEKU_SCRUB] =                                    Location::Base(RC_JABU_JABUS_BELLY_DEKU_SCRUB,                                  RCQUEST_VANILLA, RCTYPE_SCRUB,                       RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_DNS,         SCENE_JABU_JABU,                    0x00,                                              0x30, "Deku Scrub",                                  "Jabu Jabus Belly Deku Scrub",                              RHT_JABU_JABUS_BELLY_DEKU_SCRUB,                                 RG_BUY_DEKU_NUTS_5,                   { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_JABU_JABUS_BELLY_DEKU_SCRUB),                                 SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_MAP_CHEST] =                                    Location::Chest(RC_JABU_JABUS_BELLY_MAP_CHEST,                                   RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    6178,                                              0x02, "Map Chest",                                   RHT_JABU_JABUS_BELLY_MAP_CHEST,                                  RG_JABU_JABUS_BELLY_MAP,              { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY,    true);
+    locationTable[RC_JABU_JABUS_BELLY_COMPASS_CHEST] =                                Location::Chest(RC_JABU_JABUS_BELLY_COMPASS_CHEST,                               RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    -18428,                                            0x04, "Compass Chest",                               RHT_JABU_JABUS_BELLY_COMPASS_CHEST,                              RG_JABU_JABUS_BELLY_COMPASS,          { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY,    true);
+    locationTable[RC_JABU_JABUS_BELLY_BOOMERANG_CHEST] =                              Location::Chest(RC_JABU_JABUS_BELLY_BOOMERANG_CHEST,                             RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    4289,                                              0x01, "Boomerang Chest",                             RHT_JABU_JABUS_BELLY_BOOMERANG_CHEST,                            RG_BOOMERANG,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY,    true);
+    locationTable[RC_JABU_JABUS_BELLY_DEKU_SCRUB] =                                    Location::Base(RC_JABU_JABUS_BELLY_DEKU_SCRUB,                                  RCQUEST_VANILLA, RCTYPE_SCRUB,                       RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_DNS,         SCENE_JABU_JABU,                    0x00,                                              0x30, "Deku Scrub",                                  RHT_JABU_JABUS_BELLY_DEKU_SCRUB,                                 RG_BUY_DEKU_NUTS_5,                   { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_JABU_JABUS_BELLY_DEKU_SCRUB),                                 SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
     // Jabu-Jabu's Belly MQ
-    locationTable[RC_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST] =                     Location::Chest(RC_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST,                    RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    -32699,                                            0x05, "MQ First Room Side Chest",                    "Jabu Jabus Belly MQ First Room Side Chest",                RHT_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST,                   RG_DEKU_NUTS_5,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_JABU_JABUS_BELLY_MQ_MAP_CHEST] =                                 Location::Chest(RC_JABU_JABUS_BELLY_MQ_MAP_CHEST,                                RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    -18397,                                            0x03, "MQ Map Chest",                                "Jabu Jabus Belly MQ Map Chest",                            RHT_JABU_JABUS_BELLY_MQ_MAP_CHEST,                               RG_JABU_JABUS_BELLY_MAP,              { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY,    true);
-    locationTable[RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST] =                   Location::Chest(RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST,                  RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    20546,                                             0x02, "MQ Second Room Lower Chest",                  "Jabu Jabus Belly MQ Second Room Lower Chest",              RHT_JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST,                 RG_DEKU_NUTS_5,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_JABU_JABUS_BELLY_MQ_COMPASS_CHEST] =                             Location::Chest(RC_JABU_JABUS_BELLY_MQ_COMPASS_CHEST,                            RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    -18432,                                            0x00, "MQ Compass Chest",                            "Jabu Jabus Belly MQ Compass Chest",                        RHT_JABU_JABUS_BELLY_MQ_COMPASS_CHEST,                           RG_JABU_JABUS_BELLY_COMPASS,          { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY,    true);
-    locationTable[RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST] =                   Location::Chest(RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST,                  RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    -30457,                                            0x07, "MQ Second Room Upper Chest",                  "Jabu Jabus Belly MQ Second Room Upper Chest",              RHT_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST,                 RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST] =              Location::Chest(RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST,             RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    -32696,                                            0x08, "MQ Basement Near Switches Chest",             "Jabu Jabus Belly MQ Basement Near Switches Chest",         RHT_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST,            RG_DEKU_NUTS_5,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST] =                 Location::Chest(RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST,                RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    -32668,                                            0x04, "MQ Basement Near Vines Chest",                "Jabu Jabus Belly MQ Basement Near Vines Chest",            RHT_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST,               RG_BOMBCHU_10,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST] =                           Location::Chest(RC_JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST,                          RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    -31446,                                            0x0A, "MQ Near Boss Chest",                          "Jabu Jabus Belly MQ Near Boss Chest",                      RHT_JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST,                         RG_DEKU_SHIELD,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST] =              Location::Chest(RC_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST,             RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    28905,                                             0x09, "MQ Falling Like Like Room Chest",             "Jabu Jabus Belly MQ Falling Like Like Room Chest",         RHT_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST,            RG_DEKU_STICK_1,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST] =                Location::Chest(RC_JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST,               RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    20545,                                             0x01, "MQ Boomerang Room Small Chest",               "Jabu Jabus Belly MQ Boomerang Room Small Chest",           RHT_JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST,              RG_DEKU_NUTS_5,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST] =                           Location::Chest(RC_JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST,                          RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    4294,                                              0x06, "MQ Boomerang Chest",                          "Jabu Jabus Belly MQ Boomerang Chest",                      RHT_JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST,                         RG_BOOMERANG,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY,    true);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST] =                     Location::Chest(RC_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST,                    RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    -32699,                                            0x05, "MQ First Room Side Chest",                    RHT_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST,                   RG_DEKU_NUTS_5,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_MAP_CHEST] =                                 Location::Chest(RC_JABU_JABUS_BELLY_MQ_MAP_CHEST,                                RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    -18397,                                            0x03, "MQ Map Chest",                                RHT_JABU_JABUS_BELLY_MQ_MAP_CHEST,                               RG_JABU_JABUS_BELLY_MAP,              { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY,    true);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST] =                   Location::Chest(RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST,                  RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    20546,                                             0x02, "MQ Second Room Lower Chest",                  RHT_JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST,                 RG_DEKU_NUTS_5,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_COMPASS_CHEST] =                             Location::Chest(RC_JABU_JABUS_BELLY_MQ_COMPASS_CHEST,                            RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    -18432,                                            0x00, "MQ Compass Chest",                            RHT_JABU_JABUS_BELLY_MQ_COMPASS_CHEST,                           RG_JABU_JABUS_BELLY_COMPASS,          { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY,    true);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST] =                   Location::Chest(RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST,                  RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    -30457,                                            0x07, "MQ Second Room Upper Chest",                  RHT_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST,                 RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST] =              Location::Chest(RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST,             RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    -32696,                                            0x08, "MQ Basement Near Switches Chest",             RHT_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST,            RG_DEKU_NUTS_5,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST] =                 Location::Chest(RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST,                RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    -32668,                                            0x04, "MQ Basement Near Vines Chest",                RHT_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST,               RG_BOMBCHU_10,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST] =                           Location::Chest(RC_JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST,                          RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    -31446,                                            0x0A, "MQ Near Boss Chest",                          RHT_JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST,                         RG_DEKU_SHIELD,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST] =              Location::Chest(RC_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST,             RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    28905,                                             0x09, "MQ Falling Like Like Room Chest",             RHT_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST,            RG_DEKU_STICK_1,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST] =                Location::Chest(RC_JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST,               RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    20545,                                             0x01, "MQ Boomerang Room Small Chest",               RHT_JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST,              RG_DEKU_NUTS_5,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST] =                           Location::Chest(RC_JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST,                          RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    4294,                                              0x06, "MQ Boomerang Chest",                          RHT_JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST,                         RG_BOOMERANG,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY,    true);
 
     // Forest Temple Vanilla
-    locationTable[RC_FOREST_TEMPLE_FIRST_ROOM_CHEST] =                                Location::Chest(RC_FOREST_TEMPLE_FIRST_ROOM_CHEST,                               RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                22595,                                             0x03, "First Room Chest",                            "Forest Temple First Room Chest",                           RHT_FOREST_TEMPLE_FIRST_ROOM_CHEST,                              RG_FOREST_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
-    locationTable[RC_FOREST_TEMPLE_FIRST_STALFOS_CHEST] =                             Location::Chest(RC_FOREST_TEMPLE_FIRST_STALFOS_CHEST,                            RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                30784,                                             0x00, "First Stalfos Chest",                         "Forest Temple First Stalfos Chest",                        RHT_FOREST_TEMPLE_FIRST_STALFOS_CHEST,                           RG_FOREST_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
-    locationTable[RC_FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST] =                   Location::Chest(RC_FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST,                  RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                22789,                                             0x05, "Raised Island Courtyard Chest",               "Forest Temple Raised Island Courtyard Chest",              RHT_FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST,                 RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[RC_FOREST_TEMPLE_MAP_CHEST] =                                       Location::Chest(RC_FOREST_TEMPLE_MAP_CHEST,                                      RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                6177,                                              0x01, "Map Chest",                                   "Forest Temple Map Chest",                                  RHT_FOREST_TEMPLE_MAP_CHEST,                                     RG_FOREST_TEMPLE_MAP,                 { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
-    locationTable[RC_FOREST_TEMPLE_WELL_CHEST] =                                      Location::Chest(RC_FOREST_TEMPLE_WELL_CHEST,                                     RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                22601,                                             0x09, "Well Chest",                                  "Forest Temple Well Chest",                                 RHT_FOREST_TEMPLE_WELL_CHEST,                                    RG_FOREST_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
-    locationTable[RC_FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST] =                      Location::Chest(RC_FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST,                     RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                22855,                                             0x07, "Falling Ceiling Room Chest",                  "Forest Temple Falling Ceiling Room Chest",                 RHT_FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST,                    RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[RC_FOREST_TEMPLE_EYE_SWITCH_CHEST] =                                Location::Chest(RC_FOREST_TEMPLE_EYE_SWITCH_CHEST,                               RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                -30364,                                            0x04, "Eye Switch Chest",                            "Forest Temple Eye Switch Chest",                           RHT_FOREST_TEMPLE_EYE_SWITCH_CHEST,                              RG_ARROWS_30,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[RC_FOREST_TEMPLE_BOSS_KEY_CHEST] =                                  Location::Chest(RC_FOREST_TEMPLE_BOSS_KEY_CHEST,                                 RCQUEST_VANILLA, RCTYPE_BOSS_KEY,                    RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                10222,                                             0x0E, "Boss Key Chest",                              "Forest Temple Boss Key Chest",                             RHT_FOREST_TEMPLE_BOSS_KEY_CHEST,                                RG_FOREST_TEMPLE_BOSS_KEY,            { Category::cVanillaBossKey },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
-    locationTable[RC_FOREST_TEMPLE_FLOORMASTER_CHEST] =                               Location::Chest(RC_FOREST_TEMPLE_FLOORMASTER_CHEST,                              RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                30786,                                             0x02, "Floormaster Chest",                           "Forest Temple Floormaster Chest",                          RHT_FOREST_TEMPLE_FLOORMASTER_CHEST,                             RG_FOREST_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
-    locationTable[RC_FOREST_TEMPLE_BOW_CHEST] =                                       Location::Chest(RC_FOREST_TEMPLE_BOW_CHEST,                                      RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                -20340,                                            0x0C, "Bow Chest",                                   "Forest Temple Bow Chest",                                  RHT_FOREST_TEMPLE_BOW_CHEST,                                     RG_PROGRESSIVE_BOW,                   {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
-    locationTable[RC_FOREST_TEMPLE_RED_POE_CHEST] =                                   Location::Chest(RC_FOREST_TEMPLE_RED_POE_CHEST,                                  RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                30797,                                             0x0D, "Red Poe Chest",                               "Forest Temple Red Poe Chest",                              RHT_FOREST_TEMPLE_RED_POE_CHEST,                                 RG_FOREST_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
-    locationTable[RC_FOREST_TEMPLE_BLUE_POE_CHEST] =                                  Location::Chest(RC_FOREST_TEMPLE_BLUE_POE_CHEST,                                 RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                6159,                                              0x0F, "Blue Poe Chest",                              "Forest Temple Blue Poe Chest",                             RHT_FOREST_TEMPLE_BLUE_POE_CHEST,                                RG_FOREST_TEMPLE_COMPASS,             { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
-    locationTable[RC_FOREST_TEMPLE_BASEMENT_CHEST] =                                  Location::Chest(RC_FOREST_TEMPLE_BASEMENT_CHEST,                                 RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                22827,                                             0x0B, "Basement Chest",                              "Forest Temple Basement Chest",                             RHT_FOREST_TEMPLE_BASEMENT_CHEST,                                RG_ARROWS_5,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_FIRST_ROOM_CHEST] =                                Location::Chest(RC_FOREST_TEMPLE_FIRST_ROOM_CHEST,                               RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                22595,                                             0x03, "First Room Chest",                            RHT_FOREST_TEMPLE_FIRST_ROOM_CHEST,                              RG_FOREST_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
+    locationTable[RC_FOREST_TEMPLE_FIRST_STALFOS_CHEST] =                             Location::Chest(RC_FOREST_TEMPLE_FIRST_STALFOS_CHEST,                            RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                30784,                                             0x00, "First Stalfos Chest",                         RHT_FOREST_TEMPLE_FIRST_STALFOS_CHEST,                           RG_FOREST_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
+    locationTable[RC_FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST] =                   Location::Chest(RC_FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST,                  RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                22789,                                             0x05, "Raised Island Courtyard Chest",               RHT_FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST,                 RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_MAP_CHEST] =                                       Location::Chest(RC_FOREST_TEMPLE_MAP_CHEST,                                      RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                6177,                                              0x01, "Map Chest",                                   RHT_FOREST_TEMPLE_MAP_CHEST,                                     RG_FOREST_TEMPLE_MAP,                 { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
+    locationTable[RC_FOREST_TEMPLE_WELL_CHEST] =                                      Location::Chest(RC_FOREST_TEMPLE_WELL_CHEST,                                     RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                22601,                                             0x09, "Well Chest",                                  RHT_FOREST_TEMPLE_WELL_CHEST,                                    RG_FOREST_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
+    locationTable[RC_FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST] =                      Location::Chest(RC_FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST,                     RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                22855,                                             0x07, "Falling Ceiling Room Chest",                  RHT_FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST,                    RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_EYE_SWITCH_CHEST] =                                Location::Chest(RC_FOREST_TEMPLE_EYE_SWITCH_CHEST,                               RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                -30364,                                            0x04, "Eye Switch Chest",                            RHT_FOREST_TEMPLE_EYE_SWITCH_CHEST,                              RG_ARROWS_30,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_BOSS_KEY_CHEST] =                                  Location::Chest(RC_FOREST_TEMPLE_BOSS_KEY_CHEST,                                 RCQUEST_VANILLA, RCTYPE_BOSS_KEY,                    RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                10222,                                             0x0E, "Boss Key Chest",                              RHT_FOREST_TEMPLE_BOSS_KEY_CHEST,                                RG_FOREST_TEMPLE_BOSS_KEY,            { Category::cVanillaBossKey },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
+    locationTable[RC_FOREST_TEMPLE_FLOORMASTER_CHEST] =                               Location::Chest(RC_FOREST_TEMPLE_FLOORMASTER_CHEST,                              RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                30786,                                             0x02, "Floormaster Chest",                           RHT_FOREST_TEMPLE_FLOORMASTER_CHEST,                             RG_FOREST_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
+    locationTable[RC_FOREST_TEMPLE_BOW_CHEST] =                                       Location::Chest(RC_FOREST_TEMPLE_BOW_CHEST,                                      RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                -20340,                                            0x0C, "Bow Chest",                                   RHT_FOREST_TEMPLE_BOW_CHEST,                                     RG_PROGRESSIVE_BOW,                   {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
+    locationTable[RC_FOREST_TEMPLE_RED_POE_CHEST] =                                   Location::Chest(RC_FOREST_TEMPLE_RED_POE_CHEST,                                  RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                30797,                                             0x0D, "Red Poe Chest",                               RHT_FOREST_TEMPLE_RED_POE_CHEST,                                 RG_FOREST_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
+    locationTable[RC_FOREST_TEMPLE_BLUE_POE_CHEST] =                                  Location::Chest(RC_FOREST_TEMPLE_BLUE_POE_CHEST,                                 RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                6159,                                              0x0F, "Blue Poe Chest",                              RHT_FOREST_TEMPLE_BLUE_POE_CHEST,                                RG_FOREST_TEMPLE_COMPASS,             { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
+    locationTable[RC_FOREST_TEMPLE_BASEMENT_CHEST] =                                  Location::Chest(RC_FOREST_TEMPLE_BASEMENT_CHEST,                                 RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                22827,                                             0x0B, "Basement Chest",                              RHT_FOREST_TEMPLE_BASEMENT_CHEST,                                RG_ARROWS_5,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
     // Forest Temple MQ
-    locationTable[RC_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST] =                             Location::Chest(RC_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST,                            RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                -30653,                                            0x03, "MQ First Room Chest",                         "Forest Temple MQ First Room Chest",                        RHT_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST,                           RG_FOREST_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[RC_FOREST_TEMPLE_MQ_WOLFOS_CHEST] =                                 Location::Chest(RC_FOREST_TEMPLE_MQ_WOLFOS_CHEST,                                RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                30784,                                             0x00, "MQ Wolfos Chest",                             "Forest Temple MQ Wolfos Chest",                            RHT_FOREST_TEMPLE_MQ_WOLFOS_CHEST,                               RG_FOREST_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
-    locationTable[RC_FOREST_TEMPLE_MQ_BOW_CHEST] =                                    Location::Chest(RC_FOREST_TEMPLE_MQ_BOW_CHEST,                                   RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                -20340,                                            0x0C, "MQ Bow Chest",                                "Forest Temple MQ Bow Chest",                               RHT_FOREST_TEMPLE_MQ_BOW_CHEST,                                  RG_PROGRESSIVE_BOW,                   {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
-    locationTable[RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST] =          Location::Chest(RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST,         RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                22593,                                             0x01, "MQ Raised Island Courtyard Lower Chest",      "Forest Temple MQ Raised Island Courtyard Lower Chest",     RHT_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST,        RG_FOREST_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
-    locationTable[RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST] =          Location::Chest(RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST,         RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                22597,                                             0x05, "MQ Raised Island Courtyard Upper Chest",      "Forest Temple MQ Raised Island Courtyard Upper Chest",     RHT_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST,        RG_FOREST_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
-    locationTable[RC_FOREST_TEMPLE_MQ_WELL_CHEST] =                                   Location::Chest(RC_FOREST_TEMPLE_MQ_WELL_CHEST,                                  RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                22601,                                             0x09, "MQ Well Chest",                               "Forest Temple MQ Well Chest",                              RHT_FOREST_TEMPLE_MQ_WELL_CHEST,                                 RG_FOREST_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
-    locationTable[RC_FOREST_TEMPLE_MQ_MAP_CHEST] =                                    Location::Chest(RC_FOREST_TEMPLE_MQ_MAP_CHEST,                                   RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                6189,                                              0x0D, "MQ Map Chest",                                "Forest Temple MQ Map Chest",                               RHT_FOREST_TEMPLE_MQ_MAP_CHEST,                                  RG_FOREST_TEMPLE_MAP,                 { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
-    locationTable[RC_FOREST_TEMPLE_MQ_COMPASS_CHEST] =                                Location::Chest(RC_FOREST_TEMPLE_MQ_COMPASS_CHEST,                               RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                6159,                                              0x0F, "MQ Compass Chest",                            "Forest Temple MQ Compass Chest",                           RHT_FOREST_TEMPLE_MQ_COMPASS_CHEST,                              RG_FOREST_TEMPLE_COMPASS,             { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
-    locationTable[RC_FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST] =                   Location::Chest(RC_FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST,                  RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                -30426,                                            0x06, "MQ Falling Ceiling Room Chest",               "Forest Temple MQ Falling Ceiling Room Chest",              RHT_FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST,                 RG_ARROWS_5,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[RC_FOREST_TEMPLE_MQ_BASEMENT_CHEST] =                               Location::Chest(RC_FOREST_TEMPLE_MQ_BASEMENT_CHEST,                              RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                22827,                                             0x0B, "MQ Basement Chest",                           "Forest Temple MQ Basement Chest",                          RHT_FOREST_TEMPLE_MQ_BASEMENT_CHEST,                             RG_ARROWS_5,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[RC_FOREST_TEMPLE_MQ_REDEAD_CHEST] =                                 Location::Chest(RC_FOREST_TEMPLE_MQ_REDEAD_CHEST,                                RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                30786,                                             0x02, "MQ Redead Chest",                             "Forest Temple MQ Redead Chest",                            RHT_FOREST_TEMPLE_MQ_REDEAD_CHEST,                               RG_FOREST_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
-    locationTable[RC_FOREST_TEMPLE_MQ_BOSS_KEY_CHEST] =                               Location::Chest(RC_FOREST_TEMPLE_MQ_BOSS_KEY_CHEST,                              RCQUEST_MQ,      RCTYPE_BOSS_KEY,                    RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                10222,                                             0x0E, "MQ Boss Key Chest",                           "Forest Temple MQ Boss Key Chest",                          RHT_FOREST_TEMPLE_MQ_BOSS_KEY_CHEST,                             RG_FOREST_TEMPLE_BOSS_KEY,            { Category::cVanillaBossKey },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
+    locationTable[RC_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST] =                             Location::Chest(RC_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST,                            RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                -30653,                                            0x03, "MQ First Room Chest",                         RHT_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST,                           RG_FOREST_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_MQ_WOLFOS_CHEST] =                                 Location::Chest(RC_FOREST_TEMPLE_MQ_WOLFOS_CHEST,                                RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                30784,                                             0x00, "MQ Wolfos Chest",                             RHT_FOREST_TEMPLE_MQ_WOLFOS_CHEST,                               RG_FOREST_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
+    locationTable[RC_FOREST_TEMPLE_MQ_BOW_CHEST] =                                    Location::Chest(RC_FOREST_TEMPLE_MQ_BOW_CHEST,                                   RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                -20340,                                            0x0C, "MQ Bow Chest",                                RHT_FOREST_TEMPLE_MQ_BOW_CHEST,                                  RG_PROGRESSIVE_BOW,                   {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
+    locationTable[RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST] =          Location::Chest(RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST,         RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                22593,                                             0x01, "MQ Raised Island Courtyard Lower Chest",      RHT_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST,        RG_FOREST_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
+    locationTable[RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST] =          Location::Chest(RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST,         RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                22597,                                             0x05, "MQ Raised Island Courtyard Upper Chest",      RHT_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST,        RG_FOREST_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
+    locationTable[RC_FOREST_TEMPLE_MQ_WELL_CHEST] =                                   Location::Chest(RC_FOREST_TEMPLE_MQ_WELL_CHEST,                                  RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                22601,                                             0x09, "MQ Well Chest",                               RHT_FOREST_TEMPLE_MQ_WELL_CHEST,                                 RG_FOREST_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
+    locationTable[RC_FOREST_TEMPLE_MQ_MAP_CHEST] =                                    Location::Chest(RC_FOREST_TEMPLE_MQ_MAP_CHEST,                                   RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                6189,                                              0x0D, "MQ Map Chest",                                RHT_FOREST_TEMPLE_MQ_MAP_CHEST,                                  RG_FOREST_TEMPLE_MAP,                 { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
+    locationTable[RC_FOREST_TEMPLE_MQ_COMPASS_CHEST] =                                Location::Chest(RC_FOREST_TEMPLE_MQ_COMPASS_CHEST,                               RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                6159,                                              0x0F, "MQ Compass Chest",                            RHT_FOREST_TEMPLE_MQ_COMPASS_CHEST,                              RG_FOREST_TEMPLE_COMPASS,             { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
+    locationTable[RC_FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST] =                   Location::Chest(RC_FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST,                  RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                -30426,                                            0x06, "MQ Falling Ceiling Room Chest",               RHT_FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST,                 RG_ARROWS_5,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_MQ_BASEMENT_CHEST] =                               Location::Chest(RC_FOREST_TEMPLE_MQ_BASEMENT_CHEST,                              RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                22827,                                             0x0B, "MQ Basement Chest",                           RHT_FOREST_TEMPLE_MQ_BASEMENT_CHEST,                             RG_ARROWS_5,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_MQ_REDEAD_CHEST] =                                 Location::Chest(RC_FOREST_TEMPLE_MQ_REDEAD_CHEST,                                RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                30786,                                             0x02, "MQ Redead Chest",                             RHT_FOREST_TEMPLE_MQ_REDEAD_CHEST,                               RG_FOREST_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
+    locationTable[RC_FOREST_TEMPLE_MQ_BOSS_KEY_CHEST] =                               Location::Chest(RC_FOREST_TEMPLE_MQ_BOSS_KEY_CHEST,                              RCQUEST_MQ,      RCTYPE_BOSS_KEY,                    RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                10222,                                             0x0E, "MQ Boss Key Chest",                           RHT_FOREST_TEMPLE_MQ_BOSS_KEY_CHEST,                             RG_FOREST_TEMPLE_BOSS_KEY,            { Category::cVanillaBossKey },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
 
     // Fire Temple Vanilla
-    locationTable[RC_FIRE_TEMPLE_NEAR_BOSS_CHEST] =                                   Location::Chest(RC_FIRE_TEMPLE_NEAR_BOSS_CHEST,                                  RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22593,                                             0x01, "Near Boss Chest",                             "Fire Temple Near Boss Chest",                              RHT_FIRE_TEMPLE_NEAR_BOSS_CHEST,                                 RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
-    locationTable[RC_FIRE_TEMPLE_FLARE_DANCER_CHEST] =                                Location::Chest(RC_FIRE_TEMPLE_FLARE_DANCER_CHEST,                               RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  31936,                                             0x00, "Flare Dancer Chest",                          "Fire Temple Flare Dancer Chest",                           RHT_FIRE_TEMPLE_FLARE_DANCER_CHEST,                              RG_BOMBS_10,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[RC_FIRE_TEMPLE_BOSS_KEY_CHEST] =                                    Location::Chest(RC_FIRE_TEMPLE_BOSS_KEY_CHEST,                                   RCQUEST_VANILLA, RCTYPE_BOSS_KEY,                    RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  10220,                                             0x0C, "Boss Key Chest",                              "Fire Temple Boss Key Chest",                               RHT_FIRE_TEMPLE_BOSS_KEY_CHEST,                                  RG_FIRE_TEMPLE_BOSS_KEY,              { Category::cVanillaBossKey },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
-    locationTable[RC_FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST] =                  Location::Chest(RC_FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST,                 RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22594,                                             0x02, "Big Lava Room Blocked Door Chest",            "Fire Temple Big Lava Room Blocked Door Chest",             RHT_FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST,                RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
-    locationTable[RC_FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST] =               Location::Chest(RC_FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST,              RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22596,                                             0x04, "Big Lava Room Lower Open Door Chest",         "Fire Temple Big Lava Room Lower Open Door Chest",          RHT_FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST,             RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
-    locationTable[RC_FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST] =                          Location::Chest(RC_FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST,                         RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22595,                                             0x03, "Boulder Maze Lower Chest",                    "Fire Temple Boulder Maze Lower Chest",                     RHT_FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST,                        RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
-    locationTable[RC_FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST] =                          Location::Chest(RC_FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST,                         RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22598,                                             0x06, "Boulder Maze Upper Chest",                    "Fire Temple Boulder Maze Upper Chest",                     RHT_FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST,                        RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
-    locationTable[RC_FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST] =                      Location::Chest(RC_FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST,                     RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22600,                                             0x08, "Boulder Maze Side Room Chest",                "Fire Temple Boulder Maze Side Room Chest",                 RHT_FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST,                    RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
-    locationTable[RC_FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST] =                       Location::Chest(RC_FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST,                      RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22603,                                             0x0B, "Boulder Maze Shortcut Chest",                 "Fire Temple Boulder Maze Shortcut Chest",                  RHT_FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST,                     RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
-    locationTable[RC_FIRE_TEMPLE_SCARECROW_CHEST] =                                   Location::Chest(RC_FIRE_TEMPLE_SCARECROW_CHEST,                                  RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  23245,                                             0x0D, "Scarecrow Chest",                             "Fire Temple Scarecrow Chest",                              RHT_FIRE_TEMPLE_SCARECROW_CHEST,                                 RG_HUGE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[RC_FIRE_TEMPLE_MAP_CHEST] =                                         Location::Chest(RC_FIRE_TEMPLE_MAP_CHEST,                                        RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  2090,                                              0x0A, "Map Chest",                                   "Fire Temple Map Chest",                                    RHT_FIRE_TEMPLE_MAP_CHEST,                                       RG_FIRE_TEMPLE_MAP,                   { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
-    locationTable[RC_FIRE_TEMPLE_COMPASS_CHEST] =                                     Location::Chest(RC_FIRE_TEMPLE_COMPASS_CHEST,                                    RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  2055,                                              0x07, "Compass Chest",                               "Fire Temple Compass Chest",                                RHT_FIRE_TEMPLE_COMPASS_CHEST,                                   RG_FIRE_TEMPLE_COMPASS,               { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
-    locationTable[RC_FIRE_TEMPLE_HIGHEST_GORON_CHEST] =                               Location::Chest(RC_FIRE_TEMPLE_HIGHEST_GORON_CHEST,                              RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22601,                                             0x09, "Highest Goron Chest",                         "Fire Temple Highest Goron Chest",                          RHT_FIRE_TEMPLE_HIGHEST_GORON_CHEST,                             RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
-    locationTable[RC_FIRE_TEMPLE_MEGATON_HAMMER_CHEST] =                              Location::Chest(RC_FIRE_TEMPLE_MEGATON_HAMMER_CHEST,                             RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  421,                                               0x05, "Megaton Hammer Chest",                        "Fire Temple Megaton Hammer Chest",                         RHT_FIRE_TEMPLE_MEGATON_HAMMER_CHEST,                            RG_MEGATON_HAMMER,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_FIRE_TEMPLE_NEAR_BOSS_CHEST] =                                   Location::Chest(RC_FIRE_TEMPLE_NEAR_BOSS_CHEST,                                  RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22593,                                             0x01, "Near Boss Chest",                             RHT_FIRE_TEMPLE_NEAR_BOSS_CHEST,                                 RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_FIRE_TEMPLE_FLARE_DANCER_CHEST] =                                Location::Chest(RC_FIRE_TEMPLE_FLARE_DANCER_CHEST,                               RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  31936,                                             0x00, "Flare Dancer Chest",                          RHT_FIRE_TEMPLE_FLARE_DANCER_CHEST,                              RG_BOMBS_10,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    locationTable[RC_FIRE_TEMPLE_BOSS_KEY_CHEST] =                                    Location::Chest(RC_FIRE_TEMPLE_BOSS_KEY_CHEST,                                   RCQUEST_VANILLA, RCTYPE_BOSS_KEY,                    RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  10220,                                             0x0C, "Boss Key Chest",                              RHT_FIRE_TEMPLE_BOSS_KEY_CHEST,                                  RG_FIRE_TEMPLE_BOSS_KEY,              { Category::cVanillaBossKey },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST] =                  Location::Chest(RC_FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST,                 RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22594,                                             0x02, "Big Lava Room Blocked Door Chest",            RHT_FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST,                RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST] =               Location::Chest(RC_FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST,              RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22596,                                             0x04, "Big Lava Room Lower Open Door Chest",         RHT_FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST,             RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST] =                          Location::Chest(RC_FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST,                         RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22595,                                             0x03, "Boulder Maze Lower Chest",                    RHT_FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST,                        RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST] =                          Location::Chest(RC_FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST,                         RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22598,                                             0x06, "Boulder Maze Upper Chest",                    RHT_FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST,                        RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST] =                      Location::Chest(RC_FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST,                     RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22600,                                             0x08, "Boulder Maze Side Room Chest",                RHT_FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST,                    RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST] =                       Location::Chest(RC_FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST,                      RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22603,                                             0x0B, "Boulder Maze Shortcut Chest",                 RHT_FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST,                     RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_FIRE_TEMPLE_SCARECROW_CHEST] =                                   Location::Chest(RC_FIRE_TEMPLE_SCARECROW_CHEST,                                  RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  23245,                                             0x0D, "Scarecrow Chest",                             RHT_FIRE_TEMPLE_SCARECROW_CHEST,                                 RG_HUGE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    locationTable[RC_FIRE_TEMPLE_MAP_CHEST] =                                         Location::Chest(RC_FIRE_TEMPLE_MAP_CHEST,                                        RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  2090,                                              0x0A, "Map Chest",                                   RHT_FIRE_TEMPLE_MAP_CHEST,                                       RG_FIRE_TEMPLE_MAP,                   { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_FIRE_TEMPLE_COMPASS_CHEST] =                                     Location::Chest(RC_FIRE_TEMPLE_COMPASS_CHEST,                                    RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  2055,                                              0x07, "Compass Chest",                               RHT_FIRE_TEMPLE_COMPASS_CHEST,                                   RG_FIRE_TEMPLE_COMPASS,               { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_FIRE_TEMPLE_HIGHEST_GORON_CHEST] =                               Location::Chest(RC_FIRE_TEMPLE_HIGHEST_GORON_CHEST,                              RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22601,                                             0x09, "Highest Goron Chest",                         RHT_FIRE_TEMPLE_HIGHEST_GORON_CHEST,                             RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_FIRE_TEMPLE_MEGATON_HAMMER_CHEST] =                              Location::Chest(RC_FIRE_TEMPLE_MEGATON_HAMMER_CHEST,                             RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  421,                                               0x05, "Megaton Hammer Chest",                        RHT_FIRE_TEMPLE_MEGATON_HAMMER_CHEST,                            RG_MEGATON_HAMMER,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
     // Fire Temple MQ
-    locationTable[RC_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST] =                                Location::Chest(RC_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST,                               RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22599,                                             0x07, "MQ Near Boss Chest",                          "Fire Temple MQ Near Boss Chest",                           RHT_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST,                              RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
-    locationTable[RC_FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST] =                           Location::Chest(RC_FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST,                          RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  4512,                                              0x00, "MQ Megaton Hammer Chest",                     "Fire Temple MQ Megaton Hammer Chest",                      RHT_FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST,                         RG_MEGATON_HAMMER,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
-    locationTable[RC_FIRE_TEMPLE_MQ_COMPASS_CHEST] =                                  Location::Chest(RC_FIRE_TEMPLE_MQ_COMPASS_CHEST,                                 RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  2059,                                              0x0B, "MQ Compass Chest",                            "Fire Temple MQ Compass Chest",                             RHT_FIRE_TEMPLE_MQ_COMPASS_CHEST,                                RG_FIRE_TEMPLE_COMPASS,               { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
-    locationTable[RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST] =                      Location::Chest(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST,                     RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  23747,                                             0x03, "MQ Lizalfos Maze Lower Chest",                "Fire Temple MQ Lizalfos Maze Lower Chest",                 RHT_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST,                    RG_BOMBS_10,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST] =                      Location::Chest(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST,                     RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  23782,                                             0x06, "MQ Lizalfos Maze Upper Chest",                "Fire Temple MQ Lizalfos Maze Upper Chest",                 RHT_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST,                    RG_BOMBS_10,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[RC_FIRE_TEMPLE_MQ_CHEST_ON_FIRE] =                                  Location::Chest(RC_FIRE_TEMPLE_MQ_CHEST_ON_FIRE,                                 RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22597,                                             0x05, "MQ Chest on Fire",                            "Fire Temple MQ Chest on Fire",                             RHT_FIRE_TEMPLE_MQ_CHEST_ON_FIRE,                                RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
-    locationTable[RC_FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST] =                            Location::Chest(RC_FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST,                           RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  30018,                                             0x02, "MQ Map Room Side Chest",                      "Fire Temple MQ Map Room Side Chest",                       RHT_FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST,                          RG_HYLIAN_SHIELD,                     {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[RC_FIRE_TEMPLE_MQ_MAP_CHEST] =                                      Location::Chest(RC_FIRE_TEMPLE_MQ_MAP_CHEST,                                     RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  2092,                                              0x0C, "MQ Map Chest",                                "Fire Temple MQ Map Chest",                                 RHT_FIRE_TEMPLE_MQ_MAP_CHEST,                                    RG_FIRE_TEMPLE_MAP,                   { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
-    locationTable[RC_FIRE_TEMPLE_MQ_BOSS_KEY_CHEST] =                                 Location::Chest(RC_FIRE_TEMPLE_MQ_BOSS_KEY_CHEST,                                RCQUEST_MQ,      RCTYPE_BOSS_KEY,                    RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  10212,                                             0x04, "MQ Boss Key Chest",                           "Fire Temple MQ Boss Key Chest",                            RHT_FIRE_TEMPLE_MQ_BOSS_KEY_CHEST,                               RG_FIRE_TEMPLE_BOSS_KEY,              { Category::cVanillaBossKey },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
-    locationTable[RC_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST] =               Location::Chest(RC_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST,              RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22593,                                             0x01, "MQ Big Lava Room Blocked Door Chest",         "Fire Temple MQ Big Lava Room Blocked Door Chest",          RHT_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST,             RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
-    locationTable[RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST] =                  Location::Chest(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST,                 RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22600,                                             0x08, "MQ Lizalfos Maze Side Room Chest",            "Fire Temple MQ Lizalfos Maze Side Room Chest",             RHT_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST,                RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
-    locationTable[RC_FIRE_TEMPLE_MQ_FREESTANDING_KEY] =                         Location::Collectable(RC_FIRE_TEMPLE_MQ_FREESTANDING_KEY,                              RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_ITEM00,      SCENE_FIRE_TEMPLE,                  7185,                                              0x1C, "MQ Freestanding Key",                         "Fire Temple MQ Freestanding Key",                          RHT_FIRE_TEMPLE_MQ_FREESTANDING_KEY,                             RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST] =                                Location::Chest(RC_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST,                               RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22599,                                             0x07, "MQ Near Boss Chest",                          RHT_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST,                              RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST] =                           Location::Chest(RC_FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST,                          RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  4512,                                              0x00, "MQ Megaton Hammer Chest",                     RHT_FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST,                         RG_MEGATON_HAMMER,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_FIRE_TEMPLE_MQ_COMPASS_CHEST] =                                  Location::Chest(RC_FIRE_TEMPLE_MQ_COMPASS_CHEST,                                 RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  2059,                                              0x0B, "MQ Compass Chest",                            RHT_FIRE_TEMPLE_MQ_COMPASS_CHEST,                                RG_FIRE_TEMPLE_COMPASS,               { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST] =                      Location::Chest(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST,                     RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  23747,                                             0x03, "MQ Lizalfos Maze Lower Chest",                RHT_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST,                    RG_BOMBS_10,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    locationTable[RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST] =                      Location::Chest(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST,                     RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  23782,                                             0x06, "MQ Lizalfos Maze Upper Chest",                RHT_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST,                    RG_BOMBS_10,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    locationTable[RC_FIRE_TEMPLE_MQ_CHEST_ON_FIRE] =                                  Location::Chest(RC_FIRE_TEMPLE_MQ_CHEST_ON_FIRE,                                 RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22597,                                             0x05, "MQ Chest on Fire",                            RHT_FIRE_TEMPLE_MQ_CHEST_ON_FIRE,                                RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST] =                            Location::Chest(RC_FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST,                           RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  30018,                                             0x02, "MQ Map Room Side Chest",                      RHT_FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST,                          RG_HYLIAN_SHIELD,                     {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    locationTable[RC_FIRE_TEMPLE_MQ_MAP_CHEST] =                                      Location::Chest(RC_FIRE_TEMPLE_MQ_MAP_CHEST,                                     RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  2092,                                              0x0C, "MQ Map Chest",                                RHT_FIRE_TEMPLE_MQ_MAP_CHEST,                                    RG_FIRE_TEMPLE_MAP,                   { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_FIRE_TEMPLE_MQ_BOSS_KEY_CHEST] =                                 Location::Chest(RC_FIRE_TEMPLE_MQ_BOSS_KEY_CHEST,                                RCQUEST_MQ,      RCTYPE_BOSS_KEY,                    RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  10212,                                             0x04, "MQ Boss Key Chest",                           RHT_FIRE_TEMPLE_MQ_BOSS_KEY_CHEST,                               RG_FIRE_TEMPLE_BOSS_KEY,              { Category::cVanillaBossKey },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST] =               Location::Chest(RC_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST,              RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22593,                                             0x01, "MQ Big Lava Room Blocked Door Chest",         RHT_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST,             RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST] =                  Location::Chest(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST,                 RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22600,                                             0x08, "MQ Lizalfos Maze Side Room Chest",            RHT_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST,                RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_FIRE_TEMPLE_MQ_FREESTANDING_KEY] =                         Location::Collectable(RC_FIRE_TEMPLE_MQ_FREESTANDING_KEY,                              RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_ITEM00,      SCENE_FIRE_TEMPLE,                  7185,                                              0x1C, "MQ Freestanding Key",                         RHT_FIRE_TEMPLE_MQ_FREESTANDING_KEY,                             RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
 
     // Water Temple Vanilla
-    locationTable[RC_WATER_TEMPLE_MAP_CHEST] =                                        Location::Chest(RC_WATER_TEMPLE_MAP_CHEST,                                       RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 6178,                                              0x02, "Map Chest",                                   "Water Temple Map Chest",                                   RHT_WATER_TEMPLE_MAP_CHEST,                                      RG_WATER_TEMPLE_MAP,                  { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
-    locationTable[RC_WATER_TEMPLE_COMPASS_CHEST] =                                    Location::Chest(RC_WATER_TEMPLE_COMPASS_CHEST,                                   RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 2057,                                              0x09, "Compass Chest",                               "Water Temple Compass Chest",                               RHT_WATER_TEMPLE_COMPASS_CHEST,                                  RG_WATER_TEMPLE_COMPASS,              { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
-    locationTable[RC_WATER_TEMPLE_TORCHES_CHEST] =                                    Location::Chest(RC_WATER_TEMPLE_TORCHES_CHEST,                                   RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 30785,                                             0x01, "Torches Chest",                               "Water Temple Torches Chest",                               RHT_WATER_TEMPLE_TORCHES_CHEST,                                  RG_WATER_TEMPLE_SMALL_KEY,            { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
-    locationTable[RC_WATER_TEMPLE_DRAGON_CHEST] =                                     Location::Chest(RC_WATER_TEMPLE_DRAGON_CHEST,                                    RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 22602,                                             0x0A, "Dragon Chest",                                "Water Temple Dragon Chest",                                RHT_WATER_TEMPLE_DRAGON_CHEST,                                   RG_WATER_TEMPLE_SMALL_KEY,            { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
-    locationTable[RC_WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST] =                         Location::Chest(RC_WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST,                        RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 22600,                                             0x08, "Central Bow Target Chest",                    "Water Temple Central Bow Target Chest",                    RHT_WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST,                       RG_WATER_TEMPLE_SMALL_KEY,            { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
-    locationTable[RC_WATER_TEMPLE_CENTRAL_PILLAR_CHEST] =                             Location::Chest(RC_WATER_TEMPLE_CENTRAL_PILLAR_CHEST,                            RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 22598,                                             0x06, "Central Pillar Chest",                        "Water Temple Central Pillar Chest",                        RHT_WATER_TEMPLE_CENTRAL_PILLAR_CHEST,                           RG_WATER_TEMPLE_SMALL_KEY,            { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
-    locationTable[RC_WATER_TEMPLE_CRACKED_WALL_CHEST] =                               Location::Chest(RC_WATER_TEMPLE_CRACKED_WALL_CHEST,                              RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 22592,                                             0x00, "Cracked Wall Chest",                          "Water Temple Cracked Wall Chest",                          RHT_WATER_TEMPLE_CRACKED_WALL_CHEST,                             RG_WATER_TEMPLE_SMALL_KEY,            { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
-    locationTable[RC_WATER_TEMPLE_BOSS_KEY_CHEST] =                                   Location::Chest(RC_WATER_TEMPLE_BOSS_KEY_CHEST,                                  RCQUEST_VANILLA, RCTYPE_BOSS_KEY,                    RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 10213,                                             0x05, "Boss Key Chest",                              "Water Temple Boss Key Chest",                              RHT_WATER_TEMPLE_BOSS_KEY_CHEST,                                 RG_WATER_TEMPLE_BOSS_KEY,             { Category::cVanillaBossKey },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
-    locationTable[RC_WATER_TEMPLE_LONGSHOT_CHEST] =                                   Location::Chest(RC_WATER_TEMPLE_LONGSHOT_CHEST,                                  RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 295,                                               0x07, "Longshot Chest",                              "Water Temple Longshot Chest",                              RHT_WATER_TEMPLE_LONGSHOT_CHEST,                                 RG_PROGRESSIVE_HOOKSHOT,              {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
-    locationTable[RC_WATER_TEMPLE_RIVER_CHEST] =                                      Location::Chest(RC_WATER_TEMPLE_RIVER_CHEST,                                     RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 22595,                                             0x03, "River Chest",                                 "Water Temple River Chest",                                 RHT_WATER_TEMPLE_RIVER_CHEST,                                    RG_WATER_TEMPLE_SMALL_KEY,            { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
+    locationTable[RC_WATER_TEMPLE_MAP_CHEST] =                                        Location::Chest(RC_WATER_TEMPLE_MAP_CHEST,                                       RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 6178,                                              0x02, "Map Chest",                                   RHT_WATER_TEMPLE_MAP_CHEST,                                      RG_WATER_TEMPLE_MAP,                  { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
+    locationTable[RC_WATER_TEMPLE_COMPASS_CHEST] =                                    Location::Chest(RC_WATER_TEMPLE_COMPASS_CHEST,                                   RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 2057,                                              0x09, "Compass Chest",                               RHT_WATER_TEMPLE_COMPASS_CHEST,                                  RG_WATER_TEMPLE_COMPASS,              { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
+    locationTable[RC_WATER_TEMPLE_TORCHES_CHEST] =                                    Location::Chest(RC_WATER_TEMPLE_TORCHES_CHEST,                                   RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 30785,                                             0x01, "Torches Chest",                               RHT_WATER_TEMPLE_TORCHES_CHEST,                                  RG_WATER_TEMPLE_SMALL_KEY,            { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
+    locationTable[RC_WATER_TEMPLE_DRAGON_CHEST] =                                     Location::Chest(RC_WATER_TEMPLE_DRAGON_CHEST,                                    RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 22602,                                             0x0A, "Dragon Chest",                                RHT_WATER_TEMPLE_DRAGON_CHEST,                                   RG_WATER_TEMPLE_SMALL_KEY,            { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
+    locationTable[RC_WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST] =                         Location::Chest(RC_WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST,                        RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 22600,                                             0x08, "Central Bow Target Chest",                    RHT_WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST,                       RG_WATER_TEMPLE_SMALL_KEY,            { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
+    locationTable[RC_WATER_TEMPLE_CENTRAL_PILLAR_CHEST] =                             Location::Chest(RC_WATER_TEMPLE_CENTRAL_PILLAR_CHEST,                            RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 22598,                                             0x06, "Central Pillar Chest",                        RHT_WATER_TEMPLE_CENTRAL_PILLAR_CHEST,                           RG_WATER_TEMPLE_SMALL_KEY,            { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
+    locationTable[RC_WATER_TEMPLE_CRACKED_WALL_CHEST] =                               Location::Chest(RC_WATER_TEMPLE_CRACKED_WALL_CHEST,                              RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 22592,                                             0x00, "Cracked Wall Chest",                          RHT_WATER_TEMPLE_CRACKED_WALL_CHEST,                             RG_WATER_TEMPLE_SMALL_KEY,            { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
+    locationTable[RC_WATER_TEMPLE_BOSS_KEY_CHEST] =                                   Location::Chest(RC_WATER_TEMPLE_BOSS_KEY_CHEST,                                  RCQUEST_VANILLA, RCTYPE_BOSS_KEY,                    RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 10213,                                             0x05, "Boss Key Chest",                              RHT_WATER_TEMPLE_BOSS_KEY_CHEST,                                 RG_WATER_TEMPLE_BOSS_KEY,             { Category::cVanillaBossKey },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
+    locationTable[RC_WATER_TEMPLE_LONGSHOT_CHEST] =                                   Location::Chest(RC_WATER_TEMPLE_LONGSHOT_CHEST,                                  RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 295,                                               0x07, "Longshot Chest",                              RHT_WATER_TEMPLE_LONGSHOT_CHEST,                                 RG_PROGRESSIVE_HOOKSHOT,              {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
+    locationTable[RC_WATER_TEMPLE_RIVER_CHEST] =                                      Location::Chest(RC_WATER_TEMPLE_RIVER_CHEST,                                     RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 22595,                                             0x03, "River Chest",                                 RHT_WATER_TEMPLE_RIVER_CHEST,                                    RG_WATER_TEMPLE_SMALL_KEY,            { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
     // Water Temple MQ
-    locationTable[RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST] =                          Location::Chest(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST,                         RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 -30650,                                            0x06, "MQ Central Pillar Chest",                     "Water Temple MQ Central Pillar Chest",                     RHT_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST,                        RG_WATER_TEMPLE_SMALL_KEY,            { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
-    locationTable[RC_WATER_TEMPLE_MQ_BOSS_KEY_CHEST] =                                Location::Chest(RC_WATER_TEMPLE_MQ_BOSS_KEY_CHEST,                               RCQUEST_MQ,      RCTYPE_BOSS_KEY,                    RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 10213,                                             0x05, "MQ Boss Key Chest",                           "Water Temple MQ Boss Key Chest",                           RHT_WATER_TEMPLE_MQ_BOSS_KEY_CHEST,                              RG_WATER_TEMPLE_BOSS_KEY,             { Category::cVanillaBossKey },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
-    locationTable[RC_WATER_TEMPLE_MQ_LONGSHOT_CHEST] =                                Location::Chest(RC_WATER_TEMPLE_MQ_LONGSHOT_CHEST,                               RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 -20192,                                            0x00, "MQ Longshot Chest",                           "Water Temple MQ Longshot Chest",                           RHT_WATER_TEMPLE_MQ_LONGSHOT_CHEST,                              RG_PROGRESSIVE_HOOKSHOT,              {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
-    locationTable[RC_WATER_TEMPLE_MQ_COMPASS_CHEST] =                                 Location::Chest(RC_WATER_TEMPLE_MQ_COMPASS_CHEST,                                RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 6145,                                              0x01, "MQ Compass Chest",                            "Water Temple MQ Compass Chest",                            RHT_WATER_TEMPLE_MQ_COMPASS_CHEST,                               RG_WATER_TEMPLE_COMPASS,              { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
-    locationTable[RC_WATER_TEMPLE_MQ_MAP_CHEST] =                                     Location::Chest(RC_WATER_TEMPLE_MQ_MAP_CHEST,                                    RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 -18398,                                            0x02, "MQ Map Chest",                                "Water Temple MQ Map Chest",                                RHT_WATER_TEMPLE_MQ_MAP_CHEST,                                   RG_WATER_TEMPLE_MAP,                  { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
-    locationTable[RC_WATER_TEMPLE_MQ_FREESTANDING_KEY] =                        Location::Collectable(RC_WATER_TEMPLE_MQ_FREESTANDING_KEY,                             RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_WATER_TEMPLE,                 ACTOR_EN_ITEM00,      SCENE_WATER_TEMPLE,                 273,                                               0x01, "MQ Freestanding Key",                         "Water Temple MQ Freestanding Key",                         RHT_WATER_TEMPLE_MQ_FREESTANDING_KEY,                            RG_WATER_TEMPLE_SMALL_KEY,            { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
+    locationTable[RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST] =                          Location::Chest(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST,                         RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 -30650,                                            0x06, "MQ Central Pillar Chest",                     RHT_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST,                        RG_WATER_TEMPLE_SMALL_KEY,            { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
+    locationTable[RC_WATER_TEMPLE_MQ_BOSS_KEY_CHEST] =                                Location::Chest(RC_WATER_TEMPLE_MQ_BOSS_KEY_CHEST,                               RCQUEST_MQ,      RCTYPE_BOSS_KEY,                    RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 10213,                                             0x05, "MQ Boss Key Chest",                           RHT_WATER_TEMPLE_MQ_BOSS_KEY_CHEST,                              RG_WATER_TEMPLE_BOSS_KEY,             { Category::cVanillaBossKey },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
+    locationTable[RC_WATER_TEMPLE_MQ_LONGSHOT_CHEST] =                                Location::Chest(RC_WATER_TEMPLE_MQ_LONGSHOT_CHEST,                               RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 -20192,                                            0x00, "MQ Longshot Chest",                           RHT_WATER_TEMPLE_MQ_LONGSHOT_CHEST,                              RG_PROGRESSIVE_HOOKSHOT,              {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
+    locationTable[RC_WATER_TEMPLE_MQ_COMPASS_CHEST] =                                 Location::Chest(RC_WATER_TEMPLE_MQ_COMPASS_CHEST,                                RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 6145,                                              0x01, "MQ Compass Chest",                            RHT_WATER_TEMPLE_MQ_COMPASS_CHEST,                               RG_WATER_TEMPLE_COMPASS,              { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
+    locationTable[RC_WATER_TEMPLE_MQ_MAP_CHEST] =                                     Location::Chest(RC_WATER_TEMPLE_MQ_MAP_CHEST,                                    RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 -18398,                                            0x02, "MQ Map Chest",                                RHT_WATER_TEMPLE_MQ_MAP_CHEST,                                   RG_WATER_TEMPLE_MAP,                  { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
+    locationTable[RC_WATER_TEMPLE_MQ_FREESTANDING_KEY] =                        Location::Collectable(RC_WATER_TEMPLE_MQ_FREESTANDING_KEY,                             RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_WATER_TEMPLE,                 ACTOR_EN_ITEM00,      SCENE_WATER_TEMPLE,                 273,                                               0x01, "MQ Freestanding Key",                         RHT_WATER_TEMPLE_MQ_FREESTANDING_KEY,                            RG_WATER_TEMPLE_SMALL_KEY,            { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
 
     // Spirit Temple Shared
-    locationTable[RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST] =                          Location::Chest(RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST,                         RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_DESERT_COLOSSUS,              1707,                                              0x0B, "Silver Gauntlets Chest",                      "Spirit Temple Silver Gauntlets Chest",                     RHT_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST,                        RG_PROGRESSIVE_STRENGTH,              {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
-    locationTable[RC_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST] =                             Location::Chest(RC_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST,                            RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_DESERT_COLOSSUS,              13673,                                             0x09, "Mirror Shield Chest",                         "Spirit Temple Mirror Shield Chest",                        RHT_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST,                           RG_MIRROR_SHIELD,                     {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST] =                          Location::Chest(RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST,                         RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_DESERT_COLOSSUS,              1707,                                              0x0B, "Silver Gauntlets Chest",                      RHT_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST,                        RG_PROGRESSIVE_STRENGTH,              {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST] =                             Location::Chest(RC_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST,                            RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_DESERT_COLOSSUS,              13673,                                             0x09, "Mirror Shield Chest",                         RHT_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST,                           RG_MIRROR_SHIELD,                     {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
     // Spirit Temple Vanilla
-    locationTable[RC_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST] =                              Location::Chest(RC_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST,                             RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                21800,                                             0x08, "Child Bridge Chest",                          "Spirit Temple Child Bridge Chest",                         RHT_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST,                            RG_DEKU_SHIELD,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST] =                       Location::Chest(RC_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST,                      RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30656,                                            0x00, "Child Early Torches Chest",                   "Spirit Temple Child Early Torches Chest",                  RHT_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST,                     RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
-    locationTable[RC_SPIRIT_TEMPLE_COMPASS_CHEST] =                                   Location::Chest(RC_SPIRIT_TEMPLE_COMPASS_CHEST,                                  RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                14340,                                             0x04, "Compass Chest",                               "Spirit Temple Compass Chest",                              RHT_SPIRIT_TEMPLE_COMPASS_CHEST,                                 RG_SPIRIT_TEMPLE_COMPASS,             { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
-    locationTable[RC_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST] =                         Location::Chest(RC_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST,                        RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                22599,                                             0x07, "Early Adult Right Chest",                     "Spirit Temple Early Adult Right Chest",                    RHT_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST,                       RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
-    locationTable[RC_SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST] =                         Location::Chest(RC_SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST,                        RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30451,                                            0x0D, "First Mirror Left Chest",                     "Spirit Temple First Mirror Left Chest",                    RHT_SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST,                       RG_ICE_TRAP,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST] =                        Location::Chest(RC_SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST,                       RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -28786,                                            0x0E, "First Mirror Right Chest",                    "Spirit Temple First Mirror Right Chest",                   RHT_SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST,                      RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MAP_CHEST] =                                       Location::Chest(RC_SPIRIT_TEMPLE_MAP_CHEST,                                      RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -18397,                                            0x03, "Map Chest",                                   "Spirit Temple Map Chest",                                  RHT_SPIRIT_TEMPLE_MAP_CHEST,                                     RG_SPIRIT_TEMPLE_MAP,                 { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
-    locationTable[RC_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST] =                         Location::Chest(RC_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST,                        RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -32666,                                            0x06, "Child Climb North Chest",                     "Spirit Temple Child Climb North Chest",                    RHT_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST,                       RG_BOMBCHU_10,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST] =                          Location::Chest(RC_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST,                         RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -31444,                                            0x0C, "Child Climb East Chest",                      "Spirit Temple Child Climb East Chest",                     RHT_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST,                        RG_DEKU_SHIELD,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST] =                            Location::Chest(RC_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST,                           RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30655,                                            0x01, "Sun Block Room Chest",                        "Spirit Temple Sun Block Room Chest",                       RHT_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST,                          RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
-    locationTable[RC_SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST] =                          Location::Chest(RC_SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST,                         RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30654,                                            0x02, "Statue Room Hand Chest",                      "Spirit Temple Statue Room Hand Chest",                     RHT_SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST,                        RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
-    locationTable[RC_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST] =                     Location::Chest(RC_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST,                    RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30577,                                            0x0F, "Statue Room Northeast Chest",                 "Spirit Temple Statue Room Northeast Chest",                RHT_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST,                   RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST] =                           Location::Chest(RC_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST,                          RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                22597,                                             0x05, "Near Four Armos Chest",                       "Spirit Temple Near Four Armos Chest",                      RHT_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST,                         RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
-    locationTable[RC_SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST] =                   Location::Chest(RC_SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST,                  RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                26900,                                             0x14, "Hallway Right Invisible Chest",               "Spirit Temple Hallway Right Invisible Chest",              RHT_SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST,                 RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST] =                    Location::Chest(RC_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST,                   RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                26901,                                             0x15, "Hallway Left Invisible Chest",                "Spirit Temple Hallway Left Invisible Chest",               RHT_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST,                  RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_BOSS_KEY_CHEST] =                                  Location::Chest(RC_SPIRIT_TEMPLE_BOSS_KEY_CHEST,                                 RCQUEST_VANILLA, RCTYPE_BOSS_KEY,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                10218,                                             0x0A, "Boss Key Chest",                              "Spirit Temple Boss Key Chest",                             RHT_SPIRIT_TEMPLE_BOSS_KEY_CHEST,                                RG_SPIRIT_TEMPLE_BOSS_KEY,            { Category::cVanillaBossKey },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
-    locationTable[RC_SPIRIT_TEMPLE_TOPMOST_CHEST] =                                   Location::Chest(RC_SPIRIT_TEMPLE_TOPMOST_CHEST,                                  RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -29454,                                            0x12, "Topmost Chest",                               "Spirit Temple Topmost Chest",                              RHT_SPIRIT_TEMPLE_TOPMOST_CHEST,                                 RG_BOMBS_20,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST] =                              Location::Chest(RC_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST,                             RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                21800,                                             0x08, "Child Bridge Chest",                          RHT_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST,                            RG_DEKU_SHIELD,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST] =                       Location::Chest(RC_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST,                      RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30656,                                            0x00, "Child Early Torches Chest",                   RHT_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST,                     RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_SPIRIT_TEMPLE_COMPASS_CHEST] =                                   Location::Chest(RC_SPIRIT_TEMPLE_COMPASS_CHEST,                                  RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                14340,                                             0x04, "Compass Chest",                               RHT_SPIRIT_TEMPLE_COMPASS_CHEST,                                 RG_SPIRIT_TEMPLE_COMPASS,             { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST] =                         Location::Chest(RC_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST,                        RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                22599,                                             0x07, "Early Adult Right Chest",                     RHT_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST,                       RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST] =                         Location::Chest(RC_SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST,                        RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30451,                                            0x0D, "First Mirror Left Chest",                     RHT_SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST,                       RG_ICE_TRAP,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST] =                        Location::Chest(RC_SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST,                       RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -28786,                                            0x0E, "First Mirror Right Chest",                    RHT_SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST,                      RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MAP_CHEST] =                                       Location::Chest(RC_SPIRIT_TEMPLE_MAP_CHEST,                                      RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -18397,                                            0x03, "Map Chest",                                   RHT_SPIRIT_TEMPLE_MAP_CHEST,                                     RG_SPIRIT_TEMPLE_MAP,                 { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST] =                         Location::Chest(RC_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST,                        RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -32666,                                            0x06, "Child Climb North Chest",                     RHT_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST,                       RG_BOMBCHU_10,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST] =                          Location::Chest(RC_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST,                         RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -31444,                                            0x0C, "Child Climb East Chest",                      RHT_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST,                        RG_DEKU_SHIELD,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST] =                            Location::Chest(RC_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST,                           RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30655,                                            0x01, "Sun Block Room Chest",                        RHT_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST,                          RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST] =                          Location::Chest(RC_SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST,                         RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30654,                                            0x02, "Statue Room Hand Chest",                      RHT_SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST,                        RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST] =                     Location::Chest(RC_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST,                    RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30577,                                            0x0F, "Statue Room Northeast Chest",                 RHT_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST,                   RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST] =                           Location::Chest(RC_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST,                          RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                22597,                                             0x05, "Near Four Armos Chest",                       RHT_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST,                         RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST] =                   Location::Chest(RC_SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST,                  RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                26900,                                             0x14, "Hallway Right Invisible Chest",               RHT_SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST,                 RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST] =                    Location::Chest(RC_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST,                   RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                26901,                                             0x15, "Hallway Left Invisible Chest",                RHT_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST,                  RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_BOSS_KEY_CHEST] =                                  Location::Chest(RC_SPIRIT_TEMPLE_BOSS_KEY_CHEST,                                 RCQUEST_VANILLA, RCTYPE_BOSS_KEY,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                10218,                                             0x0A, "Boss Key Chest",                              RHT_SPIRIT_TEMPLE_BOSS_KEY_CHEST,                                RG_SPIRIT_TEMPLE_BOSS_KEY,            { Category::cVanillaBossKey },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_SPIRIT_TEMPLE_TOPMOST_CHEST] =                                   Location::Chest(RC_SPIRIT_TEMPLE_TOPMOST_CHEST,                                  RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -29454,                                            0x12, "Topmost Chest",                               RHT_SPIRIT_TEMPLE_TOPMOST_CHEST,                                 RG_BOMBS_20,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
     // Spirit Temple MQ
-    locationTable[RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST] =                    Location::Chest(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST,                   RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                20602,                                             0x1A, "MQ Entrance Front Left Chest",                "Spirit Temple MQ Entrance Front Left Chest",               RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST,                  RG_BOMBCHU_10,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST] =                    Location::Chest(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST,                   RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -32641,                                            0x1F, "MQ Entrance Back Right Chest",                "Spirit Temple MQ Entrance Back Right Chest",               RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST,                  RG_BOMBCHU_10,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST] =                   Location::Chest(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST,                  RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30629,                                            0x1B, "MQ Entrance Front Right Chest",               "Spirit Temple MQ Entrance Front Right Chest",              RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST,                 RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST] =                     Location::Chest(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST,                    RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30626,                                            0x1E, "MQ Entrance Back Left Chest",                 "Spirit Temple MQ Entrance Back Left Chest",                RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST,                   RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST] =                    Location::Chest(RC_SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST,                   RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30627,                                            0x1D, "MQ Child Hammer Switch Chest",                "Spirit Temple MQ Child Hammer Switch Chest",               RHT_SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST,                  RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_MAP_CHEST] =                                    Location::Chest(RC_SPIRIT_TEMPLE_MQ_MAP_CHEST,                                   RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                2080,                                              0x00, "MQ Map Chest",                                "Spirit Temple MQ Map Chest",                               RHT_SPIRIT_TEMPLE_MQ_MAP_CHEST,                                  RG_SPIRIT_TEMPLE_MAP,                 { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST] =                         Location::Chest(RC_SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST,                        RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                30792,                                             0x08, "MQ Map Room Enemy Chest",                     "Spirit Temple MQ Map Room Enemy Chest",                    RHT_SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST,                       RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST] =                      Location::Chest(RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST,                     RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                28774,                                             0x06, "MQ Child Climb North Chest",                  "Spirit Temple MQ Child Climb North Chest",                 RHT_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST,                    RG_BOMBCHU_10,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST] =                      Location::Chest(RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST,                     RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30644,                                            0x0C, "MQ Child Climb South Chest",                  "Spirit Temple MQ Child Climb South Chest",                 RHT_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST,                    RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_COMPASS_CHEST] =                                Location::Chest(RC_SPIRIT_TEMPLE_MQ_COMPASS_CHEST,                               RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -18429,                                            0x03, "MQ Compass Chest",                            "Spirit Temple MQ Compass Chest",                           RHT_SPIRIT_TEMPLE_MQ_COMPASS_CHEST,                              RG_SPIRIT_TEMPLE_COMPASS,             { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST] =                    Location::Chest(RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST,                   RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30577,                                            0x0F, "MQ Statue Room Lullaby Chest",                "Spirit Temple MQ Statue Room Lullaby Chest",               RHT_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST,                  RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST] =                  Location::Chest(RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST,                 RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                26882,                                             0x02, "MQ Statue Room Invisible Chest",              "Spirit Temple MQ Statue Room Invisible Chest",             RHT_SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST,                RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST] =                   Location::Chest(RC_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST,                  RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30628,                                            0x1C, "MQ Silver Block Hallway Chest",               "Spirit Temple MQ Silver Block Hallway Chest",              RHT_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST,                 RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST] =                         Location::Chest(RC_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST,                        RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30463,                                            0x01, "MQ Sun Block Room Chest",                     "Spirit Temple MQ Sun Block Room Chest",                    RHT_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST,                       RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST] =                          Location::Chest(RC_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST,                         RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                23207,                                             0x07, "MQ Symphony Room Chest",                      "Spirit Temple MQ Symphony Room Chest",                     RHT_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST,                        RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST] =                            Location::Chest(RC_SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST,                           RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                31396,                                             0x04, "MQ Leever Room Chest",                        "Spirit Temple MQ Leever Room Chest",                       RHT_SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST,                          RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST] =                            Location::Chest(RC_SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST,                           RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                24472,                                             0x19, "MQ Beamos Room Chest",                        "Spirit Temple MQ Beamos Room Chest",                       RHT_SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST,                          RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST] =                           Location::Chest(RC_SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST,                          RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                31097,                                             0x18, "MQ Chest Switch Chest",                       "Spirit Temple MQ Chest Switch Chest",                      RHT_SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST,                         RG_ICE_TRAP,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST] =                               Location::Chest(RC_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST,                              RCQUEST_MQ,      RCTYPE_BOSS_KEY,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                10213,                                             0x05, "MQ Boss Key Chest",                           "Spirit Temple MQ Boss Key Chest",                          RHT_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST,                             RG_SPIRIT_TEMPLE_BOSS_KEY,            { Category::cVanillaBossKey },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST] =                Location::Chest(RC_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST,               RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                26706,                                             0x12, "MQ Mirror Puzzle Invisible Chest",            "Spirit Temple MQ Mirror Puzzle Invisible Chest",           RHT_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST,              RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST] =                    Location::Chest(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST,                   RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                20602,                                             0x1A, "MQ Entrance Front Left Chest",                RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST,                  RG_BOMBCHU_10,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST] =                    Location::Chest(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST,                   RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -32641,                                            0x1F, "MQ Entrance Back Right Chest",                RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST,                  RG_BOMBCHU_10,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST] =                   Location::Chest(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST,                  RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30629,                                            0x1B, "MQ Entrance Front Right Chest",               RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST,                 RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST] =                     Location::Chest(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST,                    RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30626,                                            0x1E, "MQ Entrance Back Left Chest",                 RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST,                   RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST] =                    Location::Chest(RC_SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST,                   RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30627,                                            0x1D, "MQ Child Hammer Switch Chest",                RHT_SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST,                  RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_MAP_CHEST] =                                    Location::Chest(RC_SPIRIT_TEMPLE_MQ_MAP_CHEST,                                   RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                2080,                                              0x00, "MQ Map Chest",                                RHT_SPIRIT_TEMPLE_MQ_MAP_CHEST,                                  RG_SPIRIT_TEMPLE_MAP,                 { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST] =                         Location::Chest(RC_SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST,                        RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                30792,                                             0x08, "MQ Map Room Enemy Chest",                     RHT_SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST,                       RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST] =                      Location::Chest(RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST,                     RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                28774,                                             0x06, "MQ Child Climb North Chest",                  RHT_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST,                    RG_BOMBCHU_10,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST] =                      Location::Chest(RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST,                     RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30644,                                            0x0C, "MQ Child Climb South Chest",                  RHT_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST,                    RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_COMPASS_CHEST] =                                Location::Chest(RC_SPIRIT_TEMPLE_MQ_COMPASS_CHEST,                               RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -18429,                                            0x03, "MQ Compass Chest",                            RHT_SPIRIT_TEMPLE_MQ_COMPASS_CHEST,                              RG_SPIRIT_TEMPLE_COMPASS,             { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST] =                    Location::Chest(RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST,                   RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30577,                                            0x0F, "MQ Statue Room Lullaby Chest",                RHT_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST,                  RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST] =                  Location::Chest(RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST,                 RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                26882,                                             0x02, "MQ Statue Room Invisible Chest",              RHT_SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST,                RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST] =                   Location::Chest(RC_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST,                  RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30628,                                            0x1C, "MQ Silver Block Hallway Chest",               RHT_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST,                 RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST] =                         Location::Chest(RC_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST,                        RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30463,                                            0x01, "MQ Sun Block Room Chest",                     RHT_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST,                       RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST] =                          Location::Chest(RC_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST,                         RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                23207,                                             0x07, "MQ Symphony Room Chest",                      RHT_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST,                        RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST] =                            Location::Chest(RC_SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST,                           RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                31396,                                             0x04, "MQ Leever Room Chest",                        RHT_SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST,                          RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST] =                            Location::Chest(RC_SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST,                           RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                24472,                                             0x19, "MQ Beamos Room Chest",                        RHT_SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST,                          RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST] =                           Location::Chest(RC_SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST,                          RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                31097,                                             0x18, "MQ Chest Switch Chest",                       RHT_SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST,                         RG_ICE_TRAP,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST] =                               Location::Chest(RC_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST,                              RCQUEST_MQ,      RCTYPE_BOSS_KEY,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                10213,                                             0x05, "MQ Boss Key Chest",                           RHT_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST,                             RG_SPIRIT_TEMPLE_BOSS_KEY,            { Category::cVanillaBossKey },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST] =                Location::Chest(RC_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST,               RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                26706,                                             0x12, "MQ Mirror Puzzle Invisible Chest",            RHT_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST,              RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
 
     // Shadow Temple Vanilla
-    locationTable[RC_SHADOW_TEMPLE_MAP_CHEST] =                                       Location::Chest(RC_SHADOW_TEMPLE_MAP_CHEST,                                      RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                6177,                                              0x01, "Map Chest",                                   "Shadow Temple Map Chest",                                  RHT_SHADOW_TEMPLE_MAP_CHEST,                                     RG_SHADOW_TEMPLE_MAP,                 { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
-    locationTable[RC_SHADOW_TEMPLE_HOVER_BOOTS_CHEST] =                               Location::Chest(RC_SHADOW_TEMPLE_HOVER_BOOTS_CHEST,                              RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                5607,                                              0x07, "Hover Boots Chest",                           "Shadow Temple Hover Boots Chest",                          RHT_SHADOW_TEMPLE_HOVER_BOOTS_CHEST,                             RG_HOVER_BOOTS,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
-    locationTable[RC_SHADOW_TEMPLE_COMPASS_CHEST] =                                   Location::Chest(RC_SHADOW_TEMPLE_COMPASS_CHEST,                                  RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                6147,                                              0x03, "Compass Chest",                               "Shadow Temple Compass Chest",                              RHT_SHADOW_TEMPLE_COMPASS_CHEST,                                 RG_SHADOW_TEMPLE_COMPASS,             { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
-    locationTable[RC_SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST] =                        Location::Chest(RC_SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST,                       RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                22594,                                             0x02, "Early Silver Rupee Chest",                    "Shadow Temple Early Silver Rupee Chest",                   RHT_SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST,                      RG_SHADOW_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
-    locationTable[RC_SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST] =                  Location::Chest(RC_SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST,                 RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                22668,                                             0x0C, "Invisible Blades Visible Chest",              "Shadow Temple Invisible Blades Visible Chest",             RHT_SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST,                RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST] =                Location::Chest(RC_SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST,               RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                26998,                                             0x16, "Invisible Blades Invisible Chest",            "Shadow Temple Invisible Blades Invisible Chest",           RHT_SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST,              RG_ARROWS_30,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST] =                      Location::Chest(RC_SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST,                     RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                22853,                                             0x05, "Falling Spikes Lower Chest",                  "Shadow Temple Falling Spikes Lower Chest",                 RHT_SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST,                    RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST] =                      Location::Chest(RC_SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST,                     RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                22662,                                             0x06, "Falling Spikes Upper Chest",                  "Shadow Temple Falling Spikes Upper Chest",                 RHT_SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST,                    RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST] =                     Location::Chest(RC_SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST,                    RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                -30652,                                            0x04, "Falling Spikes Switch Chest",                 "Shadow Temple Falling Spikes Switch Chest",                RHT_SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST,                   RG_SHADOW_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
-    locationTable[RC_SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST] =                          Location::Chest(RC_SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST,                         RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                30857,                                             0x09, "Invisible Spikes Chest",                      "Shadow Temple Invisible Spikes Chest",                     RHT_SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST,                        RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_WIND_HINT_CHEST] =                                 Location::Chest(RC_SHADOW_TEMPLE_WIND_HINT_CHEST,                                RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                26965,                                             0x15, "Wind Hint Chest",                             "Shadow Temple Wind Hint Chest",                            RHT_SHADOW_TEMPLE_WIND_HINT_CHEST,                               RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST] =                          Location::Chest(RC_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST,                         RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                30856,                                             0x08, "After Wind Enemy Chest",                      "Shadow Temple After Wind Enemy Chest",                     RHT_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST,                        RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST] =                         Location::Chest(RC_SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST,                        RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                26708,                                             0x14, "After Wind Hidden Chest",                     "Shadow Temple After Wind Hidden Chest",                    RHT_SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST,                       RG_SHADOW_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
-    locationTable[RC_SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST] =                          Location::Chest(RC_SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST,                         RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                22666,                                             0x0A, "Spike Walls Left Chest",                      "Shadow Temple Spike Walls Left Chest",                     RHT_SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST,                        RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_BOSS_KEY_CHEST] =                                  Location::Chest(RC_SHADOW_TEMPLE_BOSS_KEY_CHEST,                                 RCQUEST_VANILLA, RCTYPE_BOSS_KEY,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                10219,                                             0x0B, "Boss Key Chest",                              "Shadow Temple Boss Key Chest",                             RHT_SHADOW_TEMPLE_BOSS_KEY_CHEST,                                RG_SHADOW_TEMPLE_BOSS_KEY,            { Category::cVanillaBossKey },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
-    locationTable[RC_SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST] =                     Location::Chest(RC_SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST,                    RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                30797,                                             0x0D, "Invisible Floormaster Chest",                 "Shadow Temple Invisible Floormaster Chest",                RHT_SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST,                   RG_SHADOW_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
-    locationTable[RC_SHADOW_TEMPLE_FREESTANDING_KEY] =                          Location::Collectable(RC_SHADOW_TEMPLE_FREESTANDING_KEY,                               RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_ITEM00,      SCENE_SHADOW_TEMPLE,                273,                                               0x01, "Freestanding Key",                            "Shadow Temple Freestanding Key",                           RHT_SHADOW_TEMPLE_FREESTANDING_KEY,                              RG_SHADOW_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
+    locationTable[RC_SHADOW_TEMPLE_MAP_CHEST] =                                       Location::Chest(RC_SHADOW_TEMPLE_MAP_CHEST,                                      RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                6177,                                              0x01, "Map Chest",                                   RHT_SHADOW_TEMPLE_MAP_CHEST,                                     RG_SHADOW_TEMPLE_MAP,                 { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
+    locationTable[RC_SHADOW_TEMPLE_HOVER_BOOTS_CHEST] =                               Location::Chest(RC_SHADOW_TEMPLE_HOVER_BOOTS_CHEST,                              RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                5607,                                              0x07, "Hover Boots Chest",                           RHT_SHADOW_TEMPLE_HOVER_BOOTS_CHEST,                             RG_HOVER_BOOTS,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
+    locationTable[RC_SHADOW_TEMPLE_COMPASS_CHEST] =                                   Location::Chest(RC_SHADOW_TEMPLE_COMPASS_CHEST,                                  RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                6147,                                              0x03, "Compass Chest",                               RHT_SHADOW_TEMPLE_COMPASS_CHEST,                                 RG_SHADOW_TEMPLE_COMPASS,             { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
+    locationTable[RC_SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST] =                        Location::Chest(RC_SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST,                       RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                22594,                                             0x02, "Early Silver Rupee Chest",                    RHT_SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST,                      RG_SHADOW_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
+    locationTable[RC_SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST] =                  Location::Chest(RC_SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST,                 RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                22668,                                             0x0C, "Invisible Blades Visible Chest",              RHT_SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST,                RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST] =                Location::Chest(RC_SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST,               RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                26998,                                             0x16, "Invisible Blades Invisible Chest",            RHT_SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST,              RG_ARROWS_30,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST] =                      Location::Chest(RC_SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST,                     RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                22853,                                             0x05, "Falling Spikes Lower Chest",                  RHT_SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST,                    RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST] =                      Location::Chest(RC_SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST,                     RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                22662,                                             0x06, "Falling Spikes Upper Chest",                  RHT_SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST,                    RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST] =                     Location::Chest(RC_SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST,                    RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                -30652,                                            0x04, "Falling Spikes Switch Chest",                 RHT_SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST,                   RG_SHADOW_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
+    locationTable[RC_SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST] =                          Location::Chest(RC_SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST,                         RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                30857,                                             0x09, "Invisible Spikes Chest",                      RHT_SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST,                        RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_WIND_HINT_CHEST] =                                 Location::Chest(RC_SHADOW_TEMPLE_WIND_HINT_CHEST,                                RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                26965,                                             0x15, "Wind Hint Chest",                             RHT_SHADOW_TEMPLE_WIND_HINT_CHEST,                               RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST] =                          Location::Chest(RC_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST,                         RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                30856,                                             0x08, "After Wind Enemy Chest",                      RHT_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST,                        RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST] =                         Location::Chest(RC_SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST,                        RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                26708,                                             0x14, "After Wind Hidden Chest",                     RHT_SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST,                       RG_SHADOW_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
+    locationTable[RC_SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST] =                          Location::Chest(RC_SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST,                         RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                22666,                                             0x0A, "Spike Walls Left Chest",                      RHT_SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST,                        RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_BOSS_KEY_CHEST] =                                  Location::Chest(RC_SHADOW_TEMPLE_BOSS_KEY_CHEST,                                 RCQUEST_VANILLA, RCTYPE_BOSS_KEY,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                10219,                                             0x0B, "Boss Key Chest",                              RHT_SHADOW_TEMPLE_BOSS_KEY_CHEST,                                RG_SHADOW_TEMPLE_BOSS_KEY,            { Category::cVanillaBossKey },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
+    locationTable[RC_SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST] =                     Location::Chest(RC_SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST,                    RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                30797,                                             0x0D, "Invisible Floormaster Chest",                 RHT_SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST,                   RG_SHADOW_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
+    locationTable[RC_SHADOW_TEMPLE_FREESTANDING_KEY] =                          Location::Collectable(RC_SHADOW_TEMPLE_FREESTANDING_KEY,                               RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_ITEM00,      SCENE_SHADOW_TEMPLE,                273,                                               0x01, "Freestanding Key",                            RHT_SHADOW_TEMPLE_FREESTANDING_KEY,                              RG_SHADOW_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
     // Shadow Temple MQ
-    locationTable[RC_SHADOW_TEMPLE_MQ_COMPASS_CHEST] =                                Location::Chest(RC_SHADOW_TEMPLE_MQ_COMPASS_CHEST,                               RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                6145,                                              0x01, "MQ Compass Chest",                            "Shadow Temple MQ Compass Chest",                           RHT_SHADOW_TEMPLE_MQ_COMPASS_CHEST,                              RG_SHADOW_TEMPLE_COMPASS,             { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
-    locationTable[RC_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST] =                            Location::Chest(RC_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST,                           RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                5607,                                              0x07, "MQ Hover Boots Chest",                        "Shadow Temple MQ Hover Boots Chest",                       RHT_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST,                          RG_HOVER_BOOTS,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
-    locationTable[RC_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST] =                           Location::Chest(RC_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST,                          RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                30787,                                             0x03, "MQ Early Gibdos Chest",                       "Shadow Temple MQ Early Gibdos Chest",                      RHT_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST,                         RG_SHADOW_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
-    locationTable[RC_SHADOW_TEMPLE_MQ_MAP_CHEST] =                                    Location::Chest(RC_SHADOW_TEMPLE_MQ_MAP_CHEST,                                   RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                2082,                                              0x02, "MQ Map Chest",                                "Shadow Temple MQ Map Chest",                               RHT_SHADOW_TEMPLE_MQ_MAP_CHEST,                                  RG_SHADOW_TEMPLE_MAP,                 { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
-    locationTable[RC_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST] =                   Location::Chest(RC_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST,                  RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                -30417,                                            0x0F, "MQ Beamos Silver Rupees Chest",               "Shadow Temple MQ Beamos Silver Rupees Chest",              RHT_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST,                 RG_ARROWS_5,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST] =                  Location::Chest(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST,                 RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                22662,                                             0x04, "MQ Falling Spikes Switch Chest",              "Shadow Temple MQ Falling Spikes Switch Chest",             RHT_SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST,                RG_SHADOW_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
-    locationTable[RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST] =                   Location::Chest(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST,                  RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                22853,                                             0x05, "MQ Falling Spikes Lower Chest",               "Shadow Temple MQ Falling Spikes Lower Chest",              RHT_SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST,                 RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST] =                   Location::Chest(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST,                  RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                -30652,                                            0x06, "MQ Falling Spikes Upper Chest",               "Shadow Temple MQ Falling Spikes Upper Chest",              RHT_SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST,                 RG_ARROWS_5,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST] =                       Location::Chest(RC_SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST,                      RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                30857,                                             0x09, "MQ Invisible Spikes Chest",                   "Shadow Temple MQ Invisible Spikes Chest",                  RHT_SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST,                     RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST] =                               Location::Chest(RC_SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST,                              RCQUEST_MQ,      RCTYPE_BOSS_KEY,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                10219,                                             0x0B, "MQ Boss Key Chest",                           "Shadow Temple MQ Boss Key Chest",                          RHT_SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST,                             RG_SHADOW_TEMPLE_BOSS_KEY,            { Category::cVanillaBossKey },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
-    locationTable[RC_SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST] =                       Location::Chest(RC_SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST,                      RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                22666,                                             0x0A, "MQ Spike Walls Left Chest",                   "Shadow Temple MQ Spike Walls Left Chest",                  RHT_SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST,                     RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST] =                           Location::Chest(RC_SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST,                          RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                31184,                                             0x10, "MQ Stalfos Room Chest",                       "Shadow Temple MQ Stalfos Room Chest",                      RHT_SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST,                         RG_RED_RUPEE,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST] =             Location::Chest(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST,            RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                26710,                                             0x16, "MQ Invisible Blades Invisible Chest",         "Shadow Temple MQ Invisible Blades Invisible Chest",        RHT_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST,           RG_SHADOW_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
-    locationTable[RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST] =               Location::Chest(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST,              RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                22668,                                             0x0C, "MQ Invisible Blades Visible Chest",           "Shadow Temple MQ Invisible Blades Visible Chest",          RHT_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST,             RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST] =                            Location::Chest(RC_SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST,                           RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                31053,                                             0x0D, "MQ Bomb Flower Chest",                        "Shadow Temple MQ Bomb Flower Chest",                       RHT_SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST,                          RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_MQ_WIND_HINT_CHEST] =                              Location::Chest(RC_SHADOW_TEMPLE_MQ_WIND_HINT_CHEST,                             RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                26709,                                             0x15, "MQ Wind Hint Chest",                          "Shadow Temple MQ Wind Hint Chest",                         RHT_SHADOW_TEMPLE_MQ_WIND_HINT_CHEST,                            RG_SHADOW_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
-    locationTable[RC_SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST] =                      Location::Chest(RC_SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST,                     RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                26932,                                             0x14, "MQ After Wind Hidden Chest",                  "Shadow Temple MQ After Wind Hidden Chest",                 RHT_SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST,                    RG_ARROWS_5,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST] =                       Location::Chest(RC_SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST,                      RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                30856,                                             0x08, "MQ After Wind Enemy Chest",                   "Shadow Temple MQ After Wind Enemy Chest",                  RHT_SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST,                     RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST] =                    Location::Chest(RC_SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST,                   RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                26702,                                             0x0E, "MQ Near Ship Invisible Chest",                "Shadow Temple MQ Near Ship Invisible Chest",               RHT_SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST,                  RG_SHADOW_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
-    locationTable[RC_SHADOW_TEMPLE_MQ_FREESTANDING_KEY] =                       Location::Collectable(RC_SHADOW_TEMPLE_MQ_FREESTANDING_KEY,                            RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_ITEM00,      SCENE_SHADOW_TEMPLE,                1553,                                              0x06, "MQ Freestanding Key",                         "Shadow Temple MQ Freestanding Key",                        RHT_SHADOW_TEMPLE_MQ_FREESTANDING_KEY,                           RG_SHADOW_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
+    locationTable[RC_SHADOW_TEMPLE_MQ_COMPASS_CHEST] =                                Location::Chest(RC_SHADOW_TEMPLE_MQ_COMPASS_CHEST,                               RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                6145,                                              0x01, "MQ Compass Chest",                            RHT_SHADOW_TEMPLE_MQ_COMPASS_CHEST,                              RG_SHADOW_TEMPLE_COMPASS,             { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
+    locationTable[RC_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST] =                            Location::Chest(RC_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST,                           RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                5607,                                              0x07, "MQ Hover Boots Chest",                        RHT_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST,                          RG_HOVER_BOOTS,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
+    locationTable[RC_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST] =                           Location::Chest(RC_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST,                          RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                30787,                                             0x03, "MQ Early Gibdos Chest",                       RHT_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST,                         RG_SHADOW_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
+    locationTable[RC_SHADOW_TEMPLE_MQ_MAP_CHEST] =                                    Location::Chest(RC_SHADOW_TEMPLE_MQ_MAP_CHEST,                                   RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                2082,                                              0x02, "MQ Map Chest",                                RHT_SHADOW_TEMPLE_MQ_MAP_CHEST,                                  RG_SHADOW_TEMPLE_MAP,                 { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
+    locationTable[RC_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST] =                   Location::Chest(RC_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST,                  RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                -30417,                                            0x0F, "MQ Beamos Silver Rupees Chest",               RHT_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST,                 RG_ARROWS_5,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST] =                  Location::Chest(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST,                 RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                22662,                                             0x04, "MQ Falling Spikes Switch Chest",              RHT_SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST,                RG_SHADOW_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
+    locationTable[RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST] =                   Location::Chest(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST,                  RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                22853,                                             0x05, "MQ Falling Spikes Lower Chest",               RHT_SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST,                 RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST] =                   Location::Chest(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST,                  RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                -30652,                                            0x06, "MQ Falling Spikes Upper Chest",               RHT_SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST,                 RG_ARROWS_5,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST] =                       Location::Chest(RC_SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST,                      RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                30857,                                             0x09, "MQ Invisible Spikes Chest",                   RHT_SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST,                     RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST] =                               Location::Chest(RC_SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST,                              RCQUEST_MQ,      RCTYPE_BOSS_KEY,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                10219,                                             0x0B, "MQ Boss Key Chest",                           RHT_SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST,                             RG_SHADOW_TEMPLE_BOSS_KEY,            { Category::cVanillaBossKey },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
+    locationTable[RC_SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST] =                       Location::Chest(RC_SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST,                      RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                22666,                                             0x0A, "MQ Spike Walls Left Chest",                   RHT_SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST,                     RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST] =                           Location::Chest(RC_SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST,                          RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                31184,                                             0x10, "MQ Stalfos Room Chest",                       RHT_SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST,                         RG_RED_RUPEE,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST] =             Location::Chest(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST,            RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                26710,                                             0x16, "MQ Invisible Blades Invisible Chest",         RHT_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST,           RG_SHADOW_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
+    locationTable[RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST] =               Location::Chest(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST,              RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                22668,                                             0x0C, "MQ Invisible Blades Visible Chest",           RHT_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST,             RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST] =                            Location::Chest(RC_SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST,                           RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                31053,                                             0x0D, "MQ Bomb Flower Chest",                        RHT_SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST,                          RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_WIND_HINT_CHEST] =                              Location::Chest(RC_SHADOW_TEMPLE_MQ_WIND_HINT_CHEST,                             RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                26709,                                             0x15, "MQ Wind Hint Chest",                          RHT_SHADOW_TEMPLE_MQ_WIND_HINT_CHEST,                            RG_SHADOW_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
+    locationTable[RC_SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST] =                      Location::Chest(RC_SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST,                     RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                26932,                                             0x14, "MQ After Wind Hidden Chest",                  RHT_SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST,                    RG_ARROWS_5,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST] =                       Location::Chest(RC_SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST,                      RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                30856,                                             0x08, "MQ After Wind Enemy Chest",                   RHT_SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST,                     RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST] =                    Location::Chest(RC_SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST,                   RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                26702,                                             0x0E, "MQ Near Ship Invisible Chest",                RHT_SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST,                  RG_SHADOW_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
+    locationTable[RC_SHADOW_TEMPLE_MQ_FREESTANDING_KEY] =                       Location::Collectable(RC_SHADOW_TEMPLE_MQ_FREESTANDING_KEY,                            RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_ITEM00,      SCENE_SHADOW_TEMPLE,                1553,                                              0x06, "MQ Freestanding Key",                         RHT_SHADOW_TEMPLE_MQ_FREESTANDING_KEY,                           RG_SHADOW_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
 
     // Bottom of the Well Vanilla
-    locationTable[RC_BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST] =                 Location::Chest(RC_BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST,                RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           22600,                                             0x08, "Front Left Fake Wall Chest",                  "Bottom of the Well Front Left Fake Wall Chest",            RHT_BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST,               RG_BOTTOM_OF_THE_WELL_SMALL_KEY,      { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
-    locationTable[RC_BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST] =                Location::Chest(RC_BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST,               RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           20578,                                             0x02, "Front Center Bombable Chest",                 "Bottom of the Well Front Center Bombable Chest",           RHT_BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST,              RG_BOMBCHU_10,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[RC_BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST] =               Location::Chest(RC_BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST,              RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           22597,                                             0x05, "Right Bottom Fake Wall Chest",                "Bottom of the Well Right Bottom Fake Wall Chest",          RHT_BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST,             RG_BOTTOM_OF_THE_WELL_SMALL_KEY,      { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
-    locationTable[RC_BOTTOM_OF_THE_WELL_COMPASS_CHEST] =                              Location::Chest(RC_BOTTOM_OF_THE_WELL_COMPASS_CHEST,                             RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           2049,                                              0x01, "Compass Chest",                               "Bottom of the Well Compass Chest",                         RHT_BOTTOM_OF_THE_WELL_COMPASS_CHEST,                            RG_BOTTOM_OF_THE_WELL_COMPASS,        { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
-    locationTable[RC_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST] =                     Location::Chest(RC_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST,                    RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           20558,                                             0x0E, "Center Skulltula Chest",                      "Bottom of the Well Center Skulltula Chest",                RHT_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST,                   RG_DEKU_NUTS_5,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[RC_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST] =                   Location::Chest(RC_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST,                  RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           23684,                                             0x04, "Back Left Bombable Chest",                    "Bottom of the Well Back Left Bombable Chest",              RHT_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST,                 RG_DEKU_NUTS_10,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[RC_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST] =                        Location::Chest(RC_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST,                       RCQUEST_VANILLA, RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           4419,                                              0x03, "Lens of Truth Chest",                         "Bottom of the Well Lens of Truth Chest",                   RHT_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST,                      RG_LENS_OF_TRUTH,                     { Category::cSongDungeonReward },                                                                                                                                                     SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
-    locationTable[RC_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST] =                            Location::Chest(RC_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST,                           RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           27348,                                             0x14, "Invisible Chest",                             "Bottom of the Well Invisible Chest",                       RHT_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST,                          RG_HUGE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[RC_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST] =                     Location::Chest(RC_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST,                    RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           23760,                                             0x10, "Underwater Front Chest",                      "Bottom of the Well Underwater Front Chest",                RHT_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST,                   RG_BOMBS_10,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[RC_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST] =                      Location::Chest(RC_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST,                     RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           22793,                                             0x09, "Underwater Left Chest",                       "Bottom of the Well Underwater Left Chest",                 RHT_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST,                    RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[RC_BOTTOM_OF_THE_WELL_MAP_CHEST] =                                  Location::Chest(RC_BOTTOM_OF_THE_WELL_MAP_CHEST,                                 RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           2087,                                              0x07, "Map Chest",                                   "Bottom of the Well Map Chest",                             RHT_BOTTOM_OF_THE_WELL_MAP_CHEST,                                RG_BOTTOM_OF_THE_WELL_MAP,            { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
-    locationTable[RC_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST] =                           Location::Chest(RC_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST,                          RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           21802,                                             0x0A, "Fire Keese Chest",                            "Bottom of the Well Fire Keese Chest",                      RHT_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST,                         RG_DEKU_SHIELD,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[RC_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST] =                            Location::Chest(RC_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST,                           RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           21836,                                             0x0C, "Like Like Chest",                             "Bottom of the Well Like Like Chest",                       RHT_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST,                          RG_HYLIAN_SHIELD,                     {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[RC_BOTTOM_OF_THE_WELL_FREESTANDING_KEY] =                     Location::Collectable(RC_BOTTOM_OF_THE_WELL_FREESTANDING_KEY,                          RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_ITEM00,      SCENE_BOTTOM_OF_THE_WELL,           273,                                               0x01, "Freestanding Key",                            "Bottom of the Well Freestanding Key",                      RHT_BOTTOM_OF_THE_WELL_FREESTANDING_KEY,                         RG_BOTTOM_OF_THE_WELL_SMALL_KEY,      { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
+    locationTable[RC_BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST] =                 Location::Chest(RC_BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST,                RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           22600,                                             0x08, "Front Left Fake Wall Chest",                  RHT_BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST,               RG_BOTTOM_OF_THE_WELL_SMALL_KEY,      { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
+    locationTable[RC_BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST] =                Location::Chest(RC_BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST,               RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           20578,                                             0x02, "Front Center Bombable Chest",                 RHT_BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST,              RG_BOMBCHU_10,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
+    locationTable[RC_BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST] =               Location::Chest(RC_BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST,              RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           22597,                                             0x05, "Right Bottom Fake Wall Chest",                RHT_BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST,             RG_BOTTOM_OF_THE_WELL_SMALL_KEY,      { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
+    locationTable[RC_BOTTOM_OF_THE_WELL_COMPASS_CHEST] =                              Location::Chest(RC_BOTTOM_OF_THE_WELL_COMPASS_CHEST,                             RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           2049,                                              0x01, "Compass Chest",                               RHT_BOTTOM_OF_THE_WELL_COMPASS_CHEST,                            RG_BOTTOM_OF_THE_WELL_COMPASS,        { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
+    locationTable[RC_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST] =                     Location::Chest(RC_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST,                    RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           20558,                                             0x0E, "Center Skulltula Chest",                      RHT_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST,                   RG_DEKU_NUTS_5,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
+    locationTable[RC_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST] =                   Location::Chest(RC_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST,                  RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           23684,                                             0x04, "Back Left Bombable Chest",                    RHT_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST,                 RG_DEKU_NUTS_10,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
+    locationTable[RC_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST] =                        Location::Chest(RC_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST,                       RCQUEST_VANILLA, RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           4419,                                              0x03, "Lens of Truth Chest",                         RHT_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST,                      RG_LENS_OF_TRUTH,                     { Category::cSongDungeonReward },                                                                                                                                                     SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
+    locationTable[RC_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST] =                            Location::Chest(RC_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST,                           RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           27348,                                             0x14, "Invisible Chest",                             RHT_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST,                          RG_HUGE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
+    locationTable[RC_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST] =                     Location::Chest(RC_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST,                    RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           23760,                                             0x10, "Underwater Front Chest",                      RHT_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST,                   RG_BOMBS_10,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
+    locationTable[RC_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST] =                      Location::Chest(RC_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST,                     RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           22793,                                             0x09, "Underwater Left Chest",                       RHT_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST,                    RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
+    locationTable[RC_BOTTOM_OF_THE_WELL_MAP_CHEST] =                                  Location::Chest(RC_BOTTOM_OF_THE_WELL_MAP_CHEST,                                 RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           2087,                                              0x07, "Map Chest",                                   RHT_BOTTOM_OF_THE_WELL_MAP_CHEST,                                RG_BOTTOM_OF_THE_WELL_MAP,            { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
+    locationTable[RC_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST] =                           Location::Chest(RC_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST,                          RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           21802,                                             0x0A, "Fire Keese Chest",                            RHT_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST,                         RG_DEKU_SHIELD,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
+    locationTable[RC_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST] =                            Location::Chest(RC_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST,                           RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           21836,                                             0x0C, "Like Like Chest",                             RHT_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST,                          RG_HYLIAN_SHIELD,                     {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
+    locationTable[RC_BOTTOM_OF_THE_WELL_FREESTANDING_KEY] =                     Location::Collectable(RC_BOTTOM_OF_THE_WELL_FREESTANDING_KEY,                          RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_ITEM00,      SCENE_BOTTOM_OF_THE_WELL,           273,                                               0x01, "Freestanding Key",                            RHT_BOTTOM_OF_THE_WELL_FREESTANDING_KEY,                         RG_BOTTOM_OF_THE_WELL_SMALL_KEY,      { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
     // Bottom of the Well Master Quest
-    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_MAP_CHEST] =                               Location::Chest(RC_BOTTOM_OF_THE_WELL_MQ_MAP_CHEST,                              RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           2083,                                              0x03, "MQ Map Chest",                                "Bottom of the Well MQ Map Chest",                          RHT_BOTTOM_OF_THE_WELL_MQ_MAP_CHEST,                             RG_BOTTOM_OF_THE_WELL_MAP,            { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
-    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST] =                     Location::Chest(RC_BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST,                    RCQUEST_MQ,      RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           -20159,                                            0x01, "MQ Lens of Truth Chest",                      "Bottom of the Well MQ Lens of Truth Chest",                RHT_BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST,                   RG_LENS_OF_TRUTH,                     { Category::cSongDungeonReward },                                                                                                                                                     SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
-    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST] =                           Location::Chest(RC_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST,                          RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           6146,                                              0x02, "MQ Compass Chest",                            "Bottom of the Well MQ Compass Chest",                      RHT_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST,                         RG_BOTTOM_OF_THE_WELL_COMPASS,        { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
-    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY] =        Location::Collectable(RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY,             RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_ITEM00,      SCENE_BOTTOM_OF_THE_WELL,           529,                                               0x02, "MQ Dead Hand Freestanding Key",               "Bottom of the Well MQ Dead Hand Freestanding Key",         RHT_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY,            RG_BOTTOM_OF_THE_WELL_SMALL_KEY,      { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
-    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY] =  Location::Collectable(RC_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY,       RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_ITEM00,      SCENE_BOTTOM_OF_THE_WELL,           273,                                               0x01, "MQ East Inner Room Freestanding Key",         "Bottom of the Well MQ East Inner Room Freestanding Key",   RHT_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY,      RG_BOTTOM_OF_THE_WELL_SMALL_KEY,      { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
+    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_MAP_CHEST] =                               Location::Chest(RC_BOTTOM_OF_THE_WELL_MQ_MAP_CHEST,                              RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           2083,                                              0x03, "MQ Map Chest",                                RHT_BOTTOM_OF_THE_WELL_MQ_MAP_CHEST,                             RG_BOTTOM_OF_THE_WELL_MAP,            { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
+    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST] =                     Location::Chest(RC_BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST,                    RCQUEST_MQ,      RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           -20159,                                            0x01, "MQ Lens of Truth Chest",                      RHT_BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST,                   RG_LENS_OF_TRUTH,                     { Category::cSongDungeonReward },                                                                                                                                                     SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
+    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST] =                           Location::Chest(RC_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST,                          RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           6146,                                              0x02, "MQ Compass Chest",                            RHT_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST,                         RG_BOTTOM_OF_THE_WELL_COMPASS,        { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
+    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY] =        Location::Collectable(RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY,             RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_ITEM00,      SCENE_BOTTOM_OF_THE_WELL,           529,                                               0x02, "MQ Dead Hand Freestanding Key",               RHT_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY,            RG_BOTTOM_OF_THE_WELL_SMALL_KEY,      { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
+    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY] =  Location::Collectable(RC_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY,       RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_ITEM00,      SCENE_BOTTOM_OF_THE_WELL,           273,                                               0x01, "MQ East Inner Room Freestanding Key",         RHT_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY,      RG_BOTTOM_OF_THE_WELL_SMALL_KEY,      { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
 
     // Ice Cavern Vanilla
-    locationTable[RC_ICE_CAVERN_MAP_CHEST] =                                          Location::Chest(RC_ICE_CAVERN_MAP_CHEST,                                         RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_ICE_CAVERN,                   ACTOR_EN_BOX,         SCENE_ICE_CAVERN,                   2080,                                              0x00, "Map Chest",                                   "Ice Cavern Map Chest",                                     RHT_ICE_CAVERN_MAP_CHEST,                                        RG_ICE_CAVERN_MAP,                    { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN,         true);
-    locationTable[RC_ICE_CAVERN_COMPASS_CHEST] =                                      Location::Chest(RC_ICE_CAVERN_COMPASS_CHEST,                                     RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_ICE_CAVERN,                   ACTOR_EN_BOX,         SCENE_ICE_CAVERN,                   2049,                                              0x01, "Compass Chest",                               "Ice Cavern Compass Chest",                                 RHT_ICE_CAVERN_COMPASS_CHEST,                                    RG_ICE_CAVERN_COMPASS,                { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN,         true);
-    locationTable[RC_ICE_CAVERN_IRON_BOOTS_CHEST] =                                   Location::Chest(RC_ICE_CAVERN_IRON_BOOTS_CHEST,                                  RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_ICE_CAVERN,                   ACTOR_EN_BOX,         SCENE_ICE_CAVERN,                   5570,                                              0x02, "Iron Boots Chest",                            "Ice Cavern Iron Boots Chest",                              RHT_ICE_CAVERN_IRON_BOOTS_CHEST,                                 RG_IRON_BOOTS,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN,         true);
-    locationTable[RC_ICE_CAVERN_FREESTANDING_POH] =                             Location::Collectable(RC_ICE_CAVERN_FREESTANDING_POH,                                  RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_ICE_CAVERN,                   ACTOR_EN_ITEM00,      SCENE_ICE_CAVERN,                   262,                                               0x01, "Freestanding PoH",                            "Ice Cavern Freestanding PoH",                              RHT_ICE_CAVERN_FREESTANDING_POH,                                 RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN,         true);
+    locationTable[RC_ICE_CAVERN_MAP_CHEST] =                                          Location::Chest(RC_ICE_CAVERN_MAP_CHEST,                                         RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_ICE_CAVERN,                   ACTOR_EN_BOX,         SCENE_ICE_CAVERN,                   2080,                                              0x00, "Map Chest",                                   RHT_ICE_CAVERN_MAP_CHEST,                                        RG_ICE_CAVERN_MAP,                    { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN,         true);
+    locationTable[RC_ICE_CAVERN_COMPASS_CHEST] =                                      Location::Chest(RC_ICE_CAVERN_COMPASS_CHEST,                                     RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_ICE_CAVERN,                   ACTOR_EN_BOX,         SCENE_ICE_CAVERN,                   2049,                                              0x01, "Compass Chest",                               RHT_ICE_CAVERN_COMPASS_CHEST,                                    RG_ICE_CAVERN_COMPASS,                { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN,         true);
+    locationTable[RC_ICE_CAVERN_IRON_BOOTS_CHEST] =                                   Location::Chest(RC_ICE_CAVERN_IRON_BOOTS_CHEST,                                  RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_ICE_CAVERN,                   ACTOR_EN_BOX,         SCENE_ICE_CAVERN,                   5570,                                              0x02, "Iron Boots Chest",                            RHT_ICE_CAVERN_IRON_BOOTS_CHEST,                                 RG_IRON_BOOTS,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN,         true);
+    locationTable[RC_ICE_CAVERN_FREESTANDING_POH] =                             Location::Collectable(RC_ICE_CAVERN_FREESTANDING_POH,                                  RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_ICE_CAVERN,                   ACTOR_EN_ITEM00,      SCENE_ICE_CAVERN,                   262,                                               0x01, "Freestanding PoH",                            RHT_ICE_CAVERN_FREESTANDING_POH,                                 RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN,         true);
     // Ice Cavern Master Quest
-    locationTable[RC_ICE_CAVERN_MQ_IRON_BOOTS_CHEST] =                                Location::Chest(RC_ICE_CAVERN_MQ_IRON_BOOTS_CHEST,                               RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_ICE_CAVERN,                   ACTOR_EN_BOX,         SCENE_ICE_CAVERN,                   5570,                                              0x02, "MQ Iron Boots Chest",                         "Ice Cavern MQ Iron Boots Chest",                           RHT_ICE_CAVERN_MQ_IRON_BOOTS_CHEST,                              RG_IRON_BOOTS,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN,         true);
-    locationTable[RC_ICE_CAVERN_MQ_COMPASS_CHEST] =                                   Location::Chest(RC_ICE_CAVERN_MQ_COMPASS_CHEST,                                  RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_ICE_CAVERN,                   ACTOR_EN_BOX,         SCENE_ICE_CAVERN,                   2048,                                              0x00, "MQ Compass Chest",                            "Ice Cavern MQ Compass Chest",                              RHT_ICE_CAVERN_MQ_COMPASS_CHEST,                                 RG_ICE_CAVERN_COMPASS,                { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN,         true);
-    locationTable[RC_ICE_CAVERN_MQ_MAP_CHEST] =                                       Location::Chest(RC_ICE_CAVERN_MQ_MAP_CHEST,                                      RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_ICE_CAVERN,                   ACTOR_EN_BOX,         SCENE_ICE_CAVERN,                   -18399,                                            0x01, "MQ Map Chest",                                "Ice Cavern MQ Map Chest",                                  RHT_ICE_CAVERN_MQ_MAP_CHEST,                                     RG_ICE_CAVERN_MAP,                    { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN,         true);
-    locationTable[RC_ICE_CAVERN_MQ_FREESTANDING_POH] =                          Location::Collectable(RC_ICE_CAVERN_MQ_FREESTANDING_POH,                               RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_ICE_CAVERN,                   ACTOR_EN_ITEM00,      SCENE_ICE_CAVERN,                   262,                                               0x01, "MQ Freestanding PoH",                         "Ice Cavern MQ Freestanding PoH",                           RHT_ICE_CAVERN_MQ_FREESTANDING_POH,                              RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN,         true);
+    locationTable[RC_ICE_CAVERN_MQ_IRON_BOOTS_CHEST] =                                Location::Chest(RC_ICE_CAVERN_MQ_IRON_BOOTS_CHEST,                               RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_ICE_CAVERN,                   ACTOR_EN_BOX,         SCENE_ICE_CAVERN,                   5570,                                              0x02, "MQ Iron Boots Chest",                         RHT_ICE_CAVERN_MQ_IRON_BOOTS_CHEST,                              RG_IRON_BOOTS,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN,         true);
+    locationTable[RC_ICE_CAVERN_MQ_COMPASS_CHEST] =                                   Location::Chest(RC_ICE_CAVERN_MQ_COMPASS_CHEST,                                  RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_ICE_CAVERN,                   ACTOR_EN_BOX,         SCENE_ICE_CAVERN,                   2048,                                              0x00, "MQ Compass Chest",                            RHT_ICE_CAVERN_MQ_COMPASS_CHEST,                                 RG_ICE_CAVERN_COMPASS,                { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN,         true);
+    locationTable[RC_ICE_CAVERN_MQ_MAP_CHEST] =                                       Location::Chest(RC_ICE_CAVERN_MQ_MAP_CHEST,                                      RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_ICE_CAVERN,                   ACTOR_EN_BOX,         SCENE_ICE_CAVERN,                   -18399,                                            0x01, "MQ Map Chest",                                RHT_ICE_CAVERN_MQ_MAP_CHEST,                                     RG_ICE_CAVERN_MAP,                    { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN,         true);
+    locationTable[RC_ICE_CAVERN_MQ_FREESTANDING_POH] =                          Location::Collectable(RC_ICE_CAVERN_MQ_FREESTANDING_POH,                               RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_ICE_CAVERN,                   ACTOR_EN_ITEM00,      SCENE_ICE_CAVERN,                   262,                                               0x01, "MQ Freestanding PoH",                         RHT_ICE_CAVERN_MQ_FREESTANDING_POH,                              RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN,         true);
 
     // Gerudo Training Grounds Vanilla
-    locationTable[RC_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST] =                       Location::Chest(RC_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST,                      RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30573,                                            0x13, "Lobby Left Chest",                            "Gerudo Training Grounds Lobby Left Chest",                 RHT_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST,                     RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST] =                      Location::Chest(RC_GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST,                     RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30393,                                            0x07, "Lobby Right Chest",                           "Gerudo Training Grounds Lobby Right Chest",                RHT_GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST,                    RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_STALFOS_CHEST] =                          Location::Chest(RC_GERUDO_TRAINING_GROUND_STALFOS_CHEST,                         RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30656,                                            0x00, "Stalfos Chest",                               "Gerudo Training Grounds Stalfos Chest",                    RHT_GERUDO_TRAINING_GROUND_STALFOS_CHEST,                        RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
-    locationTable[RC_GERUDO_TRAINING_GROUND_BEAMOS_CHEST] =                           Location::Chest(RC_GERUDO_TRAINING_GROUND_BEAMOS_CHEST,                          RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30655,                                            0x01, "Beamos Chest",                                "Gerudo Training Grounds Beamos Chest",                     RHT_GERUDO_TRAINING_GROUND_BEAMOS_CHEST,                         RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
-    locationTable[RC_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST] =                   Location::Chest(RC_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST,                  RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22603,                                             0x0B, "Hidden Ceiling Chest",                        "Gerudo Training Grounds Hidden Ceiling Chest",             RHT_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST,                 RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST] =                  Location::Chest(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST,                 RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       23206,                                             0x06, "Maze Path First Chest",                       "Gerudo Training Grounds Maze Path First Chest",            RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST,                RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MAZE_PATH_SECOND_CHEST] =                 Location::Chest(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_SECOND_CHEST,                RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22986,                                             0x0A, "Maze Path Second Chest",                      "Gerudo Training Grounds Maze Path Second Chest",           RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_SECOND_CHEST,               RG_RED_RUPEE,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MAZE_PATH_THIRD_CHEST] =                  Location::Chest(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_THIRD_CHEST,                 RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22889,                                             0x09, "Maze Path Third Chest",                       "Gerudo Training Grounds Maze Path Third Chest",            RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_THIRD_CHEST,                RG_ARROWS_30,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FINAL_CHEST] =                  Location::Chest(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FINAL_CHEST,                 RCQUEST_VANILLA, RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       2860,                                              0x0C, "Maze Path Final Chest",                       "Gerudo Training Grounds Maze Path Final Chest",            RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_FINAL_CHEST,                RG_ICE_ARROWS,                        { Category::cSongDungeonReward },                                                                                                                                                     SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_CENTRAL_CHEST] =               Location::Chest(RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_CENTRAL_CHEST,              RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       23877,                                             0x05, "Maze Right Central Chest",                    "Gerudo Training Grounds Maze Right Central Chest",         RHT_GERUDO_TRAINING_GROUND_MAZE_RIGHT_CENTRAL_CHEST,             RG_BOMBCHU_5,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_SIDE_CHEST] =                  Location::Chest(RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_SIDE_CHEST,                 RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22888,                                             0x08, "Maze Right Side Chest",                       "Gerudo Training Grounds Maze Right Side Chest",            RHT_GERUDO_TRAINING_GROUND_MAZE_RIGHT_SIDE_CHEST,                RG_ARROWS_30,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST] =          Location::Chest(RC_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST,         RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30643,                                            0x0D, "Underwater Silver Rupee Chest",               "Gerudo Training Grounds Underwater Silver Rupee Chest",    RHT_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST,        RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
-    locationTable[RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST] =                Location::Chest(RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST,               RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       31058,                                             0x12, "Hammer Room Clear Chest",                     "Gerudo Training Grounds Hammer Room Clear Chest",          RHT_GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST,              RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST] =               Location::Chest(RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST,              RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22608,                                             0x10, "Hammer Room Switch Chest",                    "Gerudo Training Grounds Hammer Room Switch Chest",         RHT_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST,             RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
-    locationTable[RC_GERUDO_TRAINING_GROUND_EYE_STATUE_CHEST] =                       Location::Chest(RC_GERUDO_TRAINING_GROUND_EYE_STATUE_CHEST,                      RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30653,                                            0x03, "Eye Statue Chest",                            "Gerudo Training Grounds Eye Statue Chest",                 RHT_GERUDO_TRAINING_GROUND_EYE_STATUE_CHEST,                     RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
-    locationTable[RC_GERUDO_TRAINING_GROUND_NEAR_SCARECROW_CHEST] =                   Location::Chest(RC_GERUDO_TRAINING_GROUND_NEAR_SCARECROW_CHEST,                  RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22596,                                             0x04, "Near Scarecrow Chest",                        "Gerudo Training Grounds Near Scarecrow Chest",             RHT_GERUDO_TRAINING_GROUND_NEAR_SCARECROW_CHEST,                 RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
-    locationTable[RC_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST] =               Location::Chest(RC_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST,              RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       31089,                                             0x11, "Before Heavy Block Chest",                    "Gerudo Training Grounds Before Heavy Block Chest",         RHT_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST,             RG_ARROWS_30,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST] =                Location::Chest(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST,               RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       31439,                                             0x0F, "Heavy Block First Chest",                     "Gerudo Training Grounds Heavy Block First Chest",          RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST,              RG_HUGE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST] =               Location::Chest(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST,              RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       30862,                                             0x0E, "Heavy Block Second Chest",                    "Gerudo Training Grounds Heavy Block Second Chest",         RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST,             RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_THIRD_CHEST] =                Location::Chest(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_THIRD_CHEST,               RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       26708,                                             0x14, "Heavy Block Third Chest",                     "Gerudo Training Grounds Heavy Block Third Chest",          RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_THIRD_CHEST,              RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
-    locationTable[RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FOURTH_CHEST] =               Location::Chest(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FOURTH_CHEST,              RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       24450,                                             0x02, "Heavy Block Fourth Chest",                    "Gerudo Training Grounds Heavy Block Fourth Chest",         RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FOURTH_CHEST,             RG_ICE_TRAP,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_FREESTANDING_KEY] =                 Location::Collectable(RC_GERUDO_TRAINING_GROUND_FREESTANDING_KEY,                      RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_ITEM00,      SCENE_GERUDO_TRAINING_GROUND,       273,                                               0x01, "Freestanding Key",                            "Gerudo Training Grounds Freestanding Key",                 RHT_GERUDO_TRAINING_GROUND_FREESTANDING_KEY,                     RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST] =                       Location::Chest(RC_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST,                      RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30573,                                            0x13, "Lobby Left Chest",                            RHT_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST,                     RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST] =                      Location::Chest(RC_GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST,                     RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30393,                                            0x07, "Lobby Right Chest",                           RHT_GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST,                    RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_STALFOS_CHEST] =                          Location::Chest(RC_GERUDO_TRAINING_GROUND_STALFOS_CHEST,                         RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30656,                                            0x00, "Stalfos Chest",                               RHT_GERUDO_TRAINING_GROUND_STALFOS_CHEST,                        RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_BEAMOS_CHEST] =                           Location::Chest(RC_GERUDO_TRAINING_GROUND_BEAMOS_CHEST,                          RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30655,                                            0x01, "Beamos Chest",                                RHT_GERUDO_TRAINING_GROUND_BEAMOS_CHEST,                         RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST] =                   Location::Chest(RC_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST,                  RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22603,                                             0x0B, "Hidden Ceiling Chest",                        RHT_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST,                 RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST] =                  Location::Chest(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST,                 RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       23206,                                             0x06, "Maze Path First Chest",                       RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST,                RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MAZE_PATH_SECOND_CHEST] =                 Location::Chest(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_SECOND_CHEST,                RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22986,                                             0x0A, "Maze Path Second Chest",                      RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_SECOND_CHEST,               RG_RED_RUPEE,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MAZE_PATH_THIRD_CHEST] =                  Location::Chest(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_THIRD_CHEST,                 RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22889,                                             0x09, "Maze Path Third Chest",                       RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_THIRD_CHEST,                RG_ARROWS_30,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FINAL_CHEST] =                  Location::Chest(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FINAL_CHEST,                 RCQUEST_VANILLA, RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       2860,                                              0x0C, "Maze Path Final Chest",                       RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_FINAL_CHEST,                RG_ICE_ARROWS,                        { Category::cSongDungeonReward },                                                                                                                                                     SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_CENTRAL_CHEST] =               Location::Chest(RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_CENTRAL_CHEST,              RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       23877,                                             0x05, "Maze Right Central Chest",                    RHT_GERUDO_TRAINING_GROUND_MAZE_RIGHT_CENTRAL_CHEST,             RG_BOMBCHU_5,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_SIDE_CHEST] =                  Location::Chest(RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_SIDE_CHEST,                 RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22888,                                             0x08, "Maze Right Side Chest",                       RHT_GERUDO_TRAINING_GROUND_MAZE_RIGHT_SIDE_CHEST,                RG_ARROWS_30,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST] =          Location::Chest(RC_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST,         RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30643,                                            0x0D, "Underwater Silver Rupee Chest",               RHT_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST,        RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST] =                Location::Chest(RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST,               RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       31058,                                             0x12, "Hammer Room Clear Chest",                     RHT_GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST,              RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST] =               Location::Chest(RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST,              RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22608,                                             0x10, "Hammer Room Switch Chest",                    RHT_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST,             RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_EYE_STATUE_CHEST] =                       Location::Chest(RC_GERUDO_TRAINING_GROUND_EYE_STATUE_CHEST,                      RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30653,                                            0x03, "Eye Statue Chest",                            RHT_GERUDO_TRAINING_GROUND_EYE_STATUE_CHEST,                     RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_NEAR_SCARECROW_CHEST] =                   Location::Chest(RC_GERUDO_TRAINING_GROUND_NEAR_SCARECROW_CHEST,                  RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22596,                                             0x04, "Near Scarecrow Chest",                        RHT_GERUDO_TRAINING_GROUND_NEAR_SCARECROW_CHEST,                 RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST] =               Location::Chest(RC_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST,              RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       31089,                                             0x11, "Before Heavy Block Chest",                    RHT_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST,             RG_ARROWS_30,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST] =                Location::Chest(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST,               RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       31439,                                             0x0F, "Heavy Block First Chest",                     RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST,              RG_HUGE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST] =               Location::Chest(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST,              RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       30862,                                             0x0E, "Heavy Block Second Chest",                    RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST,             RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_THIRD_CHEST] =                Location::Chest(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_THIRD_CHEST,               RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       26708,                                             0x14, "Heavy Block Third Chest",                     RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_THIRD_CHEST,              RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FOURTH_CHEST] =               Location::Chest(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FOURTH_CHEST,              RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       24450,                                             0x02, "Heavy Block Fourth Chest",                    RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FOURTH_CHEST,             RG_ICE_TRAP,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_FREESTANDING_KEY] =                 Location::Collectable(RC_GERUDO_TRAINING_GROUND_FREESTANDING_KEY,                      RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_ITEM00,      SCENE_GERUDO_TRAINING_GROUND,       273,                                               0x01, "Freestanding Key",                            RHT_GERUDO_TRAINING_GROUND_FREESTANDING_KEY,                     RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
     // Gerudo Training Grounds Master Quest
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST] =                   Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST,                  RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       23879,                                             0x07, "MQ Lobby Right Chest",                        "Gerudo Training Grounds MQ Lobby Right Chest",             RHT_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST,                 RG_BOMBCHU_5,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST] =                    Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST,                   RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22867,                                             0x13, "MQ Lobby Left Chest",                         "Gerudo Training Grounds MQ Lobby Left Chest",              RHT_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST,                  RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST] =            Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST,           RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30304,                                            0x00, "MQ First Iron Knuckle Chest",                 "Gerudo Training Grounds MQ First Iron Knuckle Chest",      RHT_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST,          RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_BEFORE_HEAVY_BLOCK_CHEST] =            Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_BEFORE_HEAVY_BLOCK_CHEST,           RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       31057,                                             0x11, "MQ Before Heavy Block Chest",                 "Gerudo Training Grounds MQ Before Heavy Block Chest",      RHT_GERUDO_TRAINING_GROUND_MQ_BEFORE_HEAVY_BLOCK_CHEST,          RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_EYE_STATUE_CHEST] =                    Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_EYE_STATUE_CHEST,                   RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -32669,                                            0x03, "MQ Eye Statue Chest",                         "Gerudo Training Grounds MQ Eye Statue Chest",              RHT_GERUDO_TRAINING_GROUND_MQ_EYE_STATUE_CHEST,                  RG_BOMBCHU_10,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_FLAME_CIRCLE_CHEST] =                  Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_FLAME_CIRCLE_CHEST,                 RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30642,                                            0x0E, "MQ Flame Circle Chest",                       "Gerudo Training Grounds MQ Flame Circle Chest",            RHT_GERUDO_TRAINING_GROUND_MQ_FLAME_CIRCLE_CHEST,                RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_SECOND_IRON_KNUCKLE_CHEST] =           Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_SECOND_IRON_KNUCKLE_CHEST,          RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       31058,                                             0x12, "MQ Second Iron Knuckle Chest",                "Gerudo Training Grounds MQ Second Iron Knuckle Chest",     RHT_GERUDO_TRAINING_GROUND_MQ_SECOND_IRON_KNUCKLE_CHEST,         RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_DINOLFOS_CHEST] =                      Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_DINOLFOS_CHEST,                     RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30655,                                            0x01, "MQ Dinolfos Chest",                           "Gerudo Training Grounds MQ Dinolfos Chest",                RHT_GERUDO_TRAINING_GROUND_MQ_DINOLFOS_CHEST,                    RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_ICE_ARROWS_CHEST] =                    Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_ICE_ARROWS_CHEST,                   RCQUEST_MQ,      RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -17628,                                            0x04, "MQ Ice Arrows Chest",                         "Gerudo Training Grounds MQ Ice Arrows Chest",              RHT_GERUDO_TRAINING_GROUND_MQ_ICE_ARROWS_CHEST,                  RG_ICE_ARROWS,                        { Category::cSongDungeonReward },                                                                                                                                                     SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_CENTRAL_CHEST] =            Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_CENTRAL_CHEST,           RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22661,                                             0x05, "MQ Maze Right Central Chest",                 "Gerudo Training Grounds MQ Maze Right Central Chest",      RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_CENTRAL_CHEST,          RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_FIRST_CHEST] =               Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_FIRST_CHEST,              RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22918,                                             0x06, "MQ Maze Path First Chest",                    "Gerudo Training Grounds MQ Maze Path First Chest",         RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_FIRST_CHEST,             RG_GREEN_RUPEE,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_SIDE_CHEST] =               Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_SIDE_CHEST,              RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       24136,                                             0x08, "MQ Maze Right Side Chest",                    "Gerudo Training Grounds MQ Maze Right Side Chest",         RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_SIDE_CHEST,             RG_TREASURE_GAME_GREEN_RUPEE,         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_THIRD_CHEST] =               Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_THIRD_CHEST,              RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       24137,                                             0x09, "MQ Maze Path Third Chest",                    "Gerudo Training Grounds MQ Maze Path Third Chest",         RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_THIRD_CHEST,             RG_TREASURE_GAME_GREEN_RUPEE,         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_SECOND_CHEST] =              Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_SECOND_CHEST,             RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22986,                                             0x0A, "MQ Maze Path Second Chest",                   "Gerudo Training Grounds MQ Maze Path Second Chest",        RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_SECOND_CHEST,            RG_RED_RUPEE,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_HIDDEN_CEILING_CHEST] =                Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_HIDDEN_CEILING_CHEST,               RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       23211,                                             0x0B, "MQ Hidden Ceiling Chest",                     "Gerudo Training Grounds MQ Hidden Ceiling Chest",          RHT_GERUDO_TRAINING_GROUND_MQ_HIDDEN_CEILING_CHEST,              RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST] =       Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST,      RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30643,                                            0x0D, "MQ Underwater Silver Rupee Chest",            "Gerudo Training Grounds MQ Underwater Silver Rupee Chest", RHT_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST,     RG_TREASURE_GAME_GREEN_RUPEE,         { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_HEAVY_BLOCK_CHEST] =                   Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_HEAVY_BLOCK_CHEST,                  RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       31394,                                             0x02, "MQ Heavy Block Chest",                        "Gerudo Training Grounds MQ Heavy Block Chest",             RHT_GERUDO_TRAINING_GROUND_MQ_HEAVY_BLOCK_CHEST,                 RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST] =                   Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST,                  RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       23879,                                             0x07, "MQ Lobby Right Chest",                        RHT_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST,                 RG_BOMBCHU_5,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST] =                    Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST,                   RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22867,                                             0x13, "MQ Lobby Left Chest",                         RHT_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST,                  RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST] =            Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST,           RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30304,                                            0x00, "MQ First Iron Knuckle Chest",                 RHT_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST,          RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_BEFORE_HEAVY_BLOCK_CHEST] =            Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_BEFORE_HEAVY_BLOCK_CHEST,           RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       31057,                                             0x11, "MQ Before Heavy Block Chest",                 RHT_GERUDO_TRAINING_GROUND_MQ_BEFORE_HEAVY_BLOCK_CHEST,          RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_EYE_STATUE_CHEST] =                    Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_EYE_STATUE_CHEST,                   RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -32669,                                            0x03, "MQ Eye Statue Chest",                         RHT_GERUDO_TRAINING_GROUND_MQ_EYE_STATUE_CHEST,                  RG_BOMBCHU_10,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_FLAME_CIRCLE_CHEST] =                  Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_FLAME_CIRCLE_CHEST,                 RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30642,                                            0x0E, "MQ Flame Circle Chest",                       RHT_GERUDO_TRAINING_GROUND_MQ_FLAME_CIRCLE_CHEST,                RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_SECOND_IRON_KNUCKLE_CHEST] =           Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_SECOND_IRON_KNUCKLE_CHEST,          RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       31058,                                             0x12, "MQ Second Iron Knuckle Chest",                RHT_GERUDO_TRAINING_GROUND_MQ_SECOND_IRON_KNUCKLE_CHEST,         RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_DINOLFOS_CHEST] =                      Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_DINOLFOS_CHEST,                     RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30655,                                            0x01, "MQ Dinolfos Chest",                           RHT_GERUDO_TRAINING_GROUND_MQ_DINOLFOS_CHEST,                    RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_ICE_ARROWS_CHEST] =                    Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_ICE_ARROWS_CHEST,                   RCQUEST_MQ,      RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -17628,                                            0x04, "MQ Ice Arrows Chest",                         RHT_GERUDO_TRAINING_GROUND_MQ_ICE_ARROWS_CHEST,                  RG_ICE_ARROWS,                        { Category::cSongDungeonReward },                                                                                                                                                     SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_CENTRAL_CHEST] =            Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_CENTRAL_CHEST,           RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22661,                                             0x05, "MQ Maze Right Central Chest",                 RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_CENTRAL_CHEST,          RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_FIRST_CHEST] =               Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_FIRST_CHEST,              RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22918,                                             0x06, "MQ Maze Path First Chest",                    RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_FIRST_CHEST,             RG_GREEN_RUPEE,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_SIDE_CHEST] =               Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_SIDE_CHEST,              RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       24136,                                             0x08, "MQ Maze Right Side Chest",                    RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_SIDE_CHEST,             RG_TREASURE_GAME_GREEN_RUPEE,         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_THIRD_CHEST] =               Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_THIRD_CHEST,              RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       24137,                                             0x09, "MQ Maze Path Third Chest",                    RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_THIRD_CHEST,             RG_TREASURE_GAME_GREEN_RUPEE,         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_SECOND_CHEST] =              Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_SECOND_CHEST,             RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22986,                                             0x0A, "MQ Maze Path Second Chest",                   RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_SECOND_CHEST,            RG_RED_RUPEE,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_HIDDEN_CEILING_CHEST] =                Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_HIDDEN_CEILING_CHEST,               RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       23211,                                             0x0B, "MQ Hidden Ceiling Chest",                     RHT_GERUDO_TRAINING_GROUND_MQ_HIDDEN_CEILING_CHEST,              RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST] =       Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST,      RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30643,                                            0x0D, "MQ Underwater Silver Rupee Chest",            RHT_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST,     RG_TREASURE_GAME_GREEN_RUPEE,         { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_HEAVY_BLOCK_CHEST] =                   Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_HEAVY_BLOCK_CHEST,                  RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       31394,                                             0x02, "MQ Heavy Block Chest",                        RHT_GERUDO_TRAINING_GROUND_MQ_HEAVY_BLOCK_CHEST,                 RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
 
     // Ganon's Castle Shared
-    locationTable[RC_GANONS_TOWER_BOSS_KEY_CHEST] =                                   Location::Chest(RC_GANONS_TOWER_BOSS_KEY_CHEST,                                  RCQUEST_BOTH,    RCTYPE_GANON_BOSS_KEY,              RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_GANONS_TOWER,                 10219,                                             0x0B, "Boss Key Chest",                              "Ganon's Tower Boss Key Chest",                             RHT_GANONS_TOWER_BOSS_KEY_CHEST,                                 RG_GANONS_CASTLE_BOSS_KEY,            {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE,      true);
+    locationTable[RC_GANONS_TOWER_BOSS_KEY_CHEST] =                                   Location::Chest(RC_GANONS_TOWER_BOSS_KEY_CHEST,                                  RCQUEST_BOTH,    RCTYPE_GANON_BOSS_KEY,              RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_GANONS_TOWER,                 10219,                                             0x0B, "Tower Boss Key Chest",                        RHT_GANONS_TOWER_BOSS_KEY_CHEST,                                 RG_GANONS_CASTLE_BOSS_KEY,            {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE,      true);
     // Ganon's Castle Vanilla
-    locationTable[RC_GANONS_CASTLE_FOREST_TRIAL_CHEST] =                              Location::Chest(RC_GANONS_CASTLE_FOREST_TRIAL_CHEST,                             RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         30857,                                             0x09, "Forest Trial Chest",                          "Ganon's Castle Forest Trial Chest",                        RHT_GANONS_CASTLE_FOREST_TRIAL_CHEST,                            RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST] =                          Location::Chest(RC_GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST,                         RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         24455,                                             0x07, "Water Trial Left Chest",                      "Ganon's Castle Water Trial Left Chest",                    RHT_GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST,                        RG_ICE_TRAP,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST] =                         Location::Chest(RC_GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST,                        RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         22790,                                             0x06, "Water Trial Right Chest",                     "Ganon's Castle Water Trial Right Chest",                   RHT_GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST,                       RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST] =                        Location::Chest(RC_GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST,                       RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         22664,                                             0x08, "Shadow Trial Front Chest",                    "Ganon's Castle Shadow Trial Front Chest",                  RHT_GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST,                      RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST] =             Location::Chest(RC_GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST,            RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         14021,                                             0x05, "Shadow Trial Golden Gauntlets Chest",         "Ganon's Castle Shadow Trial Golden Gauntlets Chest",       RHT_GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST,           RG_PROGRESSIVE_STRENGTH,              {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE,      true);
-    locationTable[RC_GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST] =               Location::Chest(RC_GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST,              RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -29326,                                            0x12, "Spirit Trial Crystal Switch Chest",           "Ganon's Castle Spirit Trial Crystal Switch Chest",         RHT_GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST,             RG_BOMBCHU_20,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST] =                    Location::Chest(RC_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST,                   RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         26964,                                             0x14, "Spirit Trial Invisible Chest",                "Ganon's Castle Spirit Trial Invisible Chest",              RHT_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST,                  RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST] =                    Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST,                   RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         22668,                                             0x0C, "Light Trial First Left Chest",                "Ganon's Castle Light Trial First Left Chest",              RHT_GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST,                  RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST] =                   Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST,                  RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         24459,                                             0x0B, "Light Trial Second Left Chest",               "Ganon's Castle Light Trial Second Left Chest",             RHT_GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST,                 RG_ICE_TRAP,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST] =                    Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST,                   RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         22797,                                             0x0D, "Light Trial Third Left Chest",                "Ganon's Castle Light Trial Third Left Chest",              RHT_GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST,                  RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST] =                   Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST,                  RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         24462,                                             0x0E, "Light Trial First Right Chest",               "Ganon's Castle Light Trial First Right Chest",             RHT_GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST,                 RG_ICE_TRAP,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST] =                  Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST,                 RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         22890,                                             0x0A, "Light Trial Second Right Chest",              "Ganon's Castle Light Trial Second Right Chest",            RHT_GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST,                RG_ARROWS_30,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST] =                   Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST,                  RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         24463,                                             0x0F, "Light Trial Third Right Chest",               "Ganon's Castle Light Trial Third Right Chest",             RHT_GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST,                 RG_ICE_TRAP,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST] =             Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST,            RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         30800,                                             0x10, "Light Trial Invisible Enemies Chest",         "Ganon's Castle Light Trial Invisible Enemies Chest",       RHT_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST,           RG_GANONS_CASTLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE,      true);
-    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST] =                       Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST,                      RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -30639,                                            0x11, "Light Trial Lullaby Chest",                   "Ganon's Castle Light Trial Lullaby Chest",                 RHT_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST,                     RG_GANONS_CASTLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE,      true);
-    locationTable[RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT] =                           Location::Base(RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,                         RCQUEST_VANILLA, RCTYPE_SCRUB,                       RCAREA_GANONS_CASTLE,                ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x05,                                              0x37, "Deku Scrub Center-Left",                      "Ganon's Castle Deku Scrub Center-Left",                    RHT_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,                        RG_BUY_BOMBS_535,                     { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT),                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT] =                          Location::Base(RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT,                        RCQUEST_VANILLA, RCTYPE_SCRUB,                       RCAREA_GANONS_CASTLE,                ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x03,                                              0x33, "Deku Scrub Center-Right",                     "Ganon's Castle Deku Scrub Center-Right",                   RHT_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT,                       RG_BUY_ARROWS_30,                     { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT),                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_DEKU_SCRUB_RIGHT] =                                 Location::Base(RC_GANONS_CASTLE_DEKU_SCRUB_RIGHT,                               RCQUEST_VANILLA, RCTYPE_SCRUB,                       RCAREA_GANONS_CASTLE,                ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x07,                                              0x39, "Deku Scrub Right",                            "Ganon's Castle Deku Scrub Right",                          RHT_GANONS_CASTLE_DEKU_SCRUB_RIGHT,                              RG_BUY_RED_POTION_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_RIGHT),                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_DEKU_SCRUB_LEFT] =                                  Location::Base(RC_GANONS_CASTLE_DEKU_SCRUB_LEFT,                                RCQUEST_VANILLA, RCTYPE_SCRUB,                       RCAREA_GANONS_CASTLE,                ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x08,                                              0x3A, "Deku Scrub Left",                             "Ganon's Castle Deku Scrub Left",                           RHT_GANONS_CASTLE_DEKU_SCRUB_LEFT,                               RG_BUY_GREEN_POTION,                  { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_LEFT),                               SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_FOREST_TRIAL_CHEST] =                              Location::Chest(RC_GANONS_CASTLE_FOREST_TRIAL_CHEST,                             RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         30857,                                             0x09, "Forest Trial Chest",                          RHT_GANONS_CASTLE_FOREST_TRIAL_CHEST,                            RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST] =                          Location::Chest(RC_GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST,                         RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         24455,                                             0x07, "Water Trial Left Chest",                      RHT_GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST,                        RG_ICE_TRAP,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST] =                         Location::Chest(RC_GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST,                        RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         22790,                                             0x06, "Water Trial Right Chest",                     RHT_GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST,                       RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST] =                        Location::Chest(RC_GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST,                       RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         22664,                                             0x08, "Shadow Trial Front Chest",                    RHT_GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST,                      RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST] =             Location::Chest(RC_GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST,            RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         14021,                                             0x05, "Shadow Trial Golden Gauntlets Chest",         RHT_GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST,           RG_PROGRESSIVE_STRENGTH,              {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE,      true);
+    locationTable[RC_GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST] =               Location::Chest(RC_GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST,              RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -29326,                                            0x12, "Spirit Trial Crystal Switch Chest",           RHT_GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST,             RG_BOMBCHU_20,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST] =                    Location::Chest(RC_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST,                   RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         26964,                                             0x14, "Spirit Trial Invisible Chest",                RHT_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST,                  RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST] =                    Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST,                   RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         22668,                                             0x0C, "Light Trial First Left Chest",                RHT_GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST,                  RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST] =                   Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST,                  RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         24459,                                             0x0B, "Light Trial Second Left Chest",               RHT_GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST,                 RG_ICE_TRAP,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST] =                    Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST,                   RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         22797,                                             0x0D, "Light Trial Third Left Chest",                RHT_GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST,                  RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST] =                   Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST,                  RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         24462,                                             0x0E, "Light Trial First Right Chest",               RHT_GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST,                 RG_ICE_TRAP,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST] =                  Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST,                 RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         22890,                                             0x0A, "Light Trial Second Right Chest",              RHT_GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST,                RG_ARROWS_30,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST] =                   Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST,                  RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         24463,                                             0x0F, "Light Trial Third Right Chest",               RHT_GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST,                 RG_ICE_TRAP,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST] =             Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST,            RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         30800,                                             0x10, "Light Trial Invisible Enemies Chest",         RHT_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST,           RG_GANONS_CASTLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE,      true);
+    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST] =                       Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST,                      RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -30639,                                            0x11, "Light Trial Lullaby Chest",                   RHT_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST,                     RG_GANONS_CASTLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE,      true);
+    locationTable[RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT] =                           Location::Base(RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,                         RCQUEST_VANILLA, RCTYPE_SCRUB,                       RCAREA_GANONS_CASTLE,                ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x05,                                              0x37, "Deku Scrub Center-Left",                      RHT_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,                        RG_BUY_BOMBS_535,                     { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT),                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT] =                          Location::Base(RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT,                        RCQUEST_VANILLA, RCTYPE_SCRUB,                       RCAREA_GANONS_CASTLE,                ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x03,                                              0x33, "Deku Scrub Center-Right",                     RHT_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT,                       RG_BUY_ARROWS_30,                     { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT),                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_DEKU_SCRUB_RIGHT] =                                 Location::Base(RC_GANONS_CASTLE_DEKU_SCRUB_RIGHT,                               RCQUEST_VANILLA, RCTYPE_SCRUB,                       RCAREA_GANONS_CASTLE,                ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x07,                                              0x39, "Deku Scrub Right",                            RHT_GANONS_CASTLE_DEKU_SCRUB_RIGHT,                              RG_BUY_RED_POTION_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_RIGHT),                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_DEKU_SCRUB_LEFT] =                                  Location::Base(RC_GANONS_CASTLE_DEKU_SCRUB_LEFT,                                RCQUEST_VANILLA, RCTYPE_SCRUB,                       RCAREA_GANONS_CASTLE,                ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x08,                                              0x3A, "Deku Scrub Left",                             RHT_GANONS_CASTLE_DEKU_SCRUB_LEFT,                               RG_BUY_GREEN_POTION,                  { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_LEFT),                               SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
     // Ganon's Castle MQ
-    locationTable[RC_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST] =                            Location::Chest(RC_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST,                           RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         22977,                                             0x01, "MQ Water Trial Chest",                        "Ganon's Castle MQ Water Trial Chest",                      RHT_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST,                          RG_RED_RUPEE,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST] =                Location::Chest(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST,               RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -30398,                                            0x02, "MQ Forest Trial Eye Switch Chest",            "Ganon's Castle MQ Forest Trial Eye Switch Chest",          RHT_GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST,              RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST] =         Location::Chest(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST,        RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -32733,                                            0x03, "MQ Forest Trial Frozen Eye Switch Chest",     "Ganon's Castle MQ Forest Trial Frozen Eye Switch Chest",   RHT_GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST,       RG_BOMBS_5,                           {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST] =                    Location::Chest(RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST,                   RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -30460,                                            0x04, "MQ Light Trial Lullaby Chest",                "Ganon's Castle MQ Light Trial Lullaby Chest",              RHT_GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST,                  RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST] =               Location::Chest(RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST,              RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -30400,                                            0x00, "MQ Shadow Trial Bomb Flower Chest",           "Ganon's Castle MQ Shadow Trial Bomb Flower Chest",         RHT_GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST,             RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST] =                Location::Chest(RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST,               RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -30651,                                            0x05, "MQ Shadow Trial Eye Switch Chest",            "Ganon's Castle MQ Shadow Trial Eye Switch Chest",          RHT_GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST,              RG_GANONS_CASTLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE,      true);
-    locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST] =          Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST,         RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -18746,                                            0x06, "MQ Spirit Trial Golden Gauntlets Chest",      "Ganon's Castle MQ Spirit Trial Golden Gauntlets Chest",    RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST,        RG_PROGRESSIVE_STRENGTH,              {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE,      true);
-    locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST] =            Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST,           RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -30457,                                            0x07, "MQ Spirit Trial Sun Back Right Chest",        "Ganon's Castle MQ Spirit Trial Sun Back Right Chest",      RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST,          RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST] =             Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST,            RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -30648,                                            0x08, "MQ Spirit Trial Sun Back Left Chest",         "Ganon's Castle MQ Spirit Trial Sun Back Left Chest",       RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST,           RG_GANONS_CASTLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST] =            Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST,           RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -30455,                                            0x09, "MQ Spirit Trial Sun Front Left Chest",        "Ganon's Castle MQ Spirit Trial Sun Front Left Chest",      RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST,          RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST] =                     Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST,                    RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         20586,                                             0x0A, "MQ Spirit Trial First Chest",                 "Ganon's Castle MQ Spirit Trial First Chest",               RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST,                   RG_BOMBCHU_10,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST] =                 Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST,                RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         26964,                                             0x14, "MQ Spirit Trial Invisible Chest",             "Ganon's Castle MQ Spirit Trial Invisible Chest",           RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST,               RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY] =          Location::Collectable(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY,               RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_GANONS_CASTLE,                ACTOR_EN_ITEM00,      SCENE_INSIDE_GANONS_CASTLE,         273,                                               0x01, "MQ Forest Trial Freestanding Key",            "Ganon's Castle MQ Forest Trial Freestanding Key",          RHT_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY,              RG_GANONS_CASTLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE,      true);
-    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT] =                              Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,                            RCQUEST_MQ,      RCTYPE_SCRUB,                       RCAREA_GANONS_CASTLE,                ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x00,                                              0x30, "MQ Deku Scrub Right",                         "Ganon's Castle MQ Deku Scrub Right",                       RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,                           RG_BUY_DEKU_NUTS_5,                   { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT),                           SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT] =                        Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,                      RCQUEST_MQ,      RCTYPE_SCRUB,                       RCAREA_GANONS_CASTLE,                ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x05,                                              0x37, "MQ Deku Scrub Center-Left",                   "Ganon's Castle MQ Deku Scrub Center-Left",                 RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,                     RG_BUY_BOMBS_535,                     { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT),                     SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER] =                             Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,                           RCQUEST_MQ,      RCTYPE_SCRUB,                       RCAREA_GANONS_CASTLE,                ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x03,                                              0x33, "MQ Deku Scrub Center",                        "Ganon's Castle MQ Deku Scrub Center",                      RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,                          RG_BUY_ARROWS_30,                     { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER),                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT] =                       Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT,                     RCQUEST_MQ,      RCTYPE_SCRUB,                       RCAREA_GANONS_CASTLE,                ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x07,                                              0x39, "MQ Deku Scrub Center-Right",                  "Ganon's Castle MQ Deku Scrub Center-Right",                RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT,                    RG_BUY_RED_POTION_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT),                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT] =                               Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,                             RCQUEST_MQ,      RCTYPE_SCRUB,                       RCAREA_GANONS_CASTLE,                ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x08,                                              0x3A, "MQ Deku Scrub Left",                          "Ganon's Castle MQ Deku Scrub Left",                        RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,                            RG_BUY_GREEN_POTION,                  { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT),                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST] =                            Location::Chest(RC_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST,                           RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         22977,                                             0x01, "MQ Water Trial Chest",                        RHT_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST,                          RG_RED_RUPEE,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST] =                Location::Chest(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST,               RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -30398,                                            0x02, "MQ Forest Trial Eye Switch Chest",            RHT_GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST,              RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST] =         Location::Chest(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST,        RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -32733,                                            0x03, "MQ Forest Trial Frozen Eye Switch Chest",     RHT_GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST,       RG_BOMBS_5,                           {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST] =                    Location::Chest(RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST,                   RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -30460,                                            0x04, "MQ Light Trial Lullaby Chest",                RHT_GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST,                  RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST] =               Location::Chest(RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST,              RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -30400,                                            0x00, "MQ Shadow Trial Bomb Flower Chest",           RHT_GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST,             RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST] =                Location::Chest(RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST,               RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -30651,                                            0x05, "MQ Shadow Trial Eye Switch Chest",            RHT_GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST,              RG_GANONS_CASTLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE,      true);
+    locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST] =          Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST,         RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -18746,                                            0x06, "MQ Spirit Trial Golden Gauntlets Chest",      RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST,        RG_PROGRESSIVE_STRENGTH,              {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE,      true);
+    locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST] =            Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST,           RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -30457,                                            0x07, "MQ Spirit Trial Sun Back Right Chest",        RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST,          RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST] =             Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST,            RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -30648,                                            0x08, "MQ Spirit Trial Sun Back Left Chest",         RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST,           RG_GANONS_CASTLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST] =            Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST,           RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -30455,                                            0x09, "MQ Spirit Trial Sun Front Left Chest",        RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST,          RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST] =                     Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST,                    RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         20586,                                             0x0A, "MQ Spirit Trial First Chest",                 RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST,                   RG_BOMBCHU_10,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST] =                 Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST,                RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         26964,                                             0x14, "MQ Spirit Trial Invisible Chest",             RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST,               RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY] =          Location::Collectable(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY,               RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_GANONS_CASTLE,                ACTOR_EN_ITEM00,      SCENE_INSIDE_GANONS_CASTLE,         273,                                               0x01, "MQ Forest Trial Freestanding Key",            RHT_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY,              RG_GANONS_CASTLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE,      true);
+    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT] =                              Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,                            RCQUEST_MQ,      RCTYPE_SCRUB,                       RCAREA_GANONS_CASTLE,                ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x00,                                              0x30, "MQ Deku Scrub Right",                         RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,                           RG_BUY_DEKU_NUTS_5,                   { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT),                           SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT] =                        Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,                      RCQUEST_MQ,      RCTYPE_SCRUB,                       RCAREA_GANONS_CASTLE,                ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x05,                                              0x37, "MQ Deku Scrub Center-Left",                   RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,                     RG_BUY_BOMBS_535,                     { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT),                     SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER] =                             Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,                           RCQUEST_MQ,      RCTYPE_SCRUB,                       RCAREA_GANONS_CASTLE,                ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x03,                                              0x33, "MQ Deku Scrub Center",                        RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,                          RG_BUY_ARROWS_30,                     { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER),                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT] =                       Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT,                     RCQUEST_MQ,      RCTYPE_SCRUB,                       RCAREA_GANONS_CASTLE,                ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x07,                                              0x39, "MQ Deku Scrub Center-Right",                  RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT,                    RG_BUY_RED_POTION_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT),                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT] =                               Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,                             RCQUEST_MQ,      RCTYPE_SCRUB,                       RCAREA_GANONS_CASTLE,                ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x08,                                              0x3A, "MQ Deku Scrub Left",                          RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,                            RG_BUY_GREEN_POTION,                  { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT),                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
 
     // Gold Skulltula Tokens
 
     // Dungeons
     // Deku Tree
-    locationTable[RC_DEKU_TREE_GS_BASEMENT_BACK_ROOM] =                             Location::GSToken(RC_DEKU_TREE_GS_BASEMENT_BACK_ROOM,                              RCQUEST_VANILLA,                                     RCAREA_DEKU_TREE,                                          SCENE_DEKU_TREE,                    8193,                                              0x01, "GS Basement Back Room",                       "Deku Tree GS Basement Back Room",                          RHT_DEKU_TREE_GS_BASEMENT_BACK_ROOM,                                                                   { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[RC_DEKU_TREE_GS_BASEMENT_GATE] =                                  Location::GSToken(RC_DEKU_TREE_GS_BASEMENT_GATE,                                   RCQUEST_VANILLA,                                     RCAREA_DEKU_TREE,                                          SCENE_DEKU_TREE,                    8194,                                              0x02, "GS Basement Gate",                            "Deku Tree GS Basement Gate",                               RHT_DEKU_TREE_GS_BASEMENT_GATE,                                                                        { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[RC_DEKU_TREE_GS_BASEMENT_VINES] =                                 Location::GSToken(RC_DEKU_TREE_GS_BASEMENT_VINES,                                  RCQUEST_VANILLA,                                     RCAREA_DEKU_TREE,                                          SCENE_DEKU_TREE,                    8196,                                              0x04, "GS Basement Vines",                           "Deku Tree GS Basement Vines",                              RHT_DEKU_TREE_GS_BASEMENT_VINES,                                                                       { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[RC_DEKU_TREE_GS_COMPASS_ROOM] =                                   Location::GSToken(RC_DEKU_TREE_GS_COMPASS_ROOM,                                    RCQUEST_VANILLA,                                     RCAREA_DEKU_TREE,                                          SCENE_DEKU_TREE,                    8200,                                              0x08, "GS Compass Room",                             "Deku Tree GS Compass Room",                                RHT_DEKU_TREE_GS_COMPASS_ROOM,                                                                         { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[RC_DEKU_TREE_MQ_GS_LOBBY] =                                       Location::GSToken(RC_DEKU_TREE_MQ_GS_LOBBY,                                        RCQUEST_MQ,                                          RCAREA_DEKU_TREE,                                          SCENE_DEKU_TREE,                    8194,                                              0x02, "MQ GS Lobby",                                 "Deku Tree MQ GS Lobby",                                    RHT_DEKU_TREE_MQ_GS_LOBBY,                                                                             { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[RC_DEKU_TREE_MQ_GS_COMPASS_ROOM] =                                Location::GSToken(RC_DEKU_TREE_MQ_GS_COMPASS_ROOM,                                 RCQUEST_MQ,                                          RCAREA_DEKU_TREE,                                          SCENE_DEKU_TREE,                    8200,                                              0x08, "MQ GS Compass Room",                          "Deku Tree MQ GS Compass Room",                             RHT_DEKU_TREE_MQ_GS_COMPASS_ROOM,                                                                      { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[RC_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM] =                        Location::GSToken(RC_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM,                         RCQUEST_MQ,                                          RCAREA_DEKU_TREE,                                          SCENE_DEKU_TREE,                    8196,                                              0x04, "MQ GS Basement Graves Room",                  "Deku Tree MQ GS Basement Graves Room",                     RHT_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM,                                                              { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[RC_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM] =                          Location::GSToken(RC_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM,                           RCQUEST_MQ,                                          RCAREA_DEKU_TREE,                                          SCENE_DEKU_TREE,                    8193,                                              0x01, "MQ GS Basement Back Room",                    "Deku Tree MQ GS Basement Back Room",                       RHT_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM,                                                                { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_GS_BASEMENT_BACK_ROOM] =                             Location::GSToken(RC_DEKU_TREE_GS_BASEMENT_BACK_ROOM,                              RCQUEST_VANILLA,                                     RCAREA_DEKU_TREE,                                          SCENE_DEKU_TREE,                    8193,                                              0x01, "GS Basement Back Room",                       RHT_DEKU_TREE_GS_BASEMENT_BACK_ROOM,                                                                   { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_GS_BASEMENT_GATE] =                                  Location::GSToken(RC_DEKU_TREE_GS_BASEMENT_GATE,                                   RCQUEST_VANILLA,                                     RCAREA_DEKU_TREE,                                          SCENE_DEKU_TREE,                    8194,                                              0x02, "GS Basement Gate",                            RHT_DEKU_TREE_GS_BASEMENT_GATE,                                                                        { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_GS_BASEMENT_VINES] =                                 Location::GSToken(RC_DEKU_TREE_GS_BASEMENT_VINES,                                  RCQUEST_VANILLA,                                     RCAREA_DEKU_TREE,                                          SCENE_DEKU_TREE,                    8196,                                              0x04, "GS Basement Vines",                           RHT_DEKU_TREE_GS_BASEMENT_VINES,                                                                       { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_GS_COMPASS_ROOM] =                                   Location::GSToken(RC_DEKU_TREE_GS_COMPASS_ROOM,                                    RCQUEST_VANILLA,                                     RCAREA_DEKU_TREE,                                          SCENE_DEKU_TREE,                    8200,                                              0x08, "GS Compass Room",                             RHT_DEKU_TREE_GS_COMPASS_ROOM,                                                                         { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_MQ_GS_LOBBY] =                                       Location::GSToken(RC_DEKU_TREE_MQ_GS_LOBBY,                                        RCQUEST_MQ,                                          RCAREA_DEKU_TREE,                                          SCENE_DEKU_TREE,                    8194,                                              0x02, "MQ GS Lobby",                                 RHT_DEKU_TREE_MQ_GS_LOBBY,                                                                             { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_MQ_GS_COMPASS_ROOM] =                                Location::GSToken(RC_DEKU_TREE_MQ_GS_COMPASS_ROOM,                                 RCQUEST_MQ,                                          RCAREA_DEKU_TREE,                                          SCENE_DEKU_TREE,                    8200,                                              0x08, "MQ GS Compass Room",                          RHT_DEKU_TREE_MQ_GS_COMPASS_ROOM,                                                                      { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM] =                        Location::GSToken(RC_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM,                         RCQUEST_MQ,                                          RCAREA_DEKU_TREE,                                          SCENE_DEKU_TREE,                    8196,                                              0x04, "MQ GS Basement Graves Room",                  RHT_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM,                                                              { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM] =                          Location::GSToken(RC_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM,                           RCQUEST_MQ,                                          RCAREA_DEKU_TREE,                                          SCENE_DEKU_TREE,                    8193,                                              0x01, "MQ GS Basement Back Room",                    RHT_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM,                                                                { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
     // Dodongo's Cavern
-    locationTable[RC_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS] =                       Location::GSToken(RC_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS,                        RCQUEST_VANILLA,                                     RCAREA_DODONGOS_CAVERN,                                    SCENE_DODONGOS_CAVERN,              8449,                                              0x01, "GS Vines Above Stairs",                       "Dodongos Cavern GS Vines Above Stairs",                    RHT_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS,                                                             { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_GS_SCARECROW] =                                Location::GSToken(RC_DODONGOS_CAVERN_GS_SCARECROW,                                 RCQUEST_VANILLA,                                     RCAREA_DODONGOS_CAVERN,                                    SCENE_DODONGOS_CAVERN,              8450,                                              0x02, "GS Scarecrow",                                "Dodongos Cavern GS Scarecrow",                             RHT_DODONGOS_CAVERN_GS_SCARECROW,                                                                      { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS] =                      Location::GSToken(RC_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS,                       RCQUEST_VANILLA,                                     RCAREA_DODONGOS_CAVERN,                                    SCENE_DODONGOS_CAVERN,              8452,                                              0x04, "GS Alcove Above Stairs",                      "Dodongos Cavern GS Alcove Above Stairs",                   RHT_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS,                                                            { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_GS_BACK_ROOM] =                                Location::GSToken(RC_DODONGOS_CAVERN_GS_BACK_ROOM,                                 RCQUEST_VANILLA,                                     RCAREA_DODONGOS_CAVERN,                                    SCENE_DODONGOS_CAVERN,              8456,                                              0x08, "GS Back Room",                                "Dodongos Cavern GS Back Room",                             RHT_DODONGOS_CAVERN_GS_BACK_ROOM,                                                                      { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS] =            Location::GSToken(RC_DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS,             RCQUEST_VANILLA,                                     RCAREA_DODONGOS_CAVERN,                                    SCENE_DODONGOS_CAVERN,              8464,                                              0x10, "GS Side Room Near Lower Lizalfos",            "Dodongos Cavern GS Side Room Near Lower Lizalfos",         RHT_DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS,                                                  { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM] =                            Location::GSToken(RC_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM,                             RCQUEST_MQ,                                          RCAREA_DODONGOS_CAVERN,                                    SCENE_DODONGOS_CAVERN,              8450,                                              0x02, "MQ GS Scrub Room",                            "Dodongos Cavern MQ GS Scrub Room",                         RHT_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM,                                                                  { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM] =               Location::GSToken(RC_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM,                RCQUEST_MQ,                                          RCAREA_DODONGOS_CAVERN,                                    SCENE_DODONGOS_CAVERN,              8456,                                              0x08, "MQ GS Song of Time Block Room",               "Dodongos Cavern MQ GS Song of Time Block Room",            RHT_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM,                                                     { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM] =                         Location::GSToken(RC_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM,                          RCQUEST_MQ,                                          RCAREA_DODONGOS_CAVERN,                                    SCENE_DODONGOS_CAVERN,              8452,                                              0x04, "MQ GS Lizalfos Room",                         "Dodongos Cavern MQ GS Lizalfos Room",                      RHT_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM,                                                               { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM] =                           Location::GSToken(RC_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM,                            RCQUEST_MQ,                                          RCAREA_DODONGOS_CAVERN,                                    SCENE_DODONGOS_CAVERN,              8464,                                              0x10, "MQ GS Larvae Room",                           "Dodongos Cavern MQ GS Larvae Room",                        RHT_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM,                                                                 { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_MQ_GS_BACK_AREA] =                             Location::GSToken(RC_DODONGOS_CAVERN_MQ_GS_BACK_AREA,                              RCQUEST_MQ,                                          RCAREA_DODONGOS_CAVERN,                                    SCENE_DODONGOS_CAVERN,              8449,                                              0x01, "MQ GS Back Room",                             "Dodongos Cavern MQ GS Back Room",                          RHT_DODONGOS_CAVERN_MQ_GS_BACK_AREA,                                                                   { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER] =                    Location::GSToken(RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER,                     RCQUEST_VANILLA,                                     RCAREA_JABU_JABUS_BELLY,                                   SCENE_JABU_JABU,                    8705,                                              0x01, "GS Lobby Basement Lower",                     "Jabu Jabus Belly GS Lobby Basement Lower",                 RHT_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER,                                                          { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER] =                    Location::GSToken(RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER,                     RCQUEST_VANILLA,                                     RCAREA_JABU_JABUS_BELLY,                                   SCENE_JABU_JABU,                    8706,                                              0x02, "GS Lobby Basement Upper",                     "Jabu Jabus Belly GS Lobby Basement Upper",                 RHT_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER,                                                          { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_JABU_JABUS_BELLY_GS_NEAR_BOSS] =                               Location::GSToken(RC_JABU_JABUS_BELLY_GS_NEAR_BOSS,                                RCQUEST_VANILLA,                                     RCAREA_JABU_JABUS_BELLY,                                   SCENE_JABU_JABU,                    8708,                                              0x04, "GS Near Boss",                                "Jabu Jabus Belly GS Near Boss",                            RHT_JABU_JABUS_BELLY_GS_NEAR_BOSS,                                                                     { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM] =                       Location::GSToken(RC_JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM,                        RCQUEST_VANILLA,                                     RCAREA_JABU_JABUS_BELLY,                                   SCENE_JABU_JABU,                    8712,                                              0x08, "GS Water Switch Room",                        "Jabu Jabus Belly GS Water Switch Room",                    RHT_JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM,                                                             { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM] =                     Location::GSToken(RC_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM,                      RCQUEST_MQ,                                          RCAREA_JABU_JABUS_BELLY,                                   SCENE_JABU_JABU,                    8708,                                              0x04, "MQ GS Tail Parasan Room",                     "Jabu Jabus Belly MQ GS Tail Parasan Room",                 RHT_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM,                                                           { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM] =               Location::GSToken(RC_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM,                RCQUEST_MQ,                                          RCAREA_JABU_JABUS_BELLY,                                   SCENE_JABU_JABU,                    8712,                                              0x08, "MQ GS Invisible Enemies Room",                "Jabu Jabus Belly MQ GS Invisible Enemies Room",            RHT_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM,                                                     { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM] =                 Location::GSToken(RC_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM,                  RCQUEST_MQ,                                          RCAREA_JABU_JABUS_BELLY,                                   SCENE_JABU_JABU,                    8705,                                              0x01, "MQ GS Boomerang Chest Room",                  "Jabu Jabus Belly MQ GS Boomerang Chest Room",              RHT_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM,                                                       { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS] =                            Location::GSToken(RC_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS,                             RCQUEST_MQ,                                          RCAREA_JABU_JABUS_BELLY,                                   SCENE_JABU_JABU,                    8706,                                              0x02, "MQ GS Near Boss",                             "Jabu Jabus Belly MQ GS Near Boss",                         RHT_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS,                                                                  { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD] =                    Location::GSToken(RC_FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD,                     RCQUEST_VANILLA,                                     RCAREA_FOREST_TEMPLE,                                      SCENE_FOREST_TEMPLE,                8961,                                              0x01, "GS Raised Island Courtyard",                  "Forest Temple GS Raised Island Courtyard",                 RHT_FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD,                                                          { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[RC_FOREST_TEMPLE_GS_FIRST_ROOM] =                                 Location::GSToken(RC_FOREST_TEMPLE_GS_FIRST_ROOM,                                  RCQUEST_VANILLA,                                     RCAREA_FOREST_TEMPLE,                                      SCENE_FOREST_TEMPLE,                8962,                                              0x02, "GS First Room",                               "Forest Temple GS First Room",                              RHT_FOREST_TEMPLE_GS_FIRST_ROOM,                                                                       { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[RC_FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD] =                     Location::GSToken(RC_FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD,                      RCQUEST_VANILLA,                                     RCAREA_FOREST_TEMPLE,                                      SCENE_FOREST_TEMPLE,                8964,                                              0x04, "GS Level Island Courtyard",                   "Forest Temple GS Level Island Courtyard",                  RHT_FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD,                                                           { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[RC_FOREST_TEMPLE_GS_LOBBY] =                                      Location::GSToken(RC_FOREST_TEMPLE_GS_LOBBY,                                       RCQUEST_VANILLA,                                     RCAREA_FOREST_TEMPLE,                                      SCENE_FOREST_TEMPLE,                8968,                                              0x08, "GS Lobby",                                    "Forest Temple GS Lobby",                                   RHT_FOREST_TEMPLE_GS_LOBBY,                                                                            { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[RC_FOREST_TEMPLE_GS_BASEMENT] =                                   Location::GSToken(RC_FOREST_TEMPLE_GS_BASEMENT,                                    RCQUEST_VANILLA,                                     RCAREA_FOREST_TEMPLE,                                      SCENE_FOREST_TEMPLE,                8976,                                              0x10, "GS Basement",                                 "Forest Temple GS Basement",                                RHT_FOREST_TEMPLE_GS_BASEMENT,                                                                         { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[RC_FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY] =                           Location::GSToken(RC_FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY,                            RCQUEST_MQ,                                          RCAREA_FOREST_TEMPLE,                                      SCENE_FOREST_TEMPLE,                8962,                                              0x02, "MQ GS First Hallway",                         "Forest Temple MQ GS First Hallway",                        RHT_FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY,                                                                 { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[RC_FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM] =                         Location::GSToken(RC_FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM,                          RCQUEST_MQ,                                          RCAREA_FOREST_TEMPLE,                                      SCENE_FOREST_TEMPLE,                8976,                                              0x10, "MQ GS Block Push Room",                       "Forest Temple MQ GS Block Push Room",                      RHT_FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM,                                                               { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[RC_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD] =                 Location::GSToken(RC_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD,                  RCQUEST_MQ,                                          RCAREA_FOREST_TEMPLE,                                      SCENE_FOREST_TEMPLE,                8961,                                              0x01, "MQ GS Raised Island Courtyard",               "Forest Temple MQ GS Raised Island Courtyard",              RHT_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD,                                                       { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[RC_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD] =                  Location::GSToken(RC_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD,                   RCQUEST_MQ,                                          RCAREA_FOREST_TEMPLE,                                      SCENE_FOREST_TEMPLE,                8964,                                              0x04, "MQ GS Level Island Courtyard",                "Forest Temple MQ GS Level Island Courtyard",               RHT_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD,                                                        { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[RC_FOREST_TEMPLE_MQ_GS_WELL] =                                    Location::GSToken(RC_FOREST_TEMPLE_MQ_GS_WELL,                                     RCQUEST_MQ,                                          RCAREA_FOREST_TEMPLE,                                      SCENE_FOREST_TEMPLE,                8968,                                              0x08, "MQ GS Well",                                  "Forest Temple MQ GS Well",                                 RHT_FOREST_TEMPLE_MQ_GS_WELL,                                                                          { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS] =                       Location::GSToken(RC_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS,                        RCQUEST_VANILLA,                                     RCAREA_DODONGOS_CAVERN,                                    SCENE_DODONGOS_CAVERN,              8449,                                              0x01, "GS Vines Above Stairs",                       RHT_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS,                                                             { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_GS_SCARECROW] =                                Location::GSToken(RC_DODONGOS_CAVERN_GS_SCARECROW,                                 RCQUEST_VANILLA,                                     RCAREA_DODONGOS_CAVERN,                                    SCENE_DODONGOS_CAVERN,              8450,                                              0x02, "GS Scarecrow",                                RHT_DODONGOS_CAVERN_GS_SCARECROW,                                                                      { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS] =                      Location::GSToken(RC_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS,                       RCQUEST_VANILLA,                                     RCAREA_DODONGOS_CAVERN,                                    SCENE_DODONGOS_CAVERN,              8452,                                              0x04, "GS Alcove Above Stairs",                      RHT_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS,                                                            { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_GS_BACK_ROOM] =                                Location::GSToken(RC_DODONGOS_CAVERN_GS_BACK_ROOM,                                 RCQUEST_VANILLA,                                     RCAREA_DODONGOS_CAVERN,                                    SCENE_DODONGOS_CAVERN,              8456,                                              0x08, "GS Back Room",                                RHT_DODONGOS_CAVERN_GS_BACK_ROOM,                                                                      { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS] =            Location::GSToken(RC_DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS,             RCQUEST_VANILLA,                                     RCAREA_DODONGOS_CAVERN,                                    SCENE_DODONGOS_CAVERN,              8464,                                              0x10, "GS Side Room Near Lower Lizalfos",            RHT_DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS,                                                  { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM] =                            Location::GSToken(RC_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM,                             RCQUEST_MQ,                                          RCAREA_DODONGOS_CAVERN,                                    SCENE_DODONGOS_CAVERN,              8450,                                              0x02, "MQ GS Scrub Room",                            RHT_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM,                                                                  { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM] =               Location::GSToken(RC_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM,                RCQUEST_MQ,                                          RCAREA_DODONGOS_CAVERN,                                    SCENE_DODONGOS_CAVERN,              8456,                                              0x08, "MQ GS Song of Time Block Room",               RHT_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM,                                                     { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM] =                         Location::GSToken(RC_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM,                          RCQUEST_MQ,                                          RCAREA_DODONGOS_CAVERN,                                    SCENE_DODONGOS_CAVERN,              8452,                                              0x04, "MQ GS Lizalfos Room",                         RHT_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM,                                                               { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM] =                           Location::GSToken(RC_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM,                            RCQUEST_MQ,                                          RCAREA_DODONGOS_CAVERN,                                    SCENE_DODONGOS_CAVERN,              8464,                                              0x10, "MQ GS Larvae Room",                           RHT_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM,                                                                 { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_MQ_GS_BACK_AREA] =                             Location::GSToken(RC_DODONGOS_CAVERN_MQ_GS_BACK_AREA,                              RCQUEST_MQ,                                          RCAREA_DODONGOS_CAVERN,                                    SCENE_DODONGOS_CAVERN,              8449,                                              0x01, "MQ GS Back Room",                             RHT_DODONGOS_CAVERN_MQ_GS_BACK_AREA,                                                                   { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER] =                    Location::GSToken(RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER,                     RCQUEST_VANILLA,                                     RCAREA_JABU_JABUS_BELLY,                                   SCENE_JABU_JABU,                    8705,                                              0x01, "GS Lobby Basement Lower",                     RHT_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER,                                                          { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER] =                    Location::GSToken(RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER,                     RCQUEST_VANILLA,                                     RCAREA_JABU_JABUS_BELLY,                                   SCENE_JABU_JABU,                    8706,                                              0x02, "GS Lobby Basement Upper",                     RHT_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER,                                                          { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_GS_NEAR_BOSS] =                               Location::GSToken(RC_JABU_JABUS_BELLY_GS_NEAR_BOSS,                                RCQUEST_VANILLA,                                     RCAREA_JABU_JABUS_BELLY,                                   SCENE_JABU_JABU,                    8708,                                              0x04, "GS Near Boss",                                RHT_JABU_JABUS_BELLY_GS_NEAR_BOSS,                                                                     { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM] =                       Location::GSToken(RC_JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM,                        RCQUEST_VANILLA,                                     RCAREA_JABU_JABUS_BELLY,                                   SCENE_JABU_JABU,                    8712,                                              0x08, "GS Water Switch Room",                        RHT_JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM,                                                             { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM] =                     Location::GSToken(RC_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM,                      RCQUEST_MQ,                                          RCAREA_JABU_JABUS_BELLY,                                   SCENE_JABU_JABU,                    8708,                                              0x04, "MQ GS Tail Parasan Room",                     RHT_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM,                                                           { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM] =               Location::GSToken(RC_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM,                RCQUEST_MQ,                                          RCAREA_JABU_JABUS_BELLY,                                   SCENE_JABU_JABU,                    8712,                                              0x08, "MQ GS Invisible Enemies Room",                RHT_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM,                                                     { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM] =                 Location::GSToken(RC_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM,                  RCQUEST_MQ,                                          RCAREA_JABU_JABUS_BELLY,                                   SCENE_JABU_JABU,                    8705,                                              0x01, "MQ GS Boomerang Chest Room",                  RHT_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM,                                                       { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS] =                            Location::GSToken(RC_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS,                             RCQUEST_MQ,                                          RCAREA_JABU_JABUS_BELLY,                                   SCENE_JABU_JABU,                    8706,                                              0x02, "MQ GS Near Boss",                             RHT_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS,                                                                  { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD] =                    Location::GSToken(RC_FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD,                     RCQUEST_VANILLA,                                     RCAREA_FOREST_TEMPLE,                                      SCENE_FOREST_TEMPLE,                8961,                                              0x01, "GS Raised Island Courtyard",                  RHT_FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD,                                                          { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_GS_FIRST_ROOM] =                                 Location::GSToken(RC_FOREST_TEMPLE_GS_FIRST_ROOM,                                  RCQUEST_VANILLA,                                     RCAREA_FOREST_TEMPLE,                                      SCENE_FOREST_TEMPLE,                8962,                                              0x02, "GS First Room",                               RHT_FOREST_TEMPLE_GS_FIRST_ROOM,                                                                       { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD] =                     Location::GSToken(RC_FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD,                      RCQUEST_VANILLA,                                     RCAREA_FOREST_TEMPLE,                                      SCENE_FOREST_TEMPLE,                8964,                                              0x04, "GS Level Island Courtyard",                   RHT_FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD,                                                           { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_GS_LOBBY] =                                      Location::GSToken(RC_FOREST_TEMPLE_GS_LOBBY,                                       RCQUEST_VANILLA,                                     RCAREA_FOREST_TEMPLE,                                      SCENE_FOREST_TEMPLE,                8968,                                              0x08, "GS Lobby",                                    RHT_FOREST_TEMPLE_GS_LOBBY,                                                                            { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_GS_BASEMENT] =                                   Location::GSToken(RC_FOREST_TEMPLE_GS_BASEMENT,                                    RCQUEST_VANILLA,                                     RCAREA_FOREST_TEMPLE,                                      SCENE_FOREST_TEMPLE,                8976,                                              0x10, "GS Basement",                                 RHT_FOREST_TEMPLE_GS_BASEMENT,                                                                         { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY] =                           Location::GSToken(RC_FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY,                            RCQUEST_MQ,                                          RCAREA_FOREST_TEMPLE,                                      SCENE_FOREST_TEMPLE,                8962,                                              0x02, "MQ GS First Hallway",                         RHT_FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY,                                                                 { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM] =                         Location::GSToken(RC_FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM,                          RCQUEST_MQ,                                          RCAREA_FOREST_TEMPLE,                                      SCENE_FOREST_TEMPLE,                8976,                                              0x10, "MQ GS Block Push Room",                       RHT_FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM,                                                               { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD] =                 Location::GSToken(RC_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD,                  RCQUEST_MQ,                                          RCAREA_FOREST_TEMPLE,                                      SCENE_FOREST_TEMPLE,                8961,                                              0x01, "MQ GS Raised Island Courtyard",               RHT_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD,                                                       { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD] =                  Location::GSToken(RC_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD,                   RCQUEST_MQ,                                          RCAREA_FOREST_TEMPLE,                                      SCENE_FOREST_TEMPLE,                8964,                                              0x04, "MQ GS Level Island Courtyard",                RHT_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD,                                                        { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_MQ_GS_WELL] =                                    Location::GSToken(RC_FOREST_TEMPLE_MQ_GS_WELL,                                     RCQUEST_MQ,                                          RCAREA_FOREST_TEMPLE,                                      SCENE_FOREST_TEMPLE,                8968,                                              0x08, "MQ GS Well",                                  RHT_FOREST_TEMPLE_MQ_GS_WELL,                                                                          { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
     // Fire Temple
-    locationTable[RC_FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM] =                            Location::GSToken(RC_FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM,                             RCQUEST_VANILLA,                                     RCAREA_FIRE_TEMPLE,                                        SCENE_FIRE_TEMPLE,                  9217,                                              0x01, "GS Song of Time Room",                        "Fire Temple GS Song of Time Room",                         RHT_FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM,                                                                  { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[RC_FIRE_TEMPLE_GS_BOSS_KEY_LOOP] =                                Location::GSToken(RC_FIRE_TEMPLE_GS_BOSS_KEY_LOOP,                                 RCQUEST_VANILLA,                                     RCAREA_FIRE_TEMPLE,                                        SCENE_FIRE_TEMPLE,                  9218,                                              0x02, "GS Boss Key Loop",                            "Fire Temple GS Boss Key Loop",                             RHT_FIRE_TEMPLE_GS_BOSS_KEY_LOOP,                                                                      { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[RC_FIRE_TEMPLE_GS_BOULDER_MAZE] =                                 Location::GSToken(RC_FIRE_TEMPLE_GS_BOULDER_MAZE,                                  RCQUEST_VANILLA,                                     RCAREA_FIRE_TEMPLE,                                        SCENE_FIRE_TEMPLE,                  9220,                                              0x04, "GS Boulder Maze",                             "Fire Temple GS Boulder Maze",                              RHT_FIRE_TEMPLE_GS_BOULDER_MAZE,                                                                       { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[RC_FIRE_TEMPLE_GS_SCARECROW_TOP] =                                Location::GSToken(RC_FIRE_TEMPLE_GS_SCARECROW_TOP,                                 RCQUEST_VANILLA,                                     RCAREA_FIRE_TEMPLE,                                        SCENE_FIRE_TEMPLE,                  9224,                                              0x08, "GS Scarecrow Top",                            "Fire Temple GS Scarecrow Top",                             RHT_FIRE_TEMPLE_GS_SCARECROW_TOP,                                                                      { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[RC_FIRE_TEMPLE_GS_SCARECROW_CLIMB] =                              Location::GSToken(RC_FIRE_TEMPLE_GS_SCARECROW_CLIMB,                               RCQUEST_VANILLA,                                     RCAREA_FIRE_TEMPLE,                                        SCENE_FIRE_TEMPLE,                  9232,                                              0x10, "GS Scarecrow Climb",                          "Fire Temple GS Scarecrow Climb",                           RHT_FIRE_TEMPLE_GS_SCARECROW_CLIMB,                                                                    { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[RC_FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE] =                      Location::GSToken(RC_FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE,                       RCQUEST_MQ,                                          RCAREA_FIRE_TEMPLE,                                        SCENE_FIRE_TEMPLE,                  9218,                                              0x02, "MQ GS Above Fire Wall Maze",                  "Fire Temple MQ GS Above Fire Wall Maze",                   RHT_FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE,                                                            { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER] =                     Location::GSToken(RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER,                      RCQUEST_MQ,                                          RCAREA_FIRE_TEMPLE,                                        SCENE_FIRE_TEMPLE,                  9224,                                              0x08, "MQ GS Fire Wall Maze Center",                 "Fire Temple MQ GS Fire Wall Maze Center",                  RHT_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER,                                                           { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[RC_FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR] =                   Location::GSToken(RC_FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR,                    RCQUEST_MQ,                                          RCAREA_FIRE_TEMPLE,                                        SCENE_FIRE_TEMPLE,                  9217,                                              0x01, "MQ GS Big Lava Room Open Door",               "Fire Temple MQ GS Big Lava Room Open Door",                RHT_FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR,                                                         { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM] =                  Location::GSToken(RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM,                   RCQUEST_MQ,                                          RCAREA_FIRE_TEMPLE,                                        SCENE_FIRE_TEMPLE,                  9232,                                              0x10, "MQ GS Fire Wall Maze Side Room",              "Fire Temple MQ GS Fire Wall Maze Side Room",               RHT_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM,                                                        { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[RC_FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE] =                             Location::GSToken(RC_FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE,                              RCQUEST_MQ,                                          RCAREA_FIRE_TEMPLE,                                        SCENE_FIRE_TEMPLE,                  9220,                                              0x04, "MQ GS Skull on Fire",                         "Fire Temple MQ GS Skull on Fire",                          RHT_FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE,                                                                   { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    locationTable[RC_FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM] =                            Location::GSToken(RC_FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM,                             RCQUEST_VANILLA,                                     RCAREA_FIRE_TEMPLE,                                        SCENE_FIRE_TEMPLE,                  9217,                                              0x01, "GS Song of Time Room",                        RHT_FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM,                                                                  { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    locationTable[RC_FIRE_TEMPLE_GS_BOSS_KEY_LOOP] =                                Location::GSToken(RC_FIRE_TEMPLE_GS_BOSS_KEY_LOOP,                                 RCQUEST_VANILLA,                                     RCAREA_FIRE_TEMPLE,                                        SCENE_FIRE_TEMPLE,                  9218,                                              0x02, "GS Boss Key Loop",                            RHT_FIRE_TEMPLE_GS_BOSS_KEY_LOOP,                                                                      { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    locationTable[RC_FIRE_TEMPLE_GS_BOULDER_MAZE] =                                 Location::GSToken(RC_FIRE_TEMPLE_GS_BOULDER_MAZE,                                  RCQUEST_VANILLA,                                     RCAREA_FIRE_TEMPLE,                                        SCENE_FIRE_TEMPLE,                  9220,                                              0x04, "GS Boulder Maze",                             RHT_FIRE_TEMPLE_GS_BOULDER_MAZE,                                                                       { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    locationTable[RC_FIRE_TEMPLE_GS_SCARECROW_TOP] =                                Location::GSToken(RC_FIRE_TEMPLE_GS_SCARECROW_TOP,                                 RCQUEST_VANILLA,                                     RCAREA_FIRE_TEMPLE,                                        SCENE_FIRE_TEMPLE,                  9224,                                              0x08, "GS Scarecrow Top",                            RHT_FIRE_TEMPLE_GS_SCARECROW_TOP,                                                                      { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    locationTable[RC_FIRE_TEMPLE_GS_SCARECROW_CLIMB] =                              Location::GSToken(RC_FIRE_TEMPLE_GS_SCARECROW_CLIMB,                               RCQUEST_VANILLA,                                     RCAREA_FIRE_TEMPLE,                                        SCENE_FIRE_TEMPLE,                  9232,                                              0x10, "GS Scarecrow Climb",                          RHT_FIRE_TEMPLE_GS_SCARECROW_CLIMB,                                                                    { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    locationTable[RC_FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE] =                      Location::GSToken(RC_FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE,                       RCQUEST_MQ,                                          RCAREA_FIRE_TEMPLE,                                        SCENE_FIRE_TEMPLE,                  9218,                                              0x02, "MQ GS Above Fire Wall Maze",                  RHT_FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE,                                                            { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    locationTable[RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER] =                     Location::GSToken(RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER,                      RCQUEST_MQ,                                          RCAREA_FIRE_TEMPLE,                                        SCENE_FIRE_TEMPLE,                  9224,                                              0x08, "MQ GS Fire Wall Maze Center",                 RHT_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER,                                                           { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    locationTable[RC_FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR] =                   Location::GSToken(RC_FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR,                    RCQUEST_MQ,                                          RCAREA_FIRE_TEMPLE,                                        SCENE_FIRE_TEMPLE,                  9217,                                              0x01, "MQ GS Big Lava Room Open Door",               RHT_FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR,                                                         { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    locationTable[RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM] =                  Location::GSToken(RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM,                   RCQUEST_MQ,                                          RCAREA_FIRE_TEMPLE,                                        SCENE_FIRE_TEMPLE,                  9232,                                              0x10, "MQ GS Fire Wall Maze Side Room",              RHT_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM,                                                        { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    locationTable[RC_FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE] =                             Location::GSToken(RC_FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE,                              RCQUEST_MQ,                                          RCAREA_FIRE_TEMPLE,                                        SCENE_FIRE_TEMPLE,                  9220,                                              0x04, "MQ GS Skull on Fire",                         RHT_FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE,                                                                   { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
     // Water Temple
-    locationTable[RC_WATER_TEMPLE_GS_BEHIND_GATE] =                                 Location::GSToken(RC_WATER_TEMPLE_GS_BEHIND_GATE,                                  RCQUEST_VANILLA,                                     RCAREA_WATER_TEMPLE,                                       SCENE_WATER_TEMPLE,                 9473,                                              0x01, "GS Behind Gate",                              "Water Temple GS Behind Gate",                              RHT_WATER_TEMPLE_GS_BEHIND_GATE,                                                                       { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[RC_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM] =                       Location::GSToken(RC_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM,                        RCQUEST_VANILLA,                                     RCAREA_WATER_TEMPLE,                                       SCENE_WATER_TEMPLE,                 9474,                                              0x02, "GS Falling Platform Room",                    "Water Temple GS Falling Platform Room",                    RHT_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM,                                                             { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[RC_WATER_TEMPLE_GS_CENTRAL_PILLAR] =                              Location::GSToken(RC_WATER_TEMPLE_GS_CENTRAL_PILLAR,                               RCQUEST_VANILLA,                                     RCAREA_WATER_TEMPLE,                                       SCENE_WATER_TEMPLE,                 9476,                                              0x04, "GS Central Pillar",                           "Water Temple GS Central Pillar",                           RHT_WATER_TEMPLE_GS_CENTRAL_PILLAR,                                                                    { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[RC_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST] =                         Location::GSToken(RC_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST,                          RCQUEST_VANILLA,                                     RCAREA_WATER_TEMPLE,                                       SCENE_WATER_TEMPLE,                 9480,                                              0x08, "GS Near Boss Key Chest",                      "Water Temple GS Near Boss Key Chest",                      RHT_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST,                                                               { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[RC_WATER_TEMPLE_GS_RIVER] =                                       Location::GSToken(RC_WATER_TEMPLE_GS_RIVER,                                        RCQUEST_VANILLA,                                     RCAREA_WATER_TEMPLE,                                       SCENE_WATER_TEMPLE,                 9488,                                              0x10, "GS River",                                    "Water Temple GS River",                                    RHT_WATER_TEMPLE_GS_RIVER,                                                                             { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[RC_WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH] =                Location::GSToken(RC_WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH,                 RCQUEST_MQ,                                          RCAREA_WATER_TEMPLE,                                       SCENE_WATER_TEMPLE,                 9476,                                              0x04, "MQ GS Before Upper Water Switch",             "Water Temple MQ GS Before Upper Water Switch",             RHT_WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH,                                                      { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[RC_WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA] =                    Location::GSToken(RC_WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA,                     RCQUEST_MQ,                                          RCAREA_WATER_TEMPLE,                                       SCENE_WATER_TEMPLE,                 9480,                                              0x08, "MQ GS Freestanding Key Area",                 "Water Temple MQ GS Freestanding Key Area",                 RHT_WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA,                                                          { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[RC_WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY] =                         Location::GSToken(RC_WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY,                          RCQUEST_MQ,                                          RCAREA_WATER_TEMPLE,                                       SCENE_WATER_TEMPLE,                 9473,                                              0x01, "MQ GS Lizalfos Hallway",                      "Water Temple MQ GS Lizalfos Hallway",                      RHT_WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY,                                                               { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[RC_WATER_TEMPLE_MQ_GS_RIVER] =                                    Location::GSToken(RC_WATER_TEMPLE_MQ_GS_RIVER,                                     RCQUEST_MQ,                                          RCAREA_WATER_TEMPLE,                                       SCENE_WATER_TEMPLE,                 9474,                                              0x02, "MQ GS River",                                 "Water Temple MQ GS River",                                 RHT_WATER_TEMPLE_MQ_GS_RIVER,                                                                          { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[RC_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH] =                        Location::GSToken(RC_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH,                         RCQUEST_MQ,                                          RCAREA_WATER_TEMPLE,                                       SCENE_WATER_TEMPLE,                 9488,                                              0x10, "MQ GS Triple Wall Torch",                     "Water Temple MQ GS Triple Wall Torch",                     RHT_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH,                                                              { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
+    locationTable[RC_WATER_TEMPLE_GS_BEHIND_GATE] =                                 Location::GSToken(RC_WATER_TEMPLE_GS_BEHIND_GATE,                                  RCQUEST_VANILLA,                                     RCAREA_WATER_TEMPLE,                                       SCENE_WATER_TEMPLE,                 9473,                                              0x01, "GS Behind Gate",                              RHT_WATER_TEMPLE_GS_BEHIND_GATE,                                                                       { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
+    locationTable[RC_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM] =                       Location::GSToken(RC_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM,                        RCQUEST_VANILLA,                                     RCAREA_WATER_TEMPLE,                                       SCENE_WATER_TEMPLE,                 9474,                                              0x02, "GS Falling Platform Room",                    RHT_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM,                                                             { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
+    locationTable[RC_WATER_TEMPLE_GS_CENTRAL_PILLAR] =                              Location::GSToken(RC_WATER_TEMPLE_GS_CENTRAL_PILLAR,                               RCQUEST_VANILLA,                                     RCAREA_WATER_TEMPLE,                                       SCENE_WATER_TEMPLE,                 9476,                                              0x04, "GS Central Pillar",                           RHT_WATER_TEMPLE_GS_CENTRAL_PILLAR,                                                                    { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
+    locationTable[RC_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST] =                         Location::GSToken(RC_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST,                          RCQUEST_VANILLA,                                     RCAREA_WATER_TEMPLE,                                       SCENE_WATER_TEMPLE,                 9480,                                              0x08, "GS Near Boss Key Chest",                      RHT_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST,                                                               { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
+    locationTable[RC_WATER_TEMPLE_GS_RIVER] =                                       Location::GSToken(RC_WATER_TEMPLE_GS_RIVER,                                        RCQUEST_VANILLA,                                     RCAREA_WATER_TEMPLE,                                       SCENE_WATER_TEMPLE,                 9488,                                              0x10, "GS River",                                    RHT_WATER_TEMPLE_GS_RIVER,                                                                             { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
+    locationTable[RC_WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH] =                Location::GSToken(RC_WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH,                 RCQUEST_MQ,                                          RCAREA_WATER_TEMPLE,                                       SCENE_WATER_TEMPLE,                 9476,                                              0x04, "MQ GS Before Upper Water Switch",             RHT_WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH,                                                      { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
+    locationTable[RC_WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA] =                    Location::GSToken(RC_WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA,                     RCQUEST_MQ,                                          RCAREA_WATER_TEMPLE,                                       SCENE_WATER_TEMPLE,                 9480,                                              0x08, "MQ GS Freestanding Key Area",                 RHT_WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA,                                                          { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
+    locationTable[RC_WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY] =                         Location::GSToken(RC_WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY,                          RCQUEST_MQ,                                          RCAREA_WATER_TEMPLE,                                       SCENE_WATER_TEMPLE,                 9473,                                              0x01, "MQ GS Lizalfos Hallway",                      RHT_WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY,                                                               { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
+    locationTable[RC_WATER_TEMPLE_MQ_GS_RIVER] =                                    Location::GSToken(RC_WATER_TEMPLE_MQ_GS_RIVER,                                     RCQUEST_MQ,                                          RCAREA_WATER_TEMPLE,                                       SCENE_WATER_TEMPLE,                 9474,                                              0x02, "MQ GS River",                                 RHT_WATER_TEMPLE_MQ_GS_RIVER,                                                                          { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
+    locationTable[RC_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH] =                        Location::GSToken(RC_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH,                         RCQUEST_MQ,                                          RCAREA_WATER_TEMPLE,                                       SCENE_WATER_TEMPLE,                 9488,                                              0x10, "MQ GS Triple Wall Torch",                     RHT_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH,                                                              { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
     // Spirit Temple
-    locationTable[RC_SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM] =                  Location::GSToken(RC_SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM,                   RCQUEST_VANILLA,                                     RCAREA_SPIRIT_TEMPLE,                                      SCENE_SPIRIT_TEMPLE,                9729,                                              0x01, "GS Hall After Sun Block Room",                "Spirit Temple GS Hall After Sun Block Room",               RHT_SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM,                                                        { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_GS_BOULDER_ROOM] =                               Location::GSToken(RC_SPIRIT_TEMPLE_GS_BOULDER_ROOM,                                RCQUEST_VANILLA,                                     RCAREA_SPIRIT_TEMPLE,                                      SCENE_SPIRIT_TEMPLE,                9730,                                              0x02, "GS Boulder Room",                             "Spirit Temple GS Boulder Room",                            RHT_SPIRIT_TEMPLE_GS_BOULDER_ROOM,                                                                     { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_GS_LOBBY] =                                      Location::GSToken(RC_SPIRIT_TEMPLE_GS_LOBBY,                                       RCQUEST_VANILLA,                                     RCAREA_SPIRIT_TEMPLE,                                      SCENE_SPIRIT_TEMPLE,                9732,                                              0x04, "GS Lobby",                                    "Spirit Temple GS Lobby",                                   RHT_SPIRIT_TEMPLE_GS_LOBBY,                                                                            { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM] =                          Location::GSToken(RC_SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM,                           RCQUEST_VANILLA,                                     RCAREA_SPIRIT_TEMPLE,                                      SCENE_SPIRIT_TEMPLE,                9736,                                              0x08, "GS Sun on Floor Room",                        "Spirit Temple GS Sun on Floor Room",                       RHT_SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM,                                                                { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_GS_METAL_FENCE] =                                Location::GSToken(RC_SPIRIT_TEMPLE_GS_METAL_FENCE,                                 RCQUEST_VANILLA,                                     RCAREA_SPIRIT_TEMPLE,                                      SCENE_SPIRIT_TEMPLE,                9744,                                              0x10, "GS Metal Fence",                              "Spirit Temple GS Metal Fence",                             RHT_SPIRIT_TEMPLE_GS_METAL_FENCE,                                                                      { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM] =                           Location::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM,                            RCQUEST_MQ,                                          RCAREA_SPIRIT_TEMPLE,                                      SCENE_SPIRIT_TEMPLE,                9736,                                              0x08, "MQ GS Symphony Room",                         "Spirit Temple MQ GS Symphony Room",                        RHT_SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM,                                                                 { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM] =                             Location::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM,                              RCQUEST_MQ,                                          RCAREA_SPIRIT_TEMPLE,                                      SCENE_SPIRIT_TEMPLE,                9730,                                              0x02, "MQ GS Leever Room",                           "Spirit Temple MQ GS Leever Room",                          RHT_SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM,                                                                   { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST] =                  Location::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST,                   RCQUEST_MQ,                                          RCAREA_SPIRIT_TEMPLE,                                      SCENE_SPIRIT_TEMPLE,                9732,                                              0x04, "MQ GS Nine Thrones Room West",                "Spirit Temple MQ GS Nine Thrones Room West",               RHT_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST,                                                        { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH] =                 Location::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH,                  RCQUEST_MQ,                                          RCAREA_SPIRIT_TEMPLE,                                      SCENE_SPIRIT_TEMPLE,                9744,                                              0x10, "MQ GS Nine Thrones Room North",               "Spirit Temple MQ GS Nine Thrones Room North",              RHT_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH,                                                       { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM] =                          Location::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM,                           RCQUEST_MQ,                                          RCAREA_SPIRIT_TEMPLE,                                      SCENE_SPIRIT_TEMPLE,                9729,                                              0x01, "MQ GS Sun Block Room",                        "Spirit Temple MQ GS Sun Block Room",                       RHT_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM,                                                                { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM] =                  Location::GSToken(RC_SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM,                   RCQUEST_VANILLA,                                     RCAREA_SPIRIT_TEMPLE,                                      SCENE_SPIRIT_TEMPLE,                9729,                                              0x01, "GS Hall After Sun Block Room",                RHT_SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM,                                                        { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_GS_BOULDER_ROOM] =                               Location::GSToken(RC_SPIRIT_TEMPLE_GS_BOULDER_ROOM,                                RCQUEST_VANILLA,                                     RCAREA_SPIRIT_TEMPLE,                                      SCENE_SPIRIT_TEMPLE,                9730,                                              0x02, "GS Boulder Room",                             RHT_SPIRIT_TEMPLE_GS_BOULDER_ROOM,                                                                     { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_GS_LOBBY] =                                      Location::GSToken(RC_SPIRIT_TEMPLE_GS_LOBBY,                                       RCQUEST_VANILLA,                                     RCAREA_SPIRIT_TEMPLE,                                      SCENE_SPIRIT_TEMPLE,                9732,                                              0x04, "GS Lobby",                                    RHT_SPIRIT_TEMPLE_GS_LOBBY,                                                                            { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM] =                          Location::GSToken(RC_SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM,                           RCQUEST_VANILLA,                                     RCAREA_SPIRIT_TEMPLE,                                      SCENE_SPIRIT_TEMPLE,                9736,                                              0x08, "GS Sun on Floor Room",                        RHT_SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM,                                                                { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_GS_METAL_FENCE] =                                Location::GSToken(RC_SPIRIT_TEMPLE_GS_METAL_FENCE,                                 RCQUEST_VANILLA,                                     RCAREA_SPIRIT_TEMPLE,                                      SCENE_SPIRIT_TEMPLE,                9744,                                              0x10, "GS Metal Fence",                              RHT_SPIRIT_TEMPLE_GS_METAL_FENCE,                                                                      { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM] =                           Location::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM,                            RCQUEST_MQ,                                          RCAREA_SPIRIT_TEMPLE,                                      SCENE_SPIRIT_TEMPLE,                9736,                                              0x08, "MQ GS Symphony Room",                         RHT_SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM,                                                                 { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM] =                             Location::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM,                              RCQUEST_MQ,                                          RCAREA_SPIRIT_TEMPLE,                                      SCENE_SPIRIT_TEMPLE,                9730,                                              0x02, "MQ GS Leever Room",                           RHT_SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM,                                                                   { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST] =                  Location::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST,                   RCQUEST_MQ,                                          RCAREA_SPIRIT_TEMPLE,                                      SCENE_SPIRIT_TEMPLE,                9732,                                              0x04, "MQ GS Nine Thrones Room West",                RHT_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST,                                                        { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH] =                 Location::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH,                  RCQUEST_MQ,                                          RCAREA_SPIRIT_TEMPLE,                                      SCENE_SPIRIT_TEMPLE,                9744,                                              0x10, "MQ GS Nine Thrones Room North",               RHT_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH,                                                       { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM] =                          Location::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM,                           RCQUEST_MQ,                                          RCAREA_SPIRIT_TEMPLE,                                      SCENE_SPIRIT_TEMPLE,                9729,                                              0x01, "MQ GS Sun Block Room",                        RHT_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM,                                                                { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
     // Shadow Temple
-    locationTable[RC_SHADOW_TEMPLE_GS_SINGLE_GIANT_POT] =                           Location::GSToken(RC_SHADOW_TEMPLE_GS_SINGLE_GIANT_POT,                            RCQUEST_VANILLA,                                     RCAREA_SHADOW_TEMPLE,                                      SCENE_SHADOW_TEMPLE,                9985,                                              0x01, "GS Single Giant Pot",                         "Shadow Temple GS Single Giant Pot",                        RHT_SHADOW_TEMPLE_GS_SINGLE_GIANT_POT,                                                                 { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM] =                        Location::GSToken(RC_SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM,                         RCQUEST_VANILLA,                                     RCAREA_SHADOW_TEMPLE,                                      SCENE_SHADOW_TEMPLE,                9986,                                              0x02, "GS Falling Spikes Room",                      "Shadow Temple GS Falling Spikes Room",                     RHT_SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM,                                                              { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT] =                           Location::GSToken(RC_SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT,                            RCQUEST_VANILLA,                                     RCAREA_SHADOW_TEMPLE,                                      SCENE_SHADOW_TEMPLE,                9988,                                              0x04, "GS Triple Giant Pot",                         "Shadow Temple GS Triple Giant Pot",                        RHT_SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT,                                                                 { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM] =                             Location::GSToken(RC_SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM,                              RCQUEST_VANILLA,                                     RCAREA_SHADOW_TEMPLE,                                      SCENE_SHADOW_TEMPLE,                9992,                                              0x08, "GS Like Like Room",                           "Shadow Temple GS Like Like Room",                          RHT_SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM,                                                                   { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_GS_NEAR_SHIP] =                                  Location::GSToken(RC_SHADOW_TEMPLE_GS_NEAR_SHIP,                                   RCQUEST_VANILLA,                                     RCAREA_SHADOW_TEMPLE,                                      SCENE_SHADOW_TEMPLE,                10000,                                             0x10, "GS Near Ship",                                "Shadow Temple GS Near Ship",                               RHT_SHADOW_TEMPLE_GS_NEAR_SHIP,                                                                        { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM] =                     Location::GSToken(RC_SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM,                      RCQUEST_MQ,                                          RCAREA_SHADOW_TEMPLE,                                      SCENE_SHADOW_TEMPLE,                9986,                                              0x02, "MQ GS Falling Spikes Room",                   "Shadow Temple MQ GS Falling Spikes Room",                  RHT_SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM,                                                           { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM] =                          Location::GSToken(RC_SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM,                           RCQUEST_MQ,                                          RCAREA_SHADOW_TEMPLE,                                      SCENE_SHADOW_TEMPLE,                9985,                                              0x01, "MQ GS Wind Hint Room",                        "Shadow Temple MQ GS Wind Hint Room",                       RHT_SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM,                                                                { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_MQ_GS_AFTER_WIND] =                              Location::GSToken(RC_SHADOW_TEMPLE_MQ_GS_AFTER_WIND,                               RCQUEST_MQ,                                          RCAREA_SHADOW_TEMPLE,                                      SCENE_SHADOW_TEMPLE,                9992,                                              0x08, "MQ GS After Wind",                            "Shadow Temple MQ GS After Wind",                           RHT_SHADOW_TEMPLE_MQ_GS_AFTER_WIND,                                                                    { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_MQ_GS_AFTER_SHIP] =                              Location::GSToken(RC_SHADOW_TEMPLE_MQ_GS_AFTER_SHIP,                               RCQUEST_MQ,                                          RCAREA_SHADOW_TEMPLE,                                      SCENE_SHADOW_TEMPLE,                10000,                                             0x10, "MQ GS After Ship",                            "Shadow Temple MQ GS After Ship",                           RHT_SHADOW_TEMPLE_MQ_GS_AFTER_SHIP,                                                                    { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS] =                               Location::GSToken(RC_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS,                                RCQUEST_MQ,                                          RCAREA_SHADOW_TEMPLE,                                      SCENE_SHADOW_TEMPLE,                9988,                                              0x04, "MQ GS Near Boss",                             "Shadow Temple MQ GS Near Boss",                            RHT_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS,                                                                     { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_GS_SINGLE_GIANT_POT] =                           Location::GSToken(RC_SHADOW_TEMPLE_GS_SINGLE_GIANT_POT,                            RCQUEST_VANILLA,                                     RCAREA_SHADOW_TEMPLE,                                      SCENE_SHADOW_TEMPLE,                9985,                                              0x01, "GS Single Giant Pot",                         RHT_SHADOW_TEMPLE_GS_SINGLE_GIANT_POT,                                                                 { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM] =                        Location::GSToken(RC_SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM,                         RCQUEST_VANILLA,                                     RCAREA_SHADOW_TEMPLE,                                      SCENE_SHADOW_TEMPLE,                9986,                                              0x02, "GS Falling Spikes Room",                      RHT_SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM,                                                              { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT] =                           Location::GSToken(RC_SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT,                            RCQUEST_VANILLA,                                     RCAREA_SHADOW_TEMPLE,                                      SCENE_SHADOW_TEMPLE,                9988,                                              0x04, "GS Triple Giant Pot",                         RHT_SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT,                                                                 { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM] =                             Location::GSToken(RC_SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM,                              RCQUEST_VANILLA,                                     RCAREA_SHADOW_TEMPLE,                                      SCENE_SHADOW_TEMPLE,                9992,                                              0x08, "GS Like Like Room",                           RHT_SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM,                                                                   { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_GS_NEAR_SHIP] =                                  Location::GSToken(RC_SHADOW_TEMPLE_GS_NEAR_SHIP,                                   RCQUEST_VANILLA,                                     RCAREA_SHADOW_TEMPLE,                                      SCENE_SHADOW_TEMPLE,                10000,                                             0x10, "GS Near Ship",                                RHT_SHADOW_TEMPLE_GS_NEAR_SHIP,                                                                        { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM] =                     Location::GSToken(RC_SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM,                      RCQUEST_MQ,                                          RCAREA_SHADOW_TEMPLE,                                      SCENE_SHADOW_TEMPLE,                9986,                                              0x02, "MQ GS Falling Spikes Room",                   RHT_SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM,                                                           { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM] =                          Location::GSToken(RC_SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM,                           RCQUEST_MQ,                                          RCAREA_SHADOW_TEMPLE,                                      SCENE_SHADOW_TEMPLE,                9985,                                              0x01, "MQ GS Wind Hint Room",                        RHT_SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM,                                                                { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_GS_AFTER_WIND] =                              Location::GSToken(RC_SHADOW_TEMPLE_MQ_GS_AFTER_WIND,                               RCQUEST_MQ,                                          RCAREA_SHADOW_TEMPLE,                                      SCENE_SHADOW_TEMPLE,                9992,                                              0x08, "MQ GS After Wind",                            RHT_SHADOW_TEMPLE_MQ_GS_AFTER_WIND,                                                                    { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_GS_AFTER_SHIP] =                              Location::GSToken(RC_SHADOW_TEMPLE_MQ_GS_AFTER_SHIP,                               RCQUEST_MQ,                                          RCAREA_SHADOW_TEMPLE,                                      SCENE_SHADOW_TEMPLE,                10000,                                             0x10, "MQ GS After Ship",                            RHT_SHADOW_TEMPLE_MQ_GS_AFTER_SHIP,                                                                    { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS] =                               Location::GSToken(RC_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS,                                RCQUEST_MQ,                                          RCAREA_SHADOW_TEMPLE,                                      SCENE_SHADOW_TEMPLE,                9988,                                              0x04, "MQ GS Near Boss",                             RHT_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS,                                                                     { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
     // Bottom of the Well
-    locationTable[RC_BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE] =                        Location::GSToken(RC_BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE,                         RCQUEST_VANILLA,                                     RCAREA_BOTTOM_OF_THE_WELL,                                 SCENE_BOTTOM_OF_THE_WELL,           10241,                                             0x01, "GS Like Like Cage",                           "Bottom of the Well GS Like Like Cage",                     RHT_BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE,                                                              { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[RC_BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM] =                       Location::GSToken(RC_BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM,                        RCQUEST_VANILLA,                                     RCAREA_BOTTOM_OF_THE_WELL,                                 SCENE_BOTTOM_OF_THE_WELL,           10242,                                             0x02, "GS East Inner Room",                          "Bottom of the Well GS East Inner Room",                    RHT_BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM,                                                             { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[RC_BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM] =                       Location::GSToken(RC_BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM,                        RCQUEST_VANILLA,                                     RCAREA_BOTTOM_OF_THE_WELL,                                 SCENE_BOTTOM_OF_THE_WELL,           10244,                                             0x04, "GS West Inner Room",                          "Bottom of the Well GS West Inner Room",                    RHT_BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM,                                                             { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT] =                           Location::GSToken(RC_BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT,                            RCQUEST_MQ,                                          RCAREA_BOTTOM_OF_THE_WELL,                                 SCENE_BOTTOM_OF_THE_WELL,           10241,                                             0x01, "MQ GS Basement",                              "Bottom of the Well MQ GS Basement",                        RHT_BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT,                                                                 { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM] =                        Location::GSToken(RC_BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM,                         RCQUEST_MQ,                                          RCAREA_BOTTOM_OF_THE_WELL,                                 SCENE_BOTTOM_OF_THE_WELL,           10244,                                             0x04, "MQ GS Coffin Room",                           "Bottom of the Well MQ GS Coffin Room",                     RHT_BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM,                                                              { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM] =                    Location::GSToken(RC_BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM,                     RCQUEST_MQ,                                          RCAREA_BOTTOM_OF_THE_WELL,                                 SCENE_BOTTOM_OF_THE_WELL,           10242,                                             0x02, "MQ GS West Inner Room",                       "Bottom of the Well MQ GS West Inner Room",                 RHT_BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM,                                                          { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
+    locationTable[RC_BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE] =                        Location::GSToken(RC_BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE,                         RCQUEST_VANILLA,                                     RCAREA_BOTTOM_OF_THE_WELL,                                 SCENE_BOTTOM_OF_THE_WELL,           10241,                                             0x01, "GS Like Like Cage",                           RHT_BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE,                                                              { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
+    locationTable[RC_BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM] =                       Location::GSToken(RC_BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM,                        RCQUEST_VANILLA,                                     RCAREA_BOTTOM_OF_THE_WELL,                                 SCENE_BOTTOM_OF_THE_WELL,           10242,                                             0x02, "GS East Inner Room",                          RHT_BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM,                                                             { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
+    locationTable[RC_BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM] =                       Location::GSToken(RC_BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM,                        RCQUEST_VANILLA,                                     RCAREA_BOTTOM_OF_THE_WELL,                                 SCENE_BOTTOM_OF_THE_WELL,           10244,                                             0x04, "GS West Inner Room",                          RHT_BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM,                                                             { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
+    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT] =                           Location::GSToken(RC_BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT,                            RCQUEST_MQ,                                          RCAREA_BOTTOM_OF_THE_WELL,                                 SCENE_BOTTOM_OF_THE_WELL,           10241,                                             0x01, "MQ GS Basement",                              RHT_BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT,                                                                 { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
+    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM] =                        Location::GSToken(RC_BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM,                         RCQUEST_MQ,                                          RCAREA_BOTTOM_OF_THE_WELL,                                 SCENE_BOTTOM_OF_THE_WELL,           10244,                                             0x04, "MQ GS Coffin Room",                           RHT_BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM,                                                              { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
+    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM] =                    Location::GSToken(RC_BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM,                     RCQUEST_MQ,                                          RCAREA_BOTTOM_OF_THE_WELL,                                 SCENE_BOTTOM_OF_THE_WELL,           10242,                                             0x02, "MQ GS West Inner Room",                       RHT_BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM,                                                          { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
     // Ice Cavern
-    locationTable[RC_ICE_CAVERN_GS_PUSH_BLOCK_ROOM] =                               Location::GSToken(RC_ICE_CAVERN_GS_PUSH_BLOCK_ROOM,                                RCQUEST_VANILLA,                                     RCAREA_ICE_CAVERN,                                         SCENE_ICE_CAVERN,                   10497,                                             0x01, "GS Push Block Room",                          "Ice Cavern GS Push Block Room",                            RHT_ICE_CAVERN_GS_PUSH_BLOCK_ROOM,                                                                     { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
-    locationTable[RC_ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM] =                          Location::GSToken(RC_ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM,                           RCQUEST_VANILLA,                                     RCAREA_ICE_CAVERN,                                         SCENE_ICE_CAVERN,                   10498,                                             0x02, "GS Spinning Scythe Room",                     "Ice Cavern GS Spinning Scythe Room",                       RHT_ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM,                                                                { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
-    locationTable[RC_ICE_CAVERN_GS_HEART_PIECE_ROOM] =                              Location::GSToken(RC_ICE_CAVERN_GS_HEART_PIECE_ROOM,                               RCQUEST_VANILLA,                                     RCAREA_ICE_CAVERN,                                         SCENE_ICE_CAVERN,                   10500,                                             0x04, "GS Heart Piece Room",                         "Ice Cavern GS Heart Piece Room",                           RHT_ICE_CAVERN_GS_HEART_PIECE_ROOM,                                                                    { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
-    locationTable[RC_ICE_CAVERN_MQ_GS_SCARECROW] =                                  Location::GSToken(RC_ICE_CAVERN_MQ_GS_SCARECROW,                                   RCQUEST_MQ,                                          RCAREA_ICE_CAVERN,                                         SCENE_ICE_CAVERN,                   10497,                                             0x01, "MQ GS Scarecrow",                             "Ice Cavern MQ GS Scarecrow",                               RHT_ICE_CAVERN_MQ_GS_SCARECROW,                                                                        { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
-    locationTable[RC_ICE_CAVERN_MQ_GS_ICE_BLOCK] =                                  Location::GSToken(RC_ICE_CAVERN_MQ_GS_ICE_BLOCK,                                   RCQUEST_MQ,                                          RCAREA_ICE_CAVERN,                                         SCENE_ICE_CAVERN,                   10500,                                             0x04, "MQ GS Ice Block",                             "Ice Cavern MQ GS Ice Block",                               RHT_ICE_CAVERN_MQ_GS_ICE_BLOCK,                                                                        { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
-    locationTable[RC_ICE_CAVERN_MQ_GS_RED_ICE] =                                    Location::GSToken(RC_ICE_CAVERN_MQ_GS_RED_ICE,                                     RCQUEST_MQ,                                          RCAREA_ICE_CAVERN,                                         SCENE_ICE_CAVERN,                   10498,                                             0x02, "MQ GS Red Ice",                               "Ice Cavern MQ GS Red Ice",                                 RHT_ICE_CAVERN_MQ_GS_RED_ICE,                                                                          { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
+    locationTable[RC_ICE_CAVERN_GS_PUSH_BLOCK_ROOM] =                               Location::GSToken(RC_ICE_CAVERN_GS_PUSH_BLOCK_ROOM,                                RCQUEST_VANILLA,                                     RCAREA_ICE_CAVERN,                                         SCENE_ICE_CAVERN,                   10497,                                             0x01, "GS Push Block Room",                          RHT_ICE_CAVERN_GS_PUSH_BLOCK_ROOM,                                                                     { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
+    locationTable[RC_ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM] =                          Location::GSToken(RC_ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM,                           RCQUEST_VANILLA,                                     RCAREA_ICE_CAVERN,                                         SCENE_ICE_CAVERN,                   10498,                                             0x02, "GS Spinning Scythe Room",                     RHT_ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM,                                                                { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
+    locationTable[RC_ICE_CAVERN_GS_HEART_PIECE_ROOM] =                              Location::GSToken(RC_ICE_CAVERN_GS_HEART_PIECE_ROOM,                               RCQUEST_VANILLA,                                     RCAREA_ICE_CAVERN,                                         SCENE_ICE_CAVERN,                   10500,                                             0x04, "GS Heart Piece Room",                         RHT_ICE_CAVERN_GS_HEART_PIECE_ROOM,                                                                    { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
+    locationTable[RC_ICE_CAVERN_MQ_GS_SCARECROW] =                                  Location::GSToken(RC_ICE_CAVERN_MQ_GS_SCARECROW,                                   RCQUEST_MQ,                                          RCAREA_ICE_CAVERN,                                         SCENE_ICE_CAVERN,                   10497,                                             0x01, "MQ GS Scarecrow",                             RHT_ICE_CAVERN_MQ_GS_SCARECROW,                                                                        { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
+    locationTable[RC_ICE_CAVERN_MQ_GS_ICE_BLOCK] =                                  Location::GSToken(RC_ICE_CAVERN_MQ_GS_ICE_BLOCK,                                   RCQUEST_MQ,                                          RCAREA_ICE_CAVERN,                                         SCENE_ICE_CAVERN,                   10500,                                             0x04, "MQ GS Ice Block",                             RHT_ICE_CAVERN_MQ_GS_ICE_BLOCK,                                                                        { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
+    locationTable[RC_ICE_CAVERN_MQ_GS_RED_ICE] =                                    Location::GSToken(RC_ICE_CAVERN_MQ_GS_RED_ICE,                                     RCQUEST_MQ,                                          RCAREA_ICE_CAVERN,                                         SCENE_ICE_CAVERN,                   10498,                                             0x02, "MQ GS Red Ice",                               RHT_ICE_CAVERN_MQ_GS_RED_ICE,                                                                          { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
     // Overworld
     // Kokiri Forest
-    locationTable[RC_KF_GS_BEAN_PATCH] =                                            Location::GSToken(RC_KF_GS_BEAN_PATCH,                                             RCQUEST_BOTH,                                        RCAREA_KOKIRI_FOREST,                                      SCENE_KOKIRI_FOREST,                27649,                                             0x01, "GS Bean Patch",                               "KF GS Bean Patch",                                         RHT_KF_GS_BEAN_PATCH,                                                                                  { Category::cSkulltula }, 0x0C,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_GS_KNOW_IT_ALL_HOUSE] =                                     Location::GSToken(RC_KF_GS_KNOW_IT_ALL_HOUSE,                                      RCQUEST_BOTH,                                        RCAREA_KOKIRI_FOREST,                                      SCENE_KOKIRI_FOREST,                19458,                                             0x02, "GS Know It All House",                        "KF GS Know It All House",                                  RHT_KF_GS_KNOW_IT_ALL_HOUSE,                                                                           { Category::cSkulltula }, 0x0C,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_GS_HOUSE_OF_TWINS] =                                        Location::GSToken(RC_KF_GS_HOUSE_OF_TWINS,                                         RCQUEST_BOTH,                                        RCAREA_KOKIRI_FOREST,                                      SCENE_KOKIRI_FOREST,                19460,                                             0x04, "GS House of Twins",                           "KF GS House of Twins",                                     RHT_KF_GS_HOUSE_OF_TWINS,                                                                              { Category::cSkulltula }, 0x0C,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_GS_BEAN_PATCH] =                                            Location::GSToken(RC_KF_GS_BEAN_PATCH,                                             RCQUEST_BOTH,                                        RCAREA_KOKIRI_FOREST,                                      SCENE_KOKIRI_FOREST,                27649,                                             0x01, "GS Bean Patch",                               RHT_KF_GS_BEAN_PATCH,                                                                                  { Category::cSkulltula }, 0x0C,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_GS_KNOW_IT_ALL_HOUSE] =                                     Location::GSToken(RC_KF_GS_KNOW_IT_ALL_HOUSE,                                      RCQUEST_BOTH,                                        RCAREA_KOKIRI_FOREST,                                      SCENE_KOKIRI_FOREST,                19458,                                             0x02, "GS Know It All House",                        RHT_KF_GS_KNOW_IT_ALL_HOUSE,                                                                           { Category::cSkulltula }, 0x0C,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_GS_HOUSE_OF_TWINS] =                                        Location::GSToken(RC_KF_GS_HOUSE_OF_TWINS,                                         RCQUEST_BOTH,                                        RCAREA_KOKIRI_FOREST,                                      SCENE_KOKIRI_FOREST,                19460,                                             0x04, "GS House of Twins",                           RHT_KF_GS_HOUSE_OF_TWINS,                                                                              { Category::cSkulltula }, 0x0C,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
     // Lost Woods
-    locationTable[RC_LW_GS_BEAN_PATCH_NEAR_BRIDGE] =                                Location::GSToken(RC_LW_GS_BEAN_PATCH_NEAR_BRIDGE,                                 RCQUEST_BOTH,                                        RCAREA_LOST_WOODS,                                         SCENE_LOST_WOODS,                   27905,                                             0x01, "GS Bean Patch Near Bridge",                   "LW GS Bean Patch Near Bridge",                             RHT_LW_GS_BEAN_PATCH_NEAR_BRIDGE,                                                                      { Category::cSkulltula }, 0x0D,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[RC_LW_GS_BEAN_PATCH_NEAR_THEATER] =                               Location::GSToken(RC_LW_GS_BEAN_PATCH_NEAR_THEATER,                                RCQUEST_BOTH,                                        RCAREA_LOST_WOODS,                                         SCENE_LOST_WOODS,                   27906,                                             0x02, "GS Bean Patch Near Theater",                  "LW GS Bean Patch Near Theater",                            RHT_LW_GS_BEAN_PATCH_NEAR_THEATER,                                                                     { Category::cSkulltula }, 0x0D,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[RC_LW_GS_ABOVE_THEATER] =                                         Location::GSToken(RC_LW_GS_ABOVE_THEATER,                                          RCQUEST_BOTH,                                        RCAREA_LOST_WOODS,                                         SCENE_LOST_WOODS,                   19716,                                             0x04, "GS Above Theater",                            "LW GS Above Theater",                                      RHT_LW_GS_ABOVE_THEATER,                                                                               { Category::cSkulltula }, 0x0D,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[RC_SFM_GS] =                                                      Location::GSToken(RC_SFM_GS,                                                       RCQUEST_BOTH,                                        RCAREA_SACRED_FOREST_MEADOW,                               SCENE_SACRED_FOREST_MEADOW,         19720,                                             0x08, "GS",                                          "SFM GS",                                                   RHT_SFM_GS,                                                                                            { Category::cSkulltula }, 0x0D,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_LW_GS_BEAN_PATCH_NEAR_BRIDGE] =                                Location::GSToken(RC_LW_GS_BEAN_PATCH_NEAR_BRIDGE,                                 RCQUEST_BOTH,                                        RCAREA_LOST_WOODS,                                         SCENE_LOST_WOODS,                   27905,                                             0x01, "GS Bean Patch Near Bridge",                   RHT_LW_GS_BEAN_PATCH_NEAR_BRIDGE,                                                                      { Category::cSkulltula }, 0x0D,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_LW_GS_BEAN_PATCH_NEAR_THEATER] =                               Location::GSToken(RC_LW_GS_BEAN_PATCH_NEAR_THEATER,                                RCQUEST_BOTH,                                        RCAREA_LOST_WOODS,                                         SCENE_LOST_WOODS,                   27906,                                             0x02, "GS Bean Patch Near Theater",                  RHT_LW_GS_BEAN_PATCH_NEAR_THEATER,                                                                     { Category::cSkulltula }, 0x0D,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_LW_GS_ABOVE_THEATER] =                                         Location::GSToken(RC_LW_GS_ABOVE_THEATER,                                          RCQUEST_BOTH,                                        RCAREA_LOST_WOODS,                                         SCENE_LOST_WOODS,                   19716,                                             0x04, "GS Above Theater",                            RHT_LW_GS_ABOVE_THEATER,                                                                               { Category::cSkulltula }, 0x0D,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_SFM_GS] =                                                      Location::GSToken(RC_SFM_GS,                                                       RCQUEST_BOTH,                                        RCAREA_SACRED_FOREST_MEADOW,                               SCENE_SACRED_FOREST_MEADOW,         19720,                                             0x08, "GS",                                          RHT_SFM_GS,                                                                                            { Category::cSkulltula }, 0x0D,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
     // Hyrule Field
-    locationTable[RC_HF_GS_COW_GROTTO] =                                            Location::GSToken(RC_HF_GS_COW_GROTTO,                                             RCQUEST_BOTH,                                        RCAREA_HYRULE_FIELD,                                       SCENE_GROTTOS,                      10753,                                             0x01, "GS Cow Grotto",                               "HF GS Cow Grotto",                                         RHT_HF_GS_COW_GROTTO,                                                                                  { Category::cSkulltula }, 0x0A,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[RC_HF_GS_NEAR_KAK_GROTTO] =                                       Location::GSToken(RC_HF_GS_NEAR_KAK_GROTTO,                                        RCQUEST_BOTH,                                        RCAREA_HYRULE_FIELD,                                       SCENE_GROTTOS,                      10754,                                             0x02, "GS Near Kak Grotto",                          "HF GS Near Kak Grotto",                                    RHT_HF_GS_NEAR_KAK_GROTTO,                                                                             { Category::cSkulltula }, 0x0A,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_HF_GS_COW_GROTTO] =                                            Location::GSToken(RC_HF_GS_COW_GROTTO,                                             RCQUEST_BOTH,                                        RCAREA_HYRULE_FIELD,                                       SCENE_GROTTOS,                      10753,                                             0x01, "GS Cow Grotto",                               RHT_HF_GS_COW_GROTTO,                                                                                  { Category::cSkulltula }, 0x0A,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_HF_GS_NEAR_KAK_GROTTO] =                                       Location::GSToken(RC_HF_GS_NEAR_KAK_GROTTO,                                        RCQUEST_BOTH,                                        RCAREA_HYRULE_FIELD,                                       SCENE_GROTTOS,                      10754,                                             0x02, "GS Near Kak Grotto",                          RHT_HF_GS_NEAR_KAK_GROTTO,                                                                             { Category::cSkulltula }, 0x0A,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
     // Lake Hylia
-    locationTable[RC_LH_GS_BEAN_PATCH] =                                            Location::GSToken(RC_LH_GS_BEAN_PATCH,                                             RCQUEST_BOTH,                                        RCAREA_LAKE_HYLIA,                                         SCENE_LAKE_HYLIA,                   29185,                                             0x01, "GS Bean Patch",                               "LH GS Bean Patch",                                         RHT_LH_GS_BEAN_PATCH,                                                                                  { Category::cSkulltula }, 0x12,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_GS_SMALL_ISLAND] =                                          Location::GSToken(RC_LH_GS_SMALL_ISLAND,                                           RCQUEST_BOTH,                                        RCAREA_LAKE_HYLIA,                                         SCENE_LAKE_HYLIA,                   20994,                                             0x02, "GS Small Island",                             "LH GS Small Island",                                       RHT_LH_GS_SMALL_ISLAND,                                                                                { Category::cSkulltula }, 0x12,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_GS_LAB_WALL] =                                              Location::GSToken(RC_LH_GS_LAB_WALL,                                               RCQUEST_BOTH,                                        RCAREA_LAKE_HYLIA,                                         SCENE_LAKE_HYLIA,                   20996,                                             0x04, "GS Lab Wall",                                 "LH GS Lab Wall",                                           RHT_LH_GS_LAB_WALL,                                                                                    { Category::cSkulltula }, 0x12,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_GS_LAB_CRATE] =                                             Location::GSToken(RC_LH_GS_LAB_CRATE,                                              RCQUEST_BOTH,                                        RCAREA_LAKE_HYLIA,                                         SCENE_LAKESIDE_LABORATORY,          -28152,                                            0x08, "GS Lab Crate",                                "LH GS Lab Crate",                                          RHT_LH_GS_LAB_CRATE,                                                                                   { Category::cSkulltula }, 0x12,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_GS_TREE] =                                                  Location::GSToken(RC_LH_GS_TREE,                                                   RCQUEST_BOTH,                                        RCAREA_LAKE_HYLIA,                                         SCENE_LAKE_HYLIA,                   21008,                                             0x10, "GS Tree",                                     "LH GS Tree",                                               RHT_LH_GS_TREE,                                                                                        { Category::cSkulltula }, 0x12,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_GS_BEAN_PATCH] =                                            Location::GSToken(RC_LH_GS_BEAN_PATCH,                                             RCQUEST_BOTH,                                        RCAREA_LAKE_HYLIA,                                         SCENE_LAKE_HYLIA,                   29185,                                             0x01, "GS Bean Patch",                               RHT_LH_GS_BEAN_PATCH,                                                                                  { Category::cSkulltula }, 0x12,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_GS_SMALL_ISLAND] =                                          Location::GSToken(RC_LH_GS_SMALL_ISLAND,                                           RCQUEST_BOTH,                                        RCAREA_LAKE_HYLIA,                                         SCENE_LAKE_HYLIA,                   20994,                                             0x02, "GS Small Island",                             RHT_LH_GS_SMALL_ISLAND,                                                                                { Category::cSkulltula }, 0x12,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_GS_LAB_WALL] =                                              Location::GSToken(RC_LH_GS_LAB_WALL,                                               RCQUEST_BOTH,                                        RCAREA_LAKE_HYLIA,                                         SCENE_LAKE_HYLIA,                   20996,                                             0x04, "GS Lab Wall",                                 RHT_LH_GS_LAB_WALL,                                                                                    { Category::cSkulltula }, 0x12,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_GS_LAB_CRATE] =                                             Location::GSToken(RC_LH_GS_LAB_CRATE,                                              RCQUEST_BOTH,                                        RCAREA_LAKE_HYLIA,                                         SCENE_LAKESIDE_LABORATORY,          -28152,                                            0x08, "GS Lab Crate",                                RHT_LH_GS_LAB_CRATE,                                                                                   { Category::cSkulltula }, 0x12,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_GS_TREE] =                                                  Location::GSToken(RC_LH_GS_TREE,                                                   RCQUEST_BOTH,                                        RCAREA_LAKE_HYLIA,                                         SCENE_LAKE_HYLIA,                   21008,                                             0x10, "GS Tree",                                     RHT_LH_GS_TREE,                                                                                        { Category::cSkulltula }, 0x12,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
     // Gerudo Valley
-    locationTable[RC_GV_GS_BEAN_PATCH] =                                            Location::GSToken(RC_GV_GS_BEAN_PATCH,                                             RCQUEST_BOTH,                                        RCAREA_GERUDO_VALLEY,                                      SCENE_GERUDO_VALLEY,                29441,                                             0x01, "GS Bean Patch",                               "GV GS Bean Patch",                                         RHT_GV_GS_BEAN_PATCH,                                                                                  { Category::cSkulltula }, 0x13,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[RC_GV_GS_SMALL_BRIDGE] =                                          Location::GSToken(RC_GV_GS_SMALL_BRIDGE,                                           RCQUEST_BOTH,                                        RCAREA_GERUDO_VALLEY,                                      SCENE_GERUDO_VALLEY,                21250,                                             0x02, "GS Small Bridge",                             "GV GS Small Bridge",                                       RHT_GV_GS_SMALL_BRIDGE,                                                                                { Category::cSkulltula }, 0x13,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[RC_GV_GS_PILLAR] =                                                Location::GSToken(RC_GV_GS_PILLAR,                                                 RCQUEST_BOTH,                                        RCAREA_GERUDO_VALLEY,                                      SCENE_GERUDO_VALLEY,                21252,                                             0x04, "GS Pillar",                                   "GV GS Pillar",                                             RHT_GV_GS_PILLAR,                                                                                      { Category::cSkulltula }, 0x13,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[RC_GV_GS_BEHIND_TENT] =                                           Location::GSToken(RC_GV_GS_BEHIND_TENT,                                            RCQUEST_BOTH,                                        RCAREA_GERUDO_VALLEY,                                      SCENE_GERUDO_VALLEY,                21256,                                             0x08, "GS Behind Tent",                              "GV GS Behind Tent",                                        RHT_GV_GS_BEHIND_TENT,                                                                                 { Category::cSkulltula }, 0x13,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_GV_GS_BEAN_PATCH] =                                            Location::GSToken(RC_GV_GS_BEAN_PATCH,                                             RCQUEST_BOTH,                                        RCAREA_GERUDO_VALLEY,                                      SCENE_GERUDO_VALLEY,                29441,                                             0x01, "GS Bean Patch",                               RHT_GV_GS_BEAN_PATCH,                                                                                  { Category::cSkulltula }, 0x13,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_GV_GS_SMALL_BRIDGE] =                                          Location::GSToken(RC_GV_GS_SMALL_BRIDGE,                                           RCQUEST_BOTH,                                        RCAREA_GERUDO_VALLEY,                                      SCENE_GERUDO_VALLEY,                21250,                                             0x02, "GS Small Bridge",                             RHT_GV_GS_SMALL_BRIDGE,                                                                                { Category::cSkulltula }, 0x13,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_GV_GS_PILLAR] =                                                Location::GSToken(RC_GV_GS_PILLAR,                                                 RCQUEST_BOTH,                                        RCAREA_GERUDO_VALLEY,                                      SCENE_GERUDO_VALLEY,                21252,                                             0x04, "GS Pillar",                                   RHT_GV_GS_PILLAR,                                                                                      { Category::cSkulltula }, 0x13,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_GV_GS_BEHIND_TENT] =                                           Location::GSToken(RC_GV_GS_BEHIND_TENT,                                            RCQUEST_BOTH,                                        RCAREA_GERUDO_VALLEY,                                      SCENE_GERUDO_VALLEY,                21256,                                             0x08, "GS Behind Tent",                              RHT_GV_GS_BEHIND_TENT,                                                                                 { Category::cSkulltula }, 0x13,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
     // Gerudo Fortress
-    locationTable[RC_GF_GS_ARCHERY_RANGE] =                                         Location::GSToken(RC_GF_GS_ARCHERY_RANGE,                                          RCQUEST_BOTH,                                        RCAREA_GERUDO_FORTRESS,                                    SCENE_GERUDOS_FORTRESS,             21505,                                             0x01, "GS Archery Range",                            "GF GS Archery Range",                                      RHT_GF_GS_ARCHERY_RANGE,                                                                               { Category::cSkulltula }, 0x14,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[RC_GF_GS_TOP_FLOOR] =                                             Location::GSToken(RC_GF_GS_TOP_FLOOR,                                              RCQUEST_BOTH,                                        RCAREA_GERUDO_FORTRESS,                                    SCENE_GERUDOS_FORTRESS,             21506,                                             0x02, "GS Top Floor",                                "GF GS Top Floor",                                          RHT_GF_GS_TOP_FLOOR,                                                                                   { Category::cSkulltula }, 0x14,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_GF_GS_ARCHERY_RANGE] =                                         Location::GSToken(RC_GF_GS_ARCHERY_RANGE,                                          RCQUEST_BOTH,                                        RCAREA_GERUDO_FORTRESS,                                    SCENE_GERUDOS_FORTRESS,             21505,                                             0x01, "GS Archery Range",                            RHT_GF_GS_ARCHERY_RANGE,                                                                               { Category::cSkulltula }, 0x14,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_GF_GS_TOP_FLOOR] =                                             Location::GSToken(RC_GF_GS_TOP_FLOOR,                                              RCQUEST_BOTH,                                        RCAREA_GERUDO_FORTRESS,                                    SCENE_GERUDOS_FORTRESS,             21506,                                             0x02, "GS Top Floor",                                RHT_GF_GS_TOP_FLOOR,                                                                                   { Category::cSkulltula }, 0x14,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
     // Wasteland & Desert Colossus
-    locationTable[RC_WASTELAND_GS] =                                                Location::GSToken(RC_WASTELAND_GS,                                                 RCQUEST_BOTH,                                        RCAREA_WASTELAND,                                          SCENE_HAUNTED_WASTELAND,            13570,                                             0x02, "GS",                                          "Wasteland GS",                                             RHT_WASTELAND_GS,                                                                                      { Category::cSkulltula }, 0x15,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[RC_COLOSSUS_GS_BEAN_PATCH] =                                      Location::GSToken(RC_COLOSSUS_GS_BEAN_PATCH,                                       RCQUEST_BOTH,                                        RCAREA_DESERT_COLOSSUS,                                    SCENE_DESERT_COLOSSUS,              29953,                                             0x01, "GS Bean Patch",                               "Colossus GS Bean Patch",                                   RHT_COLOSSUS_GS_BEAN_PATCH,                                                                            { Category::cSkulltula }, 0x15,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[RC_COLOSSUS_GS_HILL] =                                            Location::GSToken(RC_COLOSSUS_GS_HILL,                                             RCQUEST_BOTH,                                        RCAREA_DESERT_COLOSSUS,                                    SCENE_DESERT_COLOSSUS,              21764,                                             0x04, "GS Hill",                                     "Colossus GS Hill",                                         RHT_COLOSSUS_GS_HILL,                                                                                  { Category::cSkulltula }, 0x15,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[RC_COLOSSUS_GS_TREE] =                                            Location::GSToken(RC_COLOSSUS_GS_TREE,                                             RCQUEST_BOTH,                                        RCAREA_DESERT_COLOSSUS,                                    SCENE_DESERT_COLOSSUS,              21768,                                             0x08, "GS Tree",                                     "Colossus GS Tree",                                         RHT_COLOSSUS_GS_TREE,                                                                                  { Category::cSkulltula }, 0x15,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_WASTELAND_GS] =                                                Location::GSToken(RC_WASTELAND_GS,                                                 RCQUEST_BOTH,                                        RCAREA_WASTELAND,                                          SCENE_HAUNTED_WASTELAND,            13570,                                             0x02, "GS",                                          RHT_WASTELAND_GS,                                                                                      { Category::cSkulltula }, 0x15,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_COLOSSUS_GS_BEAN_PATCH] =                                      Location::GSToken(RC_COLOSSUS_GS_BEAN_PATCH,                                       RCQUEST_BOTH,                                        RCAREA_DESERT_COLOSSUS,                                    SCENE_DESERT_COLOSSUS,              29953,                                             0x01, "GS Bean Patch",                               RHT_COLOSSUS_GS_BEAN_PATCH,                                                                            { Category::cSkulltula }, 0x15,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_COLOSSUS_GS_HILL] =                                            Location::GSToken(RC_COLOSSUS_GS_HILL,                                             RCQUEST_BOTH,                                        RCAREA_DESERT_COLOSSUS,                                    SCENE_DESERT_COLOSSUS,              21764,                                             0x04, "GS Hill",                                     RHT_COLOSSUS_GS_HILL,                                                                                  { Category::cSkulltula }, 0x15,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_COLOSSUS_GS_TREE] =                                            Location::GSToken(RC_COLOSSUS_GS_TREE,                                             RCQUEST_BOTH,                                        RCAREA_DESERT_COLOSSUS,                                    SCENE_DESERT_COLOSSUS,              21768,                                             0x08, "GS Tree",                                     RHT_COLOSSUS_GS_TREE,                                                                                  { Category::cSkulltula }, 0x15,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
     // Hyrule Castle, Market, and Outside Ganon's Castle
-    locationTable[RC_OGC_GS] =                                                      Location::GSToken(RC_OGC_GS,                                                       RCQUEST_BOTH,                                        RCAREA_HYRULE_CASTLE,                                      SCENE_OUTSIDE_GANONS_CASTLE,        11777,                                             0x01, "OGC GS",                                      "OGC GS",                                                   RHT_OGC_GS,                                                                                            { Category::cSkulltula }, 0x0E,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_HC_GS_STORMS_GROTTO] =                                         Location::GSToken(RC_HC_GS_STORMS_GROTTO,                                          RCQUEST_BOTH,                                        RCAREA_HYRULE_CASTLE,                                      SCENE_GROTTOS,                      11778,                                             0x02, "GS Storms Grotto",                            "HC GS Storms Grotto",                                      RHT_HC_GS_STORMS_GROTTO,                                                                               { Category::cSkulltula }, 0x0E,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_HC_GS_TREE] =                                                  Location::GSToken(RC_HC_GS_TREE,                                                   RCQUEST_BOTH,                                        RCAREA_HYRULE_CASTLE,                                      SCENE_HYRULE_CASTLE,                -29180,                                            0x04, "GS Tree",                                     "HC GS Tree",                                               RHT_HC_GS_TREE,                                                                                        { Category::cSkulltula }, 0x0E,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_GS_GUARD_HOUSE] =                                       Location::GSToken(RC_MARKET_GS_GUARD_HOUSE,                                        RCQUEST_BOTH,                                        RCAREA_MARKET,                                             SCENE_MARKET_GUARD_HOUSE,           -29176,                                            0x08, "Market GS Guard House",                       "Market GS Guard House",                                    RHT_MARKET_GS_GUARD_HOUSE,                                                                             { Category::cSkulltula }, 0x0E,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_OGC_GS] =                                                      Location::GSToken(RC_OGC_GS,                                                       RCQUEST_BOTH,                                        RCAREA_HYRULE_CASTLE,                                      SCENE_OUTSIDE_GANONS_CASTLE,        11777,                                             0x01, "OGC GS",                                      RHT_OGC_GS,                                                                                            { Category::cSkulltula }, 0x0E,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_HC_GS_STORMS_GROTTO] =                                         Location::GSToken(RC_HC_GS_STORMS_GROTTO,                                          RCQUEST_BOTH,                                        RCAREA_HYRULE_CASTLE,                                      SCENE_GROTTOS,                      11778,                                             0x02, "GS Storms Grotto",                            RHT_HC_GS_STORMS_GROTTO,                                                                               { Category::cSkulltula }, 0x0E,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_HC_GS_TREE] =                                                  Location::GSToken(RC_HC_GS_TREE,                                                   RCQUEST_BOTH,                                        RCAREA_HYRULE_CASTLE,                                      SCENE_HYRULE_CASTLE,                -29180,                                            0x04, "GS Tree",                                     RHT_HC_GS_TREE,                                                                                        { Category::cSkulltula }, 0x0E,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_GS_GUARD_HOUSE] =                                       Location::GSToken(RC_MARKET_GS_GUARD_HOUSE,                                        RCQUEST_BOTH,                                        RCAREA_MARKET,                                             SCENE_MARKET_GUARD_HOUSE,           -29176,                                            0x08, "Market GS Guard House",                       RHT_MARKET_GS_GUARD_HOUSE,                                                                             { Category::cSkulltula }, 0x0E,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
     // Kakariko
-    locationTable[RC_KAK_GS_HOUSE_UNDER_CONSTRUCTION] =                             Location::GSToken(RC_KAK_GS_HOUSE_UNDER_CONSTRUCTION,                              RCQUEST_BOTH,                                        RCAREA_KAKARIKO_VILLAGE,                                   SCENE_KAKARIKO_VILLAGE,             20488,                                             0x08, "GS House Under Construction",                 "Kak GS House Under Construction",                          RHT_KAK_GS_HOUSE_UNDER_CONSTRUCTION,                                                                   { Category::cSkulltula }, 0x10,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_GS_SKULLTULA_HOUSE] =                                      Location::GSToken(RC_KAK_GS_SKULLTULA_HOUSE,                                       RCQUEST_BOTH,                                        RCAREA_KAKARIKO_VILLAGE,                                   SCENE_KAKARIKO_VILLAGE,             20496,                                             0x10, "GS Skulltula House",                          "Kak GS Skulltula House",                                   RHT_KAK_GS_SKULLTULA_HOUSE,                                                                            { Category::cSkulltula }, 0x10,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_GS_GUARDS_HOUSE] =                                         Location::GSToken(RC_KAK_GS_GUARDS_HOUSE,                                          RCQUEST_BOTH,                                        RCAREA_KAKARIKO_VILLAGE,                                   SCENE_KAKARIKO_VILLAGE,             20482,                                             0x02, "GS Guards House",                             "Kak GS Guards House",                                      RHT_KAK_GS_GUARDS_HOUSE,                                                                               { Category::cSkulltula }, 0x10,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_GS_TREE] =                                                 Location::GSToken(RC_KAK_GS_TREE,                                                  RCQUEST_BOTH,                                        RCAREA_KAKARIKO_VILLAGE,                                   SCENE_KAKARIKO_VILLAGE,             -28640,                                            0x20, "GS Tree",                                     "Kak GS Tree",                                              RHT_KAK_GS_TREE,                                                                                       { Category::cSkulltula }, 0x10,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_GS_WATCHTOWER] =                                           Location::GSToken(RC_KAK_GS_WATCHTOWER,                                            RCQUEST_BOTH,                                        RCAREA_KAKARIKO_VILLAGE,                                   SCENE_KAKARIKO_VILLAGE,             20484,                                             0x04, "GS Watchtower",                               "Kak GS Watchtower",                                        RHT_KAK_GS_WATCHTOWER,                                                                                 { Category::cSkulltula }, 0x10,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_GS_ABOVE_IMPAS_HOUSE] =                                    Location::GSToken(RC_KAK_GS_ABOVE_IMPAS_HOUSE,                                     RCQUEST_BOTH,                                        RCAREA_KAKARIKO_VILLAGE,                                   SCENE_KAKARIKO_VILLAGE,             20544,                                             0x40, "GS Above Impas House",                        "Kak GS Above Impas House",                                 RHT_KAK_GS_ABOVE_IMPAS_HOUSE,                                                                          { Category::cSkulltula }, 0x10,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_GS_HOUSE_UNDER_CONSTRUCTION] =                             Location::GSToken(RC_KAK_GS_HOUSE_UNDER_CONSTRUCTION,                              RCQUEST_BOTH,                                        RCAREA_KAKARIKO_VILLAGE,                                   SCENE_KAKARIKO_VILLAGE,             20488,                                             0x08, "GS House Under Construction",                 RHT_KAK_GS_HOUSE_UNDER_CONSTRUCTION,                                                                   { Category::cSkulltula }, 0x10,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_GS_SKULLTULA_HOUSE] =                                      Location::GSToken(RC_KAK_GS_SKULLTULA_HOUSE,                                       RCQUEST_BOTH,                                        RCAREA_KAKARIKO_VILLAGE,                                   SCENE_KAKARIKO_VILLAGE,             20496,                                             0x10, "GS Skulltula House",                          RHT_KAK_GS_SKULLTULA_HOUSE,                                                                            { Category::cSkulltula }, 0x10,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_GS_GUARDS_HOUSE] =                                         Location::GSToken(RC_KAK_GS_GUARDS_HOUSE,                                          RCQUEST_BOTH,                                        RCAREA_KAKARIKO_VILLAGE,                                   SCENE_KAKARIKO_VILLAGE,             20482,                                             0x02, "GS Guards House",                             RHT_KAK_GS_GUARDS_HOUSE,                                                                               { Category::cSkulltula }, 0x10,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_GS_TREE] =                                                 Location::GSToken(RC_KAK_GS_TREE,                                                  RCQUEST_BOTH,                                        RCAREA_KAKARIKO_VILLAGE,                                   SCENE_KAKARIKO_VILLAGE,             -28640,                                            0x20, "GS Tree",                                     RHT_KAK_GS_TREE,                                                                                       { Category::cSkulltula }, 0x10,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_GS_WATCHTOWER] =                                           Location::GSToken(RC_KAK_GS_WATCHTOWER,                                            RCQUEST_BOTH,                                        RCAREA_KAKARIKO_VILLAGE,                                   SCENE_KAKARIKO_VILLAGE,             20484,                                             0x04, "GS Watchtower",                               RHT_KAK_GS_WATCHTOWER,                                                                                 { Category::cSkulltula }, 0x10,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_GS_ABOVE_IMPAS_HOUSE] =                                    Location::GSToken(RC_KAK_GS_ABOVE_IMPAS_HOUSE,                                     RCQUEST_BOTH,                                        RCAREA_KAKARIKO_VILLAGE,                                   SCENE_KAKARIKO_VILLAGE,             20544,                                             0x40, "GS Above Impas House",                        RHT_KAK_GS_ABOVE_IMPAS_HOUSE,                                                                          { Category::cSkulltula }, 0x10,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
     // Graveyard
-    locationTable[RC_GRAVEYARD_GS_WALL] =                                           Location::GSToken(RC_GRAVEYARD_GS_WALL,                                            RCQUEST_BOTH,                                        RCAREA_GRAVEYARD,                                          SCENE_GRAVEYARD,                    20608,                                             0x80, "GS Wall",                                     "Graveyard GS Wall",                                        RHT_GRAVEYARD_GS_WALL,                                                                                 { Category::cSkulltula }, 0x10,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_GRAVEYARD_GS_BEAN_PATCH] =                                     Location::GSToken(RC_GRAVEYARD_GS_BEAN_PATCH,                                      RCQUEST_BOTH,                                        RCAREA_GRAVEYARD,                                          SCENE_GRAVEYARD,                    28673,                                             0x01, "GS Bean Patch",                               "Graveyard GS Bean Patch",                                  RHT_GRAVEYARD_GS_BEAN_PATCH,                                                                           { Category::cSkulltula }, 0x10,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_GRAVEYARD_GS_WALL] =                                           Location::GSToken(RC_GRAVEYARD_GS_WALL,                                            RCQUEST_BOTH,                                        RCAREA_GRAVEYARD,                                          SCENE_GRAVEYARD,                    20608,                                             0x80, "GS Wall",                                     RHT_GRAVEYARD_GS_WALL,                                                                                 { Category::cSkulltula }, 0x10,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_GRAVEYARD_GS_BEAN_PATCH] =                                     Location::GSToken(RC_GRAVEYARD_GS_BEAN_PATCH,                                      RCQUEST_BOTH,                                        RCAREA_GRAVEYARD,                                          SCENE_GRAVEYARD,                    28673,                                             0x01, "GS Bean Patch",                               RHT_GRAVEYARD_GS_BEAN_PATCH,                                                                           { Category::cSkulltula }, 0x10,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
     // Death Mountain
-    locationTable[RC_DMC_GS_BEAN_PATCH] =                                           Location::GSToken(RC_DMC_GS_BEAN_PATCH,                                            RCQUEST_BOTH,                                        RCAREA_DEATH_MOUNTAIN_CRATER,                              SCENE_DEATH_MOUNTAIN_CRATER,        28417,                                             0x01, "GS Bean Patch",                               "DMC GS Bean Patch",                                        RHT_DMC_GS_BEAN_PATCH,                                                                                 { Category::cSkulltula }, 0x0F,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMC_GS_CRATE] =                                                Location::GSToken(RC_DMC_GS_CRATE,                                                 RCQUEST_BOTH,                                        RCAREA_DEATH_MOUNTAIN_CRATER,                              SCENE_DEATH_MOUNTAIN_CRATER,        -28800,                                            0x80, "GS Crate",                                    "DMC GS Crate",                                             RHT_DMC_GS_CRATE,                                                                                      { Category::cSkulltula }, 0x0F,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMT_GS_BEAN_PATCH] =                                           Location::GSToken(RC_DMT_GS_BEAN_PATCH,                                            RCQUEST_BOTH,                                        RCAREA_DEATH_MOUNTAIN_TRAIL,                               SCENE_DEATH_MOUNTAIN_TRAIL,         28418,                                             0x02, "GS Bean Patch",                               "DMT GS Bean Patch",                                        RHT_DMT_GS_BEAN_PATCH,                                                                                 { Category::cSkulltula }, 0x0F,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMT_GS_NEAR_KAK] =                                             Location::GSToken(RC_DMT_GS_NEAR_KAK,                                              RCQUEST_BOTH,                                        RCAREA_DEATH_MOUNTAIN_TRAIL,                               SCENE_DEATH_MOUNTAIN_TRAIL,         12036,                                             0x04, "GS Near Kak",                                 "DMT GS Near Kak",                                          RHT_DMT_GS_NEAR_KAK,                                                                                   { Category::cSkulltula }, 0x0F,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMT_GS_ABOVE_DODONGOS_CAVERN] =                                Location::GSToken(RC_DMT_GS_ABOVE_DODONGOS_CAVERN,                                 RCQUEST_BOTH,                                        RCAREA_DEATH_MOUNTAIN_TRAIL,                               SCENE_DEATH_MOUNTAIN_TRAIL,         20232,                                             0x08, "GS Above Dodongos Cavern",                    "DMT GS Above Dodongos Cavern",                             RHT_DMT_GS_ABOVE_DODONGOS_CAVERN,                                                                      { Category::cSkulltula }, 0x0F,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMT_GS_FALLING_ROCKS_PATH] =                                   Location::GSToken(RC_DMT_GS_FALLING_ROCKS_PATH,                                    RCQUEST_BOTH,                                        RCAREA_DEATH_MOUNTAIN_TRAIL,                               SCENE_DEATH_MOUNTAIN_TRAIL,         20240,                                             0x10, "GS Falling Rocks Path",                       "DMT GS Falling Rocks Path",                                RHT_DMT_GS_FALLING_ROCKS_PATH,                                                                         { Category::cSkulltula }, 0x0F,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_GC_GS_CENTER_PLATFORM] =                                       Location::GSToken(RC_GC_GS_CENTER_PLATFORM,                                        RCQUEST_BOTH,                                        RCAREA_GORON_CITY,                                         SCENE_GORON_CITY,                   12064,                                             0x20, "GS Center Platform",                          "GC GS Center Platform",                                    RHT_GC_GS_CENTER_PLATFORM,                                                                             { Category::cSkulltula }, 0x0F,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_GS_BOULDER_MAZE] =                                          Location::GSToken(RC_GC_GS_BOULDER_MAZE,                                           RCQUEST_BOTH,                                        RCAREA_GORON_CITY,                                         SCENE_GORON_CITY,                   -28864,                                            0x40, "GS Boulder Maze",                             "GC GS Boulder Maze",                                       RHT_GC_GS_BOULDER_MAZE,                                                                                { Category::cSkulltula }, 0x0F,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_DMC_GS_BEAN_PATCH] =                                           Location::GSToken(RC_DMC_GS_BEAN_PATCH,                                            RCQUEST_BOTH,                                        RCAREA_DEATH_MOUNTAIN_CRATER,                              SCENE_DEATH_MOUNTAIN_CRATER,        28417,                                             0x01, "GS Bean Patch",                               RHT_DMC_GS_BEAN_PATCH,                                                                                 { Category::cSkulltula }, 0x0F,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMC_GS_CRATE] =                                                Location::GSToken(RC_DMC_GS_CRATE,                                                 RCQUEST_BOTH,                                        RCAREA_DEATH_MOUNTAIN_CRATER,                              SCENE_DEATH_MOUNTAIN_CRATER,        -28800,                                            0x80, "GS Crate",                                    RHT_DMC_GS_CRATE,                                                                                      { Category::cSkulltula }, 0x0F,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMT_GS_BEAN_PATCH] =                                           Location::GSToken(RC_DMT_GS_BEAN_PATCH,                                            RCQUEST_BOTH,                                        RCAREA_DEATH_MOUNTAIN_TRAIL,                               SCENE_DEATH_MOUNTAIN_TRAIL,         28418,                                             0x02, "GS Bean Patch",                               RHT_DMT_GS_BEAN_PATCH,                                                                                 { Category::cSkulltula }, 0x0F,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMT_GS_NEAR_KAK] =                                             Location::GSToken(RC_DMT_GS_NEAR_KAK,                                              RCQUEST_BOTH,                                        RCAREA_DEATH_MOUNTAIN_TRAIL,                               SCENE_DEATH_MOUNTAIN_TRAIL,         12036,                                             0x04, "GS Near Kak",                                 RHT_DMT_GS_NEAR_KAK,                                                                                   { Category::cSkulltula }, 0x0F,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMT_GS_ABOVE_DODONGOS_CAVERN] =                                Location::GSToken(RC_DMT_GS_ABOVE_DODONGOS_CAVERN,                                 RCQUEST_BOTH,                                        RCAREA_DEATH_MOUNTAIN_TRAIL,                               SCENE_DEATH_MOUNTAIN_TRAIL,         20232,                                             0x08, "GS Above Dodongos Cavern",                    RHT_DMT_GS_ABOVE_DODONGOS_CAVERN,                                                                      { Category::cSkulltula }, 0x0F,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMT_GS_FALLING_ROCKS_PATH] =                                   Location::GSToken(RC_DMT_GS_FALLING_ROCKS_PATH,                                    RCQUEST_BOTH,                                        RCAREA_DEATH_MOUNTAIN_TRAIL,                               SCENE_DEATH_MOUNTAIN_TRAIL,         20240,                                             0x10, "GS Falling Rocks Path",                       RHT_DMT_GS_FALLING_ROCKS_PATH,                                                                         { Category::cSkulltula }, 0x0F,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_GC_GS_CENTER_PLATFORM] =                                       Location::GSToken(RC_GC_GS_CENTER_PLATFORM,                                        RCQUEST_BOTH,                                        RCAREA_GORON_CITY,                                         SCENE_GORON_CITY,                   12064,                                             0x20, "GS Center Platform",                          RHT_GC_GS_CENTER_PLATFORM,                                                                             { Category::cSkulltula }, 0x0F,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_GS_BOULDER_MAZE] =                                          Location::GSToken(RC_GC_GS_BOULDER_MAZE,                                           RCQUEST_BOTH,                                        RCAREA_GORON_CITY,                                         SCENE_GORON_CITY,                   -28864,                                            0x40, "GS Boulder Maze",                             RHT_GC_GS_BOULDER_MAZE,                                                                                { Category::cSkulltula }, 0x0F,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
     // Zora's River, Domain, and Fountain
-    locationTable[RC_ZR_GS_LADDER] =                                                Location::GSToken(RC_ZR_GS_LADDER,                                                 RCQUEST_BOTH,                                        RCAREA_ZORAS_RIVER,                                        SCENE_ZORAS_RIVER,                  20737,                                             0x01, "GS Ladder",                                   "ZR GS Ladder",                                             RHT_ZR_GS_LADDER,                                                                                      { Category::cSkulltula }, 0x11,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZR_GS_TREE] =                                                  Location::GSToken(RC_ZR_GS_TREE,                                                   RCQUEST_BOTH,                                        RCAREA_ZORAS_RIVER,                                        SCENE_ZORAS_RIVER,                  -28414,                                            0x02, "GS Tree",                                     "ZR GS Tree",                                               RHT_ZR_GS_TREE,                                                                                        { Category::cSkulltula }, 0x11,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZR_GS_ABOVE_BRIDGE] =                                          Location::GSToken(RC_ZR_GS_ABOVE_BRIDGE,                                           RCQUEST_BOTH,                                        RCAREA_ZORAS_RIVER,                                        SCENE_ZORAS_RIVER,                  20744,                                             0x08, "GS Above Bridge",                             "ZR GS Above Bridge",                                       RHT_ZR_GS_ABOVE_BRIDGE,                                                                                { Category::cSkulltula }, 0x11,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZR_GS_NEAR_RAISED_GROTTOS] =                                   Location::GSToken(RC_ZR_GS_NEAR_RAISED_GROTTOS,                                    RCQUEST_BOTH,                                        RCAREA_ZORAS_RIVER,                                        SCENE_ZORAS_RIVER,                  20752,                                             0x10, "GS Near Raised Grottos",                      "ZR GS Near Raised Grottos",                                RHT_ZR_GS_NEAR_RAISED_GROTTOS,                                                                         { Category::cSkulltula }, 0x11,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZD_GS_FROZEN_WATERFALL] =                                      Location::GSToken(RC_ZD_GS_FROZEN_WATERFALL,                                       RCQUEST_BOTH,                                        RCAREA_ZORAS_DOMAIN,                                       SCENE_ZORAS_DOMAIN,                 20800,                                             0x40, "GS Frozen Waterfall",                         "ZD GS Frozen Waterfall",                                   RHT_ZD_GS_FROZEN_WATERFALL,                                                                            { Category::cSkulltula }, 0x11,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZF_GS_ABOVE_THE_LOG] =                                         Location::GSToken(RC_ZF_GS_ABOVE_THE_LOG,                                          RCQUEST_BOTH,                                        RCAREA_ZORAS_FOUNTAIN,                                     SCENE_ZORAS_FOUNTAIN,               20740,                                             0x04, "GS Above The Log",                            "ZF GS Above The Log",                                      RHT_ZF_GS_ABOVE_THE_LOG,                                                                               { Category::cSkulltula }, 0x11,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZF_GS_HIDDEN_CAVE] =                                           Location::GSToken(RC_ZF_GS_HIDDEN_CAVE,                                            RCQUEST_BOTH,                                        RCAREA_ZORAS_FOUNTAIN,                                     SCENE_ZORAS_FOUNTAIN,               20768,                                             0x20, "GS Hidden Cave",                              "ZF GS Hidden Cave",                                        RHT_ZF_GS_HIDDEN_CAVE,                                                                                 { Category::cSkulltula }, 0x11,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZF_GS_TREE] =                                                  Location::GSToken(RC_ZF_GS_TREE,                                                   RCQUEST_BOTH,                                        RCAREA_ZORAS_FOUNTAIN,                                     SCENE_ZORAS_FOUNTAIN,               -28288,                                            0x80, "GS Tree",                                     "ZF GS Tree",                                               RHT_ZF_GS_TREE,                                                                                        { Category::cSkulltula }, 0x11,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZR_GS_LADDER] =                                                Location::GSToken(RC_ZR_GS_LADDER,                                                 RCQUEST_BOTH,                                        RCAREA_ZORAS_RIVER,                                        SCENE_ZORAS_RIVER,                  20737,                                             0x01, "GS Ladder",                                   RHT_ZR_GS_LADDER,                                                                                      { Category::cSkulltula }, 0x11,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZR_GS_TREE] =                                                  Location::GSToken(RC_ZR_GS_TREE,                                                   RCQUEST_BOTH,                                        RCAREA_ZORAS_RIVER,                                        SCENE_ZORAS_RIVER,                  -28414,                                            0x02, "GS Tree",                                     RHT_ZR_GS_TREE,                                                                                        { Category::cSkulltula }, 0x11,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZR_GS_ABOVE_BRIDGE] =                                          Location::GSToken(RC_ZR_GS_ABOVE_BRIDGE,                                           RCQUEST_BOTH,                                        RCAREA_ZORAS_RIVER,                                        SCENE_ZORAS_RIVER,                  20744,                                             0x08, "GS Above Bridge",                             RHT_ZR_GS_ABOVE_BRIDGE,                                                                                { Category::cSkulltula }, 0x11,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZR_GS_NEAR_RAISED_GROTTOS] =                                   Location::GSToken(RC_ZR_GS_NEAR_RAISED_GROTTOS,                                    RCQUEST_BOTH,                                        RCAREA_ZORAS_RIVER,                                        SCENE_ZORAS_RIVER,                  20752,                                             0x10, "GS Near Raised Grottos",                      RHT_ZR_GS_NEAR_RAISED_GROTTOS,                                                                         { Category::cSkulltula }, 0x11,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZD_GS_FROZEN_WATERFALL] =                                      Location::GSToken(RC_ZD_GS_FROZEN_WATERFALL,                                       RCQUEST_BOTH,                                        RCAREA_ZORAS_DOMAIN,                                       SCENE_ZORAS_DOMAIN,                 20800,                                             0x40, "GS Frozen Waterfall",                         RHT_ZD_GS_FROZEN_WATERFALL,                                                                            { Category::cSkulltula }, 0x11,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZF_GS_ABOVE_THE_LOG] =                                         Location::GSToken(RC_ZF_GS_ABOVE_THE_LOG,                                          RCQUEST_BOTH,                                        RCAREA_ZORAS_FOUNTAIN,                                     SCENE_ZORAS_FOUNTAIN,               20740,                                             0x04, "GS Above The Log",                            RHT_ZF_GS_ABOVE_THE_LOG,                                                                               { Category::cSkulltula }, 0x11,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZF_GS_HIDDEN_CAVE] =                                           Location::GSToken(RC_ZF_GS_HIDDEN_CAVE,                                            RCQUEST_BOTH,                                        RCAREA_ZORAS_FOUNTAIN,                                     SCENE_ZORAS_FOUNTAIN,               20768,                                             0x20, "GS Hidden Cave",                              RHT_ZF_GS_HIDDEN_CAVE,                                                                                 { Category::cSkulltula }, 0x11,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZF_GS_TREE] =                                                  Location::GSToken(RC_ZF_GS_TREE,                                                   RCQUEST_BOTH,                                        RCAREA_ZORAS_FOUNTAIN,                                     SCENE_ZORAS_FOUNTAIN,               -28288,                                            0x80, "GS Tree",                                     RHT_ZF_GS_TREE,                                                                                        { Category::cSkulltula }, 0x11,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
     // Lon Lon Ranch
-    locationTable[RC_LLR_GS_BACK_WALL] =                                            Location::GSToken(RC_LLR_GS_BACK_WALL,                                             RCQUEST_BOTH,                                        RCAREA_LON_LON_RANCH,                                      SCENE_LON_LON_RANCH,                11009,                                             0x01, "GS Back Wall",                                "LLR GS Back Wall",                                         RHT_LLR_GS_BACK_WALL,                                                                                  { Category::cSkulltula }, 0x0B,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
-    locationTable[RC_LLR_GS_RAIN_SHED] =                                            Location::GSToken(RC_LLR_GS_RAIN_SHED,                                             RCQUEST_BOTH,                                        RCAREA_LON_LON_RANCH,                                      SCENE_LON_LON_RANCH,                11010,                                             0x02, "GS Rain Shed",                                "LLR GS Rain Shed",                                         RHT_LLR_GS_RAIN_SHED,                                                                                  { Category::cSkulltula }, 0x0B,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
-    locationTable[RC_LLR_GS_HOUSE_WINDOW] =                                         Location::GSToken(RC_LLR_GS_HOUSE_WINDOW,                                          RCQUEST_BOTH,                                        RCAREA_LON_LON_RANCH,                                      SCENE_LON_LON_RANCH,                11012,                                             0x04, "GS House Window",                             "LLR GS House Window",                                      RHT_LLR_GS_HOUSE_WINDOW,                                                                               { Category::cSkulltula }, 0x0B,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
-    locationTable[RC_LLR_GS_TREE] =                                                 Location::GSToken(RC_LLR_GS_TREE,                                                  RCQUEST_BOTH,                                        RCAREA_LON_LON_RANCH,                                      SCENE_LON_LON_RANCH,                -29944,                                            0x08, "GS Tree",                                     "LLR GS Tree",                                              RHT_LLR_GS_TREE,                                                                                       { Category::cSkulltula }, 0x0B,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
+    locationTable[RC_LLR_GS_BACK_WALL] =                                            Location::GSToken(RC_LLR_GS_BACK_WALL,                                             RCQUEST_BOTH,                                        RCAREA_LON_LON_RANCH,                                      SCENE_LON_LON_RANCH,                11009,                                             0x01, "GS Back Wall",                                RHT_LLR_GS_BACK_WALL,                                                                                  { Category::cSkulltula }, 0x0B,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
+    locationTable[RC_LLR_GS_RAIN_SHED] =                                            Location::GSToken(RC_LLR_GS_RAIN_SHED,                                             RCQUEST_BOTH,                                        RCAREA_LON_LON_RANCH,                                      SCENE_LON_LON_RANCH,                11010,                                             0x02, "GS Rain Shed",                                RHT_LLR_GS_RAIN_SHED,                                                                                  { Category::cSkulltula }, 0x0B,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
+    locationTable[RC_LLR_GS_HOUSE_WINDOW] =                                         Location::GSToken(RC_LLR_GS_HOUSE_WINDOW,                                          RCQUEST_BOTH,                                        RCAREA_LON_LON_RANCH,                                      SCENE_LON_LON_RANCH,                11012,                                             0x04, "GS House Window",                             RHT_LLR_GS_HOUSE_WINDOW,                                                                               { Category::cSkulltula }, 0x0B,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
+    locationTable[RC_LLR_GS_TREE] =                                                 Location::GSToken(RC_LLR_GS_TREE,                                                  RCQUEST_BOTH,                                        RCAREA_LON_LON_RANCH,                                      SCENE_LON_LON_RANCH,                -29944,                                            0x08, "GS Tree",                                     RHT_LLR_GS_TREE,                                                                                       { Category::cSkulltula }, 0x0B,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
 
     // Bosses
-    locationTable[RC_LINKS_POCKET] =                                                 Location::Reward(RC_LINKS_POCKET,                                                 RCQUEST_BOTH,    RCTYPE_LINKS_POCKET,                RCAREA_KOKIRI_FOREST,                ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x00, "Link's Pocket",                               "Link's Pocket",                                            RHT_LINKS_POCKET,                                                RG_NONE,                              {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LINKS_POCKET),                                                                 SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST,              true);
-    locationTable[RC_QUEEN_GOHMA] =                                                  Location::Reward(RC_QUEEN_GOHMA,                                                  RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_DEKU_TREE,                    ACTOR_DOOR_WARP1,     SCENE_DEKU_TREE_BOSS,               0x00,                      DungeonId::DUNGEON_DEKU_TREE, "Queen Gohma",                                 "Queen Gohma",                                              RHT_QUEEN_GOHMA,                                                 RG_KOKIRI_EMERALD,                    {},                                                     SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP),                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE,          true);
-    locationTable[RC_KING_DODONGO] =                                                 Location::Reward(RC_KING_DODONGO,                                                 RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_DODONGOS_CAVERN,              ACTOR_DOOR_WARP1,     SCENE_DODONGOS_CAVERN_BOSS,         0x00,                DungeonId::DUNGEON_DODONGOS_CAVERN, "King Dodongo",                                "King Dodongo",                                             RHT_KING_DODONGO,                                                RG_GORON_RUBY,                        {},                                                     SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP),                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN,    true);
-    locationTable[RC_BARINADE] =                                                     Location::Reward(RC_BARINADE,                                                     RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_JABU_JABUS_BELLY,             ACTOR_DOOR_WARP1,     SCENE_JABU_JABU_BOSS,               0x00,                DungeonId::DUNGEON_JABUJABUS_BELLY, "Barinade",                                    "Barinade",                                                 RHT_BARINADE,                                                    RG_ZORA_SAPPHIRE,                     {},                                                     SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP),                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY,    true);
-    locationTable[RC_PHANTOM_GANON] =                                                Location::Reward(RC_PHANTOM_GANON,                                                RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_FOREST_TEMPLE,                ACTOR_DOOR_WARP1,     SCENE_FOREST_TEMPLE_BOSS,           0x00,                  DungeonId::DUNGEON_FOREST_TEMPLE, "Phantom Ganon",                               "Phantom Ganon",                                            RHT_PHANTOM_GANON,                                               RG_FOREST_MEDALLION,                  {},                                                     SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP),                                                SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
-    locationTable[RC_VOLVAGIA] =                                                     Location::Reward(RC_VOLVAGIA,                                                     RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_FIRE_TEMPLE,                  ACTOR_DOOR_WARP1,     SCENE_FIRE_TEMPLE_BOSS,             0x00,                    DungeonId::DUNGEON_FIRE_TEMPLE, "Volvagia",                                    "Volvagia",                                                 RHT_VOLVAGIA,                                                    RG_FIRE_MEDALLION,                    {},                                                     SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP),                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
-    locationTable[RC_MORPHA] =                                                       Location::Reward(RC_MORPHA,                                                       RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_WATER_TEMPLE,                 ACTOR_DOOR_WARP1,     SCENE_WATER_TEMPLE_BOSS,            0x00,                   DungeonId::DUNGEON_WATER_TEMPLE, "Morpha",                                      "Morpha",                                                   RHT_MORPHA,                                                      RG_WATER_MEDALLION,                   {},                                                     SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP),                                                 SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
-    locationTable[RC_TWINROVA] =                                                     Location::Reward(RC_TWINROVA,                                                     RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_SPIRIT_TEMPLE,                ACTOR_DOOR_WARP1,     SCENE_SPIRIT_TEMPLE_BOSS,           0x00,                  DungeonId::DUNGEON_SPIRIT_TEMPLE, "Twinrova",                                    "Twinrova",                                                 RHT_TWINROVA,                                                    RG_SPIRIT_MEDALLION,                  {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DUNGEONS_DONE_SPIRIT_TEMPLE),                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
-    locationTable[RC_BONGO_BONGO] =                                                  Location::Reward(RC_BONGO_BONGO,                                                  RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_SHADOW_TEMPLE,                ACTOR_DOOR_WARP1,     SCENE_SHADOW_TEMPLE_BOSS,           0x00,                  DungeonId::DUNGEON_SHADOW_TEMPLE, "Bongo Bongo",                                 "Bongo Bongo",                                              RHT_BONGO_BONGO,                                                 RG_SHADOW_MEDALLION,                  {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DUNGEONS_DONE_SHADOW_TEMPLE),                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
-    locationTable[RC_GANON] =                                                        Location::Reward(RC_GANON,                                                        RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_GANONS_CASTLE,                ACTOR_DOOR_WARP1,     SCENE_GANON_BOSS,                   0x00,        DungeonId::DUNGEON_GANONS_CASTLE_CRUMBLING, "Ganon",                                       "Ganon",                                                    RHT_NONE,                                                        RG_TRIFORCE,                          {},                                                     SpoilerCollectionCheck::None(),                                                                                               SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GIFT_FROM_SAGES] =                                              Location::Reward(RC_GIFT_FROM_SAGES,                                              RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x00, "Gift from Raoru",                             "Gift from Raoru",                                          RHT_NONE,                                                        RG_LIGHT_MEDALLION,                   {},                                                     SpoilerCollectionCheck::EventChkInf(0xC9),                                                                                    SpoilerCollectionCheckGroup::GROUP_NO_GROUP,                   true);
+    locationTable[RC_LINKS_POCKET] =                                                 Location::Reward(RC_LINKS_POCKET,                                                 RCQUEST_BOTH,    RCTYPE_LINKS_POCKET,                RCAREA_KOKIRI_FOREST,                ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x00, "Link's Pocket",   "Link's Pocket",            RHT_LINKS_POCKET,                                                RG_NONE,                              {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LINKS_POCKET),                                                                 SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST,              true);
+    locationTable[RC_QUEEN_GOHMA] =                                                  Location::Reward(RC_QUEEN_GOHMA,                                                  RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_DEKU_TREE,                    ACTOR_DOOR_WARP1,     SCENE_DEKU_TREE_BOSS,               0x00,                      DungeonId::DUNGEON_DEKU_TREE, "Queen Gohma",     "Queen Gohma",              RHT_QUEEN_GOHMA,                                                 RG_KOKIRI_EMERALD,                    {},                                                     SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP),                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE,          true);
+    locationTable[RC_KING_DODONGO] =                                                 Location::Reward(RC_KING_DODONGO,                                                 RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_DODONGOS_CAVERN,              ACTOR_DOOR_WARP1,     SCENE_DODONGOS_CAVERN_BOSS,         0x00,                DungeonId::DUNGEON_DODONGOS_CAVERN, "King Dodongo",    "King Dodongo",             RHT_KING_DODONGO,                                                RG_GORON_RUBY,                        {},                                                     SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP),                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN,    true);
+    locationTable[RC_BARINADE] =                                                     Location::Reward(RC_BARINADE,                                                     RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_JABU_JABUS_BELLY,             ACTOR_DOOR_WARP1,     SCENE_JABU_JABU_BOSS,               0x00,                DungeonId::DUNGEON_JABUJABUS_BELLY, "Barinade",        "Barinade",                 RHT_BARINADE,                                                    RG_ZORA_SAPPHIRE,                     {},                                                     SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP),                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY,    true);
+    locationTable[RC_PHANTOM_GANON] =                                                Location::Reward(RC_PHANTOM_GANON,                                                RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_FOREST_TEMPLE,                ACTOR_DOOR_WARP1,     SCENE_FOREST_TEMPLE_BOSS,           0x00,                  DungeonId::DUNGEON_FOREST_TEMPLE, "Phantom Ganon",   "Phantom Ganon",            RHT_PHANTOM_GANON,                                               RG_FOREST_MEDALLION,                  {},                                                     SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP),                                                SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
+    locationTable[RC_VOLVAGIA] =                                                     Location::Reward(RC_VOLVAGIA,                                                     RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_FIRE_TEMPLE,                  ACTOR_DOOR_WARP1,     SCENE_FIRE_TEMPLE_BOSS,             0x00,                    DungeonId::DUNGEON_FIRE_TEMPLE, "Volvagia",        "Volvagia",                 RHT_VOLVAGIA,                                                    RG_FIRE_MEDALLION,                    {},                                                     SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP),                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_MORPHA] =                                                       Location::Reward(RC_MORPHA,                                                       RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_WATER_TEMPLE,                 ACTOR_DOOR_WARP1,     SCENE_WATER_TEMPLE_BOSS,            0x00,                   DungeonId::DUNGEON_WATER_TEMPLE, "Morpha",          "Morpha",                   RHT_MORPHA,                                                      RG_WATER_MEDALLION,                   {},                                                     SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP),                                                 SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
+    locationTable[RC_TWINROVA] =                                                     Location::Reward(RC_TWINROVA,                                                     RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_SPIRIT_TEMPLE,                ACTOR_DOOR_WARP1,     SCENE_SPIRIT_TEMPLE_BOSS,           0x00,                  DungeonId::DUNGEON_SPIRIT_TEMPLE, "Twinrova",        "Twinrova",                 RHT_TWINROVA,                                                    RG_SPIRIT_MEDALLION,                  {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DUNGEONS_DONE_SPIRIT_TEMPLE),                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_BONGO_BONGO] =                                                  Location::Reward(RC_BONGO_BONGO,                                                  RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_SHADOW_TEMPLE,                ACTOR_DOOR_WARP1,     SCENE_SHADOW_TEMPLE_BOSS,           0x00,                  DungeonId::DUNGEON_SHADOW_TEMPLE, "Bongo Bongo",     "Bongo Bongo",              RHT_BONGO_BONGO,                                                 RG_SHADOW_MEDALLION,                  {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DUNGEONS_DONE_SHADOW_TEMPLE),                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
+    locationTable[RC_GANON] =                                                        Location::Reward(RC_GANON,                                                        RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_GANONS_CASTLE,                ACTOR_DOOR_WARP1,     SCENE_GANON_BOSS,                   0x00,        DungeonId::DUNGEON_GANONS_CASTLE_CRUMBLING, "Ganon",           "Ganon",                    RHT_NONE,                                                        RG_TRIFORCE,                          {},                                                     SpoilerCollectionCheck::None(),                                                                                               SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GIFT_FROM_SAGES] =                                              Location::Reward(RC_GIFT_FROM_SAGES,                                              RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x00, "Gift from Raoru", "Gift from Raoru",          RHT_NONE,                                                        RG_LIGHT_MEDALLION,                   {},                                                     SpoilerCollectionCheck::EventChkInf(0xC9),                                                                                    SpoilerCollectionCheckGroup::GROUP_NO_GROUP,                   true);
 
     // Heart Containers
-    locationTable[RC_DEKU_TREE_QUEEN_GOHMA_HEART] =                                    Location::Base(RC_DEKU_TREE_QUEEN_GOHMA_HEART,                                  RCQUEST_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_DEKU_TREE,                    ACTOR_ITEM_B_HEART,   SCENE_DEKU_TREE_BOSS,               0x00,                                              0x4F, "Queen Gohma Heart Container",                 "Deku Tree Queen Gohma Heart Container",                    RHT_DEKU_TREE_QUEEN_GOHMA_HEART,                                 RG_HEART_CONTAINER,                   { Category::cSongDungeonReward },                       SpoilerCollectionCheck::Collectable(0x11, 0x1F),                                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE,          true);
-    locationTable[RC_DODONGOS_CAVERN_KING_DODONGO_HEART] =                             Location::Base(RC_DODONGOS_CAVERN_KING_DODONGO_HEART,                           RCQUEST_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_DODONGOS_CAVERN,              ACTOR_ITEM_B_HEART,   SCENE_DODONGOS_CAVERN_BOSS,         0x00,                                              0x4F, "King Dodongo Heart Container",                "Dodongos Cavern King Dodongo Heart Container",             RHT_DODONGOS_CAVERN_KING_DODONGO_HEART,                          RG_HEART_CONTAINER,                   { Category::cSongDungeonReward },                       SpoilerCollectionCheck::Collectable(0x12, 0x1F),                                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN,    true);
-    locationTable[RC_JABU_JABUS_BELLY_BARINADE_HEART] =                                Location::Base(RC_JABU_JABUS_BELLY_BARINADE_HEART,                              RCQUEST_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_JABU_JABUS_BELLY,             ACTOR_ITEM_B_HEART,   SCENE_JABU_JABU_BOSS,               0x00,                                              0x4F, "Barinade Heart Container",                    "Jabu Jabus Belly Barinade Heart Container",                RHT_JABU_JABUS_BELLY_BARINADE_HEART,                             RG_HEART_CONTAINER,                   { Category::cSongDungeonReward },                       SpoilerCollectionCheck::Collectable(0x13, 0x1F),                                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY,    true);
-    locationTable[RC_FOREST_TEMPLE_PHANTOM_GANON_HEART] =                              Location::Base(RC_FOREST_TEMPLE_PHANTOM_GANON_HEART,                            RCQUEST_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_FOREST_TEMPLE,                ACTOR_ITEM_B_HEART,   SCENE_FOREST_TEMPLE_BOSS,           0x00,                                              0x4F, "Phantom Ganon Heart Container",               "Forest Temple Phantom Ganon Heart Container",              RHT_FOREST_TEMPLE_PHANTOM_GANON_HEART,                           RG_HEART_CONTAINER,                   { Category::cSongDungeonReward },                       SpoilerCollectionCheck::Collectable(0x14, 0x1F),                                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
-    locationTable[RC_FIRE_TEMPLE_VOLVAGIA_HEART] =                                     Location::Base(RC_FIRE_TEMPLE_VOLVAGIA_HEART,                                   RCQUEST_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_FIRE_TEMPLE,                  ACTOR_ITEM_B_HEART,   SCENE_FIRE_TEMPLE_BOSS,             0x00,                                              0x4F, "Volvagia Heart Container",                    "Fire Temple Volvagia Heart Container",                     RHT_FIRE_TEMPLE_VOLVAGIA_HEART,                                  RG_HEART_CONTAINER,                   { Category::cSongDungeonReward },                       SpoilerCollectionCheck::Collectable(0x15, 0x1F),                                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
-    locationTable[RC_WATER_TEMPLE_MORPHA_HEART] =                                      Location::Base(RC_WATER_TEMPLE_MORPHA_HEART,                                    RCQUEST_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_WATER_TEMPLE,                 ACTOR_ITEM_B_HEART,   SCENE_WATER_TEMPLE_BOSS,            0x00,                                              0x4F, "Morpha Heart Container",                      "Water Temple Morpha Heart Container",                      RHT_WATER_TEMPLE_MORPHA_HEART,                                   RG_HEART_CONTAINER,                   { Category::cSongDungeonReward },                       SpoilerCollectionCheck::Collectable(0x16, 0x1F),                                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
-    locationTable[RC_SPIRIT_TEMPLE_TWINROVA_HEART] =                                   Location::Base(RC_SPIRIT_TEMPLE_TWINROVA_HEART,                                 RCQUEST_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_SPIRIT_TEMPLE,                ACTOR_ITEM_B_HEART,   SCENE_SPIRIT_TEMPLE_BOSS,           0x00,                                              0x4F, "Twinrova Heart Container",                    "Spirit Temple Twinrova Heart Container",                   RHT_SPIRIT_TEMPLE_TWINROVA_HEART,                                RG_HEART_CONTAINER,                   { Category::cSongDungeonReward },                       SpoilerCollectionCheck::Collectable(0x17, 0x1F),                                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
-    locationTable[RC_SHADOW_TEMPLE_BONGO_BONGO_HEART] =                                Location::Base(RC_SHADOW_TEMPLE_BONGO_BONGO_HEART,                              RCQUEST_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_SHADOW_TEMPLE,                ACTOR_ITEM_B_HEART,   SCENE_SHADOW_TEMPLE_BOSS,           0x00,                                              0x4F, "Bongo Bongo Heart Container",                 "Shadow Temple Bongo Bongo Heart Container",                RHT_SHADOW_TEMPLE_BONGO_BONGO_HEART,                             RG_HEART_CONTAINER,                   { Category::cSongDungeonReward },                       SpoilerCollectionCheck::Collectable(0x18, 0x1F),                                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
+    locationTable[RC_DEKU_TREE_QUEEN_GOHMA_HEART] =                                    Location::Base(RC_DEKU_TREE_QUEEN_GOHMA_HEART,                                  RCQUEST_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_DEKU_TREE,                    ACTOR_ITEM_B_HEART,   SCENE_DEKU_TREE_BOSS,               0x00,                                              0x4F, "Queen Gohma Heart Container",                 RHT_DEKU_TREE_QUEEN_GOHMA_HEART,                                 RG_HEART_CONTAINER,                   { Category::cSongDungeonReward },                       SpoilerCollectionCheck::Collectable(0x11, 0x1F),                                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE,          true);
+    locationTable[RC_DODONGOS_CAVERN_KING_DODONGO_HEART] =                             Location::Base(RC_DODONGOS_CAVERN_KING_DODONGO_HEART,                           RCQUEST_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_DODONGOS_CAVERN,              ACTOR_ITEM_B_HEART,   SCENE_DODONGOS_CAVERN_BOSS,         0x00,                                              0x4F, "King Dodongo Heart Container",                RHT_DODONGOS_CAVERN_KING_DODONGO_HEART,                          RG_HEART_CONTAINER,                   { Category::cSongDungeonReward },                       SpoilerCollectionCheck::Collectable(0x12, 0x1F),                                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN,    true);
+    locationTable[RC_JABU_JABUS_BELLY_BARINADE_HEART] =                                Location::Base(RC_JABU_JABUS_BELLY_BARINADE_HEART,                              RCQUEST_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_JABU_JABUS_BELLY,             ACTOR_ITEM_B_HEART,   SCENE_JABU_JABU_BOSS,               0x00,                                              0x4F, "Barinade Heart Container",                    RHT_JABU_JABUS_BELLY_BARINADE_HEART,                             RG_HEART_CONTAINER,                   { Category::cSongDungeonReward },                       SpoilerCollectionCheck::Collectable(0x13, 0x1F),                                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY,    true);
+    locationTable[RC_FOREST_TEMPLE_PHANTOM_GANON_HEART] =                              Location::Base(RC_FOREST_TEMPLE_PHANTOM_GANON_HEART,                            RCQUEST_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_FOREST_TEMPLE,                ACTOR_ITEM_B_HEART,   SCENE_FOREST_TEMPLE_BOSS,           0x00,                                              0x4F, "Phantom Ganon Heart Container",               RHT_FOREST_TEMPLE_PHANTOM_GANON_HEART,                           RG_HEART_CONTAINER,                   { Category::cSongDungeonReward },                       SpoilerCollectionCheck::Collectable(0x14, 0x1F),                                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
+    locationTable[RC_FIRE_TEMPLE_VOLVAGIA_HEART] =                                     Location::Base(RC_FIRE_TEMPLE_VOLVAGIA_HEART,                                   RCQUEST_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_FIRE_TEMPLE,                  ACTOR_ITEM_B_HEART,   SCENE_FIRE_TEMPLE_BOSS,             0x00,                                              0x4F, "Volvagia Heart Container",                    RHT_FIRE_TEMPLE_VOLVAGIA_HEART,                                  RG_HEART_CONTAINER,                   { Category::cSongDungeonReward },                       SpoilerCollectionCheck::Collectable(0x15, 0x1F),                                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_WATER_TEMPLE_MORPHA_HEART] =                                      Location::Base(RC_WATER_TEMPLE_MORPHA_HEART,                                    RCQUEST_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_WATER_TEMPLE,                 ACTOR_ITEM_B_HEART,   SCENE_WATER_TEMPLE_BOSS,            0x00,                                              0x4F, "Morpha Heart Container",                      RHT_WATER_TEMPLE_MORPHA_HEART,                                   RG_HEART_CONTAINER,                   { Category::cSongDungeonReward },                       SpoilerCollectionCheck::Collectable(0x16, 0x1F),                                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
+    locationTable[RC_SPIRIT_TEMPLE_TWINROVA_HEART] =                                   Location::Base(RC_SPIRIT_TEMPLE_TWINROVA_HEART,                                 RCQUEST_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_SPIRIT_TEMPLE,                ACTOR_ITEM_B_HEART,   SCENE_SPIRIT_TEMPLE_BOSS,           0x00,                                              0x4F, "Twinrova Heart Container",                    RHT_SPIRIT_TEMPLE_TWINROVA_HEART,                                RG_HEART_CONTAINER,                   { Category::cSongDungeonReward },                       SpoilerCollectionCheck::Collectable(0x17, 0x1F),                                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_SHADOW_TEMPLE_BONGO_BONGO_HEART] =                                Location::Base(RC_SHADOW_TEMPLE_BONGO_BONGO_HEART,                              RCQUEST_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_SHADOW_TEMPLE,                ACTOR_ITEM_B_HEART,   SCENE_SHADOW_TEMPLE_BOSS,           0x00,                                              0x4F, "Bongo Bongo Heart Container",                 RHT_SHADOW_TEMPLE_BONGO_BONGO_HEART,                             RG_HEART_CONTAINER,                   { Category::cSongDungeonReward },                       SpoilerCollectionCheck::Collectable(0x18, 0x1F),                                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
 
     // Cutscenes
-    locationTable[RC_TOT_MASTER_SWORD] =                                            Location::Delayed(RC_TOT_MASTER_SWORD,                                             RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x00, "ToT Master Sword",                            "ToT Master Sword",                                         RHT_TOT_MASTER_SWORD,                                            RG_MASTER_SWORD,                      {},                                                     SpoilerCollectionCheck::EventChkInf(0x45),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
-    locationTable[RC_TOT_LIGHT_ARROWS_CUTSCENE] =                                   Location::Delayed(RC_TOT_LIGHT_ARROWS_CUTSCENE,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x01, "ToT Light Arrow Cutscene",                    "ToT Light Arrow Cutscene",                                 RHT_TOT_LIGHT_ARROWS_CUTSCENE,                                   RG_LIGHT_ARROWS,                      {},                                                     SpoilerCollectionCheck::EventChkInf(0xC4),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
-    locationTable[RC_LW_GIFT_FROM_SARIA] =                                          Location::Delayed(RC_LW_GIFT_FROM_SARIA,                                           RCQUEST_BOTH,    RCTYPE_OCARINA,                     RCAREA_LOST_WOODS,                   ACTOR_ID_MAX,         SCENE_LOST_WOODS,                   0x00,                                              0x02, "Gift From Saria",                             "LW Gift From Saria",                                       RHT_LW_GIFT_FROM_SARIA,                                          RG_PROGRESSIVE_OCARINA,               {},                                                     SpoilerCollectionCheck::EventChkInf(0xC1),                                                                                    SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
-    locationTable[RC_ZF_GREAT_FAIRY_REWARD] =                                       Location::Delayed(RC_ZF_GREAT_FAIRY_REWARD,                                        RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_FOUNTAIN,               ACTOR_BG_DY_YOSEIZO,  SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 1,                                                 0x10, "Great Fairy Reward",                          "ZF Great Fairy Reward",                                    RHT_ZF_GREAT_FAIRY_REWARD,                                       RG_FARORES_WIND,                      {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZF_GREAT_FAIRY_REWARD),                                                        SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,               true);
-    locationTable[RC_HC_GREAT_FAIRY_REWARD] =                                       Location::Delayed(RC_HC_GREAT_FAIRY_REWARD,                                        RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_CASTLE,                ACTOR_BG_DY_YOSEIZO,  SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 2,                                                 0x11, "Great Fairy Reward",                          "HC Great Fairy Reward",                                    RHT_HC_GREAT_FAIRY_REWARD,                                       RG_DINS_FIRE,                         {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HC_GREAT_FAIRY_REWARD),                                                        SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
-    locationTable[RC_COLOSSUS_GREAT_FAIRY_REWARD] =                                 Location::Delayed(RC_COLOSSUS_GREAT_FAIRY_REWARD,                                  RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DESERT_COLOSSUS,              ACTOR_BG_DY_YOSEIZO,  SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 3,                                                 0x12, "Great Fairy Reward",                          "Colossus Great Fairy Reward",                              RHT_COLOSSUS_GREAT_FAIRY_REWARD,                                 RG_NAYRUS_LOVE,                       {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COLOSSUS_GREAT_FAIRY_REWARD),                                                  SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
-    locationTable[RC_DMT_GREAT_FAIRY_REWARD] =                                      Location::Delayed(RC_DMT_GREAT_FAIRY_REWARD,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_BG_DY_YOSEIZO,  SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC,  1,                                                 0x13, "Great Fairy Reward",                          "DMT Great Fairy Reward",                                   RHT_DMT_GREAT_FAIRY_REWARD,                                      RG_PROGRESSIVE_MAGIC_METER,           {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMT_GREAT_FAIRY_REWARD),                                                       SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,             true);
-    locationTable[RC_DMC_GREAT_FAIRY_REWARD] =                                      Location::Delayed(RC_DMC_GREAT_FAIRY_REWARD,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_BG_DY_YOSEIZO,  SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC,  2,                                                 0x14, "Great Fairy Reward",                          "DMC Great Fairy Reward",                                   RHT_DMC_GREAT_FAIRY_REWARD,                                      RG_PROGRESSIVE_MAGIC_METER,           {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMC_GREAT_FAIRY_REWARD),                                                       SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,             true);
-    locationTable[RC_OGC_GREAT_FAIRY_REWARD] =                                      Location::Delayed(RC_OGC_GREAT_FAIRY_REWARD,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_CASTLE,                ACTOR_BG_DY_YOSEIZO,  SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC,  3,                                                 0x15, "OGC Great Fairy Reward",                      "OGC Great Fairy Reward",                                   RHT_OGC_GREAT_FAIRY_REWARD,                                      RG_DOUBLE_DEFENSE,                    {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_OGC_GREAT_FAIRY_REWARD),                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE,      true);
+    locationTable[RC_TOT_MASTER_SWORD] =                                            Location::Delayed(RC_TOT_MASTER_SWORD,                                             RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x00, "ToT Master Sword",                            RHT_TOT_MASTER_SWORD,                                            RG_MASTER_SWORD,                      {},                                                     SpoilerCollectionCheck::EventChkInf(0x45),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
+    locationTable[RC_TOT_LIGHT_ARROWS_CUTSCENE] =                                   Location::Delayed(RC_TOT_LIGHT_ARROWS_CUTSCENE,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x01, "ToT Light Arrow Cutscene",                    RHT_TOT_LIGHT_ARROWS_CUTSCENE,                                   RG_LIGHT_ARROWS,                      {},                                                     SpoilerCollectionCheck::EventChkInf(0xC4),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
+    locationTable[RC_LW_GIFT_FROM_SARIA] =                                          Location::Delayed(RC_LW_GIFT_FROM_SARIA,                                           RCQUEST_BOTH,    RCTYPE_OCARINA,                     RCAREA_LOST_WOODS,                   ACTOR_ID_MAX,         SCENE_LOST_WOODS,                   0x00,                                              0x02, "Gift From Saria",                             RHT_LW_GIFT_FROM_SARIA,                                          RG_PROGRESSIVE_OCARINA,               {},                                                     SpoilerCollectionCheck::EventChkInf(0xC1),                                                                                    SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
+    locationTable[RC_ZF_GREAT_FAIRY_REWARD] =                                       Location::Delayed(RC_ZF_GREAT_FAIRY_REWARD,                                        RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_FOUNTAIN,               ACTOR_BG_DY_YOSEIZO,  SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 1,                                                 0x10, "Great Fairy Reward",                          RHT_ZF_GREAT_FAIRY_REWARD,                                       RG_FARORES_WIND,                      {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZF_GREAT_FAIRY_REWARD),                                                        SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,               true);
+    locationTable[RC_HC_GREAT_FAIRY_REWARD] =                                       Location::Delayed(RC_HC_GREAT_FAIRY_REWARD,                                        RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_CASTLE,                ACTOR_BG_DY_YOSEIZO,  SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 2,                                                 0x11, "Great Fairy Reward",                          RHT_HC_GREAT_FAIRY_REWARD,                                       RG_DINS_FIRE,                         {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HC_GREAT_FAIRY_REWARD),                                                        SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
+    locationTable[RC_COLOSSUS_GREAT_FAIRY_REWARD] =                                 Location::Delayed(RC_COLOSSUS_GREAT_FAIRY_REWARD,                                  RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DESERT_COLOSSUS,              ACTOR_BG_DY_YOSEIZO,  SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 3,                                                 0x12, "Great Fairy Reward",                          RHT_COLOSSUS_GREAT_FAIRY_REWARD,                                 RG_NAYRUS_LOVE,                       {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COLOSSUS_GREAT_FAIRY_REWARD),                                                  SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
+    locationTable[RC_DMT_GREAT_FAIRY_REWARD] =                                      Location::Delayed(RC_DMT_GREAT_FAIRY_REWARD,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_BG_DY_YOSEIZO,  SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC,  1,                                                 0x13, "Great Fairy Reward",                          RHT_DMT_GREAT_FAIRY_REWARD,                                      RG_PROGRESSIVE_MAGIC_METER,           {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMT_GREAT_FAIRY_REWARD),                                                       SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,             true);
+    locationTable[RC_DMC_GREAT_FAIRY_REWARD] =                                      Location::Delayed(RC_DMC_GREAT_FAIRY_REWARD,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_BG_DY_YOSEIZO,  SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC,  2,                                                 0x14, "Great Fairy Reward",                          RHT_DMC_GREAT_FAIRY_REWARD,                                      RG_PROGRESSIVE_MAGIC_METER,           {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMC_GREAT_FAIRY_REWARD),                                                       SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,             true);
+    locationTable[RC_OGC_GREAT_FAIRY_REWARD] =                                      Location::Delayed(RC_OGC_GREAT_FAIRY_REWARD,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_CASTLE,                ACTOR_BG_DY_YOSEIZO,  SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC,  3,                                                 0x15, "OGC Great Fairy Reward", "OGC Great Fairy Reward", RHT_OGC_GREAT_FAIRY_REWARD,                                 RG_DOUBLE_DEFENSE,                    {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_OGC_GREAT_FAIRY_REWARD),                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE,      true);
 
     // Songs
-    locationTable[RC_SHEIK_IN_FOREST] =                                             Location::Delayed(RC_SHEIK_IN_FOREST,                                              RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_SACRED_FOREST_MEADOW,         ACTOR_ID_MAX,         SCENE_SACRED_FOREST_MEADOW,         0x00,                                              0x20, "Sheik in Forest",                             "Sheik in Forest",                                          RHT_SHEIK_IN_FOREST,                                             RG_MINUET_OF_FOREST,                  { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(0x50),                                                                                    SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
-    locationTable[RC_SHEIK_IN_CRATER] =                                             Location::Delayed(RC_SHEIK_IN_CRATER,                                              RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x21, "Sheik in Crater",                             "Sheik in Crater",                                          RHT_SHEIK_IN_CRATER,                                             RG_BOLERO_OF_FIRE,                    { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(0x51),                                                                                    SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,             true);
-    locationTable[RC_SHEIK_IN_ICE_CAVERN] =                                         Location::Delayed(RC_SHEIK_IN_ICE_CAVERN,                                          RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_ICE_CAVERN,                   ACTOR_ID_MAX,         SCENE_ICE_CAVERN,                   0x00,                                              0x22, "Sheik in Ice Cavern",                         "Sheik in Ice Cavern",                                      RHT_SHEIK_IN_ICE_CAVERN,                                         RG_SERENADE_OF_WATER,                 { Category::cSong, Category::cSongDungeonReward },      SpoilerCollectionCheck::EventChkInf(0x52),                                                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN,         true);
-    locationTable[RC_SHEIK_AT_COLOSSUS] =                                           Location::Delayed(RC_SHEIK_AT_COLOSSUS,                                            RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_DESERT_COLOSSUS,              ACTOR_ID_MAX,         SCENE_DESERT_COLOSSUS,              0x00,                                              0x23, "Sheik at Colossus",                           "Sheik at Colossus",                                        RHT_SHEIK_AT_COLOSSUS,                                           RG_REQUIEM_OF_SPIRIT,                 { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(0xAC),                                                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
-    locationTable[RC_SHEIK_IN_KAKARIKO] =                                           Location::Delayed(RC_SHEIK_IN_KAKARIKO,                                            RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x24, "Sheik in Kakariko",                           "Sheik in Kakariko",                                        RHT_SHEIK_IN_KAKARIKO,                                           RG_NOCTURNE_OF_SHADOW,                { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(0xAA),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
-    locationTable[RC_SHEIK_AT_TEMPLE] =                                             Location::Delayed(RC_SHEIK_AT_TEMPLE,                                              RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x25, "Sheik at Temple",                             "Sheik at Temple",                                          RHT_SHEIK_AT_TEMPLE,                                             RG_PRELUDE_OF_LIGHT,                  { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(0x55),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
-    locationTable[RC_SONG_FROM_IMPA] =                                              Location::Delayed(RC_SONG_FROM_IMPA,                                               RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_HYRULE_CASTLE,                ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x26, "Song from Impa",                              "Song from Impa",                                           RHT_SONG_FROM_IMPA,                                              RG_ZELDAS_LULLABY,                    { Category::cSong, Category::cSongDungeonReward },      SpoilerCollectionCheck::EventChkInf(0x59),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
-    locationTable[RC_SONG_FROM_MALON] =                                             Location::Delayed(RC_SONG_FROM_MALON,                                              RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_LON_LON_RANCH,                ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x27, "Song from Malon",                             "Song from Malon",                                          RHT_SONG_FROM_MALON,                                             RG_EPONAS_SONG,                       { Category::cSong },                                    SpoilerCollectionCheck::RandomizerInf(RAND_INF_LEARNED_EPONA_SONG),                                                           SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH,              true);
-    locationTable[RC_SONG_FROM_SARIA] =                                             Location::Delayed(RC_SONG_FROM_SARIA,                                              RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_SACRED_FOREST_MEADOW,         ACTOR_ID_MAX,         SCENE_SACRED_FOREST_MEADOW,         0x00,                                              0x28, "Song from Saria",                             "Song from Saria",                                          RHT_SONG_FROM_SARIA,                                             RG_SARIAS_SONG,                       { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(0x57),                                                                                    SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
-    locationTable[RC_SONG_FROM_ROYAL_FAMILYS_TOMB] =                                Location::Delayed(RC_SONG_FROM_ROYAL_FAMILYS_TOMB,                                 RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_GRAVEYARD,                    ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x29, "Song from Composers Grave",                   "Song from Composers Grave",                                RHT_SONG_FROM_ROYAL_FAMILYS_TOMB,                                RG_SUNS_SONG,                         { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_LEARNED_SUNS_SONG),                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
-    locationTable[RC_SONG_FROM_OCARINA_OF_TIME] =                                   Location::Delayed(RC_SONG_FROM_OCARINA_OF_TIME,                                    RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_HYRULE_FIELD,                 ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x2A, "Song from Ocarina of Time",                   "Song from Ocarina of Time",                                RHT_SONG_FROM_OCARINA_OF_TIME,                                   RG_SONG_OF_TIME,                      { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(0xA9),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD,               true);
-    locationTable[RC_SONG_FROM_WINDMILL] =                                          Location::Delayed(RC_SONG_FROM_WINDMILL,                                           RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x2B, "Song from Windmill",                          "Song from Windmill",                                       RHT_SONG_FROM_WINDMILL,                                          RG_SONG_OF_STORMS,                    { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_LEARNED_SONG_OF_STORMS),                                                      SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
+    locationTable[RC_SHEIK_IN_FOREST] =                                             Location::Delayed(RC_SHEIK_IN_FOREST,                                              RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_SACRED_FOREST_MEADOW,         ACTOR_ID_MAX,         SCENE_SACRED_FOREST_MEADOW,         0x00,                                              0x20, "Sheik in Forest",           "Sheik in Forest",           RHT_SHEIK_IN_FOREST,                                  RG_MINUET_OF_FOREST,                  { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(0x50),                                                                                    SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
+    locationTable[RC_SHEIK_IN_CRATER] =                                             Location::Delayed(RC_SHEIK_IN_CRATER,                                              RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x21, "Sheik in Crater",           "Sheik in Crater",           RHT_SHEIK_IN_CRATER,                                  RG_BOLERO_OF_FIRE,                    { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(0x51),                                                                                    SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,             true);
+    locationTable[RC_SHEIK_IN_ICE_CAVERN] =                                         Location::Delayed(RC_SHEIK_IN_ICE_CAVERN,                                          RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_ICE_CAVERN,                   ACTOR_ID_MAX,         SCENE_ICE_CAVERN,                   0x00,                                              0x22, "Sheik in Ice Cavern",       "Sheik in Ice Cavern",       RHT_SHEIK_IN_ICE_CAVERN,                              RG_SERENADE_OF_WATER,                 { Category::cSong, Category::cSongDungeonReward },      SpoilerCollectionCheck::EventChkInf(0x52),                                                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN,         true);
+    locationTable[RC_SHEIK_AT_COLOSSUS] =                                           Location::Delayed(RC_SHEIK_AT_COLOSSUS,                                            RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_DESERT_COLOSSUS,              ACTOR_ID_MAX,         SCENE_DESERT_COLOSSUS,              0x00,                                              0x23, "Sheik at Colossus",         "Sheik at Colossus",         RHT_SHEIK_AT_COLOSSUS,                                RG_REQUIEM_OF_SPIRIT,                 { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(0xAC),                                                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
+    locationTable[RC_SHEIK_IN_KAKARIKO] =                                           Location::Delayed(RC_SHEIK_IN_KAKARIKO,                                            RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x24, "Sheik in Kakariko",         "Sheik in Kakariko",         RHT_SHEIK_IN_KAKARIKO,                                RG_NOCTURNE_OF_SHADOW,                { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(0xAA),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
+    locationTable[RC_SHEIK_AT_TEMPLE] =                                             Location::Delayed(RC_SHEIK_AT_TEMPLE,                                              RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x25, "Sheik at Temple",           "Sheik at Temple",           RHT_SHEIK_AT_TEMPLE,                                  RG_PRELUDE_OF_LIGHT,                  { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(0x55),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
+    locationTable[RC_SONG_FROM_IMPA] =                                              Location::Delayed(RC_SONG_FROM_IMPA,                                               RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_HYRULE_CASTLE,                ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x26, "Song from Impa",            "Song from Impa",            RHT_SONG_FROM_IMPA,                                   RG_ZELDAS_LULLABY,                    { Category::cSong, Category::cSongDungeonReward },      SpoilerCollectionCheck::EventChkInf(0x59),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
+    locationTable[RC_SONG_FROM_MALON] =                                             Location::Delayed(RC_SONG_FROM_MALON,                                              RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_LON_LON_RANCH,                ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x27, "Song from Malon",           "Song from Malon",           RHT_SONG_FROM_MALON,                                  RG_EPONAS_SONG,                       { Category::cSong },                                    SpoilerCollectionCheck::RandomizerInf(RAND_INF_LEARNED_EPONA_SONG),                                                           SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH,              true);
+    locationTable[RC_SONG_FROM_SARIA] =                                             Location::Delayed(RC_SONG_FROM_SARIA,                                              RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_SACRED_FOREST_MEADOW,         ACTOR_ID_MAX,         SCENE_SACRED_FOREST_MEADOW,         0x00,                                              0x28, "Song from Saria",           "Song from Saria",           RHT_SONG_FROM_SARIA,                                  RG_SARIAS_SONG,                       { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(0x57),                                                                                    SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
+    locationTable[RC_SONG_FROM_ROYAL_FAMILYS_TOMB] =                                Location::Delayed(RC_SONG_FROM_ROYAL_FAMILYS_TOMB,                                 RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_GRAVEYARD,                    ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x29, "Song from Composers Grave", "Song from Composers Grave", RHT_SONG_FROM_ROYAL_FAMILYS_TOMB,                     RG_SUNS_SONG,                         { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_LEARNED_SUNS_SONG),                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
+    locationTable[RC_SONG_FROM_OCARINA_OF_TIME] =                                   Location::Delayed(RC_SONG_FROM_OCARINA_OF_TIME,                                    RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_HYRULE_FIELD,                 ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x2A, "Song from Ocarina of Time", "Song from Ocarina of Time", RHT_SONG_FROM_OCARINA_OF_TIME,                        RG_SONG_OF_TIME,                      { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(0xA9),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD,               true);
+    locationTable[RC_SONG_FROM_WINDMILL] =                                          Location::Delayed(RC_SONG_FROM_WINDMILL,                                           RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x2B, "Song from Windmill",        "Song from Windmill",        RHT_SONG_FROM_WINDMILL,                               RG_SONG_OF_STORMS,                    { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_LEARNED_SONG_OF_STORMS),                                                      SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
 
     //Beehives
-    locationTable[RC_KF_STORMS_GROTTO_BEEHIVE_LEFT] =                                  Location::Base(RC_KF_STORMS_GROTTO_BEEHIVE_LEFT,                                RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_KOKIRI_FOREST,                ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x2C),                      0x00, "Storms Grotto Beehive Left",                  "KF Storms Grotto Beehive Left",                            RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                        { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_KF_STORMS_GROTTO_LEFT),                                                SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_STORMS_GROTTO_BEEHIVE_RIGHT] =                                 Location::Base(RC_KF_STORMS_GROTTO_BEEHIVE_RIGHT,                               RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_KOKIRI_FOREST,                ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x2C),                      0x00, "Storms Grotto Beehive Right",                 "KF Storms Grotto Beehive Right",                           RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_KF_STORMS_GROTTO_RIGHT),                                               SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_LEFT] =                          Location::Base(RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_LEFT,                        RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_LOST_WOODS,                   ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x14),                      0x00, "Near Shortcuts Grotto Beehive Left",          "LW Near Shortcuts Grotto Beehive Left",                    RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                        { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_LW_NEAR_SHORTCUTS_GROTTO_LEFT),                                        SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_RIGHT] =                         Location::Base(RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_RIGHT,                       RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_LOST_WOODS,                   ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x14),                      0x00, "Near Shortcuts Grotto Beehive Right",         "LW Near Shortcuts Grotto Beehive Right",                   RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_LW_NEAR_SHORTCUTS_GROTTO_RIGHT),                                       SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[RC_LW_DEKU_SCRUB_GROTTO_BEEHIVE] =                                   Location::Base(RC_LW_DEKU_SCRUB_GROTTO_BEEHIVE,                                 RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_LOST_WOODS,                   ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(747,  0xF5),                      0x00, "Deku Scrub Grotto Beehive",                   "LW Deku Scrub Grotto Beehive",                             RHT_BEEHIVE_SCRUB_PAIR_GROTTO,                                   RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_LW_DEKU_SCRUB_GROTTO),                                                 SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[RC_SFM_STORMS_GROTTO_BEEHIVE] =                                      Location::Base(RC_SFM_STORMS_GROTTO_BEEHIVE,                                    RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_SACRED_FOREST_MEADOW,         ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(2262, 0xEE),                      0x00, "Storms Grotto Beehive",                       "SFM Storms Grotto Beehive",                                RHT_BEEHIVE_SCRUB_PAIR_GROTTO,                                   RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_SFM_STORMS_GROTTO),                                                    SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_LEFT] =                             Location::Base(RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_LEFT,                           RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x00),                      0x00, "Near Market Grotto Beehive Left",             "HF Near Market Grotto Beehive Left",                       RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                        { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_NEAR_MARKET_GROTTO_LEFT),                                           SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_RIGHT] =                            Location::Base(RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_RIGHT,                          RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x00),                      0x00, "Near Market Grotto Beehive Right",            "HF Near Market Grotto Beehive Right",                      RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_NEAR_MARKET_GROTTO_RIGHT),                                          SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[RC_HF_OPEN_GROTTO_BEEHIVE_LEFT] =                                    Location::Base(RC_HF_OPEN_GROTTO_BEEHIVE_LEFT,                                  RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x03),                      0x00, "Open Grotto Beehive Left",                    "HF Open Grotto Beehive Left",                              RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                        { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_OPEN_GROTTO_LEFT),                                                  SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[RC_HF_OPEN_GROTTO_BEEHIVE_RIGHT] =                                   Location::Base(RC_HF_OPEN_GROTTO_BEEHIVE_RIGHT,                                 RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x03),                      0x00, "Open Grotto Beehive Right",                   "HF Open Grotto Beehive Right",                             RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_OPEN_GROTTO_RIGHT),                                                 SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[RC_HF_SOUTHEAST_GROTTO_BEEHIVE_LEFT] =                               Location::Base(RC_HF_SOUTHEAST_GROTTO_BEEHIVE_LEFT,                             RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x22),                      0x00, "Southeast Grotto Beehive Left",               "HF Southeast Grotto Beehive Left",                         RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                        { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_SOUTHEAST_GROTTO_LEFT),                                             SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[RC_HF_SOUTHEAST_GROTTO_BEEHIVE_RIGHT] =                              Location::Base(RC_HF_SOUTHEAST_GROTTO_BEEHIVE_RIGHT,                            RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x22),                      0x00, "Southeast Grotto Beehive Right",              "HF Southeast Grotto Beehive Right",                        RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_SOUTHEAST_GROTTO_RIGHT),                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[RC_HF_INSIDE_FENCE_GROTTO_BEEHIVE] =                                 Location::Base(RC_HF_INSIDE_FENCE_GROTTO_BEEHIVE,                               RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(1410, 0xE6),                      0x00, "Inside Fence Grotto Beehive",                 "HF Inside Fence Grotto Beehive",                           RHT_BEEHIVE_LONELY_SCRUB_GROTTO,                                 RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_INSIDE_FENCE_GROTTO),                                               SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[RC_LLR_GROTTO_BEEHIVE] =                                             Location::Base(RC_LLR_GROTTO_BEEHIVE,                                           RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_LON_LON_RANCH,                ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(5144, 0xFC),                      0x00, "Grotto Beehive",                              "LLR Grotto Beehive",                                       RHT_BEEHIVE_SCRUB_TRIO_GROTTO,                                   RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_LLR_GROTTO),                                                           SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
-    locationTable[RC_KAK_OPEN_GROTTO_BEEHIVE_LEFT] =                                   Location::Base(RC_KAK_OPEN_GROTTO_BEEHIVE_LEFT,                                 RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_KAKARIKO_VILLAGE,             ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x28),                      0x00, "Open Grotto Beehive Left",                    "Kak Open Grotto Beehive Left",                             RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                        { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_KAK_OPEN_GROTTO_LEFT),                                                 SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_OPEN_GROTTO_BEEHIVE_RIGHT] =                                  Location::Base(RC_KAK_OPEN_GROTTO_BEEHIVE_RIGHT,                                RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_KAKARIKO_VILLAGE,             ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x28),                      0x00, "Open Grotto Beehive Right",                   "Kak Open Grotto Beehive Right",                            RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_KAK_OPEN_GROTTO_RIGHT),                                                SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_DMT_COW_GROTTO_BEEHIVE] =                                         Location::Base(RC_DMT_COW_GROTTO_BEEHIVE,                                       RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(2617, 0xF8),                      0x00, "Cow Grotto Beehive",                          "DMT Cow Grotto Beehive",                                   RHT_BEEHIVE_COW_GROTTO,                                          RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_DMT_COW_GROTTO),                                                       SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMT_STORMS_GROTTO_BEEHIVE_LEFT] =                                 Location::Base(RC_DMT_STORMS_GROTTO_BEEHIVE_LEFT,                               RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x57),                      0x00, "Storms Grotto Beehive Left",                  "DMT Storms Grotto Beehive Left",                           RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                        { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_DMT_STORMS_GROTTO_LEFT),                                               SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMT_STORMS_GROTTO_BEEHIVE_RIGHT] =                                Location::Base(RC_DMT_STORMS_GROTTO_BEEHIVE_RIGHT,                              RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x57),                      0x00, "Storms Grotto Beehive Right",                 "DMT Storms Grotto Beehive Right",                          RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_DMT_STORMS_GROTTO_RIGHT),                                              SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_GC_GROTTO_BEEHIVE] =                                              Location::Base(RC_GC_GROTTO_BEEHIVE,                                            RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_GORON_CITY,                   ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(5144, 0xFB),                      0x00, "Grotto Beehive",                              "GC Grotto Beehive",                                        RHT_BEEHIVE_SCRUB_TRIO_GROTTO,                                   RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_GC_GROTTO),                                                            SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_DMC_UPPER_GROTTO_BEEHIVE_LEFT] =                                  Location::Base(RC_DMC_UPPER_GROTTO_BEEHIVE_LEFT,                                RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x7A),                      0x00, "Upper Grotto Beehive Left",                   "DMC Upper Grotto Beehive Left",                            RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                        { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_DMC_UPPER_GROTTO_LEFT),                                                SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMC_UPPER_GROTTO_BEEHIVE_RIGHT] =                                 Location::Base(RC_DMC_UPPER_GROTTO_BEEHIVE_RIGHT,                               RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x7A),                      0x00, "Upper Grotto Beehive Right",                  "DMC Upper Grotto Beehive Right",                           RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_DMC_UPPER_GROTTO_RIGHT),                                               SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMC_HAMMER_GROTTO_BEEHIVE] =                                      Location::Base(RC_DMC_HAMMER_GROTTO_BEEHIVE,                                    RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(5144, 0xF9),                      0x00, "Hammer Grotto Beehive",                       "DMC Hammer Grotto Beehive",                                RHT_BEEHIVE_SCRUB_TRIO_GROTTO,                                   RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_DMC_HAMMER_GROTTO),                                                    SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_ZR_OPEN_GROTTO_BEEHIVE_LEFT] =                                    Location::Base(RC_ZR_OPEN_GROTTO_BEEHIVE_LEFT,                                  RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_ZORAS_RIVER,                  ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x29),                      0x00, "Open Grotto Beehive Left",                    "ZR Open Grotto Beehive Left",                              RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                        { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_ZR_OPEN_GROTTO_LEFT),                                                  SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZR_OPEN_GROTTO_BEEHIVE_RIGHT] =                                   Location::Base(RC_ZR_OPEN_GROTTO_BEEHIVE_RIGHT,                                 RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_ZORAS_RIVER,                  ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x29),                      0x00, "Open Grotto Beehive Right",                   "ZR Open Grotto Beehive Right",                             RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_ZR_OPEN_GROTTO_RIGHT),                                                 SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZR_STORMS_GROTTO_BEEHIVE] =                                       Location::Base(RC_ZR_STORMS_GROTTO_BEEHIVE,                                     RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_ZORAS_RIVER,                  ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(2262, 0xEB),                      0x00, "Storms Grotto Beehive",                       "ZR Storms Grotto Beehive",                                 RHT_BEEHIVE_SCRUB_PAIR_GROTTO,                                   RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_ZR_STORMS_GROTTO),                                                     SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_LEFT] =                          Location::Base(RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_LEFT,                        RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_ZORAS_DOMAIN,                 ACTOR_OBJ_COMB,       SCENE_ZORAS_DOMAIN,                 TWO_ACTOR_PARAMS(382,  0x00),                      0x00, "In Front of King Zora Beehive Left",          "ZD In Front of King Zora Beehive Left",                    RHT_BEEHIVE_IN_FRONT_OF_KING_ZORA,                               RG_BLUE_RUPEE,                        { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_ZD_IN_FRONT_OF_KING_ZORA_LEFT),                                        SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_RIGHT] =                         Location::Base(RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_RIGHT,                       RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_ZORAS_DOMAIN,                 ACTOR_OBJ_COMB,       SCENE_ZORAS_DOMAIN,                 TWO_ACTOR_PARAMS(948,  0x00),                      0x00, "In Front of King Zora Beehive Right",         "ZD In Front of King Zora Beehive Right",                   RHT_BEEHIVE_IN_FRONT_OF_KING_ZORA,                               RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_ZD_IN_FRONT_OF_KING_ZORA_RIGHT),                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZD_BEHIND_KING_ZORA_BEEHIVE] =                                    Location::Base(RC_ZD_BEHIND_KING_ZORA_BEEHIVE,                                  RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_ZORAS_DOMAIN,                 ACTOR_OBJ_COMB,       SCENE_ZORAS_DOMAIN,                 TWO_ACTOR_PARAMS(701,  0x00),                      0x00, "Behind King Zora Beehive",                    "ZD Behind King Zora Beehive",                              RHT_BEEHIVE_BEHIND_KING_ZORA,                                    RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_ZD_BEHIND_KING_ZORA),                                                  SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_LH_GROTTO_BEEHIVE] =                                              Location::Base(RC_LH_GROTTO_BEEHIVE,                                            RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_LAKE_HYLIA,                   ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(5144, 0xEF),                      0x00, "Grotto Beehive",                              "LH Grotto Beehive",                                        RHT_BEEHIVE_SCRUB_TRIO_GROTTO,                                   RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_LH_GROTTO),                                                            SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_GV_DEKU_SCRUB_GROTTO_BEEHIVE] =                                   Location::Base(RC_GV_DEKU_SCRUB_GROTTO_BEEHIVE,                                 RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_GERUDO_VALLEY,                ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(2262, 0xF0),                      0x00, "Deku Scrub Grotto Beehive",                   "GV Deku Scrub Grotto Beehive",                             RHT_BEEHIVE_SCRUB_PAIR_GROTTO,                                   RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_GV_DEKU_SCRUB_GROTTO),                                                 SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[RC_COLOSSUS_GROTTO_BEEHIVE] =                                        Location::Base(RC_COLOSSUS_GROTTO_BEEHIVE,                                      RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DESERT_COLOSSUS,              ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(2262, 0xFD),                      0x00, "Grotto Beehive",                              "Colossus Grotto Beehive",                                  RHT_BEEHIVE_SCRUB_PAIR_GROTTO,                                   RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_COLOSSUS_GROTTO),                                                      SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_KF_STORMS_GROTTO_BEEHIVE_LEFT] =                                  Location::Base(RC_KF_STORMS_GROTTO_BEEHIVE_LEFT,                                RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_KOKIRI_FOREST,                ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x2C),                      0x00, "Storms Grotto Beehive Left",                  RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                        { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_KF_STORMS_GROTTO_LEFT),                                                SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_STORMS_GROTTO_BEEHIVE_RIGHT] =                                 Location::Base(RC_KF_STORMS_GROTTO_BEEHIVE_RIGHT,                               RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_KOKIRI_FOREST,                ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x2C),                      0x00, "Storms Grotto Beehive Right",                 RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_KF_STORMS_GROTTO_RIGHT),                                               SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_LEFT] =                          Location::Base(RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_LEFT,                        RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_LOST_WOODS,                   ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x14),                      0x00, "Near Shortcuts Grotto Beehive Left",          RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                        { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_LW_NEAR_SHORTCUTS_GROTTO_LEFT),                                        SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_RIGHT] =                         Location::Base(RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_RIGHT,                       RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_LOST_WOODS,                   ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x14),                      0x00, "Near Shortcuts Grotto Beehive Right",         RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_LW_NEAR_SHORTCUTS_GROTTO_RIGHT),                                       SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_LW_DEKU_SCRUB_GROTTO_BEEHIVE] =                                   Location::Base(RC_LW_DEKU_SCRUB_GROTTO_BEEHIVE,                                 RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_LOST_WOODS,                   ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(747,  0xF5),                      0x00, "Deku Scrub Grotto Beehive",                   RHT_BEEHIVE_SCRUB_PAIR_GROTTO,                                   RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_LW_DEKU_SCRUB_GROTTO),                                                 SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_SFM_STORMS_GROTTO_BEEHIVE] =                                      Location::Base(RC_SFM_STORMS_GROTTO_BEEHIVE,                                    RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_SACRED_FOREST_MEADOW,         ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(2262, 0xEE),                      0x00, "Storms Grotto Beehive",                       RHT_BEEHIVE_SCRUB_PAIR_GROTTO,                                   RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_SFM_STORMS_GROTTO),                                                    SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_LEFT] =                             Location::Base(RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_LEFT,                           RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x00),                      0x00, "Near Market Grotto Beehive Left",             RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                        { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_NEAR_MARKET_GROTTO_LEFT),                                           SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_RIGHT] =                            Location::Base(RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_RIGHT,                          RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x00),                      0x00, "Near Market Grotto Beehive Right",            RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_NEAR_MARKET_GROTTO_RIGHT),                                          SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_HF_OPEN_GROTTO_BEEHIVE_LEFT] =                                    Location::Base(RC_HF_OPEN_GROTTO_BEEHIVE_LEFT,                                  RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x03),                      0x00, "Open Grotto Beehive Left",                    RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                        { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_OPEN_GROTTO_LEFT),                                                  SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_HF_OPEN_GROTTO_BEEHIVE_RIGHT] =                                   Location::Base(RC_HF_OPEN_GROTTO_BEEHIVE_RIGHT,                                 RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x03),                      0x00, "Open Grotto Beehive Right",                   RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_OPEN_GROTTO_RIGHT),                                                 SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_HF_SOUTHEAST_GROTTO_BEEHIVE_LEFT] =                               Location::Base(RC_HF_SOUTHEAST_GROTTO_BEEHIVE_LEFT,                             RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x22),                      0x00, "Southeast Grotto Beehive Left",               RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                        { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_SOUTHEAST_GROTTO_LEFT),                                             SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_HF_SOUTHEAST_GROTTO_BEEHIVE_RIGHT] =                              Location::Base(RC_HF_SOUTHEAST_GROTTO_BEEHIVE_RIGHT,                            RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x22),                      0x00, "Southeast Grotto Beehive Right",              RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_SOUTHEAST_GROTTO_RIGHT),                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_HF_INSIDE_FENCE_GROTTO_BEEHIVE] =                                 Location::Base(RC_HF_INSIDE_FENCE_GROTTO_BEEHIVE,                               RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(1410, 0xE6),                      0x00, "Inside Fence Grotto Beehive",                 RHT_BEEHIVE_LONELY_SCRUB_GROTTO,                                 RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_INSIDE_FENCE_GROTTO),                                               SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_LLR_GROTTO_BEEHIVE] =                                             Location::Base(RC_LLR_GROTTO_BEEHIVE,                                           RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_LON_LON_RANCH,                ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(5144, 0xFC),                      0x00, "Grotto Beehive",                              RHT_BEEHIVE_SCRUB_TRIO_GROTTO,                                   RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_LLR_GROTTO),                                                           SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
+    locationTable[RC_KAK_OPEN_GROTTO_BEEHIVE_LEFT] =                                   Location::Base(RC_KAK_OPEN_GROTTO_BEEHIVE_LEFT,                                 RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_KAKARIKO_VILLAGE,             ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x28),                      0x00, "Open Grotto Beehive Left",                    RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                        { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_KAK_OPEN_GROTTO_LEFT),                                                 SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_OPEN_GROTTO_BEEHIVE_RIGHT] =                                  Location::Base(RC_KAK_OPEN_GROTTO_BEEHIVE_RIGHT,                                RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_KAKARIKO_VILLAGE,             ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x28),                      0x00, "Open Grotto Beehive Right",                   RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_KAK_OPEN_GROTTO_RIGHT),                                                SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_DMT_COW_GROTTO_BEEHIVE] =                                         Location::Base(RC_DMT_COW_GROTTO_BEEHIVE,                                       RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(2617, 0xF8),                      0x00, "Cow Grotto Beehive",                          RHT_BEEHIVE_COW_GROTTO,                                          RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_DMT_COW_GROTTO),                                                       SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMT_STORMS_GROTTO_BEEHIVE_LEFT] =                                 Location::Base(RC_DMT_STORMS_GROTTO_BEEHIVE_LEFT,                               RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x57),                      0x00, "Storms Grotto Beehive Left",                  RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                        { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_DMT_STORMS_GROTTO_LEFT),                                               SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMT_STORMS_GROTTO_BEEHIVE_RIGHT] =                                Location::Base(RC_DMT_STORMS_GROTTO_BEEHIVE_RIGHT,                              RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x57),                      0x00, "Storms Grotto Beehive Right",                 RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_DMT_STORMS_GROTTO_RIGHT),                                              SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_GC_GROTTO_BEEHIVE] =                                              Location::Base(RC_GC_GROTTO_BEEHIVE,                                            RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_GORON_CITY,                   ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(5144, 0xFB),                      0x00, "Grotto Beehive",                              RHT_BEEHIVE_SCRUB_TRIO_GROTTO,                                   RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_GC_GROTTO),                                                            SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_DMC_UPPER_GROTTO_BEEHIVE_LEFT] =                                  Location::Base(RC_DMC_UPPER_GROTTO_BEEHIVE_LEFT,                                RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x7A),                      0x00, "Upper Grotto Beehive Left",                   RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                        { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_DMC_UPPER_GROTTO_LEFT),                                                SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMC_UPPER_GROTTO_BEEHIVE_RIGHT] =                                 Location::Base(RC_DMC_UPPER_GROTTO_BEEHIVE_RIGHT,                               RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x7A),                      0x00, "Upper Grotto Beehive Right",                  RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_DMC_UPPER_GROTTO_RIGHT),                                               SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMC_HAMMER_GROTTO_BEEHIVE] =                                      Location::Base(RC_DMC_HAMMER_GROTTO_BEEHIVE,                                    RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(5144, 0xF9),                      0x00, "Hammer Grotto Beehive",                       RHT_BEEHIVE_SCRUB_TRIO_GROTTO,                                   RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_DMC_HAMMER_GROTTO),                                                    SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_ZR_OPEN_GROTTO_BEEHIVE_LEFT] =                                    Location::Base(RC_ZR_OPEN_GROTTO_BEEHIVE_LEFT,                                  RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_ZORAS_RIVER,                  ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x29),                      0x00, "Open Grotto Beehive Left",                    RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                        { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_ZR_OPEN_GROTTO_LEFT),                                                  SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZR_OPEN_GROTTO_BEEHIVE_RIGHT] =                                   Location::Base(RC_ZR_OPEN_GROTTO_BEEHIVE_RIGHT,                                 RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_ZORAS_RIVER,                  ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x29),                      0x00, "Open Grotto Beehive Right",                   RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_ZR_OPEN_GROTTO_RIGHT),                                                 SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZR_STORMS_GROTTO_BEEHIVE] =                                       Location::Base(RC_ZR_STORMS_GROTTO_BEEHIVE,                                     RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_ZORAS_RIVER,                  ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(2262, 0xEB),                      0x00, "Storms Grotto Beehive",                       RHT_BEEHIVE_SCRUB_PAIR_GROTTO,                                   RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_ZR_STORMS_GROTTO),                                                     SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_LEFT] =                          Location::Base(RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_LEFT,                        RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_ZORAS_DOMAIN,                 ACTOR_OBJ_COMB,       SCENE_ZORAS_DOMAIN,                 TWO_ACTOR_PARAMS(382,  0x00),                      0x00, "In Front of King Zora Beehive Left",          RHT_BEEHIVE_IN_FRONT_OF_KING_ZORA,                               RG_BLUE_RUPEE,                        { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_ZD_IN_FRONT_OF_KING_ZORA_LEFT),                                        SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_RIGHT] =                         Location::Base(RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_RIGHT,                       RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_ZORAS_DOMAIN,                 ACTOR_OBJ_COMB,       SCENE_ZORAS_DOMAIN,                 TWO_ACTOR_PARAMS(948,  0x00),                      0x00, "In Front of King Zora Beehive Right",         RHT_BEEHIVE_IN_FRONT_OF_KING_ZORA,                               RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_ZD_IN_FRONT_OF_KING_ZORA_RIGHT),                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZD_BEHIND_KING_ZORA_BEEHIVE] =                                    Location::Base(RC_ZD_BEHIND_KING_ZORA_BEEHIVE,                                  RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_ZORAS_DOMAIN,                 ACTOR_OBJ_COMB,       SCENE_ZORAS_DOMAIN,                 TWO_ACTOR_PARAMS(701,  0x00),                      0x00, "Behind King Zora Beehive",                    RHT_BEEHIVE_BEHIND_KING_ZORA,                                    RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_ZD_BEHIND_KING_ZORA),                                                  SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_LH_GROTTO_BEEHIVE] =                                              Location::Base(RC_LH_GROTTO_BEEHIVE,                                            RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_LAKE_HYLIA,                   ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(5144, 0xEF),                      0x00, "Grotto Beehive",                              RHT_BEEHIVE_SCRUB_TRIO_GROTTO,                                   RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_LH_GROTTO),                                                            SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_GV_DEKU_SCRUB_GROTTO_BEEHIVE] =                                   Location::Base(RC_GV_DEKU_SCRUB_GROTTO_BEEHIVE,                                 RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_GERUDO_VALLEY,                ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(2262, 0xF0),                      0x00, "Deku Scrub Grotto Beehive",                   RHT_BEEHIVE_SCRUB_PAIR_GROTTO,                                   RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_GV_DEKU_SCRUB_GROTTO),                                                 SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_COLOSSUS_GROTTO_BEEHIVE] =                                        Location::Base(RC_COLOSSUS_GROTTO_BEEHIVE,                                      RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DESERT_COLOSSUS,              ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(2262, 0xFD),                      0x00, "Grotto Beehive",                              RHT_BEEHIVE_SCRUB_PAIR_GROTTO,                                   RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_COLOSSUS_GROTTO),                                                      SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
 
     // Cows
-    locationTable[RC_KF_LINKS_HOUSE_COW] =                                             Location::Base(RC_KF_LINKS_HOUSE_COW,                                           RCQUEST_BOTH,    RCTYPE_COW,                         RCAREA_KOKIRI_FOREST,                ACTOR_EN_COW,         SCENE_LINKS_HOUSE,                  0x00,                                              0x15, "Links House Cow",                             "KF Links House Cow",                                       RHT_KF_LINKS_HOUSE_COW,                                          RG_MILK,                              { Category::cCow },                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_KF_LINKS_HOUSE_COW),                                               SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_HF_COW_GROTTO_COW] =                                              Location::Base(RC_HF_COW_GROTTO_COW,                                            RCQUEST_BOTH,    RCTYPE_COW,                         RCAREA_HYRULE_FIELD,                 ACTOR_EN_COW,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(3485, -291),                      0x16, "Cow Grotto Cow",                              "HF Cow Grotto Cow",                                        RHT_HF_COW_GROTTO_COW,                                           RG_MILK,                              { Category::cCow },                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_HF_COW_GROTTO_COW),                                                SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[RC_LLR_STABLES_LEFT_COW] =                                           Location::Base(RC_LLR_STABLES_LEFT_COW,                                         RCQUEST_BOTH,    RCTYPE_COW,                         RCAREA_LON_LON_RANCH,                ACTOR_EN_COW,         SCENE_STABLE,                       TWO_ACTOR_PARAMS(-122, -254),                      0x16, "Stables Left Cow",                            "LLR Stables Left Cow",                                     RHT_LLR_STABLES_LEFT_COW,                                        RG_MILK,                              { Category::cCow },                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_LLR_STABLES_LEFT_COW),                                             SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
-    locationTable[RC_LLR_STABLES_RIGHT_COW] =                                          Location::Base(RC_LLR_STABLES_RIGHT_COW,                                        RCQUEST_BOTH,    RCTYPE_COW,                         RCAREA_LON_LON_RANCH,                ACTOR_EN_COW,         SCENE_STABLE,                       TWO_ACTOR_PARAMS(116, -254),                       0x15, "Stables Right Cow",                           "LLR Stables Right Cow",                                    RHT_LLR_STABLES_RIGHT_COW,                                       RG_MILK,                              { Category::cCow },                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_LLR_STABLES_RIGHT_COW),                                            SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
-    locationTable[RC_LLR_TOWER_LEFT_COW] =                                             Location::Base(RC_LLR_TOWER_LEFT_COW,                                           RCQUEST_BOTH,    RCTYPE_COW,                         RCAREA_LON_LON_RANCH,                ACTOR_EN_COW,         SCENE_LON_LON_BUILDINGS,            TWO_ACTOR_PARAMS(-229, 157),                       0x15, "Tower Left Cow",                              "LLR Tower Left Cow",                                       RHT_LLR_TOWER_LEFT_COW,                                          RG_MILK,                              { Category::cCow },                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_LLR_TOWER_LEFT_COW),                                               SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
-    locationTable[RC_LLR_TOWER_RIGHT_COW] =                                            Location::Base(RC_LLR_TOWER_RIGHT_COW,                                          RCQUEST_BOTH,    RCTYPE_COW,                         RCAREA_LON_LON_RANCH,                ACTOR_EN_COW,         SCENE_LON_LON_BUILDINGS,            TWO_ACTOR_PARAMS(-142, -140),                      0x16, "Tower Right Cow",                             "LLR Tower Right Cow",                                      RHT_LLR_TOWER_RIGHT_COW,                                         RG_MILK,                              { Category::cCow },                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_LLR_TOWER_RIGHT_COW),                                              SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
-    locationTable[RC_KAK_IMPAS_HOUSE_COW] =                                            Location::Base(RC_KAK_IMPAS_HOUSE_COW,                                          RCQUEST_BOTH,    RCTYPE_COW,                         RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_COW,         SCENE_IMPAS_HOUSE,                  0x00,                                              0x15, "Impas House Cow",                             "Kak Impas House Cow",                                      RHT_KAK_IMPAS_HOUSE_COW,                                         RG_MILK,                              { Category::cCow },                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_KAK_IMPAS_HOUSE_COW),                                              SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_DMT_COW_GROTTO_COW] =                                             Location::Base(RC_DMT_COW_GROTTO_COW,                                           RCQUEST_BOTH,    RCTYPE_COW,                         RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_EN_COW,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(2444, -471),                      0x15, "Cow Grotto Cow",                              "DMT Cow Grotto Cow",                                       RHT_DMT_COW_GROTTO_COW,                                          RG_MILK,                              { Category::cCow },                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_DMT_COW_GROTTO_COW),                                               SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_GV_COW] =                                                         Location::Base(RC_GV_COW,                                                       RCQUEST_BOTH,    RCTYPE_COW,                         RCAREA_GERUDO_VALLEY,                ACTOR_EN_COW,         SCENE_GERUDO_VALLEY,                0x00,                                              0x15, "Cow",                                         "GV Cow",                                                   RHT_GV_COW,                                                      RG_MILK,                              { Category::cCow },                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_GV_COW),                                                           SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[RC_JABU_JABUS_BELLY_MQ_COW] =                                        Location::Base(RC_JABU_JABUS_BELLY_MQ_COW,                                      RCQUEST_MQ,      RCTYPE_COW,                         RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_COW,         SCENE_JABU_JABU,                    0x00,                                              0x15, "MQ Cow",                                      "Jabu Jabus Belly MQ Cow",                                  RHT_JABU_JABUS_BELLY_MQ_COW,                                     RG_MILK,                              { Category::cCow },                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_JABU_JABUS_BELLY_MQ_COW),                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_KF_LINKS_HOUSE_COW] =                                             Location::Base(RC_KF_LINKS_HOUSE_COW,                                           RCQUEST_BOTH,    RCTYPE_COW,                         RCAREA_KOKIRI_FOREST,                ACTOR_EN_COW,         SCENE_LINKS_HOUSE,                  0x00,                                              0x15, "Links House Cow",                             RHT_KF_LINKS_HOUSE_COW,                                          RG_MILK,                              { Category::cCow },                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_KF_LINKS_HOUSE_COW),                                               SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_HF_COW_GROTTO_COW] =                                              Location::Base(RC_HF_COW_GROTTO_COW,                                            RCQUEST_BOTH,    RCTYPE_COW,                         RCAREA_HYRULE_FIELD,                 ACTOR_EN_COW,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(3485, -291),                      0x16, "Cow Grotto Cow",                              RHT_HF_COW_GROTTO_COW,                                           RG_MILK,                              { Category::cCow },                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_HF_COW_GROTTO_COW),                                                SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_LLR_STABLES_LEFT_COW] =                                           Location::Base(RC_LLR_STABLES_LEFT_COW,                                         RCQUEST_BOTH,    RCTYPE_COW,                         RCAREA_LON_LON_RANCH,                ACTOR_EN_COW,         SCENE_STABLE,                       TWO_ACTOR_PARAMS(-122, -254),                      0x16, "Stables Left Cow",                            RHT_LLR_STABLES_LEFT_COW,                                        RG_MILK,                              { Category::cCow },                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_LLR_STABLES_LEFT_COW),                                             SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
+    locationTable[RC_LLR_STABLES_RIGHT_COW] =                                          Location::Base(RC_LLR_STABLES_RIGHT_COW,                                        RCQUEST_BOTH,    RCTYPE_COW,                         RCAREA_LON_LON_RANCH,                ACTOR_EN_COW,         SCENE_STABLE,                       TWO_ACTOR_PARAMS(116, -254),                       0x15, "Stables Right Cow",                           RHT_LLR_STABLES_RIGHT_COW,                                       RG_MILK,                              { Category::cCow },                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_LLR_STABLES_RIGHT_COW),                                            SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
+    locationTable[RC_LLR_TOWER_LEFT_COW] =                                             Location::Base(RC_LLR_TOWER_LEFT_COW,                                           RCQUEST_BOTH,    RCTYPE_COW,                         RCAREA_LON_LON_RANCH,                ACTOR_EN_COW,         SCENE_LON_LON_BUILDINGS,            TWO_ACTOR_PARAMS(-229, 157),                       0x15, "Tower Left Cow",                              RHT_LLR_TOWER_LEFT_COW,                                          RG_MILK,                              { Category::cCow },                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_LLR_TOWER_LEFT_COW),                                               SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
+    locationTable[RC_LLR_TOWER_RIGHT_COW] =                                            Location::Base(RC_LLR_TOWER_RIGHT_COW,                                          RCQUEST_BOTH,    RCTYPE_COW,                         RCAREA_LON_LON_RANCH,                ACTOR_EN_COW,         SCENE_LON_LON_BUILDINGS,            TWO_ACTOR_PARAMS(-142, -140),                      0x16, "Tower Right Cow",                             RHT_LLR_TOWER_RIGHT_COW,                                         RG_MILK,                              { Category::cCow },                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_LLR_TOWER_RIGHT_COW),                                              SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
+    locationTable[RC_KAK_IMPAS_HOUSE_COW] =                                            Location::Base(RC_KAK_IMPAS_HOUSE_COW,                                          RCQUEST_BOTH,    RCTYPE_COW,                         RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_COW,         SCENE_IMPAS_HOUSE,                  0x00,                                              0x15, "Impas House Cow",                             RHT_KAK_IMPAS_HOUSE_COW,                                         RG_MILK,                              { Category::cCow },                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_KAK_IMPAS_HOUSE_COW),                                              SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_DMT_COW_GROTTO_COW] =                                             Location::Base(RC_DMT_COW_GROTTO_COW,                                           RCQUEST_BOTH,    RCTYPE_COW,                         RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_EN_COW,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(2444, -471),                      0x15, "Cow Grotto Cow",                              RHT_DMT_COW_GROTTO_COW,                                          RG_MILK,                              { Category::cCow },                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_DMT_COW_GROTTO_COW),                                               SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_GV_COW] =                                                         Location::Base(RC_GV_COW,                                                       RCQUEST_BOTH,    RCTYPE_COW,                         RCAREA_GERUDO_VALLEY,                ACTOR_EN_COW,         SCENE_GERUDO_VALLEY,                0x00,                                              0x15, "Cow",                                         RHT_GV_COW,                                                      RG_MILK,                              { Category::cCow },                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_GV_COW),                                                           SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_COW] =                                        Location::Base(RC_JABU_JABUS_BELLY_MQ_COW,                                      RCQUEST_MQ,      RCTYPE_COW,                         RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_COW,         SCENE_JABU_JABU,                    0x00,                                              0x15, "MQ Cow",                                      RHT_JABU_JABUS_BELLY_MQ_COW,                                     RG_MILK,                              { Category::cCow },                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_JABU_JABUS_BELLY_MQ_COW),                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
 
     /*-------------------------------
               --- SHOPS ---
@@ -1383,189 +1383,189 @@ void Rando::StaticData::InitLocationTable() { //
       7     5               1     3
       -------------------------------*/
     // Kokiri Forest
-    locationTable[RC_KF_SHOP_ITEM_1] =                                                 Location::Base(RC_KF_SHOP_ITEM_1,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KOKIRI_FOREST,                ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x00,                                              0x00, "Shop Item 1",                                 "KF Shop Item 1",                                           RHT_KF_SHOP_ITEM_1,                                              RG_BUY_DEKU_SHIELD,                   { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2D, 0),                                                                                    SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_SHOP_ITEM_2] =                                                 Location::Base(RC_KF_SHOP_ITEM_2,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KOKIRI_FOREST,                ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x01,                                              0x01, "Shop Item 2",                                 "KF Shop Item 2",                                           RHT_KF_SHOP_ITEM_2,                                              RG_BUY_DEKU_NUTS_5,                   { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2D, 1),                                                                                    SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_SHOP_ITEM_3] =                                                 Location::Base(RC_KF_SHOP_ITEM_3,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KOKIRI_FOREST,                ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x02,                                              0x02, "Shop Item 3",                                 "KF Shop Item 3",                                           RHT_KF_SHOP_ITEM_3,                                              RG_BUY_DEKU_NUTS_10,                  { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2D, 2),                                                                                    SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_SHOP_ITEM_4] =                                                 Location::Base(RC_KF_SHOP_ITEM_4,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KOKIRI_FOREST,                ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x03,                                              0x03, "Shop Item 4",                                 "KF Shop Item 4",                                           RHT_KF_SHOP_ITEM_4,                                              RG_BUY_DEKU_STICK_1,                  { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2D, 3),                                                                                    SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_SHOP_ITEM_5] =                                                 Location::Base(RC_KF_SHOP_ITEM_5,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KOKIRI_FOREST,                ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x04,                                              0x04, "Shop Item 5",                                 "KF Shop Item 5",                                           RHT_KF_SHOP_ITEM_5,                                              RG_BUY_DEKU_SEEDS_30,                 { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2D, 4),                                                                                    SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_SHOP_ITEM_6] =                                                 Location::Base(RC_KF_SHOP_ITEM_6,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KOKIRI_FOREST,                ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x05,                                              0x05, "Shop Item 6",                                 "KF Shop Item 6",                                           RHT_KF_SHOP_ITEM_6,                                              RG_BUY_ARROWS_10,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2D, 5),                                                                                    SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_SHOP_ITEM_7] =                                                 Location::Base(RC_KF_SHOP_ITEM_7,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KOKIRI_FOREST,                ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x06,                                              0x06, "Shop Item 7",                                 "KF Shop Item 7",                                           RHT_KF_SHOP_ITEM_7,                                              RG_BUY_ARROWS_30,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2D, 6),                                                                                    SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_SHOP_ITEM_8] =                                                 Location::Base(RC_KF_SHOP_ITEM_8,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KOKIRI_FOREST,                ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x07,                                              0x07, "Shop Item 8",                                 "KF Shop Item 8",                                           RHT_KF_SHOP_ITEM_8,                                              RG_BUY_HEART,                         { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2D, 7),                                                                                    SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_SHOP_ITEM_1] =                                                 Location::Base(RC_KF_SHOP_ITEM_1,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KOKIRI_FOREST,                ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x00,                                              0x00, "Shop Item 1",                                 RHT_KF_SHOP_ITEM_1,                                              RG_BUY_DEKU_SHIELD,                   { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2D, 0),                                                                                    SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_SHOP_ITEM_2] =                                                 Location::Base(RC_KF_SHOP_ITEM_2,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KOKIRI_FOREST,                ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x01,                                              0x01, "Shop Item 2",                                 RHT_KF_SHOP_ITEM_2,                                              RG_BUY_DEKU_NUTS_5,                   { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2D, 1),                                                                                    SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_SHOP_ITEM_3] =                                                 Location::Base(RC_KF_SHOP_ITEM_3,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KOKIRI_FOREST,                ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x02,                                              0x02, "Shop Item 3",                                 RHT_KF_SHOP_ITEM_3,                                              RG_BUY_DEKU_NUTS_10,                  { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2D, 2),                                                                                    SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_SHOP_ITEM_4] =                                                 Location::Base(RC_KF_SHOP_ITEM_4,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KOKIRI_FOREST,                ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x03,                                              0x03, "Shop Item 4",                                 RHT_KF_SHOP_ITEM_4,                                              RG_BUY_DEKU_STICK_1,                  { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2D, 3),                                                                                    SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_SHOP_ITEM_5] =                                                 Location::Base(RC_KF_SHOP_ITEM_5,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KOKIRI_FOREST,                ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x04,                                              0x04, "Shop Item 5",                                 RHT_KF_SHOP_ITEM_5,                                              RG_BUY_DEKU_SEEDS_30,                 { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2D, 4),                                                                                    SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_SHOP_ITEM_6] =                                                 Location::Base(RC_KF_SHOP_ITEM_6,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KOKIRI_FOREST,                ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x05,                                              0x05, "Shop Item 6",                                 RHT_KF_SHOP_ITEM_6,                                              RG_BUY_ARROWS_10,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2D, 5),                                                                                    SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_SHOP_ITEM_7] =                                                 Location::Base(RC_KF_SHOP_ITEM_7,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KOKIRI_FOREST,                ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x06,                                              0x06, "Shop Item 7",                                 RHT_KF_SHOP_ITEM_7,                                              RG_BUY_ARROWS_30,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2D, 6),                                                                                    SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_SHOP_ITEM_8] =                                                 Location::Base(RC_KF_SHOP_ITEM_8,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KOKIRI_FOREST,                ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x07,                                              0x07, "Shop Item 8",                                 RHT_KF_SHOP_ITEM_8,                                              RG_BUY_HEART,                         { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2D, 7),                                                                                    SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
 
     // Kakariko Village
-    locationTable[RC_KAK_POTION_SHOP_ITEM_1] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_1,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x00,                                              0x30, "Potion Shop Item 1",                          "Kak Potion Shop Item 1",                                   RHT_KAK_POTION_SHOP_ITEM_1,                                      RG_BUY_GREEN_POTION,                  { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x30, 0),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_POTION_SHOP_ITEM_2] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_2,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x01,                                              0x31, "Potion Shop Item 2",                          "Kak Potion Shop Item 2",                                   RHT_KAK_POTION_SHOP_ITEM_2,                                      RG_BUY_BLUE_FIRE,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x30, 1),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_POTION_SHOP_ITEM_3] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_3,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x02,                                              0x32, "Potion Shop Item 3",                          "Kak Potion Shop Item 3",                                   RHT_KAK_POTION_SHOP_ITEM_3,                                      RG_BUY_RED_POTION_30,                 { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x30, 2),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_POTION_SHOP_ITEM_4] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_4,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x03,                                              0x33, "Potion Shop Item 4",                          "Kak Potion Shop Item 4",                                   RHT_KAK_POTION_SHOP_ITEM_4,                                      RG_BUY_FAIRYS_SPIRIT,                 { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x30, 3),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_POTION_SHOP_ITEM_5] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_5,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x04,                                              0x34, "Potion Shop Item 5",                          "Kak Potion Shop Item 5",                                   RHT_KAK_POTION_SHOP_ITEM_5,                                      RG_BUY_DEKU_NUTS_5,                   { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x30, 4),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_POTION_SHOP_ITEM_6] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_6,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x05,                                              0x35, "Potion Shop Item 6",                          "Kak Potion Shop Item 6",                                   RHT_KAK_POTION_SHOP_ITEM_6,                                      RG_BUY_BOTTLE_BUG,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x30, 5),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_POTION_SHOP_ITEM_7] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_7,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x06,                                              0x36, "Potion Shop Item 7",                          "Kak Potion Shop Item 7",                                   RHT_KAK_POTION_SHOP_ITEM_7,                                      RG_BUY_POE,                           { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x30, 6),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_POTION_SHOP_ITEM_8] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_8,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x07,                                              0x37, "Potion Shop Item 8",                          "Kak Potion Shop Item 8",                                   RHT_KAK_POTION_SHOP_ITEM_8,                                      RG_BUY_FISH,                          { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x30, 7),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_BAZAAR_ITEM_1] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_1,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x00,                                              0x38, "Bazaar Item 1",                               "Kak Bazaar Item 1",                                        RHT_KAK_BAZAAR_ITEM_1,                                           RG_BUY_HYLIAN_SHIELD,                 { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x33, 0),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_BAZAAR_ITEM_2] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_2,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x01,                                              0x39, "Bazaar Item 2",                               "Kak Bazaar Item 2",                                        RHT_KAK_BAZAAR_ITEM_2,                                           RG_BUY_BOMBS_535,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x33, 1),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_BAZAAR_ITEM_3] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_3,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x02,                                              0x3A, "Bazaar Item 3",                               "Kak Bazaar Item 3",                                        RHT_KAK_BAZAAR_ITEM_3,                                           RG_BUY_DEKU_NUTS_5,                   { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x33, 2),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_BAZAAR_ITEM_4] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_4,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x03,                                              0x3B, "Bazaar Item 4",                               "Kak Bazaar Item 4",                                        RHT_KAK_BAZAAR_ITEM_4,                                           RG_BUY_HEART,                         { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x33, 3),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_BAZAAR_ITEM_5] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_5,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x04,                                              0x3C, "Bazaar Item 5",                               "Kak Bazaar Item 5",                                        RHT_KAK_BAZAAR_ITEM_5,                                           RG_BUY_ARROWS_10,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x33, 4),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_BAZAAR_ITEM_6] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_6,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x05,                                              0x3D, "Bazaar Item 6",                               "Kak Bazaar Item 6",                                        RHT_KAK_BAZAAR_ITEM_6,                                           RG_BUY_ARROWS_50,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x33, 5),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_BAZAAR_ITEM_7] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_7,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x06,                                              0x3E, "Bazaar Item 7",                               "Kak Bazaar Item 7",                                        RHT_KAK_BAZAAR_ITEM_7,                                           RG_BUY_DEKU_STICK_1,                  { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x33, 6),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_BAZAAR_ITEM_8] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_8,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x07,                                              0x3F, "Bazaar Item 8",                               "Kak Bazaar Item 8",                                        RHT_KAK_BAZAAR_ITEM_8,                                           RG_BUY_ARROWS_30,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x33, 7),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_POTION_SHOP_ITEM_1] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_1,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x00,                                              0x30, "Potion Shop Item 1",                          RHT_KAK_POTION_SHOP_ITEM_1,                                      RG_BUY_GREEN_POTION,                  { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x30, 0),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_POTION_SHOP_ITEM_2] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_2,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x01,                                              0x31, "Potion Shop Item 2",                          RHT_KAK_POTION_SHOP_ITEM_2,                                      RG_BUY_BLUE_FIRE,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x30, 1),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_POTION_SHOP_ITEM_3] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_3,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x02,                                              0x32, "Potion Shop Item 3",                          RHT_KAK_POTION_SHOP_ITEM_3,                                      RG_BUY_RED_POTION_30,                 { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x30, 2),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_POTION_SHOP_ITEM_4] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_4,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x03,                                              0x33, "Potion Shop Item 4",                          RHT_KAK_POTION_SHOP_ITEM_4,                                      RG_BUY_FAIRYS_SPIRIT,                 { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x30, 3),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_POTION_SHOP_ITEM_5] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_5,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x04,                                              0x34, "Potion Shop Item 5",                          RHT_KAK_POTION_SHOP_ITEM_5,                                      RG_BUY_DEKU_NUTS_5,                   { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x30, 4),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_POTION_SHOP_ITEM_6] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_6,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x05,                                              0x35, "Potion Shop Item 6",                          RHT_KAK_POTION_SHOP_ITEM_6,                                      RG_BUY_BOTTLE_BUG,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x30, 5),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_POTION_SHOP_ITEM_7] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_7,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x06,                                              0x36, "Potion Shop Item 7",                          RHT_KAK_POTION_SHOP_ITEM_7,                                      RG_BUY_POE,                           { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x30, 6),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_POTION_SHOP_ITEM_8] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_8,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x07,                                              0x37, "Potion Shop Item 8",                          RHT_KAK_POTION_SHOP_ITEM_8,                                      RG_BUY_FISH,                          { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x30, 7),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_BAZAAR_ITEM_1] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_1,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x00,                                              0x38, "Bazaar Item 1",                               RHT_KAK_BAZAAR_ITEM_1,                                           RG_BUY_HYLIAN_SHIELD,                 { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x33, 0),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_BAZAAR_ITEM_2] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_2,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x01,                                              0x39, "Bazaar Item 2",                               RHT_KAK_BAZAAR_ITEM_2,                                           RG_BUY_BOMBS_535,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x33, 1),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_BAZAAR_ITEM_3] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_3,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x02,                                              0x3A, "Bazaar Item 3",                               RHT_KAK_BAZAAR_ITEM_3,                                           RG_BUY_DEKU_NUTS_5,                   { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x33, 2),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_BAZAAR_ITEM_4] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_4,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x03,                                              0x3B, "Bazaar Item 4",                               RHT_KAK_BAZAAR_ITEM_4,                                           RG_BUY_HEART,                         { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x33, 3),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_BAZAAR_ITEM_5] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_5,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x04,                                              0x3C, "Bazaar Item 5",                               RHT_KAK_BAZAAR_ITEM_5,                                           RG_BUY_ARROWS_10,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x33, 4),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_BAZAAR_ITEM_6] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_6,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x05,                                              0x3D, "Bazaar Item 6",                               RHT_KAK_BAZAAR_ITEM_6,                                           RG_BUY_ARROWS_50,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x33, 5),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_BAZAAR_ITEM_7] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_7,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x06,                                              0x3E, "Bazaar Item 7",                               RHT_KAK_BAZAAR_ITEM_7,                                           RG_BUY_DEKU_STICK_1,                  { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x33, 6),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_BAZAAR_ITEM_8] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_8,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x07,                                              0x3F, "Bazaar Item 8",                               RHT_KAK_BAZAAR_ITEM_8,                                           RG_BUY_ARROWS_30,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x33, 7),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
 
     // Market
-    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_1] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_1,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x00,                                              0x30, "Bombchu Shop Item 1",                         "MK Bombchu Shop Item 1",                                   RHT_MARKET_BOMBCHU_SHOP_ITEM_1,                                  RG_BUY_BOMBCHU_10,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 0),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_2] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_2,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x01,                                              0x31, "Bombchu Shop Item 2",                         "MK Bombchu Shop Item 2",                                   RHT_MARKET_BOMBCHU_SHOP_ITEM_2,                                  RG_BUY_BOMBCHU_10,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 1),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_3] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_3,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x02,                                              0x32, "Bombchu Shop Item 3",                         "MK Bombchu Shop Item 3",                                   RHT_MARKET_BOMBCHU_SHOP_ITEM_3,                                  RG_BUY_BOMBCHU_10,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 2),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_4] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_4,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x03,                                              0x33, "Bombchu Shop Item 4",                         "MK Bombchu Shop Item 4",                                   RHT_MARKET_BOMBCHU_SHOP_ITEM_4,                                  RG_BUY_BOMBCHU_10,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 3),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_5] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_5,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x04,                                              0x34, "Bombchu Shop Item 5",                         "MK Bombchu Shop Item 5",                                   RHT_MARKET_BOMBCHU_SHOP_ITEM_5,                                  RG_BUY_BOMBCHU_20,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 4),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_6] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_6,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x05,                                              0x35, "Bombchu Shop Item 6",                         "MK Bombchu Shop Item 6",                                   RHT_MARKET_BOMBCHU_SHOP_ITEM_6,                                  RG_BUY_BOMBCHU_20,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 5),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_7] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_7,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x06,                                              0x36, "Bombchu Shop Item 7",                         "MK Bombchu Shop Item 7",                                   RHT_MARKET_BOMBCHU_SHOP_ITEM_7,                                  RG_BUY_BOMBCHU_20,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 6),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_8] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_8,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x07,                                              0x37, "Bombchu Shop Item 8",                         "MK Bombchu Shop Item 8",                                   RHT_MARKET_BOMBCHU_SHOP_ITEM_8,                                  RG_BUY_BOMBCHU_20,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 7),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_POTION_SHOP_ITEM_1] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_1,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x00,                                              0x30, "Potion Shop Item 1",                          "MK Potion Shop Item 1",                                    RHT_MARKET_POTION_SHOP_ITEM_1,                                   RG_BUY_GREEN_POTION,                  { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x31, 0),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_POTION_SHOP_ITEM_2] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_2,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x01,                                              0x31, "Potion Shop Item 2",                          "MK Potion Shop Item 2",                                    RHT_MARKET_POTION_SHOP_ITEM_2,                                   RG_BUY_BLUE_FIRE,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x31, 1),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_POTION_SHOP_ITEM_3] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_3,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x02,                                              0x32, "Potion Shop Item 3",                          "MK Potion Shop Item 3",                                    RHT_MARKET_POTION_SHOP_ITEM_3,                                   RG_BUY_RED_POTION_30,                 { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x31, 2),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_POTION_SHOP_ITEM_4] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_4,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x03,                                              0x33, "Potion Shop Item 4",                          "MK Potion Shop Item 4",                                    RHT_MARKET_POTION_SHOP_ITEM_4,                                   RG_BUY_FAIRYS_SPIRIT,                 { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x31, 3),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_POTION_SHOP_ITEM_5] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_5,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x04,                                              0x34, "Potion Shop Item 5",                          "MK Potion Shop Item 5",                                    RHT_MARKET_POTION_SHOP_ITEM_5,                                   RG_BUY_DEKU_NUTS_5,                   { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x31, 4),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_POTION_SHOP_ITEM_6] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_6,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x05,                                              0x35, "Potion Shop Item 6",                          "MK Potion Shop Item 6",                                    RHT_MARKET_POTION_SHOP_ITEM_6,                                   RG_BUY_BOTTLE_BUG,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x31, 5),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_POTION_SHOP_ITEM_7] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_7,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x06,                                              0x36, "Potion Shop Item 7",                          "MK Potion Shop Item 7",                                    RHT_MARKET_POTION_SHOP_ITEM_7,                                   RG_BUY_POE,                           { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x31, 6),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_POTION_SHOP_ITEM_8] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_8,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x07,                                              0x37, "Potion Shop Item 8",                          "MK Potion Shop Item 8",                                    RHT_MARKET_POTION_SHOP_ITEM_8,                                   RG_BUY_FISH,                          { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x31, 7),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BAZAAR_ITEM_1] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_1,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x00,                                              0x30, "Bazaar Item 1",                               "MK Bazaar Item 1",                                         RHT_MARKET_BAZAAR_ITEM_1,                                        RG_BUY_HYLIAN_SHIELD,                 { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2C, 0),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BAZAAR_ITEM_2] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_2,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x01,                                              0x31, "Bazaar Item 2",                               "MK Bazaar Item 2",                                         RHT_MARKET_BAZAAR_ITEM_2,                                        RG_BUY_BOMBS_535,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2C, 1),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BAZAAR_ITEM_3] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_3,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x02,                                              0x32, "Bazaar Item 3",                               "MK Bazaar Item 3",                                         RHT_MARKET_BAZAAR_ITEM_3,                                        RG_BUY_DEKU_NUTS_5,                   { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2C, 2),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BAZAAR_ITEM_4] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_4,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x03,                                              0x33, "Bazaar Item 4",                               "MK Bazaar Item 4",                                         RHT_MARKET_BAZAAR_ITEM_4,                                        RG_BUY_HEART,                         { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2C, 3),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BAZAAR_ITEM_5] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_5,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x04,                                              0x34, "Bazaar Item 5",                               "MK Bazaar Item 5",                                         RHT_MARKET_BAZAAR_ITEM_5,                                        RG_BUY_ARROWS_10,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2C, 4),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BAZAAR_ITEM_6] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_6,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x05,                                              0x35, "Bazaar Item 6",                               "MK Bazaar Item 6",                                         RHT_MARKET_BAZAAR_ITEM_6,                                        RG_BUY_ARROWS_50,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2C, 5),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BAZAAR_ITEM_7] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_7,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x06,                                              0x36, "Bazaar Item 7",                               "MK Bazaar Item 7",                                         RHT_MARKET_BAZAAR_ITEM_7,                                        RG_BUY_DEKU_STICK_1,                  { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2C, 6),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BAZAAR_ITEM_8] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_8,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x07,                                              0x37, "Bazaar Item 8",                               "MK Bazaar Item 8",                                         RHT_MARKET_BAZAAR_ITEM_8,                                        RG_BUY_ARROWS_30,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2C, 7),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
- 
-    // Zora's Domain 
-    locationTable[RC_ZD_SHOP_ITEM_1] =                                                 Location::Base(RC_ZD_SHOP_ITEM_1,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x00,                                              0x30, "Shop Item 1",                                 "ZD Shop Item 1",                                           RHT_ZD_SHOP_ITEM_1,                                              RG_BUY_ZORA_TUNIC,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2F, 0),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZD_SHOP_ITEM_2] =                                                 Location::Base(RC_ZD_SHOP_ITEM_2,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x01,                                              0x31, "Shop Item 2",                                 "ZD Shop Item 2",                                           RHT_ZD_SHOP_ITEM_2,                                              RG_BUY_ARROWS_10,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2F, 1),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZD_SHOP_ITEM_3] =                                                 Location::Base(RC_ZD_SHOP_ITEM_3,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x02,                                              0x32, "Shop Item 3",                                 "ZD Shop Item 3",                                           RHT_ZD_SHOP_ITEM_3,                                              RG_BUY_HEART,                         { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2F, 2),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZD_SHOP_ITEM_4] =                                                 Location::Base(RC_ZD_SHOP_ITEM_4,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x03,                                              0x33, "Shop Item 4",                                 "ZD Shop Item 4",                                           RHT_ZD_SHOP_ITEM_4,                                              RG_BUY_ARROWS_30,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2F, 3),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZD_SHOP_ITEM_5] =                                                 Location::Base(RC_ZD_SHOP_ITEM_5,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x04,                                              0x34, "Shop Item 5",                                 "ZD Shop Item 5",                                           RHT_ZD_SHOP_ITEM_5,                                              RG_BUY_DEKU_NUTS_5,                   { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2F, 4),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZD_SHOP_ITEM_6] =                                                 Location::Base(RC_ZD_SHOP_ITEM_6,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x05,                                              0x35, "Shop Item 6",                                 "ZD Shop Item 6",                                           RHT_ZD_SHOP_ITEM_6,                                              RG_BUY_ARROWS_50,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2F, 5),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZD_SHOP_ITEM_7] =                                                 Location::Base(RC_ZD_SHOP_ITEM_7,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x06,                                              0x36, "Shop Item 7",                                 "ZD Shop Item 7",                                           RHT_ZD_SHOP_ITEM_7,                                              RG_BUY_FISH,                          { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2F, 6),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZD_SHOP_ITEM_8] =                                                 Location::Base(RC_ZD_SHOP_ITEM_8,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x07,                                              0x37, "Shop Item 8",                                 "ZD Shop Item 8",                                           RHT_ZD_SHOP_ITEM_8,                                              RG_BUY_RED_POTION_50,                 { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2F, 7),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-              
-    // Goron City             
-    locationTable[RC_GC_SHOP_ITEM_1] =                                                 Location::Base(RC_GC_SHOP_ITEM_1,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_GORON_CITY,                   ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x00,                                              0x30, "Shop Item 1",                                 "GC Shop Item 1",                                           RHT_GC_SHOP_ITEM_1,                                              RG_BUY_BOMBS_525,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2E, 0),                                                                                    SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_SHOP_ITEM_2] =                                                 Location::Base(RC_GC_SHOP_ITEM_2,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_GORON_CITY,                   ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x01,                                              0x31, "Shop Item 2",                                 "GC Shop Item 2",                                           RHT_GC_SHOP_ITEM_2,                                              RG_BUY_BOMBS_10,                      { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2E, 1),                                                                                    SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_SHOP_ITEM_3] =                                                 Location::Base(RC_GC_SHOP_ITEM_3,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_GORON_CITY,                   ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x02,                                              0x32, "Shop Item 3",                                 "GC Shop Item 3",                                           RHT_GC_SHOP_ITEM_3,                                              RG_BUY_BOMBS_20,                      { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2E, 2),                                                                                    SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_SHOP_ITEM_4] =                                                 Location::Base(RC_GC_SHOP_ITEM_4,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_GORON_CITY,                   ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x03,                                              0x33, "Shop Item 4",                                 "GC Shop Item 4",                                           RHT_GC_SHOP_ITEM_4,                                              RG_BUY_BOMBS_30,                      { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2E, 3),                                                                                    SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_SHOP_ITEM_5] =                                                 Location::Base(RC_GC_SHOP_ITEM_5,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_GORON_CITY,                   ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x04,                                              0x34, "Shop Item 5",                                 "GC Shop Item 5",                                           RHT_GC_SHOP_ITEM_5,                                              RG_BUY_GORON_TUNIC,                   { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2E, 4),                                                                                    SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_SHOP_ITEM_6] =                                                 Location::Base(RC_GC_SHOP_ITEM_6,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_GORON_CITY,                   ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x05,                                              0x35, "Shop Item 6",                                 "GC Shop Item 6",                                           RHT_GC_SHOP_ITEM_6,                                              RG_BUY_HEART,                         { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2E, 5),                                                                                    SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_SHOP_ITEM_7] =                                                 Location::Base(RC_GC_SHOP_ITEM_7,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_GORON_CITY,                   ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x06,                                              0x36, "Shop Item 7",                                 "GC Shop Item 7",                                           RHT_GC_SHOP_ITEM_7,                                              RG_BUY_RED_POTION_40,                 { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2E, 6),                                                                                    SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_SHOP_ITEM_8] =                                                 Location::Base(RC_GC_SHOP_ITEM_8,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_GORON_CITY,                   ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x07,                                              0x37, "Shop Item 8",                                 "GC Shop Item 8",                                           RHT_GC_SHOP_ITEM_8,                                              RG_BUY_HEART,                         { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2E, 7),                                                                                    SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_1] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_1,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x00,                                              0x30, "Bombchu Shop Item 1",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_1,                                  RG_BUY_BOMBCHU_10,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 0),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_2] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_2,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x01,                                              0x31, "Bombchu Shop Item 2",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_2,                                  RG_BUY_BOMBCHU_10,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 1),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_3] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_3,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x02,                                              0x32, "Bombchu Shop Item 3",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_3,                                  RG_BUY_BOMBCHU_10,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 2),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_4] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_4,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x03,                                              0x33, "Bombchu Shop Item 4",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_4,                                  RG_BUY_BOMBCHU_10,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 3),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_5] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_5,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x04,                                              0x34, "Bombchu Shop Item 5",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_5,                                  RG_BUY_BOMBCHU_20,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 4),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_6] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_6,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x05,                                              0x35, "Bombchu Shop Item 6",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_6,                                  RG_BUY_BOMBCHU_20,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 5),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_7] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_7,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x06,                                              0x36, "Bombchu Shop Item 7",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_7,                                  RG_BUY_BOMBCHU_20,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 6),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_8] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_8,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x07,                                              0x37, "Bombchu Shop Item 8",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_8,                                  RG_BUY_BOMBCHU_20,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 7),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_POTION_SHOP_ITEM_1] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_1,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x00,                                              0x30, "Potion Shop Item 1",                          RHT_MARKET_POTION_SHOP_ITEM_1,                                   RG_BUY_GREEN_POTION,                  { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x31, 0),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_POTION_SHOP_ITEM_2] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_2,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x01,                                              0x31, "Potion Shop Item 2",                          RHT_MARKET_POTION_SHOP_ITEM_2,                                   RG_BUY_BLUE_FIRE,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x31, 1),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_POTION_SHOP_ITEM_3] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_3,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x02,                                              0x32, "Potion Shop Item 3",                          RHT_MARKET_POTION_SHOP_ITEM_3,                                   RG_BUY_RED_POTION_30,                 { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x31, 2),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_POTION_SHOP_ITEM_4] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_4,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x03,                                              0x33, "Potion Shop Item 4",                          RHT_MARKET_POTION_SHOP_ITEM_4,                                   RG_BUY_FAIRYS_SPIRIT,                 { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x31, 3),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_POTION_SHOP_ITEM_5] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_5,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x04,                                              0x34, "Potion Shop Item 5",                          RHT_MARKET_POTION_SHOP_ITEM_5,                                   RG_BUY_DEKU_NUTS_5,                   { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x31, 4),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_POTION_SHOP_ITEM_6] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_6,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x05,                                              0x35, "Potion Shop Item 6",                          RHT_MARKET_POTION_SHOP_ITEM_6,                                   RG_BUY_BOTTLE_BUG,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x31, 5),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_POTION_SHOP_ITEM_7] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_7,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x06,                                              0x36, "Potion Shop Item 7",                          RHT_MARKET_POTION_SHOP_ITEM_7,                                   RG_BUY_POE,                           { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x31, 6),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_POTION_SHOP_ITEM_8] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_8,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x07,                                              0x37, "Potion Shop Item 8",                          RHT_MARKET_POTION_SHOP_ITEM_8,                                   RG_BUY_FISH,                          { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x31, 7),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BAZAAR_ITEM_1] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_1,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x00,                                              0x30, "Bazaar Item 1",                               RHT_MARKET_BAZAAR_ITEM_1,                                        RG_BUY_HYLIAN_SHIELD,                 { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2C, 0),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BAZAAR_ITEM_2] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_2,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x01,                                              0x31, "Bazaar Item 2",                               RHT_MARKET_BAZAAR_ITEM_2,                                        RG_BUY_BOMBS_535,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2C, 1),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BAZAAR_ITEM_3] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_3,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x02,                                              0x32, "Bazaar Item 3",                               RHT_MARKET_BAZAAR_ITEM_3,                                        RG_BUY_DEKU_NUTS_5,                   { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2C, 2),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BAZAAR_ITEM_4] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_4,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x03,                                              0x33, "Bazaar Item 4",                               RHT_MARKET_BAZAAR_ITEM_4,                                        RG_BUY_HEART,                         { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2C, 3),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BAZAAR_ITEM_5] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_5,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x04,                                              0x34, "Bazaar Item 5",                               RHT_MARKET_BAZAAR_ITEM_5,                                        RG_BUY_ARROWS_10,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2C, 4),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BAZAAR_ITEM_6] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_6,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x05,                                              0x35, "Bazaar Item 6",                               RHT_MARKET_BAZAAR_ITEM_6,                                        RG_BUY_ARROWS_50,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2C, 5),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BAZAAR_ITEM_7] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_7,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x06,                                              0x36, "Bazaar Item 7",                               RHT_MARKET_BAZAAR_ITEM_7,                                        RG_BUY_DEKU_STICK_1,                  { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2C, 6),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BAZAAR_ITEM_8] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_8,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x07,                                              0x37, "Bazaar Item 8",                               RHT_MARKET_BAZAAR_ITEM_8,                                        RG_BUY_ARROWS_30,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2C, 7),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+
+    // Zora's Domain
+    locationTable[RC_ZD_SHOP_ITEM_1] =                                                 Location::Base(RC_ZD_SHOP_ITEM_1,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x00,                                              0x30, "Shop Item 1",                                 RHT_ZD_SHOP_ITEM_1,                                              RG_BUY_ZORA_TUNIC,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2F, 0),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZD_SHOP_ITEM_2] =                                                 Location::Base(RC_ZD_SHOP_ITEM_2,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x01,                                              0x31, "Shop Item 2",                                 RHT_ZD_SHOP_ITEM_2,                                              RG_BUY_ARROWS_10,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2F, 1),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZD_SHOP_ITEM_3] =                                                 Location::Base(RC_ZD_SHOP_ITEM_3,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x02,                                              0x32, "Shop Item 3",                                 RHT_ZD_SHOP_ITEM_3,                                              RG_BUY_HEART,                         { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2F, 2),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZD_SHOP_ITEM_4] =                                                 Location::Base(RC_ZD_SHOP_ITEM_4,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x03,                                              0x33, "Shop Item 4",                                 RHT_ZD_SHOP_ITEM_4,                                              RG_BUY_ARROWS_30,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2F, 3),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZD_SHOP_ITEM_5] =                                                 Location::Base(RC_ZD_SHOP_ITEM_5,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x04,                                              0x34, "Shop Item 5",                                 RHT_ZD_SHOP_ITEM_5,                                              RG_BUY_DEKU_NUTS_5,                   { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2F, 4),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZD_SHOP_ITEM_6] =                                                 Location::Base(RC_ZD_SHOP_ITEM_6,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x05,                                              0x35, "Shop Item 6",                                 RHT_ZD_SHOP_ITEM_6,                                              RG_BUY_ARROWS_50,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2F, 5),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZD_SHOP_ITEM_7] =                                                 Location::Base(RC_ZD_SHOP_ITEM_7,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x06,                                              0x36, "Shop Item 7",                                 RHT_ZD_SHOP_ITEM_7,                                              RG_BUY_FISH,                          { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2F, 6),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZD_SHOP_ITEM_8] =                                                 Location::Base(RC_ZD_SHOP_ITEM_8,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x07,                                              0x37, "Shop Item 8",                                 RHT_ZD_SHOP_ITEM_8,                                              RG_BUY_RED_POTION_50,                 { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2F, 7),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+
+    // Goron City
+    locationTable[RC_GC_SHOP_ITEM_1] =                                                 Location::Base(RC_GC_SHOP_ITEM_1,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_GORON_CITY,                   ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x00,                                              0x30, "Shop Item 1",                                 RHT_GC_SHOP_ITEM_1,                                              RG_BUY_BOMBS_525,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2E, 0),                                                                                    SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_SHOP_ITEM_2] =                                                 Location::Base(RC_GC_SHOP_ITEM_2,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_GORON_CITY,                   ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x01,                                              0x31, "Shop Item 2",                                 RHT_GC_SHOP_ITEM_2,                                              RG_BUY_BOMBS_10,                      { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2E, 1),                                                                                    SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_SHOP_ITEM_3] =                                                 Location::Base(RC_GC_SHOP_ITEM_3,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_GORON_CITY,                   ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x02,                                              0x32, "Shop Item 3",                                 RHT_GC_SHOP_ITEM_3,                                              RG_BUY_BOMBS_20,                      { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2E, 2),                                                                                    SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_SHOP_ITEM_4] =                                                 Location::Base(RC_GC_SHOP_ITEM_4,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_GORON_CITY,                   ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x03,                                              0x33, "Shop Item 4",                                 RHT_GC_SHOP_ITEM_4,                                              RG_BUY_BOMBS_30,                      { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2E, 3),                                                                                    SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_SHOP_ITEM_5] =                                                 Location::Base(RC_GC_SHOP_ITEM_5,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_GORON_CITY,                   ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x04,                                              0x34, "Shop Item 5",                                 RHT_GC_SHOP_ITEM_5,                                              RG_BUY_GORON_TUNIC,                   { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2E, 4),                                                                                    SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_SHOP_ITEM_6] =                                                 Location::Base(RC_GC_SHOP_ITEM_6,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_GORON_CITY,                   ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x05,                                              0x35, "Shop Item 6",                                 RHT_GC_SHOP_ITEM_6,                                              RG_BUY_HEART,                         { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2E, 5),                                                                                    SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_SHOP_ITEM_7] =                                                 Location::Base(RC_GC_SHOP_ITEM_7,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_GORON_CITY,                   ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x06,                                              0x36, "Shop Item 7",                                 RHT_GC_SHOP_ITEM_7,                                              RG_BUY_RED_POTION_40,                 { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2E, 6),                                                                                    SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_SHOP_ITEM_8] =                                                 Location::Base(RC_GC_SHOP_ITEM_8,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_GORON_CITY,                   ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x07,                                              0x37, "Shop Item 8",                                 RHT_GC_SHOP_ITEM_8,                                              RG_BUY_HEART,                         { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2E, 7),                                                                                    SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
 
     /* +--------------+
        |  FISHSANITY  |
        +--------------+ */
 
     // Fishing Pond
-    locationTable[RC_LH_CHILD_FISH_1] =                                                Location::Base(RC_LH_CHILD_FISH_1,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 100,                                               0x00, "Child Pond Fish 1",                           "LH Child Pond Fish 1",                                     RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_FISH_2] =                                                Location::Base(RC_LH_CHILD_FISH_2,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 101,                                               0x00, "Child Pond Fish 2",                           "LH Child Pond Fish 2",                                     RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_FISH_3] =                                                Location::Base(RC_LH_CHILD_FISH_3,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 102,                                               0x00, "Child Pond Fish 3",                           "LH Child Pond Fish 3",                                     RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_FISH_4] =                                                Location::Base(RC_LH_CHILD_FISH_4,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 103,                                               0x00, "Child Pond Fish 4",                           "LH Child Pond Fish 4",                                     RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_FISH_5] =                                                Location::Base(RC_LH_CHILD_FISH_5,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 104,                                               0x00, "Child Pond Fish 5",                           "LH Child Pond Fish 5",                                     RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_FISH_6] =                                                Location::Base(RC_LH_CHILD_FISH_6,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 105,                                               0x00, "Child Pond Fish 6",                           "LH Child Pond Fish 6",                                     RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_FISH_7] =                                                Location::Base(RC_LH_CHILD_FISH_7,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 106,                                               0x00, "Child Pond Fish 7",                           "LH Child Pond Fish 7",                                     RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_FISH_8] =                                                Location::Base(RC_LH_CHILD_FISH_8,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 107,                                               0x00, "Child Pond Fish 8",                           "LH Child Pond Fish 8",                                     RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_FISH_9] =                                                Location::Base(RC_LH_CHILD_FISH_9,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 108,                                               0x00, "Child Pond Fish 9",                           "LH Child Pond Fish 9",                                     RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_FISH_10] =                                               Location::Base(RC_LH_CHILD_FISH_10,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 109,                                               0x00, "Child Pond Fish 10",                          "LH Child Pond Fish 10",                                    RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_FISH_11] =                                               Location::Base(RC_LH_CHILD_FISH_11,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 110,                                               0x00, "Child Pond Fish 11",                          "LH Child Pond Fish 11",                                    RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_FISH_12] =                                               Location::Base(RC_LH_CHILD_FISH_12,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 111,                                               0x00, "Child Pond Fish 12",                          "LH Child Pond Fish 12",                                    RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_FISH_13] =                                               Location::Base(RC_LH_CHILD_FISH_13,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 112,                                               0x00, "Child Pond Fish 13",                          "LH Child Pond Fish 13",                                    RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_FISH_14] =                                               Location::Base(RC_LH_CHILD_FISH_14,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 113,                                               0x00, "Child Pond Fish 14",                          "LH Child Pond Fish 14",                                    RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_FISH_15] =                                               Location::Base(RC_LH_CHILD_FISH_15,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 114,                                               0x00, "Child Pond Fish 15",                          "LH Child Pond Fish 15",                                    RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_LOACH_1] =                                               Location::Base(RC_LH_CHILD_LOACH_1,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 115,                                               0x00, "Child Pond Loach 1",                          "LH Child Pond Loach 1",                                    RHT_LH_HYRULE_LOACH,                                             RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_LOACH_2] =                                               Location::Base(RC_LH_CHILD_LOACH_2,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 116,                                               0x00, "Child Pond Loach 2",                          "LH Child Pond Loach 2",                                    RHT_LH_HYRULE_LOACH,                                             RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_FISH_1] =                                                Location::Base(RC_LH_ADULT_FISH_1,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 100,                                               0x00, "Adult Pond Fish 1",                           "LH Adult Pond Fish 1",                                     RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_FISH_2] =                                                Location::Base(RC_LH_ADULT_FISH_2,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 101,                                               0x00, "Adult Pond Fish 2",                           "LH Adult Pond Fish 2",                                     RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_FISH_3] =                                                Location::Base(RC_LH_ADULT_FISH_3,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 102,                                               0x00, "Adult Pond Fish 3",                           "LH Adult Pond Fish 3",                                     RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_FISH_4] =                                                Location::Base(RC_LH_ADULT_FISH_4,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 103,                                               0x00, "Adult Pond Fish 4",                           "LH Adult Pond Fish 4",                                     RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_FISH_5] =                                                Location::Base(RC_LH_ADULT_FISH_5,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 104,                                               0x00, "Adult Pond Fish 5",                           "LH Adult Pond Fish 5",                                     RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_FISH_6] =                                                Location::Base(RC_LH_ADULT_FISH_6,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 105,                                               0x00, "Adult Pond Fish 6",                           "LH Adult Pond Fish 6",                                     RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_FISH_7] =                                                Location::Base(RC_LH_ADULT_FISH_7,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 106,                                               0x00, "Adult Pond Fish 7",                           "LH Adult Pond Fish 7",                                     RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_FISH_8] =                                                Location::Base(RC_LH_ADULT_FISH_8,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 107,                                               0x00, "Adult Pond Fish 8",                           "LH Adult Pond Fish 8",                                     RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_FISH_9] =                                                Location::Base(RC_LH_ADULT_FISH_9,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 108,                                               0x00, "Adult Pond Fish 9",                           "LH Adult Pond Fish 9",                                     RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_FISH_10] =                                               Location::Base(RC_LH_ADULT_FISH_10,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 109,                                               0x00, "Adult Pond Fish 10",                          "LH Adult Pond Fish 10",                                    RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_FISH_11] =                                               Location::Base(RC_LH_ADULT_FISH_11,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 110,                                               0x00, "Adult Pond Fish 11",                          "LH Adult Pond Fish 11",                                    RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_FISH_12] =                                               Location::Base(RC_LH_ADULT_FISH_12,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 111,                                               0x00, "Adult Pond Fish 12",                          "LH Adult Pond Fish 12",                                    RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_FISH_13] =                                               Location::Base(RC_LH_ADULT_FISH_13,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 112,                                               0x00, "Adult Pond Fish 13",                          "LH Adult Pond Fish 13",                                    RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_FISH_14] =                                               Location::Base(RC_LH_ADULT_FISH_14,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 113,                                               0x00, "Adult Pond Fish 14",                          "LH Adult Pond Fish 14",                                    RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_FISH_15] =                                               Location::Base(RC_LH_ADULT_FISH_15,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 114,                                               0x00, "Adult Pond Fish 15",                          "LH Adult Pond Fish 15",                                    RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_LOACH] =                                                 Location::Base(RC_LH_ADULT_LOACH,                                               RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 115,                                               0x00, "Adult Pond Loach",                            "LH Adult Pond Loach",                                      RHT_LH_HYRULE_LOACH,                                             RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISH_1] =                                                Location::Base(RC_LH_CHILD_FISH_1,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 100,                                               0x00, "Child Pond Fish 1",                           RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISH_2] =                                                Location::Base(RC_LH_CHILD_FISH_2,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 101,                                               0x00, "Child Pond Fish 2",                           RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISH_3] =                                                Location::Base(RC_LH_CHILD_FISH_3,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 102,                                               0x00, "Child Pond Fish 3",                           RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISH_4] =                                                Location::Base(RC_LH_CHILD_FISH_4,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 103,                                               0x00, "Child Pond Fish 4",                           RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISH_5] =                                                Location::Base(RC_LH_CHILD_FISH_5,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 104,                                               0x00, "Child Pond Fish 5",                           RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISH_6] =                                                Location::Base(RC_LH_CHILD_FISH_6,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 105,                                               0x00, "Child Pond Fish 6",                           RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISH_7] =                                                Location::Base(RC_LH_CHILD_FISH_7,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 106,                                               0x00, "Child Pond Fish 7",                           RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISH_8] =                                                Location::Base(RC_LH_CHILD_FISH_8,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 107,                                               0x00, "Child Pond Fish 8",                           RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISH_9] =                                                Location::Base(RC_LH_CHILD_FISH_9,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 108,                                               0x00, "Child Pond Fish 9",                           RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISH_10] =                                               Location::Base(RC_LH_CHILD_FISH_10,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 109,                                               0x00, "Child Pond Fish 10",                          RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISH_11] =                                               Location::Base(RC_LH_CHILD_FISH_11,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 110,                                               0x00, "Child Pond Fish 11",                          RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISH_12] =                                               Location::Base(RC_LH_CHILD_FISH_12,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 111,                                               0x00, "Child Pond Fish 12",                          RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISH_13] =                                               Location::Base(RC_LH_CHILD_FISH_13,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 112,                                               0x00, "Child Pond Fish 13",                          RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISH_14] =                                               Location::Base(RC_LH_CHILD_FISH_14,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 113,                                               0x00, "Child Pond Fish 14",                          RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISH_15] =                                               Location::Base(RC_LH_CHILD_FISH_15,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 114,                                               0x00, "Child Pond Fish 15",                          RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_LOACH_1] =                                               Location::Base(RC_LH_CHILD_LOACH_1,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 115,                                               0x00, "Child Pond Loach 1",                          RHT_LH_HYRULE_LOACH,                                             RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_LOACH_2] =                                               Location::Base(RC_LH_CHILD_LOACH_2,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 116,                                               0x00, "Child Pond Loach 2",                          RHT_LH_HYRULE_LOACH,                                             RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_FISH_1] =                                                Location::Base(RC_LH_ADULT_FISH_1,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 100,                                               0x00, "Adult Pond Fish 1",                           RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_FISH_2] =                                                Location::Base(RC_LH_ADULT_FISH_2,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 101,                                               0x00, "Adult Pond Fish 2",                           RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_FISH_3] =                                                Location::Base(RC_LH_ADULT_FISH_3,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 102,                                               0x00, "Adult Pond Fish 3",                           RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_FISH_4] =                                                Location::Base(RC_LH_ADULT_FISH_4,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 103,                                               0x00, "Adult Pond Fish 4",                           RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_FISH_5] =                                                Location::Base(RC_LH_ADULT_FISH_5,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 104,                                               0x00, "Adult Pond Fish 5",                           RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_FISH_6] =                                                Location::Base(RC_LH_ADULT_FISH_6,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 105,                                               0x00, "Adult Pond Fish 6",                           RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_FISH_7] =                                                Location::Base(RC_LH_ADULT_FISH_7,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 106,                                               0x00, "Adult Pond Fish 7",                           RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_FISH_8] =                                                Location::Base(RC_LH_ADULT_FISH_8,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 107,                                               0x00, "Adult Pond Fish 8",                           RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_FISH_9] =                                                Location::Base(RC_LH_ADULT_FISH_9,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 108,                                               0x00, "Adult Pond Fish 9",                           RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_FISH_10] =                                               Location::Base(RC_LH_ADULT_FISH_10,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 109,                                               0x00, "Adult Pond Fish 10",                          RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_FISH_11] =                                               Location::Base(RC_LH_ADULT_FISH_11,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 110,                                               0x00, "Adult Pond Fish 11",                          RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_FISH_12] =                                               Location::Base(RC_LH_ADULT_FISH_12,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 111,                                               0x00, "Adult Pond Fish 12",                          RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_FISH_13] =                                               Location::Base(RC_LH_ADULT_FISH_13,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 112,                                               0x00, "Adult Pond Fish 13",                          RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_FISH_14] =                                               Location::Base(RC_LH_ADULT_FISH_14,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 113,                                               0x00, "Adult Pond Fish 14",                          RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_FISH_15] =                                               Location::Base(RC_LH_ADULT_FISH_15,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 114,                                               0x00, "Adult Pond Fish 15",                          RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_ADULT_LOACH] =                                                 Location::Base(RC_LH_ADULT_LOACH,                                               RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 115,                                               0x00, "Adult Pond Loach",                            RHT_LH_HYRULE_LOACH,                                             RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
     // Grotto fish
-    locationTable[RC_KF_STORMS_GROTTO_FISH] =                                          Location::Base(RC_KF_STORMS_GROTTO_FISH,                                        RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_KOKIRI_FOREST,                ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                                 0x00, "Storms Grotto Fish",                          "KF Storms Grotto Fish",                                    RHT_KF_STORMS_GROTTO_FISH,                                       RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0x2C, SCENE_GROTTOS),                                                                            SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_FISH] =                                  Location::Base(RC_LW_NEAR_SHORTCUTS_GROTTO_FISH,                                RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LOST_WOODS,                   ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                                 0x00, "Near Shortcuts Grotto Fish",                  "LW Near Shortcuts Grotto Fish",                            RHT_LW_NEAR_SHORTCUTS_GROTTO_FISH,                               RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0x14, SCENE_GROTTOS),                                                                            SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[RC_HF_SOUTHEAST_GROTTO_FISH] =                                       Location::Base(RC_HF_SOUTHEAST_GROTTO_FISH,                                     RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_HYRULE_FIELD,                 ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                                 0x00, "Southeast Grotto Fish",                       "HF Southeast Grotto Fish",                                 RHT_HF_SOUTHEAST_GROTTO_FISH,                                    RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0x22, SCENE_GROTTOS),                                                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[RC_HF_OPEN_GROTTO_FISH] =                                            Location::Base(RC_HF_OPEN_GROTTO_FISH,                                          RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_HYRULE_FIELD,                 ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                                 0x00, "Open Grotto Fish",                            "HF Open Grotto Fish",                                      RHT_HF_OPEN_GROTTO_FISH,                                         RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0x03, SCENE_GROTTOS),                                                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[RC_HF_NEAR_MARKET_GROTTO_FISH] =                                     Location::Base(RC_HF_NEAR_MARKET_GROTTO_FISH,                                   RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_HYRULE_FIELD,                 ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                                 0x00, "Near Market Grotto Fish",                     "HF Near Market Grotto Fish",                               RHT_HF_NEAR_MARKET_GROTTO_FISH,                                  RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0x00, SCENE_GROTTOS),                                                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[RC_KAK_OPEN_GROTTO_FISH] =                                           Location::Base(RC_KAK_OPEN_GROTTO_FISH,                                         RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                                 0x00, "Open Grotto Fish",                            "Kak Open Grotto Fish",                                     RHT_KAK_OPEN_GROTTO_FISH,                                        RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0x28, SCENE_GROTTOS),                                                                            SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_DMT_STORMS_GROTTO_FISH] =                                         Location::Base(RC_DMT_STORMS_GROTTO_FISH,                                       RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                                 0x00, "Storms Grotto Fish",                          "DMT Storms Grotto Fish",                                   RHT_DMT_STORMS_GROTTO_FISH,                                      RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0x57, SCENE_GROTTOS),                                                                            SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMC_UPPER_GROTTO_FISH] =                                          Location::Base(RC_DMC_UPPER_GROTTO_FISH,                                        RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                                 0x00, "Upper Grotto Fish",                           "DMC Upper Grotto Fish",                                    RHT_DMC_UPPER_GROTTO_FISH,                                       RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0x7A, SCENE_GROTTOS),                                                                            SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_ZR_OPEN_GROTTO_FISH] =                                            Location::Base(RC_ZR_OPEN_GROTTO_FISH,                                          RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_ZORAS_RIVER,                  ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                                 0x00, "Open Grotto Fish",                            "ZR Open Grotto Fish",                                      RHT_ZR_OPEN_GROTTO_FISH,                                         RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0x29, SCENE_GROTTOS),                                                                            SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_KF_STORMS_GROTTO_FISH] =                                          Location::Base(RC_KF_STORMS_GROTTO_FISH,                                        RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_KOKIRI_FOREST,                ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                                 0x00, "Storms Grotto Fish",                          RHT_KF_STORMS_GROTTO_FISH,                                       RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0x2C, SCENE_GROTTOS),                                                                            SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_FISH] =                                  Location::Base(RC_LW_NEAR_SHORTCUTS_GROTTO_FISH,                                RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LOST_WOODS,                   ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                                 0x00, "Near Shortcuts Grotto Fish",                  RHT_LW_NEAR_SHORTCUTS_GROTTO_FISH,                               RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0x14, SCENE_GROTTOS),                                                                            SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_HF_SOUTHEAST_GROTTO_FISH] =                                       Location::Base(RC_HF_SOUTHEAST_GROTTO_FISH,                                     RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_HYRULE_FIELD,                 ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                                 0x00, "Southeast Grotto Fish",                       RHT_HF_SOUTHEAST_GROTTO_FISH,                                    RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0x22, SCENE_GROTTOS),                                                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_HF_OPEN_GROTTO_FISH] =                                            Location::Base(RC_HF_OPEN_GROTTO_FISH,                                          RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_HYRULE_FIELD,                 ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                                 0x00, "Open Grotto Fish",                            RHT_HF_OPEN_GROTTO_FISH,                                         RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0x03, SCENE_GROTTOS),                                                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_HF_NEAR_MARKET_GROTTO_FISH] =                                     Location::Base(RC_HF_NEAR_MARKET_GROTTO_FISH,                                   RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_HYRULE_FIELD,                 ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                                 0x00, "Near Market Grotto Fish",                     RHT_HF_NEAR_MARKET_GROTTO_FISH,                                  RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0x00, SCENE_GROTTOS),                                                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_KAK_OPEN_GROTTO_FISH] =                                           Location::Base(RC_KAK_OPEN_GROTTO_FISH,                                         RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                                 0x00, "Open Grotto Fish",                            RHT_KAK_OPEN_GROTTO_FISH,                                        RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0x28, SCENE_GROTTOS),                                                                            SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_DMT_STORMS_GROTTO_FISH] =                                         Location::Base(RC_DMT_STORMS_GROTTO_FISH,                                       RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                                 0x00, "Storms Grotto Fish",                          RHT_DMT_STORMS_GROTTO_FISH,                                      RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0x57, SCENE_GROTTOS),                                                                            SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMC_UPPER_GROTTO_FISH] =                                          Location::Base(RC_DMC_UPPER_GROTTO_FISH,                                        RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                                 0x00, "Upper Grotto Fish",                           RHT_DMC_UPPER_GROTTO_FISH,                                       RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0x7A, SCENE_GROTTOS),                                                                            SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_ZR_OPEN_GROTTO_FISH] =                                            Location::Base(RC_ZR_OPEN_GROTTO_FISH,                                          RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_ZORAS_RIVER,                  ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                                 0x00, "Open Grotto Fish",                            RHT_ZR_OPEN_GROTTO_FISH,                                         RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0x29, SCENE_GROTTOS),                                                                            SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
     // Zora's Domain fish
-    locationTable[RC_ZD_FISH_1] =                                                      Location::Base(RC_ZD_FISH_1,                                                    RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_FISH,        SCENE_ZORAS_DOMAIN,                 -1 ^ 0,                                            0x00, "Fish 1",                                      "ZD Fish 1",                                                RHT_ZD_FISH,                                                     RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF, SCENE_ZORAS_DOMAIN),                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZD_FISH_2] =                                                      Location::Base(RC_ZD_FISH_2,                                                    RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_FISH,        SCENE_ZORAS_DOMAIN,                 -1 ^ 1,                                            0x00, "Fish 2",                                      "ZD Fish 2",                                                RHT_ZD_FISH,                                                     RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF, SCENE_ZORAS_DOMAIN),                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZD_FISH_3] =                                                      Location::Base(RC_ZD_FISH_3,                                                    RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_FISH,        SCENE_ZORAS_DOMAIN,                 -1 ^ 2,                                            0x00, "Fish 3",                                      "ZD Fish 3",                                                RHT_ZD_FISH,                                                     RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF, SCENE_ZORAS_DOMAIN),                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZD_FISH_4] =                                                      Location::Base(RC_ZD_FISH_4,                                                    RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_FISH,        SCENE_ZORAS_DOMAIN,                 -1 ^ 3,                                            0x00, "Fish 4",                                      "ZD Fish 4",                                                RHT_ZD_FISH,                                                     RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF, SCENE_ZORAS_DOMAIN),                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZD_FISH_5] =                                                      Location::Base(RC_ZD_FISH_5,                                                    RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_FISH,        SCENE_ZORAS_DOMAIN,                 -1 ^ 4,                                            0x00, "Fish 5",                                      "ZD Fish 5",                                                RHT_ZD_FISH,                                                     RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF, SCENE_ZORAS_DOMAIN),                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZD_FISH_1] =                                                      Location::Base(RC_ZD_FISH_1,                                                    RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_FISH,        SCENE_ZORAS_DOMAIN,                 -1 ^ 0,                                            0x00, "Fish 1",                                      RHT_ZD_FISH,                                                     RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF, SCENE_ZORAS_DOMAIN),                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZD_FISH_2] =                                                      Location::Base(RC_ZD_FISH_2,                                                    RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_FISH,        SCENE_ZORAS_DOMAIN,                 -1 ^ 1,                                            0x00, "Fish 2",                                      RHT_ZD_FISH,                                                     RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF, SCENE_ZORAS_DOMAIN),                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZD_FISH_3] =                                                      Location::Base(RC_ZD_FISH_3,                                                    RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_FISH,        SCENE_ZORAS_DOMAIN,                 -1 ^ 2,                                            0x00, "Fish 3",                                      RHT_ZD_FISH,                                                     RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF, SCENE_ZORAS_DOMAIN),                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZD_FISH_4] =                                                      Location::Base(RC_ZD_FISH_4,                                                    RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_FISH,        SCENE_ZORAS_DOMAIN,                 -1 ^ 3,                                            0x00, "Fish 4",                                      RHT_ZD_FISH,                                                     RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF, SCENE_ZORAS_DOMAIN),                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZD_FISH_5] =                                                      Location::Base(RC_ZD_FISH_5,                                                    RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_FISH,        SCENE_ZORAS_DOMAIN,                 -1 ^ 4,                                            0x00, "Fish 5",                                      RHT_ZD_FISH,                                                     RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF, SCENE_ZORAS_DOMAIN),                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
 
 
     // Gossip Stones
-    locationTable[RC_DMC_GOSSIP_STONE] =                                          Location::HintStone(RC_DMC_GOSSIP_STONE,                                             RCQUEST_BOTH,                                        RCAREA_DEATH_MOUNTAIN_CRATER,                              SCENE_DEATH_MOUNTAIN_CRATER,        14341,                                             0x05, "Gossip Stone",                                "DMC Gossip Stone",                {});
-    locationTable[RC_DMT_GOSSIP_STONE] =                                          Location::HintStone(RC_DMT_GOSSIP_STONE,                                             RCQUEST_BOTH,                                        RCAREA_DEATH_MOUNTAIN_TRAIL,                               SCENE_DEATH_MOUNTAIN_TRAIL,         14340,                                             0x04, "Gossip Stone",                                "DMT Gossip Stone",                {});
-    locationTable[RC_COLOSSUS_GOSSIP_STONE] =                                     Location::HintStone(RC_COLOSSUS_GOSSIP_STONE,                                        RCQUEST_BOTH,                                        RCAREA_DESERT_COLOSSUS,                                    SCENE_DESERT_COLOSSUS,              14362,                                             0x1A, "Gossip Stone",                                "Colossus Gossip Stone",           {});
-    locationTable[RC_DODONGOS_CAVERN_GOSSIP_STONE] =                              Location::HintStone(RC_DODONGOS_CAVERN_GOSSIP_STONE,                                 RCQUEST_VANILLA,                                     RCAREA_DODONGOS_CAVERN,                                    SCENE_DODONGOS_CAVERN,              4372,                                              0x14, "Gossip Stone",                                "Dodongo's Cavern Gossip Stone",   {});
-    locationTable[RC_GV_GOSSIP_STONE] =                                           Location::HintStone(RC_GV_GOSSIP_STONE,                                              RCQUEST_BOTH,                                        RCAREA_GERUDO_VALLEY,                                      SCENE_GERUDO_VALLEY,                14353,                                             0x11, "Gossip Stone",                                "GV Gossip Stone",                 {});
-    locationTable[RC_GC_MAZE_GOSSIP_STONE] =                                      Location::HintStone(RC_GC_MAZE_GOSSIP_STONE,                                         RCQUEST_BOTH,                                        RCAREA_GORON_CITY,                                         SCENE_GORON_CITY,                   14357,                                             0x15, "Maze Gossip Stone",                           "GC Maze Gossip Stone",            {});
-    locationTable[RC_GC_MEDIGORON_GOSSIP_STONE] =                                 Location::HintStone(RC_GC_MEDIGORON_GOSSIP_STONE,                                    RCQUEST_BOTH,                                        RCAREA_GORON_CITY,                                         SCENE_GORON_CITY,                   14873,                                             0x19, "Medigoron Gossip Stone",                      "GC Medigoron Gossip Stone",       {});
-    locationTable[RC_GRAVEYARD_GOSSIP_STONE] =                                    Location::HintStone(RC_GRAVEYARD_GOSSIP_STONE,                                       RCQUEST_BOTH,                                        RCAREA_GRAVEYARD,                                          SCENE_GRAVEYARD,                    14346,                                             0x0A, "Gossip Stone",                                "GY Gossip Stone",                 {});
-    locationTable[RC_HC_MALON_GOSSIP_STONE] =                                     Location::HintStone(RC_HC_MALON_GOSSIP_STONE,                                        RCQUEST_BOTH,                                        RCAREA_HYRULE_CASTLE,                                      SCENE_HYRULE_CASTLE,                14610,                                             0x12, "Malon Gossip Stone",                          "HC Malon Gossip Stone",           {});
-    locationTable[RC_HC_ROCK_WALL_GOSSIP_STONE] =                                 Location::HintStone(RC_HC_ROCK_WALL_GOSSIP_STONE,                                    RCQUEST_BOTH,                                        RCAREA_HYRULE_CASTLE,                                      SCENE_HYRULE_CASTLE,                14347,                                             0x0B, "Rock Wall Gossip Stone",                      "HC Rock Wall Gossip Stone",       {});
-    locationTable[RC_HC_STORMS_GROTTO_GOSSIP_STONE] =                             Location::HintStone(RC_HC_STORMS_GROTTO_GOSSIP_STONE,                                RCQUEST_BOTH,                                        RCAREA_HYRULE_CASTLE,                                      SCENE_GROTTOS,                      14355,                                             0x13, "Storms Grotto Gossip Stone",                  "HC Storms Grotto Gossip Stone",   {});
-    locationTable[RC_KF_DEKU_TREE_LEFT_GOSSIP_STONE] =                            Location::HintStone(RC_KF_DEKU_TREE_LEFT_GOSSIP_STONE,                               RCQUEST_BOTH,                                        RCAREA_KOKIRI_FOREST,                                      SCENE_KOKIRI_FOREST,                14623,                                             0x1F, "Deku Tree Left Gossip Stone",                 "KF Deku Tree Left Gossip Stone",  {});
-    locationTable[RC_KF_DEKU_TREE_RIGHT_GOSSIP_STONE] =                           Location::HintStone(RC_KF_DEKU_TREE_RIGHT_GOSSIP_STONE,                              RCQUEST_BOTH,                                        RCAREA_KOKIRI_FOREST,                                      SCENE_KOKIRI_FOREST,                14880,                                             0x20, "Deku Tree Right Gossip Stone",                "KF Deku Tree Right Gossip Stone", {});
-    locationTable[RC_KF_GOSSIP_STONE] =                                           Location::HintStone(RC_KF_GOSSIP_STONE,                                              RCQUEST_BOTH,                                        RCAREA_KOKIRI_FOREST,                                      SCENE_KOKIRI_FOREST,                14366,                                             0x1E, "Gossip Stone",                                "KF Gossip Stone",                 {});
-    locationTable[RC_KF_STORMS_GROTTO_GOSSIP_STONE] =                             Location::HintStone(RC_KF_STORMS_GROTTO_GOSSIP_STONE,                                RCQUEST_BOTH,                                        RCAREA_KOKIRI_FOREST,                                      SCENE_GROTTOS,                      -22988,                                            0x3C, "Storms Gossip Stone",                         "KF Storms Gossip Stone",          {});
-    locationTable[RC_LH_LAB_GOSSIP_STONE] =                                       Location::HintStone(RC_LH_LAB_GOSSIP_STONE,                                          RCQUEST_BOTH,                                        RCAREA_LAKE_HYLIA,                                         SCENE_LAKE_HYLIA,                   14339,                                             0x03, "Lab Gossip Stone",                            "LH Lab Gossip Stone",             {});
-    locationTable[RC_LH_SOUTHEAST_GOSSIP_STONE] =                                 Location::HintStone(RC_LH_SOUTHEAST_GOSSIP_STONE,                                    RCQUEST_BOTH,                                        RCAREA_LAKE_HYLIA,                                         SCENE_LAKE_HYLIA,                   14863,                                             0x0F, "Southeast Gossip Stone",                      "LH Southeast Gossip Stone",       {});
-    locationTable[RC_LH_SOUTHWEST_GOSSIP_STONE] =                                 Location::HintStone(RC_LH_SOUTHWEST_GOSSIP_STONE,                                    RCQUEST_BOTH,                                        RCAREA_LAKE_HYLIA,                                         SCENE_LAKE_HYLIA,                   14600,                                             0x08, "Southwest Gossip Stone",                      "LH Southwest Gossip Stone",       {});
-    locationTable[RC_LW_GOSSIP_STONE] =                                           Location::HintStone(RC_LW_GOSSIP_STONE,                                              RCQUEST_BOTH,                                        RCAREA_LOST_WOODS,                                         SCENE_LOST_WOODS,                   14365,                                             0x1D, "Gossip Stone",                                "LW Gossip Stone",                 {});
-    locationTable[RC_SFM_MAZE_LOWER_GOSSIP_STONE] =                               Location::HintStone(RC_SFM_MAZE_LOWER_GOSSIP_STONE,                                  RCQUEST_BOTH,                                        RCAREA_SACRED_FOREST_MEADOW,                               SCENE_SACRED_FOREST_MEADOW,         14358,                                             0x16, "Maze Lower Gossip Stone",                     "SFM Maze Lower Gossip Stone",     {});
-    locationTable[RC_SFM_MAZE_UPPER_GOSSIP_STONE] =                               Location::HintStone(RC_SFM_MAZE_UPPER_GOSSIP_STONE,                                  RCQUEST_BOTH,                                        RCAREA_SACRED_FOREST_MEADOW,                               SCENE_SACRED_FOREST_MEADOW,         14615,                                             0x17, "Maze Upper Gossip Stone",                     "SFM Maze Upper Gossip Stone",     {});
-    locationTable[RC_SFM_SARIA_GOSSIP_STONE] =                                    Location::HintStone(RC_SFM_SARIA_GOSSIP_STONE,                                       RCQUEST_BOTH,                                        RCAREA_SACRED_FOREST_MEADOW,                               SCENE_SACRED_FOREST_MEADOW,         14876,                                             0x1C, "Saria Gossip Stone",                          "SFM Saria Gossip Stone",          {});
-    locationTable[RC_TOT_LEFTMOST_GOSSIP_STONE] =                                 Location::HintStone(RC_TOT_LEFTMOST_GOSSIP_STONE,                                    RCQUEST_BOTH,                                        RCAREA_MARKET,                                             SCENE_ID_MAX,                       0x00,                                              0x06, "ToT Left Gossip Stone",                       "ToT Left Gossip Stone",           {});
-    locationTable[RC_TOT_RIGHTMOST_GOSSIP_STONE] =                                Location::HintStone(RC_TOT_RIGHTMOST_GOSSIP_STONE,                                   RCQUEST_BOTH,                                        RCAREA_MARKET,                                             SCENE_ID_MAX,                       0x00,                                              0x07, "ToT Right Gossip Stone",                      "ToT Right Gossip Stone",          {});
-    locationTable[RC_TOT_RIGHT_CENTER_GOSSIP_STONE] =                             Location::HintStone(RC_TOT_RIGHT_CENTER_GOSSIP_STONE,                                RCQUEST_BOTH,                                        RCAREA_MARKET,                                             SCENE_ID_MAX,                       0x00,                                              0x10, "ToT Right Center Gossip Stone",               "ToT Right Center Gossip Stone",   {});
-    locationTable[RC_TOT_LEFT_CENTER_GOSSIP_STONE] =                              Location::HintStone(RC_TOT_LEFT_CENTER_GOSSIP_STONE,                                 RCQUEST_BOTH,                                        RCAREA_MARKET,                                             SCENE_ID_MAX,                       0x00,                                              0x0E, "ToT Left Center Gossip Stone",                "ToT Left Center Gossip Stone",    {});
-    locationTable[RC_ZD_GOSSIP_STONE] =                                           Location::HintStone(RC_ZD_GOSSIP_STONE,                                              RCQUEST_BOTH,                                        RCAREA_ZORAS_DOMAIN,                                       SCENE_ZORAS_DOMAIN,                 14345,                                             0x09, "Gossip Stone",                                "ZD Gossip Stone",                 {});
-    locationTable[RC_ZF_FAIRY_GOSSIP_STONE] =                                     Location::HintStone(RC_ZF_FAIRY_GOSSIP_STONE,                                        RCQUEST_BOTH,                                        RCAREA_ZORAS_FOUNTAIN,                                     SCENE_ZORAS_FOUNTAIN,               0x00,                                              0x01, "Fairy Gossip Stone",                          "Fairy Gossip Stone",              {});
-    locationTable[RC_ZF_JABU_GOSSIP_STONE] =                                      Location::HintStone(RC_ZF_JABU_GOSSIP_STONE,                                         RCQUEST_BOTH,                                        RCAREA_ZORAS_FOUNTAIN,                                     SCENE_ZORAS_FOUNTAIN,               0x00,                                              0x02, "Jabu Gossip Stone",                           "Jabu Gossip Stone",               {});
-    locationTable[RC_ZR_NEAR_GROTTOS_GOSSIP_STONE] =                              Location::HintStone(RC_ZR_NEAR_GROTTOS_GOSSIP_STONE,                                 RCQUEST_BOTH,                                        RCAREA_ZORAS_RIVER,                                        SCENE_ZORAS_RIVER,                  14605,                                             0x0D, "Near Grottos Gossip Stone",                   "ZR Near Grottos Gossip Stone",    {});
-    locationTable[RC_ZR_NEAR_DOMAIN_GOSSIP_STONE] =                               Location::HintStone(RC_ZR_NEAR_DOMAIN_GOSSIP_STONE,                                  RCQUEST_BOTH,                                        RCAREA_ZORAS_RIVER,                                        SCENE_ZORAS_RIVER,                  14860,                                             0x0C, "Near Domain Gossip Stone",                    "ZR Near Domain Gossip Stone",     {});
-    locationTable[RC_HF_COW_GROTTO_GOSSIP_STONE] =                                Location::HintStone(RC_HF_COW_GROTTO_GOSSIP_STONE,                                   RCQUEST_BOTH,                                        RCAREA_HYRULE_FIELD,                                       SCENE_GROTTOS,                      14363,                                             0x1B, "Cow Grotto Gossip Stone",                     "HF Cow Grotto Gossip Stone",      {});
-    locationTable[RC_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE] =                        Location::HintStone(RC_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE,                           RCQUEST_BOTH,                                        RCAREA_HYRULE_FIELD,                                       SCENE_GROTTOS,                      -22944,                                            0x30, "Near Market Gossip Stone",                    "HF Near Market Gossip Stone",     {});
-    locationTable[RC_HF_SOUTHEAST_GROTTO_GOSSIP_STONE] =                          Location::HintStone(RC_HF_SOUTHEAST_GROTTO_GOSSIP_STONE,                             RCQUEST_BOTH,                                        RCAREA_HYRULE_FIELD,                                       SCENE_GROTTOS,                      -22978,                                            0x32, "Southeast Gossip Stone",                      "HF Southeast Gossip Stone",       {});
-    locationTable[RC_HF_OPEN_GROTTO_GOSSIP_STONE] =                               Location::HintStone(RC_HF_OPEN_GROTTO_GOSSIP_STONE,                                  RCQUEST_BOTH,                                        RCAREA_HYRULE_FIELD,                                       SCENE_GROTTOS,                      -22947,                                            0x33, "Open Grotto Gossip Stone",                    "HF Open Grotto Gossip Stone",     {});
-    locationTable[RC_KAK_OPEN_GROTTO_GOSSIP_STONE] =                              Location::HintStone(RC_KAK_OPEN_GROTTO_GOSSIP_STONE,                                 RCQUEST_BOTH,                                        RCAREA_KAKARIKO_VILLAGE,                                   SCENE_GROTTOS,                      -22984,                                            0x38, "Open Grotto Gossip Stone",                    "Kak Open Grotto Gossip Stone",    {});
-    locationTable[RC_ZR_OPEN_GROTTO_GOSSIP_STONE] =                               Location::HintStone(RC_ZR_OPEN_GROTTO_GOSSIP_STONE,                                  RCQUEST_BOTH,                                        RCAREA_ZORAS_RIVER,                                        SCENE_GROTTOS,                      -22985,                                            0x39, "Open Grotto Gossip Stone",                    "ZR Open Grotto Gossip Stone",     {});
-    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE] =                     Location::HintStone(RC_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE,                        RCQUEST_BOTH,                                        RCAREA_LOST_WOODS,                                         SCENE_GROTTOS,                      -22964,                                            0x34, "Near Shortcuts Gossip Stone",                 "LW Near Shortcuts Gossip Stone",  {});
-    locationTable[RC_DMT_STORMS_GROTTO_GOSSIP_STONE] =                            Location::HintStone(RC_DMT_STORMS_GROTTO_GOSSIP_STONE,                               RCQUEST_BOTH,                                        RCAREA_DEATH_MOUNTAIN_TRAIL,                               SCENE_GROTTOS,                      -23255,                                            0x37, "Storms Grotto Gossip Stone",                  "DMT Storms Grotto Gossip Stone",  {});
-    locationTable[RC_DMC_UPPER_GROTTO_GOSSIP_STONE] =                             Location::HintStone(RC_DMC_UPPER_GROTTO_GOSSIP_STONE,                                RCQUEST_BOTH,                                        RCAREA_DEATH_MOUNTAIN_CRATER,                              SCENE_GROTTOS,                      -23802,                                            0x3A, "Upper Grotto Gossip Stone",                   "DMC Upper Grotto Gossip Stone",   {});
+    locationTable[RC_DMC_GOSSIP_STONE] =                                          Location::HintStone(RC_DMC_GOSSIP_STONE,                                             RCQUEST_BOTH,                                        RCAREA_DEATH_MOUNTAIN_CRATER,                              SCENE_DEATH_MOUNTAIN_CRATER,        14341,                                             0x05, "Gossip Stone",                  {});
+    locationTable[RC_DMT_GOSSIP_STONE] =                                          Location::HintStone(RC_DMT_GOSSIP_STONE,                                             RCQUEST_BOTH,                                        RCAREA_DEATH_MOUNTAIN_TRAIL,                               SCENE_DEATH_MOUNTAIN_TRAIL,         14340,                                             0x04, "Gossip Stone",                  {});
+    locationTable[RC_COLOSSUS_GOSSIP_STONE] =                                     Location::HintStone(RC_COLOSSUS_GOSSIP_STONE,                                        RCQUEST_BOTH,                                        RCAREA_DESERT_COLOSSUS,                                    SCENE_DESERT_COLOSSUS,              14362,                                             0x1A, "Gossip Stone",                  {});
+    locationTable[RC_DODONGOS_CAVERN_GOSSIP_STONE] =                              Location::HintStone(RC_DODONGOS_CAVERN_GOSSIP_STONE,                                 RCQUEST_VANILLA,                                     RCAREA_DODONGOS_CAVERN,                                    SCENE_DODONGOS_CAVERN,              4372,                                              0x14, "Gossip Stone",                  {});
+    locationTable[RC_GV_GOSSIP_STONE] =                                           Location::HintStone(RC_GV_GOSSIP_STONE,                                              RCQUEST_BOTH,                                        RCAREA_GERUDO_VALLEY,                                      SCENE_GERUDO_VALLEY,                14353,                                             0x11, "Gossip Stone",                  {});
+    locationTable[RC_GC_MAZE_GOSSIP_STONE] =                                      Location::HintStone(RC_GC_MAZE_GOSSIP_STONE,                                         RCQUEST_BOTH,                                        RCAREA_GORON_CITY,                                         SCENE_GORON_CITY,                   14357,                                             0x15, "Maze Gossip Stone",             {});
+    locationTable[RC_GC_MEDIGORON_GOSSIP_STONE] =                                 Location::HintStone(RC_GC_MEDIGORON_GOSSIP_STONE,                                    RCQUEST_BOTH,                                        RCAREA_GORON_CITY,                                         SCENE_GORON_CITY,                   14873,                                             0x19, "Medigoron Gossip Stone",        {});
+    locationTable[RC_GRAVEYARD_GOSSIP_STONE] =                                    Location::HintStone(RC_GRAVEYARD_GOSSIP_STONE,                                       RCQUEST_BOTH,                                        RCAREA_GRAVEYARD,                                          SCENE_GRAVEYARD,                    14346,                                             0x0A, "Gossip Stone",                  {});
+    locationTable[RC_HC_MALON_GOSSIP_STONE] =                                     Location::HintStone(RC_HC_MALON_GOSSIP_STONE,                                        RCQUEST_BOTH,                                        RCAREA_HYRULE_CASTLE,                                      SCENE_HYRULE_CASTLE,                14610,                                             0x12, "Malon Gossip Stone",            {});
+    locationTable[RC_HC_ROCK_WALL_GOSSIP_STONE] =                                 Location::HintStone(RC_HC_ROCK_WALL_GOSSIP_STONE,                                    RCQUEST_BOTH,                                        RCAREA_HYRULE_CASTLE,                                      SCENE_HYRULE_CASTLE,                14347,                                             0x0B, "Rock Wall Gossip Stone",        {});
+    locationTable[RC_HC_STORMS_GROTTO_GOSSIP_STONE] =                             Location::HintStone(RC_HC_STORMS_GROTTO_GOSSIP_STONE,                                RCQUEST_BOTH,                                        RCAREA_HYRULE_CASTLE,                                      SCENE_GROTTOS,                      14355,                                             0x13, "Storms Grotto Gossip Stone",    {});
+    locationTable[RC_KF_DEKU_TREE_LEFT_GOSSIP_STONE] =                            Location::HintStone(RC_KF_DEKU_TREE_LEFT_GOSSIP_STONE,                               RCQUEST_BOTH,                                        RCAREA_KOKIRI_FOREST,                                      SCENE_KOKIRI_FOREST,                14623,                                             0x1F, "Deku Tree Left Gossip Stone",   {});
+    locationTable[RC_KF_DEKU_TREE_RIGHT_GOSSIP_STONE] =                           Location::HintStone(RC_KF_DEKU_TREE_RIGHT_GOSSIP_STONE,                              RCQUEST_BOTH,                                        RCAREA_KOKIRI_FOREST,                                      SCENE_KOKIRI_FOREST,                14880,                                             0x20, "Deku Tree Right Gossip Stone",  {});
+    locationTable[RC_KF_GOSSIP_STONE] =                                           Location::HintStone(RC_KF_GOSSIP_STONE,                                              RCQUEST_BOTH,                                        RCAREA_KOKIRI_FOREST,                                      SCENE_KOKIRI_FOREST,                14366,                                             0x1E, "Gossip Stone",                  {});
+    locationTable[RC_KF_STORMS_GROTTO_GOSSIP_STONE] =                             Location::HintStone(RC_KF_STORMS_GROTTO_GOSSIP_STONE,                                RCQUEST_BOTH,                                        RCAREA_KOKIRI_FOREST,                                      SCENE_GROTTOS,                      -22988,                                            0x3C, "Storms Gossip Stone",           {});
+    locationTable[RC_LH_LAB_GOSSIP_STONE] =                                       Location::HintStone(RC_LH_LAB_GOSSIP_STONE,                                          RCQUEST_BOTH,                                        RCAREA_LAKE_HYLIA,                                         SCENE_LAKE_HYLIA,                   14339,                                             0x03, "Lab Gossip Stone",              {});
+    locationTable[RC_LH_SOUTHEAST_GOSSIP_STONE] =                                 Location::HintStone(RC_LH_SOUTHEAST_GOSSIP_STONE,                                    RCQUEST_BOTH,                                        RCAREA_LAKE_HYLIA,                                         SCENE_LAKE_HYLIA,                   14863,                                             0x0F, "Southeast Gossip Stone",        {});
+    locationTable[RC_LH_SOUTHWEST_GOSSIP_STONE] =                                 Location::HintStone(RC_LH_SOUTHWEST_GOSSIP_STONE,                                    RCQUEST_BOTH,                                        RCAREA_LAKE_HYLIA,                                         SCENE_LAKE_HYLIA,                   14600,                                             0x08, "Southwest Gossip Stone",        {});
+    locationTable[RC_LW_GOSSIP_STONE] =                                           Location::HintStone(RC_LW_GOSSIP_STONE,                                              RCQUEST_BOTH,                                        RCAREA_LOST_WOODS,                                         SCENE_LOST_WOODS,                   14365,                                             0x1D, "Gossip Stone",                  {});
+    locationTable[RC_SFM_MAZE_LOWER_GOSSIP_STONE] =                               Location::HintStone(RC_SFM_MAZE_LOWER_GOSSIP_STONE,                                  RCQUEST_BOTH,                                        RCAREA_SACRED_FOREST_MEADOW,                               SCENE_SACRED_FOREST_MEADOW,         14358,                                             0x16, "Maze Lower Gossip Stone",       {});
+    locationTable[RC_SFM_MAZE_UPPER_GOSSIP_STONE] =                               Location::HintStone(RC_SFM_MAZE_UPPER_GOSSIP_STONE,                                  RCQUEST_BOTH,                                        RCAREA_SACRED_FOREST_MEADOW,                               SCENE_SACRED_FOREST_MEADOW,         14615,                                             0x17, "Maze Upper Gossip Stone",       {});
+    locationTable[RC_SFM_SARIA_GOSSIP_STONE] =                                    Location::HintStone(RC_SFM_SARIA_GOSSIP_STONE,                                       RCQUEST_BOTH,                                        RCAREA_SACRED_FOREST_MEADOW,                               SCENE_SACRED_FOREST_MEADOW,         14876,                                             0x1C, "Saria Gossip Stone",            {});
+    locationTable[RC_TOT_LEFTMOST_GOSSIP_STONE] =                                 Location::HintStone(RC_TOT_LEFTMOST_GOSSIP_STONE,                                    RCQUEST_BOTH,                                        RCAREA_MARKET,                                             SCENE_ID_MAX,                       0x00,                                              0x06, "ToT Left Gossip Stone",         {});
+    locationTable[RC_TOT_RIGHTMOST_GOSSIP_STONE] =                                Location::HintStone(RC_TOT_RIGHTMOST_GOSSIP_STONE,                                   RCQUEST_BOTH,                                        RCAREA_MARKET,                                             SCENE_ID_MAX,                       0x00,                                              0x07, "ToT Right Gossip Stone",        {});
+    locationTable[RC_TOT_RIGHT_CENTER_GOSSIP_STONE] =                             Location::HintStone(RC_TOT_RIGHT_CENTER_GOSSIP_STONE,                                RCQUEST_BOTH,                                        RCAREA_MARKET,                                             SCENE_ID_MAX,                       0x00,                                              0x10, "ToT Right Center Gossip Stone", {});
+    locationTable[RC_TOT_LEFT_CENTER_GOSSIP_STONE] =                              Location::HintStone(RC_TOT_LEFT_CENTER_GOSSIP_STONE,                                 RCQUEST_BOTH,                                        RCAREA_MARKET,                                             SCENE_ID_MAX,                       0x00,                                              0x0E, "ToT Left Center Gossip Stone",  {});
+    locationTable[RC_ZD_GOSSIP_STONE] =                                           Location::HintStone(RC_ZD_GOSSIP_STONE,                                              RCQUEST_BOTH,                                        RCAREA_ZORAS_DOMAIN,                                       SCENE_ZORAS_DOMAIN,                 14345,                                             0x09, "Gossip Stone",                  {});
+    locationTable[RC_ZF_FAIRY_GOSSIP_STONE] =                                     Location::HintStone(RC_ZF_FAIRY_GOSSIP_STONE,                                        RCQUEST_BOTH,                                        RCAREA_ZORAS_FOUNTAIN,                                     SCENE_ZORAS_FOUNTAIN,               0x00,                                              0x01, "Fairy Gossip Stone",            {});
+    locationTable[RC_ZF_JABU_GOSSIP_STONE] =                                      Location::HintStone(RC_ZF_JABU_GOSSIP_STONE,                                         RCQUEST_BOTH,                                        RCAREA_ZORAS_FOUNTAIN,                                     SCENE_ZORAS_FOUNTAIN,               0x00,                                              0x02, "Jabu Gossip Stone",             {});
+    locationTable[RC_ZR_NEAR_GROTTOS_GOSSIP_STONE] =                              Location::HintStone(RC_ZR_NEAR_GROTTOS_GOSSIP_STONE,                                 RCQUEST_BOTH,                                        RCAREA_ZORAS_RIVER,                                        SCENE_ZORAS_RIVER,                  14605,                                             0x0D, "Near Grottos Gossip Stone",     {});
+    locationTable[RC_ZR_NEAR_DOMAIN_GOSSIP_STONE] =                               Location::HintStone(RC_ZR_NEAR_DOMAIN_GOSSIP_STONE,                                  RCQUEST_BOTH,                                        RCAREA_ZORAS_RIVER,                                        SCENE_ZORAS_RIVER,                  14860,                                             0x0C, "Near Domain Gossip Stone",      {});
+    locationTable[RC_HF_COW_GROTTO_GOSSIP_STONE] =                                Location::HintStone(RC_HF_COW_GROTTO_GOSSIP_STONE,                                   RCQUEST_BOTH,                                        RCAREA_HYRULE_FIELD,                                       SCENE_GROTTOS,                      14363,                                             0x1B, "Cow Grotto Gossip Stone",       {});
+    locationTable[RC_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE] =                        Location::HintStone(RC_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE,                           RCQUEST_BOTH,                                        RCAREA_HYRULE_FIELD,                                       SCENE_GROTTOS,                      -22944,                                            0x30, "Near Market Gossip Stone",      {});
+    locationTable[RC_HF_SOUTHEAST_GROTTO_GOSSIP_STONE] =                          Location::HintStone(RC_HF_SOUTHEAST_GROTTO_GOSSIP_STONE,                             RCQUEST_BOTH,                                        RCAREA_HYRULE_FIELD,                                       SCENE_GROTTOS,                      -22978,                                            0x32, "Southeast Gossip Stone",        {});
+    locationTable[RC_HF_OPEN_GROTTO_GOSSIP_STONE] =                               Location::HintStone(RC_HF_OPEN_GROTTO_GOSSIP_STONE,                                  RCQUEST_BOTH,                                        RCAREA_HYRULE_FIELD,                                       SCENE_GROTTOS,                      -22947,                                            0x33, "Open Grotto Gossip Stone",      {});
+    locationTable[RC_KAK_OPEN_GROTTO_GOSSIP_STONE] =                              Location::HintStone(RC_KAK_OPEN_GROTTO_GOSSIP_STONE,                                 RCQUEST_BOTH,                                        RCAREA_KAKARIKO_VILLAGE,                                   SCENE_GROTTOS,                      -22984,                                            0x38, "Open Grotto Gossip Stone",      {});
+    locationTable[RC_ZR_OPEN_GROTTO_GOSSIP_STONE] =                               Location::HintStone(RC_ZR_OPEN_GROTTO_GOSSIP_STONE,                                  RCQUEST_BOTH,                                        RCAREA_ZORAS_RIVER,                                        SCENE_GROTTOS,                      -22985,                                            0x39, "Open Grotto Gossip Stone",      {});
+    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE] =                     Location::HintStone(RC_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE,                        RCQUEST_BOTH,                                        RCAREA_LOST_WOODS,                                         SCENE_GROTTOS,                      -22964,                                            0x34, "Near Shortcuts Gossip Stone",   {});
+    locationTable[RC_DMT_STORMS_GROTTO_GOSSIP_STONE] =                            Location::HintStone(RC_DMT_STORMS_GROTTO_GOSSIP_STONE,                               RCQUEST_BOTH,                                        RCAREA_DEATH_MOUNTAIN_TRAIL,                               SCENE_GROTTOS,                      -23255,                                            0x37, "Storms Grotto Gossip Stone",    {});
+    locationTable[RC_DMC_UPPER_GROTTO_GOSSIP_STONE] =                             Location::HintStone(RC_DMC_UPPER_GROTTO_GOSSIP_STONE,                                RCQUEST_BOTH,                                        RCAREA_DEATH_MOUNTAIN_CRATER,                              SCENE_GROTTOS,                      -23802,                                            0x3A, "Upper Grotto Gossip Stone",     {});
 
     // Other Hints
-    locationTable[RC_GANONDORF_HINT]    =                                         Location::OtherHint(RC_GANONDORF_HINT,                                               RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE,                RCAREA_GANONS_CASTLE,                ACTOR_EN_GANON_MANT,  SCENE_GANON_BOSS,                                                                            "Ganondorf Hint",                              "Ganondorf Hint");
-    locationTable[RC_SHEIK_HINT_GC]     =                                         Location::OtherHint(RC_SHEIK_HINT_GC,                                                RCQUEST_VANILLA, RCTYPE_GOSSIP_STONE,                RCAREA_GANONS_CASTLE,                ACTOR_EN_XC,          SCENE_INSIDE_GANONS_CASTLE,                                                                  "Sheik Hint",                                  "Sheik Hint in Ganons Castle");
-    locationTable[RC_SHEIK_HINT_MQ_GC]  =                                         Location::OtherHint(RC_SHEIK_HINT_MQ_GC,                                             RCQUEST_MQ,      RCTYPE_GOSSIP_STONE,                RCAREA_GANONS_CASTLE,                ACTOR_EN_XC,          SCENE_INSIDE_GANONS_CASTLE,                                                                  "Sheik Hint",                                  "Sheik Hint in MQ Ganons Castle");
-    locationTable[RC_DAMPE_HINT]        =                                         Location::OtherHint(RC_DAMPE_HINT,                                                   RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE,                RCAREA_GRAVEYARD,                    ACTOR_ID_MAX,         SCENE_GRAVEKEEPERS_HUT,                                                                      "Diary Hint",                                  "Dampe's Diary Hint");
-    locationTable[RC_GREG_HINT]         =                                         Location::OtherHint(RC_GREG_HINT,                                                    RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE,                RCAREA_MARKET,                       ACTOR_EN_TAKARA_MAN,  SCENE_TREASURE_BOX_SHOP,                                                                     "Greg Hint",                                   "Greg Hint");
-    locationTable[RC_SARIA_SONG_HINT]   =                                         Location::OtherHint(RC_SARIA_SONG_HINT,                                              RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE,                RCAREA_KOKIRI_FOREST,                ACTOR_ID_MAX,         SCENE_ID_MAX,                                                                                "Sarias Song Hint",                            "Magic Hint Via Saria's Song");
-    locationTable[RC_ALTAR_HINT_CHILD]  =                                         Location::OtherHint(RC_ALTAR_HINT_CHILD,                                             RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE,                RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_TEMPLE_OF_TIME,                                                                        "Child Altar Hint",                            "ToT Child Altar Text");
-    locationTable[RC_ALTAR_HINT_ADULT]  =                                         Location::OtherHint(RC_ALTAR_HINT_ADULT,                                             RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE,                RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_TEMPLE_OF_TIME,                                                                        "Adult Altar Hint",                            "ToT Adult Altar Text");
-    locationTable[RC_FISHING_POLE_HINT] =                                         Location::OtherHint(RC_FISHING_POLE_HINT,                                            RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE,                RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                                                                          "Fishing Pole Hint",                           "Fishing Pole Hint");
-    
-    locationTable[RC_TRIFORCE_COMPLETED] =                                           Location::Reward(RC_TRIFORCE_COMPLETED,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x00, "Completed Triforce",                          "Completed Triforce",                                       RHT_NONE,                                                        RG_NONE,                              {},                                                     SpoilerCollectionCheck::None(),                                                                                               SpoilerCollectionCheckGroup::GROUP_NO_GROUP);
+    locationTable[RC_GANONDORF_HINT]    =                                         Location::OtherHint(RC_GANONDORF_HINT,                                               RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE,                RCAREA_GANONS_CASTLE,                ACTOR_EN_GANON_MANT,  SCENE_GANON_BOSS,           "Ganondorf Hint");
+    locationTable[RC_SHEIK_HINT_GC]     =                                         Location::OtherHint(RC_SHEIK_HINT_GC,                                                RCQUEST_VANILLA, RCTYPE_GOSSIP_STONE,                RCAREA_GANONS_CASTLE,                ACTOR_EN_XC,          SCENE_INSIDE_GANONS_CASTLE, "Sheik Hint");
+    locationTable[RC_SHEIK_HINT_MQ_GC]  =                                         Location::OtherHint(RC_SHEIK_HINT_MQ_GC,                                             RCQUEST_MQ,      RCTYPE_GOSSIP_STONE,                RCAREA_GANONS_CASTLE,                ACTOR_EN_XC,          SCENE_INSIDE_GANONS_CASTLE, "Sheik Hint");
+    locationTable[RC_DAMPE_HINT]        =                                         Location::OtherHint(RC_DAMPE_HINT,                                                   RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE,                RCAREA_GRAVEYARD,                    ACTOR_ID_MAX,         SCENE_GRAVEKEEPERS_HUT,     "Diary Hint");
+    locationTable[RC_GREG_HINT]         =                                         Location::OtherHint(RC_GREG_HINT,                                                    RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE,                RCAREA_MARKET,                       ACTOR_EN_TAKARA_MAN,  SCENE_TREASURE_BOX_SHOP,    "Greg Hint");
+    locationTable[RC_SARIA_SONG_HINT]   =                                         Location::OtherHint(RC_SARIA_SONG_HINT,                                              RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE,                RCAREA_KOKIRI_FOREST,                ACTOR_ID_MAX,         SCENE_ID_MAX,               "Sarias Song Hint",  "Magic Hint Via Saria's Song");
+    locationTable[RC_ALTAR_HINT_CHILD]  =                                         Location::OtherHint(RC_ALTAR_HINT_CHILD,                                             RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE,                RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_TEMPLE_OF_TIME,       "ToT Child Altar Hint");
+    locationTable[RC_ALTAR_HINT_ADULT]  =                                         Location::OtherHint(RC_ALTAR_HINT_ADULT,                                             RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE,                RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_TEMPLE_OF_TIME,       "ToT Adult Altar Hint");
+    locationTable[RC_FISHING_POLE_HINT] =                                         Location::OtherHint(RC_FISHING_POLE_HINT,                                            RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE,                RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,         "Fishing Pole Hint");
+
+    locationTable[RC_TRIFORCE_COMPLETED] =                                           Location::Reward(RC_TRIFORCE_COMPLETED,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x00, "Completed Triforce", "Completed Triforce",    RHT_NONE,                                                        RG_NONE,                              {},                                                     SpoilerCollectionCheck::None(),                                                                                               SpoilerCollectionCheckGroup::GROUP_NO_GROUP);
     // clang-format on
 
     // Init locationNameToEnum
diff --git a/soh/soh/util.cpp b/soh/soh/util.cpp
index ceadb8b0e..2e84d2d24 100644
--- a/soh/soh/util.cpp
+++ b/soh/soh/util.cpp
@@ -3,6 +3,8 @@
 #include <string.h>
 #include <vector>
 #include <algorithm>
+#include <array>
+#include "Enhancements/randomizer/randomizerTypes.h"
 
 std::vector<std::string> sceneNames = {
     "Inside the Deku Tree",
@@ -303,6 +305,41 @@ std::vector<std::string> questItemNames = {
         "Gold Skulltula Token",
 };
 
+std::array<std::string, RA_MAX> rcareaPrefixes = {
+    "KF",
+    "LW",
+    "SFM",
+    "HF",
+    "LH",
+    "GV",
+    "GF",
+    "Wasteland",
+    "Colossus",
+    "Market",
+    "HC",
+    "Kak",
+    "Graveyard",
+    "DMT",
+    "GC",
+    "DMC",
+    "ZR",
+    "ZD",
+    "ZF",
+    "LLR",
+    "Deku Tree",
+    "Dodongos Cavern",
+    "Jabu Jabus Belly",
+    "Forest Temple",
+    "Fire Temple",
+    "Water Temple",
+    "Spirit Temple",
+    "Shadow Temple",
+    "Bottom of the Well",
+    "Ice Cavern",
+    "Gerudo Training Grounds",
+    "Ganon's Castle",
+};
+
 const std::string& SohUtils::GetSceneName(int32_t scene) {
     return sceneNames[scene];
 }
@@ -315,6 +352,10 @@ const std::string& SohUtils::GetQuestItemName(int32_t item) {
     return questItemNames[item];
 }
 
+const std::string& SohUtils::GetRandomizerCheckAreaPrefix(int32_t rcarea) {
+    return rcareaPrefixes[rcarea];
+}
+
 void SohUtils::CopyStringToCharArray(char* destination, std::string source, size_t size) {
     strncpy(destination, source.c_str(), size - 1);
     destination[size - 1] = '\0';
diff --git a/soh/soh/util.h b/soh/soh/util.h
index 827355862..10619b89a 100644
--- a/soh/soh/util.h
+++ b/soh/soh/util.h
@@ -9,6 +9,8 @@ namespace SohUtils {
 
     const std::string& GetQuestItemName(int32_t item);
 
+    const std::string& GetRandomizerCheckAreaPrefix(int32_t rcarea);
+
     // Copies a string and ensures the destination is null terminated if the source string is larger than size
     // Only up to size-1 characters are copied from the source string
     void CopyStringToCharArray(char* destination, std::string source, size_t size);

From 980b1f1a6e5451459970be6974f6b9847abe9596 Mon Sep 17 00:00:00 2001
From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Date: Tue, 7 May 2024 18:48:00 +0100
Subject: [PATCH 141/230] Fix an infinite loop in hints and better comment hint
 distribution (#4080)

---
 .../Enhancements/randomizer/3drando/hints.cpp | 48 +++++++++----------
 1 file changed, 22 insertions(+), 26 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.cpp b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
index 1c1edd62d..5973fdcee 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hints.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
@@ -531,44 +531,40 @@ int32_t getRandomWeight(int32_t totalWeight){
 }
 
 static void DistributeHints(std::vector<uint8_t>& selected, size_t stoneCount, std::vector<HintDistributionSetting> distTable, uint8_t junkWieght, bool addFixed = true){
-  int32_t totalWeight = junkWieght;
+  int32_t totalWeight = junkWieght; //Start with our Junk Weight, the natural chance of a junk hint
 
-  for (HintDistributionSetting setting: distTable){
-    totalWeight += setting.weight;
+  for (HintDistributionSetting setting: distTable){ //Gather the wieghts of each distribution and, if it's the first pass, apply fixed hints
+    totalWeight += setting.weight;                  //Note that PlaceHints will set weights of distributions to zero if it can't place anything from them
     if (addFixed){
       selected[setting.type] += setting.fixed;
       stoneCount -= setting.fixed * setting.copies;
     }
   }
-  int32_t currentWeight = getRandomWeight(totalWeight);
-  while(stoneCount > 0 && totalWeight > 0){
+  int32_t currentWeight = getRandomWeight(totalWeight); //Initialise with the first random weight from 1 to the total. 
+  while(stoneCount > 0 && totalWeight > 0){//Loop until we run out of stones or have no TotalWeight. 0 totalWeight means junkWeight is 0
+                                           //and that all weights have been 0'd out for another reason, and skips to placing all junk hints
     for (uint8_t distribution = 0; distribution < distTable.size(); distribution++){
-      currentWeight -= distTable[distribution].weight;
-      if (currentWeight <= 0){
-        if (distTable[distribution].copies == 0) {
-          // This should only happen if we ran out of locations to place hints of a certain distribution earlier. Skip
-          // to the next distribution.
-          break;
-        }
-        if (stoneCount >= distTable[distribution].copies){
-          selected[distribution] += 1;
+      currentWeight -= distTable[distribution].weight; //go over each distribution, subtracting the weight each time. Once we reach zero or less,
+      if (currentWeight <= 0){                         //tell the system to make 1 of that hint, unless not enough stones remain
+        if (stoneCount >= distTable[distribution].copies && distTable[distribution].copies > 0){
+          selected[distribution] += 1; //if we have enough stones, and copies are not zero, assign 1 to this hint type, remove the stones, and break
           stoneCount -= distTable[distribution].copies;
-          break;
-        } else {
-          totalWeight -= distTable[distribution].weight;
-          distTable[distribution].weight = 0;
+          break; //This leaves the whole for loop
+        } else { //If we don't have the stones, or copies is 0 despite there being the wieght to trigger a hit, temporerally set wieght to zero
+          totalWeight -= distTable[distribution].weight; //Unlike PlaceHint, distTable is passed by value here, making this temporary
+          distTable[distribution].weight = 0;            //this is so we can still roll this hint type if more stones free up later 
           break;
         }
       }
     }
-    //if there's still weight, then it's junk
-    if (currentWeight > 0){
+    //if there's still weight then it's junk, as the leftover weight is junkWeight
+    if (currentWeight > 0){ //zero TotalWeight breaks the while loop and hits the fallback, so skipping this is fine in that case
       selected[selected.size()-1] += 1;
       stoneCount -= 1;
     }
     currentWeight = getRandomWeight(totalWeight);
   }
-  //if stones are left, assign junk
+  //if stones are left, assign junk to every remaining stone as a fallback.
   if (stoneCount > 0){
     selected[selected.size()-1] += stoneCount;
   }
@@ -586,10 +582,11 @@ uint8_t PlaceHints(std::vector<uint8_t>& selectedHints,
       RandomizerCheck hintedLocation = RC_UNKNOWN_CHECK;
 
       hintedLocation = CreateRandomHint(hintTypePool, distribution.copies, distribution.type, distribution.name);
-      if (hintedLocation == RC_UNKNOWN_CHECK){ //if hint failed to place
+      if (hintedLocation == RC_UNKNOWN_CHECK){ //if hint failed to place, remove all wieght and copies then return the number of stones to redistribute
         uint8_t hintsToRemove = (selectedHints[curSlot] - numHint) * distribution.copies;
-        selectedHints[curSlot] = 0;
-        distTable[curSlot].copies = 0;
+        selectedHints[curSlot] = 0;   //as distTable is passed by refernce here, these changes stick for the rest of this seed generation
+        distTable[curSlot].copies = 0;//and prevent future distribution from choosing this slot
+        distTable[curSlot].weight = 0;
         return hintsToRemove;
       }
       if(Rando::StaticData::GetLocation(hintedLocation)->IsDungeon()){
@@ -661,9 +658,8 @@ void CreateStoneHints() {
   
   while(totalStones != 0){
     totalStones = PlaceHints(selectedHints, distTable);
-    while (totalStones != 0){
+    if (totalStones != 0){
       DistributeHints(selectedHints, totalStones, distTable, hintSetting.junkWeight, false);
-      totalStones = PlaceHints(selectedHints, distTable);
     }
   }
 

From cfd93f160d7cf6d42b22066f9b0d9c2b3454d42c Mon Sep 17 00:00:00 2001
From: Malkierian <malkierian@gmail.com>
Date: Tue, 7 May 2024 13:07:33 -0700
Subject: [PATCH 142/230] Fix check tracker performance changes. Move
 Mysterious Shuffle functionality to `hook_handlers.cpp` when applicable.

---
 soh/soh/Enhancements/randomizer/draw.h        |  2 +-
 .../Enhancements/randomizer/hook_handlers.cpp | 36 +++++++++++----
 soh/soh/Enhancements/randomizer/randomizer.h  |  2 +-
 .../randomizer/randomizer_check_tracker.cpp   | 16 ++++---
 .../randomizer/randomizer_check_tracker.h     |  2 +-
 soh/soh/OTRGlobals.cpp                        |  4 +-
 soh/src/code/z_en_item00.c                    | 37 +--------------
 .../actors/ovl_Demo_Effect/z_demo_effect.c    | 38 ++++++++++-----
 soh/src/overlays/actors/ovl_En_Si/z_en_si.c   | 46 +------------------
 .../actors/ovl_Item_B_Heart/z_item_b_heart.c  | 27 +++++------
 .../ovl_Item_Etcetera/z_item_etcetera.c       | 28 -----------
 11 files changed, 81 insertions(+), 157 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/draw.h b/soh/soh/Enhancements/randomizer/draw.h
index ea56e6e32..ec390c002 100644
--- a/soh/soh/Enhancements/randomizer/draw.h
+++ b/soh/soh/Enhancements/randomizer/draw.h
@@ -24,7 +24,7 @@ void Randomizer_DrawFishingPoleGI(PlayState* play, GetItemEntry* getItemEntry);
 void Randomizer_DrawMysteryItem(PlayState* play, GetItemEntry getItemEntry);
 
 #define GET_ITEM_MYSTERY \
-    { ITEM_NONE, 0, 0, 0, 0, 0, 0, 0, 0, false, ITEM_FROM_NPC, ITEM_CATEGORY_JUNK, Randomizer_DrawMysteryItem }
+    { ITEM_NONE_FE, 0, 0, 0, 0, 0, 0, ITEM_NONE_FE, 0, false, ITEM_FROM_NPC, ITEM_CATEGORY_JUNK, NULL, MOD_RANDOMIZER, (CustomDrawFunc)Randomizer_DrawMysteryItem }
 #ifdef __cplusplus
 };
 #endif
diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index db388ae1c..c3669af56 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -33,6 +33,8 @@ extern "C" {
 #include "src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.h"
 #include "src/overlays/actors/ovl_En_Ge1/z_en_ge1.h"
 #include "adult_trade_shuffle.h"
+#include "draw.h"
+
 extern SaveContext gSaveContext;
 extern PlayState* gPlayState;
 }
@@ -357,13 +359,21 @@ void EnExItem_WaitForObjectRandomized(EnExItem* enExItem, PlayState* play) {
 void EnItem00_DrawRandomizedItem(EnItem00* enItem00, PlayState* play) {
     f32 mtxScale = CVarGetFloat(CVAR_ENHANCEMENT("TimeSavers.SkipGetItemAnimationScale"), 10.0f);
     Matrix_Scale(mtxScale, mtxScale, mtxScale, MTXMODE_APPLY);
-    EnItem00_CustomItemsParticles(&enItem00->actor, play, enItem00->itemEntry);
-    GetItemEntry_Draw(play, enItem00->itemEntry);
+    GetItemEntry randoItem = enItem00->itemEntry;
+    if (CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0)) {
+        randoItem = GET_ITEM_MYSTERY;
+    }
+    EnItem00_CustomItemsParticles(&enItem00->actor, play, randoItem);
+    GetItemEntry_Draw(play, randoItem);
 }
 
 void ItemBHeart_DrawRandomizedItem(ItemBHeart* itemBHeart, PlayState* play) {
-    EnItem00_CustomItemsParticles(&itemBHeart->actor, play, itemBHeart->sohItemEntry);
-    GetItemEntry_Draw(play, itemBHeart->sohItemEntry);
+    GetItemEntry randoItem = itemBHeart->sohItemEntry;
+    if (CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0)) {
+        randoItem = GET_ITEM_MYSTERY;
+    }
+    EnItem00_CustomItemsParticles(&itemBHeart->actor, play, randoItem);
+    GetItemEntry_Draw(play, randoItem);
 }
 
 void ItemBHeart_UpdateRandomizedItem(Actor* actor, PlayState* play) {
@@ -378,14 +388,18 @@ void ItemBHeart_UpdateRandomizedItem(Actor* actor, PlayState* play) {
 }
 
 void ItemEtcetera_DrawRandomizedItem(ItemEtcetera* itemEtcetera, PlayState* play) {
-    EnItem00_CustomItemsParticles(&itemEtcetera->actor, play, itemEtcetera->sohItemEntry);
+    GetItemEntry randoItem = itemEtcetera->sohItemEntry;
+    if (CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0)) {
+        randoItem = GET_ITEM_MYSTERY;
+    }
+    EnItem00_CustomItemsParticles(&itemEtcetera->actor, play, randoItem);
     func_8002EBCC(&itemEtcetera->actor, play, 0);
     func_8002ED80(&itemEtcetera->actor, play, 0);
-    GetItemEntry_Draw(play, itemEtcetera->sohItemEntry);
+    GetItemEntry_Draw(play, randoItem);
 }
 
 void ItemEtcetera_DrawRandomizedItemThroughLens(ItemEtcetera* itemEtcetera, PlayState* play) {
-    if (play->actorCtx.lensActive) {
+    if (play->actorCtx.lensActive) { // todo [Rando] mysterious shuffle for chest minigame key shuffle
         ItemEtcetera_DrawRandomizedItem(itemEtcetera, play);
     }
 }
@@ -1160,10 +1174,14 @@ void RandomizerOnSceneInitHandler(int16_t sceneNum) {
 }
 
 void EnSi_DrawRandomizedItem(EnSi* enSi, PlayState* play) {
+    GetItemEntry randoItem = enSi->sohGetItemEntry;
+    if (CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0)) {
+        randoItem = GET_ITEM_MYSTERY;
+    }
     func_8002ED80(&enSi->actor, play, 0);
     func_8002EBCC(&enSi->actor, play, 0);
-    EnItem00_CustomItemsParticles(&enSi->actor, play, enSi->sohGetItemEntry);
-    GetItemEntry_Draw(play, enSi->sohGetItemEntry);
+    EnItem00_CustomItemsParticles(&enSi->actor, play, randoItem);
+    GetItemEntry_Draw(play, randoItem);
 }
 
 u32 EnDns_RandomizerPurchaseableCheck(EnDns* enDns) {
diff --git a/soh/soh/Enhancements/randomizer/randomizer.h b/soh/soh/Enhancements/randomizer/randomizer.h
index acbc3ad7f..3e6df6213 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.h
+++ b/soh/soh/Enhancements/randomizer/randomizer.h
@@ -11,7 +11,7 @@
 #include <soh/Enhancements/randomizer/randomizerTypes.h>
 #include "soh/Enhancements/randomizer/randomizer_check_objects.h"
 #include "soh/Enhancements/randomizer/randomizer_check_tracker.h"
-#include "soh/Enhancements/randomizer/randomizer_tricks.h"
+#include "soh/Enhancements/randomizer/tricks.h"
 #include <soh/Enhancements/custom-message/CustomMessageManager.h>
 #include "soh/Enhancements/item-tables/ItemTableTypes.h"
 #include "../custom-message/CustomMessageTypes.h"
diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
index ace7781be..36263197a 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
@@ -1092,12 +1092,12 @@ bool ShouldHideArea(RandomizerCheckArea rcArea) {
     return true;
 }
 
-bool ShouldShowCheck(RandomizerCheckObject check) {
+bool ShouldShowCheck(RandomizerCheck check) {
     return (
         IsVisibleInCheckTracker(check) && 
         (checkSearch.Filters.Size == 0 ||
         checkSearch.PassFilter(RandomizerCheckObjects::GetRCAreaName(Rando::StaticData::GetLocation(check)->GetArea()).c_str()) ||
-        checkSearch.PassFilter(Rando::StaticData::GetLocation(check)->GetShortName().c_str())
+        checkSearch.PassFilter(Rando::StaticData::GetLocation(check)->GetShortName().c_str()))
     );
 }
 
@@ -1244,7 +1244,7 @@ void LoadSettings() {
     fishsanityAgeSplit = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_FISHSANITY_AGE_SPLIT);
 }
 
-bool IsCheckShuffled(RandomizerCheckObject rcObj) {
+bool IsCheckShuffled(RandomizerCheck rc) {
     Rando::Location* loc = Rando::StaticData::GetLocation(rc);
     if (IS_RANDO && OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_LOGIC_RULES) != RO_LOGIC_VANILLA) {
         return
@@ -1307,8 +1307,10 @@ bool IsCheckShuffled(RandomizerCheckObject rcObj) {
     return false;
 }
 
-bool IsVisibleInCheckTracker(RandomizerCheckObject rcObj) {
-    return IsCheckShuffled(rcObj) || (rcObj.rcType == RCTYPE_SKULL_TOKEN && alwaysShowGS) || (rcObj.rcType == RCTYPE_SHOP && (showShops && (!hideShopRightChecks)));
+bool IsVisibleInCheckTracker(RandomizerCheck rc) {
+    auto loc = Rando::StaticData::GetLocation(rc);
+    return IsCheckShuffled(rc) || (loc->GetRCType() == RCTYPE_SKULL_TOKEN && alwaysShowGS) ||
+           (loc->GetRCType() == RCTYPE_SHOP && (showShops && (!hideShopRightChecks)));
 }
 
 void UpdateInventoryChecks() {
@@ -1501,7 +1503,7 @@ void DrawLocation(RandomizerCheck rc) {
     //Draw the extra info
     txt = "";
 
-    bool mystery = CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0) && OTRGlobals::Instance->gRandomizer->merchantPrices.contains(rcObj.rc);
+    bool mystery = CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0) && itemLoc->IsAddedToPool();
 
     if (checkData.hintItem != 0) {
         // TODO hints
@@ -1534,7 +1536,7 @@ void DrawLocation(RandomizerCheck rc) {
                     } else if (!mystery) {
                         txt = itemLoc->GetPlacedItem().GetName().GetForLanguage(gSaveContext.language);
                     }
-                    if (!IsVisibleInCheckTracker(rcObj) && status == RCSHOW_IDENTIFIED && !mystery) {
+                    if (!IsVisibleInCheckTracker(rc) && status == RCSHOW_IDENTIFIED && !mystery) {
                         txt += fmt::format(" - {}", gSaveContext.checkTrackerData[rc].price);
                     }
                 } else {
diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.h b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.h
index 576a09cc7..c8915a8ec 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.h
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.h
@@ -47,7 +47,7 @@ void DefaultCheckData(RandomizerCheck rc);
 void Teardown();
 void UpdateAllOrdering();
 bool IsVisibleInCheckTracker(RandomizerCheck rc);
-bool IsCheckShuffled(RandomizerCheck check);
+bool IsCheckShuffled(RandomizerCheck rc);
 void InitTrackerData(bool isDebug);
 RandomizerCheckArea GetCheckArea();
 void UpdateCheck(uint32_t, RandomizerCheckTrackerData);
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
index bf248d0e0..42ba48e61 100644
--- a/soh/soh/OTRGlobals.cpp
+++ b/soh/soh/OTRGlobals.cpp
@@ -2445,8 +2445,8 @@ extern "C" ItemObtainability Randomizer_GetItemObtainabilityFromRandomizerCheck(
     return OTRGlobals::Instance->gRandomizer->GetItemObtainabilityFromRandomizerCheck(randomizerCheck);
 }
 
-extern "C" bool Randomizer_IsCheckShuffled(RandomizerCheck randomizerCheck) {
-    return CheckTracker::IsCheckShuffled(RandomizerCheckObjects::GetAllRCObjects().find(randomizerCheck)->second);
+extern "C" bool Randomizer_IsCheckShuffled(RandomizerCheck rc) {
+    return CheckTracker::IsCheckShuffled(rc);
 }
 
 extern "C" GetItemEntry GetItemMystery() {
diff --git a/soh/src/code/z_en_item00.c b/soh/src/code/z_en_item00.c
index f286830e6..8e30f462a 100644
--- a/soh/src/code/z_en_item00.c
+++ b/soh/src/code/z_en_item00.c
@@ -1361,23 +1361,7 @@ static const Vtx customDropVtx[] = {
  * Draw Function used for most collectible types of En_Item00 (ammo, bombs, sticks, nuts, magic...).
  */
 void EnItem00_DrawCollectible(EnItem00* this, PlayState* play) {
-    if (IS_RANDO && (this->getItemId != GI_NONE || this->actor.params == ITEM00_SMALL_KEY)) {
-        RandomizerCheck randoCheck =
-            Randomizer_GetCheckFromActor(this->actor.id, play->sceneNum, this->ogParams);
-        GetItemEntry giEntry = this->randoGiEntry;
-
-        if (randoCheck != RC_UNKNOWN_CHECK) {
-            this->randoGiEntry = Randomizer_GetItemFromKnownCheck(randoCheck, GI_NONE);
-            giEntry = (CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0) && Randomizer_IsCheckShuffled(randoCheck))
-                                    ? GetItemMystery() : this->randoGiEntry;
-            giEntry.getItemFrom = ITEM_FROM_FREESTANDING;
-        }
-
-        f32 mtxScale = 16.0f;
-        Matrix_Scale(mtxScale, mtxScale, mtxScale, MTXMODE_APPLY);
-        EnItem00_CustomItemsParticles(&this->actor, play, giEntry);
-        GetItemEntry_Draw(play, giEntry);
-    } else if (this->actor.params == ITEM00_BOMBCHU) {
+    if (this->actor.params == ITEM00_BOMBCHU) {
         OPEN_DISPS(play->state.gfxCtx);
 
         Matrix_ReplaceRotation(&play->billboardMtxF);
@@ -1457,24 +1441,7 @@ void EnItem00_DrawHeartContainer(EnItem00* this, PlayState* play) {
  * Draw Function used for the Piece of Heart type of En_Item00.
  */
 void EnItem00_DrawHeartPiece(EnItem00* this, PlayState* play) {
-    if (IS_RANDO) {
-        RandomizerCheck randoCheck =
-            Randomizer_GetCheckFromActor(this->actor.id, play->sceneNum, this->ogParams);
-        GetItemEntry giEntry = this->randoGiEntry;
-
-        if (randoCheck != RC_UNKNOWN_CHECK) {
-            this->randoGiEntry = Randomizer_GetItemFromKnownCheck(randoCheck, GI_NONE);
-            giEntry = (CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0) && Randomizer_IsCheckShuffled(randoCheck))
-                                    ? GetItemMystery() : this->randoGiEntry;
-            giEntry.getItemFrom = ITEM_FROM_FREESTANDING;
-        }
-
-        f32 mtxScale = 16.0f;
-        Matrix_Scale(mtxScale, mtxScale, mtxScale, MTXMODE_APPLY);
-        EnItem00_CustomItemsParticles(&this->actor, play, giEntry);
-        GetItemEntry_Draw(play, giEntry);
-    } else {
-        s32 pad;
+    s32 pad;
 
     OPEN_DISPS(play->state.gfxCtx);
 
diff --git a/soh/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c b/soh/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
index 2e06e8975..5984e7eee 100644
--- a/soh/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
+++ b/soh/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
@@ -2089,42 +2089,56 @@ void DemoEffect_DrawGetItem(Actor* thisx, PlayState* play) {
         }
         if (IS_RANDO && (play->sceneNum != SCENE_TEMPLE_OF_TIME || this->actor.params == DEMO_EFFECT_LIGHTARROW)) {
             GetItemEntry getItemEntry = GET_ITEM_NONE;
-            if (CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0) && Randomizer_IsCheckShuffled(RC_BARINADE))
-                getItemEntry = GetItemMystery();
+            RandomizerCheck rc = RC_MAX;
+            RandomizerGet rg = RG_NONE;
 
             switch (this->actor.params) {
                 case DEMO_EFFECT_JEWEL_KOKIRI:
-                    getItemEntry = Randomizer_GetItemFromKnownCheck(RC_QUEEN_GOHMA, RG_KOKIRI_EMERALD);
+                    rc = RC_QUEEN_GOHMA;
+                    rg = RG_KOKIRI_EMERALD;
                     break;
                 case DEMO_EFFECT_JEWEL_GORON:
-                    getItemEntry = Randomizer_GetItemFromKnownCheck(RC_KING_DODONGO, RG_GORON_RUBY);
+                    rc = RC_KING_DODONGO;
+                    rg = RG_GORON_RUBY;
                     break;
                 case DEMO_EFFECT_JEWEL_ZORA:
-                    getItemEntry = Randomizer_GetItemFromKnownCheck(RC_BARINADE, RG_ZORA_SAPPHIRE);
+                    rc = RC_BARINADE;
+                    rg = RG_ZORA_SAPPHIRE;
                     break;
                 case DEMO_EFFECT_MEDAL_FOREST:
-                    getItemEntry = Randomizer_GetItemFromKnownCheck(RC_PHANTOM_GANON, RG_FOREST_MEDALLION);
+                    rc = RC_PHANTOM_GANON;
+                    rg = RG_FOREST_MEDALLION;
                     break;
                 case DEMO_EFFECT_MEDAL_FIRE:
-                    getItemEntry = Randomizer_GetItemFromKnownCheck(RC_VOLVAGIA, RG_FIRE_MEDALLION);
+                    rc = RC_VOLVAGIA;
+                    rg = RG_FIRE_MEDALLION;
                     break;
                 case DEMO_EFFECT_MEDAL_WATER:
-                    getItemEntry = Randomizer_GetItemFromKnownCheck(RC_MORPHA, RG_WATER_MEDALLION);
+                    rc = RC_MORPHA;
+                    rg = RG_WATER_MEDALLION;
                     break;
                 case DEMO_EFFECT_MEDAL_SPIRIT:
-                    getItemEntry = Randomizer_GetItemFromKnownCheck(RC_TWINROVA, RG_SPIRIT_MEDALLION);
+                    rc = RC_TWINROVA;
+                    rg = RG_SPIRIT_MEDALLION;
                     break;
                 case DEMO_EFFECT_MEDAL_SHADOW:
-                    getItemEntry = Randomizer_GetItemFromKnownCheck(RC_BONGO_BONGO, RG_SHADOW_MEDALLION);
+                    rc = RC_BONGO_BONGO;
+                    rg = RG_SHADOW_MEDALLION;
                     break;
                 case DEMO_EFFECT_MEDAL_LIGHT:
-                    getItemEntry = Randomizer_GetItemFromKnownCheck(RC_GIFT_FROM_SAGES, RG_LIGHT_MEDALLION);
+                    rc = RC_GIFT_FROM_SAGES;
+                    rg = RG_LIGHT_MEDALLION;
                     break;
                 case DEMO_EFFECT_LIGHTARROW:
-                    getItemEntry = Randomizer_GetItemFromKnownCheck(RC_TOT_LIGHT_ARROWS_CUTSCENE, RG_LIGHT_ARROWS);
+                    rc = RC_TOT_LIGHT_ARROWS_CUTSCENE;
+                    rg = RG_LIGHT_ARROWS;
                     break;
             }
+            getItemEntry = Randomizer_GetItemFromKnownCheck(rc, rg);
             if (getItemEntry.getItemId != GI_NONE) {
+                if (CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0) && Randomizer_IsCheckShuffled(rc)) {
+                    getItemEntry = GetItemMystery();
+                }
                 this->getItem.drawId = getItemEntry.gid;
                 func_8002EBCC(thisx, play, 0);
                 func_8002ED80(thisx, play, 0);
diff --git a/soh/src/overlays/actors/ovl_En_Si/z_en_si.c b/soh/src/overlays/actors/ovl_En_Si/z_en_si.c
index bf0e4951d..170eed16e 100644
--- a/soh/src/overlays/actors/ovl_En_Si/z_en_si.c
+++ b/soh/src/overlays/actors/ovl_En_Si/z_en_si.c
@@ -155,50 +155,6 @@ void EnSi_Draw(Actor* thisx, PlayState* play) {
     if (this->actionFunc != func_80AFB950) {
         func_8002ED80(&this->actor, play, 0);
         func_8002EBCC(&this->actor, play, 0);
-        if (!IS_RANDO) {
-            GetItem_Draw(play, GID_SKULL_TOKEN_2);
-        } else {
-            RandomizerCheck check = Randomizer_GetCheckFromActor(this->actor.id, play->sceneNum, this->actor.params);
-            getItem = (CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0) && Randomizer_IsCheckShuffled(check)) ? GetItemMystery() : Randomizer_GetItemFromKnownCheck(check, GI_SKULL_TOKEN);
-            EnItem00_CustomItemsParticles(&this->actor, play, getItem);
-            if (getItem.itemId != ITEM_SKULL_TOKEN) {
-                f32 mtxScale = 1.5f;
-                Matrix_Scale(mtxScale, mtxScale, mtxScale, MTXMODE_APPLY);
-            }
-            GetItemEntry_Draw(play, getItem);
-        }
-    }
-}
-
-void EnSi_Reset() {
-    textId = 0xB4;
-    giveItemId = ITEM_SKULL_TOKEN;
-}
-
-void Randomizer_UpdateSkullReward(EnSi* this, PlayState* play) {
-    Player* player = GET_PLAYER(play);
-
-    getItem = Randomizer_GetItemFromActor(this->actor.id, play->sceneNum, this->actor.params, GI_SKULL_TOKEN);
-    getItemId = getItem.getItemId;
-    if (getItemId == RG_ICE_TRAP) {
-        textId = 0xF8;
-    } else {
-        textId = getItem.textId;
-        giveItemId = getItem.itemId;
-    }
-    player->getItemEntry = getItem;
-}
-
-void Randomizer_GiveSkullReward(EnSi* this, PlayState* play) {
-    Player* player = GET_PLAYER(play);
-
-    if (getItem.modIndex == MOD_NONE) {
-        // RANDOTOD: Move this into Item_Give() or some other more central location
-        if (getItem.getItemId == GI_SWORD_BGS) {
-            gSaveContext.bgsFlag = true;
-        }
-        Item_Give(play, giveItemId);
-    } else if (getItem.modIndex == MOD_RANDOMIZER) {
-        Randomizer_Item_Give(play, getItem);
+        GetItem_Draw(play, GID_SKULL_TOKEN_2);
     }
 }
diff --git a/soh/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c b/soh/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c
index 02656e119..29efb832c 100644
--- a/soh/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c
+++ b/soh/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c
@@ -93,23 +93,18 @@ void ItemBHeart_Draw(Actor* thisx, PlayState* play) {
         actorIt = actorIt->next;
     }
 
-    if (IS_RANDO) {
-        RandomizerCheck check = Randomizer_GetCheckFromActor(this->actor.id, play->sceneNum, this->actor.params);
-        GetItemEntry_Draw(play, (CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0) && Randomizer_IsCheckShuffled(check)) ? GetItemMystery() : Randomizer_GetItemFromKnownCheck(check, GI_HEART_CONTAINER_2));
+    if (flag) {
+        Gfx_SetupDL_25Xlu(play->state.gfxCtx);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
+                    G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPDisplayList(POLY_XLU_DISP++, gGiHeartBorderDL);
+        gSPDisplayList(POLY_XLU_DISP++, gGiHeartContainerDL);
     } else {
-        if (flag) {
-            Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-            gSPDisplayList(POLY_XLU_DISP++, gGiHeartBorderDL);
-            gSPDisplayList(POLY_XLU_DISP++, gGiHeartContainerDL);
-        } else {
-            Gfx_SetupDL_25Opa(play->state.gfxCtx);
-            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-            gSPDisplayList(POLY_OPA_DISP++, gGiHeartBorderDL);
-            gSPDisplayList(POLY_OPA_DISP++, gGiHeartContainerDL);
-        }
+        Gfx_SetupDL_25Opa(play->state.gfxCtx);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
+                    G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPDisplayList(POLY_OPA_DISP++, gGiHeartBorderDL);
+        gSPDisplayList(POLY_OPA_DISP++, gGiHeartContainerDL);
     }
 
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c b/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c
index d27893c3a..cc1f31aa0 100644
--- a/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c
+++ b/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c
@@ -206,16 +206,6 @@ void ItemEtcetera_DrawThroughLens(Actor* thisx, PlayState* play) {
     if (play->actorCtx.lensActive) {
         func_8002EBCC(&this->actor, play, 0);
         func_8002ED80(&this->actor, play, 0);
-
-        if(IS_RANDO && play->sceneNum == SCENE_TREASURE_BOX_SHOP) {
-            RandomizerCheck check = RC_MAX;
-            GetItemEntry randoGetItem = GetChestGameRandoGetItem(this->actor.room, this->giDrawId, play); //TODO Rando: add mysterious shuffle when chest minigame keys get shuffled
-            EnItem00_CustomItemsParticles(&this->actor, play, randoGetItem);
-            if (randoGetItem.itemId != ITEM_NONE) {
-                GetItemEntry_Draw(play, randoGetItem);
-                return;
-            }
-        }
         
         GetItem_Draw(play, this->giDrawId);
     }
@@ -225,24 +215,6 @@ void ItemEtcetera_Draw(Actor* thisx, PlayState* play) {
     ItemEtcetera* this = (ItemEtcetera*)thisx;
     s32 type = this->actor.params & 0xFF;
 
-    if (IS_RANDO) {
-        GetItemEntry randoGetItem = (GetItemEntry)GET_ITEM_NONE;
-        if (type == ITEM_ETC_ARROW_FIRE) {
-            randoGetItem = (CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0) && Randomizer_IsCheckShuffled(RC_LH_SUN)) ? GetItemMystery() : Randomizer_GetItemFromKnownCheck(RC_LH_SUN, GI_ARROW_FIRE);
-        } else if (type == ITEM_ETC_LETTER) {
-            randoGetItem = (CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0) && Randomizer_IsCheckShuffled(RC_LH_UNDERWATER_ITEM)) ? GetItemMystery() : Randomizer_GetItemFromKnownCheck(RC_LH_UNDERWATER_ITEM, GI_LETTER_RUTO);
-        }
-
-        EnItem00_CustomItemsParticles(&this->actor, play, randoGetItem);
-
-        if (randoGetItem.itemId != ITEM_NONE) {
-            func_8002EBCC(&this->actor, play, 0);
-            func_8002ED80(&this->actor, play, 0);
-            GetItemEntry_Draw(play, randoGetItem);
-            return;
-        }
-    }
-
     func_8002EBCC(&this->actor, play, 0);
     func_8002ED80(&this->actor, play, 0);
     GetItem_Draw(play, this->giDrawId);

From 3bcf178fcc7916a27a27fd6100871a9e53e43e66 Mon Sep 17 00:00:00 2001
From: Malkierian <malkierian@live.com>
Date: Wed, 8 May 2024 20:24:44 -0700
Subject: [PATCH 143/230] Fix LUS ref.

---
 libultraship | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libultraship b/libultraship
index 7d71a2906..a5d84b294 160000
--- a/libultraship
+++ b/libultraship
@@ -1 +1 @@
-Subproject commit 7d71a290657a2d3b09a83e8b33025e807f4fb38e
+Subproject commit a5d84b29429dcd9b32fb1d8b169b6dd269e6c979

From ca803099cfcdba5c92569c0f19fcaf41cbad92a4 Mon Sep 17 00:00:00 2001
From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Date: Thu, 9 May 2024 13:22:39 +0100
Subject: [PATCH 144/230] Fix DistributeHints (#4145)

* fix stupid crash in DistributeHints

* replace some uint8s in loops with size
---
 soh/soh/Enhancements/randomizer/3drando/hints.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.cpp b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
index 5973fdcee..1f195251b 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hints.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
@@ -533,17 +533,17 @@ int32_t getRandomWeight(int32_t totalWeight){
 static void DistributeHints(std::vector<uint8_t>& selected, size_t stoneCount, std::vector<HintDistributionSetting> distTable, uint8_t junkWieght, bool addFixed = true){
   int32_t totalWeight = junkWieght; //Start with our Junk Weight, the natural chance of a junk hint
 
-  for (HintDistributionSetting setting: distTable){ //Gather the wieghts of each distribution and, if it's the first pass, apply fixed hints
-    totalWeight += setting.weight;                  //Note that PlaceHints will set weights of distributions to zero if it can't place anything from them
+  for (size_t c=0; c < distTable.size(); c++){ //Gather the wieghts of each distribution and, if it's the first pass, apply fixed hints
+    totalWeight += distTable[c].weight;         //Note that PlaceHints will set weights of distributions to zero if it can't place anything from them
     if (addFixed){
-      selected[setting.type] += setting.fixed;
-      stoneCount -= setting.fixed * setting.copies;
+      selected[c] += distTable[c].fixed;
+      stoneCount -= distTable[c].fixed * distTable[c].copies;
     }
   }
   int32_t currentWeight = getRandomWeight(totalWeight); //Initialise with the first random weight from 1 to the total. 
   while(stoneCount > 0 && totalWeight > 0){//Loop until we run out of stones or have no TotalWeight. 0 totalWeight means junkWeight is 0
                                            //and that all weights have been 0'd out for another reason, and skips to placing all junk hints
-    for (uint8_t distribution = 0; distribution < distTable.size(); distribution++){
+    for (size_t distribution = 0; distribution < distTable.size(); distribution++){
       currentWeight -= distTable[distribution].weight; //go over each distribution, subtracting the weight each time. Once we reach zero or less,
       if (currentWeight <= 0){                         //tell the system to make 1 of that hint, unless not enough stones remain
         if (stoneCount >= distTable[distribution].copies && distTable[distribution].copies > 0){
@@ -650,7 +650,7 @@ void CreateStoneHints() {
 
   size_t totalStones = GetEmptyGossipStones().size();
   std::vector<uint8_t> selectedHints = {};
-  for (uint8_t c=0; c < distTable.size(); c++){
+  for (size_t c=0; c < distTable.size(); c++){
     selectedHints.push_back(0);
   }
   selectedHints.push_back(0);
@@ -672,7 +672,7 @@ void CreateStoneHints() {
 std::vector<RandomizerCheck> FindItemsAndMarkHinted(std::vector<RandomizerGet> items, std::vector<RandomizerCheck> hintChecks){
   std::vector<RandomizerCheck> locations = {};
   auto ctx = Rando::Context::GetInstance();
-  for (uint8_t c = 0; c < items.size(); c++){
+  for (size_t c = 0; c < items.size(); c++){
     std::vector<RandomizerCheck> found = FilterFromPool(ctx->allLocations, [items, ctx, c](const RandomizerCheck loc) {
       return ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == items[c];});
     if (found.size() > 0){

From 1d5a54901bca5a4f18f793091354b91e00196ec1 Mon Sep 17 00:00:00 2001
From: Malkierian <malkierian@gmail.com>
Date: Thu, 9 May 2024 09:45:13 -0700
Subject: [PATCH 145/230] Add MSI to EnEx hook handler. Resolve other review
 suggestions.

---
 .../Enhancements/randomizer/hook_handlers.cpp |  8 +++--
 .../actors/ovl_En_Ex_Item/z_en_ex_item.c      | 35 +------------------
 .../actors/ovl_Item_B_Heart/z_item_b_heart.c  |  4 +--
 .../ovl_Item_Etcetera/z_item_etcetera.c       |  2 --
 4 files changed, 9 insertions(+), 40 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index c3669af56..3f15ce4c8 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -333,9 +333,13 @@ void RandomizerOnItemReceiveHandler(GetItemEntry receivedItemEntry) {
 }
 
 void EnExItem_DrawRandomizedItem(EnExItem* enExItem, PlayState* play) {
+    GetItemEntry randoGetItem = enExItem->sohItemEntry;
+    if (CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0)) {
+        randoGetItem = GET_ITEM_MYSTERY;
+    }
     func_8002ED80(&enExItem->actor, play, 0);
-    EnItem00_CustomItemsParticles(&enExItem->actor, play, enExItem->sohItemEntry);
-    GetItemEntry_Draw(play, enExItem->sohItemEntry);
+    EnItem00_CustomItemsParticles(&enExItem->actor, play, randoGetItem);
+    GetItemEntry_Draw(play, randoGetItem);
 }
 
 void EnExItem_WaitForObjectRandomized(EnExItem* enExItem, PlayState* play) {
diff --git a/soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c b/soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c
index 26116664a..0b3d69f3c 100644
--- a/soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c
+++ b/soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c
@@ -487,46 +487,13 @@ void EnExItem_DrawItems(EnExItem* this, PlayState* play) {
     }
     if (this) {}
     func_8002ED80(&this->actor, play, 0);
-    if (IS_RANDO) {
-        GetItemEntry randoGetItem = (GetItemEntry)GET_ITEM_NONE;
-        switch (this->type) {
-            case EXITEM_BOMB_BAG_BOWLING:
-            case EXITEM_BOMB_BAG_COUNTER:
-                randoGetItem = (CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0) && Randomizer_IsCheckShuffled(RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE))
-                        ? GetItemMystery()
-                        : Randomizer_GetItemFromKnownCheck(RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE, GI_BOMB_BAG_20);
-                break;
-            case EXITEM_BOMBCHUS_BOWLING:
-            case EXITEM_BOMBCHUS_COUNTER:
-                randoGetItem = Randomizer_GetItemFromKnownCheck(RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS, GI_BOMBCHUS_10);
-                break;
-            case EXITEM_BULLET_BAG:
-                randoGetItem = (CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0) && Randomizer_IsCheckShuffled(RC_LW_TARGET_IN_WOODS))
-                                ? GetItemMystery() : Randomizer_GetItemFromKnownCheck(RC_LW_TARGET_IN_WOODS, GI_BULLET_BAG_50);
-                break;
-        }
-
-        if (randoGetItem.getItemId != GI_NONE) {
-            EnItem00_CustomItemsParticles(&this->actor, play, randoGetItem);
-            GetItemEntry_Draw(play, randoGetItem);
-            return;
-        }
-    }
 
     GetItem_Draw(play, this->giDrawId);
 }
 
 void EnExItem_DrawHeartPiece(EnExItem* this, PlayState* play) {
     func_8002ED80(&this->actor, play, 0);
-
-    if (IS_RANDO) {
-        GetItemEntry randoGetItem = (CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0) && Randomizer_IsCheckShuffled(RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE))
-                                    ? GetItemMystery() : Randomizer_GetItemFromKnownCheck(RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE, GI_HEART_PIECE);
-        EnItem00_CustomItemsParticles(&this->actor, play, randoGetItem);
-        GetItemEntry_Draw(play, randoGetItem);
-    } else {
-        GetItem_Draw(play, GID_HEART_PIECE);
-    }
+    GetItem_Draw(play, GID_HEART_PIECE);
 }
 
 void EnExItem_DrawMagic(EnExItem* this, PlayState* play, s16 magicIndex) {
diff --git a/soh/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c b/soh/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c
index 29efb832c..5015a3908 100644
--- a/soh/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c
+++ b/soh/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c
@@ -96,13 +96,13 @@ void ItemBHeart_Draw(Actor* thisx, PlayState* play) {
     if (flag) {
         Gfx_SetupDL_25Xlu(play->state.gfxCtx);
         gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                    G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, gGiHeartBorderDL);
         gSPDisplayList(POLY_XLU_DISP++, gGiHeartContainerDL);
     } else {
         Gfx_SetupDL_25Opa(play->state.gfxCtx);
         gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                    G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_OPA_DISP++, gGiHeartBorderDL);
         gSPDisplayList(POLY_OPA_DISP++, gGiHeartContainerDL);
     }
diff --git a/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c b/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c
index cc1f31aa0..796b157a3 100644
--- a/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c
+++ b/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c
@@ -206,14 +206,12 @@ void ItemEtcetera_DrawThroughLens(Actor* thisx, PlayState* play) {
     if (play->actorCtx.lensActive) {
         func_8002EBCC(&this->actor, play, 0);
         func_8002ED80(&this->actor, play, 0);
-        
         GetItem_Draw(play, this->giDrawId);
     }
 }
 
 void ItemEtcetera_Draw(Actor* thisx, PlayState* play) {
     ItemEtcetera* this = (ItemEtcetera*)thisx;
-    s32 type = this->actor.params & 0xFF;
 
     func_8002EBCC(&this->actor, play, 0);
     func_8002ED80(&this->actor, play, 0);

From 118cd044b528a9cca61e6c18c5a6cb387b642bad Mon Sep 17 00:00:00 2001
From: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>
Date: Fri, 10 May 2024 04:39:22 +0200
Subject: [PATCH 146/230] Rando: Starting hearts (#3974)

* Initial implementation

* Re-run build

---------

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
---
 soh/soh/Enhancements/mods.cpp                | 2 +-
 soh/soh/Enhancements/randomizer/savefile.cpp | 5 +++++
 soh/soh/Enhancements/randomizer/settings.cpp | 5 ++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/soh/soh/Enhancements/mods.cpp b/soh/soh/Enhancements/mods.cpp
index f12b12174..72f1bc599 100644
--- a/soh/soh/Enhancements/mods.cpp
+++ b/soh/soh/Enhancements/mods.cpp
@@ -434,7 +434,7 @@ void UpdatePermanentHeartLossState() {
     if (!CVarGetInteger(CVAR_ENHANCEMENT("PermanentHeartLoss"), 0) && hasAffectedHealth) {
         uint8_t heartContainers = gSaveContext.sohStats.heartContainers; // each worth 16 health
         uint8_t heartPieces = gSaveContext.sohStats.heartPieces; // each worth 4 health, but only in groups of 4
-        uint8_t startingHealth = 16 * 3;
+        uint8_t startingHealth = 16 * (IS_RANDO ? (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_STARTING_HEARTS) + 1) : 3);
 
 
         uint8_t newCapacity = startingHealth + (heartContainers * 16) + ((heartPieces - (heartPieces % 4)) * 4);
diff --git a/soh/soh/Enhancements/randomizer/savefile.cpp b/soh/soh/Enhancements/randomizer/savefile.cpp
index ffab46e49..e8998b4a4 100644
--- a/soh/soh/Enhancements/randomizer/savefile.cpp
+++ b/soh/soh/Enhancements/randomizer/savefile.cpp
@@ -140,6 +140,11 @@ void SetStartingItems() {
         gSaveContext.inventory.gsTokens = Randomizer_GetSettingValue(RSK_STARTING_SKULLTULA_TOKEN);
     }
 
+    if ((Randomizer_GetSettingValue(RSK_STARTING_HEARTS) + 1) != 3) {
+        gSaveContext.healthCapacity = (Randomizer_GetSettingValue(RSK_STARTING_HEARTS) + 1) * 16;
+        gSaveContext.health = gSaveContext.healthCapacity;
+    }
+
     if (Randomizer_GetSettingValue(RSK_STARTING_OCARINA)) {
         INV_CONTENT(ITEM_OCARINA_FAIRY) = ITEM_OCARINA_FAIRY;
     }
diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
index 11a42aefb..48011f423 100644
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -202,7 +202,7 @@ void Settings::CreateOptions() {
     mOptions[RSK_STARTING_NOCTURNE_OF_SHADOW] = Option::Bool("Start with Nocturne of Shadow", CVAR_RANDOMIZER_SETTING("StartingNocturneOfShadow"), "", IMFLAG_NONE);
     mOptions[RSK_STARTING_PRELUDE_OF_LIGHT] = Option::Bool("Start with Prelude of Light", CVAR_RANDOMIZER_SETTING("StartingPreludeOfLight"));
     mOptions[RSK_STARTING_SKULLTULA_TOKEN] = Option::U8("Gold Skulltula Tokens", {NumOpts(0, 100)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("StartingSkulltulaToken"), "", WidgetType::Slider);
-    mOptions[RSK_STARTING_HEARTS] = Option::U8("Hearts", {NumOpts(1, 20)}, OptionCategory::Setting, "", "", WidgetType::Slider, 2);
+    mOptions[RSK_STARTING_HEARTS] = Option::U8("Hearts", {NumOpts(1, 20)}, OptionCategory::Setting, "gRandomizeStartingHearts", "", WidgetType::Slider, 2);
     // TODO: Remainder of Starting Items
     mOptions[RSK_LOGIC_RULES] = Option::U8("Logic", {"Glitchless", "Glitched", "No Logic", "Vanilla"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("LogicRules"), mOptionDescriptions[RSK_LOGIC_RULES], WidgetType::Combobox, RO_LOGIC_GLITCHLESS);
     mOptions[RSK_ALL_LOCATIONS_REACHABLE] = Option::Bool("All Locations Reachable", {"Off", "On"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("AllLocationsReachable"), mOptionDescriptions[RSK_ALL_LOCATIONS_REACHABLE], WidgetType::Checkbox, RO_GENERIC_ON);
@@ -773,6 +773,7 @@ void Settings::CreateOptions() {
         &mOptions[RSK_STARTING_OCARINA],
         &mOptions[RSK_STARTING_CONSUMABLES],
         &mOptions[RSK_STARTING_SKULLTULA_TOKEN],
+        &mOptions[RSK_STARTING_HEARTS],
     }, false, WidgetContainerType::COLUMN);
     mOptionGroups[RSG_STARTING_NORMAL_SONGS_IMGUI] = OptionGroup::SubGroup("Normal Songs", {
         &mOptions[RSK_STARTING_ZELDAS_LULLABY],
@@ -933,6 +934,7 @@ void Settings::CreateOptions() {
         &mOptions[RSK_STARTING_CONSUMABLES],
         &mOptions[RSK_FULL_WALLETS],
         &mOptions[RSK_STARTING_SKULLTULA_TOKEN],
+        &mOptions[RSK_STARTING_HEARTS],
     }, false);
     mOptionGroups[RSG_STARTING_INVENTORY] = OptionGroup("Starting Inventory", {
         &mOptionGroups[RSG_STARTING_ITEMS],
@@ -1196,6 +1198,7 @@ void Settings::CreateOptions() {
         { "Start with Consumables", RSK_STARTING_CONSUMABLES },
         { "Full Wallets", RSK_FULL_WALLETS },
         { "Gold Skulltula Tokens", RSK_STARTING_SKULLTULA_TOKEN },
+        { "Hearts", RSK_STARTING_HEARTS },
         { "Timesaver Settings:Cuccos to return", RSK_CUCCO_COUNT },
         { "Timesaver Settings:Big Poe Target Count", RSK_BIG_POE_COUNT },
         { "Timesaver Settings:Skip Child Stealth", RSK_SKIP_CHILD_STEALTH },

From 6f7173a5c41eb700381ba7d1ce7558d5b556e892 Mon Sep 17 00:00:00 2001
From: Garrett Cox <garrettjcox@gmail.com>
Date: Thu, 9 May 2024 22:22:08 -0500
Subject: [PATCH 147/230] Split a few VB changes out into their own files
 (#4123)

---
 .../TimeSavers/SkipCutscene/SkipIntro.cpp     |  21 ++
 .../SkipCutscene/Story/SkipBlueWarp.cpp       | 143 +++++++++++++
 .../SkipCutscene/Story/SkipDekuTreeIntro.cpp  |  22 ++
 .../Story/SkipLostWoodsBridge.cpp             |  39 ++++
 .../Story/SkipToGivingZeldasLetter.cpp        |  45 ++++
 .../Story/SkipZeldaFleeingCastle.cpp          |  67 ++++++
 .../MoveMidoInKokiriForest.cpp                |  30 +++
 .../Enhancements/TimeSavers/TimeSavers.cpp    |  14 ++
 soh/soh/Enhancements/TimeSavers/TimeSavers.h  |  17 ++
 .../game-interactor/GameInteractor.h          |   2 +-
 soh/soh/Enhancements/mods.cpp                 |   2 +
 .../Enhancements/timesaver_hook_handlers.cpp  | 200 ------------------
 .../actors/ovl_Bg_Treemouth/z_bg_treemouth.h  |   2 +
 soh/src/overlays/actors/ovl_En_Ko/z_en_ko.h   |   5 +-
 14 files changed, 407 insertions(+), 202 deletions(-)
 create mode 100644 soh/soh/Enhancements/TimeSavers/SkipCutscene/SkipIntro.cpp
 create mode 100644 soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipBlueWarp.cpp
 create mode 100644 soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipDekuTreeIntro.cpp
 create mode 100644 soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipLostWoodsBridge.cpp
 create mode 100644 soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipToGivingZeldasLetter.cpp
 create mode 100644 soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipZeldaFleeingCastle.cpp
 create mode 100644 soh/soh/Enhancements/TimeSavers/SkipMiscInteractions/MoveMidoInKokiriForest.cpp
 create mode 100644 soh/soh/Enhancements/TimeSavers/TimeSavers.cpp
 create mode 100644 soh/soh/Enhancements/TimeSavers/TimeSavers.h

diff --git a/soh/soh/Enhancements/TimeSavers/SkipCutscene/SkipIntro.cpp b/soh/soh/Enhancements/TimeSavers/SkipCutscene/SkipIntro.cpp
new file mode 100644
index 000000000..95e9c2d10
--- /dev/null
+++ b/soh/soh/Enhancements/TimeSavers/SkipCutscene/SkipIntro.cpp
@@ -0,0 +1,21 @@
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/OTRGlobals.h"
+
+extern "C" {
+    #include "z64save.h"
+    #include "functions.h"
+    extern PlayState* gPlayState;
+    extern SaveContext gSaveContext;
+}
+
+void SkipIntro_Register() {
+    REGISTER_VB_SHOULD(VB_PLAY_TRANSITION_CS, {
+        if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Intro"), IS_RANDO)) {
+            if (gSaveContext.entranceIndex == ENTR_LINKS_HOUSE_0 && gSaveContext.cutsceneIndex == 0xFFF1) {
+                gSaveContext.cutsceneIndex = 0;
+                *should = false;
+            }
+        }
+    });
+}
diff --git a/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipBlueWarp.cpp b/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipBlueWarp.cpp
new file mode 100644
index 000000000..564ca2d8f
--- /dev/null
+++ b/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipBlueWarp.cpp
@@ -0,0 +1,143 @@
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/OTRGlobals.h"
+
+extern "C" {
+    #include "macros.h"
+    #include "src/overlays/actors/ovl_En_Ko/z_en_ko.h"
+    #include "z64save.h"
+    #include "functions.h"
+    #include "variables.h"
+}
+
+#define RAND_GET_OPTION(option) Rando::Context::GetInstance()->GetOption(option).GetSelectedOptionIndex()
+
+/**
+ * This will override the transitions into the blue warp cutscenes, set any appropriate flags, and
+ * set the entrance index to where you would normally end up after the blue warp cutscene. This
+ * should also account for the difference between your first and following visits to the blue warp.
+ */
+void SkipBlueWarp_ShouldPlayTransitionCS(GIVanillaBehavior _, bool* should, void* opt) {
+    if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
+        uint8_t isBlueWarp = 0;
+        // Deku Tree Blue warp
+        if (gSaveContext.entranceIndex == ENTR_KOKIRI_FOREST_0 && gSaveContext.cutsceneIndex == 0xFFF1) {
+            gSaveContext.entranceIndex = ENTR_KOKIRI_FOREST_11;
+            isBlueWarp = 1;
+        // Dodongo's Cavern Blue warp
+        } else if (gSaveContext.entranceIndex == ENTR_DEATH_MOUNTAIN_TRAIL_0 && gSaveContext.cutsceneIndex == 0xFFF1) {
+            gSaveContext.entranceIndex = ENTR_DEATH_MOUNTAIN_TRAIL_5;
+            isBlueWarp = 1;
+        // Jabu Jabu's Blue warp
+        } else if (gSaveContext.entranceIndex == ENTR_ZORAS_FOUNTAIN_0 && gSaveContext.cutsceneIndex == 0xFFF0) {
+            gSaveContext.entranceIndex = ENTR_ZORAS_FOUNTAIN_0;
+            isBlueWarp = 1;
+        // Forest Temple Blue warp
+        } else if (gSaveContext.entranceIndex == ENTR_CHAMBER_OF_THE_SAGES_0 && gSaveContext.cutsceneIndex == 0x0 && gSaveContext.chamberCutsceneNum == CHAMBER_CS_FOREST) {
+            // Normally set in the blue warp cutscene
+            Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_DEKU_TREE_SPROUT);
+
+            if (IS_RANDO) {
+                gSaveContext.entranceIndex = ENTR_SACRED_FOREST_MEADOW_3;
+            } else {
+                gSaveContext.entranceIndex = ENTR_KOKIRI_FOREST_12;
+            }
+
+            isBlueWarp = 1;
+        // Fire Temple Blue warp
+        } else if (gSaveContext.entranceIndex == ENTR_KAKARIKO_VILLAGE_0 && gSaveContext.cutsceneIndex == 0xFFF3) {
+            gSaveContext.entranceIndex = ENTR_DEATH_MOUNTAIN_CRATER_5;
+            isBlueWarp = 1;
+        // Water Temple Blue warp
+        } else if (gSaveContext.entranceIndex == ENTR_CHAMBER_OF_THE_SAGES_0 && gSaveContext.cutsceneIndex == 0x0 && gSaveContext.chamberCutsceneNum == CHAMBER_CS_WATER) {
+            // Normally set in the blue warp cutscene
+            gSaveContext.dayTime = gSaveContext.skyboxTime = 0x4800;
+
+            gSaveContext.entranceIndex = ENTR_LAKE_HYLIA_9;
+            isBlueWarp = 1;
+        // Spirit Temple Blue warp
+        } else if (gSaveContext.entranceIndex == ENTR_CHAMBER_OF_THE_SAGES_0 && gSaveContext.cutsceneIndex == 0x0 && gSaveContext.chamberCutsceneNum == CHAMBER_CS_SPIRIT) {
+            gSaveContext.entranceIndex = ENTR_DESERT_COLOSSUS_8;
+            isBlueWarp = 1;
+        // Shadow Temple Blue warp
+        } else if (gSaveContext.entranceIndex == ENTR_CHAMBER_OF_THE_SAGES_0 && gSaveContext.cutsceneIndex == 0x0 && gSaveContext.chamberCutsceneNum == CHAMBER_CS_SHADOW) {
+            gSaveContext.entranceIndex = ENTR_GRAVEYARD_8;
+            isBlueWarp = 1;
+        }
+
+        if (isBlueWarp) {
+            if (gSaveContext.entranceIndex != ENTR_LAKE_HYLIA_9) {
+                // Normally set in the blue warp cutscene
+                gSaveContext.dayTime = gSaveContext.skyboxTime = 0x8000;
+            }
+
+            *should = false;
+            gSaveContext.cutsceneIndex = 0;
+
+            if (IS_RANDO && (RAND_GET_OPTION(RSK_SHUFFLE_DUNGEON_ENTRANCES) != RO_DUNGEON_ENTRANCE_SHUFFLE_OFF || RAND_GET_OPTION(RSK_SHUFFLE_BOSS_ENTRANCES) != RO_BOSS_ROOM_ENTRANCE_SHUFFLE_OFF)) {
+                Entrance_OverrideBlueWarp();
+            }
+        }
+    }
+}
+
+/**
+ * While we could rely on the Item_Give that's normally called, it's not very clear to the player that they
+ * received the item when skipping the blue warp cutscene, so we'll prevent that and queue it up to be given 
+ * to the player instead.
+ */
+void SkipBlueWarp_ShouldGiveItem(GIVanillaBehavior _, bool* should, void* opt) {
+    if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
+        *should = false;
+    }
+}
+
+// Todo: Move item queueing here
+
+/**
+ * This ensures the Kokiri blocking the forest exit checks if you are eligible to leave the forest
+ * every frame, instead of only at init. The reason we need to do this is when we skip the blue warp cutscene
+ * you end up getting the Kokiri Emerald after the actor has init'd, so the actor doesn't know you have it
+ */
+void EnKo_MoveWhenReady(EnKo* enKo, PlayState* play) {
+    func_80A995CC(enKo, play);
+
+    if ((enKo->actor.params & 0xFF) == ENKO_TYPE_CHILD_3) {
+        if (GameInteractor_Should(VB_OPEN_KOKIRI_FOREST, CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD), NULL)) {
+            enKo->collider.dim.height -= 200;
+            Path_CopyLastPoint(enKo->path, &enKo->actor.world.pos);
+            enKo->actionFunc = func_80A99384;
+        }
+    }
+}
+
+void SkipBlueWarp_OnActorUpdate(void* actorPtr) {
+    EnKo* enKo = static_cast<EnKo*>(actorPtr);
+
+    if (
+        (enKo->actor.params & 0xFF) == ENKO_TYPE_CHILD_3 &&
+        enKo->actionFunc == func_80A995CC &&
+        CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)
+    ) {
+        enKo->actionFunc = EnKo_MoveWhenReady;
+    }
+}
+
+/**
+ * This will ensure that the Deku Tree Sprout considers the Forest Temple finished when you skip the blue warp cutscene.
+ * Typically this checks for if you have the medallion, and when skipping the cutscene at this point you don't have it yet.
+ */
+void SkipBlueWarp_ShouldDekuJrConsiderForestTempleFinished(GIVanillaBehavior _, bool* should, void* opt) {
+    if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
+        if (gSaveContext.entranceIndex == ENTR_KOKIRI_FOREST_11 && gSaveContext.cutsceneIndex == 0xFFF1) {
+            *should = Flags_GetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP);
+        }
+    }
+}
+
+void SkipBlueWarp_Register() {
+    GameInteractor::Instance->RegisterGameHookForID<GameInteractor::OnActorUpdate>(ACTOR_EN_KO, SkipBlueWarp_OnActorUpdate);
+    GameInteractor::Instance->RegisterGameHookForID<GameInteractor::OnVanillaBehavior>(VB_PLAY_TRANSITION_CS, SkipBlueWarp_ShouldPlayTransitionCS);
+    GameInteractor::Instance->RegisterGameHookForID<GameInteractor::OnVanillaBehavior>(VB_DEKU_JR_CONSIDER_FOREST_TEMPLE_FINISHED, SkipBlueWarp_ShouldDekuJrConsiderForestTempleFinished);
+    GameInteractor::Instance->RegisterGameHookForID<GameInteractor::OnVanillaBehavior>(VB_GIVE_ITEM_FROM_BLUE_WARP, SkipBlueWarp_ShouldGiveItem);
+}
diff --git a/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipDekuTreeIntro.cpp b/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipDekuTreeIntro.cpp
new file mode 100644
index 000000000..bac84cb63
--- /dev/null
+++ b/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipDekuTreeIntro.cpp
@@ -0,0 +1,22 @@
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/OTRGlobals.h"
+
+extern "C" {
+    #include "src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.h"
+}
+
+/**
+ * This will skip the Deku Tree intro, and simply open the mouth as you approach it.
+*/
+void SkipDekuTreeIntro_Register() {
+    REGISTER_VB_SHOULD(VB_PLAY_DEKU_TREE_INTRO_CS, {
+        if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
+            BgTreemouth* treeMouth = static_cast<BgTreemouth*>(opt);
+            Flags_SetEventChkInf(EVENTCHKINF_DEKU_TREE_OPENED_MOUTH);
+            Audio_PlaySoundGeneral(NA_SE_EV_WOODDOOR_OPEN, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
+            BgTreemouth_SetupAction(treeMouth, func_808BC6F8);
+            *should = false;
+        }
+    });
+}
diff --git a/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipLostWoodsBridge.cpp b/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipLostWoodsBridge.cpp
new file mode 100644
index 000000000..f447b7386
--- /dev/null
+++ b/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipLostWoodsBridge.cpp
@@ -0,0 +1,39 @@
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/OTRGlobals.h"
+
+extern "C" {
+    #include "z64save.h"
+    #include "functions.h"
+    extern PlayState* gPlayState;
+    extern SaveContext gSaveContext;
+}
+
+void SkipLostWoodsBridge_Register() {
+    /**
+     * This skips the cutscene where you speak to Saria on the bridge in Lost Woods, where she gives you the Fairy Ocarina.
+     */
+    REGISTER_VB_SHOULD(VB_PLAY_TRANSITION_CS, {
+        if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
+            if ((gSaveContext.entranceIndex == ENTR_LOST_WOODS_9) && !Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_SARIA_ON_BRIDGE)) {
+                Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_SARIA_ON_BRIDGE);
+                if (GameInteractor_Should(VB_GIVE_ITEM_FAIRY_OCARINA, true, NULL)) {
+                    Item_Give(gPlayState, ITEM_OCARINA_FAIRY);
+                }
+                *should = false;
+            }
+        }
+    });
+
+    /**
+     * While we could rely on the Item_Give that's normally called (and that we have above), it's not very clear to the player
+     * that they received the item when skipping the cutscene, so we'll prevent it, and queue it up to be given instead.
+     */
+    REGISTER_VB_SHOULD(VB_GIVE_ITEM_FAIRY_OCARINA, {
+        if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
+            *should = false;
+        }
+    });
+
+    // Todo: Move item queueing here
+}
diff --git a/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipToGivingZeldasLetter.cpp b/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipToGivingZeldasLetter.cpp
new file mode 100644
index 000000000..357125db8
--- /dev/null
+++ b/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipToGivingZeldasLetter.cpp
@@ -0,0 +1,45 @@
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/OTRGlobals.h"
+
+extern "C" {
+    #include "src/overlays/actors/ovl_En_Zl4/z_en_zl4.h"
+}
+
+/**
+ * This overrides Zelda's update function to effectively skip the dialog and cutscenes played when
+ * you meet with her in Hyrule Castle Courtyard. As you approach her she will turn around, and talking
+ * with her will place you at the very last dialog option where she gives you the letter.
+ */
+
+u16 EnZl4_GiveItemTextId(PlayState* play, Actor* actor) {
+    return 0x207D;
+}
+
+void EnZl4_SkipToGivingZeldasLetter(EnZl4* enZl4, PlayState* play) {
+    if (enZl4->csState == 0 && enZl4->actor.xzDistToPlayer < 700.0f && EnZl4_SetNextAnim(enZl4, 3)) {
+        Audio_PlayFanfare(NA_BGM_APPEAR);
+        enZl4->csState = 8; // ZL4_CS_PLAN
+    } else {
+        Npc_UpdateTalking(play, &enZl4->actor, &enZl4->interactInfo.talkState, enZl4->collider.dim.radius + 60.0f, EnZl4_GiveItemTextId, func_80B5B9B0);
+        func_80B5BB78(enZl4, play);
+
+        if (enZl4->interactInfo.talkState != NPC_TALK_STATE_IDLE) {
+            enZl4->talkState = 6;
+            enZl4->actionFunc = EnZl4_Cutscene;
+        }
+    }
+}
+
+void SkipToGivingZeldasLetter_OnActorInit(void* actorPtr) {
+    if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
+        EnZl4* enZl4 = static_cast<EnZl4*>(actorPtr);
+        if (enZl4->actionFunc != EnZl4_Cutscene || enZl4->csState != 0) return;
+
+        enZl4->actionFunc = EnZl4_SkipToGivingZeldasLetter;
+    }
+}
+
+void SkipToGivingZeldasLetter_Register() {
+    GameInteractor::Instance->RegisterGameHookForID<GameInteractor::OnActorInit>(ACTOR_EN_ZL4, SkipToGivingZeldasLetter_OnActorInit);
+}
diff --git a/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipZeldaFleeingCastle.cpp b/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipZeldaFleeingCastle.cpp
new file mode 100644
index 000000000..48cc80aa7
--- /dev/null
+++ b/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipZeldaFleeingCastle.cpp
@@ -0,0 +1,67 @@
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/OTRGlobals.h"
+
+extern "C" {
+    #include "z64save.h"
+    #include "functions.h"
+    extern SaveContext gSaveContext;
+}
+
+void SkipZeldaFleeingCastle_ShouldPlayTransitionCS(GIVanillaBehavior _, bool* should, void* opt) {
+    if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
+        if (gSaveContext.entranceIndex == ENTR_HYRULE_FIELD_0 && gSaveContext.cutsceneIndex == 0xFFF1) {
+            // Normally set in the cutscene
+            gSaveContext.dayTime = gSaveContext.skyboxTime = 0x4AAA;
+
+            gSaveContext.cutsceneIndex = 0;
+            *should = false;
+        }
+    }
+}
+
+/**
+ * When this cutscene is skipped, walking up to the bridge to castle town triggers a quick fade in/out
+ * which can be confusing to beginners, because they need to then fetch the Ocarina of Time from the water.
+ * To make it more obvious what happened, we'll play the sound of the Ocarina dropping into the water.
+ */
+static int framesSinceSpawn = 0;
+static HOOK_ID itemOcarinaUpdateHook = 0;
+static HOOK_ID sceneInitHook = 0;
+
+void SkipZeldaFleeingCastle_OnActorUpdate(void* actorPtr) {
+    Actor* actor = static_cast<Actor*>(actorPtr);
+
+    framesSinceSpawn++;
+    if (framesSinceSpawn > 20) {
+        Audio_PlayActorSound2(actor, NA_SE_EV_BOMB_DROP_WATER);
+
+        GameInteractor::Instance->UnregisterGameHookForPtr<GameInteractor::OnActorUpdate>(itemOcarinaUpdateHook);
+        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(sceneInitHook);
+        itemOcarinaUpdateHook = 0;
+        sceneInitHook = 0;
+    }
+}
+
+void SkipZeldaFleeingCastle_OnActorInit(void* actorPtr) {
+    Actor* actor = static_cast<Actor*>(actorPtr);
+
+    if (
+        actor->params == 3 &&
+        CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)
+    ) {
+        framesSinceSpawn = 0;
+        itemOcarinaUpdateHook = GameInteractor::Instance->RegisterGameHookForPtr<GameInteractor::OnActorUpdate>((uintptr_t)actorPtr, SkipZeldaFleeingCastle_OnActorUpdate);
+        sceneInitHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>([] (int16_t sceneNum) {
+            GameInteractor::Instance->UnregisterGameHookForPtr<GameInteractor::OnActorUpdate>(itemOcarinaUpdateHook);
+            GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(sceneInitHook);
+            itemOcarinaUpdateHook = 0;
+            sceneInitHook = 0;
+        });
+    }
+}
+
+void SkipZeldaFleeingCastle_Register() {
+    GameInteractor::Instance->RegisterGameHookForID<GameInteractor::OnActorInit>(ACTOR_ITEM_OCARINA, SkipZeldaFleeingCastle_OnActorInit);
+    GameInteractor::Instance->RegisterGameHookForID<GameInteractor::OnVanillaBehavior>(VB_PLAY_TRANSITION_CS, SkipZeldaFleeingCastle_ShouldPlayTransitionCS);
+}
diff --git a/soh/soh/Enhancements/TimeSavers/SkipMiscInteractions/MoveMidoInKokiriForest.cpp b/soh/soh/Enhancements/TimeSavers/SkipMiscInteractions/MoveMidoInKokiriForest.cpp
new file mode 100644
index 000000000..78a680175
--- /dev/null
+++ b/soh/soh/Enhancements/TimeSavers/SkipMiscInteractions/MoveMidoInKokiriForest.cpp
@@ -0,0 +1,30 @@
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/OTRGlobals.h"
+
+extern "C" {
+    #include "z64save.h"
+    #include "macros.h"
+    #include "variables.h"
+    #include "functions.h"
+    extern PlayState* gPlayState;
+    extern SaveContext gSaveContext;
+}
+
+/**
+ * This simply skips the Mido interaction in Kokiri Forest, once you equip the Kokiri
+ * Sword and Deku Shield he will move out of the way without you needing to talk to him.
+ */
+void MoveMidoInKokiriForest_Register() {
+    REGISTER_VB_SHOULD(VB_MOVE_MIDO_IN_KOKIRI_FOREST, {
+        if (
+            CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO) &&
+            !Flags_GetEventChkInf(EVENTCHKINF_SHOWED_MIDO_SWORD_SHIELD) &&
+            (CUR_EQUIP_VALUE(EQUIP_TYPE_SHIELD) == EQUIP_VALUE_SHIELD_DEKU) && 
+            (CUR_EQUIP_VALUE(EQUIP_TYPE_SWORD) == EQUIP_VALUE_SWORD_KOKIRI)
+        ) {
+            Flags_SetEventChkInf(EVENTCHKINF_SHOWED_MIDO_SWORD_SHIELD);
+            *should = true;
+        }
+    });
+}
diff --git a/soh/soh/Enhancements/TimeSavers/TimeSavers.cpp b/soh/soh/Enhancements/TimeSavers/TimeSavers.cpp
new file mode 100644
index 000000000..f6d2e3629
--- /dev/null
+++ b/soh/soh/Enhancements/TimeSavers/TimeSavers.cpp
@@ -0,0 +1,14 @@
+#include "TimeSavers.h"
+
+void TimeSavers_Register() {
+    // SkipCutscene
+        // Story
+            SkipBlueWarp_Register();
+            SkipDekuTreeIntro_Register();
+            SkipLostWoodsBridge_Register();
+            SkipToGivingZeldasLetter_Register();
+            SkipZeldaFleeingCastle_Register();
+        SkipIntro_Register();
+    // SkipMiscInteractions
+        MoveMidoInKokiriForest_Register();
+}
diff --git a/soh/soh/Enhancements/TimeSavers/TimeSavers.h b/soh/soh/Enhancements/TimeSavers/TimeSavers.h
new file mode 100644
index 000000000..b3b221351
--- /dev/null
+++ b/soh/soh/Enhancements/TimeSavers/TimeSavers.h
@@ -0,0 +1,17 @@
+#ifndef TIME_SAVERS_H
+#define TIME_SAVERS_H
+
+void TimeSavers_Register();
+
+// SkipCutscene
+    // Story
+        void SkipBlueWarp_Register();
+        void SkipDekuTreeIntro_Register();
+        void SkipLostWoodsBridge_Register();
+        void SkipToGivingZeldasLetter_Register();
+        void SkipZeldaFleeingCastle_Register();
+    void SkipIntro_Register();
+// SkipMiscInteractions
+    void MoveMidoInKokiriForest_Register();
+
+#endif // TIME_SAVERS_H
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h
index cca978b2d..956384e5d 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h
@@ -440,7 +440,7 @@ typedef uint32_t HOOK_ID;
     }
 
 #define REGISTER_VB_SHOULD(flag, body) \
-    GameInteractor::Instance->RegisterGameHookForID<GameInteractor::ShouldVanillaBehavior>(flag, [](GIVanillaBehavior _, bool* should, void* opt) body)
+    GameInteractor::Instance->RegisterGameHookForID<GameInteractor::OnVanillaBehavior>(flag, [](GIVanillaBehavior _, bool* should, void* opt) body)
 
 class GameInteractor {
 public:
diff --git a/soh/soh/Enhancements/mods.cpp b/soh/soh/Enhancements/mods.cpp
index 72f1bc599..2efe6477e 100644
--- a/soh/soh/Enhancements/mods.cpp
+++ b/soh/soh/Enhancements/mods.cpp
@@ -11,6 +11,7 @@
 #include <soh/Enhancements/item-tables/ItemTableManager.h>
 #include "soh/Enhancements/nametag.h"
 #include "soh/Enhancements/timesaver_hook_handlers.h"
+#include "soh/Enhancements/TimeSavers/TimeSavers.h"
 #include "soh/Enhancements/cheat_hook_handlers.h"
 #include "soh/Enhancements/randomizer/hook_handlers.h"
 #include "objects/object_gi_compass/object_gi_compass.h"
@@ -1715,6 +1716,7 @@ void InitMods() {
     RandomizerRegisterHooks();
     TimeSaverRegisterHooks();
     CheatsRegisterHooks();
+    TimeSavers_Register();
     RegisterTTS();
     RegisterInfiniteMoney();
     RegisterInfiniteHealth();
diff --git a/soh/soh/Enhancements/timesaver_hook_handlers.cpp b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
index 569459c67..28518ae14 100644
--- a/soh/soh/Enhancements/timesaver_hook_handlers.cpp
+++ b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
@@ -34,20 +34,6 @@ extern int32_t D_8011D3AC;
 
 #define RAND_GET_OPTION(option) Rando::Context::GetInstance()->GetOption(option).GetSelectedOptionIndex()
 
-void EnKo_MoveWhenReady(EnKo* enKo, PlayState* play) {
-    func_80A995CC(enKo, play);
-
-    if ((enKo->actor.params & 0xFF) == ENKO_TYPE_CHILD_3) {
-        // Typically this doesn't get get live updated in vanilla, but we need to
-        // live update it if we're skipping a certain cutscene or in randomizer
-        if (GameInteractor_Should(VB_OPEN_KOKIRI_FOREST, CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD), NULL)) {
-            enKo->collider.dim.height -= 200;
-            Path_CopyLastPoint(enKo->path, &enKo->actor.world.pos);
-            enKo->actionFunc = func_80A99384;
-        }
-    }
-}
-
 void EnMa1_EndTeachSong(EnMa1* enMa1, PlayState* play) {
     if (Message_GetState(&gPlayState->msgCtx) == TEXT_STATE_CLOSING) {
         Flags_SetRandomizerInf(RAND_INF_LEARNED_EPONA_SONG);
@@ -74,25 +60,6 @@ void EnFu_EndTeachSong(EnFu* enFu, PlayState* play) {
     }
 }
 
-u16 EnZl4_GiveItemTextId(PlayState* play, Actor* actor) {
-    return 0x207D;
-}
-
-void EnZl4_SkipToGivingZeldasLetter(EnZl4* enZl4, PlayState* play) {
-    if (enZl4->csState == 0 && enZl4->actor.xzDistToPlayer < 600.0f && EnZl4_SetNextAnim(enZl4, 3)) {
-        Audio_PlayFanfare(NA_BGM_APPEAR);
-        enZl4->csState = 8; // ZL4_CS_PLAN
-    } else {
-        Npc_UpdateTalking(play, &enZl4->actor, &enZl4->interactInfo.talkState, enZl4->collider.dim.radius + 60.0f, EnZl4_GiveItemTextId, func_80B5B9B0);
-        func_80B5BB78(enZl4, play);
-
-        if (enZl4->interactInfo.talkState != NPC_TALK_STATE_IDLE) {
-            enZl4->talkState = 6;
-            enZl4->actionFunc = EnZl4_Cutscene;
-        }
-    }
-}
-
 void EnDntDemo_JudgeSkipToReward(EnDntDemo* enDntDemo, PlayState* play) {
     // todo: figure out a better way to handle toggling so we don't
     //       need to double check cvars like this
@@ -141,11 +108,6 @@ void TimeSaverOnGameFrameUpdateHandler() {
 void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void* opt) {
     switch (id) {
         case VB_PLAY_TRANSITION_CS: {
-            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Intro"), IS_RANDO) && gSaveContext.entranceIndex == ENTR_LINKS_HOUSE_0 && gSaveContext.cutsceneIndex == 0xFFF1) {
-                gSaveContext.cutsceneIndex = 0;
-                *should = false;
-            }
-
             if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.LearnSong"), IS_RANDO) || IS_RANDO) {
                 // Song of Time
                 if (gSaveContext.entranceIndex == ENTR_TEMPLE_OF_TIME_0 && gSaveContext.cutsceneIndex == 0xFFF7) {
@@ -185,82 +147,6 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             }
 
             if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
-                uint8_t isBlueWarp = 0;
-                // Deku Tree Blue warp
-                if (gSaveContext.entranceIndex == ENTR_KOKIRI_FOREST_0 && gSaveContext.cutsceneIndex == 0xFFF1) {
-                    gSaveContext.entranceIndex = ENTR_KOKIRI_FOREST_11;
-                    isBlueWarp = 1;
-                // Dodongo's Cavern Blue warp
-                } else if (gSaveContext.entranceIndex == ENTR_DEATH_MOUNTAIN_TRAIL_0 && gSaveContext.cutsceneIndex == 0xFFF1) {
-                    gSaveContext.entranceIndex = ENTR_DEATH_MOUNTAIN_TRAIL_5;
-                    isBlueWarp = 1;
-                // Jabu Jabu's Blue warp
-                } else if (gSaveContext.entranceIndex == ENTR_ZORAS_FOUNTAIN_0 && gSaveContext.cutsceneIndex == 0xFFF0) {
-                    gSaveContext.entranceIndex = ENTR_ZORAS_FOUNTAIN_0;
-                    isBlueWarp = 1;
-                // Forest Temple Blue warp
-                } else if (gSaveContext.entranceIndex == ENTR_CHAMBER_OF_THE_SAGES_0 && gSaveContext.cutsceneIndex == 0x0 && gSaveContext.chamberCutsceneNum == CHAMBER_CS_FOREST) {
-                    // Normally set in the blue warp cutscene
-                    Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_DEKU_TREE_SPROUT);
-
-                    if (IS_RANDO) {
-                        gSaveContext.entranceIndex = ENTR_SACRED_FOREST_MEADOW_3;
-                    } else {
-                        gSaveContext.entranceIndex = ENTR_KOKIRI_FOREST_12;
-                    }
-
-                    isBlueWarp = 1;
-                // Fire Temple Blue warp
-                } else if (gSaveContext.entranceIndex == ENTR_KAKARIKO_VILLAGE_0 && gSaveContext.cutsceneIndex == 0xFFF3) {
-                    gSaveContext.entranceIndex = ENTR_DEATH_MOUNTAIN_CRATER_5;
-                    isBlueWarp = 1;
-                // Water Temple Blue warp
-                } else if (gSaveContext.entranceIndex == ENTR_CHAMBER_OF_THE_SAGES_0 && gSaveContext.cutsceneIndex == 0x0 && gSaveContext.chamberCutsceneNum == CHAMBER_CS_WATER) {
-                    // Normally set in the blue warp cutscene
-                    gSaveContext.dayTime = gSaveContext.skyboxTime = 0x4800;
-
-                    gSaveContext.entranceIndex = ENTR_LAKE_HYLIA_9;
-                    isBlueWarp = 1;
-                // Spirit Temple Blue warp
-                } else if (gSaveContext.entranceIndex == ENTR_CHAMBER_OF_THE_SAGES_0 && gSaveContext.cutsceneIndex == 0x0 && gSaveContext.chamberCutsceneNum == CHAMBER_CS_SPIRIT) {
-                    gSaveContext.entranceIndex = ENTR_DESERT_COLOSSUS_8;
-                    isBlueWarp = 1;
-                // Shadow Temple Blue warp
-                } else if (gSaveContext.entranceIndex == ENTR_CHAMBER_OF_THE_SAGES_0 && gSaveContext.cutsceneIndex == 0x0 && gSaveContext.chamberCutsceneNum == CHAMBER_CS_SHADOW) {
-                    gSaveContext.entranceIndex = ENTR_GRAVEYARD_8;
-                    isBlueWarp = 1;
-                }
-
-                if (isBlueWarp) {
-                    // Normally set in the blue warp cutscene
-                    gSaveContext.dayTime = gSaveContext.skyboxTime = 0x8000;
-
-                    *should = false;
-                    gSaveContext.cutsceneIndex = 0;
-
-                    if (IS_RANDO && (RAND_GET_OPTION(RSK_SHUFFLE_DUNGEON_ENTRANCES) != RO_DUNGEON_ENTRANCE_SHUFFLE_OFF || RAND_GET_OPTION(RSK_SHUFFLE_BOSS_ENTRANCES) != RO_BOSS_ROOM_ENTRANCE_SHUFFLE_OFF)) {
-                        Entrance_OverrideBlueWarp();
-                    }
-                }
-
-                // Flee hyrule castle cutscene
-                if (gSaveContext.entranceIndex == ENTR_HYRULE_FIELD_0 && gSaveContext.cutsceneIndex == 0xFFF1) {
-                    // Normally set in the blue warp cutscene
-                    gSaveContext.dayTime = gSaveContext.skyboxTime = 0x4AAA;
-
-                    gSaveContext.cutsceneIndex = 0;
-                    *should = false;
-                }
-
-                // Lost Woods Bridge
-                if ((gSaveContext.entranceIndex == ENTR_LOST_WOODS_9) && !Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_SARIA_ON_BRIDGE)) {
-                    Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_SARIA_ON_BRIDGE);
-                    if (GameInteractor_Should(VB_GIVE_ITEM_FAIRY_OCARINA, true, NULL)) {
-                        Item_Give(gPlayState, ITEM_OCARINA_FAIRY);
-                    }
-                    *should = false;
-                }
-
                 // LACS
                 u8 meetsLACSRequirements =
                     LINK_IS_ADULT &&
@@ -429,38 +315,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
                 *should = true;
             }
             break;
-        case VB_MOVE_MIDO_IN_KOKIRI_FOREST:
-            if (
-                CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO) &&
-                !Flags_GetEventChkInf(EVENTCHKINF_SHOWED_MIDO_SWORD_SHIELD) &&
-                (CUR_EQUIP_VALUE(EQUIP_TYPE_SHIELD) == EQUIP_VALUE_SHIELD_DEKU) && 
-                (CUR_EQUIP_VALUE(EQUIP_TYPE_SWORD) == EQUIP_VALUE_SWORD_KOKIRI)
-            ) {
-                Flags_SetEventChkInf(EVENTCHKINF_SHOWED_MIDO_SWORD_SHIELD);
-                *should = true;
-            }
-            break;
-        case VB_PLAY_DEKU_TREE_INTRO_CS: {
-            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
-                BgTreemouth* treeMouth = static_cast<BgTreemouth*>(opt);
-                Flags_SetEventChkInf(EVENTCHKINF_DEKU_TREE_OPENED_MOUTH);
-                Audio_PlaySoundGeneral(NA_SE_EV_WOODDOOR_OPEN, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
-                BgTreemouth_SetupAction(treeMouth, func_808BC6F8);
-                *should = false;
-            }
-            break;
-        }
-        case VB_DEKU_JR_CONSIDER_FOREST_TEMPLE_FINISHED: {
-            // We're overriding this so that the Deku JR doesn't despawn after skipping the forest temple blue warp cutscene.
-            // It typically relies on the forest medallion being obtained, but that isn't given yet until after scene init
-            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
-                *should = Flags_GetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP);
-            }
-            break;
-        }
-        case VB_GIVE_ITEM_FROM_BLUE_WARP:
         case VB_PLAY_SHIEK_BLOCK_MASTER_SWORD_CS:
-        case VB_GIVE_ITEM_FAIRY_OCARINA:
         case VB_GIVE_ITEM_LIGHT_ARROW:
             if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
                 *should = false;
@@ -773,10 +628,6 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
     }
 }
 
-static uint32_t enKoUpdateHook = 0;
-static uint32_t enKoKillHook = 0;
-static uint32_t itemOcarinaUpdateHook = 0;
-static uint32_t itemOcarinaframesSinceSpawn = 0;
 static uint32_t enMa1UpdateHook = 0;
 static uint32_t enMa1KillHook = 0;
 static uint32_t enFuUpdateHook = 0;
@@ -788,50 +639,6 @@ static uint32_t enPoSistersKillHook = 0;
 void TimeSaverOnActorInitHandler(void* actorRef) {
     Actor* actor = static_cast<Actor*>(actorRef);
 
-    if (actor->id == ACTOR_EN_KO && (actor->params & 0xFF) == ENKO_TYPE_CHILD_3) {
-        enKoUpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* innerActorRef) mutable {
-            Actor* innerActor = static_cast<Actor*>(innerActorRef);
-            if (innerActor->id == ACTOR_EN_KO && (innerActor->params & 0xFF) == ENKO_TYPE_CHILD_3 && (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO) || IS_RANDO)) {
-                EnKo* enKo = static_cast<EnKo*>(innerActorRef);
-                // They haven't moved yet, wrap their update function so we check every frame
-                if (enKo->actionFunc == func_80A995CC) {
-                    enKo->actionFunc = EnKo_MoveWhenReady;
-                    GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(enKoUpdateHook);
-                    GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(enKoKillHook);
-                    enKoUpdateHook = 0;
-                    enKoKillHook = 0;
-                // They have already moved
-                } else if (enKo->actionFunc == func_80A99384) {
-                    GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(enKoUpdateHook);
-                    GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(enKoKillHook);
-                    enKoUpdateHook = 0;
-                    enKoKillHook = 0;
-                }
-            }
-        });
-        enKoKillHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>([](int16_t sceneNum) mutable {
-            GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(enKoUpdateHook);
-            GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(enKoKillHook);
-            enKoUpdateHook = 0;
-            enKoKillHook = 0;
-        });
-    }
-
-    if (actor->id == ACTOR_ITEM_OCARINA && actor->params == 3 && CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
-        itemOcarinaframesSinceSpawn = 0;
-        itemOcarinaUpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* innerActorRef) mutable {
-            Actor* innerActor = static_cast<Actor*>(innerActorRef);
-            if (innerActor->id != ACTOR_ITEM_OCARINA || innerActor->params != 3) return;
-            itemOcarinaframesSinceSpawn++;
-            if (itemOcarinaframesSinceSpawn > 20) {
-                Audio_PlayActorSound2(innerActor, NA_SE_EV_BOMB_DROP_WATER);
-
-                GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(itemOcarinaUpdateHook);
-                itemOcarinaUpdateHook = 0;
-            }
-        });
-    }
-
     if (actor->id == ACTOR_EN_MA1 && gPlayState->sceneNum == SCENE_LON_LON_RANCH) {
         enMa1UpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* innerActorRef) mutable {
             Actor* innerActor = static_cast<Actor*>(innerActorRef);
@@ -904,13 +711,6 @@ void TimeSaverOnActorInitHandler(void* actorRef) {
         });
     }
 
-    if (actor->id == ACTOR_EN_ZL4 && CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
-        EnZl4* enZl4 = static_cast<EnZl4*>(actorRef);
-        if (enZl4->actionFunc != EnZl4_Cutscene || enZl4->csState != 0) return;
-
-        enZl4->actionFunc = EnZl4_SkipToGivingZeldasLetter;
-    }
-
     if (actor->id == ACTOR_EN_DNT_DEMO && (IS_RANDO || CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO))) {
         EnDntDemo* enDntDemo = static_cast<EnDntDemo*>(actorRef);
         enDntDemo->actionFunc = EnDntDemo_JudgeSkipToReward;
diff --git a/soh/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.h b/soh/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.h
index daa33bfee..ea8189ad2 100644
--- a/soh/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.h
+++ b/soh/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.h
@@ -15,7 +15,9 @@ typedef struct BgTreemouth {
     /* 0x016C */ BgTreemouthActionFunc actionFunc;
 } BgTreemouth; // size = 0x0170
 
+// #region SoH [Enhancements] Externed for time savers
 void BgTreemouth_SetupAction(BgTreemouth* actor, BgTreemouthActionFunc actionFunc);
 void func_808BC6F8(BgTreemouth* actor, PlayState* play);
+// #endregion
 
 #endif
diff --git a/soh/src/overlays/actors/ovl_En_Ko/z_en_ko.h b/soh/src/overlays/actors/ovl_En_Ko/z_en_ko.h
index 5deeef465..80ecd0664 100644
--- a/soh/src/overlays/actors/ovl_En_Ko/z_en_ko.h
+++ b/soh/src/overlays/actors/ovl_En_Ko/z_en_ko.h
@@ -1,8 +1,10 @@
 #ifndef Z_EN_KO_H
 #define Z_EN_KO_H
 
+#ifndef __cplusplus
 #include <libultraship/libultra.h>
 #include "global.h"
+#endif
 
 struct EnKo;
 
@@ -57,8 +59,9 @@ typedef enum {
     ENKO_FQS_ADULT_SAVED
 } KokiriForestQuestState;
 
+// #region SoH [Enhancements] Externed for time savers
 void func_80A995CC(EnKo* actor, PlayState* play);
 void func_80A99384(EnKo* actor, PlayState* play);
-void func_80A99560(EnKo* actor, PlayState* play);
+// #endregion
 
 #endif

From baf7691fbde9b27a328a7e9b5a9ffb4c244d22ca Mon Sep 17 00:00:00 2001
From: Garrett Cox <garrettjcox@gmail.com>
Date: Mon, 13 May 2024 12:29:34 -0500
Subject: [PATCH 148/230] Fix weirdness with item gets from chests (#4146)

---
 .../game-interactor/GameInteractor.h          |  2 ++
 .../Enhancements/randomizer/hook_handlers.cpp | 26 ++++++++++++++++---
 .../Enhancements/timesaver_hook_handlers.cpp  | 11 ++++++++
 .../actors/ovl_player_actor/z_player.c        | 15 +++++------
 4 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h
index 956384e5d..57f1d1e5c 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h
@@ -260,6 +260,8 @@ typedef enum {
     // Opt: *EnOkarinaTag
     VB_PLAY_DOOR_OF_TIME_CS,
     VB_PLAY_RAINBOW_BRIDGE_CS,
+    // Opt: *EnBox
+    VB_PLAY_SLOW_CHEST_CS,
 
     /*** Give Items ***/
 
diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index 3f15ce4c8..e164eae16 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -37,6 +37,9 @@ extern "C" {
 
 extern SaveContext gSaveContext;
 extern PlayState* gPlayState;
+extern void func_8084DFAC(PlayState* play, Player* player);
+extern void func_80835DAC(PlayState* play, Player* player, PlayerActionFunc actionFunc, s32 flags);
+extern s32 func_80836898(PlayState* play, Player* player, PlayerFuncA74 func);
 }
 
 #define RAND_GET_OPTION(option) Rando::Context::GetInstance()->GetOption(option).GetSelectedOptionIndex()
@@ -555,8 +558,26 @@ void RandomizerSetChestGameRandomizerInf(RandomizerCheck rc) {
     }
 }
 
+void Player_Action_8084E6D4_override(Player* player, PlayState* play) {
+    if (LinkAnimation_Update(play, &player->skelAnime)) {
+        func_8084DFAC(play, player);
+    }
+}
+
+void func_8083A434_override(PlayState* play, Player* player) {
+    func_80835DAC(play, player, Player_Action_8084E6D4_override, 0);
+    player->stateFlags1 |= PLAYER_STATE1_GETTING_ITEM | PLAYER_STATE1_IN_CUTSCENE;
+}
+
 void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void* optionalArg) {
     switch (id) {
+        case VB_PLAY_SLOW_CHEST_CS: {
+            // We force fast chests if SkipGetItemAnimation is enabled because the camera in the CS looks pretty wonky otherwise
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipGetItemAnimation"), SGIA_DISABLED)) {
+                *should = false;
+            }
+            break;
+        }
         case VB_GIVE_ITEM_FROM_CHEST: {
             EnBox* chest = static_cast<EnBox*>(optionalArg);
             RandomizerCheck rc = OTRGlobals::Instance->gRandomizer->GetCheckFromActor(chest->dyna.actor.id, gPlayState->sceneNum, chest->dyna.actor.params);
@@ -565,9 +586,8 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             RandomizerSetChestGameRandomizerInf(rc);
 
             Player* player = GET_PLAYER(gPlayState);
-            player->av2.actionVar2 = 1;
-            player->getItemId = GI_NONE;
-            player->getItemEntry = GetItemEntry(GET_ITEM_NONE);
+            func_80836898(gPlayState, player, func_8083A434_override);
+
             *should = false;
             break;
         }
diff --git a/soh/soh/Enhancements/timesaver_hook_handlers.cpp b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
index 28518ae14..81c7d7727 100644
--- a/soh/soh/Enhancements/timesaver_hook_handlers.cpp
+++ b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
@@ -3,6 +3,7 @@
 #include "soh/Enhancements/randomizer/randomizerTypes.h"
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/enhancementTypes.h"
 
 extern "C" {
 #include "src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.h"
@@ -14,6 +15,7 @@ extern "C" {
 #include "src/overlays/actors/ovl_En_Ko/z_en_ko.h"
 #include "src/overlays/actors/ovl_En_Ma1/z_en_ma1.h"
 #include "src/overlays/actors/ovl_En_Zl4/z_en_zl4.h"
+#include "src/overlays/actors/ovl_En_Box/z_en_box.h"
 #include "src/overlays/actors/ovl_Demo_Im/z_demo_im.h"
 #include "src/overlays/actors/ovl_En_Sa/z_en_sa.h"
 #include "src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.h"
@@ -625,6 +627,15 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             }
             break;
         }
+        case VB_PLAY_SLOW_CHEST_CS: {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("FastChests"), 0)) {
+                *should = false;
+            } else if (CVarGetInteger(CVAR_ENHANCEMENT("ChestSizeAndTextureMatchContents"), CSMC_DISABLED) && *should) {
+                EnBox* enBox = static_cast<EnBox*>(opt);
+                *should = enBox->dyna.actor.scale.x != 0.005f;
+            }
+            break;
+        }
     }
 }
 
diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c
index 8cadd404b..3dfb2dbeb 100644
--- a/soh/src/overlays/actors/ovl_player_actor/z_player.c
+++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c
@@ -6853,10 +6853,6 @@ s32 Player_ActionChange_2(Player* this, PlayState* play) {
                     giEntry = this->getItemEntry;
                 }
                 EnBox* chest = (EnBox*)interactedActor;
-                if (CVarGetInteger(CVAR_ENHANCEMENT("FastChests"), 0) != 0) {
-                    giEntry.gi = -1 * abs(giEntry.gi);
-                }
-
                 if (giEntry.itemId != ITEM_NONE) {
                     if (((Item_CheckObtainability(giEntry.itemId) == ITEM_NONE) && (giEntry.field & 0x40)) ||
                         ((Item_CheckObtainability(giEntry.itemId) != ITEM_NONE) && (giEntry.field & 0x20))) {
@@ -6865,11 +6861,12 @@ s32 Player_ActionChange_2(Player* this, PlayState* play) {
                     }
                 }
 
-                func_80836898(play, this, func_8083A434);
                 if (GameInteractor_Should(VB_GIVE_ITEM_FROM_CHEST, true, chest)) {
+                    func_80836898(play, this, func_8083A434);
+                }
                 this->stateFlags1 |= PLAYER_STATE1_GETTING_ITEM | PLAYER_STATE1_ITEM_OVER_HEAD | PLAYER_STATE1_IN_CUTSCENE;
                 func_8083AE40(this, giEntry.objectId);
-                }
+
                 this->actor.world.pos.x =
                     chest->dyna.actor.world.pos.x - (Math_SinS(chest->dyna.actor.shape.rot.y) * 29.4343f);
                 this->actor.world.pos.z =
@@ -6877,8 +6874,10 @@ s32 Player_ActionChange_2(Player* this, PlayState* play) {
                 this->yaw = this->actor.shape.rot.y = chest->dyna.actor.shape.rot.y;
                 func_80832224(this);
 
-                if ((giEntry.itemId != ITEM_NONE) && (giEntry.gi >= 0) &&
-                    (Item_CheckObtainability(giEntry.itemId) == ITEM_NONE)) {
+                bool vanillaPlaySlowChestCS = (giEntry.itemId != ITEM_NONE) && (giEntry.gi >= 0) &&
+                    (Item_CheckObtainability(giEntry.itemId) == ITEM_NONE);
+
+                if (GameInteractor_Should(VB_PLAY_SLOW_CHEST_CS, vanillaPlaySlowChestCS, chest)) {
                     Player_AnimPlayOnceAdjusted(play, this, this->ageProperties->unk_98);
                     Player_AnimReplaceApplyFlags(play, this, 0x28F);
                     chest->unk_1F4 = 1;

From 510b655e5e7a8bc53ced1123e1509cd9e3d21a09 Mon Sep 17 00:00:00 2001
From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Date: Fri, 5 Jul 2024 22:35:47 +0100
Subject: [PATCH 149/230] Fix Link's Pocket Appearing in Hints. (#4191)

* Fix issues with areas not being applied to the region itself, and Link's Pocket Propogating through randomised warps

* Address reviews

* address reviews again

* fix mac issues

* git pls
---
 .../Enhancements/randomizer/3drando/fill.cpp  | 22 ++++++++++---------
 .../Enhancements/randomizer/3drando/hints.cpp |  2 +-
 .../randomizer/3drando/location_access.hpp    |  5 ++++-
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/fill.cpp b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
index 6b23c6f2d..d25d04aa0 100644
--- a/soh/soh/Enhancements/randomizer/3drando/fill.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
@@ -485,18 +485,19 @@ static void GeneratePlaythrough() {
     GetAccessibleLocations(ctx->allLocations, SearchMode::GeneratePlaythrough);
 }
 
-RandomizerArea LookForExternalArea(Area* curRegion, std::vector<RandomizerRegion> alreadyChecked){//RANDOTODO curREGION
-  for (auto& entrance : curRegion->entrances) {
+RandomizerArea LookForExternalArea(const Area* const currentRegion, std::vector<RandomizerRegion> &alreadyChecked){
+  for (const auto& entrance : currentRegion->entrances) {
     RandomizerArea otherArea = entrance->GetParentRegion()->GetArea();
-    if(otherArea != RA_NONE){
-      return otherArea;
-      //if the area hasn't already been checked, check it
-    } else if (std::find(alreadyChecked.begin(), alreadyChecked.end(), entrance->GetParentRegionKey()) == alreadyChecked.end()) {
+    const bool isAreaUnchecked = std::find(alreadyChecked.begin(), alreadyChecked.end(), entrance->GetParentRegionKey()) == alreadyChecked.end();
+    if (otherArea == RA_NONE && isAreaUnchecked) {
+      //if the region is in RA_NONE and hasn't already been checked, check it
       alreadyChecked.push_back(entrance->GetParentRegionKey());
-      RandomizerArea passdown = LookForExternalArea(entrance->GetParentRegion(), alreadyChecked);
+      const RandomizerArea passdown = LookForExternalArea(entrance->GetParentRegion(), alreadyChecked);
       if(passdown != RA_NONE){
         return passdown;
       }
+    } else if (otherArea != RA_LINKS_POCKET){ //if it's links pocket, do not propogate this, Link's Pocket is not a real Area
+      return otherArea;
     }
   }
   return RA_NONE;
@@ -505,16 +506,17 @@ RandomizerArea LookForExternalArea(Area* curRegion, std::vector<RandomizerRegion
 void SetAreas(){
   auto ctx = Rando::Context::GetInstance();
 //RANDOTODO give entrances an enum like RandomizerCheck, the give them all areas here, the use those areas to not need to recursivly find ItemLocation areas
-  for (int c = 0; c < RR_MARKER_AREAS_END; c++) {
-    Area region = areaTable[c];
+  for (int regionType = 0; regionType < RR_MARKER_AREAS_END; regionType++) {
+    Area region = areaTable[regionType];
     RandomizerArea area = region.GetArea();
     if (area == RA_NONE) {
-      std::vector<RandomizerRegion> alreadyChecked = {(RandomizerRegion)c};
+      std::vector<RandomizerRegion> alreadyChecked = {static_cast<RandomizerRegion>(regionType)};
       area = LookForExternalArea(&region, alreadyChecked);
     }
     for (auto& loc : region.locations){
       ctx->GetItemLocation(loc.GetLocation())->SetArea(area);
     }
+    areaTable[regionType].SetArea(area);
   }
 }
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.cpp b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
index 1f195251b..d571c1ab5 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hints.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
@@ -496,7 +496,7 @@ void CreateWarpSongTexts() {
   if (ctx->GetOption(RSK_WARP_SONG_HINTS)){
     auto warpSongEntrances = GetShuffleableEntrances(EntranceType::WarpSong, false);
     for (auto entrance : warpSongEntrances) {
-      auto destination = entrance->GetConnectedRegion()->GetArea();//KNOWN ISSUE: says links pocket sometimes, putting off as this will need rewriting when entrance hits are added anyway
+      const auto destination = entrance->GetConnectedRegion()->GetArea();
       switch (entrance->GetIndex()) {
         case 0x0600: // minuet RANDOTODO make into entrance hints when they are added
           ctx->AddHint(RH_MINUET_WARP_LOC, Hint(RH_MINUET_WARP_LOC, HINT_TYPE_AREA, "", {RHT_WARP_SONG}, {}, {destination}));
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access.hpp b/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
index 82b3817bf..7a4024c69 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
@@ -186,6 +186,10 @@ public:
         return area;
     }
 
+    void SetArea(RandomizerArea newArea) {
+        area = newArea;
+    }
+
     //Here checks conditional access based on whether or not both ages have
     //access to this area. For example: if there are rocks that block a path
     //which both child and adult can access, adult having hammer can give
@@ -222,7 +226,6 @@ public:
                      "Child Night: " + std::to_string(childNight) + "\t"
                      "Adult Day:   " + std::to_string(adultDay)   + "\t"
                      "Adult Night: " + std::to_string(adultNight);
-      //CitraPrint(message);
     }
 };
 

From db5e9cbc118b2fd1c4e39735314c891e970b3768 Mon Sep 17 00:00:00 2001
From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Date: Fri, 5 Jul 2024 22:49:56 +0100
Subject: [PATCH 150/230] Fix Multiple Foolish hints from an area being
 generated. (#4190)

* Fix Multiple Foolish hints for the same location

* remove debug comment
---
 .../Enhancements/randomizer/3drando/hints.cpp   | 17 +++++++++--------
 .../Enhancements/randomizer/item_location.cpp   |  2 +-
 soh/soh/Enhancements/randomizer/item_location.h |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.cpp b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
index d571c1ab5..a01f2a4ce 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hints.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
@@ -129,9 +129,9 @@ bool FilterWotHLocations(RandomizerCheck loc){
   return ctx->GetItemLocation(loc)->IsWothCandidate();
 }
 
-bool FilterBarrenLocations(RandomizerCheck loc){
+bool FilterFoolishLocations(RandomizerCheck loc){
   auto ctx = Rando::Context::GetInstance();
-  return ctx->GetItemLocation(loc)->IsBarrenCandidate();
+  return ctx->GetItemLocation(loc)->IsFoolishCandidate();
 }
 
 bool FilterSongLocations(RandomizerCheck loc){
@@ -176,7 +176,7 @@ const std::array<HintSetting, 4> hintSettingTable{{
     .junkWeight = 6,
     .distTable = {
       {"WotH",       HINT_TYPE_WOTH,      7,   0, 1, FilterWotHLocations,      2},
-      {"Barren",     HINT_TYPE_FOOLISH,   4,   0, 1, FilterBarrenLocations,    1},
+      {"Foolish",    HINT_TYPE_FOOLISH,   4,   0, 1, FilterFoolishLocations,   1},
       //("Entrance",   HINT_TYPE_ENTRANCE,      6,  0, 1), //not yet implemented
       {"Song",       HINT_TYPE_ITEM,      2,   0, 1, FilterSongLocations},
       {"Overworld",  HINT_TYPE_ITEM,      4,   0, 1, FilterOverworldLocations},
@@ -192,7 +192,7 @@ const std::array<HintSetting, 4> hintSettingTable{{
     .junkWeight = 0,
     .distTable = {
       {"WotH",       HINT_TYPE_WOTH,      12, 0, 2, FilterWotHLocations,      2},
-      {"Barren",     HINT_TYPE_FOOLISH,   12, 0, 1, FilterBarrenLocations,    1},
+      {"Foolish",    HINT_TYPE_FOOLISH,   12, 0, 1, FilterFoolishLocations,   1},
       //{"Entrance",   HINT_TYPE_ENTRANCE,      4, 0, 1}, //not yet implemented
       {"Song",       HINT_TYPE_ITEM,      4,  0, 1, FilterSongLocations},
       {"Overworld",  HINT_TYPE_ITEM,      6,  0, 1, FilterOverworldLocations},
@@ -208,7 +208,7 @@ const std::array<HintSetting, 4> hintSettingTable{{
     .junkWeight = 0,
     .distTable = {
       {"WotH",       HINT_TYPE_WOTH,      15, 0, 2, FilterWotHLocations},
-      {"Barren",     HINT_TYPE_FOOLISH,   15, 0, 1, FilterBarrenLocations},
+      {"Foolish",    HINT_TYPE_FOOLISH,   15, 0, 1, FilterFoolishLocations},
       //{"Entrance",   HINT_TYPE_ENTRANCE,     10, 0, 1}, //not yet implemented
       {"Song",       HINT_TYPE_ITEM,      2,  0, 1, FilterSongLocations},
       {"Overworld",  HINT_TYPE_ITEM,      7,  0, 1, FilterOverworldLocations},
@@ -448,9 +448,6 @@ static RandomizerCheck CreateRandomHint(std::vector<RandomizerCheck>& possibleHi
 
     placed = CreateHint(hintedLocation, copies, type, distributionName);
   }
-  if (type == HINT_TYPE_FOOLISH){
-     SetAllInRegionAsHinted(ctx->GetItemLocation(hintedLocation)->GetArea(), possibleHintLocations);
-  }
   return hintedLocation;
 }
 
@@ -582,6 +579,10 @@ uint8_t PlaceHints(std::vector<uint8_t>& selectedHints,
       RandomizerCheck hintedLocation = RC_UNKNOWN_CHECK;
 
       hintedLocation = CreateRandomHint(hintTypePool, distribution.copies, distribution.type, distribution.name);
+      if (distribution.type == HINT_TYPE_FOOLISH){
+        SetAllInRegionAsHinted(ctx->GetItemLocation(hintedLocation)->GetArea(), hintTypePool);
+        hintTypePool = FilterHintability(hintTypePool);
+      }
       if (hintedLocation == RC_UNKNOWN_CHECK){ //if hint failed to place, remove all wieght and copies then return the number of stones to redistribute
         uint8_t hintsToRemove = (selectedHints[curSlot] - numHint) * distribution.copies;
         selectedHints[curSlot] = 0;   //as distTable is passed by refernce here, these changes stick for the rest of this seed generation
diff --git a/soh/soh/Enhancements/randomizer/item_location.cpp b/soh/soh/Enhancements/randomizer/item_location.cpp
index 032619a62..3185fce8a 100644
--- a/soh/soh/Enhancements/randomizer/item_location.cpp
+++ b/soh/soh/Enhancements/randomizer/item_location.cpp
@@ -192,7 +192,7 @@ void ItemLocation::SetWothCandidate() {
     wothCandidate = true;
 }
 
-bool ItemLocation::IsBarrenCandidate() const {
+bool ItemLocation::IsFoolishCandidate() const {
     return barrenCandidate;
 }
 
diff --git a/soh/soh/Enhancements/randomizer/item_location.h b/soh/soh/Enhancements/randomizer/item_location.h
index 082fd4493..b40cac537 100644
--- a/soh/soh/Enhancements/randomizer/item_location.h
+++ b/soh/soh/Enhancements/randomizer/item_location.h
@@ -49,7 +49,7 @@ class ItemLocation {
     void SetVisible(bool visibleInImGui_);
     bool IsWothCandidate() const;
     void SetWothCandidate();
-    bool IsBarrenCandidate() const;
+    bool IsFoolishCandidate() const;
     void SetBarrenCandidate();
     void ResetVariables();
 

From 5c155a625a2b1bbc89b709130f9550b614f5c87e Mon Sep 17 00:00:00 2001
From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Date: Fri, 5 Jul 2024 22:50:58 +0100
Subject: [PATCH 151/230] Quick fix Chest Minigame Setting (#4189)

---
 soh/soh/Enhancements/randomizer/settings.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
index 48011f423..939da09ad 100644
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -1848,6 +1848,7 @@ void Settings::FinalizeSettings(const std::set<RandomizerCheck>& excludedLocatio
 
     // RANDOTODO implement chest shuffle with keysanity
     // ShuffleChestMinigame.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_CHEST_MINIGAME]);
+    mOptions[RSK_SHUFFLE_CHEST_MINIGAME].SetSelectedIndex(RO_CHEST_GAME_OFF);
     //TODO: RandomizeAllSettings(true) when implementing the ability to randomize the options themselves.
     std::array<DungeonInfo*, 12> dungeons = ctx->GetDungeons()->GetDungeonList();
     std::array<bool, 12> dungeonModesKnown{};

From 1ca8d0ab7331d82d3e1e042d9882a5a4630caa4e Mon Sep 17 00:00:00 2001
From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Date: Fri, 5 Jul 2024 22:52:59 +0100
Subject: [PATCH 152/230] Implement Mask Hints (#4152)

* Implement Mask Hints

* fix typo
---
 .../Enhancements/custom-message/CustomMessageTypes.h  |  1 +
 soh/soh/Enhancements/randomizer/3drando/hint_list.cpp |  4 ++++
 soh/soh/Enhancements/randomizer/3drando/hints.cpp     |  2 +-
 .../3drando/location_access/locacc_castle_town.cpp    |  6 ++++--
 soh/soh/Enhancements/randomizer/location_list.cpp     |  4 +++-
 .../Enhancements/randomizer/option_descriptions.cpp   |  1 +
 soh/soh/Enhancements/randomizer/randomizerTypes.h     |  4 ++++
 soh/soh/Enhancements/randomizer/settings.cpp          | 11 ++++++++---
 soh/soh/Enhancements/randomizer/static_data.cpp       |  8 +++++---
 soh/soh/OTRGlobals.cpp                                |  3 +++
 10 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/soh/soh/Enhancements/custom-message/CustomMessageTypes.h b/soh/soh/Enhancements/custom-message/CustomMessageTypes.h
index 1f5a093c7..6d25d9f8a 100644
--- a/soh/soh/Enhancements/custom-message/CustomMessageTypes.h
+++ b/soh/soh/Enhancements/custom-message/CustomMessageTypes.h
@@ -74,6 +74,7 @@ typedef enum {
     TEXT_SARIAS_SONG_IMPRISON_GANONDORF = 0x016C,
     TEXT_SARIAS_SONG_CHANNELING_POWER = 0x016D,
     TEXT_LAKE_HYLIA_WATER_SWITCH_NAVI = 0x01B3, // 0x1yy for Navi msg range
+    TEXT_MASK_SHOP_SIGN = 0x0207,
     TEXT_FROGS_UNDERWATER = 0x022E,
     TEXT_GF_HBA_SIGN = 0x031A,
     TEXT_LAKE_HYLIA_WATER_SWITCH_SIGN = 0x0346, // 0x3yy for cuttable sign range
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
index 22ef9f962..c437bcecd 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
@@ -2861,6 +2861,10 @@ void StaticData::HintTable_Init() {
                                                  /*french*/ "Yeaaarrgh! Je suis maudit!^Détruit encore #[[d]] Araignées de la Malédiction# et j'aurai quelque chose à te donner! #([[1]])#",
                                                             {QM_YELLOW, QM_GREEN}));
 
+    hintTextTable[RHT_MASK_SHOP_HINT] = HintText(CustomMessage("Some young scrubs in the #Deku Theatre# love seeing Masks!^"
+                                                               "They'll give you #[[1]]# if you show them the #Skull Mask#, and #[[2]]# if you show them the #Mask of Truth#!",
+                                                               {QM_GREEN, QM_GREEN, QM_RED, QM_GREEN, QM_RED}));
+
     /*--------------------------
     |      GANON LINE TEXT     |
     ---------------------------*/
diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.cpp b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
index a01f2a4ce..09930fa25 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hints.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
@@ -277,7 +277,7 @@ std::vector<std::pair<RandomizerCheck, std::function<bool()>>> conditionalAlways
                    }), // Remember, the option's value being 3 means 4 are required
     std::make_pair(RC_DEKU_THEATER_MASK_OF_TRUTH, []() {
                        auto ctx = Rando::Context::GetInstance();
-                       return !ctx->GetOption(RSK_COMPLETE_MASK_QUEST);
+                       return !ctx->GetOption(RSK_MASK_SHOP_HINT) && !ctx->GetOption(RSK_COMPLETE_MASK_QUEST);
                    }),
     std::make_pair(RC_SONG_FROM_OCARINA_OF_TIME, []() { return StonesRequiredBySettings() < 2; }),
     std::make_pair(RC_HF_OCARINA_OF_TIME_ITEM, []() { return StonesRequiredBySettings() < 2; }),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
index fbff295ad..160fff18d 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
@@ -191,9 +191,11 @@ void AreaTable_Init_CastleTown() {
 
   areaTable[RR_MARKET_MASK_SHOP] = Area("Market Mask Shop", "Market Mask Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->SkullMask,   {[]{return logic->SkullMask   || (logic->ZeldasLetter && (randoCtx->GetOption(RSK_COMPLETE_MASK_QUEST) ||  ChildCanAccess(RR_KAKARIKO_VILLAGE)));}}),
+                  EventAccess(&logic->SkullMask,   {[]{return logic->SkullMask   || (logic->ZeldasLetter && (randoCtx->GetOption(RSK_COMPLETE_MASK_QUEST) ||  ChildCanAccess(RR_KAKARIKO_VILLAGE)));}}), //RANDOTODO Complete mask quest does not need this location, so should be tied to link'd pocket
                   EventAccess(&logic->MaskOfTruth, {[]{return logic->MaskOfTruth || (logic->SkullMask && (randoCtx->GetOption(RSK_COMPLETE_MASK_QUEST) || (ChildCanAccess(RR_THE_LOST_WOODS) && logic->CanUse(RG_SARIAS_SONG) && AreaTable(RR_THE_GRAVEYARD)->childDay && ChildCanAccess(RR_HYRULE_FIELD) && logic->HasAllStones)));}}),
-                }, {}, {
+                }, {
+                  LocationAccess(RC_MASK_SHOP_HINT, {[]{return true;}}),
+                }, {
                   //Exits
                   Entrance(RR_THE_MARKET, {[]{return true;}}),
   });
diff --git a/soh/soh/Enhancements/randomizer/location_list.cpp b/soh/soh/Enhancements/randomizer/location_list.cpp
index 454520d48..a380e0d02 100644
--- a/soh/soh/Enhancements/randomizer/location_list.cpp
+++ b/soh/soh/Enhancements/randomizer/location_list.cpp
@@ -558,7 +558,8 @@ std::vector<RandomizerCheck> Rando::StaticData::staticHintLocations = {
     RC_SARIA_SONG_HINT,
     RC_ALTAR_HINT_CHILD,
     RC_ALTAR_HINT_ADULT,
-    RC_FISHING_POLE_HINT
+    RC_FISHING_POLE_HINT,
+    RC_MASK_SHOP_HINT,
 };
 
 std::vector<RandomizerCheck> Rando::StaticData::pondFishLocations = {
@@ -1564,6 +1565,7 @@ void Rando::StaticData::InitLocationTable() { //
     locationTable[RC_ALTAR_HINT_CHILD]  =                                         Location::OtherHint(RC_ALTAR_HINT_CHILD,                                             RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE,                RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_TEMPLE_OF_TIME,       "ToT Child Altar Hint");
     locationTable[RC_ALTAR_HINT_ADULT]  =                                         Location::OtherHint(RC_ALTAR_HINT_ADULT,                                             RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE,                RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_TEMPLE_OF_TIME,       "ToT Adult Altar Hint");
     locationTable[RC_FISHING_POLE_HINT] =                                         Location::OtherHint(RC_FISHING_POLE_HINT,                                            RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE,                RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,         "Fishing Pole Hint");
+    locationTable[RC_MASK_SHOP_HINT] =                                            Location::OtherHint(RC_MASK_SHOP_HINT,                                               RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE,                RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_HAPPY_MASK_SHOP,      "Mask Shop Hint");
 
     locationTable[RC_TRIFORCE_COMPLETED] =                                           Location::Reward(RC_TRIFORCE_COMPLETED,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x00, "Completed Triforce", "Completed Triforce",    RHT_NONE,                                                        RG_NONE,                              {},                                                     SpoilerCollectionCheck::None(),                                                                                               SpoilerCollectionCheckGroup::GROUP_NO_GROUP);
     // clang-format on
diff --git a/soh/soh/Enhancements/randomizer/option_descriptions.cpp b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
index b0160a6c6..3344a8cc1 100644
--- a/soh/soh/Enhancements/randomizer/option_descriptions.cpp
+++ b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
@@ -532,6 +532,7 @@ void Settings::CreateOptionDescriptions() {
     mOptionDescriptions[RSK_KAK_40_SKULLS_HINT] = "Talking to the Cursed Resident in the Skultulla House who is saved after 40 tokens will tell you the reward";
     mOptionDescriptions[RSK_KAK_50_SKULLS_HINT] = "Talking to the Cursed Resident in the Skultulla House who is saved after 50 tokens will tell you the reward";
     mOptionDescriptions[RSK_KAK_100_SKULLS_HINT] = "Talking to the Cursed Resident in the Skultulla House who is saved after 100 tokens will tell you the reward";
+    mOptionDescriptions[RSK_MASK_SHOP_HINT] = "Reading the mask shop sign will tell you rewards from showing masks at the Deku Theatre.";
     
     mOptionDescriptions[RSK_FULL_WALLETS] = "Start with a full wallet. All wallet upgrades come filled with rupees.";
     mOptionDescriptions[RSK_BOMBCHUS_IN_LOGIC] =
diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h
index 35d0b48ec..c48bfeeb5 100644
--- a/soh/soh/Enhancements/randomizer/randomizerTypes.h
+++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@@ -1489,6 +1489,7 @@ typedef enum {
     RC_ALTAR_HINT_CHILD,
     RC_ALTAR_HINT_ADULT,
     RC_FISHING_POLE_HINT,
+    RC_MASK_SHOP_HINT,
     RC_DMC_UPPER_GROTTO_FISH,
     RC_DMT_STORMS_GROTTO_FISH,
     RC_HF_SOUTHEAST_GROTTO_FISH,
@@ -2086,6 +2087,7 @@ typedef enum {
     RH_KAK_40_SKULLS_HINT,
     RH_KAK_50_SKULLS_HINT,
     RH_KAK_100_SKULLS_HINT,
+    RH_MASK_SHOP_HINT,
     RH_MAX,
 } RandomizerHint;
 
@@ -3447,6 +3449,7 @@ typedef enum {
     RHT_BIGGORON_HINT,
     RHT_FROGS_HINT,
     RHT_SKULLS_HINT,
+    RHT_MASK_SHOP_HINT,
     // Ganon Line
     RHT_GANON_JOKE01,
     RHT_GANON_JOKE02,
@@ -3607,6 +3610,7 @@ typedef enum {
     RSK_KAK_40_SKULLS_HINT,
     RSK_KAK_50_SKULLS_HINT,
     RSK_KAK_100_SKULLS_HINT,
+    RSK_MASK_SHOP_HINT,
     RSK_BIGGORON_HINT,
     RSK_BIG_POES_HINT,
     RSK_CHICKENS_HINT,
diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
index 939da09ad..9d836371b 100644
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -176,7 +176,8 @@ void Settings::CreateOptions() {
     mOptions[RSK_KAK_30_SKULLS_HINT] = Option::Bool("30 GS Hint", CVAR_RANDOMIZER_SETTING("30GSHint"), mOptionDescriptions[RSK_KAK_30_SKULLS_HINT], IMFLAG_NONE);
     mOptions[RSK_KAK_40_SKULLS_HINT] = Option::Bool("40 GS Hint", CVAR_RANDOMIZER_SETTING("40GSHint"), mOptionDescriptions[RSK_KAK_40_SKULLS_HINT], IMFLAG_NONE);
     mOptions[RSK_KAK_50_SKULLS_HINT] = Option::Bool("50 GS Hint", CVAR_RANDOMIZER_SETTING("50GSHint"), mOptionDescriptions[RSK_KAK_50_SKULLS_HINT], IMFLAG_NONE);
-    mOptions[RSK_KAK_100_SKULLS_HINT] = Option::Bool("100 GS Hint", CVAR_RANDOMIZER_SETTING("100GSHint"), mOptionDescriptions[RSK_KAK_100_SKULLS_HINT]);
+    mOptions[RSK_KAK_100_SKULLS_HINT] = Option::Bool("100 GS Hint", CVAR_RANDOMIZER_SETTING("100GSHint"), mOptionDescriptions[RSK_KAK_100_SKULLS_HINT], IMFLAG_NONE);
+    mOptions[RSK_MASK_SHOP_HINT] = Option::Bool("Mask Shop Hint", CVAR_RANDOMIZER_SETTING("MaskShopHint"), mOptionDescriptions[RSK_MASK_SHOP_HINT]);
     // TODO: Compasses show rewards/woth, maps show dungeon mode
     mOptions[RSK_BLUE_FIRE_ARROWS] = Option::Bool("Blue Fire Arrows", CVAR_RANDOMIZER_SETTING("BlueFireArrows"), mOptionDescriptions[RSK_BLUE_FIRE_ARROWS]);
     mOptions[RSK_SUNLIGHT_ARROWS] = Option::Bool("Sunlight Arrows", CVAR_RANDOMIZER_SETTING("SunlightArrows"), mOptionDescriptions[RSK_SUNLIGHT_ARROWS]);
@@ -745,7 +746,8 @@ void Settings::CreateOptions() {
         &mOptions[RSK_KAK_30_SKULLS_HINT],
         &mOptions[RSK_KAK_40_SKULLS_HINT],
         &mOptions[RSK_KAK_50_SKULLS_HINT],
-        &mOptions[RSK_KAK_100_SKULLS_HINT]
+        &mOptions[RSK_KAK_100_SKULLS_HINT],
+        &mOptions[RSK_MASK_SHOP_HINT]
     }, false, WidgetContainerType::SECTION, "This setting adds some hints at locations other than Gossip Stones.");
     mOptionGroups[RSG_ITEM_POOL_HINTS_IMGUI_COLUMN] = OptionGroup::SubGroup("Item Pool & Hints", std::initializer_list<OptionGroup*>{
         &mOptionGroups[RSG_ITEM_POOL_HINTS_IMGUI],
@@ -974,6 +976,7 @@ void Settings::CreateOptions() {
         &mOptions[RSK_KAK_40_SKULLS_HINT],
         &mOptions[RSK_KAK_50_SKULLS_HINT],
         &mOptions[RSK_KAK_100_SKULLS_HINT],
+        &mOptions[RSK_MASK_SHOP_HINT],
         &mOptions[RSK_SCRUB_TEXT_HINT],
         &mOptions[RSK_FISHING_POLE_HINT],
         // TODO: Compasses show Reward/WOTH, Maps show Dungeon Mode, Starting Time
@@ -1185,7 +1188,8 @@ void Settings::CreateOptions() {
         { "Miscellaneous Settings:30 GS Hint", RSK_KAK_30_SKULLS_HINT },
         { "Miscellaneous Settings:40 GS Hint", RSK_KAK_40_SKULLS_HINT },
         { "Miscellaneous Settings:50 GS Hint", RSK_KAK_50_SKULLS_HINT },
-        { "Miscellaneous Settings:50 GS Hint", RSK_KAK_100_SKULLS_HINT },
+        { "Miscellaneous Settings:100 GS Hint", RSK_KAK_100_SKULLS_HINT },
+        { "Miscellaneous Settings:Mask Shop Hint", RSK_MASK_SHOP_HINT },
         { "Miscellaneous Settings:Biggoron's Hint", RSK_BIGGORON_HINT },
         { "Miscellaneous Settings:Big Poes Hint", RSK_BIG_POES_HINT },
         { "Miscellaneous Settings:Warp Song Hints", RSK_WARP_SONG_HINTS },
@@ -2295,6 +2299,7 @@ void Settings::ParseJson(nlohmann::json spoilerFileJson) {
                 case RSK_KAK_40_SKULLS_HINT:
                 case RSK_KAK_50_SKULLS_HINT:
                 case RSK_KAK_100_SKULLS_HINT:
+                case RSK_MASK_SHOP_HINT:
                 case RSK_BIGGORON_HINT:
                 case RSK_BIG_POES_HINT:
                 case RSK_CHICKENS_HINT:
diff --git a/soh/soh/Enhancements/randomizer/static_data.cpp b/soh/soh/Enhancements/randomizer/static_data.cpp
index 524ab4700..bf7a93f17 100644
--- a/soh/soh/Enhancements/randomizer/static_data.cpp
+++ b/soh/soh/Enhancements/randomizer/static_data.cpp
@@ -93,7 +93,8 @@ std::unordered_map<uint32_t, CustomMessage> StaticData::hintNames = {
     {RH_KAK_30_SKULLS_HINT, CustomMessage("30 Skulls Hint")},
     {RH_KAK_40_SKULLS_HINT, CustomMessage("40 Skulls Hint")},
     {RH_KAK_50_SKULLS_HINT, CustomMessage("50 Skulls Hint")},
-    {RH_KAK_100_SKULLS_HINT, CustomMessage("100 Skulls Hint")}
+    {RH_KAK_100_SKULLS_HINT, CustomMessage("100 Skulls Hint")},
+    {RH_MASK_SHOP_HINT, CustomMessage("Mask Shop Hint")},
 };
 
 std::unordered_map<RandomizerCheck, RandomizerHint> StaticData::gossipStoneCheckToHint {
@@ -203,7 +204,7 @@ std::unordered_map<RandomizerHint, StaticHintInfo> StaticData::staticHintInfoMap
   {RH_CARPET_SALESMAN,     StaticHintInfo(HINT_TYPE_MERCHANT, {RHT_CARPET_SALESMAN_DIALOG_HINTED}, RSK_SHUFFLE_MERCHANTS,   (uint8_t)RO_SHUFFLE_MERCHANTS_ON_HINT,  {RC_WASTELAND_BOMBCHU_SALESMAN})},
   {RH_BEAN_SALESMAN,       StaticHintInfo(HINT_TYPE_MERCHANT, {RHT_BEAN_SALESMAN_HINT},            RSK_SHUFFLE_MAGIC_BEANS, true,                                   {RC_ZR_MAGIC_BEAN_SALESMAN})},
   {RH_HBA_HINT,            StaticHintInfo(HINT_TYPE_ITEM,     {RHT_HBA_HINT_SIGN, RHT_HBA_HINT_NOT_ON_HORSE, RHT_HBA_HINT_INITIAL, RHT_HBA_HINT_HAVE_1000}, RSK_HBA_HINT, true, {RC_GF_HBA_1000_POINTS, RC_GF_HBA_1500_POINTS})},
-  {RH_MALON_HINT,          StaticHintInfo(HINT_TYPE_ITEM,     {RHT_MALON_HINT_TURNING_EVIL, RHT_MALON_HINT_HOW_IS_EPONA, RHT_MALON_HINT_OBSTICLE_COURSE, RHT_MALON_HINT_INGO_TEMPTED},RSK_MALON_HINT, true, {RC_KF_LINKS_HOUSE_COW})},
+  {RH_MALON_HINT,          StaticHintInfo(HINT_TYPE_ITEM,     {RHT_MALON_HINT_TURNING_EVIL, RHT_MALON_HINT_HOW_IS_EPONA, RHT_MALON_HINT_OBSTICLE_COURSE, RHT_MALON_HINT_INGO_TEMPTED}, RSK_MALON_HINT, true, {RC_KF_LINKS_HOUSE_COW})},
   {RH_BIG_POES_HINT,       StaticHintInfo(HINT_TYPE_ITEM,     {RHT_BIG_POES_HINT},                 RSK_BIG_POES_HINT,       true, {RC_MARKET_10_BIG_POES})},
   {RH_CHICKENS_HINT,       StaticHintInfo(HINT_TYPE_ITEM,     {RHT_CHICKENS_HINT},                 RSK_CHICKENS_HINT,       true, {RC_KAK_ANJU_AS_CHILD})},
   {RH_BIGGORON_HINT,       StaticHintInfo(HINT_TYPE_ITEM,     {RHT_BIGGORON_HINT},                 RSK_BIGGORON_HINT,       true, {RC_DMT_TRADE_CLAIM_CHECK})},
@@ -213,7 +214,8 @@ std::unordered_map<RandomizerHint, StaticHintInfo> StaticData::staticHintInfoMap
   {RH_KAK_30_SKULLS_HINT,  StaticHintInfo(HINT_TYPE_ITEM,     {RHT_SKULLS_HINT},                   RSK_KAK_30_SKULLS_HINT,  true, {RC_KAK_30_GOLD_SKULLTULA_REWARD},  {}, {}, false, 30)},
   {RH_KAK_40_SKULLS_HINT,  StaticHintInfo(HINT_TYPE_ITEM,     {RHT_SKULLS_HINT},                   RSK_KAK_40_SKULLS_HINT,  true, {RC_KAK_40_GOLD_SKULLTULA_REWARD},  {}, {}, false, 40)},
   {RH_KAK_50_SKULLS_HINT,  StaticHintInfo(HINT_TYPE_ITEM,     {RHT_SKULLS_HINT},                   RSK_KAK_50_SKULLS_HINT,  true, {RC_KAK_50_GOLD_SKULLTULA_REWARD},  {}, {}, false, 50)},
-  {RH_KAK_100_SKULLS_HINT, StaticHintInfo(HINT_TYPE_ITEM,     {RHT_SKULLS_HINT},                   RSK_KAK_100_SKULLS_HINT, true, {RC_KAK_100_GOLD_SKULLTULA_REWARD}, {}, {}, false, 100)}
+  {RH_KAK_100_SKULLS_HINT, StaticHintInfo(HINT_TYPE_ITEM,     {RHT_SKULLS_HINT},                   RSK_KAK_100_SKULLS_HINT, true, {RC_KAK_100_GOLD_SKULLTULA_REWARD}, {}, {}, false, 100)},
+  {RH_MASK_SHOP_HINT,      StaticHintInfo(HINT_TYPE_ITEM,     {RHT_MASK_SHOP_HINT},                RSK_MASK_SHOP_HINT,      true, {RC_DEKU_THEATER_SKULL_MASK, RC_DEKU_THEATER_MASK_OF_TRUTH}, {}, {RC_MASK_SHOP_HINT})}
 };
 
 std::unordered_map<std::string, uint32_t> StaticData::PopulateTranslationMap(std::unordered_map<uint32_t, CustomMessage> input){
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
index a5f325350..18da01c2c 100644
--- a/soh/soh/OTRGlobals.cpp
+++ b/soh/soh/OTRGlobals.cpp
@@ -2754,6 +2754,9 @@ extern "C" int CustomMessage_RetrieveIfExists(PlayState* play) {
         else if (textId == TEXT_HBA_ALREADY_HAVE_1000 && ctx->GetOption(RSK_HBA_HINT)) {
             messageEntry = ctx->GetHint(RH_HBA_HINT)->GetHintMessage(MF_AUTO_FORMAT, 3);
         }
+        else if (textId == TEXT_MASK_SHOP_SIGN && ctx->GetOption(RSK_MASK_SHOP_HINT)) {
+            messageEntry = ctx->GetHint(RH_MASK_SHOP_HINT)->GetHintMessage(MF_AUTO_FORMAT);
+        }
     }
     if (textId == TEXT_GS_NO_FREEZE || textId == TEXT_GS_FREEZE) {
         if (CVarGetInteger(CVAR_ENHANCEMENT("InjectItemCounts"), 0) != 0) {

From f88883044e0708f46f5f83f1509295fd441b4cf9 Mon Sep 17 00:00:00 2001
From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Date: Sat, 6 Jul 2024 01:16:56 +0100
Subject: [PATCH 153/230] Add OoT Static Hint, Fix Sheik Crashes, Add multiple
 text boxes to AutoFormat (#4149)

* add OoT hint, sheik is crashing without hint due to an unrelated bug

* Fix Sheik crashes, add new textbox to autoFormat, trim OoTHint text

* save pls

* fix receive typos

* git pls

* nice conflict fix
---
 .../custom-message/CustomMessageManager.cpp   | 58 ++++++++++++++-----
 soh/soh/Enhancements/presets.h                |  1 +
 .../randomizer/3drando/hint_list.cpp          |  3 +
 .../Enhancements/randomizer/3drando/hints.cpp |  5 +-
 .../location_access/locacc_castle_town.cpp    |  1 +
 .../Enhancements/randomizer/location_list.cpp |  4 +-
 .../randomizer/option_descriptions.cpp        |  3 +-
 .../Enhancements/randomizer/randomizer.cpp    | 31 +++++-----
 .../Enhancements/randomizer/randomizerTypes.h |  4 ++
 soh/soh/Enhancements/randomizer/settings.cpp  |  5 ++
 .../Enhancements/randomizer/static_data.cpp   |  2 +
 11 files changed, 85 insertions(+), 32 deletions(-)

diff --git a/soh/soh/Enhancements/custom-message/CustomMessageManager.cpp b/soh/soh/Enhancements/custom-message/CustomMessageManager.cpp
index 8c71fb023..dd0591181 100644
--- a/soh/soh/Enhancements/custom-message/CustomMessageManager.cpp
+++ b/soh/soh/Enhancements/custom-message/CustomMessageManager.cpp
@@ -314,7 +314,6 @@ void CustomMessage::CleanString(std::string& str) const {
 static size_t NextLineLength(const std::string* textStr, const size_t lastNewline, bool hasIcon = false) {
   const  size_t maxLinePixelWidth = hasIcon ? 200 : 216;
 
-
   size_t totalPixelWidth = 0;
   size_t currentPos = lastNewline;
 
@@ -363,24 +362,53 @@ void CustomMessage::AutoFormatString(std::string& str) const {// did I do this r
     size_t lastNewline = 0;
     const bool hasIcon = str.find('$', 0) != std::string::npos;
     size_t lineLength = NextLineLength(&str, lastNewline, hasIcon);
+    size_t lineCount = 1;
     while (lastNewline + lineLength < str.length()) {
         const size_t carrot = str.find('^', lastNewline);
         const size_t ampersand = str.find('&', lastNewline);
         const size_t lastSpace = str.rfind(' ', lastNewline + lineLength);
-        const size_t lastPeriod = str.rfind('.', lastNewline + lineLength);
-        // replace '&' first if it's within the newline range
-        if (ampersand < lastNewline + lineLength) {
-            lastNewline = ampersand + 1;
-            // or move the lastNewline cursor to the next line if a '^' is encountered
-        } else if (carrot < lastNewline + lineLength) {
-            lastNewline = carrot + 1;
-            // some lines need to be split but don't have spaces, look for periods instead
-        } else if (lastSpace == std::string::npos) {
-            str.replace(lastPeriod, 1, ".&");
-            lastNewline = lastPeriod + 2;
-        } else {
-            str.replace(lastSpace, 1, "&");
-            lastNewline = lastSpace + 1;
+        if (lineCount < 4){
+            // replace '&' first if it's within the newline range
+            if (ampersand < lastNewline + lineLength) {
+                lastNewline = ampersand + 1;
+                // or move the lastNewline cursor to the next line if a '^' is encountered
+            } else if (carrot < lastNewline + lineLength) {
+                lastNewline = carrot + 1;
+                lineCount = 0;
+                // some lines need to be split but don't have spaces, look for periods instead
+            } else if (lastSpace == std::string::npos) {
+                const size_t lastPeriod = str.rfind('.', lastNewline + lineLength);
+                str.replace(lastPeriod, 1, ".&");
+                lastNewline = lastPeriod + 2;
+            } else {
+                str.replace(lastSpace, 1, "&");
+                lastNewline = lastSpace + 1;
+            }
+            lineCount += 1;
+        } else { 
+            const size_t lastColor = str.rfind("\x05"s, lastNewline + lineLength);
+            std::string colorText = "";
+            //check if we are on a non default colour, as ^ resets it, and readd if needed
+            if (lastColor != std::string::npos && str[lastColor+1] != 0){
+                colorText = "\x05"s + str[lastColor+1];
+            }
+            // replace '&' first if it's within the newline range
+            if (ampersand < lastNewline + lineLength) {
+                str.replace(ampersand, 1, "^" + colorText);
+                lastNewline = ampersand + 1;
+                // or move the lastNewline cursor to the next line if a '^' is encountered.
+            } else if (carrot < lastNewline + lineLength) {
+                lastNewline = carrot + 1;
+                // some lines need to be split but don't have spaces, look for periods instead
+            } else if (lastSpace == std::string::npos) {
+                const size_t lastPeriod = str.rfind('.', lastNewline + lineLength);
+                str.replace(lastPeriod, 1, ".^" + colorText);
+                lastNewline = lastPeriod + 2;
+            } else {
+                str.replace(lastSpace, 1, "^" + colorText);
+                lastNewline = lastSpace + 1;
+            }
+            lineCount = 1;
         }
         lineLength = NextLineLength(&str, lastNewline, hasIcon);
     }
diff --git a/soh/soh/Enhancements/presets.h b/soh/soh/Enhancements/presets.h
index fabefebe8..05307af6d 100644
--- a/soh/soh/Enhancements/presets.h
+++ b/soh/soh/Enhancements/presets.h
@@ -504,6 +504,7 @@ const std::vector<const char*> randomizerCvars = {
     CVAR_RANDOMIZER_SETTING("SariaHint"),
     CVAR_RANDOMIZER_ENHANCEMENT("RandomizeRupeeNames"),
     CVAR_RANDOMIZER_SETTING("FrogsHint"),
+    CVAR_RANDOMIZER_SETTING("OoTHint"),
     CVAR_RANDOMIZER_ENHANCEMENT("RandoRelevantNavi"),
     CVAR_RANDOMIZER_ENHANCEMENT("QuestItemFanfares"),
 };
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
index c437bcecd..3d0ae5940 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
@@ -2856,6 +2856,9 @@ void StaticData::HintTable_Init() {
                                                 /*french*/ "Des grenouilles se trouvant sous l'eau vous fixent attentivement, tenant fermement #[[1]]#.",
                                                            {QM_GREEN}));
 
+    hintTextTable[RHT_OOT_HINT] = HintText(CustomMessage("Bring the #Spiritual Stones# to the past so you can receive #[[1]]# from Zelda and learn #[[2]]#!",
+                                                         {QM_BLUE, QM_GREEN, QM_GREEN}));
+
     hintTextTable[RHT_SKULLS_HINT] = HintText(CustomMessage("Yeaaarrgh! I'm cursed!!^Please save me by destroying #[[d]] Spiders of the Curse# and I will give you my #[[1]]#!",
                                                  /*german*/ "Yeaaarrgh! Ich bin verflucht!^Bitte rette mich, indem du #[[d]] Skulltulas# zerstörst und ich werde dir dafür #[[1]]# geben!",
                                                  /*french*/ "Yeaaarrgh! Je suis maudit!^Détruit encore #[[d]] Araignées de la Malédiction# et j'aurai quelque chose à te donner! #([[1]])#",
diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.cpp b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
index 09930fa25..95f5a1144 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hints.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
@@ -279,7 +279,10 @@ std::vector<std::pair<RandomizerCheck, std::function<bool()>>> conditionalAlways
                        auto ctx = Rando::Context::GetInstance();
                        return !ctx->GetOption(RSK_MASK_SHOP_HINT) && !ctx->GetOption(RSK_COMPLETE_MASK_QUEST);
                    }),
-    std::make_pair(RC_SONG_FROM_OCARINA_OF_TIME, []() { return StonesRequiredBySettings() < 2; }),
+    std::make_pair(RC_SONG_FROM_OCARINA_OF_TIME, []() { 
+                        auto ctx = Rando::Context::GetInstance();
+                        return StonesRequiredBySettings() < 2 && !ctx->GetOption(RSK_OOT_HINT);
+                   }),
     std::make_pair(RC_HF_OCARINA_OF_TIME_ITEM, []() { return StonesRequiredBySettings() < 2; }),
     std::make_pair(RC_SHEIK_IN_KAKARIKO, []() { return MedallionsRequiredBySettings() < 5; }),
     std::make_pair(RC_DMT_TRADE_CLAIM_CHECK, []() {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
index 160fff18d..4dc4af7e0 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
@@ -53,6 +53,7 @@ void AreaTable_Init_CastleTown() {
                   LocationAccess(RC_TOT_LIGHT_ARROWS_CUTSCENE, {[]{return logic->IsAdult && logic->CanTriggerLACS;}}),
                   LocationAccess(RC_ALTAR_HINT_CHILD, {[]{return logic->IsChild;}}),
                   LocationAccess(RC_ALTAR_HINT_ADULT, {[]{return logic->IsAdult;}}),
+                  LocationAccess(RC_TOT_SHEIK_HINT, {[]{return logic->IsAdult;}}),
                 }, {
                   //Exits
                   Entrance(RR_TOT_ENTRANCE,            {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/location_list.cpp b/soh/soh/Enhancements/randomizer/location_list.cpp
index a380e0d02..987565352 100644
--- a/soh/soh/Enhancements/randomizer/location_list.cpp
+++ b/soh/soh/Enhancements/randomizer/location_list.cpp
@@ -559,6 +559,7 @@ std::vector<RandomizerCheck> Rando::StaticData::staticHintLocations = {
     RC_ALTAR_HINT_CHILD,
     RC_ALTAR_HINT_ADULT,
     RC_FISHING_POLE_HINT,
+    RC_TOT_SHEIK_HINT,
     RC_MASK_SHOP_HINT,
 };
 
@@ -1565,7 +1566,8 @@ void Rando::StaticData::InitLocationTable() { //
     locationTable[RC_ALTAR_HINT_CHILD]  =                                         Location::OtherHint(RC_ALTAR_HINT_CHILD,                                             RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE,                RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_TEMPLE_OF_TIME,       "ToT Child Altar Hint");
     locationTable[RC_ALTAR_HINT_ADULT]  =                                         Location::OtherHint(RC_ALTAR_HINT_ADULT,                                             RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE,                RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_TEMPLE_OF_TIME,       "ToT Adult Altar Hint");
     locationTable[RC_FISHING_POLE_HINT] =                                         Location::OtherHint(RC_FISHING_POLE_HINT,                                            RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE,                RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,         "Fishing Pole Hint");
-    locationTable[RC_MASK_SHOP_HINT] =                                            Location::OtherHint(RC_MASK_SHOP_HINT,                                               RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE,                RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_HAPPY_MASK_SHOP,      "Mask Shop Hint");
+    locationTable[RC_TOT_SHEIK_HINT] =                                            Location::OtherHint(RC_TOT_SHEIK_HINT,                                               RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE,                RCAREA_MARKET,                       ACTOR_EN_XC,          SCENE_TEMPLE_OF_TIME,       "Ocarina of Time Hint");
+        locationTable[RC_MASK_SHOP_HINT] =                                            Location::OtherHint(RC_MASK_SHOP_HINT,                                               RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE,                RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_HAPPY_MASK_SHOP,      "Mask Shop Hint");
 
     locationTable[RC_TRIFORCE_COMPLETED] =                                           Location::Reward(RC_TRIFORCE_COMPLETED,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x00, "Completed Triforce", "Completed Triforce",    RHT_NONE,                                                        RG_NONE,                              {},                                                     SpoilerCollectionCheck::None(),                                                                                               SpoilerCollectionCheckGroup::GROUP_NO_GROUP);
     // clang-format on
diff --git a/soh/soh/Enhancements/randomizer/option_descriptions.cpp b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
index 3344a8cc1..522007403 100644
--- a/soh/soh/Enhancements/randomizer/option_descriptions.cpp
+++ b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
@@ -516,10 +516,11 @@ void Settings::CreateOptionDescriptions() {
     mOptionDescriptions[RSK_SARIA_HINT] = "Talking to Saria either in person or through Saria's Song will tell you the "
                                           "location of a progressive magic meter.";
     mOptionDescriptions[RSK_FISHING_POLE_HINT] = "Talking to the fishing pond owner without the fishing pole will tell you its location.";
+    mOptionDescriptions[RSK_OOT_HINT] = "Sheik in the Temple of Time will tell you the item and song on the Ocarina of Time.";
     mOptionDescriptions[RSK_FROGS_HINT] = "Standing near the pedestal for the frogs in Zora's River will tell you the "
                                           "reward for the frogs' ocarina game.";
     mOptionDescriptions[RSK_BIGGORON_HINT] = "Talking to Biggoron will tell you the item he will give you in exchange for the Claim Check.";
-    mOptionDescriptions[RSK_BIG_POES_HINT] = "Talking to the Poe Collector in the Market Guardhouse while adult will tell you what you recieve for handing in Big Poes.";
+    mOptionDescriptions[RSK_BIG_POES_HINT] = "Talking to the Poe Collector in the Market Guardhouse while adult will tell you what you receive for handing in Big Poes.";
     mOptionDescriptions[RSK_CHICKENS_HINT] = "Talking to Anju as a child will tell you the item she will give you for delivering her Cuccos to the pen";
     mOptionDescriptions[RSK_MALON_HINT] = "Talking to Malon as adult will tell you the item on \"Link's cow\", the cow you win from beating her time on the Lon Lon Obsticle Course.";
     mOptionDescriptions[RSK_HBA_HINT] = "Talking to the Horseback Archery gerudo in Gerudo Fortress, or the nearby sign, will tell you what you win for scoring 1000 and 1500 points on Horseback Archery.";
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index 231d5e411..e75e03ee6 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -2396,11 +2396,13 @@ CustomMessage Randomizer::GetSheikMessage(s16 scene, u16 originalTextId) {
     CustomMessage messageEntry;
     switch (scene) {
         case SCENE_TEMPLE_OF_TIME:
-            if (!CHECK_DUNGEON_ITEM(DUNGEON_KEY_BOSS, SCENE_GANONS_TOWER)) {
+            if (ctx->GetOption(RSK_OOT_HINT) && !ctx->GetItemLocation(RC_SONG_FROM_OCARINA_OF_TIME)->HasObtained()){
+                messageEntry = ctx->GetHint(RH_OOT_HINT)->GetHintMessage(MF_RAW);
+            } else if (!CHECK_DUNGEON_ITEM(DUNGEON_KEY_BOSS, SCENE_GANONS_TOWER)) {
                 messageEntry = CustomMessage(
-                "@,&meet me at %gGanon's Castle%w&once you obtain the %rkey to his lair%w.",
-                "@, wir treffen uns bei %gGanons Schloß%w,&sobald Du den %rSchlüssel zu&seinem Verließ%w hast.",
-                "Retrouve-moi au %gChâteau de Ganon%w une&fois que tu auras obtenu la&Mrclé de son repaire%w.");
+                "@, meet me at %gGanon's Castle%w once you obtain the %rkey to his lair%w.",
+                "@, wir treffen uns bei %gGanons Schloß%w, sobald Du den %rSchlüssel zu seinem Verließ%w hast.",
+                "Retrouve-moi au %gChâteau de Ganon%w une fois que tu auras obtenu la Mrclé de son repaire%w.");
             } else {
                 messageEntry = CustomMessage(
                 "The time has come. Prepare yourself.",
@@ -2410,18 +2412,18 @@ CustomMessage Randomizer::GetSheikMessage(s16 scene, u16 originalTextId) {
             break;
         case SCENE_INSIDE_GANONS_CASTLE:
             if (ctx->GetOption(RSK_SHEIK_LA_HINT) && INV_CONTENT(ITEM_ARROW_LIGHT) != ITEM_ARROW_LIGHT) {
-                messageEntry = ctx->GetHint(RH_SHEIK_HINT)->GetHintMessage(MF_AUTO_FORMAT);
+                messageEntry = ctx->GetHint(RH_SHEIK_HINT)->GetHintMessage(MF_RAW);
             } else if (!(CHECK_OWNED_EQUIP(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_MASTER) && INV_CONTENT(ITEM_ARROW_LIGHT) == ITEM_ARROW_LIGHT &&
                        CUR_CAPACITY(UPG_QUIVER) >= 30 && gSaveContext.isMagicAcquired)) {
-                messageEntry = CustomMessage("You are still ill-equipped to&face %rGanondorf%w."
-                    "^Seek out the %cMaster Sword%w,&%rsomething to hold your arrows%w,&and %gmagic%w to summon the %ylight%w.",
-                    "Du bist noch nicht gewappnet um Dich&%rGanondorf%w stellen zu können.^"
-                    "Begib Dich auf die Suche nach dem&%cMaster-Schwert%w, %retwas um deine Pfeilen&einen Sinn zu geben%w,^sowie %gdie Magie%w, um das %yLicht%w&herauf beschwören zu können.",
-                    "@, tu n'es toujours pas prêt à affronter&%rGanondorf%w.^"
-                    "Cherche l'%cÉpée de Légende%w,&%rquelque chose pour ranger tes flèches%w&et de la %gmagie%w pour invoquer la&%ylumière%w.");
-            } else if (!Flags_GetEventChkInf(EVENTCHKINF_DISPELLED_GANONS_TOWER_BARRIER)){
+                messageEntry = CustomMessage("You are still ill-equipped to face %rGanondorf%w."
+                    "^Seek out the %cMaster Sword%w, %rsomething to hold your arrows%w, and %gmagic%w to summon the %ylight%w.",
+                    "Du bist noch nicht gewappnet um Dich %rGanondorf%w stellen zu können.^"
+                    "Begib Dich auf die Suche nach dem %cMaster-Schwert%w, %retwas um deine Pfeilen einen Sinn zu geben%w,^sowie %gdie Magie%w, um das %yLicht%w herauf beschwören zu können.",
+                    "@, tu n'es toujours pas prêt à affronter %rGanondorf%w.^"
+                    "Cherche l'%cÉpée de Légende%w, %rquelque chose pour ranger tes flèches%w et de la %gmagie%w pour invoquer la %ylumière%w.");
+            } else if (!Flags_GetEventChkInf(EVENTCHKINF_DISPELLED_GANONS_TOWER_BARRIER) && !ctx->GetOption(RSK_TRIAL_COUNT).Is(0)){
                 messageEntry = CustomMessage(
-                    "You may have what you need to defeat&%rthe Evil King%w, but the %cbarrier%w still&stands.^Complete the remaining %gtrials%w&to destroy it."
+                    "You may have what you need to defeat %rthe Evil King%w, but the %cbarrier%w still stands.^Complete the remaining %gtrials%w to destroy it."
                 );
             } else {
                 messageEntry = CustomMessage(
@@ -2431,7 +2433,8 @@ CustomMessage Randomizer::GetSheikMessage(s16 scene, u16 originalTextId) {
             }
             break;
     }
-        return messageEntry;
+    messageEntry.AutoFormat();
+    return messageEntry;
 }
 
 CustomMessage Randomizer::GetFishingPondOwnerMessage(u16 originalTextId) {
diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h
index c48bfeeb5..43fddacea 100644
--- a/soh/soh/Enhancements/randomizer/randomizerTypes.h
+++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@@ -1489,6 +1489,7 @@ typedef enum {
     RC_ALTAR_HINT_CHILD,
     RC_ALTAR_HINT_ADULT,
     RC_FISHING_POLE_HINT,
+    RC_TOT_SHEIK_HINT,
     RC_MASK_SHOP_HINT,
     RC_DMC_UPPER_GROTTO_FISH,
     RC_DMT_STORMS_GROTTO_FISH,
@@ -2081,6 +2082,7 @@ typedef enum {
     RH_BIG_POES_HINT,
     RH_BIGGORON_HINT,
     RH_FROGS_HINT,
+    RH_OOT_HINT,
     RH_KAK_10_SKULLS_HINT,
     RH_KAK_20_SKULLS_HINT,
     RH_KAK_30_SKULLS_HINT,
@@ -3448,6 +3450,7 @@ typedef enum {
     RHT_BIG_POES_HINT,
     RHT_BIGGORON_HINT,
     RHT_FROGS_HINT,
+    RHT_OOT_HINT,
     RHT_SKULLS_HINT,
     RHT_MASK_SHOP_HINT,
     // Ganon Line
@@ -3604,6 +3607,7 @@ typedef enum {
     RSK_GREG_HINT,
     RSK_SARIA_HINT,
     RSK_FROGS_HINT,
+    RSK_OOT_HINT,
     RSK_KAK_10_SKULLS_HINT,
     RSK_KAK_20_SKULLS_HINT,
     RSK_KAK_30_SKULLS_HINT,
diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
index 9d836371b..a67bbddab 100644
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -164,6 +164,7 @@ void Settings::CreateOptions() {
     mOptions[RSK_SARIA_HINT] = Option::Bool("Saria's Hint", CVAR_RANDOMIZER_SETTING("SariaHint"), mOptionDescriptions[RSK_SARIA_HINT], IMFLAG_NONE);
     mOptions[RSK_FISHING_POLE_HINT] = Option::Bool("Fishing Pole Hint", CVAR_RANDOMIZER_SETTING("FishingPoleHint"), mOptionDescriptions[RSK_FISHING_POLE_HINT], IMFLAG_NONE);
     mOptions[RSK_FROGS_HINT] = Option::Bool("Frog Ocarina Game Hint", CVAR_RANDOMIZER_SETTING("FrogsHint"), mOptionDescriptions[RSK_FROGS_HINT], IMFLAG_NONE);
+    mOptions[RSK_OOT_HINT] = Option::Bool("Ocarina of Time Hint", CVAR_RANDOMIZER_SETTING("OoTHint"), mOptionDescriptions[RSK_OOT_HINT], IMFLAG_NONE);
     mOptions[RSK_BIGGORON_HINT] = Option::Bool("Biggoron's Hint", CVAR_RANDOMIZER_SETTING("BiggoronHint"), mOptionDescriptions[RSK_BIGGORON_HINT], IMFLAG_NONE);
     mOptions[RSK_BIG_POES_HINT] = Option::Bool("Big Poes Hint", CVAR_RANDOMIZER_SETTING("BigPoesHint"), mOptionDescriptions[RSK_BIG_POES_HINT], IMFLAG_NONE);
     mOptions[RSK_CHICKENS_HINT] = Option::Bool("Chickens Hint", CVAR_RANDOMIZER_SETTING("ChickensHint"), mOptionDescriptions[RSK_CHICKENS_HINT], IMFLAG_NONE);
@@ -733,6 +734,7 @@ void Settings::CreateOptions() {
         &mOptions[RSK_GREG_HINT],
         &mOptions[RSK_SARIA_HINT],
         &mOptions[RSK_FROGS_HINT],
+        &mOptions[RSK_OOT_HINT],
         &mOptions[RSK_BIGGORON_HINT],
         &mOptions[RSK_BIG_POES_HINT],
         &mOptions[RSK_CHICKENS_HINT],
@@ -964,6 +966,7 @@ void Settings::CreateOptions() {
         &mOptions[RSK_GREG_HINT],
         &mOptions[RSK_SARIA_HINT],
         &mOptions[RSK_FROGS_HINT],
+        &mOptions[RSK_OOT_HINT],
         &mOptions[RSK_WARP_SONG_HINTS],
         &mOptions[RSK_BIGGORON_HINT],
         &mOptions[RSK_BIG_POES_HINT],
@@ -1183,6 +1186,7 @@ void Settings::CreateOptions() {
         { "Miscellaneous Settings:Greg the Rupee Hint", RSK_GREG_HINT },
         { "Miscellaneous Settings:Saria's Hint", RSK_SARIA_HINT },
         { "Miscellaneous Settings:Frog Ocarina Game Hint", RSK_FROGS_HINT },
+        { "Miscellaneous Settings:Ocarina of Time Hint", RSK_OOT_HINT },
         { "Miscellaneous Settings:10 GS Hint", RSK_KAK_10_SKULLS_HINT },
         { "Miscellaneous Settings:20 GS Hint", RSK_KAK_20_SKULLS_HINT },
         { "Miscellaneous Settings:30 GS Hint", RSK_KAK_30_SKULLS_HINT },
@@ -2293,6 +2297,7 @@ void Settings::ParseJson(nlohmann::json spoilerFileJson) {
                 case RSK_GREG_HINT:
                 case RSK_SARIA_HINT:
                 case RSK_FROGS_HINT:
+                case RSK_OOT_HINT:
                 case RSK_KAK_10_SKULLS_HINT:
                 case RSK_KAK_20_SKULLS_HINT:
                 case RSK_KAK_30_SKULLS_HINT:
diff --git a/soh/soh/Enhancements/randomizer/static_data.cpp b/soh/soh/Enhancements/randomizer/static_data.cpp
index bf7a93f17..f413a86e0 100644
--- a/soh/soh/Enhancements/randomizer/static_data.cpp
+++ b/soh/soh/Enhancements/randomizer/static_data.cpp
@@ -88,6 +88,7 @@ std::unordered_map<uint32_t, CustomMessage> StaticData::hintNames = {
     {RH_BIG_POES_HINT, CustomMessage("Big Poe Reward Hint")},
     {RH_BIGGORON_HINT, CustomMessage("Biggoron Claim Check Hint")},
     {RH_FROGS_HINT, CustomMessage("Final Frogs in River Hint")},
+    {RH_OOT_HINT, CustomMessage("Sheik in Temple of Time Hint")},
     {RH_KAK_10_SKULLS_HINT, CustomMessage("10 Skulls Hint")},
     {RH_KAK_20_SKULLS_HINT, CustomMessage("20 Skulls Hint")},
     {RH_KAK_30_SKULLS_HINT, CustomMessage("30 Skulls Hint")},
@@ -209,6 +210,7 @@ std::unordered_map<RandomizerHint, StaticHintInfo> StaticData::staticHintInfoMap
   {RH_CHICKENS_HINT,       StaticHintInfo(HINT_TYPE_ITEM,     {RHT_CHICKENS_HINT},                 RSK_CHICKENS_HINT,       true, {RC_KAK_ANJU_AS_CHILD})},
   {RH_BIGGORON_HINT,       StaticHintInfo(HINT_TYPE_ITEM,     {RHT_BIGGORON_HINT},                 RSK_BIGGORON_HINT,       true, {RC_DMT_TRADE_CLAIM_CHECK})},
   {RH_FROGS_HINT,          StaticHintInfo(HINT_TYPE_ITEM,     {RHT_FROGS_HINT},                    RSK_FROGS_HINT,          true, {RC_ZR_FROGS_OCARINA_GAME})},
+  {RH_OOT_HINT,            StaticHintInfo(HINT_TYPE_ITEM,     {RHT_OOT_HINT},                      RSK_OOT_HINT,            true, {RC_HF_OCARINA_OF_TIME_ITEM, RC_SONG_FROM_OCARINA_OF_TIME}, {}, {RC_TOT_SHEIK_HINT})},
   {RH_KAK_10_SKULLS_HINT,  StaticHintInfo(HINT_TYPE_ITEM,     {RHT_SKULLS_HINT},                   RSK_KAK_10_SKULLS_HINT,  true, {RC_KAK_10_GOLD_SKULLTULA_REWARD},  {}, {}, false, 10)},
   {RH_KAK_20_SKULLS_HINT,  StaticHintInfo(HINT_TYPE_ITEM,     {RHT_SKULLS_HINT},                   RSK_KAK_20_SKULLS_HINT,  true, {RC_KAK_20_GOLD_SKULLTULA_REWARD},  {}, {}, false, 20)},
   {RH_KAK_30_SKULLS_HINT,  StaticHintInfo(HINT_TYPE_ITEM,     {RHT_SKULLS_HINT},                   RSK_KAK_30_SKULLS_HINT,  true, {RC_KAK_30_GOLD_SKULLTULA_REWARD},  {}, {}, false, 30)},

From 8b001da317d7c14025f09c9a059971b85f528faa Mon Sep 17 00:00:00 2001
From: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>
Date: Sat, 6 Jul 2024 03:13:49 +0200
Subject: [PATCH 154/230] Check tracker show logic (#3972)

* Initial Implementation

* Fix missing locations

* Update locacc_castle_town.cpp

---------

Co-authored-by: Christopher Leggett <chris@leggett.dev>
---
 .../randomizer/3drando/location_access.cpp    |  42 +++-
 .../randomizer/3drando/location_access.hpp    |  19 +-
 .../locacc_bottom_of_the_well.cpp             |  50 ++---
 .../location_access/locacc_castle_town.cpp    | 135 +++++++------
 .../location_access/locacc_death_mountain.cpp | 118 +++++------
 .../location_access/locacc_deku_tree.cpp      |  50 ++---
 .../locacc_dodongos_cavern.cpp                |  68 +++----
 .../location_access/locacc_fire_temple.cpp    |  76 ++++----
 .../location_access/locacc_forest_temple.cpp  |  74 +++----
 .../location_access/locacc_ganons_castle.cpp  |  84 ++++----
 .../locacc_gerudo_training_grounds.cpp        |  78 ++++----
 .../location_access/locacc_gerudo_valley.cpp  |  72 +++----
 .../location_access/locacc_hyrule_field.cpp   | 184 +++++++++---------
 .../location_access/locacc_ice_cavern.cpp     |  32 +--
 .../locacc_jabujabus_belly.cpp                |  52 ++---
 .../location_access/locacc_kakariko.cpp       | 116 +++++------
 .../location_access/locacc_lost_woods.cpp     | 116 +++++------
 .../location_access/locacc_shadow_temple.cpp  | 102 +++++-----
 .../location_access/locacc_spirit_temple.cpp  | 116 +++++------
 .../location_access/locacc_water_temple.cpp   |  60 +++---
 .../location_access/locacc_zoras_domain.cpp   | 108 +++++-----
 .../randomizer/randomizer_check_tracker.cpp   |  18 ++
 22 files changed, 920 insertions(+), 850 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
index e389e440e..ddda3dbab 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
@@ -260,9 +260,9 @@ void AreaTable_Init() {
                        //name, scene, hint text,                       events, locations, exits
   areaTable[RR_ROOT] = Area("Root", "", RA_LINKS_POCKET, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_LINKS_POCKET,       {[]{return true;}}),
-                  LocationAccess(RC_TRIFORCE_COMPLETED, {[]{return logic->CanCompleteTriforce;}}),
-                  LocationAccess(RC_SARIA_SONG_HINT,    {[]{return logic->CanUse(RG_SARIAS_SONG);}}),
+                  LOCATION(RC_LINKS_POCKET,       true),
+                  LOCATION(RC_TRIFORCE_COMPLETED, logic->CanCompleteTriforce),
+                  LOCATION(RC_SARIA_SONG_HINT,    logic->CanUse(RG_SARIAS_SONG)),
                 }, {
                   //Exits
                   Entrance(RR_ROOT_EXITS, {[]{return true;}})
@@ -363,6 +363,42 @@ void AreaTable_Init() {
 */
 }
 
+void ReplaceFirstInString(std::string& s, std::string const& toReplace, std::string const& replaceWith) {
+    size_t pos = s.find(toReplace);
+    if (pos == std::string::npos) {
+        return;
+    }
+    s.replace(pos, toReplace.length(), replaceWith);
+}
+
+void ReplaceAllInString(std::string& s, std::string const& toReplace, std::string const& replaceWith) {
+    std::string buf;
+    size_t pos = 0;
+    size_t prevPos;
+
+    buf.reserve(s.size());
+
+    while (true) {
+        prevPos = pos;
+        pos = s.find(toReplace, pos);
+        if (pos == std::string::npos) {
+            break;
+        }
+        buf.append(s, prevPos, pos - prevPos);
+        buf += replaceWith;
+        pos += toReplace.size();
+    }
+
+    buf.append(s, prevPos, s.size() - prevPos);
+    s.swap(buf);
+}
+
+std::string CleanCheckConditionString(std::string condition) {
+    ReplaceAllInString(condition, "logic->", "");
+    ReplaceAllInString(condition, "randoCtx->", "");
+    return condition;
+}
+
 namespace Areas {
 
   const auto GetAllAreas() {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access.hpp b/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
index 7a4024c69..1492e82ec 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
@@ -70,12 +70,24 @@ private:
     std::vector<ConditionFn> conditions_met;
 };
 
+std::string CleanCheckConditionString(std::string condition);
+
+#define LOCATION(check, condition) LocationAccess(check, {[]{return condition;}}, CleanCheckConditionString(#condition))
+
 //this class is meant to hold an item location with a boolean function to determine its accessibility from a specific area
 class LocationAccess {
 public:
 
     explicit LocationAccess(RandomizerCheck location_, std::vector<ConditionFn> conditions_met_)
-        : location(location_) {
+        : location(location_), condition_str("") {
+        conditions_met.resize(2);
+        for (size_t i = 0; i < conditions_met_.size(); i++) {
+            conditions_met[i] = conditions_met_[i];
+        }
+    }
+
+    explicit LocationAccess(RandomizerCheck location_, std::vector<ConditionFn> conditions_met_, std::string condition_str_)
+        : location(location_), condition_str(condition_str_) {
         conditions_met.resize(2);
         for (size_t i = 0; i < conditions_met_.size(); i++) {
             conditions_met[i] = conditions_met_[i];
@@ -106,9 +118,14 @@ public:
         return location;
     }
 
+    std::string GetConditionStr() const {
+        return condition_str;
+    }
+
 protected:
     RandomizerCheck location;
     std::vector<ConditionFn> conditions_met;
+    std::string condition_str;
 
     //Makes sure shop locations are buyable
     bool CanBuy() const;
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_bottom_of_the_well.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_bottom_of_the_well.cpp
index 37312b84b..4f5ab4086 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_bottom_of_the_well.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_bottom_of_the_well.cpp
@@ -25,23 +25,23 @@ void AreaTable_Init_BottomOfTheWell() {
                   EventAccess(&logic->NutPot,   {[]{return true;}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST,   {[]{return randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH);}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST,  {[]{return logic->HasExplosives;}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST, {[]{return randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH);}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_COMPASS_CHEST,                {[]{return randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH);}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST,       {[]{return randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH);}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST,     {[]{return (randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->HasExplosives;}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_FREESTANDING_KEY,             {[]{return (logic->Swim || logic->CanUse(RG_ZELDAS_LULLABY)) && logic->Sticks || logic->CanUse(RG_DINS_FIRE);}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST,          {[]{return logic->CanUse(RG_ZELDAS_LULLABY) && (logic->KokiriSword || (logic->Sticks && randoCtx->GetTrickOption(RT_BOTW_CHILD_DEADHAND)));}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST,              {[]{return logic->CanUse(RG_ZELDAS_LULLABY) && (randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH));}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST,       {[]{return logic->CanUse(RG_ZELDAS_LULLABY);}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST,        {[]{return logic->CanUse(RG_ZELDAS_LULLABY);}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_MAP_CHEST,                    {[]{return logic->HasExplosives || (((logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 3) && (randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH))) || logic->CanUse(RG_DINS_FIRE) || (logic->Sticks && randoCtx->GetTrickOption(RT_BOTW_BASEMENT))) && logic->GoronBracelet);}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST,             {[]{return logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 3) && (randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH));}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST,              {[]{return logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 3) && (randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH));}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM,           {[]{return logic->Boomerang && (randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 3);}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM,           {[]{return logic->Boomerang && (randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 3);}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE,            {[]{return logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 3) && (randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->Boomerang;}}),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST,   randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH)),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST,  logic->HasExplosives),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST, randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH)),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_COMPASS_CHEST,                randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH)),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST,       randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH)),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST,     (randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->HasExplosives),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_FREESTANDING_KEY,             (logic->Swim || logic->CanUse(RG_ZELDAS_LULLABY)) && logic->Sticks || logic->CanUse(RG_DINS_FIRE)),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST,          logic->CanUse(RG_ZELDAS_LULLABY) && (logic->KokiriSword || (logic->Sticks && randoCtx->GetTrickOption(RT_BOTW_CHILD_DEADHAND)))),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST,              logic->CanUse(RG_ZELDAS_LULLABY) && (randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH))),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST,       logic->CanUse(RG_ZELDAS_LULLABY)),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST,        logic->CanUse(RG_ZELDAS_LULLABY)),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_MAP_CHEST,                    logic->HasExplosives || (((logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 3) && (randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH))) || logic->CanUse(RG_DINS_FIRE) || (logic->Sticks && randoCtx->GetTrickOption(RT_BOTW_BASEMENT))) && logic->GoronBracelet)),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST,             logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 3) && (randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH))),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST,              logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 3) && (randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH))),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM,           logic->Boomerang && (randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 3)),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM,           logic->Boomerang && (randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 3)),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE,            logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 3) && (randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->Boomerang),
                 }, {
                   //Exits
                   Entrance(RR_BOTTOM_OF_THE_WELL_ENTRYWAY, {[]{return true;}}),
@@ -57,11 +57,11 @@ void AreaTable_Init_BottomOfTheWell() {
                   //EventAccess(&WallFairy, {[]{return WallFairy || logic->Slingshot;}}),
   }, {
                   //Locations
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST,              {[]{return logic->KokiriSword || (logic->Sticks && randoCtx->GetTrickOption(RT_BOTW_CHILD_DEADHAND));}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY, {[]{return logic->HasExplosives || (randoCtx->GetTrickOption(RT_BOTW_MQ_DEADHAND_KEY) && logic->Boomerang);}}),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST,              logic->KokiriSword || (logic->Sticks && randoCtx->GetTrickOption(RT_BOTW_CHILD_DEADHAND))),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY, logic->HasExplosives || (randoCtx->GetTrickOption(RT_BOTW_MQ_DEADHAND_KEY) && logic->Boomerang)),
                     //Trick: logic->HasExplosives || (LogicBotWMQDeadHandKey && logic->Boomerang)
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT,                {[]{return logic->CanChildAttack;}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM,             {[]{return logic->CanChildAttack && logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 2);}}),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT,                logic->CanChildAttack),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM,             logic->CanChildAttack && logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 2)),
   }, {
                   //Exits
                   Entrance(RR_BOTTOM_OF_THE_WELL_ENTRYWAY,  {[]{return true;}}),
@@ -71,10 +71,10 @@ void AreaTable_Init_BottomOfTheWell() {
 
   areaTable[RR_BOTTOM_OF_THE_WELL_MQ_MIDDLE] = Area("Bottom of the Well MQ Middle", "Bottom of the Well", RA_BOTTOM_OF_THE_WELL, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_MQ_MAP_CHEST,                        {[]{return true;}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST,              {[]{return logic->HasExplosives && logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 2);}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY, {[]{return true;}}),
-                  LocationAccess(RC_BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM,               {[]{return logic->CanChildAttack && (randoCtx->GetTrickOption(RT_BOTW_MQ_PITS) || logic->HasExplosives);}}),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_MQ_MAP_CHEST,                        true),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST,              logic->HasExplosives && logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 2)),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY, true),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM,               logic->CanChildAttack && (randoCtx->GetTrickOption(RT_BOTW_MQ_PITS) || logic->HasExplosives)),
                     //Trick: logic->CanChildAttack && (LogicBotWMQPits || logic->HasExplosives)
   }, {
                   //Exits
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
index 4dc4af7e0..f1f1e0d27 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
@@ -38,22 +38,22 @@ void AreaTable_Init_CastleTown() {
                   EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CanSummonGossipFairyWithoutSuns;}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_TOT_LEFTMOST_GOSSIP_STONE,         {[]{return true;}}),
-                  LocationAccess(RC_TOT_LEFT_CENTER_GOSSIP_STONE,  {[]{return true;}}),
-                  LocationAccess(RC_TOT_RIGHT_CENTER_GOSSIP_STONE, {[]{return true;}}),
-                  LocationAccess(RC_TOT_RIGHTMOST_GOSSIP_STONE,        {[]{return true;}}),
+                  LOCATION(RC_TOT_LEFTMOST_GOSSIP_STONE,     true),
+                  LOCATION(RC_TOT_LEFT_CENTER_GOSSIP_STONE,  true),
+                  LOCATION(RC_TOT_RIGHT_CENTER_GOSSIP_STONE, true),
+                  LOCATION(RC_TOT_RIGHTMOST_GOSSIP_STONE,    true),
                 }, {
                   //Exits
-                  Entrance(RR_THE_MARKET,  {[]{return true;}}),
+                  Entrance(RR_THE_MARKET,     {[]{return true;}}),
                   Entrance(RR_TEMPLE_OF_TIME, {[]{return true;}}),
   });
 
   areaTable[RR_TEMPLE_OF_TIME] = Area("Temple of Time", "Temple of Time", RA_TEMPLE_OF_TIME, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_TOT_LIGHT_ARROWS_CUTSCENE, {[]{return logic->IsAdult && logic->CanTriggerLACS;}}),
-                  LocationAccess(RC_ALTAR_HINT_CHILD, {[]{return logic->IsChild;}}),
-                  LocationAccess(RC_ALTAR_HINT_ADULT, {[]{return logic->IsAdult;}}),
-                  LocationAccess(RC_TOT_SHEIK_HINT, {[]{return logic->IsAdult;}}),
+                  LOCATION(RC_TOT_LIGHT_ARROWS_CUTSCENE, logic->IsAdult && logic->CanTriggerLACS),
+                  LOCATION(RC_ALTAR_HINT_CHILD,          logic->IsChild),
+                  LOCATION(RC_ALTAR_HINT_ADULT,          logic->IsAdult),
+                  LOCATION(RC_TOT_SHEIK_HINT,            logic->IsAdult),
                 }, {
                   //Exits
                   Entrance(RR_TOT_ENTRANCE,            {[]{return true;}}),
@@ -65,9 +65,9 @@ void AreaTable_Init_CastleTown() {
                   //EventAccess(&logic->TimeTravel, {[]{return true;}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_TOT_MASTER_SWORD, {[]{return logic->IsAdult;}}),
-                  LocationAccess(RC_GIFT_FROM_SAGES, {[]{return logic->IsAdult;}}),
-                  LocationAccess(RC_SHEIK_AT_TEMPLE, {[]{return logic->ForestMedallion && logic->IsAdult;}}),
+                  LOCATION(RC_TOT_MASTER_SWORD, logic->IsAdult),
+                  LOCATION(RC_GIFT_FROM_SAGES,  logic->IsAdult),
+                  LOCATION(RC_SHEIK_AT_TEMPLE,  logic->ForestMedallion && logic->IsAdult),
                 }, {
                   //Exits
                   Entrance(RR_TEMPLE_OF_TIME, {[]{return true;}}),
@@ -87,10 +87,10 @@ void AreaTable_Init_CastleTown() {
                   EventAccess(&logic->BugRock,          {[]{return true;}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_HC_MALON_EGG,              {[]{return true;}}),
-                  LocationAccess(RC_HC_GS_TREE,                {[]{return logic->CanChildAttack;}}),
-                  LocationAccess(RC_HC_MALON_GOSSIP_STONE,     {[]{return true;}}),
-                  LocationAccess(RC_HC_ROCK_WALL_GOSSIP_STONE, {[]{return true;}}),
+                  LOCATION(RC_HC_MALON_EGG,              true),
+                  LOCATION(RC_HC_GS_TREE,                logic->CanChildAttack),
+                  LOCATION(RC_HC_MALON_GOSSIP_STONE,     true),
+                  LOCATION(RC_HC_ROCK_WALL_GOSSIP_STONE, true),
                 }, {
                   //Exits
                   Entrance(RR_CASTLE_GROUNDS,          {[]{return true;}}),
@@ -103,8 +103,8 @@ void AreaTable_Init_CastleTown() {
                   //Events
                 }, {
                   //Locations
-                  LocationAccess(RC_HC_ZELDAS_LETTER, {[]{return true;}}),
-                  LocationAccess(RC_SONG_FROM_IMPA,   {[]{return true;}}),
+                  LOCATION(RC_HC_ZELDAS_LETTER, true),
+                  LOCATION(RC_SONG_FROM_IMPA,   true),
                 }, {
                   //Exits
                   Entrance(RR_HYRULE_CASTLE_GROUNDS, {[]{return true;}}),
@@ -112,7 +112,7 @@ void AreaTable_Init_CastleTown() {
 
   areaTable[RR_HC_GREAT_FAIRY_FOUNTAIN] = Area("HC Great Fairy Fountain", "HC Great Fairy Fountain", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_HC_GREAT_FAIRY_REWARD, {[]{return logic->CanUse(RG_ZELDAS_LULLABY);}}),
+                  LOCATION(RC_HC_GREAT_FAIRY_REWARD, logic->CanUse(RG_ZELDAS_LULLABY)),
                 }, {
                   //Exits
                   Entrance(RR_CASTLE_GROUNDS, {[]{return true;}}),
@@ -125,8 +125,8 @@ void AreaTable_Init_CastleTown() {
                   EventAccess(&logic->WanderingBugs,    {[]{return logic->WanderingBugs    || logic->CanBlastOrSmash;}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_HC_GS_STORMS_GROTTO,           {[]{return (logic->CanBlastOrSmash && logic->HookshotOrBoomerang) || (logic->Boomerang && randoCtx->GetTrickOption(RT_HC_STORMS_GS));}}),
-                  LocationAccess(RC_HC_STORMS_GROTTO_GOSSIP_STONE, {[]{return logic->CanBlastOrSmash;}}),
+                  LOCATION(RC_HC_GS_STORMS_GROTTO,           (logic->CanBlastOrSmash && logic->HookshotOrBoomerang) || (logic->Boomerang && randoCtx->GetTrickOption(RT_HC_STORMS_GS))),
+                  LOCATION(RC_HC_STORMS_GROTTO_GOSSIP_STONE, logic->CanBlastOrSmash),
                 }, {
                   //Exits
                   Entrance(RR_CASTLE_GROUNDS, {[]{return true;}}),
@@ -136,8 +136,7 @@ void AreaTable_Init_CastleTown() {
                   EventAccess(&logic->BuiltRainbowBridge, {[]{return logic->CanBuildRainbowBridge;}}),
                 }, {
                   //Locations                                   //the terrain was lowered such that you can't get this GS with a simple sword slash
-                  LocationAccess(RC_OGC_GS, {[]{return logic->CanJumpslash || logic->CanUseProjectile
-                  || (logic->CanShield && logic->CanUse(RG_MEGATON_HAMMER)) || logic->CanUse(RG_DINS_FIRE);}}),
+                  LOCATION(RC_OGC_GS, logic->CanJumpslash || logic->CanUseProjectile || (logic->CanShield && logic->CanUse(RG_MEGATON_HAMMER)) || logic->CanUse(RG_DINS_FIRE)),
                 }, {
                   //Exits
                   Entrance(RR_CASTLE_GROUNDS,           {[]{return logic->AtNight;}}),
@@ -147,7 +146,7 @@ void AreaTable_Init_CastleTown() {
 
   areaTable[RR_OGC_GREAT_FAIRY_FOUNTAIN] = Area("OGC Great Fairy Fountain", "OGC Great Fairy Fountain", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_OGC_GREAT_FAIRY_REWARD, {[]{return logic->CanUse(RG_ZELDAS_LULLABY);}}),
+                  LOCATION(RC_OGC_GREAT_FAIRY_REWARD, logic->CanUse(RG_ZELDAS_LULLABY)),
                 }, {
                   //Exits
                   Entrance(RR_CASTLE_GROUNDS, {[]{return true;}}),
@@ -168,8 +167,8 @@ void AreaTable_Init_CastleTown() {
 
   areaTable[RR_MARKET_GUARD_HOUSE] = Area("Market Guard House", "Market Guard House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_MARKET_10_BIG_POES,    {[]{return logic->IsAdult && logic->BigPoeKill;}}),
-                  LocationAccess(RC_MARKET_GS_GUARD_HOUSE, {[]{return logic->IsChild;}}),
+                  LOCATION(RC_MARKET_10_BIG_POES,    logic->IsAdult && logic->BigPoeKill),
+                  LOCATION(RC_MARKET_GS_GUARD_HOUSE, logic->IsChild),
                 }, {
                   //Exits
                   Entrance(RR_MARKET_ENTRANCE, {[]{return true;}}),
@@ -177,14 +176,14 @@ void AreaTable_Init_CastleTown() {
 
   areaTable[RR_MARKET_BAZAAR] = Area("Market Bazaar", "Market Bazaar", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_MARKET_BAZAAR_ITEM_1, {[]{return true;}}),
-                  LocationAccess(RC_MARKET_BAZAAR_ITEM_2, {[]{return true;}}),
-                  LocationAccess(RC_MARKET_BAZAAR_ITEM_3, {[]{return true;}}),
-                  LocationAccess(RC_MARKET_BAZAAR_ITEM_4, {[]{return true;}}),
-                  LocationAccess(RC_MARKET_BAZAAR_ITEM_5, {[]{return true;}}),
-                  LocationAccess(RC_MARKET_BAZAAR_ITEM_6, {[]{return true;}}),
-                  LocationAccess(RC_MARKET_BAZAAR_ITEM_7, {[]{return true;}}),
-                  LocationAccess(RC_MARKET_BAZAAR_ITEM_8, {[]{return true;}}),
+                  LOCATION(RC_MARKET_BAZAAR_ITEM_1, true),
+                  LOCATION(RC_MARKET_BAZAAR_ITEM_2, true),
+                  LOCATION(RC_MARKET_BAZAAR_ITEM_3, true),
+                  LOCATION(RC_MARKET_BAZAAR_ITEM_4, true),
+                  LOCATION(RC_MARKET_BAZAAR_ITEM_5, true),
+                  LOCATION(RC_MARKET_BAZAAR_ITEM_6, true),
+                  LOCATION(RC_MARKET_BAZAAR_ITEM_7, true),
+                  LOCATION(RC_MARKET_BAZAAR_ITEM_8, true),
                 }, {
                   //Exits
                   Entrance(RR_THE_MARKET, {[]{return true;}}),
@@ -195,7 +194,7 @@ void AreaTable_Init_CastleTown() {
                   EventAccess(&logic->SkullMask,   {[]{return logic->SkullMask   || (logic->ZeldasLetter && (randoCtx->GetOption(RSK_COMPLETE_MASK_QUEST) ||  ChildCanAccess(RR_KAKARIKO_VILLAGE)));}}), //RANDOTODO Complete mask quest does not need this location, so should be tied to link'd pocket
                   EventAccess(&logic->MaskOfTruth, {[]{return logic->MaskOfTruth || (logic->SkullMask && (randoCtx->GetOption(RSK_COMPLETE_MASK_QUEST) || (ChildCanAccess(RR_THE_LOST_WOODS) && logic->CanUse(RG_SARIAS_SONG) && AreaTable(RR_THE_GRAVEYARD)->childDay && ChildCanAccess(RR_HYRULE_FIELD) && logic->HasAllStones)));}}),
                 }, {
-                  LocationAccess(RC_MASK_SHOP_HINT, {[]{return true;}}),
+                  LOCATION(RC_MASK_SHOP_HINT, true),
                 }, {
                   //Exits
                   Entrance(RR_THE_MARKET, {[]{return true;}}),
@@ -203,7 +202,7 @@ void AreaTable_Init_CastleTown() {
 
   areaTable[RR_MARKET_SHOOTING_GALLERY] = Area("Market Shooting Gallery", "Market Shooting Gallery", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_MARKET_SHOOTING_GALLERY_REWARD, {[]{return logic->IsChild && logic->ChildsWallet;}}),
+                  LOCATION(RC_MARKET_SHOOTING_GALLERY_REWARD, logic->IsChild && logic->ChildsWallet),
                 }, {
                   //Exits
                   Entrance(RR_THE_MARKET, {[]{return true;}}),
@@ -211,9 +210,9 @@ void AreaTable_Init_CastleTown() {
 
   areaTable[RR_MARKET_BOMBCHU_BOWLING] = Area("Market Bombchu Bowling", "Market Bombchu Bowling", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,  {[]{return logic->CanPlayBowling;}}),
-                  LocationAccess(RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE, {[]{return logic->CanPlayBowling;}}),
-                  LocationAccess(RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS,     {[]{return logic->CanPlayBowling;}}),
+                  LOCATION(RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,  logic->CanPlayBowling),
+                  LOCATION(RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE, logic->CanPlayBowling),
+                  LOCATION(RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS,     logic->CanPlayBowling),
                 }, {
                   //Exits
                   Entrance(RR_THE_MARKET, {[]{return true;}}),
@@ -221,14 +220,14 @@ void AreaTable_Init_CastleTown() {
 
   areaTable[RR_MARKET_POTION_SHOP] = Area("Market Potion Shop", "Market Potion Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_MARKET_POTION_SHOP_ITEM_1, {[]{return true;}}),
-                  LocationAccess(RC_MARKET_POTION_SHOP_ITEM_2, {[]{return true;}}),
-                  LocationAccess(RC_MARKET_POTION_SHOP_ITEM_3, {[]{return true;}}),
-                  LocationAccess(RC_MARKET_POTION_SHOP_ITEM_4, {[]{return true;}}),
-                  LocationAccess(RC_MARKET_POTION_SHOP_ITEM_5, {[]{return true;}}),
-                  LocationAccess(RC_MARKET_POTION_SHOP_ITEM_6, {[]{return true;}}),
-                  LocationAccess(RC_MARKET_POTION_SHOP_ITEM_7, {[]{return true;}}),
-                  LocationAccess(RC_MARKET_POTION_SHOP_ITEM_8, {[]{return true;}}),
+                  LOCATION(RC_MARKET_POTION_SHOP_ITEM_1, true),
+                  LOCATION(RC_MARKET_POTION_SHOP_ITEM_2, true),
+                  LOCATION(RC_MARKET_POTION_SHOP_ITEM_3, true),
+                  LOCATION(RC_MARKET_POTION_SHOP_ITEM_4, true),
+                  LOCATION(RC_MARKET_POTION_SHOP_ITEM_5, true),
+                  LOCATION(RC_MARKET_POTION_SHOP_ITEM_6, true),
+                  LOCATION(RC_MARKET_POTION_SHOP_ITEM_7, true),
+                  LOCATION(RC_MARKET_POTION_SHOP_ITEM_8, true),
                 }, {
                   //Exits
                   Entrance(RR_THE_MARKET, {[]{return true;}}),
@@ -236,18 +235,18 @@ void AreaTable_Init_CastleTown() {
 
   areaTable[RR_MARKET_TREASURE_CHEST_GAME] = Area("Market Treasure Chest Game", "Market Treasure Chest Game", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_GREG_HINT, {[]{return true;}}),
-                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_REWARD, {[]{return logic->ChildsWallet && ((logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 6)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)));}}),
-                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_KEY_1, {[]{return logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)));}}),
-                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_1, {[]{return logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)));}}),
-                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_KEY_2, {[]{return logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 2)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)));}}),
-                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_2, {[]{return logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 2)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)));}}),
-                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_KEY_3, {[]{return logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 3)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)));}}),
-                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_3, {[]{return logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 3)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)));}}),
-                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_KEY_4, {[]{return logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 4)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)));}}),
-                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_4, {[]{return logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 4)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)));}}),
-                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_KEY_5, {[]{return logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 5)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)));}}),
-                  LocationAccess(RC_MARKET_TREASURE_CHEST_GAME_ITEM_5, {[]{return logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 5)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)));}}),
+                  LOCATION(RC_GREG_HINT,                         true),
+                  LOCATION(RC_MARKET_TREASURE_CHEST_GAME_REWARD, logic->ChildsWallet && ((logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 6)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)))),
+                  LOCATION(RC_MARKET_TREASURE_CHEST_GAME_KEY_1,  logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)))),
+                  LOCATION(RC_MARKET_TREASURE_CHEST_GAME_ITEM_1, logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)))),
+                  LOCATION(RC_MARKET_TREASURE_CHEST_GAME_KEY_2,  logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 2)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)))),
+                  LOCATION(RC_MARKET_TREASURE_CHEST_GAME_ITEM_2, logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 2)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)))),
+                  LOCATION(RC_MARKET_TREASURE_CHEST_GAME_KEY_3,  logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 3)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)))),
+                  LOCATION(RC_MARKET_TREASURE_CHEST_GAME_ITEM_3, logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 3)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)))),
+                  LOCATION(RC_MARKET_TREASURE_CHEST_GAME_KEY_4,  logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 4)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)))),
+                  LOCATION(RC_MARKET_TREASURE_CHEST_GAME_ITEM_4, logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 4)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)))),
+                  LOCATION(RC_MARKET_TREASURE_CHEST_GAME_KEY_5,  logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 5)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)))),
+                  LOCATION(RC_MARKET_TREASURE_CHEST_GAME_ITEM_5, logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 5)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)))),
                 }, {
                   //Exits
                   Entrance(RR_THE_MARKET, {[]{return true;}}),
@@ -255,14 +254,14 @@ void AreaTable_Init_CastleTown() {
 
   areaTable[RR_MARKET_BOMBCHU_SHOP] = Area("Market Bombchu Shop", "Market Bombchu Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_MARKET_BOMBCHU_SHOP_ITEM_1, {[]{return true;}}),
-                  LocationAccess(RC_MARKET_BOMBCHU_SHOP_ITEM_2, {[]{return true;}}),
-                  LocationAccess(RC_MARKET_BOMBCHU_SHOP_ITEM_3, {[]{return true;}}),
-                  LocationAccess(RC_MARKET_BOMBCHU_SHOP_ITEM_4, {[]{return true;}}),
-                  LocationAccess(RC_MARKET_BOMBCHU_SHOP_ITEM_5, {[]{return true;}}),
-                  LocationAccess(RC_MARKET_BOMBCHU_SHOP_ITEM_6, {[]{return true;}}),
-                  LocationAccess(RC_MARKET_BOMBCHU_SHOP_ITEM_7, {[]{return true;}}),
-                  LocationAccess(RC_MARKET_BOMBCHU_SHOP_ITEM_8, {[]{return true;}}),
+                  LOCATION(RC_MARKET_BOMBCHU_SHOP_ITEM_1, true),
+                  LOCATION(RC_MARKET_BOMBCHU_SHOP_ITEM_2, true),
+                  LOCATION(RC_MARKET_BOMBCHU_SHOP_ITEM_3, true),
+                  LOCATION(RC_MARKET_BOMBCHU_SHOP_ITEM_4, true),
+                  LOCATION(RC_MARKET_BOMBCHU_SHOP_ITEM_5, true),
+                  LOCATION(RC_MARKET_BOMBCHU_SHOP_ITEM_6, true),
+                  LOCATION(RC_MARKET_BOMBCHU_SHOP_ITEM_7, true),
+                  LOCATION(RC_MARKET_BOMBCHU_SHOP_ITEM_8, true),
                 }, {
                   //Exits
                   Entrance(RR_MARKET_BACK_ALLEY, {[]{return true;}}),
@@ -270,7 +269,7 @@ void AreaTable_Init_CastleTown() {
 
   areaTable[RR_MARKET_DOG_LADY_HOUSE] = Area("Market Dog Lady House", "Market Dog Lady House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_MARKET_LOST_DOG, {[]{return logic->IsChild && logic->AtNight;}}),
+                  LOCATION(RC_MARKET_LOST_DOG, logic->IsChild && logic->AtNight),
                 }, {
                   //Exits
                   Entrance(RR_MARKET_BACK_ALLEY, {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
index e4a8fbb63..6627c2286 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
@@ -10,11 +10,11 @@ void AreaTable_Init_DeathMountain() {
                   EventAccess(&logic->BeanPlantFairy, {[]{return logic->BeanPlantFairy || (CanPlantBean(RR_DEATH_MOUNTAIN_TRAIL) && logic->CanUse(RG_SONG_OF_STORMS) && (logic->HasExplosives || logic->GoronBracelet));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_DMT_CHEST,                    {[]{return logic->CanBlastOrSmash || (randoCtx->GetTrickOption(RT_DMT_BOMBABLE) && logic->IsChild && logic->GoronBracelet);}}),
-                  LocationAccess(RC_DMT_FREESTANDING_POH,         {[]{return logic->CanTakeDamage || logic->CanUse(RG_HOVER_BOOTS) || (logic->IsAdult && CanPlantBean(RR_DEATH_MOUNTAIN_TRAIL) && (logic->HasExplosives || logic->GoronBracelet));}}),
-                  LocationAccess(RC_DMT_GS_BEAN_PATCH,            {[]{return logic->CanPlantBugs && (logic->HasExplosives || logic->GoronBracelet || (randoCtx->GetTrickOption(RT_DMT_SOIL_GS) && (logic->CanTakeDamage || logic->CanUse(RG_HOVER_BOOTS)) && logic->CanUse(RG_BOOMERANG)));}}),
-                  LocationAccess(RC_DMT_GS_NEAR_KAK,              {[]{return logic->CanBlastOrSmash;}}),
-                  LocationAccess(RC_DMT_GS_ABOVE_DODONGOS_CAVERN, {[]{return logic->IsAdult && logic->AtNight && (logic->CanUse(RG_MEGATON_HAMMER) || (randoCtx->GetTrickOption(RT_DMT_HOOKSHOT_LOWER_GS) && logic->CanUse(RG_HOOKSHOT)) || (randoCtx->GetTrickOption(RT_DMT_BEAN_LOWER_GS) && CanPlantBean(RR_DEATH_MOUNTAIN_TRAIL)) || (randoCtx->GetTrickOption(RT_DMT_HOVERS_LOWER_GS) && logic->CanUse(RG_HOVER_BOOTS)) || randoCtx->GetTrickOption(RT_DMT_JS_LOWER_GS)) && logic->CanGetNightTimeGS;}}),
+                  LOCATION(RC_DMT_CHEST,                    logic->CanBlastOrSmash || (randoCtx->GetTrickOption(RT_DMT_BOMBABLE) && logic->IsChild && logic->GoronBracelet)),
+                  LOCATION(RC_DMT_FREESTANDING_POH,         logic->CanTakeDamage || logic->CanUse(RG_HOVER_BOOTS) || (logic->IsAdult && CanPlantBean(RR_DEATH_MOUNTAIN_TRAIL) && (logic->HasExplosives || logic->GoronBracelet))),
+                  LOCATION(RC_DMT_GS_BEAN_PATCH,            logic->CanPlantBugs && (logic->HasExplosives || logic->GoronBracelet || (randoCtx->GetTrickOption(RT_DMT_SOIL_GS) && (logic->CanTakeDamage || logic->CanUse(RG_HOVER_BOOTS)) && logic->CanUse(RG_BOOMERANG)))),
+                  LOCATION(RC_DMT_GS_NEAR_KAK,              logic->CanBlastOrSmash),
+                  LOCATION(RC_DMT_GS_ABOVE_DODONGOS_CAVERN, logic->IsAdult && logic->AtNight && (logic->CanUse(RG_MEGATON_HAMMER) || (randoCtx->GetTrickOption(RT_DMT_HOOKSHOT_LOWER_GS) && logic->CanUse(RG_HOOKSHOT)) || (randoCtx->GetTrickOption(RT_DMT_BEAN_LOWER_GS) && CanPlantBean(RR_DEATH_MOUNTAIN_TRAIL)) || (randoCtx->GetTrickOption(RT_DMT_HOVERS_LOWER_GS) && logic->CanUse(RG_HOVER_BOOTS)) || randoCtx->GetTrickOption(RT_DMT_JS_LOWER_GS)) && logic->CanGetNightTimeGS),
                 }, {
                   //Exits
                   Entrance(RR_KAK_BEHIND_GATE,          {[]{return true;}}),
@@ -31,11 +31,11 @@ void AreaTable_Init_DeathMountain() {
                   EventAccess(&logic->BugRock,            {[]{return logic->BugRock            || logic->IsChild;}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_DMT_TRADE_BROKEN_SWORD,    {[]{return logic->IsAdult && logic->BrokenSword;}}),
-                  LocationAccess(RC_DMT_TRADE_EYEDROPS,        {[]{return logic->IsAdult && logic->Eyedrops;}}),
-                  LocationAccess(RC_DMT_TRADE_CLAIM_CHECK,     {[]{return logic->IsAdult && logic->ClaimCheck;}}),
-                  LocationAccess(RC_DMT_GS_FALLING_ROCKS_PATH, {[]{return logic->IsAdult && logic->AtNight && (logic->CanUse(RG_MEGATON_HAMMER) || randoCtx->GetTrickOption(RT_DMT_UPPER_GS)) && logic->CanGetNightTimeGS;}}),
-                  LocationAccess(RC_DMT_GOSSIP_STONE,          {[]{return true;}}),
+                  LOCATION(RC_DMT_TRADE_BROKEN_SWORD,    logic->IsAdult && logic->BrokenSword),
+                  LOCATION(RC_DMT_TRADE_EYEDROPS,        logic->IsAdult && logic->Eyedrops),
+                  LOCATION(RC_DMT_TRADE_CLAIM_CHECK,     logic->IsAdult && logic->ClaimCheck),
+                  LOCATION(RC_DMT_GS_FALLING_ROCKS_PATH, logic->IsAdult && logic->AtNight && (logic->CanUse(RG_MEGATON_HAMMER) || randoCtx->GetTrickOption(RT_DMT_UPPER_GS)) && logic->CanGetNightTimeGS),
+                  LOCATION(RC_DMT_GOSSIP_STONE,          true),
                 }, {
                   //Exits
                   Entrance(RR_DEATH_MOUNTAIN_TRAIL,     {[]{return true;}}),
@@ -52,8 +52,8 @@ void AreaTable_Init_DeathMountain() {
 
   areaTable[RR_DMT_COW_GROTTO] = Area("DMT Cow Grotto", "DMT Cow Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DMT_COW_GROTTO_COW,     {[]{return logic->CanUse(RG_EPONAS_SONG);}}),
-                  LocationAccess(RC_DMT_COW_GROTTO_BEEHIVE, {[]{return logic->CanBreakLowerBeehives;}}),
+                  LOCATION(RC_DMT_COW_GROTTO_COW,     logic->CanUse(RG_EPONAS_SONG)),
+                  LOCATION(RC_DMT_COW_GROTTO_BEEHIVE, logic->CanBreakLowerBeehives),
                 }, {
                   //Exits
                   Entrance(RR_DEATH_MOUNTAIN_SUMMIT, {[]{return true;}}),
@@ -62,11 +62,11 @@ void AreaTable_Init_DeathMountain() {
 
   areaTable[RR_DMT_STORMS_GROTTO] = Area("DMT Storms Grotto", "DMT Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
-                  LocationAccess(RC_DMT_STORMS_GROTTO_CHEST,         {[]{return true;}}),
-                  LocationAccess(RC_DMT_STORMS_GROTTO_FISH,          {[]{return logic->HasBottle;}}),
-                  LocationAccess(RC_DMT_STORMS_GROTTO_GOSSIP_STONE,  {[]{return true;}}),
-                  LocationAccess(RC_DMT_STORMS_GROTTO_BEEHIVE_LEFT,  {[]{return logic->CanBreakLowerBeehives;}}),
-                  LocationAccess(RC_DMT_STORMS_GROTTO_BEEHIVE_RIGHT, {[]{return logic->CanBreakLowerBeehives;}}),
+                  LOCATION(RC_DMT_STORMS_GROTTO_CHEST,         true),
+                  LOCATION(RC_DMT_STORMS_GROTTO_FISH,          logic->HasBottle),
+                  LOCATION(RC_DMT_STORMS_GROTTO_GOSSIP_STONE,  true),
+                  LOCATION(RC_DMT_STORMS_GROTTO_BEEHIVE_LEFT,  logic->CanBreakLowerBeehives),
+                  LOCATION(RC_DMT_STORMS_GROTTO_BEEHIVE_RIGHT, logic->CanBreakLowerBeehives),
                 }, {
                   //Exits
                   Entrance(RR_DEATH_MOUNTAIN_TRAIL, {[]{return true;}}),
@@ -74,7 +74,7 @@ void AreaTable_Init_DeathMountain() {
 
   areaTable[RR_DMT_GREAT_FAIRY_FOUNTAIN] = Area("DMT Great Fairy Fountain", "DMT Great Fairy Fountain", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DMT_GREAT_FAIRY_REWARD, {[]{return logic->CanUse(RG_ZELDAS_LULLABY);}}),
+                  LOCATION(RC_DMT_GREAT_FAIRY_REWARD, logic->CanUse(RG_ZELDAS_LULLABY)),
                 }, {
                   //Exits
                   Entrance(RR_DEATH_MOUNTAIN_SUMMIT, {[]{return true;}}),
@@ -91,17 +91,17 @@ void AreaTable_Init_DeathMountain() {
                   EventAccess(&logic->StopGCRollingGoronAsAdult, {[]{return logic->StopGCRollingGoronAsAdult || (logic->IsAdult && (logic->GoronBracelet || logic->HasExplosives || logic->Bow || (randoCtx->GetTrickOption(RT_GC_LINK_GORON_DINS) && logic->CanUse(RG_DINS_FIRE))));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_GC_MAZE_LEFT_CHEST,        {[]{return logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_SILVER_GAUNTLETS) || (randoCtx->GetTrickOption(RT_GC_LEFTMOST) && logic->HasExplosives && logic->CanUse(RG_HOVER_BOOTS));}}),
-                  LocationAccess(RC_GC_MAZE_CENTER_CHEST,      {[]{return logic->CanBlastOrSmash  || logic->CanUse(RG_SILVER_GAUNTLETS);}}),
-                  LocationAccess(RC_GC_MAZE_RIGHT_CHEST,       {[]{return logic->CanBlastOrSmash  || logic->CanUse(RG_SILVER_GAUNTLETS);}}),
-                  LocationAccess(RC_GC_POT_FREESTANDING_POH,   {[]{return logic->IsChild && logic->GoronCityChildFire && (logic->Bombs || (logic->GoronBracelet && randoCtx->GetTrickOption(RT_GC_POT_STRENGTH)) || (logic->HasBombchus && randoCtx->GetTrickOption(RT_GC_POT)));}}),
-                  LocationAccess(RC_GC_ROLLING_GORON_AS_CHILD, {[]{return logic->IsChild && (logic->HasExplosives || (logic->GoronBracelet && randoCtx->GetTrickOption(RT_GC_ROLLING_STRENGTH)));}}),
-                  LocationAccess(RC_GC_ROLLING_GORON_AS_ADULT, {[]{return logic->StopGCRollingGoronAsAdult;}}),
-                  LocationAccess(RC_GC_GS_BOULDER_MAZE,        {[]{return logic->IsChild && logic->CanBlastOrSmash;}}),
-                  LocationAccess(RC_GC_GS_CENTER_PLATFORM,     {[]{return logic->CanAdultAttack;}}),
-                  LocationAccess(RC_GC_MEDIGORON,              {[]{return logic->IsAdult && logic->AdultsWallet && (logic->CanBlastOrSmash || logic->GoronBracelet);}}),
-                  LocationAccess(RC_GC_MAZE_GOSSIP_STONE,      {[]{return logic->CanBlastOrSmash || logic->CanUse(RG_SILVER_GAUNTLETS);}}),
-                  LocationAccess(RC_GC_MEDIGORON_GOSSIP_STONE, {[]{return logic->CanBlastOrSmash || logic->GoronBracelet;}}),
+                  LOCATION(RC_GC_MAZE_LEFT_CHEST,        logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_SILVER_GAUNTLETS) || (randoCtx->GetTrickOption(RT_GC_LEFTMOST) && logic->HasExplosives && logic->CanUse(RG_HOVER_BOOTS))),
+                  LOCATION(RC_GC_MAZE_CENTER_CHEST,      logic->CanBlastOrSmash  || logic->CanUse(RG_SILVER_GAUNTLETS)),
+                  LOCATION(RC_GC_MAZE_RIGHT_CHEST,       logic->CanBlastOrSmash  || logic->CanUse(RG_SILVER_GAUNTLETS)),
+                  LOCATION(RC_GC_POT_FREESTANDING_POH,   logic->IsChild && logic->GoronCityChildFire && (logic->Bombs || (logic->GoronBracelet && randoCtx->GetTrickOption(RT_GC_POT_STRENGTH)) || (logic->HasBombchus && randoCtx->GetTrickOption(RT_GC_POT)))),
+                  LOCATION(RC_GC_ROLLING_GORON_AS_CHILD, logic->IsChild && (logic->HasExplosives || (logic->GoronBracelet && randoCtx->GetTrickOption(RT_GC_ROLLING_STRENGTH)))),
+                  LOCATION(RC_GC_ROLLING_GORON_AS_ADULT, logic->StopGCRollingGoronAsAdult),
+                  LOCATION(RC_GC_GS_BOULDER_MAZE,        logic->IsChild && logic->CanBlastOrSmash),
+                  LOCATION(RC_GC_GS_CENTER_PLATFORM,     logic->CanAdultAttack),
+                  LOCATION(RC_GC_MEDIGORON,              logic->IsAdult && logic->AdultsWallet && (logic->CanBlastOrSmash || logic->GoronBracelet)),
+                  LOCATION(RC_GC_MAZE_GOSSIP_STONE,      logic->CanBlastOrSmash || logic->CanUse(RG_SILVER_GAUNTLETS)),
+                  LOCATION(RC_GC_MEDIGORON_GOSSIP_STONE, logic->CanBlastOrSmash || logic->GoronBracelet),
                 }, {
                   //Exits
                   Entrance(RR_DEATH_MOUNTAIN_TRAIL, {[]{return true;}}),
@@ -125,7 +125,7 @@ void AreaTable_Init_DeathMountain() {
                   EventAccess(&logic->GoronCityChildFire, {[]{return logic->GoronCityChildFire || (logic->IsChild && logic->CanUse(RG_STICKS));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_GC_DARUNIAS_JOY, {[]{return logic->IsChild && logic->CanUse(RG_SARIAS_SONG);}}),
+                  LOCATION(RC_GC_DARUNIAS_JOY, logic->IsChild && logic->CanUse(RG_SARIAS_SONG)),
                 }, {
                   //Exits
                   Entrance(RR_GORON_CITY,      {[]{return true;}}),
@@ -140,14 +140,14 @@ void AreaTable_Init_DeathMountain() {
 
   areaTable[RR_GC_SHOP] = Area("GC Shop", "GC Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_GC_SHOP_ITEM_1, {[]{return true;}}),
-                  LocationAccess(RC_GC_SHOP_ITEM_2, {[]{return true;}}),
-                  LocationAccess(RC_GC_SHOP_ITEM_3, {[]{return true;}}),
-                  LocationAccess(RC_GC_SHOP_ITEM_4, {[]{return true;}}),
-                  LocationAccess(RC_GC_SHOP_ITEM_5, {[]{return true;}}),
-                  LocationAccess(RC_GC_SHOP_ITEM_6, {[]{return true;}}),
-                  LocationAccess(RC_GC_SHOP_ITEM_7, {[]{return true;}}),
-                  LocationAccess(RC_GC_SHOP_ITEM_8, {[]{return true;}}),
+                  LOCATION(RC_GC_SHOP_ITEM_1, true),
+                  LOCATION(RC_GC_SHOP_ITEM_2, true),
+                  LOCATION(RC_GC_SHOP_ITEM_3, true),
+                  LOCATION(RC_GC_SHOP_ITEM_4, true),
+                  LOCATION(RC_GC_SHOP_ITEM_5, true),
+                  LOCATION(RC_GC_SHOP_ITEM_6, true),
+                  LOCATION(RC_GC_SHOP_ITEM_7, true),
+                  LOCATION(RC_GC_SHOP_ITEM_8, true),
                 }, {
                   //Exits
                   Entrance(RR_GORON_CITY, {[]{return true;}}),
@@ -155,10 +155,10 @@ void AreaTable_Init_DeathMountain() {
 
   areaTable[RR_GC_GROTTO] = Area("GC Grotto", "GC Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_GC_DEKU_SCRUB_GROTTO_LEFT,   {[]{return logic->CanStunDeku;}}),
-                  LocationAccess(RC_GC_DEKU_SCRUB_GROTTO_RIGHT,  {[]{return logic->CanStunDeku;}}),
-                  LocationAccess(RC_GC_DEKU_SCRUB_GROTTO_CENTER, {[]{return logic->CanStunDeku;}}),
-                  LocationAccess(RC_GC_GROTTO_BEEHIVE,           {[]{return logic->CanBreakUpperBeehives;}}),
+                  LOCATION(RC_GC_DEKU_SCRUB_GROTTO_LEFT,   logic->CanStunDeku),
+                  LOCATION(RC_GC_DEKU_SCRUB_GROTTO_RIGHT,  logic->CanStunDeku),
+                  LOCATION(RC_GC_DEKU_SCRUB_GROTTO_CENTER, logic->CanStunDeku),
+                  LOCATION(RC_GC_GROTTO_BEEHIVE,           logic->CanBreakUpperBeehives),
                 }, {
                   //Exits
                   Entrance(RR_GC_GROTTO_PLATFORM, {[]{return true;}}),
@@ -176,9 +176,9 @@ void AreaTable_Init_DeathMountain() {
                   EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || (logic->HasExplosives && logic->CanSummonGossipFairyWithoutSuns && (logic->FireTimer >= 16 || logic->Hearts >= 3));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_DMC_WALL_FREESTANDING_POH, {[]{return logic->FireTimer >= 16 || logic->Hearts >= 3;}}),
-                  LocationAccess(RC_DMC_GS_CRATE,              {[]{return (logic->FireTimer >= 8 || logic->Hearts >= 3) && logic->IsChild && logic->CanChildAttack;}}),
-                  LocationAccess(RC_DMC_GOSSIP_STONE,          {[]{return logic->HasExplosives && (logic->FireTimer >= 16 || logic->Hearts >= 3);}}),
+                  LOCATION(RC_DMC_WALL_FREESTANDING_POH, logic->FireTimer >= 16 || logic->Hearts >= 3),
+                  LOCATION(RC_DMC_GS_CRATE,              (logic->FireTimer >= 8 || logic->Hearts >= 3) && logic->IsChild && logic->CanChildAttack),
+                  LOCATION(RC_DMC_GOSSIP_STONE,          logic->HasExplosives && (logic->FireTimer >= 16 || logic->Hearts >= 3)),
                 }, {
                   //Exits
                   Entrance(RR_DMC_UPPER_NEARBY,         {[]{return true;}}),
@@ -189,7 +189,7 @@ void AreaTable_Init_DeathMountain() {
 
   areaTable[RR_DMC_LADDER_AREA_NEARBY] = Area("DMC Ladder Area Nearby", "Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DMC_DEKU_SCRUB, {[]{return logic->IsChild && logic->CanStunDeku;}}),
+                  LOCATION(RC_DMC_DEKU_SCRUB, logic->IsChild && logic->CanStunDeku),
                 }, {
                   //Exits
                   Entrance(RR_DMC_UPPER_NEARBY, {[]{return logic->Hearts >= 3;}}),
@@ -214,8 +214,8 @@ void AreaTable_Init_DeathMountain() {
 
   areaTable[RR_DMC_CENTRAL_NEARBY] = Area("DMC Central Nearby", "Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DMC_VOLCANO_FREESTANDING_POH, {[]{return logic->IsAdult && logic->Hearts >= 3 && (CanPlantBean(RR_DMC_CENTRAL_LOCAL) || (randoCtx->GetTrickOption(RT_DMC_HOVER_BEAN_POH) && logic->HoverBoots));}}),
-                  LocationAccess(RC_SHEIK_IN_CRATER,              {[]{return logic->IsAdult && (logic->FireTimer >= 8 || logic->Hearts >= 3);}}),
+                  LOCATION(RC_DMC_VOLCANO_FREESTANDING_POH, logic->IsAdult && logic->Hearts >= 3 && (CanPlantBean(RR_DMC_CENTRAL_LOCAL) || (randoCtx->GetTrickOption(RT_DMC_HOVER_BEAN_POH) && logic->HoverBoots))),
+                  LOCATION(RC_SHEIK_IN_CRATER,              logic->IsAdult && (logic->FireTimer >= 8 || logic->Hearts >= 3)),
                 }, {
                   //Exits
                   Entrance(RR_DMC_CENTRAL_LOCAL, {[]{return logic->FireTimer >= 48;}}),
@@ -226,7 +226,7 @@ void AreaTable_Init_DeathMountain() {
                   EventAccess(&logic->BeanPlantFairy, {[]{return logic->BeanPlantFairy || (CanPlantBean(RR_DMC_CENTRAL_LOCAL) && logic->CanUse(RG_SONG_OF_STORMS));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_DMC_GS_BEAN_PATCH, {[]{return (logic->FireTimer >= 8 || logic->Hearts >= 3) && logic->CanPlantBugs && logic->CanChildAttack;}}),
+                  LOCATION(RC_DMC_GS_BEAN_PATCH, (logic->FireTimer >= 8 || logic->Hearts >= 3) && logic->CanPlantBugs && logic->CanChildAttack),
                 }, {
                   //Exits
                   Entrance(RR_DMC_CENTRAL_NEARBY,   {[]{return true;}}),
@@ -237,7 +237,7 @@ void AreaTable_Init_DeathMountain() {
 
   areaTable[RR_DMC_GREAT_FAIRY_FOUNTAIN] = Area("DMC Great Fairy Fountain", "DMC Great Fairy Fountain", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DMC_GREAT_FAIRY_REWARD, {[]{return logic->CanUse(RG_ZELDAS_LULLABY);}}),
+                  LOCATION(RC_DMC_GREAT_FAIRY_REWARD, logic->CanUse(RG_ZELDAS_LULLABY)),
                 }, {
                   //Exits
                   Entrance(RR_DMC_LOWER_LOCAL, {[]{return true;}}),
@@ -245,11 +245,11 @@ void AreaTable_Init_DeathMountain() {
 
   areaTable[RR_DMC_UPPER_GROTTO] = Area("DMC Upper Grotto", "DMC Upper Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
-                  LocationAccess(RC_DMC_UPPER_GROTTO_CHEST,         {[]{return true;}}),
-                  LocationAccess(RC_DMC_UPPER_GROTTO_FISH,          {[]{return logic->HasBottle;}}),
-                  LocationAccess(RC_DMC_UPPER_GROTTO_GOSSIP_STONE,  {[]{return true;}}),
-                  LocationAccess(RC_DMC_UPPER_GROTTO_BEEHIVE_LEFT,  {[]{return logic->CanBreakLowerBeehives;}}),
-                  LocationAccess(RC_DMC_UPPER_GROTTO_BEEHIVE_RIGHT, {[]{return logic->CanBreakLowerBeehives;}}),
+                  LOCATION(RC_DMC_UPPER_GROTTO_CHEST,         true),
+                  LOCATION(RC_DMC_UPPER_GROTTO_FISH,          logic->HasBottle),
+                  LOCATION(RC_DMC_UPPER_GROTTO_GOSSIP_STONE,  true),
+                  LOCATION(RC_DMC_UPPER_GROTTO_BEEHIVE_LEFT,  logic->CanBreakLowerBeehives),
+                  LOCATION(RC_DMC_UPPER_GROTTO_BEEHIVE_RIGHT, logic->CanBreakLowerBeehives),
                 }, {
                   //Exits
                   Entrance(RR_DMC_UPPER_LOCAL, {[]{return true;}}),
@@ -257,10 +257,10 @@ void AreaTable_Init_DeathMountain() {
 
   areaTable[RR_DMC_HAMMER_GROTTO] = Area("DMC Hammer Grotto", "DMC Hammer Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DMC_DEKU_SCRUB_GROTTO_LEFT,   {[]{return logic->CanStunDeku;}}),
-                  LocationAccess(RC_DMC_DEKU_SCRUB_GROTTO_RIGHT,  {[]{return logic->CanStunDeku;}}),
-                  LocationAccess(RC_DMC_DEKU_SCRUB_GROTTO_CENTER, {[]{return logic->CanStunDeku;}}),
-                  LocationAccess(RC_DMC_HAMMER_GROTTO_BEEHIVE,    {[]{return logic->CanBreakUpperBeehives;}}),
+                  LOCATION(RC_DMC_DEKU_SCRUB_GROTTO_LEFT,   logic->CanStunDeku),
+                  LOCATION(RC_DMC_DEKU_SCRUB_GROTTO_RIGHT,  logic->CanStunDeku),
+                  LOCATION(RC_DMC_DEKU_SCRUB_GROTTO_CENTER, logic->CanStunDeku),
+                  LOCATION(RC_DMC_HAMMER_GROTTO_BEEHIVE,    logic->CanBreakUpperBeehives),
                 }, {
                   //Exits
                   Entrance(RR_DMC_LOWER_LOCAL, {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp
index 39654e63e..dd7c665f7 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp
@@ -25,7 +25,7 @@ void AreaTable_Init_DekuTree() {
                   EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUse(RG_DINS_FIRE));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_DEKU_TREE_MAP_CHEST, {[]{return true;}}),
+                  LOCATION(RC_DEKU_TREE_MAP_CHEST, true),
                 }, {
                   //Exits
                   Entrance(RR_DEKU_TREE_ENTRYWAY,          {[]{return true;}}),
@@ -44,8 +44,8 @@ void AreaTable_Init_DekuTree() {
 
   areaTable[RR_DEKU_TREE_SLINGSHOT_ROOM] = Area("Deku Tree Slingshot Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DEKU_TREE_SLINGSHOT_CHEST,           {[]{return true;}}),
-                  LocationAccess(RC_DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST, {[]{return true;}}),
+                  LOCATION(RC_DEKU_TREE_SLINGSHOT_CHEST,           true),
+                  LOCATION(RC_DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST, true),
                 }, {
                   //Exits
                   Entrance(RR_DEKU_TREE_2F_MIDDLE_ROOM, {[]{return logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_HOVER_BOOTS);}}),
@@ -57,9 +57,9 @@ void AreaTable_Init_DekuTree() {
                   EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUse(RG_DINS_FIRE));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_DEKU_TREE_COMPASS_CHEST,           {[]{return true;}}),
-                  LocationAccess(RC_DEKU_TREE_COMPASS_ROOM_SIDE_CHEST, {[]{return true;}}),
-                  LocationAccess(RC_DEKU_TREE_GS_COMPASS_ROOM,         {[]{return logic->CanAdultAttack || logic->CanChildAttack;}}),
+                  LOCATION(RC_DEKU_TREE_COMPASS_CHEST,           true),
+                  LOCATION(RC_DEKU_TREE_COMPASS_ROOM_SIDE_CHEST, true),
+                  LOCATION(RC_DEKU_TREE_GS_COMPASS_ROOM,         logic->CanAdultAttack || logic->CanChildAttack),
                 }, {
                   //Exits
                   Entrance(RR_DEKU_TREE_LOBBY,     {[]{return logic->HasFireSourceWithTorch || logic->CanUse(RG_FAIRY_BOW);}}),
@@ -73,9 +73,9 @@ void AreaTable_Init_DekuTree() {
                                     /*Glitched*/[]{return logic->CanUse(RG_MEGATON_HAMMER);}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_DEKU_TREE_BASEMENT_CHEST,    {[]{return true;}}),
-                  LocationAccess(RC_DEKU_TREE_GS_BASEMENT_GATE,  {[]{return logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG) || logic->HasExplosives || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_DINS_FIRE);}}),
-                  LocationAccess(RC_DEKU_TREE_GS_BASEMENT_VINES, {[]{return logic->CanUseProjectile || logic->CanUse(RG_DINS_FIRE) || (randoCtx->GetTrickOption(RT_DEKU_MQ_COMPASS_GS) && logic->CanJumpslash);}}),
+                  LOCATION(RC_DEKU_TREE_BASEMENT_CHEST,    true),
+                  LOCATION(RC_DEKU_TREE_GS_BASEMENT_GATE,  logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG) || logic->HasExplosives || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_DINS_FIRE)),
+                  LOCATION(RC_DEKU_TREE_GS_BASEMENT_VINES, logic->CanUseProjectile || logic->CanUse(RG_DINS_FIRE) || (randoCtx->GetTrickOption(RT_DEKU_MQ_COMPASS_GS) && logic->CanJumpslash)),
                 }, {
                   //Exits
                   Entrance(RR_DEKU_TREE_LOBBY,               {[]{return true;}}),
@@ -127,7 +127,7 @@ void AreaTable_Init_DekuTree() {
 
   areaTable[RR_DEKU_TREE_BASEMENT_BACK_ROOM] = Area("Deku Tree Basement Back Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DEKU_TREE_GS_BASEMENT_BACK_ROOM, {[]{return logic->HookshotOrBoomerang;}}),
+                  LOCATION(RC_DEKU_TREE_GS_BASEMENT_BACK_ROOM, logic->HookshotOrBoomerang),
                 }, {
                   //Exits
                   Entrance(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, {[]{return true;}}),
@@ -161,11 +161,11 @@ void AreaTable_Init_DekuTree() {
                   EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUse(RG_DINS_FIRE));}}),
   }, {
                   //Locations
-                  LocationAccess(RC_DEKU_TREE_MQ_MAP_CHEST,                 {[]{return true;}}),
-                  LocationAccess(RC_DEKU_TREE_MQ_SLINGSHOT_CHEST,           {[]{return logic->CanAdultAttack || logic->CanChildAttack;}}),
-                  LocationAccess(RC_DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST, {[]{return logic->HasFireSourceWithTorch || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW));}}),
-                  LocationAccess(RC_DEKU_TREE_MQ_BASEMENT_CHEST,            {[]{return logic->HasFireSourceWithTorch || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW));}}),
-                  LocationAccess(RC_DEKU_TREE_MQ_GS_LOBBY,                  {[]{return logic->CanAdultAttack || logic->CanChildAttack;}}),
+                  LOCATION(RC_DEKU_TREE_MQ_MAP_CHEST,                 true),
+                  LOCATION(RC_DEKU_TREE_MQ_SLINGSHOT_CHEST,           logic->CanAdultAttack || logic->CanChildAttack),
+                  LOCATION(RC_DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST, logic->HasFireSourceWithTorch || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW))),
+                  LOCATION(RC_DEKU_TREE_MQ_BASEMENT_CHEST,            logic->HasFireSourceWithTorch || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW))),
+                  LOCATION(RC_DEKU_TREE_MQ_GS_LOBBY,                  logic->CanAdultAttack || logic->CanChildAttack),
   }, {
                   //Exits
                   Entrance(RR_DEKU_TREE_ENTRYWAY,                     {[]{return true;}}),
@@ -178,11 +178,11 @@ void AreaTable_Init_DekuTree() {
 
   areaTable[RR_DEKU_TREE_MQ_COMPASS_ROOM] = Area("Deku Tree MQ Compass Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DEKU_TREE_MQ_COMPASS_CHEST,   {[]{return true;}}),
-                  LocationAccess(RC_DEKU_TREE_MQ_GS_COMPASS_ROOM, {[]{return logic->HookshotOrBoomerang &&
+                  LOCATION(RC_DEKU_TREE_MQ_COMPASS_CHEST,   true),
+                  LOCATION(RC_DEKU_TREE_MQ_GS_COMPASS_ROOM, logic->HookshotOrBoomerang &&
                                                                                Here(RR_DEKU_TREE_MQ_COMPASS_ROOM, []{return logic->HasBombchus ||
                                                                                (logic->Bombs && (logic->CanUse(RG_SONG_OF_TIME) || logic->IsAdult)) ||
-                                                                               (logic->IsAdult && logic->CanUse(RG_MEGATON_HAMMER) && (logic->CanUse(RG_SONG_OF_TIME) || randoCtx->GetTrickOption(RT_DEKU_MQ_COMPASS_GS)));});}}),
+                                                                               (logic->IsAdult && logic->CanUse(RG_MEGATON_HAMMER) && (logic->CanUse(RG_SONG_OF_TIME) || randoCtx->GetTrickOption(RT_DEKU_MQ_COMPASS_GS)));})),
   }, {
                   //Exits
                   Entrance(RR_DEKU_TREE_MQ_LOBBY, {[]{return true;}}),
@@ -190,7 +190,7 @@ void AreaTable_Init_DekuTree() {
 
   areaTable[RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_FRONT] = Area("Deku Tree MQ Basement Water Room Front", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST, {[]{return true;}}),
+                  LOCATION(RC_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST, true),
   }, {
                   //Exits
                   Entrance(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK, {[]{return randoCtx->GetTrickOption(RT_DEKU_MQ_LOG) ||  (logic->IsChild && (logic->DekuShield || logic->HylianShield)) ||
@@ -200,7 +200,7 @@ void AreaTable_Init_DekuTree() {
 
   areaTable[RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK] = Area("Deku Tree MQ Basement Water Room Back", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST, {[]{return logic->CanUse(RG_SONG_OF_TIME);}}),
+                  LOCATION(RC_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST, logic->CanUse(RG_SONG_OF_TIME)),
   }, {
                   //Exits
                   Entrance(RR_DEKU_TREE_MQ_BASEMENT_BACK_ROOM,        {[]{return Here(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK, []{return (logic->IsChild && logic->CanUse(RG_STICKS)) || logic->CanUse(RG_DINS_FIRE) ||
@@ -212,8 +212,8 @@ void AreaTable_Init_DekuTree() {
 
   areaTable[RR_DEKU_TREE_MQ_BASEMENT_BACK_ROOM] = Area("Deku Tree MQ Basement Back Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM, {[]{return (logic->IsAdult && logic->CanUse(RG_LONGSHOT)) || (logic->CanUse(RG_SONG_OF_TIME) && logic->HookshotOrBoomerang);}}),
-                  LocationAccess(RC_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM,   {[]{return logic->HasFireSourceWithTorch && logic->HookshotOrBoomerang;}}),
+                  LOCATION(RC_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM, (logic->IsAdult && logic->CanUse(RG_LONGSHOT)) || (logic->CanUse(RG_SONG_OF_TIME) && logic->HookshotOrBoomerang)),
+                  LOCATION(RC_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM,   logic->HasFireSourceWithTorch && logic->HookshotOrBoomerang),
   }, {
                   //Exits
                   Entrance(RR_DEKU_TREE_MQ_BASEMENT_LEDGE,           {[]{return logic->IsChild;}}),
@@ -222,7 +222,7 @@ void AreaTable_Init_DekuTree() {
 
   areaTable[RR_DEKU_TREE_MQ_BASEMENT_LEDGE] = Area("Deku Tree MQ Basement Ledge", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DEKU_TREE_MQ_DEKU_SCRUB, {[]{return logic->CanStunDeku;}}),
+                  LOCATION(RC_DEKU_TREE_MQ_DEKU_SCRUB, logic->CanStunDeku),
   }, {
                   //Exits
                   Entrance(RR_DEKU_TREE_MQ_BASEMENT_BACK_ROOM, {[]{return logic->IsChild;}}),
@@ -264,8 +264,8 @@ void AreaTable_Init_DekuTree() {
              },
              {
                  // Locations
-                 LocationAccess(RC_QUEEN_GOHMA, { [] { return logic->DekuTreeClear; } }),
-                 LocationAccess(RC_DEKU_TREE_QUEEN_GOHMA_HEART, { [] { return logic->DekuTreeClear; } }),
+                 LOCATION(RC_QUEEN_GOHMA, logic->DekuTreeClear),
+                 LOCATION(RC_DEKU_TREE_QUEEN_GOHMA_HEART, logic->DekuTreeClear),
              },
              {
                  // Exits
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp
index 9c7202b68..7cb2dbf0a 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp
@@ -30,9 +30,9 @@ void AreaTable_Init_DodongosCavern() {
                   EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || (logic->CanSummonGossipFairy && Here(RR_DODONGOS_CAVERN_LOBBY, []{return logic->CanBlastOrSmash || logic->GoronBracelet;}));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_DODONGOS_CAVERN_MAP_CHEST,        {[]{return Here(RR_DODONGOS_CAVERN_LOBBY, []{return logic->CanBlastOrSmash || logic->GoronBracelet;});}}),
-                  LocationAccess(RC_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY, {[]{return logic->CanStunDeku || logic->GoronBracelet;}}),
-                  LocationAccess(RC_DODONGOS_CAVERN_GOSSIP_STONE,     {[]{return Here(RR_DODONGOS_CAVERN_LOBBY, []{return logic->CanBlastOrSmash || logic->GoronBracelet;});}}),
+                  LOCATION(RC_DODONGOS_CAVERN_MAP_CHEST,        Here(RR_DODONGOS_CAVERN_LOBBY, []{return logic->CanBlastOrSmash || logic->GoronBracelet;})),
+                  LOCATION(RC_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY, logic->CanStunDeku || logic->GoronBracelet),
+                  LOCATION(RC_DODONGOS_CAVERN_GOSSIP_STONE,     Here(RR_DODONGOS_CAVERN_LOBBY, []{return logic->CanBlastOrSmash || logic->GoronBracelet;})),
                 }, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_BEGINNING,    {[]{return true;}}),
@@ -52,7 +52,7 @@ void AreaTable_Init_DodongosCavern() {
 
   areaTable[RR_DODONGOS_CAVERN_SE_CORRIDOR] = Area("Dodongos Cavern SE Corridor", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DODONGOS_CAVERN_GS_SCARECROW, {[]{return logic->CanUse(RG_SCARECROW) || (logic->IsAdult && logic->CanUse(RG_LONGSHOT)) || (randoCtx->GetTrickOption(RT_DC_SCARECROW_GS) && (logic->CanAdultAttack || logic->CanChildAttack));}}),
+                  LOCATION(RC_DODONGOS_CAVERN_GS_SCARECROW, logic->CanUse(RG_SCARECROW) || (logic->IsAdult && logic->CanUse(RG_LONGSHOT)) || (randoCtx->GetTrickOption(RT_DC_SCARECROW_GS) && (logic->CanAdultAttack || logic->CanChildAttack))),
                 }, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_LOBBY,               {[]{return true;}}),
@@ -62,7 +62,7 @@ void AreaTable_Init_DodongosCavern() {
 
   areaTable[RR_DODONGOS_CAVERN_SE_ROOM] = Area("Dodongos Cavern SE Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS, {[]{return logic->CanAdultAttack || logic->CanChildAttack;}}),
+                  LOCATION(RC_DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS, logic->CanAdultAttack || logic->CanChildAttack),
                 }, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_SE_CORRIDOR, {[]{return true;}}),
@@ -91,7 +91,7 @@ void AreaTable_Init_DodongosCavern() {
 
   areaTable[RR_DODONGOS_CAVERN_NEAR_DODONGO_ROOM] = Area("Dodongos Cavern Near Dodongo Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS, {[]{return logic->CanStunDeku;}}),
+                  LOCATION(RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS, logic->CanStunDeku),
                 }, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_DODONGO_ROOM, {[]{return true;}}),
@@ -106,8 +106,8 @@ void AreaTable_Init_DodongosCavern() {
 
   areaTable[RR_DODONGOS_CAVERN_STAIRS_UPPER] = Area("Dodongos Cavern Stairs Upper", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS, {[]{return Here(RR_DODONGOS_CAVERN_FAR_BRIDGE, []{return logic->HookshotOrBoomerang;}) || logic->CanUse(RG_LONGSHOT);}}),
-                  LocationAccess(RC_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS,  {[]{return logic->IsAdult || logic->CanChildAttack || (HasAccessTo(RR_DODONGOS_CAVERN_STAIRS_LOWER) && logic->CanUse(RG_LONGSHOT) && randoCtx->GetTrickOption(RT_DC_VINES_GS));}}),
+                  LOCATION(RC_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS, Here(RR_DODONGOS_CAVERN_FAR_BRIDGE, []{return logic->HookshotOrBoomerang;}) || logic->CanUse(RG_LONGSHOT)),
+                  LOCATION(RC_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS,  logic->IsAdult || logic->CanChildAttack || (HasAccessTo(RR_DODONGOS_CAVERN_STAIRS_LOWER) && logic->CanUse(RG_LONGSHOT) && randoCtx->GetTrickOption(RT_DC_VINES_GS))),
                 }, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_STAIRS_LOWER, {[]{return true;}}),
@@ -116,7 +116,7 @@ void AreaTable_Init_DodongosCavern() {
 
   areaTable[RR_DODONGOS_CAVERN_COMPASS_ROOM] = Area("Dodongos Cavern Compass Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DODONGOS_CAVERN_COMPASS_CHEST, {[]{return true;}}),
+                  LOCATION(RC_DODONGOS_CAVERN_COMPASS_CHEST, true),
                 }, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_STAIRS_LOWER, {[]{return logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->GoronBracelet;}}),
@@ -130,7 +130,7 @@ void AreaTable_Init_DodongosCavern() {
 
   areaTable[RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER] = Area("Dodongos Cavern Bomb Room Lower", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST, {[]{return true;}}),
+                  LOCATION(RC_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST, true),
                 }, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_2F_SIDE_ROOM,         {[]{return Here(RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER, []{return logic->CanBlastOrSmash || (randoCtx->GetTrickOption(RT_DC_SCRUB_ROOM) && logic->GoronBracelet);});}}),
@@ -140,8 +140,8 @@ void AreaTable_Init_DodongosCavern() {
 
   areaTable[RR_DODONGOS_CAVERN_2F_SIDE_ROOM] = Area("Dodongos Cavern 2F Side Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,  {[]{return logic->CanStunDeku;}}),
-                  LocationAccess(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT, {[]{return logic->CanStunDeku;}}),
+                  LOCATION(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,  logic->CanStunDeku),
+                  LOCATION(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT, logic->CanStunDeku),
                 }, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER, {[]{return true;}}),
@@ -170,7 +170,7 @@ void AreaTable_Init_DodongosCavern() {
 
   areaTable[RR_DODONGOS_CAVERN_BOMB_ROOM_UPPER] = Area("Dodongos Cavern Bomb Room Upper", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DODONGOS_CAVERN_BOMB_BAG_CHEST, {[]{return true;}}),
+                  LOCATION(RC_DODONGOS_CAVERN_BOMB_BAG_CHEST, true),
                 }, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER,       {[]{return true;}}),
@@ -180,7 +180,7 @@ void AreaTable_Init_DodongosCavern() {
 
   areaTable[RR_DODONGOS_CAVERN_FAR_BRIDGE] = Area("Dodongos Cavern Far Bridge", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST, {[]{return Here(RR_DODONGOS_CAVERN_FAR_BRIDGE, []{return logic->CanBlastOrSmash;});}}),
+                  LOCATION(RC_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST, Here(RR_DODONGOS_CAVERN_FAR_BRIDGE, []{return logic->CanBlastOrSmash;})),
                 }, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_LOBBY,           {[]{return true;}}),
@@ -199,7 +199,7 @@ void AreaTable_Init_DodongosCavern() {
 
   areaTable[RR_DODONGOS_CAVERN_BACK_ROOM] = Area("Dodongos Cavern Back Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DODONGOS_CAVERN_GS_BACK_ROOM, {[]{return logic->CanAdultAttack || logic->CanChildAttack;}}),
+                  LOCATION(RC_DODONGOS_CAVERN_GS_BACK_ROOM, logic->CanAdultAttack || logic->CanChildAttack),
                 }, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_BOSS_AREA, {[]{return true;}}),
@@ -222,17 +222,17 @@ void AreaTable_Init_DodongosCavern() {
                   EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CanSummonGossipFairy;}}),
   }, {
                   //Locations
-                  LocationAccess(RC_DODONGOS_CAVERN_MQ_MAP_CHEST,                  {[]{return true;}}),
-                  LocationAccess(RC_DODONGOS_CAVERN_MQ_COMPASS_CHEST,              {[]{return logic->CanAdultAttack || logic->CanChildAttack || logic->Nuts;}}),
-                  LocationAccess(RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST,          {[]{return (logic->IsChild && logic->CanUse(RG_STICKS)) || logic->HasFireSource;}}),
-                  LocationAccess(RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST,    {[]{return logic->CanBlastOrSmash || (logic->IsChild && logic->CanUse(RG_STICKS)) || logic->CanUse(RG_DINS_FIRE) || (logic->IsAdult && (randoCtx->GetTrickOption(RT_DC_JUMP) || logic->HoverBoots || logic->Hookshot));}}),
-                  LocationAccess(RC_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM, {[]{return logic->CanUse(RG_SONG_OF_TIME) && (logic->CanChildAttack || logic->CanAdultAttack);}}),
-                  LocationAccess(RC_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM,             {[]{return (logic->IsChild && logic->CanUse(RG_STICKS)) || logic->HasFireSource;}}),
-                  LocationAccess(RC_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM,           {[]{return logic->CanBlastOrSmash;}}),
-                  LocationAccess(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,      {[]{return logic->CanStunDeku;}}),
-                  LocationAccess(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT,     {[]{return logic->CanStunDeku;}}),
-                  LocationAccess(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,       {[]{return logic->CanStunDeku;}}),
-                  LocationAccess(RC_DODONGOS_CAVERN_GOSSIP_STONE,                  {[]{return true;}}),
+                  LOCATION(RC_DODONGOS_CAVERN_MQ_MAP_CHEST,                  true),
+                  LOCATION(RC_DODONGOS_CAVERN_MQ_COMPASS_CHEST,              logic->CanAdultAttack || logic->CanChildAttack || logic->Nuts),
+                  LOCATION(RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST,          (logic->IsChild && logic->CanUse(RG_STICKS)) || logic->HasFireSource),
+                  LOCATION(RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST,    logic->CanBlastOrSmash || (logic->IsChild && logic->CanUse(RG_STICKS)) || logic->CanUse(RG_DINS_FIRE) || (logic->IsAdult && (randoCtx->GetTrickOption(RT_DC_JUMP) || logic->HoverBoots || logic->Hookshot))),
+                  LOCATION(RC_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM, logic->CanUse(RG_SONG_OF_TIME) && (logic->CanChildAttack || logic->CanAdultAttack)),
+                  LOCATION(RC_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM,             (logic->IsChild && logic->CanUse(RG_STICKS)) || logic->HasFireSource),
+                  LOCATION(RC_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM,           logic->CanBlastOrSmash),
+                  LOCATION(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,      logic->CanStunDeku),
+                  LOCATION(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT,     logic->CanStunDeku),
+                  LOCATION(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,       logic->CanStunDeku),
+                  LOCATION(RC_DODONGOS_CAVERN_GOSSIP_STONE,                  true),
   }, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE,  {[]{return Here(RR_DODONGOS_CAVERN_MQ_LOBBY, []{return logic->CanBlastOrSmash || (((logic->IsChild && logic->CanUse(RG_STICKS)) || logic->CanUse(RG_DINS_FIRE)) && logic->CanTakeDamage);});}}),
@@ -244,7 +244,7 @@ void AreaTable_Init_DodongosCavern() {
 
   areaTable[RR_DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE] = Area("Dodongos Cavern MQ Lower Right Side", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS, {[]{return logic->CanStunDeku;}}),
+                  LOCATION(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS, logic->CanStunDeku),
   }, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_MQ_BOMB_BAG_AREA, {[]{return (Here(RR_DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE, []{return logic->IsAdult && logic->CanUse(RG_FAIRY_BOW);}) || logic->GoronBracelet ||
@@ -254,8 +254,8 @@ void AreaTable_Init_DodongosCavern() {
 
   areaTable[RR_DODONGOS_CAVERN_MQ_BOMB_BAG_AREA] = Area("Dodongos Cavern MQ Bomb Bag Area", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST, {[]{return true;}}),
-                  LocationAccess(RC_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM,  {[]{return (Here(RR_DODONGOS_CAVERN_MQ_BOMB_BAG_AREA, []{return logic->IsAdult && logic->CanUse(RG_FAIRY_BOW);}) ||  logic->GoronBracelet || logic->CanUse(RG_DINS_FIRE) || logic->HasExplosives) && logic->HookshotOrBoomerang;}}),
+                  LOCATION(RC_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST, true),
+                  LOCATION(RC_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM,  (Here(RR_DODONGOS_CAVERN_MQ_BOMB_BAG_AREA, []{return logic->IsAdult && logic->CanUse(RG_FAIRY_BOW);}) ||  logic->GoronBracelet || logic->CanUse(RG_DINS_FIRE) || logic->HasExplosives) && logic->HookshotOrBoomerang),
   }, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE, {[]{return true;}}),
@@ -266,8 +266,8 @@ void AreaTable_Init_DodongosCavern() {
                   EventAccess(&logic->FairyPot,            {[]{return true;}}),
   }, {
                   //Locations
-                  LocationAccess(RC_DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST, {[]{return true;}}),
-                  LocationAccess(RC_DODONGOS_CAVERN_MQ_GS_BACK_AREA,      {[]{return true;}}),
+                  LOCATION(RC_DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST, true),
+                  LOCATION(RC_DODONGOS_CAVERN_MQ_GS_BACK_AREA,      true),
   }, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_BOSS_ENTRYWAY, {[]{return true;}}),
@@ -300,9 +300,9 @@ void AreaTable_Init_DodongosCavern() {
              },
              {
                  // Locations
-                 LocationAccess(RC_DODONGOS_CAVERN_BOSS_ROOM_CHEST, { [] { return true; } }),
-                 LocationAccess(RC_DODONGOS_CAVERN_KING_DODONGO_HEART, { [] { return logic->DodongosCavernClear; } }),
-                 LocationAccess(RC_KING_DODONGO, { [] { return logic->DodongosCavernClear; } }),
+                 LOCATION(RC_DODONGOS_CAVERN_BOSS_ROOM_CHEST, true),
+                 LOCATION(RC_DODONGOS_CAVERN_KING_DODONGO_HEART, logic->DodongosCavernClear),
+                 LOCATION(RC_KING_DODONGO, logic->DodongosCavernClear),
              },
              {
                  // Exits
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp
index de814b314..b3c2e5387 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp
@@ -34,7 +34,7 @@ void AreaTable_Init_FireTemple() {
                   EventAccess(&logic->FairyPot, {[]{return logic->FairyPot || (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_FIRE_TEMPLE_NEAR_BOSS_CHEST, {[]{return true;}}),
+                  LOCATION(RC_FIRE_TEMPLE_NEAR_BOSS_CHEST, true),
                 }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_FIRST_ROOM, {[]{return true;}}),
@@ -49,7 +49,7 @@ void AreaTable_Init_FireTemple() {
 
   areaTable[RR_FIRE_TEMPLE_LOOP_TILES] = Area("Fire Temple Loop Tiles", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FIRE_TEMPLE_GS_BOSS_KEY_LOOP, {[]{return logic->CanAdultAttack || logic->CanChildAttack;}}),
+                  LOCATION(RC_FIRE_TEMPLE_GS_BOSS_KEY_LOOP, logic->CanAdultAttack || logic->CanChildAttack),
                 }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_LOOP_ENEMIES,      {[]{return true;}}),
@@ -58,7 +58,7 @@ void AreaTable_Init_FireTemple() {
 
   areaTable[RR_FIRE_TEMPLE_LOOP_FLARE_DANCER] = Area("Fire Temple Loop Flare Dancer", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FIRE_TEMPLE_FLARE_DANCER_CHEST, {[]{return (logic->HasExplosives || logic->CanUse(RG_MEGATON_HAMMER)) && logic->IsAdult;}}),
+                  LOCATION(RC_FIRE_TEMPLE_FLARE_DANCER_CHEST, (logic->HasExplosives || logic->CanUse(RG_MEGATON_HAMMER)) && logic->IsAdult),
                 }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_LOOP_TILES,         {[]{return true;}}),
@@ -77,7 +77,7 @@ void AreaTable_Init_FireTemple() {
 
   areaTable[RR_FIRE_TEMPLE_LOOP_GORON_ROOM] = Area("Fire Temple Loop Goron Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FIRE_TEMPLE_BOSS_KEY_CHEST, {[]{return true;}}),
+                  LOCATION(RC_FIRE_TEMPLE_BOSS_KEY_CHEST, true),
                 }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_LOOP_HAMMER_SWITCH, {[]{return logic->FireLoopSwitch;}}),
@@ -101,7 +101,7 @@ void AreaTable_Init_FireTemple() {
 
   areaTable[RR_FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_GORON] = Area("Fire Temple Big Lava Room North Goron", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST, {[]{return true;}}),
+                  LOCATION(RC_FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST, true),
                 }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM, {[]{return true;}}),
@@ -109,7 +109,7 @@ void AreaTable_Init_FireTemple() {
 
   areaTable[RR_FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_TILES] = Area("Fire Temple Big Lava Room North Tiles", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM, {[]{return logic->CanAdultAttack || logic->HookshotOrBoomerang;}}),
+                  LOCATION(RC_FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM, logic->CanAdultAttack || logic->HookshotOrBoomerang),
                 }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM, {[]{return true;}}),
@@ -117,7 +117,7 @@ void AreaTable_Init_FireTemple() {
 
   areaTable[RR_FIRE_TEMPLE_BIG_LAVA_ROOM_SOUTH_GORON] = Area("Fire Temple Big Lava Room South Goron", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST, {[]{return true;}}),
+                  LOCATION(RC_FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST, true),
                 }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM, {[]{return true;}}),
@@ -131,7 +131,7 @@ void AreaTable_Init_FireTemple() {
 
   areaTable[RR_FIRE_TEMPLE_SHORTCUT_ROOM] = Area("Fire Temple Shortcut Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST, {[]{return Here(RR_FIRE_TEMPLE_SHORTCUT_CLIMB, []{return true;});}}),
+                  LOCATION(RC_FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST, Here(RR_FIRE_TEMPLE_SHORTCUT_CLIMB, []{return true;})),
                 }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_FIRE_PILLAR_ROOM,   {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 4);}}),
@@ -147,8 +147,8 @@ void AreaTable_Init_FireTemple() {
 
   areaTable[RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER] = Area("Fire Temple Boulder Maze Lower", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST, {[]{return true;}}),
-                  LocationAccess(RC_FIRE_TEMPLE_GS_BOULDER_MAZE,          {[]{return logic->HasExplosives && (logic->IsAdult || logic->HookshotOrBoomerang);}}),
+                  LOCATION(RC_FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST, true),
+                  LOCATION(RC_FIRE_TEMPLE_GS_BOULDER_MAZE,          logic->HasExplosives && (logic->IsAdult || logic->HookshotOrBoomerang)),
                 }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_SHORTCUT_ROOM,                {[]{return true;}}),
@@ -159,7 +159,7 @@ void AreaTable_Init_FireTemple() {
 
   areaTable[RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER_SIDE_ROOM] = Area("Fire Temple Boulder Maze Lower Side Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST, {[]{return true;}}),
+                  LOCATION(RC_FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST, true),
                 }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER, {[]{return true;}}),
@@ -183,7 +183,7 @@ void AreaTable_Init_FireTemple() {
 
   areaTable[RR_FIRE_TEMPLE_MAP_AREA] = Area("Fire Temple Map Area", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FIRE_TEMPLE_MAP_CHEST, {[]{return true;}}),
+                  LOCATION(RC_FIRE_TEMPLE_MAP_CHEST, true),
                 }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_EAST_CENTRAL_ROOM, {[]{return true;}}),
@@ -191,7 +191,7 @@ void AreaTable_Init_FireTemple() {
 
   areaTable[RR_FIRE_TEMPLE_BOULDER_MAZE_UPPER] = Area("Fire Temple Boulder Maze Upper", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST, {[]{return true;}}),
+                  LOCATION(RC_FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST, true),
                 }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_SHORTCUT_CLIMB,     {[]{return logic->HasExplosives;}}),
@@ -202,7 +202,7 @@ void AreaTable_Init_FireTemple() {
 
   areaTable[RR_FIRE_TEMPLE_SCARECROW_ROOM] = Area("Fire Temple Scarecrow Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FIRE_TEMPLE_GS_SCARECROW_CLIMB, {[]{return logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG) || logic->HasExplosives || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_DINS_FIRE);}}),
+                  LOCATION(RC_FIRE_TEMPLE_GS_SCARECROW_CLIMB, logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG) || logic->HasExplosives || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_DINS_FIRE)),
                 }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_UPPER, {[]{return true;}}),
@@ -211,8 +211,8 @@ void AreaTable_Init_FireTemple() {
 
   areaTable[RR_FIRE_TEMPLE_EAST_PEAK] = Area("Fire Temple East Peak", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FIRE_TEMPLE_SCARECROW_CHEST,  {[]{return true;}}),
-                  LocationAccess(RC_FIRE_TEMPLE_GS_SCARECROW_TOP, {[]{return logic->CanUseProjectile;}}),
+                  LOCATION(RC_FIRE_TEMPLE_SCARECROW_CHEST,  true),
+                  LOCATION(RC_FIRE_TEMPLE_GS_SCARECROW_TOP, logic->CanUseProjectile),
                 }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_SCARECROW_ROOM,    {[]{return true;}}),
@@ -243,7 +243,7 @@ void AreaTable_Init_FireTemple() {
 
   areaTable[RR_FIRE_TEMPLE_FIRE_MAZE_SIDE_ROOM] = Area("Fire Temple Fire Maze Side Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FIRE_TEMPLE_COMPASS_CHEST, {[]{return true;}}),
+                  LOCATION(RC_FIRE_TEMPLE_COMPASS_CHEST, true),
                 }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_ROOM, {[]{return true;}}),
@@ -251,7 +251,7 @@ void AreaTable_Init_FireTemple() {
 
   areaTable[RR_FIRE_TEMPLE_WEST_CENTRAL_LOWER] = Area("Fire Temple West Central Lower", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FIRE_TEMPLE_HIGHEST_GORON_CHEST, {[]{return Here(RR_FIRE_TEMPLE_WEST_CENTRAL_UPPER, []{return (logic->CanUse(RG_SONG_OF_TIME) || randoCtx->GetTrickOption(RT_RUSTED_SWITCHES)) && logic->CanUse(RG_MEGATON_HAMMER);});}}),
+                  LOCATION(RC_FIRE_TEMPLE_HIGHEST_GORON_CHEST, Here(RR_FIRE_TEMPLE_WEST_CENTRAL_UPPER, []{return (logic->CanUse(RG_SONG_OF_TIME) || randoCtx->GetTrickOption(RT_RUSTED_SWITCHES)) && logic->CanUse(RG_MEGATON_HAMMER);})),
                 }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_ROOM,     {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 8);}}),
@@ -289,7 +289,7 @@ void AreaTable_Init_FireTemple() {
 
   areaTable[RR_FIRE_TEMPLE_WEST_PEAK] = Area("Fire Temple West Peak", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FIRE_TEMPLE_MEGATON_HAMMER_CHEST, {[]{return true;}}),
+                  LOCATION(RC_FIRE_TEMPLE_MEGATON_HAMMER_CHEST, true),
                 }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_WEST_CENTRAL_UPPER, {[]{return logic->CanTakeDamage;}}),
@@ -315,8 +315,8 @@ void AreaTable_Init_FireTemple() {
   if (randoCtx->GetDungeon(FIRE_TEMPLE)->IsMQ()) {
   areaTable[RR_FIRE_TEMPLE_MQ_LOWER] = Area("Fire Temple MQ Lower", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST, {[]{return logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->Bombs || logic->CanUse(RG_DINS_FIRE);}}),
-                  LocationAccess(RC_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST,     {[]{return logic->IsAdult && (randoCtx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS) || logic->CanUse(RG_GORON_TUNIC)) && (((logic->CanUse(RG_HOVER_BOOTS) || (randoCtx->GetTrickOption(RT_FIRE_MQ_NEAR_BOSS) && logic->CanUse(RG_FAIRY_BOW))) && logic->HasFireSource) || (logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_FIRE_ARROWS) || (logic->CanUse(RG_DINS_FIRE) && ((randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_OHKO) && randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_QUADRUPLE) && randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_OCTUPLE) && randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_SEXDECUPLE)) || logic->CanUse(RG_GORON_TUNIC) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_LONGSHOT)))));}}),
+                  LOCATION(RC_FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST, logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->Bombs || logic->CanUse(RG_DINS_FIRE)),
+                  LOCATION(RC_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST,     logic->IsAdult && (randoCtx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS) || logic->CanUse(RG_GORON_TUNIC)) && (((logic->CanUse(RG_HOVER_BOOTS) || (randoCtx->GetTrickOption(RT_FIRE_MQ_NEAR_BOSS) && logic->CanUse(RG_FAIRY_BOW))) && logic->HasFireSource) || (logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_FIRE_ARROWS) || (logic->CanUse(RG_DINS_FIRE) && ((randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_OHKO) && randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_QUADRUPLE) && randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_OCTUPLE) && randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_SEXDECUPLE)) || logic->CanUse(RG_GORON_TUNIC) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_LONGSHOT)))))),
                     //Trick: logic->IsAdult && (LogicFewerTunicRequirements || logic->CanUse(RG_GORON_TUNIC)) && (((logic->CanUse(RG_HOVER_BOOTS) || (LogicFireMQNearBoss && logic->CanUse(RG_FAIRY_BOW))) && logic->HasFireSource) || (logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_FIRE_ARROWS) || (logic->CanUse(RG_DINS_FIRE) && ((DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_QUADRUPLE) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OCTUPLE) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_SEXDECUPLE)) || logic->CanUse(RG_GORON_TUNIC) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_LONGSHOT)))))
   }, {
                   //Exits
@@ -331,8 +331,8 @@ void AreaTable_Init_FireTemple() {
                   EventAccess(&logic->FairyPot, {[]{return true;}}),
   }, {
                   //Locations
-                  LocationAccess(RC_FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST, {[]{return logic->IsAdult && (logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_HOOKSHOT) || (logic->HasExplosives && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG))));}}),
-                  LocationAccess(RC_FIRE_TEMPLE_MQ_MAP_CHEST,            {[]{return logic->IsAdult && logic->CanUse(RG_MEGATON_HAMMER);}}),
+                  LOCATION(RC_FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST, logic->IsAdult && (logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_HOOKSHOT) || (logic->HasExplosives && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG))))),
+                  LOCATION(RC_FIRE_TEMPLE_MQ_MAP_CHEST,            logic->IsAdult && logic->CanUse(RG_MEGATON_HAMMER)),
   }, {});
 
   areaTable[RR_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM] = Area("Fire Temple MQ Big Lava Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
@@ -341,11 +341,11 @@ void AreaTable_Init_FireTemple() {
                     //Trick: logic->HasFireSource && (logic->Bow || LogicFireMQBKChest) && logic->IsAdult && (logic->CanUse(RG_HOOKSHOT) || LogicFireSongOfTime)
   }, {
                   //Locations
-                  LocationAccess(RC_FIRE_TEMPLE_MQ_BOSS_KEY_CHEST,                   {[]{return logic->HasFireSource && (logic->Bow || randoCtx->GetTrickOption(RT_FIRE_MQ_BK_CHEST)) && logic->IsAdult && logic->CanUse(RG_HOOKSHOT);}}),
+                  LOCATION(RC_FIRE_TEMPLE_MQ_BOSS_KEY_CHEST,                   logic->HasFireSource && (logic->Bow || randoCtx->GetTrickOption(RT_FIRE_MQ_BK_CHEST)) && logic->IsAdult && logic->CanUse(RG_HOOKSHOT)),
                     //Trick: logic->HasFireSource && (logic->Bow || LogicFireMQBKChest) && logic->IsAdult && logic->CanUse(RG_HOOKSHOT)
-                  LocationAccess(RC_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST, {[]{return logic->HasFireSource && logic->HasExplosives && logic->IsAdult && (logic->CanUse(RG_HOOKSHOT) || randoCtx->GetTrickOption(RT_FIRE_MQ_BLOCKED_CHEST));}}),
+                  LOCATION(RC_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST, logic->HasFireSource && logic->HasExplosives && logic->IsAdult && (logic->CanUse(RG_HOOKSHOT) || randoCtx->GetTrickOption(RT_FIRE_MQ_BLOCKED_CHEST))),
                     //Trick: logic->HasFireSource && logic->HasExplosives && logic->IsAdult && (logic->CanUse(RG_HOOKSHOT) || LogicFireMQBlockedChest)
-                  LocationAccess(RC_FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR,       {[]{return true;}}),
+                  LOCATION(RC_FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR,       true),
   }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_MQ_LOWER_MAZE, {[]{return logic->IsAdult && logic->CanUse(RG_GORON_TUNIC) && logic->SmallKeys(RR_FIRE_TEMPLE, 2) && (logic->HasFireSource || (randoCtx->GetTrickOption(RT_FIRE_MQ_CLIMB) && logic->HoverBoots));}}),
@@ -354,8 +354,8 @@ void AreaTable_Init_FireTemple() {
 
   areaTable[RR_FIRE_TEMPLE_MQ_LOWER_MAZE] = Area("Fire Temple MQ Lower Maze", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST,     {[]{return logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BIGGORON_SWORD);}}),
-                  LocationAccess(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST, {[]{return logic->HasExplosives && (randoCtx->GetTrickOption(RT_FIRE_MQ_MAZE_SIDE_ROOM) || HasAccessTo(RR_FIRE_TEMPLE_MQ_UPPER_MAZE));}}),
+                  LOCATION(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST,     logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)),
+                  LOCATION(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST, logic->HasExplosives && (randoCtx->GetTrickOption(RT_FIRE_MQ_MAZE_SIDE_ROOM) || HasAccessTo(RR_FIRE_TEMPLE_MQ_UPPER_MAZE))),
                     //Trick: logic->HasExplosives && (LogicFireMQMazeSideRoom || FIRE_TEMPLE_MQ_UPPER_MAZE.Adult())
    }, {
                   //Exits
@@ -369,9 +369,9 @@ void AreaTable_Init_FireTemple() {
                   EventAccess(&logic->FairyPot,  {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 3);}}),
   }, {
                   //Locations
-                  LocationAccess(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST, {[]{return true;}}),
-                  LocationAccess(RC_FIRE_TEMPLE_MQ_COMPASS_CHEST,             {[]{return logic->HasExplosives;}}),
-                  LocationAccess(RC_FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE,          {[]{return logic->IsAdult && ((logic->CanUse(RG_SONG_OF_TIME) && logic->CanUse(RG_HOOKSHOT) && logic->HasExplosives) || logic->CanUse(RG_LONGSHOT));}}),
+                  LOCATION(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST, true),
+                  LOCATION(RC_FIRE_TEMPLE_MQ_COMPASS_CHEST,             logic->HasExplosives),
+                  LOCATION(RC_FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE,          logic->IsAdult && ((logic->CanUse(RG_SONG_OF_TIME) && logic->CanUse(RG_HOOKSHOT) && logic->HasExplosives) || logic->CanUse(RG_LONGSHOT))),
   }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_MQ_UPPER, {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 3) && logic->IsAdult && ((logic->CanUse(RG_FAIRY_BOW) && logic->CanUse(RG_HOOKSHOT)) || logic->CanUse(RG_FIRE_ARROWS));}}),
@@ -379,14 +379,14 @@ void AreaTable_Init_FireTemple() {
 
   areaTable[RR_FIRE_TEMPLE_MQ_UPPER] = Area("Fire Temple MQ Upper", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FIRE_TEMPLE_MQ_FREESTANDING_KEY,            {[]{return ((logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG)) && logic->CanUse(RG_HOOKSHOT)) || randoCtx->GetTrickOption(RT_FIRE_MQ_FLAME_MAZE);}}),
+                  LOCATION(RC_FIRE_TEMPLE_MQ_FREESTANDING_KEY,            ((logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG)) && logic->CanUse(RG_HOOKSHOT)) || randoCtx->GetTrickOption(RT_FIRE_MQ_FLAME_MAZE)),
                     //Trick: (logic->IsAdult && logic->CanUse(RG_HOOKSHOT)) || LogicFireMQFlameMaze
-                  LocationAccess(RC_FIRE_TEMPLE_MQ_CHEST_ON_FIRE,               {[]{return ((logic->IsAdult && logic->CanUse(RG_HOOKSHOT)) || randoCtx->GetTrickOption(RT_FIRE_MQ_FLAME_MAZE)) && logic->SmallKeys(RR_FIRE_TEMPLE, 4);}}),
+                  LOCATION(RC_FIRE_TEMPLE_MQ_CHEST_ON_FIRE,               ((logic->IsAdult && logic->CanUse(RG_HOOKSHOT)) || randoCtx->GetTrickOption(RT_FIRE_MQ_FLAME_MAZE)) && logic->SmallKeys(RR_FIRE_TEMPLE, 4)),
                     //Trick: ((logic->IsAdult && logic->CanUse(RG_HOOKSHOT)) || LogicFireMQFlameMaze) && logic->SmallKeys(RR_FIRE_TEMPLE, 4)
-                  LocationAccess(RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM, {[]{return logic->CanUse(RG_SONG_OF_TIME) || logic->HoverBoots || randoCtx->GetTrickOption(RT_FIRE_MQ_FLAME_MAZE);}}),
+                  LOCATION(RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM, logic->CanUse(RG_SONG_OF_TIME) || logic->HoverBoots || randoCtx->GetTrickOption(RT_FIRE_MQ_FLAME_MAZE)),
                     //Trick: logic->CanUse(RG_SONG_OF_TIME) || logic->HoverBoots || LogicFireMQFlameMaze
-                  LocationAccess(RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER,    {[]{return logic->HasExplosives;}}),
-                  LocationAccess(RC_FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE,     {[]{return (logic->IsAdult && logic->CanUse(RG_HOOKSHOT) && logic->SmallKeys(RR_FIRE_TEMPLE, 5)) || (randoCtx->GetTrickOption(RT_FIRE_MQ_ABOVE_MAZE_GS) && logic->IsAdult && logic->CanUse(RG_LONGSHOT));}}),
+                  LOCATION(RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER,    logic->HasExplosives),
+                  LOCATION(RC_FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE,     (logic->IsAdult && logic->CanUse(RG_HOOKSHOT) && logic->SmallKeys(RR_FIRE_TEMPLE, 5)) || (randoCtx->GetTrickOption(RT_FIRE_MQ_ABOVE_MAZE_GS) && logic->IsAdult && logic->CanUse(RG_LONGSHOT))),
                     //Trick: (logic->IsAdult && logic->CanUse(RG_HOOKSHOT) && logic->SmallKeys(RR_FIRE_TEMPLE, 5)) || (LogicFireMQAboveMazeGS && logic->IsAdult && logic->CanUse(RG_LONGSHOT))
   }, {});
   }
@@ -412,8 +412,8 @@ void AreaTable_Init_FireTemple() {
              },
              {
                  // Locations
-                 LocationAccess(RC_FIRE_TEMPLE_VOLVAGIA_HEART, { [] { return logic->FireTempleClear; } }),
-                 LocationAccess(RC_VOLVAGIA, { [] { return logic->FireTempleClear; } }),
+                 LOCATION(RC_FIRE_TEMPLE_VOLVAGIA_HEART, logic->FireTempleClear),
+                 LOCATION(RC_VOLVAGIA, logic->FireTempleClear),
              },
              {
                  // Exits
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp
index 4d46b80dc..959c192ea 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp
@@ -21,8 +21,8 @@ void AreaTable_Init_ForestTemple() {
   if (randoCtx->GetDungeon(FOREST_TEMPLE)->IsVanilla()) {
   areaTable[RR_FOREST_TEMPLE_FIRST_ROOM] = Area("Forest Temple First Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FOREST_TEMPLE_FIRST_ROOM_CHEST, {[]{return true;}}),
-                  LocationAccess(RC_FOREST_TEMPLE_GS_FIRST_ROOM,    {[]{return (logic->IsAdult && logic->Bombs) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_BOOMERANG) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->HasBombchus || logic->CanUse(RG_DINS_FIRE) || (randoCtx->GetTrickOption(RT_FOREST_FIRST_GS) && (logic->CanJumpslash || (logic->IsChild && logic->Bombs)));}}),
+                  LOCATION(RC_FOREST_TEMPLE_FIRST_ROOM_CHEST, true),
+                  LOCATION(RC_FOREST_TEMPLE_GS_FIRST_ROOM,    (logic->IsAdult && logic->Bombs) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_BOOMERANG) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->HasBombchus || logic->CanUse(RG_DINS_FIRE) || (randoCtx->GetTrickOption(RT_FOREST_FIRST_GS) && (logic->CanJumpslash || (logic->IsChild && logic->Bombs)))),
                 }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_ENTRYWAY,       {[]{return true;}}),
@@ -40,7 +40,7 @@ void AreaTable_Init_ForestTemple() {
                   EventAccess(&logic->ForestTempleMeg, {[]{return logic->ForestTempleMeg || (logic->ForestTempleJoelle && logic->ForestTempleBeth && logic->ForestTempleAmy && logic->CanUse(RG_FAIRY_BOW));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_FOREST_TEMPLE_GS_LOBBY, {[]{return logic->HookshotOrBoomerang;}}),
+                  LOCATION(RC_FOREST_TEMPLE_GS_LOBBY, logic->HookshotOrBoomerang),
                 }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_SOUTH_CORRIDOR,    {[]{return true;}}),
@@ -64,7 +64,7 @@ void AreaTable_Init_ForestTemple() {
                   EventAccess(&logic->FairyPot, {[]{return true;}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_FOREST_TEMPLE_FIRST_STALFOS_CHEST, {[]{return logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER);}}),
+                  LOCATION(RC_FOREST_TEMPLE_FIRST_STALFOS_CHEST, logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER)),
                 }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_NORTH_CORRIDOR, {[]{return true;}}),
@@ -76,7 +76,7 @@ void AreaTable_Init_ForestTemple() {
                   EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUse(RG_DINS_FIRE));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD, {[]{return logic->CanUse(RG_LONGSHOT) || Here(RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER, []{return logic->HookshotOrBoomerang;});}}),
+                  LOCATION(RC_FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD, logic->CanUse(RG_LONGSHOT) || Here(RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER, []{return logic->HookshotOrBoomerang;})),
                 }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_LOBBY,             {[]{return logic->CanUse(RG_SONG_OF_TIME);}}),
@@ -104,8 +104,8 @@ void AreaTable_Init_ForestTemple() {
                   EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUse(RG_DINS_FIRE));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST, {[]{return logic->CanUse(RG_HOOKSHOT) || HasAccessTo(RR_FOREST_TEMPLE_FALLING_ROOM) || (HasAccessTo(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER) && logic->IsAdult && randoCtx->GetTrickOption(RT_FOREST_OUTDOORS_LEDGE) && logic->HoverBoots);}}),
-                  LocationAccess(RC_FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD,    {[]{return logic->CanUse(RG_HOOKSHOT) || (randoCtx->GetTrickOption(RT_FOREST_OUTDOORS_EAST_GS) && logic->CanUse(RG_BOOMERANG)) || Here(RR_FOREST_TEMPLE_FALLING_ROOM, []{return logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_DINS_FIRE) || logic->HasExplosives;});}}),
+                  LOCATION(RC_FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST, logic->CanUse(RG_HOOKSHOT) || HasAccessTo(RR_FOREST_TEMPLE_FALLING_ROOM) || (HasAccessTo(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER) && logic->IsAdult && randoCtx->GetTrickOption(RT_FOREST_OUTDOORS_LEDGE) && logic->HoverBoots)),
+                  LOCATION(RC_FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD,    logic->CanUse(RG_HOOKSHOT) || (randoCtx->GetTrickOption(RT_FOREST_OUTDOORS_EAST_GS) && logic->CanUse(RG_BOOMERANG)) || Here(RR_FOREST_TEMPLE_FALLING_ROOM, []{return logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_DINS_FIRE) || logic->HasExplosives;})),
                 }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_LOBBY,             {[]{return true;}}),
@@ -127,7 +127,7 @@ void AreaTable_Init_ForestTemple() {
 
   areaTable[RR_FOREST_TEMPLE_MAP_ROOM] = Area("Forest Temple Map Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FOREST_TEMPLE_MAP_CHEST, {[]{return Here(RR_FOREST_TEMPLE_MAP_ROOM, []{return logic->HasExplosives || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_FAIRY_BOW) || ((logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT)) && (logic->Nuts || logic->HookshotOrBoomerang || logic->CanShield));});}}),
+                  LOCATION(RC_FOREST_TEMPLE_MAP_CHEST, Here(RR_FOREST_TEMPLE_MAP_ROOM, []{return logic->HasExplosives || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_FAIRY_BOW) || ((logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT)) && (logic->Nuts || logic->HookshotOrBoomerang || logic->CanShield));})),
                 }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_LOWER, {[]{return Here(RR_FOREST_TEMPLE_MAP_ROOM, []{return logic->HasExplosives || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_FAIRY_BOW) || ((logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT)) && (logic->Nuts || logic->HookshotOrBoomerang || logic->CanShield));});}}),
@@ -136,7 +136,7 @@ void AreaTable_Init_ForestTemple() {
 
   areaTable[RR_FOREST_TEMPLE_SEWER] = Area("Forest Temple Sewer", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FOREST_TEMPLE_WELL_CHEST, {[]{return HasAccessTo(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER);}}),
+                  LOCATION(RC_FOREST_TEMPLE_WELL_CHEST, HasAccessTo(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER)),
                 }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_LOWER, {[]{return true;}}),
@@ -150,7 +150,7 @@ void AreaTable_Init_ForestTemple() {
 
   areaTable[RR_FOREST_TEMPLE_FLOORMASTER_ROOM] = Area("Forest Temple Floormaster Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FOREST_TEMPLE_FLOORMASTER_CHEST, {[]{return logic->CanAdultDamage || logic->CanChildDamage;}}),
+                  LOCATION(RC_FOREST_TEMPLE_FLOORMASTER_CHEST, logic->CanAdultDamage || logic->CanChildDamage),
                 }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER, {[]{return true;}}),
@@ -164,7 +164,7 @@ void AreaTable_Init_ForestTemple() {
 
   areaTable[RR_FOREST_TEMPLE_BLOCK_PUSH_ROOM] = Area("Forest Temple Block Push Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FOREST_TEMPLE_EYE_SWITCH_CHEST, {[]{return logic->GoronBracelet && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT));}}),
+                  LOCATION(RC_FOREST_TEMPLE_EYE_SWITCH_CHEST, logic->GoronBracelet && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT))),
                 }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_WEST_CORRIDOR,            {[]{return true;}}),
@@ -181,7 +181,7 @@ void AreaTable_Init_ForestTemple() {
 
   areaTable[RR_FOREST_TEMPLE_NW_CORRIDOR_STRAIGHTENED] = Area("Forest Temple NW Corridor Straightened", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FOREST_TEMPLE_BOSS_KEY_CHEST, {[]{return true;}}),
+                  LOCATION(RC_FOREST_TEMPLE_BOSS_KEY_CHEST, true),
                 }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_BELOW_BOSS_KEY_CHEST, {[]{return true;}}),
@@ -193,7 +193,7 @@ void AreaTable_Init_ForestTemple() {
                   EventAccess(&logic->ForestTempleJoelle, {[]{return logic->ForestTempleJoelle || logic->CanUse(RG_FAIRY_BOW);}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_FOREST_TEMPLE_RED_POE_CHEST, {[]{return logic->ForestTempleJoelle;}}),
+                  LOCATION(RC_FOREST_TEMPLE_RED_POE_CHEST, logic->ForestTempleJoelle),
                 }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_NW_CORRIDOR_TWISTED, {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 3);}}),
@@ -202,7 +202,7 @@ void AreaTable_Init_ForestTemple() {
 
   areaTable[RR_FOREST_TEMPLE_UPPER_STALFOS] = Area("Forest Temple Upper Stalfos", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FOREST_TEMPLE_BOW_CHEST, {[]{return logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER);}}),
+                  LOCATION(RC_FOREST_TEMPLE_BOW_CHEST, logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER)),
                 }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_RED_POE_ROOM,  {[]{return logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER);}}),
@@ -214,7 +214,7 @@ void AreaTable_Init_ForestTemple() {
                   EventAccess(&logic->ForestTempleBeth, {[]{return logic->ForestTempleBeth || logic->CanUse(RG_FAIRY_BOW);}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_FOREST_TEMPLE_BLUE_POE_CHEST, {[]{return logic->ForestTempleBeth;}}),
+                  LOCATION(RC_FOREST_TEMPLE_BLUE_POE_CHEST, logic->ForestTempleBeth),
                 }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_UPPER_STALFOS,            {[]{return true;}}),
@@ -241,7 +241,7 @@ void AreaTable_Init_ForestTemple() {
 
   areaTable[RR_FOREST_TEMPLE_FALLING_ROOM] = Area("Forest Temple Falling Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST, {[]{return true;}}),
+                  LOCATION(RC_FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST, true),
                 }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_NE_OUTDOORS_LOWER, {[]{return true;}}),
@@ -265,8 +265,8 @@ void AreaTable_Init_ForestTemple() {
 
   areaTable[RR_FOREST_TEMPLE_BOSS_REGION] = Area("Forest Temple Boss Region", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FOREST_TEMPLE_BASEMENT_CHEST, {[]{return true;}}),
-                  LocationAccess(RC_FOREST_TEMPLE_GS_BASEMENT,    {[]{return logic->HookshotOrBoomerang;}}),
+                  LOCATION(RC_FOREST_TEMPLE_BASEMENT_CHEST, true),
+                  LOCATION(RC_FOREST_TEMPLE_GS_BASEMENT,    logic->HookshotOrBoomerang),
                 }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_LOBBY,     {[]{return true;}}),
@@ -280,8 +280,8 @@ void AreaTable_Init_ForestTemple() {
   if (randoCtx->GetDungeon(FOREST_TEMPLE)->IsMQ()) {
   areaTable[RR_FOREST_TEMPLE_MQ_LOBBY] = Area("Forest Temple MQ Lobby", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST, {[]{return logic->CanJumpslash || logic->Bombs || logic->CanUse(RG_STICKS) || logic->Nuts || logic->HookshotOrBoomerang || logic->CanUse(RG_DINS_FIRE) || logic->KokiriSword || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOVER_BOOTS);}}),
-                  LocationAccess(RC_FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY, {[]{return logic->HookshotOrBoomerang;}}),
+                  LOCATION(RC_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST, logic->CanJumpslash || logic->Bombs || logic->CanUse(RG_STICKS) || logic->Nuts || logic->HookshotOrBoomerang || logic->CanUse(RG_DINS_FIRE) || logic->KokiriSword || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOVER_BOOTS)),
+                  LOCATION(RC_FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY, logic->HookshotOrBoomerang),
   }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_ENTRYWAY,        {[]{return true;}}),
@@ -293,8 +293,8 @@ void AreaTable_Init_ForestTemple() {
                   EventAccess(&logic->FairyPot, {[]{return true;}}),
   }, {
                   //Locations
-                  LocationAccess(RC_FOREST_TEMPLE_MQ_WOLFOS_CHEST,       {[]{return (logic->CanUse(RG_SONG_OF_TIME) || logic->IsChild) && (logic->CanJumpslash || logic->CanUse(RG_DINS_FIRE) || logic->CanUse(RG_STICKS) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->KokiriSword);}}),
-                  LocationAccess(RC_FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM, {[]{return logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER);}}),
+                  LOCATION(RC_FOREST_TEMPLE_MQ_WOLFOS_CHEST,       (logic->CanUse(RG_SONG_OF_TIME) || logic->IsChild) && (logic->CanJumpslash || logic->CanUse(RG_DINS_FIRE) || logic->CanUse(RG_STICKS) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->KokiriSword)),
+                  LOCATION(RC_FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM, logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER)),
   }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_MQ_NW_OUTDOORS,        {[]{return logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT);}}),
@@ -308,7 +308,7 @@ void AreaTable_Init_ForestTemple() {
 
   areaTable[RR_FOREST_TEMPLE_MQ_AFTER_BLOCK_PUZZLE] = Area("Forest Temple MQ After Block Puzzle", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FOREST_TEMPLE_MQ_BOSS_KEY_CHEST, {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 3);}}),
+                  LOCATION(RC_FOREST_TEMPLE_MQ_BOSS_KEY_CHEST, logic->SmallKeys(RR_FOREST_TEMPLE, 3)),
   }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_MQ_BOW_REGION,    {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 4);}}),
@@ -319,7 +319,7 @@ void AreaTable_Init_ForestTemple() {
 
   areaTable[RR_FOREST_TEMPLE_MQ_OUTDOOR_LEDGE] = Area("Forest Temple MQ Outdoor Ledge", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FOREST_TEMPLE_MQ_REDEAD_CHEST, {[]{return logic->CanJumpslash;}}),
+                  LOCATION(RC_FOREST_TEMPLE_MQ_REDEAD_CHEST, logic->CanJumpslash),
   }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_MQ_NW_OUTDOORS, {[]{return true;}}),
@@ -327,7 +327,7 @@ void AreaTable_Init_ForestTemple() {
 
   areaTable[RR_FOREST_TEMPLE_MQ_NW_OUTDOORS] = Area("Forest Temple MQ NW Outdoors", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD, {[]{return logic->CanAdultAttack || logic->CanChildAttack;}}),
+                  LOCATION(RC_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD, logic->CanAdultAttack || logic->CanChildAttack),
   }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_MQ_NE_OUTDOORS,         {[]{return (logic->IsAdult && (logic->CanUse(RG_IRON_BOOTS) || logic->CanUse(RG_LONGSHOT) || (randoCtx->GetTrickOption(RT_FOREST_MQ_WELL_SWIM) && logic->CanUse(RG_HOOKSHOT)))) || logic->ProgressiveScale >= 2;}}),
@@ -341,9 +341,9 @@ void AreaTable_Init_ForestTemple() {
                   EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUse(RG_DINS_FIRE));}}),
   }, {
                   //Locations
-                  LocationAccess(RC_FOREST_TEMPLE_MQ_WELL_CHEST,                 {[]{return (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW)) || (logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT));}}),
-                  LocationAccess(RC_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD, {[]{return logic->HookshotOrBoomerang || (logic->IsAdult && logic->CanUse(RG_FIRE_ARROWS) && (logic->CanUse(RG_SONG_OF_TIME) || (logic->CanUse(RG_HOVER_BOOTS) && randoCtx->GetTrickOption(RT_FOREST_DOORFRAME))));}}),
-                  LocationAccess(RC_FOREST_TEMPLE_MQ_GS_WELL,                    {[]{return (logic->IsAdult && ((logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_HOOKSHOT)) || logic->CanUse(RG_FAIRY_BOW))) || (logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT));}}),
+                  LOCATION(RC_FOREST_TEMPLE_MQ_WELL_CHEST,                 (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW)) || (logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT))),
+                  LOCATION(RC_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD, logic->HookshotOrBoomerang || (logic->IsAdult && logic->CanUse(RG_FIRE_ARROWS) && (logic->CanUse(RG_SONG_OF_TIME) || (logic->CanUse(RG_HOVER_BOOTS) && randoCtx->GetTrickOption(RT_FOREST_DOORFRAME))))),
+                  LOCATION(RC_FOREST_TEMPLE_MQ_GS_WELL,                    (logic->IsAdult && ((logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_HOOKSHOT)) || logic->CanUse(RG_FAIRY_BOW))) || (logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT))),
   }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_MQ_OUTDOORS_TOP_LEDGES, {[]{return logic->IsAdult && logic->CanUse(RG_HOOKSHOT) && (logic->CanUse(RG_LONGSHOT) || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_SONG_OF_TIME));}}),
@@ -352,7 +352,7 @@ void AreaTable_Init_ForestTemple() {
 
   areaTable[RR_FOREST_TEMPLE_MQ_OUTDOORS_TOP_LEDGES] = Area("Forest Temple MQ Outdoors Top Ledges", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST, {[]{return true;}}),
+                  LOCATION(RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST, true),
   }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_MQ_NE_OUTDOORS,       {[]{return true;}}),
@@ -362,7 +362,7 @@ void AreaTable_Init_ForestTemple() {
 
   areaTable[RR_FOREST_TEMPLE_MQ_NE_OUTDOORS_LEDGE] = Area("Forest Temple MQ NE Outdoors Ledge", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST, {[]{return true;}}),
+                  LOCATION(RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST, true),
   }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_MQ_NE_OUTDOORS,  {[]{return true;}}),
@@ -374,9 +374,9 @@ void AreaTable_Init_ForestTemple() {
                   EventAccess(&logic->ForestTempleJoAndBeth, {[]{return logic->ForestTempleJoAndBeth || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW));}}),
   }, {
                   //Locations
-                  LocationAccess(RC_FOREST_TEMPLE_MQ_BOW_CHEST,     {[]{return logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER);}}),
-                  LocationAccess(RC_FOREST_TEMPLE_MQ_MAP_CHEST,     {[]{return logic->IsAdult && logic->CanUse(RG_FAIRY_BOW);}}),
-                  LocationAccess(RC_FOREST_TEMPLE_MQ_COMPASS_CHEST, {[]{return logic->IsAdult && logic->CanUse(RG_FAIRY_BOW);}}),
+                  LOCATION(RC_FOREST_TEMPLE_MQ_BOW_CHEST,     logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER)),
+                  LOCATION(RC_FOREST_TEMPLE_MQ_MAP_CHEST,     logic->IsAdult && logic->CanUse(RG_FAIRY_BOW)),
+                  LOCATION(RC_FOREST_TEMPLE_MQ_COMPASS_CHEST, logic->IsAdult && logic->CanUse(RG_FAIRY_BOW)),
   }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_MQ_FALLING_ROOM, {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 5) && ((logic->IsAdult && logic->CanUse(RG_FAIRY_BOW)) || logic->CanUse(RG_DINS_FIRE));}}),
@@ -387,7 +387,7 @@ void AreaTable_Init_ForestTemple() {
                   EventAccess(&logic->ForestTempleAmyAndMeg, {[]{return logic->ForestTempleAmyAndMeg || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW) && logic->SmallKeys(RR_FOREST_TEMPLE, 6));}}),
   }, {
                   //Locations
-                  LocationAccess(RC_FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST, {[]{return true;}}),
+                  LOCATION(RC_FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST, true),
   }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_MQ_NE_OUTDOORS_LEDGE, {[]{return true;}}),
@@ -395,7 +395,7 @@ void AreaTable_Init_ForestTemple() {
 
   areaTable[RR_FOREST_TEMPLE_MQ_BOSS_REGION] = Area("Forest Temple MQ Boss Region", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_FOREST_TEMPLE_MQ_BASEMENT_CHEST,   {[]{return true;}}),
+                  LOCATION(RC_FOREST_TEMPLE_MQ_BASEMENT_CHEST,   true),
   }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_BOSS_ENTRYWAY, {[]{return logic->BossKeyForestTemple;}}),
@@ -425,8 +425,8 @@ void AreaTable_Init_ForestTemple() {
         },
         {
             // Locations
-            LocationAccess(RC_FOREST_TEMPLE_PHANTOM_GANON_HEART, { [] { return logic->ForestTempleClear; } }),
-            LocationAccess(RC_PHANTOM_GANON, { [] { return logic->ForestTempleClear; } }),
+            LOCATION(RC_FOREST_TEMPLE_PHANTOM_GANON_HEART, logic->ForestTempleClear),
+            LOCATION(RC_PHANTOM_GANON, logic->ForestTempleClear),
         },
         {
             // Exits
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
index baa3cb0fc..b00630e27 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
@@ -22,7 +22,7 @@ void AreaTable_Init_GanonsCastle() {
   if (randoCtx->GetDungeon(GANONS_CASTLE)->IsVanilla()) {
   areaTable[RR_GANONS_CASTLE_LOBBY] = Area("Ganon's Castle Lobby", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SHEIK_HINT_GC,  {[]{return true;}}), 
+                  LOCATION(RC_SHEIK_HINT_GC,  true), 
                 }, {
                   //Exits
                   Entrance(RR_GANONS_CASTLE_ENTRYWAY,     {[]{return true;}}),
@@ -46,10 +46,10 @@ void AreaTable_Init_GanonsCastle() {
                   EventAccess(&logic->FreeFairies, {[]{return true;}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,  {[]{return logic->CanStunDeku;}}),
-                  LocationAccess(RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT, {[]{return logic->CanStunDeku;}}),
-                  LocationAccess(RC_GANONS_CASTLE_DEKU_SCRUB_RIGHT,        {[]{return logic->CanStunDeku;}}),
-                  LocationAccess(RC_GANONS_CASTLE_DEKU_SCRUB_LEFT,         {[]{return logic->CanStunDeku;}}),
+                  LOCATION(RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,  logic->CanStunDeku),
+                  LOCATION(RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT, logic->CanStunDeku),
+                  LOCATION(RC_GANONS_CASTLE_DEKU_SCRUB_RIGHT,        logic->CanStunDeku),
+                  LOCATION(RC_GANONS_CASTLE_DEKU_SCRUB_LEFT,         logic->CanStunDeku),
   }, {});
 
   areaTable[RR_GANONS_CASTLE_FOREST_TRIAL] = Area("Ganon's Castle Forest Trial", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
@@ -57,7 +57,7 @@ void AreaTable_Init_GanonsCastle() {
                   EventAccess(&logic->ForestTrialClear, {[]{return logic->CanUse(RG_LIGHT_ARROWS) && (logic->FireArrows || logic->DinsFire);}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_GANONS_CASTLE_FOREST_TRIAL_CHEST, {[]{return logic->CanAdultDamage || logic->CanChildDamage;}}),
+                  LOCATION(RC_GANONS_CASTLE_FOREST_TRIAL_CHEST, logic->CanAdultDamage || logic->CanChildDamage),
   }, {});
 
   areaTable[RR_GANONS_CASTLE_FIRE_TRIAL] = Area("Ganon's Castle Fire Trial", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
@@ -72,8 +72,8 @@ void AreaTable_Init_GanonsCastle() {
                   EventAccess(&logic->WaterTrialClear, {[]{return logic->BlueFire && logic->IsAdult && logic->CanUse(RG_MEGATON_HAMMER) && logic->CanUse(RG_LIGHT_ARROWS);}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST,  {[]{return true;}}),
-                  LocationAccess(RC_GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST, {[]{return true;}}),
+                  LOCATION(RC_GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST,  true),
+                  LOCATION(RC_GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST, true),
   }, {});
 
   areaTable[RR_GANONS_CASTLE_SHADOW_TRIAL] = Area("Ganon's Castle Shadow Trial", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
@@ -81,8 +81,8 @@ void AreaTable_Init_GanonsCastle() {
                   EventAccess(&logic->ShadowTrialClear, {[]{return logic->CanUse(RG_LIGHT_ARROWS) && logic->CanUse(RG_MEGATON_HAMMER) && ((logic->FireArrows && (randoCtx->GetTrickOption(RT_LENS_GANON) || logic->CanUse(RG_LENS_OF_TRUTH))) || (logic->CanUse(RG_LONGSHOT) && (logic->CanUse(RG_HOVER_BOOTS) || (logic->DinsFire && (randoCtx->GetTrickOption(RT_LENS_GANON) || logic->CanUse(RG_LENS_OF_TRUTH))))));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST,            {[]{return logic->CanUse(RG_FIRE_ARROWS) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_SONG_OF_TIME) || logic->IsChild;}}),
-                  LocationAccess(RC_GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST, {[]{return logic->CanUse(RG_FIRE_ARROWS) || (logic->CanUse(RG_LONGSHOT) && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_DINS_FIRE)));}}),
+                  LOCATION(RC_GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST,            logic->CanUse(RG_FIRE_ARROWS) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_SONG_OF_TIME) || logic->IsChild),
+                  LOCATION(RC_GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST, logic->CanUse(RG_FIRE_ARROWS) || (logic->CanUse(RG_LONGSHOT) && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_DINS_FIRE)))),
   }, {});
 
   areaTable[RR_GANONS_CASTLE_SPIRIT_TRIAL] = Area("Ganon's Castle Spirit Trial", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
@@ -91,8 +91,8 @@ void AreaTable_Init_GanonsCastle() {
                   EventAccess(&logic->SpiritTrialClear, {[]{return logic->CanUse(RG_LIGHT_ARROWS) && (logic->CanUse(RG_MIRROR_SHIELD) || randoCtx->GetOption(RSK_SUNLIGHT_ARROWS)) && logic->HasBombchus && ((randoCtx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) && logic->CanJumpslash) || logic->CanUse(RG_HOOKSHOT));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST, {[]{return (randoCtx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) || logic->CanUse(RG_HOOKSHOT)) && logic->CanJumpslash;}}),
-                  LocationAccess(RC_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST,      {[]{return (randoCtx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) || logic->CanUse(RG_HOOKSHOT)) && logic->HasBombchus && (randoCtx->GetTrickOption(RT_LENS_GANON) || logic->CanUse(RG_LENS_OF_TRUTH));}}),
+                  LOCATION(RC_GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST, (randoCtx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) || logic->CanUse(RG_HOOKSHOT)) && logic->CanJumpslash),
+                  LOCATION(RC_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST,      (randoCtx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) || logic->CanUse(RG_HOOKSHOT)) && logic->HasBombchus && (randoCtx->GetTrickOption(RT_LENS_GANON) || logic->CanUse(RG_LENS_OF_TRUTH))),
   }, {});
 
   areaTable[RR_GANONS_CASTLE_LIGHT_TRIAL] = Area("Ganon's Castle Light Trial", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
@@ -100,22 +100,22 @@ void AreaTable_Init_GanonsCastle() {
                   EventAccess(&logic->LightTrialClear, {[]{return logic->CanUse(RG_LIGHT_ARROWS) && logic->CanUse(RG_HOOKSHOT) && logic->SmallKeys(RR_GANONS_CASTLE, 2) && (randoCtx->GetTrickOption(RT_LENS_GANON) || logic->CanUse(RG_LENS_OF_TRUTH));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST,        {[]{return true;}}),
-                  LocationAccess(RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST,       {[]{return true;}}),
-                  LocationAccess(RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST,        {[]{return true;}}),
-                  LocationAccess(RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST,       {[]{return true;}}),
-                  LocationAccess(RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST,      {[]{return true;}}),
-                  LocationAccess(RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST,       {[]{return true;}}),
-                  LocationAccess(RC_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST, {[]{return randoCtx->GetTrickOption(RT_LENS_GANON) || logic->CanUse(RG_LENS_OF_TRUTH);}}),
-                  LocationAccess(RC_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST,           {[]{return logic->CanUse(RG_ZELDAS_LULLABY) && logic->SmallKeys(RR_GANONS_CASTLE, 1);}}),
+                  LOCATION(RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST,        true),
+                  LOCATION(RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST,       true),
+                  LOCATION(RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST,        true),
+                  LOCATION(RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST,       true),
+                  LOCATION(RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST,      true),
+                  LOCATION(RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST,       true),
+                  LOCATION(RC_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST, randoCtx->GetTrickOption(RT_LENS_GANON) || logic->CanUse(RG_LENS_OF_TRUTH)),
+                  LOCATION(RC_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST,           logic->CanUse(RG_ZELDAS_LULLABY) && logic->SmallKeys(RR_GANONS_CASTLE, 1)),
   }, {});
   }
 
   areaTable[RR_GANONS_CASTLE_TOWER] = Area("Ganon's Castle Tower", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_GANONS_TOWER_BOSS_KEY_CHEST, {[]{return logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD);}}),
-                  LocationAccess(RC_GANONDORF_HINT,              {[]{return logic->BossKeyGanonsCastle && (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD));}}),
-                  LocationAccess(RC_GANON,                       {[]{return logic->HasBossSoul(RG_GANON_SOUL) && logic->BossKeyGanonsCastle && logic->CanUse(RG_LIGHT_ARROWS) && logic->CanUse(RG_MASTER_SWORD);}}),
+                  LOCATION(RC_GANONS_TOWER_BOSS_KEY_CHEST, logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)),
+                  LOCATION(RC_GANONDORF_HINT,              logic->BossKeyGanonsCastle && (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD))),
+                  LOCATION(RC_GANON,                       logic->HasBossSoul(RG_GANON_SOUL) && logic->BossKeyGanonsCastle && logic->CanUse(RG_LIGHT_ARROWS) && logic->CanUse(RG_MASTER_SWORD)),
   }, {});
 
   /*---------------------------
@@ -124,7 +124,7 @@ void AreaTable_Init_GanonsCastle() {
   if (randoCtx->GetDungeon(GANONS_CASTLE)->IsMQ()) {
   areaTable[RR_GANONS_CASTLE_MQ_LOBBY] = Area("Ganon's Castle MQ Lobby", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SHEIK_HINT_MQ_GC,  {[]{return true;}}),
+                  LOCATION(RC_SHEIK_HINT_MQ_GC,  true),
                 }, {
                   //Exits
                   Entrance(RR_GANONS_CASTLE_ENTRYWAY,        {[]{return (logic->CanUse(RG_MASTER_SWORD) || (logic->HasExplosives || ((logic->Nuts || logic->Boomerang) && (logic->Sticks || logic->KokiriSword))));}}),
@@ -148,11 +148,11 @@ void AreaTable_Init_GanonsCastle() {
                   EventAccess(&logic->FreeFairies, {[]{return true;}}),
   }, {
                   //Locations
-                  LocationAccess(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,  {[]{return logic->CanStunDeku;}}),
-                  LocationAccess(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,       {[]{return logic->CanStunDeku;}}),
-                  LocationAccess(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT, {[]{return logic->CanStunDeku;}}),
-                  LocationAccess(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,         {[]{return logic->CanStunDeku;}}),
-                  LocationAccess(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,        {[]{return logic->CanStunDeku;}}),
+                  LOCATION(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,  logic->CanStunDeku),
+                  LOCATION(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,       logic->CanStunDeku),
+                  LOCATION(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT, logic->CanStunDeku),
+                  LOCATION(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,         logic->CanStunDeku),
+                  LOCATION(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,        logic->CanStunDeku),
   }, {});
 
   areaTable[RR_GANONS_CASTLE_MQ_FOREST_TRIAL] = Area("Ganon's Castle MQ Forest Trial", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
@@ -160,9 +160,9 @@ void AreaTable_Init_GanonsCastle() {
                   EventAccess(&logic->ForestTrialClear, {[]{return logic->IsAdult && logic->CanUse(RG_LIGHT_ARROWS) && (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && logic->CanUse(RG_SONG_OF_TIME);}}),
   }, {
                   //Locations
-                  LocationAccess(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST,        {[]{return (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT));}}),
-                  LocationAccess(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST, {[]{return (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && logic->HasFireSource;}}),
-                  LocationAccess(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY,        {[]{return (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && logic->HookshotOrBoomerang;}}),
+                  LOCATION(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST,        (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT))),
+                  LOCATION(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST, (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && logic->HasFireSource),
+                  LOCATION(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY,        (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && logic->HookshotOrBoomerang),
   }, {});
 
   areaTable[RR_GANONS_CASTLE_MQ_FIRE_TRIAL] = Area("Ganon's Castle MQ Fire Trial", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
@@ -177,7 +177,7 @@ void AreaTable_Init_GanonsCastle() {
                   EventAccess(&logic->BlueFireAccess,  {[]{return logic->BlueFireAccess || (logic->HasBottle && logic->CanJumpslash);}}),
   }, {
                   //Locations
-                  LocationAccess(RC_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST, {[]{return logic->BlueFire;}}),
+                  LOCATION(RC_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST, logic->BlueFire),
   }, {});
 
   areaTable[RR_GANONS_CASTLE_MQ_SHADOW_TRIAL] = Area("Ganon's Castle MQ Shadow Trial", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
@@ -186,8 +186,8 @@ void AreaTable_Init_GanonsCastle() {
                     //Trick: logic->IsAdult && logic->CanUse(RG_LIGHT_ARROWS) && (LogicLensCastleMQ || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->HoverBoots || (logic->Hookshot && (logic->HasFireSource || LogicShadowTrialMQ)))
   }, {
                   //Locations
-                  LocationAccess(RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST, {[]{return logic->IsAdult && ((logic->Bow && (logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_HOVER_BOOTS))) || (logic->CanUse(RG_HOVER_BOOTS) && (randoCtx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->HasExplosives || logic->GoronBracelet || logic->CanUse(RG_DINS_FIRE))));}}),
-                  LocationAccess(RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST,  {[]{return logic->IsAdult && logic->Bow && (randoCtx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->HoverBoots || (logic->Hookshot && (logic->HasFireSource || randoCtx->GetTrickOption(RT_GANON_MQ_SHADOW_TRIAL))));}}),
+                  LOCATION(RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST, logic->IsAdult && ((logic->Bow && (logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_HOVER_BOOTS))) || (logic->CanUse(RG_HOVER_BOOTS) && (randoCtx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->HasExplosives || logic->GoronBracelet || logic->CanUse(RG_DINS_FIRE))))),
+                  LOCATION(RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST,  logic->IsAdult && logic->Bow && (randoCtx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->HoverBoots || (logic->Hookshot && (logic->HasFireSource || randoCtx->GetTrickOption(RT_GANON_MQ_SHADOW_TRIAL))))),
                     //Trick: logic->IsAdult && logic->Bow && (LogicLensCastleMQ || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->HoverBoots || (logic->Hookshot && (logic->HasFireSource || LogicShadowTrialMQ)))
   }, {});
 
@@ -197,12 +197,12 @@ void AreaTable_Init_GanonsCastle() {
                   EventAccess(&logic->NutPot,           {[]{return logic->NutPot || (logic->Hammer && logic->HasBombchus && logic->IsAdult && ((logic->CanUse(RG_FIRE_ARROWS) && logic->MirrorShield) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS))));}}),
   }, {
                   //Locations
-                  LocationAccess(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST,             {[]{return logic->IsAdult && (logic->Bow || randoCtx->GetTrickOption(RT_RUSTED_SWITCHES)) && logic->Hammer;}}),
-                  LocationAccess(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST,         {[]{return logic->IsAdult && (logic->Bow || randoCtx->GetTrickOption(RT_RUSTED_SWITCHES)) && logic->Hammer && logic->HasBombchus && (randoCtx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH));}}),
-                  LocationAccess(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST,    {[]{return logic->IsAdult && logic->Hammer && logic->HasBombchus && ((logic->CanUse(RG_FIRE_ARROWS) && logic->CanUse(RG_MIRROR_SHIELD)) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS)));}}),
-                  LocationAccess(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST,     {[]{return logic->IsAdult && logic->Hammer && logic->HasBombchus && ((logic->CanUse(RG_FIRE_ARROWS) && logic->CanUse(RG_MIRROR_SHIELD)) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS)));}}),
-                  LocationAccess(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST,  {[]{return logic->IsAdult && logic->Hammer && logic->HasBombchus && ((logic->CanUse(RG_FIRE_ARROWS) && logic->CanUse(RG_MIRROR_SHIELD)) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS)));}}),
-                  LocationAccess(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST,    {[]{return logic->IsAdult && logic->Hammer && logic->HasBombchus && ((logic->CanUse(RG_FIRE_ARROWS) && logic->CanUse(RG_MIRROR_SHIELD)) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS)));}}),
+                  LOCATION(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST,             logic->IsAdult && (logic->Bow || randoCtx->GetTrickOption(RT_RUSTED_SWITCHES)) && logic->Hammer),
+                  LOCATION(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST,         logic->IsAdult && (logic->Bow || randoCtx->GetTrickOption(RT_RUSTED_SWITCHES)) && logic->Hammer && logic->HasBombchus && (randoCtx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH))),
+                  LOCATION(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST,    logic->IsAdult && logic->Hammer && logic->HasBombchus && ((logic->CanUse(RG_FIRE_ARROWS) && logic->CanUse(RG_MIRROR_SHIELD)) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS)))),
+                  LOCATION(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST,     logic->IsAdult && logic->Hammer && logic->HasBombchus && ((logic->CanUse(RG_FIRE_ARROWS) && logic->CanUse(RG_MIRROR_SHIELD)) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS)))),
+                  LOCATION(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST,  logic->IsAdult && logic->Hammer && logic->HasBombchus && ((logic->CanUse(RG_FIRE_ARROWS) && logic->CanUse(RG_MIRROR_SHIELD)) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS)))),
+                  LOCATION(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST,    logic->IsAdult && logic->Hammer && logic->HasBombchus && ((logic->CanUse(RG_FIRE_ARROWS) && logic->CanUse(RG_MIRROR_SHIELD)) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS)))),
   }, {});
 
   areaTable[RR_GANONS_CASTLE_MQ_LIGHT_TRIAL] = Area("Ganon's Castle MQ Light Trial", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
@@ -211,7 +211,7 @@ void AreaTable_Init_GanonsCastle() {
                     //Trick: logic->IsAdult && logic->CanUse(RG_LIGHT_ARROWS) && logic->SmallKeys(RR_GANONS_CASTLE, 3) && (LogicLensCastleMQ || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->Hookshot || LogicLightTrialMQ)
   }, {
                   //Locations
-                  LocationAccess(RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST, {[]{return (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && logic->CanUse(RG_ZELDAS_LULLABY);}}),
+                  LOCATION(RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST, (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && logic->CanUse(RG_ZELDAS_LULLABY)),
   }, {});
   }
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp
index f48bac91c..c0a2ab2bc 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp
@@ -21,10 +21,10 @@ void AreaTable_Init_GerudoTrainingGrounds() {
   if (randoCtx->GetDungeon(GERUDO_TRAINING_GROUNDS)->IsVanilla()) {
   areaTable[RR_GERUDO_TRAINING_GROUNDS_LOBBY] = Area("Gerudo Training Grounds Lobby", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST,  {[]{return logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT);}}),
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST, {[]{return logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT);}}),
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_STALFOS_CHEST,     {[]{return logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD);}}),
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_BEAMOS_CHEST,      {[]{return logic->HasExplosives && (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD));}}),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST,  logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT)),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST, logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT)),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_STALFOS_CHEST,     logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_BEAMOS_CHEST,      logic->HasExplosives && (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD))),
                 }, {
                   //Exits
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_ENTRYWAY,         {[]{return true;}}),
@@ -35,11 +35,11 @@ void AreaTable_Init_GerudoTrainingGrounds() {
 
   areaTable[RR_GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE] = Area("Gerudo Training Grounds Central Maze", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST,   {[]{return logic->SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 3) && (randoCtx->GetTrickOption(RT_LENS_GTG) || logic->CanUse(RG_LENS_OF_TRUTH));}}),
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST,  {[]{return logic->SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 4);}}),
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_SECOND_CHEST, {[]{return logic->SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 6);}}),
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_THIRD_CHEST,  {[]{return logic->SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 7);}}),
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FINAL_CHEST,  {[]{return logic->SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 9);}}),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST,   logic->SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 3) && (randoCtx->GetTrickOption(RT_LENS_GTG) || logic->CanUse(RG_LENS_OF_TRUTH))),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST,  logic->SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 4)),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_SECOND_CHEST, logic->SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 6)),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_THIRD_CHEST,  logic->SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 7)),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FINAL_CHEST,  logic->SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 9)),
                 }, {
                   //Exits
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE_RIGHT, {[]{return logic->SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 9);}}),
@@ -47,9 +47,9 @@ void AreaTable_Init_GerudoTrainingGrounds() {
 
   areaTable[RR_GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE_RIGHT] = Area("Gerudo Training Grounds Central Maze Right", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_CENTRAL_CHEST, {[]{return true;}}),
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_SIDE_CHEST,    {[]{return true;}}),
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_FREESTANDING_KEY,         {[]{return true;}}),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_CENTRAL_CHEST, true),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_SIDE_CHEST,    true),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_FREESTANDING_KEY,         true),
                 }, {
                   //Exits
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_HAMMER_ROOM, {[]{return logic->CanUse(RG_HOOKSHOT);}}),
@@ -58,7 +58,7 @@ void AreaTable_Init_GerudoTrainingGrounds() {
 
   areaTable[RR_GERUDO_TRAINING_GROUNDS_LAVA_ROOM] = Area("Gerudo Training Grounds Lava Room", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST, {[]{return logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_SONG_OF_TIME) && logic->IronBoots && logic->WaterTimer >= 24;}}),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST, logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_SONG_OF_TIME) && logic->IronBoots && logic->WaterTimer >= 24),
                 }, {
                   //Exits
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE_RIGHT, {[]{return logic->CanUse(RG_SONG_OF_TIME) || logic->IsChild;}}),
@@ -67,8 +67,8 @@ void AreaTable_Init_GerudoTrainingGrounds() {
 
   areaTable[RR_GERUDO_TRAINING_GROUNDS_HAMMER_ROOM] = Area("Gerudo Training Grounds Hammer Room", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST,  {[]{return logic->CanAdultAttack || logic->CanChildAttack;}}),
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST, {[]{return logic->CanUse(RG_MEGATON_HAMMER) || (logic->CanTakeDamage && randoCtx->GetTrickOption(RT_FLAMING_CHESTS));}}),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST,  logic->CanAdultAttack || logic->CanChildAttack),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST, logic->CanUse(RG_MEGATON_HAMMER) || (logic->CanTakeDamage && randoCtx->GetTrickOption(RT_FLAMING_CHESTS))),
                 }, {
                   //Exits
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_EYE_STATUE_LOWER, {[]{return logic->CanUse(RG_MEGATON_HAMMER) && logic->CanUse(RG_FAIRY_BOW);}}),
@@ -77,7 +77,7 @@ void AreaTable_Init_GerudoTrainingGrounds() {
 
   areaTable[RR_GERUDO_TRAINING_GROUNDS_EYE_STATUE_LOWER] = Area("Gerudo Training Grounds Eye Statue Lower", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_EYE_STATUE_CHEST, {[]{return logic->CanUse(RG_FAIRY_BOW);}}),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_EYE_STATUE_CHEST, logic->CanUse(RG_FAIRY_BOW)),
                 }, {
                   //Exits
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_HAMMER_ROOM, {[]{return true;}}),
@@ -85,7 +85,7 @@ void AreaTable_Init_GerudoTrainingGrounds() {
 
   areaTable[RR_GERUDO_TRAINING_GROUNDS_EYE_STATUE_UPPER] = Area("Gerudo Training Grounds Eye Statue Upper", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_NEAR_SCARECROW_CHEST, {[]{return logic->CanUse(RG_FAIRY_BOW);}}),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_NEAR_SCARECROW_CHEST, logic->CanUse(RG_FAIRY_BOW)),
                 }, {
                   //Exits
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_EYE_STATUE_LOWER, {[]{return true;}}),
@@ -93,7 +93,7 @@ void AreaTable_Init_GerudoTrainingGrounds() {
 
   areaTable[RR_GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_ROOM] = Area("Gerudo Training Grounds Heavy Block Room", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST, {[]{return logic->CanJumpslash;}}),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST, logic->CanJumpslash),
                 }, {
                   //Exits
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_EYE_STATUE_UPPER, {[]{return (randoCtx->GetTrickOption(RT_LENS_GTG) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->CanUse(RG_HOOKSHOT) || (randoCtx->GetTrickOption(RT_GTG_FAKE_WALL) && logic->CanUse(RG_HOVER_BOOTS)));}}),
@@ -102,10 +102,10 @@ void AreaTable_Init_GerudoTrainingGrounds() {
 
   areaTable[RR_GERUDO_TRAINING_GROUNDS_LIKE_LIKE_ROOM] = Area("Gerudo Training Grounds Like Like Room", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST,  {[]{return logic->CanJumpslash;}}),
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST, {[]{return logic->CanJumpslash;}}),
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_THIRD_CHEST,  {[]{return logic->CanJumpslash;}}),
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FOURTH_CHEST, {[]{return logic->CanJumpslash;}}),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST,  logic->CanJumpslash),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST, logic->CanJumpslash),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_THIRD_CHEST,  logic->CanJumpslash),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FOURTH_CHEST, logic->CanJumpslash),
   }, {});
   }
 
@@ -115,12 +115,12 @@ void AreaTable_Init_GerudoTrainingGrounds() {
   if (randoCtx->GetDungeon(GERUDO_TRAINING_GROUNDS)->IsMQ()) {
   areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_LOBBY] = Area("Gerudo Training Grounds MQ Lobby", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST,       {[]{return true;}}),
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST,      {[]{return true;}}),
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_HIDDEN_CEILING_CHEST,   {[]{return randoCtx->GetTrickOption(RT_LENS_GTG_MQ) || logic->CanUse(RG_LENS_OF_TRUTH);}}),
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_FIRST_CHEST,  {[]{return true;}}),
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_SECOND_CHEST, {[]{return true;}}),
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_THIRD_CHEST,  {[]{return logic->SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 1);}}),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST,       true),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST,      true),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_HIDDEN_CEILING_CHEST,   randoCtx->GetTrickOption(RT_LENS_GTG_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_FIRST_CHEST,  true),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_SECOND_CHEST, true),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_THIRD_CHEST,  logic->SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 1)),
   }, {
                   //Exits
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_ENTRYWAY,      {[]{return true;}}),
@@ -133,7 +133,7 @@ void AreaTable_Init_GerudoTrainingGrounds() {
                   //EventAccess(&WallFairy, {[]{return WallFairy || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW));}}),
   }, {
                   //Locations
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_DINOLFOS_CHEST, {[]{return logic->IsAdult && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BIGGORON_SWORD));}}),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_DINOLFOS_CHEST, logic->IsAdult && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BIGGORON_SWORD))),
   }, {
                   //Exits
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER, {[]{return (logic->Bow || (logic->CanUse(RG_LONGSHOT) && logic->HasFireSource)) && logic->CanUse(RG_HOVER_BOOTS) && logic->IsAdult && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BIGGORON_SWORD));}}),
@@ -141,12 +141,12 @@ void AreaTable_Init_GerudoTrainingGrounds() {
 
   areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER] = Area("Gerudo Training Grounds MQ Underwater", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST, {[]{return logic->HasFireSource && logic->IsAdult && logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer >= 24 && logic->CanTakeDamage;}}),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST, logic->HasFireSource && logic->IsAdult && logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer >= 24 && logic->CanTakeDamage),
   }, {});
 
   areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_LEFT_SIDE] = Area("Gerudo Training Grounds MQ Left Side", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST, {[]{return logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->HasExplosives;}}),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST, logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->HasExplosives),
   }, {
                   //Exits
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_STALFOS_ROOM, {[]{return (logic->IsAdult && logic->CanUse(RG_LONGSHOT)) || randoCtx->GetTrickOption(RT_GTG_MQ_WIHTOUT_HOOKSHOT) || (randoCtx->GetTrickOption(RT_GTG_MQ_WITH_HOOKSHOT) && logic->IsAdult && logic->CanUse(RG_HOOKSHOT));}}),
@@ -158,8 +158,8 @@ void AreaTable_Init_GerudoTrainingGrounds() {
                   EventAccess(&logic->BlueFireAccess,  {[]{return logic->BlueFireAccess || logic->HasBottle;}}),
   }, {
                   //Locations
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_BEFORE_HEAVY_BLOCK_CHEST, {[]{return logic->IsAdult && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD));}}),
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_HEAVY_BLOCK_CHEST,        {[]{return logic->CanUse(RG_SILVER_GAUNTLETS) && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD));}}),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_BEFORE_HEAVY_BLOCK_CHEST, logic->IsAdult && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD))),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_HEAVY_BLOCK_CHEST,        logic->CanUse(RG_SILVER_GAUNTLETS) && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD))),
   }, {
                   //Exits
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_BACK_AREAS, {[]{return logic->IsAdult && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && (randoCtx->GetTrickOption(RT_LENS_GTG_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->BlueFire && (logic->CanUse(RG_SONG_OF_TIME) || (randoCtx->GetTrickOption(RT_GTG_FAKE_WALL) && logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS)));}}),
@@ -168,9 +168,9 @@ void AreaTable_Init_GerudoTrainingGrounds() {
 
   areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_BACK_AREAS] = Area("Gerudo Training Grounds MQ Back Areas", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_EYE_STATUE_CHEST,          {[]{return logic->CanUse(RG_FAIRY_BOW);}}),
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_SECOND_IRON_KNUCKLE_CHEST, {[]{return logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD);}}),
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_FLAME_CIRCLE_CHEST,        {[]{return logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->HasExplosives;}}),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_EYE_STATUE_CHEST,          logic->CanUse(RG_FAIRY_BOW)),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_SECOND_IRON_KNUCKLE_CHEST, logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_FLAME_CIRCLE_CHEST,        logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->HasExplosives),
   }, {
                   //Exits
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_CENTRAL_MAZE_RIGHT, {[]{return logic->CanUse(RG_MEGATON_HAMMER);}}),
@@ -179,9 +179,9 @@ void AreaTable_Init_GerudoTrainingGrounds() {
 
   areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_CENTRAL_MAZE_RIGHT] = Area("Gerudo Training Grounds MQ Central Maze Right", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_CENTRAL_CHEST, {[]{return true;}}),
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_SIDE_CHEST,    {[]{return true;}}),
-                  LocationAccess(RC_GERUDO_TRAINING_GROUND_MQ_ICE_ARROWS_CHEST,         {[]{return logic->SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 3);}}),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_CENTRAL_CHEST, true),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_SIDE_CHEST,    true),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_ICE_ARROWS_CHEST,         logic->SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 3)),
   }, {
                   //Exits
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER,  {[]{return logic->IsAdult && (logic->CanUse(RG_LONGSHOT) || (logic->CanUse(RG_HOOKSHOT) && logic->Bow));}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
index a81627656..554003434 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
@@ -9,7 +9,7 @@ void AreaTable_Init_GerudoValley() {
                   EventAccess(&logic->BugRock, {[]{return logic->BugRock || logic->IsChild;}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_GV_GS_SMALL_BRIDGE, {[]{return logic->IsChild && logic->HookshotOrBoomerang && logic->AtNight && logic->CanGetNightTimeGS;}}),
+                  LOCATION(RC_GV_GS_SMALL_BRIDGE, logic->IsChild && logic->HookshotOrBoomerang && logic->AtNight && logic->CanGetNightTimeGS),
                 }, {
                   //Exits
                   Entrance(RR_HYRULE_FIELD,      {[]{return true;}}),
@@ -25,10 +25,10 @@ void AreaTable_Init_GerudoValley() {
                   EventAccess(&logic->BeanPlantFairy,   {[]{return logic->BeanPlantFairy   || (CanPlantBean(RR_GV_UPPER_STREAM) && logic->CanUse(RG_SONG_OF_STORMS));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_GV_WATERFALL_FREESTANDING_POH, {[]{return logic->IsChild || logic->Swim;}}),//can use cucco as child
-                  LocationAccess(RC_GV_GS_BEAN_PATCH,              {[]{return logic->CanPlantBugs && logic->CanChildAttack;}}),
-                  LocationAccess(RC_GV_COW,                        {[]{return logic->IsChild && logic->CanUse(RG_EPONAS_SONG);}}),
-                  LocationAccess(RC_GV_GOSSIP_STONE,               {[]{return true;}}),
+                  LOCATION(RC_GV_WATERFALL_FREESTANDING_POH, logic->IsChild || logic->Swim),//can use cucco as child
+                  LOCATION(RC_GV_GS_BEAN_PATCH,              logic->CanPlantBugs && logic->CanChildAttack),
+                  LOCATION(RC_GV_COW,                        logic->IsChild && logic->CanUse(RG_EPONAS_SONG)),
+                  LOCATION(RC_GV_GOSSIP_STONE,               true),
                 }, {
                   //Exits
                   Entrance(RR_GV_LOWER_STREAM, {[]{return true;}}),
@@ -48,7 +48,7 @@ void AreaTable_Init_GerudoValley() {
 
   areaTable[RR_GV_CRATE_LEDGE] = Area("GV Crate Ledge", "Gerudo Valley", RA_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_GV_CRATE_FREESTANDING_POH, {[]{return true;}}),
+                  LOCATION(RC_GV_CRATE_FREESTANDING_POH, true),
                 }, {
                   //Exits
                   Entrance(RR_GV_LOWER_STREAM, {[]{return true;}}),
@@ -59,10 +59,10 @@ void AreaTable_Init_GerudoValley() {
                   EventAccess(&logic->BrokenSwordAccess, {[]{return logic->IsAdult && (logic->PoachersSawAccess || logic->PoachersSaw);}}),
                 }, {
                   //Locations                                       
-                  LocationAccess(RC_GV_CHEST,          {[]{return logic->IsAdult && logic->CanUse(RG_MEGATON_HAMMER);}}),
-                  LocationAccess(RC_GV_TRADE_SAW,      {[]{return logic->IsAdult && logic->PoachersSaw;}}),
-                  LocationAccess(RC_GV_GS_BEHIND_TENT, {[]{return logic->IsAdult && logic->HookshotOrBoomerang && logic->AtNight && logic->CanGetNightTimeGS;}}),
-                  LocationAccess(RC_GV_GS_PILLAR,      {[]{return logic->IsAdult && logic->HookshotOrBoomerang && logic->AtNight && logic->CanGetNightTimeGS;}}),
+                  LOCATION(RC_GV_CHEST,          logic->IsAdult && logic->CanUse(RG_MEGATON_HAMMER)),
+                  LOCATION(RC_GV_TRADE_SAW,      logic->IsAdult && logic->PoachersSaw),
+                  LOCATION(RC_GV_GS_BEHIND_TENT, logic->IsAdult && logic->HookshotOrBoomerang && logic->AtNight && logic->CanGetNightTimeGS),
+                  LOCATION(RC_GV_GS_PILLAR,      logic->IsAdult && logic->HookshotOrBoomerang && logic->AtNight && logic->CanGetNightTimeGS),
                 }, {
                   //Exits
                   Entrance(RR_GERUDO_FORTRESS,   {[]{return true;}}),
@@ -85,9 +85,9 @@ void AreaTable_Init_GerudoValley() {
 
   areaTable[RR_GV_STORMS_GROTTO] = Area("GV Storms Grotto", "GV Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_GV_DEKU_SCRUB_GROTTO_REAR,    {[]{return logic->CanStunDeku;}}),
-                  LocationAccess(RC_GV_DEKU_SCRUB_GROTTO_FRONT,   {[]{return logic->CanStunDeku;}}),
-                  LocationAccess(RC_GV_DEKU_SCRUB_GROTTO_BEEHIVE, {[]{return logic->CanBreakUpperBeehives;}}),
+                  LOCATION(RC_GV_DEKU_SCRUB_GROTTO_REAR,    logic->CanStunDeku),
+                  LOCATION(RC_GV_DEKU_SCRUB_GROTTO_FRONT,   logic->CanStunDeku),
+                  LOCATION(RC_GV_DEKU_SCRUB_GROTTO_BEEHIVE, logic->CanBreakUpperBeehives),
                 }, {
                   //Exits
                   Entrance(RR_GV_FORTRESS_SIDE, {[]{return true;}}),
@@ -100,16 +100,16 @@ void AreaTable_Init_GerudoValley() {
                   EventAccess(&logic->GtG_GateOpen,    {[]{return logic->GtG_GateOpen || (logic->IsAdult && logic->GerudoToken && logic->ChildsWallet);}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_GF_CHEST,              {[]{return logic->CanUse(RG_HOVER_BOOTS) || (logic->IsAdult && logic->CanUse(RG_SCARECROW)) || logic->CanUse(RG_LONGSHOT);}}),
-                  LocationAccess(RC_GF_HBA_1000_POINTS,    {[]{return logic->ChildsWallet && logic->GerudoToken && logic->CanRideEpona && logic->Bow && logic->AtDay;}}),
-                  LocationAccess(RC_GF_HBA_1500_POINTS,    {[]{return logic->ChildsWallet && logic->GerudoToken && logic->CanRideEpona && logic->Bow && logic->AtDay;}}),
-                  LocationAccess(RC_GF_NORTH_F1_CARPENTER, {[]{return  logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD);}}),
-                  LocationAccess(RC_GF_NORTH_F2_CARPENTER, {[]{return (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && (logic->GerudoToken || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_HOVER_BOOTS) || randoCtx->GetTrickOption(RT_GF_KITCHEN));}}),
-                  LocationAccess(RC_GF_SOUTH_F1_CARPENTER, {[]{return  logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD);}}),
-                  LocationAccess(RC_GF_SOUTH_F2_CARPENTER, {[]{return  logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD);}}),
-                  LocationAccess(RC_GF_GERUDO_MEMBERSHIP_CARD,       {[]{return logic->CanFinishGerudoFortress;}}),
-                  LocationAccess(RC_GF_GS_ARCHERY_RANGE,   {[]{return logic->IsAdult && logic->HookshotOrBoomerang && logic->GerudoToken && logic->AtNight && logic->CanGetNightTimeGS;}}),
-                  LocationAccess(RC_GF_GS_TOP_FLOOR,       {[]{return logic->IsAdult && logic->AtNight && (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG) || logic->HasExplosives || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_DINS_FIRE)) && (logic->GerudoToken || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_HOVER_BOOTS) || randoCtx->GetTrickOption(RT_GF_KITCHEN) || randoCtx->GetTrickOption(RT_GF_JUMP)) && logic->CanGetNightTimeGS;}}),
+                  LOCATION(RC_GF_CHEST,              logic->CanUse(RG_HOVER_BOOTS) || (logic->IsAdult && logic->CanUse(RG_SCARECROW)) || logic->CanUse(RG_LONGSHOT)),
+                  LOCATION(RC_GF_HBA_1000_POINTS,    logic->ChildsWallet && logic->GerudoToken && logic->CanRideEpona && logic->Bow && logic->AtDay),
+                  LOCATION(RC_GF_HBA_1500_POINTS,    logic->ChildsWallet && logic->GerudoToken && logic->CanRideEpona && logic->Bow && logic->AtDay),
+                  LOCATION(RC_GF_NORTH_F1_CARPENTER,  logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)),
+                  LOCATION(RC_GF_NORTH_F2_CARPENTER, (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && (logic->GerudoToken || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_HOVER_BOOTS) || randoCtx->GetTrickOption(RT_GF_KITCHEN))),
+                  LOCATION(RC_GF_SOUTH_F1_CARPENTER,  logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)),
+                  LOCATION(RC_GF_SOUTH_F2_CARPENTER,  logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)),
+                  LOCATION(RC_GF_GERUDO_MEMBERSHIP_CARD,       logic->CanFinishGerudoFortress),
+                  LOCATION(RC_GF_GS_ARCHERY_RANGE,   logic->IsAdult && logic->HookshotOrBoomerang && logic->GerudoToken && logic->AtNight && logic->CanGetNightTimeGS),
+                  LOCATION(RC_GF_GS_TOP_FLOOR,       logic->IsAdult && logic->AtNight && (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG) || logic->HasExplosives || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_DINS_FIRE)) && (logic->GerudoToken || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_HOVER_BOOTS) || randoCtx->GetTrickOption(RT_GF_KITCHEN) || randoCtx->GetTrickOption(RT_GF_JUMP)) && logic->CanGetNightTimeGS),
                 }, {
                   //Exits
                   Entrance(RR_GV_FORTRESS_SIDE,                 {[]{return true;}}),
@@ -147,9 +147,9 @@ void AreaTable_Init_GerudoValley() {
                   EventAccess(&logic->NutPot,   {[]{return true;}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_WASTELAND_CHEST,            {[]{return logic->HasFireSource;}}),
-                  LocationAccess(RC_WASTELAND_BOMBCHU_SALESMAN, {[]{return logic->AdultsWallet && (logic->CanJumpslash || logic->CanUse(RG_HOVER_BOOTS)) ;}}),
-                  LocationAccess(RC_WASTELAND_GS,               {[]{return logic->HookshotOrBoomerang;}}),
+                  LOCATION(RC_WASTELAND_CHEST,            logic->HasFireSource),
+                  LOCATION(RC_WASTELAND_BOMBCHU_SALESMAN, logic->AdultsWallet && (logic->CanJumpslash || logic->CanUse(RG_HOVER_BOOTS)) ),
+                  LOCATION(RC_WASTELAND_GS,               logic->HookshotOrBoomerang),
                 }, {
                   //Exits
                   Entrance(RR_WASTELAND_NEAR_COLOSSUS, {[]{return randoCtx->GetTrickOption(RT_LENS_HW) || logic->CanUse(RG_LENS_OF_TRUTH);}}),
@@ -168,11 +168,11 @@ void AreaTable_Init_GerudoValley() {
                   EventAccess(&logic->BugRock,   {[]{return true;}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_COLOSSUS_FREESTANDING_POH, {[]{return logic->IsAdult && CanPlantBean(RR_DESERT_COLOSSUS);}}),
-                  LocationAccess(RC_COLOSSUS_GS_BEAN_PATCH,    {[]{return logic->CanPlantBugs && logic->CanChildAttack;}}),
-                  LocationAccess(RC_COLOSSUS_GS_TREE,          {[]{return logic->IsAdult && logic->HookshotOrBoomerang && logic->AtNight && logic->CanGetNightTimeGS;}}),
-                  LocationAccess(RC_COLOSSUS_GS_HILL,          {[]{return logic->IsAdult && logic->AtNight && ((CanPlantBean(RR_DESERT_COLOSSUS) && logic->CanAdultAttack) || logic->CanUse(RG_LONGSHOT) || (randoCtx->GetTrickOption(RT_COLOSSUS_GS) && logic->CanUse(RG_HOOKSHOT))) && logic->CanGetNightTimeGS;}}),
-                  LocationAccess(RC_COLOSSUS_GOSSIP_STONE,     {[]{return true;}}),
+                  LOCATION(RC_COLOSSUS_FREESTANDING_POH, logic->IsAdult && CanPlantBean(RR_DESERT_COLOSSUS)),
+                  LOCATION(RC_COLOSSUS_GS_BEAN_PATCH,    logic->CanPlantBugs && logic->CanChildAttack),
+                  LOCATION(RC_COLOSSUS_GS_TREE,          logic->IsAdult && logic->HookshotOrBoomerang && logic->AtNight && logic->CanGetNightTimeGS),
+                  LOCATION(RC_COLOSSUS_GS_HILL,          logic->IsAdult && logic->AtNight && ((CanPlantBean(RR_DESERT_COLOSSUS) && logic->CanAdultAttack) || logic->CanUse(RG_LONGSHOT) || (randoCtx->GetTrickOption(RT_COLOSSUS_GS) && logic->CanUse(RG_HOOKSHOT))) && logic->CanGetNightTimeGS),
+                  LOCATION(RC_COLOSSUS_GOSSIP_STONE,     true),
                 }, {
                   //Exits
                   Entrance(RR_COLOSSUS_GREAT_FAIRY_FOUNTAIN, {[]{return logic->HasExplosives;}}),
@@ -183,7 +183,7 @@ void AreaTable_Init_GerudoValley() {
 
   areaTable[RR_DESERT_COLOSSUS_FROM_SPIRIT_ENTRYWAY] = Area("Desert Colossus From Spirit Entryway", "Desert Colossus", RA_DESERT_COLOSSUS, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SHEIK_AT_COLOSSUS, {[]{return true;}}),
+                  LOCATION(RC_SHEIK_AT_COLOSSUS, true),
                 }, {
                   //Exist
                   Entrance(RR_DESERT_COLOSSUS, {[]{return true;}}),
@@ -191,7 +191,7 @@ void AreaTable_Init_GerudoValley() {
 
   areaTable[RR_COLOSSUS_GREAT_FAIRY_FOUNTAIN] = Area("Colossus Great Fairy Fountain", "Colossus Great Fairy Fountain", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_COLOSSUS_GREAT_FAIRY_REWARD, {[]{return logic->CanUse(RG_ZELDAS_LULLABY);}}),
+                  LOCATION(RC_COLOSSUS_GREAT_FAIRY_REWARD, logic->CanUse(RG_ZELDAS_LULLABY)),
                 }, {
                   //Exits
                   Entrance(RR_DESERT_COLOSSUS, {[]{return true;}}),
@@ -199,9 +199,9 @@ void AreaTable_Init_GerudoValley() {
 
   areaTable[RR_COLOSSUS_GROTTO] = Area("Colossus Grotto", "Colossus Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,  {[]{return logic->CanStunDeku;}}),
-                  LocationAccess(RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT, {[]{return logic->CanStunDeku;}}),
-                  LocationAccess(RC_COLOSSUS_GROTTO_BEEHIVE,          {[]{return logic->CanBreakUpperBeehives;}}),
+                  LOCATION(RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,  logic->CanStunDeku),
+                  LOCATION(RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT, logic->CanStunDeku),
+                  LOCATION(RC_COLOSSUS_GROTTO_BEEHIVE,          logic->CanBreakUpperBeehives),
                 }, {
                   //Exits
                   Entrance(RR_DESERT_COLOSSUS, {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
index 8c3d6a5b1..d5d966308 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
@@ -9,8 +9,8 @@ void AreaTable_Init_HyruleField() {
                   EventAccess(&logic->BigPoeKill, {[]{return logic->CanUse(RG_FAIRY_BOW) && logic->CanRideEpona && logic->HasBottle;}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_HF_OCARINA_OF_TIME_ITEM,   {[]{return logic->IsChild && logic->HasAllStones;}}),
-                  LocationAccess(RC_SONG_FROM_OCARINA_OF_TIME, {[]{return logic->IsChild && logic->HasAllStones;}}),
+                  LOCATION(RC_HF_OCARINA_OF_TIME_ITEM,   logic->IsChild && logic->HasAllStones),
+                  LOCATION(RC_SONG_FROM_OCARINA_OF_TIME, logic->IsChild && logic->HasAllStones),
                 }, {
                   //Exits
                   Entrance(RR_LW_BRIDGE,              {[]{return true;}}),
@@ -32,11 +32,11 @@ void AreaTable_Init_HyruleField() {
 
   areaTable[RR_HF_SOUTHEAST_GROTTO] = Area("HF Southeast Grotto", "HF Southeast Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
-                  LocationAccess(RC_HF_SOUTHEAST_GROTTO_CHEST,         {[]{return true;}}),
-                  LocationAccess(RC_HF_SOUTHEAST_GROTTO_FISH,          {[]{return logic->HasBottle;}}),
-                  LocationAccess(RC_HF_SOUTHEAST_GROTTO_GOSSIP_STONE,         {[]{return true;}}),
-                  LocationAccess(RC_HF_SOUTHEAST_GROTTO_BEEHIVE_LEFT,  {[]{return logic->CanBreakLowerBeehives;}}),
-                  LocationAccess(RC_HF_SOUTHEAST_GROTTO_BEEHIVE_RIGHT, {[]{return logic->CanBreakLowerBeehives;}}),
+                  LOCATION(RC_HF_SOUTHEAST_GROTTO_CHEST,         true),
+                  LOCATION(RC_HF_SOUTHEAST_GROTTO_FISH,          logic->HasBottle),
+                  LOCATION(RC_HF_SOUTHEAST_GROTTO_GOSSIP_STONE,  true),
+                  LOCATION(RC_HF_SOUTHEAST_GROTTO_BEEHIVE_LEFT,  logic->CanBreakLowerBeehives),
+                  LOCATION(RC_HF_SOUTHEAST_GROTTO_BEEHIVE_RIGHT, logic->CanBreakLowerBeehives),
                 }, {
                   //Exits
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
@@ -44,11 +44,11 @@ void AreaTable_Init_HyruleField() {
 
   areaTable[RR_HF_OPEN_GROTTO] = Area("HF Open Grotto", "HF Open Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
-                  LocationAccess(RC_HF_OPEN_GROTTO_CHEST,         {[]{return true;}}),
-                  LocationAccess(RC_HF_OPEN_GROTTO_FISH,          {[]{return logic->HasBottle;}}),
-                  LocationAccess(RC_HF_OPEN_GROTTO_GOSSIP_STONE,  {[]{return true;}}),
-                  LocationAccess(RC_HF_OPEN_GROTTO_BEEHIVE_LEFT,  {[]{return logic->CanBreakLowerBeehives;}}),
-                  LocationAccess(RC_HF_OPEN_GROTTO_BEEHIVE_RIGHT, {[]{return logic->CanBreakLowerBeehives;}}),
+                  LOCATION(RC_HF_OPEN_GROTTO_CHEST,         true),
+                  LOCATION(RC_HF_OPEN_GROTTO_FISH,          logic->HasBottle),
+                  LOCATION(RC_HF_OPEN_GROTTO_GOSSIP_STONE,  true),
+                  LOCATION(RC_HF_OPEN_GROTTO_BEEHIVE_LEFT,  logic->CanBreakLowerBeehives),
+                  LOCATION(RC_HF_OPEN_GROTTO_BEEHIVE_RIGHT, logic->CanBreakLowerBeehives),
                 }, {
                   //Exits
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
@@ -56,8 +56,8 @@ void AreaTable_Init_HyruleField() {
 
   areaTable[RR_HF_INSIDE_FENCE_GROTTO] = Area("HF Inside Fence Grotto", "HF Inside Fence Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_HF_DEKU_SCRUB_GROTTO,           {[]{return logic->CanStunDeku;}}),
-                  LocationAccess(RC_HF_INSIDE_FENCE_GROTTO_BEEHIVE, {[]{return logic->CanBreakLowerBeehives;}}),
+                  LOCATION(RC_HF_DEKU_SCRUB_GROTTO,           logic->CanStunDeku),
+                  LOCATION(RC_HF_INSIDE_FENCE_GROTTO_BEEHIVE, logic->CanBreakLowerBeehives),
                 }, {
                   //Exits
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
@@ -65,9 +65,9 @@ void AreaTable_Init_HyruleField() {
 
   areaTable[RR_HF_COW_GROTTO] = Area("HF Cow Grotto", "HF Cow Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
-                  LocationAccess(RC_HF_GS_COW_GROTTO,           {[]{return logic->HasFireSource && logic->HookshotOrBoomerang;}}),
-                  LocationAccess(RC_HF_COW_GROTTO_COW,          {[]{return logic->HasFireSource && logic->CanUse(RG_EPONAS_SONG);}}),
-                  LocationAccess(RC_HF_COW_GROTTO_GOSSIP_STONE, {[]{return logic->HasFireSource;}}),
+                  LOCATION(RC_HF_GS_COW_GROTTO,           logic->HasFireSource && logic->HookshotOrBoomerang),
+                  LOCATION(RC_HF_COW_GROTTO_COW,          logic->HasFireSource && logic->CanUse(RG_EPONAS_SONG)),
+                  LOCATION(RC_HF_COW_GROTTO_GOSSIP_STONE, logic->HasFireSource),
                 }, {
                   //Exits
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
@@ -75,11 +75,11 @@ void AreaTable_Init_HyruleField() {
 
   areaTable[RR_HF_NEAR_MARKET_GROTTO] = Area("HF Near Market Grotto", "HF Near Market Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
-                  LocationAccess(RC_HF_NEAR_MARKET_GROTTO_CHEST,         {[]{return true;}}),
-                  LocationAccess(RC_HF_NEAR_MARKET_GROTTO_FISH,          {[]{return logic->HasBottle;}}),
-                  LocationAccess(RC_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE,         {[]{return true;}}),
-                  LocationAccess(RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_LEFT,  {[]{return logic->CanBreakLowerBeehives;}}),
-                  LocationAccess(RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_RIGHT, {[]{return logic->CanBreakLowerBeehives;}}),
+                  LOCATION(RC_HF_NEAR_MARKET_GROTTO_CHEST,         true),
+                  LOCATION(RC_HF_NEAR_MARKET_GROTTO_FISH,          logic->HasBottle),
+                  LOCATION(RC_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE,  true),
+                  LOCATION(RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_LEFT,  logic->CanBreakLowerBeehives),
+                  LOCATION(RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_RIGHT, logic->CanBreakLowerBeehives),
                 }, {
                   //Exits
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
@@ -95,7 +95,7 @@ void AreaTable_Init_HyruleField() {
 
   areaTable[RR_HF_NEAR_KAK_GROTTO] = Area("HF Near Kak Grotto", "HF Near Kak Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_HF_GS_NEAR_KAK_GROTTO, {[]{return logic->HookshotOrBoomerang;}}),
+                  LOCATION(RC_HF_GS_NEAR_KAK_GROTTO, logic->HookshotOrBoomerang),
                 }, {
                   //Exits
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
@@ -103,7 +103,7 @@ void AreaTable_Init_HyruleField() {
 
   areaTable[RR_HF_TEKTITE_GROTTO] = Area("HF Tektite Grotto", "HF Tektite Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_HF_TEKTITE_GROTTO_FREESTANDING_POH, {[]{return logic->ProgressiveScale >= 2 || logic->CanUse(RG_IRON_BOOTS);}}),
+                  LOCATION(RC_HF_TEKTITE_GROTTO_FREESTANDING_POH, logic->ProgressiveScale >= 2 || logic->CanUse(RG_IRON_BOOTS)),
                 }, {
                   //Exits
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
@@ -119,16 +119,16 @@ void AreaTable_Init_HyruleField() {
                   EventAccess(&logic->AdultScarecrow,   {[]{return logic->AdultScarecrow   || (logic->IsAdult && logic->Ocarina && logic->OcarinaButtons >= 2);}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_LH_UNDERWATER_ITEM,        {[]{return logic->IsChild && logic->CanDive;}}),
-                  LocationAccess(RC_LH_SUN,                    {[]{return logic->IsAdult && logic->WaterTempleClear && logic->CanUse(RG_FAIRY_BOW);}}),
-                  LocationAccess(RC_LH_FREESTANDING_POH,       {[]{return logic->IsAdult && (logic->CanUse(RG_SCARECROW) || CanPlantBean(RR_LAKE_HYLIA));}}),
-                  LocationAccess(RC_LH_GS_BEAN_PATCH,          {[]{return logic->CanPlantBugs && logic->CanChildAttack;}}),
-                  LocationAccess(RC_LH_GS_LAB_WALL,            {[]{return logic->IsChild && (logic->HookshotOrBoomerang || (randoCtx->GetTrickOption(RT_LH_LAB_WALL_GS) && logic->CanJumpslash)) && logic->AtNight && logic->CanGetNightTimeGS;}}),
-                  LocationAccess(RC_LH_GS_SMALL_ISLAND,        {[]{return logic->IsChild && logic->CanChildAttack && logic->AtNight && logic->CanGetNightTimeGS;}}),
-                  LocationAccess(RC_LH_GS_TREE,                {[]{return logic->IsAdult && logic->CanUse(RG_LONGSHOT) && logic->AtNight && logic->CanGetNightTimeGS;}}),
-                  LocationAccess(RC_LH_LAB_GOSSIP_STONE,       {[]{return true;}}),
-                  LocationAccess(RC_LH_SOUTHEAST_GOSSIP_STONE, {[]{return true;}}),
-                  LocationAccess(RC_LH_SOUTHWEST_GOSSIP_STONE, {[]{return true;}}),
+                  LOCATION(RC_LH_UNDERWATER_ITEM,        logic->IsChild && logic->CanDive),
+                  LOCATION(RC_LH_SUN,                    logic->IsAdult && logic->WaterTempleClear && logic->CanUse(RG_FAIRY_BOW)),
+                  LOCATION(RC_LH_FREESTANDING_POH,       logic->IsAdult && (logic->CanUse(RG_SCARECROW) || CanPlantBean(RR_LAKE_HYLIA))),
+                  LOCATION(RC_LH_GS_BEAN_PATCH,          logic->CanPlantBugs && logic->CanChildAttack),
+                  LOCATION(RC_LH_GS_LAB_WALL,            logic->IsChild && (logic->HookshotOrBoomerang || (randoCtx->GetTrickOption(RT_LH_LAB_WALL_GS) && logic->CanJumpslash)) && logic->AtNight && logic->CanGetNightTimeGS),
+                  LOCATION(RC_LH_GS_SMALL_ISLAND,        logic->IsChild && logic->CanChildAttack && logic->AtNight && logic->CanGetNightTimeGS),
+                  LOCATION(RC_LH_GS_TREE,                logic->IsAdult && logic->CanUse(RG_LONGSHOT) && logic->AtNight && logic->CanGetNightTimeGS),
+                  LOCATION(RC_LH_LAB_GOSSIP_STONE,       true),
+                  LOCATION(RC_LH_SOUTHEAST_GOSSIP_STONE, true),
+                  LOCATION(RC_LH_SOUTHWEST_GOSSIP_STONE, true),
                 }, {
                   //Exits
                   Entrance(RR_HYRULE_FIELD,          {[]{return true;}}),
@@ -156,9 +156,9 @@ void AreaTable_Init_HyruleField() {
                   EventAccess(&logic->EyedropsAccess, {[]{return logic->EyedropsAccess || (logic->IsAdult && (logic->EyeballFrogAccess || (logic->EyeballFrog && logic->DisableTradeRevert)));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_LH_LAB_DIVE,     {[]{return logic->ProgressiveScale >= 2 || (randoCtx->GetTrickOption(RT_LH_LAB_DIVING) && logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_HOOKSHOT));}}),
-                  LocationAccess(RC_LH_TRADE_FROG,   {[]{return logic->IsAdult && logic->EyeballFrog;}}),
-                  LocationAccess(RC_LH_GS_LAB_CRATE, {[]{return logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_HOOKSHOT);}}),
+                  LOCATION(RC_LH_LAB_DIVE,     logic->ProgressiveScale >= 2 || (randoCtx->GetTrickOption(RT_LH_LAB_DIVING) && logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_HOOKSHOT))),
+                  LOCATION(RC_LH_TRADE_FROG,   logic->IsAdult && logic->EyeballFrog),
+                  LOCATION(RC_LH_GS_LAB_CRATE, logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_HOOKSHOT)),
                 }, {
                   //Exits
                   Entrance(RR_LAKE_HYLIA, {[]{return true;}}),
@@ -167,42 +167,42 @@ void AreaTable_Init_HyruleField() {
   // TODO: should some of these helpers be done via events instead?
   areaTable[RR_LH_FISHING_HOLE] = Area("LH Fishing Hole", "LH Fishing Hole", RA_NONE, DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_LH_CHILD_FISHING, {[]{return logic->CanFish && logic->IsChild;}}),
-                  LocationAccess(RC_LH_CHILD_FISH_1,  {[]{return logic->CanGetChildFish;}}),
-                  LocationAccess(RC_LH_CHILD_FISH_2,  {[]{return logic->CanGetChildFish;}}),
-                  LocationAccess(RC_LH_CHILD_FISH_3,  {[]{return logic->CanGetChildFish;}}),
-                  LocationAccess(RC_LH_CHILD_FISH_4,  {[]{return logic->CanGetChildFish;}}),
-                  LocationAccess(RC_LH_CHILD_FISH_5,  {[]{return logic->CanGetChildFish;}}),
-                  LocationAccess(RC_LH_CHILD_FISH_6,  {[]{return logic->CanGetChildFish;}}),
-                  LocationAccess(RC_LH_CHILD_FISH_7,  {[]{return logic->CanGetChildFish;}}),
-                  LocationAccess(RC_LH_CHILD_FISH_8,  {[]{return logic->CanGetChildFish;}}),
-                  LocationAccess(RC_LH_CHILD_FISH_9,  {[]{return logic->CanGetChildFish;}}),
-                  LocationAccess(RC_LH_CHILD_FISH_10, {[]{return logic->CanGetChildFish;}}),
-                  LocationAccess(RC_LH_CHILD_FISH_11, {[]{return logic->CanGetChildFish;}}),
-                  LocationAccess(RC_LH_CHILD_FISH_12, {[]{return logic->CanGetChildFish;}}),
-                  LocationAccess(RC_LH_CHILD_FISH_13, {[]{return logic->CanGetChildFish;}}),
-                  LocationAccess(RC_LH_CHILD_FISH_14, {[]{return logic->CanGetChildFish;}}),
-                  LocationAccess(RC_LH_CHILD_FISH_15, {[]{return logic->CanGetChildFish;}}),
-                  LocationAccess(RC_LH_CHILD_LOACH_1, {[]{return logic->CanGetChildFish;}}),
-                  LocationAccess(RC_LH_CHILD_LOACH_2, {[]{return logic->CanGetChildFish;}}),
-                  LocationAccess(RC_LH_ADULT_FISHING, {[]{return logic->CanFish && logic->IsAdult;}}),
-                  LocationAccess(RC_LH_ADULT_FISH_1,  {[]{return logic->CanGetAdultFish;}}),
-                  LocationAccess(RC_LH_ADULT_FISH_2,  {[]{return logic->CanGetAdultFish;}}),
-                  LocationAccess(RC_LH_ADULT_FISH_3,  {[]{return logic->CanGetAdultFish;}}),
-                  LocationAccess(RC_LH_ADULT_FISH_4,  {[]{return logic->CanGetAdultFish;}}),
-                  LocationAccess(RC_LH_ADULT_FISH_5,  {[]{return logic->CanGetAdultFish;}}),
-                  LocationAccess(RC_LH_ADULT_FISH_6,  {[]{return logic->CanGetAdultFish;}}),
-                  LocationAccess(RC_LH_ADULT_FISH_7,  {[]{return logic->CanGetAdultFish;}}),
-                  LocationAccess(RC_LH_ADULT_FISH_8,  {[]{return logic->CanGetAdultFish;}}),
-                  LocationAccess(RC_LH_ADULT_FISH_9,  {[]{return logic->CanGetAdultFish;}}),
-                  LocationAccess(RC_LH_ADULT_FISH_10, {[]{return logic->CanGetAdultFish;}}),
-                  LocationAccess(RC_LH_ADULT_FISH_11, {[]{return logic->CanGetAdultFish;}}),
-                  LocationAccess(RC_LH_ADULT_FISH_12, {[]{return logic->CanGetAdultFish;}}),
-                  LocationAccess(RC_LH_ADULT_FISH_13, {[]{return logic->CanGetAdultFish;}}),
-                  LocationAccess(RC_LH_ADULT_FISH_14, {[]{return logic->CanGetAdultFish;}}),
-                  LocationAccess(RC_LH_ADULT_FISH_15, {[]{return logic->CanGetAdultFish;}}),
-                  LocationAccess(RC_LH_ADULT_LOACH,   {[]{return logic->CanGetAdultFish;}}),
-                  LocationAccess(RC_FISHING_POLE_HINT,{[]{return true;}}),
+                  LOCATION(RC_LH_CHILD_FISHING, logic->CanFish && logic->IsChild),
+                  LOCATION(RC_LH_CHILD_FISH_1,  logic->CanGetChildFish),
+                  LOCATION(RC_LH_CHILD_FISH_2,  logic->CanGetChildFish),
+                  LOCATION(RC_LH_CHILD_FISH_3,  logic->CanGetChildFish),
+                  LOCATION(RC_LH_CHILD_FISH_4,  logic->CanGetChildFish),
+                  LOCATION(RC_LH_CHILD_FISH_5,  logic->CanGetChildFish),
+                  LOCATION(RC_LH_CHILD_FISH_6,  logic->CanGetChildFish),
+                  LOCATION(RC_LH_CHILD_FISH_7,  logic->CanGetChildFish),
+                  LOCATION(RC_LH_CHILD_FISH_8,  logic->CanGetChildFish),
+                  LOCATION(RC_LH_CHILD_FISH_9,  logic->CanGetChildFish),
+                  LOCATION(RC_LH_CHILD_FISH_10, logic->CanGetChildFish),
+                  LOCATION(RC_LH_CHILD_FISH_11, logic->CanGetChildFish),
+                  LOCATION(RC_LH_CHILD_FISH_12, logic->CanGetChildFish),
+                  LOCATION(RC_LH_CHILD_FISH_13, logic->CanGetChildFish),
+                  LOCATION(RC_LH_CHILD_FISH_14, logic->CanGetChildFish),
+                  LOCATION(RC_LH_CHILD_FISH_15, logic->CanGetChildFish),
+                  LOCATION(RC_LH_CHILD_LOACH_1, logic->CanGetChildFish),
+                  LOCATION(RC_LH_CHILD_LOACH_2, logic->CanGetChildFish),
+                  LOCATION(RC_LH_ADULT_FISHING, logic->CanFish && logic->IsAdult),
+                  LOCATION(RC_LH_ADULT_FISH_1,  logic->CanGetAdultFish),
+                  LOCATION(RC_LH_ADULT_FISH_2,  logic->CanGetAdultFish),
+                  LOCATION(RC_LH_ADULT_FISH_3,  logic->CanGetAdultFish),
+                  LOCATION(RC_LH_ADULT_FISH_4,  logic->CanGetAdultFish),
+                  LOCATION(RC_LH_ADULT_FISH_5,  logic->CanGetAdultFish),
+                  LOCATION(RC_LH_ADULT_FISH_6,  logic->CanGetAdultFish),
+                  LOCATION(RC_LH_ADULT_FISH_7,  logic->CanGetAdultFish),
+                  LOCATION(RC_LH_ADULT_FISH_8,  logic->CanGetAdultFish),
+                  LOCATION(RC_LH_ADULT_FISH_9,  logic->CanGetAdultFish),
+                  LOCATION(RC_LH_ADULT_FISH_10, logic->CanGetAdultFish),
+                  LOCATION(RC_LH_ADULT_FISH_11, logic->CanGetAdultFish),
+                  LOCATION(RC_LH_ADULT_FISH_12, logic->CanGetAdultFish),
+                  LOCATION(RC_LH_ADULT_FISH_13, logic->CanGetAdultFish),
+                  LOCATION(RC_LH_ADULT_FISH_14, logic->CanGetAdultFish),
+                  LOCATION(RC_LH_ADULT_FISH_15, logic->CanGetAdultFish),
+                  LOCATION(RC_LH_ADULT_LOACH,   logic->CanGetAdultFish),
+                  LOCATION(RC_FISHING_POLE_HINT,true),
                 }, {
                   //Exits
                   Entrance(RR_LH_FISHING_ISLAND, {[]{return true;}}),
@@ -210,10 +210,10 @@ void AreaTable_Init_HyruleField() {
 
   areaTable[RR_LH_GROTTO] = Area("LH Grotto", "LH Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_LH_DEKU_SCRUB_GROTTO_LEFT,   {[]{return logic->CanStunDeku;}}),
-                  LocationAccess(RC_LH_DEKU_SCRUB_GROTTO_RIGHT,  {[]{return logic->CanStunDeku;}}),
-                  LocationAccess(RC_LH_DEKU_SCRUB_GROTTO_CENTER, {[]{return logic->CanStunDeku;}}),
-                  LocationAccess(RC_LH_GROTTO_BEEHIVE,           {[]{return logic->CanBreakUpperBeehives;}}),
+                  LOCATION(RC_LH_DEKU_SCRUB_GROTTO_LEFT,   logic->CanStunDeku),
+                  LOCATION(RC_LH_DEKU_SCRUB_GROTTO_RIGHT,  logic->CanStunDeku),
+                  LOCATION(RC_LH_DEKU_SCRUB_GROTTO_CENTER, logic->CanStunDeku),
+                  LOCATION(RC_LH_GROTTO_BEEHIVE,           logic->CanBreakUpperBeehives),
                 }, {
                   //Exits
                   Entrance(RR_LAKE_HYLIA, {[]{return true;}}),
@@ -225,11 +225,11 @@ void AreaTable_Init_HyruleField() {
                   EventAccess(&logic->LinksCow, {[]{return logic->LinksCow || (logic->ChildsWallet && logic->CanUse(RG_EPONAS_SONG) && logic->IsAdult && logic->AtDay);}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_SONG_FROM_MALON,     {[]{return logic->IsChild && logic->ZeldasLetter && logic->Ocarina && logic->AtDay;}}),
-                  LocationAccess(RC_LLR_GS_TREE,         {[]{return logic->IsChild;}}),
-                  LocationAccess(RC_LLR_GS_RAIN_SHED,    {[]{return logic->IsChild && logic->AtNight && logic->CanGetNightTimeGS;}}),
-                  LocationAccess(RC_LLR_GS_HOUSE_WINDOW, {[]{return logic->IsChild && logic->HookshotOrBoomerang && logic->AtNight && logic->CanGetNightTimeGS;}}),
-                  LocationAccess(RC_LLR_GS_BACK_WALL,    {[]{return logic->IsChild && logic->HookshotOrBoomerang && logic->AtNight && logic->CanGetNightTimeGS;}}),
+                  LOCATION(RC_SONG_FROM_MALON,     logic->IsChild && logic->ZeldasLetter && logic->Ocarina && logic->AtDay),
+                  LOCATION(RC_LLR_GS_TREE,         logic->IsChild),
+                  LOCATION(RC_LLR_GS_RAIN_SHED,    logic->IsChild && logic->AtNight && logic->CanGetNightTimeGS),
+                  LOCATION(RC_LLR_GS_HOUSE_WINDOW, logic->IsChild && logic->HookshotOrBoomerang && logic->AtNight && logic->CanGetNightTimeGS),
+                  LOCATION(RC_LLR_GS_BACK_WALL,    logic->IsChild && logic->HookshotOrBoomerang && logic->AtNight && logic->CanGetNightTimeGS),
                 }, {
                   //Exits
                   Entrance(RR_HYRULE_FIELD,     {[]{return true;}}),
@@ -241,7 +241,7 @@ void AreaTable_Init_HyruleField() {
 
   areaTable[RR_LLR_TALONS_HOUSE] = Area("LLR Talons House", "LLR Talons House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_LLR_TALONS_CHICKENS, {[]{return logic->ChildsWallet && logic->IsChild && logic->AtDay && logic->ZeldasLetter;}}),
+                  LOCATION(RC_LLR_TALONS_CHICKENS, logic->ChildsWallet && logic->IsChild && logic->AtDay && logic->ZeldasLetter),
                 }, {
                   //Exits
                   Entrance(RR_LON_LON_RANCH, {[]{return true;}}),
@@ -249,8 +249,8 @@ void AreaTable_Init_HyruleField() {
 
   areaTable[RR_LLR_STABLES] = Area("LLR Stables", "LLR Stables", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_LLR_STABLES_LEFT_COW,  {[]{return logic->CanUse(RG_EPONAS_SONG);}}),
-                  LocationAccess(RC_LLR_STABLES_RIGHT_COW, {[]{return logic->CanUse(RG_EPONAS_SONG);}}),
+                  LOCATION(RC_LLR_STABLES_LEFT_COW,  logic->CanUse(RG_EPONAS_SONG)),
+                  LOCATION(RC_LLR_STABLES_RIGHT_COW, logic->CanUse(RG_EPONAS_SONG)),
                 }, {
                   //Exits
                   Entrance(RR_LON_LON_RANCH, {[]{return true;}}),
@@ -258,9 +258,9 @@ void AreaTable_Init_HyruleField() {
 
   areaTable[RR_LLR_TOWER] = Area("LLR Tower", "LLR Tower", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_LLR_FREESTANDING_POH, {[]{return logic->IsChild;}}),
-                  LocationAccess(RC_LLR_TOWER_LEFT_COW,   {[]{return logic->CanUse(RG_EPONAS_SONG);}}),
-                  LocationAccess(RC_LLR_TOWER_RIGHT_COW,  {[]{return logic->CanUse(RG_EPONAS_SONG);}}),
+                  LOCATION(RC_LLR_FREESTANDING_POH, logic->IsChild),
+                  LOCATION(RC_LLR_TOWER_LEFT_COW,   logic->CanUse(RG_EPONAS_SONG)),
+                  LOCATION(RC_LLR_TOWER_RIGHT_COW,  logic->CanUse(RG_EPONAS_SONG)),
                 }, {
                   //Exits
                   Entrance(RR_LON_LON_RANCH, {[]{return true;}}),
@@ -268,10 +268,10 @@ void AreaTable_Init_HyruleField() {
 
   areaTable[RR_LLR_GROTTO] = Area("LLR Grotto", "LLR Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_LLR_DEKU_SCRUB_GROTTO_LEFT,   {[]{return logic->CanStunDeku;}}),
-                  LocationAccess(RC_LLR_DEKU_SCRUB_GROTTO_RIGHT,  {[]{return logic->CanStunDeku;}}),
-                  LocationAccess(RC_LLR_DEKU_SCRUB_GROTTO_CENTER, {[]{return logic->CanStunDeku;}}),
-                  LocationAccess(RC_LLR_GROTTO_BEEHIVE,           {[]{return logic->CanBreakUpperBeehives;}}),
+                  LOCATION(RC_LLR_DEKU_SCRUB_GROTTO_LEFT,   logic->CanStunDeku),
+                  LOCATION(RC_LLR_DEKU_SCRUB_GROTTO_RIGHT,  logic->CanStunDeku),
+                  LOCATION(RC_LLR_DEKU_SCRUB_GROTTO_CENTER, logic->CanStunDeku),
+                  LOCATION(RC_LLR_GROTTO_BEEHIVE,           logic->CanBreakUpperBeehives),
                 }, {
                   //Exits
                   Entrance(RR_LON_LON_RANCH, {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp
index 4e5827258..7f5873ba1 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp
@@ -30,14 +30,14 @@ void AreaTable_Init_IceCavern() {
                   EventAccess(&logic->BlueFireAccess, {[]{return logic->BlueFireAccess || (logic->IsAdult && logic->HasBottle);}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_ICE_CAVERN_MAP_CHEST,               {[]{return logic->BlueFire && logic->IsAdult;}}),
-                  LocationAccess(RC_ICE_CAVERN_COMPASS_CHEST,           {[]{return logic->BlueFire;}}),
-                  LocationAccess(RC_ICE_CAVERN_IRON_BOOTS_CHEST,        {[]{return logic->BlueFire && (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_DINS_FIRE));}}),
-                  LocationAccess(RC_SHEIK_IN_ICE_CAVERN,                {[]{return logic->BlueFire && (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_DINS_FIRE)) && logic->IsAdult;}}),
-                  LocationAccess(RC_ICE_CAVERN_FREESTANDING_POH,        {[]{return logic->BlueFire;}}),
-                  LocationAccess(RC_ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM, {[]{return logic->HookshotOrBoomerang;}}),
-                  LocationAccess(RC_ICE_CAVERN_GS_HEART_PIECE_ROOM,     {[]{return logic->BlueFire && logic->HookshotOrBoomerang;}}),
-                  LocationAccess(RC_ICE_CAVERN_GS_PUSH_BLOCK_ROOM,      {[]{return logic->BlueFire && (logic->HookshotOrBoomerang || (randoCtx->GetTrickOption(RT_ICE_BLOCK_GS) && logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS)));}}),
+                  LOCATION(RC_ICE_CAVERN_MAP_CHEST,               logic->BlueFire && logic->IsAdult),
+                  LOCATION(RC_ICE_CAVERN_COMPASS_CHEST,           logic->BlueFire),
+                  LOCATION(RC_ICE_CAVERN_IRON_BOOTS_CHEST,        logic->BlueFire && (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_DINS_FIRE))),
+                  LOCATION(RC_SHEIK_IN_ICE_CAVERN,                logic->BlueFire && (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_DINS_FIRE)) && logic->IsAdult),
+                  LOCATION(RC_ICE_CAVERN_FREESTANDING_POH,        logic->BlueFire),
+                  LOCATION(RC_ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM, logic->HookshotOrBoomerang),
+                  LOCATION(RC_ICE_CAVERN_GS_HEART_PIECE_ROOM,     logic->BlueFire && logic->HookshotOrBoomerang),
+                  LOCATION(RC_ICE_CAVERN_GS_PUSH_BLOCK_ROOM,      logic->BlueFire && (logic->HookshotOrBoomerang || (randoCtx->GetTrickOption(RT_ICE_BLOCK_GS) && logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS)))),
   }, {});
   }
 
@@ -61,23 +61,23 @@ void AreaTable_Init_IceCavern() {
                   EventAccess(&logic->BlueFireAccess,  {[]{return logic->BlueFireAccess || (logic->HasBottle && logic->CanJumpslash);}}),
   }, {
                   //Locations
-                  LocationAccess(RC_ICE_CAVERN_MQ_MAP_CHEST, {[]{return logic->BlueFire && (logic->CanJumpslash || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUseProjectile);}}),
+                  LOCATION(RC_ICE_CAVERN_MQ_MAP_CHEST, logic->BlueFire && (logic->CanJumpslash || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUseProjectile)),
   }, {});
 
   areaTable[RR_ICE_CAVERN_MQ_IRON_BOOTS_REGION] = Area("Ice Cavern MQ Iron Boots Region", "Ice Cavern", RA_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_ICE_CAVERN_MQ_IRON_BOOTS_CHEST, {[]{return logic->IsAdult && (logic->CanJumpslash || logic->CanUse(RG_MEGATON_HAMMER));}}),
-                  LocationAccess(RC_SHEIK_IN_ICE_CAVERN,            {[]{return logic->IsAdult && (logic->CanJumpslash || logic->CanUse(RG_MEGATON_HAMMER));}}),
-                  LocationAccess(RC_ICE_CAVERN_MQ_GS_ICE_BLOCK,     {[]{return logic->CanAdultAttack || logic->CanChildAttack;}}),
-                  LocationAccess(RC_ICE_CAVERN_MQ_GS_SCARECROW,     {[]{return logic->CanUse(RG_SCARECROW) || (logic->HoverBoots && logic->CanUse(RG_LONGSHOT)) || (randoCtx->GetTrickOption(RT_ICE_MQ_SCARECROW) && logic->IsAdult);}}),
+                  LOCATION(RC_ICE_CAVERN_MQ_IRON_BOOTS_CHEST, logic->IsAdult && (logic->CanJumpslash || logic->CanUse(RG_MEGATON_HAMMER))),
+                  LOCATION(RC_SHEIK_IN_ICE_CAVERN,            logic->IsAdult && (logic->CanJumpslash || logic->CanUse(RG_MEGATON_HAMMER))),
+                  LOCATION(RC_ICE_CAVERN_MQ_GS_ICE_BLOCK,     logic->CanAdultAttack || logic->CanChildAttack),
+                  LOCATION(RC_ICE_CAVERN_MQ_GS_SCARECROW,     logic->CanUse(RG_SCARECROW) || (logic->HoverBoots && logic->CanUse(RG_LONGSHOT)) || (randoCtx->GetTrickOption(RT_ICE_MQ_SCARECROW) && logic->IsAdult)),
                     //Tricks: (logic->CanUse(RG_SCARECROW) || (logic->HoverBoots && logic->CanUse(RG_LONGSHOT)) || LogicIceMQScarecrow) && logic->IsAdult
   }, {});
 
   areaTable[RR_ICE_CAVERN_MQ_COMPASS_ROOM] = Area("Ice Cavern MQ Compass Room", "Ice Cavern", RA_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_ICE_CAVERN_MQ_COMPASS_CHEST,    {[]{return true;}}),
-                  LocationAccess(RC_ICE_CAVERN_MQ_FREESTANDING_POH, {[]{return logic->HasExplosives;}}),
-                  LocationAccess(RC_ICE_CAVERN_MQ_GS_RED_ICE,       {[]{return logic->CanUse(RG_SONG_OF_TIME) || randoCtx->GetTrickOption(RT_ICE_MQ_RED_ICE_GS);}}),
+                  LOCATION(RC_ICE_CAVERN_MQ_COMPASS_CHEST,    true),
+                  LOCATION(RC_ICE_CAVERN_MQ_FREESTANDING_POH, logic->HasExplosives),
+                  LOCATION(RC_ICE_CAVERN_MQ_GS_RED_ICE,       logic->CanUse(RG_SONG_OF_TIME) || randoCtx->GetTrickOption(RT_ICE_MQ_RED_ICE_GS)),
                     //Trick: logic->CanUse(RG_SONG_OF_TIME) || LogicIceMQRedIceGS
   }, {});
   }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp
index 2816dd43a..2e4b88164 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp
@@ -43,8 +43,8 @@ void AreaTable_Init_JabuJabusBelly() {
 
   areaTable[RR_JABU_JABUS_BELLY_MAIN_LOWER] = Area("Jabu Jabus Belly Main Lower", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER, {[]{return logic->HookshotOrBoomerang;}}),
-                  LocationAccess(RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER, {[]{return logic->HookshotOrBoomerang;}}),
+                  LOCATION(RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER, logic->HookshotOrBoomerang),
+                  LOCATION(RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER, logic->HookshotOrBoomerang),
                 }, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_MAIN_UPPER,       {[]{return true;}}),
@@ -57,7 +57,7 @@ void AreaTable_Init_JabuJabusBelly() {
                   EventAccess(&logic->FairyPot, {[]{return true;}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM, {[]{return true;}}),
+                  LOCATION(RC_JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM, true),
                 }, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_MAIN_LOWER, {[]{return logic->Swim;}}),
@@ -74,7 +74,7 @@ void AreaTable_Init_JabuJabusBelly() {
 
   areaTable[RR_JABU_JABUS_BELLY_LIFT_LOWER] = Area("Jabu Jabus Belly Lift Lower", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_JABU_JABUS_BELLY_DEKU_SCRUB, {[]{return logic->Swim && (logic->IsChild || logic->CanDive || randoCtx->GetTrickOption(RT_JABU_ALCOVE_JUMP_DIVE) || logic->CanUse(RG_IRON_BOOTS)) && logic->CanStunDeku;}}),
+                  LOCATION(RC_JABU_JABUS_BELLY_DEKU_SCRUB, logic->Swim && (logic->IsChild || logic->CanDive || randoCtx->GetTrickOption(RT_JABU_ALCOVE_JUMP_DIVE) || logic->CanUse(RG_IRON_BOOTS)) && logic->CanStunDeku),
                 }, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_SHABOMB_CORRIDOR, {[]{return true;}}),
@@ -93,7 +93,7 @@ void AreaTable_Init_JabuJabusBelly() {
 
   areaTable[RR_JABU_JABUS_BELLY_BOOMERANG_ROOM] = Area("Jabu Jabus Belly Boomerang Room", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_JABU_JABUS_BELLY_BOOMERANG_CHEST, {[]{return true;}}),
+                  LOCATION(RC_JABU_JABUS_BELLY_BOOMERANG_CHEST, true),
                 }, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_FORKED_CORRIDOR, {[]{return true;}}),
@@ -101,7 +101,7 @@ void AreaTable_Init_JabuJabusBelly() {
 
   areaTable[RR_JABU_JABUS_BELLY_MAP_ROOM] = Area("Jabu Jabus Belly Map Room", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_JABU_JABUS_BELLY_MAP_CHEST, {[]{return logic->CanUse(RG_BOOMERANG);}}),
+                  LOCATION(RC_JABU_JABUS_BELLY_MAP_CHEST, logic->CanUse(RG_BOOMERANG)),
                 }, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_FORKED_CORRIDOR, {[]{return true;}}),
@@ -109,7 +109,7 @@ void AreaTable_Init_JabuJabusBelly() {
 
   areaTable[RR_JABU_JABUS_BELLY_COMPASS_ROOM] = Area("Jabu Jabus Belly Compass Room", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_JABU_JABUS_BELLY_COMPASS_CHEST, {[]{return logic->CanAdultAttack || logic->CanChildAttack;}}),
+                  LOCATION(RC_JABU_JABUS_BELLY_COMPASS_CHEST, logic->CanAdultAttack || logic->CanChildAttack),
                 }, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_FORKED_CORRIDOR, {[]{return true;}}),
@@ -148,7 +148,7 @@ void AreaTable_Init_JabuJabusBelly() {
 
   areaTable[RR_JABU_JABUS_BELLY_NEAR_BOSS_ROOM] = Area("Jabu Jabus Belly Near Boss Room", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_JABU_JABUS_BELLY_GS_NEAR_BOSS, {[]{return logic->CanAdultAttack || logic->CanChildAttack;}}),
+                  LOCATION(RC_JABU_JABUS_BELLY_GS_NEAR_BOSS, logic->CanAdultAttack || logic->CanChildAttack),
                 }, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_LIFT_MIDDLE, {[]{return true;}}),
@@ -165,8 +165,8 @@ void AreaTable_Init_JabuJabusBelly() {
                   EventAccess(&logic->NutPot, {[]{return true;}}),
   }, {
                   //Locations
-                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_MAP_CHEST,             {[]{return logic->CanBlastOrSmash;}}),
-                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST, {[]{return logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT);}}),
+                  LOCATION(RC_JABU_JABUS_BELLY_MQ_MAP_CHEST,             logic->CanBlastOrSmash),
+                  LOCATION(RC_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST, logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT)),
   }, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_ENTRYWAY, {[]{return true;}}),
@@ -175,14 +175,14 @@ void AreaTable_Init_JabuJabusBelly() {
 
   areaTable[RR_JABU_JABUS_BELLY_MQ_MAIN] = Area("Jabu Jabus Belly MQ Main", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST,      {[]{return true;}}),
-                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST,      {[]{return (logic->IsAdult && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT))) || ChildCanAccess(RR_JABU_JABUS_BELLY_MQ_BOSS_AREA);}}),
-                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_COMPASS_CHEST,                {[]{return (logic->IsChild || logic->CanDive || logic->CanUse(RG_IRON_BOOTS) || randoCtx->GetTrickOption(RT_JABU_ALCOVE_JUMP_DIVE)) && (logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->HasBombchus || (randoCtx->GetTrickOption(RT_JABU_MQ_RANG_JUMP) && logic->CanUse(RG_BOOMERANG)));}}),
-                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST,    {[]{return logic->CanUse(RG_FAIRY_SLINGSHOT);}}),
-                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST, {[]{return logic->CanUse(RG_FAIRY_SLINGSHOT);}}),
-                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST,   {[]{return true;}}),
-                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST,              {[]{return logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_STICKS) || logic->Bombs;}}),
-                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM,      {[]{return logic->CanUse(RG_SONG_OF_TIME) || (randoCtx->GetTrickOption(RT_JABU_MQ_SOT_GS) && logic->IsChild && logic->CanUse(RG_BOOMERANG));}}),
+                  LOCATION(RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST,      true),
+                  LOCATION(RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST,      (logic->IsAdult && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT))) || ChildCanAccess(RR_JABU_JABUS_BELLY_MQ_BOSS_AREA)),
+                  LOCATION(RC_JABU_JABUS_BELLY_MQ_COMPASS_CHEST,                (logic->IsChild || logic->CanDive || logic->CanUse(RG_IRON_BOOTS) || randoCtx->GetTrickOption(RT_JABU_ALCOVE_JUMP_DIVE)) && (logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->HasBombchus || (randoCtx->GetTrickOption(RT_JABU_MQ_RANG_JUMP) && logic->CanUse(RG_BOOMERANG)))),
+                  LOCATION(RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST,    logic->CanUse(RG_FAIRY_SLINGSHOT)),
+                  LOCATION(RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST, logic->CanUse(RG_FAIRY_SLINGSHOT)),
+                  LOCATION(RC_JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST,   true),
+                  LOCATION(RC_JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST,              logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_STICKS) || logic->Bombs),
+                  LOCATION(RC_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM,      logic->CanUse(RG_SONG_OF_TIME) || (randoCtx->GetTrickOption(RT_JABU_MQ_SOT_GS) && logic->IsChild && logic->CanUse(RG_BOOMERANG))),
                     //Trick: logic->CanUse(RG_SONG_OF_TIME) || (LogicJabuMQSoTGS && logic->IsChild && logic->CanUse(RG_BOOMERANG))
   }, {
                   //Exits
@@ -192,9 +192,9 @@ void AreaTable_Init_JabuJabusBelly() {
 
   areaTable[RR_JABU_JABUS_BELLY_MQ_DEPTHS] = Area("Jabu Jabus Belly MQ Depths", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST, {[]{return true;}}),
-                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM,          {[]{return logic->Swim && (logic->Sticks || logic->CanUse(RG_DINS_FIRE));}}),
-                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM,    {[]{return (randoCtx->GetTrickOption(RT_LENS_JABU_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) || Here(RR_JABU_JABUS_BELLY_MQ_MAIN, []{return logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS) && logic->CanUse(RG_HOOKSHOT);});}}),
+                  LOCATION(RC_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST, true),
+                  LOCATION(RC_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM,          logic->Swim && (logic->Sticks || logic->CanUse(RG_DINS_FIRE))),
+                  LOCATION(RC_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM,    (randoCtx->GetTrickOption(RT_LENS_JABU_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) || Here(RR_JABU_JABUS_BELLY_MQ_MAIN, []{return logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS) && logic->CanUse(RG_HOOKSHOT);})),
   }, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_MQ_MAIN,      {[]{return true;}}),
@@ -206,9 +206,9 @@ void AreaTable_Init_JabuJabusBelly() {
                   EventAccess(&logic->FairyPot, {[]{return true;}}),
   }, {
                   //Locations
-                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_COW,             {[]{return logic->CanUse(RG_EPONAS_SONG);}}),
-                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST, {[]{return logic->CanUse(RG_FAIRY_SLINGSHOT);}}),
-                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS,    {[]{return logic->CanUse(RG_BOOMERANG) || (randoCtx->GetTrickOption(RT_JABU_NEAR_BOSS_RANGED) && logic->CanUse(RG_HOOKSHOT));}}),
+                  LOCATION(RC_JABU_JABUS_BELLY_MQ_COW,             logic->CanUse(RG_EPONAS_SONG)),
+                  LOCATION(RC_JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST, logic->CanUse(RG_FAIRY_SLINGSHOT)),
+                  LOCATION(RC_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS,    logic->CanUse(RG_BOOMERANG) || (randoCtx->GetTrickOption(RT_JABU_NEAR_BOSS_RANGED) && logic->CanUse(RG_HOOKSHOT))),
   }, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_MQ_MAIN, {[]{return true;}}),
@@ -237,8 +237,8 @@ void AreaTable_Init_JabuJabusBelly() {
              },
              {
                  // Locations
-                 LocationAccess(RC_JABU_JABUS_BELLY_BARINADE_HEART, { [] { return logic->JabuJabusBellyClear; } }),
-                 LocationAccess(RC_BARINADE, { [] { return logic->JabuJabusBellyClear; } }),
+                 LOCATION(RC_JABU_JABUS_BELLY_BARINADE_HEART, logic->JabuJabusBellyClear),
+                 LOCATION(RC_BARINADE, logic->JabuJabusBellyClear),
              },
              {
                  // Exits
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
index b33cc9381..708163784 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
@@ -11,15 +11,15 @@ void AreaTable_Init_Kakariko() {
                   EventAccess(&logic->KakarikoVillageGateOpen, {[]{return logic->KakarikoVillageGateOpen || (logic->IsChild && (logic->ZeldasLetter || randoCtx->GetOption(RSK_KAK_GATE).Is(RO_KAK_GATE_OPEN)));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_SHEIK_IN_KAKARIKO,               {[]{return logic->IsAdult && logic->ForestMedallion && logic->FireMedallion && logic->WaterMedallion;}}),
-                  LocationAccess(RC_KAK_ANJU_AS_CHILD,               {[]{return logic->IsChild && logic->AtDay;}}),
-                  LocationAccess(RC_KAK_ANJU_AS_ADULT,               {[]{return logic->IsAdult && logic->AtDay;}}),
-                  LocationAccess(RC_KAK_TRADE_POCKET_CUCCO,          {[]{return logic->IsAdult && logic->AtDay && logic->PocketEgg && logic->WakeUpAdultTalon;}}),
-                  LocationAccess(RC_KAK_GS_HOUSE_UNDER_CONSTRUCTION, {[]{return logic->IsChild && logic->AtNight && logic->CanGetNightTimeGS;}}),
-                  LocationAccess(RC_KAK_GS_SKULLTULA_HOUSE,          {[]{return logic->IsChild && logic->AtNight && logic->CanGetNightTimeGS;}}),
-                  LocationAccess(RC_KAK_GS_GUARDS_HOUSE,             {[]{return logic->IsChild && logic->AtNight && logic->CanGetNightTimeGS;}}),
-                  LocationAccess(RC_KAK_GS_TREE,                     {[]{return logic->IsChild && logic->AtNight && logic->CanGetNightTimeGS;}}),
-                  LocationAccess(RC_KAK_GS_WATCHTOWER,               {[]{return logic->IsChild && (logic->Slingshot || logic->HasBombchus || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_LONGSHOT) || (randoCtx->GetTrickOption(RT_KAK_TOWER_GS) && logic->CanJumpslash)) && logic->AtNight && logic->CanGetNightTimeGS;}}),
+                  LOCATION(RC_SHEIK_IN_KAKARIKO,               logic->IsAdult && logic->ForestMedallion && logic->FireMedallion && logic->WaterMedallion),
+                  LOCATION(RC_KAK_ANJU_AS_CHILD,               logic->IsChild && logic->AtDay),
+                  LOCATION(RC_KAK_ANJU_AS_ADULT,               logic->IsAdult && logic->AtDay),
+                  LOCATION(RC_KAK_TRADE_POCKET_CUCCO,          logic->IsAdult && logic->AtDay && logic->PocketEgg && logic->WakeUpAdultTalon),
+                  LOCATION(RC_KAK_GS_HOUSE_UNDER_CONSTRUCTION, logic->IsChild && logic->AtNight && logic->CanGetNightTimeGS),
+                  LOCATION(RC_KAK_GS_SKULLTULA_HOUSE,          logic->IsChild && logic->AtNight && logic->CanGetNightTimeGS),
+                  LOCATION(RC_KAK_GS_GUARDS_HOUSE,             logic->IsChild && logic->AtNight && logic->CanGetNightTimeGS),
+                  LOCATION(RC_KAK_GS_TREE,                     logic->IsChild && logic->AtNight && logic->CanGetNightTimeGS),
+                  LOCATION(RC_KAK_GS_WATCHTOWER,               logic->IsChild && (logic->Slingshot || logic->HasBombchus || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_LONGSHOT) || (randoCtx->GetTrickOption(RT_KAK_TOWER_GS) && logic->CanJumpslash)) && logic->AtNight && logic->CanGetNightTimeGS),
                 }, {
                   //Exits
                   Entrance(RR_HYRULE_FIELD,                {[]{return true;}}),
@@ -47,7 +47,7 @@ void AreaTable_Init_Kakariko() {
 
   areaTable[RR_KAK_IMPAS_ROOFTOP] = Area("Kak Impas Rooftop", "Kakariko Village", RA_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_KAK_GS_ABOVE_IMPAS_HOUSE, {[]{return logic->IsAdult && logic->AtNight && logic->CanGetNightTimeGS && (logic->CanJumpslash || logic->CanUseProjectile);}}),
+                  LOCATION(RC_KAK_GS_ABOVE_IMPAS_HOUSE, logic->IsAdult && logic->AtNight && logic->CanGetNightTimeGS && (logic->CanJumpslash || logic->CanUseProjectile)),
                 }, {
                   //Exits
                   Entrance(RR_KAK_IMPAS_LEDGE,  {[]{return true;}}),
@@ -56,7 +56,7 @@ void AreaTable_Init_Kakariko() {
 
   areaTable[RR_KAK_ROOFTOP] = Area("Kak Rooftop", "Kakariko Village", RA_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_KAK_MAN_ON_ROOF, {[]{return true;}}),
+                  LOCATION(RC_KAK_MAN_ON_ROOF, true),
                 }, {
                   //Exits
                   Entrance(RR_KAK_BACKYARD, {[]{return true;}}),
@@ -80,12 +80,12 @@ void AreaTable_Init_Kakariko() {
 
   areaTable[RR_KAK_HOUSE_OF_SKULLTULA] = Area("Kak House of Skulltula", "Kak House of Skulltula", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_KAK_10_GOLD_SKULLTULA_REWARD, {[]{return logic->GoldSkulltulaTokens >= 10;}}),
-                  LocationAccess(RC_KAK_20_GOLD_SKULLTULA_REWARD, {[]{return logic->GoldSkulltulaTokens >= 20;}}),
-                  LocationAccess(RC_KAK_30_GOLD_SKULLTULA_REWARD, {[]{return logic->GoldSkulltulaTokens >= 30;}}),
-                  LocationAccess(RC_KAK_40_GOLD_SKULLTULA_REWARD, {[]{return logic->GoldSkulltulaTokens >= 40;}}),
-                  LocationAccess(RC_KAK_50_GOLD_SKULLTULA_REWARD, {[]{return logic->GoldSkulltulaTokens >= 50;}}),
-                  LocationAccess(RC_KAK_100_GOLD_SKULLTULA_REWARD, {[]{return logic->GoldSkulltulaTokens >= 100;}})
+                  LOCATION(RC_KAK_10_GOLD_SKULLTULA_REWARD, logic->GoldSkulltulaTokens >= 10),
+                  LOCATION(RC_KAK_20_GOLD_SKULLTULA_REWARD, logic->GoldSkulltulaTokens >= 20),
+                  LOCATION(RC_KAK_30_GOLD_SKULLTULA_REWARD, logic->GoldSkulltulaTokens >= 30),
+                  LOCATION(RC_KAK_40_GOLD_SKULLTULA_REWARD, logic->GoldSkulltulaTokens >= 40),
+                  LOCATION(RC_KAK_50_GOLD_SKULLTULA_REWARD, logic->GoldSkulltulaTokens >= 50),
+                  LOCATION(RC_KAK_100_GOLD_SKULLTULA_REWARD, logic->GoldSkulltulaTokens >= 100)
                 }, {
                   //Exits
                   Entrance(RR_KAKARIKO_VILLAGE, {[]{return true;}}),
@@ -99,7 +99,7 @@ void AreaTable_Init_Kakariko() {
 
   areaTable[RR_KAK_IMPAS_HOUSE_BACK] = Area("Kak Impas House Back", "Kak Impas House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_KAK_IMPAS_HOUSE_FREESTANDING_POH, {[]{return true;}}),
+                  LOCATION(RC_KAK_IMPAS_HOUSE_FREESTANDING_POH, true),
                 }, {
                   //Exits
                   Entrance(RR_KAK_IMPAS_LEDGE,          {[]{return true;}}),
@@ -108,7 +108,7 @@ void AreaTable_Init_Kakariko() {
 
   areaTable[RR_KAK_IMPAS_HOUSE_NEAR_COW] = Area("Kak Impas House Near Cow", "Kak Impas House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_KAK_IMPAS_HOUSE_COW, {[]{return logic->CanUse(RG_EPONAS_SONG);}}),
+                  LOCATION(RC_KAK_IMPAS_HOUSE_COW, logic->CanUse(RG_EPONAS_SONG)),
   }, {});
 
   areaTable[RR_KAK_WINDMILL] = Area("Kak Windmill", "Windmill and Dampes Grave", RA_NONE, NO_DAY_NIGHT_CYCLE, {
@@ -116,9 +116,9 @@ void AreaTable_Init_Kakariko() {
                   EventAccess(&logic->DrainWell, {[]{return logic->DrainWell || (logic->IsChild && logic->CanUse(RG_SONG_OF_STORMS));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_KAK_WINDMILL_FREESTANDING_POH, {[]{return logic->CanUse(RG_BOOMERANG) || logic->DampesWindmillAccess || (logic->IsAdult && randoCtx->GetTrickOption(RT_KAK_ADULT_WINDMILL_POH)) || (logic->IsChild && logic->CanJumpslash && randoCtx->GetTrickOption(RT_KAK_CHILD_WINDMILL_POH));}}),
+                  LOCATION(RC_KAK_WINDMILL_FREESTANDING_POH, logic->CanUse(RG_BOOMERANG) || logic->DampesWindmillAccess || (logic->IsAdult && randoCtx->GetTrickOption(RT_KAK_ADULT_WINDMILL_POH)) || (logic->IsChild && logic->CanJumpslash && randoCtx->GetTrickOption(RT_KAK_CHILD_WINDMILL_POH))),
                     //PoH as child not added to trick options yet (needs uncommenting in randomizer_tricks.cpp)
-                  LocationAccess(RC_SONG_FROM_WINDMILL,            {[]{return logic->IsAdult && logic->Ocarina;}}),
+                  LOCATION(RC_SONG_FROM_WINDMILL,            logic->IsAdult && logic->Ocarina),
                 }, {
                   //Exits
                   Entrance(RR_KAKARIKO_VILLAGE, {[]{return true;}}),
@@ -126,14 +126,14 @@ void AreaTable_Init_Kakariko() {
 
   areaTable[RR_KAK_BAZAAR] = Area("Kak Bazaar", "Kak Bazaar", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_KAK_BAZAAR_ITEM_1, {[]{return true;}}),
-                  LocationAccess(RC_KAK_BAZAAR_ITEM_2, {[]{return true;}}),
-                  LocationAccess(RC_KAK_BAZAAR_ITEM_3, {[]{return true;}}),
-                  LocationAccess(RC_KAK_BAZAAR_ITEM_4, {[]{return true;}}),
-                  LocationAccess(RC_KAK_BAZAAR_ITEM_5, {[]{return true;}}),
-                  LocationAccess(RC_KAK_BAZAAR_ITEM_6, {[]{return true;}}),
-                  LocationAccess(RC_KAK_BAZAAR_ITEM_7, {[]{return true;}}),
-                  LocationAccess(RC_KAK_BAZAAR_ITEM_8, {[]{return true;}}),
+                  LOCATION(RC_KAK_BAZAAR_ITEM_1, true),
+                  LOCATION(RC_KAK_BAZAAR_ITEM_2, true),
+                  LOCATION(RC_KAK_BAZAAR_ITEM_3, true),
+                  LOCATION(RC_KAK_BAZAAR_ITEM_4, true),
+                  LOCATION(RC_KAK_BAZAAR_ITEM_5, true),
+                  LOCATION(RC_KAK_BAZAAR_ITEM_6, true),
+                  LOCATION(RC_KAK_BAZAAR_ITEM_7, true),
+                  LOCATION(RC_KAK_BAZAAR_ITEM_8, true),
                 }, {
                   //Exits
                   Entrance(RR_KAKARIKO_VILLAGE, {[]{return true;}}),
@@ -141,7 +141,7 @@ void AreaTable_Init_Kakariko() {
 
   areaTable[RR_KAK_SHOOTING_GALLERY] = Area("Kak Shooting Gallery", "Kak Shooting Gallery", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_KAK_SHOOTING_GALLERY_REWARD, {[]{return logic->ChildsWallet && logic->IsAdult && logic->Bow;}}),
+                  LOCATION(RC_KAK_SHOOTING_GALLERY_REWARD, logic->ChildsWallet && logic->IsAdult && logic->Bow),
                 }, {
                   //Exits
                   Entrance(RR_KAKARIKO_VILLAGE, {[]{return true;}}),
@@ -149,14 +149,14 @@ void AreaTable_Init_Kakariko() {
 
   areaTable[RR_KAK_POTION_SHOP_FRONT] = Area("Kak Potion Shop Front", "Kak Potion Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_KAK_POTION_SHOP_ITEM_1, {[]{return logic->IsAdult;}}),
-                  LocationAccess(RC_KAK_POTION_SHOP_ITEM_2, {[]{return logic->IsAdult;}}),
-                  LocationAccess(RC_KAK_POTION_SHOP_ITEM_3, {[]{return logic->IsAdult;}}),
-                  LocationAccess(RC_KAK_POTION_SHOP_ITEM_4, {[]{return logic->IsAdult;}}),
-                  LocationAccess(RC_KAK_POTION_SHOP_ITEM_5, {[]{return logic->IsAdult;}}),
-                  LocationAccess(RC_KAK_POTION_SHOP_ITEM_6, {[]{return logic->IsAdult;}}),
-                  LocationAccess(RC_KAK_POTION_SHOP_ITEM_7, {[]{return logic->IsAdult;}}),
-                  LocationAccess(RC_KAK_POTION_SHOP_ITEM_8, {[]{return logic->IsAdult;}}),
+                  LOCATION(RC_KAK_POTION_SHOP_ITEM_1, logic->IsAdult),
+                  LOCATION(RC_KAK_POTION_SHOP_ITEM_2, logic->IsAdult),
+                  LOCATION(RC_KAK_POTION_SHOP_ITEM_3, logic->IsAdult),
+                  LOCATION(RC_KAK_POTION_SHOP_ITEM_4, logic->IsAdult),
+                  LOCATION(RC_KAK_POTION_SHOP_ITEM_5, logic->IsAdult),
+                  LOCATION(RC_KAK_POTION_SHOP_ITEM_6, logic->IsAdult),
+                  LOCATION(RC_KAK_POTION_SHOP_ITEM_7, logic->IsAdult),
+                  LOCATION(RC_KAK_POTION_SHOP_ITEM_8, logic->IsAdult),
                 }, {
                   //Exits
                   Entrance(RR_KAKARIKO_VILLAGE,     {[]{return true;}}),
@@ -178,8 +178,8 @@ void AreaTable_Init_Kakariko() {
                } }),
            },
            {
-               LocationAccess(RC_KAK_TRADE_ODD_MUSHROOM, { [] { return logic->IsAdult && logic->OddMushroom; } }),
-               LocationAccess(RC_KAK_GRANNYS_SHOP, { [] { return logic->IsAdult && logic->OddMushroom && logic->AdultsWallet; } }),
+               LOCATION(RC_KAK_TRADE_ODD_MUSHROOM, logic->IsAdult && logic->OddMushroom),
+               LOCATION(RC_KAK_GRANNYS_SHOP, logic->IsAdult && logic->OddMushroom && logic->AdultsWallet),
            },
            {
                // Exits
@@ -188,7 +188,7 @@ void AreaTable_Init_Kakariko() {
 
   areaTable[RR_KAK_REDEAD_GROTTO] = Area("Kak Redead Grotto", "Kak Redead Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_KAK_REDEAD_GROTTO_CHEST, {[]{return logic->CanUse(RG_STICKS) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_DINS_FIRE) || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD);}}),
+                  LOCATION(RC_KAK_REDEAD_GROTTO_CHEST, logic->CanUse(RG_STICKS) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_DINS_FIRE) || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)),
                 }, {
                   //Exits
                   Entrance(RR_KAKARIKO_VILLAGE, {[]{return true;}}),
@@ -196,11 +196,11 @@ void AreaTable_Init_Kakariko() {
 
   areaTable[RR_KAK_OPEN_GROTTO] = Area("Kak Open Grotto", "Kak Open Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
-                  LocationAccess(RC_KAK_OPEN_GROTTO_CHEST,         {[]{return true;}}),
-                  LocationAccess(RC_KAK_OPEN_GROTTO_FISH,          {[]{return logic->HasBottle;}}),
-                  LocationAccess(RC_KAK_OPEN_GROTTO_GOSSIP_STONE,  {[]{return true;}}),
-                  LocationAccess(RC_KAK_OPEN_GROTTO_BEEHIVE_LEFT,  {[]{return logic->CanBreakLowerBeehives;}}),
-                  LocationAccess(RC_KAK_OPEN_GROTTO_BEEHIVE_RIGHT, {[]{return logic->CanBreakLowerBeehives;}}),
+                  LOCATION(RC_KAK_OPEN_GROTTO_CHEST,         true),
+                  LOCATION(RC_KAK_OPEN_GROTTO_FISH,          logic->HasBottle),
+                  LOCATION(RC_KAK_OPEN_GROTTO_GOSSIP_STONE,  true),
+                  LOCATION(RC_KAK_OPEN_GROTTO_BEEHIVE_LEFT,  logic->CanBreakLowerBeehives),
+                  LOCATION(RC_KAK_OPEN_GROTTO_BEEHIVE_RIGHT, logic->CanBreakLowerBeehives),
                 }, {
                   //Exits
                   Entrance(RR_KAK_BACKYARD, {[]{return true;}}),
@@ -213,10 +213,10 @@ void AreaTable_Init_Kakariko() {
                   EventAccess(&logic->BugRock,        {[]{return true;}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_GRAVEYARD_FREESTANDING_POH,        {[]{return (logic->IsAdult && CanPlantBean(RR_THE_GRAVEYARD)) || logic->CanUse(RG_LONGSHOT) || (randoCtx->GetTrickOption(RT_GY_POH) && logic->CanUse(RG_BOOMERANG));}}),
-                  LocationAccess(RC_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR, {[]{return logic->ChildsWallet && logic->IsChild && logic->AtNight;}}), //TODO: This needs to change
-                  LocationAccess(RC_GRAVEYARD_GS_WALL,                 {[]{return logic->IsChild && logic->HookshotOrBoomerang && logic->AtNight && logic->CanGetNightTimeGS;}}),
-                  LocationAccess(RC_GRAVEYARD_GS_BEAN_PATCH,           {[]{return logic->CanPlantBugs && logic->CanChildAttack;}}),
+                  LOCATION(RC_GRAVEYARD_FREESTANDING_POH,        (logic->IsAdult && CanPlantBean(RR_THE_GRAVEYARD)) || logic->CanUse(RG_LONGSHOT) || (randoCtx->GetTrickOption(RT_GY_POH) && logic->CanUse(RG_BOOMERANG))),
+                  LOCATION(RC_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR, logic->ChildsWallet && logic->IsChild && logic->AtNight), //TODO: This needs to change
+                  LOCATION(RC_GRAVEYARD_GS_WALL,                 logic->IsChild && logic->HookshotOrBoomerang && logic->AtNight && logic->CanGetNightTimeGS),
+                  LOCATION(RC_GRAVEYARD_GS_BEAN_PATCH,           logic->CanPlantBugs && logic->CanChildAttack),
                 }, {
                   //Exits
                   Entrance(RR_GRAVEYARD_SHIELD_GRAVE,       {[]{return logic->IsAdult || logic->AtNight;}}),
@@ -230,7 +230,7 @@ void AreaTable_Init_Kakariko() {
 
   areaTable[RR_GRAVEYARD_SHIELD_GRAVE] = Area("Graveyard Shield Grave", "Graveyard Shield Grave", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_GRAVEYARD_SHIELD_GRAVE_CHEST, {[]{return true;}}),
+                  LOCATION(RC_GRAVEYARD_SHIELD_GRAVE_CHEST, true),
                   //Free Fairies
                 }, {
                   //Exits
@@ -239,7 +239,7 @@ void AreaTable_Init_Kakariko() {
 
   areaTable[RR_GRAVEYARD_HEART_PIECE_GRAVE] = Area("Graveyard Heart Piece Grave", "Graveyard Heart Piece Grave", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_GRAVEYARD_HEART_PIECE_GRAVE_CHEST, {[]{return logic->CanUse(RG_SUNS_SONG);}}),
+                  LOCATION(RC_GRAVEYARD_HEART_PIECE_GRAVE_CHEST, logic->CanUse(RG_SUNS_SONG)),
                 }, {
                   //Exits
                   Entrance(RR_THE_GRAVEYARD, {[]{return true;}}),
@@ -247,8 +247,8 @@ void AreaTable_Init_Kakariko() {
 
   areaTable[RR_GRAVEYARD_COMPOSERS_GRAVE] = Area("Graveyard Composers Grave", "Graveyard Composers Grave", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST, {[]{return logic->HasFireSource;}}),
-                  LocationAccess(RC_SONG_FROM_ROYAL_FAMILYS_TOMB,       {[]{return logic->CanUseProjectile || logic->CanJumpslash || logic->CanUse(RG_MEGATON_HAMMER);}}),
+                  LOCATION(RC_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST, logic->HasFireSource),
+                  LOCATION(RC_SONG_FROM_ROYAL_FAMILYS_TOMB,       logic->CanUseProjectile || logic->CanJumpslash || logic->CanUse(RG_MEGATON_HAMMER)),
                 }, {
                   //Exits
                   Entrance(RR_THE_GRAVEYARD, {[]{return true;}}),
@@ -260,8 +260,8 @@ void AreaTable_Init_Kakariko() {
                   EventAccess(&logic->DampesWindmillAccess, {[]{return logic->DampesWindmillAccess || (logic->IsAdult && logic->CanUse(RG_SONG_OF_TIME));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_GRAVEYARD_HOOKSHOT_CHEST,              {[]{return true;}}),
-                  LocationAccess(RC_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH, {[]{return logic->IsAdult || randoCtx->GetTrickOption(RT_GY_CHILD_DAMPE_RACE_POH);}}),
+                  LOCATION(RC_GRAVEYARD_HOOKSHOT_CHEST,              true),
+                  LOCATION(RC_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH, logic->IsAdult || randoCtx->GetTrickOption(RT_GY_CHILD_DAMPE_RACE_POH)),
                 }, {
                   //Exits
                   Entrance(RR_THE_GRAVEYARD, {[]{return true;}}),
@@ -270,7 +270,7 @@ void AreaTable_Init_Kakariko() {
 
   areaTable[RR_GRAVEYARD_DAMPES_HOUSE] = Area("Graveyard Dampes House", "Graveyard Dampes House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DAMPE_HINT, {[]{return logic->IsAdult;}}),
+                  LOCATION(RC_DAMPE_HINT, logic->IsAdult),
                 }, {
                   //Exits
                   Entrance(RR_THE_GRAVEYARD, {[]{return true;}}),
@@ -281,7 +281,7 @@ void AreaTable_Init_Kakariko() {
                   EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CanSummonGossipFairyWithoutSuns;}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_GRAVEYARD_GOSSIP_STONE, {[]{return true;}}),
+                  LOCATION(RC_GRAVEYARD_GOSSIP_STONE, true),
                 }, {
                   //Exits
                   Entrance(RR_THE_GRAVEYARD,             {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
index c7214d6ca..2f9732b46 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
@@ -11,11 +11,11 @@ void AreaTable_Init_LostWoods() {
                   EventAccess(&logic->ShowedMidoSwordAndShield, {[]{return logic->ShowedMidoSwordAndShield || (logic->IsChild && logic->KokiriSword && logic->DekuShield);}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_KF_KOKIRI_SWORD_CHEST,   {[]{return logic->IsChild;}}),
-                  LocationAccess(RC_KF_GS_KNOW_IT_ALL_HOUSE, {[]{return logic->IsChild && logic->CanChildAttack && logic->AtNight && (/*TODO: HasNightStart ||*/ logic->CanLeaveForest || logic->CanUse(RG_SUNS_SONG)) && logic->CanGetNightTimeGS;}}),
-                  LocationAccess(RC_KF_GS_BEAN_PATCH,        {[]{return logic->CanPlantBugs && logic->CanChildAttack;}}),
-                  LocationAccess(RC_KF_GS_HOUSE_OF_TWINS,    {[]{return logic->IsAdult && logic->AtNight && (logic->HookshotOrBoomerang || (randoCtx->GetTrickOption(RT_KF_ADULT_GS) && logic->CanUse(RG_HOVER_BOOTS))) && logic->CanGetNightTimeGS;}}),
-                  LocationAccess(RC_KF_GOSSIP_STONE,         {[]{return true;}}),
+                  LOCATION(RC_KF_KOKIRI_SWORD_CHEST,   logic->IsChild),
+                  LOCATION(RC_KF_GS_KNOW_IT_ALL_HOUSE, logic->IsChild && logic->CanChildAttack && logic->AtNight && (/*TODO: HasNightStart ||*/ logic->CanLeaveForest || logic->CanUse(RG_SUNS_SONG)) && logic->CanGetNightTimeGS),
+                  LOCATION(RC_KF_GS_BEAN_PATCH,        logic->CanPlantBugs && logic->CanChildAttack),
+                  LOCATION(RC_KF_GS_HOUSE_OF_TWINS,    logic->IsAdult && logic->AtNight && (logic->HookshotOrBoomerang || (randoCtx->GetTrickOption(RT_KF_ADULT_GS) && logic->CanUse(RG_HOVER_BOOTS))) && logic->CanGetNightTimeGS),
+                  LOCATION(RC_KF_GOSSIP_STONE,         true),
                 }, {
                   //Exits
                   Entrance(RR_KF_LINKS_HOUSE,        {[]{return true;}}),
@@ -37,8 +37,8 @@ void AreaTable_Init_LostWoods() {
                   EventAccess(&logic->ShowedMidoSwordAndShield, {[]{return logic->ShowedMidoSwordAndShield || (logic->IsChild && logic->KokiriSword && logic->DekuShield);}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_KF_DEKU_TREE_LEFT_GOSSIP_STONE,  {[]{return true;}}),
-                  LocationAccess(RC_KF_DEKU_TREE_RIGHT_GOSSIP_STONE, {[]{return true;}}),
+                  LOCATION(RC_KF_DEKU_TREE_LEFT_GOSSIP_STONE,  true),
+                  LOCATION(RC_KF_DEKU_TREE_RIGHT_GOSSIP_STONE, true),
                 }, {
                   //Exits
                   Entrance(RR_DEKU_TREE_ENTRYWAY, {[]{return logic->IsChild || (randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).IsNot(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF) && (randoCtx->GetOption(RSK_FOREST).Is(RO_FOREST_OPEN) || logic->ShowedMidoSwordAndShield));}}),
@@ -47,7 +47,7 @@ void AreaTable_Init_LostWoods() {
 
   areaTable[RR_KF_LINKS_HOUSE] = Area("KF Link's House", "KF Link's House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_KF_LINKS_HOUSE_COW, {[]{return logic->IsAdult && logic->CanUse(RG_EPONAS_SONG) && logic->LinksCow;}}),
+                  LOCATION(RC_KF_LINKS_HOUSE_COW, logic->IsAdult && logic->CanUse(RG_EPONAS_SONG) && logic->LinksCow),
                 }, {
                   //Exits
                   Entrance(RR_KOKIRI_FOREST, {[]{return true;}})
@@ -55,10 +55,10 @@ void AreaTable_Init_LostWoods() {
 
   areaTable[RR_KF_MIDOS_HOUSE] = Area("KF Mido's House", "KF Mido's House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_KF_MIDOS_TOP_LEFT_CHEST,     {[]{return true;}}),
-                  LocationAccess(RC_KF_MIDOS_TOP_RIGHT_CHEST,    {[]{return true;}}),
-                  LocationAccess(RC_KF_MIDOS_BOTTOM_LEFT_CHEST,  {[]{return true;}}),
-                  LocationAccess(RC_KF_MIDOS_BOTTOM_RIGHT_CHEST, {[]{return true;}}),
+                  LOCATION(RC_KF_MIDOS_TOP_LEFT_CHEST,     true),
+                  LOCATION(RC_KF_MIDOS_TOP_RIGHT_CHEST,    true),
+                  LOCATION(RC_KF_MIDOS_BOTTOM_LEFT_CHEST,  true),
+                  LOCATION(RC_KF_MIDOS_BOTTOM_RIGHT_CHEST, true),
                 }, {
                   //Exits
                   Entrance(RR_KOKIRI_FOREST, {[]{return true;}}),
@@ -81,14 +81,14 @@ void AreaTable_Init_LostWoods() {
 
   areaTable[RR_KF_KOKIRI_SHOP] = Area("KF Kokiri Shop", "KF Kokiri Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_KF_SHOP_ITEM_1, {[]{return true;}}),
-                  LocationAccess(RC_KF_SHOP_ITEM_2, {[]{return true;}}),
-                  LocationAccess(RC_KF_SHOP_ITEM_3, {[]{return true;}}),
-                  LocationAccess(RC_KF_SHOP_ITEM_4, {[]{return true;}}),
-                  LocationAccess(RC_KF_SHOP_ITEM_5, {[]{return true;}}),
-                  LocationAccess(RC_KF_SHOP_ITEM_6, {[]{return true;}}),
-                  LocationAccess(RC_KF_SHOP_ITEM_7, {[]{return true;}}),
-                  LocationAccess(RC_KF_SHOP_ITEM_8, {[]{return true;}}),
+                  LOCATION(RC_KF_SHOP_ITEM_1, true),
+                  LOCATION(RC_KF_SHOP_ITEM_2, true),
+                  LOCATION(RC_KF_SHOP_ITEM_3, true),
+                  LOCATION(RC_KF_SHOP_ITEM_4, true),
+                  LOCATION(RC_KF_SHOP_ITEM_5, true),
+                  LOCATION(RC_KF_SHOP_ITEM_6, true),
+                  LOCATION(RC_KF_SHOP_ITEM_7, true),
+                  LOCATION(RC_KF_SHOP_ITEM_8, true),
                 }, {
                   //Exits
                   Entrance(RR_KOKIRI_FOREST, {[]{return true;}}),
@@ -96,11 +96,11 @@ void AreaTable_Init_LostWoods() {
 
   areaTable[RR_KF_STORMS_GROTTO] = Area("KF Storms Grotto", "KF Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
-                  LocationAccess(RC_KF_STORMS_GROTTO_CHEST,         {[]{return true;}}),
-                  LocationAccess(RC_KF_STORMS_GROTTO_FISH,          {[]{return logic->HasBottle;}}),
-                  LocationAccess(RC_KF_STORMS_GROTTO_GOSSIP_STONE,         {[]{return true;}}),
-                  LocationAccess(RC_KF_STORMS_GROTTO_BEEHIVE_LEFT,  {[]{return logic->CanBreakLowerBeehives;}}),
-                  LocationAccess(RC_KF_STORMS_GROTTO_BEEHIVE_RIGHT, {[]{return logic->CanBreakLowerBeehives;}}),
+                  LOCATION(RC_KF_STORMS_GROTTO_CHEST,         true),
+                  LOCATION(RC_KF_STORMS_GROTTO_FISH,          logic->HasBottle),
+                  LOCATION(RC_KF_STORMS_GROTTO_GOSSIP_STONE,  true),
+                  LOCATION(RC_KF_STORMS_GROTTO_BEEHIVE_LEFT,  logic->CanBreakLowerBeehives),
+                  LOCATION(RC_KF_STORMS_GROTTO_BEEHIVE_RIGHT, logic->CanBreakLowerBeehives),
                 }, {
                   //Exits
                   Entrance(RR_KOKIRI_FOREST, {[]{return true;}})
@@ -120,9 +120,9 @@ void AreaTable_Init_LostWoods() {
                   EventAccess(&logic->BugShrub,          {[]{return logic->IsChild && logic->CanCutShrubs;}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_LW_SKULL_KID,                 {[]{return logic->IsChild && logic->CanUse(RG_SARIAS_SONG);}}),
-                  LocationAccess(RC_LW_TRADE_COJIRO,              {[]{return logic->IsAdult && logic->Cojiro;}}),
-                  LocationAccess(RC_LW_TRADE_ODD_POTION,        {[]{return logic->IsAdult && logic->OddPoultice && logic->Cojiro;}}),
+                  LOCATION(RC_LW_SKULL_KID,                 logic->IsChild && logic->CanUse(RG_SARIAS_SONG)),
+                  LOCATION(RC_LW_TRADE_COJIRO,              logic->IsAdult && logic->Cojiro),
+                  LOCATION(RC_LW_TRADE_ODD_POTION,        logic->IsAdult && logic->OddPoultice && logic->Cojiro),
                                                                                                 //all 5 buttons are logically required for memory game
                                                                                                 //because the chances of being able to beat it
                                                                                                 //every time you attempt it are as follows:
@@ -131,11 +131,11 @@ void AreaTable_Init_LostWoods() {
                                                                                                 //3 buttons        => 3.75%
                                                                                                 //4 buttons        => 25.3125%
                                                                                                 //5 buttons        => 100%
-                  LocationAccess(RC_LW_OCARINA_MEMORY_GAME,       {[]{return logic->IsChild && logic->Ocarina && logic->OcarinaButtons >= 5;}}),
-                  LocationAccess(RC_LW_TARGET_IN_WOODS,           {[]{return logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT);}}),
-                  LocationAccess(RC_LW_DEKU_SCRUB_NEAR_BRIDGE,    {[]{return logic->IsChild && logic->CanStunDeku;}}),
-                  LocationAccess(RC_LW_GS_BEAN_PATCH_NEAR_BRIDGE, {[]{return logic->CanPlantBugs && logic->CanChildAttack;}}),
-                  LocationAccess(RC_LW_GOSSIP_STONE,              {[]{return true;}}),
+                  LOCATION(RC_LW_OCARINA_MEMORY_GAME,       logic->IsChild && logic->Ocarina && logic->OcarinaButtons >= 5),
+                  LOCATION(RC_LW_TARGET_IN_WOODS,           logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT)),
+                  LOCATION(RC_LW_DEKU_SCRUB_NEAR_BRIDGE,    logic->IsChild && logic->CanStunDeku),
+                  LOCATION(RC_LW_GS_BEAN_PATCH_NEAR_BRIDGE, logic->CanPlantBugs && logic->CanChildAttack),
+                  LOCATION(RC_LW_GOSSIP_STONE,              true),
                 }, {
                   //Exits
                   Entrance(RR_LW_FOREST_EXIT,           {[]{return true;}}),
@@ -151,10 +151,10 @@ void AreaTable_Init_LostWoods() {
                   EventAccess(&logic->ButterflyFairy, {[]{return logic->ButterflyFairy || logic->CanUse(RG_STICKS);}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT, {[]{return logic->IsChild && logic->CanStunDeku;}}),
-                  LocationAccess(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT,  {[]{return logic->IsChild && logic->CanStunDeku;}}),
-                  LocationAccess(RC_LW_GS_ABOVE_THEATER,                   {[]{return logic->IsAdult && logic->AtNight && ((CanPlantBean(RR_LW_BEYOND_MIDO) && logic->CanAdultAttack) || (randoCtx->GetTrickOption(RT_LW_GS_BEAN) && logic->CanUse(RG_HOOKSHOT) && (logic->CanUse(RG_LONGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->HasBombchus || logic->CanUse(RG_DINS_FIRE)))) && logic->CanGetNightTimeGS;}}),
-                  LocationAccess(RC_LW_GS_BEAN_PATCH_NEAR_THEATER,         {[]{return logic->CanPlantBugs && (logic->CanChildAttack || (randoCtx->GetOption(RSK_SHUFFLE_SCRUBS).Is(RO_SCRUBS_OFF) && logic->DekuShield));}}),
+                  LOCATION(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT, logic->IsChild && logic->CanStunDeku),
+                  LOCATION(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT,  logic->IsChild && logic->CanStunDeku),
+                  LOCATION(RC_LW_GS_ABOVE_THEATER,                   logic->IsAdult && logic->AtNight && ((CanPlantBean(RR_LW_BEYOND_MIDO) && logic->CanAdultAttack) || (randoCtx->GetTrickOption(RT_LW_GS_BEAN) && logic->CanUse(RG_HOOKSHOT) && (logic->CanUse(RG_LONGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->HasBombchus || logic->CanUse(RG_DINS_FIRE)))) && logic->CanGetNightTimeGS),
+                  LOCATION(RC_LW_GS_BEAN_PATCH_NEAR_THEATER,         logic->CanPlantBugs && (logic->CanChildAttack || (randoCtx->GetOption(RSK_SHUFFLE_SCRUBS).Is(RO_SCRUBS_OFF) && logic->DekuShield))),
                 }, {
                   //Exits
                   Entrance(RR_LW_FOREST_EXIT,   {[]{return true;}}),
@@ -166,11 +166,11 @@ void AreaTable_Init_LostWoods() {
 
   areaTable[RR_LW_NEAR_SHORTCUTS_GROTTO] = Area("LW Near Shortcuts Grotto", "LW Near Shortcuts Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
-                  LocationAccess(RC_LW_NEAR_SHORTCUTS_GROTTO_CHEST,         {[]{return true;}}),
-                  LocationAccess(RC_LW_NEAR_SHORTCUTS_GROTTO_FISH,          {[]{return logic->HasBottle;}}),
-                  LocationAccess(RC_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE,         {[]{return true;}}),
-                  LocationAccess(RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_LEFT,  {[]{return logic->CanBreakLowerBeehives;}}),
-                  LocationAccess(RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_RIGHT, {[]{return logic->CanBreakLowerBeehives;}}),
+                  LOCATION(RC_LW_NEAR_SHORTCUTS_GROTTO_CHEST,         true),
+                  LOCATION(RC_LW_NEAR_SHORTCUTS_GROTTO_FISH,          logic->HasBottle),
+                  LOCATION(RC_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE,  true),
+                  LOCATION(RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_LEFT,  logic->CanBreakLowerBeehives),
+                  LOCATION(RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_RIGHT, logic->CanBreakLowerBeehives),
                 }, {
                   //Exits
                   Entrance(RR_THE_LOST_WOODS, {[]{return true;}}),
@@ -178,8 +178,8 @@ void AreaTable_Init_LostWoods() {
 
   areaTable[RR_DEKU_THEATER] = Area("Deku Theater", "Deku Theater", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_DEKU_THEATER_SKULL_MASK,    {[]{return logic->IsChild && logic->SkullMask;}}),
-                  LocationAccess(RC_DEKU_THEATER_MASK_OF_TRUTH, {[]{return logic->IsChild && logic->MaskOfTruth;}}),
+                  LOCATION(RC_DEKU_THEATER_SKULL_MASK,    logic->IsChild && logic->SkullMask),
+                  LOCATION(RC_DEKU_THEATER_MASK_OF_TRUTH, logic->IsChild && logic->MaskOfTruth),
                 }, {
                   //Exits
                   Entrance(RR_LW_BEYOND_MIDO, {[]{return true;}}),
@@ -187,9 +187,9 @@ void AreaTable_Init_LostWoods() {
 
   areaTable[RR_LW_SCRUBS_GROTTO] = Area("LW Scrubs Grotto", "LW Scrubs Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_LW_DEKU_SCRUB_GROTTO_REAR,    {[]{return logic->CanStunDeku;}}),
-                  LocationAccess(RC_LW_DEKU_SCRUB_GROTTO_FRONT,   {[]{return logic->CanStunDeku;}}),
-                  LocationAccess(RC_LW_DEKU_SCRUB_GROTTO_BEEHIVE, {[]{return logic->CanBreakUpperBeehives;}}),
+                  LOCATION(RC_LW_DEKU_SCRUB_GROTTO_REAR,    logic->CanStunDeku),
+                  LOCATION(RC_LW_DEKU_SCRUB_GROTTO_FRONT,   logic->CanStunDeku),
+                  LOCATION(RC_LW_DEKU_SCRUB_GROTTO_BEEHIVE, logic->CanBreakUpperBeehives),
                 }, {
                   //Exits
                   Entrance(RR_LW_BEYOND_MIDO, {[]{return true;}}),
@@ -207,12 +207,12 @@ void AreaTable_Init_LostWoods() {
                   EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CanSummonGossipFairyWithoutSuns;}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_SONG_FROM_SARIA,             {[]{return logic->IsChild && logic->ZeldasLetter;}}),
-                  LocationAccess(RC_SHEIK_IN_FOREST,             {[]{return logic->IsAdult;}}),
-                  LocationAccess(RC_SFM_GS,                      {[]{return logic->IsAdult && logic->HookshotOrBoomerang && logic->AtNight && logic->CanGetNightTimeGS;}}),
-                  LocationAccess(RC_SFM_MAZE_LOWER_GOSSIP_STONE, {[]{return true;}}),
-                  LocationAccess(RC_SFM_MAZE_UPPER_GOSSIP_STONE, {[]{return true;}}),
-                  LocationAccess(RC_SFM_SARIA_GOSSIP_STONE,      {[]{return true;}}),
+                  LOCATION(RC_SONG_FROM_SARIA,             logic->IsChild && logic->ZeldasLetter),
+                  LOCATION(RC_SHEIK_IN_FOREST,             logic->IsAdult),
+                  LOCATION(RC_SFM_GS,                      logic->IsAdult && logic->HookshotOrBoomerang && logic->AtNight && logic->CanGetNightTimeGS),
+                  LOCATION(RC_SFM_MAZE_LOWER_GOSSIP_STONE, true),
+                  LOCATION(RC_SFM_MAZE_UPPER_GOSSIP_STONE, true),
+                  LOCATION(RC_SFM_SARIA_GOSSIP_STONE,      true),
                 }, {
                   //Exits
                   Entrance(RR_SFM_ENTRYWAY,           {[]{return true;}}),
@@ -231,7 +231,7 @@ void AreaTable_Init_LostWoods() {
 
   areaTable[RR_SFM_WOLFOS_GROTTO] = Area("SFM Wolfos Grotto", "SFM Wolfos Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SFM_WOLFOS_GROTTO_CHEST, {[]{return logic->IsAdult || logic->Slingshot || logic->Sticks || logic->KokiriSword || logic->CanUse(RG_DINS_FIRE) || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD);}}),
+                  LOCATION(RC_SFM_WOLFOS_GROTTO_CHEST, logic->IsAdult || logic->Slingshot || logic->Sticks || logic->KokiriSword || logic->CanUse(RG_DINS_FIRE) || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)),
                 }, {
                   //Exits
                   Entrance(RR_SFM_ENTRYWAY, {[]{return true;}}),
@@ -239,9 +239,9 @@ void AreaTable_Init_LostWoods() {
 
   areaTable[RR_SFM_STORMS_GROTTO] = Area("SFM Storms Grotto", "SFM Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SFM_DEKU_SCRUB_GROTTO_REAR,  {[]{return logic->CanStunDeku;}}),
-                  LocationAccess(RC_SFM_DEKU_SCRUB_GROTTO_FRONT, {[]{return logic->CanStunDeku;}}),
-                  LocationAccess(RC_SFM_STORMS_GROTTO_BEEHIVE,   {[]{return logic->CanBreakUpperBeehives;}}),
+                  LOCATION(RC_SFM_DEKU_SCRUB_GROTTO_REAR,  logic->CanStunDeku),
+                  LOCATION(RC_SFM_DEKU_SCRUB_GROTTO_FRONT, logic->CanStunDeku),
+                  LOCATION(RC_SFM_STORMS_GROTTO_BEEHIVE,   logic->CanBreakUpperBeehives),
                 }, {
                   //Exits
                   Entrance(RR_SACRED_FOREST_MEADOW, {[]{return true;}}),
@@ -249,7 +249,7 @@ void AreaTable_Init_LostWoods() {
 
   areaTable[RR_LW_BRIDGE_FROM_FOREST] = Area("LW Bridge From Forest", "Lost Woods", RA_THE_LOST_WOODS, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_LW_GIFT_FROM_SARIA, {[]{return true;}}),
+                  LOCATION(RC_LW_GIFT_FROM_SARIA, true),
                 }, {
                   //Exits
                   Entrance(RR_LW_BRIDGE, {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp
index c742c9c2d..b95262ab3 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp
@@ -24,8 +24,8 @@ void AreaTable_Init_ShadowTemple() {
                   EventAccess(&logic->NutPot, {[]{return true;}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_SHADOW_TEMPLE_MAP_CHEST,         {[]{return logic->CanJumpslash;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_HOVER_BOOTS_CHEST, {[]{return (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD));}}),
+                  LOCATION(RC_SHADOW_TEMPLE_MAP_CHEST,         logic->CanJumpslash),
+                  LOCATION(RC_SHADOW_TEMPLE_HOVER_BOOTS_CHEST, (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD))),
                 }, {
                   //Exits
                   Entrance(RR_SHADOW_TEMPLE_ENTRYWAY,     {[]{return true;}}),
@@ -37,9 +37,9 @@ void AreaTable_Init_ShadowTemple() {
                   EventAccess(&logic->FairyPot, {[]{return true;}}), //This fairy pot is only on 3DS
                 }, {
                   //Locations
-                  LocationAccess(RC_SHADOW_TEMPLE_COMPASS_CHEST,            {[]{return logic->CanJumpslash;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST, {[]{return logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT);}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_GS_NEAR_SHIP,             {[]{return false;}}),
+                  LOCATION(RC_SHADOW_TEMPLE_COMPASS_CHEST,            logic->CanJumpslash),
+                  LOCATION(RC_SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST, logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT)),
+                  LOCATION(RC_SHADOW_TEMPLE_GS_NEAR_SHIP,             false),
                 }, {
                   //Exits
                   Entrance(RR_SHADOW_TEMPLE_HUGE_PIT,    {[]{return logic->HasExplosives && logic->IsAdult && logic->SmallKeys(RR_SHADOW_TEMPLE, 1, 2);}}),
@@ -48,16 +48,16 @@ void AreaTable_Init_ShadowTemple() {
 
   areaTable[RR_SHADOW_TEMPLE_HUGE_PIT] = Area("Shadow Temple Huge Pit", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST,   {[]{return logic->CanJumpslash;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST, {[]{return logic->CanJumpslash;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST,       {[]{return true;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST,       {[]{return (randoCtx->GetTrickOption(RT_SHADOW_UMBRELLA) && logic->HoverBoots) || logic->GoronBracelet;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST,      {[]{return (randoCtx->GetTrickOption(RT_SHADOW_UMBRELLA) && logic->HoverBoots) || logic->GoronBracelet;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST,           {[]{return logic->SmallKeys(RR_SHADOW_TEMPLE, 2, 3) && ((randoCtx->GetTrickOption(RT_LENS_SHADOW_PLATFORM) && randoCtx->GetTrickOption(RT_LENS_SHADOW)) || logic->CanUse(RG_LENS_OF_TRUTH));}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_FREESTANDING_KEY,                 {[]{return logic->SmallKeys(RR_SHADOW_TEMPLE, 2, 3) && ((randoCtx->GetTrickOption(RT_LENS_SHADOW_PLATFORM) && randoCtx->GetTrickOption(RT_LENS_SHADOW)) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->Hookshot && (logic->Bombs || logic->GoronBracelet || (randoCtx->GetTrickOption(RT_SHADOW_FREESTANDING_KEY) && logic->HasBombchus));}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM,                {[]{return logic->CanJumpslash;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM,           {[]{return logic->Hookshot || (randoCtx->GetTrickOption(RT_SHADOW_UMBRELLA_GS) && logic->HoverBoots);}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_GS_SINGLE_GIANT_POT,              {[]{return logic->SmallKeys(RR_SHADOW_TEMPLE, 2, 3) && ((randoCtx->GetTrickOption(RT_LENS_SHADOW_PLATFORM) && randoCtx->GetTrickOption(RT_LENS_SHADOW)) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->Hookshot;}}),
+                  LOCATION(RC_SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST,   logic->CanJumpslash),
+                  LOCATION(RC_SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST, logic->CanJumpslash),
+                  LOCATION(RC_SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST,       true),
+                  LOCATION(RC_SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST,       (randoCtx->GetTrickOption(RT_SHADOW_UMBRELLA) && logic->HoverBoots) || logic->GoronBracelet),
+                  LOCATION(RC_SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST,      (randoCtx->GetTrickOption(RT_SHADOW_UMBRELLA) && logic->HoverBoots) || logic->GoronBracelet),
+                  LOCATION(RC_SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST,           logic->SmallKeys(RR_SHADOW_TEMPLE, 2, 3) && ((randoCtx->GetTrickOption(RT_LENS_SHADOW_PLATFORM) && randoCtx->GetTrickOption(RT_LENS_SHADOW)) || logic->CanUse(RG_LENS_OF_TRUTH))),
+                  LOCATION(RC_SHADOW_TEMPLE_FREESTANDING_KEY,                 logic->SmallKeys(RR_SHADOW_TEMPLE, 2, 3) && ((randoCtx->GetTrickOption(RT_LENS_SHADOW_PLATFORM) && randoCtx->GetTrickOption(RT_LENS_SHADOW)) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->Hookshot && (logic->Bombs || logic->GoronBracelet || (randoCtx->GetTrickOption(RT_SHADOW_FREESTANDING_KEY) && logic->HasBombchus))),
+                  LOCATION(RC_SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM,                logic->CanJumpslash),
+                  LOCATION(RC_SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM,           logic->Hookshot || (randoCtx->GetTrickOption(RT_SHADOW_UMBRELLA_GS) && logic->HoverBoots)),
+                  LOCATION(RC_SHADOW_TEMPLE_GS_SINGLE_GIANT_POT,              logic->SmallKeys(RR_SHADOW_TEMPLE, 2, 3) && ((randoCtx->GetTrickOption(RT_LENS_SHADOW_PLATFORM) && randoCtx->GetTrickOption(RT_LENS_SHADOW)) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->Hookshot),
                 }, {
                   //Exits
                   Entrance(RR_SHADOW_TEMPLE_WIND_TUNNEL, {[]{return ((randoCtx->GetTrickOption(RT_LENS_SHADOW_PLATFORM) && randoCtx->GetTrickOption(RT_LENS_SHADOW)) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->Hookshot && logic->SmallKeys(RR_SHADOW_TEMPLE, 3, 4);}}),
@@ -65,10 +65,10 @@ void AreaTable_Init_ShadowTemple() {
 
   areaTable[RR_SHADOW_TEMPLE_WIND_TUNNEL] = Area("Shadow Temple Wind Tunnel", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SHADOW_TEMPLE_WIND_HINT_CHEST,         {[]{return true;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST,  {[]{return logic->CanJumpslash;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST, {[]{return true;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_GS_NEAR_SHIP,            {[]{return logic->CanUse(RG_LONGSHOT) && logic->SmallKeys(RR_SHADOW_TEMPLE, 4, 5);}}),
+                  LOCATION(RC_SHADOW_TEMPLE_WIND_HINT_CHEST,         true),
+                  LOCATION(RC_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST,  logic->CanJumpslash),
+                  LOCATION(RC_SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST, true),
+                  LOCATION(RC_SHADOW_TEMPLE_GS_NEAR_SHIP,            logic->CanUse(RG_LONGSHOT) && logic->SmallKeys(RR_SHADOW_TEMPLE, 4, 5)),
                 }, {
                   //Exits
                   Entrance(RR_SHADOW_TEMPLE_BEYOND_BOAT, {[]{return logic->CanJumpslash && logic->CanUse(RG_ZELDAS_LULLABY) && logic->SmallKeys(RR_SHADOW_TEMPLE, 4, 5);}}),
@@ -76,10 +76,10 @@ void AreaTable_Init_ShadowTemple() {
 
   areaTable[RR_SHADOW_TEMPLE_BEYOND_BOAT] = Area("Shadow Temple Beyond Boat", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST,      {[]{return logic->CanUse(RG_DINS_FIRE);}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_BOSS_KEY_CHEST,              {[]{return logic->CanUse(RG_DINS_FIRE);}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST, {[]{return logic->CanJumpslash;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT,         {[]{return logic->CanAdultAttack;}}),
+                  LOCATION(RC_SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST,      logic->CanUse(RG_DINS_FIRE)),
+                  LOCATION(RC_SHADOW_TEMPLE_BOSS_KEY_CHEST,              logic->CanUse(RG_DINS_FIRE)),
+                  LOCATION(RC_SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST, logic->CanJumpslash),
+                  LOCATION(RC_SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT,         logic->CanAdultAttack),
   }, {
                   //Exits
                   Entrance(RR_SHADOW_TEMPLE_BOSS_ENTRYWAY, {[]{return (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_DISTANT_SCARECROW) || (randoCtx->GetTrickOption(RT_SHADOW_STATUE) && logic->HasBombchus)) && logic->SmallKeys(RR_SHADOW_TEMPLE, 5) && logic->CanUse(RG_HOVER_BOOTS) && logic->BossKeyShadowTemple;}})
@@ -100,15 +100,15 @@ void AreaTable_Init_ShadowTemple() {
 
   areaTable[RR_SHADOW_TEMPLE_MQ_DEAD_HAND_AREA] = Area("Shadow Temple MQ Dead Hand Area", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_COMPASS_CHEST,     {[]{return logic->CanJumpslash;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST, {[]{return logic->CanJumpslash && logic->CanUse(RG_SONG_OF_TIME) && logic->IsAdult && logic->CanUse(RG_FAIRY_BOW);}}),
+                  LOCATION(RC_SHADOW_TEMPLE_MQ_COMPASS_CHEST,     logic->CanJumpslash),
+                  LOCATION(RC_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST, logic->CanJumpslash && logic->CanUse(RG_SONG_OF_TIME) && logic->IsAdult && logic->CanUse(RG_FAIRY_BOW)),
   }, {});
 
   areaTable[RR_SHADOW_TEMPLE_MQ_FIRST_BEAMOS] = Area("Shadow Temple MQ First Beamos", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_MAP_CHEST,                 {[]{return logic->CanAdultAttack || logic->Nuts;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST,        {[]{return logic->CanJumpslash;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST, {[]{return logic->CanAdultAttack || logic->Nuts;}}),
+                  LOCATION(RC_SHADOW_TEMPLE_MQ_MAP_CHEST,                 logic->CanAdultAttack || logic->Nuts),
+                  LOCATION(RC_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST,        logic->CanJumpslash),
+                  LOCATION(RC_SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST, logic->CanAdultAttack || logic->Nuts),
   }, {
                   //Exits
                   Entrance(RR_SHADOW_TEMPLE_MQ_UPPER_HUGE_PIT, {[]{return logic->HasExplosives && logic->SmallKeys(RR_SHADOW_TEMPLE, 2);}}),
@@ -116,9 +116,9 @@ void AreaTable_Init_ShadowTemple() {
 
   areaTable[RR_SHADOW_TEMPLE_MQ_UPPER_HUGE_PIT] = Area("Shadow Temple MQ Upper Huge Pit", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST,   {[]{return logic->CanUse(RG_SONG_OF_TIME) || (randoCtx->GetTrickOption(RT_SHADOW_MQ_INVISIBLE_BLADES) && randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_OHKO));}}),
+                  LOCATION(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST,   logic->CanUse(RG_SONG_OF_TIME) || (randoCtx->GetTrickOption(RT_SHADOW_MQ_INVISIBLE_BLADES) && randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_OHKO))),
                     //Trick: logic->CanUse(RG_SONG_OF_TIME) || (LogicShadowMQInvisibleBlades && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO))
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST, {[]{return logic->CanUse(RG_SONG_OF_TIME) || (randoCtx->GetTrickOption(RT_SHADOW_MQ_INVISIBLE_BLADES) && randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_OHKO));}}),
+                  LOCATION(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST, logic->CanUse(RG_SONG_OF_TIME) || (randoCtx->GetTrickOption(RT_SHADOW_MQ_INVISIBLE_BLADES) && randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_OHKO))),
                     //Trick: logic->CanUse(RG_SONG_OF_TIME) || (LogicShadowMQInvisibleBlades && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO))
   }, {
                   //Exits
@@ -128,14 +128,14 @@ void AreaTable_Init_ShadowTemple() {
 
   areaTable[RR_SHADOW_TEMPLE_MQ_LOWER_HUGE_PIT] = Area("Shadow Temple MQ Lower Huge Pit", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST,  {[]{return logic->IsAdult && logic->CanUse(RG_LONGSHOT);}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST,  {[]{return true;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST,  {[]{return (randoCtx->GetTrickOption(RT_SHADOW_UMBRELLA) && logic->HoverBoots) || logic->GoronBracelet;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST, {[]{return (randoCtx->GetTrickOption(RT_SHADOW_UMBRELLA) && logic->HoverBoots) || logic->GoronBracelet;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST,      {[]{return logic->CanJumpslash && logic->HoverBoots && logic->SmallKeys(RR_SHADOW_TEMPLE, 3) && ((randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ) && randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ_PLATFORM)) || logic->CanUse(RG_LENS_OF_TRUTH));}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST,          {[]{return (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && logic->HoverBoots && logic->SmallKeys(RR_SHADOW_TEMPLE, 3) && logic->Hookshot && ((randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ) &&
-                   randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ_INVISIBLE_BLADES) && randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ_PLATFORM)) || logic->CanUse(RG_LENS_OF_TRUTH));}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM,      {[]{return logic->Hookshot || (randoCtx->GetTrickOption(RT_SHADOW_UMBRELLA_GS) && logic->HoverBoots);}}),
+                  LOCATION(RC_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST,  logic->IsAdult && logic->CanUse(RG_LONGSHOT)),
+                  LOCATION(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST,  true),
+                  LOCATION(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST,  (randoCtx->GetTrickOption(RT_SHADOW_UMBRELLA) && logic->HoverBoots) || logic->GoronBracelet),
+                  LOCATION(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST, (randoCtx->GetTrickOption(RT_SHADOW_UMBRELLA) && logic->HoverBoots) || logic->GoronBracelet),
+                  LOCATION(RC_SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST,      logic->CanJumpslash && logic->HoverBoots && logic->SmallKeys(RR_SHADOW_TEMPLE, 3) && ((randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ) && randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ_PLATFORM)) || logic->CanUse(RG_LENS_OF_TRUTH))),
+                  LOCATION(RC_SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST,          (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && logic->HoverBoots && logic->SmallKeys(RR_SHADOW_TEMPLE, 3) && logic->Hookshot && ((randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ) &&
+                   randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ_INVISIBLE_BLADES) && randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ_PLATFORM)) || logic->CanUse(RG_LENS_OF_TRUTH))),
+                  LOCATION(RC_SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM,      logic->Hookshot || (randoCtx->GetTrickOption(RT_SHADOW_UMBRELLA_GS) && logic->HoverBoots)),
   }, {
                   //Exits
                   Entrance(RR_SHADOW_TEMPLE_MQ_WIND_TUNNEL, {[]{return logic->HoverBoots && ((randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ) && randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ_PLATFORM)) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->Hookshot && logic->SmallKeys(RR_SHADOW_TEMPLE, 4);}}),
@@ -146,11 +146,11 @@ void AreaTable_Init_ShadowTemple() {
                   EventAccess(&logic->NutPot, {[]{return true;}}),
   }, {
                   //Locations
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_WIND_HINT_CHEST,         {[]{return true;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST,  {[]{return logic->CanJumpslash;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST, {[]{return true;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM,       {[]{return true;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_GS_AFTER_WIND,           {[]{return true;}}),
+                  LOCATION(RC_SHADOW_TEMPLE_MQ_WIND_HINT_CHEST,         true),
+                  LOCATION(RC_SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST,  logic->CanJumpslash),
+                  LOCATION(RC_SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST, true),
+                  LOCATION(RC_SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM,       true),
+                  LOCATION(RC_SHADOW_TEMPLE_MQ_GS_AFTER_WIND,           true),
   }, {
                   //Exits
                   Entrance(RR_SHADOW_TEMPLE_MQ_BEYOND_BOAT, {[]{return logic->CanUse(RG_ZELDAS_LULLABY) && logic->SmallKeys(RR_SHADOW_TEMPLE, 5);}}),
@@ -158,8 +158,8 @@ void AreaTable_Init_ShadowTemple() {
 
   areaTable[RR_SHADOW_TEMPLE_MQ_BEYOND_BOAT] = Area("Shadow Temple MQ Beyond Boat", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_GS_AFTER_SHIP,  {[]{return true;}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS,   {[]{return logic->Bow || (randoCtx->GetTrickOption(RT_SHADOW_STATUE) && logic->HasBombchus);}}),
+                  LOCATION(RC_SHADOW_TEMPLE_MQ_GS_AFTER_SHIP,  true),
+                  LOCATION(RC_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS,   logic->Bow || (randoCtx->GetTrickOption(RT_SHADOW_STATUE) && logic->HasBombchus)),
   }, {
                   //Exits
                   Entrance(RR_SHADOW_TEMPLE_MQ_INVISIBLE_MAZE, {[]{return logic->Bow && logic->CanUse(RG_SONG_OF_TIME) && logic->IsAdult && logic->CanUse(RG_LONGSHOT);}}),
@@ -168,11 +168,11 @@ void AreaTable_Init_ShadowTemple() {
 
   areaTable[RR_SHADOW_TEMPLE_MQ_INVISIBLE_MAZE] = Area("Shadow Temple MQ Invisible Maze", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST, {[]{return logic->CanUse(RG_DINS_FIRE) && logic->SmallKeys(RR_SHADOW_TEMPLE, 6);}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST,         {[]{return logic->CanUse(RG_DINS_FIRE) && logic->SmallKeys(RR_SHADOW_TEMPLE, 6);}}),
+                  LOCATION(RC_SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST, logic->CanUse(RG_DINS_FIRE) && logic->SmallKeys(RR_SHADOW_TEMPLE, 6)),
+                  LOCATION(RC_SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST,         logic->CanUse(RG_DINS_FIRE) && logic->SmallKeys(RR_SHADOW_TEMPLE, 6)),
                   //below previously returned true
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST,      {[]{return logic->CanUse(RG_LENS_OF_TRUTH) || randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ_DEADHAND);}}),
-                  LocationAccess(RC_SHADOW_TEMPLE_MQ_FREESTANDING_KEY,       {[]{return true;}}),
+                  LOCATION(RC_SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST,      logic->CanUse(RG_LENS_OF_TRUTH) || randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ_DEADHAND)),
+                  LOCATION(RC_SHADOW_TEMPLE_MQ_FREESTANDING_KEY,       true),
   }, {});
   }
 
@@ -201,8 +201,8 @@ void AreaTable_Init_ShadowTemple() {
              },
              {
                  // Locations
-                 LocationAccess(RC_SHADOW_TEMPLE_BONGO_BONGO_HEART, { [] { return logic->ShadowTempleClear; } }),
-                 LocationAccess(RC_BONGO_BONGO, { [] { return logic->ShadowTempleClear; } }),
+                 LOCATION(RC_SHADOW_TEMPLE_BONGO_BONGO_HEART, logic->ShadowTempleClear),
+                 LOCATION(RC_BONGO_BONGO, logic->ShadowTempleClear),
              },
              {
                  // Exits
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp
index c859aeb8d..7feb1b064 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp
@@ -31,9 +31,9 @@ void AreaTable_Init_SpiritTemple() {
                   EventAccess(&logic->NutCrate, {[]{return true;}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST,        {[]{return (logic->Boomerang || logic->Slingshot || (logic->HasBombchus && randoCtx->GetTrickOption(RT_SPIRIT_CHILD_CHU))) && (logic->HasExplosives || ((logic->Nuts || logic->Boomerang) && (logic->Sticks || logic->KokiriSword || logic->Slingshot)));}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST, {[]{return (logic->Boomerang || logic->Slingshot || (logic->HasBombchus && randoCtx->GetTrickOption(RT_SPIRIT_CHILD_CHU))) && (logic->HasExplosives || ((logic->Nuts || logic->Boomerang) && (logic->Sticks || logic->KokiriSword || logic->Slingshot))) && (logic->Sticks || logic->CanUse(RG_DINS_FIRE));}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_GS_METAL_FENCE,            {[]{return (logic->Boomerang || logic->Slingshot || (logic->HasBombchus && randoCtx->GetTrickOption(RT_SPIRIT_CHILD_CHU))) && (logic->HasExplosives || ((logic->Nuts || logic->Boomerang) && (logic->Sticks || logic->KokiriSword || logic->Slingshot)));}}),
+                  LOCATION(RC_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST,        (logic->Boomerang || logic->Slingshot || (logic->HasBombchus && randoCtx->GetTrickOption(RT_SPIRIT_CHILD_CHU))) && (logic->HasExplosives || ((logic->Nuts || logic->Boomerang) && (logic->Sticks || logic->KokiriSword || logic->Slingshot)))),
+                  LOCATION(RC_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST, (logic->Boomerang || logic->Slingshot || (logic->HasBombchus && randoCtx->GetTrickOption(RT_SPIRIT_CHILD_CHU))) && (logic->HasExplosives || ((logic->Nuts || logic->Boomerang) && (logic->Sticks || logic->KokiriSword || logic->Slingshot))) && (logic->Sticks || logic->CanUse(RG_DINS_FIRE))),
+                  LOCATION(RC_SPIRIT_TEMPLE_GS_METAL_FENCE,            (logic->Boomerang || logic->Slingshot || (logic->HasBombchus && randoCtx->GetTrickOption(RT_SPIRIT_CHILD_CHU))) && (logic->HasExplosives || ((logic->Nuts || logic->Boomerang) && (logic->Sticks || logic->KokiriSword || logic->Slingshot)))),
                 }, {
                   //Exits
                   Entrance(RR_SPIRIT_TEMPLE_CHILD_CLIMB, {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 1);}}),
@@ -41,12 +41,12 @@ void AreaTable_Init_SpiritTemple() {
 
   areaTable[RR_SPIRIT_TEMPLE_CHILD_CLIMB] = Area("Child Spirit Temple Climb", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST, {[]{return logic->HasProjectile(HasProjectileAge::Both) || ((logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && logic->CanUse(RG_SILVER_GAUNTLETS) && logic->HasProjectile(HasProjectileAge::Adult)) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->IsChild && logic->HasProjectile(HasProjectileAge::Child));}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST,  {[]{return logic->HasProjectile(HasProjectileAge::Both) || ((logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && logic->CanUse(RG_SILVER_GAUNTLETS) && logic->HasProjectile(HasProjectileAge::Adult)) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->IsChild && logic->HasProjectile(HasProjectileAge::Child));}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM,    {[]{return logic->HasProjectile(HasProjectileAge::Both) || logic->CanUse(RG_DINS_FIRE) ||
+                  LOCATION(RC_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST, logic->HasProjectile(HasProjectileAge::Both) || ((logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && logic->CanUse(RG_SILVER_GAUNTLETS) && logic->HasProjectile(HasProjectileAge::Adult)) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->IsChild && logic->HasProjectile(HasProjectileAge::Child))),
+                  LOCATION(RC_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST,  logic->HasProjectile(HasProjectileAge::Both) || ((logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && logic->CanUse(RG_SILVER_GAUNTLETS) && logic->HasProjectile(HasProjectileAge::Adult)) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->IsChild && logic->HasProjectile(HasProjectileAge::Child))),
+                  LOCATION(RC_SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM,    logic->HasProjectile(HasProjectileAge::Both) || logic->CanUse(RG_DINS_FIRE) ||
                                                                                       (logic->CanTakeDamage && (logic->CanJumpslash || logic->HasProjectile(HasProjectileAge::Child))) ||
                                                                                         (logic->IsChild && logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->HasProjectile(HasProjectileAge::Child)) ||
-                                                                                          ((logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && logic->CanUse(RG_SILVER_GAUNTLETS) && (logic->HasProjectile(HasProjectileAge::Adult) || (logic->CanTakeDamage && logic->CanJumpslash)));}}),
+                                                                                          ((logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && logic->CanUse(RG_SILVER_GAUNTLETS) && (logic->HasProjectile(HasProjectileAge::Adult) || (logic->CanTakeDamage && logic->CanJumpslash)))),
                 }, {
                   //Exits
                   Entrance(RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER, {[]{return logic->HasExplosives || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS));}}),
@@ -54,11 +54,11 @@ void AreaTable_Init_SpiritTemple() {
 
   areaTable[RR_SPIRIT_TEMPLE_EARLY_ADULT] = Area("Early Adult Spirit Temple", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SPIRIT_TEMPLE_COMPASS_CHEST,            {[]{return logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_ZELDAS_LULLABY);}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST,  {[]{return (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG) || logic->HasBombchus || (logic->Bombs && logic->IsAdult && randoCtx->GetTrickOption(RT_SPIRIT_LOWER_ADULT_SWITCH))) && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanJumpslash);}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST,  {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 3);}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST, {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 3);}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_GS_BOULDER_ROOM,          {[]{return logic->CanUse(RG_SONG_OF_TIME) && (logic->Bow || logic->Hookshot || logic->HasBombchus || (logic->Bombs && randoCtx->GetTrickOption(RT_SPIRIT_LOWER_ADULT_SWITCH)));}}),
+                  LOCATION(RC_SPIRIT_TEMPLE_COMPASS_CHEST,            logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_ZELDAS_LULLABY)),
+                  LOCATION(RC_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST,  (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG) || logic->HasBombchus || (logic->Bombs && logic->IsAdult && randoCtx->GetTrickOption(RT_SPIRIT_LOWER_ADULT_SWITCH))) && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanJumpslash)),
+                  LOCATION(RC_SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST,  logic->SmallKeys(RR_SPIRIT_TEMPLE, 3)),
+                  LOCATION(RC_SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST, logic->SmallKeys(RR_SPIRIT_TEMPLE, 3)),
+                  LOCATION(RC_SPIRIT_TEMPLE_GS_BOULDER_ROOM,          logic->CanUse(RG_SONG_OF_TIME) && (logic->Bow || logic->Hookshot || logic->HasBombchus || (logic->Bombs && randoCtx->GetTrickOption(RT_SPIRIT_LOWER_ADULT_SWITCH)))),
                 }, {
                   //Exits
                   Entrance(RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER, {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 1);}}),
@@ -66,7 +66,7 @@ void AreaTable_Init_SpiritTemple() {
 
   areaTable[RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER] = Area("Spirit Temple Central Chamber", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SPIRIT_TEMPLE_MAP_CHEST,                    {[]{return ((logic->HasExplosives || logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) &&
+                  LOCATION(RC_SPIRIT_TEMPLE_MAP_CHEST,                    ((logic->HasExplosives || logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) &&
 
                                                                                                 (logic->CanUse(RG_DINS_FIRE) ||
                                                                                                     (((logic->MagicMeter && logic->FireArrows) || randoCtx->GetTrickOption(RT_SPIRIT_MAP_CHEST)) && logic->Bow && logic->Sticks))) ||
@@ -74,26 +74,26 @@ void AreaTable_Init_SpiritTemple() {
                                                                                                 logic->CanUse(RG_STICKS)) ||
                                                                                             (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) &&
                                                                                                 (logic->CanUse(RG_FIRE_ARROWS) || (randoCtx->GetTrickOption(RT_SPIRIT_MAP_CHEST) && logic->Bow)) &&
-                                                                                                logic->CanUse(RG_SILVER_GAUNTLETS));}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST,         {[]{return ((logic->HasExplosives || logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) &&
+                                                                                                logic->CanUse(RG_SILVER_GAUNTLETS))),
+                  LOCATION(RC_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST,         ((logic->HasExplosives || logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) &&
                                                                                                 (logic->CanUse(RG_DINS_FIRE) ||
                                                                                                     (((logic->MagicMeter && logic->FireArrows) || randoCtx->GetTrickOption(RT_SPIRIT_SUN_CHEST)) && logic->Bow && logic->Sticks))) ||
                                                                                             (logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->HasExplosives &&
                                                                                                 logic->CanUse(RG_STICKS)) ||
                                                                                             (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) &&
                                                                                                 (logic->CanUse(RG_FIRE_ARROWS) || (randoCtx->GetTrickOption(RT_SPIRIT_SUN_CHEST) && logic->Bow)) &&
-                                                                                                logic->CanUse(RG_SILVER_GAUNTLETS));}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST,       {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) && logic->CanUse(RG_SILVER_GAUNTLETS) && logic->CanUse(RG_ZELDAS_LULLABY);}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST,  {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) && logic->CanUse(RG_SILVER_GAUNTLETS) && logic->CanUse(RG_ZELDAS_LULLABY) && (logic->Hookshot || logic->HoverBoots || randoCtx->GetTrickOption(RT_SPIRIT_LOBBY_JUMP));}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM, {[]{return (logic->HasExplosives && logic->Boomerang && logic->Hookshot) ||
+                                                                                                logic->CanUse(RG_SILVER_GAUNTLETS))),
+                  LOCATION(RC_SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST,       logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) && logic->CanUse(RG_SILVER_GAUNTLETS) && logic->CanUse(RG_ZELDAS_LULLABY)),
+                  LOCATION(RC_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST,  logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) && logic->CanUse(RG_SILVER_GAUNTLETS) && logic->CanUse(RG_ZELDAS_LULLABY) && (logic->Hookshot || logic->HoverBoots || randoCtx->GetTrickOption(RT_SPIRIT_LOBBY_JUMP))),
+                  LOCATION(RC_SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM, (logic->HasExplosives && logic->Boomerang && logic->Hookshot) ||
                                                                                             (logic->CanUse(RG_BOOMERANG) && logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->HasExplosives) ||
                                                                                             (logic->Hookshot && logic->CanUse(RG_SILVER_GAUNTLETS) &&
                                                                                                 (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) ||
-                                                                                                    (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && logic->Boomerang && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))));}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_GS_LOBBY,                     {[]{return ((logic->HasExplosives || logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) &&
+                                                                                                    (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && logic->Boomerang && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))))),
+                  LOCATION(RC_SPIRIT_TEMPLE_GS_LOBBY,                     ((logic->HasExplosives || logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) &&
                                                                                                 randoCtx->GetTrickOption(RT_SPIRIT_LOBBY_GS) && logic->Boomerang && (logic->Hookshot || logic->HoverBoots || randoCtx->GetTrickOption(RT_SPIRIT_LOBBY_JUMP))) ||
                                                                                             (randoCtx->GetTrickOption(RT_SPIRIT_LOBBY_GS) && logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->HasExplosives && logic->CanUse(RG_BOOMERANG)) ||
-                                                                                            (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) && logic->CanUse(RG_SILVER_GAUNTLETS) && (logic->Hookshot || logic->HoverBoots || randoCtx->GetTrickOption(RT_SPIRIT_LOBBY_JUMP)));}}),
+                                                                                            (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) && logic->CanUse(RG_SILVER_GAUNTLETS) && (logic->Hookshot || logic->HoverBoots || randoCtx->GetTrickOption(RT_SPIRIT_LOBBY_JUMP)))),
                 }, {
                   //Exits
                   Entrance(RR_SPIRIT_TEMPLE_OUTDOOR_HANDS,              {[]{return logic->CanJumpslash || logic->HasExplosives;}}),
@@ -103,8 +103,8 @@ void AreaTable_Init_SpiritTemple() {
 
   areaTable[RR_SPIRIT_TEMPLE_OUTDOOR_HANDS] = Area("Spirit Temple Outdoor Hands", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST, {[]{return (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) && logic->Longshot && logic->HasExplosives) || logic->SmallKeys(RR_SPIRIT_TEMPLE, 5);}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST,    {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 4) && logic->CanUse(RG_SILVER_GAUNTLETS) && logic->HasExplosives;}}),
+                  LOCATION(RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST, (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) && logic->Longshot && logic->HasExplosives) || logic->SmallKeys(RR_SPIRIT_TEMPLE, 5)),
+                  LOCATION(RC_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST,    logic->SmallKeys(RR_SPIRIT_TEMPLE, 4) && logic->CanUse(RG_SILVER_GAUNTLETS) && logic->HasExplosives),
                 }, {
                   //Exits
                   Entrance(RR_DESERT_COLOSSUS, {[]{return (logic->IsChild && logic->SmallKeys(RR_SPIRIT_TEMPLE, 5)) || (logic->CanUse(RG_SILVER_GAUNTLETS) && ((logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) && logic->HasExplosives) || logic->SmallKeys(RR_SPIRIT_TEMPLE, 5)));}}),
@@ -112,9 +112,9 @@ void AreaTable_Init_SpiritTemple() {
 
   areaTable[RR_SPIRIT_TEMPLE_BEYOND_CENTRAL_LOCKED_DOOR] = Area("Spirit Temple Beyond Central Locked Door", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST,         {[]{return (logic->MirrorShield || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS))) && logic->HasExplosives;}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST,  {[]{return (randoCtx->GetTrickOption(RT_LENS_SPIRIT) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->HasExplosives;}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST, {[]{return (randoCtx->GetTrickOption(RT_LENS_SPIRIT) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->HasExplosives;}}),
+                  LOCATION(RC_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST,         (logic->MirrorShield || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS))) && logic->HasExplosives),
+                  LOCATION(RC_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST,  (randoCtx->GetTrickOption(RT_LENS_SPIRIT) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->HasExplosives),
+                  LOCATION(RC_SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST, (randoCtx->GetTrickOption(RT_LENS_SPIRIT) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->HasExplosives),
                 }, {
                   //Exits
                   Entrance(RR_SPIRIT_TEMPLE_BEYOND_FINAL_LOCKED_DOOR, {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && (randoCtx->GetTrickOption(RT_SPIRIT_WALL) || logic->CanUse(RG_LONGSHOT) || logic->HasBombchus || ((logic->Bombs || logic->Nuts || logic->CanUse(RG_DINS_FIRE)) && (logic->Bow || logic->CanUse(RG_HOOKSHOT) || logic->Hammer)));}}),
@@ -122,8 +122,8 @@ void AreaTable_Init_SpiritTemple() {
 
   areaTable[RR_SPIRIT_TEMPLE_BEYOND_FINAL_LOCKED_DOOR] = Area("Spirit Temple Beyond Final Locked Door", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SPIRIT_TEMPLE_BOSS_KEY_CHEST, {[]{return logic->CanUse(RG_ZELDAS_LULLABY) && ((logic->CanTakeDamage && randoCtx->GetTrickOption(RT_FLAMING_CHESTS)) || (logic->Bow && logic->Hookshot));}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_TOPMOST_CHEST,  {[]{return (logic->MirrorShield && logic->CanAdultAttack) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS));}}),
+                  LOCATION(RC_SPIRIT_TEMPLE_BOSS_KEY_CHEST, logic->CanUse(RG_ZELDAS_LULLABY) && ((logic->CanTakeDamage && randoCtx->GetTrickOption(RT_FLAMING_CHESTS)) || (logic->Bow && logic->Hookshot))),
+                  LOCATION(RC_SPIRIT_TEMPLE_TOPMOST_CHEST,  (logic->MirrorShield && logic->CanAdultAttack) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS))),
   }, {
                   //Exits
                   Entrance(RR_SPIRIT_TEMPLE_INSIDE_STATUE_HEAD, {[]{return logic->MirrorShield && logic->HasExplosives && logic->Hookshot;}}),
@@ -144,9 +144,9 @@ void AreaTable_Init_SpiritTemple() {
   if (randoCtx->GetDungeon(SPIRIT_TEMPLE)->IsMQ()) {
   areaTable[RR_SPIRIT_TEMPLE_MQ_LOBBY] = Area("Spirit Temple MQ Lobby", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST, {[]{return true;}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST,  {[]{return Here(RR_SPIRIT_TEMPLE_MQ_LOBBY, []{return logic->CanBlastOrSmash;}) && ((logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT)) || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW)));}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST, {[]{return logic->HasBombchus || (logic->IsAdult && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT))) || (logic->IsChild && (logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG)));}}),
+                  LOCATION(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST, true),
+                  LOCATION(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST,  Here(RR_SPIRIT_TEMPLE_MQ_LOBBY, []{return logic->CanBlastOrSmash;}) && ((logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT)) || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW)))),
+                  LOCATION(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST, logic->HasBombchus || (logic->IsAdult && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT))) || (logic->IsChild && (logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG)))),
   }, {
                   //Exits
                   Entrance(RR_SPIRIT_TEMPLE_ENTRYWAY, {[]{return true;}}),
@@ -159,10 +159,10 @@ void AreaTable_Init_SpiritTemple() {
                   EventAccess(&logic->FairyPot, {[]{return logic->FairyPot || (logic->KokiriSword && logic->HasBombchus && logic->Slingshot);}}),
   }, {
                   //Locations
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST,  {[]{return Here(RR_SPIRIT_TEMPLE_MQ_ADULT, []{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && logic->Hammer;});}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST,       {[]{return logic->KokiriSword && logic->HasBombchus && logic->Slingshot && logic->CanUse(RG_DINS_FIRE);}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_MAP_CHEST,                  {[]{return logic->KokiriSword || logic->Bombs;}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST, {[]{return logic->HasBombchus && logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && logic->Slingshot && (logic->CanUse(RG_DINS_FIRE) || (Here(RR_SPIRIT_TEMPLE_MQ_ADULT, []{return logic->IsAdult && (logic->CanUse(RG_FIRE_ARROWS) || (randoCtx->GetTrickOption(RT_SPIRIT_MQ_FROZEN_EYE) && logic->CanUse(RG_FAIRY_BOW) && logic->CanUse(RG_SONG_OF_TIME)));})));}}),
+                  LOCATION(RC_SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST,  Here(RR_SPIRIT_TEMPLE_MQ_ADULT, []{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && logic->Hammer;})),
+                  LOCATION(RC_SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST,       logic->KokiriSword && logic->HasBombchus && logic->Slingshot && logic->CanUse(RG_DINS_FIRE)),
+                  LOCATION(RC_SPIRIT_TEMPLE_MQ_MAP_CHEST,                  logic->KokiriSword || logic->Bombs),
+                  LOCATION(RC_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST, logic->HasBombchus && logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && logic->Slingshot && (logic->CanUse(RG_DINS_FIRE) || (Here(RR_SPIRIT_TEMPLE_MQ_ADULT, []{return logic->IsAdult && (logic->CanUse(RG_FIRE_ARROWS) || (randoCtx->GetTrickOption(RT_SPIRIT_MQ_FROZEN_EYE) && logic->CanUse(RG_FAIRY_BOW) && logic->CanUse(RG_SONG_OF_TIME)));})))),
                     //Trick: logic->HasBombchus && logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && logic->Slingshot && (logic->CanUse(RG_DINS_FIRE) || (SPIRIT_TEMPLE_MQ_ADULT.Adult() && logic->IsAdult && (logic->CanUse(RG_FIRE_ARROWS) || (LogicSpiritMQFrozenEye && logic->CanUse(RG_FAIRY_BOW) && logic->CanUse(RG_SONG_OF_TIME)))))
   }, {
                   //Exits
@@ -171,14 +171,14 @@ void AreaTable_Init_SpiritTemple() {
 
   areaTable[RR_SPIRIT_TEMPLE_MQ_ADULT] = Area("Spirit Temple MQ Adult", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST,     {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 7);}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST,   {[]{return logic->CanUse(RG_ZELDAS_LULLABY) && (logic->CanJumpslash || logic->CanUse(RG_HOVER_BOOTS));}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST, {[]{return (randoCtx->GetTrickOption(RT_LENS_SPIRIT_MQ) || logic->CanUse(RG_LENS_OF_TRUTH));}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST,           {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 5);}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST,          {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->CanUse(RG_SONG_OF_TIME);}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST,              {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->CanUse(RG_SONG_OF_TIME) && (logic->MirrorShield || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS)));}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST,   {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 7);}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH,  {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 7);}}),
+                  LOCATION(RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST,     logic->SmallKeys(RR_SPIRIT_TEMPLE, 7)),
+                  LOCATION(RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST,   logic->CanUse(RG_ZELDAS_LULLABY) && (logic->CanJumpslash || logic->CanUse(RG_HOVER_BOOTS))),
+                  LOCATION(RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST, (randoCtx->GetTrickOption(RT_LENS_SPIRIT_MQ) || logic->CanUse(RG_LENS_OF_TRUTH))),
+                  LOCATION(RC_SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST,           logic->SmallKeys(RR_SPIRIT_TEMPLE, 5)),
+                  LOCATION(RC_SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST,          logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->CanUse(RG_SONG_OF_TIME)),
+                  LOCATION(RC_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST,              logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->CanUse(RG_SONG_OF_TIME) && (logic->MirrorShield || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS)))),
+                  LOCATION(RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST,   logic->SmallKeys(RR_SPIRIT_TEMPLE, 7)),
+                  LOCATION(RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH,  logic->SmallKeys(RR_SPIRIT_TEMPLE, 7)),
   }, {
                   //Exits
                   Entrance(RR_SPIRIT_TEMPLE_MQ_LOWER_ADULT,        {[]{return logic->MirrorShield && logic->IsAdult && (logic->CanUse(RG_FIRE_ARROWS) || (randoCtx->GetTrickOption(RT_SPIRIT_MQ_LOWER_ADULT) && logic->CanUse(RG_DINS_FIRE) && logic->Bow));}}),
@@ -190,11 +190,11 @@ void AreaTable_Init_SpiritTemple() {
 
   areaTable[RR_SPIRIT_TEMPLE_MQ_SHARED] = Area("Spirit Temple MQ Shared", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST, {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 6);}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_COMPASS_CHEST,           {[]{return (logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT) && logic->SmallKeys(RR_SPIRIT_TEMPLE, 7)) || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW)) || (logic->Bow && logic->Slingshot);}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST,    {[]{return logic->CanUse(RG_SONG_OF_TIME) || randoCtx->GetTrickOption(RT_SPIRIT_MQ_SUN_BLOCK_SOT) || logic->IsAdult;}}),
+                  LOCATION(RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST, logic->SmallKeys(RR_SPIRIT_TEMPLE, 6)),
+                  LOCATION(RC_SPIRIT_TEMPLE_MQ_COMPASS_CHEST,           (logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT) && logic->SmallKeys(RR_SPIRIT_TEMPLE, 7)) || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW)) || (logic->Bow && logic->Slingshot)),
+                  LOCATION(RC_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST,    logic->CanUse(RG_SONG_OF_TIME) || randoCtx->GetTrickOption(RT_SPIRIT_MQ_SUN_BLOCK_SOT) || logic->IsAdult),
                     //Trick: logic->CanUse(RG_SONG_OF_TIME) || LogicSpiritMQSunBlockSoT || logic->IsAdult
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM,       {[]{return (randoCtx->GetTrickOption(RT_SPIRIT_MQ_SUN_BLOCK_GS) && logic->Boomerang && (logic->CanUse(RG_SONG_OF_TIME) || randoCtx->GetTrickOption(RT_SPIRIT_MQ_SUN_BLOCK_SOT))) || logic->IsAdult;}}),
+                  LOCATION(RC_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM,       (randoCtx->GetTrickOption(RT_SPIRIT_MQ_SUN_BLOCK_GS) && logic->Boomerang && (logic->CanUse(RG_SONG_OF_TIME) || randoCtx->GetTrickOption(RT_SPIRIT_MQ_SUN_BLOCK_SOT))) || logic->IsAdult),
                     //Trick: (LogicSpiritMQSunBlockGS && logic->Boomerang && (logic->CanUse(RG_SONG_OF_TIME) || LogicSpiritMQSunBlockSoT)) || logic->IsAdult
    }, {
                   //Exits
@@ -206,16 +206,16 @@ void AreaTable_Init_SpiritTemple() {
 
   areaTable[RR_SPIRIT_TEMPLE_MQ_LOWER_ADULT] = Area("Spirit Temple MQ Lower Adult", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST,          {[]{return true;}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST,        {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && logic->Hammer && logic->Ocarina && logic->SongOfTime && logic->EponasSong && logic->SunsSong && logic->SongOfStorms && logic->ZeldasLullaby;}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST, {[]{return logic->Hammer;}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM,             {[]{return true;}}),
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM,           {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && logic->Hammer && logic->Ocarina && logic->SongOfTime && logic->EponasSong && logic->SunsSong && logic->SongOfStorms && logic->ZeldasLullaby;}}),
+                  LOCATION(RC_SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST,          true),
+                  LOCATION(RC_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST,        logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && logic->Hammer && logic->Ocarina && logic->SongOfTime && logic->EponasSong && logic->SunsSong && logic->SongOfStorms && logic->ZeldasLullaby),
+                  LOCATION(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST, logic->Hammer),
+                  LOCATION(RC_SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM,             true),
+                  LOCATION(RC_SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM,           logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && logic->Hammer && logic->Ocarina && logic->SongOfTime && logic->EponasSong && logic->SunsSong && logic->SongOfStorms && logic->ZeldasLullaby),
   }, {});
 
   areaTable[RR_SPIRIT_TEMPLE_MQ_BOSS_AREA] = Area("Spirit Temple MQ Boss Area", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST, {[]{return randoCtx->GetTrickOption(RT_LENS_SPIRIT_MQ) || logic->CanUse(RG_LENS_OF_TRUTH);}}),
+                  LOCATION(RC_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST, randoCtx->GetTrickOption(RT_LENS_SPIRIT_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)),
   }, {
                   //Exits
                   Entrance(RR_SPIRIT_TEMPLE_MQ_INSIDE_STATUE_HEAD, {[]{return logic->MirrorShield && logic->Hookshot;}}),
@@ -231,12 +231,12 @@ void AreaTable_Init_SpiritTemple() {
 
   areaTable[RR_SPIRIT_TEMPLE_MQ_MIRROR_SHIELD_HAND] = Area("Spirit Temple MQ Mirror Shield Hand", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST, {[]{return true;}}),
+                  LOCATION(RC_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST, true),
   }, {});
 
   areaTable[RR_SPIRIT_TEMPLE_MQ_SILVER_GAUNTLETS_HAND] = Area("Spirit Temple MQ Silver Gauntlets Hand", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST, {[]{return true;}}),
+                  LOCATION(RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST, true),
   }, {});
   }
 
@@ -263,8 +263,8 @@ void AreaTable_Init_SpiritTemple() {
         },
         {
             // Locations
-            LocationAccess(RC_SPIRIT_TEMPLE_TWINROVA_HEART, { [] { return logic->SpiritTempleClear; } }),
-            LocationAccess(RC_TWINROVA, { [] { return logic->SpiritTempleClear; } }),
+            LOCATION(RC_SPIRIT_TEMPLE_TWINROVA_HEART, logic->SpiritTempleClear),
+            LOCATION(RC_TWINROVA, logic->SpiritTempleClear),
         },
         {
             // Exits
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp
index e9a0b8678..2534ebef3 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp
@@ -50,7 +50,7 @@ void AreaTable_Init_WaterTemple() {
 
   areaTable[RR_WATER_TEMPLE_MAP_ROOM] = Area("Water Temple Map Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_WATER_TEMPLE_MAP_CHEST, {[]{return (logic->MagicMeter && logic->CanUse(RG_KOKIRI_SWORD)) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_HOOKSHOT);}}),
+                  LOCATION(RC_WATER_TEMPLE_MAP_CHEST, (logic->MagicMeter && logic->CanUse(RG_KOKIRI_SWORD)) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_HOOKSHOT)),
                 }, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_EAST_LOWER, {[]{return (logic->MagicMeter && logic->CanUse(RG_KOKIRI_SWORD)) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_HOOKSHOT);}}),
@@ -58,7 +58,7 @@ void AreaTable_Init_WaterTemple() {
 
   areaTable[RR_WATER_TEMPLE_CRACKED_WALL] = Area("Water Temple Cracked Wall", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_WATER_TEMPLE_CRACKED_WALL_CHEST, {[]{return logic->HasExplosives;}}),
+                  LOCATION(RC_WATER_TEMPLE_CRACKED_WALL_CHEST, logic->HasExplosives),
                 }, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_EAST_LOWER, {[]{return true;}}),
@@ -66,7 +66,7 @@ void AreaTable_Init_WaterTemple() {
 
   areaTable[RR_WATER_TEMPLE_TORCH_ROOM] = Area("Water Temple Torch Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_WATER_TEMPLE_TORCHES_CHEST, {[]{return (logic->MagicMeter && logic->CanUse(RG_KOKIRI_SWORD)) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_HOOKSHOT);}}),
+                  LOCATION(RC_WATER_TEMPLE_TORCHES_CHEST, (logic->MagicMeter && logic->CanUse(RG_KOKIRI_SWORD)) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_HOOKSHOT)),
                 }, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_EAST_LOWER, {[]{return (logic->MagicMeter && logic->CanUse(RG_KOKIRI_SWORD)) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_HOOKSHOT);}}),
@@ -80,7 +80,7 @@ void AreaTable_Init_WaterTemple() {
 
   areaTable[RR_WATER_TEMPLE_BOULDERS_LOWER] = Area("Water Temple Boulders Lower", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST, {[]{return logic->CanUse(RG_LONGSHOT) || Here(RR_WATER_TEMPLE_BOULDERS_UPPER, []{return (logic->IsAdult && logic->HookshotOrBoomerang) || (logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_HOOKSHOT));});}}),
+                  LOCATION(RC_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST, logic->CanUse(RG_LONGSHOT) || Here(RR_WATER_TEMPLE_BOULDERS_UPPER, []{return (logic->IsAdult && logic->HookshotOrBoomerang) || (logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_HOOKSHOT));})),
                 }, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_NORTH_LOWER,    {[]{return logic->SmallKeys(RR_WATER_TEMPLE, 4);}}),
@@ -112,7 +112,7 @@ void AreaTable_Init_WaterTemple() {
                   EventAccess(&logic->FairyPot, {[]{return true;}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_WATER_TEMPLE_BOSS_KEY_CHEST, {[]{return true;}}),
+                  LOCATION(RC_WATER_TEMPLE_BOSS_KEY_CHEST, true),
                 }, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_BOULDERS_UPPER, {[]{return (logic->CanUse(RG_IRON_BOOTS) || (logic->IsAdult && randoCtx->GetTrickOption(RT_WATER_BK_JUMP_DIVE)) || logic->IsChild || logic->CanDive) && logic->SmallKeys(RR_WATER_TEMPLE, 5);}}),
@@ -120,7 +120,7 @@ void AreaTable_Init_WaterTemple() {
 
   areaTable[RR_WATER_TEMPLE_SOUTH_LOWER] = Area("Water Temple South Lower", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_WATER_TEMPLE_GS_BEHIND_GATE, {[]{return (logic->CanJumpslash || logic->CanUse(RG_MEGATON_HAMMER)) && (logic->CanUse(RG_HOOKSHOT) || (logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS)));}}),
+                  LOCATION(RC_WATER_TEMPLE_GS_BEHIND_GATE, (logic->CanJumpslash || logic->CanUse(RG_MEGATON_HAMMER)) && (logic->CanUse(RG_HOOKSHOT) || (logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS)))),
                 }, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_LOBBY, {[]{return logic->CanUse(RG_IRON_BOOTS);}}),
@@ -134,8 +134,8 @@ void AreaTable_Init_WaterTemple() {
 
   areaTable[RR_WATER_TEMPLE_DRAGON_ROOM] = Area("Water Temple Dragon Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_WATER_TEMPLE_DRAGON_CHEST, {[]{return (logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_IRON_BOOTS)) || (((logic->IsAdult && randoCtx->GetTrickOption(RT_WATER_ADULT_DRAGON) && (logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->HasBombchus)) || (logic->IsChild && randoCtx->GetTrickOption(RT_WATER_CHILD_DRAGON) && (logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG) || logic->HasBombchus))) && (logic->CanDive || logic->CanUse(RG_IRON_BOOTS))) ||
-                                                                       Here(RR_WATER_TEMPLE_RIVER, []{return logic->IsAdult && logic->CanUse(RG_FAIRY_BOW) && ((randoCtx->GetTrickOption(RT_WATER_ADULT_DRAGON) && (logic->CanDive || logic->CanUse(RG_IRON_BOOTS))) || randoCtx->GetTrickOption(RT_WATER_DRAGON_JUMP_DIVE));});}}),
+                  LOCATION(RC_WATER_TEMPLE_DRAGON_CHEST, (logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_IRON_BOOTS)) || (((logic->IsAdult && randoCtx->GetTrickOption(RT_WATER_ADULT_DRAGON) && (logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->HasBombchus)) || (logic->IsChild && randoCtx->GetTrickOption(RT_WATER_CHILD_DRAGON) && (logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG) || logic->HasBombchus))) && (logic->CanDive || logic->CanUse(RG_IRON_BOOTS))) ||
+                                                                       Here(RR_WATER_TEMPLE_RIVER, []{return logic->IsAdult && logic->CanUse(RG_FAIRY_BOW) && ((randoCtx->GetTrickOption(RT_WATER_ADULT_DRAGON) && (logic->CanDive || logic->CanUse(RG_IRON_BOOTS))) || randoCtx->GetTrickOption(RT_WATER_DRAGON_JUMP_DIVE));})),
                 }, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_WEST_LOWER, {[]{return true;}}),
@@ -153,7 +153,7 @@ void AreaTable_Init_WaterTemple() {
                   EventAccess(&logic->WaterTempleMiddle, {[]{return logic->WaterTempleMiddle || logic->CanUse(RG_ZELDAS_LULLABY);}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_WATER_TEMPLE_GS_CENTRAL_PILLAR, {[]{return logic->CanUse(RG_LONGSHOT) || (((randoCtx->GetTrickOption(RT_WATER_FW_CENTRAL_GS) && logic->CanUse(RG_FARORES_WIND) && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_DINS_FIRE) || logic->SmallKeys(RR_WATER_TEMPLE, 5))) || (randoCtx->GetTrickOption(RT_WATER_IRONS_CENTRAL_GS) && logic->CanUse(RG_IRON_BOOTS) && ((logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_FAIRY_BOW)) || (logic->CanUse(RG_DINS_FIRE))))) && logic->WaterTempleHigh && logic->HookshotOrBoomerang);}}),
+                  LOCATION(RC_WATER_TEMPLE_GS_CENTRAL_PILLAR, logic->CanUse(RG_LONGSHOT) || (((randoCtx->GetTrickOption(RT_WATER_FW_CENTRAL_GS) && logic->CanUse(RG_FARORES_WIND) && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_DINS_FIRE) || logic->SmallKeys(RR_WATER_TEMPLE, 5))) || (randoCtx->GetTrickOption(RT_WATER_IRONS_CENTRAL_GS) && logic->CanUse(RG_IRON_BOOTS) && ((logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_FAIRY_BOW)) || (logic->CanUse(RG_DINS_FIRE))))) && logic->WaterTempleHigh && logic->HookshotOrBoomerang)),
                 }, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_LOBBY,                {[]{return true;}}),
@@ -162,7 +162,7 @@ void AreaTable_Init_WaterTemple() {
 
   areaTable[RR_WATER_TEMPLE_CENTRAL_PILLAR_BASEMENT] = Area("Water Temple Central Pillar Basement", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_WATER_TEMPLE_CENTRAL_PILLAR_CHEST, {[]{return logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer >= 40;}}),
+                  LOCATION(RC_WATER_TEMPLE_CENTRAL_PILLAR_CHEST, logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer >= 40),
                 }, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_CENTRAL_PILLAR_LOWER, {[]{return logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer >= 16;}}),
@@ -170,7 +170,7 @@ void AreaTable_Init_WaterTemple() {
 
   areaTable[RR_WATER_TEMPLE_EAST_MIDDLE] = Area("Water Temple East Middle", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_WATER_TEMPLE_COMPASS_CHEST, {[]{return logic->CanUseProjectile;}}),
+                  LOCATION(RC_WATER_TEMPLE_COMPASS_CHEST, logic->CanUseProjectile),
                 }, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_LOBBY, {[]{return logic->CanUse(RG_IRON_BOOTS);}}),
@@ -192,7 +192,7 @@ void AreaTable_Init_WaterTemple() {
 
   areaTable[RR_WATER_TEMPLE_BLOCK_CORRIDOR] = Area("Water Temple Block Corridor", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST, {[]{return logic->GoronBracelet && (logic->WaterTempleLow || logic->WaterTempleMiddle);}}),
+                  LOCATION(RC_WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST, logic->GoronBracelet && (logic->WaterTempleLow || logic->WaterTempleMiddle)),
                 }, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_LOBBY, {[]{return logic->CanUse(RG_HOOKSHOT);}}),
@@ -200,7 +200,7 @@ void AreaTable_Init_WaterTemple() {
 
   areaTable[RR_WATER_TEMPLE_FALLING_PLATFORM_ROOM] = Area("Water Temple Falling Platform Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM, {[]{return logic->CanUse(RG_LONGSHOT) || (randoCtx->GetTrickOption(RT_WATER_RANG_FALLING_PLATFORM_GS) && logic->IsChild && logic->CanUse(RG_BOOMERANG)) || (randoCtx->GetTrickOption(RT_WATER_HOOKSHOT_FALLING_PLATFORM_GS) && logic->IsAdult && logic->CanUse(RG_HOOKSHOT));}}),
+                  LOCATION(RC_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM, logic->CanUse(RG_LONGSHOT) || (randoCtx->GetTrickOption(RT_WATER_RANG_FALLING_PLATFORM_GS) && logic->IsChild && logic->CanUse(RG_BOOMERANG)) || (randoCtx->GetTrickOption(RT_WATER_HOOKSHOT_FALLING_PLATFORM_GS) && logic->IsAdult && logic->CanUse(RG_HOOKSHOT))),
                 }, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_LOBBY,               {[]{return logic->CanUse(RG_HOOKSHOT) && logic->SmallKeys(RR_WATER_TEMPLE, 4);}}),
@@ -221,7 +221,7 @@ void AreaTable_Init_WaterTemple() {
 
   areaTable[RR_WATER_TEMPLE_LONGSHOT_ROOM] = Area("Water Temple Longshot Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_WATER_TEMPLE_LONGSHOT_CHEST, {[]{return true;}}),
+                  LOCATION(RC_WATER_TEMPLE_LONGSHOT_CHEST, true),
                 }, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_DARK_LINK_ROOM, {[]{return true;}}),
@@ -230,8 +230,8 @@ void AreaTable_Init_WaterTemple() {
 
   areaTable[RR_WATER_TEMPLE_RIVER] = Area("Water Temple River", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_WATER_TEMPLE_RIVER_CHEST, {[]{return (logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW)) && (logic->IsAdult || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT));}}),
-                  LocationAccess(RC_WATER_TEMPLE_GS_RIVER,    {[]{return (logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_HOOKSHOT)) || (randoCtx->GetTrickOption(RT_WATER_RIVER_GS) && logic->CanUse(RG_LONGSHOT));}}),
+                  LOCATION(RC_WATER_TEMPLE_RIVER_CHEST, (logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW)) && (logic->IsAdult || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT))),
+                  LOCATION(RC_WATER_TEMPLE_GS_RIVER,    (logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_HOOKSHOT)) || (randoCtx->GetTrickOption(RT_WATER_RIVER_GS) && logic->CanUse(RG_LONGSHOT))),
                 }, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_DRAGON_ROOM, {[]{return (logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW)) && (logic->IsAdult || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT));}}),
@@ -261,8 +261,8 @@ void AreaTable_Init_WaterTemple() {
 
   areaTable[RR_WATER_TEMPLE_MQ_DIVE] = Area("Water Temple MQ Dive", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_WATER_TEMPLE_MQ_MAP_CHEST,            {[]{return logic->HasFireSource && logic->IsAdult && logic->CanUse(RG_HOOKSHOT);}}),
-                  LocationAccess(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST, {[]{return logic->IsAdult && logic->CanUse(RG_ZORA_TUNIC) && logic->CanUse(RG_HOOKSHOT) && ((randoCtx->GetTrickOption(RT_WATER_MQ_CENTRAL_PILLAR) && logic->CanUse(RG_FIRE_ARROWS)) || (logic->CanUse(RG_DINS_FIRE) && logic->CanUse(RG_SONG_OF_TIME)));}}),
+                  LOCATION(RC_WATER_TEMPLE_MQ_MAP_CHEST,            logic->HasFireSource && logic->IsAdult && logic->CanUse(RG_HOOKSHOT)),
+                  LOCATION(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST, logic->IsAdult && logic->CanUse(RG_ZORA_TUNIC) && logic->CanUse(RG_HOOKSHOT) && ((randoCtx->GetTrickOption(RT_WATER_MQ_CENTRAL_PILLAR) && logic->CanUse(RG_FIRE_ARROWS)) || (logic->CanUse(RG_DINS_FIRE) && logic->CanUse(RG_SONG_OF_TIME)))),
                     //Trick: logic->IsAdult && logic->CanUse(RG_ZORA_TUNIC) && logic->CanUse(RG_HOOKSHOT) && ((LogicWaterMQCentralPillar && logic->CanUse(RG_FIRE_ARROWS)) || (logic->CanUse(RG_DINS_FIRE) && logic->CanUse(RG_SONG_OF_TIME)))
   }, {
                   //Exits
@@ -271,11 +271,11 @@ void AreaTable_Init_WaterTemple() {
 
   areaTable[RR_WATER_TEMPLE_MQ_LOWERED_WATER_LEVELS] = Area("Water Temple MQ Lowered Water Levels", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_WATER_TEMPLE_MQ_COMPASS_CHEST,                {[]{return ((logic->IsAdult && logic->CanUse(RG_FAIRY_BOW)) || logic->CanUse(RG_DINS_FIRE) || Here(RR_WATER_TEMPLE_MQ_LOBBY, []{return logic->IsChild && logic->CanUse(RG_STICKS) && logic->HasExplosives;})) &&
-                    (logic->CanJumpslash || logic->CanUseProjectile);}}),
-                  LocationAccess(RC_WATER_TEMPLE_MQ_LONGSHOT_CHEST,               {[]{return logic->IsAdult && logic->CanUse(RG_HOOKSHOT);}}),
-                  LocationAccess(RC_WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY,          {[]{return logic->CanUse(RG_DINS_FIRE);}}),
-                  LocationAccess(RC_WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH, {[]{return logic->IsAdult && logic->CanUse(RG_LONGSHOT);}}),
+                  LOCATION(RC_WATER_TEMPLE_MQ_COMPASS_CHEST,                ((logic->IsAdult && logic->CanUse(RG_FAIRY_BOW)) || logic->CanUse(RG_DINS_FIRE) || Here(RR_WATER_TEMPLE_MQ_LOBBY, []{return logic->IsChild && logic->CanUse(RG_STICKS) && logic->HasExplosives;})) &&
+                    (logic->CanJumpslash || logic->CanUseProjectile)),
+                  LOCATION(RC_WATER_TEMPLE_MQ_LONGSHOT_CHEST,               logic->IsAdult && logic->CanUse(RG_HOOKSHOT)),
+                  LOCATION(RC_WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY,          logic->CanUse(RG_DINS_FIRE)),
+                  LOCATION(RC_WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH, logic->IsAdult && logic->CanUse(RG_LONGSHOT)),
   }, {});
 
   areaTable[RR_WATER_TEMPLE_MQ_DARK_LINK_REGION] = Area("Water Temple MQ Dark Link Region", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
@@ -284,8 +284,8 @@ void AreaTable_Init_WaterTemple() {
                   EventAccess(&logic->NutPot,   {[]{return true;}}),
   }, {
                   //Locations
-                  LocationAccess(RC_WATER_TEMPLE_MQ_BOSS_KEY_CHEST, {[]{return logic->IsAdult && logic->WaterTimer >= 24 && logic->CanUse(RG_DINS_FIRE) && (randoCtx->GetTrickOption(RT_WATER_DRAGON_JUMP_DIVE) || logic->CanDive || logic->CanUse(RG_IRON_BOOTS));}}),
-                  LocationAccess(RC_WATER_TEMPLE_MQ_GS_RIVER,       {[]{return true;}}),
+                  LOCATION(RC_WATER_TEMPLE_MQ_BOSS_KEY_CHEST, logic->IsAdult && logic->WaterTimer >= 24 && logic->CanUse(RG_DINS_FIRE) && (randoCtx->GetTrickOption(RT_WATER_DRAGON_JUMP_DIVE) || logic->CanDive || logic->CanUse(RG_IRON_BOOTS))),
+                  LOCATION(RC_WATER_TEMPLE_MQ_GS_RIVER,       true),
   }, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_MQ_BASEMENT_GATED_AREAS, {[]{return logic->IsAdult && logic->WaterTimer >= 24 && logic->CanUse(RG_DINS_FIRE) && logic->CanUse(RG_IRON_BOOTS);}}),
@@ -293,9 +293,9 @@ void AreaTable_Init_WaterTemple() {
 
   areaTable[RR_WATER_TEMPLE_MQ_BASEMENT_GATED_AREAS] = Area("Water Temple MQ Basement Gated Areas", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_WATER_TEMPLE_MQ_FREESTANDING_KEY,         {[]{return logic->HoverBoots || logic->CanUse(RG_SCARECROW) || randoCtx->GetTrickOption(RT_WATER_NORTH_BASEMENT_LEDGE_JUMP);}}),
-                  LocationAccess(RC_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH,     {[]{return logic->CanUse(RG_FIRE_ARROWS) && (logic->HoverBoots || logic->CanUse(RG_SCARECROW));}}),
-                  LocationAccess(RC_WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA, {[]{return randoCtx->GetTrickOption(RT_WATER_MQ_LOCKED_GS) || (logic->SmallKeys(RR_WATER_TEMPLE, 2) && (logic->HoverBoots || logic->CanUse(RG_SCARECROW) || randoCtx->GetTrickOption(RT_WATER_NORTH_BASEMENT_LEDGE_JUMP)) && logic->CanJumpslash);}}),
+                  LOCATION(RC_WATER_TEMPLE_MQ_FREESTANDING_KEY,         logic->HoverBoots || logic->CanUse(RG_SCARECROW) || randoCtx->GetTrickOption(RT_WATER_NORTH_BASEMENT_LEDGE_JUMP)),
+                  LOCATION(RC_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH,     logic->CanUse(RG_FIRE_ARROWS) && (logic->HoverBoots || logic->CanUse(RG_SCARECROW))),
+                  LOCATION(RC_WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA, randoCtx->GetTrickOption(RT_WATER_MQ_LOCKED_GS) || (logic->SmallKeys(RR_WATER_TEMPLE, 2) && (logic->HoverBoots || logic->CanUse(RG_SCARECROW) || randoCtx->GetTrickOption(RT_WATER_NORTH_BASEMENT_LEDGE_JUMP)) && logic->CanJumpslash)),
                     //Trick: LogicWaterMQLockedGS || (logic->SmallKeys(RR_WATER_TEMPLE, 2) && (logic->HoverBoots || logic->CanUse(RG_SCARECROW) || LogicWaterNorthBasementLedgeJump))
   }, {});
   }
@@ -323,8 +323,8 @@ void AreaTable_Init_WaterTemple() {
         },
         {
             // Locations
-            LocationAccess(RC_WATER_TEMPLE_MORPHA_HEART, { [] { return logic->WaterTempleClear; } }),
-            LocationAccess(RC_MORPHA, { [] { return logic->WaterTempleClear; } }),
+            LOCATION(RC_WATER_TEMPLE_MORPHA_HEART, logic->WaterTempleClear),
+            LOCATION(RC_MORPHA, logic->WaterTempleClear),
         },
         {
             // Exits
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
index dddad29a1..2344c13a8 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
@@ -6,7 +6,7 @@ using namespace Rando;
 void AreaTable_Init_ZorasDomain() {
   areaTable[RR_ZR_FRONT] = Area("ZR Front", "Zora River", RA_ZORAS_RIVER, DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_ZR_GS_TREE, {[]{return logic->IsChild && logic->CanChildAttack;}}),
+                  LOCATION(RC_ZR_GS_TREE, logic->IsChild && logic->CanChildAttack),
                 }, {
                   //Exits
                   Entrance(RR_ZORAS_RIVER,  {[]{return logic->IsAdult || logic->CanBlastOrSmash;}}),
@@ -21,21 +21,21 @@ void AreaTable_Init_ZorasDomain() {
                   EventAccess(&logic->BugShrub,         {[]{return logic->BugShrub         || logic->CanCutShrubs;}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_ZR_MAGIC_BEAN_SALESMAN,               {[]{return logic->ChildsWallet && logic->IsChild;}}),
-                  LocationAccess(RC_ZR_FROGS_OCARINA_GAME,                {[]{return logic->IsChild && logic->CanUse(RG_ZELDAS_LULLABY) && logic->CanUse(RG_SARIAS_SONG) && logic->CanUse(RG_SUNS_SONG) && logic->CanUse(RG_EPONAS_SONG) && logic->CanUse(RG_SONG_OF_TIME) && logic->CanUse(RG_SONG_OF_STORMS);}}),
-                  LocationAccess(RC_ZR_FROGS_IN_THE_RAIN,                 {[]{return logic->IsChild && logic->CanUse(RG_SONG_OF_STORMS);}}),
-                  LocationAccess(RC_ZR_FROGS_ZELDAS_LULLABY,              {[]{return logic->IsChild && logic->CanUse(RG_ZELDAS_LULLABY);}}),
-                  LocationAccess(RC_ZR_FROGS_EPONAS_SONG,                 {[]{return logic->IsChild && logic->CanUse(RG_EPONAS_SONG);}}),
-                  LocationAccess(RC_ZR_FROGS_SARIAS_SONG,                 {[]{return logic->IsChild && logic->CanUse(RG_SARIAS_SONG);}}),
-                  LocationAccess(RC_ZR_FROGS_SUNS_SONG,                   {[]{return logic->IsChild && logic->CanUse(RG_SUNS_SONG);}}),
-                  LocationAccess(RC_ZR_FROGS_SONG_OF_TIME,                {[]{return logic->IsChild && logic->CanUse(RG_SONG_OF_TIME);}}),
-                  LocationAccess(RC_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH, {[]{return logic->IsChild || logic->CanUse(RG_HOVER_BOOTS) || (logic->IsAdult && randoCtx->GetTrickOption(RT_ZR_LOWER));}}),
-                  LocationAccess(RC_ZR_NEAR_DOMAIN_FREESTANDING_POH,      {[]{return logic->IsChild || logic->CanUse(RG_HOVER_BOOTS) || (logic->IsAdult && randoCtx->GetTrickOption(RT_ZR_UPPER));}}),
-                  LocationAccess(RC_ZR_GS_LADDER,                         {[]{return logic->IsChild && logic->AtNight && logic->CanChildAttack && logic->CanGetNightTimeGS;}}),
-                  LocationAccess(RC_ZR_GS_NEAR_RAISED_GROTTOS,            {[]{return logic->IsAdult && logic->HookshotOrBoomerang && logic->AtNight && logic->CanGetNightTimeGS;}}),
-                  LocationAccess(RC_ZR_GS_ABOVE_BRIDGE,                   {[]{return logic->IsAdult && logic->CanUse(RG_HOOKSHOT) && logic->AtNight && logic->CanGetNightTimeGS;}}),
-                  LocationAccess(RC_ZR_NEAR_GROTTOS_GOSSIP_STONE,         {[]{return true;}}),
-                  LocationAccess(RC_ZR_NEAR_DOMAIN_GOSSIP_STONE,          {[]{return true;}}),
+                  LOCATION(RC_ZR_MAGIC_BEAN_SALESMAN,               logic->ChildsWallet && logic->IsChild),
+                  LOCATION(RC_ZR_FROGS_OCARINA_GAME,                logic->IsChild && logic->CanUse(RG_ZELDAS_LULLABY) && logic->CanUse(RG_SARIAS_SONG) && logic->CanUse(RG_SUNS_SONG) && logic->CanUse(RG_EPONAS_SONG) && logic->CanUse(RG_SONG_OF_TIME) && logic->CanUse(RG_SONG_OF_STORMS)),
+                  LOCATION(RC_ZR_FROGS_IN_THE_RAIN,                 logic->IsChild && logic->CanUse(RG_SONG_OF_STORMS)),
+                  LOCATION(RC_ZR_FROGS_ZELDAS_LULLABY,              logic->IsChild && logic->CanUse(RG_ZELDAS_LULLABY)),
+                  LOCATION(RC_ZR_FROGS_EPONAS_SONG,                 logic->IsChild && logic->CanUse(RG_EPONAS_SONG)),
+                  LOCATION(RC_ZR_FROGS_SARIAS_SONG,                 logic->IsChild && logic->CanUse(RG_SARIAS_SONG)),
+                  LOCATION(RC_ZR_FROGS_SUNS_SONG,                   logic->IsChild && logic->CanUse(RG_SUNS_SONG)),
+                  LOCATION(RC_ZR_FROGS_SONG_OF_TIME,                logic->IsChild && logic->CanUse(RG_SONG_OF_TIME)),
+                  LOCATION(RC_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH, logic->IsChild || logic->CanUse(RG_HOVER_BOOTS) || (logic->IsAdult && randoCtx->GetTrickOption(RT_ZR_LOWER))),
+                  LOCATION(RC_ZR_NEAR_DOMAIN_FREESTANDING_POH,      logic->IsChild || logic->CanUse(RG_HOVER_BOOTS) || (logic->IsAdult && randoCtx->GetTrickOption(RT_ZR_UPPER))),
+                  LOCATION(RC_ZR_GS_LADDER,                         logic->IsChild && logic->AtNight && logic->CanChildAttack && logic->CanGetNightTimeGS),
+                  LOCATION(RC_ZR_GS_NEAR_RAISED_GROTTOS,            logic->IsAdult && logic->HookshotOrBoomerang && logic->AtNight && logic->CanGetNightTimeGS),
+                  LOCATION(RC_ZR_GS_ABOVE_BRIDGE,                   logic->IsAdult && logic->CanUse(RG_HOOKSHOT) && logic->AtNight && logic->CanGetNightTimeGS),
+                  LOCATION(RC_ZR_NEAR_GROTTOS_GOSSIP_STONE,         true),
+                  LOCATION(RC_ZR_NEAR_DOMAIN_GOSSIP_STONE,          true),
                 }, {
                   //Exits
                   Entrance(RR_ZR_FRONT,            {[]{return true;}}),
@@ -54,11 +54,11 @@ void AreaTable_Init_ZorasDomain() {
 
   areaTable[RR_ZR_OPEN_GROTTO] = Area("ZR Open Grotto", "ZR Open Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
-                  LocationAccess(RC_ZR_OPEN_GROTTO_CHEST,         {[]{return true;}}),
-                  LocationAccess(RC_ZR_OPEN_GROTTO_FISH,          {[]{return logic->HasBottle;}}),
-                  LocationAccess(RC_ZR_OPEN_GROTTO_GOSSIP_STONE,  {[]{return true;}}),
-                  LocationAccess(RC_ZR_OPEN_GROTTO_BEEHIVE_LEFT,  {[]{return logic->CanBreakLowerBeehives;}}),
-                  LocationAccess(RC_ZR_OPEN_GROTTO_BEEHIVE_RIGHT, {[]{return logic->CanBreakLowerBeehives;}}),
+                  LOCATION(RC_ZR_OPEN_GROTTO_CHEST,         true),
+                  LOCATION(RC_ZR_OPEN_GROTTO_FISH,          logic->HasBottle),
+                  LOCATION(RC_ZR_OPEN_GROTTO_GOSSIP_STONE,  true),
+                  LOCATION(RC_ZR_OPEN_GROTTO_BEEHIVE_LEFT,  logic->CanBreakLowerBeehives),
+                  LOCATION(RC_ZR_OPEN_GROTTO_BEEHIVE_RIGHT, logic->CanBreakLowerBeehives),
                 }, {
                   //Exits
                   Entrance(RR_ZORAS_RIVER, {[]{return true;}}),
@@ -74,9 +74,9 @@ void AreaTable_Init_ZorasDomain() {
 
   areaTable[RR_ZR_STORMS_GROTTO] = Area("ZR Storms Grotto", "ZR Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_ZR_DEKU_SCRUB_GROTTO_REAR,  {[]{return logic->CanStunDeku;}}),
-                  LocationAccess(RC_ZR_DEKU_SCRUB_GROTTO_FRONT, {[]{return logic->CanStunDeku;}}),
-                  LocationAccess(RC_ZR_STORMS_GROTTO_BEEHIVE,   {[]{return logic->CanBreakUpperBeehives;}}),
+                  LOCATION(RC_ZR_DEKU_SCRUB_GROTTO_REAR,  logic->CanStunDeku),
+                  LOCATION(RC_ZR_DEKU_SCRUB_GROTTO_FRONT, logic->CanStunDeku),
+                  LOCATION(RC_ZR_STORMS_GROTTO_BEEHIVE,   logic->CanBreakUpperBeehives),
                 }, {
                   //Exits
                   Entrance(RR_ZORAS_RIVER, {[]{return true;}}),
@@ -93,19 +93,19 @@ void AreaTable_Init_ZorasDomain() {
                   EventAccess(&logic->DeliverLetter,     {[]{return logic->DeliverLetter     || (logic->RutosLetter && logic->IsChild && randoCtx->GetOption(RSK_ZORAS_FOUNTAIN).IsNot(RO_ZF_OPEN));}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_ZD_DIVING_MINIGAME,                     {[]{return logic->Swim && logic->ChildsWallet && logic->IsChild;}}),
-                  LocationAccess(RC_ZD_CHEST,                               {[]{return logic->IsChild && logic->CanUse(RG_STICKS);}}),
-                  LocationAccess(RC_ZD_KING_ZORA_THAWED,                    {[]{return logic->KingZoraThawed;}}),
-                  LocationAccess(RC_ZD_TRADE_PRESCRIPTION,                  {[]{return logic->KingZoraThawed && logic->Prescription;}}),
-                  LocationAccess(RC_ZD_GS_FROZEN_WATERFALL,                 {[]{return logic->IsAdult && logic->AtNight && (logic->HookshotOrBoomerang || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->Bow || (logic->MagicMeter && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BIGGORON_SWORD))) || (randoCtx->GetTrickOption(RT_ZD_GS) && logic->CanJumpslash)) && logic->CanGetNightTimeGS;}}),
-                  LocationAccess(RC_ZD_FISH_1,                              {[]{return logic->IsChild && logic->HasBottle;}}),
-                  LocationAccess(RC_ZD_FISH_2,                              {[]{return logic->IsChild && logic->HasBottle;}}),
-                  LocationAccess(RC_ZD_FISH_3,                              {[]{return logic->IsChild && logic->HasBottle;}}),
-                  LocationAccess(RC_ZD_FISH_4,                              {[]{return logic->IsChild && logic->HasBottle;}}),
-                  LocationAccess(RC_ZD_FISH_5,                              {[]{return logic->IsChild && logic->HasBottle;}}),
-                  LocationAccess(RC_ZD_GOSSIP_STONE,                        {[]{return true;}}),
-                  LocationAccess(RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_LEFT,  {[]{return logic->CanBreakUpperBeehives;}}),
-                  LocationAccess(RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_RIGHT, {[]{return logic->CanBreakUpperBeehives;}}),
+                  LOCATION(RC_ZD_DIVING_MINIGAME,                     logic->Swim && logic->ChildsWallet && logic->IsChild),
+                  LOCATION(RC_ZD_CHEST,                               logic->IsChild && logic->CanUse(RG_STICKS)),
+                  LOCATION(RC_ZD_KING_ZORA_THAWED,                    logic->KingZoraThawed),
+                  LOCATION(RC_ZD_TRADE_PRESCRIPTION,                  logic->KingZoraThawed && logic->Prescription),
+                  LOCATION(RC_ZD_GS_FROZEN_WATERFALL,                 logic->IsAdult && logic->AtNight && (logic->HookshotOrBoomerang || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->Bow || (logic->MagicMeter && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BIGGORON_SWORD))) || (randoCtx->GetTrickOption(RT_ZD_GS) && logic->CanJumpslash)) && logic->CanGetNightTimeGS),
+                  LOCATION(RC_ZD_FISH_1,                              logic->IsChild && logic->HasBottle),
+                  LOCATION(RC_ZD_FISH_2,                              logic->IsChild && logic->HasBottle),
+                  LOCATION(RC_ZD_FISH_3,                              logic->IsChild && logic->HasBottle),
+                  LOCATION(RC_ZD_FISH_4,                              logic->IsChild && logic->HasBottle),
+                  LOCATION(RC_ZD_FISH_5,                              logic->IsChild && logic->HasBottle),
+                  LOCATION(RC_ZD_GOSSIP_STONE,                        true),
+                  LOCATION(RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_LEFT,  logic->CanBreakUpperBeehives),
+                  LOCATION(RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_RIGHT, logic->CanBreakUpperBeehives),
                 }, {
                   //Exits
                   Entrance(RR_ZR_BEHIND_WATERFALL, {[]{return true;}}),
@@ -117,7 +117,7 @@ void AreaTable_Init_ZorasDomain() {
 
   areaTable[RR_ZD_BEHIND_KING_ZORA] = Area("ZD Behind King Zora", "Zoras Domain", RA_ZORAS_DOMAIN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_ZD_BEHIND_KING_ZORA_BEEHIVE, {[]{return logic->CanBreakUpperBeehives;}}),
+                  LOCATION(RC_ZD_BEHIND_KING_ZORA_BEEHIVE, logic->CanBreakUpperBeehives),
                 }, {
                   //Exits
                   Entrance(RR_ZORAS_DOMAIN,   {[]{return logic->DeliverLetter || randoCtx->GetOption(RSK_ZORAS_FOUNTAIN).Is(RO_ZF_OPEN) || (randoCtx->GetOption(RSK_ZORAS_FOUNTAIN).Is(RO_ZF_CLOSED_CHILD) && logic->IsAdult);}}),
@@ -126,14 +126,14 @@ void AreaTable_Init_ZorasDomain() {
 
   areaTable[RR_ZD_SHOP] = Area("ZD Shop", "ZD Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_ZD_SHOP_ITEM_1, {[]{return true;}}),
-                  LocationAccess(RC_ZD_SHOP_ITEM_2, {[]{return true;}}),
-                  LocationAccess(RC_ZD_SHOP_ITEM_3, {[]{return true;}}),
-                  LocationAccess(RC_ZD_SHOP_ITEM_4, {[]{return true;}}),
-                  LocationAccess(RC_ZD_SHOP_ITEM_5, {[]{return true;}}),
-                  LocationAccess(RC_ZD_SHOP_ITEM_6, {[]{return true;}}),
-                  LocationAccess(RC_ZD_SHOP_ITEM_7, {[]{return true;}}),
-                  LocationAccess(RC_ZD_SHOP_ITEM_8, {[]{return true;}}),
+                  LOCATION(RC_ZD_SHOP_ITEM_1, true),
+                  LOCATION(RC_ZD_SHOP_ITEM_2, true),
+                  LOCATION(RC_ZD_SHOP_ITEM_3, true),
+                  LOCATION(RC_ZD_SHOP_ITEM_4, true),
+                  LOCATION(RC_ZD_SHOP_ITEM_5, true),
+                  LOCATION(RC_ZD_SHOP_ITEM_6, true),
+                  LOCATION(RC_ZD_SHOP_ITEM_7, true),
+                  LOCATION(RC_ZD_SHOP_ITEM_8, true),
                 }, {
                   //Exits
                   Entrance(RR_ZORAS_DOMAIN, {[]{return true;}}),
@@ -153,13 +153,13 @@ void AreaTable_Init_ZorasDomain() {
                   EventAccess(&logic->ButterflyFairy,   {[]{return logic->ButterflyFairy   || (logic->CanUse(RG_STICKS) && logic->AtDay);}}),
                 }, {
                   //Locations
-                  LocationAccess(RC_ZF_ICEBERC_FREESTANDING_POH, {[]{return logic->IsAdult;}}),
-                  LocationAccess(RC_ZF_BOTTOM_FREESTANDING_POH,  {[]{return logic->IsAdult && logic->IronBoots && logic->WaterTimer >= 24;}}),
-                  LocationAccess(RC_ZF_GS_TREE,                  {[]{return logic->IsChild;}}),
-                  LocationAccess(RC_ZF_GS_ABOVE_THE_LOG,         {[]{return logic->IsChild && logic->HookshotOrBoomerang && logic->AtNight && logic->CanGetNightTimeGS;}}),
-                  LocationAccess(RC_ZF_GS_HIDDEN_CAVE,           {[]{return logic->CanUse(RG_SILVER_GAUNTLETS) && logic->CanBlastOrSmash && logic->HookshotOrBoomerang && logic->IsAdult && logic->AtNight && logic->CanGetNightTimeGS;}}),
-                  LocationAccess(RC_ZF_FAIRY_GOSSIP_STONE,       {[]{return true;}}),
-                  LocationAccess(RC_ZF_JABU_GOSSIP_STONE,        {[]{return true;}}),
+                  LOCATION(RC_ZF_ICEBERC_FREESTANDING_POH, logic->IsAdult),
+                  LOCATION(RC_ZF_BOTTOM_FREESTANDING_POH,  logic->IsAdult && logic->IronBoots && logic->WaterTimer >= 24),
+                  LOCATION(RC_ZF_GS_TREE,                  logic->IsChild),
+                  LOCATION(RC_ZF_GS_ABOVE_THE_LOG,         logic->IsChild && logic->HookshotOrBoomerang && logic->AtNight && logic->CanGetNightTimeGS),
+                  LOCATION(RC_ZF_GS_HIDDEN_CAVE,           logic->CanUse(RG_SILVER_GAUNTLETS) && logic->CanBlastOrSmash && logic->HookshotOrBoomerang && logic->IsAdult && logic->AtNight && logic->CanGetNightTimeGS),
+                  LOCATION(RC_ZF_FAIRY_GOSSIP_STONE,       true),
+                  LOCATION(RC_ZF_JABU_GOSSIP_STONE,        true),
                 }, {
                   //Exits
                   Entrance(RR_ZD_BEHIND_KING_ZORA,       {[]{return true;}}),
@@ -170,7 +170,7 @@ void AreaTable_Init_ZorasDomain() {
 
   areaTable[RR_ZF_GREAT_FAIRY_FOUNTAIN] = Area("ZF Great Fairy Fountain", "ZF Great Fairy Fountain", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(RC_ZF_GREAT_FAIRY_REWARD, {[]{return logic->CanUse(RG_ZELDAS_LULLABY);}}),
+                  LOCATION(RC_ZF_GREAT_FAIRY_REWARD, logic->CanUse(RG_ZELDAS_LULLABY)),
                 }, {
                   //Exits
                   Entrance(RR_ZORAS_FOUNTAIN, {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
index 36263197a..76c293950 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
@@ -5,6 +5,7 @@
 #include "dungeon.h"
 #include "../../OTRGlobals.h"
 #include "../../UIWidgets.hpp"
+#include "3drando/location_access.hpp"
 
 #include <string>
 #include <vector>
@@ -927,6 +928,8 @@ void CheckTrackerWindow::DrawElement() {
         return;
     }
 
+    AreaTable_Init();
+
     ImGui::TableNextRow(0, headerHeight);
     ImGui::TableNextColumn();
     UIWidgets::EnhancementCheckbox(
@@ -1561,6 +1564,19 @@ void DrawLocation(RandomizerCheck rc) {
         ImGui::Text(" (%s)", txt.c_str());
         ImGui::PopStyleColor();
     }
+
+    if (CVarGetInteger("gCheckTrackerOptionShowLogic", 0)) {
+        std::vector<LocationAccess> locationsInRegion = areaTable[itemLoc->GetParentRegionKey()].locations;
+        for (auto& locationInRegion : locationsInRegion) {
+            if (locationInRegion.GetLocation() == rc) {
+                std::string conditionStr = locationInRegion.GetConditionStr();
+                if (conditionStr != "true") {
+                    UIWidgets::InsertHelpHoverText(conditionStr);
+                }
+                return;
+            }
+        }
+    }
 }
 
 static std::set<std::string> rainbowCVars = {
@@ -1698,6 +1714,8 @@ void CheckTrackerSettingsWindow::DrawElement() {
         RecalculateAreaTotals();
     }
     UIWidgets::Tooltip("If enabled, will show GS locations in the tracker regardless of tokensanity settings.");
+    UIWidgets::EnhancementCheckbox("Show Logic", "gCheckTrackerOptionShowLogic");
+    UIWidgets::Tooltip("If enabled, will show a check's logic when hovering over it.");
 
     // Filtering settings
     UIWidgets::PaddedSeparator();

From 7a17fe221fd9a4b912a5d8ea1cb75cd2b46e3800 Mon Sep 17 00:00:00 2001
From: Christopher Leggett <chris@leggett.dev>
Date: Sun, 7 Jul 2024 21:22:23 -0400
Subject: [PATCH 155/230] Don't play the intro cutscene on child spawn even if
 location is shuffled (#4226)

* Don't play the intro cutscene on child spawn even if location is shuffled.

* Fix condition to not always skip cutscene when IS_RANDO is true.

* Fix typo
---
 soh/soh/Enhancements/TimeSavers/SkipCutscene/SkipIntro.cpp | 5 +++--
 soh/soh/Enhancements/randomizer/settings.cpp               | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/soh/soh/Enhancements/TimeSavers/SkipCutscene/SkipIntro.cpp b/soh/soh/Enhancements/TimeSavers/SkipCutscene/SkipIntro.cpp
index 95e9c2d10..f9dc8c239 100644
--- a/soh/soh/Enhancements/TimeSavers/SkipCutscene/SkipIntro.cpp
+++ b/soh/soh/Enhancements/TimeSavers/SkipCutscene/SkipIntro.cpp
@@ -11,8 +11,9 @@ extern "C" {
 
 void SkipIntro_Register() {
     REGISTER_VB_SHOULD(VB_PLAY_TRANSITION_CS, {
-        if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Intro"), IS_RANDO)) {
-            if (gSaveContext.entranceIndex == ENTR_LINKS_HOUSE_0 && gSaveContext.cutsceneIndex == 0xFFF1) {
+        if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Intro"), IS_RANDO) ||
+            IS_RANDO && OTRGlobals::Instance->gRandoContext->GetOption(RSK_SHUFFLE_OVERWORLD_SPAWNS).Is(true)) {
+            if (gSaveContext.entranceIndex == (IS_RANDO ? Entrance_GetOverride(ENTR_LINKS_HOUSE_0) : ENTR_LINKS_HOUSE_0) && gSaveContext.cutsceneIndex == 0xFFF1) {
                 gSaveContext.cutsceneIndex = 0;
                 *should = false;
             }
diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
index a67bbddab..cbaf774f0 100644
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -65,7 +65,7 @@ void Settings::CreateOptions() {
     mOptions[RSK_SHUFFLE_GROTTO_ENTRANCES] = Option::Bool("Grottos Entrances", CVAR_RANDOMIZER_SETTING("ShuffleGrottosEntrances"), mOptionDescriptions[RSK_SHUFFLE_GROTTO_ENTRANCES]);
     mOptions[RSK_SHUFFLE_OWL_DROPS] = Option::Bool("Owl Drops", CVAR_RANDOMIZER_SETTING("ShuffleOwlDrops"), mOptionDescriptions[RSK_SHUFFLE_OWL_DROPS]);
     mOptions[RSK_SHUFFLE_WARP_SONGS] = Option::Bool("Warp Songs", CVAR_RANDOMIZER_SETTING("ShuffleWarpSongs"), mOptionDescriptions[RSK_SHUFFLE_WARP_SONGS]);
-    mOptions[RSK_SHUFFLE_OVERWORLD_SPAWNS] = Option::Bool("Overworld Spawns", CVAR_RANDOMIZER_SETTING("ShuffleOverworldSpanws"), mOptionDescriptions[RSK_SHUFFLE_OVERWORLD_SPAWNS]);
+    mOptions[RSK_SHUFFLE_OVERWORLD_SPAWNS] = Option::Bool("Overworld Spawns", CVAR_RANDOMIZER_SETTING("ShuffleOverworldSpawns"), mOptionDescriptions[RSK_SHUFFLE_OVERWORLD_SPAWNS]);
     mOptions[RSK_MIXED_ENTRANCE_POOLS] = Option::Bool("Mixed Entrance Pools", CVAR_RANDOMIZER_SETTING("MixedEntrances"), mOptionDescriptions[RSK_MIXED_ENTRANCE_POOLS]);
     mOptions[RSK_MIX_DUNGEON_ENTRANCES] = Option::Bool("Mix Dungeons", CVAR_RANDOMIZER_SETTING("MixDungeons"), mOptionDescriptions[RSK_MIX_DUNGEON_ENTRANCES], IMFLAG_NONE);
     mOptions[RSK_MIX_BOSS_ENTRANCES] = Option::Bool("Mix Bosses", CVAR_RANDOMIZER_SETTING("MixBosses"), mOptionDescriptions[RSK_MIX_BOSS_ENTRANCES], IMFLAG_NONE);

From 77770ba3b2d93b96220909fefe0ef85b2c55ecf3 Mon Sep 17 00:00:00 2001
From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Date: Tue, 9 Jul 2024 23:57:28 +0100
Subject: [PATCH 156/230] fix hint crash on windows (#4227)

---
 soh/soh/Enhancements/custom-message/CustomMessageManager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/soh/soh/Enhancements/custom-message/CustomMessageManager.cpp b/soh/soh/Enhancements/custom-message/CustomMessageManager.cpp
index dd0591181..1386673d9 100644
--- a/soh/soh/Enhancements/custom-message/CustomMessageManager.cpp
+++ b/soh/soh/Enhancements/custom-message/CustomMessageManager.cpp
@@ -184,7 +184,7 @@ CustomMessage CustomMessage::operator+(const CustomMessage& right) const {
         newColors.push_back(color);
     }
     std::vector<bool> newCapital = capital;
-    newCapital.insert(capital.end(), right.GetCapital().begin(), right.GetCapital().end());
+    newCapital.insert(newCapital.end(), right.GetCapital().begin(), right.GetCapital().end());
     return CustomMessage(messages[LANGUAGE_ENG] + right.GetEnglish(MF_RAW),
                          messages[LANGUAGE_GER] + right.GetGerman(MF_RAW),
                          messages[LANGUAGE_FRA] + right.GetFrench(MF_RAW),

From a0fda39a75a4c628e2a19249bb7e736d540acf72 Mon Sep 17 00:00:00 2001
From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Date: Thu, 11 Jul 2024 15:38:52 +0100
Subject: [PATCH 157/230] Force Warp Song Hints off when Warp Songs are not
 shuffled (#4229)

---
 soh/soh/Enhancements/randomizer/settings.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
index cbaf774f0..0d702e480 100644
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -1739,6 +1739,12 @@ void Settings::UpdateOptionProperties() {
         mOptions[RSK_HINT_DISTRIBUTION].Unhide();
     }
 
+    if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleWarpSongs"), RO_GENERIC_ON)) {
+        mOptions[RSK_WARP_SONG_HINTS].Enable();
+    } else {
+        mOptions[RSK_WARP_SONG_HINTS].Disable("This option is disabled since warp song locations not shuffled.");
+    }
+
     if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleCows"), RO_GENERIC_OFF)) {
         mOptions[RSK_MALON_HINT].Enable();
         } else {
@@ -2039,6 +2045,10 @@ void Settings::FinalizeSettings(const std::set<RandomizerCheck>& excludedLocatio
         mOptions[RSK_KEYSANITY].SetSelectedIndex(3);
     }
 
+    if (!mOptions[RSK_SHUFFLE_WARP_SONGS]) {
+        mOptions[RSK_WARP_SONG_HINTS].SetSelectedIndex(RO_GENERIC_OFF);
+    }
+
     if (!mOptions[RSK_SHUFFLE_COWS]) {
         mOptions[RSK_MALON_HINT].SetSelectedIndex(RO_GENERIC_OFF);
     }

From ba82bfbba6d89e0d0f0626d50515e5f7dfae7a14 Mon Sep 17 00:00:00 2001
From: Christopher Leggett <chris@leggett.dev>
Date: Sat, 13 Jul 2024 16:51:54 -0400
Subject: [PATCH 158/230] Fix spawn shuffle when starting age is adult/random.
 (#4230)

* Fix spawn shuffle when starting age is adult.

* Handle adult start without spawn shuffle

* Handle correct entrance for adult start + spawn shuffle and add comments.

* Fix grotto spawn cutscene skips.

* Fix an issue with randomized starting age.
---
 .../TimeSavers/SkipCutscene/SkipIntro.cpp     | 35 +++++++++++++++----
 soh/soh/Enhancements/randomizer/savefile.cpp  |  2 +-
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/soh/soh/Enhancements/TimeSavers/SkipCutscene/SkipIntro.cpp b/soh/soh/Enhancements/TimeSavers/SkipCutscene/SkipIntro.cpp
index f9dc8c239..2402f841c 100644
--- a/soh/soh/Enhancements/TimeSavers/SkipCutscene/SkipIntro.cpp
+++ b/soh/soh/Enhancements/TimeSavers/SkipCutscene/SkipIntro.cpp
@@ -5,18 +5,41 @@
 extern "C" {
     #include "z64save.h"
     #include "functions.h"
+    #include "soh/Enhancements/randomizer/randomizer_grotto.h"
     extern PlayState* gPlayState;
     extern SaveContext gSaveContext;
 }
 
 void SkipIntro_Register() {
     REGISTER_VB_SHOULD(VB_PLAY_TRANSITION_CS, {
-        if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Intro"), IS_RANDO) ||
-            IS_RANDO && OTRGlobals::Instance->gRandoContext->GetOption(RSK_SHUFFLE_OVERWORLD_SPAWNS).Is(true)) {
-            if (gSaveContext.entranceIndex == (IS_RANDO ? Entrance_GetOverride(ENTR_LINKS_HOUSE_0) : ENTR_LINKS_HOUSE_0) && gSaveContext.cutsceneIndex == 0xFFF1) {
-                gSaveContext.cutsceneIndex = 0;
-                *should = false;
-            }
+        // If we're playing rando and if starting age is adult and/or overworld spawns are shuffled we need to skip
+        // the cutscene regardless of the enhancement being on.
+        bool adultStart = gSaveContext.linkAge == LINK_AGE_ADULT;
+        bool shuffleOverworldSpawns = OTRGlobals::Instance->gRandoContext->GetOption(RSK_SHUFFLE_OVERWORLD_SPAWNS).Is(true);
+        if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Intro"), IS_RANDO) || (IS_RANDO && (adultStart || shuffleOverworldSpawns))) {
+                // Calculate spawn location. Start with vanilla, Link's house.
+                int32_t spawnEntrance = ENTR_LINKS_HOUSE_0;
+                // If we're not in rando, we can skip all of the below.
+                if (IS_RANDO) {
+                    // If starting age is shuffled, use vanilla adult spawn/prelude warp.
+                    if (adultStart) {
+                        spawnEntrance = ENTR_TEMPLE_OF_TIME_7;
+                    }
+                    // If we're shuffling overworld spawns we'll need to get the Entrance Override
+                    if (shuffleOverworldSpawns) {
+                        // If we're shuffling overworld spawns the adult spawn is ENTR_HYRULE_FIELD_10 instead of
+                        // ENTR_TEMPLE_OF_TIME_7, so that spawn and Prelude don't share an entrance.
+                        if (adultStart){
+                            spawnEntrance = ENTR_HYRULE_FIELD_10;
+                        }
+                        spawnEntrance = Grotto_OverrideSpecialEntrance(Entrance_GetOverride(spawnEntrance));
+                    }
+                }
+                // Skip the intro cutscene for whatever the spawnEntrance is calculated to be.
+                if (gSaveContext.entranceIndex == spawnEntrance) {
+                    gSaveContext.cutsceneIndex = 0;
+                    *should = false;
+                }
         }
     });
 }
diff --git a/soh/soh/Enhancements/randomizer/savefile.cpp b/soh/soh/Enhancements/randomizer/savefile.cpp
index e8998b4a4..4900e4a70 100644
--- a/soh/soh/Enhancements/randomizer/savefile.cpp
+++ b/soh/soh/Enhancements/randomizer/savefile.cpp
@@ -331,7 +331,7 @@ extern "C" void Randomizer_InitSaveFile() {
         gSaveContext.adultTradeItems = 0;
     }
 
-    int startingAge = Randomizer_GetSettingValue(RSK_STARTING_AGE);
+    int startingAge = OTRGlobals::Instance->gRandoContext->GetSettings()->ResolvedStartingAge();
     switch (startingAge) {
         case RO_AGE_ADULT: // Adult
             gSaveContext.linkAge = LINK_AGE_ADULT;

From 2ff795e2276fd8ff671423f636576dc0973dd473 Mon Sep 17 00:00:00 2001
From: Angelo Bulfone <boomshroom@users.noreply.github.com>
Date: Tue, 16 Jul 2024 14:39:18 -0600
Subject: [PATCH 159/230] Fix MQ Checks (#4234)

---
 .../Enhancements/randomizer/hook_handlers.cpp    | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index e164eae16..303b8af42 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -3,6 +3,7 @@
 #include "soh/Enhancements/enhancementTypes.h"
 #include "soh/Enhancements/custom-message/CustomMessageTypes.h"
 #include "soh/Enhancements/randomizer/randomizerTypes.h"
+#include "soh/Enhancements/randomizer/dungeon.h"
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
@@ -44,16 +45,25 @@ extern s32 func_80836898(PlayState* play, Player* player, PlayerFuncA74 func);
 
 #define RAND_GET_OPTION(option) Rando::Context::GetInstance()->GetOption(option).GetSelectedOptionIndex()
 
+bool LocMatchesQuest(Rando::Location loc) {
+    if (loc.GetQuest() == RCQUEST_BOTH) {
+        return true;
+    } else {
+        auto dungeon = OTRGlobals::Instance->gRandoContext->GetDungeons()->GetDungeonFromScene(loc.GetScene());
+        return (dungeon->IsMQ() && loc.GetQuest() == RCQUEST_MQ) || (dungeon->IsVanilla() && loc.GetQuest() == RCQUEST_VANILLA);
+    }
+}
+
 RandomizerCheck GetRandomizerCheckFromFlag(int16_t flagType, int16_t flag) {
     for (auto& loc : Rando::StaticData::GetLocationTable()) {
-        if (loc.GetCollectionCheck().flag == flag && (
+        if ((loc.GetCollectionCheck().flag == flag && (
                 (flagType == FLAG_INF_TABLE && loc.GetCollectionCheck().type == SPOILER_CHK_INF_TABLE) ||
                 (flagType == FLAG_EVENT_CHECK_INF && loc.GetCollectionCheck().type == SPOILER_CHK_EVENT_CHK_INF) ||
                 (flagType == FLAG_ITEM_GET_INF && loc.GetCollectionCheck().type == SPOILER_CHK_ITEM_GET_INF) ||
                 (flagType == FLAG_RANDOMIZER_INF && loc.GetCollectionCheck().type == SPOILER_CHK_RANDOMIZER_INF)
             ) ||
             (loc.GetActorParams() == flag && flagType == FLAG_GS_TOKEN && loc.GetCollectionCheck().type == SPOILER_CHK_GOLD_SKULLTULA)
-        ) {
+        ) && LocMatchesQuest(loc)) {
             return loc.GetRandomizerCheck();
         }
     }
@@ -67,7 +77,7 @@ RandomizerCheck GetRandomizerCheckFromSceneFlag(int16_t sceneNum, int16_t flagTy
             (flagType == FLAG_SCENE_TREASURE && loc.GetCollectionCheck().type == SPOILER_CHK_CHEST) ||
             (flagType == FLAG_SCENE_COLLECTIBLE && loc.GetCollectionCheck().type == SPOILER_CHK_COLLECTABLE) ||
             (flagType == FLAG_GS_TOKEN && loc.GetCollectionCheck().type == SPOILER_CHK_GOLD_SKULLTULA)
-        )) {
+        ) && LocMatchesQuest(loc)) {
             return loc.GetRandomizerCheck();
         }
     }

From 8eb63049992f9dda531a0bc236161cbd1dae2821 Mon Sep 17 00:00:00 2001
From: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>
Date: Wed, 17 Jul 2024 05:25:06 +0200
Subject: [PATCH 160/230] Rando: Keyring tristate (#3960)

* Initial implementation

* Fix build

* Update UIWidgets.cpp

* Update option.cpp

* Update settings.cpp

* Update settings.cpp

* Apply Pepper0ni's patch

Co-Authored-By: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>

* Update option_descriptions.cpp

---------

Co-authored-by: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
---
 soh/soh/Enhancements/randomizer/option.cpp    | 23 +++++
 soh/soh/Enhancements/randomizer/option.h      |  2 +
 .../randomizer/option_descriptions.cpp        |  3 +-
 .../Enhancements/randomizer/randomizerTypes.h |  6 ++
 soh/soh/Enhancements/randomizer/settings.cpp  | 93 +++++++++++--------
 soh/soh/UIWidgets.cpp                         | 55 ++++++++++-
 soh/soh/UIWidgets.hpp                         |  4 +-
 7 files changed, 141 insertions(+), 45 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/option.cpp b/soh/soh/Enhancements/randomizer/option.cpp
index acccb9c5b..36fdd1f8b 100644
--- a/soh/soh/Enhancements/randomizer/option.cpp
+++ b/soh/soh/Enhancements/randomizer/option.cpp
@@ -140,6 +140,9 @@ bool Option::RenderImGui() const {
         case WidgetType::Checkbox:
             changed = RenderCheckbox();
             break;
+        case WidgetType::TristateCheckbox:
+            changed = RenderTristateCheckbox();
+            break;
         case WidgetType::Combobox:
             changed = RenderCombobox();
             break;
@@ -209,6 +212,26 @@ bool Option::RenderCheckbox() const {
     return changed;
 }
 
+bool Option::RenderTristateCheckbox() const {
+    bool changed = false;
+    if (disabled) {
+        UIWidgets::DisableComponent(ImGui::GetStyle().Alpha * 0.5f);
+    }
+    int val = CVarGetInteger(cvarName.c_str(), defaultOption);
+    if (CustomCheckboxTristate(name.c_str(), &val, disabled, disabledGraphic)) {
+        CVarSetInteger(cvarName.c_str(), val);
+        changed = true;
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
+    }
+    if (!description.empty()) {
+        UIWidgets::InsertHelpHoverText(description.c_str());
+    }
+    if (disabled) {
+        UIWidgets::ReEnableComponent(disabledText.c_str());
+    }
+    return changed;
+}
+
 bool Option::RenderCombobox() const {
     bool changed = false;
     if (disabled) {
diff --git a/soh/soh/Enhancements/randomizer/option.h b/soh/soh/Enhancements/randomizer/option.h
index 8ec4a32b1..57b3dae2c 100644
--- a/soh/soh/Enhancements/randomizer/option.h
+++ b/soh/soh/Enhancements/randomizer/option.h
@@ -34,6 +34,7 @@ enum class OptionCategory {
  */
 enum class WidgetType {
   Checkbox, /** Default for Bools, not compatible if options.size() > 2. */
+  TristateCheckbox, /** Compatible with U8s, not compatible if options.size() != 3. */
   Combobox, /** Default for U8s, works with U8s and Bools. */
   Slider, /** Compatible with U8s. If constructed with NumOpts, consider using this. Technically can be used for Bool or non-NumOpts options but it would be a bit weird semantically. */
 };
@@ -317,6 +318,7 @@ protected:
 
   private:
     bool RenderCheckbox() const;
+    bool RenderTristateCheckbox() const;
     bool RenderCombobox() const;
     bool RenderSlider() const;
     std::variant<bool, uint8_t> var;
diff --git a/soh/soh/Enhancements/randomizer/option_descriptions.cpp b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
index 522007403..784d9d1f3 100644
--- a/soh/soh/Enhancements/randomizer/option_descriptions.cpp
+++ b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
@@ -370,7 +370,8 @@ void Settings::CreateOptionDescriptions() {
         "\n"
         "Count - A specified amount of randomly selected dungeons will have their keys replaced with keyrings.\n"
         "\n"
-        "Selection - Hand select which dungeons will have their keys replaced with keyrings.\n"
+        "Selection - Hand select which dungeons will have their keys replaced with keyrings\n"
+        "(can also be left as random, in which case each one will have a 50% chance of being a keyring).\n"
         "\n"
         "Selecting key ring for dungeons will have no effect if Small Keys are set to Start With or Vanilla.\n"
         "\n"
diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h
index 43fddacea..80d62859c 100644
--- a/soh/soh/Enhancements/randomizer/randomizerTypes.h
+++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@@ -3876,6 +3876,12 @@ typedef enum {
     RO_KEYRINGS_SELECTION,
 } RandoOptionKeyrings;
 
+typedef enum {
+    RO_KEYRING_FOR_DUNGEON_OFF,
+    RO_KEYRING_FOR_DUNGEON_RANDOM,
+    RO_KEYRING_FOR_DUNGEON_ON,
+} RandoOptionKeyringForDungeon;
+
 //Ganon's Boss Key Settings (vanilla, own dungeon, start with,
 //overworld, anywhere, 100 GS reward)
 typedef enum {
diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
index 0d702e480..883a7c208 100644
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -136,15 +136,15 @@ void Settings::CreateOptions() {
     mOptions[RSK_LACS_OPTIONS] = Option::U8("LACS Reward Options", {"Standard Reward", "Greg as Reward", "Greg as Wildcard"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("LacsRewardOptions"), "", WidgetType::Combobox, RO_LACS_STANDARD_REWARD);
     mOptions[RSK_KEYRINGS] = Option::U8("Key Rings", {"Off", "Random", "Count", "Selection"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleKeyRings"), mOptionDescriptions[RSK_KEYRINGS], WidgetType::Combobox, RO_KEYRINGS_OFF);
     mOptions[RSK_KEYRINGS_RANDOM_COUNT] = Option::U8("Keyring Dungeon Count", {NumOpts(0, 9)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsRandomCount"), "", WidgetType::Slider, 8);
-    mOptions[RSK_KEYRINGS_GERUDO_FORTRESS] = Option::Bool("Gerudo Fortress", CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsGerudoFortress"), "", IMFLAG_NONE);
-    mOptions[RSK_KEYRINGS_FOREST_TEMPLE] = Option::Bool("Forest Temple", CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsForestTemple"), "", IMFLAG_NONE);
-    mOptions[RSK_KEYRINGS_FIRE_TEMPLE] = Option::Bool("Fire Temple", CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsFireTemple"), "", IMFLAG_NONE);
-    mOptions[RSK_KEYRINGS_WATER_TEMPLE] = Option::Bool("Water Temple", CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsWaterTemple"), "", IMFLAG_NONE);
-    mOptions[RSK_KEYRINGS_SPIRIT_TEMPLE] = Option::Bool("Spirit Temple", CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsSpiritTemple"), "", IMFLAG_NONE);
-    mOptions[RSK_KEYRINGS_SHADOW_TEMPLE] = Option::Bool("Shadow Temple", CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsShadowTemple"), "", IMFLAG_NONE);
-    mOptions[RSK_KEYRINGS_BOTTOM_OF_THE_WELL] = Option::Bool("Bottom of the Well", CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsBottomOfTheWell"), "", IMFLAG_NONE);
-    mOptions[RSK_KEYRINGS_GTG] = Option::Bool("Gerudo Training Grounds", CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsGTG"), "", IMFLAG_NONE);
-    mOptions[RSK_KEYRINGS_GANONS_CASTLE] = Option::Bool("Ganon's Castle", CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsGanonsCastle"));
+    mOptions[RSK_KEYRINGS_GERUDO_FORTRESS] = Option::U8("Gerudo Fortress Keyring", {"No", "Random", "Yes"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsGerudoFortress"), "", WidgetType::TristateCheckbox, 0);
+    mOptions[RSK_KEYRINGS_FOREST_TEMPLE] = Option::U8("Forest Temple Keyring", {"No", "Random", "Yes"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsForestTemple"), "", WidgetType::TristateCheckbox, 0);
+    mOptions[RSK_KEYRINGS_FIRE_TEMPLE] = Option::U8("Fire Temple Keyring", {"No", "Random", "Yes"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsFireTemple"), "", WidgetType::TristateCheckbox, 0);
+    mOptions[RSK_KEYRINGS_WATER_TEMPLE] = Option::U8("Water Temple Keyring", {"No", "Random", "Yes"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsWaterTemple"), "", WidgetType::TristateCheckbox, 0);
+    mOptions[RSK_KEYRINGS_SPIRIT_TEMPLE] = Option::U8("Spirit Temple Keyring", {"No", "Random", "Yes"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsSpiritTemple"), "", WidgetType::TristateCheckbox, 0);
+    mOptions[RSK_KEYRINGS_SHADOW_TEMPLE] = Option::U8("Shadow Temple Keyring", {"No", "Random", "Yes"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsShadowTemple"), "", WidgetType::TristateCheckbox, 0);
+    mOptions[RSK_KEYRINGS_BOTTOM_OF_THE_WELL] = Option::U8("Bottom of the Well Keyring", {"No", "Random", "Yes"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsBottomOfTheWell"), "", WidgetType::TristateCheckbox, 0);
+    mOptions[RSK_KEYRINGS_GTG] = Option::U8("Gerudo Training Grounds Keyring", {"No", "Random", "Yes"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsGTG"), "", WidgetType::TristateCheckbox, 0);
+    mOptions[RSK_KEYRINGS_GANONS_CASTLE] = Option::U8("Ganon's Castle Keyring", {"No", "Random", "Yes"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsGanonsCastle"), "", WidgetType::TristateCheckbox, 0);
     mOptions[RSK_SKIP_CHILD_STEALTH] = Option::Bool("Skip Child Stealth", {"Don't Skip", "Skip"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("SkipChildStealth"), mOptionDescriptions[RSK_SKIP_CHILD_STEALTH], WidgetType::Checkbox, RO_GENERIC_DONT_SKIP);
     mOptions[RSK_SKIP_CHILD_ZELDA] = Option::Bool("Skip Child Zelda", {"Don't Skip", "Skip"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("SkipChildZelda"), mOptionDescriptions[RSK_SKIP_CHILD_ZELDA], WidgetType::Checkbox, RO_GENERIC_DONT_SKIP);
     mOptions[RSK_SKIP_EPONA_RACE] = Option::Bool("Skip Epona Race", {"Don't Skip", "Skip"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("SkipEponaRace"), mOptionDescriptions[RSK_SKIP_EPONA_RACE], WidgetType::Checkbox, RO_GENERIC_DONT_SKIP);
@@ -1145,15 +1145,15 @@ void Settings::CreateOptions() {
         { "Shuffle Dungeon Items:LACS Reward Options", RSK_LACS_OPTIONS },
         { "Shuffle Dungeon Items:Key Rings", RSK_KEYRINGS },
         { "Shuffle Dungeon Items:Keyring Dungeon Count", RSK_KEYRINGS_RANDOM_COUNT },
-        { "Shuffle Dungeon Items:Gerudo Fortress", RSK_KEYRINGS_GERUDO_FORTRESS },
-        { "Shuffle Dungeon Items:Forest Temple", RSK_KEYRINGS_FOREST_TEMPLE },
-        { "Shuffle Dungeon Items:Fire Temple", RSK_KEYRINGS_FIRE_TEMPLE },
-        { "Shuffle Dungeon Items:Water Temple", RSK_KEYRINGS_WATER_TEMPLE },
-        { "Shuffle Dungeon Items:Spirit Temple", RSK_KEYRINGS_SPIRIT_TEMPLE },
-        { "Shuffle Dungeon Items:Shadow Temple", RSK_KEYRINGS_SHADOW_TEMPLE },
-        { "Shuffle Dungeon Items:Bottom of the Well", RSK_KEYRINGS_BOTTOM_OF_THE_WELL },
-        { "Shuffle Dungeon Items:GTG", RSK_KEYRINGS_GTG },
-        { "Shuffle Dungeon Items:Ganon's Castle", RSK_KEYRINGS_GANONS_CASTLE },
+        { "Shuffle Dungeon Items:Gerudo Fortress Keyring", RSK_KEYRINGS_GERUDO_FORTRESS },
+        { "Shuffle Dungeon Items:Forest Temple Keyring", RSK_KEYRINGS_FOREST_TEMPLE },
+        { "Shuffle Dungeon Items:Fire Temple Keyring", RSK_KEYRINGS_FIRE_TEMPLE },
+        { "Shuffle Dungeon Items:Water Temple Keyring", RSK_KEYRINGS_WATER_TEMPLE },
+        { "Shuffle Dungeon Items:Spirit Temple Keyring", RSK_KEYRINGS_SPIRIT_TEMPLE },
+        { "Shuffle Dungeon Items:Shadow Temple Keyring", RSK_KEYRINGS_SHADOW_TEMPLE },
+        { "Shuffle Dungeon Items:Bottom of the Well Keyring", RSK_KEYRINGS_BOTTOM_OF_THE_WELL },
+        { "Shuffle Dungeon Items:GTG Keyring", RSK_KEYRINGS_GTG },
+        { "Shuffle Dungeon Items:Ganon's Castle Keyring", RSK_KEYRINGS_GANONS_CASTLE },
         { "World Settings:Starting Age", RSK_STARTING_AGE },
         // TODO: Ammo Drop settings
         { "World Settings:Bombchu Drops", RSK_ENABLE_BOMBCHU_DROPS },
@@ -1952,39 +1952,44 @@ void Settings::FinalizeSettings(const std::set<RandomizerCheck>& excludedLocatio
 
     if (mOptions[RSK_KEYRINGS]) {
         // Random Key Rings
+        auto keyrings = keyRingOptions;
+        if (mOptions[RSK_GERUDO_FORTRESS].Is(RO_GF_NORMAL) && mOptions[RSK_GERUDO_KEYS].IsNot(RO_GERUDO_KEYS_VANILLA)) {
+            keyrings.push_back(&mOptions[RSK_KEYRINGS_GERUDO_FORTRESS]);
+        } else {
+            mOptions[RSK_KEYRINGS_GERUDO_FORTRESS].SetSelectedIndex(RO_KEYRING_FOR_DUNGEON_OFF);
+        }
         if (mOptions[RSK_KEYRINGS].Is(RO_KEYRINGS_RANDOM) || mOptions[RSK_KEYRINGS].Is(RO_KEYRINGS_COUNT)) {
-            auto keyrings = keyRingOptions;
-            if (mOptions[RSK_GERUDO_FORTRESS].Is(RO_GF_NORMAL) && mOptions[RSK_GERUDO_KEYS].IsNot(RO_GERUDO_KEYS_VANILLA)) {
-                keyrings.push_back(&mOptions[RSK_KEYRINGS_GERUDO_FORTRESS]);
-            }
             const uint32_t keyRingCount = mOptions[RSK_KEYRINGS].Is(RO_KEYRINGS_COUNT) ? mOptions[RSK_KEYRINGS_RANDOM_COUNT].Value<uint8_t>() : Random(0, static_cast<int>(keyrings.size()));
             Shuffle(keyrings);
             for (size_t i = 0; i < keyRingCount; i++) {
-                keyrings[i]->SetSelectedIndex(RO_GENERIC_ON);
+                keyrings[i]->SetSelectedIndex(RO_KEYRING_FOR_DUNGEON_ON);
+            }
+            for (size_t i = keyRingCount; i < keyrings.size(); i++) {
+                keyrings[i]->SetSelectedIndex(RO_KEYRING_FOR_DUNGEON_OFF);
             }
         }
-        if (mOptions[RSK_KEYRINGS_BOTTOM_OF_THE_WELL]) {
+        if (mOptions[RSK_KEYRINGS_BOTTOM_OF_THE_WELL].Is(RO_KEYRING_FOR_DUNGEON_ON) || (mOptions[RSK_KEYRINGS_BOTTOM_OF_THE_WELL].Is(RO_KEYRING_FOR_DUNGEON_RANDOM) && Random(0, 2) == 1)) {
             ctx->GetDungeon(BOTTOM_OF_THE_WELL)->SetKeyRing();
         }
-        if (mOptions[RSK_KEYRINGS_FOREST_TEMPLE]) {
+        if (mOptions[RSK_KEYRINGS_FOREST_TEMPLE].Is(RO_KEYRING_FOR_DUNGEON_ON) || (mOptions[RSK_KEYRINGS_FOREST_TEMPLE].Is(RO_KEYRING_FOR_DUNGEON_RANDOM) && Random(0, 2) == 1)) {
             ctx->GetDungeon(FOREST_TEMPLE)->SetKeyRing();
         }
-        if (mOptions[RSK_KEYRINGS_FIRE_TEMPLE]) {
+        if (mOptions[RSK_KEYRINGS_FIRE_TEMPLE].Is(RO_KEYRING_FOR_DUNGEON_ON) || (mOptions[RSK_KEYRINGS_FIRE_TEMPLE].Is(RO_KEYRING_FOR_DUNGEON_RANDOM) && Random(0, 2) == 1)) {
             ctx->GetDungeon(FIRE_TEMPLE)->SetKeyRing();
         }
-        if (mOptions[RSK_KEYRINGS_WATER_TEMPLE]) {
+        if (mOptions[RSK_KEYRINGS_WATER_TEMPLE].Is(RO_KEYRING_FOR_DUNGEON_ON) || (mOptions[RSK_KEYRINGS_WATER_TEMPLE].Is(RO_KEYRING_FOR_DUNGEON_RANDOM) && Random(0, 2) == 1)) {
             ctx->GetDungeon(WATER_TEMPLE)->SetKeyRing();
         }
-        if (mOptions[RSK_KEYRINGS_SPIRIT_TEMPLE]) {
+        if (mOptions[RSK_KEYRINGS_SPIRIT_TEMPLE].Is(RO_KEYRING_FOR_DUNGEON_ON) || (mOptions[RSK_KEYRINGS_SPIRIT_TEMPLE].Is(RO_KEYRING_FOR_DUNGEON_RANDOM) && Random(0, 2) == 1)) {
             ctx->GetDungeon(SPIRIT_TEMPLE)->SetKeyRing();
         }
-        if (mOptions[RSK_KEYRINGS_SHADOW_TEMPLE]) {
+        if (mOptions[RSK_KEYRINGS_SHADOW_TEMPLE].Is(RO_KEYRING_FOR_DUNGEON_ON) || (mOptions[RSK_KEYRINGS_SHADOW_TEMPLE].Is(RO_KEYRING_FOR_DUNGEON_RANDOM) && Random(0, 2) == 1)) {
             ctx->GetDungeon(SHADOW_TEMPLE)->SetKeyRing();
         }
-        if (mOptions[RSK_KEYRINGS_GTG]) {
+        if (mOptions[RSK_KEYRINGS_GTG].Is(RO_KEYRING_FOR_DUNGEON_ON) || (mOptions[RSK_KEYRINGS_GTG].Is(RO_KEYRING_FOR_DUNGEON_RANDOM) && Random(0, 2) == 1)) {
             ctx->GetDungeon(GERUDO_TRAINING_GROUNDS)->SetKeyRing();
         }
-        if (mOptions[RSK_KEYRINGS_GANONS_CASTLE]) {
+        if (mOptions[RSK_KEYRINGS_GANONS_CASTLE].Is(RO_KEYRING_FOR_DUNGEON_ON) || (mOptions[RSK_KEYRINGS_GANONS_CASTLE].Is(RO_KEYRING_FOR_DUNGEON_RANDOM) && Random(0, 2) == 1)) {
             ctx->GetDungeon(GANONS_CASTLE)->SetKeyRing();
         }
     }
@@ -2322,15 +2327,6 @@ void Settings::ParseJson(nlohmann::json spoilerFileJson) {
                 case RSK_HBA_HINT:
                 case RSK_WARP_SONG_HINTS:
                 case RSK_SCRUB_TEXT_HINT:
-                case RSK_KEYRINGS_GERUDO_FORTRESS:
-                case RSK_KEYRINGS_FOREST_TEMPLE:
-                case RSK_KEYRINGS_FIRE_TEMPLE:
-                case RSK_KEYRINGS_WATER_TEMPLE:
-                case RSK_KEYRINGS_SHADOW_TEMPLE:
-                case RSK_KEYRINGS_SPIRIT_TEMPLE:
-                case RSK_KEYRINGS_BOTTOM_OF_THE_WELL:
-                case RSK_KEYRINGS_GTG:
-                case RSK_KEYRINGS_GANONS_CASTLE:
                 case RSK_SHUFFLE_ENTRANCES:
                 case RSK_SHUFFLE_OVERWORLD_ENTRANCES:
                 case RSK_SHUFFLE_GROTTO_ENTRANCES:
@@ -2365,6 +2361,23 @@ void Settings::ParseJson(nlohmann::json spoilerFileJson) {
                         mOptions[index].SetSelectedIndex(RO_KEYRINGS_SELECTION);
                     }
                     break;
+                case RSK_KEYRINGS_GERUDO_FORTRESS:
+                case RSK_KEYRINGS_FOREST_TEMPLE:
+                case RSK_KEYRINGS_FIRE_TEMPLE:
+                case RSK_KEYRINGS_WATER_TEMPLE:
+                case RSK_KEYRINGS_SHADOW_TEMPLE:
+                case RSK_KEYRINGS_SPIRIT_TEMPLE:
+                case RSK_KEYRINGS_BOTTOM_OF_THE_WELL:
+                case RSK_KEYRINGS_GTG:
+                case RSK_KEYRINGS_GANONS_CASTLE:
+                    if (it.value() == "No") {
+                        mOptions[index].SetSelectedIndex(RO_KEYRING_FOR_DUNGEON_OFF);
+                    } else if (it.value() == "Random") {
+                        mOptions[index].SetSelectedIndex(RO_KEYRING_FOR_DUNGEON_RANDOM);
+                    } else if (it.value() == "Yes") {
+                        mOptions[index].SetSelectedIndex(RO_KEYRING_FOR_DUNGEON_ON);
+                    }
+                    break;
                 case RSK_SHUFFLE_MERCHANTS:
                     if (it.value() == "Off") {
                         mOptions[index].SetSelectedIndex(RO_SHUFFLE_MERCHANTS_OFF);
diff --git a/soh/soh/UIWidgets.cpp b/soh/soh/UIWidgets.cpp
index d1bf0967a..5ceaa0012 100644
--- a/soh/soh/UIWidgets.cpp
+++ b/soh/soh/UIWidgets.cpp
@@ -127,7 +127,7 @@ namespace UIWidgets {
         draw_list->PathStroke(col, 0, thickness);
     }
 
-    bool CustomCheckbox(const char* label, bool* v, bool disabled, CheckboxGraphics disabledGraphic) {
+    bool CustomCheckbox(const char* label, bool* v, bool disabled, CheckboxGraphics disabledGraphic, bool renderCrossWhenOff) {
         ImGuiWindow* window = ImGui::GetCurrentWindow();
         if (window->SkipItems) {
             return false;
@@ -168,9 +168,9 @@ namespace UIWidgets {
         } else if ((!disabled && *v) || (disabled && disabledGraphic == CheckboxGraphics::Checkmark)) {
             const float pad = ImMax(1.0f, IM_FLOOR(square_sz / 6.0f));
             ImGui::RenderCheckMark(window->DrawList, check_bb.Min + ImVec2(pad, pad), check_col, square_sz - pad * 2.0f);
-        } else if (disabled && disabledGraphic == CheckboxGraphics::Cross) {
+        } else if ((!disabled && !*v && renderCrossWhenOff) || (disabled && disabledGraphic == CheckboxGraphics::Cross)) {
             const float pad = ImMax(1.0f, IM_FLOOR(square_sz / 6.0f));
-            RenderCross(window->DrawList, check_bb.Min + ImVec2(pad, pad), cross_col, square_sz - pad * 2.0f);
+            RenderCross(window->DrawList, check_bb.Min + ImVec2(pad, pad), disabled ? cross_col : check_col, square_sz - pad * 2.0f);
         }
 
         ImVec2 label_pos = ImVec2(check_bb.Max.x + style.ItemInnerSpacing.x, check_bb.Min.y + style.FramePadding.y);
@@ -185,6 +185,36 @@ namespace UIWidgets {
         return pressed;
     }
 
+    bool CustomCheckboxTristate(const char* label, int* v, bool disabled, CheckboxGraphics disabledGraphic) {
+        bool ret;
+        if (*v == 0) {
+            bool b = false;
+            ret = CustomCheckbox(label, &b, disabled, disabledGraphic, true);
+            if (ret) {
+                *v = 1;
+            }
+        } else if (*v == 1) {
+            ImGui::PushItemFlag(ImGuiItemFlags_MixedValue, true);
+            bool b = true;
+            ret = CustomCheckbox(label, &b, disabled, disabledGraphic, true);
+            if (ret) {
+                *v = 2;
+            }
+            ImGui::PopItemFlag();
+        } else if (*v == 2) {
+            bool b = true;
+            ret = CustomCheckbox(label, &b, disabled, disabledGraphic, true);
+            if (ret) {
+                *v = 0;
+            }
+        } else {
+            SPDLOG_INFO("Invalid CheckBoxTristate value: {}", *v);
+            *v = 0;
+            return false;
+        }
+        return ret;
+    }
+
     void ReEnableComponent(const char* disabledTooltipText) {
         // End of disable region of previous component
         ImGui::PopStyleVar(1);
@@ -218,6 +248,25 @@ namespace UIWidgets {
         return changed;
     }
 
+    bool EnhancementCheckboxTristate(const char* text, const char* cvarName, bool disabled, const char* disabledTooltipText, CheckboxGraphics disabledGraphic, bool defaultValue) {
+        bool changed = false;
+        if (disabled) {
+            DisableComponent(ImGui::GetStyle().Alpha * 0.5f);
+        }
+
+        int val = CVarGetInteger(cvarName, defaultValue);
+        if (CustomCheckboxTristate(text, &val, disabled, disabledGraphic)) {
+            CVarSetInteger(cvarName, val);
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
+            changed = true;
+        }
+
+        if (disabled) {
+            ReEnableComponent(disabledTooltipText);
+        }
+        return changed;
+    }
+
     bool PaddedEnhancementCheckbox(const char* text, const char* cvarName, bool padTop, bool padBottom, bool disabled, const char* disabledTooltipText, CheckboxGraphics disabledGraphic, bool defaultValue) {
         ImGui::BeginGroup();
         if (padTop) Spacer(0);
diff --git a/soh/soh/UIWidgets.hpp b/soh/soh/UIWidgets.hpp
index 70580340c..809c4dd2d 100644
--- a/soh/soh/UIWidgets.hpp
+++ b/soh/soh/UIWidgets.hpp
@@ -68,12 +68,14 @@ namespace UIWidgets {
     void PaddedSeparator(bool padTop = true, bool padBottom = true, float extraVerticalTopPadding = 0.0f, float extraVerticalBottomPadding = 0.0f);
 
     void RenderCross(ImDrawList* draw_list, ImVec2 pos, ImU32 col, float sz);
-    bool CustomCheckbox(const char* label, bool* v, bool disabled, CheckboxGraphics disabledGraphic);
+    bool CustomCheckbox(const char* label, bool* v, bool disabled, CheckboxGraphics disabledGraphic, bool renderCrossWhenOff = false);
+    bool CustomCheckboxTristate(const char* label, int* v, bool disabled, CheckboxGraphics disabledGraphic);
 
     void ReEnableComponent(const char* disabledTooltipText);
     void DisableComponent(const float alpha);
 
     bool EnhancementCheckbox(const char* text, const char* cvarName, bool disabled = false, const char* disabledTooltipText = "", CheckboxGraphics disabledGraphic = CheckboxGraphics::Cross, bool defaultValue = false);
+    bool EnhancementCheckboxTristate(const char* text, const char* cvarName, bool disabled = false, const char* disabledTooltipText = "", CheckboxGraphics disabledGraphic = CheckboxGraphics::Cross, bool defaultValue = false);
     bool PaddedEnhancementCheckbox(const char* text, const char* cvarName, bool padTop = true, bool padBottom = true, bool disabled = false, const char* disabledTooltipText = "", CheckboxGraphics disabledGraphic = CheckboxGraphics::Cross, bool defaultValue = false);
     
     bool EnhancementCombobox(const char* cvarName, std::span<const char*, std::dynamic_extent> comboArray, uint8_t defaultIndex, bool disabled = false, const char* disabledTooltipText = "", uint8_t disabledValue = -1);

From f2958aea1ccf8419e0fd8b77324e77739c8c0da3 Mon Sep 17 00:00:00 2001
From: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>
Date: Wed, 17 Jul 2024 05:25:28 +0200
Subject: [PATCH 161/230] Improved rando settings (#3980)

* Initial implementation

* center icons (#5)

---------

Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
---
 .../randomizer_entrance_tracker.cpp           | 166 +++++++++---------
 .../randomizer/randomizer_entrance_tracker.h  |  10 ++
 soh/soh/SohGui.cpp                            |   6 +-
 soh/soh/SohMenuBar.cpp                        |  55 +++++-
 4 files changed, 146 insertions(+), 91 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.cpp
index af484449d..851bdf2d2 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.cpp
@@ -639,6 +639,89 @@ void InitEntranceTrackingData() {
     SortEntranceListByType(destListSortedByType, 1);
 }
 
+void EntranceTrackerSettingsWindow::DrawElement() {
+    ImGui::SetNextWindowSize(ImVec2(600, 375), ImGuiCond_FirstUseEver);
+
+    if (!ImGui::Begin("Entrance Tracker Settings", &mIsVisible, ImGuiWindowFlags_NoFocusOnAppearing)) {
+        ImGui::End();
+        return;
+    }
+
+    if (ImGui::BeginTable("entranceTrackerSettings", 1, ImGuiTableFlags_BordersInnerH)) {
+
+        ImGui::TableNextColumn();
+
+        UIWidgets::Spacer(0);
+        ImGui::TextWrapped("The entrance tracker will only track shuffled entrances");
+        UIWidgets::Spacer(0);
+
+        ImGui::TableNextColumn();
+
+        if (ImGui::BeginTable("entranceTrackerSubSettings", 2, ImGuiTableFlags_BordersInnerV | ImGuiTableFlags_SizingStretchProp)) {
+
+            ImGui::TableNextColumn();
+
+            ImGui::Text("Sort By");
+            UIWidgets::EnhancementRadioButton("To", CVAR_TRACKER_ENTRANCE("SortBy"), 0);
+            UIWidgets::Tooltip("Sort entrances by the original source entrance");
+            UIWidgets::EnhancementRadioButton("From", CVAR_TRACKER_ENTRANCE("SortBy"), 1);
+            UIWidgets::Tooltip("Sort entrances by the overrided destination");
+
+            UIWidgets::Spacer(2.0f);
+
+            ImGui::Text("List Items");
+            UIWidgets::PaddedEnhancementCheckbox("Auto scroll", CVAR_TRACKER_ENTRANCE("AutoScroll"), true, false);
+            UIWidgets::Tooltip("Automatically scroll to the first aviable entrance in the current scene");
+            UIWidgets::PaddedEnhancementCheckbox("Highlight previous", CVAR_TRACKER_ENTRANCE("HighlightPrevious"), true, false);
+            UIWidgets::Tooltip("Highlight the previous entrance that Link came from");
+            UIWidgets::PaddedEnhancementCheckbox("Highlight available", CVAR_TRACKER_ENTRANCE("HighlightAvailable"), true, false);
+            UIWidgets::Tooltip("Highlight available entrances in the current scene");
+            UIWidgets::PaddedEnhancementCheckbox("Hide undiscovered", CVAR_TRACKER_ENTRANCE("CollapseUndiscovered"), true, false);
+            UIWidgets::Tooltip("Collapse undiscovered entrances towards the bottom of each group");
+            bool disableHideReverseEntrances = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_DECOUPLED_ENTRANCES) == RO_GENERIC_ON;
+            static const char* disableHideReverseEntrancesText = "This option is disabled because \"Decouple Entrances\" is enabled.";
+            UIWidgets::PaddedEnhancementCheckbox("Hide reverse", CVAR_TRACKER_ENTRANCE("HideReverseEntrances"), true, false,
+                                          disableHideReverseEntrances, disableHideReverseEntrancesText, UIWidgets::CheckboxGraphics::Cross, true);
+            UIWidgets::Tooltip("Hide reverse entrance transitions when Decouple Entrances is off");
+            UIWidgets::Spacer(0);
+
+            ImGui::TableNextColumn();
+
+            ImGui::Text("Group By");
+            UIWidgets::EnhancementRadioButton("Area", CVAR_TRACKER_ENTRANCE("GroupBy"), 0);
+            UIWidgets::Tooltip("Group entrances by their area");
+            UIWidgets::EnhancementRadioButton("Type", CVAR_TRACKER_ENTRANCE("GroupBy"), 1);
+            UIWidgets::Tooltip("Group entrances by their entrance type");
+
+            UIWidgets::Spacer(2.0f);
+
+            ImGui::Text("Spoiler Reveal");
+            UIWidgets::PaddedEnhancementCheckbox("Show \"To\"", CVAR_TRACKER_ENTRANCE("ShowTo"), true, false);
+            UIWidgets::Tooltip("Reveal the \"To\" entrance for undiscovered entrances");
+            UIWidgets::PaddedEnhancementCheckbox("Show \"From\"", CVAR_TRACKER_ENTRANCE("ShowFrom"), true, false);
+            UIWidgets::Tooltip("Reveal the \"From\" entrance for undiscovered entrances");
+
+            ImGui::EndTable();
+        }
+
+        ImGui::TableNextColumn();
+
+        ImGui::SetNextItemOpen(false, ImGuiCond_Once);
+        if (ImGui::TreeNode("Legend")) {
+            ImGui::TextColored(ImColor(COLOR_ORANGE), "Last Entrance");
+            ImGui::TextColored(ImColor(COLOR_GREEN), "Available Entrances");
+            ImGui::TextColored(ImColor(COLOR_GRAY), "Undiscovered Entrances");
+            ImGui::TreePop();
+        }
+
+        UIWidgets::Spacer(0);
+
+        ImGui::EndTable();
+    }
+
+    ImGui::End();
+}
+
 void EntranceTrackerWindow::DrawElement() {
     ImGui::SetNextWindowSize(ImVec2(600, 375), ImGuiCond_FirstUseEver);
 
@@ -647,89 +730,6 @@ void EntranceTrackerWindow::DrawElement() {
         return;
     }
 
-    // Begin tracker settings
-    ImGui::SetNextItemOpen(false, ImGuiCond_Once);
-    if (ImGui::TreeNode("Tracker Settings")) {
-        // Reduce indentation from the tree node for the table
-        ImGui::SetCursorPosX((ImGui::GetCursorPosX() / 2) + 4.0f);
-
-        if (ImGui::BeginTable("entranceTrackerSettings", 1, ImGuiTableFlags_BordersInnerH)) {
-
-            ImGui::TableNextColumn();
-
-            UIWidgets::Spacer(0);
-            ImGui::TextWrapped("The entrance tracker will only track shuffled entrances");
-            UIWidgets::Spacer(0);
-
-            ImGui::TableNextColumn();
-
-            if (ImGui::BeginTable("entranceTrackerSubSettings", 2, ImGuiTableFlags_BordersInnerV | ImGuiTableFlags_SizingStretchProp)) {
-
-                ImGui::TableNextColumn();
-
-                ImGui::Text("Sort By");
-                UIWidgets::EnhancementRadioButton("To", CVAR_TRACKER_ENTRANCE("SortBy"), 0);
-                UIWidgets::Tooltip("Sort entrances by the original source entrance");
-                UIWidgets::EnhancementRadioButton("From", CVAR_TRACKER_ENTRANCE("SortBy"), 1);
-                UIWidgets::Tooltip("Sort entrances by the overrided destination");
-
-                UIWidgets::Spacer(2.0f);
-
-                ImGui::Text("List Items");
-                UIWidgets::PaddedEnhancementCheckbox("Auto scroll", CVAR_TRACKER_ENTRANCE("AutoScroll"), true, false);
-                UIWidgets::Tooltip("Automatically scroll to the first aviable entrance in the current scene");
-                UIWidgets::PaddedEnhancementCheckbox("Highlight previous", CVAR_TRACKER_ENTRANCE("HighlightPrevious"), true, false);
-                UIWidgets::Tooltip("Highlight the previous entrance that Link came from");
-                UIWidgets::PaddedEnhancementCheckbox("Highlight available", CVAR_TRACKER_ENTRANCE("HighlightAvailable"), true, false);
-                UIWidgets::Tooltip("Highlight available entrances in the current scene");
-                UIWidgets::PaddedEnhancementCheckbox("Hide undiscovered", CVAR_TRACKER_ENTRANCE("CollapseUndiscovered"), true, false);
-                UIWidgets::Tooltip("Collapse undiscovered entrances towards the bottom of each group");
-                bool disableHideReverseEntrances = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_DECOUPLED_ENTRANCES) == RO_GENERIC_ON;
-                static const char* disableHideReverseEntrancesText = "This option is disabled because \"Decouple Entrances\" is enabled.";
-                UIWidgets::PaddedEnhancementCheckbox("Hide reverse", CVAR_TRACKER_ENTRANCE("HideReverseEntrances"), true, false,
-                                              disableHideReverseEntrances, disableHideReverseEntrancesText, UIWidgets::CheckboxGraphics::Cross, true);
-                UIWidgets::Tooltip("Hide reverse entrance transitions when Decouple Entrances is off");
-                UIWidgets::Spacer(0);
-
-                ImGui::TableNextColumn();
-
-                ImGui::Text("Group By");
-                UIWidgets::EnhancementRadioButton("Area", CVAR_TRACKER_ENTRANCE("GroupBy"), 0);
-                UIWidgets::Tooltip("Group entrances by their area");
-                UIWidgets::EnhancementRadioButton("Type", CVAR_TRACKER_ENTRANCE("GroupBy"), 1);
-                UIWidgets::Tooltip("Group entrances by their entrance type");
-
-                UIWidgets::Spacer(2.0f);
-
-                ImGui::Text("Spoiler Reveal");
-                UIWidgets::PaddedEnhancementCheckbox("Show \"To\"", CVAR_TRACKER_ENTRANCE("ShowTo"), true, false);
-                UIWidgets::Tooltip("Reveal the \"To\" entrance for undiscovered entrances");
-                UIWidgets::PaddedEnhancementCheckbox("Show \"From\"", CVAR_TRACKER_ENTRANCE("ShowFrom"), true, false);
-                UIWidgets::Tooltip("Reveal the \"From\" entrance for undiscovered entrances");
-
-                ImGui::EndTable();
-            }
-
-            ImGui::TableNextColumn();
-
-            ImGui::SetNextItemOpen(false, ImGuiCond_Once);
-            if (ImGui::TreeNode("Legend")) {
-                ImGui::TextColored(ImColor(COLOR_ORANGE), "Last Entrance");
-                ImGui::TextColored(ImColor(COLOR_GREEN), "Available Entrances");
-                ImGui::TextColored(ImColor(COLOR_GRAY), "Undiscovered Entrances");
-                ImGui::TreePop();
-            }
-
-            UIWidgets::Spacer(0);
-
-            ImGui::EndTable();
-        }
-
-        ImGui::TreePop();
-    } else {
-        UIWidgets::PaddedSeparator();
-    }
-
     static ImGuiTextFilter locationSearch;
 
     uint8_t nextTreeState = 0;
diff --git a/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.h b/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.h
index 87d736058..22e27a250 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.h
+++ b/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.h
@@ -85,6 +85,16 @@ s16 GetLastEntranceOverride();
 s16 GetCurrentGrottoId();
 const EntranceData* GetEntranceData(s16);
 
+class EntranceTrackerSettingsWindow : public Ship::GuiWindow {
+  public:
+    using GuiWindow::GuiWindow;
+
+  protected:
+    void InitElement() override {};
+    void DrawElement() override;
+    void UpdateElement() override {};
+};
+
 class EntranceTrackerWindow : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
diff --git a/soh/soh/SohGui.cpp b/soh/soh/SohGui.cpp
index 7fde4f351..696825ec8 100644
--- a/soh/soh/SohGui.cpp
+++ b/soh/soh/SohGui.cpp
@@ -129,6 +129,7 @@ namespace SohGui {
     std::shared_ptr<GameplayStatsWindow> mGameplayStatsWindow;
     std::shared_ptr<CheckTracker::CheckTrackerSettingsWindow> mCheckTrackerSettingsWindow;
     std::shared_ptr<CheckTracker::CheckTrackerWindow> mCheckTrackerWindow;
+    std::shared_ptr<EntranceTrackerSettingsWindow> mEntranceTrackerSettingsWindow;
     std::shared_ptr<EntranceTrackerWindow> mEntranceTrackerWindow;
     std::shared_ptr<ItemTrackerSettingsWindow> mItemTrackerSettingsWindow;
     std::shared_ptr<ItemTrackerWindow> mItemTrackerWindow;
@@ -191,8 +192,10 @@ namespace SohGui {
         gui->AddGuiWindow(mCheckTrackerWindow);
         mCheckTrackerSettingsWindow = std::make_shared<CheckTracker::CheckTrackerSettingsWindow>(CVAR_WINDOW("CheckTrackerSettings"), "Check Tracker Settings");
         gui->AddGuiWindow(mCheckTrackerSettingsWindow);
-        mEntranceTrackerWindow = std::make_shared<EntranceTrackerWindow>(CVAR_WINDOW("EntranceTracker"),"Entrance Tracker");
+        mEntranceTrackerWindow = std::make_shared<EntranceTrackerWindow>(CVAR_WINDOW("EntranceTracker"), "Entrance Tracker");
         gui->AddGuiWindow(mEntranceTrackerWindow);
+        mEntranceTrackerSettingsWindow = std::make_shared<EntranceTrackerSettingsWindow>(CVAR_WINDOW("EntranceTrackerSettings"), "Entrance Tracker Settings");
+        gui->AddGuiWindow(mEntranceTrackerSettingsWindow);
         mItemTrackerWindow = std::make_shared<ItemTrackerWindow>(CVAR_WINDOW("ItemTracker"), "Item Tracker");
         gui->AddGuiWindow(mItemTrackerWindow);
         mItemTrackerSettingsWindow = std::make_shared<ItemTrackerSettingsWindow>(CVAR_WINDOW("ItemTrackerSettings"), "Item Tracker Settings");
@@ -213,6 +216,7 @@ namespace SohGui {
         mItemTrackerWindow = nullptr;
         mItemTrackerSettingsWindow = nullptr;
         mEntranceTrackerWindow = nullptr;
+        mEntranceTrackerSettingsWindow = nullptr;
         mCheckTrackerWindow = nullptr;
         mCheckTrackerSettingsWindow = nullptr;
         mGameplayStatsWindow = nullptr;
diff --git a/soh/soh/SohMenuBar.cpp b/soh/soh/SohMenuBar.cpp
index 28e43c483..587e2d0c1 100644
--- a/soh/soh/SohMenuBar.cpp
+++ b/soh/soh/SohMenuBar.cpp
@@ -38,6 +38,10 @@
 #include "Enhancements/randomizer/randomizer_settings_window.h"
 #include "Enhancements/resolution-editor/ResolutionEditor.h"
 
+// FA icons are kind of wonky, if they worked how I expected them to the "+ 2.0f" wouldn't be needed, but
+// they don't work how I expect them to so I added that because it looked good when I eyeballed it
+#define FA_ICON_BUTTON_FRAME_PADDING_X(icon) (((optionsButtonSize.x - ImGui::CalcTextSize(icon).x) / 2) + 2.0f)
+
 extern bool ToggleAltAssetsAtEndOfFrame;
 extern bool isBetaQuestEnabled;
 
@@ -1963,6 +1967,7 @@ extern std::shared_ptr<RandomizerSettingsWindow> mRandomizerSettingsWindow;
 extern std::shared_ptr<ItemTrackerWindow> mItemTrackerWindow;
 extern std::shared_ptr<ItemTrackerSettingsWindow> mItemTrackerSettingsWindow;
 extern std::shared_ptr<EntranceTrackerWindow> mEntranceTrackerWindow;
+extern std::shared_ptr<EntranceTrackerSettingsWindow> mEntranceTrackerSettingsWindow;
 extern std::shared_ptr<CheckTracker::CheckTrackerWindow> mCheckTrackerWindow;
 extern std::shared_ptr<CheckTracker::CheckTrackerSettingsWindow> mCheckTrackerSettingsWindow;
 extern "C" u8 Randomizer_GetSettingValue(RandomizerSettingKey randoSettingKey);
@@ -1981,11 +1986,19 @@ void DrawRandomizerMenu() {
         ImGui::PushStyleVar(ImGuiStyleVar_ButtonTextAlign, ImVec2(0, 0));
         ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0f);
         ImGui::PushStyleColor(ImGuiCol_Border, ImVec4(0.22f, 0.38f, 0.56f, 1.0f));
+
     #ifdef __WIIU__
         static ImVec2 buttonSize(200.0f * 2.0f, 0.0f);
+        static ImVec2 buttonWithOptionsSize(170.0f * 2.0f, 0.0f);
+        static ImVec2 optionsButtonSize(25.0f * 2.0f, 0.0f);
+        static float separationToOptionsButton = 5.0f * 2.0f;
     #else
         static ImVec2 buttonSize(200.0f, 0.0f);
+        static ImVec2 buttonWithOptionsSize(170.0f, 0.0f);
+        static ImVec2 optionsButtonSize(25.0f, 0.0f);
+        static float separationToOptionsButton = 5.0f;
     #endif
+
         if (mRandomizerSettingsWindow) {
             if (ImGui::Button(GetWindowButtonText("Randomizer Settings", CVarGetInteger(CVAR_WINDOW("RandomizerSettings"), 0)).c_str(), buttonSize)) {
                 mRandomizerSettingsWindow->ToggleVisibility();
@@ -1993,36 +2006,64 @@ void DrawRandomizerMenu() {
         }
 
         UIWidgets::Spacer(0);
+
         if (mItemTrackerWindow) {
-            if (ImGui::Button(GetWindowButtonText("Item Tracker", CVarGetInteger(CVAR_WINDOW("ItemTracker"), 0)).c_str(), buttonSize)) {
+            if (ImGui::Button(GetWindowButtonText("Item Tracker", CVarGetInteger(CVAR_WINDOW("ItemTracker"), 0)).c_str(), buttonWithOptionsSize)) {
                 mItemTrackerWindow->ToggleVisibility();
             }
         }
 
-        UIWidgets::Spacer(0);
+        ImGui::SameLine(0, 0);
+        ImVec2 cursor = ImGui::GetCursorPos();
+        ImGui::SetCursorPos(ImVec2(cursor.x + separationToOptionsButton, cursor.y));
+
         if (mItemTrackerSettingsWindow) {
-            if (ImGui::Button(GetWindowButtonText("Item Tracker Settings", CVarGetInteger(CVAR_WINDOW("ItemTrackerSettings"), 0)).c_str(), buttonSize)) {
+            ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(FA_ICON_BUTTON_FRAME_PADDING_X(ICON_FA_COG), 6.0f));
+            if (ImGui::Button(ICON_FA_COG "##ItemTrackerSettings", optionsButtonSize)) {
                 mItemTrackerSettingsWindow->ToggleVisibility();
             }
+            ImGui::PopStyleVar();
         }
+
         UIWidgets::Spacer(0);
         if (mEntranceTrackerWindow) {
-            if (ImGui::Button(GetWindowButtonText("Entrance Tracker", CVarGetInteger(CVAR_WINDOW("EntranceTracker"), 0)).c_str(), buttonSize)) {
+            if (ImGui::Button(GetWindowButtonText("Entrance Tracker", CVarGetInteger(CVAR_WINDOW("EntranceTracker"), 0)).c_str(), buttonWithOptionsSize)) {
                 mEntranceTrackerWindow->ToggleVisibility();
             }
         }
+
+        ImGui::SameLine(0, 0);
+        cursor = ImGui::GetCursorPos();
+        ImGui::SetCursorPos(ImVec2(cursor.x + separationToOptionsButton, cursor.y));
+
+        if (mEntranceTrackerSettingsWindow) {
+            ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(FA_ICON_BUTTON_FRAME_PADDING_X(ICON_FA_COG), 6.0f));
+            if (ImGui::Button(ICON_FA_COG "##EntranceTrackerSettings", optionsButtonSize)) {
+                mEntranceTrackerSettingsWindow->ToggleVisibility();
+            }
+            ImGui::PopStyleVar();
+        }
+
         UIWidgets::Spacer(0);
+
         if (mCheckTrackerWindow) {
-            if (ImGui::Button(GetWindowButtonText("Check Tracker", CVarGetInteger(CVAR_WINDOW("CheckTracker"), 0)).c_str(), buttonSize)) {
+            if (ImGui::Button(GetWindowButtonText("Check Tracker", CVarGetInteger(CVAR_WINDOW("CheckTracker"), 0)).c_str(), buttonWithOptionsSize)) {
                 mCheckTrackerWindow->ToggleVisibility();
             }
         }
-        UIWidgets::Spacer(0);
+
+        ImGui::SameLine(0, 0);
+        cursor = ImGui::GetCursorPos();
+        ImGui::SetCursorPos(ImVec2(cursor.x + separationToOptionsButton, cursor.y));
+
         if (mCheckTrackerSettingsWindow) {
-            if (ImGui::Button(GetWindowButtonText("Check Tracker Settings", CVarGetInteger(CVAR_WINDOW("CheckTrackerSettings"), 0)).c_str(), buttonSize)) {
+            ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(FA_ICON_BUTTON_FRAME_PADDING_X(ICON_FA_COG), 6.0f));
+            if (ImGui::Button(ICON_FA_COG "##CheckTrackerSettings", optionsButtonSize)) {
                 mCheckTrackerSettingsWindow->ToggleVisibility();
             }
+            ImGui::PopStyleVar();
         }
+
         ImGui::PopStyleVar(3);
         ImGui::PopStyleColor(1);
 

From a5c0cede12d3a53cb0f1069a5d4a5c4febe991fa Mon Sep 17 00:00:00 2001
From: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>
Date: Wed, 17 Jul 2024 18:42:56 +0200
Subject: [PATCH 162/230] Rando: Shuffle consumable bags (#3959)

* Main implementation

* Fix sticks & nuts from shops & checks

* Change the models to normal stick & nut

Worth noting that before you have the bags, the refills are blue rupees so there will not be model collision

* Update hook_handlers.cpp
---
 .../randomizer/3drando/item_pool.cpp          |  7 ++++
 .../Enhancements/randomizer/hook_handlers.cpp | 19 +++++++++++
 soh/soh/Enhancements/randomizer/item.cpp      |  8 +++++
 soh/soh/Enhancements/randomizer/item_list.cpp | 16 +++++----
 soh/soh/Enhancements/randomizer/logic.cpp     |  6 ++--
 soh/soh/Enhancements/randomizer/logic.h       |  2 ++
 .../randomizer/option_descriptions.cpp        |  6 ++++
 .../Enhancements/randomizer/randomizer.cpp    | 18 ++++++----
 .../Enhancements/randomizer/randomizerTypes.h |  4 +++
 soh/soh/Enhancements/randomizer/savefile.cpp  |  8 +++--
 soh/soh/Enhancements/randomizer/settings.cpp  |  8 +++++
 soh/src/code/z_parameter.c                    | 34 +++++++++++++++++++
 .../overlays/actors/ovl_En_GirlA/z_en_girla.c |  8 +++++
 13 files changed, 127 insertions(+), 17 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
index 9c1459cef..caf7c811e 100644
--- a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
@@ -977,6 +977,13 @@ void GenerateItemPool() {
     AddItemToMainPool(RG_PROGRESSIVE_WALLET);
   }
 
+  if (ctx->GetOption(RSK_SHUFFLE_DEKU_STICK_BAG)) {
+    AddItemToMainPool(RG_PROGRESSIVE_STICK_UPGRADE);
+  }
+
+  if (ctx->GetOption(RSK_SHUFFLE_DEKU_NUT_BAG)) {
+    AddItemToMainPool(RG_PROGRESSIVE_NUT_UPGRADE);
+  }
 
   if (ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC)) {
     AddItemToMainPool(RG_PROGRESSIVE_BOMBCHUS, 5);
diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index 303b8af42..2f314fc76 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -1443,6 +1443,25 @@ void RandomizerOnActorInitHandler(void* actorRef) {
             Actor_Kill(actor);
         }
     }
+
+    //consumable bags
+    if (
+        actor->id = ACTOR_EN_ITEM00 &&
+        (
+            (
+                RAND_GET_OPTION(RSK_SHUFFLE_DEKU_STICK_BAG) &&
+                CUR_UPG_VALUE(UPG_STICKS) == 0 &&
+                actor->params == ITEM00_STICK
+            ) ||
+            (
+                RAND_GET_OPTION(RSK_SHUFFLE_DEKU_NUT_BAG) &&
+                CUR_UPG_VALUE(UPG_NUTS) == 0 &&
+                actor->params == ITEM00_NUTS
+            )
+        )
+    ) {
+        Actor_Kill(actor);
+    }
 }
 
 void RandomizerRegisterHooks() {
diff --git a/soh/soh/Enhancements/randomizer/item.cpp b/soh/soh/Enhancements/randomizer/item.cpp
index 16396c072..9be5551b8 100644
--- a/soh/soh/Enhancements/randomizer/item.cpp
+++ b/soh/soh/Enhancements/randomizer/item.cpp
@@ -123,6 +123,10 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
         case RG_PROGRESSIVE_STICK_UPGRADE:
             switch (CUR_UPG_VALUE(UPG_STICKS)) {
                 case 0:
+                    if (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_DEKU_STICK_BAG)) {
+                        actual = RG_DEKU_STICK_BAG;
+                        break;
+                    }
                 case 1:
                     actual = RG_DEKU_STICK_CAPACITY_20;
                     break;
@@ -137,6 +141,10 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
         case RG_PROGRESSIVE_NUT_UPGRADE:
             switch (CUR_UPG_VALUE(UPG_NUTS)) {
                 case 0:
+                    if (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_DEKU_NUT_BAG)) {
+                        actual = RG_DEKU_NUT_BAG;
+                        break;
+                    }
                 case 1:
                     actual = RG_DEKU_NUT_CAPACITY_30;
                     break;
diff --git a/soh/soh/Enhancements/randomizer/item_list.cpp b/soh/soh/Enhancements/randomizer/item_list.cpp
index 2b6c42d34..3bdd2709f 100644
--- a/soh/soh/Enhancements/randomizer/item_list.cpp
+++ b/soh/soh/Enhancements/randomizer/item_list.cpp
@@ -64,8 +64,8 @@ void Rando::StaticData::InitItemTable() {
     itemTable[RG_PROGRESSIVE_SLINGSHOT] =               Item(RG_PROGRESSIVE_SLINGSHOT,            Text{ "Progressive Slingshot", "Lance-Pierre (prog.)", "Progressive Steinschleuder" },                            ITEMTYPE_ITEM,              0x84,               true,  &logic->ProgressiveBulletBag,RHT_PROGRESSIVE_SLINGSHOT, true);
     itemTable[RG_PROGRESSIVE_WALLET] =                  Item(RG_PROGRESSIVE_WALLET,               Text{ "Progressive Wallet", "Bourse (prog.)", "Progressive Brieftasche" },                                        ITEMTYPE_ITEM,              0x85,               true,  &logic->ProgressiveWallet,   RHT_PROGRESSIVE_WALLET, true);
     itemTable[RG_PROGRESSIVE_SCALE] =                   Item(RG_PROGRESSIVE_SCALE,                Text{ "Progressive Scale", "Écaille (prog.)", "Progressive Skala" },                                              ITEMTYPE_ITEM,              0x86,               true,  &logic->ProgressiveScale,    RHT_PROGRESSIVE_SCALE, true);
-    itemTable[RG_PROGRESSIVE_NUT_UPGRADE] =             Item(RG_PROGRESSIVE_NUT_UPGRADE,          Text{ "Progressive Nut Capacity", "Capacité de Noix (prog.)", "Progressive Nusskapazität" },                      ITEMTYPE_ITEM,              0x87,               false, &logic->noVariable,          RHT_PROGRESSIVE_NUT_UPGRADE, true);
-    itemTable[RG_PROGRESSIVE_STICK_UPGRADE] =           Item(RG_PROGRESSIVE_STICK_UPGRADE,        Text{ "Progressive Stick Capacity", "Capacité de Bâtons (prog.)", "Progressive Stick-Kapazität" },                ITEMTYPE_ITEM,              0x88,               false, &logic->noVariable,          RHT_PROGRESSIVE_STICK_UPGRADE, true);
+    itemTable[RG_PROGRESSIVE_NUT_UPGRADE] =             Item(RG_PROGRESSIVE_NUT_UPGRADE,          Text{ "Progressive Nut Capacity", "Capacité de Noix (prog.)", "Progressive Nusskapazität" },                      ITEMTYPE_ITEM,              0x87,               true,  &logic->ProgressiveNutBag,   RHT_PROGRESSIVE_NUT_UPGRADE, true);
+    itemTable[RG_PROGRESSIVE_STICK_UPGRADE] =           Item(RG_PROGRESSIVE_STICK_UPGRADE,        Text{ "Progressive Stick Capacity", "Capacité de Bâtons (prog.)", "Progressive Stick-Kapazität" },                ITEMTYPE_ITEM,              0x88,               true,  &logic->ProgressiveStickBag, RHT_PROGRESSIVE_STICK_UPGRADE, true);
     itemTable[RG_PROGRESSIVE_BOMBCHUS] =                Item(RG_PROGRESSIVE_BOMBCHUS,             Text{ "Progressive Bombchu", "Missiles (prog.)", "Progressive Kriechgrube" },                                     ITEMTYPE_ITEM,              0x89,               true,  &logic->Bombchus,            RHT_PROGRESSIVE_BOMBCHUS,   RG_PROGRESSIVE_BOMBCHUS,        OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER, true);
     itemTable[RG_PROGRESSIVE_MAGIC_METER] =             Item(RG_PROGRESSIVE_MAGIC_METER,          Text{ "Progressive Magic Meter", "Jauge de Magie (prog.)", "Progressives magisches Messgerät" },                  ITEMTYPE_ITEM,              0x8A,               true,  &logic->ProgressiveMagic,    RHT_PROGRESSIVE_MAGIC_METER, true);
     itemTable[RG_PROGRESSIVE_OCARINA] =                 Item(RG_PROGRESSIVE_OCARINA,              Text{ "Progressive Ocarina", "Ocarina (prog.)", "Progressive Okarina" },                                          ITEMTYPE_ITEM,              0x8B,               true,  &logic->ProgressiveOcarina,  RHT_PROGRESSIVE_OCARINA, true);
@@ -289,6 +289,10 @@ void Rando::StaticData::InitItemTable() {
     itemTable[RG_BRONZE_SCALE] = Item(RG_BRONZE_SCALE, Text{ "Bronze Scale", "!!!", "!!!" }, ITEMTYPE_ITEM, GI_SCALE_SILVER, true, &logic->ProgressiveWallet, RHT_BRONZE_SCALE, RG_BRONZE_SCALE, OBJECT_GI_SCALE, GID_SCALE_SILVER, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
     itemTable[RG_BRONZE_SCALE].SetCustomDrawFunc(Randomizer_DrawBronzeScale);
 
+    itemTable[RG_DEKU_STICK_BAG] = Item(RG_DEKU_STICK_BAG, Text{ "Deku Stick Bag", "!!!", "!!!" }, ITEMTYPE_ITEM, GI_STICK_UPGRADE_30, true, &logic->ProgressiveStickBag, RHT_NONE, RG_DEKU_STICK_BAG, OBJECT_GI_STICK, GID_STICK, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
+
+    itemTable[RG_DEKU_NUT_BAG] = Item(RG_DEKU_NUT_BAG, Text{ "Deku Nut Bag", "!!!", "!!!" }, ITEMTYPE_ITEM, GI_NUT_UPGRADE_30, true, &logic->ProgressiveNutBag, RHT_NONE, RG_DEKU_NUT_BAG, OBJECT_GI_NUTS, GID_NUTS, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
+
     itemTable[RG_TRIFORCE] =                            Item(RG_TRIFORCE,                         Text{ "Triforce", "Triforce", "Triforce" },                                                                       ITEMTYPE_EVENT,             RG_TRIFORCE,        false, &logic->noVariable,          RHT_NONE);
     itemTable[RG_HINT] =                                Item(RG_HINT,                             Text{ "Hint", "Indice", "Hinweis" },                                                                              ITEMTYPE_EVENT,             RG_HINT,            false, &logic->noVariable,          RHT_NONE);
     // Individual stages of progressive items (only here for GetItemEntry purposes, not for use in seed gen)
@@ -314,10 +318,10 @@ void Rando::StaticData::InitItemTable() {
     itemTable[RG_GIANT_WALLET] =                        Item(RG_GIANT_WALLET,                     Text{ "Giant Wallet", "Bourse de Géant", "Riesige Geldbörse" },                                                   ITEMTYPE_ITEM,              GI_WALLET_GIANT,    true,  &logic->ProgressiveWallet,   RHT_GIANT_WALLET,           ITEM_WALLET_GIANT,              OBJECT_GI_PURSE,        GID_WALLET_GIANT,   0x5F,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
     itemTable[RG_TYCOON_WALLET] =                       Item(RG_TYCOON_WALLET,                    Text{ "Tycoon Wallet", "Bourse de Magnat", "Reiche Geldbörse" },                                                  ITEMTYPE_ITEM,              RG_TYCOON_WALLET,   true,  &logic->ProgressiveWallet,   RHT_TYCOON_WALLET,          RG_TYCOON_WALLET,               OBJECT_GI_PURSE,        GID_WALLET_GIANT,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
     itemTable[RG_CHILD_WALLET] =                        Item(RG_CHILD_WALLET,                     Text{ "Child Wallet", "Bourse de Magnat", "Reiche Geldbörse" },/*FIXME: still says tycoon in french & german*/    ITEMTYPE_ITEM,              RG_CHILD_WALLET,    true,  &logic->ProgressiveWallet,   RHT_CHILD_WALLET,           RG_CHILD_WALLET,                OBJECT_GI_PURSE,        GID_WALLET_ADULT,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_DEKU_NUT_CAPACITY_30] =                Item(RG_DEKU_NUT_CAPACITY_30,             Text{ "Deku Nut Capacity (30)", "Capacité de noix Mojo (30)", "Deku Nuss Kapazität (30)" },                       ITEMTYPE_ITEM,              GI_NUT_UPGRADE_30,  false, &logic->noVariable,          RHT_DEKU_NUT_CAPACITY_30,   ITEM_NUT_UPGRADE_30,            OBJECT_GI_NUTS,         GID_NUTS,           0xA7,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_DEKU_NUT_CAPACITY_40] =                Item(RG_DEKU_NUT_CAPACITY_40,             Text{ "Deku Nut Capacity (40)", "Capacité de noix Mojo (40)", "Deku Nuss Kapazität (40)" },                       ITEMTYPE_ITEM,              GI_NUT_UPGRADE_40,  false, &logic->noVariable,          RHT_DEKU_NUT_CAPACITY_40,   ITEM_NUT_UPGRADE_40,            OBJECT_GI_NUTS,         GID_NUTS,           0xA8,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_DEKU_STICK_CAPACITY_20] =              Item(RG_DEKU_STICK_CAPACITY_20,           Text{ "Deku Stick Capacity (20)", "Capacité de Bâtons Mojo (20)", "Deku Stick Kapazität (20)" },                  ITEMTYPE_ITEM,              GI_STICK_UPGRADE_20,false, &logic->noVariable,          RHT_DEKU_STICK_CAPACITY_20, ITEM_STICK_UPGRADE_20,          OBJECT_GI_STICK,        GID_STICK,          0x90,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_DEKU_STICK_CAPACITY_30] =              Item(RG_DEKU_STICK_CAPACITY_30,           Text{ "Deku Stick Capacity (30)", "Capacité de Bâtons Mojo (30)", "Deku Stick Kapazität (30)" },                  ITEMTYPE_ITEM,              GI_STICK_UPGRADE_30,false, &logic->noVariable,          RHT_DEKU_STICK_CAPACITY_30, ITEM_STICK_UPGRADE_30,          OBJECT_GI_STICK,        GID_STICK,          0x91,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_DEKU_NUT_CAPACITY_30] =                Item(RG_DEKU_NUT_CAPACITY_30,             Text{ "Deku Nut Capacity (30)", "Capacité de noix Mojo (30)", "Deku Nuss Kapazität (30)" },                       ITEMTYPE_ITEM,              GI_NUT_UPGRADE_30,  true,  &logic->ProgressiveNutBag,   RHT_DEKU_NUT_CAPACITY_30,   ITEM_NUT_UPGRADE_30,            OBJECT_GI_NUTS,         GID_NUTS,           0xA7,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_DEKU_NUT_CAPACITY_40] =                Item(RG_DEKU_NUT_CAPACITY_40,             Text{ "Deku Nut Capacity (40)", "Capacité de noix Mojo (40)", "Deku Nuss Kapazität (40)" },                       ITEMTYPE_ITEM,              GI_NUT_UPGRADE_40,  true,  &logic->ProgressiveNutBag,   RHT_DEKU_NUT_CAPACITY_40,   ITEM_NUT_UPGRADE_40,            OBJECT_GI_NUTS,         GID_NUTS,           0xA8,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_DEKU_STICK_CAPACITY_20] =              Item(RG_DEKU_STICK_CAPACITY_20,           Text{ "Deku Stick Capacity (20)", "Capacité de Bâtons Mojo (20)", "Deku Stick Kapazität (20)" },                  ITEMTYPE_ITEM,              GI_STICK_UPGRADE_20,true,  &logic->ProgressiveStickBag, RHT_DEKU_STICK_CAPACITY_20, ITEM_STICK_UPGRADE_20,          OBJECT_GI_STICK,        GID_STICK,          0x90,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_DEKU_STICK_CAPACITY_30] =              Item(RG_DEKU_STICK_CAPACITY_30,           Text{ "Deku Stick Capacity (30)", "Capacité de Bâtons Mojo (30)", "Deku Stick Kapazität (30)" },                  ITEMTYPE_ITEM,              GI_STICK_UPGRADE_30,true,  &logic->ProgressiveStickBag, RHT_DEKU_STICK_CAPACITY_30, ITEM_STICK_UPGRADE_30,          OBJECT_GI_STICK,        GID_STICK,          0x91,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
     itemTable[RG_MAGIC_SINGLE] =                        Item(RG_MAGIC_SINGLE,                     Text{ "Magic Meter", "Jauge de Magie", "Magisches Messgerät" },                                                   ITEMTYPE_ITEM,              0x8A,               true,  &logic->ProgressiveMagic,    RHT_MAGIC_SINGLE,           RG_MAGIC_SINGLE,                OBJECT_GI_MAGICPOT,     GID_MAGIC_SMALL,    0xE4,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_MAGIC_DOUBLE] =                        Item(RG_MAGIC_DOUBLE,                     Text{ "Enhanced Magic Meter", "Jauge de Magie améliorée", "Verbesserte Magieanzeige" },                           ITEMTYPE_ITEM,              0x8A,               true,  &logic->ProgressiveMagic,    RHT_MAGIC_DOUBLE,           RG_MAGIC_DOUBLE,                OBJECT_GI_MAGICPOT,     GID_MAGIC_LARGE,    0xE8,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
     itemTable[RG_TRIFORCE_PIECE] =                      Item(RG_TRIFORCE_PIECE,                   Text{ "Triforce Piece", "Triforce Piece", "Triforce Piece" },                                                     ITEMTYPE_ITEM,              0xDF,               true,  &logic->TriforcePieces,      RHT_TRIFORCE_PIECE,         RG_TRIFORCE_PIECE,              OBJECT_GI_BOMB_2,       GID_TRIFORCE_PIECE, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
diff --git a/soh/soh/Enhancements/randomizer/logic.cpp b/soh/soh/Enhancements/randomizer/logic.cpp
index 56ed191c0..b1fa969d0 100644
--- a/soh/soh/Enhancements/randomizer/logic.cpp
+++ b/soh/soh/Enhancements/randomizer/logic.cpp
@@ -297,8 +297,8 @@ namespace Rando {
 
         //refills
         Bombs        = BombBag;
-        Nuts         = DekuNutDrop || Nuts;
-        Sticks       = DekuStickDrop || Sticks;
+        Nuts         = (ProgressiveNutBag != 0 && DekuNutDrop) || Nuts;
+        Sticks       = (ProgressiveStickBag != 0 && DekuStickDrop) || Sticks;
         Bugs         = HasBottle && BugsAccess;
         BlueFire     = (HasBottle && BlueFireAccess) || (ctx->GetOption(RSK_BLUE_FIRE_ARROWS) && CanUse(RG_ICE_ARROWS));
         Fish         = HasBottle && FishAccess;
@@ -626,6 +626,8 @@ namespace Rando {
         OcarinaCDownButton = ctx->GetOption(RSK_SHUFFLE_OCARINA_BUTTONS).Is(true) ? 0 : 1;
 
         //Progressive Items
+        ProgressiveStickBag   = ctx->GetOption(RSK_SHUFFLE_DEKU_STICK_BAG).Is(true) ? 0 : 1;
+        ProgressiveNutBag     = ctx->GetOption(RSK_SHUFFLE_DEKU_NUT_BAG).Is(true) ? 0 : 1;
         ProgressiveBulletBag  = 0;
         ProgressiveBombBag    = 0;
         ProgressiveMagic      = 0;
diff --git a/soh/soh/Enhancements/randomizer/logic.h b/soh/soh/Enhancements/randomizer/logic.h
index 5475d4d92..16213049d 100644
--- a/soh/soh/Enhancements/randomizer/logic.h
+++ b/soh/soh/Enhancements/randomizer/logic.h
@@ -140,6 +140,8 @@ class Logic {
     bool GregInLacsLogic = false;
 
     // Progressive Items
+    uint8_t ProgressiveStickBag = 0;
+    uint8_t ProgressiveNutBag = 0;
     uint8_t ProgressiveBulletBag = 0;
     uint8_t ProgressiveBombBag = 0;
     uint8_t ProgressiveMagic = 0;
diff --git a/soh/soh/Enhancements/randomizer/option_descriptions.cpp b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
index 784d9d1f3..3e91715c4 100644
--- a/soh/soh/Enhancements/randomizer/option_descriptions.cpp
+++ b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
@@ -249,6 +249,12 @@ void Settings::CreateOptionDescriptions() {
     mOptionDescriptions[RSK_SHUFFLE_FISHING_POLE] = "Shuffles the fishing pole into the item pool.\n"
         "\n"
         "The fishing pole is required to play the fishing pond minigame.";
+    mOptionDescriptions[RSK_SHUFFLE_DEKU_STICK_BAG] = "Shuffles the deku stick bag into the item pool.\n"
+        "\n"
+        "The deku stick bag is required to hold deku sticks.";
+    mOptionDescriptions[RSK_SHUFFLE_DEKU_NUT_BAG] = "Shuffles the deku nut bag into the item pool.\n"
+        "\n"
+        "The deku nut bag is required to hold deku nuts.";
     mOptionDescriptions[RSK_SHOPSANITY] = "Off - All shop items will be the same as vanilla.\n"
                                           "\n"
                                           "0 Items - Vanilla shop items will be shuffled among different shops.\n"
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index e75e03ee6..303a6bbfd 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -397,8 +397,16 @@ ItemObtainability Randomizer::GetItemObtainabilityFromRandomizerGet(RandomizerGe
         // Inventory Items
         case RG_PROGRESSIVE_STICK_UPGRADE:
             return CUR_UPG_VALUE(UPG_STICKS) < 3 ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE;
+        case RG_DEKU_STICK_1:
+        case RG_BUY_DEKU_STICK_1:
+            return CUR_UPG_VALUE(UPG_STICKS) ? CAN_OBTAIN : CANT_OBTAIN_NEED_UPGRADE;
         case RG_PROGRESSIVE_NUT_UPGRADE:
             return CUR_UPG_VALUE(UPG_NUTS) < 3 ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE;
+        case RG_DEKU_NUTS_5:
+        case RG_DEKU_NUTS_10:
+        case RG_BUY_DEKU_NUTS_5:
+        case RG_BUY_DEKU_NUTS_10:
+            return CUR_UPG_VALUE(UPG_NUTS) ? CAN_OBTAIN : CANT_OBTAIN_NEED_UPGRADE;
         case RG_PROGRESSIVE_BOMB_BAG:
             return CUR_UPG_VALUE(UPG_BOMB_BAG) < 3 ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE;
         case RG_BOMBS_5:
@@ -694,14 +702,8 @@ ItemObtainability Randomizer::GetItemObtainabilityFromRandomizerGet(RandomizerGe
         case RG_PIECE_OF_HEART:
         case RG_HEART_CONTAINER:
         case RG_ICE_TRAP:
-        case RG_DEKU_NUTS_5:
-        case RG_DEKU_NUTS_10:
-        case RG_DEKU_STICK_1:
         case RG_TREASURE_GAME_HEART:
         case RG_TREASURE_GAME_GREEN_RUPEE:
-        case RG_BUY_DEKU_NUTS_5:
-        case RG_BUY_DEKU_NUTS_10:
-        case RG_BUY_DEKU_STICK_1:
         case RG_BUY_HEART:
         case RG_TRIFORCE_PIECE:
         default:
@@ -2952,7 +2954,7 @@ CustomMessage Randomizer::GetGoronMessage(u16 index) {
 void Randomizer::CreateCustomMessages() {
     // RANDTODO: Translate into french and german and replace GIMESSAGE_UNTRANSLATED
     // with GIMESSAGE(getItemID, itemID, english, german, french).
-    const std::array<GetItemMessage, 74> getItemMessages = {{
+    const std::array<GetItemMessage, 76> getItemMessages = {{
         GIMESSAGE(RG_GREG_RUPEE, ITEM_MASK_GORON, 
 			"You found %gGreg%w!",
 			"%gGreg%w! Du hast ihn wirklich gefunden!",
@@ -3224,6 +3226,8 @@ void Randomizer::CreateCustomMessages() {
 			"Vous trouvez la %rtouche %y\xa6%r de&l'Ocarina%w! Vous pouvez&maintenant l'utiliser lorsque&vous en jouez!"),
         GIMESSAGE_UNTRANSLATED(RG_BRONZE_SCALE, ITEM_SCALE_SILVER, "You got the %rBronze Scale%w!&The power of buoyancy is yours!"),
         GIMESSAGE_UNTRANSLATED(RG_FISHING_POLE, ITEM_FISHING_POLE, "You found a lost %rFishing Pole%w!&Time to hit the pond!"),
+        GIMESSAGE_UNTRANSLATED(RG_DEKU_STICK_BAG, ITEM_STICK, "You found the %rDeku Stick Bag%w!&You can now hold deku sticks!"),
+        GIMESSAGE_UNTRANSLATED(RG_DEKU_NUT_BAG, ITEM_NUT, "You found the %rDeku Nut Bag%w!&You can now hold deku nuts!"),
     }};
     CreateGetItemMessages(&getItemMessages);
     CreateRupeeMessages();
diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h
index 80d62859c..d15d3d4a3 100644
--- a/soh/soh/Enhancements/randomizer/randomizerTypes.h
+++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@@ -1980,6 +1980,8 @@ typedef enum {
     RG_OCARINA_C_LEFT_BUTTON,
     RG_OCARINA_C_RIGHT_BUTTON,
     RG_FISHING_POLE,
+    RG_DEKU_STICK_BAG,
+    RG_DEKU_NUT_BAG,
     RG_HINT,
     RG_TYCOON_WALLET,
     RG_BRONZE_SCALE,
@@ -3711,6 +3713,8 @@ typedef enum {
     RSK_FISHSANITY_POND_COUNT,
     RSK_FISHSANITY_AGE_SPLIT,
     RSK_SHUFFLE_FISHING_POLE,
+    RSK_SHUFFLE_DEKU_STICK_BAG,
+    RSK_SHUFFLE_DEKU_NUT_BAG,
     RSK_MAX
 } RandomizerSettingKey;
 
diff --git a/soh/soh/Enhancements/randomizer/savefile.cpp b/soh/soh/Enhancements/randomizer/savefile.cpp
index 4900e4a70..8859e8d43 100644
--- a/soh/soh/Enhancements/randomizer/savefile.cpp
+++ b/soh/soh/Enhancements/randomizer/savefile.cpp
@@ -150,8 +150,12 @@ void SetStartingItems() {
     }
 
     if (Randomizer_GetSettingValue(RSK_STARTING_CONSUMABLES)) {
-        GiveLinkDekuSticks(10);
-        GiveLinkDekuNuts(20);
+        if (!Randomizer_GetSettingValue(RSK_SHUFFLE_DEKU_STICK_BAG)) {
+            GiveLinkDekuSticks(10);
+        }
+        if (!Randomizer_GetSettingValue(RSK_SHUFFLE_DEKU_NUT_BAG)) {
+            GiveLinkDekuNuts(20);
+        }
     }
 
     if (Randomizer_GetSettingValue(RSK_FULL_WALLETS)) {
diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
index 883a7c208..745593ef5 100644
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -120,6 +120,8 @@ void Settings::CreateOptions() {
     mOptions[RSK_SHUFFLE_CHEST_MINIGAME] = Option::U8("Shuffle Chest Minigame", {"Off", "On (Separate)", "On (Pack)"});
     mOptions[RSK_SHUFFLE_100_GS_REWARD] = Option::Bool("Shuffle 100 GS Reward", CVAR_RANDOMIZER_SETTING("Shuffle100GSReward"), mOptionDescriptions[RSK_SHUFFLE_100_GS_REWARD], IMFLAG_SEPARATOR_BOTTOM, WidgetType::Checkbox, RO_GENERIC_OFF);
     mOptions[RSK_SHUFFLE_BOSS_SOULS] = Option::U8("Shuffle Boss Souls", {"Off", "On", "On + Ganon"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleBossSouls"), mOptionDescriptions[RSK_SHUFFLE_BOSS_SOULS], WidgetType::Combobox);
+    mOptions[RSK_SHUFFLE_DEKU_STICK_BAG] = Option::Bool("Shuffle Deku Stick Bag", CVAR_RANDOMIZER_SETTING("ShuffleDekuStickBag"), mOptionDescriptions[RSK_SHUFFLE_DEKU_STICK_BAG], IMFLAG_SEPARATOR_BOTTOM, WidgetType::Checkbox, RO_GENERIC_OFF);
+    mOptions[RSK_SHUFFLE_DEKU_NUT_BAG] = Option::Bool("Shuffle Deku Nut Bag", CVAR_RANDOMIZER_SETTING("ShuffleDekuNutBag"), mOptionDescriptions[RSK_SHUFFLE_DEKU_NUT_BAG], IMFLAG_SEPARATOR_BOTTOM, WidgetType::Checkbox, RO_GENERIC_OFF);
     mOptions[RSK_FISHSANITY] = Option::U8("Fishsanity", {"Off", "Shuffle Fishing Pond", "Shuffle Overworld Fish", "Shuffle Both"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("Fishsanity"), mOptionDescriptions[RSK_FISHSANITY], WidgetType::Combobox, RO_FISHSANITY_OFF);
     mOptions[RSK_FISHSANITY_POND_COUNT] = Option::U8("Pond Fish Count", {NumOpts(0,17,1)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("FishsanityPondCount"), mOptionDescriptions[RSK_FISHSANITY_POND_COUNT], WidgetType::Slider, 0, true, IMFLAG_NONE);
     mOptions[RSK_FISHSANITY_AGE_SPLIT] = Option::Bool("Pond Age Split", CVAR_RANDOMIZER_SETTING("FishsanityAgeSplit"), mOptionDescriptions[RSK_FISHSANITY_AGE_SPLIT]);
@@ -662,6 +664,8 @@ void Settings::CreateOptions() {
         &mOptions[RSK_SHUFFLE_WEIRD_EGG],
         &mOptions[RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD],
         &mOptions[RSK_SHUFFLE_FISHING_POLE],
+        &mOptions[RSK_SHUFFLE_DEKU_STICK_BAG],
+        &mOptions[RSK_SHUFFLE_DEKU_NUT_BAG],
     }, false, WidgetContainerType::COLUMN);
     mOptionGroups[RSG_SHUFFLE_NPCS_IMGUI] = OptionGroup::SubGroup("Shuffle NPCs & Merchants", {
         &mOptions[RSK_SHOPSANITY],
@@ -889,6 +893,8 @@ void Settings::CreateOptions() {
         &mOptions[RSK_SHUFFLE_CHEST_MINIGAME],
         &mOptions[RSK_SHUFFLE_100_GS_REWARD],
         &mOptions[RSK_SHUFFLE_BOSS_SOULS],
+        &mOptions[RSK_SHUFFLE_DEKU_STICK_BAG],
+        &mOptions[RSK_SHUFFLE_DEKU_NUT_BAG],
     });
     mOptionGroups[RSG_SHUFFLE_DUNGEON_ITEMS] = OptionGroup("Shuffle Dungeon Items", {
         &mOptions[RSK_SHUFFLE_MAPANDCOMPASS],
@@ -1117,6 +1123,8 @@ void Settings::CreateOptions() {
         { "Shuffle Settings:Shuffle Merchants", RSK_SHUFFLE_MERCHANTS },
         { "Shuffle Settings:Shuffle 100 GS Reward", RSK_SHUFFLE_100_GS_REWARD },
         { "Shuffle Settings:Shuffle Boss Souls", RSK_SHUFFLE_BOSS_SOULS },
+        { "Shuffle Settings:Shuffle Deku Stick Bag", RSK_SHUFFLE_DEKU_STICK_BAG },
+        { "Shuffle Settings:Shuffle Deku Nut Bag", RSK_SHUFFLE_DEKU_NUT_BAG },
         { "Start with Deku Shield", RSK_STARTING_DEKU_SHIELD },
         { "Start with Kokiri Sword", RSK_STARTING_KOKIRI_SWORD },
         { "Start with Fairy Ocarina", RSK_STARTING_OCARINA },
diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c
index 658e96394..2f39ade8c 100644
--- a/soh/src/code/z_parameter.c
+++ b/soh/src/code/z_parameter.c
@@ -1926,6 +1926,26 @@ u8 Return_Item(u8 itemID, ModIndex modId, ItemID returnItem) {
  * @return u8 
  */
 u8 Item_Give(PlayState* play, u8 item) {
+    //prevents getting sticks without the bag in case something got missed
+    if (
+        IS_RANDO &&
+        (item == ITEM_STICK || item == ITEM_STICKS_5 || item == ITEM_STICKS_10) &&
+        Randomizer_GetSettingValue(RSK_SHUFFLE_DEKU_STICK_BAG) &&
+        CUR_UPG_VALUE(UPG_STICKS) == 0
+    ) {
+        return;
+    }
+
+    //prevents getting nuts without the bag in case something got missed
+    if (
+        IS_RANDO &&
+        (item == ITEM_NUT || item == ITEM_NUTS_5 || item == ITEM_NUTS_10) &&
+        Randomizer_GetSettingValue(RSK_SHUFFLE_DEKU_NUT_BAG) &&
+        CUR_UPG_VALUE(UPG_NUTS) == 0
+    ) {
+        return;
+    }
+
     lusprintf(__FILE__, __LINE__, 2, "Item Give - item: %#x", item);
     static s16 sAmmoRefillCounts[] = { 5, 10, 20, 30, 5, 10, 30, 0, 5, 20, 1, 5, 20, 50, 200, 10 };
     s16 i;
@@ -2776,6 +2796,20 @@ u16 Randomizer_Item_Give(PlayState* play, GetItemEntry giEntry) {
         return Return_Item_Entry(giEntry, RG_NONE);
     }
 
+    if (item == RG_DEKU_STICK_BAG) {
+        Inventory_ChangeUpgrade(UPG_STICKS, 1);
+        INV_CONTENT(ITEM_STICK) = ITEM_STICK;
+        AMMO(ITEM_STICK) = CUR_CAPACITY(UPG_STICKS);
+        return Return_Item_Entry(giEntry, RG_NONE);
+    }
+
+    if (item == RG_DEKU_NUT_BAG) {
+        Inventory_ChangeUpgrade(UPG_NUTS, 1);
+        INV_CONTENT(ITEM_NUT) = ITEM_NUT;
+        AMMO(ITEM_NUT) = CUR_CAPACITY(UPG_NUTS);
+        return Return_Item_Entry(giEntry, RG_NONE);
+    }
+
     temp = gSaveContext.inventory.items[slot];
     osSyncPrintf("Item_Register(%d)=%d  %d\n", slot, item, temp);
     INV_CONTENT(item) = item;
diff --git a/soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.c b/soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.c
index 0382735a3..b005cbf3f 100644
--- a/soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.c
+++ b/soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.c
@@ -487,6 +487,10 @@ s32 EnGirlA_CanBuy_Bombs(PlayState* play, EnGirlA* this) {
 }
 
 s32 EnGirlA_CanBuy_DekuNuts(PlayState* play, EnGirlA* this) {
+    if (IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_DEKU_NUT_BAG) && CUR_CAPACITY(UPG_NUTS) == 0) {
+        return CANBUY_RESULT_CANT_GET_NOW;
+    }
+
     if ((CUR_CAPACITY(UPG_NUTS) != 0) && (AMMO(ITEM_NUT) >= CUR_CAPACITY(UPG_NUTS))) {
         return CANBUY_RESULT_CANT_GET_NOW;
     }
@@ -500,6 +504,10 @@ s32 EnGirlA_CanBuy_DekuNuts(PlayState* play, EnGirlA* this) {
 }
 
 s32 EnGirlA_CanBuy_DekuSticks(PlayState* play, EnGirlA* this) {
+    if (IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_DEKU_STICK_BAG) && CUR_CAPACITY(UPG_STICKS) == 0) {
+        return CANBUY_RESULT_CANT_GET_NOW;
+    }
+
     if ((CUR_CAPACITY(UPG_STICKS) != 0) && (AMMO(ITEM_STICK) >= CUR_CAPACITY(UPG_STICKS))) {
         return CANBUY_RESULT_CANT_GET_NOW;
     }

From 7595a5a65e86ad6a61d7bd642f5907f624a7d725 Mon Sep 17 00:00:00 2001
From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Date: Wed, 17 Jul 2024 17:45:29 +0100
Subject: [PATCH 163/230] fix selection only and make MQ dungeon settings set
 themselves more smartley (#4232)

---
 .../randomizer/3drando/random.hpp             |   1 +
 soh/soh/Enhancements/randomizer/dungeon.cpp   |  34 ++--
 soh/soh/Enhancements/randomizer/dungeon.h     |   7 +-
 .../randomizer/option_descriptions.cpp        |   3 +-
 .../randomizer/randomizer_check_objects.cpp   |  10 +-
 soh/soh/Enhancements/randomizer/settings.cpp  | 179 +++++++++++-------
 6 files changed, 149 insertions(+), 85 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/random.hpp b/soh/soh/Enhancements/randomizer/3drando/random.hpp
index c8ccf0f50..623c396a1 100644
--- a/soh/soh/Enhancements/randomizer/3drando/random.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/random.hpp
@@ -30,6 +30,7 @@ const auto& RandomElement(const Container& container) {
 }
 
 //Shuffle items within a vector or array
+//RANDOTODO There's probably a more efficient way to do what this does.
 template <typename T>
 void Shuffle(std::vector<T>& vector) {
     for (std::size_t i = 0; i + 1 < vector.size(); i++)
diff --git a/soh/soh/Enhancements/randomizer/dungeon.cpp b/soh/soh/Enhancements/randomizer/dungeon.cpp
index 8453c938b..0f799b036 100644
--- a/soh/soh/Enhancements/randomizer/dungeon.cpp
+++ b/soh/soh/Enhancements/randomizer/dungeon.cpp
@@ -8,10 +8,12 @@ namespace Rando {
 DungeonInfo::DungeonInfo(std::string name_, const RandomizerHintTextKey hintKey_, const RandomizerGet map_,
     const RandomizerGet compass_, const RandomizerGet smallKey_, const RandomizerGet keyRing_,
     const RandomizerGet bossKey_, RandomizerArea area_, const uint8_t vanillaKeyCount_, const uint8_t mqKeyCount_,
+    const RandomizerSettingKey mqSetting_,
     std::vector<RandomizerCheck> vanillaLocations_, std::vector<RandomizerCheck> mqLocations_,
     std::vector<RandomizerCheck> sharedLocations_, std::vector<RandomizerCheck> bossRoomLocations_)
     : name(std::move(name_)), hintKey(hintKey_), map(map_), compass(compass_), smallKey(smallKey_), keyRing(keyRing_),
       bossKey(bossKey_), area(area_), vanillaKeyCount(vanillaKeyCount_), mqKeyCount(mqKeyCount_),
+      mqSetting(mqSetting_),
       vanillaLocations(std::move(vanillaLocations_)), mqLocations(std::move(mqLocations_)),
       sharedLocations(std::move(sharedLocations_)), bossRoomLocations(std::move(bossRoomLocations_)) {
 }
@@ -83,6 +85,14 @@ RandomizerGet DungeonInfo::GetBossKey() const {
     return bossKey;
 }
 
+RandomizerSettingKey DungeonInfo::GetMQSetting() const {
+    return mqSetting;
+}
+
+void DungeonInfo::SetDungeonKnown(bool known) {
+    isDungeonModeKnown = known;
+}
+
 void DungeonInfo::PlaceVanillaMap() const {
     if (map == RG_NONE) {
         return;
@@ -152,7 +162,7 @@ std::vector<RandomizerCheck> DungeonInfo::GetEveryLocation() const {
 
 Dungeons::Dungeons() {
     dungeonList[DEKU_TREE] =
-        DungeonInfo("Deku Tree", RHT_DEKU_TREE, RG_DEKU_TREE_MAP, RG_DEKU_TREE_COMPASS, RG_NONE, RG_NONE, RG_NONE, RA_DEKU_TREE, 0, 0,
+        DungeonInfo("Deku Tree", RHT_DEKU_TREE, RG_DEKU_TREE_MAP, RG_DEKU_TREE_COMPASS, RG_NONE, RG_NONE, RG_NONE, RA_DEKU_TREE, 0, 0, RSK_MQ_DEKU_TREE,
                     {
                         // Vanilla Locations
                         RC_DEKU_TREE_MAP_CHEST,
@@ -188,7 +198,7 @@ Dungeons::Dungeons() {
                         RC_QUEEN_GOHMA,
                     });
     dungeonList[DODONGOS_CAVERN] = DungeonInfo("Dodongo's Cavern", RHT_DODONGOS_CAVERN, RG_DODONGOS_CAVERN_MAP,
-                                               RG_DODONGOS_CAVERN_COMPASS, RG_NONE, RG_NONE, RG_NONE, RA_DODONGOS_CAVERN, 0, 0,
+                                               RG_DODONGOS_CAVERN_COMPASS, RG_NONE, RG_NONE, RG_NONE, RA_DODONGOS_CAVERN, 0, 0, RSK_MQ_DODONGOS_CAVERN,
                                                {
                                                    // Vanilla Locations
                                                    RC_DODONGOS_CAVERN_MAP_CHEST,
@@ -232,7 +242,7 @@ Dungeons::Dungeons() {
                                                    RC_KING_DODONGO,
                                                });
     dungeonList[JABU_JABUS_BELLY] = DungeonInfo("Jabu Jabu's Belly", RHT_JABU_JABUS_BELLY, RG_JABU_JABUS_BELLY_MAP,
-                                                RG_JABU_JABUS_BELLY_COMPASS, RG_NONE, RG_NONE, RG_NONE, RA_JABU_JABUS_BELLY, 0, 0,
+                                                RG_JABU_JABUS_BELLY_COMPASS, RG_NONE, RG_NONE, RG_NONE, RA_JABU_JABUS_BELLY, 0, 0, RSK_MQ_JABU_JABU,
                                                 {
                                                     // Vanilla Locations
                                                     RC_JABU_JABUS_BELLY_MAP_CHEST,
@@ -271,7 +281,7 @@ Dungeons::Dungeons() {
                                                 });
     dungeonList[FOREST_TEMPLE] =
         DungeonInfo("Forest Temple", RHT_FOREST_TEMPLE, RG_FOREST_TEMPLE_MAP, RG_FOREST_TEMPLE_COMPASS,
-                    RG_FOREST_TEMPLE_SMALL_KEY, RG_FOREST_TEMPLE_KEY_RING, RG_FOREST_TEMPLE_BOSS_KEY, RA_FOREST_TEMPLE, 5, 6,
+                    RG_FOREST_TEMPLE_SMALL_KEY, RG_FOREST_TEMPLE_KEY_RING, RG_FOREST_TEMPLE_BOSS_KEY, RA_FOREST_TEMPLE, 5, 6, RSK_MQ_FOREST_TEMPLE,
                     {
                         // Vanilla Locations
                         RC_FOREST_TEMPLE_FIRST_ROOM_CHEST,
@@ -321,7 +331,7 @@ Dungeons::Dungeons() {
                     });
     dungeonList[FIRE_TEMPLE] =
         DungeonInfo("Fire Temple", RHT_FIRE_TEMPLE, RG_FIRE_TEMPLE_MAP, RG_FIRE_TEMPLE_COMPASS,
-                    RG_FIRE_TEMPLE_SMALL_KEY, RG_FIRE_TEMPLE_KEY_RING, RG_FIRE_TEMPLE_BOSS_KEY, RA_FIRE_TEMPLE, 8, 5,
+                    RG_FIRE_TEMPLE_SMALL_KEY, RG_FIRE_TEMPLE_KEY_RING, RG_FIRE_TEMPLE_BOSS_KEY, RA_FIRE_TEMPLE, 8, 5, RSK_MQ_FIRE_TEMPLE,
                     {
                         // Vanilla Locations
                         RC_FIRE_TEMPLE_NEAR_BOSS_CHEST,
@@ -372,7 +382,7 @@ Dungeons::Dungeons() {
                     });
     dungeonList[WATER_TEMPLE] =
         DungeonInfo("Water Temple", RHT_WATER_TEMPLE, RG_WATER_TEMPLE_MAP, RG_WATER_TEMPLE_COMPASS,
-                    RG_WATER_TEMPLE_SMALL_KEY, RG_WATER_TEMPLE_KEY_RING, RG_WATER_TEMPLE_BOSS_KEY, RA_WATER_TEMPLE, 6, 2,
+                    RG_WATER_TEMPLE_SMALL_KEY, RG_WATER_TEMPLE_KEY_RING, RG_WATER_TEMPLE_BOSS_KEY, RA_WATER_TEMPLE, 6, 2, RSK_MQ_WATER_TEMPLE,
                     {
                         // Vanilla Locations
                         RC_WATER_TEMPLE_MAP_CHEST,
@@ -413,7 +423,7 @@ Dungeons::Dungeons() {
                     });
     dungeonList[SPIRIT_TEMPLE] =
         DungeonInfo("Spirit Temple", RHT_SPIRIT_TEMPLE, RG_SPIRIT_TEMPLE_MAP, RG_SPIRIT_TEMPLE_COMPASS,
-                    RG_SPIRIT_TEMPLE_SMALL_KEY, RG_SPIRIT_TEMPLE_KEY_RING, RG_SPIRIT_TEMPLE_BOSS_KEY, RA_SPIRIT_TEMPLE, 5, 7,
+                    RG_SPIRIT_TEMPLE_SMALL_KEY, RG_SPIRIT_TEMPLE_KEY_RING, RG_SPIRIT_TEMPLE_BOSS_KEY, RA_SPIRIT_TEMPLE, 5, 7, RSK_MQ_SPIRIT_TEMPLE,
                     {
                         // Vanilla Locations
                         RC_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST,
@@ -479,7 +489,7 @@ Dungeons::Dungeons() {
                     });
     dungeonList[SHADOW_TEMPLE] =
         DungeonInfo("Shadow Temple", RHT_SHADOW_TEMPLE, RG_SHADOW_TEMPLE_MAP, RG_SHADOW_TEMPLE_COMPASS,
-                    RG_SHADOW_TEMPLE_SMALL_KEY, RG_SHADOW_TEMPLE_KEY_RING, RG_SHADOW_TEMPLE_BOSS_KEY, RA_SHADOW_TEMPLE, 5, 6,
+                    RG_SHADOW_TEMPLE_SMALL_KEY, RG_SHADOW_TEMPLE_KEY_RING, RG_SHADOW_TEMPLE_BOSS_KEY, RA_SHADOW_TEMPLE, 5, 6, RSK_MQ_SHADOW_TEMPLE,
                     {
                         // Vanilla Locations
                         RC_SHADOW_TEMPLE_MAP_CHEST,
@@ -541,7 +551,7 @@ Dungeons::Dungeons() {
                     });
     dungeonList[BOTTOM_OF_THE_WELL] = DungeonInfo(
         "Bottom of the Well", RHT_BOTTOM_OF_THE_WELL, RG_BOTTOM_OF_THE_WELL_MAP, RG_BOTTOM_OF_THE_WELL_COMPASS,
-        RG_BOTTOM_OF_THE_WELL_SMALL_KEY, RG_BOTTOM_OF_THE_WELL_KEY_RING, RG_NONE, RA_BOTTOM_OF_THE_WELL, 3, 2,
+        RG_BOTTOM_OF_THE_WELL_SMALL_KEY, RG_BOTTOM_OF_THE_WELL_KEY_RING, RG_NONE, RA_BOTTOM_OF_THE_WELL, 3, 2, RSK_MQ_BOTTOM_OF_THE_WELL,
         {
             // Vanilla Locations
             RC_BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST,
@@ -575,7 +585,7 @@ Dungeons::Dungeons() {
         },
         {}, {});
     dungeonList[ICE_CAVERN] = DungeonInfo("Ice Cavern", RHT_ICE_CAVERN, RG_ICE_CAVERN_MAP, RG_ICE_CAVERN_COMPASS,
-                                          RG_NONE, RG_NONE, RG_NONE, RA_ICE_CAVERN, 0, 0,
+                                          RG_NONE, RG_NONE, RG_NONE, RA_ICE_CAVERN, 0, 0, RSK_MQ_ICE_CAVERN,
                                           {
                                               // Vanilla Locations
                                               RC_ICE_CAVERN_MAP_CHEST,
@@ -603,7 +613,7 @@ Dungeons::Dungeons() {
                                           {});
     dungeonList[GERUDO_TRAINING_GROUNDS] =
         DungeonInfo("Gerudo Training Grounds", RHT_GERUDO_TRAINING_GROUND, RG_NONE, RG_NONE,
-                    RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, RG_GERUDO_TRAINING_GROUNDS_KEY_RING, RG_NONE, RA_GERUDO_TRAINING_GROUND, 9, 3,
+                    RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, RG_GERUDO_TRAINING_GROUNDS_KEY_RING, RG_NONE, RA_GERUDO_TRAINING_GROUND, 9, 3, RSK_MQ_GTG,
                     {
                         // Vanilla Locations
                         RC_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST,
@@ -652,7 +662,7 @@ Dungeons::Dungeons() {
                     {}, {});
     dungeonList[GANONS_CASTLE] =
         DungeonInfo("Ganon's Castle", RHT_GANONS_CASTLE, RG_NONE, RG_NONE, RG_GANONS_CASTLE_SMALL_KEY,
-                    RG_GANONS_CASTLE_KEY_RING, RG_GANONS_CASTLE_BOSS_KEY, RA_GANONS_CASTLE, 2, 3,
+                    RG_GANONS_CASTLE_KEY_RING, RG_GANONS_CASTLE_BOSS_KEY, RA_GANONS_CASTLE, 2, 3, RSK_MQ_GANONS_CASTLE,
                     {
                         // Vanilla Locations
                         RC_GANONS_CASTLE_FOREST_TRIAL_CHEST,
diff --git a/soh/soh/Enhancements/randomizer/dungeon.h b/soh/soh/Enhancements/randomizer/dungeon.h
index a2338441d..b9176f707 100644
--- a/soh/soh/Enhancements/randomizer/dungeon.h
+++ b/soh/soh/Enhancements/randomizer/dungeon.h
@@ -12,7 +12,8 @@ class DungeonInfo {
   public:
     DungeonInfo(std::string name_, RandomizerHintTextKey hintKey_, RandomizerGet map_, RandomizerGet compass_,
                 RandomizerGet smallKey_, RandomizerGet keyRing_, RandomizerGet bossKey_, RandomizerArea area_, 
-                uint8_t vanillaKeyCount_, uint8_t mqKeyCount_, std::vector<RandomizerCheck> vanillaLocations_,
+                uint8_t vanillaKeyCount_, uint8_t mqKeyCount_, RandomizerSettingKey mqSetting_,
+                std::vector<RandomizerCheck> vanillaLocations_,
                 std::vector<RandomizerCheck> mqLocations_, std::vector<RandomizerCheck> sharedLocations_,
                 std::vector<RandomizerCheck> bossRoomLocations_);
     DungeonInfo();
@@ -34,6 +35,8 @@ class DungeonInfo {
     RandomizerGet GetMap() const;
     RandomizerGet GetCompass() const;
     RandomizerGet GetBossKey() const;
+    RandomizerSettingKey GetMQSetting() const;
+    void SetDungeonKnown(bool known);
     void PlaceVanillaMap() const;
     void PlaceVanillaCompass() const;
     void PlaceVanillaBossKey() const;
@@ -50,6 +53,8 @@ class DungeonInfo {
     RandomizerGet smallKey;
     RandomizerGet keyRing;
     RandomizerGet bossKey;
+    RandomizerSettingKey mqSetting;
+    bool isDungeonModeKnown = true;
     uint8_t vanillaKeyCount{};
     uint8_t mqKeyCount{};
     bool masterQuest = false;
diff --git a/soh/soh/Enhancements/randomizer/option_descriptions.cpp b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
index 3e91715c4..ad5cd4e09 100644
--- a/soh/soh/Enhancements/randomizer/option_descriptions.cpp
+++ b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
@@ -98,7 +98,8 @@ void Settings::CreateOptionDescriptions() {
         "\n"
         "Random Number - A Random number and set of dungeons will be their Master Quest varieties.\n"
         "\n"
-        "Selection Only - Specify which dungeons are Vanilla or Master Quest.";
+        "Selection Only - Specify which dungeons are Vanilla, Master Quest or a 50/50 between the two.\n"
+        "Differs from Random Number in that they are rolled individually, making the exact total a bell curve.";
     mOptionDescriptions[RSK_MQ_DUNGEON_SET] =
                 "Choose specific Dungeons to be Master Quest or Vanilla.\n"
                 "\n"
diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp
index d6fc3fefd..ddedd5b53 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp
@@ -112,12 +112,12 @@ void RandomizerCheckObjects::UpdateImGuiVisibility() {
             (location.GetRandomizerCheck() != RC_UNKNOWN_CHECK) &&
             (!RandomizerCheckObjects::AreaIsDungeon(location.GetArea()) || location.GetQuest() == RCQUEST_BOTH ||
              location.GetQuest() == RCQUEST_MQ &&
-                 ((CVarGetInteger(CVAR_RANDOMIZER_SETTING("MqDungeons"), RO_MQ_DUNGEONS_NONE) == RO_MQ_DUNGEONS_SET_NUMBER &&
-                       (CVarGetInteger(CVAR_RANDOMIZER_SETTING("MqDungeonCount"), 12) > 0) || // at least one MQ dungeon
-                   CVarGetInteger(CVAR_RANDOMIZER_SETTING("MqDungeons"), RO_MQ_DUNGEONS_NONE) == RO_MQ_DUNGEONS_RANDOM_NUMBER)) ||
+                 ((CVarGetInteger(CVAR_RANDOMIZER_SETTING("MQDungeons"), RO_MQ_DUNGEONS_NONE) == RO_MQ_DUNGEONS_SET_NUMBER &&
+                       (CVarGetInteger(CVAR_RANDOMIZER_SETTING("MQDungeonCount"), 12) > 0) || // at least one MQ dungeon
+                   CVarGetInteger(CVAR_RANDOMIZER_SETTING("MQDungeons"), RO_MQ_DUNGEONS_NONE) == RO_MQ_DUNGEONS_RANDOM_NUMBER)) ||
              location.GetQuest() == RCQUEST_VANILLA &&
-                 (CVarGetInteger(CVAR_RANDOMIZER_SETTING("MqDungeons"), RO_MQ_DUNGEONS_NONE) != RO_MQ_DUNGEONS_SET_NUMBER ||
-                  CVarGetInteger(CVAR_RANDOMIZER_SETTING("MqDungeonCount"), 12) < 12) // at least one vanilla dungeon
+                 (CVarGetInteger(CVAR_RANDOMIZER_SETTING("MQDungeons"), RO_MQ_DUNGEONS_NONE) != RO_MQ_DUNGEONS_SET_NUMBER ||
+                  CVarGetInteger(CVAR_RANDOMIZER_SETTING("MQDungeonCount"), 12) < 12) // at least one vanilla dungeon
              ) &&
             (location.GetRCType() != RCTYPE_SHOP ||
              CVarGetInteger(CVAR_RANDOMIZER_SETTING("Shopsanity"), RO_SHOPSANITY_OFF) > RO_SHOPSANITY_ZERO_ITEMS) &&
diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
index 745593ef5..80007b564 100644
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -1486,7 +1486,7 @@ void Settings::UpdateOptionProperties() {
     } else {
         // If any MQ Options are available, show the MQ Dungeon Randomization Combobox
         mOptions[RSK_MQ_DUNGEON_RANDOM].Unhide();
-        switch(CVarGetInteger(CVAR_RANDOMIZER_SETTING("MqDungeons"), RO_MQ_DUNGEONS_NONE)) {
+        switch(CVarGetInteger(CVAR_RANDOMIZER_SETTING("MQDungeons"), RO_MQ_DUNGEONS_NONE)) {
             // If No MQ Dungeons, add a separator after the combobx and hide
             // the count slider and the toggle for individual dungeon selections.
             case RO_MQ_DUNGEONS_NONE:
@@ -1504,17 +1504,22 @@ void Settings::UpdateOptionProperties() {
             // else if random number or selection only, remove the separator and only show
             // the individual dungeon selection toggle.
             case RO_MQ_DUNGEONS_RANDOM_NUMBER:
-            case RO_MQ_DUNGEONS_SELECTION:
                 mOptions[RSK_MQ_DUNGEON_RANDOM].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
                 mOptions[RSK_MQ_DUNGEON_COUNT].Hide();
                 mOptions[RSK_MQ_DUNGEON_SET].Unhide();
                 break;
+            case RO_MQ_DUNGEONS_SELECTION:
+                mOptions[RSK_MQ_DUNGEON_RANDOM].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
+                mOptions[RSK_MQ_DUNGEON_COUNT].Hide();
+                mOptions[RSK_MQ_DUNGEON_SET].Hide();
+                break;
             default:
                 break;
         }
         // Controls whether or not to show the selectors for individual dungeons.
-        if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("MqDungeons"), RO_MQ_DUNGEONS_NONE) != RO_MQ_DUNGEONS_NONE &&
-            CVarGetInteger(CVAR_RANDOMIZER_SETTING("MqDungeonsSelection"), RO_GENERIC_OFF) == RO_GENERIC_ON) {
+        if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("MQDungeons"), RO_MQ_DUNGEONS_NONE) != RO_MQ_DUNGEONS_NONE &&
+            (CVarGetInteger(CVAR_RANDOMIZER_SETTING("MQDungeonsSelection"), RO_GENERIC_OFF) == RO_GENERIC_ON ||
+             CVarGetInteger(CVAR_RANDOMIZER_SETTING("MQDungeons"), RO_MQ_DUNGEONS_NONE) == RO_MQ_DUNGEONS_SELECTION)) {
             // if showing the dungeon selectors, remove the separator after the Set Dungeons checkbox.
             mOptions[RSK_MQ_DUNGEON_SET].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
             mOptions[RSK_MQ_DEKU_TREE].Unhide();
@@ -1546,12 +1551,7 @@ void Settings::UpdateOptionProperties() {
             mOptions[RSK_MQ_GANONS_CASTLE].Hide();
         }
     }
-    // Disable interaction with Set Dungeons checkbox if MQ Dungeon Randomization is set to Selection Only.
-    if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("MqDungeons"), RO_MQ_DUNGEONS_NONE) == RO_MQ_DUNGEONS_SELECTION) {
-        mOptions[RSK_MQ_DUNGEON_SET].Disable("This option is force-enabled because Master Quest Dungeons is set to Selection Only", UIWidgets::CheckboxGraphics::Checkmark);
-    } else {
-        mOptions[RSK_MQ_DUNGEON_SET].Enable();
-    }
+
     // Show mixed entrance pool options if mixed entrance pools are enabled at all.
     if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("MixedEntrances"), RO_GENERIC_OFF)) {
         mOptions[RSK_MIXED_ENTRANCE_POOLS].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
@@ -1871,74 +1871,121 @@ void Settings::FinalizeSettings(const std::set<RandomizerCheck>& excludedLocatio
     // RANDOTODO implement chest shuffle with keysanity
     // ShuffleChestMinigame.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_CHEST_MINIGAME]);
     mOptions[RSK_SHUFFLE_CHEST_MINIGAME].SetSelectedIndex(RO_CHEST_GAME_OFF);
+    
     //TODO: RandomizeAllSettings(true) when implementing the ability to randomize the options themselves.
     std::array<DungeonInfo*, 12> dungeons = ctx->GetDungeons()->GetDungeonList();
-    std::array<bool, 12> dungeonModesKnown{};
-    const std::vector<Option*> dungeonOptions = {
-        &mOptions[RSK_MQ_DEKU_TREE],
-        &mOptions[RSK_MQ_DODONGOS_CAVERN],
-        &mOptions[RSK_MQ_JABU_JABU],
-        &mOptions[RSK_MQ_FOREST_TEMPLE],
-        &mOptions[RSK_MQ_FIRE_TEMPLE],
-        &mOptions[RSK_MQ_WATER_TEMPLE],
-        &mOptions[RSK_MQ_SPIRIT_TEMPLE],
-        &mOptions[RSK_MQ_SHADOW_TEMPLE],
-        &mOptions[RSK_MQ_BOTTOM_OF_THE_WELL],
-        &mOptions[RSK_MQ_ICE_CAVERN],
-        &mOptions[RSK_MQ_GTG],
-        &mOptions[RSK_MQ_GANONS_CASTLE]
-    };
-    auto mqSet = mOptions[RSK_MQ_DUNGEON_COUNT].Value<uint8_t>();
-    if (mOptions[RSK_MQ_DUNGEON_RANDOM].Is(RO_MQ_DUNGEONS_SELECTION)) {
-        mqSet = 0;
+
+    //reset the MQ vars
+    for (auto dungeon: dungeons) {
+        dungeon->ClearMQ();
+        dungeon->SetDungeonKnown(true);
     }
-    std::vector<uint8_t> randMQOption = {};
-    if (mOptions[RSK_MQ_DUNGEON_SET]) {
-        uint8_t dungeonCount = 0;
-        for (size_t i = 0; i < dungeons.size(); i++) {
-            dungeons[i]->ClearMQ();
-            dungeonModesKnown[i] = true;
-            switch (dungeonOptions[i]->Value<uint8_t>()) {
-                case 1:
-                    dungeons[i]->SetMQ();
-                    dungeonCount++;
+    //if it's selection mode, process the selection directly
+    if (mOptions[RSK_MQ_DUNGEON_RANDOM].Value<uint8_t>() == RO_MQ_DUNGEONS_SELECTION){
+        mOptions[RSK_MQ_DUNGEON_SET].SetSelectedIndex(RO_GENERIC_ON);
+        //How many dungeons are set to MQ in selection
+        uint8_t mqSet = 0;
+        for (auto dungeon: dungeons) {
+            switch (mOptions[dungeon->GetMQSetting()].Value<uint8_t>()) {
+                case RO_MQ_SET_MQ:
+                    dungeon->SetMQ();
+                    mqSet += 1;
                     break;
-                case 2:
-                    randMQOption.push_back(i);
-                    dungeonModesKnown[i] = false;
+                case RO_MQ_SET_RANDOM:
+                    //50% per dungeon, rolled seperatly so people can either have a linear distribtuion
+                    //or a bell curve for the number of MQ dungeons per seed.
+                    if (Random(0,2)){
+                        dungeon->SetMQ();
+                        mqSet += 1;
+                    }
+                    dungeon->SetDungeonKnown(false);
                     break;
                 default:
                     break;
             }
         }
-        Shuffle(randMQOption);
-        if (mOptions[RSK_MQ_DUNGEON_RANDOM].Is(RO_MQ_DUNGEONS_RANDOM_NUMBER)) {
-            mqSet = dungeonCount + Random(0, static_cast<int>(randMQOption.size()) + 1);
-        }
-        for (uint8_t i = 0; dungeonCount < mqSet; i++) {
-            if (i > randMQOption.size()) {
-                // This can happen if the amount of MQ Dungeons is specifically
-                // set to a higher number than the amount of Dungeons specifically set to MQ or Random,
-                // break out of the loop and just have fewer MQ dungeons than the Set Count.
-                break;
+        //override the dungeons set with the ones set by selection, so it's accurate for anything that wants to know MQ dungeon count
+        mOptions[RSK_MQ_DUNGEON_COUNT].SetSelectedIndex(mqSet);
+    //handling set number and random number together
+    } else if (mOptions[RSK_MQ_DUNGEON_RANDOM].Value<uint8_t>() != RO_MQ_DUNGEONS_NONE){
+        // so we don't have to call this repeatedly
+        uint8_t mqCount = mOptions[RSK_MQ_DUNGEON_COUNT].Value<uint8_t>();
+        //How many dungeons are set to MQ in selection
+        uint8_t mqSet = 0;
+        //the number of random 
+        uint8_t mqToSet = 0;
+        //store the dungeons to randomly decide between. we use the id instead of a dungeon object to avoid a lot of casting.
+        std::vector<uint8_t> randMQOption = {};
+        //if dungeons have been preset, process them
+        if (mOptions[RSK_MQ_DUNGEON_SET]){
+            for (size_t i = 0; i < dungeons.size(); i++) {
+                switch (mOptions[dungeons[i]->GetMQSetting()].Value<uint8_t>()) {
+                case RO_MQ_SET_MQ:
+                    dungeons[i]->SetMQ();
+                    mqSet += 1;
+                    break;
+                case RO_MQ_SET_RANDOM:
+                    randMQOption.push_back(i);
+                    dungeons[i]->SetDungeonKnown(false);
+                    break;
+                default:
+                    break;
+                }
+            }
+        //otherwise, every dungeon is possible
+        } else {
+            //if the count is fixed to 12, we know everything is MQ, so can skip some setps and do not set Known
+            if (mOptions[RSK_MQ_DUNGEON_RANDOM].Value<uint8_t>() == RO_MQ_DUNGEONS_SET_NUMBER &&
+                mqCount == 12) {
+                randMQOption = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11};
+                for (auto dungeon: dungeons) {
+                    mOptions[dungeon->GetMQSetting()].SetSelectedIndex(RO_MQ_SET_MQ);
+                }
+            //if it's fixed to zero, set it to None instead. the rest is processed after
+            } else if (mOptions[RSK_MQ_DUNGEON_RANDOM].Value<uint8_t>() == RO_MQ_DUNGEONS_SET_NUMBER &&
+                       mqCount == 0){
+                mOptions[RSK_MQ_DUNGEON_RANDOM].SetSelectedIndex(RO_MQ_DUNGEONS_NONE);
+            //otherwise, make everything a possibility and unknown
+            } else {
+                for (size_t i = 0; i < dungeons.size(); i++) {
+                    randMQOption.push_back(i);
+                    dungeons[i]->SetDungeonKnown(false);
+                    mOptions[dungeons[i]->GetMQSetting()].SetSelectedIndex(RO_MQ_SET_RANDOM);
+                }
             }
-            dungeons[randMQOption[i]]->SetMQ();
-            dungeonCount++;
         }
-    } else {
-        Shuffle(dungeons);
-        for (const auto dungeon : dungeons) {
-            dungeon->ClearMQ();
+        //if there's no random options, we can skip this
+        if (randMQOption.size() > 0){
+            //Figure out how many dungeons to select, rolling the random number if needed
+            if (mOptions[RSK_MQ_DUNGEON_RANDOM].Is(RO_MQ_DUNGEONS_RANDOM_NUMBER)){
+                mqToSet = Random(0, static_cast<int>(randMQOption.size()) + 1);
+            } else if (mqCount > mqSet) {
+                mqToSet = std::min(mqCount - mqSet, static_cast<int>(randMQOption.size()));
+            }
+            //we only need to shuffle if we're not using them all
+            if (mqToSet <= static_cast<int8_t>(randMQOption.size()) && mqToSet > 0) {
+                Shuffle(randMQOption);
+            } 
+            for (uint8_t i = 0; i < mqToSet; i++){
+                dungeons[randMQOption[i]]->SetMQ();
+            }
+        } else {
+            //if there's no random options, check if we can collapse the setting into None or Selection
+            if (mqSet == 0){   
+                mOptions[RSK_MQ_DUNGEON_RANDOM].SetSelectedIndex(RO_MQ_DUNGEONS_NONE);
+            } else {
+                mOptions[RSK_MQ_DUNGEON_RANDOM].SetSelectedIndex(RO_MQ_DUNGEONS_SELECTION);
+            }
         }
-        const bool allDungeonModesKnown = mqSet == 0 || mqSet == dungeons.size();
-        for (bool & i : dungeonModesKnown) {
-            i = allDungeonModesKnown;
-        }
-        if (mOptions[RSK_MQ_DUNGEON_RANDOM].Is(RO_MQ_DUNGEONS_RANDOM_NUMBER)) {
-            mqSet = Random(0, 13);
-        }
-        for (uint8_t i = 0; i < mqSet; i++) {
-            dungeons[i]->SetMQ();
+        //reset the value set based on what was actually set
+        mOptions[RSK_MQ_DUNGEON_COUNT].SetSelectedIndex(mqToSet + mqSet);
+    } 
+    //Not an if else as other settings can become None in processing
+    if (mOptions[RSK_MQ_DUNGEON_RANDOM].Value<uint8_t>() == RO_MQ_DUNGEONS_NONE) {
+        mOptions[RSK_MQ_DUNGEON_SET].SetSelectedIndex(RO_GENERIC_OFF);
+        mOptions[RSK_MQ_DUNGEON_COUNT].SetSelectedIndex(0);
+        for (auto dungeon: dungeons) {
+            mOptions[dungeon->GetMQSetting()].SetSelectedIndex(RO_MQ_SET_VANILLA);
         }
     }
 

From 8b6c183776bddb511e7cec7a07d0018507ff101d Mon Sep 17 00:00:00 2001
From: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>
Date: Wed, 17 Jul 2024 18:55:05 +0200
Subject: [PATCH 164/230] Rando: Skeleton key (#3997)

* Initial Implementation

* Add temporary model to the skeleton key
---
 .../Enhancements/debugger/debugSaveEditor.h   |   4 +-
 soh/soh/Enhancements/mods.cpp                 |  23 ++-
 .../randomizer/3drando/item_pool.cpp          |   4 +
 soh/soh/Enhancements/randomizer/draw.cpp      |  50 ++++++
 soh/soh/Enhancements/randomizer/draw.h        |   1 +
 soh/soh/Enhancements/randomizer/item_list.cpp |   3 +
 soh/soh/Enhancements/randomizer/logic.cpp     |   6 +
 soh/soh/Enhancements/randomizer/logic.h       |   3 +
 .../randomizer/option_descriptions.cpp        |   2 +-
 .../Enhancements/randomizer/randomizer.cpp    |   3 +-
 .../Enhancements/randomizer/randomizerTypes.h |   3 +
 .../Enhancements/randomizer/randomizer_inf.h  |   4 +-
 soh/soh/Enhancements/randomizer/settings.cpp  |   7 +-
 soh/src/code/z_parameter.c                    | 159 +++++++++---------
 .../overlays/actors/ovl_En_Door/z_en_door.h   |   3 +
 15 files changed, 194 insertions(+), 81 deletions(-)

diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.h b/soh/soh/Enhancements/debugger/debugSaveEditor.h
index e5086f5b8..661cf87be 100644
--- a/soh/soh/Enhancements/debugger/debugSaveEditor.h
+++ b/soh/soh/Enhancements/debugger/debugSaveEditor.h
@@ -596,11 +596,13 @@ const std::vector<FlagTable> flagTables = {
         { RAND_INF_ZD_FISH_4, "RAND_INF_ZD_FISH_4" },
         { RAND_INF_ZD_FISH_5, "RAND_INF_ZD_FISH_5" },
 
+        { RAND_INF_HAS_SKELETON_KEY, "RAND_INF_HAS_SKELETON_KEY" },
+
         { RAND_INF_LINKS_POCKET, "RAND_INF_LINKS_POCKET" },
         { RAND_INF_LEARNED_EPONA_SONG, "RAND_INF_LEARNED_EPONA_SONG" },
         { RAND_INF_DARUNIAS_JOY, "RAND_INF_DARUNIAS_JOY" },
         { RAND_INF_KING_ZORA_THAWED, "RAND_INF_KING_ZORA_THAWED" },
-        
+
         { RAND_INF_HC_GREAT_FAIRY_REWARD, "RAND_INF_HC_GREAT_FAIRY_REWARD" },
         { RAND_INF_DMT_GREAT_FAIRY_REWARD, "RAND_INF_DMT_GREAT_FAIRY_REWARD" },
         { RAND_INF_DMC_GREAT_FAIRY_REWARD, "RAND_INF_DMC_GREAT_FAIRY_REWARD" },
diff --git a/soh/soh/Enhancements/mods.cpp b/soh/soh/Enhancements/mods.cpp
index 2efe6477e..098317bae 100644
--- a/soh/soh/Enhancements/mods.cpp
+++ b/soh/soh/Enhancements/mods.cpp
@@ -29,8 +29,10 @@
 #include "src/overlays/actors/ovl_En_Tp/z_en_tp.h"
 #include "src/overlays/actors/ovl_En_Firefly/z_en_firefly.h"
 #include "src/overlays/actors/ovl_En_Xc/z_en_xc.h"
-#include "src/overlays//actors/ovl_Fishing/z_fishing.h"
+#include "src/overlays/actors/ovl_Fishing/z_fishing.h"
 #include "src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h"
+#include "src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h"
+#include "src/overlays/actors/ovl_En_Door/z_en_door.h"
 #include "objects/object_link_boy/object_link_boy.h"
 #include "objects/object_link_child/object_link_child.h"
 
@@ -1712,6 +1714,24 @@ void RegisterRandomizerCompasses() {
     });
 }
 
+void RegisterSkeletonKey() {
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* refActor) {
+        Actor* actor = static_cast<Actor*>(refActor);
+
+        if (Flags_GetRandomizerInf(RAND_INF_HAS_SKELETON_KEY)) {
+            if (actor->id == ACTOR_EN_DOOR) {
+                EnDoor* door = (EnDoor*)actor;
+                door->lockTimer = 0;
+            } else if (actor->id == ACTOR_DOOR_SHUTTER) {
+                DoorShutter* shutterDoor = (DoorShutter*)actor;
+                if (shutterDoor->doorType == SHUTTER_KEY_LOCKED) {
+                    shutterDoor->unk_16E = 0;
+                }
+            }
+        }
+    });
+}
+
 void InitMods() {
     RandomizerRegisterHooks();
     TimeSaverRegisterHooks();
@@ -1760,4 +1780,5 @@ void InitMods() {
     RegisterPatchHandHandler();
     RegisterHurtContainerModeHandler();
     RegisterPauseMenuHooks();
+    RegisterSkeletonKey();
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
index caf7c811e..6d2e44fbf 100644
--- a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
@@ -782,6 +782,10 @@ void GenerateItemPool() {
     ctx->possibleIceTrapModels.push_back(RG_OCARINA_C_RIGHT_BUTTON);
   }
 
+  if (ctx->GetOption(RSK_SKELETON_KEY)) {
+    AddItemToMainPool(RG_SKELETON_KEY);
+  }
+
   if (ctx->GetOption(RSK_SHUFFLE_SWIM)) {
     AddItemToMainPool(RG_PROGRESSIVE_SCALE);
   }
diff --git a/soh/soh/Enhancements/randomizer/draw.cpp b/soh/soh/Enhancements/randomizer/draw.cpp
index f35567b83..11e4a430b 100644
--- a/soh/soh/Enhancements/randomizer/draw.cpp
+++ b/soh/soh/Enhancements/randomizer/draw.cpp
@@ -541,5 +541,55 @@ extern "C" void Randomizer_DrawFishingPoleGI(PlayState* play, GetItemEntry* getI
 
     Matrix_Pop();
 
+    CLOSE_DISPS(play->state.gfxCtx);
+}
+
+int skeletonKeyHue = 0;
+
+// Runs every frame to update rainbow hue, taken from CosmeticsEditor.cpp.
+Color_RGBA8 GetSkeletonKeyColor() {
+    float rainbowSpeed = 0.6f;
+    
+    float frequency = 2 * M_PI / (360 * rainbowSpeed);
+    Color_RGBA8 color;
+    color.r = sin(frequency * skeletonKeyHue + 0) * 127 + 128;
+    color.g = sin(frequency * skeletonKeyHue + (2 * M_PI / 3)) * 127 + 128;
+    color.b = sin(frequency * skeletonKeyHue + (4 * M_PI / 3)) * 127 + 128;
+    color.a = 255;
+
+    skeletonKeyHue++;
+    if (skeletonKeyHue >= (360 * rainbowSpeed)) skeletonKeyHue = 0;
+
+    return color;
+}
+
+int test = 0;
+
+extern "C" void Randomizer_DrawSkeletonKey(PlayState* play, GetItemEntry* getItemEntry) {
+    OPEN_DISPS(play->state.gfxCtx);
+
+    Color_RGBA8 color = GetSkeletonKeyColor();
+
+    Gfx_SetupDL_25Opa(play->state.gfxCtx);
+
+    test += 1;
+
+    if (test > 40) {
+        test -= 80;
+    }
+
+    Matrix_RotateZ(M_PI / 40 * test, MTXMODE_APPLY);
+    Matrix_RotateY(M_PI / 40 * test, MTXMODE_APPLY);
+
+    gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
+              G_MTX_MODELVIEW | G_MTX_LOAD);
+
+    gDPSetGrayscaleColor(POLY_OPA_DISP++, color.r, color.g, color.b, color.a);
+    gSPGrayscale(POLY_OPA_DISP++, true);
+    
+    gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gGiSmallKeyDL);
+
+    gSPGrayscale(POLY_OPA_DISP++, false);
+    
     CLOSE_DISPS(play->state.gfxCtx);
 }
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/draw.h b/soh/soh/Enhancements/randomizer/draw.h
index ec390c002..d0ba3c747 100644
--- a/soh/soh/Enhancements/randomizer/draw.h
+++ b/soh/soh/Enhancements/randomizer/draw.h
@@ -21,6 +21,7 @@ void Randomizer_DrawTriforcePieceGI(PlayState* play, GetItemEntry getItemEntry);
 void Randomizer_DrawOcarinaButton(PlayState* play, GetItemEntry* getItemEntry);
 void Randomizer_DrawBronzeScale(PlayState* play, GetItemEntry* getItemEntry);
 void Randomizer_DrawFishingPoleGI(PlayState* play, GetItemEntry* getItemEntry);
+void Randomizer_DrawSkeletonKey(PlayState* play, GetItemEntry* getItemEntry);
 void Randomizer_DrawMysteryItem(PlayState* play, GetItemEntry getItemEntry);
 
 #define GET_ITEM_MYSTERY \
diff --git a/soh/soh/Enhancements/randomizer/item_list.cpp b/soh/soh/Enhancements/randomizer/item_list.cpp
index 3bdd2709f..b9bd9be22 100644
--- a/soh/soh/Enhancements/randomizer/item_list.cpp
+++ b/soh/soh/Enhancements/randomizer/item_list.cpp
@@ -289,6 +289,9 @@ void Rando::StaticData::InitItemTable() {
     itemTable[RG_BRONZE_SCALE] = Item(RG_BRONZE_SCALE, Text{ "Bronze Scale", "!!!", "!!!" }, ITEMTYPE_ITEM, GI_SCALE_SILVER, true, &logic->ProgressiveWallet, RHT_BRONZE_SCALE, RG_BRONZE_SCALE, OBJECT_GI_SCALE, GID_SCALE_SILVER, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
     itemTable[RG_BRONZE_SCALE].SetCustomDrawFunc(Randomizer_DrawBronzeScale);
 
+    itemTable[RG_SKELETON_KEY] = Item(RG_SKELETON_KEY, Text{ "Skeleton Key", "!!!", "!!!" }, ITEMTYPE_ITEM, GI_STONE_OF_AGONY, true, &logic->SkeletonKey, RHT_SKELETON_KEY, RG_SKELETON_KEY, OBJECT_GI_MAP, GID_STONE_OF_AGONY, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
+    itemTable[RG_SKELETON_KEY].SetCustomDrawFunc(Randomizer_DrawSkeletonKey);
+
     itemTable[RG_DEKU_STICK_BAG] = Item(RG_DEKU_STICK_BAG, Text{ "Deku Stick Bag", "!!!", "!!!" }, ITEMTYPE_ITEM, GI_STICK_UPGRADE_30, true, &logic->ProgressiveStickBag, RHT_NONE, RG_DEKU_STICK_BAG, OBJECT_GI_STICK, GID_STICK, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
 
     itemTable[RG_DEKU_NUT_BAG] = Item(RG_DEKU_NUT_BAG, Text{ "Deku Nut Bag", "!!!", "!!!" }, ITEMTYPE_ITEM, GI_NUT_UPGRADE_30, true, &logic->ProgressiveNutBag, RHT_NONE, RG_DEKU_NUT_BAG, OBJECT_GI_NUTS, GID_NUTS, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
diff --git a/soh/soh/Enhancements/randomizer/logic.cpp b/soh/soh/Enhancements/randomizer/logic.cpp
index b1fa969d0..49f611f0e 100644
--- a/soh/soh/Enhancements/randomizer/logic.cpp
+++ b/soh/soh/Enhancements/randomizer/logic.cpp
@@ -411,6 +411,9 @@ namespace Rando {
     }
 
     bool Logic::SmallKeys(RandomizerRegion dungeon, uint8_t requiredAmountGlitchless, uint8_t requiredAmountGlitched) {
+        if (SkeletonKey) {
+            return true;
+        }
         switch (dungeon) {
             case RR_FOREST_TEMPLE:
                 /*if (IsGlitched && (GetDifficultyValueFromString(GlitchHookshotJump_Boots) >= static_cast<uint8_t>(GlitchDifficulty::INTERMEDIATE) || GetDifficultyValueFromString(GlitchHoverBoost) >= static_cast<uint8_t>(GlitchDifficulty::NOVICE) ||
@@ -673,6 +676,9 @@ namespace Rando {
         //Triforce Pieces
         TriforcePieces = 0;
 
+        //Skeleton Key
+        SkeletonKey = false;
+
         //Boss Souls
         CanSummonGohma        = false;
         CanSummonKingDodongo  = false;
diff --git a/soh/soh/Enhancements/randomizer/logic.h b/soh/soh/Enhancements/randomizer/logic.h
index 16213049d..799b8402a 100644
--- a/soh/soh/Enhancements/randomizer/logic.h
+++ b/soh/soh/Enhancements/randomizer/logic.h
@@ -171,6 +171,9 @@ class Logic {
     // Triforce Pieces
     uint8_t TriforcePieces = 0;
 
+    // Skeleton Key
+    bool SkeletonKey = false;
+
     // Boss Keys
     bool BossKeyForestTemple = false;
     bool BossKeyFireTemple = false;
diff --git a/soh/soh/Enhancements/randomizer/option_descriptions.cpp b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
index ad5cd4e09..e5b0722f3 100644
--- a/soh/soh/Enhancements/randomizer/option_descriptions.cpp
+++ b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
@@ -542,7 +542,6 @@ void Settings::CreateOptionDescriptions() {
     mOptionDescriptions[RSK_KAK_50_SKULLS_HINT] = "Talking to the Cursed Resident in the Skultulla House who is saved after 50 tokens will tell you the reward";
     mOptionDescriptions[RSK_KAK_100_SKULLS_HINT] = "Talking to the Cursed Resident in the Skultulla House who is saved after 100 tokens will tell you the reward";
     mOptionDescriptions[RSK_MASK_SHOP_HINT] = "Reading the mask shop sign will tell you rewards from showing masks at the Deku Theatre.";
-    
     mOptionDescriptions[RSK_FULL_WALLETS] = "Start with a full wallet. All wallet upgrades come filled with rupees.";
     mOptionDescriptions[RSK_BOMBCHUS_IN_LOGIC] =
         "Bombchus are properly considered in logic.\n"
@@ -557,6 +556,7 @@ void Settings::CreateOptionDescriptions() {
     mOptionDescriptions[RSK_BLUE_FIRE_ARROWS] =
         "Ice Arrows act like Blue Fire, making them able to melt red ice. "
         "Item placement logic will respect this option, so it might be required to use this to progress.";
+    mOptionDescriptions[RSK_SKELETON_KEY] = "Adds a new item called the \"Skeleton Key\", it unlocks every dungeon door locked by a small key.";
     mOptionDescriptions[RSK_SUNLIGHT_ARROWS] =
         "Light Arrows can be used to light up the sun switches instead of using the Mirror Shield. "
         "Item placement logic will respect this option, so it might be required to use this to progress.";
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index 303a6bbfd..faac02d84 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -2954,7 +2954,7 @@ CustomMessage Randomizer::GetGoronMessage(u16 index) {
 void Randomizer::CreateCustomMessages() {
     // RANDTODO: Translate into french and german and replace GIMESSAGE_UNTRANSLATED
     // with GIMESSAGE(getItemID, itemID, english, german, french).
-    const std::array<GetItemMessage, 76> getItemMessages = {{
+    const std::array<GetItemMessage, 77> getItemMessages = {{
         GIMESSAGE(RG_GREG_RUPEE, ITEM_MASK_GORON, 
 			"You found %gGreg%w!",
 			"%gGreg%w! Du hast ihn wirklich gefunden!",
@@ -3226,6 +3226,7 @@ void Randomizer::CreateCustomMessages() {
 			"Vous trouvez la %rtouche %y\xa6%r de&l'Ocarina%w! Vous pouvez&maintenant l'utiliser lorsque&vous en jouez!"),
         GIMESSAGE_UNTRANSLATED(RG_BRONZE_SCALE, ITEM_SCALE_SILVER, "You got the %rBronze Scale%w!&The power of buoyancy is yours!"),
         GIMESSAGE_UNTRANSLATED(RG_FISHING_POLE, ITEM_FISHING_POLE, "You found a lost %rFishing Pole%w!&Time to hit the pond!"),
+        GIMESSAGE_UNTRANSLATED(RG_SKELETON_KEY, ITEM_KEY_SMALL, "You found the %rSkeleton Key%w!"),
         GIMESSAGE_UNTRANSLATED(RG_DEKU_STICK_BAG, ITEM_STICK, "You found the %rDeku Stick Bag%w!&You can now hold deku sticks!"),
         GIMESSAGE_UNTRANSLATED(RG_DEKU_NUT_BAG, ITEM_NUT, "You found the %rDeku Nut Bag%w!&You can now hold deku nuts!"),
     }};
diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h
index d15d3d4a3..e89059ecd 100644
--- a/soh/soh/Enhancements/randomizer/randomizerTypes.h
+++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@@ -1979,6 +1979,7 @@ typedef enum {
     RG_OCARINA_C_DOWN_BUTTON,
     RG_OCARINA_C_LEFT_BUTTON,
     RG_OCARINA_C_RIGHT_BUTTON,
+    RG_SKELETON_KEY,
     RG_FISHING_POLE,
     RG_DEKU_STICK_BAG,
     RG_DEKU_NUT_BAG,
@@ -3244,6 +3245,7 @@ typedef enum {
     RHT_OCARINA_C_RIGHT_BUTTON,
     RHT_BRONZE_SCALE,
     RHT_FISHING_POLE,
+    RHT_SKELETON_KEY,
     RHT_EPONA,
     RHT_HINT_MYSTERIOUS,
     RHT_MYSTERIOUS_ITEM,
@@ -3713,6 +3715,7 @@ typedef enum {
     RSK_FISHSANITY_POND_COUNT,
     RSK_FISHSANITY_AGE_SPLIT,
     RSK_SHUFFLE_FISHING_POLE,
+    RSK_SKELETON_KEY,
     RSK_SHUFFLE_DEKU_STICK_BAG,
     RSK_SHUFFLE_DEKU_NUT_BAG,
     RSK_MAX
diff --git a/soh/soh/Enhancements/randomizer/randomizer_inf.h b/soh/soh/Enhancements/randomizer/randomizer_inf.h
index f1ae83121..72168f018 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_inf.h
+++ b/soh/soh/Enhancements/randomizer/randomizer_inf.h
@@ -257,11 +257,13 @@ typedef enum {
     RAND_INF_ZD_FISH_4,
     RAND_INF_ZD_FISH_5,
 
+    RAND_INF_HAS_SKELETON_KEY,
+
     RAND_INF_LINKS_POCKET,
     RAND_INF_LEARNED_EPONA_SONG,
     RAND_INF_DARUNIAS_JOY,
     RAND_INF_KING_ZORA_THAWED,
-    
+
     RAND_INF_HC_GREAT_FAIRY_REWARD,
     RAND_INF_DMT_GREAT_FAIRY_REWARD,
     RAND_INF_DMC_GREAT_FAIRY_REWARD,
diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
index 80007b564..28f341631 100644
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -184,6 +184,7 @@ void Settings::CreateOptions() {
     // TODO: Compasses show rewards/woth, maps show dungeon mode
     mOptions[RSK_BLUE_FIRE_ARROWS] = Option::Bool("Blue Fire Arrows", CVAR_RANDOMIZER_SETTING("BlueFireArrows"), mOptionDescriptions[RSK_BLUE_FIRE_ARROWS]);
     mOptions[RSK_SUNLIGHT_ARROWS] = Option::Bool("Sunlight Arrows", CVAR_RANDOMIZER_SETTING("SunlightArrows"), mOptionDescriptions[RSK_SUNLIGHT_ARROWS]);
+    mOptions[RSK_SKELETON_KEY] = Option::Bool("Skeleton Key", CVAR_RANDOMIZER_SETTING("SkeletonKey"), mOptionDescriptions[RSK_SKELETON_KEY]);
     mOptions[RSK_ITEM_POOL] = Option::U8("Item Pool", {"Plentiful", "Balanced", "Scarce", "Minimal"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ItemPool"), mOptionDescriptions[RSK_ITEM_POOL], WidgetType::Combobox, RO_ITEM_POOL_BALANCED);
     mOptions[RSK_ICE_TRAPS] = Option::U8("Ice Traps", {"Off", "Normal", "Extra", "Mayhem", "Onslaught"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("IceTraps"), mOptionDescriptions[RSK_ICE_TRAPS], WidgetType::Combobox, RO_ICE_TRAPS_NORMAL);
     // TODO: Remove Double Defense, Progressive Goron Sword
@@ -764,7 +765,8 @@ void Settings::CreateOptions() {
         &mOptions[RSK_BOMBCHUS_IN_LOGIC],
         &mOptions[RSK_ENABLE_BOMBCHU_DROPS],
         &mOptions[RSK_BLUE_FIRE_ARROWS],
-        &mOptions[RSK_SUNLIGHT_ARROWS]
+        &mOptions[RSK_SUNLIGHT_ARROWS],
+        &mOptions[RSK_SKELETON_KEY],
     }, false, WidgetContainerType::COLUMN);
     mOptionGroups[RSG_GAMEPLAY_IMGUI_TABLE] = OptionGroup::SubGroup("Gameplay", {
         &mOptionGroups[RSG_TIMESAVERS_IMGUI],
@@ -992,6 +994,7 @@ void Settings::CreateOptions() {
         &mOptions[RSK_DAMAGE_MULTIPLIER],
         &mOptions[RSK_BLUE_FIRE_ARROWS],
         &mOptions[RSK_SUNLIGHT_ARROWS],
+        &mOptions[RSK_SKELETON_KEY],
     });
     mOptionGroups[RSG_ITEM_POOL] = OptionGroup("Item Pool Settings", std::initializer_list<Option*>({
         &mOptions[RSK_ITEM_POOL],
@@ -1210,6 +1213,7 @@ void Settings::CreateOptions() {
         { "Miscellaneous Settings:Hint Distribution", RSK_HINT_DISTRIBUTION },
         { "Miscellaneous Settings:Blue Fire Arrows", RSK_BLUE_FIRE_ARROWS },
         { "Miscellaneous Settings:Sunlight Arrows", RSK_SUNLIGHT_ARROWS },
+        { "Miscellaneous Settings:Skeleton Key", RSK_SKELETON_KEY },
         { "Timesaver Settings:Skip Child Zelda", RSK_SKIP_CHILD_ZELDA },
         { "Start with Consumables", RSK_STARTING_CONSUMABLES },
         { "Full Wallets", RSK_FULL_WALLETS },
@@ -2359,6 +2363,7 @@ void Settings::ParseJson(nlohmann::json spoilerFileJson) {
                 case RSK_SKULLS_SUNS_SONG:
                 case RSK_BLUE_FIRE_ARROWS:
                 case RSK_SUNLIGHT_ARROWS:
+                case RSK_SKELETON_KEY:
                 case RSK_BOMBCHUS_IN_LOGIC:
                 case RSK_TOT_ALTAR_HINT:
                 case RSK_GANONDORF_HINT:
diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c
index 2f39ade8c..a03a74c69 100644
--- a/soh/src/code/z_parameter.c
+++ b/soh/src/code/z_parameter.c
@@ -2796,6 +2796,11 @@ u16 Randomizer_Item_Give(PlayState* play, GetItemEntry giEntry) {
         return Return_Item_Entry(giEntry, RG_NONE);
     }
 
+    if (item == RG_SKELETON_KEY) {
+        Flags_SetRandomizerInf(RAND_INF_HAS_SKELETON_KEY);
+        return Return_Item_Entry(giEntry, RG_NONE);
+    }
+
     if (item == RG_DEKU_STICK_BAG) {
         Inventory_ChangeUpgrade(UPG_STICKS, 1);
         INV_CONTENT(ITEM_STICK) = ITEM_STICK;
@@ -5370,83 +5375,87 @@ void Interface_Draw(PlayState* play) {
                 }
             }
 
-            switch (play->sceneNum) {
-                case SCENE_FOREST_TEMPLE:
-                case SCENE_FIRE_TEMPLE:
-                case SCENE_WATER_TEMPLE:
-                case SCENE_SPIRIT_TEMPLE:
-                case SCENE_SHADOW_TEMPLE:
-                case SCENE_BOTTOM_OF_THE_WELL:
-                case SCENE_ICE_CAVERN:
-                case SCENE_GANONS_TOWER:
-                case SCENE_GERUDO_TRAINING_GROUND:
-                case SCENE_THIEVES_HIDEOUT:
-                case SCENE_INSIDE_GANONS_CASTLE:
-                case SCENE_GANONS_TOWER_COLLAPSE_INTERIOR:
-                case SCENE_INSIDE_GANONS_CASTLE_COLLAPSE:
-                case SCENE_TREASURE_BOX_SHOP:
-                    if (gSaveContext.inventory.dungeonKeys[gSaveContext.mapIndex] >= 0) {
-                        s16 X_Margins_SKC;
-                        s16 Y_Margins_SKC;
-                        if (CVarGetInteger(CVAR_COSMETIC("HUD.SmallKey.UseMargins"), 0) != 0) {
-                            if (CVarGetInteger(CVAR_COSMETIC("HUD.SmallKey.PosType"), 0) == 0) {X_Margins_SKC = Left_HUD_Margin;};
-                            Y_Margins_SKC = Bottom_HUD_Margin;
-                        } else {
-                            X_Margins_SKC = 0;
-                            Y_Margins_SKC = 0;
-                        }
-                        s16 PosX_SKC_ori = OTRGetRectDimensionFromLeftEdge(26+X_Margins_SKC);
-                        s16 PosY_SKC_ori = 190+Y_Margins_SKC;
-                        s16 PosX_SKC;
-                        s16 PosY_SKC;
-                        if (CVarGetInteger(CVAR_COSMETIC("HUD.SmallKey.PosType"), 0) != 0) {
-                            PosY_SKC = CVarGetInteger(CVAR_COSMETIC("HUD.SmallKey.PosY"), 0)+Y_Margins_SKC;
-                            if (CVarGetInteger(CVAR_COSMETIC("HUD.SmallKey.PosType"), 0) == 1) {//Anchor Left
-                                if (CVarGetInteger(CVAR_COSMETIC("HUD.SmallKey.UseMargins"), 0) != 0) {X_Margins_SKC = Left_HUD_Margin;};
-                                PosX_SKC = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.SmallKey.PosX"), 0)+X_Margins_SKC);
-                            } else if (CVarGetInteger(CVAR_COSMETIC("HUD.SmallKey.PosType"), 0) == 2) {//Anchor Right
-                                if (CVarGetInteger(CVAR_COSMETIC("HUD.SmallKey.UseMargins"), 0) != 0) {X_Margins_SKC = Right_HUD_Margin;};
-                                PosX_SKC = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.SmallKey.PosX"), 0)+X_Margins_SKC);
-                            } else if (CVarGetInteger(CVAR_COSMETIC("HUD.SmallKey.PosType"), 0) == 3) {//Anchor None
-                                PosX_SKC = CVarGetInteger(CVAR_COSMETIC("HUD.SmallKey.PosX"), 0);
-                            } else if (CVarGetInteger(CVAR_COSMETIC("HUD.SmallKey.PosType"), 0) == 4) {//Hidden
-                            PosX_SKC = -9999;
+            //when having the skeleton key in rando, don't render the small key counter
+            if (!Flags_GetRandomizerInf(RAND_INF_HAS_SKELETON_KEY)) {
+                switch (play->sceneNum) {
+                    case SCENE_FOREST_TEMPLE:
+                    case SCENE_FIRE_TEMPLE:
+                    case SCENE_WATER_TEMPLE:
+                    case SCENE_SPIRIT_TEMPLE:
+                    case SCENE_SHADOW_TEMPLE:
+                    case SCENE_BOTTOM_OF_THE_WELL:
+                    case SCENE_ICE_CAVERN:
+                    case SCENE_GANONS_TOWER:
+                    case SCENE_GERUDO_TRAINING_GROUND:
+                    case SCENE_THIEVES_HIDEOUT:
+                    case SCENE_INSIDE_GANONS_CASTLE:
+                    case SCENE_GANONS_TOWER_COLLAPSE_INTERIOR:
+                    case SCENE_INSIDE_GANONS_CASTLE_COLLAPSE:
+                    case SCENE_TREASURE_BOX_SHOP:
+
+                        if (gSaveContext.inventory.dungeonKeys[gSaveContext.mapIndex] >= 0) {
+                            s16 X_Margins_SKC;
+                            s16 Y_Margins_SKC;
+                            if (CVarGetInteger(CVAR_COSMETIC("HUD.SmallKey.UseMargins"), 0) != 0) {
+                                if (CVarGetInteger(CVAR_COSMETIC("HUD.SmallKey.PosType"), 0) == 0) {X_Margins_SKC = Left_HUD_Margin;};
+                                Y_Margins_SKC = Bottom_HUD_Margin;
+                            } else {
+                                X_Margins_SKC = 0;
+                                Y_Margins_SKC = 0;
                             }
-                        } else {
-                            PosY_SKC = PosY_SKC_ori;
-                            PosX_SKC = PosX_SKC_ori;
+                            s16 PosX_SKC_ori = OTRGetRectDimensionFromLeftEdge(26+X_Margins_SKC);
+                            s16 PosY_SKC_ori = 190+Y_Margins_SKC;
+                            s16 PosX_SKC;
+                            s16 PosY_SKC;
+                            if (CVarGetInteger(CVAR_COSMETIC("HUD.SmallKey.PosType"), 0) != 0) {
+                                PosY_SKC = CVarGetInteger(CVAR_COSMETIC("HUD.SmallKey.PosY"), 0)+Y_Margins_SKC;
+                                if (CVarGetInteger(CVAR_COSMETIC("HUD.SmallKey.PosType"), 0) == 1) {//Anchor Left
+                                    if (CVarGetInteger(CVAR_COSMETIC("HUD.SmallKey.UseMargins"), 0) != 0) {X_Margins_SKC = Left_HUD_Margin;};
+                                    PosX_SKC = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.SmallKey.PosX"), 0)+X_Margins_SKC);
+                                } else if (CVarGetInteger(CVAR_COSMETIC("HUD.SmallKey.PosType"), 0) == 2) {//Anchor Right
+                                    if (CVarGetInteger(CVAR_COSMETIC("HUD.SmallKey.UseMargins"), 0) != 0) {X_Margins_SKC = Right_HUD_Margin;};
+                                    PosX_SKC = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.SmallKey.PosX"), 0)+X_Margins_SKC);
+                                } else if (CVarGetInteger(CVAR_COSMETIC("HUD.SmallKey.PosType"), 0) == 3) {//Anchor None
+                                    PosX_SKC = CVarGetInteger(CVAR_COSMETIC("HUD.SmallKey.PosX"), 0);
+                                } else if (CVarGetInteger(CVAR_COSMETIC("HUD.SmallKey.PosType"), 0) == 4) {//Hidden
+                                    PosX_SKC = -9999;
+                                }
+                            } else {
+                                PosY_SKC = PosY_SKC_ori;
+                                PosX_SKC = PosX_SKC_ori;
+                            }
+                            // Small Key Icon
+                            gDPPipeSync(OVERLAY_DISP++);
+
+                            gDPSetPrimColor(OVERLAY_DISP++, 0, 0, keyCountColor.r,keyCountColor.g,keyCountColor.b, interfaceCtx->magicAlpha);
+                            gDPSetEnvColor(OVERLAY_DISP++, 0, 0, 20, 255); //We reset this here so it match user color :)
+                            OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, gSmallKeyCounterIconTex, 16, 16, PosX_SKC, PosY_SKC, 16, 16,
+                                                          1 << 10, 1 << 10);
+
+                            // Small Key Counter
+                            gDPPipeSync(OVERLAY_DISP++);
+                            gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 255, 255, interfaceCtx->magicAlpha);
+                            gDPSetCombineLERP(OVERLAY_DISP++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE,
+                                              TEXEL0, 0, PRIMITIVE, 0);
+
+                            interfaceCtx->counterDigits[2] = 0;
+                            interfaceCtx->counterDigits[3] = gSaveContext.inventory.dungeonKeys[gSaveContext.mapIndex];
+
+                            while (interfaceCtx->counterDigits[3] >= 10) {
+                                interfaceCtx->counterDigits[2]++;
+                                interfaceCtx->counterDigits[3] -= 10;
+                            }
+
+                            if (interfaceCtx->counterDigits[2] != 0) {
+                                OVERLAY_DISP = Gfx_TextureI8(OVERLAY_DISP, ((u8*)((u8*)digitTextures[interfaceCtx->counterDigits[2]])), 8, 16, PosX_SKC+8, PosY_SKC, 8, 16, 1 << 10, 1 << 10);
+                            }
+
+                            OVERLAY_DISP = Gfx_TextureI8(OVERLAY_DISP, ((u8*)digitTextures[interfaceCtx->counterDigits[3]]), 8, 16, PosX_SKC+16, PosY_SKC, 8, 16, 1 << 10, 1 << 10);
                         }
-                        // Small Key Icon
-                        gDPPipeSync(OVERLAY_DISP++);
-
-                        gDPSetPrimColor(OVERLAY_DISP++, 0, 0, keyCountColor.r,keyCountColor.g,keyCountColor.b, interfaceCtx->magicAlpha);
-                        gDPSetEnvColor(OVERLAY_DISP++, 0, 0, 20, 255); //We reset this here so it match user color :)
-                        OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, gSmallKeyCounterIconTex, 16, 16, PosX_SKC, PosY_SKC, 16, 16,
-                                                      1 << 10, 1 << 10);
-
-                        // Small Key Counter
-                        gDPPipeSync(OVERLAY_DISP++);
-                        gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 255, 255, interfaceCtx->magicAlpha);
-                        gDPSetCombineLERP(OVERLAY_DISP++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE,
-                                          TEXEL0, 0, PRIMITIVE, 0);
-
-                        interfaceCtx->counterDigits[2] = 0;
-                        interfaceCtx->counterDigits[3] = gSaveContext.inventory.dungeonKeys[gSaveContext.mapIndex];
-
-                        while (interfaceCtx->counterDigits[3] >= 10) {
-                            interfaceCtx->counterDigits[2]++;
-                            interfaceCtx->counterDigits[3] -= 10;
-                        }
-
-                        if (interfaceCtx->counterDigits[2] != 0) {
-                            OVERLAY_DISP = Gfx_TextureI8(OVERLAY_DISP, ((u8*)((u8*)digitTextures[interfaceCtx->counterDigits[2]])), 8, 16, PosX_SKC+8, PosY_SKC, 8, 16, 1 << 10, 1 << 10);
-                        }
-
-                        OVERLAY_DISP = Gfx_TextureI8(OVERLAY_DISP, ((u8*)digitTextures[interfaceCtx->counterDigits[3]]), 8, 16, PosX_SKC+16, PosY_SKC, 8, 16, 1 << 10, 1 << 10);
-                    }
-                    break;
-                default:
-                    break;
+                        break;
+                    default:
+                        break;
+                }
             }
 
             // Rupee Counter
diff --git a/soh/src/overlays/actors/ovl_En_Door/z_en_door.h b/soh/src/overlays/actors/ovl_En_Door/z_en_door.h
index 7389ac99a..4e7ef1279 100644
--- a/soh/src/overlays/actors/ovl_En_Door/z_en_door.h
+++ b/soh/src/overlays/actors/ovl_En_Door/z_en_door.h
@@ -57,6 +57,9 @@ typedef struct EnDoor {
     /* 0x01D4 */ EnDoorActionFunc actionFunc;
 } EnDoor; // size = 0x01D8
 
+#ifdef __cplusplus
+extern "C"
+#endif
 void EnDoor_SetupType(EnDoor* enDoor, PlayState* play);
 
 #endif

From 4df4e61eb30043646d688ad7a68a7f3b08f151b9 Mon Sep 17 00:00:00 2001
From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Date: Thu, 18 Jul 2024 22:42:48 +0100
Subject: [PATCH 165/230] Fix return of Item_Give for stricter compilers
 (#4244)

* fix return of Item_Give for stricter compilers

* change to just item
---
 soh/src/code/z_parameter.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c
index a03a74c69..31b2a6d0b 100644
--- a/soh/src/code/z_parameter.c
+++ b/soh/src/code/z_parameter.c
@@ -1933,7 +1933,7 @@ u8 Item_Give(PlayState* play, u8 item) {
         Randomizer_GetSettingValue(RSK_SHUFFLE_DEKU_STICK_BAG) &&
         CUR_UPG_VALUE(UPG_STICKS) == 0
     ) {
-        return;
+        return item;
     }
 
     //prevents getting nuts without the bag in case something got missed
@@ -1943,7 +1943,7 @@ u8 Item_Give(PlayState* play, u8 item) {
         Randomizer_GetSettingValue(RSK_SHUFFLE_DEKU_NUT_BAG) &&
         CUR_UPG_VALUE(UPG_NUTS) == 0
     ) {
-        return;
+        return item;
     }
 
     lusprintf(__FILE__, __LINE__, 2, "Item Give - item: %#x", item);

From 081a55ab294290fe860c4ab194da027fc3883684 Mon Sep 17 00:00:00 2001
From: Angelo Bulfone <boomshroom@users.noreply.github.com>
Date: Fri, 19 Jul 2024 21:49:26 -0600
Subject: [PATCH 166/230] Fix accidental assignment expression (#4248)

A typo from https://github.com/HarbourMasters/Shipwright/commit/a5c0cede12d3a53cb0f1069a5d4a5c4febe991fa resulted in various bugs due to giving every actor the same id.
---
 soh/soh/Enhancements/randomizer/hook_handlers.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index 2f314fc76..4f94e517a 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -1446,7 +1446,7 @@ void RandomizerOnActorInitHandler(void* actorRef) {
 
     //consumable bags
     if (
-        actor->id = ACTOR_EN_ITEM00 &&
+        actor->id == ACTOR_EN_ITEM00 &&
         (
             (
                 RAND_GET_OPTION(RSK_SHUFFLE_DEKU_STICK_BAG) &&

From 3bcd93428e4d39982ae6c921126c0e10b4b7e46e Mon Sep 17 00:00:00 2001
From: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>
Date: Mon, 22 Jul 2024 18:54:14 +0200
Subject: [PATCH 167/230] Rando: Infinite upgrades (Rando V3) (#3942)

* Infinite Upgrades

* Add "Condensed Progressive"

* VB & fix build

* Update settings.cpp
---
 .../cosmetics/CosmeticsEditor.cpp             |   1 +
 .../Enhancements/debugger/debugSaveEditor.h   |   9 ++
 .../game-interactor/GameInteractor.h          |  22 ++++
 soh/soh/Enhancements/mods.cpp                 |  41 ++++++
 .../3drando/hint_list/hint_list_item.cpp      |  48 +++++++
 .../randomizer/3drando/item_pool.cpp          |  10 ++
 .../Enhancements/randomizer/hook_handlers.cpp |  18 +++
 soh/soh/Enhancements/randomizer/item.cpp      | 105 +++++++++++++--
 soh/soh/Enhancements/randomizer/item_list.cpp |   9 ++
 .../randomizer/option_descriptions.cpp        |   5 +
 .../Enhancements/randomizer/randomizer.cpp    | 115 ++++++++++++++---
 .../Enhancements/randomizer/randomizerTypes.h |  24 ++++
 .../Enhancements/randomizer/randomizer_inf.h  |   9 ++
 soh/soh/Enhancements/randomizer/settings.cpp  |   5 +
 soh/src/code/z_parameter.c                    | 121 ++++++++++++++----
 .../misc/ovl_kaleido_scope/z_kaleido_item.c   |   7 +
 16 files changed, 499 insertions(+), 50 deletions(-)

diff --git a/soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp b/soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp
index 4badd8279..f4f344b49 100644
--- a/soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp
+++ b/soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp
@@ -220,6 +220,7 @@ static std::map<std::string, CosmeticOption> cosmeticOptions = {
     COSMETIC_OPTION("Consumable.DDHeartBorder",      "DD Heart Border",      COSMETICS_GROUP_CONSUMABLE,   ImVec4(255, 255, 255, 255), false, true, true),
     COSMETIC_OPTION("Consumable.Magic",              "Magic",                COSMETICS_GROUP_CONSUMABLE,   ImVec4(  0, 200,   0, 255), false, true, false),
     COSMETIC_OPTION("Consumable.MagicActive",        "Magic Active",         COSMETICS_GROUP_CONSUMABLE,   ImVec4(250, 250,   0, 255), false, true, true),
+    COSMETIC_OPTION("Consumable_MagicInfinite",      "Infinite Magic",       COSMETICS_GROUP_CONSUMABLE,   ImVec4(  0,   0, 200, 255), false, true, true),
     COSMETIC_OPTION("Consumable.MagicBorder",        "Magic Border",         COSMETICS_GROUP_CONSUMABLE,   ImVec4(255, 255, 255, 255), false, false, true),
     COSMETIC_OPTION("Consumable.MagicBorderActive",  "Magic Border Active",  COSMETICS_GROUP_CONSUMABLE,   ImVec4(255, 255, 255, 255), false, false, true),
     COSMETIC_OPTION("Consumable.GreenRupee",         "Green Rupee",          COSMETICS_GROUP_CONSUMABLE,   ImVec4( 50, 255,  50, 255), false, true, true),
diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.h b/soh/soh/Enhancements/debugger/debugSaveEditor.h
index 661cf87be..4199b7172 100644
--- a/soh/soh/Enhancements/debugger/debugSaveEditor.h
+++ b/soh/soh/Enhancements/debugger/debugSaveEditor.h
@@ -596,6 +596,15 @@ const std::vector<FlagTable> flagTables = {
         { RAND_INF_ZD_FISH_4, "RAND_INF_ZD_FISH_4" },
         { RAND_INF_ZD_FISH_5, "RAND_INF_ZD_FISH_5" },
 
+        { RAND_INF_HAS_INFINITE_QUIVER, "RAND_INF_HAS_INFINITE_QUIVER" },
+        { RAND_INF_HAS_INFINITE_BOMB_BAG, "RAND_INF_HAS_INFINITE_BOMB_BAG" },
+        { RAND_INF_HAS_INFINITE_BULLET_BAG, "RAND_INF_HAS_INFINITE_BULLET_BAG" },
+        { RAND_INF_HAS_INFINITE_STICK_UPGRADE, "RAND_INF_HAS_INFINITE_STICK_UPGRADE" },
+        { RAND_INF_HAS_INFINITE_NUT_UPGRADE, "RAND_INF_HAS_INFINITE_NUT_UPGRADE" },
+        { RAND_INF_HAS_INFINITE_MAGIC_METER, "RAND_INF_HAS_INFINITE_MAGIC_METER" },
+        { RAND_INF_HAS_INFINITE_BOMBCHUS, "RAND_INF_HAS_INFINITE_BOMBCHUS" },
+        { RAND_INF_HAS_INFINITE_MONEY, "RAND_INF_HAS_INFINITE_MONEY" },
+
         { RAND_INF_HAS_SKELETON_KEY, "RAND_INF_HAS_SKELETON_KEY" },
 
         { RAND_INF_LINKS_POCKET, "RAND_INF_LINKS_POCKET" },
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h
index 57f1d1e5c..2323e7222 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h
@@ -220,6 +220,28 @@ typedef enum {
     VB_GERUDOS_BE_FRIENDLY,
     // Vanilla condition: switch
     VB_GTG_GATE_BE_OPEN,
+    // Opt: *s16 (item id)
+    /* Vanilla condition:
+    In one case:
+    ```
+    true
+    ```
+    In the other case:
+    ```
+    (i == ITEM_STICK) ||
+    (i == ITEM_NUT) ||
+    (i == ITEM_BOMB) ||
+    (i == ITEM_BOW) ||
+    (
+        (i >= ITEM_BOW_ARROW_FIRE) &&
+        (i <= ITEM_BOW_ARROW_LIGHT)
+    ) ||
+    (i == ITEM_SLINGSHOT) ||
+    (i == ITEM_BOMBCHU) ||
+    (i == ITEM_BEAN)
+    ```
+    */
+    VB_DRAW_AMMO_COUNT,
 
     /*** Play Cutscenes ***/
 
diff --git a/soh/soh/Enhancements/mods.cpp b/soh/soh/Enhancements/mods.cpp
index 098317bae..2571b7d96 100644
--- a/soh/soh/Enhancements/mods.cpp
+++ b/soh/soh/Enhancements/mods.cpp
@@ -1694,6 +1694,46 @@ void RegisterFishsanity() {
     });
 }
 
+void RegisterInfiniteUpgrades() {
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGameFrameUpdate>([]() {
+        if (!IS_RANDO) {
+            return;
+        }
+
+        if (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_QUIVER)) {
+            AMMO(ITEM_BOW) = CUR_CAPACITY(UPG_QUIVER);
+        }
+
+        if (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_BOMB_BAG)) {
+            AMMO(ITEM_BOMB) = CUR_CAPACITY(UPG_BOMB_BAG);
+        }
+
+        if (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_BULLET_BAG)) {
+            AMMO(ITEM_SLINGSHOT) = CUR_CAPACITY(UPG_BULLET_BAG);
+        }
+
+        if (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_STICK_UPGRADE)) {
+            AMMO(ITEM_STICK) = CUR_CAPACITY(UPG_STICKS);
+        }
+
+        if (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_NUT_UPGRADE)) {
+            AMMO(ITEM_NUT) = CUR_CAPACITY(UPG_NUTS);
+        }
+
+        if (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_MAGIC_METER)) {
+            gSaveContext.magic = gSaveContext.magicCapacity;
+        }
+
+        if (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_BOMBCHUS)) {
+            AMMO(ITEM_BOMBCHU) = 50;
+        }
+
+        if (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_MONEY)) {
+            gSaveContext.rupees = CUR_CAPACITY(UPG_WALLET);
+        }
+    });
+}
+
 extern "C" u8 Randomizer_GetSettingValue(RandomizerSettingKey randoSettingKey);
 
 void PatchCompasses() {
@@ -1774,6 +1814,7 @@ void InitMods() {
     RegisterNoSwim();
     RegisterNoWallet();
     RegisterFishsanity();
+    RegisterInfiniteUpgrades();
     RegisterRandomizerCompasses();
     NameTag_RegisterHooks();
     RegisterFloorSwitchesHook();
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp
index e99b6fd71..d6e2c2f9a 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp
@@ -2058,6 +2058,54 @@ void StaticData::HintTable_Init_Item() {
                                                CustomMessage("a fish-puller", /*german*/"", /*french*/"(canne à pêche)")});
                                                 // /*spanish*/(caña de pescar)
 
+    hintTextTable[RHT_QUIVER_INF] = HintText(CustomMessage("", /*german*/"!!!", /*french*/"!!!"),
+                                             {
+                                             CustomMessage("", /*german*/"!!!", /*french*/"!!!"),
+                                             }, {
+                                             CustomMessage("", /*german*/"!!!", /*french*/"!!!")});
+
+    hintTextTable[RHT_BOMB_BAG_INF] = HintText(CustomMessage("", /*german*/"!!!", /*french*/"!!!"),
+                                               {
+                                               CustomMessage("", /*german*/"!!!", /*french*/"!!!"),
+                                               }, {
+                                               CustomMessage("", /*german*/"!!!", /*french*/"!!!")});
+
+    hintTextTable[RHT_BULLET_BAG_INF] = HintText(CustomMessage("", /*german*/"!!!", /*french*/"!!!"),
+                                                 {
+                                                 CustomMessage("", /*german*/"!!!", /*french*/"!!!"),
+                                                 }, {
+                                                 CustomMessage("", /*german*/"!!!", /*french*/"!!!")});
+
+    hintTextTable[RHT_STICK_UPGRADE_INF] = HintText(CustomMessage("", /*german*/"!!!", /*french*/"!!!"),
+                                                    {
+                                                    CustomMessage("", /*german*/"!!!", /*french*/"!!!"),
+                                                    }, {
+                                                    CustomMessage("", /*german*/"!!!", /*french*/"!!!")});
+
+    hintTextTable[RHT_NUT_UPGRADE_INF] = HintText(CustomMessage("", /*german*/"!!!", /*french*/"!!!"),
+                                                  {
+                                                  CustomMessage("", /*german*/"!!!", /*french*/"!!!"),
+                                                  }, {
+                                                  CustomMessage("", /*german*/"!!!", /*french*/"!!!")});
+
+    hintTextTable[RHT_MAGIC_INF] = HintText(CustomMessage("", /*german*/"!!!", /*french*/"!!!"),
+                                            {
+                                            CustomMessage("", /*german*/"!!!", /*french*/"!!!"),
+                                            }, {
+                                            CustomMessage("", /*german*/"!!!", /*french*/"!!!")});
+
+    hintTextTable[RHT_BOMBCHU_INF] = HintText(CustomMessage("", /*german*/"!!!", /*french*/"!!!"),
+                                              {
+                                              CustomMessage("", /*german*/"!!!", /*french*/"!!!"),
+                                              }, {
+                                              CustomMessage("", /*german*/"!!!", /*french*/"!!!")});
+
+    hintTextTable[RHT_WALLET_INF] = HintText(CustomMessage("", /*german*/"!!!", /*french*/"!!!"),
+                                             {
+                                             CustomMessage("", /*german*/"!!!", /*french*/"!!!"),
+                                             }, {
+                                             CustomMessage("", /*german*/"!!!", /*french*/"!!!")});
+
     hintTextTable[RHT_EPONA] = HintText(CustomMessage("Epona", /*german*/"", /*french*/"Epona"),
                                     // /*spanish*/a Epona
                                     {
diff --git a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
index 6d2e44fbf..514e81ce4 100644
--- a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
@@ -845,6 +845,16 @@ void GenerateItemPool() {
     ctx->possibleIceTrapModels.push_back(RG_FISHING_POLE);
   }
 
+  if (ctx->GetOption(RSK_INFINITE_UPGRADES).Is(RO_INF_UPGRADES_PROGRESSIVE)) {
+    AddItemToMainPool(RG_PROGRESSIVE_BOMB_BAG);
+    AddItemToMainPool(RG_PROGRESSIVE_BOW);
+    AddItemToMainPool(RG_PROGRESSIVE_NUT_UPGRADE);
+    AddItemToMainPool(RG_PROGRESSIVE_SLINGSHOT);
+    AddItemToMainPool(RG_PROGRESSIVE_STICK_UPGRADE);
+    AddItemToMainPool(RG_PROGRESSIVE_MAGIC_METER);
+    AddItemToMainPool(RG_PROGRESSIVE_WALLET);
+  }
+
   if (ctx->GetOption(RSK_SHUFFLE_MAGIC_BEANS)) {
     AddItemToMainPool(RG_MAGIC_BEAN_PACK);
     if (ctx->GetOption(RSK_ITEM_POOL).Is(RO_ITEM_POOL_PLENTIFUL)) {
diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index 4f94e517a..d5737d33d 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -1113,6 +1113,24 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             }
             break;
         }
+        case VB_DRAW_AMMO_COUNT: {
+            s16 item = *static_cast<s16*>(optionalArg);
+            // don't draw ammo count if you have the infinite upgrade
+            if (
+                (item == ITEM_NUT && Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_NUT_UPGRADE)) ||
+                (item == ITEM_STICK && Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_STICK_UPGRADE)) ||
+                (item == ITEM_BOMB && Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_BOMB_BAG)) ||
+                (
+                    (item == ITEM_BOW || item == ITEM_BOW_ARROW_FIRE || item == ITEM_BOW_ARROW_ICE || item == ITEM_BOW_ARROW_LIGHT) &&
+                    Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_QUIVER)
+                ) ||
+                (item == ITEM_SLINGSHOT && Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_BULLET_BAG)) ||
+                (item == ITEM_BOMBCHU && Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_BOMBCHUS))
+            ) {
+                *should = false;
+            }
+            break;
+        }
         case VB_TRADE_TIMER_ODD_MUSHROOM:
         case VB_TRADE_TIMER_EYEDROPS:
         case VB_TRADE_TIMER_FROG:
diff --git a/soh/soh/Enhancements/randomizer/item.cpp b/soh/soh/Enhancements/randomizer/item.cpp
index 9be5551b8..2ffedbfeb 100644
--- a/soh/soh/Enhancements/randomizer/item.cpp
+++ b/soh/soh/Enhancements/randomizer/item.cpp
@@ -119,6 +119,7 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
     RandomizerGet actual = RG_NONE;
     const bool tycoonWallet =
         OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHOPSANITY) > RO_SHOPSANITY_ZERO_ITEMS;
+    const u8 infiniteUpgrades = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_INFINITE_UPGRADES);
     switch (randomizerGet) {
         case RG_PROGRESSIVE_STICK_UPGRADE:
             switch (CUR_UPG_VALUE(UPG_STICKS)) {
@@ -128,12 +129,23 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
                         break;
                     }
                 case 1:
-                    actual = RG_DEKU_STICK_CAPACITY_20;
+                    if (infiniteUpgrades == RO_INF_UPGRADES_CONDENSED_PROGRESSIVE) {
+                        actual = RG_STICK_UPGRADE_INF;
+                    } else {
+                        actual = RG_DEKU_STICK_CAPACITY_20;
+                    }
                     break;
                 case 2:
-                case 3:
                     actual = RG_DEKU_STICK_CAPACITY_30;
                     break;
+                case 3:
+                case 4:
+                    if (infiniteUpgrades == RO_INF_UPGRADES_PROGRESSIVE) {
+                        actual = RG_STICK_UPGRADE_INF;
+                    } else {
+                        actual = RG_DEKU_STICK_CAPACITY_30;
+                    }
+                    break;
                 default:
                     break;
             }
@@ -146,12 +158,23 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
                         break;
                     }
                 case 1:
-                    actual = RG_DEKU_NUT_CAPACITY_30;
+                    if (infiniteUpgrades == RO_INF_UPGRADES_CONDENSED_PROGRESSIVE) {
+                        actual = RG_NUT_UPGRADE_INF;
+                    } else {
+                        actual = RG_DEKU_NUT_CAPACITY_30;
+                    }
                     break;
                 case 2:
-                case 3:
                     actual = RG_DEKU_NUT_CAPACITY_40;
                     break;
+                case 3:
+                case 4:
+                    if (infiniteUpgrades == RO_INF_UPGRADES_PROGRESSIVE) {
+                        actual = RG_NUT_UPGRADE_INF;
+                    } else {
+                        actual = RG_DEKU_NUT_CAPACITY_40;
+                    }
+                    break;
                 default:
                     break;
             }
@@ -162,12 +185,23 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
                     actual = RG_BOMB_BAG;
                     break;
                 case 1:
-                    actual = RG_BIG_BOMB_BAG;
+                    if (infiniteUpgrades == RO_INF_UPGRADES_CONDENSED_PROGRESSIVE) {
+                        actual = RG_BOMB_BAG_INF;
+                    } else {
+                        actual = RG_BIG_BOMB_BAG;
+                    }
                     break;
                 case 2:
-                case 3:
                     actual = RG_BIGGEST_BOMB_BAG;
                     break;
+                case 3:
+                case 4:
+                    if (infiniteUpgrades == RO_INF_UPGRADES_PROGRESSIVE) {
+                        actual = RG_BOMB_BAG_INF;
+                    } else {
+                        actual = RG_BIGGEST_BOMB_BAG;
+                    }
+                    break;
                 default:
                     break;
             }
@@ -178,12 +212,23 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
                     actual = RG_FAIRY_BOW;
                     break;
                 case 1:
-                    actual = RG_BIG_QUIVER;
+                    if (infiniteUpgrades == RO_INF_UPGRADES_CONDENSED_PROGRESSIVE) {
+                        actual = RG_QUIVER_INF;
+                    } else {
+                        actual = RG_BIG_QUIVER;
+                    }
                     break;
                 case 2:
-                case 3:
                     actual = RG_BIGGEST_QUIVER;
                     break;
+                case 3:
+                case 4:
+                    if (infiniteUpgrades == RO_INF_UPGRADES_PROGRESSIVE) {
+                        actual = RG_QUIVER_INF;
+                    } else {
+                        actual = RG_BIGGEST_QUIVER;
+                    }
+                    break;
                 default:
                     break;
             }
@@ -194,12 +239,23 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
                     actual = RG_FAIRY_SLINGSHOT;
                     break;
                 case 1:
-                    actual = RG_BIG_BULLET_BAG;
+                    if (infiniteUpgrades == RO_INF_UPGRADES_CONDENSED_PROGRESSIVE) {
+                        actual = RG_BULLET_BAG_INF;
+                    } else {
+                        actual = RG_BIG_BULLET_BAG;
+                    }
                     break;
                 case 2:
-                case 3:
                     actual = RG_BIGGEST_BULLET_BAG;
                     break;
+                case 3:
+                case 4:
+                    if (infiniteUpgrades == RO_INF_UPGRADES_PROGRESSIVE) {
+                        actual = RG_BULLET_BAG_INF;
+                    } else {
+                        actual = RG_BIGGEST_BULLET_BAG;
+                    }
+                    break;
                 default:
                     break;
             }
@@ -259,9 +315,16 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
                     actual = RG_GIANT_WALLET;
                     break;
                 case 2:
-                case 3:
                     actual = tycoonWallet ? RG_TYCOON_WALLET : RG_GIANT_WALLET;
                     break;
+                case 3:
+                case 4:
+                    if (infiniteUpgrades != RO_INF_UPGRADES_OFF) {
+                        actual = RG_WALLET_INF;
+                    } else {
+                        actual = tycoonWallet ? RG_TYCOON_WALLET : RG_GIANT_WALLET;
+                    }
+                    break;
                 default:
                     break;
             }
@@ -289,9 +352,16 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
                     actual = RG_MAGIC_SINGLE;
                     break;
                 case 1:
-                case 2:
                     actual = RG_MAGIC_DOUBLE;
                     break;
+                case 2:
+                case 3:
+                    if (infiniteUpgrades != RO_INF_UPGRADES_OFF) {
+                        actual = RG_MAGIC_INF;
+                    } else {
+                        actual = RG_MAGIC_DOUBLE;
+                    }
+                    break;
                 default:
                     break;
             }
@@ -299,6 +369,17 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
         case RG_PROGRESSIVE_GORONSWORD: // todo progressive?
            actual = RG_BIGGORON_SWORD;
            break;
+        case RG_PROGRESSIVE_BOMBCHUS:
+            if (INV_CONTENT(ITEM_BOMBCHU) == ITEM_NONE) {
+                actual = RG_BOMBCHU_20;
+            } else if (infiniteUpgrades != RO_INF_UPGRADES_OFF) {
+                actual = RG_BOMBCHU_INF;
+            } else if (AMMO(ITEM_BOMBCHU) < 5) {
+                actual = RG_BOMBCHU_10;
+            } else {
+                actual = RG_BOMBCHU_5;
+            }
+            break;
         default:
             actual = RG_NONE;
             break;
diff --git a/soh/soh/Enhancements/randomizer/item_list.cpp b/soh/soh/Enhancements/randomizer/item_list.cpp
index b9bd9be22..7c86fcfd3 100644
--- a/soh/soh/Enhancements/randomizer/item_list.cpp
+++ b/soh/soh/Enhancements/randomizer/item_list.cpp
@@ -289,6 +289,15 @@ void Rando::StaticData::InitItemTable() {
     itemTable[RG_BRONZE_SCALE] = Item(RG_BRONZE_SCALE, Text{ "Bronze Scale", "!!!", "!!!" }, ITEMTYPE_ITEM, GI_SCALE_SILVER, true, &logic->ProgressiveWallet, RHT_BRONZE_SCALE, RG_BRONZE_SCALE, OBJECT_GI_SCALE, GID_SCALE_SILVER, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
     itemTable[RG_BRONZE_SCALE].SetCustomDrawFunc(Randomizer_DrawBronzeScale);
 
+    itemTable[RG_QUIVER_INF] =        Item(RG_QUIVER_INF,        Text{ "Infinite Quiver", "!!!", "!!!" },         ITEMTYPE_ITEM, RG_QUIVER_INF,        true, &logic->ProgressiveBow,       RHT_QUIVER_INF,        RG_QUIVER_INF,        OBJECT_GI_ARROWCASE, GID_QUIVER_50,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_BOMB_BAG_INF] =      Item(RG_BOMB_BAG_INF,      Text{ "Infinite Bomb Bag", "!!!", "!!!" },       ITEMTYPE_ITEM, RG_BOMB_BAG_INF,      true, &logic->ProgressiveBombBag,   RHT_BOMB_BAG_INF,      RG_BOMB_BAG_INF,      OBJECT_GI_BOMBPOUCH, GID_BOMB_BAG_40,  TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_BULLET_BAG_INF] =    Item(RG_BULLET_BAG_INF,    Text{ "Infinite Bullet Bag", "!!!", "!!!" },     ITEMTYPE_ITEM, RG_BULLET_BAG_INF,    true, &logic->ProgressiveBulletBag, RHT_BULLET_BAG_INF,    RG_BULLET_BAG_INF,    OBJECT_GI_DEKUPOUCH, GID_BULLET_BAG,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_STICK_UPGRADE_INF] = Item(RG_STICK_UPGRADE_INF, Text{ "Infinite Stick Capacity", "!!!", "!!!" }, ITEMTYPE_ITEM, RG_STICK_UPGRADE_INF, true, &logic->noVariable,           RHT_STICK_UPGRADE_INF, RG_STICK_UPGRADE_INF, OBJECT_GI_STICK,     GID_STICK,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_NUT_UPGRADE_INF] =   Item(RG_QUIVER_INF,        Text{ "Infinite Nut Capacity", "!!!", "!!!" },   ITEMTYPE_ITEM, RG_NUT_UPGRADE_INF,   true, &logic->noVariable,           RHT_NUT_UPGRADE_INF,   RG_NUT_UPGRADE_INF,   OBJECT_GI_NUTS,      GID_NUTS,         TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_MAGIC_INF] =         Item(RG_QUIVER_INF,        Text{ "Infinite Magic Meter", "!!!", "!!!" },    ITEMTYPE_ITEM, RG_MAGIC_INF,         true, &logic->ProgressiveMagic,     RHT_MAGIC_INF,         RG_MAGIC_INF,         OBJECT_GI_MAGICPOT,  GID_MAGIC_LARGE,  TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_BOMBCHU_INF] =       Item(RG_BOMBCHU_INF,       Text{ "Infinite Bombchus", "!!!", "!!!" },       ITEMTYPE_ITEM, RG_BOMBCHU_INF,       true, &logic->Bombchus,             RHT_BOMBCHU_INF,       RG_BOMBCHU_INF,       OBJECT_GI_BOMB_2,    GID_BOMBCHU,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_WALLET_INF] =        Item(RG_WALLET_INF,        Text{ "Infinite Wallet", "!!!", "!!!" },         ITEMTYPE_ITEM, RG_WALLET_INF,        true, &logic->ProgressiveWallet,    RHT_WALLET_INF,        RG_WALLET_INF,        OBJECT_GI_PURSE,     GID_WALLET_GIANT, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+
     itemTable[RG_SKELETON_KEY] = Item(RG_SKELETON_KEY, Text{ "Skeleton Key", "!!!", "!!!" }, ITEMTYPE_ITEM, GI_STONE_OF_AGONY, true, &logic->SkeletonKey, RHT_SKELETON_KEY, RG_SKELETON_KEY, OBJECT_GI_MAP, GID_STONE_OF_AGONY, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
     itemTable[RG_SKELETON_KEY].SetCustomDrawFunc(Randomizer_DrawSkeletonKey);
 
diff --git a/soh/soh/Enhancements/randomizer/option_descriptions.cpp b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
index e5b0722f3..6b5ebc893 100644
--- a/soh/soh/Enhancements/randomizer/option_descriptions.cpp
+++ b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
@@ -250,6 +250,11 @@ void Settings::CreateOptionDescriptions() {
     mOptionDescriptions[RSK_SHUFFLE_FISHING_POLE] = "Shuffles the fishing pole into the item pool.\n"
         "\n"
         "The fishing pole is required to play the fishing pond minigame.";
+    mOptionDescriptions[RSK_INFINITE_UPGRADES] = "Adds upgrades that hold infinite quanities of items (bombs, arrows, etc.)\n"
+        "\n"
+        "Progressive - The infinite upgrades are obtained after getting the last normal capacity upgrade\n"
+        "\n"
+        "Condensed Progressive - The infinite upgrades are obtained as the first capacity upgrade (doesn't apply to the infinite wallet or to infinite magic)";
     mOptionDescriptions[RSK_SHUFFLE_DEKU_STICK_BAG] = "Shuffles the deku stick bag into the item pool.\n"
         "\n"
         "The deku stick bag is required to hold deku sticks.";
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index faac02d84..b2c047e63 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -360,6 +360,13 @@ ItemObtainability Randomizer::GetItemObtainabilityFromRandomizerGet(RandomizerGe
     // This is needed since Plentiful item pool also adds a third progressive wallet
     // but we should *not* get Tycoon's Wallet in that mode.
     bool tycoonWallet = GetRandoSettingValue(RSK_SHOPSANITY) > RO_SHOPSANITY_ZERO_ITEMS;
+
+    // Same thing with the infinite upgrades, if we're not shuffling them
+    // and we're using the Plentiful item pool, we should prevent the infinite
+    // upgrades from being gotten
+    u8 infiniteUpgrades = GetRandoSettingValue(RSK_INFINITE_UPGRADES);
+
+    u8 numWallets = 2 + (u8)tycoonWallet + (infiniteUpgrades != RO_INF_UPGRADES_OFF ? 1 : 0);
     switch (randoGet) {
         case RG_NONE:
         case RG_TRIFORCE:
@@ -396,19 +403,25 @@ ItemObtainability Randomizer::GetItemObtainabilityFromRandomizerGet(RandomizerGe
 
         // Inventory Items
         case RG_PROGRESSIVE_STICK_UPGRADE:
-            return CUR_UPG_VALUE(UPG_STICKS) < 3 ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE;
+            return infiniteUpgrades != RO_INF_UPGRADES_OFF ?
+                (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_STICK_UPGRADE) ? CANT_OBTAIN_ALREADY_HAVE : CAN_OBTAIN) :
+                (CUR_UPG_VALUE(UPG_STICKS) < 3 ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE);
         case RG_DEKU_STICK_1:
         case RG_BUY_DEKU_STICK_1:
             return CUR_UPG_VALUE(UPG_STICKS) ? CAN_OBTAIN : CANT_OBTAIN_NEED_UPGRADE;
         case RG_PROGRESSIVE_NUT_UPGRADE:
-            return CUR_UPG_VALUE(UPG_NUTS) < 3 ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE;
+            return infiniteUpgrades != RO_INF_UPGRADES_OFF ?
+                (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_NUT_UPGRADE) ? CANT_OBTAIN_ALREADY_HAVE : CAN_OBTAIN) :
+                (CUR_UPG_VALUE(UPG_NUTS) < 3 ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE);
         case RG_DEKU_NUTS_5:
         case RG_DEKU_NUTS_10:
         case RG_BUY_DEKU_NUTS_5:
         case RG_BUY_DEKU_NUTS_10:
             return CUR_UPG_VALUE(UPG_NUTS) ? CAN_OBTAIN : CANT_OBTAIN_NEED_UPGRADE;
         case RG_PROGRESSIVE_BOMB_BAG:
-            return CUR_UPG_VALUE(UPG_BOMB_BAG) < 3 ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE;
+            return infiniteUpgrades != RO_INF_UPGRADES_OFF ?
+                (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_BOMB_BAG) ? CANT_OBTAIN_ALREADY_HAVE : CAN_OBTAIN) :
+                (CUR_UPG_VALUE(UPG_BOMB_BAG) < 3 ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE);
         case RG_BOMBS_5:
         case RG_BOMBS_10:
         case RG_BOMBS_20:
@@ -419,7 +432,9 @@ ItemObtainability Randomizer::GetItemObtainabilityFromRandomizerGet(RandomizerGe
         case RG_BUY_BOMBS_30:
             return CUR_UPG_VALUE(UPG_BOMB_BAG) ? CAN_OBTAIN : CANT_OBTAIN_NEED_UPGRADE;
         case RG_PROGRESSIVE_BOW:
-            return CUR_UPG_VALUE(UPG_QUIVER) < 3 ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE;
+            return infiniteUpgrades != RO_INF_UPGRADES_OFF ?
+                (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_QUIVER) ? CANT_OBTAIN_ALREADY_HAVE : CAN_OBTAIN) :
+                (CUR_UPG_VALUE(UPG_QUIVER) < 3 ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE);
         case RG_ARROWS_5:
         case RG_ARROWS_10:
         case RG_ARROWS_30:
@@ -428,7 +443,9 @@ ItemObtainability Randomizer::GetItemObtainabilityFromRandomizerGet(RandomizerGe
         case RG_BUY_ARROWS_50:
             return CUR_UPG_VALUE(UPG_QUIVER) ? CAN_OBTAIN : CANT_OBTAIN_NEED_UPGRADE;
         case RG_PROGRESSIVE_SLINGSHOT:
-            return CUR_UPG_VALUE(UPG_BULLET_BAG) < 3 ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE;
+            return infiniteUpgrades != RO_INF_UPGRADES_OFF ?
+                (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_BULLET_BAG) ? CANT_OBTAIN_ALREADY_HAVE : CAN_OBTAIN) :
+                (CUR_UPG_VALUE(UPG_BULLET_BAG) < 3 ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE);
         case RG_DEKU_SEEDS_30:
         case RG_BUY_DEKU_SEEDS_30:
             return CUR_UPG_VALUE(UPG_BULLET_BAG) ? CAN_OBTAIN : CANT_OBTAIN_NEED_UPGRADE;
@@ -550,13 +567,15 @@ ItemObtainability Randomizer::GetItemObtainabilityFromRandomizerGet(RandomizerGe
         case RG_PROGRESSIVE_STRENGTH:
             return CUR_UPG_VALUE(UPG_STRENGTH) < 3 ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE;
         case RG_PROGRESSIVE_WALLET:
-            return CUR_UPG_VALUE(UPG_WALLET) < (tycoonWallet ? 3 : 2) ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE;
+            return CUR_UPG_VALUE(UPG_WALLET) < numWallets ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE;
         case RG_PROGRESSIVE_SCALE:
             return CUR_UPG_VALUE(UPG_SCALE) < 2 ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE;
         case RG_PROGRESSIVE_MAGIC_METER:
         case RG_MAGIC_SINGLE:
         case RG_MAGIC_DOUBLE:
-            return gSaveContext.magicLevel < 2 ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE;
+            return infiniteUpgrades != RO_INF_UPGRADES_OFF ?
+                (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_MAGIC_METER) ? CANT_OBTAIN_ALREADY_HAVE : CAN_OBTAIN) :
+                (gSaveContext.magicLevel < 2 ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE);
         case RG_FISHING_POLE:
             return !Flags_GetRandomizerInf(RAND_INF_FISHING_POLE_FOUND) ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE;
 
@@ -716,6 +735,11 @@ GetItemID Randomizer::GetItemIdFromRandomizerGet(RandomizerGet randoGet, GetItem
     // This is needed since Plentiful item pool also adds a third progressive wallet
     // but we should *not* get Tycoon's Wallet in that mode.
     bool tycoonWallet = GetRandoSettingValue(RSK_SHOPSANITY) > RO_SHOPSANITY_ZERO_ITEMS;
+
+    // Same thing with the infinite upgrades, if we're not shuffling them
+    //and we're using the Plentiful item pool, we should prevent the infinite
+    //upgrades from being gotten
+    u8 infiniteUpgrades = GetRandoSettingValue(RSK_INFINITE_UPGRADES);
     switch (randoGet) {
         case RG_NONE:
             return ogItemId;
@@ -760,8 +784,10 @@ GetItemID Randomizer::GetItemIdFromRandomizerGet(RandomizerGet randoGet, GetItem
                 case 1:
                     return GI_STICK_UPGRADE_20;
                 case 2:
-                case 3:
                     return GI_STICK_UPGRADE_30;
+                case 3:
+                case 4:
+                    return infiniteUpgrades == RO_INF_UPGRADES_PROGRESSIVE ? (GetItemID)RG_STICK_UPGRADE_INF : GI_STICK_UPGRADE_30;
             }
         case RG_PROGRESSIVE_NUT_UPGRADE:
             switch (CUR_UPG_VALUE(UPG_NUTS)) {
@@ -769,8 +795,10 @@ GetItemID Randomizer::GetItemIdFromRandomizerGet(RandomizerGet randoGet, GetItem
                 case 1:
                     return GI_NUT_UPGRADE_30;
                 case 2:
-                case 3:
                     return GI_NUT_UPGRADE_40;
+                case 3:
+                case 4:
+                    return infiniteUpgrades == RO_INF_UPGRADES_PROGRESSIVE ? (GetItemID)RG_NUT_UPGRADE_INF : GI_NUT_UPGRADE_40;
             }
         case RG_PROGRESSIVE_BOMB_BAG:
             switch (CUR_UPG_VALUE(UPG_BOMB_BAG)) {
@@ -779,8 +807,10 @@ GetItemID Randomizer::GetItemIdFromRandomizerGet(RandomizerGet randoGet, GetItem
                 case 1:
                     return GI_BOMB_BAG_30;
                 case 2:
-                case 3:
                     return GI_BOMB_BAG_40;
+                case 3:
+                case 4:
+                    return infiniteUpgrades == RO_INF_UPGRADES_PROGRESSIVE ? (GetItemID)RG_BOMB_BAG_INF : GI_BOMB_BAG_40;
             }
         case RG_BOMBS_5:
         case RG_BUY_BOMBS_525:
@@ -801,8 +831,10 @@ GetItemID Randomizer::GetItemIdFromRandomizerGet(RandomizerGet randoGet, GetItem
                 case 1:
                     return GI_QUIVER_40;
                 case 2:
-                case 3:
                     return GI_QUIVER_50;
+                case 3:
+                case 4:
+                    return infiniteUpgrades == RO_INF_UPGRADES_PROGRESSIVE ? (GetItemID)RG_QUIVER_INF : GI_QUIVER_50;
             }
         case RG_ARROWS_5:
         case RG_BUY_ARROWS_10:
@@ -820,8 +852,10 @@ GetItemID Randomizer::GetItemIdFromRandomizerGet(RandomizerGet randoGet, GetItem
                 case 1:
                     return GI_BULLET_BAG_40;
                 case 2:
-                case 3:
                     return GI_BULLET_BAG_50;
+                case 3:
+                case 4:
+                    return infiniteUpgrades == RO_INF_UPGRADES_PROGRESSIVE ? (GetItemID)RG_BULLET_BAG_INF : GI_BULLET_BAG_50;
             }
         case RG_DEKU_SEEDS_30:
         case RG_BUY_DEKU_SEEDS_30:
@@ -843,6 +877,16 @@ GetItemID Randomizer::GetItemIdFromRandomizerGet(RandomizerGet randoGet, GetItem
         case RG_BOMBCHU_20:
         case RG_BUY_BOMBCHU_20:
             return GI_BOMBCHUS_20;
+        case RG_PROGRESSIVE_BOMBCHUS:
+            if (INV_CONTENT(ITEM_BOMBCHU) == ITEM_NONE) {
+                return (GetItemID)RG_PROGRESSIVE_BOMBCHUS;
+            } else if (infiniteUpgrades != RO_INF_UPGRADES_OFF) {
+                return (GetItemID)RG_BOMBCHU_INF;
+            } else if (AMMO(ITEM_BOMBCHU) < 5) {
+                return GI_BOMBCHUS_10;
+            } else {
+                return GI_BOMBCHUS_5;
+            }
         case RG_PROGRESSIVE_HOOKSHOT:
             switch (INV_CONTENT(ITEM_HOOKSHOT)) {
                 case ITEM_NONE:
@@ -959,8 +1003,10 @@ GetItemID Randomizer::GetItemIdFromRandomizerGet(RandomizerGet randoGet, GetItem
                 case 1:
                     return GI_WALLET_GIANT;
                 case 2:
+                    return tycoonWallet ? (GetItemID)RG_TYCOON_WALLET : infiniteUpgrades != RO_INF_UPGRADES_OFF ? (GetItemID)RG_WALLET_INF : GI_WALLET_GIANT;
                 case 3:
-                    return tycoonWallet ? (GetItemID)RG_TYCOON_WALLET : GI_WALLET_GIANT;
+                case 4:
+                    return infiniteUpgrades != RO_INF_UPGRADES_OFF ? (GetItemID)RG_WALLET_INF : tycoonWallet ? (GetItemID)RG_TYCOON_WALLET : GI_WALLET_GIANT;
             }
         case RG_PROGRESSIVE_SCALE:
             if (!Flags_GetRandomizerInf(RAND_INF_CAN_SWIM)) {
@@ -978,8 +1024,10 @@ GetItemID Randomizer::GetItemIdFromRandomizerGet(RandomizerGet randoGet, GetItem
                 case 0:
                     return (GetItemID)RG_MAGIC_SINGLE;
                 case 1:
-                case 2:
                     return (GetItemID)RG_MAGIC_DOUBLE;
+                case 2:
+                case 3:
+                    return infiniteUpgrades != RO_INF_UPGRADES_OFF ? (GetItemID)RG_MAGIC_INF : (GetItemID)RG_MAGIC_DOUBLE;
             }
 
         case RG_RECOVERY_HEART:
@@ -1077,11 +1125,37 @@ bool Randomizer::IsItemVanilla(RandomizerGet randoGet) {
         case RG_GOLD_SKULLTULA_TOKEN:
         case RG_PROGRESSIVE_HOOKSHOT:
         case RG_PROGRESSIVE_STRENGTH:
+            return true;
         case RG_PROGRESSIVE_BOMB_BAG:
+            if (CUR_UPG_VALUE(UPG_BOMB_BAG) < 3) {
+                return true;
+            } else {
+                return false;
+            }
         case RG_PROGRESSIVE_BOW:
+            if (CUR_UPG_VALUE(UPG_QUIVER) < 3) {
+                return true;
+            } else {
+                return false;
+            }
         case RG_PROGRESSIVE_SLINGSHOT:
+            if (CUR_UPG_VALUE(UPG_BULLET_BAG) < 3) {
+                return true;
+            } else {
+                return false;
+            }
         case RG_PROGRESSIVE_NUT_UPGRADE:
+            if (CUR_UPG_VALUE(UPG_NUTS) < 3) {
+                return true;
+            } else {
+                return false;
+            }
         case RG_PROGRESSIVE_STICK_UPGRADE:
+            if (CUR_UPG_VALUE(UPG_STICKS) < 3) {
+                return true;
+            } else {
+                return false;
+            }
         case RG_PROGRESSIVE_OCARINA:
         case RG_PROGRESSIVE_GORONSWORD:
         case RG_EMPTY_BOTTLE:
@@ -1103,6 +1177,9 @@ bool Randomizer::IsItemVanilla(RandomizerGet randoGet) {
         case RG_BOMBCHU_10:
         case RG_BOMBCHU_20:
         case RG_BOMBCHU_DROP:
+            return true;
+        case RG_PROGRESSIVE_BOMBCHUS:
+            return INV_CONTENT(ITEM_BOMBCHU) != ITEM_NONE && !GetRandoSettingValue(RSK_INFINITE_UPGRADES);
         case RG_ARROWS_5:
         case RG_ARROWS_10:
         case RG_ARROWS_30:
@@ -2954,7 +3031,7 @@ CustomMessage Randomizer::GetGoronMessage(u16 index) {
 void Randomizer::CreateCustomMessages() {
     // RANDTODO: Translate into french and german and replace GIMESSAGE_UNTRANSLATED
     // with GIMESSAGE(getItemID, itemID, english, german, french).
-    const std::array<GetItemMessage, 77> getItemMessages = {{
+    const std::array<GetItemMessage, 85> getItemMessages = {{
         GIMESSAGE(RG_GREG_RUPEE, ITEM_MASK_GORON, 
 			"You found %gGreg%w!",
 			"%gGreg%w! Du hast ihn wirklich gefunden!",
@@ -3226,6 +3303,14 @@ void Randomizer::CreateCustomMessages() {
 			"Vous trouvez la %rtouche %y\xa6%r de&l'Ocarina%w! Vous pouvez&maintenant l'utiliser lorsque&vous en jouez!"),
         GIMESSAGE_UNTRANSLATED(RG_BRONZE_SCALE, ITEM_SCALE_SILVER, "You got the %rBronze Scale%w!&The power of buoyancy is yours!"),
         GIMESSAGE_UNTRANSLATED(RG_FISHING_POLE, ITEM_FISHING_POLE, "You found a lost %rFishing Pole%w!&Time to hit the pond!"),
+        GIMESSAGE_UNTRANSLATED(RG_BOMB_BAG_INF, ITEM_BOMB_BAG_40, "You got an %rInfinite Bomb Bag%w!&Now you have %yinfinite bombs%w!"),
+        GIMESSAGE_UNTRANSLATED(RG_QUIVER_INF, ITEM_QUIVER_50, "You got an %rInfinite Quiver%w!&Now you have %yinfinite arrows%w!"),
+        GIMESSAGE_UNTRANSLATED(RG_BULLET_BAG_INF, ITEM_BULLET_BAG_50, "You got an %rInfinite Bullet Bag%w!&Now you have %yinfinite&slingshot seeds%w!"),
+        GIMESSAGE_UNTRANSLATED(RG_STICK_UPGRADE_INF, ITEM_STICK, "You now have %yinfinite%w %rDeku Sticks%w!"),
+        GIMESSAGE_UNTRANSLATED(RG_NUT_UPGRADE_INF, ITEM_NUT, "You now have %yinfinite%w %rDeku Nuts%w!"),
+        GIMESSAGE_UNTRANSLATED(RG_MAGIC_INF, ITEM_MAGIC_LARGE, "You now have %yinfinite%w %rMagic%w!"),
+        GIMESSAGE_UNTRANSLATED(RG_BOMBCHU_INF, ITEM_BOMBCHU, "You now have %yinfinite%w %rBombchus%w!"),
+        GIMESSAGE_UNTRANSLATED(RG_WALLET_INF, ITEM_WALLET_GIANT, "You now have %yinfinite%w %rmoney%w!"),
         GIMESSAGE_UNTRANSLATED(RG_SKELETON_KEY, ITEM_KEY_SMALL, "You found the %rSkeleton Key%w!"),
         GIMESSAGE_UNTRANSLATED(RG_DEKU_STICK_BAG, ITEM_STICK, "You found the %rDeku Stick Bag%w!&You can now hold deku sticks!"),
         GIMESSAGE_UNTRANSLATED(RG_DEKU_NUT_BAG, ITEM_NUT, "You found the %rDeku Nut Bag%w!&You can now hold deku nuts!"),
diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h
index e89059ecd..b423b5235 100644
--- a/soh/soh/Enhancements/randomizer/randomizerTypes.h
+++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@@ -1987,6 +1987,14 @@ typedef enum {
     RG_TYCOON_WALLET,
     RG_BRONZE_SCALE,
     RG_CHILD_WALLET,
+    RG_QUIVER_INF,
+    RG_BOMB_BAG_INF,
+    RG_BULLET_BAG_INF,
+    RG_STICK_UPGRADE_INF,
+    RG_NUT_UPGRADE_INF,
+    RG_MAGIC_INF,
+    RG_BOMBCHU_INF,
+    RG_WALLET_INF,
     RG_FAIRY_OCARINA,
     RG_OCARINA_OF_TIME,
     RG_BOMB_BAG,
@@ -3201,6 +3209,14 @@ typedef enum {
     RHT_BUY_RED_POTION_40,
     RHT_BUY_RED_POTION_50,
     RHT_TRIFORCE,
+    RHT_QUIVER_INF,
+    RHT_BOMB_BAG_INF,
+    RHT_BULLET_BAG_INF,
+    RHT_STICK_UPGRADE_INF,
+    RHT_NUT_UPGRADE_INF,
+    RHT_MAGIC_INF,
+    RHT_BOMBCHU_INF,
+    RHT_WALLET_INF,
     RHT_HINT,
     RHT_TYCOON_WALLET,
     RHT_CHILD_WALLET,
@@ -3715,6 +3731,7 @@ typedef enum {
     RSK_FISHSANITY_POND_COUNT,
     RSK_FISHSANITY_AGE_SPLIT,
     RSK_SHUFFLE_FISHING_POLE,
+    RSK_INFINITE_UPGRADES,
     RSK_SKELETON_KEY,
     RSK_SHUFFLE_DEKU_STICK_BAG,
     RSK_SHUFFLE_DEKU_NUT_BAG,
@@ -3856,6 +3873,13 @@ typedef enum {
     RO_FISHSANITY_BOTH
 } RandoOptionsFishsanity;
 
+//Infinite Upgrades settings (off, progressive, condensed progressive)
+typedef enum {
+    RO_INF_UPGRADES_OFF,
+    RO_INF_UPGRADES_PROGRESSIVE,
+    RO_INF_UPGRADES_CONDENSED_PROGRESSIVE,
+} RandoOptionInfiniteUpgrades;
+
 //Any Dungeon Item (start with, vanilla, own dungeon, any dungeon,
 //overworld, anywhere)
 typedef enum {
diff --git a/soh/soh/Enhancements/randomizer/randomizer_inf.h b/soh/soh/Enhancements/randomizer/randomizer_inf.h
index 72168f018..8a9e8be1f 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_inf.h
+++ b/soh/soh/Enhancements/randomizer/randomizer_inf.h
@@ -257,6 +257,15 @@ typedef enum {
     RAND_INF_ZD_FISH_4,
     RAND_INF_ZD_FISH_5,
 
+    RAND_INF_HAS_INFINITE_QUIVER,
+    RAND_INF_HAS_INFINITE_BOMB_BAG,
+    RAND_INF_HAS_INFINITE_BULLET_BAG,
+    RAND_INF_HAS_INFINITE_STICK_UPGRADE,
+    RAND_INF_HAS_INFINITE_NUT_UPGRADE,
+    RAND_INF_HAS_INFINITE_MAGIC_METER,
+    RAND_INF_HAS_INFINITE_BOMBCHUS,
+    RAND_INF_HAS_INFINITE_MONEY,
+
     RAND_INF_HAS_SKELETON_KEY,
 
     RAND_INF_LINKS_POCKET,
diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
index 28f341631..f3077cf3e 100644
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -184,6 +184,7 @@ void Settings::CreateOptions() {
     // TODO: Compasses show rewards/woth, maps show dungeon mode
     mOptions[RSK_BLUE_FIRE_ARROWS] = Option::Bool("Blue Fire Arrows", CVAR_RANDOMIZER_SETTING("BlueFireArrows"), mOptionDescriptions[RSK_BLUE_FIRE_ARROWS]);
     mOptions[RSK_SUNLIGHT_ARROWS] = Option::Bool("Sunlight Arrows", CVAR_RANDOMIZER_SETTING("SunlightArrows"), mOptionDescriptions[RSK_SUNLIGHT_ARROWS]);
+    mOptions[RSK_INFINITE_UPGRADES] = Option::U8("Infinite Upgrades", {"Off", "Progressive", "Condensed Progressive"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("InfiniteUpgrades"), mOptionDescriptions[RSK_INFINITE_UPGRADES]);
     mOptions[RSK_SKELETON_KEY] = Option::Bool("Skeleton Key", CVAR_RANDOMIZER_SETTING("SkeletonKey"), mOptionDescriptions[RSK_SKELETON_KEY]);
     mOptions[RSK_ITEM_POOL] = Option::U8("Item Pool", {"Plentiful", "Balanced", "Scarce", "Minimal"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ItemPool"), mOptionDescriptions[RSK_ITEM_POOL], WidgetType::Combobox, RO_ITEM_POOL_BALANCED);
     mOptions[RSK_ICE_TRAPS] = Option::U8("Ice Traps", {"Off", "Normal", "Extra", "Mayhem", "Onslaught"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("IceTraps"), mOptionDescriptions[RSK_ICE_TRAPS], WidgetType::Combobox, RO_ICE_TRAPS_NORMAL);
@@ -766,6 +767,7 @@ void Settings::CreateOptions() {
         &mOptions[RSK_ENABLE_BOMBCHU_DROPS],
         &mOptions[RSK_BLUE_FIRE_ARROWS],
         &mOptions[RSK_SUNLIGHT_ARROWS],
+        &mOptions[RSK_INFINITE_UPGRADES],
         &mOptions[RSK_SKELETON_KEY],
     }, false, WidgetContainerType::COLUMN);
     mOptionGroups[RSG_GAMEPLAY_IMGUI_TABLE] = OptionGroup::SubGroup("Gameplay", {
@@ -994,6 +996,7 @@ void Settings::CreateOptions() {
         &mOptions[RSK_DAMAGE_MULTIPLIER],
         &mOptions[RSK_BLUE_FIRE_ARROWS],
         &mOptions[RSK_SUNLIGHT_ARROWS],
+        &mOptions[RSK_INFINITE_UPGRADES],
         &mOptions[RSK_SKELETON_KEY],
     });
     mOptionGroups[RSG_ITEM_POOL] = OptionGroup("Item Pool Settings", std::initializer_list<Option*>({
@@ -1213,6 +1216,7 @@ void Settings::CreateOptions() {
         { "Miscellaneous Settings:Hint Distribution", RSK_HINT_DISTRIBUTION },
         { "Miscellaneous Settings:Blue Fire Arrows", RSK_BLUE_FIRE_ARROWS },
         { "Miscellaneous Settings:Sunlight Arrows", RSK_SUNLIGHT_ARROWS },
+        { "Miscellaneous Settings:Infinite Upgrades", RSK_INFINITE_UPGRADES },
         { "Miscellaneous Settings:Skeleton Key", RSK_SKELETON_KEY },
         { "Timesaver Settings:Skip Child Zelda", RSK_SKIP_CHILD_ZELDA },
         { "Start with Consumables", RSK_STARTING_CONSUMABLES },
@@ -2363,6 +2367,7 @@ void Settings::ParseJson(nlohmann::json spoilerFileJson) {
                 case RSK_SKULLS_SUNS_SONG:
                 case RSK_BLUE_FIRE_ARROWS:
                 case RSK_SUNLIGHT_ARROWS:
+                case RSK_INFINITE_UPGRADES:
                 case RSK_SKELETON_KEY:
                 case RSK_BOMBCHUS_IN_LOGIC:
                 case RSK_TOT_ALTAR_HINT:
diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c
index 31b2a6d0b..0cfde00b7 100644
--- a/soh/src/code/z_parameter.c
+++ b/soh/src/code/z_parameter.c
@@ -2768,6 +2768,8 @@ u16 Randomizer_Item_Give(PlayState* play, GetItemEntry giEntry) {
         if (INV_CONTENT(ITEM_BOMBCHU) == ITEM_NONE) {
             INV_CONTENT(ITEM_BOMBCHU) = ITEM_BOMBCHU;
             AMMO(ITEM_BOMBCHU) = 20;
+        } else if (Randomizer_GetSettingValue(RSK_INFINITE_UPGRADES)) {
+            Flags_SetRandomizerInf(RAND_INF_HAS_INFINITE_BOMBCHUS);
         } else {
             AMMO(ITEM_BOMBCHU) += AMMO(ITEM_BOMBCHU) < 5 ? 10 : 5;
             if (AMMO(ITEM_BOMBCHU) > 50) {
@@ -2796,6 +2798,46 @@ u16 Randomizer_Item_Give(PlayState* play, GetItemEntry giEntry) {
         return Return_Item_Entry(giEntry, RG_NONE);
     }
 
+    if (item == RG_QUIVER_INF) {
+        Flags_SetRandomizerInf(RAND_INF_HAS_INFINITE_QUIVER);
+        return Return_Item_Entry(giEntry, RG_NONE);
+    }
+
+    if (item == RG_BOMB_BAG_INF) {
+        Flags_SetRandomizerInf(RAND_INF_HAS_INFINITE_BOMB_BAG);
+        return Return_Item_Entry(giEntry, RG_NONE);
+    }
+
+    if (item == RG_BULLET_BAG_INF) {
+        Flags_SetRandomizerInf(RAND_INF_HAS_INFINITE_BULLET_BAG);
+        return Return_Item_Entry(giEntry, RG_NONE);
+    }
+
+    if (item == RG_STICK_UPGRADE_INF) {
+        Flags_SetRandomizerInf(RAND_INF_HAS_INFINITE_STICK_UPGRADE);
+        return Return_Item_Entry(giEntry, RG_NONE);
+    }
+
+    if (item == RG_NUT_UPGRADE_INF) {
+        Flags_SetRandomizerInf(RAND_INF_HAS_INFINITE_NUT_UPGRADE);
+        return Return_Item_Entry(giEntry, RG_NONE);
+    }
+
+    if (item == RG_MAGIC_INF) {
+        Flags_SetRandomizerInf(RAND_INF_HAS_INFINITE_MAGIC_METER);
+        return Return_Item_Entry(giEntry, RG_NONE);
+    }
+
+    if (item == RG_BOMBCHU_INF) {
+        Flags_SetRandomizerInf(RAND_INF_HAS_INFINITE_BOMBCHUS);
+        return Return_Item_Entry(giEntry, RG_NONE);
+    }
+
+    if (item == RG_WALLET_INF) {
+        Flags_SetRandomizerInf(RAND_INF_HAS_INFINITE_MONEY);
+        return Return_Item_Entry(giEntry, RG_NONE);
+    }
+
     if (item == RG_SKELETON_KEY) {
         Flags_SetRandomizerInf(RAND_INF_HAS_SKELETON_KEY);
         return Return_Item_Entry(giEntry, RG_NONE);
@@ -3578,21 +3620,23 @@ void Interface_UpdateMagicBar(PlayState* play) {
             break;
 
         case MAGIC_STATE_CONSUME:
-            gSaveContext.magic -= 2;
-            if (gSaveContext.magic <= 0) {
-                gSaveContext.magic = 0;
-                gSaveContext.magicState = MAGIC_STATE_METER_FLASH_1;
-                if (CVarGetInteger(CVAR_COSMETIC("Consumable.MagicBorder.Changed"), 0)) {
-                    sMagicBorder = CVarGetColor24(CVAR_COSMETIC("Consumable.MagicBorder.Value"), sMagicBorder_ori);
-                } else {
-                    sMagicBorder = sMagicBorder_ori;
-                }
-            } else if (gSaveContext.magic == gSaveContext.magicTarget) {
-                gSaveContext.magicState = MAGIC_STATE_METER_FLASH_1;
-                if (CVarGetInteger(CVAR_COSMETIC("Consumable.MagicBorder.Changed"), 0)) {
-                    sMagicBorder = CVarGetColor24(CVAR_COSMETIC("Consumable.MagicBorder.Value"), sMagicBorder_ori);
-                } else {
-                    sMagicBorder = sMagicBorder_ori;
+            if (!Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_MAGIC_METER)) {
+                gSaveContext.magic -= 2;
+                if (gSaveContext.magic <= 0) {
+                    gSaveContext.magic = 0;
+                    gSaveContext.magicState = MAGIC_STATE_METER_FLASH_1;
+                    if (CVarGetInteger(CVAR_COSMETIC("Consumable.MagicBorder.Changed"), 0)) {
+                        sMagicBorder = CVarGetColor24(CVAR_COSMETIC("Consumable.MagicBorder.Value"), sMagicBorder_ori);
+                    } else {
+                        sMagicBorder = sMagicBorder_ori;
+                    }
+                } else if (gSaveContext.magic == gSaveContext.magicTarget) {
+                    gSaveContext.magicState = MAGIC_STATE_METER_FLASH_1;
+                    if (CVarGetInteger(CVAR_COSMETIC("Consumable.MagicBorder.Changed"), 0)) {
+                        sMagicBorder = CVarGetColor24(CVAR_COSMETIC("Consumable.MagicBorder.Value"), sMagicBorder_ori);
+                    } else {
+                        sMagicBorder = sMagicBorder_ori;
+                    }
                 }
             }
         case MAGIC_STATE_METER_FLASH_1:
@@ -3756,6 +3800,7 @@ void Interface_DrawMagicBar(PlayState* play) {
     s16 magicBarY;
     Color_RGB8 magicbar_yellow = {250,250,0}; //Magic bar being used
     Color_RGB8 magicbar_green = {R_MAGIC_FILL_COLOR(0),R_MAGIC_FILL_COLOR(1),R_MAGIC_FILL_COLOR(2)}; //Magic bar fill
+    Color_RGB8 magicbar_blue = {0,0,200};//Infinite magic bar
 
     if (CVarGetInteger(CVAR_COSMETIC("Consumable.MagicActive.Changed"), 0)) {
         magicbar_yellow = CVarGetColor24(CVAR_COSMETIC("Consumable.MagicActive.Value"), magicbar_yellow);
@@ -3763,6 +3808,9 @@ void Interface_DrawMagicBar(PlayState* play) {
     if (CVarGetInteger(CVAR_COSMETIC("Consumable.Magic.Changed"), 0)) {
         magicbar_green = CVarGetColor24(CVAR_COSMETIC("Consumable.Magic.Value"), magicbar_green);
     }
+    if (CVarGetInteger("gCosmetics.Consumable_MagicInfinite.Changed", 0)) {
+        magicbar_blue = CVarGetColor24("gCosmetics.Consumable_MagicInfinite.Value", magicbar_blue);
+    }
 
     OPEN_DISPS(play->state.gfxCtx);
 
@@ -3870,14 +3918,26 @@ void Interface_DrawMagicBar(PlayState* play) {
 
             // Fill the rest of the bar with the normal magic color
             gDPPipeSync(OVERLAY_DISP++);
-            gDPSetPrimColor(OVERLAY_DISP++, 0, 0, magicbar_green.r, magicbar_green.g, magicbar_green.b, interfaceCtx->magicAlpha);
+            if (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_MAGIC_METER)) {
+                // Blue magic
+                gDPSetPrimColor(OVERLAY_DISP++, 0, 0, magicbar_blue.r, magicbar_blue.g, magicbar_blue.b, interfaceCtx->magicAlpha);
+            } else {
+                // Green magic (default)
+                gDPSetPrimColor(OVERLAY_DISP++, 0, 0, magicbar_green.r, magicbar_green.g, magicbar_green.b, interfaceCtx->magicAlpha);
+            }
 
             gSPWideTextureRectangle(OVERLAY_DISP++, rMagicFillX << 2, (magicBarY + 3) << 2,
                                 (rMagicFillX + gSaveContext.magicTarget) << 2, (magicBarY + 10) << 2, G_TX_RENDERTILE,
                                 0, 0, 1 << 10, 1 << 10);
         } else {
             // Fill the whole bar with the normal magic color
-            gDPSetPrimColor(OVERLAY_DISP++, 0, 0, magicbar_green.r, magicbar_green.g, magicbar_green.b, interfaceCtx->magicAlpha);
+            if (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_MAGIC_METER)) {
+                // Blue magic
+                gDPSetPrimColor(OVERLAY_DISP++, 0, 0, magicbar_blue.r, magicbar_blue.g, magicbar_blue.b, interfaceCtx->magicAlpha);
+            } else {
+                // Green magic (default)
+                gDPSetPrimColor(OVERLAY_DISP++, 0, 0, magicbar_green.r, magicbar_green.g, magicbar_green.b, interfaceCtx->magicAlpha);
+            }
 
             gDPLoadMultiBlock_4b(OVERLAY_DISP++, gMagicMeterFillTex, 0, G_TX_RENDERTILE, G_IM_FMT_I, 16, 16, 0,
                                  G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK,
@@ -5021,10 +5081,25 @@ void Interface_DrawAmmoCount(PlayState* play, s16 button, s16 alpha) {
 
     i = gSaveContext.equips.buttonItems[button];
 
-    if ((i == ITEM_STICK) || (i == ITEM_NUT) || (i == ITEM_BOMB) || (i == ITEM_BOW) ||
-        ((i >= ITEM_BOW_ARROW_FIRE) && (i <= ITEM_BOW_ARROW_LIGHT)) || (i == ITEM_SLINGSHOT) || (i == ITEM_BOMBCHU) ||
-        (i == ITEM_BEAN)) {
-
+    if (
+        GameInteractor_Should(
+            VB_DRAW_AMMO_COUNT,
+            (
+                (i == ITEM_STICK) ||
+                (i == ITEM_NUT) ||
+                (i == ITEM_BOMB) ||
+                (i == ITEM_BOW) ||
+                (
+                    (i >= ITEM_BOW_ARROW_FIRE) &&
+                    (i <= ITEM_BOW_ARROW_LIGHT)
+                ) ||
+                (i == ITEM_SLINGSHOT) ||
+                (i == ITEM_BOMBCHU) ||
+                (i == ITEM_BEAN)
+            ),
+            &i
+        )
+    ) {
         if ((i >= ITEM_BOW_ARROW_FIRE) && (i <= ITEM_BOW_ARROW_LIGHT)) {
             i = ITEM_BOW;
         }
@@ -5297,8 +5372,8 @@ void Interface_Draw(PlayState* play) {
         if (fullUi) {
             s16 PosX_RC;
             s16 PosY_RC;
-            //when not having a wallet in rando, don't calculate the ruppe icon
-            if (!IS_RANDO || Flags_GetRandomizerInf(RAND_INF_HAS_WALLET)) {
+            //when not having a wallet (or infinite money) in rando, don't calculate the ruppe icon
+            if (!IS_RANDO || (Flags_GetRandomizerInf(RAND_INF_HAS_WALLET) && !Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_MONEY))) {
                 // Rupee Icon
                 if (CVarGetInteger(CVAR_ENHANCEMENT("DynamicWalletIcon"), 0)) {
                     switch (CUR_UPG_VALUE(UPG_WALLET)) {
diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c
index 83b734156..d34ce4d8a 100644
--- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c
+++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c
@@ -6,6 +6,9 @@
 #include "soh/Enhancements/enhancementTypes.h"
 #include "soh/Enhancements/cosmetics/cosmeticsTypes.h"
 
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+
 u8 gAmmoItems[] = {
     ITEM_STICK,   ITEM_NUT,  ITEM_BOMB, ITEM_BOW,  ITEM_NONE, ITEM_NONE, ITEM_SLINGSHOT, ITEM_NONE,
     ITEM_BOMBCHU, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_BEAN,      ITEM_NONE,
@@ -37,6 +40,10 @@ s8 ItemInSlotUsesAmmo(s16 slot) {
 }
 
 void KaleidoScope_DrawAmmoCount(PauseContext* pauseCtx, GraphicsContext* gfxCtx, s16 item, int slot) {
+    if (!GameInteractor_Should(VB_DRAW_AMMO_COUNT, true, &item)) {
+        return;
+    }
+
     s16 ammo;
     s16 i;
 

From c68cecec71803e5fe8102aa06bdff61161cc1236 Mon Sep 17 00:00:00 2001
From: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>
Date: Tue, 23 Jul 2024 17:56:44 +0200
Subject: [PATCH 168/230] Rando: Shuffle Hyrule Loach (Rando V3) (#3805)

* Shuffle Hyrule Loach

* Remove rando specific loach text override

* Remove duplicated enhancement from fishsanity

* Re-run Build

* Re-run Build

* Changed to be an option within fishsanity

* Rename cvar and fix check tracker

* Fix build

* Re-run build

* Re-re-run build

* Update z_fishing.c

* Fix AllHyruleLoaches

* Fix static data

* Fix hint spacing

* Restrict loach hint to "Shuffle only Hyrule Loach"

* Update settings.cpp

* Address review
---
 .../custom-message/CustomMessageTypes.h       |  8 ++
 .../Enhancements/debugger/debugSaveEditor.h   |  2 +
 .../randomizer/3drando/hint_list.cpp          |  3 +
 .../randomizer/3drando/item_pool.cpp          |  6 ++
 .../location_access/locacc_hyrule_field.cpp   | 73 ++++++++++---------
 .../Enhancements/randomizer/location_list.cpp |  2 +
 .../randomizer/option_descriptions.cpp        |  3 +
 .../Enhancements/randomizer/randomizer.cpp    |  2 +-
 .../Enhancements/randomizer/randomizerTypes.h |  7 +-
 .../randomizer/randomizer_check_objects.cpp   |  2 +
 .../randomizer/randomizer_check_tracker.cpp   |  5 ++
 .../Enhancements/randomizer/randomizer_inf.h  |  2 +
 soh/soh/Enhancements/randomizer/settings.cpp  | 21 +++++-
 .../Enhancements/randomizer/static_data.cpp   |  2 +
 soh/soh/OTRGlobals.cpp                        | 16 +++-
 soh/soh/SohMenuBar.cpp                        |  3 +-
 .../overlays/actors/ovl_Fishing/z_fishing.c   | 55 +++++++-------
 17 files changed, 144 insertions(+), 68 deletions(-)

diff --git a/soh/soh/Enhancements/custom-message/CustomMessageTypes.h b/soh/soh/Enhancements/custom-message/CustomMessageTypes.h
index 6d25d9f8a..93681ebe9 100644
--- a/soh/soh/Enhancements/custom-message/CustomMessageTypes.h
+++ b/soh/soh/Enhancements/custom-message/CustomMessageTypes.h
@@ -138,7 +138,15 @@ typedef enum {
     TEXT_BEAN_SALESMAN_SOLD_OUT = 0x406B,
     TEXT_BEAN_SALESMAN_WANT_TO_PLANT = 0x406C,
     TEXT_FISHING_POND_START = 0x407B,
+    TEXT_FISHING_TALK_ABOUT_SOMETHING = 0x4088,
+    TEXT_FISHING_TRY_ANOTHER_LURE = 0x408D,
+    TEXT_FISHING_SECRETS = 0x408E,
+    TEXT_FISHING_GOOD_FISHERMAN = 0x408F,
     TEXT_FISHING_POND_START_MET = 0x4093,
+    TEXT_FISHING_DIFFERENT_POND = 0x4094,
+    TEXT_FISHING_SCRATCHING = 0x4095,
+    TEXT_FISHING_CLOUDY = 0x4096,
+    TEXT_FISHING_TRY_ANOTHER_LURE_WITH_SINKING_LURE = 0x40AF,
     TEXT_DAMPES_DIARY = 0x5003,
     TEXT_GRANNYS_SHOP = 0x500C,
     TEXT_ANJU_PLEASE_BRING_MY_CUCCOS_BACK = 0x5036,
diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.h b/soh/soh/Enhancements/debugger/debugSaveEditor.h
index 4199b7172..c3e01b657 100644
--- a/soh/soh/Enhancements/debugger/debugSaveEditor.h
+++ b/soh/soh/Enhancements/debugger/debugSaveEditor.h
@@ -510,6 +510,8 @@ const std::vector<FlagTable> flagTables = {
         { RAND_INF_HAS_OCARINA_C_LEFT, "RAND_INF_HAS_OCARINA_C_LEFT"},
         { RAND_INF_HAS_OCARINA_C_RIGHT, "RAND_INF_HAS_OCARINA_C_RIGHT"},
 
+        { RAND_INF_CAUGHT_LOACH, "RAND_INF_CAUGHT_LOACH" },
+
         { RAND_INF_CAN_SWIM, "RAND_INF_CAN_SWIM" },
 
         { RAND_INF_HAS_WALLET, "RAND_INF_HAS_WALLET" },
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
index 3d0ae5940..ca60835e6 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
@@ -2752,6 +2752,9 @@ void StaticData::HintTable_Init() {
                                                 /*french*/ "As-tu récemment ressenti une vague de #puissance magique#? Un mystérieux hibou m'a dit  qu'elle provenait du #[[1]]#. Tu devrais aller y jeter un coup d'oeil, @!\x0B",
                                                            {QM_GREEN, QM_RED}, {}, TEXTBOX_TYPE_BLUE));
 
+    hintTextTable[RHT_LOACH_HINT] = HintText(CustomMessage("What?^You wanna know about the&%rHyrule Loach%w?^It's a big fish, but it's so rare that I'll give my %g[[1]]%w to anyone who catches it. Seriously!",
+                                                                  {QM_RED}));
+
     hintTextTable[RHT_FISHING_POLE_HINT] = HintText(CustomMessage("^If I remember correctly, I lost it somewhere in #[[1]]#...&Let me know if you find it!",
                                                                   {QM_RED}));
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
index 514e81ce4..fd78f1843 100644
--- a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
@@ -836,6 +836,12 @@ void GenerateItemPool() {
     } else {
       PlaceVanillaOverworldFish();
     }
+
+    if (fsMode.Is(RO_FISHSANITY_HYRULE_LOACH)) {
+      AddItemToMainPool(RG_PURPLE_RUPEE);
+    } else {
+      ctx->PlaceItemInLocation(RC_LH_HYRULE_LOACH, RG_PURPLE_RUPEE, false, true);
+    }
   } else {
     PlaceVanillaOverworldFish();
   }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
index d5d966308..860b90e8b 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
@@ -167,42 +167,43 @@ void AreaTable_Init_HyruleField() {
   // TODO: should some of these helpers be done via events instead?
   areaTable[RR_LH_FISHING_HOLE] = Area("LH Fishing Hole", "LH Fishing Hole", RA_NONE, DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_LH_CHILD_FISHING, logic->CanFish && logic->IsChild),
-                  LOCATION(RC_LH_CHILD_FISH_1,  logic->CanGetChildFish),
-                  LOCATION(RC_LH_CHILD_FISH_2,  logic->CanGetChildFish),
-                  LOCATION(RC_LH_CHILD_FISH_3,  logic->CanGetChildFish),
-                  LOCATION(RC_LH_CHILD_FISH_4,  logic->CanGetChildFish),
-                  LOCATION(RC_LH_CHILD_FISH_5,  logic->CanGetChildFish),
-                  LOCATION(RC_LH_CHILD_FISH_6,  logic->CanGetChildFish),
-                  LOCATION(RC_LH_CHILD_FISH_7,  logic->CanGetChildFish),
-                  LOCATION(RC_LH_CHILD_FISH_8,  logic->CanGetChildFish),
-                  LOCATION(RC_LH_CHILD_FISH_9,  logic->CanGetChildFish),
-                  LOCATION(RC_LH_CHILD_FISH_10, logic->CanGetChildFish),
-                  LOCATION(RC_LH_CHILD_FISH_11, logic->CanGetChildFish),
-                  LOCATION(RC_LH_CHILD_FISH_12, logic->CanGetChildFish),
-                  LOCATION(RC_LH_CHILD_FISH_13, logic->CanGetChildFish),
-                  LOCATION(RC_LH_CHILD_FISH_14, logic->CanGetChildFish),
-                  LOCATION(RC_LH_CHILD_FISH_15, logic->CanGetChildFish),
-                  LOCATION(RC_LH_CHILD_LOACH_1, logic->CanGetChildFish),
-                  LOCATION(RC_LH_CHILD_LOACH_2, logic->CanGetChildFish),
-                  LOCATION(RC_LH_ADULT_FISHING, logic->CanFish && logic->IsAdult),
-                  LOCATION(RC_LH_ADULT_FISH_1,  logic->CanGetAdultFish),
-                  LOCATION(RC_LH_ADULT_FISH_2,  logic->CanGetAdultFish),
-                  LOCATION(RC_LH_ADULT_FISH_3,  logic->CanGetAdultFish),
-                  LOCATION(RC_LH_ADULT_FISH_4,  logic->CanGetAdultFish),
-                  LOCATION(RC_LH_ADULT_FISH_5,  logic->CanGetAdultFish),
-                  LOCATION(RC_LH_ADULT_FISH_6,  logic->CanGetAdultFish),
-                  LOCATION(RC_LH_ADULT_FISH_7,  logic->CanGetAdultFish),
-                  LOCATION(RC_LH_ADULT_FISH_8,  logic->CanGetAdultFish),
-                  LOCATION(RC_LH_ADULT_FISH_9,  logic->CanGetAdultFish),
-                  LOCATION(RC_LH_ADULT_FISH_10, logic->CanGetAdultFish),
-                  LOCATION(RC_LH_ADULT_FISH_11, logic->CanGetAdultFish),
-                  LOCATION(RC_LH_ADULT_FISH_12, logic->CanGetAdultFish),
-                  LOCATION(RC_LH_ADULT_FISH_13, logic->CanGetAdultFish),
-                  LOCATION(RC_LH_ADULT_FISH_14, logic->CanGetAdultFish),
-                  LOCATION(RC_LH_ADULT_FISH_15, logic->CanGetAdultFish),
-                  LOCATION(RC_LH_ADULT_LOACH,   logic->CanGetAdultFish),
-                  LOCATION(RC_FISHING_POLE_HINT,true),
+                  LOCATION(RC_LH_CHILD_FISHING,  logic->CanFish && logic->IsChild),
+                  LOCATION(RC_LH_CHILD_FISH_1,   logic->CanGetChildFish),
+                  LOCATION(RC_LH_CHILD_FISH_2,   logic->CanGetChildFish),
+                  LOCATION(RC_LH_CHILD_FISH_3,   logic->CanGetChildFish),
+                  LOCATION(RC_LH_CHILD_FISH_4,   logic->CanGetChildFish),
+                  LOCATION(RC_LH_CHILD_FISH_5,   logic->CanGetChildFish),
+                  LOCATION(RC_LH_CHILD_FISH_6,   logic->CanGetChildFish),
+                  LOCATION(RC_LH_CHILD_FISH_7,   logic->CanGetChildFish),
+                  LOCATION(RC_LH_CHILD_FISH_8,   logic->CanGetChildFish),
+                  LOCATION(RC_LH_CHILD_FISH_9,   logic->CanGetChildFish),
+                  LOCATION(RC_LH_CHILD_FISH_10,  logic->CanGetChildFish),
+                  LOCATION(RC_LH_CHILD_FISH_11,  logic->CanGetChildFish),
+                  LOCATION(RC_LH_CHILD_FISH_12,  logic->CanGetChildFish),
+                  LOCATION(RC_LH_CHILD_FISH_13,  logic->CanGetChildFish),
+                  LOCATION(RC_LH_CHILD_FISH_14,  logic->CanGetChildFish),
+                  LOCATION(RC_LH_CHILD_FISH_15,  logic->CanGetChildFish),
+                  LOCATION(RC_LH_CHILD_LOACH_1,  logic->CanGetChildFish),
+                  LOCATION(RC_LH_CHILD_LOACH_2,  logic->CanGetChildFish),
+                  LOCATION(RC_LH_ADULT_FISHING,  logic->CanFish && logic->IsAdult),
+                  LOCATION(RC_LH_ADULT_FISH_1,   logic->CanGetAdultFish),
+                  LOCATION(RC_LH_ADULT_FISH_2,   logic->CanGetAdultFish),
+                  LOCATION(RC_LH_ADULT_FISH_3,   logic->CanGetAdultFish),
+                  LOCATION(RC_LH_ADULT_FISH_4,   logic->CanGetAdultFish),
+                  LOCATION(RC_LH_ADULT_FISH_5,   logic->CanGetAdultFish),
+                  LOCATION(RC_LH_ADULT_FISH_6,   logic->CanGetAdultFish),
+                  LOCATION(RC_LH_ADULT_FISH_7,   logic->CanGetAdultFish),
+                  LOCATION(RC_LH_ADULT_FISH_8,   logic->CanGetAdultFish),
+                  LOCATION(RC_LH_ADULT_FISH_9,   logic->CanGetAdultFish),
+                  LOCATION(RC_LH_ADULT_FISH_10,  logic->CanGetAdultFish),
+                  LOCATION(RC_LH_ADULT_FISH_11,  logic->CanGetAdultFish),
+                  LOCATION(RC_LH_ADULT_FISH_12,  logic->CanGetAdultFish),
+                  LOCATION(RC_LH_ADULT_FISH_13,  logic->CanGetAdultFish),
+                  LOCATION(RC_LH_ADULT_FISH_14,  logic->CanGetAdultFish),
+                  LOCATION(RC_LH_ADULT_FISH_15,  logic->CanGetAdultFish),
+                  LOCATION(RC_LH_ADULT_LOACH,    logic->CanGetAdultFish),
+                  LOCATION(RC_LH_HYRULE_LOACH,   logic->CanFish),
+                  LOCATION(RC_FISHING_POLE_HINT, true),
                 }, {
                   //Exits
                   Entrance(RR_LH_FISHING_ISLAND, {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/location_list.cpp b/soh/soh/Enhancements/randomizer/location_list.cpp
index 987565352..ad09e683d 100644
--- a/soh/soh/Enhancements/randomizer/location_list.cpp
+++ b/soh/soh/Enhancements/randomizer/location_list.cpp
@@ -157,6 +157,7 @@ std::vector<RandomizerCheck> Rando::StaticData::overworldLocations = {
     // Lake Hylia
     RC_LH_CHILD_FISHING,
     RC_LH_ADULT_FISHING,
+    RC_LH_HYRULE_LOACH,
     RC_LH_LAB_DIVE,
     RC_LH_TRADE_FROG,
     RC_LH_UNDERWATER_ITEM,
@@ -643,6 +644,7 @@ void Rando::StaticData::InitLocationTable() { //
     // Lake Hylia
     locationTable[RC_LH_CHILD_FISHING] =                                               Location::Base(RC_LH_CHILD_FISHING,                                             RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LAKE_HYLIA,                   ACTOR_ID_MAX,         SCENE_FISHING_POND,                 0x00,                                              0x3E, "Child Fishing",                               RHT_LH_CHILD_FISHING,                                            RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_CHILD_FISHING),                                                                SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,                 true);
     locationTable[RC_LH_ADULT_FISHING] =                                               Location::Base(RC_LH_ADULT_FISHING,                                             RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LAKE_HYLIA,                   ACTOR_ID_MAX,         SCENE_FISHING_POND,                 0x00,                                              0x38, "Adult Fishing",                               RHT_LH_ADULT_FISHING,                                            RG_PROGRESSIVE_SCALE,                 {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ADULT_FISHING),                                                                SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,                 true);
+    locationTable[RC_LH_HYRULE_LOACH] =                                                Location::Base(RC_LH_HYRULE_LOACH,                                              RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LAKE_HYLIA,                   ACTOR_ID_MAX,         SCENE_FISHING_POND,                 0x00,                                              0x00, "Hyrule Loach Reward",                         RHT_LH_HYRULE_LOACH,                                             RG_PURPLE_RUPEE,                      {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_CAUGHT_LOACH),                                                                 SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
     locationTable[RC_LH_LAB_DIVE] =                                                    Location::Base(RC_LH_LAB_DIVE,                                                  RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LAKE_HYLIA,                   ACTOR_ID_MAX,         SCENE_LAKESIDE_LABORATORY,          0x00,                                              0x3E, "Lab Dive",                                    RHT_LH_LAB_DIVE,                                                 RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::ItemGetInf(16),                                                                                       SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,                 true);
     locationTable[RC_LH_TRADE_FROG] =                                                  Location::Base(RC_LH_TRADE_FROG,                                                RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_LAKE_HYLIA,                   ACTOR_ID_MAX,         SCENE_LAKESIDE_LABORATORY,          0x00,                                              0x25, "Lab Trade Eyeball Frog",                      RHT_LH_TRADE_FROG,                                               RG_EYEDROPS,                          { Category::cAdultTrade },                              SpoilerCollectionCheck::RandomizerInf(RAND_INF_ADULT_TRADES_LH_TRADE_FROG),                                                   SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,                 true);
     locationTable[RC_LH_UNDERWATER_ITEM] =                                             Location::Base(RC_LH_UNDERWATER_ITEM,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LAKE_HYLIA,                   ACTOR_ID_MAX,         SCENE_LAKE_HYLIA,                   0x00,                                              0x15, "Underwater Item",                             RHT_LH_UNDERWATER_ITEM,                                          RG_RUTOS_LETTER,                      {},                                                     SpoilerCollectionCheck::EventChkInf(0x31),                                                                                    SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,                 true);
diff --git a/soh/soh/Enhancements/randomizer/option_descriptions.cpp b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
index 6b5ebc893..36c270642 100644
--- a/soh/soh/Enhancements/randomizer/option_descriptions.cpp
+++ b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
@@ -279,6 +279,7 @@ void Settings::CreateOptionDescriptions() {
         "Affordable prices per tier: starter = 10, adult = 105, giant = 205, tycoon = 505\n\n"
         "Use this to enable wallet tier locking, but make shop items not as expensive as they could be.";
     mOptionDescriptions[RSK_FISHSANITY] = "Off - Fish will not be shuffled. No changes will be made to fishing behavior.\n\n"
+        "Shuffle only Hyrule Loach - Allows you to earn an item by catching the hyrule loach at the fishing pond and giving it to the owner.\n\n"
         "Shuffle Fishing Pond - The fishing pond's fish will be shuffled. Catching a fish in the fishing pond will grant a reward.\n\n"
         "Shuffle Overworld Fish - Fish in generic grottos and Zora's Domain will be shuffled. Catching a fish in a bottle will give a reward.\n\n"
         "Shuffle Both - Both overworld fish and fish in the fishing pond will be shuffled.";
@@ -526,6 +527,8 @@ void Settings::CreateOptionDescriptions() {
         "Reading the diary of Dampé the gravekeeper as adult will tell you the location of one of the Hookshots.";
     mOptionDescriptions[RSK_GREG_HINT] =
         "Talking to the chest game owner after buying a key will tell you the location of Greg the Green Rupee.";
+    mOptionDescriptions[RSK_LOACH_HINT] =
+        "Talking to the fishing pond owner and asking to talk about something will tell you what's the reward for the Hyrule Loach.";
     mOptionDescriptions[RSK_SARIA_HINT] = "Talking to Saria either in person or through Saria's Song will tell you the "
                                           "location of a progressive magic meter.";
     mOptionDescriptions[RSK_FISHING_POLE_HINT] = "Talking to the fishing pond owner without the fishing pole will tell you its location.";
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index b2c047e63..01b3f49c9 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -86,7 +86,7 @@ static const char* englishRupeeNames[171] = {
     "Frog Coins",        "Gald",             "Gekz",             "Gems",             "Geo",
     "Gil",               "Glimmer",          "Glitches",         "Gold",             "Gold Dragons",
     "Goober Dollars",    "Green Herbs",      "Greg Siblings",    "Gummybears",       "Hell",
-    "Hylian Loaches",    "Ice Traps",        "ISK",              "Jiggies",          "KF7 Ammo",
+    "Hyrule Loaches",    "Ice Traps",        "ISK",              "Jiggies",          "KF7 Ammo",
     "Kinstones",         "Kremcoins",        "Kroner",           "Leaves ",          "Lemmings",
     "Lien",              "Lira",             "Lumber",           "Lungmen Dollars",  "Macca",
     "Mana",              "Mann Co. Keys",    "Meat",             "Meat Stacks",      "Medaparts",
diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h
index b423b5235..1b772367d 100644
--- a/soh/soh/Enhancements/randomizer/randomizerTypes.h
+++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@@ -945,6 +945,7 @@ typedef enum {
     RC_LH_CHILD_LOACH_1,
     RC_LH_CHILD_LOACH_2,
     RC_LH_ADULT_FISHING,
+    RC_LH_HYRULE_LOACH,
     RC_LH_ADULT_FISH_1,
     RC_LH_ADULT_FISH_2,
     RC_LH_ADULT_FISH_3,
@@ -2076,6 +2077,7 @@ typedef enum {
     RH_ALTAR_CHILD,
     RH_ALTAR_ADULT,
     RH_SARIA_HINT,
+    RH_LOACH_HINT,
     RH_FISHING_POLE,
     RH_MINUET_WARP_LOC,
     RH_BOLERO_WARP_LOC,
@@ -3448,6 +3450,7 @@ typedef enum {
     RHT_GREG_HINT,
     RHT_SARIA_TALK_HINT,
     RHT_SARIA_SONG_HINT,
+    RHT_LOACH_HINT,
     RHT_FISHING_POLE_HINT,
     // Static Entrance Hints
     RHT_WARP_SONG,
@@ -3625,6 +3628,7 @@ typedef enum {
     RSK_SHEIK_LA_HINT,
     RSK_DAMPES_DIARY_HINT,
     RSK_GREG_HINT,
+    RSK_LOACH_HINT,
     RSK_SARIA_HINT,
     RSK_FROGS_HINT,
     RSK_OOT_HINT,
@@ -3865,9 +3869,10 @@ typedef enum {
     RO_BOSS_SOULS_ON_PLUS_GANON,
 } RandoOptionBossSouls;
 
-//Fishsanity settings (off, pond only, grottos only, both)
+//Fishsanity settings (off, loach only, pond only, grottos only, both)
 typedef enum {
     RO_FISHSANITY_OFF,
+    RO_FISHSANITY_HYRULE_LOACH,
     RO_FISHSANITY_POND,
     RO_FISHSANITY_OVERWORLD,
     RO_FISHSANITY_BOTH
diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp
index ddedd5b53..3b5eed450 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp
@@ -161,6 +161,8 @@ void RandomizerCheckObjects::UpdateImGuiVisibility() {
              CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleAdultTrade"), RO_GENERIC_NO)) &&
             (location.GetRandomizerCheck() != RC_KF_KOKIRI_SWORD_CHEST ||
              CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleKokiriSword"), RO_GENERIC_NO)) &&
+            (location.GetRandomizerCheck() != RC_LH_HYRULE_LOACH ||
+             CVarGetInteger(CVAR_RANDOMIZER_SETTING("Fishsanity"), RO_GENERIC_NO) == RO_FISHSANITY_HYRULE_LOACH) &&
             (location.GetRandomizerCheck() != RC_ZR_MAGIC_BEAN_SALESMAN ||
              CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleBeans"), RO_GENERIC_NO)) &&
             (location.GetRandomizerCheck() != RC_HC_MALON_EGG ||
diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
index 76c293950..de46a4496 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
@@ -65,6 +65,7 @@ bool showCows;
 bool showAdultTrade;
 bool showKokiriSword;
 bool showMasterSword;
+bool showHyruleLoach;
 bool showWeirdEgg;
 bool showGerudoCard;
 bool showFrogSongRupees;
@@ -1167,6 +1168,9 @@ void LoadSettings() {
     showMasterSword = IS_RANDO ?
         OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_MASTER_SWORD) == RO_GENERIC_YES
         : true;
+    showHyruleLoach = IS_RANDO ?
+        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_FISHSANITY) == RO_FISHSANITY_HYRULE_LOACH
+        : false;
     showWeirdEgg = IS_RANDO ?
         OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_WEIRD_EGG) == RO_GENERIC_YES
         : true;
@@ -1287,6 +1291,7 @@ bool IsCheckShuffled(RandomizerCheck rc) {
                 ) &&
             (rc != RC_KF_KOKIRI_SWORD_CHEST || showKokiriSword) &&
             (rc != RC_TOT_MASTER_SWORD || showMasterSword) &&
+            (rc != RC_LH_HYRULE_LOACH || showHyruleLoach) &&
             (rc != RC_ZR_MAGIC_BEAN_SALESMAN || showBeans) &&
             (rc != RC_HC_MALON_EGG || showWeirdEgg) &&
             (loc->GetRCType() != RCTYPE_FROG_SONG || showFrogSongRupees) &&
diff --git a/soh/soh/Enhancements/randomizer/randomizer_inf.h b/soh/soh/Enhancements/randomizer/randomizer_inf.h
index 8a9e8be1f..8d3e96239 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_inf.h
+++ b/soh/soh/Enhancements/randomizer/randomizer_inf.h
@@ -202,6 +202,8 @@ typedef enum {
     RAND_INF_HAS_OCARINA_C_LEFT,
     RAND_INF_HAS_OCARINA_C_RIGHT,
 
+    RAND_INF_CAUGHT_LOACH,
+
     RAND_INF_CAN_SWIM,
 
     RAND_INF_HAS_WALLET,
diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
index f3077cf3e..f3f860800 100644
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -122,7 +122,7 @@ void Settings::CreateOptions() {
     mOptions[RSK_SHUFFLE_BOSS_SOULS] = Option::U8("Shuffle Boss Souls", {"Off", "On", "On + Ganon"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleBossSouls"), mOptionDescriptions[RSK_SHUFFLE_BOSS_SOULS], WidgetType::Combobox);
     mOptions[RSK_SHUFFLE_DEKU_STICK_BAG] = Option::Bool("Shuffle Deku Stick Bag", CVAR_RANDOMIZER_SETTING("ShuffleDekuStickBag"), mOptionDescriptions[RSK_SHUFFLE_DEKU_STICK_BAG], IMFLAG_SEPARATOR_BOTTOM, WidgetType::Checkbox, RO_GENERIC_OFF);
     mOptions[RSK_SHUFFLE_DEKU_NUT_BAG] = Option::Bool("Shuffle Deku Nut Bag", CVAR_RANDOMIZER_SETTING("ShuffleDekuNutBag"), mOptionDescriptions[RSK_SHUFFLE_DEKU_NUT_BAG], IMFLAG_SEPARATOR_BOTTOM, WidgetType::Checkbox, RO_GENERIC_OFF);
-    mOptions[RSK_FISHSANITY] = Option::U8("Fishsanity", {"Off", "Shuffle Fishing Pond", "Shuffle Overworld Fish", "Shuffle Both"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("Fishsanity"), mOptionDescriptions[RSK_FISHSANITY], WidgetType::Combobox, RO_FISHSANITY_OFF);
+    mOptions[RSK_FISHSANITY] = Option::U8("Fishsanity", {"Off", "Shuffle only Hyrule Loach", "Shuffle Fishing Pond", "Shuffle Overworld Fish", "Shuffle Both"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("Fishsanity"), mOptionDescriptions[RSK_FISHSANITY], WidgetType::Combobox, RO_FISHSANITY_OFF);
     mOptions[RSK_FISHSANITY_POND_COUNT] = Option::U8("Pond Fish Count", {NumOpts(0,17,1)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("FishsanityPondCount"), mOptionDescriptions[RSK_FISHSANITY_POND_COUNT], WidgetType::Slider, 0, true, IMFLAG_NONE);
     mOptions[RSK_FISHSANITY_AGE_SPLIT] = Option::Bool("Pond Age Split", CVAR_RANDOMIZER_SETTING("FishsanityAgeSplit"), mOptionDescriptions[RSK_FISHSANITY_AGE_SPLIT]);
     mOptions[RSK_SHUFFLE_MAPANDCOMPASS] = Option::U8("Maps/Compasses", {"Start With", "Vanilla", "Own Dungeon", "Any Dungeon", "Overworld", "Anywhere"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("StartingMapsCompasses"), mOptionDescriptions[RSK_SHUFFLE_MAPANDCOMPASS], WidgetType::Combobox, RO_DUNGEON_ITEM_LOC_OWN_DUNGEON);
@@ -163,6 +163,7 @@ void Settings::CreateOptions() {
     mOptions[RSK_SHEIK_LA_HINT] = Option::Bool("Sheik Light Arrow Hint", {"Off", "On"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("SheikLAHint"), mOptionDescriptions[RSK_SHEIK_LA_HINT], WidgetType::Checkbox, RO_GENERIC_ON, false, IMFLAG_NONE);
     mOptions[RSK_DAMPES_DIARY_HINT] = Option::Bool("Dampe's Diary Hint", CVAR_RANDOMIZER_SETTING("DampeHint"), mOptionDescriptions[RSK_DAMPES_DIARY_HINT], IMFLAG_NONE);
     mOptions[RSK_GREG_HINT] = Option::Bool("Greg the Green Rupee Hint", CVAR_RANDOMIZER_SETTING("GregHint"), mOptionDescriptions[RSK_GREG_HINT], IMFLAG_NONE);
+    mOptions[RSK_LOACH_HINT] = Option::Bool("Hyrule Loach Hint", CVAR_RANDOMIZER_SETTING("LoachHint"), mOptionDescriptions[RSK_LOACH_HINT], IMFLAG_NONE);
     mOptions[RSK_SARIA_HINT] = Option::Bool("Saria's Hint", CVAR_RANDOMIZER_SETTING("SariaHint"), mOptionDescriptions[RSK_SARIA_HINT], IMFLAG_NONE);
     mOptions[RSK_FISHING_POLE_HINT] = Option::Bool("Fishing Pole Hint", CVAR_RANDOMIZER_SETTING("FishingPoleHint"), mOptionDescriptions[RSK_FISHING_POLE_HINT], IMFLAG_NONE);
     mOptions[RSK_FROGS_HINT] = Option::Bool("Frog Ocarina Game Hint", CVAR_RANDOMIZER_SETTING("FrogsHint"), mOptionDescriptions[RSK_FROGS_HINT], IMFLAG_NONE);
@@ -738,6 +739,7 @@ void Settings::CreateOptions() {
         &mOptions[RSK_SHEIK_LA_HINT],
         &mOptions[RSK_DAMPES_DIARY_HINT],
         &mOptions[RSK_GREG_HINT],
+        &mOptions[RSK_LOACH_HINT],
         &mOptions[RSK_SARIA_HINT],
         &mOptions[RSK_FROGS_HINT],
         &mOptions[RSK_OOT_HINT],
@@ -974,6 +976,7 @@ void Settings::CreateOptions() {
         &mOptions[RSK_SHEIK_LA_HINT],
         &mOptions[RSK_DAMPES_DIARY_HINT],
         &mOptions[RSK_GREG_HINT],
+        &mOptions[RSK_LOACH_HINT],
         &mOptions[RSK_SARIA_HINT],
         &mOptions[RSK_FROGS_HINT],
         &mOptions[RSK_OOT_HINT],
@@ -1198,6 +1201,7 @@ void Settings::CreateOptions() {
         { "Miscellaneous Settings:Sheik Light Arrow Hint", RSK_SHEIK_LA_HINT },
         { "Miscellaneous Settings:Dampe's Diary Hint", RSK_DAMPES_DIARY_HINT },
         { "Miscellaneous Settings:Greg the Rupee Hint", RSK_GREG_HINT },
+        { "Miscellaneous Settings:Hyrule Loach Hint", RSK_LOACH_HINT },
         { "Miscellaneous Settings:Saria's Hint", RSK_SARIA_HINT },
         { "Miscellaneous Settings:Frog Ocarina Game Hint", RSK_FROGS_HINT },
         { "Miscellaneous Settings:Ocarina of Time Hint", RSK_OOT_HINT },
@@ -1763,16 +1767,22 @@ void Settings::UpdateOptionProperties() {
 
     if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleCows"), RO_GENERIC_OFF)) {
         mOptions[RSK_MALON_HINT].Enable();
-        } else {
+    } else {
         mOptions[RSK_MALON_HINT].Disable("Malon's hint points to a cow, so requires cows to be shuffled.");
     }
 
     if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("Shuffle100GSReward"), RO_GENERIC_OFF)) {
         mOptions[RSK_KAK_100_SKULLS_HINT].Enable();
-        } else {
+    } else {
         mOptions[RSK_KAK_100_SKULLS_HINT].Disable("There is no point to hinting 100 skulls if it is not shuffled");
     }
 
+    if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("Fishsanity"), RO_FISHSANITY_OFF) == RO_FISHSANITY_HYRULE_LOACH) {
+        mOptions[RSK_LOACH_HINT].Enable();
+    } else {
+        mOptions[RSK_LOACH_HINT].Disable("Loach hint is only avaliable with \"Fishsanity\" set to \"Shuffle only Hyrule Loach\"\nas that's the only setting where you present the loach to the fishing pond owner");
+    }
+
     if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("CuccosToReturn"), 7) == 0) {
         mOptions[RSK_CHICKENS_HINT].Disable("Anju will just give you the item instead with 0 chickens");
     } else {
@@ -2125,6 +2135,10 @@ void Settings::FinalizeSettings(const std::set<RandomizerCheck>& excludedLocatio
         mOptions[RSK_KAK_100_SKULLS_HINT].SetSelectedIndex(RO_GENERIC_OFF);
     }
 
+    if (mOptions[RSK_FISHSANITY].IsNot(RO_FISHSANITY_HYRULE_LOACH)) {
+        mOptions[RSK_LOACH_HINT].SetSelectedIndex(RO_FISHSANITY_OFF);
+    }
+
     if (mOptions[RSK_CUCCO_COUNT].Is(0)) {
         mOptions[RSK_CHICKENS_HINT].SetSelectedIndex(RO_GENERIC_OFF);
     }
@@ -2375,6 +2389,7 @@ void Settings::ParseJson(nlohmann::json spoilerFileJson) {
                 case RSK_SHEIK_LA_HINT:
                 case RSK_DAMPES_DIARY_HINT:
                 case RSK_GREG_HINT:
+                case RSK_LOACH_HINT:
                 case RSK_SARIA_HINT:
                 case RSK_FROGS_HINT:
                 case RSK_OOT_HINT:
diff --git a/soh/soh/Enhancements/randomizer/static_data.cpp b/soh/soh/Enhancements/randomizer/static_data.cpp
index f413a86e0..5a091552b 100644
--- a/soh/soh/Enhancements/randomizer/static_data.cpp
+++ b/soh/soh/Enhancements/randomizer/static_data.cpp
@@ -71,6 +71,7 @@ std::unordered_map<uint32_t, CustomMessage> StaticData::hintNames = {
     {RH_ALTAR_CHILD, CustomMessage("ToT Altar as Child")},
     {RH_ALTAR_ADULT, CustomMessage("ToT Altar as Adult")},
     {RH_SARIA_HINT, CustomMessage("Saria's Magic Hint")},
+    {RH_LOACH_HINT, CustomMessage("Loach Hint")},
     {RH_FISHING_POLE, CustomMessage("Fishing Pole Hint")},
     {RH_MINUET_WARP_LOC, CustomMessage("Minuet of Forest Destination")},
     {RH_BOLERO_WARP_LOC, CustomMessage("Bolero of Fire Destination")},
@@ -199,6 +200,7 @@ std::unordered_map<RandomizerHint, StaticHintInfo> StaticData::staticHintInfoMap
   {RH_DAMPES_DIARY,        StaticHintInfo(HINT_TYPE_AREA,     {RHT_DAMPE_DIARY},                   RSK_DAMPES_DIARY_HINT,   true, {}, {RG_PROGRESSIVE_HOOKSHOT},    {RC_DAMPE_HINT})},
   {RH_GREG_RUPEE,          StaticHintInfo(HINT_TYPE_AREA,     {RHT_GREG_HINT},                     RSK_GREG_HINT,           true, {}, {RG_GREG_RUPEE},              {RC_GREG_HINT})},
   {RH_SARIA_HINT,          StaticHintInfo(HINT_TYPE_AREA,     {RHT_SARIA_TALK_HINT, RHT_SARIA_SONG_HINT}, RSK_SARIA_HINT,   true, {}, {RG_PROGRESSIVE_MAGIC_METER}, {RC_SARIA_SONG_HINT, RC_SONG_FROM_SARIA}, true)},
+  {RH_LOACH_HINT,          StaticHintInfo(HINT_TYPE_ITEM,     {RHT_LOACH_HINT},                    RSK_LOACH_HINT,          true, {RC_LH_HYRULE_LOACH})},
   {RH_FISHING_POLE,        StaticHintInfo(HINT_TYPE_AREA,     {RHT_FISHING_POLE_HINT},             RSK_FISHING_POLE_HINT,   true, {}, {RG_FISHING_POLE},            {RC_FISHING_POLE_HINT}, true)},
   {RH_MEDIGORON,           StaticHintInfo(HINT_TYPE_MERCHANT, {RHT_MEDIGORON_HINT},                RSK_SHUFFLE_MERCHANTS,   (uint8_t)RO_SHUFFLE_MERCHANTS_ON_HINT,  {RC_GC_MEDIGORON})},
   {RH_GRANNY,              StaticHintInfo(HINT_TYPE_MERCHANT, {RHT_GRANNY_HINT},                   RSK_SHUFFLE_MERCHANTS,   (uint8_t)RO_SHUFFLE_MERCHANTS_ON_HINT,  {RC_KAK_GRANNYS_SHOP})},
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
index 18da01c2c..43f3e2f00 100644
--- a/soh/soh/OTRGlobals.cpp
+++ b/soh/soh/OTRGlobals.cpp
@@ -2707,7 +2707,21 @@ extern "C" int CustomMessage_RetrieveIfExists(PlayState* play) {
         else if (textId == TEXT_FROGS_UNDERWATER && ctx->GetOption(RSK_FROGS_HINT)) {
            messageEntry = ctx->GetHint(RH_FROGS_HINT)->GetHintMessage(MF_AUTO_FORMAT), TEXTBOX_TYPE_BLUE;
         }
-        else if ((textId == TEXT_FISHING_POND_START || textId == TEXT_FISHING_POND_START_MET) && 
+        else if (
+            Randomizer_GetSettingValue(RSK_LOACH_HINT) &&
+            (
+                textId == TEXT_FISHING_CLOUDY ||
+                textId == TEXT_FISHING_TRY_ANOTHER_LURE ||
+                textId == TEXT_FISHING_SECRETS ||
+                textId == TEXT_FISHING_GOOD_FISHERMAN ||
+                textId == TEXT_FISHING_DIFFERENT_POND ||
+                textId == TEXT_FISHING_SCRATCHING ||
+                textId == TEXT_FISHING_TRY_ANOTHER_LURE_WITH_SINKING_LURE
+            )
+        ) {
+            messageEntry = ctx->GetHint(RH_LOACH_HINT)->GetHintMessage(MF_AUTO_FORMAT);
+        }
+        else if ((textId == TEXT_FISHING_POND_START || textId == TEXT_FISHING_POND_START_MET) &&
                    ctx->GetOption(RSK_SHUFFLE_FISHING_POLE) && !Flags_GetRandomizerInf(RAND_INF_FISHING_POLE_FOUND)) {
             messageEntry = OTRGlobals::Instance->gRandomizer->GetFishingPondOwnerMessage(textId);
         }
diff --git a/soh/soh/SohMenuBar.cpp b/soh/soh/SohMenuBar.cpp
index 587e2d0c1..8adeaa429 100644
--- a/soh/soh/SohMenuBar.cpp
+++ b/soh/soh/SohMenuBar.cpp
@@ -924,7 +924,6 @@ void DrawEnhancementsMenu() {
                 }
 
                 UIWidgets::Spacer(0);
-
                 if (ImGui::BeginMenu("Fishing")) {
                     UIWidgets::EnhancementCheckbox("Customize Behavior", CVAR_ENHANCEMENT("CustomizeFishing"));
                     UIWidgets::Tooltip("Turn on/off changes to the fishing behavior");
@@ -944,6 +943,8 @@ void DrawEnhancementsMenu() {
                     UIWidgets::Tooltip("The minimum weight for the unique fishing reward as a child");
                     UIWidgets::PaddedEnhancementSliderInt("Adult Minimum Weight: %d", "##aMinimumWeight", CVAR_ENHANCEMENT("MinimumFishWeightAdult"), 6, 13, "", 13, true, true, false, disabled, disabledTooltip);
                     UIWidgets::Tooltip("The minimum weight for the unique fishing reward as an adult");
+                    UIWidgets::PaddedEnhancementCheckbox("All fish are Hyrule Loaches", CVAR_ENHANCEMENT("AllHyruleLoaches"), true, false, disabled, disabledTooltip);
+                    UIWidgets::Tooltip("Every fish in the fishing pond will always be a Hyrule Loach");
                     ImGui::EndMenu();
                 }
                 UIWidgets::Spacer(0);
diff --git a/soh/src/overlays/actors/ovl_Fishing/z_fishing.c b/soh/src/overlays/actors/ovl_Fishing/z_fishing.c
index a0ead103c..b3be105dd 100644
--- a/soh/src/overlays/actors/ovl_Fishing/z_fishing.c
+++ b/soh/src/overlays/actors/ovl_Fishing/z_fishing.c
@@ -17,6 +17,7 @@
 #define WATER_SURFACE_Y(play) play->colCtx.colHeader->waterBoxes->ySurface
 #define IS_FISHSANITY (IS_RANDO && Randomizer_GetPondFishShuffled())
 #define FISHID(params) (Randomizer_IdentifyFish(play->sceneNum, params))
+bool getShouldSpawnLoaches();
 
 void Fishing_Init(Actor* thisx, PlayState* play);
 void Fishing_Destroy(Actor* thisx, PlayState* play);
@@ -26,8 +27,6 @@ void Fishing_DrawFish(Actor* thisx, PlayState* play);
 void Fishing_DrawOwner(Actor* thisx, PlayState* play);
 void Fishing_Reset(void);
 
-bool getShouldSpawnLoaches();
-
 typedef struct {
     /* 0x00 */ u8 isLoach;
     /* 0x02 */ Vec3s pos;
@@ -436,6 +435,10 @@ static Vec3f sStreamSoundProjectedPos;
 static s16 sFishOnHandParams;
 static Color_RGBA16 fsPulseColor = { 30, 240, 200 };
 
+u8 AllHyruleLoaches() {
+    return CVarGetInteger(CVAR_ENHANCEMENT("CustomizeFishing"), 0) && CVarGetInteger(CVAR_ENHANCEMENT("AllHyruleLoaches"), 0);
+}
+
 void Fishing_SetColliderElement(s32 index, ColliderJntSph* collider, Vec3f* pos, f32 scale) {
     collider->elements[index].dim.worldSphere.center.x = pos->x;
     collider->elements[index].dim.worldSphere.center.y = pos->y;
@@ -1001,7 +1004,7 @@ void Fishing_Init(Actor* thisx, PlayState* play2) {
                         sFishInits[i].pos.z, 0, Rand_ZeroFloat(0x10000), 0, 100 + i, true);
         }
     } else {
-        if ((thisx->params < (EN_FISH_PARAM + 15)) || (thisx->params == EN_FISH_AQUARIUM)) {
+        if ((thisx->params < (EN_FISH_PARAM + 15) && !AllHyruleLoaches()) || (thisx->params == EN_FISH_AQUARIUM)) {
             SkelAnime_InitFlex(play, &this->skelAnime, &gFishingFishSkel, &gFishingFishAnim, NULL, NULL, 0);
             Animation_MorphToLoop(&this->skelAnime, &gFishingFishAnim, 0.0f);
         } else {
@@ -2847,7 +2850,7 @@ void Fishing_FishLeapSfx(Fishing* this, u8 outOfWater) {
     s16 sfxId;
     u8 length;
 
-    if (this->isLoach == 0) {
+    if (this->isLoach == 0 && !AllHyruleLoaches()) {
         length = this->fishLength;
     } else {
         length = 2.0f * this->fishLength;
@@ -2992,7 +2995,7 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
     this->actor.uncullZoneForward = 700.0f;
     this->actor.uncullZoneScale = 50.0f;
 
-    if (this->isLoach == 0) {
+    if (this->isLoach == 0 && !AllHyruleLoaches()) {
         playerSpeedMod = (player->actor.speedXZ * 0.15f) + 0.25f;
     } else {
         playerSpeedMod = (player->actor.speedXZ * 0.3f) + 0.25f;
@@ -3054,7 +3057,7 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
 
     Math_ApproachS(&this->fishLimbDRotZDelta, 0, 5, 0x1F4);
 
-    if (this->isLoach == 0) {
+    if (this->isLoach == 0 && !AllHyruleLoaches()) {
         Actor_SetScale(&this->actor, this->fishLength * 15.0f * 0.00001f);
 
         this->fishLimbRotPhase += this->fishLimbRotPhaseStep;
@@ -3223,7 +3226,7 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
             break;
 
         case 1:
-            if (this->isLoach == 1) {
+            if (this->isLoach == 1 || AllHyruleLoaches()) {
                 this->fishState = -1;
                 this->unk_1A4 = 20000;
                 this->unk_1A2 = 20000;
@@ -3376,7 +3379,7 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
 
             if (sLureEquipped == FS_LURE_SINKING) {
                 this->fishTargetPos.y = sLurePos.y;
-            } else if (this->isLoach == 0) {
+            } else if (this->isLoach == 0 && !AllHyruleLoaches()) {
                 this->fishTargetPos.y = sLurePos.y - 15.0f;
             } else {
                 this->fishTargetPos.y = sLurePos.y - 5.0f;
@@ -3451,8 +3454,8 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
             }
             if (getGuaranteeBite() == 1 ||
                 ((this->timerArray[0] == 1) || (Rand_ZeroOne() < chance)) &&
-                ((Rand_ZeroOne() < (this->perception * multiplier)) || ((this->isLoach + 1) == KREG(69)))) {
-                if (this->isLoach == 0) {
+                ((Rand_ZeroOne() < (this->perception * multiplier)) || (((this->isLoach || AllHyruleLoaches()) + 1) == KREG(69)))) {
+                if (this->isLoach == 0 && !AllHyruleLoaches()) {
                     this->fishState = 3;
                     this->unk_190 = 1.2f;
                     this->unk_194 = 5000.0f;
@@ -3673,7 +3676,7 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
                     Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_ENEMY | 0x800);
                     sFishingMusicDelay = 0;
 
-                    if (this->isLoach == 1) {
+                    if (this->isLoach == 1 || AllHyruleLoaches()) {
                         rumbleStrength = (this->fishLength * 3.0f) + 120.0f;
                     } else {
                         rumbleStrength = (2.0f * this->fishLength) + 120.0f;
@@ -3776,7 +3779,7 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
                             Math_ApproachF(&this->actor.speedXZ, 5.0f, 1.0f, 0.5f);
                         }
 
-                        if (this->isLoach == 0) {
+                        if (this->isLoach == 0 && !AllHyruleLoaches()) {
                             sRodReelingSpeed = 1.0f - (this->fishLength * 0.00899f);
                         } else {
                             sRodReelingSpeed = 1.0f - (this->fishLength * 0.00899f * 1.4f);
@@ -3792,7 +3795,7 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
                     this->unk_190 = 1.0f;
                     this->unk_194 = 4500.0f;
 
-                    if (this->isLoach == 0) {
+                    if (this->isLoach == 0 && !AllHyruleLoaches()) {
                         sRodReelingSpeed = 1.3f - (this->fishLength * 0.00899f);
                     } else {
                         sRodReelingSpeed = 1.3f - (this->fishLength * 0.00899f * 1.4f);
@@ -3946,7 +3949,7 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
                 Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_HEART_GET | 0x900);
                 sFishingCaughtTextDelay = 40;
 
-                if (this->isLoach == 0) {
+                if (this->isLoach == 0 && !AllHyruleLoaches()) {
                     sFishLengthToWeigh = this->fishLength;
 
                     if (sFishLengthToWeigh >= 75) {
@@ -3993,13 +3996,13 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
                                 if (play->msgCtx.choiceIndex == 0) {
                                     if (sFishOnHandLength == 0.0f) {
                                         sFishOnHandLength = this->fishLength;
-                                        sFishOnHandIsLoach = this->isLoach;
+                                        sFishOnHandIsLoach = (this->isLoach || AllHyruleLoaches());
                                         sLureCaughtWith = sLureEquipped;
                                         if (IS_FISHSANITY) {
                                             sFishOnHandParams = this->fishsanityParams;
                                         }
                                         Actor_Kill(&this->actor);
-                                    } else if (getShouldConfirmKeep() && (this->isLoach == 0) && (sFishOnHandIsLoach == 0) &&
+                                    } else if (getShouldConfirmKeep() && (this->isLoach == 0 && !AllHyruleLoaches()) && (sFishOnHandIsLoach == 0) &&
                                                ((s16)this->fishLength < (s16)sFishOnHandLength)) {
                                         this->keepState = 1;
                                         this->timerArray[0] = 0x3C;
@@ -4061,7 +4064,7 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
                     this->unk_194 = 2000.0f;
                     SkelAnime_Free(&this->skelAnime, play);
 
-                    if (this->isLoach == 0) {
+                    if (this->isLoach == 0 && !AllHyruleLoaches()) {
                         SkelAnime_InitFlex(play, &this->skelAnime, &gFishingFishSkel, &gFishingFishAnim, 0, 0, 0);
                         Animation_MorphToLoop(&this->skelAnime, &gFishingFishAnim, 0.0f);
                     } else {
@@ -4397,7 +4400,7 @@ void Fishing_DrawFish(Actor* thisx, PlayState* play) {
     Matrix_RotateZ(((this->unk_164 + this->actor.shape.rot.z) / 32768.0f) * M_PI, MTXMODE_APPLY);
     Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY);
 
-    if (this->isLoach == 0) {
+    if (this->isLoach == 0 && !AllHyruleLoaches()) {
         Matrix_RotateY((this->fishLimb23RotYDelta * (M_PI / 32768)) - (M_PI / 2), MTXMODE_APPLY);
         Matrix_Translate(0.0f, 0.0f, this->fishLimb23RotYDelta * 10.0f * 0.01f, MTXMODE_APPLY);
 
@@ -4998,7 +5001,7 @@ void Fishing_HandleOwnerDialog(Fishing* this, PlayState* play) {
                             if (sFishOnHandLength == 0.0f) {
                                 this->actor.textId = 0x408C;
                                 this->stateAndTimer = 20;
-                            } else if (sFishOnHandIsLoach == 0 && !IS_RANDO) {
+                            } else if (sFishOnHandIsLoach == 0) {
                                 sFishLengthToWeigh = sFishOnHandLength;
                                 if ((s16)sFishingRecordLength < (s16)sFishOnHandLength) {
                                     if (sLureCaughtWith == FS_LURE_SINKING) {
@@ -5011,14 +5014,10 @@ void Fishing_HandleOwnerDialog(Fishing* this, PlayState* play) {
                                     this->actor.textId = 0x408B;
                                     this->stateAndTimer = 20;
                                 }
-                            } else if (!IS_RANDO) {
+                            } else {
                                 this->actor.textId = 0x409B;
                                 this->stateAndTimer = 11;
                             }
-                            else {
-                                this->actor.textId = 0x4086;
-                                this->stateAndTimer = 11;
-                            }
                             Message_ContinueTextbox(play, this->actor.textId);
                             break;
                         case 1:
@@ -5154,7 +5153,13 @@ void Fishing_HandleOwnerDialog(Fishing* this, PlayState* play) {
                         }
                     }
                 } else {
-                    getItemId = GI_RUPEE_PURPLE;
+                    if (IS_RANDO && !Flags_GetRandomizerInf(RAND_INF_CAUGHT_LOACH)) {
+                        Flags_SetRandomizerInf(RAND_INF_CAUGHT_LOACH);
+                        getItemEntry = Randomizer_GetItemFromKnownCheck(RC_LH_HYRULE_LOACH, GI_RUPEE_PURPLE);
+                        getItemId = getItemEntry.getItemId;
+                    } else {
+                        getItemId = GI_RUPEE_PURPLE;
+                    }
                     sFishOnHandLength = 0.0f; // doesn't record loach
                 }
 

From e66dada09dee7ff039bf1a82969441eedd5c5f2e Mon Sep 17 00:00:00 2001
From: Archez <Archez@users.noreply.github.com>
Date: Tue, 23 Jul 2024 21:31:01 -0400
Subject: [PATCH 169/230] Fix grotto handling with the skip intro timesaver
 (#4252)

---
 .../TimeSavers/SkipCutscene/SkipIntro.cpp     | 56 ++++++++++---------
 .../randomizer/randomizer_entrance.c          |  4 ++
 .../randomizer/randomizer_entrance.h          |  1 +
 .../randomizer/randomizer_grotto.c            | 43 +++++++++++++-
 .../randomizer/randomizer_grotto.h            |  3 +-
 5 files changed, 78 insertions(+), 29 deletions(-)

diff --git a/soh/soh/Enhancements/TimeSavers/SkipCutscene/SkipIntro.cpp b/soh/soh/Enhancements/TimeSavers/SkipCutscene/SkipIntro.cpp
index 2402f841c..dda8b7a6e 100644
--- a/soh/soh/Enhancements/TimeSavers/SkipCutscene/SkipIntro.cpp
+++ b/soh/soh/Enhancements/TimeSavers/SkipCutscene/SkipIntro.cpp
@@ -3,11 +3,11 @@
 #include "soh/OTRGlobals.h"
 
 extern "C" {
-    #include "z64save.h"
-    #include "functions.h"
-    #include "soh/Enhancements/randomizer/randomizer_grotto.h"
-    extern PlayState* gPlayState;
-    extern SaveContext gSaveContext;
+#include "z64save.h"
+#include "functions.h"
+#include "soh/Enhancements/randomizer/randomizer_entrance.h"
+extern PlayState* gPlayState;
+extern SaveContext gSaveContext;
 }
 
 void SkipIntro_Register() {
@@ -15,31 +15,33 @@ void SkipIntro_Register() {
         // If we're playing rando and if starting age is adult and/or overworld spawns are shuffled we need to skip
         // the cutscene regardless of the enhancement being on.
         bool adultStart = gSaveContext.linkAge == LINK_AGE_ADULT;
-        bool shuffleOverworldSpawns = OTRGlobals::Instance->gRandoContext->GetOption(RSK_SHUFFLE_OVERWORLD_SPAWNS).Is(true);
-        if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Intro"), IS_RANDO) || (IS_RANDO && (adultStart || shuffleOverworldSpawns))) {
-                // Calculate spawn location. Start with vanilla, Link's house.
-                int32_t spawnEntrance = ENTR_LINKS_HOUSE_0;
-                // If we're not in rando, we can skip all of the below.
-                if (IS_RANDO) {
-                    // If starting age is shuffled, use vanilla adult spawn/prelude warp.
+        bool shuffleOverworldSpawns =
+            OTRGlobals::Instance->gRandoContext->GetOption(RSK_SHUFFLE_OVERWORLD_SPAWNS).Is(true);
+        if ((CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Intro"), IS_RANDO) ||
+             (IS_RANDO && (adultStart || shuffleOverworldSpawns)) && gSaveContext.cutsceneIndex == 0xFFF1)) {
+            // Calculate spawn location. Start with vanilla, Link's house.
+            int32_t spawnEntrance = ENTR_LINKS_HOUSE_0;
+            // If we're not in rando, we can skip all of the below.
+            if (IS_RANDO) {
+                // If starting age is shuffled, use vanilla adult spawn/prelude warp.
+                if (adultStart) {
+                    spawnEntrance = ENTR_TEMPLE_OF_TIME_7;
+                }
+                // If we're shuffling overworld spawns we'll need to get the Entrance Override
+                if (shuffleOverworldSpawns) {
+                    // If we're shuffling overworld spawns the adult spawn is ENTR_HYRULE_FIELD_10 instead of
+                    // ENTR_TEMPLE_OF_TIME_7, so that spawn and Prelude don't share an entrance.
                     if (adultStart) {
-                        spawnEntrance = ENTR_TEMPLE_OF_TIME_7;
-                    }
-                    // If we're shuffling overworld spawns we'll need to get the Entrance Override
-                    if (shuffleOverworldSpawns) {
-                        // If we're shuffling overworld spawns the adult spawn is ENTR_HYRULE_FIELD_10 instead of
-                        // ENTR_TEMPLE_OF_TIME_7, so that spawn and Prelude don't share an entrance.
-                        if (adultStart){
-                            spawnEntrance = ENTR_HYRULE_FIELD_10;
-                        }
-                        spawnEntrance = Grotto_OverrideSpecialEntrance(Entrance_GetOverride(spawnEntrance));
+                        spawnEntrance = ENTR_HYRULE_FIELD_10;
                     }
+                    spawnEntrance = Entrance_PeekNextIndexOverride(spawnEntrance);
                 }
-                // Skip the intro cutscene for whatever the spawnEntrance is calculated to be.
-                if (gSaveContext.entranceIndex == spawnEntrance) {
-                    gSaveContext.cutsceneIndex = 0;
-                    *should = false;
-                }
+            }
+            // Skip the intro cutscene for whatever the spawnEntrance is calculated to be.
+            if (gSaveContext.entranceIndex == spawnEntrance) {
+                gSaveContext.cutsceneIndex = 0;
+                *should = false;
+            }
         }
     });
 }
diff --git a/soh/soh/Enhancements/randomizer/randomizer_entrance.c b/soh/soh/Enhancements/randomizer/randomizer_entrance.c
index 24bf8c03a..d52b09836 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_entrance.c
+++ b/soh/soh/Enhancements/randomizer/randomizer_entrance.c
@@ -260,6 +260,10 @@ s16 Entrance_GetOverride(s16 index) {
     return entranceOverrideTable[index];
 }
 
+s16 Entrance_PeekNextIndexOverride(int16_t nextEntranceIndex) {
+    return Grotto_GetEntranceValueHandlingGrottoRando(Entrance_GetOverride(nextEntranceIndex));
+}
+
 s16 Entrance_OverrideNextIndex(s16 nextEntranceIndex) {
     // When entering Spirit Temple, clear temp flags so they don't carry over to the randomized dungeon
     if (nextEntranceIndex == ENTR_SPIRIT_TEMPLE_0 && Entrance_GetOverride(nextEntranceIndex) != nextEntranceIndex &&
diff --git a/soh/soh/Enhancements/randomizer/randomizer_entrance.h b/soh/soh/Enhancements/randomizer/randomizer_entrance.h
index 8d8d3a678..cc22b31f3 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_entrance.h
+++ b/soh/soh/Enhancements/randomizer/randomizer_entrance.h
@@ -81,6 +81,7 @@ void Entrance_ResetEntranceTable(void);
 uint8_t Entrance_EntranceIsNull(EntranceOverride* entranceOverride);
 int16_t Entrance_GetOverride(int16_t index);
 int16_t Entrance_OverrideNextIndex(int16_t nextEntranceIndex);
+int16_t Entrance_PeekNextIndexOverride(int16_t nextEntranceIndex);
 int16_t Entrance_OverrideDynamicExit(int16_t dynamicExitIndex);
 uint32_t Entrance_SceneAndSpawnAre(uint8_t scene, uint8_t spawn);
 void Entrance_SetGameOverEntrance(void);
diff --git a/soh/soh/Enhancements/randomizer/randomizer_grotto.c b/soh/soh/Enhancements/randomizer/randomizer_grotto.c
index b552dd2cd..6c92221b9 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_grotto.c
+++ b/soh/soh/Enhancements/randomizer/randomizer_grotto.c
@@ -128,8 +128,49 @@ static void Grotto_SetupReturnInfo(GrottoReturnInfo grotto, RespawnMode respawnM
     }
 }
 
+// Get the next entrance value while handling conversion of grotto rando IDs to real entrance values.
+// This method doesn't change player respawn data, so only use this if you are querying an entrance index.
+s16 Grotto_GetEntranceValueHandlingGrottoRando(s16 nextEntranceIndex) {
+    // Don't change anything unless grotto shuffle has been enabled
+    if (!Randomizer_GetSettingValue(RSK_SHUFFLE_GROTTO_ENTRANCES) && !Randomizer_GetSettingValue(RSK_SHUFFLE_OVERWORLD_SPAWNS) && !Randomizer_GetSettingValue(RSK_SHUFFLE_WARP_SONGS)) {
+        return nextEntranceIndex;
+    }
+
+    // If Link hits a grotto exit, load the entrance index from the grotto exit list
+    // based on the current grotto ID
+    if (nextEntranceIndex == ENTR_RETURN_GROTTO) {
+        nextEntranceIndex = grottoExitList[grottoId];
+    }
+
+    // Get the new grotto id from the next entrance
+    grottoId = nextEntranceIndex & 0x00FF;
+
+    // Grotto Returns
+    if (nextEntranceIndex >= ENTRANCE_RANDO_GROTTO_EXIT_START && nextEntranceIndex < ENTRANCE_RANDO_GROTTO_EXIT_START + NUM_GROTTOS) {
+        GrottoReturnInfo grotto = grottoReturnTable[grottoId];
+
+        // When the nextEntranceIndex is determined by a dynamic exit,
+        // or set by Entrance_OverrideBlueWarp to mark a blue warp entrance,
+        // we have to set the respawn information and nextEntranceIndex manually
+        if (gPlayState != NULL && gPlayState->nextEntranceIndex != ENTR_LOAD_OPENING) {
+            nextEntranceIndex = grotto.entranceIndex;
+        } else if (gPlayState == NULL) { // Handle spawn position when loading from a save file
+            nextEntranceIndex = grotto.entranceIndex;
+        // Otherwise return 0x7FFF (ENTR_RETURN_GROTTO) and let the game handle it
+        } else {
+            nextEntranceIndex = ENTR_RETURN_GROTTO;
+        }
+    // Grotto Loads
+    } else if (nextEntranceIndex >= ENTRANCE_RANDO_GROTTO_LOAD_START && nextEntranceIndex < ENTRANCE_RANDO_GROTTO_EXIT_START) {
+        GrottoLoadInfo grotto = grottoLoadTable[grottoId];
+        nextEntranceIndex = grotto.entranceIndex;
+    }
+
+    return nextEntranceIndex;
+}
+
 // Translates and overrides the passed in entrance index if it corresponds to a
-// special grotto entrance (grotto load or returnpoint)
+// special grotto entrance (grotto load or returnpoint) and updates player respawn data correctly.
 s16 Grotto_OverrideSpecialEntrance(s16 nextEntranceIndex) {
 
     // Don't change anything unless grotto shuffle has been enabled
diff --git a/soh/soh/Enhancements/randomizer/randomizer_grotto.h b/soh/soh/Enhancements/randomizer/randomizer_grotto.h
index c516d32bf..938c4c6d6 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_grotto.h
+++ b/soh/soh/Enhancements/randomizer/randomizer_grotto.h
@@ -24,7 +24,8 @@ typedef struct {
 void Grotto_InitExitAndLoadLists(void);
 void Grotto_SetExitOverride(s16 originalIndex, s16 overrideIndex);
 void Grotto_SetLoadOverride(s16 originalIndex, s16 overrideIndex);
-s16  Grotto_OverrideSpecialEntrance(s16 nextEntranceIndex);
+s16 Grotto_GetEntranceValueHandlingGrottoRando(s16 nextEntranceIndex);
+s16 Grotto_OverrideSpecialEntrance(s16 nextEntranceIndex);
 void Grotto_ForceGrottoReturnOnSpecialEntrance(void);
 void Grotto_ForceGrottoReturn(void);
 void Grotto_ForceRegularVoidOut(void);

From b81a3dd099f8207e1add57aa323ede3d4ad13575 Mon Sep 17 00:00:00 2001
From: Archez <Archez@users.noreply.github.com>
Date: Thu, 25 Jul 2024 21:09:45 -0400
Subject: [PATCH 170/230] Another round of fixes for skip intro and grotto
 rando (#4253)

---
 .../Enhancements/TimeSavers/SkipCutscene/SkipIntro.cpp    | 3 ++-
 soh/soh/Enhancements/randomizer/randomizer_grotto.c       | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/soh/soh/Enhancements/TimeSavers/SkipCutscene/SkipIntro.cpp b/soh/soh/Enhancements/TimeSavers/SkipCutscene/SkipIntro.cpp
index dda8b7a6e..aca290f79 100644
--- a/soh/soh/Enhancements/TimeSavers/SkipCutscene/SkipIntro.cpp
+++ b/soh/soh/Enhancements/TimeSavers/SkipCutscene/SkipIntro.cpp
@@ -18,7 +18,8 @@ void SkipIntro_Register() {
         bool shuffleOverworldSpawns =
             OTRGlobals::Instance->gRandoContext->GetOption(RSK_SHUFFLE_OVERWORLD_SPAWNS).Is(true);
         if ((CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Intro"), IS_RANDO) ||
-             (IS_RANDO && (adultStart || shuffleOverworldSpawns)) && gSaveContext.cutsceneIndex == 0xFFF1)) {
+             (IS_RANDO && (adultStart || shuffleOverworldSpawns))) &&
+            gSaveContext.cutsceneIndex == 0xFFF1) {
             // Calculate spawn location. Start with vanilla, Link's house.
             int32_t spawnEntrance = ENTR_LINKS_HOUSE_0;
             // If we're not in rando, we can skip all of the below.
diff --git a/soh/soh/Enhancements/randomizer/randomizer_grotto.c b/soh/soh/Enhancements/randomizer/randomizer_grotto.c
index 6c92221b9..ef532f670 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_grotto.c
+++ b/soh/soh/Enhancements/randomizer/randomizer_grotto.c
@@ -142,12 +142,12 @@ s16 Grotto_GetEntranceValueHandlingGrottoRando(s16 nextEntranceIndex) {
         nextEntranceIndex = grottoExitList[grottoId];
     }
 
-    // Get the new grotto id from the next entrance
-    grottoId = nextEntranceIndex & 0x00FF;
+    // Get the new grotto id from the next entrance, temp value to override modifying the static one
+    s8 tempGrottoId = nextEntranceIndex & 0x00FF;
 
     // Grotto Returns
     if (nextEntranceIndex >= ENTRANCE_RANDO_GROTTO_EXIT_START && nextEntranceIndex < ENTRANCE_RANDO_GROTTO_EXIT_START + NUM_GROTTOS) {
-        GrottoReturnInfo grotto = grottoReturnTable[grottoId];
+        GrottoReturnInfo grotto = grottoReturnTable[tempGrottoId];
 
         // When the nextEntranceIndex is determined by a dynamic exit,
         // or set by Entrance_OverrideBlueWarp to mark a blue warp entrance,
@@ -162,7 +162,7 @@ s16 Grotto_GetEntranceValueHandlingGrottoRando(s16 nextEntranceIndex) {
         }
     // Grotto Loads
     } else if (nextEntranceIndex >= ENTRANCE_RANDO_GROTTO_LOAD_START && nextEntranceIndex < ENTRANCE_RANDO_GROTTO_EXIT_START) {
-        GrottoLoadInfo grotto = grottoLoadTable[grottoId];
+        GrottoLoadInfo grotto = grottoLoadTable[tempGrottoId];
         nextEntranceIndex = grotto.entranceIndex;
     }
 

From 06b20a05dd179b8d3fa4897fe855e8c8e0138323 Mon Sep 17 00:00:00 2001
From: Nick Michael <nick-michael@users.noreply.github.com>
Date: Mon, 29 Jul 2024 17:22:57 +0100
Subject: [PATCH 171/230] Fix Lake Hylia Water Level for Vanilla with Cutscene
 Skips (#4257)

* Fix Lake Hylia Water Level

* Move logic to SkipBlueWarp handlers
---
 .../TimeSavers/SkipCutscene/Story/SkipBlueWarp.cpp            | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipBlueWarp.cpp b/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipBlueWarp.cpp
index 564ca2d8f..ec53c7ed0 100644
--- a/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipBlueWarp.cpp
+++ b/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipBlueWarp.cpp
@@ -46,12 +46,16 @@ void SkipBlueWarp_ShouldPlayTransitionCS(GIVanillaBehavior _, bool* should, void
             isBlueWarp = 1;
         // Fire Temple Blue warp
         } else if (gSaveContext.entranceIndex == ENTR_KAKARIKO_VILLAGE_0 && gSaveContext.cutsceneIndex == 0xFFF3) {
+            // Normally set in the blue warp cutscene
+            Flags_SetEventChkInf(EVENTCHKINF_DEATH_MOUNTAIN_ERUPTED);
+
             gSaveContext.entranceIndex = ENTR_DEATH_MOUNTAIN_CRATER_5;
             isBlueWarp = 1;
         // Water Temple Blue warp
         } else if (gSaveContext.entranceIndex == ENTR_CHAMBER_OF_THE_SAGES_0 && gSaveContext.cutsceneIndex == 0x0 && gSaveContext.chamberCutsceneNum == CHAMBER_CS_WATER) {
             // Normally set in the blue warp cutscene
             gSaveContext.dayTime = gSaveContext.skyboxTime = 0x4800;
+            Flags_SetEventChkInf(EVENTCHKINF_RAISED_LAKE_HYLIA_WATER);
 
             gSaveContext.entranceIndex = ENTR_LAKE_HYLIA_9;
             isBlueWarp = 1;

From cab0871fe7b97dd27563be95fb315c00a7fdb11d Mon Sep 17 00:00:00 2001
From: Christopher Leggett <chris@leggett.dev>
Date: Mon, 29 Jul 2024 21:48:49 -0400
Subject: [PATCH 172/230] Fix Zora's Sapphire crash (#4254)

---
 soh/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/soh/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c b/soh/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
index 5984e7eee..9ba6a8437 100644
--- a/soh/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
+++ b/soh/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
@@ -2092,7 +2092,7 @@ void DemoEffect_DrawGetItem(Actor* thisx, PlayState* play) {
             RandomizerCheck rc = RC_MAX;
             RandomizerGet rg = RG_NONE;
 
-            switch (this->actor.params) {
+            switch (this->actor.params & 0x00FF) {
                 case DEMO_EFFECT_JEWEL_KOKIRI:
                     rc = RC_QUEEN_GOHMA;
                     rg = RG_KOKIRI_EMERALD;

From aeb85c81aa824e2b88b519f465dd9e1988691cf3 Mon Sep 17 00:00:00 2001
From: Malkierian <malkierian@gmail.com>
Date: Thu, 1 Aug 2024 21:24:24 -0700
Subject: [PATCH 173/230] Item SaveContext Logic (#4237)

* Port initial framework up to latest dev-rando. Includes about 15 items using the SCL structure for tracking.

* Most other item variables ported to SaveContext in UpdateHelpers.

* Removed individual Context retrievals in favor of single local variable in Logic to reference.

* start of some diagnostics.
caught some reverse logic with ApplyItemEffect.

* more diagnostics

* Resolve major logic issue with SetInventory flow in ApplyItemEffect.
Other small logic issues in ApplyItemEffect.

* Added a bit of logging.
Add Double Defense to item effects.

* revert hint gen bypass

* item_list *actually* divorced from logicVar pointers.
Several missed options for ApplyItemEffect, HasItem, and UpdateHelpers added in.
Changed HasItem to a switch block for more performance.
Seeds generate within 10-20 seconds in release mode. Further optimization is assumed possible.

* Some formatting

* Bit more formatting.

* Couple review changes.

* Incorporate progressive upgrades and skeleton key into SCL.
Bit of cleanup.

* Change `inLogic` to static array.

* Fix bug in `BottleCount()` preventing Jabu Jabu from ever being in logic.

* Fix bomb bag HasItem check.

* Fix Gerudo Fortress and Ganon's Castle SmallKeys checks.

* Change all logic use of `bool remove` to be `bool state` and work on the affirmative assumption.

* Forgot the `Set(x)` uses in `Logic::Reset()`.

* Fix fishing pole effect application.

* fishing pole tweak

* Add `RG_BOMB_BAG`, `RG_NUTS` and `RG_STICKS` to `HasItem()`.
Fix silver and gold gauntlet checks in `HasItem()`.
Change Nuts and Sticks helpers to use non-progressive RGs in `UpdateHelpers()`.

* Change mSaveContext to simple pointer.
Set `mSaveContext` to `&gSaveContext` when loading a save file.
Modify `Item::GetGIEntry()` to use rando context's SaveContext pointer instead of the gSaveContext macros.
Utilize `Item::GetGIEntry()` to get real RG of infinite upgrades and set rando infs accordingly, skipping upgrade level incrementing (which was causing overflow of wallets for some reason).

* Rename all remaining references of LogicVar to variants of LogicVal.

* Change final references to song LogicVars to CanUse calls, and remove them.

* Separate equip and rand inf flag maps.
Add Zelda's Letter and Weird Egg rand infs to map.
Consolidate `HasItem` rand inf  lookups using rand inf map and equips using equip flag map.
Maps are static, so can be referenced with `Context::` instead of ctx pointer.
---
 soh/include/variables.h                       |   1 +
 soh/include/z64item.h                         |  15 +
 .../Enhancements/randomizer/3drando/fill.cpp  |  16 +-
 .../randomizer/3drando/location_access.cpp    |   2 +-
 .../location_access/locacc_spirit_temple.cpp  |   6 +-
 soh/soh/Enhancements/randomizer/context.cpp   | 778 +++++++++++++++++-
 soh/soh/Enhancements/randomizer/context.h     |  32 +
 soh/soh/Enhancements/randomizer/item.cpp      | 108 +--
 soh/soh/Enhancements/randomizer/item.h        |  21 +-
 soh/soh/Enhancements/randomizer/item_list.cpp | 500 +++++------
 soh/soh/Enhancements/randomizer/logic.cpp     | 571 +++++++++----
 soh/soh/Enhancements/randomizer/logic.h       |  30 +-
 .../Enhancements/randomizer/randomizerTypes.h | 151 ++++
 .../Enhancements/randomizer/randomizer_inf.h  |  11 +
 soh/soh/SaveManager.cpp                       |   3 +-
 15 files changed, 1713 insertions(+), 532 deletions(-)

diff --git a/soh/include/variables.h b/soh/include/variables.h
index 2c226f2c6..0f50e2249 100644
--- a/soh/include/variables.h
+++ b/soh/include/variables.h
@@ -94,6 +94,7 @@ extern "C"
 	extern u16 gEquipMasks[4];
 	extern u16 gEquipNegMasks[4];
 	extern u32 gUpgradeMasks[8];
+	extern u32 gUpgradeNegMasks[8];
 	extern u8 gEquipShifts[4];
 	extern u8 gUpgradeShifts[8];
 	extern u16 gUpgradeCapacities[8][4];
diff --git a/soh/include/z64item.h b/soh/include/z64item.h
index 92ce499ba..ceba11d09 100644
--- a/soh/include/z64item.h
+++ b/soh/include/z64item.h
@@ -311,6 +311,21 @@ typedef enum {
     /* 0xFF */ ITEM_NONE = 0xFF
 } ItemID;
 
+typedef enum {
+    EQUIP_FLAG_SWORD_KOKIRI = 1 << 0,
+    EQUIP_FLAG_SWORD_MASTER = 1 << 1,
+    EQUIP_FLAG_SWORD_BGS = 1 << 2,
+    EQUIP_FLAG_SHIELD_DEKU = 1 << 4,
+    EQUIP_FLAG_SHIELD_HYLIAN = 1 << 5,
+    EQUIP_FLAG_SHIELD_MIRROR = 1 << 6,
+    EQUIP_FLAG_TUNIC_KOKIRI = 1 << 8,
+    EQUIP_FLAG_TUNIC_GORON = 1 << 9,
+    EQUIP_FLAG_TUNIC_ZORA = 1 << 10,
+    EQUIP_FLAG_BOOTS_KOKIRI = 1 << 12,
+    EQUIP_FLAG_BOOTS_IRON = 1 << 13,
+    EQUIP_FLAG_BOOTS_HOVER = 1 << 14,
+} EquipmentFlag;
+
 #define ITEM_TRADE_CHILD ITEM_WEIRD_EGG
 #define ITEM_TRADE_ADULT ITEM_POCKET_EGG
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/fill.cpp b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
index d25d04aa0..de5ddbdb3 100644
--- a/soh/soh/Enhancements/randomizer/3drando/fill.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
@@ -245,7 +245,7 @@ std::vector<RandomizerCheck> GetAccessibleLocations(const std::vector<Randomizer
   int gsCount = 0;
   const int maxGsCount = mode == SearchMode::GeneratePlaythrough ? GetMaxGSCount() : 0; //If generating playthrough want the max that's possibly useful, else doesn't matter
   bool bombchusFound = false;
-  std::vector<std::variant<bool*, uint8_t*>> buyIgnores;
+  std::vector<LogicVal> buyIgnores;
 
   //Variables for search
   std::vector<Rando::ItemLocation*> newItemLocations;
@@ -365,9 +365,9 @@ std::vector<RandomizerCheck> GetAccessibleLocations(const std::vector<Randomizer
                 else if (IsBombchus(ignore) && IsBombchus(locItem, true)) {
                   newItemLocations.push_back(location);
                 }
-                //We want to ignore a specific Buy item. Buy items with different RandomizerGets are recognised by a shared GetLogicVar
+                //We want to ignore a specific Buy item. Buy items with different RandomizerGets are recognised by a shared GetLogicVal
                 else if (ignore != RG_GOLD_SKULLTULA_TOKEN && IsBombchus(ignore)) {
-                  if ((type == ITEMTYPE_SHOP && Rando::StaticData::GetItemTable()[ignore].GetLogicVar() != location->GetPlacedItem().GetLogicVar()) || type != ITEMTYPE_SHOP) {
+                  if ((type == ITEMTYPE_SHOP && Rando::StaticData::GetItemTable()[ignore].GetLogicVal() != location->GetPlacedItem().GetLogicVal()) || type != ITEMTYPE_SHOP) {
                     newItemLocations.push_back(location);
                   }
                 }
@@ -408,7 +408,7 @@ std::vector<RandomizerCheck> GetAccessibleLocations(const std::vector<Randomizer
                 // TODO: Reimplement Ammo Drops setting
                 else if (/*AmmoDrops.IsNot(AMMODROPS_NONE) &&*/ !(bombchus && bombchusFound) && type == ITEMTYPE_SHOP) {
                   //Only check each buy item once
-                  auto buyItem = location->GetPlacedItem().GetLogicVar();
+                  auto buyItem = location->GetPlacedItem().GetLogicVal();
                   //Buy item not in list to ignore, add it to list and write to playthrough
                   if (std::find(buyIgnores.begin(), buyIgnores.end(), buyItem) == buyIgnores.end()) {
                     exclude = false;
@@ -1003,7 +1003,9 @@ void ClearProgress() {
 int Fill() {
   auto ctx = Rando::Context::GetInstance();
   int retries = 0;
+  SPDLOG_INFO("Starting seed generation...");
   while(retries < 5) {
+    SPDLOG_INFO("Attempt {}...", retries + 1);
     placementFailure = false;
     //showItemProgress = false;
     ctx->playthroughLocations.clear();
@@ -1036,8 +1038,10 @@ int Fill() {
     //Place shop items first, since a buy shield is needed to place a dungeon reward on Gohma due to access
     NonShopItems = {};
     if (ctx->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_OFF)) {
+      SPDLOG_INFO("Placing Vanilla Shop Items...");
       PlaceVanillaShopItems(); //Place vanilla shop items in vanilla location
     } else {
+      SPDLOG_INFO("Shuffling Shop Items");
       int total_replaced = 0;
       if (ctx->GetOption(RSK_SHOPSANITY).IsNot(RO_SHOPSANITY_ZERO_ITEMS)) { //Shopsanity 1-4, random
         //Initialize NonShopItems
@@ -1080,6 +1084,7 @@ int Fill() {
     }
 
     //Place dungeon rewards
+    SPDLOG_INFO("Shuffling and Placing Dungeon Items...");
     RandomizeDungeonRewards();
 
     //Place dungeon items restricted to their Own Dungeon
@@ -1111,15 +1116,18 @@ int Fill() {
 
     //Then place dungeon items that are assigned to restrictive location pools
     RandomizeDungeonItems();
+    SPDLOG_INFO("Dungeon Items Done");
 
     //Then place Link's Pocket Item if it has to be an advancement item
     RandomizeLinksPocket();
+    SPDLOG_INFO("Shuffling Advancement Items");
     //Then place the rest of the advancement items
     std::vector<RandomizerGet> remainingAdvancementItems =
         FilterAndEraseFromPool(ItemPool, [](const auto i) { return Rando::StaticData::RetrieveItem(i).IsAdvancement(); });
     AssumedFill(remainingAdvancementItems, ctx->allLocations, true);
 
     //Fast fill for the rest of the pool
+    SPDLOG_INFO("Shuffling Remaining Items");
     std::vector<RandomizerGet> remainingPool = FilterAndEraseFromPool(ItemPool, [](const auto i) { return true; });
     FastFill(remainingPool, GetAllEmptyLocations(), false);
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
index ddda3dbab..b181a3cdb 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
@@ -162,7 +162,7 @@ Rando::Entrance* Area::GetExit(RandomizerRegion exitToReturn) {
 }
 
 bool Area::CanPlantBeanCheck() const {
-  return (logic->MagicBean || logic->MagicBeanPack) && BothAgesCheck();
+    return Rando::Context::GetInstance()->GetAmmo(ITEM_BEAN) > 0 && BothAgesCheck();
 }
 
 bool Area::AllAccountedFor() const {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp
index 7feb1b064..92716469e 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp
@@ -207,10 +207,12 @@ void AreaTable_Init_SpiritTemple() {
   areaTable[RR_SPIRIT_TEMPLE_MQ_LOWER_ADULT] = Area("Spirit Temple MQ Lower Adult", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST,          true),
-                  LOCATION(RC_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST,        logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && logic->Hammer && logic->Ocarina && logic->SongOfTime && logic->EponasSong && logic->SunsSong && logic->SongOfStorms && logic->ZeldasLullaby),
+                  LOCATION(RC_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST,        logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && logic->Hammer && logic->CanUse(RG_SONG_OF_TIME) && logic->CanUse(RG_EPONAS_SONG) && logic->CanUse(RG_SUNS_SONG)
+                                                                           && logic->CanUse(RG_SONG_OF_STORMS) && logic->CanUse(RG_ZELDAS_LULLABY)),
                   LOCATION(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST, logic->Hammer),
                   LOCATION(RC_SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM,             true),
-                  LOCATION(RC_SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM,           logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && logic->Hammer && logic->Ocarina && logic->SongOfTime && logic->EponasSong && logic->SunsSong && logic->SongOfStorms && logic->ZeldasLullaby),
+                  LOCATION(RC_SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM,           logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && logic->Hammer && logic->CanUse(RG_SONG_OF_TIME) && logic->CanUse(RG_EPONAS_SONG) && logic->CanUse(RG_SUNS_SONG)
+                                                                           && logic->CanUse(RG_SONG_OF_STORMS) && logic->CanUse(RG_ZELDAS_LULLABY)),
   }, {});
 
   areaTable[RR_SPIRIT_TEMPLE_MQ_BOSS_AREA] = Area("Spirit Temple MQ Boss Area", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
diff --git a/soh/soh/Enhancements/randomizer/context.cpp b/soh/soh/Enhancements/randomizer/context.cpp
index 35c856d60..a325e5e84 100644
--- a/soh/soh/Enhancements/randomizer/context.cpp
+++ b/soh/soh/Enhancements/randomizer/context.cpp
@@ -9,13 +9,12 @@
 #include "settings.h"
 #include "rando_hash.h"
 #include "fishsanity.h"
+#include "macros.h"
 #include "3drando/hints.hpp"
 
 #include <fstream>
 #include <spdlog/spdlog.h>
 
-#include "luslog.h"
-
 namespace Rando {
 std::weak_ptr<Context> Context::mContext;
 
@@ -49,6 +48,7 @@ std::shared_ptr<Context> Context::CreateInstance() {
     if (mContext.expired()) {
         auto instance = std::make_shared<Context>();
         mContext = instance;
+        GetInstance()->GetLogic()->SetContext(GetInstance());
         return instance;
     }
     return GetInstance();
@@ -395,6 +395,500 @@ void Context::ParseHintJson(nlohmann::json spoilerFileJson) {
     CreateStaticHints();
 }
 
+std::map<RandomizerGet, uint32_t> Context::RandoGetToEquipFlag = {
+    { RG_KOKIRI_SWORD,           EQUIP_FLAG_SWORD_KOKIRI },
+    { RG_MASTER_SWORD,           EQUIP_FLAG_SWORD_MASTER },
+    { RG_BIGGORON_SWORD,         EQUIP_FLAG_SWORD_BGS },
+    { RG_DEKU_SHIELD,            EQUIP_FLAG_SHIELD_DEKU },
+    { RG_HYLIAN_SHIELD,          EQUIP_FLAG_SHIELD_HYLIAN },
+    { RG_MIRROR_SHIELD,          EQUIP_FLAG_SHIELD_MIRROR },
+    { RG_GORON_TUNIC,            EQUIP_FLAG_TUNIC_GORON },
+    { RG_ZORA_TUNIC,             EQUIP_FLAG_TUNIC_ZORA },
+    { RG_BUY_DEKU_SHIELD,        EQUIP_FLAG_SHIELD_DEKU },
+    { RG_BUY_HYLIAN_SHIELD,      EQUIP_FLAG_SHIELD_HYLIAN },
+    { RG_BUY_GORON_TUNIC,        EQUIP_FLAG_TUNIC_GORON },
+    { RG_BUY_ZORA_TUNIC,         EQUIP_FLAG_TUNIC_ZORA },
+    { RG_IRON_BOOTS,             EQUIP_FLAG_BOOTS_IRON },
+    { RG_HOVER_BOOTS,            EQUIP_FLAG_BOOTS_HOVER }
+};
+
+std::map<RandomizerGet, uint32_t> Context::RandoGetToRandInf = {
+    { RG_ZELDAS_LETTER,          RAND_INF_ZELDAS_LETTER },
+    { RG_WEIRD_EGG,              RAND_INF_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 },
+    { RG_PHANTOM_GANON_SOUL,     RAND_INF_PHANTOM_GANON_SOUL },
+    { RG_VOLVAGIA_SOUL,          RAND_INF_VOLVAGIA_SOUL },
+    { RG_MORPHA_SOUL,            RAND_INF_MORPHA_SOUL },
+    { RG_BONGO_BONGO_SOUL,       RAND_INF_BONGO_BONGO_SOUL },
+    { RG_TWINROVA_SOUL,          RAND_INF_TWINROVA_SOUL },
+    { RG_GANON_SOUL,             RAND_INF_GANON_SOUL },
+    { RG_OCARINA_A_BUTTON,       RAND_INF_HAS_OCARINA_A },
+    { RG_OCARINA_C_UP_BUTTON,    RAND_INF_HAS_OCARINA_C_UP },
+    { RG_OCARINA_C_DOWN_BUTTON,  RAND_INF_HAS_OCARINA_C_DOWN },
+    { RG_OCARINA_C_LEFT_BUTTON,  RAND_INF_HAS_OCARINA_C_LEFT },
+    { RG_OCARINA_C_RIGHT_BUTTON, RAND_INF_HAS_OCARINA_C_RIGHT },
+    { RG_SKELETON_KEY,           RAND_INF_HAS_SKELETON_KEY },
+    { RG_GREG_RUPEE,             RAND_INF_GREG_FOUND },
+    { RG_FISHING_POLE,           RAND_INF_FISHING_POLE_FOUND }
+};
+
+std::map<uint32_t, uint32_t> Context::RandoGetToDungeonScene = {
+    { RG_FOREST_TEMPLE_SMALL_KEY,           SCENE_FOREST_TEMPLE },
+    { RG_FIRE_TEMPLE_SMALL_KEY,             SCENE_FIRE_TEMPLE },
+    { RG_WATER_TEMPLE_SMALL_KEY,            SCENE_WATER_TEMPLE },
+    { RG_SPIRIT_TEMPLE_SMALL_KEY,           SCENE_SPIRIT_TEMPLE },
+    { RG_SHADOW_TEMPLE_SMALL_KEY,           SCENE_SHADOW_TEMPLE },
+    { RG_BOTTOM_OF_THE_WELL_SMALL_KEY,      SCENE_BOTTOM_OF_THE_WELL },
+    { RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, SCENE_GERUDO_TRAINING_GROUND },
+    { RG_GERUDO_FORTRESS_SMALL_KEY,         SCENE_THIEVES_HIDEOUT },
+    { RG_GANONS_CASTLE_SMALL_KEY,           SCENE_INSIDE_GANONS_CASTLE },
+    { RG_FOREST_TEMPLE_KEY_RING,            SCENE_FOREST_TEMPLE },
+    { RG_FIRE_TEMPLE_KEY_RING,              SCENE_FIRE_TEMPLE },
+    { RG_WATER_TEMPLE_KEY_RING,             SCENE_WATER_TEMPLE },
+    { RG_SPIRIT_TEMPLE_KEY_RING,            SCENE_SPIRIT_TEMPLE },
+    { RG_SHADOW_TEMPLE_KEY_RING,            SCENE_SHADOW_TEMPLE },
+    { RG_BOTTOM_OF_THE_WELL_KEY_RING,       SCENE_BOTTOM_OF_THE_WELL },
+    { RG_GERUDO_TRAINING_GROUNDS_KEY_RING,  SCENE_GERUDO_TRAINING_GROUND },
+    { RG_GERUDO_FORTRESS_KEY_RING,          SCENE_THIEVES_HIDEOUT },
+    { RG_GANONS_CASTLE_KEY_RING,            SCENE_INSIDE_GANONS_CASTLE },
+    { RG_FOREST_TEMPLE_BOSS_KEY,            SCENE_FOREST_TEMPLE },
+    { RG_FIRE_TEMPLE_BOSS_KEY,              SCENE_FIRE_TEMPLE },
+    { RG_WATER_TEMPLE_BOSS_KEY,             SCENE_WATER_TEMPLE },
+    { RG_SPIRIT_TEMPLE_BOSS_KEY,            SCENE_SPIRIT_TEMPLE },
+    { RG_SHADOW_TEMPLE_BOSS_KEY,            SCENE_SHADOW_TEMPLE },
+    { RG_GANONS_CASTLE_BOSS_KEY,            SCENE_INSIDE_GANONS_CASTLE },
+    { RG_DEKU_TREE_MAP,                     SCENE_DEKU_TREE },
+    { RG_DODONGOS_CAVERN_MAP,               SCENE_DODONGOS_CAVERN },
+    { RG_JABU_JABUS_BELLY_MAP,              SCENE_JABU_JABU },
+    { RG_FOREST_TEMPLE_MAP,                 SCENE_FOREST_TEMPLE },
+    { RG_FIRE_TEMPLE_MAP,                   SCENE_FIRE_TEMPLE },
+    { RG_WATER_TEMPLE_MAP,                  SCENE_WATER_TEMPLE },
+    { RG_SPIRIT_TEMPLE_MAP,                 SCENE_SPIRIT_TEMPLE },
+    { RG_SHADOW_TEMPLE_MAP,                 SCENE_SHADOW_TEMPLE },
+    { RG_BOTTOM_OF_THE_WELL_MAP,            SCENE_BOTTOM_OF_THE_WELL },
+    { RG_ICE_CAVERN_MAP,                    SCENE_ICE_CAVERN },
+    { RG_DEKU_TREE_COMPASS,                 SCENE_DEKU_TREE },
+    { RG_DODONGOS_CAVERN_COMPASS,           SCENE_DODONGOS_CAVERN },
+    { RG_JABU_JABUS_BELLY_COMPASS,          SCENE_JABU_JABU },
+    { RG_FOREST_TEMPLE_COMPASS,             SCENE_FOREST_TEMPLE },
+    { RG_FIRE_TEMPLE_COMPASS,               SCENE_FIRE_TEMPLE },
+    { RG_WATER_TEMPLE_COMPASS,              SCENE_WATER_TEMPLE },
+    { RG_SPIRIT_TEMPLE_COMPASS,             SCENE_SPIRIT_TEMPLE },
+    { RG_SHADOW_TEMPLE_COMPASS,             SCENE_SHADOW_TEMPLE },
+    { RG_BOTTOM_OF_THE_WELL_COMPASS,        SCENE_BOTTOM_OF_THE_WELL },
+    { RG_ICE_CAVERN_COMPASS,                SCENE_ICE_CAVERN },
+    { RG_TREASURE_GAME_SMALL_KEY,           SCENE_TREASURE_BOX_SHOP }
+};
+
+std::map<uint32_t, uint32_t> Context::RandoGetToQuestItem = {
+    { RG_FOREST_MEDALLION,       QUEST_MEDALLION_FOREST },
+    { RG_FIRE_MEDALLION,         QUEST_MEDALLION_FIRE },
+    { RG_WATER_MEDALLION,        QUEST_MEDALLION_WATER },
+    { RG_SPIRIT_MEDALLION,       QUEST_MEDALLION_SPIRIT },
+    { RG_SHADOW_MEDALLION,       QUEST_MEDALLION_SHADOW },
+    { RG_LIGHT_MEDALLION,        QUEST_MEDALLION_LIGHT },
+    { RG_MINUET_OF_FOREST,       QUEST_SONG_MINUET },
+    { RG_BOLERO_OF_FIRE,         QUEST_SONG_BOLERO },
+    { RG_SERENADE_OF_WATER,      QUEST_SONG_SERENADE },
+    { RG_REQUIEM_OF_SPIRIT,      QUEST_SONG_REQUIEM },
+    { RG_NOCTURNE_OF_SHADOW,     QUEST_SONG_NOCTURNE },
+    { RG_PRELUDE_OF_LIGHT,       QUEST_SONG_PRELUDE },
+    { RG_ZELDAS_LULLABY,         QUEST_SONG_LULLABY },
+    { RG_EPONAS_SONG,            QUEST_SONG_EPONA },
+    { RG_SARIAS_SONG,            QUEST_SONG_SARIA },
+    { RG_SUNS_SONG,              QUEST_SONG_SUN },
+    { RG_SONG_OF_TIME,           QUEST_SONG_TIME },
+    { RG_SONG_OF_STORMS,         QUEST_SONG_STORMS },
+    { RG_KOKIRI_EMERALD,         QUEST_KOKIRI_EMERALD },
+    { RG_GORON_RUBY,             QUEST_GORON_RUBY },
+    { RG_ZORA_SAPPHIRE,          QUEST_ZORA_SAPPHIRE },
+    { RG_STONE_OF_AGONY,         QUEST_STONE_OF_AGONY },
+    { RG_GERUDO_MEMBERSHIP_CARD, QUEST_GERUDO_CARD },
+};
+
+uint32_t HookshotLookup[3] = { ITEM_NONE, ITEM_HOOKSHOT, ITEM_LONGSHOT };
+uint32_t OcarinaLookup[3] = { ITEM_NONE, ITEM_OCARINA_FAIRY, ITEM_OCARINA_TIME };
+
+void Context::ApplyItemEffect(Item& item, bool state) {
+    auto randoGet = item.GetRandomizerGet();
+    if (item.GetGIEntry()->objectId == OBJECT_GI_STICK) {
+        SetInventory(ITEM_STICK, (!state ? ITEM_NONE : ITEM_STICK));
+    }
+    if (item.GetGIEntry()->objectId == OBJECT_GI_NUTS) {
+        SetInventory(ITEM_NUT, (!state ? ITEM_NONE : ITEM_NUT));
+    }
+    switch (item.GetItemType()) {
+    case ITEMTYPE_ITEM:
+    {
+        switch (randoGet) {
+            case RG_STONE_OF_AGONY:
+            case RG_GERUDO_MEMBERSHIP_CARD:
+                SetQuestItem(RandoGetToQuestItem.at(randoGet), state);
+                break;
+            case RG_WEIRD_EGG:
+                SetRandoInf(RAND_INF_WEIRD_EGG, state);
+                break;
+            case RG_ZELDAS_LETTER:
+                SetRandoInf(RAND_INF_ZELDAS_LETTER, state);
+                break;
+            case RG_DOUBLE_DEFENSE:
+                mSaveContext->isDoubleDefenseAcquired = state;
+                break;
+            case RG_POCKET_EGG:
+            case RG_COJIRO:
+            case RG_ODD_MUSHROOM:
+            case RG_ODD_POTION:
+            case RG_POACHERS_SAW:
+            case RG_BROKEN_SWORD:
+            case RG_PRESCRIPTION:
+            case RG_EYEBALL_FROG:
+            case RG_EYEDROPS:
+            case RG_CLAIM_CHECK:
+                SetAdultTrade(item.GetGIEntry()->itemId, state);
+                break;
+            case RG_PROGRESSIVE_HOOKSHOT:
+            {
+                uint8_t i;
+                for (i = 0; i < 3; i++) {
+                    if (CurrentInventory(ITEM_HOOKSHOT) == HookshotLookup[i]) {
+                        break;
+                    }
+                }
+                auto newItem = i + (!state ? -1 : 1);
+                if (newItem < 0) {
+                    newItem = 0;
+                }
+                else if (newItem > 2) {
+                    newItem = 2;
+                }
+                SetInventory(ITEM_HOOKSHOT, HookshotLookup[newItem]);
+            }   break;
+            case RG_PROGRESSIVE_STRENGTH:
+            {
+                auto currentLevel = CurrentUpgrade(UPG_STRENGTH);
+                auto newLevel = currentLevel + (!state ? -1 : 1);
+                SetUpgrade(UPG_STRENGTH, newLevel);
+            }   break;
+            case RG_PROGRESSIVE_BOMB_BAG:
+            {
+                auto realGI = item.GetGIEntry();
+                if (realGI->itemId == RG_BOMB_BAG_INF && realGI->modIndex == MOD_RANDOMIZER) {
+                    SetRandoInf(RAND_INF_HAS_INFINITE_BOMB_BAG, true);
+                    break;
+                }
+                auto currentLevel = CurrentUpgrade(UPG_BOMB_BAG);
+                auto newLevel = currentLevel + (!state ? -1 : 1);
+                if (currentLevel == 0 && state || currentLevel == 1 && !state) {
+                    SetInventory(ITEM_BOMB, (!state ? ITEM_NONE : ITEM_BOMB));
+                }
+                SetUpgrade(UPG_BOMB_BAG, newLevel);
+            }   break;
+            case RG_PROGRESSIVE_BOW:
+            {
+                auto realGI = item.GetGIEntry();
+                if (realGI->itemId == RG_QUIVER_INF && realGI->modIndex == MOD_RANDOMIZER) {
+                    SetRandoInf(RAND_INF_HAS_INFINITE_QUIVER, true);
+                    break;
+                }
+                auto currentLevel = CurrentUpgrade(UPG_QUIVER);
+                auto newLevel = currentLevel + (!state ? -1 : 1);
+                if (currentLevel == 0 && state || currentLevel == 1 && !state) {
+                    SetInventory(ITEM_BOW, (!state ? ITEM_NONE : ITEM_BOW));
+                }
+                SetUpgrade(UPG_QUIVER, newLevel);
+            }   break;
+            case RG_PROGRESSIVE_SLINGSHOT:
+            {
+                auto realGI = item.GetGIEntry();
+                if (realGI->itemId == RG_BULLET_BAG_INF && realGI->modIndex == MOD_RANDOMIZER) {
+                    SetRandoInf(RAND_INF_HAS_INFINITE_BULLET_BAG, true);
+                    break;
+                }
+                auto currentLevel = CurrentUpgrade(UPG_BULLET_BAG);
+                auto newLevel = currentLevel + (!state ? -1 : 1);
+                if (currentLevel == 0 && state || currentLevel == 1 && !state) {
+                    SetInventory(ITEM_SLINGSHOT, (!state ? ITEM_NONE : ITEM_SLINGSHOT));
+                }
+                SetUpgrade(UPG_BULLET_BAG, newLevel);
+            }   break;
+            case RG_PROGRESSIVE_WALLET:
+            {
+                auto realGI = item.GetGIEntry();
+                if (realGI->itemId == RG_WALLET_INF && realGI->modIndex == MOD_RANDOMIZER) {
+                    SetRandoInf(RAND_INF_HAS_INFINITE_MONEY, true);
+                    break;
+                }
+                auto currentLevel = CurrentUpgrade(UPG_WALLET);
+                if (!CheckRandoInf(RAND_INF_HAS_WALLET) && state) {
+                    SetRandoInf(RAND_INF_HAS_WALLET, true);
+                }
+                else if (currentLevel == 0 && !state) {
+                    SetRandoInf(RAND_INF_HAS_WALLET, false);
+                }
+                else {
+                    auto newLevel = currentLevel + (!state ? -1 : 1);
+                    SetUpgrade(UPG_WALLET, newLevel);
+                }
+            }   break;
+            case RG_PROGRESSIVE_SCALE:
+            {
+                auto currentLevel = CurrentUpgrade(UPG_SCALE);
+                if (!CheckRandoInf(RAND_INF_CAN_SWIM) && state) {
+                    SetRandoInf(RAND_INF_CAN_SWIM, true);
+                }
+                else if (currentLevel == 0 && !state) {
+                    SetRandoInf(RAND_INF_CAN_SWIM, false);
+                }
+                else {
+                    auto newLevel = currentLevel + (!state ? -1 : 1);
+                    SetUpgrade(UPG_SCALE, newLevel);
+                }
+            }   break;
+            case RG_PROGRESSIVE_NUT_UPGRADE:
+            {
+                auto realGI = item.GetGIEntry();
+                if (realGI->itemId == RG_NUT_UPGRADE_INF && realGI->modIndex == MOD_RANDOMIZER) {
+                    SetRandoInf(RAND_INF_HAS_INFINITE_NUT_UPGRADE, true);
+                    break;
+                }
+                auto currentLevel = CurrentUpgrade(UPG_NUTS);
+                auto newLevel = currentLevel + (!state ? -1 : 1);
+                if (currentLevel == 0 && state || currentLevel == 1 && !state) {
+                    SetInventory(ITEM_NUT, (!state ? ITEM_NONE : ITEM_NUT));
+                }
+                SetUpgrade(UPG_NUTS, newLevel);
+            }   break;
+            case RG_PROGRESSIVE_STICK_UPGRADE:
+            {
+                auto realGI = item.GetGIEntry();
+                if (realGI->itemId == RG_STICK_UPGRADE_INF && realGI->modIndex == MOD_RANDOMIZER) {
+                    SetRandoInf(RAND_INF_HAS_INFINITE_STICK_UPGRADE, true);
+                    break;
+                }
+                auto currentLevel = CurrentUpgrade(UPG_STICKS);
+                auto newLevel = currentLevel + (!state ? -1 : 1);
+                if (currentLevel == 0 && state || currentLevel == 1 && !state) {
+                    SetInventory(ITEM_STICK, (!state ? ITEM_NONE : ITEM_STICK));
+                }
+                SetUpgrade(UPG_STICKS, newLevel);
+            }   break;
+            case RG_PROGRESSIVE_BOMBCHUS:
+            {
+                auto realGI = item.GetGIEntry();
+                if (realGI->itemId == RG_BOMBCHU_INF && realGI->modIndex == MOD_RANDOMIZER) {
+                    SetRandoInf(RAND_INF_HAS_INFINITE_BOMBCHUS, true);
+                    break;
+                }
+                SetInventory(ITEM_BOMBCHU, (!state ? ITEM_NONE : ITEM_BOMBCHU));
+            } break;
+            case RG_PROGRESSIVE_MAGIC_METER:
+            {
+                auto realGI = item.GetGIEntry();
+                if (realGI->itemId == RG_MAGIC_INF && realGI->modIndex == MOD_RANDOMIZER) {
+                    SetRandoInf(RAND_INF_HAS_INFINITE_MAGIC_METER, true);
+                    break;
+                }
+                mSaveContext->magicLevel += (!state ? -1 : 1);
+            } break;
+            case RG_PROGRESSIVE_OCARINA:
+            {
+                uint8_t i;
+                for (i = 0; i < 3; i++) {
+                    if (CurrentInventory(ITEM_OCARINA_FAIRY) == OcarinaLookup[i]) {
+                        break;
+                    }
+                }
+                i += (!state ? -1 : 1);
+                if (i < 0) {
+                    i = 0;
+                }
+                else if (i > 2) {
+                    i = 2;
+                }
+                SetInventory(ITEM_OCARINA_FAIRY, OcarinaLookup[i]);
+            }   break;
+            case RG_HEART_CONTAINER:
+                mSaveContext->healthCapacity += (!state ? -16 : 16);
+                break;
+            case RG_PIECE_OF_HEART:
+                mSaveContext->healthCapacity += (!state ? -4 : 4);
+                break;
+            case RG_BOOMERANG:
+            case RG_LENS_OF_TRUTH:
+            case RG_MEGATON_HAMMER:
+            case RG_DINS_FIRE:
+            case RG_FARORES_WIND:
+            case RG_NAYRUS_LOVE:
+            case RG_FIRE_ARROWS:
+            case RG_ICE_ARROWS:
+            case RG_LIGHT_ARROWS:
+                SetInventory(item.GetGIEntry()->itemId, (!state ? ITEM_NONE : item.GetGIEntry()->itemId));
+                break;
+            case RG_MAGIC_BEAN:
+            case RG_MAGIC_BEAN_PACK:
+            {
+                auto change = (item.GetRandomizerGet() == RG_MAGIC_BEAN ? 1 : 10);
+                auto current = GetAmmo(ITEM_BEAN);
+                SetAmmo(ITEM_BEAN, current + (!state ? -change : change));
+            }   break;
+            case RG_EMPTY_BOTTLE:
+            case RG_BOTTLE_WITH_MILK:
+            case RG_BOTTLE_WITH_RED_POTION:
+            case RG_BOTTLE_WITH_GREEN_POTION:
+            case RG_BOTTLE_WITH_BLUE_POTION:
+            case RG_BOTTLE_WITH_FAIRY:
+            case RG_BOTTLE_WITH_FISH:
+            case RG_BOTTLE_WITH_BLUE_FIRE:
+            case RG_BOTTLE_WITH_BUGS:
+            case RG_BOTTLE_WITH_POE:
+            case RG_BOTTLE_WITH_BIG_POE:
+            {
+                uint8_t slot = SLOT_BOTTLE_1;
+                while (slot != SLOT_BOTTLE_4) {
+                    if (mSaveContext->inventory.items[slot] == ITEM_NONE) {
+                        break;
+                    }
+                    slot++;
+                }
+                mSaveContext->inventory.items[slot] = item.GetGIEntry()->itemId;
+            }   break;
+            case RG_RUTOS_LETTER:
+                SetEventChkInf(EVENTCHKINF_OBTAINED_RUTOS_LETTER, state);
+                break;
+            case RG_GOHMA_SOUL:
+            case RG_KING_DODONGO_SOUL:
+            case RG_BARINADE_SOUL:
+            case RG_PHANTOM_GANON_SOUL:
+            case RG_VOLVAGIA_SOUL:
+            case RG_MORPHA_SOUL:
+            case RG_BONGO_BONGO_SOUL:
+            case RG_TWINROVA_SOUL:
+            case RG_GANON_SOUL:
+            case RG_OCARINA_A_BUTTON:
+            case RG_OCARINA_C_UP_BUTTON:
+            case RG_OCARINA_C_DOWN_BUTTON:
+            case RG_OCARINA_C_LEFT_BUTTON:
+            case RG_OCARINA_C_RIGHT_BUTTON:
+            case RG_GREG_RUPEE:
+            case RG_FISHING_POLE:
+                SetRandoInf(RandoGetToRandInf.at(randoGet), state);
+                break;
+            case RG_TRIFORCE_PIECE:
+                mSaveContext->triforcePiecesCollected += (!state ? -1 : 1);
+                break;
+            case RG_BOMBCHU_5:
+            case RG_BOMBCHU_10:
+            case RG_BOMBCHU_20:
+            case RG_BOMBCHU_DROP:
+                SetInventory(ITEM_BOMBCHU, (!state ? ITEM_NONE : ITEM_BOMBCHU));
+                break;
+        }
+    }
+    break;
+    case ITEMTYPE_EQUIP:
+    {
+        RandomizerGet itemRG = item.GetRandomizerGet();
+        if (itemRG == RG_GIANTS_KNIFE) {
+            return;
+        }
+        uint32_t equipId = RandoGetToEquipFlag.find(itemRG)->second;
+        if (!state) {
+            mSaveContext->inventory.equipment &= ~equipId;
+            if (equipId == EQUIP_FLAG_SWORD_BGS) {
+                mSaveContext->bgsFlag = false;
+            }
+        }
+        else {
+            mSaveContext->inventory.equipment |= equipId;
+            if (equipId == EQUIP_FLAG_SWORD_BGS) {
+                mSaveContext->bgsFlag = true;
+            }
+        }
+    }
+    break;
+    case ITEMTYPE_DUNGEONREWARD:
+    case ITEMTYPE_SONG:
+        SetQuestItem(RandoGetToQuestItem.find(item.GetRandomizerGet())->second, state);
+        break;
+    case ITEMTYPE_MAP:
+        SetDungeonItem(DUNGEON_MAP, RandoGetToDungeonScene.find(item.GetRandomizerGet())->second, state);
+        break;
+    case ITEMTYPE_COMPASS:
+        SetDungeonItem(DUNGEON_COMPASS, RandoGetToDungeonScene.find(item.GetRandomizerGet())->second, state);
+        break;
+    case ITEMTYPE_BOSSKEY:
+        SetDungeonItem(DUNGEON_KEY_BOSS, RandoGetToDungeonScene.find(item.GetRandomizerGet())->second, state);
+        break;
+    case ITEMTYPE_FORTRESS_SMALLKEY:
+    case ITEMTYPE_SMALLKEY:
+    {
+        auto randoGet = item.GetRandomizerGet();
+        auto keyring = randoGet >= RG_FOREST_TEMPLE_KEY_RING && randoGet <= RG_GANONS_CASTLE_KEY_RING;
+        auto dungeonIndex = RandoGetToDungeonScene.find(randoGet)->second;
+        auto count = GetSmallKeyCount(dungeonIndex);
+        if (!state) {
+            if (keyring) {
+                count = 0;
+            }
+            else {
+                count -= 1;
+            }
+        }
+        else {
+            if (keyring) {
+                count = 10;
+            }
+            else {
+                count += 1;
+            }
+        }
+        SetSmallKeyCount(dungeonIndex, count);
+    } break;
+    case ITEMTYPE_TOKEN:
+        mSaveContext->inventory.gsTokens += (!state ? -1 : 1);
+        break;
+    case ITEMTYPE_EVENT:
+        break;
+    case ITEMTYPE_DROP:
+    case ITEMTYPE_REFILL:
+    case ITEMTYPE_SHOP:
+    {
+        RandomizerGet itemRG = item.GetRandomizerGet();
+        if (itemRG == RG_BUY_HYLIAN_SHIELD || itemRG == RG_BUY_DEKU_SHIELD || itemRG == RG_BUY_GORON_TUNIC || itemRG == RG_BUY_ZORA_TUNIC) {
+            uint32_t equipId = RandoGetToEquipFlag.find(itemRG)->second;
+            if (!state) {
+                mSaveContext->inventory.equipment &= ~equipId;
+            }
+            else {
+                mSaveContext->inventory.equipment |= equipId;
+            }
+        }
+        switch (itemRG) {
+        case RG_DEKU_NUTS_5:
+        case RG_DEKU_NUTS_10:
+        case RG_BUY_DEKU_NUTS_5:
+        case RG_BUY_DEKU_NUTS_10:
+            SetInventory(ITEM_NUT, (!state ? ITEM_NONE : ITEM_NUT));
+            break;
+        case RG_DEKU_STICK_1:
+        case RG_BUY_DEKU_STICK_1:
+        case RG_STICKS:
+            SetInventory(ITEM_STICK, (!state ? ITEM_NONE : ITEM_STICK));
+            break;
+        case RG_BOMBCHU_5:
+        case RG_BOMBCHU_10:
+        case RG_BOMBCHU_20:
+        case RG_BOMBCHU_DROP:
+            SetInventory(ITEM_BOMBCHU, (!state ? ITEM_NONE : ITEM_BOMBCHU));
+            break;
+        }
+    } break;
+    }
+    mLogic->UpdateHelpers();
+}
+
 std::shared_ptr<Settings> Context::GetSettings() {
     return mSettings;
 }
@@ -422,7 +916,170 @@ std::shared_ptr<Logic> Context::GetLogic() {
     return mLogic;
 }
 
+SaveContext* Context::GetSaveContext() {
+    if (mSaveContext == nullptr) {
+        NewSaveContext();
+    }
+    return mSaveContext;
+}
+
+void Context::SetSaveContext(SaveContext* context) {
+    mSaveContext = context;
+}
+
+void Context::InitSaveContext() {
+    mSaveContext->totalDays = 0;
+    mSaveContext->bgsDayCount = 0;
+
+    mSaveContext->deaths = 0;
+    for (int i = 0; i < ARRAY_COUNT(mSaveContext->playerName); i++) {
+        mSaveContext->playerName[i] = 0x3E;
+    }
+    mSaveContext->n64ddFlag = 0;
+    mSaveContext->healthCapacity = 0x30;
+    mSaveContext->health = 0x30;
+    mSaveContext->magicLevel = 0;
+    mSaveContext->magic = 0x30;
+    mSaveContext->rupees = 0;
+    mSaveContext->swordHealth = 0;
+    mSaveContext->naviTimer = 0;
+    mSaveContext->isMagicAcquired = 0;
+    mSaveContext->isDoubleMagicAcquired = 0;
+    mSaveContext->isDoubleDefenseAcquired = 0;
+    mSaveContext->bgsFlag = 0;
+    mSaveContext->ocarinaGameRoundNum = 0;
+    for (int button = 0; button < ARRAY_COUNT(mSaveContext->childEquips.buttonItems); button++) {
+        mSaveContext->childEquips.buttonItems[button] = ITEM_NONE;
+    }
+    for (int button = 0; button < ARRAY_COUNT(mSaveContext->childEquips.cButtonSlots); button++) {
+        mSaveContext->childEquips.cButtonSlots[button] = SLOT_NONE;
+    }
+    mSaveContext->childEquips.equipment = 0;
+    for (int button = 0; button < ARRAY_COUNT(mSaveContext->adultEquips.buttonItems); button++) {
+        mSaveContext->adultEquips.buttonItems[button] = ITEM_NONE;
+    }
+    for (int button = 0; button < ARRAY_COUNT(mSaveContext->adultEquips.cButtonSlots); button++) {
+        mSaveContext->adultEquips.cButtonSlots[button] = SLOT_NONE;
+    }
+    mSaveContext->adultEquips.equipment = 0;
+    mSaveContext->unk_54 = 0;
+    mSaveContext->savedSceneNum = SCENE_LINKS_HOUSE;
+
+    // Equipment
+    for (int button = 0; button < ARRAY_COUNT(mSaveContext->equips.buttonItems); button++) {
+        mSaveContext->equips.buttonItems[button] = ITEM_NONE;
+    }
+    for (int button = 0; button < ARRAY_COUNT(mSaveContext->equips.cButtonSlots); button++) {
+        mSaveContext->equips.cButtonSlots[button] = SLOT_NONE;
+    }
+    mSaveContext->equips.equipment = 0;
+
+    // Inventory
+    for (int item = 0; item < ARRAY_COUNT(mSaveContext->inventory.items); item++) {
+        mSaveContext->inventory.items[item] = ITEM_NONE;
+    }
+    for (int ammo = 0; ammo < ARRAY_COUNT(mSaveContext->inventory.ammo); ammo++) {
+        mSaveContext->inventory.ammo[ammo] = 0;
+    }
+    mSaveContext->inventory.equipment = 0;
+    mSaveContext->inventory.upgrades = 0;
+    mSaveContext->inventory.questItems = 0;
+    for (int dungeon = 0; dungeon < ARRAY_COUNT(mSaveContext->inventory.dungeonItems); dungeon++) {
+        mSaveContext->inventory.dungeonItems[dungeon] = 0;
+    }
+    for (int dungeon = 0; dungeon < ARRAY_COUNT(mSaveContext->inventory.dungeonKeys); dungeon++) {
+        mSaveContext->inventory.dungeonKeys[dungeon] = 0x0;
+    }
+    mSaveContext->inventory.defenseHearts = 0;
+    mSaveContext->inventory.gsTokens = 0;
+    for (int scene = 0; scene < ARRAY_COUNT(mSaveContext->sceneFlags); scene++) {
+        mSaveContext->sceneFlags[scene].chest = 0;
+        mSaveContext->sceneFlags[scene].swch = 0;
+        mSaveContext->sceneFlags[scene].clear = 0;
+        mSaveContext->sceneFlags[scene].collect = 0;
+        mSaveContext->sceneFlags[scene].unk = 0;
+        mSaveContext->sceneFlags[scene].rooms = 0;
+        mSaveContext->sceneFlags[scene].floors = 0;
+    }
+    mSaveContext->fw.pos.x = 0;
+    mSaveContext->fw.pos.y = 0;
+    mSaveContext->fw.pos.z = 0;
+    mSaveContext->fw.yaw = 0;
+    mSaveContext->fw.playerParams = 0;
+    mSaveContext->fw.entranceIndex = 0;
+    mSaveContext->fw.roomIndex = 0;
+    mSaveContext->fw.set = 0;
+    mSaveContext->fw.tempSwchFlags = 0;
+    mSaveContext->fw.tempCollectFlags = 0;
+    for (int flag = 0; flag < ARRAY_COUNT(mSaveContext->gsFlags); flag++) {
+        mSaveContext->gsFlags[flag] = 0;
+    }
+    for (int highscore = 0; highscore < ARRAY_COUNT(mSaveContext->highScores); highscore++) {
+        mSaveContext->highScores[highscore] = 0;
+    }
+    for (int flag = 0; flag < ARRAY_COUNT(mSaveContext->eventChkInf); flag++) {
+        mSaveContext->eventChkInf[flag] = 0;
+    }
+    for (int flag = 0; flag < ARRAY_COUNT(mSaveContext->itemGetInf); flag++) {
+        mSaveContext->itemGetInf[flag] = 0;
+    }
+    for (int flag = 0; flag < ARRAY_COUNT(mSaveContext->infTable); flag++) {
+        mSaveContext->infTable[flag] = 0;
+    }
+    mSaveContext->worldMapAreaData = 0;
+    mSaveContext->scarecrowLongSongSet = 0;
+    for (int i = 0; i < ARRAY_COUNT(mSaveContext->scarecrowLongSong); i++) {
+        mSaveContext->scarecrowLongSong[i].noteIdx = 0;
+        mSaveContext->scarecrowLongSong[i].unk_01 = 0;
+        mSaveContext->scarecrowLongSong[i].unk_02 = 0;
+        mSaveContext->scarecrowLongSong[i].volume = 0;
+        mSaveContext->scarecrowLongSong[i].vibrato = 0;
+        mSaveContext->scarecrowLongSong[i].tone = 0;
+        mSaveContext->scarecrowLongSong[i].semitone = 0;
+    }
+    mSaveContext->scarecrowSpawnSongSet = 0;
+    for (int i = 0; i < ARRAY_COUNT(mSaveContext->scarecrowSpawnSong); i++) {
+        mSaveContext->scarecrowSpawnSong[i].noteIdx = 0;
+        mSaveContext->scarecrowSpawnSong[i].unk_01 = 0;
+        mSaveContext->scarecrowSpawnSong[i].unk_02 = 0;
+        mSaveContext->scarecrowSpawnSong[i].volume = 0;
+        mSaveContext->scarecrowSpawnSong[i].vibrato = 0;
+        mSaveContext->scarecrowSpawnSong[i].tone = 0;
+        mSaveContext->scarecrowSpawnSong[i].semitone = 0;
+    }
+
+    mSaveContext->horseData.scene = SCENE_HYRULE_FIELD;
+    mSaveContext->horseData.pos.x = -1840;
+    mSaveContext->horseData.pos.y = 72;
+    mSaveContext->horseData.pos.z = 5497;
+    mSaveContext->horseData.angle = -0x6AD9;
+    mSaveContext->magicLevel = 0;
+    mSaveContext->infTable[29] = 1;
+    mSaveContext->sceneFlags[5].swch = 0x40000000;
+
+    // SoH specific
+    mSaveContext->backupFW = mSaveContext->fw;
+    mSaveContext->pendingSale = ITEM_NONE;
+    mSaveContext->pendingSaleMod = MOD_NONE;
+    mSaveContext->isBossRushPaused = 0;
+    mSaveContext->pendingIceTrapCount = 0;
+
+    // Init with normal quest unless only an MQ rom is provided
+    mSaveContext->questId = OTRGlobals::Instance->HasOriginal() ? QUEST_NORMAL : QUEST_MASTER;
+
+    //RANDOTODO (ADD ITEMLOCATIONS TO GSAVECONTEXT)
+}
+
+void Context::NewSaveContext() {
+    if (mSaveContext != nullptr && mSaveContext != &gSaveContext) {
+        free(mSaveContext);
+    }
+    mSaveContext = new SaveContext();
+    InitSaveContext();
+}
+
 void Context::ResetLogic() {
+    NewSaveContext();
     mLogic->Reset();
 }
 
@@ -449,4 +1106,121 @@ Option& Context::GetOption(const RandomizerSettingKey key) const {
 TrickOption& Context::GetTrickOption(const RandomizerTrick key) const {
     return mSettings->GetTrickOption(key);
 }
+
+uint8_t Context::InventorySlot(uint32_t item) {
+    return gItemSlots[item];
+}
+
+uint32_t Context::CurrentUpgrade(uint32_t upgrade) {
+    return (mSaveContext->inventory.upgrades & gUpgradeMasks[upgrade]) >> gUpgradeShifts[upgrade];
+}
+
+uint32_t Context::CurrentInventory(uint32_t item) {
+    return mSaveContext->inventory.items[InventorySlot(item)];
+}
+
+void Context::SetUpgrade(uint32_t upgrade, uint8_t level) {
+    mSaveContext->inventory.upgrades &= gUpgradeNegMasks[upgrade];
+    mSaveContext->inventory.upgrades |= level << gUpgradeShifts[upgrade];
+}
+
+bool Context::CheckInventory(uint32_t item, bool exact) {
+    auto current = mSaveContext->inventory.items[InventorySlot(item)];
+    return exact ? (current == item) : (current != ITEM_NONE);
+}
+
+void Context::SetInventory(uint32_t itemSlot, uint32_t item) {
+    mSaveContext->inventory.items[InventorySlot(itemSlot)] = item;
+}
+
+bool Context::CheckEquipment(uint32_t equipFlag) {
+    return (equipFlag & mSaveContext->inventory.equipment);
+}
+
+bool Context::CheckQuestItem(uint32_t item) {
+    return ((1 << item) & mSaveContext->inventory.questItems);
+}
+
+bool Context::HasAdultTrade(uint32_t itemID) {
+    int tradeIndex = itemID - ITEM_POCKET_EGG;
+    return mSaveContext->adultTradeItems & (1 << tradeIndex);
+}
+
+void Context::SetAdultTrade(uint32_t itemID, bool state) {
+    int tradeIndex = itemID - ITEM_POCKET_EGG;
+    if (!state) {
+        mSaveContext->adultTradeItems &= ~(1 << tradeIndex);
+    }
+    else {
+        mSaveContext->adultTradeItems |= (1 << tradeIndex);
+    }
+}
+
+void Context::SetQuestItem(uint32_t item, bool state) {
+    if (!state) {
+        mSaveContext->inventory.questItems &= ~(1 << item);
+    }
+    else {
+        mSaveContext->inventory.questItems |= (1 << item);
+    }
+}
+
+uint8_t Context::GetSmallKeyCount(uint32_t dungeonIndex) {
+    return mSaveContext->inventory.dungeonKeys[dungeonIndex];
+}
+
+void Context::SetSmallKeyCount(uint32_t dungeonIndex, uint8_t count) {
+    mSaveContext->inventory.dungeonKeys[dungeonIndex] = count;
+}
+
+bool Context::CheckDungeonItem(uint32_t item, uint32_t dungeonIndex) {
+    return mSaveContext->inventory.dungeonItems[dungeonIndex] & gBitFlags[item];
+}
+
+void Context::SetDungeonItem(uint32_t item, uint32_t dungeonIndex, bool state) {
+    if (!state) {
+        mSaveContext->inventory.dungeonItems[dungeonIndex] &= ~gBitFlags[item];
+    }
+    else {
+        mSaveContext->inventory.dungeonItems[dungeonIndex] |= gBitFlags[item];
+    }
+}
+
+bool Context::CheckRandoInf(uint32_t flag) {
+    return mSaveContext->randomizerInf[flag >> 4] & (1 << (flag & 0xF));
+}
+
+void Context::SetRandoInf(uint32_t flag, bool state) {
+    if (!state) {
+        mSaveContext->randomizerInf[flag >> 4] &= ~(1 << (flag & 0xF));
+    }
+    else {
+        mSaveContext->randomizerInf[flag >> 4] |= (1 << (flag & 0xF));
+    }
+}
+
+bool Context::CheckEventChkInf(int32_t flag) {
+    return mSaveContext->eventChkInf[flag >> 4] & (1 << (flag & 0xF));
+}
+
+void Context::SetEventChkInf(int32_t flag, bool state) {
+    if (!state) {
+        mSaveContext->eventChkInf[flag >> 4] &= ~(1 << (flag & 0xF));
+    }
+    else {
+        mSaveContext->eventChkInf[flag >> 4] |= (1 << (flag & 0xF));
+    }
+}
+
+uint8_t Context::GetGSCount() {
+    return mSaveContext->inventory.gsTokens;
+}
+
+uint8_t Context::GetAmmo(uint32_t item) {
+    return mSaveContext->inventory.ammo[gItemSlots[item]];
+}
+
+void Context::SetAmmo(uint32_t item, uint8_t count) {
+    mSaveContext->inventory.ammo[gItemSlots[item]] = count;
+}
 } // namespace Rando
diff --git a/soh/soh/Enhancements/randomizer/context.h b/soh/soh/Enhancements/randomizer/context.h
index 2deb4e365..13147143e 100644
--- a/soh/soh/Enhancements/randomizer/context.h
+++ b/soh/soh/Enhancements/randomizer/context.h
@@ -52,6 +52,10 @@ class Context {
     void GenerateLocationPool();
     static std::vector<RandomizerCheck> GetLocations(const std::vector<RandomizerCheck>& locationPool,
                                               Category categoryInclude, Category categoryExclude = Category::cNull);
+    static std::map<uint32_t, uint32_t> RandoGetToQuestItem;
+    static std::map<uint32_t, uint32_t> RandoGetToDungeonScene;
+    static std::map<RandomizerGet, uint32_t> RandoGetToEquipFlag;
+    static std::map<RandomizerGet, uint32_t> RandoGetToRandInf;
     void AddExcludedOptions();
     void LocationReset();
     void ClearItemLocations();
@@ -64,12 +68,17 @@ class Context {
     void SetSpoilerLoaded(bool spoilerLoaded = true);
     bool IsPlandoLoaded() const;
     void SetPlandoLoaded(bool plandoLoaded = true);
+    void ApplyItemEffect(Item& item, bool state);
     std::shared_ptr<Settings> GetSettings();
     std::shared_ptr<EntranceShuffler> GetEntranceShuffler();
     std::shared_ptr<Dungeons> GetDungeons();
     std::shared_ptr<Fishsanity> GetFishsanity();
     DungeonInfo* GetDungeon(size_t key) const;
     std::shared_ptr<Logic> GetLogic();
+    SaveContext* GetSaveContext();
+    void SetSaveContext(SaveContext* context);
+    void InitSaveContext();
+    void NewSaveContext();
     void ResetLogic();
     std::shared_ptr<Trials> GetTrials();
     TrialInfo* GetTrial(size_t key) const;
@@ -92,6 +101,28 @@ class Context {
     bool playthroughBeatable = false;
     bool allLocationsReachable = false;
     RandomizerArea GetAreaFromString(std::string str);
+    uint8_t InventorySlot(uint32_t item);
+    void SetUpgrade(uint32_t upgrade, uint8_t level);
+    uint32_t CurrentUpgrade(uint32_t upgrade);
+    uint32_t CurrentInventory(uint32_t item);
+    bool CheckInventory(uint32_t item, bool exact);
+    void SetInventory(uint32_t itemSlot, uint32_t item);
+    bool CheckEquipment(uint32_t item);
+    bool CheckQuestItem(uint32_t item);
+    void SetQuestItem(uint32_t item, bool state);
+    bool HasAdultTrade(uint32_t item);
+    void SetAdultTrade(uint32_t item, bool state);
+    uint8_t GetSmallKeyCount(uint32_t dungeonIndex);
+    void SetSmallKeyCount(uint32_t dungeonIndex, uint8_t count);
+    bool CheckDungeonItem(uint32_t item, uint32_t dungeonIndex);
+    void SetDungeonItem(uint32_t item, uint32_t dungeonIndex, bool state);
+    bool CheckRandoInf(uint32_t flag);
+    void SetRandoInf(uint32_t flag, bool state);
+    bool CheckEventChkInf(int32_t flag);
+    uint8_t GetGSCount();
+    void SetEventChkInf(int32_t flag, bool state);
+    uint8_t GetAmmo(uint32_t item);
+    void SetAmmo(uint32_t item, uint8_t count);
 
   private:
     static std::weak_ptr<Context> mContext;
@@ -101,6 +132,7 @@ class Context {
     std::shared_ptr<EntranceShuffler> mEntranceShuffler;
     std::shared_ptr<Dungeons> mDungeons;
     std::shared_ptr<Logic> mLogic;
+    SaveContext* mSaveContext = nullptr;
     std::shared_ptr<Trials> mTrials;
     std::shared_ptr<Fishsanity> mFishsanity;
     bool mSeedGenerated = false;
diff --git a/soh/soh/Enhancements/randomizer/item.cpp b/soh/soh/Enhancements/randomizer/item.cpp
index 2ffedbfeb..5fbab59a8 100644
--- a/soh/soh/Enhancements/randomizer/item.cpp
+++ b/soh/soh/Enhancements/randomizer/item.cpp
@@ -14,74 +14,41 @@ namespace Rando {
 Item::Item() : randomizerGet(RG_NONE), type(ITEMTYPE_ITEM), getItemId(GI_NONE), advancement(false), hintKey(RHT_NONE),
                progressive(false), price(0) {}
 Item::Item(const RandomizerGet randomizerGet_, Text name_, const ItemType type_, const int16_t getItemId_,
-           const bool advancement_, bool* logicVar_, const RandomizerHintTextKey hintKey_, const uint16_t itemId_,
-           const uint16_t objectId_, const uint16_t gid_, const uint16_t textId_, const uint16_t field_,
-           const int16_t chestAnimation_, const GetItemCategory category_, const uint16_t modIndex_,
-           const bool progressive_, const uint16_t price_)
+    const bool advancement_, LogicVal logicVal_, const RandomizerHintTextKey hintKey_, const uint16_t itemId_,
+    const uint16_t objectId_, const uint16_t gid_, const uint16_t textId_, const uint16_t field_,
+    const int16_t chestAnimation_, const GetItemCategory category_, const uint16_t modIndex_,
+    const bool progressive_, const uint16_t price_)
     : randomizerGet(randomizerGet_), name(std::move(name_)), type(type_), getItemId(getItemId_),
-      advancement(advancement_), logicVar(logicVar_), hintKey(hintKey_), progressive(progressive_), price(price_) {
+    advancement(advancement_), logicVal(logicVal_), hintKey(hintKey_), progressive(progressive_), price(price_) {
     if (modIndex_ == MOD_RANDOMIZER || getItemId > 0x7D) {
-        giEntry = std::make_shared<GetItemEntry>(GetItemEntry{itemId_, field_, static_cast<int16_t>((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_, objectId_, modIndex_, TABLE_RANDOMIZER, static_cast<int16_t>(randomizerGet_), gid_, true, ITEM_FROM_NPC, category_, static_cast<uint16_t>(randomizerGet_), MOD_RANDOMIZER, NULL});
-    } else {
-        giEntry = std::make_shared<GetItemEntry>(GetItemEntry{itemId_, field_, static_cast<int16_t>((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_, objectId_, modIndex_, TABLE_VANILLA, getItemId_, gid_, true, ITEM_FROM_NPC, category_, itemId_, modIndex_, NULL});
+        giEntry = std::make_shared<GetItemEntry>(GetItemEntry{ itemId_, field_, static_cast<int16_t>((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_, objectId_, modIndex_, TABLE_RANDOMIZER, static_cast<int16_t>(randomizerGet_), gid_, true, ITEM_FROM_NPC, category_, static_cast<uint16_t>(randomizerGet_), MOD_RANDOMIZER, NULL });
+    }
+    else {
+        giEntry = std::make_shared<GetItemEntry>(GetItemEntry{ itemId_, field_, static_cast<int16_t>((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_, objectId_, modIndex_, TABLE_VANILLA, getItemId_, gid_, true, ITEM_FROM_NPC, category_, itemId_, modIndex_, NULL });
     }
 }
 
 Item::Item(const RandomizerGet randomizerGet_, Text name_, const ItemType type_, const int16_t getItemId_,
-           const bool advancement_, uint8_t* logicVar_, const RandomizerHintTextKey hintKey_, const uint16_t itemId_,
-           const uint16_t objectId_, const uint16_t gid_, const uint16_t textId_, const uint16_t field_,
-           const int16_t chestAnimation_, const GetItemCategory category_, const uint16_t modIndex_,
-           const bool progressive_, const uint16_t price_)
+    const bool advancement_, LogicVal logicVal_, const RandomizerHintTextKey hintKey_, const bool progressive_,
+    const uint16_t price_)
     : randomizerGet(randomizerGet_), name(std::move(name_)), type(type_), getItemId(getItemId_),
-      advancement(advancement_), logicVar(logicVar_), hintKey(hintKey_), progressive(progressive_), price(price_) {
-    if (modIndex_ == MOD_RANDOMIZER || getItemId > 0x7D) {
-        giEntry = std::make_shared<GetItemEntry>(GetItemEntry{itemId_, field_, static_cast<int16_t>((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_, objectId_, modIndex_, TABLE_RANDOMIZER, static_cast<int16_t>(randomizerGet_), gid_, true, ITEM_FROM_NPC, category_, static_cast<uint16_t>(randomizerGet_), modIndex_, NULL});
-    } else {
-        giEntry = std::make_shared<GetItemEntry>(GetItemEntry{itemId_, field_, static_cast<int16_t>((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_, objectId_, modIndex_, TABLE_VANILLA, getItemId_, gid_, true, ITEM_FROM_NPC, category_, itemId_, modIndex_, NULL});
-    }
-}
-
-Item::Item(const RandomizerGet randomizerGet_, Text name_, const ItemType type_, const int16_t getItemId_,
-           const bool advancement_, bool* logicVar_, const RandomizerHintTextKey hintKey_, const bool progressive_,
-           const uint16_t price_)
-    : randomizerGet(randomizerGet_), name(std::move(name_)), type(type_), getItemId(getItemId_),
-      advancement(advancement_), logicVar(logicVar_), hintKey(hintKey_), progressive(progressive_), price(price_) {
-}
-
-Item::Item(const RandomizerGet randomizerGet_, Text name_, const ItemType type_, const int16_t getItemId_,
-           const bool advancement_, uint8_t* logicVar_, const RandomizerHintTextKey hintKey_, const bool progressive_,
-           const uint16_t price_)
-    : randomizerGet(randomizerGet_), name(std::move(name_)), type(type_), getItemId(getItemId_),
-      advancement(advancement_), logicVar(logicVar_), hintKey(hintKey_), progressive(progressive_), price(price_) {
+    advancement(advancement_), logicVal(logicVal_), hintKey(hintKey_), progressive(progressive_), price(price_) {
 }
 
     Item::~Item() = default;
 
 void Item::ApplyEffect() const {
-    // If this is a key ring, logically add as many keys as we could need
-    if (RHT_FOREST_TEMPLE_KEY_RING <= hintKey && hintKey <= RHT_GANONS_CASTLE_KEY_RING) {
-        *std::get<uint8_t*>(logicVar) += 10;
-    } else {
-        if (std::holds_alternative<bool*>(logicVar)) {
-            *std::get<bool*>(logicVar) = true;
-        } else {
-            *std::get<uint8_t*>(logicVar) += 1;
-        }
-    }
-    Rando::Context::GetInstance()->GetLogic()->UpdateHelpers();
+    auto ctx = Rando::Context::GetInstance();
+    ctx->ApplyItemEffect(StaticData::RetrieveItem(randomizerGet), true);
+    ctx->GetLogic()->SetInLogic(logicVal, true);
+    ctx->GetLogic()->UpdateHelpers();
 }
 
 void Item::UndoEffect() const {
-    if (RHT_FOREST_TEMPLE_KEY_RING <= hintKey && hintKey <= RHT_GANONS_CASTLE_KEY_RING) {
-        *std::get<uint8_t*>(logicVar) -= 10;
-    } else {
-        if (std::holds_alternative<bool*>(logicVar)) {
-            *std::get<bool*>(logicVar) = false;
-        } else {
-            *std::get<uint8_t*>(logicVar) -= 1;
-        }
-    }
-    Rando::Context::GetInstance()->GetLogic()->UpdateHelpers();
+    auto ctx = Rando::Context::GetInstance();
+    ctx->ApplyItemEffect(StaticData::RetrieveItem(randomizerGet), false);
+    ctx->GetLogic()->SetInLogic(logicVal, false);
+    ctx->GetLogic()->UpdateHelpers();
 }
 
 const Text& Item::GetName() const {
@@ -100,8 +67,8 @@ ItemType Item::GetItemType() const {
     return type;
 }
 
-std::variant<bool*, uint8_t*> Item::GetLogicVar() const {
-    return logicVar;
+LogicVal Item::GetLogicVal() const {
+    return logicVal;
 }
 
 RandomizerGet Item::GetRandomizerGet() const {
@@ -116,13 +83,14 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
     if (giEntry != nullptr) {
         return giEntry;
     }
+    auto ctx = Rando::Context::GetInstance();
     RandomizerGet actual = RG_NONE;
     const bool tycoonWallet =
         OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHOPSANITY) > RO_SHOPSANITY_ZERO_ITEMS;
     const u8 infiniteUpgrades = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_INFINITE_UPGRADES);
     switch (randomizerGet) {
         case RG_PROGRESSIVE_STICK_UPGRADE:
-            switch (CUR_UPG_VALUE(UPG_STICKS)) {
+            switch (ctx->CurrentUpgrade(UPG_STICKS)) {
                 case 0:
                     if (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_DEKU_STICK_BAG)) {
                         actual = RG_DEKU_STICK_BAG;
@@ -151,7 +119,7 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
             }
             break;
         case RG_PROGRESSIVE_NUT_UPGRADE:
-            switch (CUR_UPG_VALUE(UPG_NUTS)) {
+            switch (ctx->CurrentUpgrade(UPG_NUTS)) {
                 case 0:
                     if (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_DEKU_NUT_BAG)) {
                         actual = RG_DEKU_NUT_BAG;
@@ -180,7 +148,7 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
             }
             break;
         case RG_PROGRESSIVE_BOMB_BAG:
-            switch (CUR_UPG_VALUE(UPG_BOMB_BAG)) {
+            switch (ctx->CurrentUpgrade(UPG_BOMB_BAG)) {
                 case 0:
                     actual = RG_BOMB_BAG;
                     break;
@@ -207,7 +175,7 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
             }
             break;
         case RG_PROGRESSIVE_BOW:
-            switch (CUR_UPG_VALUE(UPG_QUIVER)) {
+            switch (ctx->CurrentUpgrade(UPG_QUIVER)) {
                 case 0:
                     actual = RG_FAIRY_BOW;
                     break;
@@ -234,7 +202,7 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
             }
             break;
         case RG_PROGRESSIVE_SLINGSHOT:
-            switch (CUR_UPG_VALUE(UPG_BULLET_BAG)) {
+            switch (ctx->CurrentUpgrade(UPG_BULLET_BAG)) {
                 case 0:
                     actual = RG_FAIRY_SLINGSHOT;
                     break;
@@ -261,7 +229,7 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
             }
             break;
         case RG_PROGRESSIVE_OCARINA:
-            switch (INV_CONTENT(ITEM_OCARINA_FAIRY)) {
+            switch (ctx->CurrentInventory(ITEM_OCARINA_FAIRY)) {
                 case ITEM_NONE:
                     actual = RG_FAIRY_OCARINA;
                     break;
@@ -274,7 +242,7 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
             }
             break;
         case RG_PROGRESSIVE_HOOKSHOT:
-            switch (INV_CONTENT(ITEM_HOOKSHOT)) {
+            switch (ctx->CurrentInventory(ITEM_HOOKSHOT)) {
                 case ITEM_NONE:
                     actual = RG_HOOKSHOT;
                     break;
@@ -287,7 +255,7 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
             }
             break;
         case RG_PROGRESSIVE_STRENGTH:
-            switch (CUR_UPG_VALUE(UPG_STRENGTH)) {
+            switch (ctx->CurrentUpgrade(UPG_STRENGTH)) {
                 case 0:
                     actual = RG_GORONS_BRACELET;
                     break;
@@ -303,11 +271,11 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
             }
             break;
         case RG_PROGRESSIVE_WALLET:
-            if (!Flags_GetRandomizerInf(RAND_INF_HAS_WALLET)) {
+            if (!ctx->CheckRandoInf(RAND_INF_HAS_WALLET)) {
                 actual = RG_CHILD_WALLET;
                 break;
             }
-            switch (CUR_UPG_VALUE(UPG_WALLET)) {
+            switch (ctx->CurrentUpgrade(UPG_WALLET)) {
                 case 0:
                     actual = RG_ADULT_WALLET;
                     break;
@@ -330,11 +298,11 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
             }
             break;
         case RG_PROGRESSIVE_SCALE:
-            if (!Flags_GetRandomizerInf(RAND_INF_CAN_SWIM)) {
+            if (!ctx->CheckRandoInf(RAND_INF_CAN_SWIM)) {
                 actual = RG_BRONZE_SCALE;
                 break;
             }
-            switch (CUR_UPG_VALUE(UPG_SCALE)) {
+            switch (ctx->CurrentUpgrade(UPG_SCALE)) {
                 case 0:
                     actual = RG_SILVER_SCALE;
                     break;
@@ -347,7 +315,7 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
             }
             break;
         case RG_PROGRESSIVE_MAGIC_METER:
-            switch (gSaveContext.magicLevel) {
+            switch (ctx->GetSaveContext()->magicLevel) {
                 case 0:
                     actual = RG_MAGIC_SINGLE;
                     break;
@@ -370,11 +338,11 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
            actual = RG_BIGGORON_SWORD;
            break;
         case RG_PROGRESSIVE_BOMBCHUS:
-            if (INV_CONTENT(ITEM_BOMBCHU) == ITEM_NONE) {
+            if (ctx->CurrentInventory(ITEM_BOMBCHU) == ITEM_NONE) {
                 actual = RG_BOMBCHU_20;
             } else if (infiniteUpgrades != RO_INF_UPGRADES_OFF) {
                 actual = RG_BOMBCHU_INF;
-            } else if (AMMO(ITEM_BOMBCHU) < 5) {
+            } else if (ctx->GetAmmo(ITEM_BOMBCHU) < 5) {
                 actual = RG_BOMBCHU_10;
             } else {
                 actual = RG_BOMBCHU_5;
diff --git a/soh/soh/Enhancements/randomizer/item.h b/soh/soh/Enhancements/randomizer/item.h
index 8986d1146..f0df0f1bf 100644
--- a/soh/soh/Enhancements/randomizer/item.h
+++ b/soh/soh/Enhancements/randomizer/item.h
@@ -11,6 +11,7 @@
 
 enum ItemType {
     ITEMTYPE_ITEM,
+    ITEMTYPE_EQUIP,
     ITEMTYPE_MAP,
     ITEMTYPE_COMPASS,
     ITEMTYPE_BOSSKEY,
@@ -30,17 +31,11 @@ class Item {
   public:
     Item();
     Item(RandomizerGet randomizerGet_, Text name_, ItemType type_, int16_t getItemId_, bool advancement_,
-                     bool* logicVar_, RandomizerHintTextKey hintKey_, uint16_t itemId_, uint16_t objectId_, uint16_t gid_,
-                     uint16_t textId_, uint16_t field_, int16_t chestAnimation_, GetItemCategory category_,
-                     uint16_t modIndex_, bool progressive_ = false, uint16_t price_ = 0);
+        LogicVal logicVal_, RandomizerHintTextKey hintKey_, uint16_t itemId_, uint16_t objectId_, uint16_t gid_,
+        uint16_t textId_, uint16_t field_, int16_t chestAnimation_, GetItemCategory category_, uint16_t modIndex_,
+        bool progressive_ = false, uint16_t price_ = 0);
     Item(RandomizerGet randomizerGet_, Text name_, ItemType type_, int16_t getItemId_, bool advancement_,
-              uint8_t* logicVar_, RandomizerHintTextKey hintKey_, uint16_t itemId_, uint16_t objectId_, uint16_t gid_,
-              uint16_t textId_, uint16_t field_, int16_t chestAnimation_, GetItemCategory category_, uint16_t modIndex_,
-              bool progressive_ = false, uint16_t price_ = 0);
-    Item(RandomizerGet randomizerGet_, Text name_, ItemType type_, int16_t getItemId_, bool advancement_,
-              bool* logicVar_, RandomizerHintTextKey hintKey_, bool progressive_ = false, uint16_t price_ = 0);
-    Item(RandomizerGet randomizerGet_, Text name_, ItemType type_, int16_t getItemId_, bool advancement_,
-              uint8_t* logicVar_, RandomizerHintTextKey hintKey_, bool progressive_ = false, uint16_t price_ = 0);
+        LogicVal logicVal_, RandomizerHintTextKey hintKey_, bool progressive_ = false, uint16_t price_ = 0);
     ~Item();
 
     void ApplyEffect() const;
@@ -51,7 +46,7 @@ class Item {
     bool IsAdvancement() const;
     int GetItemID() const;
     ItemType GetItemType() const;
-    std::variant<bool*, uint8_t*> GetLogicVar() const;
+    LogicVal GetLogicVal() const;
     RandomizerGet GetRandomizerGet() const;
     uint16_t GetPrice() const;
     std::shared_ptr<GetItemEntry> GetGIEntry() const;
@@ -73,11 +68,11 @@ class Item {
     ItemType type;
     int16_t getItemId;
     bool advancement;
-    std::variant<bool*, uint8_t*> logicVar;
+    LogicVal logicVal;
     RandomizerHintTextKey hintKey;
     bool progressive;
     uint16_t price;
     bool playthrough = false;
-   std::shared_ptr<GetItemEntry> giEntry;
+    std::shared_ptr<GetItemEntry> giEntry;
 };
 }
diff --git a/soh/soh/Enhancements/randomizer/item_list.cpp b/soh/soh/Enhancements/randomizer/item_list.cpp
index 7c86fcfd3..6e4524939 100644
--- a/soh/soh/Enhancements/randomizer/item_list.cpp
+++ b/soh/soh/Enhancements/randomizer/item_list.cpp
@@ -12,331 +12,331 @@ std::unordered_map<std::string, RandomizerGet> Rando::StaticData::itemNameToEnum
 
 void Rando::StaticData::InitItemTable() {
     auto logic = Context::GetInstance()->GetLogic();
-    itemTable[RG_NONE] =                                Item(RG_NONE,                             Text{ "No Item", "Rien", "Kein Artikel" },                                                                        ITEMTYPE_EVENT,             GI_RUPEE_GREEN,     false, &logic->noVariable,          RHT_NONE,                   ITEM_NONE,                      0,                      0,                  0,                           0,    0,                ITEM_CATEGORY_JUNK,   MOD_NONE);
-    //        Randomizer Get                                 Randomizer Get                       Name Text                                                                                                         Type                        Get Item ID         Adv.   Logic Variable               Hint Text Key               Item ID                         Object ID               Draw ID             Text ID                      field Chest Animation Item Category         Mod Index
-    itemTable[RG_KOKIRI_SWORD] =                        Item(RG_KOKIRI_SWORD,                     Text{ "Kokiri Sword", "Épée Kokiri", "Kokiri-Schwert" },                                                          ITEMTYPE_ITEM,              GI_SWORD_KOKIRI,    true,  &logic->KokiriSword,         RHT_KOKIRI_SWORD,           ITEM_SWORD_KOKIRI,              OBJECT_GI_SWORD_1,      GID_SWORD_KOKIRI,   0xA4,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_MASTER_SWORD] =                        Item(RG_MASTER_SWORD,                     Text{ "Master Sword", "Épée de Legende", "Espada Master"},                                                        ITEMTYPE_ITEM,              0xE0,               true,  &logic->MasterSword,         RHT_MASTER_SWORD,           ITEM_SWORD_MASTER,              OBJECT_TOKI_OBJECTS,    GID_SWORD_BGS,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_NONE] =                                Item(RG_NONE,                             Text{ "No Item", "Rien", "Kein Artikel" },                                                                        ITEMTYPE_EVENT,             GI_RUPEE_GREEN,       false, LOGIC_NONE,                         RHT_NONE,                              ITEM_NONE,                      0,                      0,                  0,                           0,    0,                ITEM_CATEGORY_JUNK,   MOD_NONE);
+    //        Randomizer Get                                 Randomizer Get                       Name Text                                                                                                         Type                        Get Item ID           Adv.   Logic Value                         Hint Text Key                          Item ID                         Object ID               Draw ID             Text ID                      field Chest Animation Item Category         Mod Index
+    itemTable[RG_KOKIRI_SWORD] =                        Item(RG_KOKIRI_SWORD,                     Text{ "Kokiri Sword", "Épée Kokiri", "Kokiri-Schwert" },                                                          ITEMTYPE_EQUIP,             GI_SWORD_KOKIRI,      true,  LOGIC_KOKIRI_SWORD,                 RHT_KOKIRI_SWORD,                      ITEM_SWORD_KOKIRI,              OBJECT_GI_SWORD_1,      GID_SWORD_KOKIRI,   0xA4,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_MASTER_SWORD] =                        Item(RG_MASTER_SWORD,                     Text{ "Master Sword", "Épée de Legende", "Espada Master"},                                                        ITEMTYPE_EQUIP,             0xE0,                 true,  LOGIC_MASTER_SWORD,                 RHT_MASTER_SWORD,                      ITEM_SWORD_MASTER,              OBJECT_TOKI_OBJECTS,    GID_SWORD_BGS,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_MASTER_SWORD].SetCustomDrawFunc(Randomizer_DrawMasterSword);
-    itemTable[RG_GIANTS_KNIFE] =                        Item(RG_GIANTS_KNIFE,                     Text{ "Giant's Knife", "Lame des Géants", "Messer des Riesen" },                                                  ITEMTYPE_ITEM,              GI_SWORD_KNIFE,     true,  &logic->noVariable,          RHT_GIANTS_KNIFE,           ITEM_SWORD_BGS,                 OBJECT_GI_LONGSWORD,    GID_SWORD_BGS,      0x4B,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_BIGGORON_SWORD] =                      Item(RG_BIGGORON_SWORD,                   Text{ "Biggoron's Sword", "Épée de Biggoron", "Biggoron-Schwert" },                                               ITEMTYPE_ITEM,              GI_SWORD_BGS,       true,  &logic->BiggoronSword,       RHT_BIGGORON_SWORD,         ITEM_SWORD_BGS,                 OBJECT_GI_LONGSWORD,    GID_SWORD_BGS,      0x0C,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_DEKU_SHIELD] =                         Item(RG_DEKU_SHIELD,                      Text{ "Deku Shield", "Bouclier Mojo", "Deku-Schild" },                                                            ITEMTYPE_ITEM,              GI_SHIELD_DEKU,     false, &logic->noVariable,          RHT_DEKU_SHIELD,            ITEM_SHIELD_DEKU,               OBJECT_GI_SHIELD_1,     GID_SHIELD_DEKU,    0x4C,                        0xA0, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_HYLIAN_SHIELD] =                       Item(RG_HYLIAN_SHIELD,                    Text{ "Hylian Shield", "Bouclier Hylien", "Hylia-Schild" },                                                       ITEMTYPE_ITEM,              GI_SHIELD_HYLIAN,   false, &logic->noVariable,          RHT_HYLIAN_SHIELD,          ITEM_SHIELD_HYLIAN,             OBJECT_GI_SHIELD_2,     GID_SHIELD_HYLIAN,  0x4D,                        0xA0, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_MIRROR_SHIELD] =                       Item(RG_MIRROR_SHIELD,                    Text{ "Mirror Shield", "Bouclier Miroir", "Spiegel-Schild" },                                                     ITEMTYPE_ITEM,              GI_SHIELD_MIRROR,   true,  &logic->MirrorShield,        RHT_MIRROR_SHIELD,          ITEM_SHIELD_MIRROR,             OBJECT_GI_SHIELD_3,     GID_SHIELD_MIRROR,  0x4E,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_GORON_TUNIC] =                         Item(RG_GORON_TUNIC,                      Text{ "Goron Tunic", "Tunique Goron", "Goronen-Tunika" },                                                         ITEMTYPE_ITEM,              GI_TUNIC_GORON,     true,  &logic->GoronTunic,          RHT_GORON_TUNIC,            ITEM_TUNIC_GORON,               OBJECT_GI_CLOTHES,      GID_TUNIC_GORON,    0x50,                        0xA0, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_ZORA_TUNIC] =                          Item(RG_ZORA_TUNIC,                       Text{ "Zora Tunic", "Tunique Zora", "Zora-Tunika" },                                                              ITEMTYPE_ITEM,              GI_TUNIC_ZORA,      true,  &logic->ZoraTunic,           RHT_ZORA_TUNIC,             ITEM_TUNIC_ZORA,                OBJECT_GI_CLOTHES,      GID_TUNIC_ZORA,     0x51,                        0xA0, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_IRON_BOOTS] =                          Item(RG_IRON_BOOTS,                       Text{ "Iron Boots", "Bottes de plomb", "Eisenstiefel" },                                                          ITEMTYPE_ITEM,              GI_BOOTS_IRON,      true,  &logic->IronBoots,           RHT_IRON_BOOTS,             ITEM_BOOTS_IRON,                OBJECT_GI_BOOTS_2,      GID_BOOTS_IRON,     0x53,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_HOVER_BOOTS] =                         Item(RG_HOVER_BOOTS,                      Text{ "Hover Boots", "Bottes de airs", "Gleitstiefel" },                                                          ITEMTYPE_ITEM,              GI_BOOTS_HOVER,     true,  &logic->HoverBoots,          RHT_HOVER_BOOTS,            ITEM_BOOTS_HOVER,               OBJECT_GI_HOVERBOOTS,   GID_BOOTS_HOVER,    0x54,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_BOOMERANG] =                           Item(RG_BOOMERANG,                        Text{ "Boomerang", "Boomerang", "Bumerang" },                                                                     ITEMTYPE_ITEM,              GI_BOOMERANG,       true,  &logic->Boomerang,           RHT_BOOMERANG,              ITEM_BOOMERANG,                 OBJECT_GI_BOOMERANG,    GID_BOOMERANG,      0x35,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_LENS_OF_TRUTH] =                       Item(RG_LENS_OF_TRUTH,                    Text{ "Lens of Truth", "Monocle de Vérité", "Auge der Wahrheit" },                                                ITEMTYPE_ITEM,              GI_LENS,            true,  &logic->LensOfTruth,         RHT_LENS_OF_TRUTH,          ITEM_LENS,                      OBJECT_GI_GLASSES,      GID_LENS,           0x39,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_MEGATON_HAMMER] =                      Item(RG_MEGATON_HAMMER,                   Text{ "Megaton Hammer", "Masse des Titans", "Stahlhammer" },                                                      ITEMTYPE_ITEM,              GI_HAMMER,          true,  &logic->Hammer,              RHT_MEGATON_HAMMER,         ITEM_HAMMER,                    OBJECT_GI_HAMMER,       GID_HAMMER,         0x38,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_STONE_OF_AGONY] =                      Item(RG_STONE_OF_AGONY,                   Text{ "Stone of Agony", "Pierre de Souffrance", "Stein der Qualen" },                                             ITEMTYPE_ITEM,              GI_STONE_OF_AGONY,  true,  &logic->ShardOfAgony,        RHT_STONE_OF_AGONY,         ITEM_STONE_OF_AGONY,            OBJECT_GI_MAP,          GID_STONE_OF_AGONY, 0x68,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_DINS_FIRE] =                           Item(RG_DINS_FIRE,                        Text{ "Din's Fire", "Feu de Din", "Dins Feuerinferno" },                                                          ITEMTYPE_ITEM,              GI_DINS_FIRE,       true,  &logic->DinsFire,            RHT_DINS_FIRE,              ITEM_DINS_FIRE,                 OBJECT_GI_GODDESS,      GID_DINS_FIRE,      0xAD,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_FARORES_WIND] =                        Item(RG_FARORES_WIND,                     Text{ "Farore's Wind", "Vent de Farore", "Farores Donnersturm" },                                                 ITEMTYPE_ITEM,              GI_FARORES_WIND,    true,  &logic->FaroresWind,         RHT_FARORES_WIND,           ITEM_FARORES_WIND,              OBJECT_GI_GODDESS,      GID_FARORES_WIND,   0xAE,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_NAYRUS_LOVE] =                         Item(RG_NAYRUS_LOVE,                      Text{ "Nayru's Love", "Amour de Nayru", "Nayrus Umarmung" },                                                      ITEMTYPE_ITEM,              GI_NAYRUS_LOVE,     true,  &logic->NayrusLove,          RHT_NAYRUS_LOVE,            ITEM_NAYRUS_LOVE,               OBJECT_GI_GODDESS,      GID_NAYRUS_LOVE,    0xAF,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_FIRE_ARROWS] =                         Item(RG_FIRE_ARROWS,                      Text{ "Fire Arrow", "Flèche de Feu", "Feuerpfeile" },                                                             ITEMTYPE_ITEM,              GI_ARROW_FIRE,      true,  &logic->FireArrows,          RHT_FIRE_ARROWS,            ITEM_ARROW_FIRE,                OBJECT_GI_M_ARROW,      GID_ARROW_FIRE,     0x70,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_ICE_ARROWS] =                          Item(RG_ICE_ARROWS,                       Text{ "Ice Arrow", "Flèche de Glace", "Eispfeil" },                                                               ITEMTYPE_ITEM,              GI_ARROW_ICE,       true,  &logic->IceArrows,           RHT_ICE_ARROWS,             ITEM_ARROW_ICE,                 OBJECT_GI_M_ARROW,      GID_ARROW_ICE,      0x71,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_LIGHT_ARROWS] =                        Item(RG_LIGHT_ARROWS,                     Text{ "Light Arrow", "Flèche de Lumière", "Lichtpfeil" },                                                         ITEMTYPE_ITEM,              GI_ARROW_LIGHT,     true,  &logic->LightArrows,         RHT_LIGHT_ARROWS,           ITEM_ARROW_LIGHT,               OBJECT_GI_M_ARROW,      GID_ARROW_LIGHT,    0x72,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_GERUDO_MEMBERSHIP_CARD] =              Item(RG_GERUDO_MEMBERSHIP_CARD,           Text{ "Gerudo Membership Card", "Carte Gerudo", "Gerudo Karte" },                                                 ITEMTYPE_ITEM,              GI_GERUDO_CARD,     true,  &logic->GerudoToken,         RHT_GERUDO_MEMBERSHIP_CARD, ITEM_GERUDO_CARD,               OBJECT_GI_GERUDO,       GID_GERUDO_CARD,    0x7B,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_MAGIC_BEAN] =                          Item(RG_MAGIC_BEAN,                       Text{ "Magic Bean", "Haricots Magiques", "Wundererbse" },                                                         ITEMTYPE_ITEM,              GI_BEAN,            true,  &logic->MagicBean,           RHT_MAGIC_BEAN,             ITEM_BEAN,                      OBJECT_GI_BEAN,         GID_BEAN,           0x48,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_MAGIC_BEAN_PACK] =                     Item(RG_MAGIC_BEAN_PACK,                  Text{ "Magic Bean Pack", "Paquet de Haricots Magiques", "Wundererbsen-Packung" },                                 ITEMTYPE_ITEM,              RG_MAGIC_BEAN_PACK, true,  &logic->MagicBeanPack,       RHT_MAGIC_BEAN_PACK,        RG_MAGIC_BEAN_PACK,             OBJECT_GI_BEAN,         GID_BEAN,           TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_DOUBLE_DEFENSE] =                      Item(RG_DOUBLE_DEFENSE,                   Text{ "Double Defense", "Double Défence", "Doppelte Verteidigung" },                                              ITEMTYPE_ITEM,              RG_DOUBLE_DEFENSE,  true,  &logic->DoubleDefense,       RHT_DOUBLE_DEFENSE,         RG_DOUBLE_DEFENSE,              OBJECT_GI_HEARTS,       GID_HEART_CONTAINER,0xE9,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_GIANTS_KNIFE] =                        Item(RG_GIANTS_KNIFE,                     Text{ "Giant's Knife", "Lame des Géants", "Messer des Riesen" },                                                  ITEMTYPE_EQUIP,             GI_SWORD_KNIFE,       true,  LOGIC_NONE,                         RHT_GIANTS_KNIFE,                      ITEM_SWORD_BGS,                 OBJECT_GI_LONGSWORD,    GID_SWORD_BGS,      0x4B,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BIGGORON_SWORD] =                      Item(RG_BIGGORON_SWORD,                   Text{ "Biggoron's Sword", "Épée de Biggoron", "Biggoron-Schwert" },                                               ITEMTYPE_EQUIP,             GI_SWORD_BGS,         true,  LOGIC_BIGGORON_SWORD,               RHT_BIGGORON_SWORD,                    ITEM_SWORD_BGS,                 OBJECT_GI_LONGSWORD,    GID_SWORD_BGS,      0x0C,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_DEKU_SHIELD] =                         Item(RG_DEKU_SHIELD,                      Text{ "Deku Shield", "Bouclier Mojo", "Deku-Schild" },                                                            ITEMTYPE_EQUIP,             GI_SHIELD_DEKU,       false, LOGIC_DEKU_SHIELD,                  RHT_DEKU_SHIELD,                       ITEM_SHIELD_DEKU,               OBJECT_GI_SHIELD_1,     GID_SHIELD_DEKU,    0x4C,                        0xA0, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_HYLIAN_SHIELD] =                       Item(RG_HYLIAN_SHIELD,                    Text{ "Hylian Shield", "Bouclier Hylien", "Hylia-Schild" },                                                       ITEMTYPE_EQUIP,             GI_SHIELD_HYLIAN,     false, LOGIC_HYLIAN_SHIELD,                RHT_HYLIAN_SHIELD,                     ITEM_SHIELD_HYLIAN,             OBJECT_GI_SHIELD_2,     GID_SHIELD_HYLIAN,  0x4D,                        0xA0, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_MIRROR_SHIELD] =                       Item(RG_MIRROR_SHIELD,                    Text{ "Mirror Shield", "Bouclier Miroir", "Spiegel-Schild" },                                                     ITEMTYPE_EQUIP,             GI_SHIELD_MIRROR,     true,  LOGIC_MIRROR_SHIELD,                RHT_MIRROR_SHIELD,                     ITEM_SHIELD_MIRROR,             OBJECT_GI_SHIELD_3,     GID_SHIELD_MIRROR,  0x4E,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_GORON_TUNIC] =                         Item(RG_GORON_TUNIC,                      Text{ "Goron Tunic", "Tunique Goron", "Goronen-Tunika" },                                                         ITEMTYPE_EQUIP,             GI_TUNIC_GORON,       true,  LOGIC_GORON_TUNIC,                  RHT_GORON_TUNIC,                       ITEM_TUNIC_GORON,               OBJECT_GI_CLOTHES,      GID_TUNIC_GORON,    0x50,                        0xA0, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_ZORA_TUNIC] =                          Item(RG_ZORA_TUNIC,                       Text{ "Zora Tunic", "Tunique Zora", "Zora-Tunika" },                                                              ITEMTYPE_EQUIP,             GI_TUNIC_ZORA,        true,  LOGIC_ZORA_TUNIC,                   RHT_ZORA_TUNIC,                        ITEM_TUNIC_ZORA,                OBJECT_GI_CLOTHES,      GID_TUNIC_ZORA,     0x51,                        0xA0, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_IRON_BOOTS] =                          Item(RG_IRON_BOOTS,                       Text{ "Iron Boots", "Bottes de plomb", "Eisenstiefel" },                                                          ITEMTYPE_EQUIP,             GI_BOOTS_IRON,        true,  LOGIC_IRON_BOOTS,                   RHT_IRON_BOOTS,                        ITEM_BOOTS_IRON,                OBJECT_GI_BOOTS_2,      GID_BOOTS_IRON,     0x53,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_HOVER_BOOTS] =                         Item(RG_HOVER_BOOTS,                      Text{ "Hover Boots", "Bottes de airs", "Gleitstiefel" },                                                          ITEMTYPE_EQUIP,             GI_BOOTS_HOVER,       true,  LOGIC_HOVER_BOOTS,                  RHT_HOVER_BOOTS,                       ITEM_BOOTS_HOVER,               OBJECT_GI_HOVERBOOTS,   GID_BOOTS_HOVER,    0x54,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BOOMERANG] =                           Item(RG_BOOMERANG,                        Text{ "Boomerang", "Boomerang", "Bumerang" },                                                                     ITEMTYPE_ITEM,              GI_BOOMERANG,         true,  LOGIC_BOOMERANG,                    RHT_BOOMERANG,                         ITEM_BOOMERANG,                 OBJECT_GI_BOOMERANG,    GID_BOOMERANG,      0x35,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_LENS_OF_TRUTH] =                       Item(RG_LENS_OF_TRUTH,                    Text{ "Lens of Truth", "Monocle de Vérité", "Auge der Wahrheit" },                                                ITEMTYPE_ITEM,              GI_LENS,              true,  LOGIC_LENS_OF_TRUTH,                RHT_LENS_OF_TRUTH,                     ITEM_LENS,                      OBJECT_GI_GLASSES,      GID_LENS,           0x39,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_MEGATON_HAMMER] =                      Item(RG_MEGATON_HAMMER,                   Text{ "Megaton Hammer", "Masse des Titans", "Stahlhammer" },                                                      ITEMTYPE_ITEM,              GI_HAMMER,            true,  LOGIC_HAMMER,                       RHT_MEGATON_HAMMER,                    ITEM_HAMMER,                    OBJECT_GI_HAMMER,       GID_HAMMER,         0x38,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_STONE_OF_AGONY] =                      Item(RG_STONE_OF_AGONY,                   Text{ "Stone of Agony", "Pierre de Souffrance", "Stein der Qualen" },                                             ITEMTYPE_ITEM,              GI_STONE_OF_AGONY,    true,  LOGIC_STONE_OF_AGONY,               RHT_STONE_OF_AGONY,                    ITEM_STONE_OF_AGONY,            OBJECT_GI_MAP,          GID_STONE_OF_AGONY, 0x68,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_DINS_FIRE] =                           Item(RG_DINS_FIRE,                        Text{ "Din's Fire", "Feu de Din", "Dins Feuerinferno" },                                                          ITEMTYPE_ITEM,              GI_DINS_FIRE,         true,  LOGIC_DINS_FIRE,                    RHT_DINS_FIRE,                         ITEM_DINS_FIRE,                 OBJECT_GI_GODDESS,      GID_DINS_FIRE,      0xAD,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_FARORES_WIND] =                        Item(RG_FARORES_WIND,                     Text{ "Farore's Wind", "Vent de Farore", "Farores Donnersturm" },                                                 ITEMTYPE_ITEM,              GI_FARORES_WIND,      true,  LOGIC_FARORES_WIND,                 RHT_FARORES_WIND,                      ITEM_FARORES_WIND,              OBJECT_GI_GODDESS,      GID_FARORES_WIND,   0xAE,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_NAYRUS_LOVE] =                         Item(RG_NAYRUS_LOVE,                      Text{ "Nayru's Love", "Amour de Nayru", "Nayrus Umarmung" },                                                      ITEMTYPE_ITEM,              GI_NAYRUS_LOVE,       true,  LOGIC_NAYRUS_LOVE,                  RHT_NAYRUS_LOVE,                       ITEM_NAYRUS_LOVE,               OBJECT_GI_GODDESS,      GID_NAYRUS_LOVE,    0xAF,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_FIRE_ARROWS] =                         Item(RG_FIRE_ARROWS,                      Text{ "Fire Arrow", "Flèche de Feu", "Feuerpfeile" },                                                             ITEMTYPE_ITEM,              GI_ARROW_FIRE,        true,  LOGIC_FIRE_ARROWS,                  RHT_FIRE_ARROWS,                       ITEM_ARROW_FIRE,                OBJECT_GI_M_ARROW,      GID_ARROW_FIRE,     0x70,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_ICE_ARROWS] =                          Item(RG_ICE_ARROWS,                       Text{ "Ice Arrow", "Flèche de Glace", "Eispfeil" },                                                               ITEMTYPE_ITEM,              GI_ARROW_ICE,         true,  LOGIC_ICE_ARROWS,                   RHT_ICE_ARROWS,                        ITEM_ARROW_ICE,                 OBJECT_GI_M_ARROW,      GID_ARROW_ICE,      0x71,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_LIGHT_ARROWS] =                        Item(RG_LIGHT_ARROWS,                     Text{ "Light Arrow", "Flèche de Lumière", "Lichtpfeil" },                                                         ITEMTYPE_ITEM,              GI_ARROW_LIGHT,       true,  LOGIC_LIGHT_ARROWS,                 RHT_LIGHT_ARROWS,                      ITEM_ARROW_LIGHT,               OBJECT_GI_M_ARROW,      GID_ARROW_LIGHT,    0x72,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_GERUDO_MEMBERSHIP_CARD] =              Item(RG_GERUDO_MEMBERSHIP_CARD,           Text{ "Gerudo Membership Card", "Carte Gerudo", "Gerudo Karte" },                                                 ITEMTYPE_ITEM,              GI_GERUDO_CARD,       true,  LOGIC_GERUDO_CARD,                  RHT_GERUDO_MEMBERSHIP_CARD,            ITEM_GERUDO_CARD,               OBJECT_GI_GERUDO,       GID_GERUDO_CARD,    0x7B,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_MAGIC_BEAN] =                          Item(RG_MAGIC_BEAN,                       Text{ "Magic Bean", "Haricots Magiques", "Wundererbse" },                                                         ITEMTYPE_ITEM,              GI_BEAN,              true,  LOGIC_MAGIC_BEAN,                   RHT_MAGIC_BEAN,                        ITEM_BEAN,                      OBJECT_GI_BEAN,         GID_BEAN,           0x48,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_MAGIC_BEAN_PACK] =                     Item(RG_MAGIC_BEAN_PACK,                  Text{ "Magic Bean Pack", "Paquet de Haricots Magiques", "Wundererbsen-Packung" },                                 ITEMTYPE_ITEM,              RG_MAGIC_BEAN_PACK,   true,  LOGIC_MAGIC_BEAN,                   RHT_MAGIC_BEAN_PACK,                   RG_MAGIC_BEAN_PACK,             OBJECT_GI_BEAN,         GID_BEAN,           TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_DOUBLE_DEFENSE] =                      Item(RG_DOUBLE_DEFENSE,                   Text{ "Double Defense", "Double Défence", "Doppelte Verteidigung" },                                              ITEMTYPE_ITEM,              RG_DOUBLE_DEFENSE,    true,  LOGIC_DOUBLE_DEFENSE,               RHT_DOUBLE_DEFENSE,                    RG_DOUBLE_DEFENSE,              OBJECT_GI_HEARTS,       GID_HEART_CONTAINER,0xE9,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
     itemTable[RG_DOUBLE_DEFENSE].SetCustomDrawFunc(Randomizer_DrawDoubleDefense);
     // Trade Quest Items
-    itemTable[RG_WEIRD_EGG] =                           Item(RG_WEIRD_EGG,                        Text{ "Weird Egg", "Oeuf Curieux", "Seltsames Ei" },                                                              ITEMTYPE_ITEM,              GI_WEIRD_EGG,       true,  &logic->WeirdEgg,            RHT_WEIRD_EGG,              ITEM_WEIRD_EGG,                 OBJECT_GI_EGG,          GID_EGG,            0x9A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_ZELDAS_LETTER] =                       Item(RG_ZELDAS_LETTER,                    Text{ "Zelda's Letter", "Lettre de Zelda", "Zeldas Brief" },                                                      ITEMTYPE_ITEM,              GI_LETTER_ZELDA,    true,  &logic->ZeldasLetter,        RHT_ZELDAS_LETTER,          ITEM_LETTER_ZELDA,              OBJECT_GI_LETTER,       GID_LETTER_ZELDA,   0x69,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_POCKET_EGG] =                          Item(RG_POCKET_EGG,                       Text{ "Pocket Egg", "Oeuf de poche", "Taschenei" },                                                               ITEMTYPE_ITEM,              GI_POCKET_EGG,      true,  &logic->PocketEgg,           RHT_POCKET_EGG,             ITEM_POCKET_EGG,                OBJECT_GI_EGG,          GID_EGG,            0x01,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_COJIRO] =                              Item(RG_COJIRO,                           Text{ "Cojiro", "P'tit Poulet", "Cojiro" },                                                                       ITEMTYPE_ITEM,              GI_COJIRO,          true,  &logic->Cojiro,              RHT_COJIRO,                 ITEM_COJIRO,                    OBJECT_GI_NIWATORI,     GID_COJIRO,         0x02,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_ODD_MUSHROOM] =                        Item(RG_ODD_MUSHROOM,                     Text{ "Odd Mushroom", "Champigon Suspect", "Seltsamer Pilz" },                                                    ITEMTYPE_ITEM,              GI_ODD_MUSHROOM,    true,  &logic->OddMushroom,         RHT_ODD_MUSHROOM,           ITEM_ODD_MUSHROOM,              OBJECT_GI_MUSHROOM,     GID_ODD_MUSHROOM,   0x03,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_ODD_POTION] =                          Item(RG_ODD_POTION,                       Text{ "Odd Potion", "Mixture Suspecte", "Seltsamer Trank" },                                                      ITEMTYPE_ITEM,              GI_ODD_POTION,      true,  &logic->OddPoultice,         RHT_ODD_POTION,             ITEM_ODD_POTION,                OBJECT_GI_POWDER,       GID_ODD_POTION,     0x04,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_POACHERS_SAW] =                        Item(RG_POACHERS_SAW,                     Text{ "Poacher's Saw", "Scie du Chasseur", "Wilderer-Säge" },                                                     ITEMTYPE_ITEM,              GI_SAW,             true,  &logic->PoachersSaw,         RHT_POACHERS_SAW,           ITEM_SAW,                       OBJECT_GI_SAW,          GID_SAW,            0x05,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_BROKEN_SWORD] =                        Item(RG_BROKEN_SWORD,                     Text{ "Broken Goron's Sword", "Épée Brisée de Goron", "Schwert des gebrochenen Goronen" },                        ITEMTYPE_ITEM,              GI_SWORD_BROKEN,    true,  &logic->BrokenSword,         RHT_BROKEN_SWORD,           ITEM_SWORD_BROKEN,              OBJECT_GI_BROKENSWORD,  GID_SWORD_BROKEN,   0x08,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_PRESCRIPTION] =                        Item(RG_PRESCRIPTION,                     Text{ "Prescription", "Ordonnance", "Verschreibung" },                                                            ITEMTYPE_ITEM,              GI_PRESCRIPTION,    true,  &logic->Prescription,        RHT_PRESCRIPTION,           ITEM_PRESCRIPTION,              OBJECT_GI_PRESCRIPTION, GID_PRESCRIPTION,   0x09,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_EYEBALL_FROG] =                        Item(RG_EYEBALL_FROG,                     Text{ "Eyeball Frog", "Crapaud-qui-louche", "Augapfel-Frosch" },                                                  ITEMTYPE_ITEM,              GI_FROG,            true,  &logic->EyeballFrog,         RHT_EYEBALL_FROG,           ITEM_FROG,                      OBJECT_GI_FROG,         GID_FROG,           0x0D,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_EYEDROPS] =                            Item(RG_EYEDROPS,                         Text{ "World's Finest Eyedrops", "Super Gouttes", "Supertropfen" },                                               ITEMTYPE_ITEM,              GI_EYEDROPS,        true,  &logic->Eyedrops,            RHT_EYEDROPS,               ITEM_EYEDROPS,                  OBJECT_GI_EYE_LOTION,   GID_EYEDROPS,       0x0E,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_CLAIM_CHECK] =                         Item(RG_CLAIM_CHECK,                      Text{ "Claim Check", "Certificat", "Quittung" },                                                                  ITEMTYPE_ITEM,              GI_CLAIM_CHECK,     true,  &logic->ClaimCheck,          RHT_CLAIM_CHECK,            ITEM_CLAIM_CHECK,               OBJECT_GI_TICKETSTONE,  GID_CLAIM_CHECK,    0x0A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_WEIRD_EGG] =                           Item(RG_WEIRD_EGG,                        Text{ "Weird Egg", "Oeuf Curieux", "Seltsames Ei" },                                                              ITEMTYPE_ITEM,              GI_WEIRD_EGG,         true,  LOGIC_WEIRD_EGG,                    RHT_WEIRD_EGG,                         ITEM_WEIRD_EGG,                 OBJECT_GI_EGG,          GID_EGG,            0x9A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_ZELDAS_LETTER] =                       Item(RG_ZELDAS_LETTER,                    Text{ "Zelda's Letter", "Lettre de Zelda", "Zeldas Brief" },                                                      ITEMTYPE_ITEM,              GI_LETTER_ZELDA,      true,  LOGIC_ZELDAS_LETTER,                RHT_ZELDAS_LETTER,                     ITEM_LETTER_ZELDA,              OBJECT_GI_LETTER,       GID_LETTER_ZELDA,   0x69,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_POCKET_EGG] =                          Item(RG_POCKET_EGG,                       Text{ "Pocket Egg", "Oeuf de poche", "Taschenei" },                                                               ITEMTYPE_ITEM,              GI_POCKET_EGG,        true,  LOGIC_POCKET_EGG,                   RHT_POCKET_EGG,                        ITEM_POCKET_EGG,                OBJECT_GI_EGG,          GID_EGG,            0x01,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_COJIRO] =                              Item(RG_COJIRO,                           Text{ "Cojiro", "P'tit Poulet", "Cojiro" },                                                                       ITEMTYPE_ITEM,              GI_COJIRO,            true,  LOGIC_COJIRO,                       RHT_COJIRO,                            ITEM_COJIRO,                    OBJECT_GI_NIWATORI,     GID_COJIRO,         0x02,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_ODD_MUSHROOM] =                        Item(RG_ODD_MUSHROOM,                     Text{ "Odd Mushroom", "Champigon Suspect", "Seltsamer Pilz" },                                                    ITEMTYPE_ITEM,              GI_ODD_MUSHROOM,      true,  LOGIC_ODD_MUSHROOM,                 RHT_ODD_MUSHROOM,                      ITEM_ODD_MUSHROOM,              OBJECT_GI_MUSHROOM,     GID_ODD_MUSHROOM,   0x03,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_ODD_POTION] =                          Item(RG_ODD_POTION,                       Text{ "Odd Potion", "Mixture Suspecte", "Seltsamer Trank" },                                                      ITEMTYPE_ITEM,              GI_ODD_POTION,        true,  LOGIC_ODD_POULTICE,                 RHT_ODD_POTION,                        ITEM_ODD_POTION,                OBJECT_GI_POWDER,       GID_ODD_POTION,     0x04,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_POACHERS_SAW] =                        Item(RG_POACHERS_SAW,                     Text{ "Poacher's Saw", "Scie du Chasseur", "Wilderer-Säge" },                                                     ITEMTYPE_ITEM,              GI_SAW,               true,  LOGIC_POACHERS_SAW,                 RHT_POACHERS_SAW,                      ITEM_SAW,                       OBJECT_GI_SAW,          GID_SAW,            0x05,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BROKEN_SWORD] =                        Item(RG_BROKEN_SWORD,                     Text{ "Broken Goron's Sword", "Épée Brisée de Goron", "Schwert des gebrochenen Goronen" },                        ITEMTYPE_ITEM,              GI_SWORD_BROKEN,      true,  LOGIC_BROKEN_SWORD,                 RHT_BROKEN_SWORD,                      ITEM_SWORD_BROKEN,              OBJECT_GI_BROKENSWORD,  GID_SWORD_BROKEN,   0x08,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_PRESCRIPTION] =                        Item(RG_PRESCRIPTION,                     Text{ "Prescription", "Ordonnance", "Verschreibung" },                                                            ITEMTYPE_ITEM,              GI_PRESCRIPTION,      true,  LOGIC_PRESCRIPTION,                 RHT_PRESCRIPTION,                      ITEM_PRESCRIPTION,              OBJECT_GI_PRESCRIPTION, GID_PRESCRIPTION,   0x09,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_EYEBALL_FROG] =                        Item(RG_EYEBALL_FROG,                     Text{ "Eyeball Frog", "Crapaud-qui-louche", "Augapfel-Frosch" },                                                  ITEMTYPE_ITEM,              GI_FROG,              true,  LOGIC_EYEBALL_FROG,                 RHT_EYEBALL_FROG,                      ITEM_FROG,                      OBJECT_GI_FROG,         GID_FROG,           0x0D,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_EYEDROPS] =                            Item(RG_EYEDROPS,                         Text{ "World's Finest Eyedrops", "Super Gouttes", "Supertropfen" },                                               ITEMTYPE_ITEM,              GI_EYEDROPS,          true,  LOGIC_EYEDROPS,                     RHT_EYEDROPS,                          ITEM_EYEDROPS,                  OBJECT_GI_EYE_LOTION,   GID_EYEDROPS,       0x0E,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_CLAIM_CHECK] =                         Item(RG_CLAIM_CHECK,                      Text{ "Claim Check", "Certificat", "Quittung" },                                                                  ITEMTYPE_ITEM,              GI_CLAIM_CHECK,       true,  LOGIC_CLAIM_CHECK,                  RHT_CLAIM_CHECK,                       ITEM_CLAIM_CHECK,               OBJECT_GI_TICKETSTONE,  GID_CLAIM_CHECK,    0x0A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
     // Skulltula Token
-    itemTable[RG_GOLD_SKULLTULA_TOKEN] =                Item(RG_GOLD_SKULLTULA_TOKEN,             Text{ "Gold Skulltula Token", "Symbole de Skulltula d'Or", "Goldenes Skulltula-Symbol" },                         ITEMTYPE_TOKEN,             GI_SKULL_TOKEN,     true,  &logic->GoldSkulltulaTokens, RHT_GOLD_SKULLTULA_TOKEN,   ITEM_SKULL_TOKEN,               OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    0xB4,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SKULLTULA_TOKEN, MOD_NONE);
+    itemTable[RG_GOLD_SKULLTULA_TOKEN] =                Item(RG_GOLD_SKULLTULA_TOKEN,             Text{ "Gold Skulltula Token", "Symbole de Skulltula d'Or", "Goldenes Skulltula-Symbol" },                         ITEMTYPE_TOKEN,             GI_SKULL_TOKEN,       true,  LOGIC_GOLD_SKULLTULA_TOKENS,        RHT_GOLD_SKULLTULA_TOKEN,              ITEM_SKULL_TOKEN,               OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    0xB4,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SKULLTULA_TOKEN, MOD_NONE);
     // Progressive Items
-    itemTable[RG_PROGRESSIVE_HOOKSHOT] =                Item(RG_PROGRESSIVE_HOOKSHOT,             Text{ "Progressive Hookshot", "Grappin (prog.)", "Progressiver Fanghaken" },                                      ITEMTYPE_ITEM,              0x80,               true,  &logic->ProgressiveHookshot, RHT_PROGRESSIVE_HOOKSHOT, true);
-    itemTable[RG_PROGRESSIVE_STRENGTH] =                Item(RG_PROGRESSIVE_STRENGTH,             Text{ "Strength Upgrade", "Amélioration de Force (prog.)", "Progressives Kraft-Upgrade" },                        ITEMTYPE_ITEM,              0x81,               true,  &logic->ProgressiveStrength, RHT_PROGRESSIVE_STRENGTH, true);
-    itemTable[RG_PROGRESSIVE_BOMB_BAG] =                Item(RG_PROGRESSIVE_BOMB_BAG,             Text{ "Progressive Bomb Bag", "Sac de Bombes (prog.)", "Progressive Bombentasche" },                              ITEMTYPE_ITEM,              0x82,               true,  &logic->ProgressiveBombBag,  RHT_PROGRESSIVE_BOMB_BAG, true);
-    itemTable[RG_PROGRESSIVE_BOW] =                     Item(RG_PROGRESSIVE_BOW,                  Text{ "Progressive Bow", "Arc (prog.)", "Progressiver Bogen" },                                                   ITEMTYPE_ITEM,              0x83,               true,  &logic->ProgressiveBow,      RHT_PROGRESSIVE_BOW, true);
-    itemTable[RG_PROGRESSIVE_SLINGSHOT] =               Item(RG_PROGRESSIVE_SLINGSHOT,            Text{ "Progressive Slingshot", "Lance-Pierre (prog.)", "Progressive Steinschleuder" },                            ITEMTYPE_ITEM,              0x84,               true,  &logic->ProgressiveBulletBag,RHT_PROGRESSIVE_SLINGSHOT, true);
-    itemTable[RG_PROGRESSIVE_WALLET] =                  Item(RG_PROGRESSIVE_WALLET,               Text{ "Progressive Wallet", "Bourse (prog.)", "Progressive Brieftasche" },                                        ITEMTYPE_ITEM,              0x85,               true,  &logic->ProgressiveWallet,   RHT_PROGRESSIVE_WALLET, true);
-    itemTable[RG_PROGRESSIVE_SCALE] =                   Item(RG_PROGRESSIVE_SCALE,                Text{ "Progressive Scale", "Écaille (prog.)", "Progressive Skala" },                                              ITEMTYPE_ITEM,              0x86,               true,  &logic->ProgressiveScale,    RHT_PROGRESSIVE_SCALE, true);
-    itemTable[RG_PROGRESSIVE_NUT_UPGRADE] =             Item(RG_PROGRESSIVE_NUT_UPGRADE,          Text{ "Progressive Nut Capacity", "Capacité de Noix (prog.)", "Progressive Nusskapazität" },                      ITEMTYPE_ITEM,              0x87,               true,  &logic->ProgressiveNutBag,   RHT_PROGRESSIVE_NUT_UPGRADE, true);
-    itemTable[RG_PROGRESSIVE_STICK_UPGRADE] =           Item(RG_PROGRESSIVE_STICK_UPGRADE,        Text{ "Progressive Stick Capacity", "Capacité de Bâtons (prog.)", "Progressive Stick-Kapazität" },                ITEMTYPE_ITEM,              0x88,               true,  &logic->ProgressiveStickBag, RHT_PROGRESSIVE_STICK_UPGRADE, true);
-    itemTable[RG_PROGRESSIVE_BOMBCHUS] =                Item(RG_PROGRESSIVE_BOMBCHUS,             Text{ "Progressive Bombchu", "Missiles (prog.)", "Progressive Kriechgrube" },                                     ITEMTYPE_ITEM,              0x89,               true,  &logic->Bombchus,            RHT_PROGRESSIVE_BOMBCHUS,   RG_PROGRESSIVE_BOMBCHUS,        OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER, true);
-    itemTable[RG_PROGRESSIVE_MAGIC_METER] =             Item(RG_PROGRESSIVE_MAGIC_METER,          Text{ "Progressive Magic Meter", "Jauge de Magie (prog.)", "Progressives magisches Messgerät" },                  ITEMTYPE_ITEM,              0x8A,               true,  &logic->ProgressiveMagic,    RHT_PROGRESSIVE_MAGIC_METER, true);
-    itemTable[RG_PROGRESSIVE_OCARINA] =                 Item(RG_PROGRESSIVE_OCARINA,              Text{ "Progressive Ocarina", "Ocarina (prog.)", "Progressive Okarina" },                                          ITEMTYPE_ITEM,              0x8B,               true,  &logic->ProgressiveOcarina,  RHT_PROGRESSIVE_OCARINA, true);
-    itemTable[RG_PROGRESSIVE_GORONSWORD] =              Item(RG_PROGRESSIVE_GORONSWORD,           Text{ "Progressive Goron Sword", "Épée Goron (prog.)", "Progressives Goronenschwert" },                           ITEMTYPE_ITEM,              0xD4,               true,  &logic->ProgressiveGiantKnife,RHT_PROGRESSIVE_GORONSWORD, true);
+    itemTable[RG_PROGRESSIVE_HOOKSHOT] =                Item(RG_PROGRESSIVE_HOOKSHOT,             Text{ "Progressive Hookshot", "Grappin (prog.)", "Progressiver Fanghaken" },                                      ITEMTYPE_ITEM,              0x80,                 true,  LOGIC_PROGRESSIVE_HOOKSHOT,         RHT_PROGRESSIVE_HOOKSHOT, true);
+    itemTable[RG_PROGRESSIVE_STRENGTH] =                Item(RG_PROGRESSIVE_STRENGTH,             Text{ "Strength Upgrade", "Amélioration de Force (prog.)", "Progressives Kraft-Upgrade" },                        ITEMTYPE_ITEM,              0x81,                 true,  LOGIC_PROGRESSIVE_STRENGTH,         RHT_PROGRESSIVE_STRENGTH, true);
+    itemTable[RG_PROGRESSIVE_BOMB_BAG] =                Item(RG_PROGRESSIVE_BOMB_BAG,             Text{ "Progressive Bomb Bag", "Sac de Bombes (prog.)", "Progressive Bombentasche" },                              ITEMTYPE_ITEM,              0x82,                 true,  LOGIC_PROGRESSIVE_BOMB_BAG,         RHT_PROGRESSIVE_BOMB_BAG, true);
+    itemTable[RG_PROGRESSIVE_BOW] =                     Item(RG_PROGRESSIVE_BOW,                  Text{ "Progressive Bow", "Arc (prog.)", "Progressiver Bogen" },                                                   ITEMTYPE_ITEM,              0x83,                 true,  LOGIC_PROGRESSIVE_BOW,              RHT_PROGRESSIVE_BOW, true);
+    itemTable[RG_PROGRESSIVE_SLINGSHOT] =               Item(RG_PROGRESSIVE_SLINGSHOT,            Text{ "Progressive Slingshot", "Lance-Pierre (prog.)", "Progressive Steinschleuder" },                            ITEMTYPE_ITEM,              0x84,                 true,  LOGIC_PROGRESSIVE_BULLET_BAG,       RHT_PROGRESSIVE_SLINGSHOT, true);
+    itemTable[RG_PROGRESSIVE_WALLET] =                  Item(RG_PROGRESSIVE_WALLET,               Text{ "Progressive Wallet", "Bourse (prog.)", "Progressive Brieftasche" },                                        ITEMTYPE_ITEM,              0x85,                 true,  LOGIC_PROGRESSIVE_WALLET,           RHT_PROGRESSIVE_WALLET, true);
+    itemTable[RG_PROGRESSIVE_SCALE] =                   Item(RG_PROGRESSIVE_SCALE,                Text{ "Progressive Scale", "Écaille (prog.)", "Progressive Skala" },                                              ITEMTYPE_ITEM,              0x86,                 true,  LOGIC_PROGRESSIVE_SCALE,            RHT_PROGRESSIVE_SCALE, true);
+    itemTable[RG_PROGRESSIVE_NUT_UPGRADE] =             Item(RG_PROGRESSIVE_NUT_UPGRADE,          Text{ "Progressive Nut Capacity", "Capacité de Noix (prog.)", "Progressive Nusskapazität" },                      ITEMTYPE_ITEM,              0x87,                 true,  LOGIC_PROGRESSIVE_NUT_BAG,          RHT_PROGRESSIVE_NUT_UPGRADE, true);
+    itemTable[RG_PROGRESSIVE_STICK_UPGRADE] =           Item(RG_PROGRESSIVE_STICK_UPGRADE,        Text{ "Progressive Stick Capacity", "Capacité de Bâtons (prog.)", "Progressive Stick-Kapazität" },                ITEMTYPE_ITEM,              0x88,                 true,  LOGIC_PROGRESSIVE_STICK_BAG,        RHT_PROGRESSIVE_STICK_UPGRADE, true);
+    itemTable[RG_PROGRESSIVE_BOMBCHUS] =                Item(RG_PROGRESSIVE_BOMBCHUS,             Text{ "Progressive Bombchu", "Missiles (prog.)", "Progressive Kriechgrube" },                                     ITEMTYPE_ITEM,              0x89,                 true,  LOGIC_BOMBCHUS,                     RHT_PROGRESSIVE_BOMBCHUS,              RG_PROGRESSIVE_BOMBCHUS,              OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER, true);
+    itemTable[RG_PROGRESSIVE_MAGIC_METER] =             Item(RG_PROGRESSIVE_MAGIC_METER,          Text{ "Progressive Magic Meter", "Jauge de Magie (prog.)", "Progressives magisches Messgerät" },                  ITEMTYPE_ITEM,              0x8A,                 true,  LOGIC_PROGRESSIVE_MAGIC,            RHT_PROGRESSIVE_MAGIC_METER, true);
+    itemTable[RG_PROGRESSIVE_OCARINA] =                 Item(RG_PROGRESSIVE_OCARINA,              Text{ "Progressive Ocarina", "Ocarina (prog.)", "Progressive Okarina" },                                          ITEMTYPE_ITEM,              0x8B,                 true,  LOGIC_PROGRESSIVE_OCARINA,          RHT_PROGRESSIVE_OCARINA, true);
+    itemTable[RG_PROGRESSIVE_GORONSWORD] =              Item(RG_PROGRESSIVE_GORONSWORD,           Text{ "Progressive Goron Sword", "Épée Goron (prog.)", "Progressives Goronenschwert" },                           ITEMTYPE_ITEM,              0xD4,                 true,  LOGIC_PROGRESSIVE_GIANT_KNIFE,      RHT_PROGRESSIVE_GORONSWORD, true);
     // Bottles
-    itemTable[RG_EMPTY_BOTTLE] =                        Item(RG_EMPTY_BOTTLE,                     Text{ "Empty Bottle", "Bouteille Vide", "Leere Flasche" },                                                        ITEMTYPE_ITEM,              GI_BOTTLE,          true,  &logic->Bottles,             RHT_BOTTLE_WITH_MILK,       ITEM_BOTTLE,                    OBJECT_GI_BOTTLE,       GID_BOTTLE,         0x42,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_BOTTLE_WITH_MILK] =                    Item(RG_BOTTLE_WITH_MILK,                 Text{ "Bottle with Milk", "Bouteille avec du Lait", "Flasche mit Milch" },                                        ITEMTYPE_ITEM,              GI_MILK_BOTTLE,     true,  &logic->Bottles,             RHT_BOTTLE_WITH_MILK,       ITEM_MILK_BOTTLE,               OBJECT_GI_MILK,         GID_MILK,           0x98,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_BOTTLE_WITH_RED_POTION] =              Item(RG_BOTTLE_WITH_RED_POTION,           Text{ "Bottle with Red Potion", "Bouteille avec une Potion Rouge", "Flasche mit rotem Elixier" },                 ITEMTYPE_ITEM,              0x8C,               true,  &logic->Bottles,             RHT_BOTTLE_WITH_RED_POTION, RG_BOTTLE_WITH_RED_POTION,      OBJECT_GI_LIQUID,       GID_POTION_RED,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_BOTTLE_WITH_GREEN_POTION] =            Item(RG_BOTTLE_WITH_GREEN_POTION,         Text{ "Bottle with Green Potion", "Bouteille avec une Potion Verte", "Flasche mit grünem Elixier" },              ITEMTYPE_ITEM,              0x8D,               true,  &logic->Bottles,             RHT_BOTTLE_WITH_GREEN_POTION,RG_BOTTLE_WITH_GREEN_POTION,   OBJECT_GI_LIQUID,       GID_POTION_GREEN,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_BOTTLE_WITH_BLUE_POTION] =             Item(RG_BOTTLE_WITH_BLUE_POTION,          Text{ "Bottle with Blue Potion", "Bouteille avec une Potion Bleue", "Flasche mit blauem Elixier" },               ITEMTYPE_ITEM,              0x8E,               true,  &logic->Bottles,             RHT_BOTTLE_WITH_BLUE_POTION,RG_BOTTLE_WITH_BLUE_POTION,     OBJECT_GI_LIQUID,       GID_POTION_BLUE,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_BOTTLE_WITH_FAIRY] =                   Item(RG_BOTTLE_WITH_FAIRY,                Text{ "Bottle with Fairy", "Bouteille avec une Fée", "Flasche mit Fee" },                                         ITEMTYPE_ITEM,              0x8F,               true,  &logic->Bottles,             RHT_BOTTLE_WITH_FAIRY,      RG_BOTTLE_WITH_FAIRY,           OBJECT_GI_BOTTLE,       GID_BOTTLE,         TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_BOTTLE_WITH_FISH] =                    Item(RG_BOTTLE_WITH_FISH,                 Text{ "Bottle with Fish", "Bouteille avec un Poisson", "Flasche mit Fisch" },                                     ITEMTYPE_ITEM,              0x90,               true,  &logic->Bottles,             RHT_BOTTLE_WITH_FISH,       RG_BOTTLE_WITH_FISH,            OBJECT_GI_FISH,         GID_FISH,           TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_BOTTLE_WITH_BLUE_FIRE] =               Item(RG_BOTTLE_WITH_BLUE_FIRE,            Text{ "Bottle with Blue Fire", "Bouteille avec une Flamme Bleue", "Flasche mit blauem Feuer" },                   ITEMTYPE_ITEM,              0x91,               true,  &logic->Bottles,             RHT_BOTTLE_WITH_BLUE_FIRE,  RG_BOTTLE_WITH_BLUE_FIRE,       OBJECT_GI_FIRE,         GID_BLUE_FIRE,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_BOTTLE_WITH_BUGS] =                    Item(RG_BOTTLE_WITH_BUGS,                 Text{ "Bottle with Bugs", "Bouteille avec des Insectes", "Flasche mit Wanzen" },                                  ITEMTYPE_ITEM,              0x92,               true,  &logic->Bottles,             RHT_BOTTLE_WITH_BUGS,       RG_BOTTLE_WITH_BUGS,            OBJECT_GI_INSECT,       GID_BUG,            TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_BOTTLE_WITH_POE] =                     Item(RG_BOTTLE_WITH_POE,                  Text{ "Bottle with Poe", "Bouteille avec un Esprit", "Flasche mit einem Geist" },                                 ITEMTYPE_ITEM,              0x94,               true,  &logic->Bottles,             RHT_BOTTLE_WITH_POE,        RG_BOTTLE_WITH_POE,             OBJECT_GI_GHOST,        GID_POE,            TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_RUTOS_LETTER] =                        Item(RG_RUTOS_LETTER,                     Text{ "Bottle with Ruto's Letter", "Bouteille avec la Lettre de Ruto", "Flasche mit Rutos Brief" },               ITEMTYPE_ITEM,              GI_LETTER_RUTO,     true,  &logic->RutosLetter,         RHT_RUTOS_LETTER,           ITEM_LETTER_RUTO,               OBJECT_GI_BOTTLE_LETTER,GID_LETTER_RUTO,    0x99,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_BOTTLE_WITH_BIG_POE] =                 Item(RG_BOTTLE_WITH_BIG_POE,              Text{ "Bottle with Big Poe", "Bouteille avec une Âme", "Flasche mit Seele" },                                     ITEMTYPE_ITEM,              0x93,               true,  &logic->BottleWithBigPoe,    RHT_BOTTLE_WITH_BIG_POE,    RG_BOTTLE_WITH_BIG_POE,         OBJECT_GI_GHOST,        GID_BIG_POE,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_EMPTY_BOTTLE] =                        Item(RG_EMPTY_BOTTLE,                     Text{ "Empty Bottle", "Bouteille Vide", "Leere Flasche" },                                                        ITEMTYPE_ITEM,              GI_BOTTLE,            true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_MILK,                  ITEM_BOTTLE,                          OBJECT_GI_BOTTLE,       GID_BOTTLE,         0x42,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BOTTLE_WITH_MILK] =                    Item(RG_BOTTLE_WITH_MILK,                 Text{ "Bottle with Milk", "Bouteille avec du Lait", "Flasche mit Milch" },                                        ITEMTYPE_ITEM,              GI_MILK_BOTTLE,       true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_MILK,                  ITEM_MILK_BOTTLE,                     OBJECT_GI_MILK,         GID_MILK,           0x98,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BOTTLE_WITH_RED_POTION] =              Item(RG_BOTTLE_WITH_RED_POTION,           Text{ "Bottle with Red Potion", "Bouteille avec une Potion Rouge", "Flasche mit rotem Elixier" },                 ITEMTYPE_ITEM,              0x8C,                 true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_RED_POTION,            RG_BOTTLE_WITH_RED_POTION,            OBJECT_GI_LIQUID,       GID_POTION_RED,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BOTTLE_WITH_GREEN_POTION] =            Item(RG_BOTTLE_WITH_GREEN_POTION,         Text{ "Bottle with Green Potion", "Bouteille avec une Potion Verte", "Flasche mit grünem Elixier" },              ITEMTYPE_ITEM,              0x8D,                 true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_GREEN_POTION,          RG_BOTTLE_WITH_GREEN_POTION,          OBJECT_GI_LIQUID,       GID_POTION_GREEN,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BOTTLE_WITH_BLUE_POTION] =             Item(RG_BOTTLE_WITH_BLUE_POTION,          Text{ "Bottle with Blue Potion", "Bouteille avec une Potion Bleue", "Flasche mit blauem Elixier" },               ITEMTYPE_ITEM,              0x8E,                 true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_BLUE_POTION,           RG_BOTTLE_WITH_BLUE_POTION,           OBJECT_GI_LIQUID,       GID_POTION_BLUE,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BOTTLE_WITH_FAIRY] =                   Item(RG_BOTTLE_WITH_FAIRY,                Text{ "Bottle with Fairy", "Bouteille avec une Fée", "Flasche mit Fee" },                                         ITEMTYPE_ITEM,              0x8F,                 true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_FAIRY,                 RG_BOTTLE_WITH_FAIRY,                 OBJECT_GI_BOTTLE,       GID_BOTTLE,         TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BOTTLE_WITH_FISH] =                    Item(RG_BOTTLE_WITH_FISH,                 Text{ "Bottle with Fish", "Bouteille avec un Poisson", "Flasche mit Fisch" },                                     ITEMTYPE_ITEM,              0x90,                 true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_FISH,                  RG_BOTTLE_WITH_FISH,                  OBJECT_GI_FISH,         GID_FISH,           TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BOTTLE_WITH_BLUE_FIRE] =               Item(RG_BOTTLE_WITH_BLUE_FIRE,            Text{ "Bottle with Blue Fire", "Bouteille avec une Flamme Bleue", "Flasche mit blauem Feuer" },                   ITEMTYPE_ITEM,              0x91,                 true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_BLUE_FIRE,             RG_BOTTLE_WITH_BLUE_FIRE,             OBJECT_GI_FIRE,         GID_BLUE_FIRE,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BOTTLE_WITH_BUGS] =                    Item(RG_BOTTLE_WITH_BUGS,                 Text{ "Bottle with Bugs", "Bouteille avec des Insectes", "Flasche mit Wanzen" },                                  ITEMTYPE_ITEM,              0x92,                 true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_BUGS,                  RG_BOTTLE_WITH_BUGS,                  OBJECT_GI_INSECT,       GID_BUG,            TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BOTTLE_WITH_POE] =                     Item(RG_BOTTLE_WITH_POE,                  Text{ "Bottle with Poe", "Bouteille avec un Esprit", "Flasche mit einem Geist" },                                 ITEMTYPE_ITEM,              0x94,                 true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_POE,                   RG_BOTTLE_WITH_POE,                   OBJECT_GI_GHOST,        GID_POE,            TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_RUTOS_LETTER] =                        Item(RG_RUTOS_LETTER,                     Text{ "Bottle with Ruto's Letter", "Bouteille avec la Lettre de Ruto", "Flasche mit Rutos Brief" },               ITEMTYPE_ITEM,              GI_LETTER_RUTO,       true,  LOGIC_RUTOS_LETTER,                 RHT_RUTOS_LETTER,                      ITEM_LETTER_RUTO,                     OBJECT_GI_BOTTLE_LETTER,GID_LETTER_RUTO,    0x99,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BOTTLE_WITH_BIG_POE] =                 Item(RG_BOTTLE_WITH_BIG_POE,              Text{ "Bottle with Big Poe", "Bouteille avec une Âme", "Flasche mit Seele" },                                     ITEMTYPE_ITEM,              0x93,                 true,  LOGIC_BOTTLE_WITH_BIG_POE,          RHT_BOTTLE_WITH_BIG_POE,               RG_BOTTLE_WITH_BIG_POE,               OBJECT_GI_GHOST,        GID_BIG_POE,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     // Songs
-    itemTable[RG_ZELDAS_LULLABY] =                      Item(RG_ZELDAS_LULLABY,                   Text{ "Zelda's Lullaby", "Berceuse de Zelda", "Zeldas Wiegenlied" },                                              ITEMTYPE_SONG,              0xC1,               true,  &logic->ZeldasLullaby,       RHT_ZELDAS_LULLABY,         ITEM_SONG_LULLABY,              OBJECT_GI_MELODY,       GID_SONG_ZELDA,     0xD4,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_EPONAS_SONG] =                         Item(RG_EPONAS_SONG,                      Text{ "Epona's Song", "Chant d'Epona", "Eponas Lied" },                                                           ITEMTYPE_SONG,              0xC2,               true,  &logic->EponasSong,          RHT_EPONAS_SONG,            ITEM_SONG_EPONA,                OBJECT_GI_MELODY,       GID_SONG_EPONA,     0xD2,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_SARIAS_SONG] =                         Item(RG_SARIAS_SONG,                      Text{ "Saria's Song", "Chant de Saria", "Sarias Lied" },                                                          ITEMTYPE_SONG,              0xC3,               true,  &logic->SariasSong,          RHT_SARIAS_SONG,            ITEM_SONG_SARIA,                OBJECT_GI_MELODY,       GID_SONG_SARIA,     0xD1,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_SUNS_SONG] =                           Item(RG_SUNS_SONG,                        Text{ "Sun's Song", "Chant du Soleil", "Das Lied der Sonne" },                                                    ITEMTYPE_SONG,              0xC4,               true,  &logic->SunsSong,            RHT_SUNS_SONG,              ITEM_SONG_SUN,                  OBJECT_GI_MELODY,       GID_SONG_SUN,       0xD3,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_SONG_OF_TIME] =                        Item(RG_SONG_OF_TIME,                     Text{ "Song of Time", "Chant du Temps", "Das Lied der Zeit" },                                                    ITEMTYPE_SONG,              0xC5,               true,  &logic->SongOfTime,          RHT_SONG_OF_TIME,           ITEM_SONG_TIME,                 OBJECT_GI_MELODY,       GID_SONG_TIME,      0xD5,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_SONG_OF_STORMS] =                      Item(RG_SONG_OF_STORMS,                   Text{ "Song of Storms", "Chant des Tempêtes", "Lied der Stürme" },                                                ITEMTYPE_SONG,              0xC6,               true,  &logic->SongOfStorms,        RHT_SONG_OF_STORMS,         ITEM_SONG_STORMS,               OBJECT_GI_MELODY,       GID_SONG_STORM,     0xD6,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_MINUET_OF_FOREST] =                    Item(RG_MINUET_OF_FOREST,                 Text{ "Minuet of Forest", "Menuet des Bois", "Wald-Minuett" },                                                    ITEMTYPE_SONG,              0xBB,               true,  &logic->MinuetOfForest,      RHT_MINUET_OF_FOREST,       ITEM_SONG_MINUET,               OBJECT_GI_MELODY,       GID_SONG_MINUET,    0x73,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_BOLERO_OF_FIRE] =                      Item(RG_BOLERO_OF_FIRE,                   Text{ "Bolero of Fire", "Boléro du Feu", "Bolero des Feuers" },                                                   ITEMTYPE_SONG,              0xBC,               true,  &logic->BoleroOfFire,        RHT_BOLERO_OF_FIRE,         ITEM_SONG_BOLERO,               OBJECT_GI_MELODY,       GID_SONG_BOLERO,    0x74,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_SERENADE_OF_WATER] =                   Item(RG_SERENADE_OF_WATER,                Text{ "Serenade of Water", "Sérénade de l'Eau", "Serenade des Wassers" },                                         ITEMTYPE_SONG,              0xBD,               true,  &logic->SerenadeOfWater,     RHT_SERENADE_OF_WATER,      ITEM_SONG_SERENADE,             OBJECT_GI_MELODY,       GID_SONG_SERENADE,  0x75,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_NOCTURNE_OF_SHADOW] =                  Item(RG_NOCTURNE_OF_SHADOW,               Text{ "Nocturne of Shadow", "Nocturne de l'Ombre", "Nocturne der Schatten " },                                    ITEMTYPE_SONG,              0xBF,               true,  &logic->NocturneOfShadow,    RHT_NOCTURNE_OF_SHADOW,     ITEM_SONG_NOCTURNE,             OBJECT_GI_MELODY,       GID_SONG_NOCTURNE,  0x77,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_REQUIEM_OF_SPIRIT] =                   Item(RG_REQUIEM_OF_SPIRIT,                Text{ "Requiem of Spirit", "Requiem des Esprits", "Requiem des Geistes" },                                        ITEMTYPE_SONG,              0xBE,               true,  &logic->RequiemOfSpirit,     RHT_REQUIEM_OF_SPIRIT,      ITEM_SONG_REQUIEM,              OBJECT_GI_MELODY,       GID_SONG_REQUIEM,   0x76,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_PRELUDE_OF_LIGHT] =                    Item(RG_PRELUDE_OF_LIGHT,                 Text{ "Prelude of Light", "Prélude de la Lumière", "Präludium des Lichts" },                                      ITEMTYPE_SONG,              0xC0,               true,  &logic->PreludeOfLight,      RHT_PRELUDE_OF_LIGHT,       ITEM_SONG_PRELUDE,              OBJECT_GI_MELODY,       GID_SONG_PRELUDE,   0x78,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_ZELDAS_LULLABY] =                      Item(RG_ZELDAS_LULLABY,                   Text{ "Zelda's Lullaby", "Berceuse de Zelda", "Zeldas Wiegenlied" },                                              ITEMTYPE_SONG,              0xC1,                 true,  LOGIC_ZELDAS_LULLABY,               RHT_ZELDAS_LULLABY,                    ITEM_SONG_LULLABY,                    OBJECT_GI_MELODY,       GID_SONG_ZELDA,     0xD4,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_EPONAS_SONG] =                         Item(RG_EPONAS_SONG,                      Text{ "Epona's Song", "Chant d'Epona", "Eponas Lied" },                                                           ITEMTYPE_SONG,              0xC2,                 true,  LOGIC_EPONAS_SONG,                  RHT_EPONAS_SONG,                       ITEM_SONG_EPONA,                      OBJECT_GI_MELODY,       GID_SONG_EPONA,     0xD2,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_SARIAS_SONG] =                         Item(RG_SARIAS_SONG,                      Text{ "Saria's Song", "Chant de Saria", "Sarias Lied" },                                                          ITEMTYPE_SONG,              0xC3,                 true,  LOGIC_SARIAS_SONG,                  RHT_SARIAS_SONG,                       ITEM_SONG_SARIA,                      OBJECT_GI_MELODY,       GID_SONG_SARIA,     0xD1,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_SUNS_SONG] =                           Item(RG_SUNS_SONG,                        Text{ "Sun's Song", "Chant du Soleil", "Das Lied der Sonne" },                                                    ITEMTYPE_SONG,              0xC4,                 true,  LOGIC_SUNS_SONG,                    RHT_SUNS_SONG,                         ITEM_SONG_SUN,                        OBJECT_GI_MELODY,       GID_SONG_SUN,       0xD3,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_SONG_OF_TIME] =                        Item(RG_SONG_OF_TIME,                     Text{ "Song of Time", "Chant du Temps", "Das Lied der Zeit" },                                                    ITEMTYPE_SONG,              0xC5,                 true,  LOGIC_SONG_OF_TIME,                 RHT_SONG_OF_TIME,                      ITEM_SONG_TIME,                       OBJECT_GI_MELODY,       GID_SONG_TIME,      0xD5,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_SONG_OF_STORMS] =                      Item(RG_SONG_OF_STORMS,                   Text{ "Song of Storms", "Chant des Tempêtes", "Lied der Stürme" },                                                ITEMTYPE_SONG,              0xC6,                 true,  LOGIC_SONG_OF_STORMS,               RHT_SONG_OF_STORMS,                    ITEM_SONG_STORMS,                     OBJECT_GI_MELODY,       GID_SONG_STORM,     0xD6,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_MINUET_OF_FOREST] =                    Item(RG_MINUET_OF_FOREST,                 Text{ "Minuet of Forest", "Menuet des Bois", "Wald-Minuett" },                                                    ITEMTYPE_SONG,              0xBB,                 true,  LOGIC_MINUET_OF_FOREST,             RHT_MINUET_OF_FOREST,                  ITEM_SONG_MINUET,                     OBJECT_GI_MELODY,       GID_SONG_MINUET,    0x73,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BOLERO_OF_FIRE] =                      Item(RG_BOLERO_OF_FIRE,                   Text{ "Bolero of Fire", "Boléro du Feu", "Bolero des Feuers" },                                                   ITEMTYPE_SONG,              0xBC,                 true,  LOGIC_BOLERO_OF_FIRE,               RHT_BOLERO_OF_FIRE,                    ITEM_SONG_BOLERO,                     OBJECT_GI_MELODY,       GID_SONG_BOLERO,    0x74,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_SERENADE_OF_WATER] =                   Item(RG_SERENADE_OF_WATER,                Text{ "Serenade of Water", "Sérénade de l'Eau", "Serenade des Wassers" },                                         ITEMTYPE_SONG,              0xBD,                 true,  LOGIC_SERENADE_OF_WATER,            RHT_SERENADE_OF_WATER,                 ITEM_SONG_SERENADE,                   OBJECT_GI_MELODY,       GID_SONG_SERENADE,  0x75,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_NOCTURNE_OF_SHADOW] =                  Item(RG_NOCTURNE_OF_SHADOW,               Text{ "Nocturne of Shadow", "Nocturne de l'Ombre", "Nocturne der Schatten " },                                    ITEMTYPE_SONG,              0xBF,                 true,  LOGIC_NOCTURNE_OF_SHADOW,           RHT_NOCTURNE_OF_SHADOW,                ITEM_SONG_NOCTURNE,                   OBJECT_GI_MELODY,       GID_SONG_NOCTURNE,  0x77,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_REQUIEM_OF_SPIRIT] =                   Item(RG_REQUIEM_OF_SPIRIT,                Text{ "Requiem of Spirit", "Requiem des Esprits", "Requiem des Geistes" },                                        ITEMTYPE_SONG,              0xBE,                 true,  LOGIC_REQUIEM_OF_SPIRIT,            RHT_REQUIEM_OF_SPIRIT,                 ITEM_SONG_REQUIEM,                    OBJECT_GI_MELODY,       GID_SONG_REQUIEM,   0x76,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_PRELUDE_OF_LIGHT] =                    Item(RG_PRELUDE_OF_LIGHT,                 Text{ "Prelude of Light", "Prélude de la Lumière", "Präludium des Lichts" },                                      ITEMTYPE_SONG,              0xC0,                 true,  LOGIC_PRELUDE_OF_LIGHT,             RHT_PRELUDE_OF_LIGHT,                  ITEM_SONG_PRELUDE,                    OBJECT_GI_MELODY,       GID_SONG_PRELUDE,   0x78,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
     // Maps and Compasses
-    itemTable[RG_DEKU_TREE_MAP] =                       Item(RG_DEKU_TREE_MAP,                    Text{ "Great Deku Tree Map", "Carte de l'Arbre Mojo", "Karte des Deku-Baums" },                                   ITEMTYPE_MAP,               0xA5,               false, &logic->noVariable,          RHT_DEKU_TREE_MAP,          RG_DEKU_TREE_MAP,               OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_DODONGOS_CAVERN_MAP] =                 Item(RG_DODONGOS_CAVERN_MAP,              Text{ "Dodongo's Cavern Map", "Carte de la Caverne Dodongo", "Karte der Dodongo-Höhle" },                         ITEMTYPE_MAP,               0xA6,               false, &logic->noVariable,          RHT_DODONGOS_CAVERN_MAP,    RG_DODONGOS_CAVERN_MAP,         OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_JABU_JABUS_BELLY_MAP] =                Item(RG_JABU_JABUS_BELLY_MAP,             Text{ "Jabu-Jabu's Belly Map", "Carte du Ventre de Jabu-Jabu", "Karte des Jabu-Jabu-Bauchs" },                    ITEMTYPE_MAP,               0xA7,               false, &logic->noVariable,          RHT_JABU_JABUS_BELLY_MAP,   RG_JABU_JABUS_BELLY_MAP,        OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_FOREST_TEMPLE_MAP] =                   Item(RG_FOREST_TEMPLE_MAP,                Text{ "Forest Temple Map", "Carte du Temple de la Forêt", "Waldtempel Karte" },                                   ITEMTYPE_MAP,               0xA8,               false, &logic->noVariable,          RHT_FOREST_TEMPLE_MAP,      RG_FOREST_TEMPLE_MAP,           OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_FIRE_TEMPLE_MAP] =                     Item(RG_FIRE_TEMPLE_MAP,                  Text{ "Fire Temple Map", "Carte due Temple de Feu", "Feuertempel Karte" },                                        ITEMTYPE_MAP,               0xA9,               false, &logic->noVariable,          RHT_FIRE_TEMPLE_MAP,        RG_FIRE_TEMPLE_MAP,             OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_WATER_TEMPLE_MAP] =                    Item(RG_WATER_TEMPLE_MAP,                 Text{ "Water Temple Map", "Carte du Temple de l'Eau", "Wassertempel-Karte" },                                     ITEMTYPE_MAP,               0xAA,               false, &logic->noVariable,          RHT_WATER_TEMPLE_MAP,       RG_WATER_TEMPLE_MAP,            OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_SPIRIT_TEMPLE_MAP] =                   Item(RG_SPIRIT_TEMPLE_MAP,                Text{ "Spirit Temple Map", "Carte due Temple de l'Esprit", "Geistertempel Karte" },                               ITEMTYPE_MAP,               0xAB,               false, &logic->noVariable,          RHT_SPIRIT_TEMPLE_MAP,      RG_SPIRIT_TEMPLE_MAP,           OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_SHADOW_TEMPLE_MAP] =                   Item(RG_SHADOW_TEMPLE_MAP,                Text{ "Shadow Temple Map", "Carte du Temple de l'Ombre", "Karte des Schattentempels" },                           ITEMTYPE_MAP,               0xAC,               false, &logic->noVariable,          RHT_SHADOW_TEMPLE_MAP,      RG_SHADOW_TEMPLE_MAP,           OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_BOTTOM_OF_THE_WELL_MAP] =              Item(RG_BOTTOM_OF_THE_WELL_MAP,           Text{ "Bottom of the Well Map", "Carte du Puits", "Boden des Brunnens Karte" },                                   ITEMTYPE_MAP,               0xAD,               false, &logic->noVariable,          RHT_BOTTOM_OF_THE_WELL_MAP, RG_BOTTOM_OF_THE_WELL_MAP,      OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_ICE_CAVERN_MAP] =                      Item(RG_ICE_CAVERN_MAP,                   Text{ "Ice Cavern Map", "Carte de la Caverne Polaire", "Eishöhle Karte" },                                        ITEMTYPE_MAP,               0xAE,               false, &logic->noVariable,          RHT_ICE_CAVERN_MAP,         RG_ICE_CAVERN_MAP,              OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_DEKU_TREE_COMPASS] =                   Item(RG_DEKU_TREE_COMPASS,                Text{ "Great Deku Tree Compass", "Boussole de l'Arbre Mojo", "Kompass des Deku-Baums" },                          ITEMTYPE_COMPASS,           0x9B,               false, &logic->noVariable,          RHT_DEKU_TREE_COMPASS,      RG_DEKU_TREE_COMPASS,           OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_DEKU_TREE_MAP] =                       Item(RG_DEKU_TREE_MAP,                    Text{ "Great Deku Tree Map", "Carte de l'Arbre Mojo", "Karte des Deku-Baums" },                                   ITEMTYPE_MAP,               0xA5,                 false, LOGIC_MAP_DEKU_TREE,                RHT_DEKU_TREE_MAP,                     RG_DEKU_TREE_MAP,                     OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_DODONGOS_CAVERN_MAP] =                 Item(RG_DODONGOS_CAVERN_MAP,              Text{ "Dodongo's Cavern Map", "Carte de la Caverne Dodongo", "Karte der Dodongo-Höhle" },                         ITEMTYPE_MAP,               0xA6,                 false, LOGIC_MAP_DODONGOS_CAVERN,          RHT_DODONGOS_CAVERN_MAP,               RG_DODONGOS_CAVERN_MAP,               OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_JABU_JABUS_BELLY_MAP] =                Item(RG_JABU_JABUS_BELLY_MAP,             Text{ "Jabu-Jabu's Belly Map", "Carte du Ventre de Jabu-Jabu", "Karte des Jabu-Jabu-Bauchs" },                    ITEMTYPE_MAP,               0xA7,                 false, LOGIC_MAP_JABU_JABUS_BELLY,         RHT_JABU_JABUS_BELLY_MAP,              RG_JABU_JABUS_BELLY_MAP,              OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_FOREST_TEMPLE_MAP] =                   Item(RG_FOREST_TEMPLE_MAP,                Text{ "Forest Temple Map", "Carte du Temple de la Forêt", "Waldtempel Karte" },                                   ITEMTYPE_MAP,               0xA8,                 false, LOGIC_MAP_FOREST_TEMPLE,            RHT_FOREST_TEMPLE_MAP,                 RG_FOREST_TEMPLE_MAP,                 OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_FIRE_TEMPLE_MAP] =                     Item(RG_FIRE_TEMPLE_MAP,                  Text{ "Fire Temple Map", "Carte due Temple de Feu", "Feuertempel Karte" },                                        ITEMTYPE_MAP,               0xA9,                 false, LOGIC_MAP_FIRE_TEMPLE,              RHT_FIRE_TEMPLE_MAP,                   RG_FIRE_TEMPLE_MAP,                   OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_WATER_TEMPLE_MAP] =                    Item(RG_WATER_TEMPLE_MAP,                 Text{ "Water Temple Map", "Carte du Temple de l'Eau", "Wassertempel-Karte" },                                     ITEMTYPE_MAP,               0xAA,                 false, LOGIC_MAP_WATER_TEMPLE,             RHT_WATER_TEMPLE_MAP,                  RG_WATER_TEMPLE_MAP,                  OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_SPIRIT_TEMPLE_MAP] =                   Item(RG_SPIRIT_TEMPLE_MAP,                Text{ "Spirit Temple Map", "Carte due Temple de l'Esprit", "Geistertempel Karte" },                               ITEMTYPE_MAP,               0xAB,                 false, LOGIC_MAP_SPIRIT_TEMPLE,            RHT_SPIRIT_TEMPLE_MAP,                 RG_SPIRIT_TEMPLE_MAP,                 OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_SHADOW_TEMPLE_MAP] =                   Item(RG_SHADOW_TEMPLE_MAP,                Text{ "Shadow Temple Map", "Carte du Temple de l'Ombre", "Karte des Schattentempels" },                           ITEMTYPE_MAP,               0xAC,                 false, LOGIC_MAP_SHADOW_TEMPLE,            RHT_SHADOW_TEMPLE_MAP,                 RG_SHADOW_TEMPLE_MAP,                 OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_BOTTOM_OF_THE_WELL_MAP] =              Item(RG_BOTTOM_OF_THE_WELL_MAP,           Text{ "Bottom of the Well Map", "Carte du Puits", "Boden des Brunnens Karte" },                                   ITEMTYPE_MAP,               0xAD,                 false, LOGIC_MAP_BOTTOM_OF_THE_WELL,       RHT_BOTTOM_OF_THE_WELL_MAP,            RG_BOTTOM_OF_THE_WELL_MAP,            OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_ICE_CAVERN_MAP] =                      Item(RG_ICE_CAVERN_MAP,                   Text{ "Ice Cavern Map", "Carte de la Caverne Polaire", "Eishöhle Karte" },                                        ITEMTYPE_MAP,               0xAE,                 false, LOGIC_MAP_ICE_CAVERN,               RHT_ICE_CAVERN_MAP,                    RG_ICE_CAVERN_MAP,                    OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_DEKU_TREE_COMPASS] =                   Item(RG_DEKU_TREE_COMPASS,                Text{ "Great Deku Tree Compass", "Boussole de l'Arbre Mojo", "Kompass des Deku-Baums" },                          ITEMTYPE_COMPASS,           0x9B,                 false, LOGIC_COMPASS_DEKU_TREE,            RHT_DEKU_TREE_COMPASS,                 RG_DEKU_TREE_COMPASS,                 OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
     itemTable[RG_DEKU_TREE_COMPASS].SetCustomDrawFunc(Randomizer_DrawCompass);
-    itemTable[RG_DODONGOS_CAVERN_COMPASS] =             Item(RG_DODONGOS_CAVERN_COMPASS,          Text{ "Dodongo's Cavern Compass", "Boussole de la Caverne Dodongo", "Kompass der Dodongo-Höhle" },                ITEMTYPE_COMPASS,           0x9C,               false, &logic->noVariable,          RHT_DODONGOS_CAVERN_COMPASS,RG_DODONGOS_CAVERN_COMPASS,     OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_DODONGOS_CAVERN_COMPASS] =             Item(RG_DODONGOS_CAVERN_COMPASS,          Text{ "Dodongo's Cavern Compass", "Boussole de la Caverne Dodongo", "Kompass der Dodongo-Höhle" },                ITEMTYPE_COMPASS,           0x9C,                 false, LOGIC_COMPASS_DODONGOS_CAVERN,      RHT_DODONGOS_CAVERN_COMPASS,           RG_DODONGOS_CAVERN_COMPASS,           OBJECT_GI_COMPASS,      GID_COMPASS,   TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
     itemTable[RG_DODONGOS_CAVERN_COMPASS].SetCustomDrawFunc(Randomizer_DrawCompass);
-    itemTable[RG_JABU_JABUS_BELLY_COMPASS] =            Item(RG_JABU_JABUS_BELLY_COMPASS,         Text{ "Jabu-Jabu's Belly Compass", "Boussole du Ventre de Jabu-Jabu", "Kompass des Jabu-Jabu-Bauchs" },           ITEMTYPE_COMPASS,           0x9D,               false, &logic->noVariable,          RHT_JABU_JABUS_BELLY_COMPASS,RG_JABU_JABUS_BELLY_COMPASS,   OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_JABU_JABUS_BELLY_COMPASS] =            Item(RG_JABU_JABUS_BELLY_COMPASS,         Text{ "Jabu-Jabu's Belly Compass", "Boussole du Ventre de Jabu-Jabu", "Kompass des Jabu-Jabu-Bauchs" },           ITEMTYPE_COMPASS,           0x9D,                 false, LOGIC_COMPASS_JABU_JABUS_BELLY,     RHT_JABU_JABUS_BELLY_COMPASS,          RG_JABU_JABUS_BELLY_COMPASS,          OBJECT_GI_COMPASS,      GID_COMPASS,   TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
     itemTable[RG_JABU_JABUS_BELLY_COMPASS].SetCustomDrawFunc(Randomizer_DrawCompass);
-    itemTable[RG_FOREST_TEMPLE_COMPASS] =               Item(RG_FOREST_TEMPLE_COMPASS,            Text{ "Forest Temple Compass", "Boussole du Temple de la Forêt", "Waldtempel-Kompass" },                          ITEMTYPE_COMPASS,           0x9E,               false, &logic->noVariable,          RHT_FOREST_TEMPLE_COMPASS,  RG_FOREST_TEMPLE_COMPASS,       OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_FOREST_TEMPLE_COMPASS] =               Item(RG_FOREST_TEMPLE_COMPASS,            Text{ "Forest Temple Compass", "Boussole du Temple de la Forêt", "Waldtempel-Kompass" },                          ITEMTYPE_COMPASS,           0x9E,                 false, LOGIC_COMPASS_FOREST_TEMPLE,        RHT_FOREST_TEMPLE_COMPASS,             RG_FOREST_TEMPLE_COMPASS,             OBJECT_GI_COMPASS,      GID_COMPASS,   TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
     itemTable[RG_FOREST_TEMPLE_COMPASS].SetCustomDrawFunc(Randomizer_DrawCompass);
-    itemTable[RG_FIRE_TEMPLE_COMPASS] =                 Item(RG_FIRE_TEMPLE_COMPASS,              Text{ "Fire Temple Compass", "Boussole du Temple du Feu", "Feuertempel-Kompass" },                                ITEMTYPE_COMPASS,           0x9F,               false, &logic->noVariable,          RHT_FIRE_TEMPLE_COMPASS,    RG_FIRE_TEMPLE_COMPASS,         OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_FIRE_TEMPLE_COMPASS] =                 Item(RG_FIRE_TEMPLE_COMPASS,              Text{ "Fire Temple Compass", "Boussole du Temple du Feu", "Feuertempel-Kompass" },                                ITEMTYPE_COMPASS,           0x9F,                 false, LOGIC_COMPASS_FIRE_TEMPLE,          RHT_FIRE_TEMPLE_COMPASS,               RG_FIRE_TEMPLE_COMPASS,               OBJECT_GI_COMPASS,      GID_COMPASS,   TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
     itemTable[RG_FIRE_TEMPLE_COMPASS].SetCustomDrawFunc(Randomizer_DrawCompass);
-    itemTable[RG_WATER_TEMPLE_COMPASS] =                Item(RG_WATER_TEMPLE_COMPASS,             Text{ "Water Temple Compass", "Boussole du Temple de l'Eau", "Wassertempel-Kompass" },                            ITEMTYPE_COMPASS,           0xA0,               false, &logic->noVariable,          RHT_WATER_TEMPLE_COMPASS,   RG_WATER_TEMPLE_COMPASS,        OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_WATER_TEMPLE_COMPASS] =                Item(RG_WATER_TEMPLE_COMPASS,             Text{ "Water Temple Compass", "Boussole du Temple de l'Eau", "Wassertempel-Kompass" },                            ITEMTYPE_COMPASS,           0xA0,                 false, LOGIC_COMPASS_WATER_TEMPLE,         RHT_WATER_TEMPLE_COMPASS,              RG_WATER_TEMPLE_COMPASS,              OBJECT_GI_COMPASS,      GID_COMPASS,   TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
     itemTable[RG_WATER_TEMPLE_COMPASS].SetCustomDrawFunc(Randomizer_DrawCompass);
-    itemTable[RG_SPIRIT_TEMPLE_COMPASS] =               Item(RG_SPIRIT_TEMPLE_COMPASS,            Text{ "Spirit Temple Compass", "Boussole due Temple de l'Esprit", "Geistiger Tempelkompass" },                    ITEMTYPE_COMPASS,           0xA1,               false, &logic->noVariable,          RHT_SPIRIT_TEMPLE_COMPASS,  RG_SPIRIT_TEMPLE_COMPASS,       OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_SPIRIT_TEMPLE_COMPASS] =               Item(RG_SPIRIT_TEMPLE_COMPASS,            Text{ "Spirit Temple Compass", "Boussole due Temple de l'Esprit", "Geistiger Tempelkompass" },                    ITEMTYPE_COMPASS,           0xA1,                 false, LOGIC_COMPASS_SPIRIT_TEMPLE,        RHT_SPIRIT_TEMPLE_COMPASS,             RG_SPIRIT_TEMPLE_COMPASS,             OBJECT_GI_COMPASS,      GID_COMPASS,   TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
     itemTable[RG_SPIRIT_TEMPLE_COMPASS].SetCustomDrawFunc(Randomizer_DrawCompass);
-    itemTable[RG_SHADOW_TEMPLE_COMPASS] =               Item(RG_SHADOW_TEMPLE_COMPASS,            Text{ "Shadow Temple Compass", "Boussole du Temple de l'Ombre", "Kompass des Schattentempels" },                  ITEMTYPE_COMPASS,           0xA2,               false, &logic->noVariable,          RHT_SHADOW_TEMPLE_COMPASS,  RG_SHADOW_TEMPLE_COMPASS,       OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_SHADOW_TEMPLE_COMPASS] =               Item(RG_SHADOW_TEMPLE_COMPASS,            Text{ "Shadow Temple Compass", "Boussole du Temple de l'Ombre", "Kompass des Schattentempels" },                  ITEMTYPE_COMPASS,           0xA2,                 false, LOGIC_COMPASS_SHADOW_TEMPLE,        RHT_SHADOW_TEMPLE_COMPASS,             RG_SHADOW_TEMPLE_COMPASS,             OBJECT_GI_COMPASS,      GID_COMPASS,   TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
     itemTable[RG_SHADOW_TEMPLE_COMPASS].SetCustomDrawFunc(Randomizer_DrawCompass);
-    itemTable[RG_BOTTOM_OF_THE_WELL_COMPASS] =          Item(RG_BOTTOM_OF_THE_WELL_COMPASS,       Text{ "Bottom of the Well Compass", "Boussole du Puits", "Boden des Brunnenkompasses" },                          ITEMTYPE_COMPASS,           0xA3,               false, &logic->noVariable,          RHT_BOTTOM_OF_THE_WELL_COMPASS,RG_BOTTOM_OF_THE_WELL_COMPASS,OBJECT_GI_COMPASS,     GID_COMPASS,        TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_BOTTOM_OF_THE_WELL_COMPASS] =          Item(RG_BOTTOM_OF_THE_WELL_COMPASS,       Text{ "Bottom of the Well Compass", "Boussole du Puits", "Boden des Brunnenkompasses" },                          ITEMTYPE_COMPASS,           0xA3,                 false, LOGIC_COMPASS_BOTTOM_OF_THE_WELL,   RHT_BOTTOM_OF_THE_WELL_COMPASS,        RG_BOTTOM_OF_THE_WELL_COMPASS,        OBJECT_GI_COMPASS,      GID_COMPASS,   TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
     itemTable[RG_BOTTOM_OF_THE_WELL_COMPASS].SetCustomDrawFunc(Randomizer_DrawCompass);
-    itemTable[RG_ICE_CAVERN_COMPASS] =                  Item(RG_ICE_CAVERN_COMPASS,               Text{ "Ice Cavern Compass", "Boussole de la Caverne Polaire", "Eishöhlenkompass" },                               ITEMTYPE_COMPASS,           0xA4,               false, &logic->noVariable,          RHT_ICE_CAVERN_COMPASS,     RG_ICE_CAVERN_COMPASS,          OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_ICE_CAVERN_COMPASS] =                  Item(RG_ICE_CAVERN_COMPASS,               Text{ "Ice Cavern Compass", "Boussole de la Caverne Polaire", "Eishöhlenkompass" },                               ITEMTYPE_COMPASS,           0xA4,                 false, LOGIC_COMPASS_ICE_CAVERN,           RHT_ICE_CAVERN_COMPASS,                RG_ICE_CAVERN_COMPASS,                OBJECT_GI_COMPASS,      GID_COMPASS,   TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
     itemTable[RG_ICE_CAVERN_COMPASS].SetCustomDrawFunc(Randomizer_DrawCompass);
     // Boss Keys
-    itemTable[RG_FOREST_TEMPLE_BOSS_KEY] =              Item(RG_FOREST_TEMPLE_BOSS_KEY,           Text{ "Forest Temple Boss Key", "Clé d'Or du Temple de la Forêt", "Waldtempel-Boss-Schlüssel" },                  ITEMTYPE_BOSSKEY,           0x95,               true,  &logic->BossKeyForestTemple, RHT_FOREST_TEMPLE_BOSS_KEY, RG_FOREST_TEMPLE_BOSS_KEY,      OBJECT_GI_BOSSKEY,      GID_KEY_BOSS,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
+    itemTable[RG_FOREST_TEMPLE_BOSS_KEY] =              Item(RG_FOREST_TEMPLE_BOSS_KEY,           Text{ "Forest Temple Boss Key", "Clé d'Or du Temple de la Forêt", "Waldtempel-Boss-Schlüssel" },                  ITEMTYPE_BOSSKEY,           0x95,                 true,  LOGIC_BOSS_KEY_FOREST_TEMPLE,       RHT_FOREST_TEMPLE_BOSS_KEY,            RG_FOREST_TEMPLE_BOSS_KEY,            OBJECT_GI_BOSSKEY,      GID_KEY_BOSS,  TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
     itemTable[RG_FOREST_TEMPLE_BOSS_KEY].SetCustomDrawFunc(Randomizer_DrawBossKey);
-    itemTable[RG_FIRE_TEMPLE_BOSS_KEY] =                Item(RG_FIRE_TEMPLE_BOSS_KEY,             Text{ "Fire Temple Boss Key", "Clé d'Or du Temple du Feu", "Feuertempel-Boss-Schlüssel" },                        ITEMTYPE_BOSSKEY,           0x96,               true,  &logic->BossKeyFireTemple,   RHT_FIRE_TEMPLE_BOSS_KEY,   RG_FIRE_TEMPLE_BOSS_KEY,        OBJECT_GI_BOSSKEY,      GID_KEY_BOSS,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
+    itemTable[RG_FIRE_TEMPLE_BOSS_KEY] =                Item(RG_FIRE_TEMPLE_BOSS_KEY,             Text{ "Fire Temple Boss Key", "Clé d'Or du Temple du Feu", "Feuertempel-Boss-Schlüssel" },                        ITEMTYPE_BOSSKEY,           0x96,                 true,  LOGIC_BOSS_KEY_FIRE_TEMPLE,         RHT_FIRE_TEMPLE_BOSS_KEY,              RG_FIRE_TEMPLE_BOSS_KEY,              OBJECT_GI_BOSSKEY,      GID_KEY_BOSS,  TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
     itemTable[RG_FIRE_TEMPLE_BOSS_KEY].SetCustomDrawFunc(Randomizer_DrawBossKey);
-    itemTable[RG_WATER_TEMPLE_BOSS_KEY] =               Item(RG_WATER_TEMPLE_BOSS_KEY,            Text{ "Water Temple Boss Key", "Clé d'Or du Temple de l'Eau", "Wassertempel-Boss-Schlüssel" },                    ITEMTYPE_BOSSKEY,           0x97,               true,  &logic->BossKeyWaterTemple,  RHT_WATER_TEMPLE_BOSS_KEY,  RG_WATER_TEMPLE_BOSS_KEY,       OBJECT_GI_BOSSKEY,      GID_KEY_BOSS,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
+    itemTable[RG_WATER_TEMPLE_BOSS_KEY] =               Item(RG_WATER_TEMPLE_BOSS_KEY,            Text{ "Water Temple Boss Key", "Clé d'Or du Temple de l'Eau", "Wassertempel-Boss-Schlüssel" },                    ITEMTYPE_BOSSKEY,           0x97,                 true,  LOGIC_BOSS_KEY_WATER_TEMPLE,        RHT_WATER_TEMPLE_BOSS_KEY,             RG_WATER_TEMPLE_BOSS_KEY,             OBJECT_GI_BOSSKEY,      GID_KEY_BOSS,  TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
     itemTable[RG_WATER_TEMPLE_BOSS_KEY].SetCustomDrawFunc(Randomizer_DrawBossKey);
-    itemTable[RG_SPIRIT_TEMPLE_BOSS_KEY] =              Item(RG_SPIRIT_TEMPLE_BOSS_KEY,           Text{ "Spirit Temple Boss Key", "Clé d'Or du Temple de l'Esprit", "Geistertempel-Boss-Schlüssel" },               ITEMTYPE_BOSSKEY,           0x98,               true,  &logic->BossKeySpiritTemple, RHT_SPIRIT_TEMPLE_BOSS_KEY, RG_SPIRIT_TEMPLE_BOSS_KEY,      OBJECT_GI_BOSSKEY,      GID_KEY_BOSS,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
+    itemTable[RG_SPIRIT_TEMPLE_BOSS_KEY] =              Item(RG_SPIRIT_TEMPLE_BOSS_KEY,           Text{ "Spirit Temple Boss Key", "Clé d'Or du Temple de l'Esprit", "Geistertempel-Boss-Schlüssel" },               ITEMTYPE_BOSSKEY,           0x98,                 true,  LOGIC_BOSS_KEY_SPIRIT_TEMPLE,       RHT_SPIRIT_TEMPLE_BOSS_KEY,            RG_SPIRIT_TEMPLE_BOSS_KEY,            OBJECT_GI_BOSSKEY,      GID_KEY_BOSS,  TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
     itemTable[RG_SPIRIT_TEMPLE_BOSS_KEY].SetCustomDrawFunc(Randomizer_DrawBossKey);
-    itemTable[RG_SHADOW_TEMPLE_BOSS_KEY] =              Item( RG_SHADOW_TEMPLE_BOSS_KEY,          Text{ "Shadow Temple Boss Key", "Clé d'Or du Temple de l'Ombre", "Schlüssel für den Boss des Schattentempels" },  ITEMTYPE_BOSSKEY,           0x99,               true,  &logic->BossKeyShadowTemple, RHT_SHADOW_TEMPLE_BOSS_KEY, RG_SHADOW_TEMPLE_BOSS_KEY,      OBJECT_GI_BOSSKEY,      GID_KEY_BOSS,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
+    itemTable[RG_SHADOW_TEMPLE_BOSS_KEY] =              Item( RG_SHADOW_TEMPLE_BOSS_KEY,          Text{ "Shadow Temple Boss Key", "Clé d'Or du Temple de l'Ombre", "Schlüssel für den Boss des Schattentempels" },  ITEMTYPE_BOSSKEY,           0x99,                 true,  LOGIC_BOSS_KEY_SHADOW_TEMPLE,       RHT_SHADOW_TEMPLE_BOSS_KEY,            RG_SHADOW_TEMPLE_BOSS_KEY,            OBJECT_GI_BOSSKEY,      GID_KEY_BOSS,  TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
     itemTable[RG_SHADOW_TEMPLE_BOSS_KEY].SetCustomDrawFunc(Randomizer_DrawBossKey);
-    itemTable[RG_GANONS_CASTLE_BOSS_KEY] =              Item(RG_GANONS_CASTLE_BOSS_KEY,           Text{ "Ganon's Castle Boss Key", "Clé d'Or du Château de Ganon", "Ganons Schloss-Boss-Schlüssel" },               ITEMTYPE_BOSSKEY,           0x9A,               true,  &logic->BossKeyGanonsCastle, RHT_GANONS_CASTLE_BOSS_KEY, RG_GANONS_CASTLE_BOSS_KEY,      OBJECT_GI_BOSSKEY,      GID_KEY_BOSS,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
+    itemTable[RG_GANONS_CASTLE_BOSS_KEY] =              Item(RG_GANONS_CASTLE_BOSS_KEY,           Text{ "Ganon's Castle Boss Key", "Clé d'Or du Château de Ganon", "Ganons Schloss-Boss-Schlüssel" },               ITEMTYPE_BOSSKEY,           0x9A,                 true,  LOGIC_BOSS_KEY_GANONS_CASTLE,       RHT_GANONS_CASTLE_BOSS_KEY,            RG_GANONS_CASTLE_BOSS_KEY,            OBJECT_GI_BOSSKEY,      GID_KEY_BOSS,  TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
     itemTable[RG_GANONS_CASTLE_BOSS_KEY].SetCustomDrawFunc(Randomizer_DrawBossKey);
-    itemTable[RG_FOREST_TEMPLE_SMALL_KEY] =             Item(RG_FOREST_TEMPLE_SMALL_KEY,          Text{ "Forest Temple Small Key", "Petite Clé du Temple de la Forêt", "Waldtempel Kleiner Schlüssel" },            ITEMTYPE_SMALLKEY,          0xAF,               true,  &logic->ForestTempleKeys,    RHT_FOREST_TEMPLE_SMALL_KEY,RG_FOREST_TEMPLE_SMALL_KEY,     OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_FOREST_TEMPLE_SMALL_KEY] =             Item(RG_FOREST_TEMPLE_SMALL_KEY,          Text{ "Forest Temple Small Key", "Petite Clé du Temple de la Forêt", "Waldtempel Kleiner Schlüssel" },            ITEMTYPE_SMALLKEY,          0xAF,                 true,  LOGIC_FOREST_TEMPLE_KEYS,           RHT_FOREST_TEMPLE_SMALL_KEY,           RG_FOREST_TEMPLE_SMALL_KEY,           OBJECT_GI_KEY,          GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_FOREST_TEMPLE_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
-    itemTable[RG_FIRE_TEMPLE_SMALL_KEY] =               Item(RG_FIRE_TEMPLE_SMALL_KEY,            Text{ "Fire Temple Small Key", "Petite Clé du Temple du Feu", "Feuertempel Kleiner Schlüssel" },                  ITEMTYPE_SMALLKEY,          0xB0,               true,  &logic->FireTempleKeys,      RHT_FIRE_TEMPLE_SMALL_KEY,  RG_FIRE_TEMPLE_SMALL_KEY,       OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_FIRE_TEMPLE_SMALL_KEY] =               Item(RG_FIRE_TEMPLE_SMALL_KEY,            Text{ "Fire Temple Small Key", "Petite Clé du Temple du Feu", "Feuertempel Kleiner Schlüssel" },                  ITEMTYPE_SMALLKEY,          0xB0,                 true,  LOGIC_FIRE_TEMPLE_KEYS,             RHT_FIRE_TEMPLE_SMALL_KEY,             RG_FIRE_TEMPLE_SMALL_KEY,             OBJECT_GI_KEY,          GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_FIRE_TEMPLE_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
-    itemTable[RG_WATER_TEMPLE_SMALL_KEY] =              Item(RG_WATER_TEMPLE_SMALL_KEY,           Text{ "Water Temple Small Key", "Petite Clé du Temple de l'Eau", "Wassertempel Kleiner Schlüssel" },              ITEMTYPE_SMALLKEY,          0xB1,               true,  &logic->WaterTempleKeys,     RHT_WATER_TEMPLE_SMALL_KEY, RG_WATER_TEMPLE_SMALL_KEY,      OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_WATER_TEMPLE_SMALL_KEY] =              Item(RG_WATER_TEMPLE_SMALL_KEY,           Text{ "Water Temple Small Key", "Petite Clé du Temple de l'Eau", "Wassertempel Kleiner Schlüssel" },              ITEMTYPE_SMALLKEY,          0xB1,                 true,  LOGIC_WATER_TEMPLE_KEYS,            RHT_WATER_TEMPLE_SMALL_KEY,            RG_WATER_TEMPLE_SMALL_KEY,            OBJECT_GI_KEY,          GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_WATER_TEMPLE_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
-    itemTable[RG_SPIRIT_TEMPLE_SMALL_KEY] =             Item(RG_SPIRIT_TEMPLE_SMALL_KEY,          Text{ "Spirit Temple Small Key", "Petite Clé du Temple de l'Esprit", "Geisttempel Kleiner Schlüssel" },           ITEMTYPE_SMALLKEY,          0xB2,               true,  &logic->SpiritTempleKeys,    RHT_SPIRIT_TEMPLE_SMALL_KEY,RG_SPIRIT_TEMPLE_SMALL_KEY,     OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_SPIRIT_TEMPLE_SMALL_KEY] =             Item(RG_SPIRIT_TEMPLE_SMALL_KEY,          Text{ "Spirit Temple Small Key", "Petite Clé du Temple de l'Esprit", "Geisttempel Kleiner Schlüssel" },           ITEMTYPE_SMALLKEY,          0xB2,                 true,  LOGIC_SPIRIT_TEMPLE_KEYS,           RHT_SPIRIT_TEMPLE_SMALL_KEY,           RG_SPIRIT_TEMPLE_SMALL_KEY,           OBJECT_GI_KEY,          GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_SPIRIT_TEMPLE_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
-    itemTable[RG_SHADOW_TEMPLE_SMALL_KEY] =             Item(RG_SHADOW_TEMPLE_SMALL_KEY,          Text{ "Shadow Temple Small Key", "Petite Clé du Temple de l'Ombre", "Schattentempel Kleiner Schlüssel" },         ITEMTYPE_SMALLKEY,          0xB3,               true,  &logic->ShadowTempleKeys,    RHT_SHADOW_TEMPLE_SMALL_KEY,RG_SHADOW_TEMPLE_SMALL_KEY,     OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_SHADOW_TEMPLE_SMALL_KEY] =             Item(RG_SHADOW_TEMPLE_SMALL_KEY,          Text{ "Shadow Temple Small Key", "Petite Clé du Temple de l'Ombre", "Schattentempel Kleiner Schlüssel" },         ITEMTYPE_SMALLKEY,          0xB3,                 true,  LOGIC_SHADOW_TEMPLE_KEYS,           RHT_SHADOW_TEMPLE_SMALL_KEY,           RG_SHADOW_TEMPLE_SMALL_KEY,           OBJECT_GI_KEY,          GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_SHADOW_TEMPLE_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
-    itemTable[RG_BOTTOM_OF_THE_WELL_SMALL_KEY] =        Item(RG_BOTTOM_OF_THE_WELL_SMALL_KEY,     Text{ "Bottom of the Well Small Key", "Petite Clé du Puits", "Boden des Brunnens Kleiner Schlüssel" },            ITEMTYPE_SMALLKEY,          0xB4,               true,  &logic->BottomOfTheWellKeys, RHT_BOTTOM_OF_THE_WELL_SMALL_KEY,RG_BOTTOM_OF_THE_WELL_SMALL_KEY,OBJECT_GI_KEY,     GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_BOTTOM_OF_THE_WELL_SMALL_KEY] =        Item(RG_BOTTOM_OF_THE_WELL_SMALL_KEY,     Text{ "Bottom of the Well Small Key", "Petite Clé du Puits", "Boden des Brunnens Kleiner Schlüssel" },            ITEMTYPE_SMALLKEY,          0xB4,                 true,  LOGIC_BOTTOM_OF_THE_WELL_KEYS,      RHT_BOTTOM_OF_THE_WELL_SMALL_KEY,      RG_BOTTOM_OF_THE_WELL_SMALL_KEY,      OBJECT_GI_KEY,          GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_BOTTOM_OF_THE_WELL_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
-    itemTable[RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY] =   Item(RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, Text{ "Training Grounds Small Key", "Petite Clé du Gymnase Gerudo", "Trainingsgelände Kleiner Schlüssel" },      ITEMTYPE_SMALLKEY,          0xB5,               true,  &logic->GerudoTrainingGroundsKeys, RHT_GERUDO_TRAINING_GROUNDS_SMALL_KEY,RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY,OBJECT_GI_KEY,GID_KEY_SMALL,TEXT_RANDOMIZER_CUSTOM_ITEM,0x80, CHEST_ANIM_SHORT,ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY] =   Item(RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, Text{ "Training Grounds Small Key", "Petite Clé du Gymnase Gerudo", "Trainingsgelände Kleiner Schlüssel" },      ITEMTYPE_SMALLKEY,          0xB5,                 true,  LOGIC_GERUDO_TRAINING_GROUNDS_KEYS, RHT_GERUDO_TRAINING_GROUNDS_SMALL_KEY, RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, OBJECT_GI_KEY,          GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
-    itemTable[RG_GERUDO_FORTRESS_SMALL_KEY] =           Item(RG_GERUDO_FORTRESS_SMALL_KEY,        Text{ "Gerudo Fortress Small Key", "Petite Clé du Repaire des Voleurs", "Gerudo-Festung Kleiner Schlüssel" },     ITEMTYPE_FORTRESS_SMALLKEY, 0xB6,               true,  &logic->GerudoFortressKeys,  RHT_GERUDO_FORTRESS_SMALL_KEY,RG_GERUDO_FORTRESS_SMALL_KEY, OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_GERUDO_FORTRESS_SMALL_KEY] =           Item(RG_GERUDO_FORTRESS_SMALL_KEY,        Text{ "Gerudo Fortress Small Key", "Petite Clé du Repaire des Voleurs", "Gerudo-Festung Kleiner Schlüssel" },     ITEMTYPE_FORTRESS_SMALLKEY, 0xB6,                 true,  LOGIC_GERUDO_FORTRESS_KEYS,         RHT_GERUDO_FORTRESS_SMALL_KEY,         RG_GERUDO_FORTRESS_SMALL_KEY,         OBJECT_GI_KEY,          GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_GERUDO_FORTRESS_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
-    itemTable[RG_GANONS_CASTLE_SMALL_KEY] =             Item(RG_GANONS_CASTLE_SMALL_KEY,          Text{ "Ganon's Castle Small Key", "Petite Clé du Château de Ganon", "Ganons Schloss Kleiner Schlüssel" },         ITEMTYPE_SMALLKEY,          0xB7,               true,  &logic->GanonsCastleKeys,    RHT_GANONS_CASTLE_SMALL_KEY,RG_GANONS_CASTLE_SMALL_KEY,     OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_GANONS_CASTLE_SMALL_KEY] =             Item(RG_GANONS_CASTLE_SMALL_KEY,          Text{ "Ganon's Castle Small Key", "Petite Clé du Château de Ganon", "Ganons Schloss Kleiner Schlüssel" },         ITEMTYPE_SMALLKEY,          0xB7,                 true,  LOGIC_GANONS_CASTLE_KEYS,           RHT_GANONS_CASTLE_SMALL_KEY,           RG_GANONS_CASTLE_SMALL_KEY,           OBJECT_GI_KEY,          GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_GANONS_CASTLE_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
-    itemTable[RG_TREASURE_GAME_SMALL_KEY] =             Item(RG_TREASURE_GAME_SMALL_KEY,          Text{ "Chest Game Small Key", "Petite Clé du jeu la Chasse-aux-Trésors", "Truhenspiel Kleiner Schlüssel" },       ITEMTYPE_SMALLKEY,          GI_DOOR_KEY,        true,  &logic->TreasureGameKeys,    RHT_TREASURE_GAME_SMALL_KEY,ITEM_KEY_SMALL,                 OBJECT_GI_KEY,          GID_KEY_SMALL,      0xF3,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_NONE);
+    itemTable[RG_TREASURE_GAME_SMALL_KEY] =             Item(RG_TREASURE_GAME_SMALL_KEY,          Text{ "Chest Game Small Key", "Petite Clé du jeu la Chasse-aux-Trésors", "Truhenspiel Kleiner Schlüssel" },       ITEMTYPE_SMALLKEY,          GI_DOOR_KEY,          true,  LOGIC_TREASURE_GAME_KEYS,           RHT_TREASURE_GAME_SMALL_KEY,           ITEM_KEY_SMALL,                       OBJECT_GI_KEY,          GID_KEY_SMALL, 0xF3,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_NONE);
     // Key Rings
-    itemTable[RG_FOREST_TEMPLE_KEY_RING] =              Item(RG_FOREST_TEMPLE_KEY_RING,           Text{ "Forest Temple Key Ring", "Trousseau du Temple de la Forêt", "Waldtempel Schlüsselanhänger" },              ITEMTYPE_SMALLKEY,          0xD5,               true,  &logic->ForestTempleKeys,    RHT_FOREST_TEMPLE_KEY_RING, RG_FOREST_TEMPLE_KEY_RING,      OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_FOREST_TEMPLE_KEY_RING] =              Item(RG_FOREST_TEMPLE_KEY_RING,           Text{ "Forest Temple Key Ring", "Trousseau du Temple de la Forêt", "Waldtempel Schlüsselanhänger" },              ITEMTYPE_SMALLKEY,          0xD5,                 true,  LOGIC_FOREST_TEMPLE_KEYS,           RHT_FOREST_TEMPLE_KEY_RING,            RG_FOREST_TEMPLE_KEY_RING,            OBJECT_GI_KEY,          GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_FOREST_TEMPLE_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
-    itemTable[RG_FIRE_TEMPLE_KEY_RING] =                Item(RG_FIRE_TEMPLE_KEY_RING,             Text{ "Fire Temple Key Ring", "Trousseau du Temple du Feu", "Feuertempel Schlüsselanhänger" },                    ITEMTYPE_SMALLKEY,          0xD6,               true,  &logic->FireTempleKeys,      RHT_FIRE_TEMPLE_KEY_RING,   RG_FIRE_TEMPLE_KEY_RING,        OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_FIRE_TEMPLE_KEY_RING] =                Item(RG_FIRE_TEMPLE_KEY_RING,             Text{ "Fire Temple Key Ring", "Trousseau du Temple du Feu", "Feuertempel Schlüsselanhänger" },                    ITEMTYPE_SMALLKEY,          0xD6,                 true,  LOGIC_FIRE_TEMPLE_KEYS,             RHT_FIRE_TEMPLE_KEY_RING,              RG_FIRE_TEMPLE_KEY_RING,              OBJECT_GI_KEY,          GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_FIRE_TEMPLE_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
-    itemTable[RG_WATER_TEMPLE_KEY_RING] =               Item(RG_WATER_TEMPLE_KEY_RING,            Text{ "Water Temple Key Ring", "Trousseau du Temple de l'Eau", "Wassertempel Schlüsselanhänger" },                ITEMTYPE_SMALLKEY,          0xD7,               true,  &logic->WaterTempleKeys,     RHT_WATER_TEMPLE_KEY_RING,  RG_WATER_TEMPLE_KEY_RING,       OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_WATER_TEMPLE_KEY_RING] =               Item(RG_WATER_TEMPLE_KEY_RING,            Text{ "Water Temple Key Ring", "Trousseau du Temple de l'Eau", "Wassertempel Schlüsselanhänger" },                ITEMTYPE_SMALLKEY,          0xD7,                 true,  LOGIC_WATER_TEMPLE_KEYS,            RHT_WATER_TEMPLE_KEY_RING,             RG_WATER_TEMPLE_KEY_RING,             OBJECT_GI_KEY,          GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_WATER_TEMPLE_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
-    itemTable[RG_SPIRIT_TEMPLE_KEY_RING] =              Item(RG_SPIRIT_TEMPLE_KEY_RING,           Text{ "Spirit Temple Key Ring", "Trousseau du Temple de l'Esprit", "Geisttempel Schlüsselanhänger" },             ITEMTYPE_SMALLKEY,          0xD8,               true,  &logic->SpiritTempleKeys,    RHT_SPIRIT_TEMPLE_KEY_RING, RG_SPIRIT_TEMPLE_KEY_RING,      OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_SPIRIT_TEMPLE_KEY_RING] =              Item(RG_SPIRIT_TEMPLE_KEY_RING,           Text{ "Spirit Temple Key Ring", "Trousseau du Temple de l'Esprit", "Geisttempel Schlüsselanhänger" },             ITEMTYPE_SMALLKEY,          0xD8,                 true,  LOGIC_SPIRIT_TEMPLE_KEYS,           RHT_SPIRIT_TEMPLE_KEY_RING,            RG_SPIRIT_TEMPLE_KEY_RING,            OBJECT_GI_KEY,          GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_SPIRIT_TEMPLE_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
-    itemTable[RG_SHADOW_TEMPLE_KEY_RING] =              Item(RG_SHADOW_TEMPLE_KEY_RING,           Text{ "Shadow Temple Key Ring", "Trousseau du Temple de l'Ombre", "Schattentempel Schlüsselanhänger" },           ITEMTYPE_SMALLKEY,          0xD9,               true,  &logic->ShadowTempleKeys,    RHT_SHADOW_TEMPLE_KEY_RING, RG_SHADOW_TEMPLE_KEY_RING,      OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_SHADOW_TEMPLE_KEY_RING] =              Item(RG_SHADOW_TEMPLE_KEY_RING,           Text{ "Shadow Temple Key Ring", "Trousseau du Temple de l'Ombre", "Schattentempel Schlüsselanhänger" },           ITEMTYPE_SMALLKEY,          0xD9,                 true,  LOGIC_SHADOW_TEMPLE_KEYS,           RHT_SHADOW_TEMPLE_KEY_RING,            RG_SHADOW_TEMPLE_KEY_RING,            OBJECT_GI_KEY,          GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_SHADOW_TEMPLE_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
-    itemTable[RG_BOTTOM_OF_THE_WELL_KEY_RING] =         Item(RG_BOTTOM_OF_THE_WELL_KEY_RING,      Text{ "Bottom of the Well Key Ring", "Trousseau du Puits", "Boden des Brunnens Schlüsselanhänger" },              ITEMTYPE_SMALLKEY,          0xDA,               true,  &logic->BottomOfTheWellKeys, RHT_BOTTOM_OF_THE_WELL_KEY_RING,RG_BOTTOM_OF_THE_WELL_KEY_RING,OBJECT_GI_KEY,       GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_BOTTOM_OF_THE_WELL_KEY_RING] =         Item(RG_BOTTOM_OF_THE_WELL_KEY_RING,      Text{ "Bottom of the Well Key Ring", "Trousseau du Puits", "Boden des Brunnens Schlüsselanhänger" },              ITEMTYPE_SMALLKEY,          0xDA,                 true,  LOGIC_BOTTOM_OF_THE_WELL_KEYS,      RHT_BOTTOM_OF_THE_WELL_KEY_RING,       RG_BOTTOM_OF_THE_WELL_KEY_RING,       OBJECT_GI_KEY,          GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_BOTTOM_OF_THE_WELL_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
-    itemTable[RG_GERUDO_TRAINING_GROUNDS_KEY_RING] =    Item(RG_GERUDO_TRAINING_GROUNDS_KEY_RING, Text{ "Training Grounds Key Ring", "Trousseau du Gymnase Gerudo", "Trainingsgelände Schlüsselanhänger" },         ITEMTYPE_SMALLKEY,          0xDB,               true,  &logic->GerudoTrainingGroundsKeys, RHT_GERUDO_TRAINING_GROUNDS_KEY_RING,RG_GERUDO_TRAINING_GROUNDS_KEY_RING,OBJECT_GI_KEY,GID_KEY_SMALL,TEXT_RANDOMIZER_CUSTOM_ITEM,0x80, CHEST_ANIM_SHORT,ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_GERUDO_TRAINING_GROUNDS_KEY_RING] =    Item(RG_GERUDO_TRAINING_GROUNDS_KEY_RING, Text{ "Training Grounds Key Ring", "Trousseau du Gymnase Gerudo", "Trainingsgelände Schlüsselanhänger" },         ITEMTYPE_SMALLKEY,          0xDB,                 true,  LOGIC_GERUDO_TRAINING_GROUNDS_KEYS, RHT_GERUDO_TRAINING_GROUNDS_KEY_RING,  RG_GERUDO_TRAINING_GROUNDS_KEY_RING,  OBJECT_GI_KEY,          GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_GERUDO_TRAINING_GROUNDS_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
-    itemTable[RG_GERUDO_FORTRESS_KEY_RING] =            Item(RG_GERUDO_FORTRESS_KEY_RING,         Text{ "Gerudo Fortress Key Ring", "Trousseau du Repaire des Voleurs", "Gerudo Festung Schlüsselanhänger" },       ITEMTYPE_FORTRESS_SMALLKEY, 0xDC,               true,  &logic->GerudoFortressKeys,  RHT_GERUDO_FORTRESS_KEY_RING,RG_GERUDO_FORTRESS_KEY_RING,   OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_GERUDO_FORTRESS_KEY_RING] =            Item(RG_GERUDO_FORTRESS_KEY_RING,         Text{ "Gerudo Fortress Key Ring", "Trousseau du Repaire des Voleurs", "Gerudo Festung Schlüsselanhänger" },       ITEMTYPE_FORTRESS_SMALLKEY, 0xDC,                 true,  LOGIC_GERUDO_FORTRESS_KEYS,         RHT_GERUDO_FORTRESS_KEY_RING,          RG_GERUDO_FORTRESS_KEY_RING,          OBJECT_GI_KEY,          GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_GERUDO_FORTRESS_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
-    itemTable[RG_GANONS_CASTLE_KEY_RING] =              Item(RG_GANONS_CASTLE_KEY_RING,           Text{ "Ganon's Castle Key Ring", "Trousseau du Château de Ganon", "Ganons Schloss Schlüsselanhänger" },           ITEMTYPE_SMALLKEY,          0xDD,               true,  &logic->GanonsCastleKeys,    RHT_GANONS_CASTLE_KEY_RING, RG_GANONS_CASTLE_KEY_RING,      OBJECT_GI_KEY,          GID_KEY_SMALL,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_GANONS_CASTLE_KEY_RING] =              Item(RG_GANONS_CASTLE_KEY_RING,           Text{ "Ganon's Castle Key Ring", "Trousseau du Château de Ganon", "Ganons Schloss Schlüsselanhänger" },           ITEMTYPE_SMALLKEY,          0xDD,                 true,  LOGIC_GANONS_CASTLE_KEYS,           RHT_GANONS_CASTLE_KEY_RING,            RG_GANONS_CASTLE_KEY_RING,            OBJECT_GI_KEY,          GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_GANONS_CASTLE_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
     // Dungeon Rewards
-    itemTable[RG_KOKIRI_EMERALD] =                      Item(RG_KOKIRI_EMERALD,                   Text{ "Kokiri's Emerald", "Émeraude Kokiri", "Kokiri-Smaragd" },                                                  ITEMTYPE_DUNGEONREWARD,     0xCB,               true,  &logic->KokiriEmerald,       RHT_KOKIRI_EMERALD,         ITEM_KOKIRI_EMERALD,            OBJECT_GI_JEWEL,        GID_KOKIRI_EMERALD, 0x80,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_GORON_RUBY] =                          Item(RG_GORON_RUBY,                       Text{ "Goron's Ruby", "Rubis Goron", "Goronen-Rubin" },                                                           ITEMTYPE_DUNGEONREWARD,     0xCC,               true,  &logic->GoronRuby,           RHT_GORON_RUBY,             ITEM_GORON_RUBY,                OBJECT_GI_JEWEL,        GID_GORON_RUBY,     0x81,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_ZORA_SAPPHIRE] =                       Item(RG_ZORA_SAPPHIRE,                    Text{ "Zora's Sapphire", "Saphir Zora", "Zora-Saphir" },                                                          ITEMTYPE_DUNGEONREWARD,     0xCD,               true,  &logic->ZoraSapphire,        RHT_ZORA_SAPPHIRE,          ITEM_ZORA_SAPPHIRE,             OBJECT_GI_JEWEL,        GID_ZORA_SAPPHIRE,  0x82,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_FOREST_MEDALLION] =                    Item(RG_FOREST_MEDALLION,                 Text{ "Forest Medallion", "Médaillon de la Forêt", "Wald Medaillon" },                                            ITEMTYPE_DUNGEONREWARD,     0xCE,               true,  &logic->ForestMedallion,     RHT_FOREST_MEDALLION,       ITEM_MEDALLION_FOREST,          OBJECT_GI_MEDAL,        GID_MEDALLION_FOREST,0x3E,                       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_FIRE_MEDALLION] =                      Item(RG_FIRE_MEDALLION,                   Text{ "Fire Medallion", "Médaillon du Feu", "Feuer Medaillon" },                                                  ITEMTYPE_DUNGEONREWARD,     0xCF,               true,  &logic->FireMedallion,       RHT_FIRE_MEDALLION,         ITEM_MEDALLION_FIRE,            OBJECT_GI_MEDAL,        GID_MEDALLION_FIRE, 0x3C,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_WATER_MEDALLION] =                     Item(RG_WATER_MEDALLION,                  Text{ "Water Medallion", "Médaillon de l'Eau", "Wasser Medaillon" },                                              ITEMTYPE_DUNGEONREWARD,     0xD0,               true,  &logic->WaterMedallion,      RHT_WATER_MEDALLION,        ITEM_MEDALLION_WATER,           OBJECT_GI_MEDAL,        GID_MEDALLION_WATER,0x3D,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_SPIRIT_MEDALLION] =                    Item(RG_SPIRIT_MEDALLION,                 Text{ "Spirit Medallion", "Médaillon de l'Esprit", "Geist Medaillon" },                                           ITEMTYPE_DUNGEONREWARD,     0xD1,               true,  &logic->SpiritMedallion,     RHT_SPIRIT_MEDALLION,       ITEM_MEDALLION_SPIRIT,          OBJECT_GI_MEDAL,        GID_MEDALLION_SPIRIT,0x3F,                       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_SHADOW_MEDALLION] =                    Item(RG_SHADOW_MEDALLION,                 Text{ "Shadow Medallion", "Médaillon de l'Ombre", "Schatten Medaillon" },                                         ITEMTYPE_DUNGEONREWARD,     0xD2,               true,  &logic->ShadowMedallion,     RHT_SHADOW_MEDALLION,       ITEM_MEDALLION_SHADOW,          OBJECT_GI_MEDAL,        GID_MEDALLION_SHADOW,0x41,                       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_LIGHT_MEDALLION] =                     Item(RG_LIGHT_MEDALLION,                  Text{ "Light Medallion", "Médaillon de la Lumière", "Licht Medaillon" },                                          ITEMTYPE_DUNGEONREWARD,     0xD3,               true,  &logic->LightMedallion,      RHT_LIGHT_MEDALLION,        ITEM_MEDALLION_LIGHT,           OBJECT_GI_MEDAL,        GID_MEDALLION_LIGHT,0x40,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_KOKIRI_EMERALD] =                      Item(RG_KOKIRI_EMERALD,                   Text{ "Kokiri's Emerald", "Émeraude Kokiri", "Kokiri-Smaragd" },                                                  ITEMTYPE_DUNGEONREWARD,     0xCB,                 true,  LOGIC_KOKIRI_EMERALD,          RHT_KOKIRI_EMERALD,           ITEM_KOKIRI_EMERALD,            OBJECT_GI_JEWEL,        GID_KOKIRI_EMERALD, 0x80,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_GORON_RUBY] =                          Item(RG_GORON_RUBY,                       Text{ "Goron's Ruby", "Rubis Goron", "Goronen-Rubin" },                                                           ITEMTYPE_DUNGEONREWARD,     0xCC,                 true,  LOGIC_GORON_RUBY,              RHT_GORON_RUBY,               ITEM_GORON_RUBY,                OBJECT_GI_JEWEL,        GID_GORON_RUBY,     0x81,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_ZORA_SAPPHIRE] =                       Item(RG_ZORA_SAPPHIRE,                    Text{ "Zora's Sapphire", "Saphir Zora", "Zora-Saphir" },                                                          ITEMTYPE_DUNGEONREWARD,     0xCD,                 true,  LOGIC_ZORA_SAPPHIRE,           RHT_ZORA_SAPPHIRE,            ITEM_ZORA_SAPPHIRE,             OBJECT_GI_JEWEL,        GID_ZORA_SAPPHIRE,  0x82,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_FOREST_MEDALLION] =                    Item(RG_FOREST_MEDALLION,                 Text{ "Forest Medallion", "Médaillon de la Forêt", "Wald Medaillon" },                                            ITEMTYPE_DUNGEONREWARD,     0xCE,                 true,  LOGIC_FOREST_MEDALLION,        RHT_FOREST_MEDALLION,         ITEM_MEDALLION_FOREST,          OBJECT_GI_MEDAL,        GID_MEDALLION_FOREST,0x3E,                       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_FIRE_MEDALLION] =                      Item(RG_FIRE_MEDALLION,                   Text{ "Fire Medallion", "Médaillon du Feu", "Feuer Medaillon" },                                                  ITEMTYPE_DUNGEONREWARD,     0xCF,                 true,  LOGIC_FIRE_MEDALLION,          RHT_FIRE_MEDALLION,           ITEM_MEDALLION_FIRE,            OBJECT_GI_MEDAL,        GID_MEDALLION_FIRE, 0x3C,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_WATER_MEDALLION] =                     Item(RG_WATER_MEDALLION,                  Text{ "Water Medallion", "Médaillon de l'Eau", "Wasser Medaillon" },                                              ITEMTYPE_DUNGEONREWARD,     0xD0,                 true,  LOGIC_WATER_MEDALLION,         RHT_WATER_MEDALLION,          ITEM_MEDALLION_WATER,           OBJECT_GI_MEDAL,        GID_MEDALLION_WATER,0x3D,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_SPIRIT_MEDALLION] =                    Item(RG_SPIRIT_MEDALLION,                 Text{ "Spirit Medallion", "Médaillon de l'Esprit", "Geist Medaillon" },                                           ITEMTYPE_DUNGEONREWARD,     0xD1,                 true,  LOGIC_SPIRIT_MEDALLION,        RHT_SPIRIT_MEDALLION,         ITEM_MEDALLION_SPIRIT,          OBJECT_GI_MEDAL,        GID_MEDALLION_SPIRIT,0x3F,                       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_SHADOW_MEDALLION] =                    Item(RG_SHADOW_MEDALLION,                 Text{ "Shadow Medallion", "Médaillon de l'Ombre", "Schatten Medaillon" },                                         ITEMTYPE_DUNGEONREWARD,     0xD2,                 true,  LOGIC_SHADOW_MEDALLION,        RHT_SHADOW_MEDALLION,         ITEM_MEDALLION_SHADOW,          OBJECT_GI_MEDAL,        GID_MEDALLION_SHADOW,0x41,                       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_LIGHT_MEDALLION] =                     Item(RG_LIGHT_MEDALLION,                  Text{ "Light Medallion", "Médaillon de la Lumière", "Licht Medaillon" },                                          ITEMTYPE_DUNGEONREWARD,     0xD3,                 true,  LOGIC_LIGHT_MEDALLION,         RHT_LIGHT_MEDALLION,          ITEM_MEDALLION_LIGHT,           OBJECT_GI_MEDAL,        GID_MEDALLION_LIGHT,0x40,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
     // Generic Items
-    itemTable[RG_RECOVERY_HEART] =                      Item(RG_RECOVERY_HEART,                   Text{ "Recovery Heart", "Coeur de Vie", "Herz" },                                                                 ITEMTYPE_ITEM,              GI_HEART,           false, &logic->noVariable,          RHT_RECOVERY_HEART,         ITEM_HEART,                     OBJECT_GI_HEART,        GID_HEART,          0x55,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_GREEN_RUPEE] =                         Item(RG_GREEN_RUPEE,                      Text{ "Green Rupee", "Rubis Vert", "Grüne Rupie" },                                                               ITEMTYPE_ITEM,              GI_RUPEE_GREEN,     false, &logic->noVariable,          RHT_GREEN_RUPEE,            ITEM_RUPEE_GREEN,               OBJECT_GI_RUPY,         GID_RUPEE_GREEN,    0x6F,                        0x00, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_GREG_RUPEE] =                          Item(RG_GREG_RUPEE,                       Text{ "Greg the Green Rupee", "Rubis Greg", "Greg Rupie" },                                                       ITEMTYPE_ITEM,              GI_RUPEE_GREEN,     true,  &logic->Greg,                RHT_GREG_RUPEE,             RG_GREG_RUPEE,                  OBJECT_GI_RUPY,         GID_RUPEE_GREEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_BLUE_RUPEE] =                          Item(RG_BLUE_RUPEE,                       Text{ "Blue Rupee", "Rubis Bleu", "Blaue Rupie" },                                                                ITEMTYPE_ITEM,              GI_RUPEE_BLUE,      false, &logic->noVariable,          RHT_BLUE_RUPEE,             ITEM_RUPEE_BLUE,                OBJECT_GI_RUPY,         GID_RUPEE_BLUE,     0xCC,                        0x01, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_RED_RUPEE] =                           Item(RG_RED_RUPEE,                        Text{ "Red Rupee", "Rubis Rouge", "Rote Rupie" },                                                                 ITEMTYPE_ITEM,              GI_RUPEE_RED,       false, &logic->noVariable,          RHT_RED_RUPEE,              ITEM_RUPEE_RED,                 OBJECT_GI_RUPY,         GID_RUPEE_RED,      0xF0,                        0x02, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_PURPLE_RUPEE] =                        Item(RG_PURPLE_RUPEE,                     Text{ "Purple Rupee", "Rubis Pourpre", "Lila Rupie" },                                                            ITEMTYPE_ITEM,              GI_RUPEE_PURPLE,    false, &logic->noVariable,          RHT_PURPLE_RUPEE,           ITEM_RUPEE_PURPLE,              OBJECT_GI_RUPY,         GID_RUPEE_PURPLE,   0xF1,                        0x14, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_HUGE_RUPEE] =                          Item(RG_HUGE_RUPEE,                       Text{ "Huge Rupee", "Énorme Rubis", "Riesige Rupie" },                                                            ITEMTYPE_ITEM,              GI_RUPEE_GOLD,      false, &logic->noVariable,          RHT_HUGE_RUPEE,             ITEM_RUPEE_GOLD,                OBJECT_GI_RUPY,         GID_RUPEE_GOLD,     0xF2,                        0x13, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_PIECE_OF_HEART] =                      Item(RG_PIECE_OF_HEART,                   Text{ "Piece of Heart", "Quart de Coeur", "Herzstück" },                                                          ITEMTYPE_ITEM,              GI_HEART_PIECE,     true,  &logic->PieceOfHeart,        RHT_PIECE_OF_HEART,         ITEM_HEART_PIECE_2,             OBJECT_GI_HEARTS,       GID_HEART_PIECE,    0xC2,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_HEART_CONTAINER] =                     Item(RG_HEART_CONTAINER,                  Text{ "Heart Container", "Réceptacle de Coeur", "Herz-Container" },                                               ITEMTYPE_ITEM,              GI_HEART_CONTAINER_2,true, &logic->HeartContainer,      RHT_HEART_CONTAINER,        ITEM_HEART_CONTAINER,           OBJECT_GI_HEARTS,       GID_HEART_CONTAINER,0xC6,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_ICE_TRAP] =                            Item(RG_ICE_TRAP,                         Text{ "Ice Trap", "Piège de Glace", "Eisfalle" },                                                                 ITEMTYPE_ITEM,              RG_ICE_TRAP,        false, &logic->noVariable,          RHT_ICE_TRAP,               RG_ICE_TRAP,                    OBJECT_GI_RUPY,         GID_RUPEE_GOLD,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_MILK] =                                Item(RG_MILK,                             Text{ "Milk", "Lait", "Milch" },                                                                                  ITEMTYPE_ITEM,              GI_MILK,            false, &logic->noVariable,          RHT_NONE,                   ITEM_MILK,                      OBJECT_GI_MILK,         GID_MILK,           0x98,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_FISH] =                                Item(RG_FISH,                             Text{ "Fish", "Poisson", "Pez" },                                                                                 ITEMTYPE_ITEM,              GI_FISH,            false, &logic->noVariable,          RHT_NONE,                   ITEM_FISH,                      OBJECT_GI_FISH,         GID_FISH,           0x47,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_RECOVERY_HEART] =                      Item(RG_RECOVERY_HEART,                   Text{ "Recovery Heart", "Coeur de Vie", "Herz" },                                                                 ITEMTYPE_ITEM,              GI_HEART,             false, LOGIC_NONE,                    RHT_RECOVERY_HEART,           ITEM_HEART,                     OBJECT_GI_HEART,        GID_HEART,          0x55,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_GREEN_RUPEE] =                         Item(RG_GREEN_RUPEE,                      Text{ "Green Rupee", "Rubis Vert", "Grüne Rupie" },                                                               ITEMTYPE_ITEM,              GI_RUPEE_GREEN,       false, LOGIC_NONE,                    RHT_GREEN_RUPEE,              ITEM_RUPEE_GREEN,               OBJECT_GI_RUPY,         GID_RUPEE_GREEN,    0x6F,                        0x00, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_GREG_RUPEE] =                          Item(RG_GREG_RUPEE,                       Text{ "Greg the Green Rupee", "Rubis Greg", "Greg Rupie" },                                                       ITEMTYPE_ITEM,              GI_RUPEE_GREEN,       true,  LOGIC_GREG,                    RHT_GREG_RUPEE,               RG_GREG_RUPEE,                  OBJECT_GI_RUPY,         GID_RUPEE_GREEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BLUE_RUPEE] =                          Item(RG_BLUE_RUPEE,                       Text{ "Blue Rupee", "Rubis Bleu", "Blaue Rupie" },                                                                ITEMTYPE_ITEM,              GI_RUPEE_BLUE,        false, LOGIC_NONE,                    RHT_BLUE_RUPEE,               ITEM_RUPEE_BLUE,                OBJECT_GI_RUPY,         GID_RUPEE_BLUE,     0xCC,                        0x01, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_RED_RUPEE] =                           Item(RG_RED_RUPEE,                        Text{ "Red Rupee", "Rubis Rouge", "Rote Rupie" },                                                                 ITEMTYPE_ITEM,              GI_RUPEE_RED,         false, LOGIC_NONE,                    RHT_RED_RUPEE,                ITEM_RUPEE_RED,                 OBJECT_GI_RUPY,         GID_RUPEE_RED,      0xF0,                        0x02, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_PURPLE_RUPEE] =                        Item(RG_PURPLE_RUPEE,                     Text{ "Purple Rupee", "Rubis Pourpre", "Lila Rupie" },                                                            ITEMTYPE_ITEM,              GI_RUPEE_PURPLE,      false, LOGIC_NONE,                    RHT_PURPLE_RUPEE,             ITEM_RUPEE_PURPLE,              OBJECT_GI_RUPY,         GID_RUPEE_PURPLE,   0xF1,                        0x14, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_HUGE_RUPEE] =                          Item(RG_HUGE_RUPEE,                       Text{ "Huge Rupee", "Énorme Rubis", "Riesige Rupie" },                                                            ITEMTYPE_ITEM,              GI_RUPEE_GOLD,        false, LOGIC_NONE,                    RHT_HUGE_RUPEE,               ITEM_RUPEE_GOLD,                OBJECT_GI_RUPY,         GID_RUPEE_GOLD,     0xF2,                        0x13, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_PIECE_OF_HEART] =                      Item(RG_PIECE_OF_HEART,                   Text{ "Piece of Heart", "Quart de Coeur", "Herzstück" },                                                          ITEMTYPE_ITEM,              GI_HEART_PIECE,       true,  LOGIC_PIECE_OF_HEART,          RHT_PIECE_OF_HEART,           ITEM_HEART_PIECE_2,             OBJECT_GI_HEARTS,       GID_HEART_PIECE,    0xC2,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_HEART_CONTAINER] =                     Item(RG_HEART_CONTAINER,                  Text{ "Heart Container", "Réceptacle de Coeur", "Herz-Container" },                                               ITEMTYPE_ITEM,              GI_HEART_CONTAINER_2, true,  LOGIC_HEART_CONTAINER,         RHT_HEART_CONTAINER,          ITEM_HEART_CONTAINER,           OBJECT_GI_HEARTS,       GID_HEART_CONTAINER,0xC6,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_ICE_TRAP] =                            Item(RG_ICE_TRAP,                         Text{ "Ice Trap", "Piège de Glace", "Eisfalle" },                                                                 ITEMTYPE_ITEM,              RG_ICE_TRAP,          false, LOGIC_NONE,                    RHT_ICE_TRAP,                 RG_ICE_TRAP,                    OBJECT_GI_RUPY,         GID_RUPEE_GOLD,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_MILK] =                                Item(RG_MILK,                             Text{ "Milk", "Lait", "Milch" },                                                                                  ITEMTYPE_ITEM,              GI_MILK,              false, LOGIC_NONE,                    RHT_NONE,                     ITEM_MILK,                      OBJECT_GI_MILK,         GID_MILK,           0x98,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_FISH] =                                Item(RG_FISH,                             Text{ "Fish", "Poisson", "Pez" },                                                                                 ITEMTYPE_ITEM,              GI_FISH,              false, LOGIC_NONE,                    RHT_NONE,                     ITEM_FISH,                      OBJECT_GI_FISH,         GID_FISH,           0x47,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
     // Refills
-    itemTable[RG_BOMBS_5] =                             Item(RG_BOMBS_5,                          Text{ "Bombs (5)", "Bombes (5)", "Bomben (5)" },                                                                  ITEMTYPE_REFILL,            GI_BOMBS_5,         false, &logic->noVariable,          RHT_BOMBS_5,                ITEM_BOMBS_5,                   OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_BOMBS_10] =                            Item(RG_BOMBS_10,                         Text{ "Bombs (10)", "Bombes (10)", "Bomben (10)" },                                                               ITEMTYPE_REFILL,            GI_BOMBS_10,        false, &logic->noVariable,          RHT_BOMBS_10,               ITEM_BOMBS_10,                  OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_BOMBS_20] =                            Item(RG_BOMBS_20,                         Text{ "Bombs (20)", "Bombes (20)", "Bomben (20)" },                                                               ITEMTYPE_REFILL,            GI_BOMBS_20,        false, &logic->noVariable,          RHT_BOMBS_20,               ITEM_BOMBS_20,                  OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_BOMBCHU_5] =                           Item(RG_BOMBCHU_5,                        Text{ "Bombchus (5)", "Missiles (5)", "Bombchus (5)" },                                                           ITEMTYPE_REFILL,            GI_BOMBCHUS_5,      true,  &logic->Bombchus5,           RHT_BOMBCHU_5,              ITEM_BOMBCHUS_5,                OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_BOMBCHU_10] =                          Item(RG_BOMBCHU_10,                       Text{ "Bombchus (10)", "Missiles (10)", "Bombchus (10)" },                                                        ITEMTYPE_REFILL,            GI_BOMBCHUS_10,     true,  &logic->Bombchus10,          RHT_BOMBCHU_10,             ITEM_BOMBCHU,                   OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_BOMBCHU_20] =                          Item(RG_BOMBCHU_20,                       Text{ "Bombchus (20)", "Missiles (20)", "Bombchus (20)" },                                                        ITEMTYPE_REFILL,            GI_BOMBCHUS_20,     true,  &logic->Bombchus20,          RHT_BOMBCHU_20,             ITEM_BOMBCHUS_20,               OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_BOMBCHU_DROP] =                        Item(RG_BOMBCHU_DROP,                     Text{ "Bombchu Drop", "Drop Missiles", "Bombchus" },                                                              ITEMTYPE_DROP,              GI_BOMBCHUS_10,     true,  &logic->BombchuDrop,         RHT_NONE,                   ITEM_BOMBCHU,                   OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_ARROWS_5] =                            Item(RG_ARROWS_5,                         Text{ "Arrows (5)", "Flèches (5)", "Pfeile (5)" },                                                                ITEMTYPE_REFILL,            GI_ARROWS_SMALL,    false, &logic->noVariable,          RHT_ARROWS_5,               ITEM_ARROWS_SMALL,              OBJECT_GI_ARROW,        GID_ARROWS_SMALL,   0xE6,                        0x48, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_ARROWS_10] =                           Item(RG_ARROWS_10,                        Text{ "Arrows (10)", "Flèches (10)", "Pfeile (10)" },                                                             ITEMTYPE_REFILL,            GI_ARROWS_MEDIUM,   false, &logic->noVariable,          RHT_ARROWS_10,              ITEM_ARROWS_MEDIUM,             OBJECT_GI_ARROW,        GID_ARROWS_MEDIUM,  0xE6,                        0x49, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_ARROWS_30] =                           Item(RG_ARROWS_30,                        Text{ "Arrows (30)", "Flèches (30)", "Pfeile (30)" },                                                             ITEMTYPE_REFILL,            GI_ARROWS_LARGE,    false, &logic->noVariable,          RHT_ARROWS_30,              ITEM_ARROWS_LARGE,              OBJECT_GI_ARROW,        GID_ARROWS_LARGE,   0xE6,                        0x4A, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_DEKU_NUTS_5] =                         Item(RG_DEKU_NUTS_5,                      Text{ "Deku Nuts (5)", "Noix Mojo (5)", "Deku-Nüsse (5)" },                                                       ITEMTYPE_REFILL,            GI_NUTS_5,          false, &logic->noVariable,          RHT_DEKU_NUTS_5,            ITEM_NUTS_5,                    OBJECT_GI_NUTS,         GID_NUTS,           0x34,                        0x0C, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_DEKU_NUTS_10] =                        Item(RG_DEKU_NUTS_10,                     Text{ "Deku Nuts (10)", "Noix Mojo (10)", "Deku-Nüsse (10)" },                                                    ITEMTYPE_REFILL,            GI_NUTS_10,         false, &logic->noVariable,          RHT_DEKU_NUTS_10,           ITEM_NUTS_10,                   OBJECT_GI_NUTS,         GID_NUTS,           0x34,                        0x0C, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_DEKU_SEEDS_30] =                       Item(RG_DEKU_SEEDS_30,                    Text{ "Deku Seeds (30)", "Graines Mojo (30)", "Deku-Samen (30)" },                                                ITEMTYPE_REFILL,            GI_SEEDS_30,        false, &logic->noVariable,          RHT_DEKU_SEEDS_30,          ITEM_SEEDS_30,                  OBJECT_GI_SEED,         GID_SEEDS,          0xDC,                        0x50, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_DEKU_STICK_1] =                        Item(RG_DEKU_STICK_1,                     Text{ "Deku Stick (1)", "Bâton Mojo (1)", "Deku-Stick (1)" },                                                     ITEMTYPE_REFILL,            GI_STICKS_1,        false, &logic->noVariable,          RHT_DEKU_STICK_1,           ITEM_STICK,                     OBJECT_GI_STICK,        GID_STICK,          0x37,                        0x0D, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_RED_POTION_REFILL] =                   Item(RG_RED_POTION_REFILL,                Text{ "Red Potion Refill", "Recharge de Potion Rouge", "Rotes Elixier Nachfüllpackung" },                         ITEMTYPE_REFILL,            GI_POTION_RED,      false, &logic->noVariable,          RHT_NONE,                   ITEM_POTION_RED,                OBJECT_GI_LIQUID,       GID_POTION_RED,     0x43,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_GREEN_POTION_REFILL] =                 Item(RG_GREEN_POTION_REFILL,              Text{ "Green Potion Refill", "Recharge de Potion Verte", "Grünes Elixier Nachfüllpackung" },                      ITEMTYPE_REFILL,            GI_POTION_GREEN,    false, &logic->noVariable,          RHT_NONE,                   ITEM_POTION_GREEN,              OBJECT_GI_LIQUID,       GID_POTION_GREEN,   0x44,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_BLUE_POTION_REFILL] =                  Item(RG_BLUE_POTION_REFILL,               Text{ "Blue Potion Refill", "Recharge de Potion Bleue", "Blaues Elixier Nachfüllpackung" },                       ITEMTYPE_REFILL,            GI_POTION_BLUE,     false, &logic->noVariable,          RHT_NONE,                   ITEM_POTION_BLUE,               OBJECT_GI_LIQUID,       GID_POTION_BLUE,    0x45,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_BOMBS_5] =                             Item(RG_BOMBS_5,                          Text{ "Bombs (5)", "Bombes (5)", "Bomben (5)" },                                                                  ITEMTYPE_REFILL,            GI_BOMBS_5,           false, LOGIC_NONE,                    RHT_BOMBS_5,                  ITEM_BOMBS_5,                   OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_BOMBS_10] =                            Item(RG_BOMBS_10,                         Text{ "Bombs (10)", "Bombes (10)", "Bomben (10)" },                                                               ITEMTYPE_REFILL,            GI_BOMBS_10,          false, LOGIC_NONE,                    RHT_BOMBS_10,                 ITEM_BOMBS_10,                  OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_BOMBS_20] =                            Item(RG_BOMBS_20,                         Text{ "Bombs (20)", "Bombes (20)", "Bomben (20)" },                                                               ITEMTYPE_REFILL,            GI_BOMBS_20,          false, LOGIC_NONE,                    RHT_BOMBS_20,                 ITEM_BOMBS_20,                  OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_BOMBCHU_5] =                           Item(RG_BOMBCHU_5,                        Text{ "Bombchus (5)", "Missiles (5)", "Bombchus (5)" },                                                           ITEMTYPE_REFILL,            GI_BOMBCHUS_5,        true,  LOGIC_BOMBCHUS_5,              RHT_BOMBCHU_5,                ITEM_BOMBCHUS_5,                OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_BOMBCHU_10] =                          Item(RG_BOMBCHU_10,                       Text{ "Bombchus (10)", "Missiles (10)", "Bombchus (10)" },                                                        ITEMTYPE_REFILL,            GI_BOMBCHUS_10,       true,  LOGIC_BOMBCHUS_10,             RHT_BOMBCHU_10,               ITEM_BOMBCHU,                   OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_BOMBCHU_20] =                          Item(RG_BOMBCHU_20,                       Text{ "Bombchus (20)", "Missiles (20)", "Bombchus (20)" },                                                        ITEMTYPE_REFILL,            GI_BOMBCHUS_20,       true,  LOGIC_BOMBCHUS_20,             RHT_BOMBCHU_20,               ITEM_BOMBCHUS_20,               OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_BOMBCHU_DROP] =                        Item(RG_BOMBCHU_DROP,                     Text{ "Bombchu Drop", "Drop Missiles", "Bombchus" },                                                              ITEMTYPE_DROP,              GI_BOMBCHUS_10,       true,  LOGIC_BOMBCHU_DROP,            RHT_NONE,                     ITEM_BOMBCHU,                   OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_ARROWS_5] =                            Item(RG_ARROWS_5,                         Text{ "Arrows (5)", "Flèches (5)", "Pfeile (5)" },                                                                ITEMTYPE_REFILL,            GI_ARROWS_SMALL,      false, LOGIC_NONE,                    RHT_ARROWS_5,                 ITEM_ARROWS_SMALL,              OBJECT_GI_ARROW,        GID_ARROWS_SMALL,   0xE6,                        0x48, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_ARROWS_10] =                           Item(RG_ARROWS_10,                        Text{ "Arrows (10)", "Flèches (10)", "Pfeile (10)" },                                                             ITEMTYPE_REFILL,            GI_ARROWS_MEDIUM,     false, LOGIC_NONE,                    RHT_ARROWS_10,                ITEM_ARROWS_MEDIUM,             OBJECT_GI_ARROW,        GID_ARROWS_MEDIUM,  0xE6,                        0x49, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_ARROWS_30] =                           Item(RG_ARROWS_30,                        Text{ "Arrows (30)", "Flèches (30)", "Pfeile (30)" },                                                             ITEMTYPE_REFILL,            GI_ARROWS_LARGE,      false, LOGIC_NONE,                    RHT_ARROWS_30,                ITEM_ARROWS_LARGE,              OBJECT_GI_ARROW,        GID_ARROWS_LARGE,   0xE6,                        0x4A, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_DEKU_NUTS_5] =                         Item(RG_DEKU_NUTS_5,                      Text{ "Deku Nuts (5)", "Noix Mojo (5)", "Deku-Nüsse (5)" },                                                       ITEMTYPE_REFILL,            GI_NUTS_5,            false, LOGIC_NONE,                    RHT_DEKU_NUTS_5,              ITEM_NUTS_5,                    OBJECT_GI_NUTS,         GID_NUTS,           0x34,                        0x0C, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_DEKU_NUTS_10] =                        Item(RG_DEKU_NUTS_10,                     Text{ "Deku Nuts (10)", "Noix Mojo (10)", "Deku-Nüsse (10)" },                                                    ITEMTYPE_REFILL,            GI_NUTS_10,           false, LOGIC_NONE,                    RHT_DEKU_NUTS_10,             ITEM_NUTS_10,                   OBJECT_GI_NUTS,         GID_NUTS,           0x34,                        0x0C, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_DEKU_SEEDS_30] =                       Item(RG_DEKU_SEEDS_30,                    Text{ "Deku Seeds (30)", "Graines Mojo (30)", "Deku-Samen (30)" },                                                ITEMTYPE_REFILL,            GI_SEEDS_30,          false, LOGIC_NONE,                    RHT_DEKU_SEEDS_30,            ITEM_SEEDS_30,                  OBJECT_GI_SEED,         GID_SEEDS,          0xDC,                        0x50, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_DEKU_STICK_1] =                        Item(RG_DEKU_STICK_1,                     Text{ "Deku Stick (1)", "Bâton Mojo (1)", "Deku-Stick (1)" },                                                     ITEMTYPE_REFILL,            GI_STICKS_1,          false, LOGIC_NONE,                    RHT_DEKU_STICK_1,             ITEM_STICK,                     OBJECT_GI_STICK,        GID_STICK,          0x37,                        0x0D, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_RED_POTION_REFILL] =                   Item(RG_RED_POTION_REFILL,                Text{ "Red Potion Refill", "Recharge de Potion Rouge", "Rotes Elixier Nachfüllpackung" },                         ITEMTYPE_REFILL,            GI_POTION_RED,        false, LOGIC_NONE,                    RHT_NONE,                     ITEM_POTION_RED,                OBJECT_GI_LIQUID,       GID_POTION_RED,     0x43,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_GREEN_POTION_REFILL] =                 Item(RG_GREEN_POTION_REFILL,              Text{ "Green Potion Refill", "Recharge de Potion Verte", "Grünes Elixier Nachfüllpackung" },                      ITEMTYPE_REFILL,            GI_POTION_GREEN,      false, LOGIC_NONE,                    RHT_NONE,                     ITEM_POTION_GREEN,              OBJECT_GI_LIQUID,       GID_POTION_GREEN,   0x44,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_BLUE_POTION_REFILL] =                  Item(RG_BLUE_POTION_REFILL,               Text{ "Blue Potion Refill", "Recharge de Potion Bleue", "Blaues Elixier Nachfüllpackung" },                       ITEMTYPE_REFILL,            GI_POTION_BLUE,       false, LOGIC_NONE,                    RHT_NONE,                     ITEM_POTION_BLUE,               OBJECT_GI_LIQUID,       GID_POTION_BLUE,    0x45,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
     // Treasure Game
-    itemTable[RG_TREASURE_GAME_HEART] =                 Item(RG_TREASURE_GAME_HEART,              Text{ "Piece of Heart (WINNER)", "Quart de Coeur (Chasse-aux-Trésors)", "Herzstück (Schatztruhen-Minispiel)" },   ITEMTYPE_ITEM,              GI_HEART_PIECE_WIN, true,  &logic->PieceOfHeart,        RHT_TREASURE_GAME_HEART,    ITEM_HEART_PIECE_2,             OBJECT_GI_HEARTS,       GID_HEART_PIECE,    0xFA,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_TREASURE_GAME_GREEN_RUPEE] =           Item(RG_TREASURE_GAME_GREEN_RUPEE,        Text{ "Green Rupee (LOSER)", "Rubis Vert (Chasse-aux-Trésors)", "Grüne Rupie (Schatztruhe-Minispiel)" },          ITEMTYPE_ITEM,              GI_RUPEE_GREEN_LOSE,false, &logic->noVariable,          RHT_TREASURE_GAME_GREEN_RUPEE,ITEM_RUPEE_GREEN,             OBJECT_GI_RUPY,         GID_RUPEE_GREEN,    0xF4,                        0x00, CHEST_ANIM_SHORT, ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_TREASURE_GAME_HEART] =                 Item(RG_TREASURE_GAME_HEART,              Text{ "Piece of Heart (WINNER)", "Quart de Coeur (Chasse-aux-Trésors)", "Herzstück (Schatztruhen-Minispiel)" },   ITEMTYPE_ITEM,              GI_HEART_PIECE_WIN,   true,  LOGIC_PIECE_OF_HEART,          RHT_TREASURE_GAME_HEART,      ITEM_HEART_PIECE_2,             OBJECT_GI_HEARTS,       GID_HEART_PIECE,    0xFA,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_TREASURE_GAME_GREEN_RUPEE] =           Item(RG_TREASURE_GAME_GREEN_RUPEE,        Text{ "Green Rupee (LOSER)", "Rubis Vert (Chasse-aux-Trésors)", "Grüne Rupie (Schatztruhe-Minispiel)" },          ITEMTYPE_ITEM,              GI_RUPEE_GREEN_LOSE,  false, LOGIC_NONE,                    RHT_TREASURE_GAME_GREEN_RUPEE,ITEM_RUPEE_GREEN,               OBJECT_GI_RUPY,         GID_RUPEE_GREEN,    0xF4,                        0x00, CHEST_ANIM_SHORT, ITEM_CATEGORY_MAJOR,  MOD_NONE);
     // Shop
-    itemTable[RG_BUY_DEKU_NUTS_5] =                     Item(RG_BUY_DEKU_NUTS_5,                  Text{ "Buy Deku Nut (5)", "Acheter: Noix Mojo (5)", "Deku-Nuss kaufen (5)" },                                     ITEMTYPE_SHOP,              GI_NUTS_5_2,        true,  &logic->Nuts,                RHT_DEKU_NUTS_5,            ITEM_NUTS_5,                    OBJECT_GI_NUTS,         GID_NUTS,           0x34,                        0x0C, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 15);
-    itemTable[RG_BUY_ARROWS_30] =                       Item(RG_BUY_ARROWS_30,                    Text{ "Buy Arrows (30)", "Acheter: Flèches (30)", "Pfeile kaufen (30)" },                                         ITEMTYPE_SHOP,              GI_ARROWS_MEDIUM,   true,  &logic->BuyArrow,            RHT_ARROWS_30,              ITEM_ARROWS_MEDIUM,             OBJECT_GI_ARROW,        GID_ARROWS_MEDIUM,  0xE6,                        0x49, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 60);
-    itemTable[RG_BUY_ARROWS_50] =                       Item(RG_BUY_ARROWS_50,                    Text{ "Buy Arrows (50)", "Acheter: Flèches (50)", "Pfeile kaufen (50)" },                                         ITEMTYPE_SHOP,              GI_ARROWS_LARGE,    true,  &logic->BuyArrow,            RHT_ARROWS_30,              ITEM_ARROWS_LARGE,              OBJECT_GI_ARROW,        GID_ARROWS_LARGE,   0xE6,                        0x4A, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 90);
-    itemTable[RG_BUY_BOMBS_525] =                       Item(RG_BUY_BOMBS_525,                    Text{ "Buy Bombs (5) [25]", "Acheter: Bombes (5) [25]", "Bomben kaufen (5) [25]" },                               ITEMTYPE_SHOP,              GI_BOMBS_5,         true,  &logic->BuyBomb,             RHT_BOMBS_5,                ITEM_BOMBS_5,                   OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 25);
-    itemTable[RG_BUY_DEKU_NUTS_10] =                    Item(RG_BUY_DEKU_NUTS_10,                 Text{ "Buy Deku Nut (10)", "Acheter: Noix Mojo (10)", "Deku-Nuss kaufen (10)" },                                  ITEMTYPE_SHOP,              GI_NUTS_10,         true,  &logic->Nuts,                RHT_DEKU_NUTS_10,           ITEM_NUTS_10,                   OBJECT_GI_NUTS,         GID_NUTS,           0x34,                        0x0C, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
-    itemTable[RG_BUY_DEKU_STICK_1] =                    Item(RG_BUY_DEKU_STICK_1,                 Text{ "Buy Deku Stick (1)", "Acheter: Bâton Mojo (1)", "Deku-Stick kaufen (1)" },                                 ITEMTYPE_SHOP,              GI_STICKS_1,        true,  &logic->Sticks,              RHT_DEKU_STICK_1,           ITEM_STICK,                     OBJECT_GI_STICK,        GID_STICK,          0x37,                        0x0D, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 10);
-    itemTable[RG_BUY_BOMBS_10] =                        Item(RG_BUY_BOMBS_10,                     Text{ "Buy Bombs (10)", "Acheter: Bombes (10)", "Bomben kaufen (10)" },                                           ITEMTYPE_SHOP,              GI_BOMBS_10,        true,  &logic->BuyBomb,             RHT_BOMBS_10,               ITEM_BOMBS_10,                  OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 50);
-    itemTable[RG_BUY_FISH] =                            Item(RG_BUY_FISH,                         Text{ "Buy Fish", "Acheter: Poisson", "Fisch kaufen" },                                                           ITEMTYPE_SHOP,              GI_FISH,            true,  &logic->FishAccess,          RHT_BOTTLE_WITH_FISH,       ITEM_FISH,                      OBJECT_GI_FISH,         GID_FISH,           0x47,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 200);
-    itemTable[RG_BUY_RED_POTION_30] =                   Item(RG_BUY_RED_POTION_30,                Text{ "Buy Red Potion [30]", "Acheter: Potion Rouge [30]", "Rotes Elixier kaufen [30]" },                         ITEMTYPE_SHOP,              GI_POTION_RED,      false, &logic->noVariable,          RHT_BOTTLE_WITH_RED_POTION, ITEM_POTION_RED,                OBJECT_GI_LIQUID,       GID_POTION_RED,     0x43,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
-    itemTable[RG_BUY_GREEN_POTION] =                    Item(RG_BUY_GREEN_POTION,                 Text{ "Buy Green Potion", "Acheter: Potion Verte", "Grünes Elixier kaufen" },                                     ITEMTYPE_SHOP,              GI_POTION_GREEN,    true,  &logic->BuyMagicPotion,      RHT_BOTTLE_WITH_GREEN_POTION,ITEM_POTION_GREEN,             OBJECT_GI_LIQUID,       GID_POTION_GREEN,   0x44,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
-    itemTable[RG_BUY_BLUE_POTION] =                     Item(RG_BUY_BLUE_POTION,                  Text{ "Buy Blue Potion", "Acheter: Potion Bleue", "Blaues Elixier kaufen" },                                      ITEMTYPE_SHOP,              GI_POTION_BLUE,     true,  &logic->BuyMagicPotion,      RHT_BOTTLE_WITH_BLUE_POTION,ITEM_POTION_BLUE,               OBJECT_GI_LIQUID,       GID_POTION_BLUE,    0x45,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 100);
-    itemTable[RG_BUY_HYLIAN_SHIELD] =                   Item(RG_BUY_HYLIAN_SHIELD,                Text{ "Buy Hylian Shield", "Acheter: Bouclier Hylien", "Hylianischer Schild kaufen" },                            ITEMTYPE_SHOP,              GI_SHIELD_HYLIAN,   true,  &logic->HylianShield,        RHT_HYLIAN_SHIELD,          ITEM_SHIELD_HYLIAN,             OBJECT_GI_SHIELD_2,     GID_SHIELD_HYLIAN,  0x4D,                        0xA0, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE, false, 80);
-    itemTable[RG_BUY_DEKU_SHIELD] =                     Item(RG_BUY_DEKU_SHIELD,                  Text{ "Buy Deku Shield", "Acheter: Bouclier Mojo", "Deku-Schild kaufen" },                                        ITEMTYPE_SHOP,              GI_SHIELD_DEKU,     true,  &logic->DekuShield,          RHT_DEKU_SHIELD,            ITEM_SHIELD_DEKU,               OBJECT_GI_SHIELD_1,     GID_SHIELD_DEKU,    0x4C,                        0xA0, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE, false, 40);
-    itemTable[RG_BUY_GORON_TUNIC] =                     Item(RG_BUY_GORON_TUNIC,                  Text{ "Buy Goron Tunic", "Acheter: Tunique Goron", "Goronen-Tunika kaufen" },                                     ITEMTYPE_SHOP,              GI_TUNIC_GORON,     true,  &logic->GoronTunic,          RHT_GORON_TUNIC,            ITEM_TUNIC_GORON,               OBJECT_GI_CLOTHES,      GID_TUNIC_GORON,    0x50,                        0xA0, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE, false, 200);
-    itemTable[RG_BUY_ZORA_TUNIC] =                      Item(RG_BUY_ZORA_TUNIC,                   Text{ "Buy Zora Tunic", "Acheter: Tunique Zora", "Zora-Tunika kaufen" },                                          ITEMTYPE_SHOP,              GI_TUNIC_ZORA,      true,  &logic->ZoraTunic,           RHT_ZORA_TUNIC,             ITEM_TUNIC_ZORA,                OBJECT_GI_CLOTHES,      GID_TUNIC_ZORA,     0x51,                        0xA0, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE, false, 300);
-    itemTable[RG_BUY_HEART] =                           Item(RG_BUY_HEART,                        Text{ "Buy Heart", "Acheter: Coeur de Vie", "Herz kaufen" },                                                      ITEMTYPE_SHOP,              GI_HEART,           false, &logic->noVariable,          RHT_RECOVERY_HEART,         ITEM_HEART,                     OBJECT_GI_HEART,        GID_HEART,          0x55,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 10);
-    itemTable[RG_BUY_BOMBCHU_10] =                      Item(RG_BUY_BOMBCHU_10,                   Text{ "Buy Bombchu (10)", "Acheter: Missiles (10)", "Bomchu kaufen (10)" },                                       ITEMTYPE_SHOP,              GI_BOMBCHUS_10,     true,  &logic->BuyBombchus,         RHT_BOMBCHU_10,             ITEM_BOMBCHU,                   OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 99);
-    itemTable[RG_BUY_BOMBCHU_20] =                      Item(RG_BUY_BOMBCHU_20,                   Text{ "Buy Bombchu (20)", "Acheter: Missiles (20)", "Bomchu kaufen (20)" },                                       ITEMTYPE_SHOP,              GI_BOMBCHUS_20,     true,  &logic->BuyBombchus,         RHT_BOMBCHU_20,             ITEM_BOMBCHUS_20,               OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 180);
-    itemTable[RG_BUY_DEKU_SEEDS_30] =                   Item(RG_BUY_DEKU_SEEDS_30,                Text{ "Buy Deku Seeds (30)", "Acheter: Graines Mojo (30)", "Deku-Samen kaufen (30)" },                            ITEMTYPE_SHOP,              GI_SEEDS_30,        true,  &logic->BuySeed,             RHT_DEKU_SEEDS_30,          ITEM_SEEDS_30,                  OBJECT_GI_SEED,         GID_SEEDS,          0xDC,                        0x50, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
-    itemTable[RG_SOLD_OUT] =                            Item(RG_SOLD_OUT,                         Text{ "Sold Out", "Rupture de stock", "Ausverkauft" },                                                            ITEMTYPE_SHOP,              RG_SOLD_OUT,        false, &logic->noVariable,          RHT_NONE, false, 0);
-    itemTable[RG_BUY_BLUE_FIRE] =                       Item(RG_BUY_BLUE_FIRE,                    Text{ "Buy Blue Fire", "Acheter: Flamme Bleue", "Blaues Feuer kaufen" },                                          ITEMTYPE_SHOP,              GI_BLUE_FIRE,       true,  &logic->BlueFireAccess,      RHT_BOTTLE_WITH_BLUE_FIRE,  ITEM_BLUE_FIRE,                 OBJECT_GI_FIRE,         GID_BLUE_FIRE,      0x5D,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 300);
-    itemTable[RG_BUY_BOTTLE_BUG] =                      Item(RG_BUY_BOTTLE_BUG,                   Text{ "Buy Bottle Bug", "Acheter: Insecte en bouteille", "Flaschenkäfer kaufen" },                                ITEMTYPE_SHOP,              GI_BUGS,            true,  &logic->BugsAccess,          RHT_BOTTLE_WITH_BUGS,       ITEM_BUG,                       OBJECT_GI_INSECT,       GID_BUG,            0x7A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 50);
-    itemTable[RG_BUY_POE] =                             Item(RG_BUY_POE,                          Text{ "Buy Poe", "Acheter: Esprit", "Geist kaufen" },                                                             ITEMTYPE_SHOP,              RG_BUY_POE,         false, &logic->noVariable,          RHT_BOTTLE_WITH_BIG_POE,    ITEM_POE,                       OBJECT_GI_GHOST,        GID_POE,            0x97,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
-    itemTable[RG_BUY_FAIRYS_SPIRIT] =                   Item(RG_BUY_FAIRYS_SPIRIT,                Text{ "Buy Fairy's Spirit", "Acheter: Esprit de Fée", "Feengeist kaufen" },                                       ITEMTYPE_SHOP,              GI_FAIRY,           true,  &logic->FairyAccess,         RHT_BOTTLE_WITH_FAIRY,      ITEM_FAIRY,                     OBJECT_GI_BOTTLE,       GID_BOTTLE,         0x46,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 50);
-    itemTable[RG_BUY_ARROWS_10] =                       Item(RG_BUY_ARROWS_10,                    Text{ "Buy Arrows (10)", "Acheter: Flèches (10)", "Pfeile kaufen (10)" },                                         ITEMTYPE_SHOP,              GI_ARROWS_SMALL,    true,  &logic->BuyArrow,            RHT_ARROWS_10,              ITEM_ARROWS_SMALL,              OBJECT_GI_ARROW,        GID_ARROWS_SMALL,   0xE6,                        0x48, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 20);
-    itemTable[RG_BUY_BOMBS_20] =                        Item(RG_BUY_BOMBS_20,                     Text{ "Buy Bombs (20)", "Acheter: Bombes (20)", "Bomben kaufen (20)" },                                           ITEMTYPE_SHOP,              GI_BOMBS_20,        true,  &logic->BuyBomb,             RHT_BOMBS_20,               ITEM_BOMBS_20,                  OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 80);
-    itemTable[RG_BUY_BOMBS_30] =                        Item(RG_BUY_BOMBS_30,                     Text{ "Buy Bombs (30)", "Acheter: Bombes (30)", "Bomben kaufen (30)" },                                           ITEMTYPE_SHOP,              GI_BOMBS_30,        true,  &logic->BuyBomb,             RHT_BOMBS_20,               ITEM_BOMBS_30,                  OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 120);
-    itemTable[RG_BUY_BOMBS_535] =                       Item(RG_BUY_BOMBS_535,                    Text{ "Buy Bombs (5) [35]", "Acheter: Bombes (5) [35]", "Bomben kaufen (5) [35]" },                               ITEMTYPE_SHOP,              GI_BOMBS_5,         true,  &logic->BuyBomb,             RHT_BOMBS_5,                ITEM_BOMBS_5,                   OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 35);
-    itemTable[RG_BUY_RED_POTION_40] =                   Item(RG_BUY_RED_POTION_40,                Text{ "Buy Red Potion [40]", "Acheter: Potion Rouge [40]", "Rotes Elixier kaufen [40]" },                         ITEMTYPE_SHOP,              GI_POTION_RED,      false, &logic->noVariable,          RHT_BOTTLE_WITH_RED_POTION, ITEM_POTION_RED,                OBJECT_GI_LIQUID,       GID_POTION_RED,     0x43,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 40);
-    itemTable[RG_BUY_RED_POTION_50] =                   Item(RG_BUY_RED_POTION_50,                Text{ "Buy Red Potion [50]", "Acheter: Potion Rouge [50]", "Rotes Elixier kaufen [50]" },                         ITEMTYPE_SHOP,              GI_POTION_RED,      false, &logic->noVariable,          RHT_BOTTLE_WITH_RED_POTION, ITEM_POTION_RED,                OBJECT_GI_LIQUID,       GID_POTION_RED,     0x43,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 50);
+    itemTable[RG_BUY_DEKU_NUTS_5] =                     Item(RG_BUY_DEKU_NUTS_5,                  Text{ "Buy Deku Nut (5)", "Acheter: Noix Mojo (5)", "Deku-Nuss kaufen (5)" },                                     ITEMTYPE_SHOP,              GI_NUTS_5_2,          true,  LOGIC_NUTS,                    RHT_DEKU_NUTS_5,              ITEM_NUTS_5,                    OBJECT_GI_NUTS,         GID_NUTS,           0x34,                        0x0C, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 15);
+    itemTable[RG_BUY_ARROWS_30] =                       Item(RG_BUY_ARROWS_30,                    Text{ "Buy Arrows (30)", "Acheter: Flèches (30)", "Pfeile kaufen (30)" },                                         ITEMTYPE_SHOP,              GI_ARROWS_MEDIUM,     true,  LOGIC_BUY_ARROW,               RHT_ARROWS_30,                ITEM_ARROWS_MEDIUM,             OBJECT_GI_ARROW,        GID_ARROWS_MEDIUM,  0xE6,                        0x49, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 60);
+    itemTable[RG_BUY_ARROWS_50] =                       Item(RG_BUY_ARROWS_50,                    Text{ "Buy Arrows (50)", "Acheter: Flèches (50)", "Pfeile kaufen (50)" },                                         ITEMTYPE_SHOP,              GI_ARROWS_LARGE,      true,  LOGIC_BUY_ARROW,               RHT_ARROWS_30,                ITEM_ARROWS_LARGE,              OBJECT_GI_ARROW,        GID_ARROWS_LARGE,   0xE6,                        0x4A, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 90);
+    itemTable[RG_BUY_BOMBS_525] =                       Item(RG_BUY_BOMBS_525,                    Text{ "Buy Bombs (5) [25]", "Acheter: Bombes (5) [25]", "Bomben kaufen (5) [25]" },                               ITEMTYPE_SHOP,              GI_BOMBS_5,           true,  LOGIC_BUY_BOMB,                RHT_BOMBS_5,                  ITEM_BOMBS_5,                   OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 25);
+    itemTable[RG_BUY_DEKU_NUTS_10] =                    Item(RG_BUY_DEKU_NUTS_10,                 Text{ "Buy Deku Nut (10)", "Acheter: Noix Mojo (10)", "Deku-Nuss kaufen (10)" },                                  ITEMTYPE_SHOP,              GI_NUTS_10,           true,  LOGIC_NUTS,                    RHT_DEKU_NUTS_10,             ITEM_NUTS_10,                   OBJECT_GI_NUTS,         GID_NUTS,           0x34,                        0x0C, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
+    itemTable[RG_BUY_DEKU_STICK_1] =                    Item(RG_BUY_DEKU_STICK_1,                 Text{ "Buy Deku Stick (1)", "Acheter: Bâton Mojo (1)", "Deku-Stick kaufen (1)" },                                 ITEMTYPE_SHOP,              GI_STICKS_1,          true,  LOGIC_STICKS,                  RHT_DEKU_STICK_1,             ITEM_STICK,                     OBJECT_GI_STICK,        GID_STICK,          0x37,                        0x0D, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 10);
+    itemTable[RG_BUY_BOMBS_10] =                        Item(RG_BUY_BOMBS_10,                     Text{ "Buy Bombs (10)", "Acheter: Bombes (10)", "Bomben kaufen (10)" },                                           ITEMTYPE_SHOP,              GI_BOMBS_10,          true,  LOGIC_BUY_BOMB,                RHT_BOMBS_10,                 ITEM_BOMBS_10,                  OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 50);
+    itemTable[RG_BUY_FISH] =                            Item(RG_BUY_FISH,                         Text{ "Buy Fish", "Acheter: Poisson", "Fisch kaufen" },                                                           ITEMTYPE_SHOP,              GI_FISH,              true,  LOGIC_FISH_ACCESS,             RHT_BOTTLE_WITH_FISH,         ITEM_FISH,                      OBJECT_GI_FISH,         GID_FISH,           0x47,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 200);
+    itemTable[RG_BUY_RED_POTION_30] =                   Item(RG_BUY_RED_POTION_30,                Text{ "Buy Red Potion [30]", "Acheter: Potion Rouge [30]", "Rotes Elixier kaufen [30]" },                         ITEMTYPE_SHOP,              GI_POTION_RED,        false, LOGIC_NONE,                    RHT_BOTTLE_WITH_RED_POTION,   ITEM_POTION_RED,                OBJECT_GI_LIQUID,       GID_POTION_RED,     0x43,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
+    itemTable[RG_BUY_GREEN_POTION] =                    Item(RG_BUY_GREEN_POTION,                 Text{ "Buy Green Potion", "Acheter: Potion Verte", "Grünes Elixier kaufen" },                                     ITEMTYPE_SHOP,              GI_POTION_GREEN,      true,  LOGIC_BUY_MAGIC_POTION,        RHT_BOTTLE_WITH_GREEN_POTION, ITEM_POTION_GREEN,              OBJECT_GI_LIQUID,       GID_POTION_GREEN,   0x44,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
+    itemTable[RG_BUY_BLUE_POTION] =                     Item(RG_BUY_BLUE_POTION,                  Text{ "Buy Blue Potion", "Acheter: Potion Bleue", "Blaues Elixier kaufen" },                                      ITEMTYPE_SHOP,              GI_POTION_BLUE,       true,  LOGIC_BUY_MAGIC_POTION,        RHT_BOTTLE_WITH_BLUE_POTION,  ITEM_POTION_BLUE,               OBJECT_GI_LIQUID,       GID_POTION_BLUE,    0x45,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 100);
+    itemTable[RG_BUY_HYLIAN_SHIELD] =                   Item(RG_BUY_HYLIAN_SHIELD,                Text{ "Buy Hylian Shield", "Acheter: Bouclier Hylien", "Hylianischer Schild kaufen" },                            ITEMTYPE_SHOP,              GI_SHIELD_HYLIAN,     true,  LOGIC_HYLIAN_SHIELD,           RHT_HYLIAN_SHIELD,            ITEM_SHIELD_HYLIAN,             OBJECT_GI_SHIELD_2,     GID_SHIELD_HYLIAN,  0x4D,                        0xA0, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE, false, 80);
+    itemTable[RG_BUY_DEKU_SHIELD] =                     Item(RG_BUY_DEKU_SHIELD,                  Text{ "Buy Deku Shield", "Acheter: Bouclier Mojo", "Deku-Schild kaufen" },                                        ITEMTYPE_SHOP,              GI_SHIELD_DEKU,       true,  LOGIC_DEKU_SHIELD,             RHT_DEKU_SHIELD,              ITEM_SHIELD_DEKU,               OBJECT_GI_SHIELD_1,     GID_SHIELD_DEKU,    0x4C,                        0xA0, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE, false, 40);
+    itemTable[RG_BUY_GORON_TUNIC] =                     Item(RG_BUY_GORON_TUNIC,                  Text{ "Buy Goron Tunic", "Acheter: Tunique Goron", "Goronen-Tunika kaufen" },                                     ITEMTYPE_SHOP,              GI_TUNIC_GORON,       true,  LOGIC_GORON_TUNIC,             RHT_GORON_TUNIC,              ITEM_TUNIC_GORON,               OBJECT_GI_CLOTHES,      GID_TUNIC_GORON,    0x50,                        0xA0, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE, false, 200);
+    itemTable[RG_BUY_ZORA_TUNIC] =                      Item(RG_BUY_ZORA_TUNIC,                   Text{ "Buy Zora Tunic", "Acheter: Tunique Zora", "Zora-Tunika kaufen" },                                          ITEMTYPE_SHOP,              GI_TUNIC_ZORA,        true,  LOGIC_ZORA_TUNIC,              RHT_ZORA_TUNIC,               ITEM_TUNIC_ZORA,                OBJECT_GI_CLOTHES,      GID_TUNIC_ZORA,     0x51,                        0xA0, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE, false, 300);
+    itemTable[RG_BUY_HEART] =                           Item(RG_BUY_HEART,                        Text{ "Buy Heart", "Acheter: Coeur de Vie", "Herz kaufen" },                                                      ITEMTYPE_SHOP,              GI_HEART,             false, LOGIC_NONE,                    RHT_RECOVERY_HEART,           ITEM_HEART,                     OBJECT_GI_HEART,        GID_HEART,          0x55,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 10);
+    itemTable[RG_BUY_BOMBCHU_10] =                      Item(RG_BUY_BOMBCHU_10,                   Text{ "Buy Bombchu (10)", "Acheter: Missiles (10)", "Bomchu kaufen (10)" },                                       ITEMTYPE_SHOP,              GI_BOMBCHUS_10,       true,  LOGIC_BUY_BOMBCHUS,            RHT_BOMBCHU_10,               ITEM_BOMBCHU,                   OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 99);
+    itemTable[RG_BUY_BOMBCHU_20] =                      Item(RG_BUY_BOMBCHU_20,                   Text{ "Buy Bombchu (20)", "Acheter: Missiles (20)", "Bomchu kaufen (20)" },                                       ITEMTYPE_SHOP,              GI_BOMBCHUS_20,       true,  LOGIC_BUY_BOMBCHUS,            RHT_BOMBCHU_20,               ITEM_BOMBCHUS_20,               OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 180);
+    itemTable[RG_BUY_DEKU_SEEDS_30] =                   Item(RG_BUY_DEKU_SEEDS_30,                Text{ "Buy Deku Seeds (30)", "Acheter: Graines Mojo (30)", "Deku-Samen kaufen (30)" },                            ITEMTYPE_SHOP,              GI_SEEDS_30,          true,  LOGIC_BUY_SEED,                RHT_DEKU_SEEDS_30,            ITEM_SEEDS_30,                  OBJECT_GI_SEED,         GID_SEEDS,          0xDC,                        0x50, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
+    itemTable[RG_SOLD_OUT] =                            Item(RG_SOLD_OUT,                         Text{ "Sold Out", "Rupture de stock", "Ausverkauft" },                                                            ITEMTYPE_SHOP,              RG_SOLD_OUT,          false, LOGIC_NONE,                    RHT_NONE, false, 0);
+    itemTable[RG_BUY_BLUE_FIRE] =                       Item(RG_BUY_BLUE_FIRE,                    Text{ "Buy Blue Fire", "Acheter: Flamme Bleue", "Blaues Feuer kaufen" },                                          ITEMTYPE_SHOP,              GI_BLUE_FIRE,         true,  LOGIC_BLUE_FIRE_ACCESS,        RHT_BOTTLE_WITH_BLUE_FIRE,    ITEM_BLUE_FIRE,                 OBJECT_GI_FIRE,         GID_BLUE_FIRE,      0x5D,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 300);
+    itemTable[RG_BUY_BOTTLE_BUG] =                      Item(RG_BUY_BOTTLE_BUG,                   Text{ "Buy Bottle Bug", "Acheter: Insecte en bouteille", "Flaschenkäfer kaufen" },                                ITEMTYPE_SHOP,              GI_BUGS,              true,  LOGIC_BUGS_ACCESS,             RHT_BOTTLE_WITH_BUGS,         ITEM_BUG,                       OBJECT_GI_INSECT,       GID_BUG,            0x7A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 50);
+    itemTable[RG_BUY_POE] =                             Item(RG_BUY_POE,                          Text{ "Buy Poe", "Acheter: Esprit", "Geist kaufen" },                                                             ITEMTYPE_SHOP,              RG_BUY_POE,           false, LOGIC_NONE,                    RHT_BOTTLE_WITH_BIG_POE,      ITEM_POE,                       OBJECT_GI_GHOST,        GID_POE,            0x97,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
+    itemTable[RG_BUY_FAIRYS_SPIRIT] =                   Item(RG_BUY_FAIRYS_SPIRIT,                Text{ "Buy Fairy's Spirit", "Acheter: Esprit de Fée", "Feengeist kaufen" },                                       ITEMTYPE_SHOP,              GI_FAIRY,             true,  LOGIC_FAIRY_ACCESS,            RHT_BOTTLE_WITH_FAIRY,        ITEM_FAIRY,                     OBJECT_GI_BOTTLE,       GID_BOTTLE,         0x46,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 50);
+    itemTable[RG_BUY_ARROWS_10] =                       Item(RG_BUY_ARROWS_10,                    Text{ "Buy Arrows (10)", "Acheter: Flèches (10)", "Pfeile kaufen (10)" },                                         ITEMTYPE_SHOP,              GI_ARROWS_SMALL,      true,  LOGIC_BUY_ARROW,               RHT_ARROWS_10,                ITEM_ARROWS_SMALL,              OBJECT_GI_ARROW,        GID_ARROWS_SMALL,   0xE6,                        0x48, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 20);
+    itemTable[RG_BUY_BOMBS_20] =                        Item(RG_BUY_BOMBS_20,                     Text{ "Buy Bombs (20)", "Acheter: Bombes (20)", "Bomben kaufen (20)" },                                           ITEMTYPE_SHOP,              GI_BOMBS_20,          true,  LOGIC_BUY_BOMB,                RHT_BOMBS_20,                 ITEM_BOMBS_20,                  OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 80);
+    itemTable[RG_BUY_BOMBS_30] =                        Item(RG_BUY_BOMBS_30,                     Text{ "Buy Bombs (30)", "Acheter: Bombes (30)", "Bomben kaufen (30)" },                                           ITEMTYPE_SHOP,              GI_BOMBS_30,          true,  LOGIC_BUY_BOMB,                RHT_BOMBS_20,                 ITEM_BOMBS_30,                  OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 120);
+    itemTable[RG_BUY_BOMBS_535] =                       Item(RG_BUY_BOMBS_535,                    Text{ "Buy Bombs (5) [35]", "Acheter: Bombes (5) [35]", "Bomben kaufen (5) [35]" },                               ITEMTYPE_SHOP,              GI_BOMBS_5,           true,  LOGIC_BUY_BOMB,                RHT_BOMBS_5,                  ITEM_BOMBS_5,                   OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 35);
+    itemTable[RG_BUY_RED_POTION_40] =                   Item(RG_BUY_RED_POTION_40,                Text{ "Buy Red Potion [40]", "Acheter: Potion Rouge [40]", "Rotes Elixier kaufen [40]" },                         ITEMTYPE_SHOP,              GI_POTION_RED,        false, LOGIC_NONE,                    RHT_BOTTLE_WITH_RED_POTION,   ITEM_POTION_RED,                OBJECT_GI_LIQUID,       GID_POTION_RED,     0x43,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 40);
+    itemTable[RG_BUY_RED_POTION_50] =                   Item(RG_BUY_RED_POTION_50,                Text{ "Buy Red Potion [50]", "Acheter: Potion Rouge [50]", "Rotes Elixier kaufen [50]" },                         ITEMTYPE_SHOP,              GI_POTION_RED,        false, LOGIC_NONE,                    RHT_BOTTLE_WITH_RED_POTION,   ITEM_POTION_RED,                OBJECT_GI_LIQUID,       GID_POTION_RED,     0x43,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 50);
     // Misc.
-    itemTable[RG_GOHMA_SOUL] =                          Item(RG_GOHMA_SOUL,                      Text{ "Gohma's Soul", "", "" },                                                                                    ITEMTYPE_ITEM,              0xE0,               true,  &logic->CanSummonGohma,      RHT_GOHMA_SOUL,             RG_GOHMA_SOUL,                  OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_GOHMA_SOUL] =                          Item(RG_GOHMA_SOUL,                       Text{ "Gohma's Soul", "", "" },                                                                                   ITEMTYPE_ITEM,              0xE0,                 true,  LOGIC_CAN_SUMMON_GOHMA,        RHT_GOHMA_SOUL,               RG_GOHMA_SOUL,                  OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_GOHMA_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
-    itemTable[RG_KING_DODONGO_SOUL] =                   Item(RG_KING_DODONGO_SOUL,               Text{ "King Dodongo's Soul", "", "" },                                                                             ITEMTYPE_ITEM,              0xE1,               true,  &logic->CanSummonKingDodongo,RHT_KING_DODONGO_SOUL,      RG_KING_DODONGO_SOUL,           OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_KING_DODONGO_SOUL] =                   Item(RG_KING_DODONGO_SOUL,                Text{ "King Dodongo's Soul", "", "" },                                                                            ITEMTYPE_ITEM,              0xE1,                 true,  LOGIC_CAN_SUMMON_KINGDODONGO,  RHT_KING_DODONGO_SOUL,        RG_KING_DODONGO_SOUL,           OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_KING_DODONGO_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
-    itemTable[RG_BARINADE_SOUL] =                       Item(RG_BARINADE_SOUL,                   Text{ "Barinade's Soul", "", "" },                                                                                 ITEMTYPE_ITEM,              0xE2,               true,  &logic->CanSummonBarinade,   RHT_BARINADE_SOUL,          RG_BARINADE_SOUL,               OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BARINADE_SOUL] =                       Item(RG_BARINADE_SOUL,                    Text{ "Barinade's Soul", "", "" },                                                                                ITEMTYPE_ITEM,              0xE2,                 true,  LOGIC_CAN_SUMMON_BARINADE,     RHT_BARINADE_SOUL,            RG_BARINADE_SOUL,               OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_BARINADE_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
-    itemTable[RG_PHANTOM_GANON_SOUL] =                  Item(RG_PHANTOM_GANON_SOUL,              Text{ "Phantom Ganon's Soul", "", "" },                                                                            ITEMTYPE_ITEM,              0xE3,               true,  &logic->CanSummonPhantomGanon,RHT_PHANTOM_GANON_SOUL,    RG_PHANTOM_GANON_SOUL,          OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_PHANTOM_GANON_SOUL] =                  Item(RG_PHANTOM_GANON_SOUL,               Text{ "Phantom Ganon's Soul", "", "" },                                                                           ITEMTYPE_ITEM,              0xE3,                 true,  LOGIC_CAN_SUMMON_PHANTOMGANON, RHT_PHANTOM_GANON_SOUL,       RG_PHANTOM_GANON_SOUL,          OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_PHANTOM_GANON_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
-    itemTable[RG_VOLVAGIA_SOUL] =                       Item(RG_VOLVAGIA_SOUL,                   Text{ "Volvagia's Soul", "", "" },                                                                                 ITEMTYPE_ITEM,              0xE4,               true,  &logic->CanSummonVolvagia,   RHT_VOLVAGIA_SOUL,          RG_VOLVAGIA_SOUL,               OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_VOLVAGIA_SOUL] =                       Item(RG_VOLVAGIA_SOUL,                    Text{ "Volvagia's Soul", "", "" },                                                                                ITEMTYPE_ITEM,              0xE4,                 true,  LOGIC_CAN_SUMMON_VOLVAGIA,     RHT_VOLVAGIA_SOUL,            RG_VOLVAGIA_SOUL,               OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_VOLVAGIA_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
-    itemTable[RG_MORPHA_SOUL] =                         Item(RG_MORPHA_SOUL,                     Text{ "Morpha's Soul", "", "" },                                                                                   ITEMTYPE_ITEM,              0xE5,               true,  &logic->CanSummonMorpha,     RHT_MORPHA_SOUL,            RG_MORPHA_SOUL,                 OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_MORPHA_SOUL] =                         Item(RG_MORPHA_SOUL,                      Text{ "Morpha's Soul", "", "" },                                                                                  ITEMTYPE_ITEM,              0xE5,                 true,  LOGIC_CAN_SUMMON_MORPHA,       RHT_MORPHA_SOUL,              RG_MORPHA_SOUL,                 OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_MORPHA_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
-    itemTable[RG_BONGO_BONGO_SOUL] =                    Item(RG_BONGO_BONGO_SOUL,                Text{ "Bongo Bongo's Soul", "", "" },                                                                              ITEMTYPE_ITEM,              0xE6,               true,  &logic->CanSummonBongoBongo, RHT_BONGO_BONGO_SOUL,       RG_BONGO_BONGO_SOUL,            OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BONGO_BONGO_SOUL] =                    Item(RG_BONGO_BONGO_SOUL,                 Text{ "Bongo Bongo's Soul", "", "" },                                                                             ITEMTYPE_ITEM,              0xE6,                 true,  LOGIC_CAN_SUMMON_BONGOBONGO,   RHT_BONGO_BONGO_SOUL,         RG_BONGO_BONGO_SOUL,            OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_BONGO_BONGO_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
-    itemTable[RG_TWINROVA_SOUL] =                       Item(RG_TWINROVA_SOUL,                   Text{ "Twinrova's Soul", "", "" },                                                                                 ITEMTYPE_ITEM,              0xE7,               true,  &logic->CanSummonTwinrova,   RHT_TWINROVA_SOUL,          RG_TWINROVA_SOUL,               OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_TWINROVA_SOUL] =                       Item(RG_TWINROVA_SOUL,                    Text{ "Twinrova's Soul", "", "" },                                                                                ITEMTYPE_ITEM,              0xE7,                 true,  LOGIC_CAN_SUMMON_TWINROVA,     RHT_TWINROVA_SOUL,            RG_TWINROVA_SOUL,               OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_TWINROVA_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
-    itemTable[RG_GANON_SOUL] =                          Item(RG_GANON_SOUL,                      Text{ "Ganon's Soul", "", "" },                                                                                    ITEMTYPE_ITEM,              0xE8,               true,  &logic->CanSummonGanon,      RHT_GANON_SOUL,             RG_GANON_SOUL,                  OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_GANON_SOUL] =                          Item(RG_GANON_SOUL,                       Text{ "Ganon's Soul", "", "" },                                                                                   ITEMTYPE_ITEM,              0xE8,                 true,  LOGIC_CAN_SUMMON_GANON,        RHT_GANON_SOUL,               RG_GANON_SOUL,                  OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_GANON_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
-    itemTable[RG_FISHING_POLE] =                        Item(RG_FISHING_POLE,                    Text{ "Fishing Pole", "Canne à Pêche", "Caña de Pescar" },                                                         ITEMTYPE_ITEM,              RG_FISHING_POLE,    true,  &logic->FishingPole,         RHT_FISHING_POLE,           RG_FISHING_POLE,                OBJECT_GI_FISH,         GID_FISHING_POLE,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_FISHING_POLE] =                        Item(RG_FISHING_POLE,                     Text{ "Fishing Pole", "Canne à Pêche", "Caña de Pescar" },                                                        ITEMTYPE_ITEM,              RG_FISHING_POLE,      true,  LOGIC_FISHING_POLE,            RHT_FISHING_POLE,             RG_FISHING_POLE,                OBJECT_GI_FISH,         GID_FISHING_POLE,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_FISHING_POLE].SetCustomDrawFunc(Randomizer_DrawFishingPoleGI);
 
-    itemTable[RG_OCARINA_A_BUTTON] =                    Item(RG_OCARINA_A_BUTTON,                Text{ "Ocarina A Button", "Touche A de l'Ocarina", "Botón A de Ocarina" },                                         ITEMTYPE_ITEM,              GI_MAP,             true,  &logic->OcarinaAButton,      RHT_OCARINA_A_BUTTON,       RG_OCARINA_A_BUTTON,            OBJECT_GI_MAP,          GID_STONE_OF_AGONY, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_OCARINA_A_BUTTON] =                    Item(RG_OCARINA_A_BUTTON,                 Text{ "Ocarina A Button", "Touche A de l'Ocarina", "Botón A de Ocarina" },                                        ITEMTYPE_ITEM,              GI_MAP,               true,  LOGIC_OCARINA_A_BUTTON,        RHT_OCARINA_A_BUTTON,         RG_OCARINA_A_BUTTON,            OBJECT_GI_MAP,          GID_STONE_OF_AGONY, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_OCARINA_A_BUTTON].SetCustomDrawFunc(Randomizer_DrawOcarinaButton);
-    itemTable[RG_OCARINA_C_UP_BUTTON] =                 Item(RG_OCARINA_C_UP_BUTTON,             Text{ "Ocarina C Up Button", "Touche C-Haut de l'Ocarina", "Botón C superior de Ocarina" },                        ITEMTYPE_ITEM,              GI_MAP,             true,  &logic->OcarinaCUpButton,    RHT_OCARINA_C_UP_BUTTON,    RG_OCARINA_C_UP_BUTTON,         OBJECT_GI_MAP,          GID_STONE_OF_AGONY, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_OCARINA_C_UP_BUTTON] =                 Item(RG_OCARINA_C_UP_BUTTON,              Text{ "Ocarina C Up Button", "Touche C-Haut de l'Ocarina", "Botón C superior de Ocarina" },                       ITEMTYPE_ITEM,              GI_MAP,               true,  LOGIC_OCARINA_C_UP_BUTTON,     RHT_OCARINA_C_UP_BUTTON,      RG_OCARINA_C_UP_BUTTON,         OBJECT_GI_MAP,          GID_STONE_OF_AGONY, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_OCARINA_C_UP_BUTTON].SetCustomDrawFunc(Randomizer_DrawOcarinaButton);
-    itemTable[RG_OCARINA_C_DOWN_BUTTON] =               Item(RG_OCARINA_C_DOWN_BUTTON,           Text{ "Ocarina C Down Button", "Touche C-Bas de l'Ocarina", "Botón C inferior de Ocarina" },                       ITEMTYPE_ITEM,              GI_MAP,             true,  &logic->OcarinaCDownButton,  RHT_OCARINA_C_DOWN_BUTTON,  RG_OCARINA_C_DOWN_BUTTON,       OBJECT_GI_MAP,          GID_STONE_OF_AGONY, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_OCARINA_C_DOWN_BUTTON] =               Item(RG_OCARINA_C_DOWN_BUTTON,            Text{ "Ocarina C Down Button", "Touche C-Bas de l'Ocarina", "Botón C inferior de Ocarina" },                      ITEMTYPE_ITEM,              GI_MAP,               true,  LOGIC_OCARINA_C_DOWN_BUTTON,   RHT_OCARINA_C_DOWN_BUTTON,    RG_OCARINA_C_DOWN_BUTTON,       OBJECT_GI_MAP,          GID_STONE_OF_AGONY, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_OCARINA_C_DOWN_BUTTON].SetCustomDrawFunc(Randomizer_DrawOcarinaButton);
-    itemTable[RG_OCARINA_C_LEFT_BUTTON] =               Item(RG_OCARINA_C_LEFT_BUTTON,           Text{ "Ocarina C Left Button", "Touche C-Gauche de l'Ocarina", "Botón C izquierdo de Ocarina" },                   ITEMTYPE_ITEM,              GI_MAP,             true,  &logic->OcarinaCLeftButton,  RHT_OCARINA_C_LEFT_BUTTON,  RG_OCARINA_C_LEFT_BUTTON,       OBJECT_GI_MAP,          GID_STONE_OF_AGONY, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_OCARINA_C_LEFT_BUTTON] =               Item(RG_OCARINA_C_LEFT_BUTTON,            Text{ "Ocarina C Left Button", "Touche C-Gauche de l'Ocarina", "Botón C izquierdo de Ocarina" },                  ITEMTYPE_ITEM,              GI_MAP,               true,  LOGIC_OCARINA_C_LEFT_BUTTON,   RHT_OCARINA_C_LEFT_BUTTON,    RG_OCARINA_C_LEFT_BUTTON,       OBJECT_GI_MAP,          GID_STONE_OF_AGONY, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_OCARINA_C_LEFT_BUTTON].SetCustomDrawFunc(Randomizer_DrawOcarinaButton);
-    itemTable[RG_OCARINA_C_RIGHT_BUTTON] =              Item(RG_OCARINA_C_RIGHT_BUTTON,          Text{ "Ocarina C Right Button", "Touche C-Droit de l'Ocarina", "Botón C derecho de Ocarina" },                     ITEMTYPE_ITEM,              GI_MAP,             true,  &logic->OcarinaCRightButton, RHT_OCARINA_C_RIGHT_BUTTON, RG_OCARINA_C_RIGHT_BUTTON,      OBJECT_GI_MAP,          GID_STONE_OF_AGONY, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_OCARINA_C_RIGHT_BUTTON] =              Item(RG_OCARINA_C_RIGHT_BUTTON,           Text{ "Ocarina C Right Button", "Touche C-Droit de l'Ocarina", "Botón C derecho de Ocarina" },                    ITEMTYPE_ITEM,              GI_MAP,               true,  LOGIC_OCARINA_C_RIGHT_BUTTON,  RHT_OCARINA_C_RIGHT_BUTTON,   RG_OCARINA_C_RIGHT_BUTTON,      OBJECT_GI_MAP,          GID_STONE_OF_AGONY, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_OCARINA_C_RIGHT_BUTTON].SetCustomDrawFunc(Randomizer_DrawOcarinaButton);
 
-    itemTable[RG_BRONZE_SCALE] = Item(RG_BRONZE_SCALE, Text{ "Bronze Scale", "!!!", "!!!" }, ITEMTYPE_ITEM, GI_SCALE_SILVER, true, &logic->ProgressiveWallet, RHT_BRONZE_SCALE, RG_BRONZE_SCALE, OBJECT_GI_SCALE, GID_SCALE_SILVER, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
+    itemTable[RG_BRONZE_SCALE] =                        Item(RG_BRONZE_SCALE,                     Text{ "Bronze Scale", "!!!", "!!!" },                                                                             ITEMTYPE_ITEM,              GI_SCALE_SILVER,      true,  LOGIC_PROGRESSIVE_WALLET,      RHT_BRONZE_SCALE,             RG_BRONZE_SCALE,                OBJECT_GI_SCALE,        GID_SCALE_SILVER,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_BRONZE_SCALE].SetCustomDrawFunc(Randomizer_DrawBronzeScale);
 
-    itemTable[RG_QUIVER_INF] =        Item(RG_QUIVER_INF,        Text{ "Infinite Quiver", "!!!", "!!!" },         ITEMTYPE_ITEM, RG_QUIVER_INF,        true, &logic->ProgressiveBow,       RHT_QUIVER_INF,        RG_QUIVER_INF,        OBJECT_GI_ARROWCASE, GID_QUIVER_50,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_BOMB_BAG_INF] =      Item(RG_BOMB_BAG_INF,      Text{ "Infinite Bomb Bag", "!!!", "!!!" },       ITEMTYPE_ITEM, RG_BOMB_BAG_INF,      true, &logic->ProgressiveBombBag,   RHT_BOMB_BAG_INF,      RG_BOMB_BAG_INF,      OBJECT_GI_BOMBPOUCH, GID_BOMB_BAG_40,  TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_BULLET_BAG_INF] =    Item(RG_BULLET_BAG_INF,    Text{ "Infinite Bullet Bag", "!!!", "!!!" },     ITEMTYPE_ITEM, RG_BULLET_BAG_INF,    true, &logic->ProgressiveBulletBag, RHT_BULLET_BAG_INF,    RG_BULLET_BAG_INF,    OBJECT_GI_DEKUPOUCH, GID_BULLET_BAG,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_STICK_UPGRADE_INF] = Item(RG_STICK_UPGRADE_INF, Text{ "Infinite Stick Capacity", "!!!", "!!!" }, ITEMTYPE_ITEM, RG_STICK_UPGRADE_INF, true, &logic->noVariable,           RHT_STICK_UPGRADE_INF, RG_STICK_UPGRADE_INF, OBJECT_GI_STICK,     GID_STICK,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_NUT_UPGRADE_INF] =   Item(RG_QUIVER_INF,        Text{ "Infinite Nut Capacity", "!!!", "!!!" },   ITEMTYPE_ITEM, RG_NUT_UPGRADE_INF,   true, &logic->noVariable,           RHT_NUT_UPGRADE_INF,   RG_NUT_UPGRADE_INF,   OBJECT_GI_NUTS,      GID_NUTS,         TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_MAGIC_INF] =         Item(RG_QUIVER_INF,        Text{ "Infinite Magic Meter", "!!!", "!!!" },    ITEMTYPE_ITEM, RG_MAGIC_INF,         true, &logic->ProgressiveMagic,     RHT_MAGIC_INF,         RG_MAGIC_INF,         OBJECT_GI_MAGICPOT,  GID_MAGIC_LARGE,  TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_BOMBCHU_INF] =       Item(RG_BOMBCHU_INF,       Text{ "Infinite Bombchus", "!!!", "!!!" },       ITEMTYPE_ITEM, RG_BOMBCHU_INF,       true, &logic->Bombchus,             RHT_BOMBCHU_INF,       RG_BOMBCHU_INF,       OBJECT_GI_BOMB_2,    GID_BOMBCHU,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_WALLET_INF] =        Item(RG_WALLET_INF,        Text{ "Infinite Wallet", "!!!", "!!!" },         ITEMTYPE_ITEM, RG_WALLET_INF,        true, &logic->ProgressiveWallet,    RHT_WALLET_INF,        RG_WALLET_INF,        OBJECT_GI_PURSE,     GID_WALLET_GIANT, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_QUIVER_INF] =                          Item(RG_QUIVER_INF,                       Text{ "Infinite Quiver", "!!!", "!!!" },                                                                          ITEMTYPE_ITEM,              RG_QUIVER_INF,        true,  LOGIC_PROGRESSIVE_BOW,         RHT_QUIVER_INF,               RG_QUIVER_INF,                  OBJECT_GI_ARROWCASE,    GID_QUIVER_50,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_BOMB_BAG_INF] =                        Item(RG_BOMB_BAG_INF,                     Text{ "Infinite Bomb Bag", "!!!", "!!!" },                                                                        ITEMTYPE_ITEM,              RG_BOMB_BAG_INF,      true,  LOGIC_PROGRESSIVE_BOMB_BAG,    RHT_BOMB_BAG_INF,             RG_BOMB_BAG_INF,                OBJECT_GI_BOMBPOUCH,    GID_BOMB_BAG_40,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_BULLET_BAG_INF] =                      Item(RG_BULLET_BAG_INF,                   Text{ "Infinite Bullet Bag", "!!!", "!!!" },                                                                      ITEMTYPE_ITEM,              RG_BULLET_BAG_INF,    true,  LOGIC_PROGRESSIVE_BULLET_BAG,  RHT_BULLET_BAG_INF,           RG_BULLET_BAG_INF,              OBJECT_GI_DEKUPOUCH,    GID_BULLET_BAG,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_STICK_UPGRADE_INF] =                   Item(RG_STICK_UPGRADE_INF,                Text{ "Infinite Stick Capacity", "!!!", "!!!" },                                                                  ITEMTYPE_ITEM,              RG_STICK_UPGRADE_INF, true,  LOGIC_PROGRESSIVE_STICK_BAG,   RHT_STICK_UPGRADE_INF,        RG_STICK_UPGRADE_INF,           OBJECT_GI_STICK,        GID_STICK,          TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_NUT_UPGRADE_INF] =                     Item(RG_QUIVER_INF,                       Text{ "Infinite Nut Capacity", "!!!", "!!!" },                                                                    ITEMTYPE_ITEM,              RG_NUT_UPGRADE_INF,   true,  LOGIC_PROGRESSIVE_NUT_BAG,     RHT_NUT_UPGRADE_INF,          RG_NUT_UPGRADE_INF,             OBJECT_GI_NUTS,         GID_NUTS,           TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_MAGIC_INF] =                           Item(RG_QUIVER_INF,                       Text{ "Infinite Magic Meter", "!!!", "!!!" },                                                                     ITEMTYPE_ITEM,              RG_MAGIC_INF,         true,  LOGIC_PROGRESSIVE_MAGIC,       RHT_MAGIC_INF,                RG_MAGIC_INF,                   OBJECT_GI_MAGICPOT,     GID_MAGIC_LARGE,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_BOMBCHU_INF] =                         Item(RG_BOMBCHU_INF,                      Text{ "Infinite Bombchus", "!!!", "!!!" },                                                                        ITEMTYPE_ITEM,              RG_BOMBCHU_INF,       true,  LOGIC_BOMBCHUS,                RHT_BOMBCHU_INF,              RG_BOMBCHU_INF,                 OBJECT_GI_BOMB_2,       GID_BOMBCHU,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_WALLET_INF] =                          Item(RG_WALLET_INF,                       Text{ "Infinite Wallet", "!!!", "!!!" },                                                                          ITEMTYPE_ITEM,              RG_WALLET_INF,        true,  LOGIC_PROGRESSIVE_WALLET,      RHT_WALLET_INF,               RG_WALLET_INF,                  OBJECT_GI_PURSE,        GID_WALLET_GIANT,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
 
-    itemTable[RG_SKELETON_KEY] = Item(RG_SKELETON_KEY, Text{ "Skeleton Key", "!!!", "!!!" }, ITEMTYPE_ITEM, GI_STONE_OF_AGONY, true, &logic->SkeletonKey, RHT_SKELETON_KEY, RG_SKELETON_KEY, OBJECT_GI_MAP, GID_STONE_OF_AGONY, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
+    itemTable[RG_SKELETON_KEY] =                        Item(RG_SKELETON_KEY,                     Text{ "Skeleton Key", "!!!", "!!!" },                                                                             ITEMTYPE_ITEM,              GI_STONE_OF_AGONY,    true,  LOGIC_SKELETON_KEY,            RHT_SKELETON_KEY,             RG_SKELETON_KEY,                OBJECT_GI_MAP,          GID_STONE_OF_AGONY, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_SKELETON_KEY].SetCustomDrawFunc(Randomizer_DrawSkeletonKey);
 
-    itemTable[RG_DEKU_STICK_BAG] = Item(RG_DEKU_STICK_BAG, Text{ "Deku Stick Bag", "!!!", "!!!" }, ITEMTYPE_ITEM, GI_STICK_UPGRADE_30, true, &logic->ProgressiveStickBag, RHT_NONE, RG_DEKU_STICK_BAG, OBJECT_GI_STICK, GID_STICK, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
+    itemTable[RG_DEKU_STICK_BAG] =                      Item(RG_DEKU_STICK_BAG,                   Text{ "Deku Stick Bag", "!!!", "!!!" },                                                                           ITEMTYPE_ITEM,              GI_STICK_UPGRADE_30,  true,  LOGIC_PROGRESSIVE_STICK_BAG,   RHT_NONE,                     RG_DEKU_STICK_BAG,              OBJECT_GI_STICK,        GID_STICK,          TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
 
-    itemTable[RG_DEKU_NUT_BAG] = Item(RG_DEKU_NUT_BAG, Text{ "Deku Nut Bag", "!!!", "!!!" }, ITEMTYPE_ITEM, GI_NUT_UPGRADE_30, true, &logic->ProgressiveNutBag, RHT_NONE, RG_DEKU_NUT_BAG, OBJECT_GI_NUTS, GID_NUTS, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
+    itemTable[RG_DEKU_NUT_BAG] =                        Item(RG_DEKU_NUT_BAG,                     Text{ "Deku Nut Bag", "!!!", "!!!" },                                                                             ITEMTYPE_ITEM,              GI_NUT_UPGRADE_30,    true,  LOGIC_PROGRESSIVE_NUT_BAG,     RHT_NONE,                     RG_DEKU_NUT_BAG,                OBJECT_GI_NUTS,         GID_NUTS,           TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
 
-    itemTable[RG_TRIFORCE] =                            Item(RG_TRIFORCE,                         Text{ "Triforce", "Triforce", "Triforce" },                                                                       ITEMTYPE_EVENT,             RG_TRIFORCE,        false, &logic->noVariable,          RHT_NONE);
-    itemTable[RG_HINT] =                                Item(RG_HINT,                             Text{ "Hint", "Indice", "Hinweis" },                                                                              ITEMTYPE_EVENT,             RG_HINT,            false, &logic->noVariable,          RHT_NONE);
+    itemTable[RG_TRIFORCE] =                            Item(RG_TRIFORCE,                         Text{ "Triforce", "Triforce", "Triforce" },                                                                       ITEMTYPE_EVENT,             RG_TRIFORCE,          false, LOGIC_NONE,                    RHT_NONE);
+    itemTable[RG_HINT] =                                Item(RG_HINT,                             Text{ "Hint", "Indice", "Hinweis" },                                                                              ITEMTYPE_EVENT,             RG_HINT,              false, LOGIC_NONE,                    RHT_NONE);
     // Individual stages of progressive items (only here for GetItemEntry purposes, not for use in seed gen)
-    itemTable[RG_HOOKSHOT] =                            Item(RG_HOOKSHOT,                         Text{ "Hookshot", "Grappin", "Fanghaken" },                                                                       ITEMTYPE_ITEM,              GI_HOOKSHOT,        true,  &logic->ProgressiveHookshot, RHT_HOOKSHOT,               ITEM_HOOKSHOT,                  OBJECT_GI_HOOKSHOT,     GID_HOOKSHOT,       0x36,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_LONGSHOT] =                            Item(RG_LONGSHOT,                         Text{ "Longshot", "Super-Grappin", "Enterhaken" },                                                                ITEMTYPE_ITEM,              GI_LONGSHOT,        true,  &logic->ProgressiveHookshot, RHT_LONGSHOT,               ITEM_LONGSHOT,                  OBJECT_GI_HOOKSHOT,     GID_LONGSHOT,       0x4F,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_FAIRY_OCARINA] =                       Item(RG_FAIRY_OCARINA,                    Text{ "Fairy Ocarina", "Ocarina des fées", "Feen-Okarina" },                                                      ITEMTYPE_ITEM,              GI_OCARINA_FAIRY,   true,  &logic->ProgressiveOcarina,  RHT_FAIRY_OCARINA,          ITEM_OCARINA_FAIRY,             OBJECT_GI_OCARINA_0,    GID_OCARINA_FAIRY,  0x4A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_OCARINA_OF_TIME] =                     Item(RG_OCARINA_OF_TIME,                  Text{ "Ocarina of Time", "Ocarina du Temps", "Okarina der Zeit" },                                                ITEMTYPE_ITEM,              GI_OCARINA_OOT,     true,  &logic->ProgressiveOcarina,  RHT_OCARINA_OF_TIME,        ITEM_OCARINA_TIME,              OBJECT_GI_OCARINA,      GID_OCARINA_TIME,   0x3A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_BOMB_BAG] =                            Item(RG_BOMB_BAG,                         Text{ "Bomb Bag", "Sac de Bombes", "Bombentasche" },                                                              ITEMTYPE_ITEM,              GI_BOMB_BAG_20,     true,  &logic->ProgressiveBombBag,  RHT_BOMB_BAG,               ITEM_BOMB_BAG_20,               OBJECT_GI_BOMBPOUCH,    GID_BOMB_BAG_20,    0x58,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_BIG_BOMB_BAG] =                        Item(RG_BIG_BOMB_BAG,                     Text{ "Big Bomb Bag", "Grand Sac de Bombes", "Große Bombentasche" },                                              ITEMTYPE_ITEM,              GI_BOMB_BAG_30,     true,  &logic->ProgressiveBombBag,  RHT_BIG_BOMB_BAG,           ITEM_BOMB_BAG_30,               OBJECT_GI_BOMBPOUCH,    GID_BOMB_BAG_30,    0x59,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_BIGGEST_BOMB_BAG] =                    Item(RG_BIGGEST_BOMB_BAG,                 Text{ "Biggest Bomb Bag", "Énorme Sac de Bombes", "Größte Bombentasche" },                                        ITEMTYPE_ITEM,              GI_BOMB_BAG_40,     true,  &logic->ProgressiveBombBag,  RHT_BIGGEST_BOMB_BAG,       ITEM_BOMB_BAG_40,               OBJECT_GI_BOMBPOUCH,    GID_BOMB_BAG_40,    0x5A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_FAIRY_BOW] =                           Item(RG_FAIRY_BOW,                        Text{ "Fairy Bow", "Arc des Fées", "Feen-Bogen" },                                                                ITEMTYPE_ITEM,              GI_BOW,             true,  &logic->ProgressiveBow,      RHT_FAIRY_BOW,              ITEM_BOW,                       OBJECT_GI_BOW,          GID_BOW,            0x31,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_BIG_QUIVER] =                          Item(RG_BIG_QUIVER,                       Text{ "Big Quiver", "Grand carquois", "Großer Köcher" },                                                          ITEMTYPE_ITEM,              GI_QUIVER_40,       true,  &logic->ProgressiveBow,      RHT_BIG_QUIVER,             ITEM_QUIVER_40,                 OBJECT_GI_ARROWCASE,    GID_QUIVER_40,      0x56,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_BIGGEST_QUIVER] =                      Item(RG_BIGGEST_QUIVER,                   Text{ "Biggest Quiver", "Énorme carquois", "Größter Köcher" },                                                    ITEMTYPE_ITEM,              GI_QUIVER_50,       true,  &logic->ProgressiveBow,      RHT_BIGGEST_QUIVER,         ITEM_QUIVER_50,                 OBJECT_GI_ARROWCASE,    GID_QUIVER_50,      0x57,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_FAIRY_SLINGSHOT] =                     Item(RG_FAIRY_SLINGSHOT,                  Text{ "Fairy Slingshot", "Lance-Pierre des Fées", "Feen-Schleuder" },                                             ITEMTYPE_ITEM,              GI_SLINGSHOT,       true,  &logic->ProgressiveBulletBag,RHT_FAIRY_SLINGSHOT,        ITEM_SLINGSHOT,                 OBJECT_GI_PACHINKO,     GID_SLINGSHOT,      0x30,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_BIG_BULLET_BAG] =                      Item(RG_BIG_BULLET_BAG,                   Text{ "Big Deku Seed Bullet Bag", "Grand sac de graines mojo", "Großer Deku-Samenkugelsack" },                    ITEMTYPE_ITEM,              GI_BULLET_BAG_40,   true,  &logic->ProgressiveBulletBag,RHT_BIG_BULLET_BAG,         ITEM_BULLET_BAG_40,             OBJECT_GI_DEKUPOUCH,    GID_BULLET_BAG,     0x07,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_BIGGEST_BULLET_BAG] =                  Item(RG_BIGGEST_BULLET_BAG,               Text{ "Biggest Deku Seed Bullet Bag", "Énorme sac de graines mojo", "Größte Deku-Samenkugelsack" },               ITEMTYPE_ITEM,              GI_BULLET_BAG_50,   true,  &logic->ProgressiveBulletBag,RHT_BIGGEST_BULLET_BAG,     ITEM_BULLET_BAG_50,             OBJECT_GI_DEKUPOUCH,    GID_BULLET_BAG,     0x07,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_GORONS_BRACELET] =                     Item(RG_GORONS_BRACELET,                  Text{ "Goron's Bracelet", "Bracelet Goron", "Goronen-Armband" },                                                  ITEMTYPE_ITEM,              GI_BRACELET,        true,  &logic->ProgressiveStrength, RHT_GORONS_BRACELET,        ITEM_BRACELET,                  OBJECT_GI_BRACELET,     GID_BRACELET,       0x79,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_SILVER_GAUNTLETS] =                    Item(RG_SILVER_GAUNTLETS,                 Text{ "Silver Gauntlets", "Gantelets d'argent", "Silberne Fehdehandschuhe" },                                     ITEMTYPE_ITEM,              GI_GAUNTLETS_SILVER,true,  &logic->ProgressiveStrength, RHT_SILVER_GAUNTLETS,       ITEM_GAUNTLETS_SILVER,          OBJECT_GI_GLOVES,       GID_GAUNTLETS_SILVER,0x5B,                       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_GOLDEN_GAUNTLETS] =                    Item(RG_GOLDEN_GAUNTLETS,                 Text{ "Golden Gauntlets", "Gantelets d'or", "Goldene Fehdehandschuhe" },                                          ITEMTYPE_ITEM,              GI_GAUNTLETS_GOLD,  true,  &logic->ProgressiveStrength, RHT_GOLDEN_GAUNTLETS,       ITEM_GAUNTLETS_GOLD,            OBJECT_GI_GLOVES,       GID_GAUNTLETS_GOLD, 0x5C,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_SILVER_SCALE] =                        Item(RG_SILVER_SCALE,                     Text{ "Silver Scale", "Écaille d'argent", "Silberne Skala" },                                                     ITEMTYPE_ITEM,              GI_SCALE_SILVER,    true,  &logic->ProgressiveScale,    RHT_SILVER_SCALE,           ITEM_SCALE_SILVER,              OBJECT_GI_SCALE,        GID_SCALE_SILVER,   0xCD,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_GOLDEN_SCALE] =                        Item(RG_GOLDEN_SCALE,                     Text{ "Golden Scale", "Écaille d'or", "Goldene Skala" },                                                          ITEMTYPE_ITEM,              GI_SCALE_GOLD,      true,  &logic->ProgressiveScale,    RHT_GOLDEN_SCALE,           ITEM_SCALE_GOLDEN,              OBJECT_GI_SCALE,        GID_SCALE_GOLDEN,   0xCE,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_ADULT_WALLET] =                        Item(RG_ADULT_WALLET,                     Text{ "Adult Wallet", "Grande Bourse", "Erwachsene Geldbörse" },                                                  ITEMTYPE_ITEM,              GI_WALLET_ADULT,    true,  &logic->ProgressiveWallet,   RHT_ADULT_WALLET,           ITEM_WALLET_ADULT,              OBJECT_GI_PURSE,        GID_WALLET_ADULT,   0x5E,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_GIANT_WALLET] =                        Item(RG_GIANT_WALLET,                     Text{ "Giant Wallet", "Bourse de Géant", "Riesige Geldbörse" },                                                   ITEMTYPE_ITEM,              GI_WALLET_GIANT,    true,  &logic->ProgressiveWallet,   RHT_GIANT_WALLET,           ITEM_WALLET_GIANT,              OBJECT_GI_PURSE,        GID_WALLET_GIANT,   0x5F,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_TYCOON_WALLET] =                       Item(RG_TYCOON_WALLET,                    Text{ "Tycoon Wallet", "Bourse de Magnat", "Reiche Geldbörse" },                                                  ITEMTYPE_ITEM,              RG_TYCOON_WALLET,   true,  &logic->ProgressiveWallet,   RHT_TYCOON_WALLET,          RG_TYCOON_WALLET,               OBJECT_GI_PURSE,        GID_WALLET_GIANT,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_CHILD_WALLET] =                        Item(RG_CHILD_WALLET,                     Text{ "Child Wallet", "Bourse de Magnat", "Reiche Geldbörse" },/*FIXME: still says tycoon in french & german*/    ITEMTYPE_ITEM,              RG_CHILD_WALLET,    true,  &logic->ProgressiveWallet,   RHT_CHILD_WALLET,           RG_CHILD_WALLET,                OBJECT_GI_PURSE,        GID_WALLET_ADULT,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_DEKU_NUT_CAPACITY_30] =                Item(RG_DEKU_NUT_CAPACITY_30,             Text{ "Deku Nut Capacity (30)", "Capacité de noix Mojo (30)", "Deku Nuss Kapazität (30)" },                       ITEMTYPE_ITEM,              GI_NUT_UPGRADE_30,  true,  &logic->ProgressiveNutBag,   RHT_DEKU_NUT_CAPACITY_30,   ITEM_NUT_UPGRADE_30,            OBJECT_GI_NUTS,         GID_NUTS,           0xA7,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_DEKU_NUT_CAPACITY_40] =                Item(RG_DEKU_NUT_CAPACITY_40,             Text{ "Deku Nut Capacity (40)", "Capacité de noix Mojo (40)", "Deku Nuss Kapazität (40)" },                       ITEMTYPE_ITEM,              GI_NUT_UPGRADE_40,  true,  &logic->ProgressiveNutBag,   RHT_DEKU_NUT_CAPACITY_40,   ITEM_NUT_UPGRADE_40,            OBJECT_GI_NUTS,         GID_NUTS,           0xA8,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_DEKU_STICK_CAPACITY_20] =              Item(RG_DEKU_STICK_CAPACITY_20,           Text{ "Deku Stick Capacity (20)", "Capacité de Bâtons Mojo (20)", "Deku Stick Kapazität (20)" },                  ITEMTYPE_ITEM,              GI_STICK_UPGRADE_20,true,  &logic->ProgressiveStickBag, RHT_DEKU_STICK_CAPACITY_20, ITEM_STICK_UPGRADE_20,          OBJECT_GI_STICK,        GID_STICK,          0x90,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_DEKU_STICK_CAPACITY_30] =              Item(RG_DEKU_STICK_CAPACITY_30,           Text{ "Deku Stick Capacity (30)", "Capacité de Bâtons Mojo (30)", "Deku Stick Kapazität (30)" },                  ITEMTYPE_ITEM,              GI_STICK_UPGRADE_30,true,  &logic->ProgressiveStickBag, RHT_DEKU_STICK_CAPACITY_30, ITEM_STICK_UPGRADE_30,          OBJECT_GI_STICK,        GID_STICK,          0x91,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_MAGIC_SINGLE] =                        Item(RG_MAGIC_SINGLE,                     Text{ "Magic Meter", "Jauge de Magie", "Magisches Messgerät" },                                                   ITEMTYPE_ITEM,              0x8A,               true,  &logic->ProgressiveMagic,    RHT_MAGIC_SINGLE,           RG_MAGIC_SINGLE,                OBJECT_GI_MAGICPOT,     GID_MAGIC_SMALL,    0xE4,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_MAGIC_DOUBLE] =                        Item(RG_MAGIC_DOUBLE,                     Text{ "Enhanced Magic Meter", "Jauge de Magie améliorée", "Verbesserte Magieanzeige" },                           ITEMTYPE_ITEM,              0x8A,               true,  &logic->ProgressiveMagic,    RHT_MAGIC_DOUBLE,           RG_MAGIC_DOUBLE,                OBJECT_GI_MAGICPOT,     GID_MAGIC_LARGE,    0xE8,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_TRIFORCE_PIECE] =                      Item(RG_TRIFORCE_PIECE,                   Text{ "Triforce Piece", "Triforce Piece", "Triforce Piece" },                                                     ITEMTYPE_ITEM,              0xDF,               true,  &logic->TriforcePieces,      RHT_TRIFORCE_PIECE,         RG_TRIFORCE_PIECE,              OBJECT_GI_BOMB_2,       GID_TRIFORCE_PIECE, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_HOOKSHOT] =                            Item(RG_HOOKSHOT,                         Text{ "Hookshot", "Grappin", "Fanghaken" },                                                                       ITEMTYPE_ITEM,              GI_HOOKSHOT,          true,  LOGIC_PROGRESSIVE_HOOKSHOT,    RHT_HOOKSHOT,                 ITEM_HOOKSHOT,                  OBJECT_GI_HOOKSHOT,     GID_HOOKSHOT,         0x36,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_LONGSHOT] =                            Item(RG_LONGSHOT,                         Text{ "Longshot", "Super-Grappin", "Enterhaken" },                                                                ITEMTYPE_ITEM,              GI_LONGSHOT,          true,  LOGIC_PROGRESSIVE_HOOKSHOT,    RHT_LONGSHOT,                 ITEM_LONGSHOT,                  OBJECT_GI_HOOKSHOT,     GID_LONGSHOT,         0x4F,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_FAIRY_OCARINA] =                       Item(RG_FAIRY_OCARINA,                    Text{ "Fairy Ocarina", "Ocarina des fées", "Feen-Okarina" },                                                      ITEMTYPE_ITEM,              GI_OCARINA_FAIRY,     true,  LOGIC_PROGRESSIVE_OCARINA,     RHT_FAIRY_OCARINA,            ITEM_OCARINA_FAIRY,             OBJECT_GI_OCARINA_0,    GID_OCARINA_FAIRY,    0x4A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_OCARINA_OF_TIME] =                     Item(RG_OCARINA_OF_TIME,                  Text{ "Ocarina of Time", "Ocarina du Temps", "Okarina der Zeit" },                                                ITEMTYPE_ITEM,              GI_OCARINA_OOT,       true,  LOGIC_PROGRESSIVE_OCARINA,     RHT_OCARINA_OF_TIME,          ITEM_OCARINA_TIME,              OBJECT_GI_OCARINA,      GID_OCARINA_TIME,     0x3A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BOMB_BAG] =                            Item(RG_BOMB_BAG,                         Text{ "Bomb Bag", "Sac de Bombes", "Bombentasche" },                                                              ITEMTYPE_ITEM,              GI_BOMB_BAG_20,       true,  LOGIC_PROGRESSIVE_BOMB_BAG,    RHT_BOMB_BAG,                 ITEM_BOMB_BAG_20,               OBJECT_GI_BOMBPOUCH,    GID_BOMB_BAG_20,      0x58,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BIG_BOMB_BAG] =                        Item(RG_BIG_BOMB_BAG,                     Text{ "Big Bomb Bag", "Grand Sac de Bombes", "Große Bombentasche" },                                              ITEMTYPE_ITEM,              GI_BOMB_BAG_30,       true,  LOGIC_PROGRESSIVE_BOMB_BAG,    RHT_BIG_BOMB_BAG,             ITEM_BOMB_BAG_30,               OBJECT_GI_BOMBPOUCH,    GID_BOMB_BAG_30,      0x59,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_BIGGEST_BOMB_BAG] =                    Item(RG_BIGGEST_BOMB_BAG,                 Text{ "Biggest Bomb Bag", "Énorme Sac de Bombes", "Größte Bombentasche" },                                        ITEMTYPE_ITEM,              GI_BOMB_BAG_40,       true,  LOGIC_PROGRESSIVE_BOMB_BAG,    RHT_BIGGEST_BOMB_BAG,         ITEM_BOMB_BAG_40,               OBJECT_GI_BOMBPOUCH,    GID_BOMB_BAG_40,      0x5A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_FAIRY_BOW] =                           Item(RG_FAIRY_BOW,                        Text{ "Fairy Bow", "Arc des Fées", "Feen-Bogen" },                                                                ITEMTYPE_ITEM,              GI_BOW,               true,  LOGIC_PROGRESSIVE_BOW,         RHT_FAIRY_BOW,                ITEM_BOW,                       OBJECT_GI_BOW,          GID_BOW,              0x31,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BIG_QUIVER] =                          Item(RG_BIG_QUIVER,                       Text{ "Big Quiver", "Grand carquois", "Großer Köcher" },                                                          ITEMTYPE_ITEM,              GI_QUIVER_40,         true,  LOGIC_PROGRESSIVE_BOW,         RHT_BIG_QUIVER,               ITEM_QUIVER_40,                 OBJECT_GI_ARROWCASE,    GID_QUIVER_40,        0x56,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_BIGGEST_QUIVER] =                      Item(RG_BIGGEST_QUIVER,                   Text{ "Biggest Quiver", "Énorme carquois", "Größter Köcher" },                                                    ITEMTYPE_ITEM,              GI_QUIVER_50,         true,  LOGIC_PROGRESSIVE_BOW,         RHT_BIGGEST_QUIVER,           ITEM_QUIVER_50,                 OBJECT_GI_ARROWCASE,    GID_QUIVER_50,        0x57,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_FAIRY_SLINGSHOT] =                     Item(RG_FAIRY_SLINGSHOT,                  Text{ "Fairy Slingshot", "Lance-Pierre des Fées", "Feen-Schleuder" },                                             ITEMTYPE_ITEM,              GI_SLINGSHOT,         true,  LOGIC_PROGRESSIVE_BULLET_BAG,  RHT_FAIRY_SLINGSHOT,          ITEM_SLINGSHOT,                 OBJECT_GI_PACHINKO,     GID_SLINGSHOT,        0x30,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BIG_BULLET_BAG] =                      Item(RG_BIG_BULLET_BAG,                   Text{ "Big Deku Seed Bullet Bag", "Grand sac de graines mojo", "Großer Deku-Samenkugelsack" },                    ITEMTYPE_ITEM,              GI_BULLET_BAG_40,     true,  LOGIC_PROGRESSIVE_BULLET_BAG,  RHT_BIG_BULLET_BAG,           ITEM_BULLET_BAG_40,             OBJECT_GI_DEKUPOUCH,    GID_BULLET_BAG,       0x07,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_BIGGEST_BULLET_BAG] =                  Item(RG_BIGGEST_BULLET_BAG,               Text{ "Biggest Deku Seed Bullet Bag", "Énorme sac de graines mojo", "Größte Deku-Samenkugelsack" },               ITEMTYPE_ITEM,              GI_BULLET_BAG_50,     true,  LOGIC_PROGRESSIVE_BULLET_BAG,  RHT_BIGGEST_BULLET_BAG,       ITEM_BULLET_BAG_50,             OBJECT_GI_DEKUPOUCH,    GID_BULLET_BAG,       0x07,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_GORONS_BRACELET] =                     Item(RG_GORONS_BRACELET,                  Text{ "Goron's Bracelet", "Bracelet Goron", "Goronen-Armband" },                                                  ITEMTYPE_ITEM,              GI_BRACELET,          true,  LOGIC_PROGRESSIVE_STRENGTH,    RHT_GORONS_BRACELET,          ITEM_BRACELET,                  OBJECT_GI_BRACELET,     GID_BRACELET,         0x79,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_SILVER_GAUNTLETS] =                    Item(RG_SILVER_GAUNTLETS,                 Text{ "Silver Gauntlets", "Gantelets d'argent", "Silberne Fehdehandschuhe" },                                     ITEMTYPE_ITEM,              GI_GAUNTLETS_SILVER,  true,  LOGIC_PROGRESSIVE_STRENGTH,    RHT_SILVER_GAUNTLETS,         ITEM_GAUNTLETS_SILVER,          OBJECT_GI_GLOVES,       GID_GAUNTLETS_SILVER, 0x5B,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_GOLDEN_GAUNTLETS] =                    Item(RG_GOLDEN_GAUNTLETS,                 Text{ "Golden Gauntlets", "Gantelets d'or", "Goldene Fehdehandschuhe" },                                          ITEMTYPE_ITEM,              GI_GAUNTLETS_GOLD,    true,  LOGIC_PROGRESSIVE_STRENGTH,    RHT_GOLDEN_GAUNTLETS,         ITEM_GAUNTLETS_GOLD,            OBJECT_GI_GLOVES,       GID_GAUNTLETS_GOLD,   0x5C,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_SILVER_SCALE] =                        Item(RG_SILVER_SCALE,                     Text{ "Silver Scale", "Écaille d'argent", "Silberne Skala" },                                                     ITEMTYPE_ITEM,              GI_SCALE_SILVER,      true,  LOGIC_PROGRESSIVE_SCALE,       RHT_SILVER_SCALE,             ITEM_SCALE_SILVER,              OBJECT_GI_SCALE,        GID_SCALE_SILVER,     0xCD,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_GOLDEN_SCALE] =                        Item(RG_GOLDEN_SCALE,                     Text{ "Golden Scale", "Écaille d'or", "Goldene Skala" },                                                          ITEMTYPE_ITEM,              GI_SCALE_GOLD,        true,  LOGIC_PROGRESSIVE_SCALE,       RHT_GOLDEN_SCALE,             ITEM_SCALE_GOLDEN,              OBJECT_GI_SCALE,        GID_SCALE_GOLDEN,     0xCE,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_ADULT_WALLET] =                        Item(RG_ADULT_WALLET,                     Text{ "Adult Wallet", "Grande Bourse", "Erwachsene Geldbörse" },                                                  ITEMTYPE_ITEM,              GI_WALLET_ADULT,      true,  LOGIC_PROGRESSIVE_WALLET,      RHT_ADULT_WALLET,             ITEM_WALLET_ADULT,              OBJECT_GI_PURSE,        GID_WALLET_ADULT,     0x5E,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_GIANT_WALLET] =                        Item(RG_GIANT_WALLET,                     Text{ "Giant Wallet", "Bourse de Géant", "Riesige Geldbörse" },                                                   ITEMTYPE_ITEM,              GI_WALLET_GIANT,      true,  LOGIC_PROGRESSIVE_WALLET,      RHT_GIANT_WALLET,             ITEM_WALLET_GIANT,              OBJECT_GI_PURSE,        GID_WALLET_GIANT,     0x5F,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_TYCOON_WALLET] =                       Item(RG_TYCOON_WALLET,                    Text{ "Tycoon Wallet", "Bourse de Magnat", "Reiche Geldbörse" },                                                  ITEMTYPE_ITEM,              RG_TYCOON_WALLET,     true,  LOGIC_PROGRESSIVE_WALLET,      RHT_TYCOON_WALLET,            RG_TYCOON_WALLET,               OBJECT_GI_PURSE,        GID_WALLET_GIANT,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_CHILD_WALLET] =                        Item(RG_CHILD_WALLET,                     Text{ "Child Wallet", "Bourse de Magnat", "Reiche Geldbörse" },/*FIXME: still says tycoon in french & german*/    ITEMTYPE_ITEM,              RG_CHILD_WALLET,      true,  LOGIC_PROGRESSIVE_WALLET,      RHT_CHILD_WALLET,             RG_CHILD_WALLET,                OBJECT_GI_PURSE,        GID_WALLET_ADULT,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_DEKU_NUT_CAPACITY_30] =                Item(RG_DEKU_NUT_CAPACITY_30,             Text{ "Deku Nut Capacity (30)", "Capacité de noix Mojo (30)", "Deku Nuss Kapazität (30)" },                       ITEMTYPE_ITEM,              GI_NUT_UPGRADE_30,    true,  LOGIC_PROGRESSIVE_NUT_BAG,     RHT_DEKU_NUT_CAPACITY_30,     ITEM_NUT_UPGRADE_30,            OBJECT_GI_NUTS,         GID_NUTS,             0xA7,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_DEKU_NUT_CAPACITY_40] =                Item(RG_DEKU_NUT_CAPACITY_40,             Text{ "Deku Nut Capacity (40)", "Capacité de noix Mojo (40)", "Deku Nuss Kapazität (40)" },                       ITEMTYPE_ITEM,              GI_NUT_UPGRADE_40,    true,  LOGIC_PROGRESSIVE_NUT_BAG,     RHT_DEKU_NUT_CAPACITY_40,     ITEM_NUT_UPGRADE_40,            OBJECT_GI_NUTS,         GID_NUTS,             0xA8,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_DEKU_STICK_CAPACITY_20] =              Item(RG_DEKU_STICK_CAPACITY_20,           Text{ "Deku Stick Capacity (20)", "Capacité de Bâtons Mojo (20)", "Deku Stick Kapazität (20)" },                  ITEMTYPE_ITEM,              GI_STICK_UPGRADE_20,  true,  LOGIC_PROGRESSIVE_STICK_BAG,   RHT_DEKU_STICK_CAPACITY_20,   ITEM_STICK_UPGRADE_20,          OBJECT_GI_STICK,        GID_STICK,            0x90,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_DEKU_STICK_CAPACITY_30] =              Item(RG_DEKU_STICK_CAPACITY_30,           Text{ "Deku Stick Capacity (30)", "Capacité de Bâtons Mojo (30)", "Deku Stick Kapazität (30)" },                  ITEMTYPE_ITEM,              GI_STICK_UPGRADE_30,  true,  LOGIC_PROGRESSIVE_STICK_BAG,   RHT_DEKU_STICK_CAPACITY_30,   ITEM_STICK_UPGRADE_30,          OBJECT_GI_STICK,        GID_STICK,            0x91,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_MAGIC_SINGLE] =                        Item(RG_MAGIC_SINGLE,                     Text{ "Magic Meter", "Jauge de Magie", "Magisches Messgerät" },                                                   ITEMTYPE_ITEM,              0x8A,                 true,  LOGIC_PROGRESSIVE_MAGIC,       RHT_MAGIC_SINGLE,             RG_MAGIC_SINGLE,                OBJECT_GI_MAGICPOT,     GID_MAGIC_SMALL,      0xE4,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_MAGIC_DOUBLE] =                        Item(RG_MAGIC_DOUBLE,                     Text{ "Enhanced Magic Meter", "Jauge de Magie améliorée", "Verbesserte Magieanzeige" },                           ITEMTYPE_ITEM,              0x8A,                 true,  LOGIC_PROGRESSIVE_MAGIC,       RHT_MAGIC_DOUBLE,             RG_MAGIC_DOUBLE,                OBJECT_GI_MAGICPOT,     GID_MAGIC_LARGE,      0xE8,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_TRIFORCE_PIECE] =                      Item(RG_TRIFORCE_PIECE,                   Text{ "Triforce Piece", "Triforce Piece", "Triforce Piece" },                                                     ITEMTYPE_ITEM,              0xDF,                 true,  LOGIC_TRIFORCE_PIECES,         RHT_TRIFORCE_PIECE,           RG_TRIFORCE_PIECE,              OBJECT_GI_BOMB_2,       GID_TRIFORCE_PIECE,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
 
     // Init itemNameToEnum
     for (auto& item : itemTable) {
diff --git a/soh/soh/Enhancements/randomizer/logic.cpp b/soh/soh/Enhancements/randomizer/logic.cpp
index 49f611f0e..3814e12c5 100644
--- a/soh/soh/Enhancements/randomizer/logic.cpp
+++ b/soh/soh/Enhancements/randomizer/logic.cpp
@@ -8,6 +8,7 @@
 
 #include "dungeon.h"
 #include "context.h"
+#include <spdlog/spdlog.h>
 
 namespace Rando {
     bool Logic::IsMagicItem(RandomizerGet item) {
@@ -24,52 +25,187 @@ namespace Rando {
     }
 
     bool Logic::HasItem(RandomizerGet itemName) {
-        return  (itemName == RG_DINS_FIRE              && DinsFire)            ||
-                (itemName == RG_FARORES_WIND           && FaroresWind)         ||
-                (itemName == RG_NAYRUS_LOVE            && NayrusLove)          ||
-                (itemName == RG_LENS_OF_TRUTH          && LensOfTruth)         ||
-                (itemName == RG_FAIRY_BOW              && Bow)                 ||
-                (itemName == RG_MEGATON_HAMMER         && Hammer)              ||
-                (itemName == RG_IRON_BOOTS             && IronBoots)           ||
-                (itemName == RG_HOVER_BOOTS            && HoverBoots)          ||
-                (itemName == RG_HOOKSHOT               && Hookshot)            ||
-                (itemName == RG_LONGSHOT               && Longshot)            ||
-                (itemName == RG_SILVER_GAUNTLETS       && SilverGauntlets)     ||
-                (itemName == RG_GOLDEN_GAUNTLETS       && GoldenGauntlets)     ||
-                (itemName == RG_GORON_TUNIC            && GoronTunic)          ||
-                (itemName == RG_ZORA_TUNIC             && ZoraTunic)           ||
-                (itemName == RG_SCARECROW              && Scarecrow)           ||
-                (itemName == RG_DISTANT_SCARECROW      && DistantScarecrow)    ||
-                (itemName == RG_HYLIAN_SHIELD          && HylianShield)        ||
-                (itemName == RG_MIRROR_SHIELD          && MirrorShield)        ||
-                (itemName == RG_MASTER_SWORD           && MasterSword)         ||
-                (itemName == RG_BIGGORON_SWORD         && BiggoronSword)       ||
-                (itemName == RG_FAIRY_SLINGSHOT        && Slingshot)           ||
-                (itemName == RG_BOOMERANG              && Boomerang)           ||
-                (itemName == RG_KOKIRI_SWORD           && KokiriSword)         ||
-                (itemName == RG_STICKS                 && Sticks)              ||
-                (itemName == RG_DEKU_SHIELD            && DekuShield)          ||
-                (itemName == RG_FIRE_ARROWS            && FireArrows)          ||
-                (itemName == RG_ICE_ARROWS             && IceArrows)           ||
-                (itemName == RG_LIGHT_ARROWS           && LightArrows)         ||
-                (itemName == RG_OCARINA_A_BUTTON       && OcarinaAButton)      ||
-                (itemName == RG_OCARINA_C_LEFT_BUTTON  && OcarinaCLeftButton)  ||
-                (itemName == RG_OCARINA_C_RIGHT_BUTTON && OcarinaCRightButton) ||
-                (itemName == RG_OCARINA_C_DOWN_BUTTON  && OcarinaCDownButton)  ||
-                (itemName == RG_OCARINA_C_UP_BUTTON    && OcarinaCUpButton)    ||
-                (itemName == RG_FISHING_POLE           && FishingPole)         ||
-                (itemName == RG_ZELDAS_LULLABY         && ZeldasLullaby)       ||
-                (itemName == RG_EPONAS_SONG            && EponasSong)          ||
-                (itemName == RG_SARIAS_SONG            && SariasSong)          ||
-                (itemName == RG_SUNS_SONG              && SunsSong)            ||
-                (itemName == RG_SONG_OF_TIME           && SongOfTime)          ||
-                (itemName == RG_SONG_OF_STORMS         && SongOfStorms)        ||
-                (itemName == RG_MINUET_OF_FOREST       && MinuetOfForest)      ||
-                (itemName == RG_BOLERO_OF_FIRE         && BoleroOfFire)        ||
-                (itemName == RG_SERENADE_OF_WATER      && SerenadeOfWater)     ||
-                (itemName == RG_REQUIEM_OF_SPIRIT      && RequiemOfSpirit)     ||
-                (itemName == RG_NOCTURNE_OF_SHADOW     && NocturneOfShadow)    ||
-                (itemName == RG_PRELUDE_OF_LIGHT       && PreludeOfLight);
+        switch (itemName) {
+            case RG_FAIRY_OCARINA:
+                return ctx->CheckInventory(ITEM_OCARINA_FAIRY, false);
+            case RG_OCARINA_OF_TIME:
+                return ctx->CheckInventory(ITEM_OCARINA_TIME, true);
+            case RG_DINS_FIRE:
+                return ctx->CheckInventory(ITEM_DINS_FIRE, true);
+            case RG_FARORES_WIND:
+                return ctx->CheckInventory(ITEM_FARORES_WIND, true);
+            case RG_NAYRUS_LOVE:
+                return ctx->CheckInventory(ITEM_NAYRUS_LOVE, true);
+            case RG_LENS_OF_TRUTH:
+                return ctx->CheckInventory(ITEM_LENS, true);
+            case RG_FAIRY_BOW:
+                return ctx->CheckInventory(ITEM_BOW, true);
+            case RG_MEGATON_HAMMER:
+                return ctx->CheckInventory(ITEM_HAMMER, true);
+            case RG_HOOKSHOT:
+                return ctx->CheckInventory(ITEM_HOOKSHOT, false);
+            case RG_LONGSHOT:
+                return ctx->CheckInventory(ITEM_LONGSHOT, true);
+            case RG_PROGRESSIVE_STICK_UPGRADE:
+            case RG_STICKS:
+                return ctx->CurrentUpgrade(UPG_STICKS);
+            case RG_FIRE_ARROWS:
+                return ctx->CheckInventory(ITEM_ARROW_FIRE, true);
+            case RG_ICE_ARROWS:
+                return ctx->CheckInventory(ITEM_ARROW_ICE, true);
+            case RG_LIGHT_ARROWS:
+                return ctx->CheckInventory(ITEM_ARROW_LIGHT, true);
+            case RG_PROGRESSIVE_BOMBCHUS:
+                return ctx->CheckInventory(ITEM_BOMBCHU, true);
+            case RG_FAIRY_SLINGSHOT:
+                return ctx->CheckInventory(ITEM_SLINGSHOT, true);
+            case RG_BOOMERANG:
+                return ctx->CheckInventory(ITEM_BOOMERANG, true);
+            case RG_PROGRESSIVE_NUT_UPGRADE:
+            case RG_NUTS:
+                return ctx->CurrentUpgrade(UPG_NUTS);
+            case RG_SCARECROW:
+                return Scarecrow;
+            case RG_DISTANT_SCARECROW:
+                return DistantScarecrow;
+            case RG_KOKIRI_SWORD:
+            case RG_DEKU_SHIELD:
+            case RG_GORON_TUNIC:
+            case RG_ZORA_TUNIC:
+            case RG_HYLIAN_SHIELD:
+            case RG_MIRROR_SHIELD:
+            case RG_MASTER_SWORD:
+            case RG_BIGGORON_SWORD:
+            case RG_IRON_BOOTS:
+            case RG_HOVER_BOOTS:
+                return ctx->CheckEquipment(Context::RandoGetToEquipFlag.at(itemName));
+            case RG_GORONS_BRACELET:
+                return ctx->CurrentUpgrade(UPG_STRENGTH);
+            case RG_SILVER_GAUNTLETS:
+                return ctx->CurrentUpgrade(UPG_STRENGTH) >= 2;
+            case RG_GOLDEN_GAUNTLETS:
+                return ctx->CurrentUpgrade(UPG_STRENGTH) >= 3;
+            case RG_PROGRESSIVE_BOMB_BAG:
+            case RG_BOMB_BAG:
+                return ctx->CurrentUpgrade(UPG_BOMB_BAG);
+            case RG_MAGIC_SINGLE:
+                return ctx->GetSaveContext()->magicLevel >= 1;
+                // Songs
+            case RG_ZELDAS_LULLABY:
+            case RG_EPONAS_SONG:
+            case RG_SARIAS_SONG:
+            case RG_SUNS_SONG:
+            case RG_SONG_OF_TIME:
+            case RG_SONG_OF_STORMS:
+            case RG_MINUET_OF_FOREST:
+            case RG_BOLERO_OF_FIRE:
+            case RG_SERENADE_OF_WATER:
+            case RG_REQUIEM_OF_SPIRIT:
+            case RG_NOCTURNE_OF_SHADOW:
+            case RG_PRELUDE_OF_LIGHT:
+                // Dungeon Rewards
+            case RG_KOKIRI_EMERALD:
+            case RG_GORON_RUBY:
+            case RG_ZORA_SAPPHIRE:
+            case RG_FOREST_MEDALLION:
+            case RG_FIRE_MEDALLION:
+            case RG_WATER_MEDALLION:
+            case RG_SPIRIT_MEDALLION:
+            case RG_SHADOW_MEDALLION:
+            case RG_LIGHT_MEDALLION:
+                // Misc Quest Items
+            case RG_STONE_OF_AGONY:
+            case RG_GERUDO_MEMBERSHIP_CARD:
+                return ctx->CheckQuestItem(Context::RandoGetToQuestItem.at(itemName));
+            case RG_RUTOS_LETTER:
+                return ctx->CheckEventChkInf(EVENTCHKINF_OBTAINED_RUTOS_LETTER);
+            case RG_DOUBLE_DEFENSE:
+                return ctx->GetSaveContext()->isDoubleDefenseAcquired;
+            case RG_FISHING_POLE:
+            case RG_ZELDAS_LETTER:
+            case RG_WEIRD_EGG:
+            case RG_GREG_RUPEE:
+                // Ocarina Buttons
+            case RG_OCARINA_A_BUTTON:
+            case RG_OCARINA_C_LEFT_BUTTON:
+            case RG_OCARINA_C_RIGHT_BUTTON:
+            case RG_OCARINA_C_DOWN_BUTTON:
+            case RG_OCARINA_C_UP_BUTTON:
+                // Boss Souls
+            case RG_GOHMA_SOUL:
+            case RG_KING_DODONGO_SOUL:
+            case RG_BARINADE_SOUL:
+            case RG_PHANTOM_GANON_SOUL:
+            case RG_VOLVAGIA_SOUL:
+            case RG_MORPHA_SOUL:
+            case RG_BONGO_BONGO_SOUL:
+            case RG_TWINROVA_SOUL:
+            case RG_GANON_SOUL:
+            case RG_SKELETON_KEY:
+                return ctx->CheckRandoInf(Context::RandoGetToRandInf.at(itemName));
+                // Boss Keys
+            case RG_FOREST_TEMPLE_BOSS_KEY:
+            case RG_FIRE_TEMPLE_BOSS_KEY:
+            case RG_WATER_TEMPLE_BOSS_KEY:
+            case RG_SPIRIT_TEMPLE_BOSS_KEY:
+            case RG_SHADOW_TEMPLE_BOSS_KEY:
+            case RG_GANONS_CASTLE_BOSS_KEY:
+                return ctx->CheckDungeonItem(DUNGEON_KEY_BOSS, Context::RandoGetToDungeonScene.at(itemName));
+                // Maps
+            case RG_DEKU_TREE_MAP:
+            case RG_DODONGOS_CAVERN_MAP:
+            case RG_JABU_JABUS_BELLY_MAP:
+            case RG_FOREST_TEMPLE_MAP:
+            case RG_FIRE_TEMPLE_MAP:
+            case RG_WATER_TEMPLE_MAP:
+            case RG_SPIRIT_TEMPLE_MAP:
+            case RG_SHADOW_TEMPLE_MAP:
+            case RG_BOTTOM_OF_THE_WELL_MAP:
+            case RG_ICE_CAVERN_MAP:
+                return ctx->CheckDungeonItem(DUNGEON_MAP, Context::RandoGetToDungeonScene.at(itemName));
+                // Compasses
+            case RG_DEKU_TREE_COMPASS:
+            case RG_DODONGOS_CAVERN_COMPASS:
+            case RG_JABU_JABUS_BELLY_COMPASS:
+            case RG_FOREST_TEMPLE_COMPASS:
+            case RG_FIRE_TEMPLE_COMPASS:
+            case RG_WATER_TEMPLE_COMPASS:
+            case RG_SPIRIT_TEMPLE_COMPASS:
+            case RG_SHADOW_TEMPLE_COMPASS:
+            case RG_BOTTOM_OF_THE_WELL_COMPASS:
+            case RG_ICE_CAVERN_COMPASS:
+                return ctx->CheckDungeonItem(DUNGEON_COMPASS, Context::RandoGetToDungeonScene.at(itemName));
+                // Wallets
+            case RG_CHILD_WALLET:
+                return ctx->CheckRandoInf(RAND_INF_HAS_WALLET);
+            case RG_ADULT_WALLET:
+                return ctx->CurrentUpgrade(UPG_WALLET) >= 1;
+            case RG_GIANT_WALLET:
+                return ctx->CurrentUpgrade(UPG_WALLET) >= 2;
+            case RG_TYCOON_WALLET:
+                return ctx->CurrentUpgrade(UPG_WALLET) >= 3;
+                // Scales
+            case RG_BRONZE_SCALE:
+                return ctx->CheckRandoInf(RAND_INF_CAN_SWIM);
+            case RG_SILVER_SCALE:
+                return ctx->CurrentUpgrade(UPG_SCALE) >= 1;
+            case RG_GOLDEN_SCALE:
+                return ctx->CurrentUpgrade(UPG_SCALE) >= 2;
+            case RG_POCKET_EGG:
+            case RG_COJIRO:
+            case RG_ODD_MUSHROOM:
+            case RG_ODD_POTION:
+            case RG_POACHERS_SAW:
+            case RG_BROKEN_SWORD:
+            case RG_PRESCRIPTION:
+            case RG_EYEBALL_FROG:
+            case RG_EYEDROPS:
+            case RG_CLAIM_CHECK:
+                return ctx->HasAdultTrade(StaticData::RetrieveItem(itemName).GetGIEntry()->itemId);
+        }
+        SPDLOG_ERROR("HasItem reached `return false;`. Missing case for RandomizerGet of {}", static_cast<uint32_t>(itemName));
+        assert(false);
+        return false;
     }
 
     //Can the passed in item be used?
@@ -124,37 +260,62 @@ namespace Rando {
                 return IsChild;// || StickAsAdult;
             case RG_DEKU_SHIELD:
                 return IsChild;// || DekuShieldAsAdult;
+            case RG_WEIRD_EGG:
+                return IsChild;
+            case RG_RUTOS_LETTER:
+                return IsChild;
+
+                // Adult Trade
+            case RG_POCKET_EGG:
+                return IsAdult;
+            case RG_COJIRO:
+                return IsAdult;
+            case RG_ODD_MUSHROOM:
+                return IsAdult;
+            case RG_ODD_POTION:
+                return IsAdult;
+            case RG_POACHERS_SAW:
+                return IsAdult;
+            case RG_BROKEN_SWORD:
+                return IsAdult;
+            case RG_PRESCRIPTION:
+                return IsAdult;
+            case RG_EYEBALL_FROG:
+                return IsAdult;
+            case RG_EYEDROPS:
+                return IsAdult;
+            case RG_CLAIM_CHECK:
+                return IsAdult;
 
             // Songs
             case RG_ZELDAS_LULLABY:
-                return Ocarina && OcarinaCLeftButton && OcarinaCRightButton && OcarinaCUpButton;
+                return Ocarina && HasItem(RG_OCARINA_C_LEFT_BUTTON) && HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_UP_BUTTON);
             case RG_EPONAS_SONG:
-                return Ocarina && OcarinaCLeftButton && OcarinaCRightButton && OcarinaCUpButton;
+                return Ocarina && HasItem(RG_OCARINA_C_LEFT_BUTTON) && HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_UP_BUTTON);
             case RG_SARIAS_SONG:
-                return Ocarina && OcarinaCLeftButton && OcarinaCRightButton && OcarinaCDownButton;
+                return Ocarina && HasItem(RG_OCARINA_C_LEFT_BUTTON) && HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_DOWN_BUTTON);
             case RG_SUNS_SONG:
-                return Ocarina && OcarinaCRightButton && OcarinaCUpButton && OcarinaCDownButton;
+                return Ocarina && HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_UP_BUTTON) && HasItem(RG_OCARINA_C_DOWN_BUTTON);
             case RG_SONG_OF_TIME:
-                return Ocarina && OcarinaAButton && OcarinaCRightButton && OcarinaCDownButton;
+                return Ocarina && HasItem(RG_OCARINA_A_BUTTON) && HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_DOWN_BUTTON);
             case RG_SONG_OF_STORMS:
-                return Ocarina && OcarinaAButton && OcarinaCUpButton && OcarinaCDownButton;
+                return Ocarina && HasItem(RG_OCARINA_A_BUTTON) && HasItem(RG_OCARINA_C_UP_BUTTON) && HasItem(RG_OCARINA_C_DOWN_BUTTON);
             case RG_MINUET_OF_FOREST:
-                return Ocarina && OcarinaAButton && OcarinaCLeftButton && OcarinaCRightButton && OcarinaCUpButton;
+                return Ocarina && HasItem(RG_OCARINA_A_BUTTON) && HasItem(RG_OCARINA_C_LEFT_BUTTON) && HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_UP_BUTTON);
             case RG_BOLERO_OF_FIRE:
-                return Ocarina && OcarinaAButton && OcarinaCRightButton && OcarinaCDownButton;
+                return Ocarina && HasItem(RG_OCARINA_A_BUTTON) && HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_DOWN_BUTTON);
             case RG_SERENADE_OF_WATER:
-                return Ocarina && OcarinaAButton && OcarinaCLeftButton && OcarinaCRightButton && OcarinaCDownButton;
+                return Ocarina && HasItem(RG_OCARINA_A_BUTTON) && HasItem(RG_OCARINA_C_LEFT_BUTTON) && HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_DOWN_BUTTON);
             case RG_REQUIEM_OF_SPIRIT:
-                return Ocarina && OcarinaAButton && OcarinaCRightButton && OcarinaCDownButton;
+                return Ocarina && HasItem(RG_OCARINA_A_BUTTON) && HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_DOWN_BUTTON);
             case RG_NOCTURNE_OF_SHADOW:
-                return Ocarina && OcarinaAButton && OcarinaCLeftButton && OcarinaCRightButton && OcarinaCDownButton;
+                return Ocarina && HasItem(RG_OCARINA_A_BUTTON) && HasItem(RG_OCARINA_C_LEFT_BUTTON) && HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_DOWN_BUTTON);
             case RG_PRELUDE_OF_LIGHT:
-                return Ocarina && OcarinaCLeftButton && OcarinaCRightButton && OcarinaCUpButton;
+                return Ocarina && HasItem(RG_OCARINA_C_LEFT_BUTTON) && HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_UP_BUTTON);
 
             // Misc. Items
-            // TODO: Once child wallet shuffle is added, this will need to be updated to account for the fishing pond entry fee.
             case RG_FISHING_POLE:
-                return true; // as long as you have enough rubies
+                return HasItem(RG_CHILD_WALLET); // as long as you have enough rubies
 
             // Magic items
             default:
@@ -171,31 +332,23 @@ namespace Rando {
     }
 
     bool Logic::HasBossSoul(RandomizerGet itemName) {
-        auto ctx = Rando::Context::GetInstance();
         if (!ctx->GetOption(RSK_SHUFFLE_BOSS_SOULS)) {
             return true;
         }
         switch(itemName) {
             case RG_GOHMA_SOUL:
-                return CanSummonGohma;
             case RG_KING_DODONGO_SOUL:
-                return CanSummonKingDodongo;
             case RG_BARINADE_SOUL:
-                return CanSummonBarinade;
             case RG_PHANTOM_GANON_SOUL:
-                return CanSummonPhantomGanon;
             case RG_VOLVAGIA_SOUL:
-                return CanSummonVolvagia;
             case RG_MORPHA_SOUL:
-                return CanSummonMorpha;
             case RG_BONGO_BONGO_SOUL:
-                return CanSummonBongoBongo;
             case RG_TWINROVA_SOUL:
-                return CanSummonTwinrova;
+                return HasItem(itemName);
             case RG_GANON_SOUL:
-                return ctx->GetOption(RSK_SHUFFLE_BOSS_SOULS).Is(RO_BOSS_SOULS_ON_PLUS_GANON) ? CanSummonGanon : true;
+                return ctx->GetOption(RSK_SHUFFLE_BOSS_SOULS).Is(RO_BOSS_SOULS_ON_PLUS_GANON) ? HasItem(RG_GANON_SOUL) : true;
             default:
-                break;
+                return false;
         }
     }
 
@@ -223,7 +376,7 @@ namespace Rando {
             case GlitchType::EquipSwap: // todo: add bunny hood to adult item equippable list and child trade item to child item equippable list
                 return ((IsAdult && (HasItem(RG_DINS_FIRE) || HasItem(RG_FARORES_WIND) || HasItem(RG_NAYRUS_LOVE))) || (IsChild && (HasItem(RG_STICKS) || 
                     HasItem(RG_FAIRY_SLINGSHOT) || HasItem(RG_BOOMERANG) || HasBottle || Nuts || Ocarina || HasItem(RG_LENS_OF_TRUTH) || HasExplosives ||
-                    (MagicBean || MagicBeanPack) || HasItem(RG_DINS_FIRE) || HasItem(RG_FARORES_WIND) || HasItem(RG_NAYRUS_LOVE)))) && false; //GlitchEquipSwap;
+                    ctx->GetAmmo(ITEM_BEAN) > 0 || HasItem(RG_DINS_FIRE) || HasItem(RG_FARORES_WIND) || HasItem(RG_NAYRUS_LOVE)))) && false; //GlitchEquipSwap;
         }
 
         //Shouldn't be reached
@@ -254,33 +407,116 @@ namespace Rando {
         
     }
 
+    uint8_t Logic::BottleCount() {
+        uint8_t count = 0;
+        for (int i = SLOT_BOTTLE_1; i <= SLOT_BOTTLE_4; i++) {
+            uint8_t item = ctx->GetSaveContext()->inventory.items[i];
+            if (item != ITEM_NONE && (item != ITEM_LETTER_RUTO || (item == ITEM_LETTER_RUTO && DeliverLetter)) && item != ITEM_BIG_POE) {
+                count++;
+            }
+        }
+        return count;
+    }
+
     // Updates all logic helpers. Should be called whenever a non-helper is changed
     void Logic::UpdateHelpers() {
-        auto ctx = Rando::Context::GetInstance();
-        OcarinaButtons  =  (OcarinaAButton ? 1 : 0) +
-                           (OcarinaCLeftButton ? 1 : 0) +
-                           (OcarinaCRightButton ? 1 : 0) +
-                           (OcarinaCUpButton ? 1 : 0) +
-                           (OcarinaCDownButton ? 1 : 0);
-        NumBottles      = ((NoBottles) ? 0 : (Bottles + ((DeliverLetter) ? 1 : 0)));
+        OcarinaButtons  =  (HasItem(RG_OCARINA_A_BUTTON) ? 1 : 0) +
+                           (HasItem(RG_OCARINA_C_LEFT_BUTTON) ? 1 : 0) +
+                           (HasItem(RG_OCARINA_C_RIGHT_BUTTON) ? 1 : 0) +
+                           (HasItem(RG_OCARINA_C_UP_BUTTON) ? 1 : 0) +
+                           (HasItem(RG_OCARINA_C_DOWN_BUTTON) ? 1 : 0);
+        ZeldasLetter   = HasItem(RG_ZELDAS_LETTER);
+        WeirdEgg       = CanUse(RG_WEIRD_EGG);
+        Bombchus       = HasItem(RG_PROGRESSIVE_BOMBCHUS);
+        BuySeed        = GetInLogic(LOGIC_BUY_SEED);
+        BuyArrow       = GetInLogic(LOGIC_BUY_ARROW);
+        BuyBomb        = GetInLogic(LOGIC_BUY_BOMB);
+        BuyMagicPotion = GetInLogic(LOGIC_BUY_MAGIC_POTION);
+        BuyBombchus    = GetInLogic(LOGIC_BUY_BOMBCHUS);
+        MagicBean      = ctx->GetAmmo(ITEM_BEAN) > 0;
+        RutosLetter    = CanUse(RG_RUTOS_LETTER);
+        Boomerang      = CanUse(RG_BOOMERANG);
+        DinsFire       = CanUse(RG_DINS_FIRE);
+        FaroresWind    = CanUse(RG_FARORES_WIND);
+        NayrusLove     = CanUse(RG_NAYRUS_LOVE);
+        LensOfTruth    = CanUse(RG_LENS_OF_TRUTH);
+        ShardOfAgony   = HasItem(RG_STONE_OF_AGONY);
+        //SkullMask      = false;
+        //MaskOfTruth    = false;
+
+        //Adult logic
+        Hammer          = CanUse(RG_MEGATON_HAMMER);
+        IronBoots       = CanUse(RG_IRON_BOOTS);
+        HoverBoots      = CanUse(RG_HOVER_BOOTS);
+        DekuShield      = CanUse(RG_DEKU_SHIELD);
+        HylianShield    = CanUse(RG_HYLIAN_SHIELD);
+        MirrorShield    = CanUse(RG_MIRROR_SHIELD);
+        GoronTunic      = CanUse(RG_GORON_TUNIC);
+        ZoraTunic       = CanUse(RG_ZORA_TUNIC);
+        //Epona         = false;
+        //BigPoe        = false;
+        GerudoToken     = HasItem(RG_GERUDO_MEMBERSHIP_CARD);
+        FireArrows      = CanUse(RG_FIRE_ARROWS);
+        IceArrows       = CanUse(RG_ICE_ARROWS);
+        LightArrows     = CanUse(RG_LIGHT_ARROWS);
+        KokiriSword     = CanUse(RG_KOKIRI_SWORD);
+        MasterSword     = CanUse(RG_MASTER_SWORD);
+        BiggoronSword   = CanUse(RG_MASTER_SWORD);
+        NumBottles      = ((NoBottles) ? 0 : BottleCount());
         HasBottle       = NumBottles >= 1;
-        Slingshot       = (ProgressiveBulletBag >= 1) && (BuySeed || AmmoCanDrop);
-        Ocarina         = ProgressiveOcarina    >= 1;
-        OcarinaOfTime   = ProgressiveOcarina    >= 2;
-        MagicMeter      = (ProgressiveMagic     >= 1) && (AmmoCanDrop || (HasBottle && BuyMagicPotion));
-        BombBag         = (ProgressiveBombBag   >= 1) && (BuyBomb || AmmoCanDrop);
-        Hookshot        = ProgressiveHookshot   >= 1;
-        Longshot        = ProgressiveHookshot   >= 2;
-        Bow             = (ProgressiveBow       >= 1) && (BuyArrow || AmmoCanDrop);
-        GoronBracelet   = ProgressiveStrength   >= 1;
-        SilverGauntlets = ProgressiveStrength   >= 2;
-        GoldenGauntlets = ProgressiveStrength   >= 3;
-        Swim            = ProgressiveScale      >= 1;
-        SilverScale     = ProgressiveScale      >= 2;
-        GoldScale       = ProgressiveScale      >= 3;
-        ChildsWallet    = ProgressiveWallet     >= 1;
-        AdultsWallet    = ProgressiveWallet     >= 2;
-        BiggoronSword   = BiggoronSword || ProgressiveGiantKnife >= 2;
+        Slingshot       = CanUse(RG_FAIRY_SLINGSHOT) && (BuySeed || AmmoCanDrop);
+        Ocarina         = HasItem(RG_FAIRY_OCARINA);
+        OcarinaOfTime   = HasItem(RG_OCARINA_OF_TIME);
+        MagicMeter      = HasItem(RG_MAGIC_SINGLE) && (AmmoCanDrop || (HasBottle && BuyMagicPotion));
+        BombBag         = HasItem(RG_BOMB_BAG) && (BuyBomb || AmmoCanDrop);
+        Hookshot        = CanUse(RG_HOOKSHOT);
+        Longshot        = CanUse(RG_LONGSHOT);
+        Bow             = CanUse(RG_FAIRY_BOW) && (BuyArrow || AmmoCanDrop);
+        GoronBracelet   = HasItem(RG_GORONS_BRACELET);
+        SilverGauntlets = HasItem(RG_SILVER_GAUNTLETS);
+        GoldenGauntlets = HasItem(RG_GOLDEN_GAUNTLETS);
+        Swim            = HasItem(RG_BRONZE_SCALE);
+        SilverScale     = HasItem(RG_SILVER_SCALE);
+        GoldScale       = HasItem(RG_GOLDEN_SCALE);
+        ChildsWallet    = HasItem(RG_CHILD_WALLET);
+        AdultsWallet    = HasItem(RG_ADULT_WALLET);
+        BiggoronSword   = HasItem(RG_BIGGORON_SWORD);
+
+        ProgressiveScale  = ctx->CurrentUpgrade(UPG_SCALE) + HasItem(RG_BRONZE_SCALE);
+        ProgressiveWallet = ctx->CurrentUpgrade(UPG_WALLET) + HasItem(RG_CHILD_WALLET);
+
+        CanSummonGohma        = HasBossSoul(RG_GOHMA_SOUL);
+        CanSummonKingDodongo  = HasBossSoul(RG_KING_DODONGO_SOUL);
+        CanSummonBarinade     = HasBossSoul(RG_BARINADE_SOUL);
+        CanSummonPhantomGanon = HasBossSoul(RG_PHANTOM_GANON_SOUL);
+        CanSummonVolvagia     = HasBossSoul(RG_VOLVAGIA_SOUL);
+        CanSummonMorpha       = HasBossSoul(RG_MORPHA_SOUL);
+        CanSummonBongoBongo   = HasBossSoul(RG_BONGO_BONGO_SOUL);
+        CanSummonTwinrova     = HasBossSoul(RG_TWINROVA_SOUL);
+        CanSummonGanon        = HasBossSoul(RG_GANON_SOUL);
+
+        // Boss Keys
+        BossKeyForestTemple = HasItem(RG_FOREST_TEMPLE_BOSS_KEY);
+        BossKeyFireTemple   = HasItem(RG_FIRE_TEMPLE_BOSS_KEY);
+        BossKeyWaterTemple  = HasItem(RG_WATER_TEMPLE_BOSS_KEY);
+        BossKeySpiritTemple = HasItem(RG_SPIRIT_TEMPLE_BOSS_KEY);
+        BossKeyShadowTemple = HasItem(RG_SHADOW_TEMPLE_BOSS_KEY);
+        BossKeyGanonsCastle = HasItem(RG_GANONS_CASTLE_BOSS_KEY);
+
+        KokiriEmerald   = HasItem(RG_KOKIRI_EMERALD);
+        GoronRuby       = HasItem(RG_GORON_RUBY);
+        ZoraSapphire    = HasItem(RG_ZORA_SAPPHIRE);
+        ForestMedallion = HasItem(RG_FOREST_MEDALLION);
+        FireMedallion   = HasItem(RG_FIRE_MEDALLION);
+        WaterMedallion  = HasItem(RG_WATER_MEDALLION);
+        SpiritMedallion = HasItem(RG_SPIRIT_MEDALLION);
+        ShadowMedallion = HasItem(RG_SHADOW_MEDALLION);
+        LightMedallion  = HasItem(RG_LIGHT_MEDALLION);
+
+        DoubleDefense = HasItem(RG_DOUBLE_DEFENSE);
+        TriforcePieces = ctx->GetSaveContext()->triforcePiecesCollected;
+        Greg = HasItem(RG_GREG_RUPEE);
+        GoldSkulltulaTokens = ctx->GetGSCount();
 
         //you need at least 2 buttons for scarecrow song
         ScarecrowSong    = ScarecrowSong || (ctx->GetOption(RSK_SKIP_SCARECROWS_SONG) && Ocarina && OcarinaButtons >= 2) || (ChildScarecrow && AdultScarecrow);
@@ -290,21 +526,22 @@ namespace Rando {
         //Drop Access
         DekuStickDrop = StickPot || DekuBabaSticks;
         DekuNutDrop   = (NutPot  || NutCrate         || DekuBabaNuts) && AmmoCanDrop;
-        BugsAccess    = BugShrub || WanderingBugs    || BugRock;
-        FishAccess    = LoneFish || FishGroup;
-        FairyAccess   = FairyPot || GossipStoneFairy || BeanPlantFairy || ButterflyFairy || FreeFairies || FairyPond;
+        BugsAccess    = BugShrub || WanderingBugs    || BugRock || GetInLogic(LOGIC_BUGS_ACCESS);
+        FishAccess    = LoneFish || FishGroup || GetInLogic(LOGIC_FISH_ACCESS);
+        FairyAccess   = FairyPot || GossipStoneFairy || BeanPlantFairy || ButterflyFairy || FreeFairies || FairyPond || GetInLogic(LOGIC_FAIRY_ACCESS);
 
 
         //refills
-        Bombs        = BombBag;
-        Nuts         = (ProgressiveNutBag != 0 && DekuNutDrop) || Nuts;
-        Sticks       = (ProgressiveStickBag != 0 && DekuStickDrop) || Sticks;
+        Bombs        = HasItem(RG_PROGRESSIVE_BOMB_BAG);
+        Nuts         = DekuNutDrop || HasItem(RG_NUTS);
+        Sticks       = DekuStickDrop || HasItem(RG_STICKS);
         Bugs         = HasBottle && BugsAccess;
+        BlueFireAccess = BlueFireAccess || GetInLogic(LOGIC_BLUE_FIRE_ACCESS);
         BlueFire     = (HasBottle && BlueFireAccess) || (ctx->GetOption(RSK_BLUE_FIRE_ARROWS) && CanUse(RG_ICE_ARROWS));
         Fish         = HasBottle && FishAccess;
         Fairy        = HasBottle && FairyAccess;
 
-        FoundBombchus   = (BombchuDrop || Bombchus || Bombchus5 || Bombchus10 || Bombchus20) && (BombBag || ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC));
+        FoundBombchus   = Bombchus && (BombBag || ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC));
         CanPlayBowling  = ChildsWallet && ((ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && FoundBombchus) || (!ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && BombBag));
         // TODO: Implement Ammo Drop Setting in place of bombchu drops
         HasBombchus = (BuyBombchus || (ctx->GetOption(RSK_ENABLE_BOMBCHU_DROPS).Is(RO_AMMO_DROPS_ON/*_PLUS_BOMBCHU*/) && FoundBombchus));
@@ -314,15 +551,16 @@ namespace Rando {
         HasBoots = IronBoots || HoverBoots;
 
         //Unshuffled adult trade quest
-        Eyedrops     = Eyedrops     || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && ClaimCheck);
-        EyeballFrog  = EyeballFrog  || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && Eyedrops);
-        Prescription = Prescription || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && EyeballFrog);
-        BrokenSword  = BrokenSword  || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && Prescription);
-        PoachersSaw  = PoachersSaw  || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && BrokenSword);
-        OddPoultice  = OddPoultice  || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && PoachersSaw);
-        OddMushroom  = OddMushroom  || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && OddPoultice);
-        Cojiro       = Cojiro       || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && OddMushroom);
-        PocketEgg    = PocketEgg    || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && Cojiro);
+        ClaimCheck = CanUse(RG_CLAIM_CHECK);
+        Eyedrops = CanUse(RG_EYEDROPS) || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && ClaimCheck);
+        EyeballFrog = CanUse(RG_EYEBALL_FROG) || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && Eyedrops);
+        Prescription = CanUse(RG_PRESCRIPTION) || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && EyeballFrog);
+        BrokenSword = CanUse(RG_BROKEN_SWORD) || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && Prescription);
+        PoachersSaw = CanUse(RG_POACHERS_SAW) || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && BrokenSword);
+        OddPoultice = CanUse(RG_ODD_POTION) || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && PoachersSaw);
+        OddMushroom = CanUse(RG_ODD_MUSHROOM) || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && OddPoultice);
+        Cojiro = CanUse(RG_COJIRO) || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && OddMushroom);
+        PocketEgg = CanUse(RG_POCKET_EGG) || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && Cojiro);
 
         // IsChild = Age == AGE_CHILD;
         // IsAdult = Age == AGE_ADULT;
@@ -340,7 +578,7 @@ namespace Rando {
         CanRideEpona    = IsAdult && Epona && CanUse(RG_EPONAS_SONG);
         CanSummonGossipFairyWithoutSuns = CanUse(RG_ZELDAS_LULLABY) || CanUse(RG_EPONAS_SONG) || CanUse(RG_SONG_OF_TIME);
         CanSummonGossipFairy            = CanSummonGossipFairyWithoutSuns || CanUse(RG_SUNS_SONG);
-        Hearts          = BaseHearts + HeartContainer + (PieceOfHeart >> 2);
+        Hearts          = ctx->GetSaveContext()->healthCapacity / 16;
         EffectiveHealth = ((Hearts << (2 + DoubleDefense)) >> Multiplier) + ((Hearts << (2 + DoubleDefense)) % (1 << Multiplier) > 0); //Number of half heart hits to die, ranges from 1 to 160
         FireTimer       = CanUse(RG_GORON_TUNIC) ? 255 : (ctx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS)) ? (Hearts * 8) : 0;
         WaterTimer      = CanUse(RG_ZORA_TUNIC) ? 255 : (ctx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS)) ? (Hearts * 8) : 0;
@@ -348,14 +586,13 @@ namespace Rando {
         CanSurviveDamage    = !NeedNayrusLove || CanUse(RG_NAYRUS_LOVE);
         CanTakeDamage       = Fairy || CanSurviveDamage;
         CanTakeDamageTwice  = (Fairy && NumBottles >= 2) || ((EffectiveHealth == 2) && (CanUse(RG_NAYRUS_LOVE) || Fairy)) || (EffectiveHealth > 2);
-        //CanPlantBean        = IsChild && (MagicBean || MagicBeanPack);
         CanOpenBombGrotto   = CanBlastOrSmash       && (ShardOfAgony || ctx->GetTrickOption(RT_GROTTOS_WITHOUT_AGONY));
         CanOpenStormGrotto  = CanUse(RG_SONG_OF_STORMS) && (ShardOfAgony || ctx->GetTrickOption(RT_GROTTOS_WITHOUT_AGONY));
         HookshotOrBoomerang = CanUse(RG_HOOKSHOT) || CanUse(RG_BOOMERANG);
         CanGetNightTimeGS   = (CanUse(RG_SUNS_SONG) || !ctx->GetOption(RSK_SKULLS_SUNS_SONG));
         CanBreakUpperBeehives = HookshotOrBoomerang || (ctx->GetTrickOption(RT_BOMBCHU_BEEHIVES) && HasBombchus);
         CanBreakLowerBeehives = CanBreakUpperBeehives || Bombs;
-        CanFish = ChildsWallet && (CanUse(RG_FISHING_POLE) || !ctx->GetOption(RSK_SHUFFLE_FISHING_POLE));
+        CanFish = ChildsWallet && (HasItem(RG_FISHING_POLE) || !ctx->GetOption(RSK_SHUFFLE_FISHING_POLE));
         CanGetChildFish = CanFish && (IsChild || (IsAdult && !ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT)));
         CanGetAdultFish = CanFish && IsAdult && ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT);
 
@@ -365,8 +602,8 @@ namespace Rando {
         HasFireSourceWithTorch = HasFireSource || CanUse(RG_STICKS);
 
         //Gerudo Fortress
-        CanFinishGerudoFortress = (ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_NORMAL)    && GerudoFortressKeys >= 4 && (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) && (GerudoToken || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_HOVER_BOOTS) || ctx->GetTrickOption(RT_GF_KITCHEN))) ||
-                                    (ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_FAST)      && GerudoFortressKeys >= 1 && (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD))) ||
+        CanFinishGerudoFortress = (ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_NORMAL)      && SmallKeys(RR_GERUDO_FORTRESS, 4) && (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) && (GerudoToken || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_HOVER_BOOTS) || ctx->GetTrickOption(RT_GF_KITCHEN))) ||
+                                    (ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_FAST)      && SmallKeys(RR_GERUDO_FORTRESS, 1) && (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD))) ||
                                     (ctx->GetOption(RSK_GERUDO_FORTRESS).IsNot(RO_GF_NORMAL) && ctx->GetOption(RSK_GERUDO_FORTRESS).IsNot(RO_GF_FAST));
 
         HasShield          = CanUse(RG_HYLIAN_SHIELD) || CanUse(RG_DEKU_SHIELD); //Mirror shield can't reflect attacks
@@ -411,7 +648,7 @@ namespace Rando {
     }
 
     bool Logic::SmallKeys(RandomizerRegion dungeon, uint8_t requiredAmountGlitchless, uint8_t requiredAmountGlitched) {
-        if (SkeletonKey) {
+        if (HasItem(RG_SKELETON_KEY)) {
             return true;
         }
         switch (dungeon) {
@@ -420,55 +657,58 @@ namespace Rando {
                                     (GetDifficultyValueFromString(GlitchHover) >= static_cast<uint8_t>(GlitchDifficulty::NOVICE) && GetDifficultyValueFromString(GlitchISG) >= static_cast<uint8_t>(GlitchDifficulty::INTERMEDIATE)))) {
                     return ForestTempleKeys >= requiredAmountGlitched;
                 }*/
-                return ForestTempleKeys >= requiredAmountGlitchless;
+                return ctx->GetSmallKeyCount(SCENE_FOREST_TEMPLE) >= requiredAmountGlitchless;
 
             case RR_FIRE_TEMPLE:
                 /*if (IsGlitched && (GetDifficultyValueFromString(GlitchLedgeClip) >= static_cast<uint8_t>(GlitchDifficulty::INTERMEDIATE) || GetDifficultyValueFromString(GlitchHover) >= static_cast<uint8_t>(GlitchDifficulty::INTERMEDIATE))) {
                     return FireTempleKeys >= requiredAmountGlitched;
                 }*/
-                return FireTempleKeys >= requiredAmountGlitchless;
+                return ctx->GetSmallKeyCount(SCENE_FIRE_TEMPLE) >= requiredAmountGlitchless;
 
             case RR_WATER_TEMPLE:
                 /*if (IsGlitched && (false)) {
                     return WaterTempleKeys >= requiredAmountGlitched;
                 }*/
-                return WaterTempleKeys >= requiredAmountGlitchless;
+                return ctx->GetSmallKeyCount(SCENE_WATER_TEMPLE) >= requiredAmountGlitchless;
 
             case RR_SPIRIT_TEMPLE:
                 /*if (IsGlitched && (false)) {
                     return SpiritTempleKeys >= requiredAmountGlitched;
                 }*/
-                return SpiritTempleKeys >= requiredAmountGlitchless;
+                return ctx->GetSmallKeyCount(SCENE_SPIRIT_TEMPLE) >= requiredAmountGlitchless;
 
             case RR_SHADOW_TEMPLE:
                 /*if (IsGlitched && (GetDifficultyValueFromString(GlitchHookshotClip) >= static_cast<uint8_t>(GlitchDifficulty::NOVICE))) {
                     return ShadowTempleKeys >= requiredAmountGlitched;
                 }*/
-                return ShadowTempleKeys >= requiredAmountGlitchless;
+                return ctx->GetSmallKeyCount(SCENE_SHADOW_TEMPLE) >= requiredAmountGlitchless;
 
             case RR_BOTTOM_OF_THE_WELL:
                 /*if (IsGlitched && (false)) {
                     return BottomOfTheWellKeys >= requiredAmountGlitched;
                 }*/
-                return BottomOfTheWellKeys >= requiredAmountGlitchless;
+                return ctx->GetSmallKeyCount(SCENE_BOTTOM_OF_THE_WELL) >= requiredAmountGlitchless;
 
             case RR_GERUDO_TRAINING_GROUNDS:
                 /*if (IsGlitched && (false)) {
                     return GerudoTrainingGroundsKeys >= requiredAmountGlitched;
                 }*/
-                return GerudoTrainingGroundsKeys >= requiredAmountGlitchless;
+                return ctx->GetSmallKeyCount(SCENE_GERUDO_TRAINING_GROUND) >= requiredAmountGlitchless;
 
             case RR_GANONS_CASTLE:
                 /*if (IsGlitched && (false)) {
                     return GanonsCastleKeys >= requiredAmountGlitched;
                 }*/
-                return GanonsCastleKeys >= requiredAmountGlitchless;
+                return ctx->GetSmallKeyCount(SCENE_INSIDE_GANONS_CASTLE) >= requiredAmountGlitchless;
 
             case RR_MARKET_TREASURE_CHEST_GAME:
                 /*if (IsGlitched && (false)) {
                     return TreasureGameKeys >= requiredAmountGlitched;
                 }*/
-                return TreasureGameKeys >= requiredAmountGlitchless;
+                return ctx->GetSmallKeyCount(SCENE_TREASURE_BOX_SHOP) >= requiredAmountGlitchless;
+
+            case RR_GERUDO_FORTRESS:
+                return ctx->GetSmallKeyCount(SCENE_THIEVES_HIDEOUT) >= requiredAmountGlitchless;
 
             default:
                 return false;
@@ -504,8 +744,21 @@ namespace Rando {
         return false;
     }
 
+    void Logic::SetContext(std::shared_ptr<Context> _ctx) {
+        ctx = _ctx;
+    }
+
+    bool Logic::GetInLogic(LogicVal logicVal) {
+        return inLogic[logicVal];
+    }
+
+    void Logic::SetInLogic(LogicVal logicVal, bool value) {
+        inLogic[logicVal] = value;
+    }
+
     void Logic::Reset() {
-        auto ctx = Rando::Context::GetInstance();
+        ctx->NewSaveContext();
+        memset(inLogic, false, sizeof(inLogic));
         //Settings-dependent variables
         IsKeysanity = ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_ANYWHERE) || 
                     ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_ANYWHERE) || 
@@ -522,7 +775,6 @@ namespace Rando {
         Bombchus10    = false;
         Bombchus20    = false;
         MagicBean     = false;
-        MagicBeanPack = false;
         RutosLetter   = false;
         Boomerang     = false;
         DinsFire      = false;
@@ -541,7 +793,7 @@ namespace Rando {
         GoronTunic    = false;
         ZoraTunic     = false;
         Epona         = false;
-        BigPoe        = false;
+        //BigPoe        = false;
         GerudoToken   = false;
         FireArrows    = false;
         IceArrows     = false;
@@ -573,20 +825,6 @@ namespace Rando {
         EyedropsAccess     = false;
         DisableTradeRevert = false;
 
-        //Songs
-        ZeldasLullaby    = false;
-        SariasSong       = false;
-        SunsSong         = false;
-        SongOfStorms     = false;
-        EponasSong       = false;
-        SongOfTime       = false;
-        MinuetOfForest   = false;
-        BoleroOfFire     = false;
-        SerenadeOfWater  = false;
-        RequiemOfSpirit  = false;
-        NocturneOfShadow = false;
-        PreludeOfLight   = false;
-
         //Stones and Meddallions
         ForestMedallion = false;
         FireMedallion   = false;
@@ -622,40 +860,41 @@ namespace Rando {
         GregInLacsLogic = false;
 
         //Ocarina C Buttons
-        OcarinaAButton = ctx->GetOption(RSK_SHUFFLE_OCARINA_BUTTONS).Is(true) ? 0 : 1;
-        OcarinaCLeftButton = ctx->GetOption(RSK_SHUFFLE_OCARINA_BUTTONS).Is(true) ? 0 : 1;
-        OcarinaCRightButton = ctx->GetOption(RSK_SHUFFLE_OCARINA_BUTTONS).Is(true) ? 0 : 1;
-        OcarinaCUpButton = ctx->GetOption(RSK_SHUFFLE_OCARINA_BUTTONS).Is(true) ? 0 : 1;
-        OcarinaCDownButton = ctx->GetOption(RSK_SHUFFLE_OCARINA_BUTTONS).Is(true) ? 0 : 1;
+        bool ocBtnShuffle = ctx->GetOption(RSK_SHUFFLE_OCARINA_BUTTONS).Is(true);
+        ctx->SetRandoInf(RAND_INF_HAS_OCARINA_A, !ocBtnShuffle);
+        ctx->SetRandoInf(RAND_INF_HAS_OCARINA_C_UP, !ocBtnShuffle);
+        ctx->SetRandoInf(RAND_INF_HAS_OCARINA_C_DOWN, !ocBtnShuffle);
+        ctx->SetRandoInf(RAND_INF_HAS_OCARINA_C_LEFT, !ocBtnShuffle);
+        ctx->SetRandoInf(RAND_INF_HAS_OCARINA_C_RIGHT, !ocBtnShuffle);
 
         //Progressive Items
-        ProgressiveStickBag   = ctx->GetOption(RSK_SHUFFLE_DEKU_STICK_BAG).Is(true) ? 0 : 1;
-        ProgressiveNutBag     = ctx->GetOption(RSK_SHUFFLE_DEKU_NUT_BAG).Is(true) ? 0 : 1;
+        ctx->SetUpgrade(UPG_STICKS, ctx->GetOption(RSK_SHUFFLE_DEKU_STICK_BAG).Is(true) ? 0 : 1);
+        ctx->SetUpgrade(UPG_NUTS, ctx->GetOption(RSK_SHUFFLE_DEKU_NUT_BAG).Is(true) ? 0 : 1);
         ProgressiveBulletBag  = 0;
         ProgressiveBombBag    = 0;
         ProgressiveMagic      = 0;
         //If we're not shuffling swim, we start with it (scale 1)
-        ProgressiveScale      = ctx->GetOption(RSK_SHUFFLE_SWIM).Is(true) ? 0 : 1;
+        ProgressiveScale = 0;
+        if (ctx->GetOption(RSK_SHUFFLE_SWIM).Is(false)) {
+            ProgressiveScale = 1;
+            ctx->SetRandoInf(RAND_INF_CAN_SWIM, true);
+        }
         ProgressiveHookshot   = 0;
         ProgressiveBow        = 0;
         //If we're not shuffling child's wallet, we start with it (wallet 1)
-        ProgressiveWallet     = ctx->GetOption(RSK_SHUFFLE_CHILD_WALLET).Is(true) ? 0 : 1;
+        ProgressiveWallet = 0;
+        if (ctx->GetOption(RSK_SHUFFLE_CHILD_WALLET).Is(false)) {
+            ProgressiveWallet = 1;
+            ctx->SetRandoInf(RAND_INF_HAS_WALLET, true);
+        }
         ProgressiveStrength   = 0;
         ProgressiveOcarina    = 0;
         ProgressiveGiantKnife = 0;
 
-        //Keys
-        ForestTempleKeys          = 0;
         //If not keysanity, start with 1 logical key to account for automatically unlocking the basement door in vanilla FiT
-        FireTempleKeys            = IsKeysanity || ctx->GetDungeon(Rando::FIRE_TEMPLE)->IsMQ() ? 0 : 1;
-        WaterTempleKeys           = 0;
-        SpiritTempleKeys          = 0;
-        ShadowTempleKeys          = 0;
-        GanonsCastleKeys          = 0;
-        GerudoFortressKeys        = 0;
-        GerudoTrainingGroundsKeys = 0;
-        BottomOfTheWellKeys       = 0;
-        TreasureGameKeys          = 0;
+        if (!IsKeysanity && ctx->GetDungeon(Rando::FIRE_TEMPLE)->IsVanilla()) {
+            ctx->SetSmallKeyCount(SCENE_FIRE_TEMPLE, 1);
+        }
 
         //Boss Keys
         BossKeyForestTemple = 0;
@@ -676,9 +915,6 @@ namespace Rando {
         //Triforce Pieces
         TriforcePieces = 0;
 
-        //Skeleton Key
-        SkeletonKey = false;
-
         //Boss Souls
         CanSummonGohma        = false;
         CanSummonKingDodongo  = false;
@@ -830,6 +1066,7 @@ namespace Rando {
         AtDay         = false;
         AtNight       = false;
         Age           = ctx->GetSettings()->ResolvedStartingAge();
+        ctx->GetSaveContext()->linkAge = !Age;
 
         //Events
         ShowedMidoSwordAndShield  = false;
diff --git a/soh/soh/Enhancements/randomizer/logic.h b/soh/soh/Enhancements/randomizer/logic.h
index 799b8402a..4c23dc321 100644
--- a/soh/soh/Enhancements/randomizer/logic.h
+++ b/soh/soh/Enhancements/randomizer/logic.h
@@ -40,7 +40,6 @@ class Logic {
     bool Bombchus10 = false;
     bool Bombchus20 = false;
     bool MagicBean = false;
-    bool MagicBeanPack = false;
     bool RutosLetter = false;
     bool Boomerang = false;
     bool DinsFire = false;
@@ -59,7 +58,7 @@ class Logic {
     bool GoronTunic = false;
     bool ZoraTunic = false;
     bool Epona = false;
-    bool BigPoe = false;
+    //bool BigPoe = false; //unused
     bool GerudoToken = false;
     bool FireArrows = false;
     bool IceArrows = false;
@@ -91,20 +90,6 @@ class Logic {
     bool EyedropsAccess = false;
     bool DisableTradeRevert = false;
 
-    // Songs
-    bool ZeldasLullaby = false;
-    bool SariasSong = false;
-    bool SunsSong = false;
-    bool SongOfStorms = false;
-    bool EponasSong = false;
-    bool SongOfTime = false;
-    bool MinuetOfForest = false;
-    bool BoleroOfFire = false;
-    bool SerenadeOfWater = false;
-    bool RequiemOfSpirit = false;
-    bool NocturneOfShadow = false;
-    bool PreludeOfLight = false;
-
     // Stones and Meddallions
     bool ForestMedallion = false;
     bool FireMedallion = false;
@@ -140,8 +125,6 @@ class Logic {
     bool GregInLacsLogic = false;
 
     // Progressive Items
-    uint8_t ProgressiveStickBag = 0;
-    uint8_t ProgressiveNutBag = 0;
     uint8_t ProgressiveBulletBag = 0;
     uint8_t ProgressiveBombBag = 0;
     uint8_t ProgressiveMagic = 0;
@@ -171,9 +154,6 @@ class Logic {
     // Triforce Pieces
     uint8_t TriforcePieces = 0;
 
-    // Skeleton Key
-    bool SkeletonKey = false;
-
     // Boss Keys
     bool BossKeyForestTemple = false;
     bool BossKeyFireTemple = false;
@@ -422,6 +402,7 @@ class Logic {
     void UpdateHelpers();
     bool CanUse(RandomizerGet itemName);
     bool HasProjectile(HasProjectileAge age);
+    bool HasItem(RandomizerGet itemName);
     bool HasBossSoul(RandomizerGet itemName);
     bool SmallKeys(RandomizerRegion dungeon, uint8_t requiredAmount);
     bool SmallKeys(RandomizerRegion dungeon, uint8_t requiredAmountGlitchless, uint8_t requiredAmountGlitched);
@@ -430,11 +411,16 @@ class Logic {
     bool CanKillEnemy(std::string enemy);
     bool CanPassEnemy(std::string enemy);
     bool EventsUpdated();
+    uint8_t BottleCount();
     void Reset();
+    void SetContext(std::shared_ptr<Context> _ctx);
+    bool GetInLogic(LogicVal logicVal);
+    void SetInLogic(LogicVal logicVal, bool remove);
 
   private:
     static bool IsMagicItem(RandomizerGet item);
     static bool IsMagicArrow(RandomizerGet item);
-    bool HasItem(RandomizerGet itemName);
+    std::shared_ptr<Context> ctx;
+    bool inLogic[LOGIC_MAX];
 }; // class Logic
 } // namespace Rando
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h
index 1b772367d..6162b3341 100644
--- a/soh/soh/Enhancements/randomizer/randomizerTypes.h
+++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@@ -53,6 +53,156 @@ typedef enum {
     HINT_TYPE_MAX
 } HintType;
 
+typedef enum {
+    LOGIC_NONE,
+    LOGIC_KOKIRI_SWORD,
+    LOGIC_MASTER_SWORD,
+    LOGIC_BIGGORON_SWORD,
+    LOGIC_DEKU_SHIELD,
+    LOGIC_HYLIAN_SHIELD,
+    LOGIC_MIRROR_SHIELD,
+    LOGIC_GORON_TUNIC,
+    LOGIC_ZORA_TUNIC,
+    LOGIC_IRON_BOOTS,
+    LOGIC_HOVER_BOOTS,
+    LOGIC_BOOMERANG,
+    LOGIC_LENS_OF_TRUTH,
+    LOGIC_HAMMER,
+    LOGIC_STONE_OF_AGONY,
+    LOGIC_DINS_FIRE,
+    LOGIC_FARORES_WIND,
+    LOGIC_NAYRUS_LOVE,
+    LOGIC_FIRE_ARROWS,
+    LOGIC_ICE_ARROWS,
+    LOGIC_LIGHT_ARROWS,
+    LOGIC_GERUDO_CARD,
+    LOGIC_MAGIC_BEAN,
+    LOGIC_MAGIC_BEANPACK,
+    LOGIC_DOUBLE_DEFENSE,
+    LOGIC_WEIRD_EGG,
+    LOGIC_ZELDAS_LETTER,
+    LOGIC_POCKET_EGG,
+    LOGIC_COJIRO,
+    LOGIC_ODD_MUSHROOM,
+    LOGIC_ODD_POULTICE,
+    LOGIC_POACHERS_SAW,
+    LOGIC_BROKEN_SWORD,
+    LOGIC_PRESCRIPTION,
+    LOGIC_EYEBALL_FROG,
+    LOGIC_EYEDROPS,
+    LOGIC_CLAIM_CHECK,
+    LOGIC_GOLD_SKULLTULA_TOKENS,
+    LOGIC_PROGRESSIVE_HOOKSHOT,
+    LOGIC_PROGRESSIVE_STRENGTH,
+    LOGIC_PROGRESSIVE_BOMB_BAG,
+    LOGIC_PROGRESSIVE_BOW,
+    LOGIC_PROGRESSIVE_BULLET_BAG,
+    LOGIC_PROGRESSIVE_STICK_BAG,
+    LOGIC_PROGRESSIVE_NUT_BAG,
+    LOGIC_PROGRESSIVE_WALLET,
+    LOGIC_PROGRESSIVE_SCALE,
+    LOGIC_BOMBCHUS,
+    LOGIC_PROGRESSIVE_MAGIC,
+    LOGIC_PROGRESSIVE_OCARINA,
+    LOGIC_PROGRESSIVE_GIANT_KNIFE,
+    LOGIC_BOTTLES,
+    LOGIC_RUTOS_LETTER,
+    LOGIC_BOTTLE_WITH_BIG_POE,
+    LOGIC_ZELDAS_LULLABY,
+    LOGIC_EPONAS_SONG,
+    LOGIC_SARIAS_SONG,
+    LOGIC_SUNS_SONG,
+    LOGIC_SONG_OF_TIME,
+    LOGIC_SONG_OF_STORMS,
+    LOGIC_MINUET_OF_FOREST,
+    LOGIC_BOLERO_OF_FIRE,
+    LOGIC_SERENADE_OF_WATER,
+    LOGIC_NOCTURNE_OF_SHADOW,
+    LOGIC_REQUIEM_OF_SPIRIT,
+    LOGIC_PRELUDE_OF_LIGHT,
+    LOGIC_MAP_DEKU_TREE,
+    LOGIC_MAP_DODONGOS_CAVERN,
+    LOGIC_MAP_JABU_JABUS_BELLY,
+    LOGIC_MAP_FOREST_TEMPLE,
+    LOGIC_MAP_FIRE_TEMPLE,
+    LOGIC_MAP_WATER_TEMPLE,
+    LOGIC_MAP_SPIRIT_TEMPLE,
+    LOGIC_MAP_SHADOW_TEMPLE,
+    LOGIC_MAP_BOTTOM_OF_THE_WELL,
+    LOGIC_MAP_ICE_CAVERN,
+    LOGIC_COMPASS_DEKU_TREE,
+    LOGIC_COMPASS_DODONGOS_CAVERN,
+    LOGIC_COMPASS_JABU_JABUS_BELLY,
+    LOGIC_COMPASS_FOREST_TEMPLE,
+    LOGIC_COMPASS_FIRE_TEMPLE,
+    LOGIC_COMPASS_WATER_TEMPLE,
+    LOGIC_COMPASS_SPIRIT_TEMPLE,
+    LOGIC_COMPASS_SHADOW_TEMPLE,
+    LOGIC_COMPASS_BOTTOM_OF_THE_WELL,
+    LOGIC_COMPASS_ICE_CAVERN,
+    LOGIC_BOSS_KEY_FOREST_TEMPLE,
+    LOGIC_BOSS_KEY_FIRE_TEMPLE,
+    LOGIC_BOSS_KEY_WATER_TEMPLE,
+    LOGIC_BOSS_KEY_SPIRIT_TEMPLE,
+    LOGIC_BOSS_KEY_SHADOW_TEMPLE,
+    LOGIC_BOSS_KEY_GANONS_CASTLE,
+    LOGIC_FOREST_TEMPLE_KEYS,
+    LOGIC_FIRE_TEMPLE_KEYS,
+    LOGIC_WATER_TEMPLE_KEYS,
+    LOGIC_SPIRIT_TEMPLE_KEYS,
+    LOGIC_SHADOW_TEMPLE_KEYS,
+    LOGIC_BOTTOM_OF_THE_WELL_KEYS,
+    LOGIC_GERUDO_TRAINING_GROUNDS_KEYS,
+    LOGIC_GERUDO_FORTRESS_KEYS,
+    LOGIC_GANONS_CASTLE_KEYS,
+    LOGIC_TREASURE_GAME_KEYS,
+    LOGIC_SKELETON_KEY,
+    LOGIC_KOKIRI_EMERALD,
+    LOGIC_GORON_RUBY,
+    LOGIC_ZORA_SAPPHIRE,
+    LOGIC_FOREST_MEDALLION,
+    LOGIC_FIRE_MEDALLION,
+    LOGIC_WATER_MEDALLION,
+    LOGIC_SPIRIT_MEDALLION,
+    LOGIC_SHADOW_MEDALLION,
+    LOGIC_LIGHT_MEDALLION,
+    LOGIC_GREG,
+    LOGIC_PIECE_OF_HEART,
+    LOGIC_HEART_CONTAINER,
+    LOGIC_BOMBCHUS_5,
+    LOGIC_BOMBCHUS_10,
+    LOGIC_BOMBCHUS_20,
+    LOGIC_BOMBCHU_DROP,
+    LOGIC_NUTS,
+    LOGIC_BUY_ARROW,
+    LOGIC_BUY_BOMB,
+    LOGIC_STICKS,
+    LOGIC_FISH_ACCESS,
+    LOGIC_BUY_MAGIC_POTION,
+    LOGIC_BUY_BOMBCHUS,
+    LOGIC_BUY_SEED,
+    LOGIC_BLUE_FIRE_ACCESS,
+    LOGIC_BUGS_ACCESS,
+    LOGIC_FAIRY_ACCESS,
+    LOGIC_CAN_SUMMON_GOHMA,
+    LOGIC_CAN_SUMMON_KINGDODONGO,
+    LOGIC_CAN_SUMMON_BARINADE,
+    LOGIC_CAN_SUMMON_PHANTOMGANON,
+    LOGIC_CAN_SUMMON_VOLVAGIA,
+    LOGIC_CAN_SUMMON_MORPHA,
+    LOGIC_CAN_SUMMON_BONGOBONGO,
+    LOGIC_CAN_SUMMON_TWINROVA,
+    LOGIC_CAN_SUMMON_GANON,
+    LOGIC_FISHING_POLE,
+    LOGIC_OCARINA_A_BUTTON,
+    LOGIC_OCARINA_C_UP_BUTTON,
+    LOGIC_OCARINA_C_DOWN_BUTTON,
+    LOGIC_OCARINA_C_LEFT_BUTTON,
+    LOGIC_OCARINA_C_RIGHT_BUTTON,  
+    LOGIC_TRIFORCE_PIECES,
+    LOGIC_MAX
+} LogicVal;
+
 typedef enum {
     RA_NONE,
     RA_LINKS_POCKET,
@@ -2024,6 +2174,7 @@ typedef enum {
     // Logic Only
     RG_DISTANT_SCARECROW,
     RG_STICKS,
+    RG_NUTS,
     RG_MAX
 } RandomizerGet;
 
diff --git a/soh/soh/Enhancements/randomizer/randomizer_inf.h b/soh/soh/Enhancements/randomizer/randomizer_inf.h
index 8d3e96239..20aab3032 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_inf.h
+++ b/soh/soh/Enhancements/randomizer/randomizer_inf.h
@@ -295,6 +295,17 @@ typedef enum {
 
     RAND_INF_GF_ITEM_FROM_LEADER_OF_FORTRESS,
     RAND_INF_GF_GTG_GATE_PERMANENTLY_OPEN,
+
+    RAND_INF_ZELDAS_LETTER,
+    RAND_INF_WEIRD_EGG,
+    RAND_INF_CHILD_TRADES_MASK_KEATON,
+    RAND_INF_CHILD_TRADES_MASK_SKULL,
+    RAND_INF_CHILD_TRADES_MASK_SPOOKY,
+    RAND_INF_CHILD_TRADES_MASK_BUNNY,
+    RAND_INF_CHILD_TRADES_MASK_GORON,
+    RAND_INF_CHILD_TRADES_MASK_ZORA,
+    RAND_INF_CHILD_TRADES_MASK_GERUDO,
+    RAND_INF_CHILD_TRADES_MASK_TRUTH,
     // If you add anything to this list, you need to update the size of randomizerInf in z64save.h to be ceil(RAND_INF_MAX / 16)
 
     RAND_INF_MAX,
diff --git a/soh/soh/SaveManager.cpp b/soh/soh/SaveManager.cpp
index 4415cd7dd..00cd3115e 100644
--- a/soh/soh/SaveManager.cpp
+++ b/soh/soh/SaveManager.cpp
@@ -2843,8 +2843,9 @@ extern "C" void Save_SaveGlobal(void) {
 extern "C" void Save_LoadFile(void) {
     if (gSaveContext.questId == QUEST_RANDOMIZER) {
         // Reset rando context for rando saves.
-          OTRGlobals::Instance->gRandoContext.reset();
+        OTRGlobals::Instance->gRandoContext.reset();
         OTRGlobals::Instance->gRandoContext = Rando::Context::CreateInstance();
+        OTRGlobals::Instance->gRandoContext->SetSaveContext(&gSaveContext);
         OTRGlobals::Instance->gRandoContext->AddExcludedOptions();
         OTRGlobals::Instance->gRandoContext->GetSettings()->CreateOptions();
     }

From 5e6cd710314b04f749fd86d0e9e80662726e9d46 Mon Sep 17 00:00:00 2001
From: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>
Date: Fri, 2 Aug 2024 16:54:33 +0200
Subject: [PATCH 174/230] Update item_list.cpp (#4272)

---
 soh/soh/Enhancements/randomizer/item_list.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/item_list.cpp b/soh/soh/Enhancements/randomizer/item_list.cpp
index 6e4524939..526c7b3ae 100644
--- a/soh/soh/Enhancements/randomizer/item_list.cpp
+++ b/soh/soh/Enhancements/randomizer/item_list.cpp
@@ -293,8 +293,8 @@ void Rando::StaticData::InitItemTable() {
     itemTable[RG_BOMB_BAG_INF] =                        Item(RG_BOMB_BAG_INF,                     Text{ "Infinite Bomb Bag", "!!!", "!!!" },                                                                        ITEMTYPE_ITEM,              RG_BOMB_BAG_INF,      true,  LOGIC_PROGRESSIVE_BOMB_BAG,    RHT_BOMB_BAG_INF,             RG_BOMB_BAG_INF,                OBJECT_GI_BOMBPOUCH,    GID_BOMB_BAG_40,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
     itemTable[RG_BULLET_BAG_INF] =                      Item(RG_BULLET_BAG_INF,                   Text{ "Infinite Bullet Bag", "!!!", "!!!" },                                                                      ITEMTYPE_ITEM,              RG_BULLET_BAG_INF,    true,  LOGIC_PROGRESSIVE_BULLET_BAG,  RHT_BULLET_BAG_INF,           RG_BULLET_BAG_INF,              OBJECT_GI_DEKUPOUCH,    GID_BULLET_BAG,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
     itemTable[RG_STICK_UPGRADE_INF] =                   Item(RG_STICK_UPGRADE_INF,                Text{ "Infinite Stick Capacity", "!!!", "!!!" },                                                                  ITEMTYPE_ITEM,              RG_STICK_UPGRADE_INF, true,  LOGIC_PROGRESSIVE_STICK_BAG,   RHT_STICK_UPGRADE_INF,        RG_STICK_UPGRADE_INF,           OBJECT_GI_STICK,        GID_STICK,          TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_NUT_UPGRADE_INF] =                     Item(RG_QUIVER_INF,                       Text{ "Infinite Nut Capacity", "!!!", "!!!" },                                                                    ITEMTYPE_ITEM,              RG_NUT_UPGRADE_INF,   true,  LOGIC_PROGRESSIVE_NUT_BAG,     RHT_NUT_UPGRADE_INF,          RG_NUT_UPGRADE_INF,             OBJECT_GI_NUTS,         GID_NUTS,           TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_MAGIC_INF] =                           Item(RG_QUIVER_INF,                       Text{ "Infinite Magic Meter", "!!!", "!!!" },                                                                     ITEMTYPE_ITEM,              RG_MAGIC_INF,         true,  LOGIC_PROGRESSIVE_MAGIC,       RHT_MAGIC_INF,                RG_MAGIC_INF,                   OBJECT_GI_MAGICPOT,     GID_MAGIC_LARGE,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_NUT_UPGRADE_INF] =                     Item(RG_NUT_UPGRADE_INF,                  Text{ "Infinite Nut Capacity", "!!!", "!!!" },                                                                    ITEMTYPE_ITEM,              RG_NUT_UPGRADE_INF,   true,  LOGIC_PROGRESSIVE_NUT_BAG,     RHT_NUT_UPGRADE_INF,          RG_NUT_UPGRADE_INF,             OBJECT_GI_NUTS,         GID_NUTS,           TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_MAGIC_INF] =                           Item(RG_MAGIC_INF,                        Text{ "Infinite Magic Meter", "!!!", "!!!" },                                                                     ITEMTYPE_ITEM,              RG_MAGIC_INF,         true,  LOGIC_PROGRESSIVE_MAGIC,       RHT_MAGIC_INF,                RG_MAGIC_INF,                   OBJECT_GI_MAGICPOT,     GID_MAGIC_LARGE,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
     itemTable[RG_BOMBCHU_INF] =                         Item(RG_BOMBCHU_INF,                      Text{ "Infinite Bombchus", "!!!", "!!!" },                                                                        ITEMTYPE_ITEM,              RG_BOMBCHU_INF,       true,  LOGIC_BOMBCHUS,                RHT_BOMBCHU_INF,              RG_BOMBCHU_INF,                 OBJECT_GI_BOMB_2,       GID_BOMBCHU,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
     itemTable[RG_WALLET_INF] =                          Item(RG_WALLET_INF,                       Text{ "Infinite Wallet", "!!!", "!!!" },                                                                          ITEMTYPE_ITEM,              RG_WALLET_INF,        true,  LOGIC_PROGRESSIVE_WALLET,      RHT_WALLET_INF,               RG_WALLET_INF,                  OBJECT_GI_PURSE,        GID_WALLET_GIANT,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
 

From 03e32587927119efb0c2148f06c6f923b5be4993 Mon Sep 17 00:00:00 2001
From: Malkierian <malkierian@gmail.com>
Date: Fri, 2 Aug 2024 08:54:25 -0700
Subject: [PATCH 175/230] It's not master sword. (#4273)

---
 soh/soh/Enhancements/randomizer/logic.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/soh/soh/Enhancements/randomizer/logic.cpp b/soh/soh/Enhancements/randomizer/logic.cpp
index 3814e12c5..a4bc5a08c 100644
--- a/soh/soh/Enhancements/randomizer/logic.cpp
+++ b/soh/soh/Enhancements/randomizer/logic.cpp
@@ -461,7 +461,7 @@ namespace Rando {
         LightArrows     = CanUse(RG_LIGHT_ARROWS);
         KokiriSword     = CanUse(RG_KOKIRI_SWORD);
         MasterSword     = CanUse(RG_MASTER_SWORD);
-        BiggoronSword   = CanUse(RG_MASTER_SWORD);
+        BiggoronSword   = CanUse(RG_BIGGORON_SWORD);
         NumBottles      = ((NoBottles) ? 0 : BottleCount());
         HasBottle       = NumBottles >= 1;
         Slingshot       = CanUse(RG_FAIRY_SLINGSHOT) && (BuySeed || AmmoCanDrop);

From c6b05b2087adcb90e60c0c57747d9ee85947b27a Mon Sep 17 00:00:00 2001
From: Malkierian <malkierian@gmail.com>
Date: Sun, 4 Aug 2024 15:32:11 -0700
Subject: [PATCH 176/230] Change `RSK_SHUFFLE` instance in mixed pool code to
 `RSK_MIX`. (#4276)

---
 soh/soh/Enhancements/randomizer/entrance.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/entrance.cpp b/soh/soh/Enhancements/randomizer/entrance.cpp
index 2f4b43d26..b75ab3d48 100644
--- a/soh/soh/Enhancements/randomizer/entrance.cpp
+++ b/soh/soh/Enhancements/randomizer/entrance.cpp
@@ -1392,16 +1392,16 @@ int EntranceShuffler::ShuffleAllEntrances() {
                 poolsToMix.insert(EntranceType::BossReverse);
             }
         }
-        if (ctx->GetOption(RSK_SHUFFLE_OVERWORLD_ENTRANCES)) {
+        if (ctx->GetOption(RSK_MIX_OVERWORLD_ENTRANCES)) {
             poolsToMix.insert(EntranceType::Overworld);
         }
-        if (ctx->GetOption(RSK_SHUFFLE_INTERIOR_ENTRANCES)) {
+        if (ctx->GetOption(RSK_MIX_INTERIOR_ENTRANCES)) {
             poolsToMix.insert(EntranceType::Interior);
             if (ctx->GetOption(RSK_DECOUPLED_ENTRANCES)) {
                 poolsToMix.insert(EntranceType::InteriorReverse);
             }
         }
-        if (ctx->GetOption(RSK_SHUFFLE_GROTTO_ENTRANCES)) {
+        if (ctx->GetOption(RSK_MIX_GROTTO_ENTRANCES)) {
             poolsToMix.insert(EntranceType::GrottoGrave);
             if (ctx->GetOption(RSK_DECOUPLED_ENTRANCES)) {
                 poolsToMix.insert(EntranceType::GrottoGraveReverse);

From 483dbea33068f11a0f02afb84ee46b2d66fbfcd9 Mon Sep 17 00:00:00 2001
From: Malkierian <malkierian@gmail.com>
Date: Sun, 4 Aug 2024 17:05:29 -0700
Subject: [PATCH 177/230] Fix RSK for mixing boss entrances. (#4277)

---
 soh/soh/Enhancements/randomizer/entrance.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/soh/soh/Enhancements/randomizer/entrance.cpp b/soh/soh/Enhancements/randomizer/entrance.cpp
index b75ab3d48..16fbdfd3b 100644
--- a/soh/soh/Enhancements/randomizer/entrance.cpp
+++ b/soh/soh/Enhancements/randomizer/entrance.cpp
@@ -1386,7 +1386,7 @@ int EntranceShuffler::ShuffleAllEntrances() {
                 poolsToMix.insert(EntranceType::DungeonReverse);
             }
         }
-        if (ctx->GetOption(RSK_MIX_DUNGEON_ENTRANCES)) {
+        if (ctx->GetOption(RSK_MIX_BOSS_ENTRANCES)) {
             poolsToMix.insert(EntranceType::Boss);
             if (ctx->GetOption(RSK_DECOUPLED_ENTRANCES)) {
                 poolsToMix.insert(EntranceType::BossReverse);

From 91d1e5970d787eab37884ce578b73f45992ef5de Mon Sep 17 00:00:00 2001
From: Christopher Leggett <chris@leggett.dev>
Date: Sat, 10 Aug 2024 17:07:03 -0400
Subject: [PATCH 178/230] Fix an issue with a stray Rando::Context shared_ptr
 hanging around. (#4259)

* Fix an issue with a stray Rando::Context shared_ptr hanging around.

* Fixes accidental leftover from when I found this bug on another branch

* Properly reset randoContext on every save load, not just after save creation
---
 soh/soh/Enhancements/randomizer/3drando/location_access.cpp | 4 ++--
 soh/soh/Enhancements/randomizer/3drando/location_access.hpp | 2 +-
 soh/soh/Enhancements/randomizer/entrance.cpp                | 5 +++++
 soh/soh/Enhancements/randomizer/entrance.h                  | 1 +
 soh/soh/SaveManager.cpp                                     | 2 +-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
index b181a3cdb..a64ef5f55 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
@@ -240,12 +240,12 @@ bool HasAccessTo(const RandomizerRegion area) {
   return areaTable[area].HasAccess();
 }
 
-std::shared_ptr<Rando::Context> randoCtx;
+Rando::Context* randoCtx;
 std::shared_ptr<Rando::Logic> logic;
 
 void AreaTable_Init() {
   using namespace Rando;
-  randoCtx = Context::GetInstance();
+  randoCtx = Context::GetInstance().get();
   logic = randoCtx->GetLogic();
   grottoEvents = {
       EventAccess(&logic->GossipStoneFairy, { [] { return logic->GossipStoneFairy || logic->CanSummonGossipFairy; } }),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access.hpp b/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
index 1492e82ec..286551cab 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
@@ -12,7 +12,7 @@
 typedef bool (*ConditionFn)();
 
 // I hate this but every alternative I can think of right now is worse
-extern std::shared_ptr<Rando::Context> randoCtx;
+extern Rando::Context* randoCtx;
 extern std::shared_ptr<Rando::Logic> logic;
 
 class EventAccess {
diff --git a/soh/soh/Enhancements/randomizer/entrance.cpp b/soh/soh/Enhancements/randomizer/entrance.cpp
index 16fbdfd3b..39eab1398 100644
--- a/soh/soh/Enhancements/randomizer/entrance.cpp
+++ b/soh/soh/Enhancements/randomizer/entrance.cpp
@@ -235,6 +235,11 @@ Entrance* Entrance::AssumeReachable() {
     return assumed;
 }
 
+EntranceShuffler::EntranceShuffler() {
+  playthroughEntrances = {};
+  entranceOverrides = {};
+}
+
 bool EntranceShuffler::HasNoRandomEntrances() {
     return mNoRandomEntrances;
 }
diff --git a/soh/soh/Enhancements/randomizer/entrance.h b/soh/soh/Enhancements/randomizer/entrance.h
index e17687842..08861ff0d 100644
--- a/soh/soh/Enhancements/randomizer/entrance.h
+++ b/soh/soh/Enhancements/randomizer/entrance.h
@@ -115,6 +115,7 @@ using EntrancePools = std::map<EntranceType, std::vector<Entrance*>>;
 
 class EntranceShuffler {
   public:
+    EntranceShuffler();
     std::array<EntranceOverride, ENTRANCE_OVERRIDES_MAX_COUNT> entranceOverrides;
     std::vector<std::list<Entrance*>> playthroughEntrances;
     bool HasNoRandomEntrances();
diff --git a/soh/soh/SaveManager.cpp b/soh/soh/SaveManager.cpp
index 00cd3115e..448a8d2e0 100644
--- a/soh/soh/SaveManager.cpp
+++ b/soh/soh/SaveManager.cpp
@@ -2841,7 +2841,7 @@ extern "C" void Save_SaveGlobal(void) {
 }
 
 extern "C" void Save_LoadFile(void) {
-    if (gSaveContext.questId == QUEST_RANDOMIZER) {
+    if (SaveManager::Instance->fileMetaInfo[gSaveContext.fileNum].randoSave) {
         // Reset rando context for rando saves.
         OTRGlobals::Instance->gRandoContext.reset();
         OTRGlobals::Instance->gRandoContext = Rando::Context::CreateInstance();

From f4d951aab8966add4e19a4151b41ff53d746d9f6 Mon Sep 17 00:00:00 2001
From: Extloga <141232749+Extloga@users.noreply.github.com>
Date: Sun, 11 Aug 2024 22:08:42 +0200
Subject: [PATCH 179/230] Additions and fixes for the German translation in
 several files (#4195)

* Fixes for the German translation in randomizer.cpp

* Fixes for the German translation in hint_list.cpp

* Fixes for the German translation in item_list.cpp

* Fixes for the German translation in z_message_OTR.cpp

* Fixes for the German translation in randomizer.cpp

* Fixes for the German translation in randomizer.cpp

* Additions for the German translation in hint_list_item.cpp

* Fixes for the German translation in item_list.cpp

* Additions for the German translation in hint_list_item.cpp

* Additions for the German translation in hint_list_item.cpp

* Fixes for the German translation in item_list.cpp

* Additions for the German translation in hint_list_item.cpp

* Fixes for the German translation in item_list.cpp

* Fixes for the German translation in item_list.cpp

* Fixes for the German translation in item_list.cpp

* Fixes for the German translation in hint_list_item.cpp

* Fixes for the German translation in hint_list_item.cpp

* Fixes for the German translation in hint_list_item.cpp

* Fixes for the German translation in item_list.cpp

* Fixes for the German translation in item_list.cpp

* Fixes for the German translation in hint_list_item.cpp

* Fixes for the German translation in item_list.cpp

* Fixes for the German translation in randomizer.cpp

* Fixes for the German translation in item_list.cpp

* Fixes for the German translation in hint_list_item.cpp

* Fixes for the German translation in item_list.cpp

* Fixes for the German translation in z_message_OTR.cpp

* Fixes for the German translation in z_message_OTR.cpp

* Additions for the German translation in item_list.cpp

* Fixes for the German translation in item_list.cpp

* Fixes for the German translation in hint_list.cpp

* Fixes for the German translation in hint_list.cpp

* Fixes for the German translation in randomizer.cpp

* Fixes for the German translation in hint_list_item.cpp

* Fixes for the German translation in hint_list_item.cpp

* Fixes for the German translation in item_list.cpp

* Fixes for the German translation in item_list.cpp

* Fixes for the German translation in randomizer.cpp

* Fixes for the German translation in randomizer.cpp

* Fixes for the German translation in randomizer.cpp
---
 .../randomizer/3drando/hint_list.cpp          |  363 ++--
 .../3drando/hint_list/hint_list_item.cpp      | 1596 ++++++++---------
 soh/soh/Enhancements/randomizer/item_list.cpp |  508 +++---
 .../Enhancements/randomizer/randomizer.cpp    |  115 +-
 soh/soh/z_message_OTR.cpp                     |    8 +-
 5 files changed, 1300 insertions(+), 1290 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
index ca60835e6..3a35118d2 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
@@ -949,122 +949,126 @@ void StaticData::HintTable_Init() {
     ---------------------------*/
 
     hintTextTable[RHT_LINKS_POCKET] = HintText(CustomMessage("Link's Pocket",
-                                                  /*german*/ "",
+                                                  /*german*/ "Links Taschen",
                                                   /*french*/ "les Poches de @"));
                                                // /*spanish*/el bolsillo de @
 
     hintTextTable[RHT_KOKIRI_FOREST] = HintText(CustomMessage("Kokiri Forest",
-                                                   /*german*/ "",
+                                                   /*german*/ "Kokiri-Wald",
                                                    /*french*/ "la Forêt Kokiri"));
                                                 // /*spanish*/el Bosque Kokiri
 
     hintTextTable[RHT_THE_LOST_WOODS] = HintText(CustomMessage("the Lost Woods",
-                                                    /*german*/ "",
+                                                    /*german*/ "Verlorene Wälder",
                                                     /*french*/ "les Bois Perdus"));
                                                  // /*spanish*/el Bosque Perdido
+    
     hintTextTable[RHT_SACRED_FOREST_MEADOW] = HintText(CustomMessage("Sacred Forest Meadow",
-                                                          /*german*/ "",
+                                                          /*german*/ "Heilige Lichtung",
                                                           /*french*/ "le Bosquet Sacré"));
                                                        // /*spanish*/la pradera sagrada del bosque
 
     hintTextTable[RHT_HYRULE_FIELD] = HintText(CustomMessage("Hyrule Field",
-                                                  /*german*/ "",
+                                                  /*german*/ "Hylianische Steppe",
                                                   /*french*/ "la Plaine d'Hyrule"));
                                                // /*spanish*/la Llanura de Hyrule
 
     hintTextTable[RHT_LAKE_HYLIA] = HintText(CustomMessage("Lake Hylia",
-                                                /*german*/ "",
+                                                /*german*/ "Hylia-See",
                                                 /*french*/ "le Lac Hylia"));
                                              // /*spanish*/el Lago Hylia
 
     hintTextTable[RHT_GERUDO_VALLEY] = HintText(CustomMessage("Gerudo Valley",
-                                                   /*german*/ "",
+                                                   /*german*/ "Gerudotal",
                                                    /*french*/ "la Vallée Gerudo"));
                                                 // /*spanish*/el Valle Gerudo
 
     hintTextTable[RHT_GERUDO_FORTRESS] = HintText(CustomMessage("Gerudo's Fortress",
-                                                     /*german*/ "",
+                                                     /*german*/ "Gerudo-Festung",
                                                      /*french*/ "le Repaire des Voleurs"));
                                                   // /*spanish*/la Fortaleza Gerudo
 
     hintTextTable[RHT_HAUNTED_WASTELAND] = HintText(CustomMessage("Haunted Wasteland",
-                                                       /*german*/ "",
+                                                       /*german*/ "Gespensterwüste",
                                                        /*french*/ "le Désert Hanté"));
                                                     // /*spanish*/el desierto encantado
 
     hintTextTable[RHT_DESERT_COLOSSUS] = HintText(CustomMessage("Desert Colossus",
-                                                     /*german*/ "",
+                                                     /*german*/ "Wüstenkoloß",
                                                      /*french*/ "le Colosse du Désert"));
                                                   // /*spanish*/el Coloso del Desierto
 
     hintTextTable[RHT_THE_MARKET] = HintText(CustomMessage("the Market",
-                                                /*german*/ "",
+                                                /*german*/ "Markt",
                                                 /*french*/ "la Place du Marché"));
                                              // /*spanish*/la plaza del mercado
 
     hintTextTable[RHT_TEMPLE_OF_TIME] = HintText(CustomMessage("Temple of Time",
-                                                    /*german*/ "",
+                                                    /*german*/ "Zitadelle der Zeit",
                                                     /*french*/ "le Temple du Temps"));
                                                  // /*spanish*/el Templo del Tiempo
+    
     hintTextTable[RHT_CASTLE_GROUNDS] = HintText(CustomMessage("the Castle Grounds",
-                                                    /*german*/ "",
+                                                    /*german*/ "Anlage von Schloß Hyrule",
                                                     /*french*/ "le Château d'Hyrule"));
                                                  // /*spanish*/
+    
     hintTextTable[RHT_HYRULE_CASTLE] = HintText(CustomMessage("Hyrule Castle",
-                                                   /*german*/ "",
+                                                   /*german*/ "Schloß Hyrule",
                                                    /*french*/ "le Château d'Hyrule"));
                                                 // /*spanish*/el Castillo de Hyrule
 
     hintTextTable[RHT_OUTSIDE_GANONS_CASTLE] = HintText(CustomMessage("outside Ganon's Castle",
-                                                           /*german*/ "",
+                                                           /*german*/ "außerhalb von Ganons Schloß",
                                                            /*french*/ "les alentours du Château de Ganon"));
                                                         // /*spanish*/el exterior del Castillo de Ganon
 
     hintTextTable[RHT_CASTLE_GROUNDS] = HintText(CustomMessage("the Castle Grounds",
-                                                    /*german*/ "",
+                                                    /*german*/ "Anlage von Schloß Hyrule",
                                                     /*french*/ "le Château d'Hyrule"));
                                                  // /*spanish*/
+    
     hintTextTable[RHT_KAKARIKO_VILLAGE] = HintText(CustomMessage("Kakariko Village",
-                                                      /*german*/ "",
+                                                      /*german*/ "Kakariko",
                                                       /*french*/ "le Village Cocorico"));
                                                    // /*spanish*/Kakariko
 
     hintTextTable[RHT_THE_GRAVEYARD] = HintText(CustomMessage("the Graveyard",
-                                                   /*german*/ "",
+                                                   /*german*/ "Friedhof",
                                                    /*french*/ "le Cimetière"));
                                                 // /*spanish*/el cementerio
 
     hintTextTable[RHT_DEATH_MOUNTAIN_TRAIL] = HintText(CustomMessage("Death Mountain Trail",
-                                                          /*german*/ "",
+                                                          /*german*/ "Gebirgspfad",
                                                           /*french*/ "le Chemin du Péril"));
                                                        // /*spanish*/el sendero de la Montaña de la Muerte
 
     hintTextTable[RHT_GORON_CITY] = HintText(CustomMessage("Goron City",
-                                                /*german*/ "",
+                                                /*german*/ "Goronia",
                                                 /*french*/ "le Village Goron"));
                                              // /*spanish*/la Ciudad Goron
 
     hintTextTable[RHT_DEATH_MOUNTAIN_CRATER] = HintText(CustomMessage("Death Mountain Crater",
-                                                           /*german*/ "",
+                                                           /*german*/ "Todeskrater",
                                                            /*french*/ "le Cratère du Péril"));
                                                         // /*spanish*/el cráter de la Montaña de la Muerte
 
     hintTextTable[RHT_ZORAS_RIVER] = HintText(CustomMessage("Zora's River",
-                                                 /*german*/ "",
+                                                 /*german*/ "Zoras Fluß",
                                                  /*french*/ "la Rivière Zora"));
                                               // /*spanish*/el Río Zora
 
     hintTextTable[RHT_ZORAS_DOMAIN] = HintText(CustomMessage("Zora's Domain",
-                                                  /*german*/ "",
+                                                  /*german*/ "Zoras Reich",
                                                   /*french*/ "le Domaine Zora"));
                                                // /*spanish*/la Región de los Zora
 
     hintTextTable[RHT_ZORAS_FOUNTAIN] = HintText(CustomMessage("Zora's Fountain",
-                                                    /*german*/ "",
+                                                    /*german*/ "Zoras Quelle",
                                                     /*french*/ "la Fontaine Zora"));
                                                  // /*spanish*/la Fuente Zora
     hintTextTable[RHT_LON_LON_RANCH] = HintText(CustomMessage("Lon Lon Ranch",
-                                                   /*german*/ "",
+                                                   /*german*/ "Lon Lon-Farm",
                                                    /*french*/ "le Ranch Lon Lon"));
                                                 // /*spanish*/el Rancho Lon Lon
 
@@ -1073,382 +1077,387 @@ void StaticData::HintTable_Init() {
     ---------------------------*/
 
     hintTextTable[RHT_KF_LINKS_HOUSE] = HintText(CustomMessage("Link's House",
-                                                    /*german*/ "",
+                                                    /*german*/ "Links Haus",
                                                     /*french*/ "la #maison de @#"));
                                                  // /*spanish*/la casa de @
 
     hintTextTable[RHT_KF_MIDOS_HOUSE] = HintText(CustomMessage("Mido's house",
-                                                    /*german*/ "",
+                                                    /*german*/ "Midos Haus",
                                                     /*french*/ "la Cabane du Grand Mido"));
                                                  // /*spanish*/la casa de Mido
+    
     hintTextTable[RHT_KF_SARIAS_HOUSE] = HintText(CustomMessage("Saria's House",
-                                                     /*german*/ "",
+                                                     /*german*/ "Salias Haus",
                                                      /*french*/ "la Cabane de Saria"));
                                                   // /*spanish*/la casa de Saria
 
     hintTextTable[RHT_KF_HOUSE_OF_TWINS] = HintText(CustomMessage("the #House of Twins#",
-                                                       /*german*/ "",
+                                                       /*german*/ "das #Haus der Zwillinge#",
                                                        /*french*/ "la Cabane des Jumelles"));
                                                     // /*spanish*/la casa de las gemelas
 
     hintTextTable[RHT_KF_KNOW_IT_ALL_HOUSE] = HintText(CustomMessage("Know-It-All Brothers' House",
-                                                          /*german*/ "",
+                                                          /*german*/ "das #Haus der allwissenden Brüder#",
                                                           /*french*/ "la Cabane des frères Je-Sais-Tout"));
                                                        // /*spanish*/la casa de los hermanos Sabelotodo
 
     hintTextTable[RHT_KF_KOKIRI_SHOP] = HintText(CustomMessage("the #Kokiri Shop#",
-                                                    /*german*/ "",
+                                                    /*german*/ "der #Kokiri-Laden#",
                                                     /*french*/ "le #Magasin Kokiri#"));
                                                  // /*spanish*/la tienda kokiri
+    
     hintTextTable[RHT_LH_LAB] = HintText(CustomMessage("the #Lakeside Laboratory#",
-                                            /*german*/ "",
+                                            /*german*/ "das #Laboratorium des Sees#",
                                             /*french*/ "le #Laboratoire du Lac#"));
                                          // /*spanish*/el laboratorio del lago
 
     hintTextTable[RHT_LH_FISHING_HOLE] = HintText(CustomMessage("the #Fishing Pond#",
-                                                     /*german*/ "",
+                                                     /*german*/ "der #Angelteich#",
                                                      /*french*/ "l'#Étang#"));
                                                   // /*spanish*/el estanque
 
     hintTextTable[RHT_GV_CARPENTER_TENT] = HintText(CustomMessage("the #Carpenters' tent#",
-                                                       /*german*/ "",
+                                                       /*german*/ "das #Zelt der Zimmerleute#",
                                                        /*french*/ "la #Tente des charpentiers#"));
                                                     // /*spanish*/la #tienda de campaña de los carpinteros#
 
     hintTextTable[RHT_MARKET_GUARD_HOUSE] = HintText(CustomMessage("the #Guard House#",
-                                                        /*german*/ "",
+                                                        /*german*/ "das #Haus der Wachen#",
                                                         /*french*/ "le #poste de garde#"));
                                                      // /*spanish*/la caseta de guardia
 
     hintTextTable[RHT_MARKET_MASK_SHOP] = HintText(CustomMessage("the #Happy Mask Shop#",
-                                                      /*german*/ "",
+                                                      /*german*/ "der #Fröhliche Maskenladen#",
                                                       /*french*/ "la #Foire Aux Masques#"));
                                                    // /*spanish*/la tienda de La Máscara Feliz
 
     hintTextTable[RHT_MARKET_BOMBCHU_BOWLING] = HintText(CustomMessage("the #Bombchu Bowling Alley#",
-                                                            /*german*/ "",
+                                                            /*german*/ "die #Krabbelminenbowlingbahn",
                                                             /*french*/ "le #Bowling Teigneux#"));
                                                          // /*spanish*/la Bolera Bombchu
 
     hintTextTable[RHT_MARKET_POTION_SHOP] = HintText(CustomMessage("the #Market Potion Shop#",
-                                                        /*german*/ "",
+                                                        /*german*/ "der #Magie-Laden des Marktes#",
                                                         /*french*/ "l'#apothicaire de la Place du Marché#"));
                                                      // /*spanish*/la tienda de pociones de la plaza del mercado
 
     hintTextTable[RHT_MARKET_TREASURE_CHEST_GAME] = HintText(CustomMessage("the #Treasure Chest Shop#",
-                                                                /*german*/ "",
+                                                                /*german*/ "der #Schatztruhen-Laden#",
                                                                 /*french*/ "la #Chasse-aux-Trésors#"));
                                                              // /*spanish*/el Cofre del Tesoro
 
     hintTextTable[RHT_MARKET_BOMBCHU_SHOP] = HintText(CustomMessage("the #Bombchu Shop#",
-                                                         /*german*/ "",
+                                                         /*german*/ "der #Krabbelminen-Laden#",
                                                          /*french*/ "le #Magasin de Missiles#"));
                                                       // /*spanish*/la Tienda Bombchu
 
     hintTextTable[RHT_MARKET_MAN_IN_GREEN_HOUSE] = HintText(CustomMessage("Man in Green's House",
-                                                               /*german*/ "",
+                                                               /*german*/ "das #Haus des Mannes in grün#",
                                                                /*french*/ "la #Maison de l'Homme en Vert#"));
                                                             // /*spanish*/la casa del hombre de verde
 
     hintTextTable[RHT_KAK_WINDMILL] = HintText(CustomMessage("the #Windmill#",
-                                                  /*german*/ "",
+                                                  /*german*/ "die #Windmühle#",
                                                   /*french*/ "le #Moulin#"));
                                                // /*spanish*/el #molino#
 
     hintTextTable[RHT_KAK_CARPENTER_BOSS_HOUSE] = HintText(CustomMessage("the #Carpenters' Boss House#",
-                                                              /*german*/ "",
+                                                              /*german*/ "das #Haus des Chefs der Zimmerleute#",
                                                               /*french*/ "la #Maison du Chef des ouvriers#"));
                                                            // /*spanish*/la casa del capataz de los carpinteros
 
     hintTextTable[RHT_KAK_HOUSE_OF_SKULLTULA] = HintText(CustomMessage("the #House of Skulltula#",
-                                                            /*german*/ "",
+                                                            /*german*/ "das #Haus der Skulltula#",
                                                             /*french*/ "la #Maison des Skulltulas#"));
                                                          // /*spanish*/la casa de las Skulltulas
 
     hintTextTable[RHT_KAK_IMPAS_HOUSE] = HintText(CustomMessage("Impa's House",
-                                                     /*german*/ "",
+                                                     /*german*/ "das #Haus von Impa#",
                                                      /*french*/ "la #Maison d'Impa#"));
                                                   // /*spanish*/la casa de Impa
 
     hintTextTable[RHT_KAK_IMPAS_HOUSE_BACK] = HintText(CustomMessage("Impa's cow cage",
-                                                          /*german*/ "",
+                                                          /*german*/ "der #Kuhkäfig von Impa#",
                                                           /*french*/ "la #cage à vache d'Impa#"));
                                                        // /*spanish*/la jaula de la vaca de Impa
 
     hintTextTable[RHT_KAK_ODD_POTION_BUILDING] = HintText(CustomMessage("Granny's Potion Shop",
-                                                             /*german*/ "",
+                                                             /*german*/ "Asas Hexenladen",
                                                              /*french*/ "la #maison bleue de Cocorico#"));
                                                           // /*spanish*/la tienda de pociones de la abuela
 
     hintTextTable[RHT_GRAVEYARD_DAMPES_HOUSE] = HintText(CustomMessage("Dampé's Hut",
-                                                            /*german*/ "",
+                                                            /*german*/ "der #Hut von Boris#",
                                                             /*french*/ "la #Cabane du Fossoyeur#"));
                                                          // /*spanish*/la cabaña de Dampé
 
     hintTextTable[RHT_GC_SHOP] = HintText(CustomMessage("the #Goron Shop#",
-                                             /*german*/ "",
+                                             /*german*/ "der #Goronen-Laden#",
                                              /*french*/ "la #Boutique Goron#"));
                                           // /*spanish*/la #tienda goron#
 
     hintTextTable[RHT_ZD_SHOP] = HintText(CustomMessage("the #Zora Shop#",
-                                             /*german*/ "",
+                                             /*german*/ "der #Zora-Laden#",
                                              /*french*/ "la #Boutique Zora#"));
                                           // /*spanish*/la #tienda zora#
 
     hintTextTable[RHT_LLR_TALONS_HOUSE] = HintText(CustomMessage("Talon's House",
-                                                      /*german*/ "",
+                                                      /*german*/ "das #Haus von Talon#",
                                                       /*french*/ "la #Maison de Talon#"));
                                                    // /*spanish*/la casa de Talon
 
     hintTextTable[RHT_LLR_STABLES] = HintText(CustomMessage("a #stable#",
-                                                 /*german*/ "",
+                                                 /*german*/ "ein #Stall#",
                                                  /*french*/ "l'#Étable#"));
                                               // /*spanish*/el establo
 
     hintTextTable[RHT_LLR_TOWER] = HintText(CustomMessage("the #Lon Lon Tower#",
-                                               /*german*/ "",
+                                               /*german*/ "der #Lon Lon-Turm#",
                                                /*french*/ "le #silo du Ranch Lon Lon#"));
                                             // /*spanish*/la torre Lon Lon
 
     hintTextTable[RHT_MARKET_BAZAAR] = HintText(CustomMessage("the #Market Bazaar#",
-                                                   /*german*/ "",
+                                                   /*german*/ "der #Basar des Marktes#",
                                                    /*french*/ "le #Bazar de la Place du Marché#"));
                                                 // /*spanish*/el bazar de la plaza del mercado
 
     hintTextTable[RHT_MARKET_SHOOTING_GALLERY] = HintText(CustomMessage("a #Slingshot Shooting Gallery#",
-                                                             /*german*/ "",
+                                                             /*german*/ "die #Schießbude des Marktes#",
                                                              /*french*/ "le #Jeu d'Adresse de la Place du Marché#"));
                                                           // /*spanish*/el Tiro al Blanco con tirachinas
 
     hintTextTable[RHT_KAK_BAZAAR] = HintText(CustomMessage("the #Kakariko Bazaar#",
-                                                /*german*/ "",
+                                                /*german*/ "der #Basar von Kakariko#",
                                                 /*french*/ "le #Bazar de Cocorico#"));
                                              // /*spanish*/el bazar de Kakariko
 
     hintTextTable[RHT_KAK_POTION_SHOP_FRONT] = HintText(CustomMessage("the #Kakariko Potion Shop#",
-                                                           /*german*/ "",
+                                                           /*german*/ "der #Magie-Laden von Kakariko#",
                                                            /*french*/ "l'#apothicaire de Cocorico#"));
                                                         // /*spanish*/la tienda de pociones de Kakariko
 
     hintTextTable[RHT_KAK_POTION_SHOP_BACK] = HintText(CustomMessage("the #Kakariko Potion Shop#",
-                                                          /*german*/ "",
+                                                          /*german*/ "der #Magie-Laden von Kakariko#",
                                                           /*french*/ "l'#apothicaire de Cocorico#"));
                                                        // /*spanish*/la tienda de pociones de Kakariko
 
     hintTextTable[RHT_KAK_SHOOTING_GALLERY] = HintText(CustomMessage("a #Bow Shooting Gallery#",
-                                                          /*german*/ "",
+                                                          /*german*/ "eine #Schießbude von Kakariko#",
                                                           /*french*/ "le #jeu d'adresse de Cocorico#"));
                                                        // /*spanish*/el Tiro al Blanco con arco
 
     hintTextTable[RHT_COLOSSUS_GREAT_FAIRY_FOUNTAIN] = HintText(CustomMessage("a #Great Fairy Fountain#",
-                                                                   /*german*/ "",
+                                                                   /*german*/ "eine #Feen-Quelle#",
                                                                    /*french*/ "une #Fontaine Royale des Fées#"));
                                                                 // /*spanish*/una fuente de la Gran Hada
 
     hintTextTable[RHT_HC_GREAT_FAIRY_FOUNTAIN] = HintText(CustomMessage("a #Great Fairy Fountain#",
-                                                             /*german*/ "",
+                                                             /*german*/ "eine #Feen-Quelle#",
                                                              /*french*/ "une #Fontaine Royale des Fées#"));
                                                           // /*spanish*/una fuente de la Gran Hada
 
     hintTextTable[RHT_OGC_GREAT_FAIRY_FOUNTAIN] = HintText(CustomMessage("a #Great Fairy Fountain#",
-                                                              /*german*/ "",
+                                                              /*german*/ "eine #Feen-Quelle#",
                                                               /*french*/ "une #Fontaine Royale des Fées#"));
                                                            // /*spanish*/una fuente de la Gran Hada
 
     hintTextTable[RHT_DMC_GREAT_FAIRY_FOUNTAIN] = HintText(CustomMessage("a #Great Fairy Fountain#",
-                                                              /*german*/ "",
+                                                              /*german*/ "eine #Feen-Quelle#",
                                                               /*french*/ "une #Fontaine Royale des Fées#"));
                                                            // /*spanish*/una fuente de la Gran Hada
 
     hintTextTable[RHT_DMT_GREAT_FAIRY_FOUNTAIN] = HintText(CustomMessage("a #Great Fairy Fountain#",
-                                                              /*german*/ "",
+                                                              /*german*/ "eine #Feen-Quelle#",
                                                               /*french*/ "une #Fontaine Royale des Fées#"));
                                                            // /*spanish*/una fuente de la Gran Hada
 
     hintTextTable[RHT_ZF_GREAT_FAIRY_FOUNTAIN] = HintText(CustomMessage("a #Great Fairy Fountain#",
-                                                             /*german*/ "",
+                                                             /*german*/ "eine #Feen-Quelle#",
                                                              /*french*/ "une #Fontaine Royale des Fées#"));
                                                           // /*spanish*/una fuente de la Gran Hada
 
     hintTextTable[RHT_GRAVEYARD_SHIELD_GRAVE] = HintText(CustomMessage("a #grave with a free chest#",
-                                                            /*german*/ "",
+                                                            /*german*/ "ein #Grab mit einer Gratistruhe#",
                                                             /*french*/ "le #tombeau avec un trésor#"));
                                                          // /*spanish*/la #tumba con un cofre#
 
     hintTextTable[RHT_GRAVEYARD_HEART_PIECE_GRAVE] = HintText(CustomMessage("a chest spawned by #Sun's Song#",
-                                                                 /*german*/ "",
+                                                                 /*german*/ "eine von der #Hymne der Sonne# geschaffene Truhe",
                                                                  /*french*/ "un #coffre apparaît avec le Chant du Soleil#"));
                                                               // /*spanish*/la #tumba de la Canción del Sol#
 
     hintTextTable[RHT_GRAVEYARD_COMPOSERS_GRAVE] = HintText(CustomMessage("the #Composers' Grave#",
-                                                               /*german*/ "",
+                                                               /*german*/ "das Königsgrab",
                                                                /*french*/ "la #Tombe royale#"));
                                                             // /*spanish*/el #Panteón Real#
 
     hintTextTable[RHT_GRAVEYARD_DAMPES_GRAVE] = HintText(CustomMessage("Dampé's Grave",
-                                                            /*german*/ "",
+                                                            /*german*/ "das Grab von Boris",
                                                             /*french*/ "la #Tombe d'Igor#"));
                                                          // /*spanish*/la #tumba de Dampé#
 
     hintTextTable[RHT_DMT_COW_GROTTO] = HintText(CustomMessage("a solitary #Cow#",
-                                                    /*german*/ "",
+                                                    /*german*/ "eine solitäre #Kuh#",
                                                     /*french*/ "la #grotte avec une vache#"));
                                                  // /*spanish*/una #vaca# solitaria
+    
     hintTextTable[RHT_HC_STORMS_GROTTO] = HintText(CustomMessage("a sandy grotto with #fragile walls#",
-                                                      /*german*/ "",
+                                                      /*german*/ "eine sandige Grotte mit #fragilen Wänden#",
                                                       /*french*/ "la #grotte avec des murs fragiles#"));
                                                    // /*spanish*/la arenosa gruta de #frágiles paredes#
 
     hintTextTable[RHT_HF_TEKTITE_GROTTO] = HintText(CustomMessage("a pool guarded by a #Tektite#",
-                                                       /*german*/ "",
+                                                       /*german*/ "ein poolbewachender #Arachno#",
                                                        /*french*/ "l'#étang sous-terrain avec un Araknon#"));
                                                     // /*spanish*/un charco custodiado por un #Tektite#
 
     hintTextTable[RHT_HF_NEAR_KAK_GROTTO] = HintText(CustomMessage("a #Big Skulltula# guarding a Gold one",
-                                                        /*german*/ "",
+                                                        /*german*/ "eine goldene Skulltula bewachende #große Skulltula#",
                                                         /*french*/ "la #grotte d'araignées#"));
                                                      // /*spanish*/una #gran Skulltula# custodiando una dorada
 
     hintTextTable[RHT_HF_COW_GROTTO] = HintText(CustomMessage("a grotto full of #spider webs#",
-                                                   /*german*/ "",
+                                                   /*german*/ "eine mit #Spinnweben# gefüllte Grotte",
                                                    /*french*/ "la #grotte couverte de toiles d'araignées#"));
                                                 // /*spanish*/una gruta llena de #telarañas#
 
     hintTextTable[RHT_KAK_REDEAD_GROTTO] = HintText(CustomMessage("#ReDeads# guarding a chest",
-                                                       /*german*/ "",
+                                                       /*german*/ "truhenbewachende #Remorts#",
                                                        /*french*/ "le tombeau de #deux morts#"));
                                                     // /*spanish*/los #ReDeads# que custodian un cofre
 
     hintTextTable[RHT_SFM_WOLFOS_GROTTO] = HintText(CustomMessage("#Wolfos# guarding a chest",
-                                                       /*german*/ "",
+                                                       /*german*/ "truhenbewachende #Wolfos#",
                                                        /*french*/ "la #grotte iridescente#"));
                                                     // /*spanish*/los #Wolfos# que custodian un cofre
 
     hintTextTable[RHT_GV_OCTOROK_GROTTO] = HintText(CustomMessage("an #Octorok# guarding a rich pool",
-                                                       /*german*/ "",
+                                                       /*german*/ "ein poolbewachender #Oktorok#",
                                                        /*french*/ "un #étang sous-terrain avec un Octorok#"));
                                                     // /*spanish*/un #Octorok# que custodia un lujoso charco
 
     hintTextTable[RHT_DEKU_THEATER] = HintText(CustomMessage("the #Lost Woods Stage#",
-                                                  /*german*/ "",
+                                                  /*german*/ "die #Verlorenen Wälder#",
                                                   /*french*/ "le #théâtre sylvestre#"));
                                                // /*spanish*/el #escenario del Bosque Perdido#
 
     hintTextTable[RHT_ZR_OPEN_GROTTO] = HintText(CustomMessage("a #generic grotto#",
-                                                    /*german*/ "",
+                                                    /*german*/ "eine #generische Grotte#",
                                                     /*french*/ "une #grotte avec un trésor#"));
                                                  // /*spanish*/una #cueva genérica#
+    
     hintTextTable[RHT_DMC_UPPER_GROTTO] = HintText(CustomMessage("a #generic grotto#",
-                                                      /*german*/ "",
+                                                      /*german*/ "eine #generische Grotte#",
                                                       /*french*/ "une #grotte avec un trésor#"));
                                                    // /*spanish*/una #cueva genérica#
 
     hintTextTable[RHT_DMT_STORMS_GROTTO] = HintText(CustomMessage("a #generic grotto#",
-                                                       /*german*/ "",
+                                                       /*german*/ "eine #generische Grotte#",
                                                        /*french*/ "une #grotte avec un trésor#"));
                                                     // /*spanish*/una #cueva genérica#
 
     hintTextTable[RHT_KAK_OPEN_GROTTO] = HintText(CustomMessage("a #generic grotto#",
-                                                     /*german*/ "",
+                                                     /*german*/ "eine #generische Grotte#",
                                                      /*french*/ "une #grotte avec un trésor#"));
                                                   // /*spanish*/una #cueva genérica#
 
     hintTextTable[RHT_HF_NEAR_MARKET_GROTTO] = HintText(CustomMessage("a #generic grotto#",
-                                                           /*german*/ "",
+                                                           /*german*/ "eine #generische Grotte#",
                                                            /*french*/ "une #grotte avec un trésor#"));
                                                         // /*spanish*/una #cueva genérica#
 
     hintTextTable[RHT_HF_OPEN_GROTTO] = HintText(CustomMessage("a #generic grotto#",
-                                                    /*german*/ "",
+                                                    /*german*/ "eine #generische Grotte#",
                                                     /*french*/ "une #grotte avec un trésor#"));
                                                  // /*spanish*/una #cueva genérica#
+    
     hintTextTable[RHT_HF_SOUTHEAST_GROTTO] = HintText(CustomMessage("a #generic grotto#",
-                                                         /*german*/ "",
+                                                         /*german*/ "eine #generische Grotte#",
                                                          /*french*/ "une #grotte avec un trésor#"));
                                                       // /*spanish*/una #cueva genérica#
 
     hintTextTable[RHT_KF_STORMS_GROTTO] = HintText(CustomMessage("a #generic grotto#",
-                                                      /*german*/ "",
+                                                      /*german*/ "eine #generische Grotte#",
                                                       /*french*/ "une #grotte avec un trésor#"));
                                                    // /*spanish*/una #cueva genérica#
 
     hintTextTable[RHT_LW_NEAR_SHORTCUTS_GROTTO] = HintText(CustomMessage("a #generic grotto#",
-                                                              /*german*/ "",
+                                                              /*german*/ "eine #generische Grotte#",
                                                               /*french*/ "une #grotte avec un trésor#"));
                                                            // /*spanish*/una #cueva genérica#
 
     hintTextTable[RHT_HF_INSIDE_FENCE_GROTTO] = HintText(CustomMessage("a #single Upgrade Deku Scrub#",
-                                                            /*german*/ "",
+                                                            /*german*/ "ein #einzelner Upgrade-Deku#",
                                                             /*french*/ "une #grotte avec une peste Mojo#"));
                                                          // /*spanish*/una cueva con un #solitario mercader deku#
 
     hintTextTable[RHT_LW_SCRUBS_GROTTO] = HintText(CustomMessage("#2 Deku Scrubs# including an Upgrade one",
-                                                      /*german*/ "",
+                                                      /*german*/ "#zwei Dekus# inklusive einem Upgrade-Deku",
                                                       /*french*/ "une #grotte avec deux pestes Mojo#"));
                                                    // /*spanish*/una cueva con #dos mercaderes deku#
 
     hintTextTable[RHT_COLOSSUS_GROTTO] = HintText(CustomMessage("2 Deku Scrubs",
-                                                     /*german*/ "",
+                                                     /*german*/ "zwei Dekus",
                                                      /*french*/ "une #grotte avec deux pestes Mojo#"));
                                                   // /*spanish*/una cueva con #dos mercaderes deku#
 
     hintTextTable[RHT_ZR_STORMS_GROTTO] = HintText(CustomMessage("2 Deku Scrubs",
-                                                      /*german*/ "",
+                                                      /*german*/ "zwei Dekus",
                                                       /*french*/ "une #grotte avec deux pestes Mojo#"));
                                                    // /*spanish*/una cueva con #dos mercaderes deku#
 
     hintTextTable[RHT_SFM_STORMS_GROTTO] = HintText(CustomMessage("2 Deku Scrubs",
-                                                       /*german*/ "",
+                                                       /*german*/ "zwei Dekus",
                                                        /*french*/ "une #grotte avec deux pestes Mojo#"));
                                                     // /*spanish*/una cueva con #dos mercaderes deku#
 
     hintTextTable[RHT_GV_STORMS_GROTTO] = HintText(CustomMessage("2 Deku Scrubs",
-                                                      /*german*/ "",
+                                                      /*german*/ "zwei Dekus",
                                                       /*french*/ "une #grotte avec deux pestes Mojo#"));
                                                    // /*spanish*/una cueva con #dos mercaderes deku#
 
     hintTextTable[RHT_LH_GROTTO] = HintText(CustomMessage("3 Deku Scrubs",
-                                               /*german*/ "",
+                                               /*german*/ "drei Dekus",
                                                /*french*/ "une #grotte avec trois pestes Mojo#"));
                                             // /*spanish*/una cueva con #tres mercaderes deku#
 
     hintTextTable[RHT_DMC_HAMMER_GROTTO] = HintText(CustomMessage("3 Deku Scrubs",
-                                                       /*german*/ "",
+                                                       /*german*/ "drei Dekus",
                                                        /*french*/ "une #grotte avec trois pestes Mojo#"));
                                                     // /*spanish*/una cueva con #tres mercaderes deku#
 
     hintTextTable[RHT_GC_GROTTO] = HintText(CustomMessage("3 Deku Scrubs",
-                                               /*german*/ "",
+                                               /*german*/ "drei Dekus",
                                                /*french*/ "une #grotte avec trois pestes Mojo#"));
                                             // /*spanish*/una cueva con #tres mercaderes deku#
 
     hintTextTable[RHT_LLR_GROTTO] = HintText(CustomMessage("3 Deku Scrubs",
-                                                /*german*/ "",
+                                                /*german*/ "drei Dekus",
                                                 /*french*/ "une #grotte avec trois pestes Mojo#"));
                                              // /*spanish*/una cueva con #tres mercaderes deku#
 
     hintTextTable[RHT_ZR_FAIRY_GROTTO] = HintText(CustomMessage("a small #Fairy Fountain#",
-                                                     /*german*/ "",
+                                                     /*german*/ "ein kleiner #Feen-Brunnen#",
                                                      /*french*/ "une #fontaine de fées#"));
                                                   // /*spanish*/una pequeña #fuente de hadas#
 
     hintTextTable[RHT_HF_FAIRY_GROTTO] = HintText(CustomMessage("a small #Fairy Fountain#",
-                                                     /*german*/ "",
+                                                     /*german*/ "ein kleiner #Feen-Brunnen#",
                                                      /*french*/ "une #fontaine de fées#"));
                                                   // /*spanish*/una pequeña #fuente de hadas#
 
     hintTextTable[RHT_SFM_FAIRY_GROTTO] = HintText(CustomMessage("a small #Fairy Fountain#",
-                                                      /*german*/ "",
+                                                      /*german*/ "ein kleiner #Feen-Brunnen#",
                                                       /*french*/ "une #fontaine de fées#"));
                                                    // /*spanish*/una pequeña #fuente de hadas#
 
     hintTextTable[RHT_ZD_STORMS_GROTTO] = HintText(CustomMessage("a small #Fairy Fountain#",
-                                                      /*german*/ "",
+                                                      /*german*/ "ein kleiner #Feen-Brunnen#",
                                                       /*french*/ "une #fontaine de fées#"));
                                                    // /*spanish*/una pequeña #fuente de hadas#
 
     hintTextTable[RHT_GF_STORMS_GROTTO] = HintText(CustomMessage("a small #Fairy Fountain#",
-                                                      /*german*/ "",
+                                                      /*german*/ "ein kleiner #Feen-Brunnen#",
                                                       /*french*/ "une #fontaine de fées#"));
                                                    // /*spanish*/una pequeña #fuente de hadas#
 
@@ -1503,9 +1512,9 @@ void StaticData::HintTable_Init() {
                                          // /*spanish*/Salva tu futuro, acaba con el dueño de La Máscara Feliz.
 
     hintTextTable[RHT_JUNK11] = HintText(CustomMessage("Glitches are a pathway to many abilities some consider to be... Unnatural.",
-                                            /*german*/ "Los glitches son el camino a muchas habilidades que varios consideran... nada natural.",
+                                            /*german*/ "",
                                             /*french*/ "Les glitchs sont un moyen d'acquérir de nombreuses facultés considérées par certains comme... contraire "));
-                                         // /*spanish*/à la nature.
+                                         // /*spanish*/ Los glitches son el camino a muchas habilidades que varios consideran... nada natural.
 
     hintTextTable[RHT_JUNK12] = HintText(CustomMessage("I'm stoned. Get it?",
                                             /*german*/ "",
@@ -2261,122 +2270,122 @@ void StaticData::HintTable_Init() {
 
     
     hintTextTable[RHT_DEKU_TREE] = HintText(CustomMessage("Deku Tree",
-                                               /*german*/ "",
+                                               /*german*/ "Deku-Baum",
                                                /*french*/ "l'Arbre Mojo"),
                                             // /*spanish*/el Gran Árbol Deku
                                             {},
                                             {CustomMessage("an ancient tree",
-                                                /*german*/ "",
+                                                /*german*/ "ein antiker Baum",
                                                 /*french*/ "le vieil arbre")});
                                              // /*spanish*/un ancestral árbol
 
     hintTextTable[RHT_DODONGOS_CAVERN] = HintText(CustomMessage("Dodongo's Cavern",
-                                                     /*german*/ "",
+                                                     /*german*/ "Dodongos Kaverne",
                                                      /*french*/ "la Caverne Dodongo"),
                                                   // /*spanish*/la Cueva de los Dodongos
                                                   {},
                                                   {CustomMessage("an immense cavern",
-                                                      /*german*/ "",
+                                                      /*german*/ "eine riesige Kaverne",
                                                       /*french*/ "l'immense caverne")});
                                                    // /*spanish*/una descomunal cueva
 
     hintTextTable[RHT_JABU_JABUS_BELLY] = HintText(CustomMessage("Jabu-Jabu's Belly",
-                                                      /*german*/ "",
+                                                      /*german*/ "Jabu-Jabus Bauch",
                                                       /*french*/ "le Ventre de Jabu-Jabu"),
                                                    // /*spanish*/tripa de Jabu-Jabu
                                                    {},
                                                    {CustomMessage("the belly of a deity",
-                                                       /*german*/ "",
+                                                       /*german*/ "der Bauch einer Gottheit",
                                                        /*french*/ "le ventre d'un gardien")});
                                                     // /*spanish*/la tripa de cierta deidad
 
     hintTextTable[RHT_FOREST_TEMPLE] = HintText(CustomMessage("Forest Temple",
-                                                   /*german*/ "",
+                                                   /*german*/ "Waldtempel",
                                                    /*french*/ "le Temple de la Forêt"),
                                                 // /*spanish*/el Templo del Bosque
                                                 {},
                                                 {CustomMessage("a deep forest",
-                                                    /*german*/ "",
+                                                    /*german*/ "ein tiefer Wald",
                                                     /*french*/ "la profonde forêt")});
                                                  // /*spanish*/las profundidades del bosque
 
     hintTextTable[RHT_FIRE_TEMPLE] = HintText(CustomMessage("Fire Temple",
-                                                 /*german*/ "",
+                                                 /*german*/ "Feuertempel",
                                                  /*french*/ "le Temple du Feu"),
                                               // /*spanish*/el Templo del Fuego
                                               {},
                                               {CustomMessage("a high mountain",
-                                                  /*german*/ "",
+                                                  /*german*/ "ein hoher Berg",
                                                   /*french*/ "la grande montagne")});
                                                // /*spanish*/una alta montaña
 
     hintTextTable[RHT_WATER_TEMPLE] = HintText(CustomMessage("Water Temple",
-                                                  /*german*/ "",
+                                                  /*german*/ "Wassertempel",
                                                   /*french*/ "le Temple de l'Eau"),
                                                // /*spanish*/el Templo del Agua
                                                {},
                                                {CustomMessage("a vast lake",
-                                                   /*german*/ "",
+                                                   /*german*/ "ein gewaltiger See",
                                                    /*french*/ "le vaste lac")});
                                                 // /*spanish*/un lago inmenso
 
     hintTextTable[RHT_SPIRIT_TEMPLE] = HintText(CustomMessage("Spirit Temple",
-                                                   /*german*/ "",
+                                                   /*german*/ "Geistertempel",
                                                    /*french*/ "le Temple de l'Esprit"),
                                                 // /*spanish*/el Templo del Espíritu
                                                 {},
                                                 {CustomMessage("the goddess of the sand",
-                                                    /*german*/ "",
+                                                    /*german*/ "die Göttin des Sandes",
                                                     /*french*/ "la déesse des sables")});
                                                  // /*spanish*/la diosa de las arenas
 
     hintTextTable[RHT_SHADOW_TEMPLE] = HintText(CustomMessage("Shadow Temple",
-                                                   /*german*/ "",
+                                                   /*german*/ "Schattentempel",
                                                    /*french*/ "le Temple de l'Ombre"),
                                                 // /*spanish*/el Templo de las Sombras
                                                 {},
                                                 {CustomMessage("the house of the dead",
-                                                    /*german*/ "",
+                                                    /*german*/ "das Haus der Toten",
                                                     /*french*/ "la maison des morts")});
                                                  // /*spanish*/la casa de la muerte
 
     hintTextTable[RHT_ICE_CAVERN] = HintText(CustomMessage("Ice Cavern",
-                                                /*german*/ "",
+                                                /*german*/ "Eishöhle",
                                                 /*french*/ "la caverne de glace"),
                                              // /*spanish*/la caverna de hielo
                                              {},
                                              {CustomMessage("a frozen maze",
-                                                 /*german*/ "",
+                                                 /*german*/ "ein gefrorenes Labyrinth",
                                                  /*french*/ "le dédale glacé")});
                                               // /*spanish*/un gélido laberinto
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL] = HintText(CustomMessage("Bottom of the Well",
-                                                        /*german*/ "",
+                                                        /*german*/ "Grund des Brunnens",
                                                         /*french*/ "le fonds du Puits"),
                                                      // /*spanish*/el fondo del pozo
                                                      {},
                                                      {CustomMessage("a shadow\'s prison",
-                                                         /*german*/ "",
+                                                         /*german*/ "das Gefängnis eines Schattens",
                                                          /*french*/ "la prison d'une ombre")});
                                                       // /*spanish*/la prisión de las sombras
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND] = HintText(CustomMessage("Gerudo Training Grounds",
-                                                            /*german*/ "",
+                                                            /*german*/ "Gerudo-Trainingsgelände",
                                                             /*french*/ "le Gymnase Gerudo"),
                                                          // /*spanish*/el Centro de Instrucción Gerudo
                                                          {},
                                                          {CustomMessage("the test of thieves",
-                                                             /*german*/ "",
+                                                             /*german*/ "die Prüfung der Diebe",
                                                              /*french*/ "l'épreuve des voleurs")});
                                                           // /*spanish*/la prueba de las bandidas
 
     hintTextTable[RHT_GANONS_CASTLE] = HintText(CustomMessage("Inside Ganon's Castle",
-                                                   /*german*/ "",
+                                                   /*german*/ "In Ganons Schloß",
                                                    /*french*/ "l'intérieur du Château de Ganon"),
                                                 // /*spanish*/el interior del Castillo de Ganon
                                                 {},
                                                 {CustomMessage("a conquered citadel",
-                                                    /*german*/ "",
+                                                    /*german*/ "eine eroberte Zitadelle",
                                                     /*french*/ "la citadelle assiégée")});
                                                  // /*spanish*/una conquistada ciudadela
 
@@ -2385,82 +2394,82 @@ void StaticData::HintTable_Init() {
     ---------------------------*/
 
     hintTextTable[RHT_QUEEN_GOHMA] = HintText(CustomMessage("#Queen Gohma# holds",
-                                                 /*german*/ "",
+                                                 /*german*/ "#Königin Gohma# hält",
                                                  /*french*/ "la #Reine Gohma# possède"),
                                               // /*spanish*/la #Reina Goma# porta
                                               {},
                                               {CustomMessage("the #Parasitic Armored Arachnid# holds",
-                                                  /*german*/ "",
+                                                  /*german*/ "die #gepanzerte parasitäre Spinne# hält",
                                                   /*french*/ "le #monstre insectoïde géant# possède")});
                                                // /*spanish*/el #arácnido parasitario acorazado# porta
 
     hintTextTable[RHT_KING_DODONGO] = HintText(CustomMessage("#King Dodongo# holds",
-                                                  /*german*/ "",
+                                                  /*german*/ "#König Dodongo# hält",
                                                   /*french*/ "le #Roi Dodongo# possède"),
                                                // /*spanish*/el #Rey Dodongo# porta
                                                {},
                                                {CustomMessage("the #Infernal Dinosaur# holds",
-                                                   /*german*/ "",
+                                                   /*german*/ "der #infernalische Dinosaurier# hält",
                                                    /*french*/ "le #dinosaure infernal# possède")});
                                                 // /*spanish*/el #dinosaurio infernal# porta
 
     hintTextTable[RHT_BARINADE] = HintText(CustomMessage("#Barinade# holds",
-                                              /*german*/ "",
+                                              /*german*/ "#Barinade# hält",
                                               /*french*/ "#Barinade# possède"),
                                            // /*spanish*/#Barinade# porta
                                            {},
                                            {CustomMessage("the #Bio-Electric Anemone# holds",
-                                               /*german*/ "",
+                                               /*german*/ "die #bioelektrische Anemone# hält",
                                                /*french*/ "l'#anémone bioélectrique# possède")});
                                             // /*spanish*/la #anémona bioeléctrica# porta
 
     hintTextTable[RHT_PHANTOM_GANON] = HintText(CustomMessage("#Phantom Ganon# holds",
-                                                   /*german*/ "",
+                                                   /*german*/ "#Phantom-Ganon# hält",
                                                    /*french*/ "#Ganon Spectral# possède"),
                                                 // /*spanish*/#Ganon Fantasma# porta
                                                 {},
                                                 {CustomMessage("the #Evil Spirit from Beyond# holds",
-                                                    /*german*/ "",
+                                                    /*german*/ "der #böse Geist aus dem Jenseits# hält",
                                                     /*french*/ "l'#esprit maléfique de l'au-delà# possède")});
                                                  // /*spanish*/el #espíritu maligno de ultratumba# porta
 
     hintTextTable[RHT_VOLVAGIA] = HintText(CustomMessage("#Volvagia# holds",
-                                              /*german*/ "",
+                                              /*german*/ "#Volvagia# hält",
                                               /*french*/ "#Volvagia# possède"),
                                            // /*spanish*/#Volvagia# porta
                                            {},
                                            {CustomMessage("the #Subterranean Lava Dragon# holds",
-                                               /*german*/ "",
+                                               /*german*/ "der #subterrane Lavadrache# hält",
                                                /*french*/ "le #dragon des profondeurs# possède")});
                                             // /*spanish*/el #dragón de lava subterráneo# porta
 
     hintTextTable[RHT_MORPHA] = HintText(CustomMessage("#Morpha# holds",
-                                            /*german*/ "",
+                                            /*german*/ "#Morpha# hält",
                                             /*french*/ "#Morpha# possède"),
                                          // /*spanish*/#Morpha# porta
                                          {},
                                          {CustomMessage("the #Giant Aquatic Amoeba# holds",
-                                             /*german*/ "",
+                                             /*german*/ "die #gigantische aquatische Amöbe# hält",
                                              /*french*/ "l'#amibe aquatique géante# possède")});
                                           // /*spanish*/la #ameba acuática gigante# porta
 
     hintTextTable[RHT_BONGO_BONGO] = HintText(CustomMessage("#Bongo Bongo# holds",
-                                                 /*german*/ "",
+                                                 /*german*/ "#Bongo Bongo# hält",
                                                  /*french*/ "#Bongo Bongo# possède"),
                                               // /*spanish*/#Bongo Bongo# porta
                                               {},
                                               {CustomMessage("the #Phantom Shadow Beast# holds",
-                                                  /*german*/ "",
+                                                  /*german*/ "das #Phantomschattenbiest# hält",
                                                   /*french*/ "le #monstre de l'ombre# possède")});
                                                // /*spanish*/la #alimaña oscura espectral# porta
 
     hintTextTable[RHT_TWINROVA] = HintText(CustomMessage("#Twinrova# holds",
-                                              /*german*/ "",
+                                              /*german*/ "#Twinrova# hält",
                                               /*french*/ "#Twinrova# possède"),
                                            // /*spanish*/#Birova# porta
                                            {},
                                            {CustomMessage("the #Sorceress Sisters# hold",
-                                               /*german*/ "",
+                                               /*german*/ "die #Hexenschwestern# halten",
                                                /*french*/ "#les sorcières jumelles# possède")});
                                             // /*spanish*/las #hermanas hechiceras# portan
     /*--------------------------
@@ -2468,34 +2477,34 @@ void StaticData::HintTable_Init() {
     ---------------------------*/
 
     hintTextTable[RHT_BRIDGE_OPEN_HINT] = HintText(CustomMessage("$lThe awakened ones have #already created a bridge# to the castle where the evil dwells.^",
-                                                      /*german*/ "$lDie Weisen haben #bereits&eine Brücke zum Portal von&Ganons Schloss gelegt#...^",
+                                                      /*german*/ "$lDie Weisen haben #bereits&eine Brücke zum Portal von&Ganons Schloß gelegt#...^",
                                                       /*french*/ "$lLes êtres de sagesse ont#déjà créé un pont# vers le repaire du mal.^",
                                                                  {QM_LBLUE}));
                                                    // /*spanish*/$lLos sabios #ya habrán creado un puente#&al castillo, de donde emana el mal.^
 
 
     hintTextTable[RHT_BRIDGE_VANILLA_HINT] = HintText(CustomMessage("$6The awakened ones require the #Shadow and Spirit Medallions# as well as the #Light Arrows#.^",
-                                                        /*german*/ "$6Die Weisen werden darauf warten, dass der Held das #Amulett des Schattens, Amulett der Geister# und die #Licht-Pfeile# sammelt.^",
+                                                        /*german*/ "$6Die Weisen werden darauf warten, daß der Held das #Amulett des Schattens, Amulett der Geister# und die #Licht-Pfeile# sammelt.^",
                                                         /*french*/ "$6Les êtres de sagesse attendront le héros muni des #Médaillons de l'Ombre et l'Esprit# et des #Flèches de Lumière#.^",
                                                                    {QM_RED, QM_YELLOW}));
                                                      // /*spanish*/$6Los sabios aguardarán a que el héroe obtenga tanto el #Medallón de las Sombras y el del Espíritu# junto
                                                                 // a la #flecha de luz#.^
 
     hintTextTable[RHT_BRIDGE_STONES_HINT] = HintText(CustomMessage("$0The awakened ones will await for the Hero to collect #[[d]] Spiritual Stone||s|#.^",
-                                                        /*german*/ "$0Die Weisen werden darauf warten, dass der Held #[[d]] |Heiligen Stein|Heilige Steine|# sammelt.^",
+                                                        /*german*/ "$0Die Weisen werden darauf warten, daß der Held #[[d]] |Heiligen Stein|Heilige Steine|# sammelt.^",
                                                         /*french*/ "$0Les êtres de sagesse attendront le héros muni de #[[d]] |Pierre Ancestrale|Pierres Ancestrales|#.^",
                                                                    {QM_BLUE}));
                                                      // /*spanish*/$0Los sabios aguardarán a que el héroe&obtenga #[[d]] |piedra espiritual|piedras espirituales|#.^
 
     hintTextTable[RHT_BRIDGE_MEDALLIONS_HINT] = HintText(CustomMessage("$8The awakened ones will await for the Hero to collect #[[d]] Medallion||s|#.^",
-                                                            /*german*/ "$8Die Weisen werden darauf warten, dass der Held #[[d]] Amulett||e|# sammelt.^",
+                                                            /*german*/ "$8Die Weisen werden darauf warten, daß der Held #[[d]] Amulett||e|# sammelt.^",
                                                             /*french*/ "$8Les êtres de sagesse attendront le héros muni de #[[d]] Médaillon||s|#.^",
                                                                        {QM_RED}));
                                                          // /*spanish*/$8Los sabios aguardarán a que el héroe&obtenga #[[d]] |medallón|medallones|#.^
 
     hintTextTable[RHT_BRIDGE_REWARDS_HINT] = HintText(CustomMessage("$CThe awakened ones will await for the Hero to collect #[[d]]# |#Spiritual Stone# or #Medallion#|"
                                                                        "#Spiritual Stones# and #Medallions#|.^",
-                                                            /*german*/ "$CDie Weisen werden darauf warten, dass der Held #[[d]]# |#Heiligen Stein# oder #Amulett#|"
+                                                            /*german*/ "$CDie Weisen werden darauf warten, daß der Held #[[d]]# |#Heiligen Stein# oder #Amulett#|"
                                                                        "#Heilige Steine# oder #Amulette#| sammelt.^",
                                                             /*french*/ "$CLes êtres de sagesse attendront le héros muni de #[[d]]# |#Pierre Ancestrale# ou #Médaillon#"
                                                                        "|#Pierres Ancestrales# ou #Médaillons#|.^",
@@ -2504,13 +2513,13 @@ void StaticData::HintTable_Init() {
                                                                     //#piedras espirtuales# y #medallones#|.^
 
     hintTextTable[RHT_BRIDGE_DUNGEONS_HINT] = HintText(CustomMessage("$mThe awakened ones will await for the Hero to conquer #[[d]] Dungeon||s|#.^",
-                                                          /*german*/ "$mDie Weisen werden darauf warten, dass der Held #[[d]] Labyrinth||e|# abschließt.^",
+                                                          /*german*/ "$mDie Weisen werden darauf warten, daß der Held #[[d]] Labyrinth||e|# abschließt.^",
                                                           /*french*/ "$mLes êtres de sagesse attendront la conquête de #[[d]] Donjon||s|#.^",
                                                                      {QM_PINK}));
                                                        // /*spanish*/$mLos sabios aguardarán a que el héroe complete #[[d]] mazmorra||s|#.^
 
     hintTextTable[RHT_BRIDGE_TOKENS_HINT] = HintText(CustomMessage("$sThe awakened ones will await for the Hero to collect #[[d]] Gold Skulltula Token||s|#.^",
-                                                        /*german*/ "$sDie Weisen werden darauf warten, dass der Held #[[d]] Skulltula-Symbol||e|# sammelt.^",
+                                                        /*german*/ "$sDie Weisen werden darauf warten, daß der Held #[[d]] Skulltula-Symbol||e|# sammelt.^",
                                                         /*french*/ "$sLes êtres de sagesse attendront le héros muni de #[[d]] Symbole||s| de Skulltula d'or#.^",
                                                                    {QM_YELLOW}));
                                                      // /*spanish*/$sLos sabios aguardarán a que el héroe obtenga #[[d]] símbolo||s| de skulltula dorada#.^
@@ -2536,7 +2545,7 @@ void StaticData::HintTable_Init() {
                                                         // /*spanish*/$bY la llave del #señor del mal# aguardará en un gran cofre de #su torre#.^
 
     hintTextTable[RHT_GANON_BK_OWN_DUNGEON_HINT] = HintText(CustomMessage("$bAnd the #evil one#'s key will be hidden somewhere #inside its castle#.^",
-                                                               /*german*/ "$bUnd der #Schlüssel des Bösen#, wird irgendwo #in Ganons Schloss# zu finden sein.^",
+                                                               /*german*/ "$bUnd der #Schlüssel des Bösen#, wird irgendwo #in Ganons Schloß# zu finden sein.^",
                                                                /*french*/ "$bAussi, la #clé du Malin# sera cachée #dans son vaste château#.^",
                                                                           {QM_PINK, QM_PINK}));
                                                             // /*spanish*/$bY la llave del #señor del mal# aguardará en #algún lugar de su castillo#.^
@@ -2566,7 +2575,7 @@ void StaticData::HintTable_Init() {
                                                          // /*spanish*/$bY el héroe recibirá la llave del #señor del mal# cuando haya completado la #Trifuerza#.^
 
     hintTextTable[RHT_GANON_BK_SKULLTULA_HINT] = HintText(CustomMessage("$bAnd the #evil one#'s key will be provided by the cursed rich man once #100 Gold Skulltula Tokens# are retrieved.^",
-                                                             /*german*/ "",
+                                                             /*german*/ "$bUnd der #Schlüssel des Bösen# wird von einem verfluchten reichen Mann verliehen, sobald #100 Goldene Skulltula-Symbole# wiedererlangt wurden.^",
                                                              /*french*/ "$bAussi, la #clé du Malin# sera&donnée par l'homme maudit une fois que #100 Symboles de Skulltula d'or# auront été trouvés.^",
                                                                         {QM_PINK, QM_YELLOW}));
                                                           // /*spanish*/$bY el rico maldito entregará la llave&del #señor de mal# tras obtener&100 símbolos de skulltula dorada#.^
@@ -2614,52 +2623,52 @@ void StaticData::HintTable_Init() {
     ---------------------------*/
 
     hintTextTable[RHT_SIX_TRIALS] = HintText(CustomMessage("They say that #Ganon's Tower# is protected by a powerful barrier.",
-                                                /*german*/ "Man erzählt sich, daß der #Teufelsturm# sei von einer mächtigen Barriere geschützt sei.",
+                                                /*german*/ "Man erzählt sich, daß der #Teufelsturm# von einer mächtigen Barriere geschützt sei.",
                                                 /*french*/ "Selon moi, #la Tour de Ganon# est protégée par une puissante barrière", {QM_PINK}));
                                              // /*spanish*/Según dicen, la #torre de Ganon# está protegida por una poderosa barrera
 
     hintTextTable[RHT_ZERO_TRIALS] = HintText(CustomMessage("They say that Sheik dispelled the barrier around #Ganon's Tower#.",
-                                                 /*german*/ "Man erzählt sich, Shiek habe die Barriere um den #Teufelsturm# aufgelöst sei.",
+                                                 /*german*/ "Man erzählt sich, Shiek habe die Barriere um den #Teufelsturm# aufgelöst.",
                                                  /*french*/ "Selon moi, Sheik a dissipé la barrière autour de #la Tour de Ganon#", {QM_YELLOW}));
                                               // /*spanish*/Según dicen, Sheik disipó la barrera alrededor de la #torre de Ganon#.
 
     hintTextTable[RHT_TRIAL_OFF] = HintText(CustomMessage("They say that #[[1]]# was dispelled by Sheik.",
-                                               /*german*/ "Man erzählt sich, daß #[[1]]# sei von Shiek aufgelöst worden sei.",
+                                               /*german*/ "Man erzählt sich, daß #[[1]]# von Shiek aufgelöst worden sei.",
                                                /*french*/ "Selon moi, #[[1]]# a été dissipée par Sheik.", {QM_YELLOW}));
                                             // /*spanish*/Según dicen, #[[1]]# se disipó gracias a Sheik.
 
     hintTextTable[RHT_TRIAL_ON] = HintText(CustomMessage("They say that #[[1]]# protects Ganons Tower.",
-                                              /*german*/ "Man erzählt sich, daß #[[1]]# schütze den Teufelsturm sei.",
+                                              /*german*/ "Man erzählt sich, daß #[[1]]# den Teufelsturm schütze.",
                                               /*french*/ "Selon moi, #[[1]]# protège la Tour de Ganon.", {QM_PINK}));
                                            // /*spanish*/Según dicen, #[[1]]# protege la torre de Ganon
 
     hintTextTable[RHT_LIGHT_TRIAL] = HintText(CustomMessage("the Light Trial",
-                                                 /*german*/ "",
+                                                 /*german*/ "die Prüfung des Lichts",
                                                  /*french*/ "l'épreuve de la Lumière"));
                                               // /*spanish*/la prueba de la luz
 
     hintTextTable[RHT_FOREST_TRIAL] = HintText(CustomMessage("the Forest Trial",
-                                                  /*german*/ "",
+                                                  /*german*/ "die Prüfung des Waldes",
                                                   /*french*/ "l'épreuve de la Forêt"));
                                                // /*spanish*/la prueba del bosque
 
     hintTextTable[RHT_FIRE_TRIAL] = HintText(CustomMessage("the Fire Trial",
-                                                /*german*/ "",
+                                                /*german*/ "die Prüfung des Feuers",
                                                 /*french*/ "l'épreuve du Feu"));
                                              // /*spanish*/la prueba del fuego
 
     hintTextTable[RHT_WATER_TRIAL] = HintText(CustomMessage("the Water Trial",
-                                                 /*german*/ "",
+                                                 /*german*/ "die Prüfung des Wassers",
                                                  /*french*/ "l'épreuve de l'Eau"));
                                               // /*spanish*/la prueba del agua
 
     hintTextTable[RHT_SPIRIT_TRIAL] = HintText(CustomMessage("the Spirit Trial",
-                                                  /*german*/ "",
+                                                  /*german*/ "die Prüfung der Geister",
                                                   /*french*/ "l'épreuve de l'Esprit"));
                                                // /*spanish*/la prueba del espíritu
 
     hintTextTable[RHT_SHADOW_TRIAL] = HintText(CustomMessage("the Shadow Trial",
-                                                  /*german*/ "",
+                                                  /*german*/ "die Prüfung des Schattens",
                                                   /*french*/ "l'épreuve de l'Ombre"));
                                                // /*spanish*/la prueba de las sombras
 
@@ -2699,7 +2708,7 @@ void StaticData::HintTable_Init() {
                                                                     // $8#[[1]]#...^$3#[[2]]#...^$4#[[3]]#...^$5#[[4]]#...^$6#[[5]]#...^$7#[[6]]#...^
 
     hintTextTable[RHT_ADULT_ALTAR_TEXT_END] = HintText(CustomMessage("$kTogether with the Hero of Time, the awakened ones will return the light of peace to the world...",
-                                                        /*german*/ "$kZusammen mit dem Auserwählten wer-den diese ihre Kräfte einsetzen, um der Welt den Frieden wiederzugeben.",
+                                                        /*german*/ "$kZusammen mit dem Auserwählten werden diese ihre Kräfte einsetzen, um der Welt den Frieden wiederzugeben.",
                                                         /*french*/ "$kEnsemble avec le Héros du Temps, ces Sages emprisonneront le mal et réinstaureront la lumière de paix dans le monde..."));
                                                         // /*spanish*/Con el Héroe del Tiempo, aquellos&que despierten detendrán el mal y&volverán al mundo de luz la paz...
 
@@ -2733,7 +2742,7 @@ void StaticData::HintTable_Init() {
                                                                    {QM_YELLOW, QM_RED}));
 
     hintTextTable[RHT_DAMPE_DIARY] = HintText(CustomMessage("Whoever reads this, please enter #[[1]]#. I will let you have my #stretching, shrinking keepsake#.^I'm waiting for you.&--Dampé",
-                                                 /*german*/ "Wer immer dies liest, der möge folgenden Ort aufsuchen: #[[1]]#. Ihm gebe ich meinen langen, kurzen Schatz.^Ich warte!&Boris", //RANDOTODO color in whatever refers to the hookshot
+                                                 /*german*/ "Wer immer dies liest, der möge folgenden Ort aufsuchen: #[[1]]#. Ihm gebe ich meinen #dehnenden, schrumpfenden Schatz#.^Ich warte!&Boris", //RANDOTODO color in whatever refers to the hookshot
                                                  /*french*/ "Toi qui lit ce journal, rends-toi dans #[[1]]#. Et peut-être auras-tu droit à mon précieux #trésor#.^Je t'attends...&--Igor",
                                                             {QM_RED, QM_RED}));
 
@@ -2772,20 +2781,20 @@ void StaticData::HintTable_Init() {
     ---------------------------*/
 
     hintTextTable[RHT_MEDIGORON_HINT] = HintText(CustomMessage("How about buying #[[1]]# for #200 Rupees#?&" + TWO_WAY_CHOICE() + "#Buy&Don't buy#",
-                                                    /*german*/ "Möchtest du #[[1]]# für #200 Rubine# kaufen?&" + TWO_WAY_CHOICE() + "#Klar!&Nie im Leben!#",
+                                                    /*german*/ "Möchtest Du #[[1]]# für #200 Rubine# kaufen?&" + TWO_WAY_CHOICE() + "#Klar!&Nie im Leben!#",
                                                     /*french*/ "Veux-tu acheter #[[1]]# pour #200 rubis#?&" + TWO_WAY_CHOICE() + "#Acheter&Ne pas acheter#",
                                                                {QM_GREEN, QM_YELLOW, QM_GREEN}));
                                                 /*spanish*/ // ¿Me compras #[[1]]# por #200 rupias#?&" + TWO_WAY_CHOICE() + "#Comprar&No comprar#
 
     hintTextTable[RHT_CARPET_SALESMAN_DIALOG_FIRST] = HintText(CustomMessage("Welcome!^I am selling stuff, strange and rare, from all over the world to everybody. Today's special is...^",
-                                                                  /*german*/ "Sei gegrüßt!^Ich verkaufe allerlei Kuriorisäten. Stets sonderliche und seltene Ware aus "
+                                                                  /*german*/ "Sei gegrüßt!^Ich verkaufe allerlei Kuriositäten. Stets sonderliche und seltene Ware aus "
                                                                              "aller Welt für jedermann. Das heutige Angebot bleibt...^#",
                                                                   /*french*/ "Bienvenue!^Je vends des objets rares et merveilleux du monde entier. En spécial aujourd'hui...^"));
                                                               /*spanish*/ // ¡Acércate!^Vendo productos extraños y difíciles de encontrar... De todo el mundo a todo el mundo. La oferta de hoy es...^#¡
 
     hintTextTable[RHT_CARPET_SALESMAN_DIALOG_MYSTERIOUS] = HintText(CustomMessage("Terrifying! I won't tell you what it is until I see the #money#...^How about #200 Rupees#?&&" +
                                                                                   TWO_WAY_CHOICE() + "#Buy&Don't buy#",
-                                                                       /*german*/ "Furchterregend oder? Ich erzähle Euch mehr, wenn ich #Geld# sehe...^Wie wär's mit #200 Rubinen#?&&" +
+                                                                       /*german*/ "Furchterregend, oder? Ich erzähle Euch mehr, wenn ich #Geld# sehe...^Wie wär's mit #200 Rubinen#?&&" +
                                                                                   TWO_WAY_CHOICE() + "#Aber sicher!&Ich bin weg!#",
                                                                        /*french*/ "Un concentré de puissance! Mais montre tes #rubis# avant que je te dise ce que c'est...^Disons #200 "
                                                                                   "rubis#?&&" + TWO_WAY_CHOICE() + "#Acheter&Ne pas acheter#",
@@ -2795,7 +2804,7 @@ void StaticData::HintTable_Init() {
 
     hintTextTable[RHT_CARPET_SALESMAN_DIALOG_HINTED] = HintText(CustomMessage("#[[1]]!# It's real, I promise! A lonely man such as myself wouldn't #lie# to you, hmm?^"
                                                                               "How about #200 Rupees#?&&" + TWO_WAY_CHOICE() + "#Buy&Don't buy#",
-                                                                  /*german*/ "#[[1]]#! Ich kann versichern es ist ein aufrichtiges Angebot!^Ein einsamer Mann wie ich würde dich doch "
+                                                                  /*german*/ "#[[1]]#! Ich kann versichern, es ist ein aufrichtiges Angebot!^Ein einsamer Mann wie ich würde Dich doch "
                                                                              "nicht #anlügen#, oder?^Wie wär's mit #200 Rubinen#?&&" + TWO_WAY_CHOICE() + "#Aber sicher!&Ich bin weg!#",
                                                                   /*french*/ "#[[1]]!# C'est vrai! J'te jure! Un gars comme moi ne te #mentirai# pas tu ne crois pas?^Disons #200 "
                                                                              "rubis#?&&" + TWO_WAY_CHOICE() + "#Acheter&Ne pas acheter#",
@@ -2803,13 +2812,13 @@ void StaticData::HintTable_Init() {
 
     hintTextTable[RHT_BEAN_SALESMAN_HINT] = HintText(CustomMessage("I tried to be a #magic bean# salesman, but it turns out my marketing skills weren't worth "
                                                                    "beans!^Anyway, want to buy #[[1]]# for #60 Rupees#?&" + TWO_WAY_CHOICE() + "#Yes&No#",
-                                                        /*german*/ "Möchten Sie #[[1]]# für #60 Rubine#?&" + TWO_WAY_CHOICE() + "#Ja&Nein#",
+                                                        /*german*/ "Möchten Sie #[[1]]# für #60 Rubine# kaufen?&" + TWO_WAY_CHOICE() + "#Ja&Nein#",
                                                         /*french*/ "J'ai essayé d'être un vendeur de #haricots magiques#, mais j'étais mauvais au niveau du marketing et ça "
                                                                    "me courait sur le haricot...^Enfin bref, ça te dirait de m'acheter #[[1]]# pour #60 Rubis#?&" + TWO_WAY_CHOICE() + "#Oui&Non#",
                                                                    {QM_RED, QM_GREEN, QM_YELLOW, QM_GREEN}));
 
     hintTextTable[RHT_GRANNY_HINT] = HintText(CustomMessage("#[[1]]#! How about #100 Rupees#?&" + TWO_WAY_CHOICE() + "#Buy&Don't buy#",
-                                                /*german*/ "#[[1]]#! Sagen wir #100 Rubine#!&" + TWO_WAY_CHOICE() + "#Gerne!&Auf keinen Fall!#",
+                                                /*german*/ "#[[1]]#! Sagen wir #100 Rubine#?&" + TWO_WAY_CHOICE() + "#Gerne!&Auf keinen Fall!#",
                                                 /*french*/ "#[[1]]#! Que dis-tu de #100 rubis#?&" + TWO_WAY_CHOICE() + "#Acheter&Ne pas acheter#",
                                                            {QM_GREEN, QM_YELLOW, QM_GREEN}, {true}));
                                              // /*spanish*/#[[1]]#. Vendo por #100 rupias#.&" + TWO_WAY_CHOICE() + "#Comprar&No comprar#
@@ -2829,19 +2838,19 @@ void StaticData::HintTable_Init() {
                                                                    "Prove yourself to be a horsemaster by scoring 1500 points to win  my #[[1]]#!\x0B",
                                                                    {QM_RED, QM_GREEN}));
 
-    hintTextTable[RHT_MALON_HINT_HOW_IS_EPONA] = HintText(CustomMessage("@! You should come back with Epona and try to beat my time on the #Obsticle Course#!^"
+    hintTextTable[RHT_MALON_HINT_HOW_IS_EPONA] = HintText(CustomMessage("@! You should come back with Epona and try to beat my time on the #Obstacle Course#!^"
                                                                         "If you beat my time, I'll give you my favourite #cow# Elsie and her toy #[[1]]#!",
                                                                         {QM_RED, QM_BLUE, QM_GREEN}));
 
-    hintTextTable[RHT_MALON_HINT_OBSTICLE_COURSE] = HintText(CustomMessage("How about trying the #Obsticle Course?# If you beat my time I'll let you keep my favourite #cow# Elsie and her toy #[[1]]#!^"
-                                                                           "Challenge the #Obsticle Course?#&\x1B&#Let's go&No thanks#",
+    hintTextTable[RHT_MALON_HINT_OBSTICLE_COURSE] = HintText(CustomMessage("How about trying the #Obstacle Course?# If you beat my time I'll let you keep my favourite #cow# Elsie and her toy #[[1]]#!^"
+                                                                           "Challenge the #Obstacle Course?#&\x1B&#Let's go&No thanks#",
                                                                            {QM_RED, QM_BLUE, QM_GREEN, QM_RED, QM_GREEN}));
 
-    hintTextTable[RHT_MALON_HINT_TURNING_EVIL] = HintText(CustomMessage("@? Is that you? ^If I ran the ranch, I'd build an #Obsticle Course#, and whoever gets the best time would win a #cow#!^"
+    hintTextTable[RHT_MALON_HINT_TURNING_EVIL] = HintText(CustomMessage("@? Is that you? ^If I ran the ranch, I'd build an #Obstacle Course#, and whoever gets the best time would win a #cow#!^"
                                                                         "Elsie loves sharing her #[[1]]# with new people, It'll be fun!^...But Ingo won't let me...",
                                                                         {QM_RED, QM_BLUE, QM_GREEN}));
 
-    hintTextTable[RHT_MALON_HINT_INGO_TEMPTED] = HintText(CustomMessage("@! You should come back in the morning and try to beat my time on the #Obsticle Course#!^"
+    hintTextTable[RHT_MALON_HINT_INGO_TEMPTED] = HintText(CustomMessage("@! You should come back in the morning and try to beat my time on the #Obstacle Course#!^"
                                                                         "If you beat my time, I'll give you my favourite #cow# Elsie and her toy #[[1]]#!",
                                                                         {QM_RED, QM_BLUE, QM_GREEN}));
 
@@ -2943,7 +2952,7 @@ void StaticData::HintTable_Init() {
    ---------------------------*/
    
     hintTextTable[RHT_YOUR_POCKET] = HintText(CustomMessage("your pocket",
-                                                 /*german*/ "",
+                                                 /*german*/ "deine Tasche",
                                                  /*french*/ "tes poches"));
                                               // /*spanish*/tu bolsillo
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp
index d6e2c2f9a..52bfd1ffc 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp
@@ -6,2058 +6,2058 @@ namespace Rando {
 
 void StaticData::HintTable_Init_Item() {
     
-    hintTextTable[RHT_KOKIRI_SWORD] = HintText(CustomMessage("the Kokiri Sword", /*german*/"", /*french*/"l'Épée Kokiri"),
+    hintTextTable[RHT_KOKIRI_SWORD] = HintText(CustomMessage("the Kokiri Sword", /*german*/"das Kokiri-Schwert", /*french*/"l'Épée Kokiri"),
                                                // /*spanish*/la Espada Kokiri
                                                {
-                                               CustomMessage("a sword", /*german*/"", /*french*/"une épée")
+                                               CustomMessage("a sword", /*german*/"ein Schwert", /*french*/"une épée")
                                                 // /*spanish*/una espada
                                                }, {
-                                               CustomMessage("a butter knife", /*german*/"", /*french*/"un couteau à beurre"),
+                                               CustomMessage("a butter knife", /*german*/"ein Buttermesser", /*french*/"un couteau à beurre"),
                                                 // /*spanish*/un ágil puñal
-                                               CustomMessage("a starter slasher", /*german*/"", /*french*/"une arme de débutant"),
+                                               CustomMessage("a starter slasher", /*german*/"ein Anfängerschwert", /*french*/"une arme de débutant"),
                                                 // /*spanish*/una hoja de principiantes
-                                               CustomMessage("a switchblade", /*german*/"", /*french*/"un canif")});
+                                               CustomMessage("a switchblade", /*german*/"ein Stellmesser", /*french*/"un canif")});
                                                 // /*spanish*/una navaja
 
-    hintTextTable[RHT_MASTER_SWORD] = HintText(CustomMessage("the Master Sword", /*german*/"", /*french*/"l'Épée de Légende"),
+    hintTextTable[RHT_MASTER_SWORD] = HintText(CustomMessage("the Master Sword", /*german*/"das Master-Schwert", /*french*/"l'Épée de Légende"),
                                                // /*spanish*/la Espada Maestra
                                                {
-                                               CustomMessage("a sword", /*german*/"", /*french*/"une épée")
+                                               CustomMessage("a sword", /*german*/"ein Schwert", /*french*/"une épée")
                                                 // /*spanish*/una espada
                                                }, {
-                                               CustomMessage("evil's bane", /*german*/"", /*french*/"le fléau du mal"),
+                                               CustomMessage("evil's bane", /*german*/"der böse Fluch", /*french*/"le fléau du mal"),
                                                 // /*spanish*/la destructora del mal
-                                               CustomMessage("a seven year limbo", /*german*/"", /*french*/"une stase de sept ans")});
+                                               CustomMessage("a seven year limbo", /*german*/"eine siebenjährige Erwartung", /*french*/"une stase de sept ans")});
                                                 // /*spanish*/unos siete años de espera
 
-    hintTextTable[RHT_GIANTS_KNIFE] = HintText(CustomMessage("the Giant's Knife", /*german*/"", /*french*/"la Lame des Géants"),
+    hintTextTable[RHT_GIANTS_KNIFE] = HintText(CustomMessage("the Giant's Knife", /*german*/"das Langschwert", /*french*/"la Lame des Géants"),
                                                // /*spanish*/la daga gigante
                                                {
-                                               CustomMessage("a sword", /*german*/"", /*french*/"une épée")
+                                               CustomMessage("a sword", /*german*/"ein Schwert", /*french*/"une épée")
                                                 // /*spanish*/una espada
                                                }, {
-                                               CustomMessage("a fragile blade", /*german*/"", /*french*/"une lame fragile"),
+                                               CustomMessage("a fragile blade", /*german*/"ein fragiles Schwert", /*french*/"une lame fragile"),
                                                 // /*spanish*/una frágil hoja
-                                               CustomMessage("a breakable cleaver", /*german*/"", /*french*/"un espadon de verre")});
+                                               CustomMessage("a breakable cleaver", /*german*/"ein brüchiger Spalter", /*french*/"un espadon de verre")});
                                                 // /*spanish*/un rompible acero
 
-    hintTextTable[RHT_BIGGORON_SWORD] = HintText(CustomMessage("the Biggoron Sword", /*german*/"", /*french*/"l'Épée de Biggoron"),
+    hintTextTable[RHT_BIGGORON_SWORD] = HintText(CustomMessage("the Biggoron Sword", /*german*/"das Biggoron-Schwert", /*french*/"l'Épée de Biggoron"),
                                                  // /*spanish*/la Espada de Biggoron
                                                  {
-                                                 CustomMessage("a sword", /*german*/"", /*french*/"une épée")
+                                                 CustomMessage("a sword", /*german*/"ein Schwert", /*french*/"une épée")
                                                   // /*spanish*/una espada
                                                  }, {
-                                                 CustomMessage("the biggest blade", /*german*/"", /*french*/"une lame gigantesque"),
+                                                 CustomMessage("the biggest blade", /*german*/"das größte Schwert", /*french*/"une lame gigantesque"),
                                                   // /*spanish*/el mayor mandoble
-                                                 CustomMessage("a colossal cleaver", /*german*/"", /*french*/"un espadon colossal")});
+                                                 CustomMessage("a colossal cleaver", /*german*/"ein kolossaler Spalter", /*french*/"un espadon colossal")});
                                                   // /*spanish*/un estoque colosal
 
-    hintTextTable[RHT_DEKU_SHIELD] = HintText(CustomMessage("a Deku Shield", /*german*/"", /*french*/"un Bouclier Mojo"),
+    hintTextTable[RHT_DEKU_SHIELD] = HintText(CustomMessage("a Deku Shield", /*german*/"ein Deku-Schild", /*french*/"un Bouclier Mojo"),
                                               // /*spanish*/un escudo deku
                                               {
-                                              CustomMessage("a shield", /*german*/"", /*french*/"un bouclier")
+                                              CustomMessage("a shield", /*german*/"ein Schild", /*french*/"un bouclier")
                                                // /*spanish*/un escudo
                                               }, {
-                                              CustomMessage("a wooden ward", /*german*/"", /*french*/"un écu d'écorce"),
+                                              CustomMessage("a wooden ward", /*german*/"eine hölzerne Abwehr", /*french*/"un écu d'écorce"),
                                                // /*spanish*/una protección del bosque
-                                              CustomMessage("a burnable barrier", /*german*/"", /*french*/"une protection inflammable")});
+                                              CustomMessage("a burnable barrier", /*german*/"eine brennbare Barriere", /*french*/"une protection inflammable")});
                                                // /*spanish*/una barrera quemable
 
-    hintTextTable[RHT_HYLIAN_SHIELD] = HintText(CustomMessage("a Hylian Shield", /*german*/"", /*french*/"un Bouclier Hylien"),
+    hintTextTable[RHT_HYLIAN_SHIELD] = HintText(CustomMessage("a Hylian Shield", /*german*/"ein Hylia-Schild", /*french*/"un Bouclier Hylien"),
                                                 // /*spanish*/un escudo hyliano
                                                 {
-                                                CustomMessage("a shield", /*german*/"", /*french*/"un bouclier")
+                                                CustomMessage("a shield", /*german*/"ein Schild", /*french*/"un bouclier")
                                                  // /*spanish*/un escudo
                                                 }, {
-                                                CustomMessage("a steel safeguard", /*german*/"", /*french*/"une carapace d'acier"),
+                                                CustomMessage("a steel safeguard", /*german*/"ein eiserner Schutz", /*french*/"une carapace d'acier"),
                                                  // /*spanish*/una protección de acero
-                                                CustomMessage("Like Like's metal meal", /*german*/"", /*french*/"un amuse-gueule de Pudding")});
+                                                CustomMessage("Like Like's metal meal", /*german*/"Raubschleims Metallmahlzeit", /*french*/"un amuse-gueule de Pudding")});
                                                  // /*spanish*/un alimento de Like Like
 
-    hintTextTable[RHT_MIRROR_SHIELD] = HintText(CustomMessage("the Mirror Shield", /*german*/"", /*french*/"le Bouclier Miroir"),
+    hintTextTable[RHT_MIRROR_SHIELD] = HintText(CustomMessage("the Mirror Shield", /*german*/"das Spiegelschild", /*french*/"le Bouclier Miroir"),
                                                 // /*spanish*/el escudo espejo
                                                 {
-                                                CustomMessage("a shield", /*german*/"", /*french*/"un bouclier")
+                                                CustomMessage("a shield", /*german*/"ein Schild", /*french*/"un bouclier")
                                                  // /*spanish*/un escudo
                                                 }, {
-                                                CustomMessage("a reflective rampart", /*german*/"", /*french*/"un capteur de lumière"),
+                                                CustomMessage("a reflective rampart", /*german*/"ein reflektierender Schutzwall", /*french*/"un capteur de lumière"),
                                                  // /*spanish*/una muralla reflectora
-                                                CustomMessage("Medusa's weakness", /*german*/"", /*french*/"la faiblesse de Méduse"),
+                                                CustomMessage("Medusa's weakness", /*german*/"Medusas Schwäche", /*french*/"la faiblesse de Méduse"),
                                                  // /*spanish*/la debilidad de Medusa
-                                                CustomMessage("a silvered surface", /*german*/"", /*french*/"une surface argentée")});
+                                                CustomMessage("a silvered surface", /*german*/"eine silberne Oberfläche", /*french*/"une surface argentée")});
                                                  // /*spanish*/una superficie plateada
 
-    hintTextTable[RHT_GORON_TUNIC] = HintText(CustomMessage("a Goron Tunic", /*german*/"", /*french*/"une Tunique Goron"),
+    hintTextTable[RHT_GORON_TUNIC] = HintText(CustomMessage("a Goron Tunic", /*german*/"eine Goronen-Tunika", /*french*/"une Tunique Goron"),
                                               // /*spanish*/un sayo goron
                                               {
-                                              CustomMessage("a tunic", /*german*/"", /*french*/"une tunique")
+                                              CustomMessage("a tunic", /*german*/"eine Tunika", /*french*/"une tunique")
                                                // /*spanish*/un sayo
                                               }, {
-                                              CustomMessage("ruby robes", /*german*/"", /*french*/"un pigment rouge"),
+                                              CustomMessage("ruby robes", /*german*/"Rubinroben", /*french*/"un pigment rouge"),
                                                // /*spanish*/una vestimenta rubí
-                                              CustomMessage("fireproof fabric", /*german*/"", /*french*/"un trésor anti-flamme"),
+                                              CustomMessage("fireproof fabric", /*german*/"feuerfestes Gewebe", /*french*/"un trésor anti-flamme"),
                                                // /*spanish*/una ignífuga prenda
-                                              CustomMessage("cooking clothes", /*german*/"", /*french*/"une tenue de cuisine")});
+                                              CustomMessage("cooking clothes", /*german*/"Kochschürze", /*french*/"une tenue de cuisine")});
                                                // /*spanish*/unos abrasantes ropajes
 
-    hintTextTable[RHT_ZORA_TUNIC] = HintText(CustomMessage("a Zora Tunic", /*german*/"", /*french*/"une Tunique Zora"),
+    hintTextTable[RHT_ZORA_TUNIC] = HintText(CustomMessage("a Zora Tunic", /*german*/"eine Zora-Tunika", /*french*/"une Tunique Zora"),
                                              // /*spanish*/un sayo zora
                                              {
-                                             CustomMessage("a tunic", /*german*/"", /*french*/"une tunique"),
+                                             CustomMessage("a tunic", /*german*/"eine Tunika", /*french*/"une tunique"),
                                               // /*spanish*/un sayo
-                                             CustomMessage("something expensive", /*german*/"", /*french*/"une chose dispendieuse")
+                                             CustomMessage("something expensive", /*german*/"etwas Teures", /*french*/"une chose dispendieuse")
                                               // /*spanish*/algo caro
                                              }, {
-                                             CustomMessage("a sapphire suit", /*german*/"", /*french*/"un pigment bleuté"),
+                                             CustomMessage("a sapphire suit", /*german*/"ein Saphiranzug", /*french*/"un pigment bleuté"),
                                               // /*spanish*/una vestidura zafiro
-                                             CustomMessage("scuba gear", /*german*/"", /*french*/"un habit de plongée"),
+                                             CustomMessage("scuba gear", /*german*/"eine Taucherausrüstung", /*french*/"un habit de plongée"),
                                               // /*spanish*/un traje impermeable
-                                             CustomMessage("a swimsuit", /*german*/"", /*french*/"un costume de baignade")});
+                                             CustomMessage("a swimsuit", /*german*/"ein Badeanzug", /*french*/"un costume de baignade")});
                                               // /*spanish*/unos ropajes sumergibles
 
-    hintTextTable[RHT_IRON_BOOTS] = HintText(CustomMessage("the Iron Boots", /*german*/"", /*french*/"une paire de Bottes de plomb"),
+    hintTextTable[RHT_IRON_BOOTS] = HintText(CustomMessage("the Iron Boots", /*german*/"die Eisenstiefel", /*french*/"une paire de Bottes de plomb"),
                                              // /*spanish*/las botas de hierro
                                              {
-                                             CustomMessage("some boots", /*german*/"", /*french*/"une paire de bottes"),
+                                             CustomMessage("some boots", /*german*/"ein paar Stiefel", /*french*/"une paire de bottes"),
                                               // /*spanish*/un par de botas
-                                             CustomMessage("a feature of the Water Temple", /*german*/"", /*french*/"une particularité du Temple de l'Eau"),
+                                             CustomMessage("a feature of the Water Temple", /*german*/"ein Merkmal des Wassertempels", /*french*/"une particularité du Temple de l'Eau"),
                                               // /*spanish*/algo particular del Templo del Agua
-                                             CustomMessage("something heavy", /*german*/"", /*french*/"une chose pesante")
+                                             CustomMessage("something heavy", /*german*/"etwas Schweres", /*french*/"une chose pesante")
                                               // /*spanish*/algo de lo más pesado
                                              }, {
-                                             CustomMessage("sink shoes", /*german*/"", /*french*/"un boulet de fer"),
+                                             CustomMessage("sink shoes", /*german*/"Sinkschuhe", /*french*/"un boulet de fer"),
                                               // /*spanish*/un calzado de las profundidades
-                                             CustomMessage("clank cleats", /*german*/"", /*french*/"une paire de talons bruyants")});
+                                             CustomMessage("clank cleats", /*german*/"klirrende Knacken", /*french*/"une paire de talons bruyants")});
                                               // /*spanish*/unas suelas férreas
 
-    hintTextTable[RHT_HOVER_BOOTS] = HintText(CustomMessage("the Hover Boots", /*german*/"", /*french*/"une paire de Bottes des airs"),
+    hintTextTable[RHT_HOVER_BOOTS] = HintText(CustomMessage("the Hover Boots", /*german*/"die Gleitstiefel", /*french*/"une paire de Bottes des airs"),
                                               // /*spanish*/las botas voladoras
                                               {
-                                              CustomMessage("some boots", /*german*/"", /*french*/"une paire de bottes")
+                                              CustomMessage("some boots", /*german*/"ein paar Stiefel", /*french*/"une paire de bottes")
                                                // /*spanish*/un par de botas
                                               }, {
-                                              CustomMessage("butter boots", /*german*/"", /*french*/"une paire de patins de beurre"),
+                                              CustomMessage("butter boots", /*german*/"Butterstiefel", /*french*/"une paire de patins de beurre"),
                                                // /*spanish*/unas suelas resvaladizas
-                                              CustomMessage("sacred slippers", /*german*/"", /*french*/"une paire de pantoufles sacrées"),
+                                              CustomMessage("sacred slippers", /*german*/"heilige Pantoffeln", /*french*/"une paire de pantoufles sacrées"),
                                                // /*spanish*/unos escurridizos botines
-                                              CustomMessage("spacewalkers", /*german*/"", /*french*/"une paire de bottes spatiales")});
+                                              CustomMessage("spacewalkers", /*german*/"Weltraumstiefel", /*french*/"une paire de bottes spatiales")});
                                                // /*spanish*/un calzado antigravitatorio
 
-    hintTextTable[RHT_ZELDAS_LETTER] = HintText(CustomMessage("Zelda's Letter", /*german*/"", /*french*/"la Lettre de Zelda"),
+    hintTextTable[RHT_ZELDAS_LETTER] = HintText(CustomMessage("Zelda's Letter", /*german*/"Zeldas Brief", /*french*/"la Lettre de Zelda"),
                                                 // /*spanish*/la carta de Zelda
                                                 {}, {
-                                                CustomMessage("an autograph", /*german*/"", /*french*/"un autographe"),
+                                                CustomMessage("an autograph", /*german*/"ein Autograph", /*french*/"un autographe"),
                                                  // /*spanish*/un autógrafo
-                                                CustomMessage("royal stationery", /*german*/"", /*french*/"du papier royal"),
+                                                CustomMessage("royal stationery", /*german*/"royales Briefpapier", /*french*/"du papier royal"),
                                                  // /*spanish*/un escrito real
-                                                CustomMessage("royal snail mail", /*german*/"", /*french*/"une enveloppe royale")});
+                                                CustomMessage("royal snail mail", /*german*/"ein royaler Umschlag", /*french*/"une enveloppe royale")});
                                                  // /*spanish*/correo de la realeza
 
-    hintTextTable[RHT_WEIRD_EGG] = HintText(CustomMessage("the Weird Egg", /*german*/"", /*french*/"l'Oeuf Curieux"),
+    hintTextTable[RHT_WEIRD_EGG] = HintText(CustomMessage("the Weird Egg", /*german*/"ein seltsames Ei", /*french*/"l'Oeuf Curieux"),
                                             // /*spanish*/el huevo extraño
                                             {
-                                            CustomMessage("an egg", /*german*/"", /*french*/"un oeuf")
+                                            CustomMessage("an egg", /*german*/"ein Ei", /*french*/"un oeuf")
                                              // /*spanish*/un huevo
                                             }, {
-                                            CustomMessage("a chicken dilemma", /*german*/"", /*french*/"un drôle d'ovale")});
+                                            CustomMessage("a chicken dilemma", /*german*/"ein Hühnerdilemma", /*french*/"un drôle d'ovale")});
                                              // /*spanish*/el dilema de la gallina
 
-    hintTextTable[RHT_BOOMERANG] = HintText(CustomMessage("the Boomerang", /*german*/"", /*french*/"le Boomerang"),
+    hintTextTable[RHT_BOOMERANG] = HintText(CustomMessage("the Boomerang", /*german*/"ein Bumerang", /*french*/"le Boomerang"),
                                             // /*spanish*/el bumerán
                                             {
-                                            CustomMessage("something that can grab things", /*german*/"", /*french*/"une chose qui peut attraper"),
+                                            CustomMessage("something that can grab things", /*german*/"etwas, das Dinge greifen kann", /*french*/"une chose qui peut attraper"),
                                              // /*spanish*/algo que pueda agarrar cosas
-                                            CustomMessage("something that can stun", /*german*/"", /*french*/"une chose qui peut paralyser")
+                                            CustomMessage("something that can stun", /*german*/"etwas, das paralysieren kann", /*french*/"une chose qui peut paralyser")
                                              // /*spanish*/algo que pueda paralizar
                                             }, {
-                                            CustomMessage("a banana", /*german*/"", /*french*/"une banane"),
+                                            CustomMessage("a banana", /*german*/"eine Banane", /*french*/"une banane"),
                                              // /*spanish*/un plátano
-                                            CustomMessage("a stun stick", /*german*/"", /*french*/"un bâton étourdissant"),
+                                            CustomMessage("a stun stick", /*german*/"ein paralysierender Stab", /*french*/"un bâton étourdissant"),
                                              // /*spanish*/un palo aturdidor
-                                            CustomMessage("a yellow angle", /*german*/"", /*french*/"un angle jaune")});
+                                            CustomMessage("a yellow angle", /*german*/"ein gelber Winkel", /*french*/"un angle jaune")});
                                              // /*spanish*/un ángulo amarillo
 
-    hintTextTable[RHT_LENS_OF_TRUTH] = HintText(CustomMessage("the Lens of Truth", /*german*/"", /*french*/"le Monocle de Vérité"),
+    hintTextTable[RHT_LENS_OF_TRUTH] = HintText(CustomMessage("the Lens of Truth", /*german*/"das Auge der Wahrheit", /*french*/"le Monocle de Vérité"),
                                                 // /*spanish*/la Lupa de la Verdad
                                                 {
-                                                CustomMessage("a secret-finding tool", /*german*/"", /*french*/"un cherche-secrets")
+                                                CustomMessage("a secret-finding tool", /*german*/"ein geheimnisfindendes Werkzeug", /*french*/"un cherche-secrets")
                                                  // /*spanish*/un instrumento para hallar objetos
                                                 }, {
-                                                CustomMessage("a lie detector", /*german*/"", /*french*/"un détecteur de mensonges"),
+                                                CustomMessage("a lie detector", /*german*/"ein Lügendetektor", /*french*/"un détecteur de mensonges"),
                                                  // /*spanish*/el detector de ilusiones
-                                                CustomMessage("a ghost tracker", /*german*/"", /*french*/"un trouve-fantôme"),
+                                                CustomMessage("a ghost tracker", /*german*/"ein Geisterfinder", /*french*/"un trouve-fantôme"),
                                                  // /*spanish*/el rastreador paranormal
-                                                CustomMessage("true sight", /*german*/"", /*french*/"le troisième œil"),
+                                                CustomMessage("true sight", /*german*/"wahre Sicht", /*french*/"le troisième œil"),
                                                  // /*spanish*/el ojo que todo ve
-                                                CustomMessage("a detective's tool", /*german*/"", /*french*/"un trésor Sheikah")});
+                                                CustomMessage("a detective's tool", /*german*/"ein Detektivwerkzeug", /*french*/"un trésor Sheikah")});
                                                  // /*spanish*/la revelación verdadera
 
-    hintTextTable[RHT_MEGATON_HAMMER] = HintText(CustomMessage("the Megaton Hammer", /*german*/"", /*french*/"la Masse des Titans"),
+    hintTextTable[RHT_MEGATON_HAMMER] = HintText(CustomMessage("the Megaton Hammer", /*german*/"der Stahlhammer", /*french*/"la Masse des Titans"),
                                                  // /*spanish*/el martillo Megatón
                                                  {
-                                                 CustomMessage("something that can remove boulders", /*german*/"", /*french*/"une chose qui enlève les rochers")
+                                                 CustomMessage("something that can remove boulders", /*german*/"etwas, das Geröll entfernen kann", /*french*/"une chose qui enlève les rochers")
                                                   // /*spanish*/algo que pueda quitar rocas
                                                  }, {
-                                                 CustomMessage("the dragon smasher", /*german*/"", /*french*/"le tueur de dragons"),
+                                                 CustomMessage("the dragon smasher", /*german*/"ein Drachenschläger", /*french*/"le tueur de dragons"),
                                                   // /*spanish*/un destructor de dragones
-                                                 CustomMessage("the metal mallet", /*german*/"", /*french*/"un outil de construction"),
+                                                 CustomMessage("the metal mallet", /*german*/"ein stählerner Schlägel", /*french*/"un outil de construction"),
                                                   // /*spanish*/un mazo de metal
-                                                 CustomMessage("the heavy hitter", /*german*/"", /*french*/"un poids lourd")});
+                                                 CustomMessage("the heavy hitter", /*german*/"ein schwerer Schläger", /*french*/"un poids lourd")});
                                                   // /*spanish*/un machacador
 
-    hintTextTable[RHT_STONE_OF_AGONY] = HintText(CustomMessage("the Stone of Agony", /*german*/"", /*french*/"la Pierre de Souffrance"),
+    hintTextTable[RHT_STONE_OF_AGONY] = HintText(CustomMessage("the Stone of Agony", /*german*/"der Stein des Wissens", /*french*/"la Pierre de Souffrance"),
                                                  // /*spanish*/la Piedra de la Agonía
                                                  {
-                                                 CustomMessage("a prize of the House of Skulltulas", /*german*/"", /*french*/"un prix de la maison des Skulltulas"),
+                                                 CustomMessage("a prize of the House of Skulltulas", /*german*/"ein Preis des Skulltula-Hauses", /*french*/"un prix de la maison des Skulltulas"),
                                                   // /*spanish*/un obsequio de la Casa Skulltula
-                                                 CustomMessage("a secret-finding tool", /*german*/"", /*french*/"un cherche-secrets")
+                                                 CustomMessage("a secret-finding tool", /*german*/"ein geheimnisfindendes Werkzeug", /*french*/"un cherche-secrets")
                                                   // /*spanish*/un instrumento para hallar objetos
                                                  }, {
-                                                 CustomMessage("the shake stone", /*german*/"", /*french*/"le fragment vibrant"),
+                                                 CustomMessage("the shake stone", /*german*/"der Schüttelstein", /*french*/"le fragment vibrant"),
                                                   // /*spanish*/el fragmento tintineante
-                                                 CustomMessage("a gray alarm", /*german*/"", /*french*/"une alerte bleue")});
+                                                 CustomMessage("a gray alarm", /*german*/"der graue Alarm", /*french*/"une alerte bleue")});
                                                   // /*spanish*/una azul alarma
 
-    hintTextTable[RHT_DINS_FIRE] = HintText(CustomMessage("Din's Fire", /*german*/"", /*french*/"le Feu de Din"),
+    hintTextTable[RHT_DINS_FIRE] = HintText(CustomMessage("Din's Fire", /*german*/"Dins Feuerinferno", /*french*/"le Feu de Din"),
                                             // /*spanish*/el Fuego de Din
                                             {
-                                            CustomMessage("a Great Fairy's power", /*german*/"", /*french*/"le pouvoir d'une grande fée")
+                                            CustomMessage("a Great Fairy's power", /*german*/"eine Kraft einer großen Fee", /*french*/"le pouvoir d'une grande fée")
                                              // /*spanish*/el poder de una Gran Hada
                                             }, {
-                                            CustomMessage("an inferno", /*german*/"", /*french*/"un brasier"),
+                                            CustomMessage("an inferno", /*german*/"ein Inferno", /*french*/"un brasier"),
                                              // /*spanish*/un incendio
-                                            CustomMessage("a heat wave", /*german*/"", /*french*/"une vague de chaleur"),
+                                            CustomMessage("a heat wave", /*german*/"eine Hitzewelle", /*french*/"une vague de chaleur"),
                                              // /*spanish*/una onda de calor
-                                            CustomMessage("a red ball", /*german*/"", /*french*/"une explosion de flammes")});
+                                            CustomMessage("a red ball", /*german*/"ein roter Ball", /*french*/"une explosion de flammes")});
                                              // /*spanish*/una roja esfera
 
-    hintTextTable[RHT_FARORES_WIND] = HintText(CustomMessage("Farore's Wind", /*german*/"", /*french*/"le Vent de Farore"),
+    hintTextTable[RHT_FARORES_WIND] = HintText(CustomMessage("Farore's Wind", /*german*/"Farores Donnersturm", /*french*/"le Vent de Farore"),
                                                // /*spanish*/el Viento de Farore
                                                {
-                                               CustomMessage("a Great Fairy's power", /*german*/"", /*french*/"le pouvoir d'une grande fée")
+                                               CustomMessage("a Great Fairy's power", /*german*/"eine Kraft einer großen Fee", /*french*/"le pouvoir d'une grande fée")
                                                 // /*spanish*/el poder de una Gran Hada
                                                }, {
-                                               CustomMessage("teleportation", /*german*/"", /*french*/"la téléportation"),
+                                               CustomMessage("teleportation", /*german*/"ein Teleportierer", /*french*/"la téléportation"),
                                                 // /*spanish*/un teletransportador
-                                               CustomMessage("a relocation rune", /*german*/"", /*french*/"une rune de relocation"),
+                                               CustomMessage("a relocation rune", /*german*/"eine Umzugsrune", /*french*/"une rune de relocation"),
                                                 // /*spanish*/una runa de transporte
-                                               CustomMessage("a green ball", /*german*/"", /*french*/"une boule verte")});
+                                               CustomMessage("a green ball", /*german*/"ein grüner Ball", /*french*/"une boule verte")});
                                                 // /*spanish*/una verde esfera
 
-    hintTextTable[RHT_NAYRUS_LOVE] = HintText(CustomMessage("Nayru's Love", /*german*/"", /*french*/"l'Amour de Nayru"),
+    hintTextTable[RHT_NAYRUS_LOVE] = HintText(CustomMessage("Nayru's Love", /*german*/"Nayrus Umarmung", /*french*/"l'Amour de Nayru"),
                                               // /*spanish*/el Amor de Nayru
                                               {
-                                              CustomMessage("a Great Fairy's power", /*german*/"", /*french*/"le pouvoir d'une grande fée")
+                                              CustomMessage("a Great Fairy's power", /*german*/"eine Kraft einer großen Fee", /*french*/"le pouvoir d'une grande fée")
                                                // /*spanish*/el poder de una Gran Hada
                                               }, {
-                                              CustomMessage("a safe space", /*german*/"", /*french*/"une bulle de cristal"),
+                                              CustomMessage("a safe space", /*german*/"ein sicherer Raum", /*french*/"une bulle de cristal"),
                                                // /*spanish*/una seguridad temporal
-                                              CustomMessage("an impregnable aura", /*german*/"", /*french*/"un aura impénétrable"),
+                                              CustomMessage("an impregnable aura", /*german*/"eine undurchdringliche Aura", /*french*/"un aura impénétrable"),
                                                // /*spanish*/un aura impenetrable
-                                              CustomMessage("a blue barrier", /*german*/"", /*french*/"une toison bleu")});
+                                              CustomMessage("a blue barrier", /*german*/"eine blaue Barriere", /*french*/"une toison bleu")});
                                                // /*spanish*/una barrera azul
 
-    hintTextTable[RHT_FIRE_ARROWS] = HintText(CustomMessage("the Fire Arrows", /*german*/"", /*french*/"les Flèches de Feu"),
+    hintTextTable[RHT_FIRE_ARROWS] = HintText(CustomMessage("the Fire Arrows", /*german*/"die Feuerpfeile", /*french*/"les Flèches de Feu"),
                                               // /*spanish*/la flecha de fuego
                                               {
-                                              CustomMessage("a magic arrow", /*german*/"", /*french*/"une flèche magique")
+                                              CustomMessage("a magic arrow", /*german*/"ein magischer Pfeil", /*french*/"une flèche magique")
                                                // /*spanish*/una flecha mágica
                                               }, {
-                                              CustomMessage("the furnace firearm", /*german*/"", /*french*/"une fusée solaire"),
+                                              CustomMessage("the furnace firearm", /*german*/"die Ofenwaffe", /*french*/"une fusée solaire"),
                                                // /*spanish*/el ardiente aguijón
-                                              CustomMessage("the burning bolts", /*german*/"", /*french*/"un obus enflammé"),
+                                              CustomMessage("the burning bolts", /*german*/"die Brennstifte", /*french*/"un obus enflammé"),
                                                // /*spanish*/las puntas ígneas
-                                              CustomMessage("a magma missile", /*german*/"", /*french*/"un missile volcanique")});
+                                              CustomMessage("a magma missile", /*german*/"eine vulkanische Rakete", /*french*/"un missile volcanique")});
                                                // /*spanish*/el misil abrasador
 
-    hintTextTable[RHT_ICE_ARROWS] = HintText(CustomMessage("the Ice Arrows", /*german*/"", /*french*/"les Flèches de Glace"),
+    hintTextTable[RHT_ICE_ARROWS] = HintText(CustomMessage("the Ice Arrows", /*german*/"die Eispfeile", /*french*/"les Flèches de Glace"),
                                              // /*spanish*/la flecha de hielo
                                              {
-                                             CustomMessage("a magic arrow", /*german*/"", /*french*/"une flèche magique"),
+                                             CustomMessage("a magic arrow", /*german*/"ein magischer Pfeil", /*french*/"une flèche magique"),
                                               // /*spanish*/una flecha mágica
-                                             CustomMessage("something that can stun", /*german*/"", /*french*/"une chose qui peut paralyser")
+                                             CustomMessage("something that can stun", /*german*/"etwas, das paralysieren kann", /*french*/"une chose qui peut paralyser")
                                               // /*spanish*/algo que pueda paralizar
                                              }, {
-                                             CustomMessage("the refrigerator rocket", /*german*/"", /*french*/"un missile pétrifiant"),
+                                             CustomMessage("the refrigerator rocket", /*german*/"die Kühlschrankrakete", /*french*/"un missile pétrifiant"),
                                               // /*spanish*/el misil congelador
-                                             CustomMessage("the frostbite bolts", /*german*/"", /*french*/"un froid mordant"),
+                                             CustomMessage("the frostbite bolts", /*german*/"die Froststifte", /*french*/"un froid mordant"),
                                               // /*spanish*/las puntas gélidas
-                                             CustomMessage("an iceberg maker", /*german*/"", /*french*/"une aiguille glaciale")});
+                                             CustomMessage("an iceberg maker", /*german*/"ein Eisbergmacher", /*french*/"une aiguille glaciale")});
                                               // /*spanish*/el control de escarcha
 
-    hintTextTable[RHT_LIGHT_ARROWS] = HintText(CustomMessage("the Light Arrows", /*german*/"", /*french*/"les Flèches de Lumière"),
+    hintTextTable[RHT_LIGHT_ARROWS] = HintText(CustomMessage("the Light Arrows", /*german*/"die Lichtpfeile", /*french*/"les Flèches de Lumière"),
                                                // /*spanish*/la flecha de luz
                                                {
-                                               CustomMessage("a magic arrow", /*german*/"", /*french*/"une flèche magique")
+                                               CustomMessage("a magic arrow", /*german*/"ein magischer Pfeil", /*french*/"une flèche magique")
                                                 // /*spanish*/una flecha mágica
                                                }, {
-                                               CustomMessage("the shining shot", /*german*/"", /*french*/"l'arme brillante"),
+                                               CustomMessage("the shining shot", /*german*/"der strahlende Schuss", /*french*/"l'arme brillante"),
                                                 // /*spanish*/el haz de luz
-                                               CustomMessage("the luminous launcher", /*german*/"", /*french*/"un jet de lumière"),
+                                               CustomMessage("the luminous launcher", /*german*/"der leuchtende Werfer", /*french*/"un jet de lumière"),
                                                 // /*spanish*/el disparo luminoso
-                                               CustomMessage("Ganondorf's bane", /*german*/"", /*french*/"le fléau de Ganondorf"),
+                                               CustomMessage("Ganondorf's bane", /*german*/"Ganondorfs Verderben", /*french*/"le fléau de Ganondorf"),
                                                 // /*spanish*/la perdición de Ganondorf
-                                               CustomMessage("the lighting bolts", /*german*/"", /*french*/"l'éclair sacré")});
+                                               CustomMessage("the lighting bolts", /*german*/"die Lichtstifte", /*french*/"l'éclair sacré")});
                                                 // /*spanish*/las puntas resplandecientes
 
-    hintTextTable[RHT_GERUDO_MEMBERSHIP_CARD] = HintText(CustomMessage("the Gerudo Membership Card", /*german*/"", /*french*/"la Carte Gerudo"),
+    hintTextTable[RHT_GERUDO_MEMBERSHIP_CARD] = HintText(CustomMessage("the Gerudo Membership Card", /*german*/"der Gerudo-Pass", /*french*/"la Carte Gerudo"),
                                                          // /*spanish*/el pase de socio gerudo
                                                          {
-                                                         CustomMessage("a token of recognition", /*german*/"", /*french*/"une preuve de reconnaissance")
+                                                         CustomMessage("a token of recognition", /*german*/"ein Zeichen der Anerkennung", /*french*/"une preuve de reconnaissance")
                                                           // /*spanish*/una prueba de reconocimiento
                                                          }, {
-                                                         CustomMessage("a girl club membership", /*german*/"", /*french*/"une carte de membre"),
+                                                         CustomMessage("a girl club membership", /*german*/"eine Mitgliedskarte", /*french*/"une carte de membre"),
                                                           // /*spanish*/una fémina membresía
-                                                         CustomMessage("a desert tribe's pass", /*german*/"", /*french*/"un laissez-passer")});
+                                                         CustomMessage("a desert tribe's pass", /*german*/"ein Pass eines Wüstenstammes", /*french*/"un laissez-passer")});
                                                           // /*spanish*/el vale del desierto
 
-    hintTextTable[RHT_MAGIC_BEAN] = HintText(CustomMessage("a Magic Bean", /*german*/"", /*french*/"un Haricot Magique"),
+    hintTextTable[RHT_MAGIC_BEAN] = HintText(CustomMessage("a Magic Bean", /*german*/"eine Wundererbse", /*french*/"un Haricot Magique"),
                                              // /*spanish*/una judía mágica
                                              {
-                                             CustomMessage("something sometimes buried", /*german*/"", /*french*/"une chose parfois enterrée")
+                                             CustomMessage("something sometimes buried", /*german*/"etwas, das manchmal begraben ist", /*french*/"une chose parfois enterrée")
                                               // /*spanish*/algo a veces enterrado
                                              }, {
-                                             CustomMessage("a wizardly legume", /*german*/"", /*french*/"un légume ensorcelé")});
+                                             CustomMessage("a wizardly legume", /*german*/"eine zauberhafte Hülse", /*french*/"un légume ensorcelé")});
                                               // /*spanish*/una legumbre hechizada
 
-    hintTextTable[RHT_MAGIC_BEAN_PACK] = HintText(CustomMessage("Magic Beans", /*german*/"", /*french*/"un Paquet de Haricots Magiques"),
+    hintTextTable[RHT_MAGIC_BEAN_PACK] = HintText(CustomMessage("Magic Beans", /*german*/"Wundererbsen", /*french*/"un Paquet de Haricots Magiques"),
                                                   // /*spanish*/unas judías mágicas
                                                   {
-                                                  CustomMessage("something sometimes buried", /*german*/"", /*french*/"une chose parfois enterrée")
+                                                  CustomMessage("something sometimes buried", /*german*/"etwas, das manchmal begraben ist", /*french*/"une chose parfois enterrée")
                                                    // /*spanish*/algo a veces enterrado
                                                   }, {
-                                                  CustomMessage("wizardly legumes", /*german*/"", /*french*/"un paquet de légumes ensorcelés")});
+                                                  CustomMessage("wizardly legumes", /*german*/"zauberhafte Hülsen", /*french*/"un paquet de légumes ensorcelés")});
                                                    // /*spanish*/unas legumbres hechizadas
 
-    hintTextTable[RHT_DOUBLE_DEFENSE] = HintText(CustomMessage("Double Defense", /*german*/"", /*french*/"la Double Défence"),
+    hintTextTable[RHT_DOUBLE_DEFENSE] = HintText(CustomMessage("Double Defense", /*german*/"Doppelte Verteidigung", /*french*/"la Double Défence"),
                                                  // /*spanish*/la doble defensa
                                                  {
-                                                 CustomMessage("a Great Fairy's power", /*german*/"", /*french*/"le pouvoir d'une grande fée"),
+                                                 CustomMessage("a Great Fairy's power", /*german*/"eine Kraft einer großen Fee", /*french*/"le pouvoir d'une grande fée"),
                                                   // /*spanish*/el poder de una Gran Hada
-                                                 CustomMessage("something heart-shaped", /*german*/"", /*french*/"une chose en forme de coeur")
+                                                 CustomMessage("something heart-shaped", /*german*/"etwas Herzförmiges", /*french*/"une chose en forme de coeur")
                                                   // /*spanish*/algo con forma de corazón
                                                  }, {
-                                                 CustomMessage("a white outline", /*german*/"", /*french*/"un rebord blanc"),
+                                                 CustomMessage("a white outline", /*german*/"ein weißes Profil", /*french*/"un rebord blanc"),
                                                   // /*spanish*/un contorno blanco
-                                                 CustomMessage("damage decrease", /*german*/"", /*french*/"une protection supplémentaire"),
+                                                 CustomMessage("damage decrease", /*german*/"Schadensverringerung", /*french*/"une protection supplémentaire"),
                                                   // /*spanish*/una reducción de daño
-                                                 CustomMessage("strengthened love", /*german*/"", /*french*/"un amour coriace")});
+                                                 CustomMessage("strengthened love", /*german*/"gestärkte Liebe", /*french*/"un amour coriace")});
                                                   // /*spanish*/un amor fortalecido
 
-    hintTextTable[RHT_GOLD_SKULLTULA_TOKEN] = HintText(CustomMessage("a Gold Skulltula Token", /*german*/"", /*french*/"un Symbole de Skulltula d'or"),
+    hintTextTable[RHT_GOLD_SKULLTULA_TOKEN] = HintText(CustomMessage("a Gold Skulltula Token", /*german*/"ein goldenes Skulltula-Symbol", /*french*/"un Symbole de Skulltula d'or"),
                                                        // /*spanish*/un símbolo de skulltula dorada
                                                        {
-                                                       CustomMessage("a token of recognition", /*german*/"", /*french*/"une preuve de reconnaissance"),
+                                                       CustomMessage("a token of recognition", /*german*/"ein Zeichen der Anerkennung", /*french*/"une preuve de reconnaissance"),
                                                         // /*spanish*/una prueba de reconocimiento
-                                                       CustomMessage("something sometimes buried", /*german*/"", /*french*/"une chose parfois enterrée")
+                                                       CustomMessage("something sometimes buried", /*german*/"etwas, das manchmal begraben ist", /*french*/"une chose parfois enterrée")
                                                         // /*spanish*/algo a veces enterrado
                                                        }, {
-                                                       CustomMessage("proof of destruction", /*german*/"", /*french*/"un certificat d'élimination"),
+                                                       CustomMessage("proof of destruction", /*german*/"Nachweis der Zerstörung", /*french*/"un certificat d'élimination"),
                                                         // /*spanish*/una prueba de la destrucción
-                                                       CustomMessage("an arachnid chip", /*german*/"", /*french*/"un symbole cranien"),
+                                                       CustomMessage("an arachnid chip", /*german*/"ein spinnenartiges Symbol", /*french*/"un symbole cranien"),
                                                         // /*spanish*/una figura arácnida
-                                                       CustomMessage("spider remains", /*german*/"", /*french*/"une dépouille dorée"),
+                                                       CustomMessage("spider remains", /*german*/"Spinnenüberreste", /*french*/"une dépouille dorée"),
                                                         // /*spanish*/unos restos dorados
-                                                       CustomMessage("one percent of a curse", /*german*/"", /*french*/"un centième de malédiction")});
+                                                       CustomMessage("one percent of a curse", /*german*/"ein Prozent eines Fluchs", /*french*/"un centième de malédiction")});
                                                         // /*spanish*/una centésima de una maldición
 
-    hintTextTable[RHT_POCKET_EGG] = HintText(CustomMessage("the Pocket Egg", /*german*/"", /*french*/"l'Oeuf de Poche"),
+    hintTextTable[RHT_POCKET_EGG] = HintText(CustomMessage("the Pocket Egg", /*german*/"das Ei", /*french*/"l'Oeuf de Poche"),
                                              // /*spanish*/el huevo de bolsillo
                                              {
-                                             CustomMessage("a trade quest item", /*german*/"", /*french*/"un objet de quête d'échanges"),
+                                             CustomMessage("a trade quest item", /*german*/"ein Gegenstand einer Handelsmission", /*french*/"un objet de quête d'échanges"),
                                               // /*spanish*/un objeto de una misión secundaria
-                                             CustomMessage("an egg", /*german*/"", /*french*/"un oeuf")
+                                             CustomMessage("an egg", /*german*/"ein Ei", /*french*/"un oeuf")
                                               // /*spanish*/un huevo
                                              }, {
-                                             CustomMessage("a Cucco container", /*german*/"", /*french*/"un réservoir à Cocotte"),
+                                             CustomMessage("a Cucco container", /*german*/"ein Hühnerbehälter", /*french*/"un réservoir à Cocotte"),
                                               // /*spanish*/cuco contenido
-                                             CustomMessage("a Cucco, eventually", /*german*/"", /*french*/"un poussin éventuel"),
+                                             CustomMessage("a Cucco, eventually", /*german*/"schlussendlich ein Huhn", /*french*/"un poussin éventuel"),
                                               // /*spanish*/un futuro cuco
-                                             CustomMessage("a fowl youth", /*german*/"", /*french*/"une omelette crue")});
+                                             CustomMessage("a fowl youth", /*german*/"ein junges Geflügel", /*french*/"une omelette crue")});
                                               // /*spanish*/una dulce juventud
 
-    hintTextTable[RHT_POCKET_CUCCO] = HintText(CustomMessage("the Pocket Cucco", /*german*/"", /*french*/"la Cocotte de Poche"),
+    hintTextTable[RHT_POCKET_CUCCO] = HintText(CustomMessage("the Pocket Cucco", /*german*/"Kiki", /*french*/"la Cocotte de Poche"),
                                                // /*spanish*/el cuco de bolsillo
                                                {
-                                               CustomMessage("a trade quest item", /*german*/"", /*french*/"un objet de quête d'échanges")
+                                               CustomMessage("a trade quest item", /*german*/"ein Gegenstand einer Handelsmission", /*french*/"un objet de quête d'échanges")
                                                 // /*spanish*/un objeto de una misión secundaria
                                                }, {
-                                               CustomMessage("a little clucker", /*german*/"", /*french*/"un petit glousseur")});
+                                               CustomMessage("a little clucker", /*german*/"ein kleiner Gackerer", /*french*/"un petit glousseur")});
                                                 // /*spanish*/un pollito chiquito
 
-    hintTextTable[RHT_COJIRO] = HintText(CustomMessage("Cojiro", /*german*/"", /*french*/"le p'tit poulet"),
+    hintTextTable[RHT_COJIRO] = HintText(CustomMessage("Cojiro", /*german*/"Henni", /*french*/"le p'tit poulet"),
                                          // /*spanish*/a Cojiro
                                          {
-                                         CustomMessage("a trade quest item", /*german*/"", /*french*/"un objet de quête d'échanges")
+                                         CustomMessage("a trade quest item", /*german*/"ein Gegenstand einer Handelsmission", /*french*/"un objet de quête d'échanges")
                                           // /*spanish*/un objeto de una misión secundaria
                                          }, {
-                                         CustomMessage("a cerulean capon", /*german*/"", /*french*/"un paon azur")});
+                                         CustomMessage("a cerulean capon", /*german*/"ein coelinblaues Kapaun", /*french*/"un paon azur")});
                                           // /*spanish*/un cerúleo capón
 
-    hintTextTable[RHT_ODD_MUSHROOM] = HintText(CustomMessage("an Odd Mushroom", /*german*/"", /*french*/"un Champignon Suspect"),
+    hintTextTable[RHT_ODD_MUSHROOM] = HintText(CustomMessage("an Odd Mushroom", /*german*/"ein Schimmelpilz", /*french*/"un Champignon Suspect"),
                                                // /*spanish*/un champiñón extraño
                                                {
-                                               CustomMessage("a trade quest item", /*german*/"", /*french*/"un objet de quête d'échanges")
+                                               CustomMessage("a trade quest item", /*german*/"ein Gegenstand einer Handelsmission", /*french*/"un objet de quête d'échanges")
                                                 // /*spanish*/un objeto de una misión secundaria
                                                }, {
-                                               CustomMessage("a powder ingredient", /*german*/"", /*french*/"un ingrédient à poudre")});
+                                               CustomMessage("a powder ingredient", /*german*/"eine Puderingredienz", /*french*/"un ingrédient à poudre")});
                                                 // /*spanish*/un oloroso ingrediente
 
-    hintTextTable[RHT_ODD_POTION] = HintText(CustomMessage("an Odd Potion", /*german*/"", /*french*/"une Mixture Suspecte"),
+    hintTextTable[RHT_ODD_POTION] = HintText(CustomMessage("an Odd Potion", /*german*/"ein Modertrank", /*french*/"une Mixture Suspecte"),
                                              // /*spanish*/una medicina rara
                                              {
-                                             CustomMessage("something that contains medicine", /*german*/"", /*french*/"une chose médicamenteuse"),
+                                             CustomMessage("something that contains medicine", /*german*/"etwas, das Medizin enthält", /*french*/"une chose médicamenteuse"),
                                               // /*spanish*/algo que contenga medicina
-                                             CustomMessage("something with a strange smell", /*german*/"", /*french*/"une chose qui sent bizarre"),
+                                             CustomMessage("something with a strange smell", /*german*/"etwas, das streng riecht", /*french*/"une chose qui sent bizarre"),
                                               // /*spanish*/algo con un olor extraño
-                                             CustomMessage("a trade quest item", /*german*/"", /*french*/"un objet de quête d'échanges")
+                                             CustomMessage("a trade quest item", /*german*/"ein Gegenstand einer Handelsmission", /*french*/"un objet de quête d'échanges")
                                               // /*spanish*/un objeto de una misión secundaria
                                              }, {
-                                             CustomMessage("Granny's goodies", /*german*/"", /*french*/"la confiserie de mamie")});
+                                             CustomMessage("Granny's goodies", /*german*/"Omas Zuckerwerk", /*french*/"la confiserie de mamie")});
                                               // /*spanish*/la especialidad de la abuela
 
-    hintTextTable[RHT_POACHERS_SAW] = HintText(CustomMessage("the Poacher's Saw", /*german*/"", /*french*/"la Scie du Chasseur"),
+    hintTextTable[RHT_POACHERS_SAW] = HintText(CustomMessage("the Poacher's Saw", /*german*/"eine Säge", /*french*/"la Scie du Chasseur"),
                                                // /*spanish*/la sierra del furtivo
                                                {
-                                               CustomMessage("a trade quest item", /*german*/"", /*french*/"un objet de quête d'échanges")
+                                               CustomMessage("a trade quest item", /*german*/"ein Gegenstand einer Handelsmission", /*french*/"un objet de quête d'échanges")
                                                 // /*spanish*/un objeto de una misión secundaria
                                                }, {
-                                               CustomMessage("a tree killer", /*german*/"", /*french*/"un coupeur d'arbres")});
+                                               CustomMessage("a tree killer", /*german*/"ein Baumtöter", /*french*/"un coupeur d'arbres")});
                                                 // /*spanish*/un destructor de árboles
 
-    hintTextTable[RHT_BROKEN_SWORD] = HintText(CustomMessage("the Broken Goron's Sword", /*german*/"", /*french*/"l'Épée Brisée de Goron"),
+    hintTextTable[RHT_BROKEN_SWORD] = HintText(CustomMessage("the Broken Goron's Sword", /*german*/"das zerbrochene Goronen-Schwert", /*french*/"l'Épée Brisée de Goron"),
                                                // /*spanish*/la espada goron rota
                                                {
-                                               CustomMessage("a trade quest item", /*german*/"", /*french*/"un objet de quête d'échanges"),
+                                               CustomMessage("a trade quest item", /*german*/"ein Gegenstand einer Handelsmission", /*french*/"un objet de quête d'échanges"),
                                                 // /*spanish*/un objeto de una misión secundaria
-                                               CustomMessage("a sword", /*german*/"", /*french*/"une épée")
+                                               CustomMessage("a sword", /*german*/"ein Schwert", /*french*/"une épée")
                                                 // /*spanish*/una espada
                                                }, {
-                                               CustomMessage("a shattered slicer", /*german*/"", /*french*/"une arme cassée")});
+                                               CustomMessage("a shattered slicer", /*german*/"ein zersplitterter Schneider", /*french*/"une arme cassée")});
                                                 // /*spanish*/una rebanadora rota
 
-    hintTextTable[RHT_PRESCRIPTION] = HintText(CustomMessage("the Prescription", /*german*/"", /*french*/"une Ordonnance"),
+    hintTextTable[RHT_PRESCRIPTION] = HintText(CustomMessage("the Prescription", /*german*/"ein Rezept", /*french*/"une Ordonnance"),
                                                // /*spanish*/la receta
                                                {
-                                               CustomMessage("a trade quest item", /*german*/"", /*french*/"un objet de quête d'échanges")
+                                               CustomMessage("a trade quest item", /*german*/"ein Gegenstand einer Handelsmission", /*french*/"un objet de quête d'échanges")
                                                 // /*spanish*/un objeto de una misión secundaria
                                                }, {
-                                               CustomMessage("a pill pamphlet", /*german*/"", /*french*/"un document urgent"),
+                                               CustomMessage("a pill pamphlet", /*german*/"ein Pillenpamphlet", /*french*/"un document urgent"),
                                                 // /*spanish*/un instructivo medicinal
-                                               CustomMessage("a doctor's note", /*german*/"", /*french*/"un papier médical")});
+                                               CustomMessage("a doctor's note", /*german*/"eine Notiz eines Doktors", /*french*/"un papier médical")});
                                                 // /*spanish*/unas notas del doctor
 
-    hintTextTable[RHT_EYEBALL_FROG] = HintText(CustomMessage("the Eyeball Frog", /*german*/"", /*french*/"le Crapaud-qui-louche"),
+    hintTextTable[RHT_EYEBALL_FROG] = HintText(CustomMessage("the Eyeball Frog", /*german*/"der Glotzfrosch", /*french*/"le Crapaud-qui-louche"),
                                                // /*spanish*/la rana de ojos saltones
                                                {
-                                               CustomMessage("a trade quest item", /*german*/"", /*french*/"un objet de quête d'échanges")
+                                               CustomMessage("a trade quest item", /*german*/"ein Gegenstand einer Handelsmission", /*french*/"un objet de quête d'échanges")
                                                 // /*spanish*/un objeto de una misión secundaria
                                                }, {
-                                               CustomMessage("a perceiving polliwog", /*german*/"", /*french*/"un amphibien")});
+                                               CustomMessage("a perceiving polliwog", /*german*/"eine wahrnehmende Kaulquappe", /*french*/"un amphibien")});
                                                 // /*spanish*/un variopinto batracio
 
-    hintTextTable[RHT_EYEDROPS] = HintText(CustomMessage("the Eyedrops", /*german*/"", /*french*/"une phiole de Super-Gouttes"),
+    hintTextTable[RHT_EYEDROPS] = HintText(CustomMessage("the Eyedrops", /*german*/"die Augentropfen", /*french*/"une phiole de Super-Gouttes"),
                                            // /*spanish*/las supergotas oculares
                                            {
-                                           CustomMessage("a trade quest item", /*german*/"", /*french*/"un objet de quête d'échanges")
+                                           CustomMessage("a trade quest item", /*german*/"ein Gegenstand einer Handelsmission", /*french*/"un objet de quête d'échanges")
                                             // /*spanish*/un objeto de una misión secundaria
                                            }, {
-                                           CustomMessage("a vision vial", /*german*/"", /*french*/"une solution oculaire")});
+                                           CustomMessage("a vision vial", /*german*/"eine Sichtphiole", /*french*/"une solution oculaire")});
                                             // /*spanish*/un remedio para la vista
 
-    hintTextTable[RHT_CLAIM_CHECK] = HintText(CustomMessage("the Claim Check", /*german*/"", /*french*/"un Certificat"),
+    hintTextTable[RHT_CLAIM_CHECK] = HintText(CustomMessage("the Claim Check", /*german*/"ein Zertifikat", /*french*/"un Certificat"),
                                               // /*spanish*/el recibo
                                               {
-                                              CustomMessage("a trade quest item", /*german*/"", /*french*/"un objet de quête d'échanges")
+                                              CustomMessage("a trade quest item", /*german*/"ein Gegenstand einer Handelsmission", /*french*/"un objet de quête d'échanges")
                                                // /*spanish*/un objeto de una misión secundaria
                                               }, {
-                                              CustomMessage("a three day wait", /*german*/"", /*french*/"un rendez-vous dans trois jours")});
+                                              CustomMessage("a three day wait", /*german*/"eine dreitägige Erwartung", /*french*/"un rendez-vous dans trois jours")});
                                                // /*spanish*/unos tres días de espera
 
-    hintTextTable[RHT_PROGRESSIVE_HOOKSHOT] = HintText(CustomMessage("a Hookshot", /*german*/"", /*french*/"un Grappin"),
+    hintTextTable[RHT_PROGRESSIVE_HOOKSHOT] = HintText(CustomMessage("a Hookshot", /*german*/"ein Enterhaken", /*french*/"un Grappin"),
                                                        // /*spanish*/un gancho
                                                        {
-                                                       CustomMessage("something that can grab things", /*german*/"", /*french*/"une chose qui peut attraper"),
+                                                       CustomMessage("something that can grab things", /*german*/"etwas, das Dinge greifen kann", /*french*/"une chose qui peut attraper"),
                                                         // /*spanish*/algo que pueda agarrar cosas
-                                                       CustomMessage("something that can stun", /*german*/"", /*french*/"une chose qui peut paralyser")
+                                                       CustomMessage("something that can stun", /*german*/"etwas, das paralysieren kann", /*french*/"une chose qui peut paralyser")
                                                         // /*spanish*/algo que pueda paralizar
                                                        }, {
-                                                       CustomMessage("Dampé's keepsake", /*german*/"", /*french*/"l'héritage d'Igor"),
+                                                       CustomMessage("Dampé's keepsake", /*german*/"Dampés Andenken", /*french*/"l'héritage d'Igor"),
                                                         // /*spanish*/un recuerdo de Dampé
-                                                       CustomMessage("the Grapple Beam", /*german*/"", /*french*/"le rayon grippeur"),
+                                                       CustomMessage("the Grapple Beam", /*german*/"der Greifstrahl", /*french*/"le rayon grippeur"),
                                                         // /*spanish*/una garra metálica
-                                                       CustomMessage("the RHT_BOING! chain", /*german*/"", /*french*/"la chaîne de RHT_BOING!")});
+                                                       CustomMessage("the RHT_BOING! chain", /*german*/"die Kette des RHT_BOING!", /*french*/"la chaîne de RHT_BOING!")});
                                                         // /*spanish*/una cadena retráctil
 
-    hintTextTable[RHT_PROGRESSIVE_STRENGTH] = HintText(CustomMessage("a Strength Upgrade", /*german*/"", /*french*/"une Amélioration de Force"),
+    hintTextTable[RHT_PROGRESSIVE_STRENGTH] = HintText(CustomMessage("a Strength Upgrade", /*german*/"eine Stärkeverbesserung", /*french*/"une Amélioration de Force"),
                                                        // /*spanish*/un aumento de fuerza
                                                        {
-                                                       CustomMessage("something that can remove boulders", /*german*/"", /*french*/"une chose qui enlève les rochers")
+                                                       CustomMessage("something that can remove boulders", /*german*/"etwas, das Geröll entfernen kann", /*french*/"une chose qui enlève les rochers")
                                                         // /*spanish*/algo que pueda quitar rocas
                                                        }, {
-                                                       CustomMessage("power gloves", /*german*/"", /*french*/"une paire de gants de travail"),
+                                                       CustomMessage("power gloves", /*german*/"Krafthandschuhe", /*french*/"une paire de gants de travail"),
                                                         // /*spanish*/unos poderosos guanteletes
-                                                       CustomMessage("metal mittens", /*german*/"", /*french*/"une paire de mitaines"),
+                                                       CustomMessage("metal mittens", /*german*/"Metallfäustlinge", /*french*/"une paire de mitaines"),
                                                         // /*spanish*/unas manoplas metálicas
-                                                       CustomMessage("the heavy lifty", /*german*/"", /*french*/"la puissance de dix hommes")});
+                                                       CustomMessage("the heavy lifty", /*german*/"der Schwerlastheber", /*french*/"la puissance de dix hommes")});
                                                         // /*spanish*/un levantamiento pesado
 
-    hintTextTable[RHT_PROGRESSIVE_BOMB_BAG] = HintText(CustomMessage("a Bomb Bag", /*german*/"", /*french*/"un Sac de Bombes"),
+    hintTextTable[RHT_PROGRESSIVE_BOMB_BAG] = HintText(CustomMessage("a Bomb Bag", /*german*/"ein Bombenbeutel", /*french*/"un Sac de Bombes"),
                                                        // /*spanish*/un saco de bombas
                                                        {
-                                                       CustomMessage("explosives", /*german*/"", /*french*/"un paquet d'explosifs"),
+                                                       CustomMessage("explosives", /*german*/"ein Explosivpaket", /*french*/"un paquet d'explosifs"),
                                                         // /*spanish*/un montón de explosivos
-                                                       CustomMessage("something that can remove boulders", /*german*/"", /*french*/"une chose qui enlève les rochers")
+                                                       CustomMessage("something that can remove boulders", /*german*/"etwas, das Geröll entfernen kann", /*french*/"une chose qui enlève les rochers")
                                                         // /*spanish*/algo que pueda quitar rocas
                                                        }, {
-                                                       CustomMessage("an explosive container", /*german*/"", /*french*/"un porte-grenade"),
+                                                       CustomMessage("an explosive container", /*german*/"ein Explosivbehälter", /*french*/"un porte-grenade"),
                                                         // /*spanish*/un recipiente explosivo
-                                                       CustomMessage("a blast bag", /*german*/"", /*french*/"un estomac de Dodongo")});
+                                                       CustomMessage("a blast bag", /*german*/"ein Dodongomagen", /*french*/"un estomac de Dodongo")});
                                                         // /*spanish*/un zurrón de estallidos
 
-    hintTextTable[RHT_PROGRESSIVE_BOW] = HintText(CustomMessage("a Bow", /*german*/"", /*french*/"l'Arc des Fées"),
+    hintTextTable[RHT_PROGRESSIVE_BOW] = HintText(CustomMessage("a Fairy Bow", /*german*/"ein Feen-Bogen", /*french*/"l'Arc des Fées"),
                                                   // /*spanish*/un arco de las hadas
                                                   {
-                                                  CustomMessage("a projectile shooter", /*german*/"", /*french*/"un tire-projectile")
+                                                  CustomMessage("a projectile shooter", /*german*/"ein Projektilwerfer", /*french*/"un tire-projectile")
                                                    // /*spanish*/un arma de proyectil
                                                   }, {
-                                                  CustomMessage("an archery enabler", /*german*/"", /*french*/"un facilitateur de tir"),
+                                                  CustomMessage("an archery enabler", /*german*/"ein Bogenschussermöglicher", /*french*/"un facilitateur de tir"),
                                                    // /*spanish*/un tiro al blanco
-                                                  CustomMessage("a danger dart launcher", /*german*/"", /*french*/"un tire-fléchette")});
+                                                  CustomMessage("a danger dart launcher", /*german*/"ein Pfeilwerfer", /*french*/"un tire-fléchette")});
                                                    // /*spanish*/un peligroso lanzadardos
 
-    hintTextTable[RHT_PROGRESSIVE_SLINGSHOT] = HintText(CustomMessage("a Slingshot", /*german*/"", /*french*/"un Lance-Pierre"),
+    hintTextTable[RHT_PROGRESSIVE_SLINGSHOT] = HintText(CustomMessage("a Slingshot", /*german*/"eine Schleuder", /*french*/"un Lance-Pierre"),
                                                         // /*spanish*/una resortera de las hadas
                                                         {
-                                                        CustomMessage("a projectile shooter", /*german*/"", /*french*/"un tire-projectile")
+                                                        CustomMessage("a projectile shooter", /*german*/"ein Projektilwerfer", /*french*/"un tire-projectile")
                                                          // /*spanish*/un arma de proyectil
                                                         }, {
-                                                        CustomMessage("a seed shooter", /*german*/"", /*french*/"un lance-noix"),
+                                                        CustomMessage("a seed shooter", /*german*/"ein Nusswerfer", /*french*/"un lance-noix"),
                                                          // /*spanish*/un lanzasemillas
-                                                        CustomMessage("a rubberband", /*german*/"", /*french*/"un élastique"),
+                                                        CustomMessage("a rubberband", /*german*/"ein Gummiband", /*french*/"un élastique"),
                                                          // /*spanish*/un tirachinas
-                                                        CustomMessage("a child's catapult", /*german*/"", /*french*/"un jouet d'enfant")});
+                                                        CustomMessage("a child's catapult", /*german*/"ein Kinderkatapult", /*french*/"un jouet d'enfant")});
                                                          // /*spanish*/una catapulta infantil
 
-    hintTextTable[RHT_PROGRESSIVE_WALLET] = HintText(CustomMessage("a Wallet", /*german*/"", /*french*/"une Bourse"),
+    hintTextTable[RHT_PROGRESSIVE_WALLET] = HintText(CustomMessage("a Wallet", /*german*/"eine Börse", /*french*/"une Bourse"),
                                                      // /*spanish*/una bolsa de rupias
                                                      {
-                                                     CustomMessage("a prize of the House of Skulltulas", /*german*/"", /*french*/"un prix de la maison des Skulltulas")
+                                                     CustomMessage("a prize of the House of Skulltulas", /*german*/"ein Preis des Skulltula-Hauses", /*french*/"un prix de la maison des Skulltulas")
                                                       // /*spanish*/un obsequio de la Casa Skulltula
                                                      }, {
-                                                     CustomMessage("a mo' money holder", /*german*/"", /*french*/"un sac à sous"),
+                                                     CustomMessage("a mo' money holder", /*german*/"ein Geldhalter", /*french*/"un sac à sous"),
                                                       // /*spanish*/una cartera de dinero
-                                                     CustomMessage("a gem purse", /*german*/"", /*french*/"une sacoche"),
+                                                     CustomMessage("a gem purse", /*german*/"ein Edelsteinportemonnaie", /*french*/"une sacoche"),
                                                       // /*spanish*/un zurrón de gemas
-                                                     CustomMessage("a portable bank", /*german*/"", /*french*/"une petite banque")});
+                                                     CustomMessage("a portable bank", /*german*/"eine tragbare Bank", /*french*/"une petite banque")});
                                                       // /*spanish*/un banco portable
 
-    hintTextTable[RHT_PROGRESSIVE_SCALE] = HintText(CustomMessage("a Zora Scale", /*german*/"", /*french*/"une Écaille Zora"),
+    hintTextTable[RHT_PROGRESSIVE_SCALE] = HintText(CustomMessage("a Zora Scale", /*german*/"eine Zora-Schuppe", /*french*/"une Écaille Zora"),
                                                     // /*spanish*/una escama Zora
                                                     {
-                                                    CustomMessage("a diving tool", /*german*/"", /*french*/"un outil de plongée")
+                                                    CustomMessage("a diving tool", /*german*/"ein Tauchwerkzeug", /*french*/"un outil de plongée")
                                                      // /*spanish*/un instrumento de buceo
                                                     }, {
-                                                    CustomMessage("a deeper dive", /*german*/"", /*french*/"une bulle de plongée"),
+                                                    CustomMessage("a deeper dive", /*german*/"eine Tauchblase", /*french*/"une bulle de plongée"),
                                                      // /*spanish*/un profundo buceo
-                                                    CustomMessage("a piece of Zora", /*german*/"", /*french*/"un morceau de Zora")});
+                                                    CustomMessage("a piece of Zora", /*german*/"ein Zora-Fragment", /*french*/"un morceau de Zora")});
                                                      // /*spanish*/un fragmento de Zora
 
-    hintTextTable[RHT_PROGRESSIVE_NUT_UPGRADE] = HintText(CustomMessage("Deku Nut Capacity", /*german*/"", /*french*/"une Augmentation de Noix Mojo"),
+    hintTextTable[RHT_PROGRESSIVE_NUT_UPGRADE] = HintText(CustomMessage("Deku Nut Capacity", /*german*/"Deku-Nuß-Kapazität", /*french*/"une Augmentation de Noix Mojo"),
                                                           // /*spanish*/un aumento de nueces deku
                                                           {
-                                                          CustomMessage("some Deku munitions", /*german*/"", /*french*/"un paquet de munitions Mojo"),
+                                                          CustomMessage("some Deku munitions", /*german*/"etwas Deku-Munition", /*french*/"un paquet de munitions Mojo"),
                                                            // /*spanish*/un montón de municiones Deku
-                                                          CustomMessage("something that can stun", /*german*/"", /*french*/"une chose qui peut paralyser")
+                                                          CustomMessage("something that can stun", /*german*/"etwas, das paralysieren kann", /*french*/"une chose qui peut paralyser")
                                                            // /*spanish*/algo que pueda paralizar
                                                           }, {
-                                                          CustomMessage("more nuts", /*german*/"", /*french*/"ecnore plus de noix"),
+                                                          CustomMessage("more nuts", /*german*/"mehr Nüsse", /*french*/"encore plus de noix"),
                                                            // /*spanish*/más semillas de nogal
-                                                          CustomMessage("flashbang storage", /*german*/"", /*french*/"un sac à noix")});
+                                                          CustomMessage("flashbang storage", /*german*/"Blendgranatenvorrat", /*french*/"un sac à noix")});
                                                            // /*spanish*/más frutos aturdidores
 
-    hintTextTable[RHT_PROGRESSIVE_STICK_UPGRADE] = HintText(CustomMessage("Deku Stick Capacity", /*german*/"", /*french*/"une augmentation de bâtons Mojo"),
+    hintTextTable[RHT_PROGRESSIVE_STICK_UPGRADE] = HintText(CustomMessage("Deku Stick Capacity", /*german*/"Deku-Stab-Kapazität", /*french*/"une augmentation de bâtons Mojo"),
                                                             // /*spanish*/un aumento de palos deku
                                                             {
-                                                            CustomMessage("some Deku munitions", /*german*/"", /*french*/"un paquet de munitions Mojo")
+                                                            CustomMessage("some Deku munitions", /*german*/"etwas Deku-Munition", /*french*/"un paquet de munitions Mojo")
                                                              // /*spanish*/un montón de municiones Deku
                                                             }, {
-                                                            CustomMessage("a lumber rack", /*german*/"", /*french*/"un paquet de bois"),
+                                                            CustomMessage("lumber racks", /*german*/"Holzgestelle", /*french*/"un paquet de bois"),
                                                              // /*spanish*/más bastones
-                                                            CustomMessage("more flammable twigs", /*german*/"", /*french*/"beaucoup de branches")});
+                                                            CustomMessage("more flammable twigs", /*german*/"mehr entflammbare Zweige", /*french*/"beaucoup de branches")});
                                                              // /*spanish*/más varas
 
-    hintTextTable[RHT_PROGRESSIVE_MAGIC_METER] = HintText(CustomMessage("a Magic Meter", /*german*/"", /*french*/"une Jauge de Magie"),
+    hintTextTable[RHT_PROGRESSIVE_MAGIC_METER] = HintText(CustomMessage("a Magic Meter", /*german*/"ein Magieabmaß", /*french*/"une Jauge de Magie"),
                                                           // /*spanish*/un aumento de poder mágico
                                                           {
-                                                          CustomMessage("a Great Fairy's power", /*german*/"", /*french*/"le pouvoir d'une grande fée")
+                                                          CustomMessage("a Great Fairy's power", /*german*/"eine Kraft einer großen Fee", /*french*/"le pouvoir d'une grande fée")
                                                            // /*spanish*/el poder de una Gran Hada
                                                           }, {
-                                                          CustomMessage("mystic training", /*german*/"", /*french*/"un potentiel magique"),
+                                                          CustomMessage("mystic training", /*german*/"mystisches Training", /*french*/"un potentiel magique"),
                                                            // /*spanish*/una maestría mística
-                                                          CustomMessage("pixie dust", /*german*/"", /*french*/"de la poudre de fée"),
+                                                          CustomMessage("pixie dust", /*german*/"Feenstaub", /*french*/"de la poudre de fée"),
                                                            // /*spanish*/un polvo de hada
-                                                          CustomMessage("a green rectangle", /*german*/"", /*french*/"un rectangle vert")});
+                                                          CustomMessage("a green rectangle", /*german*/"ein grünes Rechteck", /*french*/"un rectangle vert")});
                                                            // /*spanish*/una verduzca barra
 
-    hintTextTable[RHT_PROGRESSIVE_OCARINA] = HintText(CustomMessage("an Ocarina", /*german*/"", /*french*/"un ocarina"),
+    hintTextTable[RHT_PROGRESSIVE_OCARINA] = HintText(CustomMessage("an Ocarina", /*german*/"eine Okarina", /*french*/"un ocarina"),
                                                       // /*spanish*/una ocarina
                                                       {
-                                                      CustomMessage("something given by Saria", /*german*/"", /*french*/"un cadeau de Saria"),
+                                                      CustomMessage("something given by Saria", /*german*/"ein Geschenk von Salia", /*french*/"un cadeau de Saria"),
                                                        // /*spanish*/un obsequio de Saria
-                                                      CustomMessage("something kept by the royal family", /*german*/"", /*french*/"une chose qui paralyse")
+                                                      CustomMessage("something kept by the royal family", /*german*/"etwas, das von der royalen Familie bewahrt wird", /*french*/"une chose qui paralyse")
                                                        // /*spanish*/algo guardado por la familia real
                                                       }, {
-                                                      CustomMessage("a flute", /*german*/"", /*french*/"un bec musical"),
+                                                      CustomMessage("a flute", /*german*/"eine Flöte", /*french*/"un bec musical"),
                                                        // /*spanish*/un utensilio musical
-                                                      CustomMessage("a music maker", /*german*/"", /*french*/"un porteur de chansons")});
+                                                      CustomMessage("a music maker", /*german*/"ein Musikmacher", /*french*/"un porteur de chansons")});
                                                        // /*spanish*/un instrumento
 
-    hintTextTable[RHT_PROGRESSIVE_BOMBCHUS] = HintText(CustomMessage("Bombchus", /*german*/"", /*french*/"un paquet de Missiles"),
+    hintTextTable[RHT_PROGRESSIVE_BOMBCHUS] = HintText(CustomMessage("Bombchus", /*german*/"Krabbelminen", /*french*/"un paquet de Missiles"),
                                                        // /*spanish*/unos bombchus
                                                        {
-                                                       CustomMessage("a prize of the House of Skulltulas", /*german*/"", /*french*/"un prix de la maison des Skulltulas"),
+                                                       CustomMessage("a prize of the House of Skulltulas", /*german*/"ein Preis des Skulltula-Hauses", /*french*/"un prix de la maison des Skulltulas"),
                                                         // /*spanish*/un obsequio de la Casa Skulltula
-                                                       CustomMessage("explosives", /*german*/"", /*french*/"un paquet d'explosifs")
+                                                       CustomMessage("explosives", /*german*/"ein Explosivpaket", /*french*/"un paquet d'explosifs")
                                                         // /*spanish*/un montón de explosivos
                                                        }, {
-                                                       CustomMessage("mice bombs", /*german*/"", /*french*/"un adorable explosif"),
+                                                       CustomMessage("mice bombs", /*german*/"Mäusebomben", /*french*/"un adorable explosif"),
                                                         // /*spanish*/unas bombas roedoras
-                                                       CustomMessage("proximity mice", /*german*/"", /*french*/"une mine anti-rongeur"),
+                                                       CustomMessage("proximity mice", /*german*/"Näherungsmäuse", /*french*/"une mine anti-rongeur"),
                                                         // /*spanish*/unos explosivos ratoncitos
-                                                       CustomMessage("wall crawlers", /*german*/"", /*french*/"un rapide grimpeur"),
+                                                       CustomMessage("wall crawlers", /*german*/"Wandkrabbler", /*french*/"un rapide grimpeur"),
                                                         // /*spanish*/unos trepaparedes
-                                                       CustomMessage("trail blazers", /*german*/"", /*french*/"un zigzag éclatant")});
+                                                       CustomMessage("trail blazers", /*german*/"Vorreiter", /*french*/"un zigzag éclatant")});
                                                         // /*spanish*/unas ratas propulsadas
 
-    hintTextTable[RHT_PROGRESSIVE_GORONSWORD] = HintText(CustomMessage("a Goron Sword", /*german*/"", /*french*/"une épée Goron"),
+    hintTextTable[RHT_PROGRESSIVE_GORONSWORD] = HintText(CustomMessage("a Goron Sword", /*german*/"ein Goronen-Schwert", /*french*/"une épée Goron"),
                                                          // /*spanish*/una espada goron
                                                          {
-                                                         CustomMessage("a sword", /*german*/"", /*french*/"une épée")
+                                                         CustomMessage("a sword", /*german*/"ein Schwert", /*french*/"une épée")
                                                           // /*spanish*/una espada
                                                          }, {
-                                                         CustomMessage("a long blade", /*german*/"", /*french*/"une longue lame"),
+                                                         CustomMessage("a long blade", /*german*/"eine lange Klinge", /*french*/"une longue lame"),
                                                           // /*spanish*/una gran hoja
-                                                         CustomMessage("a Goron weapon", /*german*/"", /*french*/"une arme Goron")});
+                                                         CustomMessage("a Goron weapon", /*german*/"eine Goronenwaffe", /*french*/"une arme Goron")});
                                                           // /*spanish*/un arma goron
 
-    hintTextTable[RHT_EMPTY_BOTTLE] = HintText(CustomMessage("a Bottle", /*german*/"", /*french*/"un flacon vide"),
+    hintTextTable[RHT_EMPTY_BOTTLE] = HintText(CustomMessage("a bottle", /*german*/"eine Flasche", /*french*/"un flacon vide"),
                                                // /*spanish*/una botella
                                                {
-                                               CustomMessage("a bottle", /*german*/"", /*french*/"un flacon")
+                                               CustomMessage("a bottle", /*german*/"eine Flasche", /*french*/"un flacon")
                                                 // /*spanish*/una botella
                                                }, {
-                                               CustomMessage("a glass container", /*german*/"", /*french*/"un cylindre de cristal"),
+                                               CustomMessage("a glass container", /*german*/"ein Glasbehälter", /*french*/"un cylindre de cristal"),
                                                 // /*spanish*/un recipiente de cristal
-                                               CustomMessage("an empty jar", /*german*/"", /*french*/"une jarre incassable"),
+                                               CustomMessage("an empty jar", /*german*/"ein leerer Krug", /*french*/"une jarre incassable"),
                                                 // /*spanish*/un frasco vacío
-                                               CustomMessage("encased air", /*german*/"", /*french*/"un bocal d'air")});
+                                               CustomMessage("encased air", /*german*/"eingeschlossene Luft", /*french*/"un bocal d'air")});
                                                 // /*spanish*/aire a presión
 
-    hintTextTable[RHT_BOTTLE_WITH_MILK] = HintText(CustomMessage("a Milk Bottle", /*german*/"", /*french*/"un flacon de lait"),
+    hintTextTable[RHT_BOTTLE_WITH_MILK] = HintText(CustomMessage("a Milk Bottle", /*german*/"eine Milchflasche", /*french*/"un flacon de lait"),
                                                    // /*spanish*/una botella de leche
                                                    {
-                                                   CustomMessage("a bottle", /*german*/"", /*french*/"un flacon")
+                                                   CustomMessage("a bottle", /*german*/"eine Flasche", /*french*/"un flacon")
                                                     // /*spanish*/una botella
                                                    }, {
-                                                   CustomMessage("cow juice", /*german*/"", /*french*/"une source de calcium"),
+                                                   CustomMessage("cow juice", /*german*/"Kuhsaft", /*french*/"une source de calcium"),
                                                     // /*spanish*/una fuente de calcio
-                                                   CustomMessage("a white liquid", /*german*/"", /*french*/"un liquide blanc"),
+                                                   CustomMessage("a white liquid", /*german*/"eine weiße Flüssigkeit", /*french*/"un liquide blanc"),
                                                     // /*spanish*/una bebida nutritiva
-                                                   CustomMessage("a baby's breakfast", /*german*/"", /*french*/"du jus pour bébé")});
+                                                   CustomMessage("a baby's breakfast", /*german*/"ein Babyfrühstück", /*french*/"du jus pour bébé")});
                                                     // /*spanish*/un trago para bebés
 
-    hintTextTable[RHT_BOTTLE_WITH_RED_POTION] = HintText(CustomMessage("a Red Potion Bottle", /*german*/"", /*french*/"un flacon de potion rouge"),
+    hintTextTable[RHT_BOTTLE_WITH_RED_POTION] = HintText(CustomMessage("a Red Potion Bottle", /*german*/"eine Flasche mit rotem Elixier", /*french*/"un flacon de potion rouge"),
                                                          // /*spanish*/una botella de poción roja
                                                          {
-                                                         CustomMessage("a bottle", /*german*/"", /*french*/"un flacon")
+                                                         CustomMessage("a bottle", /*german*/"eine Flasche", /*french*/"un flacon")
                                                           // /*spanish*/una botella
                                                          }, {
-                                                         CustomMessage("a vitality vial", /*german*/"", /*french*/"un mélange de vitalité"),
+                                                         CustomMessage("a vitality vial", /*german*/"eine Vitalitätsphiole", /*french*/"un mélange de vitalité"),
                                                           // /*spanish*/una pócima vitalicia
-                                                         CustomMessage("a red liquid", /*german*/"", /*french*/"un liquide rouge")});
+                                                         CustomMessage("a red liquid", /*german*/"eine rote Flüssigkeit", /*french*/"un liquide rouge")});
                                                           // /*spanish*/un remedio rojizo
 
-    hintTextTable[RHT_BOTTLE_WITH_GREEN_POTION] = HintText(CustomMessage("a Green Potion Bottle", /*german*/"", /*french*/"un flacon de potion verte"),
+    hintTextTable[RHT_BOTTLE_WITH_GREEN_POTION] = HintText(CustomMessage("a Green Potion Bottle", /*german*/"eine Flasche mit grünem Elixier", /*french*/"un flacon de potion verte"),
                                                            // /*spanish*/una botella de poción verde
                                                            {
-                                                           CustomMessage("a bottle", /*german*/"", /*french*/"un flacon")
+                                                           CustomMessage("a bottle", /*german*/"eine Flasche", /*french*/"un flacon")
                                                             // /*spanish*/una botella
                                                            }, {
-                                                           CustomMessage("a magic mixture", /*german*/"", /*french*/"une réserve magique"),
+                                                           CustomMessage("a magic mixture", /*german*/"eine magische Mixtur", /*french*/"une réserve magique"),
                                                             // /*spanish*/un potingue mágico
-                                                           CustomMessage("a green liquid", /*german*/"", /*french*/"un liquide vert")});
+                                                           CustomMessage("a green liquid", /*german*/"eine grüne Flüssigkeit", /*french*/"un liquide vert")});
                                                             // /*spanish*/un remedio verduzco
 
-    hintTextTable[RHT_BOTTLE_WITH_BLUE_POTION] = HintText(CustomMessage("a Blue Potion Bottle", /*german*/"", /*french*/"un flacon de potion bleue"),
+    hintTextTable[RHT_BOTTLE_WITH_BLUE_POTION] = HintText(CustomMessage("a Blue Potion Bottle", /*german*/"eine Flasche mit blauem Elixier", /*french*/"un flacon de potion bleue"),
                                                           // /*spanish*/una botella de poción azul
                                                           {
-                                                          CustomMessage("a bottle", /*german*/"", /*french*/"un flacon")
+                                                          CustomMessage("a bottle", /*german*/"eine Flasche", /*french*/"un flacon")
                                                            // /*spanish*/una botella
                                                           }, {
-                                                          CustomMessage("an ailment antidote", /*german*/"", /*french*/"l'élixir ultime"),
+                                                          CustomMessage("an ailment antidote", /*german*/"ein Krankheitsantidot", /*french*/"l'élixir ultime"),
                                                            // /*spanish*/un antídoto para el dolor
-                                                          CustomMessage("a blue liquid", /*german*/"", /*french*/"un liquide bleu")});
+                                                          CustomMessage("a blue liquid", /*german*/"eine blaue Flüssigkeit", /*french*/"un liquide bleu")});
                                                            // /*spanish*/un remedio índigo
 
-    hintTextTable[RHT_BOTTLE_WITH_FAIRY] = HintText(CustomMessage("a Fairy Bottle", /*german*/"", /*french*/"une fée en flacon"),
+    hintTextTable[RHT_BOTTLE_WITH_FAIRY] = HintText(CustomMessage("a Fairy Bottle", /*german*/"eine Feenflasche", /*french*/"une fée en flacon"),
                                                     // /*spanish*/un hada en una botella
                                                     {
-                                                    CustomMessage("a bottle", /*german*/"", /*french*/"un flacon")
+                                                    CustomMessage("a bottle", /*german*/"eine Flasche", /*french*/"un flacon")
                                                      // /*spanish*/una botella
                                                     }, {
-                                                    CustomMessage("an imprisoned fairy", /*german*/"", /*french*/"une fée emprisonnée"),
+                                                    CustomMessage("an imprisoned fairy", /*german*/"eine gefangene Fee", /*french*/"une fée emprisonnée"),
                                                      // /*spanish*/un hada atrapada
-                                                    CustomMessage("an extra life", /*german*/"", /*french*/"une vie de rechange"),
+                                                    CustomMessage("an extra life", /*german*/"ein Extraleben", /*french*/"une vie de rechange"),
                                                      // /*spanish*/una oportunidad más
-                                                    CustomMessage("Navi's cousin", /*german*/"", /*french*/"le cousin de Navi")});
+                                                    CustomMessage("Navi's cousin", /*german*/"Navis Vetter", /*french*/"le cousin de Navi")});
                                                      // /*spanish*/una prima de Navi
 
-    hintTextTable[RHT_BOTTLE_WITH_FISH] = HintText(CustomMessage("a Fish Bottle", /*german*/"", /*french*/"un poisson en flacon"),
+    hintTextTable[RHT_BOTTLE_WITH_FISH] = HintText(CustomMessage("a Fish Bottle", /*german*/"eine Fischflasche", /*french*/"un poisson en flacon"),
                                                    // /*spanish*/un pez en una botella
                                                    {
-                                                   CustomMessage("a bottle", /*german*/"", /*french*/"un flacon")
+                                                   CustomMessage("a bottle", /*german*/"eine Flasche", /*french*/"un flacon")
                                                     // /*spanish*/una botella
                                                    }, {
-                                                   CustomMessage("an aquarium", /*german*/"", /*french*/"un aquarium"),
+                                                   CustomMessage("an aquarium", /*german*/"ein Aquarium", /*french*/"un aquarium"),
                                                     // /*spanish*/un escamado ser
-                                                   CustomMessage("a deity's snack", /*german*/"", /*french*/"le repas d'un dieu marin")});
+                                                   CustomMessage("a deity's snack", /*german*/"ein Gottheitssnack", /*french*/"le repas d'un dieu marin")});
                                                     // /*spanish*/un tentempié de cierta deidad
 
-    hintTextTable[RHT_BOTTLE_WITH_BLUE_FIRE] = HintText(CustomMessage("a Blue Fire Bottle", /*german*/"", /*french*/"une flamme bleue en flacon"),
+    hintTextTable[RHT_BOTTLE_WITH_BLUE_FIRE] = HintText(CustomMessage("a Blue Fire Bottle", /*german*/"eine Flasche mit blauem Feuer", /*french*/"une flamme bleue en flacon"),
                                                         // /*spanish*/una botella de fuego azul
                                                         {
-                                                        CustomMessage("a bottle", /*german*/"", /*french*/"un flacon")
+                                                        CustomMessage("a bottle", /*german*/"eine Flasche", /*french*/"un flacon")
                                                          // /*spanish*/una botella
                                                         }, {
-                                                        CustomMessage("a conflagration canteen", /*german*/"", /*french*/"une mystérieuse flamme"),
+                                                        CustomMessage("a conflagration canteen", /*german*/"eine Brandfeldflasche", /*french*/"une mystérieuse flamme"),
                                                          // /*spanish*/un incendio retenido
-                                                        CustomMessage("an icemelt jar", /*german*/"", /*french*/"un brasier glacial")});
+                                                        CustomMessage("an icemelt jar", /*german*/"ein eisschmelzender Krug", /*french*/"un brasier glacial")});
                                                          // /*spanish*/unas brasas enfrascadas
 
-    hintTextTable[RHT_BOTTLE_WITH_BUGS] = HintText(CustomMessage("a Bug Bottle", /*german*/"", /*french*/"un insecte en flacon"),
+    hintTextTable[RHT_BOTTLE_WITH_BUGS] = HintText(CustomMessage("a Bug Bottle", /*german*/"eine Wanzenflasche", /*french*/"un insecte en flacon"),
                                                    // /*spanish*/unos insectos en una botella
                                                    {
-                                                   CustomMessage("a bottle", /*german*/"", /*french*/"un flacon")
+                                                   CustomMessage("a bottle", /*german*/"eine Flasche", /*french*/"un flacon")
                                                     // /*spanish*/una botella
                                                    }, {
-                                                   CustomMessage("an insectarium", /*german*/"", /*french*/"un insectarium"),
+                                                   CustomMessage("an insectarium", /*german*/"ein Insektarium", /*french*/"un insectarium"),
                                                     // /*spanish*/unos invertebrados seres
-                                                   CustomMessage("Skulltula finders", /*german*/"", /*french*/"une poignée de trouve-Skulltula")});
+                                                   CustomMessage("Skulltula finders", /*german*/"Skulltula-Finder", /*french*/"une poignée de trouve-Skulltula")});
                                                     // /*spanish*/unos rastreadores de skulltulas
 
-    hintTextTable[RHT_BOTTLE_WITH_POE] = HintText(CustomMessage("a Poe Bottle", /*german*/"", /*french*/"un Esprit en flacon"),
+    hintTextTable[RHT_BOTTLE_WITH_POE] = HintText(CustomMessage("a Poe Bottle", /*german*/"eine Irrlichtflasche", /*french*/"un Esprit en flacon"),
                                                   // /*spanish*/un Poe en una botella
                                                   {
-                                                  CustomMessage("a bottle", /*german*/"", /*french*/"un flacon")
+                                                  CustomMessage("a bottle", /*german*/"eine Flasche", /*french*/"un flacon")
                                                    // /*spanish*/una botella
                                                   }, {
-                                                  CustomMessage("a spooky ghost", /*german*/"", /*french*/"un effroyable fantôme"),
+                                                  CustomMessage("a spooky ghost", /*german*/"ein spukhafter Geist", /*french*/"un effroyable fantôme"),
                                                    // /*spanish*/un espantoso espectro
-                                                  CustomMessage("a face in the jar", /*german*/"", /*french*/"un visage dans un bocal")});
+                                                  CustomMessage("a face in the jar", /*german*/"ein Gesicht im Krug", /*french*/"un visage dans un bocal")});
                                                    // /*spanish*/una expresión enfrascada
 
-    hintTextTable[RHT_BOTTLE_WITH_BIG_POE] = HintText(CustomMessage("a Big Poe Bottle", /*german*/"", /*french*/"une Ame en flacon"),
+    hintTextTable[RHT_BOTTLE_WITH_BIG_POE] = HintText(CustomMessage("a Big Poe Bottle", /*german*/"eine Nachtschwärmerflasche", /*french*/"une Ame en flacon"),
                                                       // /*spanish*/un Gran Poe en una botella
                                                       {
-                                                      CustomMessage("a bottle", /*german*/"", /*french*/"un flacon")
+                                                      CustomMessage("a bottle", /*german*/"eine Flasche", /*french*/"un flacon")
                                                        // /*spanish*/una botella
                                                       }, {
-                                                      CustomMessage("the spookiest ghost", /*german*/"", /*french*/"un épouvantable spectre"),
+                                                      CustomMessage("the spookiest ghost", /*german*/"der spukhafteste Geist", /*french*/"un épouvantable spectre"),
                                                        // /*spanish*/el espectro más espeluznante
-                                                      CustomMessage("a sidequest spirit", /*german*/"", /*french*/"un précieux esprit")});
+                                                      CustomMessage("a sidequest spirit", /*german*/"ein Nebenmissionsgeist", /*french*/"un précieux esprit")});
                                                        // /*spanish*/un buen valorado espíritu
 
-    hintTextTable[RHT_RUTOS_LETTER] = HintText(CustomMessage("Ruto's Letter", /*german*/"", /*french*/"la lettre de Ruto"),
+    hintTextTable[RHT_RUTOS_LETTER] = HintText(CustomMessage("Ruto's Letter", /*german*/"Rutos Brief", /*french*/"la lettre de Ruto"),
                                                // /*spanish*/la carta de Ruto
                                                {
-                                               CustomMessage("a bottle", /*german*/"", /*french*/"un flacon")
+                                               CustomMessage("a bottle", /*german*/"eine Flasche", /*french*/"un flacon")
                                                 // /*spanish*/una botella
                                                }, {
-                                               CustomMessage("a call for help", /*german*/"", /*french*/"un appel au secours"),
+                                               CustomMessage("a call for help", /*german*/"ein Hilferuf", /*french*/"un appel au secours"),
                                                 // /*spanish*/una llamada de auxilio
-                                               CustomMessage("the note that Mweeps", /*german*/"", /*french*/"un message qui fait mwip"),
+                                               CustomMessage("the note that Mweeps", /*german*/"eine Notiz, die Mweeps", /*french*/"un message qui fait mwip"),
                                                 // /*spanish*/un escrito mweep
-                                               CustomMessage("an RHT_SOS call", /*german*/"", /*french*/"un signal RHT_SOS"),
+                                               CustomMessage("an RHT_SOS call", /*german*/"ein RHT_SOS Signal", /*french*/"un signal RHT_SOS"),
                                                 // /*spanish*/una nota de socorro
-                                               CustomMessage("a fishy stationery", /*german*/"", /*french*/"un papier mouillé")});
+                                               CustomMessage("a fishy stationery", /*german*/"ein nasses Papier", /*french*/"un papier mouillé")});
                                                 // /*spanish*/un mensaje de ayuda
 
-    hintTextTable[RHT_ZELDAS_LULLABY] = HintText(CustomMessage("Zelda's Lullaby", /*german*/"", /*french*/"la berceuse de Zelda"),
+    hintTextTable[RHT_ZELDAS_LULLABY] = HintText(CustomMessage("Zelda's Lullaby", /*german*/"Zeldas Wiegenlied", /*french*/"la berceuse de Zelda"),
                                                  // /*spanish*/la Nana de Zelda
                                                  {
-                                                 CustomMessage("a regular song", /*german*/"", /*french*/"une chanson normale"),
+                                                 CustomMessage("a regular song", /*german*/"ein normales Lied", /*french*/"une chanson normale"),
                                                   // /*spanish*/una cancion normal
-                                                 CustomMessage("something kept by the royal family", /*german*/"", /*french*/"une chose qui paralyse")
+                                                 CustomMessage("something kept by the royal family", /*german*/"etwas, das von der royalen Familie bewahrt wird", /*french*/"une chose qui paralyse")
                                                   // /*spanish*/algo guardado por la familia real
                                                  }, {
-                                                 CustomMessage("a song of royal slumber", /*german*/"", /*french*/"une chanson royale"),
+                                                 CustomMessage("a song of royal slumber", /*german*/"ein royales Lied", /*french*/"une chanson royale"),
                                                   // /*spanish*/la canción real
-                                                 CustomMessage("a triforce tune", /*german*/"", /*french*/"la musique sacrée")});
+                                                 CustomMessage("a triforce tune", /*german*/"eine heilige Musik", /*french*/"la musique sacrée")});
                                                   // /*spanish*/la melodía de la trifuerza
 
-    hintTextTable[RHT_EPONAS_SONG] = HintText(CustomMessage("Epona's Song", /*german*/"", /*french*/"le chant d'Epona"),
+    hintTextTable[RHT_EPONAS_SONG] = HintText(CustomMessage("Epona's Song", /*german*/"Eponas Lied", /*french*/"le chant d'Epona"),
                                               // /*spanish*/la Canción de Epona
                                               {
-                                              CustomMessage("a regular song", /*german*/"", /*french*/"une chanson normale")
+                                              CustomMessage("a regular song", /*german*/"ein normales Lied", /*french*/"une chanson normale")
                                                // /*spanish*/una cancion normal
                                               }, {
-                                              CustomMessage("an equestrian etude", /*german*/"", /*french*/"une hymne équestre"),
+                                              CustomMessage("an equestrian etude", /*german*/"eine Reiterhymne", /*french*/"une hymne équestre"),
                                                // /*spanish*/una copla ecuestre
-                                              CustomMessage("Malon's melody", /*german*/"", /*french*/"la mélodie des vaches"),
+                                              CustomMessage("Malon's melody", /*german*/"Malons Melodie", /*french*/"la mélodie des vaches"),
                                                // /*spanish*/la sonata de Malon
-                                              CustomMessage("a ranch song", /*german*/"", /*french*/"le chant des champs")});
+                                              CustomMessage("a ranch song", /*german*/"ein Lied des Ackers", /*french*/"le chant des champs")});
                                                // /*spanish*/un canto rupestre
 
-    hintTextTable[RHT_SARIAS_SONG] = HintText(CustomMessage("Saria's Song", /*german*/"", /*french*/"le chant de Saria"),
+    hintTextTable[RHT_SARIAS_SONG] = HintText(CustomMessage("Saria's Song", /*german*/"Salias Lied", /*french*/"le chant de Saria"),
                                               // /*spanish*/la Canción de Saria
                                               {
-                                              CustomMessage("a regular song", /*german*/"", /*french*/"une chanson normale"),
+                                              CustomMessage("a regular song", /*german*/"ein normales Lied", /*french*/"une chanson normale"),
                                                // /*spanish*/una cancion normal
-                                              CustomMessage("something given by Saria", /*german*/"", /*french*/"un cadeau de Saria")
+                                              CustomMessage("something given by Saria", /*german*/"ein Geschenk von Salia", /*french*/"un cadeau de Saria")
                                                // /*spanish*/un obsequio de Saria
                                               }, {
-                                              CustomMessage("a song of dancing Gorons", /*german*/"", /*french*/"une chanson danceuse"),
+                                              CustomMessage("a song of dancing Gorons", /*german*/"ein Lied der tanzenden Goronen", /*french*/"une chanson danceuse"),
                                                // /*spanish*/un pegadizo tono goron
-                                              CustomMessage("Saria's phone number", /*german*/"", /*french*/"le téléphone d'une amie")});
+                                              CustomMessage("Saria's phone number", /*german*/"Salias Telefonnummer", /*french*/"le téléphone d'une amie")});
                                                // /*spanish*/una consulta de asistencia
 
-    hintTextTable[RHT_SUNS_SONG] = HintText(CustomMessage("the Sun's Song", /*german*/"", /*french*/"le chant du soleil"),
+    hintTextTable[RHT_SUNS_SONG] = HintText(CustomMessage("the Sun's Song", /*german*/"Hymne der Sonne", /*french*/"le chant du soleil"),
                                             // /*spanish*/la Canción del Sol
                                             {
-                                            CustomMessage("a regular song", /*german*/"", /*french*/"une chanson normale"),
+                                            CustomMessage("a regular song", /*german*/"ein normales Lied", /*french*/"une chanson normale"),
                                              // /*spanish*/una cancion normal
-                                            CustomMessage("something that can stun", /*german*/"", /*french*/"une chose qui peut paralyser")
+                                            CustomMessage("something that can stun", /*german*/"etwas, das paralysieren kann", /*french*/"une chose qui peut paralyser")
                                              // /*spanish*/algo que pueda paralizar
                                             }, {
-                                            CustomMessage("Sunny Day", /*german*/"", /*french*/"Zénith"),
+                                            CustomMessage("Sunny Day", /*german*/"sonniger Tag", /*french*/"Zénith"),
                                              // /*spanish*/un día soleado
-                                            CustomMessage("the ReDead's bane", /*german*/"", /*french*/"le fléau des Éffrois"),
+                                            CustomMessage("the ReDead's bane", /*german*/"das Verderben der Remorts", /*french*/"le fléau des Éffrois"),
                                              // /*spanish*/la destructora de Redeads
-                                            CustomMessage("the Gibdo's bane", /*german*/"", /*french*/"le fléau des Gibdo")});
+                                            CustomMessage("the Gibdo's bane", /*german*/"das Verderben der Gibdos", /*french*/"le fléau des Gibdo")});
                                              // /*spanish*/la destructora de Gibdos
 
-    hintTextTable[RHT_SONG_OF_TIME] = HintText(CustomMessage("the Song of Time", /*german*/"", /*french*/"le chant du temps"),
+    hintTextTable[RHT_SONG_OF_TIME] = HintText(CustomMessage("the Song of Time", /*german*/"Hymne der Zeit", /*french*/"le chant du temps"),
                                                // /*spanish*/la Canción del tiempo
                                                {
-                                               CustomMessage("a regular song", /*german*/"", /*french*/"une chanson normale")
+                                               CustomMessage("a regular song", /*german*/"ein normales Lied", /*french*/"une chanson normale")
                                                 // /*spanish*/una cancion normal
                                                }, {
-                                               CustomMessage("a song 7 years long", /*german*/"", /*french*/"le flot du temps"),
+                                               CustomMessage("a song 7 years long", /*german*/"ein sieben Jahre langes Lied", /*french*/"le flot du temps"),
                                                 // /*spanish*/la setenada canción
-                                               CustomMessage("the tune of ages", /*german*/"", /*french*/"le Chant des Âges")});
+                                               CustomMessage("the tune of ages", /*german*/"Hymne des Äons", /*french*/"le Chant des Âges")});
                                                 // /*spanish*/la melodía eónica
 
-    hintTextTable[RHT_SONG_OF_STORMS] = HintText(CustomMessage("the Song of Storms", /*german*/"", /*french*/"le chant des tempêtes"),
+    hintTextTable[RHT_SONG_OF_STORMS] = HintText(CustomMessage("the Song of Storms", /*german*/"Hymne des Sturms", /*french*/"le chant des tempêtes"),
                                                  // /*spanish*/la Canción de la Tormenta
                                                  {
-                                                 CustomMessage("a regular song", /*german*/"", /*french*/"une chanson normale")
+                                                 CustomMessage("a regular song", /*german*/"ein normales Lied", /*french*/"une chanson normale")
                                                   // /*spanish*/una cancion normal
                                                  }, {
-                                                 CustomMessage("Rain Dance", /*german*/"", /*french*/"Danse Pluie"),
+                                                 CustomMessage("Rain Dance", /*german*/"Regentanz", /*french*/"Danse Pluie"),
                                                   // /*spanish*/la danza de la lluvia
-                                                 CustomMessage("a thunderstorm tune", /*german*/"", /*french*/"une hymne foudroyante"),
+                                                 CustomMessage("a thunderstorm tune", /*german*/"eine Gewitterhymne", /*french*/"une hymne foudroyante"),
                                                   // /*spanish*/una sonata tormentosa
-                                                 CustomMessage("windmill acceleration", /*german*/"", /*french*/"l'accélérateur de moulins")});
+                                                 CustomMessage("windmill acceleration", /*german*/"Windmühlenbeschleunigung", /*french*/"l'accélérateur de moulins")});
                                                   // /*spanish*/el arranque de molinos
 
-    hintTextTable[RHT_MINUET_OF_FOREST] = HintText(CustomMessage("the Minuet of Forest", /*german*/"", /*french*/"le menuet de la forêt"),
+    hintTextTable[RHT_MINUET_OF_FOREST] = HintText(CustomMessage("the Minuet of Forest", /*german*/"Menuett des Waldes", /*french*/"le menuet de la forêt"),
                                                    // /*spanish*/el Minueto del bosque
                                                    {
-                                                   CustomMessage("a warp song", /*german*/"", /*french*/"une chanson de téléportation")
+                                                   CustomMessage("a warp song", /*german*/"ein Teleportationslied", /*french*/"une chanson de téléportation")
                                                     // /*spanish*/una canción de teletransportación
                                                    }, {
-                                                   CustomMessage("the song of tall trees", /*german*/"", /*french*/"le bruit des arbres"),
+                                                   CustomMessage("the song of tall trees", /*german*/"Lied der großen Bäume", /*french*/"le bruit des arbres"),
                                                     // /*spanish*/la canción de las copas
-                                                   CustomMessage("an arboreal anthem", /*german*/"", /*french*/"l'hymne sylvestre"),
+                                                   CustomMessage("an arboreal anthem", /*german*/"eine baumartige Hymne", /*french*/"l'hymne sylvestre"),
                                                     // /*spanish*/el himno forestal
-                                                   CustomMessage("a green spark trail", /*german*/"", /*french*/"une comète verte")});
+                                                   CustomMessage("a green spark trail", /*german*/"ein grüner Komet", /*french*/"une comète verte")});
                                                     // /*spanish*/el sendero esmeralda
 
-    hintTextTable[RHT_BOLERO_OF_FIRE] = HintText(CustomMessage("the Bolero of Fire", /*german*/"", /*french*/"le boléro du feu"),
+    hintTextTable[RHT_BOLERO_OF_FIRE] = HintText(CustomMessage("the Bolero of Fire", /*german*/"Bolero des Feuers", /*french*/"le boléro du feu"),
                                                  // /*spanish*/el Bolero del fuego
                                                  {
-                                                 CustomMessage("a warp song", /*german*/"", /*french*/"une chanson de téléportation")
+                                                 CustomMessage("a warp song", /*german*/"ein Teleportationslied", /*french*/"une chanson de téléportation")
                                                   // /*spanish*/una canción de teletransportación
                                                  }, {
-                                                 CustomMessage("a song of lethal lava", /*german*/"", /*french*/"une musique enflammée"),
+                                                 CustomMessage("a song of lethal lava", /*german*/"Lied der tödlichen Lava", /*french*/"une musique enflammée"),
                                                   // /*spanish*/la canción de la lava
-                                                 CustomMessage("a red spark trail", /*german*/"", /*french*/"une comète rouge"),
+                                                 CustomMessage("a red spark trail", /*german*/"ein roter Komet", /*french*/"une comète rouge"),
                                                   // /*spanish*/el sendero rubí
-                                                 CustomMessage("a volcanic verse", /*german*/"", /*french*/"le souffle du volcan")});
+                                                 CustomMessage("a volcanic verse", /*german*/"ein vulkanischer Vers", /*french*/"le souffle du volcan")});
                                                   // /*spanish*/el verso volcánico
 
-    hintTextTable[RHT_SERENADE_OF_WATER] = HintText(CustomMessage("the Serenade of Water", /*german*/"", /*french*/"la sérénade de l'eau"),
+    hintTextTable[RHT_SERENADE_OF_WATER] = HintText(CustomMessage("the Serenade of Water", /*german*/"Serenade des Wassers", /*french*/"la sérénade de l'eau"),
                                                     // /*spanish*/la Serenata del agua
                                                     {
-                                                    CustomMessage("a warp song", /*german*/"", /*french*/"une chanson de téléportation")
+                                                    CustomMessage("a warp song", /*german*/"ein Teleportationslied", /*french*/"une chanson de téléportation")
                                                      // /*spanish*/una canción de teletransportación
                                                     }, {
-                                                    CustomMessage("a song of a damp ditch", /*german*/"", /*french*/"le calme de l'eau"),
+                                                    CustomMessage("a song of a damp ditch", /*german*/"die Stille des Wassers", /*french*/"le calme de l'eau"),
                                                      // /*spanish*/la canción del estanque
-                                                    CustomMessage("a blue spark trail", /*german*/"", /*french*/"une comète bleue"),
+                                                    CustomMessage("a blue spark trail", /*german*/"ein blauer Komet", /*french*/"une comète bleue"),
                                                      // /*spanish*/el sendero zafiro
-                                                    CustomMessage("the lake's lyric", /*german*/"", /*french*/"la voix du lac")});
+                                                    CustomMessage("the lake's lyric", /*german*/"die Lyrik des Sees", /*french*/"la voix du lac")});
                                                      // /*spanish*/la letra del lago
 
-    hintTextTable[RHT_REQUIEM_OF_SPIRIT] = HintText(CustomMessage("the Requiem of Spirit", /*german*/"", /*french*/"le requiem des esprits"),
+    hintTextTable[RHT_REQUIEM_OF_SPIRIT] = HintText(CustomMessage("the Requiem of Spirit", /*german*/"Requiem der Geister", /*french*/"le requiem des esprits"),
                                                     // /*spanish*/el Réquiem del espíritu
                                                     {
-                                                    CustomMessage("a warp song", /*german*/"", /*french*/"une chanson de téléportation")
+                                                    CustomMessage("a warp song", /*german*/"ein Teleportationslied", /*french*/"une chanson de téléportation")
                                                      // /*spanish*/una canción de teletransportación
                                                     }, {
-                                                    CustomMessage("a song of sandy statues", /*german*/"", /*french*/"la mélodie d'une grande statue"),
+                                                    CustomMessage("a song of sandy statues", /*german*/"Lied der sandigen Statuen", /*french*/"la mélodie d'une grande statue"),
                                                      // /*spanish*/la canción de la gran estatua
-                                                    CustomMessage("an orange spark trail", /*german*/"", /*french*/"une comète orange"),
+                                                    CustomMessage("an orange spark trail", /*german*/"ein oranger Komet", /*french*/"une comète orange"),
                                                      // /*spanish*/el sendero ámbar
-                                                    CustomMessage("the desert ditty", /*german*/"", /*french*/"le vent du désert")});
+                                                    CustomMessage("the desert ditty", /*german*/"der Wind der Wüste", /*french*/"le vent du désert")});
                                                      // /*spanish*/la estrofa del desierto
 
-    hintTextTable[RHT_NOCTURNE_OF_SHADOW] = HintText(CustomMessage("the Nocturne of Shadow", /*german*/"", /*french*/"le nocturne de l'ombre"),
+    hintTextTable[RHT_NOCTURNE_OF_SHADOW] = HintText(CustomMessage("the Nocturne of Shadow", /*german*/"Nocturne des Schattens", /*french*/"le nocturne de l'ombre"),
                                                      // /*spanish*/el Nocturno de la sombra
                                                      {
-                                                     CustomMessage("a warp song", /*german*/"", /*french*/"une chanson de téléportation")
+                                                     CustomMessage("a warp song", /*german*/"ein Teleportationslied", /*french*/"une chanson de téléportation")
                                                       // /*spanish*/una canción de teletransportación
                                                      }, {
-                                                     CustomMessage("a song of spooky spirits", /*german*/"", /*french*/"une hymne de chair de poule"),
+                                                     CustomMessage("a song of spooky spirits", /*german*/"Lied der spukhaften Geister", /*french*/"une hymne de chair de poule"),
                                                       // /*spanish*/la canción de los espectros
-                                                     CustomMessage("a graveyard boogie", /*german*/"", /*french*/"un boogie de fantômes"),
+                                                     CustomMessage("a graveyard boogie", /*german*/"ein Friedhofsboogie", /*french*/"un boogie de fantômes"),
                                                       // /*spanish*/una honra fúnebre
-                                                     CustomMessage("a haunted hymn", /*german*/"", /*french*/"une chanson lugubre"),
+                                                     CustomMessage("a haunted hymn", /*german*/"eine Spukhymne", /*french*/"une chanson lugubre"),
                                                       // /*spanish*/una estrofa encantada
-                                                     CustomMessage("a purple spark trail", /*german*/"", /*french*/"une comète mauve")});
+                                                     CustomMessage("a purple spark trail", /*german*/"ein violetter Komet", /*french*/"une comète mauve")});
                                                       // /*spanish*/el sendero malva
 
-    hintTextTable[RHT_PRELUDE_OF_LIGHT] = HintText(CustomMessage("the Prelude of Light", /*german*/"", /*french*/"le prélude de la lumière"),
+    hintTextTable[RHT_PRELUDE_OF_LIGHT] = HintText(CustomMessage("the Prelude of Light", /*german*/"Kantate des Lichts", /*french*/"le prélude de la lumière"),
                                                    // /*spanish*/el Preludio de la luz
                                                    {
-                                                   CustomMessage("a warp song", /*german*/"", /*french*/"une chanson de téléportation")
+                                                   CustomMessage("a warp song", /*german*/"ein Teleportationslied", /*french*/"une chanson de téléportation")
                                                     // /*spanish*/una canción de teletransportación
                                                    }, {
-                                                   CustomMessage("a luminous prologue melody", /*german*/"", /*french*/"une matine illuminée"),
+                                                   CustomMessage("a luminous prologue melody", /*german*/"eine leuchtende Melodie", /*french*/"une matine illuminée"),
                                                     // /*spanish*/la melodía refulgente
-                                                   CustomMessage("a yellow spark trail", /*german*/"", /*french*/"une comète jaune"),
+                                                   CustomMessage("a yellow spark trail", /*german*/"ein gelber Komet", /*french*/"une comète jaune"),
                                                     // /*spanish*/el sendero resplandeciente
-                                                   CustomMessage("the temple traveler", /*german*/"", /*french*/"un chant de sanctuaire")});
+                                                   CustomMessage("the temple traveler", /*german*/"ein Tempelreisender", /*french*/"un chant de sanctuaire")});
                                                     // /*spanish*/la ruta del templo
 
-    hintTextTable[RHT_DEKU_TREE_MAP] = HintText(CustomMessage("the Deku Tree Map", /*german*/"", /*french*/"la carte de l'Arbre Mojo"),
+    hintTextTable[RHT_DEKU_TREE_MAP] = HintText(CustomMessage("the Deku Tree Map", /*german*/"die Karte des Deku-Baums", /*french*/"la carte de l'Arbre Mojo"),
                                                 // /*spanish*/el mapa del Gran Árbol Deku
                                                 {
-                                                CustomMessage("a dungeon map", /*german*/"", /*french*/"une carte")
+                                                CustomMessage("a dungeon map", /*german*/"eine Karte", /*french*/"une carte")
                                                  // /*spanish*/un mapa
                                                 }, {
-                                                CustomMessage("a mossy atlas", /*german*/"", /*french*/"un atlas boisé"),
+                                                CustomMessage("a mossy atlas", /*german*/"ein moosiger Atlas", /*french*/"un atlas boisé"),
                                                  // /*spanish*/un atlas musgoso
-                                                CustomMessage("some mossy blueprints", /*german*/"", /*french*/"un plan boisé")});
+                                                CustomMessage("some mossy blueprints", /*german*/"einige moosige Blaupausen", /*french*/"un plan boisé")});
                                                  // /*spanish*/unos planos musgosos
 
-    hintTextTable[RHT_DODONGOS_CAVERN_MAP] = HintText(CustomMessage("the Dodongo's Cavern Map", /*german*/"", /*french*/"la carte de la Caverne Dodongo"),
+    hintTextTable[RHT_DODONGOS_CAVERN_MAP] = HintText(CustomMessage("the Dodongo's Cavern Map", /*german*/"die Karte der Dodongo-Höhle", /*french*/"la carte de la Caverne Dodongo"),
                                                       // /*spanish*/el mapa de la Cueva de los Dodongos
                                                       {
-                                                      CustomMessage("a dungeon map", /*german*/"", /*french*/"une carte")
+                                                      CustomMessage("a dungeon map", /*german*/"eine Karte", /*french*/"une carte")
                                                        // /*spanish*/un mapa
                                                       }, {
-                                                      CustomMessage("a rocky atlas", /*german*/"", /*french*/"un atlas rocheux"),
+                                                      CustomMessage("a rocky atlas", /*german*/"eine felsiger Atlas", /*french*/"un atlas rocheux"),
                                                        // /*spanish*/un atlas rocoso
-                                                      CustomMessage("some rocky blueprints", /*german*/"", /*french*/"un plan rocheux")});
+                                                      CustomMessage("some rocky blueprints", /*german*/"einige felsige Blaupausen", /*french*/"un plan rocheux")});
                                                        // /*spanish*/unos planos rocosos
 
-    hintTextTable[RHT_JABU_JABUS_BELLY_MAP] = HintText(CustomMessage("the Jabu-Jabu's Belly Map", /*german*/"", /*french*/"la carte de Jabu-Jabu"),
+    hintTextTable[RHT_JABU_JABUS_BELLY_MAP] = HintText(CustomMessage("the Jabu-Jabu's Belly Map", /*german*/"die Karte des Jabu-Jabu-Bauchs", /*french*/"la carte de Jabu-Jabu"),
                                                        // /*spanish*/el mapa de la Tripa de Jabu-Jabu
                                                        {
-                                                       CustomMessage("a dungeon map", /*german*/"", /*french*/"une carte")
+                                                       CustomMessage("a dungeon map", /*german*/"eine Karte", /*french*/"une carte")
                                                         // /*spanish*/un mapa
                                                        }, {
-                                                       CustomMessage("a fishy atlas", /*german*/"", /*french*/"un atlas digéré"),
+                                                       CustomMessage("a fishy atlas", /*german*/"ein fischiger Atlas", /*french*/"un atlas digéré"),
                                                         // /*spanish*/un atlas digesto
-                                                       CustomMessage("some fishy blueprints", /*german*/"", /*french*/"un plan digéré")});
+                                                       CustomMessage("some fishy blueprints", /*german*/"einige fischige Blaupausen", /*french*/"un plan digéré")});
                                                         // /*spanish*/unos planos digestos
 
-    hintTextTable[RHT_FOREST_TEMPLE_MAP] = HintText(CustomMessage("the Forest Temple Map", /*german*/"", /*french*/"la carte du Temple de la Forêt"),
+    hintTextTable[RHT_FOREST_TEMPLE_MAP] = HintText(CustomMessage("the Forest Temple Map", /*german*/"die Karte des Waldtempels", /*french*/"la carte du Temple de la Forêt"),
                                                     // /*spanish*/el mapa del Templo del Bosque
                                                     {
-                                                    CustomMessage("a dungeon map", /*german*/"", /*french*/"une carte")
+                                                    CustomMessage("a dungeon map", /*german*/"eine Karte", /*french*/"une carte")
                                                      // /*spanish*/un mapa
                                                     }, {
-                                                    CustomMessage("a sylvan atlas", /*german*/"", /*french*/"un atlas sylvestre"),
+                                                    CustomMessage("a sylvan atlas", /*german*/"ein waldiger Atlas", /*french*/"un atlas sylvestre"),
                                                      // /*spanish*/un atlas enselvado
-                                                    CustomMessage("some sylvan blueprints", /*german*/"", /*french*/"un plan sylvestre")});
+                                                    CustomMessage("some sylvan blueprints", /*german*/"einige waldige Blaupausen", /*french*/"un plan sylvestre")});
                                                      // /*spanish*/unos planos enselvados
 
-    hintTextTable[RHT_FIRE_TEMPLE_MAP] = HintText(CustomMessage("the Fire Temple Map", /*german*/"", /*french*/"la carte du Temple du Feu"),
+    hintTextTable[RHT_FIRE_TEMPLE_MAP] = HintText(CustomMessage("the Fire Temple Map", /*german*/"die Karte des Feuertempels", /*french*/"la carte du Temple du Feu"),
                                                   // /*spanish*/el mapa del Templo del Fuego
                                                   {
-                                                  CustomMessage("a dungeon map", /*german*/"", /*french*/"une carte")
+                                                  CustomMessage("a dungeon map", /*german*/"eine Karte", /*french*/"une carte")
                                                    // /*spanish*/un mapa
                                                   }, {
-                                                  CustomMessage("a molten atlas", /*german*/"", /*french*/"un atlas fondu"),
+                                                  CustomMessage("a molten atlas", /*german*/"ein geschmolzener Atlas", /*french*/"un atlas fondu"),
                                                    // /*spanish*/un atlas fundido
-                                                  CustomMessage("some molten blueprints", /*german*/"", /*french*/"un plan fondu")});
+                                                  CustomMessage("some molten blueprints", /*german*/"einige geschmolzene Blaupausen", /*french*/"un plan fondu")});
                                                    // /*spanish*/unos planos fundidos
 
-    hintTextTable[RHT_WATER_TEMPLE_MAP] = HintText(CustomMessage("the Water Temple Map", /*german*/"", /*french*/"la carte du Temple de l'Eau"),
+    hintTextTable[RHT_WATER_TEMPLE_MAP] = HintText(CustomMessage("the Water Temple Map", /*german*/"die Karte des Wassertempels", /*french*/"la carte du Temple de l'Eau"),
                                                    // /*spanish*/el mapa del Templo del Agua
                                                    {
-                                                   CustomMessage("a dungeon map", /*german*/"", /*french*/"une carte")
+                                                   CustomMessage("a dungeon map", /*german*/"eine Karte", /*french*/"une carte")
                                                     // /*spanish*/un mapa
                                                    }, {
-                                                   CustomMessage("a wet atlas", /*german*/"", /*french*/"un atlas humide"),
+                                                   CustomMessage("a wet atlas", /*german*/"ein nasser Atlas", /*french*/"un atlas humide"),
                                                     // /*spanish*/un atlas mojado
-                                                   CustomMessage("some wet blueprints", /*german*/"", /*french*/"un plan humide")});
+                                                   CustomMessage("some wet blueprints", /*german*/"einige nasse Blaupausen", /*french*/"un plan humide")});
                                                     // /*spanish*/unos planos mojados
 
-    hintTextTable[RHT_SPIRIT_TEMPLE_MAP] = HintText(CustomMessage("the Spirit Temple Map", /*german*/"", /*french*/"la carte du Temple de l'Esprit"),
+    hintTextTable[RHT_SPIRIT_TEMPLE_MAP] = HintText(CustomMessage("the Spirit Temple Map", /*german*/"die Karte des Geistertempels", /*french*/"la carte du Temple de l'Esprit"),
                                                     // /*spanish*/el mapa del Templo del Espíritu
                                                     {
-                                                    CustomMessage("a dungeon map", /*german*/"", /*french*/"une carte")
+                                                    CustomMessage("a dungeon map", /*german*/"eine Karte", /*french*/"une carte")
                                                      // /*spanish*/un mapa
                                                     }, {
-                                                    CustomMessage("a sandy atlas", /*german*/"", /*french*/"un atlas sableux"),
+                                                    CustomMessage("a sandy atlas", /*german*/"ein sandiger Atlas", /*french*/"un atlas sableux"),
                                                      // /*spanish*/un atlas arenoso
-                                                    CustomMessage("some sandy blueprints", /*german*/"", /*french*/"un plan sableux")});
+                                                    CustomMessage("some sandy blueprints", /*german*/"einige sandige Blaupausen", /*french*/"un plan sableux")});
                                                      // /*spanish*/unos planos arenosos
 
-    hintTextTable[RHT_SHADOW_TEMPLE_MAP] = HintText(CustomMessage("the Shadow Temple Map", /*german*/"", /*french*/"la carte du Temple de l'Ombre"),
+    hintTextTable[RHT_SHADOW_TEMPLE_MAP] = HintText(CustomMessage("the Shadow Temple Map", /*german*/"die Karte des Schattentempels", /*french*/"la carte du Temple de l'Ombre"),
                                                     // /*spanish*/el mapa del Templo de las Sombras
                                                     {
-                                                    CustomMessage("a dungeon map", /*german*/"", /*french*/"une carte")
+                                                    CustomMessage("a dungeon map", /*german*/"eine Karte", /*french*/"une carte")
                                                      // /*spanish*/un mapa
                                                     }, {
-                                                    CustomMessage("a creepy atlas", /*german*/"", /*french*/"un atlas sinistre"),
+                                                    CustomMessage("a creepy atlas", /*german*/"eine gruseliger Atlas", /*french*/"un atlas sinistre"),
                                                      // /*spanish*/un atlas siniestra
-                                                    CustomMessage("some creepy blueprints", /*german*/"", /*french*/"un plan sinistre")});
+                                                    CustomMessage("some creepy blueprints", /*german*/"einige gruselige Blaupausen", /*french*/"un plan sinistre")});
                                                      // /*spanish*/unos planos siniestras
 
-    hintTextTable[RHT_BOTTOM_OF_THE_WELL_MAP] = HintText(CustomMessage("the Bottom of the Well Map", /*german*/"", /*french*/"la carte du fond du Puits"),
+    hintTextTable[RHT_BOTTOM_OF_THE_WELL_MAP] = HintText(CustomMessage("the Bottom of the Well Map", /*german*/"die Karte des Grund des Brunnens", /*french*/"la carte du fond du Puits"),
                                                          // /*spanish*/el mapa del Fondo del pozo
                                                          {
-                                                         CustomMessage("a dungeon map", /*german*/"", /*french*/"une carte")
+                                                         CustomMessage("a dungeon map", /*german*/"eine Karte", /*french*/"une carte")
                                                           // /*spanish*/un mapa
                                                          }, {
-                                                         CustomMessage("a moldy atlas", /*german*/"", /*french*/"un atlas moisi"),
+                                                         CustomMessage("a moldy atlas", /*german*/"ein schimmeliger Atlas", /*french*/"un atlas moisi"),
                                                           // /*spanish*/un atlas mohoso
-                                                         CustomMessage("some moldy blueprints", /*german*/"", /*french*/"un plan moisi")});
+                                                         CustomMessage("some moldy blueprints", /*german*/"einige schimmelige Blaupausen", /*french*/"un plan moisi")});
                                                           // /*spanish*/unos planos mohosos
 
-    hintTextTable[RHT_ICE_CAVERN_MAP] = HintText(CustomMessage("the Ice Cavern Map", /*german*/"", /*french*/"la carte de la Caverne Polaire"),
+    hintTextTable[RHT_ICE_CAVERN_MAP] = HintText(CustomMessage("the Ice Cavern Map", /*german*/"die Karte der Eishöhle", /*french*/"la carte de la Caverne Polaire"),
                                                  // /*spanish*/el mapa de la Caverna de hielo
                                                  {
-                                                 CustomMessage("a dungeon map", /*german*/"", /*french*/"une carte")
+                                                 CustomMessage("a dungeon map", /*german*/"eine Karte", /*french*/"une carte")
                                                   // /*spanish*/un mapa
                                                  }, {
-                                                 CustomMessage("a polar atlas", /*german*/"", /*french*/"un atlas polaire"),
+                                                 CustomMessage("a polar atlas", /*german*/"ein polarer Atlas", /*french*/"un atlas polaire"),
                                                   // /*spanish*/un atlas polar
-                                                 CustomMessage("some polar blueprints", /*german*/"", /*french*/"un plan polaire")});
+                                                 CustomMessage("some polar blueprints", /*german*/"einige polare Blaupausen", /*french*/"un plan polaire")});
                                                   // /*spanish*/unos planos polars
 
-    hintTextTable[RHT_DEKU_TREE_COMPASS] = HintText(CustomMessage("the Deku Tree Compass", /*german*/"", /*french*/"la boussole de l'Arbre Mojo"),
+    hintTextTable[RHT_DEKU_TREE_COMPASS] = HintText(CustomMessage("the Deku Tree Compass", /*german*/"der Kompaß des Deku-Baums", /*french*/"la boussole de l'Arbre Mojo"),
                                                     // /*spanish*/la brújula del Gran Árbol Deku
                                                     {
-                                                    CustomMessage("a compass", /*german*/"", /*french*/"une boussole")
+                                                    CustomMessage("a compass", /*german*/"ein Kompaß", /*french*/"une boussole")
                                                      // /*spanish*/una brújula
                                                     }, {
-                                                    CustomMessage("a mossy treasure tracker", /*german*/"", /*french*/"un cherche-trésor boisé"),
+                                                    CustomMessage("a mossy treasure tracker", /*german*/"ein moosiger Schatzfinder", /*french*/"un cherche-trésor boisé"),
                                                      // /*spanish*/un zahorí musgoso
-                                                    CustomMessage("a mossy magnetic needle", /*german*/"", /*french*/"une aimant boisée")});
+                                                    CustomMessage("a mossy magnetic needle", /*german*/"eine moosige Magnetnadel", /*french*/"une aimant boisée")});
                                                      // /*spanish*/un imán musgoso
 
-    hintTextTable[RHT_DODONGOS_CAVERN_COMPASS] = HintText(CustomMessage("the Dodongo's Cavern Compass", /*german*/"", /*french*/"la boussole de la Caverne Dodongo"),
+    hintTextTable[RHT_DODONGOS_CAVERN_COMPASS] = HintText(CustomMessage("the Dodongo's Cavern Compass", /*german*/"der Kompaß der Dodongo-Höhle", /*french*/"la boussole de la Caverne Dodongo"),
                                                           // /*spanish*/la brújula de la Cueva de los Dodongos
                                                           {
-                                                          CustomMessage("a compass", /*german*/"", /*french*/"une boussole")
+                                                          CustomMessage("a compass", /*german*/"ein Kompaß", /*french*/"une boussole")
                                                            // /*spanish*/una brújula
                                                           }, {
-                                                          CustomMessage("a rocky treasure tracker", /*german*/"", /*french*/"un cherche-trésor rocheux"),
+                                                          CustomMessage("a rocky treasure tracker", /*german*/"ein felsiger Schatzfinder", /*french*/"un cherche-trésor rocheux"),
                                                            // /*spanish*/un zahorí rocoso
-                                                          CustomMessage("a rocky magnetic needle", /*german*/"", /*french*/"une aimant rocheux")});
+                                                          CustomMessage("a rocky magnetic needle", /*german*/"eine felsige Magnetnadel", /*french*/"une aimant rocheux")});
                                                            // /*spanish*/un imán rocoso
 
-    hintTextTable[RHT_JABU_JABUS_BELLY_COMPASS] = HintText(CustomMessage("the Jabu-Jabu's Belly Compass", /*german*/"", /*french*/"la boussole de Jabu-Jabu"),
+    hintTextTable[RHT_JABU_JABUS_BELLY_COMPASS] = HintText(CustomMessage("the Jabu-Jabu's Belly Compass", /*german*/"der Kompaß des Jabu-Jabu-Bauchs", /*french*/"la boussole de Jabu-Jabu"),
                                                            // /*spanish*/la brújula de la Tripa de Jabu-Jabu
                                                            {
-                                                           CustomMessage("a compass", /*german*/"", /*french*/"une boussole")
+                                                           CustomMessage("a compass", /*german*/"ein Kompaß", /*french*/"une boussole")
                                                             // /*spanish*/una brújula
                                                            }, {
-                                                           CustomMessage("a fishy treasure tracker", /*german*/"", /*french*/"un cherche-trésor digéré"),
+                                                           CustomMessage("a fishy treasure tracker", /*german*/"ein fischiger Schatzfinder", /*french*/"un cherche-trésor digéré"),
                                                             // /*spanish*/un zahorí digesto
-                                                           CustomMessage("a fishy magnetic needle", /*german*/"", /*french*/"une aimant digéré")});
+                                                           CustomMessage("a fishy magnetic needle", /*german*/"eine fischige Magnetnadel", /*french*/"une aimant digéré")});
                                                             // /*spanish*/un imán digesto
 
-    hintTextTable[RHT_FOREST_TEMPLE_COMPASS] = HintText(CustomMessage("the Forest Temple Compass", /*german*/"", /*french*/"la boussole du Temple de la Forêt"),
+    hintTextTable[RHT_FOREST_TEMPLE_COMPASS] = HintText(CustomMessage("the Forest Temple Compass", /*german*/"der Kompaß des Waldtempels", /*french*/"la boussole du Temple de la Forêt"),
                                                         // /*spanish*/la brújula del Templo del Bosque
                                                         {
-                                                        CustomMessage("a compass", /*german*/"", /*french*/"une boussole")
+                                                        CustomMessage("a compass", /*german*/"ein Kompaß", /*french*/"une boussole")
                                                          // /*spanish*/una brújula
                                                         }, {
-                                                        CustomMessage("a sylvan treasure tracker", /*german*/"", /*french*/"un cherche-trésor sylvestre"),
+                                                        CustomMessage("a sylvan treasure tracker", /*german*/"ein waldiger Schatzfinder", /*french*/"un cherche-trésor sylvestre"),
                                                          // /*spanish*/un zahorí enselvado
-                                                        CustomMessage("a sylvan magnetic needle", /*german*/"", /*french*/"une aimant sylvestre")});
+                                                        CustomMessage("a sylvan magnetic needle", /*german*/"eine waldige Magnetnadel", /*french*/"une aimant sylvestre")});
                                                          // /*spanish*/un imán enselvado
 
-    hintTextTable[RHT_FIRE_TEMPLE_COMPASS] = HintText(CustomMessage("the Fire Temple Compass", /*german*/"", /*french*/"la boussole du Temple du Feu"),
+    hintTextTable[RHT_FIRE_TEMPLE_COMPASS] = HintText(CustomMessage("the Fire Temple Compass", /*german*/"der Kompaß des Feuertempels", /*french*/"la boussole du Temple du Feu"),
                                                       // /*spanish*/la brújula del Templo del Fuego
                                                       {
-                                                      CustomMessage("a compass", /*german*/"", /*french*/"une boussole")
+                                                      CustomMessage("a compass", /*german*/"ein Kompaß", /*french*/"une boussole")
                                                        // /*spanish*/una brújula
                                                       }, {
-                                                      CustomMessage("a molten treasure tracker", /*german*/"", /*french*/"un cherche-trésor fondu"),
+                                                      CustomMessage("a molten treasure tracker", /*german*/"ein geschmolzener Schatzfinder", /*french*/"un cherche-trésor fondu"),
                                                        // /*spanish*/un zahorí fundido
-                                                      CustomMessage("a molten magnetic needle", /*german*/"", /*french*/"une aimant fondu")});
+                                                      CustomMessage("a molten magnetic needle", /*german*/"eine geschmolzene Magnetnadel", /*french*/"une aimant fondu")});
                                                        // /*spanish*/un imán fundido
 
-    hintTextTable[RHT_WATER_TEMPLE_COMPASS] = HintText(CustomMessage("the Water Temple Compass", /*german*/"", /*french*/"la boussole du Temple de l'Eau"),
+    hintTextTable[RHT_WATER_TEMPLE_COMPASS] = HintText(CustomMessage("the Water Temple Compass", /*german*/"der Kompaß des Wassertempels", /*french*/"la boussole du Temple de l'Eau"),
                                                        // /*spanish*/la brújula del Templo del Agua
                                                        {
-                                                       CustomMessage("a compass", /*german*/"", /*french*/"une boussole")
+                                                       CustomMessage("a compass", /*german*/"ein Kompaß", /*french*/"une boussole")
                                                         // /*spanish*/una brújula
                                                        }, {
-                                                       CustomMessage("a wet treasure tracker", /*german*/"", /*french*/"un cherche-trésor humide"),
+                                                       CustomMessage("a wet treasure tracker", /*german*/"ein nasser Schatzfinder", /*french*/"un cherche-trésor humide"),
                                                         // /*spanish*/un zahorí mojado
-                                                       CustomMessage("a wet magnetic needle", /*german*/"", /*french*/"une aimant humide")});
+                                                       CustomMessage("a wet magnetic needle", /*german*/"eine nasse Magnetnadel", /*french*/"une aimant humide")});
                                                         // /*spanish*/un imán mojado
 
-    hintTextTable[RHT_SPIRIT_TEMPLE_COMPASS] = HintText(CustomMessage("the Spirit Temple Compass", /*german*/"", /*french*/"la boussole du Temple de l'Esprit"),
+    hintTextTable[RHT_SPIRIT_TEMPLE_COMPASS] = HintText(CustomMessage("the Spirit Temple Compass", /*german*/"der Kompaß des Geistertempels", /*french*/"la boussole du Temple de l'Esprit"),
                                                         // /*spanish*/la brújula del Templo del Espíritu
                                                         {
-                                                        CustomMessage("a compass", /*german*/"", /*french*/"une boussole")
+                                                        CustomMessage("a compass", /*german*/"ein Kompaß", /*french*/"une boussole")
                                                          // /*spanish*/una brújula
                                                         }, {
-                                                        CustomMessage("a sandy treasure tracker", /*german*/"", /*french*/"un cherche-trésor sableux"),
+                                                        CustomMessage("a sandy treasure tracker", /*german*/"ein sandiger Schatzfinder", /*french*/"un cherche-trésor sableux"),
                                                          // /*spanish*/un zahorí arenoso
-                                                        CustomMessage("a sandy magnetic needle", /*german*/"", /*french*/"une aimant sableux")});
+                                                        CustomMessage("a sandy magnetic needle", /*german*/"eine sandige Magnetnadel", /*french*/"une aimant sableux")});
                                                          // /*spanish*/un imán arenoso
 
-    hintTextTable[RHT_SHADOW_TEMPLE_COMPASS] = HintText(CustomMessage("the Shadow Temple Compass", /*german*/"", /*french*/"la boussole du Temple de l'Ombre"),
+    hintTextTable[RHT_SHADOW_TEMPLE_COMPASS] = HintText(CustomMessage("the Shadow Temple Compass", /*german*/"der Kompaß des Schattentempels", /*french*/"la boussole du Temple de l'Ombre"),
                                                         // /*spanish*/la brújula del Templo de las Sombras
                                                         {
-                                                        CustomMessage("a compass", /*german*/"", /*french*/"une boussole")
+                                                        CustomMessage("a compass", /*german*/"ein Kompaß", /*french*/"une boussole")
                                                          // /*spanish*/una brújula
                                                         }, {
-                                                        CustomMessage("a creepy treasure tracker", /*german*/"", /*french*/"un cherche-trésor sinistre"),
+                                                        CustomMessage("a creepy treasure tracker", /*german*/"ein gruseliger Schatzfinder", /*french*/"un cherche-trésor sinistre"),
                                                          // /*spanish*/un zahorí siniestra
-                                                        CustomMessage("a creepy magnetic needle", /*german*/"", /*french*/"une aimant sinistre")});
+                                                        CustomMessage("a creepy magnetic needle", /*german*/"eine gruselige Magnetnadel", /*french*/"une aimant sinistre")});
                                                          // /*spanish*/un imán siniestra
 
-    hintTextTable[RHT_BOTTOM_OF_THE_WELL_COMPASS] = HintText(CustomMessage("the Bottom of the Well Compass", /*german*/"", /*french*/"la boussole du fond du Puits"),
+    hintTextTable[RHT_BOTTOM_OF_THE_WELL_COMPASS] = HintText(CustomMessage("the Bottom of the Well Compass", /*german*/"der Kompaß des Grund des Brunnens", /*french*/"la boussole du fond du Puits"),
                                                              // /*spanish*/la brújula del Fondo del pozo
                                                              {
-                                                             CustomMessage("a compass", /*german*/"", /*french*/"une boussole")
+                                                             CustomMessage("a compass", /*german*/"ein Kompaß", /*french*/"une boussole")
                                                               // /*spanish*/una brújula
                                                              }, {
-                                                             CustomMessage("a dank treasure tracker", /*german*/"", /*french*/"un cherche-trésor moisi"),
+                                                             CustomMessage("a dank treasure tracker", /*german*/"ein feuchter Schatzfinder", /*french*/"un cherche-trésor moisi"),
                                                               // /*spanish*/un zahorí mohoso
-                                                             CustomMessage("a dank magnetic needle", /*german*/"", /*french*/"une aimant moisi")});
+                                                             CustomMessage("a dank magnetic needle", /*german*/"eine feuchte Magnetnadel", /*french*/"une aimant moisi")});
                                                               // /*spanish*/un imán mohoso
 
-    hintTextTable[RHT_ICE_CAVERN_COMPASS] = HintText(CustomMessage("the Ice Cavern Compass", /*german*/"", /*french*/"la Boussole de la Caverne Polaire"),
+    hintTextTable[RHT_ICE_CAVERN_COMPASS] = HintText(CustomMessage("the Ice Cavern Compass", /*german*/"der Kompaß der Eishöhle", /*french*/"la Boussole de la Caverne Polaire"),
                                                      // /*spanish*/la brújula de la Caverna de hielo
                                                      {
-                                                     CustomMessage("a compass", /*german*/"", /*french*/"une boussole")
+                                                     CustomMessage("a compass", /*german*/"ein Kompaß", /*french*/"une boussole")
                                                       // /*spanish*/una brújula
                                                      }, {
-                                                     CustomMessage("a polar treasure tracker", /*german*/"", /*french*/"un cherche-trésor polaire"),
+                                                     CustomMessage("a polar treasure tracker", /*german*/"ein polarer Schatzfinder", /*french*/"un cherche-trésor polaire"),
                                                       // /*spanish*/un zahorí polar
-                                                     CustomMessage("a polar magnetic needle", /*german*/"", /*french*/"une aimant polaire")});
+                                                     CustomMessage("a polar magnetic needle", /*german*/"eine polare Magnetnadel", /*french*/"une aimant polaire")});
                                                       // /*spanish*/un imán polar
 
-    hintTextTable[RHT_FOREST_TEMPLE_BOSS_KEY] = HintText(CustomMessage("the Forest Temple Boss Key", /*german*/"", /*french*/"la Clé d'Or du Temple de la Forêt"),
+    hintTextTable[RHT_FOREST_TEMPLE_BOSS_KEY] = HintText(CustomMessage("the Forest Temple Boss Key", /*german*/"der Waldtempel-Master-Schlüssel", /*french*/"la Clé d'Or du Temple de la Forêt"),
                                                          // /*spanish*/la gran llave del Templo del Bosque
                                                          {
-                                                         CustomMessage("a boss key", /*german*/"", /*french*/"une Clé d'Or")
+                                                         CustomMessage("a boss key", /*german*/"ein Master-Schlüssel", /*french*/"une Clé d'Or")
                                                           // /*spanish*/una gran llave
                                                          }, {
-                                                         CustomMessage("a sylvan master of unlocking", /*german*/"", /*french*/"un anti-grosse porte sylvestre"),
+                                                         CustomMessage("a sylvan master of unlocking", /*german*/"ein waldiger Meister des Entschlüsselns", /*french*/"un anti-grosse porte sylvestre"),
                                                           // /*spanish*/la clave enselvada de un jefe
-                                                         CustomMessage("a sylvan dungeon's master pass", /*german*/"", /*french*/"une clé maléfique sylvestree")});
+                                                         CustomMessage("a sylvan dungeon's master pass", /*german*/"ein waldiger Dungeon-Meisterpass", /*french*/"une clé maléfique sylvestre")});
                                                           // /*spanish*/el pase maestro enselvado
 
-    hintTextTable[RHT_FIRE_TEMPLE_BOSS_KEY] = HintText(CustomMessage("the Fire Temple Boss Key", /*german*/"", /*french*/"la Clé d'Or du Temple du Feu"),
+    hintTextTable[RHT_FIRE_TEMPLE_BOSS_KEY] = HintText(CustomMessage("the Fire Temple Boss Key", /*german*/"der Feuertempel-Master-Schlüssel", /*french*/"la Clé d'Or du Temple du Feu"),
                                                        // /*spanish*/la gran llave del Templo del Fuego
                                                        {
-                                                       CustomMessage("a boss key", /*german*/"", /*french*/"une Clé d'Or")
+                                                       CustomMessage("a boss key", /*german*/"ein Master-Schlüssel", /*french*/"une Clé d'Or")
                                                         // /*spanish*/una gran llave
                                                        }, {
-                                                       CustomMessage("a molten master of unlocking", /*german*/"", /*french*/"un anti-grosse porte fondu"),
+                                                       CustomMessage("a molten master of unlocking", /*german*/"ein geschmolzener Meister des Entschlüsselns", /*french*/"un anti-grosse porte fondu"),
                                                         // /*spanish*/la clave fundido de un jefe
-                                                       CustomMessage("a molten dungeon's master pass", /*german*/"", /*french*/"une clé maléfique fondu")});
+                                                       CustomMessage("a molten dungeon's master pass", /*german*/"ein geschmolzener Dungeon-Meisterpass", /*french*/"une clé maléfique fondu")});
                                                         // /*spanish*/el pase maestro fundido
 
-    hintTextTable[RHT_WATER_TEMPLE_BOSS_KEY] = HintText(CustomMessage("the Water Temple Boss Key", /*german*/"", /*french*/"la Clé d'Or du Temple de l'Eau"),
+    hintTextTable[RHT_WATER_TEMPLE_BOSS_KEY] = HintText(CustomMessage("the Water Temple Boss Key", /*german*/"der Wassertempel-Master-Schlüssel", /*french*/"la Clé d'Or du Temple de l'Eau"),
                                                         // /*spanish*/la gran llave del Templo del Agua
                                                         {
-                                                        CustomMessage("a boss key", /*german*/"", /*french*/"une Clé d'Or")
+                                                        CustomMessage("a boss key", /*german*/"ein Master-Schlüssel", /*french*/"une Clé d'Or")
                                                          // /*spanish*/una gran llave
                                                         }, {
-                                                        CustomMessage("a wet master of unlocking", /*german*/"", /*french*/"un anti-grosse porte humide"),
+                                                        CustomMessage("a wet master of unlocking", /*german*/"ein nasser Meister des Entschlüsselns", /*french*/"un anti-grosse porte humide"),
                                                          // /*spanish*/la clave mojado de un jefe
-                                                        CustomMessage("a wet dungeon's master pass", /*german*/"", /*french*/"une clé maléfique humide")});
+                                                        CustomMessage("a wet dungeon's master pass", /*german*/"ein nasser Dungeon-Meisterpass", /*french*/"une clé maléfique humide")});
                                                          // /*spanish*/el pase maestro mojado
 
-    hintTextTable[RHT_SPIRIT_TEMPLE_BOSS_KEY] = HintText(CustomMessage("the Spirit Temple Boss Key", /*german*/"", /*french*/"la Clé d'Or du Temple de l'Esprit"),
+    hintTextTable[RHT_SPIRIT_TEMPLE_BOSS_KEY] = HintText(CustomMessage("the Spirit Temple Boss Key", /*german*/"der Geistertempel-Master-Schlüssel", /*french*/"la Clé d'Or du Temple de l'Esprit"),
                                                          // /*spanish*/la gran llave del Templo del Espíritu
                                                          {
-                                                         CustomMessage("a boss key", /*german*/"", /*french*/"une Clé d'Or")
+                                                         CustomMessage("a boss key", /*german*/"ein Master-Schlüssel", /*french*/"une Clé d'Or")
                                                           // /*spanish*/una gran llave
                                                          }, {
-                                                         CustomMessage("a sandy master of unlocking", /*german*/"", /*french*/"un anti-grosse porte sableux"),
+                                                         CustomMessage("a sandy master of unlocking", /*german*/"ein sandiger Meister des Entschlüsselns", /*french*/"un anti-grosse porte sableux"),
                                                           // /*spanish*/la clave arenoso de un jefe
-                                                         CustomMessage("a sandy dungeon's master pass", /*german*/"", /*french*/"une clé maléfique sableux")});
+                                                         CustomMessage("a sandy dungeon's master pass", /*german*/"ein sandiger Dungeon-Meisterpass", /*french*/"une clé maléfique sableux")});
                                                           // /*spanish*/el pase maestro arenoso
 
-    hintTextTable[RHT_SHADOW_TEMPLE_BOSS_KEY] = HintText(CustomMessage("the Shadow Temple Boss Key", /*german*/"", /*french*/"la Clé d'Or du Temple de l'Ombre"),
+    hintTextTable[RHT_SHADOW_TEMPLE_BOSS_KEY] = HintText(CustomMessage("the Shadow Temple Boss Key", /*german*/"der Schattentempel-Master-Schlüssel", /*french*/"la Clé d'Or du Temple de l'Ombre"),
                                                          // /*spanish*/la gran llave del Templo de las Sombras
                                                          {
-                                                         CustomMessage("a boss key", /*german*/"", /*french*/"une Clé d'Or")
+                                                         CustomMessage("a boss key", /*german*/"ein Master-Schlüssel", /*french*/"une Clé d'Or")
                                                           // /*spanish*/una gran llave
                                                          }, {
-                                                         CustomMessage("a creepy master of unlocking", /*german*/"", /*french*/"un anti-grosse porte sinistre"),
+                                                         CustomMessage("a creepy master of unlocking", /*german*/"ein gruseliger Meister des Entschlüsselns", /*french*/"un anti-grosse porte sinistre"),
                                                           // /*spanish*/la clave siniestra de un jefe
-                                                         CustomMessage("a creepy dungeon's master pass", /*german*/"", /*french*/"une clé maléfique sinistre")});
+                                                         CustomMessage("a creepy dungeon's master pass", /*german*/"ein gruseliger Dungeon-Meisterpass", /*french*/"une clé maléfique sinistre")});
                                                           // /*spanish*/el pase maestro siniestra
 
-    hintTextTable[RHT_GANONS_CASTLE_BOSS_KEY] = HintText(CustomMessage("the Ganon's Castle Boss Key", /*german*/"", /*french*/"la Clé d'Or du Château de Ganon"),
+    hintTextTable[RHT_GANONS_CASTLE_BOSS_KEY] = HintText(CustomMessage("the Ganon's Castle Boss Key", /*german*/"der Master-Schlüssel für Ganons Schloß", /*french*/"la Clé d'Or du Château de Ganon"),
                                                          // /*spanish*/la gran llave del Castillo de Ganon
                                                          {
-                                                         CustomMessage("a boss key", /*german*/"", /*french*/"une Clé d'Or")
+                                                         CustomMessage("a boss key", /*german*/"ein Master-Schlüssel", /*french*/"une Clé d'Or")
                                                           // /*spanish*/una gran llave
                                                          }, {
-                                                         CustomMessage("a final master of unlocking", /*german*/"", /*french*/"un anti-grosse porte final"),
+                                                         CustomMessage("a final master of unlocking", /*german*/"ein finaler Meister des Entschlüsselns", /*french*/"un anti-grosse porte final"),
                                                           // /*spanish*/la clave final de un jefe
-                                                         CustomMessage("a final dungeon's master pass", /*german*/"", /*french*/"une clé maléfique final")});
+                                                         CustomMessage("a final dungeon's master pass", /*german*/"ein finaler Dungeon-Meisterpass", /*french*/"une clé maléfique final")});
                                                           // /*spanish*/el pase maestro final
 
-    hintTextTable[RHT_FOREST_TEMPLE_SMALL_KEY] = HintText(CustomMessage("a Forest Temple Small Key", /*german*/"", /*french*/"une petite clé du Temple de la Forêt"),
+    hintTextTable[RHT_FOREST_TEMPLE_SMALL_KEY] = HintText(CustomMessage("a Forest Temple Small Key", /*german*/"ein kleiner Waldtempel-Schlüssel", /*french*/"une petite clé du Temple de la Forêt"),
                                                           // /*spanish*/una llave pequeña del Templo del Bosque
                                                           {
-                                                          CustomMessage("a small key", /*german*/"", /*french*/"une petite clé")
+                                                          CustomMessage("a small key", /*german*/"ein kleiner Schlüssel", /*french*/"une petite clé")
                                                            // /*spanish*/una llave pequeña
                                                           }, {
-                                                          CustomMessage("a sylvan tool for unlocking", /*german*/"", /*french*/"un anti-porte sylvestre"),
+                                                          CustomMessage("a sylvan tool for unlocking", /*german*/"ein waldiges Werkzeug zur Entschlüsselung", /*french*/"un anti-porte sylvestre"),
                                                            // /*spanish*/una clave de una entrada enselvada
-                                                          CustomMessage("a sylvan dungeon pass", /*german*/"", /*french*/"le rêve sylvestre d'un prisonnier"),
+                                                          CustomMessage("a sylvan dungeon pass", /*german*/"ein waldiger Dungeon-Pass", /*french*/"le rêve sylvestre d'un prisonnier"),
                                                            // /*spanish*/un pase de una mazmorra enselvada
-                                                          CustomMessage("a sylvan lock remover", /*german*/"", /*french*/"un efface-serrure sylvestre"),
+                                                          CustomMessage("a sylvan lock remover", /*german*/"ein waldiger Schlossentferner", /*french*/"un efface-serrure sylvestre"),
                                                            // /*spanish*/un destructor de cerraduras enselvada
-                                                          CustomMessage("a sylvan lockpick", /*german*/"", /*french*/"un crochet à porte sylvestre")});
+                                                          CustomMessage("a sylvan lockpick", /*german*/"ein waldiger Dietrich", /*french*/"un crochet à porte sylvestre")});
                                                            // /*spanish*/una apertura portentosa enselvada
 
-    hintTextTable[RHT_FIRE_TEMPLE_SMALL_KEY] = HintText(CustomMessage("a Fire Temple Small Key", /*german*/"", /*french*/"une petite clé du Temple du Feu"),
+    hintTextTable[RHT_FIRE_TEMPLE_SMALL_KEY] = HintText(CustomMessage("a Fire Temple Small Key", /*german*/"ein kleiner Feuertempel-Schlüssel", /*french*/"une petite clé du Temple du Feu"),
                                                         // /*spanish*/una llave pequeña del Templo del Fuego
                                                         {
-                                                        CustomMessage("a small key", /*german*/"", /*french*/"une petite clé")
+                                                        CustomMessage("a small key", /*german*/"ein kleiner Schlüssel", /*french*/"une petite clé")
                                                          // /*spanish*/una llave pequeña
                                                         }, {
-                                                        CustomMessage("a molten tool for unlocking", /*german*/"", /*french*/"un anti-porte fondu"),
+                                                        CustomMessage("a molten tool for unlocking", /*german*/"ein geschmolzenes Werkzeug zur Entschlüsselung", /*french*/"un anti-porte fondu"),
                                                          // /*spanish*/una clave de una entrada fundida
-                                                        CustomMessage("a molten dungeon pass", /*german*/"", /*french*/"le rêve fondu d'un prisonnier"),
+                                                        CustomMessage("a molten dungeon pass", /*german*/"ein geschmolzener Dungeon-Pass", /*french*/"le rêve fondu d'un prisonnier"),
                                                          // /*spanish*/un pase de una mazmorra fundida
-                                                        CustomMessage("a molten lock remover", /*german*/"", /*french*/"un efface-serrure fondu"),
+                                                        CustomMessage("a molten lock remover", /*german*/"ein geschmolzener Schlossentferner", /*french*/"un efface-serrure fondu"),
                                                          // /*spanish*/un destructor de cerraduras fundida
-                                                        CustomMessage("a molten lockpick", /*german*/"", /*french*/"un crochet à porte fondu")});
+                                                        CustomMessage("a molten lockpick", /*german*/"ein geschmolzener Dietrich", /*french*/"un crochet à porte fondu")});
                                                          // /*spanish*/una apertura portentosa fundida
 
-    hintTextTable[RHT_WATER_TEMPLE_SMALL_KEY] = HintText(CustomMessage("a Water Temple Small Key", /*german*/"", /*french*/"une petite clé du Temple de l'Eau"),
+    hintTextTable[RHT_WATER_TEMPLE_SMALL_KEY] = HintText(CustomMessage("a Water Temple Small Key", /*german*/"ein kleiner Wassertempel-Schlüssel", /*french*/"une petite clé du Temple de l'Eau"),
                                                          // /*spanish*/una llave pequeña del Templo del Agua
                                                          {
-                                                         CustomMessage("a small key", /*german*/"", /*french*/"une petite clé")
+                                                         CustomMessage("a small key", /*german*/"ein kleiner Schlüssel", /*french*/"une petite clé")
                                                           // /*spanish*/una llave pequeña
                                                          }, {
-                                                         CustomMessage("a wet tool for unlocking", /*german*/"", /*french*/"un anti-porte humide"),
+                                                         CustomMessage("a wet tool for unlocking", /*german*/"ein nasses Werkzeug zur Entschlüsselung", /*french*/"un anti-porte humide"),
                                                           // /*spanish*/una clave de una entrada mojada
-                                                         CustomMessage("a wet dungeon pass", /*german*/"", /*french*/"le rêve humide d'un prisonnier"),
+                                                         CustomMessage("a wet dungeon pass", /*german*/"ein nasser Dungeon-Pass", /*french*/"le rêve humide d'un prisonnier"),
                                                           // /*spanish*/un pase de una mazmorra mojada
-                                                         CustomMessage("a wet lock remover", /*german*/"", /*french*/"un efface-serrure humide"),
+                                                         CustomMessage("a wet lock remover", /*german*/"ein nasser Schlossentferner", /*french*/"un efface-serrure humide"),
                                                           // /*spanish*/un destructor de cerraduras mojada
-                                                         CustomMessage("a wet lockpick", /*german*/"", /*french*/"un crochet à porte humide")});
+                                                         CustomMessage("a wet lockpick", /*german*/"ein nasser Dietrich", /*french*/"un crochet à porte humide")});
                                                           // /*spanish*/una apertura portentosa mojada
 
-    hintTextTable[RHT_SPIRIT_TEMPLE_SMALL_KEY] = HintText(CustomMessage("a Spirit Temple Small Key", /*german*/"", /*french*/"une petite clé du Temple de l'Esprit"),
+    hintTextTable[RHT_SPIRIT_TEMPLE_SMALL_KEY] = HintText(CustomMessage("a Spirit Temple Small Key", /*german*/"ein kleiner Geistertempel-Schlüssel", /*french*/"une petite clé du Temple de l'Esprit"),
                                                           // /*spanish*/una llave pequeña del Templo del Espíritu
                                                           {
-                                                          CustomMessage("a small key", /*german*/"", /*french*/"une petite clé")
+                                                          CustomMessage("a small key", /*german*/"ein kleiner Schlüssel", /*french*/"une petite clé")
                                                            // /*spanish*/una llave pequeña
                                                           }, {
-                                                          CustomMessage("a sandy tool for unlocking", /*german*/"", /*french*/"un anti-porte sableux"),
+                                                          CustomMessage("a sandy tool for unlocking", /*german*/"ein sandiges Werkzeug zur Entschlüsselung", /*french*/"un anti-porte sableux"),
                                                            // /*spanish*/una clave de una entrada arenosa
-                                                          CustomMessage("a sandy dungeon pass", /*german*/"", /*french*/"le rêve sableux d'un prisonnier"),
+                                                          CustomMessage("a sandy dungeon pass", /*german*/"ein sandiger Dungeon-Pass", /*french*/"le rêve sableux d'un prisonnier"),
                                                            // /*spanish*/un pase de una mazmorra arenosa
-                                                          CustomMessage("a sandy lock remover", /*german*/"", /*french*/"un efface-serrure sableux"),
+                                                          CustomMessage("a sandy lock remover", /*german*/"ein sandiger Schlossentferner", /*french*/"un efface-serrure sableux"),
                                                            // /*spanish*/un destructor de cerraduras arenosa
-                                                          CustomMessage("a sandy lockpick", /*german*/"", /*french*/"un crochet à porte sableux")});
+                                                          CustomMessage("a sandy lockpick", /*german*/"ein sandiger Dietrich", /*french*/"un crochet à porte sableux")});
                                                            // /*spanish*/una apertura portentosa arenosa
 
-    hintTextTable[RHT_SHADOW_TEMPLE_SMALL_KEY] = HintText(CustomMessage("a Shadow Temple Small Key", /*german*/"", /*french*/"une petite clé du Temple de l'Ombre"),
+    hintTextTable[RHT_SHADOW_TEMPLE_SMALL_KEY] = HintText(CustomMessage("a Shadow Temple Small Key", /*german*/"ein kleiner Schattentempel-Schlüssel", /*french*/"une petite clé du Temple de l'Ombre"),
                                                           // /*spanish*/una llave pequeña del Templo de las Sombras
                                                           {
-                                                          CustomMessage("a small key", /*german*/"", /*french*/"une petite clé")
+                                                          CustomMessage("a small key", /*german*/"ein kleiner Schlüssel", /*french*/"une petite clé")
                                                            // /*spanish*/una llave pequeña
                                                           }, {
-                                                          CustomMessage("a creepy tool for unlocking", /*german*/"", /*french*/"un anti-porte sinistre"),
+                                                          CustomMessage("a creepy tool for unlocking", /*german*/"ein gruseliges Werkzeug zur Entschlüsselung", /*french*/"un anti-porte sinistre"),
                                                            // /*spanish*/una clave de una entrada siniestra:a
-                                                          CustomMessage("a creepy dungeon pass", /*german*/"", /*french*/"le rêve sinistre d'un prisonnier"),
+                                                          CustomMessage("a creepy dungeon pass", /*german*/"ein gruseliger Dungeon-Pass", /*french*/"le rêve sinistre d'un prisonnier"),
                                                            // /*spanish*/un pase de una mazmorra siniestra:a
-                                                          CustomMessage("a creepy lock remover", /*german*/"", /*french*/"un efface-serrure sinistre"),
+                                                          CustomMessage("a creepy lock remover", /*german*/"ein gruseliger Schlossentferner", /*french*/"un efface-serrure sinistre"),
                                                            // /*spanish*/un destructor de cerraduras siniestra:a
-                                                          CustomMessage("a creepy lockpick", /*german*/"", /*french*/"un crochet à porte sinistre")});
+                                                          CustomMessage("a creepy lockpick", /*german*/"ein gruseliger Dietrich", /*french*/"un crochet à porte sinistre")});
                                                            // /*spanish*/una apertura portentosa siniestra:a
 
-    hintTextTable[RHT_GERUDO_TRAINING_GROUNDS_SMALL_KEY] = HintText(CustomMessage("a Gerudo Training Ground Small Key", /*german*/"", /*french*/"une petite clé du Gymnase Gerudo"),
+    hintTextTable[RHT_GERUDO_TRAINING_GROUNDS_SMALL_KEY] = HintText(CustomMessage("a Gerudo Training Ground Small Key", /*german*/"ein kleiner Schlüssel des Gerudo-Trainingsgeländes", /*french*/"une petite clé du Gymnase Gerudo"),
                                                                     // /*spanish*/una llave pequeña del Centro de Instrucción Gerudo
                                                                     {
-                                                                    CustomMessage("a small key", /*german*/"", /*french*/"une petite clé")
+                                                                    CustomMessage("a small key", /*german*/"ein kleiner Schlüssel", /*french*/"une petite clé")
                                                                      // /*spanish*/una llave pequeña
                                                                     }, {
-                                                                    CustomMessage("a labyrinthian tool for unlocking", /*german*/"", /*french*/"un anti-porte labyrinthique"),
+                                                                    CustomMessage("a labyrinthian tool for unlocking", /*german*/"ein labyrinthisches Werkzeug zur Entschlüsselung", /*french*/"un anti-porte labyrinthique"),
                                                                      // /*spanish*/una clave de una entrada laberíntica
-                                                                    CustomMessage("a labyrinthian dungeon pass", /*german*/"", /*french*/"le rêve labyrinthique d'un prisonnier"),
+                                                                    CustomMessage("a labyrinthian dungeon pass", /*german*/"ein labyrinthischer Dungeon-Pass", /*french*/"le rêve labyrinthique d'un prisonnier"),
                                                                      // /*spanish*/un pase de una mazmorra laberíntica
-                                                                    CustomMessage("a labyrinthian lock remover", /*german*/"", /*french*/"un efface-serrure labyrinthique"),
+                                                                    CustomMessage("a labyrinthian lock remover", /*german*/"ein labyrinthischer Schlossentferner", /*french*/"un efface-serrure labyrinthique"),
                                                                      // /*spanish*/un destructor de cerraduras laberíntica
-                                                                    CustomMessage("a labyrinthian lockpick", /*german*/"", /*french*/"un crochet à porte labyrinthique")});
+                                                                    CustomMessage("a labyrinthian lockpick", /*german*/"ein labyrinthischer Dietrich", /*french*/"un crochet à porte labyrinthique")});
                                                                      // /*spanish*/una apertura portentosa laberíntica
 
-    hintTextTable[RHT_GERUDO_FORTRESS_SMALL_KEY] = HintText(CustomMessage("a Gerudo Fortress Small Key", /*german*/"", /*french*/"une petite clé de la Repaire des Voleurs"),
+    hintTextTable[RHT_GERUDO_FORTRESS_SMALL_KEY] = HintText(CustomMessage("a Gerudo Fortress Small Key", /*german*/"ein kleiner Schlüssel für die Gerudo-Festung", /*french*/"une petite clé de la Repaire des Voleurs"),
                                                             // /*spanish*/una llave pequeña de la Fortaleza Gerudo
                                                             {
-                                                            CustomMessage("a small key", /*german*/"", /*french*/"une petite clé")
+                                                            CustomMessage("a small key", /*german*/"ein kleiner Schlüssel", /*french*/"une petite clé")
                                                              // /*spanish*/una llave pequeña
                                                             }, {
-                                                            CustomMessage("an imprisoned tool for unlocking", /*german*/"", /*french*/"un anti-porte emprisonné"),
+                                                            CustomMessage("an imprisoned tool for unlocking", /*german*/"ein gefangenes Werkzeug zur Entschlüsselung", /*french*/"un anti-porte emprisonné"),
                                                              // /*spanish*/una clave de una entrada encarcelada
-                                                            CustomMessage("an imprisoned dungeon pass", /*german*/"", /*french*/"le rêve emprisonné d'un prisonnier"),
+                                                            CustomMessage("an imprisoned dungeon pass", /*german*/"ein gefangener Dungeon-Pass", /*french*/"le rêve emprisonné d'un prisonnier"),
                                                              // /*spanish*/un pase de una mazmorra encarcelada
-                                                            CustomMessage("an imprisoned lock remover", /*german*/"", /*french*/"un efface-serrure emprisonné"),
+                                                            CustomMessage("an imprisoned lock remover", /*german*/"ein gefangener Schlossentferner", /*french*/"un efface-serrure emprisonné"),
                                                              // /*spanish*/un destructor de cerraduras encarcelada
-                                                            CustomMessage("an imprisoned lockpick", /*german*/"", /*french*/"un crochet à porte emprisonné")});
+                                                            CustomMessage("an imprisoned lockpick", /*german*/"ein gefangener Dietrich", /*french*/"un crochet à porte emprisonné")});
                                                              // /*spanish*/una apertura portentosa encarcelada
 
-    hintTextTable[RHT_BOTTOM_OF_THE_WELL_SMALL_KEY] = HintText(CustomMessage("a Bottom of the Well Small Key", /*german*/"", /*french*/"une petite clé du fond du Puits"),
+    hintTextTable[RHT_BOTTOM_OF_THE_WELL_SMALL_KEY] = HintText(CustomMessage("a Bottom of the Well Small Key", /*german*/"ein kleiner Schlüssel des Grund des Brunnens", /*french*/"une petite clé du fond du Puits"),
                                                                // /*spanish*/una llave pequeña del Fondo del pozo
                                                                {
-                                                               CustomMessage("a small key", /*german*/"", /*french*/"une petite clé")
+                                                               CustomMessage("a small key", /*german*/"ein kleiner Schlüssel", /*french*/"une petite clé")
                                                                 // /*spanish*/una llave pequeña
                                                                }, {
-                                                               CustomMessage("a moldy tool for unlocking", /*german*/"", /*french*/"un anti-porte moisi"),
+                                                               CustomMessage("a moldy tool for unlocking", /*german*/"ein schimmeliges Werkzeug zur Entschlüsselung", /*french*/"un anti-porte moisi"),
                                                                 // /*spanish*/una clave de una entrada mohosa
-                                                               CustomMessage("a moldy dungeon pass", /*german*/"", /*french*/"le rêve moisi d'un prisonnier"),
+                                                               CustomMessage("a moldy dungeon pass", /*german*/"ein schimmeliger Dungeon-Pass", /*french*/"le rêve moisi d'un prisonnier"),
                                                                 // /*spanish*/un pase de una mazmorra mohosa
-                                                               CustomMessage("a moldy lock remover", /*german*/"", /*french*/"un efface-serrure moisi"),
+                                                               CustomMessage("a moldy lock remover", /*german*/"ein schimmeliger Schlossentferner", /*french*/"un efface-serrure moisi"),
                                                                 // /*spanish*/un destructor de cerraduras mohosa
-                                                               CustomMessage("a moldy lockpick", /*german*/"", /*french*/"un crochet à porte moisi")});
+                                                               CustomMessage("a moldy lockpick", /*german*/"ein schimmeliger Dietrich", /*french*/"un crochet à porte moisi")});
                                                                 // /*spanish*/una apertura portentosa mohosa
 
-    hintTextTable[RHT_GANONS_CASTLE_SMALL_KEY] = HintText(CustomMessage("a Ganon's Castle Small Key", /*german*/"", /*french*/"une petite clé du Château de Ganon"),
+    hintTextTable[RHT_GANONS_CASTLE_SMALL_KEY] = HintText(CustomMessage("a Ganon's Castle Small Key", /*german*/"ein kleiner Schlüssel für Ganons Schloß", /*french*/"une petite clé du Château de Ganon"),
                                                           // /*spanish*/una llave pequeña del Castillo de Ganon
                                                           {
-                                                          CustomMessage("a small key", /*german*/"", /*french*/"une petite clé")
+                                                          CustomMessage("a small key", /*german*/"ein kleiner Schlüssel", /*french*/"une petite clé")
                                                            // /*spanish*/una llave pequeña
                                                           }, {
-                                                          CustomMessage("a final tool for unlocking", /*german*/"", /*french*/"un anti-porte final"),
+                                                          CustomMessage("a final tool for unlocking", /*german*/"ein finales Werkzeug zur Entschlüsselung", /*french*/"un anti-porte final"),
                                                            // /*spanish*/una clave de una entrada final
-                                                          CustomMessage("a final dungeon pass", /*german*/"", /*french*/"le rêve final d'un prisonnier"),
+                                                          CustomMessage("a final dungeon pass", /*german*/"ein finaler Dungeon-Pass", /*french*/"le rêve final d'un prisonnier"),
                                                            // /*spanish*/un pase de una mazmorra final
-                                                          CustomMessage("a final lock remover", /*german*/"", /*french*/"un efface-serrure final"),
+                                                          CustomMessage("a final lock remover", /*german*/"ein finaler Schlossentferner", /*french*/"un efface-serrure final"),
                                                            // /*spanish*/un destructor de cerraduras final
-                                                          CustomMessage("a final lockpick", /*german*/"", /*french*/"un crochet à porte final")});
+                                                          CustomMessage("a final lockpick", /*german*/"ein finaler Dietrich", /*french*/"un crochet à porte final")});
                                                            // /*spanish*/una apertura portentosa final
 
-    hintTextTable[RHT_FOREST_TEMPLE_KEY_RING] = HintText(CustomMessage("a Forest Temple Key Ring", /*german*/"", /*french*/"un trousseau de clés du Temple de la Forêt"),
+    hintTextTable[RHT_FOREST_TEMPLE_KEY_RING] = HintText(CustomMessage("a Forest Temple Key Ring", /*german*/"ein Schlüsselbund des Waldtempels", /*french*/"un trousseau de clés du Temple de la Forêt"),
                                                          // /*spanish*/un llavero del Templo del Bosque
                                                          {
-                                                         CustomMessage("a key ring", /*german*/"", /*french*/"un trousseau de clés")
+                                                         CustomMessage("a key ring", /*german*/"ein Schlüsselbund", /*french*/"un trousseau de clés")
                                                           // /*spanish*/un llavero
                                                          }, {
-                                                         CustomMessage("a sylvan toolbox for unlocking", /*german*/"", /*french*/"des anti-portes sylvestres"),
+                                                         CustomMessage("a sylvan toolbox for unlocking", /*german*/"eine waldige Werkzeugkiste zur Entschlüsselung", /*french*/"des anti-portes sylvestres"),
                                                           // /*spanish*/un conjunto silvestre de cerrajero
-                                                         CustomMessage("a sylvan dungeon season pass", /*german*/"", /*french*/"les rêves sylvestres d'un prisonnier"),
+                                                         CustomMessage("a sylvan dungeon season pass", /*german*/"ein waldiger Dungeon-Season-Pass", /*french*/"les rêves sylvestres d'un prisonnier"),
                                                           // /*spanish*/un pase vip de mazmorras silvestre
-                                                         CustomMessage("a sylvan jingling ring", /*german*/"", /*french*/"des efface-serrures sylvestres"),
+                                                         CustomMessage("a sylvan jingling ring", /*german*/"ein waldiger Multifunktionsschlüssel", /*french*/"des efface-serrures sylvestres"),
                                                           // /*spanish*/una cadena multiusos silvestre
-                                                         CustomMessage("a sylvan skeleton key", /*german*/"", /*french*/"des crochets à porte sylvestres")});
+                                                         CustomMessage("a sylvan skeleton key", /*german*/"ein waldiger Skelettschlüssel", /*french*/"des crochets à porte sylvestres")});
                                                           // /*spanish*/un anillo silvestre contra cerrojos
 
-    hintTextTable[RHT_FIRE_TEMPLE_KEY_RING] = HintText(CustomMessage("a Fire Temple Key Ring", /*german*/"", /*french*/"un trousseau de clés du Temple du Feu"),
+    hintTextTable[RHT_FIRE_TEMPLE_KEY_RING] = HintText(CustomMessage("a Fire Temple Key Ring", /*german*/"ein Schlüsselbund des Feuertempels", /*french*/"un trousseau de clés du Temple du Feu"),
                                                        // /*spanish*/un llavero del Templo del Fuego
                                                        {
-                                                       CustomMessage("a key ring", /*german*/"", /*french*/"un trousseau de clés")
+                                                       CustomMessage("a key ring", /*german*/"ein Schlüsselbund", /*french*/"un trousseau de clés")
                                                         // /*spanish*/un llavero
                                                        }, {
-                                                       CustomMessage("a molten toolbox for unlocking", /*german*/"", /*french*/"des anti-portes fondus"),
+                                                       CustomMessage("a molten toolbox for unlocking", /*german*/"eine geschmolzene Werkzeugkiste zur Entschlüsselung", /*french*/"des anti-portes fondus"),
                                                         // /*spanish*/un conjunto fundido de cerrajero
-                                                       CustomMessage("a molten dungeon season pass", /*german*/"", /*french*/"les rêves fondus d'un prisonnier"),
+                                                       CustomMessage("a molten dungeon season pass", /*german*/"ein geschmolzener Dungeon-Season-Pass", /*french*/"les rêves fondus d'un prisonnier"),
                                                         // /*spanish*/un pase vip de mazmorras fundido
-                                                       CustomMessage("a molten jingling ring", /*german*/"", /*french*/"des efface-serrures fondus"),
+                                                       CustomMessage("a molten jingling ring", /*german*/"ein geschmolzener Multifunktionsschlüssel", /*french*/"des efface-serrures fondus"),
                                                         // /*spanish*/una cadena multiusos fundida
-                                                       CustomMessage("a molten skeleton key", /*german*/"", /*french*/"des crochets à porte fondus")});
+                                                       CustomMessage("a molten skeleton key", /*german*/"ein geschmolzener Skelettschlüssel", /*french*/"des crochets à porte fondus")});
                                                         // /*spanish*/un anillo fundido contra cerrojos
 
-    hintTextTable[RHT_WATER_TEMPLE_KEY_RING] = HintText(CustomMessage("a Water Temple Key Ring", /*german*/"", /*french*/"un trousseau de clés du Temple de l'Eau"),
+    hintTextTable[RHT_WATER_TEMPLE_KEY_RING] = HintText(CustomMessage("a Water Temple Key Ring", /*german*/"ein Schlüsselbund des Wassertempels", /*french*/"un trousseau de clés du Temple de l'Eau"),
                                                         // /*spanish*/un llavero del Templo del Agua
                                                         {
-                                                        CustomMessage("a key ring", /*german*/"", /*french*/"un trousseau de clés")
+                                                        CustomMessage("a key ring", /*german*/"ein Schlüsselbund", /*french*/"un trousseau de clés")
                                                          // /*spanish*/un llavero
                                                         }, {
-                                                        CustomMessage("a wet toolbox for unlocking", /*german*/"", /*french*/"des anti-portes humides"),
+                                                        CustomMessage("a wet toolbox for unlocking", /*german*/"eine nasse Werkzeugkiste zur Entschlüsselung", /*french*/"des anti-portes humides"),
                                                          // /*spanish*/un conjunto abisal de cerrajero
-                                                        CustomMessage("a wet dungeon season pass", /*german*/"", /*french*/"les rêves humides d'un prisonnier"),
+                                                        CustomMessage("a wet dungeon season pass", /*german*/"ein nasser Dungeon-Season-Pass", /*french*/"les rêves humides d'un prisonnier"),
                                                          // /*spanish*/un pase vip de mazmorras abisal
-                                                        CustomMessage("a wet jingling ring", /*german*/"", /*french*/"des efface-serrures humides"),
+                                                        CustomMessage("a wet jingling ring", /*german*/"ein nasser Multifunktionsschlüssel", /*french*/"des efface-serrures humides"),
                                                          // /*spanish*/una cadena multiusos abisal
-                                                        CustomMessage("a wet skeleton key", /*german*/"", /*french*/"des crochets à porte humides")});
+                                                        CustomMessage("a wet skeleton key", /*german*/"ein nasser Skelettschlüssel", /*french*/"des crochets à porte humides")});
                                                          // /*spanish*/un anillo abisal contra cerrojos
 
-    hintTextTable[RHT_SPIRIT_TEMPLE_KEY_RING] = HintText(CustomMessage("a Spirit Temple Key Ring", /*german*/"", /*french*/"un trousseau de clés du Temple de l'Esprit"),
+    hintTextTable[RHT_SPIRIT_TEMPLE_KEY_RING] = HintText(CustomMessage("a Spirit Temple Key Ring", /*german*/"ein Schlüsselbund des Geistertempels", /*french*/"un trousseau de clés du Temple de l'Esprit"),
                                                          // /*spanish*/un llavero del Templo del Espíritu
                                                          {
-                                                         CustomMessage("a key ring", /*german*/"", /*french*/"un trousseau de clés")
+                                                         CustomMessage("a key ring", /*german*/"ein Schlüsselbund", /*french*/"un trousseau de clés")
                                                           // /*spanish*/un llavero
                                                          }, {
-                                                         CustomMessage("a sandy toolbox for unlocking", /*german*/"", /*french*/"des anti-portes sableux"),
+                                                         CustomMessage("a sandy toolbox for unlocking", /*german*/"eine sandige Werkzeugkiste zur Entschlüsselung", /*french*/"des anti-portes sableux"),
                                                           // /*spanish*/un conjunto arenoso de cerrajero
-                                                         CustomMessage("a sandy dungeon season pass", /*german*/"", /*french*/"les rêves sableux d'un prisonnier"),
+                                                         CustomMessage("a sandy dungeon season pass", /*german*/"ein sandiger Dungeon-Season-Pass", /*french*/"les rêves sableux d'un prisonnier"),
                                                           // /*spanish*/un pase vip de mazmorras arenoso
-                                                         CustomMessage("a sandy jingling ring", /*german*/"", /*french*/"des efface-serrures sableux"),
+                                                         CustomMessage("a sandy jingling ring", /*german*/"ein sandiger Multifunktionsschlüssel", /*french*/"des efface-serrures sableux"),
                                                           // /*spanish*/una cadena multiusos arenosa
-                                                         CustomMessage("a sandy skeleton key", /*german*/"", /*french*/"des crochets à porte sableux")});
+                                                         CustomMessage("a sandy skeleton key", /*german*/"ein sandiger Skelettschlüssel", /*french*/"des crochets à porte sableux")});
                                                           // /*spanish*/un anillo arenoso contra cerrojos
 
-    hintTextTable[RHT_SHADOW_TEMPLE_KEY_RING] = HintText(CustomMessage("a Shadow Temple Key Ring", /*german*/"", /*french*/"un trousseau de clés du Temple de l'Ombre"),
+    hintTextTable[RHT_SHADOW_TEMPLE_KEY_RING] = HintText(CustomMessage("a Shadow Temple Key Ring", /*german*/"ein Schlüsselbund des Schattentempels", /*french*/"un trousseau de clés du Temple de l'Ombre"),
                                                          // /*spanish*/un llavero del Templo de las Sombras
                                                          {
-                                                         CustomMessage("a key ring", /*german*/"", /*french*/"un trousseau de clés")
+                                                         CustomMessage("a key ring", /*german*/"ein Schlüsselbund", /*french*/"un trousseau de clés")
                                                           // /*spanish*/un llavero
                                                          }, {
-                                                         CustomMessage("a creepy toolbox for unlocking", /*german*/"", /*french*/"des anti-portes sinistres"),
+                                                         CustomMessage("a creepy toolbox for unlocking", /*german*/"eine gruselige Werkzeugkiste zur Entschlüsselung", /*french*/"des anti-portes sinistres"),
                                                           // /*spanish*/un conjunto tenebroso de cerrajero
-                                                         CustomMessage("a creepy dungeon season pass", /*german*/"", /*french*/"les rêves sinistres d'un prisonnier"),
+                                                         CustomMessage("a creepy dungeon season pass", /*german*/"ein gruseliger Dungeon-Season-Pass", /*french*/"les rêves sinistres d'un prisonnier"),
                                                           // /*spanish*/un pase vip de mazmorras tenebroso
-                                                         CustomMessage("a creepy jingling ring", /*german*/"", /*french*/"des efface-serrures sinistres"),
+                                                         CustomMessage("a creepy jingling ring", /*german*/"ein gruseliger Multifunktionsschlüssel", /*french*/"des efface-serrures sinistres"),
                                                           // /*spanish*/una cadena multiusos tenebrosa
-                                                         CustomMessage("a creepy skeleton key", /*german*/"", /*french*/"des crochets à porte sinistres")});
+                                                         CustomMessage("a creepy skeleton key", /*german*/"ein gruseliger Skelettschlüssel", /*french*/"des crochets à porte sinistres")});
                                                           // /*spanish*/un anillo tenebroso contra cerrojos
 
-    hintTextTable[RHT_GERUDO_TRAINING_GROUNDS_KEY_RING] = HintText(CustomMessage("a Gerudo Training Ground Key Ring", /*german*/"", /*french*/"un trousseau de clés du Gymnase Gerudo"),
+    hintTextTable[RHT_GERUDO_TRAINING_GROUNDS_KEY_RING] = HintText(CustomMessage("a Gerudo Training Ground Key Ring", /*german*/"ein Schlüsselbund des Gerudo-Trainingsgeländes", /*french*/"un trousseau de clés du Gymnase Gerudo"),
                                                                    // /*spanish*/un llavero del Centro de Instrucción Gerudo
                                                                    {
-                                                                   CustomMessage("a key ring", /*german*/"", /*french*/"un trousseau de clés")
+                                                                   CustomMessage("a key ring", /*german*/"ein Schlüsselbund", /*french*/"un trousseau de clés")
                                                                     // /*spanish*/un llavero
                                                                    }, {
-                                                                   CustomMessage("a labyrinthian toolbox for unlocking", /*german*/"", /*french*/"des anti-portes labyrinthiques"),
+                                                                   CustomMessage("a labyrinthian toolbox for unlocking", /*german*/"eine labyrinthische Werkzeugkiste zur Entschlüsselung", /*french*/"des anti-portes labyrinthiques"),
                                                                     // /*spanish*/un conjunto laberíntico de cerrajero
-                                                                   CustomMessage("a labyrinthian dungeon season pass", /*german*/"", /*french*/"les rêves labyrinthiques d'un prisonnier"),
+                                                                   CustomMessage("a labyrinthian dungeon season pass", /*german*/"ein labyrinthischer Dungeon-Season-Pass", /*french*/"les rêves labyrinthiques d'un prisonnier"),
                                                                     // /*spanish*/un pase vip de mazmorras laberíntico
-                                                                   CustomMessage("a labyrinthian jingling ring", /*german*/"", /*french*/"des efface-serrures labyrinthiques"),
+                                                                   CustomMessage("a labyrinthian jingling ring", /*german*/"ein labyrinthischer Multifunktionsschlüssel", /*french*/"des efface-serrures labyrinthiques"),
                                                                     // /*spanish*/una cadena multiusos laberíntica
-                                                                   CustomMessage("a labyrinthian skeleton key", /*german*/"", /*french*/"des crochets à porte labyrinthiques")});
+                                                                   CustomMessage("a labyrinthian skeleton key", /*german*/"ein labyrinthischer Skelettschlüssel", /*french*/"des crochets à porte labyrinthiques")});
                                                                     // /*spanish*/un anillo laberíntico contra cerrojos
 
-    hintTextTable[RHT_GERUDO_FORTRESS_KEY_RING] = HintText(CustomMessage("a Gerudo Fortress Key Ring", /*german*/"", /*french*/"un trousseau de clés de la Repaire des Voleurs"),
+    hintTextTable[RHT_GERUDO_FORTRESS_KEY_RING] = HintText(CustomMessage("a Gerudo Fortress Key Ring", /*german*/"ein Schlüsselbund der Gerudo-Festung", /*french*/"un trousseau de clés de la Repaire des Voleurs"),
                                                            // /*spanish*/un llavero de la Fortaleza Gerudo
                                                            {
-                                                           CustomMessage("a key ring", /*german*/"", /*french*/"un trousseau de clés")
+                                                           CustomMessage("a key ring", /*german*/"ein Schlüsselbund", /*french*/"un trousseau de clés")
                                                             // /*spanish*/un llavero
                                                            }, {
-                                                           CustomMessage("an imprisoned toolbox for unlocking", /*german*/"", /*french*/"des anti-portes emprisonnés"),
+                                                           CustomMessage("an imprisoned toolbox for unlocking", /*german*/"eine gefangene Werkzeugkiste zur Entschlüsselung", /*french*/"des anti-portes emprisonnés"),
                                                             // /*spanish*/un conjunto enjaulado de cerrajero
-                                                           CustomMessage("an imprisoned dungeon season pass", /*german*/"", /*french*/"les rêves emprisonnés d'un prisonnier"),
+                                                           CustomMessage("an imprisoned dungeon season pass", /*german*/"ein gefangener Dungeon-Season-Pass", /*french*/"les rêves emprisonnés d'un prisonnier"),
                                                             // /*spanish*/un pase vip de una mazmorra enjaulado
-                                                           CustomMessage("an imprisoned jingling ring", /*german*/"", /*french*/"des efface-serrures emprisonnés"),
+                                                           CustomMessage("an imprisoned jingling ring", /*german*/"ein gefangener Multifunktionsschlüssel", /*french*/"des efface-serrures emprisonnés"),
                                                             // /*spanish*/una cadena multiusos enjaulada
-                                                           CustomMessage("an imprisoned skeleton key", /*german*/"", /*french*/"des crochets à porte emprisonnés")});
+                                                           CustomMessage("an imprisoned skeleton key", /*german*/"ein gefangener Skelettschlüssel", /*french*/"des crochets à porte emprisonnés")});
                                                             // /*spanish*/un anillo enjaulado contra cerrojos
 
-    hintTextTable[RHT_BOTTOM_OF_THE_WELL_KEY_RING] = HintText(CustomMessage("a Bottom of the Well Key Ring", /*german*/"", /*french*/"un trousseau de clés du fond du Puits"),
+    hintTextTable[RHT_BOTTOM_OF_THE_WELL_KEY_RING] = HintText(CustomMessage("a Bottom of the Well Key Ring", /*german*/"ein Schlüsselbund des Grund des Brunnens", /*french*/"un trousseau de clés du fond du Puits"),
                                                               // /*spanish*/un llavero del Fondo del pozo
                                                               {
-                                                              CustomMessage("a key ring", /*german*/"", /*french*/"un trousseau de clés")
+                                                              CustomMessage("a key ring", /*german*/"ein Schlüsselbund", /*french*/"un trousseau de clés")
                                                                // /*spanish*/un llavero
                                                               }, {
-                                                              CustomMessage("a moldy toolbox for unlocking", /*german*/"", /*french*/"des anti-portes moisis"),
+                                                              CustomMessage("a moldy toolbox for unlocking", /*german*/"eine schimmelige Werkzeugkiste zur Entschlüsselung", /*french*/"des anti-portes moisis"),
                                                                // /*spanish*/un conjunto subterráneo de cerrajero
-                                                              CustomMessage("a moldy dungeon season pass", /*german*/"", /*french*/"les rêves moisis d'un prisonnier"),
+                                                              CustomMessage("a moldy dungeon season pass", /*german*/"ein schimmeliger Dungeon-Season-Pass", /*french*/"les rêves moisis d'un prisonnier"),
                                                                // /*spanish*/un pase vip de una mazmorra subterráneo
-                                                              CustomMessage("a moldy jingling ring", /*german*/"", /*french*/"des efface-serrures moisis"),
+                                                              CustomMessage("a moldy jingling ring", /*german*/"ein schimmeliger Multifunktionsschlüssel", /*french*/"des efface-serrures moisis"),
                                                                // /*spanish*/una cadena multiusos subterránea
-                                                              CustomMessage("a moldy skeleton key", /*german*/"", /*french*/"des crochets à porte moisis")});
+                                                              CustomMessage("a moldy skeleton key", /*german*/"ein schimmeliger Skelettschlüssel", /*french*/"des crochets à porte moisis")});
                                                                // /*spanish*/un anillo subterráneo contra cerrojos
 
-    hintTextTable[RHT_GANONS_CASTLE_KEY_RING] = HintText(CustomMessage("a Ganon's Castle Key Ring", /*german*/"", /*french*/"un trousseau de clés du Château de Ganon"),
+    hintTextTable[RHT_GANONS_CASTLE_KEY_RING] = HintText(CustomMessage("a Ganon's Castle Key Ring", /*german*/"ein Schlüsselbund von Ganons Schloß", /*french*/"un trousseau de clés du Château de Ganon"),
                                                          // /*spanish*/un llavero del Castillo de Ganon
                                                          {
-                                                         CustomMessage("a key ring", /*german*/"", /*french*/"un trousseau de clés")
+                                                         CustomMessage("a key ring", /*german*/"ein Schlüsselbund", /*french*/"un trousseau de clés")
                                                           // /*spanish*/un llavero
                                                          }, {
-                                                         CustomMessage("a final toolbox for unlocking", /*german*/"", /*french*/"des anti-portes finaux"),
+                                                         CustomMessage("a final toolbox for unlocking", /*german*/"eine finale Werkzeugkiste zur Entschlüsselung", /*french*/"des anti-portes finaux"),
                                                           // /*spanish*/un conjunto decisivo de cerrajero
-                                                         CustomMessage("a final dungeon season pass", /*german*/"", /*french*/"les rêves finaux d'un prisonnier"),
+                                                         CustomMessage("a final dungeon season pass", /*german*/"ein finaler Dungeon-Season-Pass", /*french*/"les rêves finaux d'un prisonnier"),
                                                           // /*spanish*/un pase vip de una mazmorra decisivo
-                                                         CustomMessage("a final jingling ring", /*german*/"", /*french*/"des efface-serrures finaux"),
+                                                         CustomMessage("a final jingling ring", /*german*/"ein finaler Multifunktionsschlüssel", /*french*/"des efface-serrures finaux"),
                                                           // /*spanish*/una cadena multiusos decisiva
-                                                         CustomMessage("a final skeleton key", /*german*/"", /*french*/"des crochets à porte finaux")});
+                                                         CustomMessage("a final skeleton key", /*german*/"ein finaler Skelettschlüssel", /*french*/"des crochets à porte finaux")});
                                                           // /*spanish*/un anillo decisivo multiusos
 
-    hintTextTable[RHT_TREASURE_GAME_SMALL_KEY] = HintText(CustomMessage("a Treasure Chest Shop Small Key", /*german*/"", /*french*/"une petite clé de la chasse aux trésors"),
+    hintTextTable[RHT_TREASURE_GAME_SMALL_KEY] = HintText(CustomMessage("a Treasure Chest Shop Small Key", /*german*/"ein kleiner Schlüssel des Schatztruhenladens", /*french*/"une petite clé de la chasse aux trésors"),
                                                           // /*spanish*/una llave pequeña del Cofre del Tesoro
                                                           {
-                                                          CustomMessage("a small key", /*german*/"", /*french*/"une petite clé")
+                                                          CustomMessage("a small key", /*german*/"ein kleiner Schlüssel", /*french*/"une petite clé")
                                                            // /*spanish*/una llave pequeña
                                                           }, {
-                                                          CustomMessage("a gambler's tool for unlocking", /*german*/"", /*french*/"un anti-porte de parieur"),
+                                                          CustomMessage("a gambler's tool for unlocking", /*german*/"ein Spieler-Werkzeug zur Entschlüsselung", /*french*/"un anti-porte de parieur"),
                                                            // /*spanish*/una clave de un juego de azar
-                                                          CustomMessage("a gambler's dungeon pass", /*german*/"", /*french*/"le rêve d'un prisonnier parieur"),
+                                                          CustomMessage("a gambler's dungeon pass", /*german*/"ein Spieler-Dungeon-Pass", /*french*/"le rêve d'un prisonnier parieur"),
                                                            // /*spanish*/un pase de un juego de azar
-                                                          CustomMessage("a gambler's lock remover", /*german*/"", /*french*/"un efface-serrure de parieur"),
+                                                          CustomMessage("a gambler's lock remover", /*german*/"ein Spieler-Schlossentferner", /*french*/"un efface-serrure de parieur"),
                                                            // /*spanish*/un destructor de cerraduras del juego de azar
-                                                          CustomMessage("a gambler's lockpick", /*german*/"", /*french*/"un crochet à serrure de parieur")});
+                                                          CustomMessage("a gambler's lockpick", /*german*/"ein Spieler-Dietrich", /*french*/"un crochet à serrure de parieur")});
                                                            // /*spanish*/una apertura portentosa del juego de azar
 
-    hintTextTable[RHT_KOKIRI_EMERALD] = HintText(CustomMessage("the Kokiri Emerald", /*german*/"", /*french*/"l'Émeraude Kokiri"),
+    hintTextTable[RHT_KOKIRI_EMERALD] = HintText(CustomMessage("the Kokiri Emerald", /*german*/"der Kokiri-Smaragd", /*french*/"l'Émeraude Kokiri"),
                                                  // /*spanish*/la Esmeralda de los Kokiri
                                                  {
-                                                 CustomMessage("a spiritual stone", /*german*/"", /*french*/"une Pierre Ancestrale")
+                                                 CustomMessage("a spiritual stone", /*german*/"ein spiritueller Stein", /*french*/"une Pierre Ancestrale")
                                                   // /*spanish*/una piedra espiritual
                                                  }, {
-                                                 CustomMessage("a green stone", /*german*/"", /*french*/"une pierre verte"),
+                                                 CustomMessage("a green stone", /*german*/"ein grüner Stein", /*french*/"une pierre verte"),
                                                   // /*spanish*/una piedra verde
-                                                 CustomMessage("a gift before death", /*german*/"", /*french*/"le dernier souffle d'un arbre")});
+                                                 CustomMessage("a gift before death", /*german*/"ein Geschenk vor dem Tod", /*french*/"le dernier souffle d'un arbre")});
                                                   // /*spanish*/un obsequio testamentario
 
-    hintTextTable[RHT_GORON_RUBY] = HintText(CustomMessage("the Goron Ruby", /*german*/"", /*french*/"le Rubis Goron"),
+    hintTextTable[RHT_GORON_RUBY] = HintText(CustomMessage("the Goron Ruby", /*german*/"der Goronen-Rubin", /*french*/"le Rubis Goron"),
                                              // /*spanish*/el Rubí de los Goron
                                              {
-                                             CustomMessage("a spiritual stone", /*german*/"", /*french*/"une Pierre Ancestrale")
+                                             CustomMessage("a spiritual stone", /*german*/"ein spiritueller Stein", /*french*/"une Pierre Ancestrale")
                                               // /*spanish*/una piedra espiritual
                                              }, {
-                                             CustomMessage("a red stone", /*german*/"", /*french*/"une pierre rouge"),
+                                             CustomMessage("a red stone", /*german*/"ein roter Stein", /*french*/"une pierre rouge"),
                                               // /*spanish*/una piedra carmín
-                                             CustomMessage("sworn brotherhood", /*german*/"", /*french*/"un serment de fraternité")});
+                                             CustomMessage("sworn brotherhood", /*german*/"verschworene Bruderschaft", /*french*/"un serment de fraternité")});
                                               // /*spanish*/el juramento de hermanos de sangre
 
-    hintTextTable[RHT_ZORA_SAPPHIRE] = HintText(CustomMessage("the Zora Sapphire", /*german*/"", /*french*/"le Saphir Zora"),
+    hintTextTable[RHT_ZORA_SAPPHIRE] = HintText(CustomMessage("the Zora Sapphire", /*german*/"der Zora-Saphir", /*french*/"le Saphir Zora"),
                                                 // /*spanish*/el Zafiro de los Zora
                                                 {
-                                                CustomMessage("a spiritual stone", /*german*/"", /*french*/"une Pierre Ancestrale")
+                                                CustomMessage("a spiritual stone", /*german*/"ein spiritueller Stein", /*french*/"une Pierre Ancestrale")
                                                  // /*spanish*/una piedra espiritual
                                                 }, {
-                                                CustomMessage("a blue stone", /*german*/"", /*french*/"une pierre bleue"),
+                                                CustomMessage("a blue stone", /*german*/"ein blauer Stein", /*french*/"une pierre bleue"),
                                                  // /*spanish*/una piedra celeste
-                                                CustomMessage("an engagement gift", /*german*/"", /*french*/"un cadeau de mariage")});
+                                                CustomMessage("an engagement gift", /*german*/"ein Verlobungsgeschenk", /*french*/"un cadeau de mariage")});
                                                  // /*spanish*/un regalo de compromiso
 
-    hintTextTable[RHT_FOREST_MEDALLION] = HintText(CustomMessage("the Forest Medallion", /*german*/"", /*french*/"le Médaillon de la Forêt"),
+    hintTextTable[RHT_FOREST_MEDALLION] = HintText(CustomMessage("the Forest Medallion", /*german*/"Amulett des Waldes", /*french*/"le Médaillon de la Forêt"),
                                                    // /*spanish*/el Medallón del Bosque
                                                    {
-                                                   CustomMessage("a medallion", /*german*/"", /*french*/"un médaillon")
+                                                   CustomMessage("a medallion", /*german*/"ein Amulett", /*french*/"un médaillon")
                                                     // /*spanish*/un medallón
                                                    }, {
-                                                   CustomMessage("a green coin", /*german*/"", /*french*/"une pièce verte"),
+                                                   CustomMessage("a green coin", /*german*/"eine grüne Münze", /*french*/"une pièce verte"),
                                                     // /*spanish*/una moneda esmeralda
-                                                   CustomMessage("Saria's friendship", /*german*/"", /*french*/"l'amitié de Saria")});
+                                                   CustomMessage("Saria's friendship", /*german*/"Salias Freundschaft", /*french*/"l'amitié de Saria")});
                                                     // /*spanish*/la amistad de Saria
 
-    hintTextTable[RHT_FIRE_MEDALLION] = HintText(CustomMessage("the Fire Medallion", /*german*/"", /*french*/"le Médaillon du Feu"),
+    hintTextTable[RHT_FIRE_MEDALLION] = HintText(CustomMessage("the Fire Medallion", /*german*/"Amulett des Feuers", /*french*/"le Médaillon du Feu"),
                                                  // /*spanish*/el Medallón del Fuego
                                                  {
-                                                 CustomMessage("a medallion", /*german*/"", /*french*/"un médaillon")
+                                                 CustomMessage("a medallion", /*german*/"ein Amulett", /*french*/"un médaillon")
                                                   // /*spanish*/un medallón
                                                  }, {
-                                                 CustomMessage("a red coin", /*german*/"", /*french*/"une pièce rouge"),
+                                                 CustomMessage("a red coin", /*german*/"eine rote Münze", /*french*/"une pièce rouge"),
                                                   // /*spanish*/una moneda rubí
-                                                 CustomMessage("Darunia's power", /*german*/"", /*french*/"la fraternité de Darunia")});
+                                                 CustomMessage("Darunia's power", /*german*/"Darunias Kraft", /*french*/"la fraternité de Darunia")});
                                                   // /*spanish*/la fraternidad de Darunia
 
-    hintTextTable[RHT_WATER_MEDALLION] = HintText(CustomMessage("the Water Medallion", /*german*/"", /*french*/"le Médaillon de l'Eau"),
+    hintTextTable[RHT_WATER_MEDALLION] = HintText(CustomMessage("the Water Medallion", /*german*/"Amulett des Wassers", /*french*/"le Médaillon de l'Eau"),
                                                   // /*spanish*/el Medallón del Agua
                                                   {
-                                                  CustomMessage("a medallion", /*german*/"", /*french*/"un médaillon")
+                                                  CustomMessage("a medallion", /*german*/"ein Amulett", /*french*/"un médaillon")
                                                    // /*spanish*/un medallón
                                                   }, {
-                                                  CustomMessage("a blue coin", /*german*/"", /*french*/"une pièce bleue"),
+                                                  CustomMessage("a blue coin", /*german*/"eine blaue Münze", /*french*/"une pièce bleue"),
                                                    // /*spanish*/una moneda zafiro
-                                                  CustomMessage("Ruto's power", /*german*/"", /*french*/"l'amour de Ruto")});
+                                                  CustomMessage("Ruto's power", /*german*/"Rutos Macht", /*french*/"l'amour de Ruto")});
                                                    // /*spanish*/el amor de Ruto
 
-    hintTextTable[RHT_SPIRIT_MEDALLION] = HintText(CustomMessage("the Spirit Medallion", /*german*/"", /*french*/"le Médaillon de l'Esprit"),
+    hintTextTable[RHT_SPIRIT_MEDALLION] = HintText(CustomMessage("the Spirit Medallion", /*german*/"Amulett der Geister", /*french*/"le Médaillon de l'Esprit"),
                                                    // /*spanish*/el Medallón del Espíritu
                                                    {
-                                                   CustomMessage("a medallion", /*german*/"", /*french*/"un médaillon")
+                                                   CustomMessage("a medallion", /*german*/"ein Amulett", /*french*/"un médaillon")
                                                     // /*spanish*/un medallón
                                                    }, {
-                                                   CustomMessage("an orange coin", /*german*/"", /*french*/"une pièce orange"),
+                                                   CustomMessage("an orange coin", /*german*/"eine orange Münze", /*french*/"une pièce orange"),
                                                     // /*spanish*/una moneda ámbar
-                                                   CustomMessage("Nabooru's power", /*german*/"", /*french*/"le respect de Nabooru")});
+                                                   CustomMessage("Nabooru's power", /*german*/"Naborus Macht", /*french*/"le respect de Nabooru")});
                                                     // /*spanish*/el respeto de Nabooru
 
-    hintTextTable[RHT_SHADOW_MEDALLION] = HintText(CustomMessage("the Shadow Medallion", /*german*/"", /*french*/"le Médaillon de l'Ombre"),
+    hintTextTable[RHT_SHADOW_MEDALLION] = HintText(CustomMessage("the Shadow Medallion", /*german*/"Amulett des Schattens", /*french*/"le Médaillon de l'Ombre"),
                                                    // /*spanish*/el Medallón de la Sombra
                                                    {
-                                                   CustomMessage("a medallion", /*german*/"", /*french*/"un médaillon")
+                                                   CustomMessage("a medallion", /*german*/"ein Amulett", /*french*/"un médaillon")
                                                     // /*spanish*/un medallón
                                                    }, {
-                                                   CustomMessage("a purple coin", /*german*/"", /*french*/"une pièce pourpre"),
+                                                   CustomMessage("a purple coin", /*german*/"eine violette Münze", /*french*/"une pièce pourpre"),
                                                     // /*spanish*/una moneda malva
-                                                   CustomMessage("Impa's power", /*german*/"", /*french*/"la confiance d'Impa")});
+                                                   CustomMessage("Impa's power", /*german*/"Impas Macht", /*french*/"la confiance d'Impa")});
                                                     // /*spanish*/la confianza de Impa
 
-    hintTextTable[RHT_LIGHT_MEDALLION] = HintText(CustomMessage("the Light Medallion", /*german*/"", /*french*/"le Médaillon de la Lumière"),
+    hintTextTable[RHT_LIGHT_MEDALLION] = HintText(CustomMessage("the Light Medallion", /*german*/"Amulett des Lichts", /*french*/"le Médaillon de la Lumière"),
                                                   // /*spanish*/el Medallón de la Luz
                                                   {
-                                                  CustomMessage("a medallion", /*german*/"", /*french*/"un médaillon")
+                                                  CustomMessage("a medallion", /*german*/"ein Amulett", /*french*/"un médaillon")
                                                    // /*spanish*/un medallón
                                                   }, {
-                                                  CustomMessage("a yellow coin", /*german*/"", /*french*/"une pièce jaune"),
+                                                  CustomMessage("a yellow coin", /*german*/"eine gelbe Münze", /*french*/"une pièce jaune"),
                                                    // /*spanish*/una moneda resplandeciente
-                                                  CustomMessage("Rauru's power", /*german*/"", /*french*/"la foi de Rauru")});
+                                                  CustomMessage("Rauru's power", /*german*/"Raurus Macht", /*french*/"la foi de Rauru")});
                                                    // /*spanish*/la fe de Rauru
 
-    hintTextTable[RHT_RECOVERY_HEART] = HintText(CustomMessage("a Recovery Heart", /*german*/"", /*french*/"un coeur de vie"),
+    hintTextTable[RHT_RECOVERY_HEART] = HintText(CustomMessage("a Recovery Heart", /*german*/"ein Herz", /*french*/"un coeur de vie"),
                                                  // /*spanish*/un corazón
                                                  {
-                                                 CustomMessage("something heart-shaped", /*german*/"", /*french*/"une chose en forme de coeur")
+                                                 CustomMessage("something heart-shaped", /*german*/"etwas Herzförmiges", /*french*/"une chose en forme de coeur")
                                                   // /*spanish*/algo con forma de corazón
                                                  }, {
-                                                 CustomMessage("a free heal", /*german*/"", /*french*/"un bec-au-bobo"),
+                                                 CustomMessage("a free heal", /*german*/"eine kostenlose Heilung", /*french*/"un bec-au-bobo"),
                                                   // /*spanish*/una cura de regalo
-                                                 CustomMessage("a hearty meal", /*german*/"", /*french*/"un petit amour"),
+                                                 CustomMessage("a hearty meal", /*german*/"ein herzhaftes Mahl", /*french*/"un petit amour"),
                                                   // /*spanish*/una sanación romántica
-                                                 CustomMessage("a Band-Aid", /*german*/"", /*french*/"un diachylon")});
+                                                 CustomMessage("a Band-Aid", /*german*/"ein Wundpflaster", /*french*/"un diachylon")});
                                                   // /*spanish*/un corazoncito sanador
 
-    hintTextTable[RHT_GREEN_RUPEE] = HintText(CustomMessage("a Green Rupee", /*german*/"", /*french*/"un rubis vert"),
+    hintTextTable[RHT_GREEN_RUPEE] = HintText(CustomMessage("a Green Rupee", /*german*/"ein grüner Rubin", /*french*/"un rubis vert"),
                                               // /*spanish*/una rupia verde
                                               {
-                                              CustomMessage("some rupees", /*german*/"", /*french*/"une quantité de rubis")
+                                              CustomMessage("some rupees", /*german*/"einige Rubine", /*french*/"une quantité de rubis")
                                                // /*spanish*/una cantidad de rupias
                                               }, {
-                                              CustomMessage("a unique coin", /*german*/"", /*french*/"un rubis bien mérité"),
+                                              CustomMessage("a unique coin", /*german*/"eine einzigartige Münze", /*french*/"un rubis bien mérité"),
                                                // /*spanish*/una singular moneda
-                                              CustomMessage("a penny", /*german*/"", /*french*/"un sou"),
+                                              CustomMessage("a penny", /*german*/"ein Pfennig", /*french*/"un sou"),
                                                // /*spanish*/un peso hyliano
-                                              CustomMessage("a green gem", /*german*/"", /*french*/"un joyau vert")});
+                                              CustomMessage("a green gem", /*german*/"ein grüner Edelstein", /*french*/"un joyau vert")});
                                                // /*spanish*/una gema verde
 
-    hintTextTable[RHT_GREG_RUPEE] = HintText(CustomMessage("Greg", /*german*/"", /*french*/"Greg"),
+    hintTextTable[RHT_GREG_RUPEE] = HintText(CustomMessage("Greg", /*german*/"Greg", /*french*/"Greg"),
                                              // /*spanish*/Greg
                                              {
-                                             CustomMessage("a Green Rupee", /*german*/"", /*french*/"un rubis vert")
+                                             CustomMessage("a Green Rupee", /*german*/"ein grüner Rubin", /*french*/"un rubis vert")
                                               // /*spanish*/una rupia verde
                                              }, {
-                                             CustomMessage("an old friend", /*german*/"", /*french*/"Greg"),
+                                             CustomMessage("an old friend", /*german*/"ein alter Freund", /*french*/"Greg"),
                                               // /*spanish*/Greg
-                                             CustomMessage("a glorious gem", /*german*/"", /*french*/"Greg")});
+                                             CustomMessage("a glorious gem", /*german*/"ein glorioser Edelstein", /*french*/"Greg")});
                                               // /*spanish*/Greg
 
-    hintTextTable[RHT_BLUE_RUPEE] = HintText(CustomMessage("a Blue Rupee", /*german*/"", /*french*/"un rubis bleu"),
+    hintTextTable[RHT_BLUE_RUPEE] = HintText(CustomMessage("a Blue Rupee", /*german*/"ein blauer Rubin", /*french*/"un rubis bleu"),
                                              // /*spanish*/una rupia azul
                                              {
-                                             CustomMessage("some rupees", /*german*/"", /*french*/"une quantité de rubis")
+                                             CustomMessage("some rupees", /*german*/"einige Rubine", /*french*/"une quantité de rubis")
                                               // /*spanish*/una cantidad de rupias
                                              }, {
-                                             CustomMessage("a common coin", /*german*/"", /*french*/"quelques sous"),
+                                             CustomMessage("a common coin", /*german*/"eine gewöhnliche Münze", /*french*/"quelques sous"),
                                               // /*spanish*/una moneda usual
-                                             CustomMessage("a blue gem", /*german*/"", /*french*/"un joyau bleu")});
+                                             CustomMessage("a blue gem", /*german*/"ein blauer Edelstein", /*french*/"un joyau bleu")});
                                               // /*spanish*/una gema azul
 
-    hintTextTable[RHT_RED_RUPEE] = HintText(CustomMessage("a Red Rupee", /*german*/"", /*french*/"un rubis rouge"),
+    hintTextTable[RHT_RED_RUPEE] = HintText(CustomMessage("a Red Rupee", /*german*/"ein roter Rubin", /*french*/"un rubis rouge"),
                                             // /*spanish*/una rupia roja
                                             {
-                                            CustomMessage("some rupees", /*german*/"", /*french*/"une quantité de rubis")
+                                            CustomMessage("some rupees", /*german*/"einige Rubine", /*french*/"une quantité de rubis")
                                              // /*spanish*/una cantidad de rupias
                                             }, {
-                                            CustomMessage("couch cash", /*german*/"", /*french*/"un peu de fric"),
+                                            CustomMessage("couch cash", /*german*/"ein wenig Zaster", /*french*/"un peu de fric"),
                                              // /*spanish*/una buena moneda
-                                            CustomMessage("a red gem", /*german*/"", /*french*/"un joyau rouge")});
+                                            CustomMessage("a red gem", /*german*/"ein roter Edelstein", /*french*/"un joyau rouge")});
                                              // /*spanish*/una gema roja
 
-    hintTextTable[RHT_PURPLE_RUPEE] = HintText(CustomMessage("a Purple Rupee", /*german*/"", /*french*/"un rubis pourpre"),
+    hintTextTable[RHT_PURPLE_RUPEE] = HintText(CustomMessage("a Purple Rupee", /*german*/"ein violetter Rubin", /*french*/"un rubis pourpre"),
                                                // /*spanish*/una rupia morada
                                                {
-                                               CustomMessage("some rupees", /*german*/"", /*french*/"une quantité de rubis")
+                                               CustomMessage("some rupees", /*german*/"einige Rubine", /*french*/"une quantité de rubis")
                                                 // /*spanish*/una cantidad de rupias
                                                }, {
-                                               CustomMessage("big bucks", /*german*/"", /*french*/"plein de fric"),
+                                               CustomMessage("big bucks", /*german*/"ordentlich Zaster", /*french*/"plein de fric"),
                                                 // /*spanish*/plata de calidad
-                                               CustomMessage("a purple gem", /*german*/"", /*french*/"un joyau mauve"),
+                                               CustomMessage("a purple gem", /*german*/"ein violetter Edelstein", /*french*/"un joyau mauve"),
                                                 // /*spanish*/una gema morada
-                                               CustomMessage("wealth", /*german*/"", /*french*/"la richesse")});
+                                               CustomMessage("wealth", /*german*/"Wohlstand", /*french*/"la richesse")});
                                                 // /*spanish*/una buena riqueza
 
-    hintTextTable[RHT_HUGE_RUPEE] = HintText(CustomMessage("a Huge Rupee", /*german*/"", /*french*/"un énorme rubis"),
+    hintTextTable[RHT_HUGE_RUPEE] = HintText(CustomMessage("a Huge Rupee", /*german*/"ein riesiger Rubin", /*french*/"un énorme rubis"),
                                              // /*spanish*/una rupia gigante
                                              {
-                                             CustomMessage("some rupees", /*german*/"", /*french*/"une quantité de rubis")
+                                             CustomMessage("some rupees", /*german*/"einige Rubine", /*french*/"une quantité de rubis")
                                               // /*spanish*/una cantidad de rupias
                                              }, {
-                                             CustomMessage("a juicy jackpot", /*german*/"", /*french*/"le jackpot"),
+                                             CustomMessage("a juicy jackpot", /*german*/"ein saftiger Jackpot", /*french*/"le jackpot"),
                                               // /*spanish*/el premio gordo
-                                             CustomMessage("a yellow gem", /*german*/"", /*french*/"un joyau doré"),
+                                             CustomMessage("a yellow gem", /*german*/"ein gelber Edelstein", /*french*/"un joyau doré"),
                                               // /*spanish*/una gema amarilla
-                                             CustomMessage("a giant gem", /*german*/"", /*french*/"un gros joyau"),
+                                             CustomMessage("a giant gem", /*german*/"ein riesiger Edelstein", /*french*/"un gros joyau"),
                                               // /*spanish*/una gema descomunal
-                                             CustomMessage("great wealth", /*german*/"", /*french*/"l'aisance financière")});
+                                             CustomMessage("great wealth", /*german*/"großer Wohlstand", /*french*/"l'aisance financière")});
                                               // /*spanish*/dinero a caudales
 
-    hintTextTable[RHT_PIECE_OF_HEART] = HintText(CustomMessage("a Piece of Heart", /*german*/"", /*french*/"un Quart de Coeur"),
+    hintTextTable[RHT_PIECE_OF_HEART] = HintText(CustomMessage("a Piece of Heart", /*german*/"ein Herzteil", /*french*/"un Quart de Coeur"),
                                                  // /*spanish*/una pieza de corazón
                                                  {
-                                                 CustomMessage("something heart-shaped", /*german*/"", /*french*/"une chose en forme de coeur")
+                                                 CustomMessage("something heart-shaped", /*german*/"etwas Herzförmiges", /*french*/"une chose en forme de coeur")
                                                   // /*spanish*/algo con forma de corazón
                                                  }, {
-                                                 CustomMessage("a little love", /*german*/"", /*french*/"un peu plus d'amour"),
+                                                 CustomMessage("a little love", /*german*/"ein wenig Liebe", /*french*/"un peu plus d'amour"),
                                                   // /*spanish*/un cuarto de amor
-                                                 CustomMessage("a broken heart", /*german*/"", /*french*/"un coeur brisé")});
+                                                 CustomMessage("a broken heart", /*german*/"ein gebrochenes Herz", /*french*/"un coeur brisé")});
                                                   // /*spanish*/un corazón roto
 
-    hintTextTable[RHT_HEART_CONTAINER] = HintText(CustomMessage("a Heart Container", /*german*/"", /*french*/"un Réceptacle de Coeur"),
+    hintTextTable[RHT_HEART_CONTAINER] = HintText(CustomMessage("a Heart Container", /*german*/"ein Herzcontainer", /*french*/"un Réceptacle de Coeur"),
                                                   // /*spanish*/un contenedor de corazón
                                                   {
-                                                  CustomMessage("something heart-shaped", /*german*/"", /*french*/"une chose en forme de coeur")
+                                                  CustomMessage("something heart-shaped", /*german*/"etwas Herzförmiges", /*french*/"une chose en forme de coeur")
                                                    // /*spanish*/algo con forma de corazón
                                                   }, {
-                                                  CustomMessage("a lot of love", /*german*/"", /*french*/"le grand amour"),
+                                                  CustomMessage("a lot of love", /*german*/"eine Menge Liebe", /*french*/"le grand amour"),
                                                    // /*spanish*/amor por doquier
-                                                  CustomMessage("a Valentine's gift", /*german*/"", /*french*/"un cadeau de Saint-Valentin"),
+                                                  CustomMessage("a Valentine's gift", /*german*/"ein Valentinsgeschenk", /*french*/"un cadeau de Saint-Valentin"),
                                                    // /*spanish*/un contenedor de afección
-                                                  CustomMessage("a boss's organ", /*german*/"", /*french*/"un organe de monstre")});
+                                                  CustomMessage("a boss's organ", /*german*/"ein monströses Organ", /*french*/"un organe de monstre")});
                                                    // /*spanish*/los órganos de un jefe
 
-    hintTextTable[RHT_ICE_TRAP] = HintText(CustomMessage("an Ice Trap", /*german*/"", /*french*/"un Piège de Glace"),
+    hintTextTable[RHT_ICE_TRAP] = HintText(CustomMessage("an Ice Trap", /*german*/"eine Eisfalle", /*french*/"un Piège de Glace"),
                                            // /*spanish*/una trampa de hielo
                                            {
-                                           CustomMessage("a Great Fairy's power", /*german*/"", /*french*/"le pouvoir d'une grande fée"),
+                                           CustomMessage("a Great Fairy's power", /*german*/"eine Kraft einer großen Fee", /*french*/"le pouvoir d'une grande fée"),
                                             // /*spanish*/el poder de una Gran Hada
-                                           CustomMessage("a magic arrow", /*german*/"", /*french*/"une flèche magique"),
+                                           CustomMessage("a magic arrow", /*german*/"ein magischer Pfeil", /*french*/"une flèche magique"),
                                             // /*spanish*/una flecha mágica
-                                           CustomMessage("a medallion", /*german*/"", /*french*/"un médaillon"),
+                                           CustomMessage("a medallion", /*german*/"ein Amulett", /*french*/"un médaillon"),
                                             // /*spanish*/un medallón
-                                           CustomMessage("a spiritual stone", /*german*/"", /*french*/"une Pierre Ancestrale"),
+                                           CustomMessage("a spiritual stone", /*german*/"ein spiritueller Stein", /*french*/"une Pierre Ancestrale"),
                                             // /*spanish*/una piedra espiritual
-                                           CustomMessage("something that can stun", /*german*/"", /*french*/"une chose qui peut paralyser")
+                                           CustomMessage("something that can stun", /*german*/"etwas, das paralysieren kann", /*french*/"une chose qui peut paralyser")
                                             // /*spanish*/algo que pueda paralizar
                                            }, {
-                                           CustomMessage("a gift from Ganon", /*german*/"", /*french*/"un cadeau de Ganon"),
+                                           CustomMessage("a gift from Ganon", /*german*/"ein Geschenk von Ganon", /*french*/"un cadeau de Ganon"),
                                             // /*spanish*/un regalo de Ganon
-                                           CustomMessage("a chilling discovery", /*german*/"", /*french*/"une frissonante découverte"),
+                                           CustomMessage("a chilling discovery", /*german*/"eine fröstelnde Entdeckung", /*french*/"une frissonante découverte"),
                                             // /*spanish*/un escalofriante hallazgo
-                                           CustomMessage("frosty fun", /*german*/"", /*french*/"une engelure")});
+                                           CustomMessage("frosty fun", /*german*/"frostiger Spaß", /*french*/"une engelure")});
                                             // /*spanish*/una gélida diversión
 
-    hintTextTable[RHT_BOMBS_5] = HintText(CustomMessage("Bombs (5 pieces)", /*german*/"", /*french*/"une demi-dizaine de bombes"),
+    hintTextTable[RHT_BOMBS_5] = HintText(CustomMessage("Bombs (5 pieces)", /*german*/"Bomben (5 Stück)", /*french*/"une demi-dizaine de bombes"),
                                           // /*spanish*/unas (5) bombas
                                           {
-                                          CustomMessage("explosives", /*german*/"", /*french*/"un paquet d'explosifs")
+                                          CustomMessage("explosives", /*german*/"Explosivpakete", /*french*/"un paquet d'explosifs")
                                            // /*spanish*/un montón de explosivos
                                           }, {
-                                          CustomMessage("a few explosives", /*german*/"", /*french*/"une poignée de pétards"),
+                                          CustomMessage("a few explosives", /*german*/"ein paar Explosivbehälter", /*french*/"une poignée de pétards"),
                                            // /*spanish*/un par de explosivos
-                                          CustomMessage("a few blast balls", /*german*/"", /*french*/"une poignée de boules bleues")});
+                                          CustomMessage("a few blast balls", /*german*/"ein paar Explosionsbälle", /*french*/"une poignée de boules bleues")});
                                            // /*spanish*/un par de estallidos
 
-    hintTextTable[RHT_BOMBS_10] = HintText(CustomMessage("Bombs (10 pieces)", /*german*/"", /*french*/"une dizaine de bombes"),
+    hintTextTable[RHT_BOMBS_10] = HintText(CustomMessage("Bombs (10 pieces)", /*german*/"Bomben (10 Stück)", /*french*/"une dizaine de bombes"),
                                            // /*spanish*/unas (10) bombas
                                            {
-                                           CustomMessage("explosives", /*german*/"", /*french*/"un paquet d'explosifs")
+                                           CustomMessage("explosives", /*german*/"Explosivpakete", /*french*/"un paquet d'explosifs")
                                             // /*spanish*/un montón de explosivos
                                            }, {
-                                           CustomMessage("some explosives", /*german*/"", /*french*/"un paquet de pétards"),
+                                           CustomMessage("some explosives", /*german*/"einige Explosivbehälter", /*french*/"un paquet de pétards"),
                                             // /*spanish*/unos cuantos explosivos
-                                           CustomMessage("some blast balls", /*german*/"", /*french*/"un paquet de boules bleues")});
+                                           CustomMessage("some blast balls", /*german*/"einige Explosionsbälle", /*french*/"un paquet de boules bleues")});
                                             // /*spanish*/unos cuantos estallidos
 
-    hintTextTable[RHT_BOMBS_20] = HintText(CustomMessage("Bombs (20 pieces)", /*german*/"", /*french*/"une vingtaine de bombes"),
+    hintTextTable[RHT_BOMBS_20] = HintText(CustomMessage("Bombs (20 pieces)", /*german*/"Bomben (20 Stück)", /*french*/"une vingtaine de bombes"),
                                            // /*spanish*/unas (20) bombas
                                            {
-                                           CustomMessage("explosives", /*german*/"", /*french*/"un paquet d'explosifs")
+                                           CustomMessage("explosives", /*german*/"Explosivpakete", /*french*/"un paquet d'explosifs")
                                             // /*spanish*/un montón de explosivos
                                            }, {
-                                           CustomMessage("lots-o-explosives", /*german*/"", /*french*/"une abondance de pétards"),
+                                           CustomMessage("lots-o-explosives", /*german*/"viele Explosivbehälter", /*french*/"une abondance de pétards"),
                                             // /*spanish*/un puñado de explosivos
-                                           CustomMessage("plenty of blast balls", /*german*/"", /*french*/"une abondance de boules bleues")});
+                                           CustomMessage("plenty of blast balls", /*german*/"viele Explosionsbälle", /*french*/"une abondance de boules bleues")});
                                             // /*spanish*/bastantes estallidos
 
-    hintTextTable[RHT_BOMBCHU_5] = HintText(CustomMessage("Bombchus (5 pieces)", /*german*/"", /*french*/"une demi-dizaine de Missiles"),
+    hintTextTable[RHT_BOMBCHU_5] = HintText(CustomMessage("Bombchus (5 pieces)", /*german*/"Krabbelminen (5 Stück)", /*french*/"une demi-dizaine de Missiles"),
                                             // /*spanish*/unos (5) bombchus
                                             {
-                                            CustomMessage("a prize of the House of Skulltulas", /*german*/"", /*french*/"un prix de la maison des Skulltulas"),
+                                            CustomMessage("a prize of the House of Skulltulas", /*german*/"ein Preis des Skulltula-Hauses", /*french*/"un prix de la maison des Skulltulas"),
                                              // /*spanish*/un obsequio de la Casa Skulltula
-                                            CustomMessage("explosives", /*german*/"", /*french*/"un paquet d'explosifs")
+                                            CustomMessage("explosives", /*german*/"Explosivpakete", /*french*/"un paquet d'explosifs")
                                              // /*spanish*/un montón de explosivos
                                             }, {
-                                            CustomMessage("a few mice bombs", /*german*/"", /*french*/"une poignée de mignons explosifs"),
+                                            CustomMessage("a few mice bombs", /*german*/"ein paar Mäusebomben", /*french*/"une poignée de mignons explosifs"),
                                              // /*spanish*/un par de bombas roedoras
-                                            CustomMessage("a few proximity mice", /*german*/"", /*french*/"une poignée de jouets à remonter"),
+                                            CustomMessage("a few proximity mice", /*german*/"ein paar Näherungsmäuse", /*french*/"une poignée de jouets à remonter"),
                                              // /*spanish*/un par de explosivos ratoncitos
-                                            CustomMessage("a few wall crawlers", /*german*/"", /*french*/"une poignée de rapides grimpeurs"),
+                                            CustomMessage("a few wall crawlers", /*german*/"ein paar Wandkrabbler", /*french*/"une poignée de rapides grimpeurs"),
                                              // /*spanish*/un par de trepaparedes
-                                            CustomMessage("a few trail blazers", /*german*/"", /*french*/"une poignée de zigzags éclatants")});
+                                            CustomMessage("a few trail blazers", /*german*/"ein paar Vorreiter", /*french*/"une poignée de zigzags éclatants")});
                                              // /*spanish*/un par de ratas propulsadas
 
-    hintTextTable[RHT_BOMBCHU_10] = HintText(CustomMessage("Bombchus (10 pieces)", /*german*/"", /*french*/"une dizaine de Missiles"),
+    hintTextTable[RHT_BOMBCHU_10] = HintText(CustomMessage("Bombchus (10 pieces)", /*german*/"Krabbelminen (10 Stück)", /*french*/"une dizaine de Missiles"),
                                              // /*spanish*/unos (10) bombchus
                                              {
-                                             CustomMessage("a prize of the House of Skulltulas", /*german*/"", /*french*/"un prix de la maison des Skulltulas"),
+                                             CustomMessage("a prize of the House of Skulltulas", /*german*/"ein Preis des Skulltula-Hauses", /*french*/"un prix de la maison des Skulltulas"),
                                               // /*spanish*/un obsequio de la Casa Skulltula
-                                             CustomMessage("explosives", /*german*/"", /*french*/"un paquet d'explosifs")
+                                             CustomMessage("explosives", /*german*/"Explosivpakete", /*french*/"un paquet d'explosifs")
                                               // /*spanish*/un montón de explosivos
                                              }, {
-                                             CustomMessage("some mice bombs", /*german*/"", /*french*/"un paquet de mignons explosifs"),
+                                             CustomMessage("some mice bombs", /*german*/"einige Mäusebomben", /*french*/"un paquet de mignons explosifs"),
                                               // /*spanish*/unas cuantas bombas roedoras
-                                             CustomMessage("some proximity mice", /*german*/"", /*french*/"un paquet de jouets à remonter"),
+                                             CustomMessage("some proximity mice", /*german*/"einige Näherungsmäuse", /*french*/"un paquet de jouets à remonter"),
                                               // /*spanish*/unos cuantos explosivos ratoncitos
-                                             CustomMessage("some wall crawlers", /*german*/"", /*french*/"un paquet de rapides grimpeurs"),
+                                             CustomMessage("some wall crawlers", /*german*/"einige Wandkrabbler", /*french*/"un paquet de rapides grimpeurs"),
                                               // /*spanish*/unos cuantos trepaparedes
-                                             CustomMessage("some trail blazers", /*german*/"", /*french*/"un paquet de zigzags éclatants")});
+                                             CustomMessage("some trail blazers", /*german*/"einige Vorreiter", /*french*/"un paquet de zigzags éclatants")});
                                               // /*spanish*/unas cuantas ratas propulsadas
 
-    hintTextTable[RHT_BOMBCHU_20] = HintText(CustomMessage("Bombchus (20 pieces)", /*german*/"", /*french*/"une vingtaine de Missiles"),
+    hintTextTable[RHT_BOMBCHU_20] = HintText(CustomMessage("Bombchus (20 pieces)", /*german*/"Krabbelminen (20 Stück)", /*french*/"une vingtaine de Missiles"),
                                              // /*spanish*/unos (20) bombchus
                                              {
-                                             CustomMessage("a prize of the House of Skulltulas", /*german*/"", /*french*/"un prix de la maison des Skulltulas"),
+                                             CustomMessage("a prize of the House of Skulltulas", /*german*/"ein Preis des Skulltula-Hauses", /*french*/"un prix de la maison des Skulltulas"),
                                               // /*spanish*/un obsequio de la Casa Skulltula
-                                             CustomMessage("explosives", /*german*/"", /*french*/"un paquet d'explosifs")
+                                             CustomMessage("explosives", /*german*/"Explosivpakete", /*french*/"un paquet d'explosifs")
                                               // /*spanish*/un montón de explosivos
                                              }, {
-                                             CustomMessage("plenty of mice bombs", /*german*/"", /*french*/"une abondance de mignons explosifs"),
+                                             CustomMessage("plenty of mice bombs", /*german*/"viele Mäusebomben", /*french*/"une abondance de mignons explosifs"),
                                               // /*spanish*/bastantes bombas roedoras
-                                             CustomMessage("plenty of proximity mice", /*german*/"", /*french*/"une abondance de jouets à remonter"),
+                                             CustomMessage("plenty of proximity mice", /*german*/"viele Näherungsmäuse", /*french*/"une abondance de jouets à remonter"),
                                               // /*spanish*/bastantes explosivos ratoncitos
-                                             CustomMessage("plenty of wall crawlers", /*german*/"", /*french*/"une abondance de rapides grimpeurs"),
+                                             CustomMessage("plenty of wall crawlers", /*german*/"viele Wandkrabbler", /*french*/"une abondance de rapides grimpeurs"),
                                               // /*spanish*/bastantes trepaparedes
-                                             CustomMessage("plenty of trail blazers", /*german*/"", /*french*/"une abondance de zigzags éclatants")});
+                                             CustomMessage("plenty of trail blazers", /*german*/"viele Vorreiter", /*french*/"une abondance de zigzags éclatants")});
                                               // /*spanish*/bastantes ratas propulsadas
 
-    hintTextTable[RHT_ARROWS_5] = HintText(CustomMessage("Arrows (5 pieces)", /*german*/"", /*french*/"une demi-dizaine de flèches"),
+    hintTextTable[RHT_ARROWS_5] = HintText(CustomMessage("Arrows (5 pieces)", /*german*/"Pfeile (5 Stück)", /*french*/"une demi-dizaine de flèches"),
                                            // /*spanish*/unas (5) flechas
                                            {
-                                           CustomMessage("a projectile", /*german*/"", /*french*/"un projectile")
+                                           CustomMessage("a projectile", /*german*/"ein Projektil", /*french*/"un projectile")
                                             // /*spanish*/un proyectil
                                            }, {
-                                           CustomMessage("a few danger darts", /*german*/"", /*french*/"une poignée d'obus"),
+                                           CustomMessage("a few danger darts", /*german*/"ein paar gefährliche Spitzen", /*french*/"une poignée d'obus"),
                                             // /*spanish*/un par de peligrosos dardos
-                                           CustomMessage("a few sharp shafts", /*german*/"", /*french*/"une poignée de piquets")});
+                                           CustomMessage("a few sharp shafts", /*german*/"ein paar scharfe Stifte", /*french*/"une poignée de piquets")});
                                             // /*spanish*/un par de puntas afiladas
 
-    hintTextTable[RHT_ARROWS_10] = HintText(CustomMessage("Arrows (10 pieces)", /*german*/"", /*french*/"une dizaine de flèches"),
+    hintTextTable[RHT_ARROWS_10] = HintText(CustomMessage("Arrows (10 pieces)", /*german*/"Pfeile (10 Stück)", /*french*/"une dizaine de flèches"),
                                             // /*spanish*/unas (10) flechas
                                             {
-                                            CustomMessage("a projectile", /*german*/"", /*french*/"un projectile")
+                                            CustomMessage("a projectile", /*german*/"ein Projektil", /*french*/"un projectile")
                                              // /*spanish*/un proyectil
                                             }, {
-                                            CustomMessage("some danger darts", /*german*/"", /*french*/"un paquet d'obus"),
+                                            CustomMessage("some danger darts", /*german*/"einige gefährliche Spitzen", /*french*/"un paquet d'obus"),
                                              // /*spanish*/unos cuantos peligrosos dardos
-                                            CustomMessage("some sharp shafts", /*german*/"", /*french*/"un paquet de piquets")});
+                                            CustomMessage("some sharp shafts", /*german*/"einige scharfe Stifte", /*french*/"un paquet de piquets")});
                                              // /*spanish*/unas cuantas puntas afiladas
 
-    hintTextTable[RHT_ARROWS_30] = HintText(CustomMessage("Arrows (30 pieces)", /*german*/"", /*french*/"une trentaine de flèches"),
+    hintTextTable[RHT_ARROWS_30] = HintText(CustomMessage("Arrows (30 pieces)", /*german*/"Pfeile (30 Stück)", /*french*/"une trentaine de flèches"),
                                             // /*spanish*/unas (30) flechas
                                             {
-                                            CustomMessage("a projectile", /*german*/"", /*french*/"un projectile")
+                                            CustomMessage("a projectile", /*german*/"ein Projektil", /*french*/"un projectile")
                                              // /*spanish*/un proyectil
                                             }, {
-                                            CustomMessage("plenty of danger darts", /*german*/"", /*french*/"une abondance d'obus"),
+                                            CustomMessage("plenty of danger darts", /*german*/"viele gefährliche Spitzen", /*french*/"une abondance d'obus"),
                                              // /*spanish*/bastantes peligrosos dardos
-                                            CustomMessage("plenty of sharp shafts", /*german*/"", /*french*/"une abondance de piquets")});
+                                            CustomMessage("plenty of sharp shafts", /*german*/"viele scharfe Stifte", /*french*/"une abondance de piquets")});
                                              // /*spanish*/bastantes puntas afiladas
 
-    hintTextTable[RHT_DEKU_NUTS_5] = HintText(CustomMessage("Deku Nuts (5 pieces)", /*german*/"", /*french*/"une demi-dizaine de noix Mojo"),
+    hintTextTable[RHT_DEKU_NUTS_5] = HintText(CustomMessage("Deku Nuts (5 pieces)", /*german*/"Deku-Nüsse (5 Stück)", /*french*/"une demi-dizaine de noix Mojo"),
                                               // /*spanish*/unas (5) nueces deku
                                               {
-                                              CustomMessage("some Deku munitions", /*german*/"", /*french*/"un paquet de munitions Mojo"),
+                                              CustomMessage("some Deku munitions", /*german*/"ein wenig Deku-Munition", /*french*/"un paquet de munitions Mojo"),
                                                // /*spanish*/un montón de municiones Deku
-                                              CustomMessage("something that can stun", /*german*/"", /*french*/"une chose qui peut paralyser")
+                                              CustomMessage("something that can stun", /*german*/"etwas, das paralysieren kann", /*french*/"une chose qui peut paralyser")
                                                // /*spanish*/algo que pueda paralizar
                                               }, {
-                                              CustomMessage("some nuts", /*german*/"", /*french*/"une poignée de noisettes"),
+                                              CustomMessage("some nuts", /*german*/"ein paar Nüsse", /*french*/"une poignée de noisettes"),
                                                // /*spanish*/un par de nueces
-                                              CustomMessage("some flashbangs", /*german*/"", /*french*/"une poignée d'éclats"),
+                                              CustomMessage("some flashbangs", /*german*/"ein paar Blendgranaten", /*french*/"une poignée d'éclats"),
                                                // /*spanish*/un par de semillas aturdidoras
-                                              CustomMessage("some scrub spit", /*german*/"", /*french*/"une poignée de crachats Mojo")});
+                                              CustomMessage("some scrub spit", /*german*/"ein wenig Buschspucke", /*french*/"une poignée de crachats Mojo")});
                                                // /*spanish*/un par de escupitajos deku
 
-    hintTextTable[RHT_DEKU_NUTS_10] = HintText(CustomMessage("Deku Nuts (10 pieces)", /*german*/"", /*french*/"une dizaine de noix Mojo"),
+    hintTextTable[RHT_DEKU_NUTS_10] = HintText(CustomMessage("Deku Nuts (10 pieces)", /*german*/"Deku-Nüsse (10 Stück)", /*french*/"une dizaine de noix Mojo"),
                                                // /*spanish*/unas (10) nueces deku
                                                {
-                                               CustomMessage("some Deku munitions", /*german*/"", /*french*/"un paquet de munitions Mojo"),
+                                               CustomMessage("some Deku munitions", /*german*/"etwas Deku-Munition", /*french*/"un paquet de munitions Mojo"),
                                                 // /*spanish*/un montón de municiones Deku
-                                               CustomMessage("something that can stun", /*german*/"", /*french*/"une chose qui peut paralyser")
+                                               CustomMessage("something that can stun", /*german*/"etwas, das paralysieren kann", /*french*/"une chose qui peut paralyser")
                                                 // /*spanish*/algo que pueda paralizar
                                                }, {
-                                               CustomMessage("lots-o-nuts", /*german*/"", /*french*/"un paquet de noisettes"),
+                                               CustomMessage("lots-o-nuts", /*german*/"einige Nüsse", /*french*/"un paquet de noisettes"),
                                                 // /*spanish*/un puñado de nueces
-                                               CustomMessage("plenty of flashbangs", /*german*/"", /*french*/"un paquet d'éclats"),
+                                               CustomMessage("plenty of flashbangs", /*german*/"einige Blendgranaten", /*french*/"un paquet d'éclats"),
                                                 // /*spanish*/unas cuantas semillas aturdidoras
-                                               CustomMessage("plenty of scrub spit", /*german*/"", /*french*/"un paquet de crachats Mojo")});
+                                               CustomMessage("plenty of scrub spit", /*german*/"einige Buschspucke", /*french*/"un paquet de crachats Mojo")});
                                                 // /*spanish*/unos cuantos escupitajos deku
 
-    hintTextTable[RHT_DEKU_SEEDS_30] = HintText(CustomMessage("Deku Seeds (30 pieces)", /*german*/"", /*french*/"une trentaine de graines Mojo"),
+    hintTextTable[RHT_DEKU_SEEDS_30] = HintText(CustomMessage("Deku Seeds (30 pieces)", /*german*/"Deku-Samen (30 Stück)", /*french*/"une trentaine de graines Mojo"),
                                                 // /*spanish*/unas (30) semillas deku
                                                 {
-                                                CustomMessage("a projectile", /*german*/"", /*french*/"un projectile"),
+                                                CustomMessage("a projectile", /*german*/"ein Projektil", /*french*/"un projectile"),
                                                  // /*spanish*/un proyectil
-                                                CustomMessage("some Deku munitions", /*german*/"", /*french*/"un paquet de munitions Mojo")
+                                                CustomMessage("some Deku munitions", /*german*/"viel Deku-Munition", /*french*/"un paquet de munitions Mojo")
                                                  // /*spanish*/un montón de municiones Deku
                                                 }, {
-                                                CustomMessage("catapult ammo", /*german*/"", /*french*/"un paquet de délicieuses munitions"),
+                                                CustomMessage("catapult ammo", /*german*/"Katapultmunition", /*french*/"un paquet de délicieuses munitions"),
                                                  // /*spanish*/un par de munición infantil
-                                                CustomMessage("lots-o-seeds", /*german*/"", /*french*/"un paquet de germes séchés")});
+                                                CustomMessage("lots-o-seeds", /*german*/"viele Samen", /*french*/"un paquet de germes séchés")});
                                                  // /*spanish*/un puñado de semillas
 
-    hintTextTable[RHT_DEKU_STICK_1] = HintText(CustomMessage("a Deku Stick", /*german*/"", /*french*/"un bâton Mojo"),
+    hintTextTable[RHT_DEKU_STICK_1] = HintText(CustomMessage("a Deku Stick", /*german*/"ein Deku-Stab", /*french*/"un bâton Mojo"),
                                                // /*spanish*/un palo deku
                                                {
-                                               CustomMessage("some Deku munitions", /*german*/"", /*french*/"un paquet de munitions Mojo")
+                                               CustomMessage("some Deku munitions", /*german*/"ein wenig Deku-Munition", /*french*/"un paquet de munitions Mojo")
                                                 // /*spanish*/un montón de municiones Deku
                                                }, {
-                                               CustomMessage("a breakable branch", /*german*/"", /*french*/"un bout de bois")});
+                                               CustomMessage("a breakable branch", /*german*/"ein brüchiger Zweig", /*french*/"un bout de bois")});
                                                 // /*spanish*/un pequeño báculo
 
-    hintTextTable[RHT_TREASURE_GAME_HEART] = HintText(CustomMessage("a Piece of Heart", /*german*/"", /*french*/"un Quart de Coeur"),
+    hintTextTable[RHT_TREASURE_GAME_HEART] = HintText(CustomMessage("a Piece of Heart", /*german*/"ein Herzteil", /*french*/"un Quart de Coeur"),
                                                       // /*spanish*/el amor de la victoria
                                                       {
-                                                      CustomMessage("something heart-shaped", /*german*/"", /*french*/"une chose en forme de coeur")
+                                                      CustomMessage("something heart-shaped", /*german*/"etwas Herzförmiges", /*french*/"une chose en forme de coeur")
                                                        // /*spanish*/algo con forma de corazón
                                                       }, {
-                                                      CustomMessage("a victory valentine", /*german*/"", /*french*/"un amour gagnant")});
+                                                      CustomMessage("a victory valentine", /*german*/"ein siegreicher Valentin", /*french*/"un amour gagnant")});
                                                        // /*spanish*/el amor victorioso
 
-    hintTextTable[RHT_TREASURE_GAME_GREEN_RUPEE] = HintText(CustomMessage("a Green Rupee", /*german*/"", /*french*/"un rubis vert"),
+    hintTextTable[RHT_TREASURE_GAME_GREEN_RUPEE] = HintText(CustomMessage("a Green Rupee", /*german*/"ein grüner Rubin", /*french*/"un rubis vert"),
                                                             // /*spanish*/una rupia verde
                                                             {
-                                                            CustomMessage("some rupees", /*german*/"", /*french*/"une quantité de rubis")
+                                                            CustomMessage("some rupees", /*german*/"einige Rubine", /*french*/"une quantité de rubis")
                                                              // /*spanish*/una cantidad de rupias
                                                             }, {
-                                                            CustomMessage("the dollar of defeat", /*german*/"", /*french*/"le rubis de la défaite")});
+                                                            CustomMessage("the dollar of defeat", /*german*/"der Rubin der Niederlage", /*french*/"le rubis de la défaite")});
                                                              // /*spanish*/el peso de la derrota
 
-    hintTextTable[RHT_TRIFORCE_PIECE] = HintText(CustomMessage("a Piece of the Triforce", /*german*/"", /*french*/"un fragment de la Triforce"),
+    hintTextTable[RHT_TRIFORCE_PIECE] = HintText(CustomMessage("a Piece of the Triforce", /*german*/"ein Triforce-Fragment", /*french*/"un fragment de la Triforce"),
                                                  // /*spanish*/un fragmento de la Trifuerza
                                                  {}, {
-                                                 CustomMessage("a triumph fork", /*german*/"", /*french*/"la Tribosse"),
+                                                 CustomMessage("a triumph fork", /*german*/"ein Dreieck des Triumphs", /*french*/"la Tribosse"),
                                                   // /*spanish*/un trígono del triunfo
-                                                 CustomMessage("cheese", /*german*/"", /*french*/"du fromage"),
+                                                 CustomMessage("cheese", /*german*/"Käse", /*french*/"du fromage"),
                                                   // /*spanish*/un porción de queso
-                                                 CustomMessage("a gold fragment", /*german*/"", /*french*/"un fragment d'or")});
+                                                 CustomMessage("a gold fragment", /*german*/"ein goldenes Fragment", /*french*/"un fragment d'or")});
                                                   // /*spanish*/un fragmento dorado
 
-    hintTextTable[RHT_GOHMA_SOUL] = HintText(CustomMessage("the soul of Gohma", /*german*/"", /*french*/""),
+    hintTextTable[RHT_GOHMA_SOUL] = HintText(CustomMessage("the soul of Gohma", /*german*/"die Seele Gohmas", /*french*/""),
                                              {
-                                             CustomMessage("something webbed", /*german*/"", /*french*/"")
+                                             CustomMessage("something webbed", /*german*/"etwas Verwobenes", /*french*/"")
                                              }, {
-                                             CustomMessage("an invasive soul", /*german*/"", /*french*/""),
-                                             CustomMessage("some spider essence", /*german*/"", /*french*/"")});
+                                             CustomMessage("an invasive soul", /*german*/"eine invasive Seele", /*french*/""),
+                                             CustomMessage("some spider essence", /*german*/"etwas spinnenartige Essenz", /*french*/"")});
 
-    hintTextTable[RHT_KING_DODONGO_SOUL] = HintText(CustomMessage("the soul of King Dodongo", /*german*/"", /*french*/""),
+    hintTextTable[RHT_KING_DODONGO_SOUL] = HintText(CustomMessage("the soul of King Dodongo", /*german*/"die Seele König Dodongos", /*french*/""),
                                                     {
-                                                    CustomMessage("something explosive", /*german*/"", /*french*/"")
+                                                    CustomMessage("something explosive", /*german*/"etwas Explosives", /*french*/"")
                                                     }, {
-                                                    CustomMessage("a royal soul", /*german*/"", /*french*/""),
-                                                    CustomMessage("some reptile essence", /*german*/"", /*french*/"")});
+                                                    CustomMessage("a royal soul", /*german*/"eine royale Seele", /*french*/""),
+                                                    CustomMessage("some reptile essence", /*german*/"etwas reptilienartige Essenz", /*french*/"")});
 
-    hintTextTable[RHT_BARINADE_SOUL] = HintText(CustomMessage("the soul of Barinade", /*german*/"", /*french*/""),
+    hintTextTable[RHT_BARINADE_SOUL] = HintText(CustomMessage("the soul of Barinade", /*german*/"die Seele Barinades", /*french*/""),
                                                 {
-                                                CustomMessage("something fishy", /*german*/"", /*french*/"")
+                                                CustomMessage("something fishy", /*german*/"etwas Fischiges", /*french*/"")
                                                 }, {
-                                                CustomMessage("an infectuous soul", /*german*/"", /*french*/""),
-                                                CustomMessage("some parasitic essence", /*german*/"", /*french*/"")});
+                                                CustomMessage("an infectuous soul", /*german*/"eine infektiöse Seele", /*french*/""),
+                                                CustomMessage("some parasitic essence", /*german*/"etwas parasitäre Essenz", /*french*/"")});
 
-    hintTextTable[RHT_PHANTOM_GANON_SOUL] = HintText(CustomMessage("the soul of Phantom Ganon", /*german*/"", /*french*/""),
+    hintTextTable[RHT_PHANTOM_GANON_SOUL] = HintText(CustomMessage("the soul of Phantom Ganon", /*german*/"die Seele Phantom-Ganons", /*french*/""),
                                                      {
-                                                     CustomMessage("something spectral", /*german*/"", /*french*/"")
+                                                     CustomMessage("something spectral", /*german*/"etwas Spektrales", /*french*/"")
                                                      }, {
-                                                     CustomMessage("a duplicate soul", /*german*/"", /*french*/""),
+                                                     CustomMessage("a duplicate soul", /*german*/"eine duplizierte Seele", /*french*/""),
 
-                                                     CustomMessage("some illusionary essence", /*german*/"", /*french*/"")});
+                                                     CustomMessage("some illusionary essence", /*german*/"etwas illusionäre Essenz", /*french*/"")});
 
-    hintTextTable[RHT_VOLVAGIA_SOUL] = HintText(CustomMessage("the soul of Volvagia", /*german*/"", /*french*/""),
+    hintTextTable[RHT_VOLVAGIA_SOUL] = HintText(CustomMessage("the soul of Volvagia", /*german*/"die Seele Volvagias", /*french*/""),
                                                 {
-                                                CustomMessage("something hot", /*german*/"", /*french*/"")
+                                                CustomMessage("something hot", /*german*/"etwas Heißes", /*french*/"")
                                                 }, {
-                                                CustomMessage("a draconic soul", /*german*/"", /*french*/""),
-                                                CustomMessage("some magmatic essence", /*german*/"", /*french*/"")});
+                                                CustomMessage("a draconic soul", /*german*/"eine drakonische Seele", /*french*/""),
+                                                CustomMessage("some magmatic essence", /*german*/"etwas magmatische Essenz", /*french*/"")});
 
-    hintTextTable[RHT_MORPHA_SOUL] = HintText(CustomMessage("the soul of Barinade", /*german*/"", /*french*/""),
+    hintTextTable[RHT_MORPHA_SOUL] = HintText(CustomMessage("the soul of Morpha", /*german*/"die Seele Morphas", /*french*/""),
                                               {
-                                              CustomMessage("something wet", /*german*/"", /*french*/"")
+                                              CustomMessage("something wet", /*german*/"etwas Nasses", /*french*/"")
                                               }, {
-                                              CustomMessage("an aquatic soul", /*german*/"", /*french*/""),
-                                              CustomMessage("some liquid essence", /*german*/"", /*french*/"")});
+                                              CustomMessage("an aquatic soul", /*german*/"eine aquatische Seele", /*french*/""),
+                                              CustomMessage("some liquid essence", /*german*/"etwas flüssige Essenz", /*french*/"")});
 
-    hintTextTable[RHT_BONGO_BONGO_SOUL] = HintText(CustomMessage("the soul of Bongo Bongo", /*german*/"", /*french*/""),
+    hintTextTable[RHT_BONGO_BONGO_SOUL] = HintText(CustomMessage("the soul of Bongo Bongo", /*german*/"die Seele Bongo Bongos", /*french*/""),
                                                    {
-                                                   CustomMessage("something dark", /*german*/"", /*french*/"")
+                                                   CustomMessage("something dark", /*german*/"etwas Dunkles", /*french*/"")
                                                    }, {
-                                                   CustomMessage("a shadowy soul", /*german*/"", /*french*/""),
-                                                   CustomMessage("some handy essence", /*german*/"", /*french*/"")});
+                                                   CustomMessage("a shadowy soul", /*german*/"eine schattige Seele", /*french*/""),
+                                                   CustomMessage("some handy essence", /*german*/"etwas praktische Essenz", /*french*/"")});
 
-    hintTextTable[RHT_TWINROVA_SOUL] = HintText(CustomMessage("the soul of Twinrova", /*german*/"", /*french*/""),
+    hintTextTable[RHT_TWINROVA_SOUL] = HintText(CustomMessage("the soul of Twinrova", /*german*/"die Seele Twinrovas", /*french*/""),
                                                 {
-                                                CustomMessage("something spiritual", /*german*/"", /*french*/"")
+                                                CustomMessage("something spiritual", /*german*/"etwas Spirituelles", /*french*/"")
                                                 }, {
-                                                CustomMessage("old souls", /*german*/"", /*french*/""),
-                                                CustomMessage("twin essences", /*german*/"", /*french*/"")});
+                                                CustomMessage("old souls", /*german*/"alte Seelen", /*french*/""),
+                                                CustomMessage("twin essences", /*german*/"Zwillingsessenzen", /*french*/"")});
 
-    hintTextTable[RHT_GANON_SOUL] = HintText(CustomMessage("the soul of Ganon", /*german*/"", /*french*/""),
+    hintTextTable[RHT_GANON_SOUL] = HintText(CustomMessage("the soul of Ganon", /*german*/"die Seele Ganons", /*french*/""),
                                              {
-                                             CustomMessage("something strong", /*german*/"", /*french*/"")
+                                             CustomMessage("something strong", /*german*/"etwas Starkes", /*french*/"")
                                              }, {
-                                             CustomMessage("an evil soul", /*german*/"", /*french*/""),
-                                             CustomMessage("some powerful essence", /*german*/"", /*french*/"")});
+                                             CustomMessage("an evil soul", /*german*/"eine böse Seele", /*french*/""),
+                                             CustomMessage("some powerful essence", /*german*/"etwas mächtige Essenz", /*french*/"")});
 
-    hintTextTable[RHT_OCARINA_A_BUTTON] = HintText(CustomMessage("an Ocarina A Button", /*german*/"", /*french*/"la Touche A de l'Ocarina"),
+    hintTextTable[RHT_OCARINA_A_BUTTON] = HintText(CustomMessage("an Ocarina A Button", /*german*/"eine Okarina A Taste", /*french*/"la Touche A de l'Ocarina"),
                                                    // /*spanish*/un botón A de Ocarina
                                                    {
-                                                   CustomMessage("something melodic", /*german*/"", /*french*/"quelque chose de mélodieux")
+                                                   CustomMessage("something melodic", /*german*/"etwas Melodisches", /*french*/"quelque chose de mélodieux")
                                                     // /*spanish*/algo melódico
                                                    }, {
-                                                   CustomMessage("a musical letter", /*german*/"", /*french*/"une lettre musicale")});
+                                                   CustomMessage("a musical letter", /*german*/"ein musikalischer Brief", /*french*/"une lettre musicale")});
                                                     // /*spanish*/una letra musical
 
-    hintTextTable[RHT_OCARINA_C_UP_BUTTON] = HintText(CustomMessage("an Ocarina C Up Button", /*german*/"", /*french*/"la Touche C-Haut de l'Ocarina"),
+    hintTextTable[RHT_OCARINA_C_UP_BUTTON] = HintText(CustomMessage("an Ocarina C Up Button", /*german*/"eine Okarina C-Oben Taste", /*french*/"la Touche C-Haut de l'Ocarina"),
                                                       // /*spanish*/un botón C superior de Ocarina
                                                       {
-                                                      CustomMessage("something melodic", /*german*/"", /*french*/"quelque chose de mélodieux")
+                                                      CustomMessage("something melodic", /*german*/"etwas Melodisches", /*french*/"quelque chose de mélodieux")
                                                        // /*spanish*/algo melódico
                                                       }, {
-                                                      CustomMessage("a high tone", /*german*/"", /*french*/"une tonalité élevée")});
+                                                      CustomMessage("a high tone", /*german*/"ein hoher Ton", /*french*/"une tonalité élevée")});
                                                        // /*spanish*/un tono alto
 
-    hintTextTable[RHT_OCARINA_C_DOWN_BUTTON] = HintText(CustomMessage("an Ocarina C Down Button", /*german*/"", /*french*/"la Touche C-Bas de l'Ocarina"),
+    hintTextTable[RHT_OCARINA_C_DOWN_BUTTON] = HintText(CustomMessage("an Ocarina C Down Button", /*german*/"eine Okarina C-Unten Taste", /*french*/"la Touche C-Bas de l'Ocarina"),
                                                         // /*spanish*/un botón C inferior de Ocarina
                                                         {
-                                                        CustomMessage("something melodic", /*german*/"", /*french*/"quelque chose de mélodieux")
+                                                        CustomMessage("something melodic", /*german*/"etwas Melodisches", /*french*/"quelque chose de mélodieux")
                                                          // /*spanish*/algo melódico
                                                         }, {
-                                                        CustomMessage("a low tone", /*german*/"", /*french*/"une tonalité basse")});
+                                                        CustomMessage("a low tone", /*german*/"ein tiefer Ton", /*french*/"une tonalité basse")});
                                                          // /*spanish*/un tono bajo
 
-    hintTextTable[RHT_OCARINA_C_LEFT_BUTTON] = HintText(CustomMessage("an Ocarina C Left Button", /*german*/"", /*french*/"la Touche C-Gauche de l'Ocarina"),
+    hintTextTable[RHT_OCARINA_C_LEFT_BUTTON] = HintText(CustomMessage("an Ocarina C Left Button", /*german*/"eine Okarina C-Links Taste", /*french*/"la Touche C-Gauche de l'Ocarina"),
                                                         // /*spanish*/un botón C izquierdo de Ocarina
                                                         {
-                                                        CustomMessage("something melodic", /*german*/"", /*french*/"quelque chose de mélodieux")
+                                                        CustomMessage("something melodic", /*german*/"etwas Melodisches", /*french*/"quelque chose de mélodieux")
                                                          // /*spanish*/algo melódico
                                                         }, {
-                                                        CustomMessage("a leftward tone", /*german*/"", /*french*/"une tonalité vers la gauche")});
+                                                        CustomMessage("a leftward tone", /*german*/"ein linksseitiger Ton", /*french*/"une tonalité vers la gauche")});
                                                          // /*spanish*/un tono hacia la izquierda
 
-    hintTextTable[RHT_OCARINA_C_RIGHT_BUTTON] = HintText(CustomMessage("an Ocarina C Right Button", /*german*/"", /*french*/"la Touche C-Droit de l'Ocarina"),
+    hintTextTable[RHT_OCARINA_C_RIGHT_BUTTON] = HintText(CustomMessage("an Ocarina C Right Button", /*german*/"eine Okarina C-Rechts Taste", /*french*/"la Touche C-Droit de l'Ocarina"),
                                                          // /*spanish*/un botón C derecho de Ocarina
                                                          {
-                                                         CustomMessage("something melodic", /*german*/"", /*french*/"quelque chose de mélodieux")
+                                                         CustomMessage("something melodic", /*german*/"etwas Melodisches", /*french*/"quelque chose de mélodieux")
                                                           // /*spanish*/algo melódico
                                                          }, {
-                                                         CustomMessage("a rightward tone", /*german*/"", /*french*/"une tonalité vers la droite")});
+                                                         CustomMessage("a rightward tone", /*german*/"ein rechtsseitiger Ton", /*french*/"une tonalité vers la droite")});
                                                           // /*spanish*/un tono hacia la derecha
 
-    hintTextTable[RHT_FISHING_POLE] = HintText(CustomMessage("a fishing pole", /*german*/"", /*french*/"canne à pêche"),
+    hintTextTable[RHT_FISHING_POLE] = HintText(CustomMessage("a fishing pole", /*german*/"eine Angelrute", /*french*/"canne à pêche"),
                                                // /*spanish*/caña de pescar
                                                {
-                                               CustomMessage("the pond owner's property", /*german*/"", /*french*/"(canne à pêche)")
+                                               CustomMessage("the pond owner's property", /*german*/"der Besitz des Teicheigners", /*french*/"(canne à pêche)")
                                                 // /*spanish*/(caña de pescar)
                                                }, {
-                                               CustomMessage("a fish-puller", /*german*/"", /*french*/"(canne à pêche)")});
+                                               CustomMessage("a fish-puller", /*german*/"ein Fischzieher", /*french*/"(canne à pêche)")});
                                                 // /*spanish*/(caña de pescar)
-
+  
     hintTextTable[RHT_QUIVER_INF] = HintText(CustomMessage("", /*german*/"!!!", /*french*/"!!!"),
                                              {
                                              CustomMessage("", /*german*/"!!!", /*french*/"!!!"),
@@ -2106,27 +2106,27 @@ void StaticData::HintTable_Init_Item() {
                                              }, {
                                              CustomMessage("", /*german*/"!!!", /*french*/"!!!")});
 
-    hintTextTable[RHT_EPONA] = HintText(CustomMessage("Epona", /*german*/"", /*french*/"Epona"),
+    hintTextTable[RHT_EPONA] = HintText(CustomMessage("Epona", /*german*/"Epona", /*french*/"Epona"),
                                     // /*spanish*/a Epona
                                     {
-                                    CustomMessage("something from Malon", /*german*/"", /*french*/"un cadeau de Malon"),
+                                    CustomMessage("something from Malon", /*german*/"ein Geschenk von Malon", /*french*/"un cadeau de Malon"),
                                          // /*spanish*/un obsequio de Malon
-                                    CustomMessage("a song sung by frogs", /*german*/"", /*french*/"une chanson aimée des grenouilles"),
+                                    CustomMessage("a song sung by frogs", /*german*/"ein von Fröschen gesungenes Lied", /*french*/"une chanson aimée des grenouilles"),
                                          // /*spanish*/una melodía de ranas
-                                    CustomMessage("something to cross a broken bridge", /*german*/"", /*french*/"une chose pour traverser un pont brisé")
+                                    CustomMessage("something to cross a broken bridge", /*german*/"etwas, um eine kaputte Brücke zu überqueren", /*french*/"une chose pour traverser un pont brisé")
                                          // /*spanish*/algo para cruzar un puente roto
                                     }, {
-                                    CustomMessage("a horse", /*german*/"", /*french*/"un fidèle destrier"),
+                                    CustomMessage("a horse", /*german*/"ein Pferd", /*french*/"un fidèle destrier"),
                                          // /*spanish*/una yegua
-                                    CustomMessage("a four legged friend", /*german*/"", /*french*/"un puissant animal")});
+                                    CustomMessage("a four legged friend", /*german*/"ein vierbeiniger Freund", /*french*/"un puissant animal")});
                                          // /*spanish*/una amiga cuadrúpeda
 
     //What is this used for?
-    hintTextTable[RHT_HINT_MYSTERIOUS] = HintText(CustomMessage("something mysterious", /*german*/"etwas Unvorhergesehenes", /*french*/"un sacré mystère"));
+    hintTextTable[RHT_HINT_MYSTERIOUS] = HintText(CustomMessage("something mysterious", /*german*/"etwas Mysteriöses", /*french*/"un sacré mystère"));
                                                   // /*spanish*/algo misterioso
 
-    hintTextTable[RHT_MYSTERIOUS_ITEM] = HintText(CustomMessage("mysterious item", /*german*/"mysteriösen Gegenstand", /*french*/"objet mystérieux"));
+    hintTextTable[RHT_MYSTERIOUS_ITEM] = HintText(CustomMessage("mysterious item", /*german*/"mysteriöser Gegenstand", /*french*/"objet mystérieux"));
                                                   // /*spanish*/algo misterioso
 
 }
-}
\ No newline at end of file
+}
diff --git a/soh/soh/Enhancements/randomizer/item_list.cpp b/soh/soh/Enhancements/randomizer/item_list.cpp
index 526c7b3ae..e465d2575 100644
--- a/soh/soh/Enhancements/randomizer/item_list.cpp
+++ b/soh/soh/Enhancements/randomizer/item_list.cpp
@@ -12,331 +12,331 @@ std::unordered_map<std::string, RandomizerGet> Rando::StaticData::itemNameToEnum
 
 void Rando::StaticData::InitItemTable() {
     auto logic = Context::GetInstance()->GetLogic();
-    itemTable[RG_NONE] =                                Item(RG_NONE,                             Text{ "No Item", "Rien", "Kein Artikel" },                                                                        ITEMTYPE_EVENT,             GI_RUPEE_GREEN,       false, LOGIC_NONE,                         RHT_NONE,                              ITEM_NONE,                      0,                      0,                  0,                           0,    0,                ITEM_CATEGORY_JUNK,   MOD_NONE);
-    //        Randomizer Get                                 Randomizer Get                       Name Text                                                                                                         Type                        Get Item ID           Adv.   Logic Value                         Hint Text Key                          Item ID                         Object ID               Draw ID             Text ID                      field Chest Animation Item Category         Mod Index
-    itemTable[RG_KOKIRI_SWORD] =                        Item(RG_KOKIRI_SWORD,                     Text{ "Kokiri Sword", "Épée Kokiri", "Kokiri-Schwert" },                                                          ITEMTYPE_EQUIP,             GI_SWORD_KOKIRI,      true,  LOGIC_KOKIRI_SWORD,                 RHT_KOKIRI_SWORD,                      ITEM_SWORD_KOKIRI,              OBJECT_GI_SWORD_1,      GID_SWORD_KOKIRI,   0xA4,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_MASTER_SWORD] =                        Item(RG_MASTER_SWORD,                     Text{ "Master Sword", "Épée de Legende", "Espada Master"},                                                        ITEMTYPE_EQUIP,             0xE0,                 true,  LOGIC_MASTER_SWORD,                 RHT_MASTER_SWORD,                      ITEM_SWORD_MASTER,              OBJECT_TOKI_OBJECTS,    GID_SWORD_BGS,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_NONE] =                                Item(RG_NONE,                             Text{ "No Item", "Rien", "Kein Artikel" },                                                                                           ITEMTYPE_EVENT,             GI_RUPEE_GREEN,       false, LOGIC_NONE,                         RHT_NONE,                              ITEM_NONE,                            0,                       0,                   0,                           0,    0,                ITEM_CATEGORY_JUNK,   MOD_NONE);
+    //        Randomizer Get                                 Randomizer Get                       Name Text                                                                                                                            Type                        Get Item ID           Adv.   Logic Value                         Hint Text Key                          Item ID                               Object ID                Draw ID              Text ID                      field Chest Animation   Item Category         Mod Index
+    itemTable[RG_KOKIRI_SWORD] =                        Item(RG_KOKIRI_SWORD,                     Text{ "Kokiri Sword", "Épée Kokiri", "Kokiri-Schwert" },                                                                             ITEMTYPE_EQUIP,             GI_SWORD_KOKIRI,      true,  LOGIC_KOKIRI_SWORD,                 RHT_KOKIRI_SWORD,                      ITEM_SWORD_KOKIRI,                    OBJECT_GI_SWORD_1,       GID_SWORD_KOKIRI,    0xA4,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_MASTER_SWORD] =                        Item(RG_MASTER_SWORD,                     Text{ "Master Sword", "Épée de Legende", "Master-Schwert"},                                                                          ITEMTYPE_EQUIP,             0xE0,                 true,  LOGIC_MASTER_SWORD,                 RHT_MASTER_SWORD,                      ITEM_SWORD_MASTER,                    OBJECT_TOKI_OBJECTS,     GID_SWORD_BGS,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_MASTER_SWORD].SetCustomDrawFunc(Randomizer_DrawMasterSword);
-    itemTable[RG_GIANTS_KNIFE] =                        Item(RG_GIANTS_KNIFE,                     Text{ "Giant's Knife", "Lame des Géants", "Messer des Riesen" },                                                  ITEMTYPE_EQUIP,             GI_SWORD_KNIFE,       true,  LOGIC_NONE,                         RHT_GIANTS_KNIFE,                      ITEM_SWORD_BGS,                 OBJECT_GI_LONGSWORD,    GID_SWORD_BGS,      0x4B,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_BIGGORON_SWORD] =                      Item(RG_BIGGORON_SWORD,                   Text{ "Biggoron's Sword", "Épée de Biggoron", "Biggoron-Schwert" },                                               ITEMTYPE_EQUIP,             GI_SWORD_BGS,         true,  LOGIC_BIGGORON_SWORD,               RHT_BIGGORON_SWORD,                    ITEM_SWORD_BGS,                 OBJECT_GI_LONGSWORD,    GID_SWORD_BGS,      0x0C,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_DEKU_SHIELD] =                         Item(RG_DEKU_SHIELD,                      Text{ "Deku Shield", "Bouclier Mojo", "Deku-Schild" },                                                            ITEMTYPE_EQUIP,             GI_SHIELD_DEKU,       false, LOGIC_DEKU_SHIELD,                  RHT_DEKU_SHIELD,                       ITEM_SHIELD_DEKU,               OBJECT_GI_SHIELD_1,     GID_SHIELD_DEKU,    0x4C,                        0xA0, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_HYLIAN_SHIELD] =                       Item(RG_HYLIAN_SHIELD,                    Text{ "Hylian Shield", "Bouclier Hylien", "Hylia-Schild" },                                                       ITEMTYPE_EQUIP,             GI_SHIELD_HYLIAN,     false, LOGIC_HYLIAN_SHIELD,                RHT_HYLIAN_SHIELD,                     ITEM_SHIELD_HYLIAN,             OBJECT_GI_SHIELD_2,     GID_SHIELD_HYLIAN,  0x4D,                        0xA0, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_MIRROR_SHIELD] =                       Item(RG_MIRROR_SHIELD,                    Text{ "Mirror Shield", "Bouclier Miroir", "Spiegel-Schild" },                                                     ITEMTYPE_EQUIP,             GI_SHIELD_MIRROR,     true,  LOGIC_MIRROR_SHIELD,                RHT_MIRROR_SHIELD,                     ITEM_SHIELD_MIRROR,             OBJECT_GI_SHIELD_3,     GID_SHIELD_MIRROR,  0x4E,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_GORON_TUNIC] =                         Item(RG_GORON_TUNIC,                      Text{ "Goron Tunic", "Tunique Goron", "Goronen-Tunika" },                                                         ITEMTYPE_EQUIP,             GI_TUNIC_GORON,       true,  LOGIC_GORON_TUNIC,                  RHT_GORON_TUNIC,                       ITEM_TUNIC_GORON,               OBJECT_GI_CLOTHES,      GID_TUNIC_GORON,    0x50,                        0xA0, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_ZORA_TUNIC] =                          Item(RG_ZORA_TUNIC,                       Text{ "Zora Tunic", "Tunique Zora", "Zora-Tunika" },                                                              ITEMTYPE_EQUIP,             GI_TUNIC_ZORA,        true,  LOGIC_ZORA_TUNIC,                   RHT_ZORA_TUNIC,                        ITEM_TUNIC_ZORA,                OBJECT_GI_CLOTHES,      GID_TUNIC_ZORA,     0x51,                        0xA0, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_IRON_BOOTS] =                          Item(RG_IRON_BOOTS,                       Text{ "Iron Boots", "Bottes de plomb", "Eisenstiefel" },                                                          ITEMTYPE_EQUIP,             GI_BOOTS_IRON,        true,  LOGIC_IRON_BOOTS,                   RHT_IRON_BOOTS,                        ITEM_BOOTS_IRON,                OBJECT_GI_BOOTS_2,      GID_BOOTS_IRON,     0x53,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_HOVER_BOOTS] =                         Item(RG_HOVER_BOOTS,                      Text{ "Hover Boots", "Bottes de airs", "Gleitstiefel" },                                                          ITEMTYPE_EQUIP,             GI_BOOTS_HOVER,       true,  LOGIC_HOVER_BOOTS,                  RHT_HOVER_BOOTS,                       ITEM_BOOTS_HOVER,               OBJECT_GI_HOVERBOOTS,   GID_BOOTS_HOVER,    0x54,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_BOOMERANG] =                           Item(RG_BOOMERANG,                        Text{ "Boomerang", "Boomerang", "Bumerang" },                                                                     ITEMTYPE_ITEM,              GI_BOOMERANG,         true,  LOGIC_BOOMERANG,                    RHT_BOOMERANG,                         ITEM_BOOMERANG,                 OBJECT_GI_BOOMERANG,    GID_BOOMERANG,      0x35,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_LENS_OF_TRUTH] =                       Item(RG_LENS_OF_TRUTH,                    Text{ "Lens of Truth", "Monocle de Vérité", "Auge der Wahrheit" },                                                ITEMTYPE_ITEM,              GI_LENS,              true,  LOGIC_LENS_OF_TRUTH,                RHT_LENS_OF_TRUTH,                     ITEM_LENS,                      OBJECT_GI_GLASSES,      GID_LENS,           0x39,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_MEGATON_HAMMER] =                      Item(RG_MEGATON_HAMMER,                   Text{ "Megaton Hammer", "Masse des Titans", "Stahlhammer" },                                                      ITEMTYPE_ITEM,              GI_HAMMER,            true,  LOGIC_HAMMER,                       RHT_MEGATON_HAMMER,                    ITEM_HAMMER,                    OBJECT_GI_HAMMER,       GID_HAMMER,         0x38,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_STONE_OF_AGONY] =                      Item(RG_STONE_OF_AGONY,                   Text{ "Stone of Agony", "Pierre de Souffrance", "Stein der Qualen" },                                             ITEMTYPE_ITEM,              GI_STONE_OF_AGONY,    true,  LOGIC_STONE_OF_AGONY,               RHT_STONE_OF_AGONY,                    ITEM_STONE_OF_AGONY,            OBJECT_GI_MAP,          GID_STONE_OF_AGONY, 0x68,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_DINS_FIRE] =                           Item(RG_DINS_FIRE,                        Text{ "Din's Fire", "Feu de Din", "Dins Feuerinferno" },                                                          ITEMTYPE_ITEM,              GI_DINS_FIRE,         true,  LOGIC_DINS_FIRE,                    RHT_DINS_FIRE,                         ITEM_DINS_FIRE,                 OBJECT_GI_GODDESS,      GID_DINS_FIRE,      0xAD,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_FARORES_WIND] =                        Item(RG_FARORES_WIND,                     Text{ "Farore's Wind", "Vent de Farore", "Farores Donnersturm" },                                                 ITEMTYPE_ITEM,              GI_FARORES_WIND,      true,  LOGIC_FARORES_WIND,                 RHT_FARORES_WIND,                      ITEM_FARORES_WIND,              OBJECT_GI_GODDESS,      GID_FARORES_WIND,   0xAE,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_NAYRUS_LOVE] =                         Item(RG_NAYRUS_LOVE,                      Text{ "Nayru's Love", "Amour de Nayru", "Nayrus Umarmung" },                                                      ITEMTYPE_ITEM,              GI_NAYRUS_LOVE,       true,  LOGIC_NAYRUS_LOVE,                  RHT_NAYRUS_LOVE,                       ITEM_NAYRUS_LOVE,               OBJECT_GI_GODDESS,      GID_NAYRUS_LOVE,    0xAF,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_FIRE_ARROWS] =                         Item(RG_FIRE_ARROWS,                      Text{ "Fire Arrow", "Flèche de Feu", "Feuerpfeile" },                                                             ITEMTYPE_ITEM,              GI_ARROW_FIRE,        true,  LOGIC_FIRE_ARROWS,                  RHT_FIRE_ARROWS,                       ITEM_ARROW_FIRE,                OBJECT_GI_M_ARROW,      GID_ARROW_FIRE,     0x70,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_ICE_ARROWS] =                          Item(RG_ICE_ARROWS,                       Text{ "Ice Arrow", "Flèche de Glace", "Eispfeil" },                                                               ITEMTYPE_ITEM,              GI_ARROW_ICE,         true,  LOGIC_ICE_ARROWS,                   RHT_ICE_ARROWS,                        ITEM_ARROW_ICE,                 OBJECT_GI_M_ARROW,      GID_ARROW_ICE,      0x71,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_LIGHT_ARROWS] =                        Item(RG_LIGHT_ARROWS,                     Text{ "Light Arrow", "Flèche de Lumière", "Lichtpfeil" },                                                         ITEMTYPE_ITEM,              GI_ARROW_LIGHT,       true,  LOGIC_LIGHT_ARROWS,                 RHT_LIGHT_ARROWS,                      ITEM_ARROW_LIGHT,               OBJECT_GI_M_ARROW,      GID_ARROW_LIGHT,    0x72,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_GERUDO_MEMBERSHIP_CARD] =              Item(RG_GERUDO_MEMBERSHIP_CARD,           Text{ "Gerudo Membership Card", "Carte Gerudo", "Gerudo Karte" },                                                 ITEMTYPE_ITEM,              GI_GERUDO_CARD,       true,  LOGIC_GERUDO_CARD,                  RHT_GERUDO_MEMBERSHIP_CARD,            ITEM_GERUDO_CARD,               OBJECT_GI_GERUDO,       GID_GERUDO_CARD,    0x7B,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_MAGIC_BEAN] =                          Item(RG_MAGIC_BEAN,                       Text{ "Magic Bean", "Haricots Magiques", "Wundererbse" },                                                         ITEMTYPE_ITEM,              GI_BEAN,              true,  LOGIC_MAGIC_BEAN,                   RHT_MAGIC_BEAN,                        ITEM_BEAN,                      OBJECT_GI_BEAN,         GID_BEAN,           0x48,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_MAGIC_BEAN_PACK] =                     Item(RG_MAGIC_BEAN_PACK,                  Text{ "Magic Bean Pack", "Paquet de Haricots Magiques", "Wundererbsen-Packung" },                                 ITEMTYPE_ITEM,              RG_MAGIC_BEAN_PACK,   true,  LOGIC_MAGIC_BEAN,                   RHT_MAGIC_BEAN_PACK,                   RG_MAGIC_BEAN_PACK,             OBJECT_GI_BEAN,         GID_BEAN,           TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_DOUBLE_DEFENSE] =                      Item(RG_DOUBLE_DEFENSE,                   Text{ "Double Defense", "Double Défence", "Doppelte Verteidigung" },                                              ITEMTYPE_ITEM,              RG_DOUBLE_DEFENSE,    true,  LOGIC_DOUBLE_DEFENSE,               RHT_DOUBLE_DEFENSE,                    RG_DOUBLE_DEFENSE,              OBJECT_GI_HEARTS,       GID_HEART_CONTAINER,0xE9,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_GIANTS_KNIFE] =                        Item(RG_GIANTS_KNIFE,                     Text{ "Giant's Knife", "Lame des Géants", "Langschwert" },                                                                           ITEMTYPE_EQUIP,             GI_SWORD_KNIFE,       true,  LOGIC_NONE,                         RHT_GIANTS_KNIFE,                      ITEM_SWORD_BGS,                       OBJECT_GI_LONGSWORD,     GID_SWORD_BGS,       0x4B,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BIGGORON_SWORD] =                      Item(RG_BIGGORON_SWORD,                   Text{ "Biggoron's Sword", "Épée de Biggoron", "Biggoron-Schwert" },                                                                  ITEMTYPE_EQUIP,             GI_SWORD_BGS,         true,  LOGIC_BIGGORON_SWORD,               RHT_BIGGORON_SWORD,                    ITEM_SWORD_BGS,                       OBJECT_GI_LONGSWORD,     GID_SWORD_BGS,       0x0C,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_DEKU_SHIELD] =                         Item(RG_DEKU_SHIELD,                      Text{ "Deku Shield", "Bouclier Mojo", "Deku-Schild" },                                                                               ITEMTYPE_EQUIP,             GI_SHIELD_DEKU,       false, LOGIC_DEKU_SHIELD,                  RHT_DEKU_SHIELD,                       ITEM_SHIELD_DEKU,                     OBJECT_GI_SHIELD_1,      GID_SHIELD_DEKU,     0x4C,                        0xA0, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_HYLIAN_SHIELD] =                       Item(RG_HYLIAN_SHIELD,                    Text{ "Hylian Shield", "Bouclier Hylien", "Hylia-Schild" },                                                                          ITEMTYPE_EQUIP,             GI_SHIELD_HYLIAN,     false, LOGIC_HYLIAN_SHIELD,                RHT_HYLIAN_SHIELD,                     ITEM_SHIELD_HYLIAN,                   OBJECT_GI_SHIELD_2,      GID_SHIELD_HYLIAN,   0x4D,                        0xA0, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_MIRROR_SHIELD] =                       Item(RG_MIRROR_SHIELD,                    Text{ "Mirror Shield", "Bouclier Miroir", "Spiegelschild" },                                                                         ITEMTYPE_EQUIP,             GI_SHIELD_MIRROR,     true,  LOGIC_MIRROR_SHIELD,                RHT_MIRROR_SHIELD,                     ITEM_SHIELD_MIRROR,                   OBJECT_GI_SHIELD_3,      GID_SHIELD_MIRROR,   0x4E,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_GORON_TUNIC] =                         Item(RG_GORON_TUNIC,                      Text{ "Goron Tunic", "Tunique Goron", "Goronen-Tunika" },                                                                            ITEMTYPE_EQUIP,             GI_TUNIC_GORON,       true,  LOGIC_GORON_TUNIC,                  RHT_GORON_TUNIC,                       ITEM_TUNIC_GORON,                     OBJECT_GI_CLOTHES,       GID_TUNIC_GORON,     0x50,                        0xA0, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_ZORA_TUNIC] =                          Item(RG_ZORA_TUNIC,                       Text{ "Zora Tunic", "Tunique Zora", "Zora-Tunika" },                                                                                 ITEMTYPE_EQUIP,             GI_TUNIC_ZORA,        true,  LOGIC_ZORA_TUNIC,                   RHT_ZORA_TUNIC,                        ITEM_TUNIC_ZORA,                      OBJECT_GI_CLOTHES,       GID_TUNIC_ZORA,      0x51,                        0xA0, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_IRON_BOOTS] =                          Item(RG_IRON_BOOTS,                       Text{ "Iron Boots", "Bottes de plomb", "Eisenstiefel" },                                                                             ITEMTYPE_EQUIP,             GI_BOOTS_IRON,        true,  LOGIC_IRON_BOOTS,                   RHT_IRON_BOOTS,                        ITEM_BOOTS_IRON,                      OBJECT_GI_BOOTS_2,       GID_BOOTS_IRON,      0x53,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_HOVER_BOOTS] =                         Item(RG_HOVER_BOOTS,                      Text{ "Hover Boots", "Bottes de airs", "Gleitstiefel" },                                                                             ITEMTYPE_EQUIP,             GI_BOOTS_HOVER,       true,  LOGIC_HOVER_BOOTS,                  RHT_HOVER_BOOTS,                       ITEM_BOOTS_HOVER,                     OBJECT_GI_HOVERBOOTS,    GID_BOOTS_HOVER,     0x54,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BOOMERANG] =                           Item(RG_BOOMERANG,                        Text{ "Boomerang", "Boomerang", "Bumerang" },                                                                                        ITEMTYPE_ITEM,              GI_BOOMERANG,         true,  LOGIC_BOOMERANG,                    RHT_BOOMERANG,                         ITEM_BOOMERANG,                       OBJECT_GI_BOOMERANG,     GID_BOOMERANG,       0x35,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_LENS_OF_TRUTH] =                       Item(RG_LENS_OF_TRUTH,                    Text{ "Lens of Truth", "Monocle de Vérité", "Auge der Wahrheit" },                                                                   ITEMTYPE_ITEM,              GI_LENS,              true,  LOGIC_LENS_OF_TRUTH,                RHT_LENS_OF_TRUTH,                     ITEM_LENS,                            OBJECT_GI_GLASSES,       GID_LENS,            0x39,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_MEGATON_HAMMER] =                      Item(RG_MEGATON_HAMMER,                   Text{ "Megaton Hammer", "Masse des Titans", "Stahlhammer" },                                                                         ITEMTYPE_ITEM,              GI_HAMMER,            true,  LOGIC_HAMMER,                       RHT_MEGATON_HAMMER,                    ITEM_HAMMER,                          OBJECT_GI_HAMMER,        GID_HAMMER,          0x38,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_STONE_OF_AGONY] =                      Item(RG_STONE_OF_AGONY,                   Text{ "Stone of Agony", "Pierre de Souffrance", "Stein des Wissens" },                                                               ITEMTYPE_ITEM,              GI_STONE_OF_AGONY,    true,  LOGIC_STONE_OF_AGONY,               RHT_STONE_OF_AGONY,                    ITEM_STONE_OF_AGONY,                  OBJECT_GI_MAP,           GID_STONE_OF_AGONY,  0x68,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_DINS_FIRE] =                           Item(RG_DINS_FIRE,                        Text{ "Din's Fire", "Feu de Din", "Dins Feuerinferno" },                                                                             ITEMTYPE_ITEM,              GI_DINS_FIRE,         true,  LOGIC_DINS_FIRE,                    RHT_DINS_FIRE,                         ITEM_DINS_FIRE,                       OBJECT_GI_GODDESS,       GID_DINS_FIRE,       0xAD,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_FARORES_WIND] =                        Item(RG_FARORES_WIND,                     Text{ "Farore's Wind", "Vent de Farore", "Farores Donnersturm" },                                                                    ITEMTYPE_ITEM,              GI_FARORES_WIND,      true,  LOGIC_FARORES_WIND,                 RHT_FARORES_WIND,                      ITEM_FARORES_WIND,                    OBJECT_GI_GODDESS,       GID_FARORES_WIND,    0xAE,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_NAYRUS_LOVE] =                         Item(RG_NAYRUS_LOVE,                      Text{ "Nayru's Love", "Amour de Nayru", "Nayrus Umarmung" },                                                                         ITEMTYPE_ITEM,              GI_NAYRUS_LOVE,       true,  LOGIC_NAYRUS_LOVE,                  RHT_NAYRUS_LOVE,                       ITEM_NAYRUS_LOVE,                     OBJECT_GI_GODDESS,       GID_NAYRUS_LOVE,     0xAF,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_FIRE_ARROWS] =                         Item(RG_FIRE_ARROWS,                      Text{ "Fire Arrow", "Flèche de Feu", "Feuerpfeil" },                                                                                 ITEMTYPE_ITEM,              GI_ARROW_FIRE,        true,  LOGIC_FIRE_ARROWS,                  RHT_FIRE_ARROWS,                       ITEM_ARROW_FIRE,                      OBJECT_GI_M_ARROW,       GID_ARROW_FIRE,      0x70,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_ICE_ARROWS] =                          Item(RG_ICE_ARROWS,                       Text{ "Ice Arrow", "Flèche de Glace", "Eispfeil" },                                                                                  ITEMTYPE_ITEM,              GI_ARROW_ICE,         true,  LOGIC_ICE_ARROWS,                   RHT_ICE_ARROWS,                        ITEM_ARROW_ICE,                       OBJECT_GI_M_ARROW,       GID_ARROW_ICE,       0x71,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_LIGHT_ARROWS] =                        Item(RG_LIGHT_ARROWS,                     Text{ "Light Arrow", "Flèche de Lumière", "Lichtpfeil" },                                                                            ITEMTYPE_ITEM,              GI_ARROW_LIGHT,       true,  LOGIC_LIGHT_ARROWS,                 RHT_LIGHT_ARROWS,                      ITEM_ARROW_LIGHT,                     OBJECT_GI_M_ARROW,       GID_ARROW_LIGHT,     0x72,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_GERUDO_MEMBERSHIP_CARD] =              Item(RG_GERUDO_MEMBERSHIP_CARD,           Text{ "Gerudo Membership Card", "Carte Gerudo", "Gerudo-Pass" },                                                                     ITEMTYPE_ITEM,              GI_GERUDO_CARD,       true,  LOGIC_GERUDO_CARD,                  RHT_GERUDO_MEMBERSHIP_CARD,            ITEM_GERUDO_CARD,                     OBJECT_GI_GERUDO,        GID_GERUDO_CARD,     0x7B,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_MAGIC_BEAN] =                          Item(RG_MAGIC_BEAN,                       Text{ "Magic Bean", "Haricots Magiques", "Wundererbse" },                                                                            ITEMTYPE_ITEM,              GI_BEAN,              true,  LOGIC_MAGIC_BEAN,                   RHT_MAGIC_BEAN,                        ITEM_BEAN,                            OBJECT_GI_BEAN,          GID_BEAN,            0x48,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_MAGIC_BEAN_PACK] =                     Item(RG_MAGIC_BEAN_PACK,                  Text{ "Magic Bean Pack", "Paquet de Haricots Magiques", "Wundererbsen-Packung" },                                                    ITEMTYPE_ITEM,              RG_MAGIC_BEAN_PACK,   true,  LOGIC_MAGIC_BEAN,                   RHT_MAGIC_BEAN_PACK,                   RG_MAGIC_BEAN_PACK,                   OBJECT_GI_BEAN,          GID_BEAN,            TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_DOUBLE_DEFENSE] =                      Item(RG_DOUBLE_DEFENSE,                   Text{ "Double Defense", "Double Défence", "Doppelte Verteidigung" },                                                                 ITEMTYPE_ITEM,              RG_DOUBLE_DEFENSE,    true,  LOGIC_DOUBLE_DEFENSE,               RHT_DOUBLE_DEFENSE,                    RG_DOUBLE_DEFENSE,                    OBJECT_GI_HEARTS,        GID_HEART_CONTAINER, 0xE9,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
     itemTable[RG_DOUBLE_DEFENSE].SetCustomDrawFunc(Randomizer_DrawDoubleDefense);
     // Trade Quest Items
-    itemTable[RG_WEIRD_EGG] =                           Item(RG_WEIRD_EGG,                        Text{ "Weird Egg", "Oeuf Curieux", "Seltsames Ei" },                                                              ITEMTYPE_ITEM,              GI_WEIRD_EGG,         true,  LOGIC_WEIRD_EGG,                    RHT_WEIRD_EGG,                         ITEM_WEIRD_EGG,                 OBJECT_GI_EGG,          GID_EGG,            0x9A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_ZELDAS_LETTER] =                       Item(RG_ZELDAS_LETTER,                    Text{ "Zelda's Letter", "Lettre de Zelda", "Zeldas Brief" },                                                      ITEMTYPE_ITEM,              GI_LETTER_ZELDA,      true,  LOGIC_ZELDAS_LETTER,                RHT_ZELDAS_LETTER,                     ITEM_LETTER_ZELDA,              OBJECT_GI_LETTER,       GID_LETTER_ZELDA,   0x69,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_POCKET_EGG] =                          Item(RG_POCKET_EGG,                       Text{ "Pocket Egg", "Oeuf de poche", "Taschenei" },                                                               ITEMTYPE_ITEM,              GI_POCKET_EGG,        true,  LOGIC_POCKET_EGG,                   RHT_POCKET_EGG,                        ITEM_POCKET_EGG,                OBJECT_GI_EGG,          GID_EGG,            0x01,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_COJIRO] =                              Item(RG_COJIRO,                           Text{ "Cojiro", "P'tit Poulet", "Cojiro" },                                                                       ITEMTYPE_ITEM,              GI_COJIRO,            true,  LOGIC_COJIRO,                       RHT_COJIRO,                            ITEM_COJIRO,                    OBJECT_GI_NIWATORI,     GID_COJIRO,         0x02,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_ODD_MUSHROOM] =                        Item(RG_ODD_MUSHROOM,                     Text{ "Odd Mushroom", "Champigon Suspect", "Seltsamer Pilz" },                                                    ITEMTYPE_ITEM,              GI_ODD_MUSHROOM,      true,  LOGIC_ODD_MUSHROOM,                 RHT_ODD_MUSHROOM,                      ITEM_ODD_MUSHROOM,              OBJECT_GI_MUSHROOM,     GID_ODD_MUSHROOM,   0x03,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_ODD_POTION] =                          Item(RG_ODD_POTION,                       Text{ "Odd Potion", "Mixture Suspecte", "Seltsamer Trank" },                                                      ITEMTYPE_ITEM,              GI_ODD_POTION,        true,  LOGIC_ODD_POULTICE,                 RHT_ODD_POTION,                        ITEM_ODD_POTION,                OBJECT_GI_POWDER,       GID_ODD_POTION,     0x04,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_POACHERS_SAW] =                        Item(RG_POACHERS_SAW,                     Text{ "Poacher's Saw", "Scie du Chasseur", "Wilderer-Säge" },                                                     ITEMTYPE_ITEM,              GI_SAW,               true,  LOGIC_POACHERS_SAW,                 RHT_POACHERS_SAW,                      ITEM_SAW,                       OBJECT_GI_SAW,          GID_SAW,            0x05,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_BROKEN_SWORD] =                        Item(RG_BROKEN_SWORD,                     Text{ "Broken Goron's Sword", "Épée Brisée de Goron", "Schwert des gebrochenen Goronen" },                        ITEMTYPE_ITEM,              GI_SWORD_BROKEN,      true,  LOGIC_BROKEN_SWORD,                 RHT_BROKEN_SWORD,                      ITEM_SWORD_BROKEN,              OBJECT_GI_BROKENSWORD,  GID_SWORD_BROKEN,   0x08,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_PRESCRIPTION] =                        Item(RG_PRESCRIPTION,                     Text{ "Prescription", "Ordonnance", "Verschreibung" },                                                            ITEMTYPE_ITEM,              GI_PRESCRIPTION,      true,  LOGIC_PRESCRIPTION,                 RHT_PRESCRIPTION,                      ITEM_PRESCRIPTION,              OBJECT_GI_PRESCRIPTION, GID_PRESCRIPTION,   0x09,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_EYEBALL_FROG] =                        Item(RG_EYEBALL_FROG,                     Text{ "Eyeball Frog", "Crapaud-qui-louche", "Augapfel-Frosch" },                                                  ITEMTYPE_ITEM,              GI_FROG,              true,  LOGIC_EYEBALL_FROG,                 RHT_EYEBALL_FROG,                      ITEM_FROG,                      OBJECT_GI_FROG,         GID_FROG,           0x0D,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_EYEDROPS] =                            Item(RG_EYEDROPS,                         Text{ "World's Finest Eyedrops", "Super Gouttes", "Supertropfen" },                                               ITEMTYPE_ITEM,              GI_EYEDROPS,          true,  LOGIC_EYEDROPS,                     RHT_EYEDROPS,                          ITEM_EYEDROPS,                  OBJECT_GI_EYE_LOTION,   GID_EYEDROPS,       0x0E,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_CLAIM_CHECK] =                         Item(RG_CLAIM_CHECK,                      Text{ "Claim Check", "Certificat", "Quittung" },                                                                  ITEMTYPE_ITEM,              GI_CLAIM_CHECK,       true,  LOGIC_CLAIM_CHECK,                  RHT_CLAIM_CHECK,                       ITEM_CLAIM_CHECK,               OBJECT_GI_TICKETSTONE,  GID_CLAIM_CHECK,    0x0A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_WEIRD_EGG] =                           Item(RG_WEIRD_EGG,                        Text{ "Weird Egg", "Oeuf Curieux", "Seltsames Ei" },                                                                                 ITEMTYPE_ITEM,              GI_WEIRD_EGG,         true,  LOGIC_WEIRD_EGG,                    RHT_WEIRD_EGG,                         ITEM_WEIRD_EGG,                       OBJECT_GI_EGG,           GID_EGG,             0x9A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_ZELDAS_LETTER] =                       Item(RG_ZELDAS_LETTER,                    Text{ "Zelda's Letter", "Lettre de Zelda", "Zeldas Brief" },                                                                         ITEMTYPE_ITEM,              GI_LETTER_ZELDA,      true,  LOGIC_ZELDAS_LETTER,                RHT_ZELDAS_LETTER,                     ITEM_LETTER_ZELDA,                    OBJECT_GI_LETTER,        GID_LETTER_ZELDA,    0x69,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_POCKET_EGG] =                          Item(RG_POCKET_EGG,                       Text{ "Pocket Egg", "Oeuf de poche", "Ei" },                                                                                         ITEMTYPE_ITEM,              GI_POCKET_EGG,        true,  LOGIC_POCKET_EGG,                   RHT_POCKET_EGG,                        ITEM_POCKET_EGG,                      OBJECT_GI_EGG,           GID_EGG,             0x01,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_COJIRO] =                              Item(RG_COJIRO,                           Text{ "Cojiro", "P'tit Poulet", "Henni" },                                                                                           ITEMTYPE_ITEM,              GI_COJIRO,            true,  LOGIC_COJIRO,                       RHT_COJIRO,                            ITEM_COJIRO,                          OBJECT_GI_NIWATORI,      GID_COJIRO,          0x02,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_ODD_MUSHROOM] =                        Item(RG_ODD_MUSHROOM,                     Text{ "Odd Mushroom", "Champigon Suspect", "Schimmelpilz" },                                                                         ITEMTYPE_ITEM,              GI_ODD_MUSHROOM,      true,  LOGIC_ODD_MUSHROOM,                 RHT_ODD_MUSHROOM,                      ITEM_ODD_MUSHROOM,                    OBJECT_GI_MUSHROOM,      GID_ODD_MUSHROOM,    0x03,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_ODD_POTION] =                          Item(RG_ODD_POTION,                       Text{ "Odd Potion", "Mixture Suspecte", "Modertrank" },                                                                              ITEMTYPE_ITEM,              GI_ODD_POTION,        true,  LOGIC_ODD_POULTICE,                 RHT_ODD_POTION,                        ITEM_ODD_POTION,                      OBJECT_GI_POWDER,        GID_ODD_POTION,      0x04,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_POACHERS_SAW] =                        Item(RG_POACHERS_SAW,                     Text{ "Poacher's Saw", "Scie du Chasseur", "Säge" },                                                                                 ITEMTYPE_ITEM,              GI_SAW,               true,  LOGIC_POACHERS_SAW,                 RHT_POACHERS_SAW,                      ITEM_SAW,                             OBJECT_GI_SAW,           GID_SAW,             0x05,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BROKEN_SWORD] =                        Item(RG_BROKEN_SWORD,                     Text{ "Broken Goron's Sword", "Épée Brisée de Goron", "Zerbrochenes Goronen-Schwert" },                                              ITEMTYPE_ITEM,              GI_SWORD_BROKEN,      true,  LOGIC_BROKEN_SWORD,                 RHT_BROKEN_SWORD,                      ITEM_SWORD_BROKEN,                    OBJECT_GI_BROKENSWORD,   GID_SWORD_BROKEN,    0x08,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_PRESCRIPTION] =                        Item(RG_PRESCRIPTION,                     Text{ "Prescription", "Ordonnance", "Rezept" },                                                                                      ITEMTYPE_ITEM,              GI_PRESCRIPTION,      true,  LOGIC_PRESCRIPTION,                 RHT_PRESCRIPTION,                      ITEM_PRESCRIPTION,                    OBJECT_GI_PRESCRIPTION,  GID_PRESCRIPTION,    0x09,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_EYEBALL_FROG] =                        Item(RG_EYEBALL_FROG,                     Text{ "Eyeball Frog", "Crapaud-qui-louche", "Glotzfrosch" },                                                                         ITEMTYPE_ITEM,              GI_FROG,              true,  LOGIC_EYEBALL_FROG,                 RHT_EYEBALL_FROG,                      ITEM_FROG,                            OBJECT_GI_FROG,          GID_FROG,            0x0D,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_EYEDROPS] =                            Item(RG_EYEDROPS,                         Text{ "World's Finest Eyedrops", "Super Gouttes", "Augentropfen" },                                                                  ITEMTYPE_ITEM,              GI_EYEDROPS,          true,  LOGIC_EYEDROPS,                     RHT_EYEDROPS,                          ITEM_EYEDROPS,                        OBJECT_GI_EYE_LOTION,    GID_EYEDROPS,        0x0E,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_CLAIM_CHECK] =                         Item(RG_CLAIM_CHECK,                      Text{ "Claim Check", "Certificat", "Zertifikat" },                                                                                   ITEMTYPE_ITEM,              GI_CLAIM_CHECK,       true,  LOGIC_CLAIM_CHECK,                  RHT_CLAIM_CHECK,                       ITEM_CLAIM_CHECK,                     OBJECT_GI_TICKETSTONE,   GID_CLAIM_CHECK,     0x0A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
     // Skulltula Token
-    itemTable[RG_GOLD_SKULLTULA_TOKEN] =                Item(RG_GOLD_SKULLTULA_TOKEN,             Text{ "Gold Skulltula Token", "Symbole de Skulltula d'Or", "Goldenes Skulltula-Symbol" },                         ITEMTYPE_TOKEN,             GI_SKULL_TOKEN,       true,  LOGIC_GOLD_SKULLTULA_TOKENS,        RHT_GOLD_SKULLTULA_TOKEN,              ITEM_SKULL_TOKEN,               OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    0xB4,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SKULLTULA_TOKEN, MOD_NONE);
+    itemTable[RG_GOLD_SKULLTULA_TOKEN] =                Item(RG_GOLD_SKULLTULA_TOKEN,             Text{ "Gold Skulltula Token", "Symbole de Skulltula d'Or", "Goldenes Skulltula-Symbol" },                                            ITEMTYPE_TOKEN,             GI_SKULL_TOKEN,       true,  LOGIC_GOLD_SKULLTULA_TOKENS,        RHT_GOLD_SKULLTULA_TOKEN,              ITEM_SKULL_TOKEN,                     OBJECT_GI_SUTARU,        GID_SKULL_TOKEN,     0xB4,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SKULLTULA_TOKEN, MOD_NONE);
     // Progressive Items
-    itemTable[RG_PROGRESSIVE_HOOKSHOT] =                Item(RG_PROGRESSIVE_HOOKSHOT,             Text{ "Progressive Hookshot", "Grappin (prog.)", "Progressiver Fanghaken" },                                      ITEMTYPE_ITEM,              0x80,                 true,  LOGIC_PROGRESSIVE_HOOKSHOT,         RHT_PROGRESSIVE_HOOKSHOT, true);
-    itemTable[RG_PROGRESSIVE_STRENGTH] =                Item(RG_PROGRESSIVE_STRENGTH,             Text{ "Strength Upgrade", "Amélioration de Force (prog.)", "Progressives Kraft-Upgrade" },                        ITEMTYPE_ITEM,              0x81,                 true,  LOGIC_PROGRESSIVE_STRENGTH,         RHT_PROGRESSIVE_STRENGTH, true);
-    itemTable[RG_PROGRESSIVE_BOMB_BAG] =                Item(RG_PROGRESSIVE_BOMB_BAG,             Text{ "Progressive Bomb Bag", "Sac de Bombes (prog.)", "Progressive Bombentasche" },                              ITEMTYPE_ITEM,              0x82,                 true,  LOGIC_PROGRESSIVE_BOMB_BAG,         RHT_PROGRESSIVE_BOMB_BAG, true);
-    itemTable[RG_PROGRESSIVE_BOW] =                     Item(RG_PROGRESSIVE_BOW,                  Text{ "Progressive Bow", "Arc (prog.)", "Progressiver Bogen" },                                                   ITEMTYPE_ITEM,              0x83,                 true,  LOGIC_PROGRESSIVE_BOW,              RHT_PROGRESSIVE_BOW, true);
-    itemTable[RG_PROGRESSIVE_SLINGSHOT] =               Item(RG_PROGRESSIVE_SLINGSHOT,            Text{ "Progressive Slingshot", "Lance-Pierre (prog.)", "Progressive Steinschleuder" },                            ITEMTYPE_ITEM,              0x84,                 true,  LOGIC_PROGRESSIVE_BULLET_BAG,       RHT_PROGRESSIVE_SLINGSHOT, true);
-    itemTable[RG_PROGRESSIVE_WALLET] =                  Item(RG_PROGRESSIVE_WALLET,               Text{ "Progressive Wallet", "Bourse (prog.)", "Progressive Brieftasche" },                                        ITEMTYPE_ITEM,              0x85,                 true,  LOGIC_PROGRESSIVE_WALLET,           RHT_PROGRESSIVE_WALLET, true);
-    itemTable[RG_PROGRESSIVE_SCALE] =                   Item(RG_PROGRESSIVE_SCALE,                Text{ "Progressive Scale", "Écaille (prog.)", "Progressive Skala" },                                              ITEMTYPE_ITEM,              0x86,                 true,  LOGIC_PROGRESSIVE_SCALE,            RHT_PROGRESSIVE_SCALE, true);
-    itemTable[RG_PROGRESSIVE_NUT_UPGRADE] =             Item(RG_PROGRESSIVE_NUT_UPGRADE,          Text{ "Progressive Nut Capacity", "Capacité de Noix (prog.)", "Progressive Nusskapazität" },                      ITEMTYPE_ITEM,              0x87,                 true,  LOGIC_PROGRESSIVE_NUT_BAG,          RHT_PROGRESSIVE_NUT_UPGRADE, true);
-    itemTable[RG_PROGRESSIVE_STICK_UPGRADE] =           Item(RG_PROGRESSIVE_STICK_UPGRADE,        Text{ "Progressive Stick Capacity", "Capacité de Bâtons (prog.)", "Progressive Stick-Kapazität" },                ITEMTYPE_ITEM,              0x88,                 true,  LOGIC_PROGRESSIVE_STICK_BAG,        RHT_PROGRESSIVE_STICK_UPGRADE, true);
-    itemTable[RG_PROGRESSIVE_BOMBCHUS] =                Item(RG_PROGRESSIVE_BOMBCHUS,             Text{ "Progressive Bombchu", "Missiles (prog.)", "Progressive Kriechgrube" },                                     ITEMTYPE_ITEM,              0x89,                 true,  LOGIC_BOMBCHUS,                     RHT_PROGRESSIVE_BOMBCHUS,              RG_PROGRESSIVE_BOMBCHUS,              OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER, true);
-    itemTable[RG_PROGRESSIVE_MAGIC_METER] =             Item(RG_PROGRESSIVE_MAGIC_METER,          Text{ "Progressive Magic Meter", "Jauge de Magie (prog.)", "Progressives magisches Messgerät" },                  ITEMTYPE_ITEM,              0x8A,                 true,  LOGIC_PROGRESSIVE_MAGIC,            RHT_PROGRESSIVE_MAGIC_METER, true);
-    itemTable[RG_PROGRESSIVE_OCARINA] =                 Item(RG_PROGRESSIVE_OCARINA,              Text{ "Progressive Ocarina", "Ocarina (prog.)", "Progressive Okarina" },                                          ITEMTYPE_ITEM,              0x8B,                 true,  LOGIC_PROGRESSIVE_OCARINA,          RHT_PROGRESSIVE_OCARINA, true);
-    itemTable[RG_PROGRESSIVE_GORONSWORD] =              Item(RG_PROGRESSIVE_GORONSWORD,           Text{ "Progressive Goron Sword", "Épée Goron (prog.)", "Progressives Goronenschwert" },                           ITEMTYPE_ITEM,              0xD4,                 true,  LOGIC_PROGRESSIVE_GIANT_KNIFE,      RHT_PROGRESSIVE_GORONSWORD, true);
+    itemTable[RG_PROGRESSIVE_HOOKSHOT] =                Item(RG_PROGRESSIVE_HOOKSHOT,             Text{ "Progressive Hookshot", "Grappin (prog.)", "Progressiver Fanghaken" },                                                         ITEMTYPE_ITEM,              0x80,                 true,  LOGIC_PROGRESSIVE_HOOKSHOT,         RHT_PROGRESSIVE_HOOKSHOT, true);
+    itemTable[RG_PROGRESSIVE_STRENGTH] =                Item(RG_PROGRESSIVE_STRENGTH,             Text{ "Strength Upgrade", "Amélioration de Force (prog.)", "Progressives Kraft-Upgrade" },                                           ITEMTYPE_ITEM,              0x81,                 true,  LOGIC_PROGRESSIVE_STRENGTH,         RHT_PROGRESSIVE_STRENGTH, true);
+    itemTable[RG_PROGRESSIVE_BOMB_BAG] =                Item(RG_PROGRESSIVE_BOMB_BAG,             Text{ "Progressive Bomb Bag", "Sac de Bombes (prog.)", "Progressive Bombentasche" },                                                 ITEMTYPE_ITEM,              0x82,                 true,  LOGIC_PROGRESSIVE_BOMB_BAG,         RHT_PROGRESSIVE_BOMB_BAG, true);
+    itemTable[RG_PROGRESSIVE_BOW] =                     Item(RG_PROGRESSIVE_BOW,                  Text{ "Progressive Bow", "Arc (prog.)", "Progressiver Bogen" },                                                                      ITEMTYPE_ITEM,              0x83,                 true,  LOGIC_PROGRESSIVE_BOW,              RHT_PROGRESSIVE_BOW, true);
+    itemTable[RG_PROGRESSIVE_SLINGSHOT] =               Item(RG_PROGRESSIVE_SLINGSHOT,            Text{ "Progressive Slingshot", "Lance-Pierre (prog.)", "Progressive Steinschleuder" },                                               ITEMTYPE_ITEM,              0x84,                 true,  LOGIC_PROGRESSIVE_BULLET_BAG,       RHT_PROGRESSIVE_SLINGSHOT, true);
+    itemTable[RG_PROGRESSIVE_WALLET] =                  Item(RG_PROGRESSIVE_WALLET,               Text{ "Progressive Wallet", "Bourse (prog.)", "Progressive Geldbörse" },                                                             ITEMTYPE_ITEM,              0x85,                 true,  LOGIC_PROGRESSIVE_WALLET,           RHT_PROGRESSIVE_WALLET, true);
+    itemTable[RG_PROGRESSIVE_SCALE] =                   Item(RG_PROGRESSIVE_SCALE,                Text{ "Progressive Scale", "Écaille (prog.)", "Progressive Schuppe" },                                                               ITEMTYPE_ITEM,              0x86,                 true,  LOGIC_PROGRESSIVE_SCALE,            RHT_PROGRESSIVE_SCALE, true);
+    itemTable[RG_PROGRESSIVE_NUT_UPGRADE] =             Item(RG_PROGRESSIVE_NUT_UPGRADE,          Text{ "Progressive Nut Capacity", "Capacité de Noix (prog.)", "Progressive Nuß-Kapazität" },                                         ITEMTYPE_ITEM,              0x87,                 true,  LOGIC_PROGRESSIVE_NUT_BAG,          RHT_PROGRESSIVE_NUT_UPGRADE, true);
+    itemTable[RG_PROGRESSIVE_STICK_UPGRADE] =           Item(RG_PROGRESSIVE_STICK_UPGRADE,        Text{ "Progressive Stick Capacity", "Capacité de Bâtons (prog.)", "Progressive Stab-Kapazität" },                                    ITEMTYPE_ITEM,              0x88,                 true,  LOGIC_PROGRESSIVE_STICK_BAG,        RHT_PROGRESSIVE_STICK_UPGRADE, true);
+    itemTable[RG_PROGRESSIVE_BOMBCHUS] =                Item(RG_PROGRESSIVE_BOMBCHUS,             Text{ "Progressive Bombchu", "Missiles (prog.)", "Progressive Krabbelminen" },                                                       ITEMTYPE_ITEM,              0x89,                 true,  LOGIC_BOMBCHUS,                     RHT_PROGRESSIVE_BOMBCHUS,              RG_PROGRESSIVE_BOMBCHUS,              OBJECT_GI_BOMB_2,        GID_BOMBCHU,         0x33,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER, true);
+    itemTable[RG_PROGRESSIVE_MAGIC_METER] =             Item(RG_PROGRESSIVE_MAGIC_METER,          Text{ "Progressive Magic Meter", "Jauge de Magie (prog.)", "Progressives Magisches Maß" },                                           ITEMTYPE_ITEM,              0x8A,                 true,  LOGIC_PROGRESSIVE_MAGIC,            RHT_PROGRESSIVE_MAGIC_METER, true);
+    itemTable[RG_PROGRESSIVE_OCARINA] =                 Item(RG_PROGRESSIVE_OCARINA,              Text{ "Progressive Ocarina", "Ocarina (prog.)", "Progressive Okarina" },                                                             ITEMTYPE_ITEM,              0x8B,                 true,  LOGIC_PROGRESSIVE_OCARINA,          RHT_PROGRESSIVE_OCARINA, true);
+    itemTable[RG_PROGRESSIVE_GORONSWORD] =              Item(RG_PROGRESSIVE_GORONSWORD,           Text{ "Progressive Goron Sword", "Épée Goron (prog.)", "Progressives Goronen-Schwert" },                                             ITEMTYPE_ITEM,              0xD4,                 true,  LOGIC_PROGRESSIVE_GIANT_KNIFE,      RHT_PROGRESSIVE_GORONSWORD, true);
     // Bottles
-    itemTable[RG_EMPTY_BOTTLE] =                        Item(RG_EMPTY_BOTTLE,                     Text{ "Empty Bottle", "Bouteille Vide", "Leere Flasche" },                                                        ITEMTYPE_ITEM,              GI_BOTTLE,            true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_MILK,                  ITEM_BOTTLE,                          OBJECT_GI_BOTTLE,       GID_BOTTLE,         0x42,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_BOTTLE_WITH_MILK] =                    Item(RG_BOTTLE_WITH_MILK,                 Text{ "Bottle with Milk", "Bouteille avec du Lait", "Flasche mit Milch" },                                        ITEMTYPE_ITEM,              GI_MILK_BOTTLE,       true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_MILK,                  ITEM_MILK_BOTTLE,                     OBJECT_GI_MILK,         GID_MILK,           0x98,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_BOTTLE_WITH_RED_POTION] =              Item(RG_BOTTLE_WITH_RED_POTION,           Text{ "Bottle with Red Potion", "Bouteille avec une Potion Rouge", "Flasche mit rotem Elixier" },                 ITEMTYPE_ITEM,              0x8C,                 true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_RED_POTION,            RG_BOTTLE_WITH_RED_POTION,            OBJECT_GI_LIQUID,       GID_POTION_RED,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_BOTTLE_WITH_GREEN_POTION] =            Item(RG_BOTTLE_WITH_GREEN_POTION,         Text{ "Bottle with Green Potion", "Bouteille avec une Potion Verte", "Flasche mit grünem Elixier" },              ITEMTYPE_ITEM,              0x8D,                 true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_GREEN_POTION,          RG_BOTTLE_WITH_GREEN_POTION,          OBJECT_GI_LIQUID,       GID_POTION_GREEN,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_BOTTLE_WITH_BLUE_POTION] =             Item(RG_BOTTLE_WITH_BLUE_POTION,          Text{ "Bottle with Blue Potion", "Bouteille avec une Potion Bleue", "Flasche mit blauem Elixier" },               ITEMTYPE_ITEM,              0x8E,                 true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_BLUE_POTION,           RG_BOTTLE_WITH_BLUE_POTION,           OBJECT_GI_LIQUID,       GID_POTION_BLUE,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_BOTTLE_WITH_FAIRY] =                   Item(RG_BOTTLE_WITH_FAIRY,                Text{ "Bottle with Fairy", "Bouteille avec une Fée", "Flasche mit Fee" },                                         ITEMTYPE_ITEM,              0x8F,                 true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_FAIRY,                 RG_BOTTLE_WITH_FAIRY,                 OBJECT_GI_BOTTLE,       GID_BOTTLE,         TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_BOTTLE_WITH_FISH] =                    Item(RG_BOTTLE_WITH_FISH,                 Text{ "Bottle with Fish", "Bouteille avec un Poisson", "Flasche mit Fisch" },                                     ITEMTYPE_ITEM,              0x90,                 true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_FISH,                  RG_BOTTLE_WITH_FISH,                  OBJECT_GI_FISH,         GID_FISH,           TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_BOTTLE_WITH_BLUE_FIRE] =               Item(RG_BOTTLE_WITH_BLUE_FIRE,            Text{ "Bottle with Blue Fire", "Bouteille avec une Flamme Bleue", "Flasche mit blauem Feuer" },                   ITEMTYPE_ITEM,              0x91,                 true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_BLUE_FIRE,             RG_BOTTLE_WITH_BLUE_FIRE,             OBJECT_GI_FIRE,         GID_BLUE_FIRE,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_BOTTLE_WITH_BUGS] =                    Item(RG_BOTTLE_WITH_BUGS,                 Text{ "Bottle with Bugs", "Bouteille avec des Insectes", "Flasche mit Wanzen" },                                  ITEMTYPE_ITEM,              0x92,                 true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_BUGS,                  RG_BOTTLE_WITH_BUGS,                  OBJECT_GI_INSECT,       GID_BUG,            TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_BOTTLE_WITH_POE] =                     Item(RG_BOTTLE_WITH_POE,                  Text{ "Bottle with Poe", "Bouteille avec un Esprit", "Flasche mit einem Geist" },                                 ITEMTYPE_ITEM,              0x94,                 true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_POE,                   RG_BOTTLE_WITH_POE,                   OBJECT_GI_GHOST,        GID_POE,            TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_RUTOS_LETTER] =                        Item(RG_RUTOS_LETTER,                     Text{ "Bottle with Ruto's Letter", "Bouteille avec la Lettre de Ruto", "Flasche mit Rutos Brief" },               ITEMTYPE_ITEM,              GI_LETTER_RUTO,       true,  LOGIC_RUTOS_LETTER,                 RHT_RUTOS_LETTER,                      ITEM_LETTER_RUTO,                     OBJECT_GI_BOTTLE_LETTER,GID_LETTER_RUTO,    0x99,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_BOTTLE_WITH_BIG_POE] =                 Item(RG_BOTTLE_WITH_BIG_POE,              Text{ "Bottle with Big Poe", "Bouteille avec une Âme", "Flasche mit Seele" },                                     ITEMTYPE_ITEM,              0x93,                 true,  LOGIC_BOTTLE_WITH_BIG_POE,          RHT_BOTTLE_WITH_BIG_POE,               RG_BOTTLE_WITH_BIG_POE,               OBJECT_GI_GHOST,        GID_BIG_POE,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_EMPTY_BOTTLE] =                        Item(RG_EMPTY_BOTTLE,                     Text{ "Empty Bottle", "Bouteille Vide", "Leere Flasche" },                                                                           ITEMTYPE_ITEM,              GI_BOTTLE,            true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_MILK,                  ITEM_BOTTLE,                          OBJECT_GI_BOTTLE,        GID_BOTTLE,          0x42,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BOTTLE_WITH_MILK] =                    Item(RG_BOTTLE_WITH_MILK,                 Text{ "Bottle with Milk", "Bouteille avec du Lait", "Flasche mit Milch" },                                                           ITEMTYPE_ITEM,              GI_MILK_BOTTLE,       true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_MILK,                  ITEM_MILK_BOTTLE,                     OBJECT_GI_MILK,          GID_MILK,            0x98,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BOTTLE_WITH_RED_POTION] =              Item(RG_BOTTLE_WITH_RED_POTION,           Text{ "Bottle with Red Potion", "Bouteille avec une Potion Rouge", "Flasche mit rotem Elixier" },                                    ITEMTYPE_ITEM,              0x8C,                 true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_RED_POTION,            RG_BOTTLE_WITH_RED_POTION,            OBJECT_GI_LIQUID,        GID_POTION_RED,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BOTTLE_WITH_GREEN_POTION] =            Item(RG_BOTTLE_WITH_GREEN_POTION,         Text{ "Bottle with Green Potion", "Bouteille avec une Potion Verte", "Flasche mit grünem Elixier" },                                 ITEMTYPE_ITEM,              0x8D,                 true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_GREEN_POTION,          RG_BOTTLE_WITH_GREEN_POTION,          OBJECT_GI_LIQUID,        GID_POTION_GREEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BOTTLE_WITH_BLUE_POTION] =             Item(RG_BOTTLE_WITH_BLUE_POTION,          Text{ "Bottle with Blue Potion", "Bouteille avec une Potion Bleue", "Flasche mit blauem Elixier" },                                  ITEMTYPE_ITEM,              0x8E,                 true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_BLUE_POTION,           RG_BOTTLE_WITH_BLUE_POTION,           OBJECT_GI_LIQUID,        GID_POTION_BLUE,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BOTTLE_WITH_FAIRY] =                   Item(RG_BOTTLE_WITH_FAIRY,                Text{ "Bottle with Fairy", "Bouteille avec une Fée", "Flasche mit Fee" },                                                            ITEMTYPE_ITEM,              0x8F,                 true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_FAIRY,                 RG_BOTTLE_WITH_FAIRY,                 OBJECT_GI_BOTTLE,        GID_BOTTLE,          TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BOTTLE_WITH_FISH] =                    Item(RG_BOTTLE_WITH_FISH,                 Text{ "Bottle with Fish", "Bouteille avec un Poisson", "Flasche mit Fisch" },                                                        ITEMTYPE_ITEM,              0x90,                 true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_FISH,                  RG_BOTTLE_WITH_FISH,                  OBJECT_GI_FISH,          GID_FISH,            TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BOTTLE_WITH_BLUE_FIRE] =               Item(RG_BOTTLE_WITH_BLUE_FIRE,            Text{ "Bottle with Blue Fire", "Bouteille avec une Flamme Bleue", "Flasche mit blauem Feuer" },                                      ITEMTYPE_ITEM,              0x91,                 true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_BLUE_FIRE,             RG_BOTTLE_WITH_BLUE_FIRE,             OBJECT_GI_FIRE,          GID_BLUE_FIRE,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BOTTLE_WITH_BUGS] =                    Item(RG_BOTTLE_WITH_BUGS,                 Text{ "Bottle with Bugs", "Bouteille avec des Insectes", "Flasche mit Wanzen" },                                                     ITEMTYPE_ITEM,              0x92,                 true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_BUGS,                  RG_BOTTLE_WITH_BUGS,                  OBJECT_GI_INSECT,        GID_BUG,             TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BOTTLE_WITH_POE] =                     Item(RG_BOTTLE_WITH_POE,                  Text{ "Bottle with Poe", "Bouteille avec un Esprit", "Flasche mit einem Geist" },                                                    ITEMTYPE_ITEM,              0x94,                 true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_POE,                   RG_BOTTLE_WITH_POE,                   OBJECT_GI_GHOST,         GID_POE,             TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_RUTOS_LETTER] =                        Item(RG_RUTOS_LETTER,                     Text{ "Bottle with Ruto's Letter", "Bouteille avec la Lettre de Ruto", "Flasche mit Rutos Brief" },                                  ITEMTYPE_ITEM,              GI_LETTER_RUTO,       true,  LOGIC_RUTOS_LETTER,                 RHT_RUTOS_LETTER,                      ITEM_LETTER_RUTO,                     OBJECT_GI_BOTTLE_LETTER, GID_LETTER_RUTO,     0x99,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BOTTLE_WITH_BIG_POE] =                 Item(RG_BOTTLE_WITH_BIG_POE,              Text{ "Bottle with Big Poe", "Bouteille avec une Âme", "Flasche mit Seele" },                                                        ITEMTYPE_ITEM,              0x93,                 true,  LOGIC_BOTTLE_WITH_BIG_POE,          RHT_BOTTLE_WITH_BIG_POE,               RG_BOTTLE_WITH_BIG_POE,               OBJECT_GI_GHOST,         GID_BIG_POE,         TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     // Songs
-    itemTable[RG_ZELDAS_LULLABY] =                      Item(RG_ZELDAS_LULLABY,                   Text{ "Zelda's Lullaby", "Berceuse de Zelda", "Zeldas Wiegenlied" },                                              ITEMTYPE_SONG,              0xC1,                 true,  LOGIC_ZELDAS_LULLABY,               RHT_ZELDAS_LULLABY,                    ITEM_SONG_LULLABY,                    OBJECT_GI_MELODY,       GID_SONG_ZELDA,     0xD4,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_EPONAS_SONG] =                         Item(RG_EPONAS_SONG,                      Text{ "Epona's Song", "Chant d'Epona", "Eponas Lied" },                                                           ITEMTYPE_SONG,              0xC2,                 true,  LOGIC_EPONAS_SONG,                  RHT_EPONAS_SONG,                       ITEM_SONG_EPONA,                      OBJECT_GI_MELODY,       GID_SONG_EPONA,     0xD2,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_SARIAS_SONG] =                         Item(RG_SARIAS_SONG,                      Text{ "Saria's Song", "Chant de Saria", "Sarias Lied" },                                                          ITEMTYPE_SONG,              0xC3,                 true,  LOGIC_SARIAS_SONG,                  RHT_SARIAS_SONG,                       ITEM_SONG_SARIA,                      OBJECT_GI_MELODY,       GID_SONG_SARIA,     0xD1,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_SUNS_SONG] =                           Item(RG_SUNS_SONG,                        Text{ "Sun's Song", "Chant du Soleil", "Das Lied der Sonne" },                                                    ITEMTYPE_SONG,              0xC4,                 true,  LOGIC_SUNS_SONG,                    RHT_SUNS_SONG,                         ITEM_SONG_SUN,                        OBJECT_GI_MELODY,       GID_SONG_SUN,       0xD3,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_SONG_OF_TIME] =                        Item(RG_SONG_OF_TIME,                     Text{ "Song of Time", "Chant du Temps", "Das Lied der Zeit" },                                                    ITEMTYPE_SONG,              0xC5,                 true,  LOGIC_SONG_OF_TIME,                 RHT_SONG_OF_TIME,                      ITEM_SONG_TIME,                       OBJECT_GI_MELODY,       GID_SONG_TIME,      0xD5,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_SONG_OF_STORMS] =                      Item(RG_SONG_OF_STORMS,                   Text{ "Song of Storms", "Chant des Tempêtes", "Lied der Stürme" },                                                ITEMTYPE_SONG,              0xC6,                 true,  LOGIC_SONG_OF_STORMS,               RHT_SONG_OF_STORMS,                    ITEM_SONG_STORMS,                     OBJECT_GI_MELODY,       GID_SONG_STORM,     0xD6,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_MINUET_OF_FOREST] =                    Item(RG_MINUET_OF_FOREST,                 Text{ "Minuet of Forest", "Menuet des Bois", "Wald-Minuett" },                                                    ITEMTYPE_SONG,              0xBB,                 true,  LOGIC_MINUET_OF_FOREST,             RHT_MINUET_OF_FOREST,                  ITEM_SONG_MINUET,                     OBJECT_GI_MELODY,       GID_SONG_MINUET,    0x73,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_BOLERO_OF_FIRE] =                      Item(RG_BOLERO_OF_FIRE,                   Text{ "Bolero of Fire", "Boléro du Feu", "Bolero des Feuers" },                                                   ITEMTYPE_SONG,              0xBC,                 true,  LOGIC_BOLERO_OF_FIRE,               RHT_BOLERO_OF_FIRE,                    ITEM_SONG_BOLERO,                     OBJECT_GI_MELODY,       GID_SONG_BOLERO,    0x74,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_SERENADE_OF_WATER] =                   Item(RG_SERENADE_OF_WATER,                Text{ "Serenade of Water", "Sérénade de l'Eau", "Serenade des Wassers" },                                         ITEMTYPE_SONG,              0xBD,                 true,  LOGIC_SERENADE_OF_WATER,            RHT_SERENADE_OF_WATER,                 ITEM_SONG_SERENADE,                   OBJECT_GI_MELODY,       GID_SONG_SERENADE,  0x75,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_NOCTURNE_OF_SHADOW] =                  Item(RG_NOCTURNE_OF_SHADOW,               Text{ "Nocturne of Shadow", "Nocturne de l'Ombre", "Nocturne der Schatten " },                                    ITEMTYPE_SONG,              0xBF,                 true,  LOGIC_NOCTURNE_OF_SHADOW,           RHT_NOCTURNE_OF_SHADOW,                ITEM_SONG_NOCTURNE,                   OBJECT_GI_MELODY,       GID_SONG_NOCTURNE,  0x77,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_REQUIEM_OF_SPIRIT] =                   Item(RG_REQUIEM_OF_SPIRIT,                Text{ "Requiem of Spirit", "Requiem des Esprits", "Requiem des Geistes" },                                        ITEMTYPE_SONG,              0xBE,                 true,  LOGIC_REQUIEM_OF_SPIRIT,            RHT_REQUIEM_OF_SPIRIT,                 ITEM_SONG_REQUIEM,                    OBJECT_GI_MELODY,       GID_SONG_REQUIEM,   0x76,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_PRELUDE_OF_LIGHT] =                    Item(RG_PRELUDE_OF_LIGHT,                 Text{ "Prelude of Light", "Prélude de la Lumière", "Präludium des Lichts" },                                      ITEMTYPE_SONG,              0xC0,                 true,  LOGIC_PRELUDE_OF_LIGHT,             RHT_PRELUDE_OF_LIGHT,                  ITEM_SONG_PRELUDE,                    OBJECT_GI_MELODY,       GID_SONG_PRELUDE,   0x78,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_ZELDAS_LULLABY] =                      Item(RG_ZELDAS_LULLABY,                   Text{ "Zelda's Lullaby", "Berceuse de Zelda", "Zeldas Wiegenlied" },                                                                 ITEMTYPE_SONG,              0xC1,                 true,  LOGIC_ZELDAS_LULLABY,               RHT_ZELDAS_LULLABY,                    ITEM_SONG_LULLABY,                    OBJECT_GI_MELODY,        GID_SONG_ZELDA,      0xD4,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_EPONAS_SONG] =                         Item(RG_EPONAS_SONG,                      Text{ "Epona's Song", "Chant d'Epona", "Eponas Lied" },                                                                              ITEMTYPE_SONG,              0xC2,                 true,  LOGIC_EPONAS_SONG,                  RHT_EPONAS_SONG,                       ITEM_SONG_EPONA,                      OBJECT_GI_MELODY,        GID_SONG_EPONA,      0xD2,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_SARIAS_SONG] =                         Item(RG_SARIAS_SONG,                      Text{ "Saria's Song", "Chant de Saria", "Salias Lied" },                                                                             ITEMTYPE_SONG,              0xC3,                 true,  LOGIC_SARIAS_SONG,                  RHT_SARIAS_SONG,                       ITEM_SONG_SARIA,                      OBJECT_GI_MELODY,        GID_SONG_SARIA,      0xD1,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_SUNS_SONG] =                           Item(RG_SUNS_SONG,                        Text{ "Sun's Song", "Chant du Soleil", "Hymne der Sonne" },                                                                          ITEMTYPE_SONG,              0xC4,                 true,  LOGIC_SUNS_SONG,                    RHT_SUNS_SONG,                         ITEM_SONG_SUN,                        OBJECT_GI_MELODY,        GID_SONG_SUN,        0xD3,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_SONG_OF_TIME] =                        Item(RG_SONG_OF_TIME,                     Text{ "Song of Time", "Chant du Temps", "Hymne der Zeit" },                                                                          ITEMTYPE_SONG,              0xC5,                 true,  LOGIC_SONG_OF_TIME,                 RHT_SONG_OF_TIME,                      ITEM_SONG_TIME,                       OBJECT_GI_MELODY,        GID_SONG_TIME,       0xD5,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_SONG_OF_STORMS] =                      Item(RG_SONG_OF_STORMS,                   Text{ "Song of Storms", "Chant des Tempêtes", "Hymne des Sturms" },                                                                  ITEMTYPE_SONG,              0xC6,                 true,  LOGIC_SONG_OF_STORMS,               RHT_SONG_OF_STORMS,                    ITEM_SONG_STORMS,                     OBJECT_GI_MELODY,        GID_SONG_STORM,      0xD6,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_MINUET_OF_FOREST] =                    Item(RG_MINUET_OF_FOREST,                 Text{ "Minuet of Forest", "Menuet des Bois", "Menuett des Waldes" },                                                                 ITEMTYPE_SONG,              0xBB,                 true,  LOGIC_MINUET_OF_FOREST,             RHT_MINUET_OF_FOREST,                  ITEM_SONG_MINUET,                     OBJECT_GI_MELODY,        GID_SONG_MINUET,     0x73,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BOLERO_OF_FIRE] =                      Item(RG_BOLERO_OF_FIRE,                   Text{ "Bolero of Fire", "Boléro du Feu", "Bolero des Feuers" },                                                                      ITEMTYPE_SONG,              0xBC,                 true,  LOGIC_BOLERO_OF_FIRE,               RHT_BOLERO_OF_FIRE,                    ITEM_SONG_BOLERO,                     OBJECT_GI_MELODY,        GID_SONG_BOLERO,     0x74,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_SERENADE_OF_WATER] =                   Item(RG_SERENADE_OF_WATER,                Text{ "Serenade of Water", "Sérénade de l'Eau", "Serenade des Wassers" },                                                            ITEMTYPE_SONG,              0xBD,                 true,  LOGIC_SERENADE_OF_WATER,            RHT_SERENADE_OF_WATER,                 ITEM_SONG_SERENADE,                   OBJECT_GI_MELODY,        GID_SONG_SERENADE,   0x75,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_NOCTURNE_OF_SHADOW] =                  Item(RG_NOCTURNE_OF_SHADOW,               Text{ "Nocturne of Shadow", "Nocturne de l'Ombre", "Nocturne des Schattens" },                                                       ITEMTYPE_SONG,              0xBF,                 true,  LOGIC_NOCTURNE_OF_SHADOW,           RHT_NOCTURNE_OF_SHADOW,                ITEM_SONG_NOCTURNE,                   OBJECT_GI_MELODY,        GID_SONG_NOCTURNE,   0x77,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_REQUIEM_OF_SPIRIT] =                   Item(RG_REQUIEM_OF_SPIRIT,                Text{ "Requiem of Spirit", "Requiem des Esprits", "Requiem der Geister" },                                                           ITEMTYPE_SONG,              0xBE,                 true,  LOGIC_REQUIEM_OF_SPIRIT,            RHT_REQUIEM_OF_SPIRIT,                 ITEM_SONG_REQUIEM,                    OBJECT_GI_MELODY,        GID_SONG_REQUIEM,    0x76,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_PRELUDE_OF_LIGHT] =                    Item(RG_PRELUDE_OF_LIGHT,                 Text{ "Prelude of Light", "Prélude de la Lumière", "Kantate des Lichts" },                                                           ITEMTYPE_SONG,              0xC0,                 true,  LOGIC_PRELUDE_OF_LIGHT,             RHT_PRELUDE_OF_LIGHT,                  ITEM_SONG_PRELUDE,                    OBJECT_GI_MELODY,        GID_SONG_PRELUDE,    0x78,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
     // Maps and Compasses
-    itemTable[RG_DEKU_TREE_MAP] =                       Item(RG_DEKU_TREE_MAP,                    Text{ "Great Deku Tree Map", "Carte de l'Arbre Mojo", "Karte des Deku-Baums" },                                   ITEMTYPE_MAP,               0xA5,                 false, LOGIC_MAP_DEKU_TREE,                RHT_DEKU_TREE_MAP,                     RG_DEKU_TREE_MAP,                     OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_DODONGOS_CAVERN_MAP] =                 Item(RG_DODONGOS_CAVERN_MAP,              Text{ "Dodongo's Cavern Map", "Carte de la Caverne Dodongo", "Karte der Dodongo-Höhle" },                         ITEMTYPE_MAP,               0xA6,                 false, LOGIC_MAP_DODONGOS_CAVERN,          RHT_DODONGOS_CAVERN_MAP,               RG_DODONGOS_CAVERN_MAP,               OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_JABU_JABUS_BELLY_MAP] =                Item(RG_JABU_JABUS_BELLY_MAP,             Text{ "Jabu-Jabu's Belly Map", "Carte du Ventre de Jabu-Jabu", "Karte des Jabu-Jabu-Bauchs" },                    ITEMTYPE_MAP,               0xA7,                 false, LOGIC_MAP_JABU_JABUS_BELLY,         RHT_JABU_JABUS_BELLY_MAP,              RG_JABU_JABUS_BELLY_MAP,              OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_FOREST_TEMPLE_MAP] =                   Item(RG_FOREST_TEMPLE_MAP,                Text{ "Forest Temple Map", "Carte du Temple de la Forêt", "Waldtempel Karte" },                                   ITEMTYPE_MAP,               0xA8,                 false, LOGIC_MAP_FOREST_TEMPLE,            RHT_FOREST_TEMPLE_MAP,                 RG_FOREST_TEMPLE_MAP,                 OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_FIRE_TEMPLE_MAP] =                     Item(RG_FIRE_TEMPLE_MAP,                  Text{ "Fire Temple Map", "Carte due Temple de Feu", "Feuertempel Karte" },                                        ITEMTYPE_MAP,               0xA9,                 false, LOGIC_MAP_FIRE_TEMPLE,              RHT_FIRE_TEMPLE_MAP,                   RG_FIRE_TEMPLE_MAP,                   OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_WATER_TEMPLE_MAP] =                    Item(RG_WATER_TEMPLE_MAP,                 Text{ "Water Temple Map", "Carte du Temple de l'Eau", "Wassertempel-Karte" },                                     ITEMTYPE_MAP,               0xAA,                 false, LOGIC_MAP_WATER_TEMPLE,             RHT_WATER_TEMPLE_MAP,                  RG_WATER_TEMPLE_MAP,                  OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_SPIRIT_TEMPLE_MAP] =                   Item(RG_SPIRIT_TEMPLE_MAP,                Text{ "Spirit Temple Map", "Carte due Temple de l'Esprit", "Geistertempel Karte" },                               ITEMTYPE_MAP,               0xAB,                 false, LOGIC_MAP_SPIRIT_TEMPLE,            RHT_SPIRIT_TEMPLE_MAP,                 RG_SPIRIT_TEMPLE_MAP,                 OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_SHADOW_TEMPLE_MAP] =                   Item(RG_SHADOW_TEMPLE_MAP,                Text{ "Shadow Temple Map", "Carte du Temple de l'Ombre", "Karte des Schattentempels" },                           ITEMTYPE_MAP,               0xAC,                 false, LOGIC_MAP_SHADOW_TEMPLE,            RHT_SHADOW_TEMPLE_MAP,                 RG_SHADOW_TEMPLE_MAP,                 OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_BOTTOM_OF_THE_WELL_MAP] =              Item(RG_BOTTOM_OF_THE_WELL_MAP,           Text{ "Bottom of the Well Map", "Carte du Puits", "Boden des Brunnens Karte" },                                   ITEMTYPE_MAP,               0xAD,                 false, LOGIC_MAP_BOTTOM_OF_THE_WELL,       RHT_BOTTOM_OF_THE_WELL_MAP,            RG_BOTTOM_OF_THE_WELL_MAP,            OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_ICE_CAVERN_MAP] =                      Item(RG_ICE_CAVERN_MAP,                   Text{ "Ice Cavern Map", "Carte de la Caverne Polaire", "Eishöhle Karte" },                                        ITEMTYPE_MAP,               0xAE,                 false, LOGIC_MAP_ICE_CAVERN,               RHT_ICE_CAVERN_MAP,                    RG_ICE_CAVERN_MAP,                    OBJECT_GI_MAP,          GID_DUNGEON_MAP,    TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_DEKU_TREE_COMPASS] =                   Item(RG_DEKU_TREE_COMPASS,                Text{ "Great Deku Tree Compass", "Boussole de l'Arbre Mojo", "Kompass des Deku-Baums" },                          ITEMTYPE_COMPASS,           0x9B,                 false, LOGIC_COMPASS_DEKU_TREE,            RHT_DEKU_TREE_COMPASS,                 RG_DEKU_TREE_COMPASS,                 OBJECT_GI_COMPASS,      GID_COMPASS,        TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_DEKU_TREE_MAP] =                       Item(RG_DEKU_TREE_MAP,                    Text{ "Great Deku Tree Map", "Carte de l'Arbre Mojo", "Karte des Deku-Baums" },                                                      ITEMTYPE_MAP,               0xA5,                 false, LOGIC_MAP_DEKU_TREE,                RHT_DEKU_TREE_MAP,                     RG_DEKU_TREE_MAP,                     OBJECT_GI_MAP,           GID_DUNGEON_MAP,     TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_DODONGOS_CAVERN_MAP] =                 Item(RG_DODONGOS_CAVERN_MAP,              Text{ "Dodongo's Cavern Map", "Carte de la Caverne Dodongo", "Karte der Dodongo-Höhle" },                                            ITEMTYPE_MAP,               0xA6,                 false, LOGIC_MAP_DODONGOS_CAVERN,          RHT_DODONGOS_CAVERN_MAP,               RG_DODONGOS_CAVERN_MAP,               OBJECT_GI_MAP,           GID_DUNGEON_MAP,     TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_JABU_JABUS_BELLY_MAP] =                Item(RG_JABU_JABUS_BELLY_MAP,             Text{ "Jabu-Jabu's Belly Map", "Carte du Ventre de Jabu-Jabu", "Karte des Jabu-Jabu-Bauchs" },                                       ITEMTYPE_MAP,               0xA7,                 false, LOGIC_MAP_JABU_JABUS_BELLY,         RHT_JABU_JABUS_BELLY_MAP,              RG_JABU_JABUS_BELLY_MAP,              OBJECT_GI_MAP,           GID_DUNGEON_MAP,     TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_FOREST_TEMPLE_MAP] =                   Item(RG_FOREST_TEMPLE_MAP,                Text{ "Forest Temple Map", "Carte du Temple de la Forêt", "Karte des Waldtempels" },                                                 ITEMTYPE_MAP,               0xA8,                 false, LOGIC_MAP_FOREST_TEMPLE,            RHT_FOREST_TEMPLE_MAP,                 RG_FOREST_TEMPLE_MAP,                 OBJECT_GI_MAP,           GID_DUNGEON_MAP,     TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_FIRE_TEMPLE_MAP] =                     Item(RG_FIRE_TEMPLE_MAP,                  Text{ "Fire Temple Map", "Carte due Temple de Feu", "Karte des Feuertempels" },                                                      ITEMTYPE_MAP,               0xA9,                 false, LOGIC_MAP_FIRE_TEMPLE,              RHT_FIRE_TEMPLE_MAP,                   RG_FIRE_TEMPLE_MAP,                   OBJECT_GI_MAP,           GID_DUNGEON_MAP,     TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_WATER_TEMPLE_MAP] =                    Item(RG_WATER_TEMPLE_MAP,                 Text{ "Water Temple Map", "Carte du Temple de l'Eau", "Karte des Wassertempels" },                                                   ITEMTYPE_MAP,               0xAA,                 false, LOGIC_MAP_WATER_TEMPLE,             RHT_WATER_TEMPLE_MAP,                  RG_WATER_TEMPLE_MAP,                  OBJECT_GI_MAP,           GID_DUNGEON_MAP,     TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_SPIRIT_TEMPLE_MAP] =                   Item(RG_SPIRIT_TEMPLE_MAP,                Text{ "Spirit Temple Map", "Carte due Temple de l'Esprit", "Karte des Geistertempels" },                                             ITEMTYPE_MAP,               0xAB,                 false, LOGIC_MAP_SPIRIT_TEMPLE,            RHT_SPIRIT_TEMPLE_MAP,                 RG_SPIRIT_TEMPLE_MAP,                 OBJECT_GI_MAP,           GID_DUNGEON_MAP,     TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_SHADOW_TEMPLE_MAP] =                   Item(RG_SHADOW_TEMPLE_MAP,                Text{ "Shadow Temple Map", "Carte du Temple de l'Ombre", "Karte des Schattentempels" },                                              ITEMTYPE_MAP,               0xAC,                 false, LOGIC_MAP_SHADOW_TEMPLE,            RHT_SHADOW_TEMPLE_MAP,                 RG_SHADOW_TEMPLE_MAP,                 OBJECT_GI_MAP,           GID_DUNGEON_MAP,     TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_BOTTOM_OF_THE_WELL_MAP] =              Item(RG_BOTTOM_OF_THE_WELL_MAP,           Text{ "Bottom of the Well Map", "Carte du Puits", "Karte des Grund des Brunnens" },                                                  ITEMTYPE_MAP,               0xAD,                 false, LOGIC_MAP_BOTTOM_OF_THE_WELL,       RHT_BOTTOM_OF_THE_WELL_MAP,            RG_BOTTOM_OF_THE_WELL_MAP,            OBJECT_GI_MAP,           GID_DUNGEON_MAP,     TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_ICE_CAVERN_MAP] =                      Item(RG_ICE_CAVERN_MAP,                   Text{ "Ice Cavern Map", "Carte de la Caverne Polaire", "Karte der Eishöhle" },                                                       ITEMTYPE_MAP,               0xAE,                 false, LOGIC_MAP_ICE_CAVERN,               RHT_ICE_CAVERN_MAP,                    RG_ICE_CAVERN_MAP,                    OBJECT_GI_MAP,           GID_DUNGEON_MAP,     TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_DEKU_TREE_COMPASS] =                   Item(RG_DEKU_TREE_COMPASS,                Text{ "Great Deku Tree Compass", "Boussole de l'Arbre Mojo", "Kompaß des Deku-Baums" },                                              ITEMTYPE_COMPASS,           0x9B,                 false, LOGIC_COMPASS_DEKU_TREE,            RHT_DEKU_TREE_COMPASS,                 RG_DEKU_TREE_COMPASS,                 OBJECT_GI_COMPASS,       GID_COMPASS,         TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
     itemTable[RG_DEKU_TREE_COMPASS].SetCustomDrawFunc(Randomizer_DrawCompass);
-    itemTable[RG_DODONGOS_CAVERN_COMPASS] =             Item(RG_DODONGOS_CAVERN_COMPASS,          Text{ "Dodongo's Cavern Compass", "Boussole de la Caverne Dodongo", "Kompass der Dodongo-Höhle" },                ITEMTYPE_COMPASS,           0x9C,                 false, LOGIC_COMPASS_DODONGOS_CAVERN,      RHT_DODONGOS_CAVERN_COMPASS,           RG_DODONGOS_CAVERN_COMPASS,           OBJECT_GI_COMPASS,      GID_COMPASS,   TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_DODONGOS_CAVERN_COMPASS] =             Item(RG_DODONGOS_CAVERN_COMPASS,          Text{ "Dodongo's Cavern Compass", "Boussole de la Caverne Dodongo", "Kompaß der Dodongo-Höhle" },                                    ITEMTYPE_COMPASS,           0x9C,                 false, LOGIC_COMPASS_DODONGOS_CAVERN,      RHT_DODONGOS_CAVERN_COMPASS,           RG_DODONGOS_CAVERN_COMPASS,           OBJECT_GI_COMPASS,       GID_COMPASS,         TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
     itemTable[RG_DODONGOS_CAVERN_COMPASS].SetCustomDrawFunc(Randomizer_DrawCompass);
-    itemTable[RG_JABU_JABUS_BELLY_COMPASS] =            Item(RG_JABU_JABUS_BELLY_COMPASS,         Text{ "Jabu-Jabu's Belly Compass", "Boussole du Ventre de Jabu-Jabu", "Kompass des Jabu-Jabu-Bauchs" },           ITEMTYPE_COMPASS,           0x9D,                 false, LOGIC_COMPASS_JABU_JABUS_BELLY,     RHT_JABU_JABUS_BELLY_COMPASS,          RG_JABU_JABUS_BELLY_COMPASS,          OBJECT_GI_COMPASS,      GID_COMPASS,   TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_JABU_JABUS_BELLY_COMPASS] =            Item(RG_JABU_JABUS_BELLY_COMPASS,         Text{ "Jabu-Jabu's Belly Compass", "Boussole du Ventre de Jabu-Jabu", "Kompaß des Jabu-Jabu-Bauchs" },                               ITEMTYPE_COMPASS,           0x9D,                 false, LOGIC_COMPASS_JABU_JABUS_BELLY,     RHT_JABU_JABUS_BELLY_COMPASS,          RG_JABU_JABUS_BELLY_COMPASS,          OBJECT_GI_COMPASS,       GID_COMPASS,         TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
     itemTable[RG_JABU_JABUS_BELLY_COMPASS].SetCustomDrawFunc(Randomizer_DrawCompass);
-    itemTable[RG_FOREST_TEMPLE_COMPASS] =               Item(RG_FOREST_TEMPLE_COMPASS,            Text{ "Forest Temple Compass", "Boussole du Temple de la Forêt", "Waldtempel-Kompass" },                          ITEMTYPE_COMPASS,           0x9E,                 false, LOGIC_COMPASS_FOREST_TEMPLE,        RHT_FOREST_TEMPLE_COMPASS,             RG_FOREST_TEMPLE_COMPASS,             OBJECT_GI_COMPASS,      GID_COMPASS,   TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_FOREST_TEMPLE_COMPASS] =               Item(RG_FOREST_TEMPLE_COMPASS,            Text{ "Forest Temple Compass", "Boussole du Temple de la Forêt", "Kompaß des Waldtempels" },                                         ITEMTYPE_COMPASS,           0x9E,                 false, LOGIC_COMPASS_FOREST_TEMPLE,        RHT_FOREST_TEMPLE_COMPASS,             RG_FOREST_TEMPLE_COMPASS,             OBJECT_GI_COMPASS,       GID_COMPASS,         TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
     itemTable[RG_FOREST_TEMPLE_COMPASS].SetCustomDrawFunc(Randomizer_DrawCompass);
-    itemTable[RG_FIRE_TEMPLE_COMPASS] =                 Item(RG_FIRE_TEMPLE_COMPASS,              Text{ "Fire Temple Compass", "Boussole du Temple du Feu", "Feuertempel-Kompass" },                                ITEMTYPE_COMPASS,           0x9F,                 false, LOGIC_COMPASS_FIRE_TEMPLE,          RHT_FIRE_TEMPLE_COMPASS,               RG_FIRE_TEMPLE_COMPASS,               OBJECT_GI_COMPASS,      GID_COMPASS,   TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_FIRE_TEMPLE_COMPASS] =                 Item(RG_FIRE_TEMPLE_COMPASS,              Text{ "Fire Temple Compass", "Boussole du Temple du Feu", "Kompaß des Feuertempels" },                                               ITEMTYPE_COMPASS,           0x9F,                 false, LOGIC_COMPASS_FIRE_TEMPLE,          RHT_FIRE_TEMPLE_COMPASS,               RG_FIRE_TEMPLE_COMPASS,               OBJECT_GI_COMPASS,       GID_COMPASS,         TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
     itemTable[RG_FIRE_TEMPLE_COMPASS].SetCustomDrawFunc(Randomizer_DrawCompass);
-    itemTable[RG_WATER_TEMPLE_COMPASS] =                Item(RG_WATER_TEMPLE_COMPASS,             Text{ "Water Temple Compass", "Boussole du Temple de l'Eau", "Wassertempel-Kompass" },                            ITEMTYPE_COMPASS,           0xA0,                 false, LOGIC_COMPASS_WATER_TEMPLE,         RHT_WATER_TEMPLE_COMPASS,              RG_WATER_TEMPLE_COMPASS,              OBJECT_GI_COMPASS,      GID_COMPASS,   TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_WATER_TEMPLE_COMPASS] =                Item(RG_WATER_TEMPLE_COMPASS,             Text{ "Water Temple Compass", "Boussole du Temple de l'Eau", "Kompaß des Wassertempels" },                                           ITEMTYPE_COMPASS,           0xA0,                 false, LOGIC_COMPASS_WATER_TEMPLE,         RHT_WATER_TEMPLE_COMPASS,              RG_WATER_TEMPLE_COMPASS,              OBJECT_GI_COMPASS,       GID_COMPASS,         TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
     itemTable[RG_WATER_TEMPLE_COMPASS].SetCustomDrawFunc(Randomizer_DrawCompass);
-    itemTable[RG_SPIRIT_TEMPLE_COMPASS] =               Item(RG_SPIRIT_TEMPLE_COMPASS,            Text{ "Spirit Temple Compass", "Boussole due Temple de l'Esprit", "Geistiger Tempelkompass" },                    ITEMTYPE_COMPASS,           0xA1,                 false, LOGIC_COMPASS_SPIRIT_TEMPLE,        RHT_SPIRIT_TEMPLE_COMPASS,             RG_SPIRIT_TEMPLE_COMPASS,             OBJECT_GI_COMPASS,      GID_COMPASS,   TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_SPIRIT_TEMPLE_COMPASS] =               Item(RG_SPIRIT_TEMPLE_COMPASS,            Text{ "Spirit Temple Compass", "Boussole due Temple de l'Esprit", "Kompaß des Geistertempels" },                                     ITEMTYPE_COMPASS,           0xA1,                 false, LOGIC_COMPASS_SPIRIT_TEMPLE,        RHT_SPIRIT_TEMPLE_COMPASS,             RG_SPIRIT_TEMPLE_COMPASS,             OBJECT_GI_COMPASS,       GID_COMPASS,         TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
     itemTable[RG_SPIRIT_TEMPLE_COMPASS].SetCustomDrawFunc(Randomizer_DrawCompass);
-    itemTable[RG_SHADOW_TEMPLE_COMPASS] =               Item(RG_SHADOW_TEMPLE_COMPASS,            Text{ "Shadow Temple Compass", "Boussole du Temple de l'Ombre", "Kompass des Schattentempels" },                  ITEMTYPE_COMPASS,           0xA2,                 false, LOGIC_COMPASS_SHADOW_TEMPLE,        RHT_SHADOW_TEMPLE_COMPASS,             RG_SHADOW_TEMPLE_COMPASS,             OBJECT_GI_COMPASS,      GID_COMPASS,   TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_SHADOW_TEMPLE_COMPASS] =               Item(RG_SHADOW_TEMPLE_COMPASS,            Text{ "Shadow Temple Compass", "Boussole du Temple de l'Ombre", "Kompaß des Schattentempels" },                                      ITEMTYPE_COMPASS,           0xA2,                 false, LOGIC_COMPASS_SHADOW_TEMPLE,        RHT_SHADOW_TEMPLE_COMPASS,             RG_SHADOW_TEMPLE_COMPASS,             OBJECT_GI_COMPASS,       GID_COMPASS,         TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
     itemTable[RG_SHADOW_TEMPLE_COMPASS].SetCustomDrawFunc(Randomizer_DrawCompass);
-    itemTable[RG_BOTTOM_OF_THE_WELL_COMPASS] =          Item(RG_BOTTOM_OF_THE_WELL_COMPASS,       Text{ "Bottom of the Well Compass", "Boussole du Puits", "Boden des Brunnenkompasses" },                          ITEMTYPE_COMPASS,           0xA3,                 false, LOGIC_COMPASS_BOTTOM_OF_THE_WELL,   RHT_BOTTOM_OF_THE_WELL_COMPASS,        RG_BOTTOM_OF_THE_WELL_COMPASS,        OBJECT_GI_COMPASS,      GID_COMPASS,   TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_BOTTOM_OF_THE_WELL_COMPASS] =          Item(RG_BOTTOM_OF_THE_WELL_COMPASS,       Text{ "Bottom of the Well Compass", "Boussole du Puits", "Kompaß des Grund des Brunnens" },                                          ITEMTYPE_COMPASS,           0xA3,                 false, LOGIC_COMPASS_BOTTOM_OF_THE_WELL,   RHT_BOTTOM_OF_THE_WELL_COMPASS,        RG_BOTTOM_OF_THE_WELL_COMPASS,        OBJECT_GI_COMPASS,       GID_COMPASS,         TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
     itemTable[RG_BOTTOM_OF_THE_WELL_COMPASS].SetCustomDrawFunc(Randomizer_DrawCompass);
-    itemTable[RG_ICE_CAVERN_COMPASS] =                  Item(RG_ICE_CAVERN_COMPASS,               Text{ "Ice Cavern Compass", "Boussole de la Caverne Polaire", "Eishöhlenkompass" },                               ITEMTYPE_COMPASS,           0xA4,                 false, LOGIC_COMPASS_ICE_CAVERN,           RHT_ICE_CAVERN_COMPASS,                RG_ICE_CAVERN_COMPASS,                OBJECT_GI_COMPASS,      GID_COMPASS,   TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_ICE_CAVERN_COMPASS].SetCustomDrawFunc(Randomizer_DrawCompass);
+    itemTable[RG_ICE_CAVERN_COMPASS] =                  Item(RG_ICE_CAVERN_COMPASS,               Text{ "Ice Cavern Compass", "Boussole de la Caverne Polaire", "Kompaß der Eishöhle" },                                               ITEMTYPE_COMPASS,           0xA4,                 false, LOGIC_COMPASS_ICE_CAVERN,           RHT_ICE_CAVERN_COMPASS,                RG_ICE_CAVERN_COMPASS,                OBJECT_GI_COMPASS,       GID_COMPASS,         TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_ICE_CAVERN_COMPASS].SetCustomDrawFunc(Randomizer_DrawCompass);          
     // Boss Keys
-    itemTable[RG_FOREST_TEMPLE_BOSS_KEY] =              Item(RG_FOREST_TEMPLE_BOSS_KEY,           Text{ "Forest Temple Boss Key", "Clé d'Or du Temple de la Forêt", "Waldtempel-Boss-Schlüssel" },                  ITEMTYPE_BOSSKEY,           0x95,                 true,  LOGIC_BOSS_KEY_FOREST_TEMPLE,       RHT_FOREST_TEMPLE_BOSS_KEY,            RG_FOREST_TEMPLE_BOSS_KEY,            OBJECT_GI_BOSSKEY,      GID_KEY_BOSS,  TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
+    itemTable[RG_FOREST_TEMPLE_BOSS_KEY] =              Item(RG_FOREST_TEMPLE_BOSS_KEY,           Text{ "Forest Temple Boss Key", "Clé d'Or du Temple de la Forêt", "Master-Schlüssel des Waldtempels" },                              ITEMTYPE_BOSSKEY,           0x95,                 true,  LOGIC_BOSS_KEY_FOREST_TEMPLE,       RHT_FOREST_TEMPLE_BOSS_KEY,            RG_FOREST_TEMPLE_BOSS_KEY,            OBJECT_GI_BOSSKEY,       GID_KEY_BOSS,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
     itemTable[RG_FOREST_TEMPLE_BOSS_KEY].SetCustomDrawFunc(Randomizer_DrawBossKey);
-    itemTable[RG_FIRE_TEMPLE_BOSS_KEY] =                Item(RG_FIRE_TEMPLE_BOSS_KEY,             Text{ "Fire Temple Boss Key", "Clé d'Or du Temple du Feu", "Feuertempel-Boss-Schlüssel" },                        ITEMTYPE_BOSSKEY,           0x96,                 true,  LOGIC_BOSS_KEY_FIRE_TEMPLE,         RHT_FIRE_TEMPLE_BOSS_KEY,              RG_FIRE_TEMPLE_BOSS_KEY,              OBJECT_GI_BOSSKEY,      GID_KEY_BOSS,  TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
+    itemTable[RG_FIRE_TEMPLE_BOSS_KEY] =                Item(RG_FIRE_TEMPLE_BOSS_KEY,             Text{ "Fire Temple Boss Key", "Clé d'Or du Temple du Feu", "Master-Schlüssel des Feuertempels" },                                    ITEMTYPE_BOSSKEY,           0x96,                 true,  LOGIC_BOSS_KEY_FIRE_TEMPLE,         RHT_FIRE_TEMPLE_BOSS_KEY,              RG_FIRE_TEMPLE_BOSS_KEY,              OBJECT_GI_BOSSKEY,       GID_KEY_BOSS,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
     itemTable[RG_FIRE_TEMPLE_BOSS_KEY].SetCustomDrawFunc(Randomizer_DrawBossKey);
-    itemTable[RG_WATER_TEMPLE_BOSS_KEY] =               Item(RG_WATER_TEMPLE_BOSS_KEY,            Text{ "Water Temple Boss Key", "Clé d'Or du Temple de l'Eau", "Wassertempel-Boss-Schlüssel" },                    ITEMTYPE_BOSSKEY,           0x97,                 true,  LOGIC_BOSS_KEY_WATER_TEMPLE,        RHT_WATER_TEMPLE_BOSS_KEY,             RG_WATER_TEMPLE_BOSS_KEY,             OBJECT_GI_BOSSKEY,      GID_KEY_BOSS,  TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
+    itemTable[RG_WATER_TEMPLE_BOSS_KEY] =               Item(RG_WATER_TEMPLE_BOSS_KEY,            Text{ "Water Temple Boss Key", "Clé d'Or du Temple de l'Eau", "Master-Schlüssel des Wassertempels" },                                ITEMTYPE_BOSSKEY,           0x97,                 true,  LOGIC_BOSS_KEY_WATER_TEMPLE,        RHT_WATER_TEMPLE_BOSS_KEY,             RG_WATER_TEMPLE_BOSS_KEY,             OBJECT_GI_BOSSKEY,       GID_KEY_BOSS,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
     itemTable[RG_WATER_TEMPLE_BOSS_KEY].SetCustomDrawFunc(Randomizer_DrawBossKey);
-    itemTable[RG_SPIRIT_TEMPLE_BOSS_KEY] =              Item(RG_SPIRIT_TEMPLE_BOSS_KEY,           Text{ "Spirit Temple Boss Key", "Clé d'Or du Temple de l'Esprit", "Geistertempel-Boss-Schlüssel" },               ITEMTYPE_BOSSKEY,           0x98,                 true,  LOGIC_BOSS_KEY_SPIRIT_TEMPLE,       RHT_SPIRIT_TEMPLE_BOSS_KEY,            RG_SPIRIT_TEMPLE_BOSS_KEY,            OBJECT_GI_BOSSKEY,      GID_KEY_BOSS,  TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
+    itemTable[RG_SPIRIT_TEMPLE_BOSS_KEY] =              Item(RG_SPIRIT_TEMPLE_BOSS_KEY,           Text{ "Spirit Temple Boss Key", "Clé d'Or du Temple de l'Esprit", "Master-Schlüssel des Geistertempels" },                           ITEMTYPE_BOSSKEY,           0x98,                 true,  LOGIC_BOSS_KEY_SPIRIT_TEMPLE,       RHT_SPIRIT_TEMPLE_BOSS_KEY,            RG_SPIRIT_TEMPLE_BOSS_KEY,            OBJECT_GI_BOSSKEY,       GID_KEY_BOSS,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
     itemTable[RG_SPIRIT_TEMPLE_BOSS_KEY].SetCustomDrawFunc(Randomizer_DrawBossKey);
-    itemTable[RG_SHADOW_TEMPLE_BOSS_KEY] =              Item( RG_SHADOW_TEMPLE_BOSS_KEY,          Text{ "Shadow Temple Boss Key", "Clé d'Or du Temple de l'Ombre", "Schlüssel für den Boss des Schattentempels" },  ITEMTYPE_BOSSKEY,           0x99,                 true,  LOGIC_BOSS_KEY_SHADOW_TEMPLE,       RHT_SHADOW_TEMPLE_BOSS_KEY,            RG_SHADOW_TEMPLE_BOSS_KEY,            OBJECT_GI_BOSSKEY,      GID_KEY_BOSS,  TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
+    itemTable[RG_SHADOW_TEMPLE_BOSS_KEY] =              Item( RG_SHADOW_TEMPLE_BOSS_KEY,          Text{ "Shadow Temple Boss Key", "Clé d'Or du Temple de l'Ombre", "Master-Schlüssel des Schattentempels" },                           ITEMTYPE_BOSSKEY,           0x99,                 true,  LOGIC_BOSS_KEY_SHADOW_TEMPLE,       RHT_SHADOW_TEMPLE_BOSS_KEY,            RG_SHADOW_TEMPLE_BOSS_KEY,            OBJECT_GI_BOSSKEY,       GID_KEY_BOSS,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
     itemTable[RG_SHADOW_TEMPLE_BOSS_KEY].SetCustomDrawFunc(Randomizer_DrawBossKey);
-    itemTable[RG_GANONS_CASTLE_BOSS_KEY] =              Item(RG_GANONS_CASTLE_BOSS_KEY,           Text{ "Ganon's Castle Boss Key", "Clé d'Or du Château de Ganon", "Ganons Schloss-Boss-Schlüssel" },               ITEMTYPE_BOSSKEY,           0x9A,                 true,  LOGIC_BOSS_KEY_GANONS_CASTLE,       RHT_GANONS_CASTLE_BOSS_KEY,            RG_GANONS_CASTLE_BOSS_KEY,            OBJECT_GI_BOSSKEY,      GID_KEY_BOSS,  TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
+    itemTable[RG_GANONS_CASTLE_BOSS_KEY] =              Item(RG_GANONS_CASTLE_BOSS_KEY,           Text{ "Ganon's Castle Boss Key", "Clé d'Or du Château de Ganon", "Master-Schlüssel von Ganons Schloß" },                             ITEMTYPE_BOSSKEY,           0x9A,                 true,  LOGIC_BOSS_KEY_GANONS_CASTLE,       RHT_GANONS_CASTLE_BOSS_KEY,            RG_GANONS_CASTLE_BOSS_KEY,            OBJECT_GI_BOSSKEY,       GID_KEY_BOSS,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
     itemTable[RG_GANONS_CASTLE_BOSS_KEY].SetCustomDrawFunc(Randomizer_DrawBossKey);
-    itemTable[RG_FOREST_TEMPLE_SMALL_KEY] =             Item(RG_FOREST_TEMPLE_SMALL_KEY,          Text{ "Forest Temple Small Key", "Petite Clé du Temple de la Forêt", "Waldtempel Kleiner Schlüssel" },            ITEMTYPE_SMALLKEY,          0xAF,                 true,  LOGIC_FOREST_TEMPLE_KEYS,           RHT_FOREST_TEMPLE_SMALL_KEY,           RG_FOREST_TEMPLE_SMALL_KEY,           OBJECT_GI_KEY,          GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_FOREST_TEMPLE_SMALL_KEY] =             Item(RG_FOREST_TEMPLE_SMALL_KEY,          Text{ "Forest Temple Small Key", "Petite Clé du Temple de la Forêt", "Kleiner Schlüssel für den Waldtempel" },                       ITEMTYPE_SMALLKEY,          0xAF,                 true,  LOGIC_FOREST_TEMPLE_KEYS,           RHT_FOREST_TEMPLE_SMALL_KEY,           RG_FOREST_TEMPLE_SMALL_KEY,           OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_FOREST_TEMPLE_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
-    itemTable[RG_FIRE_TEMPLE_SMALL_KEY] =               Item(RG_FIRE_TEMPLE_SMALL_KEY,            Text{ "Fire Temple Small Key", "Petite Clé du Temple du Feu", "Feuertempel Kleiner Schlüssel" },                  ITEMTYPE_SMALLKEY,          0xB0,                 true,  LOGIC_FIRE_TEMPLE_KEYS,             RHT_FIRE_TEMPLE_SMALL_KEY,             RG_FIRE_TEMPLE_SMALL_KEY,             OBJECT_GI_KEY,          GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_FIRE_TEMPLE_SMALL_KEY] =               Item(RG_FIRE_TEMPLE_SMALL_KEY,            Text{ "Fire Temple Small Key", "Petite Clé du Temple du Feu", "Kleiner Schlüssel für den Feuertempel" },                             ITEMTYPE_SMALLKEY,          0xB0,                 true,  LOGIC_FIRE_TEMPLE_KEYS,             RHT_FIRE_TEMPLE_SMALL_KEY,             RG_FIRE_TEMPLE_SMALL_KEY,             OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_FIRE_TEMPLE_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
-    itemTable[RG_WATER_TEMPLE_SMALL_KEY] =              Item(RG_WATER_TEMPLE_SMALL_KEY,           Text{ "Water Temple Small Key", "Petite Clé du Temple de l'Eau", "Wassertempel Kleiner Schlüssel" },              ITEMTYPE_SMALLKEY,          0xB1,                 true,  LOGIC_WATER_TEMPLE_KEYS,            RHT_WATER_TEMPLE_SMALL_KEY,            RG_WATER_TEMPLE_SMALL_KEY,            OBJECT_GI_KEY,          GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_WATER_TEMPLE_SMALL_KEY] =              Item(RG_WATER_TEMPLE_SMALL_KEY,           Text{ "Water Temple Small Key", "Petite Clé du Temple de l'Eau", "Kleiner Schlüssel für den Wassertempel" },                         ITEMTYPE_SMALLKEY,          0xB1,                 true,  LOGIC_WATER_TEMPLE_KEYS,            RHT_WATER_TEMPLE_SMALL_KEY,            RG_WATER_TEMPLE_SMALL_KEY,            OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_WATER_TEMPLE_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
-    itemTable[RG_SPIRIT_TEMPLE_SMALL_KEY] =             Item(RG_SPIRIT_TEMPLE_SMALL_KEY,          Text{ "Spirit Temple Small Key", "Petite Clé du Temple de l'Esprit", "Geisttempel Kleiner Schlüssel" },           ITEMTYPE_SMALLKEY,          0xB2,                 true,  LOGIC_SPIRIT_TEMPLE_KEYS,           RHT_SPIRIT_TEMPLE_SMALL_KEY,           RG_SPIRIT_TEMPLE_SMALL_KEY,           OBJECT_GI_KEY,          GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_SPIRIT_TEMPLE_SMALL_KEY] =             Item(RG_SPIRIT_TEMPLE_SMALL_KEY,          Text{ "Spirit Temple Small Key", "Petite Clé du Temple de l'Esprit", "Kleiner Schlüssel für den Geistertempel" },                    ITEMTYPE_SMALLKEY,          0xB2,                 true,  LOGIC_SPIRIT_TEMPLE_KEYS,           RHT_SPIRIT_TEMPLE_SMALL_KEY,           RG_SPIRIT_TEMPLE_SMALL_KEY,           OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_SPIRIT_TEMPLE_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
-    itemTable[RG_SHADOW_TEMPLE_SMALL_KEY] =             Item(RG_SHADOW_TEMPLE_SMALL_KEY,          Text{ "Shadow Temple Small Key", "Petite Clé du Temple de l'Ombre", "Schattentempel Kleiner Schlüssel" },         ITEMTYPE_SMALLKEY,          0xB3,                 true,  LOGIC_SHADOW_TEMPLE_KEYS,           RHT_SHADOW_TEMPLE_SMALL_KEY,           RG_SHADOW_TEMPLE_SMALL_KEY,           OBJECT_GI_KEY,          GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_SHADOW_TEMPLE_SMALL_KEY] =             Item(RG_SHADOW_TEMPLE_SMALL_KEY,          Text{ "Shadow Temple Small Key", "Petite Clé du Temple de l'Ombre", "Kleiner Schlüssel für den Schattentempel" },                    ITEMTYPE_SMALLKEY,          0xB3,                 true,  LOGIC_SHADOW_TEMPLE_KEYS,           RHT_SHADOW_TEMPLE_SMALL_KEY,           RG_SHADOW_TEMPLE_SMALL_KEY,           OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_SHADOW_TEMPLE_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
-    itemTable[RG_BOTTOM_OF_THE_WELL_SMALL_KEY] =        Item(RG_BOTTOM_OF_THE_WELL_SMALL_KEY,     Text{ "Bottom of the Well Small Key", "Petite Clé du Puits", "Boden des Brunnens Kleiner Schlüssel" },            ITEMTYPE_SMALLKEY,          0xB4,                 true,  LOGIC_BOTTOM_OF_THE_WELL_KEYS,      RHT_BOTTOM_OF_THE_WELL_SMALL_KEY,      RG_BOTTOM_OF_THE_WELL_SMALL_KEY,      OBJECT_GI_KEY,          GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_BOTTOM_OF_THE_WELL_SMALL_KEY] =        Item(RG_BOTTOM_OF_THE_WELL_SMALL_KEY,     Text{ "Bottom of the Well Small Key", "Petite Clé du Puits", "Kleiner Schlüssel für den Grund des Brunnens" },                       ITEMTYPE_SMALLKEY,          0xB4,                 true,  LOGIC_BOTTOM_OF_THE_WELL_KEYS,      RHT_BOTTOM_OF_THE_WELL_SMALL_KEY,      RG_BOTTOM_OF_THE_WELL_SMALL_KEY,      OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_BOTTOM_OF_THE_WELL_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
-    itemTable[RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY] =   Item(RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, Text{ "Training Grounds Small Key", "Petite Clé du Gymnase Gerudo", "Trainingsgelände Kleiner Schlüssel" },      ITEMTYPE_SMALLKEY,          0xB5,                 true,  LOGIC_GERUDO_TRAINING_GROUNDS_KEYS, RHT_GERUDO_TRAINING_GROUNDS_SMALL_KEY, RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, OBJECT_GI_KEY,          GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY] =   Item(RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, Text{ "Training Grounds Small Key", "Petite Clé du Gymnase Gerudo", "Kleiner Schlüssel für das Gerudo-Trainingsgelände" },          ITEMTYPE_SMALLKEY,          0xB5,                 true,  LOGIC_GERUDO_TRAINING_GROUNDS_KEYS, RHT_GERUDO_TRAINING_GROUNDS_SMALL_KEY, RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
-    itemTable[RG_GERUDO_FORTRESS_SMALL_KEY] =           Item(RG_GERUDO_FORTRESS_SMALL_KEY,        Text{ "Gerudo Fortress Small Key", "Petite Clé du Repaire des Voleurs", "Gerudo-Festung Kleiner Schlüssel" },     ITEMTYPE_FORTRESS_SMALLKEY, 0xB6,                 true,  LOGIC_GERUDO_FORTRESS_KEYS,         RHT_GERUDO_FORTRESS_SMALL_KEY,         RG_GERUDO_FORTRESS_SMALL_KEY,         OBJECT_GI_KEY,          GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_GERUDO_FORTRESS_SMALL_KEY] =           Item(RG_GERUDO_FORTRESS_SMALL_KEY,        Text{ "Gerudo Fortress Small Key", "Petite Clé du Repaire des Voleurs", "Kleiner Schlüssel für die Gerudo-Festung" },                ITEMTYPE_FORTRESS_SMALLKEY, 0xB6,                 true,  LOGIC_GERUDO_FORTRESS_KEYS,         RHT_GERUDO_FORTRESS_SMALL_KEY,         RG_GERUDO_FORTRESS_SMALL_KEY,         OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_GERUDO_FORTRESS_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
-    itemTable[RG_GANONS_CASTLE_SMALL_KEY] =             Item(RG_GANONS_CASTLE_SMALL_KEY,          Text{ "Ganon's Castle Small Key", "Petite Clé du Château de Ganon", "Ganons Schloss Kleiner Schlüssel" },         ITEMTYPE_SMALLKEY,          0xB7,                 true,  LOGIC_GANONS_CASTLE_KEYS,           RHT_GANONS_CASTLE_SMALL_KEY,           RG_GANONS_CASTLE_SMALL_KEY,           OBJECT_GI_KEY,          GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
-    itemTable[RG_GANONS_CASTLE_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
-    itemTable[RG_TREASURE_GAME_SMALL_KEY] =             Item(RG_TREASURE_GAME_SMALL_KEY,          Text{ "Chest Game Small Key", "Petite Clé du jeu la Chasse-aux-Trésors", "Truhenspiel Kleiner Schlüssel" },       ITEMTYPE_SMALLKEY,          GI_DOOR_KEY,          true,  LOGIC_TREASURE_GAME_KEYS,           RHT_TREASURE_GAME_SMALL_KEY,           ITEM_KEY_SMALL,                       OBJECT_GI_KEY,          GID_KEY_SMALL, 0xF3,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_NONE);
+    itemTable[RG_GANONS_CASTLE_SMALL_KEY] =             Item(RG_GANONS_CASTLE_SMALL_KEY,          Text{ "Ganon's Castle Small Key", "Petite Clé du Château de Ganon", "Kleiner Schlüssel für Ganons Schloß" },                         ITEMTYPE_SMALLKEY,          0xB7,                 true,  LOGIC_GANONS_CASTLE_KEYS,           RHT_GANONS_CASTLE_SMALL_KEY,           RG_GANONS_CASTLE_SMALL_KEY,           OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_GANONS_CASTLE_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);      
+    itemTable[RG_TREASURE_GAME_SMALL_KEY] =             Item(RG_TREASURE_GAME_SMALL_KEY,          Text{ "Chest Game Small Key", "Petite Clé du jeu la Chasse-aux-Trésors", "Kleiner Schlüssel für das Truhenspiel" },                  ITEMTYPE_SMALLKEY,          GI_DOOR_KEY,          true,  LOGIC_TREASURE_GAME_KEYS,           RHT_TREASURE_GAME_SMALL_KEY,           ITEM_KEY_SMALL,                       OBJECT_GI_KEY,           GID_KEY_SMALL,       0xF3,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_NONE);
     // Key Rings
-    itemTable[RG_FOREST_TEMPLE_KEY_RING] =              Item(RG_FOREST_TEMPLE_KEY_RING,           Text{ "Forest Temple Key Ring", "Trousseau du Temple de la Forêt", "Waldtempel Schlüsselanhänger" },              ITEMTYPE_SMALLKEY,          0xD5,                 true,  LOGIC_FOREST_TEMPLE_KEYS,           RHT_FOREST_TEMPLE_KEY_RING,            RG_FOREST_TEMPLE_KEY_RING,            OBJECT_GI_KEY,          GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_FOREST_TEMPLE_KEY_RING] =              Item(RG_FOREST_TEMPLE_KEY_RING,           Text{ "Forest Temple Key Ring", "Trousseau du Temple de la Forêt", "Schlüsselbund für den Waldtempel" },                             ITEMTYPE_SMALLKEY,          0xD5,                 true,  LOGIC_FOREST_TEMPLE_KEYS,           RHT_FOREST_TEMPLE_KEY_RING,            RG_FOREST_TEMPLE_KEY_RING,            OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_FOREST_TEMPLE_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
-    itemTable[RG_FIRE_TEMPLE_KEY_RING] =                Item(RG_FIRE_TEMPLE_KEY_RING,             Text{ "Fire Temple Key Ring", "Trousseau du Temple du Feu", "Feuertempel Schlüsselanhänger" },                    ITEMTYPE_SMALLKEY,          0xD6,                 true,  LOGIC_FIRE_TEMPLE_KEYS,             RHT_FIRE_TEMPLE_KEY_RING,              RG_FIRE_TEMPLE_KEY_RING,              OBJECT_GI_KEY,          GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_FIRE_TEMPLE_KEY_RING] =                Item(RG_FIRE_TEMPLE_KEY_RING,             Text{ "Fire Temple Key Ring", "Trousseau du Temple du Feu", "Schlüsselbund für den Feuertempel" },                                   ITEMTYPE_SMALLKEY,          0xD6,                 true,  LOGIC_FIRE_TEMPLE_KEYS,             RHT_FIRE_TEMPLE_KEY_RING,              RG_FIRE_TEMPLE_KEY_RING,              OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_FIRE_TEMPLE_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
-    itemTable[RG_WATER_TEMPLE_KEY_RING] =               Item(RG_WATER_TEMPLE_KEY_RING,            Text{ "Water Temple Key Ring", "Trousseau du Temple de l'Eau", "Wassertempel Schlüsselanhänger" },                ITEMTYPE_SMALLKEY,          0xD7,                 true,  LOGIC_WATER_TEMPLE_KEYS,            RHT_WATER_TEMPLE_KEY_RING,             RG_WATER_TEMPLE_KEY_RING,             OBJECT_GI_KEY,          GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_WATER_TEMPLE_KEY_RING] =               Item(RG_WATER_TEMPLE_KEY_RING,            Text{ "Water Temple Key Ring", "Trousseau du Temple de l'Eau", "Schlüsselbund für den Wassertempel" },                               ITEMTYPE_SMALLKEY,          0xD7,                 true,  LOGIC_WATER_TEMPLE_KEYS,            RHT_WATER_TEMPLE_KEY_RING,             RG_WATER_TEMPLE_KEY_RING,             OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_WATER_TEMPLE_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
-    itemTable[RG_SPIRIT_TEMPLE_KEY_RING] =              Item(RG_SPIRIT_TEMPLE_KEY_RING,           Text{ "Spirit Temple Key Ring", "Trousseau du Temple de l'Esprit", "Geisttempel Schlüsselanhänger" },             ITEMTYPE_SMALLKEY,          0xD8,                 true,  LOGIC_SPIRIT_TEMPLE_KEYS,           RHT_SPIRIT_TEMPLE_KEY_RING,            RG_SPIRIT_TEMPLE_KEY_RING,            OBJECT_GI_KEY,          GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
-    itemTable[RG_SPIRIT_TEMPLE_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
-    itemTable[RG_SHADOW_TEMPLE_KEY_RING] =              Item(RG_SHADOW_TEMPLE_KEY_RING,           Text{ "Shadow Temple Key Ring", "Trousseau du Temple de l'Ombre", "Schattentempel Schlüsselanhänger" },           ITEMTYPE_SMALLKEY,          0xD9,                 true,  LOGIC_SHADOW_TEMPLE_KEYS,           RHT_SHADOW_TEMPLE_KEY_RING,            RG_SHADOW_TEMPLE_KEY_RING,            OBJECT_GI_KEY,          GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_SPIRIT_TEMPLE_KEY_RING] =              Item(RG_SPIRIT_TEMPLE_KEY_RING,           Text{ "Spirit Temple Key Ring", "Trousseau du Temple de l'Esprit", "Schlüsselbund für den Geistertempel" },                          ITEMTYPE_SMALLKEY,          0xD8,                 true,  LOGIC_SPIRIT_TEMPLE_KEYS,           RHT_SPIRIT_TEMPLE_KEY_RING,            RG_SPIRIT_TEMPLE_KEY_RING,            OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_SPIRIT_TEMPLE_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing); 
+    itemTable[RG_SHADOW_TEMPLE_KEY_RING] =              Item(RG_SHADOW_TEMPLE_KEY_RING,           Text{ "Shadow Temple Key Ring", "Trousseau du Temple de l'Ombre", "Schlüsselbund für den Schattentempel" },                          ITEMTYPE_SMALLKEY,          0xD9,                 true,  LOGIC_SHADOW_TEMPLE_KEYS,           RHT_SHADOW_TEMPLE_KEY_RING,            RG_SHADOW_TEMPLE_KEY_RING,            OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_SHADOW_TEMPLE_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
-    itemTable[RG_BOTTOM_OF_THE_WELL_KEY_RING] =         Item(RG_BOTTOM_OF_THE_WELL_KEY_RING,      Text{ "Bottom of the Well Key Ring", "Trousseau du Puits", "Boden des Brunnens Schlüsselanhänger" },              ITEMTYPE_SMALLKEY,          0xDA,                 true,  LOGIC_BOTTOM_OF_THE_WELL_KEYS,      RHT_BOTTOM_OF_THE_WELL_KEY_RING,       RG_BOTTOM_OF_THE_WELL_KEY_RING,       OBJECT_GI_KEY,          GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_BOTTOM_OF_THE_WELL_KEY_RING] =         Item(RG_BOTTOM_OF_THE_WELL_KEY_RING,      Text{ "Bottom of the Well Key Ring", "Trousseau du Puits", "Schlüsselbund für den Grund des Brunnens" },                             ITEMTYPE_SMALLKEY,          0xDA,                 true,  LOGIC_BOTTOM_OF_THE_WELL_KEYS,      RHT_BOTTOM_OF_THE_WELL_KEY_RING,       RG_BOTTOM_OF_THE_WELL_KEY_RING,       OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_BOTTOM_OF_THE_WELL_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
-    itemTable[RG_GERUDO_TRAINING_GROUNDS_KEY_RING] =    Item(RG_GERUDO_TRAINING_GROUNDS_KEY_RING, Text{ "Training Grounds Key Ring", "Trousseau du Gymnase Gerudo", "Trainingsgelände Schlüsselanhänger" },         ITEMTYPE_SMALLKEY,          0xDB,                 true,  LOGIC_GERUDO_TRAINING_GROUNDS_KEYS, RHT_GERUDO_TRAINING_GROUNDS_KEY_RING,  RG_GERUDO_TRAINING_GROUNDS_KEY_RING,  OBJECT_GI_KEY,          GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_GERUDO_TRAINING_GROUNDS_KEY_RING] =    Item(RG_GERUDO_TRAINING_GROUNDS_KEY_RING, Text{ "Training Grounds Key Ring", "Trousseau du Gymnase Gerudo", "Schlüsselbund für das Gerudo-Trainingsgelände" },                 ITEMTYPE_SMALLKEY,          0xDB,                 true,  LOGIC_GERUDO_TRAINING_GROUNDS_KEYS, RHT_GERUDO_TRAINING_GROUNDS_KEY_RING,  RG_GERUDO_TRAINING_GROUNDS_KEY_RING,  OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_GERUDO_TRAINING_GROUNDS_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
-    itemTable[RG_GERUDO_FORTRESS_KEY_RING] =            Item(RG_GERUDO_FORTRESS_KEY_RING,         Text{ "Gerudo Fortress Key Ring", "Trousseau du Repaire des Voleurs", "Gerudo Festung Schlüsselanhänger" },       ITEMTYPE_FORTRESS_SMALLKEY, 0xDC,                 true,  LOGIC_GERUDO_FORTRESS_KEYS,         RHT_GERUDO_FORTRESS_KEY_RING,          RG_GERUDO_FORTRESS_KEY_RING,          OBJECT_GI_KEY,          GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_GERUDO_FORTRESS_KEY_RING] =            Item(RG_GERUDO_FORTRESS_KEY_RING,         Text{ "Gerudo Fortress Key Ring", "Trousseau du Repaire des Voleurs", "Schlüsselbund für die Gerudo-Festung" },                      ITEMTYPE_FORTRESS_SMALLKEY, 0xDC,                 true,  LOGIC_GERUDO_FORTRESS_KEYS,         RHT_GERUDO_FORTRESS_KEY_RING,          RG_GERUDO_FORTRESS_KEY_RING,          OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_GERUDO_FORTRESS_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
-    itemTable[RG_GANONS_CASTLE_KEY_RING] =              Item(RG_GANONS_CASTLE_KEY_RING,           Text{ "Ganon's Castle Key Ring", "Trousseau du Château de Ganon", "Ganons Schloss Schlüsselanhänger" },           ITEMTYPE_SMALLKEY,          0xDD,                 true,  LOGIC_GANONS_CASTLE_KEYS,           RHT_GANONS_CASTLE_KEY_RING,            RG_GANONS_CASTLE_KEY_RING,            OBJECT_GI_KEY,          GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_GANONS_CASTLE_KEY_RING] =              Item(RG_GANONS_CASTLE_KEY_RING,           Text{ "Ganon's Castle Key Ring", "Trousseau du Château de Ganon", "Schlüsselbund für Ganons Schloß" },                               ITEMTYPE_SMALLKEY,          0xDD,                 true,  LOGIC_GANONS_CASTLE_KEYS,           RHT_GANONS_CASTLE_KEY_RING,            RG_GANONS_CASTLE_KEY_RING,            OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_GANONS_CASTLE_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
     // Dungeon Rewards
-    itemTable[RG_KOKIRI_EMERALD] =                      Item(RG_KOKIRI_EMERALD,                   Text{ "Kokiri's Emerald", "Émeraude Kokiri", "Kokiri-Smaragd" },                                                  ITEMTYPE_DUNGEONREWARD,     0xCB,                 true,  LOGIC_KOKIRI_EMERALD,          RHT_KOKIRI_EMERALD,           ITEM_KOKIRI_EMERALD,            OBJECT_GI_JEWEL,        GID_KOKIRI_EMERALD, 0x80,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_GORON_RUBY] =                          Item(RG_GORON_RUBY,                       Text{ "Goron's Ruby", "Rubis Goron", "Goronen-Rubin" },                                                           ITEMTYPE_DUNGEONREWARD,     0xCC,                 true,  LOGIC_GORON_RUBY,              RHT_GORON_RUBY,               ITEM_GORON_RUBY,                OBJECT_GI_JEWEL,        GID_GORON_RUBY,     0x81,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_ZORA_SAPPHIRE] =                       Item(RG_ZORA_SAPPHIRE,                    Text{ "Zora's Sapphire", "Saphir Zora", "Zora-Saphir" },                                                          ITEMTYPE_DUNGEONREWARD,     0xCD,                 true,  LOGIC_ZORA_SAPPHIRE,           RHT_ZORA_SAPPHIRE,            ITEM_ZORA_SAPPHIRE,             OBJECT_GI_JEWEL,        GID_ZORA_SAPPHIRE,  0x82,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_FOREST_MEDALLION] =                    Item(RG_FOREST_MEDALLION,                 Text{ "Forest Medallion", "Médaillon de la Forêt", "Wald Medaillon" },                                            ITEMTYPE_DUNGEONREWARD,     0xCE,                 true,  LOGIC_FOREST_MEDALLION,        RHT_FOREST_MEDALLION,         ITEM_MEDALLION_FOREST,          OBJECT_GI_MEDAL,        GID_MEDALLION_FOREST,0x3E,                       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_FIRE_MEDALLION] =                      Item(RG_FIRE_MEDALLION,                   Text{ "Fire Medallion", "Médaillon du Feu", "Feuer Medaillon" },                                                  ITEMTYPE_DUNGEONREWARD,     0xCF,                 true,  LOGIC_FIRE_MEDALLION,          RHT_FIRE_MEDALLION,           ITEM_MEDALLION_FIRE,            OBJECT_GI_MEDAL,        GID_MEDALLION_FIRE, 0x3C,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_WATER_MEDALLION] =                     Item(RG_WATER_MEDALLION,                  Text{ "Water Medallion", "Médaillon de l'Eau", "Wasser Medaillon" },                                              ITEMTYPE_DUNGEONREWARD,     0xD0,                 true,  LOGIC_WATER_MEDALLION,         RHT_WATER_MEDALLION,          ITEM_MEDALLION_WATER,           OBJECT_GI_MEDAL,        GID_MEDALLION_WATER,0x3D,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_SPIRIT_MEDALLION] =                    Item(RG_SPIRIT_MEDALLION,                 Text{ "Spirit Medallion", "Médaillon de l'Esprit", "Geist Medaillon" },                                           ITEMTYPE_DUNGEONREWARD,     0xD1,                 true,  LOGIC_SPIRIT_MEDALLION,        RHT_SPIRIT_MEDALLION,         ITEM_MEDALLION_SPIRIT,          OBJECT_GI_MEDAL,        GID_MEDALLION_SPIRIT,0x3F,                       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_SHADOW_MEDALLION] =                    Item(RG_SHADOW_MEDALLION,                 Text{ "Shadow Medallion", "Médaillon de l'Ombre", "Schatten Medaillon" },                                         ITEMTYPE_DUNGEONREWARD,     0xD2,                 true,  LOGIC_SHADOW_MEDALLION,        RHT_SHADOW_MEDALLION,         ITEM_MEDALLION_SHADOW,          OBJECT_GI_MEDAL,        GID_MEDALLION_SHADOW,0x41,                       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_LIGHT_MEDALLION] =                     Item(RG_LIGHT_MEDALLION,                  Text{ "Light Medallion", "Médaillon de la Lumière", "Licht Medaillon" },                                          ITEMTYPE_DUNGEONREWARD,     0xD3,                 true,  LOGIC_LIGHT_MEDALLION,         RHT_LIGHT_MEDALLION,          ITEM_MEDALLION_LIGHT,           OBJECT_GI_MEDAL,        GID_MEDALLION_LIGHT,0x40,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_KOKIRI_EMERALD] =                      Item(RG_KOKIRI_EMERALD,                   Text{ "Kokiri's Emerald", "Émeraude Kokiri", "Kokiri-Smaragd" },                                                                     ITEMTYPE_DUNGEONREWARD,     0xCB,                 true,  LOGIC_KOKIRI_EMERALD,               RHT_KOKIRI_EMERALD,                    ITEM_KOKIRI_EMERALD,                  OBJECT_GI_JEWEL,        GID_KOKIRI_EMERALD,   0x80,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_GORON_RUBY] =                          Item(RG_GORON_RUBY,                       Text{ "Goron's Ruby", "Rubis Goron", "Goronen-Rubin" },                                                                              ITEMTYPE_DUNGEONREWARD,     0xCC,                 true,  LOGIC_GORON_RUBY,                   RHT_GORON_RUBY,                        ITEM_GORON_RUBY,                      OBJECT_GI_JEWEL,        GID_GORON_RUBY,       0x81,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_ZORA_SAPPHIRE] =                       Item(RG_ZORA_SAPPHIRE,                    Text{ "Zora's Sapphire", "Saphir Zora", "Zora-Saphir" },                                                                             ITEMTYPE_DUNGEONREWARD,     0xCD,                 true,  LOGIC_ZORA_SAPPHIRE,                RHT_ZORA_SAPPHIRE,                     ITEM_ZORA_SAPPHIRE,                   OBJECT_GI_JEWEL,        GID_ZORA_SAPPHIRE,    0x82,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_FOREST_MEDALLION] =                    Item(RG_FOREST_MEDALLION,                 Text{ "Forest Medallion", "Médaillon de la Forêt", "Amulett des Waldes" },                                                           ITEMTYPE_DUNGEONREWARD,     0xCE,                 true,  LOGIC_FOREST_MEDALLION,             RHT_FOREST_MEDALLION,                  ITEM_MEDALLION_FOREST,                OBJECT_GI_MEDAL,        GID_MEDALLION_FOREST, 0x3E,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_FIRE_MEDALLION] =                      Item(RG_FIRE_MEDALLION,                   Text{ "Fire Medallion", "Médaillon du Feu", "Amulett des Feuers" },                                                                  ITEMTYPE_DUNGEONREWARD,     0xCF,                 true,  LOGIC_FIRE_MEDALLION,               RHT_FIRE_MEDALLION,                    ITEM_MEDALLION_FIRE,                  OBJECT_GI_MEDAL,        GID_MEDALLION_FIRE,   0x3C,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_WATER_MEDALLION] =                     Item(RG_WATER_MEDALLION,                  Text{ "Water Medallion", "Médaillon de l'Eau", "Amulett des Wassers" },                                                              ITEMTYPE_DUNGEONREWARD,     0xD0,                 true,  LOGIC_WATER_MEDALLION,              RHT_WATER_MEDALLION,                   ITEM_MEDALLION_WATER,                 OBJECT_GI_MEDAL,        GID_MEDALLION_WATER,  0x3D,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_SPIRIT_MEDALLION] =                    Item(RG_SPIRIT_MEDALLION,                 Text{ "Spirit Medallion", "Médaillon de l'Esprit", "Amulett der Geister" },                                                          ITEMTYPE_DUNGEONREWARD,     0xD1,                 true,  LOGIC_SPIRIT_MEDALLION,             RHT_SPIRIT_MEDALLION,                  ITEM_MEDALLION_SPIRIT,                OBJECT_GI_MEDAL,        GID_MEDALLION_SPIRIT, 0x3F,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_SHADOW_MEDALLION] =                    Item(RG_SHADOW_MEDALLION,                 Text{ "Shadow Medallion", "Médaillon de l'Ombre", "Amulett des Schattens" },                                                         ITEMTYPE_DUNGEONREWARD,     0xD2,                 true,  LOGIC_SHADOW_MEDALLION,             RHT_SHADOW_MEDALLION,                  ITEM_MEDALLION_SHADOW,                OBJECT_GI_MEDAL,        GID_MEDALLION_SHADOW, 0x41,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_LIGHT_MEDALLION] =                     Item(RG_LIGHT_MEDALLION,                  Text{ "Light Medallion", "Médaillon de la Lumière", "Amulett des Lichts" },                                                          ITEMTYPE_DUNGEONREWARD,     0xD3,                 true,  LOGIC_LIGHT_MEDALLION,              RHT_LIGHT_MEDALLION,                   ITEM_MEDALLION_LIGHT,                 OBJECT_GI_MEDAL,        GID_MEDALLION_LIGHT,  0x40,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
     // Generic Items
-    itemTable[RG_RECOVERY_HEART] =                      Item(RG_RECOVERY_HEART,                   Text{ "Recovery Heart", "Coeur de Vie", "Herz" },                                                                 ITEMTYPE_ITEM,              GI_HEART,             false, LOGIC_NONE,                    RHT_RECOVERY_HEART,           ITEM_HEART,                     OBJECT_GI_HEART,        GID_HEART,          0x55,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_GREEN_RUPEE] =                         Item(RG_GREEN_RUPEE,                      Text{ "Green Rupee", "Rubis Vert", "Grüne Rupie" },                                                               ITEMTYPE_ITEM,              GI_RUPEE_GREEN,       false, LOGIC_NONE,                    RHT_GREEN_RUPEE,              ITEM_RUPEE_GREEN,               OBJECT_GI_RUPY,         GID_RUPEE_GREEN,    0x6F,                        0x00, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_GREG_RUPEE] =                          Item(RG_GREG_RUPEE,                       Text{ "Greg the Green Rupee", "Rubis Greg", "Greg Rupie" },                                                       ITEMTYPE_ITEM,              GI_RUPEE_GREEN,       true,  LOGIC_GREG,                    RHT_GREG_RUPEE,               RG_GREG_RUPEE,                  OBJECT_GI_RUPY,         GID_RUPEE_GREEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_BLUE_RUPEE] =                          Item(RG_BLUE_RUPEE,                       Text{ "Blue Rupee", "Rubis Bleu", "Blaue Rupie" },                                                                ITEMTYPE_ITEM,              GI_RUPEE_BLUE,        false, LOGIC_NONE,                    RHT_BLUE_RUPEE,               ITEM_RUPEE_BLUE,                OBJECT_GI_RUPY,         GID_RUPEE_BLUE,     0xCC,                        0x01, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_RED_RUPEE] =                           Item(RG_RED_RUPEE,                        Text{ "Red Rupee", "Rubis Rouge", "Rote Rupie" },                                                                 ITEMTYPE_ITEM,              GI_RUPEE_RED,         false, LOGIC_NONE,                    RHT_RED_RUPEE,                ITEM_RUPEE_RED,                 OBJECT_GI_RUPY,         GID_RUPEE_RED,      0xF0,                        0x02, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_PURPLE_RUPEE] =                        Item(RG_PURPLE_RUPEE,                     Text{ "Purple Rupee", "Rubis Pourpre", "Lila Rupie" },                                                            ITEMTYPE_ITEM,              GI_RUPEE_PURPLE,      false, LOGIC_NONE,                    RHT_PURPLE_RUPEE,             ITEM_RUPEE_PURPLE,              OBJECT_GI_RUPY,         GID_RUPEE_PURPLE,   0xF1,                        0x14, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_HUGE_RUPEE] =                          Item(RG_HUGE_RUPEE,                       Text{ "Huge Rupee", "Énorme Rubis", "Riesige Rupie" },                                                            ITEMTYPE_ITEM,              GI_RUPEE_GOLD,        false, LOGIC_NONE,                    RHT_HUGE_RUPEE,               ITEM_RUPEE_GOLD,                OBJECT_GI_RUPY,         GID_RUPEE_GOLD,     0xF2,                        0x13, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_PIECE_OF_HEART] =                      Item(RG_PIECE_OF_HEART,                   Text{ "Piece of Heart", "Quart de Coeur", "Herzstück" },                                                          ITEMTYPE_ITEM,              GI_HEART_PIECE,       true,  LOGIC_PIECE_OF_HEART,          RHT_PIECE_OF_HEART,           ITEM_HEART_PIECE_2,             OBJECT_GI_HEARTS,       GID_HEART_PIECE,    0xC2,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_HEART_CONTAINER] =                     Item(RG_HEART_CONTAINER,                  Text{ "Heart Container", "Réceptacle de Coeur", "Herz-Container" },                                               ITEMTYPE_ITEM,              GI_HEART_CONTAINER_2, true,  LOGIC_HEART_CONTAINER,         RHT_HEART_CONTAINER,          ITEM_HEART_CONTAINER,           OBJECT_GI_HEARTS,       GID_HEART_CONTAINER,0xC6,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_ICE_TRAP] =                            Item(RG_ICE_TRAP,                         Text{ "Ice Trap", "Piège de Glace", "Eisfalle" },                                                                 ITEMTYPE_ITEM,              RG_ICE_TRAP,          false, LOGIC_NONE,                    RHT_ICE_TRAP,                 RG_ICE_TRAP,                    OBJECT_GI_RUPY,         GID_RUPEE_GOLD,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_MILK] =                                Item(RG_MILK,                             Text{ "Milk", "Lait", "Milch" },                                                                                  ITEMTYPE_ITEM,              GI_MILK,              false, LOGIC_NONE,                    RHT_NONE,                     ITEM_MILK,                      OBJECT_GI_MILK,         GID_MILK,           0x98,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_FISH] =                                Item(RG_FISH,                             Text{ "Fish", "Poisson", "Pez" },                                                                                 ITEMTYPE_ITEM,              GI_FISH,              false, LOGIC_NONE,                    RHT_NONE,                     ITEM_FISH,                      OBJECT_GI_FISH,         GID_FISH,           0x47,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_RECOVERY_HEART] =                      Item(RG_RECOVERY_HEART,                   Text{ "Recovery Heart", "Coeur de Vie", "Herz" },                                                                                    ITEMTYPE_ITEM,              GI_HEART,             false, LOGIC_NONE,                         RHT_RECOVERY_HEART,                    ITEM_HEART,                           OBJECT_GI_HEART,        GID_HEART,            0x55,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_GREEN_RUPEE] =                         Item(RG_GREEN_RUPEE,                      Text{ "Green Rupee", "Rubis Vert", "Grüner Rubin" },                                                                                 ITEMTYPE_ITEM,              GI_RUPEE_GREEN,       false, LOGIC_NONE,                         RHT_GREEN_RUPEE,                       ITEM_RUPEE_GREEN,                     OBJECT_GI_RUPY,         GID_RUPEE_GREEN,      0x6F,                        0x00, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_GREG_RUPEE] =                          Item(RG_GREG_RUPEE,                       Text{ "Greg the Green Rupee", "Rubis Greg", "Greg Rubin" },                                                                          ITEMTYPE_ITEM,              GI_RUPEE_GREEN,       true,  LOGIC_GREG,                         RHT_GREG_RUPEE,                        RG_GREG_RUPEE,                        OBJECT_GI_RUPY,         GID_RUPEE_GREEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BLUE_RUPEE] =                          Item(RG_BLUE_RUPEE,                       Text{ "Blue Rupee", "Rubis Bleu", "Blauer Rubin" },                                                                                  ITEMTYPE_ITEM,              GI_RUPEE_BLUE,        false, LOGIC_NONE,                         RHT_BLUE_RUPEE,                        ITEM_RUPEE_BLUE,                      OBJECT_GI_RUPY,         GID_RUPEE_BLUE,       0xCC,                        0x01, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_RED_RUPEE] =                           Item(RG_RED_RUPEE,                        Text{ "Red Rupee", "Rubis Rouge", "Roter Rubin" },                                                                                   ITEMTYPE_ITEM,              GI_RUPEE_RED,         false, LOGIC_NONE,                         RHT_RED_RUPEE,                         ITEM_RUPEE_RED,                       OBJECT_GI_RUPY,         GID_RUPEE_RED,        0xF0,                        0x02, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_PURPLE_RUPEE] =                        Item(RG_PURPLE_RUPEE,                     Text{ "Purple Rupee", "Rubis Pourpre", "Violetter Rubin" },                                                                          ITEMTYPE_ITEM,              GI_RUPEE_PURPLE,      false, LOGIC_NONE,                         RHT_PURPLE_RUPEE,                      ITEM_RUPEE_PURPLE,                    OBJECT_GI_RUPY,         GID_RUPEE_PURPLE,     0xF1,                        0x14, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_HUGE_RUPEE] =                          Item(RG_HUGE_RUPEE,                       Text{ "Huge Rupee", "Énorme Rubis", "Riesiger Rubin" },                                                                              ITEMTYPE_ITEM,              GI_RUPEE_GOLD,        false, LOGIC_NONE,                         RHT_HUGE_RUPEE,                        ITEM_RUPEE_GOLD,                      OBJECT_GI_RUPY,         GID_RUPEE_GOLD,       0xF2,                        0x13, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_PIECE_OF_HEART] =                      Item(RG_PIECE_OF_HEART,                   Text{ "Piece of Heart", "Quart de Coeur", "Herzstück" },                                                                             ITEMTYPE_ITEM,              GI_HEART_PIECE,       true,  LOGIC_PIECE_OF_HEART,               RHT_PIECE_OF_HEART,                    ITEM_HEART_PIECE_2,                   OBJECT_GI_HEARTS,       GID_HEART_PIECE,      0xC2,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_HEART_CONTAINER] =                     Item(RG_HEART_CONTAINER,                  Text{ "Heart Container", "Réceptacle de Coeur", "Herzcontainer" },                                                                   ITEMTYPE_ITEM,              GI_HEART_CONTAINER_2, true,  LOGIC_HEART_CONTAINER,              RHT_HEART_CONTAINER,                   ITEM_HEART_CONTAINER,                 OBJECT_GI_HEARTS,       GID_HEART_CONTAINER,  0xC6,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_ICE_TRAP] =                            Item(RG_ICE_TRAP,                         Text{ "Ice Trap", "Piège de Glace", "Eisfalle" },                                                                                    ITEMTYPE_ITEM,              RG_ICE_TRAP,          false, LOGIC_NONE,                         RHT_ICE_TRAP,                          RG_ICE_TRAP,                          OBJECT_GI_RUPY,         GID_RUPEE_GOLD,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_MILK] =                                Item(RG_MILK,                             Text{ "Milk", "Lait", "Milch" },                                                                                                     ITEMTYPE_ITEM,              GI_MILK,              false, LOGIC_NONE,                         RHT_NONE,                              ITEM_MILK,                            OBJECT_GI_MILK,         GID_MILK,             0x98,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_FISH] =                                Item(RG_FISH,                             Text{ "Fish", "Poisson", "Fisch" },                                                                                                  ITEMTYPE_ITEM,              GI_FISH,              false, LOGIC_NONE,                         RHT_NONE,                              ITEM_FISH,                            OBJECT_GI_FISH,         GID_FISH,             0x47,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
     // Refills
-    itemTable[RG_BOMBS_5] =                             Item(RG_BOMBS_5,                          Text{ "Bombs (5)", "Bombes (5)", "Bomben (5)" },                                                                  ITEMTYPE_REFILL,            GI_BOMBS_5,           false, LOGIC_NONE,                    RHT_BOMBS_5,                  ITEM_BOMBS_5,                   OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_BOMBS_10] =                            Item(RG_BOMBS_10,                         Text{ "Bombs (10)", "Bombes (10)", "Bomben (10)" },                                                               ITEMTYPE_REFILL,            GI_BOMBS_10,          false, LOGIC_NONE,                    RHT_BOMBS_10,                 ITEM_BOMBS_10,                  OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_BOMBS_20] =                            Item(RG_BOMBS_20,                         Text{ "Bombs (20)", "Bombes (20)", "Bomben (20)" },                                                               ITEMTYPE_REFILL,            GI_BOMBS_20,          false, LOGIC_NONE,                    RHT_BOMBS_20,                 ITEM_BOMBS_20,                  OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_BOMBCHU_5] =                           Item(RG_BOMBCHU_5,                        Text{ "Bombchus (5)", "Missiles (5)", "Bombchus (5)" },                                                           ITEMTYPE_REFILL,            GI_BOMBCHUS_5,        true,  LOGIC_BOMBCHUS_5,              RHT_BOMBCHU_5,                ITEM_BOMBCHUS_5,                OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_BOMBCHU_10] =                          Item(RG_BOMBCHU_10,                       Text{ "Bombchus (10)", "Missiles (10)", "Bombchus (10)" },                                                        ITEMTYPE_REFILL,            GI_BOMBCHUS_10,       true,  LOGIC_BOMBCHUS_10,             RHT_BOMBCHU_10,               ITEM_BOMBCHU,                   OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_BOMBCHU_20] =                          Item(RG_BOMBCHU_20,                       Text{ "Bombchus (20)", "Missiles (20)", "Bombchus (20)" },                                                        ITEMTYPE_REFILL,            GI_BOMBCHUS_20,       true,  LOGIC_BOMBCHUS_20,             RHT_BOMBCHU_20,               ITEM_BOMBCHUS_20,               OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_BOMBCHU_DROP] =                        Item(RG_BOMBCHU_DROP,                     Text{ "Bombchu Drop", "Drop Missiles", "Bombchus" },                                                              ITEMTYPE_DROP,              GI_BOMBCHUS_10,       true,  LOGIC_BOMBCHU_DROP,            RHT_NONE,                     ITEM_BOMBCHU,                   OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_ARROWS_5] =                            Item(RG_ARROWS_5,                         Text{ "Arrows (5)", "Flèches (5)", "Pfeile (5)" },                                                                ITEMTYPE_REFILL,            GI_ARROWS_SMALL,      false, LOGIC_NONE,                    RHT_ARROWS_5,                 ITEM_ARROWS_SMALL,              OBJECT_GI_ARROW,        GID_ARROWS_SMALL,   0xE6,                        0x48, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_ARROWS_10] =                           Item(RG_ARROWS_10,                        Text{ "Arrows (10)", "Flèches (10)", "Pfeile (10)" },                                                             ITEMTYPE_REFILL,            GI_ARROWS_MEDIUM,     false, LOGIC_NONE,                    RHT_ARROWS_10,                ITEM_ARROWS_MEDIUM,             OBJECT_GI_ARROW,        GID_ARROWS_MEDIUM,  0xE6,                        0x49, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_ARROWS_30] =                           Item(RG_ARROWS_30,                        Text{ "Arrows (30)", "Flèches (30)", "Pfeile (30)" },                                                             ITEMTYPE_REFILL,            GI_ARROWS_LARGE,      false, LOGIC_NONE,                    RHT_ARROWS_30,                ITEM_ARROWS_LARGE,              OBJECT_GI_ARROW,        GID_ARROWS_LARGE,   0xE6,                        0x4A, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_DEKU_NUTS_5] =                         Item(RG_DEKU_NUTS_5,                      Text{ "Deku Nuts (5)", "Noix Mojo (5)", "Deku-Nüsse (5)" },                                                       ITEMTYPE_REFILL,            GI_NUTS_5,            false, LOGIC_NONE,                    RHT_DEKU_NUTS_5,              ITEM_NUTS_5,                    OBJECT_GI_NUTS,         GID_NUTS,           0x34,                        0x0C, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_DEKU_NUTS_10] =                        Item(RG_DEKU_NUTS_10,                     Text{ "Deku Nuts (10)", "Noix Mojo (10)", "Deku-Nüsse (10)" },                                                    ITEMTYPE_REFILL,            GI_NUTS_10,           false, LOGIC_NONE,                    RHT_DEKU_NUTS_10,             ITEM_NUTS_10,                   OBJECT_GI_NUTS,         GID_NUTS,           0x34,                        0x0C, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_DEKU_SEEDS_30] =                       Item(RG_DEKU_SEEDS_30,                    Text{ "Deku Seeds (30)", "Graines Mojo (30)", "Deku-Samen (30)" },                                                ITEMTYPE_REFILL,            GI_SEEDS_30,          false, LOGIC_NONE,                    RHT_DEKU_SEEDS_30,            ITEM_SEEDS_30,                  OBJECT_GI_SEED,         GID_SEEDS,          0xDC,                        0x50, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_DEKU_STICK_1] =                        Item(RG_DEKU_STICK_1,                     Text{ "Deku Stick (1)", "Bâton Mojo (1)", "Deku-Stick (1)" },                                                     ITEMTYPE_REFILL,            GI_STICKS_1,          false, LOGIC_NONE,                    RHT_DEKU_STICK_1,             ITEM_STICK,                     OBJECT_GI_STICK,        GID_STICK,          0x37,                        0x0D, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_RED_POTION_REFILL] =                   Item(RG_RED_POTION_REFILL,                Text{ "Red Potion Refill", "Recharge de Potion Rouge", "Rotes Elixier Nachfüllpackung" },                         ITEMTYPE_REFILL,            GI_POTION_RED,        false, LOGIC_NONE,                    RHT_NONE,                     ITEM_POTION_RED,                OBJECT_GI_LIQUID,       GID_POTION_RED,     0x43,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_GREEN_POTION_REFILL] =                 Item(RG_GREEN_POTION_REFILL,              Text{ "Green Potion Refill", "Recharge de Potion Verte", "Grünes Elixier Nachfüllpackung" },                      ITEMTYPE_REFILL,            GI_POTION_GREEN,      false, LOGIC_NONE,                    RHT_NONE,                     ITEM_POTION_GREEN,              OBJECT_GI_LIQUID,       GID_POTION_GREEN,   0x44,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_BLUE_POTION_REFILL] =                  Item(RG_BLUE_POTION_REFILL,               Text{ "Blue Potion Refill", "Recharge de Potion Bleue", "Blaues Elixier Nachfüllpackung" },                       ITEMTYPE_REFILL,            GI_POTION_BLUE,       false, LOGIC_NONE,                    RHT_NONE,                     ITEM_POTION_BLUE,               OBJECT_GI_LIQUID,       GID_POTION_BLUE,    0x45,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_BOMBS_5] =                             Item(RG_BOMBS_5,                          Text{ "Bombs (5)", "Bombes (5)", "Bomben (5)" },                                                                                     ITEMTYPE_REFILL,            GI_BOMBS_5,           false, LOGIC_NONE,                         RHT_BOMBS_5,                           ITEM_BOMBS_5,                         OBJECT_GI_BOMB_1,       GID_BOMB,             0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_BOMBS_10] =                            Item(RG_BOMBS_10,                         Text{ "Bombs (10)", "Bombes (10)", "Bomben (10)" },                                                                                  ITEMTYPE_REFILL,            GI_BOMBS_10,          false, LOGIC_NONE,                         RHT_BOMBS_10,                          ITEM_BOMBS_10,                        OBJECT_GI_BOMB_1,       GID_BOMB,             0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_BOMBS_20] =                            Item(RG_BOMBS_20,                         Text{ "Bombs (20)", "Bombes (20)", "Bomben (20)" },                                                                                  ITEMTYPE_REFILL,            GI_BOMBS_20,          false, LOGIC_NONE,                         RHT_BOMBS_20,                          ITEM_BOMBS_20,                        OBJECT_GI_BOMB_1,       GID_BOMB,             0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_BOMBCHU_5] =                           Item(RG_BOMBCHU_5,                        Text{ "Bombchus (5)", "Missiles (5)", "Krabbelminen (5)" },                                                                          ITEMTYPE_REFILL,            GI_BOMBCHUS_5,        true,  LOGIC_BOMBCHUS_5,                   RHT_BOMBCHU_5,                         ITEM_BOMBCHUS_5,                      OBJECT_GI_BOMB_2,       GID_BOMBCHU,          0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_BOMBCHU_10] =                          Item(RG_BOMBCHU_10,                       Text{ "Bombchus (10)", "Missiles (10)", "Krabbelminen (10)" },                                                                       ITEMTYPE_REFILL,            GI_BOMBCHUS_10,       true,  LOGIC_BOMBCHUS_10,                  RHT_BOMBCHU_10,                        ITEM_BOMBCHU,                         OBJECT_GI_BOMB_2,       GID_BOMBCHU,          0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_BOMBCHU_20] =                          Item(RG_BOMBCHU_20,                       Text{ "Bombchus (20)", "Missiles (20)", "Krabbelminen (20)" },                                                                       ITEMTYPE_REFILL,            GI_BOMBCHUS_20,       true,  LOGIC_BOMBCHUS_20,                  RHT_BOMBCHU_20,                        ITEM_BOMBCHUS_20,                     OBJECT_GI_BOMB_2,       GID_BOMBCHU,          0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_BOMBCHU_DROP] =                        Item(RG_BOMBCHU_DROP,                     Text{ "Bombchu Drop", "Drop Missiles", "Krabbelminen" },                                                                             ITEMTYPE_DROP,              GI_BOMBCHUS_10,       true,  LOGIC_BOMBCHU_DROP,                 RHT_NONE,                              ITEM_BOMBCHU,                         OBJECT_GI_BOMB_2,       GID_BOMBCHU,          0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_ARROWS_5] =                            Item(RG_ARROWS_5,                         Text{ "Arrows (5)", "Flèches (5)", "Pfeile (5)" },                                                                                   ITEMTYPE_REFILL,            GI_ARROWS_SMALL,      false, LOGIC_NONE,                         RHT_ARROWS_5,                          ITEM_ARROWS_SMALL,                    OBJECT_GI_ARROW,        GID_ARROWS_SMALL,     0xE6,                        0x48, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_ARROWS_10] =                           Item(RG_ARROWS_10,                        Text{ "Arrows (10)", "Flèches (10)", "Pfeile (10)" },                                                                                ITEMTYPE_REFILL,            GI_ARROWS_MEDIUM,     false, LOGIC_NONE,                         RHT_ARROWS_10,                         ITEM_ARROWS_MEDIUM,                   OBJECT_GI_ARROW,        GID_ARROWS_MEDIUM,    0xE6,                        0x49, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_ARROWS_30] =                           Item(RG_ARROWS_30,                        Text{ "Arrows (30)", "Flèches (30)", "Pfeile (30)" },                                                                                ITEMTYPE_REFILL,            GI_ARROWS_LARGE,      false, LOGIC_NONE,                         RHT_ARROWS_30,                         ITEM_ARROWS_LARGE,                    OBJECT_GI_ARROW,        GID_ARROWS_LARGE,     0xE6,                        0x4A, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_DEKU_NUTS_5] =                         Item(RG_DEKU_NUTS_5,                      Text{ "Deku Nuts (5)", "Noix Mojo (5)", "Deku-Nüsse (5)" },                                                                          ITEMTYPE_REFILL,            GI_NUTS_5,            false, LOGIC_NONE,                         RHT_DEKU_NUTS_5,                       ITEM_NUTS_5,                          OBJECT_GI_NUTS,         GID_NUTS,             0x34,                        0x0C, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_DEKU_NUTS_10] =                        Item(RG_DEKU_NUTS_10,                     Text{ "Deku Nuts (10)", "Noix Mojo (10)", "Deku-Nüsse (10)" },                                                                       ITEMTYPE_REFILL,            GI_NUTS_10,           false, LOGIC_NONE,                         RHT_DEKU_NUTS_10,                      ITEM_NUTS_10,                         OBJECT_GI_NUTS,         GID_NUTS,             0x34,                        0x0C, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_DEKU_SEEDS_30] =                       Item(RG_DEKU_SEEDS_30,                    Text{ "Deku Seeds (30)", "Graines Mojo (30)", "Deku-Samen (30)" },                                                                   ITEMTYPE_REFILL,            GI_SEEDS_30,          false, LOGIC_NONE,                         RHT_DEKU_SEEDS_30,                     ITEM_SEEDS_30,                        OBJECT_GI_SEED,         GID_SEEDS,            0xDC,                        0x50, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_DEKU_STICK_1] =                        Item(RG_DEKU_STICK_1,                     Text{ "Deku Stick (1)", "Bâton Mojo (1)", "Deku-Stab (1)" },                                                                         ITEMTYPE_REFILL,            GI_STICKS_1,          false, LOGIC_NONE,                         RHT_DEKU_STICK_1,                      ITEM_STICK,                           OBJECT_GI_STICK,        GID_STICK,            0x37,                        0x0D, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_RED_POTION_REFILL] =                   Item(RG_RED_POTION_REFILL,                Text{ "Red Potion Refill", "Recharge de Potion Rouge", "Nachfüllpackung des roten Elixiers" },                                       ITEMTYPE_REFILL,            GI_POTION_RED,        false, LOGIC_NONE,                         RHT_NONE,                              ITEM_POTION_RED,                      OBJECT_GI_LIQUID,       GID_POTION_RED,       0x43,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_GREEN_POTION_REFILL] =                 Item(RG_GREEN_POTION_REFILL,              Text{ "Green Potion Refill", "Recharge de Potion Verte", "Nachfüllpackung des grünen Elixiers" },                                    ITEMTYPE_REFILL,            GI_POTION_GREEN,      false, LOGIC_NONE,                         RHT_NONE,                              ITEM_POTION_GREEN,                    OBJECT_GI_LIQUID,       GID_POTION_GREEN,     0x44,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_BLUE_POTION_REFILL] =                  Item(RG_BLUE_POTION_REFILL,               Text{ "Blue Potion Refill", "Recharge de Potion Bleue", "Nachfüllpackung des blauen Elixiers" },                                     ITEMTYPE_REFILL,            GI_POTION_BLUE,       false, LOGIC_NONE,                         RHT_NONE,                              ITEM_POTION_BLUE,                     OBJECT_GI_LIQUID,       GID_POTION_BLUE,      0x45,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
     // Treasure Game
-    itemTable[RG_TREASURE_GAME_HEART] =                 Item(RG_TREASURE_GAME_HEART,              Text{ "Piece of Heart (WINNER)", "Quart de Coeur (Chasse-aux-Trésors)", "Herzstück (Schatztruhen-Minispiel)" },   ITEMTYPE_ITEM,              GI_HEART_PIECE_WIN,   true,  LOGIC_PIECE_OF_HEART,          RHT_TREASURE_GAME_HEART,      ITEM_HEART_PIECE_2,             OBJECT_GI_HEARTS,       GID_HEART_PIECE,    0xFA,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_TREASURE_GAME_GREEN_RUPEE] =           Item(RG_TREASURE_GAME_GREEN_RUPEE,        Text{ "Green Rupee (LOSER)", "Rubis Vert (Chasse-aux-Trésors)", "Grüne Rupie (Schatztruhe-Minispiel)" },          ITEMTYPE_ITEM,              GI_RUPEE_GREEN_LOSE,  false, LOGIC_NONE,                    RHT_TREASURE_GAME_GREEN_RUPEE,ITEM_RUPEE_GREEN,               OBJECT_GI_RUPY,         GID_RUPEE_GREEN,    0xF4,                        0x00, CHEST_ANIM_SHORT, ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_TREASURE_GAME_HEART] =                 Item(RG_TREASURE_GAME_HEART,              Text{ "Piece of Heart (WINNER)", "Quart de Coeur (Chasse-aux-Trésors)", "Herzstück (Schatztruhenminispiel)" },                       ITEMTYPE_ITEM,              GI_HEART_PIECE_WIN,   true,  LOGIC_PIECE_OF_HEART,               RHT_TREASURE_GAME_HEART,               ITEM_HEART_PIECE_2,                   OBJECT_GI_HEARTS,       GID_HEART_PIECE,      0xFA,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_TREASURE_GAME_GREEN_RUPEE] =           Item(RG_TREASURE_GAME_GREEN_RUPEE,        Text{ "Green Rupee (LOSER)", "Rubis Vert (Chasse-aux-Trésors)", "Grüner Rubin (Schatztruhenminispiel)" },                            ITEMTYPE_ITEM,              GI_RUPEE_GREEN_LOSE,  false, LOGIC_NONE,                         RHT_TREASURE_GAME_GREEN_RUPEE,         ITEM_RUPEE_GREEN,                     OBJECT_GI_RUPY,         GID_RUPEE_GREEN,      0xF4,                        0x00, CHEST_ANIM_SHORT, ITEM_CATEGORY_MAJOR,  MOD_NONE);
     // Shop
-    itemTable[RG_BUY_DEKU_NUTS_5] =                     Item(RG_BUY_DEKU_NUTS_5,                  Text{ "Buy Deku Nut (5)", "Acheter: Noix Mojo (5)", "Deku-Nuss kaufen (5)" },                                     ITEMTYPE_SHOP,              GI_NUTS_5_2,          true,  LOGIC_NUTS,                    RHT_DEKU_NUTS_5,              ITEM_NUTS_5,                    OBJECT_GI_NUTS,         GID_NUTS,           0x34,                        0x0C, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 15);
-    itemTable[RG_BUY_ARROWS_30] =                       Item(RG_BUY_ARROWS_30,                    Text{ "Buy Arrows (30)", "Acheter: Flèches (30)", "Pfeile kaufen (30)" },                                         ITEMTYPE_SHOP,              GI_ARROWS_MEDIUM,     true,  LOGIC_BUY_ARROW,               RHT_ARROWS_30,                ITEM_ARROWS_MEDIUM,             OBJECT_GI_ARROW,        GID_ARROWS_MEDIUM,  0xE6,                        0x49, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 60);
-    itemTable[RG_BUY_ARROWS_50] =                       Item(RG_BUY_ARROWS_50,                    Text{ "Buy Arrows (50)", "Acheter: Flèches (50)", "Pfeile kaufen (50)" },                                         ITEMTYPE_SHOP,              GI_ARROWS_LARGE,      true,  LOGIC_BUY_ARROW,               RHT_ARROWS_30,                ITEM_ARROWS_LARGE,              OBJECT_GI_ARROW,        GID_ARROWS_LARGE,   0xE6,                        0x4A, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 90);
-    itemTable[RG_BUY_BOMBS_525] =                       Item(RG_BUY_BOMBS_525,                    Text{ "Buy Bombs (5) [25]", "Acheter: Bombes (5) [25]", "Bomben kaufen (5) [25]" },                               ITEMTYPE_SHOP,              GI_BOMBS_5,           true,  LOGIC_BUY_BOMB,                RHT_BOMBS_5,                  ITEM_BOMBS_5,                   OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 25);
-    itemTable[RG_BUY_DEKU_NUTS_10] =                    Item(RG_BUY_DEKU_NUTS_10,                 Text{ "Buy Deku Nut (10)", "Acheter: Noix Mojo (10)", "Deku-Nuss kaufen (10)" },                                  ITEMTYPE_SHOP,              GI_NUTS_10,           true,  LOGIC_NUTS,                    RHT_DEKU_NUTS_10,             ITEM_NUTS_10,                   OBJECT_GI_NUTS,         GID_NUTS,           0x34,                        0x0C, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
-    itemTable[RG_BUY_DEKU_STICK_1] =                    Item(RG_BUY_DEKU_STICK_1,                 Text{ "Buy Deku Stick (1)", "Acheter: Bâton Mojo (1)", "Deku-Stick kaufen (1)" },                                 ITEMTYPE_SHOP,              GI_STICKS_1,          true,  LOGIC_STICKS,                  RHT_DEKU_STICK_1,             ITEM_STICK,                     OBJECT_GI_STICK,        GID_STICK,          0x37,                        0x0D, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 10);
-    itemTable[RG_BUY_BOMBS_10] =                        Item(RG_BUY_BOMBS_10,                     Text{ "Buy Bombs (10)", "Acheter: Bombes (10)", "Bomben kaufen (10)" },                                           ITEMTYPE_SHOP,              GI_BOMBS_10,          true,  LOGIC_BUY_BOMB,                RHT_BOMBS_10,                 ITEM_BOMBS_10,                  OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 50);
-    itemTable[RG_BUY_FISH] =                            Item(RG_BUY_FISH,                         Text{ "Buy Fish", "Acheter: Poisson", "Fisch kaufen" },                                                           ITEMTYPE_SHOP,              GI_FISH,              true,  LOGIC_FISH_ACCESS,             RHT_BOTTLE_WITH_FISH,         ITEM_FISH,                      OBJECT_GI_FISH,         GID_FISH,           0x47,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 200);
-    itemTable[RG_BUY_RED_POTION_30] =                   Item(RG_BUY_RED_POTION_30,                Text{ "Buy Red Potion [30]", "Acheter: Potion Rouge [30]", "Rotes Elixier kaufen [30]" },                         ITEMTYPE_SHOP,              GI_POTION_RED,        false, LOGIC_NONE,                    RHT_BOTTLE_WITH_RED_POTION,   ITEM_POTION_RED,                OBJECT_GI_LIQUID,       GID_POTION_RED,     0x43,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
-    itemTable[RG_BUY_GREEN_POTION] =                    Item(RG_BUY_GREEN_POTION,                 Text{ "Buy Green Potion", "Acheter: Potion Verte", "Grünes Elixier kaufen" },                                     ITEMTYPE_SHOP,              GI_POTION_GREEN,      true,  LOGIC_BUY_MAGIC_POTION,        RHT_BOTTLE_WITH_GREEN_POTION, ITEM_POTION_GREEN,              OBJECT_GI_LIQUID,       GID_POTION_GREEN,   0x44,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
-    itemTable[RG_BUY_BLUE_POTION] =                     Item(RG_BUY_BLUE_POTION,                  Text{ "Buy Blue Potion", "Acheter: Potion Bleue", "Blaues Elixier kaufen" },                                      ITEMTYPE_SHOP,              GI_POTION_BLUE,       true,  LOGIC_BUY_MAGIC_POTION,        RHT_BOTTLE_WITH_BLUE_POTION,  ITEM_POTION_BLUE,               OBJECT_GI_LIQUID,       GID_POTION_BLUE,    0x45,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 100);
-    itemTable[RG_BUY_HYLIAN_SHIELD] =                   Item(RG_BUY_HYLIAN_SHIELD,                Text{ "Buy Hylian Shield", "Acheter: Bouclier Hylien", "Hylianischer Schild kaufen" },                            ITEMTYPE_SHOP,              GI_SHIELD_HYLIAN,     true,  LOGIC_HYLIAN_SHIELD,           RHT_HYLIAN_SHIELD,            ITEM_SHIELD_HYLIAN,             OBJECT_GI_SHIELD_2,     GID_SHIELD_HYLIAN,  0x4D,                        0xA0, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE, false, 80);
-    itemTable[RG_BUY_DEKU_SHIELD] =                     Item(RG_BUY_DEKU_SHIELD,                  Text{ "Buy Deku Shield", "Acheter: Bouclier Mojo", "Deku-Schild kaufen" },                                        ITEMTYPE_SHOP,              GI_SHIELD_DEKU,       true,  LOGIC_DEKU_SHIELD,             RHT_DEKU_SHIELD,              ITEM_SHIELD_DEKU,               OBJECT_GI_SHIELD_1,     GID_SHIELD_DEKU,    0x4C,                        0xA0, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE, false, 40);
-    itemTable[RG_BUY_GORON_TUNIC] =                     Item(RG_BUY_GORON_TUNIC,                  Text{ "Buy Goron Tunic", "Acheter: Tunique Goron", "Goronen-Tunika kaufen" },                                     ITEMTYPE_SHOP,              GI_TUNIC_GORON,       true,  LOGIC_GORON_TUNIC,             RHT_GORON_TUNIC,              ITEM_TUNIC_GORON,               OBJECT_GI_CLOTHES,      GID_TUNIC_GORON,    0x50,                        0xA0, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE, false, 200);
-    itemTable[RG_BUY_ZORA_TUNIC] =                      Item(RG_BUY_ZORA_TUNIC,                   Text{ "Buy Zora Tunic", "Acheter: Tunique Zora", "Zora-Tunika kaufen" },                                          ITEMTYPE_SHOP,              GI_TUNIC_ZORA,        true,  LOGIC_ZORA_TUNIC,              RHT_ZORA_TUNIC,               ITEM_TUNIC_ZORA,                OBJECT_GI_CLOTHES,      GID_TUNIC_ZORA,     0x51,                        0xA0, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE, false, 300);
-    itemTable[RG_BUY_HEART] =                           Item(RG_BUY_HEART,                        Text{ "Buy Heart", "Acheter: Coeur de Vie", "Herz kaufen" },                                                      ITEMTYPE_SHOP,              GI_HEART,             false, LOGIC_NONE,                    RHT_RECOVERY_HEART,           ITEM_HEART,                     OBJECT_GI_HEART,        GID_HEART,          0x55,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 10);
-    itemTable[RG_BUY_BOMBCHU_10] =                      Item(RG_BUY_BOMBCHU_10,                   Text{ "Buy Bombchu (10)", "Acheter: Missiles (10)", "Bomchu kaufen (10)" },                                       ITEMTYPE_SHOP,              GI_BOMBCHUS_10,       true,  LOGIC_BUY_BOMBCHUS,            RHT_BOMBCHU_10,               ITEM_BOMBCHU,                   OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 99);
-    itemTable[RG_BUY_BOMBCHU_20] =                      Item(RG_BUY_BOMBCHU_20,                   Text{ "Buy Bombchu (20)", "Acheter: Missiles (20)", "Bomchu kaufen (20)" },                                       ITEMTYPE_SHOP,              GI_BOMBCHUS_20,       true,  LOGIC_BUY_BOMBCHUS,            RHT_BOMBCHU_20,               ITEM_BOMBCHUS_20,               OBJECT_GI_BOMB_2,       GID_BOMBCHU,        0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 180);
-    itemTable[RG_BUY_DEKU_SEEDS_30] =                   Item(RG_BUY_DEKU_SEEDS_30,                Text{ "Buy Deku Seeds (30)", "Acheter: Graines Mojo (30)", "Deku-Samen kaufen (30)" },                            ITEMTYPE_SHOP,              GI_SEEDS_30,          true,  LOGIC_BUY_SEED,                RHT_DEKU_SEEDS_30,            ITEM_SEEDS_30,                  OBJECT_GI_SEED,         GID_SEEDS,          0xDC,                        0x50, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
-    itemTable[RG_SOLD_OUT] =                            Item(RG_SOLD_OUT,                         Text{ "Sold Out", "Rupture de stock", "Ausverkauft" },                                                            ITEMTYPE_SHOP,              RG_SOLD_OUT,          false, LOGIC_NONE,                    RHT_NONE, false, 0);
-    itemTable[RG_BUY_BLUE_FIRE] =                       Item(RG_BUY_BLUE_FIRE,                    Text{ "Buy Blue Fire", "Acheter: Flamme Bleue", "Blaues Feuer kaufen" },                                          ITEMTYPE_SHOP,              GI_BLUE_FIRE,         true,  LOGIC_BLUE_FIRE_ACCESS,        RHT_BOTTLE_WITH_BLUE_FIRE,    ITEM_BLUE_FIRE,                 OBJECT_GI_FIRE,         GID_BLUE_FIRE,      0x5D,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 300);
-    itemTable[RG_BUY_BOTTLE_BUG] =                      Item(RG_BUY_BOTTLE_BUG,                   Text{ "Buy Bottle Bug", "Acheter: Insecte en bouteille", "Flaschenkäfer kaufen" },                                ITEMTYPE_SHOP,              GI_BUGS,              true,  LOGIC_BUGS_ACCESS,             RHT_BOTTLE_WITH_BUGS,         ITEM_BUG,                       OBJECT_GI_INSECT,       GID_BUG,            0x7A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 50);
-    itemTable[RG_BUY_POE] =                             Item(RG_BUY_POE,                          Text{ "Buy Poe", "Acheter: Esprit", "Geist kaufen" },                                                             ITEMTYPE_SHOP,              RG_BUY_POE,           false, LOGIC_NONE,                    RHT_BOTTLE_WITH_BIG_POE,      ITEM_POE,                       OBJECT_GI_GHOST,        GID_POE,            0x97,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
-    itemTable[RG_BUY_FAIRYS_SPIRIT] =                   Item(RG_BUY_FAIRYS_SPIRIT,                Text{ "Buy Fairy's Spirit", "Acheter: Esprit de Fée", "Feengeist kaufen" },                                       ITEMTYPE_SHOP,              GI_FAIRY,             true,  LOGIC_FAIRY_ACCESS,            RHT_BOTTLE_WITH_FAIRY,        ITEM_FAIRY,                     OBJECT_GI_BOTTLE,       GID_BOTTLE,         0x46,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 50);
-    itemTable[RG_BUY_ARROWS_10] =                       Item(RG_BUY_ARROWS_10,                    Text{ "Buy Arrows (10)", "Acheter: Flèches (10)", "Pfeile kaufen (10)" },                                         ITEMTYPE_SHOP,              GI_ARROWS_SMALL,      true,  LOGIC_BUY_ARROW,               RHT_ARROWS_10,                ITEM_ARROWS_SMALL,              OBJECT_GI_ARROW,        GID_ARROWS_SMALL,   0xE6,                        0x48, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 20);
-    itemTable[RG_BUY_BOMBS_20] =                        Item(RG_BUY_BOMBS_20,                     Text{ "Buy Bombs (20)", "Acheter: Bombes (20)", "Bomben kaufen (20)" },                                           ITEMTYPE_SHOP,              GI_BOMBS_20,          true,  LOGIC_BUY_BOMB,                RHT_BOMBS_20,                 ITEM_BOMBS_20,                  OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 80);
-    itemTable[RG_BUY_BOMBS_30] =                        Item(RG_BUY_BOMBS_30,                     Text{ "Buy Bombs (30)", "Acheter: Bombes (30)", "Bomben kaufen (30)" },                                           ITEMTYPE_SHOP,              GI_BOMBS_30,          true,  LOGIC_BUY_BOMB,                RHT_BOMBS_20,                 ITEM_BOMBS_30,                  OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 120);
-    itemTable[RG_BUY_BOMBS_535] =                       Item(RG_BUY_BOMBS_535,                    Text{ "Buy Bombs (5) [35]", "Acheter: Bombes (5) [35]", "Bomben kaufen (5) [35]" },                               ITEMTYPE_SHOP,              GI_BOMBS_5,           true,  LOGIC_BUY_BOMB,                RHT_BOMBS_5,                  ITEM_BOMBS_5,                   OBJECT_GI_BOMB_1,       GID_BOMB,           0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 35);
-    itemTable[RG_BUY_RED_POTION_40] =                   Item(RG_BUY_RED_POTION_40,                Text{ "Buy Red Potion [40]", "Acheter: Potion Rouge [40]", "Rotes Elixier kaufen [40]" },                         ITEMTYPE_SHOP,              GI_POTION_RED,        false, LOGIC_NONE,                    RHT_BOTTLE_WITH_RED_POTION,   ITEM_POTION_RED,                OBJECT_GI_LIQUID,       GID_POTION_RED,     0x43,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 40);
-    itemTable[RG_BUY_RED_POTION_50] =                   Item(RG_BUY_RED_POTION_50,                Text{ "Buy Red Potion [50]", "Acheter: Potion Rouge [50]", "Rotes Elixier kaufen [50]" },                         ITEMTYPE_SHOP,              GI_POTION_RED,        false, LOGIC_NONE,                    RHT_BOTTLE_WITH_RED_POTION,   ITEM_POTION_RED,                OBJECT_GI_LIQUID,       GID_POTION_RED,     0x43,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 50);
+    itemTable[RG_BUY_DEKU_NUTS_5] =                     Item(RG_BUY_DEKU_NUTS_5,                  Text{ "Buy Deku Nut (5)", "Acheter: Noix Mojo (5)", "Deku-Nuß kaufen (5)" },                                                         ITEMTYPE_SHOP,              GI_NUTS_5_2,          true,  LOGIC_NUTS,                         RHT_DEKU_NUTS_5,                       ITEM_NUTS_5,                          OBJECT_GI_NUTS,         GID_NUTS,             0x34,                        0x0C, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 15);
+    itemTable[RG_BUY_ARROWS_30] =                       Item(RG_BUY_ARROWS_30,                    Text{ "Buy Arrows (30)", "Acheter: Flèches (30)", "Pfeile kaufen (30)" },                                                            ITEMTYPE_SHOP,              GI_ARROWS_MEDIUM,     true,  LOGIC_BUY_ARROW,                    RHT_ARROWS_30,                         ITEM_ARROWS_MEDIUM,                   OBJECT_GI_ARROW,        GID_ARROWS_MEDIUM,    0xE6,                        0x49, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 60);
+    itemTable[RG_BUY_ARROWS_50] =                       Item(RG_BUY_ARROWS_50,                    Text{ "Buy Arrows (50)", "Acheter: Flèches (50)", "Pfeile kaufen (50)" },                                                            ITEMTYPE_SHOP,              GI_ARROWS_LARGE,      true,  LOGIC_BUY_ARROW,                    RHT_ARROWS_30,                         ITEM_ARROWS_LARGE,                    OBJECT_GI_ARROW,        GID_ARROWS_LARGE,     0xE6,                        0x4A, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 90);
+    itemTable[RG_BUY_BOMBS_525] =                       Item(RG_BUY_BOMBS_525,                    Text{ "Buy Bombs (5) [25]", "Acheter: Bombes (5) [25]", "Bomben kaufen (5) [25]" },                                                  ITEMTYPE_SHOP,              GI_BOMBS_5,           true,  LOGIC_BUY_BOMB,                     RHT_BOMBS_5,                           ITEM_BOMBS_5,                         OBJECT_GI_BOMB_1,       GID_BOMB,             0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 25);
+    itemTable[RG_BUY_DEKU_NUTS_10] =                    Item(RG_BUY_DEKU_NUTS_10,                 Text{ "Buy Deku Nut (10)", "Acheter: Noix Mojo (10)", "Deku-Nuß kaufen (10)" },                                                      ITEMTYPE_SHOP,              GI_NUTS_10,           true,  LOGIC_NUTS,                         RHT_DEKU_NUTS_10,                      ITEM_NUTS_10,                         OBJECT_GI_NUTS,         GID_NUTS,             0x34,                        0x0C, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
+    itemTable[RG_BUY_DEKU_STICK_1] =                    Item(RG_BUY_DEKU_STICK_1,                 Text{ "Buy Deku Stick (1)", "Acheter: Bâton Mojo (1)", "Deku-Stab kaufen (1)" },                                                     ITEMTYPE_SHOP,              GI_STICKS_1,          true,  LOGIC_STICKS,                       RHT_DEKU_STICK_1,                      ITEM_STICK,                           OBJECT_GI_STICK,        GID_STICK,            0x37,                        0x0D, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 10);
+    itemTable[RG_BUY_BOMBS_10] =                        Item(RG_BUY_BOMBS_10,                     Text{ "Buy Bombs (10)", "Acheter: Bombes (10)", "Bomben kaufen (10)" },                                                              ITEMTYPE_SHOP,              GI_BOMBS_10,          true,  LOGIC_BUY_BOMB,                     RHT_BOMBS_10,                          ITEM_BOMBS_10,                        OBJECT_GI_BOMB_1,       GID_BOMB,             0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 50);
+    itemTable[RG_BUY_FISH] =                            Item(RG_BUY_FISH,                         Text{ "Buy Fish", "Acheter: Poisson", "Fisch kaufen" },                                                                              ITEMTYPE_SHOP,              GI_FISH,              true,  LOGIC_FISH_ACCESS,                  RHT_BOTTLE_WITH_FISH,                  ITEM_FISH,                            OBJECT_GI_FISH,         GID_FISH,             0x47,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 200);
+    itemTable[RG_BUY_RED_POTION_30] =                   Item(RG_BUY_RED_POTION_30,                Text{ "Buy Red Potion [30]", "Acheter: Potion Rouge [30]", "Rotes Elixier kaufen [30]" },                                            ITEMTYPE_SHOP,              GI_POTION_RED,        false, LOGIC_NONE,                         RHT_BOTTLE_WITH_RED_POTION,            ITEM_POTION_RED,                      OBJECT_GI_LIQUID,       GID_POTION_RED,       0x43,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
+    itemTable[RG_BUY_GREEN_POTION] =                    Item(RG_BUY_GREEN_POTION,                 Text{ "Buy Green Potion", "Acheter: Potion Verte", "Grünes Elixier kaufen" },                                                        ITEMTYPE_SHOP,              GI_POTION_GREEN,      true,  LOGIC_BUY_MAGIC_POTION,             RHT_BOTTLE_WITH_GREEN_POTION,          ITEM_POTION_GREEN,                    OBJECT_GI_LIQUID,       GID_POTION_GREEN,     0x44,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
+    itemTable[RG_BUY_BLUE_POTION] =                     Item(RG_BUY_BLUE_POTION,                  Text{ "Buy Blue Potion", "Acheter: Potion Bleue", "Blaues Elixier kaufen" },                                                         ITEMTYPE_SHOP,              GI_POTION_BLUE,       true,  LOGIC_BUY_MAGIC_POTION,             RHT_BOTTLE_WITH_BLUE_POTION,           ITEM_POTION_BLUE,                     OBJECT_GI_LIQUID,       GID_POTION_BLUE,      0x45,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 100);
+    itemTable[RG_BUY_HYLIAN_SHIELD] =                   Item(RG_BUY_HYLIAN_SHIELD,                Text{ "Buy Hylian Shield", "Acheter: Bouclier Hylien", "Hylia-Schild kaufen" },                                                      ITEMTYPE_SHOP,              GI_SHIELD_HYLIAN,     true,  LOGIC_HYLIAN_SHIELD,                RHT_HYLIAN_SHIELD,                     ITEM_SHIELD_HYLIAN,                   OBJECT_GI_SHIELD_2,     GID_SHIELD_HYLIAN,    0x4D,                        0xA0, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE, false, 80);
+    itemTable[RG_BUY_DEKU_SHIELD] =                     Item(RG_BUY_DEKU_SHIELD,                  Text{ "Buy Deku Shield", "Acheter: Bouclier Mojo", "Deku-Schild kaufen" },                                                           ITEMTYPE_SHOP,              GI_SHIELD_DEKU,       true,  LOGIC_DEKU_SHIELD,                  RHT_DEKU_SHIELD,                       ITEM_SHIELD_DEKU,                     OBJECT_GI_SHIELD_1,     GID_SHIELD_DEKU,      0x4C,                        0xA0, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE, false, 40);
+    itemTable[RG_BUY_GORON_TUNIC] =                     Item(RG_BUY_GORON_TUNIC,                  Text{ "Buy Goron Tunic", "Acheter: Tunique Goron", "Goronen-Tunika kaufen" },                                                        ITEMTYPE_SHOP,              GI_TUNIC_GORON,       true,  LOGIC_GORON_TUNIC,                  RHT_GORON_TUNIC,                       ITEM_TUNIC_GORON,                     OBJECT_GI_CLOTHES,      GID_TUNIC_GORON,      0x50,                        0xA0, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE, false, 200);
+    itemTable[RG_BUY_ZORA_TUNIC] =                      Item(RG_BUY_ZORA_TUNIC,                   Text{ "Buy Zora Tunic", "Acheter: Tunique Zora", "Zora-Tunika kaufen" },                                                             ITEMTYPE_SHOP,              GI_TUNIC_ZORA,        true,  LOGIC_ZORA_TUNIC,                   RHT_ZORA_TUNIC,                        ITEM_TUNIC_ZORA,                      OBJECT_GI_CLOTHES,      GID_TUNIC_ZORA,       0x51,                        0xA0, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE, false, 300);
+    itemTable[RG_BUY_HEART] =                           Item(RG_BUY_HEART,                        Text{ "Buy Heart", "Acheter: Coeur de Vie", "Herz kaufen" },                                                                         ITEMTYPE_SHOP,              GI_HEART,             false, LOGIC_NONE,                         RHT_RECOVERY_HEART,                    ITEM_HEART,                           OBJECT_GI_HEART,        GID_HEART,            0x55,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 10);
+    itemTable[RG_BUY_BOMBCHU_10] =                      Item(RG_BUY_BOMBCHU_10,                   Text{ "Buy Bombchu (10)", "Acheter: Missiles (10)", "Krabbelminen kaufen (10)" },                                                    ITEMTYPE_SHOP,              GI_BOMBCHUS_10,       true,  LOGIC_BUY_BOMBCHUS,                 RHT_BOMBCHU_10,                        ITEM_BOMBCHU,                         OBJECT_GI_BOMB_2,       GID_BOMBCHU,          0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 99);
+    itemTable[RG_BUY_BOMBCHU_20] =                      Item(RG_BUY_BOMBCHU_20,                   Text{ "Buy Bombchu (20)", "Acheter: Missiles (20)", "Krabbelminen kaufen (20)" },                                                    ITEMTYPE_SHOP,              GI_BOMBCHUS_20,       true,  LOGIC_BUY_BOMBCHUS,                 RHT_BOMBCHU_20,                        ITEM_BOMBCHUS_20,                     OBJECT_GI_BOMB_2,       GID_BOMBCHU,          0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 180);
+    itemTable[RG_BUY_DEKU_SEEDS_30] =                   Item(RG_BUY_DEKU_SEEDS_30,                Text{ "Buy Deku Seeds (30)", "Acheter: Graines Mojo (30)", "Deku-Samen kaufen (30)" },                                               ITEMTYPE_SHOP,              GI_SEEDS_30,          true,  LOGIC_BUY_SEED,                     RHT_DEKU_SEEDS_30,                     ITEM_SEEDS_30,                        OBJECT_GI_SEED,         GID_SEEDS,            0xDC,                        0x50, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
+    itemTable[RG_SOLD_OUT] =                            Item(RG_SOLD_OUT,                         Text{ "Sold Out", "Rupture de stock", "Ausverkauft" },                                                                               ITEMTYPE_SHOP,              RG_SOLD_OUT,          false, LOGIC_NONE,                         RHT_NONE, false, 0);
+    itemTable[RG_BUY_BLUE_FIRE] =                       Item(RG_BUY_BLUE_FIRE,                    Text{ "Buy Blue Fire", "Acheter: Flamme Bleue", "Blaues Feuer kaufen" },                                                             ITEMTYPE_SHOP,              GI_BLUE_FIRE,         true,  LOGIC_BLUE_FIRE_ACCESS,             RHT_BOTTLE_WITH_BLUE_FIRE,             ITEM_BLUE_FIRE,                       OBJECT_GI_FIRE,         GID_BLUE_FIRE,        0x5D,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 300);
+    itemTable[RG_BUY_BOTTLE_BUG] =                      Item(RG_BUY_BOTTLE_BUG,                   Text{ "Buy Bottle Bug", "Acheter: Insecte en bouteille", "Flaschenkäfer kaufen" },                                                   ITEMTYPE_SHOP,              GI_BUGS,              true,  LOGIC_BUGS_ACCESS,                  RHT_BOTTLE_WITH_BUGS,                  ITEM_BUG,                             OBJECT_GI_INSECT,       GID_BUG,              0x7A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 50);
+    itemTable[RG_BUY_POE] =                             Item(RG_BUY_POE,                          Text{ "Buy Poe", "Acheter: Esprit", "Geist kaufen" },                                                                                ITEMTYPE_SHOP,              RG_BUY_POE,           false, LOGIC_NONE,                         RHT_BOTTLE_WITH_BIG_POE,               ITEM_POE,                             OBJECT_GI_GHOST,        GID_POE,              0x97,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
+    itemTable[RG_BUY_FAIRYS_SPIRIT] =                   Item(RG_BUY_FAIRYS_SPIRIT,                Text{ "Buy Fairy's Spirit", "Acheter: Esprit de Fée", "Feengeist kaufen" },                                                          ITEMTYPE_SHOP,              GI_FAIRY,             true,  LOGIC_FAIRY_ACCESS,                 RHT_BOTTLE_WITH_FAIRY,                 ITEM_FAIRY,                           OBJECT_GI_BOTTLE,       GID_BOTTLE,           0x46,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 50);
+    itemTable[RG_BUY_ARROWS_10] =                       Item(RG_BUY_ARROWS_10,                    Text{ "Buy Arrows (10)", "Acheter: Flèches (10)", "Pfeile kaufen (10)" },                                                            ITEMTYPE_SHOP,              GI_ARROWS_SMALL,      true,  LOGIC_BUY_ARROW,                    RHT_ARROWS_10,                         ITEM_ARROWS_SMALL,                    OBJECT_GI_ARROW,        GID_ARROWS_SMALL,     0xE6,                        0x48, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 20);
+    itemTable[RG_BUY_BOMBS_20] =                        Item(RG_BUY_BOMBS_20,                     Text{ "Buy Bombs (20)", "Acheter: Bombes (20)", "Bomben kaufen (20)" },                                                              ITEMTYPE_SHOP,              GI_BOMBS_20,          true,  LOGIC_BUY_BOMB,                     RHT_BOMBS_20,                          ITEM_BOMBS_20,                        OBJECT_GI_BOMB_1,       GID_BOMB,             0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 80);
+    itemTable[RG_BUY_BOMBS_30] =                        Item(RG_BUY_BOMBS_30,                     Text{ "Buy Bombs (30)", "Acheter: Bombes (30)", "Bomben kaufen (30)" },                                                              ITEMTYPE_SHOP,              GI_BOMBS_30,          true,  LOGIC_BUY_BOMB,                     RHT_BOMBS_20,                          ITEM_BOMBS_30,                        OBJECT_GI_BOMB_1,       GID_BOMB,             0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 120);
+    itemTable[RG_BUY_BOMBS_535] =                       Item(RG_BUY_BOMBS_535,                    Text{ "Buy Bombs (5) [35]", "Acheter: Bombes (5) [35]", "Bomben kaufen (5) [35]" },                                                  ITEMTYPE_SHOP,              GI_BOMBS_5,           true,  LOGIC_BUY_BOMB,                     RHT_BOMBS_5,                           ITEM_BOMBS_5,                         OBJECT_GI_BOMB_1,       GID_BOMB,             0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 35);
+    itemTable[RG_BUY_RED_POTION_40] =                   Item(RG_BUY_RED_POTION_40,                Text{ "Buy Red Potion [40]", "Acheter: Potion Rouge [40]", "Rotes Elixier kaufen [40]" },                                            ITEMTYPE_SHOP,              GI_POTION_RED,        false, LOGIC_NONE,                         RHT_BOTTLE_WITH_RED_POTION,            ITEM_POTION_RED,                      OBJECT_GI_LIQUID,       GID_POTION_RED,       0x43,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 40);
+    itemTable[RG_BUY_RED_POTION_50] =                   Item(RG_BUY_RED_POTION_50,                Text{ "Buy Red Potion [50]", "Acheter: Potion Rouge [50]", "Rotes Elixier kaufen [50]" },                                            ITEMTYPE_SHOP,              GI_POTION_RED,        false, LOGIC_NONE,                         RHT_BOTTLE_WITH_RED_POTION,            ITEM_POTION_RED,                      OBJECT_GI_LIQUID,       GID_POTION_RED,       0x43,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 50);
     // Misc.
-    itemTable[RG_GOHMA_SOUL] =                          Item(RG_GOHMA_SOUL,                       Text{ "Gohma's Soul", "", "" },                                                                                   ITEMTYPE_ITEM,              0xE0,                 true,  LOGIC_CAN_SUMMON_GOHMA,        RHT_GOHMA_SOUL,               RG_GOHMA_SOUL,                  OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_GOHMA_SOUL] =                          Item(RG_GOHMA_SOUL,                       Text{ "Gohma's Soul", "", "Gohmas Seele" },                                                                                          ITEMTYPE_ITEM,              0xE0,                 true,  LOGIC_CAN_SUMMON_GOHMA,             RHT_GOHMA_SOUL,                        RG_GOHMA_SOUL,                        OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_GOHMA_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
-    itemTable[RG_KING_DODONGO_SOUL] =                   Item(RG_KING_DODONGO_SOUL,                Text{ "King Dodongo's Soul", "", "" },                                                                            ITEMTYPE_ITEM,              0xE1,                 true,  LOGIC_CAN_SUMMON_KINGDODONGO,  RHT_KING_DODONGO_SOUL,        RG_KING_DODONGO_SOUL,           OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_KING_DODONGO_SOUL] =                   Item(RG_KING_DODONGO_SOUL,                Text{ "King Dodongo's Soul", "", "König Dodongos Seele" },                                                                           ITEMTYPE_ITEM,              0xE1,                 true,  LOGIC_CAN_SUMMON_KINGDODONGO,       RHT_KING_DODONGO_SOUL,                 RG_KING_DODONGO_SOUL,                 OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_KING_DODONGO_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
-    itemTable[RG_BARINADE_SOUL] =                       Item(RG_BARINADE_SOUL,                    Text{ "Barinade's Soul", "", "" },                                                                                ITEMTYPE_ITEM,              0xE2,                 true,  LOGIC_CAN_SUMMON_BARINADE,     RHT_BARINADE_SOUL,            RG_BARINADE_SOUL,               OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BARINADE_SOUL] =                       Item(RG_BARINADE_SOUL,                    Text{ "Barinade's Soul", "", "Barinades Seele" },                                                                                    ITEMTYPE_ITEM,              0xE2,                 true,  LOGIC_CAN_SUMMON_BARINADE,          RHT_BARINADE_SOUL,                     RG_BARINADE_SOUL,                     OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_BARINADE_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
-    itemTable[RG_PHANTOM_GANON_SOUL] =                  Item(RG_PHANTOM_GANON_SOUL,               Text{ "Phantom Ganon's Soul", "", "" },                                                                           ITEMTYPE_ITEM,              0xE3,                 true,  LOGIC_CAN_SUMMON_PHANTOMGANON, RHT_PHANTOM_GANON_SOUL,       RG_PHANTOM_GANON_SOUL,          OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_PHANTOM_GANON_SOUL] =                  Item(RG_PHANTOM_GANON_SOUL,               Text{ "Phantom Ganon's Soul", "", "Phantom-Ganons Seele" },                                                                          ITEMTYPE_ITEM,              0xE3,                 true,  LOGIC_CAN_SUMMON_PHANTOMGANON,      RHT_PHANTOM_GANON_SOUL,                RG_PHANTOM_GANON_SOUL,                OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_PHANTOM_GANON_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
-    itemTable[RG_VOLVAGIA_SOUL] =                       Item(RG_VOLVAGIA_SOUL,                    Text{ "Volvagia's Soul", "", "" },                                                                                ITEMTYPE_ITEM,              0xE4,                 true,  LOGIC_CAN_SUMMON_VOLVAGIA,     RHT_VOLVAGIA_SOUL,            RG_VOLVAGIA_SOUL,               OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_VOLVAGIA_SOUL] =                       Item(RG_VOLVAGIA_SOUL,                    Text{ "Volvagia's Soul", "", "Volvagias Seele" },                                                                                    ITEMTYPE_ITEM,              0xE4,                 true,  LOGIC_CAN_SUMMON_VOLVAGIA,          RHT_VOLVAGIA_SOUL,                     RG_VOLVAGIA_SOUL,                     OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_VOLVAGIA_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
-    itemTable[RG_MORPHA_SOUL] =                         Item(RG_MORPHA_SOUL,                      Text{ "Morpha's Soul", "", "" },                                                                                  ITEMTYPE_ITEM,              0xE5,                 true,  LOGIC_CAN_SUMMON_MORPHA,       RHT_MORPHA_SOUL,              RG_MORPHA_SOUL,                 OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_MORPHA_SOUL] =                         Item(RG_MORPHA_SOUL,                      Text{ "Morpha's Soul", "", "Morphas Seele" },                                                                                        ITEMTYPE_ITEM,              0xE5,                 true,  LOGIC_CAN_SUMMON_MORPHA,            RHT_MORPHA_SOUL,                       RG_MORPHA_SOUL,                       OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_MORPHA_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
-    itemTable[RG_BONGO_BONGO_SOUL] =                    Item(RG_BONGO_BONGO_SOUL,                 Text{ "Bongo Bongo's Soul", "", "" },                                                                             ITEMTYPE_ITEM,              0xE6,                 true,  LOGIC_CAN_SUMMON_BONGOBONGO,   RHT_BONGO_BONGO_SOUL,         RG_BONGO_BONGO_SOUL,            OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BONGO_BONGO_SOUL] =                    Item(RG_BONGO_BONGO_SOUL,                 Text{ "Bongo Bongo's Soul", "", "Bongo Bongos Seele" },                                                                              ITEMTYPE_ITEM,              0xE6,                 true,  LOGIC_CAN_SUMMON_BONGOBONGO,        RHT_BONGO_BONGO_SOUL,                  RG_BONGO_BONGO_SOUL,                  OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_BONGO_BONGO_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
-    itemTable[RG_TWINROVA_SOUL] =                       Item(RG_TWINROVA_SOUL,                    Text{ "Twinrova's Soul", "", "" },                                                                                ITEMTYPE_ITEM,              0xE7,                 true,  LOGIC_CAN_SUMMON_TWINROVA,     RHT_TWINROVA_SOUL,            RG_TWINROVA_SOUL,               OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_TWINROVA_SOUL] =                       Item(RG_TWINROVA_SOUL,                    Text{ "Twinrova's Soul", "", "Twinrovas Seele" },                                                                                    ITEMTYPE_ITEM,              0xE7,                 true,  LOGIC_CAN_SUMMON_TWINROVA,          RHT_TWINROVA_SOUL,                     RG_TWINROVA_SOUL,                     OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_TWINROVA_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
-    itemTable[RG_GANON_SOUL] =                          Item(RG_GANON_SOUL,                       Text{ "Ganon's Soul", "", "" },                                                                                   ITEMTYPE_ITEM,              0xE8,                 true,  LOGIC_CAN_SUMMON_GANON,        RHT_GANON_SOUL,               RG_GANON_SOUL,                  OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_GANON_SOUL] =                          Item(RG_GANON_SOUL,                       Text{ "Ganon's Soul", "", "Ganons Seele" },                                                                                          ITEMTYPE_ITEM,              0xE8,                 true,  LOGIC_CAN_SUMMON_GANON,             RHT_GANON_SOUL,                        RG_GANON_SOUL,                        OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_GANON_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
-    itemTable[RG_FISHING_POLE] =                        Item(RG_FISHING_POLE,                     Text{ "Fishing Pole", "Canne à Pêche", "Caña de Pescar" },                                                        ITEMTYPE_ITEM,              RG_FISHING_POLE,      true,  LOGIC_FISHING_POLE,            RHT_FISHING_POLE,             RG_FISHING_POLE,                OBJECT_GI_FISH,         GID_FISHING_POLE,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_FISHING_POLE] =                        Item(RG_FISHING_POLE,                     Text{ "Fishing Pole", "Canne à Pêche", "Angelrute" },                                                                                ITEMTYPE_ITEM,              RG_FISHING_POLE,      true,  LOGIC_FISHING_POLE,                 RHT_FISHING_POLE,                      RG_FISHING_POLE,                      OBJECT_GI_FISH,         GID_FISHING_POLE,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_FISHING_POLE].SetCustomDrawFunc(Randomizer_DrawFishingPoleGI);
 
-    itemTable[RG_OCARINA_A_BUTTON] =                    Item(RG_OCARINA_A_BUTTON,                 Text{ "Ocarina A Button", "Touche A de l'Ocarina", "Botón A de Ocarina" },                                        ITEMTYPE_ITEM,              GI_MAP,               true,  LOGIC_OCARINA_A_BUTTON,        RHT_OCARINA_A_BUTTON,         RG_OCARINA_A_BUTTON,            OBJECT_GI_MAP,          GID_STONE_OF_AGONY, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_OCARINA_A_BUTTON] =                    Item(RG_OCARINA_A_BUTTON,                 Text{ "Ocarina A Button", "Touche A de l'Ocarina", "Taste A der Okarina" },                                                          ITEMTYPE_ITEM,              GI_MAP,               true,  LOGIC_OCARINA_A_BUTTON,             RHT_OCARINA_A_BUTTON,                  RG_OCARINA_A_BUTTON,                  OBJECT_GI_MAP,          GID_STONE_OF_AGONY,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_OCARINA_A_BUTTON].SetCustomDrawFunc(Randomizer_DrawOcarinaButton);
-    itemTable[RG_OCARINA_C_UP_BUTTON] =                 Item(RG_OCARINA_C_UP_BUTTON,              Text{ "Ocarina C Up Button", "Touche C-Haut de l'Ocarina", "Botón C superior de Ocarina" },                       ITEMTYPE_ITEM,              GI_MAP,               true,  LOGIC_OCARINA_C_UP_BUTTON,     RHT_OCARINA_C_UP_BUTTON,      RG_OCARINA_C_UP_BUTTON,         OBJECT_GI_MAP,          GID_STONE_OF_AGONY, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_OCARINA_C_UP_BUTTON] =                 Item(RG_OCARINA_C_UP_BUTTON,              Text{ "Ocarina C Up Button", "Touche C-Haut de l'Ocarina", "Taste C-Oben der Okarina" },                                             ITEMTYPE_ITEM,              GI_MAP,               true,  LOGIC_OCARINA_C_UP_BUTTON,          RHT_OCARINA_C_UP_BUTTON,               RG_OCARINA_C_UP_BUTTON,               OBJECT_GI_MAP,          GID_STONE_OF_AGONY,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_OCARINA_C_UP_BUTTON].SetCustomDrawFunc(Randomizer_DrawOcarinaButton);
-    itemTable[RG_OCARINA_C_DOWN_BUTTON] =               Item(RG_OCARINA_C_DOWN_BUTTON,            Text{ "Ocarina C Down Button", "Touche C-Bas de l'Ocarina", "Botón C inferior de Ocarina" },                      ITEMTYPE_ITEM,              GI_MAP,               true,  LOGIC_OCARINA_C_DOWN_BUTTON,   RHT_OCARINA_C_DOWN_BUTTON,    RG_OCARINA_C_DOWN_BUTTON,       OBJECT_GI_MAP,          GID_STONE_OF_AGONY, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_OCARINA_C_DOWN_BUTTON] =               Item(RG_OCARINA_C_DOWN_BUTTON,            Text{ "Ocarina C Down Button", "Touche C-Bas de l'Ocarina", "Taste C-Unten der Okarina" },                                           ITEMTYPE_ITEM,              GI_MAP,               true,  LOGIC_OCARINA_C_DOWN_BUTTON,        RHT_OCARINA_C_DOWN_BUTTON,             RG_OCARINA_C_DOWN_BUTTON,             OBJECT_GI_MAP,          GID_STONE_OF_AGONY,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_OCARINA_C_DOWN_BUTTON].SetCustomDrawFunc(Randomizer_DrawOcarinaButton);
-    itemTable[RG_OCARINA_C_LEFT_BUTTON] =               Item(RG_OCARINA_C_LEFT_BUTTON,            Text{ "Ocarina C Left Button", "Touche C-Gauche de l'Ocarina", "Botón C izquierdo de Ocarina" },                  ITEMTYPE_ITEM,              GI_MAP,               true,  LOGIC_OCARINA_C_LEFT_BUTTON,   RHT_OCARINA_C_LEFT_BUTTON,    RG_OCARINA_C_LEFT_BUTTON,       OBJECT_GI_MAP,          GID_STONE_OF_AGONY, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_OCARINA_C_LEFT_BUTTON] =               Item(RG_OCARINA_C_LEFT_BUTTON,            Text{ "Ocarina C Left Button", "Touche C-Gauche de l'Ocarina", "Taste C-Links der Okarina" },                                        ITEMTYPE_ITEM,              GI_MAP,               true,  LOGIC_OCARINA_C_LEFT_BUTTON,        RHT_OCARINA_C_LEFT_BUTTON,             RG_OCARINA_C_LEFT_BUTTON,             OBJECT_GI_MAP,          GID_STONE_OF_AGONY,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_OCARINA_C_LEFT_BUTTON].SetCustomDrawFunc(Randomizer_DrawOcarinaButton);
-    itemTable[RG_OCARINA_C_RIGHT_BUTTON] =              Item(RG_OCARINA_C_RIGHT_BUTTON,           Text{ "Ocarina C Right Button", "Touche C-Droit de l'Ocarina", "Botón C derecho de Ocarina" },                    ITEMTYPE_ITEM,              GI_MAP,               true,  LOGIC_OCARINA_C_RIGHT_BUTTON,  RHT_OCARINA_C_RIGHT_BUTTON,   RG_OCARINA_C_RIGHT_BUTTON,      OBJECT_GI_MAP,          GID_STONE_OF_AGONY, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_OCARINA_C_RIGHT_BUTTON] =              Item(RG_OCARINA_C_RIGHT_BUTTON,           Text{ "Ocarina C Right Button", "Touche C-Droit de l'Ocarina", "Taste C-Rechts der Okarina" },                                       ITEMTYPE_ITEM,              GI_MAP,               true,  LOGIC_OCARINA_C_RIGHT_BUTTON,       RHT_OCARINA_C_RIGHT_BUTTON,            RG_OCARINA_C_RIGHT_BUTTON,            OBJECT_GI_MAP,          GID_STONE_OF_AGONY,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_OCARINA_C_RIGHT_BUTTON].SetCustomDrawFunc(Randomizer_DrawOcarinaButton);
 
-    itemTable[RG_BRONZE_SCALE] =                        Item(RG_BRONZE_SCALE,                     Text{ "Bronze Scale", "!!!", "!!!" },                                                                             ITEMTYPE_ITEM,              GI_SCALE_SILVER,      true,  LOGIC_PROGRESSIVE_WALLET,      RHT_BRONZE_SCALE,             RG_BRONZE_SCALE,                OBJECT_GI_SCALE,        GID_SCALE_SILVER,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BRONZE_SCALE] =                        Item(RG_BRONZE_SCALE,                     Text{ "Bronze Scale", "!!!", "Bronzene Schuppe" },                                                                                   ITEMTYPE_ITEM,              GI_SCALE_SILVER,      true,  LOGIC_PROGRESSIVE_WALLET,           RHT_BRONZE_SCALE,                      RG_BRONZE_SCALE,                      OBJECT_GI_SCALE,        GID_SCALE_SILVER,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_BRONZE_SCALE].SetCustomDrawFunc(Randomizer_DrawBronzeScale);
 
-    itemTable[RG_QUIVER_INF] =                          Item(RG_QUIVER_INF,                       Text{ "Infinite Quiver", "!!!", "!!!" },                                                                          ITEMTYPE_ITEM,              RG_QUIVER_INF,        true,  LOGIC_PROGRESSIVE_BOW,         RHT_QUIVER_INF,               RG_QUIVER_INF,                  OBJECT_GI_ARROWCASE,    GID_QUIVER_50,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_BOMB_BAG_INF] =                        Item(RG_BOMB_BAG_INF,                     Text{ "Infinite Bomb Bag", "!!!", "!!!" },                                                                        ITEMTYPE_ITEM,              RG_BOMB_BAG_INF,      true,  LOGIC_PROGRESSIVE_BOMB_BAG,    RHT_BOMB_BAG_INF,             RG_BOMB_BAG_INF,                OBJECT_GI_BOMBPOUCH,    GID_BOMB_BAG_40,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_BULLET_BAG_INF] =                      Item(RG_BULLET_BAG_INF,                   Text{ "Infinite Bullet Bag", "!!!", "!!!" },                                                                      ITEMTYPE_ITEM,              RG_BULLET_BAG_INF,    true,  LOGIC_PROGRESSIVE_BULLET_BAG,  RHT_BULLET_BAG_INF,           RG_BULLET_BAG_INF,              OBJECT_GI_DEKUPOUCH,    GID_BULLET_BAG,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_STICK_UPGRADE_INF] =                   Item(RG_STICK_UPGRADE_INF,                Text{ "Infinite Stick Capacity", "!!!", "!!!" },                                                                  ITEMTYPE_ITEM,              RG_STICK_UPGRADE_INF, true,  LOGIC_PROGRESSIVE_STICK_BAG,   RHT_STICK_UPGRADE_INF,        RG_STICK_UPGRADE_INF,           OBJECT_GI_STICK,        GID_STICK,          TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_NUT_UPGRADE_INF] =                     Item(RG_NUT_UPGRADE_INF,                  Text{ "Infinite Nut Capacity", "!!!", "!!!" },                                                                    ITEMTYPE_ITEM,              RG_NUT_UPGRADE_INF,   true,  LOGIC_PROGRESSIVE_NUT_BAG,     RHT_NUT_UPGRADE_INF,          RG_NUT_UPGRADE_INF,             OBJECT_GI_NUTS,         GID_NUTS,           TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_MAGIC_INF] =                           Item(RG_MAGIC_INF,                        Text{ "Infinite Magic Meter", "!!!", "!!!" },                                                                     ITEMTYPE_ITEM,              RG_MAGIC_INF,         true,  LOGIC_PROGRESSIVE_MAGIC,       RHT_MAGIC_INF,                RG_MAGIC_INF,                   OBJECT_GI_MAGICPOT,     GID_MAGIC_LARGE,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_BOMBCHU_INF] =                         Item(RG_BOMBCHU_INF,                      Text{ "Infinite Bombchus", "!!!", "!!!" },                                                                        ITEMTYPE_ITEM,              RG_BOMBCHU_INF,       true,  LOGIC_BOMBCHUS,                RHT_BOMBCHU_INF,              RG_BOMBCHU_INF,                 OBJECT_GI_BOMB_2,       GID_BOMBCHU,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_WALLET_INF] =                          Item(RG_WALLET_INF,                       Text{ "Infinite Wallet", "!!!", "!!!" },                                                                          ITEMTYPE_ITEM,              RG_WALLET_INF,        true,  LOGIC_PROGRESSIVE_WALLET,      RHT_WALLET_INF,               RG_WALLET_INF,                  OBJECT_GI_PURSE,        GID_WALLET_GIANT,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_QUIVER_INF] =                          Item(RG_QUIVER_INF,                       Text{ "Infinite Quiver", "!!!", "Unendlicher Köcher" },                                                                              ITEMTYPE_ITEM,              RG_QUIVER_INF,        true,  LOGIC_PROGRESSIVE_BOW,              RHT_QUIVER_INF,                        RG_QUIVER_INF,                        OBJECT_GI_ARROWCASE,    GID_QUIVER_50,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_BOMB_BAG_INF] =                        Item(RG_BOMB_BAG_INF,                     Text{ "Infinite Bomb Bag", "!!!", "Unendliche Bombentasche" },                                                                       ITEMTYPE_ITEM,              RG_BOMB_BAG_INF,      true,  LOGIC_PROGRESSIVE_BOMB_BAG,         RHT_BOMB_BAG_INF,                      RG_BOMB_BAG_INF,                      OBJECT_GI_BOMBPOUCH,    GID_BOMB_BAG_40,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_BULLET_BAG_INF] =                      Item(RG_BULLET_BAG_INF,                   Text{ "Infinite Bullet Bag", "!!!", "Unendliche Samentasche" },                                                                      ITEMTYPE_ITEM,              RG_BULLET_BAG_INF,    true,  LOGIC_PROGRESSIVE_BULLET_BAG,       RHT_BULLET_BAG_INF,                    RG_BULLET_BAG_INF,                    OBJECT_GI_DEKUPOUCH,    GID_BULLET_BAG,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_STICK_UPGRADE_INF] =                   Item(RG_STICK_UPGRADE_INF,                Text{ "Infinite Stick Capacity", "!!!", "Unendliche Stab-Kapazität" },                                                               ITEMTYPE_ITEM,              RG_STICK_UPGRADE_INF, true,  LOGIC_PROGRESSIVE_STICK_BAG,        RHT_STICK_UPGRADE_INF,                 RG_STICK_UPGRADE_INF,                 OBJECT_GI_STICK,        GID_STICK,            TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_NUT_UPGRADE_INF] =                     Item(RG_NUT_UPGRADE_INF,                  Text{ "Infinite Nut Capacity", "!!!", "Unendliche Nuß-Kapazität" },                                                                  ITEMTYPE_ITEM,              RG_NUT_UPGRADE_INF,   true,  LOGIC_PROGRESSIVE_NUT_BAG,          RHT_NUT_UPGRADE_INF,                   RG_NUT_UPGRADE_INF,                   OBJECT_GI_NUTS,         GID_NUTS,             TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_MAGIC_INF] =                           Item(RG_MAGIC_INF,                        Text{ "Infinite Magic Meter", "!!!", "Unendliches Magisches Maß" },                                                                  ITEMTYPE_ITEM,              RG_MAGIC_INF,         true,  LOGIC_PROGRESSIVE_MAGIC,            RHT_MAGIC_INF,                         RG_MAGIC_INF,                         OBJECT_GI_MAGICPOT,     GID_MAGIC_LARGE,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_BOMBCHU_INF] =                         Item(RG_BOMBCHU_INF,                      Text{ "Infinite Bombchus", "!!!", "Unendliche Krabbelminen" },                                                                       ITEMTYPE_ITEM,              RG_BOMBCHU_INF,       true,  LOGIC_BOMBCHUS,                     RHT_BOMBCHU_INF,                       RG_BOMBCHU_INF,                       OBJECT_GI_BOMB_2,       GID_BOMBCHU,          TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_WALLET_INF] =                          Item(RG_WALLET_INF,                       Text{ "Infinite Wallet", "!!!", "Unendliche Geldbörse" },                                                                            ITEMTYPE_ITEM,              RG_WALLET_INF,        true,  LOGIC_PROGRESSIVE_WALLET,           RHT_WALLET_INF,                        RG_WALLET_INF,                        OBJECT_GI_PURSE,        GID_WALLET_GIANT,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
 
-    itemTable[RG_SKELETON_KEY] =                        Item(RG_SKELETON_KEY,                     Text{ "Skeleton Key", "!!!", "!!!" },                                                                             ITEMTYPE_ITEM,              GI_STONE_OF_AGONY,    true,  LOGIC_SKELETON_KEY,            RHT_SKELETON_KEY,             RG_SKELETON_KEY,                OBJECT_GI_MAP,          GID_STONE_OF_AGONY, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_SKELETON_KEY] =                        Item(RG_SKELETON_KEY,                     Text{ "Skeleton Key", "!!!", "Skelettschlüssel" },                                                                                   ITEMTYPE_ITEM,              GI_STONE_OF_AGONY,    true,  LOGIC_SKELETON_KEY,                 RHT_SKELETON_KEY,                      RG_SKELETON_KEY,                      OBJECT_GI_MAP,          GID_STONE_OF_AGONY,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_SKELETON_KEY].SetCustomDrawFunc(Randomizer_DrawSkeletonKey);
 
-    itemTable[RG_DEKU_STICK_BAG] =                      Item(RG_DEKU_STICK_BAG,                   Text{ "Deku Stick Bag", "!!!", "!!!" },                                                                           ITEMTYPE_ITEM,              GI_STICK_UPGRADE_30,  true,  LOGIC_PROGRESSIVE_STICK_BAG,   RHT_NONE,                     RG_DEKU_STICK_BAG,              OBJECT_GI_STICK,        GID_STICK,          TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_DEKU_STICK_BAG] =                      Item(RG_DEKU_STICK_BAG,                   Text{ "Deku Stick Bag", "!!!", "Deku-Stab-Tasche" },                                                                                 ITEMTYPE_ITEM,              GI_STICK_UPGRADE_30,  true,  LOGIC_PROGRESSIVE_STICK_BAG,        RHT_NONE,                              RG_DEKU_STICK_BAG,                    OBJECT_GI_STICK,        GID_STICK,            TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
 
-    itemTable[RG_DEKU_NUT_BAG] =                        Item(RG_DEKU_NUT_BAG,                     Text{ "Deku Nut Bag", "!!!", "!!!" },                                                                             ITEMTYPE_ITEM,              GI_NUT_UPGRADE_30,    true,  LOGIC_PROGRESSIVE_NUT_BAG,     RHT_NONE,                     RG_DEKU_NUT_BAG,                OBJECT_GI_NUTS,         GID_NUTS,           TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_DEKU_NUT_BAG] =                        Item(RG_DEKU_NUT_BAG,                     Text{ "Deku Nut Bag", "!!!", "Deku-Nuß-Tasche" },                                                                                    ITEMTYPE_ITEM,              GI_NUT_UPGRADE_30,    true,  LOGIC_PROGRESSIVE_NUT_BAG,          RHT_NONE,                              RG_DEKU_NUT_BAG,                      OBJECT_GI_NUTS,         GID_NUTS,             TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
 
-    itemTable[RG_TRIFORCE] =                            Item(RG_TRIFORCE,                         Text{ "Triforce", "Triforce", "Triforce" },                                                                       ITEMTYPE_EVENT,             RG_TRIFORCE,          false, LOGIC_NONE,                    RHT_NONE);
-    itemTable[RG_HINT] =                                Item(RG_HINT,                             Text{ "Hint", "Indice", "Hinweis" },                                                                              ITEMTYPE_EVENT,             RG_HINT,              false, LOGIC_NONE,                    RHT_NONE);
+    itemTable[RG_TRIFORCE] =                            Item(RG_TRIFORCE,                         Text{ "Triforce", "Triforce", "Triforce" },                                                                                          ITEMTYPE_EVENT,             RG_TRIFORCE,          false, LOGIC_NONE,                         RHT_NONE);
+    itemTable[RG_HINT] =                                Item(RG_HINT,                             Text{ "Hint", "Indice", "Hinweis" },                                                                                                 ITEMTYPE_EVENT,             RG_HINT,              false, LOGIC_NONE,                         RHT_NONE);
     // Individual stages of progressive items (only here for GetItemEntry purposes, not for use in seed gen)
-    itemTable[RG_HOOKSHOT] =                            Item(RG_HOOKSHOT,                         Text{ "Hookshot", "Grappin", "Fanghaken" },                                                                       ITEMTYPE_ITEM,              GI_HOOKSHOT,          true,  LOGIC_PROGRESSIVE_HOOKSHOT,    RHT_HOOKSHOT,                 ITEM_HOOKSHOT,                  OBJECT_GI_HOOKSHOT,     GID_HOOKSHOT,         0x36,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_LONGSHOT] =                            Item(RG_LONGSHOT,                         Text{ "Longshot", "Super-Grappin", "Enterhaken" },                                                                ITEMTYPE_ITEM,              GI_LONGSHOT,          true,  LOGIC_PROGRESSIVE_HOOKSHOT,    RHT_LONGSHOT,                 ITEM_LONGSHOT,                  OBJECT_GI_HOOKSHOT,     GID_LONGSHOT,         0x4F,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_FAIRY_OCARINA] =                       Item(RG_FAIRY_OCARINA,                    Text{ "Fairy Ocarina", "Ocarina des fées", "Feen-Okarina" },                                                      ITEMTYPE_ITEM,              GI_OCARINA_FAIRY,     true,  LOGIC_PROGRESSIVE_OCARINA,     RHT_FAIRY_OCARINA,            ITEM_OCARINA_FAIRY,             OBJECT_GI_OCARINA_0,    GID_OCARINA_FAIRY,    0x4A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_OCARINA_OF_TIME] =                     Item(RG_OCARINA_OF_TIME,                  Text{ "Ocarina of Time", "Ocarina du Temps", "Okarina der Zeit" },                                                ITEMTYPE_ITEM,              GI_OCARINA_OOT,       true,  LOGIC_PROGRESSIVE_OCARINA,     RHT_OCARINA_OF_TIME,          ITEM_OCARINA_TIME,              OBJECT_GI_OCARINA,      GID_OCARINA_TIME,     0x3A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_BOMB_BAG] =                            Item(RG_BOMB_BAG,                         Text{ "Bomb Bag", "Sac de Bombes", "Bombentasche" },                                                              ITEMTYPE_ITEM,              GI_BOMB_BAG_20,       true,  LOGIC_PROGRESSIVE_BOMB_BAG,    RHT_BOMB_BAG,                 ITEM_BOMB_BAG_20,               OBJECT_GI_BOMBPOUCH,    GID_BOMB_BAG_20,      0x58,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_BIG_BOMB_BAG] =                        Item(RG_BIG_BOMB_BAG,                     Text{ "Big Bomb Bag", "Grand Sac de Bombes", "Große Bombentasche" },                                              ITEMTYPE_ITEM,              GI_BOMB_BAG_30,       true,  LOGIC_PROGRESSIVE_BOMB_BAG,    RHT_BIG_BOMB_BAG,             ITEM_BOMB_BAG_30,               OBJECT_GI_BOMBPOUCH,    GID_BOMB_BAG_30,      0x59,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_BIGGEST_BOMB_BAG] =                    Item(RG_BIGGEST_BOMB_BAG,                 Text{ "Biggest Bomb Bag", "Énorme Sac de Bombes", "Größte Bombentasche" },                                        ITEMTYPE_ITEM,              GI_BOMB_BAG_40,       true,  LOGIC_PROGRESSIVE_BOMB_BAG,    RHT_BIGGEST_BOMB_BAG,         ITEM_BOMB_BAG_40,               OBJECT_GI_BOMBPOUCH,    GID_BOMB_BAG_40,      0x5A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_FAIRY_BOW] =                           Item(RG_FAIRY_BOW,                        Text{ "Fairy Bow", "Arc des Fées", "Feen-Bogen" },                                                                ITEMTYPE_ITEM,              GI_BOW,               true,  LOGIC_PROGRESSIVE_BOW,         RHT_FAIRY_BOW,                ITEM_BOW,                       OBJECT_GI_BOW,          GID_BOW,              0x31,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_BIG_QUIVER] =                          Item(RG_BIG_QUIVER,                       Text{ "Big Quiver", "Grand carquois", "Großer Köcher" },                                                          ITEMTYPE_ITEM,              GI_QUIVER_40,         true,  LOGIC_PROGRESSIVE_BOW,         RHT_BIG_QUIVER,               ITEM_QUIVER_40,                 OBJECT_GI_ARROWCASE,    GID_QUIVER_40,        0x56,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_BIGGEST_QUIVER] =                      Item(RG_BIGGEST_QUIVER,                   Text{ "Biggest Quiver", "Énorme carquois", "Größter Köcher" },                                                    ITEMTYPE_ITEM,              GI_QUIVER_50,         true,  LOGIC_PROGRESSIVE_BOW,         RHT_BIGGEST_QUIVER,           ITEM_QUIVER_50,                 OBJECT_GI_ARROWCASE,    GID_QUIVER_50,        0x57,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_FAIRY_SLINGSHOT] =                     Item(RG_FAIRY_SLINGSHOT,                  Text{ "Fairy Slingshot", "Lance-Pierre des Fées", "Feen-Schleuder" },                                             ITEMTYPE_ITEM,              GI_SLINGSHOT,         true,  LOGIC_PROGRESSIVE_BULLET_BAG,  RHT_FAIRY_SLINGSHOT,          ITEM_SLINGSHOT,                 OBJECT_GI_PACHINKO,     GID_SLINGSHOT,        0x30,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_BIG_BULLET_BAG] =                      Item(RG_BIG_BULLET_BAG,                   Text{ "Big Deku Seed Bullet Bag", "Grand sac de graines mojo", "Großer Deku-Samenkugelsack" },                    ITEMTYPE_ITEM,              GI_BULLET_BAG_40,     true,  LOGIC_PROGRESSIVE_BULLET_BAG,  RHT_BIG_BULLET_BAG,           ITEM_BULLET_BAG_40,             OBJECT_GI_DEKUPOUCH,    GID_BULLET_BAG,       0x07,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_BIGGEST_BULLET_BAG] =                  Item(RG_BIGGEST_BULLET_BAG,               Text{ "Biggest Deku Seed Bullet Bag", "Énorme sac de graines mojo", "Größte Deku-Samenkugelsack" },               ITEMTYPE_ITEM,              GI_BULLET_BAG_50,     true,  LOGIC_PROGRESSIVE_BULLET_BAG,  RHT_BIGGEST_BULLET_BAG,       ITEM_BULLET_BAG_50,             OBJECT_GI_DEKUPOUCH,    GID_BULLET_BAG,       0x07,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_GORONS_BRACELET] =                     Item(RG_GORONS_BRACELET,                  Text{ "Goron's Bracelet", "Bracelet Goron", "Goronen-Armband" },                                                  ITEMTYPE_ITEM,              GI_BRACELET,          true,  LOGIC_PROGRESSIVE_STRENGTH,    RHT_GORONS_BRACELET,          ITEM_BRACELET,                  OBJECT_GI_BRACELET,     GID_BRACELET,         0x79,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_SILVER_GAUNTLETS] =                    Item(RG_SILVER_GAUNTLETS,                 Text{ "Silver Gauntlets", "Gantelets d'argent", "Silberne Fehdehandschuhe" },                                     ITEMTYPE_ITEM,              GI_GAUNTLETS_SILVER,  true,  LOGIC_PROGRESSIVE_STRENGTH,    RHT_SILVER_GAUNTLETS,         ITEM_GAUNTLETS_SILVER,          OBJECT_GI_GLOVES,       GID_GAUNTLETS_SILVER, 0x5B,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_GOLDEN_GAUNTLETS] =                    Item(RG_GOLDEN_GAUNTLETS,                 Text{ "Golden Gauntlets", "Gantelets d'or", "Goldene Fehdehandschuhe" },                                          ITEMTYPE_ITEM,              GI_GAUNTLETS_GOLD,    true,  LOGIC_PROGRESSIVE_STRENGTH,    RHT_GOLDEN_GAUNTLETS,         ITEM_GAUNTLETS_GOLD,            OBJECT_GI_GLOVES,       GID_GAUNTLETS_GOLD,   0x5C,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_SILVER_SCALE] =                        Item(RG_SILVER_SCALE,                     Text{ "Silver Scale", "Écaille d'argent", "Silberne Skala" },                                                     ITEMTYPE_ITEM,              GI_SCALE_SILVER,      true,  LOGIC_PROGRESSIVE_SCALE,       RHT_SILVER_SCALE,             ITEM_SCALE_SILVER,              OBJECT_GI_SCALE,        GID_SCALE_SILVER,     0xCD,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_GOLDEN_SCALE] =                        Item(RG_GOLDEN_SCALE,                     Text{ "Golden Scale", "Écaille d'or", "Goldene Skala" },                                                          ITEMTYPE_ITEM,              GI_SCALE_GOLD,        true,  LOGIC_PROGRESSIVE_SCALE,       RHT_GOLDEN_SCALE,             ITEM_SCALE_GOLDEN,              OBJECT_GI_SCALE,        GID_SCALE_GOLDEN,     0xCE,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_ADULT_WALLET] =                        Item(RG_ADULT_WALLET,                     Text{ "Adult Wallet", "Grande Bourse", "Erwachsene Geldbörse" },                                                  ITEMTYPE_ITEM,              GI_WALLET_ADULT,      true,  LOGIC_PROGRESSIVE_WALLET,      RHT_ADULT_WALLET,             ITEM_WALLET_ADULT,              OBJECT_GI_PURSE,        GID_WALLET_ADULT,     0x5E,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_GIANT_WALLET] =                        Item(RG_GIANT_WALLET,                     Text{ "Giant Wallet", "Bourse de Géant", "Riesige Geldbörse" },                                                   ITEMTYPE_ITEM,              GI_WALLET_GIANT,      true,  LOGIC_PROGRESSIVE_WALLET,      RHT_GIANT_WALLET,             ITEM_WALLET_GIANT,              OBJECT_GI_PURSE,        GID_WALLET_GIANT,     0x5F,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_TYCOON_WALLET] =                       Item(RG_TYCOON_WALLET,                    Text{ "Tycoon Wallet", "Bourse de Magnat", "Reiche Geldbörse" },                                                  ITEMTYPE_ITEM,              RG_TYCOON_WALLET,     true,  LOGIC_PROGRESSIVE_WALLET,      RHT_TYCOON_WALLET,            RG_TYCOON_WALLET,               OBJECT_GI_PURSE,        GID_WALLET_GIANT,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_CHILD_WALLET] =                        Item(RG_CHILD_WALLET,                     Text{ "Child Wallet", "Bourse de Magnat", "Reiche Geldbörse" },/*FIXME: still says tycoon in french & german*/    ITEMTYPE_ITEM,              RG_CHILD_WALLET,      true,  LOGIC_PROGRESSIVE_WALLET,      RHT_CHILD_WALLET,             RG_CHILD_WALLET,                OBJECT_GI_PURSE,        GID_WALLET_ADULT,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_DEKU_NUT_CAPACITY_30] =                Item(RG_DEKU_NUT_CAPACITY_30,             Text{ "Deku Nut Capacity (30)", "Capacité de noix Mojo (30)", "Deku Nuss Kapazität (30)" },                       ITEMTYPE_ITEM,              GI_NUT_UPGRADE_30,    true,  LOGIC_PROGRESSIVE_NUT_BAG,     RHT_DEKU_NUT_CAPACITY_30,     ITEM_NUT_UPGRADE_30,            OBJECT_GI_NUTS,         GID_NUTS,             0xA7,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_DEKU_NUT_CAPACITY_40] =                Item(RG_DEKU_NUT_CAPACITY_40,             Text{ "Deku Nut Capacity (40)", "Capacité de noix Mojo (40)", "Deku Nuss Kapazität (40)" },                       ITEMTYPE_ITEM,              GI_NUT_UPGRADE_40,    true,  LOGIC_PROGRESSIVE_NUT_BAG,     RHT_DEKU_NUT_CAPACITY_40,     ITEM_NUT_UPGRADE_40,            OBJECT_GI_NUTS,         GID_NUTS,             0xA8,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_DEKU_STICK_CAPACITY_20] =              Item(RG_DEKU_STICK_CAPACITY_20,           Text{ "Deku Stick Capacity (20)", "Capacité de Bâtons Mojo (20)", "Deku Stick Kapazität (20)" },                  ITEMTYPE_ITEM,              GI_STICK_UPGRADE_20,  true,  LOGIC_PROGRESSIVE_STICK_BAG,   RHT_DEKU_STICK_CAPACITY_20,   ITEM_STICK_UPGRADE_20,          OBJECT_GI_STICK,        GID_STICK,            0x90,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_DEKU_STICK_CAPACITY_30] =              Item(RG_DEKU_STICK_CAPACITY_30,           Text{ "Deku Stick Capacity (30)", "Capacité de Bâtons Mojo (30)", "Deku Stick Kapazität (30)" },                  ITEMTYPE_ITEM,              GI_STICK_UPGRADE_30,  true,  LOGIC_PROGRESSIVE_STICK_BAG,   RHT_DEKU_STICK_CAPACITY_30,   ITEM_STICK_UPGRADE_30,          OBJECT_GI_STICK,        GID_STICK,            0x91,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_MAGIC_SINGLE] =                        Item(RG_MAGIC_SINGLE,                     Text{ "Magic Meter", "Jauge de Magie", "Magisches Messgerät" },                                                   ITEMTYPE_ITEM,              0x8A,                 true,  LOGIC_PROGRESSIVE_MAGIC,       RHT_MAGIC_SINGLE,             RG_MAGIC_SINGLE,                OBJECT_GI_MAGICPOT,     GID_MAGIC_SMALL,      0xE4,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_MAGIC_DOUBLE] =                        Item(RG_MAGIC_DOUBLE,                     Text{ "Enhanced Magic Meter", "Jauge de Magie améliorée", "Verbesserte Magieanzeige" },                           ITEMTYPE_ITEM,              0x8A,                 true,  LOGIC_PROGRESSIVE_MAGIC,       RHT_MAGIC_DOUBLE,             RG_MAGIC_DOUBLE,                OBJECT_GI_MAGICPOT,     GID_MAGIC_LARGE,      0xE8,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_TRIFORCE_PIECE] =                      Item(RG_TRIFORCE_PIECE,                   Text{ "Triforce Piece", "Triforce Piece", "Triforce Piece" },                                                     ITEMTYPE_ITEM,              0xDF,                 true,  LOGIC_TRIFORCE_PIECES,         RHT_TRIFORCE_PIECE,           RG_TRIFORCE_PIECE,              OBJECT_GI_BOMB_2,       GID_TRIFORCE_PIECE,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_HOOKSHOT] =                            Item(RG_HOOKSHOT,                         Text{ "Hookshot", "Grappin", "Fanghaken" },                                                                                          ITEMTYPE_ITEM,              GI_HOOKSHOT,          true,  LOGIC_PROGRESSIVE_HOOKSHOT,         RHT_HOOKSHOT,                          ITEM_HOOKSHOT,                        OBJECT_GI_HOOKSHOT,     GID_HOOKSHOT,         0x36,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_LONGSHOT] =                            Item(RG_LONGSHOT,                         Text{ "Longshot", "Super-Grappin", "Enterhaken" },                                                                                   ITEMTYPE_ITEM,              GI_LONGSHOT,          true,  LOGIC_PROGRESSIVE_HOOKSHOT,         RHT_LONGSHOT,                          ITEM_LONGSHOT,                        OBJECT_GI_HOOKSHOT,     GID_LONGSHOT,         0x4F,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_FAIRY_OCARINA] =                       Item(RG_FAIRY_OCARINA,                    Text{ "Fairy Ocarina", "Ocarina des fées", "Feen-Okarina" },                                                                         ITEMTYPE_ITEM,              GI_OCARINA_FAIRY,     true,  LOGIC_PROGRESSIVE_OCARINA,          RHT_FAIRY_OCARINA,                     ITEM_OCARINA_FAIRY,                   OBJECT_GI_OCARINA_0,    GID_OCARINA_FAIRY,    0x4A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_OCARINA_OF_TIME] =                     Item(RG_OCARINA_OF_TIME,                  Text{ "Ocarina of Time", "Ocarina du Temps", "Okarina der Zeit" },                                                                   ITEMTYPE_ITEM,              GI_OCARINA_OOT,       true,  LOGIC_PROGRESSIVE_OCARINA,          RHT_OCARINA_OF_TIME,                   ITEM_OCARINA_TIME,                    OBJECT_GI_OCARINA,      GID_OCARINA_TIME,     0x3A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BOMB_BAG] =                            Item(RG_BOMB_BAG,                         Text{ "Bomb Bag", "Sac de Bombes", "Bombentasche" },                                                                                 ITEMTYPE_ITEM,              GI_BOMB_BAG_20,       true,  LOGIC_PROGRESSIVE_BOMB_BAG,         RHT_BOMB_BAG,                          ITEM_BOMB_BAG_20,                     OBJECT_GI_BOMBPOUCH,    GID_BOMB_BAG_20,      0x58,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BIG_BOMB_BAG] =                        Item(RG_BIG_BOMB_BAG,                     Text{ "Big Bomb Bag", "Grand Sac de Bombes", "Große Bombentasche" },                                                                 ITEMTYPE_ITEM,              GI_BOMB_BAG_30,       true,  LOGIC_PROGRESSIVE_BOMB_BAG,         RHT_BIG_BOMB_BAG,                      ITEM_BOMB_BAG_30,                     OBJECT_GI_BOMBPOUCH,    GID_BOMB_BAG_30,      0x59,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_BIGGEST_BOMB_BAG] =                    Item(RG_BIGGEST_BOMB_BAG,                 Text{ "Biggest Bomb Bag", "Énorme Sac de Bombes", "Größte Bombentasche" },                                                           ITEMTYPE_ITEM,              GI_BOMB_BAG_40,       true,  LOGIC_PROGRESSIVE_BOMB_BAG,         RHT_BIGGEST_BOMB_BAG,                  ITEM_BOMB_BAG_40,                     OBJECT_GI_BOMBPOUCH,    GID_BOMB_BAG_40,      0x5A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_FAIRY_BOW] =                           Item(RG_FAIRY_BOW,                        Text{ "Fairy Bow", "Arc des Fées", "Feen-Bogen" },                                                                                   ITEMTYPE_ITEM,              GI_BOW,               true,  LOGIC_PROGRESSIVE_BOW,              RHT_FAIRY_BOW,                         ITEM_BOW,                             OBJECT_GI_BOW,          GID_BOW,              0x31,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BIG_QUIVER] =                          Item(RG_BIG_QUIVER,                       Text{ "Big Quiver", "Grand carquois", "Großer Köcher" },                                                                             ITEMTYPE_ITEM,              GI_QUIVER_40,         true,  LOGIC_PROGRESSIVE_BOW,              RHT_BIG_QUIVER,                        ITEM_QUIVER_40,                       OBJECT_GI_ARROWCASE,    GID_QUIVER_40,        0x56,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_BIGGEST_QUIVER] =                      Item(RG_BIGGEST_QUIVER,                   Text{ "Biggest Quiver", "Énorme carquois", "Größter Köcher" },                                                                       ITEMTYPE_ITEM,              GI_QUIVER_50,         true,  LOGIC_PROGRESSIVE_BOW,              RHT_BIGGEST_QUIVER,                    ITEM_QUIVER_50,                       OBJECT_GI_ARROWCASE,    GID_QUIVER_50,        0x57,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_FAIRY_SLINGSHOT] =                     Item(RG_FAIRY_SLINGSHOT,                  Text{ "Fairy Slingshot", "Lance-Pierre des Fées", "Feen-Schleuder" },                                                                ITEMTYPE_ITEM,              GI_SLINGSHOT,         true,  LOGIC_PROGRESSIVE_BULLET_BAG,       RHT_FAIRY_SLINGSHOT,                   ITEM_SLINGSHOT,                       OBJECT_GI_PACHINKO,     GID_SLINGSHOT,        0x30,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BIG_BULLET_BAG] =                      Item(RG_BIG_BULLET_BAG,                   Text{ "Big Deku Seed Bullet Bag", "Grand sac de graines mojo", "Große Deku-Samentasche" },                                           ITEMTYPE_ITEM,              GI_BULLET_BAG_40,     true,  LOGIC_PROGRESSIVE_BULLET_BAG,       RHT_BIG_BULLET_BAG,                    ITEM_BULLET_BAG_40,                   OBJECT_GI_DEKUPOUCH,    GID_BULLET_BAG,       0x07,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_BIGGEST_BULLET_BAG] =                  Item(RG_BIGGEST_BULLET_BAG,               Text{ "Biggest Deku Seed Bullet Bag", "Énorme sac de graines mojo", "Größte Deku-Samentasche" },                                     ITEMTYPE_ITEM,              GI_BULLET_BAG_50,     true,  LOGIC_PROGRESSIVE_BULLET_BAG,       RHT_BIGGEST_BULLET_BAG,                ITEM_BULLET_BAG_50,                   OBJECT_GI_DEKUPOUCH,    GID_BULLET_BAG,       0x07,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_GORONS_BRACELET] =                     Item(RG_GORONS_BRACELET,                  Text{ "Goron's Bracelet", "Bracelet Goron", "Goronen-Armband" },                                                                     ITEMTYPE_ITEM,              GI_BRACELET,          true,  LOGIC_PROGRESSIVE_STRENGTH,         RHT_GORONS_BRACELET,                   ITEM_BRACELET,                        OBJECT_GI_BRACELET,     GID_BRACELET,         0x79,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_SILVER_GAUNTLETS] =                    Item(RG_SILVER_GAUNTLETS,                 Text{ "Silver Gauntlets", "Gantelets d'argent", "Silberhandschuhe" },                                                                ITEMTYPE_ITEM,              GI_GAUNTLETS_SILVER,  true,  LOGIC_PROGRESSIVE_STRENGTH,         RHT_SILVER_GAUNTLETS,                  ITEM_GAUNTLETS_SILVER,                OBJECT_GI_GLOVES,       GID_GAUNTLETS_SILVER, 0x5B,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_GOLDEN_GAUNTLETS] =                    Item(RG_GOLDEN_GAUNTLETS,                 Text{ "Golden Gauntlets", "Gantelets d'or", "Goldhandschuhe" },                                                                      ITEMTYPE_ITEM,              GI_GAUNTLETS_GOLD,    true,  LOGIC_PROGRESSIVE_STRENGTH,         RHT_GOLDEN_GAUNTLETS,                  ITEM_GAUNTLETS_GOLD,                  OBJECT_GI_GLOVES,       GID_GAUNTLETS_GOLD,   0x5C,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_SILVER_SCALE] =                        Item(RG_SILVER_SCALE,                     Text{ "Silver Scale", "Écaille d'argent", "Silberne Schuppe" },                                                                      ITEMTYPE_ITEM,              GI_SCALE_SILVER,      true,  LOGIC_PROGRESSIVE_SCALE,            RHT_SILVER_SCALE,                      ITEM_SCALE_SILVER,                    OBJECT_GI_SCALE,        GID_SCALE_SILVER,     0xCD,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_GOLDEN_SCALE] =                        Item(RG_GOLDEN_SCALE,                     Text{ "Golden Scale", "Écaille d'or", "Goldene Schuppe" },                                                                           ITEMTYPE_ITEM,              GI_SCALE_GOLD,        true,  LOGIC_PROGRESSIVE_SCALE,            RHT_GOLDEN_SCALE,                      ITEM_SCALE_GOLDEN,                    OBJECT_GI_SCALE,        GID_SCALE_GOLDEN,     0xCE,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_ADULT_WALLET] =                        Item(RG_ADULT_WALLET,                     Text{ "Adult Wallet", "Grande Bourse", "Erwachsenengeldbörse" },                                                                     ITEMTYPE_ITEM,              GI_WALLET_ADULT,      true,  LOGIC_PROGRESSIVE_WALLET,           RHT_ADULT_WALLET,                      ITEM_WALLET_ADULT,                    OBJECT_GI_PURSE,        GID_WALLET_ADULT,     0x5E,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_GIANT_WALLET] =                        Item(RG_GIANT_WALLET,                     Text{ "Giant Wallet", "Bourse de Géant", "Riesige Geldbörse" },                                                                      ITEMTYPE_ITEM,              GI_WALLET_GIANT,      true,  LOGIC_PROGRESSIVE_WALLET,           RHT_GIANT_WALLET,                      ITEM_WALLET_GIANT,                    OBJECT_GI_PURSE,        GID_WALLET_GIANT,     0x5F,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_TYCOON_WALLET] =                       Item(RG_TYCOON_WALLET,                    Text{ "Tycoon Wallet", "Bourse de Magnat", "Goldene Geldbörse" },                                                                    ITEMTYPE_ITEM,              RG_TYCOON_WALLET,     true,  LOGIC_PROGRESSIVE_WALLET,           RHT_TYCOON_WALLET,                     RG_TYCOON_WALLET,                     OBJECT_GI_PURSE,        GID_WALLET_GIANT,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_CHILD_WALLET] =                        Item(RG_CHILD_WALLET,                     Text{ "Child Wallet", "Bourse d'Enfant", "Kindergeldbörse" },                                                                        ITEMTYPE_ITEM,              RG_CHILD_WALLET,      true,  LOGIC_PROGRESSIVE_WALLET,           RHT_CHILD_WALLET,                      RG_CHILD_WALLET,                      OBJECT_GI_PURSE,        GID_WALLET_ADULT,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_DEKU_NUT_CAPACITY_30] =                Item(RG_DEKU_NUT_CAPACITY_30,             Text{ "Deku Nut Capacity (30)", "Capacité de noix Mojo (30)", "Deku-Nuß-Kapazität (30)" },                                           ITEMTYPE_ITEM,              GI_NUT_UPGRADE_30,    true,  LOGIC_PROGRESSIVE_NUT_BAG,          RHT_DEKU_NUT_CAPACITY_30,              ITEM_NUT_UPGRADE_30,                  OBJECT_GI_NUTS,         GID_NUTS,             0xA7,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_DEKU_NUT_CAPACITY_40] =                Item(RG_DEKU_NUT_CAPACITY_40,             Text{ "Deku Nut Capacity (40)", "Capacité de noix Mojo (40)", "Deku-Nuß-Kapazität (40)" },                                           ITEMTYPE_ITEM,              GI_NUT_UPGRADE_40,    true,  LOGIC_PROGRESSIVE_NUT_BAG,          RHT_DEKU_NUT_CAPACITY_40,              ITEM_NUT_UPGRADE_40,                  OBJECT_GI_NUTS,         GID_NUTS,             0xA8,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_DEKU_STICK_CAPACITY_20] =              Item(RG_DEKU_STICK_CAPACITY_20,           Text{ "Deku Stick Capacity (20)", "Capacité de Bâtons Mojo (20)", "Deku-Stab-Kapazität (20)" },                                      ITEMTYPE_ITEM,              GI_STICK_UPGRADE_20,  true,  LOGIC_PROGRESSIVE_STICK_BAG,        RHT_DEKU_STICK_CAPACITY_20,            ITEM_STICK_UPGRADE_20,                OBJECT_GI_STICK,        GID_STICK,            0x90,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_DEKU_STICK_CAPACITY_30] =              Item(RG_DEKU_STICK_CAPACITY_30,           Text{ "Deku Stick Capacity (30)", "Capacité de Bâtons Mojo (30)", "Deku-Stab-Kapazität (30)" },                                      ITEMTYPE_ITEM,              GI_STICK_UPGRADE_30,  true,  LOGIC_PROGRESSIVE_STICK_BAG,        RHT_DEKU_STICK_CAPACITY_30,            ITEM_STICK_UPGRADE_30,                OBJECT_GI_STICK,        GID_STICK,            0x91,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_MAGIC_SINGLE] =                        Item(RG_MAGIC_SINGLE,                     Text{ "Magic Meter", "Jauge de Magie", "Magisches Maß" },                                                                            ITEMTYPE_ITEM,              0x8A,                 true,  LOGIC_PROGRESSIVE_MAGIC,            RHT_MAGIC_SINGLE,                      RG_MAGIC_SINGLE,                      OBJECT_GI_MAGICPOT,     GID_MAGIC_SMALL,      0xE4,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_MAGIC_DOUBLE] =                        Item(RG_MAGIC_DOUBLE,                     Text{ "Enhanced Magic Meter", "Jauge de Magie améliorée", "Verbessertes Magisches Maß" },                                            ITEMTYPE_ITEM,              0x8A,                 true,  LOGIC_PROGRESSIVE_MAGIC,            RHT_MAGIC_DOUBLE,                      RG_MAGIC_DOUBLE,                      OBJECT_GI_MAGICPOT,     GID_MAGIC_LARGE,      0xE8,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_TRIFORCE_PIECE] =                      Item(RG_TRIFORCE_PIECE,                   Text{ "Triforce Piece", "Triforce Piece", "Triforce-Fragment" },                                                                     ITEMTYPE_ITEM,              0xDF,                 true,  LOGIC_TRIFORCE_PIECES,              RHT_TRIFORCE_PIECE,                    RG_TRIFORCE_PIECE,                    OBJECT_GI_BOMB_2,       GID_TRIFORCE_PIECE,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
 
     // Init itemNameToEnum
     for (auto& item : itemTable) {
@@ -371,4 +371,4 @@ Item& Rando::StaticData::ItemFromGIID(const int giid) {
 
 std::array<Item, RG_MAX>& Rando::StaticData::GetItemTable() {
     return itemTable;
-}
\ No newline at end of file
+}
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index 01b3f49c9..e87e08229 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -111,7 +111,7 @@ static const char* englishRupeeNames[171] = {
 static const char* germanRupeeNames[41] = {
     "Rubine",     "Mäuse",       "Kröten",        "Münzen",     "Euro",       "Mark",     "Bananen",
     "Gummibären", "Bonbons",     "Diamanten",     "Bratwürste", "Bitcoin",    "Dogecoin", "Monde",
-    "Sterne",     "Brause UFOs", "Taler",         "Sternis",    "Schillinge", "Freunde",  "Seelen",
+    "Sterne",     "Brause UFOs", "Taler",         "Sternis",    "Schilling",  "Freunde",  "Seelen",
     "Gil",        "Zenny",       "Pfandflaschen", "Knochen",    "Pilze",      "Smaragde", "Kronkorken",
     "Pokédollar", "Brötchen",    "EXP",           "Wagenchips", "Moos",       "Knete",    "Kohle",
     "Kies",       "Radieschen",  "Diridari",      "Steine",     "Kartoffeln", "Penunze"
@@ -235,13 +235,13 @@ void Randomizer::LoadHintMessages() {
     // Bow Shooting Gallery reminder
     CustomMessageManager::Instance->CreateMessage(Randomizer::hintMessageTableID, TEXT_SHOOTING_GALLERY_MAN_COME_BACK_WITH_BOW,
         CustomMessage("Come back when you have your own&bow and you'll get a %rdifferent prize%w!",
-        "Komm wieder sobald du deinen eigenen&Bogen hast, um einen %rspeziellen Preis%w zu&erhalten!",
+        "Komm wieder sobald Du Deinen eigenen&Bogen hast, um einen %rspeziellen Preis%w zu&erhalten!",
         "J'aurai %rune autre récompense%w pour toi&lorsque tu auras ton propre arc."));
 
     // Warp Song Mysterious text
     CustomMessageManager::Instance->CreateMessage(Randomizer::hintMessageTableID, TEXT_WARP_MINUET_OF_FOREST,
         CustomMessage("Warp to&#a mysterious place?#&" + CustomMessages::TWO_WAY_CHOICE() + "#OK&No#",
-            "Zu&#ein mysteriöser Ort#?&" + CustomMessages::TWO_WAY_CHOICE() + "#OK&No#",
+            "Zu&#einem mysteriösen Ort#?&" + CustomMessages::TWO_WAY_CHOICE() + "#OK&No#",
             "Se téléporter vers&#un endroit mystérieux#?&" + CustomMessages::TWO_WAY_CHOICE() + "#OK!&Non#",
             {QM_RED, QM_GREEN}));
 
@@ -297,11 +297,11 @@ void Randomizer::LoadMerchantMessages() {
     // Prices have a chance of being 0, and the "sell" message below doesn't really make sense for a free item, so adding a "free" variation here
     CustomMessageManager::Instance->CreateMessage(Randomizer::merchantMessageTableID, TEXT_SCRUB_RANDOM_FREE,
         CustomMessage("\x12\x38\x82" "All right! You win! In return for&sparing me, I will give you a&%g[[item]]%w!&Please, take it!\x07\x10\xA3",
-            "\x12\x38\x82" "In Ordnung! Du gewinnst! Im Austausch&dafür, dass du mich verschont hast,&werde ich dir einen &%g[[item]]%w geben!\x07\x10\xA3",
+            "\x12\x38\x82" "In Ordnung! Du gewinnst! Im Austausch&dafür, dass Du mich verschont hast,&werde ich Dir einen &%g[[item]]%w geben!\x07\x10\xA3",
             "\x12\x38\x82" "J'me rends! Laisse-moi partir et en&échange, je te donne un &%g[[item]]%w! Vas-y prends le!\x07\x10\xA3"));
     CustomMessageManager::Instance->CreateMessage(Randomizer::merchantMessageTableID, TEXT_SCRUB_RANDOM,
         CustomMessage("\x12\x38\x82" "All right! You win! In return for&sparing me, I will sell you a&%g[[item]]%w!&%r[[price]] Rupees%w it is!\x07\x10\xA3",
-            "\x12\x38\x82" "Aufgeben! Ich verkaufe dir einen&%g[[item]]%w&für %r[[price]] Rubine%w!\x07\x10\xA3",
+            "\x12\x38\x82" "Ich gebe auf! Ich verkaufe Dir einen&%g[[item]]%w&für %r[[price]] Rubine%w!\x07\x10\xA3",
             "\x12\x38\x82" "J'abandonne! Tu veux bien m'acheter&un %g[[item]]%w?&Ça fera %r[[price]] Rubis%w!\x07\x10\xA3"));
 
     //Carpet Salesman
@@ -326,7 +326,7 @@ void Randomizer::LoadMerchantMessages() {
     CustomMessageManager::Instance->CreateMessage(
         Randomizer::merchantMessageTableID, TEXT_BEAN_SALESMAN_BUY_FOR_100,
         CustomMessage("I never thought I'd say this, but I'm &selling the last %rMagic Bean%w. %r99%w Rupees...\x1B&%gYes&No%w",
-                      "\x1B&%gJa&Nein%w",
+                      "Ich hätte nie gedacht, daß ich das&sage, aber ich verkaufe die letzte^%rWundererbse%w für %r99%w Rubine.&\x1B&%gJa&Nein%w",
                       "Je te vends mon dernier %rHaricot&magique%w pour %r99 Rubis%w.\x1B&%gAcheter&Ne pas acheter%w"));
 }
 
@@ -2480,7 +2480,7 @@ CustomMessage Randomizer::GetSheikMessage(s16 scene, u16 originalTextId) {
             } else if (!CHECK_DUNGEON_ITEM(DUNGEON_KEY_BOSS, SCENE_GANONS_TOWER)) {
                 messageEntry = CustomMessage(
                 "@, meet me at %gGanon's Castle%w once you obtain the %rkey to his lair%w.",
-                "@, wir treffen uns bei %gGanons Schloß%w, sobald Du den %rSchlüssel zu seinem Verließ%w hast.",
+                "@, wir treffen uns bei %gGanons Schloß%w, sobald Du den %rSchlüssel zu seinem Verlies%w hast.",
                 "Retrouve-moi au %gChâteau de Ganon%w une fois que tu auras obtenu la Mrclé de son repaire%w.");
             } else {
                 messageEntry = CustomMessage(
@@ -2497,13 +2497,14 @@ CustomMessage Randomizer::GetSheikMessage(s16 scene, u16 originalTextId) {
                 messageEntry = CustomMessage("You are still ill-equipped to face %rGanondorf%w."
                     "^Seek out the %cMaster Sword%w, %rsomething to hold your arrows%w, and %gmagic%w to summon the %ylight%w.",
                     "Du bist noch nicht gewappnet um Dich %rGanondorf%w stellen zu können.^"
-                    "Begib Dich auf die Suche nach dem %cMaster-Schwert%w, %retwas um deine Pfeilen einen Sinn zu geben%w,^sowie %gdie Magie%w, um das %yLicht%w herauf beschwören zu können.",
+                    "Begib Dich auf die Suche nach dem %cMaster-Schwert%w, %retwas um Deinen Pfeilen einen Sinn zu geben%w,^sowie %gdie Magie%w, um das %yLicht%w herauf beschwören zu können.",
                     "@, tu n'es toujours pas prêt à affronter %rGanondorf%w.^"
                     "Cherche l'%cÉpée de Légende%w, %rquelque chose pour ranger tes flèches%w et de la %gmagie%w pour invoquer la %ylumière%w.");
             } else if (!Flags_GetEventChkInf(EVENTCHKINF_DISPELLED_GANONS_TOWER_BARRIER) && !ctx->GetOption(RSK_TRIAL_COUNT).Is(0)){
                 messageEntry = CustomMessage(
-                    "You may have what you need to defeat %rthe Evil King%w, but the %cbarrier%w still stands.^Complete the remaining %gtrials%w to destroy it."
-                );
+                    "You may have what you need to defeat %rthe Evil King%w, but the %cbarrier%w still stands.^Complete the remaining %gtrials%w to destroy it.",
+                    "Du magst das haben, was Du brauchst um %rden bösen König%w zu besiegen, aber die %cBarriere%w steht noch.^Absolviere die verbleibenden %gPrüfungen%w um sie zu zerstören.",
+		    "");
             } else {
                 messageEntry = CustomMessage(
                     "If you're ready, then proceed.^Good luck.",
@@ -2520,7 +2521,7 @@ CustomMessage Randomizer::GetFishingPondOwnerMessage(u16 originalTextId) {
     auto ctx = Rando::Context::GetInstance();
     CustomMessage messageEntry = CustomMessage(
       "Sorry, but the pond is closed.&I've lost my good %rfishing pole%w...&Can't go fishing without it!",
-      "",
+      "Entschuldigung, aber der Teich ist zu.&Ich habe meine gute %rAngelrute%w verloren.&Ohne kann ich nicht fischen!",
       ""
     );
 
@@ -2532,7 +2533,7 @@ CustomMessage Randomizer::GetFishingPondOwnerMessage(u16 originalTextId) {
     if (originalTextId == TEXT_FISHING_POND_START_MET) {
         messageEntry = CustomMessage(
             "Hey, mister! I remember you!&It's been a long time!^",
-            "",
+            "Hallo, mein Herr! Ich erinnere mich an Sie!&Lang ist's her!",
             ""
         ) + messageEntry;
     }
@@ -2552,7 +2553,7 @@ CustomMessage Randomizer::GetMerchantMessage(RandomizerInf randomizerInf, u16 te
         if (randomizerInf >= RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_1 && randomizerInf <= RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_8) {
             shopItemName = {
                 "Mysterious Item",
-                "Mysteriösen Gegenstand",
+                "Mysteriöser Gegenstand",
                 "Objet Mystérieux"
             };
         } else {
@@ -2742,61 +2743,61 @@ void CreateNaviRandoMessages() {
     CustomMessage NaviMessages[NUM_NAVI_MESSAGES] = {
 
         { "%cMissing a small key in a dungeon?&Maybe the %rboss %chas it!",
-          "%cFehlt dir ein kleiner Schlüssel in &einem Labyrinth? Vielleicht hat ihn&ja der %rEndgegner%c!",
+          "%cFehlt Dir ein kleiner Schlüssel in &einem Labyrinth? Vielleicht hat ihn&ja der %rEndgegner%c!",
           "%cIl te manque une %wPetite Clé %cdans&un donjon? C'est peut-être le %rboss&%cqui l'a!" },
 
         { "%cSometimes you can use the %rMegaton&Hammer %cinstead of bombs!",
-          "%cManchmal kannst du den %rStahlhammer&%cstatt Bomben verwenden!",
+          "%cManchmal kannst Du den %rStahlhammer&%cstatt Bomben verwenden!",
           "%cParfois, tu peux utiliser la %rMasse&des Titans %cau lieu de tes bombes!" },
 
         { "%cThere are three %gbusiness scrubs %cin &Hyrule who sell %wmysterious items%c. Do&you know where they are?",
-          "%cEs gibt drei %gDeku-Händler %cin Hyrule&die mysteriöse Gegenstände&verkaufen. Weißt du wo Sie sind?",
+          "%cEs gibt drei %gDeku-Händler %cin Hyrule&die mysteriöse Gegenstände&verkaufen. Weißt Du wo sie sind?",
           "%cIl y a trois %gPestes Marchandes%c en&Hyrule qui vendent des %wobjets&mystérieux%c. Tu sais où elles "
           "sont?" },
 
         { "%cStuck on this seed? You could &throw in the towel and check the&%wspoiler log%c...",
-          "%cHängst du bei diesem Seed fest?&Du könntest die Flinte ins Korn&werfen und ins %wSpoiler Log %cschauen...",
+          "%cHängst Du bei diesem Seed fest?&Du könntest die Flinte ins Korn&werfen und ins %wSpoiler Log %cschauen...",
           "%cSi tu es coincé sur cette seed,&tu peux toujours jeter l'éponge&et regader le %wSpoiler log%c..." },
 
         { "%cDid you know that the %yHover&Boots %ccan be used to cross&%wquicksand%c?",
-          "%cWußtest du, daß du mit den&%yGleitstiefeln %cTreibsand %wüberqueren&kannst%c?",
+          "%cWußtest Du, daß Du mit den&%yGleitstiefeln %cTreibsand %wüberqueren&kannst%c?",
           "%cEst-ce que tu savais que les %rBottes&des airs %cpouvaient être utilisées&pour traverser les %wsables "
           "mouvants%c?" },
 
         { "%cYou can reach the back of %wImpa's&House %cby jumping from the&unfinished house with a %rcucco%c!",
-          "%cDu kannst den Balkon von %wImpas&Haus %cerreichen indem du von&der Baustelle aus mit einem "
+          "%cDu kannst den Balkon von %wImpas&Haus %cerreichen indem Du von&der Baustelle aus mit einem "
           "%rHuhn&%cspringst!",
           "%cTu peux atteindre l'arrière de la&%wMaison d'Impa %cen sautant depuis la&maison en construction avec "
           "une&%rcocotte%c!" },
 
         { "%cThe %ySpirit Trial %cin %pGanon's Castle&%chas a %whidden chest %csomewhere.&Did you already know that?",
-          "%cDie %yGeister-Prüfung %cin %pGanons&Schloß %chat irgendwo eine&%wversteckte Kiste%c. Weißt du schon&wo?",
+          "%cDie %yGeister-Prüfung %cin %pGanons&Schloß %chat irgendwo eine&%wversteckte Kiste%c. Weißt Du schon&wo?",
           "%cL'%yÉpreuve de l'Esprit%c dans le %pChâteau&de Ganon %ca un coffre caché quelque&part. Je suppose que tu "
           "le savais&déjà?" },
 
         { "%cYou know the %wBombchu Bowling&Alley%c? I heard %wonly two of the &prizes %care worthwhile. The rest &is "
           "junk!",
-          "%cKennst du die %wMinenbowlingbahn%c?&Ich habe gehört daß sich nur &%wzwei der Preise%c lohnen. Der "
+          "%cKennst Du die %wMinenbowlingbahn%c?&Ich habe gehört, daß sich nur &%wzwei der Preise%c lohnen. Der "
           "Rest&ist Krimskrams!",
           "%cEst-ce que tu savais qu'au %wBowling&Teigneux%c, il n'y a que les %wdeux&premiers prix %cqui sont "
           "intéréssant?" },
 
         { "%cHave you been using %wDeku Nuts&%cenough? I've seen them blow up&a %rBombchu%c!",
-          "%cBenutzt du auch genügend %wDeku&Nüsse%c? Ich habe mal gesehen daß&man damit %rKrabbelminen "
-          "%cdetonieren&kann!",
+          "%cBenutzt Du auch genügend %wDeku-Nüsse%c?&Ich habe mal gesehen, daß&man damit %rKrabbelminen "
+          "%cdetonieren&lassen kann!",
           "%cTu es sûr d'utiliser tes %wNoix Mojo &%ccorrectement? J'en ai déjà vu&exploser des %rChoux-Péteurs%c!" },
 
         { "%cYou might end up with an %wextra&key %cfor the %bWater Temple %cor the&%rFire Temple%c. It's for your "
           "safety!",
-          "%cVielleicht verbleibt dir im&%bWassertempel %coder %rFeuertempel %cein&%wzusätzlicher Schlüssel%c. "
-          "Dies&ist zu deiner Sicherheit!",
+          "%cVielleicht verbleibt Dir im&%bWassertempel %coder %rFeuertempel %cein&%wzusätzlicher Schlüssel%c. "
+          "Dies&ist zu Deiner Sicherheit!",
           "%cIl se peut que tu aies une %wPetite&Clé %cen trop dans le %bTemple de l'Eau&%cou le %rTemple du Feu%c. "
           "C'est pour ta&propre sécurité!" },
 
         { "%cIf you can't pick up a %rbomb&flower %cwith your hands, you can&still detonate it with %rfire %cor&with "
           "%warrows%c!",
-          "%cNur weil du eine %rDonnerblume&%cnicht hochheben kannst, so kannst&du sie immernoch mit %rFeuer "
-          "%coder&%wPfeilen %cdetonieren!",
+          "%cNur weil Du eine %rDonnerblume&%cnicht hochheben kannst, so kannst&Du sie noch immer mit %rFeuer "
+          "%coder&%wPfeilen %cdetonieren lassen!",
           "%cSi tu ne peux pas ramasser&un %rChoux-Péteur %cavec tes mains, tu&peux toujours le faire exploser&avec du "
           "%rFeu %cou avec des %wflèches%c!" },
 
@@ -2805,43 +2806,43 @@ void CreateNaviRandoMessages() {
           "%cMême un adulte ne peut pas pousser&de grands blocs sans un petit %wgain&de force%c!" },
 
         { "%cI've heard that %rFlare Dancer&%cis weak to the %wMaster Sword%c!&Have you tried it?",
-          "%cIch habe gehört daß der&%rFlammenderwisch %ceine Schwäche für&das %wMasterschwert %caufweist. Hast du&es "
-          "schonmal versucht einzusetzen?",
+          "%cIch habe gehört, daß der&%rFlammenderwisch %ceine Schwäche für&das %wMaster-Schwert %caufweist. Hast Du&es "
+          "schon einmal versucht einzusetzen?",
           "%cJ'ai entendu dire que les %rDanse-&Flammes %csont faîbles face à l'%wÉpée de&Légende%c! Est-ce que tu as "
           "essayé?" },
 
         { "%cDon't have a weapon to kill a&%rspider%c? Try throwing a %wpot&%cat it!",
-          "%cFehlt dir die Waffe um gegen&eine %rSkulltula %czu kämpfen? Versuch&Sie mit einem %wKrug %cabzuwerfen!",
+          "%cFehlt Dir die Waffe um gegen&eine %rSkulltula %czu kämpfen? Versuche&sie mit einem %wKrug %cabzuwerfen!",
           "%cSi tu n'as pas d'arme pour tuer&une %raraignée%c, pourquoi n'essayerais&-tu pas de lui jetter une "
           "%wjarre&%cà la figure?" },
 
         { "%cI hear the patch of %wsoft soil&%cin %bZora's River %cis the only one&that isn't home to a %rspider%c!",
-          "%cIch habe gehört daß die Stelle&%wfeuchten Bodens %cim %bZora-Fluß %cals&einzige keine %rSkulltula "
+          "%cIch habe gehört, daß die Stelle&%wfeuchten Bodens %cim %bZora-Fluß %cals&einzige keine %rSkulltula "
           "%cbeherbergt.",
           "%cJ'ai entendu dire que la %wterre meuble&%cqui se trouve à la %bRivière Zora %cest&la seule qui ne "
           "contienne pas&d'%raraignée%c." },
 
         { "%cThe people of Hyrule sometimes&have %witems %cfor you, but they won't&like it if you're %wwearing a "
           "mask%c!",
-          "%cDie Bewohner Hyrules haben manchmal&%wGegenstände %cfür dich, aber Sie mögen&es nicht wenn du %wMasken "
+          "%cDie Bewohner Hyrules haben manchmal&%wGegenstände %cfür Dich, aber sie mögen&es nicht, wenn Du %wMasken "
           "trägst%c!",
           "%cIl se peut que les habitants d'Hyrule&aient des %wobjets %cpour toi. Par contre,&ils risquent de ne pas "
           "trop apprécier&le fait que tu %wportes un masque%c!" },
 
         { "%cIf you get trapped somewhere, you&might have to %wsave your game %cand&%wreset%c!",
-          "%cSolltest du irgendwo eingeschloßen&sein, mußt du vielleicht dein %wSpiel&speichern %cund %wneustarten%c!",
+          "%cSolltest Du irgendwo eingeschlossen&sein, mußt Du vielleicht Dein %wSpiel&speichern %cund %wneu starten%c!",
           "%cSi tu es coincé quelque part, tu&devrais %wsauvegarder ta partie %cet&faire un %wreset%c!" },
 
         { "%cSheik will meet you in a %rburning&village %conce you have %gForest%c,&%rFire%c, and %bWater "
           "%cMedallions!",
-          "%cShiek wird dich in einem %rbrennenden&Dorf %ctreffen sobald du das Amulett&des %gWaldes%c, %rFeuers %cund "
+          "%cShiek wird Dich in einem %rbrennenden&Dorf %ctreffen, sobald Du das Amulett&des %gWaldes%c, %rFeuers %cund "
           "%bWassers&%cbesitzt.",
           "%cSheik t'attendra dans un %rvillage&en feu %clorsque tu auras récupéré&les médaillons de la %gForêt%c, du "
           "%rFeu&%cet de l'%bEau%c!" },
 
         { "%cIf you don't have a %wsword %cas a&child, try buying %wDeku Sticks%c!&They're effective against your "
           "foes!",
-          "%cSolltest du als Kind kein %wSchwert&%cbesitzen, empfehle ich %wDeku Stäbe&%czu kaufen! Diese sind "
+          "%cSolltest Du als Kind kein %wSchwert&%cbesitzen, empfehle ich %wDeku-Stäbe&%czu kaufen! Diese sind "
           "effektiv gegen&Widersacher!",
           "%cSi tu n'as pas d'%wépée %cen tant&qu'enfant, pourquoi n'irais-tu pas&acheter quelques %wBâtons Mojo%c? "
           "Ils&sont efficaces contre tes ennemis!" }
@@ -2865,7 +2866,7 @@ void CreateIceTrapRandoMessages() {
 
         { "You just got %bPUNKED%w!", "Du wurdest %beiskalt%w erwischt!", "Ça me %bglace%w le sang!" },
 
-        { "Stay %bfrosty%w, @.", "Es läuft dir %beiskalt%w den Rücken&hinunter, @.", "%bReste au frais%w, @." },
+        { "Stay %bfrosty%w, @.", "Es läuft Dir %beiskalt%w den Rücken&hinunter, @.", "%bReste au frais%w, @." },
 
         { "Take a %bchill pill%w, @.", "Bleib %bcool%w, @.", "Et c'est la douche %bfroide%w!" },
 
@@ -2879,7 +2880,7 @@ void CreateIceTrapRandoMessages() {
         { "It's a %bcold day%w in the Evil Realm.", "Es ist ein %kalter%w Tag im Herzen&von Hyrule.",
           "Est-ce que tu as déjà eu des sueurs&%bfroides%w?" },
 
-        { "Getting %bcold feet%w?", "Bekommst du etwa %bkalte%w Füße?",
+        { "Getting %bcold feet%w?", "Bekommst Du etwa %bkalte%w Füße?",
           "La vengeance est un plat qui se mange&%bfroid%w!" },
 
         { "Say hello to the %bZoras%w for me!", "Sag den %bZoras%w viele Grüße von mir!",
@@ -2898,7 +2899,7 @@ void CreateIceTrapRandoMessages() {
         { "%bCold pun%w.", "%bEiskalt%w lässt du meine Seele&erfrier'n.",
           "Balance man...,&Cadence man...,&Trace la %bglace%w...,&c'est le Cooooolllll Rasta!" },
 
-        { "The %bTitanic%w would be scared of you,&@.", "Die %bTitanic%w hätte Angst vor dir,&@.",
+        { "The %bTitanic%w would be scared of you,&@.", "Die %bTitanic%w hätte Angst vor Dir,&@.",
           "Le %bTitanic%w aurait peur de toi,&@." },
 
         { "Oh no!", "Oh nein!", "Oh non!" },
@@ -2915,7 +2916,7 @@ void CreateIceTrapRandoMessages() {
           "Never gonna %bgive you up%w. Never&gonna %blet you down%w. Never gonna&run around and %bdesert you%w." },
 
         { "Thank you %b@%w!&But your item is in another castle!",
-          "Danke %b@%w!&Aber der Gegenstand ist in&einem anderem Schloss!",
+          "Danke %b@%w!&Aber der Gegenstand ist in&einem anderem Schloß!",
           "Merci %b@%w!&Mais ton objet est dans un autre&château!" },
 
         { "%bFREEZE%w! Don't move!", "	Kalt. Kalt. Kälter. %bEISKALT%w!",
@@ -2943,7 +2944,7 @@ void CreateFireTempleGoronMessages() {
     CustomMessage FireTempleGoronMessages[NUM_GORON_MESSAGES] = {
         {
             "Are you the one they call %g@%w?^You look really weird for %rDarunia's kid.%w&Are you adopted?",
-            "Du bist also der, den sie @ nennen?^Du siehst nicht aus als wärst du&%rDarunias Kind.%w Bist du "
+            "Du bist also der, den sie @ nennen?^Du siehst nicht aus als wärst Du&%rDarunias Kind.%w Bist Du "
             "adoptiert?",
             "C'est toi qu'on appelle %g@%w?^Tu es vraiment bizarre pour être&le %rfils du Chef%w. Tu as été adopté?",
         },
@@ -2951,14 +2952,14 @@ void CreateFireTempleGoronMessages() {
             "Thank Hylia! I was so worried about&when my teacher would let me get&out of detention.^I gotta go home "
             "and see my parents.",
             "Ich wollte nur dieses Ding hier wieder&in seine Truhe zurücklegen, weil...^...gehört mir ja eigentlich "
-            "nicht,&weißt du?^Doch dann ging plötzlich dieses&Tor hinter mir zu.&Danke für die Rettung.",
+            "nicht,&weißt Du?^Doch dann ging plötzlich dieses&Tor hinter mir zu.&Danke für die Rettung.",
             "Par les déesses!&Mon Frère?!&C'est bien toi?&Comment ça on ne se connaît pas?^Tu trouves vraiment que "
             "je&ressemble à n'importe quel Goron?",
         },
         {
             "How long has it been, do you know?^%r[[days]]%w days!?^Oh no, and it's %r\x1F%w?&I have to check on my "
             "cake!!",
-            "Weißt du zufällig, wie viele Tage&vergangen sind?^%r[[days]]%w Tage!?^Oh je, und es ist %r\x1F%w Uhr? "
+            "Weißt Du zufällig, wie viele Tage&vergangen sind?^%r[[days]]%w Tage!?^Oh je, und es ist %r\x1F%w Uhr? "
             "Ich&muss dringend nach meinem Kuchen&sehen!!!",
             "Cela fait combien de temps que&je suis enfermé ici?&Non mais je ne vais pas crier.^COMBIEN?! %r[[days]]%w "
             "JOURS!?^En plus il est %r\x1F%w...&Il faut vraiment que je rentre...",
@@ -2983,8 +2984,8 @@ void CreateFireTempleGoronMessages() {
         },
         { "Do you know about %b\x9f%w?&It's this weird symbol that's been&in my dreams lately...^Apparently, you "
           "pressed it %b[[a_btn]]%w times.^Wow.",
-          "Weißt du über %b\x9f%w bescheid?&Es sind Symbole, die mir&in letzter Zeit öfter in&meinen Träumen "
-          "erschienen sind...^Es scheint, dass du sie schon&%b[[a_btn]]%w mal betätigt hast.^Faszinierend...",
+          "Weißt Du über %b\x9f%w Bescheid?&Es sind Symbole, die mir&in letzter Zeit öfter in&meinen Träumen "
+          "erschienen sind...^Es scheint, dass Du sie schon&%b[[a_btn]]%w mal betätigt hast.^Faszinierend...",
           "Tu as déjà entendu parler du&symbole %b\x9f%w?&C'est un symbole bizarre qui est&apparu dans mes rêves "
           "dernièrement...^Apparemment, tu as appuyé dessus&%b[[a_btn]]%w fois.^Wow..." },
         {
@@ -2992,8 +2993,8 @@ void CreateFireTempleGoronMessages() {
             "Boy, you must be hot!&Get yourself a bottle of&%rLon Lon Milk%w right away and cool&down, for only %g30%w "
             "rupees!",
             "\x13\x1A"
-            "Hey, ist dir nicht zu warm?&Besorg dir doch eine Flasche&%rLon Lon-Milch%w, um dich&abzukühlen.^Kostet "
-            "dich auch nur %g30%w Rubine!",
+            "Hey, ist Dir nicht zu warm?&Besorge Dir doch eine Flasche&%rLon Lon-Milch%w, um Dich&abzukühlen.^Kostet "
+            "Dich auch nur %g30%w Rubine!",
             "\x13\x1A"
             "Woah! Tu dois avoir chaud!&Tu savais que tu pouvais acheter&du %rLait de Lon Lon%w pour&seulement %g30 "
             "rubis%w?^Il n'y a rien de mieux pour s'hydrater!",
@@ -3001,7 +3002,7 @@ void CreateFireTempleGoronMessages() {
         {
             "In that case, I'll help you out!^They say that %rthe thing you're&looking for%w can only be found%g "
             "when&you're not looking for it.%w^Hope that helps!",
-            "Pass auf, ich geb dir einen Tipp!^Man sagt, man findet %rdas was&man sucht%w nur, und wirklich nur&dann, "
+            "Pass auf, ich gebe Dir einen Tipp!^Man sagt, man findet %rdas was&man sucht%w nur, und wirklich nur&dann, "
             "%gwenn man gerade nicht danach&sucht%w.^Du kannst mich jederzeit wieder für&mehr hilfreiche Tipps "
             "aufsuchen!",
             "Dans ce cas, je vais t'aider!&On dit que l'objet que tu cherches&ne peut être trouvé que lorsque&tu ne le "
@@ -3038,7 +3039,7 @@ void Randomizer::CreateCustomMessages() {
             "Félicitation! Vous avez trouvé %gGreg%w!"),
         GIMESSAGE(RG_MASTER_SWORD, ITEM_SWORD_MASTER, 
             "You found the %gMaster Sword%w!",
-            "Du erhältst dem %gMaster-Schwert%w!",
+            "Du erhältst das %gMaster-Schwert%w!",
             "Vous obtenez %gl'Épée de Légende%w!"),
         GIMESSAGE(RG_BOTTLE_WITH_BLUE_FIRE, ITEM_BLUE_FIRE, 
 			"You got a %rBottle with Blue &Fire%w! Use it to melt Red Ice!",
@@ -3050,7 +3051,7 @@ void Randomizer::CreateCustomMessages() {
 			"Vous obtenez une %rBouteille avec&une Âme%w! Vendez-la au Marchand&d'Âme"),
         GIMESSAGE(RG_BOTTLE_WITH_BLUE_POTION, ITEM_POTION_BLUE,
 			"You got a %rBottle of Blue Potion%w!&Drink it to replenish your&%ghealth%w and %bmagic%w!",
-			"Du erhältst ein %rBlaues Elexier%w!&Nutze es, um deine %rMagie- und&Energieleiste%w komplett&aufzufüllen!",
+			"Du erhältst ein %rBlaues Elixier%w!&Nutze es, um Deine %rMagie- und&Energieleiste%w komplett&aufzufüllen!",
 			"Vous obtenez une %rBouteille avec&une Potion Bleue%w! Buvez-la pour&restaurer votre %rénergie vitale%w&ainsi que votre %gmagie%w!"),
         GIMESSAGE(RG_BOTTLE_WITH_FISH, ITEM_FISH,
             "You got a %rFish in a Bottle%w!&It looks fresh and delicious!&They say Jabu-Jabu loves them!",
@@ -3066,11 +3067,11 @@ void Randomizer::CreateCustomMessages() {
 			"Vous obtenez une %rBouteille avec&une Fée%w! Faites-en bon usage!"),
         GIMESSAGE(RG_BOTTLE_WITH_RED_POTION, ITEM_POTION_RED,
             "You got a %rBottle of Red Potion%w!&Drink it to replenish your&%ghealth%w!",
-			"Du erhältst ein %rRotes Elexier%w!&Nutze es, um deine %rEnergieleiste&%weinmalig komplett aufzufüllen!",
+			"Du erhältst ein %rRotes Elixier%w!&Nutze es, um Deine %rEnergieleiste&%weinmalig komplett aufzufüllen!",
             "Vous obtenez une %rBouteille avec&une Potion Rouge%w! Buvez-la pour&restaurer votre %rénergie vitale%w!"),
         GIMESSAGE(RG_BOTTLE_WITH_GREEN_POTION, ITEM_POTION_GREEN,
             "You got a %rBottle of Green Potion%w!&Drink it to replenish your&%bmagic%w!",
-			"Du erhältst ein %rGrünes Elexier%w!&Nutze es, um deine %bMagieleiste&%weinmalig komplett aufzufüllen!",
+			"Du erhältst ein %rGrünes Elixier%w!&Nutze es, um Deine %bMagieleiste&%weinmalig komplett aufzufüllen!",
             "Vous obtenez une %rBouteille avec&une Potion Verte%w! Buvez-la pour&restaurer votre %gmagie%w!"),
         GIMESSAGE(RG_BOTTLE_WITH_POE, ITEM_POE,
             "You got a %rPoe in a Bottle%w!&That creepy Ghost Shop might&be interested in this...",
@@ -3107,11 +3108,11 @@ void Randomizer::CreateCustomMessages() {
 			"Vous obtenez une %rPetite Clé %w&du %pPuits%w!"),
         GIMESSAGE(RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, ITEM_KEY_SMALL,
 			"You found a %yGerudo Training &Grounds %wSmall Key!",
-			"Du erhältst einen %rKleinen&Schlüssel%w für die %yGerudo&Trainingsarena%w!",
+			"Du erhältst einen %rKleinen&Schlüssel%w für die %yGerudo-Trainingsarena%w!",
 			"Vous obtenez une %rPetite Clé %w&du %yGymnase Gerudo%w!"),
         GIMESSAGE(RG_GANONS_CASTLE_SMALL_KEY, ITEM_KEY_SMALL,
 			"You found a %rGanon's Castle &%wSmall Key!",
-			"Du erhältst einen %rKleinen&Schlüssel%w für die %rGanons Schloß%w!",
+			"Du erhältst einen %rKleinen&Schlüssel%w für %rGanons Schloß%w!",
 			"Vous obtenez une %rPetite Clé %w&du %rChâteau de Ganon%w!"),
 
         GIMESSAGE(RG_GERUDO_FORTRESS_KEY_RING, ITEM_KEY_SMALL,
@@ -3144,7 +3145,7 @@ void Randomizer::CreateCustomMessages() {
 			"Vous obtenez un trousseau de&clés du %pPuits%w!"),
         GIMESSAGE(RG_GERUDO_TRAINING_GROUNDS_KEY_RING, ITEM_KEY_SMALL,
 			"You found a %yGerudo Training &Grounds %wKeyring!",
-			"Du erhältst ein %rSchlüsselbund%w&für die %yGerudo Trainingsarena%w!",
+			"Du erhältst ein %rSchlüsselbund%w&für die %yGerudo-Trainingsarena%w!",
 			"Vous obtenez un trousseau de&clés du %yGymnase Gerudo%w!"),
         GIMESSAGE(RG_GANONS_CASTLE_KEY_RING, ITEM_KEY_SMALL, 
 			"You found a %rGanon's Castle &%wKeyring!",
@@ -3264,12 +3265,12 @@ void Randomizer::CreateCustomMessages() {
 			"Vous obtenez un %rPaquet de&Haricots Magiques%w! Trouvez&un endroit approprié pour un&jardin et plantez-les.^Attendez ensuite que quelque&chose d'amusant se produise!"),
         GIMESSAGE(RG_TYCOON_WALLET, ITEM_WALLET_GIANT,
 			"You got a %rTycoon's Wallet%w!&It's gigantic! Now you can carry&up to %y999 rupees%w!",
-			"Du erhältst die %rGoldene&Geldbörse%w! Die größte aller&Geldbörsen! Jetzt kannst Du bis&zu %y999 Rubine%w mit dir führen!",
+			"Du erhältst die %rGoldene&Geldbörse%w! Die größte aller&Geldbörsen! Jetzt kannst Du bis&zu %y999 Rubine%w mit Dir führen!",
 			"Vous obtenez la %rBourse de Magnat%w!&Elle peut contenir jusqu'à %y999 rubis%w!&C'est gigantesque!"),
         GIMESSAGE(RG_CHILD_WALLET, ITEM_WALLET_ADULT,
 			"You got a %rChild's Wallet%w!&Now you can carry&up to %y99 rupees%w!",
-			"Du erhältst die %rGoldene&Geldbörse%w! Jetzt kannst Du bis&zu %y99 Rubine%w mit dir führen!",//FIXME: still says tycoon
-			"Vous obtenez la %rBourse de Magnat%w!&Elle peut contenir jusqu'à %y99 rubis%w!"),//FIXME: still says tycoon
+			"Du erhältst die %rKindergeldbörse%w!&Jetzt kannst Du bis&zu %y99 Rubine%w mit Dir führen!",
+			"Vous obtenez la %rBourse d'Enfant%w!&Elle peut contenir jusqu'à %y99 rubis%w!"),
 
         GIMESSAGE_UNTRANSLATED(RG_GOHMA_SOUL, ITEM_BIG_POE, "You found the soul for %gGohma%w!"),
         GIMESSAGE_UNTRANSLATED(RG_KING_DODONGO_SOUL, ITEM_BIG_POE, "You found the soul for %rKing&Dodongo%w!"),
diff --git a/soh/soh/z_message_OTR.cpp b/soh/soh/z_message_OTR.cpp
index 2d281d7a8..addfc703a 100644
--- a/soh/soh/z_message_OTR.cpp
+++ b/soh/soh/z_message_OTR.cpp
@@ -153,7 +153,7 @@ extern "C" void OTRMessage_Init()
             TEXTBOX_TYPE_BLUE));
     CustomMessageManager::Instance->CreateMessage(
         customMessageTableID, TEXT_BUY_BOMBCHU_10_DESC,
-        CustomMessage("\x08%rBombchu  (10 pieces)  99 Rupees&%wThis looks like a toy mouse, but&it's actually a "
+        CustomMessage("\x08%rBombchu  10 pieces  99 Rupees&%wThis looks like a toy mouse, but&it's actually a "
                       "self-propelled time&bomb!\x09\x0A",
                       "\x08%rKrabbelmine  10 Stück  99 Rubine&%wDas ist eine praktische Zeitbombe,&die Du als "
                       "Distanzwaffe&einsetzen kannst!\x09\x0A",
@@ -174,17 +174,17 @@ extern "C" void OTRMessage_Init()
     CustomMessageManager::Instance->CreateGetItemMessage(
         customMessageTableID, (GetItemID)TEXT_HEART_PIECE, ITEM_HEART_PIECE,
         CustomMessage("You got a %rHeart Piece%w!&You've collected %r[[heartPieceCount]]%w pieces&in total!",
-                      "Ein %rHerzteil%w!&Du hast nun insgesamt %r[[heartPieceCount]]%w&Herteile gesammelt!",
+                      "Ein %rHerzteil%w!&Du hast nun insgesamt %r[[heartPieceCount]]%w&Herzteile gesammelt!",
                       "Vous obtenez un %rQuart de&Coeur%w! Vous en avez collecté&%r[[heartPieceCount]]%w en tout!",
                       TEXTBOX_TYPE_BLUE));
     CustomMessageManager::Instance->CreateMessage(
         customMessageTableID, TEXT_MARKET_GUARD_NIGHT,
         CustomMessage("You look bored. Wanna go out for a&walk?\x1B&%gYes&No%w",
-                      "Du siehst gelangweilt aus.&Willst du einen Spaziergang machen?\x1B&%gJa&Nein%w",
+                      "Du siehst gelangweilt aus.&Willst Du einen Spaziergang machen?\x1B&%gJa&Nein%w",
                       "Tu as l'air de t'ennuyer. Tu veux&aller faire un tour?\x1B&%gOui&Non%w"));
     CustomMessageManager::Instance->CreateMessage(
         customMessageTableID, TEXT_FISHERMAN_LEAVE,
         CustomMessage("Hey! Hey!&You can't take the rod out of here!&I'm serious!^Do you want to quit?&\x1B&%gYes&No%w",
-                      "Hey! Hey!&Du kannst die Angel doch nicht&einfach mitnehmen!&Ganz im Ernst!^Möchtest du aufhören?&\x1B&%gJa&Nein%w", //TODO Used AI translation as placeholder
+                      "Hey! Hey!&Du kannst die Angel doch nicht&einfach mitnehmen!&Ganz im Ernst!^Möchtest Du aufhören?&\x1B&%gJa&Nein%w",
                       "Holà! Holà!&Les cannes ne sortent pas d'ici!&Je suis sérieux!^Voulez-vous arrêter?&\x1B&%gOui&Non%w")); //TODO Used AI translation as placeholder
 }

From bfba2a180ad4ab3d215982889a2dbc141c0017e0 Mon Sep 17 00:00:00 2001
From: Malkierian <malkierian@gmail.com>
Date: Wed, 14 Aug 2024 22:27:32 -0700
Subject: [PATCH 180/230] Fix tricks menu (#4278)

* Fix tricks not getting disabled by button click.

* Fix area trees not collapsing on enabled side of tricks list.

* Fix difficulty tag button order for Linux.

* Fix Collapse All, Open All, and Disable All.
Prevent Disable All from disabling all despite areas being collapsed.
---
 .../Enhancements/randomizer/randomizer.cpp    | 57 ++++++++-----------
 soh/soh/Enhancements/randomizer/tricks.cpp    |  2 +-
 soh/soh/Enhancements/randomizer/tricks.h      |  3 +-
 3 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index e87e08229..c25aca93a 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -2169,7 +2169,7 @@ void RandomizerSettingsWindow::DrawElement() {
                 {RA_GANONS_CASTLE, true}
             };
 
-            static std::unordered_map<Rando::Tricks::Tag, bool> showTag {
+            static std::map<Rando::Tricks::Tag, bool> showTag {
                 {Rando::Tricks::Tag::NOVICE,true},
                 {Rando::Tricks::Tag::INTERMEDIATE,true},
                 {Rando::Tricks::Tag::ADVANCED,true},
@@ -2236,22 +2236,14 @@ void RandomizerSettingsWindow::DrawElement() {
                     window->DC.CurrLineTextBaseOffset = 0.0f;
                     
                     if (ImGui::Button("Collapse All##disabled")) {
-                        for (int i = 0; i < RT_MAX; i++) {
-                            auto option = mSettings->GetTrickOption(static_cast<RandomizerTrick>(i));
-                            if (!option.IsHidden() && !enabledTricks.count(static_cast<RandomizerTrick>(i)) &&
-                                !option.IsGlitch()) {
-                                areaTreeDisabled[option.GetArea()] = false;
-                            }
+                        for (int i = 0; i < RA_MAX; i++) {
+                            areaTreeDisabled[static_cast<RandomizerArea>(i)] = false;
                         }
                     }
                     ImGui::SameLine();
                     if (ImGui::Button("Open All##disabled")) {
-                        for (int i = 0; i < RT_MAX; i++) {
-                            auto option = mSettings->GetTrickOption(static_cast<RandomizerTrick>(i));
-                            if (option.IsHidden() && !enabledTricks.count(static_cast<RandomizerTrick>(i)) &&
-                                !option.IsGlitch()) {
-                                areaTreeDisabled[option.GetArea()] = false;
-                            }
+                        for (int i = 0; i < RA_MAX; i++) {
+                            areaTreeDisabled[static_cast<RandomizerArea>(i)] = true;
                         }
                     }
                     ImGui::SameLine();
@@ -2288,15 +2280,15 @@ void RandomizerSettingsWindow::DrawElement() {
                             }
                         }
                         if (hasTricks) {
-                            ImGui::TreeNodeSetOpen(ImGui::GetID(Rando::Tricks::GetRTAreaName(area).c_str()), areaTreeDisabled[area]);
+                            ImGui::TreeNodeSetOpen(ImGui::GetID((Rando::Tricks::GetRTAreaName(area) + "##disabled").c_str()), areaTreeDisabled[area]);
                             ImGui::SetNextItemOpen(true, ImGuiCond_Once);
-                            if (ImGui::TreeNode(Rando::Tricks::GetRTAreaName(area).c_str())) {
+                            if (ImGui::TreeNode((Rando::Tricks::GetRTAreaName(area) + "##disabled").c_str())) {
                                 for (auto rt : trickIds) {
                                     auto option = mSettings->GetTrickOption(rt);
                                     if (!option.IsHidden() && trickSearch.PassFilter(option.GetName().c_str()) &&
                                         !enabledTricks.count(rt) && Rando::Tricks::CheckRTTags(showTag, option.GetTags()) &&
                                         !option.IsGlitch()) {
-                                        ImGui::TreeNodeSetOpen(ImGui::GetID(Rando::Tricks::GetRTAreaName(option.GetArea()).c_str()), areaTreeDisabled[option.GetArea()]);
+                                        ImGui::TreeNodeSetOpen(ImGui::GetID((Rando::Tricks::GetRTAreaName(option.GetArea()) + "##disabled").c_str()), areaTreeDisabled[option.GetArea()]);
                                         ImGui::SetNextItemOpen(true, ImGuiCond_Once);
                                         if (ImGui::ArrowButton(std::to_string(rt).c_str(), ImGuiDir_Right)) {
                                             enabledTricks.insert(rt);
@@ -2329,23 +2321,16 @@ void RandomizerSettingsWindow::DrawElement() {
                     ImGui::TableNextColumn();
                     window->DC.CurrLineTextBaseOffset = 0.0f;
 
+
                     if (ImGui::Button("Collapse All##enabled")) {
-                        for (int i = 0; i < RT_MAX; i++) {
-                            auto option = mSettings->GetTrickOption(static_cast<RandomizerTrick>(i));
-                            if (!option.IsHidden() && enabledTricks.count(static_cast<RandomizerTrick>(i)) &&
-                                !option.IsGlitch()) {
-                                areaTreeDisabled[option.GetArea()] = false;
-                            }
+                        for (int i = 0; i < RA_MAX; i++) {
+                            areaTreeEnabled[static_cast<RandomizerArea>(i)] = false;
                         }
                     }
                     ImGui::SameLine();
                     if (ImGui::Button("Open All##enabled")) {
-                        for (int i = 0; i < RT_MAX; i++) {
-                            auto option = mSettings->GetTrickOption(static_cast<RandomizerTrick>(i));
-                            if (option.IsHidden() && enabledTricks.count(static_cast<RandomizerTrick>(i)) &&
-                                !option.IsGlitch()) {
-                                areaTreeDisabled[option.GetArea()] = false;
-                            }
+                        for (int i = 0; i < RA_MAX; i++) {
+                            areaTreeEnabled[static_cast<RandomizerArea>(i)] = true;
                         }
                     }
                     ImGui::SameLine();
@@ -2356,7 +2341,7 @@ void RandomizerSettingsWindow::DrawElement() {
                                 trickSearch.PassFilter(option.GetName().c_str()) &&
                                 areaTreeEnabled[option.GetArea()] &&
                                 Rando::Tricks::CheckRTTags(showTag, option.GetTags())) {
-                                enabledTricks.insert(static_cast<RandomizerTrick>(i));
+                                enabledTricks.erase(static_cast<RandomizerTrick>(i));
                             }
                         }
                         std::string enabledTrickString = "";
@@ -2364,7 +2349,11 @@ void RandomizerSettingsWindow::DrawElement() {
                             enabledTrickString += std::to_string(enabledTrickIt);
                             enabledTrickString += ",";
                         }
-                        CVarClear(CVAR_RANDOMIZER_SETTING("EnabledTricks"));
+                        if (enabledTricks.size() == 0) {
+                            CVarClear(CVAR_RANDOMIZER_SETTING("EnabledTricks"));
+                        } else {
+                            CVarSetString(CVAR_RANDOMIZER_SETTING("EnabledTricks"), enabledTrickString.c_str());
+                        }
                         Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
                     }
                     
@@ -2382,18 +2371,18 @@ void RandomizerSettingsWindow::DrawElement() {
                             }
                         }
                         if (hasTricks) {
-                            ImGui::TreeNodeSetOpen(ImGui::GetID(Rando::Tricks::GetRTAreaName(area).c_str()), areaTreeDisabled[area]);
+                            ImGui::TreeNodeSetOpen(ImGui::GetID((Rando::Tricks::GetRTAreaName(area) + "##enabled").c_str()), areaTreeEnabled[area]);
                             ImGui::SetNextItemOpen(true, ImGuiCond_Once);
-                            if (ImGui::TreeNode(Rando::Tricks::GetRTAreaName(area).c_str())) {
+                            if (ImGui::TreeNode((Rando::Tricks::GetRTAreaName(area) + "##enabled").c_str())) {
                                 for (auto rt : trickIds) {
                                     auto option = mSettings->GetTrickOption(rt);
                                     if (!option.IsHidden() && trickSearch.PassFilter(option.GetName().c_str()) &&
                                         enabledTricks.count(rt) && Rando::Tricks::CheckRTTags(showTag, option.GetTags()) &&
                                         !option.IsGlitch()) {
-                                        ImGui::TreeNodeSetOpen(ImGui::GetID(Rando::Tricks::GetRTAreaName(option.GetArea()).c_str()), areaTreeDisabled[option.GetArea()]);
+                                        ImGui::TreeNodeSetOpen(ImGui::GetID((Rando::Tricks::GetRTAreaName(option.GetArea()) + "##enabled").c_str()), areaTreeEnabled[option.GetArea()]);
                                         ImGui::SetNextItemOpen(true, ImGuiCond_Once);
                                         if (ImGui::ArrowButton(std::to_string(rt).c_str(), ImGuiDir_Left)) {
-                                            enabledTricks.insert(rt);
+                                            enabledTricks.erase(rt);
                                             std::string enabledTrickString = "";
                                             for (auto enabledTrickIt : enabledTricks) {
                                                 enabledTrickString += std::to_string(enabledTrickIt);
diff --git a/soh/soh/Enhancements/randomizer/tricks.cpp b/soh/soh/Enhancements/randomizer/tricks.cpp
index 8172f2a55..4828dde7b 100644
--- a/soh/soh/Enhancements/randomizer/tricks.cpp
+++ b/soh/soh/Enhancements/randomizer/tricks.cpp
@@ -6,7 +6,7 @@ namespace Rando {
         return rtAreaNames.at(area);
     }
 
-    bool Tricks::CheckRTTags(const std::unordered_map<Tag, bool> &showTag, const std::set<Tag> &rtTags) {
+    bool Tricks::CheckRTTags(const std::map<Tag, bool> &showTag, const std::set<Tag> &rtTags) {
         if (rtTags.empty()) {
             return false;
         }
diff --git a/soh/soh/Enhancements/randomizer/tricks.h b/soh/soh/Enhancements/randomizer/tricks.h
index c473d5e3b..77d3a0b23 100644
--- a/soh/soh/Enhancements/randomizer/tricks.h
+++ b/soh/soh/Enhancements/randomizer/tricks.h
@@ -7,6 +7,7 @@
 #include "randomizerTypes.h"
 
 #include <unordered_map>
+#include <map>
 #include <string>
 
 
@@ -25,7 +26,7 @@ namespace Rando {
         };
 
         static const std::string& GetRTAreaName(RandomizerArea area);
-        static bool CheckRTTags(const std::unordered_map<Tag, bool> &showTag, const std::set<Tag> &rtTags);
+        static bool CheckRTTags(const std::map<Tag, bool> &showTag, const std::set<Tag> &rtTags);
         static std::string GetRTTagName(Tag tag);
         static ImVec4 GetRTTagColor(Tag tag);
         static void DrawTagChips(const std::set<Tag> &rtTags);

From 6ea8823de147ac71563c7e3e803746e7eabf9b95 Mon Sep 17 00:00:00 2001
From: aMannus <mannusmenting@gmail.com>
Date: Fri, 16 Aug 2024 00:39:50 +0200
Subject: [PATCH 181/230] Add Total Checks to Check/Item Trackers - devrando
 edition (#4292)

* Fix fmt in savestates

* Check Tracker Totals
---
 .../randomizer/randomizer_check_tracker.cpp   | 29 +++++++++++++++++++
 .../randomizer/randomizer_check_tracker.h     |  2 ++
 .../randomizer/randomizer_item_tracker.cpp    | 28 ++++++++++++++++++
 3 files changed, 59 insertions(+)

diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
index de46a4496..f8838f827 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
@@ -138,6 +138,8 @@ u32 areasSpoiled = 0;
 bool showVOrMQ;
 s8 areaChecksGotten[RCAREA_INVALID]; //|     "Kokiri Forest (4/9)"
 s8 areaCheckTotals[RCAREA_INVALID];
+uint16_t totalChecks = 0;
+uint16_t totalChecksGotten = 0;
 bool optCollapseAll; // A bool that will collapse all checks once
 bool optExpandAll;       // A bool that will expand all checks once
 RandomizerCheck lastLocationChecked = RC_UNKNOWN_CHECK;
@@ -260,6 +262,24 @@ void TrySetAreas() {
     }
 }
 
+void CalculateTotals() {
+    totalChecks = 0;
+    totalChecksGotten = 0;
+
+    for (uint8_t i = 0; i < RCAREA_INVALID; i++) {
+        totalChecks += areaCheckTotals[i];
+        totalChecksGotten += areaChecksGotten[i];
+    }
+}
+
+uint16_t GetTotalChecks() {
+    return totalChecks;
+}
+
+uint16_t GetTotalChecksGotten() {
+    return totalChecksGotten;
+}
+
 void RecalculateAreaTotals() {
     for (auto [rcArea, checks] : checksByArea) {
         if (rcArea == RCAREA_INVALID) {
@@ -278,6 +298,9 @@ void RecalculateAreaTotals() {
             }
         }
     }
+
+    totalChecks = 0;
+    totalChecksGotten = 0;
 }
 
 void SetCheckCollected(RandomizerCheck rc) {
@@ -957,6 +980,10 @@ void CheckTrackerWindow::DrawElement() {
 
     UIWidgets::PaddedSeparator();
 
+    ImGui::Text("Total Checks: %d / %d", totalChecksGotten, totalChecks);
+
+    UIWidgets::PaddedSeparator();
+
     //Checks Section Lead-in
     ImGui::TableNextRow();
     ImGui::TableNextColumn();
@@ -1349,6 +1376,8 @@ void UpdateOrdering(RandomizerCheckArea rcArea) {
     if(checksByArea.contains(rcArea)) {
         std::sort(checksByArea.find(rcArea)->second.begin(), checksByArea.find(rcArea)->second.end(), CompareChecks);
     }
+
+    CalculateTotals();
 }
 
 bool IsEoDCheck(RandomizerCheckType type) {
diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.h b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.h
index c8915a8ec..60094dd02 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.h
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.h
@@ -51,6 +51,8 @@ bool IsCheckShuffled(RandomizerCheck rc);
 void InitTrackerData(bool isDebug);
 RandomizerCheckArea GetCheckArea();
 void UpdateCheck(uint32_t, RandomizerCheckTrackerData);
+uint16_t GetTotalChecks();
+uint16_t GetTotalChecksGotten();
 bool IsAreaSpoiled(RandomizerCheckArea rcArea);
 void SetAreaSpoiled(RandomizerCheckArea rcArea);
 } // namespace CheckTracker
diff --git a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
index 6371708d6..8b7f97a69 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
@@ -316,6 +316,11 @@ typedef enum {
     SECTION_DISPLAY_EXTENDED_SEPARATE
 } ItemTrackerExtendedDisplayType;
 
+typedef enum {
+    SECTION_DISPLAY_MINIMAL_HIDDEN,
+    SECTION_DISPLAY_MINIMAL_SEPARATE
+} ItemTrackerMinimalDisplayType;
+
 struct ItemTrackerNumbers {
   int currentCapacity;
   int maxCapacity;
@@ -911,6 +916,16 @@ void DrawNotes(bool resizeable = false) {
     ImGui::EndGroup();
 }
 
+void DrawTotalChecks() {
+    uint16_t totalChecks = CheckTracker::GetTotalChecks();
+    uint16_t totalChecksGotten = CheckTracker::GetTotalChecksGotten();
+
+    ImGui::BeginGroup();
+    ImGui::SetWindowFontScale(2.5);
+    ImGui::Text("Checks: %d/%d", totalChecksGotten, totalChecks);
+    ImGui::EndGroup();
+}
+
 // Windowing stuff
 ImVec4 ChromaKeyBackground = { 0, 0, 0, 0 }; // Float value, 1 = 255 in rgb value.
 void BeginFloatingWindows(std::string UniqueName, ImGuiWindowFlags flags = 0) {
@@ -1313,6 +1328,14 @@ void ItemTrackerWindow::DrawElement() {
             DrawNotes(true);
             EndFloatingWindows();
         }
+
+        if (CVarGetInteger("gTrackers.ItemTracker.TotalChecks.DisplayType", SECTION_DISPLAY_MINIMAL_HIDDEN) ==
+            SECTION_DISPLAY_MINIMAL_SEPARATE) {
+            ImGui::SetNextWindowSize(ImVec2(400, 300), ImGuiCond_FirstUseEver);
+            BeginFloatingWindows("Total Checks");
+            DrawTotalChecks();
+            EndFloatingWindows();
+        }
     }
 }
 
@@ -1324,6 +1347,7 @@ static const char* displayModes[2] = { "Always", "Combo Button Hold" };
 static const char* buttons[14] = { "A", "B", "C-Up", "C-Down", "C-Left", "C-Right", "L", "Z", "R", "Start", "D-Up", "D-Down", "D-Left", "D-Right" };
 static const char* displayTypes[3] = { "Hidden", "Main Window", "Separate" };
 static const char* extendedDisplayTypes[4] = { "Hidden", "Main Window", "Misc Window", "Separate" };
+static const char* minimalDisplayTypes[2] = { "Hidden", "Separate" };
 
 void ItemTrackerSettingsWindow::DrawElement() {
     ImGui::SetNextWindowSize(ImVec2(733, 472), ImGuiCond_FirstUseEver);
@@ -1459,6 +1483,10 @@ void ItemTrackerSettingsWindow::DrawElement() {
         shouldUpdateVectors = true;
     }
 
+    if (UIWidgets::LabeledRightAlignedEnhancementCombobox("Total Checks", "gTrackers.ItemTracker.TotalChecks.DisplayType", minimalDisplayTypes, SECTION_DISPLAY_MINIMAL_HIDDEN)) {
+        shouldUpdateVectors = true;
+    }
+
     if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Main"), TRACKER_DISPLAY_ALWAYS) == TRACKER_DISPLAY_ALWAYS) {
         if (UIWidgets::LabeledRightAlignedEnhancementCombobox("Personal notes", CVAR_TRACKER_ITEM("DisplayType.Notes"), displayTypes, SECTION_DISPLAY_HIDDEN)) {
             shouldUpdateVectors = true;

From d3edbcd0423682614d97c4ddef67e64702e5fa3b Mon Sep 17 00:00:00 2001
From: Extloga <141232749+Extloga@users.noreply.github.com>
Date: Fri, 16 Aug 2024 18:58:12 +0200
Subject: [PATCH 182/230] Additions and fixes for the German translation in
 three files (#4293)

* Additions for the German translation in hint_list_exclude_dungeon.cpp

* Fixes for the German translation in z_select.c

* Fixes for the German translation in z_select.c

* Additions for the German translation in hint_list_exclude_overworld.cpp

* Additions for the German translation in hint_list_exclude_dungeon.cpp

* Additions for the German translation in hint_list_exclude_overworld.cpp
---
 .../hint_list/hint_list_exclude_dungeon.cpp   | 232 +++++++++---------
 .../hint_list/hint_list_exclude_overworld.cpp |  68 ++---
 .../overlays/gamestates/ovl_select/z_select.c |  58 ++---
 3 files changed, 179 insertions(+), 179 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_dungeon.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_dungeon.cpp
index b86b8f33e..99659838b 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_dungeon.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_dungeon.cpp
@@ -8,112 +8,112 @@ void StaticData::HintTable_Init_Exclude_Dungeon() {
   |        DEKU TREE         |
   ---------------------------*/
    hintTextTable[RHT_DEKU_TREE_MAP_CHEST] = HintText(CustomMessage("They say that in the #center of the Deku Tree# lies #[[1]]#.",
-                                                         /*german*/ "",
+                                                         /*german*/ "Man erzählt sich, daß im #Zentrum des Deku-Baums# #[[1]]# läge.",
                                                          /*french*/ "Selon moi, #le coeur de l'Arbre Mojo# recèle #[[1]]#.", {QM_RED, QM_GREEN}));
                                                       // /*spanish*/ Según dicen, al #centro del Gran Árbol Deku# yace #[[1]]#.
 
     hintTextTable[RHT_DEKU_TREE_SLINGSHOT_CHEST] = HintText(CustomMessage("They say that the #treasure guarded by a scrub# in the Deku Tree is #[[1]]#.",
-                                                               /*german*/ "",
+                                                               /*german*/ "Man erzählt sich, daß ein #von einem Deku bewachter Schatz# im Deku-Baum #[[1]]# sei.",
                                                                /*french*/ "Selon moi, le #trésor protégé par une peste# dans l'Arbre Mojo est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                             // /*spanish*/ Según dicen, un #deku del Gran Árbol Deku# esconde #[[1]]#.
 
     hintTextTable[RHT_DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST] = HintText(CustomMessage("They say that the #treasure guarded by a scrub# in the Deku Tree is #[[1]]#.",
-                                                                         /*german*/ "",
+                                                                         /*german*/ "Man erzählt sich, daß ein #von einem Deku bewachter Schatz# im Deku-Baum #[[1]]# sei.",
                                                                          /*french*/ "Selon moi, le #trésor protégé par une peste# dans l'Arbre Mojo est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                       // /*spanish*/ Según dicen, un #deku del Gran Árbol Deku# esconde #[[1]]#.
 
     hintTextTable[RHT_DEKU_TREE_COMPASS_CHEST] = HintText(CustomMessage("They say that #pillars of wood# in the Deku Tree lead to #[[1]]#.",
-                                                             /*german*/ "",
+                                                             /*german*/ "Man erzählt sich, daß die #Säulen aus Holz# im Deku-Baum zu #[[1]]# führen würden.",
                                                              /*french*/ "Selon moi, les #piliers de bois# dans l'Arbre Mojo indiquent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                           // /*spanish*/ Según dicen, los #salientes del Gran Árbol Deku# conducen a #[[1]]#.
 
     hintTextTable[RHT_DEKU_TREE_COMPASS_ROOM_SIDE_CHEST] = HintText(CustomMessage("They say that #pillars of wood# in the Deku Tree lead to #[[1]]#.",
-                                                                       /*german*/ "",
+                                                                       /*german*/ "Man erzählt sich, daß die #Säulen aus Holz# im Deku-Baum zu #[[1]]# führen würden.",
                                                                        /*french*/ "Selon moi, les #piliers de bois# dans l'Arbre Mojo indiquent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                     // /*spanish*/ Según dicen, los #salientes del Gran Árbol Deku# conducen a #[[1]]#.
 
     hintTextTable[RHT_DEKU_TREE_BASEMENT_CHEST] = HintText(CustomMessage("They say that #webs in the Deku Tree# hide #[[1]]#.",
-                                                              /*german*/ "",
+                                                              /*german*/ "Man erzählt sich, daß #Spinnweben im Deku-Baum# #[[1]]# verstecken würden.",
                                                               /*french*/ "Selon moi, les #toiles dans l'Arbre Mojo# cachent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                            // /*spanish*/ Según dicen, entre #telarañas del Gran Árbol Deku# yace #[[1]]#.
 
     hintTextTable[RHT_DEKU_TREE_MQ_MAP_CHEST] = HintText(CustomMessage("They say that in the #center of the Deku Tree# lies #[[1]]#.",
-                                                            /*german*/ "",
+                                                            /*german*/ "Man erzählt sich, daß im #Zentrum des Deku-Baums# #[[1]]# läge.",
                                                             /*french*/ "Selon moi, #le coeur de l'Arbre Mojo# recèle #[[1]]#.", {QM_RED, QM_GREEN}));
                                                          // /*spanish*/ Según dicen, al #centro del Gran Árbol Deku# yace #[[1]]#.
 
     hintTextTable[RHT_DEKU_TREE_MQ_COMPASS_CHEST] = HintText(CustomMessage("They say that a #treasure guarded by a large spider# in the Deku Tree is #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß ein #von einer großen Spinne bewachter Schatz# im Deku-Baum #[[1]]# sei.",
                                                                 /*french*/ "Selon moi, le #trésor protégé par une grosse araignée# dans l'Arbre Mojo est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/ Según dicen, una #gran araña del Gran Árbol Deku# esconde #[[1]]#.
 
     hintTextTable[RHT_DEKU_TREE_MQ_SLINGSHOT_CHEST] = HintText(CustomMessage("They say that #pillars of wood# in the Deku Tree lead to #[[1]]#.",
-                                                                  /*german*/ "",
+                                                                  /*german*/ "Man erzählt sich, daß die #Säulen aus Holz# im Deku-Baum zu #[[1]]# führen würden.",
                                                                   /*french*/ "Selon moi, les #piliers de bois# dans l'Arbre Mojo indiquent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                // /*spanish*/ Según dicen, los #salientes del Gran Árbol Deku# conducen a #[[1]]#.
 
     hintTextTable[RHT_DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST] = HintText(CustomMessage("They say that #pillars of wood# in the Deku Tree lead to #[[1]]#.",
-                                                                            /*german*/ "",
+                                                                            /*german*/ "Man erzählt sich, daß die #Säulen aus Holz# im Deku-Baum zu #[[1]]# führen würden.",
                                                                             /*french*/ "Selon moi, les #piliers de bois# dans l'Arbre Mojo indiquent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                          // /*spanish*/ Según dicen, los #salientes del Gran Árbol Deku# conducen a #[[1]]#.
 
     hintTextTable[RHT_DEKU_TREE_MQ_BASEMENT_CHEST] = HintText(CustomMessage("They say that #webs in the Deku Tree# hide #[[1]]#.",
-                                                                 /*german*/ "",
+                                                                 /*german*/ "Man erzählt sich, daß #Spinnweben im Deku-Baum# #[[1]]# verstecken würden.",
                                                                  /*french*/ "Selon moi, les #toiles dans l'Arbre Mojo# cachent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                               // /*spanish*/ Según dicen, entre #telarañas del Gran Árbol Deku# yace #[[1]]#.
 
     hintTextTable[RHT_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST] = HintText(CustomMessage("They say that #magical fire in the Deku Tree# leads to #[[1]]#.",
-                                                                            /*german*/ "",
+                                                                            /*german*/ "Man erzählt sich, daß #magisches Feuer im Deku-Baum# zu #[[1]]# führe.",
                                                                             /*french*/ "Selon moi, le #feu magique dans l'Arbre Mojo# éclaire #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                          // /*spanish*/ Según dicen, el #fuego mágico en el Gran Árbol Deku# conduce a #[[1]]#.
 
     hintTextTable[RHT_DEKU_TREE_QUEEN_GOHMA_HEART] = HintText(CustomMessage("They say that #Queen Gohma# holds #[[1]]#.",
-                                                                 /*german*/ "",
+                                                                 /*german*/ "Man erzählt sich, daß #Königin Gohma# #[[1]]# besäße.",
                                                                  /*french*/ "Selon moi, la #Reine Gohma# possède #[[1]]#.", {QM_RED, QM_GREEN}),
                                                               // /*spanish*/ Según dicen, la #Reina Goma# porta #[[1]]#.
                                                               {}, {
                                                               CustomMessage("They say that the #Parasitic Armored Arachnid# holds #[[1]]#.",
-                                                                  /*german*/ "",
+                                                                  /*german*/ "Man erzählt sich, daß das #gepanzerte parasitäre Spinne# #[[1]]# besäße.",
                                                                   /*french*/ "Selon moi, le #monstre insectoïde géant# possède #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                // /*spanish*/ Según dicen, el #arácnido parasitario acorazado# porta #[[1]]#.
 
     hintTextTable[RHT_DEKU_TREE_GS_BASEMENT_BACK_ROOM] = HintText(CustomMessage("They say that a #spider deep within the Deku Tree# hides #[[1]]#.",
-                                                                     /*german*/ "",
+                                                                     /*german*/ "Man erzählt sich, daß eine #Spinne tief innerhalb des Deku-Baums# #[[1]]# verstecke.",
                                                                      /*french*/ "Selon moi, une #Skulltula au coeur de l'Arbre Mojo# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                   // /*spanish*/ Según dicen, una #Skulltula en las profundidades del Árbol Deku# otorga #[[1]]#.
 
     hintTextTable[RHT_DEKU_TREE_GS_BASEMENT_GATE] = HintText(CustomMessage("They say that a #web protects a spider# within the Deku Tree holding #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß eine #von einer Webe geschützte Spinne# innerhalb des Deku-Baums #[[1]]# hielte.",
                                                                 /*french*/ "Selon moi, une #Skulltula derrière une toile dans l'Arbre Mojo# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/ Según dicen, una #Skulltula protegida por su tela# del Árbol Deku otorga #[[1]]#.
 
     hintTextTable[RHT_DEKU_TREE_GS_BASEMENT_VINES] = HintText(CustomMessage("They say that a #web protects a spider# within the Deku Tree holding #[[1]]#.",
-                                                                 /*german*/ "",
+                                                                 /*german*/ "Man erzählt sich, daß eine #von einer Webe geschützte Spinne# innerhalb des Deku-Baums #[[1]]# hielte.",
                                                                  /*french*/ "Selon moi, une #Skulltula derrière une toile dans l'Arbre Mojo# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                               // /*spanish*/ Según dicen, una #Skulltula protegida por su tela# del Árbol Deku otorga #[[1]]#.
 
     hintTextTable[RHT_DEKU_TREE_GS_COMPASS_ROOM] = HintText(CustomMessage("They say that a #spider atop the Deku Tree# holds #[[1]]#.",
-                                                               /*german*/ "",
+                                                               /*german*/ "Man erzählt sich, daß eine #Spinne auf der Spitze des Deku-Baums# #[[1]]# hielte.",
                                                                /*french*/ "Selon moi, une #Skulltula au sommet de l'Arbre Mojo# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                             // /*spanish*/ Según dicen, una #Skulltula en lo alto del Árbol Deku# otorga #[[1]]#.
 
     hintTextTable[RHT_DEKU_TREE_MQ_GS_LOBBY] = HintText(CustomMessage("They say that a #spider in a crate# within the Deku Tree hides #[[1]]#.",
-                                                           /*german*/ "",
+                                                           /*german*/ "Man erzählt sich, daß eine #Spinne in einer Kiste# innerhalb des Deku-Baums #[[1]]# verstecke.",
                                                            /*french*/ "Selon moi, une #Skulltula dans une boîte dans l'Arbre Mojo# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                         // /*spanish*/ Según dicen, una #Skulltula bajo una caja# del Árbol Deku otorga #[[1]]#.
 
     hintTextTable[RHT_DEKU_TREE_MQ_GS_COMPASS_ROOM] = HintText(CustomMessage("They say that a #wall of rock protects a spider# within the Deku Tree holding #[[1]]#.",
-                                                                  /*german*/ "",
+                                                                  /*german*/ "Man erzählt sich, daß eine #von einer Steinwand geschützte Spinne# innerhalb des Deku-Baums #[[1]]# hielte.",
                                                                   /*french*/ "Selon moi, une #Skulltula derrière des rochers dans l'Arbre Mojo# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                // /*spanish*/ Según dicen, una #Skulltula protegida por una pared rocosa# del Árbol Deku otorga #[[1]]#.
 
     hintTextTable[RHT_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM] = HintText(CustomMessage("They say that a #spider deep within the Deku Tree# hides #[[1]]#.",
-                                                                        /*german*/ "",
+                                                                        /*german*/ "Man erzählt sich, daß eine #Spinne tief innerhalb des Deku-Baums# #[[1]]# verstecke.",
                                                                         /*french*/ "Selon moi, une #Skulltula au coeur de l'Arbre Mojo# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                      // /*spanish*/ Según dicen, una #Skulltula en las profundidades del Árbol Deku# otorga #[[1]]#.
 
     hintTextTable[RHT_DEKU_TREE_MQ_DEKU_SCRUB] = HintText(CustomMessage("They say that a #scrub in the Deku Tree# sells #[[1]]#.",
-                                                             /*german*/ "",
+                                                             /*german*/ "Man erzählt sich, daß ein #Deku im Deku-Baum# #[[1]]# verkaufe.",
                                                              /*french*/ "Selon moi, la #peste Mojo dans l'Arbre Mojo# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                           // /*spanish*/ Según dicen, un #deku del Gran Árbol Deku# vende #[[1]]#.
 
@@ -121,157 +121,157 @@ void StaticData::HintTable_Init_Exclude_Dungeon() {
   |     DODONGOS CAVERN      |
   ---------------------------*/
 hintTextTable[RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST] = HintText(CustomMessage("They say that #above King Dodongo# lies #[[1]]#.",
-                                                                     /*german*/ "",
+                                                                     /*german*/ "Man erzählt sich, daß #auf König Dodongo# #[[1]]# läge.",
                                                                      /*french*/ "Selon moi, #par dessus le Roi Dodongo# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                   // /*spanish*/ Según dicen, #sobre el Rey Dodongo# yace #[[1]]#.
 
     hintTextTable[RHT_DODONGOS_CAVERN_MAP_CHEST] = HintText(CustomMessage("They say that a #muddy wall in Dodongo's Cavern# hides #[[1]]#.",
-                                                               /*german*/ "",
+                                                               /*german*/ "Man erzählt sich, daß eine #schlammige Wand in Dodongos Höhle# #[[1]]# verstecke.",
                                                                /*french*/ "Selon moi, le #mur fragile dans la Caverne Dodongo# recèle #[[1]]#.", {QM_RED, QM_GREEN}));
                                                             // /*spanish*/ Según dicen, tras una #agrietada pared en la Cueva de los Dodongos# yace #[[1]]#.
 
     hintTextTable[RHT_DODONGOS_CAVERN_COMPASS_CHEST] = HintText(CustomMessage("They say that a #statue in Dodongo's Cavern# guards #[[1]]#.",
-                                                                   /*german*/ "",
+                                                                   /*german*/ "Man erzählt sich, daß eine #Statue in Dodongos Höhle# #[[1]]# bewache.",
                                                                    /*french*/ "Selon moi, la #statue dans la Caverne Dodongo# protège #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                 // /*spanish*/ Según dicen, una #estatua de la Cueva de los Dodongos# esconde #[[1]]#.
 
     hintTextTable[RHT_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST] = HintText(CustomMessage("They say that above a #maze of stone# in Dodongo's Cavern lies #[[1]]#.",
-                                                                                /*german*/ "",
+                                                                                /*german*/ "Man erzählt sich, daß auf einem #Labyrinth aus Stein# in Dodongos Höhle #[[1]]# läge.",
                                                                                 /*french*/ "Selon moi, sur #un labyrinthe de pierre# dans la Caverne Dodongo gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                              // /*spanish*/ Según dicen, entre un #laberinto de piedra# en la Cueva de los Dodongos yace #[[1]]#.
 
     hintTextTable[RHT_DODONGOS_CAVERN_BOMB_BAG_CHEST] = HintText(CustomMessage("They say that the #second lizard cavern battle# yields #[[1]]#.",
-                                                                    /*german*/ "",
+                                                                    /*german*/ "Man erzählt sich, daß der #zweite Reptilienkampf der Höhle# #[[1]]# brächte.",
                                                                     /*french*/ "Selon moi, le #deuxième duel de lézards de caverne# octroie #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                  // /*spanish*/ Según dicen, #luchar dos veces contra reptiles en una cueva# conduce a #[[1]]#.
 
     hintTextTable[RHT_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST] = HintText(CustomMessage("They say that a #chest at the end of a bridge# yields #[[1]]#.",
-                                                                         /*german*/ "",
+                                                                         /*german*/ "Man erzählt sich, daß eine #Truhe am Ende der Brücke# #[[1]]# brächte.",
                                                                          /*french*/ "Selon moi, le #trésor à l'extrémité d'un pont# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                       // /*spanish*/ Según dicen, un #cofre al final de un quebrado puente# contiene #[[1]]#.
 
     hintTextTable[RHT_DODONGOS_CAVERN_MQ_MAP_CHEST] = HintText(CustomMessage("They say that a #muddy wall in Dodongo's Cavern# hides #[[1]]#.",
-                                                                  /*german*/ "",
+                                                                  /*german*/ "Man erzählt sich, daß eine #schlammige Wand in Dodongos Höhle# #[[1]]# verstecke.",
                                                                   /*french*/ "Selon moi, le #mur fragile dans la Caverne Dodongo# recèle #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                // /*spanish*/ Según dicen, una #agrietada pared en la Cueva de los Dodongos# esconde #[[1]]#.
 
     hintTextTable[RHT_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST] = HintText(CustomMessage("They say that an #elevated alcove# in Dodongo's Cavern holds #[[1]]#.",
-                                                                       /*german*/ "",
+                                                                       /*german*/ "Man erzählt sich, daß ein #erhöhter Alkoven# in Dodongos Höhle #[[1]]# hielte.",
                                                                        /*french*/ "Selon moi, l'#alcove haut perchée# dans la Caverne Dodongo cache #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                     // /*spanish*/ Según dicen, una #elevada alcoba# en la Cueva de los Dodongos brinda #[[1]]#.
 
     hintTextTable[RHT_DODONGOS_CAVERN_MQ_COMPASS_CHEST] = HintText(CustomMessage("They say that #fire-breathing lizards# in Dodongo's Cavern guard #[[1]]#.",
-                                                                      /*german*/ "",
+                                                                      /*german*/ "Man erzählt sich, daß #feuerschnaubende Reptilien# in Dodongos Höhle #[[1]]# bewachen würden.",
                                                                       /*french*/ "Selon moi, les #lézards cracheurs de feu# dans la Caverne Dodongo protègent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                    // /*spanish*/ Según dicen, unos #flamígeros reptiles# en la Cueva de los Dodongos esconden #[[1]]#.
 
     hintTextTable[RHT_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST] = HintText(CustomMessage("They say that #baby spiders# in Dodongo's Cavern guard #[[1]]#.",
-                                                                          /*german*/ "",
+                                                                          /*german*/ "Man erzählt sich, daß #kleine Spinnen# in Dodongos Höhle #[[1]]# bewachen würden.",
                                                                           /*french*/ "Selon moi, les #petites araignées dans la Caverne Dodongo# protègent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                        // /*spanish*/ Según dicen, unas #pequeñas larvas# en la Cueva de los Dodongos esconden #[[1]]#.
 
     hintTextTable[RHT_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST] = HintText(CustomMessage("They say that above a #maze of stone# in Dodongo's Cavern lies #[[1]]#.",
-                                                                                /*german*/ "",
+                                                                                /*german*/ "Man erzählt sich, daß auf einem #Labyrinth aus Stein# in Dodongos Höhle #[[1]]# läge.",
                                                                                 /*french*/ "Selon moi, sur #un labyrinthe de pierre# dans la Caverne Dodongo gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                              // /*spanish*/ Según dicen, sobre un #laberinto de piedra# en la Cueva de los Dodongos yace #[[1]]#.
 
     hintTextTable[RHT_DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST] = HintText(CustomMessage("They say that #beneath a headstone# in Dodongo's Cavern lies #[[1]]#.",
-                                                                          /*german*/ "",
+                                                                          /*german*/ "Man erzählt sich, daß #unterhalb eines Grabsteins# in Dodongos Höhle #[[1]]# läge.",
                                                                           /*french*/ "Selon moi, #sous une pierre tombale# dans la Caverne Dodongo gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                        // /*spanish*/ Según dicen, #bajo una lápida# en la Cueva de los Dodongos yace #[[1]]#.
 
     hintTextTable[RHT_DODONGOS_CAVERN_KING_DODONGO_HEART] = HintText(CustomMessage("They say that #King Dodongo# holds #[[1]]#.",
-                                                                        /*german*/ "",
+                                                                        /*german*/ "Man erzählt sich, daß #König Dodongo# #[[1]]# besäße.",
                                                                         /*french*/ "Selon moi, le #Roi Dodongo# possède #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                      // /*spanish*/ Según dicen, el #Rey Dodongo# porta #[[1]]#.
                                                                      {}, {
                                                                      CustomMessage("They say that the #Infernal Dinosaur# holds #[[1]]#.",
-                                                                         /*german*/ "",
+                                                                         /*german*/ "Man erzählt sich, daß der #infernalische Dinosaurier# #[[1]]# besäße.",
                                                                          /*french*/ "Selon moi, le #dinosaure infernal# possède #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                       // /*spanish*/ Según dicen, el #dinosaurio infernal# porta #[[1]]#.
 
     hintTextTable[RHT_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS] = HintText(CustomMessage("They say that a #spider entangled in vines# in Dodongo's Cavern guards #[[1]]#.",
-                                                                           /*german*/ "",
+                                                                           /*german*/ "Man erzählt sich, daß eine in #Reben verwobene Spinne# in Dodongos Höhle #[[1]]# bewache.",
                                                                            /*french*/ "Selon moi, une #Skulltula sur les vignes dans la Caverne Dodongo# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                         // /*spanish*/ Según dicen, una #Skulltula sobre unas cepas# de la Cueva de los Dodongos otorga #[[1]]#.
 
     hintTextTable[RHT_DODONGOS_CAVERN_GS_SCARECROW] = HintText(CustomMessage("They say that a #spider among explosive slugs# hides #[[1]]#.",
-                                                                  /*german*/ "",
+                                                                  /*german*/ "Man erzählt sich, daß eine #Spinne inmitten explosiver Schnecken# #[[1]]# verstecke.",
                                                                   /*french*/ "Selon moi, une #Skulltula dans l'alcove du couloir dans la Caverne Dodongo# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                // /*spanish*/ Según dicen, una #Skulltula rodeada de explosivos gusanos# otorga #[[1]]#.
 
     hintTextTable[RHT_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS] = HintText(CustomMessage("They say that a #spider just out of reach# in Dodongo's Cavern holds #[[1]]#.",
-                                                                            /*german*/ "",
+                                                                            /*german*/ "Man erzählt sich, daß eine #Spinne außer Reichweite# in Dodongos Höhle #[[1]]# hielte.",
                                                                             /*french*/ "Selon moi, une #Skulltula au haut des escaliers de la Caverne Dodongo# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                          // /*spanish*/ Según dicen, una #Skulltula fuera del alcance# de la Cueva de los Dodongos otorga #[[1]]#.
 
     hintTextTable[RHT_DODONGOS_CAVERN_GS_BACK_ROOM] = HintText(CustomMessage("They say that a #spider behind a statue# in Dodongo's Cavern holds #[[1]]#.",
-                                                                  /*german*/ "",
+                                                                  /*german*/ "Man erzählt sich, daß eine #Spinne hinter einer Statue# in Dodongos Höhle #[[1]]# hielte.",
                                                                   /*french*/ "Selon moi, une #Skulltula au coeur de la Caverne Dodongo# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                // /*spanish*/ Según dicen, una #Skulltula tras una estatua# de la Cueva de los Dodongos otorga #[[1]]#.
 
     hintTextTable[RHT_DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS] = HintText(CustomMessage("They say that a #spider among bats# in Dodongo's Cavern holds #[[1]]#.",
-                                                                                      /*german*/ "",
+                                                                                      /*german*/ "Man erzählt sich, daß eine #Spinne inmitten von Fledermäusen# in Dodongos Höhle #[[1]]# hielte.",
                                                                                       /*french*/ "Selon moi, une #Skulltula entourée de Saigneurs dans la Caverne Dodongo# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                    // /*spanish*/ Según dicen, una #Skulltula rodeada de murciélagos# de la Cueva de los Dodongos otorga #[[1]]#.
 
     hintTextTable[RHT_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM] = HintText(CustomMessage("They say that a #spider high on a wall# in Dodongo's Cavern holds #[[1]]#.",
-                                                                      /*german*/ "",
+                                                                      /*german*/ "Man erzählt sich, daß eine #hoch an einer Wand befindliche Spinne# in Dodongos Höhle #[[1]]# hielte.",
                                                                       /*french*/ "Selon moi, une #Skulltula haut perchée dans la Caverne Dodongo# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                    // /*spanish*/ Según dicen, una #Skulltula en lo alto de una pared# de la Cueva de los Dodongos otorga #[[1]]#.
 
     hintTextTable[RHT_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM] = HintText(CustomMessage("They say that a #spider on top of a pillar of rock# in Dodongo's Cavern holds #[[1]]#.",
-                                                                         /*german*/ "",
+                                                                         /*german*/ "Man erzählt sich, daß eine #Spinne auf einer Steinsäule# in Dodongos Höhle #[[1]]# hielte.",
                                                                          /*french*/ "Selon moi, une #Skulltula sur l'énorme pilier de roc de la Caverne Dodongo# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                       // /*spanish*/ Según dicen, una #Skulltula en lo alto de un pilar# de la Cueva de los Dodongos otorga #[[1]]#.
 
     hintTextTable[RHT_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM] = HintText(CustomMessage("They say that a #spider in a crate# in Dodongo's Cavern holds #[[1]]#.",
-                                                                       /*german*/ "",
+                                                                       /*german*/ "Man erzählt sich, daß eine #Spinne in einer Kiste# in Dodongos Höhle #[[1]]# hielte.",
                                                                        /*french*/ "Selon moi, une #Skulltula dans une boîte de la Caverne Dodongo# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                     // /*spanish*/ Según dicen, una #Skulltula bajo una caja# de la Cueva de los Dodongos otorga #[[1]]#.
 
     hintTextTable[RHT_DODONGOS_CAVERN_MQ_GS_BACK_AREA] = HintText(CustomMessage("They say that a #spider among graves# in Dodongo's Cavern holds #[[1]]#.",
-                                                                     /*german*/ "",
+                                                                     /*german*/ "Man erzählt sich, daß eine #Spinne inmitten von Gräbern# in Dodongos Höhle #[[1]]# hielte.",
                                                                      /*french*/ "Selon moi, une #Skulltula parmi les tombes de la Caverne Dodongo# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                   // /*spanish*/ Según dicen, una #Skulltula entre lápidas# en la Cueva de los Dodongos otorga #[[1]]#.
 
     hintTextTable[RHT_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT] = HintText(CustomMessage("They say that a pair of #scrubs in Dodongo's Cavern# sells #[[1]]#.",
-                                                                                   /*german*/ "",
+                                                                                   /*german*/ "Man erzählt sich, daß ein #Deku-Paar in Dodongos Höhle# #[[1]]# verkaufe.",
                                                                                    /*french*/ "Selon moi, le #duo de peste Mojo dans la Caverne Dodongo# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                 // /*spanish*/ Según dicen, un #par de dekus en la Cueva de los Dodongos# venden #[[1]]#.
 
     hintTextTable[RHT_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS] = HintText(CustomMessage("They say that a #scrub guarded by Lizalfos# sells #[[1]]#.",
-                                                                                        /*german*/ "",
+                                                                                        /*german*/ "Man erzählt sich, daß ein #von Lizalfos bewachter Deku# #[[1]]# verkaufe.",
                                                                                         /*french*/ "Selon moi, la #peste Mojo au coeur de la Caverne Dodongo# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                      // /*spanish*/ Según dicen, un #deku custodiado por Lizalfos# vende #[[1]]#.
 
     hintTextTable[RHT_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT] = HintText(CustomMessage("They say that a pair of #scrubs in Dodongo's Cavern# sells #[[1]]#.",
-                                                                                    /*german*/ "",
+                                                                                    /*german*/ "Man erzählt sich, daß ein #Deku-Paar in Dodongos Höhle# #[[1]]# verkaufe.",
                                                                                     /*french*/ "Selon moi, le #duo de peste Mojo dans la Caverne Dodongo# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                  // /*spanish*/ Según dicen, un #par de dekus en la Cueva de los Dodongos# venden #[[1]]#.
 
     hintTextTable[RHT_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY] = HintText(CustomMessage("They say that a #scrub in Dodongo's Cavern# sells #[[1]]#.",
-                                                                      /*german*/ "",
+                                                                      /*german*/ "Man erzählt sich, daß ein #Deku in Dodongos Höhle# #[[1]]# verkaufe.",
                                                                       /*french*/ "Selon moi, la #peste Mojo dans l'entrée de la Caverne Dodongo# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                    // /*spanish*/ Según dicen, un #deku en la Cueva de los Dodongos# vende #[[1]]#.
 
     hintTextTable[RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR] = HintText(CustomMessage("They say that a pair of #scrubs in Dodongo's Cavern# sells #[[1]]#.",
-                                                                              /*german*/ "",
+                                                                              /*german*/ "Man erzählt sich, daß ein #Deku-Paar in Dodongos Höhle# #[[1]]# verkaufe.",
                                                                               /*french*/ "Selon moi, le #duo de peste Mojo dans l'entrée de la Caverne Dodongo# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                            // /*spanish*/ Según dicen, un #par de dekus en la Cueva de los Dodongos# venden #[[1]]#.
 
     hintTextTable[RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT] = HintText(CustomMessage("They say that a pair of #scrubs in Dodongo's Cavern# sells #[[1]]#.",
-                                                                               /*german*/ "",
+                                                                               /*german*/ "Man erzählt sich, daß ein #Deku-Paar in Dodongos Höhle# #[[1]]# verkaufe.",
                                                                                /*french*/ "Selon moi, le #duo de peste Mojo dans l'entrée de la Caverne Dodongo# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                             // /*spanish*/ Según dicen, un #par de dekus en la Cueva de los Dodongos# venden #[[1]]#.
 
     hintTextTable[RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE] = HintText(CustomMessage("They say that a #scrub in Dodongo's Cavern# sells #[[1]]#.",
-                                                                             /*german*/ "",
+                                                                             /*german*/ "Man erzählt sich, daß ein #Deku-Paar in Dodongos Höhle# #[[1]]# verkaufe.",
                                                                              /*french*/ "Selon moi, la #peste Mojo au sommet des escaliers dans la Caverne Dodongo# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                           // /*spanish*/ Según dicen, un #deku en la Cueva de los Dodongos# vende #[[1]]#.
 
     hintTextTable[RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS] = HintText(CustomMessage("They say that a #scrub guarded by Lizalfos# sells #[[1]]#.",
-                                                                                                 /*german*/ "",
+                                                                                                 /*german*/ "Man erzählt sich, daß ein #von Lizalfos bewachter Deku# #[[1]]# verkaufe.",
                                                                                                  /*french*/ "Selon moi, la #peste Mojo au coeur de la Caverne Dodongo# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                               // /*spanish*/ Según dicen, un #deku custodiado por Lizalfos# vende #[[1]]#.
 
@@ -279,308 +279,308 @@ hintTextTable[RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST] = HintText(CustomMessage("The
   |     JABU JABUS BELLY     |
   ---------------------------*/
     hintTextTable[RHT_JABU_JABUS_BELLY_MAP_CHEST] = HintText(CustomMessage("They say that a #slimy thing# guards #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß ein #schleimiges Ding# #[[1]]# bewache.",
                                                                 /*french*/ "Selon moi, la #chose gluante# gardien protège #[[1]]#.", {QM_RED, QM_GREEN}),
                                                              // /*spanish*/ Según dicen, un #tentáculo parasitario# protege #[[1]]#.
                                                              {}, {
                                                              CustomMessage("They say that #tentacle trouble# in a deity's belly guards #[[1]]#.",
-                                                                 /*german*/ "",
+                                                                 /*german*/ "Man erzählt sich, daß #Tentakel# im Bauch einer Gottheit #[[1]]# bewachen würden.",
                                                                  /*french*/ "Selon moi, la #membrane# dans le ventre du gardien protège #[[1]]#.", {QM_RED, QM_GREEN})});
                                                               // /*spanish*/ Según dicen, un #problema tentaculoso# en la tripa de cierta deidad esconde #[[1]]#.
 
     hintTextTable[RHT_JABU_JABUS_BELLY_COMPASS_CHEST] = HintText(CustomMessage("They say that #bubbles# guard #[[1]]#.",
-                                                                    /*german*/ "",
+                                                                    /*german*/ "Man erzählt sich, daß #Blasen# #[[1]]# bewachen würden.",
                                                                     /*french*/ "Selon moi, des #bulles# entourent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                  // /*spanish*/ Según dicen, unas #burbujas# protegen #[[1]]#.
                                                                  {}, {
                                                                  CustomMessage("They say that #bubble trouble# in a deity's belly guards #[[1]]#.",
-                                                                     /*german*/ "",
+                                                                     /*german*/ "Man erzählt sich, daß #Blasen# im Bauch einer Gottheit #[[1]]# bewachen würden.",
                                                                      /*french*/ "Selon moi, un #horde de bulles# dans le ventre du gardien protègent #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                   // /*spanish*/ Según dicen, un #problema burbujesco# en la tripa de cierta deidad esconde #[[1]]#.
 
     hintTextTable[RHT_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST] = HintText(CustomMessage("They say that shooting a #mouth cow# reveals #[[1]]#.",
-                                                                               /*german*/ "",
+                                                                               /*german*/ "Man erzählt sich, daß ein #Kuhmund# #[[1]]# enthüllen würde.",
                                                                                /*french*/ "Selon moi, tirer sur une #vache# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                             // /*spanish*/ Según dicen, #dispararle a una vaca# revela #[[1]]#.
 
     hintTextTable[RHT_JABU_JABUS_BELLY_MQ_MAP_CHEST] = HintText(CustomMessage("They say that a #boulder before cows# hides #[[1]]#.",
-                                                                   /*german*/ "",
+                                                                   /*german*/ "Man erzählt sich, daß ein #Findling vor Kühen# #[[1]]# verstecke.",
                                                                    /*french*/ "Selon moi, des #rochers près des vaches# cachent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                 // /*spanish*/ Según dicen, cierta #roca rodeada de vacas# esconde #[[1]]#.
                                                                 {}, {
                                                                 CustomMessage("They say that #pop rocks# hide #[[1]]#.",
-                                                                    /*german*/ "",
+                                                                    /*german*/ "Man erzählt sich, daß #Knallfelsen# #[[1]]# verstecken würden.",
                                                                     /*french*/ "Selon moi, des #pierres aux reins# cachent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                  // /*spanish*/ Según dicen, #cepillarse los dientes con explosivos# revela #[[1]]#.
                                                                 CustomMessage("They say that an #explosive palate# holds #[[1]]#.",
-                                                                    /*german*/ "",
+                                                                    /*german*/ "Man erzählt sich, daß ein #explosiver Gaumen# #[[1]]# hielte.",
                                                                     /*french*/ "Selon moi, des #gargouillis explosifs# cachent #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                  // /*spanish*/ Según dicen, un #paladar explosivo# esconde #[[1]]#.
 
     hintTextTable[RHT_JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST] = HintText(CustomMessage("They say that near a #spiked elevator# lies #[[1]]#.",
-                                                                                 /*german*/ "",
+                                                                                 /*german*/ "Man erzählt sich, daß in der Nähe eines #stachligen Aufzugs# #[[1]]# läge.",
                                                                                  /*french*/ "Selon moi, près d'un #ascenseur visqueux# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                               // /*spanish*/ Según dicen, cerca de un #ascensor puntiagudo# yace #[[1]]#.
 
     hintTextTable[RHT_JABU_JABUS_BELLY_MQ_COMPASS_CHEST] = HintText(CustomMessage("They say that a #drowning cow# unveils #[[1]]#.",
-                                                                       /*german*/ "",
+                                                                       /*german*/ "Man erzählt sich, daß eine #ertrinkende Kuh# #[[1]]# enthüllen würde.",
                                                                        /*french*/ "Selon moi, une #vache à l'eau# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                     // /*spanish*/ Según dicen, una #vaca sumergida# revela #[[1]]#.
 
     hintTextTable[RHT_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST] = HintText(CustomMessage("They say that #moving anatomy# creates a path to #[[1]]#.",
-                                                                                 /*german*/ "",
+                                                                                 /*german*/ "Man erzählt sich, daß eine #sich bewegende Anatomie# einen Pfad zu #[[1]]# kreiere.",
                                                                                  /*french*/ "Selon moi, un #organe descendant# mène à #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                               // /*spanish*/ Según dicen, un #ser movedizo entre paredes# conduce a #[[1]]#.
 
     hintTextTable[RHT_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST] = HintText(CustomMessage("They say that a #pair of digested cows# hold #[[1]]#.",
-                                                                                      /*german*/ "",
+                                                                                      /*german*/ "Man erzählt sich, daß ein #Paar verdauter Kühe# #[[1]]# hielte.",
                                                                                       /*french*/ "Selon moi, #deux boeufs digérés# détiennent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                    // /*spanish*/ Según dicen, un #par de digeridas vacas# otorgan #[[1]]#.
 
     hintTextTable[RHT_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST] = HintText(CustomMessage("They say that a #pair of digested cows# hold #[[1]]#.",
-                                                                                   /*german*/ "",
+                                                                                   /*german*/ "Man erzählt sich, daß ein #Paar verdauter Kühe# #[[1]]# hielte.",
                                                                                    /*french*/ "Selon moi, #deux boeufs digérés# détiennent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                 // /*spanish*/ Según dicen, un #par de digeridas vacas# otorgan #[[1]]#.
 
     hintTextTable[RHT_JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST] = HintText(CustomMessage("They say that the #final cows' reward# in a deity's belly is #[[1]]#.",
-                                                                         /*german*/ "",
+                                                                         /*german*/ "Man erzählt sich, daß die #Belohnung der letzten Kuh# im Bauch einer Gottheit #[[1]]# sei.",
                                                                          /*french*/ "Selon moi, le #cadeau des dernières vaches# estomacales est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                       // /*spanish*/ Según dicen, las #vacas al final# de la tripa de cierta deidad otorgan #[[1]]#.
 
-    hintTextTable[RHT_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST] = HintText(CustomMessage("They say that #cows protected by falling monsters# in a deity's belly guard #[[1]]#.",
-                                                                                      /*german*/ "",
+    hintTextTable[RHT_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST] = HintText(CustomMessage("They say that #cows protected by falling monsters# in a deity's belly guard hide #[[1]]#.",
+                                                                                      /*german*/ "Man erzählt sich, daß #von fallenden Monstern bewachte Kühe# im Bauch einer Gottheit #[[1]]# verstecken würden.",
                                                                                       /*french*/ "Selon moi, des #vaches protégées par des monstres tombants# cachent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                    // /*spanish*/ Según dicen, unas #vacas custodiadas por monstruos del techo# de la tripa de cierta deidad otorgan #[[1]]#.
 
     hintTextTable[RHT_JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST] = HintText(CustomMessage("They say that a school of #stingers swallowed by Jabu-Jabu# guard #[[1]]#.",
-                                                                                    /*german*/ "",
+                                                                                    /*german*/ "Man erzählt sich, daß von #Jabu-Jabu verschluckte Rochen# #[[1]]# bewachen würden.",
                                                                                     /*french*/ "Selon moi, les #raies avallées par Jabu-Jabu# protègent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                                  // /*spanish*/ Según dicen, unos #stingers engullidos por Jabu-Jabu# guardan #[[1]]#.
                                                                                  {}, {
                                                                                  CustomMessage("They say that a school of #stingers swallowed by a deity# guard #[[1]]#.",
-                                                                                     /*german*/ "",
+                                                                                     /*german*/ "Man erzählt sich, daß von #Jabu-Jabu verschluckte Rochen# #[[1]]# bewachen würden.",
                                                                                      /*french*/ "Selon moi, les #raies avallées par le gardien# protègent #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                                   // /*spanish*/ Según dicen, unos #stingers engullidos por cierta deidad# guardan #[[1]]#.
 
     hintTextTable[RHT_JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST] = HintText(CustomMessage("They say that a school of #stingers swallowed by Jabu-Jabu# guard #[[1]]#.",
-                                                                         /*german*/ "",
+                                                                         /*german*/ "Man erzählt sich, daß von #Jabu-Jabu verschluckte Rochen# #[[1]]# bewachen würden.",
                                                                          /*french*/ "Selon moi, les #raies avallées par Jabu-Jabu# protègent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                       // /*spanish*/ Según dicen, unos #stingers engullidos por Jabu-Jabu# guardan #[[1]]#.
                                                                       {}, {
                                                                       CustomMessage("They say that a school of #stingers swallowed by a deity# guard #[[1]]#.",
-                                                                          /*german*/ "",
+                                                                          /*german*/ "Man erzählt sich, daß von #einer Gottheit verschluckte Rochen# #[[1]]# bewachen würden.",
                                                                           /*french*/ "Selon moi, les #raies avallées par le gardien# protègent #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                        // /*spanish*/ Según dicen, unos #stingers engullidos por cierta deidad# guardan #[[1]]#.
 
     hintTextTable[RHT_JABU_JABUS_BELLY_BARINADE_HEART] = HintText(CustomMessage("They say that #Barinade# holds #[[1]]#.",
-                                                                     /*german*/ "",
+                                                                     /*german*/ "Man erzählt sich, daß #Barinade# #[[1]]# besäße.",
                                                                      /*french*/ "Selon moi, #Barinade# possède #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                   // /*spanish*/ Según dicen, #Barinade# porta #[[1]]#.
                                                                   {}, {
                                                                   CustomMessage("They say that the #Bio-Electric Anemone# holds #[[1]]#.",
-                                                                      /*german*/ "",
+                                                                      /*german*/ "Man erzählt sich, daß die #bioelektrische Anemone# #[[1]]# besäße.",
                                                                       /*french*/ "Selon moi, l'#anémone bioélectrique# possède #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                    // /*spanish*/ Según dicen, la #anémona bioeléctrica# porta #[[1]]#.
 
     hintTextTable[RHT_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER] = HintText(CustomMessage("They say that a #spider resting near a princess# in Jabu-Jabu's Belly holds #[[1]]#.",
-                                                                              /*german*/ "",
+                                                                              /*german*/ "Man erzählt sich, daß eine #in der Nähe einer Prinzessin ruhende Spinne# in Jabu-Jabus Bauch #[[1]]# hielte.",
                                                                               /*french*/ "Selon moi, une #Skulltula près de la princesse dans le Ventre de Jabu-Jabu# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                            // /*spanish*/ Según dicen, una #Skulltula junto a una princesa# en la Tripa de Jabu-Jabu otorga #[[1]]#.
 
     hintTextTable[RHT_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER] = HintText(CustomMessage("They say that a #spider resting near a princess# in Jabu-Jabu's Belly holds #[[1]]#.",
-                                                                              /*german*/ "",
+                                                                              /*german*/ "Man erzählt sich, daß eine #in der Nähe einer Prinzessin ruhende Spinne# in Jabu-Jabus Bauch #[[1]]# hielte.",
                                                                               /*french*/ "Selon moi, une #Skulltula près de la princesse dans le Ventre de Jabu-Jabu# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                            // /*spanish*/ Según dicen, una #Skulltula junto a una princesa# en la Tripa de Jabu-Jabu otorga #[[1]]#.
 
-    hintTextTable[RHT_JABU_JABUS_BELLY_GS_NEAR_BOSS] = HintText(CustomMessage("They say that #jellyfish surround a spider# holding #[[1]]#.",
-                                                                   /*german*/ "",
+    hintTextTable[RHT_JABU_JABUS_BELLY_GS_NEAR_BOSS] = HintText(CustomMessage("They say that #a spider surrounded by jellyfish# in Jabu-Jabu's Belly holds #[[1]]#.",
+                                                                   /*german*/ "Man erzählt sich, daß eine #von Quallen umgebene Spinne# in Jabu-Jabus Bauch #[[1]]# hielte.",
                                                                    /*french*/ "Selon moi, une #Skulltula entourée de méduses dans le Ventre de Jabu-Jabu# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                 // /*spanish*/ Según dicen, una #Skulltula rodeada de medusas# otorga #[[1]]#.
 
     hintTextTable[RHT_JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM] = HintText(CustomMessage("They say that a #spider guarded by a school of stingers# in Jabu-Jabu's Belly holds #[[1]]#.",
-                                                                           /*german*/ "",
+                                                                           /*german*/ "Man erzählt sich, daß eine #von Rochen bewachte Spinne# in Jabu-Jabus Bauch #[[1]]# hielte.",
                                                                            /*french*/ "Selon moi, une #Skulltula protégée par des raies dans le Ventre de Jabu-Jabu# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                         // /*spanish*/ Según dicen, una #Skulltula rodeada por unos stingers# en la Tripa de Jabu-Jabu otorga #[[1]]#.
 
     hintTextTable[RHT_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM] = HintText(CustomMessage("They say that a #spider surrounded by electricity# in Jabu-Jabu's Belly holds #[[1]]#.",
-                                                                             /*german*/ "",
+                                                                             /*german*/ "Man erzählt sich, daß eine #von Elektrizität umgebene Spinne# in Jabu-Jabus Bauch #[[1]]# hielte.",
                                                                              /*french*/ "Selon moi, une #Skulltula entourée d'électricité dans le Ventre de Jabu-Jabu# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                           // /*spanish*/ Según dicen, una #Skulltula rodeada de electricidad# en la Tripa de Jabu-Jabu otorga #[[1]]#.
 
     hintTextTable[RHT_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM] = HintText(CustomMessage("They say that a #spider guarded by a school of stingers# in Jabu-Jabu's Belly holds #[[1]]#.",
-                                                                                 /*german*/ "",
+                                                                                 /*german*/ "Man erzählt sich, daß eine #von Rochen bewachte Spinne# in Jabu-Jabus Bauch #[[1]]# hielte.",
                                                                                  /*french*/ "Selon moi, une #Skulltula protégée par des raies dans le Ventre de Jabu-Jabu# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                               // /*spanish*/ Según dicen, una #Skulltula protegida por unos stingers# en la Tripa de Jabu-Jabu otorga #[[1]]#.
 
     hintTextTable[RHT_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS] = HintText(CustomMessage("They say that a #spider in a web within Jabu-Jabu's Belly# holds #[[1]]#.",
-                                                                      /*german*/ "",
+                                                                      /*german*/ "Man erzählt sich, daß eine #Spinne innerhalb einer Webe in Jabu-Jabus Bauch# #[[1]]# hielte.",
                                                                       /*french*/ "Selon moi, une #Skulltula sur une toile dans le Ventre de Jabu-Jabu# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                    // /*spanish*/ Según dicen, una #Skulltula sobre una red# en la Tripa de Jabu-Jabu otorga #[[1]]#.
 
     hintTextTable[RHT_JABU_JABUS_BELLY_DEKU_SCRUB] = HintText(CustomMessage("They say that a #scrub in a deity# sells #[[1]]#.",
-                                                                 /*german*/ "",
+                                                                 /*german*/ "Man erzählt sich, daß ein #Deku in einer Gottheit #[[1]]# verkaufe.",
                                                                  /*french*/ "Selon moi, la #peste Mojo dans le ventre du gardien# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                               // /*spanish*/ Según dicen, un #deku dentro de cierta deidad# vende #[[1]]#.
   /*--------------------------
   |      FOREST TEMPLE       |
   ---------------------------*/
  hintTextTable[RHT_FOREST_TEMPLE_FIRST_ROOM_CHEST] = HintText(CustomMessage("They say that a #tree in the Forest Temple# supports #[[1]]#.",
-                                                                    /*german*/ "",
+                                                                    /*german*/ "Man erzählt sich, daß ein #Baum im Waldtempel# #[[1]]# unterstütze.",
                                                                     /*french*/ "Selon moi, sur l'#arbre dans le Temple de la Forêt# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                  // /*spanish*/ Según dicen, sobre un #árbol del Templo del Bosque# yace #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_FIRST_STALFOS_CHEST] = HintText(CustomMessage("They say that #defeating enemies beneath a falling ceiling# in Forest Temple yields #[[1]]#.",
-                                                                       /*german*/ "",
+                                                                       /*german*/ "Man erzählt sich, daß das #Besiegen von Gegnern unter einer fallenden Decke# im Waldtempel #[[1]]# brächte.",
                                                                        /*french*/ "Selon moi, #deux squelettes# dans le Temple de la Forêt protègent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                     // /*spanish*/ Según dicen, #derrotar enemigos caídos de lo alto# del Templo del Bosque revela #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_WELL_CHEST] = HintText(CustomMessage("They say that a #sunken chest deep in the woods# contains #[[1]]#.",
-                                                              /*german*/ "",
+                                                              /*german*/ "Man erzählt sich, daß eine #gesunkene Truhe tief im Wald# #[[1]]# enthielte.",
                                                               /*french*/ "Selon moi, le #coffre submergé dans la forêt# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                            // /*spanish*/ Según dicen, un #sumergido cofre en lo profundo del bosque# contiene #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say that a #fiery skull# in Forest Temple guards #[[1]]#.",
-                                                             /*german*/ "",
+                                                             /*german*/ "Man erzählt sich, daß ein #feuriger Schädel# im Waldtempel #[[1]]# bewache.",
                                                              /*french*/ "Selon moi, le #crâne enflammé# dans le Temple de la Forêt protège #[[1]]#.", {QM_RED, QM_GREEN}));
                                                           // /*spanish*/ Según dicen, una #ardiente calavera# del Templo del Bosque esconde #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST] = HintText(CustomMessage("They say that a #chest on a small island# in the Forest Temple holds #[[1]]#.",
-                                                                                 /*german*/ "",
+                                                                                 /*german*/ "Man erzählt sich, daß eine ##Truhe auf einer kleinen Insel# im Waldtempel #[[1]]# enthielte.",
                                                                                  /*french*/ "Selon moi, le #coffre sur l'îlot# du Temple de la Forêt contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                               // /*spanish*/ Según dicen, un #cofre sobre una isla# del Templo del Bosque contiene #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST] = HintText(CustomMessage("They say that beneath a #checkerboard falling ceiling# lies #[[1]]#.",
-                                                                              /*german*/ "",
+                                                                              /*german*/ "Man erzählt sich, daß unter einer #fallenden Schachbrettdecke# #[[1]]# läge.",
                                                                               /*french*/ "Selon moi, sous #l'échiquier tombant# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                            // /*spanish*/ Según dicen, tras un #techo de ajedrez# yace #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_EYE_SWITCH_CHEST] = HintText(CustomMessage("They say that #blocks of stone# in the Forest Temple surround #[[1]]#.",
-                                                                    /*german*/ "",
+                                                                    /*german*/ "Man erzählt sich, daß #Steinblöcke# im Waldtempel #[[1]]# umgeben würden.",
                                                                     /*french*/ "Selon moi, les #blocs dans le Temple de la Forêt# entourent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                  // /*spanish*/ Según dicen, cerca de unos #bloques de piedra# del Templo del Bosque yace #[[1]]#.
                                                                  {}, {
                                                                  CustomMessage("They say that a #sharp eye# will spot #[[1]]#.",
-                                                                     /*german*/ "",
+                                                                     /*german*/ "Man erzählt sich, daß ein #scharfes Auge# #[[1]]# erkennen würde.",
                                                                      /*french*/ "Selon moi, l'#oeil perçant# dans la forêt verra #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                   // /*spanish*/ Según dicen, un #afilado ojo# revela #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_BOSS_KEY_CHEST] = HintText(CustomMessage("They say that a #turned trunk# contains #[[1]]#.",
-                                                                  /*german*/ "",
+                                                                  /*german*/ "Man erzählt sich, daß ein #gedrehter Baumstamm# #[[1]]# enthielte.",
                                                                   /*french*/ "Selon moi, le #coffre pivoté# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                // /*spanish*/ Según dicen, en una #sala con otro punto de vista# se esconde #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_FLOORMASTER_CHEST] = HintText(CustomMessage("They say that deep in the forest #shadows guard a chest# containing #[[1]]#.",
-                                                                     /*german*/ "",
+                                                                     /*german*/ "Man erzählt sich, daß tief im Wald, #Schatten eine Truhe bewachen#, welche [[1]]# enthielte.",
                                                                      /*french*/ "Selon moi, l'#ombre de la forêt# protège un coffre contenant #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                   // /*spanish*/ Según dicen, en lo profundo del bosque #unas sombras# esconden #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_BOW_CHEST] = HintText(CustomMessage("They say that #Stalfos deep in the Forest Temple# guard #[[1]]#.",
-                                                             /*german*/ "",
+                                                             /*german*/ "Man erzählt sich, daß #Stalfos tief im Waldtempel# #[[1]]# bewachen würden.",
                                                              /*french*/ "Selon moi, #trois squelettes dans le Temple de la Forêt# protègent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                           // /*spanish*/ Según dicen, los #Stalfos en lo profundo del Templo del Bosque# guardan #[[1]]#.
                                                           {}, {
                                                           CustomMessage("They say that an #army of the dead# guards #[[1]]#.",
-                                                              /*german*/ "",
+                                                              /*german*/ "Man erzählt sich, daß eine #Armee der Toten# #[[1]]# bewachen würden.",
                                                               /*french*/ "Selon moi, des #squelettes sylvestres# protègent #[[1]]#.", {QM_RED, QM_GREEN})});
                                                            // /*spanish*/ Según dicen, un #ejército de soldados caídos# guarda #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_RED_POE_CHEST] = HintText(CustomMessage("They say that a #red ghost# guards #[[1]]#.",
-                                                                 /*german*/ "",
+                                                                 /*german*/ "Man erzählt sich, daß ein #roter Geist# #[[1]]# bewachen würde.",
                                                                  /*french*/ "Selon moi, le #fantôme rouge# protège #[[1]]#.", {QM_RED, QM_GREEN}),
                                                               // /*spanish*/ Según dicen, un #espectro rojo# guarda #[[1]]#.
                                                               {}, {
                                                               CustomMessage("They say that #Joelle# guards #[[1]]#.",
-                                                                  /*german*/ "",
+                                                                  /*german*/ "Man erzählt sich, daß #Joelle# #[[1]]# bewachen würde.",
                                                                   /*french*/ "Selon moi, #Joelle# protège #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                // /*spanish*/ Según dicen, #Joelle# guarda #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_BLUE_POE_CHEST] = HintText(CustomMessage("They say that a #blue ghost# guards #[[1]]#.",
-                                                                  /*german*/ "",
+                                                                  /*german*/ "Man erzählt sich, daß ein #blauer Geist# #[[1]]# bewachen würde.",
                                                                   /*french*/ "Selon moi, le #fantôme bleu# protège #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                // /*spanish*/ Según dicen, un #espectro azul# guarda #[[1]]#.
                                                                {}, {
                                                                CustomMessage("They say that #Beth# guards #[[1]]#.",
-                                                                   /*german*/ "",
+                                                                   /*german*/ "Man erzählt sich, daß #Beth# #[[1]]# bewachen würde.",
                                                                    /*french*/ "Selon moi, #Beth# protège #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                 // /*spanish*/ Según dicen, #Beth# guarda #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_BASEMENT_CHEST] = HintText(CustomMessage("They say that #revolving walls# in the Forest Temple conceal #[[1]]#.",
-                                                                  /*german*/ "",
+                                                                  /*german*/ "Man erzählt sich, daß #drehende Wände# im Waldtempel #[[1]]# verbergen würden.",
                                                                   /*french*/ "Selon moi, des #murs rotatifs dans la forêt# recèlent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                // /*spanish*/ Según dicen, las #paredes giratorias# del Templo del Bosque conceden #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST] = HintText(CustomMessage("They say that a #tree in the Forest Temple# supports #[[1]]#.",
-                                                                       /*german*/ "",
+                                                                       /*german*/ "Man erzählt sich, daß ein #Baum im Waldtempel# #[[1]]# unterstütze.",
                                                                        /*french*/ "Selon moi, sur l'#arbre dans le Temple de la Forêt# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                     // /*spanish*/ Según dicen, sobre un #árbol del Templo del Bosque# yace #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_MQ_WOLFOS_CHEST] = HintText(CustomMessage("They say that #defeating enemies beneath a falling ceiling# in Forest Temple yields #[[1]]#.",
-                                                                   /*german*/ "",
+                                                                   /*german*/ "Man erzählt sich, daß das #Besiegen von Gegnern unter einer fallenden Decke# im Waldtempel #[[1]]# brächte.",
                                                                    /*french*/ "Selon moi, #deux squelettes# dans le Temple de la Forêt protègent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                 // /*spanish*/ Según dicen, #derrotar enemigos caídos de lo alto# del Templo del Bosque revela #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_MQ_BOW_CHEST] = HintText(CustomMessage("They say that #Stalfos deep in the Forest Temple# guard #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß #Stalfos tief im Waldtempel# #[[1]]# bewachen würden.",
                                                                 /*french*/ "Selon moi, #trois squelettes dans le Temple de la Forêt# protègent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                              // /*spanish*/ Según dicen, los #Stalfos en lo profundo del Templo del Bosque# guardan #[[1]]#.
                                                              {}, {
                                                              CustomMessage("They say that an #army of the dead# guards #[[1]]#.",
-                                                                 /*german*/ "",
+                                                                 /*german*/ "Man erzählt sich, daß eine #Armee der Toten# #[[1]]# bewachen würden.",
                                                                  /*french*/ "Selon moi, des #squelettes sylvestres# protègent #[[1]]#.", {QM_RED, QM_GREEN})});
                                                               // /*spanish*/ Según dicen, un #ejército de soldados caídos# guarda #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST] = HintText(CustomMessage("They say that a #chest on a small island# in the Forest Temple holds #[[1]]#.",
-                                                                                          /*german*/ "",
+                                                                                          /*german*/ "Man erzählt sich, daß eine ##Truhe auf einer kleinen Insel# im Waldtempel #[[1]]# enthielte.",
                                                                                           /*french*/ "Selon moi, le #coffre sur l'îlot# du Temple de la Forêt contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                        // /*spanish*/ Según dicen, un #cofre sobre una isla# del Templo del Bosque contiene #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST] = HintText(CustomMessage("They say that #high in a courtyard# within the Forest Temple is #[[1]]#.",
-                                                                                          /*german*/ "",
+                                                                                          /*german*/ "Man erzählt sich, daß #hoch in einem Hof# innerhalb des Waldtempels #[[1]]# sei.",
                                                                                           /*french*/ "Selon moi, #haut perché dans le jardin# du Temple de la Forêt gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                        // /*spanish*/ Según dicen, un #cofre en lo alto de un patio# del Templo del Bosque contiene #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_MQ_WELL_CHEST] = HintText(CustomMessage("They say that a #sunken chest deep in the woods# contains #[[1]]#.",
-                                                                 /*german*/ "",
+                                                                 /*german*/ "Man erzählt sich, daß eine #gesunkene Truhe tief im Wald# #[[1]]# enthielte.",
                                                                  /*french*/ "Selon moi, le #coffre submergé dans la forêt# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                               // /*spanish*/ Según dicen, un #sumergido cofre en lo profundo del bosque# contiene #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_MQ_MAP_CHEST] = HintText(CustomMessage("They say that a #red ghost# guards #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß ein #roter Geist# #[[1]]# bewachen würde.",
                                                                 /*french*/ "Selon moi, le #fantôme rouge# protège #[[1]]#.", {QM_RED, QM_GREEN}),
                                                              // /*spanish*/ Según dicen, un #fantasma rojo# guarda #[[1]]#.
                                                              {}, {
                                                              CustomMessage("They say that #Joelle# guards #[[1]]#.",
-                                                                 /*german*/ "",
+                                                                 /*german*/ "Man erzählt sich, daß #Joelle# #[[1]]# bewachen würde.",
                                                                  /*french*/ "Selon moi, #Joelle# protège #[[1]]#.", {QM_RED, QM_GREEN})});
                                                               // /*spanish*/ Según dicen, #Joelle# guarda #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_MQ_COMPASS_CHEST] = HintText(CustomMessage("They say that a #blue ghost# guards #[[1]]#.",
-                                                                    /*german*/ "",
+                                                                    /*german*/ "Man erzählt sich, daß ein #blauer Geist# #[[1]]# bewachen würde.",
                                                                     /*french*/ "Selon moi, le #fantôme bleu# protège #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                  // /*spanish*/ Según dicen, un #fantasma azul# guarda #[[1]]#.
                                                                  {}, {
                                                                  CustomMessage("They say that #Beth# guards #[[1]]#.",
-                                                                     /*german*/ "",
+                                                                     /*german*/ "Man erzählt sich, daß #Beth# #[[1]]# bewachen würde.",
                                                                      /*french*/ "Selon moi, #Beth# protège #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                   // /*spanish*/ Según dicen, #Beth# guarda #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST] = HintText(CustomMessage("They say that beneath a #checkerboard falling ceiling# lies #[[1]]#.",
-                                                                                 /*german*/ "",
+                                                                                 /*german*/ "Man erzählt sich, daß unter einer #fallenden Schachbrettdecke# #[[1]]# läge.",
                                                                                  /*french*/ "Selon moi, sous #l'échiquier tombant# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                               // /*spanish*/ Según dicen, tras un #techo de ajedrez# yace #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_MQ_BASEMENT_CHEST] = HintText(CustomMessage("They say that #revolving walls# in the Forest Temple conceal #[[1]]#.",
-                                                                     /*german*/ "",
+                                                                     /*german*/ "Man erzählt sich, daß #drehende Wände# im Waldtempel #[[1]]# verbergen würden.",
                                                                      /*french*/ "Selon moi, des #murs rotatifs dans la forêt# recèlent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                   // /*spanish*/ Según dicen, las #paredes giratorias# del Templo del Bosque conceden #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_MQ_REDEAD_CHEST] = HintText(CustomMessage("They say that deep in the forest #undead guard a chest# containing #[[1]]#.",
-                                                                   /*german*/ "",
+                                                                   /*german*/ "Man erzählt sich, daß tief im Wald #Untote eine Truhe bewachen#, welche #[[1]]# enthielte.",
                                                                    /*french*/ "Selon moi, des #revenants dans le Temple de la Forêt# protègent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                 // /*spanish*/ Según dicen, en lo profundo del bosque #guardias del más allá# guardan #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_MQ_BOSS_KEY_CHEST] = HintText(CustomMessage("They say that a #turned trunk# contains #[[1]]#.",
-                                                                     /*german*/ "",
+                                                                     /*german*/ "Man erzählt sich, daß ein #gedrehter Baumstamm# #[[1]]# enthielte.",
                                                                      /*french*/ "Selon moi, le #coffre pivoté# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                   // /*spanish*/ Según dicen, en una #sala con otro punto de vista# se esconde #[[1]]#.
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_overworld.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_overworld.cpp
index 570101b4e..84c74da87 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_overworld.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_overworld.cpp
@@ -6,167 +6,167 @@ namespace Rando {
 void StaticData::HintTable_Init_Exclude_Overworld() {
 
    hintTextTable[RHT_KF_KOKIRI_SWORD_CHEST] = HintText(CustomMessage("They say that the #hidden treasure of the Kokiri# is #[[1]]#.",
-                                                           /*german*/ "",
+                                                           /*german*/ "Man erzählt sich, daß der #versteckte Schatz der Kokiri# #[[1]]# sei.",
                                                            /*french*/ "Selon moi, le #trésor des Kokiri# est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                         // /*spanish*/ Según dicen, el #tesoro oculto de los Kokiri# esconde #[[1]]#.
 
     hintTextTable[RHT_KF_MIDOS_TOP_LEFT_CHEST] = HintText(CustomMessage("They say that #inside Mido's house# is #[[1]]#.",
-                                                             /*german*/ "",
+                                                             /*german*/ "Man erzählt sich, daß #in Midos Haus# #[[1]]# sei.",
                                                              /*french*/ "Selon moi, #dans la maison de Mido# gît #[[1]]#.", {QM_RED, QM_GREEN}),
                                                           // /*spanish*/ Según dicen, en la #casa de Mido# yace #[[1]]#.
                                                           {}, {
                                                           CustomMessage("They say that the #leader of the Kokiri# hides #[[1]]#.",
-                                                              /*german*/ "",
+                                                              /*german*/ "Man erzählt sich, daß der #Anführer der Kokiri# #[[1]]# verstecke.",
                                                               /*french*/ "Selon moi, le #chef des Kokiri# possède #[[1]]#.", {QM_RED, QM_GREEN})});
                                                            // /*spanish*/ Según dicen, el #líder de los Kokiri# esconde #[[1]]#.
 
     hintTextTable[RHT_KF_MIDOS_TOP_RIGHT_CHEST] = HintText(CustomMessage("They say that #inside Mido's house# is #[[1]]#.",
-                                                              /*german*/ "",
+                                                              /*german*/ "Man erzählt sich, daß #in Midos Haus# #[[1]]# sei.",
                                                               /*french*/ "Selon moi, #dans la maison de Mido# gît #[[1]]#.", {QM_RED, QM_GREEN}),
                                                            // /*spanish*/ Según dicen, en la #casa de Mido# yace #[[1]]#.
                                                            {}, {
                                                            CustomMessage("They say that the #leader of the Kokiri# hides #[[1]]#.",
-                                                               /*german*/ "",
+                                                               /*german*/ "Man erzählt sich, daß der #Anführer der Kokiri# #[[1]]# verstecke.",
                                                                /*french*/ "Selon moi, le #chef des Kokiri# possède #[[1]]#.", {QM_RED, QM_GREEN})});
                                                             // /*spanish*/ Según dicen, el #líder de los Kokiri# esconde #[[1]]#.
 
     hintTextTable[RHT_KF_MIDOS_BOTTOM_LEFT_CHEST] = HintText(CustomMessage("They say that #inside Mido's house# is #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß #in Midos Haus# #[[1]]# sei.",
                                                                 /*french*/ "Selon moi, #dans la maison de Mido# gît #[[1]]#.", {QM_RED, QM_GREEN}),
                                                              // /*spanish*/ Según dicen, en la #casa de Mido# yace #[[1]]#.
                                                              {}, {
                                                              CustomMessage("They say that the #leader of the Kokiri# hides #[[1]]#.",
-                                                                 /*german*/ "",
+                                                                 /*german*/ "Man erzählt sich, daß der #Anführer der Kokiri# #[[1]]# verstecke.",
                                                                  /*french*/ "Selon moi, le #chef des Kokiri# possède #[[1]]#.", {QM_RED, QM_GREEN})});
                                                               // /*spanish*/ Según dicen, el #líder de los Kokiri# esconde #[[1]]#.
 
     hintTextTable[RHT_KF_MIDOS_BOTTOM_RIGHT_CHEST] = HintText(CustomMessage("They say that #inside Mido's house# is #[[1]]#.",
-                                                                 /*german*/ "",
+                                                                 /*german*/ "Man erzählt sich, daß #in Midos Haus# #[[1]]# sei.",
                                                                  /*french*/ "Selon moi, #dans la maison de Mido# gît #[[1]]#.", {QM_RED, QM_GREEN}),
                                                               // /*spanish*/ Según dicen, en la #casa de Mido# yace #[[1]]#.
                                                               {}, {
                                                               CustomMessage("They say that the #leader of the Kokiri# hides #[[1]]#.",
-                                                                  /*german*/ "",
+                                                                  /*german*/ "Man erzählt sich, daß der #Anführer der Kokiri# #[[1]]# verstecke.",
                                                                   /*french*/ "Selon moi, le #chef des Kokiri# possède #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                // /*spanish*/ Según dicen, el #líder de los Kokiri# esconde #[[1]]#.
 
     hintTextTable[RHT_GRAVEYARD_SHIELD_GRAVE_CHEST] = HintText(CustomMessage("They say that the #treasure of a fallen soldier# is #[[1]]#.",
-                                                                  /*german*/ "",
+                                                                  /*german*/ "Man erzählt sich, daß der #Schatz eines gefallenen Soldaten# #[[1]]# sei.",
                                                                   /*french*/ "Selon moi, le #trésor du soldat mort# est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                // /*spanish*/ Según dicen, el #tesoro de un soldado caído# esconde #[[1]]#.
 
     hintTextTable[RHT_DMT_CHEST] = HintText(CustomMessage("They say that hidden behind a wall on a #mountain trail# is #[[1]]#.",
-                                               /*german*/ "",
+                                               /*german*/ "Man erzählt sich, daß hinter einer Wand des #Gebirgspfads# #[[1]]# sei.",
                                                /*french*/ "Selon moi, derrière une façade du #chemin montagneux# est #[[1]]#.", {QM_RED, QM_GREEN}));
                                             // /*spanish*/ Según dicen, tras una pared del #sendero de la montaña# yace #[[1]]#.
 
     hintTextTable[RHT_GC_MAZE_RIGHT_CHEST] = HintText(CustomMessage("They say that in #Goron City# explosives unlock #[[1]]#.",
-                                                         /*german*/ "",
+                                                         /*german*/ "Man erzählt sich, daß in #Goronia# Explosionen #[[1]]# freischalten würden.",
                                                          /*french*/ "Selon moi, des explosions dans le #village Goron# révèlent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                       // /*spanish*/ Según dicen, en la #Ciudad Goron# unos explosivos desbloquean #[[1]]#.
 
     hintTextTable[RHT_GC_MAZE_CENTER_CHEST] = HintText(CustomMessage("They say that in #Goron City# explosives unlock #[[1]]#.",
-                                                          /*german*/ "",
+                                                          /*german*/ "Man erzählt sich, daß in #Goronia# Explosionen #[[1]]# freischalten würden.",
                                                           /*french*/ "Selon moi, des explosions dans le #village Goron# révèlent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                        // /*spanish*/ Según dicen, en la #Ciudad Goron# unos explosivos desbloquean #[[1]]#.
 
     hintTextTable[RHT_ZD_CHEST] = HintText(CustomMessage("They say that fire #beyond a waterfall# reveals #[[1]]#.",
-                                              /*german*/ "",
+                                              /*german*/ "Man erzählt sich, daß Feuer #hinter einem Wasserfall# #[[1]]# enthüllen würde.",
                                               /*french*/ "Selon moi, du feu #derrière la cascade# éclaire #[[1]]#.", {QM_RED, QM_GREEN}));
                                            // /*spanish*/ Según dicen, las #llamas tras una una cascada# revelan #[[1]]#.
 
     hintTextTable[RHT_GRAVEYARD_HOOKSHOT_CHEST] = HintText(CustomMessage("They say that #dead Dampé's first prize# is #[[1]]#.",
-                                                              /*german*/ "",
+                                                              /*german*/ "Man erzählt sich, daß #Igors erster Preis# #[[1]]# sei.",
                                                               /*french*/ "Selon moi, la #première course d'Igor# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                            // /*spanish*/ Según dicen, el primer premio de #la carrera de Dampé# se trata de #[[1]]#.
                                                            {}, {
                                                            CustomMessage("They say that a chest hidden by a #speedy spectre# holds #[[1]]#.",
-                                                               /*german*/ "",
+                                                               /*german*/ "Man erzählt sich, daß eine von einem #schnellen Gespenst# versteckte Truhe #[[1]]# enthielte.",
                                                                /*french*/ "Selon moi, le #coffre du rapide revenant# contient #[[1]]#.", {QM_RED, QM_GREEN})});
                                                             // /*spanish*/ Según dicen, un cofre custodiado por un #espectro veloz# contiene #[[1]]#.
 
     hintTextTable[RHT_GF_CHEST] = HintText(CustomMessage("They say that on a #rooftop in the desert# lies #[[1]]#.",
-                                              /*german*/ "",
+                                              /*german*/ "Man erzählt sich, daß auf einem #Dach in der Wüste# #[[1]]# läge.",
                                               /*french*/ "Selon moi, sur un #toit du désert# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                            // /*spanish*/ Según dicen, en una #azotea del desierto# yace #[[1]]#.
 
     hintTextTable[RHT_KAK_REDEAD_GROTTO_CHEST] = HintText(CustomMessage("They say that #zombies beneath the earth# guard #[[1]]#.",
-                                                             /*german*/ "",
+                                                             /*german*/ "Man erzählt sich, daß die #Untoten unter der Erde# #[[1]]# bewachen würden.",
                                                              /*french*/ "Selon moi, les #revenants sous terre# protègent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                           // /*spanish*/ Según dicen, unos #zombis subterráneos# esconden #[[1]]#.
 
     hintTextTable[RHT_SFM_WOLFOS_GROTTO_CHEST] = HintText(CustomMessage("They say that #wolves beneath the earth# guard #[[1]]#.",
-                                                             /*german*/ "",
+                                                             /*german*/ "Man erzählt sich, daß die #Wölfe unter der Erde# #[[1]]# bewachen würden.",
                                                              /*french*/ "Selon moi, les #loups sous terre# protègent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                           // /*spanish*/ Según dicen, unos #lobos subterráneos# esconden #[[1]]#.
 
     hintTextTable[RHT_HF_NEAR_MARKET_GROTTO_CHEST] = HintText(CustomMessage("They say that a #hole in a field near a drawbridge# holds #[[1]]#.",
-                                                                 /*german*/ "",
+                                                                 /*german*/ "Man erzählt sich, daß ein #Loch in einem Feld nahe der Zugbrücke# #[[1]]# enthielte.",
                                                                  /*french*/ "Selon moi, la #grotte près d'un pont# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                               // /*spanish*/ Según dicen, bajo el #hoyo de una llanura cercano a un puente# yace #[[1]]#.
 
     hintTextTable[RHT_HF_NEAR_MARKET_GROTTO_FISH] = HintText(CustomMessage("They say that a #fish in a hole in a field near a drawbridge# holds #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß ein #Fisch in einem Loch in einem Feld nahe der Zugbrücke# #[[1]]# enthielte.",
                                                                 /*french*/ "Selon moi, la #grotte près d'un pont# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/ Según dicen, bajo el #hoyo de una llanura cercano a un puente# yace #[[1]]#.
 
     hintTextTable[RHT_HF_SOUTHEAST_GROTTO_CHEST] = HintText(CustomMessage("They say that a #hole amongst trees in a field# holds #[[1]]#.",
-                                                               /*german*/ "",
+                                                               /*german*/ "Man erzählt sich, daß ein #Loch inmitten der Bäume in einem Feld# #[[1]]# enthielte.",
                                                                /*french*/ "Selon moi, la #grotte près des arbres# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                             // /*spanish*/ Según dicen, bajo el #hoyo de una llanura rodeado de árboles# yace #[[1]]#.
 
     hintTextTable[RHT_HF_SOUTHEAST_GROTTO_FISH] = HintText(CustomMessage("They say that a #fish in a hole amongst trees in a field# holds #[[1]]#.",
-                                                              /*german*/ "",
+                                                              /*german*/ "Man erzählt sich, daß ein #Fisch in einem Loch inmitten von Bäumen in einem Feld# #[[1]]# enthielte.",
                                                               /*french*/ "Selon moi, la #grotte près des arbres# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                            // /*spanish*/ Según dicen, bajo el #hoyo de una llanura rodeado de árboles# yace #[[1]]#.
 
     hintTextTable[RHT_HF_OPEN_GROTTO_CHEST] = HintText(CustomMessage("They say that an #open hole in a field# holds #[[1]]#.",
-                                                          /*german*/ "",
+                                                          /*german*/ "Man erzählt sich, daß ein #offenes Loch in einem Feld# #[[1]]# enthielte.",
                                                           /*french*/ "Selon moi, la #grotte dans les plaines# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                        // /*spanish*/ Según dicen, bajo el #hoyo descubierto de una llanura# yace #[[1]]#.
 
     hintTextTable[RHT_HF_OPEN_GROTTO_FISH] = HintText(CustomMessage("They say that a #fish in an open hole in a field# holds #[[1]]#.",
-                                                         /*german*/ "",
+                                                         /*german*/ "Man erzählt sich, daß ein #Fisch in einem offenen Loch auf einem Feld# #[[1]]# enthielte.",
                                                          /*french*/ "Selon moi, la #grotte dans les plaines# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                       // /*spanish*/ Según dicen, bajo el #hoyo descubierto de una llanura# yace #[[1]]#.
 
     hintTextTable[RHT_KAK_OPEN_GROTTO_CHEST] = HintText(CustomMessage("They say that an #open hole in a town# holds #[[1]]#.",
-                                                           /*german*/ "",
+                                                           /*german*/ "Man erzählt sich, daß ein #offenes Loch in einer Stadt# #[[1]]# enthielte.",
                                                            /*french*/ "Selon moi, la #grotte dans le village# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                         // /*spanish*/ Según dicen, bajo el #hoyo descubierto de un pueblo# yace #[[1]]#.
 
     hintTextTable[RHT_KAK_OPEN_GROTTO_FISH] = HintText(CustomMessage("They say that a #fish in an open hole in a town# holds #[[1]]#.",
-                                                          /*german*/ "",
+                                                          /*german*/ "Man erzählt sich, daß ein #Fisch in einem Loch in einer Stadt# #[[1]]# enthielte.",
                                                           /*french*/ "Selon moi, la #grotte dans le village# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                        // /*spanish*/ Según dicen, bajo el #hoyo descubierto de un pueblo# yace #[[1]]#.
 
     hintTextTable[RHT_ZR_OPEN_GROTTO_CHEST] = HintText(CustomMessage("They say that a #hole along a river# holds #[[1]]#.",
-                                                          /*german*/ "",
+                                                          /*german*/ "Man erzählt sich, daß ein #Loch entlang eines Flusses# #[[1]]# enthielte.",
                                                           /*french*/ "Selon moi, la #grotte près du fleuve# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                        // /*spanish*/ Según dicen, bajo un #hoyo junto a un río# yace #[[1]]#.
 
     hintTextTable[RHT_ZR_OPEN_GROTTO_FISH] = HintText(CustomMessage("They say that a #fish in a hole along a river# holds #[[1]]#.",
-                                                         /*german*/ "",
+                                                         /*german*/ "Man erzählt sich, daß ein #Fisch in einem Loch entlang eines Flusses# #[[1]]# enthielte.",
                                                          /*french*/ "Selon moi, la #grotte près du fleuve# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                       // /*spanish*/ Según dicen, bajo un #hoyo junto a un río# yace #[[1]]#.
 
     hintTextTable[RHT_KF_STORMS_GROTTO_CHEST] = HintText(CustomMessage("They say that a #hole in a forest village# holds #[[1]]#.",
-                                                            /*german*/ "",
+                                                            /*german*/ "Man erzählt sich, daß ein #Loch in einem Dorf des Waldes# #[[1]]# enthielte.",
                                                             /*french*/ "Selon moi, la #grotte inondée de pluie dans le Village Kokiri# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
                                                          // /*spanish*/ Según dicen, bajo el #hoyo de una tribu del bosque# yace #[[1]]#.
 
     hintTextTable[RHT_KF_STORMS_GROTTO_FISH] = HintText(CustomMessage("They say that a #fish in a hole in a forest village# holds #[[1]]#.",
-                                                           /*german*/ "",
+                                                           /*german*/ "Man erzählt sich, daß ein #Fisch in einem Loch in einem Dorf des Waldes# #[[1]]# enthielte.",
                                                            /*french*/ "Selon moi, la #grotte inondée de pluie dans le Village Kokiri# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
                                                         // /*spanish*/ Según dicen, bajo el #hoyo de una tribu del bosque# yace #[[1]]#.
 
     hintTextTable[RHT_LW_NEAR_SHORTCUTS_GROTTO_CHEST] = HintText(CustomMessage("They say that a #hole in a wooded maze# holds #[[1]]#.",
-                                                                    /*german*/ "",
+                                                                    /*german*/ "Man erzählt sich, daß ein #Loch in einem hölzernen Labyrinth# #[[1]]# enthielte.",
                                                                     /*french*/ "Selon moi, la #grotte dans le labyrinthe sylvestre# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                  // /*spanish*/ Según dicen, bajo un #hoyo de un laberinto forestal# yace #[[1]]#.
 
     hintTextTable[RHT_LW_NEAR_SHORTCUTS_GROTTO_FISH] = HintText(CustomMessage("They say that a #fish in a hole in a wooded maze# holds #[[1]]#.",
-                                                                   /*german*/ "",
+                                                                   /*german*/ "Man erzählt sich, daß ein #Fisch in einem Loch in einem hölzernen Labyrinth# #[[1]]# enthielte.",
                                                                    /*french*/ "Selon moi, la #grotte dans le labyrinthe sylvestre# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                 // /*spanish*/ Según dicen, bajo un #hoyo de un laberinto forestal# yace #[[1]]#.
 
@@ -1488,4 +1488,4 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                               /*french*/ "Selon moi,  #[[1]]#.", {QM_RED, QM_GREEN}));
                                                            // /*spanish*/ Según dicen, una #colmena detrás del rey de los zoras# esconde #[[1]]#.
 }
-}
\ No newline at end of file
+}
diff --git a/soh/src/overlays/gamestates/ovl_select/z_select.c b/soh/src/overlays/gamestates/ovl_select/z_select.c
index f4d577c5c..6d89521f9 100644
--- a/soh/src/overlays/gamestates/ovl_select/z_select.c
+++ b/soh/src/overlays/gamestates/ovl_select/z_select.c
@@ -149,7 +149,7 @@ static SceneSelectEntry sScenes[] = {
     { "19:SPOT20", "19:Lon Lon Ranch", "19:Lon Lon-Farm", "19:Ranch Lon Lon", Select_LoadGame, ENTR_LON_LON_RANCH_0 },
     { "20:" GFXP_HIRAGANA "ﾄｷﾉﾏ", "20:Temple Of Time", "20:Zitadelle der Zeit", "20:Temple du Temps", Select_LoadGame, ENTR_TEMPLE_OF_TIME_0 },
     { "21:" GFXP_HIRAGANA "ｹﾝｼﾞｬﾉﾏ", "21:Chamber of Sages", "21:Halle der Weisen", "21:Sanctuaire des Sages", Select_LoadGame, ENTR_CHAMBER_OF_THE_SAGES_0 },
-    { "22:" GFXP_HIRAGANA "ｼｬﾃｷｼﾞｮｳ", "22:Shooting Gallery", "22:Schiessbude ", "22:Jeu d'adresse", Select_LoadGame, ENTR_SHOOTING_GALLERY_0 },
+    { "22:" GFXP_HIRAGANA "ｼｬﾃｷｼﾞｮｳ", "22:Shooting Gallery", "22:Schiessbude", "22:Jeu d'adresse", Select_LoadGame, ENTR_SHOOTING_GALLERY_0 },
     { "23:" GFXP_KATAKANA "ﾊｲﾗﾙ" GFXP_HIRAGANA "ﾆﾜ" GFXP_KATAKANA "ｹﾞｰﾑ", "23:Castle Courtyard Game", "23:Burghof - Wachen", "23:Cour du Chateau (Infilration)", Select_LoadGame, ENTR_CASTLE_COURTYARD_GUARDS_DAY_0 },
     { "24:" GFXP_HIRAGANA "ﾊｶｼﾀﾄﾋﾞｺﾐｱﾅ", "24:Grave 1", "24:Grab 1", "24:Tombe 1", Select_LoadGame, ENTR_REDEAD_GRAVE_0 },
     { "25:" GFXP_HIRAGANA "ﾊｶｼﾀﾄﾋﾞｺﾐｱﾅ 2", "25:Grave 2", "25:Grab 2", "25:Tombe 2", Select_LoadGame, ENTR_GRAVE_WITH_FAIRYS_FOUNTAIN_0 },
@@ -165,7 +165,7 @@ static SceneSelectEntry sScenes[] = {
     { "35:" GFXP_KATAKANA "ﾛﾝﾛﾝ" GFXP_HIRAGANA "ﾎﾞｸｼﾞｮｳ ｿｳｺ 2", "35:Lon Lon Ranch Silo", "35:Lon Lon-Farm Silo", "35:Silo du Ranch Lon Lon", Select_LoadGame, ENTR_LON_LON_BUILDINGS_1 },
     { "36:" GFXP_HIRAGANA "ﾐﾊﾘ ｺﾞﾔ", "36:Guard House", "36:Wachposten", "36:Maison de Garde", Select_LoadGame, ENTR_MARKET_GUARD_HOUSE_0 },
     { "37:" GFXP_HIRAGANA "ﾏﾎｳ ﾉ ｸｽﾘﾔ", "37:Potion Shop", "37:Magie-Laden", "37:Apothicaire", Select_LoadGame, ENTR_POTION_SHOP_GRANNY_0 },
-    { "38:" GFXP_HIRAGANA "ﾀｶﾗﾊﾞｺﾔ", "38:Treasure Chest Game", "38:Trhenlotterie", "38:Chasse aux Tresors", Select_LoadGame, ENTR_TREASURE_BOX_SHOP_0 },
+    { "38:" GFXP_HIRAGANA "ﾀｶﾗﾊﾞｺﾔ", "38:Treasure Chest Game", "38:Truhenlotterie", "38:Chasse aux Tresors", Select_LoadGame, ENTR_TREASURE_BOX_SHOP_0 },
     { "39:" GFXP_HIRAGANA "ｷﾝ " GFXP_KATAKANA "ｽﾀﾙﾁｭﾗ ﾊｳｽ", "39:House Of Skulltula", "39:Skulltulas Haus", "39:Maison des Skulltulas", Select_LoadGame, ENTR_HOUSE_OF_SKULLTULA_0 },
     { "40:" GFXP_HIRAGANA "ｼﾞｮｳｶﾏﾁ ｲﾘｸﾞﾁ", "40:Entrance to Market", "40:Eingang zum Marktplatz", "40:Entree de la Place du Marche", Select_LoadGame, ENTR_MARKET_ENTRANCE_DAY_0 },
     { "41:" GFXP_HIRAGANA "ｼﾞｮｳｶﾏﾁ", "41:Market", "41:Marktplatz", "41:Place du Marche", Select_LoadGame, ENTR_MARKET_DAY_0 },
@@ -192,11 +192,11 @@ static SceneSelectEntry sScenes[] = {
     { "62:" GFXP_HIRAGANA "ｼﾞｮｳｶﾏﾁ ｸｽﾘﾔ", "62:Potion Shop", "62:Magie-Laden", "62:Apothicaire (Boutique)", Select_LoadGame, ENTR_POTION_SHOP_MARKET_0 },
     { "63:" GFXP_HIRAGANA "ｳﾗﾛｼﾞ ﾖﾙﾉﾐｾ", "63:Bombchu Shop", "63:Krabbelminen-Laden", "63:Boutique de Missiles Teigneux", Select_LoadGame, ENTR_BOMBCHU_SHOP_0 },
     { "64:" GFXP_HIRAGANA "ｵﾒﾝﾔ", "64:Happy Mask Shop", "64:Maskenhaendler", "64:Foire aux Masques", Select_LoadGame, ENTR_HAPPY_MASK_SHOP_0 },
-    { "65:" GFXP_KATAKANA "ｹﾞﾙﾄﾞ" GFXP_HIRAGANA "ﾉｼｭｳﾚﾝｼﾞｮｳ", "65:Gerudo Training Ground", "65:Gerudo-Arena", "65:Gymnase Gerudo", Select_LoadGame, ENTR_GERUDO_TRAINING_GROUND_0 },
+    { "65:" GFXP_KATAKANA "ｹﾞﾙﾄﾞ" GFXP_HIRAGANA "ﾉｼｭｳﾚﾝｼﾞｮｳ", "65:Gerudo Training Ground", "65:Gerudo-Trainingsarena", "65:Gymnase Gerudo", Select_LoadGame, ENTR_GERUDO_TRAINING_GROUND_0 },
     { "66:" GFXP_HIRAGANA "ﾖｳｾｲﾉｷﾉ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ", "66:Inside the Deku Tree", "66:Im Deku-Baum", "66:Arbre Mojo", Select_LoadGame, ENTR_DEKU_TREE_0 },
     { "67:" GFXP_HIRAGANA "ﾖｳｾｲﾉｷﾉ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ ﾎﾞｽ", "67:Gohma's Lair", "67:Gohmas Verlies", "67:Repaire de Gohma", Select_LoadGame, ENTR_DEKU_TREE_BOSS_0 },
     { "68:" GFXP_KATAKANA "ﾄﾞﾄﾞﾝｺﾞ ﾀﾞﾝｼﾞｮﾝ", "68:Dodongo's Cavern", "68:Dodongos Hoehle", "68:Caverne Dodongo", Select_LoadGame, ENTR_DODONGOS_CAVERN_0 },
-    { "69:" GFXP_KATAKANA "ﾄﾞﾄﾞﾝｺﾞ ﾀﾞﾝｼﾞｮﾝ ﾎﾞｽ", "69:King Dodongo's Lair", "69:King Dodongos Verlies", "69:Repaire du Roi Dodongo", Select_LoadGame, ENTR_DODONGOS_CAVERN_BOSS_0 },
+    { "69:" GFXP_KATAKANA "ﾄﾞﾄﾞﾝｺﾞ ﾀﾞﾝｼﾞｮﾝ ﾎﾞｽ", "69:King Dodongo's Lair", "69:Koenig Dodongos Verlies", "69:Repaire du Roi Dodongo", Select_LoadGame, ENTR_DODONGOS_CAVERN_BOSS_0 },
     { "70:" GFXP_HIRAGANA "ｷｮﾀﾞｲｷﾞｮ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ", "70:Inside Jabu-Jabu's Belly", "70:Jabu-Jabus Bauch", "70:Ventre de Jabu-Jabu", Select_LoadGame, ENTR_JABU_JABU_0 },
     { "71:" GFXP_HIRAGANA "ｷｮﾀﾞｲｷﾞｮ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ ﾎﾞｽ", "71:Barinade's Lair", "71:Barinades Verlies", "71:Repaire de Barinade", Select_LoadGame, ENTR_JABU_JABU_BOSS_0 },
     { "72:" GFXP_HIRAGANA "ﾓﾘﾉｼﾝﾃﾞﾝ", "72:Forest Temple", "72:Waldtempel", "72:Temple de la Foret", Select_LoadGame, ENTR_FOREST_TEMPLE_0 },
@@ -338,7 +338,7 @@ static BetterSceneSelectEntry sBetterScenes[] = {
     }},
     { "10:Temple of Time", "10:Zitadelle der Zeit", "10:Temple du Temps", Select_LoadGame, 5, { 
         { "From Outside", "Von draussen", "Depuis l'Entree", ENTR_TEMPLE_OF_TIME_0, 0 },
-        { "From Master Sword Pedestal", "Vom Master-Schwert Podest", "Depuis le Piedestal de l'Epee de Legende", ENTR_TEMPLE_OF_TIME_2, 0 },
+        { "From Master Sword Pedestal", "Vom Podest des Master-Schwerts", "Depuis le Piedestal de l'Epee de Legende", ENTR_TEMPLE_OF_TIME_2, 0 },
         { "Prelude of Light Warp", "Kantate des Lichts Teleport", "Teleporteur du Prelude de la Lumiere", ENTR_TEMPLE_OF_TIME_7, 0 },
         { "Outside Temple of Time - From Market", "Vor der Zitadelle der Zeit - Vom Marktplatz", "Exterieur du Temple - Depuis la Place du Marche", ENTR_TEMPLE_OF_TIME_EXTERIOR_DAY_0, 0 },
         { "Outside Temple of Time - From Temple of Time", "Vor der Zitadelle der Zeit - Von der Zitadelle der Zeit", "Exterieur du Temple - Depuis le Temple", ENTR_TEMPLE_OF_TIME_EXTERIOR_DAY_1, 0 },
@@ -347,7 +347,7 @@ static BetterSceneSelectEntry sBetterScenes[] = {
         { "From Market", "Vom Marktplatz", "Depuis la Place du Marche", ENTR_HYRULE_CASTLE_0, 0 },
         { "From Castle Courtyard", "Vom Burghof", "Depuis la Cour du Chateau", ENTR_HYRULE_CASTLE_1, 0 },
         { "From Great Fairy", "Von der Feen-Quelle", "Depuis la Grande Fee", ENTR_HYRULE_CASTLE_2, 0 },
-        { "From Courtyard Guard Capture", "Von Wachen-Festnahme", "Depuis la capture d'un Garde de la Cour", ENTR_HYRULE_CASTLE_3, 0 },
+        { "From Courtyard Guard Capture", "Von der Wachen-Festnahme", "Depuis la capture d'un Garde de la Cour", ENTR_HYRULE_CASTLE_3, 0 },
         { "Great Fairy", "Feen-Quelle", "Grande Fee", ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_2, 0 },
     }},
     { "12:Hyrule Castle Courtyard", "12:Burghof", "12:Cour du Chateau", Select_LoadGame, 3, {
@@ -360,7 +360,7 @@ static BetterSceneSelectEntry sBetterScenes[] = {
         { "From Ranch House", "Vom Farmhaus", "Depuis la Maison du Ranch", ENTR_LON_LON_RANCH_4, 0 },
         { "From Stables", "Vom Stall", "Depuis l'Etable", ENTR_LON_LON_RANCH_5, 0 },
         { "From Back Tower", "Vom Silo", "Depuis Silo du Ranch", ENTR_LON_LON_RANCH_10, 0 },
-        { "Epona Song Cutscene", "Eponas Song Cutscene", "Cinematique du Chant d'Epona", ENTR_LON_LON_RANCH_1, 0 },
+        { "Epona Song Cutscene", "Eponas Song Sequenz", "Cinematique du Chant d'Epona", ENTR_LON_LON_RANCH_1, 0 },
     }},
     { "14:Lon Lon Ranch Buildings", "14:Lon Lon-Farm Gebaeude", "14:Batiments du Ranch Lon Lon", Select_LoadGame, 3, {
         { "Ranch House", "Farmhaus", "Maison du Ranch", ENTR_LON_LON_BUILDINGS_0, 0 },
@@ -381,7 +381,7 @@ static BetterSceneSelectEntry sBetterScenes[] = {
         { "From Impas House (Cow)", "Von Impas Haus (Kuh)", "Depuis la Maison d'Impa (Vache)", ENTR_KAKARIKO_VILLAGE_15, 0 },
         { "From Windmill", "Von der Windmuehle", "Depuis le Moulin", ENTR_KAKARIKO_VILLAGE_8, 0 },
         { "From Shooting Gallery", "Von der Schiessbude", "Depuis le Jeu d'adresse", ENTR_KAKARIKO_VILLAGE_10, 0 },
-        { "From Skulltula House", "Vom Skulltula Haus", "Depuis la Maison des Skulltulas", ENTR_KAKARIKO_VILLAGE_11, 0 },
+        { "From Skulltula House", "Vom Haus der Skulltulas", "Depuis la Maison des Skulltulas", ENTR_KAKARIKO_VILLAGE_11, 0 },
         { "Owl Drop Spot from Death Mountain", "Eulen-Absetzpunkt vom Todesberg", "Point de chute du Hibou depuis le Mont du Peril", ENTR_KAKARIKO_VILLAGE_14, 0 },
     }},
     { "16:Kakariko Buildings", "16:Kakariko Gebaeude", "16:Batiments du Village Cocorico", Select_LoadGame, 9, {
@@ -393,7 +393,7 @@ static BetterSceneSelectEntry sBetterScenes[] = {
         { "Impas House (Near Cow)", "Impas Haus (Kuh)", "Maison d'Impa (Vache)", ENTR_IMPAS_HOUSE_1, 0 },
         { "Boss House", "Haus des Bosses", "Maison du Boss", ENTR_KAKARIKO_CENTER_GUEST_HOUSE_0, 0 },
         { "Windmill", "Windmuehle", "Moulin", ENTR_WINDMILL_AND_DAMPES_GRAVE_1, 0 },
-        { "Skulltula House", "Skulltula Haus", "Maison des SKulltulas", ENTR_HOUSE_OF_SKULLTULA_0, 0 },
+        { "Skulltula House", "Haus der Skulltulas", "Maison des Skulltulas", ENTR_HOUSE_OF_SKULLTULA_0, 0 },
     }}, 
     { "17:Graveyard", "17:Friedhof", "17:Cimetiere", Select_LoadGame, 9, {
         { "From Kakariko", "Von Kakariko", "Depuis l'Apothicaire", ENTR_GRAVEYARD_0, 0 },
@@ -409,7 +409,7 @@ static BetterSceneSelectEntry sBetterScenes[] = {
     { "18:Graves", "18:Graeber", "18:Tombes", Select_LoadGame, 5, {
         { "Dampes Grave Minigame", "Boris' Grab-Minispiel", "Tour du Cimetiere d'Igor", ENTR_WINDMILL_AND_DAMPES_GRAVE_0, 0 },
         { "Royal Familys Tomb", "Koenigsgrab", "Tombe Royale", ENTR_ROYAL_FAMILYS_TOMB_0, 0 },
-        { "Royal Familys Tomb, Suns Song Cutscene", "Koenigsgrab, Hymne der Sonne Cutscene", "Tombe Royale, Cinematique du Chant du Soleil", ENTR_ROYAL_FAMILYS_TOMB_1, 0 },
+        { "Royal Familys Tomb, Suns Song Cutscene", "Koenigsgrab, Hymne der Sonne Sequenz", "Tombe Royale, Cinematique du Chant du Soleil", ENTR_ROYAL_FAMILYS_TOMB_1, 0 },
         { "Treasure Chest Grave", "Schatzkisten Grab", "Tombe au Coffre", ENTR_GRAVE_WITH_FAIRYS_FOUNTAIN_0, 0 },
         { "ReDead Grave", "Zombie Grab", "Tombe au Effrois", ENTR_REDEAD_GRAVE_0, 0 },
     }},
@@ -477,7 +477,7 @@ static BetterSceneSelectEntry sBetterScenes[] = {
     }},
     { "28:Gerudo Fortress", "28:Gerudo-Festung", "28:Forteresse Gerudo", Select_LoadGame, 18, {
         { "From Gerudo Valley", "Vom Gerudotal", "Depuis la Vallee Gerudo", ENTR_GERUDOS_FORTRESS_0, 0 },
-        { "From Gerudo Training Grounds", "Von der Gerudo-Arena", "Depuis le Gymnase Gerudo", ENTR_GERUDOS_FORTRESS_14, 0 },
+        { "From Gerudo Training Grounds", "Von der Gerudo-Trainingsarena", "Depuis le Gymnase Gerudo", ENTR_GERUDOS_FORTRESS_14, 0 },
         { "From Haunted Wasteland", "Von der Gespensterwueste", "Depuis le Desert Hante", ENTR_GERUDOS_FORTRESS_15, 0 },
         { "Horseback Riding Minigame", "Bogen zu Pferde Minispiel", "Archerie Montee", ENTR_GERUDOS_FORTRESS_16, 0 },
         { "Gerudo Fortress Jail", "Gerudo-Festung Gefaengnis", "Prison de la Forteresse Gerudo", ENTR_GERUDOS_FORTRESS_17, 0 },
@@ -525,45 +525,45 @@ static BetterSceneSelectEntry sBetterScenes[] = {
     }},
     { "32:Deku Tree", "32:Deku-Baum", "32:Arbre Mojo", Select_LoadGame, 3, {
         { "Entrance", "Eingang", "Entree", ENTR_DEKU_TREE_0, 1 },
-        { "From Gohma's Lair", "Vom Gohma Kampf", "Depuis le Repaire de Gohma", ENTR_DEKU_TREE_1, 1 },
-        { "Gohma's Lair", "Gohma Kampf", "Repaire de Gohma", ENTR_DEKU_TREE_BOSS_0, 0 },
+        { "From Gohma's Lair", "Von Gohmas Kampf", "Depuis le Repaire de Gohma", ENTR_DEKU_TREE_1, 1 },
+        { "Gohma's Lair", "Gohmas Kampf", "Repaire de Gohma", ENTR_DEKU_TREE_BOSS_0, 0 },
     }},
     { "33:Dodongos Cavern", "33:Dodongos Hoehle", "33:Caverne Dodongo", Select_LoadGame, 3, {
         { "Entrance", "Eingang", "Entree", ENTR_DODONGOS_CAVERN_0, 1 },
-        { "From King Dodongo", "Von King Dodongo", "Depuis le Repaire du Roi Dodongo", ENTR_DODONGOS_CAVERN_1, 1 },
-        { "King Dodongo's Lair", "King Dodongo Kampf", "Repaire du Roi Dodongo", ENTR_DODONGOS_CAVERN_BOSS_0, 0 },
+        { "From King Dodongo", "Von Koenig Dodongo", "Depuis le Repaire du Roi Dodongo", ENTR_DODONGOS_CAVERN_1, 1 },
+        { "King Dodongo's Lair", "Koenig Dodongos Kampf", "Repaire du Roi Dodongo", ENTR_DODONGOS_CAVERN_BOSS_0, 0 },
     }},
     { "34:Jabu Jabu", "34:Jabu-Jabu", "34:Jabu-Jabu", Select_LoadGame, 2, {
         { "Entrance", "Eingang", "Entree", ENTR_JABU_JABU_0, 1 },
-        { "Barinade's Lair", "Barinade Kampf", "Repaire de Barinade", ENTR_JABU_JABU_BOSS_0, 0 },
+        { "Barinade's Lair", "Barinades Kampf", "Repaire de Barinade", ENTR_JABU_JABU_BOSS_0, 0 },
     }},
     { "35:Forest Temple", "35:Waldtempel", "35:Temple de la Foret", Select_LoadGame, 4, {
         { "Entrance", "Eingang", "Entree", ENTR_FOREST_TEMPLE_0, 1 },
         { "Crushing Room", "Der Fallende Decke Raum", "Salle de Broyage", ENTR_FOREST_TEMPLE_2, 1 },
         { "Before Phantom Ganon", "Vor Phantom-Ganon", "Avant Ganon Spectral", ENTR_FOREST_TEMPLE_1, 1 },
-        { "Phantom Ganon's Lair", "Phantom-Ganon Kampf", "Repaire de Ganon Spectral", ENTR_FOREST_TEMPLE_BOSS_0, 0 },
+        { "Phantom Ganon's Lair", "Phantom-Ganons Kampf", "Repaire de Ganon Spectral", ENTR_FOREST_TEMPLE_BOSS_0, 0 },
     }},
     { "36:Fire Temple", "36:Feuertempel", "36:Temple du Feu", Select_LoadGame, 3, {
         { "Entrance", "Eingang", "Entrance", ENTR_FIRE_TEMPLE_0, 1 },
         { "Before Volvagia", "Vor Volvagia", "Avant Volvagia", ENTR_FIRE_TEMPLE_1, 1 },
-        { "Volvagia's Lair", "Volvagia Kampf", "Repaire de Volcania", ENTR_FIRE_TEMPLE_BOSS_0, 0 },
+        { "Volvagia's Lair", "Volvagias Kampf", "Repaire de Volcania", ENTR_FIRE_TEMPLE_BOSS_0, 0 },
     }},
     { "37:Water Temple", "37:Wassertempel", "37:Temple de l'Eau", Select_LoadGame, 2, { 
         { "Entrance", "Eingang", "Entree", ENTR_WATER_TEMPLE_0, 1 },
-        { "Morpha's Lair", "Morpha Kampf", "Repaire de Morpha", ENTR_WATER_TEMPLE_BOSS_0, 0 },
+        { "Morpha's Lair", "Morphas Kampf", "Repaire de Morpha", ENTR_WATER_TEMPLE_BOSS_0, 0 },
     }},
     { "38:Shadow Temple", "38:Schattentempel", "38:Temple de l'Ombre", Select_LoadGame, 3, {
         { "Entrance", "Eingang", "Entree", ENTR_SHADOW_TEMPLE_0, 1 },
         { "Outside Bongo Bongo", "Vor Bongo Bongo", "Avant Bongo Bongo", ENTR_SHADOW_TEMPLE_1, 1 },
-        { "Bongo Bongo's Lair", "Bongo Bongo Kampf", "Repaire de Bongo Bongo", ENTR_SHADOW_TEMPLE_BOSS_0, 1 },
+        { "Bongo Bongo's Lair", "Bongo Bongos Kampf", "Repaire de Bongo Bongo", ENTR_SHADOW_TEMPLE_BOSS_0, 1 },
     }},
     { "39:Spirit Temple", "39:Geistertempel", "39:Temple de l'Esprit", Select_LoadGame, 6, {
         { "Entrance", "Eingang", "Entree", ENTR_SPIRIT_TEMPLE_0, 1 },
         { "From Left Hand", "Von der linken Hand", "Depuis la Main Gauche", ENTR_SPIRIT_TEMPLE_2, 1 },
         { "From Right Hand", "Von der rechten Hand", "Depuis la Main Droite", ENTR_SPIRIT_TEMPLE_3, 1 },
         { "Before Twinrova", "Vor den Killa Ohmaz", "Avant le Duo Malefique", ENTR_SPIRIT_TEMPLE_1, 1 },
-        { "Nabooru Fight", "Naboru Kampf", "Combat contre Nabooru", ENTR_SPIRIT_TEMPLE_BOSS_0, 0 },
-        { "Twinrova's Lair", "Killa Ohmaz Kampf", "Repaire du Duo Malefique", ENTR_SPIRIT_TEMPLE_BOSS_2, 0 },
+        { "Nabooru Fight", "Naborus Kampf", "Combat contre Nabooru", ENTR_SPIRIT_TEMPLE_BOSS_0, 0 },
+        { "Twinrova's Lair", "Killa Ohmaz' Kampf", "Repaire du Duo Malefique", ENTR_SPIRIT_TEMPLE_BOSS_2, 0 },
     }},
     { "40:Ganons Castle", "40:Ganons Schloss", "40:Chateau de Ganon", Select_LoadGame, 9, {
         { "Entrance", "Eingang", "Entree", ENTR_INSIDE_GANONS_CASTLE_0, 1 },
@@ -573,8 +573,8 @@ static BetterSceneSelectEntry sBetterScenes[] = {
         { "Ganondorf's Lair", "Ganondorfs Verlies", "Repaire de Ganondorf", ENTR_GANONDORF_BOSS_0, 0 },
         { "Ganondorf Defeated", "Ganondorf Besiegt", "Ganondorf Vaincu", ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_5, 0 },
         { "Ganondorf Defeated (2)", "Ganondorf Besiegt (2)", "Ganondorf Vaincu (2)", ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_1, 0 },
-        { "Ganon's Lair", "Ganon Kampf", "Repaire de Ganon", ENTR_GANON_BOSS_0, 0 },
-        { "Ganon Death Cutscene", "Ganon Todes Cutscene", "Cinematique de la Mort de Ganon", ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_0, 0 },
+        { "Ganon's Lair", "Ganons Kampf", "Repaire de Ganon", ENTR_GANON_BOSS_0, 0 },
+        { "Ganon Death Cutscene", "Ganons Todessequenz", "Cinematique de la Mort de Ganon", ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_0, 0 },
     }},
     { "41:Bottom of the Well", "41:Grund des Brunnens", "41:Puits", Select_LoadGame, 1, {
         { "Entrance", "Eingang", "Entree", ENTR_BOTTOM_OF_THE_WELL_0, 1 },
@@ -582,7 +582,7 @@ static BetterSceneSelectEntry sBetterScenes[] = {
     { "42:Ice Cavern", "42:Eishoehle", "42:Caverne Polaire", Select_LoadGame, 1, {
         { "Entrance", "Eingang", "Entree", ENTR_ICE_CAVERN_0, 1 },
     }},
-    { "43:Gerudo Training Grounds", "43:Gerudo-Arena", "43:Gymnase Gerudo", Select_LoadGame, 1, {
+    { "43:Gerudo Training Grounds", "43:Gerudo-Trainingsarena", "43:Gymnase Gerudo", Select_LoadGame, 1, {
         { "Entrance", "Eingang", "Entree", ENTR_GERUDO_TRAINING_GROUND_0, 1 },
     }},
     { "44:Warps", "44:Teleportpunkte", "44:Teleporteurs", Select_LoadGame, 6, {
@@ -612,7 +612,7 @@ static BetterSceneSelectEntry sBetterScenes[] = {
         { "Zoras Fountain", "Zoras Quelle", "Fontaine Zora", ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_0, 0 },
         { "Desert Colossus", "Wuestenkoloss", "Colosse du Desert", ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_2, 0 },
     }},
-    { "47:Chest Grottos", "47:Truhen Grotten", "47:Grottes a Coffres", Select_Grotto_LoadGame, 11, {
+    { "47:Chest Grottos", "47:Truhengrotten", "47:Grottes a Coffres", Select_Grotto_LoadGame, 11, {
         { "Kokiri Forest (Song of Storms)", "Kokiri-Wald (Hymne des Sturms)", "Foret Kokiri (Chant des Tempetes)", 0x00, 0 },
         { "Lost Woods", "Verlorene Waelder", "Bois Perdus", 0x01, 0 },
         { "Sacred Forest Meadow", "Waldlichtung", "Bosquet Sacre", 0x02, 0 },
@@ -625,7 +625,7 @@ static BetterSceneSelectEntry sBetterScenes[] = {
         { "Death Mountain Crater", "Todeskrater", "Cratere du Peril", 0x09, 0 },
         { "Zora River (Open)", "Zora-Fluss (Offen)", "Riviere Zora (Deja Ouverte)", 0x0A, 0 },
     }},
-    { "48:Scrub Grottos", "48:Laubkerl Grotten", "48:Grottes des Pestes Marchandes", Select_Grotto_LoadGame, 10, {
+    { "48:Scrub Grottos", "48:Laubkerlgrotten", "48:Grottes des Pestes Marchandes", Select_Grotto_LoadGame, 10, {
         { "Hyrule Field (Near Lake)", "Hylianische Steppe (beim Hylia-See)", "Plaine d'Hyrule (Pres du Lac)", 0x0B, 0 },
         { "Death Mountain Crater", "Todeskrater", "Cratere du Peril", 0x0C, 0 },
         { "Goron City", "Goronia", "Village Goron", 0x0D, 0 },
@@ -651,8 +651,8 @@ static BetterSceneSelectEntry sBetterScenes[] = {
         { "SRD Map", "SRD Karte", "Carte SRD", ENTR_SASATEST_0, 0 },
         { "Test Map", "Test Karte", "Carte de Test", ENTR_TEST01_0, 0 },
         { "Treasure Chest Warp", "Schatzkisten Teleport", "Salle de Test - Objets", ENTR_TESTROOM_0, 0 },
-        { "Stalfos Miniboss Room", "Stalfos-Ritter Miniboss Raum", "Salle du Minoboss Stalfos", ENTR_SYOTES_0, 0 },
-        { "Stalfos Boss Room", "Stalfos-Ritter Boss Raum", "Salle de Boss Stalfos", ENTR_SYOTES2_0, 0 },
+        { "Stalfos Miniboss Room", "Stalfos-Ritter Miniboss-Raum", "Salle du Minoboss Stalfos", ENTR_SYOTES_0, 0 },
+        { "Stalfos Boss Room", "Stalfos-Ritter Boss-Raum", "Salle de Boss Stalfos", ENTR_SYOTES2_0, 0 },
         { "Dark Link Room", "Schwarzer Link Raum", "Salle de Dark Link", ENTR_SUTARU_0, 0 },
         { "Shooting Gallery Duplicate", "Schiessbude (Duplikat)", "Jeu d'Adresse (Duplicata)", ENTR_TEST_SHOOTING_GALLERY_0, 0 },
         { "Depth Test", "Tiefen Test", "Test de Profondeur", ENTR_DEPTH_TEST_0, 0 },

From 9c2e773ce4194c4c718cda7dbe70981c3e1e22ea Mon Sep 17 00:00:00 2001
From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Date: Sun, 18 Aug 2024 00:10:11 +0100
Subject: [PATCH 183/230] Bombchu logic fixes, Add BetterBombchShopping
 enhancment and some adjacent cleanups (#3733)

* Initial Bombchu rework implementation

* Finish bombchus in logic overhaul

* address reviews

* Post resolution fixes

* fix git being dumb

* Readd Child Wallet To Bombchu Bowling Logic

* post merge fixes

* fix some oversights in bombchu shopping logic

* doesn't work, linker errors

* cleanup old reviews

* Make it build, likely broken by VB

* attempt to fix carpet man second purchse text

* commit to change branch

* mostly have carpet guy working

* badly fix carpet salesman

* fix better bombchu shopping

* fix bombchu drops

* remember you need bombchus in inventory to get drops

* Address reviews

* post-SCL clean up and redo the bombchu ammo logic to apply better to the spirit edge case

* fix oversight which could have allowed for bombchus to logical exist when they shouldn't

* Remove special bombchu playthrough checks which are causing bugs and no longer needed

* fix Slingshot logic reset

* Convert helpers I touched into CanUse and HasItem

* last cleanups
---
 .gitignore                                    |   1 +
 .../custom-message/CustomMessageTypes.h       |   5 +-
 .../game-interactor/GameInteractor.h          |   1 +
 soh/soh/Enhancements/mods.cpp                 |   2 +-
 soh/soh/Enhancements/presets.h                |   6 +-
 .../Enhancements/randomizer/3drando/fill.cpp  |  19 +-
 .../3drando/hint_list/hint_list_item.cpp      |   6 +-
 .../randomizer/3drando/item_pool.cpp          |   1 -
 .../randomizer/3drando/location_access.cpp    |   5 -
 .../locacc_bottom_of_the_well.cpp             |  10 +-
 .../location_access/locacc_castle_town.cpp    |  10 +-
 .../location_access/locacc_death_mountain.cpp |   4 +-
 .../location_access/locacc_deku_tree.cpp      |  10 +-
 .../locacc_dodongos_cavern.cpp                |   2 +-
 .../location_access/locacc_forest_temple.cpp  |  26 +-
 .../location_access/locacc_ganons_castle.cpp  |  22 +-
 .../location_access/locacc_gerudo_valley.cpp  |   7 +-
 .../locacc_jabujabus_belly.cpp                |  11 +-
 .../location_access/locacc_kakariko.cpp       |   4 +-
 .../location_access/locacc_lost_woods.cpp     |   4 +-
 .../location_access/locacc_shadow_temple.cpp  |  12 +-
 .../location_access/locacc_spirit_temple.cpp  |  73 ++--
 .../location_access/locacc_water_temple.cpp   |   2 +-
 .../location_access/locacc_zoras_domain.cpp   |   2 +-
 .../Enhancements/randomizer/3drando/shops.cpp |  16 +-
 .../randomizer/3drando/spoiler_log.cpp        |   5 +-
 soh/soh/Enhancements/randomizer/context.cpp   |   2 -
 .../Enhancements/randomizer/hook_handlers.cpp |   7 +-
 soh/soh/Enhancements/randomizer/item_list.cpp |  11 +-
 .../Enhancements/randomizer/location_list.cpp |  20 +-
 soh/soh/Enhancements/randomizer/logic.cpp     | 118 +++----
 soh/soh/Enhancements/randomizer/logic.h       |  34 +-
 .../randomizer/option_descriptions.cpp        |   8 +-
 .../Enhancements/randomizer/randomizer.cpp    |  32 +-
 .../Enhancements/randomizer/randomizerTypes.h |  21 +-
 .../randomizer/randomizer_check_tracker.cpp   |   1 -
 soh/soh/OTRGlobals.cpp                        |  31 +-
 soh/soh/SohMenuBar.cpp                        |   7 +-
 soh/soh/z_message_OTR.cpp                     |  10 +-
 soh/src/code/z_en_item00.c                    |   9 +-
 soh/src/code/z_parameter.c                    |   2 +-
 .../overlays/actors/ovl_En_GirlA/z_en_girla.c | 321 ++++++++++++------
 .../overlays/actors/ovl_En_GirlA/z_en_girla.h |   4 +-
 soh/src/overlays/actors/ovl_En_Js/z_en_js.c   |  13 +-
 .../overlays/actors/ovl_En_Ossan/z_en_ossan.c |  18 +-
 45 files changed, 521 insertions(+), 414 deletions(-)

diff --git a/.gitignore b/.gitignore
index 09f29ab48..9c499abb0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,6 +41,7 @@ tools/asmsplitter/c/*
 ctx.c
 tools/*dSYM/
 graphs/
+.netcoredbg_hist
 
 # Assets
 *.png
diff --git a/soh/soh/Enhancements/custom-message/CustomMessageTypes.h b/soh/soh/Enhancements/custom-message/CustomMessageTypes.h
index 93681ebe9..5471a4886 100644
--- a/soh/soh/Enhancements/custom-message/CustomMessageTypes.h
+++ b/soh/soh/Enhancements/custom-message/CustomMessageTypes.h
@@ -15,10 +15,10 @@ typedef enum {
     TEXT_CHEST_GAME_REAL_GAMBLER = 0x006E,
     TEXT_ITEM_COMPASS = 0x0067,
     TEXT_CHEST_GAME_THANKS_A_LOT = 0x0084,
-    TEXT_BUY_BOMBCHU_10_PROMPT = 0x008C,
+    TEXT_BUY_BOMBCHUS_10_PROMPT = 0x008C,
     TEXT_GS_NO_FREEZE = 0x00B4,
     TEXT_GS_FREEZE = 0x00B5,
-    TEXT_BUY_BOMBCHU_10_DESC = 0x00BC,
+    TEXT_BUY_BOMBCHUS_10_DESC = 0x00BC,
     TEXT_HEART_PIECE = 0x00C2,
     TEXT_HEART_CONTAINER = 0x00C6,
     TEXT_ITEM_KEY_BOSS = 0x00C7,
@@ -161,6 +161,7 @@ typedef enum {
     TEXT_HBA_INITIAL_EXPLAINATION = 0x6040,
     TEXT_HBA_WANT_TO_TRY_AGAIN_YES_NO = 0x6041,
     TEXT_HBA_ALREADY_HAVE_1000 = 0x6042,
+    TEXT_CARPET_SALESMAN_CUSTOM_FAIL_TO_BUY = 0x6073,
     TEXT_CARPET_SALESMAN_1 = 0x6077,
     TEXT_CARPET_SALESMAN_2 = 0x6078,
     TEXT_MARKET_GUARD_NIGHT = 0x7003,
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h
index 2323e7222..3523fa405 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h
@@ -313,6 +313,7 @@ typedef enum {
     VB_GIVE_ITEM_FROM_GORON,
     // Opt: *EnJs
     VB_GIVE_ITEM_FROM_CARPET_SALESMAN,
+    VB_GIVE_BOMBCHUS_FROM_CARPET_SALESMAN,
     // Opt: *EnGm
     VB_GIVE_ITEM_FROM_MEDIGORON,
     // Opt: *EnMs
diff --git a/soh/soh/Enhancements/mods.cpp b/soh/soh/Enhancements/mods.cpp
index 2571b7d96..f84f99b52 100644
--- a/soh/soh/Enhancements/mods.cpp
+++ b/soh/soh/Enhancements/mods.cpp
@@ -344,7 +344,7 @@ void AutoSave(GetItemEntry itemEntry) {
                     case ITEM_BOMBCHU:
                     case ITEM_BOMBCHUS_5:
                     case ITEM_BOMBCHUS_20:
-                        if (!CVarGetInteger(CVAR_ENHANCEMENT("BombchuDrops"), 0)) {
+                        if (!CVarGetInteger(CVAR_ENHANCEMENT("EnableBombchuDrops"), 0)) {
                             performSave = true;
                         }
                         break;
diff --git a/soh/soh/Enhancements/presets.h b/soh/soh/Enhancements/presets.h
index da6279e80..39cd167c2 100644
--- a/soh/soh/Enhancements/presets.h
+++ b/soh/soh/Enhancements/presets.h
@@ -99,7 +99,7 @@ const std::vector<const char*> enhancementsCvars = {
     CVAR_ENHANCEMENT("BonkDamageMult"),
     CVAR_ENHANCEMENT("NoRandomDrops"),
     CVAR_ENHANCEMENT("NoHeartDrops"),
-    CVAR_ENHANCEMENT("BombchuDrops"),
+    CVAR_ENHANCEMENT("EnableBombchuDrops"),
     CVAR_ENHANCEMENT("GoronPot"),
     CVAR_ENHANCEMENT("FullHealthSpawn"),
     CVAR_ENHANCEMENT("DampeWin"),
@@ -218,6 +218,7 @@ const std::vector<const char*> enhancementsCvars = {
     CVAR_ENHANCEMENT("BowSlingshotAmmoFix"),
     CVAR_ENHANCEMENT("BetterFarore"),
     CVAR_ENHANCEMENT("DisableFirstPersonChus"),
+    CVAR_ENHANCEMENT("BetterBombchuShopping"),
     CVAR_ENHANCEMENT("HyperBosses"),
     CVAR_ENHANCEMENT("RupeeDash"),
     CVAR_ENHANCEMENT("RupeeDashInterval"),
@@ -713,6 +714,9 @@ const std::vector<PresetEntry> enhancedPresetEntries = {
 
     // Autosave
     PRESET_ENTRY_S32(CVAR_ENHANCEMENT("Autosave"), AUTOSAVE_LOCATION_AND_MAJOR_ITEMS),
+
+    // Bombchu shop doesn't sell out, and 10 bombchus cost 99 instead of 100
+    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("BetterBombchuShopping"), 1),
 };
 
 const std::vector<PresetEntry> randomizerPresetEntries = {
diff --git a/soh/soh/Enhancements/randomizer/3drando/fill.cpp b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
index de5ddbdb3..835055ee4 100644
--- a/soh/soh/Enhancements/randomizer/3drando/fill.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
@@ -201,8 +201,8 @@ std::vector<RandomizerCheck> GetAllEmptyLocations() {
 }
 
 bool IsBombchus(RandomizerGet item, bool includeShops = false){
-  return (item >= RG_BOMBCHU_5 && item <= RG_BOMBCHU_DROP) || item == RG_PROGRESSIVE_BOMBCHUS || 
-    (includeShops && (item == RG_BUY_BOMBCHU_10 || item == RG_BUY_BOMBCHU_20));
+  return (item >= RG_BOMBCHU_5 && item <= RG_BOMBCHU_20) || item == RG_PROGRESSIVE_BOMBCHUS || 
+    (includeShops && (item == RG_BUY_BOMBCHUS_10 || item == RG_BUY_BOMBCHUS_20));
 }
 
 bool IsBeatableWithout(RandomizerCheck excludedCheck, bool replaceItem, RandomizerGet ignore = RG_NONE){ //RANDOTODO make excludCheck an ItemLocation
@@ -244,7 +244,6 @@ std::vector<RandomizerCheck> GetAccessibleLocations(const std::vector<Randomizer
   //Variables for playthrough
   int gsCount = 0;
   const int maxGsCount = mode == SearchMode::GeneratePlaythrough ? GetMaxGSCount() : 0; //If generating playthrough want the max that's possibly useful, else doesn't matter
-  bool bombchusFound = false;
   std::vector<LogicVal> buyIgnores;
 
   //Variables for search
@@ -384,29 +383,23 @@ std::vector<RandomizerCheck> GetAccessibleLocations(const std::vector<Randomizer
               //Item is an advancement item, figure out if it should be added to this sphere
               if (!ctx->playthroughBeatable && location->GetPlacedItem().IsAdvancement()) {
                 ItemType type = location->GetPlacedItem().GetItemType();
-                bool bombchus = IsBombchus(locItem, true); //Is a bombchu location
 
                 //Decide whether to exclude this location
                 //This preprocessing is done to reduce the amount of searches performed in PareDownPlaythrough
                 //Want to exclude:
                 //1) Tokens after the last potentially useful one (the last one that gives an advancement item or last for token bridge)
-                //2) Bombchus after the first (including buy bombchus)
-                //3) Buy items of the same type, after the first (So only see Buy Deku Nut of any amount once)
+                //2) Buy items of the same type, after the first (So only see Buy Deku Nut of any amount once)
                 bool exclude = true;
                 //Exclude tokens after the last possibly useful one
                 if (type == ITEMTYPE_TOKEN && gsCount < maxGsCount) {
                   gsCount++;
                   exclude = false;
                 }
-                //Only print first bombchu location found
-                else if (bombchus && !bombchusFound) {
-                  bombchusFound = true;
-                  exclude = false;
-                }
+
                 //Handle buy items
                 //If ammo drops are off, don't do this step, since buyable ammo becomes logically important
                 // TODO: Reimplement Ammo Drops setting
-                else if (/*AmmoDrops.IsNot(AMMODROPS_NONE) &&*/ !(bombchus && bombchusFound) && type == ITEMTYPE_SHOP) {
+                else if (/*AmmoDrops.IsNot(AMMODROPS_NONE) &&*/ type == ITEMTYPE_SHOP) {
                   //Only check each buy item once
                   auto buyItem = location->GetPlacedItem().GetLogicVal();
                   //Buy item not in list to ignore, add it to list and write to playthrough
@@ -416,7 +409,7 @@ std::vector<RandomizerCheck> GetAccessibleLocations(const std::vector<Randomizer
                   }
                 }
                 //Add all other advancement items
-                else if (!bombchus && type != ITEMTYPE_TOKEN && (/*AmmoDrops.Is(AMMODROPS_NONE) ||*/ type != ITEMTYPE_SHOP)) {
+                else if (type != ITEMTYPE_TOKEN && (/*AmmoDrops.Is(AMMODROPS_NONE) ||*/ type != ITEMTYPE_SHOP)) {
                   exclude = false;
                 }
                 //Has not been excluded, add to playthrough
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp
index 52bfd1ffc..f9aa2a280 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp
@@ -1776,7 +1776,7 @@ void StaticData::HintTable_Init_Item() {
                                            CustomMessage("plenty of blast balls", /*german*/"viele Explosionsbälle", /*french*/"une abondance de boules bleues")});
                                             // /*spanish*/bastantes estallidos
 
-    hintTextTable[RHT_BOMBCHU_5] = HintText(CustomMessage("Bombchus (5 pieces)", /*german*/"Krabbelminen (5 Stück)", /*french*/"une demi-dizaine de Missiles"),
+    hintTextTable[RHT_BOMBCHUS_5] = HintText(CustomMessage("Bombchus (5 pieces)", /*german*/"Krabbelminen (5 Stück)", /*french*/"une demi-dizaine de Missiles"),
                                             // /*spanish*/unos (5) bombchus
                                             {
                                             CustomMessage("a prize of the House of Skulltulas", /*german*/"ein Preis des Skulltula-Hauses", /*french*/"un prix de la maison des Skulltulas"),
@@ -1793,7 +1793,7 @@ void StaticData::HintTable_Init_Item() {
                                             CustomMessage("a few trail blazers", /*german*/"ein paar Vorreiter", /*french*/"une poignée de zigzags éclatants")});
                                              // /*spanish*/un par de ratas propulsadas
 
-    hintTextTable[RHT_BOMBCHU_10] = HintText(CustomMessage("Bombchus (10 pieces)", /*german*/"Krabbelminen (10 Stück)", /*french*/"une dizaine de Missiles"),
+    hintTextTable[RHT_BOMBCHUS_10] = HintText(CustomMessage("Bombchus (10 pieces)", /*german*/"Krabbelminen (10 Stück)", /*french*/"une dizaine de Missiles"),
                                              // /*spanish*/unos (10) bombchus
                                              {
                                              CustomMessage("a prize of the House of Skulltulas", /*german*/"ein Preis des Skulltula-Hauses", /*french*/"un prix de la maison des Skulltulas"),
@@ -1810,7 +1810,7 @@ void StaticData::HintTable_Init_Item() {
                                              CustomMessage("some trail blazers", /*german*/"einige Vorreiter", /*french*/"un paquet de zigzags éclatants")});
                                               // /*spanish*/unas cuantas ratas propulsadas
 
-    hintTextTable[RHT_BOMBCHU_20] = HintText(CustomMessage("Bombchus (20 pieces)", /*german*/"Krabbelminen (20 Stück)", /*french*/"une vingtaine de Missiles"),
+    hintTextTable[RHT_BOMBCHUS_20] = HintText(CustomMessage("Bombchus (20 pieces)", /*german*/"Krabbelminen (20 Stück)", /*french*/"une vingtaine de Missiles"),
                                              // /*spanish*/unos (20) bombchus
                                              {
                                              CustomMessage("a prize of the House of Skulltulas", /*german*/"ein Preis des Skulltula-Hauses", /*french*/"un prix de la maison des Skulltulas"),
diff --git a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
index fd78f1843..f7250e17d 100644
--- a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
@@ -723,7 +723,6 @@ void GenerateItemPool() {
 
   //Fixed item locations
   ctx->PlaceItemInLocation(RC_HC_ZELDAS_LETTER, RG_ZELDAS_LETTER);
-  ctx->PlaceItemInLocation(RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS, RG_BOMBCHU_DROP);
 
   if (ctx->GetOption(RSK_SHUFFLE_KOKIRI_SWORD)) {
     AddItemToMainPool(RG_KOKIRI_SWORD);
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
index a64ef5f55..29b3cb217 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
@@ -69,11 +69,6 @@ bool LocationAccess::CanBuy() const {
       placed == RG_BUY_FAIRYS_SPIRIT) {
       OtherCondition = logic->HasBottle;
   }
-  // If bombchus in logic, need to have found chus to buy; if not just need bomb bag
-  else if (placed == RG_BUY_BOMBCHU_10 || placed == RG_BUY_BOMBCHU_20) {
-      OtherCondition =
-          (!ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->Bombs) || (ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->FoundBombchus);
-  }
 
   return SufficientWallet && OtherCondition;
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_bottom_of_the_well.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_bottom_of_the_well.cpp
index 4f5ab4086..44260c7eb 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_bottom_of_the_well.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_bottom_of_the_well.cpp
@@ -10,7 +10,7 @@ void AreaTable_Init_BottomOfTheWell() {
   ---------------------------*/
   areaTable[RR_BOTTOM_OF_THE_WELL_ENTRYWAY] = Area("Bottom of the Well Entryway", "Bottom of the Well", RA_BOTTOM_OF_THE_WELL, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_BOTTOM_OF_THE_WELL_MAIN_AREA,    {[]{return randoCtx->GetDungeon(Rando::BOTTOM_OF_THE_WELL)->IsVanilla() && logic->IsChild && (logic->CanChildAttack || logic->Nuts);}}),
+                  Entrance(RR_BOTTOM_OF_THE_WELL_MAIN_AREA,    {[]{return randoCtx->GetDungeon(Rando::BOTTOM_OF_THE_WELL)->IsVanilla() && logic->IsChild && (logic->CanChildAttack || logic->CanUse(RG_NUTS));}}),
                   Entrance(RR_BOTTOM_OF_THE_WELL_MQ_PERIMETER, {[]{return randoCtx->GetDungeon(Rando::BOTTOM_OF_THE_WELL)->IsMQ()      && logic->IsChild;}}),
                   Entrance(RR_KAKARIKO_VILLAGE,                {[]{return true;}}),
   });
@@ -31,12 +31,12 @@ void AreaTable_Init_BottomOfTheWell() {
                   LOCATION(RC_BOTTOM_OF_THE_WELL_COMPASS_CHEST,                randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH)),
                   LOCATION(RC_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST,       randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH)),
                   LOCATION(RC_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST,     (randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->HasExplosives),
-                  LOCATION(RC_BOTTOM_OF_THE_WELL_FREESTANDING_KEY,             (logic->Swim || logic->CanUse(RG_ZELDAS_LULLABY)) && logic->Sticks || logic->CanUse(RG_DINS_FIRE)),
-                  LOCATION(RC_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST,          logic->CanUse(RG_ZELDAS_LULLABY) && (logic->KokiriSword || (logic->Sticks && randoCtx->GetTrickOption(RT_BOTW_CHILD_DEADHAND)))),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_FREESTANDING_KEY,             (logic->Swim || logic->CanUse(RG_ZELDAS_LULLABY)) && logic->CanUse(RG_STICKS) || logic->CanUse(RG_DINS_FIRE)),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST,          logic->CanUse(RG_ZELDAS_LULLABY) && (logic->KokiriSword || (logic->CanUse(RG_STICKS) && randoCtx->GetTrickOption(RT_BOTW_CHILD_DEADHAND)))),
                   LOCATION(RC_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST,              logic->CanUse(RG_ZELDAS_LULLABY) && (randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH))),
                   LOCATION(RC_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST,       logic->CanUse(RG_ZELDAS_LULLABY)),
                   LOCATION(RC_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST,        logic->CanUse(RG_ZELDAS_LULLABY)),
-                  LOCATION(RC_BOTTOM_OF_THE_WELL_MAP_CHEST,                    logic->HasExplosives || (((logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 3) && (randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH))) || logic->CanUse(RG_DINS_FIRE) || (logic->Sticks && randoCtx->GetTrickOption(RT_BOTW_BASEMENT))) && logic->GoronBracelet)),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_MAP_CHEST,                    logic->HasExplosives || (((logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 3) && (randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH))) || logic->CanUse(RG_DINS_FIRE) || (logic->CanUse(RG_STICKS) && randoCtx->GetTrickOption(RT_BOTW_BASEMENT))) && logic->GoronBracelet)),
                   LOCATION(RC_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST,             logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 3) && (randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH))),
                   LOCATION(RC_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST,              logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 3) && (randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH))),
                   LOCATION(RC_BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM,           logic->Boomerang && (randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 3)),
@@ -57,7 +57,7 @@ void AreaTable_Init_BottomOfTheWell() {
                   //EventAccess(&WallFairy, {[]{return WallFairy || logic->Slingshot;}}),
   }, {
                   //Locations
-                  LOCATION(RC_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST,              logic->KokiriSword || (logic->Sticks && randoCtx->GetTrickOption(RT_BOTW_CHILD_DEADHAND))),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST,              logic->KokiriSword || (logic->CanUse(RG_STICKS) && randoCtx->GetTrickOption(RT_BOTW_CHILD_DEADHAND))),
                   LOCATION(RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY, logic->HasExplosives || (randoCtx->GetTrickOption(RT_BOTW_MQ_DEADHAND_KEY) && logic->Boomerang)),
                     //Trick: logic->HasExplosives || (LogicBotWMQDeadHandKey && logic->Boomerang)
                   LOCATION(RC_BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT,                logic->CanChildAttack),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
index f1f1e0d27..e809beb54 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
@@ -208,11 +208,13 @@ void AreaTable_Init_CastleTown() {
                   Entrance(RR_THE_MARKET, {[]{return true;}}),
   });
 
-  areaTable[RR_MARKET_BOMBCHU_BOWLING] = Area("Market Bombchu Bowling", "Market Bombchu Bowling", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_MARKET_BOMBCHU_BOWLING] = Area("Market Bombchu Bowling", "Market Bombchu Bowling", RA_NONE, NO_DAY_NIGHT_CYCLE, {
+                  //Events
+                  EventAccess(&logic->CouldPlayBowling, {[]{return (logic->ChildsWallet);}}),
+                }, {
                   //Locations
-                  LOCATION(RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,  logic->CanPlayBowling),
-                  LOCATION(RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE, logic->CanPlayBowling),
-                  LOCATION(RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS,     logic->CanPlayBowling),
+                  LOCATION(RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,  logic->CouldPlayBowling && logic->BombchusEnabled),
+                  LOCATION(RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE, logic->CouldPlayBowling && logic->BombchusEnabled),
                 }, {
                   //Exits
                   Entrance(RR_THE_MARKET, {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
index 6627c2286..73284dbc8 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
@@ -94,7 +94,7 @@ void AreaTable_Init_DeathMountain() {
                   LOCATION(RC_GC_MAZE_LEFT_CHEST,        logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_SILVER_GAUNTLETS) || (randoCtx->GetTrickOption(RT_GC_LEFTMOST) && logic->HasExplosives && logic->CanUse(RG_HOVER_BOOTS))),
                   LOCATION(RC_GC_MAZE_CENTER_CHEST,      logic->CanBlastOrSmash  || logic->CanUse(RG_SILVER_GAUNTLETS)),
                   LOCATION(RC_GC_MAZE_RIGHT_CHEST,       logic->CanBlastOrSmash  || logic->CanUse(RG_SILVER_GAUNTLETS)),
-                  LOCATION(RC_GC_POT_FREESTANDING_POH,   logic->IsChild && logic->GoronCityChildFire && (logic->Bombs || (logic->GoronBracelet && randoCtx->GetTrickOption(RT_GC_POT_STRENGTH)) || (logic->HasBombchus && randoCtx->GetTrickOption(RT_GC_POT)))),
+                  LOCATION(RC_GC_POT_FREESTANDING_POH,   logic->IsChild && logic->GoronCityChildFire && (logic->Bombs || (logic->GoronBracelet && randoCtx->GetTrickOption(RT_GC_POT_STRENGTH)) || (logic->CanUse(RG_BOMBCHU_5) && randoCtx->GetTrickOption(RT_GC_POT)))),
                   LOCATION(RC_GC_ROLLING_GORON_AS_CHILD, logic->IsChild && (logic->HasExplosives || (logic->GoronBracelet && randoCtx->GetTrickOption(RT_GC_ROLLING_STRENGTH)))),
                   LOCATION(RC_GC_ROLLING_GORON_AS_ADULT, logic->StopGCRollingGoronAsAdult),
                   LOCATION(RC_GC_GS_BOULDER_MAZE,        logic->IsChild && logic->CanBlastOrSmash),
@@ -183,7 +183,7 @@ void AreaTable_Init_DeathMountain() {
                   //Exits
                   Entrance(RR_DMC_UPPER_NEARBY,         {[]{return true;}}),
                   Entrance(RR_DMC_LADDER_AREA_NEARBY,   {[]{return logic->FireTimer >= 16 || logic->Hearts >= 3;}}),
-                  Entrance(RR_DMC_CENTRAL_NEARBY,       {[]{return logic->IsAdult && logic->CanUse(RG_GORON_TUNIC) && logic->CanUse(RG_DISTANT_SCARECROW) && ((logic->EffectiveHealth > 2) || (logic->Fairy && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).IsNot(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF)) || logic->CanUse(RG_NAYRUS_LOVE));}}),
+                  Entrance(RR_DMC_CENTRAL_NEARBY,       {[]{return logic->IsAdult && logic->CanUse(RG_GORON_TUNIC) && logic->CanUse(RG_DISTANT_SCARECROW) && ((logic->EffectiveHealth > 2) || (logic->CanUse(RG_BOTTLE_WITH_FAIRY) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).IsNot(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF)) || logic->CanUse(RG_NAYRUS_LOVE));}}),
                   Entrance(RR_DMC_LOWER_NEARBY,         {[]{return false;}}),
   });
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp
index dd7c665f7..492a226f4 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp
@@ -31,7 +31,7 @@ void AreaTable_Init_DekuTree() {
                   Entrance(RR_DEKU_TREE_ENTRYWAY,          {[]{return true;}}),
                   Entrance(RR_DEKU_TREE_2F_MIDDLE_ROOM,    {[]{return true;}}),
                   Entrance(RR_DEKU_TREE_COMPASS_ROOM,      {[]{return true;}}),
-                  Entrance(RR_DEKU_TREE_BASEMENT_LOWER,    {[]{return Here(RR_DEKU_TREE_LOBBY, []{return logic->CanAdultAttack || logic->CanChildAttack || logic->Nuts;});}}),
+                  Entrance(RR_DEKU_TREE_BASEMENT_LOWER,    {[]{return Here(RR_DEKU_TREE_LOBBY, []{return logic->CanAdultAttack || logic->CanChildAttack || logic->CanUse(RG_NUTS);});}}),
                   Entrance(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM, {[]{return false;}}),
                   Entrance(RR_DEKU_TREE_BOSS_ENTRYWAY,     {[]{return false;}}),
   });
@@ -180,7 +180,7 @@ void AreaTable_Init_DekuTree() {
                   //Locations
                   LOCATION(RC_DEKU_TREE_MQ_COMPASS_CHEST,   true),
                   LOCATION(RC_DEKU_TREE_MQ_GS_COMPASS_ROOM, logic->HookshotOrBoomerang &&
-                                                                               Here(RR_DEKU_TREE_MQ_COMPASS_ROOM, []{return logic->HasBombchus ||
+                                                                               Here(RR_DEKU_TREE_MQ_COMPASS_ROOM, []{return logic->CanUse(RG_BOMBCHU_5) ||
                                                                                (logic->Bombs && (logic->CanUse(RG_SONG_OF_TIME) || logic->IsAdult)) ||
                                                                                (logic->IsAdult && logic->CanUse(RG_MEGATON_HAMMER) && (logic->CanUse(RG_SONG_OF_TIME) || randoCtx->GetTrickOption(RT_DEKU_MQ_COMPASS_GS)));})),
   }, {
@@ -206,7 +206,7 @@ void AreaTable_Init_DekuTree() {
                   Entrance(RR_DEKU_TREE_MQ_BASEMENT_BACK_ROOM,        {[]{return Here(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK, []{return (logic->IsChild && logic->CanUse(RG_STICKS)) || logic->CanUse(RG_DINS_FIRE) ||
                                                                                Here(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_FRONT, []{return logic->IsAdult && logic->CanUse(RG_FIRE_ARROWS);});}) &&
                                                                                  Here(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK, []{return logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) ||
-                                                                                  logic->CanUseProjectile || (logic->Nuts && logic->CanUse(RG_STICKS));});}}),
+                                                                                  logic->CanUseProjectile || (logic->CanUse(RG_NUTS) && logic->CanUse(RG_STICKS));});}}),
                   Entrance(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_FRONT, {[]{return true;}}),
   });
 
@@ -217,7 +217,7 @@ void AreaTable_Init_DekuTree() {
   }, {
                   //Exits
                   Entrance(RR_DEKU_TREE_MQ_BASEMENT_LEDGE,           {[]{return logic->IsChild;}}),
-                  Entrance(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK, {[]{return (logic->IsChild && logic->CanUse(RG_KOKIRI_SWORD)) || logic->CanUseProjectile || (logic->Nuts && (logic->IsChild && logic->CanUse(RG_STICKS)));}}),
+                  Entrance(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK, {[]{return (logic->IsChild && logic->CanUse(RG_KOKIRI_SWORD)) || logic->CanUseProjectile || (logic->CanUse(RG_NUTS) && (logic->IsChild && logic->CanUse(RG_STICKS)));}}),
   });
 
   areaTable[RR_DEKU_TREE_MQ_BASEMENT_LEDGE] = Area("Deku Tree MQ Basement Ledge", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -258,7 +258,7 @@ void AreaTable_Init_DekuTree() {
                  // Events
                  EventAccess(&logic->DekuTreeClear, { [] {
                                                   return logic->DekuTreeClear || (logic->HasBossSoul(RG_GOHMA_SOUL) && 
-                                                         (logic->CanJumpslash && (logic->Nuts || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) ||
+                                                         (logic->CanJumpslash && (logic->CanUse(RG_NUTS) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) ||
                                                                            logic->HookshotOrBoomerang)));
                                               }}),
              },
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp
index 7cb2dbf0a..591705e51 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp
@@ -223,7 +223,7 @@ void AreaTable_Init_DodongosCavern() {
   }, {
                   //Locations
                   LOCATION(RC_DODONGOS_CAVERN_MQ_MAP_CHEST,                  true),
-                  LOCATION(RC_DODONGOS_CAVERN_MQ_COMPASS_CHEST,              logic->CanAdultAttack || logic->CanChildAttack || logic->Nuts),
+                  LOCATION(RC_DODONGOS_CAVERN_MQ_COMPASS_CHEST,              logic->CanAdultAttack || logic->CanChildAttack || logic->CanUse(RG_NUTS)),
                   LOCATION(RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST,          (logic->IsChild && logic->CanUse(RG_STICKS)) || logic->HasFireSource),
                   LOCATION(RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST,    logic->CanBlastOrSmash || (logic->IsChild && logic->CanUse(RG_STICKS)) || logic->CanUse(RG_DINS_FIRE) || (logic->IsAdult && (randoCtx->GetTrickOption(RT_DC_JUMP) || logic->HoverBoots || logic->Hookshot))),
                   LOCATION(RC_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM, logic->CanUse(RG_SONG_OF_TIME) && (logic->CanChildAttack || logic->CanAdultAttack)),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp
index 959c192ea..eaaee1f36 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp
@@ -22,7 +22,7 @@ void AreaTable_Init_ForestTemple() {
   areaTable[RR_FOREST_TEMPLE_FIRST_ROOM] = Area("Forest Temple First Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FOREST_TEMPLE_FIRST_ROOM_CHEST, true),
-                  LOCATION(RC_FOREST_TEMPLE_GS_FIRST_ROOM,    (logic->IsAdult && logic->Bombs) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_BOOMERANG) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->HasBombchus || logic->CanUse(RG_DINS_FIRE) || (randoCtx->GetTrickOption(RT_FOREST_FIRST_GS) && (logic->CanJumpslash || (logic->IsChild && logic->Bombs)))),
+                  LOCATION(RC_FOREST_TEMPLE_GS_FIRST_ROOM,    (logic->IsAdult && logic->Bombs) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_BOOMERANG) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOMBCHU_5) || logic->CanUse(RG_DINS_FIRE) || (randoCtx->GetTrickOption(RT_FOREST_FIRST_GS) && (logic->CanJumpslash || (logic->IsChild && logic->Bombs)))),
                 }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_ENTRYWAY,       {[]{return true;}}),
@@ -32,7 +32,7 @@ void AreaTable_Init_ForestTemple() {
   areaTable[RR_FOREST_TEMPLE_SOUTH_CORRIDOR] = Area("Forest Temple South Corridor", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_FIRST_ROOM, {[]{return true;}}),
-                  Entrance(RR_FOREST_TEMPLE_LOBBY,      {[]{return logic->CanAdultAttack || logic->CanChildAttack || logic->Nuts;}}),
+                  Entrance(RR_FOREST_TEMPLE_LOBBY,      {[]{return logic->CanAdultAttack || logic->CanChildAttack || logic->CanUse(RG_NUTS);}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_LOBBY] = Area("Forest Temple Lobby", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
@@ -127,11 +127,11 @@ void AreaTable_Init_ForestTemple() {
 
   areaTable[RR_FOREST_TEMPLE_MAP_ROOM] = Area("Forest Temple Map Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_FOREST_TEMPLE_MAP_CHEST, Here(RR_FOREST_TEMPLE_MAP_ROOM, []{return logic->HasExplosives || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_FAIRY_BOW) || ((logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT)) && (logic->Nuts || logic->HookshotOrBoomerang || logic->CanShield));})),
+                  LOCATION(RC_FOREST_TEMPLE_MAP_CHEST, Here(RR_FOREST_TEMPLE_MAP_ROOM, []{return logic->HasExplosives || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_FAIRY_BOW) || ((logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT)) && (logic->CanUse(RG_NUTS) || logic->HookshotOrBoomerang || logic->CanShield));})),
                 }, {
                   //Exits
-                  Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_LOWER, {[]{return Here(RR_FOREST_TEMPLE_MAP_ROOM, []{return logic->HasExplosives || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_FAIRY_BOW) || ((logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT)) && (logic->Nuts || logic->HookshotOrBoomerang || logic->CanShield));});}}),
-                  Entrance(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER, {[]{return Here(RR_FOREST_TEMPLE_MAP_ROOM, []{return logic->HasExplosives || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_FAIRY_BOW) || ((logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT)) && (logic->Nuts || logic->HookshotOrBoomerang || logic->CanShield));});}}),
+                  Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_LOWER, {[]{return Here(RR_FOREST_TEMPLE_MAP_ROOM, []{return logic->HasExplosives || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_FAIRY_BOW) || ((logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT)) && (logic->CanUse(RG_NUTS) || logic->HookshotOrBoomerang || logic->CanShield));});}}),
+                  Entrance(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER, {[]{return Here(RR_FOREST_TEMPLE_MAP_ROOM, []{return logic->HasExplosives || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_FAIRY_BOW) || ((logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT)) && (logic->CanUse(RG_NUTS) || logic->HookshotOrBoomerang || logic->CanShield));});}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_SEWER] = Area("Forest Temple Sewer", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -145,7 +145,7 @@ void AreaTable_Init_ForestTemple() {
 
   areaTable[RR_FOREST_TEMPLE_BELOW_BOSS_KEY_CHEST] = Area("Forest Temple Below Boss Key Chest", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER, {[]{return Here(RR_FOREST_TEMPLE_BELOW_BOSS_KEY_CHEST, []{return logic->HasExplosives || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_FAIRY_BOW) || ((logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT)) && (logic->Nuts || logic->HookshotOrBoomerang || logic->CanShield));});}}),
+                  Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER, {[]{return Here(RR_FOREST_TEMPLE_BELOW_BOSS_KEY_CHEST, []{return logic->HasExplosives || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_FAIRY_BOW) || ((logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT)) && (logic->CanUse(RG_NUTS) || logic->HookshotOrBoomerang || logic->CanShield));});}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_FLOORMASTER_ROOM] = Area("Forest Temple Floormaster Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -159,7 +159,7 @@ void AreaTable_Init_ForestTemple() {
   areaTable[RR_FOREST_TEMPLE_WEST_CORRIDOR] = Area("Forest Temple West Corridor", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_LOBBY,           {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 1, 5);}}),
-                  Entrance(RR_FOREST_TEMPLE_BLOCK_PUSH_ROOM, {[]{return logic->CanAdultAttack || logic->CanChildAttack || logic->Nuts;}}),
+                  Entrance(RR_FOREST_TEMPLE_BLOCK_PUSH_ROOM, {[]{return logic->CanAdultAttack || logic->CanChildAttack || logic->CanUse(RG_NUTS);}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_BLOCK_PUSH_ROOM] = Area("Forest Temple Block Push Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -259,8 +259,8 @@ void AreaTable_Init_ForestTemple() {
 
   areaTable[RR_FOREST_TEMPLE_EAST_CORRIDOR] = Area("Forest Temple East Corridor", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_FOREST_TEMPLE_LOBBY,          {[]{return logic->CanAdultAttack || logic->CanChildAttack || logic->Nuts;}}),
-                  Entrance(RR_FOREST_TEMPLE_GREEN_POE_ROOM, {[]{return logic->CanAdultAttack || logic->CanChildAttack || logic->Nuts;}}),
+                  Entrance(RR_FOREST_TEMPLE_LOBBY,          {[]{return logic->CanAdultAttack || logic->CanChildAttack || logic->CanUse(RG_NUTS);}}),
+                  Entrance(RR_FOREST_TEMPLE_GREEN_POE_ROOM, {[]{return logic->CanAdultAttack || logic->CanChildAttack || logic->CanUse(RG_NUTS);}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_BOSS_REGION] = Area("Forest Temple Boss Region", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -280,12 +280,12 @@ void AreaTable_Init_ForestTemple() {
   if (randoCtx->GetDungeon(FOREST_TEMPLE)->IsMQ()) {
   areaTable[RR_FOREST_TEMPLE_MQ_LOBBY] = Area("Forest Temple MQ Lobby", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST, logic->CanJumpslash || logic->Bombs || logic->CanUse(RG_STICKS) || logic->Nuts || logic->HookshotOrBoomerang || logic->CanUse(RG_DINS_FIRE) || logic->KokiriSword || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOVER_BOOTS)),
+                  LOCATION(RC_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST, logic->CanJumpslash || logic->Bombs || logic->CanUse(RG_STICKS) || logic->CanUse(RG_NUTS) || logic->HookshotOrBoomerang || logic->CanUse(RG_DINS_FIRE) || logic->KokiriSword || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOVER_BOOTS)),
                   LOCATION(RC_FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY, logic->HookshotOrBoomerang),
   }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_ENTRYWAY,        {[]{return true;}}),
-                  Entrance(RR_FOREST_TEMPLE_MQ_CENTRAL_AREA, {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 1) && (logic->CanAdultAttack || logic->CanChildAttack || logic->Nuts);}}),
+                  Entrance(RR_FOREST_TEMPLE_MQ_CENTRAL_AREA, {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 1) && (logic->CanAdultAttack || logic->CanChildAttack || logic->CanUse(RG_NUTS));}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_MQ_CENTRAL_AREA] = Area("Forest Temple MQ Central Area", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
@@ -299,8 +299,8 @@ void AreaTable_Init_ForestTemple() {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_MQ_NW_OUTDOORS,        {[]{return logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT);}}),
                   Entrance(RR_FOREST_TEMPLE_MQ_NE_OUTDOORS,        {[]{return logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT);}}), //This is as far as child can get
-                  Entrance(RR_FOREST_TEMPLE_MQ_AFTER_BLOCK_PUZZLE, {[]{return logic->IsAdult && (logic->GoronBracelet || (randoCtx->GetTrickOption(RT_FOREST_MQ_BLOCK_PUZZLE) && logic->HasBombchus && logic->IsAdult && logic->CanUse(RG_HOOKSHOT)));}}),
-                    //Trick: logic->IsAdult && (logic->GoronBracelet || (LogicForestMQBlockPuzzle && logic->HasBombchus && logic->IsAdult && logic->CanUse(RG_HOOKSHOT)))
+                  Entrance(RR_FOREST_TEMPLE_MQ_AFTER_BLOCK_PUZZLE, {[]{return logic->IsAdult && (logic->GoronBracelet || (randoCtx->GetTrickOption(RT_FOREST_MQ_BLOCK_PUZZLE) && logic->CanUse(RG_BOMBCHU_5) && logic->IsAdult && logic->CanUse(RG_HOOKSHOT)));}}),
+                    //Trick: logic->IsAdult && (logic->GoronBracelet || (LogicForestMQBlockPuzzle && logic->CanUse(RG_BOMBCHU_5) && logic->IsAdult && logic->CanUse(RG_HOOKSHOT)))
                   Entrance(RR_FOREST_TEMPLE_MQ_OUTDOOR_LEDGE,      {[]{return (randoCtx->GetTrickOption(RT_FOREST_MQ_JS_HALLWAY_SWITCH) && logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS)) || (randoCtx->GetTrickOption(RT_FOREST_MQ_RANG_HALLWAY_SWITCH) && logic->CanUse(RG_BOOMERANG)) || (randoCtx->GetTrickOption(RT_FOREST_MQ_HOOKSHOT_HALLWAY_SWITCH) && logic->IsAdult && logic->CanUse(RG_HOOKSHOT));}}),
                     //Trick (logic->Hookshot trick not added to either n64 or oot3d rando as of yet, to enable in SoH needs uncommenting in randomizer_tricks.cpp): (LogicForestMQHallwaySwitchJS && logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS)) || (LogicForestMQHallwaySwitchHookshot && logic->IsAdult && logic->CanUse(RG_HOOKSHOT)) 
                   Entrance(RR_FOREST_TEMPLE_MQ_BOSS_REGION,        {[]{return logic->ForestTempleJoAndBeth && logic->ForestTempleAmyAndMeg;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
index b00630e27..05249def1 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
@@ -87,12 +87,12 @@ void AreaTable_Init_GanonsCastle() {
 
   areaTable[RR_GANONS_CASTLE_SPIRIT_TRIAL] = Area("Ganon's Castle Spirit Trial", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->NutPot,           {[]{return logic->NutPot || (((randoCtx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) && logic->CanJumpslash) || logic->CanUse(RG_HOOKSHOT)) && logic->HasBombchus && logic->CanUse(RG_FAIRY_BOW) && (logic->CanUse(RG_MIRROR_SHIELD) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS))));}}),
-                  EventAccess(&logic->SpiritTrialClear, {[]{return logic->CanUse(RG_LIGHT_ARROWS) && (logic->CanUse(RG_MIRROR_SHIELD) || randoCtx->GetOption(RSK_SUNLIGHT_ARROWS)) && logic->HasBombchus && ((randoCtx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) && logic->CanJumpslash) || logic->CanUse(RG_HOOKSHOT));}}),
+                  EventAccess(&logic->NutPot,           {[]{return logic->NutPot || (((randoCtx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) && logic->CanJumpslash) || logic->CanUse(RG_HOOKSHOT)) && logic->CanUse(RG_BOMBCHU_5) && logic->CanUse(RG_FAIRY_BOW) && (logic->CanUse(RG_MIRROR_SHIELD) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS))));}}),
+                  EventAccess(&logic->SpiritTrialClear, {[]{return logic->CanUse(RG_LIGHT_ARROWS) && (logic->CanUse(RG_MIRROR_SHIELD) || randoCtx->GetOption(RSK_SUNLIGHT_ARROWS)) && logic->CanUse(RG_BOMBCHU_5) && ((randoCtx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) && logic->CanJumpslash) || logic->CanUse(RG_HOOKSHOT));}}),
                 }, {
                   //Locations
                   LOCATION(RC_GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST, (randoCtx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) || logic->CanUse(RG_HOOKSHOT)) && logic->CanJumpslash),
-                  LOCATION(RC_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST,      (randoCtx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) || logic->CanUse(RG_HOOKSHOT)) && logic->HasBombchus && (randoCtx->GetTrickOption(RT_LENS_GANON) || logic->CanUse(RG_LENS_OF_TRUTH))),
+                  LOCATION(RC_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST,      (randoCtx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) || logic->CanUse(RG_HOOKSHOT)) && logic->CanUse(RG_BOMBCHU_5) && (randoCtx->GetTrickOption(RT_LENS_GANON) || logic->CanUse(RG_LENS_OF_TRUTH))),
   }, {});
 
   areaTable[RR_GANONS_CASTLE_LIGHT_TRIAL] = Area("Ganon's Castle Light Trial", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
@@ -127,7 +127,7 @@ void AreaTable_Init_GanonsCastle() {
                   LOCATION(RC_SHEIK_HINT_MQ_GC,  true),
                 }, {
                   //Exits
-                  Entrance(RR_GANONS_CASTLE_ENTRYWAY,        {[]{return (logic->CanUse(RG_MASTER_SWORD) || (logic->HasExplosives || ((logic->Nuts || logic->Boomerang) && (logic->Sticks || logic->KokiriSword))));}}),
+                  Entrance(RR_GANONS_CASTLE_ENTRYWAY,        {[]{return (logic->CanUse(RG_MASTER_SWORD) || (logic->HasExplosives || ((logic->CanUse(RG_NUTS) || logic->Boomerang) && (logic->CanUse(RG_STICKS) || logic->KokiriSword))));}}),
                   Entrance(RR_GANONS_CASTLE_MQ_FOREST_TRIAL, {[]{return true;}}),
                   Entrance(RR_GANONS_CASTLE_MQ_FIRE_TRIAL,   {[]{return true;}}),
                   Entrance(RR_GANONS_CASTLE_MQ_WATER_TRIAL,  {[]{return true;}}),
@@ -193,16 +193,16 @@ void AreaTable_Init_GanonsCastle() {
 
   areaTable[RR_GANONS_CASTLE_MQ_SPIRIT_TRIAL] = Area("Ganon's Castle MQ Spirit Castle", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->SpiritTrialClear, {[]{return logic->IsAdult && logic->CanUse(RG_LIGHT_ARROWS) && logic->Hammer && logic->HasBombchus && ((logic->FireArrows && logic->MirrorShield) || randoCtx->GetOption(RSK_SUNLIGHT_ARROWS));}}),
-                  EventAccess(&logic->NutPot,           {[]{return logic->NutPot || (logic->Hammer && logic->HasBombchus && logic->IsAdult && ((logic->CanUse(RG_FIRE_ARROWS) && logic->MirrorShield) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS))));}}),
+                  EventAccess(&logic->SpiritTrialClear, {[]{return logic->IsAdult && logic->CanUse(RG_LIGHT_ARROWS) && logic->Hammer && logic->CanUse(RG_BOMBCHU_5) && ((logic->FireArrows && logic->MirrorShield) || randoCtx->GetOption(RSK_SUNLIGHT_ARROWS));}}),
+                  EventAccess(&logic->NutPot,           {[]{return logic->NutPot || (logic->Hammer && logic->CanUse(RG_BOMBCHU_5) && logic->IsAdult && ((logic->CanUse(RG_FIRE_ARROWS) && logic->MirrorShield) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS))));}}),
   }, {
                   //Locations
                   LOCATION(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST,             logic->IsAdult && (logic->Bow || randoCtx->GetTrickOption(RT_RUSTED_SWITCHES)) && logic->Hammer),
-                  LOCATION(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST,         logic->IsAdult && (logic->Bow || randoCtx->GetTrickOption(RT_RUSTED_SWITCHES)) && logic->Hammer && logic->HasBombchus && (randoCtx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH))),
-                  LOCATION(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST,    logic->IsAdult && logic->Hammer && logic->HasBombchus && ((logic->CanUse(RG_FIRE_ARROWS) && logic->CanUse(RG_MIRROR_SHIELD)) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS)))),
-                  LOCATION(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST,     logic->IsAdult && logic->Hammer && logic->HasBombchus && ((logic->CanUse(RG_FIRE_ARROWS) && logic->CanUse(RG_MIRROR_SHIELD)) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS)))),
-                  LOCATION(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST,  logic->IsAdult && logic->Hammer && logic->HasBombchus && ((logic->CanUse(RG_FIRE_ARROWS) && logic->CanUse(RG_MIRROR_SHIELD)) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS)))),
-                  LOCATION(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST,    logic->IsAdult && logic->Hammer && logic->HasBombchus && ((logic->CanUse(RG_FIRE_ARROWS) && logic->CanUse(RG_MIRROR_SHIELD)) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS)))),
+                  LOCATION(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST,         logic->IsAdult && (logic->Bow || randoCtx->GetTrickOption(RT_RUSTED_SWITCHES)) && logic->Hammer && logic->CanUse(RG_BOMBCHU_5) && (randoCtx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH))),
+                  LOCATION(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST,    logic->IsAdult && logic->Hammer && logic->CanUse(RG_BOMBCHU_5) && ((logic->CanUse(RG_FIRE_ARROWS) && logic->CanUse(RG_MIRROR_SHIELD)) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS)))),
+                  LOCATION(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST,     logic->IsAdult && logic->Hammer && logic->CanUse(RG_BOMBCHU_5) && ((logic->CanUse(RG_FIRE_ARROWS) && logic->CanUse(RG_MIRROR_SHIELD)) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS)))),
+                  LOCATION(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST,  logic->IsAdult && logic->Hammer && logic->CanUse(RG_BOMBCHU_5) && ((logic->CanUse(RG_FIRE_ARROWS) && logic->CanUse(RG_MIRROR_SHIELD)) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS)))),
+                  LOCATION(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST,    logic->IsAdult && logic->Hammer && logic->CanUse(RG_BOMBCHU_5) && ((logic->CanUse(RG_FIRE_ARROWS) && logic->CanUse(RG_MIRROR_SHIELD)) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS)))),
   }, {});
 
   areaTable[RR_GANONS_CASTLE_MQ_LIGHT_TRIAL] = Area("Ganon's Castle MQ Light Trial", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
index 554003434..5913e2d3b 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
@@ -143,12 +143,13 @@ void AreaTable_Init_GerudoValley() {
 
   areaTable[RR_HAUNTED_WASTELAND] = Area("Haunted Wasteland", "Haunted Wasteland", RA_HAUNTED_WASTELAND, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->FairyPot, {[]{return true;}}),
-                  EventAccess(&logic->NutPot,   {[]{return true;}}),
+                  EventAccess(&logic->FairyPot,       {[]{return true;}}),
+                  EventAccess(&logic->NutPot,         {[]{return true;}}),
+                  EventAccess(&logic->CarpetMerchant, {[]{return logic->AdultsWallet && (logic->CanJumpslash || logic->CanUse(RG_HOVER_BOOTS));}}),
                 }, {
                   //Locations
                   LOCATION(RC_WASTELAND_CHEST,            logic->HasFireSource),
-                  LOCATION(RC_WASTELAND_BOMBCHU_SALESMAN, logic->AdultsWallet && (logic->CanJumpslash || logic->CanUse(RG_HOVER_BOOTS)) ),
+                  LOCATION(RC_WASTELAND_BOMBCHU_SALESMAN, logic->CarpetMerchant),
                   LOCATION(RC_WASTELAND_GS,               logic->HookshotOrBoomerang),
                 }, {
                   //Exits
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp
index 2e4b88164..036a522b0 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp
@@ -128,7 +128,7 @@ void AreaTable_Init_JabuJabusBelly() {
   areaTable[RR_JABU_JABUS_BELLY_BIGOCTO_ROOM] = Area("Jabu Jabus Belly Bigocto Room", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_MAIN_LOWER,    {[]{return true;}}),
-                  Entrance(RR_JABU_JABUS_BELLY_ABOVE_BIGOCTO, {[]{return Here(RR_JABU_JABUS_BELLY_BIGOCTO_ROOM, []{return (logic->CanUse(RG_BOOMERANG) || logic->Nuts) && (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_STICKS));});}}),
+                  Entrance(RR_JABU_JABUS_BELLY_ABOVE_BIGOCTO, {[]{return Here(RR_JABU_JABUS_BELLY_BIGOCTO_ROOM, []{return (logic->CanUse(RG_BOOMERANG) || logic->CanUse(RG_NUTS)) && (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_STICKS));});}}),
   });
 
   areaTable[RR_JABU_JABUS_BELLY_ABOVE_BIGOCTO] = Area("Jabu Jabus Belly Above Bigocto", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
@@ -152,7 +152,7 @@ void AreaTable_Init_JabuJabusBelly() {
                 }, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_LIFT_MIDDLE, {[]{return true;}}),
-                  Entrance(RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY, {[]{return logic->CanUse(RG_BOOMERANG) || (randoCtx->GetTrickOption(RT_JABU_NEAR_BOSS_RANGED) && ((logic->IsAdult && (logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_FAIRY_BOW))) || (logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT)))) || (randoCtx->GetTrickOption(RT_JABU_NEAR_BOSS_EXPLOSIVES) && (logic->HasBombchus || (logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS) && logic->Bombs)));}}),
+                  Entrance(RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY, {[]{return logic->CanUse(RG_BOOMERANG) || (randoCtx->GetTrickOption(RT_JABU_NEAR_BOSS_RANGED) && ((logic->IsAdult && (logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_FAIRY_BOW))) || (logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT)))) || (randoCtx->GetTrickOption(RT_JABU_NEAR_BOSS_EXPLOSIVES) && (logic->CanUse(RG_BOMBCHU_5) || (logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS) && logic->Bombs)));}}),
   });
   }
 
@@ -177,7 +177,8 @@ void AreaTable_Init_JabuJabusBelly() {
                   //Locations
                   LOCATION(RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST,      true),
                   LOCATION(RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST,      (logic->IsAdult && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT))) || ChildCanAccess(RR_JABU_JABUS_BELLY_MQ_BOSS_AREA)),
-                  LOCATION(RC_JABU_JABUS_BELLY_MQ_COMPASS_CHEST,                (logic->IsChild || logic->CanDive || logic->CanUse(RG_IRON_BOOTS) || randoCtx->GetTrickOption(RT_JABU_ALCOVE_JUMP_DIVE)) && (logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->HasBombchus || (randoCtx->GetTrickOption(RT_JABU_MQ_RANG_JUMP) && logic->CanUse(RG_BOOMERANG)))),
+                  LOCATION(RC_JABU_JABUS_BELLY_MQ_COMPASS_CHEST,                (logic->IsChild || logic->CanDive || logic->CanUse(RG_IRON_BOOTS) ||
+                                                                                                  randoCtx->GetTrickOption(RT_JABU_ALCOVE_JUMP_DIVE)) && (logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_BOMBCHU_5) || (randoCtx->GetTrickOption(RT_JABU_MQ_RANG_JUMP) && logic->CanUse(RG_BOOMERANG)))),
                   LOCATION(RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST,    logic->CanUse(RG_FAIRY_SLINGSHOT)),
                   LOCATION(RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST, logic->CanUse(RG_FAIRY_SLINGSHOT)),
                   LOCATION(RC_JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST,   true),
@@ -193,12 +194,12 @@ void AreaTable_Init_JabuJabusBelly() {
   areaTable[RR_JABU_JABUS_BELLY_MQ_DEPTHS] = Area("Jabu Jabus Belly MQ Depths", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST, true),
-                  LOCATION(RC_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM,          logic->Swim && (logic->Sticks || logic->CanUse(RG_DINS_FIRE))),
+                  LOCATION(RC_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM,          logic->Swim && (logic->CanUse(RG_STICKS) || logic->CanUse(RG_DINS_FIRE))),
                   LOCATION(RC_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM,    (randoCtx->GetTrickOption(RT_LENS_JABU_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) || Here(RR_JABU_JABUS_BELLY_MQ_MAIN, []{return logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS) && logic->CanUse(RG_HOOKSHOT);})),
   }, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_MQ_MAIN,      {[]{return true;}}),
-                  Entrance(RR_JABU_JABUS_BELLY_MQ_BOSS_AREA, {[]{return logic->Sticks || (logic->CanUse(RG_DINS_FIRE) && logic->KokiriSword);}}),
+                  Entrance(RR_JABU_JABUS_BELLY_MQ_BOSS_AREA, {[]{return logic->CanUse(RG_STICKS) || (logic->CanUse(RG_DINS_FIRE) && logic->KokiriSword);}}),
   });
 
   areaTable[RR_JABU_JABUS_BELLY_MQ_BOSS_AREA] = Area("Jabu Jabus Belly MQ Boss Area", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
index 708163784..b0452e419 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
@@ -19,7 +19,7 @@ void AreaTable_Init_Kakariko() {
                   LOCATION(RC_KAK_GS_SKULLTULA_HOUSE,          logic->IsChild && logic->AtNight && logic->CanGetNightTimeGS),
                   LOCATION(RC_KAK_GS_GUARDS_HOUSE,             logic->IsChild && logic->AtNight && logic->CanGetNightTimeGS),
                   LOCATION(RC_KAK_GS_TREE,                     logic->IsChild && logic->AtNight && logic->CanGetNightTimeGS),
-                  LOCATION(RC_KAK_GS_WATCHTOWER,               logic->IsChild && (logic->Slingshot || logic->HasBombchus || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_LONGSHOT) || (randoCtx->GetTrickOption(RT_KAK_TOWER_GS) && logic->CanJumpslash)) && logic->AtNight && logic->CanGetNightTimeGS),
+                  LOCATION(RC_KAK_GS_WATCHTOWER,               logic->IsChild && (logic->Slingshot || logic->CanUse(RG_BOMBCHU_5) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_LONGSHOT) || (randoCtx->GetTrickOption(RT_KAK_TOWER_GS) && logic->CanJumpslash)) && logic->AtNight && logic->CanGetNightTimeGS),
                 }, {
                   //Exits
                   Entrance(RR_HYRULE_FIELD,                {[]{return true;}}),
@@ -33,7 +33,7 @@ void AreaTable_Init_Kakariko() {
                   Entrance(RR_KAK_POTION_SHOP_FRONT,       {[]{return logic->AtDay || logic->IsChild;}}),
                   Entrance(RR_KAK_REDEAD_GROTTO,           {[]{return logic->CanOpenBombGrotto;}}),
                   Entrance(RR_KAK_IMPAS_LEDGE,             {[]{return (logic->IsChild && logic->AtDay) || logic->CanUse(RG_HOOKSHOT) || (logic->IsAdult && randoCtx->GetTrickOption(RT_VISIBLE_COLLISION));}}),
-                  Entrance(RR_KAK_ROOFTOP,                 {[]{return logic->CanUse(RG_HOOKSHOT) || (randoCtx->GetTrickOption(RT_KAK_MAN_ON_ROOF) && (logic->IsAdult || logic->AtDay || logic->Slingshot || logic->HasBombchus || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_LONGSHOT)));}}),
+                  Entrance(RR_KAK_ROOFTOP,                 {[]{return logic->CanUse(RG_HOOKSHOT) || (randoCtx->GetTrickOption(RT_KAK_MAN_ON_ROOF) && (logic->IsAdult || logic->AtDay || logic->Slingshot || logic->CanUse(RG_BOMBCHU_5) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_LONGSHOT)));}}),
                   Entrance(RR_KAK_IMPAS_ROOFTOP,           {[]{return logic->CanUse(RG_HOOKSHOT) || (randoCtx->GetTrickOption(RT_KAK_ROOFTOP_GS) && logic->CanUse(RG_HOVER_BOOTS));}}),
                   Entrance(RR_THE_GRAVEYARD,               {[]{return true;}}),
                   Entrance(RR_KAK_BEHIND_GATE,             {[]{return logic->IsAdult || (logic->KakarikoVillageGateOpen);}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
index 2f9732b46..66c085905 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
@@ -153,7 +153,7 @@ void AreaTable_Init_LostWoods() {
                   //Locations
                   LOCATION(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT, logic->IsChild && logic->CanStunDeku),
                   LOCATION(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT,  logic->IsChild && logic->CanStunDeku),
-                  LOCATION(RC_LW_GS_ABOVE_THEATER,                   logic->IsAdult && logic->AtNight && ((CanPlantBean(RR_LW_BEYOND_MIDO) && logic->CanAdultAttack) || (randoCtx->GetTrickOption(RT_LW_GS_BEAN) && logic->CanUse(RG_HOOKSHOT) && (logic->CanUse(RG_LONGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->HasBombchus || logic->CanUse(RG_DINS_FIRE)))) && logic->CanGetNightTimeGS),
+                  LOCATION(RC_LW_GS_ABOVE_THEATER,                   logic->IsAdult && logic->AtNight && ((CanPlantBean(RR_LW_BEYOND_MIDO) && logic->CanAdultAttack) || (randoCtx->GetTrickOption(RT_LW_GS_BEAN) && logic->CanUse(RG_HOOKSHOT) && (logic->CanUse(RG_LONGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOMBCHU_5) || logic->CanUse(RG_DINS_FIRE)))) && logic->CanGetNightTimeGS),
                   LOCATION(RC_LW_GS_BEAN_PATCH_NEAR_THEATER,         logic->CanPlantBugs && (logic->CanChildAttack || (randoCtx->GetOption(RSK_SHUFFLE_SCRUBS).Is(RO_SCRUBS_OFF) && logic->DekuShield))),
                 }, {
                   //Exits
@@ -231,7 +231,7 @@ void AreaTable_Init_LostWoods() {
 
   areaTable[RR_SFM_WOLFOS_GROTTO] = Area("SFM Wolfos Grotto", "SFM Wolfos Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_SFM_WOLFOS_GROTTO_CHEST, logic->IsAdult || logic->Slingshot || logic->Sticks || logic->KokiriSword || logic->CanUse(RG_DINS_FIRE) || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)),
+                  LOCATION(RC_SFM_WOLFOS_GROTTO_CHEST, logic->IsAdult || logic->Slingshot || logic->CanUse(RG_STICKS) || logic->KokiriSword || logic->CanUse(RG_DINS_FIRE) || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)), //RANDOTODO is this meant to auto-pass as adult?
                 }, {
                   //Exits
                   Entrance(RR_SFM_ENTRYWAY, {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp
index b95262ab3..fb9265060 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp
@@ -54,7 +54,7 @@ void AreaTable_Init_ShadowTemple() {
                   LOCATION(RC_SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST,       (randoCtx->GetTrickOption(RT_SHADOW_UMBRELLA) && logic->HoverBoots) || logic->GoronBracelet),
                   LOCATION(RC_SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST,      (randoCtx->GetTrickOption(RT_SHADOW_UMBRELLA) && logic->HoverBoots) || logic->GoronBracelet),
                   LOCATION(RC_SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST,           logic->SmallKeys(RR_SHADOW_TEMPLE, 2, 3) && ((randoCtx->GetTrickOption(RT_LENS_SHADOW_PLATFORM) && randoCtx->GetTrickOption(RT_LENS_SHADOW)) || logic->CanUse(RG_LENS_OF_TRUTH))),
-                  LOCATION(RC_SHADOW_TEMPLE_FREESTANDING_KEY,                 logic->SmallKeys(RR_SHADOW_TEMPLE, 2, 3) && ((randoCtx->GetTrickOption(RT_LENS_SHADOW_PLATFORM) && randoCtx->GetTrickOption(RT_LENS_SHADOW)) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->Hookshot && (logic->Bombs || logic->GoronBracelet || (randoCtx->GetTrickOption(RT_SHADOW_FREESTANDING_KEY) && logic->HasBombchus))),
+                  LOCATION(RC_SHADOW_TEMPLE_FREESTANDING_KEY,                 logic->SmallKeys(RR_SHADOW_TEMPLE, 2, 3) && ((randoCtx->GetTrickOption(RT_LENS_SHADOW_PLATFORM) && randoCtx->GetTrickOption(RT_LENS_SHADOW)) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->Hookshot && (logic->Bombs || logic->GoronBracelet || (randoCtx->GetTrickOption(RT_SHADOW_FREESTANDING_KEY) && logic->CanUse(RG_BOMBCHU_5)))),
                   LOCATION(RC_SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM,                logic->CanJumpslash),
                   LOCATION(RC_SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM,           logic->Hookshot || (randoCtx->GetTrickOption(RT_SHADOW_UMBRELLA_GS) && logic->HoverBoots)),
                   LOCATION(RC_SHADOW_TEMPLE_GS_SINGLE_GIANT_POT,              logic->SmallKeys(RR_SHADOW_TEMPLE, 2, 3) && ((randoCtx->GetTrickOption(RT_LENS_SHADOW_PLATFORM) && randoCtx->GetTrickOption(RT_LENS_SHADOW)) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->Hookshot),
@@ -82,7 +82,7 @@ void AreaTable_Init_ShadowTemple() {
                   LOCATION(RC_SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT,         logic->CanAdultAttack),
   }, {
                   //Exits
-                  Entrance(RR_SHADOW_TEMPLE_BOSS_ENTRYWAY, {[]{return (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_DISTANT_SCARECROW) || (randoCtx->GetTrickOption(RT_SHADOW_STATUE) && logic->HasBombchus)) && logic->SmallKeys(RR_SHADOW_TEMPLE, 5) && logic->CanUse(RG_HOVER_BOOTS) && logic->BossKeyShadowTemple;}})
+                  Entrance(RR_SHADOW_TEMPLE_BOSS_ENTRYWAY, {[]{return (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_DISTANT_SCARECROW) || (randoCtx->GetTrickOption(RT_SHADOW_STATUE) && logic->CanUse(RG_BOMBCHU_5))) && logic->SmallKeys(RR_SHADOW_TEMPLE, 5) && logic->CanUse(RG_HOVER_BOOTS) && logic->BossKeyShadowTemple;}})
   });
   }
 
@@ -106,9 +106,9 @@ void AreaTable_Init_ShadowTemple() {
 
   areaTable[RR_SHADOW_TEMPLE_MQ_FIRST_BEAMOS] = Area("Shadow Temple MQ First Beamos", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_SHADOW_TEMPLE_MQ_MAP_CHEST,                 logic->CanAdultAttack || logic->Nuts),
+                  LOCATION(RC_SHADOW_TEMPLE_MQ_MAP_CHEST,                 logic->CanAdultAttack || logic->CanUse(RG_NUTS)),
                   LOCATION(RC_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST,        logic->CanJumpslash),
-                  LOCATION(RC_SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST, logic->CanAdultAttack || logic->Nuts),
+                  LOCATION(RC_SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST, logic->CanAdultAttack || logic->CanUse(RG_NUTS)),
   }, {
                   //Exits
                   Entrance(RR_SHADOW_TEMPLE_MQ_UPPER_HUGE_PIT, {[]{return logic->HasExplosives && logic->SmallKeys(RR_SHADOW_TEMPLE, 2);}}),
@@ -159,11 +159,11 @@ void AreaTable_Init_ShadowTemple() {
   areaTable[RR_SHADOW_TEMPLE_MQ_BEYOND_BOAT] = Area("Shadow Temple MQ Beyond Boat", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SHADOW_TEMPLE_MQ_GS_AFTER_SHIP,  true),
-                  LOCATION(RC_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS,   logic->Bow || (randoCtx->GetTrickOption(RT_SHADOW_STATUE) && logic->HasBombchus)),
+                  LOCATION(RC_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS,   logic->Bow || (randoCtx->GetTrickOption(RT_SHADOW_STATUE) && logic->CanUse(RG_BOMBCHU_5))),
   }, {
                   //Exits
                   Entrance(RR_SHADOW_TEMPLE_MQ_INVISIBLE_MAZE, {[]{return logic->Bow && logic->CanUse(RG_SONG_OF_TIME) && logic->IsAdult && logic->CanUse(RG_LONGSHOT);}}),
-                  Entrance(RR_SHADOW_TEMPLE_BOSS_ENTRYWAY,     {[]{return (logic->CanUse(RG_FAIRY_BOW) || (randoCtx->GetTrickOption(RT_SHADOW_STATUE) && logic->HasBombchus)) && logic->CanUse(RG_HOVER_BOOTS) && logic->BossKeyShadowTemple;}}),
+                  Entrance(RR_SHADOW_TEMPLE_BOSS_ENTRYWAY,     {[]{return (logic->CanUse(RG_FAIRY_BOW) || (randoCtx->GetTrickOption(RT_SHADOW_STATUE) && logic->CanUse(RG_BOMBCHU_5))) && logic->CanUse(RG_HOVER_BOOTS) && logic->BossKeyShadowTemple;}}),
   });
 
   areaTable[RR_SHADOW_TEMPLE_MQ_INVISIBLE_MAZE] = Area("Shadow Temple MQ Invisible Maze", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp
index 92716469e..747b5ec2f 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp
@@ -31,9 +31,9 @@ void AreaTable_Init_SpiritTemple() {
                   EventAccess(&logic->NutCrate, {[]{return true;}}),
                 }, {
                   //Locations
-                  LOCATION(RC_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST,        (logic->Boomerang || logic->Slingshot || (logic->HasBombchus && randoCtx->GetTrickOption(RT_SPIRIT_CHILD_CHU))) && (logic->HasExplosives || ((logic->Nuts || logic->Boomerang) && (logic->Sticks || logic->KokiriSword || logic->Slingshot)))),
-                  LOCATION(RC_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST, (logic->Boomerang || logic->Slingshot || (logic->HasBombchus && randoCtx->GetTrickOption(RT_SPIRIT_CHILD_CHU))) && (logic->HasExplosives || ((logic->Nuts || logic->Boomerang) && (logic->Sticks || logic->KokiriSword || logic->Slingshot))) && (logic->Sticks || logic->CanUse(RG_DINS_FIRE))),
-                  LOCATION(RC_SPIRIT_TEMPLE_GS_METAL_FENCE,            (logic->Boomerang || logic->Slingshot || (logic->HasBombchus && randoCtx->GetTrickOption(RT_SPIRIT_CHILD_CHU))) && (logic->HasExplosives || ((logic->Nuts || logic->Boomerang) && (logic->Sticks || logic->KokiriSword || logic->Slingshot)))),
+                  LOCATION(RC_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST,        (logic->Boomerang || logic->Slingshot || (logic->CanUse(RG_BOMBCHU_5) && randoCtx->GetTrickOption(RT_SPIRIT_CHILD_CHU))) && (logic->HasExplosives || ((logic->CanUse(RG_NUTS) || logic->Boomerang) && (logic->CanUse(RG_STICKS)  || logic->KokiriSword || logic->Slingshot)))),
+                  LOCATION(RC_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST, (logic->Boomerang || logic->Slingshot || (logic->CanUse(RG_BOMBCHU_5) && randoCtx->GetTrickOption(RT_SPIRIT_CHILD_CHU))) && (logic->HasExplosives || ((logic->CanUse(RG_NUTS) || logic->Boomerang) && (logic->CanUse(RG_STICKS)  || logic->KokiriSword || logic->Slingshot))) && (logic->CanUse(RG_STICKS) || logic->CanUse(RG_DINS_FIRE))),
+                  LOCATION(RC_SPIRIT_TEMPLE_GS_METAL_FENCE,            (logic->Boomerang || logic->Slingshot || (logic->CanUse(RG_BOMBCHU_5) && randoCtx->GetTrickOption(RT_SPIRIT_CHILD_CHU))) && (logic->HasExplosives || ((logic->CanUse(RG_NUTS) || logic->Boomerang) && (logic->CanUse(RG_STICKS)  || logic->KokiriSword || logic->Slingshot)))),
                 }, {
                   //Exits
                   Entrance(RR_SPIRIT_TEMPLE_CHILD_CLIMB, {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 1);}}),
@@ -41,12 +41,12 @@ void AreaTable_Init_SpiritTemple() {
 
   areaTable[RR_SPIRIT_TEMPLE_CHILD_CLIMB] = Area("Child Spirit Temple Climb", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST, logic->HasProjectile(HasProjectileAge::Both) || ((logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && logic->CanUse(RG_SILVER_GAUNTLETS) && logic->HasProjectile(HasProjectileAge::Adult)) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->IsChild && logic->HasProjectile(HasProjectileAge::Child))),
-                  LOCATION(RC_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST,  logic->HasProjectile(HasProjectileAge::Both) || ((logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && logic->CanUse(RG_SILVER_GAUNTLETS) && logic->HasProjectile(HasProjectileAge::Adult)) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->IsChild && logic->HasProjectile(HasProjectileAge::Child))),
+                  LOCATION(RC_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST, logic->HasProjectile(HasProjectileAge::Both) || ((logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->BombchuRefill && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && logic->CanUse(RG_SILVER_GAUNTLETS) && logic->HasProjectile(HasProjectileAge::Adult)) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->IsChild && logic->HasProjectile(HasProjectileAge::Child))),
+                  LOCATION(RC_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST,  logic->HasProjectile(HasProjectileAge::Both) || ((logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->BombchuRefill && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && logic->CanUse(RG_SILVER_GAUNTLETS) && logic->HasProjectile(HasProjectileAge::Adult)) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->IsChild && logic->HasProjectile(HasProjectileAge::Child))),
                   LOCATION(RC_SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM,    logic->HasProjectile(HasProjectileAge::Both) || logic->CanUse(RG_DINS_FIRE) ||
                                                                                       (logic->CanTakeDamage && (logic->CanJumpslash || logic->HasProjectile(HasProjectileAge::Child))) ||
                                                                                         (logic->IsChild && logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->HasProjectile(HasProjectileAge::Child)) ||
-                                                                                          ((logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && logic->CanUse(RG_SILVER_GAUNTLETS) && (logic->HasProjectile(HasProjectileAge::Adult) || (logic->CanTakeDamage && logic->CanJumpslash)))),
+                                                                                          ((logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->BombchuRefill && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && logic->CanUse(RG_SILVER_GAUNTLETS) && (logic->HasProjectile(HasProjectileAge::Adult) || (logic->CanTakeDamage && logic->CanJumpslash)))),
                 }, {
                   //Exits
                   Entrance(RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER, {[]{return logic->HasExplosives || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS));}}),
@@ -55,10 +55,10 @@ void AreaTable_Init_SpiritTemple() {
   areaTable[RR_SPIRIT_TEMPLE_EARLY_ADULT] = Area("Early Adult Spirit Temple", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SPIRIT_TEMPLE_COMPASS_CHEST,            logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_ZELDAS_LULLABY)),
-                  LOCATION(RC_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST,  (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG) || logic->HasBombchus || (logic->Bombs && logic->IsAdult && randoCtx->GetTrickOption(RT_SPIRIT_LOWER_ADULT_SWITCH))) && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanJumpslash)),
+                  LOCATION(RC_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST,  (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG) || logic->CanUse(RG_BOMBCHU_5) || (logic->Bombs && logic->IsAdult && randoCtx->GetTrickOption(RT_SPIRIT_LOWER_ADULT_SWITCH))) && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanJumpslash)),
                   LOCATION(RC_SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST,  logic->SmallKeys(RR_SPIRIT_TEMPLE, 3)),
                   LOCATION(RC_SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST, logic->SmallKeys(RR_SPIRIT_TEMPLE, 3)),
-                  LOCATION(RC_SPIRIT_TEMPLE_GS_BOULDER_ROOM,          logic->CanUse(RG_SONG_OF_TIME) && (logic->Bow || logic->Hookshot || logic->HasBombchus || (logic->Bombs && randoCtx->GetTrickOption(RT_SPIRIT_LOWER_ADULT_SWITCH)))),
+                  LOCATION(RC_SPIRIT_TEMPLE_GS_BOULDER_ROOM,          logic->CanUse(RG_SONG_OF_TIME) && (logic->Bow || logic->Hookshot || logic->CanUse(RG_BOMBCHU_5) || (logic->Bombs && randoCtx->GetTrickOption(RT_SPIRIT_LOWER_ADULT_SWITCH)))),
                 }, {
                   //Exits
                   Entrance(RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER, {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 1);}}),
@@ -66,34 +66,27 @@ void AreaTable_Init_SpiritTemple() {
 
   areaTable[RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER] = Area("Spirit Temple Central Chamber", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_SPIRIT_TEMPLE_MAP_CHEST,                    ((logic->HasExplosives || logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) &&
+                  LOCATION(RC_SPIRIT_TEMPLE_MAP_CHEST,                    ((logic->HasExplosives || logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->BombchuRefill && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) &&
+                                                                            (logic->CanUse(RG_DINS_FIRE) || ((logic->CanUse(RG_FIRE_ARROWS) || randoCtx->GetTrickOption(RT_SPIRIT_MAP_CHEST)) && logic->Bow && logic->CanUse(RG_STICKS) ))) ||
+                                                                          (logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->HasExplosives && logic->CanUse(RG_STICKS)) ||
+                                                                          (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) && (logic->CanUse(RG_FIRE_ARROWS) || (randoCtx->GetTrickOption(RT_SPIRIT_MAP_CHEST) && logic->Bow)) && logic->CanUse(RG_SILVER_GAUNTLETS))),
+                  
+                  LOCATION(RC_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST,         ((logic->HasExplosives || logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->BombchuRefill && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) &&
+                                                                           (logic->CanUse(RG_DINS_FIRE) || ((logic->CanUse(RG_FIRE_ARROWS) || randoCtx->GetTrickOption(RT_SPIRIT_SUN_CHEST)) && logic->Bow && logic->CanUse(RG_STICKS) ))) ||
+                                                                          (logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->HasExplosives && logic->CanUse(RG_STICKS)) ||
+                                                                          (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) && (logic->CanUse(RG_FIRE_ARROWS) || (randoCtx->GetTrickOption(RT_SPIRIT_SUN_CHEST) && logic->Bow)) && logic->CanUse(RG_SILVER_GAUNTLETS))),
 
-                                                                                                (logic->CanUse(RG_DINS_FIRE) ||
-                                                                                                    (((logic->MagicMeter && logic->FireArrows) || randoCtx->GetTrickOption(RT_SPIRIT_MAP_CHEST)) && logic->Bow && logic->Sticks))) ||
-                                                                                            (logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->HasExplosives &&
-                                                                                                logic->CanUse(RG_STICKS)) ||
-                                                                                            (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) &&
-                                                                                                (logic->CanUse(RG_FIRE_ARROWS) || (randoCtx->GetTrickOption(RT_SPIRIT_MAP_CHEST) && logic->Bow)) &&
-                                                                                                logic->CanUse(RG_SILVER_GAUNTLETS))),
-                  LOCATION(RC_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST,         ((logic->HasExplosives || logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) &&
-                                                                                                (logic->CanUse(RG_DINS_FIRE) ||
-                                                                                                    (((logic->MagicMeter && logic->FireArrows) || randoCtx->GetTrickOption(RT_SPIRIT_SUN_CHEST)) && logic->Bow && logic->Sticks))) ||
-                                                                                            (logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->HasExplosives &&
-                                                                                                logic->CanUse(RG_STICKS)) ||
-                                                                                            (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) &&
-                                                                                                (logic->CanUse(RG_FIRE_ARROWS) || (randoCtx->GetTrickOption(RT_SPIRIT_SUN_CHEST) && logic->Bow)) &&
-                                                                                                logic->CanUse(RG_SILVER_GAUNTLETS))),
                   LOCATION(RC_SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST,       logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) && logic->CanUse(RG_SILVER_GAUNTLETS) && logic->CanUse(RG_ZELDAS_LULLABY)),
                   LOCATION(RC_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST,  logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) && logic->CanUse(RG_SILVER_GAUNTLETS) && logic->CanUse(RG_ZELDAS_LULLABY) && (logic->Hookshot || logic->HoverBoots || randoCtx->GetTrickOption(RT_SPIRIT_LOBBY_JUMP))),
                   LOCATION(RC_SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM, (logic->HasExplosives && logic->Boomerang && logic->Hookshot) ||
-                                                                                            (logic->CanUse(RG_BOOMERANG) && logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->HasExplosives) ||
-                                                                                            (logic->Hookshot && logic->CanUse(RG_SILVER_GAUNTLETS) &&
-                                                                                                (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) ||
-                                                                                                    (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && logic->Boomerang && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))))),
-                  LOCATION(RC_SPIRIT_TEMPLE_GS_LOBBY,                     ((logic->HasExplosives || logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) &&
-                                                                                                randoCtx->GetTrickOption(RT_SPIRIT_LOBBY_GS) && logic->Boomerang && (logic->Hookshot || logic->HoverBoots || randoCtx->GetTrickOption(RT_SPIRIT_LOBBY_JUMP))) ||
-                                                                                            (randoCtx->GetTrickOption(RT_SPIRIT_LOBBY_GS) && logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->HasExplosives && logic->CanUse(RG_BOOMERANG)) ||
-                                                                                            (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) && logic->CanUse(RG_SILVER_GAUNTLETS) && (logic->Hookshot || logic->HoverBoots || randoCtx->GetTrickOption(RT_SPIRIT_LOBBY_JUMP)))),
+                                                                          (logic->CanUse(RG_BOOMERANG) && logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->HasExplosives) ||
+                                                                          (logic->Hookshot && logic->CanUse(RG_SILVER_GAUNTLETS) && (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && 
+                                                                           logic->Boomerang && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->BombchuRefill && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))))),
+
+                  LOCATION(RC_SPIRIT_TEMPLE_GS_LOBBY,                     ((logic->HasExplosives || logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->BombchuRefill && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) &&
+                                                                           randoCtx->GetTrickOption(RT_SPIRIT_LOBBY_GS) && logic->Boomerang && (logic->Hookshot || logic->HoverBoots || randoCtx->GetTrickOption(RT_SPIRIT_LOBBY_JUMP))) ||
+                                                                          (randoCtx->GetTrickOption(RT_SPIRIT_LOBBY_GS) && logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->HasExplosives && logic->CanUse(RG_BOOMERANG)) ||
+                                                                          (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) && logic->CanUse(RG_SILVER_GAUNTLETS) && (logic->Hookshot || logic->HoverBoots || randoCtx->GetTrickOption(RT_SPIRIT_LOBBY_JUMP)))),
                 }, {
                   //Exits
                   Entrance(RR_SPIRIT_TEMPLE_OUTDOOR_HANDS,              {[]{return logic->CanJumpslash || logic->HasExplosives;}}),
@@ -117,7 +110,7 @@ void AreaTable_Init_SpiritTemple() {
                   LOCATION(RC_SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST, (randoCtx->GetTrickOption(RT_LENS_SPIRIT) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->HasExplosives),
                 }, {
                   //Exits
-                  Entrance(RR_SPIRIT_TEMPLE_BEYOND_FINAL_LOCKED_DOOR, {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && (randoCtx->GetTrickOption(RT_SPIRIT_WALL) || logic->CanUse(RG_LONGSHOT) || logic->HasBombchus || ((logic->Bombs || logic->Nuts || logic->CanUse(RG_DINS_FIRE)) && (logic->Bow || logic->CanUse(RG_HOOKSHOT) || logic->Hammer)));}}),
+                  Entrance(RR_SPIRIT_TEMPLE_BEYOND_FINAL_LOCKED_DOOR, {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && (randoCtx->GetTrickOption(RT_SPIRIT_WALL) || logic->CanUse(RG_LONGSHOT) || logic->CanUse(RG_BOMBCHU_5) || ((logic->Bombs || logic->CanUse(RG_NUTS) || logic->CanUse(RG_DINS_FIRE)) && (logic->Bow || logic->CanUse(RG_HOOKSHOT) || logic->Hammer)));}}),
   });
 
   areaTable[RR_SPIRIT_TEMPLE_BEYOND_FINAL_LOCKED_DOOR] = Area("Spirit Temple Beyond Final Locked Door", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -146,27 +139,27 @@ void AreaTable_Init_SpiritTemple() {
                   //Locations
                   LOCATION(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST, true),
                   LOCATION(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST,  Here(RR_SPIRIT_TEMPLE_MQ_LOBBY, []{return logic->CanBlastOrSmash;}) && ((logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT)) || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW)))),
-                  LOCATION(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST, logic->HasBombchus || (logic->IsAdult && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT))) || (logic->IsChild && (logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG)))),
+                  LOCATION(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST, logic->CanUse(RG_BOMBCHU_5) || (logic->IsAdult && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT))) || (logic->IsChild && (logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG)))),
   }, {
                   //Exits
                   Entrance(RR_SPIRIT_TEMPLE_ENTRYWAY, {[]{return true;}}),
                   Entrance(RR_SPIRIT_TEMPLE_MQ_CHILD, {[]{return logic->IsChild;}}),
-                  Entrance(RR_SPIRIT_TEMPLE_MQ_ADULT, {[]{return logic->HasBombchus && logic->IsAdult && logic->CanUse(RG_LONGSHOT) && logic->CanUse(RG_SILVER_GAUNTLETS);}}),
+                  Entrance(RR_SPIRIT_TEMPLE_MQ_ADULT, {[]{return logic->CanUse(RG_BOMBCHU_5) && logic->IsAdult && logic->CanUse(RG_LONGSHOT) && logic->CanUse(RG_SILVER_GAUNTLETS);}}),
   });
 
   areaTable[RR_SPIRIT_TEMPLE_MQ_CHILD] = Area("Spirit Temple MQ Child", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->FairyPot, {[]{return logic->FairyPot || (logic->KokiriSword && logic->HasBombchus && logic->Slingshot);}}),
+                  EventAccess(&logic->FairyPot, {[]{return logic->FairyPot || (logic->KokiriSword && logic->CanUse(RG_BOMBCHU_5) && logic->Slingshot);}}),
   }, {
                   //Locations
                   LOCATION(RC_SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST,  Here(RR_SPIRIT_TEMPLE_MQ_ADULT, []{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && logic->Hammer;})),
-                  LOCATION(RC_SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST,       logic->KokiriSword && logic->HasBombchus && logic->Slingshot && logic->CanUse(RG_DINS_FIRE)),
+                  LOCATION(RC_SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST,       logic->KokiriSword && logic->CanUse(RG_BOMBCHU_5) && logic->Slingshot && logic->CanUse(RG_DINS_FIRE)),
                   LOCATION(RC_SPIRIT_TEMPLE_MQ_MAP_CHEST,                  logic->KokiriSword || logic->Bombs),
-                  LOCATION(RC_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST, logic->HasBombchus && logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && logic->Slingshot && (logic->CanUse(RG_DINS_FIRE) || (Here(RR_SPIRIT_TEMPLE_MQ_ADULT, []{return logic->IsAdult && (logic->CanUse(RG_FIRE_ARROWS) || (randoCtx->GetTrickOption(RT_SPIRIT_MQ_FROZEN_EYE) && logic->CanUse(RG_FAIRY_BOW) && logic->CanUse(RG_SONG_OF_TIME)));})))),
-                    //Trick: logic->HasBombchus && logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && logic->Slingshot && (logic->CanUse(RG_DINS_FIRE) || (SPIRIT_TEMPLE_MQ_ADULT.Adult() && logic->IsAdult && (logic->CanUse(RG_FIRE_ARROWS) || (LogicSpiritMQFrozenEye && logic->CanUse(RG_FAIRY_BOW) && logic->CanUse(RG_SONG_OF_TIME)))))
+                  LOCATION(RC_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST, logic->CanUse(RG_BOMBCHU_5) && logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && logic->Slingshot && (logic->CanUse(RG_DINS_FIRE) || (Here(RR_SPIRIT_TEMPLE_MQ_ADULT, []{return logic->IsAdult && (logic->CanUse(RG_FIRE_ARROWS) || (randoCtx->GetTrickOption(RT_SPIRIT_MQ_FROZEN_EYE) && logic->CanUse(RG_FAIRY_BOW) && logic->CanUse(RG_SONG_OF_TIME)));})))),
+                    //Trick: logic->CanUse(RG_BOMBCHU_5) && logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && logic->Slingshot && (logic->CanUse(RG_DINS_FIRE) || (SPIRIT_TEMPLE_MQ_ADULT.Adult() && logic->IsAdult && (logic->CanUse(RG_FIRE_ARROWS) || (LogicSpiritMQFrozenEye && logic->CanUse(RG_FAIRY_BOW) && logic->CanUse(RG_SONG_OF_TIME)))))
   }, {
                   //Exits
-                  Entrance(RR_SPIRIT_TEMPLE_MQ_SHARED, {[]{return logic->HasBombchus && logic->SmallKeys(RR_SPIRIT_TEMPLE, 2);}}),
+                  Entrance(RR_SPIRIT_TEMPLE_MQ_SHARED, {[]{return logic->CanUse(RG_BOMBCHU_5) && logic->SmallKeys(RR_SPIRIT_TEMPLE, 2);}}),
   });
 
   areaTable[RR_SPIRIT_TEMPLE_MQ_ADULT] = Area("Spirit Temple MQ Adult", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp
index 2534ebef3..ef9c5ecd9 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp
@@ -134,7 +134,7 @@ void AreaTable_Init_WaterTemple() {
 
   areaTable[RR_WATER_TEMPLE_DRAGON_ROOM] = Area("Water Temple Dragon Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_WATER_TEMPLE_DRAGON_CHEST, (logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_IRON_BOOTS)) || (((logic->IsAdult && randoCtx->GetTrickOption(RT_WATER_ADULT_DRAGON) && (logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->HasBombchus)) || (logic->IsChild && randoCtx->GetTrickOption(RT_WATER_CHILD_DRAGON) && (logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG) || logic->HasBombchus))) && (logic->CanDive || logic->CanUse(RG_IRON_BOOTS))) ||
+                  LOCATION(RC_WATER_TEMPLE_DRAGON_CHEST, (logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_IRON_BOOTS)) || (((logic->IsAdult && randoCtx->GetTrickOption(RT_WATER_ADULT_DRAGON) && (logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_BOMBCHU_5))) || (logic->IsChild && randoCtx->GetTrickOption(RT_WATER_CHILD_DRAGON) && (logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG) || logic->CanUse(RG_BOMBCHU_5)))) && (logic->CanDive || logic->CanUse(RG_IRON_BOOTS))) ||
                                                                        Here(RR_WATER_TEMPLE_RIVER, []{return logic->IsAdult && logic->CanUse(RG_FAIRY_BOW) && ((randoCtx->GetTrickOption(RT_WATER_ADULT_DRAGON) && (logic->CanDive || logic->CanUse(RG_IRON_BOOTS))) || randoCtx->GetTrickOption(RT_WATER_DRAGON_JUMP_DIVE));})),
                 }, {
                   //Exits
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
index 2344c13a8..49a764147 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
@@ -163,7 +163,7 @@ void AreaTable_Init_ZorasDomain() {
                 }, {
                   //Exits
                   Entrance(RR_ZD_BEHIND_KING_ZORA,       {[]{return true;}}),
-                  Entrance(RR_JABU_JABUS_BELLY_ENTRYWAY, {[]{return (logic->IsChild && logic->Fish);}}),
+                  Entrance(RR_JABU_JABUS_BELLY_ENTRYWAY, {[]{return (logic->IsChild && logic->CanUse(RG_BOTTLE_WITH_FISH));}}),
                   Entrance(RR_ICE_CAVERN_ENTRYWAY,       {[]{return logic->IsAdult;}}),
                   Entrance(RR_ZF_GREAT_FAIRY_FOUNTAIN,   {[]{return logic->HasExplosives;}}),
   });
diff --git a/soh/soh/Enhancements/randomizer/3drando/shops.cpp b/soh/soh/Enhancements/randomizer/3drando/shops.cpp
index 7ac5173c5..6f785b505 100644
--- a/soh/soh/Enhancements/randomizer/3drando/shops.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/shops.cpp
@@ -45,10 +45,10 @@ std::vector<RandomizerGet> GetMinVanillaShopItems(int total_replaced) {
     RG_BUY_ARROWS_10,
     RG_BUY_ARROWS_30,
     RG_BUY_ARROWS_50,
-    RG_BUY_BOMBCHU_10,
-    RG_BUY_BOMBCHU_10,
-    RG_BUY_BOMBCHU_10,
-    RG_BUY_BOMBCHU_20,
+    RG_BUY_BOMBCHUS_10,
+    RG_BUY_BOMBCHUS_10,
+    RG_BUY_BOMBCHUS_10,
+    RG_BUY_BOMBCHUS_20,
     RG_BUY_BOMBS_525,
     RG_BUY_BOMBS_535,
     RG_BUY_BOMBS_10,
@@ -67,15 +67,15 @@ std::vector<RandomizerGet> GetMinVanillaShopItems(int total_replaced) {
     //^First 32 items: Always guaranteed
     RG_BUY_BLUE_FIRE,
     RG_BUY_FISH,
-    RG_BUY_BOMBCHU_10,
+    RG_BUY_BOMBCHUS_10,
     RG_BUY_DEKU_NUTS_5,
     RG_BUY_ARROWS_10,
-    RG_BUY_BOMBCHU_20,
+    RG_BUY_BOMBCHUS_20,
     RG_BUY_BOMBS_535,
     RG_BUY_RED_POTION_30,
     //^First 40 items: Exist on shopsanity 3 or less
     RG_BUY_BOMBS_30,
-    RG_BUY_BOMBCHU_20,
+    RG_BUY_BOMBCHUS_20,
     RG_BUY_DEKU_NUTS_5,
     RG_BUY_ARROWS_10,
     RG_BUY_DEKU_NUTS_5,
@@ -83,7 +83,7 @@ std::vector<RandomizerGet> GetMinVanillaShopItems(int total_replaced) {
     RG_BUY_RED_POTION_40,
     RG_BUY_FISH,
     //^First 48 items: Exist on shopsanity 2 or less
-    RG_BUY_BOMBCHU_20,
+    RG_BUY_BOMBCHUS_20,
     RG_BUY_ARROWS_30,
     RG_BUY_RED_POTION_50,
     RG_BUY_ARROWS_30,
diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
index c40031e74..1fa01cdd7 100644
--- a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
@@ -186,10 +186,7 @@ void WriteIngameSpoilerLog() {
         if (key == RC_GANON) {
             spoilerData.ItemLocations[spoilerItemIndex].CollectType = COLLECTTYPE_NEVER;
             spoilerData.ItemLocations[spoilerItemIndex].RevealType = REVEALTYPE_ALWAYS;
-        } else if (key == RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS) {
-            spoilerData.ItemLocations[spoilerItemIndex].CollectType = COLLECTTYPE_REPEATABLE;
-            spoilerData.ItemLocations[spoilerItemIndex].RevealType = REVEALTYPE_ALWAYS;
-        }
+        } 
         // Shops
         else if (loc->IsShop()) {
             if (ctx->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_OFF)) {
diff --git a/soh/soh/Enhancements/randomizer/context.cpp b/soh/soh/Enhancements/randomizer/context.cpp
index a325e5e84..db348b32f 100644
--- a/soh/soh/Enhancements/randomizer/context.cpp
+++ b/soh/soh/Enhancements/randomizer/context.cpp
@@ -781,7 +781,6 @@ void Context::ApplyItemEffect(Item& item, bool state) {
             case RG_BOMBCHU_5:
             case RG_BOMBCHU_10:
             case RG_BOMBCHU_20:
-            case RG_BOMBCHU_DROP:
                 SetInventory(ITEM_BOMBCHU, (!state ? ITEM_NONE : ITEM_BOMBCHU));
                 break;
         }
@@ -880,7 +879,6 @@ void Context::ApplyItemEffect(Item& item, bool state) {
         case RG_BOMBCHU_5:
         case RG_BOMBCHU_10:
         case RG_BOMBCHU_20:
-        case RG_BOMBCHU_DROP:
             SetInventory(ITEM_BOMBCHU, (!state ? ITEM_NONE : ITEM_BOMBCHU));
             break;
         }
diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index d5737d33d..4bd8da742 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -261,7 +261,6 @@ void RandomizerOnPlayerUpdateForRCQueueHandler() {
             rc != RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST &&
             rc != RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE &&
             rc != RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE &&
-            rc != RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS &&
             // Always show ItemGet animation for ice traps
             !(getItemEntry.modIndex == MOD_RANDOMIZER && getItemEntry.getItemId == RG_ICE_TRAP) &&
             (
@@ -835,6 +834,10 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
                       Flags_GetRandomizerInf(RAND_INF_MERCHANTS_CARPET_SALESMAN);
             break;
         }
+        case VB_GIVE_BOMBCHUS_FROM_CARPET_SALESMAN: {
+            *should = RAND_GET_OPTION(RSK_BOMBCHUS_IN_LOGIC) == false || INV_CONTENT(ITEM_BOMBCHU) == ITEM_BOMBCHU;
+            break;
+        }
         case VB_GIVE_ITEM_FROM_MEDIGORON: {
             // fallthrough
         case VB_BE_ELIGIBLE_FOR_GIANTS_KNIFE_PURCHASE:
@@ -1435,7 +1438,7 @@ void RandomizerOnActorInitHandler(void* actorRef) {
                 break;
             case EXITEM_BOMBCHUS_COUNTER:
             case EXITEM_BOMBCHUS_BOWLING:
-                rc = RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS;
+                //RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS was removed as a 3DS holdover not in anyones near term plans due to being pretty useless.
                 break;
             case EXITEM_BULLET_BAG:
                 rc = RC_LW_TARGET_IN_WOODS;
diff --git a/soh/soh/Enhancements/randomizer/item_list.cpp b/soh/soh/Enhancements/randomizer/item_list.cpp
index e465d2575..6b7b8a5e1 100644
--- a/soh/soh/Enhancements/randomizer/item_list.cpp
+++ b/soh/soh/Enhancements/randomizer/item_list.cpp
@@ -205,10 +205,9 @@ void Rando::StaticData::InitItemTable() {
     itemTable[RG_BOMBS_5] =                             Item(RG_BOMBS_5,                          Text{ "Bombs (5)", "Bombes (5)", "Bomben (5)" },                                                                                     ITEMTYPE_REFILL,            GI_BOMBS_5,           false, LOGIC_NONE,                         RHT_BOMBS_5,                           ITEM_BOMBS_5,                         OBJECT_GI_BOMB_1,       GID_BOMB,             0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
     itemTable[RG_BOMBS_10] =                            Item(RG_BOMBS_10,                         Text{ "Bombs (10)", "Bombes (10)", "Bomben (10)" },                                                                                  ITEMTYPE_REFILL,            GI_BOMBS_10,          false, LOGIC_NONE,                         RHT_BOMBS_10,                          ITEM_BOMBS_10,                        OBJECT_GI_BOMB_1,       GID_BOMB,             0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
     itemTable[RG_BOMBS_20] =                            Item(RG_BOMBS_20,                         Text{ "Bombs (20)", "Bombes (20)", "Bomben (20)" },                                                                                  ITEMTYPE_REFILL,            GI_BOMBS_20,          false, LOGIC_NONE,                         RHT_BOMBS_20,                          ITEM_BOMBS_20,                        OBJECT_GI_BOMB_1,       GID_BOMB,             0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_BOMBCHU_5] =                           Item(RG_BOMBCHU_5,                        Text{ "Bombchus (5)", "Missiles (5)", "Krabbelminen (5)" },                                                                          ITEMTYPE_REFILL,            GI_BOMBCHUS_5,        true,  LOGIC_BOMBCHUS_5,                   RHT_BOMBCHU_5,                         ITEM_BOMBCHUS_5,                      OBJECT_GI_BOMB_2,       GID_BOMBCHU,          0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_BOMBCHU_10] =                          Item(RG_BOMBCHU_10,                       Text{ "Bombchus (10)", "Missiles (10)", "Krabbelminen (10)" },                                                                       ITEMTYPE_REFILL,            GI_BOMBCHUS_10,       true,  LOGIC_BOMBCHUS_10,                  RHT_BOMBCHU_10,                        ITEM_BOMBCHU,                         OBJECT_GI_BOMB_2,       GID_BOMBCHU,          0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_BOMBCHU_20] =                          Item(RG_BOMBCHU_20,                       Text{ "Bombchus (20)", "Missiles (20)", "Krabbelminen (20)" },                                                                       ITEMTYPE_REFILL,            GI_BOMBCHUS_20,       true,  LOGIC_BOMBCHUS_20,                  RHT_BOMBCHU_20,                        ITEM_BOMBCHUS_20,                     OBJECT_GI_BOMB_2,       GID_BOMBCHU,          0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_BOMBCHU_DROP] =                        Item(RG_BOMBCHU_DROP,                     Text{ "Bombchu Drop", "Drop Missiles", "Krabbelminen" },                                                                             ITEMTYPE_DROP,              GI_BOMBCHUS_10,       true,  LOGIC_BOMBCHU_DROP,                 RHT_NONE,                              ITEM_BOMBCHU,                         OBJECT_GI_BOMB_2,       GID_BOMBCHU,          0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_BOMBCHU_5] =                           Item(RG_BOMBCHU_5,                        Text{ "Bombchus (5)", "Missiles (5)", "Krabbelminen (5)" },                                                                          ITEMTYPE_REFILL,            GI_BOMBCHUS_5,        true,  LOGIC_BOMBCHUS,                     RHT_BOMBCHUS_5,                        ITEM_BOMBCHUS_5,                      OBJECT_GI_BOMB_2,       GID_BOMBCHU,          0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_BOMBCHU_10] =                          Item(RG_BOMBCHU_10,                       Text{ "Bombchus (10)", "Missiles (10)", "Krabbelminen (10)" },                                                                       ITEMTYPE_REFILL,            GI_BOMBCHUS_10,       true,  LOGIC_BOMBCHUS,                     RHT_BOMBCHUS_10,                       ITEM_BOMBCHU,                         OBJECT_GI_BOMB_2,       GID_BOMBCHU,          0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_BOMBCHU_20] =                          Item(RG_BOMBCHU_20,                       Text{ "Bombchus (20)", "Missiles (20)", "Krabbelminen (20)" },                                                                       ITEMTYPE_REFILL,            GI_BOMBCHUS_20,       true,  LOGIC_BOMBCHUS,                     RHT_BOMBCHUS_20,                       ITEM_BOMBCHUS_20,                     OBJECT_GI_BOMB_2,       GID_BOMBCHU,          0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
     itemTable[RG_ARROWS_5] =                            Item(RG_ARROWS_5,                         Text{ "Arrows (5)", "Flèches (5)", "Pfeile (5)" },                                                                                   ITEMTYPE_REFILL,            GI_ARROWS_SMALL,      false, LOGIC_NONE,                         RHT_ARROWS_5,                          ITEM_ARROWS_SMALL,                    OBJECT_GI_ARROW,        GID_ARROWS_SMALL,     0xE6,                        0x48, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
     itemTable[RG_ARROWS_10] =                           Item(RG_ARROWS_10,                        Text{ "Arrows (10)", "Flèches (10)", "Pfeile (10)" },                                                                                ITEMTYPE_REFILL,            GI_ARROWS_MEDIUM,     false, LOGIC_NONE,                         RHT_ARROWS_10,                         ITEM_ARROWS_MEDIUM,                   OBJECT_GI_ARROW,        GID_ARROWS_MEDIUM,    0xE6,                        0x49, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
     itemTable[RG_ARROWS_30] =                           Item(RG_ARROWS_30,                        Text{ "Arrows (30)", "Flèches (30)", "Pfeile (30)" },                                                                                ITEMTYPE_REFILL,            GI_ARROWS_LARGE,      false, LOGIC_NONE,                         RHT_ARROWS_30,                         ITEM_ARROWS_LARGE,                    OBJECT_GI_ARROW,        GID_ARROWS_LARGE,     0xE6,                        0x4A, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
@@ -239,8 +238,8 @@ void Rando::StaticData::InitItemTable() {
     itemTable[RG_BUY_GORON_TUNIC] =                     Item(RG_BUY_GORON_TUNIC,                  Text{ "Buy Goron Tunic", "Acheter: Tunique Goron", "Goronen-Tunika kaufen" },                                                        ITEMTYPE_SHOP,              GI_TUNIC_GORON,       true,  LOGIC_GORON_TUNIC,                  RHT_GORON_TUNIC,                       ITEM_TUNIC_GORON,                     OBJECT_GI_CLOTHES,      GID_TUNIC_GORON,      0x50,                        0xA0, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE, false, 200);
     itemTable[RG_BUY_ZORA_TUNIC] =                      Item(RG_BUY_ZORA_TUNIC,                   Text{ "Buy Zora Tunic", "Acheter: Tunique Zora", "Zora-Tunika kaufen" },                                                             ITEMTYPE_SHOP,              GI_TUNIC_ZORA,        true,  LOGIC_ZORA_TUNIC,                   RHT_ZORA_TUNIC,                        ITEM_TUNIC_ZORA,                      OBJECT_GI_CLOTHES,      GID_TUNIC_ZORA,       0x51,                        0xA0, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE, false, 300);
     itemTable[RG_BUY_HEART] =                           Item(RG_BUY_HEART,                        Text{ "Buy Heart", "Acheter: Coeur de Vie", "Herz kaufen" },                                                                         ITEMTYPE_SHOP,              GI_HEART,             false, LOGIC_NONE,                         RHT_RECOVERY_HEART,                    ITEM_HEART,                           OBJECT_GI_HEART,        GID_HEART,            0x55,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 10);
-    itemTable[RG_BUY_BOMBCHU_10] =                      Item(RG_BUY_BOMBCHU_10,                   Text{ "Buy Bombchu (10)", "Acheter: Missiles (10)", "Krabbelminen kaufen (10)" },                                                    ITEMTYPE_SHOP,              GI_BOMBCHUS_10,       true,  LOGIC_BUY_BOMBCHUS,                 RHT_BOMBCHU_10,                        ITEM_BOMBCHU,                         OBJECT_GI_BOMB_2,       GID_BOMBCHU,          0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 99);
-    itemTable[RG_BUY_BOMBCHU_20] =                      Item(RG_BUY_BOMBCHU_20,                   Text{ "Buy Bombchu (20)", "Acheter: Missiles (20)", "Krabbelminen kaufen (20)" },                                                    ITEMTYPE_SHOP,              GI_BOMBCHUS_20,       true,  LOGIC_BUY_BOMBCHUS,                 RHT_BOMBCHU_20,                        ITEM_BOMBCHUS_20,                     OBJECT_GI_BOMB_2,       GID_BOMBCHU,          0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 180);
+    itemTable[RG_BUY_BOMBCHUS_10] =                     Item(RG_BUY_BOMBCHUS_10,                  Text{ "Buy Bombchu (10)", "Acheter: Missiles (10)", "Krabbelminen kaufen (10)" },                                                    ITEMTYPE_SHOP,              GI_BOMBCHUS_10,       true,  LOGIC_BUY_BOMBCHUS,                 RHT_BOMBCHUS_10,                       ITEM_BOMBCHU,                         OBJECT_GI_BOMB_2,       GID_BOMBCHU,          0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 99);
+    itemTable[RG_BUY_BOMBCHUS_20] =                     Item(RG_BUY_BOMBCHUS_20,                  Text{ "Buy Bombchu (20)", "Acheter: Missiles (20)", "Krabbelminen kaufen (20)" },                                                    ITEMTYPE_SHOP,              GI_BOMBCHUS_20,       true,  LOGIC_BUY_BOMBCHUS,                 RHT_BOMBCHUS_20,                       ITEM_BOMBCHUS_20,                     OBJECT_GI_BOMB_2,       GID_BOMBCHU,          0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 180);
     itemTable[RG_BUY_DEKU_SEEDS_30] =                   Item(RG_BUY_DEKU_SEEDS_30,                Text{ "Buy Deku Seeds (30)", "Acheter: Graines Mojo (30)", "Deku-Samen kaufen (30)" },                                               ITEMTYPE_SHOP,              GI_SEEDS_30,          true,  LOGIC_BUY_SEED,                     RHT_DEKU_SEEDS_30,                     ITEM_SEEDS_30,                        OBJECT_GI_SEED,         GID_SEEDS,            0xDC,                        0x50, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
     itemTable[RG_SOLD_OUT] =                            Item(RG_SOLD_OUT,                         Text{ "Sold Out", "Rupture de stock", "Ausverkauft" },                                                                               ITEMTYPE_SHOP,              RG_SOLD_OUT,          false, LOGIC_NONE,                         RHT_NONE, false, 0);
     itemTable[RG_BUY_BLUE_FIRE] =                       Item(RG_BUY_BLUE_FIRE,                    Text{ "Buy Blue Fire", "Acheter: Flamme Bleue", "Blaues Feuer kaufen" },                                                             ITEMTYPE_SHOP,              GI_BLUE_FIRE,         true,  LOGIC_BLUE_FIRE_ACCESS,             RHT_BOTTLE_WITH_BLUE_FIRE,             ITEM_BLUE_FIRE,                       OBJECT_GI_FIRE,         GID_BLUE_FIRE,        0x5D,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 300);
diff --git a/soh/soh/Enhancements/randomizer/location_list.cpp b/soh/soh/Enhancements/randomizer/location_list.cpp
index ad09e683d..dd31dae5c 100644
--- a/soh/soh/Enhancements/randomizer/location_list.cpp
+++ b/soh/soh/Enhancements/randomizer/location_list.cpp
@@ -201,7 +201,6 @@ std::vector<RandomizerCheck> Rando::StaticData::overworldLocations = {
     RC_MARKET_TREASURE_CHEST_GAME_REWARD,
     RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,
     RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE,
-    RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS,
     RC_MARKET_LOST_DOG,
     RC_MARKET_SHOOTING_GALLERY_REWARD,
     RC_MARKET_10_BIG_POES,
@@ -672,7 +671,7 @@ void Rando::StaticData::InitLocationTable() { //
     locationTable[RC_GF_SOUTH_F2_CARPENTER] =                                   Location::Collectable(RC_GF_SOUTH_F2_CARPENTER,                                        RCQUEST_BOTH,    RCTYPE_GF_KEY,                      RCAREA_GERUDO_FORTRESS,              ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,              3857,                                              0x0F, "GF South F2 Carpenter",                       RHT_GF_SOUTH_F2_CARPENTER,                                       RG_GERUDO_FORTRESS_SMALL_KEY,         { Category::cVanillaGFSmallKey },                                                                                                                                                     SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
     // Haunted Wasteland
     locationTable[RC_WASTELAND_CHEST] =                                               Location::Chest(RC_WASTELAND_CHEST,                                              RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_WASTELAND,                    ACTOR_EN_BOX,         SCENE_HAUNTED_WASTELAND,            -30048,                                            0x00, "Chest",                                       RHT_WASTELAND_CHEST,                                             RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[RC_WASTELAND_BOMBCHU_SALESMAN] =                                     Location::Base(RC_WASTELAND_BOMBCHU_SALESMAN,                                   RCQUEST_BOTH,    RCTYPE_MERCHANT,                    RCAREA_WASTELAND,                    ACTOR_ID_MAX,         SCENE_HAUNTED_WASTELAND,            0x00,                                              0x03, "Carpet Salesman",                             RHT_WASTELAND_BOMBCHU_SALESMAN,                                  RG_BOMBCHU_10,                        { Category::cMerchant },                                SpoilerCollectionCheck::RandomizerInf(RAND_INF_MERCHANTS_CARPET_SALESMAN),                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_WASTELAND_BOMBCHU_SALESMAN] =                                     Location::Base(RC_WASTELAND_BOMBCHU_SALESMAN,                                   RCQUEST_BOTH,    RCTYPE_MERCHANT,                    RCAREA_WASTELAND,                    ACTOR_ID_MAX,         SCENE_HAUNTED_WASTELAND,            0x00,                                              0x03, "Carpet Salesman",                             RHT_WASTELAND_BOMBCHU_SALESMAN,                                  RG_BUY_BOMBCHUS_10,                   { Category::cMerchant },                                SpoilerCollectionCheck::RandomizerInf(RAND_INF_MERCHANTS_CARPET_SALESMAN),                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
     // Desert Colossus
     locationTable[RC_COLOSSUS_FREESTANDING_POH] =                               Location::Collectable(RC_COLOSSUS_FREESTANDING_POH,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DESERT_COLOSSUS,              ACTOR_EN_ITEM00,      SCENE_DESERT_COLOSSUS,              3334,                                              0x0D, "Freestanding PoH",                            RHT_COLOSSUS_FREESTANDING_POH,                                   RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
     locationTable[RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR] =                         Location::GrottoScrub(RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,                              RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_DESERT_COLOSSUS,              ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x07, 0xFD),                      0x39, "Deku Scrub Grotto Rear",                      RHT_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,                             RG_BUY_RED_POTION_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_COLOSSUS_DEKU_SCRUB_GROTTO_REAR),                             SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
@@ -681,7 +680,6 @@ void Rando::StaticData::InitLocationTable() { //
     locationTable[RC_MARKET_TREASURE_CHEST_GAME_REWARD] =                             Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_REWARD,                            RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0x0A, "Treasure Chest Game Reward",                  RHT_MARKET_TREASURE_CHEST_GAME_REWARD,                           RG_TREASURE_GAME_HEART,               {},                                                     SpoilerCollectionCheck::ItemGetInf(27),                                                                                       SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
     locationTable[RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE] =                             Location::Base(RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_BOMBCHU_BOWLING_ALLEY,        0x00,                                              0x33, "Bombchu Bowling First Prize",                 RHT_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,                          RG_PROGRESSIVE_BOMB_BAG,              {},                                                     SpoilerCollectionCheck::ItemGetInf(17),                                                                                       SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
     locationTable[RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE] =                            Location::Base(RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE,                          RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_BOMBCHU_BOWLING_ALLEY,        0x00,                                              0x3E, "Bombchu Bowling Second Prize",                RHT_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE,                         RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::ItemGetInf(18),                                                                                       SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
-    locationTable[RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS] =                                Location::Base(RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS,                              RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_BOMBCHU_BOWLING_ALLEY,        0x00,                                              0x00, "Bombchu Bowling Bombchus",                    RHT_MARKET_BOMBCHU_BOWLING_BOMBCHUS,                             RG_BOMBCHU_DROP,                      {},                                                     SpoilerCollectionCheck::None(),                                                                                               SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
     locationTable[RC_MARKET_LOST_DOG] =                                                Location::Base(RC_MARKET_LOST_DOG,                                              RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_DOG_LADY_HOUSE,               0x00,                                              0x3E, "Lost Dog",                                    RHT_MARKET_LOST_DOG,                                             RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::InfTable(INFTABLE_191),                                                                               SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
     locationTable[RC_MARKET_SHOOTING_GALLERY_REWARD] =                                 Location::Base(RC_MARKET_SHOOTING_GALLERY_REWARD,                               RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_SHOOTING_GALLERY,             0x00,                                              0x60, "Shooting Gallery",                            RHT_MARKET_SHOOTING_GALLERY_REWARD,                              RG_PROGRESSIVE_SLINGSHOT,             {},                                                     SpoilerCollectionCheck::ItemGetInf(ITEMGETINF_0D),                                                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
     locationTable[RC_MARKET_10_BIG_POES] =                                             Location::Base(RC_MARKET_10_BIG_POES,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_MARKET_GUARD_HOUSE,           0x00,                                              0x0F, "10 Big Poes",                                 RHT_MARKET_10_BIG_POES,                                          RG_EMPTY_BOTTLE,                      {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_10_BIG_POES),                                                                  SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
@@ -1415,14 +1413,14 @@ void Rando::StaticData::InitLocationTable() { //
     locationTable[RC_KAK_BAZAAR_ITEM_8] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_8,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x07,                                              0x3F, "Bazaar Item 8",                               RHT_KAK_BAZAAR_ITEM_8,                                           RG_BUY_ARROWS_30,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x33, 7),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
 
     // Market
-    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_1] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_1,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x00,                                              0x30, "Bombchu Shop Item 1",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_1,                                  RG_BUY_BOMBCHU_10,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 0),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_2] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_2,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x01,                                              0x31, "Bombchu Shop Item 2",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_2,                                  RG_BUY_BOMBCHU_10,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 1),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_3] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_3,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x02,                                              0x32, "Bombchu Shop Item 3",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_3,                                  RG_BUY_BOMBCHU_10,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 2),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_4] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_4,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x03,                                              0x33, "Bombchu Shop Item 4",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_4,                                  RG_BUY_BOMBCHU_10,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 3),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_5] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_5,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x04,                                              0x34, "Bombchu Shop Item 5",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_5,                                  RG_BUY_BOMBCHU_20,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 4),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_6] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_6,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x05,                                              0x35, "Bombchu Shop Item 6",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_6,                                  RG_BUY_BOMBCHU_20,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 5),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_7] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_7,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x06,                                              0x36, "Bombchu Shop Item 7",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_7,                                  RG_BUY_BOMBCHU_20,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 6),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_8] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_8,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x07,                                              0x37, "Bombchu Shop Item 8",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_8,                                  RG_BUY_BOMBCHU_20,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 7),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_1] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_1,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x00,                                              0x30, "Bombchu Shop Item 1",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_1,                                  RG_BUY_BOMBCHUS_10,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 0),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_2] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_2,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x01,                                              0x31, "Bombchu Shop Item 2",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_2,                                  RG_BUY_BOMBCHUS_10,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 1),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_3] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_3,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x02,                                              0x32, "Bombchu Shop Item 3",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_3,                                  RG_BUY_BOMBCHUS_10,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 2),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_4] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_4,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x03,                                              0x33, "Bombchu Shop Item 4",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_4,                                  RG_BUY_BOMBCHUS_10,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 3),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_5] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_5,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x04,                                              0x34, "Bombchu Shop Item 5",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_5,                                  RG_BUY_BOMBCHUS_20,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 4),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_6] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_6,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x05,                                              0x35, "Bombchu Shop Item 6",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_6,                                  RG_BUY_BOMBCHUS_20,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 5),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_7] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_7,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x06,                                              0x36, "Bombchu Shop Item 7",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_7,                                  RG_BUY_BOMBCHUS_20,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 6),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_8] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_8,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x07,                                              0x37, "Bombchu Shop Item 8",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_8,                                  RG_BUY_BOMBCHUS_20,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 7),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
     locationTable[RC_MARKET_POTION_SHOP_ITEM_1] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_1,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x00,                                              0x30, "Potion Shop Item 1",                          RHT_MARKET_POTION_SHOP_ITEM_1,                                   RG_BUY_GREEN_POTION,                  { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x31, 0),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
     locationTable[RC_MARKET_POTION_SHOP_ITEM_2] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_2,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x01,                                              0x31, "Potion Shop Item 2",                          RHT_MARKET_POTION_SHOP_ITEM_2,                                   RG_BUY_BLUE_FIRE,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x31, 1),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
     locationTable[RC_MARKET_POTION_SHOP_ITEM_3] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_3,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x02,                                              0x32, "Potion Shop Item 3",                          RHT_MARKET_POTION_SHOP_ITEM_3,                                   RG_BUY_RED_POTION_30,                 { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x31, 2),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
diff --git a/soh/soh/Enhancements/randomizer/logic.cpp b/soh/soh/Enhancements/randomizer/logic.cpp
index a4bc5a08c..edb17df0c 100644
--- a/soh/soh/Enhancements/randomizer/logic.cpp
+++ b/soh/soh/Enhancements/randomizer/logic.cpp
@@ -56,7 +56,10 @@ namespace Rando {
             case RG_LIGHT_ARROWS:
                 return ctx->CheckInventory(ITEM_ARROW_LIGHT, true);
             case RG_PROGRESSIVE_BOMBCHUS:
-                return ctx->CheckInventory(ITEM_BOMBCHU, true);
+            case RG_BOMBCHU_5:
+            case RG_BOMBCHU_10:
+            case RG_BOMBCHU_20:
+                return (BombchusEnabled && BuyBombchus) || ctx->CheckInventory(ITEM_BOMBCHU, true);
             case RG_FAIRY_SLINGSHOT:
                 return ctx->CheckInventory(ITEM_SLINGSHOT, true);
             case RG_BOOMERANG:
@@ -202,6 +205,18 @@ namespace Rando {
             case RG_EYEDROPS:
             case RG_CLAIM_CHECK:
                 return ctx->HasAdultTrade(StaticData::RetrieveItem(itemName).GetGIEntry()->itemId);
+            case RG_BOTTLE_WITH_BIG_POE:
+            case RG_BOTTLE_WITH_BLUE_FIRE:
+            case RG_BOTTLE_WITH_BLUE_POTION:
+            case RG_BOTTLE_WITH_BUGS:
+            case RG_BOTTLE_WITH_FAIRY:
+            case RG_BOTTLE_WITH_FISH:
+            case RG_BOTTLE_WITH_GREEN_POTION:
+            case RG_BOTTLE_WITH_MILK:
+            case RG_BOTTLE_WITH_POE:
+            case RG_BOTTLE_WITH_RED_POTION:
+            case RG_EMPTY_BOTTLE:
+                return HasBottle;
         }
         SPDLOG_ERROR("HasItem reached `return false;`. Missing case for RandomizerGet of {}", static_cast<uint32_t>(itemName));
         assert(false);
@@ -256,12 +271,19 @@ namespace Rando {
                 return IsChild;// || BoomerangAsAdult;
             case RG_KOKIRI_SWORD:
                 return IsChild;// || KokiriSwordAsAdult;
+            case RG_NUTS:
+                return (NutPot  || NutCrate || DekuBabaNuts) && AmmoCanDrop; //RANDOTODO BuyNuts currently mixed in with Nuts, should be seperate as BuyNuts are also a Nuts source
             case RG_STICKS:
-                return IsChild;// || StickAsAdult;
+                return IsChild /* || StickAsAdult;*/&& (StickPot || DekuBabaSticks);
             case RG_DEKU_SHIELD:
                 return IsChild;// || DekuShieldAsAdult;
             case RG_WEIRD_EGG:
                 return IsChild;
+            case RG_PROGRESSIVE_BOMBCHUS:
+            case RG_BOMBCHU_5:
+            case RG_BOMBCHU_10:
+            case RG_BOMBCHU_20:
+                return BombchuRefill && BombchusEnabled;
             case RG_RUTOS_LETTER:
                 return IsChild;
 
@@ -317,6 +339,16 @@ namespace Rando {
             case RG_FISHING_POLE:
                 return HasItem(RG_CHILD_WALLET); // as long as you have enough rubies
 
+            // Bottle Items
+            case RG_BOTTLE_WITH_BUGS:
+                return BugShrub || WanderingBugs || BugRock || GetInLogic(LOGIC_BUGS_ACCESS);
+            case RG_BOTTLE_WITH_FISH:
+                return LoneFish || FishGroup || GetInLogic(LOGIC_FISH_ACCESS); //is there any need to care about lone vs group?
+            case RG_BOTTLE_WITH_BLUE_FIRE: //RANDOTODO should probably be better named to 
+                return BlueFireAccess || GetInLogic(LOGIC_BLUE_FIRE_ACCESS);
+            case RG_BOTTLE_WITH_FAIRY:
+                return FairyPot || GossipStoneFairy || BeanPlantFairy || ButterflyFairy || FreeFairies || FairyPond || GetInLogic(LOGIC_FAIRY_ACCESS);
+
             // Magic items
             default:
                 return MagicMeter && (IsMagicItem(itemName) || (IsMagicArrow(itemName) && CanUse(RG_FAIRY_BOW)));
@@ -375,7 +407,7 @@ namespace Rando {
                 return ((IsAdult && HasItem(RG_DINS_FIRE)) || (IsChild && (HasItem(RG_STICKS) || HasItem(RG_DINS_FIRE)))) && false; //GlitchEquipSwapDins;
             case GlitchType::EquipSwap: // todo: add bunny hood to adult item equippable list and child trade item to child item equippable list
                 return ((IsAdult && (HasItem(RG_DINS_FIRE) || HasItem(RG_FARORES_WIND) || HasItem(RG_NAYRUS_LOVE))) || (IsChild && (HasItem(RG_STICKS) || 
-                    HasItem(RG_FAIRY_SLINGSHOT) || HasItem(RG_BOOMERANG) || HasBottle || Nuts || Ocarina || HasItem(RG_LENS_OF_TRUTH) || HasExplosives ||
+                    HasItem(RG_FAIRY_SLINGSHOT) || HasItem(RG_BOOMERANG) || HasBottle || CanUse(RG_NUTS) || Ocarina || HasItem(RG_LENS_OF_TRUTH) || HasExplosives ||
                     ctx->GetAmmo(ITEM_BEAN) > 0 || HasItem(RG_DINS_FIRE) || HasItem(RG_FARORES_WIND) || HasItem(RG_NAYRUS_LOVE)))) && false; //GlitchEquipSwap;
         }
 
@@ -398,7 +430,7 @@ namespace Rando {
             return true;
         }
         if (enemy == "Big Skulltula"){
-            return Nuts || CanUse(RG_BOOMERANG);
+            return CanUse(RG_NUTS) || CanUse(RG_BOOMERANG);
         }
         return false;
     }
@@ -427,12 +459,10 @@ namespace Rando {
                            (HasItem(RG_OCARINA_C_DOWN_BUTTON) ? 1 : 0);
         ZeldasLetter   = HasItem(RG_ZELDAS_LETTER);
         WeirdEgg       = CanUse(RG_WEIRD_EGG);
-        Bombchus       = HasItem(RG_PROGRESSIVE_BOMBCHUS);
         BuySeed        = GetInLogic(LOGIC_BUY_SEED);
         BuyArrow       = GetInLogic(LOGIC_BUY_ARROW);
         BuyBomb        = GetInLogic(LOGIC_BUY_BOMB);
         BuyMagicPotion = GetInLogic(LOGIC_BUY_MAGIC_POTION);
-        BuyBombchus    = GetInLogic(LOGIC_BUY_BOMBCHUS);
         MagicBean      = ctx->GetAmmo(ITEM_BEAN) > 0;
         RutosLetter    = CanUse(RG_RUTOS_LETTER);
         Boomerang      = CanUse(RG_BOOMERANG);
@@ -469,6 +499,8 @@ namespace Rando {
         OcarinaOfTime   = HasItem(RG_OCARINA_OF_TIME);
         MagicMeter      = HasItem(RG_MAGIC_SINGLE) && (AmmoCanDrop || (HasBottle && BuyMagicPotion));
         BombBag         = HasItem(RG_BOMB_BAG) && (BuyBomb || AmmoCanDrop);
+        BombchusEnabled = ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) ? ctx->CheckInventory(ITEM_BOMBCHU, true) : BombBag;
+        BuyBombchus     = (GetInLogic(LOGIC_BUY_BOMBCHUS) || CouldPlayBowling || CarpetMerchant);
         Hookshot        = CanUse(RG_HOOKSHOT);
         Longshot        = CanUse(RG_LONGSHOT);
         Bow             = CanUse(RG_FAIRY_BOW) && (BuyArrow || AmmoCanDrop);
@@ -523,33 +555,16 @@ namespace Rando {
         Scarecrow        = Hookshot && ScarecrowSong;
         DistantScarecrow = Longshot && ScarecrowSong;
 
-        //Drop Access
-        DekuStickDrop = StickPot || DekuBabaSticks;
-        DekuNutDrop   = (NutPot  || NutCrate         || DekuBabaNuts) && AmmoCanDrop;
-        BugsAccess    = BugShrub || WanderingBugs    || BugRock || GetInLogic(LOGIC_BUGS_ACCESS);
-        FishAccess    = LoneFish || FishGroup || GetInLogic(LOGIC_FISH_ACCESS);
-        FairyAccess   = FairyPot || GossipStoneFairy || BeanPlantFairy || ButterflyFairy || FreeFairies || FairyPond || GetInLogic(LOGIC_FAIRY_ACCESS);
-
-
-        //refills
-        Bombs        = HasItem(RG_PROGRESSIVE_BOMB_BAG);
-        Nuts         = DekuNutDrop || HasItem(RG_NUTS);
-        Sticks       = DekuStickDrop || HasItem(RG_STICKS);
-        Bugs         = HasBottle && BugsAccess;
-        BlueFireAccess = BlueFireAccess || GetInLogic(LOGIC_BLUE_FIRE_ACCESS);
-        BlueFire     = (HasBottle && BlueFireAccess) || (ctx->GetOption(RSK_BLUE_FIRE_ARROWS) && CanUse(RG_ICE_ARROWS));
-        Fish         = HasBottle && FishAccess;
-        Fairy        = HasBottle && FairyAccess;
-
-        FoundBombchus   = Bombchus && (BombBag || ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC));
-        CanPlayBowling  = ChildsWallet && ((ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && FoundBombchus) || (!ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && BombBag));
         // TODO: Implement Ammo Drop Setting in place of bombchu drops
-        HasBombchus = (BuyBombchus || (ctx->GetOption(RSK_ENABLE_BOMBCHU_DROPS).Is(RO_AMMO_DROPS_ON/*_PLUS_BOMBCHU*/) && FoundBombchus));
+        BombchuRefill = BuyBombchus || (ctx->GetOption(RSK_ENABLE_BOMBCHU_DROPS).Is(RO_AMMO_DROPS_ON/*_PLUS_BOMBCHU*/));
 
-        HasExplosives =  Bombs || (ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && HasBombchus);
+        //Usage
+        Bombs     = HasItem(RG_PROGRESSIVE_BOMB_BAG);
+        BlueFire  = CanUse(RG_BOTTLE_WITH_BLUE_FIRE) || (ctx->GetOption(RSK_BLUE_FIRE_ARROWS) && CanUse(RG_ICE_ARROWS));
 
+        // TODO: Implement Ammo Drop Setting in place of bombchu drops
+        HasExplosives = Bombs || CanUse(RG_BOMBCHU_5);
         HasBoots = IronBoots || HoverBoots;
-
         //Unshuffled adult trade quest
         ClaimCheck = CanUse(RG_CLAIM_CHECK);
         Eyedrops = CanUse(RG_EYEDROPS) || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && ClaimCheck);
@@ -566,15 +581,15 @@ namespace Rando {
         // IsAdult = Age == AGE_ADULT;
 
         CanBlastOrSmash = HasExplosives || CanUse(RG_MEGATON_HAMMER);
-        CanChildAttack  = IsChild && (Slingshot || Boomerang || Sticks || KokiriSword || HasExplosives || CanUse(RG_DINS_FIRE) || CanUse(RG_MASTER_SWORD) || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_BIGGORON_SWORD));
-        CanChildDamage  = IsChild && (Slingshot ||              Sticks || KokiriSword || HasExplosives || CanUse(RG_DINS_FIRE) || CanUse(RG_MASTER_SWORD) || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_BIGGORON_SWORD));
+        CanChildAttack  = IsChild && (Slingshot || Boomerang || CanUse(RG_STICKS) || KokiriSword || HasExplosives || CanUse(RG_DINS_FIRE) || CanUse(RG_MASTER_SWORD) || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_BIGGORON_SWORD));
+        CanChildDamage  = IsChild && (Slingshot ||              CanUse(RG_STICKS) || KokiriSword || HasExplosives || CanUse(RG_DINS_FIRE) || CanUse(RG_MASTER_SWORD) || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_BIGGORON_SWORD));
         CanAdultAttack  = IsAdult && (CanUse(RG_FAIRY_BOW) || CanUse(RG_BOOMERANG)       || CanUse(RG_STICKS) || CanUse(RG_KOKIRI_SWORD) || HasExplosives || CanUse(RG_DINS_FIRE) || MasterSword || Hammer || BiggoronSword || Hookshot);
         CanAdultDamage  = IsAdult && (CanUse(RG_FAIRY_BOW) || CanUse(RG_STICKS)          || CanUse(RG_KOKIRI_SWORD) || HasExplosives || CanUse(RG_DINS_FIRE) || MasterSword || Hammer || BiggoronSword);
-        CanStunDeku     = CanAdultAttack || CanChildAttack || Nuts || HasShield;
+        CanStunDeku     = CanAdultAttack || CanChildAttack || CanUse(RG_NUTS) || HasShield;
         CanCutShrubs    = CanUse(RG_KOKIRI_SWORD) || CanUse(RG_BOOMERANG) || HasExplosives || CanUse(RG_MASTER_SWORD) || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_BIGGORON_SWORD);
         CanDive         = ProgressiveScale >= 2;
         CanLeaveForest  = ctx->GetOption(RSK_FOREST).IsNot(RO_FOREST_CLOSED) || IsAdult || DekuTreeClear || ctx->GetOption(RSK_SHUFFLE_INTERIOR_ENTRANCES) || ctx->GetOption(RSK_SHUFFLE_OVERWORLD_ENTRANCES);
-        CanPlantBugs    = IsChild && Bugs;
+        CanPlantBugs    = IsChild && CanUse(RG_BOTTLE_WITH_BUGS);
         CanRideEpona    = IsAdult && Epona && CanUse(RG_EPONAS_SONG);
         CanSummonGossipFairyWithoutSuns = CanUse(RG_ZELDAS_LULLABY) || CanUse(RG_EPONAS_SONG) || CanUse(RG_SONG_OF_TIME);
         CanSummonGossipFairy            = CanSummonGossipFairyWithoutSuns || CanUse(RG_SUNS_SONG);
@@ -584,13 +599,13 @@ namespace Rando {
         WaterTimer      = CanUse(RG_ZORA_TUNIC) ? 255 : (ctx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS)) ? (Hearts * 8) : 0;
         NeedNayrusLove      = (EffectiveHealth == 1);
         CanSurviveDamage    = !NeedNayrusLove || CanUse(RG_NAYRUS_LOVE);
-        CanTakeDamage       = Fairy || CanSurviveDamage;
-        CanTakeDamageTwice  = (Fairy && NumBottles >= 2) || ((EffectiveHealth == 2) && (CanUse(RG_NAYRUS_LOVE) || Fairy)) || (EffectiveHealth > 2);
+        CanTakeDamage       = CanUse(RG_BOTTLE_WITH_FAIRY) || CanSurviveDamage;
+        CanTakeDamageTwice  = (CanUse(RG_BOTTLE_WITH_FAIRY) && NumBottles >= 2) || ((EffectiveHealth == 2) && (CanUse(RG_NAYRUS_LOVE) || CanUse(RG_BOTTLE_WITH_FAIRY))) || (EffectiveHealth > 2);
         CanOpenBombGrotto   = CanBlastOrSmash       && (ShardOfAgony || ctx->GetTrickOption(RT_GROTTOS_WITHOUT_AGONY));
         CanOpenStormGrotto  = CanUse(RG_SONG_OF_STORMS) && (ShardOfAgony || ctx->GetTrickOption(RT_GROTTOS_WITHOUT_AGONY));
         HookshotOrBoomerang = CanUse(RG_HOOKSHOT) || CanUse(RG_BOOMERANG);
         CanGetNightTimeGS   = (CanUse(RG_SUNS_SONG) || !ctx->GetOption(RSK_SKULLS_SUNS_SONG));
-        CanBreakUpperBeehives = HookshotOrBoomerang || (ctx->GetTrickOption(RT_BOMBCHU_BEEHIVES) && HasBombchus);
+        CanBreakUpperBeehives = HookshotOrBoomerang || (ctx->GetTrickOption(RT_BOMBCHU_BEEHIVES) && CanUse(RG_BOMBCHU_5));
         CanBreakLowerBeehives = CanBreakUpperBeehives || Bombs;
         CanFish = ChildsWallet && (HasItem(RG_FISHING_POLE) || !ctx->GetOption(RSK_SHUFFLE_FISHING_POLE));
         CanGetChildFish = CanFish && (IsChild || (IsAdult && !ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT)));
@@ -770,10 +785,6 @@ namespace Rando {
         ZeldasLetter  = false;
         WeirdEgg      = false;
         HasBottle     = false;
-        Bombchus      = false;
-        Bombchus5     = false;
-        Bombchus10    = false;
-        Bombchus20    = false;
         MagicBean     = false;
         RutosLetter   = false;
         Boomerang     = false;
@@ -927,36 +938,34 @@ namespace Rando {
         CanSummonGanon        = false;
 
         //Drops and Bottle Contents Access
-        DekuNutDrop      = false;
         NutPot           = false;
         NutCrate         = false;
         DekuBabaNuts     = false;
-        DekuStickDrop    = false;
         StickPot         = false;
         DekuBabaSticks   = false;
-        BugsAccess       = false;
         BugShrub         = false;
         WanderingBugs    = false;
         BugRock          = false;
         BlueFireAccess   = false;
-        FishAccess       = false;
         FishGroup        = false;
         LoneFish         = false;
-        FairyAccess      = false;
         GossipStoneFairy = false;
         BeanPlantFairy   = false;
         ButterflyFairy   = false;
         FairyPot         = false;
         FreeFairies      = false;
         FairyPond        = false;
-        BombchuDrop      = false;
-
+        BombchuRefill    = false;
+        BombchusEnabled  = false;
         BuyBombchus      = false;
+
         BuySeed          = false;
         BuyArrow         = false;
         BuyBomb          = false;
-        BuyMagicPotion        = false;
-        MagicRefill      = false;
+        BuyMagicPotion   = false;
+        BuyFish          = false;
+        BuyBugs          = false;
+        BuyFairy         = false;
 
         PieceOfHeart     = 0;
         HeartContainer   = 0;
@@ -966,6 +975,7 @@ namespace Rando {
         /* These are used to simplify reading the logic, but need to be updated
         /  every time a base value is updated.                       */
 
+        BulletBag        = false;
         Slingshot        = false;
         Ocarina          = false;
         OcarinaOfTime    = false;
@@ -973,6 +983,7 @@ namespace Rando {
         MagicMeter       = false;
         Hookshot         = false;
         Longshot         = false;
+        Quiver           = false;
         Bow              = false;
         GoronBracelet    = false;
         SilverGauntlets  = false;
@@ -992,17 +1003,10 @@ namespace Rando {
         Bombs            = false;
         DekuShield       = false;
         HylianShield     = false;
-        Nuts             = false;
-        Sticks           = false;
-        Bugs             = false;
         BlueFire         = false;
-        Fish             = false;
-        Fairy            = false;
         BottleWithBigPoe = false;
 
-        FoundBombchus    = false;
-        CanPlayBowling   = false;
-        HasBombchus      = false;
+        CouldPlayBowling   = false;
         HasExplosives    = false;
         HasBoots         = false;
         IsChild          = false;
diff --git a/soh/soh/Enhancements/randomizer/logic.h b/soh/soh/Enhancements/randomizer/logic.h
index 4c23dc321..6a669d7eb 100644
--- a/soh/soh/Enhancements/randomizer/logic.h
+++ b/soh/soh/Enhancements/randomizer/logic.h
@@ -32,13 +32,10 @@ class Logic {
 
     // Child item logic
     bool KokiriSword = false;
+    bool BulletBag = false;
     bool ZeldasLetter = false;
     bool WeirdEgg = false;
     bool HasBottle = false;
-    bool Bombchus = false;
-    bool Bombchus5 = false;
-    bool Bombchus10 = false;
-    bool Bombchus20 = false;
     bool MagicBean = false;
     bool RutosLetter = false;
     bool Boomerang = false;
@@ -171,37 +168,35 @@ class Logic {
     bool NoBottles = false;
 
     // Drops and Bottle Contents Access
-    bool DekuNutDrop = false;
     bool NutPot = false;
     bool NutCrate = false;
     bool DekuBabaNuts = false;
-    bool DekuStickDrop = false;
     bool StickPot = false;
     bool DekuBabaSticks = false;
-    bool BugsAccess = false;
     bool BugShrub = false;
     bool WanderingBugs = false;
     bool BugRock = false;
     bool BlueFireAccess = false;
-    bool FishAccess = false;
     bool FishGroup = false;
     bool LoneFish = false;
-    bool FairyAccess = false;
     bool GossipStoneFairy = false;
     bool BeanPlantFairy = false;
     bool ButterflyFairy = false;
     bool FairyPot = false;
     bool FreeFairies = false;
     bool FairyPond = false;
-    bool BombchuDrop = false;
     bool AmmoCanDrop = false;
-
+    bool BombchuRefill = false;
+    bool BombchusEnabled  = false;
     bool BuyBombchus = false;
+
     bool BuySeed = false;
     bool BuyArrow = false;
     bool BuyBomb = false;
     bool BuyMagicPotion = false;
-    bool MagicRefill = false;
+    bool BuyFish = false;
+    bool BuyBugs = false;
+    bool BuyFairy = false;
 
     uint8_t PieceOfHeart = 0;
     uint8_t HeartContainer = 0;
@@ -211,14 +206,13 @@ class Logic {
     /* These are used to simplify reading the logic, but need to be updated
     /  every time a base value is updated.                       */
 
-    bool Slingshot = false;
     bool Ocarina = false;
     bool OcarinaOfTime = false;
     bool BombBag = false;
     bool MagicMeter = false;
     bool Hookshot = false;
     bool Longshot = false;
-    bool Bow = false;
+    bool Quiver = false;
     bool GoronBracelet = false;
     bool SilverGauntlets = false;
     bool GoldenGauntlets = false;
@@ -234,15 +228,12 @@ class Logic {
     bool Scarecrow = false;
     bool DistantScarecrow = false;
 
+    bool Slingshot = false;
     bool Bombs = false;
+    bool Bow = false;
     bool DekuShield = false;
     bool HylianShield = false;
-    bool Nuts = false;
-    bool Sticks = false;
-    bool Bugs = false;
     bool BlueFire = false;
-    bool Fish = false;
-    bool Fairy = false;
     bool BottleWithBigPoe = false;
 
     bool OcarinaAButton      = false;
@@ -251,9 +242,8 @@ class Logic {
     bool OcarinaCUpButton    = false;
     bool OcarinaCDownButton  = false;
 
-    bool FoundBombchus = false;
-    bool CanPlayBowling = false;
-    bool HasBombchus = false;
+    bool CarpetMerchant = false;
+    bool CouldPlayBowling = false;
     bool HasExplosives = false;
     bool HasBoots = false;
     bool IsChild = false;
diff --git a/soh/soh/Enhancements/randomizer/option_descriptions.cpp b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
index 36c270642..597b46db6 100644
--- a/soh/soh/Enhancements/randomizer/option_descriptions.cpp
+++ b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
@@ -552,7 +552,8 @@ void Settings::CreateOptionDescriptions() {
     mOptionDescriptions[RSK_MASK_SHOP_HINT] = "Reading the mask shop sign will tell you rewards from showing masks at the Deku Theatre.";
     mOptionDescriptions[RSK_FULL_WALLETS] = "Start with a full wallet. All wallet upgrades come filled with rupees.";
     mOptionDescriptions[RSK_BOMBCHUS_IN_LOGIC] =
-        "Bombchus are properly considered in logic.\n"
+        "Bombchus are properly considered in logic. Without this setting, any Bombchu requirement"
+        " is filled by Bomb Bag + a renewable source of Bombchus\n"
         "\n"
         "The first Bombchu pack will always be 20, and subsequent packs will be "
         "5 or 10 based on how many you have.\n"
@@ -560,7 +561,10 @@ void Settings::CreateOptionDescriptions() {
         "\n"
         "Bombchu Bowling is opened by obtaining Bombchus.";
     mOptionDescriptions[RSK_ENABLE_BOMBCHU_DROPS] = "Once you obtain bombchus for the first time, refills can be found "
-                                                    "in bushes and other places where bomb drops can normally spawn.";
+                                                    "in bushes and other places where bomb drops can normally spawn."
+                                                    "\n"
+                                                    "If you have Bombchus in Logic disabled, you will also need a"
+                                                    "Bomb bag for bombchus to drop";
     mOptionDescriptions[RSK_BLUE_FIRE_ARROWS] =
         "Ice Arrows act like Blue Fire, making them able to melt red ice. "
         "Item placement logic will respect this option, so it might be required to use this to progress.";
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index c25aca93a..cf5d794fc 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -273,9 +273,9 @@ std::unordered_map<RandomizerGet, EnGirlAShopItem> randomizerGetToEnGirlShopItem
     { RG_BUY_DEKU_SHIELD,   SI_DEKU_SHIELD },
     { RG_BUY_GORON_TUNIC,   SI_GORON_TUNIC },
     { RG_BUY_ZORA_TUNIC,    SI_ZORA_TUNIC },
-    { RG_BUY_HEART,         SI_HEART },
-    { RG_BUY_BOMBCHU_10,    SI_BOMBCHU_10_1 },
-    { RG_BUY_BOMBCHU_20,    SI_BOMBCHU_20_1 },
+    { RG_BUY_HEART,         SI_RECOVERY_HEART },
+    { RG_BUY_BOMBCHUS_10,   SI_BOMBCHU_10_1 },
+    { RG_BUY_BOMBCHUS_20,   SI_BOMBCHU_20_1 },
     { RG_BUY_DEKU_SEEDS_30, SI_DEKU_SEEDS_30 },
     { RG_BUY_BLUE_FIRE,     SI_BLUE_FIRE },
     { RG_BUY_BOTTLE_BUG,    SI_BUGS },
@@ -461,19 +461,10 @@ ItemObtainability Randomizer::GetItemObtainabilityFromRandomizerGet(RandomizerGe
         case RG_BOMBCHU_5:
         case RG_BOMBCHU_10:
         case RG_BOMBCHU_20:
-        case RG_PROGRESSIVE_BOMBCHUS:
+        case RG_BUY_BOMBCHUS_10:
+        case RG_BUY_BOMBCHUS_20:
+        case RG_PROGRESSIVE_BOMBCHUS: //RANDOTODO Do we want bombchu refills to exist seperatly from bombchu bags? If so, this needs changing.
             return CAN_OBTAIN;
-        case RG_BUY_BOMBCHU_10:
-        case RG_BUY_BOMBCHU_20:
-        case RG_BOMBCHU_DROP:
-            // If Bombchus aren't in logic, you need a bomb bag to purchase them
-            // If they are in logic, you need to have already obtained them somewhere else
-            // Bombchu Drop is only used as a bowling reward, so it needs the same logic
-            if (GetRandoSettingValue(RSK_BOMBCHUS_IN_LOGIC)) {
-                return INV_CONTENT(ITEM_BOMBCHU) == ITEM_BOMBCHU ? CAN_OBTAIN : CANT_OBTAIN_NEED_UPGRADE;
-            } else {
-                return CUR_UPG_VALUE(UPG_BOMB_BAG) ? CAN_OBTAIN : CANT_OBTAIN_NEED_UPGRADE;
-            }
         case RG_PROGRESSIVE_HOOKSHOT:
             switch (INV_CONTENT(ITEM_HOOKSHOT)) {
                 case ITEM_NONE:
@@ -869,13 +860,11 @@ GetItemID Randomizer::GetItemIdFromRandomizerGet(RandomizerGet randoGet, GetItem
                     return GI_OCARINA_OOT;
             }
         case RG_BOMBCHU_5:
-        case RG_BOMBCHU_DROP:
-            return GI_BOMBCHUS_5;
         case RG_BOMBCHU_10:
-        case RG_BUY_BOMBCHU_10:
+        case RG_BUY_BOMBCHUS_10:
             return GI_BOMBCHUS_10;
         case RG_BOMBCHU_20:
-        case RG_BUY_BOMBCHU_20:
+        case RG_BUY_BOMBCHUS_20:
             return GI_BOMBCHUS_20;
         case RG_PROGRESSIVE_BOMBCHUS:
             if (INV_CONTENT(ITEM_BOMBCHU) == ITEM_NONE) {
@@ -1176,7 +1165,6 @@ bool Randomizer::IsItemVanilla(RandomizerGet randoGet) {
         case RG_BOMBCHU_5:
         case RG_BOMBCHU_10:
         case RG_BOMBCHU_20:
-        case RG_BOMBCHU_DROP:
             return true;
         case RG_PROGRESSIVE_BOMBCHUS:
             return INV_CONTENT(ITEM_BOMBCHU) != ITEM_NONE && !GetRandoSettingValue(RSK_INFINITE_UPGRADES);
@@ -1208,8 +1196,8 @@ bool Randomizer::IsItemVanilla(RandomizerGet randoGet) {
         case RG_BUY_GORON_TUNIC:
         case RG_BUY_ZORA_TUNIC:
         case RG_BUY_HEART:
-        case RG_BUY_BOMBCHU_10:
-        case RG_BUY_BOMBCHU_20:
+        case RG_BUY_BOMBCHUS_10:
+        case RG_BUY_BOMBCHUS_20:
         case RG_BUY_DEKU_SEEDS_30:
         case RG_SOLD_OUT:
         case RG_BUY_BLUE_FIRE:
diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h
index 6162b3341..507ae5fec 100644
--- a/soh/soh/Enhancements/randomizer/randomizerTypes.h
+++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@@ -169,10 +169,6 @@ typedef enum {
     LOGIC_GREG,
     LOGIC_PIECE_OF_HEART,
     LOGIC_HEART_CONTAINER,
-    LOGIC_BOMBCHUS_5,
-    LOGIC_BOMBCHUS_10,
-    LOGIC_BOMBCHUS_20,
-    LOGIC_BOMBCHU_DROP,
     LOGIC_NUTS,
     LOGIC_BUY_ARROW,
     LOGIC_BUY_BOMB,
@@ -888,7 +884,6 @@ typedef enum {
     RC_MARKET_SHOOTING_GALLERY_REWARD,
     RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,
     RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE,
-    RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS,
     RC_MARKET_LOST_DOG,
     RC_MARKET_TREASURE_CHEST_GAME_REWARD,
     RC_MARKET_10_BIG_POES,
@@ -2071,7 +2066,6 @@ typedef enum {
     RG_BOMBCHU_5,
     RG_BOMBCHU_10,
     RG_BOMBCHU_20,
-    RG_BOMBCHU_DROP,
     RG_ARROWS_5,
     RG_ARROWS_10,
     RG_ARROWS_30,
@@ -2100,8 +2094,8 @@ typedef enum {
     RG_BUY_GORON_TUNIC,
     RG_BUY_ZORA_TUNIC,
     RG_BUY_HEART,
-    RG_BUY_BOMBCHU_10,
-    RG_BUY_BOMBCHU_20,
+    RG_BUY_BOMBCHUS_10,
+    RG_BUY_BOMBCHUS_20,
     RG_BUY_DEKU_SEEDS_30,
     RG_SOLD_OUT,
     RG_BUY_BLUE_FIRE,
@@ -3315,10 +3309,9 @@ typedef enum {
     RHT_BOMBS_5,
     RHT_BOMBS_10,
     RHT_BOMBS_20,
-    RHT_BOMBCHU_5,
-    RHT_BOMBCHU_10,
-    RHT_BOMBCHU_20,
-    RHT_BOMBCHU_DROP,
+    RHT_BOMBCHUS_5,
+    RHT_BOMBCHUS_10,
+    RHT_BOMBCHUS_20,
     RHT_ARROWS_5,
     RHT_ARROWS_10,
     RHT_ARROWS_30,
@@ -3347,8 +3340,8 @@ typedef enum {
     RHT_BUY_GORON_TUNIC,
     RHT_BUY_ZORA_TUNIC,
     RHT_BUY_HEART,
-    RHT_BUY_BOMBCHU_10,
-    RHT_BUY_BOMBCHU_20,
+    RHT_BUY_BOMBCHUS_10,
+    RHT_BUY_BOMBCHUS_20,
     RHT_BUY_DEKU_SEEDS_30,
     RHT_SOLD_OUT,
     RHT_BUY_BLUE_FIRE,
diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
index f8838f827..29b99106b 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
@@ -1293,7 +1293,6 @@ bool IsCheckShuffled(RandomizerCheck rc) {
                 loc->GetQuest() == RCQUEST_VANILLA && OTRGlobals::Instance->gRandoContext->GetDungeons()->GetDungeonFromScene(loc->GetScene())->IsVanilla()
                 ) &&
             (loc->GetRCType() != RCTYPE_SHOP || (showShops && loc->GetActorParams() > 0x03)) &&
-            (loc->GetRandomizerCheck() != RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS) &&
             (rc != RC_TRIFORCE_COMPLETED || !hideTriforceCompleted) &&
             (rc != RC_GIFT_FROM_SAGES || !IS_RANDO) &&
             (loc->GetRCType() != RCTYPE_SCRUB ||
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
index bd61fd823..85b5e1ea2 100644
--- a/soh/soh/OTRGlobals.cpp
+++ b/soh/soh/OTRGlobals.cpp
@@ -2643,17 +2643,13 @@ extern "C" int CustomMessage_RetrieveIfExists(PlayState* play) {
         else if (textId == TEXT_MEDIGORON && Randomizer_GetSettingValue(RSK_SHUFFLE_MERCHANTS) != RO_SHUFFLE_MERCHANTS_OFF){
             messageEntry = messageEntry = ctx->GetHint(RH_MEDIGORON)->GetHintMessage(MF_AUTO_FORMAT);
         } 
-        else if (textId == TEXT_CARPET_SALESMAN_1 && Randomizer_GetSettingValue(RSK_SHUFFLE_MERCHANTS) != RO_SHUFFLE_MERCHANTS_OFF){
-            messageEntry = messageEntry = ctx->GetHint(RH_CARPET_SALESMAN)->GetHintMessage(MF_AUTO_FORMAT);
+        else if (textId == TEXT_CARPET_SALESMAN_1 && !Flags_GetRandomizerInf(RAND_INF_MERCHANTS_CARPET_SALESMAN) && Randomizer_GetSettingValue(RSK_SHUFFLE_MERCHANTS) != RO_SHUFFLE_MERCHANTS_OFF){
+            messageEntry = ctx->GetHint(RH_CARPET_SALESMAN)->GetHintMessage(MF_AUTO_FORMAT);
         } 
-        else if (textId == TEXT_CARPET_SALESMAN_2 && Randomizer_GetSettingValue(RSK_SHUFFLE_MERCHANTS) != RO_SHUFFLE_MERCHANTS_OFF){
+        else if (textId == TEXT_CARPET_SALESMAN_2 && !Flags_GetRandomizerInf(RAND_INF_MERCHANTS_CARPET_SALESMAN) && Randomizer_GetSettingValue(RSK_SHUFFLE_MERCHANTS) != RO_SHUFFLE_MERCHANTS_OFF){
             messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::merchantMessageTableID, textId);
-        } 
-        else if ((textId == TEXT_BUY_BOMBCHU_10_DESC || textId == TEXT_BUY_BOMBCHU_10_PROMPT) 
-                    && ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC)) {
-            messageEntry = CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, textId);
-        } 
-        else if (textId == TEXT_SKULLTULA_PEOPLE_IM_CURSED) {
+            Flags_SetRandomizerInf(RAND_INF_MERCHANTS_CARPET_SALESMAN);//set here so we can actually check if the text is run, not a good solution
+        } else if (textId == TEXT_SKULLTULA_PEOPLE_IM_CURSED) {
             actorParams = GET_PLAYER(play)->targetActor->params;
             if (actorParams == 1 && ctx->GetOption(RSK_KAK_10_SKULLS_HINT)){
                 messageEntry = ctx->GetHint(RH_KAK_10_SKULLS_HINT)->GetHintMessage(MF_AUTO_FORMAT);
@@ -2768,6 +2764,9 @@ extern "C" int CustomMessage_RetrieveIfExists(PlayState* play) {
         }
         else if (textId == TEXT_HBA_ALREADY_HAVE_1000 && ctx->GetOption(RSK_HBA_HINT)) {
             messageEntry = ctx->GetHint(RH_HBA_HINT)->GetHintMessage(MF_AUTO_FORMAT, 3);
+        } 
+        else if (textId == TEXT_CARPET_SALESMAN_CUSTOM_FAIL_TO_BUY){
+            messageEntry = CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, textId);
         }
         else if (textId == TEXT_MASK_SHOP_SIGN && ctx->GetOption(RSK_MASK_SHOP_HINT)) {
             messageEntry = ctx->GetHint(RH_MASK_SHOP_HINT)->GetHintMessage(MF_AUTO_FORMAT);
@@ -2793,17 +2792,17 @@ extern "C" int CustomMessage_RetrieveIfExists(PlayState* play) {
             s16 gsCount = gSaveContext.inventory.gsTokens + (IS_RANDO ? 1 : 0);
             messageEntry = CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, textId);
             messageEntry.Replace("[[gsCount]]", std::to_string(gsCount));
-        }
-    }
-    if (textId == TEXT_HEART_CONTAINER && CVarGetInteger(CVAR_ENHANCEMENT("InjectItemCounts"), 0)) {
+        } 
+    } else if ((IS_RANDO || CVarGetInteger(CVAR_ENHANCEMENT("BetterBombchuShopping"), 0)) &&
+                (textId == TEXT_BUY_BOMBCHUS_10_DESC || textId == TEXT_BUY_BOMBCHUS_10_PROMPT)) {
+            messageEntry = CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, textId);
+    } else if (textId == TEXT_HEART_CONTAINER && CVarGetInteger(CVAR_ENHANCEMENT("InjectItemCounts"), 0)) {
         messageEntry = CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, TEXT_HEART_CONTAINER);
         messageEntry.Replace("[[heartContainerCount]]", std::to_string(gSaveContext.sohStats.heartContainers + 1));
-    }
-    if (textId == TEXT_HEART_PIECE && CVarGetInteger(CVAR_ENHANCEMENT("InjectItemCounts"), 0)) {
+    } else if (textId == TEXT_HEART_PIECE && CVarGetInteger(CVAR_ENHANCEMENT("InjectItemCounts"), 0)) {
         messageEntry = CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, TEXT_HEART_PIECE);
         messageEntry.Replace("[[heartPieceCount]]", std::to_string(gSaveContext.sohStats.heartPieces + 1));
-    }
-    if (textId == TEXT_MARKET_GUARD_NIGHT && CVarGetInteger(CVAR_ENHANCEMENT("MarketSneak"), 0) && play->sceneNum == SCENE_MARKET_ENTRANCE_NIGHT) {
+    } else if (textId == TEXT_MARKET_GUARD_NIGHT && CVarGetInteger(CVAR_ENHANCEMENT("MarketSneak"), 0) && play->sceneNum == SCENE_MARKET_ENTRANCE_NIGHT) {
         messageEntry = CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, TEXT_MARKET_GUARD_NIGHT);
     }
     if (textId == TEXT_FISHERMAN_LEAVE && CVarGetInteger(CVAR_ENHANCEMENT("QuitFishingAtDoor"), 0)) {
diff --git a/soh/soh/SohMenuBar.cpp b/soh/soh/SohMenuBar.cpp
index cda689fd6..5568841b6 100644
--- a/soh/soh/SohMenuBar.cpp
+++ b/soh/soh/SohMenuBar.cpp
@@ -794,6 +794,11 @@ void DrawEnhancementsMenu() {
                 UIWidgets::Tooltip("Explosions are now a static size, like in Majora's Mask and OoT3D. Makes bombchu hovering much easier.");
                 UIWidgets::PaddedEnhancementCheckbox("Prevent Bombchus Forcing First-Person", CVAR_ENHANCEMENT("DisableFirstPersonChus"), true, false);
                 UIWidgets::Tooltip("Prevent bombchus from forcing the camera into first-person mode when released.");
+                UIWidgets::PaddedEnhancementCheckbox("Better Bombchu Shopping", CVAR_ENHANCEMENT("BetterBombchuShopping"), true, false,
+                                                        IS_RANDO, "This setting is forcefully enabled when you are playing a randomizer.", UIWidgets::CheckboxGraphics::Checkmark);
+                UIWidgets::Tooltip("Bombchus do not sell out when bought, and a 10 pack of bombchus costs 99 rupees instead of 100."
+                "\n"
+                "Toggling while inside the shop will not change prices or restock any SOLD OUTs");
                 UIWidgets::PaddedEnhancementCheckbox("Aiming reticle for the bow/slingshot", CVAR_ENHANCEMENT("BowReticle"), true, false);
                 UIWidgets::Tooltip("Aiming with a bow or slingshot will display a reticle as with the hookshot when the projectile is ready to fire.");
                 if (UIWidgets::PaddedEnhancementCheckbox("Allow strength equipment to be toggled", CVAR_ENHANCEMENT("ToggleStrength"), true, false)) {
@@ -1072,7 +1077,7 @@ void DrawEnhancementsMenu() {
                     OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_ENABLE_BOMBCHU_DROPS) == 1;
                 static const char* forceEnableBombchuDropsText =
                     "This setting is forcefully enabled because a savefile\nwith \"Enable Bombchu Drops\" is loaded.";
-                UIWidgets::PaddedEnhancementCheckbox("Enable Bombchu Drops", CVAR_ENHANCEMENT("BombchuDrops"), true, false,
+                UIWidgets::PaddedEnhancementCheckbox("Enable Bombchu Drops", CVAR_ENHANCEMENT("EnableBombchuDrops"), true, false,
                                                         forceEnableBombchuDrops, forceEnableBombchuDropsText, UIWidgets::CheckboxGraphics::Checkmark);
                 UIWidgets::Tooltip("Bombchus will sometimes drop in place of bombs");
                 UIWidgets::PaddedEnhancementCheckbox("Trees Drop Sticks", CVAR_ENHANCEMENT("TreesDropSticks"), true, false);
diff --git a/soh/soh/z_message_OTR.cpp b/soh/soh/z_message_OTR.cpp
index addfc703a..b695de579 100644
--- a/soh/soh/z_message_OTR.cpp
+++ b/soh/soh/z_message_OTR.cpp
@@ -152,7 +152,7 @@ extern "C" void OTRMessage_Init()
             "Vous obtenez un %rSymbole de&Skulltula d'or%w! Vous avez&collecté %r[[gsCount]]%w symboles en tout!",
             TEXTBOX_TYPE_BLUE));
     CustomMessageManager::Instance->CreateMessage(
-        customMessageTableID, TEXT_BUY_BOMBCHU_10_DESC,
+        customMessageTableID, TEXT_BUY_BOMBCHUS_10_DESC,
         CustomMessage("\x08%rBombchu  10 pieces  99 Rupees&%wThis looks like a toy mouse, but&it's actually a "
                       "self-propelled time&bomb!\x09\x0A",
                       "\x08%rKrabbelmine  10 Stück  99 Rubine&%wDas ist eine praktische Zeitbombe,&die Du als "
@@ -160,7 +160,7 @@ extern "C" void OTRMessage_Init()
                       "\x08%rMissile  10 unités  99 Rubis&%wProfilée comme une souris&mécanique, cette arme est "
                       "&destructrice!!!\x09\x0A"));
     CustomMessageManager::Instance->CreateMessage(
-        customMessageTableID, TEXT_BUY_BOMBCHU_10_PROMPT,
+        customMessageTableID, TEXT_BUY_BOMBCHUS_10_PROMPT,
         CustomMessage("\x08"
                       "Bombchu  10 pieces   99 Rupees\x09&&\x1B%gBuy&Don't buy%w",
                       "\x08Krabbelmine  10 Stück  99 Rubine\x09&&\x1B%gKaufen!&Nicht kaufen!%w",
@@ -187,4 +187,10 @@ extern "C" void OTRMessage_Init()
         CustomMessage("Hey! Hey!&You can't take the rod out of here!&I'm serious!^Do you want to quit?&\x1B&%gYes&No%w",
                       "Hey! Hey!&Du kannst die Angel doch nicht&einfach mitnehmen!&Ganz im Ernst!^Möchtest Du aufhören?&\x1B&%gJa&Nein%w",
                       "Holà! Holà!&Les cannes ne sortent pas d'ici!&Je suis sérieux!^Voulez-vous arrêter?&\x1B&%gOui&Non%w")); //TODO Used AI translation as placeholder
+    CustomMessageManager::Instance->CreateMessage(
+        customMessageTableID, TEXT_CARPET_SALESMAN_CUSTOM_FAIL_TO_BUY,
+        CustomMessage("I'm sorry I can't sell you&these fine specimens,&they need an %rexperienced owner%w.^"
+                      "Come back when you have&had %gBombchus%w of your own.",
+                      "",
+                      ""));
 }
diff --git a/soh/src/code/z_en_item00.c b/soh/src/code/z_en_item00.c
index 8e30f462a..bca44cf26 100644
--- a/soh/src/code/z_en_item00.c
+++ b/soh/src/code/z_en_item00.c
@@ -1454,6 +1454,7 @@ void EnItem00_DrawHeartPiece(EnItem00* this, PlayState* play) {
     CLOSE_DISPS(play->state.gfxCtx);
 }
 
+// #region [Randomizer] [Enchancment]
 /**
  * Sometimes convert the given drop ID into a bombchu.
  * Returns the new drop type ID.
@@ -1483,6 +1484,7 @@ s16 EnItem00_ConvertBombDropToBombchu(s16 dropId) {
         }
     }
 }
+// #endregion
 
 /**
  * Converts a given drop type ID based on link's current age, health and owned items.
@@ -1501,11 +1503,14 @@ s16 func_8001F404(s16 dropId) {
         }
     }
 
-    if ((CVarGetInteger(CVAR_ENHANCEMENT("BombchuDrops"), 0) || 
+    // #region [Randomizer] [Enchancment]
+    if ((CVarGetInteger(CVAR_ENHANCEMENT("EnableBombchuDrops"), 0) || 
         (IS_RANDO && Randomizer_GetSettingValue(RSK_ENABLE_BOMBCHU_DROPS) == 1)) &&
-        (dropId == ITEM00_BOMBS_A || dropId == ITEM00_BOMBS_B || dropId == ITEM00_BOMBS_SPECIAL)) {
+        (dropId == ITEM00_BOMBS_A || dropId == ITEM00_BOMBS_B || dropId == ITEM00_BOMBS_SPECIAL) &&
+        (!IS_RANDO || Randomizer_GetSettingValue(RSK_BOMBCHUS_IN_LOGIC) || INV_CONTENT(ITEM_BOMB) != ITEM_NONE)) {
         dropId = EnItem00_ConvertBombDropToBombchu(dropId);
     }
+    // #endregion
 
     // This is convoluted but it seems like it must be a single condition to match
     // clang-format off
diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c
index 0cfde00b7..1ca58cf00 100644
--- a/soh/src/code/z_parameter.c
+++ b/soh/src/code/z_parameter.c
@@ -1870,7 +1870,7 @@ void Randomizer_GameplayStats_SetTimestamp(uint16_t item) {
         return;
     }
     // Count any bombchu pack as bombchus
-    if ((item >= RG_BOMBCHU_5 && item <= RG_BOMBCHU_DROP) || item == RG_PROGRESSIVE_BOMBCHUS) {
+    if ((item >= RG_BOMBCHU_5 && item <= RG_BOMBCHU_20) || item == RG_PROGRESSIVE_BOMBCHUS) {
         if (gSaveContext.sohStats.itemTimestamp[ITEM_BOMBCHU] = 0) {
             gSaveContext.sohStats.itemTimestamp[ITEM_BOMBCHU] = time;
         }
diff --git a/soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.c b/soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.c
index b005cbf3f..ca927a447 100644
--- a/soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.c
+++ b/soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.c
@@ -19,7 +19,7 @@ void EnGirlA_Update(Actor* thisx, PlayState* play);
 
 void EnGirlA_SetItemOutOfStock(PlayState* play, EnGirlA* this);
 void EnGirlA_UpdateStockedItem(PlayState* play, EnGirlA* this);
-void EnGirlA_InitializeItemAction(EnGirlA* this, PlayState* play);
+void EnGirlA_WaitForObject(EnGirlA* this, PlayState* play);
 void EnGirlA_Update2(EnGirlA* this, PlayState* play);
 void func_80A3C498(Actor* thisx, PlayState* play, s32 flags);
 void EnGirlA_Draw(Actor* thisx, PlayState* play);
@@ -213,7 +213,7 @@ static ShopItemEntry shopItemEntries[] = {
     /* SI_ZORA_TUNIC */
     { OBJECT_GI_CLOTHES, GID_TUNIC_ZORA, NULL, 300, 1, 0x00AB, 0x0094, GI_TUNIC_ZORA, EnGirlA_CanBuy_ZoraTunic,
       EnGirlA_ItemGive_ZoraTunic, EnGirlA_BuyEvent_ZoraTunic },
-    /* SI_HEART */
+    /* SI_RECOVERY_HEART */
     { OBJECT_GI_HEART, GID_HEART, NULL, 10, 16, 0x00AC, 0x0095, GI_HEART, EnGirlA_CanBuy_Health,
       EnGirlA_ItemGive_Health, EnGirlA_BuyEvent_ShieldDiscount },
     /* SI_MILK_BOTTLE */
@@ -327,78 +327,139 @@ void EnGirlA_SetupAction(EnGirlA* this, EnGirlAActionFunc func) {
     this->actionFunc = func;
 }
 
-s32 EnGirlA_TryChangeShopItem(EnGirlA* this, PlayState* play) {
+// #region SOH [Enhancement] [Randomizer]
+s32 EnGirlA_TryChangeShopItemShip(EnGirlA* this, PlayState* play) {
+    if (!(IS_RANDO || CVarGetInteger(CVAR_ENHANCEMENT("BetterBombchuShopping"), 0))){
+        switch (this->actor.params) {
+            case SI_BOMBCHU_10_2:
+                if (Flags_GetItemGetInf(ITEMGETINF_06)) {
+                    this->actor.params = SI_SOLD_OUT;
+                    return true;
+                }
+                break;
+            case SI_BOMBCHU_10_3:
+                if (Flags_GetItemGetInf(ITEMGETINF_07)) {
+                    this->actor.params = SI_SOLD_OUT;
+                    return true;
+                }
+                break;
+            case SI_BOMBCHU_20_3:
+                if (Flags_GetItemGetInf(ITEMGETINF_08)) {
+                    this->actor.params = SI_SOLD_OUT;
+                    return true;
+                }
+                break;
+            case SI_BOMBCHU_20_4:
+                if (Flags_GetItemGetInf(ITEMGETINF_09)) {
+                    this->actor.params = SI_SOLD_OUT;
+                    return true;
+                }
+                break;
+            case SI_BOMBCHU_10_4:
+                if (Flags_GetItemGetInf(ITEMGETINF_0A)) {
+                    this->actor.params = SI_SOLD_OUT;
+                    return true;
+                }
+                break;
+            case SI_BOMBCHU_10_1:
+                if (Flags_GetItemGetInf(ITEMGETINF_03)) {
+                    this->actor.params = SI_SOLD_OUT;
+                    return true;
+                }
+                break;
+            case SI_BOMBCHU_20_1:
+                if (Flags_GetItemGetInf(ITEMGETINF_04)) {
+                    this->actor.params = SI_SOLD_OUT;
+                    return true;
+                }
+                break;
+            case SI_BOMBCHU_20_2:
+                if (Flags_GetItemGetInf(ITEMGETINF_05)) {
+                    this->actor.params = SI_SOLD_OUT;
+                    return true;
+                }
+                break;
+        }
+    }
+    if (this->actor.params == SI_MILK_BOTTLE){
+        if (Flags_GetItemGetInf(ITEMGETINF_TALON_BOTTLE)) {
+            this->actor.params = SI_RECOVERY_HEART;
+            return true;
+        }
+    } else if (this->actor.params == SI_RANDOMIZED_ITEM) {
+        ShopItemIdentity shopItemIdentity = Randomizer_IdentifyShopItem(play->sceneNum, this->randoSlotIndex);
+        if (Flags_GetRandomizerInf(shopItemIdentity.randomizerInf)) {
+            this->actor.params = SI_SOLD_OUT;
+            GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheckWithoutObtainabilityCheck(shopItemIdentity.randomizerCheck, shopItemIdentity.ogItemId);
+
+            // Undo the rotation for spiritual stones
+            if (getItemEntry.getItemId >= RG_KOKIRI_EMERALD && getItemEntry.getItemId <= RG_ZORA_SAPPHIRE) {
+                this->actor.shape.rot.y = this->actor.shape.rot.y - 20000;
+            }
+            return true;
+        }
+    }
+    return false;
+}
+// #endregion
+
+s32 EnGirlA_TryChangeShopItem(EnGirlA* this) {
     switch (this->actor.params) {
         case SI_MILK_BOTTLE:
-            if (Flags_GetItemGetInf(ITEMGETINF_TALON_BOTTLE)) {
-                this->actor.params = SI_HEART;
+            if (GET_ITEMGETINF(ITEMGETINF_TALON_BOTTLE)) {
+                this->actor.params = SI_RECOVERY_HEART;
                 return true;
             }
             break;
         case SI_BOMBCHU_10_2:
-            if (Flags_GetItemGetInf(ITEMGETINF_06)) {
+            if (GET_ITEMGETINF(ITEMGETINF_06)) {
                 this->actor.params = SI_SOLD_OUT;
                 return true;
             }
             break;
         case SI_BOMBCHU_10_3:
-            if (Flags_GetItemGetInf(ITEMGETINF_07)) {
+            if (GET_ITEMGETINF(ITEMGETINF_07)) {
                 this->actor.params = SI_SOLD_OUT;
                 return true;
             }
             break;
         case SI_BOMBCHU_20_3:
-            if (Flags_GetItemGetInf(ITEMGETINF_08)) {
+            if (GET_ITEMGETINF(ITEMGETINF_08)) {
                 this->actor.params = SI_SOLD_OUT;
                 return true;
             }
             break;
         case SI_BOMBCHU_20_4:
-            if (Flags_GetItemGetInf(ITEMGETINF_09)) {
+            if (GET_ITEMGETINF(ITEMGETINF_09)) {
                 this->actor.params = SI_SOLD_OUT;
                 return true;
             }
             break;
         case SI_BOMBCHU_10_4:
-            if (Flags_GetItemGetInf(ITEMGETINF_0A)) {
+            if (GET_ITEMGETINF(ITEMGETINF_0A)) {
                 this->actor.params = SI_SOLD_OUT;
                 return true;
             }
             break;
         case SI_BOMBCHU_10_1:
-            if (Flags_GetItemGetInf(ITEMGETINF_03)) {
+            if (GET_ITEMGETINF(ITEMGETINF_03)) {
                 this->actor.params = SI_SOLD_OUT;
                 return true;
             }
             break;
         case SI_BOMBCHU_20_1:
-            if (Flags_GetItemGetInf(ITEMGETINF_04)) {
+            if (GET_ITEMGETINF(ITEMGETINF_04)) {
                 this->actor.params = SI_SOLD_OUT;
                 return true;
             }
             break;
         case SI_BOMBCHU_20_2:
-            if (Flags_GetItemGetInf(ITEMGETINF_05)) {
+            if (GET_ITEMGETINF(ITEMGETINF_05)) {
                 this->actor.params = SI_SOLD_OUT;
                 return true;
             }
             break;
-        case SI_RANDOMIZED_ITEM: {
-            ShopItemIdentity shopItemIdentity = Randomizer_IdentifyShopItem(play->sceneNum, this->randoSlotIndex);
-            if (Flags_GetRandomizerInf(shopItemIdentity.randomizerInf)) {
-                this->actor.params = SI_SOLD_OUT;
-                GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheckWithoutObtainabilityCheck(shopItemIdentity.randomizerCheck, shopItemIdentity.ogItemId);
-
-                // Undo the rotation for spiritual stones
-                if (getItemEntry.getItemId >= RG_KOKIRI_EMERALD && getItemEntry.getItemId <= RG_ZORA_SAPPHIRE) {
-                    this->actor.shape.rot.y = this->actor.shape.rot.y - 20000;
-                }
-                return true;
-            }
-            break;
-        }
     }
-
     return false;
 }
 
@@ -413,12 +474,12 @@ void EnGirlA_InitItem(EnGirlA* this, PlayState* play) {
         osSyncPrintf("引数がおかしいよ(arg_data=%d)！！\n", this->actor.params);
         osSyncPrintf(VT_RST);
         assert((params >= SI_MAX) && (params < 0));
+        //ASSERT(0, "0", "../z_en_girlA.c", 1421); zret assert, currently errors due to missing macro
         return;
     }
 
-    if (!IS_RANDO || Randomizer_GetSettingValue(RSK_SHOPSANITY) == RO_SHOPSANITY_OFF) {
-        this->objBankIndex = Object_GetIndex(&play->objectCtx, shopItemEntries[params].objID);
-    } else {
+    // #region [Randomizer]
+    if (IS_RANDO && !Randomizer_GetSettingValue(RSK_SHOPSANITY) == RO_SHOPSANITY_OFF) {
         s16 objectId = shopItemEntries[params].objID;
 
         if (params == SI_RANDOMIZED_ITEM) {
@@ -428,33 +489,48 @@ void EnGirlA_InitItem(EnGirlA* this, PlayState* play) {
             objectId = getItemEntry.objectId;
         }
 
-        this->objBankIndex = Object_GetIndex(&play->objectCtx, objectId);
+        this->requiredObjectSlot = Object_GetIndex(&play->objectCtx, objectId);
 
         // If the object isn't normally spawned by the shop scene, then spawn it now
-        if (this->objBankIndex < 0) {
-            this->objBankIndex = Object_Spawn(&play->objectCtx, objectId);
+        if (this->requiredObjectSlot < 0) {
+            this->requiredObjectSlot = Object_Spawn(&play->objectCtx, objectId);
         }
     }
+    // #endregion
+    else {
+        this->requiredObjectSlot = Object_GetIndex(&play->objectCtx, shopItemEntries[params].objID);
+    }
 
-    if (this->objBankIndex < 0) {
+    if (this->requiredObjectSlot < 0) {
         Actor_Kill(&this->actor);
         osSyncPrintf(VT_COL(RED, WHITE));
         osSyncPrintf("バンクが無いよ！！(%s)\n", sShopItemDescriptions[params]);
         osSyncPrintf(VT_RST);
-        assert(this->objBankIndex < 0);
+        //ASSERT(0, "0", "../z_en_girlA.c", 1434); zret assert, currently errors due to missing macro
         return;
     }
 
     this->actor.params = params;
-    this->actionFunc2 = EnGirlA_InitializeItemAction;
+    this->actionFunc2 = EnGirlA_WaitForObject;
 }
 
 void EnGirlA_Init(Actor* thisx, PlayState* play) {
-    EnGirlA* this = (EnGirlA*)thisx;
+    // #region [Randomizer] [Enhancment]
+    if (IS_RANDO || CVarGetInteger(CVAR_ENHANCEMENT("BetterBombchuShopping"), 0)){
+        EnGirlA* this = (EnGirlA*)thisx;
 
-    EnGirlA_TryChangeShopItem(this, play);
-    EnGirlA_InitItem(this, play);
-    osSyncPrintf("%s(%2d)初期設定\n", sShopItemDescriptions[this->actor.params], this->actor.params);
+        EnGirlA_TryChangeShopItemShip(this, play);
+        EnGirlA_InitItem(this, play);
+        osSyncPrintf("%s(%2d)初期設定\n", sShopItemDescriptions[this->actor.params], this->actor.params);
+    }
+    // #endregion
+    else {
+        EnGirlA* this = (EnGirlA*)thisx;
+
+        EnGirlA_TryChangeShopItem(this);
+        EnGirlA_InitItem(this, play);
+        osSyncPrintf("%s(%2d)初期設定\n", sShopItemDescriptions[this->actor.params], this->actor.params);
+    }
 }
 
 void EnGirlA_Destroy(Actor* thisx, PlayState* play) {
@@ -1035,10 +1111,12 @@ void EnGirlA_BuyEvent_ObtainBombchuPack(PlayState* play, EnGirlA* this) {
     Rupees_ChangeBy(-this->basePrice);
 
 	// Normally, buying a bombchu pack sets a flag indicating the pack is now sold out
-    // If we're in rando, skip setting that flag so they can be purchased repeatedly
-    if (IS_RANDO) {
+    // If they're in logic for rando, skip setting that flag so they can be purchased repeatedly
+    // #region [Enhancment]
+    if (IS_RANDO || CVarGetInteger(CVAR_ENHANCEMENT("BetterBombchuShopping"), 0)) {
         return;
     }
+    // #endregion
 
     switch (this->actor.params) {
         case SI_BOMBCHU_10_2:
@@ -1153,21 +1231,35 @@ void EnGirlA_SetItemOutOfStock(PlayState* play, EnGirlA* this) {
 }
 
 void EnGirlA_UpdateStockedItem(PlayState* play, EnGirlA* this) {
-    ShopItemEntry* itemEntry;
+    // #region [Randomizer] [Enhancment]
+    if (IS_RANDO || CVarGetInteger(CVAR_ENHANCEMENT("BetterBombchuShopping"), 0)){
+        ShopItemEntry* itemEntry;
+        if (EnGirlA_TryChangeShopItemShip(this, play)) {
+            EnGirlA_InitItem(this, play);
+            itemEntry = &shopItemEntries[this->actor.params];
 
-    if (EnGirlA_TryChangeShopItem(this, play)) {
-        EnGirlA_InitItem(this, play);
-        itemEntry = &shopItemEntries[this->actor.params];
-
-        if (this->actor.params == SI_RANDOMIZED_ITEM) {
-            ShopItemIdentity shopItemIdentity = Randomizer_IdentifyShopItem(play->sceneNum, this->randoSlotIndex);
-            this->actor.textId = 0x9100 + (shopItemIdentity.randomizerInf - RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_1);
+            if (this->actor.params == SI_RANDOMIZED_ITEM) {
+                ShopItemIdentity shopItemIdentity = Randomizer_IdentifyShopItem(play->sceneNum, this->randoSlotIndex);
+                this->actor.textId = 0x9100 + (shopItemIdentity.randomizerInf - RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_1);
+            } else {
+                this->actor.textId = itemEntry->itemDescTextId;
+            }
         } else {
-            this->actor.textId = itemEntry->itemDescTextId;
+            this->isInvisible = false;
+            this->actor.draw = EnGirlA_Draw;
+        }
+    }
+    // #endregion
+    else {
+        ShopItemEntry* itemEntry;
+        if (EnGirlA_TryChangeShopItem(this)) {
+            EnGirlA_InitItem(this, play);
+            itemEntry = &shopItemEntries[this->actor.params];
+            this->actor.textId = itemEntry->itemDescTextId;
+        } else {
+            this->isInvisible = false;
+            this->actor.draw = EnGirlA_Draw;
         }
-    } else {
-        this->isInvisible = false;
-        this->actor.draw = EnGirlA_Draw;
     }
 }
 
@@ -1186,13 +1278,13 @@ s32 EnGirlA_TrySetMaskItemDescription(EnGirlA* this, PlayState* play) {
     return false;
 }
 
-void EnGirlA_InitializeItemAction(EnGirlA* this, PlayState* play) {
+void EnGirlA_WaitForObject(EnGirlA* this, PlayState* play) {
     s16 params = this->actor.params;
     ShopItemEntry* itemEntry = &shopItemEntries[params];
 
-    if (Object_IsLoaded(&play->objectCtx, this->objBankIndex)) {
+    if (Object_IsLoaded(&play->objectCtx, this->requiredObjectSlot)) {
         this->actor.flags &= ~ACTOR_FLAG_UPDATE_WHILE_CULLED;
-        this->actor.objBankIndex = this->objBankIndex;
+        this->actor.objBankIndex = this->requiredObjectSlot;
         switch (this->actor.params) {
             case SI_KEATON_MASK:
                 if (Flags_GetItemGetInf(ITEMGETINF_38)) {
@@ -1255,49 +1347,78 @@ void EnGirlA_InitializeItemAction(EnGirlA* this, PlayState* play) {
         if (!EnGirlA_TrySetMaskItemDescription(this, play)) {
             EnGirlA_SetItemDescription(play, this);
         }
-
-        this->setOutOfStockFunc = EnGirlA_SetItemOutOfStock;
-        this->updateStockedItemFunc = EnGirlA_UpdateStockedItem;
-        this->getItemId = itemEntry->getItemId;
-        this->canBuyFunc = itemEntry->canBuyFunc;
-        this->itemGiveFunc = itemEntry->itemGiveFunc;
-        this->buyEventFunc = itemEntry->buyEventFunc;
-        // If chus are in logic, make the 10 pack affordable without a wallet upgrade
-        if (IS_RANDO && this->getItemId == GI_BOMBCHUS_10) {
-            this->basePrice = 99;
-        } else {
-            this->basePrice = itemEntry->price;
-        }
-        this->itemCount = itemEntry->count;
-        this->hiliteFunc = itemEntry->hiliteFunc;
-        this->giDrawId = itemEntry->giDrawId;
-        osSyncPrintf("%s(%2d)\n", sShopItemDescriptions[params], params);
-        this->actor.flags &= ~ACTOR_FLAG_TARGETABLE;
-        Actor_SetScale(&this->actor, 0.25f);
-        this->actor.shape.yOffset = 24.0f;
-        this->actor.shape.shadowScale = 4.0f;
-        this->actor.floorHeight = this->actor.home.pos.y;
-        this->actor.gravity = 0.0f;
-        EnGirlA_SetupAction(this, EnGirlA_Noop);
-        this->isInitialized = true;
-        this->actionFunc2 = EnGirlA_Update2;
-        this->isSelected = false;
-        this->yRotation = 0;
-        this->yRotationInit = this->actor.shape.rot.y;
-
-        if (params == SI_RANDOMIZED_ITEM) {
-            ShopItemIdentity shopItemIdentity = Randomizer_IdentifyShopItem(play->sceneNum, this->randoSlotIndex);
-            GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheckWithoutObtainabilityCheck(shopItemIdentity.randomizerCheck, shopItemIdentity.ogItemId);
-            this->actor.textId = 0x9100 + (shopItemIdentity.randomizerInf - RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_1);
-            this->itemBuyPromptTextId = 0x9100 + ((shopItemIdentity.randomizerInf - RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_1) + NUM_SHOP_ITEMS);
-            this->getItemId = getItemEntry.getItemId;
-            this->basePrice = shopItemIdentity.itemPrice;
-            this->giDrawId = getItemEntry.gid;
-
-            // Correct the rotation for spiritual stones, but only if mysterious shuffle isn't on, else it's obvious what's there in shops
-            if (!CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0) && (getItemEntry.getItemId >= RG_KOKIRI_EMERALD && getItemEntry.getItemId <= RG_ZORA_SAPPHIRE)) {
-                this->actor.shape.rot.y = this->actor.shape.rot.y + 20000;
+        // #region [Enhancment] [Randomizer]
+        if (IS_RANDO || CVarGetInteger(CVAR_ENHANCEMENT("BetterBombchuShopping"), 0)) { 
+            this->setOutOfStockFunc = EnGirlA_SetItemOutOfStock;
+            this->updateStockedItemFunc = EnGirlA_UpdateStockedItem;
+            this->getItemId = itemEntry->getItemId;
+            this->canBuyFunc = itemEntry->canBuyFunc;
+            this->itemGiveFunc = itemEntry->itemGiveFunc;
+            this->buyEventFunc = itemEntry->buyEventFunc;
+            // If Better Bombchu Shopping is on, make the 10 pack affordable without a wallet upgrade
+            if (this->getItemId == GI_BOMBCHUS_10) {
+                this->basePrice = 99;
+            } 
+            else {
+                this->basePrice = itemEntry->price;
             }
+            this->itemCount = itemEntry->count;
+            this->hiliteFunc = itemEntry->hiliteFunc;
+            this->giDrawId = itemEntry->giDrawId;
+            osSyncPrintf("%s(%2d)\n", sShopItemDescriptions[params], params);
+            this->actor.flags &= ~ACTOR_FLAG_TARGETABLE;
+            Actor_SetScale(&this->actor, 0.25f);
+            this->actor.shape.yOffset = 24.0f;
+            this->actor.shape.shadowScale = 4.0f;
+            this->actor.floorHeight = this->actor.home.pos.y;
+            this->actor.gravity = 0.0f;
+            EnGirlA_SetupAction(this, EnGirlA_Noop);
+            this->isInitialized = true;
+            this->actionFunc2 = EnGirlA_Update2;
+            this->isSelected = false;
+            this->yRotation = 0;
+            this->yRotationInit = this->actor.shape.rot.y;
+
+            if (params == SI_RANDOMIZED_ITEM) {
+                ShopItemIdentity shopItemIdentity = Randomizer_IdentifyShopItem(play->sceneNum, this->randoSlotIndex);
+                GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheckWithoutObtainabilityCheck(shopItemIdentity.randomizerCheck, shopItemIdentity.ogItemId);
+                this->actor.textId = 0x9100 + (shopItemIdentity.randomizerInf - RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_1);
+                this->itemBuyPromptTextId = 0x9100 + ((shopItemIdentity.randomizerInf - RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_1) + NUM_SHOP_ITEMS);
+                this->getItemId = getItemEntry.getItemId;
+                this->basePrice = shopItemIdentity.itemPrice;
+                this->giDrawId = getItemEntry.gid;
+
+                // Correct the rotation for spiritual stones, but only if mysterious shuffle isn't on, else it's obvious what's there in shops
+                if (!CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0) && (getItemEntry.getItemId >= RG_KOKIRI_EMERALD && getItemEntry.getItemId <= RG_ZORA_SAPPHIRE)) {
+                    this->actor.shape.rot.y = this->actor.shape.rot.y + 20000;
+                }
+            }
+        }
+        // #endregion
+        else {
+            this->setOutOfStockFunc = EnGirlA_SetItemOutOfStock;
+            this->updateStockedItemFunc = EnGirlA_UpdateStockedItem;
+            this->getItemId = itemEntry->getItemId;
+            this->canBuyFunc = itemEntry->canBuyFunc;
+            this->itemGiveFunc = itemEntry->itemGiveFunc;
+            this->buyEventFunc = itemEntry->buyEventFunc;
+            this->basePrice = itemEntry->price;
+            this->itemCount = itemEntry->count;
+            this->hiliteFunc = itemEntry->hiliteFunc;
+            this->giDrawId = itemEntry->giDrawId;
+            osSyncPrintf("%s(%2d)\n", sShopItemDescriptions[params], params);
+            this->actor.flags &= ~ACTOR_FLAG_TARGETABLE;
+            Actor_SetScale(&this->actor, 0.25f);
+            this->actor.shape.yOffset = 24.0f;
+            this->actor.shape.shadowScale = 4.0f;
+            this->actor.floorHeight = this->actor.home.pos.y;
+            this->actor.gravity = 0.0f;
+            EnGirlA_SetupAction(this, EnGirlA_Noop);
+            this->isInitialized = true;
+            this->actionFunc2 = EnGirlA_Update2;
+            this->isSelected = false;
+            this->yRotation = 0;
+            this->yRotationInit = this->actor.shape.rot.y;
         }
     }
 }
diff --git a/soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.h b/soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.h
index 11b90a0d5..c5121e221 100644
--- a/soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.h
+++ b/soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.h
@@ -15,7 +15,7 @@ typedef struct EnGirlA {
     /* 0x0000 */ Actor actor;
     /* 0x014C */ SkelAnime skelAnime;
     /* 0x0190 */ EnGirlAActionFunc actionFunc;
-    /* 0x0194 */ s8 objBankIndex;
+    /* 0x0194 */ s8 requiredObjectSlot;
     /* 0x0198 */ EnGirlAActionFunc actionFunc2;
     /* 0x019C */ s32 isInitialized;
     /* 0x01A0 */ s16 itemBuyPromptTextId;
@@ -53,7 +53,7 @@ typedef enum {
     /* 0x0D */ SI_DEKU_SHIELD,
     /* 0x0E */ SI_GORON_TUNIC,
     /* 0x0F */ SI_ZORA_TUNIC,
-    /* 0x10 */ SI_HEART,
+    /* 0x10 */ SI_RECOVERY_HEART,
     /* 0x11 */ SI_MILK_BOTTLE,
     /* 0x12 */ SI_WEIRD_EGG,
     /* 0x13 */ SI_19,
diff --git a/soh/src/overlays/actors/ovl_En_Js/z_en_js.c b/soh/src/overlays/actors/ovl_En_Js/z_en_js.c
index f9e18f315..a12dfec5e 100644
--- a/soh/src/overlays/actors/ovl_En_Js/z_en_js.c
+++ b/soh/src/overlays/actors/ovl_En_Js/z_en_js.c
@@ -131,7 +131,8 @@ void func_80A89160(EnJs* this, PlayState* play) {
     if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_FROM_CARPET_SALESMAN, true, this)) {
         this->actor.parent = NULL;
         En_Js_SetupAction(this, func_80A8910C);
-        Flags_SetRandomizerInf(RAND_INF_MERCHANTS_CARPET_SALESMAN);
+        // Moved into the text handling to patch a text bug, not a great solution though
+        // Flags_SetRandomizerInf(RAND_INF_MERCHANTS_CARPET_SALESMAN);
     } else {
         GetItemEntry itemEntry = ItemTable_Retrieve(GI_BOMBCHUS_10);
         gSaveContext.pendingSale = itemEntry.itemId;
@@ -148,8 +149,14 @@ void func_80A891C4(EnJs* this, PlayState* play) {
                     Message_ContinueTextbox(play, 0x6075);
                     func_80A89008(this);
                 } else {
-                    Rupees_ChangeBy(-200);
-                    En_Js_SetupAction(this, func_80A89160);
+                    if (GameInteractor_Should(VB_GIVE_BOMBCHUS_FROM_CARPET_SALESMAN, true, this) || 
+                       (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_FROM_CARPET_SALESMAN, true, this))){
+                        Rupees_ChangeBy(-200);
+                        En_Js_SetupAction(this, func_80A89160);
+                    } else{
+                        Message_ContinueTextbox(play, 0x6073);
+                        func_80A89008(this);
+                    }
                 }
                 break;
             case 1: // no
diff --git a/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
index eeea17e47..0e09af177 100644
--- a/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
+++ b/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
@@ -206,7 +206,7 @@ ShopItem sShopkeeperStores[][8] = {
       { SI_DEKU_SEEDS_30, -50, 52, -20 },
       { SI_ARROWS_10, -50, 76, -20 },
       { SI_ARROWS_30, -80, 52, -3 },
-      { SI_HEART, -80, 76, -3 } },
+      { SI_RECOVERY_HEART, -80, 76, -3 } },
 
     { { SI_GREEN_POTION, 50, 52, -20 },
       { SI_BLUE_FIRE, 50, 76, -20 },
@@ -238,7 +238,7 @@ ShopItem sShopkeeperStores[][8] = {
     { { SI_HYLIAN_SHIELD, 50, 52, -20 },
       { SI_BOMBS_5_R35, 50, 76, -20 },
       { SI_DEKU_NUTS_5, 80, 52, -3 },
-      { SI_HEART, 80, 76, -3 },
+      { SI_RECOVERY_HEART, 80, 76, -3 },
       { SI_ARROWS_10, -50, 52, -20 },
       { SI_ARROWS_50, -50, 76, -20 },
       { SI_DEKU_STICK, -80, 52, -3 },
@@ -247,7 +247,7 @@ ShopItem sShopkeeperStores[][8] = {
     { { SI_HYLIAN_SHIELD, 50, 52, -20 },
       { SI_BOMBS_5_R25, 50, 76, -20 },
       { SI_DEKU_NUTS_5, 80, 52, -3 },
-      { SI_HEART, 80, 76, -3 },
+      { SI_RECOVERY_HEART, 80, 76, -3 },
       { SI_ARROWS_10, -50, 52, -20 },
       { SI_ARROWS_50, -50, 76, -20 },
       { SI_DEKU_STICK, -80, 52, -3 },
@@ -256,15 +256,15 @@ ShopItem sShopkeeperStores[][8] = {
     { { SI_MILK_BOTTLE, 50, 52, -20 },
       { SI_DEKU_NUTS_5, 50, 76, -20 },
       { SI_DEKU_NUTS_10, 80, 52, -3 },
-      { SI_HEART, 80, 76, -3 },
+      { SI_RECOVERY_HEART, 80, 76, -3 },
       { SI_WEIRD_EGG, -50, 52, -20 },
       { SI_DEKU_STICK, -50, 76, -20 },
-      { SI_HEART, -80, 52, -3 },
-      { SI_HEART, -80, 76, -3 } },
+      { SI_RECOVERY_HEART, -80, 52, -3 },
+      { SI_RECOVERY_HEART, -80, 76, -3 } },
 
     { { SI_ZORA_TUNIC, 50, 52, -20 },
       { SI_ARROWS_10, 50, 76, -20 },
-      { SI_HEART, 80, 52, -3 },
+      { SI_RECOVERY_HEART, 80, 52, -3 },
       { SI_ARROWS_30, 80, 76, -3 },
       { SI_DEKU_NUTS_5, -50, 52, -20 },
       { SI_ARROWS_50, -50, 76, -20 },
@@ -276,9 +276,9 @@ ShopItem sShopkeeperStores[][8] = {
       { SI_BOMBS_20, 80, 52, -3 },
       { SI_BOMBS_30, 80, 76, -3 },
       { SI_GORON_TUNIC, -50, 52, -20 },
-      { SI_HEART, -50, 76, -20 },
+      { SI_RECOVERY_HEART, -50, 76, -20 },
       { SI_RED_POTION_R40, -80, 52, -3 },
-      { SI_HEART, -80, 76, -3 } },
+      { SI_RECOVERY_HEART, -80, 76, -3 } },
 
     { { SI_19, 50, 52, -20 },
       { SI_19, 50, 76, -20 },

From 9d7d4bffa2f8b742d3a040592f4c5176fef6987f Mon Sep 17 00:00:00 2001
From: Extloga <141232749+Extloga@users.noreply.github.com>
Date: Sun, 18 Aug 2024 05:25:38 +0200
Subject: [PATCH 184/230] Additions for the German currencies in randomizer.cpp
 (#4289)

* Additions for the German currencies in randomizer.cpp

* Additions for the German translation in hint_list_exclude_dungeon.cpp

* Fixes for the German translation in z_select.c

* Fixes for the German translation in z_select.c

* Additions for the German translation in hint_list_exclude_overworld.cpp
---
 soh/soh/Enhancements/randomizer/randomizer.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index cf5d794fc..066faca7e 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -108,13 +108,15 @@ static const char* englishRupeeNames[171] = {
     "Zorkmids"
 };
 
-static const char* germanRupeeNames[41] = {
+static const char* germanRupeeNames[56] = {
     "Rubine",     "Mäuse",       "Kröten",        "Münzen",     "Euro",       "Mark",     "Bananen",
     "Gummibären", "Bonbons",     "Diamanten",     "Bratwürste", "Bitcoin",    "Dogecoin", "Monde",
     "Sterne",     "Brause UFOs", "Taler",         "Sternis",    "Schilling",  "Freunde",  "Seelen",
     "Gil",        "Zenny",       "Pfandflaschen", "Knochen",    "Pilze",      "Smaragde", "Kronkorken",
     "Pokédollar", "Brötchen",    "EXP",           "Wagenchips", "Moos",       "Knete",    "Kohle",
-    "Kies",       "Radieschen",  "Diridari",      "Steine",     "Kartoffeln", "Penunze"
+    "Kies",       "Radieschen",  "Diridari",      "Steine",     "Kartoffeln", "Penunze",  "ECU",
+    "Franken",    "Cent",        "Pfennig",       "Groschen",   "Rappen",     "Gulden",   "Kreuzer",
+    "Kronen",     "Forint",      "Heller",        "Pfund",      "Karolin",    "Pesa",     "Tael"
 };
 
 static const char* frenchRupeeNames[36] = {

From 07babaa17b8298b2ba7e058036b488d8a5296bab Mon Sep 17 00:00:00 2001
From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Date: Sun, 18 Aug 2024 04:44:50 +0100
Subject: [PATCH 185/230] fix link name enhancment (#4295)

---
 soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
index dcf3209cb..55a4b9f7c 100644
--- a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
+++ b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
@@ -1350,11 +1350,11 @@ void FileChoose_GenerateRandoSeed(GameState* thisx) {
         this->kbdY = 0;
         this->charIndex = 0;
         this->charBgAlpha = 0;
-        this->newFileNameCharCount = CVarGetInteger(CVAR_GENERAL("LinkDefaultName"), 0) ? 4 : 0;
+        this->newFileNameCharCount = CVarGetInteger(CVAR_ENHANCEMENT("LinkDefaultName"), 0) ? 4 : 0;
         this->nameEntryBoxPosX = 120;
         this->nameEntryBoxAlpha = 0;
         memcpy(Save_GetSaveMetaInfo(this->buttonIndex)->playerName,
-               CVarGetInteger(CVAR_GENERAL("LinkDefaultName"), 0) ? &linkName : &emptyName, 8);
+               CVarGetInteger(CVAR_ENHANCEMENT("LinkDefaultName"), 0) ? &linkName : &emptyName, 8);
         return;
     }
     if (!generating) {

From b6554a84093e716de8490ec35dccee0a35aa4121 Mon Sep 17 00:00:00 2001
From: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>
Date: Sun, 18 Aug 2024 05:45:10 +0200
Subject: [PATCH 186/230] Fix skeleton key (#4296)

---
 soh/soh/Enhancements/mods.cpp                    | 10 ++++++++--
 soh/soh/Enhancements/randomizer/draw.cpp         | 16 ++++++++--------
 .../overlays/actors/ovl_En_Daiku/z_en_daiku.c    |  2 +-
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/soh/soh/Enhancements/mods.cpp b/soh/soh/Enhancements/mods.cpp
index f84f99b52..8b3adca0f 100644
--- a/soh/soh/Enhancements/mods.cpp
+++ b/soh/soh/Enhancements/mods.cpp
@@ -32,6 +32,7 @@
 #include "src/overlays/actors/ovl_Fishing/z_fishing.h"
 #include "src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h"
 #include "src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h"
+#include "src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.h"
 #include "src/overlays/actors/ovl_En_Door/z_en_door.h"
 #include "objects/object_link_boy/object_link_boy.h"
 #include "objects/object_link_child/object_link_child.h"
@@ -1754,11 +1755,12 @@ void RegisterRandomizerCompasses() {
     });
 }
 
+extern "C" void func_8099485C(DoorGerudo* gerudoDoor, PlayState* play);
+
 void RegisterSkeletonKey() {
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* refActor) {
-        Actor* actor = static_cast<Actor*>(refActor);
-
         if (Flags_GetRandomizerInf(RAND_INF_HAS_SKELETON_KEY)) {
+            Actor* actor = static_cast<Actor*>(refActor);
             if (actor->id == ACTOR_EN_DOOR) {
                 EnDoor* door = (EnDoor*)actor;
                 door->lockTimer = 0;
@@ -1767,6 +1769,10 @@ void RegisterSkeletonKey() {
                 if (shutterDoor->doorType == SHUTTER_KEY_LOCKED) {
                     shutterDoor->unk_16E = 0;
                 }
+            } else if (actor->id == ACTOR_DOOR_GERUDO) {
+                DoorGerudo* gerudoDoor = (DoorGerudo*)actor;
+                gerudoDoor->actionFunc = func_8099485C;
+                gerudoDoor->dyna.actor.world.pos.y = gerudoDoor->dyna.actor.home.pos.y + 200.0f;
             }
         }
     });
diff --git a/soh/soh/Enhancements/randomizer/draw.cpp b/soh/soh/Enhancements/randomizer/draw.cpp
index 11e4a430b..e643acd70 100644
--- a/soh/soh/Enhancements/randomizer/draw.cpp
+++ b/soh/soh/Enhancements/randomizer/draw.cpp
@@ -563,7 +563,7 @@ Color_RGBA8 GetSkeletonKeyColor() {
     return color;
 }
 
-int test = 0;
+int skeletonKeyRotation = 0;
 
 extern "C" void Randomizer_DrawSkeletonKey(PlayState* play, GetItemEntry* getItemEntry) {
     OPEN_DISPS(play->state.gfxCtx);
@@ -572,24 +572,24 @@ extern "C" void Randomizer_DrawSkeletonKey(PlayState* play, GetItemEntry* getIte
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
 
-    test += 1;
+    skeletonKeyRotation += 1;
 
-    if (test > 40) {
-        test -= 80;
+    if (skeletonKeyRotation > 40) {
+        skeletonKeyRotation -= 80;
     }
 
-    Matrix_RotateZ(M_PI / 40 * test, MTXMODE_APPLY);
-    Matrix_RotateY(M_PI / 40 * test, MTXMODE_APPLY);
+    Matrix_RotateZ(M_PI / 40 * skeletonKeyRotation, MTXMODE_APPLY);
+    Matrix_RotateY(M_PI / 40 * skeletonKeyRotation, MTXMODE_APPLY);
 
     gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
               G_MTX_MODELVIEW | G_MTX_LOAD);
 
     gDPSetGrayscaleColor(POLY_OPA_DISP++, color.r, color.g, color.b, color.a);
     gSPGrayscale(POLY_OPA_DISP++, true);
-    
+
     gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gGiSmallKeyDL);
 
     gSPGrayscale(POLY_OPA_DISP++, false);
-    
+
     CLOSE_DISPS(play->state.gfxCtx);
 }
\ No newline at end of file
diff --git a/soh/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c b/soh/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c
index 715a48c37..50ec1532e 100644
--- a/soh/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c
+++ b/soh/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c
@@ -382,7 +382,7 @@ void EnDaiku_Jailed(EnDaiku* this, PlayState* play) {
 void EnDaiku_WaitFreedom(EnDaiku* this, PlayState* play) {
     SkelAnime_Update(&this->skelAnime);
 
-    if (Flags_GetSwitch(play, this->actor.params >> 8 & 0x3F)) {
+    if (Flags_GetSwitch(play, this->actor.params >> 8 & 0x3F) || (IS_RANDO && Flags_GetRandomizerInf(RAND_INF_HAS_SKELETON_KEY))) {
         this->actor.flags |= ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY;
         EnDaiku_UpdateText(this, play);
     }

From 15395defa4652be5145dfcc1b3cc98d04a0c7f6a Mon Sep 17 00:00:00 2001
From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Date: Fri, 23 Aug 2024 15:20:11 +0100
Subject: [PATCH 187/230] Add jabu box skip door  and frog hint exceptions to
 cutscene skipping (#4300)

* Add jaby box skip door one point to glitchAiding and frog hint exception to NoForcedDialouge

* address review
---
 soh/soh/Enhancements/timesaver_hook_handlers.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/soh/soh/Enhancements/timesaver_hook_handlers.cpp b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
index 81c7d7727..0cd6ffb09 100644
--- a/soh/soh/Enhancements/timesaver_hook_handlers.cpp
+++ b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
@@ -237,6 +237,12 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
                         break;
                     }
                     case ACTOR_BG_BDAN_SWITCH: {
+                        // The switch in jabu that you are intended to press with a box to reach barrinade
+                        // can be skipped by either a frame perfect roll open or with OI
+                        // The One Point for that switch is used in common setups for the former and is required for the latter to work
+                        if (actor->params == 14848 && gPlayState->sceneNum == SCENE_JABU_JABU && !CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.GlitchAiding"), 0)){
+                            break;
+                        }
                         BgBdanSwitch* switchActor = static_cast<BgBdanSwitch*>(opt);
                         switchActor->unk_1D8 = 0;
                         switchActor->unk_1DA = 0;
@@ -297,7 +303,9 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             }
             break;
         case VB_WONDER_TALK: {
-            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.NoForcedDialog"), IS_RANDO)) {
+            //We want to show the frog hint if it is on, regardless of cutscene settings
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.NoForcedDialog"), IS_RANDO) && 
+                !(gPlayState->sceneNum == SCENE_ZORAS_RIVER && IS_RANDO && RAND_GET_OPTION(RSK_FROGS_HINT))) {
                 *should = false;
             }
             break;

From 1f85420625f4254ae23c6eff86cd5d946c314c42 Mon Sep 17 00:00:00 2001
From: Extloga <141232749+Extloga@users.noreply.github.com>
Date: Mon, 2 Sep 2024 16:32:38 +0200
Subject: [PATCH 188/230] Additions for the German translation in two files
 (#4304)

* Additions for the German translation in hint_list_exclude_dungeon.cpp

* Additions for the German translation in hint_list_exclude_overworld.cpp
---
 .../hint_list/hint_list_exclude_dungeon.cpp   | 566 +++++++++---------
 .../hint_list/hint_list_exclude_overworld.cpp | 535 +++++++++--------
 2 files changed, 552 insertions(+), 549 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_dungeon.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_dungeon.cpp
index 99659838b..c2117c4eb 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_dungeon.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_dungeon.cpp
@@ -33,7 +33,7 @@ void StaticData::HintTable_Init_Exclude_Dungeon() {
                                                                     // /*spanish*/ Según dicen, los #salientes del Gran Árbol Deku# conducen a #[[1]]#.
 
     hintTextTable[RHT_DEKU_TREE_BASEMENT_CHEST] = HintText(CustomMessage("They say that #webs in the Deku Tree# hide #[[1]]#.",
-                                                              /*german*/ "Man erzählt sich, daß #Spinnweben im Deku-Baum# #[[1]]# verstecken würden.",
+                                                              /*german*/ "Man erzählt sich, daß #Spinnweben im Deku-Baum# #[[1]]# verbergen würden.",
                                                               /*french*/ "Selon moi, les #toiles dans l'Arbre Mojo# cachent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                            // /*spanish*/ Según dicen, entre #telarañas del Gran Árbol Deku# yace #[[1]]#.
 
@@ -58,7 +58,7 @@ void StaticData::HintTable_Init_Exclude_Dungeon() {
                                                                          // /*spanish*/ Según dicen, los #salientes del Gran Árbol Deku# conducen a #[[1]]#.
 
     hintTextTable[RHT_DEKU_TREE_MQ_BASEMENT_CHEST] = HintText(CustomMessage("They say that #webs in the Deku Tree# hide #[[1]]#.",
-                                                                 /*german*/ "Man erzählt sich, daß #Spinnweben im Deku-Baum# #[[1]]# verstecken würden.",
+                                                                 /*german*/ "Man erzählt sich, daß #Spinnweben im Deku-Baum# #[[1]]# verbergen würden.",
                                                                  /*french*/ "Selon moi, les #toiles dans l'Arbre Mojo# cachent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                               // /*spanish*/ Según dicen, entre #telarañas del Gran Árbol Deku# yace #[[1]]#.
 
@@ -309,7 +309,7 @@ hintTextTable[RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST] = HintText(CustomMessage("The
                                                                 // /*spanish*/ Según dicen, cierta #roca rodeada de vacas# esconde #[[1]]#.
                                                                 {}, {
                                                                 CustomMessage("They say that #pop rocks# hide #[[1]]#.",
-                                                                    /*german*/ "Man erzählt sich, daß #Knallfelsen# #[[1]]# verstecken würden.",
+                                                                    /*german*/ "Man erzählt sich, daß #Knallfelsen# #[[1]]# verbergen würden.",
                                                                     /*french*/ "Selon moi, des #pierres aux reins# cachent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                  // /*spanish*/ Según dicen, #cepillarse los dientes con explosivos# revela #[[1]]#.
                                                                 CustomMessage("They say that an #explosive palate# holds #[[1]]#.",
@@ -358,7 +358,7 @@ hintTextTable[RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST] = HintText(CustomMessage("The
                                                                                  // /*spanish*/ Según dicen, unos #stingers engullidos por Jabu-Jabu# guardan #[[1]]#.
                                                                                  {}, {
                                                                                  CustomMessage("They say that a school of #stingers swallowed by a deity# guard #[[1]]#.",
-                                                                                     /*german*/ "Man erzählt sich, daß von #Jabu-Jabu verschluckte Rochen# #[[1]]# bewachen würden.",
+                                                                                     /*german*/ "Man erzählt sich, daß von #einer Gottheit verschluckte Rochen# #[[1]]# bewachen würden.",
                                                                                      /*french*/ "Selon moi, les #raies avallées par le gardien# protègent #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                                   // /*spanish*/ Según dicen, unos #stingers engullidos por cierta deidad# guardan #[[1]]#.
 
@@ -585,61 +585,61 @@ hintTextTable[RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST] = HintText(CustomMessage("The
                                                                   // /*spanish*/ Según dicen, en una #sala con otro punto de vista# se esconde #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_PHANTOM_GANON_HEART] = HintText(CustomMessage("They say that #Phantom Ganon# holds #[[1]]#.",
-                                                                       /*german*/ "",
+                                                                       /*german*/ "Man erzählt sich, daß #Phantom-Ganon# #[[1]]# besäße.",
                                                                        /*french*/ "Selon moi, #Ganon Spectral# possède #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                     // /*spanish*/ Según dicen, #Ganon Fantasma# porta #[[1]]#.
                                                                     {}, {
                                                                     CustomMessage("They say that the #Evil Spirit from Beyond# holds #[[1]]#.",
-                                                                        /*german*/ "",
+                                                                        /*german*/ "Man erzählt sich, daß #böse Geist aus dem Jenseits# #[[1]]# besäße.",
                                                                         /*french*/ "Selon moi, l'#esprit maléfique de l'au-delà# possède #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                      // /*spanish*/ Según dicen, el #espíritu maligno de ultratumba# porta #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD] = HintText(CustomMessage("They say that a #spider on a small island# in the Forest Temple holds #[[1]]#.",
-                                                                              /*german*/ "",
+                                                                              /*german*/ "Man erzählt sich, daß eine #Spinne auf einer kleinen Insel# im Waldtempel #[[1]]# besäße.",
                                                                               /*french*/ "Selon moi, une #Skulltula sur l'îlot du Temple de la Forêt# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                            // /*spanish*/ Según dicen, una #Skulltula sobre una pequeña isla# del Templo del Bosque otorga #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_GS_FIRST_ROOM] = HintText(CustomMessage("They say that a #spider high on a wall of vines# in the Forest Temple holds #[[1]]#.",
-                                                                 /*german*/ "",
+                                                                 /*german*/ "Man erzählt sich, daß eine #Spinne hoch auf einer Wand aus Reben# im Waldtempel #[[1]]# besäße.",
                                                                  /*french*/ "Selon moi, une #Skulltula sur un mur de vignes du Temple de la Forêt# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                               // /*spanish*/ Según dicen, una #Skulltula en lo alto de una pared de cepas# del Templo del Bosque otorga #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD] = HintText(CustomMessage("They say that #stone columns# lead to a spider in the Forest Temple hiding #[[1]]#.",
-                                                                             /*german*/ "",
+                                                                             /*german*/ "Man erzählt sich, daß #Säulen aus Stein# zu einer Spinne im Waldtempel führen, welche #[[1]]# verstecke.",
                                                                              /*french*/ "Selon moi, une #Skulltula haut perchée dans le jardin du Temple de la Forêt# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                           // /*spanish*/ Según dicen, unas #columnas del Templo del Bosque# conducen a una Skulltula que otorga #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_GS_LOBBY] = HintText(CustomMessage("They say that a #spider among ghosts# in the Forest Temple guards #[[1]]#.",
-                                                            /*german*/ "",
+                                                            /*german*/ "Man erzählt sich, daß eine #Spinne inmitten von Geistern# im Waldtempel #[[1]]# bewache.",
                                                             /*french*/ "Selon moi, une #Skulltula dans la grande salle du Temple de la Forêt# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                          // /*spanish*/ Según dicen, una #Skulltula rodeada de fantasmas# del Templo del Bosque otorga #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_GS_BASEMENT] = HintText(CustomMessage("They say that a #spider within revolving walls# in the Forest Temple holds #[[1]]#.",
-                                                               /*german*/ "",
+                                                               /*german*/ "Man erzählt sich, daß eine #Spinne inmitten drehender Wände# im Waldtempel #[[1]]# besäße.",
                                                                /*french*/ "Selon moi, une #Skulltula derrière les murs pivotants du Temple de la Forêt# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                             // /*spanish*/ Según dicen, una #Skulltula entre paredes giratorias# del Templo del Bosque otorga #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY] = HintText(CustomMessage("They say that an #ivy-hidden spider# in the Forest Temple hoards #[[1]]#.",
-                                                                       /*german*/ "",
+                                                                       /*german*/ "Man erzählt sich, daß eine #unter Efeu versteckte Spinne# im Waldtempel #[[1]]# horte.",
                                                                        /*french*/ "Selon moi, une #Skulltula près de l'entrée du Temple de la Forêt# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                     // /*spanish*/ Según dicen, una #Skulltula escondida entre cepas# del Templo del Bosque otorga #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM] = HintText(CustomMessage("They say that a #spider in a hidden nook# within the Forest Temple holds #[[1]]#.",
-                                                                         /*german*/ "",
+                                                                         /*german*/ "Man erzählt sich, daß eine #Spinne in einem versteckten Winkel# im Waldtempel #[[1]]# besäße.",
                                                                          /*french*/ "Selon moi, une #Skulltula dans un recoin caché du Temple de la Forêt# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                       // /*spanish*/ Según dicen, una #Skulltula en una esquina oculta# del Templo del Bosque otorga #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD] = HintText(CustomMessage("They say that a #spider on an arch# in the Forest Temple holds #[[1]]#.",
-                                                                                 /*german*/ "",
+                                                                                 /*german*/ "Man erzählt sich, daß eine #Spinne auf einem Bogen# im Waldtempel #[[1]]# besäße.",
                                                                                  /*french*/ "Selon moi, une #Skulltula sur une arche du Temple de la Forêt# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                               // /*spanish*/ Según dicen, una #Skulltula sobre un arco# del Templo del Bosque otorga #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD] = HintText(CustomMessage("They say that a #spider on a ledge# in the Forest Temple holds #[[1]]#.",
-                                                                                /*german*/ "",
+                                                                                /*german*/ "Man erzählt sich, daß eine #Spinne auf einem Vorsprung# im Waldtempel #[[1]]# besäße.",
                                                                                 /*french*/ "Selon moi, une #Skulltula dans le jardin du Temple de la Forêt# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                              // /*spanish*/ Según dicen, una #Skulltula en un borde# del Templo del Bosque otorga #[[1]]#.
   hintTextTable[RHT_FOREST_TEMPLE_MQ_GS_WELL] = HintText(CustomMessage("They say that #draining a well# in Forest Temple uncovers a spider with #[[1]]#.",
-                                                              /*german*/ "",
+                                                              /*german*/ "Man erzählt sich, daß das #Entleeren eines Brunnens# im Waldtempel eine Spinne mit #[[1]]# enthülle.",
                                                               /*french*/ "Selon moi, une #Skulltula au fond du Puits du Temple de la Forêt# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                            // /*spanish*/ Según dicen, #vaciar el pozo# del Templo del Bosque desvela una Skulltula que otorga #[[1]]#.
   
@@ -647,187 +647,187 @@ hintTextTable[RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST] = HintText(CustomMessage("The
   |       FIRE TEMPLE        |
   ---------------------------*/
 hintTextTable[RHT_FIRE_TEMPLE_NEAR_BOSS_CHEST] = HintText(CustomMessage("They say that #near a dragon# is #[[1]]#.",
-                                                                 /*german*/ "",
+                                                                 /*german*/ "Man erzählt sich, daß #nahe eines Drachens# #[[1]]# sei.",
                                                                  /*french*/ "Selon moi, #près d'un dragon# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                               // /*spanish*/ Según dicen, #cerca de un dragón# yace #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_FLARE_DANCER_CHEST] = HintText(CustomMessage("They say that the #Flare Dancer behind a totem# guards #[[1]]#.",
-                                                                    /*german*/ "",
+                                                                    /*german*/ "Man erzählt sich, daß die #Flammenderwische hinter einem Totem# #[[1]]# bewachen würden.",
                                                                     /*french*/ "Selon moi, le #Danse-Flamme derrière un totem# protège #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                  // /*spanish*/ Según dicen, el #Bailafuego tras unos tótems# esconde #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_BOSS_KEY_CHEST] = HintText(CustomMessage("They say that a #prison beyond a totem# holds #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß ein #Gefängnis jenseits eines Totems# #[[1]]# enthielte.",
                                                                 /*french*/ "Selon moi, la #prison derrière un totem# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/ Según dicen, en una #prisión tras unos tótems# yace #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST] = HintText(CustomMessage("They say that #explosives over a lava pit# unveil #[[1]]#.",
-                                                                                  /*german*/ "",
+                                                                                  /*german*/ "Man erzählt sich, daß #Explosives über einem Lavastrom# #[[1]]# enthüllen würde.",
                                                                                   /*french*/ "Selon moi, des #explosifs dans un lac de lave# révèlent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                // /*spanish*/ Según dicen, los #explosivos en un mar de llamas# revelan #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST] = HintText(CustomMessage("They say that a #Goron trapped near lava# holds #[[1]]#.",
-                                                                                     /*german*/ "",
+                                                                                     /*german*/ "Man erzählt sich, daß ein #nahe der Lava gefangene Gorone# #[[1]]# besäße.",
                                                                                      /*french*/ "Selon moi, le #Goron emprisonné près de la lave# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                   // /*spanish*/ Según dicen, un #goron atrapado cerca de un mar de llamas# guarda #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST] = HintText(CustomMessage("They say that a #Goron at the end of a maze# holds #[[1]]#.",
-                                                                          /*german*/ "",
+                                                                          /*german*/ "Man erzählt sich, daß ein #Gorone am Ende eines Labyrinths# #[[1]]# besäße.",
                                                                           /*french*/ "Selon moi, le #Goron dans le labyrinthe# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                        // /*spanish*/ Según dicen, un #goron al final de un laberinto# guarda #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST] = HintText(CustomMessage("They say that a #Goron above a maze# holds #[[1]]#.",
-                                                                          /*german*/ "",
+                                                                          /*german*/ "Man erzählt sich, daß ein #Gorone oberhalb eines Labyrinths# #[[1]]# besäße.",
                                                                           /*french*/ "Selon moi, le #Goron au dessus du labyrinthe# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                        // /*spanish*/ Según dicen, un #goron sobre un laberinto# guarda #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST] = HintText(CustomMessage("They say that a #Goron hidden near a maze# holds #[[1]]#.",
-                                                                              /*german*/ "",
+                                                                              /*german*/ "Man erzählt sich, daß ein #nahe eines Labyrinths versteckter Gorone# #[[1]]# besäße.",
                                                                               /*french*/ "Selon moi, le #Goron caché près du labyrinthe# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                            // /*spanish*/ Según dicen, un #goron escondido tras un laberinto# guarda #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST] = HintText(CustomMessage("They say that a #blocked path# in Fire Temple holds #[[1]]#.",
-                                                                             /*german*/ "",
+                                                                             /*german*/ "Man erzählt sich, daß ein #blockierter Pfad# im Feuertempel #[[1]]# enthielte.",
                                                                              /*french*/ "Selon moi, un #sol fragile dans le Temple du Feu# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                           // /*spanish*/ Según dicen, en un #camino bloqueado# del Templo del Fuego yace #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say that a #caged chest# in the Fire Temple hoards #[[1]]#.",
-                                                           /*german*/ "",
+                                                           /*german*/ "Man erzählt sich, daß eine #eingesperrte Truhe# im Feuertempel #[[1]]# enthielte.",
                                                            /*french*/ "Selon moi, un #coffre emprisonné# dans le Temple du Feu contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                         // /*spanish*/ Según dicen, un #cofre entre rejas# del Templo del Fuego contiene #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_COMPASS_CHEST] = HintText(CustomMessage("They say that a #chest in a fiery maze# contains #[[1]]#.",
-                                                               /*german*/ "",
+                                                               /*german*/ "Man erzählt sich, daß eine #Truhe in einem feurigen Labyrinth# #[[1]]# enthielte.",
                                                                /*french*/ "Selon moi, un #coffre dans un labyrinthe enflammé# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                             // /*spanish*/ Según dicen, un #cofre de un ardiente laberinto# contiene #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_HIGHEST_GORON_CHEST] = HintText(CustomMessage("They say that a #Goron atop the Fire Temple# holds #[[1]]#.",
-                                                                     /*german*/ "",
+                                                                     /*german*/ "Man erzählt sich, daß ein #Gorone auf der Spitze des Feuertempels# #[[1]]# besäße.",
                                                                      /*french*/ "Selon moi, le #Goron au sommet du Temple du Feu# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                   // /*spanish*/ Según dicen, un #goron en lo alto del Templo del Fuego# guarda #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST] = HintText(CustomMessage("They say that #near a dragon# is #[[1]]#.",
-                                                                    /*german*/ "",
+                                                                    /*german*/ "Man erzählt sich, daß #nahe eines Drachens# #[[1]]# sei.",
                                                                     /*french*/ "Selon moi, #près d'un dragon# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                  // /*spanish*/ Según dicen, #cerca de un dragón# yace #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST] = HintText(CustomMessage("They say that the #Flare Dancer in the depths of the Fire Temple# guards #[[1]]#.",
-                                                                         /*german*/ "",
+                                                                         /*german*/ "Man erzählt sich, daß die #Flammenderwische in den Tiefen des Feuertempels# #[[1]]# bewachen würden.",
                                                                          /*french*/ "Selon moi, le #Danse-Flamme au coeur du volcan# a #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                       // /*spanish*/ Según dicen, el #Bailafuego en lo profundo del Templo del Fuego# esconde #[[1]]#.
                                                                       {}, {
                                                                       CustomMessage("They say that the #Flare Dancer in the depths of a volcano# guards #[[1]]#.",
-                                                                          /*german*/ "",
+                                                                          /*german*/ "Man erzählt sich, daß die #Flammenderwische in den Tiefen eines Vulkans# #[[1]]# bewachen würden.",
                                                                           /*french*/ "Selon moi, le #Danse-Flamme au coeur du volcan# a #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                        // /*spanish*/ Según dicen, el #Bailafuego en lo profundo del volcán# esconde #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_MQ_COMPASS_CHEST] = HintText(CustomMessage("They say that a #blocked path# in Fire Temple holds #[[1]]#.",
-                                                                  /*german*/ "",
+                                                                  /*german*/ "Man erzählt sich, daß ein #blockierter Pfad# im Feuertempel #[[1]]# enthielte.",
                                                                   /*french*/ "Selon moi, le #chemin scellé# dans le Temple du Feu contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                // /*spanish*/ Según dicen, en un #camino bloqueado# del Templo del Fuego yace #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST] = HintText(CustomMessage("They say that #crates in a maze# contain #[[1]]#.",
-                                                                              /*german*/ "",
+                                                                              /*german*/ "Man erzählt sich, daß #Kisten in einem Labyrinth# #[[1]]# enthielten.",
                                                                               /*french*/ "Selon moi, des #boîtes dans le labyrinthe# contiennent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                            // /*spanish*/ Según dicen, las #cajas de un laberinto# contienen #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST] = HintText(CustomMessage("They say that #crates in a maze# contain #[[1]]#.",
-                                                                              /*german*/ "",
+                                                                              /*german*/ "Man erzählt sich, daß #Kisten in einem Labyrinth #[[1]]# enthielten.",
                                                                               /*french*/ "Selon moi, des #boîtes dans le labyrinthe# contiennent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                            // /*spanish*/ Según dicen, las #cajas de un laberinto# contienen #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST] = HintText(CustomMessage("They say that a #falling slug# in the Fire Temple guards #[[1]]#.",
-                                                                        /*german*/ "",
+                                                                        /*german*/ "Man erzählt sich, daß eine #fallende Schnecke# im Feuertempel #[[1]]# bewache.",
                                                                         /*french*/ "Selon moi, la #limace tombante# dans le Temple du Feu protège #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                      // /*spanish*/ Según dicen, una #babosa del techo# del Templo del Fuego guarda #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_MQ_MAP_CHEST] = HintText(CustomMessage("They say that using a #hammer in the depths of the Fire Temple# reveals #[[1]]#.",
-                                                              /*german*/ "",
+                                                              /*german*/ "Man erzählt sich, daß die Benutzung eines #Hammers in den Tiefen des Feuertempels# #[[1]]# enthüllen würde.",
                                                               /*french*/ "Selon moi, frapper du #marteau au coeur du volcan# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
                                                            // /*spanish*/ Según dicen, usar el #martillo en lo profundo del Templo del Fuego# revela #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_MQ_BOSS_KEY_CHEST] = HintText(CustomMessage("They say that #illuminating a lava pit# reveals the path to #[[1]]#.",
-                                                                   /*german*/ "",
+                                                                   /*german*/ "Man erzählt sich, daß die #Illumination einer Lavagrube# den Pfad zu #[[1]]# enthülle.",
                                                                    /*french*/ "Selon moi, #éclairer le lac de lave# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                 // /*spanish*/ Según dicen, #iluminar un mar de llamas# revela #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST] = HintText(CustomMessage("They say that #explosives over a lava pit# unveil #[[1]]#.",
-                                                                                     /*german*/ "",
+                                                                                     /*german*/ "Man erzählt sich, daß #Explosives oberhalb einer Lavagrube# #[[1]]# enthüllen würde.",
                                                                                      /*french*/ "Selon moi, des #explosifs dans un lac de lave# révèlent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                   // /*spanish*/ Según dicen, los #explosivos en un mar de llamas# revelan #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST] = HintText(CustomMessage("They say that a #Goron hidden near a maze# holds #[[1]]#.",
-                                                                                  /*german*/ "",
+                                                                                  /*german*/ "Man erzählt sich, daß ein #nahe eines Labyrinths versteckter Gorone# #[[1]]# besäße.",
                                                                                   /*french*/ "Selon moi, le #Goron caché près du labyrinthe# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                // /*spanish*/ Según dicen, un #goron cerca de un laberinto# guarda #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_MQ_FREESTANDING_KEY] = HintText(CustomMessage("They say that hidden #beneath a block of stone# lies #[[1]]#.",
-                                                                     /*german*/ "",
+                                                                     /*german*/ "Man erzählt sich, daß versteckt #unter einem Steinblock# #[[1]]# läge.",
                                                                      /*french*/ "Selon moi, caché #derrière un bloc de pierre# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                   // /*spanish*/ Según dicen, #bajo unos bloques de piedra# yace #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_VOLVAGIA_HEART] = HintText(CustomMessage("They say that #Volvagia# holds #[[1]]#.",
-                                                                /*german*/ "",
-                                                                /*french*/ "Selon moi, #Volvagia# possède #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                /*german*/ "Man erzählt sich, daß #Volvagia# #[[1]]# besäße.",
+                                                                /*french*/ "Selon moi, #Volcania# possède #[[1]]#.", {QM_RED, QM_GREEN}),
                                                              // /*spanish*/ Según dicen, #Volvagia# porta #[[1]]#.
                                                              {}, {
                                                              CustomMessage("They say that the #Subterranean Lava Dragon# holds #[[1]]#.",
-                                                                 /*german*/ "",
+                                                                 /*german*/ "Man erzählt sich, daß der #subterrane Lavadrache# #[[1]]# besäße.",
                                                                  /*french*/ "Selon moi, le #dragon des profondeurs# possède #[[1]]#.", {QM_RED, QM_GREEN})});
                                                               // /*spanish*/ Según dicen, el #dragón de lava subterráneo# porta #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM] = HintText(CustomMessage("They say that #eight tiles of malice# guard a spider holding #[[1]]#.",
-                                                                      /*german*/ "",
+                                                                      /*german*/ "Man erzählt sich, daß #acht Kacheln der Arglist# eine Spinne bewachen würden, welche #[[1]]# besäße.",
                                                                       /*french*/ "Selon moi, une #Skulltula protégée par huit tuiles dans le Temple du Feu# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                    // /*spanish*/ Según dicen, #ocho baldosas de maldad# custodian una Skulltula que otorga #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_GS_BOSS_KEY_LOOP] = HintText(CustomMessage("They say that #five tiles of malice# guard a spider holding #[[1]]#.",
-                                                                  /*german*/ "",
+                                                                  /*german*/ "Man erzählt sich, daß #fünf Kacheln der Arglist# eine Spinne bewachen würden, welche #[[1]]# besäße.",
                                                                   /*french*/ "Selon moi, une #Skulltula protégée par cinq tuiles dans le Temple du Feu# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                // /*spanish*/ Según dicen, #cinco baldosas de maldad# custodian una Skulltula que otorga #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_GS_BOULDER_MAZE] = HintText(CustomMessage("They say that #explosives in a maze# unveil a spider hiding #[[1]]#.",
-                                                                 /*german*/ "",
+                                                                 /*german*/ "Man erzählt sich, daß #Explosives in einem Labyrinth# eine Spinne enthüllen würde, welche #[[1]]# verstecke.",
                                                                  /*french*/ "Selon moi, une #Skulltula derrière un mur fragile du Temple du Feu# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                               // /*spanish*/ Según dicen, los #explosivos en un laberinto# desvelan una Skulltula que otorga #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_GS_SCARECROW_TOP] = HintText(CustomMessage("They say that a #spider-friendly scarecrow# atop the Fire Temple hides #[[1]]#.",
-                                                                  /*german*/ "",
+                                                                  /*german*/ "Man erzählt sich, daß eine #spinnenfreundliche Vogelscheuche# auf der Spitze des Feuertempels #[[1]]# verstecke.",
                                                                   /*french*/ "Selon moi, une #Skulltula repérée par l'épouvantail du Temple du Feu# a #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                // /*spanish*/ Según dicen, un #espantapájaros del Templo del Fuego# custodia una Skulltula que otorga #[[1]]#.
                                                                {}, {
                                                                CustomMessage("They say that a #spider-friendly scarecrow# atop a volcano hides #[[1]]#.",
-                                                                   /*german*/ "",
+                                                                   /*german*/ "Man erzählt sich, daß eine #spinnenfreundliche Vogelscheuche# auf der Spitze eines Vulkans #[[1]]# verstecke.",
                                                                    /*french*/ "Selon moi, une #Skulltula repérée par l'épouvantail du volcan# a #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                 // /*spanish*/ Según dicen, un #espantapájaros en lo alto de un volcán# custodia una Skulltula que otorga #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_GS_SCARECROW_CLIMB] = HintText(CustomMessage("They say that a #spider-friendly scarecrow# atop the Fire Temple hides #[[1]]#.",
-                                                                    /*german*/ "",
+                                                                    /*german*/ "Man erzählt sich, daß eine #spinnenfreundliche Vogelscheuche# auf der der Spitze des Feuertempels #[[1]]# verstecke.",
                                                                     /*french*/ "Selon moi, une #Skulltula repérée par l'épouvantail du Temple du Feu# a #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                  // /*spanish*/ Según dicen, un #espantapájaros del Templo del Fuego# custodia una Skulltula que otorga #[[1]]#.
                                                                  {}, {
                                                                  CustomMessage("They say that a #spider-friendly scarecrow# atop a volcano hides #[[1]]#.",
-                                                                     /*german*/ "",
+                                                                     /*german*/ "Man erzählt sich, daß eine #spinnenfreundliche Vogelscheuche# auf der Spitze eines Vulkans #[[1]]# verstecke.",
                                                                      /*french*/ "Selon moi, une #Skulltula repérée par l'épouvantail du volcan# a #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                   // /*spanish*/ Según dicen, un #espantapájaros en lo alto de un volcán# custodia una Skulltula que otorga #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE] = HintText(CustomMessage("They say that a #spider above a fiery maze# holds #[[1]]#.",
-                                                                            /*german*/ "",
+                                                                            /*german*/ "Man erzählt sich, daß eine #Spinne oberhalb eines feurigen Labyrinths #[[1]]# besäße.",
                                                                             /*french*/ "Selon moi, une #Skulltula au dessus du labyrinthe enflammé du Temple du Feu# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                          // /*spanish*/ Según dicen, una #Skulltula sobre un ardiente laberinto# otorga #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER] = HintText(CustomMessage("They say that a #spider within a fiery maze# holds #[[1]]#.",
-                                                                             /*german*/ "",
+                                                                             /*german*/ "Man erzählt sich, daß eine #Spinne innerhalb eines feurigen Labyrinths# #[[1]]# besäße.",
                                                                              /*french*/ "Selon moi, une #Skulltula dans le labyrinthe enflammé du Temple du Feu# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                           // /*spanish*/ Según dicen, una #Skulltula en el interior de un ardiente laberinto# otorga #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR] = HintText(CustomMessage("They say that a #Goron trapped near lava# befriended a spider with #[[1]]#.",
-                                                                               /*german*/ "",
+                                                                               /*german*/ "Man erzählt sich, daß ein #nahe der Lava gefangener Gorone# sich mit einer Spinne angefreundet hat, welche #[[1]]# besäße.",
                                                                                /*french*/ "Selon moi, une #Skulltula emprisonnée près du lac de lave du Temple du Feu# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                             // /*spanish*/ Según dicen, una #Skulltula amiga de un Goron atrapado junto a la lava# otorga #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM] = HintText(CustomMessage("They say that a #spider beside a fiery maze# holds #[[1]]#.",
-                                                                                /*german*/ "",
+                                                                                /*german*/ "Man erzählt sich, daß eine #Spinne neben einem feurigen Labyrinth# #[[1]]# besäße.",
                                                                                 /*french*/ "Selon moi, une #Skulltula près du labyrinthe enflammé du Temple du Feu# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                              // /*spanish*/ Según dicen, una #Skulltula junto a un ardiente laberinto# otorga #[[1]]#.
 
@@ -835,126 +835,126 @@ hintTextTable[RHT_FIRE_TEMPLE_NEAR_BOSS_CHEST] = HintText(CustomMessage("They sa
   |       WATER TEMPLE       |
   ---------------------------*/
     hintTextTable[RHT_WATER_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say that #rolling spikes# in the Water Temple surround #[[1]]#.",
-                                                            /*german*/ "",
+                                                            /*german*/ "Man erzählt sich, daß #rollende Stacheln# im Wassertempel #[[1]]# umgeben würden.",
                                                             /*french*/ "Selon moi, des #Spikes# dans le Temple de l'Eau entourent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                          // /*spanish*/ Según dicen, unas #rodantes púas# del Templo del Agua guardan #[[1]]#.
 
     hintTextTable[RHT_WATER_TEMPLE_COMPASS_CHEST] = HintText(CustomMessage("They say that #roaming stingers in the Water Temple# guard #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß #umherstreifende Rochen im Wassertempel# #[[1]]# bewachen würden.",
                                                                 /*french*/ "Selon moi, des #raies dans le Temple de l'Eau# protègent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/ Según dicen, unos #errantes stingers# del Templo del Agua guardan #[[1]]#.
 
     hintTextTable[RHT_WATER_TEMPLE_TORCHES_CHEST] = HintText(CustomMessage("They say that #fire in the Water Temple# reveals #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß #Feuer im Wassertempel# #[[1]]# enthüllen würde.",
                                                                 /*french*/ "Selon moi, des #flammes dans le Temple de l'Eau# révèlent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/ Según dicen, el #fuego en el Templo del Agua# revela #[[1]]#.
 
     hintTextTable[RHT_WATER_TEMPLE_DRAGON_CHEST] = HintText(CustomMessage("They say that a #serpent's prize# in the Water Temple is #[[1]]#.",
-                                                               /*german*/ "",
+                                                               /*german*/ "Man erzählt sich, daß der #Preis einer Schlange# im Wassertempel #[[1]]# sei.",
                                                                /*french*/ "Selon moi, la #récompense du dragon submergé# est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                             // /*spanish*/ Según dicen, el #escamado premio# del Templo del Agua se trata de #[[1]]#.
 
     hintTextTable[RHT_WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST] = HintText(CustomMessage("They say that #blinding an eye# in the Water Temple leads to #[[1]]#.",
-                                                                           /*german*/ "",
+                                                                           /*german*/ "Man erzählt sich, daß das #Erblinden eines Auges# im Wassertempel zu #[[1]]# führe.",
                                                                            /*french*/ "Selon moi, #l'oeil# du Temple de l'Eau voit #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                         // /*spanish*/ Según dicen, #cegar un ojo# del Templo del Agua conduce a #[[1]]#.
 
     hintTextTable[RHT_WATER_TEMPLE_CENTRAL_PILLAR_CHEST] = HintText(CustomMessage("They say that in the #depths of the Water Temple# lies #[[1]]#.",
-                                                                       /*german*/ "",
+                                                                       /*german*/ "Man erzählt sich, daß in den #Tiefen des Wassertempels# #[[1]]# läge.",
                                                                        /*french*/ "Selon moi, le #coeur du Temple de l'Eau# cache #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                     // /*spanish*/ Según dicen, en las #profundidades del Templo del Agua# yace #[[1]]#.
 
     hintTextTable[RHT_WATER_TEMPLE_CRACKED_WALL_CHEST] = HintText(CustomMessage("They say that #through a crack# in the Water Temple is #[[1]]#.",
-                                                                     /*german*/ "",
+                                                                     /*german*/ "Man erzählt sich, daß #in einem Spalt# im Wassertempel #[[1]]# sei.",
                                                                      /*french*/ "Selon moi, le #mur fragile# du Temple de l'Eau cache #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                   // /*spanish*/ Según dicen, tras una #agrietada pared# del Templo del Agua yace #[[1]]#.
 
     hintTextTable[RHT_WATER_TEMPLE_LONGSHOT_CHEST] = HintText(CustomMessage("They say that #Dark Link# guards #[[1]]#.",
-                                                                 /*german*/ "",
+                                                                 /*german*/ "Man erzählt sich, daß der #schwarze Link# #[[1]]# bewache.",
                                                                  /*french*/ "Selon moi, l'#Ombre de @# protège #[[1]]#.", {QM_RED, QM_GREEN}),
                                                               // /*spanish*/ Según dicen, #@ Oscuro# guarda #[[1]]#.
                                                               {}, {
                                                               CustomMessage("They say that #facing yourself# reveals #[[1]]#.",
-                                                                  /*german*/ "",
+                                                                  /*german*/ "Man erzählt sich, daß die #Konfrontation mit einem Selbst# #[[1]]# offenbare.",
                                                                   /*french*/ "Selon moi, se #vaincre soi-même# révèle #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                // /*spanish*/ Según dicen, #luchar contra ti mismo# revela #[[1]]#.
                                                               CustomMessage("They say that a #dark reflection# of yourself guards #[[1]]#.",
-                                                                  /*german*/ "",
+                                                                  /*german*/ "Man erzählt sich, daß eine #dunkle Reflektion# von einem Selbst #[[1]]# bewache.",
                                                                   /*french*/ "Selon moi, son #propre reflet# cache #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                // /*spanish*/ Según dicen, el #oscuro reflejo de ti mismo# guarda #[[1]]#.
 
     hintTextTable[RHT_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST] = HintText(CustomMessage("They say that in the #depths of the Water Temple# lies #[[1]]#.",
-                                                                          /*german*/ "",
+                                                                          /*german*/ "Man erzählt sich, daß in den #Tiefen des Wassertempels# #[[1]]# läge.",
                                                                           /*french*/ "Selon moi, le #coeur du Temple de l'Eau# cache #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                        // /*spanish*/ Según dicen, en las #profundidades del Templo del Agua# yace #[[1]]#.
 
     hintTextTable[RHT_WATER_TEMPLE_MQ_BOSS_KEY_CHEST] = HintText(CustomMessage("They say that fire in the Water Temple unlocks a #vast gate# revealing a chest with #[[1]]#.",
-                                                                    /*german*/ "",
+                                                                    /*german*/ "Man erzählt sich, daß Feuer im Wassertempel ein #großes Tor# entschlüssele, welches eine Truhe mit #[[1]]# offenbare.",
                                                                     /*french*/ "Selon moi, des #flammes au coeur du Temple de l'Eau# révèlent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                  // /*spanish*/ Según dicen, el fuego en el Templo del Agua alza una #gran valla# con #[[1]]#.
 
     hintTextTable[RHT_WATER_TEMPLE_MQ_LONGSHOT_CHEST] = HintText(CustomMessage("They say that #through a crack# in the Water Temple is #[[1]]#.",
-                                                                    /*german*/ "",
+                                                                    /*german*/ "Man erzählt sich, daß #in einem Spalt# im Wassertempel #[[1]]# sei.",
                                                                     /*french*/ "Selon moi, le #mur fragile# du Temple de l'Eau cache #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                  // /*spanish*/ Según dicen, tras una #agrietada pared# del Templo del Agua yace #[[1]]#.
 
     hintTextTable[RHT_WATER_TEMPLE_MQ_COMPASS_CHEST] = HintText(CustomMessage("They say that #fire in the Water Temple# reveals #[[1]]#.",
-                                                                   /*german*/ "",
+                                                                   /*german*/ "Man erzählt sich, daß #Feuer im Wassertempel# #[[1]]# offenbare.",
                                                                    /*french*/ "Selon moi, des #flammes dans le Temple de l'Eau# révèlent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                 // /*spanish*/ Según dicen, el #fuego en el Templo del Agua# revela #[[1]]#.
 
     hintTextTable[RHT_WATER_TEMPLE_MQ_MAP_CHEST] = HintText(CustomMessage("They say that #sparring soldiers# in the Water Temple guard #[[1]]#.",
-                                                               /*german*/ "",
+                                                               /*german*/ "Man erzählt sich, daß #sich duellierende Soldaten# im Wassertempel #[[1]]# bewachen würden.",
                                                                /*french*/ "Selon moi, les #soldats du Temple de l'Eau# protègent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                             // /*spanish*/ Según dicen, #acabar con unos soldados# del Templo del Agua revela #[[1]]#.
 
     hintTextTable[RHT_WATER_TEMPLE_MORPHA_HEART] = HintText(CustomMessage("They say that #Morpha# holds #[[1]]#.",
-                                                               /*german*/ "",
+                                                               /*german*/ "Man erzählt sich, daß #Morpha# #[[1]]# besäße.",
                                                                /*french*/ "Selon moi, #Morpha# possède #[[1]]#.", {QM_RED, QM_GREEN}),
                                                             // /*spanish*/ Según dicen, #Morpha# porta #[[1]]#.
                                                             {}, {
                                                             CustomMessage("They say that the #Giant Aquatic Amoeba# holds #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß die #gigantische aquatische Amöbe# #[[1]]# besäße.",
                                                                 /*french*/ "Selon moi, l'#amibe aquatique géante# possède #[[1]]#.", {QM_RED, QM_GREEN})});
                                                              // /*spanish*/ Según dicen, la #ameba acuática gigante# porta #[[1]]#.
 
     hintTextTable[RHT_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM] = HintText(CustomMessage("They say that a #spider over a waterfall# in the Water Temple holds #[[1]]#.",
-                                                                           /*german*/ "",
+                                                                           /*german*/ "Man erzählt sich, daß eine #Spinne über einem Wasserfall# im Wassertempel #[[1]]# besäße.",
                                                                            /*french*/ "Selon moi, une #Skulltula au dessus d'une cascade du Temple de l'Eau# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                         // /*spanish*/ Según dicen, una #Skulltula tras una cascada# del Templo del Agua otorga #[[1]]#.
 
     hintTextTable[RHT_WATER_TEMPLE_GS_CENTRAL_PILLAR] = HintText(CustomMessage("They say that a #spider in the center of the Water Temple# holds #[[1]]#.",
-                                                                    /*german*/ "",
+                                                                    /*german*/ "Man erzählt sich, daß eine #Spinne im Zentrum des Wassertempels# #[[1]]# besäße.",
                                                                     /*french*/ "Selon moi, une #Skulltula au centre du Temple de l'Eau# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                  // /*spanish*/ Según dicen, una #Skulltula en el centro del Templo del Agua# otorga #[[1]]#.
 
     hintTextTable[RHT_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST] = HintText(CustomMessage("They say that a spider protected by #rolling boulders in the Water Temple# hides #[[1]]#.",
-                                                                         /*german*/ "",
+                                                                         /*german*/ "Man erzählt sich, daß eine Spinne, welche von #rollenden Felsbrocken im Wassertempel# geschützt werde, #[[1]]# verstecke.",
                                                                          /*french*/ "Selon moi, une #Skulltula derrière les rochers roulants du Temple de l'Eau# a #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                       // /*spanish*/ Según dicen, una #Skulltula protegida por rocas rodantes# del Templo del Agua otorga #[[1]]#.
                                                                       {}, {
                                                                       CustomMessage("They say that a spider protected by #rolling boulders under the lake# hides #[[1]]#.",
-                                                                          /*german*/ "",
+                                                                          /*german*/ "Man erzählt sich, daß eine Spinne, welche von #rollenden Felsbrocken unterhalb eines Flusses# geschützt werde, #[[1]]# verstecke.",
                                                                           /*french*/ "Selon moi, une #Skulltula derrière les rochers roulants sous le lac# a #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                        // /*spanish*/ Según dicen, una #Skulltula protegida por rocas rodantes# bajo el lago otorga #[[1]]#.
 
     hintTextTable[RHT_WATER_TEMPLE_GS_RIVER] = HintText(CustomMessage("They say that a #spider over a river# in the Water Temple holds #[[1]]#.",
-                                                           /*german*/ "",
+                                                           /*german*/ "Man erzählt sich, daß eine #Spinne über einem Fluß# im Wassertempel #[[1]]# besäße.",
                                                            /*french*/ "Selon moi, une #Skulltula au dessus de la rivière du Temple de l'Eau# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                         // /*spanish*/ Según dicen, una #Skulltula sobre un río# del Templo del Agua otorga #[[1]]#.
 
     hintTextTable[RHT_WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH] = HintText(CustomMessage("They say that #beyond a pit of lizards# is a spider holding #[[1]]#.",
-                                                                                  /*german*/ "",
+                                                                                  /*german*/ "Man erzählt sich, daß #jenseits einer Reptiliengrube# eine Spinne sei, welche #[[1]]# besäße.",
                                                                                   /*french*/ "Selon moi, une #Skulltula près des lézards du Temple de l'Eau# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                // /*spanish*/ Según dicen, #más allá de un pozo de reptiles# una Skulltula otorga #[[1]]#.
 
     hintTextTable[RHT_WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY] = HintText(CustomMessage("They say that #lizards guard a spider# in the Water Temple with #[[1]]#.",
-                                                                         /*german*/ "",
+                                                                         /*german*/ "Man erzählt sich, daß #eine von Reptilien bewachte Spinne# im Wassertempel #[[1]]# besäße.",
                                                                          /*french*/ "Selon moi, une #Skulltula dans les couloirs croisés du Temple de l'Eau# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                       // /*spanish*/ Según dicen, unos #reptiles custodian una Skulltula# del Templo del Agua que otorga #[[1]]#.
 
     hintTextTable[RHT_WATER_TEMPLE_MQ_GS_RIVER] = HintText(CustomMessage("They say that a #spider over a river# in the Water Temple holds #[[1]]#.",
-                                                              /*german*/ "",
+                                                              /*german*/ "Man erzählt sich, daß eine #Spinne oberhalb eines Flusses# im Wassertempel #[[1]]# besäße.",
                                                               /*french*/ "Selon moi, une #Skulltula au dessus de la rivière du Temple de l'Eau# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                            // /*spanish*/ Según dicen, una #Skulltula sobre un río# del Templo del Agua otorga #[[1]]#.
 
@@ -962,232 +962,232 @@ hintTextTable[RHT_FIRE_TEMPLE_NEAR_BOSS_CHEST] = HintText(CustomMessage("They sa
   |      SPIRIT TEMPLE       |
   ---------------------------*/
  hintTextTable[RHT_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST] = HintText(CustomMessage("They say that a child conquers a #skull in green fire# in the Spirit Temple to reach #[[1]]#.",
-                                                                      /*german*/ "",
+                                                                      /*german*/ "Man erzählt sich, daß ein Kind einen #Schädel in grünem Feuer# im Geistertempel erobere, um #[[1]]# zu erreichen.",
                                                                       /*french*/ "Selon moi, le #crâne au halo vert dans le colosse# cache #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                    // /*spanish*/ Según dicen, el joven que #baje el puente# del Templo del Espíritu encontrará #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST] = HintText(CustomMessage("They say that a child can find a #caged chest# in the Spirit Temple with #[[1]]#.",
-                                                                             /*german*/ "",
+                                                                             /*german*/ "Man erzählt sich, daß ein Kind eine #gefangene Truhe# im Geistertempel finden könne, welche #[[1]]# enthielte.",
                                                                              /*french*/ "Selon moi, le #coffre embarré dans le colosse# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                           // /*spanish*/ Según dicen, un joven puede encontrar un #cofre entre rejas# del Templo del Espíritu con #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_COMPASS_CHEST] = HintText(CustomMessage("They say that #across a pit of sand# in the Spirit Temple lies #[[1]]#.",
-                                                                 /*german*/ "",
+                                                                 /*german*/ "Man erzählt sich, daß #jenseits einer Sandgrube# im Geistertempel #[[1]]# läge.",
                                                                  /*french*/ "Selon moi, le #trou sableux dans le colosse# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                               // /*spanish*/ Según dicen, tras un #pozo de arena# del Templo del Espíritu yace #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST] = HintText(CustomMessage("They say that #dodging boulders to collect silver rupees# in the Spirit Temple yields #[[1]]#.",
-                                                                           /*german*/ "",
+                                                                           /*german*/ "Man erzählt sich, daß das #Ausweichen von Felsbrocken um silberne Rubine zu sammeln# im Geistertempel #[[1]]# einbrächte.",
                                                                            /*french*/ "Selon moi, les #pièces argentées entourées de rochers dans le colosse# révèlent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                         // /*spanish*/ Según dicen, #esquivar rocas y conseguir plateadas rupias# en el Templo del Espíritu conduce a #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST] = HintText(CustomMessage("They say that a #shadow circling reflected light# in the Spirit Temple guards #[[1]]#.",
-                                                                           /*german*/ "",
+                                                                           /*german*/ "Man erzählt sich, daß ein #reflektierendes Licht umzirkelnder Schatten# im Geistertempel #[[1]]# bewachen würde.",
                                                                            /*french*/ "Selon moi, l'#ombre près d'un miroir# protège #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                         // /*spanish*/ Según dicen, un #círculo de reflectante luz# del Templo del Espíritu guarda #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST] = HintText(CustomMessage("They say that a #shadow circling reflected light# in the Spirit Temple guards #[[1]]#.",
-                                                                            /*german*/ "",
+                                                                            /*german*/ "Man erzählt sich, daß ein #reflektierendes Licht umzirkelnder Schatten# im Geistertempel #[[1]]# bewachen würde.",
                                                                             /*french*/ "Selon moi, l'#ombre près d'un miroir# protège #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                          // /*spanish*/ Según dicen, un #círculo de reflectante luz# del Templo del Espíritu guarda #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say that #before a giant statue# in the Spirit Temple lies #[[1]]#.",
-                                                             /*german*/ "",
+                                                             /*german*/ "Man erzählt sich, daß #vor einer riesigen Statue# im Geistertempel #[[1]]# läge.",
                                                              /*french*/ "Selon moi, #devant la statue# dans le colosse gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                           // /*spanish*/ Según dicen, #ante una gran estatua# del Templo del Espíritu aguarda #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST] = HintText(CustomMessage("They say that #lizards in the Spirit Temple# guard #[[1]]#.",
-                                                                           /*german*/ "",
+                                                                           /*german*/ "Man erzählt sich, daß #Reptilien im Geistertempel# #[[1]]# bewachen würden.",
                                                                            /*french*/ "Selon moi, les #lézards dans le colosse# protègent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                         // /*spanish*/ Según dicen, los #reptiles del Templo del Espíritu# guardan #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST] = HintText(CustomMessage("They say that #lizards in the Spirit Temple# guard #[[1]]#.",
-                                                                          /*german*/ "",
+                                                                          /*german*/ "Man erzählt sich, daß #Reptilien im Geistertempel# #[[1]]# bewachen würden.",
                                                                           /*french*/ "Selon moi, les #lézards dans le colosse# protègent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                        // /*spanish*/ Según dicen, los #reptiles del Templo del Espíritu# guardan #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST] = HintText(CustomMessage("They say that #torchlight among Beamos# in the Spirit Temple reveals #[[1]]#.",
-                                                                        /*german*/ "",
+                                                                        /*german*/ "Man erzählt sich, daß #Fackellicht inmitten von Strahlzyklopen# #[[1]]# enthüllen würde.",
                                                                         /*french*/ "Selon moi, les #torches autour des Sentinelles# éclairent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                      // /*spanish*/ Según dicen, las #antorchas junto a Beamos# del Templo del Espíritu revelan #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST] = HintText(CustomMessage("They say that a #statue in the Spirit Temple# holds #[[1]]#.",
-                                                                          /*german*/ "",
+                                                                          /*german*/ "Man erzählt sich, daß eine #Statue im Geistertempel# #[[1]]# hielte.",
                                                                           /*french*/ "Selon moi, la #statue dans le colosse# tient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                        // /*spanish*/ Según dicen, una #estatua del Templo del Espíritu# esconde #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST] = HintText(CustomMessage("They say that on a #ledge by a statue# in the Spirit Temple rests #[[1]]#.",
-                                                                               /*german*/ "",
+                                                                               /*german*/ "Man erzählt sich, daß auf einem #Vorsprung einer Statue# im Geistertempel #[[1]]# ruhe.",
                                                                                /*french*/ "Selon moi, #haut perché près de la statue# dans le colosse gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                             // /*spanish*/ Según dicen, al #borde de una estatua# del Templo del Espíritu yace #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST] = HintText(CustomMessage("They say that those who #show the light among statues# in the Spirit Temple find #[[1]]#.",
-                                                                         /*german*/ "",
+                                                                         /*german*/ "Man erzählt sich, daß jene, welche #das Licht inmitten von Statuen# im Geistertempel zeigen würden, #[[1]]# fänden.",
                                                                          /*french*/ "Selon moi, le #soleil près des statues# cache #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                       // /*spanish*/ Según dicen, aquellos que #iluminen ante las estatuas# del Templo del Espíritu encontrarán #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST] = HintText(CustomMessage("They say that the #Eye of Truth in the Spirit Temple# reveals #[[1]]#.",
-                                                                                 /*german*/ "",
+                                                                                 /*german*/ "Man erzählt sich, daß das #Auge der Wahrheit im Geistertempel# #[[1]]# enthüllen würde.",
                                                                                  /*french*/ "Selon moi, le #trésor invisible près du Hache-Viande# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                               // /*spanish*/ Según dicen, el #Ojo de la Verdad# en el Templo del Espíritu revela #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST] = HintText(CustomMessage("They say that the #Eye of Truth in the Spirit Temple# reveals #[[1]]#.",
-                                                                                /*german*/ "",
+                                                                                /*german*/ "Man erzählt sich, daß das #Auge der Wahrheit im Geistertempel# #[[1]]# enthüllen würde.",
                                                                                 /*french*/ "Selon moi, le #trésor invisible près du Hache-Viande# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                              // /*spanish*/ Según dicen, el #Ojo de la Verdad# en el Templo del Espíritu revela #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_BOSS_KEY_CHEST] = HintText(CustomMessage("They say that a #chest engulfed in flame# in the Spirit Temple holds #[[1]]#.",
-                                                                  /*german*/ "",
+                                                                  /*german*/ "Man erzählt sich, daß eine #von Flammen eingehüllte Truhe# im Geistertempel #[[1]]# enthielte.",
                                                                   /*french*/ "Selon moi, le #coffre enflammé dans le colosse# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                // /*spanish*/ Según dicen, un #cofre rodeado de llamas# del Templo del Espíritu contiene #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_TOPMOST_CHEST] = HintText(CustomMessage("They say that those who #show the light above the Colossus# find #[[1]]#.",
-                                                                 /*german*/ "",
+                                                                 /*german*/ "Man erzählt sich, daß jene, welche #das Licht auf dem Koloss# zeigen würden, #[[1]]# fänden.",
                                                                  /*french*/ "Selon moi, le #soleil au sommet du colosse# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
                                                               // /*spanish*/ Según dicen, aquellos que #iluminen en lo alto del Coloso# encontrarán #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST] = HintText(CustomMessage("They say that #lying unguarded# in the Spirit Temple is #[[1]]#.",
-                                                                                /*german*/ "",
+                                                                                /*german*/ "Man erzählt sich, daß #unbewacht liegend# im Geistertempel #[[1]]# sei.",
                                                                                 /*french*/ "Selon moi, dans #l'entrée du colosse# se trouve #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                              // /*spanish*/ Según dicen, en la #entrada del Templo del Espíritu# yace #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST] = HintText(CustomMessage("They say that a #switch in a pillar# within the Spirit Temple drops #[[1]]#.",
-                                                                                /*german*/ "",
+                                                                                /*german*/ "Man erzählt sich, daß ein #Schalter in einer Säule# innerhalb des Geistertempels #[[1]]# erbringe.",
                                                                                 /*french*/ "Selon moi, l'#interrupteur dans un pilier# du colosse cache #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                              // /*spanish*/ Según dicen, el #interruptor de un pilar# del Templo del Espíritu revela #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST] = HintText(CustomMessage("They say that #collecting rupees through a water jet# reveals #[[1]]#.",
-                                                                                 /*german*/ "",
+                                                                                 /*german*/ "Man erzählt sich, daß das #Sammeln von Rubin durch einen Wasserstrom# #[[1]]# enthüllen würde.",
                                                                                  /*french*/ "Selon moi, les #pièces argentées dans le jet d'eau# du colosse révèlent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                               // /*spanish*/ Según dicen, #hacerte con rupias tras un géiser# revela #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST] = HintText(CustomMessage("They say that an #eye blinded by stone# within the Spirit Temple conceals #[[1]]#.",
-                                                                               /*german*/ "",
+                                                                               /*german*/ "Man erzählt sich, daß ein #durch einen Stein erblindetes Auge# im Geistertempel #[[1]]# verberge.",
                                                                                /*french*/ "Selon moi, #l'oeil derrière le rocher# dans le colosse voit #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                             // /*spanish*/ Según dicen, #cegar a un ojo# del Templo del Espíritu revela #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_MQ_MAP_CHEST] = HintText(CustomMessage("They say that surrounded by #fire and wrappings# lies #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß umgeben von #Feuer umhüllt# #[[1]]# läge.",
                                                                 /*french*/ "Selon moi, près des #pierres tombales dans le colosse# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/ Según dicen, rodeado de #fuego y vendas# yace #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST] = HintText(CustomMessage("They say that a child defeats a #gauntlet of monsters# within the Spirit Temple to find #[[1]]#.",
-                                                                           /*german*/ "",
+                                                                           /*german*/ "Man erzählt sich, daß ein Kind eine #Herausforderung von Monstern# innerhalb des Geistertempels bewältige und #[[1]]# fände.",
                                                                            /*french*/ "Selon moi, l'enfant qui vainc #plusieurs monstres# dans le colosse trouvera #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                         // /*spanish*/ Según dicen, el joven que derrote #unos monstruos# del Templo del Espíritu encontrará #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST] = HintText(CustomMessage("They say that #explosive sunlight# within the Spirit Temple uncovers #[[1]]#.",
-                                                                              /*german*/ "",
+                                                                              /*german*/ "Man erzählt sich, daß #explosives Sonnenlicht# innerhalb des Geistertempels #[[1]]# enthüllen würde.",
                                                                               /*french*/ "Selon moi, le #rayon de lumière explosif dans le colosse# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                            // /*spanish*/ Según dicen, una #explosiva luz solar# del Templo del Espíritu revela #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST] = HintText(CustomMessage("They say that #trapped by falling enemies# within the Spirit Temple is #[[1]]#.",
-                                                                              /*german*/ "",
+                                                                              /*german*/ "Man erzählt sich, daß sich #gefangen von fallenden Feinden# im Geistertempel #[[1]]# befände.",
                                                                               /*french*/ "Selon moi, des #ennemis tombants# dans le colosse protègent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                            // /*spanish*/ Según dicen, #rodeado de enemigos del cielo# del Templo del Espíritu yace #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_MQ_COMPASS_CHEST] = HintText(CustomMessage("They say that #blinding the colossus# unveils #[[1]]#.",
-                                                                    /*german*/ "",
+                                                                    /*german*/ "Man erzählt sich, daß das #Erblinden des Kolosses# #[[1]]# offenbare.",
                                                                     /*french*/ "Selon moi, #l'oeil dans le colosse# voit #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                  // /*spanish*/ Según dicen, #cegar al coloso# revela #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST] = HintText(CustomMessage("They say that a #royal melody awakens the colossus# to reveal #[[1]]#.",
-                                                                                /*german*/ "",
+                                                                                /*german*/ "Man erzählt sich, daß eine #königliche Melodie den Koloss erwecke# und #[[1]]# enthüllen würde.",
                                                                                 /*french*/ "Selon moi, la #mélodie royale éveille le colosse# et révèle #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                              // /*spanish*/ Según dicen, la #melodía real que despierte al coloso# revelará #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST] = HintText(CustomMessage("They say that the #Eye of Truth# finds the colossus's hidden #[[1]]#.",
-                                                                                  /*german*/ "",
+                                                                                  /*german*/ "Man erzählt sich, daß das #Auge der Wahrheit# des Kolosses verborgene #[[1]]# fände.",
                                                                                   /*french*/ "Selon moi, #l'oeil de vérité# verra dans le colosse #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                // /*spanish*/ Según dicen, el #Ojo de la Verdad# en el Templo del Espíritu encontrará #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST] = HintText(CustomMessage("They say that #the old hide what the young find# to reveal #[[1]]#.",
-                                                                                 /*german*/ "",
+                                                                                 /*german*/ "Man erzählt sich, daß #der Alte verstecke, was der Junge finde# und #[[1]]# enthüllt würde.",
                                                                                  /*french*/ "Selon moi, l'#oeil dans le trou du bloc argent# dans le colosse voit #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                               // /*spanish*/ Según dicen, el #adulto esconde lo que el joven anhela#, revelando #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST] = HintText(CustomMessage("They say that #sunlight in a maze of fire# hides #[[1]]#.",
-                                                                           /*german*/ "",
+                                                                           /*german*/ "Man erzählt sich, daß #Sonnenlicht in einem Labyrinth aus Feuer# #[[1]]# verstecke.",
                                                                            /*french*/ "Selon moi, #la lumière dans le labyrinthe de feu# du colosse révèle #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                         // /*spanish*/ Según dicen, la #luz solar de un ígneo laberinto# esconde #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST] = HintText(CustomMessage("They say that #across a pit of sand# in the Spirit Temple lies #[[1]]#.",
-                                                                        /*german*/ "",
+                                                                        /*german*/ "Man erzählt sich, daß #jenseits einer Sandgrube# im Geistertempel #[[1]]# läge.",
                                                                         /*french*/ "Selon moi, le #trou sableux# dans le colosse a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                      // /*spanish*/ Según dicen, #a través del pozo de arena# del Templo del Espíritu yace #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST] = HintText(CustomMessage("They say that where #temporal stone blocks the path# within the Spirit Temple lies #[[1]]#.",
-                                                                        /*german*/ "",
+                                                                        /*german*/ "Man erzählt sich, daß wo #zeitlicher Stein den Pfad blockiere# im Geistertempel #[[1]]# läge.",
                                                                         /*french*/ "Selon moi, les #pierres temporelles# dans le colosse cachent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                      // /*spanish*/ Según dicen, donde los #bloques temporales bloquean# en el Templo del Espíritu yace #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST] = HintText(CustomMessage("They say that a #chest of double purpose# holds #[[1]]#.",
-                                                                         /*german*/ "",
+                                                                         /*german*/ "Man erzählt sich, daß eine #Truhe mit doppeltem Zweck# #[[1]]# enthielte.",
                                                                          /*french*/ "Selon moi, le #coffre à usage double# du colosse contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                       // /*spanish*/ Según dicen, un #cofre de doble uso# contiene #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST] = HintText(CustomMessage("They say that a #temporal stone blocks the light# leading to #[[1]]#.",
-                                                                     /*german*/ "",
+                                                                     /*german*/ "Man erzählt sich, daß ein #zeitlicher Stein das Licht blockiere#, was zu #[[1]]# führe.",
                                                                      /*french*/ "Selon moi, la #pierre temporelle# le colosse fait ombre sur #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                   // /*spanish*/ Según dicen, un #bloque temporal bloquea la luz# que conduce a #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST] = HintText(CustomMessage("They say that those who #show the light above the Colossus# find #[[1]]#.",
-                                                                                    /*german*/ "",
+                                                                                    /*german*/ "Man erzählt sich, daß jene, welche #das Licht auf dem Koloss# zeigen würden, #[[1]]# fänden.",
                                                                                     /*french*/ "Selon moi, le trésor invisible #au sommet du colosse# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                  // /*spanish*/ Según dicen, aquellos que #revelen la luz sobre el Coloso# encontrarán #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_TWINROVA_HEART] = HintText(CustomMessage("They say that #Twinrova# holds #[[1]]#.",
-                                                                  /*german*/ "",
+                                                                  /*german*/ "Man erzählt sich, daß #Twinrova# #[[1]]# besäße.",
                                                                   /*french*/ "Selon moi, #Twinrova# possède #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                // /*spanish*/ Según dicen, #Birova# porta #[[1]]#.
                                                                {}, {
                                                                CustomMessage("They say that the #Sorceress Sisters# hold #[[1]]#.",
-                                                                   /*german*/ "",
+                                                                   /*german*/ "Man erzählt sich, daß die #Hexenschwestern# #[[1]]# besäßen.",
                                                                    /*french*/ "Selon moi, #les sorcières jumelles# possède #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                 // /*spanish*/ Según dicen, las #hermanas hechiceras# portan #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM] = HintText(CustomMessage("They say that a spider in the #hall of a knight# guards #[[1]]#.",
-                                                                                /*german*/ "",
+                                                                                /*german*/ "Man erzählt sich, daß eine Spinne in der #Halle eines Ritters# #[[1]]# bewache.",
                                                                                 /*french*/ "Selon moi, une #Skulltula au dessus d'un escalier du Temple de l'Esprit# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                              // /*spanish*/ Según dicen, una #Skulltula en el salón de un guerrero# otorga #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_GS_BOULDER_ROOM] = HintText(CustomMessage("They say that a #spider behind a temporal stone# in the Spirit Temple yields #[[1]]#.",
-                                                                   /*german*/ "",
+                                                                   /*german*/ "Man erzählt sich, daß eine #Spinne hinter einem zeitlichen Stein# im Geistertempel #[[1]]# einbrächte.",
                                                                    /*french*/ "Selon moi, une #Skulltula derrière une pierre temporelle du Temple de l'Esprit# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                 // /*spanish*/ Según dicen, una #Skulltula tras un bloque temporal# del Templo del Espíritu otorga #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_GS_LOBBY] = HintText(CustomMessage("They say that a #spider beside a statue# holds #[[1]]#.",
-                                                            /*german*/ "",
+                                                            /*german*/ "Man erzählt sich, daß eine #Spinne neben einer Statue# #[[1]]# besäße.",
                                                             /*french*/ "Selon moi, une #Skulltula dans la grande salle du Temple de l'Esprit# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                          // /*spanish*/ Según dicen, una #Skulltula junto a una estatua# del Templo del Espíritu otorga #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM] = HintText(CustomMessage("They say that a #spider at the top of a deep shaft# in the Spirit Temple holds #[[1]]#.",
-                                                                        /*german*/ "",
+                                                                        /*german*/ "Man erzählt sich, daß eine #Spinne auf der Spitze eines tiefen Stiels# im Geistertempel #[[1]]# besäße.",
                                                                         /*french*/ "Selon moi, une #Skulltula près d'un mur d'escalade du Temple de l'Esprit# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                      // /*spanish*/ Según dicen, una #Skulltula en lo alto de un gran hueco# del Templo del Espíritu otorga #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_GS_METAL_FENCE] = HintText(CustomMessage("They say that a child defeats a #spider among bats# in the Spirit Temple to gain #[[1]]#.",
-                                                                  /*german*/ "",
+                                                                  /*german*/ "Man erzählt sich, daß ein Kind #eine Spinne inmitten von Fledermäusen# im Geistertempel besiege und #[[1]]# erhielte.",
                                                                   /*french*/ "Selon moi, une #Skulltula sur le grillage du Temple de l'Esprit# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                // /*spanish*/ Según dicen, el joven que derrote la #Skulltula entre murciélagos# del Templo del Espíritu hallará #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM] = HintText(CustomMessage("They say that #above a pit of sand# in the Spirit Temple hides #[[1]]#.",
-                                                                     /*german*/ "",
+                                                                     /*german*/ "Man erzählt sich, daß sich #oberhalb einer Sandgrube# im Geistertempel #[[1]]# verstecke.",
                                                                      /*french*/ "Selon moi, une #Skulltula au dessus du trou sableux du Temple de l'Esprit# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                   // /*spanish*/ Según dicen, una #Skulltula sobre un pozo de arena# del Templo del Espíritu otorga #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST] = HintText(CustomMessage("They say that a spider in the #hall of a knight# guards #[[1]]#.",
-                                                                                /*german*/ "",
+                                                                                /*german*/ "Man erzählt sich, daß eine Spinne in der #Halle eines Ritters# #[[1]]# bewache.",
                                                                                 /*french*/ "Selon moi, une #Skulltula dans la salle aux neuf trônes du Temple de l'Esprit# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                              // /*spanish*/ Según dicen, una #Skulltula en el salón de un guerrero# otorga #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH] = HintText(CustomMessage("They say that a spider in the #hall of a knight# guards #[[1]]#.",
-                                                                                 /*german*/ "",
+                                                                                 /*german*/ "Man erzählt sich, daß eine Spinne in der #Halle eines Ritters# #[[1]]# bewache.",
                                                                                  /*french*/ "Selon moi, une #Skulltula dans la salle aux neuf trônes du Temple de l'Esprit# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                               // /*spanish*/ Según dicen, una #Skulltula en el salón de un guerrero# otorga #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM] = HintText(CustomMessage("They say that #upon a web of glass# in the Spirit Temple sits a spider holding #[[1]]#.",
-                                                                        /*german*/ "",
+                                                                        /*german*/ "Man erzählt sich, daß #auf einer Webe aus Glas# im Geistertempel eine Spinne säße, welche #[[1]]# besäße.",
                                                                         /*french*/ "Selon moi, une #Skulltula sur une paroi de verre du Temple de l'Esprit# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                      // /*spanish*/ Según dicen, #sobre una plataforma de cristal# yace una Skulltula que otorga #[[1]]#.
 
@@ -1195,242 +1195,242 @@ hintTextTable[RHT_FIRE_TEMPLE_NEAR_BOSS_CHEST] = HintText(CustomMessage("They sa
   |      SHADOW TEMPLE       |
   ---------------------------*/
 hintTextTable[RHT_SHADOW_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say that the #Eye of Truth# pierces a hall of faces to reveal #[[1]]#.",
-                                                             /*german*/ "",
+                                                             /*german*/ "Man erzählt sich, daß das #Auge der Wahrheit# eine Halle der Gesichter durchdränge und #[[1]]# offenbaren würde.",
                                                              /*french*/ "Selon moi, l'#oeil de vérité# voit dans les couloirs du Temple de l'Ombre #[[1]]#.", {QM_RED, QM_GREEN}));
                                                           // /*spanish*/ Según dicen, el #Ojo de la Verdad# descubrirá un pasillo de facetas con #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_HOVER_BOOTS_CHEST] = HintText(CustomMessage("They say that #Dead Hand in the Shadow Temple# holds #[[1]]#.",
-                                                                     /*german*/ "",
+                                                                     /*german*/ "Man erzählt sich, daß eine #tote Hand im Schattentempel# #[[1]]# hielte.",
                                                                      /*french*/ "Selon moi, le #Poigneur dans le Temple de l'Ombre# cache #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                   // /*spanish*/ Según dicen, la #Mano Muerta del Templo de las Sombras# guarda #[[1]]#.
                                                                   {}, {
                                                                   CustomMessage("They say that a #nether dweller in the Shadow Temple# holds #[[1]]#.",
-                                                                      /*german*/ "",
+                                                                      /*german*/ "Man erzählt sich, daß ein #Bewohner der Unterwelt im Schattentempel# #[[1]]# besäße.",
                                                                       /*french*/ "Selon moi, le #spectre du Temple de l'Ombre# a #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                    // /*spanish*/ Según dicen, un #temido morador del Templo de las Sombras# guarda #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_COMPASS_CHEST] = HintText(CustomMessage("They say that #mummies revealed by the Eye of Truth# guard #[[1]]#.",
-                                                                 /*german*/ "",
+                                                                 /*german*/ "Man erzählt sich, daß #durch das Auge der Wahrheit offenbarte Mumien# #[[1]]# bewachen würden.",
                                                                  /*french*/ "Selon moi, les #Gibdos dans les couloirs# du Temple de l'Ombre protègent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                               // /*spanish*/ Según dicen, las #momias reveladas por el Ojo de la Verdad# guardan #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST] = HintText(CustomMessage("They say that #spinning scythes# protect #[[1]]#.",
-                                                                            /*german*/ "",
+                                                                            /*german*/ "Man erzählt sich, daß #rotierende Sensen# #[[1]]# schützen würden.",
                                                                             /*french*/ "Selon moi, les #faucheurs danseurs# du Temple de l'Ombre protègent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                          // /*spanish*/ Según dicen, las #giratorias guadañas# protegen #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST] = HintText(CustomMessage("They say that #invisible blades# guard #[[1]]#.",
-                                                                                  /*german*/ "",
+                                                                                  /*german*/ "Man erzählt sich, daß #unsichtbare Klingen# #[[1]]# bewachen würden.",
                                                                                   /*french*/ "Selon moi, les #faucheurs invisibles# du Temple de l'Ombre protègent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                // /*spanish*/ Según dicen, las #hojas invisibles# guardan #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST] = HintText(CustomMessage("They say that #invisible blades# guard #[[1]]#.",
-                                                                                    /*german*/ "",
+                                                                                    /*german*/ "Man erzählt sich, daß #unsichtbare Klingen# #[[1]]# bewachen würden.",
                                                                                     /*french*/ "Selon moi, les #faucheurs invisibles# du Temple de l'Ombre protègent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                  // /*spanish*/ Según dicen, las #hojas invisibles# guardan #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST] = HintText(CustomMessage("They say that #falling spikes# block the path to #[[1]]#.",
-                                                                              /*german*/ "",
+                                                                              /*german*/ "Man erzählt sich, daß #fallende Stacheln# den Pfad zu #[[1]]# blockieren würden.",
                                                                               /*french*/ "Selon moi, la #pluie de clous# surplombe #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                            // /*spanish*/ Según dicen, los #pinchos de un techo# conducen a #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST] = HintText(CustomMessage("They say that #falling spikes# block the path to #[[1]]#.",
-                                                                              /*german*/ "",
+                                                                              /*german*/ "Man erzählt sich, daß #fallende Stacheln# den Pfad zu #[[1]]# blockieren würden.",
                                                                               /*french*/ "Selon moi, la #pluie de clous# surplombe #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                            // /*spanish*/ Según dicen, los #pinchos de un techo# conducen a #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST] = HintText(CustomMessage("They say that #falling spikes# block the path to #[[1]]#.",
-                                                                               /*german*/ "",
+                                                                               /*german*/ "Man erzählt sich, daß #fallende Stacheln# den Pfad zu #[[1]]# blockieren würden.",
                                                                                /*french*/ "Selon moi, la #pluie de clous# surplombe #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                             // /*spanish*/ Según dicen, los #pinchos de un techo# conducen a #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST] = HintText(CustomMessage("They say that the #dead roam among invisible spikes# guarding #[[1]]#.",
-                                                                          /*german*/ "",
+                                                                          /*german*/ "Man erzählt sich, daß #herumschweifende Tote inmitten von unsichtbaren Stacheln# #[[1]]# bewachen würden.",
                                                                           /*french*/ "Selon moi, #parmi les clous invisibles# du Temple de l'Ombre se cache #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                        // /*spanish*/ Según dicen, los #muertos que vagan por pinchos invisibles# protegen #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_WIND_HINT_CHEST] = HintText(CustomMessage("They say that an #invisible chest guarded by the dead# holds #[[1]]#.",
-                                                                   /*german*/ "",
+                                                                   /*german*/ "Man erzählt sich, daß eine #von Toten bewachte unsichtbare Truhe# #[[1]]# enthielte.",
                                                                    /*french*/ "Selon moi, le #trésor invisible du cul-de-sac# du Temple de l'Ombre contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                 // /*spanish*/ Según dicen, un #cofre invisible custodiado por los del más allá# contiene #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST] = HintText(CustomMessage("They say that #mummies guarding a ferry# hide #[[1]]#.",
-                                                                          /*german*/ "",
+                                                                          /*german*/ "Man erzählt sich, daß #eine Fähre bewachende Mumien# #[[1]]# verstecken würden.",
                                                                           /*french*/ "Selon moi, les #Gibdos qui bloquent le traversier# cachent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                        // /*spanish*/ Según dicen, las #momias que protegen un navío# esconden #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST] = HintText(CustomMessage("They say that #mummies guarding a ferry# hide #[[1]]#.",
-                                                                           /*german*/ "",
+                                                                           /*german*/ "Man erzählt sich, daß #eine Fähre bewachende Mumien# #[[1]]# verstecken würden.",
                                                                            /*french*/ "Selon moi, les #Gibdos qui bloquent le traversier# cachent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                         // /*spanish*/ Según dicen, las #momias que protegen un navío# esconden #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST] = HintText(CustomMessage("They say that #walls consumed by a ball of fire# reveal #[[1]]#.",
-                                                                          /*german*/ "",
+                                                                          /*german*/ "Man erzählt sich, daß #von einem Feuerball verschlungende Wände# #[[1]]# offenbaren würden.",
                                                                           /*french*/ "Selon moi, le #piège de bois# du Temple de l'Ombre cache #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                        // /*spanish*/ Según dicen, las #paredes consumidas por una esfera ígnea# revelan #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_BOSS_KEY_CHEST] = HintText(CustomMessage("They say that #walls consumed by a ball of fire# reveal #[[1]]#.",
-                                                                  /*german*/ "",
+                                                                  /*german*/ "Man erzählt sich, daß #von einem Feuerball verschlungende Wände# #[[1]]# offenbaren würden.",
                                                                   /*french*/ "Selon moi, le #piège de bois# du Temple de l'Ombre cache #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                // /*spanish*/ Según dicen, las #paredes consumidas por una esfera ígnea# revelan #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_FREESTANDING_KEY] = HintText(CustomMessage("They say that #inside a burning skull# lies #[[1]]#.",
-                                                                    /*german*/ "",
+                                                                    /*german*/ "Man erzählt sich, daß #innerhalb eines brennenden Schädels# #[[1]]# läge.",
                                                                     /*french*/ "Selon moi, #dans un crâne enflammé# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                  // /*spanish*/ Según dicen, en el #interior de una calavera en llamas# aguarda #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_MQ_COMPASS_CHEST] = HintText(CustomMessage("They say that the #Eye of Truth# pierces a hall of faces to reveal #[[1]]#.",
-                                                                    /*german*/ "",
+                                                                    /*german*/ "Man erzählt sich, daß das #Auge der Wahrheit# eine Halle der Gesichter durchdränge und #[[1]]# offenbaren würde.",
                                                                     /*french*/ "Selon moi, l'#oeil de vérité# voit dans les couloirs du Temple de l'Ombre #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                  // /*spanish*/ Según dicen, el #Ojo de la Verdad# descubre un pasillo de facetas con #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST] = HintText(CustomMessage("They say that #Dead Hand in the Shadow Temple# holds #[[1]]#.",
-                                                                        /*german*/ "",
+                                                                        /*german*/ "Man erzählt sich, daß eine #tote Hand im Schattentempel# #[[1]]# hielte.",
                                                                         /*french*/ "Selon moi, le #Poigneur dans le Temple de l'Ombre# cache #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                      // /*spanish*/ Según dicen, la #Mano Muerta del Templo de las Sombras# guarda #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST] = HintText(CustomMessage("They say that #mummies revealed by the Eye of Truth# guard #[[1]]#.",
-                                                                         /*german*/ "",
+                                                                         /*german*/ "Man erzählt sich, daß #durch das Auge der Wahrheit offenbarte Mumien# #[[1]]# bewachen würden.",
                                                                          /*french*/ "Selon moi, les #Gibdos dans les couloirs# du Temple de l'Ombre protègent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                       // /*spanish*/ Según dicen, las #momias reveladas por el Ojo de la Verdad# guardan #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_MQ_MAP_CHEST] = HintText(CustomMessage("They say that #spinning scythes# protect #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß #rotierende Sensen# #[[1]]# bewachen würden.",
                                                                 /*french*/ "Selon moi, les #faucheurs danseurs# du Temple de l'Ombre protègent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/ Según dicen, las #giratorias guadañas# protegen #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST] = HintText(CustomMessage("They say that #collecting rupees in a vast cavern# with the Shadow Temple unveils #[[1]]#.",
-                                                                                 /*german*/ "",
+                                                                                 /*german*/ "Man erzählt sich, daß das #Sammeln von Rubinen in einer riesigen Kaverne# im Schattentempel #[[1]]# offenbaren würde.",
                                                                                  /*french*/ "Selon moi, les #pièces argentées dans le Temple de l'Ombre# révèlent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                               // /*spanish*/ Según dicen, hacerte con las #rupias en una gran caverna# del Templo de las Sombras revela #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST] = HintText(CustomMessage("They say that #falling spikes# block the path to #[[1]]#.",
-                                                                                  /*german*/ "",
+                                                                                  /*german*/ "Man erzählt sich, daß #fallende Stachel# den Pfad zu #[[1]]# blockieren würden.",
                                                                                   /*french*/ "Selon moi, la #pluie de clous# surplombe #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                // /*spanish*/ Según dicen, los #pinchos de un techo# conducen a #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST] = HintText(CustomMessage("They say that #falling spikes# block the path to #[[1]]#.",
-                                                                                 /*german*/ "",
+                                                                                 /*german*/ "Man erzählt sich, daß #fallende Stachel# den Pfad zu #[[1]]# blockieren würden.",
                                                                                  /*french*/ "Selon moi, la #pluie de clous# surplombe #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                               // /*spanish*/ Según dicen, los #pinchos de un techo# conducen a #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST] = HintText(CustomMessage("They say that #falling spikes# block the path to #[[1]]#.",
-                                                                                 /*german*/ "",
+                                                                                 /*german*/ "Man erzählt sich, daß #fallende Stachel# den Pfad zu #[[1]]# blockieren würden.",
                                                                                  /*french*/ "Selon moi, la #pluie de clous# surplombe #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                               // /*spanish*/ Según dicen, los #pinchos de un techo# conducen a #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST] = HintText(CustomMessage("They say that the #dead roam among invisible spikes# guarding #[[1]]#.",
-                                                                             /*german*/ "",
+                                                                             /*german*/ "Man erzählt sich, daß #herumschweifende Tote inmitten von unsichtbaren Stacheln# #[[1]]# bewachen würden.",
                                                                              /*french*/ "Selon moi, #parmi les clous invisibles# du Temple de l'Ombre se cache #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                           // /*spanish*/ Según dicen, los #muertos que vagan por pinchos invisibles# protegen #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST] = HintText(CustomMessage("They say that #walls consumed by a ball of fire# reveal #[[1]]#.",
-                                                                     /*german*/ "",
+                                                                     /*german*/ "Man erzählt sich, daß #von einem Feuerball verschlungende Wände# #[[1]]# offenbaren würden.",
                                                                      /*french*/ "Selon moi, le #piège de bois# du Temple de l'Ombre cache #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                   // /*spanish*/ Según dicen, las #paredes consumidas por una esfera ígnea# revelan #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST] = HintText(CustomMessage("They say that #walls consumed by a ball of fire# reveal #[[1]]#.",
-                                                                             /*german*/ "",
+                                                                             /*german*/ "Man erzählt sich, daß #von einem Feuerball verschlungende Wände# #[[1]]# offenbaren würden.",
                                                                              /*french*/ "Selon moi, le #piège de bois# du Temple de l'Ombre cache #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                           // /*spanish*/ Según dicen, las #paredes consumidas por una esfera ígnea# revelan #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST] = HintText(CustomMessage("They say that near an #empty pedestal# within the Shadow Temple lies #[[1]]#.",
-                                                                         /*german*/ "",
+                                                                         /*german*/ "Man erzählt sich, daß nahe einem #leeren Sockel# im Schattentempel #[[1]]# läge.",
                                                                          /*french*/ "Selon moi, #près d'un pédestal vide du Temple de l'Ombre# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                       // /*spanish*/ Según dicen, cerca de un #vacío pedestal# del Templo de las Sombras yace #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST] = HintText(CustomMessage("They say that #invisible blades# guard #[[1]]#.",
-                                                                                       /*german*/ "",
+                                                                                       /*german*/ "Man erzählt sich, daß #unsichtbare Klingen# #[[1]]# bewachen würden.",
                                                                                        /*french*/ "Selon moi, les #faucheurs invisibles# du Temple de l'Ombre protègent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                     // /*spanish*/ Según dicen, unas #hojas invisibles# guardan #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST] = HintText(CustomMessage("They say that #invisible blades# guard #[[1]]#.",
-                                                                                     /*german*/ "",
+                                                                                     /*german*/ "Man erzählt sich, daß #unsichtbare Klingen# #[[1]]# bewachen würden.",
                                                                                      /*french*/ "Selon moi, les #faucheurs invisibles# du Temple de l'Ombre protègent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                   // /*spanish*/ Según dicen, unas #hojas invisibles# guardan #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_MQ_WIND_HINT_CHEST] = HintText(CustomMessage("They say that an #invisible chest guarded by the dead# holds #[[1]]#.",
-                                                                      /*german*/ "",
+                                                                      /*german*/ "Man erzählt sich, daß eine #von Toten bewachte unsichtbare Truhe# #[[1]]# enthielte.",
                                                                       /*french*/ "Selon moi, le #trésor invisible du cul-de-sac# du Temple de l'Ombre contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                    // /*spanish*/ Según dicen, un #cofre invisible custodiado por los del más allá# contiene #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST] = HintText(CustomMessage("They say that #mummies guarding a ferry# hide #[[1]]#.",
-                                                                              /*german*/ "",
+                                                                              /*german*/ "Man erzählt sich, daß #eine Fähre bewachende Mumien# #[[1]]# verstecken würden.",
                                                                               /*french*/ "Selon moi, les #Gibdos qui bloquent le traversier# cachent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                            // /*spanish*/ Según dicen, las #momias que protegen un navío# esconden #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST] = HintText(CustomMessage("They say that #mummies guarding a ferry# hide #[[1]]#.",
-                                                                             /*german*/ "",
+                                                                             /*german*/ "Man erzählt sich, daß #eine Fähre bewachende Mumien# #[[1]]# verstecken würden.",
                                                                              /*french*/ "Selon moi, les #Gibdos qui bloquent le traversier# cachent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                           // /*spanish*/ Según dicen, las #momias que protegen un navío# esconden #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST] = HintText(CustomMessage("They say that #caged near a ship# lies #[[1]]#.",
-                                                                                /*german*/ "",
+                                                                                /*german*/ "Man erzählt sich, daß #in der Nähe eines Schiffes eingesperrt# #[[1]]# läge.",
                                                                                 /*french*/ "Selon moi, #dans une cage près du traversier# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                              // /*spanish*/ Según dicen, #entre rejas al lado de un navío# yace #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_MQ_FREESTANDING_KEY] = HintText(CustomMessage("They say that #behind three burning skulls# lies #[[1]]#.",
-                                                                       /*german*/ "",
+                                                                       /*german*/ "Man erzählt sich, daß #hinter drei brennenden Schädeln# #[[1]]# läge.",
                                                                        /*french*/ "Selon moi, #derrière trois crânes enflammés# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                     // /*spanish*/ Según dicen, tras #tres ardientes calaveras# yace #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_BONGO_BONGO_HEART] = HintText(CustomMessage("They say that #Bongo Bongo# holds #[[1]]#.",
-                                                                     /*german*/ "",
+                                                                     /*german*/ "Man erzählt sich, daß #Bongo Bongo# #[[1]]# besäße.",
                                                                      /*french*/ "Selon moi, #Bongo Bongo# possède #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                   // /*spanish*/ Según dicen, #Bongo Bongo# porta #[[1]]#.
                                                                   {}, {
                                                                   CustomMessage("They say that the #Phantom Shadow Beast# holds #[[1]]#.",
-                                                                      /*german*/ "",
+                                                                      /*german*/ "Man erzählt sich, daß das #Phantomschattenbiest# #[[1]]# besäße.",
                                                                       /*french*/ "Selon moi, le #monstre de l'ombre# possède #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                    // /*spanish*/ Según dicen, la #alimaña oscura espectral# porta #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_GS_SINGLE_GIANT_POT] = HintText(CustomMessage("They say that #beyond a burning skull# lies a spider with #[[1]]#.",
-                                                                       /*german*/ "",
+                                                                       /*german*/ "Man erzählt sich, daß #jenseits eines brennenden Schädels# eine Spinne läge, welche #[[1]]# besäße.",
                                                                        /*french*/ "Selon moi, une #Skulltula derrière un crâne enflammé du Temple de l'Ombre# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                     // /*spanish*/ Según dicen, #tras una ardiente calavera# yace una Skulltula que otorga #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM] = HintText(CustomMessage("They say that a #spider beyond falling spikes# holds #[[1]]#.",
-                                                                          /*german*/ "",
+                                                                          /*german*/ "Man erzählt sich, daß eine #Spinne jenseits fallender Stacheln# #[[1]]# besäße.",
                                                                           /*french*/ "Selon moi, une #Skulltula au delà de la pluie de clous du Temple de l'Ombre# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                        // /*spanish*/ Según dicen, una #Skulltula tras los pinchos del techo# otorga #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT] = HintText(CustomMessage("They say that #beyond three burning skulls# lies a spider with #[[1]]#.",
-                                                                       /*german*/ "",
+                                                                       /*german*/ "Man erzählt sich, daß #jenseits drei brennender Schädel# eine Spinne läge, welche #[[1]]# besäße.",
                                                                        /*french*/ "Selon moi, une #Skulltula derrière trois crânes enflammés du Temple de l'Ombre# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                     // /*spanish*/ Según dicen, #tras tres ardientes calaveras# yace una Skulltula que otorga #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM] = HintText(CustomMessage("They say that a spider guarded by #invisible blades# holds #[[1]]#.",
-                                                                     /*german*/ "",
+                                                                     /*german*/ "Man erzählt sich, daß eine Spinne von #unsichtbaren Klingen# bewacht werde und #[[1]]# besäße.",
                                                                      /*french*/ "Selon moi, une #Skulltula protégée par les faucheurs invisibles du Temple de l'Ombre# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                   // /*spanish*/ Según dicen, una #Skulltula custodiada por hojas invisibles# otorga #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_GS_NEAR_SHIP] = HintText(CustomMessage("They say that a spider near a #docked ship# hoards #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß eine Spinne nahe eines #geankerten Schiffs# #[[1]]# horte.",
                                                                 /*french*/ "Selon moi, une #Skulltula près du traversier du Temple de l'Ombre# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/ Según dicen, una #Skulltula cercana a un navío# otorga #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM] = HintText(CustomMessage("They say that a #spider beyond falling spikes# holds #[[1]]#.",
-                                                                             /*german*/ "",
+                                                                             /*german*/ "Man erzählt sich, daß eine #Spinne jenseits fallender Stacheln# #[[1]]# besäße.",
                                                                              /*french*/ "Selon moi, une #Skulltula au delà de la pluie de clous du Temple de l'Ombre# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                           // /*spanish*/ Según dicen, una #Skulltula tras los pinchos del techo# otorga #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM] = HintText(CustomMessage("They say that a #spider amidst roaring winds# in the Shadow Temple holds #[[1]]#.",
-                                                                        /*german*/ "",
+                                                                        /*german*/ "Man erzählt sich, daß eine #Spinne inmitten stürmischer Winde# im Schattentempel #[[1]]# besäße.",
                                                                         /*french*/ "Selon moi, une #Skulltula près des vents du Temple de l'Ombre# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                      // /*spanish*/ Según dicen, una #Skulltula entre ventarrones# del Templo de las Sombras otorga #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_MQ_GS_AFTER_WIND] = HintText(CustomMessage("They say that a #spider beneath gruesome debris# in the Shadow Temple hides #[[1]]#.",
-                                                                    /*german*/ "",
+                                                                    /*german*/ "Man erzählt sich, daß eine #Spinne unterhalb grauenvoller Trümmer# im Schattentempel #[[1]]# verstecke.",
                                                                     /*french*/ "Selon moi, une #Skulltula sous des débris du Temple de l'Ombre# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                  // /*spanish*/ Según dicen, una #Skulltula bajo unos horripilantes escombros# del Templo de las Sombras otorga #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_MQ_GS_AFTER_SHIP] = HintText(CustomMessage("They say that a #fallen statue# reveals a spider with #[[1]]#.",
-                                                                    /*german*/ "",
+                                                                    /*german*/ "Man erzählt sich, daß eine #fallende Statue# eine Spinne enthülle, welche #[[1]]# besäße.",
                                                                     /*french*/ "Selon moi, une #Skulltula près de la statue écroulée du Temple de l'Ombre# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                  // /*spanish*/ Según dicen, una #estatua caída# revelará una Skulltula que otorgue #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS] = HintText(CustomMessage("They say that a #suspended spider# guards #[[1]]#.",
-                                                                   /*german*/ "",
+                                                                   /*german*/ "Man erzählt sich, daß eine #hängende Spinne# #[[1]]# bewache.",
                                                                    /*french*/ "Selon moi, une #Skulltula près du repère du Temple de l'Ombre# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                 // /*spanish*/ Según dicen, una #Skulltula flotante# del Templo de las Sombras otorga #[[1]]#.
 
@@ -1438,117 +1438,117 @@ hintTextTable[RHT_SHADOW_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say th
   |    BOTTOM OF THE WELL    |
   ---------------------------*/
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST] = HintText(CustomMessage("They say that the #Eye of Truth in the well# reveals #[[1]]#.",
-                                                                                   /*german*/ "",
+                                                                                   /*german*/ "Man erzählt sich, daß das #Auge der Wahrheit im Brunnen# #[[1]]# offenbare.",
                                                                                    /*french*/ "Selon moi, l'#oeil de vérité dans le Puits# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                 // /*spanish*/ Según dicen, el #Ojo de la Verdad en el pozo# revela #[[1]]#.
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST] = HintText(CustomMessage("They say that #gruesome debris# in the well hides #[[1]]#.",
-                                                                                    /*german*/ "",
+                                                                                    /*german*/ "Man erzählt sich, daß #grauenvolle Trümmer# im Brunnen #[[1]]# verbergen würden.",
                                                                                     /*french*/ "Selon moi, des #débris dans le Puits# cachent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                  // /*spanish*/ Según dicen, unos #horripilantes escombros# del pozo esconden #[[1]]#.
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST] = HintText(CustomMessage("They say that the #Eye of Truth in the well# reveals #[[1]]#.",
-                                                                                     /*german*/ "",
+                                                                                     /*german*/ "Man erzählt sich, daß das #Auge der Wahrheit im Brunnen# #[[1]]# offenbare.",
                                                                                      /*french*/ "Selon moi, l'#oeil de vérité dans le Puits# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                   // /*spanish*/ Según dicen, el #Ojo de la Verdad en el pozo# revela #[[1]]#.
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_COMPASS_CHEST] = HintText(CustomMessage("They say that a #hidden entrance to a cage# in the well leads to #[[1]]#.",
-                                                                      /*german*/ "",
+                                                                      /*german*/ "Man erzählt sich, daß ein #verborgener Eingang zu einem Käfig# im Brunnen zu #[[1]]# führe.",
                                                                       /*french*/ "Selon moi, dans un #chemin caché dans le Puits# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                    // /*spanish*/ Según dicen, la #entrada oculta de una celda# del pozo conduce a #[[1]]#.
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST] = HintText(CustomMessage("They say that a #spider guarding a cage# in the well protects #[[1]]#.",
-                                                                               /*german*/ "",
+                                                                               /*german*/ "Man erzählt sich, daß eine #einen Käfig schützende Spinne# im Brunnen #[[1]]# schütze.",
                                                                                /*french*/ "Selon moi, l'#araignée dans la cage du Puits# protège #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                             // /*spanish*/ Según dicen, una #araña protegiendo una celda# del pozo guarda #[[1]]#.
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST] = HintText(CustomMessage("They say that #gruesome debris# in the well hides #[[1]]#.",
-                                                                                 /*german*/ "",
+                                                                                 /*german*/ "Man erzählt sich, daß #grauenvolle Trümmer# im Brunnen #[[1]]# verbergen würde.",
                                                                                  /*french*/ "Selon moi, des #débris dans le Puits# cachent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                               // /*spanish*/ Según dicen, unos #horripilantes escombros# del pozo esconden #[[1]]#.
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST] = HintText(CustomMessage("They say that #Dead Hand's invisible secret# is #[[1]]#.",
-                                                                        /*german*/ "",
+                                                                        /*german*/ "Man erzählt sich, daß das #unsichtbare Geheimnis der toten Hand# #[[1]]# sei.",
                                                                         /*french*/ "Selon moi, le #trésor invisible du Poigneur# est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                      // /*spanish*/ Según dicen, el #secreto invisible de la Mano Muerta# esconde #[[1]]#.
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST] = HintText(CustomMessage("They say that a #royal melody in the well# uncovers #[[1]]#.",
-                                                                               /*german*/ "",
+                                                                               /*german*/ "Man erzählt sich, daß eine #königliche Melodie im Brunnen# #[[1]]# enthüllen würde.",
                                                                                /*french*/ "Selon moi, la #mélodie royale révèle dans le Puits# #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                             // /*spanish*/ Según dicen, una #melodía real en el pozo# revela #[[1]]#.
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST] = HintText(CustomMessage("They say that a #royal melody in the well# uncovers #[[1]]#.",
-                                                                              /*german*/ "",
+                                                                              /*german*/ "Man erzählt sich, daß eine #königliche Melodie im Brunnen# #[[1]]# enthüllen würde.",
                                                                               /*french*/ "Selon moi, la #mélodie royale révèle dans le Puits# #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                            // /*spanish*/ Según dicen, una #melodía real en el pozo# revela #[[1]]#.
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_MAP_CHEST] = HintText(CustomMessage("They say that in the #depths of the well# lies #[[1]]#.",
-                                                                  /*german*/ "",
+                                                                  /*german*/ "Man erzählt sich, daß in den #Tiefen des Brunnens# #[[1]]# läge.",
                                                                   /*french*/ "Selon moi, #dans le coeur du Puits# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                // /*spanish*/ Según dicen, en las #profundidades del pozo# yace #[[1]]#.
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST] = HintText(CustomMessage("They say that #perilous pits# in the well guard the path to #[[1]]#.",
-                                                                         /*german*/ "",
+                                                                         /*german*/ "Man erzählt sich, daß #gefährliche Gruben# im Brunnen den Pfad zu #[[1]]# bewachen würden.",
                                                                          /*french*/ "Selon moi, #trois trous# dans le Puits protègent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                       // /*spanish*/ Según dicen, #peligrosos fosos# del pozo conducen a #[[1]]#.
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST] = HintText(CustomMessage("They say that #locked in a cage# in the well lies #[[1]]#.",
-                                                                        /*german*/ "",
+                                                                        /*german*/ "Man erzählt sich, daß #in einem Käfig eingeschlossen# im Brunnen #[[1]]# läge.",
                                                                         /*french*/ "Selon moi, #dans une cage# du Puits gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                      // /*spanish*/ Según dicen, #entre rejas# en el pozo yace #[[1]]#.
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_FREESTANDING_KEY] = HintText(CustomMessage("They say that #inside a coffin# hides #[[1]]#.",
-                                                                         /*german*/ "",
+                                                                         /*german*/ "Man erzählt sich, daß #in einem Sarg# #[[1]]# verborgen läge.",
                                                                          /*french*/ "Selon moi, dans #un cercueil# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                       // /*spanish*/ Según dicen, en el #interior de un ataúd# yace #[[1]]#.
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_MQ_MAP_CHEST] = HintText(CustomMessage("They say that a #royal melody in the well# uncovers #[[1]]#.",
-                                                                     /*german*/ "",
+                                                                     /*german*/ "Man erzählt sich, daß eine #königliche Melodie im Brunnen# #[[1]]# enthüllen würde.",
                                                                      /*french*/ "Selon moi, la #mélodie royale révèle dans le Puits# #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                   // /*spanish*/ Según dicen, una #melodía real en el pozo# revela #[[1]]#.
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST] = HintText(CustomMessage("They say that an #army of the dead# in the well guards #[[1]]#.",
-                                                                               /*german*/ "",
+                                                                               /*german*/ "Man erzählt sich, daß eine #Armee der Toten# im Brunnen #[[1]]# bewachen würde.",
                                                                                /*french*/ "Selon moi, l'#armée des morts# dans le Puits protège #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                             // /*spanish*/ Según dicen, un #ejército del más allá# del pozo guarda #[[1]]#.
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY] = HintText(CustomMessage("They say that #Dead Hand's explosive secret# is #[[1]]#.",
-                                                                                      /*german*/ "",
+                                                                                      /*german*/ "Man erzählt sich, daß das #explosive Geheimnis der toten Hand# #[[1]]# sei.",
                                                                                       /*french*/ "Selon moi, le #secret explosif du Poigneur# est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                    // /*spanish*/ Según dicen, el #explosivo secreto de la Mano Muerta# esconde #[[1]]#.
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY] = HintText(CustomMessage("They say that an #invisible path in the well# leads to #[[1]]#.",
-                                                                                            /*german*/ "",
+                                                                                            /*german*/ "Man erzählt sich, daß ein #unsichtbarer Pfad im Brunnen# zu #[[1]]# führe.",
                                                                                             /*french*/ "Selon moi, dans un #chemin caché dans le Puits# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                          // /*spanish*/ Según dicen, un #camino invisible del pozo# conduce a #[[1]]#.
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE] = HintText(CustomMessage("They say that a #spider locked in a cage# in the well holds #[[1]]#.",
-                                                                          /*german*/ "",
+                                                                          /*german*/ "Man erzählt sich, daß eine #in einem Käfig eingeschlossene Spinne# im Brunnen #[[1]]# besäße.",
                                                                           /*french*/ "Selon moi, une #Skulltula dans une cage au fonds du Puits# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                        // /*spanish*/ Según dicen, una #Skulltula enjaulada# del pozo otorga #[[1]]#.
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM] = HintText(CustomMessage("They say that an #invisible path in the well# leads to #[[1]]#.",
-                                                                           /*german*/ "",
+                                                                           /*german*/ "Man erzählt sich, daß ein #unsichtbarer Pfad im Brunnen# zu #[[1]]# führe.",
                                                                            /*french*/ "Selon moi, une #Skulltula dans le chemin invisible au fonds du Puits# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                         // /*spanish*/ Según dicen, un #camino invisible del pozo# conduce a una Skulltula que otorga #[[1]]#.
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM] = HintText(CustomMessage("They say that a #spider locked in a crypt# within the well guards #[[1]]#.",
-                                                                           /*german*/ "",
+                                                                           /*german*/ "Man erzählt sich, daß eine #in einer Krypta eingeschlossene Spinne# im Brunnen #[[1]]# bewache.",
                                                                            /*french*/ "Selon moi, une #Skulltula embarrée dans la crypte au fonds du Puits# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                         // /*spanish*/ Según dicen, una #Skulltula encerrada en una cripta# del pozo otorga #[[1]]#.
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT] = HintText(CustomMessage("They say that a #gauntlet of invisible spiders# protects #[[1]]#.",
-                                                                       /*german*/ "",
+                                                                       /*german*/ "Man erzählt sich, daß eine #Herausforderung unsichtbarer Spinnen# #[[1]]# bewache.",
                                                                        /*french*/ "Selon moi, une #Skulltula protégée par les araignées invisibles au fonds du Puits# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                     // /*spanish*/ Según dicen, unas #arañas invisibles# custodian una Skulltula que otorga #[[1]]#.
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM] = HintText(CustomMessage("They say that a #spider crawling near the dead# in the well holds #[[1]]#.",
-                                                                          /*german*/ "",
+                                                                          /*german*/ "Man erzählt sich, daß eine #nahe der Toten kriechende Spinne# im Brunnen #[[1]]# besäße.",
                                                                           /*french*/ "Selon moi, une #Skulltula près des cercueils au fonds du Puits# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                        // /*spanish*/ Según dicen, una #Skulltula junto a los muertos# del pozo otorga #[[1]]#.
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM] = HintText(CustomMessage("They say that a #spider locked in a crypt# within the well guards #[[1]]#.",
-                                                                              /*german*/ "",
+                                                                              /*german*/ "Man erzählt sich, daß eine #in einer Krypta eingeschlossene Spinne# im Brunnen #[[1]]# bewache.",
                                                                               /*french*/ "Selon moi, une #Skulltula embarrée dans la crypte au fonds du Puits# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                            // /*spanish*/ Según dicen, una #Skulltula encerrada en una cripta# del pozo otorga #[[1]]#.
 
@@ -1556,72 +1556,72 @@ hintTextTable[RHT_SHADOW_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say th
   |        ICE CAVERN        |
   ---------------------------*/
     hintTextTable[RHT_ICE_CAVERN_MAP_CHEST] = HintText(CustomMessage("They say that #winds of ice# surround #[[1]]#.",
-                                                          /*german*/ "",
+                                                          /*german*/ "Man erzählt sich, daß #Eiswinde# #[[1]]# umgeben würden.",
                                                           /*french*/ "Selon moi, #figé dans la glace rouge# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                        // /*spanish*/ Según dicen, #heladas borrascas# rodean #[[1]]#.
 
     hintTextTable[RHT_ICE_CAVERN_COMPASS_CHEST] = HintText(CustomMessage("They say that a #wall of ice# protects #[[1]]#.",
-                                                              /*german*/ "",
+                                                              /*german*/ "Man erzählt sich, daß eine #Eiswand# #[[1]]# schütze.",
                                                               /*french*/ "Selon moi, #un mur de glace rouge# cache #[[1]]#.", {QM_RED, QM_GREEN}));
                                                            // /*spanish*/ Según dicen, una #gélida pared# protege #[[1]]#.
 
     hintTextTable[RHT_ICE_CAVERN_IRON_BOOTS_CHEST] = HintText(CustomMessage("They say that a #monster in a frozen cavern# guards #[[1]]#.",
-                                                                 /*german*/ "",
+                                                                 /*german*/ "Man erzählt sich, daß ein #Monster in einer gefrorenen Kaverne# #[[1]]# bewache.",
                                                                  /*french*/ "Selon moi, le #monstre de la caverne de glace# protège #[[1]]#.", {QM_RED, QM_GREEN}));
                                                               // /*spanish*/ Según dicen, un #monstruo de una helada caverna# guarda #[[1]]#.
 
     hintTextTable[RHT_ICE_CAVERN_FREESTANDING_POH] = HintText(CustomMessage("They say that a #wall of ice# protects #[[1]]#.",
-                                                                 /*german*/ "",
+                                                                 /*german*/ "Man erzählt sich, daß eine #Eiswand# #[[1]]# schütze.",
                                                                  /*french*/ "Selon moi, un #mur de glace rouge# cache #[[1]]#.", {QM_RED, QM_GREEN}));
                                                               // /*spanish*/ Según dicen, una #gélida pared# protege #[[1]]#.
 
     hintTextTable[RHT_ICE_CAVERN_MQ_IRON_BOOTS_CHEST] = HintText(CustomMessage("They say that a #monster in a frozen cavern# guards #[[1]]#.",
-                                                                    /*german*/ "",
+                                                                    /*german*/ "Man erzählt sich, daß ein #Monster in einer gefrorenen Kaverne# #[[1]]# bewache.",
                                                                     /*french*/ "Selon moi, le #monstre de la caverne de glace# protège #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                  // /*spanish*/ Según dicen, un #monstruo de una helada caverna# guarda #[[1]]#.
 
     hintTextTable[RHT_ICE_CAVERN_MQ_COMPASS_CHEST] = HintText(CustomMessage("They say that #winds of ice# surround #[[1]]#.",
-                                                                 /*german*/ "",
+                                                                 /*german*/ "Man erzählt sich, daß #Eiswinde# #[[1]]# umgeben würden.",
                                                                  /*french*/ "Selon moi, #entouré de vent glacial# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                               // /*spanish*/ Según dicen, #heladas borrascas# rodean #[[1]]#.
 
     hintTextTable[RHT_ICE_CAVERN_MQ_MAP_CHEST] = HintText(CustomMessage("They say that a #wall of ice# protects #[[1]]#.",
-                                                             /*german*/ "",
+                                                             /*german*/ "Man erzählt sich, daß eine #Eiswand# #[[1]]# schütze.",
                                                              /*french*/ "Selon moi, #un mur de glace rouge# cache #[[1]]#.", {QM_RED, QM_GREEN}));
                                                           // /*spanish*/ Según dicen, una #gélida pared# protege #[[1]]#.
 
     hintTextTable[RHT_ICE_CAVERN_MQ_FREESTANDING_POH] = HintText(CustomMessage("They say that #winds of ice# surround #[[1]]#.",
-                                                                    /*german*/ "",
+                                                                    /*german*/ "Man erzählt sich, daß #Eiswinde# #[[1]]# umgeben würden.",
                                                                     /*french*/ "Selon moi, #entouré de vent glacial# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                  // /*spanish*/ Según dicen, #heladas borrascas# rodean #[[1]]#.
 
     hintTextTable[RHT_ICE_CAVERN_GS_PUSH_BLOCK_ROOM] = HintText(CustomMessage("They say that a #spider above icy pits# holds #[[1]]#.",
-                                                                   /*german*/ "",
+                                                                   /*german*/ "Man erzählt sich, daß eine #Spinne oberhalb eisiger Gruben# #[[1]]# besäße.",
                                                                    /*french*/ "Selon moi, une #Skulltula au dessus d'un goufre glacial# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                 // /*spanish*/ Según dicen, una #Skulltula sobre gélidos vacíos# otorga #[[1]]#.
 
     hintTextTable[RHT_ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM] = HintText(CustomMessage("They say that #spinning ice# guards a spider holding #[[1]]#.",
-                                                                        /*german*/ "",
+                                                                        /*german*/ "Man erzählt sich, daß #rotierendes Eis# eine Spinne beschütze, welche #[[1]]# besäße.",
                                                                         /*french*/ "Selon moi, une #Skulltula près de deux lames de glace# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                      // /*spanish*/ Según dicen, unos #témpanos giratorios# custodian una Skulltula que otorga #[[1]]#.
 
     hintTextTable[RHT_ICE_CAVERN_GS_HEART_PIECE_ROOM] = HintText(CustomMessage("They say that a #spider behind a wall of ice# hides #[[1]]#.",
-                                                                    /*german*/ "",
+                                                                    /*german*/ "Man erzählt sich, daß eine #Spinne hinter einer Eiswand# #[[1]]# verstecke.",
                                                                     /*french*/ "Selon moi, une #Skulltula derrière un mur de glace# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                  // /*spanish*/ Según dicen, una #Skulltula tras una gélida pared# otorga #[[1]]#.
 
     hintTextTable[RHT_ICE_CAVERN_MQ_GS_SCARECROW] = HintText(CustomMessage("They say that a #spider above icy pits# holds #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß eine #Spinne oberhalb eisiger Gruben# #[[1]]# besäße.",
                                                                 /*french*/ "Selon moi, une #Skulltula au dessus d'un goufre glacial# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/ Según dicen, una #Skulltula sobre gélidos vacíos# otorga #[[1]]#.
 
     hintTextTable[RHT_ICE_CAVERN_MQ_GS_ICE_BLOCK] = HintText(CustomMessage("They say that a #web of ice# surrounds a spider with #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß eine #Webe aus Eis# eine Spinne umgebe, welche #[[1]]# besäße.",
                                                                 /*french*/ "Selon moi, une #Skulltula protégée d'une toile glacée# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/ Según dicen, una #gélida red# rodea a una Skulltula que otorga #[[1]]#.
 
     hintTextTable[RHT_ICE_CAVERN_MQ_GS_RED_ICE] = HintText(CustomMessage("They say that a #spider in fiery ice# hoards #[[1]]#.",
-                                                              /*german*/ "",
+                                                              /*german*/ "Man erzählt sich, daß eine #Spinne in feurigem Eis# #[[1]]# horte.",
                                                               /*french*/ "Selon moi, une #Skulltula figée dans la glace rouge# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                            // /*spanish*/ Según dicen, una #Skulltula tras un ardiente hielo# otorga #[[1]]#.
 
@@ -1629,177 +1629,177 @@ hintTextTable[RHT_SHADOW_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say th
   | GERUDO TRAINING GROUNDS  |
   ---------------------------*/
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST] = HintText(CustomMessage("They say that a #blinded eye in the Gerudo Training Grounds# drops #[[1]]#.",
-                                                                             /*german*/ "",
+                                                                             /*german*/ "Man erzählt sich, daß ein #erblindetes Auge in der Gerudo-Trainingsarena# #[[1]]# fallen ließe.",
                                                                              /*french*/ "Selon moi, l'#Oeil dans le Gymnase Gerudo# voit #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                           // /*spanish*/ Según dicen, #cegar un ojo en el Centro de Instrucción Gerudo# revela #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST] = HintText(CustomMessage("They say that a #blinded eye in the Gerudo Training Grounds# drops #[[1]]#.",
-                                                                              /*german*/ "",
+                                                                              /*german*/ "Man erzählt sich, daß ein #erblindetes Auge in der Gerudo-Trainingsarena# #[[1]]# fallen ließe.",
                                                                               /*french*/ "Selon moi, l'#Oeil dans le Gymnase Gerudo# voit #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                            // /*spanish*/ Según dicen, #cegar un ojo en el Centro de Instrucción Gerudo# revela #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_STALFOS_CHEST] = HintText(CustomMessage("They say that #soldiers walking on shifting sands# in the Gerudo Training Grounds guard #[[1]]#.",
-                                                                          /*german*/ "",
+                                                                          /*german*/ "Man erzählt sich, daß #auf veränderlichen Sanden laufende Soldaten# in der Gerudo-Trainingsarena #[[1]]# bewachen würden.",
                                                                           /*french*/ "Selon moi, les #squelettes# du Gymnase Gerudo protègent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                        // /*spanish*/ Según dicen, #soldados en resbaladizas arenas# del Centro de Instrucción Gerudo protegen #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_BEAMOS_CHEST] = HintText(CustomMessage("They say that #reptilian warriors# in the Gerudo Training Grounds protect #[[1]]#.",
-                                                                         /*german*/ "",
+                                                                         /*german*/ "Man erzählt sich, daß #reptilienartige Krieger# in der Gerudo-Trainingsarena #[[1]]# schützen würden.",
                                                                          /*french*/ "Selon moi, les #lézards# dans le Gymnase Gerudo protègent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                       // /*spanish*/ Según dicen, #unos escamosos guerreros# del Centro de Instrucción Gerudo protegen #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST] = HintText(CustomMessage("They say that the #Eye of Truth# in the Gerudo Training Grounds reveals #[[1]]#.",
-                                                                                 /*german*/ "",
+                                                                                 /*german*/ "Man erzählt sich, daß das #Auge der Wahrheit# in der Gerudo-Trainingsarena #[[1]]# enthülle.",
                                                                                  /*french*/ "Selon moi, #bien caché# dans le Gymnase Gerudo gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                               // /*spanish*/ Según dicen, el #Ojo de la Verdad# en el Centro de Instrucción Gerudo revela #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST] = HintText(CustomMessage("They say that the first prize of #the thieves' training# is #[[1]]#.",
-                                                                                  /*german*/ "",
+                                                                                  /*german*/ "Man erzählt sich, daß der erste Preis des #Diebestrainings# #[[1]]# sei.",
                                                                                   /*french*/ "Selon moi, le #premier trésor du Gymnase Gerudo# est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                // /*spanish*/ Según dicen, el primer premio de la #instrucción bandida# se trata de #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_SECOND_CHEST] = HintText(CustomMessage("They say that the second prize of #the thieves' training# is #[[1]]#.",
-                                                                                   /*german*/ "",
+                                                                                   /*german*/ "Man erzählt sich, daß der zweite Preis des #Diebestrainings# #[[1]]# sei.",
                                                                                    /*french*/ "Selon moi, le #deuxième trésor du Gymnase Gerudo# est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                 // /*spanish*/ Según dicen, el segundo premio de la #instrucción bandida# se trata de #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_THIRD_CHEST] = HintText(CustomMessage("They say that the third prize of #the thieves' training# is #[[1]]#.",
-                                                                                  /*german*/ "",
+                                                                                  /*german*/ "Man erzählt sich, daß der dritte Preis des #Diebestrainings# #[[1]]# sei.",
                                                                                   /*french*/ "Selon moi, le #troisième trésor du Gymnase Gerudo# est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                // /*spanish*/ Según dicen, el tercer premio de la #instrucción bandida# se trata de #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_MAZE_RIGHT_CENTRAL_CHEST] = HintText(CustomMessage("They say that the #Song of Time# in the Gerudo Training Grounds leads to #[[1]]#.",
-                                                                                     /*german*/ "",
+                                                                                     /*german*/ "Man erzählt sich, daß die #Hymne der Zeit# in der Gerudo-Trainingsarena zu #[[1]]# führe.",
                                                                                      /*french*/ "Selon moi, le #chant du temps# révèle dans le Gymnase Gerudo #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                   // /*spanish*/ Según dicen, la #Canción del Tiempo# en el Centro de Instrucción Gerudo conduce a #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_MAZE_RIGHT_SIDE_CHEST] = HintText(CustomMessage("They say that the #Song of Time# in the Gerudo Training Grounds leads to #[[1]]#.",
-                                                                                  /*german*/ "",
+                                                                                  /*german*/ "Man erzählt sich, daß die #Hymne der Zeit# in der Gerudo-Trainingsarena zu #[[1]]# führe.",
                                                                                   /*french*/ "Selon moi, le #chant du temps# révèle dans le Gymnase Gerudo #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                // /*spanish*/ Según dicen, la #Canción del Tiempo# en el Centro de Instrucción Gerudo conduce a #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST] = HintText(CustomMessage("They say that #fiery foes# in the Gerudo Training Grounds guard #[[1]]#.",
-                                                                                    /*german*/ "",
+                                                                                    /*german*/ "Man erzählt sich, daß #feurige Feinde# in der Gerudo-Trainingsarena #[[1]]# bewachen würden.",
                                                                                     /*french*/ "Selon moi, les #limaces de feu# du Gymnase Gerudo protègent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                  // /*spanish*/ Según dicen, unos #flamígeros enemigos# del Centro de Instrucción Gerudo guardan #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST] = HintText(CustomMessage("They say that #engulfed in flame# where thieves train lies #[[1]]#.",
-                                                                                     /*german*/ "",
+                                                                                     /*german*/ "Man erzählt sich, daß #von Flammen umschlungen# wo Diebe trainieren #[[1]]# läge.",
                                                                                      /*french*/ "Selon moi, le #trésor enflammé# du Gymnase Gerudo est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                   // /*spanish*/ Según dicen, donde entrenan las bandidas #entre llamas# yace #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_EYE_STATUE_CHEST] = HintText(CustomMessage("They say that thieves #blind four faces# to find #[[1]]#.",
-                                                                             /*german*/ "",
+                                                                             /*german*/ "Man erzählt sich, daß Diebe #vier Gesichter erblinden# würden und #[[1]]# fänden.",
                                                                              /*french*/ "Selon moi, l'#épreuve d'archerie# du Gymnase Gerudo donne #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                           // /*spanish*/ Según dicen, las bandidas #ciegan cuatro bustos# para hallar #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_NEAR_SCARECROW_CHEST] = HintText(CustomMessage("They say that thieves #blind four faces# to find #[[1]]#.",
-                                                                                 /*german*/ "",
+                                                                                 /*german*/ "Man erzählt sich, daß Diebe #vier Gesichter erblinden# würden und #[[1]]# fänden.",
                                                                                  /*french*/ "Selon moi, l'#épreuve d'archerie# du Gymnase Gerudo donne #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                               // /*spanish*/ Según dicen, las bandidas #ciegan cuatro bustos# para hallar #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST] = HintText(CustomMessage("They say that #before a block of silver# thieves can find #[[1]]#.",
-                                                                                     /*german*/ "",
+                                                                                     /*german*/ "Man erzählt sich, daß #vor einem Block aus Silber# Diebe #[[1]]# finden könnten.",
                                                                                      /*french*/ "Selon moi, #près d'un bloc argent# dans le Gymnase Gerudo gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                   // /*spanish*/ Según dicen, #ante un plateado bloque# las bandidas hallan #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST] = HintText(CustomMessage("They say that a #feat of strength# rewards thieves with #[[1]]#.",
-                                                                                    /*german*/ "",
+                                                                                    /*german*/ "Man erzählt sich, daß ein #Meisterstück der Stärke# Diebe mit #[[1]]# belohnen würde.",
                                                                                     /*french*/ "Selon moi, #derrière un bloc argent# dans le Gymnase Gerudo gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                  // /*spanish*/ Según dicen, una #hazaña de fuerza# premia a las bandidas con #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST] = HintText(CustomMessage("They say that a #feat of strength# rewards thieves with #[[1]]#.",
-                                                                                     /*german*/ "",
+                                                                                     /*german*/ "Man erzählt sich, daß ein #Meisterstück der Stärke# Diebe mit #[[1]]# belohnen würde.",
                                                                                      /*french*/ "Selon moi, #derrière un bloc argent# dans le Gymnase Gerudo gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                   // /*spanish*/ Según dicen, una #hazaña de fuerza# premia a las bandidas con #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_THIRD_CHEST] = HintText(CustomMessage("They say that a #feat of strength# rewards thieves with #[[1]]#.",
-                                                                                    /*german*/ "",
+                                                                                    /*german*/ "Man erzählt sich, daß ein #Meisterstück der Stärke# Diebe mit #[[1]]# belohnen würde.",
                                                                                     /*french*/ "Selon moi, #derrière un bloc argent# dans le Gymnase Gerudo gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                  // /*spanish*/ Según dicen, una #hazaña de fuerza# premia a las bandidas con #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FOURTH_CHEST] = HintText(CustomMessage("They say that a #feat of strength# rewards thieves with #[[1]]#.",
-                                                                                     /*german*/ "",
+                                                                                     /*german*/ "Man erzählt sich, daß ein #Meisterstück der Stärke# Diebe mit #[[1]]# belohnen würde.",
                                                                                      /*french*/ "Selon moi, #derrière un bloc argent# dans le Gymnase Gerudo gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                   // /*spanish*/ Según dicen, una #hazaña de fuerza# premia a las bandidas con #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_FREESTANDING_KEY] = HintText(CustomMessage("They say that the #Song of Time# in the Gerudo Training Grounds leads to #[[1]]#.",
-                                                                             /*german*/ "",
+                                                                             /*german*/ "Man erzählt sich, daß die #Hymne der Zeit# in der Gerudo-Trainingsarena zu #[[1]]# führe.",
                                                                              /*french*/ "Selon moi, le #chant du temps# révèle dans le Gymnase Gerudo #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                           // /*spanish*/ Según dicen, la #Canción del Tiempo# en el Centro de Instrucción Gerudo conduce a #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST] = HintText(CustomMessage("They say that #thieves prepare for training# with #[[1]]#.",
-                                                                                 /*german*/ "",
+                                                                                 /*german*/ "Man erzählt sich, daß sich #Diebe auf das Training vorbereiteten# mit #[[1]]#.",
                                                                                  /*french*/ "Selon moi, dans #l'entrée du Gymnase Gerudo# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                               // /*spanish*/ Según dicen, las #bandidas se instruyen# con #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST] = HintText(CustomMessage("They say that #thieves prepare for training# with #[[1]]#.",
-                                                                                /*german*/ "",
+                                                                                /*german*/ "Man erzählt sich, daß sich #Diebe auf das Training vorbereiteten# mit #[[1]]#.",
                                                                                 /*french*/ "Selon moi, dans #l'entrée du Gymnase Gerudo# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                              // /*spanish*/ Según dicen, las #bandidas se instruyen# con #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST] = HintText(CustomMessage("They say that #soldiers walking on shifting sands# in the Gerudo Training Grounds guard #[[1]]#.",
-                                                                                        /*german*/ "",
+                                                                                        /*german*/ "Man erzählt sich, daß #auf veränderlichen Sanden laufende Soldaten# in der Gerudo-Trainingsarena #[[1]]# bewachen würden.",
                                                                                         /*french*/ "Selon moi, les #squelettes# du Gymnase Gerudo protègent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                      // /*spanish*/ Según dicen, #soldados en resbaladizas arenas# del Centro de Instrucción Gerudo protegen #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_BEFORE_HEAVY_BLOCK_CHEST] = HintText(CustomMessage("They say that #before a block of silver# thieves can find #[[1]]#.",
-                                                                                        /*german*/ "",
+                                                                                        /*german*/ "Man erzählt sich, daß #vor einem Block aus Silber# Diebe #[[1]]# finden könnten.",
                                                                                         /*french*/ "Selon moi, #près d'un bloc argent# dans le Gymnase Gerudo gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                      // /*spanish*/ Según dicen, #ante un plateado bloque# las bandidas hallan #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_EYE_STATUE_CHEST] = HintText(CustomMessage("They say that thieves #blind four faces# to find #[[1]]#.",
-                                                                                /*german*/ "",
+                                                                                /*german*/ "Man erzählt sich, daß Diebe #vier Gesichter erblinden# würden und #[[1]]# fänden.",
                                                                                 /*french*/ "Selon moi, l'#épreuve d'archerie# du Gymnase Gerudo donne #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                              // /*spanish*/ Según dicen, las bandidas #ciegan cuatro bustos# para hallar #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_FLAME_CIRCLE_CHEST] = HintText(CustomMessage("They say that #engulfed in flame# where thieves train lies #[[1]]#.",
-                                                                                  /*german*/ "",
+                                                                                  /*german*/ "Man erzählt sich, daß #von Flammen umschlungen# wo Diebe trainieren #[[1]]# läge.",
                                                                                   /*french*/ "Selon moi, le #trésor enflammé# du Gymnase Gerudo est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                // /*spanish*/ Según dicen, donde entrenan las bandidas #entre llamas# yace #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_SECOND_IRON_KNUCKLE_CHEST] = HintText(CustomMessage("They say that #fiery foes# in the Gerudo Training Grounds guard #[[1]]#.",
-                                                                                         /*german*/ "",
+                                                                                         /*german*/ "Man erzählt sich, daß #feurige Feinde# in der Gerudo-Trainingsarena #[[1]]# bewachen würden.",
                                                                                          /*french*/ "Selon moi, les #ennemis de feu# du Gymnase Gerudo protègent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                       // /*spanish*/ Según dicen, unos #flamígeros enemigos# del Centro de Instrucción Gerudo guardan #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_DINOLFOS_CHEST] = HintText(CustomMessage("They say that #reptilian warriors# in the Gerudo Training Grounds protect #[[1]]#.",
-                                                                              /*german*/ "",
+                                                                              /*german*/ "Man erzählt sich, daß #reptilienartige Krieger# in der Gerudo-Trainingsarena #[[1]]# schützen würden.",
                                                                               /*french*/ "Selon moi, les #lézards# dans le Gymnase Gerudo protègent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                            // /*spanish*/ Según dicen, #unos escamosos guerreros# del Centro de Instrucción Gerudo protegen #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_CENTRAL_CHEST] = HintText(CustomMessage("They say that a #path of fire# leads thieves to #[[1]]#.",
-                                                                                        /*german*/ "",
+                                                                                        /*german*/ "Man erzählt sich, daß der #Pfad des Feuers# Diebe zu #[[1]]# führe.",
                                                                                         /*french*/ "Selon moi, dans le #chemin enflammé# dans le Gymnase Gerudo gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                      // /*spanish*/ Según dicen, un #camino de fuego# conduce a las bandidas a #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_FIRST_CHEST] = HintText(CustomMessage("They say that the first prize of #the thieves' training# is #[[1]]#.",
-                                                                                     /*german*/ "",
+                                                                                     /*german*/ "Man erzählt sich, daß der erste Preis des #Diebestrainings# #[[1]]# sei.",
                                                                                      /*french*/ "Selon moi, le #premier trésor du Gymnase Gerudo# est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                   // /*spanish*/ Según dicen, el primer premio de la #instrucción bandida# se trata de #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_SIDE_CHEST] = HintText(CustomMessage("They say that a #path of fire# leads thieves to #[[1]]#.",
-                                                                                     /*german*/ "",
+                                                                                     /*german*/ "Man erzählt sich, daß der #Pfad des Feuers# Diebe zu #[[1]]# führe.",
                                                                                      /*french*/ "Selon moi, dans le #chemin enflammé# dans le Gymnase Gerudo gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                   // /*spanish*/ Según dicen, un #camino de fuego# conduce a las bandidas a #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_THIRD_CHEST] = HintText(CustomMessage("They say that the third prize of #the thieves' training# is #[[1]]#.",
-                                                                                     /*german*/ "",
+                                                                                     /*german*/ "Man erzählt sich, daß der dritte Preis des #Diebestrainings# #[[1]]# sei.",
                                                                                      /*french*/ "Selon moi, le #troisième trésor du Gymnase Gerudo# est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                   // /*spanish*/ Según dicen, el tercer premio de la #instrucción bandida# se trata de #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_SECOND_CHEST] = HintText(CustomMessage("They say that the second prize of #the thieves' training# is #[[1]]#.",
-                                                                                      /*german*/ "",
+                                                                                      /*german*/ "Man erzählt sich, daß der zweite Preis des #Diebestrainings# #[[1]]# sei.",
                                                                                       /*french*/ "Selon moi, le #deuxième trésor du Gymnase Gerudo# est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                    // /*spanish*/ Según dicen, el segundo premio de la #instrucción bandida# se trata de #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_HIDDEN_CEILING_CHEST] = HintText(CustomMessage("They say that the #Eye of Truth# in the Gerudo Training Grounds reveals #[[1]]#.",
-                                                                                    /*german*/ "",
+                                                                                    /*german*/ "Man erzählt sich, daß das #Auge der Wahrheit# in der Gerudo-Trainingsarena #[[1]]# enthülle.",
                                                                                     /*french*/ "Selon moi, #bien caché# dans le Gymnase Gerudo gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                  // /*spanish*/ Según dicen, el #Ojo de la Verdad# en el Centro de Instrucción Gerudo revela #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_HEAVY_BLOCK_CHEST] = HintText(CustomMessage("They say that a #feat of strength# rewards thieves with #[[1]]#.",
-                                                                                 /*german*/ "",
+                                                                                 /*german*/ "Man erzählt sich, daß ein #Meisterstück der Stärke# Diebe mit #[[1]]# belohnen würde.",
                                                                                  /*french*/ "Selon moi, #derrière un bloc argent# dans le Gymnase Gerudo gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                               // /*spanish*/ Según dicen, una #hazaña de fuerza# premia a las bandidas con #[[1]]#.
 
@@ -1807,192 +1807,192 @@ hintTextTable[RHT_SHADOW_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say th
   |      GANONS CASTLE       |
   ---------------------------*/
     hintTextTable[RHT_GANONS_TOWER_BOSS_KEY_CHEST] = HintText(CustomMessage("They say that the #Evil King# hoards #[[1]]#.",
-                                                                 /*german*/ "",
+                                                                 /*german*/ "Man erzählt sich, daß der #böse König# #[[1]]# horte.",
                                                                  /*french*/ "Selon moi, le #Roi du Mal# possède #[[1]]#.", {QM_RED, QM_GREEN}));
                                                               // /*spanish*/ Según dicen, el #Rey del Mal# acapara #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_FOREST_TRIAL_CHEST] = HintText(CustomMessage("They say that the #test of the wilds# holds #[[1]]#.",
-                                                                      /*german*/ "",
+                                                                      /*german*/ "Man erzählt sich, daß die #Prüfung der Wildnis# #[[1]]# enthielte.",
                                                                       /*french*/ "Selon moi, l'#épreuve des bois# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                    // /*spanish*/ Según dicen, la #prueba de la naturaleza# brinda #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST] = HintText(CustomMessage("They say that the #test of the seas# holds #[[1]]#.",
-                                                                          /*german*/ "",
+                                                                          /*german*/ "Man erzählt sich, daß die #Prüfung der Meere# #[[1]]# enthielte.",
                                                                           /*french*/ "Selon moi, l'#épreuve des mers# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                        // /*spanish*/ Según dicen, la #prueba del mar# brinda #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST] = HintText(CustomMessage("They say that the #test of the seas# holds #[[1]]#.",
-                                                                           /*german*/ "",
+                                                                           /*german*/ "Man erzählt sich, daß die #Prüfung der Meere# #[[1]]# enthielte.",
                                                                            /*french*/ "Selon moi, l'#épreuve des mers# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                         // /*spanish*/ Según dicen, la #prueba del mar# brinda #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST] = HintText(CustomMessage("They say that #music in the test of darkness# unveils #[[1]]#.",
-                                                                            /*german*/ "",
+                                                                            /*german*/ "Man erzählt sich, daß #Musik in der Prüfung des Dunkelheit# #[[1]]# enthüllen würde.",
                                                                             /*french*/ "Selon moi, la #musique dans l'épreuve des ténèbres# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                          // /*spanish*/ Según dicen, la #música en la prueba de la oscuridad# revela #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST] = HintText(CustomMessage("They say that #light in the test of darkness# unveils #[[1]]#.",
-                                                                                       /*german*/ "",
+                                                                                       /*german*/ "Man erzählt sich, daß #Licht in der Prüfung der Dunkelheit# #[[1]]# enthüllen würde.",
                                                                                        /*french*/ "Selon moi, la #lumière dans l'épreuve des ténèbres# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                     // /*spanish*/ Según dicen, la #luz en la prueba de la oscuridad# revela #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST] = HintText(CustomMessage("They say that the #test of the sands# holds #[[1]]#.",
-                                                                                     /*german*/ "",
+                                                                                     /*german*/ "Man erzählt sich, daß die #Prüfung der Sande# #[[1]]# enthielte.",
                                                                                      /*french*/ "Selon moi, l'#épreuve des sables# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                   // /*spanish*/ Según dicen, la #prueba de las arenas# brinda #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST] = HintText(CustomMessage("They say that the #test of the sands# holds #[[1]]#.",
-                                                                                /*german*/ "",
+                                                                                /*german*/ "Man erzählt sich, daß die #Prüfung der Sande# #[[1]]# enthielte.",
                                                                                 /*french*/ "Selon moi, l'#épreuve des sables# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                              // /*spanish*/ Según dicen, la #prueba de las arenas# brinda #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST] = HintText(CustomMessage("They say that the #test of radiance# holds #[[1]]#.",
-                                                                                /*german*/ "",
+                                                                                /*german*/ "Man erzählt sich, daß die #Prüfung des Glanzes# #[[1]]# enthielte.",
                                                                                 /*french*/ "Selon moi, l'#épreuve du ciel# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                              // /*spanish*/ Según dicen, la #prueba del resplandor# brinda #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST] = HintText(CustomMessage("They say that the #test of radiance# holds #[[1]]#.",
-                                                                                 /*german*/ "",
+                                                                                 /*german*/ "Man erzählt sich, daß die #Prüfung des Glanzes# #[[1]]# enthielte.",
                                                                                  /*french*/ "Selon moi, l'#épreuve du ciel# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                               // /*spanish*/ Según dicen, la #prueba del resplandor# brinda #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST] = HintText(CustomMessage("They say that the #test of radiance# holds #[[1]]#.",
-                                                                                /*german*/ "",
+                                                                                /*german*/ "Man erzählt sich, daß die #Prüfung des Glanzes# #[[1]]# enthielte.",
                                                                                 /*french*/ "Selon moi, l'#épreuve du ciel# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                              // /*spanish*/ Según dicen, la #prueba del resplandor# brinda #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST] = HintText(CustomMessage("They say that the #test of radiance# holds #[[1]]#.",
-                                                                                 /*german*/ "",
+                                                                                 /*german*/ "Man erzählt sich, daß die #Prüfung des Glanzes# #[[1]]# enthielte.",
                                                                                  /*french*/ "Selon moi, l'#épreuve du ciel# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                               // /*spanish*/ Según dicen, la #prueba del resplandor# brinda #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST] = HintText(CustomMessage("They say that the #test of radiance# holds #[[1]]#.",
-                                                                                  /*german*/ "",
+                                                                                  /*german*/ "Man erzählt sich, daß die #Prüfung des Glanzes# #[[1]]# enthielte.",
                                                                                   /*french*/ "Selon moi, l'#épreuve du ciel# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                // /*spanish*/ Según dicen, la #prueba del resplandor# brinda #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST] = HintText(CustomMessage("They say that the #test of radiance# holds #[[1]]#.",
-                                                                                 /*german*/ "",
+                                                                                 /*german*/ "Man erzählt sich, daß die #Prüfung des Glanzes# #[[1]]# enthielte.",
                                                                                  /*french*/ "Selon moi, l'#épreuve du ciel# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                               // /*spanish*/ Según dicen, la #prueba del resplandor# brinda #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST] = HintText(CustomMessage("They say that the #test of radiance# holds #[[1]]#.",
-                                                                                       /*german*/ "",
+                                                                                       /*german*/ "Man erzählt sich, daß die #Prüfung des Glanzes# #[[1]]# enthielte.",
                                                                                        /*french*/ "Selon moi, l'#épreuve du ciel# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                     // /*spanish*/ Según dicen, la #prueba del resplandor# brinda #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST] = HintText(CustomMessage("They say that #music in the test of radiance# reveals #[[1]]#.",
-                                                                             /*german*/ "",
+                                                                             /*german*/ "Man erzählt sich, daß #Musik in der Prüfung des Glanzes# #[[1]]# enthüllen würde.",
                                                                              /*french*/ "Selon moi, la #musique dans l'épreuve du ciel# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                           // /*spanish*/ Según dicen, la #música en la prueba del resplandor# revela #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST] = HintText(CustomMessage("They say that the #test of the seas# holds #[[1]]#.",
-                                                                        /*german*/ "",
+                                                                        /*german*/ "Man erzählt sich, daß die #Prüfung der Meere# #[[1]]# enthielte.",
                                                                         /*french*/ "Selon moi, l'#épreuve des mers# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                      // /*spanish*/ Según dicen, la #prueba del mar# brinda #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST] = HintText(CustomMessage("They say that the #test of the wilds# holds #[[1]]#.",
-                                                                                    /*german*/ "",
+                                                                                    /*german*/ "Man erzählt sich, daß die #Prüfung der Wildnis# #[[1]]# enthielte.",
                                                                                     /*french*/ "Selon moi, l'#épreuve des bois# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                  // /*spanish*/ Según dicen, la #prueba de la naturaleza# brinda #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST] = HintText(CustomMessage("They say that the #test of the wilds# holds #[[1]]#.",
-                                                                                           /*german*/ "",
+                                                                                           /*german*/ "Man erzählt sich, daß die #Prüfung der Wildnis# #[[1]]# enthielte.",
                                                                                            /*french*/ "Selon moi, l'#épreuve des bois# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                         // /*spanish*/ Según dicen, la #prueba de la naturaleza# brinda #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST] = HintText(CustomMessage("They say that #music in the test of radiance# reveals #[[1]]#.",
-                                                                                /*german*/ "",
+                                                                                /*german*/ "Man erzählt sich, daß #Musik in der Prüfung des Glanzes# #[[1]]# enthüllen würde.",
                                                                                 /*french*/ "Selon moi, la #musique dans l'épreuve du ciel# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                              // /*spanish*/ Según dicen, la #música en la prueba del resplandor# revela #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST] = HintText(CustomMessage("They say that the #test of darkness# holds #[[1]]#.",
-                                                                                     /*german*/ "",
+                                                                                     /*german*/ "Man erzählt sich, daß die #Prüfung der Dunkelheit# #[[1]]# enthielte.",
                                                                                      /*french*/ "Selon moi, l'#épreuve des ténèbres# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                   // /*spanish*/ Según dicen, la #prueba de la oscuridad# brinda #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST] = HintText(CustomMessage("They say that the #test of darkness# holds #[[1]]#.",
-                                                                                    /*german*/ "",
+                                                                                    /*german*/ "Man erzählt sich, daß die #Prüfung der Dunkelheit# #[[1]]# enthielte.",
                                                                                     /*french*/ "Selon moi, l'#épreuve des ténèbres# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                  // /*spanish*/ Según dicen, la #prueba de la oscuridad# brinda #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST] = HintText(CustomMessage("They say that #reflected light in the test of the sands# reveals #[[1]]#.",
-                                                                                          /*german*/ "",
+                                                                                          /*german*/ "Man erzählt sich, daß #reflektiertes Licht in der Prüfung der Sande# #[[1]]# enthüllen würde.",
                                                                                           /*french*/ "Selon moi, le #soleil dans l'épreuve des sables# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                        // /*spanish*/ Según dicen, #reflejar la luz en la prueba de las arenas# revela #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST] = HintText(CustomMessage("They say that #reflected light in the test of the sands# reveals #[[1]]#.",
-                                                                                        /*german*/ "",
+                                                                                        /*german*/ "Man erzählt sich, daß #reflektiertes Licht in der Prüfung der Sande# #[[1]]# enthüllen würde.",
                                                                                         /*french*/ "Selon moi, le #soleil dans l'épreuve des sables# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                      // /*spanish*/ Según dicen, #reflejar la luz en la prueba de las arenas# revela #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST] = HintText(CustomMessage("They say that #reflected light in the test of the sands# reveals #[[1]]#.",
-                                                                                       /*german*/ "",
+                                                                                       /*german*/ "Man erzählt sich, daß #reflektiertes Licht in der Prüfung der Sande# #[[1]]# enthüllen würde.",
                                                                                        /*french*/ "Selon moi, le #soleil dans l'épreuve des sables# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                     // /*spanish*/ Según dicen, #reflejar la luz en la prueba de las arenas# revela #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST] = HintText(CustomMessage("They say that #reflected light in the test of the sands# reveals #[[1]]#.",
-                                                                                        /*german*/ "",
+                                                                                        /*german*/ "Man erzählt sich, daß #reflektiertes Licht in der Prüfung der Sande# #[[1]]# enthüllen würde.",
                                                                                         /*french*/ "Selon moi, le #soleil dans l'épreuve des sables# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                      // /*spanish*/ Según dicen, #reflejar la luz en la prueba de las arenas# revela #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST] = HintText(CustomMessage("They say that #reflected light in the test of the sands# reveals #[[1]]#.",
-                                                                               /*german*/ "",
+                                                                               /*german*/ "Man erzählt sich, daß #reflektiertes Licht in der Prüfung der Sande# #[[1]]# enthüllen würde.",
                                                                                /*french*/ "Selon moi, le #soleil dans l'épreuve des sables# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                             // /*spanish*/ Según dicen, #reflejar la luz en la prueba de las arenas# revela #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST] = HintText(CustomMessage("They say that #reflected light in the test of the sands# reveals #[[1]]#.",
-                                                                                   /*german*/ "",
+                                                                                   /*german*/ "Man erzählt sich, daß #reflektiertes Licht in der Prüfung der Sande# #[[1]]# enthüllen würde.",
                                                                                    /*french*/ "Selon moi, le #soleil dans l'épreuve des sables# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                 // /*spanish*/ Según dicen, #reflejar la luz en la prueba de las arenas# revela #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY] = HintText(CustomMessage("They say that the #test of the wilds# holds #[[1]]#.",
-                                                                                    /*german*/ "",
+                                                                                    /*german*/ "Man erzählt sich, daß die #Prüfung der Wildnis# #[[1]]# enthielte.",
                                                                                     /*french*/ "Selon moi, l'#épreuve des bois# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                  // /*spanish*/ Según dicen, la #prueba de la naturaleza# brinda #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT] = HintText(CustomMessage("They say that #scrubs in Ganon's Castle# sell #[[1]]#.",
-                                                                          /*german*/ "",
+                                                                          /*german*/ "Man erzählt sich, daß #Dekus in Ganons Schloß# #[[1]]# verkaufen würden.",
                                                                           /*french*/ "Selon moi, les #pestes Mojo dans le Château de Ganon# vendent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                        // /*spanish*/ Según dicen, los #dekus del Castillo de Ganon# venden #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT] = HintText(CustomMessage("They say that #scrubs in Ganon's Castle# sell #[[1]]#.",
-                                                                           /*german*/ "",
+                                                                           /*german*/ "Man erzählt sich, daß #Dekus in Ganons Schloß# #[[1]]# verkaufen würden.",
                                                                            /*french*/ "Selon moi, les #pestes Mojo dans le Château de Ganon# vendent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                         // /*spanish*/ Según dicen, los #dekus del Castillo de Ganon# venden #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_DEKU_SCRUB_RIGHT] = HintText(CustomMessage("They say that #scrubs in Ganon's Castle# sell #[[1]]#.",
-                                                                    /*german*/ "",
+                                                                    /*german*/ "Man erzählt sich, daß #Dekus in Ganons Schloß# #[[1]]# verkaufen würden.",
                                                                     /*french*/ "Selon moi, les #pestes Mojo dans le Château de Ganon# vendent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                  // /*spanish*/ Según dicen, los #dekus del Castillo de Ganon# venden #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_DEKU_SCRUB_LEFT] = HintText(CustomMessage("They say that #scrubs in Ganon's Castle# sell #[[1]]#.",
-                                                                   /*german*/ "",
+                                                                   /*german*/ "Man erzählt sich, daß #Dekus in Ganons Schloß# #[[1]]# verkaufen würden.",
                                                                    /*french*/ "Selon moi, les #pestes Mojo dans le Château de Ganon# vendent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                 // /*spanish*/ Según dicen, los #dekus del Castillo de Ganon# venden #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT] = HintText(CustomMessage("They say that #scrubs in Ganon's Castle# sell #[[1]]#.",
-                                                                       /*german*/ "",
+                                                                       /*german*/ "Man erzählt sich, daß #Dekus in Ganons Schloß# #[[1]]# verkaufen würden.",
                                                                        /*french*/ "Selon moi, les #pestes Mojo dans le Château de Ganon# vendent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                     // /*spanish*/ Según dicen, los #dekus del Castillo de Ganon# venden #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT] = HintText(CustomMessage("They say that #scrubs in Ganon's Castle# sell #[[1]]#.",
-                                                                             /*german*/ "",
+                                                                             /*german*/ "Man erzählt sich, daß #Dekus in Ganons Schloß# #[[1]]# verkaufen würden.",
                                                                              /*french*/ "Selon moi, les #pestes Mojo dans le Château de Ganon# vendent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                           // /*spanish*/ Según dicen, los #dekus del Castillo de Ganon# venden #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER] = HintText(CustomMessage("They say that #scrubs in Ganon's Castle# sell #[[1]]#.",
-                                                                        /*german*/ "",
+                                                                        /*german*/ "Man erzählt sich, daß #Dekus in Ganons Schloß# #[[1]]# verkaufen würden.",
                                                                         /*french*/ "Selon moi, les #pestes Mojo dans le Château de Ganon# vendent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                      // /*spanish*/ Según dicen, los #dekus del Castillo de Ganon# venden #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT] = HintText(CustomMessage("They say that #scrubs in Ganon's Castle# sell #[[1]]#.",
-                                                                              /*german*/ "",
+                                                                              /*german*/ "Man erzählt sich, daß #Dekus in Ganons Schloß# #[[1]]# verkaufen würden.",
                                                                               /*french*/ "Selon moi, les #pestes Mojo dans le Château de Ganon# vendent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                            // /*spanish*/ Según dicen, los #dekus del Castillo de Ganon# venden #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT] = HintText(CustomMessage("They say that #scrubs in Ganon's Castle# sell #[[1]]#.",
-                                                                      /*german*/ "",
+                                                                      /*german*/ "Man erzählt sich, daß #Dekus in Ganons Schloß# #[[1]]# verkaufen würden.",
                                                                       /*french*/ "Selon moi, les #pestes Mojo dans le Château de Ganon# vendent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                    // /*spanish*/ Según dicen, los #dekus del Castillo de Ganon# venden #[[1]]#.
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_overworld.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_overworld.cpp
index 84c74da87..a467c18b5 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_overworld.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_overworld.cpp
@@ -171,1320 +171,1323 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                                 // /*spanish*/ Según dicen, bajo un #hoyo de un laberinto forestal# yace #[[1]]#.
 
     hintTextTable[RHT_DMT_STORMS_GROTTO_CHEST] = HintText(CustomMessage("They say that #hole flooded with rain on a mountain# holds #[[1]]#.",
-                                                             /*german*/ "",
+                                                             /*german*/ "Man erzählt sich, daß ein #durch Regen geflutetes Loch auf einem Berg# #[[1]]# enthielte.",
                                                              /*french*/ "Selon moi, la #grotte inondée de pluie sur la montagne# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                           // /*spanish*/ Según dicen, bajo un #hoyo de una montaña inundado de lluvia# yace #[[1]]#.
 
     hintTextTable[RHT_DMT_STORMS_GROTTO_FISH] = HintText(CustomMessage("They say that #fish in a hole flooded with rain on a mountain# holds #[[1]]#.",
-                                                            /*german*/ "",
+                                                            /*german*/ "Man erzählt sich, daß ein #Fisch in einem durch Regen geflutetes Loch auf einem Berg# #[[1]]# enthielte.",
                                                             /*french*/ "Selon moi, la #grotte inondée de pluie sur la montagne# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                          // /*spanish*/ Según dicen, bajo un #hoyo de una montaña inundado de lluvia# yace #[[1]]#.
 
     hintTextTable[RHT_DMC_UPPER_GROTTO_CHEST] = HintText(CustomMessage("They say that a #hole in a volcano# holds #[[1]]#.",
-                                                            /*german*/ "",
+                                                            /*german*/ "Man erzählt sich, daß ein #Loch in einem Vulkan# #[[1]]# enthielte.",
                                                             /*french*/ "Selon moi, la #grotte dans le volcan# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                          // /*spanish*/ Según dicen, bajo el #hoyo de un volcán# yace #[[1]]#.
 
     hintTextTable[RHT_DMC_UPPER_GROTTO_FISH] = HintText(CustomMessage("They say that a #fish in a hole in a volcano# holds #[[1]]#.",
-                                                           /*german*/ "",
+                                                           /*german*/ "Man erzählt sich, daß ein #Fisch in einem Loch in einem Vulkan# #[[1]]# enthielte.",
                                                            /*french*/ "Selon moi, la #grotte dans le volcan# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                         // /*spanish*/ Según dicen, bajo el #hoyo de un volcán# yace #[[1]]#.
 
     hintTextTable[RHT_TOT_MASTER_SWORD] = HintText(CustomMessage("They say that a #pedestal in a temple# holds #[[1]]#.",
-                                                      /*german*/ "",
+                                                      /*german*/ "Man erzählt sich, daß sich auf einem #Podest in einem Tempel# #[[1]]# befände.",
                                                       /*french*/ "Selon moi, un #piédestal dans un temple# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                    // /*spanish*/ Según dicen, un #pedestal en un templo# sostiene #[[1]]#.
 
     hintTextTable[RHT_TOT_LIGHT_ARROWS_CUTSCENE] = HintText(CustomMessage("They say that the #final gift of a princess# is #[[1]]#.",
-                                                               /*german*/ "",
+                                                               /*german*/ "Man erzählt sich, daß das #letzte Geschenk einer Prinzessin# #[[1]]# sei.",
                                                                /*french*/ "Selon moi, le #cadeau d'adieu de la princesse# est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                             // /*spanish*/ Según dicen, el #obsequio final de la princesa# se trata de #[[1]]#.
 
     hintTextTable[RHT_LW_GIFT_FROM_SARIA] = HintText(CustomMessage("They say that #Saria's Gift# is #[[1]]#.",
-                                                        /*german*/ "",
+                                                        /*german*/ "Man erzählt sich, daß #Salias Geschenk# #[[1]]# sei.",
                                                         /*french*/ "Selon moi, le #cadeau de Saria# est #[[1]]#.", {QM_RED, QM_GREEN}),
                                                      // /*spanish*/ Según dicen, el #regalo de Saria# se trata de #[[1]]#.
                                                      {}, {
                                                      CustomMessage("They say that a #potato hoarder# holds #[[1]]#.",
-                                                         /*german*/ "",
+                                                         /*german*/ "Man erzählt sich, daß ein #Kartoffelhortender# #[[1]]# besäße.",
                                                          /*french*/ "Selon moi, le #panini mélodieux# est en fait #[[1]]#.", {QM_RED, QM_GREEN}),
                                                       // /*spanish*/ Según dicen, cierta #jovencita verde# concede #[[1]]#.
                                                      CustomMessage("They say that a rooty tooty #flutey cutey# gifts #[[1]]#.",
-                                                         /*german*/ "",
+                                                         /*german*/ "Man erzählt sich, daß die #musikalische Kartoffel# #[[1]]# schenke.",
                                                          /*french*/ "Selon moi, la #patate musicale# est en fait #[[1]]#.", {QM_RED, QM_GREEN})});
                                                       // /*spanish*/ Según dicen, una #gran amiga# concede #[[1]]#.
 
     hintTextTable[RHT_ZF_GREAT_FAIRY_REWARD] = HintText(CustomMessage("They say that the #fairy of winds# holds #[[1]]#.",
-                                                           /*german*/ "",
+                                                           /*german*/ "Man erzählt sich, daß die #Fee der Winde# #[[1]]# besäße.",
                                                            /*french*/ "Selon moi, la #fée du vent# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                         // /*spanish*/ Según dicen, el #hada del viento# brinda #[[1]]#.
 
     hintTextTable[RHT_HC_GREAT_FAIRY_REWARD] = HintText(CustomMessage("They say that the #fairy of fire# holds #[[1]]#.",
-                                                           /*german*/ "",
+                                                           /*german*/ "Man erzählt sich, daß die #Fee des Feuers# #[[1]]# besäße.",
                                                            /*french*/ "Selon moi, la #fée du feu# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                         // /*spanish*/ Según dicen, el #hada del fuego# brinda #[[1]]#.
 
     hintTextTable[RHT_COLOSSUS_GREAT_FAIRY_REWARD] = HintText(CustomMessage("They say that the #fairy of love# holds #[[1]]#.",
-                                                                 /*german*/ "",
+                                                                 /*german*/ "Man erzählt sich, daß die #Fee der Liebe# #[[1]]# besäße.",
                                                                  /*french*/ "Selon moi, la #fée de l'amour# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                               // /*spanish*/ Según dicen, el #hada del amor# brinda #[[1]]#.
 
     hintTextTable[RHT_DMT_GREAT_FAIRY_REWARD] = HintText(CustomMessage("They say that a #magical fairy# gifts #[[1]]#.",
-                                                            /*german*/ "",
+                                                            /*german*/ "Man erzählt sich, daß eine #magische Fee# #[[1]]# schenke.",
                                                             /*french*/ "Selon moi, la #fée de la magie# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                          // /*spanish*/ Según dicen, un #hada mágica# brinda #[[1]]#.
 
     hintTextTable[RHT_DMC_GREAT_FAIRY_REWARD] = HintText(CustomMessage("They say that a #magical fairy# gifts #[[1]]#.",
-                                                            /*german*/ "",
+                                                            /*german*/ "Man erzählt sich, daß eine #magische Fee# #[[1]]# schenke.",
                                                             /*french*/ "Selon moi, la #fée de la magie# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                          // /*spanish*/ Según dicen, un #hada mágica# brinda #[[1]]#.
 
     hintTextTable[RHT_OGC_GREAT_FAIRY_REWARD] = HintText(CustomMessage("They say that the #fairy of strength# holds #[[1]]#.",
-                                                            /*german*/ "",
+                                                            /*german*/ "Man erzählt sich, daß die #Fee der Stärke# #[[1]]# besäße.",
                                                             /*french*/ "Selon moi, la #fée de la force# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                          // /*spanish*/ Según dicen, el #hada de la fuerza# brinda #[[1]]#.
 
     hintTextTable[RHT_SONG_FROM_IMPA] = HintText(CustomMessage("They say that #deep in a castle#, Impa teaches #[[1]]#.",
-                                                    /*german*/ "",
+                                                    /*german*/ "Man erzählt sich, daß #tief in einem Schloß#, Impa #[[1]]# lehre.",
                                                     /*french*/ "Selon moi, #la gardienne de la princesse# donne #[[1]]#.", {QM_RED, QM_GREEN}));
                                                  // /*spanish*/ Según dicen, en el #jardín del castillo Impa enseña# #[[1]]#.
 
     hintTextTable[RHT_SONG_FROM_MALON] = HintText(CustomMessage("They say that #a farm girl# sings #[[1]]#.",
-                                                     /*german*/ "",
+                                                     /*german*/ "Man erzählt sich, daß ein #Mädchen des Landes# #[[1]]# singe.",
                                                      /*french*/ "Selon moi, la #fillette de la ferme# donne #[[1]]#.", {QM_RED, QM_GREEN}));
                                                   // /*spanish*/ Según dicen, una #chica rupestre# canta #[[1]]#.
 
     hintTextTable[RHT_SONG_FROM_SARIA] = HintText(CustomMessage("They say that #deep in the forest#, Saria teaches #[[1]]#.",
-                                                     /*german*/ "",
+                                                     /*german*/ "Man erzählt sich, daß #tief im Wald#, Salia #[[1]]# lehre.",
                                                      /*french*/ "Selon moi, la #fille de la forêt# donne #[[1]]#.", {QM_RED, QM_GREEN}));
                                                   // /*spanish*/ Según dicen, al #fondo del bosque# Saria enseña #[[1]]#.
 
     hintTextTable[RHT_SONG_FROM_WINDMILL] = HintText(CustomMessage("They say that a man #in a windmill# is obsessed with #[[1]]#.",
-                                                        /*german*/ "",
+                                                        /*german*/ "Man erzählt sich, daß ein Mann #in einer Windmühle# von #[[1]]# besessen sei.",
                                                         /*french*/ "Selon moi, l'#homme du moulin# donne #[[1]]#.", {QM_RED, QM_GREEN}));
                                                      // /*spanish*/ Según dicen, el #hombre del molino# está obsesionado con #[[1]]#.
 
     hintTextTable[RHT_HC_MALON_EGG] = HintText(CustomMessage("They say that a #girl looking for her father# gives #[[1]]#.",
-                                                  /*german*/ "",
+                                                  /*german*/ "Man erzählt sich, daß ein #nach ihrem Vater suchenden Mädchen# #[[1]]# gäbe.",
                                                   /*french*/ "Selon moi, la #fillette qui cherche son père# donne #[[1]]#.", {QM_RED, QM_GREEN}));
                                                // /*spanish*/ Según dicen, una #chica en busca de su padre# otorga #[[1]]#.
 
     hintTextTable[RHT_HC_ZELDAS_LETTER] = HintText(CustomMessage("They say that a #princess in a castle# gifts #[[1]]#.",
-                                                      /*german*/ "",
+                                                      /*german*/ "Man erzählt sich, daß eine #Prinzessin in einem Schloß# #[[1]]# schenke.",
                                                       /*french*/ "Selon moi, la #princesse dans le château# donne #[[1]]#.", {QM_RED, QM_GREEN}));
                                                    // /*spanish*/ Según dicen, la #princesa de un castillo# otorga #[[1]]#.
 
     hintTextTable[RHT_ZD_DIVING_MINIGAME] = HintText(CustomMessage("They say that those who #dive for Zora rupees# will find #[[1]]#.",
-                                                        /*german*/ "",
+                                                        /*german*/ "Man erzählt sich, daß jene, welche nach den #Rubinen der Zora tauchen# #[[1]]# fänden.",
                                                         /*french*/ "Selon moi, ceux qui #plongent pour des rubis Zora# trouveront #[[1]]#.", {QM_RED, QM_GREEN}),
                                                      // /*spanish*/ Según dicen, aquellos que se #sumergan por las rupias zora# encontrarán #[[1]]#.
                                                      {}, {
                                                      CustomMessage("They say that an #unsustainable business model# gifts #[[1]]#.",
-                                                         /*german*/ "",
+                                                         /*german*/ "Man erzählt sich, daß ein #unwirtschaftliches Geschäftsmodell# #[[1]]# schenke.",
                                                          /*french*/ "Selon moi, le #mauvais modèle d'affaires# donne #[[1]]#.", {QM_RED, QM_GREEN})});
                                                       // /*spanish*/ Según dicen, un #mal modelo de negocio# premia con #[[1]]#.
 
     hintTextTable[RHT_LH_CHILD_FISHING] = HintText(CustomMessage("They say that #fishing in youth# bestows #[[1]]#.",
-                                                      /*german*/ "",
+                                                      /*german*/ "Man erzählt sich, daß das #Fischen in der Jugend# #[[1]]# verleihe.",
                                                       /*french*/ "Selon moi, #pêcher dans sa jeunesse# promet #[[1]]#.", {QM_RED, QM_GREEN}));
                                                    // /*spanish*/ Según dicen, #pescar en la juventud# conduce a #[[1]]#.
 
     hintTextTable[RHT_LH_POND_FISH] = HintText(CustomMessage("They say that #hitting the pond# reveals #[[1]]#.",
-                                                  /*german*/ "",
+                                                  /*german*/ "Man erzählt sich, daß das #Fischen im Teich# #[[1]]# enthülle.",
                                                   /*french*/ "Selon moi,  #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_LH_HYRULE_LOACH] = HintText(CustomMessage("They say that #fishing the hyrule loach# will give you #[[1]]#.",
-                                                     /*german*/ "",
+                                                     /*german*/ "Man erzählt sich, daß das #Fischen der hylianischen Schmerle# #[[1]]# einbrächte.",
                                                      /*french*/ "Selon moi, !!! #[[1]]#.", {QM_RED, QM_GREEN}),
                                                   // /*spanish*/ Según dicen, si #pescas a la Locha de Hyrule# encontrarás #[[1]]#.
                                                   {}, {
                                                   CustomMessage("They say that #fishing the legend# bestows #[[1]]#.",
-                                                      /*german*/ "",
+                                                      /*german*/ "Man erzählt sich, daß das #Fischen der Legende# #[[1]]# verleihe.",
                                                       /*french*/ "Selon moi, !!! #[[1]]#.", {QM_RED, QM_GREEN})});
                                                    // /*spanish*/ Según dicen, #pescar a la leyenda# conduce a #[[1]]#.
 
     hintTextTable[RHT_LH_ADULT_FISHING] = HintText(CustomMessage("They say that #fishing in maturity# bestows #[[1]]#.",
-                                                      /*german*/ "",
+                                                      /*german*/ "Man erzählt sich, daß das #Fischen im Alter# #[[1]]# verleihe.",
                                                       /*french*/ "Selon moi, #pêcher dans sa maturité# promet #[[1]]#.", {QM_RED, QM_GREEN}));
                                                    // /*spanish*/ Según dicen, #pescar en la madurez# conduce a #[[1]]#.
 
     hintTextTable[RHT_LH_LAB_DIVE] = HintText(CustomMessage("They say that a #diving experiment# is rewarded with #[[1]]#.",
-                                                 /*german*/ "",
+                                                 /*german*/ "Man erzählt sich, daß ein #Tauchexperiment# mit #[[1]]# belohnt würde.",
                                                  /*french*/ "Selon moi, l'#expérience de plongée# donne #[[1]]#.", {QM_RED, QM_GREEN}));
                                               // /*spanish*/ Según dicen, #bucear para un experimento# se premia con #[[1]]#.
     // RANDOTODO: needs translation
-    hintTextTable[RHT_ZD_FISH] = HintText(CustomMessage("They say that a #fish by a waterfall# hoards #[[1]]#.", {QM_RED, QM_GREEN}));
+    hintTextTable[RHT_ZD_FISH] = HintText(CustomMessage("They say that a #fish by a waterfall# hoards #[[1]]#.",
+                                             /*german*/ "Man erzählt sich, daß ein #Fisch nahe eines Wasserfalls# #[[1]]# horte.",
+                                             /*french*/ "Selon moi, #[[1]]#.", {QM_RED, QM_GREEN}));
+                                          // /*spanish*/ Según dicen, #[[1]]#.
 
  
     hintTextTable[RHT_GC_ROLLING_GORON_AS_ADULT] = HintText(CustomMessage("They say that #reassuring a young Goron# is rewarded with #[[1]]#.",
-                                                               /*german*/ "",
+                                                               /*german*/ "Man erzählt sich, daß das #Beruhigen eines jungen Goronen# mit #[[1]]# belohnt würde.",
                                                                /*french*/ "Selon moi, #rassurer un jeune Goron# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                             // /*spanish*/ Según dicen, #calmar a un joven Goron# otorga #[[1]]#.
                                                             {}, {
                                                             CustomMessage("They say that #comforting yourself# provides #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß die #Ermutigung von einem Selbst# #[[1]]# einbrächte.",
                                                                 /*french*/ "Selon moi, se #réconforter soi-même# donne #[[1]]#.", {QM_RED, QM_GREEN})});
                                                              // /*spanish*/ Según dicen, #confrontarte a ti mismo# otorga #[[1]]#.
 
     hintTextTable[RHT_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE] = HintText(CustomMessage("They say that the #first explosive prize# is #[[1]]#.",
-                                                                        /*german*/ "",
+                                                                        /*german*/ "Man erzählt sich, daß der #erste explosive Preis# #[[1]]# sei.",
                                                                         /*french*/ "Selon moi, le #premier prix explosif# est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                      // /*spanish*/ Según dicen, el #primer premio explosivo# se trata de #[[1]]#.
 
     hintTextTable[RHT_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE] = HintText(CustomMessage("They say that the #second explosive prize# is #[[1]]#.",
-                                                                         /*german*/ "",
+                                                                         /*german*/ "Man erzählt sich, daß der #zweite explosive Preis# #[[1]]# sei.",
                                                                          /*french*/ "Selon moi, le #deuxième prix explosif# est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                       // /*spanish*/ Según dicen, el #segundo premio explosivo# se trata de #[[1]]#.
 
     hintTextTable[RHT_MARKET_LOST_DOG] = HintText(CustomMessage("They say that #rescuing Richard the Dog# is rewarded with #[[1]]#.",
-                                                     /*german*/ "",
+                                                     /*german*/ "Man erzählt sich, daß die #Rettung des Hundes Richard# mit #[[1]]# belohnt würde.",
                                                      /*french*/ "Selon moi, #retrouver Kiki le chien# promet #[[1]]#.", {QM_RED, QM_GREEN}),
                                                   // /*spanish*/ Según dicen, #rescatar al perrito Ricardo# conduce a #[[1]]#.
                                                   {}, {
                                                   CustomMessage("They say that #puppy lovers# will find #[[1]]#.",
-                                                      /*german*/ "",
+                                                      /*german*/ "Man erzählt sich, daß #Welpenliebhaber# #[[1]]# fänden.",
                                                       /*french*/ "Selon moi, les #amoureux canins# trouveront #[[1]]#.", {QM_RED, QM_GREEN})});
                                                    // /*spanish*/ Según dicen, los #amantes caninos# encontrarán #[[1]]#.
 
     hintTextTable[RHT_LW_OCARINA_MEMORY_GAME] = HintText(CustomMessage("They say that #playing an Ocarina in Lost Woods# is rewarded with #[[1]]#.",
-                                                            /*german*/ "",
+                                                            /*german*/ "Man erzählt sich, daß das #Spielen der Okarina in den verlorenen Wäldern# mit #[[1]]# belohnt würde.",
                                                             /*french*/ "Selon moi, #jouer l'ocarina dans les Bois Perdus# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                          // /*spanish*/ Según dicen, #tocar la ocarina en el Bosque Perdido# otorga #[[1]]#.
                                                          {}, {
                                                          CustomMessage("They say that the prize for a #game of Simon Says# is #[[1]]#.",
-                                                             /*german*/ "",
+                                                             /*german*/ "Man erzählt sich, daß der Preis für eine Partie #Simon sagt# #[[1]]# sei.",
                                                              /*french*/ "Selon moi, la #récompense de Jean Dit# est #[[1]]#.", {QM_RED, QM_GREEN}),
                                                           // /*spanish*/ Según dicen, #repetir ciertas melodías# otorga #[[1]]#.
                                                          CustomMessage("They say that a #child sing-a-long# holds #[[1]]#.",
-                                                             /*german*/ "",
+                                                             /*german*/ "Man erzählt sich, daß die #jungen Flötisten# #[[1]]# besäßen.",
                                                              /*french*/ "Selon moi, les #jeunes flûtistes# donnent #[[1]]#.", {QM_RED, QM_GREEN})});
                                                           // /*spanish*/ Según dicen, #tocar junto a otros# otorga #[[1]]#.
 
     hintTextTable[RHT_KAK_10_GOLD_SKULLTULA_REWARD] = HintText(CustomMessage("They say that slaying #10 Gold Skulltulas# reveals #[[1]]#.",
-                                                                  /*german*/ "",
+                                                                  /*german*/ "Man erzählt sich, daß das Besiegen von #10 Goldenen Skulltulas# #[[1]]# enthüllen würde.",
                                                                   /*french*/ "Selon moi, détruire #10 Skulltulas d'or# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                // /*spanish*/ Según dicen, #exterminar 10 skulltulas doradas# revela #[[1]]#.
                                                                {}, {
                                                                CustomMessage("They say that #10 bug badges# rewards #[[1]]#.",
-                                                                   /*german*/ "",
+                                                                   /*german*/ "Man erzählt sich, daß #10 Käferabzeichen# mit #[[1]]# belohnt würde.",
                                                                    /*french*/ "Selon moi, #10 écussons# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                 // /*spanish*/ Según dicen, #10 medallas de insectos# otorgan #[[1]]#.
                                                                CustomMessage("They say that #10 spider souls# yields #[[1]]#.",
-                                                                   /*german*/ "",
+                                                                   /*german*/ "Man erzählt sich, daß #10 Spinnenseelen# #[[1]]# einbrächten.",
                                                                    /*french*/ "Selon moi, #10 âmes# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                 // /*spanish*/ Según dicen, #10 almas de araña# otorgan #[[1]]#.
                                                                CustomMessage("They say that #10 auriferous arachnids# lead to #[[1]]#.",
-                                                                   /*german*/ "",
+                                                                   /*german*/ "Man erzählt sich, daß #10 goldhaltige Arachniden# zu #[[1]]# führen würden.",
                                                                    /*french*/ "Selon moi, #10 arachnides aurifères# donnent #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                 // /*spanish*/ Según dicen, #10 arácnidos auríferos# otorgan #[[1]]#.
 
     hintTextTable[RHT_KAK_MAN_ON_ROOF] = HintText(CustomMessage("They say that a #rooftop wanderer# holds #[[1]]#.",
-                                                     /*german*/ "",
+                                                     /*german*/ "Man erzählt sich, daß ein #Dachwanderer# #[[1]]# besäße.",
                                                      /*french*/ "Selon moi, une #rencontre sur un toit# donne #[[1]]#.", {QM_RED, QM_GREEN}));
                                                   // /*spanish*/ Según dicen, #alguien sobre un tejado# otorga #[[1]]#.
 
     hintTextTable[RHT_ZR_MAGIC_BEAN_SALESMAN] = HintText(CustomMessage("They say that a #bean seller# offers #[[1]]#.",
-                                                            /*german*/ "",
+                                                            /*german*/ "Man erzählt sich, daß ein #Bohnenverkäufer# #[[1]]# offeriere.",
                                                             /*french*/ "Selon moi, le #marchand de haricots magiques# vend en fait #[[1]]#.", {QM_RED, QM_GREEN}),
                                                          // /*spanish*/ Según dicen, el #vendedor de judías# ofrece #[[1]]#.
                                                          {}, {
                                                          CustomMessage("They say that a seller of #colorful crops# has #[[1]]#.",
-                                                             /*german*/ "",
+                                                             /*german*/ "Man erzählt sich, daß ein Verkäufer #bunter Ernte# #[[1]]# besäße.",
                                                              /*french*/ "Selon moi, le #marchand de légumes# vend #[[1]]#.", {QM_RED, QM_GREEN})});
                                                           // /*spanish*/ Según dicen, el vendedor de un #colorido cultivo# ofrece #[[1]]#.
 
     hintTextTable[RHT_ZR_FROGS_IN_THE_RAIN] = HintText(CustomMessage("They say that #frogs in a storm# gift #[[1]]#.",
-                                                          /*german*/ "",
+                                                          /*german*/ "Man erzählt sich, daß #Frösche im Sturm# #[[1]]# schenken würden.",
                                                           /*french*/ "Selon moi, #des grenouilles mouillées# donnent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                        // /*spanish*/ Según dicen, las #ancas bajo la tormenta# otorgan #[[1]]#.
 
     hintTextTable[RHT_ZR_FROGS_ZELDAS_LULLABY] = HintText(CustomMessage("They say that after hearing #Zelda's Lullaby, the frogs# gift #[[1]]#.",
-                                                             /*german*/ "",
+                                                             /*german*/ "Man erzählt sich, daß die #Frösche nach dem Hören von Zeldas Wiegenlied# #[[1]]# schenken würden.",
                                                              /*french*/ "Selon moi, à l'écoute de #la berceuse de Zelda, les grenouilles# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                           // /*spanish*/ Según dicen, después de escuchar #la Nana de Zelda, las ranas# regalan #[[1]]#.
                                                           {}, {
                                                           CustomMessage("They say that #sleepy frogs# gift #[[1]]#.",
-                                                              /*german*/ "",
+                                                              /*german*/ "Man erzählt sich, daß #schläfrige Frösche# #[[1]]# schenken würden.",
                                                               /*french*/ "Selon moi, #les grenouilles somnolentes# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                            // /*spanish*/ Según dicen, las #ranas somnolientas# regalan #[[1]]#.
                                                           CustomMessage("They say that #the Froggish Tenor in the back-left# gifts #[[1]]#.",
-                                                              /*german*/ "",
+                                                              /*german*/ "Man erzählt sich, daß #der froschige Tenor hinten links# #[[1]]# schenke.",
                                                               /*french*/ "Selon moi, #le ténor grenouillesque au fond à gauche# donne #[[1]]#.", {QM_RED, QM_GREEN})});
                                                            // /*spanish*/ Según dicen, el #Sapo Tenore al fondo, a la izquierda#, regala #[[1]]#.
 
     hintTextTable[RHT_ZR_FROGS_EPONAS_SONG] = HintText(CustomMessage("They say that after hearing #Epona's Song, the frogs# gift #[[1]]#.",
-                                                          /*german*/ "",
+                                                          /*german*/ "Man erzählt sich, daß die #Frösche nach dem Hören von Eponas Lied# #[[1]]# schenken würden.",
                                                           /*french*/ "Selon moi, à l'écoute du #chant d'Epona, les grenouilles# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                        // /*spanish*/ Según dicen, después de escuchar #la Canción de Epona, las ranas# regalan #[[1]]#.
                                                        {}, {
                                                        CustomMessage("They say that #equine frogs# gift #[[1]]#.",
-                                                           /*german*/ "",
+                                                           /*german*/ "Man erzählt sich, daß #pferdeartige Frösche# #[[1]]# schenken würden.",
                                                            /*french*/ "Selon moi, #les grenouilles équestres# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                         // /*spanish*/ Según dicen, las #ranas equinas# regalan #[[1]]#.
                                                        CustomMessage("They say that #the Froggish Tenor in the back-right# gifts #[[1]]#.",
-                                                           /*german*/ "",
+                                                           /*german*/ "Man erzählt sich, daß #der froschige Tenor hinten rechts# #[[1]]# schenke.",
                                                            /*french*/ "Selon moi, #le ténor grenouillesque au fond à droite# donne #[[1]]#.", {QM_RED, QM_GREEN})});
                                                         // /*spanish*/ Según dicen, el #Sapo Tenore al fondo, a la derecha#, regala #[[1]]#.
 
     hintTextTable[RHT_ZR_FROGS_SARIAS_SONG] = HintText(CustomMessage("They say that after hearing #Saria's Song, the frogs# gift #[[1]]#.",
-                                                          /*german*/ "",
+                                                          /*german*/ "Man erzählt sich, daß die #Frösche nach dem Hören von Salias Lied# #[[1]]# schenken würden.",
                                                           /*french*/ "Selon moi, à l'écoute du #chant de Saria, les grenouilles# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                        // /*spanish*/ Según dicen, después de escuchar #la Canción de Saria, las ranas# regalan #[[1]]#.
                                                        {}, {
                                                        CustomMessage("They say that #sylvan frogs# gift #[[1]]#.",
-                                                           /*german*/ "",
+                                                           /*german*/ "Man erzählt sich, daß #waldige Frösche# #[[1]]# schenken würden.",
                                                            /*french*/ "Selon moi, #les grenouilles sylvestres# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                         // /*spanish*/ Según dicen, las #ranas silvestres# regalan #[[1]]#.
                                                        CustomMessage("They say that #the Froggish Tenor in the center# gifts #[[1]]#.",
-                                                           /*german*/ "",
+                                                           /*german*/ "Man erzählt sich, daß #der froschige Tenor im Zentrum# #[[1]]# schenke.",
                                                            /*french*/ "Selon moi, #le ténor grenouillesque dans le centre# donne #[[1]]#.", {QM_RED, QM_GREEN})});
                                                         // /*spanish*/ Según dicen, el #Sapo Tenore en el centro# regala #[[1]]#.
 
     hintTextTable[RHT_ZR_FROGS_SUNS_SONG] = HintText(CustomMessage("They say that after hearing #the Sun's Song, the frogs# gift #[[1]]#.",
-                                                        /*german*/ "",
+                                                        /*german*/ "Man erzählt sich, daß die #Frösche nach dem Hören der Hymne der Sonne# #[[1]]# schenken würden.",
                                                         /*french*/ "Selon moi, à l'écoute du #chant du soleil, les grenouilles# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                      // /*spanish*/ Según dicen, después de escuchar #la Canción del Sol, las ranas# regalan #[[1]]#.
                                                      {}, {
                                                      CustomMessage("They say that #enlightened frogs# gift #[[1]]#.",
-                                                         /*german*/ "",
+                                                         /*german*/ "Man erzählt sich, daß #erleuchtete Frösche# #[[1]]# schenken würden.",
                                                          /*french*/ "Selon moi, #les grenouilles éclairées# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                       // /*spanish*/ Según dicen, las #ranas alumbradas# regalan #[[1]]#.
                                                      CustomMessage("They say that #the Froggish Tenor in the front-left# gifts #[[1]]#.",
-                                                         /*german*/ "",
+                                                         /*german*/ "Man erzählt sich, daß #der froschige Tenor vorne links# #[[1]]# schenke.",
                                                          /*french*/ "Selon moi, #le ténor grenouillesque à l'avant gauche# donne #[[1]]#.", {QM_RED, QM_GREEN})});
                                                       // /*spanish*/ Según dicen, el #Sapo Tenore al frente, a la izquierda#, regala #[[1]]#.
 
     hintTextTable[RHT_ZR_FROGS_SONG_OF_TIME] = HintText(CustomMessage("They say that after hearing #the Song of Time, the frogs# gift #[[1]]#.",
-                                                           /*german*/ "",
+                                                           /*german*/ "Man erzählt sich, daß die #Frösche nach dem Hören der Hymne der Zeit# #[[1]]# schenken würden.",
                                                            /*french*/ "Selon moi, à l'écoute du #chant du temps, les grenouilles# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                         // /*spanish*/ Según dicen, después de escuchar #la Canción del tiempo, las ranas# regalan #[[1]]#.
                                                         {}, {
                                                         CustomMessage("They say that #time-traveling frogs# gift #[[1]]#.",
-                                                            /*german*/ "",
+                                                            /*german*/ "Man erzählt sich, daß #zeitreisende Frösche# #[[1]]# schenken würden.",
                                                             /*french*/ "Selon moi, #les grenouilles voyageuses dans le temps# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                          // /*spanish*/ Según dicen, las #ranas viajeras del tiempo# regalan #[[1]]#.
                                                         CustomMessage("They say that #the Froggish Tenor in the front-right# gifts #[[1]]#.",
-                                                            /*german*/ "",
+                                                            /*german*/ "Man erzählt sich, daß #der froschige Tenor vorne rechts# #[[1]]# schenke.",
                                                             /*french*/ "Selon moi, #le ténor grenouillesque à l'avant droite# donne #[[1]]#.", {QM_RED, QM_GREEN})});
                                                          // /*spanish*/ Según dicen, el #Sapo Tenore al frente, a la derecha#, regala #[[1]]#.
 
     hintTextTable[RHT_GF_HBA_1000_POINTS] = HintText(CustomMessage("They say that scoring 1000 in #horseback archery# grants #[[1]]#.",
-                                                        /*german*/ "",
+                                                        /*german*/ "Man erzählt sich, daß das Erzielen von 1000 Punkten beim #Pferdebogenschießen# #[[1]]# einbrächte.",
                                                         /*french*/ "Selon moi, obtenir 1000 points dans l'#archerie équestre# donne #[[1]]#.", {QM_RED, QM_GREEN}));
                                                      // /*spanish*/ Según dicen, conseguir 1000 puntos en el #tiro con arco a caballo# premia #[[1]]#.
 
     hintTextTable[RHT_MARKET_SHOOTING_GALLERY_REWARD] = HintText(CustomMessage("They say that #shooting in youth# grants #[[1]]#.",
-                                                                    /*german*/ "",
+                                                                    /*german*/ "Man erzählt sich, daß das #Schießen in der Jugend# #[[1]]# einbrächte.",
                                                                     /*french*/ "Selon moi, #faire du tir dans sa jeunesse# donne #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                  // /*spanish*/ Según dicen, #disparar en la juventud# otorga #[[1]]#.
 
     hintTextTable[RHT_KAK_SHOOTING_GALLERY_REWARD] = HintText(CustomMessage("They say that #shooting in maturity# grants #[[1]]#.",
-                                                                 /*german*/ "",
+                                                                 /*german*/ "Man erzählt sich, daß das #Schießen im Alter# #[[1]]# einbrächte.",
                                                                  /*french*/ "Selon moi, #faire du tir dans sa maturité# donne #[[1]]#.", {QM_RED, QM_GREEN}));
                                                               // /*spanish*/ Según dicen, #disparar en la madurez# otorga #[[1]]#.
 
     hintTextTable[RHT_LW_TARGET_IN_WOODS] = HintText(CustomMessage("They say that shooting a #target in the woods# grants #[[1]]#.",
-                                                        /*german*/ "",
+                                                        /*german*/ "Man erzählt sich, daß das Abschießen eines #Zieles in den Wäldern# #[[1]]# einbrächte.",
                                                         /*french*/ "Selon moi, #tirer une cible dans les bois# donne #[[1]]#.", {QM_RED, QM_GREEN}));
                                                      // /*spanish*/ Según dicen, disparar a un #blanco forestal# brinda #[[1]]#.
 
     hintTextTable[RHT_KAK_ANJU_AS_ADULT] = HintText(CustomMessage("They say that a #chicken caretaker# offers adults #[[1]]#.",
-                                                       /*german*/ "",
+                                                       /*german*/ "Man erzählt sich, daß ein #Hühnchenpfleger# Erwachsenen #[[1]]# anböte.",
                                                        /*french*/ "Selon moi, devenir un #éleveur de Cocottes# donne #[[1]]#.", {QM_RED, QM_GREEN}));
                                                     // /*spanish*/ Según dicen, una #cuidadora de emplumados# le ofrece a los mayores #[[1]]#.
 
     hintTextTable[RHT_LLR_TALONS_CHICKENS] = HintText(CustomMessage("They say that #finding Super Cuccos# is rewarded with #[[1]]#.",
-                                                         /*german*/ "",
+                                                         /*german*/ "Man erzählt sich, daß das #Finden von Superhühnchen# mit #[[1]]# belohnt würde.",
                                                          /*french*/ "Selon moi, #trouver des Super Cocottes# donne #[[1]]#.", {QM_RED, QM_GREEN}));
                                                       // /*spanish*/ Según dicen, #hallar los supercucos# conduce a #[[1]]#.
 
     hintTextTable[RHT_GC_ROLLING_GORON_AS_CHILD] = HintText(CustomMessage("They say that the prize offered by a #large rolling Goron# is #[[1]]#.",
-                                                               /*german*/ "",
+                                                               /*german*/ "Man erzählt sich, daß der angebotene Preis eines #großen rollenden Goronen# #[[1]]# sei.",
                                                                /*french*/ "Selon moi, la récompense d'un #gros Goron roulant# est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                             // /*spanish*/ Según dicen, un #gran Goron rodante# otorga #[[1]]#.
 
     hintTextTable[RHT_LH_UNDERWATER_ITEM] = HintText(CustomMessage("They say that the #sunken treasure in a lake# is #[[1]]#.",
-                                                        /*german*/ "",
+                                                        /*german*/ "Man erzählt sich, daß der #versunkene Schatz in einem See# #[[1]]# sei.",
                                                         /*french*/ "Selon moi, le #trésor au fond du lac# est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                      // /*spanish*/ Según dicen, el #tesoro hundido del lago# se trata de #[[1]]#.
 
     hintTextTable[RHT_GF_GERUDO_MEMBERSHIP_CARD] = HintText(CustomMessage("They say that #rescuing captured carpenters# is rewarded with #[[1]]#.",
-                                                               /*german*/ "",
+                                                               /*german*/ "Man erzählt sich, daß das #Retten gefangener Zimmerleute# mit #[[1]]# belohnt würde.",
                                                                /*french*/ "Selon moi, #secourir les charpentiers capturés# assure #[[1]]#.", {QM_RED, QM_GREEN}));
                                                             // /*spanish*/ Según dicen, #rescatar los apresados carpinteros# se premia con #[[1]]#.
 
     hintTextTable[RHT_WASTELAND_BOMBCHU_SALESMAN] = HintText(CustomMessage("They say that a #carpet guru# sells #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß ein #Teppichguru# #[[1]]# verkaufe.",
                                                                 /*french*/ "Selon moi, #un marchand du désert# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/ Según dicen, el #genio de una alfombra# vende #[[1]]#.
 
     hintTextTable[RHT_GC_MEDIGORON] = HintText(CustomMessage("They say that #Medigoron# sells #[[1]]#.",
-                                                  /*german*/ "",
+                                                  /*german*/ "Man erzählt sich, daß #Medigoron# #[[1]]# verkaufe.",
                                                   /*french*/ "Selon moi, #Medigoron# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                // /*spanish*/ Según dicen, #Medigoron# vende #[[1]]#.
 
     hintTextTable[RHT_KAK_GRANNYS_SHOP] = HintText(CustomMessage("They say that the #potion shop lady# sells #[[1]]#.",
-                                                      /*german*/ "",
+                                                      /*german*/ "Man erzählt sich, daß die #Dame des Hexenladens# #[[1]]# verkaufe.",
                                                       /*french*/ "Selon moi, la #dame du magasin de potion# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                    // /*spanish*/ Según dicen, la #señora de la tienda de pociones# vende #[[1]]#.
 
     hintTextTable[RHT_KAK_IMPAS_HOUSE_FREESTANDING_POH] = HintText(CustomMessage("They say that #imprisoned in a house# lies #[[1]]#.",
-                                                                      /*german*/ "",
+                                                                      /*german*/ "Man erzählt sich, daß #eingesperrt in einem Haus# #[[1]]# läge.",
                                                                       /*french*/ "Selon moi, #encagé dans une maison# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                    // /*spanish*/ Según dicen, #en una casa entre rejas# yace #[[1]]#.
 
     hintTextTable[RHT_HF_TEKTITE_GROTTO_FREESTANDING_POH] = HintText(CustomMessage("They say that #deep underwater in a hole# is #[[1]]#.",
-                                                                        /*german*/ "",
+                                                                        /*german*/ "Man erzählt sich, daß #tief unter Wasser in einem Loch# #[[1]]# sei.",
                                                                         /*french*/ "Selon moi, #dans les profondeurs d'une grotte# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                      // /*spanish*/ Según dicen, #en lo hondo bajo un hoyo# yace #[[1]]#.
 
     hintTextTable[RHT_KAK_WINDMILL_FREESTANDING_POH] = HintText(CustomMessage("They say that on a #windmill ledge# lies #[[1]]#.",
-                                                                   /*german*/ "",
+                                                                   /*german*/ "Man erzählt sich, daß auf einem #Vorsprung in einer Windmühle# #[[1]]# läge.",
                                                                    /*french*/ "Selon moi, #haut perché dans le moulin# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                 // /*spanish*/ Según dicen, al #borde de un molino# yace #[[1]]#.
 
     hintTextTable[RHT_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH] = HintText(CustomMessage("They say that #dead Dampe's second# prize is #[[1]]#.",
-                                                                           /*german*/ "",
+                                                                           /*german*/ "Man erzählt sich, daß der #zweite Preis des toten Boris# #[[1]]# sei.",
                                                                            /*french*/ "Selon moi, la #deuxième course d'Igor# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                         // /*spanish*/ Según dicen, el segundo premio de #la carrera de Dampé# se trata de #[[1]]#.
                                                                         {}, {
                                                                         CustomMessage("They say that #racing a ghost# leads to #[[1]]#.",
-                                                                            /*german*/ "",
+                                                                            /*german*/ "Man erzählt sich, daß das #Rennen gegen einen Geist# zu #[[1]]# führen würde.",
                                                                             /*french*/ "Selon moi, le défi du #revenant rapide# donne #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                          // /*spanish*/ Según dicen, #perseguir a un fantasma# conduce a #[[1]]#.
 
     hintTextTable[RHT_LLR_FREESTANDING_POH] = HintText(CustomMessage("They say that in a #ranch silo# lies #[[1]]#.",
-                                                          /*german*/ "",
+                                                          /*german*/ "Man erzählt sich, daß in einem #ländlichen Silo# #[[1]]# läge.",
                                                           /*french*/ "Selon moi, #dans l'entrepôt de la ferme# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                        // /*spanish*/ Según dicen, en un #granero rupestre# yace #[[1]]#.
 
     hintTextTable[RHT_GRAVEYARD_FREESTANDING_POH] = HintText(CustomMessage("They say that a #crate in a graveyard# hides #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß eine #Kiste auf einem Friedhof# #[[1]]# verberge.",
                                                                 /*french*/ "Selon moi, #la boîte dans le Cimetière# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/ Según dicen, bajo la #caja de un cementerio# yace #[[1]]#.
 
     hintTextTable[RHT_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR] = HintText(CustomMessage("They say that a #gravekeeper digs up# #[[1]]#.",
-                                                                       /*german*/ "",
+                                                                       /*german*/ "Man erzählt sich, daß ein #Grabpfleger# #[[1]]# ausgrabe.",
                                                                        /*french*/ "Selon moi, #le jeu du fossoyeur# cache #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                     // /*spanish*/ Según dicen, cierto #sepultero desentierra# #[[1]]#.
 
     hintTextTable[RHT_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH] = HintText(CustomMessage("They say that on top of a #pillar in a river# lies #[[1]]#.",
-                                                                          /*german*/ "",
+                                                                          /*german*/ "Man erzählt sich, daß auf der Spitze einer #Säule in einem Fluß# #[[1]]# läge.",
                                                                           /*french*/ "Selon moi, #sur un pilier au dessus du fleuve# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                        // /*spanish*/ Según dicen, en lo alto del #pilar de un río# yace #[[1]]#.
 
     hintTextTable[RHT_ZR_NEAR_DOMAIN_FREESTANDING_POH] = HintText(CustomMessage("They say that on a #river ledge by a waterfall# lies #[[1]]#.",
-                                                                     /*german*/ "",
+                                                                     /*german*/ "Man erzählt sich, daß auf einem #Vorsprung von einem Fluß nahe eines Wasserfalls# #[[1]]# läge.",
                                                                      /*french*/ "Selon moi, #sur la falaise au dessus du fleuve# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                   // /*spanish*/ Según dicen, al borde de #la entrada a una cascada# yace #[[1]]#.
 
     hintTextTable[RHT_LH_FREESTANDING_POH] = HintText(CustomMessage("They say that high on a #lab rooftop# one can find #[[1]]#.",
-                                                         /*german*/ "",
+                                                         /*german*/ "Man erzählt sich, daß man auf dem #Dach eines Laboratoriums# #[[1]]# finden könne.",
                                                          /*french*/ "Selon moi, #la tour d'observation du lac# cache #[[1]]#.", {QM_RED, QM_GREEN}));
                                                       // /*spanish*/ Según dicen, en lo #alto de un laboratorio# yace #[[1]]#.
 
     hintTextTable[RHT_ZF_ICEBERG_FREESTANDING_POH] = HintText(CustomMessage("They say that #floating on ice# is #[[1]]#.",
-                                                                 /*german*/ "",
+                                                                 /*german*/ "Man erzählt sich, daß sich schwebend auf Eis #[[1]]# befände.",
                                                                  /*french*/ "Selon moi, #gisant sur la glace# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                               // /*spanish*/ Según dicen, #flotando sobre hielo# yace #[[1]]#.
 
     hintTextTable[RHT_GV_WATERFALL_FREESTANDING_POH] = HintText(CustomMessage("They say that behind a #valley waterfall# is #[[1]]#.",
-                                                                   /*german*/ "",
+                                                                   /*german*/ "Man erzählt sich, daß hinter einem #Wasserfall in einem Tal# #[[1]]# sei.",
                                                                    /*french*/ "Selon moi, #derrière la cascade du désert# se cache #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                 // /*spanish*/ Según dicen, tras una #desierta cascada# yace #[[1]]#.
 
     hintTextTable[RHT_GV_CRATE_FREESTANDING_POH] = HintText(CustomMessage("They say that a #crate in a valley# hides #[[1]]#.",
-                                                               /*german*/ "",
+                                                               /*german*/ "Man erzählt sich, daß eine #Kiste in einem Tal# #[[1]]# verberge.",
                                                                /*french*/ "Selon moi, la #boîte dans la vallée# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                             // /*spanish*/ Según dicen, bajo la #caja de un valle# yace #[[1]]#.
 
     hintTextTable[RHT_COLOSSUS_FREESTANDING_POH] = HintText(CustomMessage("They say that on top of an #arch of stone# lies #[[1]]#.",
-                                                               /*german*/ "",
+                                                               /*german*/ "Man erzählt sich, daß auf der Spitze eines #Steinbogens# #[[1]]# läge.",
                                                                /*french*/ "Selon moi, #gisant sur une arche de pierre# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                             // /*spanish*/ Según dicen, en lo alto de un #arco de piedra# yace #[[1]]#.
 
     hintTextTable[RHT_DMT_FREESTANDING_POH] = HintText(CustomMessage("They say that above a #mountain cavern entrance# is #[[1]]#.",
-                                                          /*german*/ "",
+                                                          /*german*/ "Man erzählt sich, daß oberhalb eines #Berghöhleneingangs# #[[1]]# sei.",
                                                           /*french*/ "Selon moi, gisant #au dessus de la caverne montagneuse# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                        // /*spanish*/ Según dicen, en lo alto de la #entrada de una cueva en la montaña# yace #[[1]]#.
 
     hintTextTable[RHT_DMC_WALL_FREESTANDING_POH] = HintText(CustomMessage("They say that nestled in a #volcanic wall# is #[[1]]#.",
-                                                               /*german*/ "",
+                                                               /*german*/ "Man erzählt sich, daß in einem #vulkanischen Alkoven# #[[1]]# sei.",
                                                                /*french*/ "Selon moi, dans une #alcove volcanique# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                             // /*spanish*/ Según dicen, entre unas #murallas volcánicas# yace #[[1]]#.
 
     hintTextTable[RHT_DMC_VOLCANO_FREESTANDING_POH] = HintText(CustomMessage("They say that obscured by #volcanic ash# is #[[1]]#.",
-                                                                  /*german*/ "",
+                                                                  /*german*/ "Man erzählt sich, daß #[[1]]# von #Vulkanasche# verdeckt sei.",
                                                                   /*french*/ "Selon moi, #recouvert de cendres volcaniques# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                // /*spanish*/ Según dicen, bajo la #ceniza volcánica# yace #[[1]]#.
 
     hintTextTable[RHT_GF_NORTH_F1_CARPENTER] = HintText(CustomMessage("They say that #defeating Gerudo guards# reveals #[[1]]#.",
-                                                           /*german*/ "",
+                                                           /*german*/ "Man erzählt sich, daß das #Besiegen der Gerudo-Wachen# #[[1]]# enthüllen würde.",
                                                            /*french*/ "Selon moi, les #geôliers Gerudo# détiennent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                         // /*spanish*/ Según dicen, #derrotar a las guardas Gerudo# revela #[[1]]#.
 
     hintTextTable[RHT_GF_NORTH_F2_CARPENTER] = HintText(CustomMessage("They say that #defeating Gerudo guards# reveals #[[1]]#.",
-                                                           /*german*/ "",
+                                                           /*german*/ "Man erzählt sich, daß das #Besiegen der Gerudo-Wachen# #[[1]]# enthüllen würde.",
                                                            /*french*/ "Selon moi, les #geôliers Gerudo# détiennent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                         // /*spanish*/ Según dicen, #derrotar a las guardas Gerudo# revela #[[1]]#.
 
     hintTextTable[RHT_GF_SOUTH_F1_CARPENTER] = HintText(CustomMessage("They say that #defeating Gerudo guards# reveals #[[1]]#.",
-                                                           /*german*/ "",
+                                                           /*german*/ "Man erzählt sich, daß das #Besiegen der Gerudo-Wachen# #[[1]]# enthüllen würde.",
                                                            /*french*/ "Selon moi, les #geôliers Gerudo# détiennent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                         // /*spanish*/ Según dicen, #derrotar a las guardas Gerudo# revela #[[1]]#.
 
     hintTextTable[RHT_GF_SOUTH_F2_CARPENTER] = HintText(CustomMessage("They say that #defeating Gerudo guards# reveals #[[1]]#.",
-                                                           /*german*/ "",
+                                                           /*german*/ "Man erzählt sich, daß das #Besiegen der Gerudo-Wachen# #[[1]]# enthüllen würde.",
                                                            /*french*/ "Selon moi, les #geôliers Gerudo# détiennent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                         // /*spanish*/ Según dicen, #derrotar a las guardas Gerudo# revela #[[1]]#.
 
     hintTextTable[RHT_HF_GS_NEAR_KAK_GROTTO] = HintText(CustomMessage("They say that a #spider-guarded spider in a hole# hoards #[[1]]#.",
-                                                           /*german*/ "",
+                                                           /*german*/ "Man erzählt sich, daß eine #spinnenbewachte Spinne in einem Loch #[[1]]# horte.",
                                                            /*french*/ "Selon moi, une #Skulltula dans un trou d'arachnides# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                         // /*spanish*/ Según dicen, una #Skulltula custodiada por otra# de un hoyo otorga #[[1]]#.
 
     hintTextTable[RHT_LLR_GS_BACK_WALL] = HintText(CustomMessage("They say that night reveals a #spider in a ranch# holding #[[1]]#.",
-                                                      /*german*/ "",
+                                                      /*german*/ "Man erzählt sich, daß die Nacht eine #Spinne auf einer Farm# enthülle, welche #[[1]]# besäße.",
                                                       /*french*/ "Selon moi, une #Skulltula sur la façade de la ferme# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                    // /*spanish*/ Según dicen, la noche revela una #Skulltula del rancho# que otorga #[[1]]#.
 
     hintTextTable[RHT_LLR_GS_RAIN_SHED] = HintText(CustomMessage("They say that night reveals a #spider in a ranch# holding #[[1]]#.",
-                                                      /*german*/ "",
+                                                      /*german*/ "Man erzählt sich, daß die Nacht eine #Spinne auf einer Farm# enthülle, welche #[[1]]# besäße.",
                                                       /*french*/ "Selon moi, une #Skulltula sur le mur de l'enclos# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                    // /*spanish*/ Según dicen, la noche revela una #Skulltula del rancho# que otorga #[[1]]#.
 
     hintTextTable[RHT_LLR_GS_HOUSE_WINDOW] = HintText(CustomMessage("They say that night reveals a #spider in a ranch# holding #[[1]]#.",
-                                                         /*german*/ "",
+                                                         /*german*/ "Man erzählt sich, daß die Nacht eine #Spinne auf einer Farm# enthülle, welche #[[1]]# besäße.",
                                                          /*french*/ "Selon moi, une #Skulltula sur la maison de ferme# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                       // /*spanish*/ Según dicen, la noche revela una #Skulltula del rancho# que otorga #[[1]]#.
 
     hintTextTable[RHT_LLR_GS_TREE] = HintText(CustomMessage("They say that a spider hiding in a #ranch tree# holds #[[1]]#.",
-                                                 /*german*/ "",
+                                                 /*german*/ "Man erzählt sich, daß eine in einem #Baum auf einer Farm# versteckte Spinne #[[1]]# besäße.",
                                                  /*french*/ "Selon moi, une #Skulltula dans l'arbre de la ferme# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                               // /*spanish*/ Según dicen, una Skulltula escondida en el #árbol de un rancho# otorga #[[1]]#.
 
     hintTextTable[RHT_KF_GS_BEAN_PATCH] = HintText(CustomMessage("They say that a #spider buried in a forest# holds #[[1]]#.",
-                                                      /*german*/ "",
+                                                      /*german*/ "Man erzählt sich, daß eine #in einem Wald vergrabene Spinne# #[[1]]# besäße.",
                                                       /*french*/ "Selon moi, une #Skulltula enterrée dans la forêt# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                    // /*spanish*/ Según dicen, una #Skulltula enterrada en un bosque# otorga #[[1]]#.
 
     hintTextTable[RHT_KF_GS_KNOW_IT_ALL_HOUSE] = HintText(CustomMessage("They say that night in the past reveals a #spider in a forest# holding #[[1]]#.",
-                                                             /*german*/ "",
+                                                             /*german*/ "Man erzählt sich, daß die Nacht in der Vergangenheit eine #Spinne in einem Wald# enthülle, welche #[[1]]# besäße.",
                                                              /*french*/ "Selon moi, une #Skulltula derrière une cabane de la forêt# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                           // /*spanish*/ Según dicen, la noche revela en el pasado una #Skulltula del bosque# que otorga #[[1]]#.
 
     hintTextTable[RHT_KF_GS_HOUSE_OF_TWINS] = HintText(CustomMessage("They say that night in the future reveals a #spider in a forest# holding #[[1]]#.",
-                                                          /*german*/ "",
+                                                          /*german*/ "Man erzählt sich, daß die Nacht in der Zukunft eine #Spinne in einem Wald# enthülle, welche #[[1]]# besäße.",
                                                           /*french*/ "Selon moi, une #Skulltula sur une cabane de la forêt# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                        // /*spanish*/ Según dicen, la noche revela en el futuro una #Skulltula del rancho# que otorga #[[1]]#.
 
     hintTextTable[RHT_LW_GS_BEAN_PATCH_NEAR_BRIDGE] = HintText(CustomMessage("They say that a #spider buried deep in a forest maze# holds #[[1]]#.",
-                                                                  /*german*/ "",
+                                                                  /*german*/ "Man erzählt sich, daß eine #tief in einem Waldlabyrinth vergrabene Spinne# #[[1]]# besäße.",
                                                                   /*french*/ "Selon moi, une #Skulltula enterrée dans les bois# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                // /*spanish*/ Según dicen, una #Skulltula enterrada en un laberinto forestal# otorga #[[1]]#.
 
     hintTextTable[RHT_LW_GS_BEAN_PATCH_NEAR_THEATER] = HintText(CustomMessage("They say that a #spider buried deep in a forest maze# holds #[[1]]#.",
-                                                                   /*german*/ "",
+                                                                   /*german*/ "Man erzählt sich, daß eine #tief in einem Waldlabyrinth vergrabene Spinne# #[[1]]# besäße.",
                                                                    /*french*/ "Selon moi, une #Skulltula enterrée dans les bois# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                 // /*spanish*/ Según dicen, una #Skulltula enterrada en un laberinto forestal# otorga #[[1]]#.
 
     hintTextTable[RHT_LW_GS_ABOVE_THEATER] = HintText(CustomMessage("They say that night reveals a #spider deep in a forest maze# holding #[[1]]#.",
-                                                         /*german*/ "",
+                                                         /*german*/ "Man erzählt sich, daß die Nacht eine #Spinne tief in einem Waldlabyrinth# enthülle, welche #[[1]]# besäße.",
                                                          /*french*/ "Selon moi, une #Skulltula haut perchée dans les bois# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                       // /*spanish*/ Según dicen, la noche revela una #Skulltula del laberinto forestal# que otorga #[[1]]#.
 
     hintTextTable[RHT_SFM_GS] = HintText(CustomMessage("They say that night reveals a #spider in a forest meadow# holding #[[1]]#.",
-                                            /*german*/ "",
+                                            /*german*/ "Man erzählt sich, daß die Nacht eine #Spinne auf einer Waldwiese# enthülle, welche #[[1]]# besäße.",
                                             /*french*/ "Selon moi, une #Skulltula dans le sanctuaire des bois# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                          // /*spanish*/ Según dicen, la noche revela una #Skulltula de la pradera del bosque# que otorga #[[1]]#.
 
     hintTextTable[RHT_OGC_GS] = HintText(CustomMessage("They say that a #spider outside a tyrant's tower# holds #[[1]]#.",
-                                            /*german*/ "",
+                                            /*german*/ "Man erzählt sich, daß eine #Spinne außerhalb eines Turms eines Tyrannen# #[[1]]# besäße.",
                                             /*french*/ "Selon moi, une #Skulltula parmi les ruines du château# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                          // /*spanish*/ Según dicen, una #Skulltula a las afueras de la torre de un tirano# otorga #[[1]]#.
 
     hintTextTable[RHT_HC_GS_TREE] = HintText(CustomMessage("They say that a spider hiding in a #tree outside of a castle# holds #[[1]]#.",
-                                                /*german*/ "",
+                                                /*german*/ "Man erzählt sich, daß eine in einem #Baum außerhalb von einem Schloß befindliche Spinne# #[[1]]# besäße.",
                                                 /*french*/ "Selon moi, une #Skulltula dans l'arbre près du château# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                              // /*spanish*/ Según dicen, una Skulltula escondida en el #árbol de las afueras de un castillo# otorga #[[1]]#.
 
     hintTextTable[RHT_MARKET_GS_GUARD_HOUSE] = HintText(CustomMessage("They say that a #spider in a guarded crate# holds #[[1]]#.",
-                                                           /*german*/ "",
+                                                           /*german*/ "Man erzählt sich, daß eine #Spinne in einer bewachten Kiste# #[[1]]# besäße.",
                                                            /*french*/ "Selon moi, une #Skulltula dans une boîte en ville# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                         // /*spanish*/ Según dicen, una #Skulltula bajo una custodiada caja# otorga #[[1]]#.
 
     hintTextTable[RHT_DMC_GS_BEAN_PATCH] = HintText(CustomMessage("They say that a #spider buried in a volcano# holds #[[1]]#.",
-                                                       /*german*/ "",
+                                                       /*german*/ "Man erzählt sich, daß eine #in einem Vulkan begrabene Spinne# #[[1]]# besäße.",
                                                        /*french*/ "Selon moi, une #Skulltula enterrée dans un volcan# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                     // /*spanish*/ Según dicen, una #Skulltula enterrada en un volcán# otorga #[[1]]#.
 
     hintTextTable[RHT_DMT_GS_BEAN_PATCH] = HintText(CustomMessage("They say that a #spider buried outside a cavern# holds #[[1]]#.",
-                                                       /*german*/ "",
+                                                       /*german*/ "Man erzählt sich, daß eine #außerhalb einer Höhle begrabene Spinne# #[[1]]# besäße.",
                                                        /*french*/ "Selon moi, une #Skulltula enterrée près d'une caverne# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                     // /*spanish*/ Según dicen, una #Skulltula enterrada a la entrada de una cueva# otorga #[[1]]#.
 
     hintTextTable[RHT_DMT_GS_NEAR_KAK] = HintText(CustomMessage("They say that a #spider hidden in a mountain nook# holds #[[1]]#.",
-                                                     /*german*/ "",
+                                                     /*german*/ "Man erzählt sich, daß eine #in einem Bergwinkel versteckte Spinne# #[[1]]# besäße.",
                                                      /*french*/ "Selon moi, une #Skulltula cachée dans le flanc d'une montagne# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                   // /*spanish*/ Según dicen, una #Skulltula oculta en el rincón de la montaña# otorga #[[1]]#.
 
     hintTextTable[RHT_DMT_GS_ABOVE_DODONGOS_CAVERN] = HintText(CustomMessage("They say that the hammer reveals a #spider on a mountain# holding #[[1]]#.",
-                                                                  /*german*/ "",
+                                                                  /*german*/ "Man erzählt sich, daß der Hammer eine #Spinne auf einem Berg# enthülle, welche #[[1]]# besäße.",
                                                                   /*french*/ "Selon moi, une #Skulltula derrière un rocher massif près d'une caverne# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                // /*spanish*/ Según dicen, el martillo revela #una Skulltula de la montaña# que otorga #[[1]]#.
 
     hintTextTable[RHT_DMT_GS_FALLING_ROCKS_PATH] = HintText(CustomMessage("They say that the hammer reveals a #spider on a mountain# holding #[[1]]#.",
-                                                               /*german*/ "",
+                                                               /*german*/ "Man erzählt sich, daß der Hammer eine #Spinne auf einem Berg# enthülle, welche #[[1]]# besäße.",
                                                                /*french*/ "Selon moi, une #Skulltula derrière un rocher massif près du sommet d'un volcan# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                             // /*spanish*/ Según dicen, el martillo revela #una Skulltula de la montaña# que otorga #[[1]]#.
 
     hintTextTable[RHT_GC_GS_CENTER_PLATFORM] = HintText(CustomMessage("They say that a #suspended spider# in Goron City holds #[[1]]#.",
-                                                           /*german*/ "",
+                                                           /*german*/ "Man erzählt sich, daß eine #hängende Spinne# in Goronia #[[1]]# besäße.",
                                                            /*french*/ "Selon moi, une #Skulltula perchée dans le village Goron# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                         // /*spanish*/ Según dicen, una #Skulltula suspendida# en la Ciudad Goron otorga #[[1]]#.
 
     hintTextTable[RHT_GC_GS_BOULDER_MAZE] = HintText(CustomMessage("They say that a spider in a #Goron City crate# holds #[[1]]#.",
-                                                        /*german*/ "",
+                                                        /*german*/ "Man erzählt sich, daß eine Spinne in einer #Kiste in Goronia# #[[1]]# besäße.",
                                                         /*french*/ "Selon moi, une #Skulltula dans une boîte du village Goron# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                      // /*spanish*/ Según dicen, una #Skulltula bajo una caja# de la Ciudad Goron otorga #[[1]]#.
 
     hintTextTable[RHT_KAK_GS_HOUSE_UNDER_CONSTRUCTION] = HintText(CustomMessage("They say that night in the past reveals a #spider in a town# holding #[[1]]#.",
-                                                                     /*german*/ "",
+                                                                     /*german*/ "Man erzählt sich, daß die Nacht in der Vergangenheit eine #Spinne in einer Stadt# enthülle, welche #[[1]]# besäße.",
                                                                      /*french*/ "Selon moi, une #Skulltula dans le chantier de construction# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                   // /*spanish*/ Según dicen, la noche del pasado revela una #Skulltula del pueblo# que otorga #[[1]]#.
 
     hintTextTable[RHT_KAK_GS_SKULLTULA_HOUSE] = HintText(CustomMessage("They say that night in the past reveals a #spider in a town# holding #[[1]]#.",
-                                                            /*german*/ "",
+                                                            /*german*/ "Man erzählt sich, daß die Nacht in der Vergangenheit eine #Spinne in einer Stadt# enthülle, welche #[[1]]# besäße.",
                                                             /*french*/ "Selon moi, une #Skulltula sur une maison maudite# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                          // /*spanish*/ Según dicen, la noche del pasado revela una #Skulltula del pueblo# que otorga #[[1]]#.
 
     hintTextTable[RHT_KAK_GS_GUARDS_HOUSE] = HintText(CustomMessage("They say that night in the past reveals a #spider in a town# holding #[[1]]#.",
-                                                         /*german*/ "",
+                                                         /*german*/ "Man erzählt sich, daß die Nacht in der Vergangenheit eine #Spinne in einer Stadt# enthülle, welche #[[1]]# besäße.",
                                                          /*french*/ "Selon moi, une #Skulltula sur une maison de village# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                       // /*spanish*/ Según dicen, la noche del pasado revela una #Skulltula del pueblo# que otorga #[[1]]#.
 
     hintTextTable[RHT_KAK_GS_TREE] = HintText(CustomMessage("They say that night in the past reveals a #spider in a town# holding #[[1]]#.",
-                                                 /*german*/ "",
+                                                 /*german*/ "Man erzählt sich, daß die Nacht in der Vergangenheit eine #Spinne in einer Stadt# enthülle, welche #[[1]]# besäße.",
                                                  /*french*/ "Selon moi, une #Skulltula dans un arbre de village# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                               // /*spanish*/ Según dicen, la noche del pasado revela una #Skulltula del pueblo# que otorga #[[1]]#.
 
     hintTextTable[RHT_KAK_GS_WATCHTOWER] = HintText(CustomMessage("They say that night in the past reveals a #spider in a town# holding #[[1]]#.",
-                                                       /*german*/ "",
+                                                       /*german*/ "Man erzählt sich, daß die Nacht in der Vergangenheit eine #Spinne in einer Stadt# enthülle, welche #[[1]]# besäße.",
                                                        /*french*/ "Selon moi, une #Skulltula sur une échelle dans un village# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                     // /*spanish*/ Según dicen, la noche del pasado revela una #Skulltula del pueblo# que otorga #[[1]]#.
 
     hintTextTable[RHT_KAK_GS_ABOVE_IMPAS_HOUSE] = HintText(CustomMessage("They say that night in the future reveals a #spider in a town# holding #[[1]]#.",
-                                                              /*german*/ "",
+                                                              /*german*/ "Man erzählt sich, daß die Nacht in der Zukunft eine #Spinne in einer Stadt# enthülle, welche #[[1]]# besäße.",
                                                               /*french*/ "Selon moi, une #Skulltula au dessus d'une grande maison# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                            // /*spanish*/ Según dicen, la noche del futuro revela una #Skulltula del pueblo# que otorga #[[1]]#.
 
     hintTextTable[RHT_GRAVEYARD_GS_WALL] = HintText(CustomMessage("They say that night reveals a #spider in a graveyard# holding #[[1]]#.",
-                                                       /*german*/ "",
+                                                       /*german*/ "Man erzählt sich, daß die Nacht eine #Spinne auf einem Friedhof# enthülle, welche #[[1]]# besäße.",
                                                        /*french*/ "Selon moi, une #Skulltula sur une façade du Cimetière# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                     // /*spanish*/ Según dicen, la noche revela una #Skulltula del cementerio# que otorga #[[1]]#.
 
     hintTextTable[RHT_GRAVEYARD_GS_BEAN_PATCH] = HintText(CustomMessage("They say that a #spider buried in a graveyard# holds #[[1]]#.",
-                                                             /*german*/ "",
+                                                             /*german*/ "Man erzählt sich, daß eine #auf einem Friedhof begrabene Spinne# #[[1]]# besäße.",
                                                              /*french*/ "Selon moi, une #Skulltula enterrée dans le Cimetière# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                           // /*spanish*/ Según dicen, una #Skulltula enterrada en el cementerio# otorga #[[1]]#.
 
     hintTextTable[RHT_ZR_GS_LADDER] = HintText(CustomMessage("They say that night in the past reveals a #spider in a river# holding #[[1]]#.",
-                                                  /*german*/ "",
+                                                  /*german*/ "Man erzählt sich, daß die Nacht in der Vergangenheit eine #Spinne in einem Fluß# enthülle, welche #[[1]]# besäße.",
                                                   /*french*/ "Selon moi, une #Skulltula sur une échelle près d'une cascade# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                // /*spanish*/ Según dicen, la noche del pasado revela una #Skulltula del río# que otorga #[[1]]#.
 
     hintTextTable[RHT_ZR_GS_TREE] = HintText(CustomMessage("They say that a spider hiding in a #tree by a river# holds #[[1]]#.",
-                                                /*german*/ "",
+                                                /*german*/ "Man erzählt sich, daß eine in einem #Baum bei einem Fluß# versteckte Spinne #[[1]]# besäße.",
                                                 /*french*/ "Selon moi, une #Skulltula dans un arbre près du fleuve# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                              // /*spanish*/ Según dicen, una Skulltula escondida en el #árbol de un río# otorga #[[1]]#.
 
     hintTextTable[RHT_ZR_GS_ABOVE_BRIDGE] = HintText(CustomMessage("They say that night in the future reveals a #spider in a river# holding #[[1]]#.",
-                                                        /*german*/ "",
+                                                        /*german*/ "Man erzählt sich, daß die Nacht in der Zukunft eine #Spinne in einem Fluß# enthülle, welche #[[1]]# besäße.",
                                                         /*french*/ "Selon moi, une #Skulltula sur une façade près d'une cascade# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                      // /*spanish*/ Según dicen, la noche del futuro revela una #Skulltula del río# que otorga #[[1]]#.
 
     hintTextTable[RHT_ZR_GS_NEAR_RAISED_GROTTOS] = HintText(CustomMessage("They say that night in the future reveals a #spider in a river# holding #[[1]]#.",
-                                                               /*german*/ "",
+                                                               /*german*/ "Man erzählt sich, daß die Nacht in der Zukunft eine #Spinne in einem Fluß# enthülle, welche #[[1]]# besäße.",
                                                                /*french*/ "Selon moi, une #Skulltula sur une façade près d'une grotte du fleuve# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                             // /*spanish*/ Según dicen, la noche del futuro revela una #Skulltula del río# que otorga #[[1]]#.
 
     hintTextTable[RHT_ZD_GS_FROZEN_WATERFALL] = HintText(CustomMessage("They say that night reveals a #spider by a frozen waterfall# holding #[[1]]#.",
-                                                            /*german*/ "",
+                                                            /*german*/ "Man erzählt sich, daß die Nacht eine #Spinne bei einem gefrorenen Wasserfall# enthülle, welche #[[1]]# besäße.",
                                                             /*french*/ "Selon moi, une #Skulltula près d'une cascade gelée# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                          // /*spanish*/ Según dicen, la noche revela una #Skulltula junto a una congelada cascada# que otorga #[[1]]#.
 
     hintTextTable[RHT_ZF_GS_ABOVE_THE_LOG] = HintText(CustomMessage("They say that night reveals a #spider near a deity# holding #[[1]]#.",
-                                                         /*german*/ "",
+                                                         /*german*/ "Man erzählt sich, daß die Nacht eine #Spinne in der Nähe einer Gottheit# enthülle, welche #[[1]]# besäße.",
                                                          /*french*/ "Selon moi, une #Skulltula près du gardien aquatique# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                       // /*spanish*/ Según dicen, la noche revela una #Skulltula junto a cierta deidad# que otorga #[[1]]#.
 
     hintTextTable[RHT_ZF_GS_TREE] = HintText(CustomMessage("They say that a spider hiding in a #tree near a deity# holds #[[1]]#.",
-                                                /*german*/ "",
+                                                /*german*/ "Man erzählt sich, daß eine in einem #Baum in der Nähe einer Gottheit# versteckte Spinne #[[1]]# besäße.",
                                                 /*french*/ "Selon moi, une #Skulltula dans un arbre dans un réservoir# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                              // /*spanish*/ Según dicen, una Skulltula escondida en el #árbol junto a cierta deidad# otorga #[[1]]#.
 
     hintTextTable[RHT_LH_GS_BEAN_PATCH] = HintText(CustomMessage("They say that a #spider buried by a lake# holds #[[1]]#.",
-                                                      /*german*/ "",
+                                                      /*german*/ "Man erzählt sich, daß eine #bei einem Fluß begrabene Spinne# #[[1]]# besäße.",
                                                       /*french*/ "Selon moi, une #Skulltula enterrée près d'un lac# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                    // /*spanish*/ Según dicen, una #Skulltula enterrada junto a un lago# otorga #[[1]]#.
 
     hintTextTable[RHT_LH_GS_SMALL_ISLAND] = HintText(CustomMessage("They say that night reveals a #spider by a lake# holding #[[1]]#.",
-                                                        /*german*/ "",
+                                                        /*german*/ "Man erzählt sich, daß die Nacht eine #Spinne bei einem Fluß# enthülle, welche #[[1]]# besäße.",
                                                         /*french*/ "Selon moi, une #Skulltula sur un îlot du lac# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                      // /*spanish*/ Según dicen, la noche revela una #Skulltula junto a un lago# que otorga #[[1]]#.
 
     hintTextTable[RHT_LH_GS_LAB_WALL] = HintText(CustomMessage("They say that night reveals a #spider by a lake# holding #[[1]]#.",
-                                                    /*german*/ "",
+                                                    /*german*/ "Man erzählt sich, daß die Nacht eine #Spinne bei einem Fluß# enthülle, welche #[[1]]# besäße.",
                                                     /*french*/ "Selon moi, une #Skulltula sur le mur d'un centre de recherche# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                  // /*spanish*/ Según dicen, la noche revela una #Skulltula junto a un lago# que otorga #[[1]]#.
 
     hintTextTable[RHT_LH_GS_LAB_CRATE] = HintText(CustomMessage("They say that a spider deed underwater in a #lab crate# holds #[[1]]#.",
-                                                     /*german*/ "",
+                                                     /*german*/ "Man erzählt sich, daß einer Spinne in einer #Laborkiste# unter Wasser #[[1]]# besäße.",
                                                      /*french*/ "Selon moi, une #Skulltula dans une boîte au fond d'une cuve d'eau# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                   // /*spanish*/ Según dicen, una #Skulltula bajo la sumergida caja de un laboratorio# otorga #[[1]]#.
 
     hintTextTable[RHT_LH_GS_TREE] = HintText(CustomMessage("They say that night reveals a #spider by a lake high in a tree# holding #[[1]]#.",
-                                                /*german*/ "",
+                                                /*german*/ "Man erzählt sich, daß die Nacht eine #Spinne in einem Baum bei einem Fluß# enthülle, welche #[[1]]# besäße.",
                                                 /*french*/ "Selon moi, une #Skulltula dans un grand arbre du lac# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                              // /*spanish*/ Según dicen, la noche revela #una Skulltula del lago sobre un árbol# que otorga #[[1]]#.
 
     hintTextTable[RHT_GV_GS_BEAN_PATCH] = HintText(CustomMessage("They say that a #spider buried in a valley# holds #[[1]]#.",
-                                                      /*german*/ "",
+                                                      /*german*/ "Man erzählt sich, daß eine #in einem Tal begrabene Spinne# #[[1]]# besäße.",
                                                       /*french*/ "Selon moi, une #Skulltula enterré dans une vallée# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                    // /*spanish*/ Según dicen, una #Skulltula enterrada en un valle# otorga #[[1]]#.
 
     hintTextTable[RHT_GV_GS_SMALL_BRIDGE] = HintText(CustomMessage("They say that night in the past reveals a #spider in a valley# holding #[[1]]#.",
-                                                        /*german*/ "",
+                                                        /*german*/ "Man erzählt sich, daß die Nacht in der Vergangenheit eine #Spinne in einem Tal# enthülle, welche #[[1]]# besäße.",
                                                         /*french*/ "Selon moi, une #Skulltula au dessus d'une petite cascade# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                      // /*spanish*/ Según dicen, la noche del pasado revela una #Skulltula del valle# que otorga #[[1]]#.
 
     hintTextTable[RHT_GV_GS_PILLAR] = HintText(CustomMessage("They say that night in the future reveals a #spider in a valley# holding #[[1]]#.",
-                                                  /*german*/ "",
+                                                  /*german*/ "Man erzählt sich, daß die Nacht in der Zukunft eine #Spinne in einem Tal# enthülle, welche #[[1]]# besäße.",
                                                   /*french*/ "Selon moi, une #Skulltula sur une arche de pierre dans une vallée# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                // /*spanish*/ Según dicen, la noche del futuro revela una #Skulltula del valle# que otorga #[[1]]#.
 
     hintTextTable[RHT_GV_GS_BEHIND_TENT] = HintText(CustomMessage("They say that night in the future reveals a #spider in a valley# holding #[[1]]#.",
-                                                       /*german*/ "",
+                                                       /*german*/ "Man erzählt sich, daß die Nacht in der Zukunft eine #Spinne in einem Tal# enthülle, welche #[[1]]# besäße.",
                                                        /*french*/ "Selon moi, une #Skulltula derrière une tente# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                     // /*spanish*/ Según dicen, la noche del futuro revela una #Skulltula del valle# que otorga #[[1]]#.
 
     hintTextTable[RHT_GF_GS_ARCHERY_RANGE] = HintText(CustomMessage("They say that night reveals a #spider in a fortress# holding #[[1]]#.",
-                                                         /*german*/ "",
+                                                         /*german*/ "Man erzählt sich, daß die Nacht eine #Spinne in einer Festung# enthülle, welche #[[1]]# besäße.",
                                                          /*french*/ "Selon moi, une #Skulltula sur une cible de tir# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                       // /*spanish*/ Según dicen, la noche revela una #Skulltula de una fortaleza# que otorga #[[1]]#.
 
     hintTextTable[RHT_GF_GS_TOP_FLOOR] = HintText(CustomMessage("They say that night reveals a #spider in a fortress# holding #[[1]]#.",
-                                                     /*german*/ "",
+                                                     /*german*/ "Man erzählt sich, daß die Nacht eine #Spinne in einer Festung# enthülle, welche #[[1]]# besäße.",
                                                      /*french*/ "Selon moi, une #Skulltula au sommet d'une forteresse# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                   // /*spanish*/ Según dicen, la noche revela una #Skulltula de una fortaleza# que otorga #[[1]]#.
 
     hintTextTable[RHT_COLOSSUS_GS_BEAN_PATCH] = HintText(CustomMessage("They say that a #spider buried in the desert# holds #[[1]]#.",
-                                                            /*german*/ "",
+                                                            /*german*/ "Man erzählt sich, daß eine #in der Wüste begrabene Spinne# #[[1]]# besäße.",
                                                             /*french*/ "Selon moi, une #Skulltula enterrée au pied du colosse# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                          // /*spanish*/ Según dicen, una #Skulltula enterrada en el desierto# otorga #[[1]]#.
 
     hintTextTable[RHT_COLOSSUS_GS_HILL] = HintText(CustomMessage("They say that night reveals a #spider deep in the desert# holding #[[1]]#.",
-                                                      /*german*/ "",
+                                                      /*german*/ "Man erzählt sich, daß die Nacht eine #Spinne tief in der Wüste# enthülle, welche #[[1]]# besäße.",
                                                       /*french*/ "Selon moi, une #Skulltula sur une colline dans le désert# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                    // /*spanish*/ Según dicen, la noche revela una #Skulltula en las profundidades del desierto# que otorga #[[1]]#.
 
     hintTextTable[RHT_COLOSSUS_GS_TREE] = HintText(CustomMessage("They say that night reveals a #spider deep in the desert# holding #[[1]]#.",
-                                                      /*german*/ "",
+                                                      /*german*/ "Man erzählt sich, daß die Nacht eine #Spinne tief in der Wüste# enthülle, welche #[[1]]# besäße.",
                                                       /*french*/ "Selon moi, une #Skulltula dans un arbre du désert# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                    // /*spanish*/ Según dicen, la noche revela una #Skulltula en las profundidades del desierto# que otorga #[[1]]#.
 
     hintTextTable[RHT_KF_SHOP_ITEM_1] = HintText(CustomMessage("They say that a #child shopkeeper# sells #[[1]]#.",
-                                                    /*german*/ "",
+                                                    /*german*/ "Man erzählt sich, daß der #Inhaber des Kokiri-Ladens# #[[1]]# verkaufe.",
                                                     /*french*/ "Selon moi, la #boutique Kokiri# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                  // /*spanish*/ Según dicen, un #joven dependiente# vende #[[1]]#.
 
     hintTextTable[RHT_KF_SHOP_ITEM_2] = HintText(CustomMessage("They say that a #child shopkeeper# sells #[[1]]#.",
-                                                    /*german*/ "",
+                                                    /*german*/ "Man erzählt sich, daß der #Inhaber des Kokiri-Ladens# #[[1]]# verkaufe.",
                                                     /*french*/ "Selon moi, la #boutique Kokiri# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                  // /*spanish*/ Según dicen, un #joven dependiente# vende #[[1]]#.
 
     hintTextTable[RHT_KF_SHOP_ITEM_3] = HintText(CustomMessage("They say that a #child shopkeeper# sells #[[1]]#.",
-                                                    /*german*/ "",
+                                                    /*german*/ "Man erzählt sich, daß der #Inhaber des Kokiri-Ladens# #[[1]]# verkaufe.",
                                                     /*french*/ "Selon moi, la #boutique Kokiri# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                  // /*spanish*/ Según dicen, un #joven dependiente# vende #[[1]]#.
 
     hintTextTable[RHT_KF_SHOP_ITEM_4] = HintText(CustomMessage("They say that a #child shopkeeper# sells #[[1]]#.",
-                                                    /*german*/ "",
+                                                    /*german*/ "Man erzählt sich, daß der #Inhaber des Kokiri-Ladens# #[[1]]# verkaufe.",
                                                     /*french*/ "Selon moi, la #boutique Kokiri# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                  // /*spanish*/ Según dicen, un #joven dependiente# vende #[[1]]#.
 
     hintTextTable[RHT_KF_SHOP_ITEM_5] = HintText(CustomMessage("They say that a #child shopkeeper# sells #[[1]]#.",
-                                                    /*german*/ "",
+                                                    /*german*/ "Man erzählt sich, daß der #Inhaber des Kokiri-Ladens# #[[1]]# verkaufe.",
                                                     /*french*/ "Selon moi, la #boutique Kokiri# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                  // /*spanish*/ Según dicen, un #joven dependiente# vende #[[1]]#.
 
     hintTextTable[RHT_KF_SHOP_ITEM_6] = HintText(CustomMessage("They say that a #child shopkeeper# sells #[[1]]#.",
-                                                    /*german*/ "",
+                                                    /*german*/ "Man erzählt sich, daß der #Inhaber des Kokiri-Ladens# #[[1]]# verkaufe.",
                                                     /*french*/ "Selon moi, la #boutique Kokiri# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                  // /*spanish*/ Según dicen, un #joven dependiente# vende #[[1]]#.
 
     hintTextTable[RHT_KF_SHOP_ITEM_7] = HintText(CustomMessage("They say that a #child shopkeeper# sells #[[1]]#.",
-                                                    /*german*/ "",
+                                                    /*german*/ "Man erzählt sich, daß der #Inhaber des Kokiri-Ladens# #[[1]]# verkaufe.",
                                                     /*french*/ "Selon moi, la #boutique Kokiri# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                  // /*spanish*/ Según dicen, un #joven dependiente# vende #[[1]]#.
 
     hintTextTable[RHT_KF_SHOP_ITEM_8] = HintText(CustomMessage("They say that a #child shopkeeper# sells #[[1]]#.",
-                                                    /*german*/ "",
+                                                    /*german*/ "Man erzählt sich, daß der #Inhaber des Kokiri-Ladens# #[[1]]# verkaufe.",
                                                     /*french*/ "Selon moi, la #boutique Kokiri# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                  // /*spanish*/ Según dicen, un #joven dependiente# vende #[[1]]#.
 
     hintTextTable[RHT_KAK_POTION_SHOP_ITEM_1] = HintText(CustomMessage("They say that the #Kakariko Potion Shop# offers #[[1]]#.",
-                                                            /*german*/ "",
+                                                            /*german*/ "Man erzählt sich, daß der #Magie-Laden in Kakariko# #[[1]]# offeriere.",
                                                             /*french*/ "Selon moi, l'#apothicaire de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}),
                                                          // /*spanish*/ Según dicen, la #tienda de pociones de Kakariko# ofrece #[[1]]#.
                                                          {}, {
                                                          CustomMessage("They say that a #potion seller# offers #[[1]]#.",
-                                                             /*german*/ "",
+                                                             /*german*/ "Man erzählt sich, daß ein #Trankhändler# #[[1]]# anböte.",
                                                              /*french*/ "Selon moi, l'#apothicaire# vend #[[1]]#.", {QM_RED, QM_GREEN})});
                                                           // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
 
     hintTextTable[RHT_KAK_POTION_SHOP_ITEM_2] = HintText(CustomMessage("They say that the #Kakariko Potion Shop# offers #[[1]]#.",
-                                                            /*german*/ "",
+                                                            /*german*/ "Man erzählt sich, daß der #Magie-Laden in Kakariko# #[[1]]# offeriere.",
                                                             /*french*/ "Selon moi, l'#apothicaire de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}),
                                                          // /*spanish*/ Según dicen, la #tienda de pociones de Kakariko# ofrece #[[1]]#.
                                                          {}, {
                                                          CustomMessage("They say that a #potion seller# offers #[[1]]#.",
-                                                             /*german*/ "",
+                                                             /*german*/ "Man erzählt sich, daß ein #Trankhändler# #[[1]]# anböte.",
                                                              /*french*/ "Selon moi, l'#apothicaire# vend #[[1]]#.", {QM_RED, QM_GREEN})});
                                                           // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
 
     hintTextTable[RHT_KAK_POTION_SHOP_ITEM_3] = HintText(CustomMessage("They say that the #Kakariko Potion Shop# offers #[[1]]#.",
-                                                            /*german*/ "",
+                                                            /*german*/ "Man erzählt sich, daß der #Magie-Laden in Kakariko# #[[1]]# offeriere.",
                                                             /*french*/ "Selon moi, l'#apothicaire de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}),
                                                          // /*spanish*/ Según dicen, la #tienda de pociones de Kakariko# ofrece #[[1]]#.
                                                          {}, {
                                                          CustomMessage("They say that a #potion seller# offers #[[1]]#.",
-                                                             /*german*/ "",
+                                                             /*german*/ "Man erzählt sich, daß ein #Trankhändler# #[[1]]# anböte.",
                                                              /*french*/ "Selon moi, l'#apothicaire# vend #[[1]]#.", {QM_RED, QM_GREEN})});
                                                           // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
 
     hintTextTable[RHT_KAK_POTION_SHOP_ITEM_4] = HintText(CustomMessage("They say that the #Kakariko Potion Shop# offers #[[1]]#.",
-                                                            /*german*/ "",
+                                                            /*german*/ "Man erzählt sich, daß der #Magie-Laden in Kakariko# #[[1]]# offeriere.",
                                                             /*french*/ "Selon moi, l'#apothicaire de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}),
                                                          // /*spanish*/ Según dicen, la #tienda de pociones de Kakariko# ofrece #[[1]]#.
                                                          {}, {
                                                          CustomMessage("They say that a #potion seller# offers #[[1]]#.",
-                                                             /*german*/ "",
+                                                             /*german*/ "Man erzählt sich, daß ein #Trankhändler# #[[1]]# anböte.",
                                                              /*french*/ "Selon moi, l'#apothicaire# vend #[[1]]#.", {QM_RED, QM_GREEN})});
                                                           // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
 
     hintTextTable[RHT_KAK_POTION_SHOP_ITEM_5] = HintText(CustomMessage("They say that the #Kakariko Potion Shop# offers #[[1]]#.",
-                                                            /*german*/ "",
+                                                            /*german*/ "Man erzählt sich, daß der #Magie-Laden in Kakariko# #[[1]]# offeriere.",
                                                             /*french*/ "Selon moi, l'#apothicaire de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}),
                                                          // /*spanish*/ Según dicen, la #tienda de pociones de Kakariko# ofrece #[[1]]#.
                                                          {}, {
                                                          CustomMessage("They say that a #potion seller# offers #[[1]]#.",
-                                                             /*german*/ "",
+                                                             /*german*/ "Man erzählt sich, daß ein #Trankhändler# #[[1]]# anböte.",
                                                              /*french*/ "Selon moi, l'#apothicaire# vend #[[1]]#.", {QM_RED, QM_GREEN})});
                                                           // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
 
     hintTextTable[RHT_KAK_POTION_SHOP_ITEM_6] = HintText(CustomMessage("They say that the #Kakariko Potion Shop# offers #[[1]]#.",
-                                                            /*german*/ "",
+                                                            /*german*/ "Man erzählt sich, daß der #Magie-Laden in Kakariko# #[[1]]# offeriere.",
                                                             /*french*/ "Selon moi, l'#apothicaire de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}),
                                                          // /*spanish*/ Según dicen, la #tienda de pociones de Kakariko# ofrece #[[1]]#.
                                                          {}, {
                                                          CustomMessage("They say that a #potion seller# offers #[[1]]#.",
-                                                             /*german*/ "",
+                                                             /*german*/ "Man erzählt sich, daß ein #Trankhändler# #[[1]]# anböte.",
                                                              /*french*/ "Selon moi, l'#apothicaire# vend #[[1]]#.", {QM_RED, QM_GREEN})});
                                                           // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
 
     hintTextTable[RHT_KAK_POTION_SHOP_ITEM_7] = HintText(CustomMessage("They say that the #Kakariko Potion Shop# offers #[[1]]#.",
-                                                            /*german*/ "",
+                                                            /*german*/ "Man erzählt sich, daß der #Magie-Laden in Kakariko# #[[1]]# offeriere.",
                                                             /*french*/ "Selon moi, l'#apothicaire de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}),
                                                          // /*spanish*/ Según dicen, la #tienda de pociones de Kakariko# ofrece #[[1]]#.
                                                          {}, {
                                                          CustomMessage("They say that a #potion seller# offers #[[1]]#.",
-                                                             /*german*/ "",
+                                                             /*german*/ "Man erzählt sich, daß ein #Trankhändler# #[[1]]# anböte.",
                                                              /*french*/ "Selon moi, l'#apothicaire# vend #[[1]]#.", {QM_RED, QM_GREEN})});
                                                           // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
 
     hintTextTable[RHT_KAK_POTION_SHOP_ITEM_8] = HintText(CustomMessage("They say that the #Kakariko Potion Shop# offers #[[1]]#.",
-                                                            /*german*/ "",
+                                                            /*german*/ "Man erzählt sich, daß der #Magie-Laden in Kakariko# #[[1]]# offeriere.",
                                                             /*french*/ "Selon moi, l'#apothicaire de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}),
                                                          // /*spanish*/ Según dicen, la #tienda de pociones de Kakariko# ofrece #[[1]]#.
                                                          {}, {
                                                          CustomMessage("They say that a #potion seller# offers #[[1]]#.",
-                                                             /*german*/ "",
+                                                             /*german*/ "Man erzählt sich, daß ein #Trankhändler# #[[1]]# anböte.",
                                                              /*french*/ "Selon moi, l'#apothicaire# vend #[[1]]#.", {QM_RED, QM_GREEN})});
                                                           // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
 
     hintTextTable[RHT_MARKET_BOMBCHU_SHOP_ITEM_1] = HintText(CustomMessage("They say that a #Bombchu merchant# sells #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß ein #Krabbelminenhändler# #[[1]]# verkaufe.",
                                                                 /*french*/ "Selon moi, le #marchand de Missiles# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/ Según dicen, un #mercader de bombchus# vende #[[1]]#.
 
     hintTextTable[RHT_MARKET_BOMBCHU_SHOP_ITEM_2] = HintText(CustomMessage("They say that a #Bombchu merchant# sells #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß ein #Krabbelminenhändler# #[[1]]# verkaufe.",
                                                                 /*french*/ "Selon moi, le #marchand de Missiles# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/ Según dicen, un #mercader de bombchus# vende #[[1]]#.
 
     hintTextTable[RHT_MARKET_BOMBCHU_SHOP_ITEM_3] = HintText(CustomMessage("They say that a #Bombchu merchant# sells #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß ein #Krabbelminenhändler# #[[1]]# verkaufe.",
                                                                 /*french*/ "Selon moi, le #marchand de Missiles# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/ Según dicen, un #mercader de bombchus# vende #[[1]]#.
 
     hintTextTable[RHT_MARKET_BOMBCHU_SHOP_ITEM_4] = HintText(CustomMessage("They say that a #Bombchu merchant# sells #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß ein #Krabbelminenhändler# #[[1]]# verkaufe.",
                                                                 /*french*/ "Selon moi, le #marchand de Missiles# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/ Según dicen, un #mercader de bombchus# vende #[[1]]#.
 
     hintTextTable[RHT_MARKET_BOMBCHU_SHOP_ITEM_5] = HintText(CustomMessage("They say that a #Bombchu merchant# sells #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß ein #Krabbelminenhändler# #[[1]]# verkaufe.",
                                                                 /*french*/ "Selon moi, le #marchand de Missiles# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/ Según dicen, un #mercader de bombchus# vende #[[1]]#.
 
     hintTextTable[RHT_MARKET_BOMBCHU_SHOP_ITEM_6] = HintText(CustomMessage("They say that a #Bombchu merchant# sells #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß ein #Krabbelminenhändler# #[[1]]# verkaufe.",
                                                                 /*french*/ "Selon moi, le #marchand de Missiles# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/ Según dicen, un #mercader de bombchus# vende #[[1]]#.
 
     hintTextTable[RHT_MARKET_BOMBCHU_SHOP_ITEM_7] = HintText(CustomMessage("They say that a #Bombchu merchant# sells #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß ein #Krabbelminenhändler# #[[1]]# verkaufe.",
                                                                 /*french*/ "Selon moi, le #marchand de Missiles# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/ Según dicen, un #mercader de bombchus# vende #[[1]]#.
 
     hintTextTable[RHT_MARKET_BOMBCHU_SHOP_ITEM_8] = HintText(CustomMessage("They say that a #Bombchu merchant# sells #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß ein #Krabbelminenhändler# #[[1]]# verkaufe.",
                                                                 /*french*/ "Selon moi, le #marchand de Missiles# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/ Según dicen, un #mercader de bombchus# vende #[[1]]#.
 
     hintTextTable[RHT_MARKET_POTION_SHOP_ITEM_1] = HintText(CustomMessage("They say that the #Market Potion Shop# offers #[[1]]#.",
-                                                               /*german*/ "",
+                                                               /*german*/ "Man erzählt sich, daß der #Magie-Laden auf dem Markt# #[[1]]# offeriere.",
                                                                /*french*/ "Selon moi, l'#apothicaire dans la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}),
                                                             // /*spanish*/ Según dicen, la #tienda de pociones del mercado# ofrece #[[1]]#.
                                                             {}, {
                                                             CustomMessage("They say that a #potion seller# offers #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß ein #Trankhändler# #[[1]]# anböte.",
                                                                 /*french*/ "Selon moi, l'#apothicaire# vend #[[1]]#.", {QM_RED, QM_GREEN})});
                                                              // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
 
     hintTextTable[RHT_MARKET_POTION_SHOP_ITEM_2] = HintText(CustomMessage("They say that the #Market Potion Shop# offers #[[1]]#.",
-                                                               /*german*/ "",
+                                                               /*german*/ "Man erzählt sich, daß der #Magie-Laden auf dem Markt# #[[1]]# offeriere.",
                                                                /*french*/ "Selon moi, l'#apothicaire dans la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}),
                                                             // /*spanish*/ Según dicen, la #tienda de pociones del mercado# ofrece #[[1]]#.
                                                             {}, {
                                                             CustomMessage("They say that a #potion seller# offers #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß ein #Trankhändler# #[[1]]# anböte.",
                                                                 /*french*/ "Selon moi, l'#apothicaire# vend #[[1]]#.", {QM_RED, QM_GREEN})});
                                                              // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
 
     hintTextTable[RHT_MARKET_POTION_SHOP_ITEM_3] = HintText(CustomMessage("They say that the #Market Potion Shop# offers #[[1]]#.",
-                                                               /*german*/ "",
+                                                               /*german*/ "Man erzählt sich, daß der #Magie-Laden auf dem Markt# #[[1]]# offeriere.",
                                                                /*french*/ "Selon moi, l'#apothicaire dans la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}),
                                                             // /*spanish*/ Según dicen, la #tienda de pociones del mercado# ofrece #[[1]]#.
                                                             {}, {
                                                             CustomMessage("They say that a #potion seller# offers #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß ein #Trankhändler# #[[1]]# anböte.",
                                                                 /*french*/ "Selon moi, l'#apothicaire# vend #[[1]]#.", {QM_RED, QM_GREEN})});
                                                              // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
 
     hintTextTable[RHT_MARKET_POTION_SHOP_ITEM_4] = HintText(CustomMessage("They say that the #Market Potion Shop# offers #[[1]]#.",
-                                                               /*german*/ "",
+                                                               /*german*/ "Man erzählt sich, daß der #Magie-Laden auf dem Markt# #[[1]]# offeriere.",
                                                                /*french*/ "Selon moi, l'#apothicaire dans la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}),
                                                             // /*spanish*/ Según dicen, la #tienda de pociones del mercado# ofrece #[[1]]#.
                                                             {}, {
                                                             CustomMessage("They say that a #potion seller# offers #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß ein #Trankhändler# #[[1]]# anböte.",
                                                                 /*french*/ "Selon moi, l'#apothicaire# vend #[[1]]#.", {QM_RED, QM_GREEN})});
                                                              // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
 
     hintTextTable[RHT_MARKET_POTION_SHOP_ITEM_5] = HintText(CustomMessage("They say that the #Market Potion Shop# offers #[[1]]#.",
-                                                               /*german*/ "",
+                                                               /*german*/ "Man erzählt sich, daß der #Magie-Laden auf dem Markt# #[[1]]# offeriere.",
                                                                /*french*/ "Selon moi, l'#apothicaire dans la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}),
                                                             // /*spanish*/ Según dicen, la #tienda de pociones del mercado# ofrece #[[1]]#.
                                                             {}, {
                                                             CustomMessage("They say that a #potion seller# offers #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß ein #Trankhändler# #[[1]]# anböte.",
                                                                 /*french*/ "Selon moi, l'#apothicaire# vend #[[1]]#.", {QM_RED, QM_GREEN})});
                                                              // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
 
     hintTextTable[RHT_MARKET_POTION_SHOP_ITEM_6] = HintText(CustomMessage("They say that the #Market Potion Shop# offers #[[1]]#.",
-                                                               /*german*/ "",
+                                                               /*german*/ "Man erzählt sich, daß der #Magie-Laden auf dem Markt# #[[1]]# offeriere.",
                                                                /*french*/ "Selon moi, l'#apothicaire dans la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}),
                                                             // /*spanish*/ Según dicen, la #tienda de pociones del mercado# ofrece #[[1]]#.
                                                             {}, {
                                                             CustomMessage("They say that a #potion seller# offers #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß ein #Trankhändler# #[[1]]# anböte.",
                                                                 /*french*/ "Selon moi, l'#apothicaire# vend #[[1]]#.", {QM_RED, QM_GREEN})});
                                                              // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
 
     hintTextTable[RHT_MARKET_POTION_SHOP_ITEM_7] = HintText(CustomMessage("They say that the #Market Potion Shop# offers #[[1]]#.",
-                                                               /*german*/ "",
+                                                               /*german*/ "Man erzählt sich, daß der #Magie-Laden auf dem Markt# #[[1]]# offeriere.",
                                                                /*french*/ "Selon moi, l'#apothicaire dans la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}),
                                                             // /*spanish*/ Según dicen, la #tienda de pociones del mercado# ofrece #[[1]]#.
                                                             {}, {
                                                             CustomMessage("They say that a #potion seller# offers #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß ein #Trankhändler# #[[1]]# anböte.",
                                                                 /*french*/ "Selon moi, l'#apothicaire# vend #[[1]]#.", {QM_RED, QM_GREEN})});
                                                              // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
 
     hintTextTable[RHT_MARKET_POTION_SHOP_ITEM_8] = HintText(CustomMessage("They say that the #Market Potion Shop# offers #[[1]]#.",
-                                                               /*german*/ "",
+                                                               /*german*/ "Man erzählt sich, daß der #Magie-Laden auf dem Markt# #[[1]]# offeriere.",
                                                                /*french*/ "Selon moi, l'#apothicaire dans la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}),
                                                             // /*spanish*/ Según dicen, la #tienda de pociones del mercado# ofrece #[[1]]#.
                                                             {}, {
                                                             CustomMessage("They say that a #potion seller# offers #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß ein #Trankhändler# #[[1]]# anböte.",
                                                                 /*french*/ "Selon moi, l'#apothicaire# vend #[[1]]#.", {QM_RED, QM_GREEN})});
                                                              // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
 
     hintTextTable[RHT_MARKET_BAZAAR_ITEM_1] = HintText(CustomMessage("They say that the #Market Bazaar# offers #[[1]]#.",
-                                                          /*german*/ "",
+                                                          /*german*/ "Man erzählt sich, daß auf dem #Marktbasar# #[[1]]# angeboten würde.",
                                                           /*french*/ "Selon moi, le #bazar de la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                        // /*spanish*/ Según dicen, el #bazar del mercado# ofrece #[[1]]#.
 
     hintTextTable[RHT_MARKET_BAZAAR_ITEM_2] = HintText(CustomMessage("They say that the #Market Bazaar# offers #[[1]]#.",
-                                                          /*german*/ "",
+                                                          /*german*/ "Man erzählt sich, daß auf dem #Marktbasar# #[[1]]# angeboten würde.",
                                                           /*french*/ "Selon moi, le #bazar de la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                        // /*spanish*/ Según dicen, el #bazar del mercado# ofrece #[[1]]#.
 
     hintTextTable[RHT_MARKET_BAZAAR_ITEM_3] = HintText(CustomMessage("They say that the #Market Bazaar# offers #[[1]]#.",
-                                                          /*german*/ "",
+                                                          /*german*/ "Man erzählt sich, daß auf dem #Marktbasar# #[[1]]# angeboten würde.",
                                                           /*french*/ "Selon moi, le #bazar de la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                        // /*spanish*/ Según dicen, el #bazar del mercado# ofrece #[[1]]#.
 
     hintTextTable[RHT_MARKET_BAZAAR_ITEM_4] = HintText(CustomMessage("They say that the #Market Bazaar# offers #[[1]]#.",
-                                                          /*german*/ "",
+                                                          /*german*/ "Man erzählt sich, daß auf dem #Marktbasar# #[[1]]# angeboten würde.",
                                                           /*french*/ "Selon moi, le #bazar de la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                        // /*spanish*/ Según dicen, el #bazar del mercado# ofrece #[[1]]#.
 
     hintTextTable[RHT_MARKET_BAZAAR_ITEM_5] = HintText(CustomMessage("They say that the #Market Bazaar# offers #[[1]]#.",
-                                                          /*german*/ "",
+                                                          /*german*/ "Man erzählt sich, daß auf dem #Marktbasar# #[[1]]# angeboten würde.",
                                                           /*french*/ "Selon moi, le #bazar de la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                        // /*spanish*/ Según dicen, el #bazar del mercado# ofrece #[[1]]#.
 
     hintTextTable[RHT_MARKET_BAZAAR_ITEM_6] = HintText(CustomMessage("They say that the #Market Bazaar# offers #[[1]]#.",
-                                                          /*german*/ "",
+                                                          /*german*/ "Man erzählt sich, daß auf dem #Marktbasar# #[[1]]# angeboten würde.",
                                                           /*french*/ "Selon moi, le #bazar de la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                        // /*spanish*/ Según dicen, el #bazar del mercado# ofrece #[[1]]#.
 
     hintTextTable[RHT_MARKET_BAZAAR_ITEM_7] = HintText(CustomMessage("They say that the #Market Bazaar# offers #[[1]]#.",
-                                                          /*german*/ "",
+                                                          /*german*/ "Man erzählt sich, daß auf dem #Marktbasar# #[[1]]# angeboten würde.",
                                                           /*french*/ "Selon moi, le #bazar de la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                        // /*spanish*/ Según dicen, el #bazar del mercado# ofrece #[[1]]#.
 
     hintTextTable[RHT_MARKET_BAZAAR_ITEM_8] = HintText(CustomMessage("They say that the #Market Bazaar# offers #[[1]]#.",
-                                                          /*german*/ "",
+                                                          /*german*/ "Man erzählt sich, daß auf dem #Marktbasar# #[[1]]# angeboten würde.",
                                                           /*french*/ "Selon moi, le #bazar de la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                        // /*spanish*/ Según dicen, el #bazar del mercado# ofrece #[[1]]#.
 
     hintTextTable[RHT_KAK_BAZAAR_ITEM_1] = HintText(CustomMessage("They say that the #Kakariko Bazaar# offers #[[1]]#.",
-                                                       /*german*/ "",
+                                                       /*german*/ "Man erzählt sich, daß auf dem #Basar in Kakariko# #[[1]]# angeboten würde.",
                                                        /*french*/ "Selon moi, le #bazar de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                     // /*spanish*/ Según dicen, el #bazar de Kakariko# ofrece #[[1]]#.
 
     hintTextTable[RHT_KAK_BAZAAR_ITEM_2] = HintText(CustomMessage("They say that the #Kakariko Bazaar# offers #[[1]]#.",
-                                                       /*german*/ "",
+                                                       /*german*/ "Man erzählt sich, daß auf dem #Basar in Kakariko# #[[1]]# angeboten würde.",
                                                        /*french*/ "Selon moi, le #bazar de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                     // /*spanish*/ Según dicen, el #bazar de Kakariko# ofrece #[[1]]#.
 
     hintTextTable[RHT_KAK_BAZAAR_ITEM_3] = HintText(CustomMessage("They say that the #Kakariko Bazaar# offers #[[1]]#.",
-                                                       /*german*/ "",
+                                                       /*german*/ "Man erzählt sich, daß auf dem #Basar in Kakariko# #[[1]]# angeboten würde.",
                                                        /*french*/ "Selon moi, le #bazar de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                     // /*spanish*/ Según dicen, el #bazar de Kakariko# ofrece #[[1]]#.
 
     hintTextTable[RHT_KAK_BAZAAR_ITEM_4] = HintText(CustomMessage("They say that the #Kakariko Bazaar# offers #[[1]]#.",
-                                                       /*german*/ "",
+                                                       /*german*/ "Man erzählt sich, daß auf dem #Basar in Kakariko# #[[1]]# angeboten würde.",
                                                        /*french*/ "Selon moi, le #bazar de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                     // /*spanish*/ Según dicen, el #bazar de Kakariko# ofrece #[[1]]#.
 
     hintTextTable[RHT_KAK_BAZAAR_ITEM_5] = HintText(CustomMessage("They say that the #Kakariko Bazaar# offers #[[1]]#.",
-                                                       /*german*/ "",
+                                                       /*german*/ "Man erzählt sich, daß auf dem #Basar in Kakariko# #[[1]]# angeboten würde.",
                                                        /*french*/ "Selon moi, le #bazar de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                     // /*spanish*/ Según dicen, el #bazar de Kakariko# ofrece #[[1]]#.
 
     hintTextTable[RHT_KAK_BAZAAR_ITEM_6] = HintText(CustomMessage("They say that the #Kakariko Bazaar# offers #[[1]]#.",
-                                                       /*german*/ "",
+                                                       /*german*/ "Man erzählt sich, daß auf dem #Basar in Kakariko# #[[1]]# angeboten würde.",
                                                        /*french*/ "Selon moi, le #bazar de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                     // /*spanish*/ Según dicen, el #bazar de Kakariko# ofrece #[[1]]#.
 
     hintTextTable[RHT_KAK_BAZAAR_ITEM_7] = HintText(CustomMessage("They say that the #Kakariko Bazaar# offers #[[1]]#.",
-                                                       /*german*/ "",
+                                                       /*german*/ "Man erzählt sich, daß auf dem #Basar in Kakariko# #[[1]]# angeboten würde.",
                                                        /*french*/ "Selon moi, le #bazar de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                     // /*spanish*/ Según dicen, el #bazar de Kakariko# ofrece #[[1]]#.
 
     hintTextTable[RHT_KAK_BAZAAR_ITEM_8] = HintText(CustomMessage("They say that the #Kakariko Bazaar# offers #[[1]]#.",
-                                                       /*german*/ "",
+                                                       /*german*/ "Man erzählt sich, daß auf dem #Basar in Kakariko# #[[1]]# angeboten würde.",
                                                        /*french*/ "Selon moi, le #bazar de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                     // /*spanish*/ Según dicen, el #bazar de Kakariko# ofrece #[[1]]#.
 
     hintTextTable[RHT_ZD_SHOP_ITEM_1] = HintText(CustomMessage("They say that a #Zora shopkeeper# sells #[[1]]#.",
-                                                    /*german*/ "",
+                                                    /*german*/ "Man erzählt sich, daß ein #Händler der Zora# #[[1]]# verkaufen würde.",
                                                     /*french*/ "Selon moi, la #boutique Zora# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                  // /*spanish*/ Según dicen, el #dependiente Zora# vende #[[1]]#.
 
     hintTextTable[RHT_ZD_SHOP_ITEM_2] = HintText(CustomMessage("They say that a #Zora shopkeeper# sells #[[1]]#.",
-                                                    /*german*/ "",
+                                                    /*german*/ "Man erzählt sich, daß ein #Händler der Zora# #[[1]]# verkaufen würde.",
                                                     /*french*/ "Selon moi, la #boutique Zora# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                  // /*spanish*/ Según dicen, el #dependiente Zora# vende #[[1]]#.
 
     hintTextTable[RHT_ZD_SHOP_ITEM_3] = HintText(CustomMessage("They say that a #Zora shopkeeper# sells #[[1]]#.",
-                                                    /*german*/ "",
+                                                    /*german*/ "Man erzählt sich, daß ein #Händler der Zora# #[[1]]# verkaufen würde.",
                                                     /*french*/ "Selon moi, la #boutique Zora# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                  // /*spanish*/ Según dicen, el #dependiente Zora# vende #[[1]]#.
 
     hintTextTable[RHT_ZD_SHOP_ITEM_4] = HintText(CustomMessage("They say that a #Zora shopkeeper# sells #[[1]]#.",
-                                                    /*german*/ "",
+                                                    /*german*/ "Man erzählt sich, daß ein #Händler der Zora# #[[1]]# verkaufen würde.",
                                                     /*french*/ "Selon moi, la #boutique Zora# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                  // /*spanish*/ Según dicen, el #dependiente Zora# vende #[[1]]#.
 
     hintTextTable[RHT_ZD_SHOP_ITEM_5] = HintText(CustomMessage("They say that a #Zora shopkeeper# sells #[[1]]#.",
-                                                    /*german*/ "",
+                                                    /*german*/ "Man erzählt sich, daß ein #Händler der Zora# #[[1]]# verkaufen würde.",
                                                     /*french*/ "Selon moi, la #boutique Zora# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                  // /*spanish*/ Según dicen, el #dependiente Zora# vende #[[1]]#.
 
     hintTextTable[RHT_ZD_SHOP_ITEM_6] = HintText(CustomMessage("They say that a #Zora shopkeeper# sells #[[1]]#.",
-                                                    /*german*/ "",
+                                                    /*german*/ "Man erzählt sich, daß ein #Händler der Zora# #[[1]]# verkaufen würde.",
                                                     /*french*/ "Selon moi, la #boutique Zora# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                  // /*spanish*/ Según dicen, el #dependiente Zora# vende #[[1]]#.
 
     hintTextTable[RHT_ZD_SHOP_ITEM_7] = HintText(CustomMessage("They say that a #Zora shopkeeper# sells #[[1]]#.",
-                                                    /*german*/ "",
+                                                    /*german*/ "Man erzählt sich, daß ein #Händler der Zora# #[[1]]# verkaufen würde.",
                                                     /*french*/ "Selon moi, la #boutique Zora# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                  // /*spanish*/ Según dicen, el #dependiente Zora# vende #[[1]]#.
 
     hintTextTable[RHT_ZD_SHOP_ITEM_8] = HintText(CustomMessage("They say that a #Zora shopkeeper# sells #[[1]]#.",
-                                                    /*german*/ "",
+                                                    /*german*/ "Man erzählt sich, daß ein #Händler der Zora# #[[1]]# verkaufen würde.",
                                                     /*french*/ "Selon moi, la #boutique Zora# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                  // /*spanish*/ Según dicen, el #dependiente Zora# vende #[[1]]#.
 
     hintTextTable[RHT_GC_SHOP_ITEM_1] = HintText(CustomMessage("They say that a #Goron shopkeeper# sells #[[1]]#.",
-                                                    /*german*/ "",
+                                                    /*german*/ "Man erzählt sich, daß ein #Händler der Goronen# #[[1]]# verkaufen würde.",
                                                     /*french*/ "Selon moi, la #boutique Goron# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                  // /*spanish*/ Según dicen, el #dependiente Goron# vende #[[1]]#.
 
     hintTextTable[RHT_GC_SHOP_ITEM_2] = HintText(CustomMessage("They say that a #Goron shopkeeper# sells #[[1]]#.",
-                                                    /*german*/ "",
+                                                    /*german*/ "Man erzählt sich, daß ein #Händler der Goronen# #[[1]]# verkaufen würde.",
                                                     /*french*/ "Selon moi, la #boutique Goron# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                  // /*spanish*/ Según dicen, el #dependiente Goron# vende #[[1]]#.
 
     hintTextTable[RHT_GC_SHOP_ITEM_3] = HintText(CustomMessage("They say that a #Goron shopkeeper# sells #[[1]]#.",
-                                                    /*german*/ "",
+                                                    /*german*/ "Man erzählt sich, daß ein #Händler der Goronen# #[[1]]# verkaufen würde.",
                                                     /*french*/ "Selon moi, la #boutique Goron# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                  // /*spanish*/ Según dicen, el #dependiente Goron# vende #[[1]]#.
 
     hintTextTable[RHT_GC_SHOP_ITEM_4] = HintText(CustomMessage("They say that a #Goron shopkeeper# sells #[[1]]#.",
-                                                    /*german*/ "",
+                                                    /*german*/ "Man erzählt sich, daß ein #Händler der Goronen# #[[1]]# verkaufen würde.",
                                                     /*french*/ "Selon moi, la #boutique Goron# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                  // /*spanish*/ Según dicen, el #dependiente Goron# vende #[[1]]#.
 
     hintTextTable[RHT_GC_SHOP_ITEM_5] = HintText(CustomMessage("They say that a #Goron shopkeeper# sells #[[1]]#.",
-                                                    /*german*/ "",
+                                                    /*german*/ "Man erzählt sich, daß ein #Händler der Goronen# #[[1]]# verkaufen würde.",
                                                     /*french*/ "Selon moi, la #boutique Goron# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                  // /*spanish*/ Según dicen, el #dependiente Goron# vende #[[1]]#.
 
     hintTextTable[RHT_GC_SHOP_ITEM_6] = HintText(CustomMessage("They say that a #Goron shopkeeper# sells #[[1]]#.",
-                                                    /*german*/ "",
+                                                    /*german*/ "Man erzählt sich, daß ein #Händler der Goronen# #[[1]]# verkaufen würde.",
                                                     /*french*/ "Selon moi, la #boutique Goron# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                  // /*spanish*/ Según dicen, el #dependiente Goron# vende #[[1]]#.
 
     hintTextTable[RHT_GC_SHOP_ITEM_7] = HintText(CustomMessage("They say that a #Goron shopkeeper# sells #[[1]]#.",
-                                                    /*german*/ "",
+                                                    /*german*/ "Man erzählt sich, daß ein #Händler der Goronen# #[[1]]# verkaufen würde.",
                                                     /*french*/ "Selon moi, la #boutique Goron# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                  // /*spanish*/ Según dicen, el #dependiente Goron# vende #[[1]]#.
 
     hintTextTable[RHT_GC_SHOP_ITEM_8] = HintText(CustomMessage("They say that a #Goron shopkeeper# sells #[[1]]#.",
-                                                    /*german*/ "",
+                                                    /*german*/ "Man erzählt sich, daß ein #Händler der Goronen# #[[1]]# verkaufen würde.",
                                                     /*french*/ "Selon moi, la #boutique Goron# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                  // /*spanish*/ Según dicen, el #dependiente Goron# vende #[[1]]#.
 
     hintTextTable[RHT_HF_DEKU_SCRUB_GROTTO] = HintText(CustomMessage("They say that a lonely #scrub in a hole# sells #[[1]]#.",
-                                                          /*german*/ "",
+                                                          /*german*/ "Man erzählt sich, daß ein #einsamer Deku in einem Loch# #[[1]]# verkaufe.",
                                                           /*french*/ "Selon moi, la #peste Mojo dans une grotte de la plaine# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                        // /*spanish*/ Según dicen, un #singular deku bajo un hoyo# de la llanura vende #[[1]]#.
 
     hintTextTable[RHT_LLR_DEKU_SCRUB_GROTTO_LEFT] = HintText(CustomMessage("They say that a #trio of scrubs# sells #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß ein #Deku-Trio# #[[1]]# verkaufe.",
                                                                 /*french*/ "Selon moi, le #trio de peste Mojo à la ferme# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/ Según dicen, un #trío de dekus# de una granja venden #[[1]]#.
 
     hintTextTable[RHT_LLR_DEKU_SCRUB_GROTTO_RIGHT] = HintText(CustomMessage("They say that a #trio of scrubs# sells #[[1]]#.",
-                                                                 /*german*/ "",
+                                                                 /*german*/ "Man erzählt sich, daß ein #Deku-Trio# #[[1]]# verkaufe.",
                                                                  /*french*/ "Selon moi, le #trio de peste Mojo à la ferme# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                               // /*spanish*/ Según dicen, un #trío de dekus# de una granja venden #[[1]]#.
 
     hintTextTable[RHT_LLR_DEKU_SCRUB_GROTTO_CENTER] = HintText(CustomMessage("They say that a #trio of scrubs# sells #[[1]]#.",
-                                                                  /*german*/ "",
+                                                                  /*german*/ "Man erzählt sich, daß ein #Deku-Trio# #[[1]]# verkaufe.",
                                                                   /*french*/ "Selon moi, le #trio de peste Mojo à la ferme# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                // /*spanish*/ Según dicen, un #trío de dekus# de una granja venden #[[1]]#.
 
     hintTextTable[RHT_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT] = HintText(CustomMessage("They say that a pair of #scrubs in the woods# sells #[[1]]#.",
-                                                                           /*german*/ "",
+                                                                           /*german*/ "Man erzählt sich, daß ein #Deku-Paar in den Wäldern# #[[1]]# verkaufe.",
                                                                            /*french*/ "Selon moi, le #duo de peste Mojo près du théâtre# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                         // /*spanish*/ Según dicen, un par de #dekus del bosque# venden #[[1]]#.
 
     hintTextTable[RHT_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT] = HintText(CustomMessage("They say that a pair of #scrubs in the woods# sells #[[1]]#.",
-                                                                          /*german*/ "",
+                                                                          /*german*/ "Man erzählt sich, daß ein #Deku-Paar in den Wäldern# #[[1]]# verkaufe.",
                                                                           /*french*/ "Selon moi, le #duo de peste Mojo près du théâtre# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                        // /*spanish*/ Según dicen, un par de #dekus del bosque# venden #[[1]]#.
 
     hintTextTable[RHT_LW_DEKU_SCRUB_NEAR_BRIDGE] = HintText(CustomMessage("They say that a #scrub by a bridge# sells #[[1]]#.",
-                                                               /*german*/ "",
+                                                               /*german*/ "Man erzählt sich, daß ein #Deku bei einer Brücke# #[[1]]# verkaufe.",
                                                                /*french*/ "Selon moi, la #peste Mojo près du pont dans les bois# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                             // /*spanish*/ Según dicen, un #deku bajo un puente# del bosque venden #[[1]]#.
 
     hintTextTable[RHT_LW_DEKU_SCRUB_GROTTO_REAR] = HintText(CustomMessage("They say that a #scrub underground duo# sells #[[1]]#.",
-                                                               /*german*/ "",
+                                                               /*german*/ "Man erzählt sich, daß ein #Deku-Paar im Untergrund# #[[1]]# verkaufe.",
                                                                /*french*/ "Selon moi, le #duo de peste Mojo dans les sous-bois# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                             // /*spanish*/ Según dicen, un #par de dekus subterráneos# del bosque venden #[[1]]#.
 
     hintTextTable[RHT_LW_DEKU_SCRUB_GROTTO_FRONT] = HintText(CustomMessage("They say that a #scrub underground duo# sells #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß ein #Deku-Paar im Untergrund# #[[1]]# verkaufe.",
                                                                 /*french*/ "Selon moi, le #duo de peste Mojo dans les sous-bois# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/ Según dicen, un #par de dekus subterráneos# del bosque venden #[[1]]#.
 
     hintTextTable[RHT_SFM_DEKU_SCRUB_GROTTO_REAR] = HintText(CustomMessage("They say that a #scrub underground duo# sells #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß ein #Deku-Paar im Untergrund# #[[1]]# verkaufe.",
                                                                 /*french*/ "Selon moi, le #duo de peste Mojo au cœur du sanctuaire sylvestre# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/ Según dicen, un #par de dekus subterráneos# de la pradera sagrada venden #[[1]]#.
 
     hintTextTable[RHT_SFM_DEKU_SCRUB_GROTTO_FRONT] = HintText(CustomMessage("They say that a #scrub underground duo# sells #[[1]]#.",
-                                                                 /*german*/ "",
+                                                                 /*german*/ "Man erzählt sich, daß ein #Deku-Paar im Untergrund# #[[1]]# verkaufe.",
                                                                  /*french*/ "Selon moi, le #duo de peste Mojo au cœur du sanctuaire sylvestre# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                               // /*spanish*/ Según dicen, un #par de dekus subterráneos# de la pradera sagrada venden #[[1]]#.
 
     hintTextTable[RHT_GC_DEKU_SCRUB_GROTTO_LEFT] = HintText(CustomMessage("They say that a #trio of scrubs# sells #[[1]]#.",
-                                                               /*german*/ "",
+                                                               /*german*/ "Man erzählt sich, daß ein #Deku-Trio# #[[1]]# verkaufe.",
                                                                /*french*/ "Selon moi, le #trio de peste Mojo dans le village Goron# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                             // /*spanish*/ Según dicen, un #trío de dekus# de la Ciudad Goron venden #[[1]]#.
 
     hintTextTable[RHT_GC_DEKU_SCRUB_GROTTO_RIGHT] = HintText(CustomMessage("They say that a #trio of scrubs# sells #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß ein #Deku-Trio# #[[1]]# verkaufe.",
                                                                 /*french*/ "Selon moi, le #trio de peste Mojo dans le village Goron# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/ Según dicen, un #trío de dekus# de la Ciudad Goron venden #[[1]]#.
 
     hintTextTable[RHT_GC_DEKU_SCRUB_GROTTO_CENTER] = HintText(CustomMessage("They say that a #trio of scrubs# sells #[[1]]#.",
-                                                                 /*german*/ "",
+                                                                 /*german*/ "Man erzählt sich, daß ein #Deku-Trio# #[[1]]# verkaufe.",
                                                                  /*french*/ "Selon moi, le #trio de peste Mojo dans le village Goron# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                               // /*spanish*/ Según dicen, un #trío de dekus# de la Ciudad Goron venden #[[1]]#.
 
     hintTextTable[RHT_DMC_DEKU_SCRUB_GROTTO_LEFT] = HintText(CustomMessage("They say that a #trio of scrubs# sells #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß ein #Deku-Trio# #[[1]]# verkaufe.",
                                                                 /*french*/ "Selon moi, le #trio de peste Mojo dans le volcan# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/ Según dicen, un #trío de dekus# del volcán venden #[[1]]#.
 
     hintTextTable[RHT_DMC_DEKU_SCRUB_GROTTO_RIGHT] = HintText(CustomMessage("They say that a #trio of scrubs# sells #[[1]]#.",
-                                                                 /*german*/ "",
+                                                                 /*german*/ "Man erzählt sich, daß ein #Deku-Trio# #[[1]]# verkaufe.",
                                                                  /*french*/ "Selon moi, le #trio de peste Mojo dans le volcan# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                               // /*spanish*/ Según dicen, un #trío de dekus# del volcán venden #[[1]]#.
 
     hintTextTable[RHT_DMC_DEKU_SCRUB_GROTTO_CENTER] = HintText(CustomMessage("They say that a #trio of scrubs# sells #[[1]]#.",
-                                                                  /*german*/ "",
+                                                                  /*german*/ "Man erzählt sich, daß ein #Deku-Trio# #[[1]]# verkaufe.",
                                                                   /*french*/ "Selon moi, le #trio de peste Mojo dans le volcan# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                // /*spanish*/ Según dicen, un #trío de dekus# del volcán venden #[[1]]#.
 
     hintTextTable[RHT_ZR_DEKU_SCRUB_GROTTO_REAR] = HintText(CustomMessage("They say that a #scrub underground duo# sells #[[1]]#.",
-                                                               /*german*/ "",
+                                                               /*german*/ "Man erzählt sich, daß ein #Deku-Paar im Untergrund# #[[1]]# verkaufe.",
                                                                /*french*/ "Selon moi, le #duo de peste Mojo près du fleuve# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                             // /*spanish*/ Según dicen, un #par de dekus subterráneos# del río venden #[[1]]#.
 
     hintTextTable[RHT_ZR_DEKU_SCRUB_GROTTO_FRONT] = HintText(CustomMessage("They say that a #scrub underground duo# sells #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß ein #Deku-Paar im Untergrund# #[[1]]# verkaufe.",
                                                                 /*french*/ "Selon moi, le #duo de peste Mojo près du fleuve# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/ Según dicen, un #par de dekus subterráneos# del río venden #[[1]]#.
 
     hintTextTable[RHT_LH_DEKU_SCRUB_GROTTO_LEFT] = HintText(CustomMessage("They say that a #trio of scrubs# sells #[[1]]#.",
-                                                               /*german*/ "",
+                                                               /*german*/ "Man erzählt sich, daß ein #Deku-Trio# #[[1]]# verkaufe.",
                                                                /*french*/ "Selon moi, le #trio de peste Mojo près du lac# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                             // /*spanish*/ Según dicen, un #trío de dekus# del lago venden #[[1]]#.
 
     hintTextTable[RHT_LH_DEKU_SCRUB_GROTTO_RIGHT] = HintText(CustomMessage("They say that a #trio of scrubs# sells #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß ein #Deku-Trio# #[[1]]# verkaufe.",
                                                                 /*french*/ "Selon moi, le #trio de peste Mojo près du lac# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/ Según dicen, un #trío de dekus# del lago venden #[[1]]#.
 
     hintTextTable[RHT_LH_DEKU_SCRUB_GROTTO_CENTER] = HintText(CustomMessage("They say that a #trio of scrubs# sells #[[1]]#.",
-                                                                 /*german*/ "",
+                                                                 /*german*/ "Man erzählt sich, daß ein #Deku-Trio# #[[1]]# verkaufe.",
                                                                  /*french*/ "Selon moi, le #trio de peste Mojo près du lac# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                               // /*spanish*/ Según dicen, un #trío de dekus# del lago venden #[[1]]#.
 
     hintTextTable[RHT_GV_DEKU_SCRUB_GROTTO_REAR] = HintText(CustomMessage("They say that a #scrub underground duo# sells #[[1]]#.",
-                                                               /*german*/ "",
+                                                               /*german*/ "Man erzählt sich, daß ein #Deku-Paar im Untergrund# #[[1]]# verkaufe.",
                                                                /*french*/ "Selon moi, le #duo de peste Mojo près de la vallée# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                             // /*spanish*/ Según dicen, un #par de dekus subterráneos# del valle venden #[[1]]#.
 
     hintTextTable[RHT_GV_DEKU_SCRUB_GROTTO_FRONT] = HintText(CustomMessage("They say that a #scrub underground duo# sells #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß ein #Deku-Paar im Untergrund# #[[1]]# verkaufe.",
                                                                 /*french*/ "Selon moi, le #duo de peste Mojo près de la vallée# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/ Según dicen, un #par de dekus subterráneos# del valle venden #[[1]]#.
 
     hintTextTable[RHT_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT] = HintText(CustomMessage("They say that a #scrub underground duo# sells #[[1]]#.",
-                                                                      /*german*/ "",
+                                                                      /*german*/ "Man erzählt sich, daß ein #Deku-Paar im Untergrund# #[[1]]# verkaufe.",
                                                                       /*french*/ "Selon moi, le #duo de peste Mojo dans le désert# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                    // /*spanish*/ Según dicen, un #par de dekus subterráneos# del desierto venden #[[1]]#.
 
     hintTextTable[RHT_COLOSSUS_DEKU_SCRUB_GROTTO_REAR] = HintText(CustomMessage("They say that a #scrub underground duo# sells #[[1]]#.",
-                                                                     /*german*/ "",
+                                                                     /*german*/ "Man erzählt sich, daß ein #Deku-Paar im Untergrund# #[[1]]# verkaufe.",
                                                                      /*french*/ "Selon moi, le #duo de peste Mojo dans le désert# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                   // /*spanish*/ Según dicen, un #par de dekus subterráneos# del desierto venden #[[1]]#.
 
     hintTextTable[RHT_LLR_STABLES_LEFT_COW] = HintText(CustomMessage("They say that a #cow in a stable# gifts #[[1]]#.",
-                                                          /*german*/ "",
+                                                          /*german*/ "Man erzählt sich, daß eine #Kuh in einem Stall# #[[1]]# schenke.",
                                                           /*french*/ "Selon moi, la #vache dans l'étable# donne #[[1]]#.", {QM_RED, QM_GREEN}));
                                                        // /*spanish*/ Según dicen, una #vaca del establo# brinda #[[1]]#.
 
     hintTextTable[RHT_LLR_STABLES_RIGHT_COW] = HintText(CustomMessage("They say that a #cow in a stable# gifts #[[1]]#.",
-                                                           /*german*/ "",
+                                                           /*german*/ "Man erzählt sich, daß eine #Kuh in einem Stall# #[[1]]# schenke.",
                                                            /*french*/ "Selon moi, la #vache dans l'étable# donne #[[1]]#.", {QM_RED, QM_GREEN}));
                                                         // /*spanish*/ Según dicen, una #vaca del establo# brinda #[[1]]#.
 
     hintTextTable[RHT_LLR_TOWER_RIGHT_COW] = HintText(CustomMessage("They say that a #cow in a ranch silo# gifts #[[1]]#.",
-                                                         /*german*/ "",
+                                                         /*german*/ "Man erzählt sich, daß eine #Kuh in einem Silo# #[[1]]# schenke.",
                                                          /*french*/ "Selon moi, la #vache dans le silo de la ferme# donne #[[1]]#.", {QM_RED, QM_GREEN}));
                                                       // /*spanish*/ Según dicen, una #vaca del granero# brinda #[[1]]#.
 
     hintTextTable[RHT_LLR_TOWER_LEFT_COW] = HintText(CustomMessage("They say that a #cow in a ranch silo# gifts #[[1]]#.",
-                                                        /*german*/ "",
+                                                        /*german*/ "Man erzählt sich, daß eine #Kuh in einem Silo# #[[1]]# schenke.",
                                                         /*french*/ "Selon moi, la #vache dans le silo de la ferme# donne #[[1]]#.", {QM_RED, QM_GREEN}));
                                                      // /*spanish*/ Según dicen, una #vaca del granero# brinda #[[1]]#.
 
     hintTextTable[RHT_KAK_IMPAS_HOUSE_COW] = HintText(CustomMessage("They say that a #cow imprisoned in a house# protects #[[1]]#.",
-                                                         /*german*/ "",
+                                                         /*german*/ "Man erzählt sich, daß eine #in einem Haus gefangene Kuh# #[[1]]# schütze.",
                                                          /*french*/ "Selon moi, la #vache en cage# donne #[[1]]#.", {QM_RED, QM_GREEN}));
                                                       // /*spanish*/ Según dicen, una #vaca enjaulada de una casa# brinda #[[1]]#.
 
     hintTextTable[RHT_DMT_COW_GROTTO_COW] = HintText(CustomMessage("They say that a #cow in a luxurious hole# offers #[[1]]#.",
-                                                        /*german*/ "",
+                                                        /*german*/ "Man erzählt sich, daß eine #Kuh in einem luxuriösen Loch# #[[1]]# offeriere.",
                                                         /*french*/ "Selon moi, la #vache dans une grotte luxueuse# donne #[[1]]#.", {QM_RED, QM_GREEN}));
                                                      // /*spanish*/ Según dicen, una #vaca de un lujoso hoyo# brinda #[[1]]#.
 
     hintTextTable[RHT_BEEHIVE_CHEST_GROTTO] = HintText(CustomMessage("They say that a #beehive above a chest# hides #[[1]]#.",
-                                                          /*german*/ "",
+                                                          /*german*/ "Man erzählt sich, daß ein #Bienenstock oberhalb einer Truhe# #[[1]]# verberge.",
                                                           /*french*/ "Selon moi,  #[[1]]#.", {QM_RED, QM_GREEN}));
                                                        // /*spanish*/ Según dicen, una #colmena sobre un cofre# esconde #[[1]]#.
 
     hintTextTable[RHT_BEEHIVE_LONELY_SCRUB_GROTTO] = HintText(CustomMessage("They say that a #beehive above a lonely scrub# hides #[[1]]#.",
-                                                                 /*german*/ "",
+                                                                 /*german*/ "Man erzählt sich, daß ein #Bienenstock oberhalb eines einsamen Deku# #[[1]]# verberge.",
                                                                  /*french*/ "Selon moi,  #[[1]]#.", {QM_RED, QM_GREEN}));
                                                               // /*spanish*/ Según dicen, una #colmena sobre un deku solitario# esconde #[[1]]#.
 
     hintTextTable[RHT_BEEHIVE_SCRUB_PAIR_GROTTO] = HintText(CustomMessage("They say that a #beehive above a pair of scrubs# hides #[[1]]#.",
-                                                               /*german*/ "",
+                                                               /*german*/ "Man erzählt sich, daß ein #Bienenstock oberhalb eines Deku-Paars# #[[1]]# verberge.",
                                                                /*french*/ "Selon moi,  #[[1]]#.", {QM_RED, QM_GREEN}));
                                                             // /*spanish*/ Según dicen, una #colmena sobre un par de dekus# esconde #[[1]]#.
 
     hintTextTable[RHT_BEEHIVE_SCRUB_TRIO_GROTTO] = HintText(CustomMessage("They say that a #beehive above a trio of scrubs# hides #[[1]]#.",
-                                                               /*german*/ "",
+                                                               /*german*/ "Man erzählt sich, daß ein #Bienenstock oberhalb eines Deku-Trios# #[[1]]# verberge.",
                                                                /*french*/ "Selon moi,  #[[1]]#.", {QM_RED, QM_GREEN}));
                                                             // /*spanish*/ Según dicen, una #colmena sobre un trío de dekus# esconde #[[1]]#.
 
     hintTextTable[RHT_BEEHIVE_COW_GROTTO] = HintText(CustomMessage("They say that a #beehive above a cow# hides #[[1]]#.",
-                                                        /*german*/ "",
+                                                        /*german*/ "Man erzählt sich, daß ein #Bienenstock oberhalb einer Kuh# #[[1]]# verberge.",
                                                         /*french*/ "Selon moi,  #[[1]]#.", {QM_RED, QM_GREEN}));
                                                      // /*spanish*/ Según dicen, una #colmena sobre una vaca# esconde #[[1]]#.
 
     hintTextTable[RHT_BEEHIVE_IN_FRONT_OF_KING_ZORA] = HintText(CustomMessage("They say that a #beehive in front of the king of the zoras# hides #[[1]]#.",
-                                                                   /*german*/ "",
+                                                                   /*german*/ "Man erzählt sich, daß ein #Bienenstock vor dem Zora-König# #[[1]]# verberge.",
                                                                    /*french*/ "Selon moi,  #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                 // /*spanish*/ Según dicen, una #colmena delante del rey de los zoras# esconde #[[1]]#.
 
     hintTextTable[RHT_BEEHIVE_BEHIND_KING_ZORA] = HintText(CustomMessage("They say that a #beehive behind the king of the zoras# hides #[[1]]#.",
-                                                              /*german*/ "",
+                                                              /*german*/ "Man erzählt sich, daß ein #Bienenstock hinter dem Zora-König# #[[1]]# verberge.",
                                                               /*french*/ "Selon moi,  #[[1]]#.", {QM_RED, QM_GREEN}));
                                                            // /*spanish*/ Según dicen, una #colmena detrás del rey de los zoras# esconde #[[1]]#.
 }

From c507d4d9a04c57a72d4816cdbe71c76e8aa9b110 Mon Sep 17 00:00:00 2001
From: inspectredc <78732756+inspectredc@users.noreply.github.com>
Date: Fri, 13 Sep 2024 00:01:57 +0100
Subject: [PATCH 189/230]  Early Eyeball Frog (#4120)

* early eyeball is real :D

* make cvar

* update cvars

* fix additional cvar check bug
---
 soh/soh/SohMenuBar.cpp                      |   2 +
 soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c | 113 +++++++++++++++-----
 2 files changed, 86 insertions(+), 29 deletions(-)

diff --git a/soh/soh/SohMenuBar.cpp b/soh/soh/SohMenuBar.cpp
index 5568841b6..05f22fb2d 100644
--- a/soh/soh/SohMenuBar.cpp
+++ b/soh/soh/SohMenuBar.cpp
@@ -1421,6 +1421,8 @@ void DrawEnhancementsMenu() {
             UIWidgets::Tooltip("Restore a bug from NTSC 1.0 that allows bypassing Bongo Bongo's intro cutscene to quickly kill him");
             UIWidgets::PaddedEnhancementCheckbox("Original RBA Values", CVAR_ENHANCEMENT("RestoreRBAValues"), true, false);
             UIWidgets::Tooltip("Restores the original outcomes when performing Reverse Bottle Adventure.");
+            UIWidgets::PaddedEnhancementCheckbox("Early Eyeball Frog", CVAR_ENHANCEMENT("EarlyEyeballFrog"), true, false);
+            UIWidgets::Tooltip("Restores a bug from NTSC 1.0/1.1 that allows you to obtain the eyeball frog from King Zora instead of the Zora Tunic by holding shield.");
 
             ImGui::EndMenu();
         }
diff --git a/soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c b/soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c
index 73157aedf..7b6afefaa 100644
--- a/soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c
+++ b/soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c
@@ -128,18 +128,41 @@ s16 func_80A9C6C0(PlayState* play, Actor* thisx) {
 
     switch (Message_GetState(&play->msgCtx)) {
         case TEXT_STATE_DONE:
-            ret = NPC_TALK_STATE_IDLE;
-            switch (this->actor.textId) {
-                case 0x4012:
-                    Flags_SetInfTable(INFTABLE_139);
-                    ret = NPC_TALK_STATE_ACTION;
-                    break;
-                case 0x401B:
-                    ret = !Message_ShouldAdvance(play) ? NPC_TALK_STATE_TALKING : NPC_TALK_STATE_ACTION;
-                    break;
-                case 0x401F:
-                    Flags_SetInfTable(INFTABLE_139);
-                    break;
+            if (CVarGetInteger(CVAR_ENHANCEMENT("EarlyEyeballFrog"), 0)) {
+                if (Message_ShouldAdvance(play)) {
+                    ret = NPC_TALK_STATE_ITEM_GIVEN;
+                }
+            } else {
+                ret = NPC_TALK_STATE_IDLE;
+                switch (this->actor.textId) {
+                    case 0x4012:
+                        Flags_SetInfTable(INFTABLE_139);
+                        ret = NPC_TALK_STATE_ACTION;
+                        break;
+                    case 0x401B:
+                        ret = !Message_ShouldAdvance(play) ? NPC_TALK_STATE_TALKING : NPC_TALK_STATE_ACTION;
+                        break;
+                    case 0x401F:
+                        Flags_SetInfTable(INFTABLE_139);
+                        break;
+                }                
+            }
+            break;
+        case TEXT_STATE_CLOSING:
+            if (CVarGetInteger(CVAR_ENHANCEMENT("EarlyEyeballFrog"), 0)) {
+                ret = NPC_TALK_STATE_IDLE;
+                switch (this->actor.textId) {
+                    case 0x4012:
+                        Flags_SetInfTable(INFTABLE_139);
+                        ret = NPC_TALK_STATE_ACTION;
+                        break;
+                    case 0x401B:
+                        ret = !Message_ShouldAdvance(play) ? NPC_TALK_STATE_TALKING : NPC_TALK_STATE_ACTION;
+                        break;
+                    case 0x401F:
+                        Flags_SetInfTable(INFTABLE_139);
+                        break;
+                }
             }
             break;
         case TEXT_STATE_DONE_FADING:
@@ -160,7 +183,9 @@ s16 func_80A9C6C0(PlayState* play, Actor* thisx) {
             }
             if (this->actor.textId == 0x4014) {
                 if (play->msgCtx.choiceIndex == 0) {
-                    EnKz_SetupGetItem(this, play);
+                    if (!CVarGetInteger(CVAR_ENHANCEMENT("EarlyEyeballFrog"), 0)) {
+                        EnKz_SetupGetItem(this, play);
+                    }
                     ret = NPC_TALK_STATE_ACTION;
                 } else {
                     this->actor.textId = 0x4016;
@@ -175,7 +200,6 @@ s16 func_80A9C6C0(PlayState* play, Actor* thisx) {
             break;
         case TEXT_STATE_NONE:
         case TEXT_STATE_DONE_HAS_NEXT:
-        case TEXT_STATE_CLOSING:
         case TEXT_STATE_SONG_DEMO_DONE:
         case TEXT_STATE_8:
         case TEXT_STATE_9:
@@ -207,25 +231,34 @@ s32 func_80A9C95C(PlayState* play, EnKz* this, s16* talkState, f32 unkf, NpcGetT
         return 1;
     }
 
-    if (*talkState != NPC_TALK_STATE_IDLE) {
-        *talkState = updateTalkState(play, &this->actor);
-        return 0;
-    }
+    if (!CVarGetInteger(CVAR_ENHANCEMENT("EarlyEyeballFrog"), 0)) {
+        if (*talkState != NPC_TALK_STATE_IDLE) {
+            *talkState = updateTalkState(play, &this->actor);
+            return 0;
+        }
 
-    yaw = Math_Vec3f_Yaw(&this->actor.home.pos, &player->actor.world.pos);
-    yaw -= this->actor.shape.rot.y;
-    if ((fabsf(yaw) > 1638.0f) || (this->actor.xzDistToPlayer < 265.0f)) {
-        this->actor.flags &= ~ACTOR_FLAG_TARGETABLE;
-        return 0;
-    }
+        yaw = Math_Vec3f_Yaw(&this->actor.home.pos, &player->actor.world.pos);
+        yaw -= this->actor.shape.rot.y;
+        if ((fabsf(yaw) > 1638.0f) || (this->actor.xzDistToPlayer < 265.0f)) {
+            this->actor.flags &= ~ACTOR_FLAG_TARGETABLE;
+            return 0;
+        }
 
-    this->actor.flags |= ACTOR_FLAG_TARGETABLE;
+        this->actor.flags |= ACTOR_FLAG_TARGETABLE;
+    }
 
     Actor_GetScreenPos(play, &this->actor, &sp32, &sp30);
     if (!((sp32 >= -30) && (sp32 < 361) && (sp30 >= -10) && (sp30 < 241))) {
         return 0;
     }
 
+    if (CVarGetInteger(CVAR_ENHANCEMENT("EarlyEyeballFrog"), 0)) {
+        if (*talkState != NPC_TALK_STATE_IDLE) {
+            *talkState = updateTalkState(play, &this->actor);
+            return 0;
+        }
+    }
+
     xzDistToPlayer = this->actor.xzDistToPlayer;
     this->actor.xzDistToPlayer = Math_Vec3f_DistXZ(&this->actor.home.pos, &player->actor.world.pos);
     if (func_8002F2CC(&this->actor, play, unkf) == 0) {
@@ -241,6 +274,18 @@ s32 func_80A9C95C(PlayState* play, EnKz* this, s16* talkState, f32 unkf, NpcGetT
 void func_80A9CB18(EnKz* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
 
+    if (CVarGetInteger(CVAR_ENHANCEMENT("EarlyEyeballFrog"), 0)) {
+        f32 yaw;
+        yaw = Math_Vec3f_Yaw(&this->actor.home.pos, &player->actor.world.pos);
+        yaw -= this->actor.shape.rot.y;
+        if ((fabsf(yaw) > 1638.0f) || (this->actor.xzDistToPlayer < 265.0f)) {
+            this->actor.flags &= ~ACTOR_FLAG_TARGETABLE;
+            return 0;
+        }
+
+        this->actor.flags |= ACTOR_FLAG_TARGETABLE;
+    }
+
     if (func_80A9C95C(play, this, &this->interactInfo.talkState, 340.0f, EnKz_GetText, func_80A9C6C0)) {
         if (GameInteractor_Should(VB_BE_ABLE_TO_EXCHANGE_RUTOS_LETTER, (this->actor.textId == 0x401A), this) &&
             !Flags_GetEventChkInf(EVENTCHKINF_KING_ZORA_MOVED))
@@ -262,12 +307,15 @@ void func_80A9CB18(EnKz* this, PlayState* play) {
                     this->actor.textId = 0x4014;
                     this->sfxPlayed = false;
                     player->actor.textId = this->actor.textId;
-                    this->isTrading = true;
+                    if (!CVarGetInteger(CVAR_ENHANCEMENT("EarlyEyeballFrog"), 0)) {
+                        this->isTrading = true;
+                    }
                     return;
                 }
             }
-
-            this->isTrading = false;
+            if (!CVarGetInteger(CVAR_ENHANCEMENT("EarlyEyeballFrog"), 0)) {
+                this->isTrading = false;
+            }
             if (Flags_GetInfTable(INFTABLE_139)) {
                 this->actor.textId = CHECK_QUEST_ITEM(QUEST_SONG_SERENADE) ? 0x4045 : 0x401A;
                 player->actor.textId = this->actor.textId;
@@ -434,6 +482,9 @@ void EnKz_StopMweep(EnKz* this, PlayState* play) {
 
 void EnKz_Wait(EnKz* this, PlayState* play) {
     if (this->interactInfo.talkState == NPC_TALK_STATE_ACTION) {
+        if (CVarGetInteger(CVAR_ENHANCEMENT("EarlyEyeballFrog"), 0)) {
+            this->interactInfo.talkState = NPC_TALK_STATE_IDLE;
+        }
         this->actionFunc = EnKz_SetupGetItem;
         EnKz_SetupGetItem(this, play);
     } else {
@@ -460,7 +511,11 @@ void EnKz_SetupGetItem(EnKz* this, PlayState* play) {
             Flags_SetRandomizerInf(RAND_INF_ADULT_TRADES_ZD_TRADE_PRESCRIPTION);
         }
     } else {
-        getItemId = this->isTrading ? GI_FROG : GI_TUNIC_ZORA;
+        if (CVarGetInteger(CVAR_ENHANCEMENT("EarlyEyeballFrog"), 0)) {
+            getItemId = func_8002F368(play) == EXCH_ITEM_PRESCRIPTION ? GI_FROG : GI_TUNIC_ZORA;
+        } else {
+            getItemId = this->isTrading ? GI_FROG : GI_TUNIC_ZORA;
+        }
         yRange = fabsf(this->actor.yDistToPlayer) + 1.0f;
         xzRange = this->actor.xzDistToPlayer + 1.0f;
         Actor_OfferGetItem(&this->actor, play, getItemId, xzRange, yRange);

From 8359d2a8f075e9c7efdf387b2f9e7d54f3e513e7 Mon Sep 17 00:00:00 2001
From: Archez <archez39@me.com>
Date: Sat, 14 Sep 2024 23:45:10 -0400
Subject: [PATCH 190/230] Update entrance tracker settings window for modern
 menu changes

---
 .../randomizer/randomizer_entrance_tracker.cpp           | 9 ---------
 soh/soh/SohGui.cpp                                       | 2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.cpp
index 09602e917..4cf9d623a 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.cpp
@@ -640,13 +640,6 @@ void InitEntranceTrackingData() {
 }
 
 void EntranceTrackerSettingsWindow::DrawElement() {
-    ImGui::SetNextWindowSize(ImVec2(600, 375), ImGuiCond_FirstUseEver);
-
-    if (!ImGui::Begin("Entrance Tracker Settings", &mIsVisible, ImGuiWindowFlags_NoFocusOnAppearing)) {
-        ImGui::End();
-        return;
-    }
-
     if (ImGui::BeginTable("entranceTrackerSettings", 1, ImGuiTableFlags_BordersInnerH)) {
 
         ImGui::TableNextColumn();
@@ -718,8 +711,6 @@ void EntranceTrackerSettingsWindow::DrawElement() {
 
         ImGui::EndTable();
     }
-
-    ImGui::End();
 }
 
 void EntranceTrackerWindow::Draw() {
diff --git a/soh/soh/SohGui.cpp b/soh/soh/SohGui.cpp
index 13b58f48f..4bef8cea6 100644
--- a/soh/soh/SohGui.cpp
+++ b/soh/soh/SohGui.cpp
@@ -193,7 +193,7 @@ namespace SohGui {
         gui->AddGuiWindow(mCheckTrackerSettingsWindow);
         mEntranceTrackerWindow = std::make_shared<EntranceTrackerWindow>(CVAR_WINDOW("EntranceTracker"), "Entrance Tracker");
         gui->AddGuiWindow(mEntranceTrackerWindow);
-        mEntranceTrackerSettingsWindow = std::make_shared<EntranceTrackerSettingsWindow>(CVAR_WINDOW("EntranceTrackerSettings"), "Entrance Tracker Settings");
+        mEntranceTrackerSettingsWindow = std::make_shared<EntranceTrackerSettingsWindow>(CVAR_WINDOW("EntranceTrackerSettings"), "Entrance Tracker Settings", ImVec2(600, 375));
         gui->AddGuiWindow(mEntranceTrackerSettingsWindow);
         mItemTrackerWindow = std::make_shared<ItemTrackerWindow>(CVAR_WINDOW("ItemTracker"), "Item Tracker");
         gui->AddGuiWindow(mItemTrackerWindow);

From 1b51750ec04ef4ce956301eb6c636c7bda355e4d Mon Sep 17 00:00:00 2001
From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Date: Tue, 17 Sep 2024 16:26:10 +0100
Subject: [PATCH 191/230] remove a return 0 (#4347)

---
 soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c b/soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c
index 7b6afefaa..5bc2b690d 100644
--- a/soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c
+++ b/soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c
@@ -280,7 +280,7 @@ void func_80A9CB18(EnKz* this, PlayState* play) {
         yaw -= this->actor.shape.rot.y;
         if ((fabsf(yaw) > 1638.0f) || (this->actor.xzDistToPlayer < 265.0f)) {
             this->actor.flags &= ~ACTOR_FLAG_TARGETABLE;
-            return 0;
+            return;
         }
 
         this->actor.flags |= ACTOR_FLAG_TARGETABLE;

From 6cd387ddf334ba73c812916f64a0a5874b69208b Mon Sep 17 00:00:00 2001
From: Malkierian <malkierian@gmail.com>
Date: Tue, 17 Sep 2024 08:40:38 -0700
Subject: [PATCH 192/230] Fix Deku Mouth for Entrance Rando and Mido Rando
 Functionality (#4342)

* Restore Deku Tree open as adult with dungeon shuffle.

* Add Mido spawn VB to allow for preventing Mido moving in rando when starting with Zelda's letter and closed deku or forest.

* Use RAND_GET_OPTION instead of OTRGlobals rando context, get rid of IS_RANDO in deku mouth VB handler.
---
 .../Enhancements/game-interactor/GameInteractor.h  |  2 ++
 soh/soh/Enhancements/randomizer/hook_handlers.cpp  | 14 ++++++++++++++
 soh/src/overlays/actors/ovl_En_Md/z_en_md.c        |  2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h
index 3523fa405..108d2f33e 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h
@@ -78,6 +78,8 @@ typedef enum {
     // Vanilla condition: INFTABLE_GREETED_BY_SARIA
     VB_NOT_BE_GREETED_BY_SARIA,
     // Opt: *EnMd
+    VB_MIDO_SPAWN,
+    // Opt: *EnMd
     // Vanilla condition: EnMd->interactInfo.talkState == NPC_TALK_STATE_ACTION
     VB_MOVE_MIDO_IN_KOKIRI_FOREST,
     // Opt: *EnMd
diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index 4bd8da742..92a1b278c 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -12,6 +12,7 @@ extern "C" {
 #include "functions.h"
 #include "variables.h"
 #include "soh/Enhancements/randomizer/adult_trade_shuffle.h"
+#include "src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.h"
 #include "src/overlays/actors/ovl_En_Si/z_en_si.h"
 #include "src/overlays/actors/ovl_En_Cow/z_en_cow.h"
 #include "src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.h"
@@ -614,6 +615,11 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
         case VB_BE_ELIGIBLE_FOR_PRELUDE_OF_LIGHT:
             *should = !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT) && CHECK_QUEST_ITEM(QUEST_MEDALLION_FOREST);
             break;
+        case VB_MIDO_SPAWN:
+            if (RAND_GET_OPTION(RSK_FOREST) != RO_FOREST_OPEN && !Flags_GetEventChkInf(EVENTCHKINF_SHOWED_MIDO_SWORD_SHIELD)) {
+                *should = true;
+            }
+            break;
         case VB_MOVE_MIDO_IN_KOKIRI_FOREST:
             if (RAND_GET_OPTION(RSK_FOREST) == RO_FOREST_OPEN) {
                 *should = true;
@@ -1465,6 +1471,14 @@ void RandomizerOnActorInitHandler(void* actorRef) {
         }
     }
 
+    if (actor->id == ACTOR_BG_TREEMOUTH && LINK_IS_ADULT &&
+        RAND_GET_OPTION(RSK_SHUFFLE_DUNGEON_ENTRANCES) != RO_DUNGEON_ENTRANCE_SHUFFLE_OFF &&
+        (RAND_GET_OPTION(RSK_FOREST) == RO_FOREST_OPEN ||
+            Flags_GetEventChkInf(EVENTCHKINF_SHOWED_MIDO_SWORD_SHIELD))) {
+        BgTreemouth* bgTreemouth = static_cast<BgTreemouth*>(actorRef);
+        bgTreemouth->unk_168 = 1.0f;
+    }
+
     //consumable bags
     if (
         actor->id == ACTOR_EN_ITEM00 &&
diff --git a/soh/src/overlays/actors/ovl_En_Md/z_en_md.c b/soh/src/overlays/actors/ovl_En_Md/z_en_md.c
index f55123f5b..5567f3e29 100644
--- a/soh/src/overlays/actors/ovl_En_Md/z_en_md.c
+++ b/soh/src/overlays/actors/ovl_En_Md/z_en_md.c
@@ -646,7 +646,7 @@ void EnMd_Init(Actor* thisx, PlayState* play) {
     Collider_InitCylinder(play, &this->collider);
     Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit);
     CollisionCheck_SetInfo2(&this->actor.colChkInfo, NULL, &sColChkInfoInit);
-    if (!EnMd_ShouldSpawn(this, play)) {
+    if (!GameInteractor_Should(VB_MIDO_SPAWN, EnMd_ShouldSpawn(this, play), this)) {
         Actor_Kill(&this->actor);
         return;
     }

From cd92e70b84630284f60169348d4c182a11520a6b Mon Sep 17 00:00:00 2001
From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Date: Tue, 17 Sep 2024 18:06:30 +0100
Subject: [PATCH 193/230] Refactor GetAccessibleLocations (#3871)

* saving for branch change

* V0 doesn't work

* crashing in random places halp

* push to rebase

* commit for branch change

* more branch switching

* First apparent working

* fix entrence validation

* comment cleanups

* post merge fixes

* Fix entrences not validating when spawns/owl drops are on but other entrences are not

* remove bombchusFound from the struct too

* Fix issue causing improper bombchu filtering on the playthrough

* text fixes

* submodules pls

* submodules pls pt 2
---
 .../Enhancements/randomizer/3drando/fill.cpp  | 654 +++++++++++-------
 .../Enhancements/randomizer/3drando/fill.hpp  |  23 +-
 .../Enhancements/randomizer/3drando/hints.cpp |   6 +-
 .../randomizer/3drando/location_access.cpp    |   7 +-
 .../randomizer/3drando/location_access.hpp    |   4 +-
 .../location_access/locacc_castle_town.cpp    |   5 +-
 soh/soh/Enhancements/randomizer/entrance.cpp  |   4 +-
 soh/soh/Enhancements/randomizer/logic.cpp     |   9 +-
 soh/soh/Enhancements/randomizer/logic.h       |   2 +-
 9 files changed, 423 insertions(+), 291 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/fill.cpp b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
index 835055ee4..366fa1ed1 100644
--- a/soh/soh/Enhancements/randomizer/3drando/fill.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
@@ -22,6 +22,57 @@
 using namespace CustomMessages;
 using namespace Rando;
 
+
+//RANDOTODO merge into Logic once Logic is a class passed to logic funtions 
+struct GetAccessableLocationsStruct {
+  std::vector<RandomizerCheck> accessibleLocations;
+  std::vector<RandomizerRegion> regionPool;
+  //Variables for playthrough
+  int gsCount;
+  int maxGsCount;
+  std::vector<LogicVal> buyIgnores;
+
+  //Variables for search
+  std::vector<Rando::ItemLocation*> newItemLocations;
+  bool updatedEvents;
+  bool ageTimePropogated;
+  bool firstIteration;
+
+  //Variables For Validating Entrences
+  bool haveTimeAccess;
+  bool foundTempleOfTime;
+  bool validatedStartingRegion;
+  bool sphereZeroComplete;
+
+  std::vector<RandomizerCheck> itemSphere;
+  std::list<Entrance*> entranceSphere;
+
+  GetAccessableLocationsStruct(int _maxGsCount){
+    regionPool = {RR_ROOT};
+    gsCount = 0;
+    maxGsCount = _maxGsCount;
+    updatedEvents = false;
+    ageTimePropogated = false;
+    firstIteration = true;
+    haveTimeAccess = false;
+    foundTempleOfTime = false;
+    validatedStartingRegion = false;
+    sphereZeroComplete = false;
+  }
+
+  void InitLoop(){
+    firstIteration = false;
+    ageTimePropogated = false;
+    updatedEvents = false;
+    for (Rando::ItemLocation* location : newItemLocations) {
+      location->ApplyPlacedItemEffect();
+    }
+    newItemLocations.clear();
+    itemSphere.clear();
+    entranceSphere.clear();
+  }
+};
+
 static bool placementFailure = false;
 
 static void RemoveStartingItemsFromPool() {
@@ -47,12 +98,12 @@ static void RemoveStartingItemsFromPool() {
   }
 }
 
-//This function will propogate Time of Day access through the entrance
-static bool UpdateToDAccess(Entrance* entrance, SearchMode mode) {
+//This function will propagate Time of Day access through the entrance
+static bool UpdateToDAccess(Entrance* entrance, bool propagateTimeTravel) {
 
   bool ageTimePropogated = false;
 
-  //propogate childDay, childNight, adultDay, and adultNight separately
+  //propagate childDay, childNight, adultDay, and adultNight separately
   Area* parent = entrance->GetParentRegion();
   Area* connection = entrance->GetConnectedRegion();
 
@@ -74,11 +125,10 @@ static bool UpdateToDAccess(Entrance* entrance, SearchMode mode) {
   }
 
   //special check for temple of time
-  bool propogateTimeTravel = mode != SearchMode::TimePassAccess && mode != SearchMode::TempleOfTimeAccess;
-  if (!AreaTable(RR_ROOT)->Adult() && AreaTable(RR_TOT_BEYOND_DOOR_OF_TIME)->Child() && propogateTimeTravel) {
+  if (propagateTimeTravel && !AreaTable(RR_ROOT)->Adult() && AreaTable(RR_TOT_BEYOND_DOOR_OF_TIME)->Child()) { //RANDOTODO: sphere weirdness, other age locations not propagated in this sphere
     AreaTable(RR_ROOT)->adultDay   = AreaTable(RR_TOT_BEYOND_DOOR_OF_TIME)->childDay;
     AreaTable(RR_ROOT)->adultNight = AreaTable(RR_TOT_BEYOND_DOOR_OF_TIME)->childNight;
-  } else if (!AreaTable(RR_ROOT)->Child() && AreaTable(RR_TOT_BEYOND_DOOR_OF_TIME)->Adult() && propogateTimeTravel){
+  } else if (propagateTimeTravel && !AreaTable(RR_ROOT)->Child() && AreaTable(RR_TOT_BEYOND_DOOR_OF_TIME)->Adult()){
     AreaTable(RR_ROOT)->childDay   = AreaTable(RR_TOT_BEYOND_DOOR_OF_TIME)->adultDay;
     AreaTable(RR_ROOT)->childNight = AreaTable(RR_TOT_BEYOND_DOOR_OF_TIME)->adultNight;
   }
@@ -86,55 +136,85 @@ static bool UpdateToDAccess(Entrance* entrance, SearchMode mode) {
   return ageTimePropogated;
 }
 
-// Various checks that need to pass for the world to be validated as completable
-static void ValidateWorldChecks(SearchMode& mode, bool checkPoeCollectorAccess, bool checkOtherEntranceAccess, std::vector<RandomizerRegion>& areaPool) {
+// Check if key locations in the overworld are accessable
+static void ValidateOtherEntrance(GetAccessableLocationsStruct& gals) {
   auto ctx = Rando::Context::GetInstance();
   // Condition for validating Temple of Time Access
-  if (mode == SearchMode::TempleOfTimeAccess && ((ctx->GetSettings()->ResolvedStartingAge() == RO_AGE_CHILD && AreaTable(RR_TEMPLE_OF_TIME)->Adult()) || (ctx->GetSettings()->ResolvedStartingAge() == RO_AGE_ADULT && AreaTable(RR_TEMPLE_OF_TIME)->Child()) || !checkOtherEntranceAccess)) {
-    mode = SearchMode::ValidStartingRegion;
+  if (!gals.foundTempleOfTime && ((ctx->GetSettings()->ResolvedStartingAge() == RO_AGE_CHILD && AreaTable(RR_TEMPLE_OF_TIME)->Adult()) || 
+                            (ctx->GetSettings()->ResolvedStartingAge() == RO_AGE_ADULT && AreaTable(RR_TEMPLE_OF_TIME)->Child()))) {
+    gals.foundTempleOfTime = true;
   }
   // Condition for validating a valid starting region
-  if (mode == SearchMode::ValidStartingRegion) {
+  if (!gals.validatedStartingRegion) {
     bool childAccess = ctx->GetSettings()->ResolvedStartingAge() == RO_AGE_CHILD || AreaTable(RR_TOT_BEYOND_DOOR_OF_TIME)->Child();
     bool adultAccess = ctx->GetSettings()->ResolvedStartingAge() == RO_AGE_ADULT || AreaTable(RR_TOT_BEYOND_DOOR_OF_TIME)->Adult();
 
     Area* kokiri = AreaTable(RR_KOKIRI_FOREST);
     Area* kakariko = AreaTable(RR_KAKARIKO_VILLAGE);
 
-    if ((childAccess && (kokiri->Child() || kakariko->Child())) ||
-        (adultAccess && (kokiri->Adult() || kakariko->Adult())) ||
-        !checkOtherEntranceAccess) {
-       mode = SearchMode::PoeCollectorAccess;
-       ApplyStartingInventory();
-       logic->NoBottles = true;
+    if ((childAccess && (kokiri->Child() || kakariko->Child())) ||// RANDOTODO when proper ammo logic is done, this could probably be made optional
+        (adultAccess && (kokiri->Adult() || kakariko->Adult()))) {
+       gals.validatedStartingRegion = true;
+       ApplyStartingInventory(); // RANDOTODO when proper ammo logic is done, this could be moved to the start
     }
   }
-  // Condition for validating Poe Collector Access
-  if (mode == SearchMode::PoeCollectorAccess && (AreaTable(RR_MARKET_GUARD_HOUSE)->Adult() || !checkPoeCollectorAccess)) {
-    // Apply all items that are necessary for checking all location access
-      std::vector<RandomizerGet> itemsToPlace =
-          FilterFromPool(ItemPool, [](const auto i) { return Rando::StaticData::RetrieveItem(i).IsAdvancement(); });
-    for (RandomizerGet unplacedItem : itemsToPlace) {
-       Rando::StaticData::RetrieveItem(unplacedItem).ApplyEffect();
-    }
-    // Reset access as the non-starting age
-    if (ctx->GetSettings()->ResolvedStartingAge() == RO_AGE_CHILD) {
-      for (RandomizerRegion areaKey : areaPool) {
-        AreaTable(areaKey)->adultDay = false;
-        AreaTable(areaKey)->adultNight = false;
-      }
-    } else {
-      for (RandomizerRegion areaKey : areaPool) {
-        AreaTable(areaKey)->childDay = false;
-        AreaTable(areaKey)->childNight = false;
-      }
-    }
-    mode = SearchMode::AllLocationsReachable;
-  } else {
-    logic->NoBottles = false;
-  }
 }
 
+// Apply all items that are necessary for checking all location access
+static void ApplyAllAdvancmentItems(){
+  std::vector<RandomizerGet> itemsToPlace =
+      FilterFromPool(ItemPool, [](const auto i) { return Rando::StaticData::RetrieveItem(i).IsAdvancement(); });
+  for (RandomizerGet unplacedItem : itemsToPlace) {
+      Rando::StaticData::RetrieveItem(unplacedItem).ApplyEffect();
+  }
+}
+
+// Check if everything in an entrence rando seed that needs to be avalible without items, is,
+// and if so allow obtaining items in logic
+static void ValidateSphereZero(GetAccessableLocationsStruct& gals){
+  auto ctx = Rando::Context::GetInstance();
+  // Condition for verifying everything required for sphere 0, expanding search to all locations
+  if (logic->CanEmptyBigPoes && gals.validatedStartingRegion && gals.foundTempleOfTime && gals.haveTimeAccess) {
+    // Apply all items that are necessary for checking all location access
+    ApplyAllAdvancmentItems();
+    // Reset access as the non-starting age
+    if (ctx->GetSettings()->ResolvedStartingAge() == RO_AGE_CHILD) {
+      for (RandomizerRegion regionKey : gals.regionPool) {
+        AreaTable(regionKey)->adultDay = false;
+        AreaTable(regionKey)->adultNight = false;
+      }
+    } else {
+      for (RandomizerRegion regionKey : gals.regionPool) {
+        AreaTable(regionKey)->childDay = false;
+        AreaTable(regionKey)->childNight = false;
+      }
+    }
+    gals.sphereZeroComplete = true;
+  } 
+}
+
+//This function handles each possible exit
+void ProcessExit(Entrance& exit, GetAccessableLocationsStruct& gals, bool propagateTimeTravel = true, bool checkPoeCollectorAccess = false, bool checkOtherEntranceAccess = false){
+  //Update Time of Day Access for the exit
+  if (UpdateToDAccess(&exit, propagateTimeTravel)) {
+    gals.ageTimePropogated = true;
+    if (checkOtherEntranceAccess){
+      ValidateOtherEntrance(gals);
+    }
+    if (!gals.sphereZeroComplete){
+      ValidateSphereZero(gals);
+    }
+  }
+
+  //If the exit is accessible and hasn't been added yet, add it to the pool
+  Area* exitArea = exit.GetConnectedRegion();
+  if (!exitArea->addedToPool && exit.ConditionsMet()) {
+    exitArea->addedToPool = true;
+    gals.regionPool.push_back(exit.GetConnectedRegionKey());
+  }
+}
+
+
 //Get the max number of tokens that can possibly be useful
 static int GetMaxGSCount() {
   auto ctx = Rando::Context::GetInstance();
@@ -186,9 +266,9 @@ std::string GetShopItemBaseName(std::string itemName) {
   return baseName;
 }
 
-std::vector<RandomizerCheck> GetEmptyLocations(std::vector<RandomizerCheck> allowedLocations) {
+std::vector<RandomizerCheck> GetEmptyLocations(std::vector<RandomizerCheck> targetLocations) {
     auto ctx = Rando::Context::GetInstance();
-    return FilterFromPool(allowedLocations, [ctx](const auto loc) {
+    return FilterFromPool(targetLocations, [ctx](const auto loc) {
         return ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == RG_NONE;
     });
 }
@@ -211,124 +291,176 @@ bool IsBeatableWithout(RandomizerCheck excludedCheck, bool replaceItem, Randomiz
   ctx->GetItemLocation(excludedCheck)->SetPlacedItem(RG_NONE); //Write in empty item
   ctx->playthroughBeatable = false;
   logic->Reset();
-  GetAccessibleLocations(ctx->allLocations, SearchMode::CheckBeatable, ignore); //Check if game is still beatable
+  CheckBeatable(ignore);
   if (replaceItem){
     ctx->GetItemLocation(excludedCheck)->SetPlacedItem(copy); //Immediately put item back
   }
   return ctx->playthroughBeatable;
 }
 
-//This function will return a vector of ItemLocations that are accessible with
-//where items have been placed so far within the world. The allowedLocations argument
-//specifies the pool of locations that we're trying to search for an accessible location in
-std::vector<RandomizerCheck> GetAccessibleLocations(const std::vector<RandomizerCheck>& allowedLocations, SearchMode mode /* = SearchMode::ReachabilitySearch*/, RandomizerGet ignore /* = RG_NONE*/, bool checkPoeCollectorAccess /*= false*/, bool checkOtherEntranceAccess /*= false*/) {
-    auto ctx = Rando::Context::GetInstance();
-    std::vector<RandomizerCheck> accessibleLocations;
-    // Reset all access to begin a new search
-    if (mode < SearchMode::ValidateWorld) {
-        ApplyStartingInventory();
+// Reset non-Logic-class logic, and optionally apply the initial inventory
+void ResetLogic(std::shared_ptr<Context>& ctx, bool applyInventory = false){
+  if (applyInventory){
+    ApplyStartingInventory();
   }
   Areas::AccessReset();
   ctx->LocationReset();
-  std::vector<RandomizerRegion> areaPool = {RR_ROOT};
+} 
 
-  if (mode == SearchMode::ValidateWorld) {
-    mode = SearchMode::TimePassAccess;
-    AreaTable(RR_ROOT)->childNight = true;
-    AreaTable(RR_ROOT)->adultNight = true;
-    AreaTable(RR_ROOT)->childDay = true;
-    AreaTable(RR_ROOT)->adultDay = true;
-    ctx->allLocationsReachable = false;
-  }
+//Generate the playthrough, so we want to add advancement items, unless we know to ignore them
+void AddToPlaythrough(LocationAccess& locPair, GetAccessableLocationsStruct& gals){
+  auto ctx = Rando::Context::GetInstance();
+  RandomizerCheck loc = locPair.GetLocation();
+  Rando::ItemLocation* location = ctx->GetItemLocation(loc);
+  RandomizerGet locItem = location->GetPlacedRandomizerGet();
+  //Item is an advancement item, figure out if it should be added to this sphere
+  if (!ctx->playthroughBeatable && location->GetPlacedItem().IsAdvancement()) {
+    ItemType type = location->GetPlacedItem().GetItemType();
 
-  //Variables for playthrough
-  int gsCount = 0;
-  const int maxGsCount = mode == SearchMode::GeneratePlaythrough ? GetMaxGSCount() : 0; //If generating playthrough want the max that's possibly useful, else doesn't matter
-  std::vector<LogicVal> buyIgnores;
-
-  //Variables for search
-  std::vector<Rando::ItemLocation*> newItemLocations;
-  bool updatedEvents = false;
-  bool ageTimePropogated = false;
-  bool firstIteration = true;
-
-  //Variables for Time Pass access
-  bool timePassChildDay = false;
-  bool timePassChildNight = false;
-  bool timePassAdultDay = false;
-  bool timePassAdultNight = false;
-
-  // Main access checking loop
-  while (newItemLocations.size() > 0 || updatedEvents || ageTimePropogated || firstIteration) {
-    firstIteration = false;
-    ageTimePropogated = false;
-    updatedEvents = false;
-
-    for (Rando::ItemLocation* location : newItemLocations) {
-      location->ApplyPlacedItemEffect();
+    //Decide whether to exclude this location
+    //This preprocessing is done to reduce the amount of searches performed in PareDownPlaythrough
+    //Want to exclude:
+    //1) Tokens after the last potentially useful one (the last one that gives an advancement item or last for token bridge)
+    //2) Buy items of the same type, after the first (So only see Buy Deku Nut of any amount once)
+    bool exclude = true;
+    //Exclude tokens after the last possibly useful one
+    if (type == ITEMTYPE_TOKEN && gals.gsCount < gals.maxGsCount) {
+      gals.gsCount++;
+      exclude = false;
     }
-    newItemLocations.clear();
-
-    std::vector<RandomizerCheck> itemSphere;
-    std::list<Entrance*> entranceSphere;
-
-    for (size_t i = 0; i < areaPool.size(); i++) {
-      Area* area = AreaTable(areaPool[i]);
-
-      if (area->UpdateEvents(mode)){
-        updatedEvents = true;
+    //Handle buy items
+    //If ammo drops are off, don't do this step, since buyable ammo becomes logically important
+    // TODO: Reimplement Ammo Drops setting
+    else if (/*AmmoDrops.IsNot(AMMODROPS_NONE) &&*/ type == ITEMTYPE_SHOP) {
+      //Only check each buy item once
+      auto buyItem = location->GetPlacedItem().GetLogicVal();
+      //Buy item not in list to ignore, add it to list and write to playthrough
+      if (std::find(gals.buyIgnores.begin(), gals.buyIgnores.end(), buyItem) == gals.buyIgnores.end()) {
+        exclude = false;
+        gals.buyIgnores.push_back(buyItem);
       }
+    }
+    //Add all other advancement items
+    else if (type != ITEMTYPE_TOKEN && (/*AmmoDrops.Is(AMMODROPS_NONE) ||*/ type != ITEMTYPE_SHOP)) {
+      exclude = false;
+    }
+    //Has not been excluded, add to playthrough
+    if (!exclude) {
+      gals.itemSphere.push_back(loc);
+    }
+  }
+  //Triforce has been found, seed is beatable, nothing else in this or future spheres matters
+  else if (location->GetPlacedRandomizerGet() == RG_TRIFORCE) {
+    gals.itemSphere.clear();
+    gals.itemSphere.push_back(loc);
+    ctx->playthroughBeatable = true;
+  }
+}
 
-      // If we're checking for TimePass access do that for each area as it's being updated.
-      // TimePass Access is satisfied when every AgeTime can reach an area with TimePass
-      // without the aid of TimePass. During this mode, TimePass won't update ToD access
-      // in any area.
-      if (mode == SearchMode::TimePassAccess) {
-        if (area->timePass) {
-          if (area->childDay) {
-            timePassChildDay = true;
-          }
-          if (area->childNight) {
-            timePassChildNight = true;
-          }
-          if (area->adultDay) {
-            timePassAdultDay = true;
-          }
-          if (area->adultNight) {
-            timePassAdultNight = true;
-          }
+// Adds the contents of a location to the current progression and optionally playthrough
+bool AddCheckToLogic(LocationAccess& locPair, GetAccessableLocationsStruct& gals, RandomizerGet ignore, bool stopOnBeatable, bool addToPlaythrough=false){
+  auto ctx = Rando::Context::GetInstance();
+  RandomizerCheck loc = locPair.GetLocation();
+  Rando::ItemLocation* location = ctx->GetItemLocation(loc);
+  RandomizerGet locItem = location->GetPlacedRandomizerGet();
+
+  if (!location->IsAddedToPool() && locPair.ConditionsMet()) {
+    location->AddToPool();
+
+    if (locItem == RG_NONE) {
+      gals.accessibleLocations.push_back(loc); //Empty location, consider for placement
+    } else {
+      //If ignore has a value, we want to check if the item location should be considered or not
+      //This is necessary due to the below preprocessing for playthrough generation
+      if (ignore != RG_NONE) {
+        ItemType type = location->GetPlacedItem().GetItemType();
+        //If we want to ignore tokens, only add if not a token
+        if (ignore == RG_GOLD_SKULLTULA_TOKEN && type != ITEMTYPE_TOKEN) {
+          gals.newItemLocations.push_back(location);
         }
-        // Condition for validating that all startring AgeTimes have timepass access
-        // Once satisifed, change the mode to begin checking for Temple of Time Access
-        if ((timePassChildDay && timePassChildNight && timePassAdultDay && timePassAdultNight) || !checkOtherEntranceAccess) {
-          mode = SearchMode::TempleOfTimeAccess;
+        //If we want to ignore bombchus, only add if bombchu is not in the name
+        else if (IsBombchus(ignore) && IsBombchus(locItem, true)) {
+          gals.newItemLocations.push_back(location);
+        }
+        //We want to ignore a specific Buy item. Buy items with different RandomizerGets are recognised by a shared GetLogicVal
+        else if (ignore != RG_GOLD_SKULLTULA_TOKEN && IsBombchus(ignore)) {
+          if ((type == ITEMTYPE_SHOP && Rando::StaticData::GetItemTable()[ignore].GetLogicVal() != location->GetPlacedItem().GetLogicVal()) || type != ITEMTYPE_SHOP) {
+            gals.newItemLocations.push_back(location);
+          }
         }
       }
+      //If it doesn't, we can just add the location
+      else {
+        gals.newItemLocations.push_back(location); //Add item to cache to be considered in logic next iteration
+      }
+    }
+    if (addToPlaythrough){
+      AddToPlaythrough(locPair, gals);
+    }
+    //All we care about is if the game is beatable, used to pare down playthrough
+    if (location->GetPlacedRandomizerGet() == RG_TRIFORCE && stopOnBeatable) {
+      return true; //Return early for efficiency
+    }
+  }
+  return false;
+}
 
-      //for each exit in this area
-      for (auto& exit : area->exits) {
+// Return any of the targetLocations that are accessible in logic
+std::vector<RandomizerCheck> ReachabilitySearch(const std::vector<RandomizerCheck>& targetLocations, RandomizerGet ignore /* = RG_NONE*/) {
+  auto ctx = Rando::Context::GetInstance();
+  GetAccessableLocationsStruct gals(0);
+  ResetLogic(ctx, true);
+  while (gals.newItemLocations.size() > 0 || gals.updatedEvents || gals.ageTimePropogated || gals.firstIteration) {
+    gals.InitLoop();
+    for (size_t i = 0; i < gals.regionPool.size(); i++) {
+      Area* region = AreaTable(gals.regionPool[i]);
 
-        //Update Time of Day Access for the exit
-        if (UpdateToDAccess(&exit, mode)) {
-          ageTimePropogated = true;
-          ValidateWorldChecks(mode, checkPoeCollectorAccess, checkOtherEntranceAccess, areaPool);
-        }
+      if (region->UpdateEvents()){
+        gals.updatedEvents = true;
+      }
+      for (auto& exit : region->exits) {
+        ProcessExit(exit, gals);
+      }
+      for (size_t k = 0; k < region->locations.size(); k++) {
+        LocationAccess& locPair = region->locations[k];
+        AddCheckToLogic(locPair, gals, ignore, false);
+      }
+    }
+  }
+  erase_if(gals.accessibleLocations, [&targetLocations, ctx](RandomizerCheck loc){
+    for (RandomizerCheck allowedLocation : targetLocations) {
+      if (loc == allowedLocation || ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() != RG_NONE) {
+        return false;
+      }
+    }
+    return true;
+  });
+  return gals.accessibleLocations;
+}
 
-        //If the exit is accessible and hasn't been added yet, add it to the pool
-        Area* exitArea = exit.GetConnectedRegion();
-        if (!exitArea->addedToPool && exit.ConditionsMet()) {
-          exitArea->addedToPool = true;
-          areaPool.push_back(exit.GetConnectedRegionKey());
-        }
+// Create the playthrough for the seed
+void GeneratePlaythrough() {
+  auto ctx = Rando::Context::GetInstance();
+  ctx->playthroughBeatable = false;
+  logic->Reset();
+  GetAccessableLocationsStruct gals(GetMaxGSCount());
+  ResetLogic(ctx, true);
+  while (gals.newItemLocations.size() > 0 || gals.updatedEvents || gals.ageTimePropogated || gals.firstIteration) {
+    gals.InitLoop();
+    for (size_t i = 0; i < gals.regionPool.size(); i++) {
+      Area* region = AreaTable(gals.regionPool[i]);
 
+      if (region->UpdateEvents()){
+        gals.updatedEvents = true;
+      }
+      for (auto& exit : region->exits) {
+        ProcessExit(exit, gals);
         // Add shuffled entrances to the entrance playthrough
         // Include bluewarps when unshuffled but dungeon or boss shuffle is on
-        if (mode == SearchMode::GeneratePlaythrough &&
-            (exit.IsShuffled() ||
-             (exit.GetType() == Rando::EntranceType::BlueWarp &&
-              (ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES) || ctx->GetOption(RSK_SHUFFLE_BOSS_ENTRANCES)))) &&
-            !exit.IsAddedToPool() && !ctx->GetEntranceShuffler()->HasNoRandomEntrances()) {
-          entranceSphere.push_back(&exit);
+        if((exit.IsShuffled() || (exit.GetType() == Rando::EntranceType::BlueWarp && 
+            (ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES) || ctx->GetOption(RSK_SHUFFLE_BOSS_ENTRANCES)))) &&
+           !exit.IsAddedToPool() && !ctx->GetEntranceShuffler()->HasNoRandomEntrances()) {
+          gals.entranceSphere.push_back(&exit);
           exit.AddToPool();
           // Don't list a two-way coupled entrance from both directions
           if (exit.GetReverse() != nullptr && exit.GetReplacement()->GetReverse() != nullptr && !exit.IsDecoupled()) {
@@ -336,114 +468,136 @@ std::vector<RandomizerCheck> GetAccessibleLocations(const std::vector<Randomizer
           }
         }
       }
+      for (size_t k = 0; k < region->locations.size(); k++) {
+        LocationAccess& locPair = region->locations[k];
+        AddCheckToLogic(locPair, gals, RG_NONE, false, true);
+      }
+    }
+    if (gals.itemSphere.size() > 0) {
+      ctx->playthroughLocations.push_back(gals.itemSphere);
+    }
+    if (gals.entranceSphere.size() > 0 && !ctx->GetEntranceShuffler()->HasNoRandomEntrances()) {
+      ctx->GetEntranceShuffler()->playthroughEntrances.push_back(gals.entranceSphere);
+    }
+  }
+}
 
-      //for each ItemLocation in this area
-      if (mode < SearchMode::ValidateWorld) {
-        for (size_t k = 0; k < area->locations.size(); k++) {
-          LocationAccess& locPair = area->locations[k];
-          RandomizerCheck loc = locPair.GetLocation();
-          Rando::ItemLocation* location = ctx->GetItemLocation(loc);
-          RandomizerGet locItem = location->GetPlacedRandomizerGet();
+// return if the seed is currently beatable or not
+bool CheckBeatable(RandomizerGet ignore /* = RG_NONE*/) {
+  auto ctx = Rando::Context::GetInstance();
+  GetAccessableLocationsStruct gals(0);
+  ResetLogic(ctx, true);
+  while (gals.newItemLocations.size() > 0 || gals.updatedEvents || gals.ageTimePropogated || gals.firstIteration) {
+    gals.InitLoop();
+    for (size_t i = 0; i < gals.regionPool.size(); i++) {
+      Area* region = AreaTable(gals.regionPool[i]);
 
-          if (!location->IsAddedToPool() && locPair.ConditionsMet()) {
-
-            location->AddToPool();
-
-            if (locItem == RG_NONE) {
-              accessibleLocations.push_back(loc); //Empty location, consider for placement
-            } else {
-              //If ignore has a value, we want to check if the item location should be considered or not
-              //This is necessary due to the below preprocessing for playthrough generation
-              if (ignore != RG_NONE) {
-                ItemType type = location->GetPlacedItem().GetItemType();
-                //If we want to ignore tokens, only add if not a token
-                if (ignore == RG_GOLD_SKULLTULA_TOKEN && type != ITEMTYPE_TOKEN) {
-                  newItemLocations.push_back(location);
-                }
-                //If we want to ignore bombchus, only add if bombchu is not in the name
-                else if (IsBombchus(ignore) && IsBombchus(locItem, true)) {
-                  newItemLocations.push_back(location);
-                }
-                //We want to ignore a specific Buy item. Buy items with different RandomizerGets are recognised by a shared GetLogicVal
-                else if (ignore != RG_GOLD_SKULLTULA_TOKEN && IsBombchus(ignore)) {
-                  if ((type == ITEMTYPE_SHOP && Rando::StaticData::GetItemTable()[ignore].GetLogicVal() != location->GetPlacedItem().GetLogicVal()) || type != ITEMTYPE_SHOP) {
-                    newItemLocations.push_back(location);
-                  }
-                }
-              }
-              //If it doesn't, we can just add the location
-              else {
-                newItemLocations.push_back(location); //Add item to cache to be considered in logic next iteration
-              }
-            }
-
-            //Playthrough stuff
-            //Generate the playthrough, so we want to add advancement items, unless we know to ignore them
-            if (mode == SearchMode::GeneratePlaythrough) {
-              //Item is an advancement item, figure out if it should be added to this sphere
-              if (!ctx->playthroughBeatable && location->GetPlacedItem().IsAdvancement()) {
-                ItemType type = location->GetPlacedItem().GetItemType();
-
-                //Decide whether to exclude this location
-                //This preprocessing is done to reduce the amount of searches performed in PareDownPlaythrough
-                //Want to exclude:
-                //1) Tokens after the last potentially useful one (the last one that gives an advancement item or last for token bridge)
-                //2) Buy items of the same type, after the first (So only see Buy Deku Nut of any amount once)
-                bool exclude = true;
-                //Exclude tokens after the last possibly useful one
-                if (type == ITEMTYPE_TOKEN && gsCount < maxGsCount) {
-                  gsCount++;
-                  exclude = false;
-                }
-
-                //Handle buy items
-                //If ammo drops are off, don't do this step, since buyable ammo becomes logically important
-                // TODO: Reimplement Ammo Drops setting
-                else if (/*AmmoDrops.IsNot(AMMODROPS_NONE) &&*/ type == ITEMTYPE_SHOP) {
-                  //Only check each buy item once
-                  auto buyItem = location->GetPlacedItem().GetLogicVal();
-                  //Buy item not in list to ignore, add it to list and write to playthrough
-                  if (std::find(buyIgnores.begin(), buyIgnores.end(), buyItem) == buyIgnores.end()) {
-                    exclude = false;
-                    buyIgnores.push_back(buyItem);
-                  }
-                }
-                //Add all other advancement items
-                else if (type != ITEMTYPE_TOKEN && (/*AmmoDrops.Is(AMMODROPS_NONE) ||*/ type != ITEMTYPE_SHOP)) {
-                  exclude = false;
-                }
-                //Has not been excluded, add to playthrough
-                if (!exclude) {
-                  itemSphere.push_back(loc);
-                }
-              }
-              //Triforce has been found, seed is beatable, nothing else in this or future spheres matters
-              else if (location->GetPlacedRandomizerGet() == RG_TRIFORCE) {
-                itemSphere.clear();
-                itemSphere.push_back(loc);
-                ctx->playthroughBeatable = true;
-              }
-            }
-            //All we care about is if the game is beatable, used to pare down playthrough
-            else if (location->GetPlacedRandomizerGet() == RG_TRIFORCE && mode == SearchMode::CheckBeatable) {
-              ctx->playthroughBeatable = true;
-              return {}; //Return early for efficiency
-            }
-          }
+      if (region->UpdateEvents()){
+        gals.updatedEvents = true;
+      }
+      for (auto& exit : region->exits) {
+        ProcessExit(exit, gals);
+      }
+      for (size_t k = 0; k < region->locations.size(); k++) {
+        LocationAccess& locPair = region->locations[k];
+        if(AddCheckToLogic(locPair, gals, ignore, true)){
+          ctx->playthroughBeatable = true;
+          return true;
         }
       }
     }
+  }
+  return false;
+}
 
-    if (mode == SearchMode::GeneratePlaythrough && itemSphere.size() > 0) {
-      ctx->playthroughLocations.push_back(itemSphere);
-    }
-    if (mode == SearchMode::GeneratePlaythrough && entranceSphere.size() > 0 && !ctx->GetEntranceShuffler()->HasNoRandomEntrances()) {
-      ctx->GetEntranceShuffler()->playthroughEntrances.push_back(entranceSphere);
+// Check if the currently randomised set of entrences is a valid game map.
+void ValidateEntrances(bool checkPoeCollectorAccess, bool checkOtherEntranceAccess) {
+  auto ctx = Rando::Context::GetInstance();
+  GetAccessableLocationsStruct gals(0);
+  ResetLogic(ctx, !checkOtherEntranceAccess);
+
+  //Variables for Time Pass access
+  bool timePassChildDay = false;
+  bool timePassChildNight = false;
+  bool timePassAdultDay = false;
+  bool timePassAdultNight = false;
+
+  ctx->allLocationsReachable = false;
+  if (checkPoeCollectorAccess){
+    logic->CanEmptyBigPoes = false;
+  }
+  if (!checkOtherEntranceAccess){
+    gals.foundTempleOfTime = true;
+    gals.validatedStartingRegion = true;
+    gals.haveTimeAccess = true;
+    gals.sphereZeroComplete = true;
+    ApplyAllAdvancmentItems();
+    //if we assume valid sphere zero, we only want starting age access
+    if (ctx->GetSettings()->ResolvedStartingAge() == RO_AGE_CHILD) {
+      for (RandomizerRegion regionKey : gals.regionPool) {
+        AreaTable(RR_ROOT)->childNight = true;
+        AreaTable(RR_ROOT)->childDay = true;
+      }
+    } else {
+      for (RandomizerRegion regionKey : gals.regionPool) {
+        AreaTable(RR_ROOT)->adultNight = true;
+        AreaTable(RR_ROOT)->adultDay = true;
+      }
     }
+  } else {
+    AreaTable(RR_ROOT)->childNight = true;
+    AreaTable(RR_ROOT)->adultNight = true;
+    AreaTable(RR_ROOT)->childDay = true;
+    AreaTable(RR_ROOT)->adultDay = true;
   }
 
-  //Check to see if all locations were reached
-  if (mode == SearchMode::AllLocationsReachable) {
+  while (gals.newItemLocations.size() > 0 || gals.updatedEvents || gals.ageTimePropogated || gals.firstIteration) {
+    gals.InitLoop();
+    for (size_t i = 0; i < gals.regionPool.size(); i++) {
+      Area* region = AreaTable(gals.regionPool[i]);
+
+      if (region->UpdateEvents(gals.haveTimeAccess)){
+        gals.updatedEvents = true;
+      }
+      // If we're checking for TimePass access do that for each region as it's being updated.
+      // TimePass Access is satisfied when every AgeTime can reach a region with TimePass
+      // without the aid of TimePass. During this mode, TimePass won't update ToD access
+      // in any region.
+      if (!gals.haveTimeAccess) {
+        if (region->timePass) {
+          if (region->childDay) {
+            timePassChildDay = true;
+          }
+          if (region->childNight) {
+            timePassChildNight = true;
+          }
+          if (region->adultDay) {
+            timePassAdultDay = true;
+          }
+          if (region->adultNight) {
+            timePassAdultNight = true;
+          }
+        }
+        // Condition for validating that all startring AgeTimes have timepass access
+        // Once satisifed, change the mode to begin checking for Temple of Time Access
+        if (timePassChildDay && timePassChildNight && timePassAdultDay && timePassAdultNight) {
+          gals.haveTimeAccess = true;
+        }
+      }
+
+      //for each exit in this region
+      for (auto& exit : region->exits) {
+        ProcessExit(exit, gals, gals.haveTimeAccess && gals.foundTempleOfTime, checkPoeCollectorAccess, checkOtherEntranceAccess);
+      } 
+      if (gals.sphereZeroComplete) {
+        for (size_t k = 0; k < region->locations.size(); k++) {
+          LocationAccess& locPair = region->locations[k];
+          AddCheckToLogic(locPair, gals, RG_NONE, false);
+        }
+      }
+    }
+  }
+  if (gals.sphereZeroComplete) {
     ctx->allLocationsReachable = true;
     for (const RandomizerCheck loc : ctx->allLocations) {
       if (!ctx->GetItemLocation(loc)->IsAddedToPool()) {
@@ -457,25 +611,7 @@ std::vector<RandomizerCheck> GetAccessibleLocations(const std::vector<Randomizer
         #endif
       }
     }
-    return {};
   }
-
-  erase_if(accessibleLocations, [&allowedLocations, ctx](RandomizerCheck loc){
-    for (RandomizerCheck allowedLocation : allowedLocations) {
-      if (loc == allowedLocation || ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() != RG_NONE) {
-        return false;
-      }
-    }
-    return true;
-  });
-  return accessibleLocations;
-}
-
-static void GeneratePlaythrough() {
-    auto ctx = Rando::Context::GetInstance();
-    ctx->playthroughBeatable = false;
-    logic->Reset();
-    GetAccessibleLocations(ctx->allLocations, SearchMode::GeneratePlaythrough);
 }
 
 RandomizerArea LookForExternalArea(const Area* const currentRegion, std::vector<RandomizerRegion> &alreadyChecked){
@@ -489,7 +625,7 @@ RandomizerArea LookForExternalArea(const Area* const currentRegion, std::vector<
       if(passdown != RA_NONE){
         return passdown;
       }
-    } else if (otherArea != RA_LINKS_POCKET){ //if it's links pocket, do not propogate this, Link's Pocket is not a real Area
+    } else if (otherArea != RA_LINKS_POCKET){ //if it's links pocket, do not propagate this, Link's Pocket is not a real Area
       return otherArea;
     }
   }
@@ -576,7 +712,7 @@ static void CalculateWotH() {
   }
   ctx->playthroughBeatable = true;
   logic->Reset();
-  GetAccessibleLocations(ctx->allLocations);
+  ReachabilitySearch(ctx->allLocations);
 }
 
 //Calculate barren locations and assign Barren Candidacy to all locations inside those areas
@@ -687,7 +823,7 @@ static void AssumedFill(const std::vector<RandomizerGet>& items, const std::vect
             }
 
             // get all accessible locations that are allowed
-            const std::vector<RandomizerCheck> accessibleLocations = GetAccessibleLocations(allowedLocations);
+            const std::vector<RandomizerCheck> accessibleLocations = ReachabilitySearch(allowedLocations);
 
             // retry if there are no more locations to place items
             if (accessibleLocations.empty()) {
@@ -729,7 +865,7 @@ static void AssumedFill(const std::vector<RandomizerGet>& items, const std::vect
             if (!ctx->GetOption(RSK_ALL_LOCATIONS_REACHABLE)) {
                 ctx->playthroughBeatable = false;
                 logic->Reset();
-                GetAccessibleLocations(ctx->allLocations, SearchMode::CheckBeatable);
+                CheckBeatable();
                 if (ctx->playthroughBeatable) {
                     SPDLOG_DEBUG("Game beatable, now placing items randomly. " + std::to_string(itemsToPlace.size()) +
                                 " major items remaining.\n\n");
diff --git a/soh/soh/Enhancements/randomizer/3drando/fill.hpp b/soh/soh/Enhancements/randomizer/3drando/fill.hpp
index 2dd6c21c8..60feafc16 100644
--- a/soh/soh/Enhancements/randomizer/3drando/fill.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/fill.hpp
@@ -5,25 +5,16 @@
 #include <vector>
 #include <string>
 
-enum class SearchMode {
-  ReachabilitySearch,
-  GeneratePlaythrough,
-  CheckBeatable,
-  AllLocationsReachable,
-  ValidateWorld,
-  TimePassAccess,
-  TempleOfTimeAccess,
-  ValidStartingRegion,
-  PoeCollectorAccess,
-};
-
 void ClearProgress();
 void VanillaFill();
 int Fill();
 
 std::vector<RandomizerCheck> GetEmptyLocations(std::vector<RandomizerCheck> allowedLocations);
 
-std::vector<RandomizerCheck> GetAccessibleLocations(const std::vector<RandomizerCheck>& allowedLocations,
-                                             SearchMode mode = SearchMode::ReachabilitySearch, RandomizerGet ignore = RG_NONE,
-                                             bool checkPoeCollectorAccess = false,
-                                             bool checkOtherEntranceAccess = false);
\ No newline at end of file
+std::vector<RandomizerCheck> ReachabilitySearch(const std::vector<RandomizerCheck>& allowedLocations, RandomizerGet ignore=RG_NONE);
+
+void GeneratePlaythrough();
+
+bool CheckBeatable(RandomizerGet ignore=RG_NONE);
+
+void ValidateEntrances(bool checkPoeCollectorAccess, bool checkOtherEntranceAccess);
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.cpp b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
index 95f5a1144..9b22706cd 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hints.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
@@ -328,7 +328,7 @@ static std::vector<RandomizerCheck> GetAccessibleGossipStones(const RandomizerCh
   ctx->GetItemLocation(hintedLocation)->SetPlacedItem(RG_NONE);
 
   ctx->GetLogic()->Reset();
-  auto accessibleGossipStones = GetAccessibleLocations(Rando::StaticData::gossipStoneLocations);
+  auto accessibleGossipStones = ReachabilitySearch(Rando::StaticData::gossipStoneLocations);
   //Give the item back to the location
   ctx->GetItemLocation(hintedLocation)->SetPlacedItem(originalItem);
 
@@ -342,7 +342,7 @@ bool IsReachableWithout(std::vector<RandomizerCheck> locsToCheck, RandomizerChec
   RandomizerGet originalItem = ctx->GetItemLocation(excludedCheck)->GetPlacedRandomizerGet();
   ctx->GetItemLocation(excludedCheck)->SetPlacedItem(RG_NONE);
   ctx->GetLogic()->Reset();
-  const auto rechableWithout = GetAccessibleLocations(locsToCheck);
+  const auto rechableWithout = ReachabilitySearch(locsToCheck);
   ctx->GetItemLocation(excludedCheck)->SetPlacedItem(originalItem);
   if (resetAfter){
     //if resetAfter is on, reset logic we are done
@@ -670,7 +670,7 @@ void CreateStoneHints() {
   //Getting gossip stone locations temporarily sets one location to not be reachable.
   //Call the function one last time to get rid of false positives on locations not
   //being reachable.
-  GetAccessibleLocations({});
+  ReachabilitySearch({});
 }
 
 std::vector<RandomizerCheck> FindItemsAndMarkHinted(std::vector<RandomizerGet> items, std::vector<RandomizerCheck> hintChecks){
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
index 29b3cb217..851c26a48 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
@@ -89,9 +89,8 @@ Area::Area(std::string regionName_, std::string scene_, RandomizerArea area,
 
 Area::~Area() = default;
 
-bool Area::UpdateEvents(SearchMode mode) {
-
-  if (timePass && mode != SearchMode::TimePassAccess) {
+bool Area::UpdateEvents(bool haveTimeAccess) {
+  if (timePass && haveTimeAccess) {
     if (Child()) {
       childDay = true;
       childNight = true;
@@ -241,7 +240,7 @@ std::shared_ptr<Rando::Logic> logic;
 void AreaTable_Init() {
   using namespace Rando;
   randoCtx = Context::GetInstance().get();
-  logic = randoCtx->GetLogic();
+  logic = randoCtx->GetLogic(); //RANDOTODO do not hardcode, instead allow accepting a Logic class somehow
   grottoEvents = {
       EventAccess(&logic->GossipStoneFairy, { [] { return logic->GossipStoneFairy || logic->CanSummonGossipFairy; } }),
       EventAccess(&logic->ButterflyFairy, { [] { return logic->ButterflyFairy || (logic->CanUse(RG_STICKS)); } }),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access.hpp b/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
index 286551cab..3dcdbfb26 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
@@ -164,9 +164,9 @@ public:
     bool childNight = false;
     bool adultDay = false;
     bool adultNight = false;
-    bool addedToPool = false;
+    bool addedToPool = false;;
 
-    bool UpdateEvents(SearchMode mode);
+    bool UpdateEvents(bool haveTimeAccess = true);
 
     void AddExit(RandomizerRegion parentKey, RandomizerRegion newExitKey, ConditionFn condition);
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
index e809beb54..9f113218c 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
@@ -165,7 +165,10 @@ void AreaTable_Init_CastleTown() {
     Entrance(RR_GANONS_CASTLE_ENTRYWAY, {[]{return logic->IsAdult;}}),
   });
 
-  areaTable[RR_MARKET_GUARD_HOUSE] = Area("Market Guard House", "Market Guard House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_MARKET_GUARD_HOUSE] = Area("Market Guard House", "Market Guard House", RA_NONE, NO_DAY_NIGHT_CYCLE, {
+                  //Events
+                  EventAccess(&logic->CanEmptyBigPoes,   {[]{return logic->IsAdult;}}),
+                }, {
                   //Locations
                   LOCATION(RC_MARKET_10_BIG_POES,    logic->IsAdult && logic->BigPoeKill),
                   LOCATION(RC_MARKET_GS_GUARD_HOUSE, logic->IsChild),
diff --git a/soh/soh/Enhancements/randomizer/entrance.cpp b/soh/soh/Enhancements/randomizer/entrance.cpp
index 39eab1398..16f362cb9 100644
--- a/soh/soh/Enhancements/randomizer/entrance.cpp
+++ b/soh/soh/Enhancements/randomizer/entrance.cpp
@@ -462,7 +462,7 @@ static bool ValidateWorld(Entrance* entrancePlaced) {
     // Conditions will be checked during the search and any that fail will be figured out
     // afterwards
     ctx->GetLogic()->Reset();
-    GetAccessibleLocations({}, SearchMode::ValidateWorld, RG_NONE, checkPoeCollectorAccess, checkOtherEntranceAccess);
+    ValidateEntrances(checkPoeCollectorAccess, checkOtherEntranceAccess);
 
     if (!ctx->GetOption(RSK_DECOUPLED_ENTRANCES)) {
         // Unless entrances are decoupled, we don't want the player to end up through certain entrances as the wrong age
@@ -765,7 +765,7 @@ static std::array<std::vector<Entrance*>, 2> SplitEntrancesByRequirements(std::v
         Rando::StaticData::RetrieveItem(unplacedItem).ApplyEffect();
     }
     // run a search to see what's accessible
-    GetAccessibleLocations({});
+    ReachabilitySearch({});
 
     for (Entrance* entrance : entrancesToSplit) {
         // if an entrance is accessible at all times of day by both ages, it's a soft entrance with no restrictions
diff --git a/soh/soh/Enhancements/randomizer/logic.cpp b/soh/soh/Enhancements/randomizer/logic.cpp
index edb17df0c..231799baf 100644
--- a/soh/soh/Enhancements/randomizer/logic.cpp
+++ b/soh/soh/Enhancements/randomizer/logic.cpp
@@ -441,9 +441,12 @@ namespace Rando {
 
     uint8_t Logic::BottleCount() {
         uint8_t count = 0;
+        if (!CanEmptyBigPoes){
+            return 0;
+        }
         for (int i = SLOT_BOTTLE_1; i <= SLOT_BOTTLE_4; i++) {
             uint8_t item = ctx->GetSaveContext()->inventory.items[i];
-            if (item != ITEM_NONE && (item != ITEM_LETTER_RUTO || (item == ITEM_LETTER_RUTO && DeliverLetter)) && item != ITEM_BIG_POE) {
+            if (item != ITEM_NONE && (item != ITEM_LETTER_RUTO || (item == ITEM_LETTER_RUTO && DeliverLetter))) {
                 count++;
             }
         }
@@ -492,7 +495,7 @@ namespace Rando {
         KokiriSword     = CanUse(RG_KOKIRI_SWORD);
         MasterSword     = CanUse(RG_MASTER_SWORD);
         BiggoronSword   = CanUse(RG_BIGGORON_SWORD);
-        NumBottles      = ((NoBottles) ? 0 : BottleCount());
+        NumBottles      = BottleCount();
         HasBottle       = NumBottles >= 1;
         Slingshot       = CanUse(RG_FAIRY_SLINGSHOT) && (BuySeed || AmmoCanDrop);
         Ocarina         = HasItem(RG_FAIRY_OCARINA);
@@ -921,7 +924,7 @@ namespace Rando {
         //Bottle Count
         Bottles    = 0;
         NumBottles = 0;
-        NoBottles  = false;
+        CanEmptyBigPoes = true;
 
         //Triforce Pieces
         TriforcePieces = 0;
diff --git a/soh/soh/Enhancements/randomizer/logic.h b/soh/soh/Enhancements/randomizer/logic.h
index 6a669d7eb..d5de5f899 100644
--- a/soh/soh/Enhancements/randomizer/logic.h
+++ b/soh/soh/Enhancements/randomizer/logic.h
@@ -165,7 +165,7 @@ class Logic {
     // Bottle Count
     uint8_t Bottles = 0;
     uint8_t NumBottles = 0;
-    bool NoBottles = false;
+    bool CanEmptyBigPoes = true;
 
     // Drops and Bottle Contents Access
     bool NutPot = false;

From 9c11718341982b19691d3deb57a154fdabe13574 Mon Sep 17 00:00:00 2001
From: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>
Date: Tue, 17 Sep 2024 19:43:06 +0200
Subject: [PATCH 194/230] Add 146 ice trap messages (#4281)

* Add ice trap message suggestions

* Split messages by language

* Re-run build

* Apply Pepper0ni's patch with fixes
---
 .../Enhancements/randomizer/randomizer.cpp    | 320 +++++++++++++-----
 soh/soh/Enhancements/randomizer/randomizer.h  |   2 +-
 soh/soh/OTRGlobals.cpp                        |   6 +-
 3 files changed, 244 insertions(+), 84 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index cc572629f..4983647e9 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -2826,86 +2826,251 @@ void CreateNaviRandoMessages() {
     }
 }
 
-void CreateIceTrapRandoMessages() {
-    CustomMessage IceTrapMessages[NUM_ICE_TRAP_MESSAGES] = {
-        { "You are a %bFOOL%w!", "Du bist ein %bDUMMKOPF%w!", "%bPauvre fou%w..." },
-
-        { "You are a %bFOWL%w!", "Du bist eine %bFrostbeule%w!", "Tu es un %bglaçon%w, Harry!" },
-
-        { "%bFOOL%w!", "%bDUMMKOPF%w!", "%bSot%w que tu es." },
-
-        { "You just got %bPUNKED%w!", "Du wurdest %beiskalt%w erwischt!", "Ça me %bglace%w le sang!" },
-
-        { "Stay %bfrosty%w, @.", "Es läuft Dir %beiskalt%w den Rücken&hinunter, @.", "%bReste au frais%w, @." },
-
-        { "Take a %bchill pill%w, @.", "Bleib %bcool%w, @.", "Et c'est la douche %bfroide%w!" },
-
-        { "%bWinter%w is coming.", "Der %bWinter%w naht.", "L'%bhiver%w vient." },
-
-        { "%bICE%w to see you, @.", "Alles %bcool%w im Pool?", "%bGlacier%w!" },
-
-        { "Feeling a little %rhot%w under the collar?&%bLet's fix that%w.", "%bAbkühlung gefällig%w?",
-          "%Ça en jette un %bfroid%w." },
-
-        { "It's a %bcold day%w in the Evil Realm.", "Es ist ein %kalter%w Tag im Herzen&von Hyrule.",
-          "Est-ce que tu as déjà eu des sueurs&%bfroides%w?" },
-
-        { "Getting %bcold feet%w?", "Bekommst Du etwa %bkalte%w Füße?",
-          "La vengeance est un plat qui se mange&%bfroid%w!" },
-
-        { "Say hello to the %bZoras%w for me!", "Sag den %bZoras%w viele Grüße von mir!",
-          "Dit bonjour aux %bZoras%w pour moi!" },
-
-        { "Can you keep a %bcool head%w?", "Bewahre einen %bkühlen%w! Kopf.",
-          "Il faut parfois savoir garder la tête&%bfroide%w!" },
-
-        { "Ganondorf used %bIce Trap%w!&It's super effective!",
-          "Ganondorf setzt %bEisstrahl%w ein.&Das ist sehr effektiv!",
-          "Ganondorf utilise %bPiège de Glace%w!&C'est super efficace!" },
-
-        { "Allow me to break the %bice%w!", "Ein Lächeln ist der beste Weg,&um das %bEis%w zu brechen!",
-          "Laisse moi briser la %bglace%w!" },
-
-        { "%bCold pun%w.", "%bEiskalt%w lässt du meine Seele&erfrier'n.",
-          "Balance man...,&Cadence man...,&Trace la %bglace%w...,&c'est le Cooooolllll Rasta!" },
-
-        { "The %bTitanic%w would be scared of you,&@.", "Die %bTitanic%w hätte Angst vor Dir,&@.",
-          "Le %bTitanic%w aurait peur de toi,&@." },
-
-        { "Oh no!", "Oh nein!", "Oh non!" },
-
-        { "What killed the dinosaurs?&The %bICE%w age!", "Was die Dinosaurier getötet hat?&Die %bEiszeit%w!",
-          "Qu'est-ce qui a tué les dinosaures?&L'ère %bglacière%w!" },
-
-        { "Knock knock. Who's there? Ice. Ice&who? Ice see that you're a %bFOOL%w.",
-          "Nachts ist es %bkälter%w als draußen.",
-          "L'imbécile réfléchit uniquement quand il&s'observe dans la %bglace%w." },
-
-        { "Never gonna %bgive you up%w. Never&gonna %blet you down%w. Never gonna&run around and %bdesert you%w.",
-          "Never gonna %bgive you up%w. Never&gonna %blet you down%w. Never gonna&run around and %bdesert you%w.",
-          "Never gonna %bgive you up%w. Never&gonna %blet you down%w. Never gonna&run around and %bdesert you%w." },
-
-        { "Thank you %b@%w!&But your item is in another castle!",
-          "Danke %b@%w!&Aber der Gegenstand ist in&einem anderem Schloß!",
-          "Merci %b@%w!&Mais ton objet est dans un autre&château!" },
-
-        { "%bFREEZE%w! Don't move!", "	Kalt. Kalt. Kälter. %bEISKALT%w!",
-          "J'espère que ça ne te fait ni chaud, ni&%bfroid%w." },
-
+CustomMessage Randomizer::GetIceTrapMessage() {
+    static const char* const englishIceTrapMessages[169] = {
+        "You are a #FOOL#!",
+        "You are a #FOWL#!",
+        "#FOOL#!",
+        "You just got #PUNKED#!",
+        "Stay #frosty#, @.",
+        "Take a #chill pill#, @.",
+        "#Winter# is coming.",
+        "#ICE# to see you, @.",
+        "Feeling a little %rhot%w under the collar? #Let's fix that#.",
+        "It's a #cold day# in the Evil Realm.",
+        "Getting #cold feet#?",
+        "Say hello to the #Zoras# for me!",
+        "Can you keep a #cool head#?",
+        "Ganondorf used #Ice Trap#!&It's super effective!",
+        "Allow me to break the #ice#!",
+        "#Cold pun#.",
+        "The #Titanic# would be scared of you, @.",
+        "Oh no!",
+        "Uh oh!",
+        "What killed the dinosaurs?&The #ICE# age!",
+        "Knock knock. Who's there? Ice. Ice who? Ice see that you're a #FOOL#.",
+        "Never gonna #give you up#. Never gonna #let you down#. Never gonna run around and #desert you#.",
+        "Thank you #@#! But your item is in another castle!",
+        "#FREEZE#! Don't move!",
+        "Wouldn't it be #ice# if we were colder?",
+        "Greetings from #Snowhead#! Wish you were here",
+        "Too #cool# for you?",
+        "#Ice#, #ice#, baby...",
+        "Time to break the #ice#.",
+        "We wish that you would read this... We wish that you would read this... But we set our bar low.",
+        "#Freeze# and put your hands in the air!",
+        "#Ice# to meet you!",
+        "Do you want to #freeze# a snowman?",
+        "Isn't there a #mansion# around here?",
+        "Now you know how #King Zora# feels",
+        "May the #Frost# be with you.",
+        "Carpe diem. #Freeze# the day.",
+        "There #snow# place like home.",
+        "That'll do, #ice#. That'll do.",
+        "All that is #cold# does not glitter, Not all those who wander are #frost#.",
+        "I Used To Be An Adventurer Like You. Then I Took An #Icetrap# To The Knee.",
+        "Would you like #ice# with that?",
+        "You have obtained the #Ice# Medallion!",
+        "Quick, do a #Zora# impression!",
+        "One item #on the rocks#!",//would be better if it could display the name of the item
+        "How much does a polar bear weigh?&Enough to break the #ice#.",
+        "You got Din's #Ice#!",
+        "You got Nayru's #Cold#!",
+        "You got Farore's #Freeze#!",
+        "KEKW",
+        "You just got #ICE TRAPPED#! Tag your friends to totally #ICE TRAP# them!",
+        "Are you okay, @? You're being #cold# today.",
+        "In a moment, your game might experience some #freezing#.",
+        "Breeze? Trees? Squeeze? No, it's a #freeze#!",
+        "After collecting this item, @ was assaulted in #cold# blood.",
+        "Only #chill# vibes around here!",
+        "Here's a #cool# gift for you!",
+        "Aha! You THOUGHT.",
+        "Stay hydrated and brush your teeth!",
+        "Isn't it too hot here? Let's turn the #AC# on.",
+        "One serving of #cold# @, coming right up!",
+        "Is it #cold# in here is that just me?",
+        "Yahaha! You found me!",
+        "You'd made a great #ice#-tronaut!",
+        "That's just the tip of the #iceberg#!",
+        "It's the triforce!&No, just kidding, it's an #ice trap#.",
+        "WINNER!",
+        "LOSER!",
+        "Greetings from #Cold Miser#!",
+        "Pardon me while I turn up the #AC#.",
+        "If you can't stand the #cold#, get out of the #freezer#.",
+        "Oh, goodie! #Frozen @# for the main course!",
+        "You have #freeze# power!",
+        "You obtained the #Ice Beam#! No wait, wrong game.",
+        "Here's to another lousy millenium!",
+        "You've activated my #trap card#!",
+        "I love #refrigerators#!",
+        "You expected an item,&BUT IT WAS I, AN #ICE TRAP#!",
+        "It's dangerous to go alone! Take #this#!",
+        "soh.exe has #stopped responding#.",
+        "Enough! My #Ice Trap# thaws in the morning!",
+        "Nobody expects the span-#ice# inquisition!",
+        "This is one #cool# item!",
+        "Say hello to my #little friend#!",
+        "We made you an offer you #can't refuse#.",
+        "Hyrule? More like #Hycool#!",
+        "Ice puns are #snow# problem!",
+        "This #ice# is #snow# joke!",
+        "There's no business like #snow# business!",
+        "no, dude",
+        "N#ice# trap ya got here!",
+        "Quick do your best impression of #Zoras Domain#!",
+        "Ganon used #ice beam#, it's super effective!",
+        "I was #frozen# today.",
+        "You're not in a #hurry#, right?",
+        "It's a #trap#!",
+        "At least it's not a VC crash and only Link is #frozen#!",
+        "Oh no! #BRAIN FREEZE#!",
+        "Looks like your game #froze#! Nope just you!",
+        "PK #FREEZE#!",
+        "May I interest you in some #iced# Tea?",
+        "Time for some Netflix and #chill#.",
+        "I know, I know... #FREEZE#!",
+        "#Ice# of you to drop by!",
+        "STOP!&You violated the #Thaw#!",
+        "I wanted to give you a treasure, but it looks like you got #cold feet#",
+        "You told me you wanted to deliver #just ice# to Ganondorf!",
+        "You got the triforce!&This ancient artifact of divine power can grant any- wait, no, sorry, it's just an ice trap. My bad",
+        "Time to #cool off#!",
+        "The #Ice Cavern# sends its regards.",
+        "Loading item, please #wait#...",
+        "Mash A+B to not #die#.",
+        "Sorry, your item is in another location.", //would be better if it could have the name of the item
+        "You only wish this was %gGreg%w.",
+        "Do you want to drink a hot chocolate?",
+        "The #cold# never bothered me anyway",
+        "Hope you're too school for #cool#!",
+        "Be thankful this isn't #absolute zero#.",
+        "Did you know the F in ZFG stands for #Freeze#?",
+        "You got #Ice Age (2002)#!",
+        "Now you can cast a #spell# you don't know",
+        "How's about a hero #on the rocks#?",
+        "Ain't no tunic for #this#!",
+        "I knew you were #part metroid#!",
+        "That's just the #icing on the cake#!",
+        "You're so #cool#, @!",
+        "You found #disappointment#!",
+        "You got #FOOLED#!",
+        "Start Mashing.",
+        "This item will #self-destruct# in 5 seconds...",
+        "Remember, there may be some momentary #discomfort#.",
+        "In a perfect world #ice traps# like me would not exist, but this is not a perfect world.",
+        "Gee, it sure is #cold# around here.",
+        "You tested the item with your #ice detector#, it beeped.", //would be better if it could have the name of the item
+        "You have found the way of the zero. The #sub-zero#.",
+        "Mweep... mweep... mweep...",
+        "Scum, #freezebag#! I mean #freeze#, scumbag!",
+        "Is it #chilly# in here or is it just #you#?",
+        "#Proceed#",
+        "WHAT'S SHE GONNA DO, MAKE ME AN #[Ice Cream]#!?",
+        "You've met with a #terrible fate#, haven't you?",
+        "So I heard you like the Shining, here's how it #ends#.",
+        "Minor routing mistake. #I win#.",
+        "Hold this #L#, @.",
+        "#SKILL ISSUE#",
+        "All you heat are belong to us",
+        "Wait a second, don't you already have #this item#?",
+        "#Freeze#! We have you surrounded!",
+        "Error 404 - Item not #found#.",
+        "Hydration break! Hey, who #froze# my water?",
+        "Oops, wrong #item model#.",
+        "Whoops! You have to put the item #in your inventory#.",
+        "You dropped the item, shattering it into #shards of ice#!", //would be better if it could have the name of the item
+        "Is this... golden age Simpsons?&BECAUSE I'M ABOUT TO #CHOKE A CHILD#.",
+        "You are the weakest @, #goodbye#!",
+        "Ugh... Why did we even randomize #this item#?",
+        "The #Frost Moon# is rising...",
+        "According to all known laws of physics and biology, there is no way that @ should be able to survive #getting fully encased in ice#. The cells in @'s body would all die by the time they #unthaw#. Of course, this is a video game, so @ survives anyway... #Probably#.",
+        "Okay, so stop me if you've heard this one - a gamer and a bottle of #liquid nitrogen# walk into a milk bar...",
+        "Lástima, es una #trampa de hielo#...&&Nobody expects the Spanish #ice trap#!",
+        "Gee, it sure is #BURR#ing around here.",
+        "Navi? Oh! I thought she was called #Névé#!",
+        "It's fine, @ knew this was a #trap#, they're just using it to take damage intentionally to manipulate RNG.",
+        "Unfortunately, the item has #stopped#.", //would be better if it could have the name of the item
+        "This item is #not available# in your country.", //would be better if it could have the name of the item
+        "#Ice# try. #;)#",
+        "D'oh, I #missed#!",
+        "Where is my #super suit#?",
+        "#Titanic's revenge#.",
     };
-    CustomMessageManager* customMessageManager = CustomMessageManager::Instance;
-    customMessageManager->AddCustomMessageTable(Randomizer::IceTrapRandoMessageTableID);
-    for (u8 i = 0; i <= (NUM_ICE_TRAP_MESSAGES - 1); i++) {
-        customMessageManager->CreateMessage(Randomizer::IceTrapRandoMessageTableID, i,
-                                            IceTrapMessages[i]);
+
+    static const char* const germanIceTrapMessages[23] = {
+        "Du bist ein #DUMMKOPF#!",
+        "Du bist eine #Frostbeule#!",
+        "#DUMMKOPF#!",
+        "Du wurdest #eiskalt# erwischt!",
+        "Es läuft Dir #eiskalt# den Rücken hinunter, @.",
+        "Bleib #cool#, @.",
+        "Der #Winter# naht.",
+        "Alles #cool# im Pool?",
+        "#Abkühlung gefällig#?",
+        "Es ist ein %kalter%w Tag im Herzen von Hyrule.",
+        "Bekommst Du etwa #kalte# Füße?",
+        "Sag den #Zoras# viele Grüße von mir!",
+        "Bewahre einen #kühlen#! Kopf.",
+        "Ganondorf setzt #Eisstrahl# ein. Das ist sehr effektiv!",
+        "Ein Lächeln ist der beste Weg, um das #Eis# zu brechen!",
+        "#Eiskalt# lässt du meine Seele erfrier'n.",
+        "Die #Titanic# hätte Angst vor Dir, @.",
+        "Oh nein!",
+        "Was die Dinosaurier getötet hat?&Die #Eiszeit#!",
+        "Nachts ist es #kälter# als draußen.",
+        "Never gonna #give you up#. Never gonna #let you down#. Never gonna run around and #desert you#.",
+        "Danke #@#! Aber der Gegenstand ist in einem anderem Schloß!",
+        "Kalt. Kalt. Kälter. #EISKALT#!",
+    };
+
+    static const char* const frenchIceTrapMessages[23] = {
+        "#Pauvre fou#...",
+        "Tu es un #glaçon#, Harry!",
+        "#Sot# que tu es.",
+        "Ça me #glace# le sang!",
+        "#Reste au frais#, @.",
+        "Et c'est la douche #froide#!",
+        "L'#hiver# vient.",
+        "#Glacier#!",
+        "Ça en jette un #froid#.",
+        "Est-ce que tu as déjà eu des sueurs #froides#?",
+        "La vengeance est un plat qui se mange #froid#!",
+        "Dit bonjour aux #Zoras# pour moi!",
+        "Il faut parfois savoir garder la tête #froide#!",
+        "Ganondorf utilise #Piège de Glace#! C'est super efficace!",
+        "Laisse moi briser la #glace#!",
+        "Balance man..., Cadence man..., Trace la #glace#..., c'est le Cooooolllll Rasta!",
+        "Le #Titanic# aurait peur de toi, @.",
+        "Oh non!",
+        "Qu'est-ce qui a tué les dinosaures?&L'ère #glacière#!",
+        "L'imbécile réfléchit uniquement quand il s'observe dans la #glace#.",
+        "Never gonna #give you up#. Never gonna #let you down#. Never gonna run around and #desert you#.",
+        "Merci #@#! Mais ton objet est dans un autre château!",
+        "J'espère que ça ne te fait ni chaud, ni #froid#.",
+    };
+
+    CustomMessage msg;
+
+    if (CVarGetInteger(CVAR_GENERAL("LetItSnow"), 0)) {
+        msg = CustomMessage(
+            /*english*/ "This year for Christmas, all you get is #COAL#!",
+            /*german*/  "This year for Christmas, all you get is #COAL#!",
+            /*french*/  "Pour Noël, cette année, tu n'auras que du #CHARBON#! %rJoyeux Noël%w!",
+                        { QM_BLUE }
+        );
+    } else {
+        msg = CustomMessage(
+            RandomElement(englishIceTrapMessages),
+            RandomElement(germanIceTrapMessages),
+            RandomElement(frenchIceTrapMessages),
+            { QM_BLUE, QM_BLUE, QM_BLUE }
+        );
     }
 
-    // We only use this ice trap message for christmas, so we don't want it in the normal ice trap messages rotation
-    customMessageManager->CreateMessage(
-        Randomizer::IceTrapRandoMessageTableID, NUM_ICE_TRAP_MESSAGES + 1,
-        CustomMessage("This year for Christmas, all&you get is %BCOAL%w!",
-                      "This year for Christmas, all&you get is %BCOAL%w!",
-                      "Pour Noël, cette année, tu&n'auras que du %BCHARBON!&%rJoyeux Noël%w!"));
+    msg.AutoFormat();
+    return msg;
 }
 
 static int goronIDs[9] = { 0x3052, 0x3069, 0x306A, 0x306B, 0x306C, 0x306D, 0x306E, 0x306F, 0x3070 };
@@ -3290,7 +3455,6 @@ void Randomizer::CreateCustomMessages() {
     CreateRupeeMessages();
     CreateTriforcePieceMessages();
     CreateNaviRandoMessages();
-    CreateIceTrapRandoMessages();
     CreateFireTempleGoronMessages();
 }
 
diff --git a/soh/soh/Enhancements/randomizer/randomizer.h b/soh/soh/Enhancements/randomizer/randomizer.h
index 3e6df6213..9942fa564 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.h
+++ b/soh/soh/Enhancements/randomizer/randomizer.h
@@ -20,7 +20,6 @@
 #define MAX_SEED_STRING_SIZE 1024
 #define NUM_TRIFORCE_PIECE_MESSAGES 6
 #define NUM_NAVI_MESSAGES 19
-#define NUM_ICE_TRAP_MESSAGES 23
 #define NUM_GORON_MESSAGES 9
 
 class Randomizer {
@@ -68,6 +67,7 @@ class Randomizer {
     CustomMessage GetMapGetItemMessageWithHint(GetItemEntry itemEntry);
     static void CreateCustomMessages();
     static CustomMessage GetRupeeMessage(u16 rupeeTextId);
+    static CustomMessage GetIceTrapMessage();
     static CustomMessage GetTriforcePieceMessage();
     bool CheckContainsVanillaItem(RandomizerCheck randoCheck);
 };
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
index 7f15210b8..fee872f93 100644
--- a/soh/soh/OTRGlobals.cpp
+++ b/soh/soh/OTRGlobals.cpp
@@ -2519,11 +2519,7 @@ extern "C" int CustomMessage_RetrieveIfExists(PlayState* play) {
         Player* player = GET_PLAYER(play);
         if (textId == TEXT_RANDOMIZER_CUSTOM_ITEM) {
             if (player->getItemEntry.getItemId == RG_ICE_TRAP) {
-                u16 iceTrapTextId = Random(0, NUM_ICE_TRAP_MESSAGES);
-                messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::IceTrapRandoMessageTableID, iceTrapTextId);
-                if (CVarGetInteger(CVAR_GENERAL("LetItSnow"), 0)) {
-                    messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::IceTrapRandoMessageTableID, NUM_ICE_TRAP_MESSAGES + 1);
-                }
+                messageEntry = Randomizer::GetIceTrapMessage();
             } else if (player->getItemEntry.getItemId == RG_TRIFORCE_PIECE) {
                 messageEntry = Randomizer::GetTriforcePieceMessage();
             } else {

From 4148d59c48a694d04a987719281f002f19a92526 Mon Sep 17 00:00:00 2001
From: Malkierian <malkierian@gmail.com>
Date: Tue, 17 Sep 2024 11:32:52 -0700
Subject: [PATCH 195/230] Check Tracker Re-update (#4322)

* Update check status in the check tracker to the new system. Status and Skipped are now stored in ItemLocation, though still saved separately in the trackerData section.

* Fix shop checks not showing prices when identified.

* Patch fix for check status bleed.
Some cleanup of unused code.

* Small tracker optimizations.

* Fix check hiding.

* Bit more cleanup.

* Unhide the filter and make it work again...

* Fix area totals tracking.
Fix skipped status saving.

* Merge conflict cleanup.
---
 soh/include/z64save.h                         |   2 +-
 .../Enhancements/randomizer/hook_handlers.cpp |  28 +-
 .../Enhancements/randomizer/item_location.cpp |  21 +-
 .../Enhancements/randomizer/item_location.h   |   9 +-
 .../Enhancements/randomizer/randomizer.cpp    |   2 -
 .../Enhancements/randomizer/randomizerTypes.h |  27 +-
 .../randomizer/randomizer_check_tracker.cpp   | 338 +++++++-----------
 .../randomizer/randomizer_check_tracker.h     |  12 +-
 soh/soh/Enhancements/randomizer/savefile.cpp  |   2 +-
 soh/soh/SaveManager.cpp                       |  11 +-
 soh/soh/SaveManager.h                         |   2 +
 11 files changed, 192 insertions(+), 262 deletions(-)

diff --git a/soh/include/z64save.h b/soh/include/z64save.h
index 617c2acf5..c6db012e1 100644
--- a/soh/include/z64save.h
+++ b/soh/include/z64save.h
@@ -68,6 +68,7 @@ typedef enum { // Pre-existing IDs for save sections in base code
     SECTION_ID_STATS,
     SECTION_ID_ENTRANCES,
     SECTION_ID_SCENES,
+    SECTION_ID_TRACKER_DATA,
     SECTION_ID_MAX
 } SaveFuncIDs;
 
@@ -279,7 +280,6 @@ typedef struct {
     /*        */ u8 pendingIceTrapCount;
     /*        */ SohStats sohStats;
     /*        */ FaroresWindData backupFW;
-    /*        */ RandomizerCheckTrackerData checkTrackerData[RC_MAX];
     // #endregion
     // #region SOH [Randomizer]
     // Upstream TODO: Move these to their own struct or name to more obviously specific to Randomizer
diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index 92a1b278c..518daf6d0 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -306,7 +306,9 @@ void RandomizerOnItemReceiveHandler(GetItemEntry receivedItemEntry) {
     auto loc = Rando::Context::GetInstance()->GetItemLocation(randomizerQueuedCheck);
     if (randomizerQueuedItemEntry.modIndex == receivedItemEntry.modIndex && randomizerQueuedItemEntry.itemId == receivedItemEntry.itemId) {
         SPDLOG_INFO("Item received mod {} item {} from RC {}", receivedItemEntry.modIndex, receivedItemEntry.itemId, static_cast<uint32_t>(randomizerQueuedCheck));
-        loc->MarkAsObtained();
+        loc->SetCheckStatus(RCSHOW_COLLECTED);
+        CheckTracker::RecalculateAllAreaTotals();
+        SaveManager::Instance->SaveSection(gSaveContext.fileNum, SECTION_ID_TRACKER_DATA, true);
         randomizerQueuedCheck = RC_UNKNOWN_CHECK;
         randomizerQueuedItemEntry = GET_ITEM_NONE;
     }
@@ -662,7 +664,8 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
                 *should = false;
             } else {
                 *should = true;
-                Rando::Context::GetInstance()->GetItemLocation(RC_TOT_MASTER_SWORD)->MarkAsObtained();
+                Rando::Context::GetInstance()->GetItemLocation(RC_TOT_MASTER_SWORD)->SetCheckStatus(RCSHOW_COLLECTED);
+                CheckTracker::RecalculateAllAreaTotals();
             }
             break;
         case VB_ITEM00_DESPAWN: {
@@ -1179,25 +1182,26 @@ void RandomizerOnSceneInitHandler(int16_t sceneNum) {
     //       probably need to do something different when we implement shuffle
     if (sceneNum == SCENE_TREASURE_BOX_SHOP) {
         Flags_UnsetRandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_1);
-        Rando::Context::GetInstance()->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_1)->MarkAsNotObtained();
+        Rando::Context::GetInstance()->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_1)->SetCheckStatus(RCSHOW_UNCHECKED);
         Flags_UnsetRandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_2);
-        Rando::Context::GetInstance()->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_2)->MarkAsNotObtained();
+        Rando::Context::GetInstance()->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_2)->SetCheckStatus(RCSHOW_UNCHECKED);
         Flags_UnsetRandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_3);
-        Rando::Context::GetInstance()->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_3)->MarkAsNotObtained();
+        Rando::Context::GetInstance()->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_3)->SetCheckStatus(RCSHOW_UNCHECKED);
         Flags_UnsetRandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_4);
-        Rando::Context::GetInstance()->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_4)->MarkAsNotObtained();
+        Rando::Context::GetInstance()->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_4)->SetCheckStatus(RCSHOW_UNCHECKED);
         Flags_UnsetRandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_5);
-        Rando::Context::GetInstance()->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_5)->MarkAsNotObtained();
+        Rando::Context::GetInstance()->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_5)->SetCheckStatus(RCSHOW_UNCHECKED);
         Flags_UnsetRandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_1);
-        Rando::Context::GetInstance()->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_KEY_1)->MarkAsNotObtained();
+        Rando::Context::GetInstance()->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_KEY_1)->SetCheckStatus(RCSHOW_UNCHECKED);
         Flags_UnsetRandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_2);
-        Rando::Context::GetInstance()->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_KEY_2)->MarkAsNotObtained();
+        Rando::Context::GetInstance()->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_KEY_2)->SetCheckStatus(RCSHOW_UNCHECKED);
         Flags_UnsetRandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_3);
-        Rando::Context::GetInstance()->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_KEY_3)->MarkAsNotObtained();
+        Rando::Context::GetInstance()->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_KEY_3)->SetCheckStatus(RCSHOW_UNCHECKED);
         Flags_UnsetRandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_4);
-        Rando::Context::GetInstance()->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_KEY_4)->MarkAsNotObtained();
+        Rando::Context::GetInstance()->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_KEY_4)->SetCheckStatus(RCSHOW_UNCHECKED);
         Flags_UnsetRandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_5);
-        Rando::Context::GetInstance()->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_KEY_5)->MarkAsNotObtained();
+        Rando::Context::GetInstance()->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_KEY_5)->SetCheckStatus(RCSHOW_UNCHECKED);
+        CheckTracker::RecalculateAllAreaTotals();
     }
 
     // LACs & Prelude checks
diff --git a/soh/soh/Enhancements/randomizer/item_location.cpp b/soh/soh/Enhancements/randomizer/item_location.cpp
index 3185fce8a..d303b3c3b 100644
--- a/soh/soh/Enhancements/randomizer/item_location.cpp
+++ b/soh/soh/Enhancements/randomizer/item_location.cpp
@@ -102,15 +102,23 @@ void ItemLocation::SetCustomPrice(const uint16_t price_) {
 }
 
 bool ItemLocation::HasObtained() const {
-    return obtained;
+    return status == RCSHOW_COLLECTED || status == RCSHOW_SAVED;
 }
 
-void ItemLocation::MarkAsObtained() {
-    obtained = true;
+void ItemLocation::SetCheckStatus(RandomizerCheckStatus status_) {
+    status = status_;
 }
 
-void ItemLocation::MarkAsNotObtained() {
-    obtained = false;
+RandomizerCheckStatus ItemLocation::GetCheckStatus() {
+    return status;
+}
+
+void ItemLocation::SetIsSkipped(bool isSkipped_) {
+    isSkipped = isSkipped_;
+}
+
+bool ItemLocation::GetIsSkipped() {
+    return isSkipped;
 }
 
 bool ItemLocation::IsHintable() const {
@@ -213,6 +221,7 @@ void ItemLocation::ResetVariables() {
     wothCandidate = false;
     barrenCandidate = false;
     area = RA_NONE;
-    obtained = false;
+    status = RCSHOW_UNCHECKED;
+    isSkipped = false;
 }
 }
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/item_location.h b/soh/soh/Enhancements/randomizer/item_location.h
index b40cac537..868b384b5 100644
--- a/soh/soh/Enhancements/randomizer/item_location.h
+++ b/soh/soh/Enhancements/randomizer/item_location.h
@@ -32,8 +32,10 @@ class ItemLocation {
     bool HasCustomPrice() const;
     void SetCustomPrice(uint16_t price_);
     bool HasObtained() const;
-    void MarkAsObtained();
-    void MarkAsNotObtained();
+    void SetCheckStatus(RandomizerCheckStatus status_);
+    RandomizerCheckStatus GetCheckStatus();
+    void SetIsSkipped(bool isSkipped_);
+    bool GetIsSkipped();
     bool IsHintable() const;
     void SetAsHintable();
     bool IsAHintAccessible() const;
@@ -70,6 +72,7 @@ class ItemLocation {
     bool visibleInImGui = false;
     bool wothCandidate = false;
     bool barrenCandidate = false;
-    bool obtained = false;
+    RandomizerCheckStatus status = RCSHOW_UNCHECKED;
+    bool isSkipped = false;
 };
 } // namespace Rando
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index 4983647e9..651444840 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -56,8 +56,6 @@ std::set<RandomizerCheck> spoilerExcludedLocations;
 std::set<RandomizerTrick> enabledTricks;
 std::set<RandomizerTrick> enabledGlitches;
 
-std::set<std::map<RandomizerCheck, RandomizerCheckTrackerData>> checkTrackerStates;
-
 u8 generated;
 char* seedString;
 
diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h
index 507ae5fec..304fef213 100644
--- a/soh/soh/Enhancements/randomizer/randomizerTypes.h
+++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@@ -27,16 +27,6 @@ typedef struct {
     uint8_t id;
 } Sprite;
 
-// Check tracker check visibility categories
-typedef enum {
-    RCSHOW_UNCHECKED,
-    RCSHOW_SEEN,
-    RCSHOW_IDENTIFIED,
-    RCSHOW_SCUMMED,
-    RCSHOW_COLLECTED,
-    RCSHOW_SAVED,
-} RandomizerCheckStatus;
-
 typedef enum {
     HINT_TYPE_HINT_KEY,
     HINT_TYPE_AREA,
@@ -315,6 +305,16 @@ typedef enum {
     RCAREA_INVALID
 } RandomizerCheckArea;
 
+// Check tracker check visibility categories
+typedef enum {
+    RCSHOW_UNCHECKED,
+    RCSHOW_SEEN,
+    RCSHOW_IDENTIFIED,
+    RCSHOW_SCUMMED,
+    RCSHOW_COLLECTED,
+    RCSHOW_SAVED,
+} RandomizerCheckStatus;
+
 typedef enum {
     RR_NONE,
     RR_ROOT,
@@ -3886,13 +3886,6 @@ typedef enum {
     RSK_MAX
 } RandomizerSettingKey;
 
-typedef struct {
-    RandomizerCheckStatus status;
-    uint16_t skipped;
-    int16_t price;
-    uint16_t hintItem;
-} RandomizerCheckTrackerData;
-
 //Generic Settings (any binary option can use this)
 // off/on
 typedef enum {
diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
index d617f6fd0..fa67fd1eb 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
@@ -36,21 +36,6 @@ extern std::vector<ItemTrackerItem> equipmentItems;
 
 using json = nlohmann::json;
 
-void to_json(json& j, const RandomizerCheckTrackerData& rctd) {
-    j = json {
-        { "status", rctd.status == RCSHOW_COLLECTED ? RCSHOW_SAVED : rctd.status },
-        { "skipped", rctd.skipped },
-        { "price", rctd.price },
-        { "hintItem", rctd.hintItem }};
-    }
-
-void from_json(const json& j, RandomizerCheckTrackerData& rctd) {
-    j.at("status").get_to(rctd.status);
-    j.at("skipped").get_to(rctd.skipped);
-    j.at("hintItem").get_to(rctd.hintItem);
-    j.at("price").get_to(rctd.price);
-}
-
 namespace CheckTracker {
 
 // settings
@@ -149,13 +134,12 @@ OSContPad* trackerButtonsPressed;
 std::unordered_map<RandomizerCheck, std::string> checkNameOverrides;
 
 bool ShouldShowCheck(RandomizerCheck rc);
-bool ShouldHideArea(RandomizerCheckArea rcArea);
+bool UpdateFilters();
 void BeginFloatWindows(std::string UniqueName, bool& open, ImGuiWindowFlags flags = 0);
 bool CompareChecks(RandomizerCheck, RandomizerCheck);
 bool CheckByArea(RandomizerCheckArea);
 void DrawLocation(RandomizerCheck);
 void EndFloatWindows();
-bool HasItemBeenCollected(RandomizerCheck);
 void LoadSettings();
 void RainbowTick();
 void UpdateAreas(RandomizerCheckArea area);
@@ -219,39 +203,35 @@ Color_RGBA8 Color_Saved_Extra           = {   0, 185,   0, 255 }; // Green
 std::vector<uint32_t> buttons = { BTN_A, BTN_B, BTN_CUP,   BTN_CDOWN, BTN_CLEFT, BTN_CRIGHT, BTN_L,
                                   BTN_Z, BTN_R, BTN_START, BTN_DUP,   BTN_DDOWN, BTN_DLEFT,  BTN_DRIGHT };
 static ImGuiTextFilter checkSearch;
-
-void DefaultCheckData(RandomizerCheck rc) {
-    gSaveContext.checkTrackerData[rc].status = RCSHOW_UNCHECKED;
-    gSaveContext.checkTrackerData[rc].skipped = 0;
-    gSaveContext.checkTrackerData[rc].hintItem = RC_UNKNOWN_CHECK;
-}
+std::array<bool, RCAREA_INVALID> filterAreasHidden = { 0 };
+std::array<bool, RC_MAX> filterChecksHidden = { 0 };
 
 void SongFromImpa() {
     if (IS_RANDO) {
         if (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SKIP_CHILD_ZELDA) == RO_GENERIC_ON && IS_RANDO) {
-            if (gSaveContext.checkTrackerData[RC_SONG_FROM_IMPA].status != RCSHOW_SAVED) {
-                gSaveContext.checkTrackerData[RC_SONG_FROM_IMPA].status = RCSHOW_SAVED;
-            }
+            //if (gSaveContext.checkTrackerData[RC_SONG_FROM_IMPA].status != RCSHOW_SAVED) {
+            //    gSaveContext.checkTrackerData[RC_SONG_FROM_IMPA].status = RCSHOW_SAVED;
+            //}
         }
     }
 }
 
 void GiftFromSages() {
     if (!IS_RANDO) {
-        DefaultCheckData(RC_GIFT_FROM_SAGES);
+        //DefaultCheckData(RC_GIFT_FROM_SAGES);
     }
 }
 
 std::vector<RandomizerCheck> checks;
 // Function for adding Link's Pocket check
 void LinksPocket() {
-    if (IS_RANDO) {
+    /*if (IS_RANDO) {
         if (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_LINKS_POCKET) != RO_LINKS_POCKET_NOTHING ||
             OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_DUNGEON_REWARDS) == RO_DUNGEON_REWARDS_END_OF_DUNGEON) {
             DefaultCheckData(RC_LINKS_POCKET);
             gSaveContext.checkTrackerData[RC_LINKS_POCKET].status = RCSHOW_SAVED;
         }
-    }
+    }*/
 }
 
 void TrySetAreas() {
@@ -280,37 +260,38 @@ uint16_t GetTotalChecksGotten() {
     return totalChecksGotten;
 }
 
-void RecalculateAreaTotals() {
-    for (auto [rcArea, checks] : checksByArea) {
+void RecalculateAreaTotals(RandomizerCheckArea rcArea) {
+    areaChecksGotten[rcArea] = 0;
+    areaCheckTotals[rcArea] = 0;
+    for (auto rc : checksByArea.at(rcArea)) {
+        if (!IsVisibleInCheckTracker(rc)) {
+            continue;
+        }
+        areaCheckTotals[rcArea]++;
+        if (OTRGlobals::Instance->gRandoContext->GetItemLocation(rc)->GetIsSkipped() || OTRGlobals::Instance->gRandoContext->GetItemLocation(rc)->HasObtained()) {
+            areaChecksGotten[rcArea]++;
+        }
+    }
+    CalculateTotals();
+}
+
+void RecalculateAllAreaTotals() {
+    for (auto& [rcArea, checks] : checksByArea) {
         if (rcArea == RCAREA_INVALID) {
             return;
         }
-        areaChecksGotten[rcArea] = 0;
-        areaCheckTotals[rcArea] = 0;
-        for (auto rc : checks) {
-            if (!IsVisibleInCheckTracker(rc)) {
-                continue;
-            }
-            areaCheckTotals[rcArea]++;
-            if (gSaveContext.checkTrackerData[rc].skipped || gSaveContext.checkTrackerData[rc].status == RCSHOW_COLLECTED
-                || gSaveContext.checkTrackerData[rc].status == RCSHOW_SAVED) {
-                areaChecksGotten[rcArea]++;
-            }
-        }
+        RecalculateAreaTotals(rcArea);
     }
-
-    totalChecks = 0;
-    totalChecksGotten = 0;
 }
 
 void SetCheckCollected(RandomizerCheck rc) {
-    gSaveContext.checkTrackerData[rc].status = RCSHOW_COLLECTED;
+    OTRGlobals::Instance->gRandoContext->GetItemLocation(rc)->SetCheckStatus(RCSHOW_COLLECTED);
     Rando::Location* loc = Rando::StaticData::GetLocation(rc);
     if (IsVisibleInCheckTracker(rc)) {
-        if (!gSaveContext.checkTrackerData[rc].skipped) {
+        if (!OTRGlobals::Instance->gRandoContext->GetItemLocation(rc)->GetIsSkipped()) {
             areaChecksGotten[loc->GetArea()]++;
         } else {
-            gSaveContext.checkTrackerData[rc].skipped = false;
+            OTRGlobals::Instance->gRandoContext->GetItemLocation(rc)->SetIsSkipped(false);
         }
     }
     SaveManager::Instance->SaveSection(gSaveContext.fileNum, sectionId, true);
@@ -427,6 +408,8 @@ void ClearAreaChecksAndTotals() {
         areaChecksGotten[rcArea] = 0;
         areaCheckTotals[rcArea] = 0;
     }
+    totalChecks = 0;
+    totalChecksGotten = 0;
 }
 
 void SetShopSeen(uint32_t sceneNum, bool prices) {
@@ -439,8 +422,8 @@ void SetShopSeen(uint32_t sceneNum, bool prices) {
     }
     bool statusChanged = false;
     for (int i = start; i < start + 8; i++) {
-        if (gSaveContext.checkTrackerData[i].status == RCSHOW_UNCHECKED) {
-            gSaveContext.checkTrackerData[i].status = RCSHOW_SEEN;
+        if (OTRGlobals::Instance->gRandoContext->GetItemLocation(i)->GetCheckStatus() == RCSHOW_UNCHECKED) {
+            OTRGlobals::Instance->gRandoContext->GetItemLocation(i)->SetCheckStatus(RCSHOW_SEEN);
             statusChanged = true;
         }
     }
@@ -449,73 +432,23 @@ void SetShopSeen(uint32_t sceneNum, bool prices) {
     }
 }
 
-bool HasItemBeenCollected(RandomizerCheck rc) {
-    if (gPlayState == nullptr) {
-        return false;
-    }
-    Rando::Location* x = Rando::StaticData::GetLocation(rc);
-    Rando::SpoilerCollectionCheck check = x->GetCollectionCheck();
-    auto flag = check.flag;
-    auto scene = check.scene;
-    auto type = check.type;
-
-    switch (type) {
-    case SpoilerCollectionCheckType::SPOILER_CHK_ALWAYS_COLLECTED:
-        return true;
-    case SpoilerCollectionCheckType::SPOILER_CHK_CHEST:
-        return (gPlayState->sceneNum == scene && gPlayState->actorCtx.flags.chest & (1 << flag)) ||
-               gSaveContext.sceneFlags[scene].chest & (1 << flag);
-    case SpoilerCollectionCheckType::SPOILER_CHK_COLLECTABLE:
-        return (gPlayState->sceneNum == scene && gPlayState->actorCtx.flags.collect & (1 << flag)) ||
-               gSaveContext.sceneFlags[scene].collect & (1 << flag);
-    case SpoilerCollectionCheckType::SPOILER_CHK_SHOP_ITEM:
-    case SpoilerCollectionCheckType::SPOILER_CHK_FISH:
-    case SpoilerCollectionCheckType::SPOILER_CHK_RANDOMIZER_INF:
-    case SpoilerCollectionCheckType::SPOILER_CHK_MASTER_SWORD:
-        return Flags_GetRandomizerInf(OTRGlobals::Instance->gRandomizer->GetRandomizerInfFromCheck(rc));
-    case SpoilerCollectionCheckType::SPOILER_CHK_EVENT_CHK_INF:
-        return gSaveContext.eventChkInf[flag / 16] & (0x01 << flag % 16);
-    case SpoilerCollectionCheckType::SPOILER_CHK_GOLD_SKULLTULA:
-        return GET_GS_FLAGS(scene) & flag;
-    case SpoilerCollectionCheckType::SPOILER_CHK_INF_TABLE:
-        return gSaveContext.infTable[scene] & INDEX_TO_16BIT_LITTLE_ENDIAN_BITMASK(flag);
-    case SpoilerCollectionCheckType::SPOILER_CHK_ITEM_GET_INF:
-        return gSaveContext.itemGetInf[flag / 16] & INDEX_TO_16BIT_LITTLE_ENDIAN_BITMASK(flag);
-    case SpoilerCollectionCheckType::SPOILER_CHK_NONE:
-        return false;
-    case SpoilerCollectionCheckType::SPOILER_CHK_GRAVEDIGGER:
-        // Gravedigger has a fix in place that means one of two save locations. Check both.
-        return (gSaveContext.itemGetInf[1] & 0x1000) || // vanilla flag
-            ((IS_RANDO || CVarGetInteger(CVAR_ENHANCEMENT("GravediggingTourFix"), 0)) &&
-                gSaveContext.sceneFlags[scene].collect & (1 << flag) || (gPlayState->actorCtx.flags.collect & (1 << flag))); // rando/fix flag
-    default:
-        return false;
-    }
-    return false;
-}
-
 void CheckTrackerLoadGame(int32_t fileNum) {
     LoadSettings();
     TrySetAreas();
     for (auto& entry : Rando::StaticData::GetLocationTable()) {
         RandomizerCheck rc = entry.GetRandomizerCheck();
-        RandomizerCheckTrackerData rcTrackerData = gSaveContext.checkTrackerData[rc];
         if (rc == RC_UNKNOWN_CHECK || rc == RC_MAX || rc == RC_LINKS_POCKET ||
             !Rando::StaticData::GetLocation(rc) != RC_UNKNOWN_CHECK) {
             continue;
         }
 
-        Rando::Location* entry2;
-        if (rc == RC_GIFT_FROM_SAGES && !IS_RANDO) {
-            entry2 = Rando::StaticData::GetLocation(rc);
-        } else {
-            entry2 = Rando::StaticData::GetLocation(rc);
-        }
+        Rando::Location* entry2 = Rando::StaticData::GetLocation(rc);
+        Rando::ItemLocation* loc = OTRGlobals::Instance->gRandoContext->GetItemLocation(rc);
 
         checksByArea.find(entry2->GetArea())->second.push_back(entry2->GetRandomizerCheck());
         if (IsVisibleInCheckTracker(entry2->GetRandomizerCheck())) {
             areaCheckTotals[entry2->GetArea()]++;
-            if (rcTrackerData.status == RCSHOW_SAVED || rcTrackerData.skipped) {
+            if (loc->GetCheckStatus() == RCSHOW_SAVED || loc->GetIsSkipped()) {
                 areaChecksGotten[entry2->GetArea()]++;
             }
         }
@@ -570,6 +503,7 @@ void CheckTrackerLoadGame(int32_t fileNum) {
     initialized = true;
     UpdateAllOrdering();
     UpdateInventoryChecks();
+    UpdateFilters();
 }
 
 void CheckTrackerShopSlotChange(uint8_t cursorSlot, int16_t basePrice) {
@@ -581,10 +515,9 @@ void CheckTrackerShopSlotChange(uint8_t cursorSlot, int16_t basePrice) {
     if (GetCheckArea() == RCAREA_KAKARIKO_VILLAGE && gPlayState->sceneNum == SCENE_BAZAAR) {
         slot = RC_KAK_BAZAAR_ITEM_1 + cursorSlot;
     }
-    auto status = gSaveContext.checkTrackerData[slot].status;
+    auto status = OTRGlobals::Instance->gRandoContext->GetItemLocation(slot)->GetCheckStatus();
     if (status == RCSHOW_SEEN) {
-        gSaveContext.checkTrackerData[slot].status = RCSHOW_IDENTIFIED;
-        gSaveContext.checkTrackerData[slot].price = basePrice;
+        OTRGlobals::Instance->gRandoContext->GetItemLocation(slot)->SetCheckStatus(RCSHOW_IDENTIFIED);
         SaveManager::Instance->SaveSection(gSaveContext.fileNum, sectionId, true);
     }
 }
@@ -617,8 +550,7 @@ void CheckTrackerFrame() {
         return;
     }
     // TODO: Move to OnAmmoChange hook once it gets added.
-    if (gSaveContext.checkTrackerData[RC_ZR_MAGIC_BEAN_SALESMAN].status != RCSHOW_COLLECTED &&
-        gSaveContext.checkTrackerData[RC_ZR_MAGIC_BEAN_SALESMAN].status != RCSHOW_SAVED) {
+    if (!OTRGlobals::Instance->gRandoContext->GetItemLocation(RC_ZR_MAGIC_BEAN_SALESMAN)->HasObtained()) {
         if (BEANS_BOUGHT >= 10) {
             SetCheckCollected(RC_ZR_MAGIC_BEAN_SALESMAN);
         }
@@ -827,33 +759,43 @@ void CheckTrackerFlagSet(int16_t flagType, int32_t flag) {
 void InitTrackerData(bool isDebug) {
     TrySetAreas();
     areasSpoiled = 0;
-    for (auto& loc : Rando::StaticData::GetLocationTable()) {
-        if (loc.GetRandomizerCheck() != RC_UNKNOWN_CHECK && loc.GetRandomizerCheck() != RC_MAX) {
-            DefaultCheckData(loc.GetRandomizerCheck());
-        }
-    }
-    UpdateAllOrdering();
 }
 
-void SaveTrackerData(SaveContext* saveContext, int sectionID, bool gameSave) {
-    SaveManager::Instance->SaveArray("checks", ARRAY_COUNT(saveContext->checkTrackerData), [&](size_t i) {
-        if (saveContext->checkTrackerData[i].status == RCSHOW_COLLECTED) {
-            if (gameSave) {
-                gSaveContext.checkTrackerData[i].status = saveContext->checkTrackerData[i].status = RCSHOW_SAVED;
-                UpdateAllOrdering();
-                UpdateInventoryChecks();
-            } else {
-                saveContext->checkTrackerData[i].status = RCSHOW_SCUMMED;
+void SaveTrackerData(SaveContext* saveContext, int sectionID, bool fullSave) {
+    bool updateOrdering = false;
+    std::vector<RandomizerCheck> checkCount;
+    for (int i = RC_UNKNOWN_CHECK; i < RC_MAX; i++) {
+        if (OTRGlobals::Instance->gRandoContext->GetItemLocation(i)->GetCheckStatus() != RCSHOW_UNCHECKED ||
+            OTRGlobals::Instance->gRandoContext->GetItemLocation(i)->GetIsSkipped())
+            checkCount.push_back(static_cast<RandomizerCheck>(i));
+    }
+    SaveManager::Instance->SaveArray("checkStatus", checkCount.size(), [&](size_t i) {
+        RandomizerCheck check = checkCount.at(i);
+        RandomizerCheckStatus savedStatus = OTRGlobals::Instance->gRandoContext->GetItemLocation(check)->GetCheckStatus();
+        bool isSkipped = OTRGlobals::Instance->gRandoContext->GetItemLocation(check)->GetIsSkipped();
+        if (savedStatus == RCSHOW_COLLECTED) {
+            if (fullSave) {
+                OTRGlobals::Instance->gRandoContext->GetItemLocation(check)->SetCheckStatus(RCSHOW_SAVED);
+                savedStatus = RCSHOW_SAVED;
+                updateOrdering = true;
+            }
+            else {
+                savedStatus = RCSHOW_SCUMMED;
             }
         }
-        SaveManager::Instance->SaveStruct("", [&]() {
-            SaveManager::Instance->SaveData("status", saveContext->checkTrackerData[i].status);
-            SaveManager::Instance->SaveData("skipped", saveContext->checkTrackerData[i].skipped);
-            SaveManager::Instance->SaveData("price", saveContext->checkTrackerData[i].price);
-            SaveManager::Instance->SaveData("hintItem", saveContext->checkTrackerData[i].hintItem);
-        });
+        if (savedStatus != RCSHOW_UNCHECKED || isSkipped) {
+            SaveManager::Instance->SaveStruct("", [&]() {
+                SaveManager::Instance->SaveData("randomizerCheck", check);
+                SaveManager::Instance->SaveData("status", savedStatus);
+                SaveManager::Instance->SaveData("skipped", isSkipped);
+                });
+        }
     });
     SaveManager::Instance->SaveData("areasSpoiled", areasSpoiled);
+    if (updateOrdering) {
+        UpdateAllOrdering();
+        UpdateAllAreas();
+    }
 }
 
 void SaveFile(SaveContext* saveContext, int sectionID, bool fullSave) {
@@ -861,15 +803,21 @@ void SaveFile(SaveContext* saveContext, int sectionID, bool fullSave) {
 }
 
 void LoadFile() {
-    SaveManager::Instance->LoadArray("checks", RC_MAX, [](size_t i) {
+    SaveManager::Instance->LoadArray("checkStatus", RC_MAX, [](size_t i) {
         SaveManager::Instance->LoadStruct("", [&]() {
-            SaveManager::Instance->LoadData("status", gSaveContext.checkTrackerData[i].status);
-            SaveManager::Instance->LoadData("skipped", gSaveContext.checkTrackerData[i].skipped);
-            SaveManager::Instance->LoadData("price", gSaveContext.checkTrackerData[i].price);
-            SaveManager::Instance->LoadData("hintItem", gSaveContext.checkTrackerData[i].hintItem);
+            RandomizerCheckStatus status;
+            bool skipped;
+            RandomizerCheck rc;
+            SaveManager::Instance->LoadData("randomizerCheck", rc, RC_UNKNOWN_CHECK);
+            SaveManager::Instance->LoadData("status", status, RCSHOW_UNCHECKED);
+            SaveManager::Instance->LoadData("skipped", skipped, false);
+            OTRGlobals::Instance->gRandoContext->GetItemLocation(rc)->SetCheckStatus(status);
+            OTRGlobals::Instance->gRandoContext->GetItemLocation(rc)->SetIsSkipped(skipped);
+            });
         });
-    });
-    SaveManager::Instance->LoadData("areasSpoiled", areasSpoiled);
+    SaveManager::Instance->LoadData("areasSpoiled", areasSpoiled, (uint32_t)0);
+    UpdateAllOrdering();
+    UpdateAllAreas();
 }
 
 void Teardown() {
@@ -877,6 +825,8 @@ void Teardown() {
     ClearAreaChecksAndTotals();
     checksByArea.clear();
     areasSpoiled = 0;
+    filterAreasHidden = { 0 };
+    filterChecksHidden = { 0 };
 
     lastLocationChecked = RC_UNKNOWN_CHECK;
 }
@@ -890,30 +840,6 @@ void SetAreaSpoiled(RandomizerCheckArea rcArea) {
     SaveManager::Instance->SaveSection(gSaveContext.fileNum, sectionId, true);
 }
 
-void UpdateCheck(uint32_t check, RandomizerCheckTrackerData data) {
-    auto area = Rando::StaticData::GetLocation(static_cast<RandomizerCheck>(check))->GetArea();
-    if ((!gSaveContext.checkTrackerData[check].skipped && data.skipped) ||
-        ((gSaveContext.checkTrackerData[check].status != RCSHOW_COLLECTED && gSaveContext.checkTrackerData[check].status != RCSHOW_SAVED) &&
-            (data.status == RCSHOW_COLLECTED || data.status == RCSHOW_SAVED))) {
-        areaChecksGotten[area]++;
-    } else if ((gSaveContext.checkTrackerData[check].skipped && !data.skipped) ||
-        ((gSaveContext.checkTrackerData[check].status == RCSHOW_COLLECTED || gSaveContext.checkTrackerData[check].status == RCSHOW_SAVED) &&
-            (data.status != RCSHOW_COLLECTED && data.status != RCSHOW_SAVED))) {
-        areaChecksGotten[area]--;
-    }
-    gSaveContext.checkTrackerData[check] = data;
-    UpdateOrdering(area);
-}
-
-void CheckTrackerWindow::Draw() {
-    if (!IsVisible()) {
-        return;
-    }
-    DrawElement();
-    // Sync up the IsVisible flag if it was changed by ImGui
-    SyncVisibilityConsoleVariable();
-}
-
 void CheckTrackerWindow::DrawElement() {
     if (CVarGetInteger(CVAR_TRACKER_CHECK("WindowType"), TRACKER_WINDOW_WINDOW) == TRACKER_WINDOW_FLOATING) {
         if (CVarGetInteger(CVAR_TRACKER_CHECK("ShowOnlyPaused"), 0) && (gPlayState == nullptr || gPlayState->pauseCtx.state == 0)) {
@@ -985,7 +911,9 @@ void CheckTrackerWindow::DrawElement() {
         doAreaScroll = true;
     }
     UIWidgets::Tooltip("Clear the search field");
-    checkSearch.Draw();
+    if (checkSearch.Draw()) {
+        UpdateFilters();
+    }
 
     UIWidgets::PaddedSeparator();
 
@@ -1039,7 +967,7 @@ void CheckTrackerWindow::DrawElement() {
             previousShowHidden = showHidden;
             doAreaScroll = true;
         }
-        if ((shouldHideFilteredAreas && ShouldHideArea(rcArea)) ||
+        if ((shouldHideFilteredAreas && filterAreasHidden[rcArea]) ||
             (!showHidden && ((hideComplete && thisAreaFullyChecked) || (hideIncomplete && !thisAreaFullyChecked)))
         ) {
             doDraw = false;
@@ -1099,7 +1027,7 @@ void CheckTrackerWindow::DrawElement() {
                 doAreaScroll = false;
             }
             for (auto rc : checks) {
-                if (doDraw && isThisAreaSpoiled && ShouldShowCheck(rc)) {
+                if (doDraw && isThisAreaSpoiled && !filterChecksHidden[rc]) {
                     DrawLocation(rc);
                 }
             }
@@ -1119,13 +1047,16 @@ void CheckTrackerWindow::DrawElement() {
     }
 }
 
-bool ShouldHideArea(RandomizerCheckArea rcArea) {
-    if (checkSearch.Filters.Size == 0 || checkSearch.PassFilter(RandomizerCheckObjects::GetRCAreaName(rcArea).c_str())) {
-        return false;
-    }
-    for (auto check : checksByArea[rcArea]) {
-        if (ShouldShowCheck(check)) {
-            return false;
+bool UpdateFilters() {
+    for (auto& [rcArea, checks] : checksByArea) {
+        filterAreasHidden[rcArea] = !checkSearch.PassFilter(RandomizerCheckObjects::GetRCAreaName(rcArea).c_str());
+        for (auto check : checks) { 
+            if (ShouldShowCheck(check)) {
+                filterAreasHidden[rcArea] = false;
+                filterChecksHidden[check] = false;
+            } else {
+                filterChecksHidden[check] = true;
+            }
         }
     }
 
@@ -1136,8 +1067,9 @@ bool ShouldShowCheck(RandomizerCheck check) {
     return (
         IsVisibleInCheckTracker(check) && 
         (checkSearch.Filters.Size == 0 ||
-        checkSearch.PassFilter(RandomizerCheckObjects::GetRCAreaName(Rando::StaticData::GetLocation(check)->GetArea()).c_str()) ||
-        checkSearch.PassFilter(Rando::StaticData::GetLocation(check)->GetShortName().c_str()))
+        checkSearch.PassFilter((Rando::StaticData::GetLocation(check)->GetShortName() + " " +
+            Rando::StaticData::GetLocation(check)->GetName() + " " +
+            RandomizerCheckObjects::GetRCAreaName(Rando::StaticData::GetLocation(check)->GetArea())).c_str()))
     );
 }
 
@@ -1368,6 +1300,13 @@ void UpdateInventoryChecks() {
 void UpdateAreaFullyChecked(RandomizerCheckArea area) {
 }
 
+void UpdateAllAreas() {
+    // Sort the entire thing
+    for (int i = 0; i < RCAREA_INVALID; i++) {
+        UpdateAreas(static_cast<RandomizerCheckArea>(i));
+    }
+}
+
 void UpdateAreas(RandomizerCheckArea area) {
     areasFullyChecked[area] = areaChecksGotten[area] == checksByArea.find(area)->second.size();
 }
@@ -1384,7 +1323,7 @@ void UpdateOrdering(RandomizerCheckArea rcArea) {
     if(checksByArea.contains(rcArea)) {
         std::sort(checksByArea.find(rcArea)->second.begin(), checksByArea.find(rcArea)->second.end(), CompareChecks);
     }
-
+    RecalculateAllAreaTotals();
     CalculateTotals();
 }
 
@@ -1393,14 +1332,14 @@ bool IsEoDCheck(RandomizerCheckType type) {
 }
 
 bool CompareChecks(RandomizerCheck i, RandomizerCheck j) {
-    RandomizerCheckTrackerData iShow = gSaveContext.checkTrackerData[i];
-    RandomizerCheckTrackerData jShow = gSaveContext.checkTrackerData[j];
     Rando::Location* x = Rando::StaticData::GetLocation(i);
     Rando::Location* y = Rando::StaticData::GetLocation(j);
-    bool iCollected = iShow.status == RCSHOW_COLLECTED || iShow.status == RCSHOW_SAVED;
-    bool iSaved = iShow.status == RCSHOW_SAVED;
-    bool jCollected = jShow.status == RCSHOW_COLLECTED || jShow.status == RCSHOW_SAVED;
-    bool jSaved = jShow.status == RCSHOW_SAVED;
+    auto itemI = OTRGlobals::Instance->gRandoContext->GetItemLocation(i);
+    auto itemJ = OTRGlobals::Instance->gRandoContext->GetItemLocation(j);
+    bool iCollected = itemI->HasObtained();
+    bool iSaved = itemI->GetCheckStatus() == RCSHOW_SAVED;
+    bool jCollected = itemJ->HasObtained();
+    bool jSaved = itemJ->GetCheckStatus() == RCSHOW_SAVED;
 
     if (!iCollected && jCollected) {
         return true;
@@ -1414,9 +1353,9 @@ bool CompareChecks(RandomizerCheck i, RandomizerCheck j) {
         return false;
     }
 
-    if (!iShow.skipped && jShow.skipped) {
+    if (!itemI->GetIsSkipped() && itemJ->GetIsSkipped()) {
         return true;
-    } else if (iShow.skipped && !jShow.skipped) {
+    } else if (itemI->GetIsSkipped() && !itemJ->GetIsSkipped()) {
         return false;
     }
 
@@ -1446,14 +1385,8 @@ void DrawLocation(RandomizerCheck rc) {
     bool showHidden = CVarGetInteger(CVAR_TRACKER_CHECK("ShowHidden"), 0);
     Rando::Location* loc = Rando::StaticData::GetLocation(rc);
     Rando::ItemLocation* itemLoc = OTRGlobals::Instance->gRandoContext->GetItemLocation(rc);
-    RandomizerCheckTrackerData checkData = gSaveContext.checkTrackerData[rc];
-    RandomizerCheckStatus status = checkData.status;
-
-    if (itemLoc->HasObtained()) {
-        status = RCSHOW_COLLECTED;
-    }
-
-    bool skipped = checkData.skipped;
+    RandomizerCheckStatus status = itemLoc->GetCheckStatus();
+    bool skipped = itemLoc->GetIsSkipped();
     if (status == RCSHOW_COLLECTED) {
         if (!showHidden && CVarGetInteger(CVAR_TRACKER_CHECK("Collected.Hide"), 0)) {
             return;
@@ -1525,11 +1458,13 @@ void DrawLocation(RandomizerCheck rc) {
     if (status == RCSHOW_UNCHECKED || status == RCSHOW_SEEN || status == RCSHOW_IDENTIFIED || status == RCSHOW_SCUMMED || skipped) {
         if (UIWidgets::StateButton(std::to_string(rc).c_str(), skipped ? ICON_FA_PLUS : ICON_FA_TIMES)) {
             if (skipped) {
-                gSaveContext.checkTrackerData[rc].skipped = false;
+                OTRGlobals::Instance->gRandoContext->GetItemLocation(rc)->SetIsSkipped(false);
                 areaChecksGotten[loc->GetArea()]--;
+                totalChecksGotten--;
             } else {
-                gSaveContext.checkTrackerData[rc].skipped = true;
+                OTRGlobals::Instance->gRandoContext->GetItemLocation(rc)->SetIsSkipped(true);
                 areaChecksGotten[loc->GetArea()]++;
+                totalChecksGotten++;
             }
             UpdateOrdering(loc->GetArea());
             UpdateInventoryChecks();
@@ -1550,9 +1485,7 @@ void DrawLocation(RandomizerCheck rc) {
 
     bool mystery = CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0) && itemLoc->IsAddedToPool();
 
-    if (checkData.hintItem != 0) {
-        // TODO hints
-    } else if (status != RCSHOW_UNCHECKED) {
+    if (status != RCSHOW_UNCHECKED) {
         switch (status) {
             case RCSHOW_SAVED:
             case RCSHOW_COLLECTED:
@@ -1581,8 +1514,8 @@ void DrawLocation(RandomizerCheck rc) {
                     } else if (!mystery) {
                         txt = itemLoc->GetPlacedItem().GetName().GetForLanguage(gSaveContext.language);
                     }
-                    if (!IsVisibleInCheckTracker(rc) && status == RCSHOW_IDENTIFIED && !mystery) {
-                        txt += fmt::format(" - {}", gSaveContext.checkTrackerData[rc].price);
+                    if (IsVisibleInCheckTracker(rc) && status == RCSHOW_IDENTIFIED && !mystery) {
+                        txt += fmt::format(" - {}", OTRGlobals::Instance->gRandoContext->GetItemLocation(rc)->GetPrice());
                     }
                 } else {
                     if (IsHeartPiece((GetItemID)Rando::StaticData::RetrieveItem(loc->GetVanillaItem()).GetItemID())) {
@@ -1608,8 +1541,7 @@ void DrawLocation(RandomizerCheck rc) {
     }
 
     if (CVarGetInteger("gCheckTrackerOptionShowLogic", 0)) {
-        std::vector<LocationAccess> locationsInRegion = areaTable[itemLoc->GetParentRegionKey()].locations;
-        for (auto& locationInRegion : locationsInRegion) {
+        for (auto& locationInRegion : areaTable[itemLoc->GetParentRegionKey()].locations) {
             if (locationInRegion.GetLocation() == rc) {
                 std::string conditionStr = locationInRegion.GetConditionStr();
                 if (conditionStr != "true") {
@@ -1742,12 +1674,12 @@ void CheckTrackerSettingsWindow::DrawElement() {
     UIWidgets::Tooltip("If enabled, Vanilla/MQ dungeons will show on the tracker immediately. Otherwise, Vanilla/MQ dungeon locations must be unlocked.");
     if (UIWidgets::EnhancementCheckbox("Hide right-side shop item checks", CVAR_TRACKER_CHECK("HideRightShopChecks"), false, "", UIWidgets::CheckboxGraphics::Cross, true)) {
         hideShopRightChecks = !hideShopRightChecks;
-        RecalculateAreaTotals();
+        RecalculateAllAreaTotals();
     }
     UIWidgets::Tooltip("If enabled, will prevent the tracker from displaying slots 1-4 in all shops.");
     if (UIWidgets::EnhancementCheckbox("Always show gold skulltulas", CVAR_TRACKER_CHECK("AlwaysShowGSLocs"), false, "")) {
         alwaysShowGS = !alwaysShowGS;
-        RecalculateAreaTotals();
+        RecalculateAllAreaTotals();
     }
     UIWidgets::Tooltip("If enabled, will show GS locations in the tracker regardless of tokensanity settings.");
     UIWidgets::EnhancementCheckbox("Show Logic", "gCheckTrackerOptionShowLogic");
@@ -1796,7 +1728,7 @@ void CheckTrackerWindow::InitElement() {
     Color_Saved_Extra           = CVarGetColor(CVAR_TRACKER_CHECK("Saved.ExtraColor"),            Color_Saved_Extra_Default);
 
     SaveManager::Instance->AddInitFunction(InitTrackerData);
-    sectionId = SaveManager::Instance->AddSaveFunction("trackerData", 1, SaveFile, true, -1);
+    sectionId = SaveManager::Instance->AddSaveFunction("trackerData", 1, SaveFile, true, SECTION_PARENT_NONE);
     SaveManager::Instance->AddLoadFunction("trackerData", 1, LoadFile);
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnLoadGame>(CheckTrackerLoadGame);
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnExitGame>([](uint32_t fileNum) {
@@ -1811,8 +1743,6 @@ void CheckTrackerWindow::InitElement() {
 
     hideShopRightChecks = CVarGetInteger(CVAR_TRACKER_CHECK("HideRightShopChecks"), 1);
     alwaysShowGS = CVarGetInteger(CVAR_TRACKER_CHECK("AlwaysShowGSLocs"), 0);
-
-    //LocationTable_Init();
 }
 
 } // namespace CheckTracker
diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.h b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.h
index 295bb39b0..3d3330f21 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.h
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.h
@@ -21,7 +21,6 @@ class CheckTrackerSettingsWindow : public Ship::GuiWindow {
 class CheckTrackerWindow : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
-    void Draw() override;
     ~CheckTrackerWindow() {};
 
   protected:
@@ -44,20 +43,19 @@ class CheckTrackerWindow : public Ship::GuiWindow {
 //repeat...
 #define INDEX_TO_16BIT_LITTLE_ENDIAN_BITMASK(idx) (0x8000 >> (7 - (idx % 8) + ((idx % 16) / 8) * 8))
 
-void DefaultCheckData(RandomizerCheck rc);
 void Teardown();
 void UpdateAllOrdering();
 bool IsVisibleInCheckTracker(RandomizerCheck rc);
 bool IsCheckShuffled(RandomizerCheck rc);
 void InitTrackerData(bool isDebug);
 RandomizerCheckArea GetCheckArea();
-void UpdateCheck(uint32_t, RandomizerCheckTrackerData);
 uint16_t GetTotalChecks();
 uint16_t GetTotalChecksGotten();
 bool IsAreaSpoiled(RandomizerCheckArea rcArea);
 void SetAreaSpoiled(RandomizerCheckArea rcArea);
+void UpdateInventoryChecks();
+void UpdateAreas(RandomizerCheckArea area);
+void UpdateAllOrdering();
+void UpdateAllAreas();
+void RecalculateAllAreaTotals();
 } // namespace CheckTracker
-
-
-void to_json(nlohmann::json & j, const RandomizerCheckTrackerData& rctd);
-void from_json(const nlohmann::json& j, RandomizerCheckTrackerData& rctd);
diff --git a/soh/soh/Enhancements/randomizer/savefile.cpp b/soh/soh/Enhancements/randomizer/savefile.cpp
index 8859e8d43..bfa2f7606 100644
--- a/soh/soh/Enhancements/randomizer/savefile.cpp
+++ b/soh/soh/Enhancements/randomizer/savefile.cpp
@@ -97,7 +97,7 @@ void GiveLinksPocketItem() {
     if (Randomizer_GetSettingValue(RSK_LINKS_POCKET) != RO_LINKS_POCKET_NOTHING) {
         GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_LINKS_POCKET, (GetItemID)RG_NONE);
         StartingItemGive(getItemEntry);
-        Rando::Context::GetInstance()->GetItemLocation(RC_LINKS_POCKET)->MarkAsObtained();
+        Rando::Context::GetInstance()->GetItemLocation(RC_LINKS_POCKET)->SetCheckStatus(RCSHOW_SAVED);
         // If we re-add the above, we'll get the item on save creation, now it's given on first load
         Flags_SetRandomizerInf(RAND_INF_LINKS_POCKET);
     }
diff --git a/soh/soh/SaveManager.cpp b/soh/soh/SaveManager.cpp
index 4398d25a5..10e3a694b 100644
--- a/soh/soh/SaveManager.cpp
+++ b/soh/soh/SaveManager.cpp
@@ -111,6 +111,7 @@ SaveManager::SaveManager() {
     coreSectionIDsByName["sohStats"] = SECTION_ID_STATS;
     coreSectionIDsByName["entrances"] = SECTION_ID_ENTRANCES;
     coreSectionIDsByName["scenes"] = SECTION_ID_SCENES;
+    coreSectionIDsByName["trackerData"] = SECTION_ID_TRACKER_DATA;
     AddLoadFunction("base", 1, LoadBaseVersion1);
     AddLoadFunction("base", 2, LoadBaseVersion2);
     AddLoadFunction("base", 3, LoadBaseVersion3);
@@ -404,13 +405,6 @@ void SaveManager::LoadRandomizerVersion3() {
                 // all ItemLocations is 0 anyway.
                 randoContext->GetItemLocation(i)->SetCustomPrice(price);
             }
-            uint16_t obtained = 0; 
-            SaveManager::Instance->LoadData("obtained", obtained, (uint16_t)0);
-            if (obtained) {
-                randoContext->GetItemLocation(i)->MarkAsObtained();
-            } else {
-                randoContext->GetItemLocation(i)->MarkAsNotObtained();
-            }
         });
     });
 
@@ -496,7 +490,6 @@ void SaveManager::SaveRandomizer(SaveContext* saveContext, int sectionID, bool f
             if (randoContext->GetItemLocation(i)->HasCustomPrice()) {
                 SaveManager::Instance->SaveData("price", randoContext->GetItemLocation(i)->GetPrice());
             }
-            SaveManager::Instance->SaveData("obtained", randoContext->GetItemLocation(i)->HasObtained());
         });
     });
 
@@ -666,8 +659,8 @@ void SaveManager::Init() {
         if (std::filesystem::exists(GetFileName(fileNum))) {
             LoadFile(fileNum);
             saveBlock = nlohmann::json::object();
+            OTRGlobals::Instance->gRandoContext->ClearItemLocations();
         }
-
     }
 }
 
diff --git a/soh/soh/SaveManager.h b/soh/soh/SaveManager.h
index 55480b675..ac139ed97 100644
--- a/soh/soh/SaveManager.h
+++ b/soh/soh/SaveManager.h
@@ -163,6 +163,8 @@ class SaveManager {
     static void LoadRandomizerVersion1();
     static void LoadRandomizerVersion2();
     static void LoadRandomizerVersion3();
+    static void LoadTrackerData();
+    static void SaveTrackerData(SaveContext* saveContext, int sectionID, bool fullSave);
     static void SaveRandomizer(SaveContext* saveContext, int sectionID, bool fullSave);
 
     static void LoadBaseVersion1();

From fab63877f0baaa917f662563e04f4c2c35fef6d5 Mon Sep 17 00:00:00 2001
From: Extloga <141232749+Extloga@users.noreply.github.com>
Date: Tue, 17 Sep 2024 20:41:09 +0200
Subject: [PATCH 196/230] Rearrangement of the currencies in randomizer.cpp
 (#4338)

---
 .../Enhancements/randomizer/randomizer.cpp    | 110 ++++++++++--------
 1 file changed, 59 insertions(+), 51 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index 651444840..01ff89d2d 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -68,61 +68,69 @@ const std::string Randomizer::NaviRandoMessageTableID = "RandomizerNavi";
 const std::string Randomizer::IceTrapRandoMessageTableID = "RandomizerIceTrap";
 const std::string Randomizer::randoMiscHintsTableID = "RandomizerMiscHints";
 
-static const char* englishRupeeNames[171] = {
-    "[P]",               "Bad RNG Rolls",    "Bananas",          "Beanbean Coins",   "Beans",
-    "Beli",              "Bells",            "Berries",          "Bison Dollars",    "Bitcoin",
-    "Blue Essence",      "Bolts",            "Bones",            "Boondollars",      "Bottle Caps",
-    "Bratwürste",        "Bucks",            "BugFrags",         "Canadian Dollars", "Cards",
-    "Chaos Orbs",        "Clams",            "Coal",             "Cocoa Beans",      "Coins",
-    "Cookies",           "Copper",           "Cor",              "Cornflakes",       "Credits",
-    "Crimebucks",        "Crystal Shards",   "Cubits",           "Cucumbers",        "Dalmations",
-    "Dampécoin",         "Dark Elixir",      "Darseks",          "Dead Memes",       "Diamonds",
-    "DNA",               "Doge",             "Dogecoin",         "Doll Hairs",       "Dollars",
-    "Dollarydoos",       "Dosh",             "Doubloons",        "Dwarfbucks",       "Emeralds",
-    "Energon",           "Eris",             "Ether",            "Euro",             "Experience",
-    "Extinction Points", "Floopies",         "Flurbos",          "FPS",              "Friends",
-    "Frog Coins",        "Gald",             "Gekz",             "Gems",             "Geo",
-    "Gil",               "Glimmer",          "Glitches",         "Gold",             "Gold Dragons",
-    "Goober Dollars",    "Green Herbs",      "Greg Siblings",    "Gummybears",       "Hell",
-    "Hyrule Loaches",    "Ice Traps",        "ISK",              "Jiggies",          "KF7 Ammo",
-    "Kinstones",         "Kremcoins",        "Kroner",           "Leaves ",          "Lemmings",
-    "Lien",              "Lira",             "Lumber",           "Lungmen Dollars",  "Macca",
-    "Mana",              "Mann Co. Keys",    "Meat",             "Meat Stacks",      "Medaparts",
-    "Meseta",            "Mesetas",          "Minerals",         "Monopoly Money",   "Moons",
-    "Mora",              "Mumbo Tokens",     "Munny",            "Mushrooms",        "Mysteries",
-    "Neopoints",         "Notes",            "Nuyen",            "Orbs",             "Pix",
-    "Pixels",            "Platinum",         "Pokédollars",      "Pokémon",          "Poko",
-    "Pokos",             "Potch",            "Pounds",           "Power Pellets",    "Primogems",
-    "Réals",             "Refined Metal",    "Remote Mines",     "Retweets",         "Rhinu",
-    "Rings",             "Riot Points",      "Robux",            "Rubies",           "Rubles",
-    "Runite Ore",        "Rupees",           "Saint Quartz",     "Septims",          "Shekels",
-    "Shillings",         "Silver",           "Simoleons",        "Smackaroos",       "Social Credit",
-    "Souls",             "Spent Casings",    "Spice",            "Spondulicks",      "Spoons",
-    "Star Bits",         "Star Chips",       "Stars",            "Stones of Jordan", "Store Credit",
-    "Strawbs",           "Studs",            "Super Sea Snails", "Talent",           "Teef",
-    "Telecrystals",      "Tiberium",         "TokKul",           "Toys",             "Turnips",
-    "Upvotes",           "V-Bucks",          "Vespene Gas",      "Watts",            "Widgets",
-    "Woolongs",          "World Dollars",    "Wumpa Fruit",      "Yen",              "Zenny",
-    "Zorkmids"
+static const char* englishRupeeNames[175] = {
+    "[P]",                "Bad RNG Rolls",     "Bananas",           "Beanbean Coins",    "Beans",
+    "Beli",               "Bells",             "Berries",           "Bison Dollars",     "Bitcoin",
+    "Blue Essence",       "Bolts",             "Bones",             "Boondollars",       "Bottle Caps",
+    "Bratwürste",         "Bucks",             "BugFrags",          "Canadian Dollars",  "Cards",
+    "Chaos Orbs",         "Clams",             "Coal",              "Cocoa Beans",       "Coins",
+    "Cookies",            "Copper",            "Cor",               "Cornflakes",        "Credits",
+    "Crimebucks",         "Crystal Shards",    "Cubits",            "Cucumbers",         "Dalmations",
+    "Dampécoin",          "Dark Elixir",       "Darseks",           "Dead Memes",        "Diamonds",
+    "DNA",                "Doge",              "Dogecoin",          "Doll Hairs",        "Dollars",
+    "Dollarydoos",        "Dosh",              "Doubloons",         "Dwarfbucks",        "Elexit",
+    "Emeralds",           "Energon",           "Eris",              "Ether",             "Euro",
+    "Experience",         "Extinction Points", "Floopies",          "Flurbos",           "FPS",
+    "Friends",            "Frog Coins",        "Gald",              "Gekz",              "Gems",
+    "Geo",                "Gil",               "Glimmer",           "Glitches",          "Gold",
+    "Gold Dragons",       "Goober Dollars",    "Green Herbs",       "Greg Siblings",     "Grouses",
+    "Gummybears",         "Hell",              "Hyrule Loaches",    "Ice Traps",         "ISK",
+    "Jiggies",            "KF7 Ammo",          "Kinstones",         "Kremcoins",         "Kroner",
+    "Leaves",             "Lemmings",          "Lien",              "Lira",              "Lumber",
+    "Lungmen Dollars",    "Macca",             "Mana",              "Mann Co. Keys",     "Meat",
+    "Meat Stacks",        "Medaparts",         "Meseta",            "Mesetas",           "Minerals",
+    "Monopoly Money",     "Moons",             "Mora",              "Mumbo Tokens",      "Munny",
+    "Mushrooms",          "Mysteries",         "Neopoints",         "Notes",             "Nuyen",
+    "Orbs",               "Ore",               "Pix",               "Pixels",            "Plastyks",
+    "Platinum",           "Pokédollars",       "Pokémon",           "Poko",              "Pokos",
+    "Potch",              "Pounds",            "Power Pellets",     "Primogems",         "Réals",
+    "Refined Metal",      "Remote Mines",      "Retweets",          "Rhinu",             "Rings",
+    "Riot Points",        "Robux",             "Rubies",            "Rubles",            "Runite Ore",
+    "Rupees",             "Saint Quartz",      "Septims",           "Shekels",           "Shillings",
+    "Silver",             "Simoleons",         "Smackaroos",        "Social Credit",     "Souls",
+    "Spent Casings",      "Spice",             "Spondulicks",       "Spoons",            "Star Bits",
+    "Star Chips",         "Stars",             "Stones of Jordan",  "Store Credit",      "Strawbs",
+    "Studs",              "Super Sea Snails",  "Talent",            "Teef",              "Telecrystals",
+    "Tiberium",           "TokKul",            "Toys",              "Turnips",           "Upvotes",
+    "V-Bucks",            "Vespene Gas",       "Watts",             "Widgets",           "Woolongs",
+    "World Dollars",      "Wumpa Fruit",       "Yen",               "Zenny",             "Zorkmids"
 };
 
-static const char* germanRupeeNames[56] = {
-    "Rubine",     "Mäuse",       "Kröten",        "Münzen",     "Euro",       "Mark",     "Bananen",
-    "Gummibären", "Bonbons",     "Diamanten",     "Bratwürste", "Bitcoin",    "Dogecoin", "Monde",
-    "Sterne",     "Brause UFOs", "Taler",         "Sternis",    "Schilling",  "Freunde",  "Seelen",
-    "Gil",        "Zenny",       "Pfandflaschen", "Knochen",    "Pilze",      "Smaragde", "Kronkorken",
-    "Pokédollar", "Brötchen",    "EXP",           "Wagenchips", "Moos",       "Knete",    "Kohle",
-    "Kies",       "Radieschen",  "Diridari",      "Steine",     "Kartoffeln", "Penunze",  "ECU",
-    "Franken",    "Cent",        "Pfennig",       "Groschen",   "Rappen",     "Gulden",   "Kreuzer",
-    "Kronen",     "Forint",      "Heller",        "Pfund",      "Karolin",    "Pesa",     "Tael"
+static const char* germanRupeeNames[65] = {
+    "Bananen",            "Bitcoin",           "Bonbons",           "Bratwürste",        "Brause UFOs",
+    "Brötchen",           "Cent",              "Diamanten",         "Diridari",          "Dogecoin",
+    "ECU",                "Elexit",            "Erz",               "Erzbrocken",        "Euro",
+    "EXP",                "Forint",            "Franken",           "Freunde",           "Gil",
+    "Gold",               "Groschen",          "Gulden",            "Gummibären",        "Heller",
+    "Juwelen",            "Karolin",           "Kartoffeln",        "Kies",              "Knete",
+    "Knochen",            "Kohle",             "Kraniche",          "Kreuzer",           "Kronen",
+    "Kronkorken",         "Kröten",            "Mark",              "Mäuse",             "Monde",
+    "Moorhühner",         "Moos",              "Münzen",            "Penunze",           "Pesa",
+    "Pfandflaschen",      "Pfennig",           "Pfund",             "Pilze",             "Plastiks",
+    "Pokédollar",         "Radieschen",        "Rappen",            "Rubine",            "Saphire",
+    "Schilling",          "Seelen",            "Smaragde",          "Steine",            "Sterne",
+    "Sternis",            "Tael",              "Taler",             "Wagenchips",        "Zenny"
 };
 
-static const char* frenchRupeeNames[36] = {
-    "Rubis",       "Bitcoin", "Bananes",   "Euros",     "Dollars", "Émeraudes",  "Joyaux",   "Diamants",
-    "Balles",      "Pokémon", "Pièces",    "Lunes",     "Étoiles", "Dogecoin",   "Anneaux",  "Radis",
-    "Pokédollars", "Zennies", "Pépètes",   "Mailles",   "Éthers",  "Clochettes", "Capsules", "Gils",
-    "Champignons", "Blés",    "Halos",     "Munnies",   "Orens",   "Florens",    "Crédits",  "Galds",
-    "Bling",       "Orbes",   "Baguettes", "Croissants"
+static const char* frenchRupeeNames[40] = {
+    "Anneaux",            "Baguettes",         "Balles",            "Bananes",           "Bitcoin",
+    "Blés",               "Bling",             "Capsules",          "Centimes",          "Champignons",
+    "Clochettes",         "Crédits",           "Croissants",        "Diamants",          "Dogecoin",
+    "Dollars",            "Émeraudes",         "Éthers",            "Étoiles",           "Euros",
+    "Florens",            "Francs",            "Galds",             "Gils",              "Grouses",
+    "Halos",              "Joyaux",            "Lunes",             "Mailles",           "Munnies",
+    "Orbes",              "Orens",             "Pépètes",           "Pièces",            "Plastyks",
+    "Pokédollars",        "Pokémon",           "Radis",             "Rubis",             "Zennies"
 };
 
 Randomizer::Randomizer() {

From da6e4cac91cd601537fc0b82c17f6c0fc635b879 Mon Sep 17 00:00:00 2001
From: Garrett Cox <garrettjcox@gmail.com>
Date: Tue, 17 Sep 2024 14:30:33 -0500
Subject: [PATCH 197/230] Remove erroneous Entrance_OverrideBlueWarp (#4340)

---
 .../SkipCutscene/Story/SkipBlueWarp.cpp       | 27 ++++++++++---------
 .../actors/ovl_Door_Warp1/z_door_warp1.c      | 15 -----------
 2 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipBlueWarp.cpp b/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipBlueWarp.cpp
index ec53c7ed0..27dc30ae9 100644
--- a/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipBlueWarp.cpp
+++ b/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipBlueWarp.cpp
@@ -19,19 +19,19 @@ extern "C" {
  */
 void SkipBlueWarp_ShouldPlayTransitionCS(GIVanillaBehavior _, bool* should, void* opt) {
     if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
-        uint8_t isBlueWarp = 0;
+        uint8_t isBlueWarpCutscene = 0;
         // Deku Tree Blue warp
         if (gSaveContext.entranceIndex == ENTR_KOKIRI_FOREST_0 && gSaveContext.cutsceneIndex == 0xFFF1) {
             gSaveContext.entranceIndex = ENTR_KOKIRI_FOREST_11;
-            isBlueWarp = 1;
+            isBlueWarpCutscene = 1;
         // Dodongo's Cavern Blue warp
         } else if (gSaveContext.entranceIndex == ENTR_DEATH_MOUNTAIN_TRAIL_0 && gSaveContext.cutsceneIndex == 0xFFF1) {
             gSaveContext.entranceIndex = ENTR_DEATH_MOUNTAIN_TRAIL_5;
-            isBlueWarp = 1;
+            isBlueWarpCutscene = 1;
         // Jabu Jabu's Blue warp
         } else if (gSaveContext.entranceIndex == ENTR_ZORAS_FOUNTAIN_0 && gSaveContext.cutsceneIndex == 0xFFF0) {
             gSaveContext.entranceIndex = ENTR_ZORAS_FOUNTAIN_0;
-            isBlueWarp = 1;
+            isBlueWarpCutscene = 1;
         // Forest Temple Blue warp
         } else if (gSaveContext.entranceIndex == ENTR_CHAMBER_OF_THE_SAGES_0 && gSaveContext.cutsceneIndex == 0x0 && gSaveContext.chamberCutsceneNum == CHAMBER_CS_FOREST) {
             // Normally set in the blue warp cutscene
@@ -43,14 +43,14 @@ void SkipBlueWarp_ShouldPlayTransitionCS(GIVanillaBehavior _, bool* should, void
                 gSaveContext.entranceIndex = ENTR_KOKIRI_FOREST_12;
             }
 
-            isBlueWarp = 1;
+            isBlueWarpCutscene = 1;
         // Fire Temple Blue warp
         } else if (gSaveContext.entranceIndex == ENTR_KAKARIKO_VILLAGE_0 && gSaveContext.cutsceneIndex == 0xFFF3) {
             // Normally set in the blue warp cutscene
             Flags_SetEventChkInf(EVENTCHKINF_DEATH_MOUNTAIN_ERUPTED);
 
             gSaveContext.entranceIndex = ENTR_DEATH_MOUNTAIN_CRATER_5;
-            isBlueWarp = 1;
+            isBlueWarpCutscene = 1;
         // Water Temple Blue warp
         } else if (gSaveContext.entranceIndex == ENTR_CHAMBER_OF_THE_SAGES_0 && gSaveContext.cutsceneIndex == 0x0 && gSaveContext.chamberCutsceneNum == CHAMBER_CS_WATER) {
             // Normally set in the blue warp cutscene
@@ -58,18 +58,18 @@ void SkipBlueWarp_ShouldPlayTransitionCS(GIVanillaBehavior _, bool* should, void
             Flags_SetEventChkInf(EVENTCHKINF_RAISED_LAKE_HYLIA_WATER);
 
             gSaveContext.entranceIndex = ENTR_LAKE_HYLIA_9;
-            isBlueWarp = 1;
+            isBlueWarpCutscene = 1;
         // Spirit Temple Blue warp
         } else if (gSaveContext.entranceIndex == ENTR_CHAMBER_OF_THE_SAGES_0 && gSaveContext.cutsceneIndex == 0x0 && gSaveContext.chamberCutsceneNum == CHAMBER_CS_SPIRIT) {
             gSaveContext.entranceIndex = ENTR_DESERT_COLOSSUS_8;
-            isBlueWarp = 1;
+            isBlueWarpCutscene = 1;
         // Shadow Temple Blue warp
         } else if (gSaveContext.entranceIndex == ENTR_CHAMBER_OF_THE_SAGES_0 && gSaveContext.cutsceneIndex == 0x0 && gSaveContext.chamberCutsceneNum == CHAMBER_CS_SHADOW) {
             gSaveContext.entranceIndex = ENTR_GRAVEYARD_8;
-            isBlueWarp = 1;
+            isBlueWarpCutscene = 1;
         }
 
-        if (isBlueWarp) {
+        if (isBlueWarpCutscene) {
             if (gSaveContext.entranceIndex != ENTR_LAKE_HYLIA_9) {
                 // Normally set in the blue warp cutscene
                 gSaveContext.dayTime = gSaveContext.skyboxTime = 0x8000;
@@ -77,10 +77,11 @@ void SkipBlueWarp_ShouldPlayTransitionCS(GIVanillaBehavior _, bool* should, void
 
             *should = false;
             gSaveContext.cutsceneIndex = 0;
+        }
 
-            if (IS_RANDO && (RAND_GET_OPTION(RSK_SHUFFLE_DUNGEON_ENTRANCES) != RO_DUNGEON_ENTRANCE_SHUFFLE_OFF || RAND_GET_OPTION(RSK_SHUFFLE_BOSS_ENTRANCES) != RO_BOSS_ROOM_ENTRANCE_SHUFFLE_OFF)) {
-                Entrance_OverrideBlueWarp();
-            }
+        // This is outside the above condition because we want to handle both first and following visits to the blue warp
+        if (IS_RANDO && (RAND_GET_OPTION(RSK_SHUFFLE_DUNGEON_ENTRANCES) != RO_DUNGEON_ENTRANCE_SHUFFLE_OFF || RAND_GET_OPTION(RSK_SHUFFLE_BOSS_ENTRANCES) != RO_BOSS_ROOM_ENTRANCE_SHUFFLE_OFF)) {
+            Entrance_OverrideBlueWarp();
         }
     }
 }
diff --git a/soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c b/soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
index 00509500f..242ac1ddb 100644
--- a/soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
+++ b/soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
@@ -557,11 +557,6 @@ void DoorWarp1_ChildWarpOut(DoorWarp1* this, PlayState* play) {
             gSaveContext.nextCutsceneIndex = 0;
         }
 
-        if (IS_RANDO && (Randomizer_GetSettingValue(RSK_SHUFFLE_DUNGEON_ENTRANCES) != RO_DUNGEON_ENTRANCE_SHUFFLE_OFF ||
-            Randomizer_GetSettingValue(RSK_SHUFFLE_BOSS_ENTRANCES) != RO_BOSS_ROOM_ENTRANCE_SHUFFLE_OFF)) {
-            Entrance_OverrideBlueWarp();
-        }
-
         osSyncPrintf("\n\n\nおわりおわり");
         play->transitionTrigger = TRANS_TRIGGER_START;
         play->transitionType = TRANS_TYPE_FADE_WHITE_SLOW;
@@ -654,11 +649,6 @@ void DoorWarp1_RutoWarpOut(DoorWarp1* this, PlayState* play) {
         }
         play->nextEntranceIndex = ENTR_ZORAS_FOUNTAIN_0;
 
-        if (IS_RANDO && (Randomizer_GetSettingValue(RSK_SHUFFLE_DUNGEON_ENTRANCES) != RO_DUNGEON_ENTRANCE_SHUFFLE_OFF ||
-            Randomizer_GetSettingValue(RSK_SHUFFLE_BOSS_ENTRANCES) != RO_BOSS_ROOM_ENTRANCE_SHUFFLE_OFF)) {
-            Entrance_OverrideBlueWarp();
-        }
-
         play->transitionTrigger = TRANS_TRIGGER_START;
         play->transitionType = TRANS_TYPE_FADE_WHITE_SLOW;
     }
@@ -847,11 +837,6 @@ void DoorWarp1_AdultWarpOut(DoorWarp1* this, PlayState* play) {
             }
         }
 
-        if (IS_RANDO && (Randomizer_GetSettingValue(RSK_SHUFFLE_DUNGEON_ENTRANCES) != RO_DUNGEON_ENTRANCE_SHUFFLE_OFF ||
-            Randomizer_GetSettingValue(RSK_SHUFFLE_BOSS_ENTRANCES) != RO_BOSS_ROOM_ENTRANCE_SHUFFLE_OFF)) {
-            Entrance_OverrideBlueWarp();
-        }
-
         play->transitionTrigger = TRANS_TRIGGER_START;
         play->transitionType = TRANS_TYPE_FADE_WHITE;
         gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE_SLOW;

From ee02e503fc53ee7f41d15aa8c509a069599c79fd Mon Sep 17 00:00:00 2001
From: Garrett Cox <garrettjcox@gmail.com>
Date: Thu, 19 Sep 2024 11:15:31 -0500
Subject: [PATCH 198/230] Fix issues with faster heavy block lift (#4335)

---
 .../TimeSavers/FasterHeavyBlockLift.cpp       | 58 +++++++++++++++++++
 .../Enhancements/TimeSavers/TimeSavers.cpp    |  1 +
 soh/soh/Enhancements/TimeSavers/TimeSavers.h  |  1 +
 .../game-interactor/GameInteractor.h          |  3 +
 .../Enhancements/timesaver_hook_handlers.cpp  |  4 ++
 .../ovl_Bg_Heavy_Block/z_bg_heavy_block.c     | 36 +++++-------
 .../actors/ovl_player_actor/z_player.c        | 18 ++----
 7 files changed, 89 insertions(+), 32 deletions(-)
 create mode 100644 soh/soh/Enhancements/TimeSavers/FasterHeavyBlockLift.cpp

diff --git a/soh/soh/Enhancements/TimeSavers/FasterHeavyBlockLift.cpp b/soh/soh/Enhancements/TimeSavers/FasterHeavyBlockLift.cpp
new file mode 100644
index 000000000..ca73877c6
--- /dev/null
+++ b/soh/soh/Enhancements/TimeSavers/FasterHeavyBlockLift.cpp
@@ -0,0 +1,58 @@
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/OTRGlobals.h"
+#include "spdlog/spdlog.h"
+
+extern "C" {
+    #include "z64save.h"
+    #include "macros.h"
+    #include "variables.h"
+    #include "functions.h"
+    extern PlayState* gPlayState;
+    extern SaveContext gSaveContext;
+}
+
+/**
+ * This primarily handles speeding up the heavy block lifts (OGC and in the Fire Trial) but also handles skipping
+ * the one point cutscene since the two options are so similar in what they do.
+ */
+void FasterHeavyBlockLift_Register() {
+    REGISTER_VB_SHOULD(VB_PLAY_ONEPOINT_ACTOR_CS, {
+        Actor* actor = static_cast<Actor*>(opt);
+
+        if (
+            actor->id == ACTOR_BG_HEAVY_BLOCK && 
+            (CVarGetInteger(CVAR_ENHANCEMENT("FasterHeavyBlockLift"), 0) || CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.OnePoint"), IS_RANDO))
+        ) {
+            *should = false;
+        }
+    });
+
+    REGISTER_VB_SHOULD(VB_FREEZE_LINK_FOR_BLOCK_THROW, {
+        if (CVarGetInteger(CVAR_ENHANCEMENT("FasterHeavyBlockLift"), 0) || CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.OnePoint"), IS_RANDO)) {
+            *should = false;
+        }
+    });
+
+    REGISTER_VB_SHOULD(VB_PLAY_THROW_ANIMATION, {
+        Player *player = GET_PLAYER(gPlayState);
+        Actor* interactRangeActor = player->interactRangeActor;
+        s32 interactActorId = interactRangeActor->id;
+        LinkAnimationHeader* anim = static_cast<LinkAnimationHeader*>(opt);
+
+        // Same actor is used for small and large silver rocks, use actor params to identify large ones
+        bool isLargeSilverRock = interactActorId == ACTOR_EN_ISHI && interactRangeActor->params & 1 == 1;
+        if (CVarGetInteger(CVAR_ENHANCEMENT("FasterHeavyBlockLift"), 0) && (isLargeSilverRock || interactActorId == ACTOR_BG_HEAVY_BLOCK)) {
+            *should = false;
+            LinkAnimation_PlayOnceSetSpeed(gPlayState, &player->skelAnime, anim, 5.0f);
+        }
+    });
+
+    REGISTER_VB_SHOULD(VB_MOVE_THROWN_ACTOR, {
+        if (CVarGetInteger(CVAR_ENHANCEMENT("FasterHeavyBlockLift"), 0)) {
+            Actor* heldActor = static_cast<Actor*>(opt);
+
+            heldActor->shape.rot.x -= 3510;
+        }
+    });
+}
diff --git a/soh/soh/Enhancements/TimeSavers/TimeSavers.cpp b/soh/soh/Enhancements/TimeSavers/TimeSavers.cpp
index f6d2e3629..68fe71da6 100644
--- a/soh/soh/Enhancements/TimeSavers/TimeSavers.cpp
+++ b/soh/soh/Enhancements/TimeSavers/TimeSavers.cpp
@@ -11,4 +11,5 @@ void TimeSavers_Register() {
         SkipIntro_Register();
     // SkipMiscInteractions
         MoveMidoInKokiriForest_Register();
+    FasterHeavyBlockLift_Register();
 }
diff --git a/soh/soh/Enhancements/TimeSavers/TimeSavers.h b/soh/soh/Enhancements/TimeSavers/TimeSavers.h
index b3b221351..d45ed7f10 100644
--- a/soh/soh/Enhancements/TimeSavers/TimeSavers.h
+++ b/soh/soh/Enhancements/TimeSavers/TimeSavers.h
@@ -13,5 +13,6 @@ void TimeSavers_Register();
     void SkipIntro_Register();
 // SkipMiscInteractions
     void MoveMidoInKokiriForest_Register();
+void FasterHeavyBlockLift_Register();
 
 #endif // TIME_SAVERS_H
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h
index 108d2f33e..f6db2e950 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h
@@ -244,6 +244,8 @@ typedef enum {
     ```
     */
     VB_DRAW_AMMO_COUNT,
+    VB_FREEZE_LINK_FOR_BLOCK_THROW,
+    VB_MOVE_THROWN_ACTOR,
 
     /*** Play Cutscenes ***/
 
@@ -286,6 +288,7 @@ typedef enum {
     VB_PLAY_RAINBOW_BRIDGE_CS,
     // Opt: *EnBox
     VB_PLAY_SLOW_CHEST_CS,
+    VB_PLAY_THROW_ANIMATION,
 
     /*** Give Items ***/
 
diff --git a/soh/soh/Enhancements/timesaver_hook_handlers.cpp b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
index 0cd6ffb09..0682f4de1 100644
--- a/soh/soh/Enhancements/timesaver_hook_handlers.cpp
+++ b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
@@ -223,6 +223,10 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
                         if (actor->id == ACTOR_BG_MORI_HINERI) {
                             break;
                         }
+                        // This is handled in the FasterHeavyBlockLift enhancement
+                        if (actor->id == ACTOR_BG_HEAVY_BLOCK) {
+                            break;
+                        }
 
                         RateLimitedSuccessChime();
                         *should = false;
diff --git a/soh/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c b/soh/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c
index 61d0ccb1b..6df97fcfc 100644
--- a/soh/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c
+++ b/soh/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c
@@ -7,6 +7,7 @@
 #include "z_bg_heavy_block.h"
 #include "objects/object_heavy_object/object_heavy_object.h"
 #include "vt.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS 0
 
@@ -320,18 +321,16 @@ void BgHeavyBlock_Wait(BgHeavyBlock* this, PlayState* play) {
     if (Actor_HasParent(&this->dyna.actor, play)) {
         this->timer = 0;
 
-        if (!CVarGetInteger(CVAR_ENHANCEMENT("FasterHeavyBlockLift"), 0)) {
-            switch (this->dyna.actor.params & 0xFF) {
-                case HEAVYBLOCK_BREAKABLE:
-                    OnePointCutscene_Init(play, 4020, 270, &this->dyna.actor, MAIN_CAM);
-                    break;
-                case HEAVYBLOCK_UNBREAKABLE:
-                    OnePointCutscene_Init(play, 4021, 220, &this->dyna.actor, MAIN_CAM);
-                    break;
-                case HEAVYBLOCK_UNBREAKABLE_OUTSIDE_CASTLE:
-                    OnePointCutscene_Init(play, 4022, 210, &this->dyna.actor, MAIN_CAM);
-                    break;
-            }
+        switch (this->dyna.actor.params & 0xFF) {
+            case HEAVYBLOCK_BREAKABLE:
+                OnePointCutscene_Init(play, 4020, 270, &this->dyna.actor, MAIN_CAM);
+                break;
+            case HEAVYBLOCK_UNBREAKABLE:
+                OnePointCutscene_Init(play, 4021, 220, &this->dyna.actor, MAIN_CAM);
+                break;
+            case HEAVYBLOCK_UNBREAKABLE_OUTSIDE_CASTLE:
+                OnePointCutscene_Init(play, 4022, 210, &this->dyna.actor, MAIN_CAM);
+                break;
         }
 
         quakeIndex = Quake_Add(GET_ACTIVE_CAM(play), 3);
@@ -369,7 +368,7 @@ void BgHeavyBlock_LiftedUp(BgHeavyBlock* this, PlayState* play) {
 
     this->timer++;
 
-    if (!CVarGetInteger(CVAR_ENHANCEMENT("FasterHeavyBlockLift"), 0)) {
+    if (GameInteractor_Should(VB_FREEZE_LINK_FOR_BLOCK_THROW, true, this)) {
         Player_SetCsActionWithHaltedActors(play, &player->actor, 8);
     }
 
@@ -408,13 +407,10 @@ void BgHeavyBlock_Fly(BgHeavyBlock* this, PlayState* play) {
                 Quake_SetQuakeValues(quakeIndex, 14, 2, 100, 0);
                 Quake_SetCountdown(quakeIndex, 30);
 
-                // We don't want this arbitrarily long quake with the enhancement enabled
-                if (!CVarGetInteger(CVAR_ENHANCEMENT("FasterHeavyBlockLift"), 0)) {
-                    quakeIndex = Quake_Add(GET_ACTIVE_CAM(play), 2);
-                    Quake_SetSpeed(quakeIndex, 12000);
-                    Quake_SetQuakeValues(quakeIndex, 5, 0, 0, 0);
-                    Quake_SetCountdown(quakeIndex, 999);
-                }
+                quakeIndex = Quake_Add(GET_ACTIVE_CAM(play), 2);
+                Quake_SetSpeed(quakeIndex, 12000);
+                Quake_SetQuakeValues(quakeIndex, 5, 0, 0, 0);
+                Quake_SetCountdown(quakeIndex, 999);
 
                 SoundSource_PlaySfxAtFixedWorldPos(play, &this->dyna.actor.world.pos, 30,
                                                    NA_SE_EV_ELECTRIC_EXPLOSION);
diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c
index c5d1a65bd..24ff3dd1f 100644
--- a/soh/src/overlays/actors/ovl_player_actor/z_player.c
+++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c
@@ -5096,11 +5096,7 @@ void func_8083A0F4(PlayState* play, Player* this) {
                 anim = GET_PLAYER_ANIM(PLAYER_ANIMGROUP_carryB, this->modelAnimType);
             }
 
-            // Same actor is used for small and large silver rocks, use actor params to identify large ones
-            bool isLargeSilverRock = interactActorId == ACTOR_EN_ISHI && interactRangeActor->params & 1 == 1;
-            if (CVarGetInteger(CVAR_ENHANCEMENT("FasterHeavyBlockLift"), 0) && (isLargeSilverRock || interactActorId == ACTOR_BG_HEAVY_BLOCK)) {
-                LinkAnimation_PlayOnceSetSpeed(play, &this->skelAnime, anim, 5.0f);
-            } else {
+            if (GameInteractor_Should(VB_PLAY_THROW_ANIMATION, true, anim)) {
                 LinkAnimation_PlayOnce(play, &this->skelAnime, anim);
             }
         }
@@ -9842,14 +9838,12 @@ void Player_Action_80846120(Player* this, PlayState* play) {
     if (LinkAnimation_OnFrame(&this->skelAnime, 229.0f)) {
         Actor* heldActor = this->heldActor;
 
-        if (CVarGetInteger(CVAR_ENHANCEMENT("FasterHeavyBlockLift"), 0)) {
-            // This is the difference in rotation when the animation is sped up 5x
-            heldActor->shape.rot.x -= 3510;
+        if (GameInteractor_Should(VB_MOVE_THROWN_ACTOR, true, heldActor)) {
+            heldActor->speedXZ = Math_SinS(heldActor->shape.rot.x) * 40.0f;
+            heldActor->velocity.y = Math_CosS(heldActor->shape.rot.x) * 40.0f;
+            heldActor->gravity = -2.0f;
+            heldActor->minVelocityY = -30.0f;
         }
-        heldActor->speedXZ = Math_SinS(heldActor->shape.rot.x) * 40.0f;
-        heldActor->velocity.y = Math_CosS(heldActor->shape.rot.x) * 40.0f;
-        heldActor->gravity = -2.0f;
-        heldActor->minVelocityY = -30.0f;
         Player_DetachHeldActor(play, this);
         return;
     }

From 2434eb82bf81926eaa9dff5ea1014b59626f18e8 Mon Sep 17 00:00:00 2001
From: Garrett Cox <garrettjcox@gmail.com>
Date: Thu, 19 Sep 2024 11:16:31 -0500
Subject: [PATCH 199/230] Fix for LACS awarding everywhere (#4348)

* Fix for LACS awarding everywhere

* Update soh/soh/Enhancements/randomizer/hook_handlers.cpp

Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>

---------

Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>
---
 soh/soh/Enhancements/randomizer/hook_handlers.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index 518daf6d0..35f9df9f6 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -637,7 +637,11 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             *should = !Flags_GetRandomizerInf(RAND_INF_DARUNIAS_JOY);
             break;
         case VB_BE_ELIGIBLE_FOR_LIGHT_ARROWS:
-            *should = !Flags_GetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS) && MeetsLACSRequirements();
+            *should =
+                LINK_IS_ADULT &&
+                (gEntranceTable[gSaveContext.entranceIndex].scene == SCENE_TEMPLE_OF_TIME) &&
+                !Flags_GetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS) &&
+                MeetsLACSRequirements();
             break;
         case VB_BE_ELIGIBLE_FOR_NOCTURNE_OF_SHADOW:
             *should =
@@ -1212,6 +1216,7 @@ void RandomizerOnSceneInitHandler(int16_t sceneNum) {
         updateHook = 0;
     }
 
+    // If we're not in the Temple of Time or we've already learned the Prelude of Light and received LACs, we don't need to do anything
     if (
         sceneNum != SCENE_TEMPLE_OF_TIME || 
         (
@@ -1225,15 +1230,18 @@ void RandomizerOnSceneInitHandler(int16_t sceneNum) {
             Flags_SetEventChkInf(EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT);
         }
 
-        if (!Flags_GetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS) && MeetsLACSRequirements()) {
+        // We're always in rando here, and rando always overrides this should so we can just pass false
+        if (GameInteractor_Should(VB_BE_ELIGIBLE_FOR_LIGHT_ARROWS, false, NULL)) {
             Flags_SetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS);
         }
 
+        // If both awards have been given, we can unregister the hook, otherwise it will get unregistered when the player leaves the area
         if (
             Flags_GetEventChkInf(EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT) &&
             Flags_GetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS)
         ) {
             GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnPlayerUpdate>(updateHook);
+            updateHook = 0;
         }
     });
 }

From 74c93b0182779985b2b5f1c24bf5c866ac311df3 Mon Sep 17 00:00:00 2001
From: Garrett Cox <garrettjcox@gmail.com>
Date: Thu, 19 Sep 2024 11:17:01 -0500
Subject: [PATCH 200/230] Stop disabling dampe checkbox, as it's no longer
 forced to on for rando (#4349)

---
 soh/soh/SohMenuBar.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/soh/soh/SohMenuBar.cpp b/soh/soh/SohMenuBar.cpp
index 05f22fb2d..35f0b6ae1 100644
--- a/soh/soh/SohMenuBar.cpp
+++ b/soh/soh/SohMenuBar.cpp
@@ -1094,8 +1094,7 @@ void DrawEnhancementsMenu() {
                 UIWidgets::Tooltip("All regular enemies and mini-bosses move and act twice as fast.");
                 UIWidgets::PaddedEnhancementCheckbox("Always Win Goron Pot", CVAR_ENHANCEMENT("GoronPot"), true, false);
                 UIWidgets::Tooltip("Always get the heart piece/purple rupee from the spinning Goron pot");
-                UIWidgets::PaddedEnhancementCheckbox("Always Win Dampe Digging Game", CVAR_ENHANCEMENT("DampeWin"), true, false, SaveManager::Instance->IsRandoFile(),
-                                                        "This setting is always enabled in randomizer files", UIWidgets::CheckboxGraphics::Checkmark);
+                UIWidgets::PaddedEnhancementCheckbox("Always Win Dampe Digging Game", CVAR_ENHANCEMENT("DampeWin"), true, false);
                 UIWidgets::Tooltip("Always win the heart piece/purple rupee on the first dig in Dampe's grave digging game, just like in rando\nIn a rando file, this is unconditionally enabled");
                 UIWidgets::PaddedEnhancementCheckbox("All Dogs are Richard", CVAR_ENHANCEMENT("AllDogsRichard"), true, false);
                 UIWidgets::Tooltip("All dogs can be traded in and will count as Richard.");

From 5d8841777ac5568c83f42e055eb41eadeaea399b Mon Sep 17 00:00:00 2001
From: Garrett Cox <garrettjcox@gmail.com>
Date: Fri, 20 Sep 2024 17:37:34 -0500
Subject: [PATCH 201/230] Fix missing despawn branch for heart containers
 (#4350)

---
 .../game-interactor/GameInteractor.h          |  3 +++
 .../Enhancements/randomizer/hook_handlers.cpp | 21 ++++++++++---------
 .../actors/ovl_Item_B_Heart/z_item_b_heart.c  |  3 ++-
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h
index f6db2e950..ce5a18b6e 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h
@@ -141,6 +141,9 @@ typedef enum {
     // Opt: *EnItem00
     // Vanilla condition: Flags_GetCollectible(play, this->collectibleFlag)
     VB_ITEM00_DESPAWN,
+    // Opt: *ItemBHeart
+    // Vanilla condition: Flags_GetCollectible(play, 0x1F)
+    VB_ITEM_B_HEART_DESPAWN,
     // Opt: *EnTk
     // Vanilla condition: gSaveContext.dayTime <= 0xC000 || gSaveContext.dayTime >= 0xE000 || LINK_IS_ADULT || play->sceneNum != SCENE_GRAVEYARD
     VB_DAMPE_IN_GRAVEYARD_DESPAWN,
diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index 35f9df9f6..552758443 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -689,6 +689,17 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             }
             break;
         }
+        case VB_ITEM_B_HEART_DESPAWN: {
+            ItemBHeart* itemBHeart = static_cast<ItemBHeart*>(optionalArg);
+            RandomizerCheck rc = OTRGlobals::Instance->gRandomizer->GetCheckFromActor(itemBHeart->actor.id, gPlayState->sceneNum, itemBHeart->actor.params);
+            if (rc != RC_UNKNOWN_CHECK) {
+                itemBHeart->sohItemEntry = Rando::Context::GetInstance()->GetFinalGIEntry(rc, true, (GetItemID)Rando::StaticData::GetLocation(rc)->GetVanillaItem());
+                itemBHeart->actor.draw = (ActorFunc)ItemBHeart_DrawRandomizedItem;
+                itemBHeart->actor.update = (ActorFunc)ItemBHeart_UpdateRandomizedItem;
+                *should = Rando::Context::GetInstance()->GetItemLocation(rc)->HasObtained();
+            }
+            break;
+        }
         case VB_MALON_ALREADY_TAUGHT_EPONAS_SONG: {
             *should = Flags_GetRandomizerInf(RAND_INF_LEARNED_EPONA_SONG);
             break;
@@ -1348,16 +1359,6 @@ void RandomizerOnActorInitHandler(void* actorRef) {
         }
     }
 
-    if (actor->id == ACTOR_ITEM_B_HEART) {
-        ItemBHeart* itemBHeart = static_cast<ItemBHeart*>(actorRef);
-        RandomizerCheck rc = OTRGlobals::Instance->gRandomizer->GetCheckFromActor(itemBHeart->actor.id, gPlayState->sceneNum, itemBHeart->actor.params);
-        if (rc != RC_UNKNOWN_CHECK) {
-            itemBHeart->sohItemEntry = Rando::Context::GetInstance()->GetFinalGIEntry(rc, true, (GetItemID)Rando::StaticData::GetLocation(rc)->GetVanillaItem());
-            itemBHeart->actor.draw = (ActorFunc)ItemBHeart_DrawRandomizedItem;
-            itemBHeart->actor.update = (ActorFunc)ItemBHeart_UpdateRandomizedItem;
-        }
-    }
-
     if (actor->id == ACTOR_EN_DNS) {
         EnDns* enDns = static_cast<EnDns*>(actorRef);
         s16 respawnData = gSaveContext.respawn[RESPAWN_MODE_RETURN].data & ((1 << 8) - 1);
diff --git a/soh/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c b/soh/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c
index 5015a3908..85a81af85 100644
--- a/soh/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c
+++ b/soh/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c
@@ -6,6 +6,7 @@
 
 #include "z_item_b_heart.h"
 #include "objects/object_gi_hearts/object_gi_hearts.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS 0
 
@@ -39,7 +40,7 @@ static InitChainEntry sInitChain[] = {
 void ItemBHeart_Init(Actor* thisx, PlayState* play) {
     ItemBHeart* this = (ItemBHeart*)thisx;
 
-    if (Flags_GetCollectible(play, 0x1F)) {
+    if (GameInteractor_Should(VB_ITEM_B_HEART_DESPAWN, Flags_GetCollectible(play, 0x1F), this)) {
         Actor_Kill(&this->actor);
     } else {
         Actor_ProcessInitChain(&this->actor, sInitChain);

From fca8081a20b7262b9a8b35ce2978feeb033e8144 Mon Sep 17 00:00:00 2001
From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Date: Sat, 21 Sep 2024 06:56:32 +0100
Subject: [PATCH 202/230] Fix crash when preset amount is too high (#4359)

---
 soh/soh/Enhancements/presets.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/soh/soh/Enhancements/presets.cpp b/soh/soh/Enhancements/presets.cpp
index 57bfd689c..0a2582c4a 100644
--- a/soh/soh/Enhancements/presets.cpp
+++ b/soh/soh/Enhancements/presets.cpp
@@ -42,7 +42,10 @@ void applyPreset(std::vector<PresetEntry> entries) {
 void DrawPresetSelector(PresetType presetTypeId) {
     const std::string presetTypeCvar = CVAR_GENERAL("SelectedPresets.") + std::to_string(presetTypeId);
     const PresetTypeDefinition presetTypeDef = presetTypes.at(presetTypeId);
-    const uint16_t selectedPresetId = CVarGetInteger(presetTypeCvar.c_str(), 0);
+    uint16_t selectedPresetId = CVarGetInteger(presetTypeCvar.c_str(), 0);
+    if(selectedPresetId >= presetTypeDef.presets.size()){
+        selectedPresetId = 0;
+    }
     const PresetDefinition selectedPresetDef = presetTypeDef.presets.at(selectedPresetId);
     std::string comboboxTooltip = "";
     for ( auto iter = presetTypeDef.presets.begin(); iter != presetTypeDef.presets.end(); ++iter ) {

From 0a84d15d9dc6f30f135f4c7745c340ebcf46243d Mon Sep 17 00:00:00 2001
From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Date: Sun, 22 Sep 2024 01:03:48 +0100
Subject: [PATCH 203/230] Implement some basic benchmarking for seed generation
 (#4353)

* messy first implementation, pushing for verification

* push to test other platforms, add benchmark preset

* more other compiler fixes

* Finish implementing benchmarks

* forgot to reset the timers each run

* do it better

* move timers to thier own file

* forgot to add files
---
 .../debugger/performanceTimer.cpp             |  19 +++
 .../Enhancements/debugger/performanceTimer.h  |  38 ++++++
 soh/soh/Enhancements/presets.h                | 122 ++++++++++++++++++
 .../Enhancements/randomizer/3drando/fill.cpp  |  39 +++++-
 .../randomizer/3drando/location_access.cpp    |   7 +-
 .../Enhancements/randomizer/3drando/menu.cpp  |  26 ++++
 .../randomizer/3drando/playthrough.cpp        |   5 +
 soh/soh/Enhancements/randomizer/context.cpp   |   1 +
 soh/soh/Enhancements/randomizer/context.h     |   1 +
 soh/soh/Enhancements/randomizer/entrance.cpp  |  28 ++--
 soh/soh/Enhancements/randomizer/logic.cpp     |   6 +
 11 files changed, 278 insertions(+), 14 deletions(-)
 create mode 100644 soh/soh/Enhancements/debugger/performanceTimer.cpp
 create mode 100644 soh/soh/Enhancements/debugger/performanceTimer.h

diff --git a/soh/soh/Enhancements/debugger/performanceTimer.cpp b/soh/soh/Enhancements/debugger/performanceTimer.cpp
new file mode 100644
index 000000000..f52a8efac
--- /dev/null
+++ b/soh/soh/Enhancements/debugger/performanceTimer.cpp
@@ -0,0 +1,19 @@
+#pragma once
+
+#include "performanceTimer.h"
+
+void StartPerformanceTimer(TimerID timer){
+    timeStarted[timer] = std::chrono::high_resolution_clock::now();
+}
+
+void StopPerformanceTimer(TimerID timer){
+    totalTimes[timer] += (std::chrono::high_resolution_clock::now() - timeStarted[timer]);
+}
+
+std::chrono::duration<double, std::milli> GetPerformanceTimer(TimerID timer){
+    return totalTimes[timer];
+}
+
+void ResetPerformanceTimers(){
+    totalTimes = {};
+}
\ No newline at end of file
diff --git a/soh/soh/Enhancements/debugger/performanceTimer.h b/soh/soh/Enhancements/debugger/performanceTimer.h
new file mode 100644
index 000000000..ed7626326
--- /dev/null
+++ b/soh/soh/Enhancements/debugger/performanceTimer.h
@@ -0,0 +1,38 @@
+#pragma once
+
+#include <vector>
+#include <array>
+#include <chrono>
+
+typedef enum {
+  PT_WHOLE_SEED,
+  PT_LOGIC_RESET,
+  PT_AREA_RESET,
+  PT_UPDATE_HELPERS,
+  PT_SPOILER_LOG,
+  PT_ENTRANCE_SHUFFLE,
+  PT_SHOPSANITY,
+  PT_OWN_DUNGEON,
+  PT_LIMITED_CHECKS,
+  PT_ADVANCEMENT_ITEMS,
+  PT_REMAINING_ITEMS,
+  PT_PLAYTHROUGH_GENERATION,
+  PT_PARE_DOWN_PLAYTHROUGH,
+  PT_WOTH,
+  PT_FOOLISH,
+  PT_OVERRIDES,
+  PT_HINTS,
+  PT_EVENT_ACCESS,
+  PT_TOD_ACCESS,
+  PT_ENTRANCE_LOGIC,
+  PT_LOCATION_LOGIC,
+  PT_MAX
+} TimerID;
+
+void StartPerformanceTimer(TimerID timer);
+void StopPerformanceTimer(TimerID timer);
+std::chrono::duration<double, std::milli> GetPerformanceTimer(TimerID timer);
+void ResetPerformanceTimers();
+static std::array<std::chrono::duration<double, std::milli>, PT_MAX> totalTimes = {};
+static std::array<std::chrono::high_resolution_clock::time_point, PT_MAX> timeStarted = {};
+
diff --git a/soh/soh/Enhancements/presets.h b/soh/soh/Enhancements/presets.h
index 39cd167c2..5a4b2443c 100644
--- a/soh/soh/Enhancements/presets.h
+++ b/soh/soh/Enhancements/presets.h
@@ -34,6 +34,7 @@ enum RandomizerPreset {
     RANDOMIZER_PRESET_SPOCK_RACE_NO_LOGIC,
     RANDOMIZER_PRESET_S6,
     RANDOMIZER_PRESET_HELL_MODE,
+    RANDOMIZER_PRESET_BENCHMARK,
 };
 
 typedef struct PresetEntry {
@@ -1147,6 +1148,122 @@ const std::vector<PresetEntry> hellModePresetEntries = {
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ZorasFountain"), 2),
 };
 
+const std::vector<PresetEntry> BenchmarkPresetEntries = {
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("Forest"), RO_FOREST_CLOSED_DEKU),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("KakarikoGate"), RO_KAK_GATE_OPEN),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("DoorOfTime"), RO_DOOROFTIME_SONGONLY),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ZorasFountain"), RO_ZF_CLOSED),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("GerudoFortress"), RO_GF_NORMAL),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("RainbowBridge"), RO_BRIDGE_DUNGEON_REWARDS),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("RewardCount"), 5),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("BridgeRewardOptions"), RO_BRIDGE_GREG_REWARD),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("GanonTrial"), RO_GANONS_TRIALS_SET_NUMBER),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("GanonTrialCount"), 6),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingAge"), RO_AGE_RANDOM),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleDungeonsEntrances"), RO_DUNGEON_ENTRANCE_SHUFFLE_ON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleBossEntrances"), RO_BOSS_ROOM_ENTRANCE_SHUFFLE_FULL),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleOverworldEntrances"), RO_GENERIC_OFF),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleInteriorsEntrances"), RO_INTERIOR_ENTRANCE_SHUFFLE_OFF),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleGrottosEntrances"), RO_GENERIC_ON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleWarpSongs"), RO_GENERIC_ON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleOverworldSpawns"), RO_GENERIC_ON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("MixedEntrances"), RO_GENERIC_OFF),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("DecoupleEntrances"), RO_GENERIC_OFF),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("BombchusInLogic"), RO_GENERIC_ON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("EnableBombchuDrops"), RO_GENERIC_ON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("TriforceHunt"), RO_GENERIC_OFF),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("MQDungeons"), RO_MQ_DUNGEONS_RANDOM_NUMBER),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("MQDungeonsSelection"), RO_GENERIC_OFF),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleDungeonReward"), RO_DUNGEON_REWARDS_END_OF_DUNGEON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("LinksPocket"), RO_LINKS_POCKET_DUNGEON_REWARD),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleSongs"), RO_SONG_SHUFFLE_ANYWHERE),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("Shopsanity"), RO_SHOPSANITY_FOUR_ITEMS),
+    //RANDOTODO add refactored price/scrub/merchant settings
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleTokens"), RO_TOKENSANITY_OFF),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleBeehives"), RO_GENERIC_ON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleCows"), RO_GENERIC_ON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleKokiriSword"), RO_GENERIC_ON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleMasterSword"), RO_GENERIC_ON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleChildWallet"), RO_GENERIC_ON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleOcarinas"), RO_GENERIC_ON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleOcarinaButtons"), RO_GENERIC_OFF),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleSwim"), RO_GENERIC_ON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleGerudoToken"), RO_GENERIC_ON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleFrogSongRupees"), RO_GENERIC_ON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleAdultTrade"), RO_GENERIC_ON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("Shuffle100GSReward"), RO_GENERIC_OFF),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleBossSouls"), RO_BOSS_SOULS_OFF),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleDekuStickBag"), RO_GENERIC_ON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleDekuNutBag"), RO_GENERIC_ON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("Fishsanity"), RO_FISHSANITY_BOTH),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("FishsanityAgeSplit"), RO_GENERIC_OFF),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingMapsCompasses"), RO_DUNGEON_ITEM_LOC_OWN_DUNGEON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("GerudoKeys"), RO_GERUDO_KEYS_ANYWHERE),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("BossKeysanity"), RO_DUNGEON_ITEM_LOC_OWN_DUNGEON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleGanonBossKey"), RO_GANON_BOSS_KEY_LACS_MEDALLIONS),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("LacsMedallionCount"), 6),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleKeyRings"), RO_KEYRINGS_OFF),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("SkipChildZelda"), RO_GENERIC_ON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("SkipEponaRace"), RO_GENERIC_ON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("SkipScarecrowsSong"), RO_GENERIC_ON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("BigPoeTargetCount"), 1),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("CuccosToReturn"), 4),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("CompleteMaskQuest"), RO_GENERIC_ON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("GossipStoneHints"), RO_GOSSIP_STONES_NEED_NOTHING),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("HintClarity"), RO_HINT_CLARITY_CLEAR),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("HintDistribution"), RO_HINT_DIST_STRONG),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("AltarHint"), RO_GENERIC_ON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("GanondorfHint"), RO_GENERIC_ON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("SheikLAHint"), RO_GENERIC_ON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("DampeHint"), RO_GENERIC_OFF),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("GregHint"), RO_GENERIC_ON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("SariaHint"), RO_GENERIC_OFF),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("FrogsHint"), RO_GENERIC_ON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("OoTHint"), RO_GENERIC_ON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("BiggoronHint"), RO_GENERIC_ON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("BigPoesHint"), RO_GENERIC_OFF),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ChickensHint"), RO_GENERIC_ON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("MalonHint"), RO_GENERIC_ON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("HBAHint"), RO_GENERIC_OFF),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("WarpSongText"), RO_GENERIC_ON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ScrubText"), RO_GENERIC_ON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("10GSHint"), RO_GENERIC_ON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("20GSHint"), RO_GENERIC_ON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("30GSHint"), RO_GENERIC_ON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("40GSHint"), RO_GENERIC_ON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("50GSHint"), RO_GENERIC_ON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("MaskShopHint"), RO_GENERIC_ON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("BlueFireArrows"), RO_GENERIC_ON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("SunlightArrows"), RO_GENERIC_ON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("InfiniteUpgrades"), RO_INF_UPGRADES_PROGRESSIVE),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("SkeletonKey"), RO_GENERIC_OFF),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ItemPool"), RO_ITEM_POOL_BALANCED),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("IceTraps"), RO_ICE_TRAPS_NORMAL),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingOcarina"), RO_STARTING_OCARINA_FAIRY),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingDekuShield"), RO_GENERIC_ON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingKokiriSword"), RO_GENERIC_OFF),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingMasterSword"), RO_GENERIC_OFF),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingConsumables"), RO_GENERIC_ON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("FullWallets"), RO_GENERIC_ON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingZeldasLullaby"), RO_GENERIC_OFF),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingEponasSong"), RO_GENERIC_OFF),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingSariasSong"), RO_GENERIC_OFF),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingSunsSong"), RO_GENERIC_OFF),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingSongOfTime"), RO_GENERIC_OFF),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingSongOfStorms"), RO_GENERIC_OFF),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingMinuetOfForest"), RO_GENERIC_OFF),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingBoleroOfFire"), RO_GENERIC_OFF),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingSerenadeOfWater"), RO_GENERIC_OFF),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingRequiemOfSpirit"), RO_GENERIC_OFF),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingNocturneOfShadow"), RO_GENERIC_OFF),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingPreludeOfLight"), RO_GENERIC_OFF),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingSkulltulaToken"), 0),
+    PRESET_ENTRY_S32("gRandomizeStartingHearts", 2),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("LogicRules"), RO_LOGIC_GLITCHLESS),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("AllLocationsReachable"), RO_GENERIC_ON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("GsExpectSunsSong"), RO_GENERIC_ON),
+};
+
 typedef struct PresetDefinition {
     const char* label;
     const char* description;
@@ -1220,5 +1337,10 @@ const std::map<PresetType, PresetTypeDefinition> presetTypes = {
             "All settings maxed but still using glitchless logic. Expect pain.",
             hellModePresetEntries
         } },
+        { RANDOMIZER_PRESET_BENCHMARK, {
+            "Benchmark",
+            "Used for benchmarking the logic.",
+            BenchmarkPresetEntries
+        } },
     } } }
 };
diff --git a/soh/soh/Enhancements/randomizer/3drando/fill.cpp b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
index 366fa1ed1..a1b56c3e3 100644
--- a/soh/soh/Enhancements/randomizer/3drando/fill.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
@@ -14,6 +14,7 @@
 #include "pool_functions.hpp"
 //#include "debug.hpp"
 #include "soh/Enhancements/randomizer/static_data.h"
+#include "../../debugger/performanceTimer.h"
 
 #include <vector>
 #include <list>
@@ -100,6 +101,7 @@ static void RemoveStartingItemsFromPool() {
 
 //This function will propagate Time of Day access through the entrance
 static bool UpdateToDAccess(Entrance* entrance, bool propagateTimeTravel) {
+  StartPerformanceTimer(PT_TOD_ACCESS);
 
   bool ageTimePropogated = false;
 
@@ -133,6 +135,7 @@ static bool UpdateToDAccess(Entrance* entrance, bool propagateTimeTravel) {
     AreaTable(RR_ROOT)->childNight = AreaTable(RR_TOT_BEYOND_DOOR_OF_TIME)->adultNight;
   }
 
+  StopPerformanceTimer(PT_TOD_ACCESS);
   return ageTimePropogated;
 }
 
@@ -360,6 +363,7 @@ void AddToPlaythrough(LocationAccess& locPair, GetAccessableLocationsStruct& gal
 // Adds the contents of a location to the current progression and optionally playthrough
 bool AddCheckToLogic(LocationAccess& locPair, GetAccessableLocationsStruct& gals, RandomizerGet ignore, bool stopOnBeatable, bool addToPlaythrough=false){
   auto ctx = Rando::Context::GetInstance();
+  StartPerformanceTimer(PT_LOCATION_LOGIC);
   RandomizerCheck loc = locPair.GetLocation();
   Rando::ItemLocation* location = ctx->GetItemLocation(loc);
   RandomizerGet locItem = location->GetPlacedRandomizerGet();
@@ -399,9 +403,11 @@ bool AddCheckToLogic(LocationAccess& locPair, GetAccessableLocationsStruct& gals
     }
     //All we care about is if the game is beatable, used to pare down playthrough
     if (location->GetPlacedRandomizerGet() == RG_TRIFORCE && stopOnBeatable) {
+      StopPerformanceTimer(PT_LOCATION_LOGIC);
       return true; //Return early for efficiency
     }
   }
+  StopPerformanceTimer(PT_LOCATION_LOGIC);
   return false;
 }
 
@@ -1149,6 +1155,7 @@ int Fill() {
 
     //Temporarily add shop items to the ItemPool so that entrance randomization
     //can validate the world using deku/hylian shields
+    StartPerformanceTimer(PT_ENTRANCE_SHUFFLE);
     AddElementsToPool(ItemPool, GetMinVanillaShopItems(32)); //assume worst case shopsanity 4
     if (ctx->GetOption(RSK_SHUFFLE_ENTRANCES)) {
       SPDLOG_INFO("Shuffling Entrances...");
@@ -1162,9 +1169,12 @@ int Fill() {
     SetAreas();
     //erase temporary shop items
     FilterAndEraseFromPool(ItemPool, [](const auto item) { return Rando::StaticData::RetrieveItem(item).GetItemType() == ITEMTYPE_SHOP; });
+    StopPerformanceTimer(PT_ENTRANCE_SHUFFLE);
 
     //ctx->showItemProgress = true;
     //Place shop items first, since a buy shield is needed to place a dungeon reward on Gohma due to access
+    
+    StartPerformanceTimer(PT_SHOPSANITY);
     NonShopItems = {};
     if (ctx->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_OFF)) {
       SPDLOG_INFO("Placing Vanilla Shop Items...");
@@ -1211,7 +1221,9 @@ int Fill() {
       //Place the shop items which will still be at shop locations
       AssumedFill(shopItems, shopLocations);
     }
+    StopPerformanceTimer(PT_SHOPSANITY);
 
+    StartPerformanceTimer(PT_OWN_DUNGEON);
     //Place dungeon rewards
     SPDLOG_INFO("Shuffling and Placing Dungeon Items...");
     RandomizeDungeonRewards();
@@ -1220,7 +1232,9 @@ int Fill() {
     for (auto dungeon : ctx->GetDungeons()->GetDungeonList()) {
       RandomizeOwnDungeon(dungeon);
     }
+    StopPerformanceTimer(PT_OWN_DUNGEON);
 
+    StartPerformanceTimer(PT_LIMITED_CHECKS);
     //Then Place songs if song shuffle is set to specific locations
     if (ctx->GetOption(RSK_SHUFFLE_SONGS).IsNot(RO_SONG_SHUFFLE_ANYWHERE)) {
 
@@ -1249,16 +1263,23 @@ int Fill() {
 
     //Then place Link's Pocket Item if it has to be an advancement item
     RandomizeLinksPocket();
+    StopPerformanceTimer(PT_LIMITED_CHECKS);
+
+
+    StartPerformanceTimer(PT_ADVANCEMENT_ITEMS);
     SPDLOG_INFO("Shuffling Advancement Items");
     //Then place the rest of the advancement items
     std::vector<RandomizerGet> remainingAdvancementItems =
         FilterAndEraseFromPool(ItemPool, [](const auto i) { return Rando::StaticData::RetrieveItem(i).IsAdvancement(); });
     AssumedFill(remainingAdvancementItems, ctx->allLocations, true);
+    StopPerformanceTimer(PT_ADVANCEMENT_ITEMS);
 
+    StartPerformanceTimer(PT_REMAINING_ITEMS);
     //Fast fill for the rest of the pool
     SPDLOG_INFO("Shuffling Remaining Items");
     std::vector<RandomizerGet> remainingPool = FilterAndEraseFromPool(ItemPool, [](const auto i) { return true; });
     FastFill(remainingPool, GetAllEmptyLocations(), false);
+    StopPerformanceTimer(PT_REMAINING_ITEMS);
 
     //Add default prices to scrubs
     for (size_t i = 0; i < Rando::StaticData::scrubLocations.size(); i++) {
@@ -1284,19 +1305,35 @@ int Fill() {
       }
     }
 
+    StartPerformanceTimer(PT_PLAYTHROUGH_GENERATION);
     GeneratePlaythrough();
+    StopPerformanceTimer(PT_PLAYTHROUGH_GENERATION);
     //Successful placement, produced beatable result
     if(ctx->playthroughBeatable && !placementFailure) {
+
       SPDLOG_INFO("Calculating Playthrough...");
+      StartPerformanceTimer(PT_PARE_DOWN_PLAYTHROUGH);
       PareDownPlaythrough();
+      StopPerformanceTimer(PT_PARE_DOWN_PLAYTHROUGH);
+
+      StartPerformanceTimer(PT_WOTH);
       CalculateWotH();
+      StopPerformanceTimer(PT_WOTH);
+
+      StartPerformanceTimer(PT_FOOLISH);
       CalculateBarren(); 
+      StopPerformanceTimer(PT_FOOLISH);
       SPDLOG_INFO("Calculating Playthrough Done");
+
+      StartPerformanceTimer(PT_OVERRIDES);
       ctx->CreateItemOverrides();
       ctx->GetEntranceShuffler()->CreateEntranceOverrides();
-      
+      StopPerformanceTimer(PT_OVERRIDES);
+
+      StartPerformanceTimer(PT_HINTS);
       CreateAllHints();
       CreateWarpSongTexts();
+      StopPerformanceTimer(PT_HINTS);
       return 1;
     }
     //Unsuccessful placement
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
index 851c26a48..97b31e130 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
@@ -7,6 +7,7 @@
 #include "spoiler_log.hpp"
 #include "../trial.h"
 #include "../entrance.h"
+#include "../../debugger/performanceTimer.h"
 
 #include <fstream>
 
@@ -91,6 +92,7 @@ Area::~Area() = default;
 
 bool Area::UpdateEvents(bool haveTimeAccess) {
   if (timePass && haveTimeAccess) {
+    StartPerformanceTimer(PT_TOD_ACCESS);
     if (Child()) {
       childDay = true;
       childNight = true;
@@ -103,11 +105,13 @@ bool Area::UpdateEvents(bool haveTimeAccess) {
       AreaTable(RR_ROOT)->adultDay = true;
       AreaTable(RR_ROOT)->adultNight = true;
     }
+    StopPerformanceTimer(PT_TOD_ACCESS);
   }
 
   bool eventsUpdated =  false;
-
+  StartPerformanceTimer(PT_EVENT_ACCESS);
   for (EventAccess& event : events) {
+    
     //If the event has already happened, there's no reason to check it
     if (event.GetEvent()) {
       continue;
@@ -121,6 +125,7 @@ bool Area::UpdateEvents(bool haveTimeAccess) {
           eventsUpdated = true;
     }
   }
+  StopPerformanceTimer(PT_EVENT_ACCESS);
   return eventsUpdated;
 }
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/menu.cpp b/soh/soh/Enhancements/randomizer/3drando/menu.cpp
index 76cf6f1bc..ef878f513 100644
--- a/soh/soh/Enhancements/randomizer/3drando/menu.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/menu.cpp
@@ -10,6 +10,7 @@
 #include "randomizer.hpp"
 #include "spoiler_log.hpp"
 #include "location_access.hpp"
+#include "../../debugger/performanceTimer.h"
 #include <spdlog/spdlog.h>
 #include "../../randomizer/randomizerTypes.h"
 #include <boost_custom/container_hash/hash_32.hpp>
@@ -24,6 +25,8 @@ Rando::Option* currentSetting;
 bool GenerateRandomizer(std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks,
     std::string seedInput) {
     const auto ctx = Rando::Context::GetInstance();
+    ResetPerformanceTimers();
+    StartPerformanceTimer(PT_WHOLE_SEED);
 
     srand(time(NULL));
     // if a blank seed was entered, make a random one
@@ -65,5 +68,28 @@ bool GenerateRandomizer(std::set<RandomizerCheck> excludedLocations, std::set<Ra
         }
         ctx->GetOption(RSK_KEYSANITY).RestoreDelayedOption();
     }
+
+    StopPerformanceTimer(PT_WHOLE_SEED);
+    SPDLOG_DEBUG("Full Seed Genration Time: {}ms", GetPerformanceTimer(PT_WHOLE_SEED).count());
+    SPDLOG_DEBUG("LogicReset time: {}ms", GetPerformanceTimer(PT_LOGIC_RESET).count());
+    SPDLOG_DEBUG("Area->Reset time: {}ms", GetPerformanceTimer(PT_AREA_RESET).count());
+    SPDLOG_DEBUG("Total Entrance Shuffle time: {}ms", GetPerformanceTimer(PT_ENTRANCE_SHUFFLE).count());
+    SPDLOG_DEBUG("Total Shopsanity time: {}ms", GetPerformanceTimer(PT_SHOPSANITY).count());
+    SPDLOG_DEBUG("Total Dungeon Specific Items time: {}ms", GetPerformanceTimer(PT_OWN_DUNGEON).count());
+    SPDLOG_DEBUG("Total Misc Limited Checks time: {}ms", GetPerformanceTimer(PT_LIMITED_CHECKS).count());
+    SPDLOG_DEBUG("Total Advancment Checks time: {}ms", GetPerformanceTimer(PT_ADVANCEMENT_ITEMS).count());
+    SPDLOG_DEBUG("Total Other Checks time: {}ms", GetPerformanceTimer(PT_REMAINING_ITEMS).count());
+    SPDLOG_DEBUG("Total Playthrough Generation time: {}ms", GetPerformanceTimer(PT_PLAYTHROUGH_GENERATION).count());
+    SPDLOG_DEBUG("Total PareDownPlaythrough time: {}ms", GetPerformanceTimer(PT_PARE_DOWN_PLAYTHROUGH).count());
+    SPDLOG_DEBUG("Total WotH generation time: {}ms", GetPerformanceTimer(PT_WOTH).count());
+    SPDLOG_DEBUG("Total Foolish generation time: {}ms", GetPerformanceTimer(PT_FOOLISH).count());
+    SPDLOG_DEBUG("Total Overrides time: {}ms", GetPerformanceTimer(PT_OVERRIDES).count());
+    SPDLOG_DEBUG("Total Hint Generation time: {}ms", GetPerformanceTimer(PT_HINTS).count());
+    SPDLOG_DEBUG("SpoilerLog writing time: {}ms", GetPerformanceTimer(PT_SPOILER_LOG).count());
+    SPDLOG_DEBUG("Total UpdateHelpers time: {}ms", GetPerformanceTimer(PT_UPDATE_HELPERS).count());
+    SPDLOG_DEBUG("Total Event Access Calculation time: {}ms", GetPerformanceTimer(PT_EVENT_ACCESS).count());
+    SPDLOG_DEBUG("Total ToD Access Calculation: {}ms", GetPerformanceTimer(PT_TOD_ACCESS).count());
+    SPDLOG_DEBUG("Total Entrance Logic Calculation time: {}ms", GetPerformanceTimer(PT_ENTRANCE_LOGIC).count());
+    SPDLOG_DEBUG("Total Check Logic Calculation time: {}ms", GetPerformanceTimer(PT_LOCATION_LOGIC).count());
     return true;
 }
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp b/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
index ef6561205..fc7d7d2e0 100644
--- a/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
@@ -11,6 +11,7 @@
 #include "variables.h"
 #include "soh/OTRGlobals.h"
 #include "../option.h"
+#include "../../debugger/performanceTimer.h"
 
 namespace Playthrough {
 
@@ -25,7 +26,9 @@ int Playthrough_Init(uint32_t seed, std::set<RandomizerCheck> excludedLocations,
     ctx->ItemReset();
     ctx->HintReset();
     ctx->GetLogic()->Reset();
+    StartPerformanceTimer(PT_AREA_RESET);
     Areas::AccessReset();
+    StopPerformanceTimer(PT_AREA_RESET);
 
     ctx->GetSettings()->FinalizeSettings(excludedLocations, enabledTricks);
     // once the settings have been finalized turn them into a string for hashing
@@ -71,11 +74,13 @@ int Playthrough_Init(uint32_t seed, std::set<RandomizerCheck> excludedLocations,
         //TODO: Handle different types of file output (i.e. Spoiler Log, Plando Template, Patch Files, Race Files, etc.)
         // write logs
         SPDLOG_INFO("Writing Spoiler Log...");
+        StartPerformanceTimer(PT_SPOILER_LOG);
         if (SpoilerLog_Write()) {
             SPDLOG_INFO("Writing Spoiler Log Done");
         } else {
             SPDLOG_ERROR("Writing Spoiler Log Failed");
         }
+        StopPerformanceTimer(PT_SPOILER_LOG);
 #ifdef ENABLE_DEBUG
         SPDLOG_INFO("Writing Placement Log...");
         if (PlacementLog_Write()) {
diff --git a/soh/soh/Enhancements/randomizer/context.cpp b/soh/soh/Enhancements/randomizer/context.cpp
index db348b32f..8f1ea557f 100644
--- a/soh/soh/Enhancements/randomizer/context.cpp
+++ b/soh/soh/Enhancements/randomizer/context.cpp
@@ -1221,4 +1221,5 @@ uint8_t Context::GetAmmo(uint32_t item) {
 void Context::SetAmmo(uint32_t item, uint8_t count) {
     mSaveContext->inventory.ammo[gItemSlots[item]] = count;
 }
+
 } // namespace Rando
diff --git a/soh/soh/Enhancements/randomizer/context.h b/soh/soh/Enhancements/randomizer/context.h
index 13147143e..50800363c 100644
--- a/soh/soh/Enhancements/randomizer/context.h
+++ b/soh/soh/Enhancements/randomizer/context.h
@@ -123,6 +123,7 @@ class Context {
     void SetEventChkInf(int32_t flag, bool state);
     uint8_t GetAmmo(uint32_t item);
     void SetAmmo(uint32_t item, uint8_t count);
+    
 
   private:
     static std::weak_ptr<Context> mContext;
diff --git a/soh/soh/Enhancements/randomizer/entrance.cpp b/soh/soh/Enhancements/randomizer/entrance.cpp
index 16f362cb9..8610734b9 100644
--- a/soh/soh/Enhancements/randomizer/entrance.cpp
+++ b/soh/soh/Enhancements/randomizer/entrance.cpp
@@ -2,6 +2,7 @@
 
 #include "3drando/pool_functions.hpp"
 #include "3drando/item_pool.hpp"
+#include "../debugger/performanceTimer.h"
 
 #include <spdlog/spdlog.h>
 
@@ -70,21 +71,24 @@ void Entrance::printAgeTimeAccess() {
 }
 
 bool Entrance::ConditionsMet(bool allAgeTimes) const {
+  auto ctx = Rando::Context::GetInstance();
+  StartPerformanceTimer(PT_ENTRANCE_LOGIC);
+  Area* parent = AreaTable(parentRegion);
+  int conditionsMet = 0;
 
-    Area* parent = AreaTable(parentRegion);
-    int conditionsMet = 0;
+  if (allAgeTimes && !parent->AllAccess()) {
+      StopPerformanceTimer(PT_ENTRANCE_LOGIC);
+      return false;
+  }
 
-    if (allAgeTimes && !parent->AllAccess()) {
-        return false;
-    }
+  // check all possible day/night condition combinations
+  conditionsMet = (parent->childDay && CheckConditionAtAgeTime(logic->IsChild, logic->AtDay, allAgeTimes)) +
+                  (parent->childNight && CheckConditionAtAgeTime(logic->IsChild, logic->AtNight, allAgeTimes)) +
+                  (parent->adultDay && CheckConditionAtAgeTime(logic->IsAdult, logic->AtDay, allAgeTimes)) +
+                  (parent->adultNight && CheckConditionAtAgeTime(logic->IsAdult, logic->AtNight, allAgeTimes));
 
-    // check all possible day/night condition combinations
-    conditionsMet = (parent->childDay && CheckConditionAtAgeTime(logic->IsChild, logic->AtDay, allAgeTimes)) +
-                    (parent->childNight && CheckConditionAtAgeTime(logic->IsChild, logic->AtNight, allAgeTimes)) +
-                    (parent->adultDay && CheckConditionAtAgeTime(logic->IsAdult, logic->AtDay, allAgeTimes)) +
-                    (parent->adultNight && CheckConditionAtAgeTime(logic->IsAdult, logic->AtNight, allAgeTimes));
-
-    return conditionsMet && (!allAgeTimes || conditionsMet == 4);
+  StopPerformanceTimer(PT_ENTRANCE_LOGIC);
+  return conditionsMet && (!allAgeTimes || conditionsMet == 4);
 }
 
 uint32_t Entrance::Getuint32_t() const {
diff --git a/soh/soh/Enhancements/randomizer/logic.cpp b/soh/soh/Enhancements/randomizer/logic.cpp
index 231799baf..ba8311832 100644
--- a/soh/soh/Enhancements/randomizer/logic.cpp
+++ b/soh/soh/Enhancements/randomizer/logic.cpp
@@ -1,4 +1,5 @@
 #include "logic.h"
+#include "../debugger/performanceTimer.h"
 
 #include <algorithm>
 #include <cstdio>
@@ -455,6 +456,7 @@ namespace Rando {
 
     // Updates all logic helpers. Should be called whenever a non-helper is changed
     void Logic::UpdateHelpers() {
+        StartPerformanceTimer(PT_UPDATE_HELPERS);
         OcarinaButtons  =  (HasItem(RG_OCARINA_A_BUTTON) ? 1 : 0) +
                            (HasItem(RG_OCARINA_C_LEFT_BUTTON) ? 1 : 0) +
                            (HasItem(RG_OCARINA_C_RIGHT_BUTTON) ? 1 : 0) +
@@ -659,6 +661,7 @@ namespace Rando {
                             (ctx->GetSettings()->LACSCondition() == RO_LACS_DUNGEONS   && DungeonCount + (Greg && GregInLacsLogic ? 1 : 0) >= ctx->GetOption(RSK_LACS_DUNGEON_COUNT).Value<uint8_t>())                ||
                             (ctx->GetSettings()->LACSCondition() == RO_LACS_TOKENS     && GoldSkulltulaTokens >= ctx->GetOption(RSK_LACS_TOKEN_COUNT).Value<uint8_t>());
         CanCompleteTriforce = TriforcePieces >= ctx->GetOption(RSK_TRIFORCE_HUNT_PIECES_REQUIRED).Value<uint8_t>();
+        StopPerformanceTimer(PT_UPDATE_HELPERS);
     }
 
     bool Logic::SmallKeys(RandomizerRegion dungeon, uint8_t requiredAmount) {
@@ -776,6 +779,7 @@ namespace Rando {
 
     void Logic::Reset() {
         ctx->NewSaveContext();
+        StartPerformanceTimer(PT_LOGIC_RESET);
         memset(inLogic, false, sizeof(inLogic));
         //Settings-dependent variables
         IsKeysanity = ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_ANYWHERE) || 
@@ -1116,5 +1120,7 @@ namespace Rando {
         LightTrialClearPast      = false;
         BuyDekuShieldPast        = false;
         TimeTravelPast           = false;
+
+        StopPerformanceTimer(PT_LOGIC_RESET);
     }
 }

From 0f022011082c953c2ecab0a4c07e393c76b9a0d1 Mon Sep 17 00:00:00 2001
From: Malkierian <malkierian@gmail.com>
Date: Mon, 23 Sep 2024 17:10:29 -0700
Subject: [PATCH 204/230] SCL Consolidation, Area -> Region (#4356)

* Move all `SaveContext` operations to `Logic` to prepare for encapsulation.

* Rename `Area` to `Region`, `areaTable` to `regionTable`, and all local variables named variants of area to region that were of the `RandomizerRegion` or `Region` types.

* Fix mistaken renames.

* Rename PT_AREA_RESET to PT_REGION_RESET after rebasing on performance timer commit.
Change include path for the timer to absolute rather than relative.
---
 .../Enhancements/debugger/performanceTimer.h  |   2 +-
 .../Enhancements/randomizer/3drando/fill.cpp  |  82 +-
 .../randomizer/3drando/location_access.cpp    | 210 ++--
 .../randomizer/3drando/location_access.hpp    |  66 +-
 .../locacc_bottom_of_the_well.cpp             |  10 +-
 .../location_access/locacc_castle_town.cpp    |  54 +-
 .../location_access/locacc_death_mountain.cpp |  46 +-
 .../location_access/locacc_deku_tree.cpp      |  48 +-
 .../locacc_dodongos_cavern.cpp                |  62 +-
 .../location_access/locacc_fire_temple.cpp    |  90 +-
 .../location_access/locacc_forest_temple.cpp  |  84 +-
 .../location_access/locacc_ganons_castle.cpp  |  38 +-
 .../locacc_gerudo_training_grounds.cpp        |  36 +-
 .../location_access/locacc_gerudo_valley.cpp  |  40 +-
 .../location_access/locacc_hyrule_field.cpp   |  42 +-
 .../location_access/locacc_ice_cavern.cpp     |  16 +-
 .../locacc_jabujabus_belly.cpp                |  50 +-
 .../location_access/locacc_kakariko.cpp       |  54 +-
 .../location_access/locacc_lost_woods.cpp     |  46 +-
 .../location_access/locacc_shadow_temple.cpp  |  34 +-
 .../location_access/locacc_spirit_temple.cpp  |  44 +-
 .../location_access/locacc_water_temple.cpp   |  72 +-
 .../location_access/locacc_zoras_domain.cpp   |  26 +-
 .../Enhancements/randomizer/3drando/menu.cpp  |   4 +-
 .../randomizer/3drando/playthrough.cpp        |   8 +-
 .../randomizer/3drando/spoiler_log.cpp        |   2 +-
 soh/soh/Enhancements/randomizer/context.cpp   | 776 ---------------
 soh/soh/Enhancements/randomizer/context.h     |  34 -
 soh/soh/Enhancements/randomizer/entrance.cpp  |  46 +-
 soh/soh/Enhancements/randomizer/entrance.h    |   4 +-
 soh/soh/Enhancements/randomizer/item.cpp      |  36 +-
 soh/soh/Enhancements/randomizer/logic.cpp     | 914 ++++++++++++++++--
 soh/soh/Enhancements/randomizer/logic.h       |  33 +-
 .../randomizer/randomizer_check_tracker.cpp   |   2 +-
 soh/soh/SaveManager.cpp                       |   2 +-
 35 files changed, 1554 insertions(+), 1559 deletions(-)

diff --git a/soh/soh/Enhancements/debugger/performanceTimer.h b/soh/soh/Enhancements/debugger/performanceTimer.h
index ed7626326..842bd91c6 100644
--- a/soh/soh/Enhancements/debugger/performanceTimer.h
+++ b/soh/soh/Enhancements/debugger/performanceTimer.h
@@ -7,7 +7,7 @@
 typedef enum {
   PT_WHOLE_SEED,
   PT_LOGIC_RESET,
-  PT_AREA_RESET,
+  PT_REGION_RESET,
   PT_UPDATE_HELPERS,
   PT_SPOILER_LOG,
   PT_ENTRANCE_SHUFFLE,
diff --git a/soh/soh/Enhancements/randomizer/3drando/fill.cpp b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
index a1b56c3e3..2a6f3ed08 100644
--- a/soh/soh/Enhancements/randomizer/3drando/fill.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
@@ -14,7 +14,7 @@
 #include "pool_functions.hpp"
 //#include "debug.hpp"
 #include "soh/Enhancements/randomizer/static_data.h"
-#include "../../debugger/performanceTimer.h"
+#include "soh/Enhancements/debugger/performanceTimer.h"
 
 #include <vector>
 #include <list>
@@ -106,8 +106,8 @@ static bool UpdateToDAccess(Entrance* entrance, bool propagateTimeTravel) {
   bool ageTimePropogated = false;
 
   //propagate childDay, childNight, adultDay, and adultNight separately
-  Area* parent = entrance->GetParentRegion();
-  Area* connection = entrance->GetConnectedRegion();
+  Region* parent = entrance->GetParentRegion();
+  Region* connection = entrance->GetConnectedRegion();
 
   if (!connection->childDay && parent->childDay && entrance->CheckConditionAtAgeTime(logic->IsChild, logic->AtDay)) {
     connection->childDay = true;
@@ -127,12 +127,12 @@ static bool UpdateToDAccess(Entrance* entrance, bool propagateTimeTravel) {
   }
 
   //special check for temple of time
-  if (propagateTimeTravel && !AreaTable(RR_ROOT)->Adult() && AreaTable(RR_TOT_BEYOND_DOOR_OF_TIME)->Child()) { //RANDOTODO: sphere weirdness, other age locations not propagated in this sphere
-    AreaTable(RR_ROOT)->adultDay   = AreaTable(RR_TOT_BEYOND_DOOR_OF_TIME)->childDay;
-    AreaTable(RR_ROOT)->adultNight = AreaTable(RR_TOT_BEYOND_DOOR_OF_TIME)->childNight;
-  } else if (propagateTimeTravel && !AreaTable(RR_ROOT)->Child() && AreaTable(RR_TOT_BEYOND_DOOR_OF_TIME)->Adult()){
-    AreaTable(RR_ROOT)->childDay   = AreaTable(RR_TOT_BEYOND_DOOR_OF_TIME)->adultDay;
-    AreaTable(RR_ROOT)->childNight = AreaTable(RR_TOT_BEYOND_DOOR_OF_TIME)->adultNight;
+  if (propagateTimeTravel && !RegionTable(RR_ROOT)->Adult() && RegionTable(RR_TOT_BEYOND_DOOR_OF_TIME)->Child()) { //RANDOTODO: sphere weirdness, other age locations not propagated in this sphere
+    RegionTable(RR_ROOT)->adultDay   = RegionTable(RR_TOT_BEYOND_DOOR_OF_TIME)->childDay;
+    RegionTable(RR_ROOT)->adultNight = RegionTable(RR_TOT_BEYOND_DOOR_OF_TIME)->childNight;
+  } else if (propagateTimeTravel && !RegionTable(RR_ROOT)->Child() && RegionTable(RR_TOT_BEYOND_DOOR_OF_TIME)->Adult()){
+    RegionTable(RR_ROOT)->childDay   = RegionTable(RR_TOT_BEYOND_DOOR_OF_TIME)->adultDay;
+    RegionTable(RR_ROOT)->childNight = RegionTable(RR_TOT_BEYOND_DOOR_OF_TIME)->adultNight;
   }
 
   StopPerformanceTimer(PT_TOD_ACCESS);
@@ -143,17 +143,17 @@ static bool UpdateToDAccess(Entrance* entrance, bool propagateTimeTravel) {
 static void ValidateOtherEntrance(GetAccessableLocationsStruct& gals) {
   auto ctx = Rando::Context::GetInstance();
   // Condition for validating Temple of Time Access
-  if (!gals.foundTempleOfTime && ((ctx->GetSettings()->ResolvedStartingAge() == RO_AGE_CHILD && AreaTable(RR_TEMPLE_OF_TIME)->Adult()) || 
-                            (ctx->GetSettings()->ResolvedStartingAge() == RO_AGE_ADULT && AreaTable(RR_TEMPLE_OF_TIME)->Child()))) {
+  if (!gals.foundTempleOfTime && ((ctx->GetSettings()->ResolvedStartingAge() == RO_AGE_CHILD && RegionTable(RR_TEMPLE_OF_TIME)->Adult()) || 
+                            (ctx->GetSettings()->ResolvedStartingAge() == RO_AGE_ADULT && RegionTable(RR_TEMPLE_OF_TIME)->Child()))) {
     gals.foundTempleOfTime = true;
   }
   // Condition for validating a valid starting region
   if (!gals.validatedStartingRegion) {
-    bool childAccess = ctx->GetSettings()->ResolvedStartingAge() == RO_AGE_CHILD || AreaTable(RR_TOT_BEYOND_DOOR_OF_TIME)->Child();
-    bool adultAccess = ctx->GetSettings()->ResolvedStartingAge() == RO_AGE_ADULT || AreaTable(RR_TOT_BEYOND_DOOR_OF_TIME)->Adult();
+    bool childAccess = ctx->GetSettings()->ResolvedStartingAge() == RO_AGE_CHILD || RegionTable(RR_TOT_BEYOND_DOOR_OF_TIME)->Child();
+    bool adultAccess = ctx->GetSettings()->ResolvedStartingAge() == RO_AGE_ADULT || RegionTable(RR_TOT_BEYOND_DOOR_OF_TIME)->Adult();
 
-    Area* kokiri = AreaTable(RR_KOKIRI_FOREST);
-    Area* kakariko = AreaTable(RR_KAKARIKO_VILLAGE);
+    Region* kokiri = RegionTable(RR_KOKIRI_FOREST);
+    Region* kakariko = RegionTable(RR_KAKARIKO_VILLAGE);
 
     if ((childAccess && (kokiri->Child() || kakariko->Child())) ||// RANDOTODO when proper ammo logic is done, this could probably be made optional
         (adultAccess && (kokiri->Adult() || kakariko->Adult()))) {
@@ -183,13 +183,13 @@ static void ValidateSphereZero(GetAccessableLocationsStruct& gals){
     // Reset access as the non-starting age
     if (ctx->GetSettings()->ResolvedStartingAge() == RO_AGE_CHILD) {
       for (RandomizerRegion regionKey : gals.regionPool) {
-        AreaTable(regionKey)->adultDay = false;
-        AreaTable(regionKey)->adultNight = false;
+        RegionTable(regionKey)->adultDay = false;
+        RegionTable(regionKey)->adultNight = false;
       }
     } else {
       for (RandomizerRegion regionKey : gals.regionPool) {
-        AreaTable(regionKey)->childDay = false;
-        AreaTable(regionKey)->childNight = false;
+        RegionTable(regionKey)->childDay = false;
+        RegionTable(regionKey)->childNight = false;
       }
     }
     gals.sphereZeroComplete = true;
@@ -210,9 +210,9 @@ void ProcessExit(Entrance& exit, GetAccessableLocationsStruct& gals, bool propag
   }
 
   //If the exit is accessible and hasn't been added yet, add it to the pool
-  Area* exitArea = exit.GetConnectedRegion();
-  if (!exitArea->addedToPool && exit.ConditionsMet()) {
-    exitArea->addedToPool = true;
+  Region* exitRegion = exit.GetConnectedRegion();
+  if (!exitRegion->addedToPool && exit.ConditionsMet()) {
+    exitRegion->addedToPool = true;
     gals.regionPool.push_back(exit.GetConnectedRegionKey());
   }
 }
@@ -306,7 +306,7 @@ void ResetLogic(std::shared_ptr<Context>& ctx, bool applyInventory = false){
   if (applyInventory){
     ApplyStartingInventory();
   }
-  Areas::AccessReset();
+  Regions::AccessReset();
   ctx->LocationReset();
 } 
 
@@ -419,7 +419,7 @@ std::vector<RandomizerCheck> ReachabilitySearch(const std::vector<RandomizerChec
   while (gals.newItemLocations.size() > 0 || gals.updatedEvents || gals.ageTimePropogated || gals.firstIteration) {
     gals.InitLoop();
     for (size_t i = 0; i < gals.regionPool.size(); i++) {
-      Area* region = AreaTable(gals.regionPool[i]);
+      Region* region = RegionTable(gals.regionPool[i]);
 
       if (region->UpdateEvents()){
         gals.updatedEvents = true;
@@ -454,7 +454,7 @@ void GeneratePlaythrough() {
   while (gals.newItemLocations.size() > 0 || gals.updatedEvents || gals.ageTimePropogated || gals.firstIteration) {
     gals.InitLoop();
     for (size_t i = 0; i < gals.regionPool.size(); i++) {
-      Area* region = AreaTable(gals.regionPool[i]);
+      Region* region = RegionTable(gals.regionPool[i]);
 
       if (region->UpdateEvents()){
         gals.updatedEvents = true;
@@ -496,7 +496,7 @@ bool CheckBeatable(RandomizerGet ignore /* = RG_NONE*/) {
   while (gals.newItemLocations.size() > 0 || gals.updatedEvents || gals.ageTimePropogated || gals.firstIteration) {
     gals.InitLoop();
     for (size_t i = 0; i < gals.regionPool.size(); i++) {
-      Area* region = AreaTable(gals.regionPool[i]);
+      Region* region = RegionTable(gals.regionPool[i]);
 
       if (region->UpdateEvents()){
         gals.updatedEvents = true;
@@ -541,26 +541,26 @@ void ValidateEntrances(bool checkPoeCollectorAccess, bool checkOtherEntranceAcce
     //if we assume valid sphere zero, we only want starting age access
     if (ctx->GetSettings()->ResolvedStartingAge() == RO_AGE_CHILD) {
       for (RandomizerRegion regionKey : gals.regionPool) {
-        AreaTable(RR_ROOT)->childNight = true;
-        AreaTable(RR_ROOT)->childDay = true;
+        RegionTable(RR_ROOT)->childNight = true;
+        RegionTable(RR_ROOT)->childDay = true;
       }
     } else {
       for (RandomizerRegion regionKey : gals.regionPool) {
-        AreaTable(RR_ROOT)->adultNight = true;
-        AreaTable(RR_ROOT)->adultDay = true;
+        RegionTable(RR_ROOT)->adultNight = true;
+        RegionTable(RR_ROOT)->adultDay = true;
       }
     }
   } else {
-    AreaTable(RR_ROOT)->childNight = true;
-    AreaTable(RR_ROOT)->adultNight = true;
-    AreaTable(RR_ROOT)->childDay = true;
-    AreaTable(RR_ROOT)->adultDay = true;
+    RegionTable(RR_ROOT)->childNight = true;
+    RegionTable(RR_ROOT)->adultNight = true;
+    RegionTable(RR_ROOT)->childDay = true;
+    RegionTable(RR_ROOT)->adultDay = true;
   }
 
   while (gals.newItemLocations.size() > 0 || gals.updatedEvents || gals.ageTimePropogated || gals.firstIteration) {
     gals.InitLoop();
     for (size_t i = 0; i < gals.regionPool.size(); i++) {
-      Area* region = AreaTable(gals.regionPool[i]);
+      Region* region = RegionTable(gals.regionPool[i]);
 
       if (region->UpdateEvents(gals.haveTimeAccess)){
         gals.updatedEvents = true;
@@ -620,7 +620,7 @@ void ValidateEntrances(bool checkPoeCollectorAccess, bool checkOtherEntranceAcce
   }
 }
 
-RandomizerArea LookForExternalArea(const Area* const currentRegion, std::vector<RandomizerRegion> &alreadyChecked){
+RandomizerArea LookForExternalArea(const Region* const currentRegion, std::vector<RandomizerRegion> &alreadyChecked){
   for (const auto& entrance : currentRegion->entrances) {
     RandomizerArea otherArea = entrance->GetParentRegion()->GetArea();
     const bool isAreaUnchecked = std::find(alreadyChecked.begin(), alreadyChecked.end(), entrance->GetParentRegionKey()) == alreadyChecked.end();
@@ -642,7 +642,7 @@ void SetAreas(){
   auto ctx = Rando::Context::GetInstance();
 //RANDOTODO give entrances an enum like RandomizerCheck, the give them all areas here, the use those areas to not need to recursivly find ItemLocation areas
   for (int regionType = 0; regionType < RR_MARKER_AREAS_END; regionType++) {
-    Area region = areaTable[regionType];
+    Region region = areaTable[regionType];
     RandomizerArea area = region.GetArea();
     if (area == RA_NONE) {
       std::vector<RandomizerRegion> alreadyChecked = {static_cast<RandomizerRegion>(regionType)};
@@ -839,7 +839,7 @@ static void AssumedFill(const std::vector<RandomizerGet>& items, const std::vect
                 SPDLOG_DEBUG(". TRYING AGAIN...\n");
 
 #ifdef ENABLE_DEBUG
-                Areas::DumpWorldGraph(Rando::StaticData::RetrieveItem(item).GetName().GetEnglish());
+                Regions::DumpWorldGraph(Rando::StaticData::RetrieveItem(item).GetName().GetEnglish());
                 PlacementLog_Write();
 #endif
 
@@ -1109,7 +1109,7 @@ static void RandomizeLinksPocket() {
 void VanillaFill() {
   auto ctx = Rando::Context::GetInstance();
   //Perform minimum needed initialization
-  AreaTable_Init();
+  RegionTable_Init();
   ctx->GenerateLocationPool();
   GenerateItemPool();
   GenerateStartingInventory();
@@ -1145,7 +1145,7 @@ int Fill() {
     //showItemProgress = false;
     ctx->playthroughLocations.clear();
     ctx->GetEntranceShuffler()->playthroughEntrances.clear();
-    AreaTable_Init(); //Reset the world graph to intialize the proper locations
+    RegionTable_Init(); //Reset the world graph to intialize the proper locations
     ctx->ItemReset(); //Reset shops incase of shopsanity random
     ctx->GenerateLocationPool();
     GenerateItemPool();
@@ -1339,7 +1339,7 @@ int Fill() {
     //Unsuccessful placement
     if(retries < 4) {
       SPDLOG_DEBUG("Failed to generate a beatable seed. Retrying...");
-      Areas::ResetAllLocations();
+      Regions::ResetAllLocations();
       logic->Reset();
       ClearProgress();
     }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
index 97b31e130..33ef7ccbd 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
@@ -7,7 +7,7 @@
 #include "spoiler_log.hpp"
 #include "../trial.h"
 #include "../entrance.h"
-#include "../../debugger/performanceTimer.h"
+#include "soh/Enhancements/debugger/performanceTimer.h"
 
 #include <fstream>
 
@@ -31,7 +31,7 @@ bool LocationAccess::CheckConditionAtAgeTime(bool& age, bool& time) const {
 
 bool LocationAccess::ConditionsMet() const {
 
-  Area* parentRegion = AreaTable(Rando::Context::GetInstance()->GetItemLocation(location)->GetParentRegionKey());
+  Region* parentRegion = RegionTable(Rando::Context::GetInstance()->GetItemLocation(location)->GetParentRegionKey());
   bool conditionsMet = false;
 
   if ((parentRegion->childDay   && CheckConditionAtAgeTime(logic->IsChild, logic->AtDay))   ||
@@ -74,8 +74,8 @@ bool LocationAccess::CanBuy() const {
   return SufficientWallet && OtherCondition;
 }
 
-Area::Area() = default;
-Area::Area(std::string regionName_, std::string scene_, RandomizerArea area,
+Region::Region() = default;
+Region::Region(std::string regionName_, std::string scene_, RandomizerArea area,
          bool timePass_,
          std::vector<EventAccess> events_,
          std::vector<LocationAccess> locations_,
@@ -88,22 +88,22 @@ Area::Area(std::string regionName_, std::string scene_, RandomizerArea area,
     locations(std::move(locations_)),
     exits(std::move(exits_)) {}
 
-Area::~Area() = default;
+Region::~Region() = default;
 
-bool Area::UpdateEvents(bool haveTimeAccess) {
+bool Region::UpdateEvents(bool haveTimeAccess) {
   if (timePass && haveTimeAccess) {
     StartPerformanceTimer(PT_TOD_ACCESS);
     if (Child()) {
       childDay = true;
       childNight = true;
-      AreaTable(RR_ROOT)->childDay = true;
-      AreaTable(RR_ROOT)->childNight = true;
+      RegionTable(RR_ROOT)->childDay = true;
+      RegionTable(RR_ROOT)->childNight = true;
     }
     if (Adult()) {
       adultDay = true;
       adultNight = true;
-      AreaTable(RR_ROOT)->adultDay = true;
-      AreaTable(RR_ROOT)->adultNight = true;
+      RegionTable(RR_ROOT)->adultDay = true;
+      RegionTable(RR_ROOT)->adultNight = true;
     }
     StopPerformanceTimer(PT_TOD_ACCESS);
   }
@@ -129,18 +129,18 @@ bool Area::UpdateEvents(bool haveTimeAccess) {
   return eventsUpdated;
 }
 
-void Area::AddExit(RandomizerRegion parentKey, RandomizerRegion newExitKey, ConditionFn condition) {
+void Region::AddExit(RandomizerRegion parentKey, RandomizerRegion newExitKey, ConditionFn condition) {
   Rando::Entrance newExit = Rando::Entrance(newExitKey, {condition});
   newExit.SetParentRegion(parentKey);
   exits.push_front(newExit);
 }
 
-//The exit will be completely removed from this area
-void Area::RemoveExit(Rando::Entrance* exitToRemove) {
+//The exit will be completely removed from this region
+void Region::RemoveExit(Rando::Entrance* exitToRemove) {
   exits.remove_if([exitToRemove](const auto exit){return &exit == exitToRemove;});
 }
 
-void Area::SetAsPrimary(RandomizerRegion exitToBePrimary) {
+void Region::SetAsPrimary(RandomizerRegion exitToBePrimary) {
   for (auto& exit : exits) {
     if (exit.Getuint32_t() == exitToBePrimary) {
       exit.SetAsPrimary();
@@ -149,22 +149,22 @@ void Area::SetAsPrimary(RandomizerRegion exitToBePrimary) {
   }
 }
 
-Rando::Entrance* Area::GetExit(RandomizerRegion exitToReturn) {
+Rando::Entrance* Region::GetExit(RandomizerRegion exitToReturn) {
   for (auto& exit : exits) {
     if (exit.Getuint32_t() == exitToReturn) {
       return &exit;
     }
   }
-  //auto message = "ERROR: EXIT " + AreaTable(exitToReturn)->regionName + " DOES NOT EXIST IN " + this->regionName;
+  //auto message = "ERROR: EXIT " + RegionTable(exitToReturn)->regionName + " DOES NOT EXIST IN " + this->regionName;
   //CitraPrint(message);
   return nullptr;
 }
 
-bool Area::CanPlantBeanCheck() const {
-    return Rando::Context::GetInstance()->GetAmmo(ITEM_BEAN) > 0 && BothAgesCheck();
+bool Region::CanPlantBeanCheck() const {
+    return Rando::Context::GetInstance()->GetLogic()->GetAmmo(ITEM_BEAN) > 0 && BothAgesCheck();
 }
 
-bool Area::AllAccountedFor() const {
+bool Region::AllAccountedFor() const {
   for (const EventAccess& event : events) {
     if (!event.GetEvent()) {
       return false;
@@ -186,7 +186,7 @@ bool Area::AllAccountedFor() const {
   return AllAccess();
 }
 
-bool Area::CheckAllAccess(const RandomizerRegion exitKey) {
+bool Region::CheckAllAccess(const RandomizerRegion exitKey) {
   if (!AllAccess()) {
     return false;
   }
@@ -202,7 +202,7 @@ bool Area::CheckAllAccess(const RandomizerRegion exitKey) {
   return false;
 }
 
-void Area::ResetVariables() {
+void Region::ResetVariables() {
   childDay = false;
   childNight = false;
   adultDay = false;
@@ -213,36 +213,36 @@ void Area::ResetVariables() {
   }
 }
 
-std::array<Area, RR_MAX> areaTable;
+std::array<Region, RR_MAX> areaTable;
 
-bool Here(const RandomizerRegion area, ConditionFn condition) {
-  return areaTable[area].HereCheck(condition);
+bool Here(const RandomizerRegion region, ConditionFn condition) {
+  return areaTable[region].HereCheck(condition);
 }
 
-bool CanPlantBean(const RandomizerRegion area) {
-  return areaTable[area].CanPlantBeanCheck();
+bool CanPlantBean(const RandomizerRegion region) {
+  return areaTable[region].CanPlantBeanCheck();
 }
 
-bool BothAges(const RandomizerRegion area) {
-  return areaTable[area].BothAgesCheck();
+bool BothAges(const RandomizerRegion region) {
+  return areaTable[region].BothAgesCheck();
 }
 
-bool ChildCanAccess(const RandomizerRegion area) {
-  return areaTable[area].Child();
+bool ChildCanAccess(const RandomizerRegion region) {
+  return areaTable[region].Child();
 }
 
-bool AdultCanAccess(const RandomizerRegion area) {
-  return areaTable[area].Adult();
+bool AdultCanAccess(const RandomizerRegion region) {
+  return areaTable[region].Adult();
 }
 
-bool HasAccessTo(const RandomizerRegion area) {
-  return areaTable[area].HasAccess();
+bool HasAccessTo(const RandomizerRegion region) {
+  return areaTable[region].HasAccess();
 }
 
 Rando::Context* randoCtx;
 std::shared_ptr<Rando::Logic> logic;
 
-void AreaTable_Init() {
+void RegionTable_Init() {
   using namespace Rando;
   randoCtx = Context::GetInstance().get();
   logic = randoCtx->GetLogic(); //RANDOTODO do not hardcode, instead allow accepting a Logic class somehow
@@ -254,10 +254,10 @@ void AreaTable_Init() {
   };
   //Clear the array from any previous playthrough attempts. This is important so that
   //locations which appear in both MQ and Vanilla dungeons don't get set in both areas.
-  areaTable.fill(Area("Invalid Area", "Invalid Area", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {}));
+  areaTable.fill(Region("Invalid Region", "Invalid Region", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {}));
 
                        //name, scene, hint text,                       events, locations, exits
-  areaTable[RR_ROOT] = Area("Root", "", RA_LINKS_POCKET, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_ROOT] = Region("Root", "", RA_LINKS_POCKET, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_LINKS_POCKET,       true),
                   LOCATION(RC_TRIFORCE_COMPLETED, logic->CanCompleteTriforce),
@@ -267,7 +267,7 @@ void AreaTable_Init() {
                   Entrance(RR_ROOT_EXITS, {[]{return true;}})
   });
 
-  areaTable[RR_ROOT_EXITS] = Area("Root Exits", "", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_ROOT_EXITS] = Region("Root Exits", "", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_CHILD_SPAWN,             {[]{return logic->IsChild;}}),
                   Entrance(RR_ADULT_SPAWN,             {[]{return logic->IsAdult;}}),
@@ -279,67 +279,67 @@ void AreaTable_Init() {
                   Entrance(RR_PRELUDE_OF_LIGHT_WARP,   {[]{return logic->CanUse(RG_PRELUDE_OF_LIGHT)   && logic->CanLeaveForest;}}),
   });
 
-  areaTable[RR_CHILD_SPAWN] = Area("Child Spawn", "", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_CHILD_SPAWN] = Region("Child Spawn", "", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_KF_LINKS_HOUSE, {[]{return true;}}),
   });
 
-  areaTable[RR_ADULT_SPAWN] = Area("Adult Spawn", "", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_ADULT_SPAWN] = Region("Adult Spawn", "", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_TEMPLE_OF_TIME, {[]{return true;}}),
   });
 
-  areaTable[RR_MINUET_OF_FOREST_WARP] = Area("Minuet of Forest Warp", "", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_MINUET_OF_FOREST_WARP] = Region("Minuet of Forest Warp", "", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_SACRED_FOREST_MEADOW, {[]{return true;}}),
   });
 
-  areaTable[RR_BOLERO_OF_FIRE_WARP] = Area("Bolero of Fire Warp", "", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_BOLERO_OF_FIRE_WARP] = Region("Bolero of Fire Warp", "", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DMC_CENTRAL_LOCAL, {[]{return true;}}),
   });
 
-  areaTable[RR_SERENADE_OF_WATER_WARP] = Area("Serenade of Water Warp", "", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_SERENADE_OF_WATER_WARP] = Region("Serenade of Water Warp", "", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_LAKE_HYLIA, {[]{return true;}}),
   });
 
-  areaTable[RR_REQUIEM_OF_SPIRIT_WARP] = Area("Requiem of Spirit Warp", "", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_REQUIEM_OF_SPIRIT_WARP] = Region("Requiem of Spirit Warp", "", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DESERT_COLOSSUS, {[]{return true;}}),
   });
 
-  areaTable[RR_NOCTURNE_OF_SHADOW_WARP] = Area("Nocturne of Shadow Warp", "", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_NOCTURNE_OF_SHADOW_WARP] = Region("Nocturne of Shadow Warp", "", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_GRAVEYARD_WARP_PAD_REGION, {[]{return true;}}),
   });
 
-  areaTable[RR_PRELUDE_OF_LIGHT_WARP] = Area("Prelude of Light Warp", "", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_PRELUDE_OF_LIGHT_WARP] = Region("Prelude of Light Warp", "", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_TEMPLE_OF_TIME, {[]{return true;}}),
   });
 
   // Overworld
-  AreaTable_Init_LostWoods();
-  AreaTable_Init_HyruleField();
-  AreaTable_Init_CastleTown();
-  AreaTable_Init_Kakariko();
-  AreaTable_Init_DeathMountain();
-  AreaTable_Init_ZorasDomain();
-  AreaTable_Init_GerudoValley();
+  RegionTable_Init_LostWoods();
+  RegionTable_Init_HyruleField();
+  RegionTable_Init_CastleTown();
+  RegionTable_Init_Kakariko();
+  RegionTable_Init_DeathMountain();
+  RegionTable_Init_ZorasDomain();
+  RegionTable_Init_GerudoValley();
   // Dungeons
-  AreaTable_Init_DekuTree();
-  AreaTable_Init_DodongosCavern();
-  AreaTable_Init_JabuJabusBelly();
-  AreaTable_Init_ForestTemple();
-  AreaTable_Init_FireTemple();
-  AreaTable_Init_WaterTemple();
-  AreaTable_Init_SpiritTemple();
-  AreaTable_Init_ShadowTemple();
-  AreaTable_Init_BottomOfTheWell();
-  AreaTable_Init_IceCavern();
-  AreaTable_Init_GerudoTrainingGrounds();
-  AreaTable_Init_GanonsCastle();
+  RegionTable_Init_DekuTree();
+  RegionTable_Init_DodongosCavern();
+  RegionTable_Init_JabuJabusBelly();
+  RegionTable_Init_ForestTemple();
+  RegionTable_Init_FireTemple();
+  RegionTable_Init_WaterTemple();
+  RegionTable_Init_SpiritTemple();
+  RegionTable_Init_ShadowTemple();
+  RegionTable_Init_BottomOfTheWell();
+  RegionTable_Init_IceCavern();
+  RegionTable_Init_GerudoTrainingGrounds();
+  RegionTable_Init_GanonsCastle();
 
   //Set parent regions
   for (uint32_t i = RR_ROOT; i <= RR_GANONS_CASTLE; i++) {
@@ -398,41 +398,41 @@ std::string CleanCheckConditionString(std::string condition) {
     return condition;
 }
 
-namespace Areas {
+namespace Regions {
 
-  const auto GetAllAreas() {
-    static const size_t areaCount = RR_MAX - (RR_NONE + 1);
+  const auto GetAllRegions() {
+    static const size_t regionCount = RR_MAX - (RR_NONE + 1);
 
-    static std::array<RandomizerRegion, areaCount> allAreas = {};
+    static std::array<RandomizerRegion, regionCount> allRegions = {};
 
     static bool intialized = false;
     if (!intialized) {
-      for (size_t i = 0; i < areaCount; i++) {
-        allAreas[i] = (RandomizerRegion)((RR_NONE + 1) + i);
+      for (size_t i = 0; i < regionCount; i++) {
+        allRegions[i] = (RandomizerRegion)((RR_NONE + 1) + i);
       }
       intialized = true;
     }
 
-    return allAreas;
+    return allRegions;
   }
 
   void AccessReset() {
     auto ctx = Rando::Context::GetInstance();
-      for (const RandomizerRegion area : GetAllAreas()) {
-      AreaTable(area)->ResetVariables();
+      for (const RandomizerRegion region : GetAllRegions()) {
+      RegionTable(region)->ResetVariables();
     }
 
     if(/*Settings::HasNightStart TODO:: Randomize Starting Time*/ false) {
         if(ctx->GetSettings()->ResolvedStartingAge() == RO_AGE_CHILD) {
-          AreaTable(RR_ROOT)->childNight = true;
+          RegionTable(RR_ROOT)->childNight = true;
         } else {
-          AreaTable(RR_ROOT)->adultNight = true;
+          RegionTable(RR_ROOT)->adultNight = true;
         }
       } else {
         if(ctx->GetSettings()->ResolvedStartingAge() == RO_AGE_CHILD) {
-          AreaTable(RR_ROOT)->childDay = true;
+          RegionTable(RR_ROOT)->childDay = true;
         } else {
-          AreaTable(RR_ROOT)->adultDay = true;
+          RegionTable(RR_ROOT)->adultDay = true;
         }
     }
   }
@@ -440,10 +440,10 @@ namespace Areas {
   //Reset exits and clear items from locations
   void ResetAllLocations() {
     auto ctx = Rando::Context::GetInstance();
-      for (const RandomizerRegion area : GetAllAreas()) {
-      AreaTable(area)->ResetVariables();
+      for (const RandomizerRegion region : GetAllRegions()) {
+      RegionTable(region)->ResetVariables();
       //Erase item from every location in this exit
-      for (LocationAccess& locPair : AreaTable(area)->locations) {
+      for (LocationAccess& locPair : RegionTable(region)->locations) {
           RandomizerCheck location = locPair.GetLocation();
           Rando::Context::GetInstance()->GetItemLocation(location)->ResetVariables();
       }
@@ -451,23 +451,23 @@ namespace Areas {
 
     if (/*Settings::HasNightStart TODO:: Randomize Starting Time*/ false) {
         if(ctx->GetSettings()->ResolvedStartingAge() == RO_AGE_CHILD) {
-          AreaTable(RR_ROOT)->childNight = true;
+          RegionTable(RR_ROOT)->childNight = true;
         } else {
-          AreaTable(RR_ROOT)->adultNight = true;
+          RegionTable(RR_ROOT)->adultNight = true;
         }
     } else {
         if(ctx->GetSettings()->ResolvedStartingAge() == RO_AGE_CHILD) {
-          AreaTable(RR_ROOT)->childDay = true;
+          RegionTable(RR_ROOT)->childDay = true;
         } else {
-          AreaTable(RR_ROOT)->adultDay = true;
+          RegionTable(RR_ROOT)->adultDay = true;
         }
     }
   }
 
   bool HasTimePassAccess(uint8_t age) {
-      for (const RandomizerRegion areaKey : GetAllAreas()) {
-      auto area = AreaTable(areaKey);
-      if (area->timePass && ((age == RO_AGE_CHILD && area->Child()) || (age == RO_AGE_ADULT && area->Adult()))) {
+      for (const RandomizerRegion regionKey : GetAllRegions()) {
+      auto region = RegionTable(regionKey);
+      if (region->timePass && ((age == RO_AGE_CHILD && region->Child()) || (age == RO_AGE_ADULT && region->Adult()))) {
         return true;
       }
     }
@@ -483,24 +483,24 @@ namespace Areas {
     worldGraph.open (str + ".dot");
     worldGraph << "digraph {\n\tcenter=true;\n";
 
-    for (const RandomizerRegion areaKey : GetAllAreas()) {
-      auto area = AreaTable(areaKey);
-      for (auto exit : area->exits) {
-        if (exit.GetConnectedRegion()->regionName != "Invalid Area") {
+    for (const RandomizerRegion regionKey : GetAllRegions()) {
+      auto region = RegionTable(regionKey);
+      for (auto exit : region->exits) {
+        if (exit.GetConnectedRegion()->regionName != "Invalid Region") {
           std::string parent = exit.GetParentRegion()->regionName;
-          if (area->childDay) {
+          if (region->childDay) {
             parent += " CD";
           }
-          if (area->childNight) {
+          if (region->childNight) {
             parent += " CN";
           }
-          if (area->adultDay) {
+          if (region->adultDay) {
             parent += " AD";
           }
-          if (area->adultNight) {
+          if (region->adultNight) {
             parent += " AN";
           }
-          Area* connected = exit.GetConnectedRegion();
+          Region* connected = exit.GetConnectedRegion();
           auto connectedStr = connected->regionName;
           if (connected->childDay) {
             connectedStr += " CD";
@@ -524,20 +524,20 @@ namespace Areas {
     worldGraph.close();
   }
 
-} //namespace Areas
+} //namespace Regions
 
-Area* AreaTable(const RandomizerRegion areaKey) {
-  if (areaKey > RR_MAX) {
+Region* RegionTable(const RandomizerRegion regionKey) {
+  if (regionKey > RR_MAX) {
     printf("\x1b[1;1HERROR: AREAKEY TOO BIG");
   }
-  return &(areaTable[areaKey]);
+  return &(areaTable[regionKey]);
 }
 
 //Retrieve all the shuffable entrances of a specific type
 std::vector<Rando::Entrance*> GetShuffleableEntrances(Rando::EntranceType type, bool onlyPrimary /*= true*/) {
   std::vector<Rando::Entrance*> entrancesToShuffle = {};
-  for (RandomizerRegion area : Areas::GetAllAreas()) {
-    for (auto& exit : AreaTable(area)->exits) {
+  for (RandomizerRegion region : Regions::GetAllRegions()) {
+    for (auto& exit : RegionTable(region)->exits) {
       if ((exit.GetType() == type || type == Rando::EntranceType::All) && (exit.IsPrimary() || !onlyPrimary) && exit.GetType() != Rando::EntranceType::None) {
         entrancesToShuffle.push_back(&exit);
       }
@@ -548,8 +548,8 @@ std::vector<Rando::Entrance*> GetShuffleableEntrances(Rando::EntranceType type,
 
 // Get the specific entrance by name
 Rando::Entrance* GetEntrance(const std::string name) {
-  for (RandomizerRegion area : Areas::GetAllAreas()) {
-    for (auto& exit : AreaTable(area)->exits) {
+  for (RandomizerRegion region : Regions::GetAllRegions()) {
+    for (auto& exit : RegionTable(region)->exits) {
       if (exit.GetName() == name) {
         return &exit;
       }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access.hpp b/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
index 3dcdbfb26..d2e060c84 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
@@ -136,15 +136,15 @@ namespace Rando {
     enum class EntranceType;
 }
 
-class Area {
+class Region {
 public:
-    Area();
-    Area(std::string regionName_, std::string scene_, RandomizerArea area,
+    Region();
+    Region(std::string regionName_, std::string scene_, RandomizerArea area,
          bool timePass_,
          std::vector<EventAccess> events_,
          std::vector<LocationAccess> locations_,
          std::list<Rando::Entrance> exits_);
-    ~Area();
+    ~Region();
 
     std::string regionName;
     std::string scene;
@@ -246,20 +246,20 @@ public:
     }
 };
 
-extern std::array<Area, RR_MAX> areaTable;
+extern std::array<Region, RR_MAX> areaTable;
 extern std::vector<EventAccess> grottoEvents;
 
-bool Here(const RandomizerRegion area, ConditionFn condition);
-bool CanPlantBean(const RandomizerRegion area);
-bool BothAges(const RandomizerRegion area);
-bool ChildCanAccess(const RandomizerRegion area);
-bool AdultCanAccess(const RandomizerRegion area);
-bool HasAccessTo(const RandomizerRegion area);
+bool Here(const RandomizerRegion region, ConditionFn condition);
+bool CanPlantBean(const RandomizerRegion region);
+bool BothAges(const RandomizerRegion region);
+bool ChildCanAccess(const RandomizerRegion region);
+bool AdultCanAccess(const RandomizerRegion region);
+bool HasAccessTo(const RandomizerRegion region);
 
 #define DAY_NIGHT_CYCLE true
 #define NO_DAY_NIGHT_CYCLE false
 
-namespace Areas {
+namespace Regions {
 
   extern void AccessReset();
   extern void ResetAllLocations();
@@ -267,29 +267,29 @@ namespace Areas {
   extern void DumpWorldGraph(std::string str);
 } //namespace Exits
 
-void  AreaTable_Init();
-Area* AreaTable(const RandomizerRegion areaKey);
+void  RegionTable_Init();
+Region* RegionTable(const RandomizerRegion regionKey);
 std::vector<Rando::Entrance*> GetShuffleableEntrances(Rando::EntranceType type, bool onlyPrimary = true);
 Rando::Entrance* GetEntrance(const std::string name);
 
 // Overworld
-void AreaTable_Init_LostWoods();
-void AreaTable_Init_HyruleField();
-void AreaTable_Init_CastleTown();
-void AreaTable_Init_Kakariko();
-void AreaTable_Init_DeathMountain();
-void AreaTable_Init_ZorasDomain();
-void AreaTable_Init_GerudoValley();
+void RegionTable_Init_LostWoods();
+void RegionTable_Init_HyruleField();
+void RegionTable_Init_CastleTown();
+void RegionTable_Init_Kakariko();
+void RegionTable_Init_DeathMountain();
+void RegionTable_Init_ZorasDomain();
+void RegionTable_Init_GerudoValley();
 // Dungeons
-void AreaTable_Init_DekuTree();
-void AreaTable_Init_DodongosCavern();
-void AreaTable_Init_JabuJabusBelly();
-void AreaTable_Init_ForestTemple();
-void AreaTable_Init_FireTemple();
-void AreaTable_Init_WaterTemple();
-void AreaTable_Init_SpiritTemple();
-void AreaTable_Init_ShadowTemple();
-void AreaTable_Init_BottomOfTheWell();
-void AreaTable_Init_IceCavern();
-void AreaTable_Init_GerudoTrainingGrounds();
-void AreaTable_Init_GanonsCastle();
+void RegionTable_Init_DekuTree();
+void RegionTable_Init_DodongosCavern();
+void RegionTable_Init_JabuJabusBelly();
+void RegionTable_Init_ForestTemple();
+void RegionTable_Init_FireTemple();
+void RegionTable_Init_WaterTemple();
+void RegionTable_Init_SpiritTemple();
+void RegionTable_Init_ShadowTemple();
+void RegionTable_Init_BottomOfTheWell();
+void RegionTable_Init_IceCavern();
+void RegionTable_Init_GerudoTrainingGrounds();
+void RegionTable_Init_GanonsCastle();
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_bottom_of_the_well.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_bottom_of_the_well.cpp
index 44260c7eb..864ca8785 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_bottom_of_the_well.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_bottom_of_the_well.cpp
@@ -4,11 +4,11 @@
 
 using namespace Rando;
 
-void AreaTable_Init_BottomOfTheWell() {
+void RegionTable_Init_BottomOfTheWell() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[RR_BOTTOM_OF_THE_WELL_ENTRYWAY] = Area("Bottom of the Well Entryway", "Bottom of the Well", RA_BOTTOM_OF_THE_WELL, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_BOTTOM_OF_THE_WELL_ENTRYWAY] = Region("Bottom of the Well Entryway", "Bottom of the Well", RA_BOTTOM_OF_THE_WELL, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_BOTTOM_OF_THE_WELL_MAIN_AREA,    {[]{return randoCtx->GetDungeon(Rando::BOTTOM_OF_THE_WELL)->IsVanilla() && logic->IsChild && (logic->CanChildAttack || logic->CanUse(RG_NUTS));}}),
                   Entrance(RR_BOTTOM_OF_THE_WELL_MQ_PERIMETER, {[]{return randoCtx->GetDungeon(Rando::BOTTOM_OF_THE_WELL)->IsMQ()      && logic->IsChild;}}),
@@ -19,7 +19,7 @@ void AreaTable_Init_BottomOfTheWell() {
   |     VANILLA DUNGEON      |
   ---------------------------*/
   if (randoCtx->GetDungeon(Rando::BOTTOM_OF_THE_WELL)->IsVanilla()) {
-  areaTable[RR_BOTTOM_OF_THE_WELL_MAIN_AREA] = Area("Bottom of the Well Main Area", "Bottom of the Well", RA_BOTTOM_OF_THE_WELL, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_BOTTOM_OF_THE_WELL_MAIN_AREA] = Region("Bottom of the Well Main Region", "Bottom of the Well", RA_BOTTOM_OF_THE_WELL, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->StickPot, {[]{return true;}}),
                   EventAccess(&logic->NutPot,   {[]{return true;}}),
@@ -52,7 +52,7 @@ void AreaTable_Init_BottomOfTheWell() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (randoCtx->GetDungeon(Rando::BOTTOM_OF_THE_WELL)->IsMQ()) {
-  areaTable[RR_BOTTOM_OF_THE_WELL_MQ_PERIMETER] = Area("Bottom of the Well MQ Perimeter", "Bottom of the Well", RA_BOTTOM_OF_THE_WELL, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_BOTTOM_OF_THE_WELL_MQ_PERIMETER] = Region("Bottom of the Well MQ Perimeter", "Bottom of the Well", RA_BOTTOM_OF_THE_WELL, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   //EventAccess(&WallFairy, {[]{return WallFairy || logic->Slingshot;}}),
   }, {
@@ -69,7 +69,7 @@ void AreaTable_Init_BottomOfTheWell() {
                     //Trick: logic->CanUse(RG_ZELDAS_LULLABY) || (LogicBotWMQPits && logic->HasExplosives)
   });
 
-  areaTable[RR_BOTTOM_OF_THE_WELL_MQ_MIDDLE] = Area("Bottom of the Well MQ Middle", "Bottom of the Well", RA_BOTTOM_OF_THE_WELL, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_BOTTOM_OF_THE_WELL_MQ_MIDDLE] = Region("Bottom of the Well MQ Middle", "Bottom of the Well", RA_BOTTOM_OF_THE_WELL, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_BOTTOM_OF_THE_WELL_MQ_MAP_CHEST,                        true),
                   LOCATION(RC_BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST,              logic->HasExplosives && logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 2)),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
index 9f113218c..d59be8360 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
@@ -3,15 +3,15 @@
 
 using namespace Rando;
 
-void AreaTable_Init_CastleTown() {
-  areaTable[RR_MARKET_ENTRANCE] = Area("Market Entrance", "Market Entrance", RA_THE_MARKET, NO_DAY_NIGHT_CYCLE, {}, {}, {
+void RegionTable_Init_CastleTown() {
+  areaTable[RR_MARKET_ENTRANCE] = Region("Market Entrance", "Market Entrance", RA_THE_MARKET, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_HYRULE_FIELD,       {[]{return logic->IsAdult || logic->AtDay;}}),
                   Entrance(RR_THE_MARKET,         {[]{return true;}}),
                   Entrance(RR_MARKET_GUARD_HOUSE, {[]{return true;}}),
   });
 
-  areaTable[RR_THE_MARKET] = Area("Market", "Market", RA_THE_MARKET, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_THE_MARKET] = Region("Market", "Market", RA_THE_MARKET, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_MARKET_ENTRANCE,            {[]{return true;}}),
                   Entrance(RR_TOT_ENTRANCE,               {[]{return true;}}),
@@ -25,7 +25,7 @@ void AreaTable_Init_CastleTown() {
                   Entrance(RR_MARKET_BACK_ALLEY,          {[]{return logic->IsChild;}}),
   });
 
-  areaTable[RR_MARKET_BACK_ALLEY] = Area("Market Back Alley", "Market", RA_THE_MARKET, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_MARKET_BACK_ALLEY] = Region("Market Back Alley", "Market", RA_THE_MARKET, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_THE_MARKET,                 {[]{return true;}}),
                   Entrance(RR_MARKET_BOMBCHU_SHOP,        {[]{return logic->AtNight;}}),
@@ -33,7 +33,7 @@ void AreaTable_Init_CastleTown() {
                   Entrance(RR_MARKET_MAN_IN_GREEN_HOUSE,  {[]{return logic->AtNight;}}),
   });
 
-  areaTable[RR_TOT_ENTRANCE] = Area("ToT Entrance", "ToT Entrance", RA_THE_MARKET, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_TOT_ENTRANCE] = Region("ToT Entrance", "ToT Entrance", RA_THE_MARKET, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CanSummonGossipFairyWithoutSuns;}}),
                 }, {
@@ -48,7 +48,7 @@ void AreaTable_Init_CastleTown() {
                   Entrance(RR_TEMPLE_OF_TIME, {[]{return true;}}),
   });
 
-  areaTable[RR_TEMPLE_OF_TIME] = Area("Temple of Time", "Temple of Time", RA_TEMPLE_OF_TIME, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_TEMPLE_OF_TIME] = Region("Temple of Time", "Temple of Time", RA_TEMPLE_OF_TIME, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_TOT_LIGHT_ARROWS_CUTSCENE, logic->IsAdult && logic->CanTriggerLACS),
                   LOCATION(RC_ALTAR_HINT_CHILD,          logic->IsChild),
@@ -60,7 +60,7 @@ void AreaTable_Init_CastleTown() {
                   Entrance(RR_TOT_BEYOND_DOOR_OF_TIME, {[]{return randoCtx->GetOption(RSK_DOOR_OF_TIME).Is(RO_DOOROFTIME_OPEN) || (logic->CanUse(RG_SONG_OF_TIME) && (randoCtx->GetOption(RSK_DOOR_OF_TIME).Is(RO_DOOROFTIME_SONGONLY) || (logic->HasAllStones && logic->OcarinaOfTime)));}}),
   });
 
-  areaTable[RR_TOT_BEYOND_DOOR_OF_TIME] = Area("Beyond Door of Time", "Beyond Door of Time", RA_TEMPLE_OF_TIME, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_TOT_BEYOND_DOOR_OF_TIME] = Region("Beyond Door of Time", "Beyond Door of Time", RA_TEMPLE_OF_TIME, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   //EventAccess(&logic->TimeTravel, {[]{return true;}}),
                 }, {
@@ -73,14 +73,14 @@ void AreaTable_Init_CastleTown() {
                   Entrance(RR_TEMPLE_OF_TIME, {[]{return true;}}),
   });
 
-  areaTable[RR_CASTLE_GROUNDS] = Area("Castle Grounds", "Castle Grounds", RA_CASTLE_GROUNDS, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_CASTLE_GROUNDS] = Region("Castle Grounds", "Castle Grounds", RA_CASTLE_GROUNDS, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_THE_MARKET,            {[]{return true;}}),
                   Entrance(RR_HYRULE_CASTLE_GROUNDS, {[]{return logic->IsChild;}}),
                   Entrance(RR_GANONS_CASTLE_GROUNDS, {[]{return logic->IsAdult;}}),
   });
 
-  areaTable[RR_HYRULE_CASTLE_GROUNDS] = Area("Hyrule Castle Grounds", "Castle Grounds", RA_HYRULE_CASTLE, DAY_NIGHT_CYCLE, {
+  areaTable[RR_HYRULE_CASTLE_GROUNDS] = Region("Hyrule Castle Grounds", "Castle Grounds", RA_HYRULE_CASTLE, DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CanSummonGossipFairy;}}),
                   EventAccess(&logic->ButterflyFairy,   {[]{return logic->ButterflyFairy   || logic->CanUse(RG_STICKS);}}),
@@ -99,7 +99,7 @@ void AreaTable_Init_CastleTown() {
                   Entrance(RR_HC_STORMS_GROTTO,        {[]{return logic->CanOpenStormGrotto;}}),
   });
 
-  areaTable[RR_HC_GARDEN] = Area("HC Garden", "Castle Grounds", RA_HYRULE_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_HC_GARDEN] = Region("HC Garden", "Castle Grounds", RA_HYRULE_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                 }, {
                   //Locations
@@ -110,7 +110,7 @@ void AreaTable_Init_CastleTown() {
                   Entrance(RR_HYRULE_CASTLE_GROUNDS, {[]{return true;}}),
   });
 
-  areaTable[RR_HC_GREAT_FAIRY_FOUNTAIN] = Area("HC Great Fairy Fountain", "HC Great Fairy Fountain", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_HC_GREAT_FAIRY_FOUNTAIN] = Region("HC Great Fairy Fountain", "HC Great Fairy Fountain", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_HC_GREAT_FAIRY_REWARD, logic->CanUse(RG_ZELDAS_LULLABY)),
                 }, {
@@ -118,7 +118,7 @@ void AreaTable_Init_CastleTown() {
                   Entrance(RR_CASTLE_GROUNDS, {[]{return true;}}),
   });
 
-  areaTable[RR_HC_STORMS_GROTTO] = Area("HC Storms Grotto", "HC Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_HC_STORMS_GROTTO] = Region("HC Storms Grotto", "HC Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->NutPot,           {[]{return logic->NutPot           || logic->CanBlastOrSmash;}}),
                   EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || (logic->CanBlastOrSmash && logic->CanSummonGossipFairy);}}),
@@ -132,7 +132,7 @@ void AreaTable_Init_CastleTown() {
                   Entrance(RR_CASTLE_GROUNDS, {[]{return true;}}),
   });
 
-  areaTable[RR_GANONS_CASTLE_GROUNDS] = Area("Ganon's Castle Grounds", "Castle Grounds", RA_OUTSIDE_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_GROUNDS] = Region("Ganon's Castle Grounds", "Castle Grounds", RA_OUTSIDE_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   EventAccess(&logic->BuiltRainbowBridge, {[]{return logic->CanBuildRainbowBridge;}}),
                 }, {
                   //Locations                                   //the terrain was lowered such that you can't get this GS with a simple sword slash
@@ -144,7 +144,7 @@ void AreaTable_Init_CastleTown() {
                   Entrance(RR_GANONS_CASTLE_LEDGE,      {[]{return logic->BuiltRainbowBridge;}}),
   });
 
-  areaTable[RR_OGC_GREAT_FAIRY_FOUNTAIN] = Area("OGC Great Fairy Fountain", "OGC Great Fairy Fountain", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_OGC_GREAT_FAIRY_FOUNTAIN] = Region("OGC Great Fairy Fountain", "OGC Great Fairy Fountain", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_OGC_GREAT_FAIRY_REWARD, logic->CanUse(RG_ZELDAS_LULLABY)),
                 }, {
@@ -152,20 +152,20 @@ void AreaTable_Init_CastleTown() {
                   Entrance(RR_CASTLE_GROUNDS, {[]{return true;}}),
   });
 
-  areaTable[RR_CASTLE_GROUNDS_FROM_GANONS_CASTLE] = Area("Castle Grounds From Ganon's Castle", "Castle Grounds From Ganon's Castle", RA_CASTLE_GROUNDS, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_CASTLE_GROUNDS_FROM_GANONS_CASTLE] = Region("Castle Grounds From Ganon's Castle", "Castle Grounds From Ganon's Castle", RA_CASTLE_GROUNDS, NO_DAY_NIGHT_CYCLE, {}, {}, {
     // Exits
     Entrance(RR_HYRULE_CASTLE_GROUNDS, { [] { return logic->IsChild; }}),
     Entrance(RR_GANONS_CASTLE_LEDGE, { [] { return logic->IsAdult; }}),
   });
 
-  areaTable[RR_GANONS_CASTLE_LEDGE] = Area("Ganon's Castle Ledge", "OGC Ganon's Castle Ledge", RA_OUTSIDE_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE,
+  areaTable[RR_GANONS_CASTLE_LEDGE] = Region("Ganon's Castle Ledge", "OGC Ganon's Castle Ledge", RA_OUTSIDE_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE,
   {}, {}, {
     // Exits
     Entrance(RR_GANONS_CASTLE_GROUNDS, {[]{return logic->BuiltRainbowBridge;}}),
     Entrance(RR_GANONS_CASTLE_ENTRYWAY, {[]{return logic->IsAdult;}}),
   });
 
-  areaTable[RR_MARKET_GUARD_HOUSE] = Area("Market Guard House", "Market Guard House", RA_NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_MARKET_GUARD_HOUSE] = Region("Market Guard House", "Market Guard House", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->CanEmptyBigPoes,   {[]{return logic->IsAdult;}}),
                 }, {
@@ -177,7 +177,7 @@ void AreaTable_Init_CastleTown() {
                   Entrance(RR_MARKET_ENTRANCE, {[]{return true;}}),
   });
 
-  areaTable[RR_MARKET_BAZAAR] = Area("Market Bazaar", "Market Bazaar", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_MARKET_BAZAAR] = Region("Market Bazaar", "Market Bazaar", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_MARKET_BAZAAR_ITEM_1, true),
                   LOCATION(RC_MARKET_BAZAAR_ITEM_2, true),
@@ -192,10 +192,10 @@ void AreaTable_Init_CastleTown() {
                   Entrance(RR_THE_MARKET, {[]{return true;}}),
   });
 
-  areaTable[RR_MARKET_MASK_SHOP] = Area("Market Mask Shop", "Market Mask Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_MARKET_MASK_SHOP] = Region("Market Mask Shop", "Market Mask Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->SkullMask,   {[]{return logic->SkullMask   || (logic->ZeldasLetter && (randoCtx->GetOption(RSK_COMPLETE_MASK_QUEST) ||  ChildCanAccess(RR_KAKARIKO_VILLAGE)));}}), //RANDOTODO Complete mask quest does not need this location, so should be tied to link'd pocket
-                  EventAccess(&logic->MaskOfTruth, {[]{return logic->MaskOfTruth || (logic->SkullMask && (randoCtx->GetOption(RSK_COMPLETE_MASK_QUEST) || (ChildCanAccess(RR_THE_LOST_WOODS) && logic->CanUse(RG_SARIAS_SONG) && AreaTable(RR_THE_GRAVEYARD)->childDay && ChildCanAccess(RR_HYRULE_FIELD) && logic->HasAllStones)));}}),
+                  EventAccess(&logic->MaskOfTruth, {[]{return logic->MaskOfTruth || (logic->SkullMask && (randoCtx->GetOption(RSK_COMPLETE_MASK_QUEST) || (ChildCanAccess(RR_THE_LOST_WOODS) && logic->CanUse(RG_SARIAS_SONG) && RegionTable(RR_THE_GRAVEYARD)->childDay && ChildCanAccess(RR_HYRULE_FIELD) && logic->HasAllStones)));}}),
                 }, {
                   LOCATION(RC_MASK_SHOP_HINT, true),
                 }, {
@@ -203,7 +203,7 @@ void AreaTable_Init_CastleTown() {
                   Entrance(RR_THE_MARKET, {[]{return true;}}),
   });
 
-  areaTable[RR_MARKET_SHOOTING_GALLERY] = Area("Market Shooting Gallery", "Market Shooting Gallery", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_MARKET_SHOOTING_GALLERY] = Region("Market Shooting Gallery", "Market Shooting Gallery", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_MARKET_SHOOTING_GALLERY_REWARD, logic->IsChild && logic->ChildsWallet),
                 }, {
@@ -211,7 +211,7 @@ void AreaTable_Init_CastleTown() {
                   Entrance(RR_THE_MARKET, {[]{return true;}}),
   });
 
-  areaTable[RR_MARKET_BOMBCHU_BOWLING] = Area("Market Bombchu Bowling", "Market Bombchu Bowling", RA_NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_MARKET_BOMBCHU_BOWLING] = Region("Market Bombchu Bowling", "Market Bombchu Bowling", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->CouldPlayBowling, {[]{return (logic->ChildsWallet);}}),
                 }, {
@@ -223,7 +223,7 @@ void AreaTable_Init_CastleTown() {
                   Entrance(RR_THE_MARKET, {[]{return true;}}),
   });
 
-  areaTable[RR_MARKET_POTION_SHOP] = Area("Market Potion Shop", "Market Potion Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_MARKET_POTION_SHOP] = Region("Market Potion Shop", "Market Potion Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_MARKET_POTION_SHOP_ITEM_1, true),
                   LOCATION(RC_MARKET_POTION_SHOP_ITEM_2, true),
@@ -238,7 +238,7 @@ void AreaTable_Init_CastleTown() {
                   Entrance(RR_THE_MARKET, {[]{return true;}}),
   });
 
-  areaTable[RR_MARKET_TREASURE_CHEST_GAME] = Area("Market Treasure Chest Game", "Market Treasure Chest Game", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_MARKET_TREASURE_CHEST_GAME] = Region("Market Treasure Chest Game", "Market Treasure Chest Game", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GREG_HINT,                         true),
                   LOCATION(RC_MARKET_TREASURE_CHEST_GAME_REWARD, logic->ChildsWallet && ((logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 6)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)))),
@@ -257,7 +257,7 @@ void AreaTable_Init_CastleTown() {
                   Entrance(RR_THE_MARKET, {[]{return true;}}),
   });
 
-  areaTable[RR_MARKET_BOMBCHU_SHOP] = Area("Market Bombchu Shop", "Market Bombchu Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_MARKET_BOMBCHU_SHOP] = Region("Market Bombchu Shop", "Market Bombchu Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_MARKET_BOMBCHU_SHOP_ITEM_1, true),
                   LOCATION(RC_MARKET_BOMBCHU_SHOP_ITEM_2, true),
@@ -272,7 +272,7 @@ void AreaTable_Init_CastleTown() {
                   Entrance(RR_MARKET_BACK_ALLEY, {[]{return true;}}),
   });
 
-  areaTable[RR_MARKET_DOG_LADY_HOUSE] = Area("Market Dog Lady House", "Market Dog Lady House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_MARKET_DOG_LADY_HOUSE] = Region("Market Dog Lady House", "Market Dog Lady House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_MARKET_LOST_DOG, logic->IsChild && logic->AtNight),
                 }, {
@@ -280,7 +280,7 @@ void AreaTable_Init_CastleTown() {
                   Entrance(RR_MARKET_BACK_ALLEY, {[]{return true;}}),
   });
 
-  areaTable[RR_MARKET_MAN_IN_GREEN_HOUSE] = Area("Market Man in Green House", "Market Man in Green House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_MARKET_MAN_IN_GREEN_HOUSE] = Region("Market Man in Green House", "Market Man in Green House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_MARKET_BACK_ALLEY, {[]{return true;}}),
   });
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
index 73284dbc8..1b99ea43a 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
@@ -3,9 +3,9 @@
 
 using namespace Rando;
 
-void AreaTable_Init_DeathMountain() {
+void RegionTable_Init_DeathMountain() {
   auto ctx = Rando::Context::GetInstance();
-  areaTable[RR_DEATH_MOUNTAIN_TRAIL] = Area("Death Mountain", "Death Mountain", RA_DEATH_MOUNTAIN_TRAIL, DAY_NIGHT_CYCLE, {
+  areaTable[RR_DEATH_MOUNTAIN_TRAIL] = Region("Death Mountain", "Death Mountain", RA_DEATH_MOUNTAIN_TRAIL, DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->BeanPlantFairy, {[]{return logic->BeanPlantFairy || (CanPlantBean(RR_DEATH_MOUNTAIN_TRAIL) && logic->CanUse(RG_SONG_OF_STORMS) && (logic->HasExplosives || logic->GoronBracelet));}}),
                 }, {
@@ -24,7 +24,7 @@ void AreaTable_Init_DeathMountain() {
                   Entrance(RR_DMT_STORMS_GROTTO,        {[]{return logic->CanOpenStormGrotto;}}),
   });
 
-  areaTable[RR_DEATH_MOUNTAIN_SUMMIT] = Area("Death Mountain Summit", "Death Mountain", RA_DEATH_MOUNTAIN_TRAIL, DAY_NIGHT_CYCLE, {
+  areaTable[RR_DEATH_MOUNTAIN_SUMMIT] = Region("Death Mountain Summit", "Death Mountain", RA_DEATH_MOUNTAIN_TRAIL, DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->PrescriptionAccess, {[]{return logic->PrescriptionAccess || (logic->IsAdult && (logic->BrokenSwordAccess || logic->BrokenSword));}}),
                   EventAccess(&logic->GossipStoneFairy,   {[]{return logic->GossipStoneFairy   || logic->CanSummonGossipFairy;}}),
@@ -45,12 +45,12 @@ void AreaTable_Init_DeathMountain() {
                   Entrance(RR_DMT_GREAT_FAIRY_FOUNTAIN, {[]{return Here(RR_DEATH_MOUNTAIN_SUMMIT, []{return logic->CanBlastOrSmash;});}}),
   });
 
-  areaTable[RR_DMT_OWL_FLIGHT] = Area("DMT Owl Flight", "Death Mountain", RA_DEATH_MOUNTAIN_TRAIL, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DMT_OWL_FLIGHT] = Region("DMT Owl Flight", "Death Mountain", RA_DEATH_MOUNTAIN_TRAIL, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_KAK_IMPAS_ROOFTOP, {[]{return true;}}),
   });
 
-  areaTable[RR_DMT_COW_GROTTO] = Area("DMT Cow Grotto", "DMT Cow Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DMT_COW_GROTTO] = Region("DMT Cow Grotto", "DMT Cow Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DMT_COW_GROTTO_COW,     logic->CanUse(RG_EPONAS_SONG)),
                   LOCATION(RC_DMT_COW_GROTTO_BEEHIVE, logic->CanBreakLowerBeehives),
@@ -60,7 +60,7 @@ void AreaTable_Init_DeathMountain() {
 
   });
 
-  areaTable[RR_DMT_STORMS_GROTTO] = Area("DMT Storms Grotto", "DMT Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+  areaTable[RR_DMT_STORMS_GROTTO] = Region("DMT Storms Grotto", "DMT Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LOCATION(RC_DMT_STORMS_GROTTO_CHEST,         true),
                   LOCATION(RC_DMT_STORMS_GROTTO_FISH,          logic->HasBottle),
@@ -72,7 +72,7 @@ void AreaTable_Init_DeathMountain() {
                   Entrance(RR_DEATH_MOUNTAIN_TRAIL, {[]{return true;}}),
   });
 
-  areaTable[RR_DMT_GREAT_FAIRY_FOUNTAIN] = Area("DMT Great Fairy Fountain", "DMT Great Fairy Fountain", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DMT_GREAT_FAIRY_FOUNTAIN] = Region("DMT Great Fairy Fountain", "DMT Great Fairy Fountain", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DMT_GREAT_FAIRY_REWARD, logic->CanUse(RG_ZELDAS_LULLABY)),
                 }, {
@@ -80,7 +80,7 @@ void AreaTable_Init_DeathMountain() {
                   Entrance(RR_DEATH_MOUNTAIN_SUMMIT, {[]{return true;}}),
   });
 
-  areaTable[RR_GORON_CITY] = Area("Goron City", "Goron City", RA_GORON_CITY, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GORON_CITY] = Region("Goron City", "Goron City", RA_GORON_CITY, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->GossipStoneFairy,          {[]{return logic->GossipStoneFairy          || logic->CanSummonGossipFairyWithoutSuns;}}),
                   EventAccess(&logic->StickPot,                  {[]{return logic->StickPot                  || logic->IsChild;}}),
@@ -111,7 +111,7 @@ void AreaTable_Init_DeathMountain() {
                   Entrance(RR_GC_GROTTO_PLATFORM,   {[]{return logic->IsAdult && ((logic->CanUse(RG_SONG_OF_TIME) && ((logic->EffectiveHealth > 2) || logic->CanUse(RG_GORON_TUNIC) || logic->CanUse(RG_LONGSHOT) || logic->CanUse(RG_NAYRUS_LOVE))) || (logic->EffectiveHealth > 1 && logic->CanUse(RG_GORON_TUNIC) && logic->CanUse(RG_HOOKSHOT)) || (logic->CanUse(RG_NAYRUS_LOVE) && logic->CanUse(RG_HOOKSHOT)) || (logic->EffectiveHealth > 2 && logic->CanUse(RG_HOOKSHOT) && randoCtx->GetTrickOption(RT_GC_GROTTO)));}}),
   });
 
-  areaTable[RR_GC_WOODS_WARP] = Area("GC Woods Warp", "Goron City", RA_GORON_CITY, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GC_WOODS_WARP] = Region("GC Woods Warp", "Goron City", RA_GORON_CITY, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->GCWoodsWarpOpen, {[]{return logic->GCWoodsWarpOpen || (logic->CanBlastOrSmash || logic->CanUse(RG_DINS_FIRE));}}),
                 }, {}, {
@@ -120,7 +120,7 @@ void AreaTable_Init_DeathMountain() {
                   Entrance(RR_THE_LOST_WOODS, {[]{return true;}}),
   });
 
-  areaTable[RR_GC_DARUNIAS_CHAMBER] = Area("GC Darunias Chamber", "Goron City", RA_GORON_CITY, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GC_DARUNIAS_CHAMBER] = Region("GC Darunias Chamber", "Goron City", RA_GORON_CITY, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->GoronCityChildFire, {[]{return logic->GoronCityChildFire || (logic->IsChild && logic->CanUse(RG_STICKS));}}),
                 }, {
@@ -132,13 +132,13 @@ void AreaTable_Init_DeathMountain() {
                   Entrance(RR_DMC_LOWER_LOCAL, {[]{return logic->IsAdult;}}),
   });
 
-  areaTable[RR_GC_GROTTO_PLATFORM] = Area("GC Grotto Platform", "Goron City", RA_GORON_CITY, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_GC_GROTTO_PLATFORM] = Region("GC Grotto Platform", "Goron City", RA_GORON_CITY, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_GC_GROTTO,  {[]{return true;}}),
                   Entrance(RR_GORON_CITY, {[]{return logic->EffectiveHealth > 2 || logic->CanUse(RG_GORON_TUNIC) || logic->CanUse(RG_NAYRUS_LOVE) || ((logic->IsChild || logic->CanUse(RG_SONG_OF_TIME)) && logic->CanUse(RG_LONGSHOT));}}),
   });
 
-  areaTable[RR_GC_SHOP] = Area("GC Shop", "GC Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GC_SHOP] = Region("GC Shop", "GC Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GC_SHOP_ITEM_1, true),
                   LOCATION(RC_GC_SHOP_ITEM_2, true),
@@ -153,7 +153,7 @@ void AreaTable_Init_DeathMountain() {
                   Entrance(RR_GORON_CITY, {[]{return true;}}),
   });
 
-  areaTable[RR_GC_GROTTO] = Area("GC Grotto", "GC Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GC_GROTTO] = Region("GC Grotto", "GC Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GC_DEKU_SCRUB_GROTTO_LEFT,   logic->CanStunDeku),
                   LOCATION(RC_GC_DEKU_SCRUB_GROTTO_RIGHT,  logic->CanStunDeku),
@@ -164,14 +164,14 @@ void AreaTable_Init_DeathMountain() {
                   Entrance(RR_GC_GROTTO_PLATFORM, {[]{return true;}}),
   });
 
-  areaTable[RR_DMC_UPPER_NEARBY] = Area("DMC Upper Nearby", "Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DMC_UPPER_NEARBY] = Region("DMC Upper Nearby", "Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DMC_UPPER_LOCAL,       {[]{return logic->FireTimer >= 48;}}),
                   Entrance(RR_DEATH_MOUNTAIN_SUMMIT, {[]{return true;}}),
                   Entrance(RR_DMC_UPPER_GROTTO,      {[]{return Here(RR_DMC_UPPER_NEARBY, []{return logic->CanBlastOrSmash && (logic->FireTimer >= 8 || logic->Hearts >= 3);});}})
   });
 
-  areaTable[RR_DMC_UPPER_LOCAL] = Area("DMC Upper Local", "Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DMC_UPPER_LOCAL] = Region("DMC Upper Local", "Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || (logic->HasExplosives && logic->CanSummonGossipFairyWithoutSuns && (logic->FireTimer >= 16 || logic->Hearts >= 3));}}),
                 }, {
@@ -187,7 +187,7 @@ void AreaTable_Init_DeathMountain() {
                   Entrance(RR_DMC_LOWER_NEARBY,         {[]{return false;}}),
   });
 
-  areaTable[RR_DMC_LADDER_AREA_NEARBY] = Area("DMC Ladder Area Nearby", "Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DMC_LADDER_AREA_NEARBY] = Region("DMC Ladder Region Nearby", "Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DMC_DEKU_SCRUB, logic->IsChild && logic->CanStunDeku),
                 }, {
@@ -196,7 +196,7 @@ void AreaTable_Init_DeathMountain() {
                   Entrance(RR_DMC_LOWER_NEARBY, {[]{return logic->Hearts >= 3 && (logic->CanUse(RG_HOVER_BOOTS) || (randoCtx->GetTrickOption(RT_DMC_BOULDER_JS) && logic->IsAdult && logic->CanUse(RG_MEGATON_HAMMER)) || (randoCtx->GetTrickOption(RT_DMC_BOULDER_SKIP) && logic->IsAdult));}}),
   });
 
-  areaTable[RR_DMC_LOWER_NEARBY] = Area("DMC Lower Nearby", "Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DMC_LOWER_NEARBY] = Region("DMC Lower Nearby", "Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DMC_LOWER_LOCAL,          {[]{return logic->FireTimer >= 48;}}),
                   Entrance(RR_GC_DARUNIAS_CHAMBER,      {[]{return true;}}),
@@ -204,7 +204,7 @@ void AreaTable_Init_DeathMountain() {
                   Entrance(RR_DMC_HAMMER_GROTTO,        {[]{return logic->IsAdult && logic->CanUse(RG_MEGATON_HAMMER);}}),
   });
 
-  areaTable[RR_DMC_LOWER_LOCAL] = Area("DMC Lower Local", "Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DMC_LOWER_LOCAL] = Region("DMC Lower Local", "Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DMC_LOWER_NEARBY,       {[]{return true;}}),
                   Entrance(RR_DMC_LADDER_AREA_NEARBY, {[]{return logic->FireTimer >= 8 || logic->Hearts >= 3;}}),
@@ -212,7 +212,7 @@ void AreaTable_Init_DeathMountain() {
                   Entrance(RR_DMC_CENTRAL_LOCAL,      {[]{return (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT) || (logic->IsAdult && logic->CanShield && randoCtx->GetTrickOption(RT_DMC_BOLERO_JUMP))) && logic->FireTimer >= 24;}}),
   });
 
-  areaTable[RR_DMC_CENTRAL_NEARBY] = Area("DMC Central Nearby", "Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DMC_CENTRAL_NEARBY] = Region("DMC Central Nearby", "Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DMC_VOLCANO_FREESTANDING_POH, logic->IsAdult && logic->Hearts >= 3 && (CanPlantBean(RR_DMC_CENTRAL_LOCAL) || (randoCtx->GetTrickOption(RT_DMC_HOVER_BEAN_POH) && logic->HoverBoots))),
                   LOCATION(RC_SHEIK_IN_CRATER,              logic->IsAdult && (logic->FireTimer >= 8 || logic->Hearts >= 3)),
@@ -221,7 +221,7 @@ void AreaTable_Init_DeathMountain() {
                   Entrance(RR_DMC_CENTRAL_LOCAL, {[]{return logic->FireTimer >= 48;}}),
   });
 
-  areaTable[RR_DMC_CENTRAL_LOCAL] = Area("DMC Central Local", "Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DMC_CENTRAL_LOCAL] = Region("DMC Central Local", "Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->BeanPlantFairy, {[]{return logic->BeanPlantFairy || (CanPlantBean(RR_DMC_CENTRAL_LOCAL) && logic->CanUse(RG_SONG_OF_STORMS));}}),
                 }, {
@@ -235,7 +235,7 @@ void AreaTable_Init_DeathMountain() {
                   Entrance(RR_FIRE_TEMPLE_ENTRYWAY, {[]{return (logic->IsChild && logic->Hearts >= 3 && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).IsNot(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF)) || (logic->IsAdult && logic->FireTimer >= 24);}}),
   });
 
-  areaTable[RR_DMC_GREAT_FAIRY_FOUNTAIN] = Area("DMC Great Fairy Fountain", "DMC Great Fairy Fountain", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DMC_GREAT_FAIRY_FOUNTAIN] = Region("DMC Great Fairy Fountain", "DMC Great Fairy Fountain", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DMC_GREAT_FAIRY_REWARD, logic->CanUse(RG_ZELDAS_LULLABY)),
                 }, {
@@ -243,7 +243,7 @@ void AreaTable_Init_DeathMountain() {
                   Entrance(RR_DMC_LOWER_LOCAL, {[]{return true;}}),
   });
 
-  areaTable[RR_DMC_UPPER_GROTTO] = Area("DMC Upper Grotto", "DMC Upper Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+  areaTable[RR_DMC_UPPER_GROTTO] = Region("DMC Upper Grotto", "DMC Upper Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LOCATION(RC_DMC_UPPER_GROTTO_CHEST,         true),
                   LOCATION(RC_DMC_UPPER_GROTTO_FISH,          logic->HasBottle),
@@ -255,7 +255,7 @@ void AreaTable_Init_DeathMountain() {
                   Entrance(RR_DMC_UPPER_LOCAL, {[]{return true;}}),
   });
 
-  areaTable[RR_DMC_HAMMER_GROTTO] = Area("DMC Hammer Grotto", "DMC Hammer Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DMC_HAMMER_GROTTO] = Region("DMC Hammer Grotto", "DMC Hammer Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DMC_DEKU_SCRUB_GROTTO_LEFT,   logic->CanStunDeku),
                   LOCATION(RC_DMC_DEKU_SCRUB_GROTTO_RIGHT,  logic->CanStunDeku),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp
index 492a226f4..1c2f55ab6 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp
@@ -4,11 +4,11 @@
 
 using namespace Rando;
 
-void AreaTable_Init_DekuTree() {
+void RegionTable_Init_DekuTree() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[RR_DEKU_TREE_ENTRYWAY] = Area("Deku Tree Entryway", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DEKU_TREE_ENTRYWAY] = Region("Deku Tree Entryway", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DEKU_TREE_LOBBY,      {[]{return randoCtx->GetDungeon(DEKU_TREE)->IsVanilla();}}),
                   Entrance(RR_DEKU_TREE_MQ_LOBBY,   {[]{return randoCtx->GetDungeon(DEKU_TREE)->IsMQ();}}),
@@ -19,7 +19,7 @@ void AreaTable_Init_DekuTree() {
   |     VANILLA DUNGEON      |
   ---------------------------*/
   if (randoCtx->GetDungeon(DEKU_TREE)->IsVanilla()) {
-  areaTable[RR_DEKU_TREE_LOBBY] = Area("Deku Tree Lobby", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DEKU_TREE_LOBBY] = Region("Deku Tree Lobby", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
                   EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUse(RG_DINS_FIRE));}}),
@@ -36,13 +36,13 @@ void AreaTable_Init_DekuTree() {
                   Entrance(RR_DEKU_TREE_BOSS_ENTRYWAY,     {[]{return false;}}),
   });
 
-  areaTable[RR_DEKU_TREE_2F_MIDDLE_ROOM] = Area("Deku Tree 2F Middle Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DEKU_TREE_2F_MIDDLE_ROOM] = Region("Deku Tree 2F Middle Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DEKU_TREE_LOBBY,         {[]{return Here(RR_DEKU_TREE_2F_MIDDLE_ROOM, []{return logic->HasShield || logic->CanUse(RG_MEGATON_HAMMER);});}}),
                   Entrance(RR_DEKU_TREE_SLINGSHOT_ROOM,{[]{return Here(RR_DEKU_TREE_2F_MIDDLE_ROOM, []{return logic->HasShield || logic->CanUse(RG_MEGATON_HAMMER);});}}),
   });
 
-  areaTable[RR_DEKU_TREE_SLINGSHOT_ROOM] = Area("Deku Tree Slingshot Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DEKU_TREE_SLINGSHOT_ROOM] = Region("Deku Tree Slingshot Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DEKU_TREE_SLINGSHOT_CHEST,           true),
                   LOCATION(RC_DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST, true),
@@ -51,7 +51,7 @@ void AreaTable_Init_DekuTree() {
                   Entrance(RR_DEKU_TREE_2F_MIDDLE_ROOM, {[]{return logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_HOVER_BOOTS);}}),
   });
 
-  areaTable[RR_DEKU_TREE_COMPASS_ROOM] = Area("Deku Tree Compass Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DEKU_TREE_COMPASS_ROOM] = Region("Deku Tree Compass Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
                   EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUse(RG_DINS_FIRE));}}),
@@ -66,7 +66,7 @@ void AreaTable_Init_DekuTree() {
                   Entrance(RR_DEKU_TREE_BOSS_ENTRYWAY, {[]{return false;}}),
   });
 
-  areaTable[RR_DEKU_TREE_BASEMENT_LOWER] = Area("Deku Tree Basement Lower", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DEKU_TREE_BASEMENT_LOWER] = Region("Deku Tree Basement Lower", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->Boomerang);}}),
                   EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUse(RG_DINS_FIRE));},
@@ -84,25 +84,25 @@ void AreaTable_Init_DekuTree() {
                   Entrance(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM,   {[]{return false;}}),
   });
 
-  areaTable[RR_DEKU_TREE_BASEMENT_SCRUB_ROOM] = Area("Deku Tree Basement Scrub Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DEKU_TREE_BASEMENT_SCRUB_ROOM] = Region("Deku Tree Basement Scrub Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DEKU_TREE_BASEMENT_LOWER,            {[]{return true;}}),
                   Entrance(RR_DEKU_TREE_BASEMENT_WATER_ROOM_FRONT, {[]{return Here(RR_DEKU_TREE_BASEMENT_SCRUB_ROOM, []{return logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW);});}}),
   });
 
-  areaTable[RR_DEKU_TREE_BASEMENT_WATER_ROOM_FRONT] = Area("Deku Tree Basement Water Room Front", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DEKU_TREE_BASEMENT_WATER_ROOM_FRONT] = Region("Deku Tree Basement Water Room Front", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DEKU_TREE_BASEMENT_SCRUB_ROOM,      {[]{return true;}}),
                   Entrance(RR_DEKU_TREE_BASEMENT_WATER_ROOM_BACK, {[]{return logic->Swim || randoCtx->GetTrickOption(RT_DEKU_B1_BACKFLIP_OVER_SPIKED_LOG);}}),
   });
 
-  areaTable[RR_DEKU_TREE_BASEMENT_WATER_ROOM_BACK] = Area("Deku Tree Basement Water Room Back", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DEKU_TREE_BASEMENT_WATER_ROOM_BACK] = Region("Deku Tree Basement Water Room Back", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DEKU_TREE_BASEMENT_WATER_ROOM_FRONT, {[]{return logic->Swim || randoCtx->GetTrickOption(RT_DEKU_B1_BACKFLIP_OVER_SPIKED_LOG);}}),
                   Entrance(RR_DEKU_TREE_BASEMENT_TORCH_ROOM,       {[]{return true;}}),
   });
 
-  areaTable[RR_DEKU_TREE_BASEMENT_TORCH_ROOM] = Area("Deku Tree Basement Torch Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DEKU_TREE_BASEMENT_TORCH_ROOM] = Region("Deku Tree Basement Torch Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
                   EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUse(RG_DINS_FIRE));}}),
@@ -112,7 +112,7 @@ void AreaTable_Init_DekuTree() {
                   Entrance(RR_DEKU_TREE_BASEMENT_BACK_LOBBY,      {[]{return Here(RR_DEKU_TREE_BASEMENT_TORCH_ROOM, []{return logic->HasFireSourceWithTorch || logic->CanUse(RG_FAIRY_BOW);});}}),
   });
 
-  areaTable[RR_DEKU_TREE_BASEMENT_BACK_LOBBY] = Area("Deku Tree Basement Back Lobby", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DEKU_TREE_BASEMENT_BACK_LOBBY] = Region("Deku Tree Basement Back Lobby", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
                   EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (Here(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, []{return logic->HasFireSourceWithTorch || logic->CanUse(RG_FAIRY_BOW);}) &&
@@ -125,7 +125,7 @@ void AreaTable_Init_DekuTree() {
                   Entrance(RR_DEKU_TREE_BASEMENT_UPPER,      {[]{return Here(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, []{return logic->HasFireSourceWithTorch || logic->CanUse(RG_FAIRY_BOW);}) && logic->IsChild;}}),
   });
 
-  areaTable[RR_DEKU_TREE_BASEMENT_BACK_ROOM] = Area("Deku Tree Basement Back Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DEKU_TREE_BASEMENT_BACK_ROOM] = Region("Deku Tree Basement Back Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DEKU_TREE_GS_BASEMENT_BACK_ROOM, logic->HookshotOrBoomerang),
                 }, {
@@ -133,7 +133,7 @@ void AreaTable_Init_DekuTree() {
                   Entrance(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, {[]{return true;}}),
   });
 
-  areaTable[RR_DEKU_TREE_BASEMENT_UPPER] = Area("Deku Tree Basement Upper", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DEKU_TREE_BASEMENT_UPPER] = Region("Deku Tree Basement Upper", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
                   EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUse(RG_DINS_FIRE));}}),
@@ -144,7 +144,7 @@ void AreaTable_Init_DekuTree() {
                   Entrance(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM,   {[]{return Here(RR_DEKU_TREE_BASEMENT_UPPER, []{return logic->HasFireSourceWithTorch || (randoCtx->GetTrickOption(RT_DEKU_B1_BOW_WEBS) && logic->IsAdult && logic->CanUse(RG_FAIRY_BOW));});}}),
   });
 
-  areaTable[RR_DEKU_TREE_OUTSIDE_BOSS_ROOM] = Area("Deku Tree Outside Boss Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DEKU_TREE_OUTSIDE_BOSS_ROOM] = Region("Deku Tree Outside Boss Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DEKU_TREE_BASEMENT_UPPER, {[]{return true;}}),
                   Entrance(RR_DEKU_TREE_BOSS_ENTRYWAY,  {[]{return (logic->Swim || Here(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM, []{return logic->CanUse(RG_IRON_BOOTS);})) && Here(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM, []{return logic->HasShield;});}}),
@@ -155,7 +155,7 @@ void AreaTable_Init_DekuTree() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (randoCtx->GetDungeon(DEKU_TREE)->IsMQ()) {
-  areaTable[RR_DEKU_TREE_MQ_LOBBY] = Area("Deku Tree MQ Lobby", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DEKU_TREE_MQ_LOBBY] = Region("Deku Tree MQ Lobby", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
                   EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUse(RG_DINS_FIRE));}}),
@@ -176,7 +176,7 @@ void AreaTable_Init_DekuTree() {
                   Entrance(RR_DEKU_TREE_MQ_BASEMENT_LEDGE,            {[]{return randoCtx->GetTrickOption(RT_DEKU_B1_SKIP) || Here(RR_DEKU_TREE_MQ_LOBBY, []{return logic->IsAdult;});}}),
   });
 
-  areaTable[RR_DEKU_TREE_MQ_COMPASS_ROOM] = Area("Deku Tree MQ Compass Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DEKU_TREE_MQ_COMPASS_ROOM] = Region("Deku Tree MQ Compass Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DEKU_TREE_MQ_COMPASS_CHEST,   true),
                   LOCATION(RC_DEKU_TREE_MQ_GS_COMPASS_ROOM, logic->HookshotOrBoomerang &&
@@ -188,7 +188,7 @@ void AreaTable_Init_DekuTree() {
                   Entrance(RR_DEKU_TREE_MQ_LOBBY, {[]{return true;}}),
   });
 
-  areaTable[RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_FRONT] = Area("Deku Tree MQ Basement Water Room Front", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_FRONT] = Region("Deku Tree MQ Basement Water Room Front", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST, true),
   }, {
@@ -198,7 +198,7 @@ void AreaTable_Init_DekuTree() {
                   Entrance(RR_DEKU_TREE_MQ_LOBBY,                    {[]{return true;}}),
   });
 
-  areaTable[RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK] = Area("Deku Tree MQ Basement Water Room Back", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK] = Region("Deku Tree MQ Basement Water Room Back", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST, logic->CanUse(RG_SONG_OF_TIME)),
   }, {
@@ -210,7 +210,7 @@ void AreaTable_Init_DekuTree() {
                   Entrance(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_FRONT, {[]{return true;}}),
   });
 
-  areaTable[RR_DEKU_TREE_MQ_BASEMENT_BACK_ROOM] = Area("Deku Tree MQ Basement Back Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DEKU_TREE_MQ_BASEMENT_BACK_ROOM] = Region("Deku Tree MQ Basement Back Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM, (logic->IsAdult && logic->CanUse(RG_LONGSHOT)) || (logic->CanUse(RG_SONG_OF_TIME) && logic->HookshotOrBoomerang)),
                   LOCATION(RC_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM,   logic->HasFireSourceWithTorch && logic->HookshotOrBoomerang),
@@ -220,7 +220,7 @@ void AreaTable_Init_DekuTree() {
                   Entrance(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK, {[]{return (logic->IsChild && logic->CanUse(RG_KOKIRI_SWORD)) || logic->CanUseProjectile || (logic->CanUse(RG_NUTS) && (logic->IsChild && logic->CanUse(RG_STICKS)));}}),
   });
 
-  areaTable[RR_DEKU_TREE_MQ_BASEMENT_LEDGE] = Area("Deku Tree MQ Basement Ledge", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DEKU_TREE_MQ_BASEMENT_LEDGE] = Region("Deku Tree MQ Basement Ledge", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DEKU_TREE_MQ_DEKU_SCRUB, logic->CanStunDeku),
   }, {
@@ -232,7 +232,7 @@ void AreaTable_Init_DekuTree() {
   });
 
     areaTable[RR_DEKU_TREE_MQ_OUTSIDE_BOSS_ROOM] =
-            Area("Deku Tree MQ Outside Boss Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {},
+            Region("Deku Tree MQ Outside Boss Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {},
                  {
                      // Exits
                      Entrance(RR_DEKU_TREE_MQ_BASEMENT_LEDGE, {[]{ return true; }}),
@@ -244,7 +244,7 @@ void AreaTable_Init_DekuTree() {
     |         BOSS ROOM         |
     ---------------------------*/
     areaTable[RR_DEKU_TREE_BOSS_ENTRYWAY] =
-        Area("Deku Tree Boss Entryway", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {},
+        Region("Deku Tree Boss Entryway", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {},
              {
                  // Exits
                  Entrance(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM, { [] { return randoCtx->GetDungeon(DEKU_TREE)->IsVanilla(); } }),
@@ -253,7 +253,7 @@ void AreaTable_Init_DekuTree() {
              });
 
     areaTable[RR_DEKU_TREE_BOSS_ROOM] =
-        Area("Deku Tree Boss Room", "Deku Tree", RA_NONE, NO_DAY_NIGHT_CYCLE,
+        Region("Deku Tree Boss Room", "Deku Tree", RA_NONE, NO_DAY_NIGHT_CYCLE,
              {
                  // Events
                  EventAccess(&logic->DekuTreeClear, { [] {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp
index 591705e51..7982c942f 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp
@@ -4,11 +4,11 @@
 
 using namespace Rando;
 
-void AreaTable_Init_DodongosCavern() {
+void RegionTable_Init_DodongosCavern() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[RR_DODONGOS_CAVERN_ENTRYWAY] = Area("Dodongos Cavern Entryway", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_ENTRYWAY] = Region("Dodongos Cavern Entryway", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_BEGINNING,    {[]{return randoCtx->GetDungeon(DODONGOS_CAVERN)->IsVanilla();}}),
                   Entrance(RR_DODONGOS_CAVERN_MQ_BEGINNING, {[]{return randoCtx->GetDungeon(DODONGOS_CAVERN)->IsMQ();}}),
@@ -19,13 +19,13 @@ void AreaTable_Init_DodongosCavern() {
   |     VANILLA DUNGEON      |
   ---------------------------*/
   if (randoCtx->GetDungeon(DODONGOS_CAVERN)->IsVanilla()) {
-  areaTable[RR_DODONGOS_CAVERN_BEGINNING] = Area("Dodongos Cavern Beginning", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_BEGINNING] = Region("Dodongos Cavern Beginning", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_ENTRYWAY, {[]{return true;}}),
                   Entrance(RR_DODONGOS_CAVERN_LOBBY,    {[]{return Here(RR_DODONGOS_CAVERN_BEGINNING, []{return logic->CanBlastOrSmash || logic->GoronBracelet;});}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_LOBBY] = Area("Dodongos Cavern Lobby", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DODONGOS_CAVERN_LOBBY] = Region("Dodongos Cavern Lobby", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || (logic->CanSummonGossipFairy && Here(RR_DODONGOS_CAVERN_LOBBY, []{return logic->CanBlastOrSmash || logic->GoronBracelet;}));}}),
                 }, {
@@ -44,13 +44,13 @@ void AreaTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_BOSS_ENTRYWAY,{[]{return false;}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_LOBBY_SWITCH] = Area("Dodongos Cavern Lobby Switch", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_LOBBY_SWITCH] = Region("Dodongos Cavern Lobby Switch", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_LOBBY,        {[]{return true;}}),
                   Entrance(RR_DODONGOS_CAVERN_DODONGO_ROOM, {[]{return true;}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_SE_CORRIDOR] = Area("Dodongos Cavern SE Corridor", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_SE_CORRIDOR] = Region("Dodongos Cavern SE Corridor", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DODONGOS_CAVERN_GS_SCARECROW, logic->CanUse(RG_SCARECROW) || (logic->IsAdult && logic->CanUse(RG_LONGSHOT)) || (randoCtx->GetTrickOption(RT_DC_SCARECROW_GS) && (logic->CanAdultAttack || logic->CanChildAttack))),
                 }, {
@@ -60,7 +60,7 @@ void AreaTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_NEAR_LOWER_LIZALFOS, {[]{return true;}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_SE_ROOM] = Area("Dodongos Cavern SE Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_SE_ROOM] = Region("Dodongos Cavern SE Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS, logic->CanAdultAttack || logic->CanChildAttack),
                 }, {
@@ -68,13 +68,13 @@ void AreaTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_SE_CORRIDOR, {[]{return true;}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_NEAR_LOWER_LIZALFOS] = Area("Dodongos Cavern Near Lower Lizalfos", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_NEAR_LOWER_LIZALFOS] = Region("Dodongos Cavern Near Lower Lizalfos", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_SE_CORRIDOR,    {[]{return true;}}),
                   Entrance(RR_DODONGOS_CAVERN_LOWER_LIZALFOS, {[]{return true;}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_LOWER_LIZALFOS] = Area("Dodongos Cavern Lower Lizalfos", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_LOWER_LIZALFOS] = Region("Dodongos Cavern Lower Lizalfos", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_NEAR_LOWER_LIZALFOS, {[]{return Here(RR_DODONGOS_CAVERN_LOWER_LIZALFOS, []{return logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_STICKS) || logic->CanUse(RG_KOKIRI_SWORD) ||
                     logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives;});}}),
@@ -82,14 +82,14 @@ void AreaTable_Init_DodongosCavern() {
                     logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives;});}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_DODONGO_ROOM] = Area("Dodongos Cavern Dodongo Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_DODONGO_ROOM] = Region("Dodongos Cavern Dodongo Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_LOBBY_SWITCH,      {[]{return logic->HasFireSourceWithTorch;}}),
                   Entrance(RR_DODONGOS_CAVERN_LOWER_LIZALFOS,    {[]{return true;}}),
                   Entrance(RR_DODONGOS_CAVERN_NEAR_DODONGO_ROOM, {[]{return Here(RR_DODONGOS_CAVERN_DODONGO_ROOM, []{return logic->CanBlastOrSmash || logic->GoronBracelet;});}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_NEAR_DODONGO_ROOM] = Area("Dodongos Cavern Near Dodongo Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_NEAR_DODONGO_ROOM] = Region("Dodongos Cavern Near Dodongo Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS, logic->CanStunDeku),
                 }, {
@@ -97,14 +97,14 @@ void AreaTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_DODONGO_ROOM, {[]{return true;}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_STAIRS_LOWER] = Area("Dodongos Cavern Stairs Lower", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_STAIRS_LOWER] = Region("Dodongos Cavern Stairs Lower", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_LOBBY,        {[]{return true;}}),
                   Entrance(RR_DODONGOS_CAVERN_STAIRS_UPPER, {[]{return logic->HasExplosives || logic->GoronBracelet || logic->CanUse(RG_DINS_FIRE) || (randoCtx->GetTrickOption(RT_DC_STAIRCASE) && logic->CanUse(RG_FAIRY_BOW));}}),
                   Entrance(RR_DODONGOS_CAVERN_COMPASS_ROOM, {[]{return Here(RR_DODONGOS_CAVERN_STAIRS_LOWER, []{return logic->CanBlastOrSmash || logic->GoronBracelet;});}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_STAIRS_UPPER] = Area("Dodongos Cavern Stairs Upper", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_STAIRS_UPPER] = Region("Dodongos Cavern Stairs Upper", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS, Here(RR_DODONGOS_CAVERN_FAR_BRIDGE, []{return logic->HookshotOrBoomerang;}) || logic->CanUse(RG_LONGSHOT)),
                   LOCATION(RC_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS,  logic->IsAdult || logic->CanChildAttack || (HasAccessTo(RR_DODONGOS_CAVERN_STAIRS_LOWER) && logic->CanUse(RG_LONGSHOT) && randoCtx->GetTrickOption(RT_DC_VINES_GS))),
@@ -114,7 +114,7 @@ void AreaTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_ARMOS_ROOM,   {[]{return true;}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_COMPASS_ROOM] = Area("Dodongos Cavern Compass Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_COMPASS_ROOM] = Region("Dodongos Cavern Compass Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DODONGOS_CAVERN_COMPASS_CHEST, true),
                 }, {
@@ -122,13 +122,13 @@ void AreaTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_STAIRS_LOWER, {[]{return logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->GoronBracelet;}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_ARMOS_ROOM] = Area("Dodongos Cavern Armos Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_ARMOS_ROOM] = Region("Dodongos Cavern Armos Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_STAIRS_UPPER,    {[]{return true;}}),
                   Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER, {[]{return true;}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER] = Area("Dodongos Cavern Bomb Room Lower", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER] = Region("Dodongos Cavern Bomb Room Lower", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST, true),
                 }, {
@@ -138,7 +138,7 @@ void AreaTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_UPPER,      {[]{return (logic->IsAdult && randoCtx->GetTrickOption(RT_DC_JUMP)) || logic->CanUse(RG_HOVER_BOOTS) || (logic->IsAdult && logic->CanUse(RG_LONGSHOT));}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_2F_SIDE_ROOM] = Area("Dodongos Cavern 2F Side Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_2F_SIDE_ROOM] = Region("Dodongos Cavern 2F Side Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,  logic->CanStunDeku),
                   LOCATION(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT, logic->CanStunDeku),
@@ -147,13 +147,13 @@ void AreaTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER, {[]{return true;}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_FIRST_SLINGSHOT_ROOM] = Area("Dodongos Cavern First Slingshot Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_FIRST_SLINGSHOT_ROOM] = Region("Dodongos Cavern First Slingshot Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER, {[]{return true;}}),
                   Entrance(RR_DODONGOS_CAVERN_UPPER_LIZALFOS,  {[]{return logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || randoCtx->GetTrickOption(RT_DC_SLINGSHOT_SKIP);}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_UPPER_LIZALFOS] = Area("Dodongos Cavern Upper Lizalfos", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_UPPER_LIZALFOS] = Region("Dodongos Cavern Upper Lizalfos", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_LOWER_LIZALFOS,        {[]{return true;}}),
                   Entrance(RR_DODONGOS_CAVERN_FIRST_SLINGSHOT_ROOM,  {[]{return Here(RR_DODONGOS_CAVERN_LOWER_LIZALFOS, []{return logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_STICKS) || logic->CanUse(RG_KOKIRI_SWORD) || 
@@ -162,13 +162,13 @@ void AreaTable_Init_DodongosCavern() {
                     logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives;});}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_SECOND_SLINGSHOT_ROOM] = Area("Dodongos Cavern Second Slingshot Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_SECOND_SLINGSHOT_ROOM] = Region("Dodongos Cavern Second Slingshot Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_UPPER_LIZALFOS,  {[]{return true;}}),
                   Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_UPPER, {[]{return logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || randoCtx->GetTrickOption(RT_DC_SLINGSHOT_SKIP);}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_BOMB_ROOM_UPPER] = Area("Dodongos Cavern Bomb Room Upper", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_BOMB_ROOM_UPPER] = Region("Dodongos Cavern Bomb Room Upper", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DODONGOS_CAVERN_BOMB_BAG_CHEST, true),
                 }, {
@@ -178,7 +178,7 @@ void AreaTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_FAR_BRIDGE,            {[]{return true;}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_FAR_BRIDGE] = Area("Dodongos Cavern Far Bridge", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_FAR_BRIDGE] = Region("Dodongos Cavern Far Bridge", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST, Here(RR_DODONGOS_CAVERN_FAR_BRIDGE, []{return logic->CanBlastOrSmash;})),
                 }, {
@@ -187,7 +187,7 @@ void AreaTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_UPPER, {[]{return true;}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_BOSS_AREA] = Area("Dodongos Cavern Boss Area", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DODONGOS_CAVERN_BOSS_AREA] = Region("Dodongos Cavern Boss Region", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FairyPot, {[]{return true;}}),
                 }, {}, {
@@ -197,7 +197,7 @@ void AreaTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_BOSS_ENTRYWAY, {[]{return true;}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_BACK_ROOM] = Area("Dodongos Cavern Back Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_BACK_ROOM] = Region("Dodongos Cavern Back Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DODONGOS_CAVERN_GS_BACK_ROOM, logic->CanAdultAttack || logic->CanChildAttack),
                 }, {
@@ -210,13 +210,13 @@ void AreaTable_Init_DodongosCavern() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (randoCtx->GetDungeon(DODONGOS_CAVERN)->IsMQ()) {
-  areaTable[RR_DODONGOS_CAVERN_MQ_BEGINNING] = Area("Dodongos Cavern MQ Beginning", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_MQ_BEGINNING] = Region("Dodongos Cavern MQ Beginning", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_ENTRYWAY, {[]{return true;}}),
                   Entrance(RR_DODONGOS_CAVERN_MQ_LOBBY, {[]{return Here(RR_DODONGOS_CAVERN_MQ_BEGINNING, []{return logic->CanBlastOrSmash || logic->GoronBracelet;});}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_MQ_LOBBY] = Area("Dodongos Cavern MQ Lobby", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DODONGOS_CAVERN_MQ_LOBBY] = Region("Dodongos Cavern MQ Lobby", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->DekuBabaSticks,   {[]{return logic->DekuBabaSticks || (logic->IsAdult || logic->KokiriSword || logic->Boomerang);}}),
                   EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CanSummonGossipFairy;}}),
@@ -242,7 +242,7 @@ void AreaTable_Init_DodongosCavern() {
                     //Trick: logic->HasExplosives || (LogicDCMQEyes && logic->GoronBracelet && (logic->IsAdult || LogicDCMQChildBack) && ((logic->IsChild && logic->CanUse(RG_STICKS)) || logic->CanUse(RG_DINS_FIRE) || (logic->IsAdult && (LogicDCJump || logic->Hammer || logic->HoverBoots || logic->Hookshot))))
   });
 
-  areaTable[RR_DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE] = Area("Dodongos Cavern MQ Lower Right Side", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE] = Region("Dodongos Cavern MQ Lower Right Side", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS, logic->CanStunDeku),
   }, {
@@ -252,7 +252,7 @@ void AreaTable_Init_DodongosCavern() {
                                                                                 logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT);}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_MQ_BOMB_BAG_AREA] = Area("Dodongos Cavern MQ Bomb Bag Area", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_MQ_BOMB_BAG_AREA] = Region("Dodongos Cavern MQ Bomb Bag Region", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST, true),
                   LOCATION(RC_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM,  (Here(RR_DODONGOS_CAVERN_MQ_BOMB_BAG_AREA, []{return logic->IsAdult && logic->CanUse(RG_FAIRY_BOW);}) ||  logic->GoronBracelet || logic->CanUse(RG_DINS_FIRE) || logic->HasExplosives) && logic->HookshotOrBoomerang),
@@ -261,7 +261,7 @@ void AreaTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE, {[]{return true;}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_MQ_BOSS_AREA] = Area("Dodongos Cavern MQ BossArea", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DODONGOS_CAVERN_MQ_BOSS_AREA] = Region("Dodongos Cavern MQ BossArea", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FairyPot,            {[]{return true;}}),
   }, {
@@ -278,7 +278,7 @@ void AreaTable_Init_DodongosCavern() {
     |         BOSS ROOM         |
     ---------------------------*/
     areaTable[RR_DODONGOS_CAVERN_BOSS_ENTRYWAY] =
-        Area("Dodongos Cavern Boss Entryway", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {},
+        Region("Dodongos Cavern Boss Entryway", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {},
              {
                  // Exits
                  Entrance(RR_DODONGOS_CAVERN_BOSS_AREA, { [] { return randoCtx->GetDungeon(DODONGOS_CAVERN)->IsVanilla(); } }),
@@ -287,7 +287,7 @@ void AreaTable_Init_DodongosCavern() {
              });
 
     areaTable[RR_DODONGOS_CAVERN_BOSS_ROOM] =
-        Area("Dodongos Cavern Boss Room", "Dodongos Cavern", RA_NONE, NO_DAY_NIGHT_CYCLE,
+        Region("Dodongos Cavern Boss Room", "Dodongos Cavern", RA_NONE, NO_DAY_NIGHT_CYCLE,
              {
                  // Events
                  EventAccess(&logic->DodongosCavernClear,
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp
index b3c2e5387..e888f26d2 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp
@@ -4,11 +4,11 @@
 
 using namespace Rando;
 
-void AreaTable_Init_FireTemple() {
+void RegionTable_Init_FireTemple() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[RR_FIRE_TEMPLE_ENTRYWAY] = Area("Fire Temple Entryway", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_ENTRYWAY] = Region("Fire Temple Entryway", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_FIRST_ROOM, {[]{return randoCtx->GetDungeon(FIRE_TEMPLE)->IsVanilla();}}),
                   Entrance(RR_FIRE_TEMPLE_MQ_LOWER,   {[]{return randoCtx->GetDungeon(FIRE_TEMPLE)->IsMQ();}}),
@@ -19,7 +19,7 @@ void AreaTable_Init_FireTemple() {
   |     VANILLA DUNGEON      |
   ---------------------------*/
   if (randoCtx->GetDungeon(FIRE_TEMPLE)->IsVanilla()) {
-  areaTable[RR_FIRE_TEMPLE_FIRST_ROOM] = Area("Fire Temple First Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_FIRST_ROOM] = Region("Fire Temple First Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                 }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_ENTRYWAY,       {[]{return true;}}),
@@ -29,7 +29,7 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM,  {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 2) && logic->FireTimer >= 24;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_NEAR_BOSS_ROOM] = Area("Fire Temple Near Boss Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FIRE_TEMPLE_NEAR_BOSS_ROOM] = Region("Fire Temple Near Boss Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FairyPot, {[]{return logic->FairyPot || (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT));}}),
                 }, {
@@ -41,13 +41,13 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_BOSS_ENTRYWAY, {[]{return logic->BossKeyFireTemple && ((logic->IsAdult && (randoCtx->GetTrickOption(RT_FIRE_BOSS_DOOR_JUMP) || Here(RR_FIRE_TEMPLE_FIRE_MAZE_UPPER, []{return logic->CanUse(RG_MEGATON_HAMMER);}))) || logic->CanUse(RG_HOVER_BOOTS));}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_LOOP_ENEMIES] = Area("Fire Temple Loop Enemies", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_LOOP_ENEMIES] = Region("Fire Temple Loop Enemies", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_FIRST_ROOM, {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 8) || !logic->IsKeysanity;}}),
                   Entrance(RR_FIRE_TEMPLE_LOOP_TILES, {[]{return Here(RR_FIRE_TEMPLE_LOOP_ENEMIES, []{return logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER);});}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_LOOP_TILES] = Area("Fire Temple Loop Tiles", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_LOOP_TILES] = Region("Fire Temple Loop Tiles", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FIRE_TEMPLE_GS_BOSS_KEY_LOOP, logic->CanAdultAttack || logic->CanChildAttack),
                 }, {
@@ -56,7 +56,7 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_LOOP_FLARE_DANCER, {[]{return true;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_LOOP_FLARE_DANCER] = Area("Fire Temple Loop Flare Dancer", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_LOOP_FLARE_DANCER] = Region("Fire Temple Loop Flare Dancer", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FIRE_TEMPLE_FLARE_DANCER_CHEST, (logic->HasExplosives || logic->CanUse(RG_MEGATON_HAMMER)) && logic->IsAdult),
                 }, {
@@ -66,7 +66,7 @@ void AreaTable_Init_FireTemple() {
                    logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_BOOMERANG)));});}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_LOOP_HAMMER_SWITCH] = Area("Fire Temple Loop Hammer Switch", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FIRE_TEMPLE_LOOP_HAMMER_SWITCH] = Region("Fire Temple Loop Hammer Switch", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FireLoopSwitch, {[]{return logic->FireLoopSwitch || logic->CanUse(RG_MEGATON_HAMMER);}}),
                 }, {}, {
@@ -75,7 +75,7 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_LOOP_GORON_ROOM,   {[]{return logic->FireLoopSwitch;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_LOOP_GORON_ROOM] = Area("Fire Temple Loop Goron Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_LOOP_GORON_ROOM] = Region("Fire Temple Loop Goron Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FIRE_TEMPLE_BOSS_KEY_CHEST, true),
                 }, {
@@ -84,13 +84,13 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_LOOP_EXIT,          {[]{return logic->FireLoopSwitch;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_LOOP_EXIT] = Area("Fire Temple Loop Exit", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_LOOP_EXIT] = Region("Fire Temple Loop Exit", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_FIRST_ROOM,      {[]{return true;}}),
                   Entrance(RR_FIRE_TEMPLE_LOOP_GORON_ROOM, {[]{return logic->FireLoopSwitch;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_BIG_LAVA_ROOM] = Area("Fire Temple Big Lava Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_BIG_LAVA_ROOM] = Region("Fire Temple Big Lava Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_FIRST_ROOM,                {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 2);}}),
                   Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_GORON, {[]{return true;}}),
@@ -99,7 +99,7 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_FIRE_PILLAR_ROOM,          {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 3);}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_GORON] = Area("Fire Temple Big Lava Room North Goron", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_GORON] = Region("Fire Temple Big Lava Room North Goron", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST, true),
                 }, {
@@ -107,7 +107,7 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM, {[]{return true;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_TILES] = Area("Fire Temple Big Lava Room North Tiles", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_TILES] = Region("Fire Temple Big Lava Room North Tiles", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM, logic->CanAdultAttack || logic->HookshotOrBoomerang),
                 }, {
@@ -115,7 +115,7 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM, {[]{return true;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_BIG_LAVA_ROOM_SOUTH_GORON] = Area("Fire Temple Big Lava Room South Goron", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_BIG_LAVA_ROOM_SOUTH_GORON] = Region("Fire Temple Big Lava Room South Goron", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST, true),
                 }, {
@@ -123,13 +123,13 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM, {[]{return true;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_FIRE_PILLAR_ROOM] = Area("Fire Temple Fire Pillar Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_FIRE_PILLAR_ROOM] = Region("Fire Temple Fire Pillar Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM, {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 3);}}),
                   Entrance(RR_FIRE_TEMPLE_SHORTCUT_ROOM, {[]{return logic->FireTimer >= 56 && logic->SmallKeys(RR_FIRE_TEMPLE, 4);}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_SHORTCUT_ROOM] = Area("Fire Temple Shortcut Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_SHORTCUT_ROOM] = Region("Fire Temple Shortcut Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST, Here(RR_FIRE_TEMPLE_SHORTCUT_CLIMB, []{return true;})),
                 }, {
@@ -139,13 +139,13 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER, {[]{return logic->IsAdult && (logic->GoronBracelet || randoCtx->GetTrickOption(RT_FIRE_STRENGTH)) && (logic->HasExplosives || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_FAIRY_SLINGSHOT));}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_SHORTCUT_CLIMB] = Area("Fire Temple Shortcut Climb", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_SHORTCUT_CLIMB] = Region("Fire Temple Shortcut Climb", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_SHORTCUT_ROOM,      {[]{return true;}}),
                   Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_UPPER, {[]{return true;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER] = Area("Fire Temple Boulder Maze Lower", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER] = Region("Fire Temple Boulder Maze Lower", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST, true),
                   LOCATION(RC_FIRE_TEMPLE_GS_BOULDER_MAZE,          logic->HasExplosives && (logic->IsAdult || logic->HookshotOrBoomerang)),
@@ -157,7 +157,7 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_UPPER,           {[]{return false;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER_SIDE_ROOM] = Area("Fire Temple Boulder Maze Lower Side Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER_SIDE_ROOM] = Region("Fire Temple Boulder Maze Lower Side Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST, true),
                 }, {
@@ -165,7 +165,7 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER, {[]{return true;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_EAST_CENTRAL_ROOM] = Area("Fire Temple East Central Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_EAST_CENTRAL_ROOM] = Region("Fire Temple East Central Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM,      {[]{return logic->CanTakeDamage;}}),
                   Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER, {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 5, 8);}}),
@@ -173,7 +173,7 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_MAP_AREA,           {[]{return logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW);}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_FIRE_WALL_CHASE] = Area("Fire Temple Fire Wall Chase", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_FIRE_WALL_CHASE] = Region("Fire Temple Fire Wall Chase", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_EAST_CENTRAL_ROOM,  {[]{return logic->FireTimer >= 24 && logic->SmallKeys(RR_FIRE_TEMPLE, 6, 8);}}),
                   Entrance(RR_FIRE_TEMPLE_MAP_AREA,           {[]{return logic->IsAdult;}}),
@@ -181,7 +181,7 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_CORRIDOR,           {[]{return logic->FireTimer >= 24 && logic->IsAdult && logic->SmallKeys(RR_FIRE_TEMPLE, 7);}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_MAP_AREA] = Area("Fire Temple Map Area", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_MAP_AREA] = Region("Fire Temple Map Region", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FIRE_TEMPLE_MAP_CHEST, true),
                 }, {
@@ -189,7 +189,7 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_EAST_CENTRAL_ROOM, {[]{return true;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_BOULDER_MAZE_UPPER] = Area("Fire Temple Boulder Maze Upper", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_BOULDER_MAZE_UPPER] = Region("Fire Temple Boulder Maze Upper", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST, true),
                 }, {
@@ -200,7 +200,7 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_SCARECROW_ROOM,     {[]{return logic->CanUse(RG_SCARECROW) || (randoCtx->GetTrickOption(RT_FIRE_SCARECROW) && logic->IsAdult && logic->CanUse(RG_LONGSHOT));}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_SCARECROW_ROOM] = Area("Fire Temple Scarecrow Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_SCARECROW_ROOM] = Region("Fire Temple Scarecrow Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FIRE_TEMPLE_GS_SCARECROW_CLIMB, logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG) || logic->HasExplosives || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_DINS_FIRE)),
                 }, {
@@ -209,7 +209,7 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_EAST_PEAK,          {[]{return true;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_EAST_PEAK] = Area("Fire Temple East Peak", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_EAST_PEAK] = Region("Fire Temple East Peak", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FIRE_TEMPLE_SCARECROW_CHEST,  true),
                   LOCATION(RC_FIRE_TEMPLE_GS_SCARECROW_TOP, logic->CanUseProjectile),
@@ -219,13 +219,13 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_EAST_CENTRAL_ROOM, {[]{return logic->CanTakeDamage;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_CORRIDOR] = Area("Fire Temple Corridor", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_CORRIDOR] = Region("Fire Temple Corridor", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_FIRE_WALL_CHASE, {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 7);}}),
                   Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_ROOM,  {[]{return true;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_FIRE_MAZE_ROOM] = Area("Fire Temple Fire Maze Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_FIRE_MAZE_ROOM] = Region("Fire Temple Fire Maze Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_CORRIDOR,            {[]{return true;}}),
                   Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_UPPER,     {[]{return logic->CanUse(RG_HOVER_BOOTS);}}),
@@ -234,14 +234,14 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_LATE_FIRE_MAZE,      {[]{return randoCtx->GetTrickOption(RT_FIRE_FLAME_MAZE) || false;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_FIRE_MAZE_UPPER] = Area("Fire Temple Fire Maze Upper", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_FIRE_MAZE_UPPER] = Region("Fire Temple Fire Maze Upper", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_NEAR_BOSS_ROOM,     {[]{return logic->CanUse(RG_MEGATON_HAMMER);}}),
                   Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_ROOM,     {[]{return true;}}),
                   Entrance(RR_FIRE_TEMPLE_WEST_CENTRAL_UPPER, {[]{return logic->CanUse(RG_MEGATON_HAMMER);}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_FIRE_MAZE_SIDE_ROOM] = Area("Fire Temple Fire Maze Side Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_FIRE_MAZE_SIDE_ROOM] = Region("Fire Temple Fire Maze Side Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FIRE_TEMPLE_COMPASS_CHEST, true),
                 }, {
@@ -249,7 +249,7 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_ROOM, {[]{return true;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_WEST_CENTRAL_LOWER] = Area("Fire Temple West Central Lower", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_WEST_CENTRAL_LOWER] = Region("Fire Temple West Central Lower", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FIRE_TEMPLE_HIGHEST_GORON_CHEST, Here(RR_FIRE_TEMPLE_WEST_CENTRAL_UPPER, []{return (logic->CanUse(RG_SONG_OF_TIME) || randoCtx->GetTrickOption(RT_RUSTED_SWITCHES)) && logic->CanUse(RG_MEGATON_HAMMER);})),
                 }, {
@@ -259,21 +259,21 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_LATE_FIRE_MAZE,     {[]{return true;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_WEST_CENTRAL_UPPER] = Area("Fire Temple West Central Upper", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_WEST_CENTRAL_UPPER] = Region("Fire Temple West Central Upper", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_BOSS_ENTRYWAY,      {[]{return false;}}),
                   Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_UPPER,    {[]{return true;}}),
                   Entrance(RR_FIRE_TEMPLE_WEST_CENTRAL_LOWER, {[]{return true;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_LATE_FIRE_MAZE] = Area("Fire Temple Late Fire Maze", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_LATE_FIRE_MAZE] = Region("Fire Temple Late Fire Maze", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_ROOM,     {[]{return false;}}),
                   Entrance(RR_FIRE_TEMPLE_WEST_CENTRAL_LOWER, {[]{return true;}}),
                   Entrance(RR_FIRE_TEMPLE_UPPER_FLARE_DANCER, {[]{return logic->HasExplosives;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_UPPER_FLARE_DANCER] = Area("Fire Temple Upper Flare Dancer", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_UPPER_FLARE_DANCER] = Region("Fire Temple Upper Flare Dancer", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_LATE_FIRE_MAZE, {[]{return Here(RR_FIRE_TEMPLE_UPPER_FLARE_DANCER, []{return logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_HOOKSHOT) || (logic->HasExplosives && ((logic->CanUse(RG_KOKIRI_SWORD)) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) ||
                    logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_BOOMERANG)));});}}),
@@ -281,13 +281,13 @@ void AreaTable_Init_FireTemple() {
                    logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG)));});}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_WEST_CLIMB] = Area("Fire Temple West Climb", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_WEST_CLIMB] = Region("Fire Temple West Climb", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_UPPER_FLARE_DANCER, {[]{return true;}}),
                   Entrance(RR_FIRE_TEMPLE_WEST_PEAK,          {[]{return logic->CanUseProjectile;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_WEST_PEAK] = Area("Fire Temple West Peak", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_WEST_PEAK] = Region("Fire Temple West Peak", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FIRE_TEMPLE_MEGATON_HAMMER_CHEST, true),
                 }, {
@@ -297,12 +297,12 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_HAMMER_RETURN_PATH, {[]{return logic->CanUse(RG_MEGATON_HAMMER);}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_HAMMER_RETURN_PATH] = Area("Fire Temple Hammer Return Path", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_HAMMER_RETURN_PATH] = Region("Fire Temple Hammer Return Path", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_ABOVE_FIRE_MAZE, {[]{return logic->CanUse(RG_MEGATON_HAMMER);}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_ABOVE_FIRE_MAZE] = Area("Fire Temple Above Fire Maze", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_ABOVE_FIRE_MAZE] = Region("Fire Temple Above Fire Maze", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_HAMMER_RETURN_PATH, {[]{return true;}}),
                   Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_UPPER,    {[]{return logic->CanUse(RG_MEGATON_HAMMER);}}),
@@ -313,7 +313,7 @@ void AreaTable_Init_FireTemple() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (randoCtx->GetDungeon(FIRE_TEMPLE)->IsMQ()) {
-  areaTable[RR_FIRE_TEMPLE_MQ_LOWER] = Area("Fire Temple MQ Lower", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_MQ_LOWER] = Region("Fire Temple MQ Lower", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST, logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->Bombs || logic->CanUse(RG_DINS_FIRE)),
                   LOCATION(RC_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST,     logic->IsAdult && (randoCtx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS) || logic->CanUse(RG_GORON_TUNIC)) && (((logic->CanUse(RG_HOVER_BOOTS) || (randoCtx->GetTrickOption(RT_FIRE_MQ_NEAR_BOSS) && logic->CanUse(RG_FAIRY_BOW))) && logic->HasFireSource) || (logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_FIRE_ARROWS) || (logic->CanUse(RG_DINS_FIRE) && ((randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_OHKO) && randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_QUADRUPLE) && randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_OCTUPLE) && randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_SEXDECUPLE)) || logic->CanUse(RG_GORON_TUNIC) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_LONGSHOT)))))),
@@ -326,7 +326,7 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM,     {[]{return logic->IsAdult && logic->FireTimer >= 24 && logic->CanUse(RG_MEGATON_HAMMER);}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_MQ_LOWER_LOCKED_DOOR] = Area("Fire Temple MQ Lower Locked Door", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FIRE_TEMPLE_MQ_LOWER_LOCKED_DOOR] = Region("Fire Temple MQ Lower Locked Door", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FairyPot, {[]{return true;}}),
   }, {
@@ -335,7 +335,7 @@ void AreaTable_Init_FireTemple() {
                   LOCATION(RC_FIRE_TEMPLE_MQ_MAP_CHEST,            logic->IsAdult && logic->CanUse(RG_MEGATON_HAMMER)),
   }, {});
 
-  areaTable[RR_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM] = Area("Fire Temple MQ Big Lava Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM] = Region("Fire Temple MQ Big Lava Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FairyPot, {[]{return logic->FairyPot || (logic->HasFireSource && (logic->Bow || randoCtx->GetTrickOption(RT_FIRE_MQ_BK_CHEST)) && logic->IsAdult && (logic->CanUse(RG_HOOKSHOT) || randoCtx->GetTrickOption(RT_FIRE_SOT)));}}),
                     //Trick: logic->HasFireSource && (logic->Bow || LogicFireMQBKChest) && logic->IsAdult && (logic->CanUse(RG_HOOKSHOT) || LogicFireSongOfTime)
@@ -352,7 +352,7 @@ void AreaTable_Init_FireTemple() {
                     //Trick: logic->IsAdult && logic->CanUse(RG_GORON_TUNIC) && logic->SmallKeys(RR_FIRE_TEMPLE, 2) && (logic->HasFireSource || (LogicFireMQClimb && logic->HoverBoots))
   });
 
-  areaTable[RR_FIRE_TEMPLE_MQ_LOWER_MAZE] = Area("Fire Temple MQ Lower Maze", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_MQ_LOWER_MAZE] = Region("Fire Temple MQ Lower Maze", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST,     logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)),
                   LOCATION(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST, logic->HasExplosives && (randoCtx->GetTrickOption(RT_FIRE_MQ_MAZE_SIDE_ROOM) || HasAccessTo(RR_FIRE_TEMPLE_MQ_UPPER_MAZE))),
@@ -363,7 +363,7 @@ void AreaTable_Init_FireTemple() {
                     //Trick: (logic->IsAdult && ((logic->HasExplosives && logic->CanUse(RG_HOOKSHOT)) || (LogicFireMQMazeHovers && logic->CanUse(RG_HOVER_BOOTS)))) || LogicFireMQMazeJump
   });
 
-  areaTable[RR_FIRE_TEMPLE_MQ_UPPER_MAZE] = Area("Fire Temple MQ Upper Maze", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FIRE_TEMPLE_MQ_UPPER_MAZE] = Region("Fire Temple MQ Upper Maze", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   //EventAccess(&WallFairy, {[]{return WallFairy || (logic->IsAdult && (((logic->CanUse(RG_SONG_OF_TIME) && logic->CanUse(RG_HOOKSHOT) && logic->HasExplosives) || logic->CanUse(RG_LONGSHOT))));}}),
                   EventAccess(&logic->FairyPot,  {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 3);}}),
@@ -377,7 +377,7 @@ void AreaTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_MQ_UPPER, {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 3) && logic->IsAdult && ((logic->CanUse(RG_FAIRY_BOW) && logic->CanUse(RG_HOOKSHOT)) || logic->CanUse(RG_FIRE_ARROWS));}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_MQ_UPPER] = Area("Fire Temple MQ Upper", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_MQ_UPPER] = Region("Fire Temple MQ Upper", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FIRE_TEMPLE_MQ_FREESTANDING_KEY,            ((logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG)) && logic->CanUse(RG_HOOKSHOT)) || randoCtx->GetTrickOption(RT_FIRE_MQ_FLAME_MAZE)),
                     //Trick: (logic->IsAdult && logic->CanUse(RG_HOOKSHOT)) || LogicFireMQFlameMaze
@@ -395,7 +395,7 @@ void AreaTable_Init_FireTemple() {
     |         BOSS ROOM         |
     ---------------------------*/
     areaTable[RR_FIRE_TEMPLE_BOSS_ENTRYWAY] =
-        Area("Fire Temple Boss Entryway", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
+        Region("Fire Temple Boss Entryway", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
              {
                  // Exits
                  Entrance(RR_FIRE_TEMPLE_NEAR_BOSS_ROOM, { [] { return randoCtx->GetDungeon(FIRE_TEMPLE)->IsVanilla() && false; } }),
@@ -404,7 +404,7 @@ void AreaTable_Init_FireTemple() {
              });
 
     areaTable[RR_FIRE_TEMPLE_BOSS_ROOM] =
-        Area("Fire Temple Boss Room", "Fire Temple", RA_NONE, NO_DAY_NIGHT_CYCLE,
+        Region("Fire Temple Boss Room", "Fire Temple", RA_NONE, NO_DAY_NIGHT_CYCLE,
              {
                  // Events
                  EventAccess(&logic->FireTempleClear,
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp
index eaaee1f36..5619560dc 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp
@@ -4,11 +4,11 @@
 
 using namespace Rando;
 
-void AreaTable_Init_ForestTemple() {
+void RegionTable_Init_ForestTemple() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[RR_FOREST_TEMPLE_ENTRYWAY] = Area("Forest Temple Entryway", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FOREST_TEMPLE_ENTRYWAY] = Region("Forest Temple Entryway", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_FIRST_ROOM, {[]{return randoCtx->GetDungeon(FOREST_TEMPLE)->IsVanilla();}}),
                   Entrance(RR_FOREST_TEMPLE_MQ_LOBBY,   {[]{return randoCtx->GetDungeon(FOREST_TEMPLE)->IsMQ();}}),
@@ -19,7 +19,7 @@ void AreaTable_Init_ForestTemple() {
   |     VANILLA DUNGEON      |
   ---------------------------*/
   if (randoCtx->GetDungeon(FOREST_TEMPLE)->IsVanilla()) {
-  areaTable[RR_FOREST_TEMPLE_FIRST_ROOM] = Area("Forest Temple First Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_FIRST_ROOM] = Region("Forest Temple First Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FOREST_TEMPLE_FIRST_ROOM_CHEST, true),
                   LOCATION(RC_FOREST_TEMPLE_GS_FIRST_ROOM,    (logic->IsAdult && logic->Bombs) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_BOOMERANG) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOMBCHU_5) || logic->CanUse(RG_DINS_FIRE) || (randoCtx->GetTrickOption(RT_FOREST_FIRST_GS) && (logic->CanJumpslash || (logic->IsChild && logic->Bombs)))),
@@ -29,13 +29,13 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_SOUTH_CORRIDOR, {[]{return true;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_SOUTH_CORRIDOR] = Area("Forest Temple South Corridor", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FOREST_TEMPLE_SOUTH_CORRIDOR] = Region("Forest Temple South Corridor", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_FIRST_ROOM, {[]{return true;}}),
                   Entrance(RR_FOREST_TEMPLE_LOBBY,      {[]{return logic->CanAdultAttack || logic->CanChildAttack || logic->CanUse(RG_NUTS);}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_LOBBY] = Area("Forest Temple Lobby", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_LOBBY] = Region("Forest Temple Lobby", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->ForestTempleMeg, {[]{return logic->ForestTempleMeg || (logic->ForestTempleJoelle && logic->ForestTempleBeth && logic->ForestTempleAmy && logic->CanUse(RG_FAIRY_BOW));}}),
                 }, {
@@ -53,13 +53,13 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_BOSS_ENTRYWAY,     {[]{return false;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_NORTH_CORRIDOR] = Area("Forest Temple North Corridor", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FOREST_TEMPLE_NORTH_CORRIDOR] = Region("Forest Temple North Corridor", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_LOBBY,         {[]{return true;}}),
                   Entrance(RR_FOREST_TEMPLE_LOWER_STALFOS, {[]{return true;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_LOWER_STALFOS] = Area("Forest Temple Lower Stalfos", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_LOWER_STALFOS] = Region("Forest Temple Lower Stalfos", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FairyPot, {[]{return true;}}),
                 }, {
@@ -70,7 +70,7 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_NORTH_CORRIDOR, {[]{return true;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_NW_OUTDOORS_LOWER] = Area("Forest Temple NW Outdoors Lower", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_NW_OUTDOORS_LOWER] = Region("Forest Temple NW Outdoors Lower", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
                   EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUse(RG_DINS_FIRE));}}),
@@ -86,7 +86,7 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_BOSS_ENTRYWAY,     {[]{return false;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER] = Area("Forest Temple NW Outdoors Upper", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER] = Region("Forest Temple NW Outdoors Upper", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
                   EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUse(RG_DINS_FIRE));}}),
@@ -98,7 +98,7 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_BLOCK_PUSH_ROOM,      {[]{return true;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_NE_OUTDOORS_LOWER] = Area("Forest Temple NE Outdoors Lower", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_NE_OUTDOORS_LOWER] = Region("Forest Temple NE Outdoors Lower", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
                   EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUse(RG_DINS_FIRE));}}),
@@ -114,7 +114,7 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_FALLING_ROOM,      {[]{return false;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER] = Area("Forest Temple NE Outdoors Upper", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER] = Region("Forest Temple NE Outdoors Upper", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
                   EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUse(RG_DINS_FIRE));}}),
@@ -125,7 +125,7 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_FALLING_ROOM,      {[]{return randoCtx->GetTrickOption(RT_FOREST_DOORFRAME) && logic->CanJumpslash && logic->CanUse(RG_HOVER_BOOTS) && logic->CanUse(RG_SCARECROW);}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_MAP_ROOM] = Area("Forest Temple Map Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_MAP_ROOM] = Region("Forest Temple Map Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FOREST_TEMPLE_MAP_CHEST, Here(RR_FOREST_TEMPLE_MAP_ROOM, []{return logic->HasExplosives || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_FAIRY_BOW) || ((logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT)) && (logic->CanUse(RG_NUTS) || logic->HookshotOrBoomerang || logic->CanShield));})),
                 }, {
@@ -134,7 +134,7 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER, {[]{return Here(RR_FOREST_TEMPLE_MAP_ROOM, []{return logic->HasExplosives || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_FAIRY_BOW) || ((logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT)) && (logic->CanUse(RG_NUTS) || logic->HookshotOrBoomerang || logic->CanShield));});}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_SEWER] = Area("Forest Temple Sewer", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_SEWER] = Region("Forest Temple Sewer", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FOREST_TEMPLE_WELL_CHEST, HasAccessTo(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER)),
                 }, {
@@ -143,12 +143,12 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_NE_OUTDOORS_LOWER, {[]{return true;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_BELOW_BOSS_KEY_CHEST] = Area("Forest Temple Below Boss Key Chest", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FOREST_TEMPLE_BELOW_BOSS_KEY_CHEST] = Region("Forest Temple Below Boss Key Chest", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER, {[]{return Here(RR_FOREST_TEMPLE_BELOW_BOSS_KEY_CHEST, []{return logic->HasExplosives || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_FAIRY_BOW) || ((logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT)) && (logic->CanUse(RG_NUTS) || logic->HookshotOrBoomerang || logic->CanShield));});}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_FLOORMASTER_ROOM] = Area("Forest Temple Floormaster Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_FLOORMASTER_ROOM] = Region("Forest Temple Floormaster Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FOREST_TEMPLE_FLOORMASTER_CHEST, logic->CanAdultDamage || logic->CanChildDamage),
                 }, {
@@ -156,13 +156,13 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER, {[]{return true;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_WEST_CORRIDOR] = Area("Forest Temple West Corridor", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FOREST_TEMPLE_WEST_CORRIDOR] = Region("Forest Temple West Corridor", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_LOBBY,           {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 1, 5);}}),
                   Entrance(RR_FOREST_TEMPLE_BLOCK_PUSH_ROOM, {[]{return logic->CanAdultAttack || logic->CanChildAttack || logic->CanUse(RG_NUTS);}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_BLOCK_PUSH_ROOM] = Area("Forest Temple Block Push Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_BLOCK_PUSH_ROOM] = Region("Forest Temple Block Push Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FOREST_TEMPLE_EYE_SWITCH_CHEST, logic->GoronBracelet && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT))),
                 }, {
@@ -173,13 +173,13 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_NW_CORRIDOR_STRAIGHTENED, {[]{return logic->IsAdult && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT)) && logic->GoronBracelet && logic->SmallKeys(RR_FOREST_TEMPLE, 2);}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_NW_CORRIDOR_TWISTED] = Area("Forest Temple NW Corridor Twisted", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FOREST_TEMPLE_NW_CORRIDOR_TWISTED] = Region("Forest Temple NW Corridor Twisted", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_BLOCK_PUSH_ROOM, {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 2);}}),
                   Entrance(RR_FOREST_TEMPLE_RED_POE_ROOM,    {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 3);}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_NW_CORRIDOR_STRAIGHTENED] = Area("Forest Temple NW Corridor Straightened", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_NW_CORRIDOR_STRAIGHTENED] = Region("Forest Temple NW Corridor Straightened", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FOREST_TEMPLE_BOSS_KEY_CHEST, true),
                 }, {
@@ -188,7 +188,7 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_BLOCK_PUSH_ROOM,      {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 2);}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_RED_POE_ROOM] = Area("Forest Temple Red Poe Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_RED_POE_ROOM] = Region("Forest Temple Red Poe Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->ForestTempleJoelle, {[]{return logic->ForestTempleJoelle || logic->CanUse(RG_FAIRY_BOW);}}),
                 }, {
@@ -200,7 +200,7 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_UPPER_STALFOS,       {[]{return true;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_UPPER_STALFOS] = Area("Forest Temple Upper Stalfos", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_UPPER_STALFOS] = Region("Forest Temple Upper Stalfos", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FOREST_TEMPLE_BOW_CHEST, logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER)),
                 }, {
@@ -209,7 +209,7 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_BLUE_POE_ROOM, {[]{return logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER);}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_BLUE_POE_ROOM] = Area("Forest Temple Blue Poe Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_BLUE_POE_ROOM] = Region("Forest Temple Blue Poe Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->ForestTempleBeth, {[]{return logic->ForestTempleBeth || logic->CanUse(RG_FAIRY_BOW);}}),
                 }, {
@@ -221,25 +221,25 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_NE_CORRIDOR_STRAIGHTENED, {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 4);}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_NE_CORRIDOR_STRAIGHTENED] = Area("Forest Temple NE Corridor Straightened", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FOREST_TEMPLE_NE_CORRIDOR_STRAIGHTENED] = Region("Forest Temple NE Corridor Straightened", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_BLUE_POE_ROOM,   {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 4);}}),
                   Entrance(RR_FOREST_TEMPLE_FROZEN_EYE_ROOM, {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 5);}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_NE_CORRIDOR_TWISTED] = Area("Forest Temple NE Corridor Twisted", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FOREST_TEMPLE_NE_CORRIDOR_TWISTED] = Region("Forest Temple NE Corridor Twisted", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_FROZEN_EYE_ROOM, {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 5);}}),
                   Entrance(RR_FOREST_TEMPLE_FALLING_ROOM,    {[]{return true;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_FROZEN_EYE_ROOM] = Area("Forest Temple Frozen Eye Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FOREST_TEMPLE_FROZEN_EYE_ROOM] = Region("Forest Temple Frozen Eye Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_NE_CORRIDOR_STRAIGHTENED, {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 5);}}),
                   Entrance(RR_FOREST_TEMPLE_NE_CORRIDOR_TWISTED,      {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 5) && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_DINS_FIRE));}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_FALLING_ROOM] = Area("Forest Temple Falling Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_FALLING_ROOM] = Region("Forest Temple Falling Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST, true),
                 }, {
@@ -248,7 +248,7 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_GREEN_POE_ROOM,    {[]{return true;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_GREEN_POE_ROOM] = Area("Forest Temple Green Poe Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_GREEN_POE_ROOM] = Region("Forest Temple Green Poe Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->ForestTempleAmy, {[]{return logic->ForestTempleAmy || logic->CanUse(RG_FAIRY_BOW);}}),
                 }, {}, {
@@ -257,13 +257,13 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_EAST_CORRIDOR, {[]{return logic->ForestTempleAmy;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_EAST_CORRIDOR] = Area("Forest Temple East Corridor", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FOREST_TEMPLE_EAST_CORRIDOR] = Region("Forest Temple East Corridor", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_LOBBY,          {[]{return logic->CanAdultAttack || logic->CanChildAttack || logic->CanUse(RG_NUTS);}}),
                   Entrance(RR_FOREST_TEMPLE_GREEN_POE_ROOM, {[]{return logic->CanAdultAttack || logic->CanChildAttack || logic->CanUse(RG_NUTS);}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_BOSS_REGION] = Area("Forest Temple Boss Region", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_BOSS_REGION] = Region("Forest Temple Boss Region", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FOREST_TEMPLE_BASEMENT_CHEST, true),
                   LOCATION(RC_FOREST_TEMPLE_GS_BASEMENT,    logic->HookshotOrBoomerang),
@@ -278,7 +278,7 @@ void AreaTable_Init_ForestTemple() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (randoCtx->GetDungeon(FOREST_TEMPLE)->IsMQ()) {
-  areaTable[RR_FOREST_TEMPLE_MQ_LOBBY] = Area("Forest Temple MQ Lobby", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_MQ_LOBBY] = Region("Forest Temple MQ Lobby", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST, logic->CanJumpslash || logic->Bombs || logic->CanUse(RG_STICKS) || logic->CanUse(RG_NUTS) || logic->HookshotOrBoomerang || logic->CanUse(RG_DINS_FIRE) || logic->KokiriSword || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOVER_BOOTS)),
                   LOCATION(RC_FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY, logic->HookshotOrBoomerang),
@@ -288,7 +288,7 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_MQ_CENTRAL_AREA, {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 1) && (logic->CanAdultAttack || logic->CanChildAttack || logic->CanUse(RG_NUTS));}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_MQ_CENTRAL_AREA] = Area("Forest Temple MQ Central Area", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_MQ_CENTRAL_AREA] = Region("Forest Temple MQ Central Region", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FairyPot, {[]{return true;}}),
   }, {
@@ -306,7 +306,7 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_MQ_BOSS_REGION,        {[]{return logic->ForestTempleJoAndBeth && logic->ForestTempleAmyAndMeg;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_MQ_AFTER_BLOCK_PUZZLE] = Area("Forest Temple MQ After Block Puzzle", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_MQ_AFTER_BLOCK_PUZZLE] = Region("Forest Temple MQ After Block Puzzle", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FOREST_TEMPLE_MQ_BOSS_KEY_CHEST, logic->SmallKeys(RR_FOREST_TEMPLE, 3)),
   }, {
@@ -317,7 +317,7 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_MQ_NW_OUTDOORS,   {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 2);}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_MQ_OUTDOOR_LEDGE] = Area("Forest Temple MQ Outdoor Ledge", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_MQ_OUTDOOR_LEDGE] = Region("Forest Temple MQ Outdoor Ledge", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FOREST_TEMPLE_MQ_REDEAD_CHEST, logic->CanJumpslash),
   }, {
@@ -325,7 +325,7 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_MQ_NW_OUTDOORS, {[]{return true;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_MQ_NW_OUTDOORS] = Area("Forest Temple MQ NW Outdoors", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_MQ_NW_OUTDOORS] = Region("Forest Temple MQ NW Outdoors", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD, logic->CanAdultAttack || logic->CanChildAttack),
   }, {
@@ -335,7 +335,7 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_MQ_OUTDOORS_TOP_LEDGES, {[]{return logic->IsAdult && logic->CanUse(RG_FIRE_ARROWS);}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_MQ_NE_OUTDOORS] = Area("Forest Temple MQ NE Outdoors", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_MQ_NE_OUTDOORS] = Region("Forest Temple MQ NE Outdoors", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
                   EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUse(RG_DINS_FIRE));}}),
@@ -350,7 +350,7 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_MQ_NE_OUTDOORS_LEDGE,   {[]{return logic->IsAdult && logic->CanUse(RG_LONGSHOT);}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_MQ_OUTDOORS_TOP_LEDGES] = Area("Forest Temple MQ Outdoors Top Ledges", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_MQ_OUTDOORS_TOP_LEDGES] = Region("Forest Temple MQ Outdoors Top Ledges", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST, true),
   }, {
@@ -360,7 +360,7 @@ void AreaTable_Init_ForestTemple() {
                     //Trick: LogicForestOutdoorsLedge && logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS)
   });
 
-  areaTable[RR_FOREST_TEMPLE_MQ_NE_OUTDOORS_LEDGE] = Area("Forest Temple MQ NE Outdoors Ledge", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_MQ_NE_OUTDOORS_LEDGE] = Region("Forest Temple MQ NE Outdoors Ledge", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST, true),
   }, {
@@ -369,7 +369,7 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_MQ_FALLING_ROOM, {[]{return logic->CanUse(RG_SONG_OF_TIME);}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_MQ_BOW_REGION] = Area("Forest Temple MQ Bow Region", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_MQ_BOW_REGION] = Region("Forest Temple MQ Bow Region", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->ForestTempleJoAndBeth, {[]{return logic->ForestTempleJoAndBeth || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW));}}),
   }, {
@@ -382,7 +382,7 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_MQ_FALLING_ROOM, {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 5) && ((logic->IsAdult && logic->CanUse(RG_FAIRY_BOW)) || logic->CanUse(RG_DINS_FIRE));}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_MQ_FALLING_ROOM] = Area("Forest Temple MQ Falling Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_MQ_FALLING_ROOM] = Region("Forest Temple MQ Falling Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->ForestTempleAmyAndMeg, {[]{return logic->ForestTempleAmyAndMeg || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW) && logic->SmallKeys(RR_FOREST_TEMPLE, 6));}}),
   }, {
@@ -393,7 +393,7 @@ void AreaTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_MQ_NE_OUTDOORS_LEDGE, {[]{return true;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_MQ_BOSS_REGION] = Area("Forest Temple MQ Boss Region", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_MQ_BOSS_REGION] = Region("Forest Temple MQ Boss Region", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FOREST_TEMPLE_MQ_BASEMENT_CHEST,   true),
   }, {
@@ -406,7 +406,7 @@ void AreaTable_Init_ForestTemple() {
     |         BOSS ROOM         |
     ---------------------------*/
     areaTable[RR_FOREST_TEMPLE_BOSS_ENTRYWAY] =
-        Area("Forest Temple Boss Entryway", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
+        Region("Forest Temple Boss Entryway", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
              {
                  // Exits
                  Entrance(RR_FOREST_TEMPLE_BOSS_REGION, { [] { return randoCtx->GetDungeon(FOREST_TEMPLE)->IsVanilla() && false; } }),
@@ -414,7 +414,7 @@ void AreaTable_Init_ForestTemple() {
                  Entrance(RR_FOREST_TEMPLE_BOSS_ROOM, { [] { return true; } }),
              });
 
-    areaTable[RR_FOREST_TEMPLE_BOSS_ROOM] = Area(
+    areaTable[RR_FOREST_TEMPLE_BOSS_ROOM] = Region(
         "Forest Temple Boss Room", "Forest Temple", RA_NONE, NO_DAY_NIGHT_CYCLE,
         {
             // Events
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
index 05249def1..e5aba3db9 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
@@ -5,11 +5,11 @@
 
 using namespace Rando;
 
-void AreaTable_Init_GanonsCastle() {
+void RegionTable_Init_GanonsCastle() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[RR_GANONS_CASTLE_ENTRYWAY] = Area("Ganon's Castle Entryway", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_GANONS_CASTLE_ENTRYWAY] = Region("Ganon's Castle Entryway", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_GANONS_CASTLE_LOBBY,    {[]{return randoCtx->GetDungeon(GANONS_CASTLE)->IsVanilla();}}),
                   Entrance(RR_GANONS_CASTLE_MQ_LOBBY, {[]{return randoCtx->GetDungeon(GANONS_CASTLE)->IsMQ();}}),
@@ -20,7 +20,7 @@ void AreaTable_Init_GanonsCastle() {
   |     VANILLA DUNGEON      |
   ---------------------------*/
   if (randoCtx->GetDungeon(GANONS_CASTLE)->IsVanilla()) {
-  areaTable[RR_GANONS_CASTLE_LOBBY] = Area("Ganon's Castle Lobby", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GANONS_CASTLE_LOBBY] = Region("Ganon's Castle Lobby", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SHEIK_HINT_GC,  true), 
                 }, {
@@ -41,7 +41,7 @@ void AreaTable_Init_GanonsCastle() {
                   Entrance(RR_GANONS_CASTLE_DEKU_SCRUBS,  {[]{return randoCtx->GetTrickOption(RT_LENS_GANON) || logic->CanUse(RG_LENS_OF_TRUTH);}}),
   });
 
-  areaTable[RR_GANONS_CASTLE_DEKU_SCRUBS] = Area("Ganon's Castle Deku Scrubs", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_DEKU_SCRUBS] = Region("Ganon's Castle Deku Scrubs", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FreeFairies, {[]{return true;}}),
                 }, {
@@ -52,7 +52,7 @@ void AreaTable_Init_GanonsCastle() {
                   LOCATION(RC_GANONS_CASTLE_DEKU_SCRUB_LEFT,         logic->CanStunDeku),
   }, {});
 
-  areaTable[RR_GANONS_CASTLE_FOREST_TRIAL] = Area("Ganon's Castle Forest Trial", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_FOREST_TRIAL] = Region("Ganon's Castle Forest Trial", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->ForestTrialClear, {[]{return logic->CanUse(RG_LIGHT_ARROWS) && (logic->FireArrows || logic->DinsFire);}}),
                 }, {
@@ -60,12 +60,12 @@ void AreaTable_Init_GanonsCastle() {
                   LOCATION(RC_GANONS_CASTLE_FOREST_TRIAL_CHEST, logic->CanAdultDamage || logic->CanChildDamage),
   }, {});
 
-  areaTable[RR_GANONS_CASTLE_FIRE_TRIAL] = Area("Ganon's Castle Fire Trial", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_FIRE_TRIAL] = Region("Ganon's Castle Fire Trial", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FireTrialClear, {[]{return logic->CanUse(RG_GORON_TUNIC) && logic->CanUse(RG_GOLDEN_GAUNTLETS) && logic->CanUse(RG_LIGHT_ARROWS) && logic->CanUse(RG_LONGSHOT);}}),
   }, {}, {});
 
-  areaTable[RR_GANONS_CASTLE_WATER_TRIAL] = Area("Ganon's Castle Water Trial", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_WATER_TRIAL] = Region("Ganon's Castle Water Trial", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->BlueFireAccess,  {[]{return logic->BlueFireAccess || logic->HasBottle;}}),
                   EventAccess(&logic->FairyPot,        {[]{return logic->FairyPot || logic->BlueFire;}}),
@@ -76,7 +76,7 @@ void AreaTable_Init_GanonsCastle() {
                   LOCATION(RC_GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST, true),
   }, {});
 
-  areaTable[RR_GANONS_CASTLE_SHADOW_TRIAL] = Area("Ganon's Castle Shadow Trial", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_SHADOW_TRIAL] = Region("Ganon's Castle Shadow Trial", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->ShadowTrialClear, {[]{return logic->CanUse(RG_LIGHT_ARROWS) && logic->CanUse(RG_MEGATON_HAMMER) && ((logic->FireArrows && (randoCtx->GetTrickOption(RT_LENS_GANON) || logic->CanUse(RG_LENS_OF_TRUTH))) || (logic->CanUse(RG_LONGSHOT) && (logic->CanUse(RG_HOVER_BOOTS) || (logic->DinsFire && (randoCtx->GetTrickOption(RT_LENS_GANON) || logic->CanUse(RG_LENS_OF_TRUTH))))));}}),
                 }, {
@@ -85,7 +85,7 @@ void AreaTable_Init_GanonsCastle() {
                   LOCATION(RC_GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST, logic->CanUse(RG_FIRE_ARROWS) || (logic->CanUse(RG_LONGSHOT) && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_DINS_FIRE)))),
   }, {});
 
-  areaTable[RR_GANONS_CASTLE_SPIRIT_TRIAL] = Area("Ganon's Castle Spirit Trial", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_SPIRIT_TRIAL] = Region("Ganon's Castle Spirit Trial", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->NutPot,           {[]{return logic->NutPot || (((randoCtx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) && logic->CanJumpslash) || logic->CanUse(RG_HOOKSHOT)) && logic->CanUse(RG_BOMBCHU_5) && logic->CanUse(RG_FAIRY_BOW) && (logic->CanUse(RG_MIRROR_SHIELD) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS))));}}),
                   EventAccess(&logic->SpiritTrialClear, {[]{return logic->CanUse(RG_LIGHT_ARROWS) && (logic->CanUse(RG_MIRROR_SHIELD) || randoCtx->GetOption(RSK_SUNLIGHT_ARROWS)) && logic->CanUse(RG_BOMBCHU_5) && ((randoCtx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) && logic->CanJumpslash) || logic->CanUse(RG_HOOKSHOT));}}),
@@ -95,7 +95,7 @@ void AreaTable_Init_GanonsCastle() {
                   LOCATION(RC_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST,      (randoCtx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) || logic->CanUse(RG_HOOKSHOT)) && logic->CanUse(RG_BOMBCHU_5) && (randoCtx->GetTrickOption(RT_LENS_GANON) || logic->CanUse(RG_LENS_OF_TRUTH))),
   }, {});
 
-  areaTable[RR_GANONS_CASTLE_LIGHT_TRIAL] = Area("Ganon's Castle Light Trial", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_LIGHT_TRIAL] = Region("Ganon's Castle Light Trial", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->LightTrialClear, {[]{return logic->CanUse(RG_LIGHT_ARROWS) && logic->CanUse(RG_HOOKSHOT) && logic->SmallKeys(RR_GANONS_CASTLE, 2) && (randoCtx->GetTrickOption(RT_LENS_GANON) || logic->CanUse(RG_LENS_OF_TRUTH));}}),
                 }, {
@@ -111,7 +111,7 @@ void AreaTable_Init_GanonsCastle() {
   }, {});
   }
 
-  areaTable[RR_GANONS_CASTLE_TOWER] = Area("Ganon's Castle Tower", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GANONS_CASTLE_TOWER] = Region("Ganon's Castle Tower", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GANONS_TOWER_BOSS_KEY_CHEST, logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)),
                   LOCATION(RC_GANONDORF_HINT,              logic->BossKeyGanonsCastle && (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD))),
@@ -122,7 +122,7 @@ void AreaTable_Init_GanonsCastle() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (randoCtx->GetDungeon(GANONS_CASTLE)->IsMQ()) {
-  areaTable[RR_GANONS_CASTLE_MQ_LOBBY] = Area("Ganon's Castle MQ Lobby", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GANONS_CASTLE_MQ_LOBBY] = Region("Ganon's Castle MQ Lobby", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SHEIK_HINT_MQ_GC,  true),
                 }, {
@@ -143,7 +143,7 @@ void AreaTable_Init_GanonsCastle() {
                   Entrance(RR_GANONS_CASTLE_MQ_DEKU_SCRUBS,  {[]{return randoCtx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH);}}),
   });
 
-  areaTable[RR_GANONS_CASTLE_MQ_DEKU_SCRUBS] = Area("Ganon's Castle MQ Deku Scrubs", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_MQ_DEKU_SCRUBS] = Region("Ganon's Castle MQ Deku Scrubs", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FreeFairies, {[]{return true;}}),
   }, {
@@ -155,7 +155,7 @@ void AreaTable_Init_GanonsCastle() {
                   LOCATION(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,        logic->CanStunDeku),
   }, {});
 
-  areaTable[RR_GANONS_CASTLE_MQ_FOREST_TRIAL] = Area("Ganon's Castle MQ Forest Trial", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_MQ_FOREST_TRIAL] = Region("Ganon's Castle MQ Forest Trial", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->ForestTrialClear, {[]{return logic->IsAdult && logic->CanUse(RG_LIGHT_ARROWS) && (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && logic->CanUse(RG_SONG_OF_TIME);}}),
   }, {
@@ -165,13 +165,13 @@ void AreaTable_Init_GanonsCastle() {
                   LOCATION(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY,        (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && logic->HookshotOrBoomerang),
   }, {});
 
-  areaTable[RR_GANONS_CASTLE_MQ_FIRE_TRIAL] = Area("Ganon's Castle MQ Fire Trial", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_MQ_FIRE_TRIAL] = Region("Ganon's Castle MQ Fire Trial", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FireTrialClear, {[]{return logic->CanUse(RG_GORON_TUNIC) && logic->CanUse(RG_GOLDEN_GAUNTLETS) && logic->CanUse(RG_LIGHT_ARROWS) && (logic->CanUse(RG_LONGSHOT) || logic->HoverBoots || (randoCtx->GetTrickOption(RT_GANON_MQ_FIRE_TRIAL) && logic->CanUse(RG_HOOKSHOT)));}}),
                     //Trick: logic->CanUse(RG_GORON_TUNIC) && logic->CanUse(RG_GOLDEN_GAUNTLETS) && logic->CanUse(RG_LIGHT_ARROWS) && (logic->CanUse(RG_LONGSHOT) || logic->HoverBoots || (LogicFireTrialMQ && logic->CanUse(RG_HOOKSHOT)))
   }, {}, {});
 
-  areaTable[RR_GANONS_CASTLE_MQ_WATER_TRIAL] = Area("Ganon's Castle MQ Water Trial", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_MQ_WATER_TRIAL] = Region("Ganon's Castle MQ Water Trial", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->WaterTrialClear, {[]{return logic->BlueFire && logic->IsAdult && logic->CanUse(RG_LIGHT_ARROWS) && logic->SmallKeys(RR_GANONS_CASTLE, 3);}}),
                   EventAccess(&logic->BlueFireAccess,  {[]{return logic->BlueFireAccess || (logic->HasBottle && logic->CanJumpslash);}}),
@@ -180,7 +180,7 @@ void AreaTable_Init_GanonsCastle() {
                   LOCATION(RC_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST, logic->BlueFire),
   }, {});
 
-  areaTable[RR_GANONS_CASTLE_MQ_SHADOW_TRIAL] = Area("Ganon's Castle MQ Shadow Trial", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_MQ_SHADOW_TRIAL] = Region("Ganon's Castle MQ Shadow Trial", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->ShadowTrialClear, {[]{return logic->IsAdult && logic->CanUse(RG_LIGHT_ARROWS) && (randoCtx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->HoverBoots || (logic->Hookshot && (logic->HasFireSource || randoCtx->GetTrickOption(RT_GANON_MQ_SHADOW_TRIAL))));}}),
                     //Trick: logic->IsAdult && logic->CanUse(RG_LIGHT_ARROWS) && (LogicLensCastleMQ || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->HoverBoots || (logic->Hookshot && (logic->HasFireSource || LogicShadowTrialMQ)))
@@ -191,7 +191,7 @@ void AreaTable_Init_GanonsCastle() {
                     //Trick: logic->IsAdult && logic->Bow && (LogicLensCastleMQ || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->HoverBoots || (logic->Hookshot && (logic->HasFireSource || LogicShadowTrialMQ)))
   }, {});
 
-  areaTable[RR_GANONS_CASTLE_MQ_SPIRIT_TRIAL] = Area("Ganon's Castle MQ Spirit Castle", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_MQ_SPIRIT_TRIAL] = Region("Ganon's Castle MQ Spirit Castle", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->SpiritTrialClear, {[]{return logic->IsAdult && logic->CanUse(RG_LIGHT_ARROWS) && logic->Hammer && logic->CanUse(RG_BOMBCHU_5) && ((logic->FireArrows && logic->MirrorShield) || randoCtx->GetOption(RSK_SUNLIGHT_ARROWS));}}),
                   EventAccess(&logic->NutPot,           {[]{return logic->NutPot || (logic->Hammer && logic->CanUse(RG_BOMBCHU_5) && logic->IsAdult && ((logic->CanUse(RG_FIRE_ARROWS) && logic->MirrorShield) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS))));}}),
@@ -205,7 +205,7 @@ void AreaTable_Init_GanonsCastle() {
                   LOCATION(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST,    logic->IsAdult && logic->Hammer && logic->CanUse(RG_BOMBCHU_5) && ((logic->CanUse(RG_FIRE_ARROWS) && logic->CanUse(RG_MIRROR_SHIELD)) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS)))),
   }, {});
 
-  areaTable[RR_GANONS_CASTLE_MQ_LIGHT_TRIAL] = Area("Ganon's Castle MQ Light Trial", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_MQ_LIGHT_TRIAL] = Region("Ganon's Castle MQ Light Trial", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->LightTrialClear, {[]{return logic->IsAdult && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && logic->CanUse(RG_LIGHT_ARROWS) && logic->SmallKeys(RR_GANONS_CASTLE, 3) && (randoCtx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->Hookshot || randoCtx->GetTrickOption(RT_GANON_MQ_LIGHT_TRIAL));}}),
                     //Trick: logic->IsAdult && logic->CanUse(RG_LIGHT_ARROWS) && logic->SmallKeys(RR_GANONS_CASTLE, 3) && (LogicLensCastleMQ || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->Hookshot || LogicLightTrialMQ)
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp
index c0a2ab2bc..030b05f98 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp
@@ -4,11 +4,11 @@
 
 using namespace Rando;
 
-void AreaTable_Init_GerudoTrainingGrounds() {
+void RegionTable_Init_GerudoTrainingGrounds() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_ENTRYWAY] = Area("Gerudo Training Grounds Entryway", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_ENTRYWAY] = Region("Gerudo Training Grounds Entryway", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_LOBBY,    {[]{return randoCtx->GetDungeon(GERUDO_TRAINING_GROUNDS)->IsVanilla();}}),
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_LOBBY, {[]{return randoCtx->GetDungeon(GERUDO_TRAINING_GROUNDS)->IsMQ();}}),
@@ -19,7 +19,7 @@ void AreaTable_Init_GerudoTrainingGrounds() {
   |     VANILLA DUNGEON      |
   ---------------------------*/
   if (randoCtx->GetDungeon(GERUDO_TRAINING_GROUNDS)->IsVanilla()) {
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_LOBBY] = Area("Gerudo Training Grounds Lobby", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_LOBBY] = Region("Gerudo Training Grounds Lobby", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST,  logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT)),
                   LOCATION(RC_GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST, logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT)),
@@ -33,7 +33,7 @@ void AreaTable_Init_GerudoTrainingGrounds() {
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE,     {[]{return true;}}),
   });
 
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE] = Area("Gerudo Training Grounds Central Maze", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE] = Region("Gerudo Training Grounds Central Maze", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST,   logic->SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 3) && (randoCtx->GetTrickOption(RT_LENS_GTG) || logic->CanUse(RG_LENS_OF_TRUTH))),
                   LOCATION(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST,  logic->SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 4)),
@@ -45,7 +45,7 @@ void AreaTable_Init_GerudoTrainingGrounds() {
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE_RIGHT, {[]{return logic->SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 9);}}),
   });
 
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE_RIGHT] = Area("Gerudo Training Grounds Central Maze Right", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE_RIGHT] = Region("Gerudo Training Grounds Central Maze Right", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_CENTRAL_CHEST, true),
                   LOCATION(RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_SIDE_CHEST,    true),
@@ -56,7 +56,7 @@ void AreaTable_Init_GerudoTrainingGrounds() {
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_LAVA_ROOM,   {[]{return true;}}),
   });
 
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_LAVA_ROOM] = Area("Gerudo Training Grounds Lava Room", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_LAVA_ROOM] = Region("Gerudo Training Grounds Lava Room", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST, logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_SONG_OF_TIME) && logic->IronBoots && logic->WaterTimer >= 24),
                 }, {
@@ -65,7 +65,7 @@ void AreaTable_Init_GerudoTrainingGrounds() {
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_HAMMER_ROOM,        {[]{return logic->CanUse(RG_LONGSHOT)  || (logic->CanUse(RG_HOVER_BOOTS) && logic->CanUse(RG_HOOKSHOT));}}),
   });
 
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_HAMMER_ROOM] = Area("Gerudo Training Grounds Hammer Room", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_HAMMER_ROOM] = Region("Gerudo Training Grounds Hammer Room", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST,  logic->CanAdultAttack || logic->CanChildAttack),
                   LOCATION(RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST, logic->CanUse(RG_MEGATON_HAMMER) || (logic->CanTakeDamage && randoCtx->GetTrickOption(RT_FLAMING_CHESTS))),
@@ -75,7 +75,7 @@ void AreaTable_Init_GerudoTrainingGrounds() {
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_LAVA_ROOM,        {[]{return true;}}),
   });
 
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_EYE_STATUE_LOWER] = Area("Gerudo Training Grounds Eye Statue Lower", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_EYE_STATUE_LOWER] = Region("Gerudo Training Grounds Eye Statue Lower", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GERUDO_TRAINING_GROUND_EYE_STATUE_CHEST, logic->CanUse(RG_FAIRY_BOW)),
                 }, {
@@ -83,7 +83,7 @@ void AreaTable_Init_GerudoTrainingGrounds() {
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_HAMMER_ROOM, {[]{return true;}}),
   });
 
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_EYE_STATUE_UPPER] = Area("Gerudo Training Grounds Eye Statue Upper", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_EYE_STATUE_UPPER] = Region("Gerudo Training Grounds Eye Statue Upper", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GERUDO_TRAINING_GROUND_NEAR_SCARECROW_CHEST, logic->CanUse(RG_FAIRY_BOW)),
                 }, {
@@ -91,7 +91,7 @@ void AreaTable_Init_GerudoTrainingGrounds() {
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_EYE_STATUE_LOWER, {[]{return true;}}),
   });
 
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_ROOM] = Area("Gerudo Training Grounds Heavy Block Room", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_ROOM] = Region("Gerudo Training Grounds Heavy Block Room", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST, logic->CanJumpslash),
                 }, {
@@ -100,7 +100,7 @@ void AreaTable_Init_GerudoTrainingGrounds() {
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_LIKE_LIKE_ROOM,   {[]{return (randoCtx->GetTrickOption(RT_LENS_GTG) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->CanUse(RG_HOOKSHOT) || (randoCtx->GetTrickOption(RT_GTG_FAKE_WALL) && logic->CanUse(RG_HOVER_BOOTS))) && logic->CanUse(RG_SILVER_GAUNTLETS);}}),
   });
 
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_LIKE_LIKE_ROOM] = Area("Gerudo Training Grounds Like Like Room", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_LIKE_LIKE_ROOM] = Region("Gerudo Training Grounds Like Like Room", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST,  logic->CanJumpslash),
                   LOCATION(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST, logic->CanJumpslash),
@@ -113,7 +113,7 @@ void AreaTable_Init_GerudoTrainingGrounds() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (randoCtx->GetDungeon(GERUDO_TRAINING_GROUNDS)->IsMQ()) {
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_LOBBY] = Area("Gerudo Training Grounds MQ Lobby", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_LOBBY] = Region("Gerudo Training Grounds MQ Lobby", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST,       true),
                   LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST,      true),
@@ -128,7 +128,7 @@ void AreaTable_Init_GerudoTrainingGrounds() {
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_RIGHT_SIDE, {[]{return Here(RR_GERUDO_TRAINING_GROUNDS_MQ_LOBBY, []{return (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW)) || (logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT));});}}),
   });
 
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_RIGHT_SIDE] = Area("Gerudo Training Grounds MQ Right Side", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_RIGHT_SIDE] = Region("Gerudo Training Grounds MQ Right Side", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   //EventAccess(&WallFairy, {[]{return WallFairy || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW));}}),
   }, {
@@ -139,12 +139,12 @@ void AreaTable_Init_GerudoTrainingGrounds() {
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER, {[]{return (logic->Bow || (logic->CanUse(RG_LONGSHOT) && logic->HasFireSource)) && logic->CanUse(RG_HOVER_BOOTS) && logic->IsAdult && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BIGGORON_SWORD));}}),
   });
 
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER] = Area("Gerudo Training Grounds MQ Underwater", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER] = Region("Gerudo Training Grounds MQ Underwater", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST, logic->HasFireSource && logic->IsAdult && logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer >= 24 && logic->CanTakeDamage),
   }, {});
 
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_LEFT_SIDE] = Area("Gerudo Training Grounds MQ Left Side", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_LEFT_SIDE] = Region("Gerudo Training Grounds MQ Left Side", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST, logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->HasExplosives),
   }, {
@@ -153,7 +153,7 @@ void AreaTable_Init_GerudoTrainingGrounds() {
                     //Trick: (logic->IsAdult && logic->CanUse(RG_LONGSHOT)) || LogicGtgMQWithoutHookshot || (LogicGtgMQWithHookshot && logic->IsAdult && logic->CanUse(RG_HOOKSHOT))
   });
 
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_STALFOS_ROOM] = Area("Gerudo Training Grounds MQ Stalfos Room", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_STALFOS_ROOM] = Region("Gerudo Training Grounds MQ Stalfos Room", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->BlueFireAccess,  {[]{return logic->BlueFireAccess || logic->HasBottle;}}),
   }, {
@@ -166,7 +166,7 @@ void AreaTable_Init_GerudoTrainingGrounds() {
                     //Trick: logic->IsAdult && (LogicLensGtgMQ || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->BlueFire && (logic->CanUse(RG_SONG_OF_TIME) || (LogicGtgFakeWall && logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS)))
   });
 
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_BACK_AREAS] = Area("Gerudo Training Grounds MQ Back Areas", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_BACK_AREAS] = Region("Gerudo Training Grounds MQ Back Areas", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_EYE_STATUE_CHEST,          logic->CanUse(RG_FAIRY_BOW)),
                   LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_SECOND_IRON_KNUCKLE_CHEST, logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)),
@@ -177,7 +177,7 @@ void AreaTable_Init_GerudoTrainingGrounds() {
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_RIGHT_SIDE,         {[]{return logic->CanUse(RG_LONGSHOT);}}),
   });
 
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_CENTRAL_MAZE_RIGHT] = Area("Gerudo Training Grounds MQ Central Maze Right", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_CENTRAL_MAZE_RIGHT] = Region("Gerudo Training Grounds MQ Central Maze Right", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_CENTRAL_CHEST, true),
                   LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_SIDE_CHEST,    true),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
index 5913e2d3b..d5623fe17 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
@@ -3,8 +3,8 @@
 
 using namespace Rando;
 
-void AreaTable_Init_GerudoValley() {
-  areaTable[RR_GERUDO_VALLEY] = Area("Gerudo Valley", "Gerudo Valley", RA_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {
+void RegionTable_Init_GerudoValley() {
+  areaTable[RR_GERUDO_VALLEY] = Region("Gerudo Valley", "Gerudo Valley", RA_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->BugRock, {[]{return logic->BugRock || logic->IsChild;}}),
                 }, {
@@ -19,7 +19,7 @@ void AreaTable_Init_GerudoValley() {
                   Entrance(RR_GV_FORTRESS_SIDE,  {[]{return (logic->IsAdult && (logic->CanRideEpona || logic->CanUse(RG_LONGSHOT) || randoCtx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_OPEN) || logic->CarpenterRescue)) || (logic->IsChild && logic->CanUse(RG_HOOKSHOT));}}),
   });
 
-  areaTable[RR_GV_UPPER_STREAM] = Area("GV Upper Stream", "Gerudo Valley", RA_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {
+  areaTable[RR_GV_UPPER_STREAM] = Region("GV Upper Stream", "Gerudo Valley", RA_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CanSummonGossipFairy;}}),
                   EventAccess(&logic->BeanPlantFairy,   {[]{return logic->BeanPlantFairy   || (CanPlantBean(RR_GV_UPPER_STREAM) && logic->CanUse(RG_SONG_OF_STORMS));}}),
@@ -34,19 +34,19 @@ void AreaTable_Init_GerudoValley() {
                   Entrance(RR_GV_LOWER_STREAM, {[]{return true;}}),
   });
 
-  areaTable[RR_GV_LOWER_STREAM] = Area("GV Lower Stream", "Gerudo Valley", RA_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_GV_LOWER_STREAM] = Region("GV Lower Stream", "Gerudo Valley", RA_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_LAKE_HYLIA, {[]{return logic->IsChild || logic->Swim;}}),//can use cucco as child
   });
 
-  areaTable[RR_GV_GROTTO_LEDGE] = Area("GV Grotto Ledge", "Gerudo Valley", RA_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_GV_GROTTO_LEDGE] = Region("GV Grotto Ledge", "Gerudo Valley", RA_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_GV_LOWER_STREAM,   {[]{return true;}}),
                   Entrance(RR_GV_OCTOROK_GROTTO, {[]{return logic->CanUse(RG_SILVER_GAUNTLETS);}}),
                   Entrance(RR_GV_CRATE_LEDGE,    {[]{return logic->CanUse(RG_LONGSHOT);}}),
   });
 
-  areaTable[RR_GV_CRATE_LEDGE] = Area("GV Crate Ledge", "Gerudo Valley", RA_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GV_CRATE_LEDGE] = Region("GV Crate Ledge", "Gerudo Valley", RA_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GV_CRATE_FREESTANDING_POH, true),
                 }, {
@@ -54,7 +54,7 @@ void AreaTable_Init_GerudoValley() {
                   Entrance(RR_GV_LOWER_STREAM, {[]{return true;}}),
   });
 
-  areaTable[RR_GV_FORTRESS_SIDE] = Area("GV Fortress Side", "Gerudo Valley", RA_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {
+  areaTable[RR_GV_FORTRESS_SIDE] = Region("GV Fortress Side", "Gerudo Valley", RA_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->BrokenSwordAccess, {[]{return logic->IsAdult && (logic->PoachersSawAccess || logic->PoachersSaw);}}),
                 }, {
@@ -73,17 +73,17 @@ void AreaTable_Init_GerudoValley() {
                   Entrance(RR_GV_CRATE_LEDGE, {[]{return false;}}),
   });
 
-  areaTable[RR_GV_CARPENTER_TENT] = Area("GV Carpenter Tent", "GV Carpenter Tent", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_GV_CARPENTER_TENT] = Region("GV Carpenter Tent", "GV Carpenter Tent", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_GV_FORTRESS_SIDE, {[]{return true;}}),
   });
 
-  areaTable[RR_GV_OCTOROK_GROTTO] = Area("GV Octorok Grotto", "GV Octorok Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_GV_OCTOROK_GROTTO] = Region("GV Octorok Grotto", "GV Octorok Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_GV_GROTTO_LEDGE, {[]{return true;}}),
   });
 
-  areaTable[RR_GV_STORMS_GROTTO] = Area("GV Storms Grotto", "GV Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GV_STORMS_GROTTO] = Region("GV Storms Grotto", "GV Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GV_DEKU_SCRUB_GROTTO_REAR,    logic->CanStunDeku),
                   LOCATION(RC_GV_DEKU_SCRUB_GROTTO_FRONT,   logic->CanStunDeku),
@@ -93,7 +93,7 @@ void AreaTable_Init_GerudoValley() {
                   Entrance(RR_GV_FORTRESS_SIDE, {[]{return true;}}),
   });
 
-  areaTable[RR_GERUDO_FORTRESS] = Area("Gerudo Fortress", "Gerudo Fortress", RA_GERUDO_FORTRESS, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GERUDO_FORTRESS] = Region("Gerudo Fortress", "Gerudo Fortress", RA_GERUDO_FORTRESS, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->CarpenterRescue, {[]{return logic->CanFinishGerudoFortress;}}),
                   EventAccess(&logic->GF_GateOpen,     {[]{return logic->IsAdult && logic->GerudoToken;}}),
@@ -118,7 +118,7 @@ void AreaTable_Init_GerudoValley() {
                   Entrance(RR_GF_STORMS_GROTTO,                 {[]{return logic->IsAdult && logic->CanOpenStormGrotto;}}),
   });
 
-  areaTable[RR_GF_OUTSIDE_GATE] = Area("GF Outside Gate", "Gerudo Fortress", RA_GERUDO_FORTRESS, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GF_OUTSIDE_GATE] = Region("GF Outside Gate", "Gerudo Fortress", RA_GERUDO_FORTRESS, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->GF_GateOpen, {[]{return logic->IsAdult && logic->GerudoToken && (randoCtx->GetOption(RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD) || randoCtx->GetOption(RSK_SHUFFLE_OVERWORLD_ENTRANCES) /*|| ShuffleSpecialIndoorEntrances*/);}}),
                 }, {}, {
@@ -127,7 +127,7 @@ void AreaTable_Init_GerudoValley() {
                   Entrance(RR_WASTELAND_NEAR_FORTRESS, {[]{return true;}}),
   });
 
-  areaTable[RR_GF_STORMS_GROTTO] = Area("GF Storms Grotto", "GF Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GF_STORMS_GROTTO] = Region("GF Storms Grotto", "GF Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FreeFairies, {[]{return true;}}),
                 }, {}, {
@@ -135,13 +135,13 @@ void AreaTable_Init_GerudoValley() {
                   Entrance(RR_GERUDO_FORTRESS, {[]{return true;}}),
   });
 
-  areaTable[RR_WASTELAND_NEAR_FORTRESS] = Area("Wasteland Near Fortress", "Haunted Wasteland", RA_HAUNTED_WASTELAND, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WASTELAND_NEAR_FORTRESS] = Region("Wasteland Near Fortress", "Haunted Wasteland", RA_HAUNTED_WASTELAND, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_GF_OUTSIDE_GATE,   {[]{return true;}}),
                   Entrance(RR_HAUNTED_WASTELAND, {[]{return logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_LONGSHOT) || randoCtx->GetTrickOption(RT_HW_CROSSING);}}),
   });
 
-  areaTable[RR_HAUNTED_WASTELAND] = Area("Haunted Wasteland", "Haunted Wasteland", RA_HAUNTED_WASTELAND, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_HAUNTED_WASTELAND] = Region("Haunted Wasteland", "Haunted Wasteland", RA_HAUNTED_WASTELAND, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FairyPot,       {[]{return true;}}),
                   EventAccess(&logic->NutPot,         {[]{return true;}}),
@@ -157,13 +157,13 @@ void AreaTable_Init_GerudoValley() {
                   Entrance(RR_WASTELAND_NEAR_FORTRESS, {[]{return logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_LONGSHOT) || randoCtx->GetTrickOption(RT_HW_CROSSING);}}),
   });
 
-  areaTable[RR_WASTELAND_NEAR_COLOSSUS] = Area("Wasteland Near Colossus", "Haunted Wasteland", RA_HAUNTED_WASTELAND, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WASTELAND_NEAR_COLOSSUS] = Region("Wasteland Near Colossus", "Haunted Wasteland", RA_HAUNTED_WASTELAND, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DESERT_COLOSSUS,   {[]{return true;}}),
                   Entrance(RR_HAUNTED_WASTELAND, {[]{return randoCtx->GetTrickOption(RT_HW_REVERSE) || false;}}),
   });
 
-  areaTable[RR_DESERT_COLOSSUS] = Area("Desert Colossus", "Desert Colossus", RA_DESERT_COLOSSUS, DAY_NIGHT_CYCLE, {
+  areaTable[RR_DESERT_COLOSSUS] = Region("Desert Colossus", "Desert Colossus", RA_DESERT_COLOSSUS, DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FairyPond, {[]{return logic->FairyPond || logic->CanUse(RG_SONG_OF_STORMS);}}),
                   EventAccess(&logic->BugRock,   {[]{return true;}}),
@@ -182,7 +182,7 @@ void AreaTable_Init_GerudoValley() {
                   Entrance(RR_COLOSSUS_GROTTO,               {[]{return logic->CanUse(RG_SILVER_GAUNTLETS);}}),
   });
 
-  areaTable[RR_DESERT_COLOSSUS_FROM_SPIRIT_ENTRYWAY] = Area("Desert Colossus From Spirit Entryway", "Desert Colossus", RA_DESERT_COLOSSUS, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DESERT_COLOSSUS_FROM_SPIRIT_ENTRYWAY] = Region("Desert Colossus From Spirit Entryway", "Desert Colossus", RA_DESERT_COLOSSUS, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SHEIK_AT_COLOSSUS, true),
                 }, {
@@ -190,7 +190,7 @@ void AreaTable_Init_GerudoValley() {
                   Entrance(RR_DESERT_COLOSSUS, {[]{return true;}}),
   });
 
-  areaTable[RR_COLOSSUS_GREAT_FAIRY_FOUNTAIN] = Area("Colossus Great Fairy Fountain", "Colossus Great Fairy Fountain", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_COLOSSUS_GREAT_FAIRY_FOUNTAIN] = Region("Colossus Great Fairy Fountain", "Colossus Great Fairy Fountain", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_COLOSSUS_GREAT_FAIRY_REWARD, logic->CanUse(RG_ZELDAS_LULLABY)),
                 }, {
@@ -198,7 +198,7 @@ void AreaTable_Init_GerudoValley() {
                   Entrance(RR_DESERT_COLOSSUS, {[]{return true;}}),
   });
 
-  areaTable[RR_COLOSSUS_GROTTO] = Area("Colossus Grotto", "Colossus Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_COLOSSUS_GROTTO] = Region("Colossus Grotto", "Colossus Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,  logic->CanStunDeku),
                   LOCATION(RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT, logic->CanStunDeku),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
index 860b90e8b..a6ef9a58f 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
@@ -3,8 +3,8 @@
 
 using namespace Rando;
 
-void AreaTable_Init_HyruleField() {
-  areaTable[RR_HYRULE_FIELD] = Area("Hyrule Field", "Hyrule Field", RA_HYRULE_FIELD, DAY_NIGHT_CYCLE, {
+void RegionTable_Init_HyruleField() {
+  areaTable[RR_HYRULE_FIELD] = Region("Hyrule Field", "Hyrule Field", RA_HYRULE_FIELD, DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->BigPoeKill, {[]{return logic->CanUse(RG_FAIRY_BOW) && logic->CanRideEpona && logic->HasBottle;}}),
                 }, {
@@ -30,7 +30,7 @@ void AreaTable_Init_HyruleField() {
                   Entrance(RR_HF_TEKTITE_GROTTO,      {[]{return logic->CanOpenBombGrotto;}}),
   });
 
-  areaTable[RR_HF_SOUTHEAST_GROTTO] = Area("HF Southeast Grotto", "HF Southeast Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+  areaTable[RR_HF_SOUTHEAST_GROTTO] = Region("HF Southeast Grotto", "HF Southeast Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LOCATION(RC_HF_SOUTHEAST_GROTTO_CHEST,         true),
                   LOCATION(RC_HF_SOUTHEAST_GROTTO_FISH,          logic->HasBottle),
@@ -42,7 +42,7 @@ void AreaTable_Init_HyruleField() {
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
   });
 
-  areaTable[RR_HF_OPEN_GROTTO] = Area("HF Open Grotto", "HF Open Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+  areaTable[RR_HF_OPEN_GROTTO] = Region("HF Open Grotto", "HF Open Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LOCATION(RC_HF_OPEN_GROTTO_CHEST,         true),
                   LOCATION(RC_HF_OPEN_GROTTO_FISH,          logic->HasBottle),
@@ -54,7 +54,7 @@ void AreaTable_Init_HyruleField() {
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
   });
 
-  areaTable[RR_HF_INSIDE_FENCE_GROTTO] = Area("HF Inside Fence Grotto", "HF Inside Fence Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_HF_INSIDE_FENCE_GROTTO] = Region("HF Inside Fence Grotto", "HF Inside Fence Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_HF_DEKU_SCRUB_GROTTO,           logic->CanStunDeku),
                   LOCATION(RC_HF_INSIDE_FENCE_GROTTO_BEEHIVE, logic->CanBreakLowerBeehives),
@@ -63,7 +63,7 @@ void AreaTable_Init_HyruleField() {
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
   });
 
-  areaTable[RR_HF_COW_GROTTO] = Area("HF Cow Grotto", "HF Cow Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+  areaTable[RR_HF_COW_GROTTO] = Region("HF Cow Grotto", "HF Cow Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LOCATION(RC_HF_GS_COW_GROTTO,           logic->HasFireSource && logic->HookshotOrBoomerang),
                   LOCATION(RC_HF_COW_GROTTO_COW,          logic->HasFireSource && logic->CanUse(RG_EPONAS_SONG)),
@@ -73,7 +73,7 @@ void AreaTable_Init_HyruleField() {
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
   });
 
-  areaTable[RR_HF_NEAR_MARKET_GROTTO] = Area("HF Near Market Grotto", "HF Near Market Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+  areaTable[RR_HF_NEAR_MARKET_GROTTO] = Region("HF Near Market Grotto", "HF Near Market Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LOCATION(RC_HF_NEAR_MARKET_GROTTO_CHEST,         true),
                   LOCATION(RC_HF_NEAR_MARKET_GROTTO_FISH,          logic->HasBottle),
@@ -85,7 +85,7 @@ void AreaTable_Init_HyruleField() {
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
   });
 
-  areaTable[RR_HF_FAIRY_GROTTO] = Area("HF Fairy Grotto", "HF Fairy Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_HF_FAIRY_GROTTO] = Region("HF Fairy Grotto", "HF Fairy Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FreeFairies, {[]{return true;}}),
                 }, {}, {
@@ -93,7 +93,7 @@ void AreaTable_Init_HyruleField() {
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
   });
 
-  areaTable[RR_HF_NEAR_KAK_GROTTO] = Area("HF Near Kak Grotto", "HF Near Kak Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_HF_NEAR_KAK_GROTTO] = Region("HF Near Kak Grotto", "HF Near Kak Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_HF_GS_NEAR_KAK_GROTTO, logic->HookshotOrBoomerang),
                 }, {
@@ -101,7 +101,7 @@ void AreaTable_Init_HyruleField() {
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
   });
 
-  areaTable[RR_HF_TEKTITE_GROTTO] = Area("HF Tektite Grotto", "HF Tektite Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_HF_TEKTITE_GROTTO] = Region("HF Tektite Grotto", "HF Tektite Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_HF_TEKTITE_GROTTO_FREESTANDING_POH, logic->ProgressiveScale >= 2 || logic->CanUse(RG_IRON_BOOTS)),
                 }, {
@@ -109,7 +109,7 @@ void AreaTable_Init_HyruleField() {
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
   });
 
-  areaTable[RR_LAKE_HYLIA] = Area("Lake Hylia", "Lake Hylia", RA_LAKE_HYLIA, DAY_NIGHT_CYCLE, {
+  areaTable[RR_LAKE_HYLIA] = Region("Lake Hylia", "Lake Hylia", RA_LAKE_HYLIA, DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CanSummonGossipFairy;}}),
                   EventAccess(&logic->BeanPlantFairy,   {[]{return logic->BeanPlantFairy   || (CanPlantBean(RR_LAKE_HYLIA) && logic->CanUse(RG_SONG_OF_STORMS));}}),
@@ -140,18 +140,18 @@ void AreaTable_Init_HyruleField() {
                   Entrance(RR_LH_GROTTO,             {[]{return true;}}),
   });
 
-  areaTable[RR_LH_FISHING_ISLAND] = Area("LH Fishing Island", "Lake Hylia", RA_LAKE_HYLIA, DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_LH_FISHING_ISLAND] = Region("LH Fishing Island", "Lake Hylia", RA_LAKE_HYLIA, DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_LAKE_HYLIA,      {[]{return true;}}),
                   Entrance(RR_LH_FISHING_HOLE, {[]{return true;}}),
   });
 
-  areaTable[RR_LH_OWL_FLIGHT] = Area("LH Owl Flight", "Lake Hylia", RA_LAKE_HYLIA, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_LH_OWL_FLIGHT] = Region("LH Owl Flight", "Lake Hylia", RA_LAKE_HYLIA, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
   });
 
-  areaTable[RR_LH_LAB] = Area("LH Lab", "LH Lab", RA_NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_LH_LAB] = Region("LH Lab", "LH Lab", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->EyedropsAccess, {[]{return logic->EyedropsAccess || (logic->IsAdult && (logic->EyeballFrogAccess || (logic->EyeballFrog && logic->DisableTradeRevert)));}}),
                 }, {
@@ -165,7 +165,7 @@ void AreaTable_Init_HyruleField() {
   });
 
   // TODO: should some of these helpers be done via events instead?
-  areaTable[RR_LH_FISHING_HOLE] = Area("LH Fishing Hole", "LH Fishing Hole", RA_NONE, DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_LH_FISHING_HOLE] = Region("LH Fishing Hole", "LH Fishing Hole", RA_NONE, DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_LH_CHILD_FISHING,  logic->CanFish && logic->IsChild),
                   LOCATION(RC_LH_CHILD_FISH_1,   logic->CanGetChildFish),
@@ -209,7 +209,7 @@ void AreaTable_Init_HyruleField() {
                   Entrance(RR_LH_FISHING_ISLAND, {[]{return true;}}),
   });
 
-  areaTable[RR_LH_GROTTO] = Area("LH Grotto", "LH Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_LH_GROTTO] = Region("LH Grotto", "LH Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_LH_DEKU_SCRUB_GROTTO_LEFT,   logic->CanStunDeku),
                   LOCATION(RC_LH_DEKU_SCRUB_GROTTO_RIGHT,  logic->CanStunDeku),
@@ -220,7 +220,7 @@ void AreaTable_Init_HyruleField() {
                   Entrance(RR_LAKE_HYLIA, {[]{return true;}}),
   });
 
-  areaTable[RR_LON_LON_RANCH] = Area("Lon Lon Ranch", "Lon Lon Ranch", RA_LON_LON_RANCH, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_LON_LON_RANCH] = Region("Lon Lon Ranch", "Lon Lon Ranch", RA_LON_LON_RANCH, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->Epona,    {[]{return logic->Epona    || ((logic->ChildsWallet || randoCtx->GetOption(RSK_SKIP_EPONA_RACE)) && logic->CanUse(RG_EPONAS_SONG) && logic->IsAdult && logic->AtDay);}}),
                   EventAccess(&logic->LinksCow, {[]{return logic->LinksCow || (logic->ChildsWallet && logic->CanUse(RG_EPONAS_SONG) && logic->IsAdult && logic->AtDay);}}),
@@ -240,7 +240,7 @@ void AreaTable_Init_HyruleField() {
                   Entrance(RR_LLR_GROTTO,       {[]{return logic->IsChild;}}),
   });
 
-  areaTable[RR_LLR_TALONS_HOUSE] = Area("LLR Talons House", "LLR Talons House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_LLR_TALONS_HOUSE] = Region("LLR Talons House", "LLR Talons House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_LLR_TALONS_CHICKENS, logic->ChildsWallet && logic->IsChild && logic->AtDay && logic->ZeldasLetter),
                 }, {
@@ -248,7 +248,7 @@ void AreaTable_Init_HyruleField() {
                   Entrance(RR_LON_LON_RANCH, {[]{return true;}}),
   });
 
-  areaTable[RR_LLR_STABLES] = Area("LLR Stables", "LLR Stables", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_LLR_STABLES] = Region("LLR Stables", "LLR Stables", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_LLR_STABLES_LEFT_COW,  logic->CanUse(RG_EPONAS_SONG)),
                   LOCATION(RC_LLR_STABLES_RIGHT_COW, logic->CanUse(RG_EPONAS_SONG)),
@@ -257,7 +257,7 @@ void AreaTable_Init_HyruleField() {
                   Entrance(RR_LON_LON_RANCH, {[]{return true;}}),
   });
 
-  areaTable[RR_LLR_TOWER] = Area("LLR Tower", "LLR Tower", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_LLR_TOWER] = Region("LLR Tower", "LLR Tower", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_LLR_FREESTANDING_POH, logic->IsChild),
                   LOCATION(RC_LLR_TOWER_LEFT_COW,   logic->CanUse(RG_EPONAS_SONG)),
@@ -267,7 +267,7 @@ void AreaTable_Init_HyruleField() {
                   Entrance(RR_LON_LON_RANCH, {[]{return true;}}),
   });
 
-  areaTable[RR_LLR_GROTTO] = Area("LLR Grotto", "LLR Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_LLR_GROTTO] = Region("LLR Grotto", "LLR Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_LLR_DEKU_SCRUB_GROTTO_LEFT,   logic->CanStunDeku),
                   LOCATION(RC_LLR_DEKU_SCRUB_GROTTO_RIGHT,  logic->CanStunDeku),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp
index 7f5873ba1..7e603d657 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp
@@ -4,11 +4,11 @@
 
 using namespace Rando;
 
-void AreaTable_Init_IceCavern() {
+void RegionTable_Init_IceCavern() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[RR_ICE_CAVERN_ENTRYWAY] = Area("Ice Cavern Entryway", "Ice Cavern", RA_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_ICE_CAVERN_ENTRYWAY] = Region("Ice Cavern Entryway", "Ice Cavern", RA_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_ICE_CAVERN_BEGINNING,    {[]{return randoCtx->GetDungeon(ICE_CAVERN)->IsVanilla();}}),
                   Entrance(RR_ICE_CAVERN_MQ_BEGINNING, {[]{return randoCtx->GetDungeon(ICE_CAVERN)->IsMQ() && logic->CanUseProjectile;}}),
@@ -19,13 +19,13 @@ void AreaTable_Init_IceCavern() {
   |     VANILLA DUNGEON      |
   ---------------------------*/
   if (randoCtx->GetDungeon(ICE_CAVERN)->IsVanilla()) {
-  areaTable[RR_ICE_CAVERN_BEGINNING] = Area("Ice Cavern Beginning", "Ice Cavern", RA_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_ICE_CAVERN_BEGINNING] = Region("Ice Cavern Beginning", "Ice Cavern", RA_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_ICE_CAVERN_ENTRYWAY, {[]{return true;}}),
                   Entrance(RR_ICE_CAVERN_MAIN,     {[]{return Here(RR_ICE_CAVERN_BEGINNING, []{return (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_DINS_FIRE);});}}),
   });
 
-  areaTable[RR_ICE_CAVERN_MAIN] = Area("Ice Cavern", "Ice Cavern", RA_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_ICE_CAVERN_MAIN] = Region("Ice Cavern", "Ice Cavern", RA_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->BlueFireAccess, {[]{return logic->BlueFireAccess || (logic->IsAdult && logic->HasBottle);}}),
                 }, {
@@ -45,7 +45,7 @@ void AreaTable_Init_IceCavern() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (randoCtx->GetDungeon(ICE_CAVERN)->IsMQ()) {
-  areaTable[RR_ICE_CAVERN_MQ_BEGINNING] = Area("Ice Cavern MQ Beginning", "Ice Cavern", RA_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_ICE_CAVERN_MQ_BEGINNING] = Region("Ice Cavern MQ Beginning", "Ice Cavern", RA_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FairyPot, {[]{return true;}}),
   }, {}, {
@@ -56,7 +56,7 @@ void AreaTable_Init_IceCavern() {
                   Entrance(RR_ICE_CAVERN_MQ_IRON_BOOTS_REGION, {[]{return logic->BlueFire;}}),
   });
 
-  areaTable[RR_ICE_CAVERN_MQ_MAP_ROOM] = Area("Ice Cavern MQ Map Room", "Ice Cavern", RA_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_ICE_CAVERN_MQ_MAP_ROOM] = Region("Ice Cavern MQ Map Room", "Ice Cavern", RA_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->BlueFireAccess,  {[]{return logic->BlueFireAccess || (logic->HasBottle && logic->CanJumpslash);}}),
   }, {
@@ -64,7 +64,7 @@ void AreaTable_Init_IceCavern() {
                   LOCATION(RC_ICE_CAVERN_MQ_MAP_CHEST, logic->BlueFire && (logic->CanJumpslash || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUseProjectile)),
   }, {});
 
-  areaTable[RR_ICE_CAVERN_MQ_IRON_BOOTS_REGION] = Area("Ice Cavern MQ Iron Boots Region", "Ice Cavern", RA_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_ICE_CAVERN_MQ_IRON_BOOTS_REGION] = Region("Ice Cavern MQ Iron Boots Region", "Ice Cavern", RA_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_ICE_CAVERN_MQ_IRON_BOOTS_CHEST, logic->IsAdult && (logic->CanJumpslash || logic->CanUse(RG_MEGATON_HAMMER))),
                   LOCATION(RC_SHEIK_IN_ICE_CAVERN,            logic->IsAdult && (logic->CanJumpslash || logic->CanUse(RG_MEGATON_HAMMER))),
@@ -73,7 +73,7 @@ void AreaTable_Init_IceCavern() {
                     //Tricks: (logic->CanUse(RG_SCARECROW) || (logic->HoverBoots && logic->CanUse(RG_LONGSHOT)) || LogicIceMQScarecrow) && logic->IsAdult
   }, {});
 
-  areaTable[RR_ICE_CAVERN_MQ_COMPASS_ROOM] = Area("Ice Cavern MQ Compass Room", "Ice Cavern", RA_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_ICE_CAVERN_MQ_COMPASS_ROOM] = Region("Ice Cavern MQ Compass Room", "Ice Cavern", RA_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_ICE_CAVERN_MQ_COMPASS_CHEST,    true),
                   LOCATION(RC_ICE_CAVERN_MQ_FREESTANDING_POH, logic->HasExplosives),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp
index 036a522b0..b0d6031a9 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp
@@ -4,11 +4,11 @@
 
 using namespace Rando;
 
-void AreaTable_Init_JabuJabusBelly() {
+void RegionTable_Init_JabuJabusBelly() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[RR_JABU_JABUS_BELLY_ENTRYWAY] = Area("Jabu Jabus Belly Entryway", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_ENTRYWAY] = Region("Jabu Jabus Belly Entryway", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_BEGINNING,    {[]{return randoCtx->GetDungeon(JABU_JABUS_BELLY)->IsVanilla();}}),
                   Entrance(RR_JABU_JABUS_BELLY_MQ_BEGINNING, {[]{return randoCtx->GetDungeon(JABU_JABUS_BELLY)->IsMQ();}}),
@@ -19,13 +19,13 @@ void AreaTable_Init_JabuJabusBelly() {
   |     VANILLA DUNGEON      |
   ---------------------------*/
   if (randoCtx->GetDungeon(JABU_JABUS_BELLY)->IsVanilla()) {
-  areaTable[RR_JABU_JABUS_BELLY_BEGINNING] = Area("Jabu Jabus Belly Beginning", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_BEGINNING] = Region("Jabu Jabus Belly Beginning", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_ENTRYWAY,    {[]{return true;}}),
                   Entrance(RR_JABU_JABUS_BELLY_LIFT_MIDDLE, {[]{return logic->CanUseProjectile;}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_LIFT_MIDDLE] = Area("Jabu Jabus Belly Lift Middle", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_LIFT_MIDDLE] = Region("Jabu Jabus Belly Lift Middle", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_BEGINNING,      {[]{return true;}}),
                   Entrance(RR_JABU_JABUS_BELLY_MAIN_UPPER,     {[]{return true;}}),
@@ -33,7 +33,7 @@ void AreaTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_NEAR_BOSS_ROOM, {[]{return HasAccessTo(RR_JABU_JABUS_BELLY_LIFT_UPPER) || (randoCtx->GetTrickOption(RT_JABU_BOSS_HOVER) && logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS));}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_MAIN_UPPER] = Area("Jabu Jabus Belly Main Upper", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_MAIN_UPPER] = Region("Jabu Jabus Belly Main Upper", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_LIFT_MIDDLE,     {[]{return true;}}),
                   Entrance(RR_JABU_JABUS_BELLY_MAIN_LOWER,      {[]{return true;}}),
@@ -41,7 +41,7 @@ void AreaTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_BIGOCTO_ROOM,    {[]{return Here(RR_JABU_JABUS_BELLY_GREEN_TENTACLE, []{return logic->CanUse(RG_BOOMERANG);});}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_MAIN_LOWER] = Area("Jabu Jabus Belly Main Lower", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_MAIN_LOWER] = Region("Jabu Jabus Belly Main Lower", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER, logic->HookshotOrBoomerang),
                   LOCATION(RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER, logic->HookshotOrBoomerang),
@@ -52,7 +52,7 @@ void AreaTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_LOWER_SIDE_ROOM,  {[]{return true;}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_SHABOMB_CORRIDOR] = Area("Jabu Jabus Belly Shabomb Corridor", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_JABU_JABUS_BELLY_SHABOMB_CORRIDOR] = Region("Jabu Jabus Belly Shabomb Corridor", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FairyPot, {[]{return true;}}),
                 }, {
@@ -64,7 +64,7 @@ void AreaTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_LIFT_LOWER, {[]{return logic->Swim && logic->CanUseProjectile;}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_LOWER_SIDE_ROOM] = Area("Jabu Jabus Belly Lower Side Room", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_JABU_JABUS_BELLY_LOWER_SIDE_ROOM] = Region("Jabu Jabus Belly Lower Side Room", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FairyPot, {[]{return logic->FairyPot || (logic->CanUse(RG_BOOMERANG) || logic->CanUse(RG_HOVER_BOOTS));}}),
                 }, {}, {
@@ -72,7 +72,7 @@ void AreaTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_MAIN_LOWER, {[]{return true;}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_LIFT_LOWER] = Area("Jabu Jabus Belly Lift Lower", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_LIFT_LOWER] = Region("Jabu Jabus Belly Lift Lower", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_JABU_JABUS_BELLY_DEKU_SCRUB, logic->Swim && (logic->IsChild || logic->CanDive || randoCtx->GetTrickOption(RT_JABU_ALCOVE_JUMP_DIVE) || logic->CanUse(RG_IRON_BOOTS)) && logic->CanStunDeku),
                 }, {
@@ -81,7 +81,7 @@ void AreaTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_LIFT_MIDDLE,      {[]{return true;}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_FORKED_CORRIDOR] = Area("Jabu Jabus Belly Forked Corridor", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_FORKED_CORRIDOR] = Region("Jabu Jabus Belly Forked Corridor", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_MAIN_UPPER,     {[]{return true;}}),
                   Entrance(RR_JABU_JABUS_BELLY_BOOMERANG_ROOM, {[]{return true;}}),
@@ -91,7 +91,7 @@ void AreaTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_GREEN_TENTACLE, {[]{return Here(RR_JABU_JABUS_BELLY_BLUE_TENTACLE, []{return logic->CanUse(RG_BOOMERANG);});}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_BOOMERANG_ROOM] = Area("Jabu Jabus Belly Boomerang Room", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_BOOMERANG_ROOM] = Region("Jabu Jabus Belly Boomerang Room", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_JABU_JABUS_BELLY_BOOMERANG_CHEST, true),
                 }, {
@@ -99,7 +99,7 @@ void AreaTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_FORKED_CORRIDOR, {[]{return true;}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_MAP_ROOM] = Area("Jabu Jabus Belly Map Room", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_MAP_ROOM] = Region("Jabu Jabus Belly Map Room", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_JABU_JABUS_BELLY_MAP_CHEST, logic->CanUse(RG_BOOMERANG)),
                 }, {
@@ -107,7 +107,7 @@ void AreaTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_FORKED_CORRIDOR, {[]{return true;}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_COMPASS_ROOM] = Area("Jabu Jabus Belly Compass Room", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_COMPASS_ROOM] = Region("Jabu Jabus Belly Compass Room", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_JABU_JABUS_BELLY_COMPASS_CHEST, logic->CanAdultAttack || logic->CanChildAttack),
                 }, {
@@ -115,23 +115,23 @@ void AreaTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_FORKED_CORRIDOR, {[]{return true;}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_BLUE_TENTACLE] = Area("Jabu Jabus Belly Blue Tentacle", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_BLUE_TENTACLE] = Region("Jabu Jabus Belly Blue Tentacle", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_FORKED_CORRIDOR, {[]{return Here(RR_JABU_JABUS_BELLY_BLUE_TENTACLE, []{return logic->CanUse(RG_BOOMERANG);});}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_GREEN_TENTACLE] = Area("Jabu Jabus Belly Green Tentacle", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_GREEN_TENTACLE] = Region("Jabu Jabus Belly Green Tentacle", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_FORKED_CORRIDOR, {[]{return Here(RR_JABU_JABUS_BELLY_GREEN_TENTACLE, []{return logic->CanUse(RG_BOOMERANG);});}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_BIGOCTO_ROOM] = Area("Jabu Jabus Belly Bigocto Room", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_BIGOCTO_ROOM] = Region("Jabu Jabus Belly Bigocto Room", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_MAIN_LOWER,    {[]{return true;}}),
                   Entrance(RR_JABU_JABUS_BELLY_ABOVE_BIGOCTO, {[]{return Here(RR_JABU_JABUS_BELLY_BIGOCTO_ROOM, []{return (logic->CanUse(RG_BOOMERANG) || logic->CanUse(RG_NUTS)) && (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_STICKS));});}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_ABOVE_BIGOCTO] = Area("Jabu Jabus Belly Above Bigocto", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_JABU_JABUS_BELLY_ABOVE_BIGOCTO] = Region("Jabu Jabus Belly Above Bigocto", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FairyPot, {[]{return true;}}),
                   EventAccess(&logic->NutPot,   {[]{return true;}}),
@@ -140,13 +140,13 @@ void AreaTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_LIFT_UPPER, {[]{return logic->CanUse(RG_BOOMERANG);}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_LIFT_UPPER] = Area("Jabu Jabus Belly Lift Upper", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_LIFT_UPPER] = Region("Jabu Jabus Belly Lift Upper", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_LIFT_MIDDLE, {[]{return true;}}),
                   Entrance(RR_JABU_JABUS_BELLY_LIFT_LOWER,  {[]{return true;}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_NEAR_BOSS_ROOM] = Area("Jabu Jabus Belly Near Boss Room", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_NEAR_BOSS_ROOM] = Region("Jabu Jabus Belly Near Boss Room", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_JABU_JABUS_BELLY_GS_NEAR_BOSS, logic->CanAdultAttack || logic->CanChildAttack),
                 }, {
@@ -160,7 +160,7 @@ void AreaTable_Init_JabuJabusBelly() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (randoCtx->GetDungeon(JABU_JABUS_BELLY)->IsMQ()) {
-  areaTable[RR_JABU_JABUS_BELLY_MQ_BEGINNING] = Area("Jabu Jabus Belly MQ Beginning", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_JABU_JABUS_BELLY_MQ_BEGINNING] = Region("Jabu Jabus Belly MQ Beginning", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->NutPot, {[]{return true;}}),
   }, {
@@ -173,7 +173,7 @@ void AreaTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_MQ_MAIN,  {[]{return Here(RR_JABU_JABUS_BELLY_MQ_BEGINNING, []{return logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT);});}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_MQ_MAIN] = Area("Jabu Jabus Belly MQ Main", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_MQ_MAIN] = Region("Jabu Jabus Belly MQ Main", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST,      true),
                   LOCATION(RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST,      (logic->IsAdult && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT))) || ChildCanAccess(RR_JABU_JABUS_BELLY_MQ_BOSS_AREA)),
@@ -191,7 +191,7 @@ void AreaTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_MQ_DEPTHS,    {[]{return logic->HasExplosives && logic->CanUse(RG_FAIRY_SLINGSHOT) && logic->CanUse(RG_BOOMERANG);}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_MQ_DEPTHS] = Area("Jabu Jabus Belly MQ Depths", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_MQ_DEPTHS] = Region("Jabu Jabus Belly MQ Depths", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST, true),
                   LOCATION(RC_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM,          logic->Swim && (logic->CanUse(RG_STICKS) || logic->CanUse(RG_DINS_FIRE))),
@@ -202,7 +202,7 @@ void AreaTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_MQ_BOSS_AREA, {[]{return logic->CanUse(RG_STICKS) || (logic->CanUse(RG_DINS_FIRE) && logic->KokiriSword);}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_MQ_BOSS_AREA] = Area("Jabu Jabus Belly MQ Boss Area", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_JABU_JABUS_BELLY_MQ_BOSS_AREA] = Region("Jabu Jabus Belly MQ Boss Region", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FairyPot, {[]{return true;}}),
   }, {
@@ -221,7 +221,7 @@ void AreaTable_Init_JabuJabusBelly() {
     |         BOSS ROOM         |
     ---------------------------*/
     areaTable[RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY] =
-        Area("Jabu Jabus Belly Boss Entryway", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {},
+        Region("Jabu Jabus Belly Boss Entryway", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {},
              {
                  // Exits
                  Entrance(RR_JABU_JABUS_BELLY_NEAR_BOSS_ROOM, { [] { return randoCtx->GetDungeon(JABU_JABUS_BELLY)->IsVanilla(); } }),
@@ -230,7 +230,7 @@ void AreaTable_Init_JabuJabusBelly() {
              });
 
     areaTable[RR_JABU_JABUS_BELLY_BOSS_ROOM] =
-        Area("Jabu Jabus Belly Boss Room", "Jabu Jabus Belly", RA_NONE, NO_DAY_NIGHT_CYCLE,
+        Region("Jabu Jabus Belly Boss Room", "Jabu Jabus Belly", RA_NONE, NO_DAY_NIGHT_CYCLE,
              {
                  // Events //todo: add pot kill trick
                  EventAccess(&logic->JabuJabusBellyClear,
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
index b0452e419..c7b57db84 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
@@ -3,8 +3,8 @@
 
 using namespace Rando;
 
-void AreaTable_Init_Kakariko() {
-  areaTable[RR_KAKARIKO_VILLAGE] = Area("Kakariko Village", "Kakariko Village", RA_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {
+void RegionTable_Init_Kakariko() {
+  areaTable[RR_KAKARIKO_VILLAGE] = Region("Kakariko Village", "Kakariko Village", RA_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->CojiroAccess,            {[]{return logic->CojiroAccess || (logic->IsAdult && logic->WakeUpAdultTalon);}}),
                   EventAccess(&logic->BugRock,                 {[]{return true;}}),
@@ -39,13 +39,13 @@ void AreaTable_Init_Kakariko() {
                   Entrance(RR_KAK_BEHIND_GATE,             {[]{return logic->IsAdult || (logic->KakarikoVillageGateOpen);}}),
   });
 
-  areaTable[RR_KAK_IMPAS_LEDGE] = Area("Kak Impas Ledge", "Kakariko Village", RA_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_KAK_IMPAS_LEDGE] = Region("Kak Impas Ledge", "Kakariko Village", RA_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_KAK_IMPAS_HOUSE_BACK, {[]{return true;}}),
                   Entrance(RR_KAKARIKO_VILLAGE,     {[]{return true;}}),
   });
 
-  areaTable[RR_KAK_IMPAS_ROOFTOP] = Area("Kak Impas Rooftop", "Kakariko Village", RA_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KAK_IMPAS_ROOFTOP] = Region("Kak Impas Rooftop", "Kakariko Village", RA_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_KAK_GS_ABOVE_IMPAS_HOUSE, logic->IsAdult && logic->AtNight && logic->CanGetNightTimeGS && (logic->CanJumpslash || logic->CanUseProjectile)),
                 }, {
@@ -54,7 +54,7 @@ void AreaTable_Init_Kakariko() {
                   Entrance(RR_KAKARIKO_VILLAGE, {[]{return true;}}),
   });
 
-  areaTable[RR_KAK_ROOFTOP] = Area("Kak Rooftop", "Kakariko Village", RA_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KAK_ROOFTOP] = Region("Kak Rooftop", "Kakariko Village", RA_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_KAK_MAN_ON_ROOF, true),
                 }, {
@@ -62,7 +62,7 @@ void AreaTable_Init_Kakariko() {
                   Entrance(RR_KAK_BACKYARD, {[]{return true;}}),
   });
 
-  areaTable[RR_KAK_BACKYARD] = Area("Kak Backyard", "Kakariko Village", RA_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_KAK_BACKYARD] = Region("Kak Backyard", "Kakariko Village", RA_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_KAKARIKO_VILLAGE,          {[]{return true;}}),
                   Entrance(RR_KAK_OPEN_GROTTO,           {[]{return true;}}),
@@ -70,7 +70,7 @@ void AreaTable_Init_Kakariko() {
                   Entrance(RR_KAK_POTION_SHOP_BACK,      {[]{return logic->IsAdult && logic->AtDay;}}),
   });
 
-  areaTable[RR_KAK_CARPENTER_BOSS_HOUSE] = Area("Kak Carpenter Boss House", "Kak Carpenter Boss House", RA_NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_KAK_CARPENTER_BOSS_HOUSE] = Region("Kak Carpenter Boss House", "Kak Carpenter Boss House", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->WakeUpAdultTalon, {[]{return logic->WakeUpAdultTalon || (logic->IsAdult && logic->PocketEgg);}}),
                 }, {}, {
@@ -78,7 +78,7 @@ void AreaTable_Init_Kakariko() {
                   Entrance(RR_KAKARIKO_VILLAGE, {[]{return true;}}),
   });
 
-  areaTable[RR_KAK_HOUSE_OF_SKULLTULA] = Area("Kak House of Skulltula", "Kak House of Skulltula", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KAK_HOUSE_OF_SKULLTULA] = Region("Kak House of Skulltula", "Kak House of Skulltula", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_KAK_10_GOLD_SKULLTULA_REWARD, logic->GoldSkulltulaTokens >= 10),
                   LOCATION(RC_KAK_20_GOLD_SKULLTULA_REWARD, logic->GoldSkulltulaTokens >= 20),
@@ -91,13 +91,13 @@ void AreaTable_Init_Kakariko() {
                   Entrance(RR_KAKARIKO_VILLAGE, {[]{return true;}}),
   });
 
-  areaTable[RR_KAK_IMPAS_HOUSE] = Area("Kak Impas House", "Kak Impas House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_KAK_IMPAS_HOUSE] = Region("Kak Impas House", "Kak Impas House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_KAK_IMPAS_HOUSE_NEAR_COW, {[]{return true;}}),
                   Entrance(RR_KAKARIKO_VILLAGE,         {[]{return true;}}),
   });
 
-  areaTable[RR_KAK_IMPAS_HOUSE_BACK] = Area("Kak Impas House Back", "Kak Impas House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KAK_IMPAS_HOUSE_BACK] = Region("Kak Impas House Back", "Kak Impas House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_KAK_IMPAS_HOUSE_FREESTANDING_POH, true),
                 }, {
@@ -106,12 +106,12 @@ void AreaTable_Init_Kakariko() {
                   Entrance(RR_KAK_IMPAS_HOUSE_NEAR_COW, {[]{return true;}}),
   });
 
-  areaTable[RR_KAK_IMPAS_HOUSE_NEAR_COW] = Area("Kak Impas House Near Cow", "Kak Impas House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KAK_IMPAS_HOUSE_NEAR_COW] = Region("Kak Impas House Near Cow", "Kak Impas House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_KAK_IMPAS_HOUSE_COW, logic->CanUse(RG_EPONAS_SONG)),
   }, {});
 
-  areaTable[RR_KAK_WINDMILL] = Area("Kak Windmill", "Windmill and Dampes Grave", RA_NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_KAK_WINDMILL] = Region("Kak Windmill", "Windmill and Dampes Grave", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->DrainWell, {[]{return logic->DrainWell || (logic->IsChild && logic->CanUse(RG_SONG_OF_STORMS));}}),
                 }, {
@@ -124,7 +124,7 @@ void AreaTable_Init_Kakariko() {
                   Entrance(RR_KAKARIKO_VILLAGE, {[]{return true;}}),
   });
 
-  areaTable[RR_KAK_BAZAAR] = Area("Kak Bazaar", "Kak Bazaar", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KAK_BAZAAR] = Region("Kak Bazaar", "Kak Bazaar", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_KAK_BAZAAR_ITEM_1, true),
                   LOCATION(RC_KAK_BAZAAR_ITEM_2, true),
@@ -139,7 +139,7 @@ void AreaTable_Init_Kakariko() {
                   Entrance(RR_KAKARIKO_VILLAGE, {[]{return true;}}),
   });
 
-  areaTable[RR_KAK_SHOOTING_GALLERY] = Area("Kak Shooting Gallery", "Kak Shooting Gallery", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KAK_SHOOTING_GALLERY] = Region("Kak Shooting Gallery", "Kak Shooting Gallery", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_KAK_SHOOTING_GALLERY_REWARD, logic->ChildsWallet && logic->IsAdult && logic->Bow),
                 }, {
@@ -147,7 +147,7 @@ void AreaTable_Init_Kakariko() {
                   Entrance(RR_KAKARIKO_VILLAGE, {[]{return true;}}),
   });
 
-  areaTable[RR_KAK_POTION_SHOP_FRONT] = Area("Kak Potion Shop Front", "Kak Potion Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KAK_POTION_SHOP_FRONT] = Region("Kak Potion Shop Front", "Kak Potion Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_KAK_POTION_SHOP_ITEM_1, logic->IsAdult),
                   LOCATION(RC_KAK_POTION_SHOP_ITEM_2, logic->IsAdult),
@@ -163,14 +163,14 @@ void AreaTable_Init_Kakariko() {
                   Entrance(RR_KAK_POTION_SHOP_BACK, {[]{return logic->IsAdult;}}),
   });
 
-  areaTable[RR_KAK_POTION_SHOP_BACK] = Area("Kak Potion Shop Back", "Kak Potion Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_KAK_POTION_SHOP_BACK] = Region("Kak Potion Shop Back", "Kak Potion Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_KAK_BACKYARD,          {[]{return logic->IsAdult;}}),
                   Entrance(RR_KAK_POTION_SHOP_FRONT, {[]{return true;}}),
   });
 
   areaTable[RR_KAK_ODD_POTION_BUILDING] =
-      Area("Kak Granny's Potion Shop", "Kak Granny's Potion Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {
+      Region("Kak Granny's Potion Shop", "Kak Granny's Potion Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {
           
                // Events
                EventAccess(&logic->OddPoulticeAccess, { [] {
@@ -186,7 +186,7 @@ void AreaTable_Init_Kakariko() {
                Entrance(RR_KAK_BACKYARD, { [] { return true; } }),
            });
 
-  areaTable[RR_KAK_REDEAD_GROTTO] = Area("Kak Redead Grotto", "Kak Redead Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KAK_REDEAD_GROTTO] = Region("Kak Redead Grotto", "Kak Redead Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_KAK_REDEAD_GROTTO_CHEST, logic->CanUse(RG_STICKS) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_DINS_FIRE) || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)),
                 }, {
@@ -194,7 +194,7 @@ void AreaTable_Init_Kakariko() {
                   Entrance(RR_KAKARIKO_VILLAGE, {[]{return true;}}),
   });
 
-  areaTable[RR_KAK_OPEN_GROTTO] = Area("Kak Open Grotto", "Kak Open Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+  areaTable[RR_KAK_OPEN_GROTTO] = Region("Kak Open Grotto", "Kak Open Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LOCATION(RC_KAK_OPEN_GROTTO_CHEST,         true),
                   LOCATION(RC_KAK_OPEN_GROTTO_FISH,          logic->HasBottle),
@@ -206,7 +206,7 @@ void AreaTable_Init_Kakariko() {
                   Entrance(RR_KAK_BACKYARD, {[]{return true;}}),
   });
 
-  areaTable[RR_THE_GRAVEYARD] = Area("The Graveyard", "The Graveyard", RA_THE_GRAVEYARD, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_THE_GRAVEYARD] = Region("The Graveyard", "The Graveyard", RA_THE_GRAVEYARD, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->ButterflyFairy, {[]{return logic->ButterflyFairy || (logic->CanUse(RG_STICKS) && logic->AtDay);}}),
                   EventAccess(&logic->BeanPlantFairy, {[]{return logic->BeanPlantFairy || (CanPlantBean(RR_THE_GRAVEYARD) && logic->CanUse(RG_SONG_OF_STORMS));}}),
@@ -228,7 +228,7 @@ void AreaTable_Init_Kakariko() {
                   Entrance(RR_GRAVEYARD_WARP_PAD_REGION,    {[]{return false;}}),
   });
 
-  areaTable[RR_GRAVEYARD_SHIELD_GRAVE] = Area("Graveyard Shield Grave", "Graveyard Shield Grave", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GRAVEYARD_SHIELD_GRAVE] = Region("Graveyard Shield Grave", "Graveyard Shield Grave", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GRAVEYARD_SHIELD_GRAVE_CHEST, true),
                   //Free Fairies
@@ -237,7 +237,7 @@ void AreaTable_Init_Kakariko() {
                   Entrance(RR_THE_GRAVEYARD, {[]{return true;}}),
   });
 
-  areaTable[RR_GRAVEYARD_HEART_PIECE_GRAVE] = Area("Graveyard Heart Piece Grave", "Graveyard Heart Piece Grave", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GRAVEYARD_HEART_PIECE_GRAVE] = Region("Graveyard Heart Piece Grave", "Graveyard Heart Piece Grave", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GRAVEYARD_HEART_PIECE_GRAVE_CHEST, logic->CanUse(RG_SUNS_SONG)),
                 }, {
@@ -245,7 +245,7 @@ void AreaTable_Init_Kakariko() {
                   Entrance(RR_THE_GRAVEYARD, {[]{return true;}}),
   });
 
-  areaTable[RR_GRAVEYARD_COMPOSERS_GRAVE] = Area("Graveyard Composers Grave", "Graveyard Composers Grave", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GRAVEYARD_COMPOSERS_GRAVE] = Region("Graveyard Composers Grave", "Graveyard Composers Grave", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST, logic->HasFireSource),
                   LOCATION(RC_SONG_FROM_ROYAL_FAMILYS_TOMB,       logic->CanUseProjectile || logic->CanJumpslash || logic->CanUse(RG_MEGATON_HAMMER)),
@@ -254,7 +254,7 @@ void AreaTable_Init_Kakariko() {
                   Entrance(RR_THE_GRAVEYARD, {[]{return true;}}),
   });
 
-  areaTable[RR_GRAVEYARD_DAMPES_GRAVE] = Area("Graveyard Dampes Grave", "Windmill and Dampes Grave", RA_NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GRAVEYARD_DAMPES_GRAVE] = Region("Graveyard Dampes Grave", "Windmill and Dampes Grave", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->NutPot,               {[]{return true;}}),
                   EventAccess(&logic->DampesWindmillAccess, {[]{return logic->DampesWindmillAccess || (logic->IsAdult && logic->CanUse(RG_SONG_OF_TIME));}}),
@@ -268,7 +268,7 @@ void AreaTable_Init_Kakariko() {
                   Entrance(RR_KAK_WINDMILL,  {[]{return logic->IsAdult && logic->CanUse(RG_SONG_OF_TIME);}}),
   });
 
-  areaTable[RR_GRAVEYARD_DAMPES_HOUSE] = Area("Graveyard Dampes House", "Graveyard Dampes House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GRAVEYARD_DAMPES_HOUSE] = Region("Graveyard Dampes House", "Graveyard Dampes House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DAMPE_HINT, logic->IsAdult),
                 }, {
@@ -276,7 +276,7 @@ void AreaTable_Init_Kakariko() {
                   Entrance(RR_THE_GRAVEYARD, {[]{return true;}}),
   });
 
-  areaTable[RR_GRAVEYARD_WARP_PAD_REGION] = Area("Graveyard Warp Pad Region", "Graveyard", RA_THE_GRAVEYARD, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GRAVEYARD_WARP_PAD_REGION] = Region("Graveyard Warp Pad Region", "Graveyard", RA_THE_GRAVEYARD, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CanSummonGossipFairyWithoutSuns;}}),
                 }, {
@@ -288,7 +288,7 @@ void AreaTable_Init_Kakariko() {
                   Entrance(RR_SHADOW_TEMPLE_ENTRYWAY,    {[]{return logic->CanUse(RG_DINS_FIRE) || (randoCtx->GetTrickOption(RT_GY_SHADOW_FIRE_ARROWS) && logic->IsAdult && logic->CanUse(RG_FIRE_ARROWS));}}),
   });
 
-  areaTable[RR_KAK_BEHIND_GATE] = Area("Kak Behind Gate", "Kakariko Village", RA_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_KAK_BEHIND_GATE] = Region("Kak Behind Gate", "Kakariko Village", RA_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_KAKARIKO_VILLAGE,     {[]{return logic->IsAdult || randoCtx->GetTrickOption(RT_VISIBLE_COLLISION) || logic->KakarikoVillageGateOpen || randoCtx->GetOption(RSK_KAK_GATE).Is(RO_KAK_GATE_OPEN);}}),
                   Entrance(RR_DEATH_MOUNTAIN_TRAIL, {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
index 66c085905..f4875de97 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
@@ -3,8 +3,8 @@
 
 using namespace Rando;
 
-void AreaTable_Init_LostWoods() {
-  areaTable[RR_KOKIRI_FOREST] = Area("Kokiri Forest", "Kokiri Forest", RA_KOKIRI_FOREST, NO_DAY_NIGHT_CYCLE, {
+void RegionTable_Init_LostWoods() {
+  areaTable[RR_KOKIRI_FOREST] = Region("Kokiri Forest", "Kokiri Forest", RA_KOKIRI_FOREST, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->BeanPlantFairy,           {[]{return logic->BeanPlantFairy   || (CanPlantBean(RR_KOKIRI_FOREST) && logic->CanUse(RG_SONG_OF_STORMS));}}),
                   EventAccess(&logic->GossipStoneFairy,         {[]{return logic->GossipStoneFairy || logic->CanSummonGossipFairyWithoutSuns;}}),
@@ -30,7 +30,7 @@ void AreaTable_Init_LostWoods() {
                   Entrance(RR_KF_STORMS_GROTTO,      {[]{return logic->CanOpenStormGrotto;}}),
   });
 
-  areaTable[RR_KF_OUTSIDE_DEKU_TREE] = Area("KF Outside Deku Tree", "Kokiri Forest", RA_KOKIRI_FOREST, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_KF_OUTSIDE_DEKU_TREE] = Region("KF Outside Deku Tree", "Kokiri Forest", RA_KOKIRI_FOREST, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->DekuBabaSticks,           {[]{return logic->DekuBabaSticks || ((logic->IsAdult && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_KOKIRI_SWORD)) && !randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES)) || (logic->IsChild && (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BOOMERANG))));}}),
                   EventAccess(&logic->DekuBabaNuts,             {[]{return logic->DekuBabaNuts   || ((logic->IsAdult && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_KOKIRI_SWORD)) && !randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES)) || (logic->IsChild && (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->HasExplosives || logic->CanUse(RG_DINS_FIRE))));}}),
@@ -45,7 +45,7 @@ void AreaTable_Init_LostWoods() {
                   Entrance(RR_KOKIRI_FOREST,      {[]{return (logic->IsAdult && (logic->CanPassEnemy("Big Skulltula") || logic->ForestTempleClear)) || randoCtx->GetOption(RSK_FOREST).Is(RO_FOREST_OPEN) || logic->ShowedMidoSwordAndShield;}}),
   });
 
-  areaTable[RR_KF_LINKS_HOUSE] = Area("KF Link's House", "KF Link's House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KF_LINKS_HOUSE] = Region("KF Link's House", "KF Link's House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_KF_LINKS_HOUSE_COW, logic->IsAdult && logic->CanUse(RG_EPONAS_SONG) && logic->LinksCow),
                 }, {
@@ -53,7 +53,7 @@ void AreaTable_Init_LostWoods() {
                   Entrance(RR_KOKIRI_FOREST, {[]{return true;}})
   });
 
-  areaTable[RR_KF_MIDOS_HOUSE] = Area("KF Mido's House", "KF Mido's House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KF_MIDOS_HOUSE] = Region("KF Mido's House", "KF Mido's House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_KF_MIDOS_TOP_LEFT_CHEST,     true),
                   LOCATION(RC_KF_MIDOS_TOP_RIGHT_CHEST,    true),
@@ -64,22 +64,22 @@ void AreaTable_Init_LostWoods() {
                   Entrance(RR_KOKIRI_FOREST, {[]{return true;}}),
   });
 
-  areaTable[RR_KF_SARIAS_HOUSE] = Area("KF Saria's House", "KF Saria's House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_KF_SARIAS_HOUSE] = Region("KF Saria's House", "KF Saria's House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_KOKIRI_FOREST, {[]{return true;}}),
   });
 
-  areaTable[RR_KF_HOUSE_OF_TWINS] = Area("KF House of Twins", "KF House of Twins", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_KF_HOUSE_OF_TWINS] = Region("KF House of Twins", "KF House of Twins", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_KOKIRI_FOREST, {[]{return true;}}),
   });
 
-  areaTable[RR_KF_KNOW_IT_ALL_HOUSE] = Area("KF Know It All House", "KF Know It All House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_KF_KNOW_IT_ALL_HOUSE] = Region("KF Know It All House", "KF Know It All House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_KOKIRI_FOREST, {[]{return true;}}),
   });
 
-  areaTable[RR_KF_KOKIRI_SHOP] = Area("KF Kokiri Shop", "KF Kokiri Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KF_KOKIRI_SHOP] = Region("KF Kokiri Shop", "KF Kokiri Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_KF_SHOP_ITEM_1, true),
                   LOCATION(RC_KF_SHOP_ITEM_2, true),
@@ -94,7 +94,7 @@ void AreaTable_Init_LostWoods() {
                   Entrance(RR_KOKIRI_FOREST, {[]{return true;}}),
   });
 
-  areaTable[RR_KF_STORMS_GROTTO] = Area("KF Storms Grotto", "KF Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+  areaTable[RR_KF_STORMS_GROTTO] = Region("KF Storms Grotto", "KF Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LOCATION(RC_KF_STORMS_GROTTO_CHEST,         true),
                   LOCATION(RC_KF_STORMS_GROTTO_FISH,          logic->HasBottle),
@@ -106,12 +106,12 @@ void AreaTable_Init_LostWoods() {
                   Entrance(RR_KOKIRI_FOREST, {[]{return true;}})
   });
 
-  areaTable[RR_LW_FOREST_EXIT] = Area("LW Forest Exit", "Lost Woods", RA_THE_LOST_WOODS, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_LW_FOREST_EXIT] = Region("LW Forest Exit", "Lost Woods", RA_THE_LOST_WOODS, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_KOKIRI_FOREST, {[]{return true;}})
   });
 
-  areaTable[RR_THE_LOST_WOODS] = Area("Lost Woods", "Lost Woods", RA_THE_LOST_WOODS, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_THE_LOST_WOODS] = Region("Lost Woods", "Lost Woods", RA_THE_LOST_WOODS, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->OddMushroomAccess, {[]{return logic->OddMushroomAccess || (logic->IsAdult && (logic->CojiroAccess || logic->Cojiro));}}),
                   EventAccess(&logic->PoachersSawAccess, {[]{return logic->PoachersSawAccess || (logic->IsAdult && logic->OddPoulticeAccess);}}),
@@ -146,7 +146,7 @@ void AreaTable_Init_LostWoods() {
                   Entrance(RR_LW_NEAR_SHORTCUTS_GROTTO, {[]{return Here(RR_THE_LOST_WOODS, []{return logic->CanBlastOrSmash;});}}),
   });
 
-  areaTable[RR_LW_BEYOND_MIDO] = Area("LW Beyond Mido", "Lost Woods", RA_THE_LOST_WOODS, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_LW_BEYOND_MIDO] = Region("LW Beyond Mido", "Lost Woods", RA_THE_LOST_WOODS, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->ButterflyFairy, {[]{return logic->ButterflyFairy || logic->CanUse(RG_STICKS);}}),
                 }, {
@@ -164,7 +164,7 @@ void AreaTable_Init_LostWoods() {
                   Entrance(RR_LW_SCRUBS_GROTTO, {[]{return Here(RR_LW_BEYOND_MIDO, []{return logic->CanBlastOrSmash;});}}),
   });
 
-  areaTable[RR_LW_NEAR_SHORTCUTS_GROTTO] = Area("LW Near Shortcuts Grotto", "LW Near Shortcuts Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+  areaTable[RR_LW_NEAR_SHORTCUTS_GROTTO] = Region("LW Near Shortcuts Grotto", "LW Near Shortcuts Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LOCATION(RC_LW_NEAR_SHORTCUTS_GROTTO_CHEST,         true),
                   LOCATION(RC_LW_NEAR_SHORTCUTS_GROTTO_FISH,          logic->HasBottle),
@@ -176,7 +176,7 @@ void AreaTable_Init_LostWoods() {
                   Entrance(RR_THE_LOST_WOODS, {[]{return true;}}),
   });
 
-  areaTable[RR_DEKU_THEATER] = Area("Deku Theater", "Deku Theater", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DEKU_THEATER] = Region("Deku Theater", "Deku Theater", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DEKU_THEATER_SKULL_MASK,    logic->IsChild && logic->SkullMask),
                   LOCATION(RC_DEKU_THEATER_MASK_OF_TRUTH, logic->IsChild && logic->MaskOfTruth),
@@ -185,7 +185,7 @@ void AreaTable_Init_LostWoods() {
                   Entrance(RR_LW_BEYOND_MIDO, {[]{return true;}}),
   });
 
-  areaTable[RR_LW_SCRUBS_GROTTO] = Area("LW Scrubs Grotto", "LW Scrubs Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_LW_SCRUBS_GROTTO] = Region("LW Scrubs Grotto", "LW Scrubs Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_LW_DEKU_SCRUB_GROTTO_REAR,    logic->CanStunDeku),
                   LOCATION(RC_LW_DEKU_SCRUB_GROTTO_FRONT,   logic->CanStunDeku),
@@ -195,14 +195,14 @@ void AreaTable_Init_LostWoods() {
                   Entrance(RR_LW_BEYOND_MIDO, {[]{return true;}}),
   });
 
-  areaTable[RR_SFM_ENTRYWAY] = Area("SFM Entryway", "Sacred Forest Meadow", RA_SACRED_FOREST_MEADOW, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_SFM_ENTRYWAY] = Region("SFM Entryway", "Sacred Forest Meadow", RA_SACRED_FOREST_MEADOW, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_LW_BEYOND_MIDO,       {[]{return true;}}),
                   Entrance(RR_SACRED_FOREST_MEADOW, {[]{return logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_DINS_FIRE) || logic->CanUse(RG_MEGATON_HAMMER);}}),
                   Entrance(RR_SFM_WOLFOS_GROTTO,    {[]{return logic->CanOpenBombGrotto;}}),
   });
 
-  areaTable[RR_SACRED_FOREST_MEADOW] = Area("Sacred Forest Meadow", "Sacred Forest Meadow", RA_SACRED_FOREST_MEADOW, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_SACRED_FOREST_MEADOW] = Region("Sacred Forest Meadow", "Sacred Forest Meadow", RA_SACRED_FOREST_MEADOW, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CanSummonGossipFairyWithoutSuns;}}),
                 }, {
@@ -221,7 +221,7 @@ void AreaTable_Init_LostWoods() {
                   Entrance(RR_SFM_STORMS_GROTTO,      {[]{return logic->CanOpenStormGrotto;}}),
   });
 
-  areaTable[RR_SFM_FAIRY_GROTTO] = Area("SFM Fairy Grotto", "SFM Fairy Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_SFM_FAIRY_GROTTO] = Region("SFM Fairy Grotto", "SFM Fairy Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FreeFairies, {[]{return true;}}),
                 }, {}, {
@@ -229,7 +229,7 @@ void AreaTable_Init_LostWoods() {
                   Entrance(RR_SACRED_FOREST_MEADOW, {[]{return true;}}),
   });
 
-  areaTable[RR_SFM_WOLFOS_GROTTO] = Area("SFM Wolfos Grotto", "SFM Wolfos Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SFM_WOLFOS_GROTTO] = Region("SFM Wolfos Grotto", "SFM Wolfos Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SFM_WOLFOS_GROTTO_CHEST, logic->IsAdult || logic->Slingshot || logic->CanUse(RG_STICKS) || logic->KokiriSword || logic->CanUse(RG_DINS_FIRE) || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)), //RANDOTODO is this meant to auto-pass as adult?
                 }, {
@@ -237,7 +237,7 @@ void AreaTable_Init_LostWoods() {
                   Entrance(RR_SFM_ENTRYWAY, {[]{return true;}}),
   });
 
-  areaTable[RR_SFM_STORMS_GROTTO] = Area("SFM Storms Grotto", "SFM Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SFM_STORMS_GROTTO] = Region("SFM Storms Grotto", "SFM Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SFM_DEKU_SCRUB_GROTTO_REAR,  logic->CanStunDeku),
                   LOCATION(RC_SFM_DEKU_SCRUB_GROTTO_FRONT, logic->CanStunDeku),
@@ -247,7 +247,7 @@ void AreaTable_Init_LostWoods() {
                   Entrance(RR_SACRED_FOREST_MEADOW, {[]{return true;}}),
   });
 
-  areaTable[RR_LW_BRIDGE_FROM_FOREST] = Area("LW Bridge From Forest", "Lost Woods", RA_THE_LOST_WOODS, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_LW_BRIDGE_FROM_FOREST] = Region("LW Bridge From Forest", "Lost Woods", RA_THE_LOST_WOODS, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_LW_GIFT_FROM_SARIA, true),
                 }, {
@@ -255,7 +255,7 @@ void AreaTable_Init_LostWoods() {
                   Entrance(RR_LW_BRIDGE, {[]{return true;}}),
   });
 
-  areaTable[RR_LW_BRIDGE] = Area("LW Bridge", "Lost Woods", RA_THE_LOST_WOODS, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_LW_BRIDGE] = Region("LW Bridge", "Lost Woods", RA_THE_LOST_WOODS, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_KOKIRI_FOREST,  {[]{return true;}}),
                   Entrance(RR_HYRULE_FIELD,   {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp
index fb9265060..82c5e1e4b 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp
@@ -4,11 +4,11 @@
 
 using namespace Rando;
 
-void AreaTable_Init_ShadowTemple() {
+void RegionTable_Init_ShadowTemple() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[RR_SHADOW_TEMPLE_ENTRYWAY] = Area("Shadow Temple Entryway", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_SHADOW_TEMPLE_ENTRYWAY] = Region("Shadow Temple Entryway", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_SHADOW_TEMPLE_BEGINNING,    {[]{return randoCtx->GetDungeon(SHADOW_TEMPLE)->IsVanilla() && (randoCtx->GetTrickOption(RT_LENS_SHADOW) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT));}}),
                   Entrance(RR_SHADOW_TEMPLE_MQ_BEGINNING, {[]{return randoCtx->GetDungeon(SHADOW_TEMPLE)->IsMQ()    && (randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT));}}),
@@ -19,7 +19,7 @@ void AreaTable_Init_ShadowTemple() {
   |     VANILLA DUNGEON      |
   ---------------------------*/
   if (randoCtx->GetDungeon(SHADOW_TEMPLE)->IsVanilla()) {
-  areaTable[RR_SHADOW_TEMPLE_BEGINNING] = Area("Shadow Temple Beginning", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_SHADOW_TEMPLE_BEGINNING] = Region("Shadow Temple Beginning", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->NutPot, {[]{return true;}}),
                 }, {
@@ -32,7 +32,7 @@ void AreaTable_Init_ShadowTemple() {
                   Entrance(RR_SHADOW_TEMPLE_FIRST_BEAMOS, {[]{return logic->CanUse(RG_HOVER_BOOTS);}}),
   });
 
-  areaTable[RR_SHADOW_TEMPLE_FIRST_BEAMOS] = Area("Shadow Temple First Beamos", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_SHADOW_TEMPLE_FIRST_BEAMOS] = Region("Shadow Temple First Beamos", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FairyPot, {[]{return true;}}), //This fairy pot is only on 3DS
                 }, {
@@ -46,7 +46,7 @@ void AreaTable_Init_ShadowTemple() {
                   Entrance(RR_SHADOW_TEMPLE_BEYOND_BOAT, {[]{return false;}}),
   });
 
-  areaTable[RR_SHADOW_TEMPLE_HUGE_PIT] = Area("Shadow Temple Huge Pit", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SHADOW_TEMPLE_HUGE_PIT] = Region("Shadow Temple Huge Pit", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST,   logic->CanJumpslash),
                   LOCATION(RC_SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST, logic->CanJumpslash),
@@ -63,7 +63,7 @@ void AreaTable_Init_ShadowTemple() {
                   Entrance(RR_SHADOW_TEMPLE_WIND_TUNNEL, {[]{return ((randoCtx->GetTrickOption(RT_LENS_SHADOW_PLATFORM) && randoCtx->GetTrickOption(RT_LENS_SHADOW)) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->Hookshot && logic->SmallKeys(RR_SHADOW_TEMPLE, 3, 4);}}),
   });
 
-  areaTable[RR_SHADOW_TEMPLE_WIND_TUNNEL] = Area("Shadow Temple Wind Tunnel", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SHADOW_TEMPLE_WIND_TUNNEL] = Region("Shadow Temple Wind Tunnel", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SHADOW_TEMPLE_WIND_HINT_CHEST,         true),
                   LOCATION(RC_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST,  logic->CanJumpslash),
@@ -74,7 +74,7 @@ void AreaTable_Init_ShadowTemple() {
                   Entrance(RR_SHADOW_TEMPLE_BEYOND_BOAT, {[]{return logic->CanJumpslash && logic->CanUse(RG_ZELDAS_LULLABY) && logic->SmallKeys(RR_SHADOW_TEMPLE, 4, 5);}}),
   });
 
-  areaTable[RR_SHADOW_TEMPLE_BEYOND_BOAT] = Area("Shadow Temple Beyond Boat", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SHADOW_TEMPLE_BEYOND_BOAT] = Region("Shadow Temple Beyond Boat", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST,      logic->CanUse(RG_DINS_FIRE)),
                   LOCATION(RC_SHADOW_TEMPLE_BOSS_KEY_CHEST,              logic->CanUse(RG_DINS_FIRE)),
@@ -90,7 +90,7 @@ void AreaTable_Init_ShadowTemple() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (randoCtx->GetDungeon(SHADOW_TEMPLE)->IsMQ()) {
-  areaTable[RR_SHADOW_TEMPLE_MQ_BEGINNING] = Area("Shadow Temple MQ Beginning", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_SHADOW_TEMPLE_MQ_BEGINNING] = Region("Shadow Temple MQ Beginning", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_SHADOW_TEMPLE_ENTRYWAY,          {[]{return true;}}),
                   Entrance(RR_SHADOW_TEMPLE_MQ_FIRST_BEAMOS,   {[]{return logic->IsAdult && (logic->CanUse(RG_FIRE_ARROWS) || logic->HoverBoots || (randoCtx->GetTrickOption(RT_SHADOW_MQ_GAP) && logic->CanUse(RG_LONGSHOT)));}}),
@@ -98,13 +98,13 @@ void AreaTable_Init_ShadowTemple() {
                   Entrance(RR_SHADOW_TEMPLE_MQ_DEAD_HAND_AREA, {[]{return logic->HasExplosives && logic->SmallKeys(RR_SHADOW_TEMPLE, 6);}}),
   });
 
-  areaTable[RR_SHADOW_TEMPLE_MQ_DEAD_HAND_AREA] = Area("Shadow Temple MQ Dead Hand Area", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SHADOW_TEMPLE_MQ_DEAD_HAND_AREA] = Region("Shadow Temple MQ Dead Hand Region", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SHADOW_TEMPLE_MQ_COMPASS_CHEST,     logic->CanJumpslash),
                   LOCATION(RC_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST, logic->CanJumpslash && logic->CanUse(RG_SONG_OF_TIME) && logic->IsAdult && logic->CanUse(RG_FAIRY_BOW)),
   }, {});
 
-  areaTable[RR_SHADOW_TEMPLE_MQ_FIRST_BEAMOS] = Area("Shadow Temple MQ First Beamos", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SHADOW_TEMPLE_MQ_FIRST_BEAMOS] = Region("Shadow Temple MQ First Beamos", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SHADOW_TEMPLE_MQ_MAP_CHEST,                 logic->CanAdultAttack || logic->CanUse(RG_NUTS)),
                   LOCATION(RC_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST,        logic->CanJumpslash),
@@ -114,7 +114,7 @@ void AreaTable_Init_ShadowTemple() {
                   Entrance(RR_SHADOW_TEMPLE_MQ_UPPER_HUGE_PIT, {[]{return logic->HasExplosives && logic->SmallKeys(RR_SHADOW_TEMPLE, 2);}}),
   });
 
-  areaTable[RR_SHADOW_TEMPLE_MQ_UPPER_HUGE_PIT] = Area("Shadow Temple MQ Upper Huge Pit", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SHADOW_TEMPLE_MQ_UPPER_HUGE_PIT] = Region("Shadow Temple MQ Upper Huge Pit", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST,   logic->CanUse(RG_SONG_OF_TIME) || (randoCtx->GetTrickOption(RT_SHADOW_MQ_INVISIBLE_BLADES) && randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_OHKO))),
                     //Trick: logic->CanUse(RG_SONG_OF_TIME) || (LogicShadowMQInvisibleBlades && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO))
@@ -126,7 +126,7 @@ void AreaTable_Init_ShadowTemple() {
                     //Trick: logic->HasFireSource || LogicShadowMQHugePit
   });
 
-  areaTable[RR_SHADOW_TEMPLE_MQ_LOWER_HUGE_PIT] = Area("Shadow Temple MQ Lower Huge Pit", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SHADOW_TEMPLE_MQ_LOWER_HUGE_PIT] = Region("Shadow Temple MQ Lower Huge Pit", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST,  logic->IsAdult && logic->CanUse(RG_LONGSHOT)),
                   LOCATION(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST,  true),
@@ -141,7 +141,7 @@ void AreaTable_Init_ShadowTemple() {
                   Entrance(RR_SHADOW_TEMPLE_MQ_WIND_TUNNEL, {[]{return logic->HoverBoots && ((randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ) && randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ_PLATFORM)) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->Hookshot && logic->SmallKeys(RR_SHADOW_TEMPLE, 4);}}),
   });
 
-  areaTable[RR_SHADOW_TEMPLE_MQ_WIND_TUNNEL] = Area("Shadow Temple MQ Wind Tunnel", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_SHADOW_TEMPLE_MQ_WIND_TUNNEL] = Region("Shadow Temple MQ Wind Tunnel", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->NutPot, {[]{return true;}}),
   }, {
@@ -156,7 +156,7 @@ void AreaTable_Init_ShadowTemple() {
                   Entrance(RR_SHADOW_TEMPLE_MQ_BEYOND_BOAT, {[]{return logic->CanUse(RG_ZELDAS_LULLABY) && logic->SmallKeys(RR_SHADOW_TEMPLE, 5);}}),
   });
 
-  areaTable[RR_SHADOW_TEMPLE_MQ_BEYOND_BOAT] = Area("Shadow Temple MQ Beyond Boat", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SHADOW_TEMPLE_MQ_BEYOND_BOAT] = Region("Shadow Temple MQ Beyond Boat", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SHADOW_TEMPLE_MQ_GS_AFTER_SHIP,  true),
                   LOCATION(RC_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS,   logic->Bow || (randoCtx->GetTrickOption(RT_SHADOW_STATUE) && logic->CanUse(RG_BOMBCHU_5))),
@@ -166,7 +166,7 @@ void AreaTable_Init_ShadowTemple() {
                   Entrance(RR_SHADOW_TEMPLE_BOSS_ENTRYWAY,     {[]{return (logic->CanUse(RG_FAIRY_BOW) || (randoCtx->GetTrickOption(RT_SHADOW_STATUE) && logic->CanUse(RG_BOMBCHU_5))) && logic->CanUse(RG_HOVER_BOOTS) && logic->BossKeyShadowTemple;}}),
   });
 
-  areaTable[RR_SHADOW_TEMPLE_MQ_INVISIBLE_MAZE] = Area("Shadow Temple MQ Invisible Maze", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SHADOW_TEMPLE_MQ_INVISIBLE_MAZE] = Region("Shadow Temple MQ Invisible Maze", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST, logic->CanUse(RG_DINS_FIRE) && logic->SmallKeys(RR_SHADOW_TEMPLE, 6)),
                   LOCATION(RC_SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST,         logic->CanUse(RG_DINS_FIRE) && logic->SmallKeys(RR_SHADOW_TEMPLE, 6)),
@@ -180,7 +180,7 @@ void AreaTable_Init_ShadowTemple() {
     |         BOSS ROOM         |
     ---------------------------*/
     areaTable[RR_SHADOW_TEMPLE_BOSS_ENTRYWAY] =
-        Area("Shadow Temple Boss Entryway", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
+        Region("Shadow Temple Boss Entryway", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
              {
                  // Exits
                  Entrance(RR_SHADOW_TEMPLE_BEYOND_BOAT, { [] { return randoCtx->GetDungeon(SHADOW_TEMPLE)->IsVanilla() && false; } }),
@@ -189,7 +189,7 @@ void AreaTable_Init_ShadowTemple() {
              });
 
     areaTable[RR_SHADOW_TEMPLE_BOSS_ROOM] =
-        Area("Shadow Temple Boss Room", "Shadow Temple", RA_NONE, NO_DAY_NIGHT_CYCLE,
+        Region("Shadow Temple Boss Room", "Shadow Temple", RA_NONE, NO_DAY_NIGHT_CYCLE,
              {
                  // Events
                  EventAccess(&logic->ShadowTempleClear, { [] {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp
index 747b5ec2f..e65644747 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp
@@ -4,11 +4,11 @@
 
 using namespace Rando;
 
-void AreaTable_Init_SpiritTemple() {
+void RegionTable_Init_SpiritTemple() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[RR_SPIRIT_TEMPLE_ENTRYWAY] = Area("Spirit Temple Entryway", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_ENTRYWAY] = Region("Spirit Temple Entryway", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_SPIRIT_TEMPLE_LOBBY,                  {[]{return randoCtx->GetDungeon(SPIRIT_TEMPLE)->IsVanilla();}}),
                   Entrance(RR_SPIRIT_TEMPLE_MQ_LOBBY,               {[]{return randoCtx->GetDungeon(SPIRIT_TEMPLE)->IsMQ();}}),
@@ -19,14 +19,14 @@ void AreaTable_Init_SpiritTemple() {
   |     VANILLA DUNGEON      |
   ---------------------------*/
   if (randoCtx->GetDungeon(SPIRIT_TEMPLE)->IsVanilla()) {
-  areaTable[RR_SPIRIT_TEMPLE_LOBBY] = Area("Spirit Temple Lobby", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_LOBBY] = Region("Spirit Temple Lobby", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_SPIRIT_TEMPLE_ENTRYWAY,    {[]{return true;}}),
                   Entrance(RR_SPIRIT_TEMPLE_CHILD,       {[]{return logic->IsChild;}}),
                   Entrance(RR_SPIRIT_TEMPLE_EARLY_ADULT, {[]{return logic->CanUse(RG_SILVER_GAUNTLETS);}}),
   });
 
-  areaTable[RR_SPIRIT_TEMPLE_CHILD] = Area("Child Spirit Temple", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_SPIRIT_TEMPLE_CHILD] = Region("Child Spirit Temple", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->NutCrate, {[]{return true;}}),
                 }, {
@@ -39,7 +39,7 @@ void AreaTable_Init_SpiritTemple() {
                   Entrance(RR_SPIRIT_TEMPLE_CHILD_CLIMB, {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 1);}}),
   });
 
-  areaTable[RR_SPIRIT_TEMPLE_CHILD_CLIMB] = Area("Child Spirit Temple Climb", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_CHILD_CLIMB] = Region("Child Spirit Temple Climb", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST, logic->HasProjectile(HasProjectileAge::Both) || ((logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->BombchuRefill && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && logic->CanUse(RG_SILVER_GAUNTLETS) && logic->HasProjectile(HasProjectileAge::Adult)) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->IsChild && logic->HasProjectile(HasProjectileAge::Child))),
                   LOCATION(RC_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST,  logic->HasProjectile(HasProjectileAge::Both) || ((logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->BombchuRefill && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && logic->CanUse(RG_SILVER_GAUNTLETS) && logic->HasProjectile(HasProjectileAge::Adult)) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->IsChild && logic->HasProjectile(HasProjectileAge::Child))),
@@ -52,7 +52,7 @@ void AreaTable_Init_SpiritTemple() {
                   Entrance(RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER, {[]{return logic->HasExplosives || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS));}}),
   });
 
-  areaTable[RR_SPIRIT_TEMPLE_EARLY_ADULT] = Area("Early Adult Spirit Temple", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_EARLY_ADULT] = Region("Early Adult Spirit Temple", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SPIRIT_TEMPLE_COMPASS_CHEST,            logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_ZELDAS_LULLABY)),
                   LOCATION(RC_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST,  (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG) || logic->CanUse(RG_BOMBCHU_5) || (logic->Bombs && logic->IsAdult && randoCtx->GetTrickOption(RT_SPIRIT_LOWER_ADULT_SWITCH))) && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanJumpslash)),
@@ -64,7 +64,7 @@ void AreaTable_Init_SpiritTemple() {
                   Entrance(RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER, {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 1);}}),
   });
 
-  areaTable[RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER] = Area("Spirit Temple Central Chamber", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER] = Region("Spirit Temple Central Chamber", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SPIRIT_TEMPLE_MAP_CHEST,                    ((logic->HasExplosives || logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->BombchuRefill && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) &&
                                                                             (logic->CanUse(RG_DINS_FIRE) || ((logic->CanUse(RG_FIRE_ARROWS) || randoCtx->GetTrickOption(RT_SPIRIT_MAP_CHEST)) && logic->Bow && logic->CanUse(RG_STICKS) ))) ||
@@ -94,7 +94,7 @@ void AreaTable_Init_SpiritTemple() {
                   Entrance(RR_SPIRIT_TEMPLE_CHILD_CLIMB,                {[]{return true;}}),
   });
 
-  areaTable[RR_SPIRIT_TEMPLE_OUTDOOR_HANDS] = Area("Spirit Temple Outdoor Hands", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_OUTDOOR_HANDS] = Region("Spirit Temple Outdoor Hands", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST, (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) && logic->Longshot && logic->HasExplosives) || logic->SmallKeys(RR_SPIRIT_TEMPLE, 5)),
                   LOCATION(RC_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST,    logic->SmallKeys(RR_SPIRIT_TEMPLE, 4) && logic->CanUse(RG_SILVER_GAUNTLETS) && logic->HasExplosives),
@@ -103,7 +103,7 @@ void AreaTable_Init_SpiritTemple() {
                   Entrance(RR_DESERT_COLOSSUS, {[]{return (logic->IsChild && logic->SmallKeys(RR_SPIRIT_TEMPLE, 5)) || (logic->CanUse(RG_SILVER_GAUNTLETS) && ((logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) && logic->HasExplosives) || logic->SmallKeys(RR_SPIRIT_TEMPLE, 5)));}}),
   });
 
-  areaTable[RR_SPIRIT_TEMPLE_BEYOND_CENTRAL_LOCKED_DOOR] = Area("Spirit Temple Beyond Central Locked Door", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_BEYOND_CENTRAL_LOCKED_DOOR] = Region("Spirit Temple Beyond Central Locked Door", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST,         (logic->MirrorShield || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS))) && logic->HasExplosives),
                   LOCATION(RC_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST,  (randoCtx->GetTrickOption(RT_LENS_SPIRIT) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->HasExplosives),
@@ -113,7 +113,7 @@ void AreaTable_Init_SpiritTemple() {
                   Entrance(RR_SPIRIT_TEMPLE_BEYOND_FINAL_LOCKED_DOOR, {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && (randoCtx->GetTrickOption(RT_SPIRIT_WALL) || logic->CanUse(RG_LONGSHOT) || logic->CanUse(RG_BOMBCHU_5) || ((logic->Bombs || logic->CanUse(RG_NUTS) || logic->CanUse(RG_DINS_FIRE)) && (logic->Bow || logic->CanUse(RG_HOOKSHOT) || logic->Hammer)));}}),
   });
 
-  areaTable[RR_SPIRIT_TEMPLE_BEYOND_FINAL_LOCKED_DOOR] = Area("Spirit Temple Beyond Final Locked Door", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_BEYOND_FINAL_LOCKED_DOOR] = Region("Spirit Temple Beyond Final Locked Door", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SPIRIT_TEMPLE_BOSS_KEY_CHEST, logic->CanUse(RG_ZELDAS_LULLABY) && ((logic->CanTakeDamage && randoCtx->GetTrickOption(RT_FLAMING_CHESTS)) || (logic->Bow && logic->Hookshot))),
                   LOCATION(RC_SPIRIT_TEMPLE_TOPMOST_CHEST,  (logic->MirrorShield && logic->CanAdultAttack) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS))),
@@ -123,7 +123,7 @@ void AreaTable_Init_SpiritTemple() {
   });
 
   areaTable[RR_SPIRIT_TEMPLE_INSIDE_STATUE_HEAD] =
-            Area("Spirit Temple Inside Statue Head", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
+            Region("Spirit Temple Inside Statue Head", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
                  {
                      // Exits
                      Entrance(RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER, { [] { return true; } }),
@@ -135,7 +135,7 @@ void AreaTable_Init_SpiritTemple() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (randoCtx->GetDungeon(SPIRIT_TEMPLE)->IsMQ()) {
-  areaTable[RR_SPIRIT_TEMPLE_MQ_LOBBY] = Area("Spirit Temple MQ Lobby", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_MQ_LOBBY] = Region("Spirit Temple MQ Lobby", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST, true),
                   LOCATION(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST,  Here(RR_SPIRIT_TEMPLE_MQ_LOBBY, []{return logic->CanBlastOrSmash;}) && ((logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT)) || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW)))),
@@ -147,7 +147,7 @@ void AreaTable_Init_SpiritTemple() {
                   Entrance(RR_SPIRIT_TEMPLE_MQ_ADULT, {[]{return logic->CanUse(RG_BOMBCHU_5) && logic->IsAdult && logic->CanUse(RG_LONGSHOT) && logic->CanUse(RG_SILVER_GAUNTLETS);}}),
   });
 
-  areaTable[RR_SPIRIT_TEMPLE_MQ_CHILD] = Area("Spirit Temple MQ Child", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_SPIRIT_TEMPLE_MQ_CHILD] = Region("Spirit Temple MQ Child", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FairyPot, {[]{return logic->FairyPot || (logic->KokiriSword && logic->CanUse(RG_BOMBCHU_5) && logic->Slingshot);}}),
   }, {
@@ -162,7 +162,7 @@ void AreaTable_Init_SpiritTemple() {
                   Entrance(RR_SPIRIT_TEMPLE_MQ_SHARED, {[]{return logic->CanUse(RG_BOMBCHU_5) && logic->SmallKeys(RR_SPIRIT_TEMPLE, 2);}}),
   });
 
-  areaTable[RR_SPIRIT_TEMPLE_MQ_ADULT] = Area("Spirit Temple MQ Adult", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_MQ_ADULT] = Region("Spirit Temple MQ Adult", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST,     logic->SmallKeys(RR_SPIRIT_TEMPLE, 7)),
                   LOCATION(RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST,   logic->CanUse(RG_ZELDAS_LULLABY) && (logic->CanJumpslash || logic->CanUse(RG_HOVER_BOOTS))),
@@ -181,7 +181,7 @@ void AreaTable_Init_SpiritTemple() {
                   Entrance(RR_SPIRIT_TEMPLE_MQ_MIRROR_SHIELD_HAND, {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->CanUse(RG_SONG_OF_TIME) && logic->CanJumpslash && (randoCtx->GetTrickOption(RT_LENS_SPIRIT_MQ) || logic->CanUse(RG_LENS_OF_TRUTH));}}),
   });
 
-  areaTable[RR_SPIRIT_TEMPLE_MQ_SHARED] = Area("Spirit Temple MQ Shared", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_MQ_SHARED] = Region("Spirit Temple MQ Shared", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST, logic->SmallKeys(RR_SPIRIT_TEMPLE, 6)),
                   LOCATION(RC_SPIRIT_TEMPLE_MQ_COMPASS_CHEST,           (logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT) && logic->SmallKeys(RR_SPIRIT_TEMPLE, 7)) || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW)) || (logic->Bow && logic->Slingshot)),
@@ -197,7 +197,7 @@ void AreaTable_Init_SpiritTemple() {
                     //Trick: (logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && (logic->CanUse(RG_SONG_OF_TIME) || LogicSpiritMQSunBlockSoT || logic->IsAdult)) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 4) && logic->CanUse(RG_SONG_OF_TIME) && (LogicLensSpiritMQ || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->IsAdult)
   });
 
-  areaTable[RR_SPIRIT_TEMPLE_MQ_LOWER_ADULT] = Area("Spirit Temple MQ Lower Adult", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_MQ_LOWER_ADULT] = Region("Spirit Temple MQ Lower Adult", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST,          true),
                   LOCATION(RC_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST,        logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && logic->Hammer && logic->CanUse(RG_SONG_OF_TIME) && logic->CanUse(RG_EPONAS_SONG) && logic->CanUse(RG_SUNS_SONG)
@@ -208,7 +208,7 @@ void AreaTable_Init_SpiritTemple() {
                                                                            && logic->CanUse(RG_SONG_OF_STORMS) && logic->CanUse(RG_ZELDAS_LULLABY)),
   }, {});
 
-  areaTable[RR_SPIRIT_TEMPLE_MQ_BOSS_AREA] = Area("Spirit Temple MQ Boss Area", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_MQ_BOSS_AREA] = Region("Spirit Temple MQ Boss Region", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST, randoCtx->GetTrickOption(RT_LENS_SPIRIT_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)),
   }, {
@@ -217,19 +217,19 @@ void AreaTable_Init_SpiritTemple() {
   });
 
   areaTable[RR_SPIRIT_TEMPLE_MQ_INSIDE_STATUE_HEAD] =
-            Area("Spirit Temple MQ Inside Statue Head", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
+            Region("Spirit Temple MQ Inside Statue Head", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
                  {
                      // Exits
                      Entrance(RR_SPIRIT_TEMPLE_MQ_SHARED, { [] { return true; } }),
                      Entrance(RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY, { [] { return logic->BossKeySpiritTemple; } }),
                  });
 
-  areaTable[RR_SPIRIT_TEMPLE_MQ_MIRROR_SHIELD_HAND] = Area("Spirit Temple MQ Mirror Shield Hand", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_MQ_MIRROR_SHIELD_HAND] = Region("Spirit Temple MQ Mirror Shield Hand", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST, true),
   }, {});
 
-  areaTable[RR_SPIRIT_TEMPLE_MQ_SILVER_GAUNTLETS_HAND] = Area("Spirit Temple MQ Silver Gauntlets Hand", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_MQ_SILVER_GAUNTLETS_HAND] = Region("Spirit Temple MQ Silver Gauntlets Hand", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST, true),
   }, {});
@@ -238,7 +238,7 @@ void AreaTable_Init_SpiritTemple() {
     /*---------------------------
     |         BOSS ROOM         |
     ---------------------------*/
-    areaTable[RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY] = Area(
+    areaTable[RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY] = Region(
         "Spirit Temple Boss Entryway", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
         {
             // Exits
@@ -247,7 +247,7 @@ void AreaTable_Init_SpiritTemple() {
             Entrance(RR_SPIRIT_TEMPLE_BOSS_ROOM, { [] { return true; } }),
         });
 
-    areaTable[RR_SPIRIT_TEMPLE_BOSS_ROOM] = Area(
+    areaTable[RR_SPIRIT_TEMPLE_BOSS_ROOM] = Region(
         "Spirit Temple Boss Room", "Spirit Temple", RA_NONE, NO_DAY_NIGHT_CYCLE,
         {
             // Events
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp
index ef9c5ecd9..67c06b2dc 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp
@@ -4,11 +4,11 @@
 
 using namespace Rando;
 
-void AreaTable_Init_WaterTemple() {
+void RegionTable_Init_WaterTemple() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[RR_WATER_TEMPLE_ENTRYWAY] = Area("Water Temple Entryway", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_ENTRYWAY] = Region("Water Temple Entryway", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_LOBBY,    {[]{return logic->Swim && randoCtx->GetDungeon(WATER_TEMPLE)->IsVanilla();}}),
                   Entrance(RR_WATER_TEMPLE_MQ_LOBBY, {[]{return logic->Swim && randoCtx->GetDungeon(WATER_TEMPLE)->IsMQ();}}),
@@ -20,7 +20,7 @@ void AreaTable_Init_WaterTemple() {
   ---------------------------*/
   if (randoCtx->GetDungeon(WATER_TEMPLE)->IsVanilla()) {
   //Water Temple logic currently assumes that the locked door leading to the upper water raising location is unlocked from the start
-  areaTable[RR_WATER_TEMPLE_LOBBY] = Area("Water Temple Lobby", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_LOBBY] = Region("Water Temple Lobby", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_ENTRYWAY,              {[]{return true;}}),
                   Entrance(RR_WATER_TEMPLE_EAST_LOWER,            {[]{return logic->WaterTempleLow || ((randoCtx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS) || logic->CanUse(RG_ZORA_TUNIC)) && (logic->CanUse(RG_IRON_BOOTS) || (logic->CanUse(RG_LONGSHOT) && randoCtx->GetTrickOption(RT_WATER_LONGSHOT_TORCH))));}}),
@@ -37,7 +37,7 @@ void AreaTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_PRE_BOSS_ROOM,         {[]{return logic->WaterTempleHigh && logic->CanUse(RG_LONGSHOT);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_EAST_LOWER] = Area("Water Temple East Lower", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_WATER_TEMPLE_EAST_LOWER] = Region("Water Temple East Lower", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->WaterTempleLow, {[]{return logic->WaterTempleLow || logic->CanUse(RG_ZELDAS_LULLABY);}}),
                 }, {}, {
@@ -48,7 +48,7 @@ void AreaTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_TORCH_ROOM,   {[]{return logic->WaterTempleLow && (logic->HasFireSourceWithTorch || logic->CanUse(RG_FAIRY_BOW));}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_MAP_ROOM] = Area("Water Temple Map Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_MAP_ROOM] = Region("Water Temple Map Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_WATER_TEMPLE_MAP_CHEST, (logic->MagicMeter && logic->CanUse(RG_KOKIRI_SWORD)) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_HOOKSHOT)),
                 }, {
@@ -56,7 +56,7 @@ void AreaTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_EAST_LOWER, {[]{return (logic->MagicMeter && logic->CanUse(RG_KOKIRI_SWORD)) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_HOOKSHOT);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_CRACKED_WALL] = Area("Water Temple Cracked Wall", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_CRACKED_WALL] = Region("Water Temple Cracked Wall", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_WATER_TEMPLE_CRACKED_WALL_CHEST, logic->HasExplosives),
                 }, {
@@ -64,7 +64,7 @@ void AreaTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_EAST_LOWER, {[]{return true;}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_TORCH_ROOM] = Area("Water Temple Torch Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_TORCH_ROOM] = Region("Water Temple Torch Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_WATER_TEMPLE_TORCHES_CHEST, (logic->MagicMeter && logic->CanUse(RG_KOKIRI_SWORD)) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_HOOKSHOT)),
                 }, {
@@ -72,13 +72,13 @@ void AreaTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_EAST_LOWER, {[]{return (logic->MagicMeter && logic->CanUse(RG_KOKIRI_SWORD)) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_HOOKSHOT);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_NORTH_LOWER] = Area("Water Temple North Lower", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_NORTH_LOWER] = Region("Water Temple North Lower", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_LOBBY,          {[]{return true;}}),
                   Entrance(RR_WATER_TEMPLE_BOULDERS_LOWER, {[]{return (logic->CanUse(RG_LONGSHOT) || (randoCtx->GetTrickOption(RT_WATER_BK_REGION) && logic->CanUse(RG_HOVER_BOOTS))) && logic->SmallKeys(RR_WATER_TEMPLE, 4);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_BOULDERS_LOWER] = Area("Water Temple Boulders Lower", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_BOULDERS_LOWER] = Region("Water Temple Boulders Lower", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST, logic->CanUse(RG_LONGSHOT) || Here(RR_WATER_TEMPLE_BOULDERS_UPPER, []{return (logic->IsAdult && logic->HookshotOrBoomerang) || (logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_HOOKSHOT));})),
                 }, {
@@ -88,26 +88,26 @@ void AreaTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_BOULDERS_UPPER, {[]{return (logic->IsAdult && (logic->CanUse(RG_HOVER_BOOTS) || randoCtx->GetTrickOption(RT_WATER_NORTH_BASEMENT_LEDGE_JUMP))) || (logic->CanUse(RG_HOVER_BOOTS) && logic->CanUse(RG_IRON_BOOTS));}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_BLOCK_ROOM] = Area("Water Temple Block Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_BLOCK_ROOM] = Region("Water Temple Block Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_BOULDERS_LOWER, {[]{return (logic->GoronBracelet && logic->HasExplosives) || logic->CanUse(RG_HOOKSHOT);}}),
                   Entrance(RR_WATER_TEMPLE_JETS_ROOM,      {[]{return (logic->GoronBracelet && logic->HasExplosives) || (logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_HOVER_BOOTS));}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_JETS_ROOM] = Area("Water Temple Jets Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_JETS_ROOM] = Region("Water Temple Jets Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_BLOCK_ROOM,     {[]{return logic->CanUse(RG_HOOKSHOT);}}),
                   Entrance(RR_WATER_TEMPLE_BOULDERS_UPPER, {[]{return true;}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_BOULDERS_UPPER] = Area("Water Temple Boulders Upper", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_BOULDERS_UPPER] = Region("Water Temple Boulders Upper", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_BOULDERS_LOWER, {[]{return true;}}),
                   Entrance(RR_WATER_TEMPLE_JETS_ROOM,      {[]{return logic->IsAdult;}}),
                   Entrance(RR_WATER_TEMPLE_BOSS_KEY_ROOM,  {[]{return (logic->CanUse(RG_IRON_BOOTS) || (logic->IsAdult && randoCtx->GetTrickOption(RT_WATER_BK_JUMP_DIVE))) && logic->SmallKeys(RR_WATER_TEMPLE, 5);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_BOSS_KEY_ROOM] = Area("Water Temple Boss Key Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_WATER_TEMPLE_BOSS_KEY_ROOM] = Region("Water Temple Boss Key Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FairyPot, {[]{return true;}}),
                 }, {
@@ -118,7 +118,7 @@ void AreaTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_BOULDERS_UPPER, {[]{return (logic->CanUse(RG_IRON_BOOTS) || (logic->IsAdult && randoCtx->GetTrickOption(RT_WATER_BK_JUMP_DIVE)) || logic->IsChild || logic->CanDive) && logic->SmallKeys(RR_WATER_TEMPLE, 5);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_SOUTH_LOWER] = Area("Water Temple South Lower", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_SOUTH_LOWER] = Region("Water Temple South Lower", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_WATER_TEMPLE_GS_BEHIND_GATE, (logic->CanJumpslash || logic->CanUse(RG_MEGATON_HAMMER)) && (logic->CanUse(RG_HOOKSHOT) || (logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS)))),
                 }, {
@@ -126,13 +126,13 @@ void AreaTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_LOBBY, {[]{return logic->CanUse(RG_IRON_BOOTS);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_WEST_LOWER] = Area("Water Temple West Lower", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_WEST_LOWER] = Region("Water Temple West Lower", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_LOBBY,       {[]{return logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_IRON_BOOTS) && logic->GoronBracelet;}}),
                   Entrance(RR_WATER_TEMPLE_DRAGON_ROOM, {[]{return logic->CanJumpslash || logic->CanUseProjectile;}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_DRAGON_ROOM] = Area("Water Temple Dragon Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_DRAGON_ROOM] = Region("Water Temple Dragon Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_WATER_TEMPLE_DRAGON_CHEST, (logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_IRON_BOOTS)) || (((logic->IsAdult && randoCtx->GetTrickOption(RT_WATER_ADULT_DRAGON) && (logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_BOMBCHU_5))) || (logic->IsChild && randoCtx->GetTrickOption(RT_WATER_CHILD_DRAGON) && (logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG) || logic->CanUse(RG_BOMBCHU_5)))) && (logic->CanDive || logic->CanUse(RG_IRON_BOOTS))) ||
                                                                        Here(RR_WATER_TEMPLE_RIVER, []{return logic->IsAdult && logic->CanUse(RG_FAIRY_BOW) && ((randoCtx->GetTrickOption(RT_WATER_ADULT_DRAGON) && (logic->CanDive || logic->CanUse(RG_IRON_BOOTS))) || randoCtx->GetTrickOption(RT_WATER_DRAGON_JUMP_DIVE));})),
@@ -141,14 +141,14 @@ void AreaTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_WEST_LOWER, {[]{return true;}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_CENTRAL_PILLAR_LOWER] = Area("Water Temple Central Pillar Lower", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_CENTRAL_PILLAR_LOWER] = Region("Water Temple Central Pillar Lower", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_LOBBY,                   {[]{return logic->SmallKeys(RR_WATER_TEMPLE, 5);}}),
                   Entrance(RR_WATER_TEMPLE_CENTRAL_PILLAR_UPPER,    {[]{return logic->CanUse(RG_HOOKSHOT);}}),
                   Entrance(RR_WATER_TEMPLE_CENTRAL_PILLAR_BASEMENT, {[]{return logic->WaterTempleMiddle && logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer >= 40;}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_CENTRAL_PILLAR_UPPER] = Area("Water Temple Central Pillar Upper", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_WATER_TEMPLE_CENTRAL_PILLAR_UPPER] = Region("Water Temple Central Pillar Upper", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->WaterTempleMiddle, {[]{return logic->WaterTempleMiddle || logic->CanUse(RG_ZELDAS_LULLABY);}}),
                 }, {
@@ -160,7 +160,7 @@ void AreaTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_CENTRAL_PILLAR_LOWER, {[]{return true;}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_CENTRAL_PILLAR_BASEMENT] = Area("Water Temple Central Pillar Basement", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_CENTRAL_PILLAR_BASEMENT] = Region("Water Temple Central Pillar Basement", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_WATER_TEMPLE_CENTRAL_PILLAR_CHEST, logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer >= 40),
                 }, {
@@ -168,7 +168,7 @@ void AreaTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_CENTRAL_PILLAR_LOWER, {[]{return logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer >= 16;}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_EAST_MIDDLE] = Area("Water Temple East Middle", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_EAST_MIDDLE] = Region("Water Temple East Middle", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_WATER_TEMPLE_COMPASS_CHEST, logic->CanUseProjectile),
                 }, {
@@ -176,13 +176,13 @@ void AreaTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_LOBBY, {[]{return logic->CanUse(RG_IRON_BOOTS);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_WEST_MIDDLE] = Area("Water Temple West Middle", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_WEST_MIDDLE] = Region("Water Temple West Middle", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_LOBBY,      {[]{return true;}}),
                   Entrance(RR_WATER_TEMPLE_HIGH_WATER, {[]{return logic->CanUseProjectile;}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_HIGH_WATER] = Area("Water Temple High Water", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_WATER_TEMPLE_HIGH_WATER] = Region("Water Temple High Water", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->WaterTempleHigh, {[]{return logic->WaterTempleHigh || logic->CanUse(RG_ZELDAS_LULLABY);}}),
                 }, {}, {
@@ -190,7 +190,7 @@ void AreaTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_LOBBY, {[]{return true;}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_BLOCK_CORRIDOR] = Area("Water Temple Block Corridor", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_BLOCK_CORRIDOR] = Region("Water Temple Block Corridor", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST, logic->GoronBracelet && (logic->WaterTempleLow || logic->WaterTempleMiddle)),
                 }, {
@@ -198,7 +198,7 @@ void AreaTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_LOBBY, {[]{return logic->CanUse(RG_HOOKSHOT);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_FALLING_PLATFORM_ROOM] = Area("Water Temple Falling Platform Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_FALLING_PLATFORM_ROOM] = Region("Water Temple Falling Platform Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM, logic->CanUse(RG_LONGSHOT) || (randoCtx->GetTrickOption(RT_WATER_RANG_FALLING_PLATFORM_GS) && logic->IsChild && logic->CanUse(RG_BOOMERANG)) || (randoCtx->GetTrickOption(RT_WATER_HOOKSHOT_FALLING_PLATFORM_GS) && logic->IsAdult && logic->CanUse(RG_HOOKSHOT))),
                 }, {
@@ -207,19 +207,19 @@ void AreaTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_DRAGON_PILLARS_ROOM, {[]{return logic->CanUse(RG_HOOKSHOT) && logic->SmallKeys(RR_WATER_TEMPLE, 5);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_DRAGON_PILLARS_ROOM] = Area("Water Temple Dragon Pillars Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_DRAGON_PILLARS_ROOM] = Region("Water Temple Dragon Pillars Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_FALLING_PLATFORM_ROOM, {[]{return logic->CanUseProjectile;}}),
                   Entrance(RR_WATER_TEMPLE_DARK_LINK_ROOM,        {[]{return logic->CanUse(RG_HOOKSHOT);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_DARK_LINK_ROOM] = Area("Water Temple Dark Link Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_DARK_LINK_ROOM] = Region("Water Temple Dark Link Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_DRAGON_PILLARS_ROOM, {[]{return logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD);}}),
                   Entrance(RR_WATER_TEMPLE_LONGSHOT_ROOM,       {[]{return logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_LONGSHOT_ROOM] = Area("Water Temple Longshot Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_LONGSHOT_ROOM] = Region("Water Temple Longshot Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_WATER_TEMPLE_LONGSHOT_CHEST, true),
                 }, {
@@ -228,7 +228,7 @@ void AreaTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_RIVER,          {[]{return logic->IsChild || logic->CanUse(RG_SONG_OF_TIME);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_RIVER] = Area("Water Temple River", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_RIVER] = Region("Water Temple River", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_WATER_TEMPLE_RIVER_CHEST, (logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW)) && (logic->IsAdult || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT))),
                   LOCATION(RC_WATER_TEMPLE_GS_RIVER,    (logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_HOOKSHOT)) || (randoCtx->GetTrickOption(RT_WATER_RIVER_GS) && logic->CanUse(RG_LONGSHOT))),
@@ -237,7 +237,7 @@ void AreaTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_DRAGON_ROOM, {[]{return (logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW)) && (logic->IsAdult || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT));}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_PRE_BOSS_ROOM] = Area("Water Temple Pre Boss Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_WATER_TEMPLE_PRE_BOSS_ROOM] = Region("Water Temple Pre Boss Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FairyPot, {[]{return true;}}),
                 }, {}, {
@@ -251,7 +251,7 @@ void AreaTable_Init_WaterTemple() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (randoCtx->GetDungeon(WATER_TEMPLE)->IsMQ()) {
-  areaTable[RR_WATER_TEMPLE_MQ_LOBBY] = Area("Water Temple MQ Lobby", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_MQ_LOBBY] = Region("Water Temple MQ Lobby", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_ENTRYWAY,            {[]{return true;}}),
                   Entrance(RR_WATER_TEMPLE_MQ_DIVE,             {[]{return logic->IsAdult && logic->WaterTimer >= 24 && logic->CanUse(RG_IRON_BOOTS);}}),
@@ -259,7 +259,7 @@ void AreaTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_BOSS_ENTRYWAY,       {[]{return logic->BossKeyWaterTemple && logic->IsAdult && logic->CanJumpslash && logic->CanUse(RG_LONGSHOT);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_MQ_DIVE] = Area("Water Temple MQ Dive", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_MQ_DIVE] = Region("Water Temple MQ Dive", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_WATER_TEMPLE_MQ_MAP_CHEST,            logic->HasFireSource && logic->IsAdult && logic->CanUse(RG_HOOKSHOT)),
                   LOCATION(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST, logic->IsAdult && logic->CanUse(RG_ZORA_TUNIC) && logic->CanUse(RG_HOOKSHOT) && ((randoCtx->GetTrickOption(RT_WATER_MQ_CENTRAL_PILLAR) && logic->CanUse(RG_FIRE_ARROWS)) || (logic->CanUse(RG_DINS_FIRE) && logic->CanUse(RG_SONG_OF_TIME)))),
@@ -269,7 +269,7 @@ void AreaTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_MQ_LOWERED_WATER_LEVELS, {[]{return logic->CanUse(RG_ZELDAS_LULLABY);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_MQ_LOWERED_WATER_LEVELS] = Area("Water Temple MQ Lowered Water Levels", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_MQ_LOWERED_WATER_LEVELS] = Region("Water Temple MQ Lowered Water Levels", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_WATER_TEMPLE_MQ_COMPASS_CHEST,                ((logic->IsAdult && logic->CanUse(RG_FAIRY_BOW)) || logic->CanUse(RG_DINS_FIRE) || Here(RR_WATER_TEMPLE_MQ_LOBBY, []{return logic->IsChild && logic->CanUse(RG_STICKS) && logic->HasExplosives;})) &&
                     (logic->CanJumpslash || logic->CanUseProjectile)),
@@ -278,7 +278,7 @@ void AreaTable_Init_WaterTemple() {
                   LOCATION(RC_WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH, logic->IsAdult && logic->CanUse(RG_LONGSHOT)),
   }, {});
 
-  areaTable[RR_WATER_TEMPLE_MQ_DARK_LINK_REGION] = Area("Water Temple MQ Dark Link Region", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_WATER_TEMPLE_MQ_DARK_LINK_REGION] = Region("Water Temple MQ Dark Link Region", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FairyPot, {[]{return true;}}),
                   EventAccess(&logic->NutPot,   {[]{return true;}}),
@@ -291,7 +291,7 @@ void AreaTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_MQ_BASEMENT_GATED_AREAS, {[]{return logic->IsAdult && logic->WaterTimer >= 24 && logic->CanUse(RG_DINS_FIRE) && logic->CanUse(RG_IRON_BOOTS);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_MQ_BASEMENT_GATED_AREAS] = Area("Water Temple MQ Basement Gated Areas", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_MQ_BASEMENT_GATED_AREAS] = Region("Water Temple MQ Basement Gated Areas", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_WATER_TEMPLE_MQ_FREESTANDING_KEY,         logic->HoverBoots || logic->CanUse(RG_SCARECROW) || randoCtx->GetTrickOption(RT_WATER_NORTH_BASEMENT_LEDGE_JUMP)),
                   LOCATION(RC_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH,     logic->CanUse(RG_FIRE_ARROWS) && (logic->HoverBoots || logic->CanUse(RG_SCARECROW))),
@@ -304,7 +304,7 @@ void AreaTable_Init_WaterTemple() {
     |         BOSS ROOM         |
     ---------------------------*/
     areaTable[RR_WATER_TEMPLE_BOSS_ENTRYWAY] =
-        Area("Water Temple Boss Entryway", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
+        Region("Water Temple Boss Entryway", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
              {
                  // Exits
                  Entrance(RR_WATER_TEMPLE_PRE_BOSS_ROOM, { [] { return randoCtx->GetDungeon(WATER_TEMPLE)->IsVanilla() && false; } }),
@@ -312,7 +312,7 @@ void AreaTable_Init_WaterTemple() {
                  Entrance(RR_WATER_TEMPLE_BOSS_ROOM, { [] { return true; } }),
              });
 
-    areaTable[RR_WATER_TEMPLE_BOSS_ROOM] = Area(
+    areaTable[RR_WATER_TEMPLE_BOSS_ROOM] = Region(
         "Water Temple Boss Room", "Water Temple", RA_NONE, NO_DAY_NIGHT_CYCLE,
         {
             // Events
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
index 49a764147..62a66dd94 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
@@ -3,8 +3,8 @@
 
 using namespace Rando;
 
-void AreaTable_Init_ZorasDomain() {
-  areaTable[RR_ZR_FRONT] = Area("ZR Front", "Zora River", RA_ZORAS_RIVER, DAY_NIGHT_CYCLE, {}, {
+void RegionTable_Init_ZorasDomain() {
+  areaTable[RR_ZR_FRONT] = Region("ZR Front", "Zora River", RA_ZORAS_RIVER, DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_ZR_GS_TREE, logic->IsChild && logic->CanChildAttack),
                 }, {
@@ -13,7 +13,7 @@ void AreaTable_Init_ZorasDomain() {
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
   });
 
-  areaTable[RR_ZORAS_RIVER] = Area("Zora River", "Zora River", RA_ZORAS_RIVER, DAY_NIGHT_CYCLE, {
+  areaTable[RR_ZORAS_RIVER] = Region("Zora River", "Zora River", RA_ZORAS_RIVER, DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CanSummonGossipFairy;}}),
                   EventAccess(&logic->BeanPlantFairy,   {[]{return logic->BeanPlantFairy   || (CanPlantBean(RR_ZORAS_RIVER) && logic->CanUse(RG_SONG_OF_STORMS));}}),
@@ -46,13 +46,13 @@ void AreaTable_Init_ZorasDomain() {
                   Entrance(RR_ZR_BEHIND_WATERFALL, {[]{return logic->CanUse(RG_ZELDAS_LULLABY) || (logic->IsChild && randoCtx->GetTrickOption(RT_ZR_CUCCO)) || (logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS) && randoCtx->GetTrickOption(RT_ZR_HOVERS));}}),
   });
 
-  areaTable[RR_ZR_BEHIND_WATERFALL] = Area("ZR Behind Waterfall", "Zora River", RA_ZORAS_RIVER, DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_ZR_BEHIND_WATERFALL] = Region("ZR Behind Waterfall", "Zora River", RA_ZORAS_RIVER, DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_ZORAS_RIVER,  {[]{return true;}}),
                   Entrance(RR_ZORAS_DOMAIN, {[]{return true;}}),
   });
 
-  areaTable[RR_ZR_OPEN_GROTTO] = Area("ZR Open Grotto", "ZR Open Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+  areaTable[RR_ZR_OPEN_GROTTO] = Region("ZR Open Grotto", "ZR Open Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LOCATION(RC_ZR_OPEN_GROTTO_CHEST,         true),
                   LOCATION(RC_ZR_OPEN_GROTTO_FISH,          logic->HasBottle),
@@ -64,7 +64,7 @@ void AreaTable_Init_ZorasDomain() {
                   Entrance(RR_ZORAS_RIVER, {[]{return true;}}),
   });
 
-  areaTable[RR_ZR_FAIRY_GROTTO] = Area("ZR Fairy Grotto", "ZR Fairy Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_ZR_FAIRY_GROTTO] = Region("ZR Fairy Grotto", "ZR Fairy Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Event
                   EventAccess(&logic->FreeFairies, {[]{return true;}}),
                 }, {}, {
@@ -72,7 +72,7 @@ void AreaTable_Init_ZorasDomain() {
                   Entrance(RR_ZORAS_RIVER, {[]{return true;}}),
   });
 
-  areaTable[RR_ZR_STORMS_GROTTO] = Area("ZR Storms Grotto", "ZR Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_ZR_STORMS_GROTTO] = Region("ZR Storms Grotto", "ZR Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_ZR_DEKU_SCRUB_GROTTO_REAR,  logic->CanStunDeku),
                   LOCATION(RC_ZR_DEKU_SCRUB_GROTTO_FRONT, logic->CanStunDeku),
@@ -82,7 +82,7 @@ void AreaTable_Init_ZorasDomain() {
                   Entrance(RR_ZORAS_RIVER, {[]{return true;}}),
   });
 
-  areaTable[RR_ZORAS_DOMAIN] = Area("Zoras Domain", "Zoras Domain", RA_ZORAS_DOMAIN, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_ZORAS_DOMAIN] = Region("Zoras Domain", "Zoras Domain", RA_ZORAS_DOMAIN, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->EyeballFrogAccess, {[]{return logic->EyeballFrogAccess || (logic->IsAdult && logic->KingZoraThawed && (logic->Eyedrops || logic->EyeballFrog || logic->Prescription || logic->PrescriptionAccess));}}),
                   EventAccess(&logic->GossipStoneFairy,  {[]{return logic->GossipStoneFairy  || logic->CanSummonGossipFairyWithoutSuns;}}),
@@ -115,7 +115,7 @@ void AreaTable_Init_ZorasDomain() {
                   Entrance(RR_ZD_STORMS_GROTTO,    {[]{return logic->CanOpenStormGrotto;}}),
   });
 
-  areaTable[RR_ZD_BEHIND_KING_ZORA] = Area("ZD Behind King Zora", "Zoras Domain", RA_ZORAS_DOMAIN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_ZD_BEHIND_KING_ZORA] = Region("ZD Behind King Zora", "Zoras Domain", RA_ZORAS_DOMAIN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_ZD_BEHIND_KING_ZORA_BEEHIVE, logic->CanBreakUpperBeehives),
                 }, {
@@ -124,7 +124,7 @@ void AreaTable_Init_ZorasDomain() {
                   Entrance(RR_ZORAS_FOUNTAIN, {[]{return true;}}),
   });
 
-  areaTable[RR_ZD_SHOP] = Area("ZD Shop", "ZD Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_ZD_SHOP] = Region("ZD Shop", "ZD Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_ZD_SHOP_ITEM_1, true),
                   LOCATION(RC_ZD_SHOP_ITEM_2, true),
@@ -139,7 +139,7 @@ void AreaTable_Init_ZorasDomain() {
                   Entrance(RR_ZORAS_DOMAIN, {[]{return true;}}),
   });
 
-  areaTable[RR_ZD_STORMS_GROTTO] = Area("ZD Storms Grotto", "ZD Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_ZD_STORMS_GROTTO] = Region("ZD Storms Grotto", "ZD Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FreeFairies, {[]{return true;}}),
                 }, {}, {
@@ -147,7 +147,7 @@ void AreaTable_Init_ZorasDomain() {
                   Entrance(RR_ZORAS_DOMAIN, {[]{return true;}}),
   });
 
-  areaTable[RR_ZORAS_FOUNTAIN] = Area("Zoras Fountain", "Zoras Fountain", RA_ZORAS_FOUNTAIN, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_ZORAS_FOUNTAIN] = Region("Zoras Fountain", "Zoras Fountain", RA_ZORAS_FOUNTAIN, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CanSummonGossipFairyWithoutSuns;}}),
                   EventAccess(&logic->ButterflyFairy,   {[]{return logic->ButterflyFairy   || (logic->CanUse(RG_STICKS) && logic->AtDay);}}),
@@ -168,7 +168,7 @@ void AreaTable_Init_ZorasDomain() {
                   Entrance(RR_ZF_GREAT_FAIRY_FOUNTAIN,   {[]{return logic->HasExplosives;}}),
   });
 
-  areaTable[RR_ZF_GREAT_FAIRY_FOUNTAIN] = Area("ZF Great Fairy Fountain", "ZF Great Fairy Fountain", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_ZF_GREAT_FAIRY_FOUNTAIN] = Region("ZF Great Fairy Fountain", "ZF Great Fairy Fountain", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_ZF_GREAT_FAIRY_REWARD, logic->CanUse(RG_ZELDAS_LULLABY)),
                 }, {
diff --git a/soh/soh/Enhancements/randomizer/3drando/menu.cpp b/soh/soh/Enhancements/randomizer/3drando/menu.cpp
index ef878f513..ab7b951e3 100644
--- a/soh/soh/Enhancements/randomizer/3drando/menu.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/menu.cpp
@@ -10,7 +10,7 @@
 #include "randomizer.hpp"
 #include "spoiler_log.hpp"
 #include "location_access.hpp"
-#include "../../debugger/performanceTimer.h"
+#include "soh/Enhancements/debugger/performanceTimer.h"
 #include <spdlog/spdlog.h>
 #include "../../randomizer/randomizerTypes.h"
 #include <boost_custom/container_hash/hash_32.hpp>
@@ -72,7 +72,7 @@ bool GenerateRandomizer(std::set<RandomizerCheck> excludedLocations, std::set<Ra
     StopPerformanceTimer(PT_WHOLE_SEED);
     SPDLOG_DEBUG("Full Seed Genration Time: {}ms", GetPerformanceTimer(PT_WHOLE_SEED).count());
     SPDLOG_DEBUG("LogicReset time: {}ms", GetPerformanceTimer(PT_LOGIC_RESET).count());
-    SPDLOG_DEBUG("Area->Reset time: {}ms", GetPerformanceTimer(PT_AREA_RESET).count());
+    SPDLOG_DEBUG("Area->Reset time: {}ms", GetPerformanceTimer(PT_REGION_RESET).count());
     SPDLOG_DEBUG("Total Entrance Shuffle time: {}ms", GetPerformanceTimer(PT_ENTRANCE_SHUFFLE).count());
     SPDLOG_DEBUG("Total Shopsanity time: {}ms", GetPerformanceTimer(PT_SHOPSANITY).count());
     SPDLOG_DEBUG("Total Dungeon Specific Items time: {}ms", GetPerformanceTimer(PT_OWN_DUNGEON).count());
diff --git a/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp b/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
index fc7d7d2e0..c3d73028c 100644
--- a/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
@@ -11,7 +11,7 @@
 #include "variables.h"
 #include "soh/OTRGlobals.h"
 #include "../option.h"
-#include "../../debugger/performanceTimer.h"
+#include "soh/Enhancements/debugger/performanceTimer.h"
 
 namespace Playthrough {
 
@@ -26,9 +26,9 @@ int Playthrough_Init(uint32_t seed, std::set<RandomizerCheck> excludedLocations,
     ctx->ItemReset();
     ctx->HintReset();
     ctx->GetLogic()->Reset();
-    StartPerformanceTimer(PT_AREA_RESET);
-    Areas::AccessReset();
-    StopPerformanceTimer(PT_AREA_RESET);
+    StartPerformanceTimer(PT_REGION_RESET);
+    Regions::AccessReset();
+    StopPerformanceTimer(PT_REGION_RESET);
 
     ctx->GetSettings()->FinalizeSettings(excludedLocations, enabledTricks);
     // once the settings have been finalized turn them into a string for hashing
diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
index 170f93dcc..9bd24b432 100644
--- a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
@@ -40,7 +40,7 @@ json jsonData;
 std::map<RandomizerHintTextKey, Rando::ItemLocation*> hintedLocations;
 
 extern std::array<std::string, 17> hintCategoryNames;
-extern Area* GetHintRegion(uint32_t);
+extern Region* GetHintRegion(uint32_t);
 
 namespace {
 std::string placementtxt;
diff --git a/soh/soh/Enhancements/randomizer/context.cpp b/soh/soh/Enhancements/randomizer/context.cpp
index 8f1ea557f..b79bbcae1 100644
--- a/soh/soh/Enhancements/randomizer/context.cpp
+++ b/soh/soh/Enhancements/randomizer/context.cpp
@@ -395,498 +395,6 @@ void Context::ParseHintJson(nlohmann::json spoilerFileJson) {
     CreateStaticHints();
 }
 
-std::map<RandomizerGet, uint32_t> Context::RandoGetToEquipFlag = {
-    { RG_KOKIRI_SWORD,           EQUIP_FLAG_SWORD_KOKIRI },
-    { RG_MASTER_SWORD,           EQUIP_FLAG_SWORD_MASTER },
-    { RG_BIGGORON_SWORD,         EQUIP_FLAG_SWORD_BGS },
-    { RG_DEKU_SHIELD,            EQUIP_FLAG_SHIELD_DEKU },
-    { RG_HYLIAN_SHIELD,          EQUIP_FLAG_SHIELD_HYLIAN },
-    { RG_MIRROR_SHIELD,          EQUIP_FLAG_SHIELD_MIRROR },
-    { RG_GORON_TUNIC,            EQUIP_FLAG_TUNIC_GORON },
-    { RG_ZORA_TUNIC,             EQUIP_FLAG_TUNIC_ZORA },
-    { RG_BUY_DEKU_SHIELD,        EQUIP_FLAG_SHIELD_DEKU },
-    { RG_BUY_HYLIAN_SHIELD,      EQUIP_FLAG_SHIELD_HYLIAN },
-    { RG_BUY_GORON_TUNIC,        EQUIP_FLAG_TUNIC_GORON },
-    { RG_BUY_ZORA_TUNIC,         EQUIP_FLAG_TUNIC_ZORA },
-    { RG_IRON_BOOTS,             EQUIP_FLAG_BOOTS_IRON },
-    { RG_HOVER_BOOTS,            EQUIP_FLAG_BOOTS_HOVER }
-};
-
-std::map<RandomizerGet, uint32_t> Context::RandoGetToRandInf = {
-    { RG_ZELDAS_LETTER,          RAND_INF_ZELDAS_LETTER },
-    { RG_WEIRD_EGG,              RAND_INF_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 },
-    { RG_PHANTOM_GANON_SOUL,     RAND_INF_PHANTOM_GANON_SOUL },
-    { RG_VOLVAGIA_SOUL,          RAND_INF_VOLVAGIA_SOUL },
-    { RG_MORPHA_SOUL,            RAND_INF_MORPHA_SOUL },
-    { RG_BONGO_BONGO_SOUL,       RAND_INF_BONGO_BONGO_SOUL },
-    { RG_TWINROVA_SOUL,          RAND_INF_TWINROVA_SOUL },
-    { RG_GANON_SOUL,             RAND_INF_GANON_SOUL },
-    { RG_OCARINA_A_BUTTON,       RAND_INF_HAS_OCARINA_A },
-    { RG_OCARINA_C_UP_BUTTON,    RAND_INF_HAS_OCARINA_C_UP },
-    { RG_OCARINA_C_DOWN_BUTTON,  RAND_INF_HAS_OCARINA_C_DOWN },
-    { RG_OCARINA_C_LEFT_BUTTON,  RAND_INF_HAS_OCARINA_C_LEFT },
-    { RG_OCARINA_C_RIGHT_BUTTON, RAND_INF_HAS_OCARINA_C_RIGHT },
-    { RG_SKELETON_KEY,           RAND_INF_HAS_SKELETON_KEY },
-    { RG_GREG_RUPEE,             RAND_INF_GREG_FOUND },
-    { RG_FISHING_POLE,           RAND_INF_FISHING_POLE_FOUND }
-};
-
-std::map<uint32_t, uint32_t> Context::RandoGetToDungeonScene = {
-    { RG_FOREST_TEMPLE_SMALL_KEY,           SCENE_FOREST_TEMPLE },
-    { RG_FIRE_TEMPLE_SMALL_KEY,             SCENE_FIRE_TEMPLE },
-    { RG_WATER_TEMPLE_SMALL_KEY,            SCENE_WATER_TEMPLE },
-    { RG_SPIRIT_TEMPLE_SMALL_KEY,           SCENE_SPIRIT_TEMPLE },
-    { RG_SHADOW_TEMPLE_SMALL_KEY,           SCENE_SHADOW_TEMPLE },
-    { RG_BOTTOM_OF_THE_WELL_SMALL_KEY,      SCENE_BOTTOM_OF_THE_WELL },
-    { RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, SCENE_GERUDO_TRAINING_GROUND },
-    { RG_GERUDO_FORTRESS_SMALL_KEY,         SCENE_THIEVES_HIDEOUT },
-    { RG_GANONS_CASTLE_SMALL_KEY,           SCENE_INSIDE_GANONS_CASTLE },
-    { RG_FOREST_TEMPLE_KEY_RING,            SCENE_FOREST_TEMPLE },
-    { RG_FIRE_TEMPLE_KEY_RING,              SCENE_FIRE_TEMPLE },
-    { RG_WATER_TEMPLE_KEY_RING,             SCENE_WATER_TEMPLE },
-    { RG_SPIRIT_TEMPLE_KEY_RING,            SCENE_SPIRIT_TEMPLE },
-    { RG_SHADOW_TEMPLE_KEY_RING,            SCENE_SHADOW_TEMPLE },
-    { RG_BOTTOM_OF_THE_WELL_KEY_RING,       SCENE_BOTTOM_OF_THE_WELL },
-    { RG_GERUDO_TRAINING_GROUNDS_KEY_RING,  SCENE_GERUDO_TRAINING_GROUND },
-    { RG_GERUDO_FORTRESS_KEY_RING,          SCENE_THIEVES_HIDEOUT },
-    { RG_GANONS_CASTLE_KEY_RING,            SCENE_INSIDE_GANONS_CASTLE },
-    { RG_FOREST_TEMPLE_BOSS_KEY,            SCENE_FOREST_TEMPLE },
-    { RG_FIRE_TEMPLE_BOSS_KEY,              SCENE_FIRE_TEMPLE },
-    { RG_WATER_TEMPLE_BOSS_KEY,             SCENE_WATER_TEMPLE },
-    { RG_SPIRIT_TEMPLE_BOSS_KEY,            SCENE_SPIRIT_TEMPLE },
-    { RG_SHADOW_TEMPLE_BOSS_KEY,            SCENE_SHADOW_TEMPLE },
-    { RG_GANONS_CASTLE_BOSS_KEY,            SCENE_INSIDE_GANONS_CASTLE },
-    { RG_DEKU_TREE_MAP,                     SCENE_DEKU_TREE },
-    { RG_DODONGOS_CAVERN_MAP,               SCENE_DODONGOS_CAVERN },
-    { RG_JABU_JABUS_BELLY_MAP,              SCENE_JABU_JABU },
-    { RG_FOREST_TEMPLE_MAP,                 SCENE_FOREST_TEMPLE },
-    { RG_FIRE_TEMPLE_MAP,                   SCENE_FIRE_TEMPLE },
-    { RG_WATER_TEMPLE_MAP,                  SCENE_WATER_TEMPLE },
-    { RG_SPIRIT_TEMPLE_MAP,                 SCENE_SPIRIT_TEMPLE },
-    { RG_SHADOW_TEMPLE_MAP,                 SCENE_SHADOW_TEMPLE },
-    { RG_BOTTOM_OF_THE_WELL_MAP,            SCENE_BOTTOM_OF_THE_WELL },
-    { RG_ICE_CAVERN_MAP,                    SCENE_ICE_CAVERN },
-    { RG_DEKU_TREE_COMPASS,                 SCENE_DEKU_TREE },
-    { RG_DODONGOS_CAVERN_COMPASS,           SCENE_DODONGOS_CAVERN },
-    { RG_JABU_JABUS_BELLY_COMPASS,          SCENE_JABU_JABU },
-    { RG_FOREST_TEMPLE_COMPASS,             SCENE_FOREST_TEMPLE },
-    { RG_FIRE_TEMPLE_COMPASS,               SCENE_FIRE_TEMPLE },
-    { RG_WATER_TEMPLE_COMPASS,              SCENE_WATER_TEMPLE },
-    { RG_SPIRIT_TEMPLE_COMPASS,             SCENE_SPIRIT_TEMPLE },
-    { RG_SHADOW_TEMPLE_COMPASS,             SCENE_SHADOW_TEMPLE },
-    { RG_BOTTOM_OF_THE_WELL_COMPASS,        SCENE_BOTTOM_OF_THE_WELL },
-    { RG_ICE_CAVERN_COMPASS,                SCENE_ICE_CAVERN },
-    { RG_TREASURE_GAME_SMALL_KEY,           SCENE_TREASURE_BOX_SHOP }
-};
-
-std::map<uint32_t, uint32_t> Context::RandoGetToQuestItem = {
-    { RG_FOREST_MEDALLION,       QUEST_MEDALLION_FOREST },
-    { RG_FIRE_MEDALLION,         QUEST_MEDALLION_FIRE },
-    { RG_WATER_MEDALLION,        QUEST_MEDALLION_WATER },
-    { RG_SPIRIT_MEDALLION,       QUEST_MEDALLION_SPIRIT },
-    { RG_SHADOW_MEDALLION,       QUEST_MEDALLION_SHADOW },
-    { RG_LIGHT_MEDALLION,        QUEST_MEDALLION_LIGHT },
-    { RG_MINUET_OF_FOREST,       QUEST_SONG_MINUET },
-    { RG_BOLERO_OF_FIRE,         QUEST_SONG_BOLERO },
-    { RG_SERENADE_OF_WATER,      QUEST_SONG_SERENADE },
-    { RG_REQUIEM_OF_SPIRIT,      QUEST_SONG_REQUIEM },
-    { RG_NOCTURNE_OF_SHADOW,     QUEST_SONG_NOCTURNE },
-    { RG_PRELUDE_OF_LIGHT,       QUEST_SONG_PRELUDE },
-    { RG_ZELDAS_LULLABY,         QUEST_SONG_LULLABY },
-    { RG_EPONAS_SONG,            QUEST_SONG_EPONA },
-    { RG_SARIAS_SONG,            QUEST_SONG_SARIA },
-    { RG_SUNS_SONG,              QUEST_SONG_SUN },
-    { RG_SONG_OF_TIME,           QUEST_SONG_TIME },
-    { RG_SONG_OF_STORMS,         QUEST_SONG_STORMS },
-    { RG_KOKIRI_EMERALD,         QUEST_KOKIRI_EMERALD },
-    { RG_GORON_RUBY,             QUEST_GORON_RUBY },
-    { RG_ZORA_SAPPHIRE,          QUEST_ZORA_SAPPHIRE },
-    { RG_STONE_OF_AGONY,         QUEST_STONE_OF_AGONY },
-    { RG_GERUDO_MEMBERSHIP_CARD, QUEST_GERUDO_CARD },
-};
-
-uint32_t HookshotLookup[3] = { ITEM_NONE, ITEM_HOOKSHOT, ITEM_LONGSHOT };
-uint32_t OcarinaLookup[3] = { ITEM_NONE, ITEM_OCARINA_FAIRY, ITEM_OCARINA_TIME };
-
-void Context::ApplyItemEffect(Item& item, bool state) {
-    auto randoGet = item.GetRandomizerGet();
-    if (item.GetGIEntry()->objectId == OBJECT_GI_STICK) {
-        SetInventory(ITEM_STICK, (!state ? ITEM_NONE : ITEM_STICK));
-    }
-    if (item.GetGIEntry()->objectId == OBJECT_GI_NUTS) {
-        SetInventory(ITEM_NUT, (!state ? ITEM_NONE : ITEM_NUT));
-    }
-    switch (item.GetItemType()) {
-    case ITEMTYPE_ITEM:
-    {
-        switch (randoGet) {
-            case RG_STONE_OF_AGONY:
-            case RG_GERUDO_MEMBERSHIP_CARD:
-                SetQuestItem(RandoGetToQuestItem.at(randoGet), state);
-                break;
-            case RG_WEIRD_EGG:
-                SetRandoInf(RAND_INF_WEIRD_EGG, state);
-                break;
-            case RG_ZELDAS_LETTER:
-                SetRandoInf(RAND_INF_ZELDAS_LETTER, state);
-                break;
-            case RG_DOUBLE_DEFENSE:
-                mSaveContext->isDoubleDefenseAcquired = state;
-                break;
-            case RG_POCKET_EGG:
-            case RG_COJIRO:
-            case RG_ODD_MUSHROOM:
-            case RG_ODD_POTION:
-            case RG_POACHERS_SAW:
-            case RG_BROKEN_SWORD:
-            case RG_PRESCRIPTION:
-            case RG_EYEBALL_FROG:
-            case RG_EYEDROPS:
-            case RG_CLAIM_CHECK:
-                SetAdultTrade(item.GetGIEntry()->itemId, state);
-                break;
-            case RG_PROGRESSIVE_HOOKSHOT:
-            {
-                uint8_t i;
-                for (i = 0; i < 3; i++) {
-                    if (CurrentInventory(ITEM_HOOKSHOT) == HookshotLookup[i]) {
-                        break;
-                    }
-                }
-                auto newItem = i + (!state ? -1 : 1);
-                if (newItem < 0) {
-                    newItem = 0;
-                }
-                else if (newItem > 2) {
-                    newItem = 2;
-                }
-                SetInventory(ITEM_HOOKSHOT, HookshotLookup[newItem]);
-            }   break;
-            case RG_PROGRESSIVE_STRENGTH:
-            {
-                auto currentLevel = CurrentUpgrade(UPG_STRENGTH);
-                auto newLevel = currentLevel + (!state ? -1 : 1);
-                SetUpgrade(UPG_STRENGTH, newLevel);
-            }   break;
-            case RG_PROGRESSIVE_BOMB_BAG:
-            {
-                auto realGI = item.GetGIEntry();
-                if (realGI->itemId == RG_BOMB_BAG_INF && realGI->modIndex == MOD_RANDOMIZER) {
-                    SetRandoInf(RAND_INF_HAS_INFINITE_BOMB_BAG, true);
-                    break;
-                }
-                auto currentLevel = CurrentUpgrade(UPG_BOMB_BAG);
-                auto newLevel = currentLevel + (!state ? -1 : 1);
-                if (currentLevel == 0 && state || currentLevel == 1 && !state) {
-                    SetInventory(ITEM_BOMB, (!state ? ITEM_NONE : ITEM_BOMB));
-                }
-                SetUpgrade(UPG_BOMB_BAG, newLevel);
-            }   break;
-            case RG_PROGRESSIVE_BOW:
-            {
-                auto realGI = item.GetGIEntry();
-                if (realGI->itemId == RG_QUIVER_INF && realGI->modIndex == MOD_RANDOMIZER) {
-                    SetRandoInf(RAND_INF_HAS_INFINITE_QUIVER, true);
-                    break;
-                }
-                auto currentLevel = CurrentUpgrade(UPG_QUIVER);
-                auto newLevel = currentLevel + (!state ? -1 : 1);
-                if (currentLevel == 0 && state || currentLevel == 1 && !state) {
-                    SetInventory(ITEM_BOW, (!state ? ITEM_NONE : ITEM_BOW));
-                }
-                SetUpgrade(UPG_QUIVER, newLevel);
-            }   break;
-            case RG_PROGRESSIVE_SLINGSHOT:
-            {
-                auto realGI = item.GetGIEntry();
-                if (realGI->itemId == RG_BULLET_BAG_INF && realGI->modIndex == MOD_RANDOMIZER) {
-                    SetRandoInf(RAND_INF_HAS_INFINITE_BULLET_BAG, true);
-                    break;
-                }
-                auto currentLevel = CurrentUpgrade(UPG_BULLET_BAG);
-                auto newLevel = currentLevel + (!state ? -1 : 1);
-                if (currentLevel == 0 && state || currentLevel == 1 && !state) {
-                    SetInventory(ITEM_SLINGSHOT, (!state ? ITEM_NONE : ITEM_SLINGSHOT));
-                }
-                SetUpgrade(UPG_BULLET_BAG, newLevel);
-            }   break;
-            case RG_PROGRESSIVE_WALLET:
-            {
-                auto realGI = item.GetGIEntry();
-                if (realGI->itemId == RG_WALLET_INF && realGI->modIndex == MOD_RANDOMIZER) {
-                    SetRandoInf(RAND_INF_HAS_INFINITE_MONEY, true);
-                    break;
-                }
-                auto currentLevel = CurrentUpgrade(UPG_WALLET);
-                if (!CheckRandoInf(RAND_INF_HAS_WALLET) && state) {
-                    SetRandoInf(RAND_INF_HAS_WALLET, true);
-                }
-                else if (currentLevel == 0 && !state) {
-                    SetRandoInf(RAND_INF_HAS_WALLET, false);
-                }
-                else {
-                    auto newLevel = currentLevel + (!state ? -1 : 1);
-                    SetUpgrade(UPG_WALLET, newLevel);
-                }
-            }   break;
-            case RG_PROGRESSIVE_SCALE:
-            {
-                auto currentLevel = CurrentUpgrade(UPG_SCALE);
-                if (!CheckRandoInf(RAND_INF_CAN_SWIM) && state) {
-                    SetRandoInf(RAND_INF_CAN_SWIM, true);
-                }
-                else if (currentLevel == 0 && !state) {
-                    SetRandoInf(RAND_INF_CAN_SWIM, false);
-                }
-                else {
-                    auto newLevel = currentLevel + (!state ? -1 : 1);
-                    SetUpgrade(UPG_SCALE, newLevel);
-                }
-            }   break;
-            case RG_PROGRESSIVE_NUT_UPGRADE:
-            {
-                auto realGI = item.GetGIEntry();
-                if (realGI->itemId == RG_NUT_UPGRADE_INF && realGI->modIndex == MOD_RANDOMIZER) {
-                    SetRandoInf(RAND_INF_HAS_INFINITE_NUT_UPGRADE, true);
-                    break;
-                }
-                auto currentLevel = CurrentUpgrade(UPG_NUTS);
-                auto newLevel = currentLevel + (!state ? -1 : 1);
-                if (currentLevel == 0 && state || currentLevel == 1 && !state) {
-                    SetInventory(ITEM_NUT, (!state ? ITEM_NONE : ITEM_NUT));
-                }
-                SetUpgrade(UPG_NUTS, newLevel);
-            }   break;
-            case RG_PROGRESSIVE_STICK_UPGRADE:
-            {
-                auto realGI = item.GetGIEntry();
-                if (realGI->itemId == RG_STICK_UPGRADE_INF && realGI->modIndex == MOD_RANDOMIZER) {
-                    SetRandoInf(RAND_INF_HAS_INFINITE_STICK_UPGRADE, true);
-                    break;
-                }
-                auto currentLevel = CurrentUpgrade(UPG_STICKS);
-                auto newLevel = currentLevel + (!state ? -1 : 1);
-                if (currentLevel == 0 && state || currentLevel == 1 && !state) {
-                    SetInventory(ITEM_STICK, (!state ? ITEM_NONE : ITEM_STICK));
-                }
-                SetUpgrade(UPG_STICKS, newLevel);
-            }   break;
-            case RG_PROGRESSIVE_BOMBCHUS:
-            {
-                auto realGI = item.GetGIEntry();
-                if (realGI->itemId == RG_BOMBCHU_INF && realGI->modIndex == MOD_RANDOMIZER) {
-                    SetRandoInf(RAND_INF_HAS_INFINITE_BOMBCHUS, true);
-                    break;
-                }
-                SetInventory(ITEM_BOMBCHU, (!state ? ITEM_NONE : ITEM_BOMBCHU));
-            } break;
-            case RG_PROGRESSIVE_MAGIC_METER:
-            {
-                auto realGI = item.GetGIEntry();
-                if (realGI->itemId == RG_MAGIC_INF && realGI->modIndex == MOD_RANDOMIZER) {
-                    SetRandoInf(RAND_INF_HAS_INFINITE_MAGIC_METER, true);
-                    break;
-                }
-                mSaveContext->magicLevel += (!state ? -1 : 1);
-            } break;
-            case RG_PROGRESSIVE_OCARINA:
-            {
-                uint8_t i;
-                for (i = 0; i < 3; i++) {
-                    if (CurrentInventory(ITEM_OCARINA_FAIRY) == OcarinaLookup[i]) {
-                        break;
-                    }
-                }
-                i += (!state ? -1 : 1);
-                if (i < 0) {
-                    i = 0;
-                }
-                else if (i > 2) {
-                    i = 2;
-                }
-                SetInventory(ITEM_OCARINA_FAIRY, OcarinaLookup[i]);
-            }   break;
-            case RG_HEART_CONTAINER:
-                mSaveContext->healthCapacity += (!state ? -16 : 16);
-                break;
-            case RG_PIECE_OF_HEART:
-                mSaveContext->healthCapacity += (!state ? -4 : 4);
-                break;
-            case RG_BOOMERANG:
-            case RG_LENS_OF_TRUTH:
-            case RG_MEGATON_HAMMER:
-            case RG_DINS_FIRE:
-            case RG_FARORES_WIND:
-            case RG_NAYRUS_LOVE:
-            case RG_FIRE_ARROWS:
-            case RG_ICE_ARROWS:
-            case RG_LIGHT_ARROWS:
-                SetInventory(item.GetGIEntry()->itemId, (!state ? ITEM_NONE : item.GetGIEntry()->itemId));
-                break;
-            case RG_MAGIC_BEAN:
-            case RG_MAGIC_BEAN_PACK:
-            {
-                auto change = (item.GetRandomizerGet() == RG_MAGIC_BEAN ? 1 : 10);
-                auto current = GetAmmo(ITEM_BEAN);
-                SetAmmo(ITEM_BEAN, current + (!state ? -change : change));
-            }   break;
-            case RG_EMPTY_BOTTLE:
-            case RG_BOTTLE_WITH_MILK:
-            case RG_BOTTLE_WITH_RED_POTION:
-            case RG_BOTTLE_WITH_GREEN_POTION:
-            case RG_BOTTLE_WITH_BLUE_POTION:
-            case RG_BOTTLE_WITH_FAIRY:
-            case RG_BOTTLE_WITH_FISH:
-            case RG_BOTTLE_WITH_BLUE_FIRE:
-            case RG_BOTTLE_WITH_BUGS:
-            case RG_BOTTLE_WITH_POE:
-            case RG_BOTTLE_WITH_BIG_POE:
-            {
-                uint8_t slot = SLOT_BOTTLE_1;
-                while (slot != SLOT_BOTTLE_4) {
-                    if (mSaveContext->inventory.items[slot] == ITEM_NONE) {
-                        break;
-                    }
-                    slot++;
-                }
-                mSaveContext->inventory.items[slot] = item.GetGIEntry()->itemId;
-            }   break;
-            case RG_RUTOS_LETTER:
-                SetEventChkInf(EVENTCHKINF_OBTAINED_RUTOS_LETTER, state);
-                break;
-            case RG_GOHMA_SOUL:
-            case RG_KING_DODONGO_SOUL:
-            case RG_BARINADE_SOUL:
-            case RG_PHANTOM_GANON_SOUL:
-            case RG_VOLVAGIA_SOUL:
-            case RG_MORPHA_SOUL:
-            case RG_BONGO_BONGO_SOUL:
-            case RG_TWINROVA_SOUL:
-            case RG_GANON_SOUL:
-            case RG_OCARINA_A_BUTTON:
-            case RG_OCARINA_C_UP_BUTTON:
-            case RG_OCARINA_C_DOWN_BUTTON:
-            case RG_OCARINA_C_LEFT_BUTTON:
-            case RG_OCARINA_C_RIGHT_BUTTON:
-            case RG_GREG_RUPEE:
-            case RG_FISHING_POLE:
-                SetRandoInf(RandoGetToRandInf.at(randoGet), state);
-                break;
-            case RG_TRIFORCE_PIECE:
-                mSaveContext->triforcePiecesCollected += (!state ? -1 : 1);
-                break;
-            case RG_BOMBCHU_5:
-            case RG_BOMBCHU_10:
-            case RG_BOMBCHU_20:
-                SetInventory(ITEM_BOMBCHU, (!state ? ITEM_NONE : ITEM_BOMBCHU));
-                break;
-        }
-    }
-    break;
-    case ITEMTYPE_EQUIP:
-    {
-        RandomizerGet itemRG = item.GetRandomizerGet();
-        if (itemRG == RG_GIANTS_KNIFE) {
-            return;
-        }
-        uint32_t equipId = RandoGetToEquipFlag.find(itemRG)->second;
-        if (!state) {
-            mSaveContext->inventory.equipment &= ~equipId;
-            if (equipId == EQUIP_FLAG_SWORD_BGS) {
-                mSaveContext->bgsFlag = false;
-            }
-        }
-        else {
-            mSaveContext->inventory.equipment |= equipId;
-            if (equipId == EQUIP_FLAG_SWORD_BGS) {
-                mSaveContext->bgsFlag = true;
-            }
-        }
-    }
-    break;
-    case ITEMTYPE_DUNGEONREWARD:
-    case ITEMTYPE_SONG:
-        SetQuestItem(RandoGetToQuestItem.find(item.GetRandomizerGet())->second, state);
-        break;
-    case ITEMTYPE_MAP:
-        SetDungeonItem(DUNGEON_MAP, RandoGetToDungeonScene.find(item.GetRandomizerGet())->second, state);
-        break;
-    case ITEMTYPE_COMPASS:
-        SetDungeonItem(DUNGEON_COMPASS, RandoGetToDungeonScene.find(item.GetRandomizerGet())->second, state);
-        break;
-    case ITEMTYPE_BOSSKEY:
-        SetDungeonItem(DUNGEON_KEY_BOSS, RandoGetToDungeonScene.find(item.GetRandomizerGet())->second, state);
-        break;
-    case ITEMTYPE_FORTRESS_SMALLKEY:
-    case ITEMTYPE_SMALLKEY:
-    {
-        auto randoGet = item.GetRandomizerGet();
-        auto keyring = randoGet >= RG_FOREST_TEMPLE_KEY_RING && randoGet <= RG_GANONS_CASTLE_KEY_RING;
-        auto dungeonIndex = RandoGetToDungeonScene.find(randoGet)->second;
-        auto count = GetSmallKeyCount(dungeonIndex);
-        if (!state) {
-            if (keyring) {
-                count = 0;
-            }
-            else {
-                count -= 1;
-            }
-        }
-        else {
-            if (keyring) {
-                count = 10;
-            }
-            else {
-                count += 1;
-            }
-        }
-        SetSmallKeyCount(dungeonIndex, count);
-    } break;
-    case ITEMTYPE_TOKEN:
-        mSaveContext->inventory.gsTokens += (!state ? -1 : 1);
-        break;
-    case ITEMTYPE_EVENT:
-        break;
-    case ITEMTYPE_DROP:
-    case ITEMTYPE_REFILL:
-    case ITEMTYPE_SHOP:
-    {
-        RandomizerGet itemRG = item.GetRandomizerGet();
-        if (itemRG == RG_BUY_HYLIAN_SHIELD || itemRG == RG_BUY_DEKU_SHIELD || itemRG == RG_BUY_GORON_TUNIC || itemRG == RG_BUY_ZORA_TUNIC) {
-            uint32_t equipId = RandoGetToEquipFlag.find(itemRG)->second;
-            if (!state) {
-                mSaveContext->inventory.equipment &= ~equipId;
-            }
-            else {
-                mSaveContext->inventory.equipment |= equipId;
-            }
-        }
-        switch (itemRG) {
-        case RG_DEKU_NUTS_5:
-        case RG_DEKU_NUTS_10:
-        case RG_BUY_DEKU_NUTS_5:
-        case RG_BUY_DEKU_NUTS_10:
-            SetInventory(ITEM_NUT, (!state ? ITEM_NONE : ITEM_NUT));
-            break;
-        case RG_DEKU_STICK_1:
-        case RG_BUY_DEKU_STICK_1:
-        case RG_STICKS:
-            SetInventory(ITEM_STICK, (!state ? ITEM_NONE : ITEM_STICK));
-            break;
-        case RG_BOMBCHU_5:
-        case RG_BOMBCHU_10:
-        case RG_BOMBCHU_20:
-            SetInventory(ITEM_BOMBCHU, (!state ? ITEM_NONE : ITEM_BOMBCHU));
-            break;
-        }
-    } break;
-    }
-    mLogic->UpdateHelpers();
-}
-
 std::shared_ptr<Settings> Context::GetSettings() {
     return mSettings;
 }
@@ -914,173 +422,6 @@ std::shared_ptr<Logic> Context::GetLogic() {
     return mLogic;
 }
 
-SaveContext* Context::GetSaveContext() {
-    if (mSaveContext == nullptr) {
-        NewSaveContext();
-    }
-    return mSaveContext;
-}
-
-void Context::SetSaveContext(SaveContext* context) {
-    mSaveContext = context;
-}
-
-void Context::InitSaveContext() {
-    mSaveContext->totalDays = 0;
-    mSaveContext->bgsDayCount = 0;
-
-    mSaveContext->deaths = 0;
-    for (int i = 0; i < ARRAY_COUNT(mSaveContext->playerName); i++) {
-        mSaveContext->playerName[i] = 0x3E;
-    }
-    mSaveContext->n64ddFlag = 0;
-    mSaveContext->healthCapacity = 0x30;
-    mSaveContext->health = 0x30;
-    mSaveContext->magicLevel = 0;
-    mSaveContext->magic = 0x30;
-    mSaveContext->rupees = 0;
-    mSaveContext->swordHealth = 0;
-    mSaveContext->naviTimer = 0;
-    mSaveContext->isMagicAcquired = 0;
-    mSaveContext->isDoubleMagicAcquired = 0;
-    mSaveContext->isDoubleDefenseAcquired = 0;
-    mSaveContext->bgsFlag = 0;
-    mSaveContext->ocarinaGameRoundNum = 0;
-    for (int button = 0; button < ARRAY_COUNT(mSaveContext->childEquips.buttonItems); button++) {
-        mSaveContext->childEquips.buttonItems[button] = ITEM_NONE;
-    }
-    for (int button = 0; button < ARRAY_COUNT(mSaveContext->childEquips.cButtonSlots); button++) {
-        mSaveContext->childEquips.cButtonSlots[button] = SLOT_NONE;
-    }
-    mSaveContext->childEquips.equipment = 0;
-    for (int button = 0; button < ARRAY_COUNT(mSaveContext->adultEquips.buttonItems); button++) {
-        mSaveContext->adultEquips.buttonItems[button] = ITEM_NONE;
-    }
-    for (int button = 0; button < ARRAY_COUNT(mSaveContext->adultEquips.cButtonSlots); button++) {
-        mSaveContext->adultEquips.cButtonSlots[button] = SLOT_NONE;
-    }
-    mSaveContext->adultEquips.equipment = 0;
-    mSaveContext->unk_54 = 0;
-    mSaveContext->savedSceneNum = SCENE_LINKS_HOUSE;
-
-    // Equipment
-    for (int button = 0; button < ARRAY_COUNT(mSaveContext->equips.buttonItems); button++) {
-        mSaveContext->equips.buttonItems[button] = ITEM_NONE;
-    }
-    for (int button = 0; button < ARRAY_COUNT(mSaveContext->equips.cButtonSlots); button++) {
-        mSaveContext->equips.cButtonSlots[button] = SLOT_NONE;
-    }
-    mSaveContext->equips.equipment = 0;
-
-    // Inventory
-    for (int item = 0; item < ARRAY_COUNT(mSaveContext->inventory.items); item++) {
-        mSaveContext->inventory.items[item] = ITEM_NONE;
-    }
-    for (int ammo = 0; ammo < ARRAY_COUNT(mSaveContext->inventory.ammo); ammo++) {
-        mSaveContext->inventory.ammo[ammo] = 0;
-    }
-    mSaveContext->inventory.equipment = 0;
-    mSaveContext->inventory.upgrades = 0;
-    mSaveContext->inventory.questItems = 0;
-    for (int dungeon = 0; dungeon < ARRAY_COUNT(mSaveContext->inventory.dungeonItems); dungeon++) {
-        mSaveContext->inventory.dungeonItems[dungeon] = 0;
-    }
-    for (int dungeon = 0; dungeon < ARRAY_COUNT(mSaveContext->inventory.dungeonKeys); dungeon++) {
-        mSaveContext->inventory.dungeonKeys[dungeon] = 0x0;
-    }
-    mSaveContext->inventory.defenseHearts = 0;
-    mSaveContext->inventory.gsTokens = 0;
-    for (int scene = 0; scene < ARRAY_COUNT(mSaveContext->sceneFlags); scene++) {
-        mSaveContext->sceneFlags[scene].chest = 0;
-        mSaveContext->sceneFlags[scene].swch = 0;
-        mSaveContext->sceneFlags[scene].clear = 0;
-        mSaveContext->sceneFlags[scene].collect = 0;
-        mSaveContext->sceneFlags[scene].unk = 0;
-        mSaveContext->sceneFlags[scene].rooms = 0;
-        mSaveContext->sceneFlags[scene].floors = 0;
-    }
-    mSaveContext->fw.pos.x = 0;
-    mSaveContext->fw.pos.y = 0;
-    mSaveContext->fw.pos.z = 0;
-    mSaveContext->fw.yaw = 0;
-    mSaveContext->fw.playerParams = 0;
-    mSaveContext->fw.entranceIndex = 0;
-    mSaveContext->fw.roomIndex = 0;
-    mSaveContext->fw.set = 0;
-    mSaveContext->fw.tempSwchFlags = 0;
-    mSaveContext->fw.tempCollectFlags = 0;
-    for (int flag = 0; flag < ARRAY_COUNT(mSaveContext->gsFlags); flag++) {
-        mSaveContext->gsFlags[flag] = 0;
-    }
-    for (int highscore = 0; highscore < ARRAY_COUNT(mSaveContext->highScores); highscore++) {
-        mSaveContext->highScores[highscore] = 0;
-    }
-    for (int flag = 0; flag < ARRAY_COUNT(mSaveContext->eventChkInf); flag++) {
-        mSaveContext->eventChkInf[flag] = 0;
-    }
-    for (int flag = 0; flag < ARRAY_COUNT(mSaveContext->itemGetInf); flag++) {
-        mSaveContext->itemGetInf[flag] = 0;
-    }
-    for (int flag = 0; flag < ARRAY_COUNT(mSaveContext->infTable); flag++) {
-        mSaveContext->infTable[flag] = 0;
-    }
-    mSaveContext->worldMapAreaData = 0;
-    mSaveContext->scarecrowLongSongSet = 0;
-    for (int i = 0; i < ARRAY_COUNT(mSaveContext->scarecrowLongSong); i++) {
-        mSaveContext->scarecrowLongSong[i].noteIdx = 0;
-        mSaveContext->scarecrowLongSong[i].unk_01 = 0;
-        mSaveContext->scarecrowLongSong[i].unk_02 = 0;
-        mSaveContext->scarecrowLongSong[i].volume = 0;
-        mSaveContext->scarecrowLongSong[i].vibrato = 0;
-        mSaveContext->scarecrowLongSong[i].tone = 0;
-        mSaveContext->scarecrowLongSong[i].semitone = 0;
-    }
-    mSaveContext->scarecrowSpawnSongSet = 0;
-    for (int i = 0; i < ARRAY_COUNT(mSaveContext->scarecrowSpawnSong); i++) {
-        mSaveContext->scarecrowSpawnSong[i].noteIdx = 0;
-        mSaveContext->scarecrowSpawnSong[i].unk_01 = 0;
-        mSaveContext->scarecrowSpawnSong[i].unk_02 = 0;
-        mSaveContext->scarecrowSpawnSong[i].volume = 0;
-        mSaveContext->scarecrowSpawnSong[i].vibrato = 0;
-        mSaveContext->scarecrowSpawnSong[i].tone = 0;
-        mSaveContext->scarecrowSpawnSong[i].semitone = 0;
-    }
-
-    mSaveContext->horseData.scene = SCENE_HYRULE_FIELD;
-    mSaveContext->horseData.pos.x = -1840;
-    mSaveContext->horseData.pos.y = 72;
-    mSaveContext->horseData.pos.z = 5497;
-    mSaveContext->horseData.angle = -0x6AD9;
-    mSaveContext->magicLevel = 0;
-    mSaveContext->infTable[29] = 1;
-    mSaveContext->sceneFlags[5].swch = 0x40000000;
-
-    // SoH specific
-    mSaveContext->backupFW = mSaveContext->fw;
-    mSaveContext->pendingSale = ITEM_NONE;
-    mSaveContext->pendingSaleMod = MOD_NONE;
-    mSaveContext->isBossRushPaused = 0;
-    mSaveContext->pendingIceTrapCount = 0;
-
-    // Init with normal quest unless only an MQ rom is provided
-    mSaveContext->questId = OTRGlobals::Instance->HasOriginal() ? QUEST_NORMAL : QUEST_MASTER;
-
-    //RANDOTODO (ADD ITEMLOCATIONS TO GSAVECONTEXT)
-}
-
-void Context::NewSaveContext() {
-    if (mSaveContext != nullptr && mSaveContext != &gSaveContext) {
-        free(mSaveContext);
-    }
-    mSaveContext = new SaveContext();
-    InitSaveContext();
-}
-
-void Context::ResetLogic() {
-    NewSaveContext();
-    mLogic->Reset();
-}
-
 std::shared_ptr<Trials> Context::GetTrials() {
     return mTrials;
 }
@@ -1105,121 +446,4 @@ TrickOption& Context::GetTrickOption(const RandomizerTrick key) const {
     return mSettings->GetTrickOption(key);
 }
 
-uint8_t Context::InventorySlot(uint32_t item) {
-    return gItemSlots[item];
-}
-
-uint32_t Context::CurrentUpgrade(uint32_t upgrade) {
-    return (mSaveContext->inventory.upgrades & gUpgradeMasks[upgrade]) >> gUpgradeShifts[upgrade];
-}
-
-uint32_t Context::CurrentInventory(uint32_t item) {
-    return mSaveContext->inventory.items[InventorySlot(item)];
-}
-
-void Context::SetUpgrade(uint32_t upgrade, uint8_t level) {
-    mSaveContext->inventory.upgrades &= gUpgradeNegMasks[upgrade];
-    mSaveContext->inventory.upgrades |= level << gUpgradeShifts[upgrade];
-}
-
-bool Context::CheckInventory(uint32_t item, bool exact) {
-    auto current = mSaveContext->inventory.items[InventorySlot(item)];
-    return exact ? (current == item) : (current != ITEM_NONE);
-}
-
-void Context::SetInventory(uint32_t itemSlot, uint32_t item) {
-    mSaveContext->inventory.items[InventorySlot(itemSlot)] = item;
-}
-
-bool Context::CheckEquipment(uint32_t equipFlag) {
-    return (equipFlag & mSaveContext->inventory.equipment);
-}
-
-bool Context::CheckQuestItem(uint32_t item) {
-    return ((1 << item) & mSaveContext->inventory.questItems);
-}
-
-bool Context::HasAdultTrade(uint32_t itemID) {
-    int tradeIndex = itemID - ITEM_POCKET_EGG;
-    return mSaveContext->adultTradeItems & (1 << tradeIndex);
-}
-
-void Context::SetAdultTrade(uint32_t itemID, bool state) {
-    int tradeIndex = itemID - ITEM_POCKET_EGG;
-    if (!state) {
-        mSaveContext->adultTradeItems &= ~(1 << tradeIndex);
-    }
-    else {
-        mSaveContext->adultTradeItems |= (1 << tradeIndex);
-    }
-}
-
-void Context::SetQuestItem(uint32_t item, bool state) {
-    if (!state) {
-        mSaveContext->inventory.questItems &= ~(1 << item);
-    }
-    else {
-        mSaveContext->inventory.questItems |= (1 << item);
-    }
-}
-
-uint8_t Context::GetSmallKeyCount(uint32_t dungeonIndex) {
-    return mSaveContext->inventory.dungeonKeys[dungeonIndex];
-}
-
-void Context::SetSmallKeyCount(uint32_t dungeonIndex, uint8_t count) {
-    mSaveContext->inventory.dungeonKeys[dungeonIndex] = count;
-}
-
-bool Context::CheckDungeonItem(uint32_t item, uint32_t dungeonIndex) {
-    return mSaveContext->inventory.dungeonItems[dungeonIndex] & gBitFlags[item];
-}
-
-void Context::SetDungeonItem(uint32_t item, uint32_t dungeonIndex, bool state) {
-    if (!state) {
-        mSaveContext->inventory.dungeonItems[dungeonIndex] &= ~gBitFlags[item];
-    }
-    else {
-        mSaveContext->inventory.dungeonItems[dungeonIndex] |= gBitFlags[item];
-    }
-}
-
-bool Context::CheckRandoInf(uint32_t flag) {
-    return mSaveContext->randomizerInf[flag >> 4] & (1 << (flag & 0xF));
-}
-
-void Context::SetRandoInf(uint32_t flag, bool state) {
-    if (!state) {
-        mSaveContext->randomizerInf[flag >> 4] &= ~(1 << (flag & 0xF));
-    }
-    else {
-        mSaveContext->randomizerInf[flag >> 4] |= (1 << (flag & 0xF));
-    }
-}
-
-bool Context::CheckEventChkInf(int32_t flag) {
-    return mSaveContext->eventChkInf[flag >> 4] & (1 << (flag & 0xF));
-}
-
-void Context::SetEventChkInf(int32_t flag, bool state) {
-    if (!state) {
-        mSaveContext->eventChkInf[flag >> 4] &= ~(1 << (flag & 0xF));
-    }
-    else {
-        mSaveContext->eventChkInf[flag >> 4] |= (1 << (flag & 0xF));
-    }
-}
-
-uint8_t Context::GetGSCount() {
-    return mSaveContext->inventory.gsTokens;
-}
-
-uint8_t Context::GetAmmo(uint32_t item) {
-    return mSaveContext->inventory.ammo[gItemSlots[item]];
-}
-
-void Context::SetAmmo(uint32_t item, uint8_t count) {
-    mSaveContext->inventory.ammo[gItemSlots[item]] = count;
-}
-
 } // namespace Rando
diff --git a/soh/soh/Enhancements/randomizer/context.h b/soh/soh/Enhancements/randomizer/context.h
index 50800363c..1e0ea1aae 100644
--- a/soh/soh/Enhancements/randomizer/context.h
+++ b/soh/soh/Enhancements/randomizer/context.h
@@ -52,10 +52,6 @@ class Context {
     void GenerateLocationPool();
     static std::vector<RandomizerCheck> GetLocations(const std::vector<RandomizerCheck>& locationPool,
                                               Category categoryInclude, Category categoryExclude = Category::cNull);
-    static std::map<uint32_t, uint32_t> RandoGetToQuestItem;
-    static std::map<uint32_t, uint32_t> RandoGetToDungeonScene;
-    static std::map<RandomizerGet, uint32_t> RandoGetToEquipFlag;
-    static std::map<RandomizerGet, uint32_t> RandoGetToRandInf;
     void AddExcludedOptions();
     void LocationReset();
     void ClearItemLocations();
@@ -68,18 +64,12 @@ class Context {
     void SetSpoilerLoaded(bool spoilerLoaded = true);
     bool IsPlandoLoaded() const;
     void SetPlandoLoaded(bool plandoLoaded = true);
-    void ApplyItemEffect(Item& item, bool state);
     std::shared_ptr<Settings> GetSettings();
     std::shared_ptr<EntranceShuffler> GetEntranceShuffler();
     std::shared_ptr<Dungeons> GetDungeons();
     std::shared_ptr<Fishsanity> GetFishsanity();
     DungeonInfo* GetDungeon(size_t key) const;
     std::shared_ptr<Logic> GetLogic();
-    SaveContext* GetSaveContext();
-    void SetSaveContext(SaveContext* context);
-    void InitSaveContext();
-    void NewSaveContext();
-    void ResetLogic();
     std::shared_ptr<Trials> GetTrials();
     TrialInfo* GetTrial(size_t key) const;
     TrialInfo* GetTrial(TrialKey key) const;
@@ -101,29 +91,6 @@ class Context {
     bool playthroughBeatable = false;
     bool allLocationsReachable = false;
     RandomizerArea GetAreaFromString(std::string str);
-    uint8_t InventorySlot(uint32_t item);
-    void SetUpgrade(uint32_t upgrade, uint8_t level);
-    uint32_t CurrentUpgrade(uint32_t upgrade);
-    uint32_t CurrentInventory(uint32_t item);
-    bool CheckInventory(uint32_t item, bool exact);
-    void SetInventory(uint32_t itemSlot, uint32_t item);
-    bool CheckEquipment(uint32_t item);
-    bool CheckQuestItem(uint32_t item);
-    void SetQuestItem(uint32_t item, bool state);
-    bool HasAdultTrade(uint32_t item);
-    void SetAdultTrade(uint32_t item, bool state);
-    uint8_t GetSmallKeyCount(uint32_t dungeonIndex);
-    void SetSmallKeyCount(uint32_t dungeonIndex, uint8_t count);
-    bool CheckDungeonItem(uint32_t item, uint32_t dungeonIndex);
-    void SetDungeonItem(uint32_t item, uint32_t dungeonIndex, bool state);
-    bool CheckRandoInf(uint32_t flag);
-    void SetRandoInf(uint32_t flag, bool state);
-    bool CheckEventChkInf(int32_t flag);
-    uint8_t GetGSCount();
-    void SetEventChkInf(int32_t flag, bool state);
-    uint8_t GetAmmo(uint32_t item);
-    void SetAmmo(uint32_t item, uint8_t count);
-    
 
   private:
     static std::weak_ptr<Context> mContext;
@@ -133,7 +100,6 @@ class Context {
     std::shared_ptr<EntranceShuffler> mEntranceShuffler;
     std::shared_ptr<Dungeons> mDungeons;
     std::shared_ptr<Logic> mLogic;
-    SaveContext* mSaveContext = nullptr;
     std::shared_ptr<Trials> mTrials;
     std::shared_ptr<Fishsanity> mFishsanity;
     bool mSeedGenerated = false;
diff --git a/soh/soh/Enhancements/randomizer/entrance.cpp b/soh/soh/Enhancements/randomizer/entrance.cpp
index 8610734b9..9d32c5995 100644
--- a/soh/soh/Enhancements/randomizer/entrance.cpp
+++ b/soh/soh/Enhancements/randomizer/entrance.cpp
@@ -39,12 +39,12 @@ bool Entrance::GetConditionsMet() const {
 }
 
 std::string Entrance::to_string() const {
-    return AreaTable(parentRegion)->regionName + " -> " + AreaTable(connectedRegion)->regionName;
+    return RegionTable(parentRegion)->regionName + " -> " + RegionTable(connectedRegion)->regionName;
 }
 
 void Entrance::SetName(std::string name_) {
     if (name_ == "") {
-        name = AreaTable(parentRegion)->regionName + " -> " + AreaTable(connectedRegion)->regionName;
+        name = RegionTable(parentRegion)->regionName + " -> " + RegionTable(connectedRegion)->regionName;
     } else {
         name = std::move(name_);
     }
@@ -73,7 +73,7 @@ void Entrance::printAgeTimeAccess() {
 bool Entrance::ConditionsMet(bool allAgeTimes) const {
   auto ctx = Rando::Context::GetInstance();
   StartPerformanceTimer(PT_ENTRANCE_LOGIC);
-  Area* parent = AreaTable(parentRegion);
+  Region* parent = RegionTable(parentRegion);
   int conditionsMet = 0;
 
   if (allAgeTimes && !parent->AllAccess()) {
@@ -118,8 +118,8 @@ RandomizerRegion Entrance::GetOriginalConnectedRegionKey() const {
     return originalConnectedRegion;
 }
 
-Area* Entrance::GetConnectedRegion() const {
-    return AreaTable(connectedRegion);
+Region* Entrance::GetConnectedRegion() const {
+    return RegionTable(connectedRegion);
 }
 
 void Entrance::SetParentRegion(RandomizerRegion newParent) {
@@ -130,8 +130,8 @@ RandomizerRegion Entrance::GetParentRegionKey() const {
     return parentRegion;
 }
 
-Area* Entrance::GetParentRegion() const {
-    return AreaTable(parentRegion);
+Region* Entrance::GetParentRegion() const {
+    return RegionTable(parentRegion);
 }
 
 void Entrance::SetNewEntrance(RandomizerRegion newRegion) {
@@ -208,11 +208,11 @@ Entrance* Entrance::GetReverse() const {
 
 void Entrance::Connect(RandomizerRegion newConnectedRegion) {
     connectedRegion = newConnectedRegion;
-    AreaTable(newConnectedRegion)->entrances.push_front(this);
+    RegionTable(newConnectedRegion)->entrances.push_front(this);
 }
 
 RandomizerRegion Entrance::Disconnect() {
-    AreaTable(connectedRegion)->entrances.remove_if([this](const auto entrance) { return this == entrance; });
+    RegionTable(connectedRegion)->entrances.remove_if([this](const auto entrance) { return this == entrance; });
     RandomizerRegion previouslyConnected = connectedRegion;
     connectedRegion = RR_NONE;
     return previouslyConnected;
@@ -224,10 +224,10 @@ void Entrance::BindTwoWay(Entrance* otherEntrance) {
 }
 
 Entrance* Entrance::GetNewTarget() {
-    AreaTable(RR_ROOT)->AddExit(RR_ROOT, connectedRegion, [] { return true; });
-    Entrance* targetEntrance = AreaTable(RR_ROOT)->GetExit(connectedRegion);
+    RegionTable(RR_ROOT)->AddExit(RR_ROOT, connectedRegion, [] { return true; });
+    Entrance* targetEntrance = RegionTable(RR_ROOT)->GetExit(connectedRegion);
     targetEntrance->SetReplacement(this);
-    targetEntrance->SetName(AreaTable(RR_ROOT)->regionName + " -> " + GetConnectedRegion()->regionName);
+    targetEntrance->SetName(RegionTable(RR_ROOT)->regionName + " -> " + GetConnectedRegion()->regionName);
     return targetEntrance;
 }
 
@@ -254,7 +254,7 @@ void EntranceShuffler::SetNoRandomEntrances(bool noRandomEntrances) {
 
 // Construct entrance name from parent and connected region keys
 std::string EntranceNameByRegions(RandomizerRegion parentRegion, RandomizerRegion connectedRegion) {
-    return AreaTable(parentRegion)->regionName + " -> " + AreaTable(connectedRegion)->regionName;
+    return RegionTable(parentRegion)->regionName + " -> " + RegionTable(connectedRegion)->regionName;
 }
 
 void SetAllEntrancesData(std::vector<EntranceInfoPair>& entranceShuffleTable) {
@@ -265,7 +265,7 @@ void SetAllEntrancesData(std::vector<EntranceInfoPair>& entranceShuffleTable) {
         auto& returnEntry = entrancePair.second;
 
         // set data
-        Entrance* forwardEntrance = AreaTable(forwardEntry.parentRegion)->GetExit(forwardEntry.connectedRegion);
+        Entrance* forwardEntrance = RegionTable(forwardEntry.parentRegion)->GetExit(forwardEntry.connectedRegion);
         forwardEntrance->SetIndex(forwardEntry.index);
         forwardEntrance->SetType(forwardEntry.type);
         forwardEntrance->SetAsPrimary();
@@ -276,7 +276,7 @@ void SetAllEntrancesData(std::vector<EntranceInfoPair>& entranceShuffleTable) {
         }
 
         if (returnEntry.parentRegion != RR_NONE) {
-            Entrance* returnEntrance = AreaTable(returnEntry.parentRegion)->GetExit(returnEntry.connectedRegion);
+            Entrance* returnEntrance = RegionTable(returnEntry.parentRegion)->GetExit(returnEntry.connectedRegion);
             returnEntrance->SetIndex(returnEntry.index);
             returnEntrance->SetType(returnEntry.type);
             forwardEntrance->BindTwoWay(returnEntrance);
@@ -545,24 +545,24 @@ static bool ValidateWorld(Entrance* entrancePlaced) {
         if (checkOtherEntranceAccess) {
             // At least one valid starting region with all basic refills should be reachable without using any items at
             // the beginning of the seed
-            if (!AreaTable(RR_KOKIRI_FOREST)->HasAccess() && !AreaTable(RR_KAKARIKO_VILLAGE)->HasAccess()) {
+            if (!RegionTable(RR_KOKIRI_FOREST)->HasAccess() && !RegionTable(RR_KAKARIKO_VILLAGE)->HasAccess()) {
                 SPDLOG_DEBUG("Invalid starting area\n");
                 return false;
             }
 
             // Check that a region where time passes is always reachable as both ages without having collected any items
-            if (!Areas::HasTimePassAccess(RO_AGE_CHILD) || !Areas::HasTimePassAccess(RO_AGE_ADULT)) {
+            if (!Regions::HasTimePassAccess(RO_AGE_CHILD) || !Regions::HasTimePassAccess(RO_AGE_ADULT)) {
                 SPDLOG_DEBUG("Time passing is not guaranteed as both ages\n");
                 return false;
             }
 
             // The player should be able to get back to ToT after going through time, without having collected any items
             // This is important to ensure that the player never loses access to the pedestal after going through time
-            if (ctx->GetSettings()->ResolvedStartingAge() == RO_AGE_CHILD && !AreaTable(RR_TEMPLE_OF_TIME)->Adult()) {
+            if (ctx->GetSettings()->ResolvedStartingAge() == RO_AGE_CHILD && !RegionTable(RR_TEMPLE_OF_TIME)->Adult()) {
                 SPDLOG_DEBUG("Path to Temple of Time as adult is not guaranteed\n");
                 return false;
             } else if (ctx->GetSettings()->ResolvedStartingAge() == RO_AGE_ADULT &&
-                       !AreaTable(RR_TEMPLE_OF_TIME)->Child()) {
+                       !RegionTable(RR_TEMPLE_OF_TIME)->Child()) {
                 SPDLOG_DEBUG("Path to Temple of Time as child is not guaranteed\n");
                 return false;
             }
@@ -572,7 +572,7 @@ static bool ValidateWorld(Entrance* entrancePlaced) {
         // This is important to ensure that players can never lock their only bottles by filling them with Big Poes they
         // can't sell
         if (checkPoeCollectorAccess) {
-            if (!AreaTable(RR_MARKET_GUARD_HOUSE)->Adult()) {
+            if (!RegionTable(RR_MARKET_GUARD_HOUSE)->Adult()) {
                 SPDLOG_DEBUG("Big Poe Shop access is not guarenteed as adult\n");
                 return false;
             }
@@ -623,7 +623,7 @@ bool EntranceShuffler::ReplaceEntrance(Entrance* entrance, Entrance* target, std
         std::string ticks = std::to_string(svcGetSystemTick());
         auto message = "Dumping World Graph at " + ticks + "\n";
         // SPDLOG_DEBUG(message);
-        // Areas::DumpWorldGraph(ticks);
+        // Regions::DumpWorldGraph(ticks);
 #endif
         rollbacks.push_back(EntrancePair{ entrance, target });
         mCurNumRandomizedEntrances++;
@@ -633,7 +633,7 @@ bool EntranceShuffler::ReplaceEntrance(Entrance* entrance, Entrance* target, std
         std::string ticks = std::to_string(svcGetSystemTick());
         auto message = "Dumping World Graph at " + ticks + "\n";
         // SPDLOG_DEBUG(message);
-        // Areas::DumpWorldGraph(ticks);
+        // Regions::DumpWorldGraph(ticks);
 #endif
         if (entrance->GetConnectedRegionKey() != RR_NONE) {
             RestoreConnections(entrance, target);
@@ -885,7 +885,7 @@ void EntranceShuffler::ShuffleEntrancePool(std::vector<Entrance*>& entrancePool,
             auto message = "Failed to connect entrances. Retrying " + std::to_string(retries) +
                            " more times.\nDumping World Graph at " + ticks + "\n";
             SPDLOG_DEBUG(message);
-            // Areas::DumpWorldGraph(ticks);
+            // Regions::DumpWorldGraph(ticks);
 #endif
         }
         retries--;
diff --git a/soh/soh/Enhancements/randomizer/entrance.h b/soh/soh/Enhancements/randomizer/entrance.h
index 08861ff0d..38c2bb22b 100644
--- a/soh/soh/Enhancements/randomizer/entrance.h
+++ b/soh/soh/Enhancements/randomizer/entrance.h
@@ -50,10 +50,10 @@ class Entrance {
     bool CheckConditionAtAgeTime(bool& age, bool& time, bool passAnyway = false) const;
     RandomizerRegion GetConnectedRegionKey() const;
     RandomizerRegion GetOriginalConnectedRegionKey() const;
-    Area* GetConnectedRegion() const;
+    Region* GetConnectedRegion() const;
     void SetParentRegion(RandomizerRegion newParent);
     RandomizerRegion GetParentRegionKey() const;
-    Area* GetParentRegion() const;
+    Region* GetParentRegion() const;
     void SetNewEntrance(RandomizerRegion newRegion);
     void SetAsShuffled();
     bool IsShuffled() const;
diff --git a/soh/soh/Enhancements/randomizer/item.cpp b/soh/soh/Enhancements/randomizer/item.cpp
index 5fbab59a8..f132754f3 100644
--- a/soh/soh/Enhancements/randomizer/item.cpp
+++ b/soh/soh/Enhancements/randomizer/item.cpp
@@ -39,14 +39,14 @@ Item::Item(const RandomizerGet randomizerGet_, Text name_, const ItemType type_,
 
 void Item::ApplyEffect() const {
     auto ctx = Rando::Context::GetInstance();
-    ctx->ApplyItemEffect(StaticData::RetrieveItem(randomizerGet), true);
+    ctx->GetLogic()->ApplyItemEffect(StaticData::RetrieveItem(randomizerGet), true);
     ctx->GetLogic()->SetInLogic(logicVal, true);
     ctx->GetLogic()->UpdateHelpers();
 }
 
 void Item::UndoEffect() const {
     auto ctx = Rando::Context::GetInstance();
-    ctx->ApplyItemEffect(StaticData::RetrieveItem(randomizerGet), false);
+    ctx->GetLogic()->ApplyItemEffect(StaticData::RetrieveItem(randomizerGet), false);
     ctx->GetLogic()->SetInLogic(logicVal, false);
     ctx->GetLogic()->UpdateHelpers();
 }
@@ -83,14 +83,14 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
     if (giEntry != nullptr) {
         return giEntry;
     }
-    auto ctx = Rando::Context::GetInstance();
+    auto logic = Rando::Context::GetInstance()->GetLogic();
     RandomizerGet actual = RG_NONE;
     const bool tycoonWallet =
         OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHOPSANITY) > RO_SHOPSANITY_ZERO_ITEMS;
     const u8 infiniteUpgrades = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_INFINITE_UPGRADES);
     switch (randomizerGet) {
         case RG_PROGRESSIVE_STICK_UPGRADE:
-            switch (ctx->CurrentUpgrade(UPG_STICKS)) {
+            switch (logic->CurrentUpgrade(UPG_STICKS)) {
                 case 0:
                     if (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_DEKU_STICK_BAG)) {
                         actual = RG_DEKU_STICK_BAG;
@@ -119,7 +119,7 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
             }
             break;
         case RG_PROGRESSIVE_NUT_UPGRADE:
-            switch (ctx->CurrentUpgrade(UPG_NUTS)) {
+            switch (logic->CurrentUpgrade(UPG_NUTS)) {
                 case 0:
                     if (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_DEKU_NUT_BAG)) {
                         actual = RG_DEKU_NUT_BAG;
@@ -148,7 +148,7 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
             }
             break;
         case RG_PROGRESSIVE_BOMB_BAG:
-            switch (ctx->CurrentUpgrade(UPG_BOMB_BAG)) {
+            switch (logic->CurrentUpgrade(UPG_BOMB_BAG)) {
                 case 0:
                     actual = RG_BOMB_BAG;
                     break;
@@ -175,7 +175,7 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
             }
             break;
         case RG_PROGRESSIVE_BOW:
-            switch (ctx->CurrentUpgrade(UPG_QUIVER)) {
+            switch (logic->CurrentUpgrade(UPG_QUIVER)) {
                 case 0:
                     actual = RG_FAIRY_BOW;
                     break;
@@ -202,7 +202,7 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
             }
             break;
         case RG_PROGRESSIVE_SLINGSHOT:
-            switch (ctx->CurrentUpgrade(UPG_BULLET_BAG)) {
+            switch (logic->CurrentUpgrade(UPG_BULLET_BAG)) {
                 case 0:
                     actual = RG_FAIRY_SLINGSHOT;
                     break;
@@ -229,7 +229,7 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
             }
             break;
         case RG_PROGRESSIVE_OCARINA:
-            switch (ctx->CurrentInventory(ITEM_OCARINA_FAIRY)) {
+            switch (logic->CurrentInventory(ITEM_OCARINA_FAIRY)) {
                 case ITEM_NONE:
                     actual = RG_FAIRY_OCARINA;
                     break;
@@ -242,7 +242,7 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
             }
             break;
         case RG_PROGRESSIVE_HOOKSHOT:
-            switch (ctx->CurrentInventory(ITEM_HOOKSHOT)) {
+            switch (logic->CurrentInventory(ITEM_HOOKSHOT)) {
                 case ITEM_NONE:
                     actual = RG_HOOKSHOT;
                     break;
@@ -255,7 +255,7 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
             }
             break;
         case RG_PROGRESSIVE_STRENGTH:
-            switch (ctx->CurrentUpgrade(UPG_STRENGTH)) {
+            switch (logic->CurrentUpgrade(UPG_STRENGTH)) {
                 case 0:
                     actual = RG_GORONS_BRACELET;
                     break;
@@ -271,11 +271,11 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
             }
             break;
         case RG_PROGRESSIVE_WALLET:
-            if (!ctx->CheckRandoInf(RAND_INF_HAS_WALLET)) {
+            if (!logic->CheckRandoInf(RAND_INF_HAS_WALLET)) {
                 actual = RG_CHILD_WALLET;
                 break;
             }
-            switch (ctx->CurrentUpgrade(UPG_WALLET)) {
+            switch (logic->CurrentUpgrade(UPG_WALLET)) {
                 case 0:
                     actual = RG_ADULT_WALLET;
                     break;
@@ -298,11 +298,11 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
             }
             break;
         case RG_PROGRESSIVE_SCALE:
-            if (!ctx->CheckRandoInf(RAND_INF_CAN_SWIM)) {
+            if (!logic->CheckRandoInf(RAND_INF_CAN_SWIM)) {
                 actual = RG_BRONZE_SCALE;
                 break;
             }
-            switch (ctx->CurrentUpgrade(UPG_SCALE)) {
+            switch (logic->CurrentUpgrade(UPG_SCALE)) {
                 case 0:
                     actual = RG_SILVER_SCALE;
                     break;
@@ -315,7 +315,7 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
             }
             break;
         case RG_PROGRESSIVE_MAGIC_METER:
-            switch (ctx->GetSaveContext()->magicLevel) {
+            switch (logic->GetSaveContext()->magicLevel) {
                 case 0:
                     actual = RG_MAGIC_SINGLE;
                     break;
@@ -338,11 +338,11 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
            actual = RG_BIGGORON_SWORD;
            break;
         case RG_PROGRESSIVE_BOMBCHUS:
-            if (ctx->CurrentInventory(ITEM_BOMBCHU) == ITEM_NONE) {
+            if (logic->CurrentInventory(ITEM_BOMBCHU) == ITEM_NONE) {
                 actual = RG_BOMBCHU_20;
             } else if (infiniteUpgrades != RO_INF_UPGRADES_OFF) {
                 actual = RG_BOMBCHU_INF;
-            } else if (ctx->GetAmmo(ITEM_BOMBCHU) < 5) {
+            } else if (logic->GetAmmo(ITEM_BOMBCHU) < 5) {
                 actual = RG_BOMBCHU_10;
             } else {
                 actual = RG_BOMBCHU_5;
diff --git a/soh/soh/Enhancements/randomizer/logic.cpp b/soh/soh/Enhancements/randomizer/logic.cpp
index ba8311832..234d1e364 100644
--- a/soh/soh/Enhancements/randomizer/logic.cpp
+++ b/soh/soh/Enhancements/randomizer/logic.cpp
@@ -7,8 +7,11 @@
 #include <string_view>
 #include <vector>
 
+#include "soh/OTRGlobals.h"
 #include "dungeon.h"
 #include "context.h"
+#include "macros.h"
+#include "variables.h"
 #include <spdlog/spdlog.h>
 
 namespace Rando {
@@ -28,46 +31,46 @@ namespace Rando {
     bool Logic::HasItem(RandomizerGet itemName) {
         switch (itemName) {
             case RG_FAIRY_OCARINA:
-                return ctx->CheckInventory(ITEM_OCARINA_FAIRY, false);
+                return CheckInventory(ITEM_OCARINA_FAIRY, false);
             case RG_OCARINA_OF_TIME:
-                return ctx->CheckInventory(ITEM_OCARINA_TIME, true);
+                return CheckInventory(ITEM_OCARINA_TIME, true);
             case RG_DINS_FIRE:
-                return ctx->CheckInventory(ITEM_DINS_FIRE, true);
+                return CheckInventory(ITEM_DINS_FIRE, true);
             case RG_FARORES_WIND:
-                return ctx->CheckInventory(ITEM_FARORES_WIND, true);
+                return CheckInventory(ITEM_FARORES_WIND, true);
             case RG_NAYRUS_LOVE:
-                return ctx->CheckInventory(ITEM_NAYRUS_LOVE, true);
+                return CheckInventory(ITEM_NAYRUS_LOVE, true);
             case RG_LENS_OF_TRUTH:
-                return ctx->CheckInventory(ITEM_LENS, true);
+                return CheckInventory(ITEM_LENS, true);
             case RG_FAIRY_BOW:
-                return ctx->CheckInventory(ITEM_BOW, true);
+                return CheckInventory(ITEM_BOW, true);
             case RG_MEGATON_HAMMER:
-                return ctx->CheckInventory(ITEM_HAMMER, true);
+                return CheckInventory(ITEM_HAMMER, true);
             case RG_HOOKSHOT:
-                return ctx->CheckInventory(ITEM_HOOKSHOT, false);
+                return CheckInventory(ITEM_HOOKSHOT, false);
             case RG_LONGSHOT:
-                return ctx->CheckInventory(ITEM_LONGSHOT, true);
+                return CheckInventory(ITEM_LONGSHOT, true);
             case RG_PROGRESSIVE_STICK_UPGRADE:
             case RG_STICKS:
-                return ctx->CurrentUpgrade(UPG_STICKS);
+                return CurrentUpgrade(UPG_STICKS);
             case RG_FIRE_ARROWS:
-                return ctx->CheckInventory(ITEM_ARROW_FIRE, true);
+                return CheckInventory(ITEM_ARROW_FIRE, true);
             case RG_ICE_ARROWS:
-                return ctx->CheckInventory(ITEM_ARROW_ICE, true);
+                return CheckInventory(ITEM_ARROW_ICE, true);
             case RG_LIGHT_ARROWS:
-                return ctx->CheckInventory(ITEM_ARROW_LIGHT, true);
+                return CheckInventory(ITEM_ARROW_LIGHT, true);
             case RG_PROGRESSIVE_BOMBCHUS:
             case RG_BOMBCHU_5:
             case RG_BOMBCHU_10:
             case RG_BOMBCHU_20:
-                return (BombchusEnabled && BuyBombchus) || ctx->CheckInventory(ITEM_BOMBCHU, true);
+                return (BombchusEnabled && BuyBombchus) || CheckInventory(ITEM_BOMBCHU, true);
             case RG_FAIRY_SLINGSHOT:
-                return ctx->CheckInventory(ITEM_SLINGSHOT, true);
+                return CheckInventory(ITEM_SLINGSHOT, true);
             case RG_BOOMERANG:
-                return ctx->CheckInventory(ITEM_BOOMERANG, true);
+                return CheckInventory(ITEM_BOOMERANG, true);
             case RG_PROGRESSIVE_NUT_UPGRADE:
             case RG_NUTS:
-                return ctx->CurrentUpgrade(UPG_NUTS);
+                return CurrentUpgrade(UPG_NUTS);
             case RG_SCARECROW:
                 return Scarecrow;
             case RG_DISTANT_SCARECROW:
@@ -82,18 +85,18 @@ namespace Rando {
             case RG_BIGGORON_SWORD:
             case RG_IRON_BOOTS:
             case RG_HOVER_BOOTS:
-                return ctx->CheckEquipment(Context::RandoGetToEquipFlag.at(itemName));
+                return CheckEquipment(RandoGetToEquipFlag.at(itemName));
             case RG_GORONS_BRACELET:
-                return ctx->CurrentUpgrade(UPG_STRENGTH);
+                return CurrentUpgrade(UPG_STRENGTH);
             case RG_SILVER_GAUNTLETS:
-                return ctx->CurrentUpgrade(UPG_STRENGTH) >= 2;
+                return CurrentUpgrade(UPG_STRENGTH) >= 2;
             case RG_GOLDEN_GAUNTLETS:
-                return ctx->CurrentUpgrade(UPG_STRENGTH) >= 3;
+                return CurrentUpgrade(UPG_STRENGTH) >= 3;
             case RG_PROGRESSIVE_BOMB_BAG:
             case RG_BOMB_BAG:
-                return ctx->CurrentUpgrade(UPG_BOMB_BAG);
+                return CurrentUpgrade(UPG_BOMB_BAG);
             case RG_MAGIC_SINGLE:
-                return ctx->GetSaveContext()->magicLevel >= 1;
+                return GetSaveContext()->magicLevel >= 1;
                 // Songs
             case RG_ZELDAS_LULLABY:
             case RG_EPONAS_SONG:
@@ -120,11 +123,11 @@ namespace Rando {
                 // Misc Quest Items
             case RG_STONE_OF_AGONY:
             case RG_GERUDO_MEMBERSHIP_CARD:
-                return ctx->CheckQuestItem(Context::RandoGetToQuestItem.at(itemName));
+                return CheckQuestItem(RandoGetToQuestItem.at(itemName));
             case RG_RUTOS_LETTER:
-                return ctx->CheckEventChkInf(EVENTCHKINF_OBTAINED_RUTOS_LETTER);
+                return CheckEventChkInf(EVENTCHKINF_OBTAINED_RUTOS_LETTER);
             case RG_DOUBLE_DEFENSE:
-                return ctx->GetSaveContext()->isDoubleDefenseAcquired;
+                return GetSaveContext()->isDoubleDefenseAcquired;
             case RG_FISHING_POLE:
             case RG_ZELDAS_LETTER:
             case RG_WEIRD_EGG:
@@ -146,7 +149,7 @@ namespace Rando {
             case RG_TWINROVA_SOUL:
             case RG_GANON_SOUL:
             case RG_SKELETON_KEY:
-                return ctx->CheckRandoInf(Context::RandoGetToRandInf.at(itemName));
+                return CheckRandoInf(RandoGetToRandInf.at(itemName));
                 // Boss Keys
             case RG_FOREST_TEMPLE_BOSS_KEY:
             case RG_FIRE_TEMPLE_BOSS_KEY:
@@ -154,7 +157,7 @@ namespace Rando {
             case RG_SPIRIT_TEMPLE_BOSS_KEY:
             case RG_SHADOW_TEMPLE_BOSS_KEY:
             case RG_GANONS_CASTLE_BOSS_KEY:
-                return ctx->CheckDungeonItem(DUNGEON_KEY_BOSS, Context::RandoGetToDungeonScene.at(itemName));
+                return CheckDungeonItem(DUNGEON_KEY_BOSS, RandoGetToDungeonScene.at(itemName));
                 // Maps
             case RG_DEKU_TREE_MAP:
             case RG_DODONGOS_CAVERN_MAP:
@@ -166,7 +169,7 @@ namespace Rando {
             case RG_SHADOW_TEMPLE_MAP:
             case RG_BOTTOM_OF_THE_WELL_MAP:
             case RG_ICE_CAVERN_MAP:
-                return ctx->CheckDungeonItem(DUNGEON_MAP, Context::RandoGetToDungeonScene.at(itemName));
+                return CheckDungeonItem(DUNGEON_MAP, RandoGetToDungeonScene.at(itemName));
                 // Compasses
             case RG_DEKU_TREE_COMPASS:
             case RG_DODONGOS_CAVERN_COMPASS:
@@ -178,23 +181,23 @@ namespace Rando {
             case RG_SHADOW_TEMPLE_COMPASS:
             case RG_BOTTOM_OF_THE_WELL_COMPASS:
             case RG_ICE_CAVERN_COMPASS:
-                return ctx->CheckDungeonItem(DUNGEON_COMPASS, Context::RandoGetToDungeonScene.at(itemName));
+                return CheckDungeonItem(DUNGEON_COMPASS, RandoGetToDungeonScene.at(itemName));
                 // Wallets
             case RG_CHILD_WALLET:
-                return ctx->CheckRandoInf(RAND_INF_HAS_WALLET);
+                return CheckRandoInf(RAND_INF_HAS_WALLET);
             case RG_ADULT_WALLET:
-                return ctx->CurrentUpgrade(UPG_WALLET) >= 1;
+                return CurrentUpgrade(UPG_WALLET) >= 1;
             case RG_GIANT_WALLET:
-                return ctx->CurrentUpgrade(UPG_WALLET) >= 2;
+                return CurrentUpgrade(UPG_WALLET) >= 2;
             case RG_TYCOON_WALLET:
-                return ctx->CurrentUpgrade(UPG_WALLET) >= 3;
+                return CurrentUpgrade(UPG_WALLET) >= 3;
                 // Scales
             case RG_BRONZE_SCALE:
-                return ctx->CheckRandoInf(RAND_INF_CAN_SWIM);
+                return CheckRandoInf(RAND_INF_CAN_SWIM);
             case RG_SILVER_SCALE:
-                return ctx->CurrentUpgrade(UPG_SCALE) >= 1;
+                return CurrentUpgrade(UPG_SCALE) >= 1;
             case RG_GOLDEN_SCALE:
-                return ctx->CurrentUpgrade(UPG_SCALE) >= 2;
+                return CurrentUpgrade(UPG_SCALE) >= 2;
             case RG_POCKET_EGG:
             case RG_COJIRO:
             case RG_ODD_MUSHROOM:
@@ -205,7 +208,7 @@ namespace Rando {
             case RG_EYEBALL_FROG:
             case RG_EYEDROPS:
             case RG_CLAIM_CHECK:
-                return ctx->HasAdultTrade(StaticData::RetrieveItem(itemName).GetGIEntry()->itemId);
+                return HasAdultTrade(StaticData::RetrieveItem(itemName).GetGIEntry()->itemId);
             case RG_BOTTLE_WITH_BIG_POE:
             case RG_BOTTLE_WITH_BLUE_FIRE:
             case RG_BOTTLE_WITH_BLUE_POTION:
@@ -409,7 +412,7 @@ namespace Rando {
             case GlitchType::EquipSwap: // todo: add bunny hood to adult item equippable list and child trade item to child item equippable list
                 return ((IsAdult && (HasItem(RG_DINS_FIRE) || HasItem(RG_FARORES_WIND) || HasItem(RG_NAYRUS_LOVE))) || (IsChild && (HasItem(RG_STICKS) || 
                     HasItem(RG_FAIRY_SLINGSHOT) || HasItem(RG_BOOMERANG) || HasBottle || CanUse(RG_NUTS) || Ocarina || HasItem(RG_LENS_OF_TRUTH) || HasExplosives ||
-                    ctx->GetAmmo(ITEM_BEAN) > 0 || HasItem(RG_DINS_FIRE) || HasItem(RG_FARORES_WIND) || HasItem(RG_NAYRUS_LOVE)))) && false; //GlitchEquipSwap;
+                    GetAmmo(ITEM_BEAN) > 0 || HasItem(RG_DINS_FIRE) || HasItem(RG_FARORES_WIND) || HasItem(RG_NAYRUS_LOVE)))) && false; //GlitchEquipSwap;
         }
 
         //Shouldn't be reached
@@ -446,7 +449,7 @@ namespace Rando {
             return 0;
         }
         for (int i = SLOT_BOTTLE_1; i <= SLOT_BOTTLE_4; i++) {
-            uint8_t item = ctx->GetSaveContext()->inventory.items[i];
+            uint8_t item = GetSaveContext()->inventory.items[i];
             if (item != ITEM_NONE && (item != ITEM_LETTER_RUTO || (item == ITEM_LETTER_RUTO && DeliverLetter))) {
                 count++;
             }
@@ -468,7 +471,7 @@ namespace Rando {
         BuyArrow       = GetInLogic(LOGIC_BUY_ARROW);
         BuyBomb        = GetInLogic(LOGIC_BUY_BOMB);
         BuyMagicPotion = GetInLogic(LOGIC_BUY_MAGIC_POTION);
-        MagicBean      = ctx->GetAmmo(ITEM_BEAN) > 0;
+        MagicBean      = GetAmmo(ITEM_BEAN) > 0;
         RutosLetter    = CanUse(RG_RUTOS_LETTER);
         Boomerang      = CanUse(RG_BOOMERANG);
         DinsFire       = CanUse(RG_DINS_FIRE);
@@ -504,7 +507,7 @@ namespace Rando {
         OcarinaOfTime   = HasItem(RG_OCARINA_OF_TIME);
         MagicMeter      = HasItem(RG_MAGIC_SINGLE) && (AmmoCanDrop || (HasBottle && BuyMagicPotion));
         BombBag         = HasItem(RG_BOMB_BAG) && (BuyBomb || AmmoCanDrop);
-        BombchusEnabled = ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) ? ctx->CheckInventory(ITEM_BOMBCHU, true) : BombBag;
+        BombchusEnabled = ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) ? CheckInventory(ITEM_BOMBCHU, true) : BombBag;
         BuyBombchus     = (GetInLogic(LOGIC_BUY_BOMBCHUS) || CouldPlayBowling || CarpetMerchant);
         Hookshot        = CanUse(RG_HOOKSHOT);
         Longshot        = CanUse(RG_LONGSHOT);
@@ -519,8 +522,8 @@ namespace Rando {
         AdultsWallet    = HasItem(RG_ADULT_WALLET);
         BiggoronSword   = HasItem(RG_BIGGORON_SWORD);
 
-        ProgressiveScale  = ctx->CurrentUpgrade(UPG_SCALE) + HasItem(RG_BRONZE_SCALE);
-        ProgressiveWallet = ctx->CurrentUpgrade(UPG_WALLET) + HasItem(RG_CHILD_WALLET);
+        ProgressiveScale  = CurrentUpgrade(UPG_SCALE) + HasItem(RG_BRONZE_SCALE);
+        ProgressiveWallet = CurrentUpgrade(UPG_WALLET) + HasItem(RG_CHILD_WALLET);
 
         CanSummonGohma        = HasBossSoul(RG_GOHMA_SOUL);
         CanSummonKingDodongo  = HasBossSoul(RG_KING_DODONGO_SOUL);
@@ -551,9 +554,9 @@ namespace Rando {
         LightMedallion  = HasItem(RG_LIGHT_MEDALLION);
 
         DoubleDefense = HasItem(RG_DOUBLE_DEFENSE);
-        TriforcePieces = ctx->GetSaveContext()->triforcePiecesCollected;
+        TriforcePieces = GetSaveContext()->triforcePiecesCollected;
         Greg = HasItem(RG_GREG_RUPEE);
-        GoldSkulltulaTokens = ctx->GetGSCount();
+        GoldSkulltulaTokens = GetGSCount();
 
         //you need at least 2 buttons for scarecrow song
         ScarecrowSong    = ScarecrowSong || (ctx->GetOption(RSK_SKIP_SCARECROWS_SONG) && Ocarina && OcarinaButtons >= 2) || (ChildScarecrow && AdultScarecrow);
@@ -598,7 +601,7 @@ namespace Rando {
         CanRideEpona    = IsAdult && Epona && CanUse(RG_EPONAS_SONG);
         CanSummonGossipFairyWithoutSuns = CanUse(RG_ZELDAS_LULLABY) || CanUse(RG_EPONAS_SONG) || CanUse(RG_SONG_OF_TIME);
         CanSummonGossipFairy            = CanSummonGossipFairyWithoutSuns || CanUse(RG_SUNS_SONG);
-        Hearts          = ctx->GetSaveContext()->healthCapacity / 16;
+        Hearts          = GetSaveContext()->healthCapacity / 16;
         EffectiveHealth = ((Hearts << (2 + DoubleDefense)) >> Multiplier) + ((Hearts << (2 + DoubleDefense)) % (1 << Multiplier) > 0); //Number of half heart hits to die, ranges from 1 to 160
         FireTimer       = CanUse(RG_GORON_TUNIC) ? 255 : (ctx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS)) ? (Hearts * 8) : 0;
         WaterTimer      = CanUse(RG_ZORA_TUNIC) ? 255 : (ctx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS)) ? (Hearts * 8) : 0;
@@ -678,58 +681,58 @@ namespace Rando {
                                     (GetDifficultyValueFromString(GlitchHover) >= static_cast<uint8_t>(GlitchDifficulty::NOVICE) && GetDifficultyValueFromString(GlitchISG) >= static_cast<uint8_t>(GlitchDifficulty::INTERMEDIATE)))) {
                     return ForestTempleKeys >= requiredAmountGlitched;
                 }*/
-                return ctx->GetSmallKeyCount(SCENE_FOREST_TEMPLE) >= requiredAmountGlitchless;
+                return GetSmallKeyCount(SCENE_FOREST_TEMPLE) >= requiredAmountGlitchless;
 
             case RR_FIRE_TEMPLE:
                 /*if (IsGlitched && (GetDifficultyValueFromString(GlitchLedgeClip) >= static_cast<uint8_t>(GlitchDifficulty::INTERMEDIATE) || GetDifficultyValueFromString(GlitchHover) >= static_cast<uint8_t>(GlitchDifficulty::INTERMEDIATE))) {
                     return FireTempleKeys >= requiredAmountGlitched;
                 }*/
-                return ctx->GetSmallKeyCount(SCENE_FIRE_TEMPLE) >= requiredAmountGlitchless;
+                return GetSmallKeyCount(SCENE_FIRE_TEMPLE) >= requiredAmountGlitchless;
 
             case RR_WATER_TEMPLE:
                 /*if (IsGlitched && (false)) {
                     return WaterTempleKeys >= requiredAmountGlitched;
                 }*/
-                return ctx->GetSmallKeyCount(SCENE_WATER_TEMPLE) >= requiredAmountGlitchless;
+                return GetSmallKeyCount(SCENE_WATER_TEMPLE) >= requiredAmountGlitchless;
 
             case RR_SPIRIT_TEMPLE:
                 /*if (IsGlitched && (false)) {
                     return SpiritTempleKeys >= requiredAmountGlitched;
                 }*/
-                return ctx->GetSmallKeyCount(SCENE_SPIRIT_TEMPLE) >= requiredAmountGlitchless;
+                return GetSmallKeyCount(SCENE_SPIRIT_TEMPLE) >= requiredAmountGlitchless;
 
             case RR_SHADOW_TEMPLE:
                 /*if (IsGlitched && (GetDifficultyValueFromString(GlitchHookshotClip) >= static_cast<uint8_t>(GlitchDifficulty::NOVICE))) {
                     return ShadowTempleKeys >= requiredAmountGlitched;
                 }*/
-                return ctx->GetSmallKeyCount(SCENE_SHADOW_TEMPLE) >= requiredAmountGlitchless;
+                return GetSmallKeyCount(SCENE_SHADOW_TEMPLE) >= requiredAmountGlitchless;
 
             case RR_BOTTOM_OF_THE_WELL:
                 /*if (IsGlitched && (false)) {
                     return BottomOfTheWellKeys >= requiredAmountGlitched;
                 }*/
-                return ctx->GetSmallKeyCount(SCENE_BOTTOM_OF_THE_WELL) >= requiredAmountGlitchless;
+                return GetSmallKeyCount(SCENE_BOTTOM_OF_THE_WELL) >= requiredAmountGlitchless;
 
             case RR_GERUDO_TRAINING_GROUNDS:
                 /*if (IsGlitched && (false)) {
                     return GerudoTrainingGroundsKeys >= requiredAmountGlitched;
                 }*/
-                return ctx->GetSmallKeyCount(SCENE_GERUDO_TRAINING_GROUND) >= requiredAmountGlitchless;
+                return GetSmallKeyCount(SCENE_GERUDO_TRAINING_GROUND) >= requiredAmountGlitchless;
 
             case RR_GANONS_CASTLE:
                 /*if (IsGlitched && (false)) {
                     return GanonsCastleKeys >= requiredAmountGlitched;
                 }*/
-                return ctx->GetSmallKeyCount(SCENE_INSIDE_GANONS_CASTLE) >= requiredAmountGlitchless;
+                return GetSmallKeyCount(SCENE_INSIDE_GANONS_CASTLE) >= requiredAmountGlitchless;
 
             case RR_MARKET_TREASURE_CHEST_GAME:
                 /*if (IsGlitched && (false)) {
                     return TreasureGameKeys >= requiredAmountGlitched;
                 }*/
-                return ctx->GetSmallKeyCount(SCENE_TREASURE_BOX_SHOP) >= requiredAmountGlitchless;
+                return GetSmallKeyCount(SCENE_TREASURE_BOX_SHOP) >= requiredAmountGlitchless;
 
             case RR_GERUDO_FORTRESS:
-                return ctx->GetSmallKeyCount(SCENE_THIEVES_HIDEOUT) >= requiredAmountGlitchless;
+                return GetSmallKeyCount(SCENE_THIEVES_HIDEOUT) >= requiredAmountGlitchless;
 
             default:
                 return false;
@@ -765,6 +768,777 @@ namespace Rando {
         return false;
     }
 
+    std::map<RandomizerGet, uint32_t> Logic::RandoGetToEquipFlag = {
+        { RG_KOKIRI_SWORD,           EQUIP_FLAG_SWORD_KOKIRI },
+        { RG_MASTER_SWORD,           EQUIP_FLAG_SWORD_MASTER },
+        { RG_BIGGORON_SWORD,         EQUIP_FLAG_SWORD_BGS },
+        { RG_DEKU_SHIELD,            EQUIP_FLAG_SHIELD_DEKU },
+        { RG_HYLIAN_SHIELD,          EQUIP_FLAG_SHIELD_HYLIAN },
+        { RG_MIRROR_SHIELD,          EQUIP_FLAG_SHIELD_MIRROR },
+        { RG_GORON_TUNIC,            EQUIP_FLAG_TUNIC_GORON },
+        { RG_ZORA_TUNIC,             EQUIP_FLAG_TUNIC_ZORA },
+        { RG_BUY_DEKU_SHIELD,        EQUIP_FLAG_SHIELD_DEKU },
+        { RG_BUY_HYLIAN_SHIELD,      EQUIP_FLAG_SHIELD_HYLIAN },
+        { RG_BUY_GORON_TUNIC,        EQUIP_FLAG_TUNIC_GORON },
+        { RG_BUY_ZORA_TUNIC,         EQUIP_FLAG_TUNIC_ZORA },
+        { RG_IRON_BOOTS,             EQUIP_FLAG_BOOTS_IRON },
+        { RG_HOVER_BOOTS,            EQUIP_FLAG_BOOTS_HOVER }
+    };
+
+    std::map<RandomizerGet, uint32_t> Logic::RandoGetToRandInf = {
+        { RG_ZELDAS_LETTER,          RAND_INF_ZELDAS_LETTER },
+        { RG_WEIRD_EGG,              RAND_INF_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 },
+        { RG_PHANTOM_GANON_SOUL,     RAND_INF_PHANTOM_GANON_SOUL },
+        { RG_VOLVAGIA_SOUL,          RAND_INF_VOLVAGIA_SOUL },
+        { RG_MORPHA_SOUL,            RAND_INF_MORPHA_SOUL },
+        { RG_BONGO_BONGO_SOUL,       RAND_INF_BONGO_BONGO_SOUL },
+        { RG_TWINROVA_SOUL,          RAND_INF_TWINROVA_SOUL },
+        { RG_GANON_SOUL,             RAND_INF_GANON_SOUL },
+        { RG_OCARINA_A_BUTTON,       RAND_INF_HAS_OCARINA_A },
+        { RG_OCARINA_C_UP_BUTTON,    RAND_INF_HAS_OCARINA_C_UP },
+        { RG_OCARINA_C_DOWN_BUTTON,  RAND_INF_HAS_OCARINA_C_DOWN },
+        { RG_OCARINA_C_LEFT_BUTTON,  RAND_INF_HAS_OCARINA_C_LEFT },
+        { RG_OCARINA_C_RIGHT_BUTTON, RAND_INF_HAS_OCARINA_C_RIGHT },
+        { RG_SKELETON_KEY,           RAND_INF_HAS_SKELETON_KEY },
+        { RG_GREG_RUPEE,             RAND_INF_GREG_FOUND },
+        { RG_FISHING_POLE,           RAND_INF_FISHING_POLE_FOUND }
+    };
+
+    std::map<uint32_t, uint32_t> Logic::RandoGetToDungeonScene = {
+        { RG_FOREST_TEMPLE_SMALL_KEY,           SCENE_FOREST_TEMPLE },
+        { RG_FIRE_TEMPLE_SMALL_KEY,             SCENE_FIRE_TEMPLE },
+        { RG_WATER_TEMPLE_SMALL_KEY,            SCENE_WATER_TEMPLE },
+        { RG_SPIRIT_TEMPLE_SMALL_KEY,           SCENE_SPIRIT_TEMPLE },
+        { RG_SHADOW_TEMPLE_SMALL_KEY,           SCENE_SHADOW_TEMPLE },
+        { RG_BOTTOM_OF_THE_WELL_SMALL_KEY,      SCENE_BOTTOM_OF_THE_WELL },
+        { RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, SCENE_GERUDO_TRAINING_GROUND },
+        { RG_GERUDO_FORTRESS_SMALL_KEY,         SCENE_THIEVES_HIDEOUT },
+        { RG_GANONS_CASTLE_SMALL_KEY,           SCENE_INSIDE_GANONS_CASTLE },
+        { RG_FOREST_TEMPLE_KEY_RING,            SCENE_FOREST_TEMPLE },
+        { RG_FIRE_TEMPLE_KEY_RING,              SCENE_FIRE_TEMPLE },
+        { RG_WATER_TEMPLE_KEY_RING,             SCENE_WATER_TEMPLE },
+        { RG_SPIRIT_TEMPLE_KEY_RING,            SCENE_SPIRIT_TEMPLE },
+        { RG_SHADOW_TEMPLE_KEY_RING,            SCENE_SHADOW_TEMPLE },
+        { RG_BOTTOM_OF_THE_WELL_KEY_RING,       SCENE_BOTTOM_OF_THE_WELL },
+        { RG_GERUDO_TRAINING_GROUNDS_KEY_RING,  SCENE_GERUDO_TRAINING_GROUND },
+        { RG_GERUDO_FORTRESS_KEY_RING,          SCENE_THIEVES_HIDEOUT },
+        { RG_GANONS_CASTLE_KEY_RING,            SCENE_INSIDE_GANONS_CASTLE },
+        { RG_FOREST_TEMPLE_BOSS_KEY,            SCENE_FOREST_TEMPLE },
+        { RG_FIRE_TEMPLE_BOSS_KEY,              SCENE_FIRE_TEMPLE },
+        { RG_WATER_TEMPLE_BOSS_KEY,             SCENE_WATER_TEMPLE },
+        { RG_SPIRIT_TEMPLE_BOSS_KEY,            SCENE_SPIRIT_TEMPLE },
+        { RG_SHADOW_TEMPLE_BOSS_KEY,            SCENE_SHADOW_TEMPLE },
+        { RG_GANONS_CASTLE_BOSS_KEY,            SCENE_INSIDE_GANONS_CASTLE },
+        { RG_DEKU_TREE_MAP,                     SCENE_DEKU_TREE },
+        { RG_DODONGOS_CAVERN_MAP,               SCENE_DODONGOS_CAVERN },
+        { RG_JABU_JABUS_BELLY_MAP,              SCENE_JABU_JABU },
+        { RG_FOREST_TEMPLE_MAP,                 SCENE_FOREST_TEMPLE },
+        { RG_FIRE_TEMPLE_MAP,                   SCENE_FIRE_TEMPLE },
+        { RG_WATER_TEMPLE_MAP,                  SCENE_WATER_TEMPLE },
+        { RG_SPIRIT_TEMPLE_MAP,                 SCENE_SPIRIT_TEMPLE },
+        { RG_SHADOW_TEMPLE_MAP,                 SCENE_SHADOW_TEMPLE },
+        { RG_BOTTOM_OF_THE_WELL_MAP,            SCENE_BOTTOM_OF_THE_WELL },
+        { RG_ICE_CAVERN_MAP,                    SCENE_ICE_CAVERN },
+        { RG_DEKU_TREE_COMPASS,                 SCENE_DEKU_TREE },
+        { RG_DODONGOS_CAVERN_COMPASS,           SCENE_DODONGOS_CAVERN },
+        { RG_JABU_JABUS_BELLY_COMPASS,          SCENE_JABU_JABU },
+        { RG_FOREST_TEMPLE_COMPASS,             SCENE_FOREST_TEMPLE },
+        { RG_FIRE_TEMPLE_COMPASS,               SCENE_FIRE_TEMPLE },
+        { RG_WATER_TEMPLE_COMPASS,              SCENE_WATER_TEMPLE },
+        { RG_SPIRIT_TEMPLE_COMPASS,             SCENE_SPIRIT_TEMPLE },
+        { RG_SHADOW_TEMPLE_COMPASS,             SCENE_SHADOW_TEMPLE },
+        { RG_BOTTOM_OF_THE_WELL_COMPASS,        SCENE_BOTTOM_OF_THE_WELL },
+        { RG_ICE_CAVERN_COMPASS,                SCENE_ICE_CAVERN },
+        { RG_TREASURE_GAME_SMALL_KEY,           SCENE_TREASURE_BOX_SHOP }
+    };
+
+    std::map<uint32_t, uint32_t> Logic::RandoGetToQuestItem = {
+        { RG_FOREST_MEDALLION,       QUEST_MEDALLION_FOREST },
+        { RG_FIRE_MEDALLION,         QUEST_MEDALLION_FIRE },
+        { RG_WATER_MEDALLION,        QUEST_MEDALLION_WATER },
+        { RG_SPIRIT_MEDALLION,       QUEST_MEDALLION_SPIRIT },
+        { RG_SHADOW_MEDALLION,       QUEST_MEDALLION_SHADOW },
+        { RG_LIGHT_MEDALLION,        QUEST_MEDALLION_LIGHT },
+        { RG_MINUET_OF_FOREST,       QUEST_SONG_MINUET },
+        { RG_BOLERO_OF_FIRE,         QUEST_SONG_BOLERO },
+        { RG_SERENADE_OF_WATER,      QUEST_SONG_SERENADE },
+        { RG_REQUIEM_OF_SPIRIT,      QUEST_SONG_REQUIEM },
+        { RG_NOCTURNE_OF_SHADOW,     QUEST_SONG_NOCTURNE },
+        { RG_PRELUDE_OF_LIGHT,       QUEST_SONG_PRELUDE },
+        { RG_ZELDAS_LULLABY,         QUEST_SONG_LULLABY },
+        { RG_EPONAS_SONG,            QUEST_SONG_EPONA },
+        { RG_SARIAS_SONG,            QUEST_SONG_SARIA },
+        { RG_SUNS_SONG,              QUEST_SONG_SUN },
+        { RG_SONG_OF_TIME,           QUEST_SONG_TIME },
+        { RG_SONG_OF_STORMS,         QUEST_SONG_STORMS },
+        { RG_KOKIRI_EMERALD,         QUEST_KOKIRI_EMERALD },
+        { RG_GORON_RUBY,             QUEST_GORON_RUBY },
+        { RG_ZORA_SAPPHIRE,          QUEST_ZORA_SAPPHIRE },
+        { RG_STONE_OF_AGONY,         QUEST_STONE_OF_AGONY },
+        { RG_GERUDO_MEMBERSHIP_CARD, QUEST_GERUDO_CARD },
+    };
+
+    uint32_t HookshotLookup[3] = { ITEM_NONE, ITEM_HOOKSHOT, ITEM_LONGSHOT };
+    uint32_t OcarinaLookup[3] = { ITEM_NONE, ITEM_OCARINA_FAIRY, ITEM_OCARINA_TIME };
+
+    void Logic::ApplyItemEffect(Item& item, bool state) {
+        auto randoGet = item.GetRandomizerGet();
+        if (item.GetGIEntry()->objectId == OBJECT_GI_STICK) {
+            SetInventory(ITEM_STICK, (!state ? ITEM_NONE : ITEM_STICK));
+        }
+        if (item.GetGIEntry()->objectId == OBJECT_GI_NUTS) {
+            SetInventory(ITEM_NUT, (!state ? ITEM_NONE : ITEM_NUT));
+        }
+        switch (item.GetItemType()) {
+        case ITEMTYPE_ITEM:
+        {
+            switch (randoGet) {
+            case RG_STONE_OF_AGONY:
+            case RG_GERUDO_MEMBERSHIP_CARD:
+                SetQuestItem(RandoGetToQuestItem.at(randoGet), state);
+                break;
+            case RG_WEIRD_EGG:
+                SetRandoInf(RAND_INF_WEIRD_EGG, state);
+                break;
+            case RG_ZELDAS_LETTER:
+                SetRandoInf(RAND_INF_ZELDAS_LETTER, state);
+                break;
+            case RG_DOUBLE_DEFENSE:
+                mSaveContext->isDoubleDefenseAcquired = state;
+                break;
+            case RG_POCKET_EGG:
+            case RG_COJIRO:
+            case RG_ODD_MUSHROOM:
+            case RG_ODD_POTION:
+            case RG_POACHERS_SAW:
+            case RG_BROKEN_SWORD:
+            case RG_PRESCRIPTION:
+            case RG_EYEBALL_FROG:
+            case RG_EYEDROPS:
+            case RG_CLAIM_CHECK:
+                SetAdultTrade(item.GetGIEntry()->itemId, state);
+                break;
+            case RG_PROGRESSIVE_HOOKSHOT:
+            {
+                uint8_t i;
+                for (i = 0; i < 3; i++) {
+                    if (CurrentInventory(ITEM_HOOKSHOT) == HookshotLookup[i]) {
+                        break;
+                    }
+                }
+                auto newItem = i + (!state ? -1 : 1);
+                if (newItem < 0) {
+                    newItem = 0;
+                }
+                else if (newItem > 2) {
+                    newItem = 2;
+                }
+                SetInventory(ITEM_HOOKSHOT, HookshotLookup[newItem]);
+            }   break;
+            case RG_PROGRESSIVE_STRENGTH:
+            {
+                auto currentLevel = CurrentUpgrade(UPG_STRENGTH);
+                auto newLevel = currentLevel + (!state ? -1 : 1);
+                SetUpgrade(UPG_STRENGTH, newLevel);
+            }   break;
+            case RG_PROGRESSIVE_BOMB_BAG:
+            {
+                auto realGI = item.GetGIEntry();
+                if (realGI->itemId == RG_BOMB_BAG_INF && realGI->modIndex == MOD_RANDOMIZER) {
+                    SetRandoInf(RAND_INF_HAS_INFINITE_BOMB_BAG, true);
+                    break;
+                }
+                auto currentLevel = CurrentUpgrade(UPG_BOMB_BAG);
+                auto newLevel = currentLevel + (!state ? -1 : 1);
+                if (currentLevel == 0 && state || currentLevel == 1 && !state) {
+                    SetInventory(ITEM_BOMB, (!state ? ITEM_NONE : ITEM_BOMB));
+                }
+                SetUpgrade(UPG_BOMB_BAG, newLevel);
+            }   break;
+            case RG_PROGRESSIVE_BOW:
+            {
+                auto realGI = item.GetGIEntry();
+                if (realGI->itemId == RG_QUIVER_INF && realGI->modIndex == MOD_RANDOMIZER) {
+                    SetRandoInf(RAND_INF_HAS_INFINITE_QUIVER, true);
+                    break;
+                }
+                auto currentLevel = CurrentUpgrade(UPG_QUIVER);
+                auto newLevel = currentLevel + (!state ? -1 : 1);
+                if (currentLevel == 0 && state || currentLevel == 1 && !state) {
+                    SetInventory(ITEM_BOW, (!state ? ITEM_NONE : ITEM_BOW));
+                }
+                SetUpgrade(UPG_QUIVER, newLevel);
+            }   break;
+            case RG_PROGRESSIVE_SLINGSHOT:
+            {
+                auto realGI = item.GetGIEntry();
+                if (realGI->itemId == RG_BULLET_BAG_INF && realGI->modIndex == MOD_RANDOMIZER) {
+                    SetRandoInf(RAND_INF_HAS_INFINITE_BULLET_BAG, true);
+                    break;
+                }
+                auto currentLevel = CurrentUpgrade(UPG_BULLET_BAG);
+                auto newLevel = currentLevel + (!state ? -1 : 1);
+                if (currentLevel == 0 && state || currentLevel == 1 && !state) {
+                    SetInventory(ITEM_SLINGSHOT, (!state ? ITEM_NONE : ITEM_SLINGSHOT));
+                }
+                SetUpgrade(UPG_BULLET_BAG, newLevel);
+            }   break;
+            case RG_PROGRESSIVE_WALLET:
+            {
+                auto realGI = item.GetGIEntry();
+                if (realGI->itemId == RG_WALLET_INF && realGI->modIndex == MOD_RANDOMIZER) {
+                    SetRandoInf(RAND_INF_HAS_INFINITE_MONEY, true);
+                    break;
+                }
+                auto currentLevel = CurrentUpgrade(UPG_WALLET);
+                if (!CheckRandoInf(RAND_INF_HAS_WALLET) && state) {
+                    SetRandoInf(RAND_INF_HAS_WALLET, true);
+                }
+                else if (currentLevel == 0 && !state) {
+                    SetRandoInf(RAND_INF_HAS_WALLET, false);
+                }
+                else {
+                    auto newLevel = currentLevel + (!state ? -1 : 1);
+                    SetUpgrade(UPG_WALLET, newLevel);
+                }
+            }   break;
+            case RG_PROGRESSIVE_SCALE:
+            {
+                auto currentLevel = CurrentUpgrade(UPG_SCALE);
+                if (!CheckRandoInf(RAND_INF_CAN_SWIM) && state) {
+                    SetRandoInf(RAND_INF_CAN_SWIM, true);
+                }
+                else if (currentLevel == 0 && !state) {
+                    SetRandoInf(RAND_INF_CAN_SWIM, false);
+                }
+                else {
+                    auto newLevel = currentLevel + (!state ? -1 : 1);
+                    SetUpgrade(UPG_SCALE, newLevel);
+                }
+            }   break;
+            case RG_PROGRESSIVE_NUT_UPGRADE:
+            {
+                auto realGI = item.GetGIEntry();
+                if (realGI->itemId == RG_NUT_UPGRADE_INF && realGI->modIndex == MOD_RANDOMIZER) {
+                    SetRandoInf(RAND_INF_HAS_INFINITE_NUT_UPGRADE, true);
+                    break;
+                }
+                auto currentLevel = CurrentUpgrade(UPG_NUTS);
+                auto newLevel = currentLevel + (!state ? -1 : 1);
+                if (currentLevel == 0 && state || currentLevel == 1 && !state) {
+                    SetInventory(ITEM_NUT, (!state ? ITEM_NONE : ITEM_NUT));
+                }
+                SetUpgrade(UPG_NUTS, newLevel);
+            }   break;
+            case RG_PROGRESSIVE_STICK_UPGRADE:
+            {
+                auto realGI = item.GetGIEntry();
+                if (realGI->itemId == RG_STICK_UPGRADE_INF && realGI->modIndex == MOD_RANDOMIZER) {
+                    SetRandoInf(RAND_INF_HAS_INFINITE_STICK_UPGRADE, true);
+                    break;
+                }
+                auto currentLevel = CurrentUpgrade(UPG_STICKS);
+                auto newLevel = currentLevel + (!state ? -1 : 1);
+                if (currentLevel == 0 && state || currentLevel == 1 && !state) {
+                    SetInventory(ITEM_STICK, (!state ? ITEM_NONE : ITEM_STICK));
+                }
+                SetUpgrade(UPG_STICKS, newLevel);
+            }   break;
+            case RG_PROGRESSIVE_BOMBCHUS:
+            {
+                auto realGI = item.GetGIEntry();
+                if (realGI->itemId == RG_BOMBCHU_INF && realGI->modIndex == MOD_RANDOMIZER) {
+                    SetRandoInf(RAND_INF_HAS_INFINITE_BOMBCHUS, true);
+                    break;
+                }
+                SetInventory(ITEM_BOMBCHU, (!state ? ITEM_NONE : ITEM_BOMBCHU));
+            } break;
+            case RG_PROGRESSIVE_MAGIC_METER:
+            {
+                auto realGI = item.GetGIEntry();
+                if (realGI->itemId == RG_MAGIC_INF && realGI->modIndex == MOD_RANDOMIZER) {
+                    SetRandoInf(RAND_INF_HAS_INFINITE_MAGIC_METER, true);
+                    break;
+                }
+                mSaveContext->magicLevel += (!state ? -1 : 1);
+            } break;
+            case RG_PROGRESSIVE_OCARINA:
+            {
+                uint8_t i;
+                for (i = 0; i < 3; i++) {
+                    if (CurrentInventory(ITEM_OCARINA_FAIRY) == OcarinaLookup[i]) {
+                        break;
+                    }
+                }
+                i += (!state ? -1 : 1);
+                if (i < 0) {
+                    i = 0;
+                }
+                else if (i > 2) {
+                    i = 2;
+                }
+                SetInventory(ITEM_OCARINA_FAIRY, OcarinaLookup[i]);
+            }   break;
+            case RG_HEART_CONTAINER:
+                mSaveContext->healthCapacity += (!state ? -16 : 16);
+                break;
+            case RG_PIECE_OF_HEART:
+                mSaveContext->healthCapacity += (!state ? -4 : 4);
+                break;
+            case RG_BOOMERANG:
+            case RG_LENS_OF_TRUTH:
+            case RG_MEGATON_HAMMER:
+            case RG_DINS_FIRE:
+            case RG_FARORES_WIND:
+            case RG_NAYRUS_LOVE:
+            case RG_FIRE_ARROWS:
+            case RG_ICE_ARROWS:
+            case RG_LIGHT_ARROWS:
+                SetInventory(item.GetGIEntry()->itemId, (!state ? ITEM_NONE : item.GetGIEntry()->itemId));
+                break;
+            case RG_MAGIC_BEAN:
+            case RG_MAGIC_BEAN_PACK:
+            {
+                auto change = (item.GetRandomizerGet() == RG_MAGIC_BEAN ? 1 : 10);
+                auto current = GetAmmo(ITEM_BEAN);
+                SetAmmo(ITEM_BEAN, current + (!state ? -change : change));
+            }   break;
+            case RG_EMPTY_BOTTLE:
+            case RG_BOTTLE_WITH_MILK:
+            case RG_BOTTLE_WITH_RED_POTION:
+            case RG_BOTTLE_WITH_GREEN_POTION:
+            case RG_BOTTLE_WITH_BLUE_POTION:
+            case RG_BOTTLE_WITH_FAIRY:
+            case RG_BOTTLE_WITH_FISH:
+            case RG_BOTTLE_WITH_BLUE_FIRE:
+            case RG_BOTTLE_WITH_BUGS:
+            case RG_BOTTLE_WITH_POE:
+            case RG_BOTTLE_WITH_BIG_POE:
+            {
+                uint8_t slot = SLOT_BOTTLE_1;
+                while (slot != SLOT_BOTTLE_4) {
+                    if (mSaveContext->inventory.items[slot] == ITEM_NONE) {
+                        break;
+                    }
+                    slot++;
+                }
+                mSaveContext->inventory.items[slot] = item.GetGIEntry()->itemId;
+            }   break;
+            case RG_RUTOS_LETTER:
+                SetEventChkInf(EVENTCHKINF_OBTAINED_RUTOS_LETTER, state);
+                break;
+            case RG_GOHMA_SOUL:
+            case RG_KING_DODONGO_SOUL:
+            case RG_BARINADE_SOUL:
+            case RG_PHANTOM_GANON_SOUL:
+            case RG_VOLVAGIA_SOUL:
+            case RG_MORPHA_SOUL:
+            case RG_BONGO_BONGO_SOUL:
+            case RG_TWINROVA_SOUL:
+            case RG_GANON_SOUL:
+            case RG_OCARINA_A_BUTTON:
+            case RG_OCARINA_C_UP_BUTTON:
+            case RG_OCARINA_C_DOWN_BUTTON:
+            case RG_OCARINA_C_LEFT_BUTTON:
+            case RG_OCARINA_C_RIGHT_BUTTON:
+            case RG_GREG_RUPEE:
+            case RG_FISHING_POLE:
+                SetRandoInf(RandoGetToRandInf.at(randoGet), state);
+                break;
+            case RG_TRIFORCE_PIECE:
+                mSaveContext->triforcePiecesCollected += (!state ? -1 : 1);
+                break;
+            case RG_BOMBCHU_5:
+            case RG_BOMBCHU_10:
+            case RG_BOMBCHU_20:
+                SetInventory(ITEM_BOMBCHU, (!state ? ITEM_NONE : ITEM_BOMBCHU));
+                break;
+            }
+        }
+        break;
+        case ITEMTYPE_EQUIP:
+        {
+            RandomizerGet itemRG = item.GetRandomizerGet();
+            if (itemRG == RG_GIANTS_KNIFE) {
+                return;
+            }
+            uint32_t equipId = RandoGetToEquipFlag.find(itemRG)->second;
+            if (!state) {
+                mSaveContext->inventory.equipment &= ~equipId;
+                if (equipId == EQUIP_FLAG_SWORD_BGS) {
+                    mSaveContext->bgsFlag = false;
+                }
+            }
+            else {
+                mSaveContext->inventory.equipment |= equipId;
+                if (equipId == EQUIP_FLAG_SWORD_BGS) {
+                    mSaveContext->bgsFlag = true;
+                }
+            }
+        }
+        break;
+        case ITEMTYPE_DUNGEONREWARD:
+        case ITEMTYPE_SONG:
+            SetQuestItem(RandoGetToQuestItem.find(item.GetRandomizerGet())->second, state);
+            break;
+        case ITEMTYPE_MAP:
+            SetDungeonItem(DUNGEON_MAP, RandoGetToDungeonScene.find(item.GetRandomizerGet())->second, state);
+            break;
+        case ITEMTYPE_COMPASS:
+            SetDungeonItem(DUNGEON_COMPASS, RandoGetToDungeonScene.find(item.GetRandomizerGet())->second, state);
+            break;
+        case ITEMTYPE_BOSSKEY:
+            SetDungeonItem(DUNGEON_KEY_BOSS, RandoGetToDungeonScene.find(item.GetRandomizerGet())->second, state);
+            break;
+        case ITEMTYPE_FORTRESS_SMALLKEY:
+        case ITEMTYPE_SMALLKEY:
+        {
+            auto randoGet = item.GetRandomizerGet();
+            auto keyring = randoGet >= RG_FOREST_TEMPLE_KEY_RING && randoGet <= RG_GANONS_CASTLE_KEY_RING;
+            auto dungeonIndex = RandoGetToDungeonScene.find(randoGet)->second;
+            auto count = GetSmallKeyCount(dungeonIndex);
+            if (!state) {
+                if (keyring) {
+                    count = 0;
+                }
+                else {
+                    count -= 1;
+                }
+            }
+            else {
+                if (keyring) {
+                    count = 10;
+                }
+                else {
+                    count += 1;
+                }
+            }
+            SetSmallKeyCount(dungeonIndex, count);
+        } break;
+        case ITEMTYPE_TOKEN:
+            mSaveContext->inventory.gsTokens += (!state ? -1 : 1);
+            break;
+        case ITEMTYPE_EVENT:
+            break;
+        case ITEMTYPE_DROP:
+        case ITEMTYPE_REFILL:
+        case ITEMTYPE_SHOP:
+        {
+            RandomizerGet itemRG = item.GetRandomizerGet();
+            if (itemRG == RG_BUY_HYLIAN_SHIELD || itemRG == RG_BUY_DEKU_SHIELD || itemRG == RG_BUY_GORON_TUNIC || itemRG == RG_BUY_ZORA_TUNIC) {
+                uint32_t equipId = RandoGetToEquipFlag.find(itemRG)->second;
+                if (!state) {
+                    mSaveContext->inventory.equipment &= ~equipId;
+                }
+                else {
+                    mSaveContext->inventory.equipment |= equipId;
+                }
+            }
+            switch (itemRG) {
+            case RG_DEKU_NUTS_5:
+            case RG_DEKU_NUTS_10:
+            case RG_BUY_DEKU_NUTS_5:
+            case RG_BUY_DEKU_NUTS_10:
+                SetInventory(ITEM_NUT, (!state ? ITEM_NONE : ITEM_NUT));
+                break;
+            case RG_DEKU_STICK_1:
+            case RG_BUY_DEKU_STICK_1:
+            case RG_STICKS:
+                SetInventory(ITEM_STICK, (!state ? ITEM_NONE : ITEM_STICK));
+                break;
+            case RG_BOMBCHU_5:
+            case RG_BOMBCHU_10:
+            case RG_BOMBCHU_20:
+                SetInventory(ITEM_BOMBCHU, (!state ? ITEM_NONE : ITEM_BOMBCHU));
+                break;
+            }
+        } break;
+        }
+        UpdateHelpers();
+    }
+
+    SaveContext* Logic::GetSaveContext() {
+        if (mSaveContext == nullptr) {
+            NewSaveContext();
+        }
+        return mSaveContext;
+    }
+
+    void Logic::SetSaveContext(SaveContext* context) {
+        mSaveContext = context;
+    }
+
+    void Logic::InitSaveContext() {
+        mSaveContext->totalDays = 0;
+        mSaveContext->bgsDayCount = 0;
+
+        mSaveContext->deaths = 0;
+        for (int i = 0; i < ARRAY_COUNT(mSaveContext->playerName); i++) {
+            mSaveContext->playerName[i] = 0x3E;
+        }
+        mSaveContext->n64ddFlag = 0;
+        mSaveContext->healthCapacity = 0x30;
+        mSaveContext->health = 0x30;
+        mSaveContext->magicLevel = 0;
+        mSaveContext->magic = 0x30;
+        mSaveContext->rupees = 0;
+        mSaveContext->swordHealth = 0;
+        mSaveContext->naviTimer = 0;
+        mSaveContext->isMagicAcquired = 0;
+        mSaveContext->isDoubleMagicAcquired = 0;
+        mSaveContext->isDoubleDefenseAcquired = 0;
+        mSaveContext->bgsFlag = 0;
+        mSaveContext->ocarinaGameRoundNum = 0;
+        for (int button = 0; button < ARRAY_COUNT(mSaveContext->childEquips.buttonItems); button++) {
+            mSaveContext->childEquips.buttonItems[button] = ITEM_NONE;
+        }
+        for (int button = 0; button < ARRAY_COUNT(mSaveContext->childEquips.cButtonSlots); button++) {
+            mSaveContext->childEquips.cButtonSlots[button] = SLOT_NONE;
+        }
+        mSaveContext->childEquips.equipment = 0;
+        for (int button = 0; button < ARRAY_COUNT(mSaveContext->adultEquips.buttonItems); button++) {
+            mSaveContext->adultEquips.buttonItems[button] = ITEM_NONE;
+        }
+        for (int button = 0; button < ARRAY_COUNT(mSaveContext->adultEquips.cButtonSlots); button++) {
+            mSaveContext->adultEquips.cButtonSlots[button] = SLOT_NONE;
+        }
+        mSaveContext->adultEquips.equipment = 0;
+        mSaveContext->unk_54 = 0;
+        mSaveContext->savedSceneNum = SCENE_LINKS_HOUSE;
+
+        // Equipment
+        for (int button = 0; button < ARRAY_COUNT(mSaveContext->equips.buttonItems); button++) {
+            mSaveContext->equips.buttonItems[button] = ITEM_NONE;
+        }
+        for (int button = 0; button < ARRAY_COUNT(mSaveContext->equips.cButtonSlots); button++) {
+            mSaveContext->equips.cButtonSlots[button] = SLOT_NONE;
+        }
+        mSaveContext->equips.equipment = 0;
+
+        // Inventory
+        for (int item = 0; item < ARRAY_COUNT(mSaveContext->inventory.items); item++) {
+            mSaveContext->inventory.items[item] = ITEM_NONE;
+        }
+        for (int ammo = 0; ammo < ARRAY_COUNT(mSaveContext->inventory.ammo); ammo++) {
+            mSaveContext->inventory.ammo[ammo] = 0;
+        }
+        mSaveContext->inventory.equipment = 0;
+        mSaveContext->inventory.upgrades = 0;
+        mSaveContext->inventory.questItems = 0;
+        for (int dungeon = 0; dungeon < ARRAY_COUNT(mSaveContext->inventory.dungeonItems); dungeon++) {
+            mSaveContext->inventory.dungeonItems[dungeon] = 0;
+        }
+        for (int dungeon = 0; dungeon < ARRAY_COUNT(mSaveContext->inventory.dungeonKeys); dungeon++) {
+            mSaveContext->inventory.dungeonKeys[dungeon] = 0x0;
+        }
+        mSaveContext->inventory.defenseHearts = 0;
+        mSaveContext->inventory.gsTokens = 0;
+        for (int scene = 0; scene < ARRAY_COUNT(mSaveContext->sceneFlags); scene++) {
+            mSaveContext->sceneFlags[scene].chest = 0;
+            mSaveContext->sceneFlags[scene].swch = 0;
+            mSaveContext->sceneFlags[scene].clear = 0;
+            mSaveContext->sceneFlags[scene].collect = 0;
+            mSaveContext->sceneFlags[scene].unk = 0;
+            mSaveContext->sceneFlags[scene].rooms = 0;
+            mSaveContext->sceneFlags[scene].floors = 0;
+        }
+        mSaveContext->fw.pos.x = 0;
+        mSaveContext->fw.pos.y = 0;
+        mSaveContext->fw.pos.z = 0;
+        mSaveContext->fw.yaw = 0;
+        mSaveContext->fw.playerParams = 0;
+        mSaveContext->fw.entranceIndex = 0;
+        mSaveContext->fw.roomIndex = 0;
+        mSaveContext->fw.set = 0;
+        mSaveContext->fw.tempSwchFlags = 0;
+        mSaveContext->fw.tempCollectFlags = 0;
+        for (int flag = 0; flag < ARRAY_COUNT(mSaveContext->gsFlags); flag++) {
+            mSaveContext->gsFlags[flag] = 0;
+        }
+        for (int highscore = 0; highscore < ARRAY_COUNT(mSaveContext->highScores); highscore++) {
+            mSaveContext->highScores[highscore] = 0;
+        }
+        for (int flag = 0; flag < ARRAY_COUNT(mSaveContext->eventChkInf); flag++) {
+            mSaveContext->eventChkInf[flag] = 0;
+        }
+        for (int flag = 0; flag < ARRAY_COUNT(mSaveContext->itemGetInf); flag++) {
+            mSaveContext->itemGetInf[flag] = 0;
+        }
+        for (int flag = 0; flag < ARRAY_COUNT(mSaveContext->infTable); flag++) {
+            mSaveContext->infTable[flag] = 0;
+        }
+        mSaveContext->worldMapAreaData = 0;
+        mSaveContext->scarecrowLongSongSet = 0;
+        for (int i = 0; i < ARRAY_COUNT(mSaveContext->scarecrowLongSong); i++) {
+            mSaveContext->scarecrowLongSong[i].noteIdx = 0;
+            mSaveContext->scarecrowLongSong[i].unk_01 = 0;
+            mSaveContext->scarecrowLongSong[i].unk_02 = 0;
+            mSaveContext->scarecrowLongSong[i].volume = 0;
+            mSaveContext->scarecrowLongSong[i].vibrato = 0;
+            mSaveContext->scarecrowLongSong[i].tone = 0;
+            mSaveContext->scarecrowLongSong[i].semitone = 0;
+        }
+        mSaveContext->scarecrowSpawnSongSet = 0;
+        for (int i = 0; i < ARRAY_COUNT(mSaveContext->scarecrowSpawnSong); i++) {
+            mSaveContext->scarecrowSpawnSong[i].noteIdx = 0;
+            mSaveContext->scarecrowSpawnSong[i].unk_01 = 0;
+            mSaveContext->scarecrowSpawnSong[i].unk_02 = 0;
+            mSaveContext->scarecrowSpawnSong[i].volume = 0;
+            mSaveContext->scarecrowSpawnSong[i].vibrato = 0;
+            mSaveContext->scarecrowSpawnSong[i].tone = 0;
+            mSaveContext->scarecrowSpawnSong[i].semitone = 0;
+        }
+
+        mSaveContext->horseData.scene = SCENE_HYRULE_FIELD;
+        mSaveContext->horseData.pos.x = -1840;
+        mSaveContext->horseData.pos.y = 72;
+        mSaveContext->horseData.pos.z = 5497;
+        mSaveContext->horseData.angle = -0x6AD9;
+        mSaveContext->magicLevel = 0;
+        mSaveContext->infTable[29] = 1;
+        mSaveContext->sceneFlags[5].swch = 0x40000000;
+
+        // SoH specific
+        mSaveContext->backupFW = mSaveContext->fw;
+        mSaveContext->pendingSale = ITEM_NONE;
+        mSaveContext->pendingSaleMod = MOD_NONE;
+        mSaveContext->isBossRushPaused = 0;
+        mSaveContext->pendingIceTrapCount = 0;
+
+        // Init with normal quest unless only an MQ rom is provided
+        mSaveContext->questId = OTRGlobals::Instance->HasOriginal() ? QUEST_NORMAL : QUEST_MASTER;
+
+        //RANDOTODO (ADD ITEMLOCATIONS TO GSAVECONTEXT)
+    }
+
+    void Logic::NewSaveContext() {
+        if (mSaveContext != nullptr && mSaveContext != &gSaveContext) {
+            free(mSaveContext);
+        }
+        mSaveContext = new SaveContext();
+        InitSaveContext();
+    }
+
+    uint8_t Logic::InventorySlot(uint32_t item) {
+        return gItemSlots[item];
+    }
+
+    uint32_t Logic::CurrentUpgrade(uint32_t upgrade) {
+        return (mSaveContext->inventory.upgrades & gUpgradeMasks[upgrade]) >> gUpgradeShifts[upgrade];
+    }
+
+    uint32_t Logic::CurrentInventory(uint32_t item) {
+        return mSaveContext->inventory.items[InventorySlot(item)];
+    }
+
+    void Logic::SetUpgrade(uint32_t upgrade, uint8_t level) {
+        mSaveContext->inventory.upgrades &= gUpgradeNegMasks[upgrade];
+        mSaveContext->inventory.upgrades |= level << gUpgradeShifts[upgrade];
+    }
+
+    bool Logic::CheckInventory(uint32_t item, bool exact) {
+        auto current = mSaveContext->inventory.items[InventorySlot(item)];
+        return exact ? (current == item) : (current != ITEM_NONE);
+    }
+
+    void Logic::SetInventory(uint32_t itemSlot, uint32_t item) {
+        mSaveContext->inventory.items[InventorySlot(itemSlot)] = item;
+    }
+
+    bool Logic::CheckEquipment(uint32_t equipFlag) {
+        return (equipFlag & mSaveContext->inventory.equipment);
+    }
+
+    bool Logic::CheckQuestItem(uint32_t item) {
+        return ((1 << item) & mSaveContext->inventory.questItems);
+    }
+
+    bool Logic::HasAdultTrade(uint32_t itemID) {
+        int tradeIndex = itemID - ITEM_POCKET_EGG;
+        return mSaveContext->adultTradeItems & (1 << tradeIndex);
+    }
+
+    void Logic::SetAdultTrade(uint32_t itemID, bool state) {
+        int tradeIndex = itemID - ITEM_POCKET_EGG;
+        if (!state) {
+            mSaveContext->adultTradeItems &= ~(1 << tradeIndex);
+        }
+        else {
+            mSaveContext->adultTradeItems |= (1 << tradeIndex);
+        }
+    }
+
+    void Logic::SetQuestItem(uint32_t item, bool state) {
+        if (!state) {
+            mSaveContext->inventory.questItems &= ~(1 << item);
+        }
+        else {
+            mSaveContext->inventory.questItems |= (1 << item);
+        }
+    }
+
+    uint8_t Logic::GetSmallKeyCount(uint32_t dungeonIndex) {
+        return mSaveContext->inventory.dungeonKeys[dungeonIndex];
+    }
+
+    void Logic::SetSmallKeyCount(uint32_t dungeonIndex, uint8_t count) {
+        mSaveContext->inventory.dungeonKeys[dungeonIndex] = count;
+    }
+
+    bool Logic::CheckDungeonItem(uint32_t item, uint32_t dungeonIndex) {
+        return mSaveContext->inventory.dungeonItems[dungeonIndex] & gBitFlags[item];
+    }
+
+    void Logic::SetDungeonItem(uint32_t item, uint32_t dungeonIndex, bool state) {
+        if (!state) {
+            mSaveContext->inventory.dungeonItems[dungeonIndex] &= ~gBitFlags[item];
+        }
+        else {
+            mSaveContext->inventory.dungeonItems[dungeonIndex] |= gBitFlags[item];
+        }
+    }
+
+    bool Logic::CheckRandoInf(uint32_t flag) {
+        return mSaveContext->randomizerInf[flag >> 4] & (1 << (flag & 0xF));
+    }
+
+    void Logic::SetRandoInf(uint32_t flag, bool state) {
+        if (!state) {
+            mSaveContext->randomizerInf[flag >> 4] &= ~(1 << (flag & 0xF));
+        }
+        else {
+            mSaveContext->randomizerInf[flag >> 4] |= (1 << (flag & 0xF));
+        }
+    }
+
+    bool Logic::CheckEventChkInf(int32_t flag) {
+        return mSaveContext->eventChkInf[flag >> 4] & (1 << (flag & 0xF));
+    }
+
+    void Logic::SetEventChkInf(int32_t flag, bool state) {
+        if (!state) {
+            mSaveContext->eventChkInf[flag >> 4] &= ~(1 << (flag & 0xF));
+        }
+        else {
+            mSaveContext->eventChkInf[flag >> 4] |= (1 << (flag & 0xF));
+        }
+    }
+
+    uint8_t Logic::GetGSCount() {
+        return mSaveContext->inventory.gsTokens;
+    }
+
+    uint8_t Logic::GetAmmo(uint32_t item) {
+        return mSaveContext->inventory.ammo[gItemSlots[item]];
+    }
+
+    void Logic::SetAmmo(uint32_t item, uint8_t count) {
+        mSaveContext->inventory.ammo[gItemSlots[item]] = count;
+    }
+
     void Logic::SetContext(std::shared_ptr<Context> _ctx) {
         ctx = _ctx;
     }
@@ -778,7 +1552,7 @@ namespace Rando {
     }
 
     void Logic::Reset() {
-        ctx->NewSaveContext();
+        NewSaveContext();
         StartPerformanceTimer(PT_LOGIC_RESET);
         memset(inLogic, false, sizeof(inLogic));
         //Settings-dependent variables
@@ -879,15 +1653,15 @@ namespace Rando {
 
         //Ocarina C Buttons
         bool ocBtnShuffle = ctx->GetOption(RSK_SHUFFLE_OCARINA_BUTTONS).Is(true);
-        ctx->SetRandoInf(RAND_INF_HAS_OCARINA_A, !ocBtnShuffle);
-        ctx->SetRandoInf(RAND_INF_HAS_OCARINA_C_UP, !ocBtnShuffle);
-        ctx->SetRandoInf(RAND_INF_HAS_OCARINA_C_DOWN, !ocBtnShuffle);
-        ctx->SetRandoInf(RAND_INF_HAS_OCARINA_C_LEFT, !ocBtnShuffle);
-        ctx->SetRandoInf(RAND_INF_HAS_OCARINA_C_RIGHT, !ocBtnShuffle);
+        SetRandoInf(RAND_INF_HAS_OCARINA_A, !ocBtnShuffle);
+        SetRandoInf(RAND_INF_HAS_OCARINA_C_UP, !ocBtnShuffle);
+        SetRandoInf(RAND_INF_HAS_OCARINA_C_DOWN, !ocBtnShuffle);
+        SetRandoInf(RAND_INF_HAS_OCARINA_C_LEFT, !ocBtnShuffle);
+        SetRandoInf(RAND_INF_HAS_OCARINA_C_RIGHT, !ocBtnShuffle);
 
         //Progressive Items
-        ctx->SetUpgrade(UPG_STICKS, ctx->GetOption(RSK_SHUFFLE_DEKU_STICK_BAG).Is(true) ? 0 : 1);
-        ctx->SetUpgrade(UPG_NUTS, ctx->GetOption(RSK_SHUFFLE_DEKU_NUT_BAG).Is(true) ? 0 : 1);
+        SetUpgrade(UPG_STICKS, ctx->GetOption(RSK_SHUFFLE_DEKU_STICK_BAG).Is(true) ? 0 : 1);
+        SetUpgrade(UPG_NUTS, ctx->GetOption(RSK_SHUFFLE_DEKU_NUT_BAG).Is(true) ? 0 : 1);
         ProgressiveBulletBag  = 0;
         ProgressiveBombBag    = 0;
         ProgressiveMagic      = 0;
@@ -895,7 +1669,7 @@ namespace Rando {
         ProgressiveScale = 0;
         if (ctx->GetOption(RSK_SHUFFLE_SWIM).Is(false)) {
             ProgressiveScale = 1;
-            ctx->SetRandoInf(RAND_INF_CAN_SWIM, true);
+            SetRandoInf(RAND_INF_CAN_SWIM, true);
         }
         ProgressiveHookshot   = 0;
         ProgressiveBow        = 0;
@@ -903,7 +1677,7 @@ namespace Rando {
         ProgressiveWallet = 0;
         if (ctx->GetOption(RSK_SHUFFLE_CHILD_WALLET).Is(false)) {
             ProgressiveWallet = 1;
-            ctx->SetRandoInf(RAND_INF_HAS_WALLET, true);
+            SetRandoInf(RAND_INF_HAS_WALLET, true);
         }
         ProgressiveStrength   = 0;
         ProgressiveOcarina    = 0;
@@ -911,7 +1685,7 @@ namespace Rando {
 
         //If not keysanity, start with 1 logical key to account for automatically unlocking the basement door in vanilla FiT
         if (!IsKeysanity && ctx->GetDungeon(Rando::FIRE_TEMPLE)->IsVanilla()) {
-            ctx->SetSmallKeyCount(SCENE_FIRE_TEMPLE, 1);
+            SetSmallKeyCount(SCENE_FIRE_TEMPLE, 1);
         }
 
         //Boss Keys
@@ -1077,7 +1851,7 @@ namespace Rando {
         AtDay         = false;
         AtNight       = false;
         Age           = ctx->GetSettings()->ResolvedStartingAge();
-        ctx->GetSaveContext()->linkAge = !Age;
+        GetSaveContext()->linkAge = !Age;
 
         //Events
         ShowedMidoSwordAndShield  = false;
diff --git a/soh/soh/Enhancements/randomizer/logic.h b/soh/soh/Enhancements/randomizer/logic.h
index d5de5f899..89cb25927 100644
--- a/soh/soh/Enhancements/randomizer/logic.h
+++ b/soh/soh/Enhancements/randomizer/logic.h
@@ -387,7 +387,7 @@ class Logic {
     bool BuyDekuShieldPast = false;
     bool TimeTravelPast = false;
 
-    SaveContext* mSaveContext;
+    SaveContext* mSaveContext = nullptr;
     Logic();
     void UpdateHelpers();
     bool CanUse(RandomizerGet itemName);
@@ -406,6 +406,37 @@ class Logic {
     void SetContext(std::shared_ptr<Context> _ctx);
     bool GetInLogic(LogicVal logicVal);
     void SetInLogic(LogicVal logicVal, bool remove);
+    void ApplyItemEffect(Item& item, bool state);
+    uint8_t InventorySlot(uint32_t item);
+    void SetUpgrade(uint32_t upgrade, uint8_t level);
+    uint32_t CurrentUpgrade(uint32_t upgrade);
+    uint32_t CurrentInventory(uint32_t item);
+    bool CheckInventory(uint32_t item, bool exact);
+    void SetInventory(uint32_t itemSlot, uint32_t item);
+    bool CheckEquipment(uint32_t item);
+    bool CheckQuestItem(uint32_t item);
+    void SetQuestItem(uint32_t item, bool state);
+    bool HasAdultTrade(uint32_t item);
+    void SetAdultTrade(uint32_t item, bool state);
+    uint8_t GetSmallKeyCount(uint32_t dungeonIndex);
+    void SetSmallKeyCount(uint32_t dungeonIndex, uint8_t count);
+    bool CheckDungeonItem(uint32_t item, uint32_t dungeonIndex);
+    void SetDungeonItem(uint32_t item, uint32_t dungeonIndex, bool state);
+    bool CheckRandoInf(uint32_t flag);
+    void SetRandoInf(uint32_t flag, bool state);
+    bool CheckEventChkInf(int32_t flag);
+    uint8_t GetGSCount();
+    void SetEventChkInf(int32_t flag, bool state);
+    uint8_t GetAmmo(uint32_t item);
+    void SetAmmo(uint32_t item, uint8_t count);
+    SaveContext* GetSaveContext();
+    void SetSaveContext(SaveContext* context);
+    void InitSaveContext();
+    void NewSaveContext();
+    static std::map<uint32_t, uint32_t> RandoGetToQuestItem;
+    static std::map<uint32_t, uint32_t> RandoGetToDungeonScene;
+    static std::map<RandomizerGet, uint32_t> RandoGetToEquipFlag;
+    static std::map<RandomizerGet, uint32_t> RandoGetToRandInf;
 
   private:
     static bool IsMagicItem(RandomizerGet item);
diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
index fa67fd1eb..9a19acde3 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
@@ -887,7 +887,7 @@ void CheckTrackerWindow::DrawElement() {
         return;
     }
 
-    AreaTable_Init();
+    RegionTable_Init();
 
     ImGui::TableNextRow(0, headerHeight);
     ImGui::TableNextColumn();
diff --git a/soh/soh/SaveManager.cpp b/soh/soh/SaveManager.cpp
index 10e3a694b..faded27e3 100644
--- a/soh/soh/SaveManager.cpp
+++ b/soh/soh/SaveManager.cpp
@@ -2843,7 +2843,7 @@ extern "C" void Save_LoadFile(void) {
         // Reset rando context for rando saves.
         OTRGlobals::Instance->gRandoContext.reset();
         OTRGlobals::Instance->gRandoContext = Rando::Context::CreateInstance();
-        OTRGlobals::Instance->gRandoContext->SetSaveContext(&gSaveContext);
+        OTRGlobals::Instance->gRandoContext->GetLogic()->SetSaveContext(&gSaveContext);
         OTRGlobals::Instance->gRandoContext->AddExcludedOptions();
         OTRGlobals::Instance->gRandoContext->GetSettings()->CreateOptions();
     }

From 4e4c1c4f8aab5d486ce622b1c990f4d5fd9caa92 Mon Sep 17 00:00:00 2001
From: Garrett Cox <garrettjcox@gmail.com>
Date: Tue, 24 Sep 2024 12:56:56 -0500
Subject: [PATCH 205/230] Handle ignoring 0x3F for navi talk skips (#4364)

---
 soh/soh/Enhancements/timesaver_hook_handlers.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/soh/soh/Enhancements/timesaver_hook_handlers.cpp b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
index 0682f4de1..77910d687 100644
--- a/soh/soh/Enhancements/timesaver_hook_handlers.cpp
+++ b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
@@ -317,9 +317,11 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
         case VB_NAVI_TALK: {
             if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.NoForcedDialog"), IS_RANDO)) {
                 ElfMsg* naviTalk = static_cast<ElfMsg*>(opt);
-                Flags_SetSwitch(gPlayState, (naviTalk->actor.params >> 8) & 0x3F);
-                Actor_Kill(&naviTalk->actor);
-                *should = false;
+                if (((naviTalk->actor.params >> 8) & 0x3F) != 0x3F) {
+                    Flags_SetSwitch(gPlayState, (naviTalk->actor.params >> 8) & 0x3F);
+                    Actor_Kill(&naviTalk->actor);
+                    *should = false;
+                }
             }
             break;
         }

From 7810f7505a2294d5746d2d368a3352e6ef1308ed Mon Sep 17 00:00:00 2001
From: skrawpie <21212370+skrawpie@users.noreply.github.com>
Date: Tue, 24 Sep 2024 13:57:16 -0400
Subject: [PATCH 206/230] Update settings.cpp (#4362)

100 GS Reward was missing from RSK_GANONS_BOSS_KEY causing indexing issues. Notably, Triforce Hunt was setting Ganon's Boss Key to "Vanilla" rather than "Triforce Hunt."
---
 soh/soh/Enhancements/randomizer/settings.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
index f3f860800..fd24a77f8 100644
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -129,7 +129,7 @@ void Settings::CreateOptions() {
     mOptions[RSK_KEYSANITY] = Option::U8("Small Keys", {"Start With", "Vanilla", "Own Dungeon", "Any Dungeon", "Overworld", "Anywhere"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("Keysanity"), mOptionDescriptions[RSK_KEYSANITY], WidgetType::Combobox, RO_DUNGEON_ITEM_LOC_OWN_DUNGEON);
     mOptions[RSK_GERUDO_KEYS] = Option::U8("Gerudo Fortress Keys", {"Vanilla", "Any Dungeon", "Overworld", "Anywhere"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("GerudoKeys"), mOptionDescriptions[RSK_GERUDO_KEYS], WidgetType::Combobox, RO_GERUDO_KEYS_VANILLA);
     mOptions[RSK_BOSS_KEYSANITY] = Option::U8("Boss Keys", {"Start With", "Vanilla", "Own Dungeon", "Any Dungeon", "Overworld", "Anywhere"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("BossKeysanity"), mOptionDescriptions[RSK_BOSS_KEYSANITY], WidgetType::Combobox, RO_DUNGEON_ITEM_LOC_OWN_DUNGEON);
-    mOptions[RSK_GANONS_BOSS_KEY] = Option::U8("Ganon's Boss Key", {"Vanilla", "Own Dungeon", "Start With", "Any Dungeon", "Overworld", "Anywhere", "LACS-Vanilla", "LACS-Stones", "LACS-Medallions", "LACS-Rewards", "LACS-Dungeons", "LACS-Tokens", "Triforce Hunt"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleGanonBossKey"), mOptionDescriptions[RSK_GANONS_BOSS_KEY], WidgetType::Combobox, RO_GANON_BOSS_KEY_VANILLA);
+    mOptions[RSK_GANONS_BOSS_KEY] = Option::U8("Ganon's Boss Key", {"Vanilla", "Own Dungeon", "Start With", "Any Dungeon", "Overworld", "Anywhere", "LACS-Vanilla", "LACS-Stones", "LACS-Medallions", "LACS-Rewards", "LACS-Dungeons", "LACS-Tokens", "100 GS Reward", "Triforce Hunt"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleGanonBossKey"), mOptionDescriptions[RSK_GANONS_BOSS_KEY], WidgetType::Combobox, RO_GANON_BOSS_KEY_VANILLA);
     mOptions[RSK_LACS_STONE_COUNT] = Option::U8("Stone Count", {NumOpts(0, 4)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("LacsStoneCount"), "", WidgetType::Slider, 3, true);
     mOptions[RSK_LACS_MEDALLION_COUNT] = Option::U8("Medallion Count", {NumOpts(0, 7)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("LacsMedallionCount"), "", WidgetType::Slider, 6, true);
     mOptions[RSK_LACS_REWARD_COUNT] = Option::U8("Reward Count", {NumOpts(0, 10)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("LacsRewardCount"), "", WidgetType::Slider, 9, true);
@@ -2770,4 +2770,4 @@ void Settings::ParseJson(nlohmann::json spoilerFileJson) {
         GetTrickOption(rt).SetSelectedIndex(RO_GENERIC_ON);
     }
 }
-} // namespace Rando
\ No newline at end of file
+} // namespace Rando

From b3b9216b5c01f37bcd8563beb9ca7f637acd880d Mon Sep 17 00:00:00 2001
From: Garrett Cox <garrettjcox@gmail.com>
Date: Wed, 25 Sep 2024 14:01:59 -0500
Subject: [PATCH 207/230] Show interface after item get (when skipping GI)
 (#4363)

---
 soh/soh/Enhancements/randomizer/hook_handlers.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index 552758443..eb7d30b87 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -790,6 +790,9 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
                         Randomizer_Item_Give(gPlayState, item00->itemEntry);
                     }
                 }
+                // This is typically called when you close the text box after getting an item, in case a previous
+                // function hid the interface.
+                Interface_ChangeAlpha(gSaveContext.unk_13EE);
                 // EnItem00_SetupAction(item00, func_8001E5C8);
                 // *should = false;
             } else if (item00->actor.params == ITEM00_SOH_GIVE_ITEM_ENTRY_GI) {

From da5cf114499f7acff78b69c5d69e2084074bfa69 Mon Sep 17 00:00:00 2001
From: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>
Date: Fri, 27 Sep 2024 01:26:12 +0200
Subject: [PATCH 208/230] Hook Debugger (#4323)

* Initial implementation

* Add call number & relax source_location requirement

* Update hookDebugger.cpp
---
 .../Enhancements/debugger/hookDebugger.cpp    | 111 ++++++++++++
 soh/soh/Enhancements/debugger/hookDebugger.h  |  10 ++
 .../game-interactor/GameInteractor.h          | 164 +++++++++++-------
 .../GameInteractor_HookTable.h                |  57 ++++++
 soh/soh/SohGui.cpp                            |   4 +
 soh/soh/SohGui.hpp                            |   1 +
 soh/soh/SohMenuBar.cpp                        |   8 +
 7 files changed, 294 insertions(+), 61 deletions(-)
 create mode 100644 soh/soh/Enhancements/debugger/hookDebugger.cpp
 create mode 100644 soh/soh/Enhancements/debugger/hookDebugger.h
 create mode 100644 soh/soh/Enhancements/game-interactor/GameInteractor_HookTable.h

diff --git a/soh/soh/Enhancements/debugger/hookDebugger.cpp b/soh/soh/Enhancements/debugger/hookDebugger.cpp
new file mode 100644
index 000000000..b31ddc396
--- /dev/null
+++ b/soh/soh/Enhancements/debugger/hookDebugger.cpp
@@ -0,0 +1,111 @@
+#include "hookDebugger.h"
+#include "../game-interactor/GameInteractor.h"
+#include "../../UIWidgets.hpp"
+#include <string>
+#include <version>
+
+static std::unordered_map<const char*, std::unordered_map<HOOK_ID, HookInfo>> hookData;
+
+const ImVec4 grey = ImVec4(0.75, 0.75, 0.75, 1);
+const ImVec4 yellow = ImVec4(1, 1, 0, 1);
+const ImVec4 red = ImVec4(1, 0, 0, 1);
+
+void DrawHookRegisteringInfos(const char* hookName) {
+    if (hookData[hookName].size() == 0) {
+        ImGui::TextColored(grey, "No hooks found");
+        return;
+    }
+
+    if (ImGui::BeginTable(
+        ("Table##" + std::string(hookName)).c_str(),
+        4,
+        ImGuiTableFlags_Resizable | ImGuiTableFlags_Reorderable | ImGuiTableFlags_Hideable | ImGuiTableFlags_Borders | ImGuiTableFlags_SizingFixedFit
+    )) {
+        ImGui::TableSetupColumn("Id");
+        ImGui::TableSetupColumn("Type");
+        ImGui::TableSetupColumn("Registration Info");
+        //ImGui::TableSetupColumn("Stub");
+        ImGui::TableSetupColumn("Number of Calls");
+        ImGui::TableHeadersRow();
+        for (auto& [id, hookInfo] : hookData[hookName]) {
+            ImGui::TableNextRow();
+
+            ImGui::TableNextColumn();
+            ImGui::Text("%d", id);
+
+            ImGui::TableNextColumn();
+            switch (hookInfo.registering.type) {
+                case HOOK_TYPE_NORMAL:
+                    ImGui::Text("Normal");
+                    break;
+                case HOOK_TYPE_ID:
+                    ImGui::Text("Id");
+                    break;
+                case HOOK_TYPE_PTR:
+                    ImGui::Text("Ptr");
+                    break;
+                case HOOK_TYPE_FILTER:
+                    ImGui::Text("Filter");
+                    break;
+                default:
+                    ImGui::TextColored(red, "[UNKNOWN]");
+                    break;
+            }
+
+            ImGui::TableNextColumn();
+            if (hookInfo.registering.valid) {
+                ImGui::Text("%s(%d:%d) %s", hookInfo.registering.file, hookInfo.registering.line, hookInfo.registering.column, hookInfo.registering.function);
+            } else {
+                ImGui::TextColored(yellow, "[Unavaliable]");
+            }
+
+            //TODO: not currently possible
+            /*
+            ImGui::TableNextColumn();
+
+            ImGui::BeginDisabled();
+
+            bool stubButtonPressed = ImGui::Button(("Stub##" + std::to_string(id)).c_str());
+            UIWidgets::SetLastItemHoverText("Stub this hook.\nThis is not possible to automatically undo.");
+
+            if (stubButtonPressed) {
+                //stub
+            }
+
+            ImGui::EndDisabled();
+            */
+
+            ImGui::TableNextColumn();
+            ImGui::Text("%d", hookInfo.calls);
+        }
+        ImGui::EndTable();
+    }
+}
+
+void HookDebuggerWindow::DrawElement() {
+#ifndef __cpp_lib_source_location
+    ImGui::TextColored(
+        yellow,
+        "Some features of the Hook Debugger are unavaliable because SoH was compiled "
+        "without \"<source_location>\" support "
+        "(\"__cpp_lib_source_location\" not defined in \"<version>\")."
+    );
+#endif
+
+    for (auto& [hookName, _] : hookData) {
+        if (ImGui::TreeNode(hookName)) {
+            DrawHookRegisteringInfos(hookName);
+            ImGui::TreePop();
+        }
+    }
+}
+
+void HookDebuggerWindow::UpdateElement() {
+    hookData.clear();
+
+    #define DEFINE_HOOK(name, _) hookData.insert({#name, GameInteractor::Instance->GetHookData<GameInteractor::name>()});
+
+    #include "../game-interactor/GameInteractor_HookTable.h"
+
+    #undef DEFINE_HOOK
+}
\ No newline at end of file
diff --git a/soh/soh/Enhancements/debugger/hookDebugger.h b/soh/soh/Enhancements/debugger/hookDebugger.h
new file mode 100644
index 000000000..90e6886b5
--- /dev/null
+++ b/soh/soh/Enhancements/debugger/hookDebugger.h
@@ -0,0 +1,10 @@
+#include <libultraship/libultraship.h>
+
+class HookDebuggerWindow : public Ship::GuiWindow {
+  public:
+    using GuiWindow::GuiWindow;
+
+    void InitElement() override {};
+    void DrawElement() override;
+    void UpdateElement() override;
+};
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h
index ce5a18b6e..f97fe9f26 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h
@@ -458,6 +458,12 @@ void GameInteractor_SetTriforceHuntCreditsWarpActive(uint8_t state);
 #include <vector>
 #include <functional>
 #include <string>
+#include <version>
+#ifdef __cpp_lib_source_location
+#include <source_location>
+#else
+#pragma message("Compiling without <source_location> support, the Hook Debugger will not be avaliable")
+#endif
 
 #ifdef ENABLE_REMOTE_CONTROL
 #include <SDL2/SDL_net.h>
@@ -466,11 +472,40 @@ void GameInteractor_SetTriforceHuntCreditsWarpActive(uint8_t state);
 
 typedef uint32_t HOOK_ID;
 
-#define DEFINE_HOOK(name, args)                  \
-    struct name {                                \
-        typedef std::function<void args> fn;     \
-        typedef std::function<bool args> filter; \
-    }
+enum HookType {
+    HOOK_TYPE_NORMAL,
+    HOOK_TYPE_ID,
+    HOOK_TYPE_PTR,
+    HOOK_TYPE_FILTER,
+};
+
+struct HookRegisteringInfo {
+    bool valid;
+    const char* file;
+    std::uint_least32_t line;
+    std::uint_least32_t column;
+    const char* function;
+    HookType type;
+
+    HookRegisteringInfo() : valid(false), file("unknown file"), line(0), column(0), function("unknown function"), type(HOOK_TYPE_NORMAL) {}
+
+    HookRegisteringInfo(const char* _file, std::uint_least32_t _line, std::uint_least32_t _column, const char* _function, HookType _type) :
+        valid(true), file(_file), line(_line), column(_column), function(_function), type(_type) {}
+};
+
+struct HookInfo {
+    uint32_t calls;
+    HookRegisteringInfo registering;
+
+    HookInfo() : calls(0), registering(HookRegisteringInfo{}) {}
+    HookInfo(HookRegisteringInfo _registering) : calls(0), registering(_registering) {}
+};
+
+#ifdef __cpp_lib_source_location
+#define GET_CURRENT_REGISTERING_INFO(type) HookRegisteringInfo{location.file_name(), location.line(), location.column(), location.function_name(), type}
+#else
+#define GET_CURRENT_REGISTERING_INFO(type) HookRegisteringInfo{}
+#endif
 
 #define REGISTER_VB_SHOULD(flag, body) \
     GameInteractor::Instance->RegisterGameHookForID<GameInteractor::OnVanillaBehavior>(flag, [](GIVanillaBehavior _, bool* should, void* opt) body)
@@ -479,7 +514,7 @@ class GameInteractor {
 public:
     static GameInteractor* Instance;
 
-    // Gsme State
+    // Game State
     class State {
     public:
         static bool NoUIActive;
@@ -532,7 +567,11 @@ public:
         inline static std::unordered_map<int32_t, std::unordered_map<HOOK_ID, typename H::fn>> functionsForID;
         inline static std::unordered_map<uintptr_t, std::unordered_map<HOOK_ID, typename H::fn>> functionsForPtr;
         inline static std::unordered_map<HOOK_ID, std::pair<typename H::filter, typename H::fn>> functionsForFilter;
+
+        //Used for the hook debugger
+        inline static std::unordered_map<HOOK_ID, HookInfo> hookData;
     };
+
     template <typename H> struct HooksToUnregister {
         inline static std::vector<HOOK_ID> hooks;
         inline static std::vector<HOOK_ID> hooksForID;
@@ -540,50 +579,74 @@ public:
         inline static std::vector<HOOK_ID> hooksForFilter;
     };
 
+    template <typename H> std::unordered_map<uint32_t, HookInfo> GetHookData() {
+        return RegisteredGameHooks<H>::hookData;
+    }
+
     // General Hooks
-    template <typename H> HOOK_ID RegisterGameHook(typename H::fn h) {
+    template <typename H> HOOK_ID RegisterGameHook(
+        typename H::fn h
+#ifdef __cpp_lib_source_location
+        , const std::source_location location = std::source_location::current()
+#endif
+    ) {
+        // Ensure hook id is unique and not 0, which is reserved for invalid hooks
         if (this->nextHookId == 0 || this->nextHookId >= UINT32_MAX) this->nextHookId = 1;
         while (RegisteredGameHooks<H>::functions.find(this->nextHookId) != RegisteredGameHooks<H>::functions.end()) {
             this->nextHookId++;
         }
 
         RegisteredGameHooks<H>::functions[this->nextHookId] = h;
+        RegisteredGameHooks<H>::hookData[this->nextHookId] = HookInfo{GET_CURRENT_REGISTERING_INFO(HOOK_TYPE_NORMAL)};
         return this->nextHookId++;
     }
+
     template <typename H> void UnregisterGameHook(HOOK_ID hookId) {
         if (hookId == 0) return;
         HooksToUnregister<H>::hooks.push_back(hookId);
     }
+
     template <typename H, typename... Args> void ExecuteHooks(Args&&... args) {
         for (auto& hookId : HooksToUnregister<H>::hooks) {
             RegisteredGameHooks<H>::functions.erase(hookId);
+            RegisteredGameHooks<H>::hookData.erase(hookId);
         }
         HooksToUnregister<H>::hooks.clear();
         for (auto& hook : RegisteredGameHooks<H>::functions) {
             hook.second(std::forward<Args>(args)...);
+            RegisteredGameHooks<H>::hookData[hook.first].calls += 1;
         }
     }
 
     // ID based Hooks
-    template <typename H> HOOK_ID RegisterGameHookForID(int32_t id, typename H::fn h) {
+    template <typename H> HOOK_ID RegisterGameHookForID(
+        int32_t id, typename H::fn h
+#ifdef __cpp_lib_source_location
+        , const std::source_location location = std::source_location::current()
+#endif
+    ) {
         if (this->nextHookId == 0 || this->nextHookId >= UINT32_MAX) this->nextHookId = 1;
         while (RegisteredGameHooks<H>::functionsForID[id].find(this->nextHookId) != RegisteredGameHooks<H>::functionsForID[id].end()) {
             this->nextHookId++;
         }
 
         RegisteredGameHooks<H>::functionsForID[id][this->nextHookId] = h;
+        RegisteredGameHooks<H>::hookData[this->nextHookId] = HookInfo{GET_CURRENT_REGISTERING_INFO(HOOK_TYPE_ID)};
         return this->nextHookId++;
     }
+
     template <typename H> void UnregisterGameHookForID(HOOK_ID hookId) {
         if (hookId == 0) return;
         HooksToUnregister<H>::hooksForID.push_back(hookId);
     }
+
     template <typename H, typename... Args> void ExecuteHooksForID(int32_t id, Args&&... args) {
         for (auto& hookId : HooksToUnregister<H>::hooksForID) {
             for (auto it = RegisteredGameHooks<H>::functionsForID[id].begin(); it != RegisteredGameHooks<H>::functionsForID[id].end(); ) {
                 if (it->first == hookId) {
                     it = RegisteredGameHooks<H>::functionsForID[id].erase(it);
                     HooksToUnregister<H>::hooksForID.erase(std::remove(HooksToUnregister<H>::hooksForID.begin(), HooksToUnregister<H>::hooksForID.end(), hookId), HooksToUnregister<H>::hooksForID.end());
+                    RegisteredGameHooks<H>::hookData.erase(hookId);
                 } else {
                     ++it;
                 }
@@ -591,29 +654,39 @@ public:
         }
         for (auto& hook : RegisteredGameHooks<H>::functionsForID[id]) {
             hook.second(std::forward<Args>(args)...);
+            RegisteredGameHooks<H>::hookData[hook.first].calls += 1;
         }
     }
 
     // PTR based Hooks
-    template <typename H> HOOK_ID RegisterGameHookForPtr(uintptr_t ptr, typename H::fn h) {
+    template <typename H> HOOK_ID RegisterGameHookForPtr(
+        uintptr_t ptr, typename H::fn h
+#ifdef __cpp_lib_source_location
+        , const std::source_location location = std::source_location::current()
+#endif
+    ) {
         if (this->nextHookId == 0 || this->nextHookId >= UINT32_MAX) this->nextHookId = 1;
         while (RegisteredGameHooks<H>::functionsForPtr[ptr].find(this->nextHookId) != RegisteredGameHooks<H>::functionsForPtr[ptr].end()) {
             this->nextHookId++;
         }
 
         RegisteredGameHooks<H>::functionsForPtr[ptr][this->nextHookId] = h;
+        RegisteredGameHooks<H>::hookData[this->nextHookId] = HookInfo{GET_CURRENT_REGISTERING_INFO(HOOK_TYPE_PTR)};
         return this->nextHookId++;
     }
+
     template <typename H> void UnregisterGameHookForPtr(HOOK_ID hookId) {
         if (hookId == 0) return;
         HooksToUnregister<H>::hooksForPtr.push_back(hookId);
     }
+
     template <typename H, typename... Args> void ExecuteHooksForPtr(uintptr_t ptr, Args&&... args) {
         for (auto& hookId : HooksToUnregister<H>::hooksForPtr) {
             for (auto it = RegisteredGameHooks<H>::functionsForPtr[ptr].begin(); it != RegisteredGameHooks<H>::functionsForPtr[ptr].end(); ) {
                 if (it->first == hookId) {
                     it = RegisteredGameHooks<H>::functionsForPtr[ptr].erase(it);
                     HooksToUnregister<H>::hooksForPtr.erase(std::remove(HooksToUnregister<H>::hooksForPtr.begin(), HooksToUnregister<H>::hooksForPtr.end(), hookId), HooksToUnregister<H>::hooksForPtr.end());
+                    RegisteredGameHooks<H>::hookData.erase(hookId);
                 } else {
                     ++it;
                 }
@@ -621,31 +694,42 @@ public:
         }
         for (auto& hook : RegisteredGameHooks<H>::functionsForPtr[ptr]) {
             hook.second(std::forward<Args>(args)...);
+            RegisteredGameHooks<H>::hookData[hook.first].calls += 1;
         }
     }
 
     // Filter based Hooks
-    template <typename H> HOOK_ID RegisterGameHookForFilter(typename H::filter f, typename H::fn h) {
+    template <typename H> HOOK_ID RegisterGameHookForFilter(
+        typename H::filter f, typename H::fn h
+#ifdef __cpp_lib_source_location
+        , const std::source_location location = std::source_location::current()
+#endif
+    ) {
         if (this->nextHookId == 0 || this->nextHookId >= UINT32_MAX) this->nextHookId = 1;
         while (RegisteredGameHooks<H>::functionsForFilter.find(this->nextHookId) != RegisteredGameHooks<H>::functionsForFilter.end()) {
             this->nextHookId++;
         }
 
         RegisteredGameHooks<H>::functionsForFilter[this->nextHookId] = std::make_pair(f, h);
+        RegisteredGameHooks<H>::hookData[this->nextHookId] = HookInfo{GET_CURRENT_REGISTERING_INFO(HOOK_TYPE_FILTER)};
         return this->nextHookId++;
     }
+
     template <typename H> void UnregisterGameHookForFilter(HOOK_ID hookId) {
         if (hookId == 0) return;
         HooksToUnregister<H>::hooksForFilter.push_back(hookId);
     }
+
     template <typename H, typename... Args> void ExecuteHooksForFilter(Args&&... args) {
         for (auto& hookId : HooksToUnregister<H>::hooksForFilter) {
             RegisteredGameHooks<H>::functionsForFilter.erase(hookId);
+            RegisteredGameHooks<H>::hookData.erase(hookId);
         }
         HooksToUnregister<H>::hooksForFilter.clear();
         for (auto& hook : RegisteredGameHooks<H>::functionsForFilter) {
             if (hook.second.first(std::forward<Args>(args)...)) {
                 hook.second.second(std::forward<Args>(args)...);
+                RegisteredGameHooks<H>::hookData[hook.first].calls += 1;
             }
         }
     }
@@ -672,59 +756,15 @@ public:
         }
     };
 
-    DEFINE_HOOK(OnLoadGame, (int32_t fileNum));
-    DEFINE_HOOK(OnExitGame, (int32_t fileNum));
-    DEFINE_HOOK(OnGameFrameUpdate, ());
-    DEFINE_HOOK(OnItemReceive, (GetItemEntry itemEntry));
-    DEFINE_HOOK(OnSaleEnd, (GetItemEntry itemEntry));
-    DEFINE_HOOK(OnTransitionEnd, (int16_t sceneNum));
-    DEFINE_HOOK(OnSceneInit, (int16_t sceneNum));
-    DEFINE_HOOK(OnSceneFlagSet, (int16_t sceneNum, int16_t flagType, int16_t flag));
-    DEFINE_HOOK(OnSceneFlagUnset, (int16_t sceneNum, int16_t flagType, int16_t flag));
-    DEFINE_HOOK(OnFlagSet, (int16_t flagType, int16_t flag));
-    DEFINE_HOOK(OnFlagUnset, (int16_t flagType, int16_t flag));
-    DEFINE_HOOK(OnSceneSpawnActors, ());
-    DEFINE_HOOK(OnPlayerUpdate, ());
-    DEFINE_HOOK(OnOcarinaSongAction, ());
-    DEFINE_HOOK(OnShopSlotChange, (uint8_t cursorIndex, int16_t price));
-    DEFINE_HOOK(OnActorInit, (void* actor));
-    DEFINE_HOOK(OnActorUpdate, (void* actor));
-    DEFINE_HOOK(OnActorKill, (void* actor));
-    DEFINE_HOOK(OnEnemyDefeat, (void* actor));
-    DEFINE_HOOK(OnPlayerBonk, ());
-    DEFINE_HOOK(OnPlayDestroy, ());
-    DEFINE_HOOK(OnPlayDrawEnd, ());
+#define DEFINE_HOOK(name, args)                  \
+    struct name {                                \
+        typedef std::function<void args> fn;     \
+        typedef std::function<bool args> filter; \
+    }
 
-    DEFINE_HOOK(OnVanillaBehavior, (GIVanillaBehavior flag, bool* result, void* opt));
+#include "GameInteractor_HookTable.h"
 
-    DEFINE_HOOK(OnSaveFile, (int32_t fileNum));
-    DEFINE_HOOK(OnLoadFile, (int32_t fileNum));
-    DEFINE_HOOK(OnDeleteFile, (int32_t fileNum));
-    
-    DEFINE_HOOK(OnDialogMessage, ());
-    DEFINE_HOOK(OnPresentTitleCard, ());
-    DEFINE_HOOK(OnInterfaceUpdate, ());
-    DEFINE_HOOK(OnKaleidoscopeUpdate, (int16_t inDungeonScene));
-    
-    DEFINE_HOOK(OnPresentFileSelect, ());
-    DEFINE_HOOK(OnUpdateFileSelectSelection, (uint16_t optionIndex));
-    DEFINE_HOOK(OnUpdateFileSelectConfirmationSelection, (uint16_t optionIndex));
-    DEFINE_HOOK(OnUpdateFileCopySelection, (uint16_t optionIndex));
-    DEFINE_HOOK(OnUpdateFileCopyConfirmationSelection, (uint16_t optionIndex));
-    DEFINE_HOOK(OnUpdateFileEraseSelection, (uint16_t optionIndex));
-    DEFINE_HOOK(OnUpdateFileEraseConfirmationSelection, (uint16_t optionIndex));
-    DEFINE_HOOK(OnUpdateFileAudioSelection, (uint8_t optionIndex));
-    DEFINE_HOOK(OnUpdateFileTargetSelection, (uint8_t optionIndex));
-    DEFINE_HOOK(OnUpdateFileLanguageSelection, (uint8_t optionIndex));
-    DEFINE_HOOK(OnUpdateFileQuestSelection, (uint8_t questIndex));
-    DEFINE_HOOK(OnUpdateFileBossRushOptionSelection, (uint8_t optionIndex, uint8_t optionValue));
-    DEFINE_HOOK(OnUpdateFileNameSelection, (int16_t charCode));
-    
-    DEFINE_HOOK(OnSetGameLanguage, ());
-
-    DEFINE_HOOK(OnFileDropped, (std::string filePath));
-    DEFINE_HOOK(OnAssetAltChange, ());
-    DEFINE_HOOK(OnKaleidoUpdate, ());
+#undef DEFINE_HOOK
 
     // Helpers
     static bool IsSaveLoaded(bool allowDbgSave = false);
@@ -785,5 +825,7 @@ public:
     #endif
 };
 
+#undef GET_CURRENT_REGISTERING_INFO
+
 #endif /* __cplusplus */
 #endif /* GameInteractor_h */
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor_HookTable.h b/soh/soh/Enhancements/game-interactor/GameInteractor_HookTable.h
new file mode 100644
index 000000000..a3fc284ee
--- /dev/null
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor_HookTable.h
@@ -0,0 +1,57 @@
+/**
+ * Hook Table
+ *
+ * DEFINE_HOOK arguments:
+ *    - Argument 1: Name of the hook
+ *    - Argument 2: Function type that the hook uses
+ */
+DEFINE_HOOK(OnLoadGame, (int32_t fileNum));
+DEFINE_HOOK(OnExitGame, (int32_t fileNum));
+DEFINE_HOOK(OnGameFrameUpdate, ());
+DEFINE_HOOK(OnItemReceive, (GetItemEntry itemEntry));
+DEFINE_HOOK(OnSaleEnd, (GetItemEntry itemEntry));
+DEFINE_HOOK(OnTransitionEnd, (int16_t sceneNum));
+DEFINE_HOOK(OnSceneInit, (int16_t sceneNum));
+DEFINE_HOOK(OnSceneFlagSet, (int16_t sceneNum, int16_t flagType, int16_t flag));
+DEFINE_HOOK(OnSceneFlagUnset, (int16_t sceneNum, int16_t flagType, int16_t flag));
+DEFINE_HOOK(OnFlagSet, (int16_t flagType, int16_t flag));
+DEFINE_HOOK(OnFlagUnset, (int16_t flagType, int16_t flag));
+DEFINE_HOOK(OnSceneSpawnActors, ());
+DEFINE_HOOK(OnPlayerUpdate, ());
+DEFINE_HOOK(OnOcarinaSongAction, ());
+DEFINE_HOOK(OnShopSlotChange, (uint8_t cursorIndex, int16_t price));
+DEFINE_HOOK(OnActorInit, (void* actor));
+DEFINE_HOOK(OnActorUpdate, (void* actor));
+DEFINE_HOOK(OnActorKill, (void* actor));
+DEFINE_HOOK(OnEnemyDefeat, (void* actor));
+DEFINE_HOOK(OnPlayerBonk, ());
+DEFINE_HOOK(OnPlayDestroy, ());
+DEFINE_HOOK(OnPlayDrawEnd, ());
+DEFINE_HOOK(OnVanillaBehavior, (GIVanillaBehavior flag, bool* result, void* opt));
+DEFINE_HOOK(OnSaveFile, (int32_t fileNum));
+DEFINE_HOOK(OnLoadFile, (int32_t fileNum));
+DEFINE_HOOK(OnDeleteFile, (int32_t fileNum));
+
+DEFINE_HOOK(OnDialogMessage, ());
+DEFINE_HOOK(OnPresentTitleCard, ());
+DEFINE_HOOK(OnInterfaceUpdate, ());
+DEFINE_HOOK(OnKaleidoscopeUpdate, (int16_t inDungeonScene));
+
+DEFINE_HOOK(OnPresentFileSelect, ());
+DEFINE_HOOK(OnUpdateFileSelectSelection, (uint16_t optionIndex));
+DEFINE_HOOK(OnUpdateFileSelectConfirmationSelection, (uint16_t optionIndex));
+DEFINE_HOOK(OnUpdateFileCopySelection, (uint16_t optionIndex));
+DEFINE_HOOK(OnUpdateFileCopyConfirmationSelection, (uint16_t optionIndex));
+DEFINE_HOOK(OnUpdateFileEraseSelection, (uint16_t optionIndex));
+DEFINE_HOOK(OnUpdateFileEraseConfirmationSelection, (uint16_t optionIndex));
+DEFINE_HOOK(OnUpdateFileAudioSelection, (uint8_t optionIndex));
+DEFINE_HOOK(OnUpdateFileTargetSelection, (uint8_t optionIndex));
+DEFINE_HOOK(OnUpdateFileLanguageSelection, (uint8_t optionIndex));
+DEFINE_HOOK(OnUpdateFileQuestSelection, (uint8_t questIndex));
+DEFINE_HOOK(OnUpdateFileBossRushOptionSelection, (uint8_t optionIndex, uint8_t optionValue));
+DEFINE_HOOK(OnUpdateFileNameSelection, (int16_t charCode));
+
+DEFINE_HOOK(OnSetGameLanguage, ());
+DEFINE_HOOK(OnFileDropped, (std::string filePath));
+DEFINE_HOOK(OnAssetAltChange, ());
+DEFINE_HOOK(OnKaleidoUpdate, ());
\ No newline at end of file
diff --git a/soh/soh/SohGui.cpp b/soh/soh/SohGui.cpp
index 4bef8cea6..eda8641ef 100644
--- a/soh/soh/SohGui.cpp
+++ b/soh/soh/SohGui.cpp
@@ -122,6 +122,7 @@ namespace SohGui {
     std::shared_ptr<ActorViewerWindow> mActorViewerWindow;
     std::shared_ptr<ColViewerWindow> mColViewerWindow;
     std::shared_ptr<SaveEditorWindow> mSaveEditorWindow;
+    std::shared_ptr<HookDebuggerWindow> mHookDebuggerWindow;
     std::shared_ptr<DLViewerWindow> mDLViewerWindow;
     std::shared_ptr<ValueViewerWindow> mValueViewerWindow;
     std::shared_ptr<MessageViewer> mMessageViewerWindow;
@@ -179,6 +180,8 @@ namespace SohGui {
         gui->AddGuiWindow(mColViewerWindow);
         mSaveEditorWindow = std::make_shared<SaveEditorWindow>(CVAR_WINDOW("SaveEditor"), "Save Editor", ImVec2(520, 600));
         gui->AddGuiWindow(mSaveEditorWindow);
+        mHookDebuggerWindow = std::make_shared<HookDebuggerWindow>(CVAR_WINDOW("HookDebugger"), "Hook Debugger", ImVec2(1250, 850));
+        gui->AddGuiWindow(mHookDebuggerWindow);
         mDLViewerWindow = std::make_shared<DLViewerWindow>(CVAR_WINDOW("DLViewer"), "Display List Viewer", ImVec2(520, 600));
         gui->AddGuiWindow(mDLViewerWindow);
         mValueViewerWindow = std::make_shared<ValueViewerWindow>(CVAR_WINDOW("ValueViewer"), "Value Viewer", ImVec2(520, 600));
@@ -226,6 +229,7 @@ namespace SohGui {
         mValueViewerWindow = nullptr;
         mMessageViewerWindow = nullptr;
         mSaveEditorWindow = nullptr;
+        mHookDebuggerWindow = nullptr;
         mColViewerWindow = nullptr;
         mActorViewerWindow = nullptr;
         mCosmeticsEditorWindow = nullptr;
diff --git a/soh/soh/SohGui.hpp b/soh/soh/SohGui.hpp
index 5152bf69c..9bdedc504 100644
--- a/soh/soh/SohGui.hpp
+++ b/soh/soh/SohGui.hpp
@@ -16,6 +16,7 @@
 #include "Enhancements/debugger/actorViewer.h"
 #include "Enhancements/debugger/colViewer.h"
 #include "Enhancements/debugger/debugSaveEditor.h"
+#include "Enhancements/debugger/hookDebugger.h"
 #include "Enhancements/debugger/dlViewer.h"
 #include "Enhancements/debugger/valueViewer.h"
 #include "Enhancements/gameplaystatswindow.h"
diff --git a/soh/soh/SohMenuBar.cpp b/soh/soh/SohMenuBar.cpp
index 35f0b6ae1..31ef681fc 100644
--- a/soh/soh/SohMenuBar.cpp
+++ b/soh/soh/SohMenuBar.cpp
@@ -28,6 +28,7 @@
 #include "Enhancements/debugger/actorViewer.h"
 #include "Enhancements/debugger/colViewer.h"
 #include "Enhancements/debugger/debugSaveEditor.h"
+#include "Enhancements/debugger/hookDebugger.h"
 #include "Enhancements/debugger/dlViewer.h"
 #include "Enhancements/debugger/valueViewer.h"
 #include "Enhancements/gameplaystatswindow.h"
@@ -1761,6 +1762,7 @@ void DrawCheatsMenu() {
 extern std::shared_ptr<Ship::GuiWindow> mStatsWindow;
 extern std::shared_ptr<Ship::GuiWindow> mConsoleWindow;
 extern std::shared_ptr<SaveEditorWindow> mSaveEditorWindow;
+extern std::shared_ptr<HookDebuggerWindow> mHookDebuggerWindow;
 extern std::shared_ptr<ColViewerWindow> mColViewerWindow;
 extern std::shared_ptr<ActorViewerWindow> mActorViewerWindow;
 extern std::shared_ptr<DLViewerWindow> mDLViewerWindow;
@@ -1844,6 +1846,12 @@ void DrawDeveloperToolsMenu() {
             }
         }
         UIWidgets::Spacer(0);
+        if (mHookDebuggerWindow) {
+            if (ImGui::Button(GetWindowButtonText("Hook Debugger", CVarGetInteger(CVAR_WINDOW("HookDebugger"), 0)).c_str(), ImVec2(-1.0f, 0.0f))) {
+                mHookDebuggerWindow->ToggleVisibility();
+            }
+        }
+        UIWidgets::Spacer(0);
         if (mColViewerWindow) {
             if (ImGui::Button(GetWindowButtonText("Collision Viewer", CVarGetInteger(CVAR_WINDOW("CollisionViewer"), 0)).c_str(), ImVec2(-1.0f, 0.0f))) {
                 mColViewerWindow->ToggleVisibility();

From 159d0872d71c095f36e90629ecfb43880a77a753 Mon Sep 17 00:00:00 2001
From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Date: Fri, 27 Sep 2024 00:26:33 +0100
Subject: [PATCH 209/230] remove unused functions (#4313)

---
 .../Enhancements/randomizer/randomizer.cpp    | 518 +-----------------
 soh/soh/Enhancements/randomizer/randomizer.h  |   3 -
 2 files changed, 2 insertions(+), 519 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index 01ff89d2d..92b8f3e2f 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -146,7 +146,7 @@ Randomizer::Randomizer() {
     SpoilerfileAreaNameToEnum["the Graveyard"] = RCAREA_GRAVEYARD;
     SpoilerfileAreaNameToEnum["Haunted Wasteland"] = RCAREA_WASTELAND;
     SpoilerfileAreaNameToEnum["outside Ganon's Castle"] = RCAREA_HYRULE_CASTLE;
-    for (int c = 0; c < Rando::StaticData::hintTypeNames.size(); c++) {
+    for (size_t c = 0; c < Rando::StaticData::hintTypeNames.size(); c++) {
         SpoilerfileHintTypeNameToEnum[Rando::StaticData::hintTypeNames[(HintType)c].GetEnglish(MF_CLEAN)] = (HintType)c;
     }
 }
@@ -729,520 +729,6 @@ ItemObtainability Randomizer::GetItemObtainabilityFromRandomizerGet(RandomizerGe
     }
 }
 
-GetItemID Randomizer::GetItemIdFromRandomizerGet(RandomizerGet randoGet, GetItemID ogItemId) {
-    // Shopsanity with at least one item shuffled allows for a third wallet upgrade.
-    // This is needed since Plentiful item pool also adds a third progressive wallet
-    // but we should *not* get Tycoon's Wallet in that mode.
-    bool tycoonWallet = GetRandoSettingValue(RSK_SHOPSANITY) > RO_SHOPSANITY_ZERO_ITEMS;
-
-    // Same thing with the infinite upgrades, if we're not shuffling them
-    //and we're using the Plentiful item pool, we should prevent the infinite
-    //upgrades from being gotten
-    u8 infiniteUpgrades = GetRandoSettingValue(RSK_INFINITE_UPGRADES);
-    switch (randoGet) {
-        case RG_NONE:
-            return ogItemId;
-        case RG_TRIFORCE:
-        case RG_HINT:
-        case RG_MAX:
-        case RG_SOLD_OUT:
-            return GI_NONE;
-
-        // Equipment
-        case RG_KOKIRI_SWORD:
-            return GI_SWORD_KOKIRI;
-        case RG_PROGRESSIVE_GORONSWORD: //todo progressive?
-            return GI_SWORD_BGS;
-        case RG_GIANTS_KNIFE:
-            return GI_SWORD_KNIFE;
-        case RG_BIGGORON_SWORD:
-            return GI_SWORD_BGS;
-        case RG_DEKU_SHIELD:
-        case RG_BUY_DEKU_SHIELD:
-            return GI_SHIELD_DEKU;
-        case RG_HYLIAN_SHIELD:
-        case RG_BUY_HYLIAN_SHIELD:
-            return GI_SHIELD_HYLIAN;
-        case RG_MIRROR_SHIELD:
-            return GI_SHIELD_MIRROR;
-        case RG_GORON_TUNIC:
-        case RG_BUY_GORON_TUNIC:
-            return GI_TUNIC_GORON;
-        case RG_ZORA_TUNIC:
-        case RG_BUY_ZORA_TUNIC:
-            return GI_TUNIC_ZORA;
-        case RG_IRON_BOOTS:
-            return GI_BOOTS_IRON;
-        case RG_HOVER_BOOTS:
-            return GI_BOOTS_HOVER;
-
-        // Inventory Items
-        case RG_PROGRESSIVE_STICK_UPGRADE:
-            switch (CUR_UPG_VALUE(UPG_STICKS)) {
-                case 0:
-                case 1:
-                    return GI_STICK_UPGRADE_20;
-                case 2:
-                    return GI_STICK_UPGRADE_30;
-                case 3:
-                case 4:
-                    return infiniteUpgrades == RO_INF_UPGRADES_PROGRESSIVE ? (GetItemID)RG_STICK_UPGRADE_INF : GI_STICK_UPGRADE_30;
-            }
-        case RG_PROGRESSIVE_NUT_UPGRADE:
-            switch (CUR_UPG_VALUE(UPG_NUTS)) {
-                case 0:
-                case 1:
-                    return GI_NUT_UPGRADE_30;
-                case 2:
-                    return GI_NUT_UPGRADE_40;
-                case 3:
-                case 4:
-                    return infiniteUpgrades == RO_INF_UPGRADES_PROGRESSIVE ? (GetItemID)RG_NUT_UPGRADE_INF : GI_NUT_UPGRADE_40;
-            }
-        case RG_PROGRESSIVE_BOMB_BAG:
-            switch (CUR_UPG_VALUE(UPG_BOMB_BAG)) {
-                case 0:
-                    return GI_BOMB_BAG_20;
-                case 1:
-                    return GI_BOMB_BAG_30;
-                case 2:
-                    return GI_BOMB_BAG_40;
-                case 3:
-                case 4:
-                    return infiniteUpgrades == RO_INF_UPGRADES_PROGRESSIVE ? (GetItemID)RG_BOMB_BAG_INF : GI_BOMB_BAG_40;
-            }
-        case RG_BOMBS_5:
-        case RG_BUY_BOMBS_525:
-        case RG_BUY_BOMBS_535:
-            return GI_BOMBS_5;
-        case RG_BOMBS_10:
-        case RG_BUY_BOMBS_10:
-            return GI_BOMBS_10;
-        case RG_BOMBS_20:
-        case RG_BUY_BOMBS_20:
-            return GI_BOMBS_20;
-        case RG_BUY_BOMBS_30:
-            return GI_BOMBS_30;
-        case RG_PROGRESSIVE_BOW:
-            switch (CUR_UPG_VALUE(UPG_QUIVER)) {
-                case 0:
-                    return GI_BOW;
-                case 1:
-                    return GI_QUIVER_40;
-                case 2:
-                    return GI_QUIVER_50;
-                case 3:
-                case 4:
-                    return infiniteUpgrades == RO_INF_UPGRADES_PROGRESSIVE ? (GetItemID)RG_QUIVER_INF : GI_QUIVER_50;
-            }
-        case RG_ARROWS_5:
-        case RG_BUY_ARROWS_10:
-            return GI_ARROWS_SMALL;
-        case RG_ARROWS_10:
-        case RG_BUY_ARROWS_30:
-            return GI_ARROWS_MEDIUM;
-        case RG_ARROWS_30:
-        case RG_BUY_ARROWS_50:
-            return GI_ARROWS_LARGE;
-        case RG_PROGRESSIVE_SLINGSHOT:
-            switch (CUR_UPG_VALUE(UPG_BULLET_BAG)) {
-                case 0:
-                    return GI_SLINGSHOT;
-                case 1:
-                    return GI_BULLET_BAG_40;
-                case 2:
-                    return GI_BULLET_BAG_50;
-                case 3:
-                case 4:
-                    return infiniteUpgrades == RO_INF_UPGRADES_PROGRESSIVE ? (GetItemID)RG_BULLET_BAG_INF : GI_BULLET_BAG_50;
-            }
-        case RG_DEKU_SEEDS_30:
-        case RG_BUY_DEKU_SEEDS_30:
-            return GI_SEEDS_30;
-        case RG_PROGRESSIVE_OCARINA:
-            switch (INV_CONTENT(ITEM_OCARINA_FAIRY)) {
-                case ITEM_NONE:
-                    return GI_OCARINA_FAIRY;
-                case ITEM_OCARINA_FAIRY:
-                case ITEM_OCARINA_TIME:
-                    return GI_OCARINA_OOT;
-            }
-        case RG_BOMBCHU_5:
-        case RG_BOMBCHU_10:
-        case RG_BUY_BOMBCHUS_10:
-            return GI_BOMBCHUS_10;
-        case RG_BOMBCHU_20:
-        case RG_BUY_BOMBCHUS_20:
-            return GI_BOMBCHUS_20;
-        case RG_PROGRESSIVE_BOMBCHUS:
-            if (INV_CONTENT(ITEM_BOMBCHU) == ITEM_NONE) {
-                return (GetItemID)RG_PROGRESSIVE_BOMBCHUS;
-            } else if (infiniteUpgrades != RO_INF_UPGRADES_OFF) {
-                return (GetItemID)RG_BOMBCHU_INF;
-            } else if (AMMO(ITEM_BOMBCHU) < 5) {
-                return GI_BOMBCHUS_10;
-            } else {
-                return GI_BOMBCHUS_5;
-            }
-        case RG_PROGRESSIVE_HOOKSHOT:
-            switch (INV_CONTENT(ITEM_HOOKSHOT)) {
-                case ITEM_NONE:
-                    return GI_HOOKSHOT;
-                case ITEM_HOOKSHOT:
-                case ITEM_LONGSHOT:
-                    return GI_LONGSHOT;
-            }
-        case RG_BOOMERANG:
-            return GI_BOOMERANG;
-        case RG_LENS_OF_TRUTH:
-            return GI_LENS;
-        case RG_MAGIC_BEAN:
-            return GI_BEAN;
-        case RG_MEGATON_HAMMER:
-            return GI_HAMMER;
-        case RG_FIRE_ARROWS:
-            return GI_ARROW_FIRE;
-        case RG_ICE_ARROWS:
-            return GI_ARROW_ICE;
-        case RG_LIGHT_ARROWS:
-            return GI_ARROW_LIGHT;
-        case RG_DINS_FIRE:
-            return GI_DINS_FIRE;
-        case RG_FARORES_WIND:
-            return GI_FARORES_WIND;
-        case RG_NAYRUS_LOVE:
-            return GI_NAYRUS_LOVE;
-
-        // Bottles
-        case RG_EMPTY_BOTTLE:
-            return GI_BOTTLE;
-        case RG_BOTTLE_WITH_MILK:
-            return GI_MILK_BOTTLE;
-        case RG_RUTOS_LETTER:
-            return GI_LETTER_RUTO;
-
-        // Bottle Refills
-        case RG_MILK:
-            return GI_MILK;
-        case RG_RED_POTION_REFILL:
-        case RG_BUY_RED_POTION_30:
-        case RG_BUY_RED_POTION_40:
-        case RG_BUY_RED_POTION_50:
-            return GI_POTION_RED;
-        case RG_GREEN_POTION_REFILL:
-        case RG_BUY_GREEN_POTION:
-            return GI_POTION_GREEN;
-        case RG_BLUE_POTION_REFILL:
-        case RG_BUY_BLUE_POTION:
-            return GI_POTION_BLUE;
-        case RG_FISH:
-        case RG_BUY_FISH:
-            return GI_FISH;
-        case RG_BUY_BLUE_FIRE:
-            return GI_BLUE_FIRE;
-        case RG_BUY_BOTTLE_BUG:
-            return GI_BUGS;
-        case RG_BUY_POE:
-            return GI_POE;
-        case RG_BUY_FAIRYS_SPIRIT:
-            return GI_FAIRY;
-
-        // Trade Items
-        case RG_WEIRD_EGG:
-            return GI_WEIRD_EGG;
-        case RG_ZELDAS_LETTER:
-            return GI_LETTER_ZELDA;
-        case RG_POCKET_EGG:
-            return GI_POCKET_EGG;
-        case RG_COJIRO:
-            return GI_COJIRO;
-        case RG_ODD_MUSHROOM:
-            return GI_ODD_MUSHROOM;
-        case RG_ODD_POTION:
-            return GI_ODD_POTION;
-        case RG_POACHERS_SAW:
-            return GI_SAW;
-        case RG_BROKEN_SWORD:
-            return GI_SWORD_BROKEN;
-        case RG_PRESCRIPTION:
-            return GI_PRESCRIPTION;
-        case RG_EYEBALL_FROG:
-            return GI_FROG;
-        case RG_EYEDROPS:
-            return GI_EYEDROPS;
-        case RG_CLAIM_CHECK:
-            return GI_CLAIM_CHECK;
-
-        // Misc Items
-        case RG_STONE_OF_AGONY:
-            return GI_STONE_OF_AGONY;
-        case RG_GERUDO_MEMBERSHIP_CARD:
-            return GI_GERUDO_CARD;
-        case RG_GOLD_SKULLTULA_TOKEN:
-            return GI_SKULL_TOKEN;
-        case RG_PROGRESSIVE_STRENGTH:
-            switch (CUR_UPG_VALUE(UPG_STRENGTH)) {
-                case 0:
-                    return GI_BRACELET;
-                case 1:
-                    return GI_GAUNTLETS_SILVER;
-                case 2:
-                case 3:
-                    return GI_GAUNTLETS_GOLD;
-            }
-        case RG_PROGRESSIVE_WALLET:
-            if (!Flags_GetRandomizerInf(RAND_INF_HAS_WALLET)) {
-                return (GetItemID)RG_CHILD_WALLET;
-            }
-            switch (CUR_UPG_VALUE(UPG_WALLET)) {
-                case 0:
-                    return GI_WALLET_ADULT;
-                case 1:
-                    return GI_WALLET_GIANT;
-                case 2:
-                    return tycoonWallet ? (GetItemID)RG_TYCOON_WALLET : infiniteUpgrades != RO_INF_UPGRADES_OFF ? (GetItemID)RG_WALLET_INF : GI_WALLET_GIANT;
-                case 3:
-                case 4:
-                    return infiniteUpgrades != RO_INF_UPGRADES_OFF ? (GetItemID)RG_WALLET_INF : tycoonWallet ? (GetItemID)RG_TYCOON_WALLET : GI_WALLET_GIANT;
-            }
-        case RG_PROGRESSIVE_SCALE:
-            if (!Flags_GetRandomizerInf(RAND_INF_CAN_SWIM)) {
-                return (GetItemID)RG_BRONZE_SCALE;
-            }
-            switch (CUR_UPG_VALUE(UPG_SCALE)) {
-                case 0:
-                    return GI_SCALE_SILVER;
-                case 1:
-                case 2:
-                    return GI_SCALE_GOLD;
-            }
-        case RG_PROGRESSIVE_MAGIC_METER:
-            switch (gSaveContext.magicLevel) {
-                case 0:
-                    return (GetItemID)RG_MAGIC_SINGLE;
-                case 1:
-                    return (GetItemID)RG_MAGIC_DOUBLE;
-                case 2:
-                case 3:
-                    return infiniteUpgrades != RO_INF_UPGRADES_OFF ? (GetItemID)RG_MAGIC_INF : (GetItemID)RG_MAGIC_DOUBLE;
-            }
-
-        case RG_RECOVERY_HEART:
-        case RG_BUY_HEART:
-            return GI_HEART;
-        case RG_GREEN_RUPEE:
-            return GI_RUPEE_GREEN;
-        case RG_BLUE_RUPEE:
-            return GI_RUPEE_BLUE;
-        case RG_RED_RUPEE:
-            return GI_RUPEE_RED;
-        case RG_PURPLE_RUPEE:
-            return GI_RUPEE_PURPLE;
-        case RG_HUGE_RUPEE:
-            return GI_RUPEE_GOLD;
-        case RG_PIECE_OF_HEART:
-            return GI_HEART_PIECE;
-        case RG_HEART_CONTAINER:
-            return GI_HEART_CONTAINER;
-        
-        case RG_DEKU_NUTS_5:
-        case RG_BUY_DEKU_NUTS_5:
-            return GI_NUTS_5;
-        case RG_DEKU_NUTS_10:
-        case RG_BUY_DEKU_NUTS_10:
-            return GI_NUTS_10;
-        case RG_DEKU_STICK_1:
-        case RG_BUY_DEKU_STICK_1:
-            return GI_STICKS_1;
-        case RG_TREASURE_GAME_SMALL_KEY:
-            return GI_DOOR_KEY;
-        case RG_TREASURE_GAME_HEART:
-            return GI_HEART_PIECE_WIN;
-        case RG_TREASURE_GAME_GREEN_RUPEE:
-            return GI_RUPEE_GREEN_LOSE;
-
-        //Ocarina Buttons
-        case RG_OCARINA_A_BUTTON:
-            return (GetItemID)RG_OCARINA_A_BUTTON;
-        case RG_OCARINA_C_LEFT_BUTTON:
-            return (GetItemID)RG_OCARINA_C_LEFT_BUTTON;
-        case RG_OCARINA_C_RIGHT_BUTTON:
-            return (GetItemID)RG_OCARINA_C_RIGHT_BUTTON;
-        case RG_OCARINA_C_UP_BUTTON:
-            return (GetItemID)RG_OCARINA_C_UP_BUTTON;
-        case RG_OCARINA_C_DOWN_BUTTON:
-            return (GetItemID)RG_OCARINA_C_DOWN_BUTTON;
-
-        default:
-            if (!IsItemVanilla(randoGet)) {
-                return (GetItemID)randoGet;
-            }
-            return ogItemId;
-    }
-}
-
-bool Randomizer::IsItemVanilla(RandomizerGet randoGet) {
-    switch (randoGet) {
-        case RG_NONE:
-        case RG_KOKIRI_SWORD: 
-        case RG_GIANTS_KNIFE: 
-        case RG_BIGGORON_SWORD:
-        case RG_DEKU_SHIELD:
-        case RG_HYLIAN_SHIELD:
-        case RG_MIRROR_SHIELD:
-        case RG_GORON_TUNIC:
-        case RG_ZORA_TUNIC:
-        case RG_IRON_BOOTS:
-        case RG_HOVER_BOOTS:
-        case RG_BOOMERANG:
-        case RG_LENS_OF_TRUTH:
-        case RG_MEGATON_HAMMER:
-        case RG_STONE_OF_AGONY:
-        case RG_DINS_FIRE:
-        case RG_FARORES_WIND:
-        case RG_NAYRUS_LOVE:
-        case RG_FIRE_ARROWS:
-        case RG_ICE_ARROWS:
-        case RG_LIGHT_ARROWS:
-        case RG_GERUDO_MEMBERSHIP_CARD:
-        case RG_MAGIC_BEAN:
-        case RG_WEIRD_EGG: 
-        case RG_ZELDAS_LETTER:
-        case RG_RUTOS_LETTER:
-        case RG_POCKET_EGG:
-        case RG_COJIRO:
-        case RG_ODD_MUSHROOM:
-        case RG_ODD_POTION:
-        case RG_POACHERS_SAW:
-        case RG_BROKEN_SWORD:
-        case RG_PRESCRIPTION:
-        case RG_EYEBALL_FROG:
-        case RG_EYEDROPS:
-        case RG_CLAIM_CHECK:
-        case RG_GOLD_SKULLTULA_TOKEN:
-        case RG_PROGRESSIVE_HOOKSHOT:
-        case RG_PROGRESSIVE_STRENGTH:
-            return true;
-        case RG_PROGRESSIVE_BOMB_BAG:
-            if (CUR_UPG_VALUE(UPG_BOMB_BAG) < 3) {
-                return true;
-            } else {
-                return false;
-            }
-        case RG_PROGRESSIVE_BOW:
-            if (CUR_UPG_VALUE(UPG_QUIVER) < 3) {
-                return true;
-            } else {
-                return false;
-            }
-        case RG_PROGRESSIVE_SLINGSHOT:
-            if (CUR_UPG_VALUE(UPG_BULLET_BAG) < 3) {
-                return true;
-            } else {
-                return false;
-            }
-        case RG_PROGRESSIVE_NUT_UPGRADE:
-            if (CUR_UPG_VALUE(UPG_NUTS) < 3) {
-                return true;
-            } else {
-                return false;
-            }
-        case RG_PROGRESSIVE_STICK_UPGRADE:
-            if (CUR_UPG_VALUE(UPG_STICKS) < 3) {
-                return true;
-            } else {
-                return false;
-            }
-        case RG_PROGRESSIVE_OCARINA:
-        case RG_PROGRESSIVE_GORONSWORD:
-        case RG_EMPTY_BOTTLE:
-        case RG_BOTTLE_WITH_MILK:
-        case RG_RECOVERY_HEART:
-        case RG_GREEN_RUPEE:
-        case RG_BLUE_RUPEE:
-        case RG_RED_RUPEE:
-        case RG_PURPLE_RUPEE:
-        case RG_HUGE_RUPEE:
-        case RG_PIECE_OF_HEART:
-        case RG_HEART_CONTAINER:
-        case RG_MILK:
-        case RG_FISH:
-        case RG_BOMBS_5:
-        case RG_BOMBS_10:
-        case RG_BOMBS_20:
-        case RG_BOMBCHU_5:
-        case RG_BOMBCHU_10:
-        case RG_BOMBCHU_20:
-            return true;
-        case RG_PROGRESSIVE_BOMBCHUS:
-            return INV_CONTENT(ITEM_BOMBCHU) != ITEM_NONE && !GetRandoSettingValue(RSK_INFINITE_UPGRADES);
-        case RG_ARROWS_5:
-        case RG_ARROWS_10:
-        case RG_ARROWS_30:
-        case RG_DEKU_NUTS_5:
-        case RG_DEKU_NUTS_10:
-        case RG_DEKU_SEEDS_30:
-        case RG_DEKU_STICK_1:
-        case RG_RED_POTION_REFILL:
-        case RG_GREEN_POTION_REFILL:
-        case RG_BLUE_POTION_REFILL:
-        case RG_TREASURE_GAME_HEART:
-        case RG_TREASURE_GAME_GREEN_RUPEE:
-        case RG_BUY_DEKU_NUTS_5:
-        case RG_BUY_ARROWS_30:
-        case RG_BUY_ARROWS_50:
-        case RG_BUY_BOMBS_525:
-        case RG_BUY_DEKU_NUTS_10:
-        case RG_BUY_DEKU_STICK_1:
-        case RG_BUY_BOMBS_10:
-        case RG_BUY_FISH:
-        case RG_BUY_RED_POTION_30:
-        case RG_BUY_GREEN_POTION:
-        case RG_BUY_BLUE_POTION:
-        case RG_BUY_HYLIAN_SHIELD:
-        case RG_BUY_DEKU_SHIELD:
-        case RG_BUY_GORON_TUNIC:
-        case RG_BUY_ZORA_TUNIC:
-        case RG_BUY_HEART:
-        case RG_BUY_BOMBCHUS_10:
-        case RG_BUY_BOMBCHUS_20:
-        case RG_BUY_DEKU_SEEDS_30:
-        case RG_SOLD_OUT:
-        case RG_BUY_BLUE_FIRE:
-        case RG_BUY_BOTTLE_BUG:
-        case RG_BUY_POE:
-        case RG_BUY_FAIRYS_SPIRIT:
-        case RG_BUY_ARROWS_10:
-        case RG_BUY_BOMBS_20:
-        case RG_BUY_BOMBS_30:
-        case RG_BUY_BOMBS_535:
-        case RG_BUY_RED_POTION_40:
-        case RG_BUY_RED_POTION_50:
-            return true;
-        case RG_PROGRESSIVE_SCALE:
-            if (!Flags_GetRandomizerInf(RAND_INF_CAN_SWIM)) {
-                return false;
-            }
-            return true;
-        case RG_PROGRESSIVE_WALLET:
-            if (!Flags_GetRandomizerInf(RAND_INF_HAS_WALLET)) {
-                return false;
-            }
-            if (CUR_UPG_VALUE(UPG_WALLET) < 2) {
-                return true;
-            } else {
-                return false;
-            }
-        default:
-            return false;
-    }
-}
-
-bool Randomizer::CheckContainsVanillaItem(RandomizerCheck randoCheck) {
-    RandomizerGet randoGet = Rando::Context::GetInstance()->GetItemLocation(randoCheck)->GetPlacedRandomizerGet();
-    return IsItemVanilla(randoGet);
-}
-
 // There has been some talk about potentially just using the RC identifier to store flags rather than randomizer inf, so
 // for now we're not going to store randomzierInf in the randomizer check objects, we're just going to map them 1:1 here
 std::map<RandomizerCheck, RandomizerInf> rcToRandomizerInf = {
@@ -2525,7 +2011,7 @@ CustomMessage Randomizer::GetMerchantMessage(RandomizerInf randomizerInf, u16 te
     RandomizerCheck rc = GetCheckFromRandomizerInf(randomizerInf);
     RandomizerGet shopItemGet = ctx->GetItemLocation(rc)->GetPlacedRandomizerGet();
     CustomMessage shopItemName;
-    if (mysterious|| CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0)) {
+    if (mysterious || CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0)) {
         if (randomizerInf >= RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_1 && randomizerInf <= RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_8) {
             shopItemName = {
                 "Mysterious Item",
diff --git a/soh/soh/Enhancements/randomizer/randomizer.h b/soh/soh/Enhancements/randomizer/randomizer.h
index 9942fa564..14f28311c 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.h
+++ b/soh/soh/Enhancements/randomizer/randomizer.h
@@ -25,7 +25,6 @@
 class Randomizer {
   private:
     std::unordered_map<RandomizerSettingKey, u8> randoSettings;
-    bool IsItemVanilla(RandomizerGet randoGet);
 
   public:
     Randomizer();
@@ -56,7 +55,6 @@ class Randomizer {
     FishIdentity IdentifyFish(s32 sceneNum, s32 actorParams);
     GetItemEntry GetItemFromKnownCheck(RandomizerCheck randomizerCheck, GetItemID ogItemId, bool checkObtainability = true);
     GetItemEntry GetItemFromActor(s16 actorId, s16 sceneNum, s16 actorParams, GetItemID ogItemId, bool checkObtainability = true);
-    GetItemID GetItemIdFromRandomizerGet(RandomizerGet randoGet, GetItemID ogItemId);
     ItemObtainability GetItemObtainabilityFromRandomizerCheck(RandomizerCheck randomizerCheck);
     ItemObtainability GetItemObtainabilityFromRandomizerGet(RandomizerGet randomizerCheck);
     CustomMessage GetSheikMessage(s16 scene, u16 originalTextId);
@@ -69,7 +67,6 @@ class Randomizer {
     static CustomMessage GetRupeeMessage(u16 rupeeTextId);
     static CustomMessage GetIceTrapMessage();
     static CustomMessage GetTriforcePieceMessage();
-    bool CheckContainsVanillaItem(RandomizerCheck randoCheck);
 };
 
 #ifdef __cplusplus

From 0f47e6394e5e9f9db91ca2a6489dbe8566fed2d2 Mon Sep 17 00:00:00 2001
From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Date: Fri, 27 Sep 2024 01:35:20 +0100
Subject: [PATCH 210/230] fix small hint issues (#4358)

---
 soh/soh/Enhancements/randomizer/3drando/hints.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.cpp b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
index 9b22706cd..aca523072 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hints.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
@@ -681,10 +681,12 @@ std::vector<RandomizerCheck> FindItemsAndMarkHinted(std::vector<RandomizerGet> i
       return ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == items[c];});
     if (found.size() > 0){
       locations.push_back(found[0]);
-    }
-    //RANDOTODO make the called functions of this always return true if empty hintChecks are provided
-    if (hintChecks.size() == 0 || (!ctx->GetItemLocation(found[0])->IsAHintAccessible() && IsReachableWithout(hintChecks,found[0],true))){
-      ctx->GetItemLocation(found[0])->SetHintAccesible();
+      //RANDOTODO make the called functions of this always return true if empty hintChecks are provided
+      if (!ctx->GetItemLocation(found[0])->IsAHintAccessible() && (hintChecks.size() == 0 || IsReachableWithout(hintChecks, found[0],true))){
+        ctx->GetItemLocation(found[0])->SetHintAccesible();
+      }
+    } else {
+      locations.push_back(RC_UNKNOWN_CHECK);
     }
   }
   return locations;
@@ -730,10 +732,15 @@ void CreateStaticHintFromData(RandomizerHint hint, StaticHintInfo staticData){
     Option option = ctx->GetOption(staticData.setting);
     if ((std::holds_alternative<bool>(staticData.condition) && option.Is(std::get<bool>(staticData.condition))) ||
         (std::holds_alternative<uint8_t>(staticData.condition) && option.Is(std::get<uint8_t>(staticData.condition)))){
+
       std::vector<RandomizerCheck> locations = {};
       if (staticData.targetItems.size() > 0){
         locations = FindItemsAndMarkHinted(staticData.targetItems, staticData.hintChecks);
       }
+      for(auto check: staticData.targetChecks){
+        ctx->GetItemLocation(check)->SetHintAccesible();
+      }
+
       //hintKeys are defaulted to in the hint object and do not need to be specified
       ctx->AddHint(hint, Hint(hint, staticData.type, {}, locations, {}, {}, staticData.yourPocket, staticData.num));
     }

From 668f0fe4c612675f0616ac329197196b7974c8ef Mon Sep 17 00:00:00 2001
From: Malkierian <malkierian@gmail.com>
Date: Fri, 27 Sep 2024 22:47:35 -0700
Subject: [PATCH 211/230] Rando V3 - Small UI Cleanup (#4367)

* Change tristate off graphic to none instead of X to avoid confusion.
Modify Combobox and Slider Options to clamp directly to options.size() - 1 instead of just decrementing if current value is higher than max.

* Restore RenderCross line, but commented out.
---
 soh/soh/Enhancements/randomizer/option.cpp | 5 +++--
 soh/soh/UIWidgets.cpp                      | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/option.cpp b/soh/soh/Enhancements/randomizer/option.cpp
index 36fdd1f8b..9a5977262 100644
--- a/soh/soh/Enhancements/randomizer/option.cpp
+++ b/soh/soh/Enhancements/randomizer/option.cpp
@@ -240,7 +240,7 @@ bool Option::RenderCombobox() const {
     ImGui::Text("%s", name.c_str());
     uint8_t selected = CVarGetInteger(cvarName.c_str(), defaultOption);
     if (selected >= options.size()) {
-        selected--;
+        selected = options.size();
         CVarSetInteger(cvarName.c_str(), selected);
         changed = true;
         Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
@@ -272,7 +272,8 @@ bool Option::RenderSlider() const {
     bool changed = false;
     int val = CVarGetInteger(cvarName.c_str(), defaultOption);
     if (val >= options.size()) {
-        val--;
+        val = options.size();
+        CVarSetInteger(cvarName.c_str(), val);
         changed = true;
     }
     if (disabled) {
diff --git a/soh/soh/UIWidgets.cpp b/soh/soh/UIWidgets.cpp
index c47ae91f7..5a41fe7cd 100644
--- a/soh/soh/UIWidgets.cpp
+++ b/soh/soh/UIWidgets.cpp
@@ -170,7 +170,7 @@ namespace UIWidgets {
             ImGui::RenderCheckMark(window->DrawList, check_bb.Min + ImVec2(pad, pad), check_col, square_sz - pad * 2.0f);
         } else if ((!disabled && !*v && renderCrossWhenOff) || (disabled && disabledGraphic == CheckboxGraphics::Cross)) {
             const float pad = ImMax(1.0f, IM_FLOOR(square_sz / 6.0f));
-            RenderCross(window->DrawList, check_bb.Min + ImVec2(pad, pad), disabled ? cross_col : check_col, square_sz - pad * 2.0f);
+            //RenderCross(window->DrawList, check_bb.Min + ImVec2(pad, pad), disabled ? cross_col : check_col, square_sz - pad * 2.0f); // Caused confusion as to status
         }
 
         ImVec2 label_pos = ImVec2(check_bb.Max.x + style.ItemInnerSpacing.x, check_bb.Min.y + style.FramePadding.y);

From 0cfd535fe6f63a526d104382ed512d76149b1898 Mon Sep 17 00:00:00 2001
From: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>
Date: Tue, 1 Oct 2024 18:50:47 +0200
Subject: [PATCH 212/230] Clean up location table (#4258)

* Remove categories

* Remove SpoilerCollectionCheckGroup

* Remove unused Location constructors

* Remove LocationType

* Remove unused SpoilerCollectionCheckTypes

* Remove hints' isVanillaCompletion, it's always false

* Remove SpoilerCollectionCheck::None

Same effect as default constructor

* Fix mistake

* Update location.h

* Deduce RC Area by scene when possible

* Remove useless constructors

* Remove flag in most situations

* Format improvements

* Replace overworldLocations with a function

* Replace shopLocationLists with a function

* Replace gossipStoneLocations with a function

Also add a new RCType for static hints

* Replace scrubLocations with a function

* Replace staticHintLocations with a function

* Replace overworldFishLocations with a function

* Replace pondFishLocations with a function

* Remove RC_TRIFORCE_COMPLETED from GetOverworldLocations

* Update fill.cpp

Re-add filter for dungeonLocations for song shuffle dungeon rewards (and fix erroneous check for song locations there).
Modify songLocations filter for dungeon rewards to check for RCTYPE_BOSS_HEART_OR_OTHER_REWARD and then the two song locations added for it.

* Update fill.cpp

Fix bracketing.

* Apply Pepper0ni's patch

---------

Co-authored-by: Malkierian <malkierian@live.com>
---
 .../randomizer/3drando/category.hpp           |   21 -
 .../Enhancements/randomizer/3drando/fill.cpp  |   62 +-
 .../Enhancements/randomizer/3drando/hints.cpp |   10 +-
 .../randomizer/3drando/item_pool.cpp          |   10 +-
 .../randomizer/3drando/location_access.cpp    |    2 +-
 .../Enhancements/randomizer/3drando/shops.cpp |   10 +-
 .../randomizer/3drando/spoiler_log.cpp        |   65 +-
 .../randomizer/3drando/spoiler_log.hpp        |   43 +-
 soh/soh/Enhancements/randomizer/context.cpp   |   28 +-
 soh/soh/Enhancements/randomizer/context.h     |    3 +-
 soh/soh/Enhancements/randomizer/dungeon.cpp   |    8 +-
 .../Enhancements/randomizer/fishsanity.cpp    |   12 +-
 .../Enhancements/randomizer/item_location.cpp |    4 +-
 soh/soh/Enhancements/randomizer/location.cpp  |  528 ++--
 soh/soh/Enhancements/randomizer/location.h    |  327 +--
 .../Enhancements/randomizer/location_list.cpp | 2337 +++++++----------
 .../Enhancements/randomizer/randomizerTypes.h |   22 +-
 .../randomizer/randomizer_check_objects.cpp   |    6 +-
 .../randomizer/randomizer_check_tracker.cpp   |    9 +-
 soh/soh/Enhancements/randomizer/settings.cpp  |   76 +-
 soh/soh/Enhancements/randomizer/settings.h    |    6 +-
 soh/soh/Enhancements/randomizer/static_data.h |   14 +-
 22 files changed, 1404 insertions(+), 2199 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/category.hpp b/soh/soh/Enhancements/randomizer/3drando/category.hpp
index 22522789c..fc230b435 100644
--- a/soh/soh/Enhancements/randomizer/3drando/category.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/category.hpp
@@ -1,26 +1,5 @@
 #pragma once
 
-enum class Category {
-    cNull,
-    cChestMinigame,
-    cDekuScrub,
-    cDekuScrubUpgrades,
-    cSkulltula,
-    cSong,
-    cSongDungeonReward,
-    cCow,
-    cFish,
-    cShop,
-    cMerchant,
-    cVanillaSmallKey,
-    cVanillaGFSmallKey,
-    cVanillaBossKey,
-    cVanillaMap,
-    cVanillaCompass,
-    cAdultTrade,
-    cBeehive,
-};
-
 enum class OptionCategory {
   Setting,
   Toggle,
diff --git a/soh/soh/Enhancements/randomizer/3drando/fill.cpp b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
index 2a6f3ed08..953b9338a 100644
--- a/soh/soh/Enhancements/randomizer/3drando/fill.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
@@ -977,12 +977,14 @@ static void RandomizeOwnDungeon(const Rando::DungeonInfo* dungeon) {
   });
 
   //filter out locations that may be required to have songs placed at them
-  dungeonLocations = FilterFromPool(dungeonLocations, [ctx](const auto loc){
+  dungeonLocations = FilterFromPool(dungeonLocations, [ctx](const auto loc) {
     if (ctx->GetOption(RSK_SHUFFLE_SONGS).Is(RO_SONG_SHUFFLE_SONG_LOCATIONS)) {
-      return !(Rando::StaticData::GetLocation(loc)->IsCategory(Category::cSong));
+      return !(Rando::StaticData::GetLocation(loc)->GetRCType() == RCTYPE_SONG_LOCATION);
     }
-    if (ctx->GetOption(RSK_SHUFFLE_SONGS).Is(RO_SONG_SHUFFLE_SONG_LOCATIONS)) {
-      return !(Rando::StaticData::GetLocation(loc)->IsCategory(Category::cSongDungeonReward));
+    if (ctx->GetOption(RSK_SHUFFLE_SONGS).Is(RO_SONG_SHUFFLE_DUNGEON_REWARDS)) {
+      return !(Rando::StaticData::GetLocation(loc)->GetRCType() == RCTYPE_BOSS_HEART_OR_OTHER_REWARD ||
+             loc == RC_SHEIK_IN_ICE_CAVERN ||
+             loc == RC_SONG_FROM_IMPA);
     }
     return true;
   });
@@ -1022,7 +1024,7 @@ static void RandomizeDungeonItems() {
 
   //Get Any Dungeon and Overworld group locations
   std::vector<RandomizerCheck> anyDungeonLocations = FilterFromPool(ctx->allLocations, [](const auto loc){return Rando::StaticData::GetLocation(loc)->IsDungeon();});
-  //overworldLocations defined in item_location.cpp
+  //Rando::StaticData::GetOverworldLocations() defined in item_location.cpp
 
   //Create Any Dungeon and Overworld item pools
   std::vector<RandomizerGet> anyDungeonItems;
@@ -1074,7 +1076,7 @@ static void RandomizeDungeonItems() {
 
   //Randomize Any Dungeon and Overworld pools
   AssumedFill(anyDungeonItems, anyDungeonLocations, true);
-  AssumedFill(overworldItems, Rando::StaticData::overworldLocations, true);
+  AssumedFill(overworldItems, Rando::StaticData::GetOverworldLocations(), true);
 
   //Randomize maps and compasses after since they're not advancement items
   for (auto dungeon : ctx->GetDungeons()->GetDungeonList()) {
@@ -1083,7 +1085,7 @@ static void RandomizeDungeonItems() {
       AssumedFill(mapAndCompassItems, anyDungeonLocations, true);
     } else if (ctx->GetOption(RSK_SHUFFLE_MAPANDCOMPASS).Is(RO_DUNGEON_ITEM_LOC_OVERWORLD)) {
       auto mapAndCompassItems = FilterAndEraseFromPool(ItemPool, [dungeon](const RandomizerGet i){return i == dungeon->GetMap() || i == dungeon->GetCompass();});
-      AssumedFill(mapAndCompassItems, Rando::StaticData::overworldLocations, true);
+      AssumedFill(mapAndCompassItems, Rando::StaticData::GetOverworldLocations(), true);
     }
   }
 }
@@ -1192,17 +1194,19 @@ int Fill() {
         //Indices from OoTR. So shopsanity one will overwrite 7, three will overwrite 7, 5, 8, etc.
         const std::array<int, 4> indices = {7, 5, 8, 6};
         //Overwrite appropriate number of shop items
-        for (size_t i = 0; i < Rando::StaticData::shopLocationLists.size(); i++) {
+        #define LOCATIONS_PER_SHOP 8
+        for (size_t i = 0; i < Rando::StaticData::GetShopLocations().size() / LOCATIONS_PER_SHOP; i++) {
           int num_to_replace = GetShopsanityReplaceAmount(); //1-4 shop items will be overwritten, depending on settings
           total_replaced += num_to_replace;
           for (int j = 0; j < num_to_replace; j++) {
             int itemindex = indices[j];
             int shopsanityPrice = GetRandomShopPrice();
-            NonShopItems[TransformShopIndex(i * 8 + itemindex - 1)].Price =
+            NonShopItems[TransformShopIndex(i * LOCATIONS_PER_SHOP + itemindex - 1)].Price =
                 shopsanityPrice; // Set price to be retrieved by the patch and textboxes
-            ctx->GetItemLocation(Rando::StaticData::shopLocationLists[i][itemindex - 1])->SetCustomPrice(shopsanityPrice);
+            ctx->GetItemLocation(Rando::StaticData::GetShopLocations()[i * LOCATIONS_PER_SHOP + itemindex - 1])->SetCustomPrice(shopsanityPrice);
           }
         }
+        #undef LOCATIONS_PER_SHOP
       }
       //Get all locations and items that don't have a shopsanity price attached
       std::vector<RandomizerCheck> shopLocations = {};
@@ -1210,12 +1214,9 @@ int Fill() {
       //So shopsanity 0 will get all 64 vanilla items, shopsanity 4 will get 32, etc.
       std::vector<RandomizerGet> shopItems = GetMinVanillaShopItems(total_replaced);
 
-      for (size_t i = 0; i < Rando::StaticData::shopLocationLists.size(); i++) {
-        for (size_t j = 0; j < Rando::StaticData::shopLocationLists[i].size(); j++) {
-          RandomizerCheck loc = Rando::StaticData::shopLocationLists[i][j];
-          if (!(ctx->GetItemLocation(loc)->HasCustomPrice())) {
-            shopLocations.push_back(loc);
-          }
+      for (RandomizerCheck& randomizerCheck : Rando::StaticData::GetShopLocations()) {
+        if (!(ctx->GetItemLocation(randomizerCheck)->HasCustomPrice())) {
+          shopLocations.push_back(randomizerCheck);
         }
       }
       //Place the shop items which will still be at shop locations
@@ -1246,11 +1247,13 @@ int Fill() {
       std::vector<RandomizerCheck> songLocations;
       if (ctx->GetOption(RSK_SHUFFLE_SONGS).Is(RO_SONG_SHUFFLE_SONG_LOCATIONS)) {
           songLocations = FilterFromPool(
-              ctx->allLocations, [](const auto loc) { return Rando::StaticData::GetLocation(loc)->IsCategory(Category::cSong); });
+              ctx->allLocations, [](const auto loc) { return Rando::StaticData::GetLocation(loc)->GetRCType() == RCTYPE_SONG_LOCATION; });
 
       } else if (ctx->GetOption(RSK_SHUFFLE_SONGS).Is(RO_SONG_SHUFFLE_DUNGEON_REWARDS)) {
           songLocations = FilterFromPool(ctx->allLocations, [](const auto loc) {
-              return Rando::StaticData::GetLocation(loc)->IsCategory(Category::cSongDungeonReward);
+            return Rando::StaticData::GetLocation(loc)->GetRCType() == RCTYPE_BOSS_HEART_OR_OTHER_REWARD ||
+                   loc == RC_SHEIK_IN_ICE_CAVERN ||
+                   loc == RC_SONG_FROM_IMPA;
           });
       }
 
@@ -1282,26 +1285,25 @@ int Fill() {
     StopPerformanceTimer(PT_REMAINING_ITEMS);
 
     //Add default prices to scrubs
-    for (size_t i = 0; i < Rando::StaticData::scrubLocations.size(); i++) {
-      if (Rando::StaticData::scrubLocations[i] == RC_LW_DEKU_SCRUB_NEAR_BRIDGE || Rando::StaticData::scrubLocations[i] == RC_LW_DEKU_SCRUB_GROTTO_FRONT) {
-        ctx->GetItemLocation(Rando::StaticData::scrubLocations[i])->SetCustomPrice(40);
-      } else if (Rando::StaticData::scrubLocations[i] == RC_HF_DEKU_SCRUB_GROTTO) {
-        ctx->GetItemLocation(Rando::StaticData::scrubLocations[i])->SetCustomPrice(10);
+    for (RandomizerCheck& randomizerCheck : Rando::StaticData::GetScrubLocations()) {
+      if (randomizerCheck == RC_LW_DEKU_SCRUB_NEAR_BRIDGE || randomizerCheck == RC_LW_DEKU_SCRUB_GROTTO_FRONT) {
+        ctx->GetItemLocation(randomizerCheck)->SetCustomPrice(40);
+      } else if (randomizerCheck == RC_HF_DEKU_SCRUB_GROTTO) {
+        ctx->GetItemLocation(randomizerCheck)->SetCustomPrice(10);
       } else {
-        auto loc = Rando::StaticData::GetLocation(Rando::StaticData::scrubLocations[i]);
+        auto loc = Rando::StaticData::GetLocation(randomizerCheck);
         auto item = Rando::StaticData::RetrieveItem(loc->GetVanillaItem());
-        ctx->GetItemLocation(Rando::StaticData::scrubLocations[i])->SetCustomPrice(item.GetPrice());
+        ctx->GetItemLocation(randomizerCheck)->SetCustomPrice(item.GetPrice());
       }
     }
 
     if (ctx->GetOption(RSK_SHUFFLE_SCRUBS).Is(RO_SCRUBS_AFFORDABLE)) {
-      for (size_t i = 0; i < Rando::StaticData::scrubLocations.size(); i++) {
-        ctx->GetItemLocation(Rando::StaticData::scrubLocations[i])->SetCustomPrice(10);
+      for (RandomizerCheck& randomizerCheck : Rando::StaticData::GetScrubLocations()) {
+        ctx->GetItemLocation(randomizerCheck)->SetCustomPrice(10);
       }
     } else if (ctx->GetOption(RSK_SHUFFLE_SCRUBS).Is(RO_SCRUBS_RANDOM)) {
-      for (size_t i = 0; i < Rando::StaticData::scrubLocations.size(); i++) {
-        int randomPrice = GetRandomScrubPrice();
-        ctx->GetItemLocation(Rando::StaticData::scrubLocations[i])->SetCustomPrice(randomPrice);
+      for (RandomizerCheck& randomizerCheck : Rando::StaticData::GetScrubLocations()) {
+        ctx->GetItemLocation(randomizerCheck)->SetCustomPrice(GetRandomScrubPrice());
       }
     }
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.cpp b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
index aca523072..9b4eeedf8 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hints.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
@@ -136,7 +136,7 @@ bool FilterFoolishLocations(RandomizerCheck loc){
 
 bool FilterSongLocations(RandomizerCheck loc){
   auto ctx = Rando::Context::GetInstance();
-  return Rando::StaticData::GetLocation(loc)->IsCategory(Category::cSong);
+  return Rando::StaticData::GetLocation(loc)->GetRCType() == RCTYPE_SONG_LOCATION;
 }
 
 bool FilterOverworldLocations(RandomizerCheck loc){
@@ -316,7 +316,7 @@ std::vector<std::pair<RandomizerCheck, std::function<bool()>>> conditionalAlways
 };
 
 static std::vector<RandomizerCheck> GetEmptyGossipStones() {
-  auto emptyGossipStones = GetEmptyLocations(Rando::StaticData::gossipStoneLocations);
+  auto emptyGossipStones = GetEmptyLocations(Rando::StaticData::GetGossipStoneLocations());
   return emptyGossipStones;
 }
 
@@ -328,7 +328,7 @@ static std::vector<RandomizerCheck> GetAccessibleGossipStones(const RandomizerCh
   ctx->GetItemLocation(hintedLocation)->SetPlacedItem(RG_NONE);
 
   ctx->GetLogic()->Reset();
-  auto accessibleGossipStones = ReachabilitySearch(Rando::StaticData::gossipStoneLocations);
+  auto accessibleGossipStones = ReachabilitySearch(Rando::StaticData::GetGossipStoneLocations());
   //Give the item back to the location
   ctx->GetItemLocation(hintedLocation)->SetPlacedItem(originalItem);
 
@@ -405,8 +405,8 @@ static bool CreateHint(RandomizerCheck location, uint8_t copies, HintType type,
 
   //get a gossip stone accessible without the hinted item
   std::vector<RandomizerCheck> gossipStoneLocations = GetAccessibleGossipStones(location);
-  if (gossipStoneLocations.empty()) { 
-      SPDLOG_DEBUG("\tNO IN LOGIC GOSSIP STONE\n\n"); 
+  if (gossipStoneLocations.empty()) {
+      SPDLOG_DEBUG("\tNO IN LOGIC GOSSIP STONE\n\n");
       return false;
   }
   RandomizerCheck gossipStone = RandomElement(gossipStoneLocations);
diff --git a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
index f7250e17d..33e6df5d4 100644
--- a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
@@ -613,7 +613,7 @@ static void PlaceVanillaCowMilk() {
 
 static void PlaceVanillaOverworldFish() {
   auto ctx = Rando::Context::GetInstance();
-  for (auto rc : Rando::StaticData::overworldFishLocations) {
+  for (auto rc : Rando::StaticData::GetOverworldFishLocations()) {
     ctx->PlaceItemInLocation(rc, RG_FISH, false, true);
   }
 }
@@ -830,7 +830,7 @@ void GenerateItemPool() {
     }
     // 9 grotto fish, 5 zora's domain fish
     if (fsMode.Is(RO_FISHSANITY_OVERWORLD) || fsMode.Is(RO_FISHSANITY_BOTH)) {
-      for (uint8_t i = 0; i < Rando::StaticData::overworldFishLocations.size(); i++)
+      for (uint8_t i = 0; i < Rando::StaticData::GetOverworldFishLocations().size(); i++)
         AddItemToMainPool(GetJunkItem());
     } else {
       PlaceVanillaOverworldFish();
@@ -936,11 +936,11 @@ void GenerateItemPool() {
   };
 
   if (ctx->GetOption(RSK_SHUFFLE_TOKENS).Is(RO_TOKENSANITY_OFF)) {
-    for (RandomizerCheck loc : ctx->GetLocations(ctx->allLocations, Category::cSkulltula)) {
+    for (RandomizerCheck loc : ctx->GetLocations(ctx->allLocations, RCTYPE_SKULL_TOKEN)) {
       ctx->PlaceItemInLocation(loc, RG_GOLD_SKULLTULA_TOKEN, false, true);
     }
   } else if (ctx->GetOption(RSK_SHUFFLE_TOKENS).Is(RO_TOKENSANITY_DUNGEONS)) {
-    for (RandomizerCheck loc : ctx->GetLocations(ctx->allLocations, Category::cSkulltula)) {
+    for (RandomizerCheck loc : ctx->GetLocations(ctx->allLocations, RCTYPE_SKULL_TOKEN)) {
       if (Rando::StaticData::GetLocation(loc)->IsOverworld()) {
           ctx->PlaceItemInLocation((RandomizerCheck)loc, RG_GOLD_SKULLTULA_TOKEN, false, true);
       } else {
@@ -948,7 +948,7 @@ void GenerateItemPool() {
       }
     }
   } else if (ctx->GetOption(RSK_SHUFFLE_TOKENS).Is(RO_TOKENSANITY_OVERWORLD)) {
-    for (RandomizerCheck loc : ctx->GetLocations(ctx->allLocations, Category::cSkulltula)) {
+    for (RandomizerCheck loc : ctx->GetLocations(ctx->allLocations, RCTYPE_SKULL_TOKEN)) {
       if (Rando::StaticData::GetLocation(loc)->IsDungeon()) {
           ctx->PlaceItemInLocation((RandomizerCheck)loc, RG_GOLD_SKULLTULA_TOKEN, false, true);
       } else {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
index 33ef7ccbd..6fc4c04c9 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
@@ -47,7 +47,7 @@ bool LocationAccess::ConditionsMet() const {
 bool LocationAccess::CanBuy() const {
   auto ctx = Rando::Context::GetInstance();
   //Not a shop or scrub location, don't need to check if buyable
-  if (!(Rando::StaticData::GetLocation(location)->IsCategory(Category::cShop)) && !(Rando::StaticData::GetLocation(location)->IsCategory(Category::cDekuScrub))) {
+  if (Rando::StaticData::GetLocation(location)->GetRCType() != RCTYPE_SHOP && Rando::StaticData::GetLocation(location)->GetRCType() != RCTYPE_SCRUB) {
     return true;
   }
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/shops.cpp b/soh/soh/Enhancements/randomizer/3drando/shops.cpp
index 6f785b505..1aeb3379b 100644
--- a/soh/soh/Enhancements/randomizer/3drando/shops.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/shops.cpp
@@ -15,13 +15,11 @@ bool initTrickNames = false; //Indicates if trick ice trap names have been initi
 
 //Set vanilla shop item locations before potentially shuffling
 void PlaceVanillaShopItems() {
-   auto ctx = Rando::Context::GetInstance();
-  //Loop to place vanilla items in each location
-  for (size_t i = 0; i < Rando::StaticData::shopLocationLists.size(); i++) {
-    for (size_t j = 0; j < Rando::StaticData::shopLocationLists[i].size(); j++) {
-      ctx->GetItemLocation(Rando::StaticData::shopLocationLists[i][j])->PlaceVanillaItem();
+    auto ctx = Rando::Context::GetInstance();
+    //Loop to place vanilla items in each location
+    for (RandomizerCheck& randomizerCheck : Rando::StaticData::GetShopLocations()) {
+        ctx->GetItemLocation(randomizerCheck)->PlaceVanillaItem();
     }
-  }
 }
 
 //These are the vanilla shop items, but in a priority order of importance
diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
index 9bd24b432..10301d297 100644
--- a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
@@ -85,9 +85,9 @@ void WriteIngameSpoilerLog() {
     uint16_t spoilerItemIndex = 0;
     uint32_t spoilerStringOffset = 0;
     uint16_t spoilerSphereItemoffset = 0;
-    uint16_t spoilerGroupOffset = 0;
-    // Intentionally junk value so we trigger the 'new group, record some stuff' code
-    uint8_t currentGroup = SpoilerCollectionCheckGroup::SPOILER_COLLECTION_GROUP_COUNT;
+    uint16_t spoilerAreaOffset = 0;
+    // Intentionally junk value so we trigger the 'new area, record some stuff' code
+    RandomizerCheckArea currentArea = RandomizerCheckArea::RCAREA_INVALID;
     bool spoilerOutOfSpace = false;
 
     // Create map of string data offsets for all _unique_ item locations and names in the playthrough
@@ -99,12 +99,12 @@ void WriteIngameSpoilerLog() {
         stringOffsetMap; // Map of strings to their offset into spoiler string data array
     stringOffsetMap.reserve(ctx->allLocations.size() * 2);
 
-    // Sort all locations by their group, so the in-game log can show a group of items by simply starting/ending at
+    // Sort all locations by their area, so the in-game log can show a area of items by simply starting/ending at
     // certain indices
     std::stable_sort(ctx->allLocations.begin(), ctx->allLocations.end(), [](const RandomizerCheck& a, const RandomizerCheck& b) {
-        auto groupA = Rando::StaticData::GetLocation(a)->GetCollectionCheckGroup();
-        auto groupB = Rando::StaticData::GetLocation(b)->GetCollectionCheckGroup();
-        return groupA < groupB;
+        RandomizerCheckArea areaA = Rando::StaticData::GetLocation(a)->GetArea();
+        RandomizerCheckArea areaB = Rando::StaticData::GetLocation(b)->GetArea();
+        return areaA < areaB;
     });
 
     for (const RandomizerCheck key : ctx->allLocations) {
@@ -116,30 +116,29 @@ void WriteIngameSpoilerLog() {
         //     continue;
         // }
         // Beehives
-        if (!ctx->GetOption(RSK_SHUFFLE_BEEHIVES) && loc->IsCategory(Category::cBeehive)) {
+        if (!ctx->GetOption(RSK_SHUFFLE_BEEHIVES) && loc->GetRCType() == RCTYPE_BEEHIVE) {
             continue;
         }
         // Cows
-        else if (!ctx->GetOption(RSK_SHUFFLE_COWS) && loc->IsCategory(Category::cCow)) {
+        else if (!ctx->GetOption(RSK_SHUFFLE_COWS) && loc->GetRCType() == RCTYPE_COW) {
             continue;
         }
         // Merchants
-        else if (ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_OFF) && loc->IsCategory(Category::cMerchant)) {
+        else if (ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_OFF) && loc->GetRCType() == RCTYPE_MERCHANT) {
             continue;
         }
         // Adult Trade
-        else if (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && loc->IsCategory(Category::cAdultTrade)) {
+        else if (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && loc->GetRCType() == RCTYPE_ADULT_TRADE) {
             continue;
         }
         // Chest Minigame
-        else if (ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_GENERIC_OFF) &&
-                 loc->IsCategory(Category::cChestMinigame)) {
+        else if (ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_GENERIC_OFF) && loc->GetRCType() == RCTYPE_CHEST_GAME) {
             continue;
         }
         // Gerudo Fortress
         else if ((ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_NORMAL) &&
-                  (loc->IsCategory(Category::cVanillaGFSmallKey) || loc->GetHintKey() == RHT_GF_GERUDO_MEMBERSHIP_CARD)) ||
-                 (ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_FAST) && loc->IsCategory(Category::cVanillaGFSmallKey) &&
+                  (loc->GetRCType() == RCTYPE_GF_KEY || loc->GetHintKey() == RHT_GF_GERUDO_MEMBERSHIP_CARD)) ||
+                 (ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_FAST) && loc->GetRCType() == RCTYPE_GF_KEY &&
                   loc->GetHintKey() != RHT_GF_NORTH_F1_CARPENTER)) {
             continue;
         }
@@ -160,7 +159,7 @@ void WriteIngameSpoilerLog() {
         }
         // PURPLE TODO: LOCALIZATION
         auto locItem = itemLocation->GetPlacedItemName().GetEnglish();
-        if (itemLocation->GetPlacedRandomizerGet() == RG_ICE_TRAP && loc->IsCategory(Category::cShop)) {
+        if (itemLocation->GetPlacedRandomizerGet() == RG_ICE_TRAP && loc->GetRCType() == RCTYPE_SHOP) {
             locItem = NonShopItems[TransformShopIndex(GetShopIndex(key))].Name.GetEnglish();
         }
         if (stringOffsetMap.find(locItem) == stringOffsetMap.end()) {
@@ -201,29 +200,37 @@ void WriteIngameSpoilerLog() {
             }
         }
         // Gold Skulltulas
-        else if (loc->IsCategory(Category::cSkulltula) &&
+        else if (loc->GetRCType() == RCTYPE_SKULL_TOKEN &&
                  ((ctx->GetOption(RSK_SHUFFLE_TOKENS).Is(RO_TOKENSANITY_OFF)) ||
                   (ctx->GetOption(RSK_SHUFFLE_TOKENS).Is(RO_TOKENSANITY_DUNGEONS) && !loc->IsDungeon()) ||
                   (ctx->GetOption(RSK_SHUFFLE_TOKENS).Is(RO_TOKENSANITY_OVERWORLD) && loc->IsDungeon()))) {
             spoilerData.ItemLocations[spoilerItemIndex].RevealType = REVEALTYPE_ALWAYS;
         }
         // Deku Scrubs
-        else if (loc->IsCategory(Category::cDekuScrub) && !loc->IsCategory(Category::cDekuScrubUpgrades) &&
-                 ctx->GetOption(RSK_SHUFFLE_SCRUBS).Is(RO_SCRUBS_OFF)) {
+        else if (
+            loc->GetRCType() == RCTYPE_SCRUB &&
+            // these 3 scrubs are always randomized
+            !(
+                loc->GetRandomizerCheck() == RC_LW_DEKU_SCRUB_NEAR_BRIDGE ||
+                loc->GetRandomizerCheck() == RC_LW_DEKU_SCRUB_GROTTO_FRONT ||
+                loc->GetRandomizerCheck() == RC_HF_DEKU_SCRUB_GROTTO
+            ) &&
+            ctx->GetOption(RSK_SHUFFLE_SCRUBS).Is(RO_SCRUBS_OFF)
+        ) {
             spoilerData.ItemLocations[spoilerItemIndex].CollectType = COLLECTTYPE_REPEATABLE;
             spoilerData.ItemLocations[spoilerItemIndex].RevealType = REVEALTYPE_ALWAYS;
         }
 
-        auto checkGroup = loc->GetCollectionCheckGroup();
-        spoilerData.ItemLocations[spoilerItemIndex].Group = checkGroup;
+        RandomizerCheckArea checkArea = loc->GetArea();
+        spoilerData.ItemLocations[spoilerItemIndex].Area = checkArea;
 
-        // Group setup
-        if (checkGroup != currentGroup) {
-            currentGroup = checkGroup;
-            spoilerData.GroupOffsets[currentGroup] = spoilerGroupOffset;
+        // Area setup
+        if (checkArea != currentArea) {
+            currentArea = checkArea;
+            spoilerData.AreaOffsets[currentArea] = spoilerAreaOffset;
         }
-        ++spoilerData.GroupItemCounts[currentGroup];
-        ++spoilerGroupOffset;
+        ++spoilerData.AreaItemCounts[currentArea];
+        ++spoilerAreaOffset;
 
         itemLocationsMap[key] = spoilerItemIndex++;
     }
@@ -287,7 +294,7 @@ static void WriteLocation(
 
   //   // Insert a padding so we get a kind of table in the XML document.
   //   int16_t requiredPadding = LONGEST_NAME - location->GetName().length();
-  //   if (location->IsCategory(Category::cShop)) {
+  //   if (location->GetRCType() == RCTYPE_SHOP) {
   //     // Shop items have short location names, but come with an additional price attribute.
   //     requiredPadding -= PRICE_ATTRIBUTE;
   //   }
@@ -297,7 +304,7 @@ static void WriteLocation(
   //   }
   // }
 
-  // if (location->IsCategory(Category::cShop)) {
+  // if (location->GetRCType() == RCTYPE_SHOP) {
   //   char price[6];
   //   sprintf(price, "%03d", location->GetPrice());
   //   node->SetAttribute("price", price);
diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.hpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.hpp
index 89b9d36bc..bf2fd9f60 100644
--- a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.hpp
@@ -11,53 +11,16 @@ using RandomizerHash = std::array<std::string, 5>;
 
 typedef enum {
     SPOILER_CHK_NONE,
-    SPOILER_CHK_ALWAYS_COLLECTED,
     SPOILER_CHK_CHEST,
     SPOILER_CHK_COLLECTABLE,
     SPOILER_CHK_GOLD_SKULLTULA,
     SPOILER_CHK_ITEM_GET_INF,
     SPOILER_CHK_EVENT_CHK_INF,
     SPOILER_CHK_INF_TABLE,
-    SPOILER_CHK_FISH,
-    SPOILER_CHK_MINIGAME,
-    SPOILER_CHK_POE_POINTS,
-    SPOILER_CHK_SHOP_ITEM,
-    SPOILER_CHK_MASTER_SWORD,
     SPOILER_CHK_GRAVEDIGGER,
     SPOILER_CHK_RANDOMIZER_INF,
 } SpoilerCollectionCheckType;
 
-// GetLocation groups for checks, used to group the checks by logical location
-typedef enum {
-    GROUP_NO_GROUP,
-    GROUP_KOKIRI_FOREST,              // 0x55, 0x28
-    GROUP_LOST_WOODS,                 // 0x5B, 0x56
-    GROUP_DUNGEON_DEKU_TREE,          // 0x00, 0x11
-    GROUP_DUNGEON_FOREST_TEMPLE,      // 0x03
-    GROUP_KAKARIKO,                   // 0x37, 0x42, 0x3F, 0x40, 0x41, 0x48, 0x52, 0x53
-    GROUP_DUNGEON_BOTTOM_OF_THE_WELL, // 0x08
-    GROUP_DUNGEON_SHADOW_TEMPLE,      // 0x07
-    GROUP_DEATH_MOUNTAIN,             // 0x60, 0x61
-    GROUP_GORON_CITY,                 // 0x62
-    GROUP_DUNGEON_DODONGOS_CAVERN,    // 0x01, 0x12
-    GROUP_DUNGEON_FIRE_TEMPLE,        // 0x04
-    GROUP_ZORAS_RIVER,                // 0x54
-    GROUP_ZORAS_DOMAIN,               // 0x58, 0x59
-    GROUP_DUNGEON_JABUJABUS_BELLY,    // 0x02, 0x13
-    GROUP_DUNGEON_ICE_CAVERN,         // 0x09
-    GROUP_HYRULE_FIELD,               // 0x51
-    GROUP_LON_LON_RANCH,              // 0x4C
-    GROUP_LAKE_HYLIA,                 // 0x57
-    GROUP_DUNGEON_WATER_TEMPLE,       // 0x05
-    GROUP_GERUDO_VALLEY,              // 0x5A, 0x5D, 0x0C, 0x5E, 0x5C
-    GROUP_GERUDO_TRAINING_GROUND,     // 0x0B
-    GROUP_DUNGEON_SPIRIT_TEMPLE,      // 0x06
-    GROUP_HYRULE_CASTLE,              // 0x10, 0x4B, 0x35, 0x42, 0x4D, 0x5F, 0x4A
-    GROUP_DUNGEON_GANONS_CASTLE,      // 0x0A, 0x0D, 0x0E, 0x0F
-    SPOILER_COLLECTION_GROUP_COUNT,
-    // Grottos are all 0x3E
-} SpoilerCollectionCheckGroup;
-
 typedef enum {
     COLLECTTYPE_NORMAL,
     COLLECTTYPE_REPEATABLE,
@@ -82,7 +45,7 @@ typedef struct {
     SpoilerCollectionCheckType CollectionCheckType;
     uint8_t LocationScene;
     uint8_t LocationFlag;
-    SpoilerCollectionCheckGroup Group;
+    RandomizerCheckArea Area;
     SpoilerItemCollectType CollectType;
     SpoilerItemRevealType RevealType;
 } SpoilerItemLocation;
@@ -99,8 +62,8 @@ typedef struct {
     SpoilerItemLocation ItemLocations[SPOILER_ITEMS_MAX];
     uint16_t SphereItemLocations[SPOILER_ITEMS_MAX];
     char StringData[SPOILER_STRING_DATA_SIZE];
-    uint16_t GroupItemCounts[SPOILER_COLLECTION_GROUP_COUNT];
-    uint16_t GroupOffsets[SPOILER_COLLECTION_GROUP_COUNT];
+    uint16_t AreaItemCounts[RCAREA_INVALID];
+    uint16_t AreaOffsets[RCAREA_INVALID];
 } SpoilerData;
 
 void GenerateHash();
diff --git a/soh/soh/Enhancements/randomizer/context.cpp b/soh/soh/Enhancements/randomizer/context.cpp
index b79bbcae1..09a6b40d5 100644
--- a/soh/soh/Enhancements/randomizer/context.cpp
+++ b/soh/soh/Enhancements/randomizer/context.cpp
@@ -105,7 +105,7 @@ void Context::PlaceItemInLocation(const RandomizerCheck locKey, const Randomizer
 
     // If we're placing a non-shop item in a shop location, we want to record it for custom messages
     if (StaticData::RetrieveItem(item).GetItemType() != ITEMTYPE_SHOP &&
-        StaticData::GetLocation(locKey)->IsCategory(Category::cShop)) {
+        StaticData::GetLocation(locKey)->GetRCType() == RCTYPE_SHOP) {
         const int index = TransformShopIndex(GetShopIndex(locKey));
         NonShopItems[index].Name = StaticData::RetrieveItem(item).GetName();
         NonShopItems[index].Repurchaseable =
@@ -136,11 +136,11 @@ void Context::AddLocations(const Container& locations, std::vector<RandomizerChe
 
 void Context::GenerateLocationPool() {
     allLocations.clear();
-    AddLocation(RC_LINKS_POCKET);
+    //AddLocation(RC_LINKS_POCKET); this is being added twice now
     if (mSettings->GetOption(RSK_TRIFORCE_HUNT)) {
         AddLocation(RC_TRIFORCE_COMPLETED);
     }
-    AddLocations(StaticData::overworldLocations);
+    AddLocations(StaticData::GetOverworldLocations());
 
     if (mSettings->GetOption(RSK_FISHSANITY).IsNot(RO_FISHSANITY_OFF)) {
         AddLocations(mFishsanity->GetFishsanityLocations().first);
@@ -152,7 +152,7 @@ void Context::GenerateLocationPool() {
 }
 
 void Context::AddExcludedOptions() {
-    AddLocations(StaticData::overworldLocations, &everyPossibleLocation);
+    AddLocations(StaticData::GetOverworldLocations(), &everyPossibleLocation);
     for (const auto dungeon : mDungeons->GetDungeonList()) {
         AddLocations(dungeon->GetEveryLocation(), &everyPossibleLocation);
     }
@@ -161,16 +161,14 @@ void Context::AddExcludedOptions() {
     }
 }
 
-std::vector<RandomizerCheck> Context::GetLocations(const std::vector<RandomizerCheck>& locationPool,
-                                                   const Category categoryInclude, const Category categoryExclude) {
-    std::vector<RandomizerCheck> locationsInCategory;
+std::vector<RandomizerCheck> Context::GetLocations(const std::vector<RandomizerCheck>& locationPool, const RandomizerCheckType checkType) {
+    std::vector<RandomizerCheck> locationsOfType;
     for (RandomizerCheck locKey : locationPool) {
-        if (StaticData::GetLocation(locKey)->IsCategory(categoryInclude) &&
-            !StaticData::GetLocation(locKey)->IsCategory(categoryExclude)) {
-            locationsInCategory.push_back(locKey);
+        if (StaticData::GetLocation(locKey)->GetRCType() == checkType) {
+            locationsOfType.push_back(locKey);
         }
     }
-    return locationsInCategory;
+    return locationsOfType;
 }
 
 void Context::ClearItemLocations() {
@@ -198,17 +196,17 @@ void Context::LocationReset() {
         GetItemLocation(il)->RemoveFromPool();
     }
 
-    for (const RandomizerCheck il : StaticData::gossipStoneLocations) {
+    for (const RandomizerCheck il : StaticData::GetGossipStoneLocations()) {
         GetItemLocation(il)->RemoveFromPool();
     }
 
-    for (const RandomizerCheck il : StaticData::staticHintLocations) {
+    for (const RandomizerCheck il : StaticData::GetStaticHintLocations()) {
         GetItemLocation(il)->RemoveFromPool();
     }
 }
 
 void Context::HintReset() {
-    for (const RandomizerCheck il : StaticData::gossipStoneLocations) {
+    for (const RandomizerCheck il : StaticData::GetGossipStoneLocations()) {
         GetItemLocation(il)->ResetVariables();
     }
     for (Hint& hint : hintTable){
@@ -227,7 +225,7 @@ void Context::CreateItemOverrides() {
             iceTrapModels[locKey] = val.LooksLike();
             val.SetTrickName(GetIceTrapName(val.LooksLike()));
             // If this is ice trap is in a shop, change the name based on what the model will look like
-            if (loc->IsCategory(Category::cShop)) {
+            if (loc->GetRCType() == RCTYPE_SHOP) {
                 NonShopItems[TransformShopIndex(GetShopIndex(locKey))].Name = val.GetTrickName();
             }
             overrides[locKey] = val;
diff --git a/soh/soh/Enhancements/randomizer/context.h b/soh/soh/Enhancements/randomizer/context.h
index 1e0ea1aae..a1a7d0d54 100644
--- a/soh/soh/Enhancements/randomizer/context.h
+++ b/soh/soh/Enhancements/randomizer/context.h
@@ -50,8 +50,7 @@ class Context {
     template <typename Container>
     void AddLocations(const Container& locations, std::vector<RandomizerCheck>* destination = nullptr);
     void GenerateLocationPool();
-    static std::vector<RandomizerCheck> GetLocations(const std::vector<RandomizerCheck>& locationPool,
-                                              Category categoryInclude, Category categoryExclude = Category::cNull);
+    static std::vector<RandomizerCheck> GetLocations(const std::vector<RandomizerCheck>& locationPool, const RandomizerCheckType checkType);
     void AddExcludedOptions();
     void LocationReset();
     void ClearItemLocations();
diff --git a/soh/soh/Enhancements/randomizer/dungeon.cpp b/soh/soh/Enhancements/randomizer/dungeon.cpp
index 0f799b036..8484288a5 100644
--- a/soh/soh/Enhancements/randomizer/dungeon.cpp
+++ b/soh/soh/Enhancements/randomizer/dungeon.cpp
@@ -100,7 +100,7 @@ void DungeonInfo::PlaceVanillaMap() const {
 
     auto dungeonLocations = GetDungeonLocations();
     const auto mapLocation = FilterFromPool(dungeonLocations, [](const RandomizerCheck loc) {
-        return StaticData::GetLocation(loc)->IsCategory(Category::cVanillaMap);
+        return StaticData::GetLocation(loc)->GetRCType() == RCTYPE_MAP;
     })[0];
     Context::GetInstance()->PlaceItemInLocation(mapLocation, map);
 }
@@ -112,7 +112,7 @@ void DungeonInfo::PlaceVanillaCompass() const {
 
     auto dungeonLocations = GetDungeonLocations();
     const auto compassLocation = FilterFromPool(dungeonLocations, [](const RandomizerCheck loc) {
-        return StaticData::GetLocation(loc)->IsCategory(Category::cVanillaCompass);
+        return StaticData::GetLocation(loc)->GetRCType() == RCTYPE_COMPASS;
     })[0];
     Context::GetInstance()->PlaceItemInLocation(compassLocation, compass);
 }
@@ -124,7 +124,7 @@ void DungeonInfo::PlaceVanillaBossKey() const {
 
     auto dungeonLocations = GetDungeonLocations();
     const auto bossKeyLocation = FilterFromPool(dungeonLocations, [](const RandomizerCheck loc) {
-        return StaticData::GetLocation(loc)->IsCategory(Category::cVanillaBossKey);
+        return StaticData::GetLocation(loc)->GetRCType() == RCTYPE_BOSS_KEY;
     })[0];
     Context::GetInstance()->PlaceItemInLocation(bossKeyLocation, bossKey);
 }
@@ -136,7 +136,7 @@ void DungeonInfo::PlaceVanillaSmallKeys() const {
 
     auto dungeonLocations = GetDungeonLocations();
     const auto smallKeyLocations = FilterFromPool(dungeonLocations, [](const RandomizerCheck loc) {
-        return StaticData::GetLocation(loc)->IsCategory(Category::cVanillaSmallKey);
+        return StaticData::GetLocation(loc)->GetRCType() == RCTYPE_SMALL_KEY;
     });
     for (const auto location : smallKeyLocations) {
         Context::GetInstance()->PlaceItemInLocation(location, smallKey);
diff --git a/soh/soh/Enhancements/randomizer/fishsanity.cpp b/soh/soh/Enhancements/randomizer/fishsanity.cpp
index 52789f17e..5c0eda475 100644
--- a/soh/soh/Enhancements/randomizer/fishsanity.cpp
+++ b/soh/soh/Enhancements/randomizer/fishsanity.cpp
@@ -87,10 +87,10 @@ namespace Rando {
         auto [mode, numFish, ageSplit] = GetOptions(optionsSource);
         std::vector<RandomizerCheck> activeFish;
         std::vector<RandomizerCheck> remainingFish;
+        std::vector<RandomizerCheck> pondFish = Rando::StaticData::GetPondFishLocations();
 
         // Fishsanity_InitializeHelpers();
-        remainingFish.insert(remainingFish.end(), Rando::StaticData::pondFishLocations.begin(),
-                             Rando::StaticData::pondFishLocations.end());
+        remainingFish.insert(remainingFish.end(), pondFish.begin(), pondFish.end());
 
         // No pond fish shuffled
         if (numFish == 0) {
@@ -138,8 +138,8 @@ namespace Rando {
 
         // Add overworld fish
         if (mode == RO_FISHSANITY_OVERWORLD || mode == RO_FISHSANITY_BOTH) {
-            activeFish.insert(activeFish.end(), Rando::StaticData::overworldFishLocations.begin(),
-                              Rando::StaticData::overworldFishLocations.end());
+            std::vector<RandomizerCheck> overworldFish = Rando::StaticData::GetOverworldFishLocations();
+            activeFish.insert(activeFish.end(), overworldFish.begin(), overworldFish.end());
         }
 
         return std::make_pair(activeFish, remainingFish);
@@ -299,11 +299,11 @@ namespace Rando {
 
     FishsanityCheckType Fishsanity::GetCheckType(RandomizerCheck rc) {
         // Is this a pond fish?
-        if (std::binary_search(Rando::StaticData::pondFishLocations.begin(), Rando::StaticData::pondFishLocations.end(), rc))
+        if (std::binary_search(Rando::StaticData::GetPondFishLocations().begin(), Rando::StaticData::GetPondFishLocations().end(), rc))
             return FSC_POND;
 
         // Is this an overworld fish?
-        if (std::binary_search(Rando::StaticData::overworldFishLocations.begin(), Rando::StaticData::overworldFishLocations.end(), rc)) {
+        if (std::binary_search(Rando::StaticData::GetOverworldFishLocations().begin(), Rando::StaticData::GetOverworldFishLocations().end(), rc)) {
             if (rc < RC_ZD_FISH_1)
                 return FSC_GROTTO;
             else
diff --git a/soh/soh/Enhancements/randomizer/item_location.cpp b/soh/soh/Enhancements/randomizer/item_location.cpp
index d303b3c3b..1ff41c411 100644
--- a/soh/soh/Enhancements/randomizer/item_location.cpp
+++ b/soh/soh/Enhancements/randomizer/item_location.cpp
@@ -174,13 +174,13 @@ void ItemLocation::AddExcludeOption() {
     // RANDOTODO: this without string compares and loops
     bool alreadyAdded = false;
     const Location* loc = StaticData::GetLocation(rc);
-    for (const Option* location : Context::GetInstance()->GetSettings()->GetExcludeOptionsForGroup(loc->GetCollectionCheckGroup())) {
+    for (const Option* location : Context::GetInstance()->GetSettings()->GetExcludeOptionsForArea(loc->GetArea())) {
         if (location->GetName() == excludedOption.GetName()) {
             alreadyAdded = true;
         }
     }
     if (!alreadyAdded) {
-        Context::GetInstance()->GetSettings()->GetExcludeOptionsForGroup(loc->GetCollectionCheckGroup()).push_back(&excludedOption);
+        Context::GetInstance()->GetSettings()->GetExcludeOptionsForArea(loc->GetArea()).push_back(&excludedOption);
     }
 }
 
diff --git a/soh/soh/Enhancements/randomizer/location.cpp b/soh/soh/Enhancements/randomizer/location.cpp
index ddc9f7fc2..9dfceb5ab 100644
--- a/soh/soh/Enhancements/randomizer/location.cpp
+++ b/soh/soh/Enhancements/randomizer/location.cpp
@@ -1,6 +1,7 @@
 #include "location.h"
 #include "static_data.h"
 #include <algorithm>
+#include <assert.h>
 
 RandomizerCheck Rando::Location::GetRandomizerCheck() const {
     return rc;
@@ -10,10 +11,6 @@ Rando::SpoilerCollectionCheck Rando::Location::GetCollectionCheck() const {
     return collectionCheck;
 }
 
-SpoilerCollectionCheckGroup Rando::Location::GetCollectionCheckGroup() const {
-    return collectionCheckGroup;
-}
-
 RandomizerCheckQuest Rando::Location::GetQuest() const {
     return quest;
 }
@@ -35,11 +32,7 @@ int32_t Rando::Location::GetActorParams() const {
 }
 
 SceneID Rando::Location::GetScene() const {
-    return static_cast<SceneID>(scene);
-}
-
-uint8_t Rando::Location::GetFlag() const {
-    return flag;
+    return scene;
 }
 
 RandomizerHintTextKey Rando::Location::GetHintKey() const {
@@ -58,19 +51,11 @@ const std::string& Rando::Location::GetShortName() const {
     return shortName;
 }
 
-Rando::LocationType Rando::Location::GetLocationType() const {
-    return locationType;
-}
-
-bool Rando::Location::IsCategory(Category category) const {
-    return std::any_of(categories.begin(), categories.end(), [category](auto entry) { return entry == category; });
-}
-
 bool Rando::Location::IsDungeon() const {
-    return (locationType != LocationType::GSToken &&
+    return (checkType != RCTYPE_SKULL_TOKEN &&
             (scene < SCENE_GANONS_TOWER_COLLAPSE_INTERIOR ||
              (scene > SCENE_TREASURE_BOX_SHOP && scene < SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR))) ||
-           (locationType == LocationType::GSToken && scene < SCENE_GANONS_TOWER);
+           (checkType == RCTYPE_SKULL_TOKEN && scene < SCENE_GANONS_TOWER);
 }
 
 bool Rando::Location::IsOverworld() const {
@@ -97,312 +82,277 @@ RandomizerGet Rando::Location::GetVanillaItem() const {
     return vanillaItem;
 }
 
-Rando::Location Rando::Location::Base(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
-                                      RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_, int32_t actorParams_,
-                                      uint8_t flag_, std::string&& shortName_, std::string&& spoilerName_,
-                                      const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
-                                      std::vector<Category>&& categories, SpoilerCollectionCheck collectionCheck,
-                                      SpoilerCollectionCheckGroup collectionCheckGroup, bool isVanillaCompletion_) {
-    return {rc, quest_, checkType_, area_, LocationType::Base, actorId_, scene_, actorParams_, flag_,
-                    std::move(shortName_), std::move(spoilerName_), hintKey, vanillaItem, std::move(categories),
-                    isVanillaCompletion_, collectionCheck, collectionCheckGroup};
+RandomizerCheckArea GetAreaFromScene(uint8_t scene) {
+    switch (scene) {
+        case SCENE_LINKS_HOUSE:
+        case SCENE_KOKIRI_FOREST:
+        case SCENE_KOKIRI_SHOP:
+        case SCENE_MIDOS_HOUSE:
+        case SCENE_KNOW_IT_ALL_BROS_HOUSE:
+        case SCENE_TWINS_HOUSE:
+        case SCENE_SARIAS_HOUSE:
+            return RCAREA_KOKIRI_FOREST;
+
+        case SCENE_LOST_WOODS:
+            return RCAREA_LOST_WOODS;
+
+        case SCENE_SACRED_FOREST_MEADOW:
+            return RCAREA_SACRED_FOREST_MEADOW;
+
+        case SCENE_HYRULE_FIELD:
+            return RCAREA_HYRULE_FIELD;
+
+        case SCENE_LAKE_HYLIA:
+        case SCENE_FISHING_POND:
+        case SCENE_LAKESIDE_LABORATORY:
+            return RCAREA_LAKE_HYLIA;
+
+        case SCENE_GERUDO_VALLEY:
+        case SCENE_CARPENTERS_TENT:
+            return RCAREA_GERUDO_VALLEY;
+
+        case SCENE_GERUDOS_FORTRESS:
+        case SCENE_THIEVES_HIDEOUT:
+            return RCAREA_GERUDO_FORTRESS;
+
+        case SCENE_HAUNTED_WASTELAND:
+            return RCAREA_WASTELAND;
+
+        case SCENE_DESERT_COLOSSUS:
+            return RCAREA_DESERT_COLOSSUS;
+
+        case SCENE_MARKET_ENTRANCE_DAY:
+        case SCENE_MARKET_ENTRANCE_NIGHT:
+        case SCENE_MARKET_ENTRANCE_RUINS:
+        case SCENE_BACK_ALLEY_DAY:
+        case SCENE_BACK_ALLEY_NIGHT:
+        case SCENE_BACK_ALLEY_HOUSE:
+        case SCENE_MARKET_DAY:
+        case SCENE_MARKET_NIGHT:
+        case SCENE_MARKET_RUINS:
+        case SCENE_TEMPLE_OF_TIME_EXTERIOR_DAY:
+        case SCENE_TEMPLE_OF_TIME_EXTERIOR_NIGHT:
+        case SCENE_TEMPLE_OF_TIME_EXTERIOR_RUINS:
+        case SCENE_TREASURE_BOX_SHOP:
+        case SCENE_BOMBCHU_BOWLING_ALLEY:
+        case SCENE_DOG_LADY_HOUSE:
+        case SCENE_MARKET_GUARD_HOUSE:
+        case SCENE_POTION_SHOP_MARKET:
+        case SCENE_BOMBCHU_SHOP:
+        case SCENE_HAPPY_MASK_SHOP:
+        case SCENE_TEMPLE_OF_TIME:
+            return RCAREA_MARKET;
+
+        case SCENE_HYRULE_CASTLE:
+        case SCENE_CASTLE_COURTYARD_GUARDS_DAY:
+        case SCENE_CASTLE_COURTYARD_GUARDS_NIGHT:
+        case SCENE_CASTLE_COURTYARD_ZELDA:
+        case SCENE_OUTSIDE_GANONS_CASTLE:
+            return RCAREA_HYRULE_CASTLE;
+
+        case SCENE_KAKARIKO_VILLAGE:
+        case SCENE_KAKARIKO_CENTER_GUEST_HOUSE:
+        case SCENE_HOUSE_OF_SKULLTULA:
+        case SCENE_POTION_SHOP_GRANNY:
+        case SCENE_IMPAS_HOUSE:
+        case SCENE_POTION_SHOP_KAKARIKO:
+        case SCENE_TEST01:
+            return RCAREA_KAKARIKO_VILLAGE;
+
+        case SCENE_GRAVEYARD:
+        case SCENE_ROYAL_FAMILYS_TOMB:
+        case SCENE_GRAVEKEEPERS_HUT:
+            return RCAREA_GRAVEYARD;
+
+        case SCENE_DEATH_MOUNTAIN_TRAIL:
+            return RCAREA_DEATH_MOUNTAIN_TRAIL;
+
+        case SCENE_GORON_CITY:
+        case SCENE_GORON_SHOP:
+            return RCAREA_GORON_CITY;
+
+        case SCENE_DEATH_MOUNTAIN_CRATER:
+            return RCAREA_DEATH_MOUNTAIN_CRATER;
+
+        case SCENE_ZORAS_RIVER:
+            return RCAREA_ZORAS_RIVER;
+
+        case SCENE_ZORAS_DOMAIN:
+        case SCENE_ZORA_SHOP:
+            return RCAREA_ZORAS_DOMAIN;
+
+        case SCENE_ZORAS_FOUNTAIN:
+            return RCAREA_ZORAS_FOUNTAIN;
+
+        case SCENE_LON_LON_RANCH:
+        case SCENE_LON_LON_BUILDINGS:
+        case SCENE_STABLE:
+            return RCAREA_LON_LON_RANCH;
+
+        case SCENE_DEKU_TREE:
+        case SCENE_DEKU_TREE_BOSS:
+            return RCAREA_DEKU_TREE;
+
+        case SCENE_DODONGOS_CAVERN:
+        case SCENE_DODONGOS_CAVERN_BOSS:
+            return RCAREA_DODONGOS_CAVERN;
+
+        case SCENE_JABU_JABU:
+        case SCENE_JABU_JABU_BOSS:
+            return RCAREA_JABU_JABUS_BELLY;
+
+        case SCENE_FOREST_TEMPLE:
+        case SCENE_FOREST_TEMPLE_BOSS:
+            return RCAREA_FOREST_TEMPLE;
+
+        case SCENE_FIRE_TEMPLE:
+        case SCENE_FIRE_TEMPLE_BOSS:
+            return RCAREA_FIRE_TEMPLE;
+
+        case SCENE_WATER_TEMPLE:
+        case SCENE_WATER_TEMPLE_BOSS:
+            return RCAREA_WATER_TEMPLE;
+
+        case SCENE_SPIRIT_TEMPLE:
+        case SCENE_SPIRIT_TEMPLE_BOSS:
+            return RCAREA_SPIRIT_TEMPLE;
+
+        case SCENE_SHADOW_TEMPLE:
+        case SCENE_SHADOW_TEMPLE_BOSS:
+            return RCAREA_SHADOW_TEMPLE;
+
+        case SCENE_BOTTOM_OF_THE_WELL:
+            return RCAREA_BOTTOM_OF_THE_WELL;
+
+        case SCENE_ICE_CAVERN:
+            return RCAREA_ICE_CAVERN;
+
+        case SCENE_GERUDO_TRAINING_GROUND:
+            return RCAREA_GERUDO_TRAINING_GROUND;
+
+        case SCENE_INSIDE_GANONS_CASTLE:
+        case SCENE_GANONS_TOWER_COLLAPSE_INTERIOR:
+        case SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR:
+        case SCENE_INSIDE_GANONS_CASTLE_COLLAPSE:
+        case SCENE_GANONS_TOWER:
+        case SCENE_GANON_BOSS:
+            return RCAREA_GANONS_CASTLE;
+        default:
+            assert(false);
+            return RCAREA_INVALID;
+    }
 }
 
-Rando::Location Rando::Location::Base(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
-                                      RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_, int32_t actorParams_,
-                                      uint8_t flag_, std::string&& shortName_,
-                                      const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
-                                      std::vector<Category>&& categories, SpoilerCollectionCheck collectionCheck,
-                                      SpoilerCollectionCheckGroup collectionCheckGroup, bool isVanillaCompletion_) {
-    return {rc, quest_, checkType_, area_, LocationType::Base, actorId_, scene_, actorParams_, flag_,
-                    std::move(shortName_), hintKey, vanillaItem, std::move(categories),
-                    isVanillaCompletion_, collectionCheck, collectionCheckGroup};
+Rando::Location Rando::Location::Base(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, ActorID actorId_, SceneID scene_, int32_t actorParams_,
+                                      std::string&& shortName_, std::string&& spoilerName_, const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
+                                      SpoilerCollectionCheck collectionCheck, bool isVanillaCompletion_) {
+    return { rc, quest_, checkType_, GetAreaFromScene(scene_), actorId_, scene_, actorParams_, std::move(shortName_), std::move(spoilerName_), hintKey, vanillaItem,
+                    isVanillaCompletion_, collectionCheck };
 }
 
-Rando::Location Rando::Location::Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
-                                       RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_,
-                                       int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
-                                       std::string&& spoilerName_, const RandomizerHintTextKey hintKey,
-                                       const RandomizerGet vanillaItem, std::vector<Category>&& categories,
-                                       SpoilerCollectionCheckGroup collectionCheckGroup, bool isVanillaCompletion_) {
-    return {rc, quest_, checkType_, area_, LocationType::Chest, actorId_, scene_, actorParams_, flag_,
-                    std::move(shortName_), std::move(spoilerName_), hintKey, vanillaItem, std::move(categories),
-                    isVanillaCompletion_,
-                    SpoilerCollectionCheck(SPOILER_CHK_CHEST, scene_, flag_),
-                    collectionCheckGroup};
+Rando::Location Rando::Location::Base(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_, ActorID actorId_, SceneID scene_,
+                                      int32_t actorParams_, std::string&& shortName_, std::string&& spoilerName_, const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
+                                      SpoilerCollectionCheck collectionCheck, bool isVanillaCompletion_) {
+    return { rc, quest_, checkType_, area_, actorId_, scene_, actorParams_, std::move(shortName_), std::move(spoilerName_), hintKey, vanillaItem, isVanillaCompletion_, collectionCheck };
 }
 
-Rando::Location Rando::Location::Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
-                                       RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_,
-                                       int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
-                                       const RandomizerHintTextKey hintKey,
-                                       const RandomizerGet vanillaItem, std::vector<Category>&& categories,
-                                       SpoilerCollectionCheckGroup collectionCheckGroup, bool isVanillaCompletion_) {
-    return {rc, quest_, checkType_, area_, LocationType::Chest, actorId_, scene_, actorParams_, flag_,
-                    std::move(shortName_), hintKey, vanillaItem, std::move(categories),
-                    isVanillaCompletion_,
-                    SpoilerCollectionCheck(SPOILER_CHK_CHEST, scene_, flag_),
-                    collectionCheckGroup};
+Rando::Location Rando::Location::Base(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, ActorID actorId_, SceneID scene_, int32_t actorParams_,
+                                      std::string&& shortName_, const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem, SpoilerCollectionCheck collectionCheck,
+                                      bool isVanillaCompletion_) {
+    return { rc, quest_, checkType_, GetAreaFromScene(scene_), actorId_, scene_, actorParams_, std::move(shortName_), hintKey, vanillaItem, isVanillaCompletion_, collectionCheck };
 }
 
-Rando::Location Rando::Location::Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
-                                       RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_,
-                                       int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
-                                       std::string&& spoilerName_, const RandomizerHintTextKey hintKey,
-                                       const RandomizerGet vanillaItem, std::vector<Category>&& categories,
-                                       SpoilerCollectionCheck collectionCheck,
-                                       SpoilerCollectionCheckGroup collectionCheckGroup, bool isVanillaCompletion_) {
-    return {rc, quest_, checkType_, area_, LocationType::Chest, actorId_, scene_, actorParams_, flag_,
-                    std::move(shortName_), std::move(spoilerName_), hintKey, vanillaItem, std::move(categories),
-                    isVanillaCompletion_, collectionCheck, collectionCheckGroup};
+Rando::Location Rando::Location::Base(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_, ActorID actorId_, SceneID scene_,
+                                      int32_t actorParams_, std::string&& shortName_, const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
+                                      SpoilerCollectionCheck collectionCheck, bool isVanillaCompletion_) {
+    return { rc, quest_, checkType_, area_, actorId_, scene_, actorParams_, std::move(shortName_), hintKey, vanillaItem, isVanillaCompletion_, collectionCheck };
 }
 
-Rando::Location Rando::Location::Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
-                                       RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_,
-                                       int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
-                                       const RandomizerHintTextKey hintKey,
-                                       const RandomizerGet vanillaItem, std::vector<Category>&& categories,
-                                       SpoilerCollectionCheck collectionCheck,
-                                       SpoilerCollectionCheckGroup collectionCheckGroup, bool isVanillaCompletion_) {
-    return {rc, quest_, checkType_, area_, LocationType::Chest, actorId_, scene_, actorParams_, flag_,
-                    std::move(shortName_), hintKey, vanillaItem, std::move(categories),
-                    isVanillaCompletion_, collectionCheck, collectionCheckGroup};
+Rando::Location Rando::Location::Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, ActorID actorId_, SceneID scene_, int32_t actorParams_,
+                                       uint8_t flag_, std::string&& shortName_, const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem, bool isVanillaCompletion_) {
+    return { rc, quest_, checkType_, GetAreaFromScene(scene_), actorId_, scene_, actorParams_, std::move(shortName_), hintKey, vanillaItem, isVanillaCompletion_,
+                    SpoilerCollectionCheck(SPOILER_CHK_CHEST, scene_, flag_) };
 }
 
-Rando::Location Rando::Location::Collectable(
-    RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_,
-    ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
-    std::string&& spoilerName_, const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
-    std::vector<Category>&& categories, SpoilerCollectionCheckGroup collectionCheckGroup, bool isVanillaCompletion_) {
-    return {rc, quest_, checkType_, area_, LocationType::Collectable, actorId_, scene_, actorParams_, flag_,
-                    std::move(shortName_), std::move(spoilerName_), hintKey, vanillaItem, std::move(categories),
-                    isVanillaCompletion_,
-                    SpoilerCollectionCheck(SPOILER_CHK_COLLECTABLE, scene_, flag_),
-                    collectionCheckGroup};
+Rando::Location Rando::Location::Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_, ActorID actorId_, SceneID scene_,
+                                       int32_t actorParams_, uint8_t flag_, std::string&& shortName_, const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
+                                       bool isVanillaCompletion_) {
+    return { rc, quest_, checkType_, area_, actorId_, scene_, actorParams_, std::move(shortName_), hintKey, vanillaItem, isVanillaCompletion_,
+                    SpoilerCollectionCheck(SPOILER_CHK_CHEST, scene_, flag_) };
 }
 
-Rando::Location Rando::Location::Collectable(
-    RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_,
-    ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
-    const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
-    std::vector<Category>&& categories, SpoilerCollectionCheckGroup collectionCheckGroup, bool isVanillaCompletion_) {
-    return {rc, quest_, checkType_, area_, LocationType::Collectable, actorId_, scene_, actorParams_, flag_,
-                    std::move(shortName_), hintKey, vanillaItem, std::move(categories),
-                    isVanillaCompletion_,
-                    SpoilerCollectionCheck(SPOILER_CHK_COLLECTABLE, scene_, flag_),
-                    collectionCheckGroup};
+Rando::Location Rando::Location::Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, ActorID actorId_, SceneID scene_, int32_t actorParams_,
+                                       std::string&& shortName_, const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem, SpoilerCollectionCheck collectionCheck,
+                                       bool isVanillaCompletion_) {
+    return { rc, quest_, checkType_, GetAreaFromScene(scene_), actorId_, scene_, actorParams_, std::move(shortName_), hintKey, vanillaItem, isVanillaCompletion_, collectionCheck };
 }
 
-Rando::Location Rando::Location::Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_,
-                                             RandomizerCheckType checkType_, RandomizerCheckArea area_,
-                                             ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_,
-                                             std::string&& shortName_, std::string&& spoilerName_,
-                                             const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
-                                             std::vector<Category>&& categories, const uint8_t collectFlag_,
-                                             SpoilerCollectionCheckGroup collectionCheckGroup,
+Rando::Location Rando::Location::Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_, ActorID actorId_, SceneID scene_,
+                                       int32_t actorParams_, std::string&& shortName_, const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
+                                       SpoilerCollectionCheck collectionCheck, bool isVanillaCompletion_) {
+    return { rc, quest_, checkType_, area_, actorId_, scene_, actorParams_, std::move(shortName_), hintKey, vanillaItem, isVanillaCompletion_, collectionCheck };
+}
+
+Rando::Location Rando::Location::Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, ActorID actorId_, SceneID scene_, int32_t actorParams_,
+                                             uint8_t flag_, std::string&& shortName_, const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem, bool isVanillaCompletion_) {
+    return { rc, quest_, checkType_, GetAreaFromScene(scene_), actorId_, scene_, actorParams_, std::move(shortName_), hintKey, vanillaItem, isVanillaCompletion_,
+                    SpoilerCollectionCheck(SPOILER_CHK_COLLECTABLE, scene_, flag_) };
+}
+
+Rando::Location Rando::Location::Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_, ActorID actorId_, SceneID scene_,
+                                             int32_t actorParams_, uint8_t flag_, std::string&& shortName_, const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
                                              bool isVanillaCompletion_) {
-    return {rc, quest_, checkType_, area_, LocationType::Collectable, actorId_, scene_, actorParams_, flag_,
-                    std::move(shortName_), std::move(spoilerName_), hintKey, vanillaItem, std::move(categories),
-                    isVanillaCompletion_,
-                    SpoilerCollectionCheck(SPOILER_CHK_COLLECTABLE, scene_, collectFlag_),
-                    collectionCheckGroup};
+    return { rc, quest_, checkType_, area_, actorId_, scene_, actorParams_, std::move(shortName_), hintKey, vanillaItem, isVanillaCompletion_,
+                    SpoilerCollectionCheck(SPOILER_CHK_COLLECTABLE, scene_, flag_) };
 }
 
-Rando::Location Rando::Location::Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_,
-                                             RandomizerCheckType checkType_, RandomizerCheckArea area_,
-                                             ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_,
-                                             std::string&& shortName_,
-                                             const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
-                                             std::vector<Category>&& categories, const uint8_t collectFlag_,
-                                             SpoilerCollectionCheckGroup collectionCheckGroup,
+Rando::Location Rando::Location::Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, ActorID actorId_, SceneID scene_, int32_t actorParams_,
+                                             std::string&& shortName_, const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem, SpoilerCollectionCheck collectionCheck,
                                              bool isVanillaCompletion_) {
-    return {rc, quest_, checkType_, area_, LocationType::Collectable, actorId_, scene_, actorParams_, flag_,
-                    std::move(shortName_), hintKey, vanillaItem, std::move(categories),
-                    isVanillaCompletion_,
-                    SpoilerCollectionCheck(SPOILER_CHK_COLLECTABLE, scene_, collectFlag_),
-                    collectionCheckGroup};
+    return { rc, quest_, checkType_, GetAreaFromScene(scene_), actorId_, scene_, actorParams_, std::move(shortName_), hintKey, vanillaItem, isVanillaCompletion_, collectionCheck };
 }
 
-Rando::Location Rando::Location::Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_,
-                                             RandomizerCheckType checkType_, RandomizerCheckArea area_,
-                                             ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_,
-                                             std::string&& shortName_, std::string&& spoilerName_,
-                                             const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
-                                             std::vector<Category>&& categories, SpoilerCollectionCheck collectionCheck,
-                                             SpoilerCollectionCheckGroup collectionCheckGroup,
-                                             bool isVanillaCompletion_) {
-    return {rc, quest_, checkType_, area_, LocationType::Collectable, actorId_, scene_, actorParams_, flag_,
-                    std::move(shortName_), std::move(spoilerName_), hintKey, vanillaItem, std::move(categories),
-                    isVanillaCompletion_, collectionCheck, collectionCheckGroup};
+Rando::Location Rando::Location::Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_, ActorID actorId_, SceneID scene_,
+                                             int32_t actorParams_, std::string&& shortName_, const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
+                                             SpoilerCollectionCheck collectionCheck, bool isVanillaCompletion_) {
+    return { rc, quest_, checkType_, area_, actorId_, scene_, actorParams_, std::move(shortName_), hintKey, vanillaItem, isVanillaCompletion_, collectionCheck };
 }
 
-Rando::Location Rando::Location::Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_,
-                                             RandomizerCheckType checkType_, RandomizerCheckArea area_,
-                                             ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_,
-                                             std::string&& shortName_,
-                                             const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
-                                             std::vector<Category>&& categories, SpoilerCollectionCheck collectionCheck,
-                                             SpoilerCollectionCheckGroup collectionCheckGroup,
-                                             bool isVanillaCompletion_) {
-    return {rc, quest_, checkType_, area_, LocationType::Collectable, actorId_, scene_, actorParams_, flag_,
-                    std::move(shortName_), hintKey, vanillaItem, std::move(categories),
-                    isVanillaCompletion_, collectionCheck, collectionCheckGroup};
+Rando::Location Rando::Location::GSToken(RandomizerCheck rc, RandomizerCheckQuest quest_, SceneID scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
+                                         const RandomizerHintTextKey hintKey) {
+    return { rc, quest_, RCTYPE_SKULL_TOKEN, GetAreaFromScene(scene_), ACTOR_EN_SI, scene_, actorParams_, std::move(shortName_), hintKey, RG_GOLD_SKULLTULA_TOKEN, true,
+                    SpoilerCollectionCheck(SPOILER_CHK_GOLD_SKULLTULA, scene_, flag_) };
 }
 
-Rando::Location Rando::Location::GSToken(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
-                                         uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
-                                         std::string&& spoilerName_, const RandomizerHintTextKey hintKey,
-                                         std::vector<Category>&& categories,
-                                         SpoilerCollectionCheckGroup collectionCheckGroup, bool isVanillaCompletion_) {
-    return {rc, quest_, RCTYPE_SKULL_TOKEN, area_, LocationType::GSToken, ACTOR_EN_SI, scene_, actorParams_,
-                    flag_, std::move(shortName_), std::move(spoilerName_), hintKey, RG_GOLD_SKULLTULA_TOKEN,
-                    std::move(categories), isVanillaCompletion_,
-                    SpoilerCollectionCheck(SPOILER_CHK_GOLD_SKULLTULA, scene_, flag_),
-                    collectionCheckGroup};
+Rando::Location Rando::Location::GSToken(RandomizerCheck rc, RandomizerCheckQuest quest_, SceneID scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
+                                         const RandomizerHintTextKey hintKey, const uint8_t skullScene_) {
+    return { rc, quest_, RCTYPE_SKULL_TOKEN, GetAreaFromScene(scene_), ACTOR_EN_SI, scene_, actorParams_, std::move(shortName_), hintKey, RG_GOLD_SKULLTULA_TOKEN, true,
+                    SpoilerCollectionCheck(SPOILER_CHK_GOLD_SKULLTULA, skullScene_, flag_) };
 }
 
-Rando::Location Rando::Location::GSToken(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
-                                         uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
-                                         const RandomizerHintTextKey hintKey,
-                                         std::vector<Category>&& categories,
-                                         SpoilerCollectionCheckGroup collectionCheckGroup, bool isVanillaCompletion_) {
-    return {rc, quest_, RCTYPE_SKULL_TOKEN, area_, LocationType::GSToken, ACTOR_EN_SI, scene_, actorParams_,
-                    flag_, std::move(shortName_), hintKey, RG_GOLD_SKULLTULA_TOKEN,
-                    std::move(categories), isVanillaCompletion_,
-                    SpoilerCollectionCheck(SPOILER_CHK_GOLD_SKULLTULA, scene_, flag_),
-                    collectionCheckGroup};
+Rando::Location Rando::Location::GSToken(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_, SceneID scene_, int32_t actorParams_, uint8_t flag_,
+                                         std::string&& shortName_, const RandomizerHintTextKey hintKey, const uint8_t skullScene_) {
+    return { rc, quest_, RCTYPE_SKULL_TOKEN, area_, ACTOR_EN_SI, scene_, actorParams_, std::move(shortName_), hintKey, RG_GOLD_SKULLTULA_TOKEN, true,
+                    SpoilerCollectionCheck(SPOILER_CHK_GOLD_SKULLTULA, skullScene_, flag_) };
 }
 
-Rando::Location Rando::Location::GSToken(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
-                                         uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
-                                         std::string&& spoilerName_, const RandomizerHintTextKey hintKey,
-                                         std::vector<Category>&& categories, const uint8_t skullScene_,
-                                         SpoilerCollectionCheckGroup collectionCheckGroup, bool isVanillaCompletion_) {
-    return {rc, quest_, RCTYPE_SKULL_TOKEN, area_, LocationType::GSToken, ACTOR_EN_SI, scene_, actorParams_,
-                    flag_, std::move(shortName_), std::move(spoilerName_), hintKey, RG_GOLD_SKULLTULA_TOKEN,
-                    std::move(categories), isVanillaCompletion_,
-                    SpoilerCollectionCheck(SPOILER_CHK_GOLD_SKULLTULA, skullScene_, flag_),
-                    collectionCheckGroup};
+Rando::Location Rando::Location::OtherHint(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_, ActorID actorId_, SceneID scene_, std::string&& shortName_,
+                                           std::string&& spoilerName_) {
+    return { rc, quest_, RCTYPE_STATIC_HINT, area_, actorId_, scene_, 0x00, std::move(shortName_), std::move(spoilerName_), RHT_NONE, RG_NONE, false };
 }
 
-Rando::Location Rando::Location::GSToken(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
-                                         uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
-                                         const RandomizerHintTextKey hintKey,
-                                         std::vector<Category>&& categories, const uint8_t skullScene_,
-                                         SpoilerCollectionCheckGroup collectionCheckGroup, bool isVanillaCompletion_) {
-    return {rc, quest_, RCTYPE_SKULL_TOKEN, area_, LocationType::GSToken, ACTOR_EN_SI, scene_, actorParams_,
-                    flag_, std::move(shortName_), hintKey, RG_GOLD_SKULLTULA_TOKEN,
-                    std::move(categories), isVanillaCompletion_,
-                    SpoilerCollectionCheck(SPOILER_CHK_GOLD_SKULLTULA, skullScene_, flag_),
-                    collectionCheckGroup};
+Rando::Location Rando::Location::OtherHint(RandomizerCheck rc, RandomizerCheckQuest quest_, ActorID actorId_, SceneID scene_, std::string&& shortName_) {
+    return { rc, quest_, RCTYPE_STATIC_HINT, GetAreaFromScene(scene_), actorId_, scene_, 0x00, std::move(shortName_), RHT_NONE, RG_NONE, false };
 }
 
-Rando::Location Rando::Location::GrottoScrub(RandomizerCheck rc, RandomizerCheckQuest quest_,
-                                             RandomizerCheckType checkType_, RandomizerCheckArea area_,
-                                             ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_,
-                                             std::string&& shortName_, std::string&& spoilerName_,
-                                             const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
-                                             std::vector<Category>&& categories, SpoilerCollectionCheck collectionCheck,
-                                             SpoilerCollectionCheckGroup collectionCheckGroup,
-                                             bool isVanillaCompletion_) {
-    return {rc, quest_, checkType_, area_, LocationType::GrottoScrub, actorId_, scene_, actorParams_, flag_,
-                    std::move(shortName_), std::move(spoilerName_), hintKey, vanillaItem, std::move(categories),
-                    isVanillaCompletion_, collectionCheck, collectionCheckGroup};
+Rando::Location Rando::Location::OtherHint(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_, ActorID actorId_, SceneID scene_, std::string&& shortName_) {
+    return { rc, quest_, RCTYPE_STATIC_HINT, area_, actorId_, scene_, 0x00, std::move(shortName_), RHT_NONE, RG_NONE, false };
 }
 
-Rando::Location Rando::Location::GrottoScrub(RandomizerCheck rc, RandomizerCheckQuest quest_,
-                                             RandomizerCheckType checkType_, RandomizerCheckArea area_,
-                                             ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_,
-                                             std::string&& shortName_,
-                                             const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
-                                             std::vector<Category>&& categories, SpoilerCollectionCheck collectionCheck,
-                                             SpoilerCollectionCheckGroup collectionCheckGroup,
-                                             bool isVanillaCompletion_) {
-    return {rc, quest_, checkType_, area_, LocationType::GrottoScrub, actorId_, scene_, actorParams_, flag_,
-                    std::move(shortName_), hintKey, vanillaItem, std::move(categories),
-                    isVanillaCompletion_, collectionCheck, collectionCheckGroup};
+Rando::Location Rando::Location::HintStone(RandomizerCheck rc, RandomizerCheckQuest quest_, SceneID scene_, int32_t actorParams_, std::string&& shortName_) {
+    return { rc, quest_, RCTYPE_GOSSIP_STONE, GetAreaFromScene(scene_), ACTOR_EN_GS, scene_, actorParams_, std::move(shortName_), RHT_NONE, RG_NONE, false };
 }
 
-Rando::Location Rando::Location::Delayed(RandomizerCheck rc, RandomizerCheckQuest quest_,
-                                         RandomizerCheckType checkType_, RandomizerCheckArea area_, ActorID actorId_,
-                                         uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
-                                         std::string&& spoilerName_, const RandomizerHintTextKey hintKey,
-                                         const RandomizerGet vanillaItem, std::vector<Category>&& categories,
-                                         SpoilerCollectionCheck collectionCheck,
-                                         SpoilerCollectionCheckGroup collectionCheckGroup, bool isVanillaCompletion_) {
-    return {rc, quest_, checkType_, area_, LocationType::Delayed, actorId_, scene_, actorParams_, flag_,
-                    std::move(shortName_), std::move(spoilerName_), hintKey, vanillaItem, std::move(categories),
-                    isVanillaCompletion_, collectionCheck, collectionCheckGroup};
-}
-
-Rando::Location Rando::Location::Delayed(RandomizerCheck rc, RandomizerCheckQuest quest_,
-                                         RandomizerCheckType checkType_, RandomizerCheckArea area_, ActorID actorId_,
-                                         uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
-                                         const RandomizerHintTextKey hintKey,
-                                         const RandomizerGet vanillaItem, std::vector<Category>&& categories,
-                                         SpoilerCollectionCheck collectionCheck,
-                                         SpoilerCollectionCheckGroup collectionCheckGroup, bool isVanillaCompletion_) {
-    return {rc, quest_, checkType_, area_, LocationType::Delayed, actorId_, scene_, actorParams_, flag_,
-                    std::move(shortName_), hintKey, vanillaItem, std::move(categories),
-                    isVanillaCompletion_, collectionCheck, collectionCheckGroup};
-}
-
-Rando::Location Rando::Location::Reward(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
-                                        RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_,
-                                        int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
-                                        std::string&& spoilerName_, const RandomizerHintTextKey hintKey,
-                                        const RandomizerGet vanillaItem, std::vector<Category>&& categories,
-                                        SpoilerCollectionCheck collectionCheck,
-                                        SpoilerCollectionCheckGroup collectionCheckGroup, bool isVanillaCompletion_) {
-    return {rc, quest_, checkType_, area_, LocationType::TempleReward, actorId_, scene_, actorParams_, flag_,
-                    std::move(shortName_), std::move(spoilerName_), hintKey, vanillaItem, std::move(categories),
-                    isVanillaCompletion_, collectionCheck, collectionCheckGroup};
-}
-
-Rando::Location Rando::Location::Reward(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
-                                        RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_,
-                                        int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
-                                        const RandomizerHintTextKey hintKey,
-                                        const RandomizerGet vanillaItem, std::vector<Category>&& categories,
-                                        SpoilerCollectionCheck collectionCheck,
-                                        SpoilerCollectionCheckGroup collectionCheckGroup, bool isVanillaCompletion_) {
-    return {rc, quest_, checkType_, area_, LocationType::TempleReward, actorId_, scene_, actorParams_, flag_,
-                    std::move(shortName_), hintKey, vanillaItem, std::move(categories),
-                    isVanillaCompletion_, collectionCheck, collectionCheckGroup};
-}
-
-Rando::Location Rando::Location::OtherHint(RandomizerCheck rc, RandomizerCheckQuest quest_,
-                                           RandomizerCheckType checkType_, RandomizerCheckArea area_, ActorID actorId_,
-                                           uint8_t scene_,
-                                           std::string&& shortName_, std::string&& spoilerName_,
-                                           bool isVanillaCompletion_) {
-    return {rc, quest_, checkType_, area_, LocationType::OtherHint, actorId_, scene_, 0x00, 0x00,
-                    std::move(shortName_), std::move(spoilerName_), RHT_NONE, RG_NONE, {}, isVanillaCompletion_};
-}
-
-Rando::Location Rando::Location::OtherHint(RandomizerCheck rc, RandomizerCheckQuest quest_,
-                                           RandomizerCheckType checkType_, RandomizerCheckArea area_, ActorID actorId_,
-                                           uint8_t scene_,
-                                           std::string&& shortName_,
-                                           bool isVanillaCompletion_) {
-    return {rc, quest_, checkType_, area_, LocationType::OtherHint, actorId_, scene_, 0x00, 0x00,
-                    std::move(shortName_), RHT_NONE, RG_NONE, {}, isVanillaCompletion_};
-}
-
-Rando::Location Rando::Location::HintStone(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
-                                           uint8_t scene_, int32_t actorParams_, uint8_t flag_,
-                                           std::string&& shortName_, std::string&& spoilerName_,
-                                           std::vector<Category>&& categories, bool isVanillaCompletion_) {
-    return {rc, quest_, RCTYPE_GOSSIP_STONE, area_, LocationType::Base, ACTOR_EN_GS, scene_, actorParams_, flag_,
-                    std::move(shortName_), std::move(spoilerName_), RHT_NONE, RG_NONE, std::move(categories),
-                    isVanillaCompletion_};
-}
-
-Rando::Location Rando::Location::HintStone(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
-                                           uint8_t scene_, int32_t actorParams_, uint8_t flag_,
-                                           std::string&& shortName_,
-                                           std::vector<Category>&& categories, bool isVanillaCompletion_) {
-    return {rc, quest_, RCTYPE_GOSSIP_STONE, area_, LocationType::Base, ACTOR_EN_GS, scene_, actorParams_, flag_,
-                    std::move(shortName_), RHT_NONE, RG_NONE, std::move(categories),
-                    isVanillaCompletion_};
+Rando::Location Rando::Location::HintStone(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_, SceneID scene_, int32_t actorParams_, std::string&& shortName_) {
+    return { rc, quest_, RCTYPE_GOSSIP_STONE, area_, ACTOR_EN_GS, scene_, actorParams_, std::move(shortName_), RHT_NONE, RG_NONE, false };
 }
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/location.h b/soh/soh/Enhancements/randomizer/location.h
index bd7f69a8b..393380402 100644
--- a/soh/soh/Enhancements/randomizer/location.h
+++ b/soh/soh/Enhancements/randomizer/location.h
@@ -4,7 +4,6 @@
 #include <vector>
 
 #include "3drando/spoiler_log.hpp"
-#include "3drando/category.hpp"
 #include "3drando/hints.hpp"
 
 #include "randomizerTypes.h"
@@ -20,17 +19,7 @@ class SpoilerCollectionCheck {
     uint16_t flag = 0;
 
     SpoilerCollectionCheck() = default;
-    SpoilerCollectionCheck(const SpoilerCollectionCheckType type_, const uint8_t scene_, const uint16_t flag_)
-        : type(type_), scene(scene_), flag(flag_) {
-    }
-
-    static auto None() {
-        return SpoilerCollectionCheck(SPOILER_CHK_NONE, 0x00, 0x00);
-    }
-
-    static auto AlwaysCollected() {
-        return SpoilerCollectionCheck(SPOILER_CHK_ALWAYS_COLLECTED, 0x00, 0x00);
-    }
+    SpoilerCollectionCheck(const SpoilerCollectionCheckType type_, const uint8_t scene_, const uint16_t flag_) : type(type_), scene(scene_), flag(flag_) {}
 
     static auto ItemGetInf(const uint8_t slot) {
         return SpoilerCollectionCheck(SPOILER_CHK_ITEM_GET_INF, 0x00, slot);
@@ -52,76 +41,30 @@ class SpoilerCollectionCheck {
         return SpoilerCollectionCheck(SPOILER_CHK_CHEST, scene, flag);
     }
 
-    static auto Fish(const uint8_t flag, const uint8_t scene = SCENE_FISHING_POND) {
-        return SpoilerCollectionCheck(SPOILER_CHK_FISH, scene, flag);
-    }
-
-    static auto Fishing(const uint8_t bit) {
-        return SpoilerCollectionCheck(SPOILER_CHK_MINIGAME, 0x00, bit);
-    }
-
-    static auto BigPoePoints() {
-        return SpoilerCollectionCheck(SPOILER_CHK_POE_POINTS, 0x00, 0x00);
-    }
-
-    static auto Gravedigger(const uint8_t scene, const uint8_t flag) {
-        return SpoilerCollectionCheck(SPOILER_CHK_GRAVEDIGGER, scene, flag);
-    }
-
-    static auto ShopItem(const uint8_t scene, const uint8_t itemSlot) {
-        return SpoilerCollectionCheck(SPOILER_CHK_SHOP_ITEM, scene, itemSlot);
-    }
-
-    static auto MasterSword() {
-        return SpoilerCollectionCheck(SPOILER_CHK_MASTER_SWORD, 0x00, 0x00);
-    }
-
     static auto RandomizerInf(const uint16_t flag) {
         return SpoilerCollectionCheck(SPOILER_CHK_RANDOMIZER_INF, 0x00, flag);
     }
 };
 
-enum class LocationType {
-    Base,
-    Chest,
-    Collectable,
-    GSToken,
-    GrottoScrub,
-    Delayed,
-    TempleReward,
-    HintStone,
-    OtherHint,
-};
-
 class Location {
   public:
-    Location() : rc(RC_UNKNOWN_CHECK), quest(RCQUEST_BOTH), checkType(RCTYPE_STANDARD), area(RCAREA_INVALID),
-                 locationType(LocationType::Base), actorId(ACTOR_ID_MAX), scene(SCENE_ID_MAX), actorParams(0),
-                 flag(0), hintKey(RHT_NONE), vanillaItem(RG_NONE), isVanillaCompletion(false),
-                 collectionCheck(SpoilerCollectionCheck()), collectionCheckGroup(GROUP_NO_GROUP) {}
-    Location(const RandomizerCheck rc_, const RandomizerCheckQuest quest_, const RandomizerCheckType checkType_,
-             const RandomizerCheckArea area_, const LocationType locationType_, const ActorID actorId_, const uint8_t scene_,
-             const int32_t actorParams_, const uint8_t flag_, std::string shortName_, std::string spoilerName_,
-             const RandomizerHintTextKey hintKey_, const RandomizerGet vanillaItem_, std::vector<Category> categories_,
-             const bool isVanillaCompletion_ = false, const SpoilerCollectionCheck collectionCheck_ = SpoilerCollectionCheck(),
-             const SpoilerCollectionCheckGroup collectionCheckGroup_ = GROUP_NO_GROUP)
-        : rc(rc_), quest(quest_), checkType(checkType_), area(area_), locationType(locationType_), actorId(actorId_),
-          scene(scene_), actorParams(actorParams_), flag(flag_), shortName(std::move(shortName_)),
-          spoilerName(std::move(spoilerName_)), hintKey(hintKey_), vanillaItem(vanillaItem_), categories(std::move(categories_)),
-          isVanillaCompletion(isVanillaCompletion_), collectionCheck(collectionCheck_),
-          collectionCheckGroup(collectionCheckGroup_) {
-    }
-    Location(const RandomizerCheck rc_, const RandomizerCheckQuest quest_, const RandomizerCheckType checkType_,
-             const RandomizerCheckArea area_, const LocationType locationType_, const ActorID actorId_, const uint8_t scene_,
-             const int32_t actorParams_, const uint8_t flag_, std::string shortName_,
-             const RandomizerHintTextKey hintKey_, const RandomizerGet vanillaItem_, std::vector<Category> categories_,
-             const bool isVanillaCompletion_ = false, const SpoilerCollectionCheck collectionCheck_ = SpoilerCollectionCheck(),
-             const SpoilerCollectionCheckGroup collectionCheckGroup_ = GROUP_NO_GROUP)
-        : rc(rc_), quest(quest_), checkType(checkType_), area(area_), locationType(locationType_), actorId(actorId_),
-          scene(scene_), actorParams(actorParams_), flag(flag_), shortName(shortName_),
-          spoilerName(SpoilerNameFromShortName(shortName_, area_)), hintKey(hintKey_), vanillaItem(vanillaItem_), categories(std::move(categories_)),
-          isVanillaCompletion(isVanillaCompletion_), collectionCheck(collectionCheck_),
-          collectionCheckGroup(collectionCheckGroup_) {}
+    Location() : rc(RC_UNKNOWN_CHECK), quest(RCQUEST_BOTH), checkType(RCTYPE_STANDARD), area(RCAREA_INVALID), actorId(ACTOR_ID_MAX), scene(SCENE_ID_MAX), actorParams(0),
+                 hintKey(RHT_NONE), vanillaItem(RG_NONE), isVanillaCompletion(false), collectionCheck(SpoilerCollectionCheck()) {}
+
+    Location(const RandomizerCheck rc_, const RandomizerCheckQuest quest_, const RandomizerCheckType checkType_, const RandomizerCheckArea area_, const ActorID actorId_,
+             const SceneID scene_, const int32_t actorParams_, std::string shortName_, std::string spoilerName_, const RandomizerHintTextKey hintKey_,
+             const RandomizerGet vanillaItem_, const bool isVanillaCompletion_ = false, const SpoilerCollectionCheck collectionCheck_ = SpoilerCollectionCheck())
+        : rc(rc_), quest(quest_), checkType(checkType_), area(area_), actorId(actorId_),
+          scene(scene_), actorParams(actorParams_), shortName(std::move(shortName_)),
+          spoilerName(std::move(spoilerName_)), hintKey(hintKey_), vanillaItem(vanillaItem_),
+          isVanillaCompletion(isVanillaCompletion_), collectionCheck(collectionCheck_) {}
+
+    Location(const RandomizerCheck rc_, const RandomizerCheckQuest quest_, const RandomizerCheckType checkType_, const RandomizerCheckArea area_, const ActorID actorId_,
+             const SceneID scene_, const int32_t actorParams_, std::string shortName_, const RandomizerHintTextKey hintKey_, const RandomizerGet vanillaItem_,
+             const bool isVanillaCompletion_ = false, const SpoilerCollectionCheck collectionCheck_ = SpoilerCollectionCheck())
+        : rc(rc_), quest(quest_), checkType(checkType_), area(area_), actorId(actorId_), scene(scene_), actorParams(actorParams_), shortName(shortName_),
+          spoilerName(SpoilerNameFromShortName(shortName_, area_)), hintKey(hintKey_), vanillaItem(vanillaItem_), isVanillaCompletion(isVanillaCompletion_),
+          collectionCheck(collectionCheck_) {}
 
     static std::string SpoilerNameFromShortName(std::string shortName, RandomizerCheckArea area) {
         if (area < 0 || area >= RCAREA_INVALID) {
@@ -132,20 +75,16 @@ class Location {
 
     RandomizerCheck GetRandomizerCheck() const;
     SpoilerCollectionCheck GetCollectionCheck() const;
-    SpoilerCollectionCheckGroup GetCollectionCheckGroup() const;
     RandomizerCheckQuest GetQuest() const;
     RandomizerCheckArea GetArea() const;
     RandomizerCheckType GetRCType() const;
     ActorID GetActorID() const;
     int32_t GetActorParams() const;
     SceneID GetScene() const;
-    uint8_t GetFlag() const;
     RandomizerHintTextKey GetHintKey() const;
     HintText* GetHint();
     const std::string& GetName() const;
     const std::string& GetShortName() const;
-    LocationType GetLocationType() const;
-    bool IsCategory(Category category) const;
     bool IsDungeon() const;
     bool IsOverworld() const;
     bool IsShop() const;
@@ -154,119 +93,53 @@ class Location {
     const HintText& GetHint() const;
     RandomizerGet GetVanillaItem() const;
 
-    static Location Base(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
-                         RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_, int32_t actorParams_,
-                         uint8_t flag_, std::string&& shortName_, std::string&& spoilerName_,
-                         RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
-                         std::vector<Category>&& categories,
-                         SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(),
-                         SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
+    static Location Base(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, ActorID actorId_, SceneID scene_, int32_t actorParams_,
+                         std::string&& shortName_, std::string&& spoilerName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
+                         SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(), bool isVanillaCompletion_ = false);
+
+    static Location Base(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, ActorID actorId_, SceneID scene_, int32_t actorParams_,
+                         std::string&& shortName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem, SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(),
                          bool isVanillaCompletion_ = false);
 
-    static Location Base(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
-                         RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_, int32_t actorParams_,
-                         uint8_t flag_, std::string&& shortName_,
-                         RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
-                         std::vector<Category>&& categories,
-                         SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(),
-                         SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
-                         bool isVanillaCompletion_ = false);
+    static Location Base(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_, ActorID actorId_, SceneID scene_,
+                         int32_t actorParams_, std::string&& shortName_, std::string&& spoilerName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
+                         SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(), bool isVanillaCompletion_ = false);
 
-    static Location
-    Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_,
-          ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
-          std::string&& spoilerName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
-          std::vector<Category>&& categories,
-          SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
-          bool isVanillaCompletion_ = false);
+    static Location Base(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_, ActorID actorId_, SceneID scene_,
+                         int32_t actorParams_, std::string&& shortName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
+                         SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(), bool isVanillaCompletion_ = false);
 
-    static Location
-    Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_,
-          ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
-          RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
-          std::vector<Category>&& categories,
-          SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
-          bool isVanillaCompletion_ = false);
+    static Location Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_, ActorID actorId_, SceneID scene_,
+                          int32_t actorParams_, uint8_t flag_, std::string&& shortName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem, bool isVanillaCompletion_ = false);
 
-    static Location
-    Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_,
-          ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
-          std::string&& spoilerName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
-          std::vector<Category>&& categories, SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(),
-          SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
-          bool isVanillaCompletion_ = false);
+    static Location Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_, ActorID actorId_, SceneID scene_,
+                          int32_t actorParams_, std::string&& shortName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem, SpoilerCollectionCheck collectionCheck,
+                          bool isVanillaCompletion_ = false);
 
-    static Location
-    Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_,
-          ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
-          RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
-          std::vector<Category>&& categories, SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(),
-          SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
-          bool isVanillaCompletion_ = false);
+    static Location Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, ActorID actorId_, SceneID scene_, int32_t actorParams_, uint8_t flag_,
+                          std::string&& shortName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem, bool isVanillaCompletion_ = false);
 
-    static Location
-    Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
-                RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_,
-                std::string&& shortName_, std::string&& spoilerName_, RandomizerHintTextKey hintKey,
-                RandomizerGet vanillaItem, std::vector<Category>&& categories,
-                SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
-                bool isVanillaCompletion_ = false);
+    static Location Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, ActorID actorId_, SceneID scene_, int32_t actorParams_,
+                          std::string&& shortName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem, SpoilerCollectionCheck collectionCheck,
+                          bool isVanillaCompletion_ = false);
 
-    static Location
-    Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
-                RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_,
-                std::string&& shortName_, RandomizerHintTextKey hintKey,
-                RandomizerGet vanillaItem, std::vector<Category>&& categories,
-                SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
-                bool isVanillaCompletion_ = false);
+    static Location Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, ActorID actorId_, SceneID scene_, int32_t actorParams_, uint8_t flag_,
+                                std::string&& shortName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem, bool isVanillaCompletion_ = false);
 
-    static Location
-    Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
-                RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_,
-                std::string&& shortName_, std::string&& spoilerName_, RandomizerHintTextKey hintKey,
-                RandomizerGet vanillaItem, std::vector<Category>&& categories, uint8_t collectFlag_,
-                SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
-                bool isVanillaCompletion_ = false);
+    static Location Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_, ActorID actorId_, SceneID scene_,
+                                int32_t actorParams_, uint8_t flag_, std::string&& shortName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
+                                bool isVanillaCompletion_ = false);
 
-    static Location
-    Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
-                RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_,
-                std::string&& shortName_, RandomizerHintTextKey hintKey,
-                RandomizerGet vanillaItem, std::vector<Category>&& categories, uint8_t collectFlag_,
-                SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
-                bool isVanillaCompletion_ = false);
+    static Location Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, ActorID actorId_, SceneID scene_, int32_t actorParams_,
+                                std::string&& shortName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem, SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(),
+                                bool isVanillaCompletion_ = false);
 
-    static Location
-    Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
-                RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_,
-                std::string&& shortName_, std::string&& spoilerName_, RandomizerHintTextKey hintKey,
-                RandomizerGet vanillaItem, std::vector<Category>&& categories,
-                SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(),
-                SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
-                bool isVanillaCompletion_ = false);
+    static Location Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_, ActorID actorId_,
+                                SceneID scene_, int32_t actorParams_, std::string&& shortName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
+                                SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(), bool isVanillaCompletion_ = false);
 
-    static Location
-    Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
-                RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_,
-                std::string&& shortName_, RandomizerHintTextKey hintKey,
-                RandomizerGet vanillaItem, std::vector<Category>&& categories,
-                SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(),
-                SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
-                bool isVanillaCompletion_ = false);
-
-    static Location
-    GSToken(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
-            uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
-            std::string&& spoilerName_, RandomizerHintTextKey hintKey, std::vector<Category>&& categories,
-            SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
-            bool isVanillaCompletion_ = true);
-
-    static Location
-    GSToken(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
-            uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
-            RandomizerHintTextKey hintKey, std::vector<Category>&& categories,
-            SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
-            bool isVanillaCompletion_ = true);
+    static Location GSToken(RandomizerCheck rc, RandomizerCheckQuest quest_, SceneID scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
+                            RandomizerHintTextKey hintKey);
 
     /// @brief For certain scenes, the sceneId and the "Scene" in spoiler collection check later used to check the
     /// GS flags don't necessarily match. Use this constructor (or the next one) for those. scene_ should be the actual scene where
@@ -274,117 +147,45 @@ class Location {
     /// and expected that these don't always match, and the naming is a holdover from 3drando.
     /// @param rc 
     /// @param quest_ 
-    /// @param area_ 
     /// @param scene_ 
     /// @param actorParams_ 
     /// @param flag_ 
     /// @param shortName_ 
-    /// @param spoilerName_ 
     /// @param hintKey 
-    /// @param categories 
-    /// @param collectionCheckGroup 
     /// @param skullScene_ 
-    /// @param isVanillaCompletion_ 
     /// @return
-    static Location
-    GSToken(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
-            uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
-            std::string&& spoilerName_, RandomizerHintTextKey hintKey, std::vector<Category>&& categories,
-            uint8_t skullScene_,
-            SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
-            bool isVanillaCompletion_ = true);
+    static Location GSToken(RandomizerCheck rc, RandomizerCheckQuest quest_, SceneID scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
+                            RandomizerHintTextKey hintKey, uint8_t skullScene_);
 
-    static Location
-    GSToken(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
-            uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
-            RandomizerHintTextKey hintKey, std::vector<Category>&& categories,
-            uint8_t skullScene_,
-            SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
-            bool isVanillaCompletion_ = true);
+    static Location GSToken(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_, SceneID scene_, int32_t actorParams_, uint8_t flag_,
+                            std::string&& shortName_, RandomizerHintTextKey hintKey, uint8_t skullScene_);
 
-    static Location
-    GrottoScrub(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
-                RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_,
-                std::string&& shortName_, std::string&& spoilerName_, RandomizerHintTextKey hintKey,
-                RandomizerGet vanillaItem, std::vector<Category>&& categories,
-                SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(),
-                SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
-                bool isVanillaCompletion_ = false);
+    static Location OtherHint(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_, ActorID actorId_, SceneID scene_, std::string&& shortName_,
+                              std::string&& spoilerName_);
 
-    static Location
-    GrottoScrub(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
-                RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_,
-                std::string&& shortName_, RandomizerHintTextKey hintKey,
-                RandomizerGet vanillaItem, std::vector<Category>&& categories,
-                SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(),
-                SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
-                bool isVanillaCompletion_ = false);
+    static Location OtherHint(RandomizerCheck rc, RandomizerCheckQuest quest_, ActorID actorId_, SceneID scene_, std::string&& shortName_);
 
-    static Location
-    Delayed(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_,
-            ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
-            std::string&& spoilerName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
-            std::vector<Category>&& categories, SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(),
-            SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
-            bool isVanillaCompletion_ = false);
+    static Location OtherHint(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_, ActorID actorId_, SceneID scene_, std::string&& shortName_);
 
-    static Location
-    Delayed(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_,
-            ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
-            RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
-            std::vector<Category>&& categories, SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(),
-            SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP,
-            bool isVanillaCompletion_ = false);
+    static Location HintStone(RandomizerCheck rc, RandomizerCheckQuest quest_, SceneID scene_, int32_t actorParams_, std::string&& shortName_);
 
-    static Location
-    Reward(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_,
-           ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
-           std::string&& spoilerName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
-           std::vector<Category>&& categories, SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(),
-           SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP, bool isVanillaCompletion_ = false);
-
-    static Location
-    Reward(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_,
-           ActorID actorId_, uint8_t scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
-           RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
-           std::vector<Category>&& categories, SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(),
-           SpoilerCollectionCheckGroup collectionCheckGroup = GROUP_NO_GROUP, bool isVanillaCompletion_ = false);
-
-    static Location OtherHint(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
-                              RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_,
-                              std::string&& shortName_, std::string&& spoilerName_, bool isVanillaCompletion_ = false);
-
-    static Location OtherHint(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
-                              RandomizerCheckArea area_, ActorID actorId_, uint8_t scene_,
-                              std::string&& shortName_, bool isVanillaCompletion_ = false);
-
-    static Location HintStone(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_, uint8_t scene_,
-                              int32_t actorParams_, uint8_t flag_, std::string&& shortName_, std::string&& spoilerName_,
-                              std::vector<Category>&& categories, bool isVanillaCompletion_ = false);
-
-    static Location HintStone(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_, uint8_t scene_,
-                              int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
-                              std::vector<Category>&& categories, bool isVanillaCompletion_ = false);
+    static Location HintStone(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_, SceneID scene_, int32_t actorParams_, std::string&& shortName_);
 
   private:
     RandomizerCheck rc;
     RandomizerCheckQuest quest;
     RandomizerCheckType checkType;
     RandomizerCheckArea area;
-    LocationType locationType;
     ActorID actorId;
-    uint8_t scene;
+    SceneID scene;
     int32_t actorParams;
-    uint8_t flag;
     bool checked = false;
     std::string shortName;
     std::string spoilerName;
     RandomizerHintTextKey hintKey;
     RandomizerGet vanillaItem;
-    std::vector<Category> categories;
     bool isVanillaCompletion;
     SpoilerCollectionCheck collectionCheck;
-    SpoilerCollectionCheckGroup collectionCheckGroup;
     bool isHintable = false;
 };
 } // namespace Rando
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/location_list.cpp b/soh/soh/Enhancements/randomizer/location_list.cpp
index dd31dae5c..4089e1deb 100644
--- a/soh/soh/Enhancements/randomizer/location_list.cpp
+++ b/soh/soh/Enhancements/randomizer/location_list.cpp
@@ -6,1377 +6,862 @@
 std::array<Rando::Location, RC_MAX> Rando::StaticData::locationTable;
 std::multimap<std::tuple<s16, s16, s32>, RandomizerCheck> Rando::StaticData::CheckFromActorMultimap;
 
-std::vector<RandomizerCheck> KF_ShopLocations = {
-    RC_KF_SHOP_ITEM_1, RC_KF_SHOP_ITEM_2, RC_KF_SHOP_ITEM_3, RC_KF_SHOP_ITEM_4,
-    RC_KF_SHOP_ITEM_5, RC_KF_SHOP_ITEM_6, RC_KF_SHOP_ITEM_7, RC_KF_SHOP_ITEM_8,
-};
-std::vector<RandomizerCheck> Kak_PotionShopLocations = {
-    RC_KAK_POTION_SHOP_ITEM_1, RC_KAK_POTION_SHOP_ITEM_2, RC_KAK_POTION_SHOP_ITEM_3, RC_KAK_POTION_SHOP_ITEM_4,
-    RC_KAK_POTION_SHOP_ITEM_5, RC_KAK_POTION_SHOP_ITEM_6, RC_KAK_POTION_SHOP_ITEM_7, RC_KAK_POTION_SHOP_ITEM_8,
-};
-std::vector<RandomizerCheck> MK_BombchuShopLocations = {
-    RC_MARKET_BOMBCHU_SHOP_ITEM_1, RC_MARKET_BOMBCHU_SHOP_ITEM_2, RC_MARKET_BOMBCHU_SHOP_ITEM_3,
-    RC_MARKET_BOMBCHU_SHOP_ITEM_4, RC_MARKET_BOMBCHU_SHOP_ITEM_5, RC_MARKET_BOMBCHU_SHOP_ITEM_6,
-    RC_MARKET_BOMBCHU_SHOP_ITEM_7, RC_MARKET_BOMBCHU_SHOP_ITEM_8,
-};
-std::vector<RandomizerCheck> MK_PotionShopLocations = {
-    RC_MARKET_POTION_SHOP_ITEM_1, RC_MARKET_POTION_SHOP_ITEM_2, RC_MARKET_POTION_SHOP_ITEM_3,
-    RC_MARKET_POTION_SHOP_ITEM_4, RC_MARKET_POTION_SHOP_ITEM_5, RC_MARKET_POTION_SHOP_ITEM_6,
-    RC_MARKET_POTION_SHOP_ITEM_7, RC_MARKET_POTION_SHOP_ITEM_8,
-};
-std::vector<RandomizerCheck> MK_BazaarLocations = {
-    RC_MARKET_BAZAAR_ITEM_1, RC_MARKET_BAZAAR_ITEM_2, RC_MARKET_BAZAAR_ITEM_3, RC_MARKET_BAZAAR_ITEM_4,
-    RC_MARKET_BAZAAR_ITEM_5, RC_MARKET_BAZAAR_ITEM_6, RC_MARKET_BAZAAR_ITEM_7, RC_MARKET_BAZAAR_ITEM_8,
-};
-std::vector<RandomizerCheck> Kak_BazaarLocations = {
-    RC_KAK_BAZAAR_ITEM_1, RC_KAK_BAZAAR_ITEM_2, RC_KAK_BAZAAR_ITEM_3, RC_KAK_BAZAAR_ITEM_4,
-    RC_KAK_BAZAAR_ITEM_5, RC_KAK_BAZAAR_ITEM_6, RC_KAK_BAZAAR_ITEM_7, RC_KAK_BAZAAR_ITEM_8,
-};
-std::vector<RandomizerCheck> ZD_ShopLocations = {
-    RC_ZD_SHOP_ITEM_1, RC_ZD_SHOP_ITEM_2, RC_ZD_SHOP_ITEM_3, RC_ZD_SHOP_ITEM_4,
-    RC_ZD_SHOP_ITEM_5, RC_ZD_SHOP_ITEM_6, RC_ZD_SHOP_ITEM_7, RC_ZD_SHOP_ITEM_8,
-};
-std::vector<RandomizerCheck> GC_ShopLocations = {
-    RC_GC_SHOP_ITEM_1, RC_GC_SHOP_ITEM_2, RC_GC_SHOP_ITEM_3, RC_GC_SHOP_ITEM_4,
-    RC_GC_SHOP_ITEM_5, RC_GC_SHOP_ITEM_6, RC_GC_SHOP_ITEM_7, RC_GC_SHOP_ITEM_8,
-};
-// List of shop location lists, used for shop shuffle
-std::vector<std::vector<RandomizerCheck>> Rando::StaticData::shopLocationLists = {
-    KF_ShopLocations,   Kak_PotionShopLocations, MK_BombchuShopLocations, MK_PotionShopLocations,
-    MK_BazaarLocations, Kak_BazaarLocations,     ZD_ShopLocations,        GC_ShopLocations,
-};
-
-std::vector<RandomizerCheck> Rando::StaticData::scrubLocations = {
-    RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT,
-    RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT,
-    RC_LW_DEKU_SCRUB_NEAR_BRIDGE,
-    RC_LW_DEKU_SCRUB_GROTTO_REAR,
-    RC_LW_DEKU_SCRUB_GROTTO_FRONT,
-    RC_SFM_DEKU_SCRUB_GROTTO_REAR,
-    RC_SFM_DEKU_SCRUB_GROTTO_FRONT,
-    RC_HF_DEKU_SCRUB_GROTTO,
-    RC_LH_DEKU_SCRUB_GROTTO_LEFT,
-    RC_LH_DEKU_SCRUB_GROTTO_RIGHT,
-    RC_LH_DEKU_SCRUB_GROTTO_CENTER,
-    RC_GV_DEKU_SCRUB_GROTTO_REAR,
-    RC_GV_DEKU_SCRUB_GROTTO_FRONT,
-    RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,
-    RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT,
-    RC_GC_DEKU_SCRUB_GROTTO_LEFT,
-    RC_GC_DEKU_SCRUB_GROTTO_RIGHT,
-    RC_GC_DEKU_SCRUB_GROTTO_CENTER,
-    RC_DMC_DEKU_SCRUB,
-    RC_DMC_DEKU_SCRUB_GROTTO_LEFT,
-    RC_DMC_DEKU_SCRUB_GROTTO_RIGHT,
-    RC_DMC_DEKU_SCRUB_GROTTO_CENTER,
-    RC_ZR_DEKU_SCRUB_GROTTO_REAR,
-    RC_ZR_DEKU_SCRUB_GROTTO_FRONT,
-    RC_LLR_DEKU_SCRUB_GROTTO_LEFT,
-    RC_LLR_DEKU_SCRUB_GROTTO_RIGHT,
-    RC_LLR_DEKU_SCRUB_GROTTO_CENTER,
-    RC_DEKU_TREE_MQ_DEKU_SCRUB,
-    RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,
-    RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS,
-    RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT,
-    RC_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY,
-    RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,
-    RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT,
-    RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,
-    RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS,
-    RC_JABU_JABUS_BELLY_DEKU_SCRUB,
-    RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,
-    RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT,
-    RC_GANONS_CASTLE_DEKU_SCRUB_RIGHT,
-    RC_GANONS_CASTLE_DEKU_SCRUB_LEFT,
-    RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,
-    RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,
-    RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,
-    RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT,
-    RC_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,
-};
-
 std::vector<RandomizerCheck> Rando::StaticData::dungeonRewardLocations = {
     // Bosses
     RC_QUEEN_GOHMA, RC_KING_DODONGO, RC_BARINADE,    RC_PHANTOM_GANON, RC_VOLVAGIA,
     RC_MORPHA,      RC_TWINROVA,     RC_BONGO_BONGO, RC_LINKS_POCKET,
 };
 
-std::vector<RandomizerCheck> Rando::StaticData::overworldLocations = {
-    // Kokiri Forest
-    RC_KF_KOKIRI_SWORD_CHEST,
-    RC_KF_MIDOS_TOP_LEFT_CHEST,
-    RC_KF_MIDOS_TOP_RIGHT_CHEST,
-    RC_KF_MIDOS_BOTTOM_LEFT_CHEST,
-    RC_KF_MIDOS_BOTTOM_RIGHT_CHEST,
-    RC_KF_STORMS_GROTTO_CHEST,
-    RC_KF_LINKS_HOUSE_COW,
-
-    // Shop
-    RC_KF_SHOP_ITEM_1,
-    RC_KF_SHOP_ITEM_2,
-    RC_KF_SHOP_ITEM_3,
-    RC_KF_SHOP_ITEM_4,
-    RC_KF_SHOP_ITEM_5,
-    RC_KF_SHOP_ITEM_6,
-    RC_KF_SHOP_ITEM_7,
-    RC_KF_SHOP_ITEM_8,
-
-    // Lost Woods
-    RC_LW_GIFT_FROM_SARIA,
-    RC_LW_SKULL_KID,
-    RC_LW_TRADE_COJIRO,
-    RC_LW_TRADE_ODD_POTION,
-    RC_LW_OCARINA_MEMORY_GAME,
-    RC_LW_TARGET_IN_WOODS,
-    RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT,
-    RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT,
-    RC_LW_DEKU_SCRUB_NEAR_BRIDGE,
-    RC_LW_NEAR_SHORTCUTS_GROTTO_CHEST,
-    RC_LW_DEKU_SCRUB_GROTTO_REAR,
-    RC_LW_DEKU_SCRUB_GROTTO_FRONT,
-    RC_DEKU_THEATER_SKULL_MASK,
-    RC_DEKU_THEATER_MASK_OF_TRUTH,
-
-    // Sacred Forest Meadow
-    RC_SONG_FROM_SARIA,
-    RC_SHEIK_IN_FOREST,
-    RC_SFM_WOLFOS_GROTTO_CHEST,
-    RC_SFM_DEKU_SCRUB_GROTTO_REAR,
-    RC_SFM_DEKU_SCRUB_GROTTO_FRONT,
-
-    // Hyrule Field
-    RC_HF_SOUTHEAST_GROTTO_CHEST,
-    RC_HF_OPEN_GROTTO_CHEST,
-    RC_HF_NEAR_MARKET_GROTTO_CHEST,
-    RC_HF_OCARINA_OF_TIME_ITEM,
-    RC_SONG_FROM_OCARINA_OF_TIME,
-    RC_HF_TEKTITE_GROTTO_FREESTANDING_POH,
-    RC_HF_DEKU_SCRUB_GROTTO,
-    RC_HF_COW_GROTTO_COW,
-
-    // Lake Hylia
-    RC_LH_CHILD_FISHING,
-    RC_LH_ADULT_FISHING,
-    RC_LH_HYRULE_LOACH,
-    RC_LH_LAB_DIVE,
-    RC_LH_TRADE_FROG,
-    RC_LH_UNDERWATER_ITEM,
-    RC_LH_SUN,
-    RC_LH_FREESTANDING_POH,
-    RC_LH_DEKU_SCRUB_GROTTO_LEFT,
-    RC_LH_DEKU_SCRUB_GROTTO_RIGHT,
-    RC_LH_DEKU_SCRUB_GROTTO_CENTER,
-
-    // Gerudo Valley
-    RC_GV_CHEST,
-    RC_GV_TRADE_SAW,
-    RC_GV_WATERFALL_FREESTANDING_POH,
-    RC_GV_CRATE_FREESTANDING_POH,
-    RC_GV_DEKU_SCRUB_GROTTO_REAR,
-    RC_GV_DEKU_SCRUB_GROTTO_FRONT,
-    RC_GV_COW,
-
-    // Gerudo Fortress
-    RC_GF_CHEST,
-    RC_GF_HBA_1000_POINTS,
-    RC_GF_HBA_1500_POINTS,
-    RC_GF_NORTH_F1_CARPENTER,
-    RC_GF_NORTH_F2_CARPENTER,
-    RC_GF_SOUTH_F1_CARPENTER,
-    RC_GF_SOUTH_F2_CARPENTER,
-    RC_GF_GERUDO_MEMBERSHIP_CARD,
-
-    // Haunted Wasteland
-    RC_WASTELAND_CHEST,
-    RC_WASTELAND_BOMBCHU_SALESMAN,
-
-    // Desert Colossus
-    RC_SHEIK_AT_COLOSSUS,
-    RC_COLOSSUS_FREESTANDING_POH,
-    RC_COLOSSUS_GREAT_FAIRY_REWARD,
-    RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,
-    RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT,
-
-    // Market
-    RC_MARKET_TREASURE_CHEST_GAME_REWARD,
-    RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,
-    RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE,
-    RC_MARKET_LOST_DOG,
-    RC_MARKET_SHOOTING_GALLERY_REWARD,
-    RC_MARKET_10_BIG_POES,
-    RC_MARKET_TREASURE_CHEST_GAME_ITEM_1,
-    RC_MARKET_TREASURE_CHEST_GAME_ITEM_2,
-    RC_MARKET_TREASURE_CHEST_GAME_ITEM_3,
-    RC_MARKET_TREASURE_CHEST_GAME_ITEM_4,
-    RC_MARKET_TREASURE_CHEST_GAME_ITEM_5,
-    RC_MARKET_TREASURE_CHEST_GAME_KEY_1,
-    RC_MARKET_TREASURE_CHEST_GAME_KEY_2,
-    RC_MARKET_TREASURE_CHEST_GAME_KEY_3,
-    RC_MARKET_TREASURE_CHEST_GAME_KEY_4,
-    RC_MARKET_TREASURE_CHEST_GAME_KEY_5,
-
-    // Market Shops
-    RC_MARKET_BOMBCHU_SHOP_ITEM_1,
-    RC_MARKET_BOMBCHU_SHOP_ITEM_2,
-    RC_MARKET_BOMBCHU_SHOP_ITEM_3,
-    RC_MARKET_BOMBCHU_SHOP_ITEM_4,
-    RC_MARKET_BOMBCHU_SHOP_ITEM_5,
-    RC_MARKET_BOMBCHU_SHOP_ITEM_6,
-    RC_MARKET_BOMBCHU_SHOP_ITEM_7,
-    RC_MARKET_BOMBCHU_SHOP_ITEM_8,
-    RC_MARKET_POTION_SHOP_ITEM_1,
-    RC_MARKET_POTION_SHOP_ITEM_2,
-    RC_MARKET_POTION_SHOP_ITEM_3,
-    RC_MARKET_POTION_SHOP_ITEM_4,
-    RC_MARKET_POTION_SHOP_ITEM_5,
-    RC_MARKET_POTION_SHOP_ITEM_6,
-    RC_MARKET_POTION_SHOP_ITEM_7,
-    RC_MARKET_POTION_SHOP_ITEM_8,
-    RC_MARKET_BAZAAR_ITEM_1,
-    RC_MARKET_BAZAAR_ITEM_2,
-    RC_MARKET_BAZAAR_ITEM_3,
-    RC_MARKET_BAZAAR_ITEM_4,
-    RC_MARKET_BAZAAR_ITEM_5,
-    RC_MARKET_BAZAAR_ITEM_6,
-    RC_MARKET_BAZAAR_ITEM_7,
-    RC_MARKET_BAZAAR_ITEM_8,
-
-    // Hyrule Castle
-    RC_HC_MALON_EGG,
-    RC_HC_ZELDAS_LETTER,
-    RC_SONG_FROM_IMPA,
-    RC_HC_GREAT_FAIRY_REWARD,
-    RC_OGC_GREAT_FAIRY_REWARD,
-
-    // Temple of Time
-    RC_TOT_MASTER_SWORD,
-    RC_SHEIK_AT_TEMPLE,
-    RC_TOT_LIGHT_ARROWS_CUTSCENE,
-    RC_GIFT_FROM_SAGES,
-
-    // Kakariko
-    RC_SHEIK_IN_KAKARIKO,
-    RC_KAK_REDEAD_GROTTO_CHEST,
-    RC_KAK_OPEN_GROTTO_CHEST,
-    RC_KAK_10_GOLD_SKULLTULA_REWARD,
-    RC_KAK_20_GOLD_SKULLTULA_REWARD,
-    RC_KAK_30_GOLD_SKULLTULA_REWARD,
-    RC_KAK_40_GOLD_SKULLTULA_REWARD,
-    RC_KAK_50_GOLD_SKULLTULA_REWARD,
-    RC_KAK_100_GOLD_SKULLTULA_REWARD,
-    RC_KAK_MAN_ON_ROOF,
-    RC_KAK_SHOOTING_GALLERY_REWARD,
-    RC_KAK_TRADE_ODD_MUSHROOM,
-    RC_KAK_GRANNYS_SHOP,
-    RC_KAK_ANJU_AS_CHILD,
-    RC_KAK_ANJU_AS_ADULT,
-    RC_KAK_TRADE_POCKET_CUCCO,
-    RC_KAK_IMPAS_HOUSE_FREESTANDING_POH,
-    RC_KAK_WINDMILL_FREESTANDING_POH,
-    RC_SONG_FROM_WINDMILL,
-    RC_KAK_IMPAS_HOUSE_COW,
-
-    // Kakariko Shops
-    RC_KAK_POTION_SHOP_ITEM_1,
-    RC_KAK_POTION_SHOP_ITEM_2,
-    RC_KAK_POTION_SHOP_ITEM_3,
-    RC_KAK_POTION_SHOP_ITEM_4,
-    RC_KAK_POTION_SHOP_ITEM_5,
-    RC_KAK_POTION_SHOP_ITEM_6,
-    RC_KAK_POTION_SHOP_ITEM_7,
-    RC_KAK_POTION_SHOP_ITEM_8,
-    RC_KAK_BAZAAR_ITEM_1,
-    RC_KAK_BAZAAR_ITEM_2,
-    RC_KAK_BAZAAR_ITEM_3,
-    RC_KAK_BAZAAR_ITEM_4,
-    RC_KAK_BAZAAR_ITEM_5,
-    RC_KAK_BAZAAR_ITEM_6,
-    RC_KAK_BAZAAR_ITEM_7,
-    RC_KAK_BAZAAR_ITEM_8,
-
-    // Graveyard
-    RC_GRAVEYARD_HOOKSHOT_CHEST,
-    RC_GRAVEYARD_SHIELD_GRAVE_CHEST,
-    RC_GRAVEYARD_HEART_PIECE_GRAVE_CHEST,
-    RC_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST,
-    RC_SONG_FROM_ROYAL_FAMILYS_TOMB,
-    RC_GRAVEYARD_FREESTANDING_POH,
-    RC_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH,
-    RC_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR,
-
-    // Death Mountain Trail
-    RC_DMT_CHEST,
-    RC_DMT_STORMS_GROTTO_CHEST,
-    RC_DMT_TRADE_BROKEN_SWORD,
-    RC_DMT_TRADE_EYEDROPS,
-    RC_DMT_TRADE_CLAIM_CHECK,
-    RC_DMT_GREAT_FAIRY_REWARD,
-    RC_DMT_FREESTANDING_POH,
-    RC_DMT_COW_GROTTO_COW,
-
-    // Goron City
-    RC_GC_MAZE_LEFT_CHEST,
-    RC_GC_MAZE_CENTER_CHEST,
-    RC_GC_MAZE_RIGHT_CHEST,
-    RC_GC_ROLLING_GORON_AS_CHILD,
-    RC_GC_ROLLING_GORON_AS_ADULT,
-    RC_GC_DARUNIAS_JOY,
-    RC_GC_POT_FREESTANDING_POH,
-    RC_GC_DEKU_SCRUB_GROTTO_LEFT,
-    RC_GC_DEKU_SCRUB_GROTTO_RIGHT,
-    RC_GC_DEKU_SCRUB_GROTTO_CENTER,
-    RC_GC_MEDIGORON,
-
-    // Goron City Shop
-    RC_GC_SHOP_ITEM_1,
-    RC_GC_SHOP_ITEM_2,
-    RC_GC_SHOP_ITEM_3,
-    RC_GC_SHOP_ITEM_4,
-    RC_GC_SHOP_ITEM_5,
-    RC_GC_SHOP_ITEM_6,
-    RC_GC_SHOP_ITEM_7,
-    RC_GC_SHOP_ITEM_8,
-
-    // Death Mountain
-    RC_DMC_UPPER_GROTTO_CHEST,
-    RC_DMC_WALL_FREESTANDING_POH,
-    RC_DMC_VOLCANO_FREESTANDING_POH,
-    RC_SHEIK_IN_CRATER,
-    RC_DMC_DEKU_SCRUB,
-    RC_DMC_GREAT_FAIRY_REWARD,
-    RC_DMC_DEKU_SCRUB_GROTTO_LEFT,
-    RC_DMC_DEKU_SCRUB_GROTTO_RIGHT,
-    RC_DMC_DEKU_SCRUB_GROTTO_CENTER,
-
-    // Zoras River
-    RC_ZR_OPEN_GROTTO_CHEST,
-    RC_ZR_MAGIC_BEAN_SALESMAN,
-    RC_ZR_FROGS_ZELDAS_LULLABY,
-    RC_ZR_FROGS_EPONAS_SONG,
-    RC_ZR_FROGS_SARIAS_SONG,
-    RC_ZR_FROGS_SUNS_SONG,
-    RC_ZR_FROGS_SONG_OF_TIME,
-    RC_ZR_FROGS_IN_THE_RAIN,
-    RC_ZR_FROGS_OCARINA_GAME,
-    RC_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH,
-    RC_ZR_NEAR_DOMAIN_FREESTANDING_POH,
-    RC_ZR_DEKU_SCRUB_GROTTO_REAR,
-    RC_ZR_DEKU_SCRUB_GROTTO_FRONT,
-
-    // Zoras Domain
-    RC_ZD_CHEST,
-    RC_ZD_DIVING_MINIGAME,
-    RC_ZD_KING_ZORA_THAWED,
-    RC_ZD_TRADE_PRESCRIPTION,
-
-    // Zora's Domain Shop
-    RC_ZD_SHOP_ITEM_1,
-    RC_ZD_SHOP_ITEM_2,
-    RC_ZD_SHOP_ITEM_3,
-    RC_ZD_SHOP_ITEM_4,
-    RC_ZD_SHOP_ITEM_5,
-    RC_ZD_SHOP_ITEM_6,
-    RC_ZD_SHOP_ITEM_7,
-    RC_ZD_SHOP_ITEM_8,
-
-    // Zoras Fountain
-    RC_ZF_ICEBERC_FREESTANDING_POH,
-    RC_ZF_BOTTOM_FREESTANDING_POH,
-    RC_ZF_GREAT_FAIRY_REWARD,
-
-    // Lon Lon Ranch
-    RC_SONG_FROM_MALON,
-    RC_LLR_TALONS_CHICKENS,
-    RC_LLR_FREESTANDING_POH,
-    RC_LLR_DEKU_SCRUB_GROTTO_LEFT,
-    RC_LLR_DEKU_SCRUB_GROTTO_RIGHT,
-    RC_LLR_DEKU_SCRUB_GROTTO_CENTER,
-    RC_LLR_STABLES_LEFT_COW,
-    RC_LLR_STABLES_RIGHT_COW,
-    RC_LLR_TOWER_LEFT_COW,
-    RC_LLR_TOWER_RIGHT_COW,
-
-    /*-------------------------------
-       --- GOLD SKULLTULA TOKENS ---
-      -------------------------------*/
-
-    // Overworld
-    RC_KF_GS_BEAN_PATCH,
-    RC_KF_GS_KNOW_IT_ALL_HOUSE,
-    RC_KF_GS_HOUSE_OF_TWINS,
-
-    RC_LW_GS_BEAN_PATCH_NEAR_BRIDGE,
-    RC_LW_GS_BEAN_PATCH_NEAR_THEATER,
-    RC_LW_GS_ABOVE_THEATER,
-    RC_SFM_GS,
-
-    RC_HF_GS_COW_GROTTO,
-    RC_HF_GS_NEAR_KAK_GROTTO,
-
-    RC_LH_GS_BEAN_PATCH,
-    RC_LH_GS_SMALL_ISLAND,
-    RC_LH_GS_LAB_WALL,
-    RC_LH_GS_LAB_CRATE,
-    RC_LH_GS_TREE,
-
-    RC_GV_GS_BEAN_PATCH,
-    RC_GV_GS_SMALL_BRIDGE,
-    RC_GV_GS_PILLAR,
-    RC_GV_GS_BEHIND_TENT,
-
-    RC_GF_GS_ARCHERY_RANGE,
-    RC_GF_GS_TOP_FLOOR,
-
-    RC_WASTELAND_GS,
-    RC_COLOSSUS_GS_BEAN_PATCH,
-    RC_COLOSSUS_GS_HILL,
-    RC_COLOSSUS_GS_TREE,
-
-    RC_OGC_GS,
-    RC_HC_GS_STORMS_GROTTO,
-    RC_HC_GS_TREE,
-    RC_MARKET_GS_GUARD_HOUSE,
-
-    RC_KAK_GS_HOUSE_UNDER_CONSTRUCTION,
-    RC_KAK_GS_SKULLTULA_HOUSE,
-    RC_KAK_GS_GUARDS_HOUSE,
-    RC_KAK_GS_TREE,
-    RC_KAK_GS_WATCHTOWER,
-    RC_KAK_GS_ABOVE_IMPAS_HOUSE,
-
-    RC_DMC_GS_BEAN_PATCH,
-    RC_DMC_GS_CRATE,
-
-    RC_DMT_GS_BEAN_PATCH,
-    RC_DMT_GS_NEAR_KAK,
-    RC_DMT_GS_ABOVE_DODONGOS_CAVERN,
-    RC_DMT_GS_FALLING_ROCKS_PATH,
-
-    RC_GC_GS_CENTER_PLATFORM,
-    RC_GC_GS_BOULDER_MAZE,
-    RC_GRAVEYARD_GS_WALL,
-    RC_GRAVEYARD_GS_BEAN_PATCH,
-
-    RC_ZR_GS_LADDER,
-    RC_ZR_GS_TREE,
-    RC_ZR_GS_ABOVE_BRIDGE,
-    RC_ZR_GS_NEAR_RAISED_GROTTOS,
-
-    RC_ZD_GS_FROZEN_WATERFALL,
-    RC_ZF_GS_ABOVE_THE_LOG,
-    RC_ZF_GS_HIDDEN_CAVE,
-    RC_ZF_GS_TREE,
-
-    RC_LLR_GS_BACK_WALL,
-    RC_LLR_GS_RAIN_SHED,
-    RC_LLR_GS_HOUSE_WINDOW,
-    RC_LLR_GS_TREE,
-
-    RC_KF_STORMS_GROTTO_BEEHIVE_LEFT,
-    RC_KF_STORMS_GROTTO_BEEHIVE_RIGHT,
-    RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_LEFT,
-    RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_RIGHT,
-    RC_LW_DEKU_SCRUB_GROTTO_BEEHIVE,
-    RC_SFM_STORMS_GROTTO_BEEHIVE,
-    RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_LEFT,
-    RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_RIGHT,
-    RC_HF_OPEN_GROTTO_BEEHIVE_LEFT,
-    RC_HF_OPEN_GROTTO_BEEHIVE_RIGHT,
-    RC_HF_SOUTHEAST_GROTTO_BEEHIVE_LEFT,
-    RC_HF_SOUTHEAST_GROTTO_BEEHIVE_RIGHT,
-    RC_HF_INSIDE_FENCE_GROTTO_BEEHIVE,
-    RC_LLR_GROTTO_BEEHIVE,
-    RC_KAK_OPEN_GROTTO_BEEHIVE_LEFT,
-    RC_KAK_OPEN_GROTTO_BEEHIVE_RIGHT,
-    RC_DMT_COW_GROTTO_BEEHIVE,
-    RC_DMT_STORMS_GROTTO_BEEHIVE_LEFT,
-    RC_DMT_STORMS_GROTTO_BEEHIVE_RIGHT,
-    RC_GC_GROTTO_BEEHIVE,
-    RC_DMC_UPPER_GROTTO_BEEHIVE_LEFT,
-    RC_DMC_UPPER_GROTTO_BEEHIVE_RIGHT,
-    RC_DMC_HAMMER_GROTTO_BEEHIVE,
-    RC_ZR_OPEN_GROTTO_BEEHIVE_LEFT,
-    RC_ZR_OPEN_GROTTO_BEEHIVE_RIGHT,
-    RC_ZR_STORMS_GROTTO_BEEHIVE,
-    RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_LEFT,
-    RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_RIGHT,
-    RC_ZD_BEHIND_KING_ZORA_BEEHIVE,
-    RC_LH_GROTTO_BEEHIVE,
-    RC_GV_DEKU_SCRUB_GROTTO_BEEHIVE,
-    RC_COLOSSUS_GROTTO_BEEHIVE,
-};
-
-std::vector<RandomizerCheck> Rando::StaticData::gossipStoneLocations = {
-    RC_KF_DEKU_TREE_LEFT_GOSSIP_STONE,
-    RC_KF_DEKU_TREE_RIGHT_GOSSIP_STONE,
-    RC_KF_GOSSIP_STONE,
-    RC_KF_STORMS_GROTTO_GOSSIP_STONE,
-    RC_LW_GOSSIP_STONE,
-    RC_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE,
-    RC_SFM_MAZE_LOWER_GOSSIP_STONE,
-    RC_SFM_MAZE_UPPER_GOSSIP_STONE,
-    RC_SFM_SARIA_GOSSIP_STONE,
-    RC_HF_COW_GROTTO_GOSSIP_STONE,
-    RC_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE,
-    RC_HF_OPEN_GROTTO_GOSSIP_STONE,
-    RC_HF_SOUTHEAST_GROTTO_GOSSIP_STONE,
-    RC_TOT_LEFT_CENTER_GOSSIP_STONE,
-    RC_TOT_LEFTMOST_GOSSIP_STONE,
-    RC_TOT_RIGHT_CENTER_GOSSIP_STONE,
-    RC_TOT_RIGHTMOST_GOSSIP_STONE,
-    RC_HC_MALON_GOSSIP_STONE,
-    RC_HC_ROCK_WALL_GOSSIP_STONE,
-    RC_HC_STORMS_GROTTO_GOSSIP_STONE,
-    RC_KAK_OPEN_GROTTO_GOSSIP_STONE,
-    RC_GRAVEYARD_GOSSIP_STONE,
-    RC_DMT_GOSSIP_STONE,
-    RC_DMT_STORMS_GROTTO_GOSSIP_STONE,
-    RC_GC_MAZE_GOSSIP_STONE,
-    RC_GC_MEDIGORON_GOSSIP_STONE,
-    RC_DMC_GOSSIP_STONE,
-    RC_DMC_UPPER_GROTTO_GOSSIP_STONE,
-    RC_ZR_NEAR_DOMAIN_GOSSIP_STONE,
-    RC_ZR_NEAR_GROTTOS_GOSSIP_STONE,
-    RC_ZR_OPEN_GROTTO_GOSSIP_STONE,
-    RC_ZD_GOSSIP_STONE,
-    RC_ZF_JABU_GOSSIP_STONE,
-    RC_ZF_FAIRY_GOSSIP_STONE,
-    RC_LH_LAB_GOSSIP_STONE,
-    RC_LH_SOUTHEAST_GOSSIP_STONE,
-    RC_LH_SOUTHWEST_GOSSIP_STONE,
-    RC_GV_GOSSIP_STONE,
-    RC_COLOSSUS_GOSSIP_STONE,
-    RC_DODONGOS_CAVERN_GOSSIP_STONE,
-};
-
-std::vector<RandomizerCheck> Rando::StaticData::staticHintLocations = {
-    RC_GANONDORF_HINT,
-    RC_SHEIK_HINT_GC,
-    RC_SHEIK_HINT_MQ_GC,
-    RC_DAMPE_HINT,
-    RC_GREG_HINT,
-    RC_SARIA_SONG_HINT,
-    RC_ALTAR_HINT_CHILD,
-    RC_ALTAR_HINT_ADULT,
-    RC_FISHING_POLE_HINT,
-    RC_TOT_SHEIK_HINT,
-    RC_MASK_SHOP_HINT,
-};
-
-std::vector<RandomizerCheck> Rando::StaticData::pondFishLocations = {
-    RC_LH_CHILD_FISH_1,  RC_LH_CHILD_FISH_2,  RC_LH_CHILD_FISH_3,  RC_LH_CHILD_FISH_4,  RC_LH_CHILD_FISH_5,
-    RC_LH_CHILD_FISH_6,  RC_LH_CHILD_FISH_7,  RC_LH_CHILD_FISH_8,  RC_LH_CHILD_FISH_9,  RC_LH_CHILD_FISH_10,
-    RC_LH_CHILD_FISH_11, RC_LH_CHILD_FISH_12, RC_LH_CHILD_FISH_13, RC_LH_CHILD_FISH_14, RC_LH_CHILD_FISH_15,
-    RC_LH_CHILD_LOACH_1, RC_LH_CHILD_LOACH_2, RC_LH_ADULT_FISH_1,  RC_LH_ADULT_FISH_2,  RC_LH_ADULT_FISH_3,
-    RC_LH_ADULT_FISH_4,  RC_LH_ADULT_FISH_5,  RC_LH_ADULT_FISH_6,  RC_LH_ADULT_FISH_7,  RC_LH_ADULT_FISH_8,
-    RC_LH_ADULT_FISH_9,  RC_LH_ADULT_FISH_10, RC_LH_ADULT_FISH_11, RC_LH_ADULT_FISH_12, RC_LH_ADULT_FISH_13,
-    RC_LH_ADULT_FISH_14, RC_LH_ADULT_FISH_15, RC_LH_ADULT_LOACH
-};
-
-std::vector<RandomizerCheck> Rando::StaticData::overworldFishLocations = {
-    RC_DMC_UPPER_GROTTO_FISH,      RC_DMT_STORMS_GROTTO_FISH,        RC_HF_SOUTHEAST_GROTTO_FISH,
-    RC_HF_NEAR_MARKET_GROTTO_FISH, RC_HF_OPEN_GROTTO_FISH,           RC_KAK_OPEN_GROTTO_FISH,
-    RC_KF_STORMS_GROTTO_FISH,      RC_LW_NEAR_SHORTCUTS_GROTTO_FISH, RC_ZR_OPEN_GROTTO_FISH,
-    RC_ZD_FISH_1,   RC_ZD_FISH_2,   RC_ZD_FISH_3,   RC_ZD_FISH_4,    RC_ZD_FISH_5
-};
-
-typedef enum {
-    DUNGEON_DEKU_TREE = 0,
-    DUNGEON_DODONGOS_CAVERN,
-    DUNGEON_JABUJABUS_BELLY,
-    DUNGEON_FOREST_TEMPLE,
-    DUNGEON_FIRE_TEMPLE,
-    DUNGEON_WATER_TEMPLE,
-    DUNGEON_SPIRIT_TEMPLE,
-    DUNGEON_SHADOW_TEMPLE,
-    DUNGEON_BOTTOM_OF_THE_WELL,
-    DUNGEON_ICE_CAVERN,
-    DUNGEON_GANONS_CASTLE_SECOND_PART,
-    DUNGEON_GERUDO_TRAINING_GROUNDS,
-    DUNGEON_GERUDO_FORTRESS,
-    DUNGEON_GANONS_CASTLE_FIRST_PART,
-    DUNGEON_GANONS_CASTLE_FLOOR_BENEATH_BOSS_CHAMBER,
-    DUNGEON_GANONS_CASTLE_CRUMBLING,
-    DUNGEON_TREASURE_CHEST_SHOP,
-    DUNGEON_DEKU_TREE_BOSS_ROOM,
-    DUNGEON_DODONGOS_CAVERN_BOSS_ROOM,
-    DUNGEON_JABUJABUS_BELLY_BOSS_ROOM,
-} DungeonId;
-
 using namespace Rando;
 
-void Rando::StaticData::InitLocationTable() { //                                                      Randomizer Check                                                 Quest            Type                                Area                                 Actor ID              Scene ID                            Params                                             Flags Short Name                                     Hint Text Key                                                    Vanilla Item                          Categories                                              Spoiler Collection Check                                                                                                      Collection Check Group                                         Vanilla Progression
+std::vector<RandomizerCheck> Rando::StaticData::GetPondFishLocations() {
+    std::vector<RandomizerCheck> pondFishLocations = {};
+    for (Location& location : locationTable) {
+        if (location.GetRCType() == RCTYPE_FISH && location.GetScene() == SCENE_FISHING_POND && location.GetRandomizerCheck() != RC_UNKNOWN_CHECK) {
+            pondFishLocations.push_back(location.GetRandomizerCheck());
+        }
+    }
+    return pondFishLocations;
+}
+
+std::vector<RandomizerCheck> Rando::StaticData::GetOverworldFishLocations() {
+    std::vector<RandomizerCheck> overworldFishLocations = {};
+    for (Location& location : locationTable) {
+        if (location.GetRCType() == RCTYPE_FISH && location.GetScene() != SCENE_FISHING_POND && location.GetRandomizerCheck() != RC_UNKNOWN_CHECK) {
+            overworldFishLocations.push_back(location.GetRandomizerCheck());
+        }
+    }
+    return overworldFishLocations;
+}
+
+std::vector<RandomizerCheck> Rando::StaticData::GetStaticHintLocations() {
+    std::vector<RandomizerCheck> staticHintLocations = {};
+    for (Location& location : locationTable) {
+        if (location.GetRCType() == RCTYPE_STATIC_HINT && location.GetRandomizerCheck() != RC_UNKNOWN_CHECK) {
+            staticHintLocations.push_back(location.GetRandomizerCheck());
+        }
+    }
+    return staticHintLocations;
+}
+
+std::vector<RandomizerCheck> Rando::StaticData::GetScrubLocations() {
+    std::vector<RandomizerCheck> scrubLocations = {};
+    for (Location& location : locationTable) {
+        if (location.GetRCType() == RCTYPE_SCRUB && location.GetRandomizerCheck() != RC_UNKNOWN_CHECK) {
+            scrubLocations.push_back(location.GetRandomizerCheck());
+        }
+    }
+    return scrubLocations;
+}
+
+std::vector<RandomizerCheck> Rando::StaticData::GetGossipStoneLocations() {
+    std::vector<RandomizerCheck> gossipStoneLocations = {};
+    for (Location& location : locationTable) {
+        if (location.GetRCType() == RCTYPE_GOSSIP_STONE && location.GetRandomizerCheck() != RC_UNKNOWN_CHECK) {
+            gossipStoneLocations.push_back(location.GetRandomizerCheck());
+        }
+    }
+    return gossipStoneLocations;
+}
+
+std::vector<RandomizerCheck> Rando::StaticData::GetShopLocations() {
+    std::vector<RandomizerCheck> shopLocations = {};
+    for (Location& location : locationTable) {
+        if (location.GetRCType() == RCTYPE_SHOP && location.GetRandomizerCheck() != RC_UNKNOWN_CHECK) {
+            shopLocations.push_back(location.GetRandomizerCheck());
+        }
+    }
+    return shopLocations;
+}
+
+std::vector<RandomizerCheck> Rando::StaticData::GetOverworldLocations() {
+    std::vector<RandomizerCheck> overworldLocations = {};
+    for (Location& location : locationTable) {
+        if (
+            location.IsOverworld() &&
+            location.GetRandomizerCheck() != RC_UNKNOWN_CHECK &&
+            location.GetRandomizerCheck() != RC_TRIFORCE_COMPLETED && //not really an overworld check
+            location.GetRCType() != RCTYPE_FISH && //temp fix while locations are properly sorted out
+            location.GetRCType() != RCTYPE_CHEST_GAME //this is supposed to be excluded
+        ) {
+            overworldLocations.push_back(location.GetRandomizerCheck());
+        }
+    }
+    return overworldLocations;
+}
+
+void Rando::StaticData::InitLocationTable() { //                                                      Randomizer Check                                                 Quest            Type                                Area                                 Actor ID              Scene ID                            Params                        Flags Short Name                                     Hint Text Key                                                    Vanilla Item                                                        Spoiler Collection Check                                                                                                      Collection Check Group                                         Vanilla Progression
     // clang-format off
-    locationTable[RC_UNKNOWN_CHECK] =                                                  Location::Base(RC_UNKNOWN_CHECK,                                                RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_INVALID,                      ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x00, "Invalid Location", "Invalid Location",        RHT_NONE,                                                        RG_NONE,                              {},                                                     SpoilerCollectionCheck::None());
+    locationTable[RC_UNKNOWN_CHECK] =                                                  Location::Base(RC_UNKNOWN_CHECK,                                                RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_INVALID,                      ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                               "Invalid Location", "Invalid Location",        RHT_NONE,                                                        RG_NONE);
     // Kokiri Forest
-    locationTable[RC_KF_KOKIRI_SWORD_CHEST] =                                         Location::Chest(RC_KF_KOKIRI_SWORD_CHEST,                                        RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KOKIRI_FOREST,                ACTOR_EN_BOX,         SCENE_KOKIRI_FOREST,                1248,                                              0x00, "Kokiri Sword Chest",                          RHT_KF_KOKIRI_SWORD_CHEST,                                       RG_KOKIRI_SWORD,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST,              true);
-    locationTable[RC_KF_MIDOS_TOP_LEFT_CHEST] =                                       Location::Chest(RC_KF_MIDOS_TOP_LEFT_CHEST,                                      RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KOKIRI_FOREST,                ACTOR_EN_BOX,         SCENE_MIDOS_HOUSE,                  22944,                                             0x00, "Mido Top Left Chest",                         RHT_KF_MIDOS_TOP_LEFT_CHEST,                                     RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_MIDOS_TOP_RIGHT_CHEST] =                                      Location::Chest(RC_KF_MIDOS_TOP_RIGHT_CHEST,                                     RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KOKIRI_FOREST,                ACTOR_EN_BOX,         SCENE_MIDOS_HOUSE,                  22945,                                             0x01, "Mido Top Right Chest",                        RHT_KF_MIDOS_TOP_RIGHT_CHEST,                                    RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_MIDOS_BOTTOM_LEFT_CHEST] =                                    Location::Chest(RC_KF_MIDOS_BOTTOM_LEFT_CHEST,                                   RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KOKIRI_FOREST,                ACTOR_EN_BOX,         SCENE_MIDOS_HOUSE,                  22914,                                             0x02, "Mido Bottom Left Chest",                      RHT_KF_MIDOS_BOTTOM_LEFT_CHEST,                                  RG_GREG_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_MIDOS_BOTTOM_RIGHT_CHEST] =                                   Location::Chest(RC_KF_MIDOS_BOTTOM_RIGHT_CHEST,                                  RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KOKIRI_FOREST,                ACTOR_EN_BOX,         SCENE_MIDOS_HOUSE,                  22787,                                             0x03, "Mido Bottom Right Chest",                     RHT_KF_MIDOS_BOTTOM_RIGHT_CHEST,                                 RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_STORMS_GROTTO_CHEST] =                                        Location::Chest(RC_KF_STORMS_GROTTO_CHEST,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KOKIRI_FOREST,                ACTOR_EN_BOX,         SCENE_GROTTOS,                      22988,                                             0x0C, "Storms Grotto Chest",                         RHT_KF_STORMS_GROTTO_CHEST,                                      RG_RED_RUPEE,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_KOKIRI_SWORD_CHEST] =                                         Location::Chest(RC_KF_KOKIRI_SWORD_CHEST,                                        RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_KOKIRI_FOREST,                1248,                         0x00, "Kokiri Sword Chest",                          RHT_KF_KOKIRI_SWORD_CHEST,                                       RG_KOKIRI_SWORD,                                                                                                                                                                                  true);
+    locationTable[RC_KF_MIDOS_TOP_LEFT_CHEST] =                                       Location::Chest(RC_KF_MIDOS_TOP_LEFT_CHEST,                                      RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_MIDOS_HOUSE,                  22944,                        0x00, "Mido Top Left Chest",                         RHT_KF_MIDOS_TOP_LEFT_CHEST,                                     RG_BLUE_RUPEE);
+    locationTable[RC_KF_MIDOS_TOP_RIGHT_CHEST] =                                      Location::Chest(RC_KF_MIDOS_TOP_RIGHT_CHEST,                                     RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_MIDOS_HOUSE,                  22945,                        0x01, "Mido Top Right Chest",                        RHT_KF_MIDOS_TOP_RIGHT_CHEST,                                    RG_BLUE_RUPEE);
+    locationTable[RC_KF_MIDOS_BOTTOM_LEFT_CHEST] =                                    Location::Chest(RC_KF_MIDOS_BOTTOM_LEFT_CHEST,                                   RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_MIDOS_HOUSE,                  22914,                        0x02, "Mido Bottom Left Chest",                      RHT_KF_MIDOS_BOTTOM_LEFT_CHEST,                                  RG_GREG_RUPEE);
+    locationTable[RC_KF_MIDOS_BOTTOM_RIGHT_CHEST] =                                   Location::Chest(RC_KF_MIDOS_BOTTOM_RIGHT_CHEST,                                  RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_MIDOS_HOUSE,                  22787,                        0x03, "Mido Bottom Right Chest",                     RHT_KF_MIDOS_BOTTOM_RIGHT_CHEST,                                 RG_RECOVERY_HEART);
+    locationTable[RC_KF_STORMS_GROTTO_CHEST] =                                        Location::Chest(RC_KF_STORMS_GROTTO_CHEST,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KOKIRI_FOREST,                ACTOR_EN_BOX,         SCENE_GROTTOS,                      22988,                        0x0C, "Storms Grotto Chest",                         RHT_KF_STORMS_GROTTO_CHEST,                                      RG_RED_RUPEE);
     // Lost Woods
-    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_CHEST] =                                Location::Chest(RC_LW_NEAR_SHORTCUTS_GROTTO_CHEST,                               RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LOST_WOODS,                   ACTOR_EN_BOX,         SCENE_GROTTOS,                      22964,                                             0x14, "Near Shortcuts Grotto Chest",                 RHT_KF_STORMS_GROTTO_CHEST,                                      RG_RED_RUPEE,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_LW_SKULL_KID] =                                                   Location::Base(RC_LW_SKULL_KID,                                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LOST_WOODS,                   ACTOR_ID_MAX,         SCENE_LOST_WOODS,                   0x00,                                              0x3E, "Skull Kid",                                   RHT_LW_SKULL_KID,                                                RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::ItemGetInf(22),                                                                                       SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
-    locationTable[RC_LW_TRADE_COJIRO] =                                                Location::Base(RC_LW_TRADE_COJIRO,                                              RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_LOST_WOODS,                   ACTOR_ID_MAX,         SCENE_LOST_WOODS,                   0x00,                                              0x1F, "Trade Cojiro",                                RHT_LW_TRADE_COJIRO,                                             RG_ODD_MUSHROOM,                      { Category::cAdultTrade },                              SpoilerCollectionCheck::RandomizerInf(RAND_INF_ADULT_TRADES_LW_TRADE_COJIRO),                                                 SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
-    locationTable[RC_LW_TRADE_ODD_POTION] =                                            Location::Base(RC_LW_TRADE_ODD_POTION,                                          RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_LOST_WOODS,                   ACTOR_ID_MAX,         SCENE_LOST_WOODS,                   0x00,                                              0x21, "Trade Odd Potion",                            RHT_LW_TRADE_COJIRO,                                             RG_POACHERS_SAW,                      { Category::cAdultTrade },                              SpoilerCollectionCheck::ItemGetInf(49),                                                                                       SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
-    locationTable[RC_LW_OCARINA_MEMORY_GAME] =                                         Location::Base(RC_LW_OCARINA_MEMORY_GAME,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LOST_WOODS,                   ACTOR_ID_MAX,         SCENE_LOST_WOODS,                   0x00,                                              0x21, "Ocarina Memory Game",                         RHT_LW_OCARINA_MEMORY_GAME,                                      RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::ItemGetInf(23),                                                                                       SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
-    locationTable[RC_LW_TARGET_IN_WOODS] =                                             Location::Base(RC_LW_TARGET_IN_WOODS,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LOST_WOODS,                   ACTOR_ID_MAX,         SCENE_LOST_WOODS,                   0x00,                                              0x60, "Target in Woods",                             RHT_LW_TARGET_IN_WOODS,                                          RG_PROGRESSIVE_SLINGSHOT,             {},                                                     SpoilerCollectionCheck::ItemGetInf(29),                                                                                       SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
-    locationTable[RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT] =                          Location::Base(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT,                        RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LOST_WOODS,                   ACTOR_EN_DNS,         SCENE_LOST_WOODS,                   0x00,                                              0x30, "Deku Scrub Near Deku Theater Right",          RHT_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT,                       RG_BUY_DEKU_NUTS_5,                   { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT),                       SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT] =                           Location::Base(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT,                         RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LOST_WOODS,                   ACTOR_EN_DNS,         SCENE_LOST_WOODS,                   0x01,                                              0x31, "Deku Scrub Near Deku Theater Left",           RHT_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT,                        RG_BUY_DEKU_STICK_1,                  { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT),                        SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[RC_LW_DEKU_SCRUB_NEAR_BRIDGE] =                                      Location::Base(RC_LW_DEKU_SCRUB_NEAR_BRIDGE,                                    RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LOST_WOODS,                   ACTOR_EN_DNS,         SCENE_LOST_WOODS,                   0x09,                                              0x77, "Deku Scrub Near Bridge",                      RHT_LW_DEKU_SCRUB_NEAR_BRIDGE,                                   RG_PROGRESSIVE_STICK_UPGRADE,         { Category::cDekuScrub, Category::cDekuScrubUpgrades }, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_NEAR_BRIDGE),                                   SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
-    locationTable[RC_LW_DEKU_SCRUB_GROTTO_REAR] =                               Location::GrottoScrub(RC_LW_DEKU_SCRUB_GROTTO_REAR,                                    RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LOST_WOODS,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x03, 0xF5),                      0x33, "Deku Scrub Grotto Rear",                      RHT_LW_DEKU_SCRUB_GROTTO_REAR,                                   RG_BUY_DEKU_SEEDS_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_GROTTO_REAR),                                   SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[RC_LW_DEKU_SCRUB_GROTTO_FRONT] =                              Location::GrottoScrub(RC_LW_DEKU_SCRUB_GROTTO_FRONT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LOST_WOODS,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x0A, 0xF5),                      0x79, "Deku Scrub Grotto Front",                     RHT_LW_DEKU_SCRUB_GROTTO_FRONT,                                  RG_PROGRESSIVE_NUT_UPGRADE,           { Category::cDekuScrub, Category::cDekuScrubUpgrades }, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_GROTTO_FRONT),                                  SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[RC_DEKU_THEATER_SKULL_MASK] =                                        Location::Base(RC_DEKU_THEATER_SKULL_MASK,                                      RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LOST_WOODS,                   ACTOR_ID_MAX,         SCENE_GROTTOS,                      0x00,                                              0x77, "Deku Theater Skull Mask",                     RHT_DEKU_THEATER_SKULL_MASK,                                     RG_PROGRESSIVE_STICK_UPGRADE,         {},                                                     SpoilerCollectionCheck::ItemGetInf(ITEMGETINF_OBTAINED_STICK_UPGRADE_FROM_STAGE),                                             SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
-    locationTable[RC_DEKU_THEATER_MASK_OF_TRUTH] =                                     Location::Base(RC_DEKU_THEATER_MASK_OF_TRUTH,                                   RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LOST_WOODS,                   ACTOR_ID_MAX,         SCENE_GROTTOS,                      0x00,                                              0x7A, "Deku Theater Mask of Truth",                  RHT_DEKU_THEATER_MASK_OF_TRUTH,                                  RG_PROGRESSIVE_NUT_UPGRADE,           {},                                                     SpoilerCollectionCheck::ItemGetInf(ITEMGETINF_OBTAINED_NUT_UPGRADE_FROM_STAGE),                                               SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
+    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_CHEST] =                                Location::Chest(RC_LW_NEAR_SHORTCUTS_GROTTO_CHEST,                               RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LOST_WOODS,                   ACTOR_EN_BOX,         SCENE_GROTTOS,                      22964,                        0x14, "Near Shortcuts Grotto Chest",                 RHT_KF_STORMS_GROTTO_CHEST,                                      RG_RED_RUPEE);
+    locationTable[RC_LW_SKULL_KID] =                                                   Location::Base(RC_LW_SKULL_KID,                                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_LOST_WOODS,                   0x00,                               "Skull Kid",                                   RHT_LW_SKULL_KID,                                                RG_PIECE_OF_HEART,                                                  SpoilerCollectionCheck::ItemGetInf(22),                                                                                       true);
+    locationTable[RC_LW_TRADE_COJIRO] =                                                Location::Base(RC_LW_TRADE_COJIRO,                                              RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                                                      ACTOR_ID_MAX,         SCENE_LOST_WOODS,                   0x00,                               "Trade Cojiro",                                RHT_LW_TRADE_COJIRO,                                             RG_ODD_MUSHROOM,                                                    SpoilerCollectionCheck::RandomizerInf(RAND_INF_ADULT_TRADES_LW_TRADE_COJIRO),                                                 true);
+    locationTable[RC_LW_TRADE_ODD_POTION] =                                            Location::Base(RC_LW_TRADE_ODD_POTION,                                          RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                                                      ACTOR_ID_MAX,         SCENE_LOST_WOODS,                   0x00,                               "Trade Odd Potion",                            RHT_LW_TRADE_COJIRO,                                             RG_POACHERS_SAW,                                                    SpoilerCollectionCheck::ItemGetInf(49),                                                                                       true);
+    locationTable[RC_LW_OCARINA_MEMORY_GAME] =                                         Location::Base(RC_LW_OCARINA_MEMORY_GAME,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_LOST_WOODS,                   0x00,                               "Ocarina Memory Game",                         RHT_LW_OCARINA_MEMORY_GAME,                                      RG_PIECE_OF_HEART,                                                  SpoilerCollectionCheck::ItemGetInf(23),                                                                                       true);
+    locationTable[RC_LW_TARGET_IN_WOODS] =                                             Location::Base(RC_LW_TARGET_IN_WOODS,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_LOST_WOODS,                   0x00,                               "Target in Woods",                             RHT_LW_TARGET_IN_WOODS,                                          RG_PROGRESSIVE_SLINGSHOT,                                           SpoilerCollectionCheck::ItemGetInf(29),                                                                                       true);
+    locationTable[RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT] =                          Location::Base(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT,                        RCQUEST_BOTH,    RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_LOST_WOODS,                   0x00,                               "Deku Scrub Near Deku Theater Right",          RHT_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT,                       RG_BUY_DEKU_NUTS_5,                                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT));
+    locationTable[RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT] =                           Location::Base(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT,                         RCQUEST_BOTH,    RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_LOST_WOODS,                   0x01,                               "Deku Scrub Near Deku Theater Left",           RHT_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT,                        RG_BUY_DEKU_STICK_1,                                                SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT));
+    locationTable[RC_LW_DEKU_SCRUB_NEAR_BRIDGE] =                                      Location::Base(RC_LW_DEKU_SCRUB_NEAR_BRIDGE,                                    RCQUEST_BOTH,    RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_LOST_WOODS,                   0x09,                               "Deku Scrub Near Bridge",                      RHT_LW_DEKU_SCRUB_NEAR_BRIDGE,                                   RG_PROGRESSIVE_STICK_UPGRADE,                                       SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_NEAR_BRIDGE),                                   true);
+    locationTable[RC_LW_DEKU_SCRUB_GROTTO_REAR] =                                      Location::Base(RC_LW_DEKU_SCRUB_GROTTO_REAR,                                    RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LOST_WOODS,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x03, 0xF5),       "Deku Scrub Grotto Rear",                      RHT_LW_DEKU_SCRUB_GROTTO_REAR,                                   RG_BUY_DEKU_SEEDS_30,                                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_GROTTO_REAR));
+    locationTable[RC_LW_DEKU_SCRUB_GROTTO_FRONT] =                                     Location::Base(RC_LW_DEKU_SCRUB_GROTTO_FRONT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LOST_WOODS,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x0A, 0xF5),       "Deku Scrub Grotto Front",                     RHT_LW_DEKU_SCRUB_GROTTO_FRONT,                                  RG_PROGRESSIVE_NUT_UPGRADE,                                         SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_GROTTO_FRONT));
+    locationTable[RC_DEKU_THEATER_SKULL_MASK] =                                        Location::Base(RC_DEKU_THEATER_SKULL_MASK,                                      RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LOST_WOODS,                   ACTOR_ID_MAX,         SCENE_GROTTOS,                      0x00,                               "Deku Theater Skull Mask",                     RHT_DEKU_THEATER_SKULL_MASK,                                     RG_PROGRESSIVE_STICK_UPGRADE,                                       SpoilerCollectionCheck::ItemGetInf(ITEMGETINF_OBTAINED_STICK_UPGRADE_FROM_STAGE),                                             true);
+    locationTable[RC_DEKU_THEATER_MASK_OF_TRUTH] =                                     Location::Base(RC_DEKU_THEATER_MASK_OF_TRUTH,                                   RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LOST_WOODS,                   ACTOR_ID_MAX,         SCENE_GROTTOS,                      0x00,                               "Deku Theater Mask of Truth",                  RHT_DEKU_THEATER_MASK_OF_TRUTH,                                  RG_PROGRESSIVE_NUT_UPGRADE,                                         SpoilerCollectionCheck::ItemGetInf(ITEMGETINF_OBTAINED_NUT_UPGRADE_FROM_STAGE),                                               true);
     // Sacred Forest Meadow
-    locationTable[RC_SFM_WOLFOS_GROTTO_CHEST] =                                       Location::Chest(RC_SFM_WOLFOS_GROTTO_CHEST,                                      RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_SACRED_FOREST_MEADOW,         ACTOR_EN_BOX,         SCENE_GROTTOS,                      31409,                                             0x11, "Wolfos Grotto Chest",                         RHT_SFM_WOLFOS_GROTTO_CHEST,                                     RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[RC_SFM_DEKU_SCRUB_GROTTO_REAR] =                              Location::GrottoScrub(RC_SFM_DEKU_SCRUB_GROTTO_REAR,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_SACRED_FOREST_MEADOW,         ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x07, 0xEE),                      0x39, "Deku Scrub Grotto Rear",                      RHT_SFM_DEKU_SCRUB_GROTTO_REAR,                                  RG_BUY_RED_POTION_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_SFM_DEKU_SCRUB_GROTTO_REAR),                                  SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[RC_SFM_DEKU_SCRUB_GROTTO_FRONT] =                             Location::GrottoScrub(RC_SFM_DEKU_SCRUB_GROTTO_FRONT,                                  RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_SACRED_FOREST_MEADOW,         ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x08, 0xEE),                      0x3A, "Deku Scrub Grotto Front",                     RHT_SFM_DEKU_SCRUB_GROTTO_FRONT,                                 RG_BUY_GREEN_POTION,                  { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_SFM_DEKU_SCRUB_GROTTO_FRONT),                                 SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_SFM_WOLFOS_GROTTO_CHEST] =                                       Location::Chest(RC_SFM_WOLFOS_GROTTO_CHEST,                                      RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_SACRED_FOREST_MEADOW,         ACTOR_EN_BOX,         SCENE_GROTTOS,                      31409,                        0x11, "Wolfos Grotto Chest",                         RHT_SFM_WOLFOS_GROTTO_CHEST,                                     RG_PURPLE_RUPEE);
+    locationTable[RC_SFM_DEKU_SCRUB_GROTTO_REAR] =                                     Location::Base(RC_SFM_DEKU_SCRUB_GROTTO_REAR,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_SACRED_FOREST_MEADOW,         ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x07, 0xEE),       "Deku Scrub Grotto Rear",                      RHT_SFM_DEKU_SCRUB_GROTTO_REAR,                                  RG_BUY_RED_POTION_30,                                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_SFM_DEKU_SCRUB_GROTTO_REAR));
+    locationTable[RC_SFM_DEKU_SCRUB_GROTTO_FRONT] =                                    Location::Base(RC_SFM_DEKU_SCRUB_GROTTO_FRONT,                                  RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_SACRED_FOREST_MEADOW,         ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x08, 0xEE),       "Deku Scrub Grotto Front",                     RHT_SFM_DEKU_SCRUB_GROTTO_FRONT,                                 RG_BUY_GREEN_POTION,                                                SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_SFM_DEKU_SCRUB_GROTTO_FRONT));
     // Hyrule Field
-    locationTable[RC_HF_SOUTHEAST_GROTTO_CHEST] =                                     Location::Chest(RC_HF_SOUTHEAST_GROTTO_CHEST,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_FIELD,                 ACTOR_EN_BOX,         SCENE_GROTTOS,                      22978,                                             0x02, "Southeast Grotto Chest",                      RHT_HF_SOUTHEAST_GROTTO_CHEST,                                   RG_RED_RUPEE,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[RC_HF_OPEN_GROTTO_CHEST] =                                          Location::Chest(RC_HF_OPEN_GROTTO_CHEST,                                         RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_FIELD,                 ACTOR_EN_BOX,         SCENE_GROTTOS,                      22947,                                             0x03, "Open Grotto Chest",                           RHT_HF_OPEN_GROTTO_CHEST,                                        RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[RC_HF_NEAR_MARKET_GROTTO_CHEST] =                                   Location::Chest(RC_HF_NEAR_MARKET_GROTTO_CHEST,                                  RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_FIELD,                 ACTOR_EN_BOX,         SCENE_GROTTOS,                      22944,                                             0x00, "Near Market Grotto Chest",                    RHT_HF_NEAR_MARKET_GROTTO_CHEST,                                 RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[RC_HF_OCARINA_OF_TIME_ITEM] =                                        Location::Base(RC_HF_OCARINA_OF_TIME_ITEM,                                      RCQUEST_BOTH,    RCTYPE_OCARINA,                     RCAREA_HYRULE_FIELD,                 ACTOR_ID_MAX,         SCENE_HYRULE_FIELD,                 0x00,                                              0x0C, "Ocarina of Time Item",                        RHT_HF_OCARINA_OF_TIME_ITEM,                                     RG_PROGRESSIVE_OCARINA,               {},                                                     SpoilerCollectionCheck::EventChkInf(0x43),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[RC_HF_TEKTITE_GROTTO_FREESTANDING_POH] =                      Location::Collectable(RC_HF_TEKTITE_GROTTO_FREESTANDING_POH,                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_FIELD,                 ACTOR_EN_ITEM00,      SCENE_GROTTOS,                      262,                                               0x01, "Tektite Grotto Freestanding PoH",             RHT_HF_TEKTITE_GROTTO_FREESTANDING_POH,                          RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD,               true);
-    locationTable[RC_HF_DEKU_SCRUB_GROTTO] =                                    Location::GrottoScrub(RC_HF_DEKU_SCRUB_GROTTO,                                         RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_HYRULE_FIELD,                 ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x02, 0xE6),                      0x3E, "Deku Scrub Grotto",                           RHT_HF_DEKU_SCRUB_GROTTO,                                        RG_PIECE_OF_HEART,                    { Category::cDekuScrub, Category::cDekuScrubUpgrades }, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_HF_DEKU_SCRUB_GROTTO),                                        SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD,               true);
+    locationTable[RC_HF_SOUTHEAST_GROTTO_CHEST] =                                     Location::Chest(RC_HF_SOUTHEAST_GROTTO_CHEST,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_FIELD,                 ACTOR_EN_BOX,         SCENE_GROTTOS,                      22978,                        0x02, "Southeast Grotto Chest",                      RHT_HF_SOUTHEAST_GROTTO_CHEST,                                   RG_RED_RUPEE);
+    locationTable[RC_HF_OPEN_GROTTO_CHEST] =                                          Location::Chest(RC_HF_OPEN_GROTTO_CHEST,                                         RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_FIELD,                 ACTOR_EN_BOX,         SCENE_GROTTOS,                      22947,                        0x03, "Open Grotto Chest",                           RHT_HF_OPEN_GROTTO_CHEST,                                        RG_BLUE_RUPEE);
+    locationTable[RC_HF_NEAR_MARKET_GROTTO_CHEST] =                                   Location::Chest(RC_HF_NEAR_MARKET_GROTTO_CHEST,                                  RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_FIELD,                 ACTOR_EN_BOX,         SCENE_GROTTOS,                      22944,                        0x00, "Near Market Grotto Chest",                    RHT_HF_NEAR_MARKET_GROTTO_CHEST,                                 RG_BLUE_RUPEE);
+    locationTable[RC_HF_OCARINA_OF_TIME_ITEM] =                                        Location::Base(RC_HF_OCARINA_OF_TIME_ITEM,                                      RCQUEST_BOTH,    RCTYPE_OCARINA,                                                          ACTOR_ID_MAX,         SCENE_HYRULE_FIELD,                 0x00,                               "Ocarina of Time Item",                        RHT_HF_OCARINA_OF_TIME_ITEM,                                     RG_PROGRESSIVE_OCARINA,                                             SpoilerCollectionCheck::EventChkInf(0x43));
+    locationTable[RC_HF_TEKTITE_GROTTO_FREESTANDING_POH] =                      Location::Collectable(RC_HF_TEKTITE_GROTTO_FREESTANDING_POH,                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_FIELD,                 ACTOR_EN_ITEM00,      SCENE_GROTTOS,                      262,                          0x01, "Tektite Grotto Freestanding PoH",             RHT_HF_TEKTITE_GROTTO_FREESTANDING_POH,                          RG_PIECE_OF_HEART,                                                                                                                                                                                true);
+    locationTable[RC_HF_DEKU_SCRUB_GROTTO] =                                           Location::Base(RC_HF_DEKU_SCRUB_GROTTO,                                         RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_HYRULE_FIELD,                 ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x02, 0xE6),       "Deku Scrub Grotto",                           RHT_HF_DEKU_SCRUB_GROTTO,                                        RG_PIECE_OF_HEART,                                                  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_HF_DEKU_SCRUB_GROTTO),                                        true);
     // Lake Hylia
-    locationTable[RC_LH_CHILD_FISHING] =                                               Location::Base(RC_LH_CHILD_FISHING,                                             RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LAKE_HYLIA,                   ACTOR_ID_MAX,         SCENE_FISHING_POND,                 0x00,                                              0x3E, "Child Fishing",                               RHT_LH_CHILD_FISHING,                                            RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_CHILD_FISHING),                                                                SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,                 true);
-    locationTable[RC_LH_ADULT_FISHING] =                                               Location::Base(RC_LH_ADULT_FISHING,                                             RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LAKE_HYLIA,                   ACTOR_ID_MAX,         SCENE_FISHING_POND,                 0x00,                                              0x38, "Adult Fishing",                               RHT_LH_ADULT_FISHING,                                            RG_PROGRESSIVE_SCALE,                 {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ADULT_FISHING),                                                                SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,                 true);
-    locationTable[RC_LH_HYRULE_LOACH] =                                                Location::Base(RC_LH_HYRULE_LOACH,                                              RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LAKE_HYLIA,                   ACTOR_ID_MAX,         SCENE_FISHING_POND,                 0x00,                                              0x00, "Hyrule Loach Reward",                         RHT_LH_HYRULE_LOACH,                                             RG_PURPLE_RUPEE,                      {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_CAUGHT_LOACH),                                                                 SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_LAB_DIVE] =                                                    Location::Base(RC_LH_LAB_DIVE,                                                  RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LAKE_HYLIA,                   ACTOR_ID_MAX,         SCENE_LAKESIDE_LABORATORY,          0x00,                                              0x3E, "Lab Dive",                                    RHT_LH_LAB_DIVE,                                                 RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::ItemGetInf(16),                                                                                       SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,                 true);
-    locationTable[RC_LH_TRADE_FROG] =                                                  Location::Base(RC_LH_TRADE_FROG,                                                RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_LAKE_HYLIA,                   ACTOR_ID_MAX,         SCENE_LAKESIDE_LABORATORY,          0x00,                                              0x25, "Lab Trade Eyeball Frog",                      RHT_LH_TRADE_FROG,                                               RG_EYEDROPS,                          { Category::cAdultTrade },                              SpoilerCollectionCheck::RandomizerInf(RAND_INF_ADULT_TRADES_LH_TRADE_FROG),                                                   SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,                 true);
-    locationTable[RC_LH_UNDERWATER_ITEM] =                                             Location::Base(RC_LH_UNDERWATER_ITEM,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LAKE_HYLIA,                   ACTOR_ID_MAX,         SCENE_LAKE_HYLIA,                   0x00,                                              0x15, "Underwater Item",                             RHT_LH_UNDERWATER_ITEM,                                          RG_RUTOS_LETTER,                      {},                                                     SpoilerCollectionCheck::EventChkInf(0x31),                                                                                    SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,                 true);
-    locationTable[RC_LH_SUN] =                                                         Location::Base(RC_LH_SUN,                                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LAKE_HYLIA,                   ACTOR_ID_MAX,         SCENE_LAKE_HYLIA,                   0x00,                                              0x58, "Sun",                                         RHT_LH_SUN,                                                      RG_FIRE_ARROWS,                       {},                                                     SpoilerCollectionCheck::Chest(0x57, 0x1F),                                                                                    SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,                 true);
-    locationTable[RC_LH_FREESTANDING_POH] =                                     Location::Collectable(RC_LH_FREESTANDING_POH,                                          RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LAKE_HYLIA,                   ACTOR_EN_ITEM00,      SCENE_LAKE_HYLIA,                   7686,                                              0x1E, "Freestanding PoH",                            RHT_LH_FREESTANDING_POH,                                         RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA,                 true);
-    locationTable[RC_LH_DEKU_SCRUB_GROTTO_LEFT] =                               Location::GrottoScrub(RC_LH_DEKU_SCRUB_GROTTO_LEFT,                                    RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LAKE_HYLIA,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x00, 0xEF),                      0x30, "Deku Scrub Grotto Left",                      RHT_LH_DEKU_SCRUB_GROTTO_LEFT,                                   RG_BUY_DEKU_NUTS_5,                   { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LH_DEKU_SCRUB_GROTTO_LEFT),                                   SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_DEKU_SCRUB_GROTTO_RIGHT] =                              Location::GrottoScrub(RC_LH_DEKU_SCRUB_GROTTO_RIGHT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LAKE_HYLIA,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x05, 0xEF),                      0x37, "Deku Scrub Grotto Right",                     RHT_LH_DEKU_SCRUB_GROTTO_RIGHT,                                  RG_BUY_BOMBS_535,                     { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LH_DEKU_SCRUB_GROTTO_RIGHT),                                  SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_DEKU_SCRUB_GROTTO_CENTER] =                             Location::GrottoScrub(RC_LH_DEKU_SCRUB_GROTTO_CENTER,                                  RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LAKE_HYLIA,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x03, 0xEF),                      0x33, "Deku Scrub Grotto Center",                    RHT_LH_DEKU_SCRUB_GROTTO_CENTER,                                 RG_BUY_DEKU_SEEDS_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LH_DEKU_SCRUB_GROTTO_CENTER),                                 SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISHING] =                                               Location::Base(RC_LH_CHILD_FISHING,                                             RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_FISHING_POND,                 0x00,                               "Child Fishing",                               RHT_LH_CHILD_FISHING,                                            RG_PIECE_OF_HEART,                                                  SpoilerCollectionCheck::RandomizerInf(RAND_INF_CHILD_FISHING),                                                                true);
+    locationTable[RC_LH_ADULT_FISHING] =                                               Location::Base(RC_LH_ADULT_FISHING,                                             RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_FISHING_POND,                 0x00,                               "Adult Fishing",                               RHT_LH_ADULT_FISHING,                                            RG_PROGRESSIVE_SCALE,                                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_ADULT_FISHING),                                                                true);
+    locationTable[RC_LH_HYRULE_LOACH] =                                                Location::Base(RC_LH_HYRULE_LOACH,                                              RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_FISHING_POND,                 0x00,                               "Hyrule Loach Reward",                         RHT_LH_HYRULE_LOACH,                                             RG_PURPLE_RUPEE,                                                    SpoilerCollectionCheck::RandomizerInf(RAND_INF_CAUGHT_LOACH));
+    locationTable[RC_LH_LAB_DIVE] =                                                    Location::Base(RC_LH_LAB_DIVE,                                                  RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_LAKESIDE_LABORATORY,          0x00,                               "Lab Dive",                                    RHT_LH_LAB_DIVE,                                                 RG_PIECE_OF_HEART,                                                  SpoilerCollectionCheck::ItemGetInf(16),                                                                                       true);
+    locationTable[RC_LH_TRADE_FROG] =                                                  Location::Base(RC_LH_TRADE_FROG,                                                RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                                                      ACTOR_ID_MAX,         SCENE_LAKESIDE_LABORATORY,          0x00,                               "Lab Trade Eyeball Frog",                      RHT_LH_TRADE_FROG,                                               RG_EYEDROPS,                                                        SpoilerCollectionCheck::RandomizerInf(RAND_INF_ADULT_TRADES_LH_TRADE_FROG),                                                   true);
+    locationTable[RC_LH_UNDERWATER_ITEM] =                                             Location::Base(RC_LH_UNDERWATER_ITEM,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_LAKE_HYLIA,                   0x00,                               "Underwater Item",                             RHT_LH_UNDERWATER_ITEM,                                          RG_RUTOS_LETTER,                                                    SpoilerCollectionCheck::EventChkInf(0x31),                                                                                    true);
+    locationTable[RC_LH_SUN] =                                                         Location::Base(RC_LH_SUN,                                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_LAKE_HYLIA,                   0x00,                               "Sun",                                         RHT_LH_SUN,                                                      RG_FIRE_ARROWS,                                                     SpoilerCollectionCheck::Chest(0x57, 0x1F),                                                                                    true);
+    locationTable[RC_LH_FREESTANDING_POH] =                                     Location::Collectable(RC_LH_FREESTANDING_POH,                                          RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_ITEM00,      SCENE_LAKE_HYLIA,                   7686,                         0x1E, "Freestanding PoH",                            RHT_LH_FREESTANDING_POH,                                         RG_PIECE_OF_HEART,                                                                                                                                                                                true);
+    locationTable[RC_LH_DEKU_SCRUB_GROTTO_LEFT] =                                      Location::Base(RC_LH_DEKU_SCRUB_GROTTO_LEFT,                                    RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LAKE_HYLIA,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x00, 0xEF),       "Deku Scrub Grotto Left",                      RHT_LH_DEKU_SCRUB_GROTTO_LEFT,                                   RG_BUY_DEKU_NUTS_5,                                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LH_DEKU_SCRUB_GROTTO_LEFT));
+    locationTable[RC_LH_DEKU_SCRUB_GROTTO_RIGHT] =                                     Location::Base(RC_LH_DEKU_SCRUB_GROTTO_RIGHT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LAKE_HYLIA,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x05, 0xEF),       "Deku Scrub Grotto Right",                     RHT_LH_DEKU_SCRUB_GROTTO_RIGHT,                                  RG_BUY_BOMBS_535,                                                   SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LH_DEKU_SCRUB_GROTTO_RIGHT));
+    locationTable[RC_LH_DEKU_SCRUB_GROTTO_CENTER] =                                    Location::Base(RC_LH_DEKU_SCRUB_GROTTO_CENTER,                                  RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LAKE_HYLIA,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x03, 0xEF),       "Deku Scrub Grotto Center",                    RHT_LH_DEKU_SCRUB_GROTTO_CENTER,                                 RG_BUY_DEKU_SEEDS_30,                                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LH_DEKU_SCRUB_GROTTO_CENTER));
     // Gerudo Valley
-    locationTable[RC_GV_CHEST] =                                                      Location::Chest(RC_GV_CHEST,                                                     RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GERUDO_VALLEY,                ACTOR_EN_BOX,         SCENE_GERUDO_VALLEY,                23200,                                             0x00, "Chest",                                       RHT_GV_CHEST,                                                    RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[RC_GV_TRADE_SAW] =                                                   Location::Base(RC_GV_TRADE_SAW,                                                 RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_GERUDO_VALLEY,                ACTOR_ID_MAX,         SCENE_GERUDO_VALLEY,                0x00,                                              0x22, "Trade Saw",                                   RHT_GV_TRADE_SAW,                                                RG_BROKEN_SWORD,                      { Category::cAdultTrade },                              SpoilerCollectionCheck::RandomizerInf(RAND_INF_ADULT_TRADES_GV_TRADE_SAW),                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
-    locationTable[RC_GV_WATERFALL_FREESTANDING_POH] =                           Location::Collectable(RC_GV_WATERFALL_FREESTANDING_POH,                                RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GERUDO_VALLEY,                ACTOR_EN_ITEM00,      SCENE_GERUDO_VALLEY,                262,                                               0x01, "Waterfall Freestanding PoH",                  RHT_GV_WATERFALL_FREESTANDING_POH,                               RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
-    locationTable[RC_GV_CRATE_FREESTANDING_POH] =                               Location::Collectable(RC_GV_CRATE_FREESTANDING_POH,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GERUDO_VALLEY,                ACTOR_EN_ITEM00,      SCENE_GERUDO_VALLEY,                518,                                               0x02, "Crate Freestanding PoH",                      RHT_GV_CRATE_FREESTANDING_POH,                                   RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
-    locationTable[RC_GV_DEKU_SCRUB_GROTTO_REAR] =                               Location::GrottoScrub(RC_GV_DEKU_SCRUB_GROTTO_REAR,                                    RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_GERUDO_VALLEY,                ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x07, 0xF0),                      0x39, "Deku Scrub Grotto Rear",                      RHT_GV_DEKU_SCRUB_GROTTO_FRONT,                                  RG_BUY_GREEN_POTION,                  { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GV_DEKU_SCRUB_GROTTO_REAR),                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[RC_GV_DEKU_SCRUB_GROTTO_FRONT] =                              Location::GrottoScrub(RC_GV_DEKU_SCRUB_GROTTO_FRONT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_GERUDO_VALLEY,                ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x08, 0xF0),                      0x3A, "Deku Scrub Grotto Front",                     RHT_GV_DEKU_SCRUB_GROTTO_FRONT,                                  RG_BUY_GREEN_POTION,                  { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GV_DEKU_SCRUB_GROTTO_FRONT),                                  SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_GV_CHEST] =                                                      Location::Chest(RC_GV_CHEST,                                                     RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_GERUDO_VALLEY,                23200,                        0x00, "Chest",                                       RHT_GV_CHEST,                                                    RG_PURPLE_RUPEE);
+    locationTable[RC_GV_TRADE_SAW] =                                                   Location::Base(RC_GV_TRADE_SAW,                                                 RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                                                      ACTOR_ID_MAX,         SCENE_GERUDO_VALLEY,                0x00,                               "Trade Saw",                                   RHT_GV_TRADE_SAW,                                                RG_BROKEN_SWORD,                                                    SpoilerCollectionCheck::RandomizerInf(RAND_INF_ADULT_TRADES_GV_TRADE_SAW),                                                    true);
+    locationTable[RC_GV_WATERFALL_FREESTANDING_POH] =                           Location::Collectable(RC_GV_WATERFALL_FREESTANDING_POH,                                RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_ITEM00,      SCENE_GERUDO_VALLEY,                262,                          0x01, "Waterfall Freestanding PoH",                  RHT_GV_WATERFALL_FREESTANDING_POH,                               RG_PIECE_OF_HEART,                                                                                                                                                                                true);
+    locationTable[RC_GV_CRATE_FREESTANDING_POH] =                               Location::Collectable(RC_GV_CRATE_FREESTANDING_POH,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_ITEM00,      SCENE_GERUDO_VALLEY,                518,                          0x02, "Crate Freestanding PoH",                      RHT_GV_CRATE_FREESTANDING_POH,                                   RG_PIECE_OF_HEART,                                                                                                                                                                                true);
+    locationTable[RC_GV_DEKU_SCRUB_GROTTO_REAR] =                                      Location::Base(RC_GV_DEKU_SCRUB_GROTTO_REAR,                                    RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_GERUDO_VALLEY,                ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x07, 0xF0),       "Deku Scrub Grotto Rear",                      RHT_GV_DEKU_SCRUB_GROTTO_FRONT,                                  RG_BUY_GREEN_POTION,                                                SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GV_DEKU_SCRUB_GROTTO_REAR));
+    locationTable[RC_GV_DEKU_SCRUB_GROTTO_FRONT] =                                     Location::Base(RC_GV_DEKU_SCRUB_GROTTO_FRONT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_GERUDO_VALLEY,                ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x08, 0xF0),       "Deku Scrub Grotto Front",                     RHT_GV_DEKU_SCRUB_GROTTO_FRONT,                                  RG_BUY_GREEN_POTION,                                                SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GV_DEKU_SCRUB_GROTTO_FRONT));
     // Gerudo Fortress
-    locationTable[RC_GF_CHEST] =                                                      Location::Chest(RC_GF_CHEST,                                                     RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GERUDO_FORTRESS,              ACTOR_EN_BOX,         SCENE_GERUDOS_FORTRESS,             1984,                                              0x00, "Chest",                                       RHT_GF_CHEST,                                                    RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
-    locationTable[RC_GF_HBA_1000_POINTS] =                                             Location::Base(RC_GF_HBA_1000_POINTS,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GERUDO_FORTRESS,              ACTOR_ID_MAX,         SCENE_GERUDOS_FORTRESS,             0x00,                                              0x3E, "GF HBA 1000 Points",                          RHT_GF_HBA_1000_POINTS,                                          RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::InfTable(INFTABLE_190),                                                                               SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
-    locationTable[RC_GF_HBA_1500_POINTS] =                                             Location::Base(RC_GF_HBA_1500_POINTS,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GERUDO_FORTRESS,              ACTOR_ID_MAX,         SCENE_GERUDOS_FORTRESS,             0x00,                                              0x30, "GF HBA 1500 Points",                          RHT_GF_HBA_1500_POINTS,                                          RG_PROGRESSIVE_BOW,                   {},                                                     SpoilerCollectionCheck::ItemGetInf(15),                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
+    locationTable[RC_GF_CHEST] =                                                      Location::Chest(RC_GF_CHEST,                                                     RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_GERUDOS_FORTRESS,             1984,                         0x00, "Chest",                                       RHT_GF_CHEST,                                                    RG_PIECE_OF_HEART,                                                                                                                                                                                true);
+    locationTable[RC_GF_HBA_1000_POINTS] =                                             Location::Base(RC_GF_HBA_1000_POINTS,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_GERUDOS_FORTRESS,             0x00,                               "GF HBA 1000 Points",                          RHT_GF_HBA_1000_POINTS,                                          RG_PIECE_OF_HEART,                                                  SpoilerCollectionCheck::InfTable(INFTABLE_190),                                                                               true);
+    locationTable[RC_GF_HBA_1500_POINTS] =                                             Location::Base(RC_GF_HBA_1500_POINTS,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_GERUDOS_FORTRESS,             0x00,                               "GF HBA 1500 Points",                          RHT_GF_HBA_1500_POINTS,                                          RG_PROGRESSIVE_BOW,                                                 SpoilerCollectionCheck::ItemGetInf(15),                                                                                       true);
     // RandoTodo: Do we replace these with the RC_HIDEOUT keys or keep these?
-    locationTable[RC_GF_GERUDO_MEMBERSHIP_CARD] =                                      Location::Base(RC_GF_GERUDO_MEMBERSHIP_CARD,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GERUDO_FORTRESS,              ACTOR_ID_MAX,         SCENE_THIEVES_HIDEOUT,              0x00,                                              0x3A, "GF Gerudo Membership Card",                   RHT_GF_GERUDO_MEMBERSHIP_CARD,                                   RG_GERUDO_MEMBERSHIP_CARD,            {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_ITEM_FROM_LEADER_OF_FORTRESS),                                              SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
-    locationTable[RC_GF_NORTH_F1_CARPENTER] =                                   Location::Collectable(RC_GF_NORTH_F1_CARPENTER,                                        RCQUEST_BOTH,    RCTYPE_GF_KEY,                      RCAREA_GERUDO_FORTRESS,              ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,              3089,                                              0x0C, "GF North F1 Carpenter",                       RHT_GF_NORTH_F1_CARPENTER,                                       RG_GERUDO_FORTRESS_SMALL_KEY,         { Category::cVanillaGFSmallKey },                                                                                                                                                     SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
-    locationTable[RC_GF_NORTH_F2_CARPENTER] =                                   Location::Collectable(RC_GF_NORTH_F2_CARPENTER,                                        RCQUEST_BOTH,    RCTYPE_GF_KEY,                      RCAREA_GERUDO_FORTRESS,              ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,              2577,                                              0x0A, "GF North F2 Carpenter",                       RHT_GF_NORTH_F2_CARPENTER,                                       RG_GERUDO_FORTRESS_SMALL_KEY,         { Category::cVanillaGFSmallKey },                                                                                                                                                     SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
-    locationTable[RC_GF_SOUTH_F1_CARPENTER] =                                   Location::Collectable(RC_GF_SOUTH_F1_CARPENTER,                                        RCQUEST_BOTH,    RCTYPE_GF_KEY,                      RCAREA_GERUDO_FORTRESS,              ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,              3601,                                              0x0E, "GF South F1 Carpenter",                       RHT_GF_SOUTH_F1_CARPENTER,                                       RG_GERUDO_FORTRESS_SMALL_KEY,         { Category::cVanillaGFSmallKey },                                                                                                                                                     SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
-    locationTable[RC_GF_SOUTH_F2_CARPENTER] =                                   Location::Collectable(RC_GF_SOUTH_F2_CARPENTER,                                        RCQUEST_BOTH,    RCTYPE_GF_KEY,                      RCAREA_GERUDO_FORTRESS,              ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,              3857,                                              0x0F, "GF South F2 Carpenter",                       RHT_GF_SOUTH_F2_CARPENTER,                                       RG_GERUDO_FORTRESS_SMALL_KEY,         { Category::cVanillaGFSmallKey },                                                                                                                                                     SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
+    locationTable[RC_GF_GERUDO_MEMBERSHIP_CARD] =                                      Location::Base(RC_GF_GERUDO_MEMBERSHIP_CARD,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_THIEVES_HIDEOUT,              0x00,                               "GF Gerudo Membership Card",                   RHT_GF_GERUDO_MEMBERSHIP_CARD,                                   RG_GERUDO_MEMBERSHIP_CARD,                                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_ITEM_FROM_LEADER_OF_FORTRESS),                                              true);
+    locationTable[RC_GF_NORTH_F1_CARPENTER] =                                   Location::Collectable(RC_GF_NORTH_F1_CARPENTER,                                        RCQUEST_BOTH,    RCTYPE_GF_KEY,                                                           ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,              3089,                         0x0C, "GF North F1 Carpenter",                       RHT_GF_NORTH_F1_CARPENTER,                                       RG_GERUDO_FORTRESS_SMALL_KEY,                                                                                                                                                                     true);
+    locationTable[RC_GF_NORTH_F2_CARPENTER] =                                   Location::Collectable(RC_GF_NORTH_F2_CARPENTER,                                        RCQUEST_BOTH,    RCTYPE_GF_KEY,                                                           ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,              2577,                         0x0A, "GF North F2 Carpenter",                       RHT_GF_NORTH_F2_CARPENTER,                                       RG_GERUDO_FORTRESS_SMALL_KEY,                                                                                                                                                                     true);
+    locationTable[RC_GF_SOUTH_F1_CARPENTER] =                                   Location::Collectable(RC_GF_SOUTH_F1_CARPENTER,                                        RCQUEST_BOTH,    RCTYPE_GF_KEY,                                                           ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,              3601,                         0x0E, "GF South F1 Carpenter",                       RHT_GF_SOUTH_F1_CARPENTER,                                       RG_GERUDO_FORTRESS_SMALL_KEY,                                                                                                                                                                     true);
+    locationTable[RC_GF_SOUTH_F2_CARPENTER] =                                   Location::Collectable(RC_GF_SOUTH_F2_CARPENTER,                                        RCQUEST_BOTH,    RCTYPE_GF_KEY,                                                           ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,              3857,                         0x0F, "GF South F2 Carpenter",                       RHT_GF_SOUTH_F2_CARPENTER,                                       RG_GERUDO_FORTRESS_SMALL_KEY,                                                                                                                                                                     true);
     // Haunted Wasteland
-    locationTable[RC_WASTELAND_CHEST] =                                               Location::Chest(RC_WASTELAND_CHEST,                                              RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_WASTELAND,                    ACTOR_EN_BOX,         SCENE_HAUNTED_WASTELAND,            -30048,                                            0x00, "Chest",                                       RHT_WASTELAND_CHEST,                                             RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[RC_WASTELAND_BOMBCHU_SALESMAN] =                                     Location::Base(RC_WASTELAND_BOMBCHU_SALESMAN,                                   RCQUEST_BOTH,    RCTYPE_MERCHANT,                    RCAREA_WASTELAND,                    ACTOR_ID_MAX,         SCENE_HAUNTED_WASTELAND,            0x00,                                              0x03, "Carpet Salesman",                             RHT_WASTELAND_BOMBCHU_SALESMAN,                                  RG_BUY_BOMBCHUS_10,                   { Category::cMerchant },                                SpoilerCollectionCheck::RandomizerInf(RAND_INF_MERCHANTS_CARPET_SALESMAN),                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_WASTELAND_CHEST] =                                               Location::Chest(RC_WASTELAND_CHEST,                                              RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_WASTELAND,                    ACTOR_EN_BOX,         SCENE_HAUNTED_WASTELAND,            -30048,                       0x00, "Chest",                                       RHT_WASTELAND_CHEST,                                             RG_PURPLE_RUPEE);
+    locationTable[RC_WASTELAND_BOMBCHU_SALESMAN] =                                     Location::Base(RC_WASTELAND_BOMBCHU_SALESMAN,                                   RCQUEST_BOTH,    RCTYPE_MERCHANT,                    RCAREA_WASTELAND,                    ACTOR_ID_MAX,         SCENE_HAUNTED_WASTELAND,            0x00,                               "Carpet Salesman",                             RHT_WASTELAND_BOMBCHU_SALESMAN,                                  RG_BUY_BOMBCHUS_10,                                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_MERCHANTS_CARPET_SALESMAN));
     // Desert Colossus
-    locationTable[RC_COLOSSUS_FREESTANDING_POH] =                               Location::Collectable(RC_COLOSSUS_FREESTANDING_POH,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DESERT_COLOSSUS,              ACTOR_EN_ITEM00,      SCENE_DESERT_COLOSSUS,              3334,                                              0x0D, "Freestanding PoH",                            RHT_COLOSSUS_FREESTANDING_POH,                                   RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
-    locationTable[RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR] =                         Location::GrottoScrub(RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,                              RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_DESERT_COLOSSUS,              ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x07, 0xFD),                      0x39, "Deku Scrub Grotto Rear",                      RHT_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,                             RG_BUY_RED_POTION_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_COLOSSUS_DEKU_SCRUB_GROTTO_REAR),                             SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT] =                        Location::GrottoScrub(RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT,                             RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_DESERT_COLOSSUS,              ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x08, 0xFD),                      0x3A, "Deku Scrub Grotto Front",                     RHT_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT,                            RG_BUY_GREEN_POTION,                  { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT),                            SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_COLOSSUS_FREESTANDING_POH] =                               Location::Collectable(RC_COLOSSUS_FREESTANDING_POH,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_ITEM00,      SCENE_DESERT_COLOSSUS,              3334,                         0x0D, "Freestanding PoH",                            RHT_COLOSSUS_FREESTANDING_POH,                                   RG_PIECE_OF_HEART,                                                                                                                                                                                true);
+    locationTable[RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR] =                                Location::Base(RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,                              RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_DESERT_COLOSSUS,              ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x07, 0xFD),       "Deku Scrub Grotto Rear",                      RHT_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,                             RG_BUY_RED_POTION_30,                                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_COLOSSUS_DEKU_SCRUB_GROTTO_REAR));
+    locationTable[RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT] =                               Location::Base(RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT,                             RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_DESERT_COLOSSUS,              ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x08, 0xFD),       "Deku Scrub Grotto Front",                     RHT_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT,                            RG_BUY_GREEN_POTION,                                                SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT));
     // Market
-    locationTable[RC_MARKET_TREASURE_CHEST_GAME_REWARD] =                             Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_REWARD,                            RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0x0A, "Treasure Chest Game Reward",                  RHT_MARKET_TREASURE_CHEST_GAME_REWARD,                           RG_TREASURE_GAME_HEART,               {},                                                     SpoilerCollectionCheck::ItemGetInf(27),                                                                                       SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
-    locationTable[RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE] =                             Location::Base(RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_BOMBCHU_BOWLING_ALLEY,        0x00,                                              0x33, "Bombchu Bowling First Prize",                 RHT_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,                          RG_PROGRESSIVE_BOMB_BAG,              {},                                                     SpoilerCollectionCheck::ItemGetInf(17),                                                                                       SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
-    locationTable[RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE] =                            Location::Base(RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE,                          RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_BOMBCHU_BOWLING_ALLEY,        0x00,                                              0x3E, "Bombchu Bowling Second Prize",                RHT_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE,                         RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::ItemGetInf(18),                                                                                       SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
-    locationTable[RC_MARKET_LOST_DOG] =                                                Location::Base(RC_MARKET_LOST_DOG,                                              RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_DOG_LADY_HOUSE,               0x00,                                              0x3E, "Lost Dog",                                    RHT_MARKET_LOST_DOG,                                             RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::InfTable(INFTABLE_191),                                                                               SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
-    locationTable[RC_MARKET_SHOOTING_GALLERY_REWARD] =                                 Location::Base(RC_MARKET_SHOOTING_GALLERY_REWARD,                               RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_SHOOTING_GALLERY,             0x00,                                              0x60, "Shooting Gallery",                            RHT_MARKET_SHOOTING_GALLERY_REWARD,                              RG_PROGRESSIVE_SLINGSHOT,             {},                                                     SpoilerCollectionCheck::ItemGetInf(ITEMGETINF_0D),                                                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
-    locationTable[RC_MARKET_10_BIG_POES] =                                             Location::Base(RC_MARKET_10_BIG_POES,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_MARKET_GUARD_HOUSE,           0x00,                                              0x0F, "10 Big Poes",                                 RHT_MARKET_10_BIG_POES,                                          RG_EMPTY_BOTTLE,                      {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_10_BIG_POES),                                                                  SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
-    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_1] =                             Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_1,                            RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0xFF, "Chest Game First Room Item",                  RHT_MARKET_TREASURE_CHEST_GAME_ITEM_1,                           RG_GREEN_RUPEE,                       { Category::cChestMinigame },                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_1),                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_2] =                             Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_2,                            RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0xFF, "Chest Game Second Room Item",                 RHT_MARKET_TREASURE_CHEST_GAME_ITEM_2,                           RG_GREEN_RUPEE,                       { Category::cChestMinigame },                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_2),                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_3] =                             Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_3,                            RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0xFF, "Chest Game Third Room Item",                  RHT_MARKET_TREASURE_CHEST_GAME_ITEM_3,                           RG_BLUE_RUPEE,                        { Category::cChestMinigame },                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_3),                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_4] =                             Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_4,                            RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0xFF, "Chest Game Fourth Room Item",                 RHT_MARKET_TREASURE_CHEST_GAME_ITEM_4,                           RG_BLUE_RUPEE,                        { Category::cChestMinigame },                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_4),                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_5] =                             Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_5,                            RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0xFF, "Chest Game Fifth Room Item",                  RHT_MARKET_TREASURE_CHEST_GAME_ITEM_5,                           RG_RED_RUPEE,                         { Category::cChestMinigame },                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_5),                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_TREASURE_CHEST_GAME_KEY_1] =                              Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_KEY_1,                             RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0xFF, "Chest Game First Room Key",                   RHT_MARKET_TREASURE_CHEST_GAME_KEY_1,                            RG_TREASURE_GAME_SMALL_KEY,           { Category::cChestMinigame },                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_1),                                             SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_TREASURE_CHEST_GAME_KEY_2] =                              Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_KEY_2,                             RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0xFF, "Chest Game Second Room Key",                  RHT_MARKET_TREASURE_CHEST_GAME_KEY_2,                            RG_TREASURE_GAME_SMALL_KEY,           { Category::cChestMinigame },                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_2),                                             SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_TREASURE_CHEST_GAME_KEY_3] =                              Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_KEY_3,                             RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0xFF, "Chest Game Third Room Key",                   RHT_MARKET_TREASURE_CHEST_GAME_KEY_3,                            RG_TREASURE_GAME_SMALL_KEY,           { Category::cChestMinigame },                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_3),                                             SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_TREASURE_CHEST_GAME_KEY_4] =                              Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_KEY_4,                             RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0xFF, "Chest Game Fourth Room Key",                  RHT_MARKET_TREASURE_CHEST_GAME_KEY_4,                            RG_TREASURE_GAME_SMALL_KEY,           { Category::cChestMinigame },                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_4),                                             SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_TREASURE_CHEST_GAME_KEY_5] =                              Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_KEY_5,                             RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                  RCAREA_MARKET,                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                                              0xFF, "Chest Game Fifth Room Key",                   RHT_MARKET_TREASURE_CHEST_GAME_KEY_5,                            RG_TREASURE_GAME_SMALL_KEY,           { Category::cChestMinigame },                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_5),                                             SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_REWARD] =                             Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_REWARD,                            RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                               "Treasure Chest Game Reward",                  RHT_MARKET_TREASURE_CHEST_GAME_REWARD,                           RG_TREASURE_GAME_HEART,                                             SpoilerCollectionCheck::ItemGetInf(27),                                                                                       true);
+    locationTable[RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE] =                             Location::Base(RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,                           RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_BOMBCHU_BOWLING_ALLEY,        0x00,                               "Bombchu Bowling First Prize",                 RHT_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,                          RG_PROGRESSIVE_BOMB_BAG,                                            SpoilerCollectionCheck::ItemGetInf(17),                                                                                       true);
+    locationTable[RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE] =                            Location::Base(RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE,                          RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_BOMBCHU_BOWLING_ALLEY,        0x00,                               "Bombchu Bowling Second Prize",                RHT_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE,                         RG_PIECE_OF_HEART,                                                  SpoilerCollectionCheck::ItemGetInf(18),                                                                                       true);
+    locationTable[RC_MARKET_LOST_DOG] =                                                Location::Base(RC_MARKET_LOST_DOG,                                              RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_DOG_LADY_HOUSE,               0x00,                               "Lost Dog",                                    RHT_MARKET_LOST_DOG,                                             RG_PIECE_OF_HEART,                                                  SpoilerCollectionCheck::InfTable(INFTABLE_191),                                                                               true);
+    locationTable[RC_MARKET_SHOOTING_GALLERY_REWARD] =                                 Location::Base(RC_MARKET_SHOOTING_GALLERY_REWARD,                               RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_SHOOTING_GALLERY,             0x00,                               "Shooting Gallery",                            RHT_MARKET_SHOOTING_GALLERY_REWARD,                              RG_PROGRESSIVE_SLINGSHOT,                                           SpoilerCollectionCheck::ItemGetInf(ITEMGETINF_0D),                                                                            true);
+    locationTable[RC_MARKET_10_BIG_POES] =                                             Location::Base(RC_MARKET_10_BIG_POES,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_MARKET_GUARD_HOUSE,           0x00,                               "10 Big Poes",                                 RHT_MARKET_10_BIG_POES,                                          RG_EMPTY_BOTTLE,                                                    SpoilerCollectionCheck::RandomizerInf(RAND_INF_10_BIG_POES),                                                                  true);
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_1] =                             Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_1,                            RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                                                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                               "Chest Game First Room Item",                  RHT_MARKET_TREASURE_CHEST_GAME_ITEM_1,                           RG_GREEN_RUPEE,                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_1));
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_2] =                             Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_2,                            RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                                                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                               "Chest Game Second Room Item",                 RHT_MARKET_TREASURE_CHEST_GAME_ITEM_2,                           RG_GREEN_RUPEE,                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_2));
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_3] =                             Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_3,                            RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                                                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                               "Chest Game Third Room Item",                  RHT_MARKET_TREASURE_CHEST_GAME_ITEM_3,                           RG_BLUE_RUPEE,                                                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_3));
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_4] =                             Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_4,                            RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                                                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                               "Chest Game Fourth Room Item",                 RHT_MARKET_TREASURE_CHEST_GAME_ITEM_4,                           RG_BLUE_RUPEE,                                                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_4));
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_ITEM_5] =                             Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_ITEM_5,                            RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                                                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                               "Chest Game Fifth Room Item",                  RHT_MARKET_TREASURE_CHEST_GAME_ITEM_5,                           RG_RED_RUPEE,                                                       SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_5));
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_KEY_1] =                              Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_KEY_1,                             RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                                                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                               "Chest Game First Room Key",                   RHT_MARKET_TREASURE_CHEST_GAME_KEY_1,                            RG_TREASURE_GAME_SMALL_KEY,                                         SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_1));
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_KEY_2] =                              Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_KEY_2,                             RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                                                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                               "Chest Game Second Room Key",                  RHT_MARKET_TREASURE_CHEST_GAME_KEY_2,                            RG_TREASURE_GAME_SMALL_KEY,                                         SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_2));
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_KEY_3] =                              Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_KEY_3,                             RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                                                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                               "Chest Game Third Room Key",                   RHT_MARKET_TREASURE_CHEST_GAME_KEY_3,                            RG_TREASURE_GAME_SMALL_KEY,                                         SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_3));
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_KEY_4] =                              Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_KEY_4,                             RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                                                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                               "Chest Game Fourth Room Key",                  RHT_MARKET_TREASURE_CHEST_GAME_KEY_4,                            RG_TREASURE_GAME_SMALL_KEY,                                         SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_4));
+    locationTable[RC_MARKET_TREASURE_CHEST_GAME_KEY_5] =                              Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_KEY_5,                             RCQUEST_BOTH,    RCTYPE_CHEST_GAME,                                                       ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                               "Chest Game Fifth Room Key",                   RHT_MARKET_TREASURE_CHEST_GAME_KEY_5,                            RG_TREASURE_GAME_SMALL_KEY,                                         SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_5));
     // Hyrule Castle
-    locationTable[RC_HC_MALON_EGG] =                                                   Location::Base(RC_HC_MALON_EGG,                                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_CASTLE,                ACTOR_ID_MAX,         SCENE_HYRULE_CASTLE,                0x00,                                              0x47, "Malon Egg",                                   RHT_HC_MALON_EGG,                                                RG_WEIRD_EGG,                         {},                                                     SpoilerCollectionCheck::EventChkInf(0x12),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
-    locationTable[RC_HC_ZELDAS_LETTER] =                                               Location::Base(RC_HC_ZELDAS_LETTER,                                             RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_CASTLE,                ACTOR_ID_MAX,         SCENE_CASTLE_COURTYARD_ZELDA,       0x00,                                              0x0B, "Zeldas Letter",                               RHT_HC_ZELDAS_LETTER,                                            RG_ZELDAS_LETTER,                     {},                                                     SpoilerCollectionCheck::EventChkInf(0x40),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
+    locationTable[RC_HC_MALON_EGG] =                                                   Location::Base(RC_HC_MALON_EGG,                                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_HYRULE_CASTLE,                0x00,                               "Malon Egg",                                   RHT_HC_MALON_EGG,                                                RG_WEIRD_EGG,                                                       SpoilerCollectionCheck::EventChkInf(0x12),                                                                                    true);
+    locationTable[RC_HC_ZELDAS_LETTER] =                                               Location::Base(RC_HC_ZELDAS_LETTER,                                             RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_CASTLE_COURTYARD_ZELDA,       0x00,                               "Zeldas Letter",                               RHT_HC_ZELDAS_LETTER,                                            RG_ZELDAS_LETTER,                                                   SpoilerCollectionCheck::EventChkInf(0x40),                                                                                    true);
     // Kakariko
-    locationTable[RC_KAK_REDEAD_GROTTO_CHEST] =                                       Location::Chest(RC_KAK_REDEAD_GROTTO_CHEST,                                      RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_BOX,         SCENE_GROTTOS,                      31434,                                             0x0A, "Redead Grotto Chest",                         RHT_KAK_REDEAD_GROTTO_CHEST,                                     RG_HUGE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_OPEN_GROTTO_CHEST] =                                         Location::Chest(RC_KAK_OPEN_GROTTO_CHEST,                                        RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_BOX,         SCENE_GROTTOS,                      22984,                                             0x08, "Open Grotto Chest",                           RHT_KAK_OPEN_GROTTO_CHEST,                                       RG_RED_RUPEE,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_10_GOLD_SKULLTULA_REWARD] =                                   Location::Base(RC_KAK_10_GOLD_SKULLTULA_REWARD,                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_HOUSE_OF_SKULLTULA,           0x00,                                              0x45, "10 Gold Skulltula Reward",                    RHT_KAK_10_GOLD_SKULLTULA_REWARD,                                RG_PROGRESSIVE_WALLET,                {},                                                     SpoilerCollectionCheck::EventChkInf(0xDA),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
-    locationTable[RC_KAK_20_GOLD_SKULLTULA_REWARD] =                                   Location::Base(RC_KAK_20_GOLD_SKULLTULA_REWARD,                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_HOUSE_OF_SKULLTULA,           0x00,                                              0x39, "20 Gold Skulltula Reward",                    RHT_KAK_20_GOLD_SKULLTULA_REWARD,                                RG_STONE_OF_AGONY,                    {},                                                     SpoilerCollectionCheck::EventChkInf(0xDB),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
-    locationTable[RC_KAK_30_GOLD_SKULLTULA_REWARD] =                                   Location::Base(RC_KAK_30_GOLD_SKULLTULA_REWARD,                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_HOUSE_OF_SKULLTULA,           0x00,                                              0x46, "30 Gold Skulltula Reward",                    RHT_KAK_30_GOLD_SKULLTULA_REWARD,                                RG_PROGRESSIVE_WALLET,                {},                                                     SpoilerCollectionCheck::EventChkInf(0xDC),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
-    locationTable[RC_KAK_40_GOLD_SKULLTULA_REWARD] =                                   Location::Base(RC_KAK_40_GOLD_SKULLTULA_REWARD,                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_HOUSE_OF_SKULLTULA,           0x00,                                              0x03, "40 Gold Skulltula Reward",                    RHT_KAK_40_GOLD_SKULLTULA_REWARD,                                RG_BOMBCHU_10,                        {},                                                     SpoilerCollectionCheck::EventChkInf(0xDD),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_50_GOLD_SKULLTULA_REWARD] =                                   Location::Base(RC_KAK_50_GOLD_SKULLTULA_REWARD,                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_HOUSE_OF_SKULLTULA,           0x00,                                              0x3E, "50 Gold Skulltula Reward",                    RHT_KAK_50_GOLD_SKULLTULA_REWARD,                                RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::EventChkInf(0xDE),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
-    locationTable[RC_KAK_100_GOLD_SKULLTULA_REWARD] =                                  Location::Base(RC_KAK_100_GOLD_SKULLTULA_REWARD,                                RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_HOUSE_OF_SKULLTULA,           0x00,                                              0x3E, "100 Gold Skulltula Reward",                   RHT_KAK_100_GOLD_SKULLTULA_REWARD,                               RG_HUGE_RUPEE,                        {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_100_GOLD_SKULLTULA_REWARD),                                                SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_MAN_ON_ROOF] =                                                Location::Base(RC_KAK_MAN_ON_ROOF,                                              RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_KAKARIKO_VILLAGE,             0x00,                                              0x3E, "Man on Roof",                                 RHT_KAK_MAN_ON_ROOF,                                             RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::ItemGetInf(21),                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
-    locationTable[RC_KAK_SHOOTING_GALLERY_REWARD] =                                    Location::Base(RC_KAK_SHOOTING_GALLERY_REWARD,                                  RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_SHOOTING_GALLERY,             0x00,                                              0x30, "Shooting Gallery Reward",                     RHT_KAK_SHOOTING_GALLERY_REWARD,                                 RG_PROGRESSIVE_BOW,                   {},                                                     SpoilerCollectionCheck::ItemGetInf(ITEMGETINF_0E),                                                                            SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
-    locationTable[RC_KAK_TRADE_ODD_MUSHROOM] =                                         Location::Base(RC_KAK_TRADE_ODD_MUSHROOM,                                       RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_POTION_SHOP_GRANNY,           0x00,                                              0x20, "Trade Odd Mushroom",                          RHT_KAK_TRADE_ODD_MUSHROOM,                                      RG_ODD_POTION,                        { Category::cAdultTrade },                              SpoilerCollectionCheck::ItemGetInf(48),                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
-    locationTable[RC_KAK_GRANNYS_SHOP] =                                               Location::Base(RC_KAK_GRANNYS_SHOP,                                             RCQUEST_BOTH,    RCTYPE_MERCHANT,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_POTION_SHOP_GRANNY,           0x00,                                              0x4E, "Granny's Shop",                               RHT_KAK_GRANNYS_SHOP,                                            RG_BUY_BLUE_POTION,                   {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MERCHANTS_GRANNYS_SHOP),                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
-    locationTable[RC_KAK_ANJU_AS_ADULT] =                                              Location::Base(RC_KAK_ANJU_AS_ADULT,                                            RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_KAKARIKO_VILLAGE,             0x00,                                              0x1D, "Anju as Adult",                               RHT_KAK_ANJU_AS_ADULT,                                           RG_CLAIM_CHECK,                       {},                                                     SpoilerCollectionCheck::ItemGetInf(44),                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
-    locationTable[RC_KAK_ANJU_AS_CHILD] =                                              Location::Base(RC_KAK_ANJU_AS_CHILD,                                            RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_KAKARIKO_VILLAGE,             0x00,                                              0x0F, "Anju as Child",                               RHT_KAK_ANJU_AS_CHILD,                                           RG_EMPTY_BOTTLE,                      {},                                                     SpoilerCollectionCheck::ItemGetInf(12),                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
-    locationTable[RC_KAK_TRADE_POCKET_CUCCO] =                                         Location::Base(RC_KAK_TRADE_POCKET_CUCCO,                                       RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_KAKARIKO_VILLAGE,             0x00,                                              0x0E, "Trade Pocket Cucco",                          RHT_KAK_TRADE_POCKET_CUCCO,                                      RG_COJIRO,                            { Category::cAdultTrade },                              SpoilerCollectionCheck::ItemGetInf(46),                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
-    locationTable[RC_KAK_IMPAS_HOUSE_FREESTANDING_POH] =                        Location::Collectable(RC_KAK_IMPAS_HOUSE_FREESTANDING_POH,                             RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_ITEM00,      SCENE_IMPAS_HOUSE,                  262,                                               0x01, "Impas House Freestanding PoH",                RHT_KAK_IMPAS_HOUSE_FREESTANDING_POH,                            RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
-    locationTable[RC_KAK_WINDMILL_FREESTANDING_POH] =                           Location::Collectable(RC_KAK_WINDMILL_FREESTANDING_POH,                                RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_ITEM00,      SCENE_WINDMILL_AND_DAMPES_GRAVE,    262,                                               0x01, "Windmill Freestanding PoH",                   RHT_KAK_WINDMILL_FREESTANDING_POH,                               RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
+    locationTable[RC_KAK_REDEAD_GROTTO_CHEST] =                                       Location::Chest(RC_KAK_REDEAD_GROTTO_CHEST,                                      RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_BOX,         SCENE_GROTTOS,                      31434,                        0x0A, "Redead Grotto Chest",                         RHT_KAK_REDEAD_GROTTO_CHEST,                                     RG_HUGE_RUPEE);
+    locationTable[RC_KAK_OPEN_GROTTO_CHEST] =                                         Location::Chest(RC_KAK_OPEN_GROTTO_CHEST,                                        RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_BOX,         SCENE_GROTTOS,                      22984,                        0x08, "Open Grotto Chest",                           RHT_KAK_OPEN_GROTTO_CHEST,                                       RG_RED_RUPEE);
+    locationTable[RC_KAK_10_GOLD_SKULLTULA_REWARD] =                                   Location::Base(RC_KAK_10_GOLD_SKULLTULA_REWARD,                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_HOUSE_OF_SKULLTULA,           0x00,                               "10 Gold Skulltula Reward",                    RHT_KAK_10_GOLD_SKULLTULA_REWARD,                                RG_PROGRESSIVE_WALLET,                                              SpoilerCollectionCheck::EventChkInf(0xDA),                                                                                    true);
+    locationTable[RC_KAK_20_GOLD_SKULLTULA_REWARD] =                                   Location::Base(RC_KAK_20_GOLD_SKULLTULA_REWARD,                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_HOUSE_OF_SKULLTULA,           0x00,                               "20 Gold Skulltula Reward",                    RHT_KAK_20_GOLD_SKULLTULA_REWARD,                                RG_STONE_OF_AGONY,                                                  SpoilerCollectionCheck::EventChkInf(0xDB),                                                                                    true);
+    locationTable[RC_KAK_30_GOLD_SKULLTULA_REWARD] =                                   Location::Base(RC_KAK_30_GOLD_SKULLTULA_REWARD,                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_HOUSE_OF_SKULLTULA,           0x00,                               "30 Gold Skulltula Reward",                    RHT_KAK_30_GOLD_SKULLTULA_REWARD,                                RG_PROGRESSIVE_WALLET,                                              SpoilerCollectionCheck::EventChkInf(0xDC),                                                                                    true);
+    locationTable[RC_KAK_40_GOLD_SKULLTULA_REWARD] =                                   Location::Base(RC_KAK_40_GOLD_SKULLTULA_REWARD,                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_HOUSE_OF_SKULLTULA,           0x00,                               "40 Gold Skulltula Reward",                    RHT_KAK_40_GOLD_SKULLTULA_REWARD,                                RG_BOMBCHU_10,                                                      SpoilerCollectionCheck::EventChkInf(0xDD));
+    locationTable[RC_KAK_50_GOLD_SKULLTULA_REWARD] =                                   Location::Base(RC_KAK_50_GOLD_SKULLTULA_REWARD,                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_HOUSE_OF_SKULLTULA,           0x00,                               "50 Gold Skulltula Reward",                    RHT_KAK_50_GOLD_SKULLTULA_REWARD,                                RG_PIECE_OF_HEART,                                                  SpoilerCollectionCheck::EventChkInf(0xDE),                                                                                    true);
+    locationTable[RC_KAK_100_GOLD_SKULLTULA_REWARD] =                                  Location::Base(RC_KAK_100_GOLD_SKULLTULA_REWARD,                                RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_HOUSE_OF_SKULLTULA,           0x00,                               "100 Gold Skulltula Reward",                   RHT_KAK_100_GOLD_SKULLTULA_REWARD,                               RG_HUGE_RUPEE,                                                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_100_GOLD_SKULLTULA_REWARD));
+    locationTable[RC_KAK_MAN_ON_ROOF] =                                                Location::Base(RC_KAK_MAN_ON_ROOF,                                              RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_KAKARIKO_VILLAGE,             0x00,                               "Man on Roof",                                 RHT_KAK_MAN_ON_ROOF,                                             RG_PIECE_OF_HEART,                                                  SpoilerCollectionCheck::ItemGetInf(21),                                                                                       true);
+    locationTable[RC_KAK_SHOOTING_GALLERY_REWARD] =                                    Location::Base(RC_KAK_SHOOTING_GALLERY_REWARD,                                  RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_SHOOTING_GALLERY,             0x00,                               "Shooting Gallery Reward",                     RHT_KAK_SHOOTING_GALLERY_REWARD,                                 RG_PROGRESSIVE_BOW,                                                 SpoilerCollectionCheck::ItemGetInf(ITEMGETINF_0E),                                                                            true);
+    locationTable[RC_KAK_TRADE_ODD_MUSHROOM] =                                         Location::Base(RC_KAK_TRADE_ODD_MUSHROOM,                                       RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                                                      ACTOR_ID_MAX,         SCENE_POTION_SHOP_GRANNY,           0x00,                               "Trade Odd Mushroom",                          RHT_KAK_TRADE_ODD_MUSHROOM,                                      RG_ODD_POTION,                                                      SpoilerCollectionCheck::ItemGetInf(48),                                                                                       true);
+    locationTable[RC_KAK_GRANNYS_SHOP] =                                               Location::Base(RC_KAK_GRANNYS_SHOP,                                             RCQUEST_BOTH,    RCTYPE_MERCHANT,                                                         ACTOR_ID_MAX,         SCENE_POTION_SHOP_GRANNY,           0x00,                               "Granny's Shop",                               RHT_KAK_GRANNYS_SHOP,                                            RG_BUY_BLUE_POTION,                                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_MERCHANTS_GRANNYS_SHOP),                                                       true);
+    locationTable[RC_KAK_ANJU_AS_ADULT] =                                              Location::Base(RC_KAK_ANJU_AS_ADULT,                                            RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_KAKARIKO_VILLAGE,             0x00,                               "Anju as Adult",                               RHT_KAK_ANJU_AS_ADULT,                                           RG_CLAIM_CHECK,                                                     SpoilerCollectionCheck::ItemGetInf(44),                                                                                       true);
+    locationTable[RC_KAK_ANJU_AS_CHILD] =                                              Location::Base(RC_KAK_ANJU_AS_CHILD,                                            RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_KAKARIKO_VILLAGE,             0x00,                               "Anju as Child",                               RHT_KAK_ANJU_AS_CHILD,                                           RG_EMPTY_BOTTLE,                                                    SpoilerCollectionCheck::ItemGetInf(12),                                                                                       true);
+    locationTable[RC_KAK_TRADE_POCKET_CUCCO] =                                         Location::Base(RC_KAK_TRADE_POCKET_CUCCO,                                       RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                                                      ACTOR_ID_MAX,         SCENE_KAKARIKO_VILLAGE,             0x00,                               "Trade Pocket Cucco",                          RHT_KAK_TRADE_POCKET_CUCCO,                                      RG_COJIRO,                                                          SpoilerCollectionCheck::ItemGetInf(46),                                                                                       true);
+    locationTable[RC_KAK_IMPAS_HOUSE_FREESTANDING_POH] =                        Location::Collectable(RC_KAK_IMPAS_HOUSE_FREESTANDING_POH,                             RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_ITEM00,      SCENE_IMPAS_HOUSE,                  262,                          0x01, "Impas House Freestanding PoH",                RHT_KAK_IMPAS_HOUSE_FREESTANDING_POH,                            RG_PIECE_OF_HEART,                                                                                                                                                                                true);
+    locationTable[RC_KAK_WINDMILL_FREESTANDING_POH] =                           Location::Collectable(RC_KAK_WINDMILL_FREESTANDING_POH,                                RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_ITEM00,      SCENE_WINDMILL_AND_DAMPES_GRAVE,    262,                          0x01, "Windmill Freestanding PoH",                   RHT_KAK_WINDMILL_FREESTANDING_POH,                               RG_PIECE_OF_HEART,                                                                                                                                                                                true);
     // Graveyard
-    locationTable[RC_GRAVEYARD_SHIELD_GRAVE_CHEST] =                                  Location::Chest(RC_GRAVEYARD_SHIELD_GRAVE_CHEST,                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GRAVEYARD,                    ACTOR_EN_BOX,         SCENE_GRAVE_WITH_FAIRYS_FOUNTAIN,   21824,                                             0x00, "Shield Grave Chest",                          RHT_GRAVEYARD_SHIELD_GRAVE_CHEST,                                RG_HYLIAN_SHIELD,                     {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_GRAVEYARD_HEART_PIECE_GRAVE_CHEST] =                             Location::Chest(RC_GRAVEYARD_HEART_PIECE_GRAVE_CHEST,                            RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GRAVEYARD,                    ACTOR_EN_BOX,         SCENE_REDEAD_GRAVE,                 -22592,                                            0x00, "Heart Piece Grave Chest",                     RHT_GRAVEYARD_HEART_PIECE_GRAVE_CHEST,                           RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
-    locationTable[RC_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST] =                            Location::Chest(RC_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST,                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GRAVEYARD,                    ACTOR_EN_BOX,         SCENE_ROYAL_FAMILYS_TOMB,           -32736,                                            0x00, "Composers Grave Chest",                       RHT_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST,                          RG_BOMBS_5,                           {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_GRAVEYARD_HOOKSHOT_CHEST] =                                      Location::Chest(RC_GRAVEYARD_HOOKSHOT_CHEST,                                     RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GRAVEYARD,                    ACTOR_EN_BOX,         SCENE_WINDMILL_AND_DAMPES_GRAVE,    4352,                                              0x00, "Hookshot Chest",                              RHT_GRAVEYARD_HOOKSHOT_CHEST,                                    RG_PROGRESSIVE_HOOKSHOT,              {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
-    locationTable[RC_GRAVEYARD_FREESTANDING_POH] =                              Location::Collectable(RC_GRAVEYARD_FREESTANDING_POH,                                   RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GRAVEYARD,                    ACTOR_EN_ITEM00,      SCENE_GRAVEYARD,                    1030,                                              0x04, "Freestanding PoH",                            RHT_GRAVEYARD_FREESTANDING_POH,                                  RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
-    locationTable[RC_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH] =                   Location::Collectable(RC_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH,                        RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GRAVEYARD,                    ACTOR_EN_ITEM00,      SCENE_WINDMILL_AND_DAMPES_GRAVE,    1798,                                              0x07, "Dampe Race Freestanding PoH",                 RHT_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH,                       RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
-    locationTable[RC_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR] =                       Location::Collectable(RC_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR,                            RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GRAVEYARD,                    ACTOR_EN_ITEM00,      SCENE_GRAVEYARD,                    6406,                                              0x19, "Dampe Gravedigging Tour",                     RHT_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR,                           RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
+    locationTable[RC_GRAVEYARD_SHIELD_GRAVE_CHEST] =                                  Location::Chest(RC_GRAVEYARD_SHIELD_GRAVE_CHEST,                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GRAVEYARD,                    ACTOR_EN_BOX,         SCENE_GRAVE_WITH_FAIRYS_FOUNTAIN,   21824,                        0x00, "Shield Grave Chest",                          RHT_GRAVEYARD_SHIELD_GRAVE_CHEST,                                RG_HYLIAN_SHIELD);
+    locationTable[RC_GRAVEYARD_HEART_PIECE_GRAVE_CHEST] =                             Location::Chest(RC_GRAVEYARD_HEART_PIECE_GRAVE_CHEST,                            RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GRAVEYARD,                    ACTOR_EN_BOX,         SCENE_REDEAD_GRAVE,                 -22592,                       0x00, "Heart Piece Grave Chest",                     RHT_GRAVEYARD_HEART_PIECE_GRAVE_CHEST,                           RG_PIECE_OF_HEART,                                                                                                                                                                                true);
+    locationTable[RC_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST] =                            Location::Chest(RC_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST,                           RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_ROYAL_FAMILYS_TOMB,           -32736,                       0x00, "Composers Grave Chest",                       RHT_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST,                          RG_BOMBS_5);
+    locationTable[RC_GRAVEYARD_HOOKSHOT_CHEST] =                                      Location::Chest(RC_GRAVEYARD_HOOKSHOT_CHEST,                                     RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GRAVEYARD,                    ACTOR_EN_BOX,         SCENE_WINDMILL_AND_DAMPES_GRAVE,    4352,                         0x00, "Hookshot Chest",                              RHT_GRAVEYARD_HOOKSHOT_CHEST,                                    RG_PROGRESSIVE_HOOKSHOT,                                                                                                                                                                          true);
+    locationTable[RC_GRAVEYARD_FREESTANDING_POH] =                              Location::Collectable(RC_GRAVEYARD_FREESTANDING_POH,                                   RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_ITEM00,      SCENE_GRAVEYARD,                    1030,                         0x04, "Freestanding PoH",                            RHT_GRAVEYARD_FREESTANDING_POH,                                  RG_PIECE_OF_HEART,                                                                                                                                                                                true);
+    locationTable[RC_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH] =                   Location::Collectable(RC_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH,                        RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GRAVEYARD,                    ACTOR_EN_ITEM00,      SCENE_WINDMILL_AND_DAMPES_GRAVE,    1798,                         0x07, "Dampe Race Freestanding PoH",                 RHT_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH,                       RG_PIECE_OF_HEART,                                                                                                                                                                                true);
+    locationTable[RC_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR] =                       Location::Collectable(RC_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR,                            RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_ITEM00,      SCENE_GRAVEYARD,                    6406,                         0x19, "Dampe Gravedigging Tour",                     RHT_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR,                           RG_PIECE_OF_HEART,                                                                                                                                                                                true);
     // Death Mountain
-    locationTable[RC_DMT_CHEST] =                                                     Location::Chest(RC_DMT_CHEST,                                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_EN_BOX,         SCENE_DEATH_MOUNTAIN_TRAIL,         23201,                                             0x01, "Chest",                                       RHT_DMT_CHEST,                                                   RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMT_STORMS_GROTTO_CHEST] =                                       Location::Chest(RC_DMT_STORMS_GROTTO_CHEST,                                      RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_EN_BOX,         SCENE_GROTTOS,                      23255,                                             0x17, "Storms Grotto Chest",                         RHT_DMT_STORMS_GROTTO_CHEST,                                     RG_HUGE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMT_TRADE_BROKEN_SWORD] =                                         Location::Base(RC_DMT_TRADE_BROKEN_SWORD,                                       RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_ID_MAX,         SCENE_DEATH_MOUNTAIN_TRAIL,         0x00,                                              0x23, "Trade Broken Sword",                          RHT_DMT_TRADE_BROKEN_SWORD,                                      RG_PRESCRIPTION,                      { Category::cAdultTrade },                              SpoilerCollectionCheck::RandomizerInf(RAND_INF_ADULT_TRADES_DMT_TRADE_BROKEN_SWORD),                                          SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,             true);
-    locationTable[RC_DMT_TRADE_EYEDROPS] =                                             Location::Base(RC_DMT_TRADE_EYEDROPS,                                           RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_ID_MAX,         SCENE_DEATH_MOUNTAIN_TRAIL,         0x00,                                              0x26, "Trade Eyedrops",                              RHT_DMT_TRADE_EYEDROPS,                                          RG_CLAIM_CHECK,                       { Category::cAdultTrade },                              SpoilerCollectionCheck::RandomizerInf(RAND_INF_ADULT_TRADES_DMT_TRADE_EYEDROPS),                                              SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,             true);
-    locationTable[RC_DMT_TRADE_CLAIM_CHECK] =                                          Location::Base(RC_DMT_TRADE_CLAIM_CHECK,                                        RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_ID_MAX,         SCENE_DEATH_MOUNTAIN_TRAIL,         0x00,                                              0x57, "Trade Claim Check",                           RHT_DMT_TRADE_CLAIM_CHECK,                                       RG_BIGGORON_SWORD,                    {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ADULT_TRADES_DMT_TRADE_CLAIM_CHECK),                                           SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,             true);
-    locationTable[RC_DMT_FREESTANDING_POH] =                                    Location::Collectable(RC_DMT_FREESTANDING_POH,                                         RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_EN_ITEM00,      SCENE_DEATH_MOUNTAIN_TRAIL,         7686,                                              0x1E, "Freestanding PoH",                            RHT_DMT_FREESTANDING_POH,                                        RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,             true);
+    locationTable[RC_DMT_CHEST] =                                                     Location::Chest(RC_DMT_CHEST,                                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_DEATH_MOUNTAIN_TRAIL,         23201,                        0x01, "Chest",                                       RHT_DMT_CHEST,                                                   RG_PURPLE_RUPEE);
+    locationTable[RC_DMT_STORMS_GROTTO_CHEST] =                                       Location::Chest(RC_DMT_STORMS_GROTTO_CHEST,                                      RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_EN_BOX,         SCENE_GROTTOS,                      23255,                        0x17, "Storms Grotto Chest",                         RHT_DMT_STORMS_GROTTO_CHEST,                                     RG_HUGE_RUPEE);
+    locationTable[RC_DMT_TRADE_BROKEN_SWORD] =                                         Location::Base(RC_DMT_TRADE_BROKEN_SWORD,                                       RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                                                      ACTOR_ID_MAX,         SCENE_DEATH_MOUNTAIN_TRAIL,         0x00,                               "Trade Broken Sword",                          RHT_DMT_TRADE_BROKEN_SWORD,                                      RG_PRESCRIPTION,                                                    SpoilerCollectionCheck::RandomizerInf(RAND_INF_ADULT_TRADES_DMT_TRADE_BROKEN_SWORD),                                          true);
+    locationTable[RC_DMT_TRADE_EYEDROPS] =                                             Location::Base(RC_DMT_TRADE_EYEDROPS,                                           RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                                                      ACTOR_ID_MAX,         SCENE_DEATH_MOUNTAIN_TRAIL,         0x00,                               "Trade Eyedrops",                              RHT_DMT_TRADE_EYEDROPS,                                          RG_CLAIM_CHECK,                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ADULT_TRADES_DMT_TRADE_EYEDROPS),                                              true);
+    locationTable[RC_DMT_TRADE_CLAIM_CHECK] =                                          Location::Base(RC_DMT_TRADE_CLAIM_CHECK,                                        RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_DEATH_MOUNTAIN_TRAIL,         0x00,                               "Trade Claim Check",                           RHT_DMT_TRADE_CLAIM_CHECK,                                       RG_BIGGORON_SWORD,                                                  SpoilerCollectionCheck::RandomizerInf(RAND_INF_ADULT_TRADES_DMT_TRADE_CLAIM_CHECK),                                           true);
+    locationTable[RC_DMT_FREESTANDING_POH] =                                    Location::Collectable(RC_DMT_FREESTANDING_POH,                                         RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_ITEM00,      SCENE_DEATH_MOUNTAIN_TRAIL,         7686,                         0x1E, "Freestanding PoH",                            RHT_DMT_FREESTANDING_POH,                                        RG_PIECE_OF_HEART,                                                                                                                                                                                true);
     // Goron City
-    locationTable[RC_GC_MAZE_LEFT_CHEST] =                                            Location::Chest(RC_GC_MAZE_LEFT_CHEST,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GORON_CITY,                   ACTOR_EN_BOX,         SCENE_GORON_CITY,                   23232,                                             0x00, "Maze Left Chest",                             RHT_GC_MAZE_LEFT_CHEST,                                          RG_HUGE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_MAZE_RIGHT_CHEST] =                                           Location::Chest(RC_GC_MAZE_RIGHT_CHEST,                                          RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GORON_CITY,                   ACTOR_EN_BOX,         SCENE_GORON_CITY,                   23201,                                             0x01, "Maze Right Chest",                            RHT_GC_MAZE_RIGHT_CHEST,                                         RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_MAZE_CENTER_CHEST] =                                          Location::Chest(RC_GC_MAZE_CENTER_CHEST,                                         RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GORON_CITY,                   ACTOR_EN_BOX,         SCENE_GORON_CITY,                   23202,                                             0x02, "Maze Center Chest",                           RHT_GC_MAZE_CENTER_CHEST,                                        RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_ROLLING_GORON_AS_CHILD] =                                      Location::Base(RC_GC_ROLLING_GORON_AS_CHILD,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GORON_CITY,                   ACTOR_ID_MAX,         SCENE_GORON_CITY,                   0x00,                                              0x34, "Rolling Goron as Child",                      RHT_GC_ROLLING_GORON_AS_CHILD,                                   RG_PROGRESSIVE_BOMB_BAG,              {},                                                     SpoilerCollectionCheck::InfTable(INFTABLE_11E),                                                                               SpoilerCollectionCheckGroup::GROUP_GORON_CITY,                 true);
-    locationTable[RC_GC_ROLLING_GORON_AS_ADULT] =                                      Location::Base(RC_GC_ROLLING_GORON_AS_ADULT,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GORON_CITY,                   ACTOR_ID_MAX,         SCENE_GORON_CITY,                   0x00,                                              0x2C, "Rolling Goron as Adult",                      RHT_GC_ROLLING_GORON_AS_ADULT,                                   RG_GORON_TUNIC,                       {},                                                     SpoilerCollectionCheck::InfTable(INFTABLE_GORON_CITY_DOORS_UNLOCKED),                                                         SpoilerCollectionCheckGroup::GROUP_GORON_CITY,                 true);
-    locationTable[RC_GC_DARUNIAS_JOY] =                                                Location::Base(RC_GC_DARUNIAS_JOY,                                              RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GORON_CITY,                   ACTOR_ID_MAX,         SCENE_GORON_CITY,                   0x00,                                              0x54, "Darunias Joy",                                RHT_GC_DARUNIAS_JOY,                                             RG_PROGRESSIVE_STRENGTH,              {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DARUNIAS_JOY),                                                                 SpoilerCollectionCheckGroup::GROUP_GORON_CITY,                 true);
-    locationTable[RC_GC_POT_FREESTANDING_POH] =                                 Location::Collectable(RC_GC_POT_FREESTANDING_POH,                                      RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GORON_CITY,                   ACTOR_EN_ITEM00,      SCENE_GORON_CITY,                   7942,                                              0x1F, "Pot Freestanding PoH",                        RHT_GC_POT_FREESTANDING_POH,                                     RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GORON_CITY,                 true);
-    locationTable[RC_GC_DEKU_SCRUB_GROTTO_LEFT] =                               Location::GrottoScrub(RC_GC_DEKU_SCRUB_GROTTO_LEFT,                                    RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_GORON_CITY,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x00, 0xFB),                      0x30, "Deku Scrub Grotto Left",                      RHT_GC_DEKU_SCRUB_GROTTO_LEFT,                                   RG_BUY_DEKU_NUTS_5,                   { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GC_DEKU_SCRUB_GROTTO_LEFT),                                   SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_DEKU_SCRUB_GROTTO_RIGHT] =                              Location::GrottoScrub(RC_GC_DEKU_SCRUB_GROTTO_RIGHT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_GORON_CITY,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x05, 0xFB),                      0x37, "Deku Scrub Grotto Right",                     RHT_GC_DEKU_SCRUB_GROTTO_RIGHT,                                  RG_BUY_BOMBS_535,                     { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GC_DEKU_SCRUB_GROTTO_RIGHT),                                  SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_DEKU_SCRUB_GROTTO_CENTER] =                             Location::GrottoScrub(RC_GC_DEKU_SCRUB_GROTTO_CENTER,                                  RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_GORON_CITY,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x03, 0xFB),                      0x33, "Deku Scrub Grotto Center",                    RHT_GC_DEKU_SCRUB_GROTTO_CENTER,                                 RG_BUY_ARROWS_30,                     { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GC_DEKU_SCRUB_GROTTO_CENTER),                                 SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_MEDIGORON] =                                                   Location::Base(RC_GC_MEDIGORON,                                                 RCQUEST_BOTH,    RCTYPE_MERCHANT,                    RCAREA_GORON_CITY,                   ACTOR_ID_MAX,         SCENE_GORON_CITY,                   0x00,                                              0x51, "Medigoron",                                   RHT_GC_MEDIGORON,                                                RG_GIANTS_KNIFE,                      { Category::cMerchant },                                SpoilerCollectionCheck::RandomizerInf(RAND_INF_MERCHANTS_MEDIGORON),                                                          SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_MAZE_LEFT_CHEST] =                                            Location::Chest(RC_GC_MAZE_LEFT_CHEST,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_GORON_CITY,                   23232,                        0x00, "Maze Left Chest",                             RHT_GC_MAZE_LEFT_CHEST,                                          RG_HUGE_RUPEE);
+    locationTable[RC_GC_MAZE_RIGHT_CHEST] =                                           Location::Chest(RC_GC_MAZE_RIGHT_CHEST,                                          RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_GORON_CITY,                   23201,                        0x01, "Maze Right Chest",                            RHT_GC_MAZE_RIGHT_CHEST,                                         RG_PURPLE_RUPEE);
+    locationTable[RC_GC_MAZE_CENTER_CHEST] =                                          Location::Chest(RC_GC_MAZE_CENTER_CHEST,                                         RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_GORON_CITY,                   23202,                        0x02, "Maze Center Chest",                           RHT_GC_MAZE_CENTER_CHEST,                                        RG_PURPLE_RUPEE);
+    locationTable[RC_GC_ROLLING_GORON_AS_CHILD] =                                      Location::Base(RC_GC_ROLLING_GORON_AS_CHILD,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_GORON_CITY,                   0x00,                               "Rolling Goron as Child",                      RHT_GC_ROLLING_GORON_AS_CHILD,                                   RG_PROGRESSIVE_BOMB_BAG,                                            SpoilerCollectionCheck::InfTable(INFTABLE_11E),                                                                               true);
+    locationTable[RC_GC_ROLLING_GORON_AS_ADULT] =                                      Location::Base(RC_GC_ROLLING_GORON_AS_ADULT,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_GORON_CITY,                   0x00,                               "Rolling Goron as Adult",                      RHT_GC_ROLLING_GORON_AS_ADULT,                                   RG_GORON_TUNIC,                                                     SpoilerCollectionCheck::InfTable(INFTABLE_GORON_CITY_DOORS_UNLOCKED),                                                         true);
+    locationTable[RC_GC_DARUNIAS_JOY] =                                                Location::Base(RC_GC_DARUNIAS_JOY,                                              RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_GORON_CITY,                   0x00,                               "Darunias Joy",                                RHT_GC_DARUNIAS_JOY,                                             RG_PROGRESSIVE_STRENGTH,                                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_DARUNIAS_JOY),                                                                 true);
+    locationTable[RC_GC_POT_FREESTANDING_POH] =                                 Location::Collectable(RC_GC_POT_FREESTANDING_POH,                                      RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_ITEM00,      SCENE_GORON_CITY,                   7942,                         0x1F, "Pot Freestanding PoH",                        RHT_GC_POT_FREESTANDING_POH,                                     RG_PIECE_OF_HEART,                                                                                                                                                                                true);
+    locationTable[RC_GC_DEKU_SCRUB_GROTTO_LEFT] =                                      Location::Base(RC_GC_DEKU_SCRUB_GROTTO_LEFT,                                    RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_GORON_CITY,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x00, 0xFB),       "Deku Scrub Grotto Left",                      RHT_GC_DEKU_SCRUB_GROTTO_LEFT,                                   RG_BUY_DEKU_NUTS_5,                                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GC_DEKU_SCRUB_GROTTO_LEFT));
+    locationTable[RC_GC_DEKU_SCRUB_GROTTO_RIGHT] =                                     Location::Base(RC_GC_DEKU_SCRUB_GROTTO_RIGHT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_GORON_CITY,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x05, 0xFB),       "Deku Scrub Grotto Right",                     RHT_GC_DEKU_SCRUB_GROTTO_RIGHT,                                  RG_BUY_BOMBS_535,                                                   SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GC_DEKU_SCRUB_GROTTO_RIGHT));
+    locationTable[RC_GC_DEKU_SCRUB_GROTTO_CENTER] =                                    Location::Base(RC_GC_DEKU_SCRUB_GROTTO_CENTER,                                  RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_GORON_CITY,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x03, 0xFB),       "Deku Scrub Grotto Center",                    RHT_GC_DEKU_SCRUB_GROTTO_CENTER,                                 RG_BUY_ARROWS_30,                                                   SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GC_DEKU_SCRUB_GROTTO_CENTER));
+    locationTable[RC_GC_MEDIGORON] =                                                   Location::Base(RC_GC_MEDIGORON,                                                 RCQUEST_BOTH,    RCTYPE_MERCHANT,                                                         ACTOR_ID_MAX,         SCENE_GORON_CITY,                   0x00,                               "Medigoron",                                   RHT_GC_MEDIGORON,                                                RG_GIANTS_KNIFE,                                                    SpoilerCollectionCheck::RandomizerInf(RAND_INF_MERCHANTS_MEDIGORON));
     // Death Mountain Crater
-    locationTable[RC_DMC_UPPER_GROTTO_CHEST] =                                        Location::Chest(RC_DMC_UPPER_GROTTO_CHEST,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_EN_BOX,         SCENE_GROTTOS,                      23802,                                             0x1A, "Upper Grotto Chest",                          RHT_DMC_UPPER_GROTTO_CHEST,                                      RG_BOMBS_20,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMC_WALL_FREESTANDING_POH] =                               Location::Collectable(RC_DMC_WALL_FREESTANDING_POH,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_EN_ITEM00,      SCENE_DEATH_MOUNTAIN_CRATER,        518,                                               0x02, "Wall Freestanding PoH",                       RHT_DMC_WALL_FREESTANDING_POH,                                   RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,             true);
-    locationTable[RC_DMC_VOLCANO_FREESTANDING_POH] =                            Location::Collectable(RC_DMC_VOLCANO_FREESTANDING_POH,                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_EN_ITEM00,      SCENE_DEATH_MOUNTAIN_CRATER,        2054,                                              0x08, "Volcano Freestanding PoH",                    RHT_DMC_WALL_FREESTANDING_POH,                                   RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,             true);
-    locationTable[RC_DMC_DEKU_SCRUB] =                                                 Location::Base(RC_DMC_DEKU_SCRUB,                                               RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_EN_DNS,         SCENE_DEATH_MOUNTAIN_CRATER,        0x05,                                              0x37, "Deku Scrub",                                  RHT_DMC_DEKU_SCRUB,                                              RG_BUY_BOMBS_535,                     { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB),                                              SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMC_DEKU_SCRUB_GROTTO_LEFT] =                              Location::GrottoScrub(RC_DMC_DEKU_SCRUB_GROTTO_LEFT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x00, 0xF9),                      0x30, "Deku Scrub Grotto Left",                      RHT_DMC_DEKU_SCRUB_GROTTO_LEFT,                                  RG_BUY_DEKU_NUTS_5,                   { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB_GROTTO_LEFT),                                  SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMC_DEKU_SCRUB_GROTTO_RIGHT] =                             Location::GrottoScrub(RC_DMC_DEKU_SCRUB_GROTTO_RIGHT,                                  RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x05, 0xF9),                      0x37, "Deku Scrub Grotto Right",                     RHT_DMC_DEKU_SCRUB_GROTTO_RIGHT,                                 RG_BUY_BOMBS_535,                     { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB_GROTTO_RIGHT),                                 SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMC_DEKU_SCRUB_GROTTO_CENTER] =                            Location::GrottoScrub(RC_DMC_DEKU_SCRUB_GROTTO_CENTER,                                 RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x03, 0xF9),                      0x33, "Deku Scrub Grotto Center",                    RHT_DMC_DEKU_SCRUB_GROTTO_CENTER,                                RG_BUY_ARROWS_30,                     { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB_GROTTO_CENTER),                                SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
+    locationTable[RC_DMC_UPPER_GROTTO_CHEST] =                                        Location::Chest(RC_DMC_UPPER_GROTTO_CHEST,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_EN_BOX,         SCENE_GROTTOS,                      23802,                        0x1A, "Upper Grotto Chest",                          RHT_DMC_UPPER_GROTTO_CHEST,                                      RG_BOMBS_20);
+    locationTable[RC_DMC_WALL_FREESTANDING_POH] =                               Location::Collectable(RC_DMC_WALL_FREESTANDING_POH,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_ITEM00,      SCENE_DEATH_MOUNTAIN_CRATER,        518,                          0x02, "Wall Freestanding PoH",                       RHT_DMC_WALL_FREESTANDING_POH,                                   RG_PIECE_OF_HEART,                                                                                                                                                                                true);
+    locationTable[RC_DMC_VOLCANO_FREESTANDING_POH] =                            Location::Collectable(RC_DMC_VOLCANO_FREESTANDING_POH,                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_ITEM00,      SCENE_DEATH_MOUNTAIN_CRATER,        2054,                         0x08, "Volcano Freestanding PoH",                    RHT_DMC_WALL_FREESTANDING_POH,                                   RG_PIECE_OF_HEART,                                                                                                                                                                                true);
+    locationTable[RC_DMC_DEKU_SCRUB] =                                                 Location::Base(RC_DMC_DEKU_SCRUB,                                               RCQUEST_BOTH,    RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_DEATH_MOUNTAIN_CRATER,        0x05,                               "Deku Scrub",                                  RHT_DMC_DEKU_SCRUB,                                              RG_BUY_BOMBS_535,                                                   SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB));
+    locationTable[RC_DMC_DEKU_SCRUB_GROTTO_LEFT] =                                     Location::Base(RC_DMC_DEKU_SCRUB_GROTTO_LEFT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x00, 0xF9),       "Deku Scrub Grotto Left",                      RHT_DMC_DEKU_SCRUB_GROTTO_LEFT,                                  RG_BUY_DEKU_NUTS_5,                                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB_GROTTO_LEFT));
+    locationTable[RC_DMC_DEKU_SCRUB_GROTTO_RIGHT] =                                    Location::Base(RC_DMC_DEKU_SCRUB_GROTTO_RIGHT,                                  RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x05, 0xF9),       "Deku Scrub Grotto Right",                     RHT_DMC_DEKU_SCRUB_GROTTO_RIGHT,                                 RG_BUY_BOMBS_535,                                                   SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB_GROTTO_RIGHT));
+    locationTable[RC_DMC_DEKU_SCRUB_GROTTO_CENTER] =                                   Location::Base(RC_DMC_DEKU_SCRUB_GROTTO_CENTER,                                 RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x03, 0xF9),       "Deku Scrub Grotto Center",                    RHT_DMC_DEKU_SCRUB_GROTTO_CENTER,                                RG_BUY_ARROWS_30,                                                   SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB_GROTTO_CENTER));
     // Zoras River
-    locationTable[RC_ZR_OPEN_GROTTO_CHEST] =                                          Location::Chest(RC_ZR_OPEN_GROTTO_CHEST,                                         RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_RIVER,                  ACTOR_EN_BOX,         SCENE_GROTTOS,                      22985,                                             0x09, "Open Grotto Chest",                           RHT_ZR_OPEN_GROTTO_CHEST,                                        RG_RED_RUPEE,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZR_MAGIC_BEAN_SALESMAN] =                                         Location::Base(RC_ZR_MAGIC_BEAN_SALESMAN,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_RIVER,                  ACTOR_ID_MAX,         SCENE_ZORAS_RIVER,                  0x00,                                              0x16, "Magic Bean Salesman",                         RHT_ZR_MAGIC_BEAN_SALESMAN,                                      RG_MAGIC_BEAN,                        {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MERCHANTS_MAGIC_BEAN_SALESMAN),                                                SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,                true);
-    locationTable[RC_ZR_FROGS_ZELDAS_LULLABY] =                                        Location::Base(RC_ZR_FROGS_ZELDAS_LULLABY,                                      RCQUEST_BOTH,    RCTYPE_FROG_SONG,                   RCAREA_ZORAS_RIVER,                  ACTOR_EN_FR,          SCENE_ZORAS_RIVER,                  0x00,                                              0x3E, "Frogs Zelda's Lullaby",                       RHT_ZR_FROGS_ZELDAS_LULLABY,                                     RG_PURPLE_RUPEE,                      {},                                                     SpoilerCollectionCheck::EventChkInf(0xD1),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZR_FROGS_EPONAS_SONG] =                                           Location::Base(RC_ZR_FROGS_EPONAS_SONG,                                         RCQUEST_BOTH,    RCTYPE_FROG_SONG,                   RCAREA_ZORAS_RIVER,                  ACTOR_EN_FR,          SCENE_ZORAS_RIVER,                  0x00,                                              0x3E, "Frogs Epona's Song",                          RHT_ZR_FROGS_EPONAS_SONG,                                        RG_PURPLE_RUPEE,                      {},                                                     SpoilerCollectionCheck::EventChkInf(0xD2),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZR_FROGS_SARIAS_SONG] =                                           Location::Base(RC_ZR_FROGS_SARIAS_SONG,                                         RCQUEST_BOTH,    RCTYPE_FROG_SONG,                   RCAREA_ZORAS_RIVER,                  ACTOR_EN_FR,          SCENE_ZORAS_RIVER,                  0x00,                                              0x3E, "Frogs Saria's Song",                          RHT_ZR_FROGS_SARIAS_SONG,                                        RG_PURPLE_RUPEE,                      {},                                                     SpoilerCollectionCheck::EventChkInf(0xD4),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZR_FROGS_SUNS_SONG] =                                             Location::Base(RC_ZR_FROGS_SUNS_SONG,                                           RCQUEST_BOTH,    RCTYPE_FROG_SONG,                   RCAREA_ZORAS_RIVER,                  ACTOR_EN_FR,          SCENE_ZORAS_RIVER,                  0x00,                                              0x3E, "Frogs Sun's Song",                            RHT_ZR_FROGS_SUNS_SONG,                                          RG_PURPLE_RUPEE,                      {},                                                     SpoilerCollectionCheck::EventChkInf(0xD3),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZR_FROGS_SONG_OF_TIME] =                                          Location::Base(RC_ZR_FROGS_SONG_OF_TIME,                                        RCQUEST_BOTH,    RCTYPE_FROG_SONG,                   RCAREA_ZORAS_RIVER,                  ACTOR_EN_FR,          SCENE_ZORAS_RIVER,                  0x00,                                              0x3E, "Frogs Song of Time",                          RHT_ZR_FROGS_SONG_OF_TIME,                                       RG_PURPLE_RUPEE,                      {},                                                     SpoilerCollectionCheck::EventChkInf(0xD5),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZR_FROGS_IN_THE_RAIN] =                                           Location::Base(RC_ZR_FROGS_IN_THE_RAIN,                                         RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_RIVER,                  ACTOR_EN_FR,          SCENE_ZORAS_RIVER,                  0x00,                                              0x3E, "Frogs in the Rain",                           RHT_ZR_FROGS_IN_THE_RAIN,                                        RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::EventChkInf(0xD6),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,                true);
-    locationTable[RC_ZR_FROGS_OCARINA_GAME] =                                          Location::Base(RC_ZR_FROGS_OCARINA_GAME,                                        RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_RIVER,                  ACTOR_EN_FR,          SCENE_ZORAS_RIVER,                  0x00,                                              0x76, "Frogs Ocarina Game",                          RHT_ZR_FROGS_OCARINA_GAME,                                       RG_PIECE_OF_HEART,                    {},                                                     SpoilerCollectionCheck::EventChkInf(0xD0),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,                true);
-    locationTable[RC_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH] =                    Location::Collectable(RC_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH,                         RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_RIVER,                  ACTOR_EN_ITEM00,      SCENE_ZORAS_RIVER,                  1030,                                              0x04, "Near Open Grotto Freestanding PoH",           RHT_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH,                        RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,                true);
-    locationTable[RC_ZR_NEAR_DOMAIN_FREESTANDING_POH] =                         Location::Collectable(RC_ZR_NEAR_DOMAIN_FREESTANDING_POH,                              RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_RIVER,                  ACTOR_EN_ITEM00,      SCENE_ZORAS_RIVER,                  2822,                                              0x0B, "Near Domain Freestanding PoH",                RHT_ZR_NEAR_DOMAIN_FREESTANDING_POH,                             RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER,                true);
-    locationTable[RC_ZR_DEKU_SCRUB_GROTTO_REAR] =                               Location::GrottoScrub(RC_ZR_DEKU_SCRUB_GROTTO_REAR,                                    RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_ZORAS_RIVER,                  ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x07, 0xEB),                      0x39, "Deku Scrub Grotto Rear",                      RHT_ZR_DEKU_SCRUB_GROTTO_REAR,                                   RG_BUY_RED_POTION_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_ZR_DEKU_SCRUB_GROTTO_REAR),                                   SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZR_DEKU_SCRUB_GROTTO_FRONT] =                              Location::GrottoScrub(RC_ZR_DEKU_SCRUB_GROTTO_FRONT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_ZORAS_RIVER,                  ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x08, 0xEB),                      0x3A, "Deku Scrub Grotto Front",                     RHT_ZR_DEKU_SCRUB_GROTTO_FRONT,                                  RG_BUY_GREEN_POTION,                  { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_ZR_DEKU_SCRUB_GROTTO_FRONT),                                  SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_ZR_OPEN_GROTTO_CHEST] =                                          Location::Chest(RC_ZR_OPEN_GROTTO_CHEST,                                         RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_RIVER,                  ACTOR_EN_BOX,         SCENE_GROTTOS,                      22985,                        0x09, "Open Grotto Chest",                           RHT_ZR_OPEN_GROTTO_CHEST,                                        RG_RED_RUPEE);
+    locationTable[RC_ZR_MAGIC_BEAN_SALESMAN] =                                         Location::Base(RC_ZR_MAGIC_BEAN_SALESMAN,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_ZORAS_RIVER,                  0x00,                               "Magic Bean Salesman",                         RHT_ZR_MAGIC_BEAN_SALESMAN,                                      RG_MAGIC_BEAN,                                                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_MERCHANTS_MAGIC_BEAN_SALESMAN),                                                true);
+    locationTable[RC_ZR_FROGS_ZELDAS_LULLABY] =                                        Location::Base(RC_ZR_FROGS_ZELDAS_LULLABY,                                      RCQUEST_BOTH,    RCTYPE_FROG_SONG,                                                        ACTOR_EN_FR,          SCENE_ZORAS_RIVER,                  0x00,                               "Frogs Zelda's Lullaby",                       RHT_ZR_FROGS_ZELDAS_LULLABY,                                     RG_PURPLE_RUPEE,                                                    SpoilerCollectionCheck::EventChkInf(0xD1));
+    locationTable[RC_ZR_FROGS_EPONAS_SONG] =                                           Location::Base(RC_ZR_FROGS_EPONAS_SONG,                                         RCQUEST_BOTH,    RCTYPE_FROG_SONG,                                                        ACTOR_EN_FR,          SCENE_ZORAS_RIVER,                  0x00,                               "Frogs Epona's Song",                          RHT_ZR_FROGS_EPONAS_SONG,                                        RG_PURPLE_RUPEE,                                                    SpoilerCollectionCheck::EventChkInf(0xD2));
+    locationTable[RC_ZR_FROGS_SARIAS_SONG] =                                           Location::Base(RC_ZR_FROGS_SARIAS_SONG,                                         RCQUEST_BOTH,    RCTYPE_FROG_SONG,                                                        ACTOR_EN_FR,          SCENE_ZORAS_RIVER,                  0x00,                               "Frogs Saria's Song",                          RHT_ZR_FROGS_SARIAS_SONG,                                        RG_PURPLE_RUPEE,                                                    SpoilerCollectionCheck::EventChkInf(0xD4));
+    locationTable[RC_ZR_FROGS_SUNS_SONG] =                                             Location::Base(RC_ZR_FROGS_SUNS_SONG,                                           RCQUEST_BOTH,    RCTYPE_FROG_SONG,                                                        ACTOR_EN_FR,          SCENE_ZORAS_RIVER,                  0x00,                               "Frogs Sun's Song",                            RHT_ZR_FROGS_SUNS_SONG,                                          RG_PURPLE_RUPEE,                                                    SpoilerCollectionCheck::EventChkInf(0xD3));
+    locationTable[RC_ZR_FROGS_SONG_OF_TIME] =                                          Location::Base(RC_ZR_FROGS_SONG_OF_TIME,                                        RCQUEST_BOTH,    RCTYPE_FROG_SONG,                                                        ACTOR_EN_FR,          SCENE_ZORAS_RIVER,                  0x00,                               "Frogs Song of Time",                          RHT_ZR_FROGS_SONG_OF_TIME,                                       RG_PURPLE_RUPEE,                                                    SpoilerCollectionCheck::EventChkInf(0xD5));
+    locationTable[RC_ZR_FROGS_IN_THE_RAIN] =                                           Location::Base(RC_ZR_FROGS_IN_THE_RAIN,                                         RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_FR,          SCENE_ZORAS_RIVER,                  0x00,                               "Frogs in the Rain",                           RHT_ZR_FROGS_IN_THE_RAIN,                                        RG_PIECE_OF_HEART,                                                  SpoilerCollectionCheck::EventChkInf(0xD6),                                                                                    true);
+    locationTable[RC_ZR_FROGS_OCARINA_GAME] =                                          Location::Base(RC_ZR_FROGS_OCARINA_GAME,                                        RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_FR,          SCENE_ZORAS_RIVER,                  0x00,                               "Frogs Ocarina Game",                          RHT_ZR_FROGS_OCARINA_GAME,                                       RG_PIECE_OF_HEART,                                                  SpoilerCollectionCheck::EventChkInf(0xD0),                                                                                    true);
+    locationTable[RC_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH] =                    Location::Collectable(RC_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH,                         RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_ITEM00,      SCENE_ZORAS_RIVER,                  1030,                         0x04, "Near Open Grotto Freestanding PoH",           RHT_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH,                        RG_PIECE_OF_HEART,                                                                                                                                                                                true);
+    locationTable[RC_ZR_NEAR_DOMAIN_FREESTANDING_POH] =                         Location::Collectable(RC_ZR_NEAR_DOMAIN_FREESTANDING_POH,                              RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_ITEM00,      SCENE_ZORAS_RIVER,                  2822,                         0x0B, "Near Domain Freestanding PoH",                RHT_ZR_NEAR_DOMAIN_FREESTANDING_POH,                             RG_PIECE_OF_HEART,                                                                                                                                                                                true);
+    locationTable[RC_ZR_DEKU_SCRUB_GROTTO_REAR] =                                      Location::Base(RC_ZR_DEKU_SCRUB_GROTTO_REAR,                                    RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_ZORAS_RIVER,                  ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x07, 0xEB),       "Deku Scrub Grotto Rear",                      RHT_ZR_DEKU_SCRUB_GROTTO_REAR,                                   RG_BUY_RED_POTION_30,                                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_ZR_DEKU_SCRUB_GROTTO_REAR));
+    locationTable[RC_ZR_DEKU_SCRUB_GROTTO_FRONT] =                                     Location::Base(RC_ZR_DEKU_SCRUB_GROTTO_FRONT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_ZORAS_RIVER,                  ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x08, 0xEB),       "Deku Scrub Grotto Front",                     RHT_ZR_DEKU_SCRUB_GROTTO_FRONT,                                  RG_BUY_GREEN_POTION,                                                SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_ZR_DEKU_SCRUB_GROTTO_FRONT));
     // Zoras Domain
-    locationTable[RC_ZD_CHEST] =                                                      Location::Chest(RC_ZD_CHEST,                                                     RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_BOX,         SCENE_ZORAS_DOMAIN,                 -18496,                                            0x00, "Chest",                                       RHT_ZD_CHEST,                                                    RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,               true);
-    locationTable[RC_ZD_DIVING_MINIGAME] =                                             Location::Base(RC_ZD_DIVING_MINIGAME,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_DOMAIN,                 ACTOR_ID_MAX,         SCENE_ZORAS_DOMAIN,                 0x00,                                              0x37, "Diving Minigame",                             RHT_ZD_DIVING_MINIGAME,                                          RG_PROGRESSIVE_SCALE,                 {},                                                     SpoilerCollectionCheck::EventChkInf(0x38),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,               true);
-    locationTable[RC_ZD_KING_ZORA_THAWED] =                                            Location::Base(RC_ZD_KING_ZORA_THAWED,                                          RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_DOMAIN,                 ACTOR_ID_MAX,         SCENE_ZORAS_DOMAIN,                 0x00,                                              0x2D, "King Zora Thawed",                            RHT_ZD_KING_ZORA_THAWED,                                         RG_ZORA_TUNIC,                        {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KING_ZORA_THAWED),                                                             SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,               true);
-    locationTable[RC_ZD_TRADE_PRESCRIPTION] =                                          Location::Base(RC_ZD_TRADE_PRESCRIPTION,                                        RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                 RCAREA_ZORAS_DOMAIN,                 ACTOR_ID_MAX,         SCENE_ZORAS_DOMAIN,                 0x00,                                              0x24, "Trade Prescription",                          RHT_ZD_TRADE_PRESCRIPTION,                                       RG_EYEBALL_FROG,                      { Category::cAdultTrade },                              SpoilerCollectionCheck::RandomizerInf(RAND_INF_ADULT_TRADES_ZD_TRADE_PRESCRIPTION),                                           SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,               true);
+    locationTable[RC_ZD_CHEST] =                                                      Location::Chest(RC_ZD_CHEST,                                                     RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_ZORAS_DOMAIN,                 -18496,                       0x00, "Chest",                                       RHT_ZD_CHEST,                                                    RG_PIECE_OF_HEART,                                                                                                                                                                                true);
+    locationTable[RC_ZD_DIVING_MINIGAME] =                                             Location::Base(RC_ZD_DIVING_MINIGAME,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_ZORAS_DOMAIN,                 0x00,                               "Diving Minigame",                             RHT_ZD_DIVING_MINIGAME,                                          RG_PROGRESSIVE_SCALE,                                               SpoilerCollectionCheck::EventChkInf(0x38),                                                                                    true);
+    locationTable[RC_ZD_KING_ZORA_THAWED] =                                            Location::Base(RC_ZD_KING_ZORA_THAWED,                                          RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_ZORAS_DOMAIN,                 0x00,                               "King Zora Thawed",                            RHT_ZD_KING_ZORA_THAWED,                                         RG_ZORA_TUNIC,                                                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_KING_ZORA_THAWED),                                                             true);
+    locationTable[RC_ZD_TRADE_PRESCRIPTION] =                                          Location::Base(RC_ZD_TRADE_PRESCRIPTION,                                        RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                                                      ACTOR_ID_MAX,         SCENE_ZORAS_DOMAIN,                 0x00,                               "Trade Prescription",                          RHT_ZD_TRADE_PRESCRIPTION,                                       RG_EYEBALL_FROG,                                                    SpoilerCollectionCheck::RandomizerInf(RAND_INF_ADULT_TRADES_ZD_TRADE_PRESCRIPTION),                                           true);
     // Zora's Fountain
-    locationTable[RC_ZF_ICEBERC_FREESTANDING_POH] =                             Location::Collectable(RC_ZF_ICEBERC_FREESTANDING_POH,                                  RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_FOUNTAIN,               ACTOR_EN_ITEM00,      SCENE_ZORAS_FOUNTAIN,               262,                                               0x01, "Iceberg Freestanding PoH",                    RHT_ZF_ICEBERG_FREESTANDING_POH,                                 RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,               true);
-    locationTable[RC_ZF_BOTTOM_FREESTANDING_POH] =                              Location::Collectable(RC_ZF_BOTTOM_FREESTANDING_POH,                                   RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_FOUNTAIN,               ACTOR_EN_ITEM00,      SCENE_ZORAS_FOUNTAIN,               5126,                                              0x14, "Bottom Freestanding PoH",                     RHT_ZF_BOTTOM_FREESTANDING_POH,                                  RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,               true);
+    locationTable[RC_ZF_ICEBERC_FREESTANDING_POH] =                             Location::Collectable(RC_ZF_ICEBERC_FREESTANDING_POH,                                  RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_ITEM00,      SCENE_ZORAS_FOUNTAIN,               262,                          0x01, "Iceberg Freestanding PoH",                    RHT_ZF_ICEBERG_FREESTANDING_POH,                                 RG_PIECE_OF_HEART,                                                                                                                                                                                true);
+    locationTable[RC_ZF_BOTTOM_FREESTANDING_POH] =                              Location::Collectable(RC_ZF_BOTTOM_FREESTANDING_POH,                                   RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_ITEM00,      SCENE_ZORAS_FOUNTAIN,               5126,                         0x14, "Bottom Freestanding PoH",                     RHT_ZF_BOTTOM_FREESTANDING_POH,                                  RG_PIECE_OF_HEART,                                                                                                                                                                                true);
     // Lon Lon Ranch
-    locationTable[RC_LLR_TALONS_CHICKENS] =                                            Location::Base(RC_LLR_TALONS_CHICKENS,                                          RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LON_LON_RANCH,                ACTOR_ID_MAX,         SCENE_LON_LON_BUILDINGS,            0x00,                                              0x14, "Talons Chickens",                             RHT_LLR_TALONS_CHICKENS,                                         RG_BOTTLE_WITH_MILK,                  {},                                                     SpoilerCollectionCheck::ItemGetInf(2),                                                                                        SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH,              true);
-    locationTable[RC_LLR_FREESTANDING_POH] =                                    Location::Collectable(RC_LLR_FREESTANDING_POH,                                         RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LON_LON_RANCH,                ACTOR_EN_ITEM00,      SCENE_LON_LON_BUILDINGS,            262,                                               0x01, "Freestanding PoH",                            RHT_LLR_FREESTANDING_POH,                                        RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH,              true);
-    locationTable[RC_LLR_DEKU_SCRUB_GROTTO_LEFT] =                              Location::GrottoScrub(RC_LLR_DEKU_SCRUB_GROTTO_LEFT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LON_LON_RANCH,                ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x00, 0xFC),                      0x30, "Deku Scrub Grotto Left",                      RHT_LLR_DEKU_SCRUB_GROTTO_LEFT,                                  RG_BUY_DEKU_NUTS_5,                   { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LLR_DEKU_SCRUB_GROTTO_LEFT),                                  SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
-    locationTable[RC_LLR_DEKU_SCRUB_GROTTO_RIGHT] =                             Location::GrottoScrub(RC_LLR_DEKU_SCRUB_GROTTO_RIGHT,                                  RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LON_LON_RANCH,                ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x05, 0xFC),                      0x37, "Deku Scrub Grotto Right",                     RHT_LLR_DEKU_SCRUB_GROTTO_RIGHT,                                 RG_BUY_BOMBS_535,                     { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LLR_DEKU_SCRUB_GROTTO_RIGHT),                                 SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
-    locationTable[RC_LLR_DEKU_SCRUB_GROTTO_CENTER] =                            Location::GrottoScrub(RC_LLR_DEKU_SCRUB_GROTTO_CENTER,                                 RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LON_LON_RANCH,                ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x03, 0xFC),                      0x33, "Deku Scrub Grotto Center",                    RHT_LLR_DEKU_SCRUB_GROTTO_CENTER,                                RG_BUY_DEKU_SEEDS_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LLR_DEKU_SCRUB_GROTTO_CENTER),                                SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
+    locationTable[RC_LLR_TALONS_CHICKENS] =                                            Location::Base(RC_LLR_TALONS_CHICKENS,                                          RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_LON_LON_BUILDINGS,            0x00,                               "Talons Chickens",                             RHT_LLR_TALONS_CHICKENS,                                         RG_BOTTLE_WITH_MILK,                                                SpoilerCollectionCheck::ItemGetInf(2),                                                                                        true);
+    locationTable[RC_LLR_FREESTANDING_POH] =                                    Location::Collectable(RC_LLR_FREESTANDING_POH,                                         RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_ITEM00,      SCENE_LON_LON_BUILDINGS,            262,                          0x01, "Freestanding PoH",                            RHT_LLR_FREESTANDING_POH,                                        RG_PIECE_OF_HEART,                                                                                                                                                                                true);
+    locationTable[RC_LLR_DEKU_SCRUB_GROTTO_LEFT] =                                     Location::Base(RC_LLR_DEKU_SCRUB_GROTTO_LEFT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LON_LON_RANCH,                ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x00, 0xFC),       "Deku Scrub Grotto Left",                      RHT_LLR_DEKU_SCRUB_GROTTO_LEFT,                                  RG_BUY_DEKU_NUTS_5,                                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LLR_DEKU_SCRUB_GROTTO_LEFT));
+    locationTable[RC_LLR_DEKU_SCRUB_GROTTO_RIGHT] =                                    Location::Base(RC_LLR_DEKU_SCRUB_GROTTO_RIGHT,                                  RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LON_LON_RANCH,                ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x05, 0xFC),       "Deku Scrub Grotto Right",                     RHT_LLR_DEKU_SCRUB_GROTTO_RIGHT,                                 RG_BUY_BOMBS_535,                                                   SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LLR_DEKU_SCRUB_GROTTO_RIGHT));
+    locationTable[RC_LLR_DEKU_SCRUB_GROTTO_CENTER] =                                   Location::Base(RC_LLR_DEKU_SCRUB_GROTTO_CENTER,                                 RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LON_LON_RANCH,                ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x03, 0xFC),       "Deku Scrub Grotto Center",                    RHT_LLR_DEKU_SCRUB_GROTTO_CENTER,                                RG_BUY_DEKU_SEEDS_30,                                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LLR_DEKU_SCRUB_GROTTO_CENTER));
 
     // Dungeons
     // Deku Tree Vanilla
-    locationTable[RC_DEKU_TREE_MAP_CHEST] =                                           Location::Chest(RC_DEKU_TREE_MAP_CHEST,                                          RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    2083,                                              0x03, "Map Chest",                                   RHT_DEKU_TREE_MAP_CHEST,                                         RG_DEKU_TREE_MAP,                     { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE,          true);
-    locationTable[RC_DEKU_TREE_COMPASS_CHEST] =                                       Location::Chest(RC_DEKU_TREE_COMPASS_CHEST,                                      RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    2050,                                              0x02, "Compass Chest",                               RHT_DEKU_TREE_COMPASS_CHEST,                                     RG_DEKU_TREE_COMPASS,                 { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE,          true);
-    locationTable[RC_DEKU_TREE_COMPASS_ROOM_SIDE_CHEST] =                             Location::Chest(RC_DEKU_TREE_COMPASS_ROOM_SIDE_CHEST,                            RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    22790,                                             0x06, "Compass Room Side Chest",                     RHT_DEKU_TREE_COMPASS_ROOM_SIDE_CHEST,                           RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[RC_DEKU_TREE_BASEMENT_CHEST] =                                      Location::Chest(RC_DEKU_TREE_BASEMENT_CHEST,                                     RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    22788,                                             0x04, "Basement Chest",                              RHT_DEKU_TREE_BASEMENT_CHEST,                                    RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[RC_DEKU_TREE_SLINGSHOT_CHEST] =                                     Location::Chest(RC_DEKU_TREE_SLINGSHOT_CHEST,                                    RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    161,                                               0x01, "Slingshot Chest",                             RHT_DEKU_TREE_SLINGSHOT_CHEST,                                   RG_PROGRESSIVE_SLINGSHOT,             {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE,          true);
-    locationTable[RC_DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST] =                           Location::Chest(RC_DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST,                          RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    22789,                                             0x05, "Slingshot Room Side Chest",                   RHT_DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST,                         RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_MAP_CHEST] =                                           Location::Chest(RC_DEKU_TREE_MAP_CHEST,                                          RCQUEST_VANILLA, RCTYPE_MAP,                                                              ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    2083,                         0x03, "Map Chest",                                   RHT_DEKU_TREE_MAP_CHEST,                                         RG_DEKU_TREE_MAP,                                                                                                                                                                                 true);
+    locationTable[RC_DEKU_TREE_COMPASS_CHEST] =                                       Location::Chest(RC_DEKU_TREE_COMPASS_CHEST,                                      RCQUEST_VANILLA, RCTYPE_COMPASS,                                                          ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    2050,                         0x02, "Compass Chest",                               RHT_DEKU_TREE_COMPASS_CHEST,                                     RG_DEKU_TREE_COMPASS,                                                                                                                                                                             true);
+    locationTable[RC_DEKU_TREE_COMPASS_ROOM_SIDE_CHEST] =                             Location::Chest(RC_DEKU_TREE_COMPASS_ROOM_SIDE_CHEST,                            RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    22790,                        0x06, "Compass Room Side Chest",                     RHT_DEKU_TREE_COMPASS_ROOM_SIDE_CHEST,                           RG_RECOVERY_HEART);
+    locationTable[RC_DEKU_TREE_BASEMENT_CHEST] =                                      Location::Chest(RC_DEKU_TREE_BASEMENT_CHEST,                                     RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    22788,                        0x04, "Basement Chest",                              RHT_DEKU_TREE_BASEMENT_CHEST,                                    RG_RECOVERY_HEART);
+    locationTable[RC_DEKU_TREE_SLINGSHOT_CHEST] =                                     Location::Chest(RC_DEKU_TREE_SLINGSHOT_CHEST,                                    RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    161,                          0x01, "Slingshot Chest",                             RHT_DEKU_TREE_SLINGSHOT_CHEST,                                   RG_PROGRESSIVE_SLINGSHOT,                                                                                                                                                                         true);
+    locationTable[RC_DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST] =                           Location::Chest(RC_DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST,                          RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    22789,                        0x05, "Slingshot Room Side Chest",                   RHT_DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST,                         RG_RECOVERY_HEART);
     // Deku Tree MQ
-    locationTable[RC_DEKU_TREE_MQ_MAP_CHEST] =                                        Location::Chest(RC_DEKU_TREE_MQ_MAP_CHEST,                                       RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    2083,                                              0x03, "MQ Map Chest",                                RHT_DEKU_TREE_MQ_MAP_CHEST,                                      RG_DEKU_TREE_MAP,                     { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE,          true);
-    locationTable[RC_DEKU_TREE_MQ_COMPASS_CHEST] =                                    Location::Chest(RC_DEKU_TREE_MQ_COMPASS_CHEST,                                   RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    2049,                                              0x01, "MQ Compass Chest",                            RHT_DEKU_TREE_MQ_COMPASS_CHEST,                                  RG_DEKU_TREE_COMPASS,                 { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE,          true);
-    locationTable[RC_DEKU_TREE_MQ_SLINGSHOT_CHEST] =                                  Location::Chest(RC_DEKU_TREE_MQ_SLINGSHOT_CHEST,                                 RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    4262,                                              0x06, "MQ Slingshot Chest",                          RHT_DEKU_TREE_MQ_SLINGSHOT_CHEST,                                RG_PROGRESSIVE_SLINGSHOT,             {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE,          true);
-    locationTable[RC_DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST] =                        Location::Chest(RC_DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST,                       RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    -31454,                                            0x02, "MQ Slingshot Room Back Chest",                RHT_DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST,                      RG_DEKU_SHIELD,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[RC_DEKU_TREE_MQ_BASEMENT_CHEST] =                                   Location::Chest(RC_DEKU_TREE_MQ_BASEMENT_CHEST,                                  RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    -31452,                                            0x04, "MQ Basement Chest",                           RHT_DEKU_TREE_MQ_BASEMENT_CHEST,                                 RG_DEKU_SHIELD,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[RC_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST] =                        Location::Chest(RC_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST,                       RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    22789,                                             0x05, "MQ Before Spinning Log Chest",                RHT_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST,                      RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[RC_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST] =                         Location::Chest(RC_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST,                        RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_DEKU_TREE,                    ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    23200,                                             0x00, "MQ After Spinning Log Chest",                 RHT_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST,                       RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[RC_DEKU_TREE_MQ_DEKU_SCRUB] =                                        Location::Base(RC_DEKU_TREE_MQ_DEKU_SCRUB,                                      RCQUEST_MQ,      RCTYPE_SCRUB,                       RCAREA_DEKU_TREE,                    ACTOR_EN_DNS,         SCENE_DEKU_TREE,                    0x04,                                              0x34, "MQ Deku Scrub",                               RHT_DEKU_TREE_MQ_DEKU_SCRUB,                                     RG_BUY_DEKU_SHIELD,                   { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DEKU_TREE_MQ_DEKU_SCRUB),                                     SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_MQ_MAP_CHEST] =                                        Location::Chest(RC_DEKU_TREE_MQ_MAP_CHEST,                                       RCQUEST_MQ,      RCTYPE_MAP,                                                              ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    2083,                         0x03, "MQ Map Chest",                                RHT_DEKU_TREE_MQ_MAP_CHEST,                                      RG_DEKU_TREE_MAP,                                                                                                                                                                                 true);
+    locationTable[RC_DEKU_TREE_MQ_COMPASS_CHEST] =                                    Location::Chest(RC_DEKU_TREE_MQ_COMPASS_CHEST,                                   RCQUEST_MQ,      RCTYPE_COMPASS,                                                          ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    2049,                         0x01, "MQ Compass Chest",                            RHT_DEKU_TREE_MQ_COMPASS_CHEST,                                  RG_DEKU_TREE_COMPASS,                                                                                                                                                                             true);
+    locationTable[RC_DEKU_TREE_MQ_SLINGSHOT_CHEST] =                                  Location::Chest(RC_DEKU_TREE_MQ_SLINGSHOT_CHEST,                                 RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    4262,                         0x06, "MQ Slingshot Chest",                          RHT_DEKU_TREE_MQ_SLINGSHOT_CHEST,                                RG_PROGRESSIVE_SLINGSHOT,                                                                                                                                                                         true);
+    locationTable[RC_DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST] =                        Location::Chest(RC_DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST,                       RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    -31454,                       0x02, "MQ Slingshot Room Back Chest",                RHT_DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST,                      RG_DEKU_SHIELD);
+    locationTable[RC_DEKU_TREE_MQ_BASEMENT_CHEST] =                                   Location::Chest(RC_DEKU_TREE_MQ_BASEMENT_CHEST,                                  RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    -31452,                       0x04, "MQ Basement Chest",                           RHT_DEKU_TREE_MQ_BASEMENT_CHEST,                                 RG_DEKU_SHIELD);
+    locationTable[RC_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST] =                        Location::Chest(RC_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST,                       RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    22789,                        0x05, "MQ Before Spinning Log Chest",                RHT_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST,                      RG_RECOVERY_HEART);
+    locationTable[RC_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST] =                         Location::Chest(RC_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST,                        RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    23200,                        0x00, "MQ After Spinning Log Chest",                 RHT_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST,                       RG_PURPLE_RUPEE);
+    locationTable[RC_DEKU_TREE_MQ_DEKU_SCRUB] =                                        Location::Base(RC_DEKU_TREE_MQ_DEKU_SCRUB,                                      RCQUEST_MQ,      RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_DEKU_TREE,                    0x04,                               "MQ Deku Scrub",                               RHT_DEKU_TREE_MQ_DEKU_SCRUB,                                     RG_BUY_DEKU_SHIELD,                                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DEKU_TREE_MQ_DEKU_SCRUB));
 
     // Dodongo's Cavern Shared
-    locationTable[RC_DODONGOS_CAVERN_BOSS_ROOM_CHEST] =                               Location::Chest(RC_DODONGOS_CAVERN_BOSS_ROOM_CHEST,                              RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN_BOSS,         20512,                                             0x00, "Boss Room Chest",                             RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST,                             RG_BOMBS_5,                           {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_BOSS_ROOM_CHEST] =                               Location::Chest(RC_DODONGOS_CAVERN_BOSS_ROOM_CHEST,                              RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN_BOSS,         20512,                        0x00, "Boss Room Chest",                             RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST,                             RG_BOMBS_5);
     // Dodongo's Cavern Vanilla
-    locationTable[RC_DODONGOS_CAVERN_MAP_CHEST] =                                     Location::Chest(RC_DODONGOS_CAVERN_MAP_CHEST,                                    RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              2088,                                              0x08, "Map Chest",                                   RHT_DODONGOS_CAVERN_MAP_CHEST,                                   RG_DODONGOS_CAVERN_MAP,               { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN,    true);
-    locationTable[RC_DODONGOS_CAVERN_COMPASS_CHEST] =                                 Location::Chest(RC_DODONGOS_CAVERN_COMPASS_CHEST,                                RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              2053,                                              0x05, "Compass Chest",                               RHT_DODONGOS_CAVERN_COMPASS_CHEST,                               RG_DODONGOS_CAVERN_COMPASS,           { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN,    true);
-    locationTable[RC_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST] =                    Location::Chest(RC_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST,                   RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              22982,                                             0x06, "Bomb Flower Platform Chest",                  RHT_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST,                  RG_RED_RUPEE,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_BOMB_BAG_CHEST] =                                Location::Chest(RC_DODONGOS_CAVERN_BOMB_BAG_CHEST,                               RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              1604,                                              0x04, "Bomb Bag Chest",                              RHT_DODONGOS_CAVERN_BOMB_BAG_CHEST,                              RG_PROGRESSIVE_BOMB_BAG,              {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN,    true);
-    locationTable[RC_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST] =                           Location::Chest(RC_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST,                          RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              21802,                                             0x0A, "End Of Bridge Chest",                         RHT_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST,                         RG_DEKU_SHIELD,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT] =                  Location::Base(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,                RCQUEST_VANILLA, RCTYPE_SCRUB,                       RCAREA_DODONGOS_CAVERN,              ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x00,                                              0x30, "Deku Scrub Near Bomb Bag Left",               RHT_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,               RG_BUY_DEKU_NUTS_5,                   { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT),               SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS] =             Location::Base(RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS,           RCQUEST_VANILLA, RCTYPE_SCRUB,                       RCAREA_DODONGOS_CAVERN,              ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x01,                                              0x31, "Deku Scrub Side Room Near Dodongos",          RHT_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS,          RG_BUY_DEKU_STICK_1,                  { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS),          SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT] =                 Location::Base(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT,               RCQUEST_VANILLA, RCTYPE_SCRUB,                       RCAREA_DODONGOS_CAVERN,              ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x03,                                              0x33, "Deku Scrub Near Bomb Bag Right",              RHT_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT,              RG_BUY_DEKU_SEEDS_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT),              SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY] =                               Location::Base(RC_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY,                             RCQUEST_VANILLA, RCTYPE_SCRUB,                       RCAREA_DODONGOS_CAVERN,              ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x04,                                              0x34, "Deku Scrub Lobby",                            RHT_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY,                            RG_BUY_DEKU_SHIELD,                   { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY),                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_MAP_CHEST] =                                     Location::Chest(RC_DODONGOS_CAVERN_MAP_CHEST,                                    RCQUEST_VANILLA, RCTYPE_MAP,                                                              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              2088,                         0x08, "Map Chest",                                   RHT_DODONGOS_CAVERN_MAP_CHEST,                                   RG_DODONGOS_CAVERN_MAP,                                                                                                                                                                           true);
+    locationTable[RC_DODONGOS_CAVERN_COMPASS_CHEST] =                                 Location::Chest(RC_DODONGOS_CAVERN_COMPASS_CHEST,                                RCQUEST_VANILLA, RCTYPE_COMPASS,                                                          ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              2053,                         0x05, "Compass Chest",                               RHT_DODONGOS_CAVERN_COMPASS_CHEST,                               RG_DODONGOS_CAVERN_COMPASS,                                                                                                                                                                       true);
+    locationTable[RC_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST] =                    Location::Chest(RC_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST,                   RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              22982,                        0x06, "Bomb Flower Platform Chest",                  RHT_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST,                  RG_RED_RUPEE);
+    locationTable[RC_DODONGOS_CAVERN_BOMB_BAG_CHEST] =                                Location::Chest(RC_DODONGOS_CAVERN_BOMB_BAG_CHEST,                               RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              1604,                         0x04, "Bomb Bag Chest",                              RHT_DODONGOS_CAVERN_BOMB_BAG_CHEST,                              RG_PROGRESSIVE_BOMB_BAG,                                                                                                                                                                          true);
+    locationTable[RC_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST] =                           Location::Chest(RC_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST,                          RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              21802,                        0x0A, "End Of Bridge Chest",                         RHT_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST,                         RG_DEKU_SHIELD);
+    locationTable[RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT] =                  Location::Base(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,                RCQUEST_VANILLA, RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x00,                               "Deku Scrub Near Bomb Bag Left",               RHT_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,               RG_BUY_DEKU_NUTS_5,                                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT));
+    locationTable[RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS] =             Location::Base(RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS,           RCQUEST_VANILLA, RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x01,                               "Deku Scrub Side Room Near Dodongos",          RHT_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS,          RG_BUY_DEKU_STICK_1,                                                SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS));
+    locationTable[RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT] =                 Location::Base(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT,               RCQUEST_VANILLA, RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x03,                               "Deku Scrub Near Bomb Bag Right",              RHT_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT,              RG_BUY_DEKU_SEEDS_30,                                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT));
+    locationTable[RC_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY] =                               Location::Base(RC_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY,                             RCQUEST_VANILLA, RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x04,                               "Deku Scrub Lobby",                            RHT_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY,                            RG_BUY_DEKU_SHIELD,                                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY));
     // Dodongo's Cavern MQ
-    locationTable[RC_DODONGOS_CAVERN_MQ_MAP_CHEST] =                                  Location::Chest(RC_DODONGOS_CAVERN_MQ_MAP_CHEST,                                 RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              2080,                                              0x00, "MQ Map Chest",                                RHT_DODONGOS_CAVERN_MQ_MAP_CHEST,                                RG_DODONGOS_CAVERN_MAP,               { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN,    true);
-    locationTable[RC_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST] =                             Location::Chest(RC_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST,                            RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              1604,                                              0x04, "MQ Bomb Bag Chest",                           RHT_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST,                           RG_PROGRESSIVE_BOMB_BAG,              {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN,    true);
-    locationTable[RC_DODONGOS_CAVERN_MQ_COMPASS_CHEST] =                              Location::Chest(RC_DODONGOS_CAVERN_MQ_COMPASS_CHEST,                             RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              6149,                                              0x05, "MQ Compass Chest",                            RHT_DODONGOS_CAVERN_MQ_COMPASS_CHEST,                            RG_DODONGOS_CAVERN_COMPASS,           { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN,    true);
-    locationTable[RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST] =                          Location::Chest(RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST,                         RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              29986,                                             0x02, "MQ Larvae Room Chest",                        RHT_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST,                        RG_DEKU_SHIELD,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST] =                    Location::Chest(RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST,                   RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              22947,                                             0x03, "MQ Torch Puzzle Room Chest",                  RHT_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST,                  RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST] =                          Location::Chest(RC_DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST,                         RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_DODONGOS_CAVERN,              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              21825,                                             0x01, "MQ Under Grave Chest",                        RHT_DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST,                        RG_HYLIAN_SHIELD,                     {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR] =                       Location::Base(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,                     RCQUEST_MQ,      RCTYPE_SCRUB,                       RCAREA_DODONGOS_CAVERN,              ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x01,                                              0x31, "MQ Deku Scrub Lobby Rear",                    RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,                    RG_BUY_DEKU_STICK_1,                  { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR),                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT] =                      Location::Base(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT,                    RCQUEST_MQ,      RCTYPE_SCRUB,                       RCAREA_DODONGOS_CAVERN,              ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x03,                                              0x33, "MQ Deku Scrub Lobby Front",                   RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT,                   RG_BUY_DEKU_SEEDS_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT),                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE] =                        Location::Base(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,                      RCQUEST_MQ,      RCTYPE_SCRUB,                       RCAREA_DODONGOS_CAVERN,              ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x04,                                              0x34, "MQ Deku Scrub Staircase",                     RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,                     RG_BUY_DEKU_SHIELD,                   { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE),                     SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS] =    Location::Base(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS,  RCQUEST_MQ,      RCTYPE_SCRUB,                       RCAREA_DODONGOS_CAVERN,              ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x07,                                              0x39, "MQ Deku Scrub Side Room Near Lower Lizalfos", RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS, RG_BUY_RED_POTION_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
+    locationTable[RC_DODONGOS_CAVERN_MQ_MAP_CHEST] =                                  Location::Chest(RC_DODONGOS_CAVERN_MQ_MAP_CHEST,                                 RCQUEST_MQ,      RCTYPE_MAP,                                                              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              2080,                         0x00, "MQ Map Chest",                                RHT_DODONGOS_CAVERN_MQ_MAP_CHEST,                                RG_DODONGOS_CAVERN_MAP,                                                                                                                                                                           true);
+    locationTable[RC_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST] =                             Location::Chest(RC_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST,                            RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              1604,                         0x04, "MQ Bomb Bag Chest",                           RHT_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST,                           RG_PROGRESSIVE_BOMB_BAG,                                                                                                                                                                          true);
+    locationTable[RC_DODONGOS_CAVERN_MQ_COMPASS_CHEST] =                              Location::Chest(RC_DODONGOS_CAVERN_MQ_COMPASS_CHEST,                             RCQUEST_MQ,      RCTYPE_COMPASS,                                                          ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              6149,                         0x05, "MQ Compass Chest",                            RHT_DODONGOS_CAVERN_MQ_COMPASS_CHEST,                            RG_DODONGOS_CAVERN_COMPASS,                                                                                                                                                                       true);
+    locationTable[RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST] =                          Location::Chest(RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST,                         RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              29986,                        0x02, "MQ Larvae Room Chest",                        RHT_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST,                        RG_DEKU_SHIELD);
+    locationTable[RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST] =                    Location::Chest(RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST,                   RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              22947,                        0x03, "MQ Torch Puzzle Room Chest",                  RHT_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST,                  RG_BLUE_RUPEE);
+    locationTable[RC_DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST] =                          Location::Chest(RC_DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST,                         RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              21825,                        0x01, "MQ Under Grave Chest",                        RHT_DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST,                        RG_HYLIAN_SHIELD);
+    locationTable[RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR] =                       Location::Base(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,                     RCQUEST_MQ,      RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x01,                               "MQ Deku Scrub Lobby Rear",                    RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,                    RG_BUY_DEKU_STICK_1,                                                SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR));
+    locationTable[RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT] =                      Location::Base(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT,                    RCQUEST_MQ,      RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x03,                               "MQ Deku Scrub Lobby Front",                   RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT,                   RG_BUY_DEKU_SEEDS_30,                                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT));
+    locationTable[RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE] =                        Location::Base(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,                      RCQUEST_MQ,      RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x04,                               "MQ Deku Scrub Staircase",                     RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,                     RG_BUY_DEKU_SHIELD,                                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE));
+    locationTable[RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS] =    Location::Base(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS,  RCQUEST_MQ,      RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x07,                               "MQ Deku Scrub Side Room Near Lower Lizalfos", RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS, RG_BUY_RED_POTION_30,                                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS));
 
     // Jabu-Jabu's Belly Vanilla
-    locationTable[RC_JABU_JABUS_BELLY_MAP_CHEST] =                                    Location::Chest(RC_JABU_JABUS_BELLY_MAP_CHEST,                                   RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    6178,                                              0x02, "Map Chest",                                   RHT_JABU_JABUS_BELLY_MAP_CHEST,                                  RG_JABU_JABUS_BELLY_MAP,              { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY,    true);
-    locationTable[RC_JABU_JABUS_BELLY_COMPASS_CHEST] =                                Location::Chest(RC_JABU_JABUS_BELLY_COMPASS_CHEST,                               RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    -18428,                                            0x04, "Compass Chest",                               RHT_JABU_JABUS_BELLY_COMPASS_CHEST,                              RG_JABU_JABUS_BELLY_COMPASS,          { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY,    true);
-    locationTable[RC_JABU_JABUS_BELLY_BOOMERANG_CHEST] =                              Location::Chest(RC_JABU_JABUS_BELLY_BOOMERANG_CHEST,                             RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    4289,                                              0x01, "Boomerang Chest",                             RHT_JABU_JABUS_BELLY_BOOMERANG_CHEST,                            RG_BOOMERANG,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY,    true);
-    locationTable[RC_JABU_JABUS_BELLY_DEKU_SCRUB] =                                    Location::Base(RC_JABU_JABUS_BELLY_DEKU_SCRUB,                                  RCQUEST_VANILLA, RCTYPE_SCRUB,                       RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_DNS,         SCENE_JABU_JABU,                    0x00,                                              0x30, "Deku Scrub",                                  RHT_JABU_JABUS_BELLY_DEKU_SCRUB,                                 RG_BUY_DEKU_NUTS_5,                   { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_JABU_JABUS_BELLY_DEKU_SCRUB),                                 SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_JABU_JABUS_BELLY_MAP_CHEST] =                                    Location::Chest(RC_JABU_JABUS_BELLY_MAP_CHEST,                                   RCQUEST_VANILLA, RCTYPE_MAP,                                                              ACTOR_EN_BOX,         SCENE_JABU_JABU,                    6178,                         0x02, "Map Chest",                                   RHT_JABU_JABUS_BELLY_MAP_CHEST,                                  RG_JABU_JABUS_BELLY_MAP,                                                                                                                                                                          true);
+    locationTable[RC_JABU_JABUS_BELLY_COMPASS_CHEST] =                                Location::Chest(RC_JABU_JABUS_BELLY_COMPASS_CHEST,                               RCQUEST_VANILLA, RCTYPE_COMPASS,                                                          ACTOR_EN_BOX,         SCENE_JABU_JABU,                    -18428,                       0x04, "Compass Chest",                               RHT_JABU_JABUS_BELLY_COMPASS_CHEST,                              RG_JABU_JABUS_BELLY_COMPASS,                                                                                                                                                                      true);
+    locationTable[RC_JABU_JABUS_BELLY_BOOMERANG_CHEST] =                              Location::Chest(RC_JABU_JABUS_BELLY_BOOMERANG_CHEST,                             RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_JABU_JABU,                    4289,                         0x01, "Boomerang Chest",                             RHT_JABU_JABUS_BELLY_BOOMERANG_CHEST,                            RG_BOOMERANG,                                                                                                                                                                                     true);
+    locationTable[RC_JABU_JABUS_BELLY_DEKU_SCRUB] =                                    Location::Base(RC_JABU_JABUS_BELLY_DEKU_SCRUB,                                  RCQUEST_VANILLA, RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_JABU_JABU,                    0x00,                               "Deku Scrub",                                  RHT_JABU_JABUS_BELLY_DEKU_SCRUB,                                 RG_BUY_DEKU_NUTS_5,                                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_JABU_JABUS_BELLY_DEKU_SCRUB));
     // Jabu-Jabu's Belly MQ
-    locationTable[RC_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST] =                     Location::Chest(RC_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST,                    RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    -32699,                                            0x05, "MQ First Room Side Chest",                    RHT_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST,                   RG_DEKU_NUTS_5,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_JABU_JABUS_BELLY_MQ_MAP_CHEST] =                                 Location::Chest(RC_JABU_JABUS_BELLY_MQ_MAP_CHEST,                                RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    -18397,                                            0x03, "MQ Map Chest",                                RHT_JABU_JABUS_BELLY_MQ_MAP_CHEST,                               RG_JABU_JABUS_BELLY_MAP,              { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY,    true);
-    locationTable[RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST] =                   Location::Chest(RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST,                  RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    20546,                                             0x02, "MQ Second Room Lower Chest",                  RHT_JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST,                 RG_DEKU_NUTS_5,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_JABU_JABUS_BELLY_MQ_COMPASS_CHEST] =                             Location::Chest(RC_JABU_JABUS_BELLY_MQ_COMPASS_CHEST,                            RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    -18432,                                            0x00, "MQ Compass Chest",                            RHT_JABU_JABUS_BELLY_MQ_COMPASS_CHEST,                           RG_JABU_JABUS_BELLY_COMPASS,          { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY,    true);
-    locationTable[RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST] =                   Location::Chest(RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST,                  RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    -30457,                                            0x07, "MQ Second Room Upper Chest",                  RHT_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST,                 RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST] =              Location::Chest(RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST,             RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    -32696,                                            0x08, "MQ Basement Near Switches Chest",             RHT_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST,            RG_DEKU_NUTS_5,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST] =                 Location::Chest(RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST,                RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    -32668,                                            0x04, "MQ Basement Near Vines Chest",                RHT_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST,               RG_BOMBCHU_10,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST] =                           Location::Chest(RC_JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST,                          RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    -31446,                                            0x0A, "MQ Near Boss Chest",                          RHT_JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST,                         RG_DEKU_SHIELD,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST] =              Location::Chest(RC_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST,             RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    28905,                                             0x09, "MQ Falling Like Like Room Chest",             RHT_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST,            RG_DEKU_STICK_1,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST] =                Location::Chest(RC_JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST,               RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    20545,                                             0x01, "MQ Boomerang Room Small Chest",               RHT_JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST,              RG_DEKU_NUTS_5,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST] =                           Location::Chest(RC_JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST,                          RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_BOX,         SCENE_JABU_JABU,                    4294,                                              0x06, "MQ Boomerang Chest",                          RHT_JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST,                         RG_BOOMERANG,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY,    true);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST] =                     Location::Chest(RC_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST,                    RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_JABU_JABU,                    -32699,                       0x05, "MQ First Room Side Chest",                    RHT_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST,                   RG_DEKU_NUTS_5);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_MAP_CHEST] =                                 Location::Chest(RC_JABU_JABUS_BELLY_MQ_MAP_CHEST,                                RCQUEST_MQ,      RCTYPE_MAP,                                                              ACTOR_EN_BOX,         SCENE_JABU_JABU,                    -18397,                       0x03, "MQ Map Chest",                                RHT_JABU_JABUS_BELLY_MQ_MAP_CHEST,                               RG_JABU_JABUS_BELLY_MAP,                                                                                                                                                                          true);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST] =                   Location::Chest(RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST,                  RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_JABU_JABU,                    20546,                        0x02, "MQ Second Room Lower Chest",                  RHT_JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST,                 RG_DEKU_NUTS_5);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_COMPASS_CHEST] =                             Location::Chest(RC_JABU_JABUS_BELLY_MQ_COMPASS_CHEST,                            RCQUEST_MQ,      RCTYPE_COMPASS,                                                          ACTOR_EN_BOX,         SCENE_JABU_JABU,                    -18432,                       0x00, "MQ Compass Chest",                            RHT_JABU_JABUS_BELLY_MQ_COMPASS_CHEST,                           RG_JABU_JABUS_BELLY_COMPASS,                                                                                                                                                                      true);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST] =                   Location::Chest(RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST,                  RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_JABU_JABU,                    -30457,                       0x07, "MQ Second Room Upper Chest",                  RHT_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST,                 RG_RECOVERY_HEART);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST] =              Location::Chest(RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST,             RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_JABU_JABU,                    -32696,                       0x08, "MQ Basement Near Switches Chest",             RHT_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST,            RG_DEKU_NUTS_5);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST] =                 Location::Chest(RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST,                RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_JABU_JABU,                    -32668,                       0x04, "MQ Basement Near Vines Chest",                RHT_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST,               RG_BOMBCHU_10);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST] =                           Location::Chest(RC_JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST,                          RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_JABU_JABU,                    -31446,                       0x0A, "MQ Near Boss Chest",                          RHT_JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST,                         RG_DEKU_SHIELD);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST] =              Location::Chest(RC_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST,             RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_JABU_JABU,                    28905,                        0x09, "MQ Falling Like Like Room Chest",             RHT_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST,            RG_DEKU_STICK_1);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST] =                Location::Chest(RC_JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST,               RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_JABU_JABU,                    20545,                        0x01, "MQ Boomerang Room Small Chest",               RHT_JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST,              RG_DEKU_NUTS_5);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST] =                           Location::Chest(RC_JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST,                          RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_JABU_JABU,                    4294,                         0x06, "MQ Boomerang Chest",                          RHT_JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST,                         RG_BOOMERANG,                                                                                                                                                                                     true);
 
     // Forest Temple Vanilla
-    locationTable[RC_FOREST_TEMPLE_FIRST_ROOM_CHEST] =                                Location::Chest(RC_FOREST_TEMPLE_FIRST_ROOM_CHEST,                               RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                22595,                                             0x03, "First Room Chest",                            RHT_FOREST_TEMPLE_FIRST_ROOM_CHEST,                              RG_FOREST_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
-    locationTable[RC_FOREST_TEMPLE_FIRST_STALFOS_CHEST] =                             Location::Chest(RC_FOREST_TEMPLE_FIRST_STALFOS_CHEST,                            RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                30784,                                             0x00, "First Stalfos Chest",                         RHT_FOREST_TEMPLE_FIRST_STALFOS_CHEST,                           RG_FOREST_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
-    locationTable[RC_FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST] =                   Location::Chest(RC_FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST,                  RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                22789,                                             0x05, "Raised Island Courtyard Chest",               RHT_FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST,                 RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[RC_FOREST_TEMPLE_MAP_CHEST] =                                       Location::Chest(RC_FOREST_TEMPLE_MAP_CHEST,                                      RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                6177,                                              0x01, "Map Chest",                                   RHT_FOREST_TEMPLE_MAP_CHEST,                                     RG_FOREST_TEMPLE_MAP,                 { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
-    locationTable[RC_FOREST_TEMPLE_WELL_CHEST] =                                      Location::Chest(RC_FOREST_TEMPLE_WELL_CHEST,                                     RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                22601,                                             0x09, "Well Chest",                                  RHT_FOREST_TEMPLE_WELL_CHEST,                                    RG_FOREST_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
-    locationTable[RC_FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST] =                      Location::Chest(RC_FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST,                     RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                22855,                                             0x07, "Falling Ceiling Room Chest",                  RHT_FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST,                    RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[RC_FOREST_TEMPLE_EYE_SWITCH_CHEST] =                                Location::Chest(RC_FOREST_TEMPLE_EYE_SWITCH_CHEST,                               RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                -30364,                                            0x04, "Eye Switch Chest",                            RHT_FOREST_TEMPLE_EYE_SWITCH_CHEST,                              RG_ARROWS_30,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[RC_FOREST_TEMPLE_BOSS_KEY_CHEST] =                                  Location::Chest(RC_FOREST_TEMPLE_BOSS_KEY_CHEST,                                 RCQUEST_VANILLA, RCTYPE_BOSS_KEY,                    RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                10222,                                             0x0E, "Boss Key Chest",                              RHT_FOREST_TEMPLE_BOSS_KEY_CHEST,                                RG_FOREST_TEMPLE_BOSS_KEY,            { Category::cVanillaBossKey },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
-    locationTable[RC_FOREST_TEMPLE_FLOORMASTER_CHEST] =                               Location::Chest(RC_FOREST_TEMPLE_FLOORMASTER_CHEST,                              RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                30786,                                             0x02, "Floormaster Chest",                           RHT_FOREST_TEMPLE_FLOORMASTER_CHEST,                             RG_FOREST_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
-    locationTable[RC_FOREST_TEMPLE_BOW_CHEST] =                                       Location::Chest(RC_FOREST_TEMPLE_BOW_CHEST,                                      RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                -20340,                                            0x0C, "Bow Chest",                                   RHT_FOREST_TEMPLE_BOW_CHEST,                                     RG_PROGRESSIVE_BOW,                   {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
-    locationTable[RC_FOREST_TEMPLE_RED_POE_CHEST] =                                   Location::Chest(RC_FOREST_TEMPLE_RED_POE_CHEST,                                  RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                30797,                                             0x0D, "Red Poe Chest",                               RHT_FOREST_TEMPLE_RED_POE_CHEST,                                 RG_FOREST_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
-    locationTable[RC_FOREST_TEMPLE_BLUE_POE_CHEST] =                                  Location::Chest(RC_FOREST_TEMPLE_BLUE_POE_CHEST,                                 RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                6159,                                              0x0F, "Blue Poe Chest",                              RHT_FOREST_TEMPLE_BLUE_POE_CHEST,                                RG_FOREST_TEMPLE_COMPASS,             { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
-    locationTable[RC_FOREST_TEMPLE_BASEMENT_CHEST] =                                  Location::Chest(RC_FOREST_TEMPLE_BASEMENT_CHEST,                                 RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                22827,                                             0x0B, "Basement Chest",                              RHT_FOREST_TEMPLE_BASEMENT_CHEST,                                RG_ARROWS_5,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_FOREST_TEMPLE_FIRST_ROOM_CHEST] =                                Location::Chest(RC_FOREST_TEMPLE_FIRST_ROOM_CHEST,                               RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                22595,                        0x03, "First Room Chest",                            RHT_FOREST_TEMPLE_FIRST_ROOM_CHEST,                              RG_FOREST_TEMPLE_SMALL_KEY,                                                                                                                                                                       true);
+    locationTable[RC_FOREST_TEMPLE_FIRST_STALFOS_CHEST] =                             Location::Chest(RC_FOREST_TEMPLE_FIRST_STALFOS_CHEST,                            RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                30784,                        0x00, "First Stalfos Chest",                         RHT_FOREST_TEMPLE_FIRST_STALFOS_CHEST,                           RG_FOREST_TEMPLE_SMALL_KEY,                                                                                                                                                                       true);
+    locationTable[RC_FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST] =                   Location::Chest(RC_FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST,                  RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                22789,                        0x05, "Raised Island Courtyard Chest",               RHT_FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST,                 RG_RECOVERY_HEART);
+    locationTable[RC_FOREST_TEMPLE_MAP_CHEST] =                                       Location::Chest(RC_FOREST_TEMPLE_MAP_CHEST,                                      RCQUEST_VANILLA, RCTYPE_MAP,                                                              ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                6177,                         0x01, "Map Chest",                                   RHT_FOREST_TEMPLE_MAP_CHEST,                                     RG_FOREST_TEMPLE_MAP,                                                                                                                                                                             true);
+    locationTable[RC_FOREST_TEMPLE_WELL_CHEST] =                                      Location::Chest(RC_FOREST_TEMPLE_WELL_CHEST,                                     RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                22601,                        0x09, "Well Chest",                                  RHT_FOREST_TEMPLE_WELL_CHEST,                                    RG_FOREST_TEMPLE_SMALL_KEY,                                                                                                                                                                       true);
+    locationTable[RC_FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST] =                      Location::Chest(RC_FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST,                     RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                22855,                        0x07, "Falling Ceiling Room Chest",                  RHT_FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST,                    RG_ARROWS_10);
+    locationTable[RC_FOREST_TEMPLE_EYE_SWITCH_CHEST] =                                Location::Chest(RC_FOREST_TEMPLE_EYE_SWITCH_CHEST,                               RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                -30364,                       0x04, "Eye Switch Chest",                            RHT_FOREST_TEMPLE_EYE_SWITCH_CHEST,                              RG_ARROWS_30);
+    locationTable[RC_FOREST_TEMPLE_BOSS_KEY_CHEST] =                                  Location::Chest(RC_FOREST_TEMPLE_BOSS_KEY_CHEST,                                 RCQUEST_VANILLA, RCTYPE_BOSS_KEY,                                                         ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                10222,                        0x0E, "Boss Key Chest",                              RHT_FOREST_TEMPLE_BOSS_KEY_CHEST,                                RG_FOREST_TEMPLE_BOSS_KEY,                                                                                                                                                                        true);
+    locationTable[RC_FOREST_TEMPLE_FLOORMASTER_CHEST] =                               Location::Chest(RC_FOREST_TEMPLE_FLOORMASTER_CHEST,                              RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                30786,                        0x02, "Floormaster Chest",                           RHT_FOREST_TEMPLE_FLOORMASTER_CHEST,                             RG_FOREST_TEMPLE_SMALL_KEY,                                                                                                                                                                       true);
+    locationTable[RC_FOREST_TEMPLE_BOW_CHEST] =                                       Location::Chest(RC_FOREST_TEMPLE_BOW_CHEST,                                      RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                -20340,                       0x0C, "Bow Chest",                                   RHT_FOREST_TEMPLE_BOW_CHEST,                                     RG_PROGRESSIVE_BOW,                                                                                                                                                                               true);
+    locationTable[RC_FOREST_TEMPLE_RED_POE_CHEST] =                                   Location::Chest(RC_FOREST_TEMPLE_RED_POE_CHEST,                                  RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                30797,                        0x0D, "Red Poe Chest",                               RHT_FOREST_TEMPLE_RED_POE_CHEST,                                 RG_FOREST_TEMPLE_SMALL_KEY,                                                                                                                                                                       true);
+    locationTable[RC_FOREST_TEMPLE_BLUE_POE_CHEST] =                                  Location::Chest(RC_FOREST_TEMPLE_BLUE_POE_CHEST,                                 RCQUEST_VANILLA, RCTYPE_COMPASS,                                                          ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                6159,                         0x0F, "Blue Poe Chest",                              RHT_FOREST_TEMPLE_BLUE_POE_CHEST,                                RG_FOREST_TEMPLE_COMPASS,                                                                                                                                                                         true);
+    locationTable[RC_FOREST_TEMPLE_BASEMENT_CHEST] =                                  Location::Chest(RC_FOREST_TEMPLE_BASEMENT_CHEST,                                 RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                22827,                        0x0B, "Basement Chest",                              RHT_FOREST_TEMPLE_BASEMENT_CHEST,                                RG_ARROWS_5);
     // Forest Temple MQ
-    locationTable[RC_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST] =                             Location::Chest(RC_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST,                            RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                -30653,                                            0x03, "MQ First Room Chest",                         RHT_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST,                           RG_FOREST_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[RC_FOREST_TEMPLE_MQ_WOLFOS_CHEST] =                                 Location::Chest(RC_FOREST_TEMPLE_MQ_WOLFOS_CHEST,                                RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                30784,                                             0x00, "MQ Wolfos Chest",                             RHT_FOREST_TEMPLE_MQ_WOLFOS_CHEST,                               RG_FOREST_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
-    locationTable[RC_FOREST_TEMPLE_MQ_BOW_CHEST] =                                    Location::Chest(RC_FOREST_TEMPLE_MQ_BOW_CHEST,                                   RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                -20340,                                            0x0C, "MQ Bow Chest",                                RHT_FOREST_TEMPLE_MQ_BOW_CHEST,                                  RG_PROGRESSIVE_BOW,                   {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
-    locationTable[RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST] =          Location::Chest(RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST,         RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                22593,                                             0x01, "MQ Raised Island Courtyard Lower Chest",      RHT_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST,        RG_FOREST_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
-    locationTable[RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST] =          Location::Chest(RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST,         RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                22597,                                             0x05, "MQ Raised Island Courtyard Upper Chest",      RHT_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST,        RG_FOREST_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
-    locationTable[RC_FOREST_TEMPLE_MQ_WELL_CHEST] =                                   Location::Chest(RC_FOREST_TEMPLE_MQ_WELL_CHEST,                                  RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                22601,                                             0x09, "MQ Well Chest",                               RHT_FOREST_TEMPLE_MQ_WELL_CHEST,                                 RG_FOREST_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
-    locationTable[RC_FOREST_TEMPLE_MQ_MAP_CHEST] =                                    Location::Chest(RC_FOREST_TEMPLE_MQ_MAP_CHEST,                                   RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                6189,                                              0x0D, "MQ Map Chest",                                RHT_FOREST_TEMPLE_MQ_MAP_CHEST,                                  RG_FOREST_TEMPLE_MAP,                 { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
-    locationTable[RC_FOREST_TEMPLE_MQ_COMPASS_CHEST] =                                Location::Chest(RC_FOREST_TEMPLE_MQ_COMPASS_CHEST,                               RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                6159,                                              0x0F, "MQ Compass Chest",                            RHT_FOREST_TEMPLE_MQ_COMPASS_CHEST,                              RG_FOREST_TEMPLE_COMPASS,             { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
-    locationTable[RC_FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST] =                   Location::Chest(RC_FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST,                  RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                -30426,                                            0x06, "MQ Falling Ceiling Room Chest",               RHT_FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST,                 RG_ARROWS_5,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[RC_FOREST_TEMPLE_MQ_BASEMENT_CHEST] =                               Location::Chest(RC_FOREST_TEMPLE_MQ_BASEMENT_CHEST,                              RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                22827,                                             0x0B, "MQ Basement Chest",                           RHT_FOREST_TEMPLE_MQ_BASEMENT_CHEST,                             RG_ARROWS_5,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[RC_FOREST_TEMPLE_MQ_REDEAD_CHEST] =                                 Location::Chest(RC_FOREST_TEMPLE_MQ_REDEAD_CHEST,                                RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                30786,                                             0x02, "MQ Redead Chest",                             RHT_FOREST_TEMPLE_MQ_REDEAD_CHEST,                               RG_FOREST_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
-    locationTable[RC_FOREST_TEMPLE_MQ_BOSS_KEY_CHEST] =                               Location::Chest(RC_FOREST_TEMPLE_MQ_BOSS_KEY_CHEST,                              RCQUEST_MQ,      RCTYPE_BOSS_KEY,                    RCAREA_FOREST_TEMPLE,                ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                10222,                                             0x0E, "MQ Boss Key Chest",                           RHT_FOREST_TEMPLE_MQ_BOSS_KEY_CHEST,                             RG_FOREST_TEMPLE_BOSS_KEY,            { Category::cVanillaBossKey },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
+    locationTable[RC_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST] =                             Location::Chest(RC_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST,                            RCQUEST_MQ,      RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                -30653,                       0x03, "MQ First Room Chest",                         RHT_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST,                           RG_FOREST_TEMPLE_SMALL_KEY);
+    locationTable[RC_FOREST_TEMPLE_MQ_WOLFOS_CHEST] =                                 Location::Chest(RC_FOREST_TEMPLE_MQ_WOLFOS_CHEST,                                RCQUEST_MQ,      RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                30784,                        0x00, "MQ Wolfos Chest",                             RHT_FOREST_TEMPLE_MQ_WOLFOS_CHEST,                               RG_FOREST_TEMPLE_SMALL_KEY,                                                                                                                                                                       true);
+    locationTable[RC_FOREST_TEMPLE_MQ_BOW_CHEST] =                                    Location::Chest(RC_FOREST_TEMPLE_MQ_BOW_CHEST,                                   RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                -20340,                       0x0C, "MQ Bow Chest",                                RHT_FOREST_TEMPLE_MQ_BOW_CHEST,                                  RG_PROGRESSIVE_BOW,                                                                                                                                                                               true);
+    locationTable[RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST] =          Location::Chest(RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST,         RCQUEST_MQ,      RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                22593,                        0x01, "MQ Raised Island Courtyard Lower Chest",      RHT_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST,        RG_FOREST_TEMPLE_SMALL_KEY,                                                                                                                                                                       true);
+    locationTable[RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST] =          Location::Chest(RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST,         RCQUEST_MQ,      RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                22597,                        0x05, "MQ Raised Island Courtyard Upper Chest",      RHT_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST,        RG_FOREST_TEMPLE_SMALL_KEY,                                                                                                                                                                       true);
+    locationTable[RC_FOREST_TEMPLE_MQ_WELL_CHEST] =                                   Location::Chest(RC_FOREST_TEMPLE_MQ_WELL_CHEST,                                  RCQUEST_MQ,      RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                22601,                        0x09, "MQ Well Chest",                               RHT_FOREST_TEMPLE_MQ_WELL_CHEST,                                 RG_FOREST_TEMPLE_SMALL_KEY,                                                                                                                                                                       true);
+    locationTable[RC_FOREST_TEMPLE_MQ_MAP_CHEST] =                                    Location::Chest(RC_FOREST_TEMPLE_MQ_MAP_CHEST,                                   RCQUEST_MQ,      RCTYPE_MAP,                                                              ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                6189,                         0x0D, "MQ Map Chest",                                RHT_FOREST_TEMPLE_MQ_MAP_CHEST,                                  RG_FOREST_TEMPLE_MAP,                                                                                                                                                                             true);
+    locationTable[RC_FOREST_TEMPLE_MQ_COMPASS_CHEST] =                                Location::Chest(RC_FOREST_TEMPLE_MQ_COMPASS_CHEST,                               RCQUEST_MQ,      RCTYPE_COMPASS,                                                          ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                6159,                         0x0F, "MQ Compass Chest",                            RHT_FOREST_TEMPLE_MQ_COMPASS_CHEST,                              RG_FOREST_TEMPLE_COMPASS,                                                                                                                                                                         true);
+    locationTable[RC_FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST] =                   Location::Chest(RC_FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST,                  RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                -30426,                       0x06, "MQ Falling Ceiling Room Chest",               RHT_FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST,                 RG_ARROWS_5);
+    locationTable[RC_FOREST_TEMPLE_MQ_BASEMENT_CHEST] =                               Location::Chest(RC_FOREST_TEMPLE_MQ_BASEMENT_CHEST,                              RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                22827,                        0x0B, "MQ Basement Chest",                           RHT_FOREST_TEMPLE_MQ_BASEMENT_CHEST,                             RG_ARROWS_5);
+    locationTable[RC_FOREST_TEMPLE_MQ_REDEAD_CHEST] =                                 Location::Chest(RC_FOREST_TEMPLE_MQ_REDEAD_CHEST,                                RCQUEST_MQ,      RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                30786,                        0x02, "MQ Redead Chest",                             RHT_FOREST_TEMPLE_MQ_REDEAD_CHEST,                               RG_FOREST_TEMPLE_SMALL_KEY,                                                                                                                                                                       true);
+    locationTable[RC_FOREST_TEMPLE_MQ_BOSS_KEY_CHEST] =                               Location::Chest(RC_FOREST_TEMPLE_MQ_BOSS_KEY_CHEST,                              RCQUEST_MQ,      RCTYPE_BOSS_KEY,                                                         ACTOR_EN_BOX,         SCENE_FOREST_TEMPLE,                10222,                        0x0E, "MQ Boss Key Chest",                           RHT_FOREST_TEMPLE_MQ_BOSS_KEY_CHEST,                             RG_FOREST_TEMPLE_BOSS_KEY,                                                                                                                                                                        true);
 
     // Fire Temple Vanilla
-    locationTable[RC_FIRE_TEMPLE_NEAR_BOSS_CHEST] =                                   Location::Chest(RC_FIRE_TEMPLE_NEAR_BOSS_CHEST,                                  RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22593,                                             0x01, "Near Boss Chest",                             RHT_FIRE_TEMPLE_NEAR_BOSS_CHEST,                                 RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
-    locationTable[RC_FIRE_TEMPLE_FLARE_DANCER_CHEST] =                                Location::Chest(RC_FIRE_TEMPLE_FLARE_DANCER_CHEST,                               RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  31936,                                             0x00, "Flare Dancer Chest",                          RHT_FIRE_TEMPLE_FLARE_DANCER_CHEST,                              RG_BOMBS_10,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[RC_FIRE_TEMPLE_BOSS_KEY_CHEST] =                                    Location::Chest(RC_FIRE_TEMPLE_BOSS_KEY_CHEST,                                   RCQUEST_VANILLA, RCTYPE_BOSS_KEY,                    RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  10220,                                             0x0C, "Boss Key Chest",                              RHT_FIRE_TEMPLE_BOSS_KEY_CHEST,                                  RG_FIRE_TEMPLE_BOSS_KEY,              { Category::cVanillaBossKey },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
-    locationTable[RC_FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST] =                  Location::Chest(RC_FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST,                 RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22594,                                             0x02, "Big Lava Room Blocked Door Chest",            RHT_FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST,                RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
-    locationTable[RC_FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST] =               Location::Chest(RC_FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST,              RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22596,                                             0x04, "Big Lava Room Lower Open Door Chest",         RHT_FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST,             RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
-    locationTable[RC_FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST] =                          Location::Chest(RC_FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST,                         RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22595,                                             0x03, "Boulder Maze Lower Chest",                    RHT_FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST,                        RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
-    locationTable[RC_FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST] =                          Location::Chest(RC_FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST,                         RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22598,                                             0x06, "Boulder Maze Upper Chest",                    RHT_FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST,                        RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
-    locationTable[RC_FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST] =                      Location::Chest(RC_FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST,                     RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22600,                                             0x08, "Boulder Maze Side Room Chest",                RHT_FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST,                    RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
-    locationTable[RC_FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST] =                       Location::Chest(RC_FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST,                      RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22603,                                             0x0B, "Boulder Maze Shortcut Chest",                 RHT_FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST,                     RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
-    locationTable[RC_FIRE_TEMPLE_SCARECROW_CHEST] =                                   Location::Chest(RC_FIRE_TEMPLE_SCARECROW_CHEST,                                  RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  23245,                                             0x0D, "Scarecrow Chest",                             RHT_FIRE_TEMPLE_SCARECROW_CHEST,                                 RG_HUGE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[RC_FIRE_TEMPLE_MAP_CHEST] =                                         Location::Chest(RC_FIRE_TEMPLE_MAP_CHEST,                                        RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  2090,                                              0x0A, "Map Chest",                                   RHT_FIRE_TEMPLE_MAP_CHEST,                                       RG_FIRE_TEMPLE_MAP,                   { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
-    locationTable[RC_FIRE_TEMPLE_COMPASS_CHEST] =                                     Location::Chest(RC_FIRE_TEMPLE_COMPASS_CHEST,                                    RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  2055,                                              0x07, "Compass Chest",                               RHT_FIRE_TEMPLE_COMPASS_CHEST,                                   RG_FIRE_TEMPLE_COMPASS,               { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
-    locationTable[RC_FIRE_TEMPLE_HIGHEST_GORON_CHEST] =                               Location::Chest(RC_FIRE_TEMPLE_HIGHEST_GORON_CHEST,                              RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22601,                                             0x09, "Highest Goron Chest",                         RHT_FIRE_TEMPLE_HIGHEST_GORON_CHEST,                             RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
-    locationTable[RC_FIRE_TEMPLE_MEGATON_HAMMER_CHEST] =                              Location::Chest(RC_FIRE_TEMPLE_MEGATON_HAMMER_CHEST,                             RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  421,                                               0x05, "Megaton Hammer Chest",                        RHT_FIRE_TEMPLE_MEGATON_HAMMER_CHEST,                            RG_MEGATON_HAMMER,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_FIRE_TEMPLE_NEAR_BOSS_CHEST] =                                   Location::Chest(RC_FIRE_TEMPLE_NEAR_BOSS_CHEST,                                  RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22593,                        0x01, "Near Boss Chest",                             RHT_FIRE_TEMPLE_NEAR_BOSS_CHEST,                                 RG_FIRE_TEMPLE_SMALL_KEY,                                                                                                                                                                         true);
+    locationTable[RC_FIRE_TEMPLE_FLARE_DANCER_CHEST] =                                Location::Chest(RC_FIRE_TEMPLE_FLARE_DANCER_CHEST,                               RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  31936,                        0x00, "Flare Dancer Chest",                          RHT_FIRE_TEMPLE_FLARE_DANCER_CHEST,                              RG_BOMBS_10);
+    locationTable[RC_FIRE_TEMPLE_BOSS_KEY_CHEST] =                                    Location::Chest(RC_FIRE_TEMPLE_BOSS_KEY_CHEST,                                   RCQUEST_VANILLA, RCTYPE_BOSS_KEY,                                                         ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  10220,                        0x0C, "Boss Key Chest",                              RHT_FIRE_TEMPLE_BOSS_KEY_CHEST,                                  RG_FIRE_TEMPLE_BOSS_KEY,                                                                                                                                                                          true);
+    locationTable[RC_FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST] =                  Location::Chest(RC_FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST,                 RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22594,                        0x02, "Big Lava Room Blocked Door Chest",            RHT_FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST,                RG_FIRE_TEMPLE_SMALL_KEY,                                                                                                                                                                         true);
+    locationTable[RC_FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST] =               Location::Chest(RC_FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST,              RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22596,                        0x04, "Big Lava Room Lower Open Door Chest",         RHT_FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST,             RG_FIRE_TEMPLE_SMALL_KEY,                                                                                                                                                                         true);
+    locationTable[RC_FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST] =                          Location::Chest(RC_FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST,                         RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22595,                        0x03, "Boulder Maze Lower Chest",                    RHT_FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST,                        RG_FIRE_TEMPLE_SMALL_KEY,                                                                                                                                                                         true);
+    locationTable[RC_FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST] =                          Location::Chest(RC_FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST,                         RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22598,                        0x06, "Boulder Maze Upper Chest",                    RHT_FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST,                        RG_FIRE_TEMPLE_SMALL_KEY,                                                                                                                                                                         true);
+    locationTable[RC_FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST] =                      Location::Chest(RC_FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST,                     RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22600,                        0x08, "Boulder Maze Side Room Chest",                RHT_FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST,                    RG_FIRE_TEMPLE_SMALL_KEY,                                                                                                                                                                         true);
+    locationTable[RC_FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST] =                       Location::Chest(RC_FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST,                      RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22603,                        0x0B, "Boulder Maze Shortcut Chest",                 RHT_FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST,                     RG_FIRE_TEMPLE_SMALL_KEY,                                                                                                                                                                         true);
+    locationTable[RC_FIRE_TEMPLE_SCARECROW_CHEST] =                                   Location::Chest(RC_FIRE_TEMPLE_SCARECROW_CHEST,                                  RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  23245,                        0x0D, "Scarecrow Chest",                             RHT_FIRE_TEMPLE_SCARECROW_CHEST,                                 RG_HUGE_RUPEE);
+    locationTable[RC_FIRE_TEMPLE_MAP_CHEST] =                                         Location::Chest(RC_FIRE_TEMPLE_MAP_CHEST,                                        RCQUEST_VANILLA, RCTYPE_MAP,                                                              ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  2090,                         0x0A, "Map Chest",                                   RHT_FIRE_TEMPLE_MAP_CHEST,                                       RG_FIRE_TEMPLE_MAP,                                                                                                                                                                               true);
+    locationTable[RC_FIRE_TEMPLE_COMPASS_CHEST] =                                     Location::Chest(RC_FIRE_TEMPLE_COMPASS_CHEST,                                    RCQUEST_VANILLA, RCTYPE_COMPASS,                                                          ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  2055,                         0x07, "Compass Chest",                               RHT_FIRE_TEMPLE_COMPASS_CHEST,                                   RG_FIRE_TEMPLE_COMPASS,                                                                                                                                                                           true);
+    locationTable[RC_FIRE_TEMPLE_HIGHEST_GORON_CHEST] =                               Location::Chest(RC_FIRE_TEMPLE_HIGHEST_GORON_CHEST,                              RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22601,                        0x09, "Highest Goron Chest",                         RHT_FIRE_TEMPLE_HIGHEST_GORON_CHEST,                             RG_FIRE_TEMPLE_SMALL_KEY,                                                                                                                                                                         true);
+    locationTable[RC_FIRE_TEMPLE_MEGATON_HAMMER_CHEST] =                              Location::Chest(RC_FIRE_TEMPLE_MEGATON_HAMMER_CHEST,                             RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  421,                          0x05, "Megaton Hammer Chest",                        RHT_FIRE_TEMPLE_MEGATON_HAMMER_CHEST,                            RG_MEGATON_HAMMER,                                                                                                                                                                                true);
     // Fire Temple MQ
-    locationTable[RC_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST] =                                Location::Chest(RC_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST,                               RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22599,                                             0x07, "MQ Near Boss Chest",                          RHT_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST,                              RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
-    locationTable[RC_FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST] =                           Location::Chest(RC_FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST,                          RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  4512,                                              0x00, "MQ Megaton Hammer Chest",                     RHT_FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST,                         RG_MEGATON_HAMMER,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
-    locationTable[RC_FIRE_TEMPLE_MQ_COMPASS_CHEST] =                                  Location::Chest(RC_FIRE_TEMPLE_MQ_COMPASS_CHEST,                                 RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  2059,                                              0x0B, "MQ Compass Chest",                            RHT_FIRE_TEMPLE_MQ_COMPASS_CHEST,                                RG_FIRE_TEMPLE_COMPASS,               { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
-    locationTable[RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST] =                      Location::Chest(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST,                     RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  23747,                                             0x03, "MQ Lizalfos Maze Lower Chest",                RHT_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST,                    RG_BOMBS_10,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST] =                      Location::Chest(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST,                     RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  23782,                                             0x06, "MQ Lizalfos Maze Upper Chest",                RHT_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST,                    RG_BOMBS_10,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[RC_FIRE_TEMPLE_MQ_CHEST_ON_FIRE] =                                  Location::Chest(RC_FIRE_TEMPLE_MQ_CHEST_ON_FIRE,                                 RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22597,                                             0x05, "MQ Chest on Fire",                            RHT_FIRE_TEMPLE_MQ_CHEST_ON_FIRE,                                RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
-    locationTable[RC_FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST] =                            Location::Chest(RC_FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST,                           RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  30018,                                             0x02, "MQ Map Room Side Chest",                      RHT_FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST,                          RG_HYLIAN_SHIELD,                     {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[RC_FIRE_TEMPLE_MQ_MAP_CHEST] =                                      Location::Chest(RC_FIRE_TEMPLE_MQ_MAP_CHEST,                                     RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  2092,                                              0x0C, "MQ Map Chest",                                RHT_FIRE_TEMPLE_MQ_MAP_CHEST,                                    RG_FIRE_TEMPLE_MAP,                   { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
-    locationTable[RC_FIRE_TEMPLE_MQ_BOSS_KEY_CHEST] =                                 Location::Chest(RC_FIRE_TEMPLE_MQ_BOSS_KEY_CHEST,                                RCQUEST_MQ,      RCTYPE_BOSS_KEY,                    RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  10212,                                             0x04, "MQ Boss Key Chest",                           RHT_FIRE_TEMPLE_MQ_BOSS_KEY_CHEST,                               RG_FIRE_TEMPLE_BOSS_KEY,              { Category::cVanillaBossKey },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
-    locationTable[RC_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST] =               Location::Chest(RC_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST,              RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22593,                                             0x01, "MQ Big Lava Room Blocked Door Chest",         RHT_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST,             RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
-    locationTable[RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST] =                  Location::Chest(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST,                 RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22600,                                             0x08, "MQ Lizalfos Maze Side Room Chest",            RHT_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST,                RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
-    locationTable[RC_FIRE_TEMPLE_MQ_FREESTANDING_KEY] =                         Location::Collectable(RC_FIRE_TEMPLE_MQ_FREESTANDING_KEY,                              RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_FIRE_TEMPLE,                  ACTOR_EN_ITEM00,      SCENE_FIRE_TEMPLE,                  7185,                                              0x1C, "MQ Freestanding Key",                         RHT_FIRE_TEMPLE_MQ_FREESTANDING_KEY,                             RG_FIRE_TEMPLE_SMALL_KEY,             { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
+    locationTable[RC_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST] =                                Location::Chest(RC_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST,                               RCQUEST_MQ,      RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22599,                        0x07, "MQ Near Boss Chest",                          RHT_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST,                              RG_FIRE_TEMPLE_SMALL_KEY,                                                                                                                                                                         true);
+    locationTable[RC_FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST] =                           Location::Chest(RC_FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST,                          RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  4512,                         0x00, "MQ Megaton Hammer Chest",                     RHT_FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST,                         RG_MEGATON_HAMMER,                                                                                                                                                                                true);
+    locationTable[RC_FIRE_TEMPLE_MQ_COMPASS_CHEST] =                                  Location::Chest(RC_FIRE_TEMPLE_MQ_COMPASS_CHEST,                                 RCQUEST_MQ,      RCTYPE_COMPASS,                                                          ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  2059,                         0x0B, "MQ Compass Chest",                            RHT_FIRE_TEMPLE_MQ_COMPASS_CHEST,                                RG_FIRE_TEMPLE_COMPASS,                                                                                                                                                                           true);
+    locationTable[RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST] =                      Location::Chest(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST,                     RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  23747,                        0x03, "MQ Lizalfos Maze Lower Chest",                RHT_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST,                    RG_BOMBS_10);
+    locationTable[RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST] =                      Location::Chest(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST,                     RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  23782,                        0x06, "MQ Lizalfos Maze Upper Chest",                RHT_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST,                    RG_BOMBS_10);
+    locationTable[RC_FIRE_TEMPLE_MQ_CHEST_ON_FIRE] =                                  Location::Chest(RC_FIRE_TEMPLE_MQ_CHEST_ON_FIRE,                                 RCQUEST_MQ,      RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22597,                        0x05, "MQ Chest on Fire",                            RHT_FIRE_TEMPLE_MQ_CHEST_ON_FIRE,                                RG_FIRE_TEMPLE_SMALL_KEY,                                                                                                                                                                         true);
+    locationTable[RC_FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST] =                            Location::Chest(RC_FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST,                           RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  30018,                        0x02, "MQ Map Room Side Chest",                      RHT_FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST,                          RG_HYLIAN_SHIELD);
+    locationTable[RC_FIRE_TEMPLE_MQ_MAP_CHEST] =                                      Location::Chest(RC_FIRE_TEMPLE_MQ_MAP_CHEST,                                     RCQUEST_MQ,      RCTYPE_MAP,                                                              ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  2092,                         0x0C, "MQ Map Chest",                                RHT_FIRE_TEMPLE_MQ_MAP_CHEST,                                    RG_FIRE_TEMPLE_MAP,                                                                                                                                                                               true);
+    locationTable[RC_FIRE_TEMPLE_MQ_BOSS_KEY_CHEST] =                                 Location::Chest(RC_FIRE_TEMPLE_MQ_BOSS_KEY_CHEST,                                RCQUEST_MQ,      RCTYPE_BOSS_KEY,                                                         ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  10212,                        0x04, "MQ Boss Key Chest",                           RHT_FIRE_TEMPLE_MQ_BOSS_KEY_CHEST,                               RG_FIRE_TEMPLE_BOSS_KEY,                                                                                                                                                                          true);
+    locationTable[RC_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST] =               Location::Chest(RC_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST,              RCQUEST_MQ,      RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22593,                        0x01, "MQ Big Lava Room Blocked Door Chest",         RHT_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST,             RG_FIRE_TEMPLE_SMALL_KEY,                                                                                                                                                                         true);
+    locationTable[RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST] =                  Location::Chest(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST,                 RCQUEST_MQ,      RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_FIRE_TEMPLE,                  22600,                        0x08, "MQ Lizalfos Maze Side Room Chest",            RHT_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST,                RG_FIRE_TEMPLE_SMALL_KEY,                                                                                                                                                                         true);
+    locationTable[RC_FIRE_TEMPLE_MQ_FREESTANDING_KEY] =                         Location::Collectable(RC_FIRE_TEMPLE_MQ_FREESTANDING_KEY,                              RCQUEST_MQ,      RCTYPE_SMALL_KEY,                                                        ACTOR_EN_ITEM00,      SCENE_FIRE_TEMPLE,                  7185,                         0x1C, "MQ Freestanding Key",                         RHT_FIRE_TEMPLE_MQ_FREESTANDING_KEY,                             RG_FIRE_TEMPLE_SMALL_KEY,                                                                                                                                                                         true);
 
     // Water Temple Vanilla
-    locationTable[RC_WATER_TEMPLE_MAP_CHEST] =                                        Location::Chest(RC_WATER_TEMPLE_MAP_CHEST,                                       RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 6178,                                              0x02, "Map Chest",                                   RHT_WATER_TEMPLE_MAP_CHEST,                                      RG_WATER_TEMPLE_MAP,                  { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
-    locationTable[RC_WATER_TEMPLE_COMPASS_CHEST] =                                    Location::Chest(RC_WATER_TEMPLE_COMPASS_CHEST,                                   RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 2057,                                              0x09, "Compass Chest",                               RHT_WATER_TEMPLE_COMPASS_CHEST,                                  RG_WATER_TEMPLE_COMPASS,              { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
-    locationTable[RC_WATER_TEMPLE_TORCHES_CHEST] =                                    Location::Chest(RC_WATER_TEMPLE_TORCHES_CHEST,                                   RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 30785,                                             0x01, "Torches Chest",                               RHT_WATER_TEMPLE_TORCHES_CHEST,                                  RG_WATER_TEMPLE_SMALL_KEY,            { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
-    locationTable[RC_WATER_TEMPLE_DRAGON_CHEST] =                                     Location::Chest(RC_WATER_TEMPLE_DRAGON_CHEST,                                    RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 22602,                                             0x0A, "Dragon Chest",                                RHT_WATER_TEMPLE_DRAGON_CHEST,                                   RG_WATER_TEMPLE_SMALL_KEY,            { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
-    locationTable[RC_WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST] =                         Location::Chest(RC_WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST,                        RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 22600,                                             0x08, "Central Bow Target Chest",                    RHT_WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST,                       RG_WATER_TEMPLE_SMALL_KEY,            { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
-    locationTable[RC_WATER_TEMPLE_CENTRAL_PILLAR_CHEST] =                             Location::Chest(RC_WATER_TEMPLE_CENTRAL_PILLAR_CHEST,                            RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 22598,                                             0x06, "Central Pillar Chest",                        RHT_WATER_TEMPLE_CENTRAL_PILLAR_CHEST,                           RG_WATER_TEMPLE_SMALL_KEY,            { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
-    locationTable[RC_WATER_TEMPLE_CRACKED_WALL_CHEST] =                               Location::Chest(RC_WATER_TEMPLE_CRACKED_WALL_CHEST,                              RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 22592,                                             0x00, "Cracked Wall Chest",                          RHT_WATER_TEMPLE_CRACKED_WALL_CHEST,                             RG_WATER_TEMPLE_SMALL_KEY,            { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
-    locationTable[RC_WATER_TEMPLE_BOSS_KEY_CHEST] =                                   Location::Chest(RC_WATER_TEMPLE_BOSS_KEY_CHEST,                                  RCQUEST_VANILLA, RCTYPE_BOSS_KEY,                    RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 10213,                                             0x05, "Boss Key Chest",                              RHT_WATER_TEMPLE_BOSS_KEY_CHEST,                                 RG_WATER_TEMPLE_BOSS_KEY,             { Category::cVanillaBossKey },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
-    locationTable[RC_WATER_TEMPLE_LONGSHOT_CHEST] =                                   Location::Chest(RC_WATER_TEMPLE_LONGSHOT_CHEST,                                  RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 295,                                               0x07, "Longshot Chest",                              RHT_WATER_TEMPLE_LONGSHOT_CHEST,                                 RG_PROGRESSIVE_HOOKSHOT,              {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
-    locationTable[RC_WATER_TEMPLE_RIVER_CHEST] =                                      Location::Chest(RC_WATER_TEMPLE_RIVER_CHEST,                                     RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 22595,                                             0x03, "River Chest",                                 RHT_WATER_TEMPLE_RIVER_CHEST,                                    RG_WATER_TEMPLE_SMALL_KEY,            { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
+    locationTable[RC_WATER_TEMPLE_MAP_CHEST] =                                        Location::Chest(RC_WATER_TEMPLE_MAP_CHEST,                                       RCQUEST_VANILLA, RCTYPE_MAP,                                                              ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 6178,                         0x02, "Map Chest",                                   RHT_WATER_TEMPLE_MAP_CHEST,                                      RG_WATER_TEMPLE_MAP,                                                                                                                                                                              true);
+    locationTable[RC_WATER_TEMPLE_COMPASS_CHEST] =                                    Location::Chest(RC_WATER_TEMPLE_COMPASS_CHEST,                                   RCQUEST_VANILLA, RCTYPE_COMPASS,                                                          ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 2057,                         0x09, "Compass Chest",                               RHT_WATER_TEMPLE_COMPASS_CHEST,                                  RG_WATER_TEMPLE_COMPASS,                                                                                                                                                                          true);
+    locationTable[RC_WATER_TEMPLE_TORCHES_CHEST] =                                    Location::Chest(RC_WATER_TEMPLE_TORCHES_CHEST,                                   RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 30785,                        0x01, "Torches Chest",                               RHT_WATER_TEMPLE_TORCHES_CHEST,                                  RG_WATER_TEMPLE_SMALL_KEY,                                                                                                                                                                        true);
+    locationTable[RC_WATER_TEMPLE_DRAGON_CHEST] =                                     Location::Chest(RC_WATER_TEMPLE_DRAGON_CHEST,                                    RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 22602,                        0x0A, "Dragon Chest",                                RHT_WATER_TEMPLE_DRAGON_CHEST,                                   RG_WATER_TEMPLE_SMALL_KEY,                                                                                                                                                                        true);
+    locationTable[RC_WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST] =                         Location::Chest(RC_WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST,                        RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 22600,                        0x08, "Central Bow Target Chest",                    RHT_WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST,                       RG_WATER_TEMPLE_SMALL_KEY,                                                                                                                                                                        true);
+    locationTable[RC_WATER_TEMPLE_CENTRAL_PILLAR_CHEST] =                             Location::Chest(RC_WATER_TEMPLE_CENTRAL_PILLAR_CHEST,                            RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 22598,                        0x06, "Central Pillar Chest",                        RHT_WATER_TEMPLE_CENTRAL_PILLAR_CHEST,                           RG_WATER_TEMPLE_SMALL_KEY,                                                                                                                                                                        true);
+    locationTable[RC_WATER_TEMPLE_CRACKED_WALL_CHEST] =                               Location::Chest(RC_WATER_TEMPLE_CRACKED_WALL_CHEST,                              RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 22592,                        0x00, "Cracked Wall Chest",                          RHT_WATER_TEMPLE_CRACKED_WALL_CHEST,                             RG_WATER_TEMPLE_SMALL_KEY,                                                                                                                                                                        true);
+    locationTable[RC_WATER_TEMPLE_BOSS_KEY_CHEST] =                                   Location::Chest(RC_WATER_TEMPLE_BOSS_KEY_CHEST,                                  RCQUEST_VANILLA, RCTYPE_BOSS_KEY,                                                         ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 10213,                        0x05, "Boss Key Chest",                              RHT_WATER_TEMPLE_BOSS_KEY_CHEST,                                 RG_WATER_TEMPLE_BOSS_KEY,                                                                                                                                                                         true);
+    locationTable[RC_WATER_TEMPLE_LONGSHOT_CHEST] =                                   Location::Chest(RC_WATER_TEMPLE_LONGSHOT_CHEST,                                  RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 295,                          0x07, "Longshot Chest",                              RHT_WATER_TEMPLE_LONGSHOT_CHEST,                                 RG_PROGRESSIVE_HOOKSHOT,                                                                                                                                                                          true);
+    locationTable[RC_WATER_TEMPLE_RIVER_CHEST] =                                      Location::Chest(RC_WATER_TEMPLE_RIVER_CHEST,                                     RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 22595,                        0x03, "River Chest",                                 RHT_WATER_TEMPLE_RIVER_CHEST,                                    RG_WATER_TEMPLE_SMALL_KEY,                                                                                                                                                                        true);
     // Water Temple MQ
-    locationTable[RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST] =                          Location::Chest(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST,                         RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 -30650,                                            0x06, "MQ Central Pillar Chest",                     RHT_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST,                        RG_WATER_TEMPLE_SMALL_KEY,            { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
-    locationTable[RC_WATER_TEMPLE_MQ_BOSS_KEY_CHEST] =                                Location::Chest(RC_WATER_TEMPLE_MQ_BOSS_KEY_CHEST,                               RCQUEST_MQ,      RCTYPE_BOSS_KEY,                    RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 10213,                                             0x05, "MQ Boss Key Chest",                           RHT_WATER_TEMPLE_MQ_BOSS_KEY_CHEST,                              RG_WATER_TEMPLE_BOSS_KEY,             { Category::cVanillaBossKey },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
-    locationTable[RC_WATER_TEMPLE_MQ_LONGSHOT_CHEST] =                                Location::Chest(RC_WATER_TEMPLE_MQ_LONGSHOT_CHEST,                               RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 -20192,                                            0x00, "MQ Longshot Chest",                           RHT_WATER_TEMPLE_MQ_LONGSHOT_CHEST,                              RG_PROGRESSIVE_HOOKSHOT,              {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
-    locationTable[RC_WATER_TEMPLE_MQ_COMPASS_CHEST] =                                 Location::Chest(RC_WATER_TEMPLE_MQ_COMPASS_CHEST,                                RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 6145,                                              0x01, "MQ Compass Chest",                            RHT_WATER_TEMPLE_MQ_COMPASS_CHEST,                               RG_WATER_TEMPLE_COMPASS,              { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
-    locationTable[RC_WATER_TEMPLE_MQ_MAP_CHEST] =                                     Location::Chest(RC_WATER_TEMPLE_MQ_MAP_CHEST,                                    RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_WATER_TEMPLE,                 ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 -18398,                                            0x02, "MQ Map Chest",                                RHT_WATER_TEMPLE_MQ_MAP_CHEST,                                   RG_WATER_TEMPLE_MAP,                  { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
-    locationTable[RC_WATER_TEMPLE_MQ_FREESTANDING_KEY] =                        Location::Collectable(RC_WATER_TEMPLE_MQ_FREESTANDING_KEY,                             RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_WATER_TEMPLE,                 ACTOR_EN_ITEM00,      SCENE_WATER_TEMPLE,                 273,                                               0x01, "MQ Freestanding Key",                         RHT_WATER_TEMPLE_MQ_FREESTANDING_KEY,                            RG_WATER_TEMPLE_SMALL_KEY,            { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
+    locationTable[RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST] =                          Location::Chest(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST,                         RCQUEST_MQ,      RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 -30650,                       0x06, "MQ Central Pillar Chest",                     RHT_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST,                        RG_WATER_TEMPLE_SMALL_KEY,                                                                                                                                                                        true);
+    locationTable[RC_WATER_TEMPLE_MQ_BOSS_KEY_CHEST] =                                Location::Chest(RC_WATER_TEMPLE_MQ_BOSS_KEY_CHEST,                               RCQUEST_MQ,      RCTYPE_BOSS_KEY,                                                         ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 10213,                        0x05, "MQ Boss Key Chest",                           RHT_WATER_TEMPLE_MQ_BOSS_KEY_CHEST,                              RG_WATER_TEMPLE_BOSS_KEY,                                                                                                                                                                         true);
+    locationTable[RC_WATER_TEMPLE_MQ_LONGSHOT_CHEST] =                                Location::Chest(RC_WATER_TEMPLE_MQ_LONGSHOT_CHEST,                               RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 -20192,                       0x00, "MQ Longshot Chest",                           RHT_WATER_TEMPLE_MQ_LONGSHOT_CHEST,                              RG_PROGRESSIVE_HOOKSHOT,                                                                                                                                                                          true);
+    locationTable[RC_WATER_TEMPLE_MQ_COMPASS_CHEST] =                                 Location::Chest(RC_WATER_TEMPLE_MQ_COMPASS_CHEST,                                RCQUEST_MQ,      RCTYPE_COMPASS,                                                          ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 6145,                         0x01, "MQ Compass Chest",                            RHT_WATER_TEMPLE_MQ_COMPASS_CHEST,                               RG_WATER_TEMPLE_COMPASS,                                                                                                                                                                          true);
+    locationTable[RC_WATER_TEMPLE_MQ_MAP_CHEST] =                                     Location::Chest(RC_WATER_TEMPLE_MQ_MAP_CHEST,                                    RCQUEST_MQ,      RCTYPE_MAP,                                                              ACTOR_EN_BOX,         SCENE_WATER_TEMPLE,                 -18398,                       0x02, "MQ Map Chest",                                RHT_WATER_TEMPLE_MQ_MAP_CHEST,                                   RG_WATER_TEMPLE_MAP,                                                                                                                                                                              true);
+    locationTable[RC_WATER_TEMPLE_MQ_FREESTANDING_KEY] =                        Location::Collectable(RC_WATER_TEMPLE_MQ_FREESTANDING_KEY,                             RCQUEST_MQ,      RCTYPE_SMALL_KEY,                                                        ACTOR_EN_ITEM00,      SCENE_WATER_TEMPLE,                 273,                          0x01, "MQ Freestanding Key",                         RHT_WATER_TEMPLE_MQ_FREESTANDING_KEY,                            RG_WATER_TEMPLE_SMALL_KEY,                                                                                                                                                                        true);
 
     // Spirit Temple Shared
-    locationTable[RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST] =                          Location::Chest(RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST,                         RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_DESERT_COLOSSUS,              1707,                                              0x0B, "Silver Gauntlets Chest",                      RHT_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST,                        RG_PROGRESSIVE_STRENGTH,              {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
-    locationTable[RC_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST] =                             Location::Chest(RC_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST,                            RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_DESERT_COLOSSUS,              13673,                                             0x09, "Mirror Shield Chest",                         RHT_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST,                           RG_MIRROR_SHIELD,                     {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST] =                          Location::Chest(RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST,                         RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_DESERT_COLOSSUS,              1707,                         0x0B, "Silver Gauntlets Chest",                      RHT_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST,                        RG_PROGRESSIVE_STRENGTH,                                                                                                                                                                          true);
+    locationTable[RC_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST] =                             Location::Chest(RC_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST,                            RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_DESERT_COLOSSUS,              13673,                        0x09, "Mirror Shield Chest",                         RHT_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST,                           RG_MIRROR_SHIELD,                                                                                                                                                                                 true);
     // Spirit Temple Vanilla
-    locationTable[RC_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST] =                              Location::Chest(RC_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST,                             RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                21800,                                             0x08, "Child Bridge Chest",                          RHT_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST,                            RG_DEKU_SHIELD,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST] =                       Location::Chest(RC_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST,                      RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30656,                                            0x00, "Child Early Torches Chest",                   RHT_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST,                     RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
-    locationTable[RC_SPIRIT_TEMPLE_COMPASS_CHEST] =                                   Location::Chest(RC_SPIRIT_TEMPLE_COMPASS_CHEST,                                  RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                14340,                                             0x04, "Compass Chest",                               RHT_SPIRIT_TEMPLE_COMPASS_CHEST,                                 RG_SPIRIT_TEMPLE_COMPASS,             { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
-    locationTable[RC_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST] =                         Location::Chest(RC_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST,                        RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                22599,                                             0x07, "Early Adult Right Chest",                     RHT_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST,                       RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
-    locationTable[RC_SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST] =                         Location::Chest(RC_SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST,                        RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30451,                                            0x0D, "First Mirror Left Chest",                     RHT_SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST,                       RG_ICE_TRAP,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST] =                        Location::Chest(RC_SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST,                       RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -28786,                                            0x0E, "First Mirror Right Chest",                    RHT_SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST,                      RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MAP_CHEST] =                                       Location::Chest(RC_SPIRIT_TEMPLE_MAP_CHEST,                                      RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -18397,                                            0x03, "Map Chest",                                   RHT_SPIRIT_TEMPLE_MAP_CHEST,                                     RG_SPIRIT_TEMPLE_MAP,                 { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
-    locationTable[RC_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST] =                         Location::Chest(RC_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST,                        RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -32666,                                            0x06, "Child Climb North Chest",                     RHT_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST,                       RG_BOMBCHU_10,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST] =                          Location::Chest(RC_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST,                         RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -31444,                                            0x0C, "Child Climb East Chest",                      RHT_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST,                        RG_DEKU_SHIELD,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST] =                            Location::Chest(RC_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST,                           RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30655,                                            0x01, "Sun Block Room Chest",                        RHT_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST,                          RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
-    locationTable[RC_SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST] =                          Location::Chest(RC_SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST,                         RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30654,                                            0x02, "Statue Room Hand Chest",                      RHT_SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST,                        RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
-    locationTable[RC_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST] =                     Location::Chest(RC_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST,                    RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30577,                                            0x0F, "Statue Room Northeast Chest",                 RHT_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST,                   RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST] =                           Location::Chest(RC_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST,                          RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                22597,                                             0x05, "Near Four Armos Chest",                       RHT_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST,                         RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
-    locationTable[RC_SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST] =                   Location::Chest(RC_SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST,                  RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                26900,                                             0x14, "Hallway Right Invisible Chest",               RHT_SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST,                 RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST] =                    Location::Chest(RC_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST,                   RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                26901,                                             0x15, "Hallway Left Invisible Chest",                RHT_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST,                  RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_BOSS_KEY_CHEST] =                                  Location::Chest(RC_SPIRIT_TEMPLE_BOSS_KEY_CHEST,                                 RCQUEST_VANILLA, RCTYPE_BOSS_KEY,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                10218,                                             0x0A, "Boss Key Chest",                              RHT_SPIRIT_TEMPLE_BOSS_KEY_CHEST,                                RG_SPIRIT_TEMPLE_BOSS_KEY,            { Category::cVanillaBossKey },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
-    locationTable[RC_SPIRIT_TEMPLE_TOPMOST_CHEST] =                                   Location::Chest(RC_SPIRIT_TEMPLE_TOPMOST_CHEST,                                  RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -29454,                                            0x12, "Topmost Chest",                               RHT_SPIRIT_TEMPLE_TOPMOST_CHEST,                                 RG_BOMBS_20,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST] =                              Location::Chest(RC_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST,                             RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                21800,                        0x08, "Child Bridge Chest",                          RHT_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST,                            RG_DEKU_SHIELD);
+    locationTable[RC_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST] =                       Location::Chest(RC_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST,                      RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30656,                       0x00, "Child Early Torches Chest",                   RHT_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST,                     RG_SPIRIT_TEMPLE_SMALL_KEY,                                                                                                                                                                       true);
+    locationTable[RC_SPIRIT_TEMPLE_COMPASS_CHEST] =                                   Location::Chest(RC_SPIRIT_TEMPLE_COMPASS_CHEST,                                  RCQUEST_VANILLA, RCTYPE_COMPASS,                                                          ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                14340,                        0x04, "Compass Chest",                               RHT_SPIRIT_TEMPLE_COMPASS_CHEST,                                 RG_SPIRIT_TEMPLE_COMPASS,                                                                                                                                                                         true);
+    locationTable[RC_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST] =                         Location::Chest(RC_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST,                        RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                22599,                        0x07, "Early Adult Right Chest",                     RHT_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST,                       RG_SPIRIT_TEMPLE_SMALL_KEY,                                                                                                                                                                       true);
+    locationTable[RC_SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST] =                         Location::Chest(RC_SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST,                        RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30451,                       0x0D, "First Mirror Left Chest",                     RHT_SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST,                       RG_ICE_TRAP);
+    locationTable[RC_SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST] =                        Location::Chest(RC_SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST,                       RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -28786,                       0x0E, "First Mirror Right Chest",                    RHT_SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST,                      RG_RECOVERY_HEART);
+    locationTable[RC_SPIRIT_TEMPLE_MAP_CHEST] =                                       Location::Chest(RC_SPIRIT_TEMPLE_MAP_CHEST,                                      RCQUEST_VANILLA, RCTYPE_MAP,                                                              ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -18397,                       0x03, "Map Chest",                                   RHT_SPIRIT_TEMPLE_MAP_CHEST,                                     RG_SPIRIT_TEMPLE_MAP,                                                                                                                                                                             true);
+    locationTable[RC_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST] =                         Location::Chest(RC_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST,                        RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -32666,                       0x06, "Child Climb North Chest",                     RHT_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST,                       RG_BOMBCHU_10);
+    locationTable[RC_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST] =                          Location::Chest(RC_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST,                         RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -31444,                       0x0C, "Child Climb East Chest",                      RHT_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST,                        RG_DEKU_SHIELD);
+    locationTable[RC_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST] =                            Location::Chest(RC_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST,                           RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30655,                       0x01, "Sun Block Room Chest",                        RHT_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST,                          RG_SPIRIT_TEMPLE_SMALL_KEY,                                                                                                                                                                       true);
+    locationTable[RC_SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST] =                          Location::Chest(RC_SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST,                         RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30654,                       0x02, "Statue Room Hand Chest",                      RHT_SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST,                        RG_SPIRIT_TEMPLE_SMALL_KEY,                                                                                                                                                                       true);
+    locationTable[RC_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST] =                     Location::Chest(RC_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST,                    RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30577,                       0x0F, "Statue Room Northeast Chest",                 RHT_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST,                   RG_BLUE_RUPEE);
+    locationTable[RC_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST] =                           Location::Chest(RC_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST,                          RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                22597,                        0x05, "Near Four Armos Chest",                       RHT_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST,                         RG_SPIRIT_TEMPLE_SMALL_KEY,                                                                                                                                                                       true);
+    locationTable[RC_SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST] =                   Location::Chest(RC_SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST,                  RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                26900,                        0x14, "Hallway Right Invisible Chest",               RHT_SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST,                 RG_RECOVERY_HEART);
+    locationTable[RC_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST] =                    Location::Chest(RC_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST,                   RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                26901,                        0x15, "Hallway Left Invisible Chest",                RHT_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST,                  RG_RECOVERY_HEART);
+    locationTable[RC_SPIRIT_TEMPLE_BOSS_KEY_CHEST] =                                  Location::Chest(RC_SPIRIT_TEMPLE_BOSS_KEY_CHEST,                                 RCQUEST_VANILLA, RCTYPE_BOSS_KEY,                                                         ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                10218,                        0x0A, "Boss Key Chest",                              RHT_SPIRIT_TEMPLE_BOSS_KEY_CHEST,                                RG_SPIRIT_TEMPLE_BOSS_KEY,                                                                                                                                                                        true);
+    locationTable[RC_SPIRIT_TEMPLE_TOPMOST_CHEST] =                                   Location::Chest(RC_SPIRIT_TEMPLE_TOPMOST_CHEST,                                  RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -29454,                       0x12, "Topmost Chest",                               RHT_SPIRIT_TEMPLE_TOPMOST_CHEST,                                 RG_BOMBS_20,                                                                                                                                                                                      true);
     // Spirit Temple MQ
-    locationTable[RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST] =                    Location::Chest(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST,                   RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                20602,                                             0x1A, "MQ Entrance Front Left Chest",                RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST,                  RG_BOMBCHU_10,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST] =                    Location::Chest(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST,                   RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -32641,                                            0x1F, "MQ Entrance Back Right Chest",                RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST,                  RG_BOMBCHU_10,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST] =                   Location::Chest(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST,                  RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30629,                                            0x1B, "MQ Entrance Front Right Chest",               RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST,                 RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST] =                     Location::Chest(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST,                    RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30626,                                            0x1E, "MQ Entrance Back Left Chest",                 RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST,                   RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST] =                    Location::Chest(RC_SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST,                   RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30627,                                            0x1D, "MQ Child Hammer Switch Chest",                RHT_SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST,                  RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_MAP_CHEST] =                                    Location::Chest(RC_SPIRIT_TEMPLE_MQ_MAP_CHEST,                                   RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                2080,                                              0x00, "MQ Map Chest",                                RHT_SPIRIT_TEMPLE_MQ_MAP_CHEST,                                  RG_SPIRIT_TEMPLE_MAP,                 { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST] =                         Location::Chest(RC_SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST,                        RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                30792,                                             0x08, "MQ Map Room Enemy Chest",                     RHT_SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST,                       RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST] =                      Location::Chest(RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST,                     RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                28774,                                             0x06, "MQ Child Climb North Chest",                  RHT_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST,                    RG_BOMBCHU_10,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST] =                      Location::Chest(RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST,                     RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30644,                                            0x0C, "MQ Child Climb South Chest",                  RHT_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST,                    RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_COMPASS_CHEST] =                                Location::Chest(RC_SPIRIT_TEMPLE_MQ_COMPASS_CHEST,                               RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -18429,                                            0x03, "MQ Compass Chest",                            RHT_SPIRIT_TEMPLE_MQ_COMPASS_CHEST,                              RG_SPIRIT_TEMPLE_COMPASS,             { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST] =                    Location::Chest(RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST,                   RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30577,                                            0x0F, "MQ Statue Room Lullaby Chest",                RHT_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST,                  RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST] =                  Location::Chest(RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST,                 RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                26882,                                             0x02, "MQ Statue Room Invisible Chest",              RHT_SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST,                RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST] =                   Location::Chest(RC_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST,                  RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30628,                                            0x1C, "MQ Silver Block Hallway Chest",               RHT_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST,                 RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST] =                         Location::Chest(RC_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST,                        RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30463,                                            0x01, "MQ Sun Block Room Chest",                     RHT_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST,                       RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST] =                          Location::Chest(RC_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST,                         RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                23207,                                             0x07, "MQ Symphony Room Chest",                      RHT_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST,                        RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST] =                            Location::Chest(RC_SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST,                           RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                31396,                                             0x04, "MQ Leever Room Chest",                        RHT_SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST,                          RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST] =                            Location::Chest(RC_SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST,                           RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                24472,                                             0x19, "MQ Beamos Room Chest",                        RHT_SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST,                          RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST] =                           Location::Chest(RC_SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST,                          RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                31097,                                             0x18, "MQ Chest Switch Chest",                       RHT_SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST,                         RG_ICE_TRAP,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST] =                               Location::Chest(RC_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST,                              RCQUEST_MQ,      RCTYPE_BOSS_KEY,                    RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                10213,                                             0x05, "MQ Boss Key Chest",                           RHT_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST,                             RG_SPIRIT_TEMPLE_BOSS_KEY,            { Category::cVanillaBossKey },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST] =                Location::Chest(RC_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST,               RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SPIRIT_TEMPLE,                ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                26706,                                             0x12, "MQ Mirror Puzzle Invisible Chest",            RHT_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST,              RG_SPIRIT_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST] =                    Location::Chest(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST,                   RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                20602,                        0x1A, "MQ Entrance Front Left Chest",                RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST,                  RG_BOMBCHU_10);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST] =                    Location::Chest(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST,                   RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -32641,                       0x1F, "MQ Entrance Back Right Chest",                RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST,                  RG_BOMBCHU_10);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST] =                   Location::Chest(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST,                  RCQUEST_MQ,      RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30629,                       0x1B, "MQ Entrance Front Right Chest",               RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST,                 RG_SPIRIT_TEMPLE_SMALL_KEY,                                                                                                                                                                       true);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST] =                     Location::Chest(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST,                    RCQUEST_MQ,      RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30626,                       0x1E, "MQ Entrance Back Left Chest",                 RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST,                   RG_SPIRIT_TEMPLE_SMALL_KEY,                                                                                                                                                                       true);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST] =                    Location::Chest(RC_SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST,                   RCQUEST_MQ,      RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30627,                       0x1D, "MQ Child Hammer Switch Chest",                RHT_SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST,                  RG_SPIRIT_TEMPLE_SMALL_KEY,                                                                                                                                                                       true);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_MAP_CHEST] =                                    Location::Chest(RC_SPIRIT_TEMPLE_MQ_MAP_CHEST,                                   RCQUEST_MQ,      RCTYPE_MAP,                                                              ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                2080,                         0x00, "MQ Map Chest",                                RHT_SPIRIT_TEMPLE_MQ_MAP_CHEST,                                  RG_SPIRIT_TEMPLE_MAP,                                                                                                                                                                             true);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST] =                         Location::Chest(RC_SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST,                        RCQUEST_MQ,      RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                30792,                        0x08, "MQ Map Room Enemy Chest",                     RHT_SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST,                       RG_SPIRIT_TEMPLE_SMALL_KEY,                                                                                                                                                                       true);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST] =                      Location::Chest(RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST,                     RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                28774,                        0x06, "MQ Child Climb North Chest",                  RHT_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST,                    RG_BOMBCHU_10);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST] =                      Location::Chest(RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST,                     RCQUEST_MQ,      RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30644,                       0x0C, "MQ Child Climb South Chest",                  RHT_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST,                    RG_SPIRIT_TEMPLE_SMALL_KEY,                                                                                                                                                                       true);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_COMPASS_CHEST] =                                Location::Chest(RC_SPIRIT_TEMPLE_MQ_COMPASS_CHEST,                               RCQUEST_MQ,      RCTYPE_COMPASS,                                                          ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -18429,                       0x03, "MQ Compass Chest",                            RHT_SPIRIT_TEMPLE_MQ_COMPASS_CHEST,                              RG_SPIRIT_TEMPLE_COMPASS,                                                                                                                                                                         true);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST] =                    Location::Chest(RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST,                   RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30577,                       0x0F, "MQ Statue Room Lullaby Chest",                RHT_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST,                  RG_BLUE_RUPEE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST] =                  Location::Chest(RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST,                 RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                26882,                        0x02, "MQ Statue Room Invisible Chest",              RHT_SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST,                RG_RECOVERY_HEART);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST] =                   Location::Chest(RC_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST,                  RCQUEST_MQ,      RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30628,                       0x1C, "MQ Silver Block Hallway Chest",               RHT_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST,                 RG_SPIRIT_TEMPLE_SMALL_KEY,                                                                                                                                                                       true);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST] =                         Location::Chest(RC_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST,                        RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                -30463,                       0x01, "MQ Sun Block Room Chest",                     RHT_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST,                       RG_RECOVERY_HEART);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST] =                          Location::Chest(RC_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST,                         RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                23207,                        0x07, "MQ Symphony Room Chest",                      RHT_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST,                        RG_PURPLE_RUPEE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST] =                            Location::Chest(RC_SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST,                           RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                31396,                        0x04, "MQ Leever Room Chest",                        RHT_SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST,                          RG_PURPLE_RUPEE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST] =                            Location::Chest(RC_SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST,                           RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                24472,                        0x19, "MQ Beamos Room Chest",                        RHT_SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST,                          RG_RECOVERY_HEART);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST] =                           Location::Chest(RC_SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST,                          RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                31097,                        0x18, "MQ Chest Switch Chest",                       RHT_SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST,                         RG_ICE_TRAP);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST] =                               Location::Chest(RC_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST,                              RCQUEST_MQ,      RCTYPE_BOSS_KEY,                                                         ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                10213,                        0x05, "MQ Boss Key Chest",                           RHT_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST,                             RG_SPIRIT_TEMPLE_BOSS_KEY,                                                                                                                                                                        true);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST] =                Location::Chest(RC_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST,               RCQUEST_MQ,      RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_SPIRIT_TEMPLE,                26706,                        0x12, "MQ Mirror Puzzle Invisible Chest",            RHT_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST,              RG_SPIRIT_TEMPLE_SMALL_KEY,                                                                                                                                                                       true);
 
     // Shadow Temple Vanilla
-    locationTable[RC_SHADOW_TEMPLE_MAP_CHEST] =                                       Location::Chest(RC_SHADOW_TEMPLE_MAP_CHEST,                                      RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                6177,                                              0x01, "Map Chest",                                   RHT_SHADOW_TEMPLE_MAP_CHEST,                                     RG_SHADOW_TEMPLE_MAP,                 { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
-    locationTable[RC_SHADOW_TEMPLE_HOVER_BOOTS_CHEST] =                               Location::Chest(RC_SHADOW_TEMPLE_HOVER_BOOTS_CHEST,                              RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                5607,                                              0x07, "Hover Boots Chest",                           RHT_SHADOW_TEMPLE_HOVER_BOOTS_CHEST,                             RG_HOVER_BOOTS,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
-    locationTable[RC_SHADOW_TEMPLE_COMPASS_CHEST] =                                   Location::Chest(RC_SHADOW_TEMPLE_COMPASS_CHEST,                                  RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                6147,                                              0x03, "Compass Chest",                               RHT_SHADOW_TEMPLE_COMPASS_CHEST,                                 RG_SHADOW_TEMPLE_COMPASS,             { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
-    locationTable[RC_SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST] =                        Location::Chest(RC_SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST,                       RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                22594,                                             0x02, "Early Silver Rupee Chest",                    RHT_SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST,                      RG_SHADOW_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
-    locationTable[RC_SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST] =                  Location::Chest(RC_SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST,                 RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                22668,                                             0x0C, "Invisible Blades Visible Chest",              RHT_SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST,                RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST] =                Location::Chest(RC_SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST,               RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                26998,                                             0x16, "Invisible Blades Invisible Chest",            RHT_SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST,              RG_ARROWS_30,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST] =                      Location::Chest(RC_SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST,                     RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                22853,                                             0x05, "Falling Spikes Lower Chest",                  RHT_SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST,                    RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST] =                      Location::Chest(RC_SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST,                     RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                22662,                                             0x06, "Falling Spikes Upper Chest",                  RHT_SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST,                    RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST] =                     Location::Chest(RC_SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST,                    RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                -30652,                                            0x04, "Falling Spikes Switch Chest",                 RHT_SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST,                   RG_SHADOW_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
-    locationTable[RC_SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST] =                          Location::Chest(RC_SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST,                         RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                30857,                                             0x09, "Invisible Spikes Chest",                      RHT_SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST,                        RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_WIND_HINT_CHEST] =                                 Location::Chest(RC_SHADOW_TEMPLE_WIND_HINT_CHEST,                                RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                26965,                                             0x15, "Wind Hint Chest",                             RHT_SHADOW_TEMPLE_WIND_HINT_CHEST,                               RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST] =                          Location::Chest(RC_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST,                         RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                30856,                                             0x08, "After Wind Enemy Chest",                      RHT_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST,                        RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST] =                         Location::Chest(RC_SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST,                        RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                26708,                                             0x14, "After Wind Hidden Chest",                     RHT_SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST,                       RG_SHADOW_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
-    locationTable[RC_SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST] =                          Location::Chest(RC_SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST,                         RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                22666,                                             0x0A, "Spike Walls Left Chest",                      RHT_SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST,                        RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_BOSS_KEY_CHEST] =                                  Location::Chest(RC_SHADOW_TEMPLE_BOSS_KEY_CHEST,                                 RCQUEST_VANILLA, RCTYPE_BOSS_KEY,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                10219,                                             0x0B, "Boss Key Chest",                              RHT_SHADOW_TEMPLE_BOSS_KEY_CHEST,                                RG_SHADOW_TEMPLE_BOSS_KEY,            { Category::cVanillaBossKey },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
-    locationTable[RC_SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST] =                     Location::Chest(RC_SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST,                    RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                30797,                                             0x0D, "Invisible Floormaster Chest",                 RHT_SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST,                   RG_SHADOW_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
-    locationTable[RC_SHADOW_TEMPLE_FREESTANDING_KEY] =                          Location::Collectable(RC_SHADOW_TEMPLE_FREESTANDING_KEY,                               RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_ITEM00,      SCENE_SHADOW_TEMPLE,                273,                                               0x01, "Freestanding Key",                            RHT_SHADOW_TEMPLE_FREESTANDING_KEY,                              RG_SHADOW_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
+    locationTable[RC_SHADOW_TEMPLE_MAP_CHEST] =                                       Location::Chest(RC_SHADOW_TEMPLE_MAP_CHEST,                                      RCQUEST_VANILLA, RCTYPE_MAP,                                                              ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                6177,                         0x01, "Map Chest",                                   RHT_SHADOW_TEMPLE_MAP_CHEST,                                     RG_SHADOW_TEMPLE_MAP,                                                                                                                                                                             true);
+    locationTable[RC_SHADOW_TEMPLE_HOVER_BOOTS_CHEST] =                               Location::Chest(RC_SHADOW_TEMPLE_HOVER_BOOTS_CHEST,                              RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                5607,                         0x07, "Hover Boots Chest",                           RHT_SHADOW_TEMPLE_HOVER_BOOTS_CHEST,                             RG_HOVER_BOOTS,                                                                                                                                                                                   true);
+    locationTable[RC_SHADOW_TEMPLE_COMPASS_CHEST] =                                   Location::Chest(RC_SHADOW_TEMPLE_COMPASS_CHEST,                                  RCQUEST_VANILLA, RCTYPE_COMPASS,                                                          ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                6147,                         0x03, "Compass Chest",                               RHT_SHADOW_TEMPLE_COMPASS_CHEST,                                 RG_SHADOW_TEMPLE_COMPASS,                                                                                                                                                                         true);
+    locationTable[RC_SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST] =                        Location::Chest(RC_SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST,                       RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                22594,                        0x02, "Early Silver Rupee Chest",                    RHT_SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST,                      RG_SHADOW_TEMPLE_SMALL_KEY,                                                                                                                                                                       true);
+    locationTable[RC_SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST] =                  Location::Chest(RC_SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST,                 RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                22668,                        0x0C, "Invisible Blades Visible Chest",              RHT_SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST,                RG_BLUE_RUPEE);
+    locationTable[RC_SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST] =                Location::Chest(RC_SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST,               RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                26998,                        0x16, "Invisible Blades Invisible Chest",            RHT_SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST,              RG_ARROWS_30);
+    locationTable[RC_SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST] =                      Location::Chest(RC_SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST,                     RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                22853,                        0x05, "Falling Spikes Lower Chest",                  RHT_SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST,                    RG_ARROWS_10);
+    locationTable[RC_SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST] =                      Location::Chest(RC_SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST,                     RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                22662,                        0x06, "Falling Spikes Upper Chest",                  RHT_SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST,                    RG_BLUE_RUPEE);
+    locationTable[RC_SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST] =                     Location::Chest(RC_SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST,                    RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                -30652,                       0x04, "Falling Spikes Switch Chest",                 RHT_SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST,                   RG_SHADOW_TEMPLE_SMALL_KEY,                                                                                                                                                                       true);
+    locationTable[RC_SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST] =                          Location::Chest(RC_SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST,                         RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                30857,                        0x09, "Invisible Spikes Chest",                      RHT_SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST,                        RG_BLUE_RUPEE);
+    locationTable[RC_SHADOW_TEMPLE_WIND_HINT_CHEST] =                                 Location::Chest(RC_SHADOW_TEMPLE_WIND_HINT_CHEST,                                RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                26965,                        0x15, "Wind Hint Chest",                             RHT_SHADOW_TEMPLE_WIND_HINT_CHEST,                               RG_ARROWS_10);
+    locationTable[RC_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST] =                          Location::Chest(RC_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST,                         RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                30856,                        0x08, "After Wind Enemy Chest",                      RHT_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST,                        RG_BLUE_RUPEE);
+    locationTable[RC_SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST] =                         Location::Chest(RC_SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST,                        RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                26708,                        0x14, "After Wind Hidden Chest",                     RHT_SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST,                       RG_SHADOW_TEMPLE_SMALL_KEY,                                                                                                                                                                       true);
+    locationTable[RC_SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST] =                          Location::Chest(RC_SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST,                         RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                22666,                        0x0A, "Spike Walls Left Chest",                      RHT_SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST,                        RG_BLUE_RUPEE);
+    locationTable[RC_SHADOW_TEMPLE_BOSS_KEY_CHEST] =                                  Location::Chest(RC_SHADOW_TEMPLE_BOSS_KEY_CHEST,                                 RCQUEST_VANILLA, RCTYPE_BOSS_KEY,                                                         ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                10219,                        0x0B, "Boss Key Chest",                              RHT_SHADOW_TEMPLE_BOSS_KEY_CHEST,                                RG_SHADOW_TEMPLE_BOSS_KEY,                                                                                                                                                                        true);
+    locationTable[RC_SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST] =                     Location::Chest(RC_SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST,                    RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                30797,                        0x0D, "Invisible Floormaster Chest",                 RHT_SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST,                   RG_SHADOW_TEMPLE_SMALL_KEY,                                                                                                                                                                       true);
+    locationTable[RC_SHADOW_TEMPLE_FREESTANDING_KEY] =                          Location::Collectable(RC_SHADOW_TEMPLE_FREESTANDING_KEY,                               RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                                                        ACTOR_EN_ITEM00,      SCENE_SHADOW_TEMPLE,                273,                          0x01, "Freestanding Key",                            RHT_SHADOW_TEMPLE_FREESTANDING_KEY,                              RG_SHADOW_TEMPLE_SMALL_KEY,                                                                                                                                                                       true);
     // Shadow Temple MQ
-    locationTable[RC_SHADOW_TEMPLE_MQ_COMPASS_CHEST] =                                Location::Chest(RC_SHADOW_TEMPLE_MQ_COMPASS_CHEST,                               RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                6145,                                              0x01, "MQ Compass Chest",                            RHT_SHADOW_TEMPLE_MQ_COMPASS_CHEST,                              RG_SHADOW_TEMPLE_COMPASS,             { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
-    locationTable[RC_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST] =                            Location::Chest(RC_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST,                           RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                5607,                                              0x07, "MQ Hover Boots Chest",                        RHT_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST,                          RG_HOVER_BOOTS,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
-    locationTable[RC_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST] =                           Location::Chest(RC_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST,                          RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                30787,                                             0x03, "MQ Early Gibdos Chest",                       RHT_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST,                         RG_SHADOW_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
-    locationTable[RC_SHADOW_TEMPLE_MQ_MAP_CHEST] =                                    Location::Chest(RC_SHADOW_TEMPLE_MQ_MAP_CHEST,                                   RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                2082,                                              0x02, "MQ Map Chest",                                RHT_SHADOW_TEMPLE_MQ_MAP_CHEST,                                  RG_SHADOW_TEMPLE_MAP,                 { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
-    locationTable[RC_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST] =                   Location::Chest(RC_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST,                  RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                -30417,                                            0x0F, "MQ Beamos Silver Rupees Chest",               RHT_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST,                 RG_ARROWS_5,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST] =                  Location::Chest(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST,                 RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                22662,                                             0x04, "MQ Falling Spikes Switch Chest",              RHT_SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST,                RG_SHADOW_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
-    locationTable[RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST] =                   Location::Chest(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST,                  RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                22853,                                             0x05, "MQ Falling Spikes Lower Chest",               RHT_SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST,                 RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST] =                   Location::Chest(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST,                  RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                -30652,                                            0x06, "MQ Falling Spikes Upper Chest",               RHT_SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST,                 RG_ARROWS_5,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST] =                       Location::Chest(RC_SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST,                      RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                30857,                                             0x09, "MQ Invisible Spikes Chest",                   RHT_SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST,                     RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST] =                               Location::Chest(RC_SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST,                              RCQUEST_MQ,      RCTYPE_BOSS_KEY,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                10219,                                             0x0B, "MQ Boss Key Chest",                           RHT_SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST,                             RG_SHADOW_TEMPLE_BOSS_KEY,            { Category::cVanillaBossKey },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
-    locationTable[RC_SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST] =                       Location::Chest(RC_SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST,                      RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                22666,                                             0x0A, "MQ Spike Walls Left Chest",                   RHT_SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST,                     RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST] =                           Location::Chest(RC_SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST,                          RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                31184,                                             0x10, "MQ Stalfos Room Chest",                       RHT_SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST,                         RG_RED_RUPEE,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST] =             Location::Chest(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST,            RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                26710,                                             0x16, "MQ Invisible Blades Invisible Chest",         RHT_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST,           RG_SHADOW_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
-    locationTable[RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST] =               Location::Chest(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST,              RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                22668,                                             0x0C, "MQ Invisible Blades Visible Chest",           RHT_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST,             RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST] =                            Location::Chest(RC_SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST,                           RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                31053,                                             0x0D, "MQ Bomb Flower Chest",                        RHT_SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST,                          RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_MQ_WIND_HINT_CHEST] =                              Location::Chest(RC_SHADOW_TEMPLE_MQ_WIND_HINT_CHEST,                             RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                26709,                                             0x15, "MQ Wind Hint Chest",                          RHT_SHADOW_TEMPLE_MQ_WIND_HINT_CHEST,                            RG_SHADOW_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
-    locationTable[RC_SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST] =                      Location::Chest(RC_SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST,                     RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                26932,                                             0x14, "MQ After Wind Hidden Chest",                  RHT_SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST,                    RG_ARROWS_5,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST] =                       Location::Chest(RC_SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST,                      RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                30856,                                             0x08, "MQ After Wind Enemy Chest",                   RHT_SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST,                     RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST] =                    Location::Chest(RC_SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST,                   RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                26702,                                             0x0E, "MQ Near Ship Invisible Chest",                RHT_SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST,                  RG_SHADOW_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
-    locationTable[RC_SHADOW_TEMPLE_MQ_FREESTANDING_KEY] =                       Location::Collectable(RC_SHADOW_TEMPLE_MQ_FREESTANDING_KEY,                            RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_SHADOW_TEMPLE,                ACTOR_EN_ITEM00,      SCENE_SHADOW_TEMPLE,                1553,                                              0x06, "MQ Freestanding Key",                         RHT_SHADOW_TEMPLE_MQ_FREESTANDING_KEY,                           RG_SHADOW_TEMPLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
+    locationTable[RC_SHADOW_TEMPLE_MQ_COMPASS_CHEST] =                                Location::Chest(RC_SHADOW_TEMPLE_MQ_COMPASS_CHEST,                               RCQUEST_MQ,      RCTYPE_COMPASS,                                                          ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                6145,                         0x01, "MQ Compass Chest",                            RHT_SHADOW_TEMPLE_MQ_COMPASS_CHEST,                              RG_SHADOW_TEMPLE_COMPASS,                                                                                                                                                                         true);
+    locationTable[RC_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST] =                            Location::Chest(RC_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST,                           RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                5607,                         0x07, "MQ Hover Boots Chest",                        RHT_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST,                          RG_HOVER_BOOTS,                                                                                                                                                                                   true);
+    locationTable[RC_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST] =                           Location::Chest(RC_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST,                          RCQUEST_MQ,      RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                30787,                        0x03, "MQ Early Gibdos Chest",                       RHT_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST,                         RG_SHADOW_TEMPLE_SMALL_KEY,                                                                                                                                                                       true);
+    locationTable[RC_SHADOW_TEMPLE_MQ_MAP_CHEST] =                                    Location::Chest(RC_SHADOW_TEMPLE_MQ_MAP_CHEST,                                   RCQUEST_MQ,      RCTYPE_MAP,                                                              ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                2082,                         0x02, "MQ Map Chest",                                RHT_SHADOW_TEMPLE_MQ_MAP_CHEST,                                  RG_SHADOW_TEMPLE_MAP,                                                                                                                                                                             true);
+    locationTable[RC_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST] =                   Location::Chest(RC_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST,                  RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                -30417,                       0x0F, "MQ Beamos Silver Rupees Chest",               RHT_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST,                 RG_ARROWS_5);
+    locationTable[RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST] =                  Location::Chest(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST,                 RCQUEST_MQ,      RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                22662,                        0x04, "MQ Falling Spikes Switch Chest",              RHT_SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST,                RG_SHADOW_TEMPLE_SMALL_KEY,                                                                                                                                                                       true);
+    locationTable[RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST] =                   Location::Chest(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST,                  RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                22853,                        0x05, "MQ Falling Spikes Lower Chest",               RHT_SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST,                 RG_ARROWS_10);
+    locationTable[RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST] =                   Location::Chest(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST,                  RCQUEST_MQ,      RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                -30652,                       0x06, "MQ Falling Spikes Upper Chest",               RHT_SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST,                 RG_ARROWS_5);
+    locationTable[RC_SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST] =                       Location::Chest(RC_SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST,                      RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                30857,                        0x09, "MQ Invisible Spikes Chest",                   RHT_SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST,                     RG_BLUE_RUPEE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST] =                               Location::Chest(RC_SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST,                              RCQUEST_MQ,      RCTYPE_BOSS_KEY,                                                         ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                10219,                        0x0B, "MQ Boss Key Chest",                           RHT_SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST,                             RG_SHADOW_TEMPLE_BOSS_KEY,                                                                                                                                                                        true);
+    locationTable[RC_SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST] =                       Location::Chest(RC_SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST,                      RCQUEST_MQ,      RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                22666,                        0x0A, "MQ Spike Walls Left Chest",                   RHT_SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST,                     RG_BLUE_RUPEE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST] =                           Location::Chest(RC_SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST,                          RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                31184,                        0x10, "MQ Stalfos Room Chest",                       RHT_SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST,                         RG_RED_RUPEE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST] =             Location::Chest(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST,            RCQUEST_MQ,      RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                26710,                        0x16, "MQ Invisible Blades Invisible Chest",         RHT_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST,           RG_SHADOW_TEMPLE_SMALL_KEY,                                                                                                                                                                       true);
+    locationTable[RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST] =               Location::Chest(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST,              RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                22668,                        0x0C, "MQ Invisible Blades Visible Chest",           RHT_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST,             RG_BLUE_RUPEE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST] =                            Location::Chest(RC_SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST,                           RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                31053,                        0x0D, "MQ Bomb Flower Chest",                        RHT_SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST,                          RG_ARROWS_10);
+    locationTable[RC_SHADOW_TEMPLE_MQ_WIND_HINT_CHEST] =                              Location::Chest(RC_SHADOW_TEMPLE_MQ_WIND_HINT_CHEST,                             RCQUEST_MQ,      RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                26709,                        0x15, "MQ Wind Hint Chest",                          RHT_SHADOW_TEMPLE_MQ_WIND_HINT_CHEST,                            RG_SHADOW_TEMPLE_SMALL_KEY,                                                                                                                                                                       true);
+    locationTable[RC_SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST] =                      Location::Chest(RC_SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST,                     RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                26932,                        0x14, "MQ After Wind Hidden Chest",                  RHT_SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST,                    RG_ARROWS_5);
+    locationTable[RC_SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST] =                       Location::Chest(RC_SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST,                      RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                30856,                        0x08, "MQ After Wind Enemy Chest",                   RHT_SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST,                     RG_BLUE_RUPEE);
+    locationTable[RC_SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST] =                    Location::Chest(RC_SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST,                   RCQUEST_MQ,      RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_SHADOW_TEMPLE,                26702,                        0x0E, "MQ Near Ship Invisible Chest",                RHT_SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST,                  RG_SHADOW_TEMPLE_SMALL_KEY,                                                                                                                                                                       true);
+    locationTable[RC_SHADOW_TEMPLE_MQ_FREESTANDING_KEY] =                       Location::Collectable(RC_SHADOW_TEMPLE_MQ_FREESTANDING_KEY,                            RCQUEST_MQ,      RCTYPE_SMALL_KEY,                                                        ACTOR_EN_ITEM00,      SCENE_SHADOW_TEMPLE,                1553,                         0x06, "MQ Freestanding Key",                         RHT_SHADOW_TEMPLE_MQ_FREESTANDING_KEY,                           RG_SHADOW_TEMPLE_SMALL_KEY,                                                                                                                                                                       true);
 
     // Bottom of the Well Vanilla
-    locationTable[RC_BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST] =                 Location::Chest(RC_BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST,                RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           22600,                                             0x08, "Front Left Fake Wall Chest",                  RHT_BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST,               RG_BOTTOM_OF_THE_WELL_SMALL_KEY,      { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
-    locationTable[RC_BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST] =                Location::Chest(RC_BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST,               RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           20578,                                             0x02, "Front Center Bombable Chest",                 RHT_BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST,              RG_BOMBCHU_10,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[RC_BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST] =               Location::Chest(RC_BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST,              RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           22597,                                             0x05, "Right Bottom Fake Wall Chest",                RHT_BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST,             RG_BOTTOM_OF_THE_WELL_SMALL_KEY,      { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
-    locationTable[RC_BOTTOM_OF_THE_WELL_COMPASS_CHEST] =                              Location::Chest(RC_BOTTOM_OF_THE_WELL_COMPASS_CHEST,                             RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           2049,                                              0x01, "Compass Chest",                               RHT_BOTTOM_OF_THE_WELL_COMPASS_CHEST,                            RG_BOTTOM_OF_THE_WELL_COMPASS,        { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
-    locationTable[RC_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST] =                     Location::Chest(RC_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST,                    RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           20558,                                             0x0E, "Center Skulltula Chest",                      RHT_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST,                   RG_DEKU_NUTS_5,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[RC_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST] =                   Location::Chest(RC_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST,                  RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           23684,                                             0x04, "Back Left Bombable Chest",                    RHT_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST,                 RG_DEKU_NUTS_10,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[RC_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST] =                        Location::Chest(RC_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST,                       RCQUEST_VANILLA, RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           4419,                                              0x03, "Lens of Truth Chest",                         RHT_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST,                      RG_LENS_OF_TRUTH,                     { Category::cSongDungeonReward },                                                                                                                                                     SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
-    locationTable[RC_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST] =                            Location::Chest(RC_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST,                           RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           27348,                                             0x14, "Invisible Chest",                             RHT_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST,                          RG_HUGE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[RC_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST] =                     Location::Chest(RC_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST,                    RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           23760,                                             0x10, "Underwater Front Chest",                      RHT_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST,                   RG_BOMBS_10,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[RC_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST] =                      Location::Chest(RC_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST,                     RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           22793,                                             0x09, "Underwater Left Chest",                       RHT_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST,                    RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[RC_BOTTOM_OF_THE_WELL_MAP_CHEST] =                                  Location::Chest(RC_BOTTOM_OF_THE_WELL_MAP_CHEST,                                 RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           2087,                                              0x07, "Map Chest",                                   RHT_BOTTOM_OF_THE_WELL_MAP_CHEST,                                RG_BOTTOM_OF_THE_WELL_MAP,            { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
-    locationTable[RC_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST] =                           Location::Chest(RC_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST,                          RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           21802,                                             0x0A, "Fire Keese Chest",                            RHT_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST,                         RG_DEKU_SHIELD,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[RC_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST] =                            Location::Chest(RC_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST,                           RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           21836,                                             0x0C, "Like Like Chest",                             RHT_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST,                          RG_HYLIAN_SHIELD,                     {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[RC_BOTTOM_OF_THE_WELL_FREESTANDING_KEY] =                     Location::Collectable(RC_BOTTOM_OF_THE_WELL_FREESTANDING_KEY,                          RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_ITEM00,      SCENE_BOTTOM_OF_THE_WELL,           273,                                               0x01, "Freestanding Key",                            RHT_BOTTOM_OF_THE_WELL_FREESTANDING_KEY,                         RG_BOTTOM_OF_THE_WELL_SMALL_KEY,      { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
+    locationTable[RC_BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST] =                 Location::Chest(RC_BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST,                RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           22600,                        0x08, "Front Left Fake Wall Chest",                  RHT_BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST,               RG_BOTTOM_OF_THE_WELL_SMALL_KEY,                                                                                                                                                                  true);
+    locationTable[RC_BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST] =                Location::Chest(RC_BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST,               RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           20578,                        0x02, "Front Center Bombable Chest",                 RHT_BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST,              RG_BOMBCHU_10);
+    locationTable[RC_BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST] =               Location::Chest(RC_BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST,              RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           22597,                        0x05, "Right Bottom Fake Wall Chest",                RHT_BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST,             RG_BOTTOM_OF_THE_WELL_SMALL_KEY,                                                                                                                                                                  true);
+    locationTable[RC_BOTTOM_OF_THE_WELL_COMPASS_CHEST] =                              Location::Chest(RC_BOTTOM_OF_THE_WELL_COMPASS_CHEST,                             RCQUEST_VANILLA, RCTYPE_COMPASS,                                                          ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           2049,                         0x01, "Compass Chest",                               RHT_BOTTOM_OF_THE_WELL_COMPASS_CHEST,                            RG_BOTTOM_OF_THE_WELL_COMPASS,                                                                                                                                                                    true);
+    locationTable[RC_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST] =                     Location::Chest(RC_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST,                    RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           20558,                        0x0E, "Center Skulltula Chest",                      RHT_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST,                   RG_DEKU_NUTS_5);
+    locationTable[RC_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST] =                   Location::Chest(RC_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST,                  RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           23684,                        0x04, "Back Left Bombable Chest",                    RHT_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST,                 RG_DEKU_NUTS_10);
+    locationTable[RC_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST] =                        Location::Chest(RC_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST,                       RCQUEST_VANILLA, RCTYPE_BOSS_HEART_OR_OTHER_REWARD,                                       ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           4419,                         0x03, "Lens of Truth Chest",                         RHT_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST,                      RG_LENS_OF_TRUTH,                                                                                                                                                                                 true);
+    locationTable[RC_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST] =                            Location::Chest(RC_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST,                           RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           27348,                        0x14, "Invisible Chest",                             RHT_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST,                          RG_HUGE_RUPEE);
+    locationTable[RC_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST] =                     Location::Chest(RC_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST,                    RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           23760,                        0x10, "Underwater Front Chest",                      RHT_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST,                   RG_BOMBS_10);
+    locationTable[RC_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST] =                      Location::Chest(RC_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST,                     RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           22793,                        0x09, "Underwater Left Chest",                       RHT_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST,                    RG_RECOVERY_HEART);
+    locationTable[RC_BOTTOM_OF_THE_WELL_MAP_CHEST] =                                  Location::Chest(RC_BOTTOM_OF_THE_WELL_MAP_CHEST,                                 RCQUEST_VANILLA, RCTYPE_MAP,                                                              ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           2087,                         0x07, "Map Chest",                                   RHT_BOTTOM_OF_THE_WELL_MAP_CHEST,                                RG_BOTTOM_OF_THE_WELL_MAP,                                                                                                                                                                        true);
+    locationTable[RC_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST] =                           Location::Chest(RC_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST,                          RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           21802,                        0x0A, "Fire Keese Chest",                            RHT_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST,                         RG_DEKU_SHIELD);
+    locationTable[RC_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST] =                            Location::Chest(RC_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST,                           RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           21836,                        0x0C, "Like Like Chest",                             RHT_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST,                          RG_HYLIAN_SHIELD);
+    locationTable[RC_BOTTOM_OF_THE_WELL_FREESTANDING_KEY] =                     Location::Collectable(RC_BOTTOM_OF_THE_WELL_FREESTANDING_KEY,                          RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                                                        ACTOR_EN_ITEM00,      SCENE_BOTTOM_OF_THE_WELL,           273,                          0x01, "Freestanding Key",                            RHT_BOTTOM_OF_THE_WELL_FREESTANDING_KEY,                         RG_BOTTOM_OF_THE_WELL_SMALL_KEY,                                                                                                                                                                  true);
     // Bottom of the Well Master Quest
-    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_MAP_CHEST] =                               Location::Chest(RC_BOTTOM_OF_THE_WELL_MQ_MAP_CHEST,                              RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           2083,                                              0x03, "MQ Map Chest",                                RHT_BOTTOM_OF_THE_WELL_MQ_MAP_CHEST,                             RG_BOTTOM_OF_THE_WELL_MAP,            { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
-    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST] =                     Location::Chest(RC_BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST,                    RCQUEST_MQ,      RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           -20159,                                            0x01, "MQ Lens of Truth Chest",                      RHT_BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST,                   RG_LENS_OF_TRUTH,                     { Category::cSongDungeonReward },                                                                                                                                                     SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
-    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST] =                           Location::Chest(RC_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST,                          RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           6146,                                              0x02, "MQ Compass Chest",                            RHT_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST,                         RG_BOTTOM_OF_THE_WELL_COMPASS,        { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
-    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY] =        Location::Collectable(RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY,             RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_ITEM00,      SCENE_BOTTOM_OF_THE_WELL,           529,                                               0x02, "MQ Dead Hand Freestanding Key",               RHT_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY,            RG_BOTTOM_OF_THE_WELL_SMALL_KEY,      { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
-    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY] =  Location::Collectable(RC_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY,       RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_BOTTOM_OF_THE_WELL,           ACTOR_EN_ITEM00,      SCENE_BOTTOM_OF_THE_WELL,           273,                                               0x01, "MQ East Inner Room Freestanding Key",         RHT_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY,      RG_BOTTOM_OF_THE_WELL_SMALL_KEY,      { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL, true);
+    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_MAP_CHEST] =                               Location::Chest(RC_BOTTOM_OF_THE_WELL_MQ_MAP_CHEST,                              RCQUEST_MQ,      RCTYPE_MAP,                                                              ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           2083,                         0x03, "MQ Map Chest",                                RHT_BOTTOM_OF_THE_WELL_MQ_MAP_CHEST,                             RG_BOTTOM_OF_THE_WELL_MAP,                                                                                                                                                                        true);
+    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST] =                     Location::Chest(RC_BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST,                    RCQUEST_MQ,      RCTYPE_BOSS_HEART_OR_OTHER_REWARD,                                       ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           -20159,                       0x01, "MQ Lens of Truth Chest",                      RHT_BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST,                   RG_LENS_OF_TRUTH,                                                                                                                                                                                 true);
+    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST] =                           Location::Chest(RC_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST,                          RCQUEST_MQ,      RCTYPE_COMPASS,                                                          ACTOR_EN_BOX,         SCENE_BOTTOM_OF_THE_WELL,           6146,                         0x02, "MQ Compass Chest",                            RHT_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST,                         RG_BOTTOM_OF_THE_WELL_COMPASS,                                                                                                                                                                    true);
+    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY] =        Location::Collectable(RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY,             RCQUEST_MQ,      RCTYPE_SMALL_KEY,                                                        ACTOR_EN_ITEM00,      SCENE_BOTTOM_OF_THE_WELL,           529,                          0x02, "MQ Dead Hand Freestanding Key",               RHT_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY,            RG_BOTTOM_OF_THE_WELL_SMALL_KEY,                                                                                                                                                                  true);
+    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY] =  Location::Collectable(RC_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY,       RCQUEST_MQ,      RCTYPE_SMALL_KEY,                                                        ACTOR_EN_ITEM00,      SCENE_BOTTOM_OF_THE_WELL,           273,                          0x01, "MQ East Inner Room Freestanding Key",         RHT_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY,      RG_BOTTOM_OF_THE_WELL_SMALL_KEY,                                                                                                                                                                  true);
 
     // Ice Cavern Vanilla
-    locationTable[RC_ICE_CAVERN_MAP_CHEST] =                                          Location::Chest(RC_ICE_CAVERN_MAP_CHEST,                                         RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_ICE_CAVERN,                   ACTOR_EN_BOX,         SCENE_ICE_CAVERN,                   2080,                                              0x00, "Map Chest",                                   RHT_ICE_CAVERN_MAP_CHEST,                                        RG_ICE_CAVERN_MAP,                    { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN,         true);
-    locationTable[RC_ICE_CAVERN_COMPASS_CHEST] =                                      Location::Chest(RC_ICE_CAVERN_COMPASS_CHEST,                                     RCQUEST_VANILLA, RCTYPE_MAP_COMPASS,                 RCAREA_ICE_CAVERN,                   ACTOR_EN_BOX,         SCENE_ICE_CAVERN,                   2049,                                              0x01, "Compass Chest",                               RHT_ICE_CAVERN_COMPASS_CHEST,                                    RG_ICE_CAVERN_COMPASS,                { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN,         true);
-    locationTable[RC_ICE_CAVERN_IRON_BOOTS_CHEST] =                                   Location::Chest(RC_ICE_CAVERN_IRON_BOOTS_CHEST,                                  RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_ICE_CAVERN,                   ACTOR_EN_BOX,         SCENE_ICE_CAVERN,                   5570,                                              0x02, "Iron Boots Chest",                            RHT_ICE_CAVERN_IRON_BOOTS_CHEST,                                 RG_IRON_BOOTS,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN,         true);
-    locationTable[RC_ICE_CAVERN_FREESTANDING_POH] =                             Location::Collectable(RC_ICE_CAVERN_FREESTANDING_POH,                                  RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_ICE_CAVERN,                   ACTOR_EN_ITEM00,      SCENE_ICE_CAVERN,                   262,                                               0x01, "Freestanding PoH",                            RHT_ICE_CAVERN_FREESTANDING_POH,                                 RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN,         true);
+    locationTable[RC_ICE_CAVERN_MAP_CHEST] =                                          Location::Chest(RC_ICE_CAVERN_MAP_CHEST,                                         RCQUEST_VANILLA, RCTYPE_MAP,                                                              ACTOR_EN_BOX,         SCENE_ICE_CAVERN,                   2080,                         0x00, "Map Chest",                                   RHT_ICE_CAVERN_MAP_CHEST,                                        RG_ICE_CAVERN_MAP,                                                                                                                                                                                true);
+    locationTable[RC_ICE_CAVERN_COMPASS_CHEST] =                                      Location::Chest(RC_ICE_CAVERN_COMPASS_CHEST,                                     RCQUEST_VANILLA, RCTYPE_COMPASS,                                                          ACTOR_EN_BOX,         SCENE_ICE_CAVERN,                   2049,                         0x01, "Compass Chest",                               RHT_ICE_CAVERN_COMPASS_CHEST,                                    RG_ICE_CAVERN_COMPASS,                                                                                                                                                                            true);
+    locationTable[RC_ICE_CAVERN_IRON_BOOTS_CHEST] =                                   Location::Chest(RC_ICE_CAVERN_IRON_BOOTS_CHEST,                                  RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_ICE_CAVERN,                   5570,                         0x02, "Iron Boots Chest",                            RHT_ICE_CAVERN_IRON_BOOTS_CHEST,                                 RG_IRON_BOOTS,                                                                                                                                                                                    true);
+    locationTable[RC_ICE_CAVERN_FREESTANDING_POH] =                             Location::Collectable(RC_ICE_CAVERN_FREESTANDING_POH,                                  RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_ITEM00,      SCENE_ICE_CAVERN,                   262,                          0x01, "Freestanding PoH",                            RHT_ICE_CAVERN_FREESTANDING_POH,                                 RG_PIECE_OF_HEART,                                                                                                                                                                                true);
     // Ice Cavern Master Quest
-    locationTable[RC_ICE_CAVERN_MQ_IRON_BOOTS_CHEST] =                                Location::Chest(RC_ICE_CAVERN_MQ_IRON_BOOTS_CHEST,                               RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_ICE_CAVERN,                   ACTOR_EN_BOX,         SCENE_ICE_CAVERN,                   5570,                                              0x02, "MQ Iron Boots Chest",                         RHT_ICE_CAVERN_MQ_IRON_BOOTS_CHEST,                              RG_IRON_BOOTS,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN,         true);
-    locationTable[RC_ICE_CAVERN_MQ_COMPASS_CHEST] =                                   Location::Chest(RC_ICE_CAVERN_MQ_COMPASS_CHEST,                                  RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_ICE_CAVERN,                   ACTOR_EN_BOX,         SCENE_ICE_CAVERN,                   2048,                                              0x00, "MQ Compass Chest",                            RHT_ICE_CAVERN_MQ_COMPASS_CHEST,                                 RG_ICE_CAVERN_COMPASS,                { Category::cVanillaCompass },                                                                                                                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN,         true);
-    locationTable[RC_ICE_CAVERN_MQ_MAP_CHEST] =                                       Location::Chest(RC_ICE_CAVERN_MQ_MAP_CHEST,                                      RCQUEST_MQ,      RCTYPE_MAP_COMPASS,                 RCAREA_ICE_CAVERN,                   ACTOR_EN_BOX,         SCENE_ICE_CAVERN,                   -18399,                                            0x01, "MQ Map Chest",                                RHT_ICE_CAVERN_MQ_MAP_CHEST,                                     RG_ICE_CAVERN_MAP,                    { Category::cVanillaMap },                                                                                                                                                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN,         true);
-    locationTable[RC_ICE_CAVERN_MQ_FREESTANDING_POH] =                          Location::Collectable(RC_ICE_CAVERN_MQ_FREESTANDING_POH,                               RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_ICE_CAVERN,                   ACTOR_EN_ITEM00,      SCENE_ICE_CAVERN,                   262,                                               0x01, "MQ Freestanding PoH",                         RHT_ICE_CAVERN_MQ_FREESTANDING_POH,                              RG_PIECE_OF_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN,         true);
+    locationTable[RC_ICE_CAVERN_MQ_IRON_BOOTS_CHEST] =                                Location::Chest(RC_ICE_CAVERN_MQ_IRON_BOOTS_CHEST,                               RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_ICE_CAVERN,                   5570,                         0x02, "MQ Iron Boots Chest",                         RHT_ICE_CAVERN_MQ_IRON_BOOTS_CHEST,                              RG_IRON_BOOTS,                                                                                                                                                                                    true);
+    locationTable[RC_ICE_CAVERN_MQ_COMPASS_CHEST] =                                   Location::Chest(RC_ICE_CAVERN_MQ_COMPASS_CHEST,                                  RCQUEST_MQ,      RCTYPE_COMPASS,                                                          ACTOR_EN_BOX,         SCENE_ICE_CAVERN,                   2048,                         0x00, "MQ Compass Chest",                            RHT_ICE_CAVERN_MQ_COMPASS_CHEST,                                 RG_ICE_CAVERN_COMPASS,                                                                                                                                                                            true);
+    locationTable[RC_ICE_CAVERN_MQ_MAP_CHEST] =                                       Location::Chest(RC_ICE_CAVERN_MQ_MAP_CHEST,                                      RCQUEST_MQ,      RCTYPE_MAP,                                                              ACTOR_EN_BOX,         SCENE_ICE_CAVERN,                   -18399,                       0x01, "MQ Map Chest",                                RHT_ICE_CAVERN_MQ_MAP_CHEST,                                     RG_ICE_CAVERN_MAP,                                                                                                                                                                                true);
+    locationTable[RC_ICE_CAVERN_MQ_FREESTANDING_POH] =                          Location::Collectable(RC_ICE_CAVERN_MQ_FREESTANDING_POH,                               RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_ITEM00,      SCENE_ICE_CAVERN,                   262,                          0x01, "MQ Freestanding PoH",                         RHT_ICE_CAVERN_MQ_FREESTANDING_POH,                              RG_PIECE_OF_HEART,                                                                                                                                                                                true);
 
     // Gerudo Training Grounds Vanilla
-    locationTable[RC_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST] =                       Location::Chest(RC_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST,                      RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30573,                                            0x13, "Lobby Left Chest",                            RHT_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST,                     RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST] =                      Location::Chest(RC_GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST,                     RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30393,                                            0x07, "Lobby Right Chest",                           RHT_GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST,                    RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_STALFOS_CHEST] =                          Location::Chest(RC_GERUDO_TRAINING_GROUND_STALFOS_CHEST,                         RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30656,                                            0x00, "Stalfos Chest",                               RHT_GERUDO_TRAINING_GROUND_STALFOS_CHEST,                        RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
-    locationTable[RC_GERUDO_TRAINING_GROUND_BEAMOS_CHEST] =                           Location::Chest(RC_GERUDO_TRAINING_GROUND_BEAMOS_CHEST,                          RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30655,                                            0x01, "Beamos Chest",                                RHT_GERUDO_TRAINING_GROUND_BEAMOS_CHEST,                         RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
-    locationTable[RC_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST] =                   Location::Chest(RC_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST,                  RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22603,                                             0x0B, "Hidden Ceiling Chest",                        RHT_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST,                 RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST] =                  Location::Chest(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST,                 RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       23206,                                             0x06, "Maze Path First Chest",                       RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST,                RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MAZE_PATH_SECOND_CHEST] =                 Location::Chest(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_SECOND_CHEST,                RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22986,                                             0x0A, "Maze Path Second Chest",                      RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_SECOND_CHEST,               RG_RED_RUPEE,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MAZE_PATH_THIRD_CHEST] =                  Location::Chest(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_THIRD_CHEST,                 RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22889,                                             0x09, "Maze Path Third Chest",                       RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_THIRD_CHEST,                RG_ARROWS_30,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FINAL_CHEST] =                  Location::Chest(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FINAL_CHEST,                 RCQUEST_VANILLA, RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       2860,                                              0x0C, "Maze Path Final Chest",                       RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_FINAL_CHEST,                RG_ICE_ARROWS,                        { Category::cSongDungeonReward },                                                                                                                                                     SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_CENTRAL_CHEST] =               Location::Chest(RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_CENTRAL_CHEST,              RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       23877,                                             0x05, "Maze Right Central Chest",                    RHT_GERUDO_TRAINING_GROUND_MAZE_RIGHT_CENTRAL_CHEST,             RG_BOMBCHU_5,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_SIDE_CHEST] =                  Location::Chest(RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_SIDE_CHEST,                 RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22888,                                             0x08, "Maze Right Side Chest",                       RHT_GERUDO_TRAINING_GROUND_MAZE_RIGHT_SIDE_CHEST,                RG_ARROWS_30,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST] =          Location::Chest(RC_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST,         RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30643,                                            0x0D, "Underwater Silver Rupee Chest",               RHT_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST,        RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
-    locationTable[RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST] =                Location::Chest(RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST,               RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       31058,                                             0x12, "Hammer Room Clear Chest",                     RHT_GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST,              RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST] =               Location::Chest(RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST,              RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22608,                                             0x10, "Hammer Room Switch Chest",                    RHT_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST,             RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
-    locationTable[RC_GERUDO_TRAINING_GROUND_EYE_STATUE_CHEST] =                       Location::Chest(RC_GERUDO_TRAINING_GROUND_EYE_STATUE_CHEST,                      RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30653,                                            0x03, "Eye Statue Chest",                            RHT_GERUDO_TRAINING_GROUND_EYE_STATUE_CHEST,                     RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
-    locationTable[RC_GERUDO_TRAINING_GROUND_NEAR_SCARECROW_CHEST] =                   Location::Chest(RC_GERUDO_TRAINING_GROUND_NEAR_SCARECROW_CHEST,                  RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22596,                                             0x04, "Near Scarecrow Chest",                        RHT_GERUDO_TRAINING_GROUND_NEAR_SCARECROW_CHEST,                 RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
-    locationTable[RC_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST] =               Location::Chest(RC_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST,              RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       31089,                                             0x11, "Before Heavy Block Chest",                    RHT_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST,             RG_ARROWS_30,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST] =                Location::Chest(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST,               RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       31439,                                             0x0F, "Heavy Block First Chest",                     RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST,              RG_HUGE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST] =               Location::Chest(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST,              RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       30862,                                             0x0E, "Heavy Block Second Chest",                    RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST,             RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_THIRD_CHEST] =                Location::Chest(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_THIRD_CHEST,               RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       26708,                                             0x14, "Heavy Block Third Chest",                     RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_THIRD_CHEST,              RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
-    locationTable[RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FOURTH_CHEST] =               Location::Chest(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FOURTH_CHEST,              RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       24450,                                             0x02, "Heavy Block Fourth Chest",                    RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FOURTH_CHEST,             RG_ICE_TRAP,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_FREESTANDING_KEY] =                 Location::Collectable(RC_GERUDO_TRAINING_GROUND_FREESTANDING_KEY,                      RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_ITEM00,      SCENE_GERUDO_TRAINING_GROUND,       273,                                               0x01, "Freestanding Key",                            RHT_GERUDO_TRAINING_GROUND_FREESTANDING_KEY,                     RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST] =                       Location::Chest(RC_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST,                      RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30573,                       0x13, "Lobby Left Chest",                            RHT_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST,                     RG_BLUE_RUPEE);
+    locationTable[RC_GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST] =                      Location::Chest(RC_GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST,                     RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30393,                       0x07, "Lobby Right Chest",                           RHT_GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST,                    RG_ARROWS_10);
+    locationTable[RC_GERUDO_TRAINING_GROUND_STALFOS_CHEST] =                          Location::Chest(RC_GERUDO_TRAINING_GROUND_STALFOS_CHEST,                         RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30656,                       0x00, "Stalfos Chest",                               RHT_GERUDO_TRAINING_GROUND_STALFOS_CHEST,                        RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY,                                                                                                                                                             true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_BEAMOS_CHEST] =                           Location::Chest(RC_GERUDO_TRAINING_GROUND_BEAMOS_CHEST,                          RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30655,                       0x01, "Beamos Chest",                                RHT_GERUDO_TRAINING_GROUND_BEAMOS_CHEST,                         RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY,                                                                                                                                                             true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST] =                   Location::Chest(RC_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST,                  RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22603,                        0x0B, "Hidden Ceiling Chest",                        RHT_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST,                 RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY,                                                                                                                                                             true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST] =                  Location::Chest(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST,                 RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       23206,                        0x06, "Maze Path First Chest",                       RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST,                RG_PURPLE_RUPEE);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MAZE_PATH_SECOND_CHEST] =                 Location::Chest(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_SECOND_CHEST,                RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22986,                        0x0A, "Maze Path Second Chest",                      RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_SECOND_CHEST,               RG_RED_RUPEE);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MAZE_PATH_THIRD_CHEST] =                  Location::Chest(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_THIRD_CHEST,                 RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22889,                        0x09, "Maze Path Third Chest",                       RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_THIRD_CHEST,                RG_ARROWS_30);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FINAL_CHEST] =                  Location::Chest(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FINAL_CHEST,                 RCQUEST_VANILLA, RCTYPE_BOSS_HEART_OR_OTHER_REWARD,                                       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       2860,                         0x0C, "Maze Path Final Chest",                       RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_FINAL_CHEST,                RG_ICE_ARROWS,                                                                                                                                                                                    true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_CENTRAL_CHEST] =               Location::Chest(RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_CENTRAL_CHEST,              RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       23877,                        0x05, "Maze Right Central Chest",                    RHT_GERUDO_TRAINING_GROUND_MAZE_RIGHT_CENTRAL_CHEST,             RG_BOMBCHU_5);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_SIDE_CHEST] =                  Location::Chest(RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_SIDE_CHEST,                 RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22888,                        0x08, "Maze Right Side Chest",                       RHT_GERUDO_TRAINING_GROUND_MAZE_RIGHT_SIDE_CHEST,                RG_ARROWS_30);
+    locationTable[RC_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST] =          Location::Chest(RC_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST,         RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30643,                       0x0D, "Underwater Silver Rupee Chest",               RHT_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST,        RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY,                                                                                                                                                             true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST] =                Location::Chest(RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST,               RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       31058,                        0x12, "Hammer Room Clear Chest",                     RHT_GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST,              RG_ARROWS_10);
+    locationTable[RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST] =               Location::Chest(RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST,              RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22608,                        0x10, "Hammer Room Switch Chest",                    RHT_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST,             RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY,                                                                                                                                                             true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_EYE_STATUE_CHEST] =                       Location::Chest(RC_GERUDO_TRAINING_GROUND_EYE_STATUE_CHEST,                      RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30653,                       0x03, "Eye Statue Chest",                            RHT_GERUDO_TRAINING_GROUND_EYE_STATUE_CHEST,                     RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY,                                                                                                                                                             true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_NEAR_SCARECROW_CHEST] =                   Location::Chest(RC_GERUDO_TRAINING_GROUND_NEAR_SCARECROW_CHEST,                  RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22596,                        0x04, "Near Scarecrow Chest",                        RHT_GERUDO_TRAINING_GROUND_NEAR_SCARECROW_CHEST,                 RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY,                                                                                                                                                             true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST] =               Location::Chest(RC_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST,              RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       31089,                        0x11, "Before Heavy Block Chest",                    RHT_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST,             RG_ARROWS_30);
+    locationTable[RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST] =                Location::Chest(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST,               RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       31439,                        0x0F, "Heavy Block First Chest",                     RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST,              RG_HUGE_RUPEE);
+    locationTable[RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST] =               Location::Chest(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST,              RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       30862,                        0x0E, "Heavy Block Second Chest",                    RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST,             RG_BLUE_RUPEE);
+    locationTable[RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_THIRD_CHEST] =                Location::Chest(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_THIRD_CHEST,               RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       26708,                        0x14, "Heavy Block Third Chest",                     RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_THIRD_CHEST,              RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY,                                                                                                                                                             true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FOURTH_CHEST] =               Location::Chest(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FOURTH_CHEST,              RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       24450,                        0x02, "Heavy Block Fourth Chest",                    RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FOURTH_CHEST,             RG_ICE_TRAP);
+    locationTable[RC_GERUDO_TRAINING_GROUND_FREESTANDING_KEY] =                 Location::Collectable(RC_GERUDO_TRAINING_GROUND_FREESTANDING_KEY,                      RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                                                        ACTOR_EN_ITEM00,      SCENE_GERUDO_TRAINING_GROUND,       273,                          0x01, "Freestanding Key",                            RHT_GERUDO_TRAINING_GROUND_FREESTANDING_KEY,                     RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY,                                                                                                                                                             true);
     // Gerudo Training Grounds Master Quest
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST] =                   Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST,                  RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       23879,                                             0x07, "MQ Lobby Right Chest",                        RHT_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST,                 RG_BOMBCHU_5,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST] =                    Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST,                   RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22867,                                             0x13, "MQ Lobby Left Chest",                         RHT_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST,                  RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST] =            Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST,           RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30304,                                            0x00, "MQ First Iron Knuckle Chest",                 RHT_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST,          RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_BEFORE_HEAVY_BLOCK_CHEST] =            Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_BEFORE_HEAVY_BLOCK_CHEST,           RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       31057,                                             0x11, "MQ Before Heavy Block Chest",                 RHT_GERUDO_TRAINING_GROUND_MQ_BEFORE_HEAVY_BLOCK_CHEST,          RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_EYE_STATUE_CHEST] =                    Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_EYE_STATUE_CHEST,                   RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -32669,                                            0x03, "MQ Eye Statue Chest",                         RHT_GERUDO_TRAINING_GROUND_MQ_EYE_STATUE_CHEST,                  RG_BOMBCHU_10,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_FLAME_CIRCLE_CHEST] =                  Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_FLAME_CIRCLE_CHEST,                 RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30642,                                            0x0E, "MQ Flame Circle Chest",                       RHT_GERUDO_TRAINING_GROUND_MQ_FLAME_CIRCLE_CHEST,                RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_SECOND_IRON_KNUCKLE_CHEST] =           Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_SECOND_IRON_KNUCKLE_CHEST,          RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       31058,                                             0x12, "MQ Second Iron Knuckle Chest",                RHT_GERUDO_TRAINING_GROUND_MQ_SECOND_IRON_KNUCKLE_CHEST,         RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_DINOLFOS_CHEST] =                      Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_DINOLFOS_CHEST,                     RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30655,                                            0x01, "MQ Dinolfos Chest",                           RHT_GERUDO_TRAINING_GROUND_MQ_DINOLFOS_CHEST,                    RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY, { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_ICE_ARROWS_CHEST] =                    Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_ICE_ARROWS_CHEST,                   RCQUEST_MQ,      RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -17628,                                            0x04, "MQ Ice Arrows Chest",                         RHT_GERUDO_TRAINING_GROUND_MQ_ICE_ARROWS_CHEST,                  RG_ICE_ARROWS,                        { Category::cSongDungeonReward },                                                                                                                                                     SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_CENTRAL_CHEST] =            Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_CENTRAL_CHEST,           RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22661,                                             0x05, "MQ Maze Right Central Chest",                 RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_CENTRAL_CHEST,          RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_FIRST_CHEST] =               Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_FIRST_CHEST,              RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22918,                                             0x06, "MQ Maze Path First Chest",                    RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_FIRST_CHEST,             RG_GREEN_RUPEE,                       {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_SIDE_CHEST] =               Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_SIDE_CHEST,              RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       24136,                                             0x08, "MQ Maze Right Side Chest",                    RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_SIDE_CHEST,             RG_TREASURE_GAME_GREEN_RUPEE,         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_THIRD_CHEST] =               Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_THIRD_CHEST,              RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       24137,                                             0x09, "MQ Maze Path Third Chest",                    RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_THIRD_CHEST,             RG_TREASURE_GAME_GREEN_RUPEE,         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_SECOND_CHEST] =              Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_SECOND_CHEST,             RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22986,                                             0x0A, "MQ Maze Path Second Chest",                   RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_SECOND_CHEST,            RG_RED_RUPEE,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_HIDDEN_CEILING_CHEST] =                Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_HIDDEN_CEILING_CHEST,               RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       23211,                                             0x0B, "MQ Hidden Ceiling Chest",                     RHT_GERUDO_TRAINING_GROUND_MQ_HIDDEN_CEILING_CHEST,              RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST] =       Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST,      RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30643,                                            0x0D, "MQ Underwater Silver Rupee Chest",            RHT_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST,     RG_TREASURE_GAME_GREEN_RUPEE,         { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND,     true);
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_HEAVY_BLOCK_CHEST] =                   Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_HEAVY_BLOCK_CHEST,                  RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GERUDO_TRAINING_GROUND,       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       31394,                                             0x02, "MQ Heavy Block Chest",                        RHT_GERUDO_TRAINING_GROUND_MQ_HEAVY_BLOCK_CHEST,                 RG_PURPLE_RUPEE,                      {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST] =                   Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST,                  RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       23879,                        0x07, "MQ Lobby Right Chest",                        RHT_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST,                 RG_BOMBCHU_5);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST] =                    Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST,                   RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22867,                        0x13, "MQ Lobby Left Chest",                         RHT_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST,                  RG_ARROWS_10);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST] =            Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST,           RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30304,                       0x00, "MQ First Iron Knuckle Chest",                 RHT_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST,          RG_BLUE_RUPEE);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_BEFORE_HEAVY_BLOCK_CHEST] =            Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_BEFORE_HEAVY_BLOCK_CHEST,           RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       31057,                        0x11, "MQ Before Heavy Block Chest",                 RHT_GERUDO_TRAINING_GROUND_MQ_BEFORE_HEAVY_BLOCK_CHEST,          RG_ARROWS_10);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_EYE_STATUE_CHEST] =                    Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_EYE_STATUE_CHEST,                   RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -32669,                       0x03, "MQ Eye Statue Chest",                         RHT_GERUDO_TRAINING_GROUND_MQ_EYE_STATUE_CHEST,                  RG_BOMBCHU_10);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_FLAME_CIRCLE_CHEST] =                  Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_FLAME_CIRCLE_CHEST,                 RCQUEST_MQ,      RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30642,                       0x0E, "MQ Flame Circle Chest",                       RHT_GERUDO_TRAINING_GROUND_MQ_FLAME_CIRCLE_CHEST,                RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY,                                                                                                                                                             true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_SECOND_IRON_KNUCKLE_CHEST] =           Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_SECOND_IRON_KNUCKLE_CHEST,          RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       31058,                        0x12, "MQ Second Iron Knuckle Chest",                RHT_GERUDO_TRAINING_GROUND_MQ_SECOND_IRON_KNUCKLE_CHEST,         RG_ARROWS_10);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_DINOLFOS_CHEST] =                      Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_DINOLFOS_CHEST,                     RCQUEST_MQ,      RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30655,                       0x01, "MQ Dinolfos Chest",                           RHT_GERUDO_TRAINING_GROUND_MQ_DINOLFOS_CHEST,                    RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY,                                                                                                                                                             true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_ICE_ARROWS_CHEST] =                    Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_ICE_ARROWS_CHEST,                   RCQUEST_MQ,      RCTYPE_BOSS_HEART_OR_OTHER_REWARD,                                       ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -17628,                       0x04, "MQ Ice Arrows Chest",                         RHT_GERUDO_TRAINING_GROUND_MQ_ICE_ARROWS_CHEST,                  RG_ICE_ARROWS,                                                                                                                                                                                    true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_CENTRAL_CHEST] =            Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_CENTRAL_CHEST,           RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22661,                        0x05, "MQ Maze Right Central Chest",                 RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_CENTRAL_CHEST,          RG_BLUE_RUPEE);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_FIRST_CHEST] =               Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_FIRST_CHEST,              RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22918,                        0x06, "MQ Maze Path First Chest",                    RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_FIRST_CHEST,             RG_GREEN_RUPEE);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_SIDE_CHEST] =               Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_SIDE_CHEST,              RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       24136,                        0x08, "MQ Maze Right Side Chest",                    RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_SIDE_CHEST,             RG_TREASURE_GAME_GREEN_RUPEE);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_THIRD_CHEST] =               Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_THIRD_CHEST,              RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       24137,                        0x09, "MQ Maze Path Third Chest",                    RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_THIRD_CHEST,             RG_TREASURE_GAME_GREEN_RUPEE);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_SECOND_CHEST] =              Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_SECOND_CHEST,             RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       22986,                        0x0A, "MQ Maze Path Second Chest",                   RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_SECOND_CHEST,            RG_RED_RUPEE);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_HIDDEN_CEILING_CHEST] =                Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_HIDDEN_CEILING_CHEST,               RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       23211,                        0x0B, "MQ Hidden Ceiling Chest",                     RHT_GERUDO_TRAINING_GROUND_MQ_HIDDEN_CEILING_CHEST,              RG_PURPLE_RUPEE);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST] =       Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST,      RCQUEST_MQ,      RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       -30643,                       0x0D, "MQ Underwater Silver Rupee Chest",            RHT_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST,     RG_TREASURE_GAME_GREEN_RUPEE,                                                                                                                                                                     true);
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_HEAVY_BLOCK_CHEST] =                   Location::Chest(RC_GERUDO_TRAINING_GROUND_MQ_HEAVY_BLOCK_CHEST,                  RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_GERUDO_TRAINING_GROUND,       31394,                        0x02, "MQ Heavy Block Chest",                        RHT_GERUDO_TRAINING_GROUND_MQ_HEAVY_BLOCK_CHEST,                 RG_PURPLE_RUPEE);
 
     // Ganon's Castle Shared
-    locationTable[RC_GANONS_TOWER_BOSS_KEY_CHEST] =                                   Location::Chest(RC_GANONS_TOWER_BOSS_KEY_CHEST,                                  RCQUEST_BOTH,    RCTYPE_GANON_BOSS_KEY,              RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_GANONS_TOWER,                 10219,                                             0x0B, "Tower Boss Key Chest",                        RHT_GANONS_TOWER_BOSS_KEY_CHEST,                                 RG_GANONS_CASTLE_BOSS_KEY,            {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE,      true);
+    locationTable[RC_GANONS_TOWER_BOSS_KEY_CHEST] =                                   Location::Chest(RC_GANONS_TOWER_BOSS_KEY_CHEST,                                  RCQUEST_BOTH,    RCTYPE_GANON_BOSS_KEY,                                                   ACTOR_EN_BOX,         SCENE_GANONS_TOWER,                 10219,                        0x0B, "Tower Boss Key Chest",                        RHT_GANONS_TOWER_BOSS_KEY_CHEST,                                 RG_GANONS_CASTLE_BOSS_KEY,                                                                                                                                                                        true);
     // Ganon's Castle Vanilla
-    locationTable[RC_GANONS_CASTLE_FOREST_TRIAL_CHEST] =                              Location::Chest(RC_GANONS_CASTLE_FOREST_TRIAL_CHEST,                             RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         30857,                                             0x09, "Forest Trial Chest",                          RHT_GANONS_CASTLE_FOREST_TRIAL_CHEST,                            RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST] =                          Location::Chest(RC_GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST,                         RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         24455,                                             0x07, "Water Trial Left Chest",                      RHT_GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST,                        RG_ICE_TRAP,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST] =                         Location::Chest(RC_GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST,                        RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         22790,                                             0x06, "Water Trial Right Chest",                     RHT_GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST,                       RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST] =                        Location::Chest(RC_GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST,                       RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         22664,                                             0x08, "Shadow Trial Front Chest",                    RHT_GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST,                      RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST] =             Location::Chest(RC_GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST,            RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         14021,                                             0x05, "Shadow Trial Golden Gauntlets Chest",         RHT_GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST,           RG_PROGRESSIVE_STRENGTH,              {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE,      true);
-    locationTable[RC_GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST] =               Location::Chest(RC_GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST,              RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -29326,                                            0x12, "Spirit Trial Crystal Switch Chest",           RHT_GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST,             RG_BOMBCHU_20,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST] =                    Location::Chest(RC_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST,                   RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         26964,                                             0x14, "Spirit Trial Invisible Chest",                RHT_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST,                  RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST] =                    Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST,                   RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         22668,                                             0x0C, "Light Trial First Left Chest",                RHT_GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST,                  RG_BLUE_RUPEE,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST] =                   Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST,                  RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         24459,                                             0x0B, "Light Trial Second Left Chest",               RHT_GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST,                 RG_ICE_TRAP,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST] =                    Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST,                   RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         22797,                                             0x0D, "Light Trial Third Left Chest",                RHT_GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST,                  RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST] =                   Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST,                  RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         24462,                                             0x0E, "Light Trial First Right Chest",               RHT_GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST,                 RG_ICE_TRAP,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST] =                  Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST,                 RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         22890,                                             0x0A, "Light Trial Second Right Chest",              RHT_GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST,                RG_ARROWS_30,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST] =                   Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST,                  RCQUEST_VANILLA, RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         24463,                                             0x0F, "Light Trial Third Right Chest",               RHT_GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST,                 RG_ICE_TRAP,                          {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST] =             Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST,            RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         30800,                                             0x10, "Light Trial Invisible Enemies Chest",         RHT_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST,           RG_GANONS_CASTLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE,      true);
-    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST] =                       Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST,                      RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                   RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -30639,                                            0x11, "Light Trial Lullaby Chest",                   RHT_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST,                     RG_GANONS_CASTLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE,      true);
-    locationTable[RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT] =                           Location::Base(RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,                         RCQUEST_VANILLA, RCTYPE_SCRUB,                       RCAREA_GANONS_CASTLE,                ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x05,                                              0x37, "Deku Scrub Center-Left",                      RHT_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,                        RG_BUY_BOMBS_535,                     { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT),                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT] =                          Location::Base(RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT,                        RCQUEST_VANILLA, RCTYPE_SCRUB,                       RCAREA_GANONS_CASTLE,                ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x03,                                              0x33, "Deku Scrub Center-Right",                     RHT_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT,                       RG_BUY_ARROWS_30,                     { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT),                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_DEKU_SCRUB_RIGHT] =                                 Location::Base(RC_GANONS_CASTLE_DEKU_SCRUB_RIGHT,                               RCQUEST_VANILLA, RCTYPE_SCRUB,                       RCAREA_GANONS_CASTLE,                ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x07,                                              0x39, "Deku Scrub Right",                            RHT_GANONS_CASTLE_DEKU_SCRUB_RIGHT,                              RG_BUY_RED_POTION_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_RIGHT),                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_DEKU_SCRUB_LEFT] =                                  Location::Base(RC_GANONS_CASTLE_DEKU_SCRUB_LEFT,                                RCQUEST_VANILLA, RCTYPE_SCRUB,                       RCAREA_GANONS_CASTLE,                ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x08,                                              0x3A, "Deku Scrub Left",                             RHT_GANONS_CASTLE_DEKU_SCRUB_LEFT,                               RG_BUY_GREEN_POTION,                  { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_LEFT),                               SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_FOREST_TRIAL_CHEST] =                              Location::Chest(RC_GANONS_CASTLE_FOREST_TRIAL_CHEST,                             RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         30857,                        0x09, "Forest Trial Chest",                          RHT_GANONS_CASTLE_FOREST_TRIAL_CHEST,                            RG_BLUE_RUPEE);
+    locationTable[RC_GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST] =                          Location::Chest(RC_GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST,                         RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         24455,                        0x07, "Water Trial Left Chest",                      RHT_GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST,                        RG_ICE_TRAP);
+    locationTable[RC_GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST] =                         Location::Chest(RC_GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST,                        RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         22790,                        0x06, "Water Trial Right Chest",                     RHT_GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST,                       RG_RECOVERY_HEART);
+    locationTable[RC_GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST] =                        Location::Chest(RC_GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST,                       RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         22664,                        0x08, "Shadow Trial Front Chest",                    RHT_GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST,                      RG_BLUE_RUPEE);
+    locationTable[RC_GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST] =             Location::Chest(RC_GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST,            RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         14021,                        0x05, "Shadow Trial Golden Gauntlets Chest",         RHT_GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST,           RG_PROGRESSIVE_STRENGTH,                                                                                                                                                                          true);
+    locationTable[RC_GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST] =               Location::Chest(RC_GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST,              RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -29326,                       0x12, "Spirit Trial Crystal Switch Chest",           RHT_GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST,             RG_BOMBCHU_20);
+    locationTable[RC_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST] =                    Location::Chest(RC_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST,                   RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         26964,                        0x14, "Spirit Trial Invisible Chest",                RHT_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST,                  RG_ARROWS_10);
+    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST] =                    Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST,                   RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         22668,                        0x0C, "Light Trial First Left Chest",                RHT_GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST,                  RG_BLUE_RUPEE);
+    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST] =                   Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST,                  RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         24459,                        0x0B, "Light Trial Second Left Chest",               RHT_GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST,                 RG_ICE_TRAP);
+    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST] =                    Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST,                   RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         22797,                        0x0D, "Light Trial Third Left Chest",                RHT_GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST,                  RG_RECOVERY_HEART);
+    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST] =                   Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST,                  RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         24462,                        0x0E, "Light Trial First Right Chest",               RHT_GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST,                 RG_ICE_TRAP);
+    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST] =                  Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST,                 RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         22890,                        0x0A, "Light Trial Second Right Chest",              RHT_GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST,                RG_ARROWS_30);
+    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST] =                   Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST,                  RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         24463,                        0x0F, "Light Trial Third Right Chest",               RHT_GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST,                 RG_ICE_TRAP);
+    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST] =             Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST,            RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         30800,                        0x10, "Light Trial Invisible Enemies Chest",         RHT_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST,           RG_GANONS_CASTLE_SMALL_KEY,                                                                                                                                                                       true);
+    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST] =                       Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST,                      RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -30639,                       0x11, "Light Trial Lullaby Chest",                   RHT_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST,                     RG_GANONS_CASTLE_SMALL_KEY,                                                                                                                                                                       true);
+    locationTable[RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT] =                           Location::Base(RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,                         RCQUEST_VANILLA, RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x05,                               "Deku Scrub Center-Left",                      RHT_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,                        RG_BUY_BOMBS_535,                                                   SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT));
+    locationTable[RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT] =                          Location::Base(RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT,                        RCQUEST_VANILLA, RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x03,                               "Deku Scrub Center-Right",                     RHT_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT,                       RG_BUY_ARROWS_30,                                                   SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT));
+    locationTable[RC_GANONS_CASTLE_DEKU_SCRUB_RIGHT] =                                 Location::Base(RC_GANONS_CASTLE_DEKU_SCRUB_RIGHT,                               RCQUEST_VANILLA, RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x07,                               "Deku Scrub Right",                            RHT_GANONS_CASTLE_DEKU_SCRUB_RIGHT,                              RG_BUY_RED_POTION_30,                                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_RIGHT));
+    locationTable[RC_GANONS_CASTLE_DEKU_SCRUB_LEFT] =                                  Location::Base(RC_GANONS_CASTLE_DEKU_SCRUB_LEFT,                                RCQUEST_VANILLA, RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x08,                               "Deku Scrub Left",                             RHT_GANONS_CASTLE_DEKU_SCRUB_LEFT,                               RG_BUY_GREEN_POTION,                                                SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_LEFT));
     // Ganon's Castle MQ
-    locationTable[RC_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST] =                            Location::Chest(RC_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST,                           RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         22977,                                             0x01, "MQ Water Trial Chest",                        RHT_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST,                          RG_RED_RUPEE,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST] =                Location::Chest(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST,               RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -30398,                                            0x02, "MQ Forest Trial Eye Switch Chest",            RHT_GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST,              RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST] =         Location::Chest(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST,        RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -32733,                                            0x03, "MQ Forest Trial Frozen Eye Switch Chest",     RHT_GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST,       RG_BOMBS_5,                           {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST] =                    Location::Chest(RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST,                   RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -30460,                                            0x04, "MQ Light Trial Lullaby Chest",                RHT_GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST,                  RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST] =               Location::Chest(RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST,              RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -30400,                                            0x00, "MQ Shadow Trial Bomb Flower Chest",           RHT_GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST,             RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST] =                Location::Chest(RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST,               RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -30651,                                            0x05, "MQ Shadow Trial Eye Switch Chest",            RHT_GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST,              RG_GANONS_CASTLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE,      true);
-    locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST] =          Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST,         RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -18746,                                            0x06, "MQ Spirit Trial Golden Gauntlets Chest",      RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST,        RG_PROGRESSIVE_STRENGTH,              {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE,      true);
-    locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST] =            Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST,           RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -30457,                                            0x07, "MQ Spirit Trial Sun Back Right Chest",        RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST,          RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST] =             Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST,            RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -30648,                                            0x08, "MQ Spirit Trial Sun Back Left Chest",         RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST,           RG_GANONS_CASTLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST] =            Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST,           RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -30455,                                            0x09, "MQ Spirit Trial Sun Front Left Chest",        RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST,          RG_RECOVERY_HEART,                    {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST] =                     Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST,                    RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         20586,                                             0x0A, "MQ Spirit Trial First Chest",                 RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST,                   RG_BOMBCHU_10,                        {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST] =                 Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST,                RCQUEST_MQ,      RCTYPE_STANDARD,                    RCAREA_GANONS_CASTLE,                ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         26964,                                             0x14, "MQ Spirit Trial Invisible Chest",             RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST,               RG_ARROWS_10,                         {},                                                                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY] =          Location::Collectable(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY,               RCQUEST_MQ,      RCTYPE_SMALL_KEY,                   RCAREA_GANONS_CASTLE,                ACTOR_EN_ITEM00,      SCENE_INSIDE_GANONS_CASTLE,         273,                                               0x01, "MQ Forest Trial Freestanding Key",            RHT_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY,              RG_GANONS_CASTLE_SMALL_KEY,           { Category::cVanillaSmallKey },                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE,      true);
-    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT] =                              Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,                            RCQUEST_MQ,      RCTYPE_SCRUB,                       RCAREA_GANONS_CASTLE,                ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x00,                                              0x30, "MQ Deku Scrub Right",                         RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,                           RG_BUY_DEKU_NUTS_5,                   { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT),                           SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT] =                        Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,                      RCQUEST_MQ,      RCTYPE_SCRUB,                       RCAREA_GANONS_CASTLE,                ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x05,                                              0x37, "MQ Deku Scrub Center-Left",                   RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,                     RG_BUY_BOMBS_535,                     { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT),                     SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER] =                             Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,                           RCQUEST_MQ,      RCTYPE_SCRUB,                       RCAREA_GANONS_CASTLE,                ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x03,                                              0x33, "MQ Deku Scrub Center",                        RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,                          RG_BUY_ARROWS_30,                     { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER),                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT] =                       Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT,                     RCQUEST_MQ,      RCTYPE_SCRUB,                       RCAREA_GANONS_CASTLE,                ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x07,                                              0x39, "MQ Deku Scrub Center-Right",                  RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT,                    RG_BUY_RED_POTION_30,                 { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT),                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT] =                               Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,                             RCQUEST_MQ,      RCTYPE_SCRUB,                       RCAREA_GANONS_CASTLE,                ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x08,                                              0x3A, "MQ Deku Scrub Left",                          RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,                            RG_BUY_GREEN_POTION,                  { Category::cDekuScrub },                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT),                            SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
+    locationTable[RC_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST] =                            Location::Chest(RC_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST,                           RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         22977,                        0x01, "MQ Water Trial Chest",                        RHT_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST,                          RG_RED_RUPEE);
+    locationTable[RC_GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST] =                Location::Chest(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST,               RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -30398,                       0x02, "MQ Forest Trial Eye Switch Chest",            RHT_GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST,              RG_ARROWS_10);
+    locationTable[RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST] =         Location::Chest(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST,        RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -32733,                       0x03, "MQ Forest Trial Frozen Eye Switch Chest",     RHT_GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST,       RG_BOMBS_5);
+    locationTable[RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST] =                    Location::Chest(RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST,                   RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -30460,                       0x04, "MQ Light Trial Lullaby Chest",                RHT_GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST,                  RG_RECOVERY_HEART);
+    locationTable[RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST] =               Location::Chest(RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST,              RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -30400,                       0x00, "MQ Shadow Trial Bomb Flower Chest",           RHT_GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST,             RG_ARROWS_10);
+    locationTable[RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST] =                Location::Chest(RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST,               RCQUEST_MQ,      RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -30651,                       0x05, "MQ Shadow Trial Eye Switch Chest",            RHT_GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST,              RG_GANONS_CASTLE_SMALL_KEY,                                                                                                                                                                       true);
+    locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST] =          Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST,         RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -18746,                       0x06, "MQ Spirit Trial Golden Gauntlets Chest",      RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST,        RG_PROGRESSIVE_STRENGTH,                                                                                                                                                                          true);
+    locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST] =            Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST,           RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -30457,                       0x07, "MQ Spirit Trial Sun Back Right Chest",        RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST,          RG_RECOVERY_HEART);
+    locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST] =             Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST,            RCQUEST_MQ,      RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -30648,                       0x08, "MQ Spirit Trial Sun Back Left Chest",         RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST,           RG_GANONS_CASTLE_SMALL_KEY);
+    locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST] =            Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST,           RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -30455,                       0x09, "MQ Spirit Trial Sun Front Left Chest",        RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST,          RG_RECOVERY_HEART);
+    locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST] =                     Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST,                    RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         20586,                        0x0A, "MQ Spirit Trial First Chest",                 RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST,                   RG_BOMBCHU_10);
+    locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST] =                 Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST,                RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         26964,                        0x14, "MQ Spirit Trial Invisible Chest",             RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST,               RG_ARROWS_10);
+    locationTable[RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY] =          Location::Collectable(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY,               RCQUEST_MQ,      RCTYPE_SMALL_KEY,                                                        ACTOR_EN_ITEM00,      SCENE_INSIDE_GANONS_CASTLE,         273,                          0x01, "MQ Forest Trial Freestanding Key",            RHT_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY,              RG_GANONS_CASTLE_SMALL_KEY,                                                                                                                                                                       true);
+    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT] =                              Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,                            RCQUEST_MQ,      RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x00,                               "MQ Deku Scrub Right",                         RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,                           RG_BUY_DEKU_NUTS_5,                                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT));
+    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT] =                        Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,                      RCQUEST_MQ,      RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x05,                               "MQ Deku Scrub Center-Left",                   RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,                     RG_BUY_BOMBS_535,                                                   SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT));
+    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER] =                             Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,                           RCQUEST_MQ,      RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x03,                               "MQ Deku Scrub Center",                        RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,                          RG_BUY_ARROWS_30,                                                   SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER));
+    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT] =                       Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT,                     RCQUEST_MQ,      RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x07,                               "MQ Deku Scrub Center-Right",                  RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT,                    RG_BUY_RED_POTION_30,                                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT));
+    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT] =                               Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,                             RCQUEST_MQ,      RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x08,                               "MQ Deku Scrub Left",                          RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,                            RG_BUY_GREEN_POTION,                                                SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT));
 
     // Gold Skulltula Tokens
 
     // Dungeons
     // Deku Tree
-    locationTable[RC_DEKU_TREE_GS_BASEMENT_BACK_ROOM] =                             Location::GSToken(RC_DEKU_TREE_GS_BASEMENT_BACK_ROOM,                              RCQUEST_VANILLA,                                     RCAREA_DEKU_TREE,                                          SCENE_DEKU_TREE,                    8193,                                              0x01, "GS Basement Back Room",                       RHT_DEKU_TREE_GS_BASEMENT_BACK_ROOM,                                                                   { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[RC_DEKU_TREE_GS_BASEMENT_GATE] =                                  Location::GSToken(RC_DEKU_TREE_GS_BASEMENT_GATE,                                   RCQUEST_VANILLA,                                     RCAREA_DEKU_TREE,                                          SCENE_DEKU_TREE,                    8194,                                              0x02, "GS Basement Gate",                            RHT_DEKU_TREE_GS_BASEMENT_GATE,                                                                        { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[RC_DEKU_TREE_GS_BASEMENT_VINES] =                                 Location::GSToken(RC_DEKU_TREE_GS_BASEMENT_VINES,                                  RCQUEST_VANILLA,                                     RCAREA_DEKU_TREE,                                          SCENE_DEKU_TREE,                    8196,                                              0x04, "GS Basement Vines",                           RHT_DEKU_TREE_GS_BASEMENT_VINES,                                                                       { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[RC_DEKU_TREE_GS_COMPASS_ROOM] =                                   Location::GSToken(RC_DEKU_TREE_GS_COMPASS_ROOM,                                    RCQUEST_VANILLA,                                     RCAREA_DEKU_TREE,                                          SCENE_DEKU_TREE,                    8200,                                              0x08, "GS Compass Room",                             RHT_DEKU_TREE_GS_COMPASS_ROOM,                                                                         { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[RC_DEKU_TREE_MQ_GS_LOBBY] =                                       Location::GSToken(RC_DEKU_TREE_MQ_GS_LOBBY,                                        RCQUEST_MQ,                                          RCAREA_DEKU_TREE,                                          SCENE_DEKU_TREE,                    8194,                                              0x02, "MQ GS Lobby",                                 RHT_DEKU_TREE_MQ_GS_LOBBY,                                                                             { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[RC_DEKU_TREE_MQ_GS_COMPASS_ROOM] =                                Location::GSToken(RC_DEKU_TREE_MQ_GS_COMPASS_ROOM,                                 RCQUEST_MQ,                                          RCAREA_DEKU_TREE,                                          SCENE_DEKU_TREE,                    8200,                                              0x08, "MQ GS Compass Room",                          RHT_DEKU_TREE_MQ_GS_COMPASS_ROOM,                                                                      { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[RC_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM] =                        Location::GSToken(RC_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM,                         RCQUEST_MQ,                                          RCAREA_DEKU_TREE,                                          SCENE_DEKU_TREE,                    8196,                                              0x04, "MQ GS Basement Graves Room",                  RHT_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM,                                                              { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
-    locationTable[RC_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM] =                          Location::GSToken(RC_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM,                           RCQUEST_MQ,                                          RCAREA_DEKU_TREE,                                          SCENE_DEKU_TREE,                    8193,                                              0x01, "MQ GS Basement Back Room",                    RHT_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM,                                                                { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE);
+    locationTable[RC_DEKU_TREE_GS_BASEMENT_BACK_ROOM] =                             Location::GSToken(RC_DEKU_TREE_GS_BASEMENT_BACK_ROOM,                              RCQUEST_VANILLA,                                                                                                SCENE_DEKU_TREE,                    8193,                         0x01, "GS Basement Back Room",                       RHT_DEKU_TREE_GS_BASEMENT_BACK_ROOM);
+    locationTable[RC_DEKU_TREE_GS_BASEMENT_GATE] =                                  Location::GSToken(RC_DEKU_TREE_GS_BASEMENT_GATE,                                   RCQUEST_VANILLA,                                                                                                SCENE_DEKU_TREE,                    8194,                         0x02, "GS Basement Gate",                            RHT_DEKU_TREE_GS_BASEMENT_GATE);
+    locationTable[RC_DEKU_TREE_GS_BASEMENT_VINES] =                                 Location::GSToken(RC_DEKU_TREE_GS_BASEMENT_VINES,                                  RCQUEST_VANILLA,                                                                                                SCENE_DEKU_TREE,                    8196,                         0x04, "GS Basement Vines",                           RHT_DEKU_TREE_GS_BASEMENT_VINES);
+    locationTable[RC_DEKU_TREE_GS_COMPASS_ROOM] =                                   Location::GSToken(RC_DEKU_TREE_GS_COMPASS_ROOM,                                    RCQUEST_VANILLA,                                                                                                SCENE_DEKU_TREE,                    8200,                         0x08, "GS Compass Room",                             RHT_DEKU_TREE_GS_COMPASS_ROOM);
+    locationTable[RC_DEKU_TREE_MQ_GS_LOBBY] =                                       Location::GSToken(RC_DEKU_TREE_MQ_GS_LOBBY,                                        RCQUEST_MQ,                                                                                                     SCENE_DEKU_TREE,                    8194,                         0x02, "MQ GS Lobby",                                 RHT_DEKU_TREE_MQ_GS_LOBBY);
+    locationTable[RC_DEKU_TREE_MQ_GS_COMPASS_ROOM] =                                Location::GSToken(RC_DEKU_TREE_MQ_GS_COMPASS_ROOM,                                 RCQUEST_MQ,                                                                                                     SCENE_DEKU_TREE,                    8200,                         0x08, "MQ GS Compass Room",                          RHT_DEKU_TREE_MQ_GS_COMPASS_ROOM);
+    locationTable[RC_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM] =                        Location::GSToken(RC_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM,                         RCQUEST_MQ,                                                                                                     SCENE_DEKU_TREE,                    8196,                         0x04, "MQ GS Basement Graves Room",                  RHT_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM);
+    locationTable[RC_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM] =                          Location::GSToken(RC_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM,                           RCQUEST_MQ,                                                                                                     SCENE_DEKU_TREE,                    8193,                         0x01, "MQ GS Basement Back Room",                    RHT_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM);
     // Dodongo's Cavern
-    locationTable[RC_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS] =                       Location::GSToken(RC_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS,                        RCQUEST_VANILLA,                                     RCAREA_DODONGOS_CAVERN,                                    SCENE_DODONGOS_CAVERN,              8449,                                              0x01, "GS Vines Above Stairs",                       RHT_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS,                                                             { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_GS_SCARECROW] =                                Location::GSToken(RC_DODONGOS_CAVERN_GS_SCARECROW,                                 RCQUEST_VANILLA,                                     RCAREA_DODONGOS_CAVERN,                                    SCENE_DODONGOS_CAVERN,              8450,                                              0x02, "GS Scarecrow",                                RHT_DODONGOS_CAVERN_GS_SCARECROW,                                                                      { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS] =                      Location::GSToken(RC_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS,                       RCQUEST_VANILLA,                                     RCAREA_DODONGOS_CAVERN,                                    SCENE_DODONGOS_CAVERN,              8452,                                              0x04, "GS Alcove Above Stairs",                      RHT_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS,                                                            { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_GS_BACK_ROOM] =                                Location::GSToken(RC_DODONGOS_CAVERN_GS_BACK_ROOM,                                 RCQUEST_VANILLA,                                     RCAREA_DODONGOS_CAVERN,                                    SCENE_DODONGOS_CAVERN,              8456,                                              0x08, "GS Back Room",                                RHT_DODONGOS_CAVERN_GS_BACK_ROOM,                                                                      { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS] =            Location::GSToken(RC_DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS,             RCQUEST_VANILLA,                                     RCAREA_DODONGOS_CAVERN,                                    SCENE_DODONGOS_CAVERN,              8464,                                              0x10, "GS Side Room Near Lower Lizalfos",            RHT_DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS,                                                  { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM] =                            Location::GSToken(RC_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM,                             RCQUEST_MQ,                                          RCAREA_DODONGOS_CAVERN,                                    SCENE_DODONGOS_CAVERN,              8450,                                              0x02, "MQ GS Scrub Room",                            RHT_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM,                                                                  { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM] =               Location::GSToken(RC_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM,                RCQUEST_MQ,                                          RCAREA_DODONGOS_CAVERN,                                    SCENE_DODONGOS_CAVERN,              8456,                                              0x08, "MQ GS Song of Time Block Room",               RHT_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM,                                                     { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM] =                         Location::GSToken(RC_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM,                          RCQUEST_MQ,                                          RCAREA_DODONGOS_CAVERN,                                    SCENE_DODONGOS_CAVERN,              8452,                                              0x04, "MQ GS Lizalfos Room",                         RHT_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM,                                                               { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM] =                           Location::GSToken(RC_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM,                            RCQUEST_MQ,                                          RCAREA_DODONGOS_CAVERN,                                    SCENE_DODONGOS_CAVERN,              8464,                                              0x10, "MQ GS Larvae Room",                           RHT_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM,                                                                 { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_DODONGOS_CAVERN_MQ_GS_BACK_AREA] =                             Location::GSToken(RC_DODONGOS_CAVERN_MQ_GS_BACK_AREA,                              RCQUEST_MQ,                                          RCAREA_DODONGOS_CAVERN,                                    SCENE_DODONGOS_CAVERN,              8449,                                              0x01, "MQ GS Back Room",                             RHT_DODONGOS_CAVERN_MQ_GS_BACK_AREA,                                                                   { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN);
-    locationTable[RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER] =                    Location::GSToken(RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER,                     RCQUEST_VANILLA,                                     RCAREA_JABU_JABUS_BELLY,                                   SCENE_JABU_JABU,                    8705,                                              0x01, "GS Lobby Basement Lower",                     RHT_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER,                                                          { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER] =                    Location::GSToken(RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER,                     RCQUEST_VANILLA,                                     RCAREA_JABU_JABUS_BELLY,                                   SCENE_JABU_JABU,                    8706,                                              0x02, "GS Lobby Basement Upper",                     RHT_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER,                                                          { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_JABU_JABUS_BELLY_GS_NEAR_BOSS] =                               Location::GSToken(RC_JABU_JABUS_BELLY_GS_NEAR_BOSS,                                RCQUEST_VANILLA,                                     RCAREA_JABU_JABUS_BELLY,                                   SCENE_JABU_JABU,                    8708,                                              0x04, "GS Near Boss",                                RHT_JABU_JABUS_BELLY_GS_NEAR_BOSS,                                                                     { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM] =                       Location::GSToken(RC_JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM,                        RCQUEST_VANILLA,                                     RCAREA_JABU_JABUS_BELLY,                                   SCENE_JABU_JABU,                    8712,                                              0x08, "GS Water Switch Room",                        RHT_JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM,                                                             { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM] =                     Location::GSToken(RC_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM,                      RCQUEST_MQ,                                          RCAREA_JABU_JABUS_BELLY,                                   SCENE_JABU_JABU,                    8708,                                              0x04, "MQ GS Tail Parasan Room",                     RHT_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM,                                                           { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM] =               Location::GSToken(RC_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM,                RCQUEST_MQ,                                          RCAREA_JABU_JABUS_BELLY,                                   SCENE_JABU_JABU,                    8712,                                              0x08, "MQ GS Invisible Enemies Room",                RHT_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM,                                                     { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM] =                 Location::GSToken(RC_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM,                  RCQUEST_MQ,                                          RCAREA_JABU_JABUS_BELLY,                                   SCENE_JABU_JABU,                    8705,                                              0x01, "MQ GS Boomerang Chest Room",                  RHT_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM,                                                       { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS] =                            Location::GSToken(RC_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS,                             RCQUEST_MQ,                                          RCAREA_JABU_JABUS_BELLY,                                   SCENE_JABU_JABU,                    8706,                                              0x02, "MQ GS Near Boss",                             RHT_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS,                                                                  { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
-    locationTable[RC_FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD] =                    Location::GSToken(RC_FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD,                     RCQUEST_VANILLA,                                     RCAREA_FOREST_TEMPLE,                                      SCENE_FOREST_TEMPLE,                8961,                                              0x01, "GS Raised Island Courtyard",                  RHT_FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD,                                                          { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[RC_FOREST_TEMPLE_GS_FIRST_ROOM] =                                 Location::GSToken(RC_FOREST_TEMPLE_GS_FIRST_ROOM,                                  RCQUEST_VANILLA,                                     RCAREA_FOREST_TEMPLE,                                      SCENE_FOREST_TEMPLE,                8962,                                              0x02, "GS First Room",                               RHT_FOREST_TEMPLE_GS_FIRST_ROOM,                                                                       { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[RC_FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD] =                     Location::GSToken(RC_FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD,                      RCQUEST_VANILLA,                                     RCAREA_FOREST_TEMPLE,                                      SCENE_FOREST_TEMPLE,                8964,                                              0x04, "GS Level Island Courtyard",                   RHT_FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD,                                                           { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[RC_FOREST_TEMPLE_GS_LOBBY] =                                      Location::GSToken(RC_FOREST_TEMPLE_GS_LOBBY,                                       RCQUEST_VANILLA,                                     RCAREA_FOREST_TEMPLE,                                      SCENE_FOREST_TEMPLE,                8968,                                              0x08, "GS Lobby",                                    RHT_FOREST_TEMPLE_GS_LOBBY,                                                                            { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[RC_FOREST_TEMPLE_GS_BASEMENT] =                                   Location::GSToken(RC_FOREST_TEMPLE_GS_BASEMENT,                                    RCQUEST_VANILLA,                                     RCAREA_FOREST_TEMPLE,                                      SCENE_FOREST_TEMPLE,                8976,                                              0x10, "GS Basement",                                 RHT_FOREST_TEMPLE_GS_BASEMENT,                                                                         { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[RC_FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY] =                           Location::GSToken(RC_FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY,                            RCQUEST_MQ,                                          RCAREA_FOREST_TEMPLE,                                      SCENE_FOREST_TEMPLE,                8962,                                              0x02, "MQ GS First Hallway",                         RHT_FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY,                                                                 { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[RC_FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM] =                         Location::GSToken(RC_FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM,                          RCQUEST_MQ,                                          RCAREA_FOREST_TEMPLE,                                      SCENE_FOREST_TEMPLE,                8976,                                              0x10, "MQ GS Block Push Room",                       RHT_FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM,                                                               { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[RC_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD] =                 Location::GSToken(RC_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD,                  RCQUEST_MQ,                                          RCAREA_FOREST_TEMPLE,                                      SCENE_FOREST_TEMPLE,                8961,                                              0x01, "MQ GS Raised Island Courtyard",               RHT_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD,                                                       { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[RC_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD] =                  Location::GSToken(RC_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD,                   RCQUEST_MQ,                                          RCAREA_FOREST_TEMPLE,                                      SCENE_FOREST_TEMPLE,                8964,                                              0x04, "MQ GS Level Island Courtyard",                RHT_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD,                                                        { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
-    locationTable[RC_FOREST_TEMPLE_MQ_GS_WELL] =                                    Location::GSToken(RC_FOREST_TEMPLE_MQ_GS_WELL,                                     RCQUEST_MQ,                                          RCAREA_FOREST_TEMPLE,                                      SCENE_FOREST_TEMPLE,                8968,                                              0x08, "MQ GS Well",                                  RHT_FOREST_TEMPLE_MQ_GS_WELL,                                                                          { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE);
+    locationTable[RC_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS] =                       Location::GSToken(RC_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS,                        RCQUEST_VANILLA,                                                                                                SCENE_DODONGOS_CAVERN,              8449,                         0x01, "GS Vines Above Stairs",                       RHT_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS);
+    locationTable[RC_DODONGOS_CAVERN_GS_SCARECROW] =                                Location::GSToken(RC_DODONGOS_CAVERN_GS_SCARECROW,                                 RCQUEST_VANILLA,                                                                                                SCENE_DODONGOS_CAVERN,              8450,                         0x02, "GS Scarecrow",                                RHT_DODONGOS_CAVERN_GS_SCARECROW);
+    locationTable[RC_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS] =                      Location::GSToken(RC_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS,                       RCQUEST_VANILLA,                                                                                                SCENE_DODONGOS_CAVERN,              8452,                         0x04, "GS Alcove Above Stairs",                      RHT_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS);
+    locationTable[RC_DODONGOS_CAVERN_GS_BACK_ROOM] =                                Location::GSToken(RC_DODONGOS_CAVERN_GS_BACK_ROOM,                                 RCQUEST_VANILLA,                                                                                                SCENE_DODONGOS_CAVERN,              8456,                         0x08, "GS Back Room",                                RHT_DODONGOS_CAVERN_GS_BACK_ROOM);
+    locationTable[RC_DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS] =            Location::GSToken(RC_DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS,             RCQUEST_VANILLA,                                                                                                SCENE_DODONGOS_CAVERN,              8464,                         0x10, "GS Side Room Near Lower Lizalfos",            RHT_DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS);
+    locationTable[RC_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM] =                            Location::GSToken(RC_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM,                             RCQUEST_MQ,                                                                                                     SCENE_DODONGOS_CAVERN,              8450,                         0x02, "MQ GS Scrub Room",                            RHT_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM);
+    locationTable[RC_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM] =               Location::GSToken(RC_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM,                RCQUEST_MQ,                                                                                                     SCENE_DODONGOS_CAVERN,              8456,                         0x08, "MQ GS Song of Time Block Room",               RHT_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM);
+    locationTable[RC_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM] =                         Location::GSToken(RC_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM,                          RCQUEST_MQ,                                                                                                     SCENE_DODONGOS_CAVERN,              8452,                         0x04, "MQ GS Lizalfos Room",                         RHT_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM);
+    locationTable[RC_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM] =                           Location::GSToken(RC_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM,                            RCQUEST_MQ,                                                                                                     SCENE_DODONGOS_CAVERN,              8464,                         0x10, "MQ GS Larvae Room",                           RHT_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM);
+    locationTable[RC_DODONGOS_CAVERN_MQ_GS_BACK_AREA] =                             Location::GSToken(RC_DODONGOS_CAVERN_MQ_GS_BACK_AREA,                              RCQUEST_MQ,                                                                                                     SCENE_DODONGOS_CAVERN,              8449,                         0x01, "MQ GS Back Room",                             RHT_DODONGOS_CAVERN_MQ_GS_BACK_AREA);
+    locationTable[RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER] =                    Location::GSToken(RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER,                     RCQUEST_VANILLA,                                                                                                SCENE_JABU_JABU,                    8705,                         0x01, "GS Lobby Basement Lower",                     RHT_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER);
+    locationTable[RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER] =                    Location::GSToken(RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER,                     RCQUEST_VANILLA,                                                                                                SCENE_JABU_JABU,                    8706,                         0x02, "GS Lobby Basement Upper",                     RHT_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER);
+    locationTable[RC_JABU_JABUS_BELLY_GS_NEAR_BOSS] =                               Location::GSToken(RC_JABU_JABUS_BELLY_GS_NEAR_BOSS,                                RCQUEST_VANILLA,                                                                                                SCENE_JABU_JABU,                    8708,                         0x04, "GS Near Boss",                                RHT_JABU_JABUS_BELLY_GS_NEAR_BOSS);
+    locationTable[RC_JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM] =                       Location::GSToken(RC_JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM,                        RCQUEST_VANILLA,                                                                                                SCENE_JABU_JABU,                    8712,                         0x08, "GS Water Switch Room",                        RHT_JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM] =                     Location::GSToken(RC_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM,                      RCQUEST_MQ,                                                                                                     SCENE_JABU_JABU,                    8708,                         0x04, "MQ GS Tail Parasan Room",                     RHT_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM] =               Location::GSToken(RC_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM,                RCQUEST_MQ,                                                                                                     SCENE_JABU_JABU,                    8712,                         0x08, "MQ GS Invisible Enemies Room",                RHT_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM] =                 Location::GSToken(RC_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM,                  RCQUEST_MQ,                                                                                                     SCENE_JABU_JABU,                    8705,                         0x01, "MQ GS Boomerang Chest Room",                  RHT_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM);
+    locationTable[RC_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS] =                            Location::GSToken(RC_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS,                             RCQUEST_MQ,                                                                                                     SCENE_JABU_JABU,                    8706,                         0x02, "MQ GS Near Boss",                             RHT_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS);
+    locationTable[RC_FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD] =                    Location::GSToken(RC_FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD,                     RCQUEST_VANILLA,                                                                                                SCENE_FOREST_TEMPLE,                8961,                         0x01, "GS Raised Island Courtyard",                  RHT_FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD);
+    locationTable[RC_FOREST_TEMPLE_GS_FIRST_ROOM] =                                 Location::GSToken(RC_FOREST_TEMPLE_GS_FIRST_ROOM,                                  RCQUEST_VANILLA,                                                                                                SCENE_FOREST_TEMPLE,                8962,                         0x02, "GS First Room",                               RHT_FOREST_TEMPLE_GS_FIRST_ROOM);
+    locationTable[RC_FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD] =                     Location::GSToken(RC_FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD,                      RCQUEST_VANILLA,                                                                                                SCENE_FOREST_TEMPLE,                8964,                         0x04, "GS Level Island Courtyard",                   RHT_FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD);
+    locationTable[RC_FOREST_TEMPLE_GS_LOBBY] =                                      Location::GSToken(RC_FOREST_TEMPLE_GS_LOBBY,                                       RCQUEST_VANILLA,                                                                                                SCENE_FOREST_TEMPLE,                8968,                         0x08, "GS Lobby",                                    RHT_FOREST_TEMPLE_GS_LOBBY);
+    locationTable[RC_FOREST_TEMPLE_GS_BASEMENT] =                                   Location::GSToken(RC_FOREST_TEMPLE_GS_BASEMENT,                                    RCQUEST_VANILLA,                                                                                                SCENE_FOREST_TEMPLE,                8976,                         0x10, "GS Basement",                                 RHT_FOREST_TEMPLE_GS_BASEMENT);
+    locationTable[RC_FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY] =                           Location::GSToken(RC_FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY,                            RCQUEST_MQ,                                                                                                     SCENE_FOREST_TEMPLE,                8962,                         0x02, "MQ GS First Hallway",                         RHT_FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY);
+    locationTable[RC_FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM] =                         Location::GSToken(RC_FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM,                          RCQUEST_MQ,                                                                                                     SCENE_FOREST_TEMPLE,                8976,                         0x10, "MQ GS Block Push Room",                       RHT_FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM);
+    locationTable[RC_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD] =                 Location::GSToken(RC_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD,                  RCQUEST_MQ,                                                                                                     SCENE_FOREST_TEMPLE,                8961,                         0x01, "MQ GS Raised Island Courtyard",               RHT_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD);
+    locationTable[RC_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD] =                  Location::GSToken(RC_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD,                   RCQUEST_MQ,                                                                                                     SCENE_FOREST_TEMPLE,                8964,                         0x04, "MQ GS Level Island Courtyard",                RHT_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD);
+    locationTable[RC_FOREST_TEMPLE_MQ_GS_WELL] =                                    Location::GSToken(RC_FOREST_TEMPLE_MQ_GS_WELL,                                     RCQUEST_MQ,                                                                                                     SCENE_FOREST_TEMPLE,                8968,                         0x08, "MQ GS Well",                                  RHT_FOREST_TEMPLE_MQ_GS_WELL);
     // Fire Temple
-    locationTable[RC_FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM] =                            Location::GSToken(RC_FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM,                             RCQUEST_VANILLA,                                     RCAREA_FIRE_TEMPLE,                                        SCENE_FIRE_TEMPLE,                  9217,                                              0x01, "GS Song of Time Room",                        RHT_FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM,                                                                  { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[RC_FIRE_TEMPLE_GS_BOSS_KEY_LOOP] =                                Location::GSToken(RC_FIRE_TEMPLE_GS_BOSS_KEY_LOOP,                                 RCQUEST_VANILLA,                                     RCAREA_FIRE_TEMPLE,                                        SCENE_FIRE_TEMPLE,                  9218,                                              0x02, "GS Boss Key Loop",                            RHT_FIRE_TEMPLE_GS_BOSS_KEY_LOOP,                                                                      { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[RC_FIRE_TEMPLE_GS_BOULDER_MAZE] =                                 Location::GSToken(RC_FIRE_TEMPLE_GS_BOULDER_MAZE,                                  RCQUEST_VANILLA,                                     RCAREA_FIRE_TEMPLE,                                        SCENE_FIRE_TEMPLE,                  9220,                                              0x04, "GS Boulder Maze",                             RHT_FIRE_TEMPLE_GS_BOULDER_MAZE,                                                                       { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[RC_FIRE_TEMPLE_GS_SCARECROW_TOP] =                                Location::GSToken(RC_FIRE_TEMPLE_GS_SCARECROW_TOP,                                 RCQUEST_VANILLA,                                     RCAREA_FIRE_TEMPLE,                                        SCENE_FIRE_TEMPLE,                  9224,                                              0x08, "GS Scarecrow Top",                            RHT_FIRE_TEMPLE_GS_SCARECROW_TOP,                                                                      { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[RC_FIRE_TEMPLE_GS_SCARECROW_CLIMB] =                              Location::GSToken(RC_FIRE_TEMPLE_GS_SCARECROW_CLIMB,                               RCQUEST_VANILLA,                                     RCAREA_FIRE_TEMPLE,                                        SCENE_FIRE_TEMPLE,                  9232,                                              0x10, "GS Scarecrow Climb",                          RHT_FIRE_TEMPLE_GS_SCARECROW_CLIMB,                                                                    { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[RC_FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE] =                      Location::GSToken(RC_FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE,                       RCQUEST_MQ,                                          RCAREA_FIRE_TEMPLE,                                        SCENE_FIRE_TEMPLE,                  9218,                                              0x02, "MQ GS Above Fire Wall Maze",                  RHT_FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE,                                                            { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER] =                     Location::GSToken(RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER,                      RCQUEST_MQ,                                          RCAREA_FIRE_TEMPLE,                                        SCENE_FIRE_TEMPLE,                  9224,                                              0x08, "MQ GS Fire Wall Maze Center",                 RHT_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER,                                                           { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[RC_FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR] =                   Location::GSToken(RC_FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR,                    RCQUEST_MQ,                                          RCAREA_FIRE_TEMPLE,                                        SCENE_FIRE_TEMPLE,                  9217,                                              0x01, "MQ GS Big Lava Room Open Door",               RHT_FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR,                                                         { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM] =                  Location::GSToken(RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM,                   RCQUEST_MQ,                                          RCAREA_FIRE_TEMPLE,                                        SCENE_FIRE_TEMPLE,                  9232,                                              0x10, "MQ GS Fire Wall Maze Side Room",              RHT_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM,                                                        { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
-    locationTable[RC_FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE] =                             Location::GSToken(RC_FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE,                              RCQUEST_MQ,                                          RCAREA_FIRE_TEMPLE,                                        SCENE_FIRE_TEMPLE,                  9220,                                              0x04, "MQ GS Skull on Fire",                         RHT_FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE,                                                                   { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE);
+    locationTable[RC_FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM] =                            Location::GSToken(RC_FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM,                             RCQUEST_VANILLA,                                                                                                SCENE_FIRE_TEMPLE,                  9217,                         0x01, "GS Song of Time Room",                        RHT_FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM);
+    locationTable[RC_FIRE_TEMPLE_GS_BOSS_KEY_LOOP] =                                Location::GSToken(RC_FIRE_TEMPLE_GS_BOSS_KEY_LOOP,                                 RCQUEST_VANILLA,                                                                                                SCENE_FIRE_TEMPLE,                  9218,                         0x02, "GS Boss Key Loop",                            RHT_FIRE_TEMPLE_GS_BOSS_KEY_LOOP);
+    locationTable[RC_FIRE_TEMPLE_GS_BOULDER_MAZE] =                                 Location::GSToken(RC_FIRE_TEMPLE_GS_BOULDER_MAZE,                                  RCQUEST_VANILLA,                                                                                                SCENE_FIRE_TEMPLE,                  9220,                         0x04, "GS Boulder Maze",                             RHT_FIRE_TEMPLE_GS_BOULDER_MAZE);
+    locationTable[RC_FIRE_TEMPLE_GS_SCARECROW_TOP] =                                Location::GSToken(RC_FIRE_TEMPLE_GS_SCARECROW_TOP,                                 RCQUEST_VANILLA,                                                                                                SCENE_FIRE_TEMPLE,                  9224,                         0x08, "GS Scarecrow Top",                            RHT_FIRE_TEMPLE_GS_SCARECROW_TOP);
+    locationTable[RC_FIRE_TEMPLE_GS_SCARECROW_CLIMB] =                              Location::GSToken(RC_FIRE_TEMPLE_GS_SCARECROW_CLIMB,                               RCQUEST_VANILLA,                                                                                                SCENE_FIRE_TEMPLE,                  9232,                         0x10, "GS Scarecrow Climb",                          RHT_FIRE_TEMPLE_GS_SCARECROW_CLIMB);
+    locationTable[RC_FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE] =                      Location::GSToken(RC_FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE,                       RCQUEST_MQ,                                                                                                     SCENE_FIRE_TEMPLE,                  9218,                         0x02, "MQ GS Above Fire Wall Maze",                  RHT_FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE);
+    locationTable[RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER] =                     Location::GSToken(RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER,                      RCQUEST_MQ,                                                                                                     SCENE_FIRE_TEMPLE,                  9224,                         0x08, "MQ GS Fire Wall Maze Center",                 RHT_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER);
+    locationTable[RC_FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR] =                   Location::GSToken(RC_FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR,                    RCQUEST_MQ,                                                                                                     SCENE_FIRE_TEMPLE,                  9217,                         0x01, "MQ GS Big Lava Room Open Door",               RHT_FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR);
+    locationTable[RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM] =                  Location::GSToken(RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM,                   RCQUEST_MQ,                                                                                                     SCENE_FIRE_TEMPLE,                  9232,                         0x10, "MQ GS Fire Wall Maze Side Room",              RHT_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM);
+    locationTable[RC_FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE] =                             Location::GSToken(RC_FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE,                              RCQUEST_MQ,                                                                                                     SCENE_FIRE_TEMPLE,                  9220,                         0x04, "MQ GS Skull on Fire",                         RHT_FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE);
     // Water Temple
-    locationTable[RC_WATER_TEMPLE_GS_BEHIND_GATE] =                                 Location::GSToken(RC_WATER_TEMPLE_GS_BEHIND_GATE,                                  RCQUEST_VANILLA,                                     RCAREA_WATER_TEMPLE,                                       SCENE_WATER_TEMPLE,                 9473,                                              0x01, "GS Behind Gate",                              RHT_WATER_TEMPLE_GS_BEHIND_GATE,                                                                       { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[RC_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM] =                       Location::GSToken(RC_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM,                        RCQUEST_VANILLA,                                     RCAREA_WATER_TEMPLE,                                       SCENE_WATER_TEMPLE,                 9474,                                              0x02, "GS Falling Platform Room",                    RHT_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM,                                                             { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[RC_WATER_TEMPLE_GS_CENTRAL_PILLAR] =                              Location::GSToken(RC_WATER_TEMPLE_GS_CENTRAL_PILLAR,                               RCQUEST_VANILLA,                                     RCAREA_WATER_TEMPLE,                                       SCENE_WATER_TEMPLE,                 9476,                                              0x04, "GS Central Pillar",                           RHT_WATER_TEMPLE_GS_CENTRAL_PILLAR,                                                                    { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[RC_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST] =                         Location::GSToken(RC_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST,                          RCQUEST_VANILLA,                                     RCAREA_WATER_TEMPLE,                                       SCENE_WATER_TEMPLE,                 9480,                                              0x08, "GS Near Boss Key Chest",                      RHT_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST,                                                               { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[RC_WATER_TEMPLE_GS_RIVER] =                                       Location::GSToken(RC_WATER_TEMPLE_GS_RIVER,                                        RCQUEST_VANILLA,                                     RCAREA_WATER_TEMPLE,                                       SCENE_WATER_TEMPLE,                 9488,                                              0x10, "GS River",                                    RHT_WATER_TEMPLE_GS_RIVER,                                                                             { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[RC_WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH] =                Location::GSToken(RC_WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH,                 RCQUEST_MQ,                                          RCAREA_WATER_TEMPLE,                                       SCENE_WATER_TEMPLE,                 9476,                                              0x04, "MQ GS Before Upper Water Switch",             RHT_WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH,                                                      { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[RC_WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA] =                    Location::GSToken(RC_WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA,                     RCQUEST_MQ,                                          RCAREA_WATER_TEMPLE,                                       SCENE_WATER_TEMPLE,                 9480,                                              0x08, "MQ GS Freestanding Key Area",                 RHT_WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA,                                                          { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[RC_WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY] =                         Location::GSToken(RC_WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY,                          RCQUEST_MQ,                                          RCAREA_WATER_TEMPLE,                                       SCENE_WATER_TEMPLE,                 9473,                                              0x01, "MQ GS Lizalfos Hallway",                      RHT_WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY,                                                               { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[RC_WATER_TEMPLE_MQ_GS_RIVER] =                                    Location::GSToken(RC_WATER_TEMPLE_MQ_GS_RIVER,                                     RCQUEST_MQ,                                          RCAREA_WATER_TEMPLE,                                       SCENE_WATER_TEMPLE,                 9474,                                              0x02, "MQ GS River",                                 RHT_WATER_TEMPLE_MQ_GS_RIVER,                                                                          { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
-    locationTable[RC_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH] =                        Location::GSToken(RC_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH,                         RCQUEST_MQ,                                          RCAREA_WATER_TEMPLE,                                       SCENE_WATER_TEMPLE,                 9488,                                              0x10, "MQ GS Triple Wall Torch",                     RHT_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH,                                                              { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE);
+    locationTable[RC_WATER_TEMPLE_GS_BEHIND_GATE] =                                 Location::GSToken(RC_WATER_TEMPLE_GS_BEHIND_GATE,                                  RCQUEST_VANILLA,                                                                                                SCENE_WATER_TEMPLE,                 9473,                         0x01, "GS Behind Gate",                              RHT_WATER_TEMPLE_GS_BEHIND_GATE);
+    locationTable[RC_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM] =                       Location::GSToken(RC_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM,                        RCQUEST_VANILLA,                                                                                                SCENE_WATER_TEMPLE,                 9474,                         0x02, "GS Falling Platform Room",                    RHT_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM);
+    locationTable[RC_WATER_TEMPLE_GS_CENTRAL_PILLAR] =                              Location::GSToken(RC_WATER_TEMPLE_GS_CENTRAL_PILLAR,                               RCQUEST_VANILLA,                                                                                                SCENE_WATER_TEMPLE,                 9476,                         0x04, "GS Central Pillar",                           RHT_WATER_TEMPLE_GS_CENTRAL_PILLAR);
+    locationTable[RC_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST] =                         Location::GSToken(RC_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST,                          RCQUEST_VANILLA,                                                                                                SCENE_WATER_TEMPLE,                 9480,                         0x08, "GS Near Boss Key Chest",                      RHT_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST);
+    locationTable[RC_WATER_TEMPLE_GS_RIVER] =                                       Location::GSToken(RC_WATER_TEMPLE_GS_RIVER,                                        RCQUEST_VANILLA,                                                                                                SCENE_WATER_TEMPLE,                 9488,                         0x10, "GS River",                                    RHT_WATER_TEMPLE_GS_RIVER);
+    locationTable[RC_WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH] =                Location::GSToken(RC_WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH,                 RCQUEST_MQ,                                                                                                     SCENE_WATER_TEMPLE,                 9476,                         0x04, "MQ GS Before Upper Water Switch",             RHT_WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH);
+    locationTable[RC_WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA] =                    Location::GSToken(RC_WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA,                     RCQUEST_MQ,                                                                                                     SCENE_WATER_TEMPLE,                 9480,                         0x08, "MQ GS Freestanding Key Area",                 RHT_WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA);
+    locationTable[RC_WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY] =                         Location::GSToken(RC_WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY,                          RCQUEST_MQ,                                                                                                     SCENE_WATER_TEMPLE,                 9473,                         0x01, "MQ GS Lizalfos Hallway",                      RHT_WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY);
+    locationTable[RC_WATER_TEMPLE_MQ_GS_RIVER] =                                    Location::GSToken(RC_WATER_TEMPLE_MQ_GS_RIVER,                                     RCQUEST_MQ,                                                                                                     SCENE_WATER_TEMPLE,                 9474,                         0x02, "MQ GS River",                                 RHT_WATER_TEMPLE_MQ_GS_RIVER);
+    locationTable[RC_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH] =                        Location::GSToken(RC_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH,                         RCQUEST_MQ,                                                                                                     SCENE_WATER_TEMPLE,                 9488,                         0x10, "MQ GS Triple Wall Torch",                     RHT_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH);
     // Spirit Temple
-    locationTable[RC_SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM] =                  Location::GSToken(RC_SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM,                   RCQUEST_VANILLA,                                     RCAREA_SPIRIT_TEMPLE,                                      SCENE_SPIRIT_TEMPLE,                9729,                                              0x01, "GS Hall After Sun Block Room",                RHT_SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM,                                                        { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_GS_BOULDER_ROOM] =                               Location::GSToken(RC_SPIRIT_TEMPLE_GS_BOULDER_ROOM,                                RCQUEST_VANILLA,                                     RCAREA_SPIRIT_TEMPLE,                                      SCENE_SPIRIT_TEMPLE,                9730,                                              0x02, "GS Boulder Room",                             RHT_SPIRIT_TEMPLE_GS_BOULDER_ROOM,                                                                     { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_GS_LOBBY] =                                      Location::GSToken(RC_SPIRIT_TEMPLE_GS_LOBBY,                                       RCQUEST_VANILLA,                                     RCAREA_SPIRIT_TEMPLE,                                      SCENE_SPIRIT_TEMPLE,                9732,                                              0x04, "GS Lobby",                                    RHT_SPIRIT_TEMPLE_GS_LOBBY,                                                                            { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM] =                          Location::GSToken(RC_SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM,                           RCQUEST_VANILLA,                                     RCAREA_SPIRIT_TEMPLE,                                      SCENE_SPIRIT_TEMPLE,                9736,                                              0x08, "GS Sun on Floor Room",                        RHT_SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM,                                                                { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_GS_METAL_FENCE] =                                Location::GSToken(RC_SPIRIT_TEMPLE_GS_METAL_FENCE,                                 RCQUEST_VANILLA,                                     RCAREA_SPIRIT_TEMPLE,                                      SCENE_SPIRIT_TEMPLE,                9744,                                              0x10, "GS Metal Fence",                              RHT_SPIRIT_TEMPLE_GS_METAL_FENCE,                                                                      { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM] =                           Location::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM,                            RCQUEST_MQ,                                          RCAREA_SPIRIT_TEMPLE,                                      SCENE_SPIRIT_TEMPLE,                9736,                                              0x08, "MQ GS Symphony Room",                         RHT_SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM,                                                                 { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM] =                             Location::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM,                              RCQUEST_MQ,                                          RCAREA_SPIRIT_TEMPLE,                                      SCENE_SPIRIT_TEMPLE,                9730,                                              0x02, "MQ GS Leever Room",                           RHT_SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM,                                                                   { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST] =                  Location::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST,                   RCQUEST_MQ,                                          RCAREA_SPIRIT_TEMPLE,                                      SCENE_SPIRIT_TEMPLE,                9732,                                              0x04, "MQ GS Nine Thrones Room West",                RHT_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST,                                                        { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH] =                 Location::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH,                  RCQUEST_MQ,                                          RCAREA_SPIRIT_TEMPLE,                                      SCENE_SPIRIT_TEMPLE,                9744,                                              0x10, "MQ GS Nine Thrones Room North",               RHT_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH,                                                       { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
-    locationTable[RC_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM] =                          Location::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM,                           RCQUEST_MQ,                                          RCAREA_SPIRIT_TEMPLE,                                      SCENE_SPIRIT_TEMPLE,                9729,                                              0x01, "MQ GS Sun Block Room",                        RHT_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM,                                                                { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE);
+    locationTable[RC_SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM] =                  Location::GSToken(RC_SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM,                   RCQUEST_VANILLA,                                                                                                SCENE_SPIRIT_TEMPLE,                9729,                         0x01, "GS Hall After Sun Block Room",                RHT_SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM);
+    locationTable[RC_SPIRIT_TEMPLE_GS_BOULDER_ROOM] =                               Location::GSToken(RC_SPIRIT_TEMPLE_GS_BOULDER_ROOM,                                RCQUEST_VANILLA,                                                                                                SCENE_SPIRIT_TEMPLE,                9730,                         0x02, "GS Boulder Room",                             RHT_SPIRIT_TEMPLE_GS_BOULDER_ROOM);
+    locationTable[RC_SPIRIT_TEMPLE_GS_LOBBY] =                                      Location::GSToken(RC_SPIRIT_TEMPLE_GS_LOBBY,                                       RCQUEST_VANILLA,                                                                                                SCENE_SPIRIT_TEMPLE,                9732,                         0x04, "GS Lobby",                                    RHT_SPIRIT_TEMPLE_GS_LOBBY);
+    locationTable[RC_SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM] =                          Location::GSToken(RC_SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM,                           RCQUEST_VANILLA,                                                                                                SCENE_SPIRIT_TEMPLE,                9736,                         0x08, "GS Sun on Floor Room",                        RHT_SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM);
+    locationTable[RC_SPIRIT_TEMPLE_GS_METAL_FENCE] =                                Location::GSToken(RC_SPIRIT_TEMPLE_GS_METAL_FENCE,                                 RCQUEST_VANILLA,                                                                                                SCENE_SPIRIT_TEMPLE,                9744,                         0x10, "GS Metal Fence",                              RHT_SPIRIT_TEMPLE_GS_METAL_FENCE);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM] =                           Location::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM,                            RCQUEST_MQ,                                                                                                     SCENE_SPIRIT_TEMPLE,                9736,                         0x08, "MQ GS Symphony Room",                         RHT_SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM] =                             Location::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM,                              RCQUEST_MQ,                                                                                                     SCENE_SPIRIT_TEMPLE,                9730,                         0x02, "MQ GS Leever Room",                           RHT_SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST] =                  Location::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST,                   RCQUEST_MQ,                                                                                                     SCENE_SPIRIT_TEMPLE,                9732,                         0x04, "MQ GS Nine Thrones Room West",                RHT_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH] =                 Location::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH,                  RCQUEST_MQ,                                                                                                     SCENE_SPIRIT_TEMPLE,                9744,                         0x10, "MQ GS Nine Thrones Room North",               RHT_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH);
+    locationTable[RC_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM] =                          Location::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM,                           RCQUEST_MQ,                                                                                                     SCENE_SPIRIT_TEMPLE,                9729,                         0x01, "MQ GS Sun Block Room",                        RHT_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM);
     // Shadow Temple
-    locationTable[RC_SHADOW_TEMPLE_GS_SINGLE_GIANT_POT] =                           Location::GSToken(RC_SHADOW_TEMPLE_GS_SINGLE_GIANT_POT,                            RCQUEST_VANILLA,                                     RCAREA_SHADOW_TEMPLE,                                      SCENE_SHADOW_TEMPLE,                9985,                                              0x01, "GS Single Giant Pot",                         RHT_SHADOW_TEMPLE_GS_SINGLE_GIANT_POT,                                                                 { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM] =                        Location::GSToken(RC_SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM,                         RCQUEST_VANILLA,                                     RCAREA_SHADOW_TEMPLE,                                      SCENE_SHADOW_TEMPLE,                9986,                                              0x02, "GS Falling Spikes Room",                      RHT_SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM,                                                              { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT] =                           Location::GSToken(RC_SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT,                            RCQUEST_VANILLA,                                     RCAREA_SHADOW_TEMPLE,                                      SCENE_SHADOW_TEMPLE,                9988,                                              0x04, "GS Triple Giant Pot",                         RHT_SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT,                                                                 { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM] =                             Location::GSToken(RC_SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM,                              RCQUEST_VANILLA,                                     RCAREA_SHADOW_TEMPLE,                                      SCENE_SHADOW_TEMPLE,                9992,                                              0x08, "GS Like Like Room",                           RHT_SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM,                                                                   { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_GS_NEAR_SHIP] =                                  Location::GSToken(RC_SHADOW_TEMPLE_GS_NEAR_SHIP,                                   RCQUEST_VANILLA,                                     RCAREA_SHADOW_TEMPLE,                                      SCENE_SHADOW_TEMPLE,                10000,                                             0x10, "GS Near Ship",                                RHT_SHADOW_TEMPLE_GS_NEAR_SHIP,                                                                        { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM] =                     Location::GSToken(RC_SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM,                      RCQUEST_MQ,                                          RCAREA_SHADOW_TEMPLE,                                      SCENE_SHADOW_TEMPLE,                9986,                                              0x02, "MQ GS Falling Spikes Room",                   RHT_SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM,                                                           { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM] =                          Location::GSToken(RC_SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM,                           RCQUEST_MQ,                                          RCAREA_SHADOW_TEMPLE,                                      SCENE_SHADOW_TEMPLE,                9985,                                              0x01, "MQ GS Wind Hint Room",                        RHT_SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM,                                                                { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_MQ_GS_AFTER_WIND] =                              Location::GSToken(RC_SHADOW_TEMPLE_MQ_GS_AFTER_WIND,                               RCQUEST_MQ,                                          RCAREA_SHADOW_TEMPLE,                                      SCENE_SHADOW_TEMPLE,                9992,                                              0x08, "MQ GS After Wind",                            RHT_SHADOW_TEMPLE_MQ_GS_AFTER_WIND,                                                                    { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_MQ_GS_AFTER_SHIP] =                              Location::GSToken(RC_SHADOW_TEMPLE_MQ_GS_AFTER_SHIP,                               RCQUEST_MQ,                                          RCAREA_SHADOW_TEMPLE,                                      SCENE_SHADOW_TEMPLE,                10000,                                             0x10, "MQ GS After Ship",                            RHT_SHADOW_TEMPLE_MQ_GS_AFTER_SHIP,                                                                    { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
-    locationTable[RC_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS] =                               Location::GSToken(RC_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS,                                RCQUEST_MQ,                                          RCAREA_SHADOW_TEMPLE,                                      SCENE_SHADOW_TEMPLE,                9988,                                              0x04, "MQ GS Near Boss",                             RHT_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS,                                                                     { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE);
+    locationTable[RC_SHADOW_TEMPLE_GS_SINGLE_GIANT_POT] =                           Location::GSToken(RC_SHADOW_TEMPLE_GS_SINGLE_GIANT_POT,                            RCQUEST_VANILLA,                                                                                                SCENE_SHADOW_TEMPLE,                9985,                         0x01, "GS Single Giant Pot",                         RHT_SHADOW_TEMPLE_GS_SINGLE_GIANT_POT);
+    locationTable[RC_SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM] =                        Location::GSToken(RC_SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM,                         RCQUEST_VANILLA,                                                                                                SCENE_SHADOW_TEMPLE,                9986,                         0x02, "GS Falling Spikes Room",                      RHT_SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM);
+    locationTable[RC_SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT] =                           Location::GSToken(RC_SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT,                            RCQUEST_VANILLA,                                                                                                SCENE_SHADOW_TEMPLE,                9988,                         0x04, "GS Triple Giant Pot",                         RHT_SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT);
+    locationTable[RC_SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM] =                             Location::GSToken(RC_SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM,                              RCQUEST_VANILLA,                                                                                                SCENE_SHADOW_TEMPLE,                9992,                         0x08, "GS Like Like Room",                           RHT_SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM);
+    locationTable[RC_SHADOW_TEMPLE_GS_NEAR_SHIP] =                                  Location::GSToken(RC_SHADOW_TEMPLE_GS_NEAR_SHIP,                                   RCQUEST_VANILLA,                                                                                                SCENE_SHADOW_TEMPLE,                10000,                        0x10, "GS Near Ship",                                RHT_SHADOW_TEMPLE_GS_NEAR_SHIP);
+    locationTable[RC_SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM] =                     Location::GSToken(RC_SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM,                      RCQUEST_MQ,                                                                                                     SCENE_SHADOW_TEMPLE,                9986,                         0x02, "MQ GS Falling Spikes Room",                   RHT_SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM);
+    locationTable[RC_SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM] =                          Location::GSToken(RC_SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM,                           RCQUEST_MQ,                                                                                                     SCENE_SHADOW_TEMPLE,                9985,                         0x01, "MQ GS Wind Hint Room",                        RHT_SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM);
+    locationTable[RC_SHADOW_TEMPLE_MQ_GS_AFTER_WIND] =                              Location::GSToken(RC_SHADOW_TEMPLE_MQ_GS_AFTER_WIND,                               RCQUEST_MQ,                                                                                                     SCENE_SHADOW_TEMPLE,                9992,                         0x08, "MQ GS After Wind",                            RHT_SHADOW_TEMPLE_MQ_GS_AFTER_WIND);
+    locationTable[RC_SHADOW_TEMPLE_MQ_GS_AFTER_SHIP] =                              Location::GSToken(RC_SHADOW_TEMPLE_MQ_GS_AFTER_SHIP,                               RCQUEST_MQ,                                                                                                     SCENE_SHADOW_TEMPLE,                10000,                        0x10, "MQ GS After Ship",                            RHT_SHADOW_TEMPLE_MQ_GS_AFTER_SHIP);
+    locationTable[RC_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS] =                               Location::GSToken(RC_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS,                                RCQUEST_MQ,                                                                                                     SCENE_SHADOW_TEMPLE,                9988,                         0x04, "MQ GS Near Boss",                             RHT_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS);
     // Bottom of the Well
-    locationTable[RC_BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE] =                        Location::GSToken(RC_BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE,                         RCQUEST_VANILLA,                                     RCAREA_BOTTOM_OF_THE_WELL,                                 SCENE_BOTTOM_OF_THE_WELL,           10241,                                             0x01, "GS Like Like Cage",                           RHT_BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE,                                                              { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[RC_BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM] =                       Location::GSToken(RC_BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM,                        RCQUEST_VANILLA,                                     RCAREA_BOTTOM_OF_THE_WELL,                                 SCENE_BOTTOM_OF_THE_WELL,           10242,                                             0x02, "GS East Inner Room",                          RHT_BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM,                                                             { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[RC_BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM] =                       Location::GSToken(RC_BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM,                        RCQUEST_VANILLA,                                     RCAREA_BOTTOM_OF_THE_WELL,                                 SCENE_BOTTOM_OF_THE_WELL,           10244,                                             0x04, "GS West Inner Room",                          RHT_BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM,                                                             { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT] =                           Location::GSToken(RC_BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT,                            RCQUEST_MQ,                                          RCAREA_BOTTOM_OF_THE_WELL,                                 SCENE_BOTTOM_OF_THE_WELL,           10241,                                             0x01, "MQ GS Basement",                              RHT_BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT,                                                                 { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM] =                        Location::GSToken(RC_BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM,                         RCQUEST_MQ,                                          RCAREA_BOTTOM_OF_THE_WELL,                                 SCENE_BOTTOM_OF_THE_WELL,           10244,                                             0x04, "MQ GS Coffin Room",                           RHT_BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM,                                                              { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
-    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM] =                    Location::GSToken(RC_BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM,                     RCQUEST_MQ,                                          RCAREA_BOTTOM_OF_THE_WELL,                                 SCENE_BOTTOM_OF_THE_WELL,           10242,                                             0x02, "MQ GS West Inner Room",                       RHT_BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM,                                                          { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
+    locationTable[RC_BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE] =                        Location::GSToken(RC_BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE,                         RCQUEST_VANILLA,                                                                                                SCENE_BOTTOM_OF_THE_WELL,           10241,                        0x01, "GS Like Like Cage",                           RHT_BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE);
+    locationTable[RC_BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM] =                       Location::GSToken(RC_BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM,                        RCQUEST_VANILLA,                                                                                                SCENE_BOTTOM_OF_THE_WELL,           10242,                        0x02, "GS East Inner Room",                          RHT_BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM);
+    locationTable[RC_BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM] =                       Location::GSToken(RC_BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM,                        RCQUEST_VANILLA,                                                                                                SCENE_BOTTOM_OF_THE_WELL,           10244,                        0x04, "GS West Inner Room",                          RHT_BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM);
+    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT] =                           Location::GSToken(RC_BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT,                            RCQUEST_MQ,                                                                                                     SCENE_BOTTOM_OF_THE_WELL,           10241,                        0x01, "MQ GS Basement",                              RHT_BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT);
+    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM] =                        Location::GSToken(RC_BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM,                         RCQUEST_MQ,                                                                                                     SCENE_BOTTOM_OF_THE_WELL,           10244,                        0x04, "MQ GS Coffin Room",                           RHT_BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM);
+    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM] =                    Location::GSToken(RC_BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM,                     RCQUEST_MQ,                                                                                                     SCENE_BOTTOM_OF_THE_WELL,           10242,                        0x02, "MQ GS West Inner Room",                       RHT_BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM);
     // Ice Cavern
-    locationTable[RC_ICE_CAVERN_GS_PUSH_BLOCK_ROOM] =                               Location::GSToken(RC_ICE_CAVERN_GS_PUSH_BLOCK_ROOM,                                RCQUEST_VANILLA,                                     RCAREA_ICE_CAVERN,                                         SCENE_ICE_CAVERN,                   10497,                                             0x01, "GS Push Block Room",                          RHT_ICE_CAVERN_GS_PUSH_BLOCK_ROOM,                                                                     { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
-    locationTable[RC_ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM] =                          Location::GSToken(RC_ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM,                           RCQUEST_VANILLA,                                     RCAREA_ICE_CAVERN,                                         SCENE_ICE_CAVERN,                   10498,                                             0x02, "GS Spinning Scythe Room",                     RHT_ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM,                                                                { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
-    locationTable[RC_ICE_CAVERN_GS_HEART_PIECE_ROOM] =                              Location::GSToken(RC_ICE_CAVERN_GS_HEART_PIECE_ROOM,                               RCQUEST_VANILLA,                                     RCAREA_ICE_CAVERN,                                         SCENE_ICE_CAVERN,                   10500,                                             0x04, "GS Heart Piece Room",                         RHT_ICE_CAVERN_GS_HEART_PIECE_ROOM,                                                                    { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
-    locationTable[RC_ICE_CAVERN_MQ_GS_SCARECROW] =                                  Location::GSToken(RC_ICE_CAVERN_MQ_GS_SCARECROW,                                   RCQUEST_MQ,                                          RCAREA_ICE_CAVERN,                                         SCENE_ICE_CAVERN,                   10497,                                             0x01, "MQ GS Scarecrow",                             RHT_ICE_CAVERN_MQ_GS_SCARECROW,                                                                        { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
-    locationTable[RC_ICE_CAVERN_MQ_GS_ICE_BLOCK] =                                  Location::GSToken(RC_ICE_CAVERN_MQ_GS_ICE_BLOCK,                                   RCQUEST_MQ,                                          RCAREA_ICE_CAVERN,                                         SCENE_ICE_CAVERN,                   10500,                                             0x04, "MQ GS Ice Block",                             RHT_ICE_CAVERN_MQ_GS_ICE_BLOCK,                                                                        { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
-    locationTable[RC_ICE_CAVERN_MQ_GS_RED_ICE] =                                    Location::GSToken(RC_ICE_CAVERN_MQ_GS_RED_ICE,                                     RCQUEST_MQ,                                          RCAREA_ICE_CAVERN,                                         SCENE_ICE_CAVERN,                   10498,                                             0x02, "MQ GS Red Ice",                               RHT_ICE_CAVERN_MQ_GS_RED_ICE,                                                                          { Category::cSkulltula },                                                                                                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN);
+    locationTable[RC_ICE_CAVERN_GS_PUSH_BLOCK_ROOM] =                               Location::GSToken(RC_ICE_CAVERN_GS_PUSH_BLOCK_ROOM,                                RCQUEST_VANILLA,                                                                                                SCENE_ICE_CAVERN,                   10497,                        0x01, "GS Push Block Room",                          RHT_ICE_CAVERN_GS_PUSH_BLOCK_ROOM);
+    locationTable[RC_ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM] =                          Location::GSToken(RC_ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM,                           RCQUEST_VANILLA,                                                                                                SCENE_ICE_CAVERN,                   10498,                        0x02, "GS Spinning Scythe Room",                     RHT_ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM);
+    locationTable[RC_ICE_CAVERN_GS_HEART_PIECE_ROOM] =                              Location::GSToken(RC_ICE_CAVERN_GS_HEART_PIECE_ROOM,                               RCQUEST_VANILLA,                                                                                                SCENE_ICE_CAVERN,                   10500,                        0x04, "GS Heart Piece Room",                         RHT_ICE_CAVERN_GS_HEART_PIECE_ROOM);
+    locationTable[RC_ICE_CAVERN_MQ_GS_SCARECROW] =                                  Location::GSToken(RC_ICE_CAVERN_MQ_GS_SCARECROW,                                   RCQUEST_MQ,                                                                                                     SCENE_ICE_CAVERN,                   10497,                        0x01, "MQ GS Scarecrow",                             RHT_ICE_CAVERN_MQ_GS_SCARECROW);
+    locationTable[RC_ICE_CAVERN_MQ_GS_ICE_BLOCK] =                                  Location::GSToken(RC_ICE_CAVERN_MQ_GS_ICE_BLOCK,                                   RCQUEST_MQ,                                                                                                     SCENE_ICE_CAVERN,                   10500,                        0x04, "MQ GS Ice Block",                             RHT_ICE_CAVERN_MQ_GS_ICE_BLOCK);
+    locationTable[RC_ICE_CAVERN_MQ_GS_RED_ICE] =                                    Location::GSToken(RC_ICE_CAVERN_MQ_GS_RED_ICE,                                     RCQUEST_MQ,                                                                                                     SCENE_ICE_CAVERN,                   10498,                        0x02, "MQ GS Red Ice",                               RHT_ICE_CAVERN_MQ_GS_RED_ICE);
     // Overworld
     // Kokiri Forest
-    locationTable[RC_KF_GS_BEAN_PATCH] =                                            Location::GSToken(RC_KF_GS_BEAN_PATCH,                                             RCQUEST_BOTH,                                        RCAREA_KOKIRI_FOREST,                                      SCENE_KOKIRI_FOREST,                27649,                                             0x01, "GS Bean Patch",                               RHT_KF_GS_BEAN_PATCH,                                                                                  { Category::cSkulltula }, 0x0C,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_GS_KNOW_IT_ALL_HOUSE] =                                     Location::GSToken(RC_KF_GS_KNOW_IT_ALL_HOUSE,                                      RCQUEST_BOTH,                                        RCAREA_KOKIRI_FOREST,                                      SCENE_KOKIRI_FOREST,                19458,                                             0x02, "GS Know It All House",                        RHT_KF_GS_KNOW_IT_ALL_HOUSE,                                                                           { Category::cSkulltula }, 0x0C,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_GS_HOUSE_OF_TWINS] =                                        Location::GSToken(RC_KF_GS_HOUSE_OF_TWINS,                                         RCQUEST_BOTH,                                        RCAREA_KOKIRI_FOREST,                                      SCENE_KOKIRI_FOREST,                19460,                                             0x04, "GS House of Twins",                           RHT_KF_GS_HOUSE_OF_TWINS,                                                                              { Category::cSkulltula }, 0x0C,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_GS_BEAN_PATCH] =                                            Location::GSToken(RC_KF_GS_BEAN_PATCH,                                             RCQUEST_BOTH,                                                                                                   SCENE_KOKIRI_FOREST,                27649,                        0x01, "GS Bean Patch",                               RHT_KF_GS_BEAN_PATCH,                                                                                  0x0C);
+    locationTable[RC_KF_GS_KNOW_IT_ALL_HOUSE] =                                     Location::GSToken(RC_KF_GS_KNOW_IT_ALL_HOUSE,                                      RCQUEST_BOTH,                                                                                                   SCENE_KOKIRI_FOREST,                19458,                        0x02, "GS Know It All House",                        RHT_KF_GS_KNOW_IT_ALL_HOUSE,                                                                           0x0C);
+    locationTable[RC_KF_GS_HOUSE_OF_TWINS] =                                        Location::GSToken(RC_KF_GS_HOUSE_OF_TWINS,                                         RCQUEST_BOTH,                                                                                                   SCENE_KOKIRI_FOREST,                19460,                        0x04, "GS House of Twins",                           RHT_KF_GS_HOUSE_OF_TWINS,                                                                              0x0C);
     // Lost Woods
-    locationTable[RC_LW_GS_BEAN_PATCH_NEAR_BRIDGE] =                                Location::GSToken(RC_LW_GS_BEAN_PATCH_NEAR_BRIDGE,                                 RCQUEST_BOTH,                                        RCAREA_LOST_WOODS,                                         SCENE_LOST_WOODS,                   27905,                                             0x01, "GS Bean Patch Near Bridge",                   RHT_LW_GS_BEAN_PATCH_NEAR_BRIDGE,                                                                      { Category::cSkulltula }, 0x0D,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[RC_LW_GS_BEAN_PATCH_NEAR_THEATER] =                               Location::GSToken(RC_LW_GS_BEAN_PATCH_NEAR_THEATER,                                RCQUEST_BOTH,                                        RCAREA_LOST_WOODS,                                         SCENE_LOST_WOODS,                   27906,                                             0x02, "GS Bean Patch Near Theater",                  RHT_LW_GS_BEAN_PATCH_NEAR_THEATER,                                                                     { Category::cSkulltula }, 0x0D,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[RC_LW_GS_ABOVE_THEATER] =                                         Location::GSToken(RC_LW_GS_ABOVE_THEATER,                                          RCQUEST_BOTH,                                        RCAREA_LOST_WOODS,                                         SCENE_LOST_WOODS,                   19716,                                             0x04, "GS Above Theater",                            RHT_LW_GS_ABOVE_THEATER,                                                                               { Category::cSkulltula }, 0x0D,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[RC_SFM_GS] =                                                      Location::GSToken(RC_SFM_GS,                                                       RCQUEST_BOTH,                                        RCAREA_SACRED_FOREST_MEADOW,                               SCENE_SACRED_FOREST_MEADOW,         19720,                                             0x08, "GS",                                          RHT_SFM_GS,                                                                                            { Category::cSkulltula }, 0x0D,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
+    locationTable[RC_LW_GS_BEAN_PATCH_NEAR_BRIDGE] =                                Location::GSToken(RC_LW_GS_BEAN_PATCH_NEAR_BRIDGE,                                 RCQUEST_BOTH,                                                                                                   SCENE_LOST_WOODS,                   27905,                        0x01, "GS Bean Patch Near Bridge",                   RHT_LW_GS_BEAN_PATCH_NEAR_BRIDGE,                                                                      0x0D);
+    locationTable[RC_LW_GS_BEAN_PATCH_NEAR_THEATER] =                               Location::GSToken(RC_LW_GS_BEAN_PATCH_NEAR_THEATER,                                RCQUEST_BOTH,                                                                                                   SCENE_LOST_WOODS,                   27906,                        0x02, "GS Bean Patch Near Theater",                  RHT_LW_GS_BEAN_PATCH_NEAR_THEATER,                                                                     0x0D);
+    locationTable[RC_LW_GS_ABOVE_THEATER] =                                         Location::GSToken(RC_LW_GS_ABOVE_THEATER,                                          RCQUEST_BOTH,                                                                                                   SCENE_LOST_WOODS,                   19716,                        0x04, "GS Above Theater",                            RHT_LW_GS_ABOVE_THEATER,                                                                               0x0D);
+    locationTable[RC_SFM_GS] =                                                      Location::GSToken(RC_SFM_GS,                                                       RCQUEST_BOTH,                                                                                                   SCENE_SACRED_FOREST_MEADOW,         19720,                        0x08, "GS",                                          RHT_SFM_GS,                                                                                            0x0D);
     // Hyrule Field
-    locationTable[RC_HF_GS_COW_GROTTO] =                                            Location::GSToken(RC_HF_GS_COW_GROTTO,                                             RCQUEST_BOTH,                                        RCAREA_HYRULE_FIELD,                                       SCENE_GROTTOS,                      10753,                                             0x01, "GS Cow Grotto",                               RHT_HF_GS_COW_GROTTO,                                                                                  { Category::cSkulltula }, 0x0A,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[RC_HF_GS_NEAR_KAK_GROTTO] =                                       Location::GSToken(RC_HF_GS_NEAR_KAK_GROTTO,                                        RCQUEST_BOTH,                                        RCAREA_HYRULE_FIELD,                                       SCENE_GROTTOS,                      10754,                                             0x02, "GS Near Kak Grotto",                          RHT_HF_GS_NEAR_KAK_GROTTO,                                                                             { Category::cSkulltula }, 0x0A,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
+    locationTable[RC_HF_GS_COW_GROTTO] =                                            Location::GSToken(RC_HF_GS_COW_GROTTO,                                             RCQUEST_BOTH,                                        RCAREA_HYRULE_FIELD,                                       SCENE_GROTTOS,                      10753,                        0x01, "GS Cow Grotto",                               RHT_HF_GS_COW_GROTTO,                                                                                  0x0A);
+    locationTable[RC_HF_GS_NEAR_KAK_GROTTO] =                                       Location::GSToken(RC_HF_GS_NEAR_KAK_GROTTO,                                        RCQUEST_BOTH,                                        RCAREA_HYRULE_FIELD,                                       SCENE_GROTTOS,                      10754,                        0x02, "GS Near Kak Grotto",                          RHT_HF_GS_NEAR_KAK_GROTTO,                                                                             0x0A);
     // Lake Hylia
-    locationTable[RC_LH_GS_BEAN_PATCH] =                                            Location::GSToken(RC_LH_GS_BEAN_PATCH,                                             RCQUEST_BOTH,                                        RCAREA_LAKE_HYLIA,                                         SCENE_LAKE_HYLIA,                   29185,                                             0x01, "GS Bean Patch",                               RHT_LH_GS_BEAN_PATCH,                                                                                  { Category::cSkulltula }, 0x12,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_GS_SMALL_ISLAND] =                                          Location::GSToken(RC_LH_GS_SMALL_ISLAND,                                           RCQUEST_BOTH,                                        RCAREA_LAKE_HYLIA,                                         SCENE_LAKE_HYLIA,                   20994,                                             0x02, "GS Small Island",                             RHT_LH_GS_SMALL_ISLAND,                                                                                { Category::cSkulltula }, 0x12,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_GS_LAB_WALL] =                                              Location::GSToken(RC_LH_GS_LAB_WALL,                                               RCQUEST_BOTH,                                        RCAREA_LAKE_HYLIA,                                         SCENE_LAKE_HYLIA,                   20996,                                             0x04, "GS Lab Wall",                                 RHT_LH_GS_LAB_WALL,                                                                                    { Category::cSkulltula }, 0x12,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_GS_LAB_CRATE] =                                             Location::GSToken(RC_LH_GS_LAB_CRATE,                                              RCQUEST_BOTH,                                        RCAREA_LAKE_HYLIA,                                         SCENE_LAKESIDE_LABORATORY,          -28152,                                            0x08, "GS Lab Crate",                                RHT_LH_GS_LAB_CRATE,                                                                                   { Category::cSkulltula }, 0x12,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_GS_TREE] =                                                  Location::GSToken(RC_LH_GS_TREE,                                                   RCQUEST_BOTH,                                        RCAREA_LAKE_HYLIA,                                         SCENE_LAKE_HYLIA,                   21008,                                             0x10, "GS Tree",                                     RHT_LH_GS_TREE,                                                                                        { Category::cSkulltula }, 0x12,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_GS_BEAN_PATCH] =                                            Location::GSToken(RC_LH_GS_BEAN_PATCH,                                             RCQUEST_BOTH,                                                                                                   SCENE_LAKE_HYLIA,                   29185,                        0x01, "GS Bean Patch",                               RHT_LH_GS_BEAN_PATCH,                                                                                  0x12);
+    locationTable[RC_LH_GS_SMALL_ISLAND] =                                          Location::GSToken(RC_LH_GS_SMALL_ISLAND,                                           RCQUEST_BOTH,                                                                                                   SCENE_LAKE_HYLIA,                   20994,                        0x02, "GS Small Island",                             RHT_LH_GS_SMALL_ISLAND,                                                                                0x12);
+    locationTable[RC_LH_GS_LAB_WALL] =                                              Location::GSToken(RC_LH_GS_LAB_WALL,                                               RCQUEST_BOTH,                                                                                                   SCENE_LAKE_HYLIA,                   20996,                        0x04, "GS Lab Wall",                                 RHT_LH_GS_LAB_WALL,                                                                                    0x12);
+    locationTable[RC_LH_GS_LAB_CRATE] =                                             Location::GSToken(RC_LH_GS_LAB_CRATE,                                              RCQUEST_BOTH,                                                                                                   SCENE_LAKESIDE_LABORATORY,          -28152,                       0x08, "GS Lab Crate",                                RHT_LH_GS_LAB_CRATE,                                                                                   0x12);
+    locationTable[RC_LH_GS_TREE] =                                                  Location::GSToken(RC_LH_GS_TREE,                                                   RCQUEST_BOTH,                                                                                                   SCENE_LAKE_HYLIA,                   21008,                        0x10, "GS Tree",                                     RHT_LH_GS_TREE,                                                                                        0x12);
     // Gerudo Valley
-    locationTable[RC_GV_GS_BEAN_PATCH] =                                            Location::GSToken(RC_GV_GS_BEAN_PATCH,                                             RCQUEST_BOTH,                                        RCAREA_GERUDO_VALLEY,                                      SCENE_GERUDO_VALLEY,                29441,                                             0x01, "GS Bean Patch",                               RHT_GV_GS_BEAN_PATCH,                                                                                  { Category::cSkulltula }, 0x13,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[RC_GV_GS_SMALL_BRIDGE] =                                          Location::GSToken(RC_GV_GS_SMALL_BRIDGE,                                           RCQUEST_BOTH,                                        RCAREA_GERUDO_VALLEY,                                      SCENE_GERUDO_VALLEY,                21250,                                             0x02, "GS Small Bridge",                             RHT_GV_GS_SMALL_BRIDGE,                                                                                { Category::cSkulltula }, 0x13,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[RC_GV_GS_PILLAR] =                                                Location::GSToken(RC_GV_GS_PILLAR,                                                 RCQUEST_BOTH,                                        RCAREA_GERUDO_VALLEY,                                      SCENE_GERUDO_VALLEY,                21252,                                             0x04, "GS Pillar",                                   RHT_GV_GS_PILLAR,                                                                                      { Category::cSkulltula }, 0x13,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[RC_GV_GS_BEHIND_TENT] =                                           Location::GSToken(RC_GV_GS_BEHIND_TENT,                                            RCQUEST_BOTH,                                        RCAREA_GERUDO_VALLEY,                                      SCENE_GERUDO_VALLEY,                21256,                                             0x08, "GS Behind Tent",                              RHT_GV_GS_BEHIND_TENT,                                                                                 { Category::cSkulltula }, 0x13,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_GV_GS_BEAN_PATCH] =                                            Location::GSToken(RC_GV_GS_BEAN_PATCH,                                             RCQUEST_BOTH,                                                                                                   SCENE_GERUDO_VALLEY,                29441,                        0x01, "GS Bean Patch",                               RHT_GV_GS_BEAN_PATCH,                                                                                  0x13);
+    locationTable[RC_GV_GS_SMALL_BRIDGE] =                                          Location::GSToken(RC_GV_GS_SMALL_BRIDGE,                                           RCQUEST_BOTH,                                                                                                   SCENE_GERUDO_VALLEY,                21250,                        0x02, "GS Small Bridge",                             RHT_GV_GS_SMALL_BRIDGE,                                                                                0x13);
+    locationTable[RC_GV_GS_PILLAR] =                                                Location::GSToken(RC_GV_GS_PILLAR,                                                 RCQUEST_BOTH,                                                                                                   SCENE_GERUDO_VALLEY,                21252,                        0x04, "GS Pillar",                                   RHT_GV_GS_PILLAR,                                                                                      0x13);
+    locationTable[RC_GV_GS_BEHIND_TENT] =                                           Location::GSToken(RC_GV_GS_BEHIND_TENT,                                            RCQUEST_BOTH,                                                                                                   SCENE_GERUDO_VALLEY,                21256,                        0x08, "GS Behind Tent",                              RHT_GV_GS_BEHIND_TENT,                                                                                 0x13);
     // Gerudo Fortress
-    locationTable[RC_GF_GS_ARCHERY_RANGE] =                                         Location::GSToken(RC_GF_GS_ARCHERY_RANGE,                                          RCQUEST_BOTH,                                        RCAREA_GERUDO_FORTRESS,                                    SCENE_GERUDOS_FORTRESS,             21505,                                             0x01, "GS Archery Range",                            RHT_GF_GS_ARCHERY_RANGE,                                                                               { Category::cSkulltula }, 0x14,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[RC_GF_GS_TOP_FLOOR] =                                             Location::GSToken(RC_GF_GS_TOP_FLOOR,                                              RCQUEST_BOTH,                                        RCAREA_GERUDO_FORTRESS,                                    SCENE_GERUDOS_FORTRESS,             21506,                                             0x02, "GS Top Floor",                                RHT_GF_GS_TOP_FLOOR,                                                                                   { Category::cSkulltula }, 0x14,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_GF_GS_ARCHERY_RANGE] =                                         Location::GSToken(RC_GF_GS_ARCHERY_RANGE,                                          RCQUEST_BOTH,                                                                                                   SCENE_GERUDOS_FORTRESS,             21505,                        0x01, "GS Archery Range",                            RHT_GF_GS_ARCHERY_RANGE,                                                                               0x14);
+    locationTable[RC_GF_GS_TOP_FLOOR] =                                             Location::GSToken(RC_GF_GS_TOP_FLOOR,                                              RCQUEST_BOTH,                                                                                                   SCENE_GERUDOS_FORTRESS,             21506,                        0x02, "GS Top Floor",                                RHT_GF_GS_TOP_FLOOR,                                                                                   0x14);
     // Wasteland & Desert Colossus
-    locationTable[RC_WASTELAND_GS] =                                                Location::GSToken(RC_WASTELAND_GS,                                                 RCQUEST_BOTH,                                        RCAREA_WASTELAND,                                          SCENE_HAUNTED_WASTELAND,            13570,                                             0x02, "GS",                                          RHT_WASTELAND_GS,                                                                                      { Category::cSkulltula }, 0x15,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[RC_COLOSSUS_GS_BEAN_PATCH] =                                      Location::GSToken(RC_COLOSSUS_GS_BEAN_PATCH,                                       RCQUEST_BOTH,                                        RCAREA_DESERT_COLOSSUS,                                    SCENE_DESERT_COLOSSUS,              29953,                                             0x01, "GS Bean Patch",                               RHT_COLOSSUS_GS_BEAN_PATCH,                                                                            { Category::cSkulltula }, 0x15,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[RC_COLOSSUS_GS_HILL] =                                            Location::GSToken(RC_COLOSSUS_GS_HILL,                                             RCQUEST_BOTH,                                        RCAREA_DESERT_COLOSSUS,                                    SCENE_DESERT_COLOSSUS,              21764,                                             0x04, "GS Hill",                                     RHT_COLOSSUS_GS_HILL,                                                                                  { Category::cSkulltula }, 0x15,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[RC_COLOSSUS_GS_TREE] =                                            Location::GSToken(RC_COLOSSUS_GS_TREE,                                             RCQUEST_BOTH,                                        RCAREA_DESERT_COLOSSUS,                                    SCENE_DESERT_COLOSSUS,              21768,                                             0x08, "GS Tree",                                     RHT_COLOSSUS_GS_TREE,                                                                                  { Category::cSkulltula }, 0x15,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_WASTELAND_GS] =                                                Location::GSToken(RC_WASTELAND_GS,                                                 RCQUEST_BOTH,                                                                                                   SCENE_HAUNTED_WASTELAND,            13570,                        0x02, "GS",                                          RHT_WASTELAND_GS,                                                                                      0x15);
+    locationTable[RC_COLOSSUS_GS_BEAN_PATCH] =                                      Location::GSToken(RC_COLOSSUS_GS_BEAN_PATCH,                                       RCQUEST_BOTH,                                                                                                   SCENE_DESERT_COLOSSUS,              29953,                        0x01, "GS Bean Patch",                               RHT_COLOSSUS_GS_BEAN_PATCH,                                                                            0x15);
+    locationTable[RC_COLOSSUS_GS_HILL] =                                            Location::GSToken(RC_COLOSSUS_GS_HILL,                                             RCQUEST_BOTH,                                                                                                   SCENE_DESERT_COLOSSUS,              21764,                        0x04, "GS Hill",                                     RHT_COLOSSUS_GS_HILL,                                                                                  0x15);
+    locationTable[RC_COLOSSUS_GS_TREE] =                                            Location::GSToken(RC_COLOSSUS_GS_TREE,                                             RCQUEST_BOTH,                                                                                                   SCENE_DESERT_COLOSSUS,              21768,                        0x08, "GS Tree",                                     RHT_COLOSSUS_GS_TREE,                                                                                  0x15);
     // Hyrule Castle, Market, and Outside Ganon's Castle
-    locationTable[RC_OGC_GS] =                                                      Location::GSToken(RC_OGC_GS,                                                       RCQUEST_BOTH,                                        RCAREA_HYRULE_CASTLE,                                      SCENE_OUTSIDE_GANONS_CASTLE,        11777,                                             0x01, "OGC GS",                                      RHT_OGC_GS,                                                                                            { Category::cSkulltula }, 0x0E,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_HC_GS_STORMS_GROTTO] =                                         Location::GSToken(RC_HC_GS_STORMS_GROTTO,                                          RCQUEST_BOTH,                                        RCAREA_HYRULE_CASTLE,                                      SCENE_GROTTOS,                      11778,                                             0x02, "GS Storms Grotto",                            RHT_HC_GS_STORMS_GROTTO,                                                                               { Category::cSkulltula }, 0x0E,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_HC_GS_TREE] =                                                  Location::GSToken(RC_HC_GS_TREE,                                                   RCQUEST_BOTH,                                        RCAREA_HYRULE_CASTLE,                                      SCENE_HYRULE_CASTLE,                -29180,                                            0x04, "GS Tree",                                     RHT_HC_GS_TREE,                                                                                        { Category::cSkulltula }, 0x0E,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_GS_GUARD_HOUSE] =                                       Location::GSToken(RC_MARKET_GS_GUARD_HOUSE,                                        RCQUEST_BOTH,                                        RCAREA_MARKET,                                             SCENE_MARKET_GUARD_HOUSE,           -29176,                                            0x08, "Market GS Guard House",                       RHT_MARKET_GS_GUARD_HOUSE,                                                                             { Category::cSkulltula }, 0x0E,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_OGC_GS] =                                                      Location::GSToken(RC_OGC_GS,                                                       RCQUEST_BOTH,                                                                                                   SCENE_OUTSIDE_GANONS_CASTLE,        11777,                        0x01, "OGC GS",                                      RHT_OGC_GS,                                                                                            0x0E);
+    locationTable[RC_HC_GS_STORMS_GROTTO] =                                         Location::GSToken(RC_HC_GS_STORMS_GROTTO,                                          RCQUEST_BOTH,                                        RCAREA_HYRULE_CASTLE,                                      SCENE_GROTTOS,                      11778,                        0x02, "GS Storms Grotto",                            RHT_HC_GS_STORMS_GROTTO,                                                                               0x0E);
+    locationTable[RC_HC_GS_TREE] =                                                  Location::GSToken(RC_HC_GS_TREE,                                                   RCQUEST_BOTH,                                                                                                   SCENE_HYRULE_CASTLE,                -29180,                       0x04, "GS Tree",                                     RHT_HC_GS_TREE,                                                                                        0x0E);
+    locationTable[RC_MARKET_GS_GUARD_HOUSE] =                                       Location::GSToken(RC_MARKET_GS_GUARD_HOUSE,                                        RCQUEST_BOTH,                                                                                                   SCENE_MARKET_GUARD_HOUSE,           -29176,                       0x08, "Market GS Guard House",                       RHT_MARKET_GS_GUARD_HOUSE,                                                                             0x0E);
     // Kakariko
-    locationTable[RC_KAK_GS_HOUSE_UNDER_CONSTRUCTION] =                             Location::GSToken(RC_KAK_GS_HOUSE_UNDER_CONSTRUCTION,                              RCQUEST_BOTH,                                        RCAREA_KAKARIKO_VILLAGE,                                   SCENE_KAKARIKO_VILLAGE,             20488,                                             0x08, "GS House Under Construction",                 RHT_KAK_GS_HOUSE_UNDER_CONSTRUCTION,                                                                   { Category::cSkulltula }, 0x10,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_GS_SKULLTULA_HOUSE] =                                      Location::GSToken(RC_KAK_GS_SKULLTULA_HOUSE,                                       RCQUEST_BOTH,                                        RCAREA_KAKARIKO_VILLAGE,                                   SCENE_KAKARIKO_VILLAGE,             20496,                                             0x10, "GS Skulltula House",                          RHT_KAK_GS_SKULLTULA_HOUSE,                                                                            { Category::cSkulltula }, 0x10,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_GS_GUARDS_HOUSE] =                                         Location::GSToken(RC_KAK_GS_GUARDS_HOUSE,                                          RCQUEST_BOTH,                                        RCAREA_KAKARIKO_VILLAGE,                                   SCENE_KAKARIKO_VILLAGE,             20482,                                             0x02, "GS Guards House",                             RHT_KAK_GS_GUARDS_HOUSE,                                                                               { Category::cSkulltula }, 0x10,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_GS_TREE] =                                                 Location::GSToken(RC_KAK_GS_TREE,                                                  RCQUEST_BOTH,                                        RCAREA_KAKARIKO_VILLAGE,                                   SCENE_KAKARIKO_VILLAGE,             -28640,                                            0x20, "GS Tree",                                     RHT_KAK_GS_TREE,                                                                                       { Category::cSkulltula }, 0x10,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_GS_WATCHTOWER] =                                           Location::GSToken(RC_KAK_GS_WATCHTOWER,                                            RCQUEST_BOTH,                                        RCAREA_KAKARIKO_VILLAGE,                                   SCENE_KAKARIKO_VILLAGE,             20484,                                             0x04, "GS Watchtower",                               RHT_KAK_GS_WATCHTOWER,                                                                                 { Category::cSkulltula }, 0x10,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_GS_ABOVE_IMPAS_HOUSE] =                                    Location::GSToken(RC_KAK_GS_ABOVE_IMPAS_HOUSE,                                     RCQUEST_BOTH,                                        RCAREA_KAKARIKO_VILLAGE,                                   SCENE_KAKARIKO_VILLAGE,             20544,                                             0x40, "GS Above Impas House",                        RHT_KAK_GS_ABOVE_IMPAS_HOUSE,                                                                          { Category::cSkulltula }, 0x10,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_GS_HOUSE_UNDER_CONSTRUCTION] =                             Location::GSToken(RC_KAK_GS_HOUSE_UNDER_CONSTRUCTION,                              RCQUEST_BOTH,                                                                                                   SCENE_KAKARIKO_VILLAGE,             20488,                        0x08, "GS House Under Construction",                 RHT_KAK_GS_HOUSE_UNDER_CONSTRUCTION,                                                                   0x10);
+    locationTable[RC_KAK_GS_SKULLTULA_HOUSE] =                                      Location::GSToken(RC_KAK_GS_SKULLTULA_HOUSE,                                       RCQUEST_BOTH,                                                                                                   SCENE_KAKARIKO_VILLAGE,             20496,                        0x10, "GS Skulltula House",                          RHT_KAK_GS_SKULLTULA_HOUSE,                                                                            0x10);
+    locationTable[RC_KAK_GS_GUARDS_HOUSE] =                                         Location::GSToken(RC_KAK_GS_GUARDS_HOUSE,                                          RCQUEST_BOTH,                                                                                                   SCENE_KAKARIKO_VILLAGE,             20482,                        0x02, "GS Guards House",                             RHT_KAK_GS_GUARDS_HOUSE,                                                                               0x10);
+    locationTable[RC_KAK_GS_TREE] =                                                 Location::GSToken(RC_KAK_GS_TREE,                                                  RCQUEST_BOTH,                                                                                                   SCENE_KAKARIKO_VILLAGE,             -28640,                       0x20, "GS Tree",                                     RHT_KAK_GS_TREE,                                                                                       0x10);
+    locationTable[RC_KAK_GS_WATCHTOWER] =                                           Location::GSToken(RC_KAK_GS_WATCHTOWER,                                            RCQUEST_BOTH,                                                                                                   SCENE_KAKARIKO_VILLAGE,             20484,                        0x04, "GS Watchtower",                               RHT_KAK_GS_WATCHTOWER,                                                                                 0x10);
+    locationTable[RC_KAK_GS_ABOVE_IMPAS_HOUSE] =                                    Location::GSToken(RC_KAK_GS_ABOVE_IMPAS_HOUSE,                                     RCQUEST_BOTH,                                                                                                   SCENE_KAKARIKO_VILLAGE,             20544,                        0x40, "GS Above Impas House",                        RHT_KAK_GS_ABOVE_IMPAS_HOUSE,                                                                          0x10);
     // Graveyard
-    locationTable[RC_GRAVEYARD_GS_WALL] =                                           Location::GSToken(RC_GRAVEYARD_GS_WALL,                                            RCQUEST_BOTH,                                        RCAREA_GRAVEYARD,                                          SCENE_GRAVEYARD,                    20608,                                             0x80, "GS Wall",                                     RHT_GRAVEYARD_GS_WALL,                                                                                 { Category::cSkulltula }, 0x10,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_GRAVEYARD_GS_BEAN_PATCH] =                                     Location::GSToken(RC_GRAVEYARD_GS_BEAN_PATCH,                                      RCQUEST_BOTH,                                        RCAREA_GRAVEYARD,                                          SCENE_GRAVEYARD,                    28673,                                             0x01, "GS Bean Patch",                               RHT_GRAVEYARD_GS_BEAN_PATCH,                                                                           { Category::cSkulltula }, 0x10,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_GRAVEYARD_GS_WALL] =                                           Location::GSToken(RC_GRAVEYARD_GS_WALL,                                            RCQUEST_BOTH,                                                                                                   SCENE_GRAVEYARD,                    20608,                        0x80, "GS Wall",                                     RHT_GRAVEYARD_GS_WALL,                                                                                 0x10);
+    locationTable[RC_GRAVEYARD_GS_BEAN_PATCH] =                                     Location::GSToken(RC_GRAVEYARD_GS_BEAN_PATCH,                                      RCQUEST_BOTH,                                                                                                   SCENE_GRAVEYARD,                    28673,                        0x01, "GS Bean Patch",                               RHT_GRAVEYARD_GS_BEAN_PATCH,                                                                           0x10);
     // Death Mountain
-    locationTable[RC_DMC_GS_BEAN_PATCH] =                                           Location::GSToken(RC_DMC_GS_BEAN_PATCH,                                            RCQUEST_BOTH,                                        RCAREA_DEATH_MOUNTAIN_CRATER,                              SCENE_DEATH_MOUNTAIN_CRATER,        28417,                                             0x01, "GS Bean Patch",                               RHT_DMC_GS_BEAN_PATCH,                                                                                 { Category::cSkulltula }, 0x0F,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMC_GS_CRATE] =                                                Location::GSToken(RC_DMC_GS_CRATE,                                                 RCQUEST_BOTH,                                        RCAREA_DEATH_MOUNTAIN_CRATER,                              SCENE_DEATH_MOUNTAIN_CRATER,        -28800,                                            0x80, "GS Crate",                                    RHT_DMC_GS_CRATE,                                                                                      { Category::cSkulltula }, 0x0F,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMT_GS_BEAN_PATCH] =                                           Location::GSToken(RC_DMT_GS_BEAN_PATCH,                                            RCQUEST_BOTH,                                        RCAREA_DEATH_MOUNTAIN_TRAIL,                               SCENE_DEATH_MOUNTAIN_TRAIL,         28418,                                             0x02, "GS Bean Patch",                               RHT_DMT_GS_BEAN_PATCH,                                                                                 { Category::cSkulltula }, 0x0F,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMT_GS_NEAR_KAK] =                                             Location::GSToken(RC_DMT_GS_NEAR_KAK,                                              RCQUEST_BOTH,                                        RCAREA_DEATH_MOUNTAIN_TRAIL,                               SCENE_DEATH_MOUNTAIN_TRAIL,         12036,                                             0x04, "GS Near Kak",                                 RHT_DMT_GS_NEAR_KAK,                                                                                   { Category::cSkulltula }, 0x0F,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMT_GS_ABOVE_DODONGOS_CAVERN] =                                Location::GSToken(RC_DMT_GS_ABOVE_DODONGOS_CAVERN,                                 RCQUEST_BOTH,                                        RCAREA_DEATH_MOUNTAIN_TRAIL,                               SCENE_DEATH_MOUNTAIN_TRAIL,         20232,                                             0x08, "GS Above Dodongos Cavern",                    RHT_DMT_GS_ABOVE_DODONGOS_CAVERN,                                                                      { Category::cSkulltula }, 0x0F,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMT_GS_FALLING_ROCKS_PATH] =                                   Location::GSToken(RC_DMT_GS_FALLING_ROCKS_PATH,                                    RCQUEST_BOTH,                                        RCAREA_DEATH_MOUNTAIN_TRAIL,                               SCENE_DEATH_MOUNTAIN_TRAIL,         20240,                                             0x10, "GS Falling Rocks Path",                       RHT_DMT_GS_FALLING_ROCKS_PATH,                                                                         { Category::cSkulltula }, 0x0F,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_GC_GS_CENTER_PLATFORM] =                                       Location::GSToken(RC_GC_GS_CENTER_PLATFORM,                                        RCQUEST_BOTH,                                        RCAREA_GORON_CITY,                                         SCENE_GORON_CITY,                   12064,                                             0x20, "GS Center Platform",                          RHT_GC_GS_CENTER_PLATFORM,                                                                             { Category::cSkulltula }, 0x0F,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_GS_BOULDER_MAZE] =                                          Location::GSToken(RC_GC_GS_BOULDER_MAZE,                                           RCQUEST_BOTH,                                        RCAREA_GORON_CITY,                                         SCENE_GORON_CITY,                   -28864,                                            0x40, "GS Boulder Maze",                             RHT_GC_GS_BOULDER_MAZE,                                                                                { Category::cSkulltula }, 0x0F,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_DMC_GS_BEAN_PATCH] =                                           Location::GSToken(RC_DMC_GS_BEAN_PATCH,                                            RCQUEST_BOTH,                                                                                                   SCENE_DEATH_MOUNTAIN_CRATER,        28417,                        0x01, "GS Bean Patch",                               RHT_DMC_GS_BEAN_PATCH,                                                                                 0x0F);
+    locationTable[RC_DMC_GS_CRATE] =                                                Location::GSToken(RC_DMC_GS_CRATE,                                                 RCQUEST_BOTH,                                                                                                   SCENE_DEATH_MOUNTAIN_CRATER,        -28800,                       0x80, "GS Crate",                                    RHT_DMC_GS_CRATE,                                                                                      0x0F);
+    locationTable[RC_DMT_GS_BEAN_PATCH] =                                           Location::GSToken(RC_DMT_GS_BEAN_PATCH,                                            RCQUEST_BOTH,                                                                                                   SCENE_DEATH_MOUNTAIN_TRAIL,         28418,                        0x02, "GS Bean Patch",                               RHT_DMT_GS_BEAN_PATCH,                                                                                 0x0F);
+    locationTable[RC_DMT_GS_NEAR_KAK] =                                             Location::GSToken(RC_DMT_GS_NEAR_KAK,                                              RCQUEST_BOTH,                                                                                                   SCENE_DEATH_MOUNTAIN_TRAIL,         12036,                        0x04, "GS Near Kak",                                 RHT_DMT_GS_NEAR_KAK,                                                                                   0x0F);
+    locationTable[RC_DMT_GS_ABOVE_DODONGOS_CAVERN] =                                Location::GSToken(RC_DMT_GS_ABOVE_DODONGOS_CAVERN,                                 RCQUEST_BOTH,                                                                                                   SCENE_DEATH_MOUNTAIN_TRAIL,         20232,                        0x08, "GS Above Dodongos Cavern",                    RHT_DMT_GS_ABOVE_DODONGOS_CAVERN,                                                                      0x0F);
+    locationTable[RC_DMT_GS_FALLING_ROCKS_PATH] =                                   Location::GSToken(RC_DMT_GS_FALLING_ROCKS_PATH,                                    RCQUEST_BOTH,                                                                                                   SCENE_DEATH_MOUNTAIN_TRAIL,         20240,                        0x10, "GS Falling Rocks Path",                       RHT_DMT_GS_FALLING_ROCKS_PATH,                                                                         0x0F);
+    locationTable[RC_GC_GS_CENTER_PLATFORM] =                                       Location::GSToken(RC_GC_GS_CENTER_PLATFORM,                                        RCQUEST_BOTH,                                                                                                   SCENE_GORON_CITY,                   12064,                        0x20, "GS Center Platform",                          RHT_GC_GS_CENTER_PLATFORM,                                                                             0x0F);
+    locationTable[RC_GC_GS_BOULDER_MAZE] =                                          Location::GSToken(RC_GC_GS_BOULDER_MAZE,                                           RCQUEST_BOTH,                                                                                                   SCENE_GORON_CITY,                   -28864,                       0x40, "GS Boulder Maze",                             RHT_GC_GS_BOULDER_MAZE,                                                                                0x0F);
     // Zora's River, Domain, and Fountain
-    locationTable[RC_ZR_GS_LADDER] =                                                Location::GSToken(RC_ZR_GS_LADDER,                                                 RCQUEST_BOTH,                                        RCAREA_ZORAS_RIVER,                                        SCENE_ZORAS_RIVER,                  20737,                                             0x01, "GS Ladder",                                   RHT_ZR_GS_LADDER,                                                                                      { Category::cSkulltula }, 0x11,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZR_GS_TREE] =                                                  Location::GSToken(RC_ZR_GS_TREE,                                                   RCQUEST_BOTH,                                        RCAREA_ZORAS_RIVER,                                        SCENE_ZORAS_RIVER,                  -28414,                                            0x02, "GS Tree",                                     RHT_ZR_GS_TREE,                                                                                        { Category::cSkulltula }, 0x11,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZR_GS_ABOVE_BRIDGE] =                                          Location::GSToken(RC_ZR_GS_ABOVE_BRIDGE,                                           RCQUEST_BOTH,                                        RCAREA_ZORAS_RIVER,                                        SCENE_ZORAS_RIVER,                  20744,                                             0x08, "GS Above Bridge",                             RHT_ZR_GS_ABOVE_BRIDGE,                                                                                { Category::cSkulltula }, 0x11,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZR_GS_NEAR_RAISED_GROTTOS] =                                   Location::GSToken(RC_ZR_GS_NEAR_RAISED_GROTTOS,                                    RCQUEST_BOTH,                                        RCAREA_ZORAS_RIVER,                                        SCENE_ZORAS_RIVER,                  20752,                                             0x10, "GS Near Raised Grottos",                      RHT_ZR_GS_NEAR_RAISED_GROTTOS,                                                                         { Category::cSkulltula }, 0x11,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZD_GS_FROZEN_WATERFALL] =                                      Location::GSToken(RC_ZD_GS_FROZEN_WATERFALL,                                       RCQUEST_BOTH,                                        RCAREA_ZORAS_DOMAIN,                                       SCENE_ZORAS_DOMAIN,                 20800,                                             0x40, "GS Frozen Waterfall",                         RHT_ZD_GS_FROZEN_WATERFALL,                                                                            { Category::cSkulltula }, 0x11,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZF_GS_ABOVE_THE_LOG] =                                         Location::GSToken(RC_ZF_GS_ABOVE_THE_LOG,                                          RCQUEST_BOTH,                                        RCAREA_ZORAS_FOUNTAIN,                                     SCENE_ZORAS_FOUNTAIN,               20740,                                             0x04, "GS Above The Log",                            RHT_ZF_GS_ABOVE_THE_LOG,                                                                               { Category::cSkulltula }, 0x11,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZF_GS_HIDDEN_CAVE] =                                           Location::GSToken(RC_ZF_GS_HIDDEN_CAVE,                                            RCQUEST_BOTH,                                        RCAREA_ZORAS_FOUNTAIN,                                     SCENE_ZORAS_FOUNTAIN,               20768,                                             0x20, "GS Hidden Cave",                              RHT_ZF_GS_HIDDEN_CAVE,                                                                                 { Category::cSkulltula }, 0x11,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZF_GS_TREE] =                                                  Location::GSToken(RC_ZF_GS_TREE,                                                   RCQUEST_BOTH,                                        RCAREA_ZORAS_FOUNTAIN,                                     SCENE_ZORAS_FOUNTAIN,               -28288,                                            0x80, "GS Tree",                                     RHT_ZF_GS_TREE,                                                                                        { Category::cSkulltula }, 0x11,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZR_GS_LADDER] =                                                Location::GSToken(RC_ZR_GS_LADDER,                                                 RCQUEST_BOTH,                                                                                                   SCENE_ZORAS_RIVER,                  20737,                        0x01, "GS Ladder",                                   RHT_ZR_GS_LADDER,                                                                                      0x11);
+    locationTable[RC_ZR_GS_TREE] =                                                  Location::GSToken(RC_ZR_GS_TREE,                                                   RCQUEST_BOTH,                                                                                                   SCENE_ZORAS_RIVER,                  -28414,                       0x02, "GS Tree",                                     RHT_ZR_GS_TREE,                                                                                        0x11);
+    locationTable[RC_ZR_GS_ABOVE_BRIDGE] =                                          Location::GSToken(RC_ZR_GS_ABOVE_BRIDGE,                                           RCQUEST_BOTH,                                                                                                   SCENE_ZORAS_RIVER,                  20744,                        0x08, "GS Above Bridge",                             RHT_ZR_GS_ABOVE_BRIDGE,                                                                                0x11);
+    locationTable[RC_ZR_GS_NEAR_RAISED_GROTTOS] =                                   Location::GSToken(RC_ZR_GS_NEAR_RAISED_GROTTOS,                                    RCQUEST_BOTH,                                                                                                   SCENE_ZORAS_RIVER,                  20752,                        0x10, "GS Near Raised Grottos",                      RHT_ZR_GS_NEAR_RAISED_GROTTOS,                                                                         0x11);
+    locationTable[RC_ZD_GS_FROZEN_WATERFALL] =                                      Location::GSToken(RC_ZD_GS_FROZEN_WATERFALL,                                       RCQUEST_BOTH,                                                                                                   SCENE_ZORAS_DOMAIN,                 20800,                        0x40, "GS Frozen Waterfall",                         RHT_ZD_GS_FROZEN_WATERFALL,                                                                            0x11);
+    locationTable[RC_ZF_GS_ABOVE_THE_LOG] =                                         Location::GSToken(RC_ZF_GS_ABOVE_THE_LOG,                                          RCQUEST_BOTH,                                                                                                   SCENE_ZORAS_FOUNTAIN,               20740,                        0x04, "GS Above The Log",                            RHT_ZF_GS_ABOVE_THE_LOG,                                                                               0x11);
+    locationTable[RC_ZF_GS_HIDDEN_CAVE] =                                           Location::GSToken(RC_ZF_GS_HIDDEN_CAVE,                                            RCQUEST_BOTH,                                                                                                   SCENE_ZORAS_FOUNTAIN,               20768,                        0x20, "GS Hidden Cave",                              RHT_ZF_GS_HIDDEN_CAVE,                                                                                 0x11);
+    locationTable[RC_ZF_GS_TREE] =                                                  Location::GSToken(RC_ZF_GS_TREE,                                                   RCQUEST_BOTH,                                                                                                   SCENE_ZORAS_FOUNTAIN,               -28288,                       0x80, "GS Tree",                                     RHT_ZF_GS_TREE,                                                                                        0x11);
     // Lon Lon Ranch
-    locationTable[RC_LLR_GS_BACK_WALL] =                                            Location::GSToken(RC_LLR_GS_BACK_WALL,                                             RCQUEST_BOTH,                                        RCAREA_LON_LON_RANCH,                                      SCENE_LON_LON_RANCH,                11009,                                             0x01, "GS Back Wall",                                RHT_LLR_GS_BACK_WALL,                                                                                  { Category::cSkulltula }, 0x0B,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
-    locationTable[RC_LLR_GS_RAIN_SHED] =                                            Location::GSToken(RC_LLR_GS_RAIN_SHED,                                             RCQUEST_BOTH,                                        RCAREA_LON_LON_RANCH,                                      SCENE_LON_LON_RANCH,                11010,                                             0x02, "GS Rain Shed",                                RHT_LLR_GS_RAIN_SHED,                                                                                  { Category::cSkulltula }, 0x0B,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
-    locationTable[RC_LLR_GS_HOUSE_WINDOW] =                                         Location::GSToken(RC_LLR_GS_HOUSE_WINDOW,                                          RCQUEST_BOTH,                                        RCAREA_LON_LON_RANCH,                                      SCENE_LON_LON_RANCH,                11012,                                             0x04, "GS House Window",                             RHT_LLR_GS_HOUSE_WINDOW,                                                                               { Category::cSkulltula }, 0x0B,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
-    locationTable[RC_LLR_GS_TREE] =                                                 Location::GSToken(RC_LLR_GS_TREE,                                                  RCQUEST_BOTH,                                        RCAREA_LON_LON_RANCH,                                      SCENE_LON_LON_RANCH,                -29944,                                            0x08, "GS Tree",                                     RHT_LLR_GS_TREE,                                                                                       { Category::cSkulltula }, 0x0B,                                                                                                                                                       SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
+    locationTable[RC_LLR_GS_BACK_WALL] =                                            Location::GSToken(RC_LLR_GS_BACK_WALL,                                             RCQUEST_BOTH,                                                                                                   SCENE_LON_LON_RANCH,                11009,                        0x01, "GS Back Wall",                                RHT_LLR_GS_BACK_WALL,                                                                                  0x0B);
+    locationTable[RC_LLR_GS_RAIN_SHED] =                                            Location::GSToken(RC_LLR_GS_RAIN_SHED,                                             RCQUEST_BOTH,                                                                                                   SCENE_LON_LON_RANCH,                11010,                        0x02, "GS Rain Shed",                                RHT_LLR_GS_RAIN_SHED,                                                                                  0x0B);
+    locationTable[RC_LLR_GS_HOUSE_WINDOW] =                                         Location::GSToken(RC_LLR_GS_HOUSE_WINDOW,                                          RCQUEST_BOTH,                                                                                                   SCENE_LON_LON_RANCH,                11012,                        0x04, "GS House Window",                             RHT_LLR_GS_HOUSE_WINDOW,                                                                               0x0B);
+    locationTable[RC_LLR_GS_TREE] =                                                 Location::GSToken(RC_LLR_GS_TREE,                                                  RCQUEST_BOTH,                                                                                                   SCENE_LON_LON_RANCH,                -29944,                       0x08, "GS Tree",                                     RHT_LLR_GS_TREE,                                                                                       0x0B);
 
     // Bosses
-    locationTable[RC_LINKS_POCKET] =                                                 Location::Reward(RC_LINKS_POCKET,                                                 RCQUEST_BOTH,    RCTYPE_LINKS_POCKET,                RCAREA_KOKIRI_FOREST,                ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x00, "Link's Pocket",   "Link's Pocket",            RHT_LINKS_POCKET,                                                RG_NONE,                              {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LINKS_POCKET),                                                                 SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST,              true);
-    locationTable[RC_QUEEN_GOHMA] =                                                  Location::Reward(RC_QUEEN_GOHMA,                                                  RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_DEKU_TREE,                    ACTOR_DOOR_WARP1,     SCENE_DEKU_TREE_BOSS,               0x00,                      DungeonId::DUNGEON_DEKU_TREE, "Queen Gohma",     "Queen Gohma",              RHT_QUEEN_GOHMA,                                                 RG_KOKIRI_EMERALD,                    {},                                                     SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP),                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE,          true);
-    locationTable[RC_KING_DODONGO] =                                                 Location::Reward(RC_KING_DODONGO,                                                 RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_DODONGOS_CAVERN,              ACTOR_DOOR_WARP1,     SCENE_DODONGOS_CAVERN_BOSS,         0x00,                DungeonId::DUNGEON_DODONGOS_CAVERN, "King Dodongo",    "King Dodongo",             RHT_KING_DODONGO,                                                RG_GORON_RUBY,                        {},                                                     SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP),                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN,    true);
-    locationTable[RC_BARINADE] =                                                     Location::Reward(RC_BARINADE,                                                     RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_JABU_JABUS_BELLY,             ACTOR_DOOR_WARP1,     SCENE_JABU_JABU_BOSS,               0x00,                DungeonId::DUNGEON_JABUJABUS_BELLY, "Barinade",        "Barinade",                 RHT_BARINADE,                                                    RG_ZORA_SAPPHIRE,                     {},                                                     SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP),                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY,    true);
-    locationTable[RC_PHANTOM_GANON] =                                                Location::Reward(RC_PHANTOM_GANON,                                                RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_FOREST_TEMPLE,                ACTOR_DOOR_WARP1,     SCENE_FOREST_TEMPLE_BOSS,           0x00,                  DungeonId::DUNGEON_FOREST_TEMPLE, "Phantom Ganon",   "Phantom Ganon",            RHT_PHANTOM_GANON,                                               RG_FOREST_MEDALLION,                  {},                                                     SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP),                                                SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
-    locationTable[RC_VOLVAGIA] =                                                     Location::Reward(RC_VOLVAGIA,                                                     RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_FIRE_TEMPLE,                  ACTOR_DOOR_WARP1,     SCENE_FIRE_TEMPLE_BOSS,             0x00,                    DungeonId::DUNGEON_FIRE_TEMPLE, "Volvagia",        "Volvagia",                 RHT_VOLVAGIA,                                                    RG_FIRE_MEDALLION,                    {},                                                     SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP),                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
-    locationTable[RC_MORPHA] =                                                       Location::Reward(RC_MORPHA,                                                       RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_WATER_TEMPLE,                 ACTOR_DOOR_WARP1,     SCENE_WATER_TEMPLE_BOSS,            0x00,                   DungeonId::DUNGEON_WATER_TEMPLE, "Morpha",          "Morpha",                   RHT_MORPHA,                                                      RG_WATER_MEDALLION,                   {},                                                     SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP),                                                 SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
-    locationTable[RC_TWINROVA] =                                                     Location::Reward(RC_TWINROVA,                                                     RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_SPIRIT_TEMPLE,                ACTOR_DOOR_WARP1,     SCENE_SPIRIT_TEMPLE_BOSS,           0x00,                  DungeonId::DUNGEON_SPIRIT_TEMPLE, "Twinrova",        "Twinrova",                 RHT_TWINROVA,                                                    RG_SPIRIT_MEDALLION,                  {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DUNGEONS_DONE_SPIRIT_TEMPLE),                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
-    locationTable[RC_BONGO_BONGO] =                                                  Location::Reward(RC_BONGO_BONGO,                                                  RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_SHADOW_TEMPLE,                ACTOR_DOOR_WARP1,     SCENE_SHADOW_TEMPLE_BOSS,           0x00,                  DungeonId::DUNGEON_SHADOW_TEMPLE, "Bongo Bongo",     "Bongo Bongo",              RHT_BONGO_BONGO,                                                 RG_SHADOW_MEDALLION,                  {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DUNGEONS_DONE_SHADOW_TEMPLE),                                                  SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
-    locationTable[RC_GANON] =                                                        Location::Reward(RC_GANON,                                                        RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_GANONS_CASTLE,                ACTOR_DOOR_WARP1,     SCENE_GANON_BOSS,                   0x00,        DungeonId::DUNGEON_GANONS_CASTLE_CRUMBLING, "Ganon",           "Ganon",                    RHT_NONE,                                                        RG_TRIFORCE,                          {},                                                     SpoilerCollectionCheck::None(),                                                                                               SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
-    locationTable[RC_GIFT_FROM_SAGES] =                                              Location::Reward(RC_GIFT_FROM_SAGES,                                              RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x00, "Gift from Raoru", "Gift from Raoru",          RHT_NONE,                                                        RG_LIGHT_MEDALLION,                   {},                                                     SpoilerCollectionCheck::EventChkInf(0xC9),                                                                                    SpoilerCollectionCheckGroup::GROUP_NO_GROUP,                   true);
+    locationTable[RC_LINKS_POCKET] =                                                   Location::Base(RC_LINKS_POCKET,                                                 RCQUEST_BOTH,    RCTYPE_LINKS_POCKET,                RCAREA_KOKIRI_FOREST,                ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                               "Link's Pocket",   "Link's Pocket",            RHT_LINKS_POCKET,                                                RG_NONE,                                                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_LINKS_POCKET),                                                                 true);
+    locationTable[RC_QUEEN_GOHMA] =                                                    Location::Base(RC_QUEEN_GOHMA,                                                  RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,                                                   ACTOR_DOOR_WARP1,     SCENE_DEKU_TREE_BOSS,               0x00,                               "Queen Gohma",     "Queen Gohma",              RHT_QUEEN_GOHMA,                                                 RG_KOKIRI_EMERALD,                                                  SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP),                                                    true);
+    locationTable[RC_KING_DODONGO] =                                                   Location::Base(RC_KING_DODONGO,                                                 RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,                                                   ACTOR_DOOR_WARP1,     SCENE_DODONGOS_CAVERN_BOSS,         0x00,                               "King Dodongo",    "King Dodongo",             RHT_KING_DODONGO,                                                RG_GORON_RUBY,                                                      SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP),                                              true);
+    locationTable[RC_BARINADE] =                                                       Location::Base(RC_BARINADE,                                                     RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,                                                   ACTOR_DOOR_WARP1,     SCENE_JABU_JABU_BOSS,               0x00,                               "Barinade",        "Barinade",                 RHT_BARINADE,                                                    RG_ZORA_SAPPHIRE,                                                   SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP),                                             true);
+    locationTable[RC_PHANTOM_GANON] =                                                  Location::Base(RC_PHANTOM_GANON,                                                RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,                                                   ACTOR_DOOR_WARP1,     SCENE_FOREST_TEMPLE_BOSS,           0x00,                               "Phantom Ganon",   "Phantom Ganon",            RHT_PHANTOM_GANON,                                               RG_FOREST_MEDALLION,                                                SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP),                                                true);
+    locationTable[RC_VOLVAGIA] =                                                       Location::Base(RC_VOLVAGIA,                                                     RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,                                                   ACTOR_DOOR_WARP1,     SCENE_FIRE_TEMPLE_BOSS,             0x00,                               "Volvagia",        "Volvagia",                 RHT_VOLVAGIA,                                                    RG_FIRE_MEDALLION,                                                  SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP),                                                  true);
+    locationTable[RC_MORPHA] =                                                         Location::Base(RC_MORPHA,                                                       RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,                                                   ACTOR_DOOR_WARP1,     SCENE_WATER_TEMPLE_BOSS,            0x00,                               "Morpha",          "Morpha",                   RHT_MORPHA,                                                      RG_WATER_MEDALLION,                                                 SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP),                                                 true);
+    locationTable[RC_TWINROVA] =                                                       Location::Base(RC_TWINROVA,                                                     RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,                                                   ACTOR_DOOR_WARP1,     SCENE_SPIRIT_TEMPLE_BOSS,           0x00,                               "Twinrova",        "Twinrova",                 RHT_TWINROVA,                                                    RG_SPIRIT_MEDALLION,                                                SpoilerCollectionCheck::RandomizerInf(RAND_INF_DUNGEONS_DONE_SPIRIT_TEMPLE),                                                  true);
+    locationTable[RC_BONGO_BONGO] =                                                    Location::Base(RC_BONGO_BONGO,                                                  RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,                                                   ACTOR_DOOR_WARP1,     SCENE_SHADOW_TEMPLE_BOSS,           0x00,                               "Bongo Bongo",     "Bongo Bongo",              RHT_BONGO_BONGO,                                                 RG_SHADOW_MEDALLION,                                                SpoilerCollectionCheck::RandomizerInf(RAND_INF_DUNGEONS_DONE_SHADOW_TEMPLE),                                                  true);
+    locationTable[RC_GANON] =                                                          Location::Base(RC_GANON,                                                        RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,                                                   ACTOR_DOOR_WARP1,     SCENE_GANON_BOSS,                   0x00,                               "Ganon",           "Ganon",                    RHT_NONE,                                                        RG_TRIFORCE);
+    locationTable[RC_GIFT_FROM_SAGES] =                                                Location::Base(RC_GIFT_FROM_SAGES,                                              RCQUEST_BOTH,    RCTYPE_DUNGEON_REWARD,              RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                               "Gift from Raoru", "Gift from Raoru",          RHT_NONE,                                                        RG_LIGHT_MEDALLION,                                                 SpoilerCollectionCheck::EventChkInf(0xC9),                                                                                    true);
 
     // Heart Containers
-    locationTable[RC_DEKU_TREE_QUEEN_GOHMA_HEART] =                                    Location::Base(RC_DEKU_TREE_QUEEN_GOHMA_HEART,                                  RCQUEST_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_DEKU_TREE,                    ACTOR_ITEM_B_HEART,   SCENE_DEKU_TREE_BOSS,               0x00,                                              0x4F, "Queen Gohma Heart Container",                 RHT_DEKU_TREE_QUEEN_GOHMA_HEART,                                 RG_HEART_CONTAINER,                   { Category::cSongDungeonReward },                       SpoilerCollectionCheck::Collectable(0x11, 0x1F),                                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE,          true);
-    locationTable[RC_DODONGOS_CAVERN_KING_DODONGO_HEART] =                             Location::Base(RC_DODONGOS_CAVERN_KING_DODONGO_HEART,                           RCQUEST_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_DODONGOS_CAVERN,              ACTOR_ITEM_B_HEART,   SCENE_DODONGOS_CAVERN_BOSS,         0x00,                                              0x4F, "King Dodongo Heart Container",                RHT_DODONGOS_CAVERN_KING_DODONGO_HEART,                          RG_HEART_CONTAINER,                   { Category::cSongDungeonReward },                       SpoilerCollectionCheck::Collectable(0x12, 0x1F),                                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN,    true);
-    locationTable[RC_JABU_JABUS_BELLY_BARINADE_HEART] =                                Location::Base(RC_JABU_JABUS_BELLY_BARINADE_HEART,                              RCQUEST_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_JABU_JABUS_BELLY,             ACTOR_ITEM_B_HEART,   SCENE_JABU_JABU_BOSS,               0x00,                                              0x4F, "Barinade Heart Container",                    RHT_JABU_JABUS_BELLY_BARINADE_HEART,                             RG_HEART_CONTAINER,                   { Category::cSongDungeonReward },                       SpoilerCollectionCheck::Collectable(0x13, 0x1F),                                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY,    true);
-    locationTable[RC_FOREST_TEMPLE_PHANTOM_GANON_HEART] =                              Location::Base(RC_FOREST_TEMPLE_PHANTOM_GANON_HEART,                            RCQUEST_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_FOREST_TEMPLE,                ACTOR_ITEM_B_HEART,   SCENE_FOREST_TEMPLE_BOSS,           0x00,                                              0x4F, "Phantom Ganon Heart Container",               RHT_FOREST_TEMPLE_PHANTOM_GANON_HEART,                           RG_HEART_CONTAINER,                   { Category::cSongDungeonReward },                       SpoilerCollectionCheck::Collectable(0x14, 0x1F),                                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE,      true);
-    locationTable[RC_FIRE_TEMPLE_VOLVAGIA_HEART] =                                     Location::Base(RC_FIRE_TEMPLE_VOLVAGIA_HEART,                                   RCQUEST_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_FIRE_TEMPLE,                  ACTOR_ITEM_B_HEART,   SCENE_FIRE_TEMPLE_BOSS,             0x00,                                              0x4F, "Volvagia Heart Container",                    RHT_FIRE_TEMPLE_VOLVAGIA_HEART,                                  RG_HEART_CONTAINER,                   { Category::cSongDungeonReward },                       SpoilerCollectionCheck::Collectable(0x15, 0x1F),                                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE,        true);
-    locationTable[RC_WATER_TEMPLE_MORPHA_HEART] =                                      Location::Base(RC_WATER_TEMPLE_MORPHA_HEART,                                    RCQUEST_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_WATER_TEMPLE,                 ACTOR_ITEM_B_HEART,   SCENE_WATER_TEMPLE_BOSS,            0x00,                                              0x4F, "Morpha Heart Container",                      RHT_WATER_TEMPLE_MORPHA_HEART,                                   RG_HEART_CONTAINER,                   { Category::cSongDungeonReward },                       SpoilerCollectionCheck::Collectable(0x16, 0x1F),                                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE,       true);
-    locationTable[RC_SPIRIT_TEMPLE_TWINROVA_HEART] =                                   Location::Base(RC_SPIRIT_TEMPLE_TWINROVA_HEART,                                 RCQUEST_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_SPIRIT_TEMPLE,                ACTOR_ITEM_B_HEART,   SCENE_SPIRIT_TEMPLE_BOSS,           0x00,                                              0x4F, "Twinrova Heart Container",                    RHT_SPIRIT_TEMPLE_TWINROVA_HEART,                                RG_HEART_CONTAINER,                   { Category::cSongDungeonReward },                       SpoilerCollectionCheck::Collectable(0x17, 0x1F),                                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE,      true);
-    locationTable[RC_SHADOW_TEMPLE_BONGO_BONGO_HEART] =                                Location::Base(RC_SHADOW_TEMPLE_BONGO_BONGO_HEART,                              RCQUEST_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD,  RCAREA_SHADOW_TEMPLE,                ACTOR_ITEM_B_HEART,   SCENE_SHADOW_TEMPLE_BOSS,           0x00,                                              0x4F, "Bongo Bongo Heart Container",                 RHT_SHADOW_TEMPLE_BONGO_BONGO_HEART,                             RG_HEART_CONTAINER,                   { Category::cSongDungeonReward },                       SpoilerCollectionCheck::Collectable(0x18, 0x1F),                                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE,      true);
+    locationTable[RC_DEKU_TREE_QUEEN_GOHMA_HEART] =                                    Location::Base(RC_DEKU_TREE_QUEEN_GOHMA_HEART,                                  RCQUEST_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD,                                       ACTOR_ITEM_B_HEART,   SCENE_DEKU_TREE_BOSS,               0x00,                               "Queen Gohma Heart Container",                 RHT_DEKU_TREE_QUEEN_GOHMA_HEART,                                 RG_HEART_CONTAINER,                                                 SpoilerCollectionCheck::Collectable(0x11, 0x1F),                                                                              true);
+    locationTable[RC_DODONGOS_CAVERN_KING_DODONGO_HEART] =                             Location::Base(RC_DODONGOS_CAVERN_KING_DODONGO_HEART,                           RCQUEST_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD,                                       ACTOR_ITEM_B_HEART,   SCENE_DODONGOS_CAVERN_BOSS,         0x00,                               "King Dodongo Heart Container",                RHT_DODONGOS_CAVERN_KING_DODONGO_HEART,                          RG_HEART_CONTAINER,                                                 SpoilerCollectionCheck::Collectable(0x12, 0x1F),                                                                              true);
+    locationTable[RC_JABU_JABUS_BELLY_BARINADE_HEART] =                                Location::Base(RC_JABU_JABUS_BELLY_BARINADE_HEART,                              RCQUEST_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD,                                       ACTOR_ITEM_B_HEART,   SCENE_JABU_JABU_BOSS,               0x00,                               "Barinade Heart Container",                    RHT_JABU_JABUS_BELLY_BARINADE_HEART,                             RG_HEART_CONTAINER,                                                 SpoilerCollectionCheck::Collectable(0x13, 0x1F),                                                                              true);
+    locationTable[RC_FOREST_TEMPLE_PHANTOM_GANON_HEART] =                              Location::Base(RC_FOREST_TEMPLE_PHANTOM_GANON_HEART,                            RCQUEST_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD,                                       ACTOR_ITEM_B_HEART,   SCENE_FOREST_TEMPLE_BOSS,           0x00,                               "Phantom Ganon Heart Container",               RHT_FOREST_TEMPLE_PHANTOM_GANON_HEART,                           RG_HEART_CONTAINER,                                                 SpoilerCollectionCheck::Collectable(0x14, 0x1F),                                                                              true);
+    locationTable[RC_FIRE_TEMPLE_VOLVAGIA_HEART] =                                     Location::Base(RC_FIRE_TEMPLE_VOLVAGIA_HEART,                                   RCQUEST_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD,                                       ACTOR_ITEM_B_HEART,   SCENE_FIRE_TEMPLE_BOSS,             0x00,                               "Volvagia Heart Container",                    RHT_FIRE_TEMPLE_VOLVAGIA_HEART,                                  RG_HEART_CONTAINER,                                                 SpoilerCollectionCheck::Collectable(0x15, 0x1F),                                                                              true);
+    locationTable[RC_WATER_TEMPLE_MORPHA_HEART] =                                      Location::Base(RC_WATER_TEMPLE_MORPHA_HEART,                                    RCQUEST_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD,                                       ACTOR_ITEM_B_HEART,   SCENE_WATER_TEMPLE_BOSS,            0x00,                               "Morpha Heart Container",                      RHT_WATER_TEMPLE_MORPHA_HEART,                                   RG_HEART_CONTAINER,                                                 SpoilerCollectionCheck::Collectable(0x16, 0x1F),                                                                              true);
+    locationTable[RC_SPIRIT_TEMPLE_TWINROVA_HEART] =                                   Location::Base(RC_SPIRIT_TEMPLE_TWINROVA_HEART,                                 RCQUEST_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD,                                       ACTOR_ITEM_B_HEART,   SCENE_SPIRIT_TEMPLE_BOSS,           0x00,                               "Twinrova Heart Container",                    RHT_SPIRIT_TEMPLE_TWINROVA_HEART,                                RG_HEART_CONTAINER,                                                 SpoilerCollectionCheck::Collectable(0x17, 0x1F),                                                                              true);
+    locationTable[RC_SHADOW_TEMPLE_BONGO_BONGO_HEART] =                                Location::Base(RC_SHADOW_TEMPLE_BONGO_BONGO_HEART,                              RCQUEST_BOTH,    RCTYPE_BOSS_HEART_OR_OTHER_REWARD,                                       ACTOR_ITEM_B_HEART,   SCENE_SHADOW_TEMPLE_BOSS,           0x00,                               "Bongo Bongo Heart Container",                 RHT_SHADOW_TEMPLE_BONGO_BONGO_HEART,                             RG_HEART_CONTAINER,                                                 SpoilerCollectionCheck::Collectable(0x18, 0x1F),                                                                              true);
 
     // Cutscenes
-    locationTable[RC_TOT_MASTER_SWORD] =                                            Location::Delayed(RC_TOT_MASTER_SWORD,                                             RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x00, "ToT Master Sword",                            RHT_TOT_MASTER_SWORD,                                            RG_MASTER_SWORD,                      {},                                                     SpoilerCollectionCheck::EventChkInf(0x45),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
-    locationTable[RC_TOT_LIGHT_ARROWS_CUTSCENE] =                                   Location::Delayed(RC_TOT_LIGHT_ARROWS_CUTSCENE,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x01, "ToT Light Arrow Cutscene",                    RHT_TOT_LIGHT_ARROWS_CUTSCENE,                                   RG_LIGHT_ARROWS,                      {},                                                     SpoilerCollectionCheck::EventChkInf(0xC4),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
-    locationTable[RC_LW_GIFT_FROM_SARIA] =                                          Location::Delayed(RC_LW_GIFT_FROM_SARIA,                                           RCQUEST_BOTH,    RCTYPE_OCARINA,                     RCAREA_LOST_WOODS,                   ACTOR_ID_MAX,         SCENE_LOST_WOODS,                   0x00,                                              0x02, "Gift From Saria",                             RHT_LW_GIFT_FROM_SARIA,                                          RG_PROGRESSIVE_OCARINA,               {},                                                     SpoilerCollectionCheck::EventChkInf(0xC1),                                                                                    SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
-    locationTable[RC_ZF_GREAT_FAIRY_REWARD] =                                       Location::Delayed(RC_ZF_GREAT_FAIRY_REWARD,                                        RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_FOUNTAIN,               ACTOR_BG_DY_YOSEIZO,  SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 1,                                                 0x10, "Great Fairy Reward",                          RHT_ZF_GREAT_FAIRY_REWARD,                                       RG_FARORES_WIND,                      {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZF_GREAT_FAIRY_REWARD),                                                        SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN,               true);
-    locationTable[RC_HC_GREAT_FAIRY_REWARD] =                                       Location::Delayed(RC_HC_GREAT_FAIRY_REWARD,                                        RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_CASTLE,                ACTOR_BG_DY_YOSEIZO,  SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 2,                                                 0x11, "Great Fairy Reward",                          RHT_HC_GREAT_FAIRY_REWARD,                                       RG_DINS_FIRE,                         {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HC_GREAT_FAIRY_REWARD),                                                        SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
-    locationTable[RC_COLOSSUS_GREAT_FAIRY_REWARD] =                                 Location::Delayed(RC_COLOSSUS_GREAT_FAIRY_REWARD,                                  RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DESERT_COLOSSUS,              ACTOR_BG_DY_YOSEIZO,  SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 3,                                                 0x12, "Great Fairy Reward",                          RHT_COLOSSUS_GREAT_FAIRY_REWARD,                                 RG_NAYRUS_LOVE,                       {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COLOSSUS_GREAT_FAIRY_REWARD),                                                  SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
-    locationTable[RC_DMT_GREAT_FAIRY_REWARD] =                                      Location::Delayed(RC_DMT_GREAT_FAIRY_REWARD,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_BG_DY_YOSEIZO,  SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC,  1,                                                 0x13, "Great Fairy Reward",                          RHT_DMT_GREAT_FAIRY_REWARD,                                      RG_PROGRESSIVE_MAGIC_METER,           {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMT_GREAT_FAIRY_REWARD),                                                       SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,             true);
-    locationTable[RC_DMC_GREAT_FAIRY_REWARD] =                                      Location::Delayed(RC_DMC_GREAT_FAIRY_REWARD,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_BG_DY_YOSEIZO,  SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC,  2,                                                 0x14, "Great Fairy Reward",                          RHT_DMC_GREAT_FAIRY_REWARD,                                      RG_PROGRESSIVE_MAGIC_METER,           {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMC_GREAT_FAIRY_REWARD),                                                       SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,             true);
-    locationTable[RC_OGC_GREAT_FAIRY_REWARD] =                                      Location::Delayed(RC_OGC_GREAT_FAIRY_REWARD,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_CASTLE,                ACTOR_BG_DY_YOSEIZO,  SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC,  3,                                                 0x15, "OGC Great Fairy Reward", "OGC Great Fairy Reward", RHT_OGC_GREAT_FAIRY_REWARD,                                 RG_DOUBLE_DEFENSE,                    {},                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_OGC_GREAT_FAIRY_REWARD),                                                       SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE,      true);
+    locationTable[RC_TOT_MASTER_SWORD] =                                               Location::Base(RC_TOT_MASTER_SWORD,                                             RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_TEMPLE_OF_TIME,               0x00,                               "ToT Master Sword",                            RHT_TOT_MASTER_SWORD,                                            RG_MASTER_SWORD,                                                    SpoilerCollectionCheck::EventChkInf(0x45),                                                                                    true);
+    locationTable[RC_TOT_LIGHT_ARROWS_CUTSCENE] =                                      Location::Base(RC_TOT_LIGHT_ARROWS_CUTSCENE,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_TEMPLE_OF_TIME,               0x00,                               "ToT Light Arrow Cutscene",                    RHT_TOT_LIGHT_ARROWS_CUTSCENE,                                   RG_LIGHT_ARROWS,                                                    SpoilerCollectionCheck::EventChkInf(0xC4),                                                                                    true);
+    locationTable[RC_LW_GIFT_FROM_SARIA] =                                             Location::Base(RC_LW_GIFT_FROM_SARIA,                                           RCQUEST_BOTH,    RCTYPE_OCARINA,                                                          ACTOR_ID_MAX,         SCENE_LOST_WOODS,                   0x00,                               "Gift From Saria",                             RHT_LW_GIFT_FROM_SARIA,                                          RG_PROGRESSIVE_OCARINA,                                             SpoilerCollectionCheck::EventChkInf(0xC1),                                                                                    true);
+    locationTable[RC_ZF_GREAT_FAIRY_REWARD] =                                          Location::Base(RC_ZF_GREAT_FAIRY_REWARD,                                        RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_FOUNTAIN,               ACTOR_BG_DY_YOSEIZO,  SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 1,                                  "Great Fairy Reward",                          RHT_ZF_GREAT_FAIRY_REWARD,                                       RG_FARORES_WIND,                                                    SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZF_GREAT_FAIRY_REWARD),                                                        true);
+    locationTable[RC_HC_GREAT_FAIRY_REWARD] =                                          Location::Base(RC_HC_GREAT_FAIRY_REWARD,                                        RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_CASTLE,                ACTOR_BG_DY_YOSEIZO,  SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 2,                                  "Great Fairy Reward",                          RHT_HC_GREAT_FAIRY_REWARD,                                       RG_DINS_FIRE,                                                       SpoilerCollectionCheck::RandomizerInf(RAND_INF_HC_GREAT_FAIRY_REWARD),                                                        true);
+    locationTable[RC_COLOSSUS_GREAT_FAIRY_REWARD] =                                    Location::Base(RC_COLOSSUS_GREAT_FAIRY_REWARD,                                  RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DESERT_COLOSSUS,              ACTOR_BG_DY_YOSEIZO,  SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 3,                                  "Great Fairy Reward",                          RHT_COLOSSUS_GREAT_FAIRY_REWARD,                                 RG_NAYRUS_LOVE,                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COLOSSUS_GREAT_FAIRY_REWARD),                                                  true);
+    locationTable[RC_DMT_GREAT_FAIRY_REWARD] =                                         Location::Base(RC_DMT_GREAT_FAIRY_REWARD,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_BG_DY_YOSEIZO,  SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC,  1,                                  "Great Fairy Reward",                          RHT_DMT_GREAT_FAIRY_REWARD,                                      RG_PROGRESSIVE_MAGIC_METER,                                         SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMT_GREAT_FAIRY_REWARD),                                                       true);
+    locationTable[RC_DMC_GREAT_FAIRY_REWARD] =                                         Location::Base(RC_DMC_GREAT_FAIRY_REWARD,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_BG_DY_YOSEIZO,  SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC,  2,                                  "Great Fairy Reward",                          RHT_DMC_GREAT_FAIRY_REWARD,                                      RG_PROGRESSIVE_MAGIC_METER,                                         SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMC_GREAT_FAIRY_REWARD),                                                       true);
+    locationTable[RC_OGC_GREAT_FAIRY_REWARD] =                                         Location::Base(RC_OGC_GREAT_FAIRY_REWARD,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_CASTLE,                ACTOR_BG_DY_YOSEIZO,  SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC,  3,                                  "OGC Great Fairy Reward", "OGC Great Fairy Reward", RHT_OGC_GREAT_FAIRY_REWARD,                                 RG_DOUBLE_DEFENSE,                                                  SpoilerCollectionCheck::RandomizerInf(RAND_INF_OGC_GREAT_FAIRY_REWARD),                                                       true);
 
     // Songs
-    locationTable[RC_SHEIK_IN_FOREST] =                                             Location::Delayed(RC_SHEIK_IN_FOREST,                                              RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_SACRED_FOREST_MEADOW,         ACTOR_ID_MAX,         SCENE_SACRED_FOREST_MEADOW,         0x00,                                              0x20, "Sheik in Forest",           "Sheik in Forest",           RHT_SHEIK_IN_FOREST,                                  RG_MINUET_OF_FOREST,                  { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(0x50),                                                                                    SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
-    locationTable[RC_SHEIK_IN_CRATER] =                                             Location::Delayed(RC_SHEIK_IN_CRATER,                                              RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x21, "Sheik in Crater",           "Sheik in Crater",           RHT_SHEIK_IN_CRATER,                                  RG_BOLERO_OF_FIRE,                    { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(0x51),                                                                                    SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN,             true);
-    locationTable[RC_SHEIK_IN_ICE_CAVERN] =                                         Location::Delayed(RC_SHEIK_IN_ICE_CAVERN,                                          RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_ICE_CAVERN,                   ACTOR_ID_MAX,         SCENE_ICE_CAVERN,                   0x00,                                              0x22, "Sheik in Ice Cavern",       "Sheik in Ice Cavern",       RHT_SHEIK_IN_ICE_CAVERN,                              RG_SERENADE_OF_WATER,                 { Category::cSong, Category::cSongDungeonReward },      SpoilerCollectionCheck::EventChkInf(0x52),                                                                                    SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN,         true);
-    locationTable[RC_SHEIK_AT_COLOSSUS] =                                           Location::Delayed(RC_SHEIK_AT_COLOSSUS,                                            RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_DESERT_COLOSSUS,              ACTOR_ID_MAX,         SCENE_DESERT_COLOSSUS,              0x00,                                              0x23, "Sheik at Colossus",         "Sheik at Colossus",         RHT_SHEIK_AT_COLOSSUS,                                RG_REQUIEM_OF_SPIRIT,                 { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(0xAC),                                                                                    SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY,              true);
-    locationTable[RC_SHEIK_IN_KAKARIKO] =                                           Location::Delayed(RC_SHEIK_IN_KAKARIKO,                                            RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x24, "Sheik in Kakariko",         "Sheik in Kakariko",         RHT_SHEIK_IN_KAKARIKO,                                RG_NOCTURNE_OF_SHADOW,                { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(0xAA),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
-    locationTable[RC_SHEIK_AT_TEMPLE] =                                             Location::Delayed(RC_SHEIK_AT_TEMPLE,                                              RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x25, "Sheik at Temple",           "Sheik at Temple",           RHT_SHEIK_AT_TEMPLE,                                  RG_PRELUDE_OF_LIGHT,                  { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(0x55),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
-    locationTable[RC_SONG_FROM_IMPA] =                                              Location::Delayed(RC_SONG_FROM_IMPA,                                               RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_HYRULE_CASTLE,                ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x26, "Song from Impa",            "Song from Impa",            RHT_SONG_FROM_IMPA,                                   RG_ZELDAS_LULLABY,                    { Category::cSong, Category::cSongDungeonReward },      SpoilerCollectionCheck::EventChkInf(0x59),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE,              true);
-    locationTable[RC_SONG_FROM_MALON] =                                             Location::Delayed(RC_SONG_FROM_MALON,                                              RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_LON_LON_RANCH,                ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x27, "Song from Malon",           "Song from Malon",           RHT_SONG_FROM_MALON,                                  RG_EPONAS_SONG,                       { Category::cSong },                                    SpoilerCollectionCheck::RandomizerInf(RAND_INF_LEARNED_EPONA_SONG),                                                           SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH,              true);
-    locationTable[RC_SONG_FROM_SARIA] =                                             Location::Delayed(RC_SONG_FROM_SARIA,                                              RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_SACRED_FOREST_MEADOW,         ACTOR_ID_MAX,         SCENE_SACRED_FOREST_MEADOW,         0x00,                                              0x28, "Song from Saria",           "Song from Saria",           RHT_SONG_FROM_SARIA,                                  RG_SARIAS_SONG,                       { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(0x57),                                                                                    SpoilerCollectionCheckGroup::GROUP_LOST_WOODS,                 true);
-    locationTable[RC_SONG_FROM_ROYAL_FAMILYS_TOMB] =                                Location::Delayed(RC_SONG_FROM_ROYAL_FAMILYS_TOMB,                                 RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_GRAVEYARD,                    ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x29, "Song from Composers Grave", "Song from Composers Grave", RHT_SONG_FROM_ROYAL_FAMILYS_TOMB,                     RG_SUNS_SONG,                         { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_LEARNED_SUNS_SONG),                                                           SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
-    locationTable[RC_SONG_FROM_OCARINA_OF_TIME] =                                   Location::Delayed(RC_SONG_FROM_OCARINA_OF_TIME,                                    RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_HYRULE_FIELD,                 ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x2A, "Song from Ocarina of Time", "Song from Ocarina of Time", RHT_SONG_FROM_OCARINA_OF_TIME,                        RG_SONG_OF_TIME,                      { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(0xA9),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD,               true);
-    locationTable[RC_SONG_FROM_WINDMILL] =                                          Location::Delayed(RC_SONG_FROM_WINDMILL,                                           RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x2B, "Song from Windmill",        "Song from Windmill",        RHT_SONG_FROM_WINDMILL,                               RG_SONG_OF_STORMS,                    { Category::cSong },                                    SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_LEARNED_SONG_OF_STORMS),                                                      SpoilerCollectionCheckGroup::GROUP_KAKARIKO,                   true);
+    locationTable[RC_SHEIK_IN_FOREST] =                                                Location::Base(RC_SHEIK_IN_FOREST,                                              RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,                                                    ACTOR_ID_MAX,         SCENE_SACRED_FOREST_MEADOW,         0x00,                               "Sheik in Forest",           "Sheik in Forest",           RHT_SHEIK_IN_FOREST,                                  RG_MINUET_OF_FOREST,                                                SpoilerCollectionCheck::EventChkInf(0x50),                                                                                    true);
+    locationTable[RC_SHEIK_IN_CRATER] =                                                Location::Base(RC_SHEIK_IN_CRATER,                                              RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,                                                    ACTOR_ID_MAX,         SCENE_DEATH_MOUNTAIN_CRATER,        0x00,                               "Sheik in Crater",           "Sheik in Crater",           RHT_SHEIK_IN_CRATER,                                  RG_BOLERO_OF_FIRE,                                                  SpoilerCollectionCheck::EventChkInf(0x51),                                                                                    true);
+    locationTable[RC_SHEIK_IN_ICE_CAVERN] =                                            Location::Base(RC_SHEIK_IN_ICE_CAVERN,                                          RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,                                                    ACTOR_ID_MAX,         SCENE_ICE_CAVERN,                   0x00,                               "Sheik in Ice Cavern",       "Sheik in Ice Cavern",       RHT_SHEIK_IN_ICE_CAVERN,                              RG_SERENADE_OF_WATER,                                               SpoilerCollectionCheck::EventChkInf(0x52),                                                                                    true);
+    locationTable[RC_SHEIK_AT_COLOSSUS] =                                              Location::Base(RC_SHEIK_AT_COLOSSUS,                                            RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,                                                    ACTOR_ID_MAX,         SCENE_DESERT_COLOSSUS,              0x00,                               "Sheik at Colossus",         "Sheik at Colossus",         RHT_SHEIK_AT_COLOSSUS,                                RG_REQUIEM_OF_SPIRIT,                                               SpoilerCollectionCheck::EventChkInf(0xAC),                                                                                    true);
+    locationTable[RC_SHEIK_IN_KAKARIKO] =                                              Location::Base(RC_SHEIK_IN_KAKARIKO,                                            RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,                                                    ACTOR_ID_MAX,         SCENE_KAKARIKO_VILLAGE,             0x00,                               "Sheik in Kakariko",         "Sheik in Kakariko",         RHT_SHEIK_IN_KAKARIKO,                                RG_NOCTURNE_OF_SHADOW,                                              SpoilerCollectionCheck::EventChkInf(0xAA),                                                                                    true);
+    locationTable[RC_SHEIK_AT_TEMPLE] =                                                Location::Base(RC_SHEIK_AT_TEMPLE,                                              RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,                                                    ACTOR_ID_MAX,         SCENE_TEMPLE_OF_TIME,               0x00,                               "Sheik at Temple",           "Sheik at Temple",           RHT_SHEIK_AT_TEMPLE,                                  RG_PRELUDE_OF_LIGHT,                                                SpoilerCollectionCheck::EventChkInf(0x55),                                                                                    true);
+    locationTable[RC_SONG_FROM_IMPA] =                                                 Location::Base(RC_SONG_FROM_IMPA,                                               RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_HYRULE_CASTLE,                ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                               "Song from Impa",            "Song from Impa",            RHT_SONG_FROM_IMPA,                                   RG_ZELDAS_LULLABY,                                                  SpoilerCollectionCheck::EventChkInf(0x59),                                                                                    true);
+    locationTable[RC_SONG_FROM_MALON] =                                                Location::Base(RC_SONG_FROM_MALON,                                              RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,                                                    ACTOR_ID_MAX,         SCENE_LON_LON_RANCH,                0x00,                               "Song from Malon",           "Song from Malon",           RHT_SONG_FROM_MALON,                                  RG_EPONAS_SONG,                                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LEARNED_EPONA_SONG),                                                           true);
+    locationTable[RC_SONG_FROM_SARIA] =                                                Location::Base(RC_SONG_FROM_SARIA,                                              RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,                                                    ACTOR_ID_MAX,         SCENE_SACRED_FOREST_MEADOW,         0x00,                               "Song from Saria",           "Song from Saria",           RHT_SONG_FROM_SARIA,                                  RG_SARIAS_SONG,                                                     SpoilerCollectionCheck::EventChkInf(0x57),                                                                                    true);
+    locationTable[RC_SONG_FROM_ROYAL_FAMILYS_TOMB] =                                   Location::Base(RC_SONG_FROM_ROYAL_FAMILYS_TOMB,                                 RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,                                                    ACTOR_ID_MAX,         SCENE_ROYAL_FAMILYS_TOMB,           0x00,                               "Song from Composers Grave", "Song from Composers Grave", RHT_SONG_FROM_ROYAL_FAMILYS_TOMB,                     RG_SUNS_SONG,                                                       SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_LEARNED_SUNS_SONG),                                                           true);
+    locationTable[RC_SONG_FROM_OCARINA_OF_TIME] =                                      Location::Base(RC_SONG_FROM_OCARINA_OF_TIME,                                    RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,                                                    ACTOR_ID_MAX,         SCENE_HYRULE_FIELD,                 0x00,                               "Song from Ocarina of Time", "Song from Ocarina of Time", RHT_SONG_FROM_OCARINA_OF_TIME,                        RG_SONG_OF_TIME,                                                    SpoilerCollectionCheck::EventChkInf(0xA9),                                                                                    true);
+    locationTable[RC_SONG_FROM_WINDMILL] =                                             Location::Base(RC_SONG_FROM_WINDMILL,                                           RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_WINDMILL_AND_DAMPES_GRAVE,    0x00,                               "Song from Windmill",        "Song from Windmill",        RHT_SONG_FROM_WINDMILL,                               RG_SONG_OF_STORMS,                                                  SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_LEARNED_SONG_OF_STORMS),                                                      true);
 
     //Beehives
-    locationTable[RC_KF_STORMS_GROTTO_BEEHIVE_LEFT] =                                  Location::Base(RC_KF_STORMS_GROTTO_BEEHIVE_LEFT,                                RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_KOKIRI_FOREST,                ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x2C),                      0x00, "Storms Grotto Beehive Left",                  RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                        { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_KF_STORMS_GROTTO_LEFT),                                                SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_STORMS_GROTTO_BEEHIVE_RIGHT] =                                 Location::Base(RC_KF_STORMS_GROTTO_BEEHIVE_RIGHT,                               RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_KOKIRI_FOREST,                ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x2C),                      0x00, "Storms Grotto Beehive Right",                 RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_KF_STORMS_GROTTO_RIGHT),                                               SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_LEFT] =                          Location::Base(RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_LEFT,                        RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_LOST_WOODS,                   ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x14),                      0x00, "Near Shortcuts Grotto Beehive Left",          RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                        { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_LW_NEAR_SHORTCUTS_GROTTO_LEFT),                                        SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_RIGHT] =                         Location::Base(RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_RIGHT,                       RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_LOST_WOODS,                   ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x14),                      0x00, "Near Shortcuts Grotto Beehive Right",         RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_LW_NEAR_SHORTCUTS_GROTTO_RIGHT),                                       SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[RC_LW_DEKU_SCRUB_GROTTO_BEEHIVE] =                                   Location::Base(RC_LW_DEKU_SCRUB_GROTTO_BEEHIVE,                                 RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_LOST_WOODS,                   ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(747,  0xF5),                      0x00, "Deku Scrub Grotto Beehive",                   RHT_BEEHIVE_SCRUB_PAIR_GROTTO,                                   RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_LW_DEKU_SCRUB_GROTTO),                                                 SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[RC_SFM_STORMS_GROTTO_BEEHIVE] =                                      Location::Base(RC_SFM_STORMS_GROTTO_BEEHIVE,                                    RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_SACRED_FOREST_MEADOW,         ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(2262, 0xEE),                      0x00, "Storms Grotto Beehive",                       RHT_BEEHIVE_SCRUB_PAIR_GROTTO,                                   RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_SFM_STORMS_GROTTO),                                                    SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_LEFT] =                             Location::Base(RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_LEFT,                           RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x00),                      0x00, "Near Market Grotto Beehive Left",             RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                        { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_NEAR_MARKET_GROTTO_LEFT),                                           SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_RIGHT] =                            Location::Base(RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_RIGHT,                          RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x00),                      0x00, "Near Market Grotto Beehive Right",            RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_NEAR_MARKET_GROTTO_RIGHT),                                          SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[RC_HF_OPEN_GROTTO_BEEHIVE_LEFT] =                                    Location::Base(RC_HF_OPEN_GROTTO_BEEHIVE_LEFT,                                  RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x03),                      0x00, "Open Grotto Beehive Left",                    RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                        { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_OPEN_GROTTO_LEFT),                                                  SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[RC_HF_OPEN_GROTTO_BEEHIVE_RIGHT] =                                   Location::Base(RC_HF_OPEN_GROTTO_BEEHIVE_RIGHT,                                 RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x03),                      0x00, "Open Grotto Beehive Right",                   RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_OPEN_GROTTO_RIGHT),                                                 SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[RC_HF_SOUTHEAST_GROTTO_BEEHIVE_LEFT] =                               Location::Base(RC_HF_SOUTHEAST_GROTTO_BEEHIVE_LEFT,                             RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x22),                      0x00, "Southeast Grotto Beehive Left",               RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                        { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_SOUTHEAST_GROTTO_LEFT),                                             SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[RC_HF_SOUTHEAST_GROTTO_BEEHIVE_RIGHT] =                              Location::Base(RC_HF_SOUTHEAST_GROTTO_BEEHIVE_RIGHT,                            RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x22),                      0x00, "Southeast Grotto Beehive Right",              RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_SOUTHEAST_GROTTO_RIGHT),                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[RC_HF_INSIDE_FENCE_GROTTO_BEEHIVE] =                                 Location::Base(RC_HF_INSIDE_FENCE_GROTTO_BEEHIVE,                               RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(1410, 0xE6),                      0x00, "Inside Fence Grotto Beehive",                 RHT_BEEHIVE_LONELY_SCRUB_GROTTO,                                 RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_INSIDE_FENCE_GROTTO),                                               SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[RC_LLR_GROTTO_BEEHIVE] =                                             Location::Base(RC_LLR_GROTTO_BEEHIVE,                                           RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_LON_LON_RANCH,                ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(5144, 0xFC),                      0x00, "Grotto Beehive",                              RHT_BEEHIVE_SCRUB_TRIO_GROTTO,                                   RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_LLR_GROTTO),                                                           SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
-    locationTable[RC_KAK_OPEN_GROTTO_BEEHIVE_LEFT] =                                   Location::Base(RC_KAK_OPEN_GROTTO_BEEHIVE_LEFT,                                 RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_KAKARIKO_VILLAGE,             ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x28),                      0x00, "Open Grotto Beehive Left",                    RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                        { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_KAK_OPEN_GROTTO_LEFT),                                                 SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_OPEN_GROTTO_BEEHIVE_RIGHT] =                                  Location::Base(RC_KAK_OPEN_GROTTO_BEEHIVE_RIGHT,                                RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_KAKARIKO_VILLAGE,             ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x28),                      0x00, "Open Grotto Beehive Right",                   RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_KAK_OPEN_GROTTO_RIGHT),                                                SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_DMT_COW_GROTTO_BEEHIVE] =                                         Location::Base(RC_DMT_COW_GROTTO_BEEHIVE,                                       RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(2617, 0xF8),                      0x00, "Cow Grotto Beehive",                          RHT_BEEHIVE_COW_GROTTO,                                          RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_DMT_COW_GROTTO),                                                       SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMT_STORMS_GROTTO_BEEHIVE_LEFT] =                                 Location::Base(RC_DMT_STORMS_GROTTO_BEEHIVE_LEFT,                               RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x57),                      0x00, "Storms Grotto Beehive Left",                  RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                        { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_DMT_STORMS_GROTTO_LEFT),                                               SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMT_STORMS_GROTTO_BEEHIVE_RIGHT] =                                Location::Base(RC_DMT_STORMS_GROTTO_BEEHIVE_RIGHT,                              RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x57),                      0x00, "Storms Grotto Beehive Right",                 RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_DMT_STORMS_GROTTO_RIGHT),                                              SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_GC_GROTTO_BEEHIVE] =                                              Location::Base(RC_GC_GROTTO_BEEHIVE,                                            RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_GORON_CITY,                   ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(5144, 0xFB),                      0x00, "Grotto Beehive",                              RHT_BEEHIVE_SCRUB_TRIO_GROTTO,                                   RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_GC_GROTTO),                                                            SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_DMC_UPPER_GROTTO_BEEHIVE_LEFT] =                                  Location::Base(RC_DMC_UPPER_GROTTO_BEEHIVE_LEFT,                                RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x7A),                      0x00, "Upper Grotto Beehive Left",                   RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                        { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_DMC_UPPER_GROTTO_LEFT),                                                SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMC_UPPER_GROTTO_BEEHIVE_RIGHT] =                                 Location::Base(RC_DMC_UPPER_GROTTO_BEEHIVE_RIGHT,                               RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x7A),                      0x00, "Upper Grotto Beehive Right",                  RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_DMC_UPPER_GROTTO_RIGHT),                                               SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMC_HAMMER_GROTTO_BEEHIVE] =                                      Location::Base(RC_DMC_HAMMER_GROTTO_BEEHIVE,                                    RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(5144, 0xF9),                      0x00, "Hammer Grotto Beehive",                       RHT_BEEHIVE_SCRUB_TRIO_GROTTO,                                   RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_DMC_HAMMER_GROTTO),                                                    SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_ZR_OPEN_GROTTO_BEEHIVE_LEFT] =                                    Location::Base(RC_ZR_OPEN_GROTTO_BEEHIVE_LEFT,                                  RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_ZORAS_RIVER,                  ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x29),                      0x00, "Open Grotto Beehive Left",                    RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                        { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_ZR_OPEN_GROTTO_LEFT),                                                  SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZR_OPEN_GROTTO_BEEHIVE_RIGHT] =                                   Location::Base(RC_ZR_OPEN_GROTTO_BEEHIVE_RIGHT,                                 RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_ZORAS_RIVER,                  ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x29),                      0x00, "Open Grotto Beehive Right",                   RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_ZR_OPEN_GROTTO_RIGHT),                                                 SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZR_STORMS_GROTTO_BEEHIVE] =                                       Location::Base(RC_ZR_STORMS_GROTTO_BEEHIVE,                                     RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_ZORAS_RIVER,                  ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(2262, 0xEB),                      0x00, "Storms Grotto Beehive",                       RHT_BEEHIVE_SCRUB_PAIR_GROTTO,                                   RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_ZR_STORMS_GROTTO),                                                     SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_LEFT] =                          Location::Base(RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_LEFT,                        RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_ZORAS_DOMAIN,                 ACTOR_OBJ_COMB,       SCENE_ZORAS_DOMAIN,                 TWO_ACTOR_PARAMS(382,  0x00),                      0x00, "In Front of King Zora Beehive Left",          RHT_BEEHIVE_IN_FRONT_OF_KING_ZORA,                               RG_BLUE_RUPEE,                        { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_ZD_IN_FRONT_OF_KING_ZORA_LEFT),                                        SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_RIGHT] =                         Location::Base(RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_RIGHT,                       RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_ZORAS_DOMAIN,                 ACTOR_OBJ_COMB,       SCENE_ZORAS_DOMAIN,                 TWO_ACTOR_PARAMS(948,  0x00),                      0x00, "In Front of King Zora Beehive Right",         RHT_BEEHIVE_IN_FRONT_OF_KING_ZORA,                               RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_ZD_IN_FRONT_OF_KING_ZORA_RIGHT),                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZD_BEHIND_KING_ZORA_BEEHIVE] =                                    Location::Base(RC_ZD_BEHIND_KING_ZORA_BEEHIVE,                                  RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_ZORAS_DOMAIN,                 ACTOR_OBJ_COMB,       SCENE_ZORAS_DOMAIN,                 TWO_ACTOR_PARAMS(701,  0x00),                      0x00, "Behind King Zora Beehive",                    RHT_BEEHIVE_BEHIND_KING_ZORA,                                    RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_ZD_BEHIND_KING_ZORA),                                                  SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_LH_GROTTO_BEEHIVE] =                                              Location::Base(RC_LH_GROTTO_BEEHIVE,                                            RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_LAKE_HYLIA,                   ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(5144, 0xEF),                      0x00, "Grotto Beehive",                              RHT_BEEHIVE_SCRUB_TRIO_GROTTO,                                   RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_LH_GROTTO),                                                            SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_GV_DEKU_SCRUB_GROTTO_BEEHIVE] =                                   Location::Base(RC_GV_DEKU_SCRUB_GROTTO_BEEHIVE,                                 RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_GERUDO_VALLEY,                ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(2262, 0xF0),                      0x00, "Deku Scrub Grotto Beehive",                   RHT_BEEHIVE_SCRUB_PAIR_GROTTO,                                   RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_GV_DEKU_SCRUB_GROTTO),                                                 SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[RC_COLOSSUS_GROTTO_BEEHIVE] =                                        Location::Base(RC_COLOSSUS_GROTTO_BEEHIVE,                                      RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DESERT_COLOSSUS,              ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(2262, 0xFD),                      0x00, "Grotto Beehive",                              RHT_BEEHIVE_SCRUB_PAIR_GROTTO,                                   RG_RED_RUPEE,                         { Category::cBeehive },                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_COLOSSUS_GROTTO),                                                      SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
+    locationTable[RC_KF_STORMS_GROTTO_BEEHIVE_LEFT] =                                  Location::Base(RC_KF_STORMS_GROTTO_BEEHIVE_LEFT,                                RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_KOKIRI_FOREST,                ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x2C),       "Storms Grotto Beehive Left",                  RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                                                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_KF_STORMS_GROTTO_LEFT));
+    locationTable[RC_KF_STORMS_GROTTO_BEEHIVE_RIGHT] =                                 Location::Base(RC_KF_STORMS_GROTTO_BEEHIVE_RIGHT,                               RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_KOKIRI_FOREST,                ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x2C),       "Storms Grotto Beehive Right",                 RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                                                       SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_KF_STORMS_GROTTO_RIGHT));
+    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_LEFT] =                          Location::Base(RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_LEFT,                        RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_LOST_WOODS,                   ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x14),       "Near Shortcuts Grotto Beehive Left",          RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                                                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_LW_NEAR_SHORTCUTS_GROTTO_LEFT));
+    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_RIGHT] =                         Location::Base(RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_RIGHT,                       RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_LOST_WOODS,                   ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x14),       "Near Shortcuts Grotto Beehive Right",         RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                                                       SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_LW_NEAR_SHORTCUTS_GROTTO_RIGHT));
+    locationTable[RC_LW_DEKU_SCRUB_GROTTO_BEEHIVE] =                                   Location::Base(RC_LW_DEKU_SCRUB_GROTTO_BEEHIVE,                                 RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_LOST_WOODS,                   ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(747,  0xF5),       "Deku Scrub Grotto Beehive",                   RHT_BEEHIVE_SCRUB_PAIR_GROTTO,                                   RG_RED_RUPEE,                                                       SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_LW_DEKU_SCRUB_GROTTO));
+    locationTable[RC_SFM_STORMS_GROTTO_BEEHIVE] =                                      Location::Base(RC_SFM_STORMS_GROTTO_BEEHIVE,                                    RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_SACRED_FOREST_MEADOW,         ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(2262, 0xEE),       "Storms Grotto Beehive",                       RHT_BEEHIVE_SCRUB_PAIR_GROTTO,                                   RG_RED_RUPEE,                                                       SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_SFM_STORMS_GROTTO));
+    locationTable[RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_LEFT] =                             Location::Base(RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_LEFT,                           RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x00),       "Near Market Grotto Beehive Left",             RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                                                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_NEAR_MARKET_GROTTO_LEFT));
+    locationTable[RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_RIGHT] =                            Location::Base(RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_RIGHT,                          RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x00),       "Near Market Grotto Beehive Right",            RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                                                       SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_NEAR_MARKET_GROTTO_RIGHT));
+    locationTable[RC_HF_OPEN_GROTTO_BEEHIVE_LEFT] =                                    Location::Base(RC_HF_OPEN_GROTTO_BEEHIVE_LEFT,                                  RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x03),       "Open Grotto Beehive Left",                    RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                                                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_OPEN_GROTTO_LEFT));
+    locationTable[RC_HF_OPEN_GROTTO_BEEHIVE_RIGHT] =                                   Location::Base(RC_HF_OPEN_GROTTO_BEEHIVE_RIGHT,                                 RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x03),       "Open Grotto Beehive Right",                   RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                                                       SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_OPEN_GROTTO_RIGHT));
+    locationTable[RC_HF_SOUTHEAST_GROTTO_BEEHIVE_LEFT] =                               Location::Base(RC_HF_SOUTHEAST_GROTTO_BEEHIVE_LEFT,                             RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x22),       "Southeast Grotto Beehive Left",               RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                                                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_SOUTHEAST_GROTTO_LEFT));
+    locationTable[RC_HF_SOUTHEAST_GROTTO_BEEHIVE_RIGHT] =                              Location::Base(RC_HF_SOUTHEAST_GROTTO_BEEHIVE_RIGHT,                            RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x22),       "Southeast Grotto Beehive Right",              RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                                                       SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_SOUTHEAST_GROTTO_RIGHT));
+    locationTable[RC_HF_INSIDE_FENCE_GROTTO_BEEHIVE] =                                 Location::Base(RC_HF_INSIDE_FENCE_GROTTO_BEEHIVE,                               RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(1410, 0xE6),       "Inside Fence Grotto Beehive",                 RHT_BEEHIVE_LONELY_SCRUB_GROTTO,                                 RG_RED_RUPEE,                                                       SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_INSIDE_FENCE_GROTTO));
+    locationTable[RC_LLR_GROTTO_BEEHIVE] =                                             Location::Base(RC_LLR_GROTTO_BEEHIVE,                                           RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_LON_LON_RANCH,                ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(5144, 0xFC),       "Grotto Beehive",                              RHT_BEEHIVE_SCRUB_TRIO_GROTTO,                                   RG_RED_RUPEE,                                                       SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_LLR_GROTTO));
+    locationTable[RC_KAK_OPEN_GROTTO_BEEHIVE_LEFT] =                                   Location::Base(RC_KAK_OPEN_GROTTO_BEEHIVE_LEFT,                                 RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_KAKARIKO_VILLAGE,             ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x28),       "Open Grotto Beehive Left",                    RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                                                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_KAK_OPEN_GROTTO_LEFT));
+    locationTable[RC_KAK_OPEN_GROTTO_BEEHIVE_RIGHT] =                                  Location::Base(RC_KAK_OPEN_GROTTO_BEEHIVE_RIGHT,                                RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_KAKARIKO_VILLAGE,             ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x28),       "Open Grotto Beehive Right",                   RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                                                       SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_KAK_OPEN_GROTTO_RIGHT));
+    locationTable[RC_DMT_COW_GROTTO_BEEHIVE] =                                         Location::Base(RC_DMT_COW_GROTTO_BEEHIVE,                                       RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(2617, 0xF8),       "Cow Grotto Beehive",                          RHT_BEEHIVE_COW_GROTTO,                                          RG_RED_RUPEE,                                                       SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_DMT_COW_GROTTO));
+    locationTable[RC_DMT_STORMS_GROTTO_BEEHIVE_LEFT] =                                 Location::Base(RC_DMT_STORMS_GROTTO_BEEHIVE_LEFT,                               RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x57),       "Storms Grotto Beehive Left",                  RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                                                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_DMT_STORMS_GROTTO_LEFT));
+    locationTable[RC_DMT_STORMS_GROTTO_BEEHIVE_RIGHT] =                                Location::Base(RC_DMT_STORMS_GROTTO_BEEHIVE_RIGHT,                              RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x57),       "Storms Grotto Beehive Right",                 RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                                                       SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_DMT_STORMS_GROTTO_RIGHT));
+    locationTable[RC_GC_GROTTO_BEEHIVE] =                                              Location::Base(RC_GC_GROTTO_BEEHIVE,                                            RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_GORON_CITY,                   ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(5144, 0xFB),       "Grotto Beehive",                              RHT_BEEHIVE_SCRUB_TRIO_GROTTO,                                   RG_RED_RUPEE,                                                       SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_GC_GROTTO));
+    locationTable[RC_DMC_UPPER_GROTTO_BEEHIVE_LEFT] =                                  Location::Base(RC_DMC_UPPER_GROTTO_BEEHIVE_LEFT,                                RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x7A),       "Upper Grotto Beehive Left",                   RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                                                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_DMC_UPPER_GROTTO_LEFT));
+    locationTable[RC_DMC_UPPER_GROTTO_BEEHIVE_RIGHT] =                                 Location::Base(RC_DMC_UPPER_GROTTO_BEEHIVE_RIGHT,                               RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x7A),       "Upper Grotto Beehive Right",                  RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                                                       SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_DMC_UPPER_GROTTO_RIGHT));
+    locationTable[RC_DMC_HAMMER_GROTTO_BEEHIVE] =                                      Location::Base(RC_DMC_HAMMER_GROTTO_BEEHIVE,                                    RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(5144, 0xF9),       "Hammer Grotto Beehive",                       RHT_BEEHIVE_SCRUB_TRIO_GROTTO,                                   RG_RED_RUPEE,                                                       SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_DMC_HAMMER_GROTTO));
+    locationTable[RC_ZR_OPEN_GROTTO_BEEHIVE_LEFT] =                                    Location::Base(RC_ZR_OPEN_GROTTO_BEEHIVE_LEFT,                                  RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_ZORAS_RIVER,                  ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x29),       "Open Grotto Beehive Left",                    RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                                                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_ZR_OPEN_GROTTO_LEFT));
+    locationTable[RC_ZR_OPEN_GROTTO_BEEHIVE_RIGHT] =                                   Location::Base(RC_ZR_OPEN_GROTTO_BEEHIVE_RIGHT,                                 RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_ZORAS_RIVER,                  ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x29),       "Open Grotto Beehive Right",                   RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                                                       SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_ZR_OPEN_GROTTO_RIGHT));
+    locationTable[RC_ZR_STORMS_GROTTO_BEEHIVE] =                                       Location::Base(RC_ZR_STORMS_GROTTO_BEEHIVE,                                     RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_ZORAS_RIVER,                  ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(2262, 0xEB),       "Storms Grotto Beehive",                       RHT_BEEHIVE_SCRUB_PAIR_GROTTO,                                   RG_RED_RUPEE,                                                       SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_ZR_STORMS_GROTTO));
+    locationTable[RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_LEFT] =                          Location::Base(RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_LEFT,                        RCQUEST_BOTH,    RCTYPE_BEEHIVE,                                                          ACTOR_OBJ_COMB,       SCENE_ZORAS_DOMAIN,                 TWO_ACTOR_PARAMS(382,  0x00),       "In Front of King Zora Beehive Left",          RHT_BEEHIVE_IN_FRONT_OF_KING_ZORA,                               RG_BLUE_RUPEE,                                                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_ZD_IN_FRONT_OF_KING_ZORA_LEFT));
+    locationTable[RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_RIGHT] =                         Location::Base(RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_RIGHT,                       RCQUEST_BOTH,    RCTYPE_BEEHIVE,                                                          ACTOR_OBJ_COMB,       SCENE_ZORAS_DOMAIN,                 TWO_ACTOR_PARAMS(948,  0x00),       "In Front of King Zora Beehive Right",         RHT_BEEHIVE_IN_FRONT_OF_KING_ZORA,                               RG_RED_RUPEE,                                                       SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_ZD_IN_FRONT_OF_KING_ZORA_RIGHT));
+    locationTable[RC_ZD_BEHIND_KING_ZORA_BEEHIVE] =                                    Location::Base(RC_ZD_BEHIND_KING_ZORA_BEEHIVE,                                  RCQUEST_BOTH,    RCTYPE_BEEHIVE,                                                          ACTOR_OBJ_COMB,       SCENE_ZORAS_DOMAIN,                 TWO_ACTOR_PARAMS(701,  0x00),       "Behind King Zora Beehive",                    RHT_BEEHIVE_BEHIND_KING_ZORA,                                    RG_RED_RUPEE,                                                       SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_ZD_BEHIND_KING_ZORA));
+    locationTable[RC_LH_GROTTO_BEEHIVE] =                                              Location::Base(RC_LH_GROTTO_BEEHIVE,                                            RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_LAKE_HYLIA,                   ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(5144, 0xEF),       "Grotto Beehive",                              RHT_BEEHIVE_SCRUB_TRIO_GROTTO,                                   RG_RED_RUPEE,                                                       SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_LH_GROTTO));
+    locationTable[RC_GV_DEKU_SCRUB_GROTTO_BEEHIVE] =                                   Location::Base(RC_GV_DEKU_SCRUB_GROTTO_BEEHIVE,                                 RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_GERUDO_VALLEY,                ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(2262, 0xF0),       "Deku Scrub Grotto Beehive",                   RHT_BEEHIVE_SCRUB_PAIR_GROTTO,                                   RG_RED_RUPEE,                                                       SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_GV_DEKU_SCRUB_GROTTO));
+    locationTable[RC_COLOSSUS_GROTTO_BEEHIVE] =                                        Location::Base(RC_COLOSSUS_GROTTO_BEEHIVE,                                      RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DESERT_COLOSSUS,              ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(2262, 0xFD),       "Grotto Beehive",                              RHT_BEEHIVE_SCRUB_PAIR_GROTTO,                                   RG_RED_RUPEE,                                                       SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_COLOSSUS_GROTTO));
 
     // Cows
-    locationTable[RC_KF_LINKS_HOUSE_COW] =                                             Location::Base(RC_KF_LINKS_HOUSE_COW,                                           RCQUEST_BOTH,    RCTYPE_COW,                         RCAREA_KOKIRI_FOREST,                ACTOR_EN_COW,         SCENE_LINKS_HOUSE,                  0x00,                                              0x15, "Links House Cow",                             RHT_KF_LINKS_HOUSE_COW,                                          RG_MILK,                              { Category::cCow },                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_KF_LINKS_HOUSE_COW),                                               SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_HF_COW_GROTTO_COW] =                                              Location::Base(RC_HF_COW_GROTTO_COW,                                            RCQUEST_BOTH,    RCTYPE_COW,                         RCAREA_HYRULE_FIELD,                 ACTOR_EN_COW,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(3485, -291),                      0x16, "Cow Grotto Cow",                              RHT_HF_COW_GROTTO_COW,                                           RG_MILK,                              { Category::cCow },                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_HF_COW_GROTTO_COW),                                                SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[RC_LLR_STABLES_LEFT_COW] =                                           Location::Base(RC_LLR_STABLES_LEFT_COW,                                         RCQUEST_BOTH,    RCTYPE_COW,                         RCAREA_LON_LON_RANCH,                ACTOR_EN_COW,         SCENE_STABLE,                       TWO_ACTOR_PARAMS(-122, -254),                      0x16, "Stables Left Cow",                            RHT_LLR_STABLES_LEFT_COW,                                        RG_MILK,                              { Category::cCow },                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_LLR_STABLES_LEFT_COW),                                             SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
-    locationTable[RC_LLR_STABLES_RIGHT_COW] =                                          Location::Base(RC_LLR_STABLES_RIGHT_COW,                                        RCQUEST_BOTH,    RCTYPE_COW,                         RCAREA_LON_LON_RANCH,                ACTOR_EN_COW,         SCENE_STABLE,                       TWO_ACTOR_PARAMS(116, -254),                       0x15, "Stables Right Cow",                           RHT_LLR_STABLES_RIGHT_COW,                                       RG_MILK,                              { Category::cCow },                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_LLR_STABLES_RIGHT_COW),                                            SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
-    locationTable[RC_LLR_TOWER_LEFT_COW] =                                             Location::Base(RC_LLR_TOWER_LEFT_COW,                                           RCQUEST_BOTH,    RCTYPE_COW,                         RCAREA_LON_LON_RANCH,                ACTOR_EN_COW,         SCENE_LON_LON_BUILDINGS,            TWO_ACTOR_PARAMS(-229, 157),                       0x15, "Tower Left Cow",                              RHT_LLR_TOWER_LEFT_COW,                                          RG_MILK,                              { Category::cCow },                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_LLR_TOWER_LEFT_COW),                                               SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
-    locationTable[RC_LLR_TOWER_RIGHT_COW] =                                            Location::Base(RC_LLR_TOWER_RIGHT_COW,                                          RCQUEST_BOTH,    RCTYPE_COW,                         RCAREA_LON_LON_RANCH,                ACTOR_EN_COW,         SCENE_LON_LON_BUILDINGS,            TWO_ACTOR_PARAMS(-142, -140),                      0x16, "Tower Right Cow",                             RHT_LLR_TOWER_RIGHT_COW,                                         RG_MILK,                              { Category::cCow },                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_LLR_TOWER_RIGHT_COW),                                              SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH);
-    locationTable[RC_KAK_IMPAS_HOUSE_COW] =                                            Location::Base(RC_KAK_IMPAS_HOUSE_COW,                                          RCQUEST_BOTH,    RCTYPE_COW,                         RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_COW,         SCENE_IMPAS_HOUSE,                  0x00,                                              0x15, "Impas House Cow",                             RHT_KAK_IMPAS_HOUSE_COW,                                         RG_MILK,                              { Category::cCow },                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_KAK_IMPAS_HOUSE_COW),                                              SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_DMT_COW_GROTTO_COW] =                                             Location::Base(RC_DMT_COW_GROTTO_COW,                                           RCQUEST_BOTH,    RCTYPE_COW,                         RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_EN_COW,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(2444, -471),                      0x15, "Cow Grotto Cow",                              RHT_DMT_COW_GROTTO_COW,                                          RG_MILK,                              { Category::cCow },                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_DMT_COW_GROTTO_COW),                                               SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_GV_COW] =                                                         Location::Base(RC_GV_COW,                                                       RCQUEST_BOTH,    RCTYPE_COW,                         RCAREA_GERUDO_VALLEY,                ACTOR_EN_COW,         SCENE_GERUDO_VALLEY,                0x00,                                              0x15, "Cow",                                         RHT_GV_COW,                                                      RG_MILK,                              { Category::cCow },                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_GV_COW),                                                           SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
-    locationTable[RC_JABU_JABUS_BELLY_MQ_COW] =                                        Location::Base(RC_JABU_JABUS_BELLY_MQ_COW,                                      RCQUEST_MQ,      RCTYPE_COW,                         RCAREA_JABU_JABUS_BELLY,             ACTOR_EN_COW,         SCENE_JABU_JABU,                    0x00,                                              0x15, "MQ Cow",                                      RHT_JABU_JABUS_BELLY_MQ_COW,                                     RG_MILK,                              { Category::cCow },                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_JABU_JABUS_BELLY_MQ_COW),                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
+    locationTable[RC_KF_LINKS_HOUSE_COW] =                                             Location::Base(RC_KF_LINKS_HOUSE_COW,                                           RCQUEST_BOTH,    RCTYPE_COW,                                                              ACTOR_EN_COW,         SCENE_LINKS_HOUSE,                  0x00,                               "Links House Cow",                             RHT_KF_LINKS_HOUSE_COW,                                          RG_MILK,                                                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_KF_LINKS_HOUSE_COW));
+    locationTable[RC_HF_COW_GROTTO_COW] =                                              Location::Base(RC_HF_COW_GROTTO_COW,                                            RCQUEST_BOTH,    RCTYPE_COW,                         RCAREA_HYRULE_FIELD,                 ACTOR_EN_COW,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(3485, -291),       "Cow Grotto Cow",                              RHT_HF_COW_GROTTO_COW,                                           RG_MILK,                                                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_HF_COW_GROTTO_COW));
+    locationTable[RC_LLR_STABLES_LEFT_COW] =                                           Location::Base(RC_LLR_STABLES_LEFT_COW,                                         RCQUEST_BOTH,    RCTYPE_COW,                                                              ACTOR_EN_COW,         SCENE_STABLE,                       TWO_ACTOR_PARAMS(-122, -254),       "Stables Left Cow",                            RHT_LLR_STABLES_LEFT_COW,                                        RG_MILK,                                                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_LLR_STABLES_LEFT_COW));
+    locationTable[RC_LLR_STABLES_RIGHT_COW] =                                          Location::Base(RC_LLR_STABLES_RIGHT_COW,                                        RCQUEST_BOTH,    RCTYPE_COW,                                                              ACTOR_EN_COW,         SCENE_STABLE,                       TWO_ACTOR_PARAMS(116, -254),        "Stables Right Cow",                           RHT_LLR_STABLES_RIGHT_COW,                                       RG_MILK,                                                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_LLR_STABLES_RIGHT_COW));
+    locationTable[RC_LLR_TOWER_LEFT_COW] =                                             Location::Base(RC_LLR_TOWER_LEFT_COW,                                           RCQUEST_BOTH,    RCTYPE_COW,                                                              ACTOR_EN_COW,         SCENE_LON_LON_BUILDINGS,            TWO_ACTOR_PARAMS(-229, 157),        "Tower Left Cow",                              RHT_LLR_TOWER_LEFT_COW,                                          RG_MILK,                                                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_LLR_TOWER_LEFT_COW));
+    locationTable[RC_LLR_TOWER_RIGHT_COW] =                                            Location::Base(RC_LLR_TOWER_RIGHT_COW,                                          RCQUEST_BOTH,    RCTYPE_COW,                                                              ACTOR_EN_COW,         SCENE_LON_LON_BUILDINGS,            TWO_ACTOR_PARAMS(-142, -140),       "Tower Right Cow",                             RHT_LLR_TOWER_RIGHT_COW,                                         RG_MILK,                                                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_LLR_TOWER_RIGHT_COW));
+    locationTable[RC_KAK_IMPAS_HOUSE_COW] =                                            Location::Base(RC_KAK_IMPAS_HOUSE_COW,                                          RCQUEST_BOTH,    RCTYPE_COW,                                                              ACTOR_EN_COW,         SCENE_IMPAS_HOUSE,                  0x00,                               "Impas House Cow",                             RHT_KAK_IMPAS_HOUSE_COW,                                         RG_MILK,                                                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_KAK_IMPAS_HOUSE_COW));
+    locationTable[RC_DMT_COW_GROTTO_COW] =                                             Location::Base(RC_DMT_COW_GROTTO_COW,                                           RCQUEST_BOTH,    RCTYPE_COW,                         RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_EN_COW,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(2444, -471),       "Cow Grotto Cow",                              RHT_DMT_COW_GROTTO_COW,                                          RG_MILK,                                                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_DMT_COW_GROTTO_COW));
+    locationTable[RC_GV_COW] =                                                         Location::Base(RC_GV_COW,                                                       RCQUEST_BOTH,    RCTYPE_COW,                                                              ACTOR_EN_COW,         SCENE_GERUDO_VALLEY,                0x00,                               "Cow",                                         RHT_GV_COW,                                                      RG_MILK,                                                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_GV_COW));
+    locationTable[RC_JABU_JABUS_BELLY_MQ_COW] =                                        Location::Base(RC_JABU_JABUS_BELLY_MQ_COW,                                      RCQUEST_MQ,      RCTYPE_COW,                                                              ACTOR_EN_COW,         SCENE_JABU_JABU,                    0x00,                               "MQ Cow",                                      RHT_JABU_JABUS_BELLY_MQ_COW,                                     RG_MILK,                                                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_JABU_JABUS_BELLY_MQ_COW));
 
     /*-------------------------------
               --- SHOPS ---
@@ -1385,191 +870,191 @@ void Rando::StaticData::InitLocationTable() { //
       7     5               1     3
       -------------------------------*/
     // Kokiri Forest
-    locationTable[RC_KF_SHOP_ITEM_1] =                                                 Location::Base(RC_KF_SHOP_ITEM_1,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KOKIRI_FOREST,                ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x00,                                              0x00, "Shop Item 1",                                 RHT_KF_SHOP_ITEM_1,                                              RG_BUY_DEKU_SHIELD,                   { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2D, 0),                                                                                    SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_SHOP_ITEM_2] =                                                 Location::Base(RC_KF_SHOP_ITEM_2,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KOKIRI_FOREST,                ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x01,                                              0x01, "Shop Item 2",                                 RHT_KF_SHOP_ITEM_2,                                              RG_BUY_DEKU_NUTS_5,                   { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2D, 1),                                                                                    SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_SHOP_ITEM_3] =                                                 Location::Base(RC_KF_SHOP_ITEM_3,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KOKIRI_FOREST,                ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x02,                                              0x02, "Shop Item 3",                                 RHT_KF_SHOP_ITEM_3,                                              RG_BUY_DEKU_NUTS_10,                  { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2D, 2),                                                                                    SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_SHOP_ITEM_4] =                                                 Location::Base(RC_KF_SHOP_ITEM_4,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KOKIRI_FOREST,                ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x03,                                              0x03, "Shop Item 4",                                 RHT_KF_SHOP_ITEM_4,                                              RG_BUY_DEKU_STICK_1,                  { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2D, 3),                                                                                    SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_SHOP_ITEM_5] =                                                 Location::Base(RC_KF_SHOP_ITEM_5,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KOKIRI_FOREST,                ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x04,                                              0x04, "Shop Item 5",                                 RHT_KF_SHOP_ITEM_5,                                              RG_BUY_DEKU_SEEDS_30,                 { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2D, 4),                                                                                    SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_SHOP_ITEM_6] =                                                 Location::Base(RC_KF_SHOP_ITEM_6,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KOKIRI_FOREST,                ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x05,                                              0x05, "Shop Item 6",                                 RHT_KF_SHOP_ITEM_6,                                              RG_BUY_ARROWS_10,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2D, 5),                                                                                    SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_SHOP_ITEM_7] =                                                 Location::Base(RC_KF_SHOP_ITEM_7,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KOKIRI_FOREST,                ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x06,                                              0x06, "Shop Item 7",                                 RHT_KF_SHOP_ITEM_7,                                              RG_BUY_ARROWS_30,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2D, 6),                                                                                    SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_KF_SHOP_ITEM_8] =                                                 Location::Base(RC_KF_SHOP_ITEM_8,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KOKIRI_FOREST,                ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x07,                                              0x07, "Shop Item 8",                                 RHT_KF_SHOP_ITEM_8,                                              RG_BUY_HEART,                         { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2D, 7),                                                                                    SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
+    locationTable[RC_KF_SHOP_ITEM_1] =                                                 Location::Base(RC_KF_SHOP_ITEM_1,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x00,                               "Shop Item 1",                                 RHT_KF_SHOP_ITEM_1,                                              RG_BUY_DEKU_SHIELD);
+    locationTable[RC_KF_SHOP_ITEM_2] =                                                 Location::Base(RC_KF_SHOP_ITEM_2,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x01,                               "Shop Item 2",                                 RHT_KF_SHOP_ITEM_2,                                              RG_BUY_DEKU_NUTS_5);
+    locationTable[RC_KF_SHOP_ITEM_3] =                                                 Location::Base(RC_KF_SHOP_ITEM_3,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x02,                               "Shop Item 3",                                 RHT_KF_SHOP_ITEM_3,                                              RG_BUY_DEKU_NUTS_10);
+    locationTable[RC_KF_SHOP_ITEM_4] =                                                 Location::Base(RC_KF_SHOP_ITEM_4,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x03,                               "Shop Item 4",                                 RHT_KF_SHOP_ITEM_4,                                              RG_BUY_DEKU_STICK_1);
+    locationTable[RC_KF_SHOP_ITEM_5] =                                                 Location::Base(RC_KF_SHOP_ITEM_5,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x04,                               "Shop Item 5",                                 RHT_KF_SHOP_ITEM_5,                                              RG_BUY_DEKU_SEEDS_30);
+    locationTable[RC_KF_SHOP_ITEM_6] =                                                 Location::Base(RC_KF_SHOP_ITEM_6,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x05,                               "Shop Item 6",                                 RHT_KF_SHOP_ITEM_6,                                              RG_BUY_ARROWS_10);
+    locationTable[RC_KF_SHOP_ITEM_7] =                                                 Location::Base(RC_KF_SHOP_ITEM_7,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x06,                               "Shop Item 7",                                 RHT_KF_SHOP_ITEM_7,                                              RG_BUY_ARROWS_30);
+    locationTable[RC_KF_SHOP_ITEM_8] =                                                 Location::Base(RC_KF_SHOP_ITEM_8,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x07,                               "Shop Item 8",                                 RHT_KF_SHOP_ITEM_8,                                              RG_BUY_HEART);
 
     // Kakariko Village
-    locationTable[RC_KAK_POTION_SHOP_ITEM_1] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_1,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x00,                                              0x30, "Potion Shop Item 1",                          RHT_KAK_POTION_SHOP_ITEM_1,                                      RG_BUY_GREEN_POTION,                  { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x30, 0),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_POTION_SHOP_ITEM_2] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_2,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x01,                                              0x31, "Potion Shop Item 2",                          RHT_KAK_POTION_SHOP_ITEM_2,                                      RG_BUY_BLUE_FIRE,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x30, 1),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_POTION_SHOP_ITEM_3] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_3,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x02,                                              0x32, "Potion Shop Item 3",                          RHT_KAK_POTION_SHOP_ITEM_3,                                      RG_BUY_RED_POTION_30,                 { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x30, 2),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_POTION_SHOP_ITEM_4] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_4,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x03,                                              0x33, "Potion Shop Item 4",                          RHT_KAK_POTION_SHOP_ITEM_4,                                      RG_BUY_FAIRYS_SPIRIT,                 { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x30, 3),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_POTION_SHOP_ITEM_5] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_5,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x04,                                              0x34, "Potion Shop Item 5",                          RHT_KAK_POTION_SHOP_ITEM_5,                                      RG_BUY_DEKU_NUTS_5,                   { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x30, 4),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_POTION_SHOP_ITEM_6] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_6,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x05,                                              0x35, "Potion Shop Item 6",                          RHT_KAK_POTION_SHOP_ITEM_6,                                      RG_BUY_BOTTLE_BUG,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x30, 5),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_POTION_SHOP_ITEM_7] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_7,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x06,                                              0x36, "Potion Shop Item 7",                          RHT_KAK_POTION_SHOP_ITEM_7,                                      RG_BUY_POE,                           { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x30, 6),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_POTION_SHOP_ITEM_8] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_8,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x07,                                              0x37, "Potion Shop Item 8",                          RHT_KAK_POTION_SHOP_ITEM_8,                                      RG_BUY_FISH,                          { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x30, 7),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_BAZAAR_ITEM_1] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_1,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x00,                                              0x38, "Bazaar Item 1",                               RHT_KAK_BAZAAR_ITEM_1,                                           RG_BUY_HYLIAN_SHIELD,                 { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x33, 0),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_BAZAAR_ITEM_2] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_2,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x01,                                              0x39, "Bazaar Item 2",                               RHT_KAK_BAZAAR_ITEM_2,                                           RG_BUY_BOMBS_535,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x33, 1),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_BAZAAR_ITEM_3] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_3,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x02,                                              0x3A, "Bazaar Item 3",                               RHT_KAK_BAZAAR_ITEM_3,                                           RG_BUY_DEKU_NUTS_5,                   { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x33, 2),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_BAZAAR_ITEM_4] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_4,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x03,                                              0x3B, "Bazaar Item 4",                               RHT_KAK_BAZAAR_ITEM_4,                                           RG_BUY_HEART,                         { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x33, 3),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_BAZAAR_ITEM_5] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_5,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x04,                                              0x3C, "Bazaar Item 5",                               RHT_KAK_BAZAAR_ITEM_5,                                           RG_BUY_ARROWS_10,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x33, 4),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_BAZAAR_ITEM_6] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_6,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x05,                                              0x3D, "Bazaar Item 6",                               RHT_KAK_BAZAAR_ITEM_6,                                           RG_BUY_ARROWS_50,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x33, 5),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_BAZAAR_ITEM_7] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_7,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x06,                                              0x3E, "Bazaar Item 7",                               RHT_KAK_BAZAAR_ITEM_7,                                           RG_BUY_DEKU_STICK_1,                  { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x33, 6),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_KAK_BAZAAR_ITEM_8] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_8,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x07,                                              0x3F, "Bazaar Item 8",                               RHT_KAK_BAZAAR_ITEM_8,                                           RG_BUY_ARROWS_30,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x33, 7),                                                                                    SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[RC_KAK_POTION_SHOP_ITEM_1] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_1,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x00,                               "Potion Shop Item 1",                          RHT_KAK_POTION_SHOP_ITEM_1,                                      RG_BUY_GREEN_POTION);
+    locationTable[RC_KAK_POTION_SHOP_ITEM_2] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_2,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x01,                               "Potion Shop Item 2",                          RHT_KAK_POTION_SHOP_ITEM_2,                                      RG_BUY_BLUE_FIRE);
+    locationTable[RC_KAK_POTION_SHOP_ITEM_3] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_3,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x02,                               "Potion Shop Item 3",                          RHT_KAK_POTION_SHOP_ITEM_3,                                      RG_BUY_RED_POTION_30);
+    locationTable[RC_KAK_POTION_SHOP_ITEM_4] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_4,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x03,                               "Potion Shop Item 4",                          RHT_KAK_POTION_SHOP_ITEM_4,                                      RG_BUY_FAIRYS_SPIRIT);
+    locationTable[RC_KAK_POTION_SHOP_ITEM_5] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_5,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x04,                               "Potion Shop Item 5",                          RHT_KAK_POTION_SHOP_ITEM_5,                                      RG_BUY_DEKU_NUTS_5);
+    locationTable[RC_KAK_POTION_SHOP_ITEM_6] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_6,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x05,                               "Potion Shop Item 6",                          RHT_KAK_POTION_SHOP_ITEM_6,                                      RG_BUY_BOTTLE_BUG);
+    locationTable[RC_KAK_POTION_SHOP_ITEM_7] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_7,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x06,                               "Potion Shop Item 7",                          RHT_KAK_POTION_SHOP_ITEM_7,                                      RG_BUY_POE);
+    locationTable[RC_KAK_POTION_SHOP_ITEM_8] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_8,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x07,                               "Potion Shop Item 8",                          RHT_KAK_POTION_SHOP_ITEM_8,                                      RG_BUY_FISH);
+    locationTable[RC_KAK_BAZAAR_ITEM_1] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_1,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x00,                               "Bazaar Item 1",                               RHT_KAK_BAZAAR_ITEM_1,                                           RG_BUY_HYLIAN_SHIELD);
+    locationTable[RC_KAK_BAZAAR_ITEM_2] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_2,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x01,                               "Bazaar Item 2",                               RHT_KAK_BAZAAR_ITEM_2,                                           RG_BUY_BOMBS_535);
+    locationTable[RC_KAK_BAZAAR_ITEM_3] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_3,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x02,                               "Bazaar Item 3",                               RHT_KAK_BAZAAR_ITEM_3,                                           RG_BUY_DEKU_NUTS_5);
+    locationTable[RC_KAK_BAZAAR_ITEM_4] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_4,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x03,                               "Bazaar Item 4",                               RHT_KAK_BAZAAR_ITEM_4,                                           RG_BUY_HEART);
+    locationTable[RC_KAK_BAZAAR_ITEM_5] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_5,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x04,                               "Bazaar Item 5",                               RHT_KAK_BAZAAR_ITEM_5,                                           RG_BUY_ARROWS_10);
+    locationTable[RC_KAK_BAZAAR_ITEM_6] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_6,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x05,                               "Bazaar Item 6",                               RHT_KAK_BAZAAR_ITEM_6,                                           RG_BUY_ARROWS_50);
+    locationTable[RC_KAK_BAZAAR_ITEM_7] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_7,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x06,                               "Bazaar Item 7",                               RHT_KAK_BAZAAR_ITEM_7,                                           RG_BUY_DEKU_STICK_1);
+    locationTable[RC_KAK_BAZAAR_ITEM_8] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_8,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x07,                               "Bazaar Item 8",                               RHT_KAK_BAZAAR_ITEM_8,                                           RG_BUY_ARROWS_30);
 
     // Market
-    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_1] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_1,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x00,                                              0x30, "Bombchu Shop Item 1",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_1,                                  RG_BUY_BOMBCHUS_10,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 0),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_2] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_2,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x01,                                              0x31, "Bombchu Shop Item 2",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_2,                                  RG_BUY_BOMBCHUS_10,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 1),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_3] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_3,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x02,                                              0x32, "Bombchu Shop Item 3",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_3,                                  RG_BUY_BOMBCHUS_10,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 2),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_4] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_4,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x03,                                              0x33, "Bombchu Shop Item 4",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_4,                                  RG_BUY_BOMBCHUS_10,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 3),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_5] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_5,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x04,                                              0x34, "Bombchu Shop Item 5",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_5,                                  RG_BUY_BOMBCHUS_20,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 4),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_6] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_6,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x05,                                              0x35, "Bombchu Shop Item 6",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_6,                                  RG_BUY_BOMBCHUS_20,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 5),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_7] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_7,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x06,                                              0x36, "Bombchu Shop Item 7",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_7,                                  RG_BUY_BOMBCHUS_20,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 6),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_8] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_8,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x07,                                              0x37, "Bombchu Shop Item 8",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_8,                                  RG_BUY_BOMBCHUS_20,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x32, 7),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_POTION_SHOP_ITEM_1] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_1,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x00,                                              0x30, "Potion Shop Item 1",                          RHT_MARKET_POTION_SHOP_ITEM_1,                                   RG_BUY_GREEN_POTION,                  { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x31, 0),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_POTION_SHOP_ITEM_2] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_2,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x01,                                              0x31, "Potion Shop Item 2",                          RHT_MARKET_POTION_SHOP_ITEM_2,                                   RG_BUY_BLUE_FIRE,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x31, 1),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_POTION_SHOP_ITEM_3] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_3,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x02,                                              0x32, "Potion Shop Item 3",                          RHT_MARKET_POTION_SHOP_ITEM_3,                                   RG_BUY_RED_POTION_30,                 { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x31, 2),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_POTION_SHOP_ITEM_4] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_4,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x03,                                              0x33, "Potion Shop Item 4",                          RHT_MARKET_POTION_SHOP_ITEM_4,                                   RG_BUY_FAIRYS_SPIRIT,                 { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x31, 3),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_POTION_SHOP_ITEM_5] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_5,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x04,                                              0x34, "Potion Shop Item 5",                          RHT_MARKET_POTION_SHOP_ITEM_5,                                   RG_BUY_DEKU_NUTS_5,                   { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x31, 4),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_POTION_SHOP_ITEM_6] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_6,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x05,                                              0x35, "Potion Shop Item 6",                          RHT_MARKET_POTION_SHOP_ITEM_6,                                   RG_BUY_BOTTLE_BUG,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x31, 5),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_POTION_SHOP_ITEM_7] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_7,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x06,                                              0x36, "Potion Shop Item 7",                          RHT_MARKET_POTION_SHOP_ITEM_7,                                   RG_BUY_POE,                           { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x31, 6),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_POTION_SHOP_ITEM_8] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_8,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x07,                                              0x37, "Potion Shop Item 8",                          RHT_MARKET_POTION_SHOP_ITEM_8,                                   RG_BUY_FISH,                          { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x31, 7),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BAZAAR_ITEM_1] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_1,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x00,                                              0x30, "Bazaar Item 1",                               RHT_MARKET_BAZAAR_ITEM_1,                                        RG_BUY_HYLIAN_SHIELD,                 { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2C, 0),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BAZAAR_ITEM_2] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_2,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x01,                                              0x31, "Bazaar Item 2",                               RHT_MARKET_BAZAAR_ITEM_2,                                        RG_BUY_BOMBS_535,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2C, 1),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BAZAAR_ITEM_3] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_3,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x02,                                              0x32, "Bazaar Item 3",                               RHT_MARKET_BAZAAR_ITEM_3,                                        RG_BUY_DEKU_NUTS_5,                   { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2C, 2),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BAZAAR_ITEM_4] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_4,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x03,                                              0x33, "Bazaar Item 4",                               RHT_MARKET_BAZAAR_ITEM_4,                                        RG_BUY_HEART,                         { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2C, 3),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BAZAAR_ITEM_5] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_5,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x04,                                              0x34, "Bazaar Item 5",                               RHT_MARKET_BAZAAR_ITEM_5,                                        RG_BUY_ARROWS_10,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2C, 4),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BAZAAR_ITEM_6] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_6,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x05,                                              0x35, "Bazaar Item 6",                               RHT_MARKET_BAZAAR_ITEM_6,                                        RG_BUY_ARROWS_50,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2C, 5),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BAZAAR_ITEM_7] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_7,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x06,                                              0x36, "Bazaar Item 7",                               RHT_MARKET_BAZAAR_ITEM_7,                                        RG_BUY_DEKU_STICK_1,                  { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2C, 6),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
-    locationTable[RC_MARKET_BAZAAR_ITEM_8] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_8,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x07,                                              0x37, "Bazaar Item 8",                               RHT_MARKET_BAZAAR_ITEM_8,                                        RG_BUY_ARROWS_30,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2C, 7),                                                                                    SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_1] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_1,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x00,                               "Bombchu Shop Item 1",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_1,                                  RG_BUY_BOMBCHUS_10);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_2] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_2,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x01,                               "Bombchu Shop Item 2",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_2,                                  RG_BUY_BOMBCHUS_10);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_3] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_3,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x02,                               "Bombchu Shop Item 3",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_3,                                  RG_BUY_BOMBCHUS_10);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_4] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_4,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x03,                               "Bombchu Shop Item 4",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_4,                                  RG_BUY_BOMBCHUS_10);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_5] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_5,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x04,                               "Bombchu Shop Item 5",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_5,                                  RG_BUY_BOMBCHUS_20);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_6] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_6,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x05,                               "Bombchu Shop Item 6",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_6,                                  RG_BUY_BOMBCHUS_20);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_7] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_7,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x06,                               "Bombchu Shop Item 7",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_7,                                  RG_BUY_BOMBCHUS_20);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_8] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_8,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x07,                               "Bombchu Shop Item 8",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_8,                                  RG_BUY_BOMBCHUS_20);
+    locationTable[RC_MARKET_POTION_SHOP_ITEM_1] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_1,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x00,                               "Potion Shop Item 1",                          RHT_MARKET_POTION_SHOP_ITEM_1,                                   RG_BUY_GREEN_POTION);
+    locationTable[RC_MARKET_POTION_SHOP_ITEM_2] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_2,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x01,                               "Potion Shop Item 2",                          RHT_MARKET_POTION_SHOP_ITEM_2,                                   RG_BUY_BLUE_FIRE);
+    locationTable[RC_MARKET_POTION_SHOP_ITEM_3] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_3,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x02,                               "Potion Shop Item 3",                          RHT_MARKET_POTION_SHOP_ITEM_3,                                   RG_BUY_RED_POTION_30);
+    locationTable[RC_MARKET_POTION_SHOP_ITEM_4] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_4,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x03,                               "Potion Shop Item 4",                          RHT_MARKET_POTION_SHOP_ITEM_4,                                   RG_BUY_FAIRYS_SPIRIT);
+    locationTable[RC_MARKET_POTION_SHOP_ITEM_5] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_5,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x04,                               "Potion Shop Item 5",                          RHT_MARKET_POTION_SHOP_ITEM_5,                                   RG_BUY_DEKU_NUTS_5);
+    locationTable[RC_MARKET_POTION_SHOP_ITEM_6] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_6,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x05,                               "Potion Shop Item 6",                          RHT_MARKET_POTION_SHOP_ITEM_6,                                   RG_BUY_BOTTLE_BUG);
+    locationTable[RC_MARKET_POTION_SHOP_ITEM_7] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_7,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x06,                               "Potion Shop Item 7",                          RHT_MARKET_POTION_SHOP_ITEM_7,                                   RG_BUY_POE);
+    locationTable[RC_MARKET_POTION_SHOP_ITEM_8] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_8,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x07,                               "Potion Shop Item 8",                          RHT_MARKET_POTION_SHOP_ITEM_8,                                   RG_BUY_FISH);
+    locationTable[RC_MARKET_BAZAAR_ITEM_1] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_1,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x00,                               "Bazaar Item 1",                               RHT_MARKET_BAZAAR_ITEM_1,                                        RG_BUY_HYLIAN_SHIELD);
+    locationTable[RC_MARKET_BAZAAR_ITEM_2] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_2,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x01,                               "Bazaar Item 2",                               RHT_MARKET_BAZAAR_ITEM_2,                                        RG_BUY_BOMBS_535);
+    locationTable[RC_MARKET_BAZAAR_ITEM_3] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_3,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x02,                               "Bazaar Item 3",                               RHT_MARKET_BAZAAR_ITEM_3,                                        RG_BUY_DEKU_NUTS_5);
+    locationTable[RC_MARKET_BAZAAR_ITEM_4] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_4,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x03,                               "Bazaar Item 4",                               RHT_MARKET_BAZAAR_ITEM_4,                                        RG_BUY_HEART);
+    locationTable[RC_MARKET_BAZAAR_ITEM_5] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_5,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x04,                               "Bazaar Item 5",                               RHT_MARKET_BAZAAR_ITEM_5,                                        RG_BUY_ARROWS_10);
+    locationTable[RC_MARKET_BAZAAR_ITEM_6] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_6,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x05,                               "Bazaar Item 6",                               RHT_MARKET_BAZAAR_ITEM_6,                                        RG_BUY_ARROWS_50);
+    locationTable[RC_MARKET_BAZAAR_ITEM_7] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_7,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x06,                               "Bazaar Item 7",                               RHT_MARKET_BAZAAR_ITEM_7,                                        RG_BUY_DEKU_STICK_1);
+    locationTable[RC_MARKET_BAZAAR_ITEM_8] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_8,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x07,                               "Bazaar Item 8",                               RHT_MARKET_BAZAAR_ITEM_8,                                        RG_BUY_ARROWS_30);
 
     // Zora's Domain
-    locationTable[RC_ZD_SHOP_ITEM_1] =                                                 Location::Base(RC_ZD_SHOP_ITEM_1,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x00,                                              0x30, "Shop Item 1",                                 RHT_ZD_SHOP_ITEM_1,                                              RG_BUY_ZORA_TUNIC,                    { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2F, 0),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZD_SHOP_ITEM_2] =                                                 Location::Base(RC_ZD_SHOP_ITEM_2,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x01,                                              0x31, "Shop Item 2",                                 RHT_ZD_SHOP_ITEM_2,                                              RG_BUY_ARROWS_10,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2F, 1),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZD_SHOP_ITEM_3] =                                                 Location::Base(RC_ZD_SHOP_ITEM_3,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x02,                                              0x32, "Shop Item 3",                                 RHT_ZD_SHOP_ITEM_3,                                              RG_BUY_HEART,                         { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2F, 2),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZD_SHOP_ITEM_4] =                                                 Location::Base(RC_ZD_SHOP_ITEM_4,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x03,                                              0x33, "Shop Item 4",                                 RHT_ZD_SHOP_ITEM_4,                                              RG_BUY_ARROWS_30,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2F, 3),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZD_SHOP_ITEM_5] =                                                 Location::Base(RC_ZD_SHOP_ITEM_5,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x04,                                              0x34, "Shop Item 5",                                 RHT_ZD_SHOP_ITEM_5,                                              RG_BUY_DEKU_NUTS_5,                   { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2F, 4),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZD_SHOP_ITEM_6] =                                                 Location::Base(RC_ZD_SHOP_ITEM_6,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x05,                                              0x35, "Shop Item 6",                                 RHT_ZD_SHOP_ITEM_6,                                              RG_BUY_ARROWS_50,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2F, 5),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZD_SHOP_ITEM_7] =                                                 Location::Base(RC_ZD_SHOP_ITEM_7,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x06,                                              0x36, "Shop Item 7",                                 RHT_ZD_SHOP_ITEM_7,                                              RG_BUY_FISH,                          { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2F, 6),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZD_SHOP_ITEM_8] =                                                 Location::Base(RC_ZD_SHOP_ITEM_8,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x07,                                              0x37, "Shop Item 8",                                 RHT_ZD_SHOP_ITEM_8,                                              RG_BUY_RED_POTION_50,                 { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2F, 7),                                                                                    SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZD_SHOP_ITEM_1] =                                                 Location::Base(RC_ZD_SHOP_ITEM_1,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x00,                               "Shop Item 1",                                 RHT_ZD_SHOP_ITEM_1,                                              RG_BUY_ZORA_TUNIC);
+    locationTable[RC_ZD_SHOP_ITEM_2] =                                                 Location::Base(RC_ZD_SHOP_ITEM_2,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x01,                               "Shop Item 2",                                 RHT_ZD_SHOP_ITEM_2,                                              RG_BUY_ARROWS_10);
+    locationTable[RC_ZD_SHOP_ITEM_3] =                                                 Location::Base(RC_ZD_SHOP_ITEM_3,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x02,                               "Shop Item 3",                                 RHT_ZD_SHOP_ITEM_3,                                              RG_BUY_HEART);
+    locationTable[RC_ZD_SHOP_ITEM_4] =                                                 Location::Base(RC_ZD_SHOP_ITEM_4,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x03,                               "Shop Item 4",                                 RHT_ZD_SHOP_ITEM_4,                                              RG_BUY_ARROWS_30);
+    locationTable[RC_ZD_SHOP_ITEM_5] =                                                 Location::Base(RC_ZD_SHOP_ITEM_5,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x04,                               "Shop Item 5",                                 RHT_ZD_SHOP_ITEM_5,                                              RG_BUY_DEKU_NUTS_5);
+    locationTable[RC_ZD_SHOP_ITEM_6] =                                                 Location::Base(RC_ZD_SHOP_ITEM_6,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x05,                               "Shop Item 6",                                 RHT_ZD_SHOP_ITEM_6,                                              RG_BUY_ARROWS_50);
+    locationTable[RC_ZD_SHOP_ITEM_7] =                                                 Location::Base(RC_ZD_SHOP_ITEM_7,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x06,                               "Shop Item 7",                                 RHT_ZD_SHOP_ITEM_7,                                              RG_BUY_FISH);
+    locationTable[RC_ZD_SHOP_ITEM_8] =                                                 Location::Base(RC_ZD_SHOP_ITEM_8,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x07,                               "Shop Item 8",                                 RHT_ZD_SHOP_ITEM_8,                                              RG_BUY_RED_POTION_50);
 
     // Goron City
-    locationTable[RC_GC_SHOP_ITEM_1] =                                                 Location::Base(RC_GC_SHOP_ITEM_1,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_GORON_CITY,                   ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x00,                                              0x30, "Shop Item 1",                                 RHT_GC_SHOP_ITEM_1,                                              RG_BUY_BOMBS_525,                     { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2E, 0),                                                                                    SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_SHOP_ITEM_2] =                                                 Location::Base(RC_GC_SHOP_ITEM_2,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_GORON_CITY,                   ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x01,                                              0x31, "Shop Item 2",                                 RHT_GC_SHOP_ITEM_2,                                              RG_BUY_BOMBS_10,                      { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2E, 1),                                                                                    SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_SHOP_ITEM_3] =                                                 Location::Base(RC_GC_SHOP_ITEM_3,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_GORON_CITY,                   ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x02,                                              0x32, "Shop Item 3",                                 RHT_GC_SHOP_ITEM_3,                                              RG_BUY_BOMBS_20,                      { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2E, 2),                                                                                    SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_SHOP_ITEM_4] =                                                 Location::Base(RC_GC_SHOP_ITEM_4,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_GORON_CITY,                   ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x03,                                              0x33, "Shop Item 4",                                 RHT_GC_SHOP_ITEM_4,                                              RG_BUY_BOMBS_30,                      { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2E, 3),                                                                                    SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_SHOP_ITEM_5] =                                                 Location::Base(RC_GC_SHOP_ITEM_5,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_GORON_CITY,                   ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x04,                                              0x34, "Shop Item 5",                                 RHT_GC_SHOP_ITEM_5,                                              RG_BUY_GORON_TUNIC,                   { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2E, 4),                                                                                    SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_SHOP_ITEM_6] =                                                 Location::Base(RC_GC_SHOP_ITEM_6,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_GORON_CITY,                   ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x05,                                              0x35, "Shop Item 6",                                 RHT_GC_SHOP_ITEM_6,                                              RG_BUY_HEART,                         { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2E, 5),                                                                                    SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_SHOP_ITEM_7] =                                                 Location::Base(RC_GC_SHOP_ITEM_7,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_GORON_CITY,                   ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x06,                                              0x36, "Shop Item 7",                                 RHT_GC_SHOP_ITEM_7,                                              RG_BUY_RED_POTION_40,                 { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2E, 6),                                                                                    SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
-    locationTable[RC_GC_SHOP_ITEM_8] =                                                 Location::Base(RC_GC_SHOP_ITEM_8,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_GORON_CITY,                   ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x07,                                              0x37, "Shop Item 8",                                 RHT_GC_SHOP_ITEM_8,                                              RG_BUY_HEART,                         { Category::cShop },                                    SpoilerCollectionCheck::ShopItem(0x2E, 7),                                                                                    SpoilerCollectionCheckGroup::GROUP_GORON_CITY);
+    locationTable[RC_GC_SHOP_ITEM_1] =                                                 Location::Base(RC_GC_SHOP_ITEM_1,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x00,                               "Shop Item 1",                                 RHT_GC_SHOP_ITEM_1,                                              RG_BUY_BOMBS_525);
+    locationTable[RC_GC_SHOP_ITEM_2] =                                                 Location::Base(RC_GC_SHOP_ITEM_2,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x01,                               "Shop Item 2",                                 RHT_GC_SHOP_ITEM_2,                                              RG_BUY_BOMBS_10);
+    locationTable[RC_GC_SHOP_ITEM_3] =                                                 Location::Base(RC_GC_SHOP_ITEM_3,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x02,                               "Shop Item 3",                                 RHT_GC_SHOP_ITEM_3,                                              RG_BUY_BOMBS_20);
+    locationTable[RC_GC_SHOP_ITEM_4] =                                                 Location::Base(RC_GC_SHOP_ITEM_4,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x03,                               "Shop Item 4",                                 RHT_GC_SHOP_ITEM_4,                                              RG_BUY_BOMBS_30);
+    locationTable[RC_GC_SHOP_ITEM_5] =                                                 Location::Base(RC_GC_SHOP_ITEM_5,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x04,                               "Shop Item 5",                                 RHT_GC_SHOP_ITEM_5,                                              RG_BUY_GORON_TUNIC);
+    locationTable[RC_GC_SHOP_ITEM_6] =                                                 Location::Base(RC_GC_SHOP_ITEM_6,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x05,                               "Shop Item 6",                                 RHT_GC_SHOP_ITEM_6,                                              RG_BUY_HEART);
+    locationTable[RC_GC_SHOP_ITEM_7] =                                                 Location::Base(RC_GC_SHOP_ITEM_7,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x06,                               "Shop Item 7",                                 RHT_GC_SHOP_ITEM_7,                                              RG_BUY_RED_POTION_40);
+    locationTable[RC_GC_SHOP_ITEM_8] =                                                 Location::Base(RC_GC_SHOP_ITEM_8,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x07,                               "Shop Item 8",                                 RHT_GC_SHOP_ITEM_8,                                              RG_BUY_HEART);
 
     /* +--------------+
        |  FISHSANITY  |
        +--------------+ */
 
     // Fishing Pond
-    locationTable[RC_LH_CHILD_FISH_1] =                                                Location::Base(RC_LH_CHILD_FISH_1,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 100,                                               0x00, "Child Pond Fish 1",                           RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_FISH_2] =                                                Location::Base(RC_LH_CHILD_FISH_2,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 101,                                               0x00, "Child Pond Fish 2",                           RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_FISH_3] =                                                Location::Base(RC_LH_CHILD_FISH_3,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 102,                                               0x00, "Child Pond Fish 3",                           RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_FISH_4] =                                                Location::Base(RC_LH_CHILD_FISH_4,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 103,                                               0x00, "Child Pond Fish 4",                           RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_FISH_5] =                                                Location::Base(RC_LH_CHILD_FISH_5,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 104,                                               0x00, "Child Pond Fish 5",                           RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_FISH_6] =                                                Location::Base(RC_LH_CHILD_FISH_6,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 105,                                               0x00, "Child Pond Fish 6",                           RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_FISH_7] =                                                Location::Base(RC_LH_CHILD_FISH_7,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 106,                                               0x00, "Child Pond Fish 7",                           RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_FISH_8] =                                                Location::Base(RC_LH_CHILD_FISH_8,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 107,                                               0x00, "Child Pond Fish 8",                           RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_FISH_9] =                                                Location::Base(RC_LH_CHILD_FISH_9,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 108,                                               0x00, "Child Pond Fish 9",                           RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_FISH_10] =                                               Location::Base(RC_LH_CHILD_FISH_10,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 109,                                               0x00, "Child Pond Fish 10",                          RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_FISH_11] =                                               Location::Base(RC_LH_CHILD_FISH_11,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 110,                                               0x00, "Child Pond Fish 11",                          RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_FISH_12] =                                               Location::Base(RC_LH_CHILD_FISH_12,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 111,                                               0x00, "Child Pond Fish 12",                          RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_FISH_13] =                                               Location::Base(RC_LH_CHILD_FISH_13,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 112,                                               0x00, "Child Pond Fish 13",                          RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_FISH_14] =                                               Location::Base(RC_LH_CHILD_FISH_14,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 113,                                               0x00, "Child Pond Fish 14",                          RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_FISH_15] =                                               Location::Base(RC_LH_CHILD_FISH_15,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 114,                                               0x00, "Child Pond Fish 15",                          RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_LOACH_1] =                                               Location::Base(RC_LH_CHILD_LOACH_1,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 115,                                               0x00, "Child Pond Loach 1",                          RHT_LH_HYRULE_LOACH,                                             RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_CHILD_LOACH_2] =                                               Location::Base(RC_LH_CHILD_LOACH_2,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 116,                                               0x00, "Child Pond Loach 2",                          RHT_LH_HYRULE_LOACH,                                             RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_FISH_1] =                                                Location::Base(RC_LH_ADULT_FISH_1,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 100,                                               0x00, "Adult Pond Fish 1",                           RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_FISH_2] =                                                Location::Base(RC_LH_ADULT_FISH_2,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 101,                                               0x00, "Adult Pond Fish 2",                           RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_FISH_3] =                                                Location::Base(RC_LH_ADULT_FISH_3,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 102,                                               0x00, "Adult Pond Fish 3",                           RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_FISH_4] =                                                Location::Base(RC_LH_ADULT_FISH_4,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 103,                                               0x00, "Adult Pond Fish 4",                           RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_FISH_5] =                                                Location::Base(RC_LH_ADULT_FISH_5,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 104,                                               0x00, "Adult Pond Fish 5",                           RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_FISH_6] =                                                Location::Base(RC_LH_ADULT_FISH_6,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 105,                                               0x00, "Adult Pond Fish 6",                           RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_FISH_7] =                                                Location::Base(RC_LH_ADULT_FISH_7,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 106,                                               0x00, "Adult Pond Fish 7",                           RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_FISH_8] =                                                Location::Base(RC_LH_ADULT_FISH_8,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 107,                                               0x00, "Adult Pond Fish 8",                           RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_FISH_9] =                                                Location::Base(RC_LH_ADULT_FISH_9,                                              RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 108,                                               0x00, "Adult Pond Fish 9",                           RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_FISH_10] =                                               Location::Base(RC_LH_ADULT_FISH_10,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 109,                                               0x00, "Adult Pond Fish 10",                          RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_FISH_11] =                                               Location::Base(RC_LH_ADULT_FISH_11,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 110,                                               0x00, "Adult Pond Fish 11",                          RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_FISH_12] =                                               Location::Base(RC_LH_ADULT_FISH_12,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 111,                                               0x00, "Adult Pond Fish 12",                          RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_FISH_13] =                                               Location::Base(RC_LH_ADULT_FISH_13,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 112,                                               0x00, "Adult Pond Fish 13",                          RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_FISH_14] =                                               Location::Base(RC_LH_ADULT_FISH_14,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 113,                                               0x00, "Adult Pond Fish 14",                          RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_FISH_15] =                                               Location::Base(RC_LH_ADULT_FISH_15,                                             RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 114,                                               0x00, "Adult Pond Fish 15",                          RHT_LH_POND_FISH,                                                RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
-    locationTable[RC_LH_ADULT_LOACH] =                                                 Location::Base(RC_LH_ADULT_LOACH,                                               RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,                 115,                                               0x00, "Adult Pond Loach",                            RHT_LH_HYRULE_LOACH,                                             RG_NONE,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF),                                                                                           SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA);
+    locationTable[RC_LH_CHILD_FISH_1] =                                                Location::Base(RC_LH_CHILD_FISH_1,                                              RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 100,                                "Child Pond Fish 1",                           RHT_LH_POND_FISH,                                                RG_NONE);
+    locationTable[RC_LH_CHILD_FISH_2] =                                                Location::Base(RC_LH_CHILD_FISH_2,                                              RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 101,                                "Child Pond Fish 2",                           RHT_LH_POND_FISH,                                                RG_NONE);
+    locationTable[RC_LH_CHILD_FISH_3] =                                                Location::Base(RC_LH_CHILD_FISH_3,                                              RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 102,                                "Child Pond Fish 3",                           RHT_LH_POND_FISH,                                                RG_NONE);
+    locationTable[RC_LH_CHILD_FISH_4] =                                                Location::Base(RC_LH_CHILD_FISH_4,                                              RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 103,                                "Child Pond Fish 4",                           RHT_LH_POND_FISH,                                                RG_NONE);
+    locationTable[RC_LH_CHILD_FISH_5] =                                                Location::Base(RC_LH_CHILD_FISH_5,                                              RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 104,                                "Child Pond Fish 5",                           RHT_LH_POND_FISH,                                                RG_NONE);
+    locationTable[RC_LH_CHILD_FISH_6] =                                                Location::Base(RC_LH_CHILD_FISH_6,                                              RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 105,                                "Child Pond Fish 6",                           RHT_LH_POND_FISH,                                                RG_NONE);
+    locationTable[RC_LH_CHILD_FISH_7] =                                                Location::Base(RC_LH_CHILD_FISH_7,                                              RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 106,                                "Child Pond Fish 7",                           RHT_LH_POND_FISH,                                                RG_NONE);
+    locationTable[RC_LH_CHILD_FISH_8] =                                                Location::Base(RC_LH_CHILD_FISH_8,                                              RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 107,                                "Child Pond Fish 8",                           RHT_LH_POND_FISH,                                                RG_NONE);
+    locationTable[RC_LH_CHILD_FISH_9] =                                                Location::Base(RC_LH_CHILD_FISH_9,                                              RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 108,                                "Child Pond Fish 9",                           RHT_LH_POND_FISH,                                                RG_NONE);
+    locationTable[RC_LH_CHILD_FISH_10] =                                               Location::Base(RC_LH_CHILD_FISH_10,                                             RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 109,                                "Child Pond Fish 10",                          RHT_LH_POND_FISH,                                                RG_NONE);
+    locationTable[RC_LH_CHILD_FISH_11] =                                               Location::Base(RC_LH_CHILD_FISH_11,                                             RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 110,                                "Child Pond Fish 11",                          RHT_LH_POND_FISH,                                                RG_NONE);
+    locationTable[RC_LH_CHILD_FISH_12] =                                               Location::Base(RC_LH_CHILD_FISH_12,                                             RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 111,                                "Child Pond Fish 12",                          RHT_LH_POND_FISH,                                                RG_NONE);
+    locationTable[RC_LH_CHILD_FISH_13] =                                               Location::Base(RC_LH_CHILD_FISH_13,                                             RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 112,                                "Child Pond Fish 13",                          RHT_LH_POND_FISH,                                                RG_NONE);
+    locationTable[RC_LH_CHILD_FISH_14] =                                               Location::Base(RC_LH_CHILD_FISH_14,                                             RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 113,                                "Child Pond Fish 14",                          RHT_LH_POND_FISH,                                                RG_NONE);
+    locationTable[RC_LH_CHILD_FISH_15] =                                               Location::Base(RC_LH_CHILD_FISH_15,                                             RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 114,                                "Child Pond Fish 15",                          RHT_LH_POND_FISH,                                                RG_NONE);
+    locationTable[RC_LH_CHILD_LOACH_1] =                                               Location::Base(RC_LH_CHILD_LOACH_1,                                             RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 115,                                "Child Pond Loach 1",                          RHT_LH_HYRULE_LOACH,                                             RG_NONE);
+    locationTable[RC_LH_CHILD_LOACH_2] =                                               Location::Base(RC_LH_CHILD_LOACH_2,                                             RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 116,                                "Child Pond Loach 2",                          RHT_LH_HYRULE_LOACH,                                             RG_NONE);
+    locationTable[RC_LH_ADULT_FISH_1] =                                                Location::Base(RC_LH_ADULT_FISH_1,                                              RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 100,                                "Adult Pond Fish 1",                           RHT_LH_POND_FISH,                                                RG_NONE);
+    locationTable[RC_LH_ADULT_FISH_2] =                                                Location::Base(RC_LH_ADULT_FISH_2,                                              RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 101,                                "Adult Pond Fish 2",                           RHT_LH_POND_FISH,                                                RG_NONE);
+    locationTable[RC_LH_ADULT_FISH_3] =                                                Location::Base(RC_LH_ADULT_FISH_3,                                              RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 102,                                "Adult Pond Fish 3",                           RHT_LH_POND_FISH,                                                RG_NONE);
+    locationTable[RC_LH_ADULT_FISH_4] =                                                Location::Base(RC_LH_ADULT_FISH_4,                                              RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 103,                                "Adult Pond Fish 4",                           RHT_LH_POND_FISH,                                                RG_NONE);
+    locationTable[RC_LH_ADULT_FISH_5] =                                                Location::Base(RC_LH_ADULT_FISH_5,                                              RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 104,                                "Adult Pond Fish 5",                           RHT_LH_POND_FISH,                                                RG_NONE);
+    locationTable[RC_LH_ADULT_FISH_6] =                                                Location::Base(RC_LH_ADULT_FISH_6,                                              RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 105,                                "Adult Pond Fish 6",                           RHT_LH_POND_FISH,                                                RG_NONE);
+    locationTable[RC_LH_ADULT_FISH_7] =                                                Location::Base(RC_LH_ADULT_FISH_7,                                              RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 106,                                "Adult Pond Fish 7",                           RHT_LH_POND_FISH,                                                RG_NONE);
+    locationTable[RC_LH_ADULT_FISH_8] =                                                Location::Base(RC_LH_ADULT_FISH_8,                                              RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 107,                                "Adult Pond Fish 8",                           RHT_LH_POND_FISH,                                                RG_NONE);
+    locationTable[RC_LH_ADULT_FISH_9] =                                                Location::Base(RC_LH_ADULT_FISH_9,                                              RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 108,                                "Adult Pond Fish 9",                           RHT_LH_POND_FISH,                                                RG_NONE);
+    locationTable[RC_LH_ADULT_FISH_10] =                                               Location::Base(RC_LH_ADULT_FISH_10,                                             RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 109,                                "Adult Pond Fish 10",                          RHT_LH_POND_FISH,                                                RG_NONE);
+    locationTable[RC_LH_ADULT_FISH_11] =                                               Location::Base(RC_LH_ADULT_FISH_11,                                             RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 110,                                "Adult Pond Fish 11",                          RHT_LH_POND_FISH,                                                RG_NONE);
+    locationTable[RC_LH_ADULT_FISH_12] =                                               Location::Base(RC_LH_ADULT_FISH_12,                                             RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 111,                                "Adult Pond Fish 12",                          RHT_LH_POND_FISH,                                                RG_NONE);
+    locationTable[RC_LH_ADULT_FISH_13] =                                               Location::Base(RC_LH_ADULT_FISH_13,                                             RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 112,                                "Adult Pond Fish 13",                          RHT_LH_POND_FISH,                                                RG_NONE);
+    locationTable[RC_LH_ADULT_FISH_14] =                                               Location::Base(RC_LH_ADULT_FISH_14,                                             RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 113,                                "Adult Pond Fish 14",                          RHT_LH_POND_FISH,                                                RG_NONE);
+    locationTable[RC_LH_ADULT_FISH_15] =                                               Location::Base(RC_LH_ADULT_FISH_15,                                             RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 114,                                "Adult Pond Fish 15",                          RHT_LH_POND_FISH,                                                RG_NONE);
+    locationTable[RC_LH_ADULT_LOACH] =                                                 Location::Base(RC_LH_ADULT_LOACH,                                               RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 115,                                "Adult Pond Loach",                            RHT_LH_HYRULE_LOACH,                                             RG_NONE);
     // Grotto fish
-    locationTable[RC_KF_STORMS_GROTTO_FISH] =                                          Location::Base(RC_KF_STORMS_GROTTO_FISH,                                        RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_KOKIRI_FOREST,                ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                                 0x00, "Storms Grotto Fish",                          RHT_KF_STORMS_GROTTO_FISH,                                       RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0x2C, SCENE_GROTTOS),                                                                            SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
-    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_FISH] =                                  Location::Base(RC_LW_NEAR_SHORTCUTS_GROTTO_FISH,                                RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LOST_WOODS,                   ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                                 0x00, "Near Shortcuts Grotto Fish",                  RHT_LW_NEAR_SHORTCUTS_GROTTO_FISH,                               RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0x14, SCENE_GROTTOS),                                                                            SpoilerCollectionCheckGroup::GROUP_LOST_WOODS);
-    locationTable[RC_HF_SOUTHEAST_GROTTO_FISH] =                                       Location::Base(RC_HF_SOUTHEAST_GROTTO_FISH,                                     RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_HYRULE_FIELD,                 ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                                 0x00, "Southeast Grotto Fish",                       RHT_HF_SOUTHEAST_GROTTO_FISH,                                    RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0x22, SCENE_GROTTOS),                                                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[RC_HF_OPEN_GROTTO_FISH] =                                            Location::Base(RC_HF_OPEN_GROTTO_FISH,                                          RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_HYRULE_FIELD,                 ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                                 0x00, "Open Grotto Fish",                            RHT_HF_OPEN_GROTTO_FISH,                                         RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0x03, SCENE_GROTTOS),                                                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[RC_HF_NEAR_MARKET_GROTTO_FISH] =                                     Location::Base(RC_HF_NEAR_MARKET_GROTTO_FISH,                                   RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_HYRULE_FIELD,                 ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                                 0x00, "Near Market Grotto Fish",                     RHT_HF_NEAR_MARKET_GROTTO_FISH,                                  RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0x00, SCENE_GROTTOS),                                                                            SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD);
-    locationTable[RC_KAK_OPEN_GROTTO_FISH] =                                           Location::Base(RC_KAK_OPEN_GROTTO_FISH,                                         RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                                 0x00, "Open Grotto Fish",                            RHT_KAK_OPEN_GROTTO_FISH,                                        RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0x28, SCENE_GROTTOS),                                                                            SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[RC_DMT_STORMS_GROTTO_FISH] =                                         Location::Base(RC_DMT_STORMS_GROTTO_FISH,                                       RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                                 0x00, "Storms Grotto Fish",                          RHT_DMT_STORMS_GROTTO_FISH,                                      RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0x57, SCENE_GROTTOS),                                                                            SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_DMC_UPPER_GROTTO_FISH] =                                          Location::Base(RC_DMC_UPPER_GROTTO_FISH,                                        RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                                 0x00, "Upper Grotto Fish",                           RHT_DMC_UPPER_GROTTO_FISH,                                       RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0x7A, SCENE_GROTTOS),                                                                            SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN);
-    locationTable[RC_ZR_OPEN_GROTTO_FISH] =                                            Location::Base(RC_ZR_OPEN_GROTTO_FISH,                                          RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_ZORAS_RIVER,                  ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                                 0x00, "Open Grotto Fish",                            RHT_ZR_OPEN_GROTTO_FISH,                                         RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0x29, SCENE_GROTTOS),                                                                            SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[RC_KF_STORMS_GROTTO_FISH] =                                          Location::Base(RC_KF_STORMS_GROTTO_FISH,                                        RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_KOKIRI_FOREST,                ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                  "Storms Grotto Fish",                          RHT_KF_STORMS_GROTTO_FISH,                                       RG_FISH);
+    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_FISH] =                                  Location::Base(RC_LW_NEAR_SHORTCUTS_GROTTO_FISH,                                RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LOST_WOODS,                   ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                  "Near Shortcuts Grotto Fish",                  RHT_LW_NEAR_SHORTCUTS_GROTTO_FISH,                               RG_FISH);
+    locationTable[RC_HF_SOUTHEAST_GROTTO_FISH] =                                       Location::Base(RC_HF_SOUTHEAST_GROTTO_FISH,                                     RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_HYRULE_FIELD,                 ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                  "Southeast Grotto Fish",                       RHT_HF_SOUTHEAST_GROTTO_FISH,                                    RG_FISH);
+    locationTable[RC_HF_OPEN_GROTTO_FISH] =                                            Location::Base(RC_HF_OPEN_GROTTO_FISH,                                          RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_HYRULE_FIELD,                 ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                  "Open Grotto Fish",                            RHT_HF_OPEN_GROTTO_FISH,                                         RG_FISH);
+    locationTable[RC_HF_NEAR_MARKET_GROTTO_FISH] =                                     Location::Base(RC_HF_NEAR_MARKET_GROTTO_FISH,                                   RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_HYRULE_FIELD,                 ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                  "Near Market Grotto Fish",                     RHT_HF_NEAR_MARKET_GROTTO_FISH,                                  RG_FISH);
+    locationTable[RC_KAK_OPEN_GROTTO_FISH] =                                           Location::Base(RC_KAK_OPEN_GROTTO_FISH,                                         RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                  "Open Grotto Fish",                            RHT_KAK_OPEN_GROTTO_FISH,                                        RG_FISH);
+    locationTable[RC_DMT_STORMS_GROTTO_FISH] =                                         Location::Base(RC_DMT_STORMS_GROTTO_FISH,                                       RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                  "Storms Grotto Fish",                          RHT_DMT_STORMS_GROTTO_FISH,                                      RG_FISH);
+    locationTable[RC_DMC_UPPER_GROTTO_FISH] =                                          Location::Base(RC_DMC_UPPER_GROTTO_FISH,                                        RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                  "Upper Grotto Fish",                           RHT_DMC_UPPER_GROTTO_FISH,                                       RG_FISH);
+    locationTable[RC_ZR_OPEN_GROTTO_FISH] =                                            Location::Base(RC_ZR_OPEN_GROTTO_FISH,                                          RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_ZORAS_RIVER,                  ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                  "Open Grotto Fish",                            RHT_ZR_OPEN_GROTTO_FISH,                                         RG_FISH);
     // Zora's Domain fish
-    locationTable[RC_ZD_FISH_1] =                                                      Location::Base(RC_ZD_FISH_1,                                                    RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_FISH,        SCENE_ZORAS_DOMAIN,                 -1 ^ 0,                                            0x00, "Fish 1",                                      RHT_ZD_FISH,                                                     RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF, SCENE_ZORAS_DOMAIN),                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZD_FISH_2] =                                                      Location::Base(RC_ZD_FISH_2,                                                    RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_FISH,        SCENE_ZORAS_DOMAIN,                 -1 ^ 1,                                            0x00, "Fish 2",                                      RHT_ZD_FISH,                                                     RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF, SCENE_ZORAS_DOMAIN),                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZD_FISH_3] =                                                      Location::Base(RC_ZD_FISH_3,                                                    RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_FISH,        SCENE_ZORAS_DOMAIN,                 -1 ^ 2,                                            0x00, "Fish 3",                                      RHT_ZD_FISH,                                                     RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF, SCENE_ZORAS_DOMAIN),                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZD_FISH_4] =                                                      Location::Base(RC_ZD_FISH_4,                                                    RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_FISH,        SCENE_ZORAS_DOMAIN,                 -1 ^ 3,                                            0x00, "Fish 4",                                      RHT_ZD_FISH,                                                     RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF, SCENE_ZORAS_DOMAIN),                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
-    locationTable[RC_ZD_FISH_5] =                                                      Location::Base(RC_ZD_FISH_5,                                                    RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_ZORAS_DOMAIN,                 ACTOR_EN_FISH,        SCENE_ZORAS_DOMAIN,                 -1 ^ 4,                                            0x00, "Fish 5",                                      RHT_ZD_FISH,                                                     RG_FISH,                              { Category::cFish },                                    SpoilerCollectionCheck::Fish(0xFF, SCENE_ZORAS_DOMAIN),                                                                       SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN);
+    locationTable[RC_ZD_FISH_1] =                                                      Location::Base(RC_ZD_FISH_1,                                                    RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_EN_FISH,        SCENE_ZORAS_DOMAIN,                 -1 ^ 0,                             "Fish 1",                                      RHT_ZD_FISH,                                                     RG_FISH);
+    locationTable[RC_ZD_FISH_2] =                                                      Location::Base(RC_ZD_FISH_2,                                                    RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_EN_FISH,        SCENE_ZORAS_DOMAIN,                 -1 ^ 1,                             "Fish 2",                                      RHT_ZD_FISH,                                                     RG_FISH);
+    locationTable[RC_ZD_FISH_3] =                                                      Location::Base(RC_ZD_FISH_3,                                                    RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_EN_FISH,        SCENE_ZORAS_DOMAIN,                 -1 ^ 2,                             "Fish 3",                                      RHT_ZD_FISH,                                                     RG_FISH);
+    locationTable[RC_ZD_FISH_4] =                                                      Location::Base(RC_ZD_FISH_4,                                                    RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_EN_FISH,        SCENE_ZORAS_DOMAIN,                 -1 ^ 3,                             "Fish 4",                                      RHT_ZD_FISH,                                                     RG_FISH);
+    locationTable[RC_ZD_FISH_5] =                                                      Location::Base(RC_ZD_FISH_5,                                                    RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_EN_FISH,        SCENE_ZORAS_DOMAIN,                 -1 ^ 4,                             "Fish 5",                                      RHT_ZD_FISH,                                                     RG_FISH);
 
 
     // Gossip Stones
-    locationTable[RC_DMC_GOSSIP_STONE] =                                          Location::HintStone(RC_DMC_GOSSIP_STONE,                                             RCQUEST_BOTH,                                        RCAREA_DEATH_MOUNTAIN_CRATER,                              SCENE_DEATH_MOUNTAIN_CRATER,        14341,                                             0x05, "Gossip Stone",                  {});
-    locationTable[RC_DMT_GOSSIP_STONE] =                                          Location::HintStone(RC_DMT_GOSSIP_STONE,                                             RCQUEST_BOTH,                                        RCAREA_DEATH_MOUNTAIN_TRAIL,                               SCENE_DEATH_MOUNTAIN_TRAIL,         14340,                                             0x04, "Gossip Stone",                  {});
-    locationTable[RC_COLOSSUS_GOSSIP_STONE] =                                     Location::HintStone(RC_COLOSSUS_GOSSIP_STONE,                                        RCQUEST_BOTH,                                        RCAREA_DESERT_COLOSSUS,                                    SCENE_DESERT_COLOSSUS,              14362,                                             0x1A, "Gossip Stone",                  {});
-    locationTable[RC_DODONGOS_CAVERN_GOSSIP_STONE] =                              Location::HintStone(RC_DODONGOS_CAVERN_GOSSIP_STONE,                                 RCQUEST_VANILLA,                                     RCAREA_DODONGOS_CAVERN,                                    SCENE_DODONGOS_CAVERN,              4372,                                              0x14, "Gossip Stone",                  {});
-    locationTable[RC_GV_GOSSIP_STONE] =                                           Location::HintStone(RC_GV_GOSSIP_STONE,                                              RCQUEST_BOTH,                                        RCAREA_GERUDO_VALLEY,                                      SCENE_GERUDO_VALLEY,                14353,                                             0x11, "Gossip Stone",                  {});
-    locationTable[RC_GC_MAZE_GOSSIP_STONE] =                                      Location::HintStone(RC_GC_MAZE_GOSSIP_STONE,                                         RCQUEST_BOTH,                                        RCAREA_GORON_CITY,                                         SCENE_GORON_CITY,                   14357,                                             0x15, "Maze Gossip Stone",             {});
-    locationTable[RC_GC_MEDIGORON_GOSSIP_STONE] =                                 Location::HintStone(RC_GC_MEDIGORON_GOSSIP_STONE,                                    RCQUEST_BOTH,                                        RCAREA_GORON_CITY,                                         SCENE_GORON_CITY,                   14873,                                             0x19, "Medigoron Gossip Stone",        {});
-    locationTable[RC_GRAVEYARD_GOSSIP_STONE] =                                    Location::HintStone(RC_GRAVEYARD_GOSSIP_STONE,                                       RCQUEST_BOTH,                                        RCAREA_GRAVEYARD,                                          SCENE_GRAVEYARD,                    14346,                                             0x0A, "Gossip Stone",                  {});
-    locationTable[RC_HC_MALON_GOSSIP_STONE] =                                     Location::HintStone(RC_HC_MALON_GOSSIP_STONE,                                        RCQUEST_BOTH,                                        RCAREA_HYRULE_CASTLE,                                      SCENE_HYRULE_CASTLE,                14610,                                             0x12, "Malon Gossip Stone",            {});
-    locationTable[RC_HC_ROCK_WALL_GOSSIP_STONE] =                                 Location::HintStone(RC_HC_ROCK_WALL_GOSSIP_STONE,                                    RCQUEST_BOTH,                                        RCAREA_HYRULE_CASTLE,                                      SCENE_HYRULE_CASTLE,                14347,                                             0x0B, "Rock Wall Gossip Stone",        {});
-    locationTable[RC_HC_STORMS_GROTTO_GOSSIP_STONE] =                             Location::HintStone(RC_HC_STORMS_GROTTO_GOSSIP_STONE,                                RCQUEST_BOTH,                                        RCAREA_HYRULE_CASTLE,                                      SCENE_GROTTOS,                      14355,                                             0x13, "Storms Grotto Gossip Stone",    {});
-    locationTable[RC_KF_DEKU_TREE_LEFT_GOSSIP_STONE] =                            Location::HintStone(RC_KF_DEKU_TREE_LEFT_GOSSIP_STONE,                               RCQUEST_BOTH,                                        RCAREA_KOKIRI_FOREST,                                      SCENE_KOKIRI_FOREST,                14623,                                             0x1F, "Deku Tree Left Gossip Stone",   {});
-    locationTable[RC_KF_DEKU_TREE_RIGHT_GOSSIP_STONE] =                           Location::HintStone(RC_KF_DEKU_TREE_RIGHT_GOSSIP_STONE,                              RCQUEST_BOTH,                                        RCAREA_KOKIRI_FOREST,                                      SCENE_KOKIRI_FOREST,                14880,                                             0x20, "Deku Tree Right Gossip Stone",  {});
-    locationTable[RC_KF_GOSSIP_STONE] =                                           Location::HintStone(RC_KF_GOSSIP_STONE,                                              RCQUEST_BOTH,                                        RCAREA_KOKIRI_FOREST,                                      SCENE_KOKIRI_FOREST,                14366,                                             0x1E, "Gossip Stone",                  {});
-    locationTable[RC_KF_STORMS_GROTTO_GOSSIP_STONE] =                             Location::HintStone(RC_KF_STORMS_GROTTO_GOSSIP_STONE,                                RCQUEST_BOTH,                                        RCAREA_KOKIRI_FOREST,                                      SCENE_GROTTOS,                      -22988,                                            0x3C, "Storms Gossip Stone",           {});
-    locationTable[RC_LH_LAB_GOSSIP_STONE] =                                       Location::HintStone(RC_LH_LAB_GOSSIP_STONE,                                          RCQUEST_BOTH,                                        RCAREA_LAKE_HYLIA,                                         SCENE_LAKE_HYLIA,                   14339,                                             0x03, "Lab Gossip Stone",              {});
-    locationTable[RC_LH_SOUTHEAST_GOSSIP_STONE] =                                 Location::HintStone(RC_LH_SOUTHEAST_GOSSIP_STONE,                                    RCQUEST_BOTH,                                        RCAREA_LAKE_HYLIA,                                         SCENE_LAKE_HYLIA,                   14863,                                             0x0F, "Southeast Gossip Stone",        {});
-    locationTable[RC_LH_SOUTHWEST_GOSSIP_STONE] =                                 Location::HintStone(RC_LH_SOUTHWEST_GOSSIP_STONE,                                    RCQUEST_BOTH,                                        RCAREA_LAKE_HYLIA,                                         SCENE_LAKE_HYLIA,                   14600,                                             0x08, "Southwest Gossip Stone",        {});
-    locationTable[RC_LW_GOSSIP_STONE] =                                           Location::HintStone(RC_LW_GOSSIP_STONE,                                              RCQUEST_BOTH,                                        RCAREA_LOST_WOODS,                                         SCENE_LOST_WOODS,                   14365,                                             0x1D, "Gossip Stone",                  {});
-    locationTable[RC_SFM_MAZE_LOWER_GOSSIP_STONE] =                               Location::HintStone(RC_SFM_MAZE_LOWER_GOSSIP_STONE,                                  RCQUEST_BOTH,                                        RCAREA_SACRED_FOREST_MEADOW,                               SCENE_SACRED_FOREST_MEADOW,         14358,                                             0x16, "Maze Lower Gossip Stone",       {});
-    locationTable[RC_SFM_MAZE_UPPER_GOSSIP_STONE] =                               Location::HintStone(RC_SFM_MAZE_UPPER_GOSSIP_STONE,                                  RCQUEST_BOTH,                                        RCAREA_SACRED_FOREST_MEADOW,                               SCENE_SACRED_FOREST_MEADOW,         14615,                                             0x17, "Maze Upper Gossip Stone",       {});
-    locationTable[RC_SFM_SARIA_GOSSIP_STONE] =                                    Location::HintStone(RC_SFM_SARIA_GOSSIP_STONE,                                       RCQUEST_BOTH,                                        RCAREA_SACRED_FOREST_MEADOW,                               SCENE_SACRED_FOREST_MEADOW,         14876,                                             0x1C, "Saria Gossip Stone",            {});
-    locationTable[RC_TOT_LEFTMOST_GOSSIP_STONE] =                                 Location::HintStone(RC_TOT_LEFTMOST_GOSSIP_STONE,                                    RCQUEST_BOTH,                                        RCAREA_MARKET,                                             SCENE_ID_MAX,                       0x00,                                              0x06, "ToT Left Gossip Stone",         {});
-    locationTable[RC_TOT_RIGHTMOST_GOSSIP_STONE] =                                Location::HintStone(RC_TOT_RIGHTMOST_GOSSIP_STONE,                                   RCQUEST_BOTH,                                        RCAREA_MARKET,                                             SCENE_ID_MAX,                       0x00,                                              0x07, "ToT Right Gossip Stone",        {});
-    locationTable[RC_TOT_RIGHT_CENTER_GOSSIP_STONE] =                             Location::HintStone(RC_TOT_RIGHT_CENTER_GOSSIP_STONE,                                RCQUEST_BOTH,                                        RCAREA_MARKET,                                             SCENE_ID_MAX,                       0x00,                                              0x10, "ToT Right Center Gossip Stone", {});
-    locationTable[RC_TOT_LEFT_CENTER_GOSSIP_STONE] =                              Location::HintStone(RC_TOT_LEFT_CENTER_GOSSIP_STONE,                                 RCQUEST_BOTH,                                        RCAREA_MARKET,                                             SCENE_ID_MAX,                       0x00,                                              0x0E, "ToT Left Center Gossip Stone",  {});
-    locationTable[RC_ZD_GOSSIP_STONE] =                                           Location::HintStone(RC_ZD_GOSSIP_STONE,                                              RCQUEST_BOTH,                                        RCAREA_ZORAS_DOMAIN,                                       SCENE_ZORAS_DOMAIN,                 14345,                                             0x09, "Gossip Stone",                  {});
-    locationTable[RC_ZF_FAIRY_GOSSIP_STONE] =                                     Location::HintStone(RC_ZF_FAIRY_GOSSIP_STONE,                                        RCQUEST_BOTH,                                        RCAREA_ZORAS_FOUNTAIN,                                     SCENE_ZORAS_FOUNTAIN,               0x00,                                              0x01, "Fairy Gossip Stone",            {});
-    locationTable[RC_ZF_JABU_GOSSIP_STONE] =                                      Location::HintStone(RC_ZF_JABU_GOSSIP_STONE,                                         RCQUEST_BOTH,                                        RCAREA_ZORAS_FOUNTAIN,                                     SCENE_ZORAS_FOUNTAIN,               0x00,                                              0x02, "Jabu Gossip Stone",             {});
-    locationTable[RC_ZR_NEAR_GROTTOS_GOSSIP_STONE] =                              Location::HintStone(RC_ZR_NEAR_GROTTOS_GOSSIP_STONE,                                 RCQUEST_BOTH,                                        RCAREA_ZORAS_RIVER,                                        SCENE_ZORAS_RIVER,                  14605,                                             0x0D, "Near Grottos Gossip Stone",     {});
-    locationTable[RC_ZR_NEAR_DOMAIN_GOSSIP_STONE] =                               Location::HintStone(RC_ZR_NEAR_DOMAIN_GOSSIP_STONE,                                  RCQUEST_BOTH,                                        RCAREA_ZORAS_RIVER,                                        SCENE_ZORAS_RIVER,                  14860,                                             0x0C, "Near Domain Gossip Stone",      {});
-    locationTable[RC_HF_COW_GROTTO_GOSSIP_STONE] =                                Location::HintStone(RC_HF_COW_GROTTO_GOSSIP_STONE,                                   RCQUEST_BOTH,                                        RCAREA_HYRULE_FIELD,                                       SCENE_GROTTOS,                      14363,                                             0x1B, "Cow Grotto Gossip Stone",       {});
-    locationTable[RC_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE] =                        Location::HintStone(RC_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE,                           RCQUEST_BOTH,                                        RCAREA_HYRULE_FIELD,                                       SCENE_GROTTOS,                      -22944,                                            0x30, "Near Market Gossip Stone",      {});
-    locationTable[RC_HF_SOUTHEAST_GROTTO_GOSSIP_STONE] =                          Location::HintStone(RC_HF_SOUTHEAST_GROTTO_GOSSIP_STONE,                             RCQUEST_BOTH,                                        RCAREA_HYRULE_FIELD,                                       SCENE_GROTTOS,                      -22978,                                            0x32, "Southeast Gossip Stone",        {});
-    locationTable[RC_HF_OPEN_GROTTO_GOSSIP_STONE] =                               Location::HintStone(RC_HF_OPEN_GROTTO_GOSSIP_STONE,                                  RCQUEST_BOTH,                                        RCAREA_HYRULE_FIELD,                                       SCENE_GROTTOS,                      -22947,                                            0x33, "Open Grotto Gossip Stone",      {});
-    locationTable[RC_KAK_OPEN_GROTTO_GOSSIP_STONE] =                              Location::HintStone(RC_KAK_OPEN_GROTTO_GOSSIP_STONE,                                 RCQUEST_BOTH,                                        RCAREA_KAKARIKO_VILLAGE,                                   SCENE_GROTTOS,                      -22984,                                            0x38, "Open Grotto Gossip Stone",      {});
-    locationTable[RC_ZR_OPEN_GROTTO_GOSSIP_STONE] =                               Location::HintStone(RC_ZR_OPEN_GROTTO_GOSSIP_STONE,                                  RCQUEST_BOTH,                                        RCAREA_ZORAS_RIVER,                                        SCENE_GROTTOS,                      -22985,                                            0x39, "Open Grotto Gossip Stone",      {});
-    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE] =                     Location::HintStone(RC_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE,                        RCQUEST_BOTH,                                        RCAREA_LOST_WOODS,                                         SCENE_GROTTOS,                      -22964,                                            0x34, "Near Shortcuts Gossip Stone",   {});
-    locationTable[RC_DMT_STORMS_GROTTO_GOSSIP_STONE] =                            Location::HintStone(RC_DMT_STORMS_GROTTO_GOSSIP_STONE,                               RCQUEST_BOTH,                                        RCAREA_DEATH_MOUNTAIN_TRAIL,                               SCENE_GROTTOS,                      -23255,                                            0x37, "Storms Grotto Gossip Stone",    {});
-    locationTable[RC_DMC_UPPER_GROTTO_GOSSIP_STONE] =                             Location::HintStone(RC_DMC_UPPER_GROTTO_GOSSIP_STONE,                                RCQUEST_BOTH,                                        RCAREA_DEATH_MOUNTAIN_CRATER,                              SCENE_GROTTOS,                      -23802,                                            0x3A, "Upper Grotto Gossip Stone",     {});
+    locationTable[RC_DMC_GOSSIP_STONE] =                                          Location::HintStone(RC_DMC_GOSSIP_STONE,                                             RCQUEST_BOTH,                                                                                                   SCENE_DEATH_MOUNTAIN_CRATER,        14341,                              "Gossip Stone");
+    locationTable[RC_DMT_GOSSIP_STONE] =                                          Location::HintStone(RC_DMT_GOSSIP_STONE,                                             RCQUEST_BOTH,                                                                                                   SCENE_DEATH_MOUNTAIN_TRAIL,         14340,                              "Gossip Stone");
+    locationTable[RC_COLOSSUS_GOSSIP_STONE] =                                     Location::HintStone(RC_COLOSSUS_GOSSIP_STONE,                                        RCQUEST_BOTH,                                                                                                   SCENE_DESERT_COLOSSUS,              14362,                              "Gossip Stone");
+    locationTable[RC_DODONGOS_CAVERN_GOSSIP_STONE] =                              Location::HintStone(RC_DODONGOS_CAVERN_GOSSIP_STONE,                                 RCQUEST_VANILLA,                                                                                                SCENE_DODONGOS_CAVERN,              4372,                               "Gossip Stone");
+    locationTable[RC_GV_GOSSIP_STONE] =                                           Location::HintStone(RC_GV_GOSSIP_STONE,                                              RCQUEST_BOTH,                                                                                                   SCENE_GERUDO_VALLEY,                14353,                              "Gossip Stone");
+    locationTable[RC_GC_MAZE_GOSSIP_STONE] =                                      Location::HintStone(RC_GC_MAZE_GOSSIP_STONE,                                         RCQUEST_BOTH,                                                                                                   SCENE_GORON_CITY,                   14357,                              "Maze Gossip Stone");
+    locationTable[RC_GC_MEDIGORON_GOSSIP_STONE] =                                 Location::HintStone(RC_GC_MEDIGORON_GOSSIP_STONE,                                    RCQUEST_BOTH,                                                                                                   SCENE_GORON_CITY,                   14873,                              "Medigoron Gossip Stone");
+    locationTable[RC_GRAVEYARD_GOSSIP_STONE] =                                    Location::HintStone(RC_GRAVEYARD_GOSSIP_STONE,                                       RCQUEST_BOTH,                                                                                                   SCENE_GRAVEYARD,                    14346,                              "Gossip Stone");
+    locationTable[RC_HC_MALON_GOSSIP_STONE] =                                     Location::HintStone(RC_HC_MALON_GOSSIP_STONE,                                        RCQUEST_BOTH,                                                                                                   SCENE_HYRULE_CASTLE,                14610,                              "Malon Gossip Stone");
+    locationTable[RC_HC_ROCK_WALL_GOSSIP_STONE] =                                 Location::HintStone(RC_HC_ROCK_WALL_GOSSIP_STONE,                                    RCQUEST_BOTH,                                                                                                   SCENE_HYRULE_CASTLE,                14347,                              "Rock Wall Gossip Stone");
+    locationTable[RC_HC_STORMS_GROTTO_GOSSIP_STONE] =                             Location::HintStone(RC_HC_STORMS_GROTTO_GOSSIP_STONE,                                RCQUEST_BOTH,                                        RCAREA_HYRULE_CASTLE,                                      SCENE_GROTTOS,                      14355,                              "Storms Grotto Gossip Stone");
+    locationTable[RC_KF_DEKU_TREE_LEFT_GOSSIP_STONE] =                            Location::HintStone(RC_KF_DEKU_TREE_LEFT_GOSSIP_STONE,                               RCQUEST_BOTH,                                                                                                   SCENE_KOKIRI_FOREST,                14623,                              "Deku Tree Left Gossip Stone");
+    locationTable[RC_KF_DEKU_TREE_RIGHT_GOSSIP_STONE] =                           Location::HintStone(RC_KF_DEKU_TREE_RIGHT_GOSSIP_STONE,                              RCQUEST_BOTH,                                                                                                   SCENE_KOKIRI_FOREST,                14880,                              "Deku Tree Right Gossip Stone");
+    locationTable[RC_KF_GOSSIP_STONE] =                                           Location::HintStone(RC_KF_GOSSIP_STONE,                                              RCQUEST_BOTH,                                                                                                   SCENE_KOKIRI_FOREST,                14366,                              "Gossip Stone");
+    locationTable[RC_KF_STORMS_GROTTO_GOSSIP_STONE] =                             Location::HintStone(RC_KF_STORMS_GROTTO_GOSSIP_STONE,                                RCQUEST_BOTH,                                        RCAREA_KOKIRI_FOREST,                                      SCENE_GROTTOS,                      -22988,                             "Storms Gossip Stone");
+    locationTable[RC_LH_LAB_GOSSIP_STONE] =                                       Location::HintStone(RC_LH_LAB_GOSSIP_STONE,                                          RCQUEST_BOTH,                                                                                                   SCENE_LAKE_HYLIA,                   14339,                              "Lab Gossip Stone");
+    locationTable[RC_LH_SOUTHEAST_GOSSIP_STONE] =                                 Location::HintStone(RC_LH_SOUTHEAST_GOSSIP_STONE,                                    RCQUEST_BOTH,                                                                                                   SCENE_LAKE_HYLIA,                   14863,                              "Southeast Gossip Stone");
+    locationTable[RC_LH_SOUTHWEST_GOSSIP_STONE] =                                 Location::HintStone(RC_LH_SOUTHWEST_GOSSIP_STONE,                                    RCQUEST_BOTH,                                                                                                   SCENE_LAKE_HYLIA,                   14600,                              "Southwest Gossip Stone");
+    locationTable[RC_LW_GOSSIP_STONE] =                                           Location::HintStone(RC_LW_GOSSIP_STONE,                                              RCQUEST_BOTH,                                                                                                   SCENE_LOST_WOODS,                   14365,                              "Gossip Stone");
+    locationTable[RC_SFM_MAZE_LOWER_GOSSIP_STONE] =                               Location::HintStone(RC_SFM_MAZE_LOWER_GOSSIP_STONE,                                  RCQUEST_BOTH,                                                                                                   SCENE_SACRED_FOREST_MEADOW,         14358,                              "Maze Lower Gossip Stone");
+    locationTable[RC_SFM_MAZE_UPPER_GOSSIP_STONE] =                               Location::HintStone(RC_SFM_MAZE_UPPER_GOSSIP_STONE,                                  RCQUEST_BOTH,                                                                                                   SCENE_SACRED_FOREST_MEADOW,         14615,                              "Maze Upper Gossip Stone");
+    locationTable[RC_SFM_SARIA_GOSSIP_STONE] =                                    Location::HintStone(RC_SFM_SARIA_GOSSIP_STONE,                                       RCQUEST_BOTH,                                                                                                   SCENE_SACRED_FOREST_MEADOW,         14876,                              "Saria Gossip Stone");
+    locationTable[RC_TOT_LEFTMOST_GOSSIP_STONE] =                                 Location::HintStone(RC_TOT_LEFTMOST_GOSSIP_STONE,                                    RCQUEST_BOTH,                                        RCAREA_MARKET,                                             SCENE_ID_MAX,                       0x00,                               "ToT Left Gossip Stone");
+    locationTable[RC_TOT_RIGHTMOST_GOSSIP_STONE] =                                Location::HintStone(RC_TOT_RIGHTMOST_GOSSIP_STONE,                                   RCQUEST_BOTH,                                        RCAREA_MARKET,                                             SCENE_ID_MAX,                       0x00,                               "ToT Right Gossip Stone");
+    locationTable[RC_TOT_RIGHT_CENTER_GOSSIP_STONE] =                             Location::HintStone(RC_TOT_RIGHT_CENTER_GOSSIP_STONE,                                RCQUEST_BOTH,                                        RCAREA_MARKET,                                             SCENE_ID_MAX,                       0x00,                               "ToT Right Center Gossip Stone");
+    locationTable[RC_TOT_LEFT_CENTER_GOSSIP_STONE] =                              Location::HintStone(RC_TOT_LEFT_CENTER_GOSSIP_STONE,                                 RCQUEST_BOTH,                                        RCAREA_MARKET,                                             SCENE_ID_MAX,                       0x00,                               "ToT Left Center Gossip Stone");
+    locationTable[RC_ZD_GOSSIP_STONE] =                                           Location::HintStone(RC_ZD_GOSSIP_STONE,                                              RCQUEST_BOTH,                                                                                                   SCENE_ZORAS_DOMAIN,                 14345,                              "Gossip Stone");
+    locationTable[RC_ZF_FAIRY_GOSSIP_STONE] =                                     Location::HintStone(RC_ZF_FAIRY_GOSSIP_STONE,                                        RCQUEST_BOTH,                                                                                                   SCENE_ZORAS_FOUNTAIN,               0x00,                               "Fairy Gossip Stone");
+    locationTable[RC_ZF_JABU_GOSSIP_STONE] =                                      Location::HintStone(RC_ZF_JABU_GOSSIP_STONE,                                         RCQUEST_BOTH,                                                                                                   SCENE_ZORAS_FOUNTAIN,               0x00,                               "Jabu Gossip Stone");
+    locationTable[RC_ZR_NEAR_GROTTOS_GOSSIP_STONE] =                              Location::HintStone(RC_ZR_NEAR_GROTTOS_GOSSIP_STONE,                                 RCQUEST_BOTH,                                                                                                   SCENE_ZORAS_RIVER,                  14605,                              "Near Grottos Gossip Stone");
+    locationTable[RC_ZR_NEAR_DOMAIN_GOSSIP_STONE] =                               Location::HintStone(RC_ZR_NEAR_DOMAIN_GOSSIP_STONE,                                  RCQUEST_BOTH,                                                                                                   SCENE_ZORAS_RIVER,                  14860,                              "Near Domain Gossip Stone");
+    locationTable[RC_HF_COW_GROTTO_GOSSIP_STONE] =                                Location::HintStone(RC_HF_COW_GROTTO_GOSSIP_STONE,                                   RCQUEST_BOTH,                                        RCAREA_HYRULE_FIELD,                                       SCENE_GROTTOS,                      14363,                              "Cow Grotto Gossip Stone");
+    locationTable[RC_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE] =                        Location::HintStone(RC_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE,                           RCQUEST_BOTH,                                        RCAREA_HYRULE_FIELD,                                       SCENE_GROTTOS,                      -22944,                             "Near Market Gossip Stone");
+    locationTable[RC_HF_SOUTHEAST_GROTTO_GOSSIP_STONE] =                          Location::HintStone(RC_HF_SOUTHEAST_GROTTO_GOSSIP_STONE,                             RCQUEST_BOTH,                                        RCAREA_HYRULE_FIELD,                                       SCENE_GROTTOS,                      -22978,                             "Southeast Gossip Stone");
+    locationTable[RC_HF_OPEN_GROTTO_GOSSIP_STONE] =                               Location::HintStone(RC_HF_OPEN_GROTTO_GOSSIP_STONE,                                  RCQUEST_BOTH,                                        RCAREA_HYRULE_FIELD,                                       SCENE_GROTTOS,                      -22947,                             "Open Grotto Gossip Stone");
+    locationTable[RC_KAK_OPEN_GROTTO_GOSSIP_STONE] =                              Location::HintStone(RC_KAK_OPEN_GROTTO_GOSSIP_STONE,                                 RCQUEST_BOTH,                                        RCAREA_KAKARIKO_VILLAGE,                                   SCENE_GROTTOS,                      -22984,                             "Open Grotto Gossip Stone");
+    locationTable[RC_ZR_OPEN_GROTTO_GOSSIP_STONE] =                               Location::HintStone(RC_ZR_OPEN_GROTTO_GOSSIP_STONE,                                  RCQUEST_BOTH,                                        RCAREA_ZORAS_RIVER,                                        SCENE_GROTTOS,                      -22985,                             "Open Grotto Gossip Stone");
+    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE] =                     Location::HintStone(RC_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE,                        RCQUEST_BOTH,                                        RCAREA_LOST_WOODS,                                         SCENE_GROTTOS,                      -22964,                             "Near Shortcuts Gossip Stone");
+    locationTable[RC_DMT_STORMS_GROTTO_GOSSIP_STONE] =                            Location::HintStone(RC_DMT_STORMS_GROTTO_GOSSIP_STONE,                               RCQUEST_BOTH,                                        RCAREA_DEATH_MOUNTAIN_TRAIL,                               SCENE_GROTTOS,                      -23255,                             "Storms Grotto Gossip Stone");
+    locationTable[RC_DMC_UPPER_GROTTO_GOSSIP_STONE] =                             Location::HintStone(RC_DMC_UPPER_GROTTO_GOSSIP_STONE,                                RCQUEST_BOTH,                                        RCAREA_DEATH_MOUNTAIN_CRATER,                              SCENE_GROTTOS,                      -23802,                             "Upper Grotto Gossip Stone");
 
     // Other Hints
-    locationTable[RC_GANONDORF_HINT]    =                                         Location::OtherHint(RC_GANONDORF_HINT,                                               RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE,                RCAREA_GANONS_CASTLE,                ACTOR_EN_GANON_MANT,  SCENE_GANON_BOSS,           "Ganondorf Hint");
-    locationTable[RC_SHEIK_HINT_GC]     =                                         Location::OtherHint(RC_SHEIK_HINT_GC,                                                RCQUEST_VANILLA, RCTYPE_GOSSIP_STONE,                RCAREA_GANONS_CASTLE,                ACTOR_EN_XC,          SCENE_INSIDE_GANONS_CASTLE, "Sheik Hint");
-    locationTable[RC_SHEIK_HINT_MQ_GC]  =                                         Location::OtherHint(RC_SHEIK_HINT_MQ_GC,                                             RCQUEST_MQ,      RCTYPE_GOSSIP_STONE,                RCAREA_GANONS_CASTLE,                ACTOR_EN_XC,          SCENE_INSIDE_GANONS_CASTLE, "Sheik Hint");
-    locationTable[RC_DAMPE_HINT]        =                                         Location::OtherHint(RC_DAMPE_HINT,                                                   RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE,                RCAREA_GRAVEYARD,                    ACTOR_ID_MAX,         SCENE_GRAVEKEEPERS_HUT,     "Diary Hint");
-    locationTable[RC_GREG_HINT]         =                                         Location::OtherHint(RC_GREG_HINT,                                                    RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE,                RCAREA_MARKET,                       ACTOR_EN_TAKARA_MAN,  SCENE_TREASURE_BOX_SHOP,    "Greg Hint");
-    locationTable[RC_SARIA_SONG_HINT]   =                                         Location::OtherHint(RC_SARIA_SONG_HINT,                                              RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE,                RCAREA_KOKIRI_FOREST,                ACTOR_ID_MAX,         SCENE_ID_MAX,               "Sarias Song Hint",  "Magic Hint Via Saria's Song");
-    locationTable[RC_ALTAR_HINT_CHILD]  =                                         Location::OtherHint(RC_ALTAR_HINT_CHILD,                                             RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE,                RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_TEMPLE_OF_TIME,       "ToT Child Altar Hint");
-    locationTable[RC_ALTAR_HINT_ADULT]  =                                         Location::OtherHint(RC_ALTAR_HINT_ADULT,                                             RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE,                RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_TEMPLE_OF_TIME,       "ToT Adult Altar Hint");
-    locationTable[RC_FISHING_POLE_HINT] =                                         Location::OtherHint(RC_FISHING_POLE_HINT,                                            RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE,                RCAREA_LAKE_HYLIA,                   ACTOR_FISHING,        SCENE_FISHING_POND,         "Fishing Pole Hint");
-    locationTable[RC_TOT_SHEIK_HINT] =                                            Location::OtherHint(RC_TOT_SHEIK_HINT,                                               RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE,                RCAREA_MARKET,                       ACTOR_EN_XC,          SCENE_TEMPLE_OF_TIME,       "Ocarina of Time Hint");
-        locationTable[RC_MASK_SHOP_HINT] =                                            Location::OtherHint(RC_MASK_SHOP_HINT,                                               RCQUEST_BOTH,    RCTYPE_GOSSIP_STONE,                RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_HAPPY_MASK_SHOP,      "Mask Shop Hint");
+    locationTable[RC_GANONDORF_HINT]    =                                         Location::OtherHint(RC_GANONDORF_HINT,                                               RCQUEST_BOTH,                                                                             ACTOR_EN_GANON_MANT,  SCENE_GANON_BOSS,           "Ganondorf Hint");
+    locationTable[RC_SHEIK_HINT_GC]     =                                         Location::OtherHint(RC_SHEIK_HINT_GC,                                                RCQUEST_VANILLA,                                                                          ACTOR_EN_XC,          SCENE_INSIDE_GANONS_CASTLE, "Sheik Hint");
+    locationTable[RC_SHEIK_HINT_MQ_GC]  =                                         Location::OtherHint(RC_SHEIK_HINT_MQ_GC,                                             RCQUEST_MQ,                                                                               ACTOR_EN_XC,          SCENE_INSIDE_GANONS_CASTLE, "Sheik Hint");
+    locationTable[RC_DAMPE_HINT]        =                                         Location::OtherHint(RC_DAMPE_HINT,                                                   RCQUEST_BOTH,                                                                             ACTOR_ID_MAX,         SCENE_GRAVEKEEPERS_HUT,     "Diary Hint");
+    locationTable[RC_GREG_HINT]         =                                         Location::OtherHint(RC_GREG_HINT,                                                    RCQUEST_BOTH,                                        RCAREA_MARKET,                       ACTOR_EN_TAKARA_MAN,  SCENE_TREASURE_BOX_SHOP,    "Greg Hint");
+    locationTable[RC_SARIA_SONG_HINT]   =                                         Location::OtherHint(RC_SARIA_SONG_HINT,                                              RCQUEST_BOTH,                                        RCAREA_KOKIRI_FOREST,                ACTOR_ID_MAX,         SCENE_ID_MAX,               "Sarias Song Hint", "Magic Hint Via Saria's Song");
+    locationTable[RC_ALTAR_HINT_CHILD]  =                                         Location::OtherHint(RC_ALTAR_HINT_CHILD,                                             RCQUEST_BOTH,                                                                             ACTOR_ID_MAX,         SCENE_TEMPLE_OF_TIME,       "ToT Child Altar Hint");
+    locationTable[RC_ALTAR_HINT_ADULT]  =                                         Location::OtherHint(RC_ALTAR_HINT_ADULT,                                             RCQUEST_BOTH,                                                                             ACTOR_ID_MAX,         SCENE_TEMPLE_OF_TIME,       "ToT Adult Altar Hint");
+    locationTable[RC_FISHING_POLE_HINT] =                                         Location::OtherHint(RC_FISHING_POLE_HINT,                                            RCQUEST_BOTH,                                                                             ACTOR_FISHING,        SCENE_FISHING_POND,         "Fishing Pole Hint");
+    locationTable[RC_TOT_SHEIK_HINT] =                                            Location::OtherHint(RC_TOT_SHEIK_HINT,                                               RCQUEST_BOTH,                                                                             ACTOR_EN_XC,          SCENE_TEMPLE_OF_TIME,       "Ocarina of Time Hint");
+    locationTable[RC_MASK_SHOP_HINT] =                                            Location::OtherHint(RC_MASK_SHOP_HINT,                                               RCQUEST_BOTH,                                                                             ACTOR_ID_MAX,         SCENE_HAPPY_MASK_SHOP,      "Mask Shop Hint");
 
-    locationTable[RC_TRIFORCE_COMPLETED] =                                           Location::Reward(RC_TRIFORCE_COMPLETED,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                                              0x00, "Completed Triforce", "Completed Triforce",    RHT_NONE,                                                        RG_NONE,                              {},                                                     SpoilerCollectionCheck::None(),                                                                                               SpoilerCollectionCheckGroup::GROUP_NO_GROUP);
+    locationTable[RC_TRIFORCE_COMPLETED] =                                             Location::Base(RC_TRIFORCE_COMPLETED,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                               "Completed Triforce", "Completed Triforce",    RHT_NONE,                                                        RG_NONE);
     // clang-format on
 
     // Init locationNameToEnum
diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h
index 304fef213..28cd8dee1 100644
--- a/soh/soh/Enhancements/randomizer/randomizerTypes.h
+++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@@ -247,23 +247,25 @@ typedef enum {
     RCTYPE_COW,                        // Cows
     RCTYPE_ADULT_TRADE,                // Adult trade quest checks
     RCTYPE_FROG_SONG,                  // Frog song purple rupee checks
-    RCTYPE_MAP_COMPASS,                // Maps/Compasses
+    RCTYPE_MAP,                        // Maps
+    RCTYPE_COMPASS,                    // Compasses
     RCTYPE_SMALL_KEY,                  // Small Keys
     RCTYPE_GF_KEY,                     // Gerudo Fortress Keys
     RCTYPE_BOSS_KEY,                   // Boss Keys
     RCTYPE_GANON_BOSS_KEY,             // Ganon's boss key
-    RCTYPE_SHOP,                       // shops
-    RCTYPE_SCRUB,                      // scrubs
-    RCTYPE_MERCHANT,                   // merchants
+    RCTYPE_SHOP,                       // Shops
+    RCTYPE_SCRUB,                      // Scrubs
+    RCTYPE_MERCHANT,                   // Merchants
     RCTYPE_CHEST_GAME,                 // RANDOTODO replace this once we implement it, just using it to exclude for now
     RCTYPE_LINKS_POCKET,               // RANDOTODO this feels hacky, replace with better starting items
     RCTYPE_GOSSIP_STONE,               // RANDOTODO make these into event access
+    RCTYPE_STATIC_HINT,                // RANDOTODO make these into event access
     RCTYPE_SONG_LOCATION,              // Song locations
     RCTYPE_BOSS_HEART_OR_OTHER_REWARD, // Boss heart container or lesser dungeon rewards (lens, ice arrow)
     RCTYPE_DUNGEON_REWARD,             // Dungeon rewards (blue warps)
     RCTYPE_OCARINA,                    // Ocarina locations
     RCTYPE_BEEHIVE,                    // Beehives
-    RCTYPE_FISH,
+    RCTYPE_FISH,                       // Fishes
 } RandomizerCheckType;
 
 typedef enum { RCQUEST_VANILLA, RCQUEST_MQ, RCQUEST_BOTH } RandomizerCheckQuest;
@@ -3651,17 +3653,21 @@ typedef enum {
     RSG_LOGIC,
     RSG_EXCLUDES_KOKIRI_FOREST,
     RSG_EXCLUDES_LOST_WOODS,
+    RSG_EXCLUDES_SACRED_FOREST_MEADOW,
     RSG_EXCLUDES_DEKU_TREE,
     RSG_EXCLUDES_FOREST_TEMPLE,
     RSG_EXCLUDES_KAKARIKO_VILLAGE,
+    RSG_EXCLUDES_GRAVEYARD,
     RSG_EXCLUDES_BOTTOM_OF_THE_WELL,
     RSG_EXCLUDES_SHADOW_TEMPLE,
-    RSG_EXCLUDES_DEATH_MOUNTAIN,
+    RSG_EXCLUDES_DEATH_MOUNTAIN_TRAIL,
+    RSG_EXCLUDES_DEATH_MOUNTAIN_CRATER,
     RSG_EXCLUDES_GORON_CITY,
     RSG_EXCLUDES_DODONGOS_CAVERN,
     RSG_EXCLUDES_FIRE_TEMPLE,
     RSG_EXCLUDES_ZORAS_RIVER,
     RSG_EXCLUDES_ZORAS_DOMAIN,
+    RSG_EXCLUDES_ZORAS_FOUNTAIN,
     RSG_EXCLUDES_JABU_JABU,
     RSG_EXCLUDES_ICE_CAVERN,
     RSG_EXCLUDES_HYRULE_FIELD,
@@ -3669,9 +3675,13 @@ typedef enum {
     RSG_EXCLUDES_LAKE_HYLIA,
     RSG_EXCLUDES_WATER_TEMPLE,
     RSG_EXCLUDES_GERUDO_VALLEY,
+    RSG_EXCLUDES_GERUDO_FORTRESS,
+    RSG_EXCLUDES_HAUNTED_WASTELAND,
+    RSG_EXCLUDES_DESERT_COLOSSUS,
     RSG_EXCLUDES_GERUDO_TRAINING_GROUNDS,
     RSG_EXCLUDES_SPIRIT_TEMPLE,
     RSG_EXCLUDES_HYRULE_CASTLE,
+    RSG_EXCLUDES_MARKET,
     RSG_EXCLUDES_GANONS_CASTLE,
     RSG_EXCLUDES,
     RSG_TRICKS,
diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp
index 3b5eed450..4614a24d1 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp
@@ -143,8 +143,8 @@ void RandomizerCheckObjects::UpdateImGuiVisibility() {
             (location.GetRCType() != RCTYPE_OCARINA ||
              CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleOcarinas"), RO_GENERIC_NO)) && // ocarina locations
             (location.GetRandomizerCheck() != RC_HC_ZELDAS_LETTER) && // don't show until we support shuffling letter
-            (location.GetRCType() !=
-             RCTYPE_GOSSIP_STONE) && // don't show gossip stones (maybe gossipsanity will be a thing eventually?)
+            (location.GetRCType() != RCTYPE_GOSSIP_STONE) && // don't show gossip stones (maybe gossipsanity will be a thing eventually?)
+            (location.GetRCType() != RCTYPE_STATIC_HINT) && // don't show static hints
             (location.GetRCType() != RCTYPE_LINKS_POCKET) && // links pocket can be set to nothing if needed
             (location.GetRCType() !=
              RCTYPE_CHEST_GAME) && // don't show non final reward chest game checks until we support shuffling them
@@ -169,7 +169,7 @@ void RandomizerCheckObjects::UpdateImGuiVisibility() {
              CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleWeirdEgg"), RO_GENERIC_NO)) &&
             (location.GetRCType() != RCTYPE_FROG_SONG ||
              CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleFrogSongRupees"), RO_GENERIC_NO)) &&
-            (location.GetRCType() != RCTYPE_MAP_COMPASS ||
+            ((location.GetRCType() != RCTYPE_MAP && location.GetRCType() != RCTYPE_COMPASS) ||
              CVarGetInteger(CVAR_RANDOMIZER_SETTING("StartingMapsCompasses"), RO_DUNGEON_ITEM_LOC_OWN_DUNGEON) !=
                  RO_DUNGEON_ITEM_LOC_VANILLA) &&
             (location.GetRCType() != RCTYPE_SMALL_KEY ||
diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
index 9a19acde3..33fe121da 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
@@ -734,11 +734,7 @@ void CheckTrackerFlagSet(int16_t flagType, int32_t flag) {
         }
         Rando::SpoilerCollectionCheck scCheck = loc.GetCollectionCheck();
         SpoilerCollectionCheckType scCheckType = scCheck.type;
-        if (checkMatchType == SpoilerCollectionCheckType::SPOILER_CHK_RANDOMIZER_INF &&
-               (scCheckType == SpoilerCollectionCheckType::SPOILER_CHK_SHOP_ITEM ||
-               scCheckType == SpoilerCollectionCheckType::SPOILER_CHK_FISH ||
-               scCheckType == SpoilerCollectionCheckType::SPOILER_CHK_MASTER_SWORD ||
-               scCheckType == SpoilerCollectionCheckType::SPOILER_CHK_RANDOMIZER_INF)) {
+        if (checkMatchType == SpoilerCollectionCheckType::SPOILER_CHK_RANDOMIZER_INF && scCheckType == SpoilerCollectionCheckType::SPOILER_CHK_RANDOMIZER_INF) {
             if (flag == OTRGlobals::Instance->gRandomizer->GetRandomizerInfFromCheck(loc.GetRandomizerCheck())) {
                 SetCheckCollected(loc.GetRandomizerCheck());
                 return;
@@ -1225,6 +1221,7 @@ bool IsCheckShuffled(RandomizerCheck rc) {
         return
             (loc->GetArea() != RCAREA_INVALID) &&         // don't show Invalid locations
             (loc->GetRCType() != RCTYPE_GOSSIP_STONE) &&    //TODO: Don't show hints until tracker supports them
+            (loc->GetRCType() != RCTYPE_STATIC_HINT) &&     //TODO: Don't show hints until tracker supports them
             (loc->GetRCType() != RCTYPE_CHEST_GAME) &&      // don't show non final reward chest game checks until we support shuffling them
             (rc != RC_HC_ZELDAS_LETTER) &&        // don't show zeldas letter until we support shuffling it
             (rc != RC_LINKS_POCKET || showLinksPocket) &&
@@ -1262,7 +1259,7 @@ bool IsCheckShuffled(RandomizerCheck rc) {
             (rc != RC_ZR_MAGIC_BEAN_SALESMAN || showBeans) &&
             (rc != RC_HC_MALON_EGG || showWeirdEgg) &&
             (loc->GetRCType() != RCTYPE_FROG_SONG || showFrogSongRupees) &&
-            (loc->GetRCType() != RCTYPE_MAP_COMPASS || showStartingMapsCompasses) &&
+            ((loc->GetRCType() != RCTYPE_MAP && loc->GetRCType() != RCTYPE_COMPASS) || showStartingMapsCompasses) &&
             (loc->GetRCType() != RCTYPE_SMALL_KEY || showKeysanity) &&
             (loc->GetRCType() != RCTYPE_BOSS_KEY || showBossKeysanity) &&
             (loc->GetRCType() != RCTYPE_GANON_BOSS_KEY || showGanonBossKey) &&
diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
index fd24a77f8..5bbd66d58 100644
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -36,7 +36,7 @@ std::vector<std::string> MultiVecOpts(const std::vector<std::vector<std::string>
     return options;
 }
 
-Settings::Settings() : mExcludeLocationsOptionsGroups(SPOILER_COLLECTION_GROUP_COUNT) {
+Settings::Settings() : mExcludeLocationsOptionsAreas(RCAREA_INVALID) {
 }
 
 void Settings::CreateOptions() {
@@ -217,7 +217,7 @@ void Settings::CreateOptions() {
     mOptions[RSK_DAMAGE_MULTIPLIER] = Option::U8("Damage Multiplier", {"x1/2", "x1", "x2", "x4", "x8", "x16", "OHKO"}, OptionCategory::Setting, "", "", WidgetType::Slider, RO_DAMAGE_MULTIPLIER_DEFAULT);
     // clang-format on
 
-    mExcludeLocationsOptionsGroups.reserve(SPOILER_COLLECTION_GROUP_COUNT);
+    mExcludeLocationsOptionsAreas.reserve(RCAREA_INVALID);
 
     mTrickOptions[RT_ACUTE_ANGLE_CLIP] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED}, true, "Acute angle clip", "Enables locations requiring jumpslash clips through walls which meet at an acute angle.");
     mTrickOptions[RT_ADVANCED_CLIPS] = TrickOption::LogicTrick(RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED}, true, "Advanced clips", "Enables locations requiring clips through walls and objects requiring precise jumps or other tricks.");
@@ -1007,44 +1007,56 @@ void Settings::CreateOptions() {
         &mOptions[RSK_ICE_TRAPS]
     }));
     // TODO: Progressive Goron Sword, Remove Double Defense
-    mOptionGroups[RSG_EXCLUDES_KOKIRI_FOREST] = OptionGroup::SubGroup("Kokiri Forest", mExcludeLocationsOptionsGroups[GROUP_KOKIRI_FOREST], false);
-    mOptionGroups[RSG_EXCLUDES_LOST_WOODS] = OptionGroup::SubGroup("Lost Woods", mExcludeLocationsOptionsGroups[GROUP_LOST_WOODS], false);
-    mOptionGroups[RSG_EXCLUDES_DEKU_TREE] = OptionGroup::SubGroup("Deku Tree", mExcludeLocationsOptionsGroups[GROUP_DUNGEON_DEKU_TREE], false);
-    mOptionGroups[RSG_EXCLUDES_FOREST_TEMPLE] = OptionGroup::SubGroup("Forest Temple", mExcludeLocationsOptionsGroups[GROUP_DUNGEON_FOREST_TEMPLE], false);
-    mOptionGroups[RSG_EXCLUDES_KAKARIKO_VILLAGE] = OptionGroup::SubGroup("Kakariko Village", mExcludeLocationsOptionsGroups[GROUP_KAKARIKO], false);
-    mOptionGroups[RSG_EXCLUDES_BOTTOM_OF_THE_WELL] = OptionGroup::SubGroup("Bottom of the Well", mExcludeLocationsOptionsGroups[GROUP_DUNGEON_BOTTOM_OF_THE_WELL], false);
-    mOptionGroups[RSG_EXCLUDES_SHADOW_TEMPLE] = OptionGroup::SubGroup("Shadow Temple", mExcludeLocationsOptionsGroups[GROUP_DUNGEON_SHADOW_TEMPLE], false);
-    mOptionGroups[RSG_EXCLUDES_DEATH_MOUNTAIN] = OptionGroup::SubGroup("Death Mountain", mExcludeLocationsOptionsGroups[GROUP_DEATH_MOUNTAIN], false);
-    mOptionGroups[RSG_EXCLUDES_GORON_CITY] = OptionGroup::SubGroup("Goron City", mExcludeLocationsOptionsGroups[GROUP_GORON_CITY], false);
-    mOptionGroups[RSG_EXCLUDES_DODONGOS_CAVERN] = OptionGroup::SubGroup("Dodongo's Cavern", mExcludeLocationsOptionsGroups[GROUP_DUNGEON_DODONGOS_CAVERN], false);
-    mOptionGroups[RSG_EXCLUDES_FIRE_TEMPLE] = OptionGroup::SubGroup("Fire Temple", mExcludeLocationsOptionsGroups[GROUP_DUNGEON_FIRE_TEMPLE], false);
-    mOptionGroups[RSG_EXCLUDES_ZORAS_RIVER] = OptionGroup::SubGroup("Zora's River", mExcludeLocationsOptionsGroups[GROUP_ZORAS_RIVER], false);
-    mOptionGroups[RSG_EXCLUDES_ZORAS_DOMAIN] = OptionGroup::SubGroup("Zora's Domain", mExcludeLocationsOptionsGroups[GROUP_ZORAS_DOMAIN], false);
-    mOptionGroups[RSG_EXCLUDES_JABU_JABU] = OptionGroup::SubGroup("Jabu Jabu's Belly", mExcludeLocationsOptionsGroups[GROUP_DUNGEON_JABUJABUS_BELLY], false);
-    mOptionGroups[RSG_EXCLUDES_ICE_CAVERN] = OptionGroup::SubGroup("Ice Cavern", mExcludeLocationsOptionsGroups[GROUP_DUNGEON_ICE_CAVERN], false);
-    mOptionGroups[RSG_EXCLUDES_HYRULE_FIELD] = OptionGroup::SubGroup("Hyrule Field", mExcludeLocationsOptionsGroups[GROUP_HYRULE_FIELD], false);
-    mOptionGroups[RSG_EXCLUDES_LON_LON_RANCH] = OptionGroup::SubGroup("Lon Lon Ranch", mExcludeLocationsOptionsGroups[GROUP_LON_LON_RANCH], false);
-    mOptionGroups[RSG_EXCLUDES_LAKE_HYLIA] = OptionGroup::SubGroup("Lake Hylia", mExcludeLocationsOptionsGroups[GROUP_LAKE_HYLIA], false);
-    mOptionGroups[RSG_EXCLUDES_WATER_TEMPLE] = OptionGroup::SubGroup("Water Temple", mExcludeLocationsOptionsGroups[GROUP_DUNGEON_WATER_TEMPLE], false);
-    mOptionGroups[RSG_EXCLUDES_GERUDO_VALLEY] = OptionGroup::SubGroup("Gerudo Valley", mExcludeLocationsOptionsGroups[GROUP_GERUDO_VALLEY], false);
-    mOptionGroups[RSG_EXCLUDES_GERUDO_TRAINING_GROUNDS] = OptionGroup::SubGroup("Gerudo Training Grounds", mExcludeLocationsOptionsGroups[GROUP_GERUDO_TRAINING_GROUND], false);
-    mOptionGroups[RSG_EXCLUDES_SPIRIT_TEMPLE] = OptionGroup::SubGroup("Spirit Temple", mExcludeLocationsOptionsGroups[GROUP_DUNGEON_SPIRIT_TEMPLE], false);
-    mOptionGroups[RSG_EXCLUDES_HYRULE_CASTLE] = OptionGroup::SubGroup("Hyrule Castle", mExcludeLocationsOptionsGroups[GROUP_HYRULE_CASTLE], false);
-    mOptionGroups[RSG_EXCLUDES_GANONS_CASTLE] = OptionGroup::SubGroup("Ganon's Castle", mExcludeLocationsOptionsGroups[GROUP_DUNGEON_GANONS_CASTLE], false);
+    mOptionGroups[RSG_EXCLUDES_KOKIRI_FOREST] = OptionGroup::SubGroup("Kokiri Forest", mExcludeLocationsOptionsAreas[RCAREA_KOKIRI_FOREST], false);
+    mOptionGroups[RSG_EXCLUDES_LOST_WOODS] = OptionGroup::SubGroup("Lost Woods", mExcludeLocationsOptionsAreas[RCAREA_LOST_WOODS], false);
+    mOptionGroups[RSG_EXCLUDES_SACRED_FOREST_MEADOW] = OptionGroup::SubGroup("Sacred Forest Meadow", mExcludeLocationsOptionsAreas[RCAREA_SACRED_FOREST_MEADOW], false);
+    mOptionGroups[RSG_EXCLUDES_DEKU_TREE] = OptionGroup::SubGroup("Deku Tree", mExcludeLocationsOptionsAreas[RCAREA_DEKU_TREE], false);
+    mOptionGroups[RSG_EXCLUDES_FOREST_TEMPLE] = OptionGroup::SubGroup("Forest Temple", mExcludeLocationsOptionsAreas[RCAREA_FOREST_TEMPLE], false);
+    mOptionGroups[RSG_EXCLUDES_KAKARIKO_VILLAGE] = OptionGroup::SubGroup("Kakariko Village", mExcludeLocationsOptionsAreas[RCAREA_KAKARIKO_VILLAGE], false);
+    mOptionGroups[RSG_EXCLUDES_GRAVEYARD] = OptionGroup::SubGroup("Graveyard", mExcludeLocationsOptionsAreas[RCAREA_GRAVEYARD], false);
+    mOptionGroups[RSG_EXCLUDES_BOTTOM_OF_THE_WELL] = OptionGroup::SubGroup("Bottom of the Well", mExcludeLocationsOptionsAreas[RCAREA_BOTTOM_OF_THE_WELL], false);
+    mOptionGroups[RSG_EXCLUDES_SHADOW_TEMPLE] = OptionGroup::SubGroup("Shadow Temple", mExcludeLocationsOptionsAreas[RCAREA_SHADOW_TEMPLE], false);
+    mOptionGroups[RSG_EXCLUDES_DEATH_MOUNTAIN_TRAIL] = OptionGroup::SubGroup("Death Mountain Trail", mExcludeLocationsOptionsAreas[RCAREA_DEATH_MOUNTAIN_TRAIL], false);
+    mOptionGroups[RSG_EXCLUDES_DEATH_MOUNTAIN_CRATER] = OptionGroup::SubGroup("Death Mountain Crater", mExcludeLocationsOptionsAreas[RCAREA_DEATH_MOUNTAIN_CRATER], false);
+    mOptionGroups[RSG_EXCLUDES_GORON_CITY] = OptionGroup::SubGroup("Goron City", mExcludeLocationsOptionsAreas[RCAREA_GORON_CITY], false);
+    mOptionGroups[RSG_EXCLUDES_DODONGOS_CAVERN] = OptionGroup::SubGroup("Dodongo's Cavern", mExcludeLocationsOptionsAreas[RCAREA_DODONGOS_CAVERN], false);
+    mOptionGroups[RSG_EXCLUDES_FIRE_TEMPLE] = OptionGroup::SubGroup("Fire Temple", mExcludeLocationsOptionsAreas[RCAREA_FIRE_TEMPLE], false);
+    mOptionGroups[RSG_EXCLUDES_ZORAS_RIVER] = OptionGroup::SubGroup("Zora's River", mExcludeLocationsOptionsAreas[RCAREA_ZORAS_RIVER], false);
+    mOptionGroups[RSG_EXCLUDES_ZORAS_DOMAIN] = OptionGroup::SubGroup("Zora's Domain", mExcludeLocationsOptionsAreas[RCAREA_ZORAS_DOMAIN], false);
+    mOptionGroups[RSG_EXCLUDES_ZORAS_FOUNTAIN] = OptionGroup::SubGroup("Zora's Fountain", mExcludeLocationsOptionsAreas[RCAREA_ZORAS_FOUNTAIN], false);
+    mOptionGroups[RSG_EXCLUDES_JABU_JABU] = OptionGroup::SubGroup("Jabu Jabu's Belly", mExcludeLocationsOptionsAreas[RCAREA_JABU_JABUS_BELLY], false);
+    mOptionGroups[RSG_EXCLUDES_ICE_CAVERN] = OptionGroup::SubGroup("Ice Cavern", mExcludeLocationsOptionsAreas[RCAREA_ICE_CAVERN], false);
+    mOptionGroups[RSG_EXCLUDES_HYRULE_FIELD] = OptionGroup::SubGroup("Hyrule Field", mExcludeLocationsOptionsAreas[RCAREA_HYRULE_FIELD], false);
+    mOptionGroups[RSG_EXCLUDES_LON_LON_RANCH] = OptionGroup::SubGroup("Lon Lon Ranch", mExcludeLocationsOptionsAreas[RCAREA_LON_LON_RANCH], false);
+    mOptionGroups[RSG_EXCLUDES_LAKE_HYLIA] = OptionGroup::SubGroup("Lake Hylia", mExcludeLocationsOptionsAreas[RCAREA_LAKE_HYLIA], false);
+    mOptionGroups[RSG_EXCLUDES_WATER_TEMPLE] = OptionGroup::SubGroup("Water Temple", mExcludeLocationsOptionsAreas[RCAREA_WATER_TEMPLE], false);
+    mOptionGroups[RSG_EXCLUDES_GERUDO_VALLEY] = OptionGroup::SubGroup("Gerudo Valley", mExcludeLocationsOptionsAreas[RCAREA_GERUDO_VALLEY], false);
+    mOptionGroups[RSG_EXCLUDES_GERUDO_FORTRESS] = OptionGroup::SubGroup("Gerudo Fortress", mExcludeLocationsOptionsAreas[RCAREA_GERUDO_FORTRESS], false);
+    mOptionGroups[RSG_EXCLUDES_HAUNTED_WASTELAND] = OptionGroup::SubGroup("Haunted Wasteland", mExcludeLocationsOptionsAreas[RCAREA_WASTELAND], false);
+    mOptionGroups[RSG_EXCLUDES_DESERT_COLOSSUS] = OptionGroup::SubGroup("Desert Colossus", mExcludeLocationsOptionsAreas[RCAREA_DESERT_COLOSSUS], false);
+    mOptionGroups[RSG_EXCLUDES_GERUDO_TRAINING_GROUNDS] = OptionGroup::SubGroup("Gerudo Training Grounds", mExcludeLocationsOptionsAreas[RCAREA_GERUDO_TRAINING_GROUND], false);
+    mOptionGroups[RSG_EXCLUDES_SPIRIT_TEMPLE] = OptionGroup::SubGroup("Spirit Temple", mExcludeLocationsOptionsAreas[RCAREA_SPIRIT_TEMPLE], false);
+    mOptionGroups[RSG_EXCLUDES_HYRULE_CASTLE] = OptionGroup::SubGroup("Hyrule Castle", mExcludeLocationsOptionsAreas[RCAREA_HYRULE_CASTLE], false);
+    mOptionGroups[RSG_EXCLUDES_MARKET] = OptionGroup::SubGroup("Market", mExcludeLocationsOptionsAreas[RCAREA_MARKET], false);
+    mOptionGroups[RSG_EXCLUDES_GANONS_CASTLE] = OptionGroup::SubGroup("Ganon's Castle", mExcludeLocationsOptionsAreas[RCAREA_GANONS_CASTLE], false);
     mOptionGroups[RSG_EXCLUDES] = OptionGroup::SubGroup("Exclude Locations", {
         &mOptionGroups[RSG_EXCLUDES_KOKIRI_FOREST],
         &mOptionGroups[RSG_EXCLUDES_LOST_WOODS],
+        &mOptionGroups[RSG_EXCLUDES_SACRED_FOREST_MEADOW],
         &mOptionGroups[RSG_EXCLUDES_DEKU_TREE],
         &mOptionGroups[RSG_EXCLUDES_FOREST_TEMPLE],
         &mOptionGroups[RSG_EXCLUDES_KAKARIKO_VILLAGE],
+        &mOptionGroups[RSG_EXCLUDES_GRAVEYARD],
         &mOptionGroups[RSG_EXCLUDES_BOTTOM_OF_THE_WELL],
         &mOptionGroups[RSG_EXCLUDES_SHADOW_TEMPLE],
-        &mOptionGroups[RSG_EXCLUDES_DEATH_MOUNTAIN],
+        &mOptionGroups[RSG_EXCLUDES_DEATH_MOUNTAIN_TRAIL],
+        &mOptionGroups[RSG_EXCLUDES_DEATH_MOUNTAIN_CRATER],
         &mOptionGroups[RSG_EXCLUDES_GORON_CITY],
         &mOptionGroups[RSG_EXCLUDES_DODONGOS_CAVERN],
         &mOptionGroups[RSG_EXCLUDES_FIRE_TEMPLE],
         &mOptionGroups[RSG_EXCLUDES_ZORAS_RIVER],
         &mOptionGroups[RSG_EXCLUDES_ZORAS_DOMAIN],
+        &mOptionGroups[RSG_EXCLUDES_ZORAS_FOUNTAIN],
         &mOptionGroups[RSG_EXCLUDES_JABU_JABU],
         &mOptionGroups[RSG_EXCLUDES_ICE_CAVERN],
         &mOptionGroups[RSG_EXCLUDES_HYRULE_FIELD],
@@ -1052,9 +1064,13 @@ void Settings::CreateOptions() {
         &mOptionGroups[RSG_EXCLUDES_LAKE_HYLIA],
         &mOptionGroups[RSG_EXCLUDES_WATER_TEMPLE],
         &mOptionGroups[RSG_EXCLUDES_GERUDO_VALLEY],
+        &mOptionGroups[RSG_EXCLUDES_GERUDO_FORTRESS],
+        &mOptionGroups[RSG_EXCLUDES_HAUNTED_WASTELAND],
+        &mOptionGroups[RSG_EXCLUDES_DESERT_COLOSSUS],
         &mOptionGroups[RSG_EXCLUDES_GERUDO_TRAINING_GROUNDS],
         &mOptionGroups[RSG_EXCLUDES_SPIRIT_TEMPLE],
         &mOptionGroups[RSG_EXCLUDES_HYRULE_CASTLE],
+        &mOptionGroups[RSG_EXCLUDES_MARKET],
         &mOptionGroups[RSG_EXCLUDES_GANONS_CASTLE],
     }, false);
     mOptionGroups[RSG_DETAILED_LOGIC] = OptionGroup("Detailed Logic Settings", {
@@ -1267,12 +1283,12 @@ const std::array<Option, RSK_MAX>& Settings::GetAllOptions() const {
     return mOptions;
 }
 
-std::vector<Option *>& Settings::GetExcludeOptionsForGroup(const SpoilerCollectionCheckGroup group) {
-    return mExcludeLocationsOptionsGroups[group];
+std::vector<Option *>& Settings::GetExcludeOptionsForArea(const RandomizerCheckArea area) {
+    return mExcludeLocationsOptionsAreas[area];
 }
 
 const std::vector<std::vector<Option *>>& Settings::GetExcludeLocationsOptions() const {
-    return mExcludeLocationsOptionsGroups;
+    return mExcludeLocationsOptionsAreas;
 }
 
 RandoOptionStartingAge Settings::ResolvedStartingAge() const {
diff --git a/soh/soh/Enhancements/randomizer/settings.h b/soh/soh/Enhancements/randomizer/settings.h
index d0eb43d5e..07041c411 100644
--- a/soh/soh/Enhancements/randomizer/settings.h
+++ b/soh/soh/Enhancements/randomizer/settings.h
@@ -50,12 +50,12 @@ class Settings {
 
     /**
      * @brief Get a list of Location Exclude `Option`s for the given
-     * SpoilerCollectionCheckGroup
+     * RandomizerCheckArea
      *
      * @param group
      * @return std::vector<Option*>&
      */
-    std::vector<Option*>& GetExcludeOptionsForGroup(SpoilerCollectionCheckGroup group);
+    std::vector<Option*>& GetExcludeOptionsForArea(RandomizerCheckArea area);
 
     /**
      * @brief Get a reference to all of the Exclude Location `Option` lists.
@@ -185,7 +185,7 @@ class Settings {
     std::array<std::string, RSK_MAX> mOptionDescriptions = {};
     std::array<OptionGroup, RSG_MAX> mOptionGroups = {};
     std::array<TrickOption, RT_MAX> mTrickOptions = {};
-    std::vector<std::vector<Option*>> mExcludeLocationsOptionsGroups = {};
+    std::vector<std::vector<Option*>> mExcludeLocationsOptionsAreas = {};
     std::unordered_map<std::string, RandomizerSettingKey> mSpoilerfileSettingNameToEnum;
     RandoOptionStartingAge mResolvedStartingAge =  RO_AGE_CHILD;
     RandoOptionLACSCondition mLACSCondition = RO_LACS_VANILLA;
diff --git a/soh/soh/Enhancements/randomizer/static_data.h b/soh/soh/Enhancements/randomizer/static_data.h
index 44e1ff1ff..1a76fd276 100644
--- a/soh/soh/Enhancements/randomizer/static_data.h
+++ b/soh/soh/Enhancements/randomizer/static_data.h
@@ -35,14 +35,14 @@ class StaticData {
       static std::unordered_map<std::string, uint32_t> PopulateTranslationMap(std::unordered_map<uint32_t, CustomMessage> input);
       static std::unordered_map<std::string, uint32_t> PopulateTranslationMap(std::unordered_map<uint32_t, RandomizerHintTextKey> input);
       static std::multimap<std::tuple<s16, s16, s32>, RandomizerCheck> CheckFromActorMultimap;
-      static std::vector<RandomizerCheck> overworldLocations;
+      static std::vector<RandomizerCheck> GetOverworldLocations();
       static std::vector<RandomizerCheck> dungeonRewardLocations;
-      static std::vector<std::vector<RandomizerCheck>> shopLocationLists;
-      static std::vector<RandomizerCheck> scrubLocations;
-      static std::vector<RandomizerCheck> gossipStoneLocations;
-      static std::vector<RandomizerCheck> staticHintLocations;
-      static std::vector<RandomizerCheck> pondFishLocations;
-      static std::vector<RandomizerCheck> overworldFishLocations;
+      static std::vector<RandomizerCheck> GetShopLocations();
+      static std::vector<RandomizerCheck> GetScrubLocations();
+      static std::vector<RandomizerCheck> GetGossipStoneLocations();
+      static std::vector<RandomizerCheck> GetStaticHintLocations();
+      static std::vector<RandomizerCheck> GetPondFishLocations();
+      static std::vector<RandomizerCheck> GetOverworldFishLocations();
       static std::array<std::pair<RandomizerCheck, RandomizerCheck>, 17> randomizerFishingPondFish;
       static std::unordered_map<int8_t, RandomizerCheck> randomizerGrottoFishMap;
       static std::vector<RandomizerHint> oldVerHintOrder;

From e36dcefe54e3877e915c0884f89b5347c43e87ad Mon Sep 17 00:00:00 2001
From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Date: Wed, 2 Oct 2024 17:36:58 +0100
Subject: [PATCH 213/230] Fix seed generation issues caused by Location Table
 changes (#4378)

---
 soh/soh/Enhancements/randomizer/context.cpp | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/context.cpp b/soh/soh/Enhancements/randomizer/context.cpp
index 09a6b40d5..a81295bea 100644
--- a/soh/soh/Enhancements/randomizer/context.cpp
+++ b/soh/soh/Enhancements/randomizer/context.cpp
@@ -188,20 +188,8 @@ void Context::ItemReset() {
 }
 
 void Context::LocationReset() {
-    for (const RandomizerCheck il : allLocations) {
-        GetItemLocation(il)->RemoveFromPool();
-    }
-
-    for (const RandomizerCheck il : StaticData::dungeonRewardLocations) {
-        GetItemLocation(il)->RemoveFromPool();
-    }
-
-    for (const RandomizerCheck il : StaticData::GetGossipStoneLocations()) {
-        GetItemLocation(il)->RemoveFromPool();
-    }
-
-    for (const RandomizerCheck il : StaticData::GetStaticHintLocations()) {
-        GetItemLocation(il)->RemoveFromPool();
+    for (auto& il : itemLocationTable) {
+        il.RemoveFromPool();
     }
 }
 

From 89ca2149b981e81c8dbd3e5c058b90c29696acad Mon Sep 17 00:00:00 2001
From: Angelo Bulfone <boomshroom@users.noreply.github.com>
Date: Wed, 2 Oct 2024 09:37:15 -0700
Subject: [PATCH 214/230] Refactor Fishsanity (#4268)

* Move Fishsanity hooks out of mods.cpp

* Assign fish check flags.

* Clean up location_list for fish

* Prevent fishing from giving double items.

* Remove no-longer-used mPendingFish

* Override draw function for fishing

This allows the draw functions in the source
overlay to match the decomp.

* Override draw function for EnFish

* Overwrite grotto fish params based on respawn data

This allows the randomizer to identify them
automatically without any special logic.

The catch (pun not intended) is that grotto fish don't respawn,
and they were previously identified for such by a params value of 1,
so the logic to take care of that needed to be duplicated.
Thankfully it wasn't very much.

* Add a VB for catching actors in bottles.

* Clean up remaining code after conversion to VB

This breaks fast FastDrops for bottle pickups, though
readding it shouldn't be too hard with the VB hook.

* Remove fishsanityParams from Fishing

It was previously used to track exactly which fish would be
released after a catch, but since both candidate fish
would've been caught, they both wouldn't give checks
anyways.

* Update soh/soh/Enhancements/randomizer/hook_handlers.cpp

Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>

* Re-add FastDrops for bottle pickups.

While this does diverge from the vanilla decomp, I'm uncertain of
the order that hooks are run, so I put it back into z_player.c
just to be safe. A future commit can do a more proper implementation
using VB hooks.

* Move initialisation of fishsanity hooks into hook_handlers

* Change location constructor to take RandomizerInf instead of uint8_t

This shouldn't have an effect as-is, but other changes can add
additional randomizer flags that can end up pushing fishsanity check
flags out of the range of a uint8_t, causing the cast to overflow
and not be stored correctly. With this change, it could still overflow
when writing to the flag field of Location, but said field is unused
and the parameter is really only for setting the flag for the
SpoilerCollectionCheck.

* Render uncaught overworld fish as randomized item

* Fix windows build by zeroing unused field

* Fix scene parameter type

This resolves a build error on Mac and Windows, but Linux
instead buries it in the sea of warnings, meaning I can't
see it until it fails CI.

---------

Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>
---
 .../game-interactor/GameInteractor.h          |   5 +
 soh/soh/Enhancements/mods.cpp                 | 152 ---------------
 .../Enhancements/randomizer/fishsanity.cpp    | 176 +++++++++++++++++-
 soh/soh/Enhancements/randomizer/fishsanity.h  |  45 +++--
 .../Enhancements/randomizer/hook_handlers.cpp |  29 +++
 soh/soh/Enhancements/randomizer/location.cpp  |  14 +-
 soh/soh/Enhancements/randomizer/location.h    |   6 +
 .../Enhancements/randomizer/location_list.cpp |  95 +++++-----
 .../Enhancements/randomizer/randomizer.cpp    |   9 -
 .../overlays/actors/ovl_En_Fish/z_en_fish.c   |  23 ---
 .../overlays/actors/ovl_Fishing/z_fishing.c   |  44 -----
 .../overlays/actors/ovl_Fishing/z_fishing.h   |   1 -
 .../actors/ovl_player_actor/z_player.c        |  66 +------
 13 files changed, 306 insertions(+), 359 deletions(-)

diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h
index f97fe9f26..70fd70267 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h
@@ -421,6 +421,11 @@ typedef enum {
     // Vanilla condition: true
     VB_PHANTOM_GANON_DEATH_SCENE,
     VB_NABOORU_KNUCKLE_DEATH_SCENE,
+
+    /*** Fishsanity ***/
+    // Vanilla condition: Actor is ACTOR_EN_ELF, ACTOR_EN_FISH, ACTOR_EN_ICE_HONO, or ACTOR_EN_INSECT
+    // Opt: *Actor
+    VB_BOTTLE_ACTOR,
 } GIVanillaBehavior;
 
 #ifdef __cplusplus
diff --git a/soh/soh/Enhancements/mods.cpp b/soh/soh/Enhancements/mods.cpp
index 8b3adca0f..a8141ca81 100644
--- a/soh/soh/Enhancements/mods.cpp
+++ b/soh/soh/Enhancements/mods.cpp
@@ -6,7 +6,6 @@
 #include "soh/Enhancements/boss-rush/BossRushTypes.h"
 #include "soh/Enhancements/enhancementTypes.h"
 #include "soh/Enhancements/randomizer/3drando/random.hpp"
-#include "soh/Enhancements/randomizer/fishsanity.h"
 #include "soh/Enhancements/cosmetics/authenticGfxPatches.h"
 #include <soh/Enhancements/item-tables/ItemTableManager.h>
 #include "soh/Enhancements/nametag.h"
@@ -1545,156 +1544,6 @@ void RegisterNoWallet() {
     });
 }
 
-void RegisterFishsanity() {
-    static s16 fishGroupCounter = 0;
-
-    // Initialization on load
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnLoadGame>([](int32_t fileNum) {
-        if (!IS_RANDO) {
-            return;
-        }
-        OTRGlobals::Instance->gRandoContext->GetFishsanity()->InitializeFromSave();
-    });
-
-    // Initialize actors for fishsanity
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorInit>([](void* refActor) {
-        if (!IS_RANDO) {
-            return;
-        }
-
-        Actor* actor = static_cast<Actor*>(refActor);
-        auto fs = OTRGlobals::Instance->gRandoContext->GetFishsanity();
-        FishIdentity fish;
-
-        if (actor->id == ACTOR_EN_FISH && fs->GetOverworldFishShuffled()) {
-            // Set fish ID for ZD fish
-            if (gPlayState->sceneNum == SCENE_ZORAS_DOMAIN && actor->params == -1) {
-                actor->params ^= fishGroupCounter++;
-            }
-
-            fish = OTRGlobals::Instance->gRandomizer->IdentifyFish(gPlayState->sceneNum, actor->params);
-            // Create effect for uncaught fish
-            if (Rando::Fishsanity::IsFish(&fish) && !Flags_GetRandomizerInf(fish.randomizerInf)) {
-                actor->shape.shadowDraw = Fishsanity_DrawEffShadow;
-            }
-            return;
-        }
-
-        if (actor->id == ACTOR_FISHING && gPlayState->sceneNum == SCENE_FISHING_POND && actor->params >= 100 &&
-            actor->params <= 117 && fs->GetPondFishShuffled()) {
-            // Initialize pond fish for fishsanity
-            // Initialize fishsanity metadata on this actor
-            Fishing* fishActor = static_cast<Fishing*>(refActor);
-            fishActor->fishsanityParams = actor->params;
-            fish = OTRGlobals::Instance->gRandomizer->IdentifyFish(gPlayState->sceneNum, actor->params);
-
-            // With every pond fish shuffled, caught fish will not spawn unless all fish have been caught.
-            if (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_FISHSANITY_POND_COUNT) > 16 &&
-                !fs->GetPondCleared()) {
-                // Create effect for uncaught fish
-                if (!Flags_GetRandomizerInf(fish.randomizerInf)) {
-                    actor->shape.shadowDraw = Fishsanity_DrawEffShadow;
-                }
-            }
-        }
-
-    });
-
-    // Update fishsanity when a fish is caught
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnFlagSet>([](int16_t flagType, int16_t flag) {
-        if (!IS_RANDO || flagType != FLAG_RANDOMIZER_INF) {
-            return;
-        }
-        RandomizerCheck rc = OTRGlobals::Instance->gRandomizer->GetCheckFromRandomizerInf((RandomizerInf)flag);
-        FishsanityCheckType fsType = Rando::Fishsanity::GetCheckType(rc);
-        if (fsType == FSC_NONE) {
-            return;
-        }
-
-        // When a pond fish is caught, advance the pond.
-        if (fsType == FSC_POND) {
-            OTRGlobals::Instance->gRandoContext->GetFishsanity()->AdvancePond();
-        }
-    });
-
-    // Award fishing pond checks
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnPlayerUpdate>([]() {
-        if (!IS_RANDO || GameInteractor::IsGameplayPaused() || !gPlayState) {
-            return;
-        }
-
-        Player* player = GET_PLAYER(gPlayState);
-        if (Player_InBlockingCsMode(gPlayState, player)) {
-            return;
-        }
-
-        auto fs = OTRGlobals::Instance->gRandoContext->GetFishsanity();
-        if (!fs->GetPondFishShuffled()) {
-            return;
-        }
-
-        FishIdentity pending = fs->GetPendingFish();
-        if (!Rando::Fishsanity::IsFish(&pending)) { // No fish currently pending
-            return;
-        }
-
-        // Award fish
-        GetItemEntry gi = OTRGlobals::Instance->gRandomizer->GetItemFromKnownCheck(pending.randomizerCheck, GI_NONE);
-        Flags_SetRandomizerInf(pending.randomizerInf);
-        GiveItemEntryWithoutActor(gPlayState, gi);
-        fs->SetPendingFish(NULL);
-    });
-
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* refActor) {
-        if (!IS_RANDO || (gPlayState->sceneNum != SCENE_GROTTOS && gPlayState->sceneNum != SCENE_ZORAS_DOMAIN && gPlayState->sceneNum != SCENE_FISHING_POND)) {
-            return;
-        }
-
-        Actor* actor = static_cast<Actor*>(refActor);
-        auto fs = OTRGlobals::Instance->gRandoContext->GetFishsanity();
-
-        // Detect fish catch
-        if (actor->id == ACTOR_FISHING && fs->GetPondFishShuffled()) {
-            Fishing* fish = static_cast<Fishing*>(refActor);
-
-            // State 6 -> Fish caught and hoisted
-            FishIdentity pending = fs->GetPendingFish();
-            if (fish->fishState == 6 && !Rando::Fishsanity::IsFish(&pending)) {
-                pending = OTRGlobals::Instance->gRandomizer->IdentifyFish(gPlayState->sceneNum, fish->fishsanityParams);
-                if (!Flags_GetRandomizerInf(pending.randomizerInf)) {
-                    fs->SetPendingFish(&pending);
-                    // Remove uncaught effect
-                    if (actor->shape.shadowDraw != NULL) {
-                        actor->shape.shadowDraw = NULL;
-                    }
-                }
-            }
-        }
-
-        if (actor->id == ACTOR_EN_FISH && fs->GetOverworldFishShuffled()) {
-            FishIdentity fish = OTRGlobals::Instance->gRandomizer->IdentifyFish(gPlayState->sceneNum, actor->params);
-            if (Rando::Fishsanity::IsFish(&fish) && Flags_GetRandomizerInf(fish.randomizerInf)) {
-                // Remove uncaught effect
-                if (actor->shape.shadowDraw != NULL) {
-                    actor->shape.shadowDraw = NULL;
-                }
-            }
-        }
-
-        // Reset fish group counter when the group gets culled
-        if (actor->id == ACTOR_OBJ_MURE && gPlayState->sceneNum == SCENE_ZORAS_DOMAIN && fishGroupCounter > 0 &&
-            !(actor->flags & ACTOR_FLAG_UPDATE_WHILE_CULLED) && fs->GetOverworldFishShuffled()) {
-            fishGroupCounter = 0;
-        }
-    });
-
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>([](int16_t sceneNum) {
-        if (!IS_RANDO || sceneNum != SCENE_ZORAS_DOMAIN)
-            return;
-        fishGroupCounter = 0;
-    });
-}
-
 void RegisterInfiniteUpgrades() {
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGameFrameUpdate>([]() {
         if (!IS_RANDO) {
@@ -1819,7 +1668,6 @@ void InitMods() {
     RegisterToTMedallions();
     RegisterNoSwim();
     RegisterNoWallet();
-    RegisterFishsanity();
     RegisterInfiniteUpgrades();
     RegisterRandomizerCompasses();
     NameTag_RegisterHooks();
diff --git a/soh/soh/Enhancements/randomizer/fishsanity.cpp b/soh/soh/Enhancements/randomizer/fishsanity.cpp
index 5c0eda475..793553220 100644
--- a/soh/soh/Enhancements/randomizer/fishsanity.cpp
+++ b/soh/soh/Enhancements/randomizer/fishsanity.cpp
@@ -1,13 +1,24 @@
 #include "3drando/pool_functions.hpp"
 #include "../../OTRGlobals.h"
 #include "fishsanity.h"
+#include "draw.h"
 #include "variables.h"
 #include "functions.h"
 #include "macros.h"
 #include <consolevariablebridge.h>
 
+extern "C" {
+#include "src/overlays/actors/ovl_Fishing/z_fishing.h"
+#include "src/overlays/actors/ovl_En_Fish/z_en_fish.h"
+
+extern SaveContext gSaveContext;
+extern PlayState* gPlayState;
+}
+
 #define FSi OTRGlobals::Instance->gRandoContext->GetFishsanity()
 
+#define RAND_GET_OPTION(option) Rando::Context::GetInstance()->GetOption(option).GetSelectedOptionIndex()
+
 /**
  * @brief Parallel list of pond fish checks for both ages
 */
@@ -40,9 +51,14 @@ std::unordered_map<int8_t, RandomizerCheck> Rando::StaticData::randomizerGrottoF
     { 0x29, RC_ZR_OPEN_GROTTO_FISH }
 };
 
+ActorFunc drawFishing = NULL;
+ActorFunc drawEnFish = NULL;
+Color_RGBA16 fsPulseColor = { 30, 240, 200 };
+
 namespace Rando {
     const FishIdentity Fishsanity::defaultIdentity = { RAND_INF_MAX, RC_UNKNOWN_CHECK };
     bool Fishsanity::fishsanityHelpersInit = false;
+    s16 Fishsanity::fishGroupCounter = 0;
     std::unordered_map<RandomizerCheck, LinkAge> Fishsanity::pondFishAgeMap;
     std::vector<RandomizerCheck> Fishsanity::childPondFish;
     std::vector<RandomizerCheck> Fishsanity::adultPondFish;
@@ -75,7 +91,7 @@ namespace Rando {
         }
         // Are overworld fish enabled, and is this an overworld fish location?
         if (mode != RO_FISHSANITY_POND && (loc->GetScene() == SCENE_GROTTOS || loc->GetScene() == SCENE_ZORAS_DOMAIN)
-            && loc->GetActorID() == ACTOR_EN_FISH && (loc->GetActorParams() == 1 || loc->GetActorParams() < 0)) {
+            && loc->GetActorID() == ACTOR_EN_FISH && (loc->GetActorParams() >> 8)) {
             return true;
         }
         // Must not be an included fish location!
@@ -321,12 +337,136 @@ namespace Rando {
         return GetCheckType(fish->randomizerCheck) != FSC_NONE;
     }
 
-    void Fishsanity::SetPendingFish(FishIdentity* fish) {
-        mPendingFish = fish == NULL ? defaultIdentity : *fish;
+    void Fishsanity::OnActorInitHandler(void* refActor) {
+        Actor* actor = static_cast<Actor*>(refActor);
+
+        auto fs = OTRGlobals::Instance->gRandoContext->GetFishsanity();
+        FishIdentity fish;
+
+        if (actor->id == ACTOR_EN_FISH && fs->GetOverworldFishShuffled()) {
+            // Set fish ID for ZD fish
+            if (gPlayState->sceneNum == SCENE_ZORAS_DOMAIN && actor->params == -1) {
+                actor->params ^= fishGroupCounter++;
+            } else if (gPlayState->sceneNum == SCENE_GROTTOS && actor->params == 1) {
+                actor->params = 0x100 | gSaveContext.respawn[RESPAWN_MODE_RETURN].data;
+            }
+
+            fish = OTRGlobals::Instance->gRandomizer->IdentifyFish(gPlayState->sceneNum, actor->params);
+            // Render fish as randomized item
+            if (Rando::Fishsanity::IsFish(&fish) && !Flags_GetRandomizerInf(fish.randomizerInf)) {
+                if (!drawEnFish) {
+                    drawEnFish = actor->draw;
+                }
+                actor->draw = Fishsanity_DrawEnFish;
+            }
+            return;
+        }
+
+        if (actor->id == ACTOR_FISHING && gPlayState->sceneNum == SCENE_FISHING_POND && actor->params >= 100 &&
+            actor->params <= 117 && fs->GetPondFishShuffled()) {
+            // Initialize pond fish for fishsanity
+            // Initialize fishsanity metadata on this actor
+            Fishing* fishActor = static_cast<Fishing*>(refActor);
+            //fishActor->fishsanityParams = actor->params;
+            fish = OTRGlobals::Instance->gRandomizer->IdentifyFish(gPlayState->sceneNum, actor->params);
+
+            // With every pond fish shuffled, caught fish will not spawn unless all fish have been caught.
+            if (RAND_GET_OPTION(RSK_FISHSANITY_POND_COUNT) > 16 &&
+                !fs->GetPondCleared()) {
+                // Create effect for uncaught fish
+                if (!Flags_GetRandomizerInf(fish.randomizerInf)) {
+                    actor->shape.shadowDraw = Fishsanity_DrawEffShadow;
+                    if (!drawFishing) {
+                        drawFishing = actor->draw;
+                    }
+                    actor->draw = Fishsanity_DrawFishing;
+                }
+            }
+        }
     }
 
-    FishIdentity Fishsanity::GetPendingFish() {
-        return mPendingFish;
+    void Fishsanity::OnFlagSetHandler(int16_t flagType, int16_t flag) {
+        if (flagType != FLAG_RANDOMIZER_INF) {
+            return;
+        }
+        RandomizerCheck rc = OTRGlobals::Instance->gRandomizer->GetCheckFromRandomizerInf((RandomizerInf)flag);
+        FishsanityCheckType fsType = Rando::Fishsanity::GetCheckType(rc);
+        if (fsType == FSC_NONE) {
+            return;
+        }
+
+        // When a pond fish is caught, advance the pond.
+        if (fsType == FSC_POND) {
+            OTRGlobals::Instance->gRandoContext->GetFishsanity()->AdvancePond();
+        }
+    }
+
+    void Fishsanity::OnActorUpdateHandler(void* refActor) {
+        if (gPlayState->sceneNum != SCENE_GROTTOS && gPlayState->sceneNum != SCENE_ZORAS_DOMAIN && gPlayState->sceneNum != SCENE_FISHING_POND) {
+            return;
+        }
+
+        Actor* actor = static_cast<Actor*>(refActor);
+        auto fs = OTRGlobals::Instance->gRandoContext->GetFishsanity();
+
+        // Detect fish catch
+        if (actor->id == ACTOR_FISHING && fs->GetPondFishShuffled()) {
+            Fishing* fish = static_cast<Fishing*>(refActor);
+
+            // State 6 -> Fish caught and hoisted
+            if (fish->fishState == 6) {
+                FishIdentity identity = OTRGlobals::Instance->gRandomizer->IdentifyFish(gPlayState->sceneNum, actor->params);
+                if (identity.randomizerCheck != RC_UNKNOWN_CHECK) {
+                    Flags_SetRandomizerInf(identity.randomizerInf);
+                    // Remove uncaught effect
+                    if (actor->shape.shadowDraw != NULL) {
+                        actor->shape.shadowDraw = NULL;
+                        actor->draw = drawFishing;
+                    }
+                }
+            }
+        }
+
+        if (actor->id == ACTOR_EN_FISH && fs->GetOverworldFishShuffled()) {
+            FishIdentity fish = OTRGlobals::Instance->gRandomizer->IdentifyFish(gPlayState->sceneNum, actor->params);
+            EnFish* fishActor = static_cast<EnFish*>(refActor);
+            if (Rando::Fishsanity::IsFish(&fish) && Flags_GetRandomizerInf(fish.randomizerInf)) {
+                // Reset draw method
+                if (actor->draw == Fishsanity_DrawEnFish) {
+                    actor->draw = drawEnFish;
+                }
+            }
+
+            if (((actor->params >> 8) > 0) && fishActor->respawnTimer > 0) {
+                Actor_Kill(actor);
+            }
+        }
+
+        // Reset fish group counter when the group gets culled
+        if (actor->id == ACTOR_OBJ_MURE && gPlayState->sceneNum == SCENE_ZORAS_DOMAIN && fishGroupCounter > 0 &&
+            !(actor->flags & ACTOR_FLAG_UPDATE_WHILE_CULLED) && fs->GetOverworldFishShuffled()) {
+            fishGroupCounter = 0;
+        }
+    }
+
+    void Fishsanity::OnSceneInitHandler(int16_t sceneNum) {
+        if (sceneNum == SCENE_ZORAS_DOMAIN) {
+            fishGroupCounter = 0;
+        }
+    }
+
+    void Fishsanity::OnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void* refActor) {
+        Actor* actor = static_cast<Actor*>(refActor);
+        auto fs = OTRGlobals::Instance->gRandoContext->GetFishsanity();
+
+        if (id == VB_BOTTLE_ACTOR && actor->id == ACTOR_EN_FISH && fs->GetOverworldFishShuffled()) {
+            FishIdentity fish = OTRGlobals::Instance->gRandomizer->IdentifyFish(gPlayState->sceneNum, actor->params);
+            if (fish.randomizerCheck != RC_UNKNOWN_CHECK && !Flags_GetRandomizerInf(fish.randomizerInf)) {
+                Flags_SetRandomizerInf(fish.randomizerInf);
+                actor->parent = &GET_PLAYER(gPlayState)->actor;
+                *should = false;
+            }
+        }
     }
 } // namespace Rando
 
@@ -344,10 +484,6 @@ extern "C" {
         return FSi->IsAdultPond();
     }
 
-    void Randomizer_SetPendingFish(FishIdentity* fish) {
-        return FSi->SetPendingFish(fish);
-    }
-
     void Fishsanity_DrawEffShadow(Actor* actor, Lights* lights, PlayState* play) {
         Vec3f pos, ripplePos;
         static Vec3f velocity = { 0.0f, 0.0f, 0.0f };
@@ -394,6 +530,28 @@ extern "C" {
         }
     }
 
+    void Fishsanity_DrawEnFish(struct Actor* actor, struct PlayState* play) {
+        FishIdentity fish = OTRGlobals::Instance->gRandomizer->IdentifyFish(play->sceneNum, actor->params);
+        GetItemEntry randoItem = Rando::Context::GetInstance()->GetFinalGIEntry(fish.randomizerCheck, true, GI_FISH);
+        if (CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0)) {
+            randoItem = GET_ITEM_MYSTERY;
+        }
+
+        Matrix_Push();
+        Matrix_Scale(30.0, 30.0, 30.0, MTXMODE_APPLY);
+
+        EnItem00_CustomItemsParticles(actor, play, randoItem);
+        GetItemEntry_Draw(play, randoItem);
+
+        Matrix_Pop();
+    }
+
+    void Fishsanity_DrawFishing(struct Actor* actor, struct PlayState* play) {
+        Fishsanity_OpenGreyscaleColor(play, &fsPulseColor, (actor->params - 100) * 20);
+        drawFishing(actor, play);
+        Fishsanity_CloseGreyscaleColor(play);
+    }
+
     void Fishsanity_OpenGreyscaleColor(PlayState* play, Color_RGBA16* color, int16_t frameOffset) {
         OPEN_DISPS(play->state.gfxCtx);
         gDPSetGrayscaleColor(
diff --git a/soh/soh/Enhancements/randomizer/fishsanity.h b/soh/soh/Enhancements/randomizer/fishsanity.h
index fb1281162..8d6108725 100644
--- a/soh/soh/Enhancements/randomizer/fishsanity.h
+++ b/soh/soh/Enhancements/randomizer/fishsanity.h
@@ -4,6 +4,7 @@
 
 #include <z64.h>
 #include "randomizerTypes.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 typedef struct FishsanityPondOptions {
     u8 mode;
@@ -128,15 +129,34 @@ class Fishsanity {
     FishIdentity AdvancePond();
 
     /**
-     * @brief Set the currently held fish
-     * @param fish Pointer to FishIdentity to copy
+     * @brief ActorInit hook handler for fishsanity
     */
-    void SetPendingFish(FishIdentity* fish);
+    static void OnActorInitHandler(void* refActor);
 
     /**
-     * @brief Get the currently held fish
+     * @brief FlagSet hook handler for fishsanity
     */
-    FishIdentity GetPendingFish();
+    static void OnFlagSetHandler(int16_t flagType, int16_t flag);
+
+    /**
+     * @brief PlayerUpdate hook handler for fishsanity
+    */
+    static void OnPlayerUpdateHandler();
+
+    /**
+     * @brief ActorUpdate hook handler for fishsanity
+    */
+    static void OnActorUpdateHandler(void* refActor);
+
+    /**
+     * @brief SceneInit hook handler for fishsanity
+    */
+    static void OnSceneInitHandler(int16_t sceneNum);
+
+    /**
+     * @brief VB hook handler for fishsanity
+    */
+    static void OnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void* refActor);
 
   private:
     /**
@@ -152,22 +172,19 @@ class Fishsanity {
      * @return The FishIdentity for the described fish
     */
     static FishIdentity GetPondFish(s16 params, bool adultPond);
-    
+
     /**
      * @brief Current pond fish when all pond fish are not randomized
     */
     std::pair<FishIdentity, FishIdentity> mCurrPondFish;
     
-    /**
-     * @brief Identity of the last-caught fish in the fishing pond minigame awaiting reward
-    */
-    FishIdentity mPendingFish;
-    
     /**
      * @brief True if fishsanity helpers have been initialized
     */
     static bool fishsanityHelpersInit;
 
+    static s16 fishGroupCounter;
+
     /////////////////////////////////////////////////////////
     //// Helper data structures derived from static data ////
     /////////////////////////////////////////////////////////
@@ -197,10 +214,12 @@ bool Randomizer_GetPondFishShuffled();
 bool Randomizer_GetOverworldFishShuffled();
 /// Returns true if the adult fishing pond should be used for fishsanity.
 bool Randomizer_IsAdultPond();
-/// Sets the pending fish
-void Randomizer_SetPendingFish(FishIdentity* fish);
 /// Custom shadow draw function to add effect to uncollected fish
 void Fishsanity_DrawEffShadow(Actor* actor, Lights* lights, PlayState* play);
+/// Overriden actor draw function for bottleable fish
+void Fishsanity_DrawEnFish(struct Actor* actor, struct PlayState* play);
+/// Overriden actor draw function for the fishing pond
+void Fishsanity_DrawFishing(struct Actor* actor, struct PlayState* play);
 void Fishsanity_OpenGreyscaleColor(PlayState* play, Color_RGBA16* color, int16_t frameOffset);
 void Fishsanity_CloseGreyscaleColor(PlayState* play);
 #ifdef __cplusplus
diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index eb7d30b87..75e9dd290 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -4,6 +4,7 @@
 #include "soh/Enhancements/custom-message/CustomMessageTypes.h"
 #include "soh/Enhancements/randomizer/randomizerTypes.h"
 #include "soh/Enhancements/randomizer/dungeon.h"
+#include "soh/Enhancements/randomizer/fishsanity.h"
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
@@ -1525,6 +1526,12 @@ void RandomizerRegisterHooks() {
     static uint32_t onSceneInitHook = 0;
     static uint32_t onActorInitHook = 0;
 
+    static uint32_t fishsanityOnActorInitHook = 0;
+    static uint32_t fishsanityOnFlagSetHook = 0;
+    static uint32_t fishsanityOnActorUpdateHook = 0;
+    static uint32_t fishsanityOnSceneInitHook = 0;
+    static uint32_t fishsanityOnVanillaBehaviorHook = 0;
+
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnLoadGame>([](int32_t fileNum) {
         randomizerQueuedChecks = std::queue<RandomizerCheck>();
         randomizerQueuedCheck = RC_UNKNOWN_CHECK;
@@ -1539,6 +1546,12 @@ void RandomizerRegisterHooks() {
         GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(onSceneInitHook);
         GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorInit>(onActorInitHook);
 
+        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorInit>(fishsanityOnActorInitHook);
+        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnFlagSet>(fishsanityOnFlagSetHook);
+        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(fishsanityOnActorUpdateHook);
+        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(fishsanityOnSceneInitHook);
+        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnVanillaBehavior>(fishsanityOnVanillaBehaviorHook);
+
         onFlagSetHook = 0;
         onSceneFlagSetHook = 0;
         onPlayerUpdateForRCQueueHook = 0;
@@ -1548,6 +1561,12 @@ void RandomizerRegisterHooks() {
         onSceneInitHook = 0;
         onActorInitHook = 0;
 
+        fishsanityOnActorInitHook = 0;
+        fishsanityOnFlagSetHook = 0;
+        fishsanityOnActorUpdateHook = 0;
+        fishsanityOnSceneInitHook = 0;
+        fishsanityOnVanillaBehaviorHook = 0;
+
         if (!IS_RANDO) return;
 
         onFlagSetHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnFlagSet>(RandomizerOnFlagSetHandler);
@@ -1558,5 +1577,15 @@ void RandomizerRegisterHooks() {
         onVanillaBehaviorHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnVanillaBehavior>(RandomizerOnVanillaBehaviorHandler);
         onSceneInitHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>(RandomizerOnSceneInitHandler);
         onActorInitHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorInit>(RandomizerOnActorInitHandler);
+
+        if (RAND_GET_OPTION(RSK_FISHSANITY) != RO_FISHSANITY_OFF) {
+            OTRGlobals::Instance->gRandoContext->GetFishsanity()->InitializeFromSave();
+
+            fishsanityOnActorInitHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorInit>(Rando::Fishsanity::OnActorInitHandler);
+            fishsanityOnActorInitHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnFlagSet>(Rando::Fishsanity::OnFlagSetHandler);
+            fishsanityOnActorInitHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>(Rando::Fishsanity::OnActorUpdateHandler);
+            fishsanityOnActorInitHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>(Rando::Fishsanity::OnSceneInitHandler);
+            fishsanityOnActorInitHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnVanillaBehavior>(Rando::Fishsanity::OnVanillaBehaviorHandler);
+        }
     });
 }
diff --git a/soh/soh/Enhancements/randomizer/location.cpp b/soh/soh/Enhancements/randomizer/location.cpp
index 9dfceb5ab..135fddeea 100644
--- a/soh/soh/Enhancements/randomizer/location.cpp
+++ b/soh/soh/Enhancements/randomizer/location.cpp
@@ -353,6 +353,18 @@ Rando::Location Rando::Location::HintStone(RandomizerCheck rc, RandomizerCheckQu
     return { rc, quest_, RCTYPE_GOSSIP_STONE, GetAreaFromScene(scene_), ACTOR_EN_GS, scene_, actorParams_, std::move(shortName_), RHT_NONE, RG_NONE, false };
 }
 
+Rando::Location Rando::Location::Fish(RandomizerCheck rc, RandomizerCheckQuest quest_, ActorID actorId_, SceneID scene_, int32_t actorParams_, RandomizerInf flag_,
+                                      std::string&& shortName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem) {
+    return {rc, quest_, RCTYPE_FISH, GetAreaFromScene(scene_), actorId_, scene_, actorParams_, std::move(shortName_), hintKey, vanillaItem, false,
+            SpoilerCollectionCheck(SPOILER_CHK_RANDOMIZER_INF, scene_, flag_)};
+}
+
+Rando::Location Rando::Location::GrottoFish(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_, int32_t actorParams_, RandomizerInf flag_,
+                                      std::string&& shortName_, RandomizerHintTextKey hintKey) {
+    return {rc, quest_, RCTYPE_FISH, area_, ACTOR_EN_FISH, SCENE_GROTTOS, actorParams_, std::move(shortName_), hintKey, RG_FISH, false,
+            SpoilerCollectionCheck(SPOILER_CHK_RANDOMIZER_INF, SCENE_GROTTOS, flag_)};
+}
+
 Rando::Location Rando::Location::HintStone(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_, SceneID scene_, int32_t actorParams_, std::string&& shortName_) {
     return { rc, quest_, RCTYPE_GOSSIP_STONE, area_, ACTOR_EN_GS, scene_, actorParams_, std::move(shortName_), RHT_NONE, RG_NONE, false };
-}
\ No newline at end of file
+}
diff --git a/soh/soh/Enhancements/randomizer/location.h b/soh/soh/Enhancements/randomizer/location.h
index 393380402..09a015a1e 100644
--- a/soh/soh/Enhancements/randomizer/location.h
+++ b/soh/soh/Enhancements/randomizer/location.h
@@ -160,6 +160,12 @@ class Location {
     static Location GSToken(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_, SceneID scene_, int32_t actorParams_, uint8_t flag_,
                             std::string&& shortName_, RandomizerHintTextKey hintKey, uint8_t skullScene_);
 
+    static Location Fish(RandomizerCheck rc, RandomizerCheckQuest quest_, ActorID actorId_, SceneID scene_, int32_t actorParams_,
+                         RandomizerInf flag_, std::string&& shortName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem);
+
+    static Location GrottoFish(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_, int32_t actorParams_,
+                         RandomizerInf flag_, std::string&& shortName_, RandomizerHintTextKey hintKey);
+
     static Location OtherHint(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_, ActorID actorId_, SceneID scene_, std::string&& shortName_,
                               std::string&& spoilerName_);
 
diff --git a/soh/soh/Enhancements/randomizer/location_list.cpp b/soh/soh/Enhancements/randomizer/location_list.cpp
index 4089e1deb..55fac81d4 100644
--- a/soh/soh/Enhancements/randomizer/location_list.cpp
+++ b/soh/soh/Enhancements/randomizer/location_list.cpp
@@ -948,56 +948,55 @@ void Rando::StaticData::InitLocationTable() { //
        +--------------+ */
 
     // Fishing Pond
-    locationTable[RC_LH_CHILD_FISH_1] =                                                Location::Base(RC_LH_CHILD_FISH_1,                                              RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 100,                                "Child Pond Fish 1",                           RHT_LH_POND_FISH,                                                RG_NONE);
-    locationTable[RC_LH_CHILD_FISH_2] =                                                Location::Base(RC_LH_CHILD_FISH_2,                                              RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 101,                                "Child Pond Fish 2",                           RHT_LH_POND_FISH,                                                RG_NONE);
-    locationTable[RC_LH_CHILD_FISH_3] =                                                Location::Base(RC_LH_CHILD_FISH_3,                                              RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 102,                                "Child Pond Fish 3",                           RHT_LH_POND_FISH,                                                RG_NONE);
-    locationTable[RC_LH_CHILD_FISH_4] =                                                Location::Base(RC_LH_CHILD_FISH_4,                                              RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 103,                                "Child Pond Fish 4",                           RHT_LH_POND_FISH,                                                RG_NONE);
-    locationTable[RC_LH_CHILD_FISH_5] =                                                Location::Base(RC_LH_CHILD_FISH_5,                                              RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 104,                                "Child Pond Fish 5",                           RHT_LH_POND_FISH,                                                RG_NONE);
-    locationTable[RC_LH_CHILD_FISH_6] =                                                Location::Base(RC_LH_CHILD_FISH_6,                                              RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 105,                                "Child Pond Fish 6",                           RHT_LH_POND_FISH,                                                RG_NONE);
-    locationTable[RC_LH_CHILD_FISH_7] =                                                Location::Base(RC_LH_CHILD_FISH_7,                                              RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 106,                                "Child Pond Fish 7",                           RHT_LH_POND_FISH,                                                RG_NONE);
-    locationTable[RC_LH_CHILD_FISH_8] =                                                Location::Base(RC_LH_CHILD_FISH_8,                                              RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 107,                                "Child Pond Fish 8",                           RHT_LH_POND_FISH,                                                RG_NONE);
-    locationTable[RC_LH_CHILD_FISH_9] =                                                Location::Base(RC_LH_CHILD_FISH_9,                                              RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 108,                                "Child Pond Fish 9",                           RHT_LH_POND_FISH,                                                RG_NONE);
-    locationTable[RC_LH_CHILD_FISH_10] =                                               Location::Base(RC_LH_CHILD_FISH_10,                                             RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 109,                                "Child Pond Fish 10",                          RHT_LH_POND_FISH,                                                RG_NONE);
-    locationTable[RC_LH_CHILD_FISH_11] =                                               Location::Base(RC_LH_CHILD_FISH_11,                                             RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 110,                                "Child Pond Fish 11",                          RHT_LH_POND_FISH,                                                RG_NONE);
-    locationTable[RC_LH_CHILD_FISH_12] =                                               Location::Base(RC_LH_CHILD_FISH_12,                                             RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 111,                                "Child Pond Fish 12",                          RHT_LH_POND_FISH,                                                RG_NONE);
-    locationTable[RC_LH_CHILD_FISH_13] =                                               Location::Base(RC_LH_CHILD_FISH_13,                                             RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 112,                                "Child Pond Fish 13",                          RHT_LH_POND_FISH,                                                RG_NONE);
-    locationTable[RC_LH_CHILD_FISH_14] =                                               Location::Base(RC_LH_CHILD_FISH_14,                                             RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 113,                                "Child Pond Fish 14",                          RHT_LH_POND_FISH,                                                RG_NONE);
-    locationTable[RC_LH_CHILD_FISH_15] =                                               Location::Base(RC_LH_CHILD_FISH_15,                                             RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 114,                                "Child Pond Fish 15",                          RHT_LH_POND_FISH,                                                RG_NONE);
-    locationTable[RC_LH_CHILD_LOACH_1] =                                               Location::Base(RC_LH_CHILD_LOACH_1,                                             RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 115,                                "Child Pond Loach 1",                          RHT_LH_HYRULE_LOACH,                                             RG_NONE);
-    locationTable[RC_LH_CHILD_LOACH_2] =                                               Location::Base(RC_LH_CHILD_LOACH_2,                                             RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 116,                                "Child Pond Loach 2",                          RHT_LH_HYRULE_LOACH,                                             RG_NONE);
-    locationTable[RC_LH_ADULT_FISH_1] =                                                Location::Base(RC_LH_ADULT_FISH_1,                                              RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 100,                                "Adult Pond Fish 1",                           RHT_LH_POND_FISH,                                                RG_NONE);
-    locationTable[RC_LH_ADULT_FISH_2] =                                                Location::Base(RC_LH_ADULT_FISH_2,                                              RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 101,                                "Adult Pond Fish 2",                           RHT_LH_POND_FISH,                                                RG_NONE);
-    locationTable[RC_LH_ADULT_FISH_3] =                                                Location::Base(RC_LH_ADULT_FISH_3,                                              RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 102,                                "Adult Pond Fish 3",                           RHT_LH_POND_FISH,                                                RG_NONE);
-    locationTable[RC_LH_ADULT_FISH_4] =                                                Location::Base(RC_LH_ADULT_FISH_4,                                              RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 103,                                "Adult Pond Fish 4",                           RHT_LH_POND_FISH,                                                RG_NONE);
-    locationTable[RC_LH_ADULT_FISH_5] =                                                Location::Base(RC_LH_ADULT_FISH_5,                                              RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 104,                                "Adult Pond Fish 5",                           RHT_LH_POND_FISH,                                                RG_NONE);
-    locationTable[RC_LH_ADULT_FISH_6] =                                                Location::Base(RC_LH_ADULT_FISH_6,                                              RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 105,                                "Adult Pond Fish 6",                           RHT_LH_POND_FISH,                                                RG_NONE);
-    locationTable[RC_LH_ADULT_FISH_7] =                                                Location::Base(RC_LH_ADULT_FISH_7,                                              RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 106,                                "Adult Pond Fish 7",                           RHT_LH_POND_FISH,                                                RG_NONE);
-    locationTable[RC_LH_ADULT_FISH_8] =                                                Location::Base(RC_LH_ADULT_FISH_8,                                              RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 107,                                "Adult Pond Fish 8",                           RHT_LH_POND_FISH,                                                RG_NONE);
-    locationTable[RC_LH_ADULT_FISH_9] =                                                Location::Base(RC_LH_ADULT_FISH_9,                                              RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 108,                                "Adult Pond Fish 9",                           RHT_LH_POND_FISH,                                                RG_NONE);
-    locationTable[RC_LH_ADULT_FISH_10] =                                               Location::Base(RC_LH_ADULT_FISH_10,                                             RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 109,                                "Adult Pond Fish 10",                          RHT_LH_POND_FISH,                                                RG_NONE);
-    locationTable[RC_LH_ADULT_FISH_11] =                                               Location::Base(RC_LH_ADULT_FISH_11,                                             RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 110,                                "Adult Pond Fish 11",                          RHT_LH_POND_FISH,                                                RG_NONE);
-    locationTable[RC_LH_ADULT_FISH_12] =                                               Location::Base(RC_LH_ADULT_FISH_12,                                             RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 111,                                "Adult Pond Fish 12",                          RHT_LH_POND_FISH,                                                RG_NONE);
-    locationTable[RC_LH_ADULT_FISH_13] =                                               Location::Base(RC_LH_ADULT_FISH_13,                                             RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 112,                                "Adult Pond Fish 13",                          RHT_LH_POND_FISH,                                                RG_NONE);
-    locationTable[RC_LH_ADULT_FISH_14] =                                               Location::Base(RC_LH_ADULT_FISH_14,                                             RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 113,                                "Adult Pond Fish 14",                          RHT_LH_POND_FISH,                                                RG_NONE);
-    locationTable[RC_LH_ADULT_FISH_15] =                                               Location::Base(RC_LH_ADULT_FISH_15,                                             RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 114,                                "Adult Pond Fish 15",                          RHT_LH_POND_FISH,                                                RG_NONE);
-    locationTable[RC_LH_ADULT_LOACH] =                                                 Location::Base(RC_LH_ADULT_LOACH,                                               RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 115,                                "Adult Pond Loach",                            RHT_LH_HYRULE_LOACH,                                             RG_NONE);
+    locationTable[RC_LH_CHILD_FISH_1] =                                                Location::Fish(RC_LH_CHILD_FISH_1,                                              RCQUEST_BOTH,                                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 100,      RAND_INF_CHILD_FISH_1,                         "Child Pond Fish 1",           RHT_LH_POND_FISH,                  RG_NONE);
+    locationTable[RC_LH_CHILD_FISH_2] =                                                Location::Fish(RC_LH_CHILD_FISH_2,                                              RCQUEST_BOTH,                                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 101,      RAND_INF_CHILD_FISH_2,                         "Child Pond Fish 2",           RHT_LH_POND_FISH,                  RG_NONE);
+    locationTable[RC_LH_CHILD_FISH_3] =                                                Location::Fish(RC_LH_CHILD_FISH_3,                                              RCQUEST_BOTH,                                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 102,      RAND_INF_CHILD_FISH_3,                         "Child Pond Fish 3",           RHT_LH_POND_FISH,                  RG_NONE);
+    locationTable[RC_LH_CHILD_FISH_4] =                                                Location::Fish(RC_LH_CHILD_FISH_4,                                              RCQUEST_BOTH,                                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 103,      RAND_INF_CHILD_FISH_4,                         "Child Pond Fish 4",           RHT_LH_POND_FISH,                  RG_NONE);
+    locationTable[RC_LH_CHILD_FISH_5] =                                                Location::Fish(RC_LH_CHILD_FISH_5,                                              RCQUEST_BOTH,                                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 104,      RAND_INF_CHILD_FISH_5,                         "Child Pond Fish 5",           RHT_LH_POND_FISH,                  RG_NONE);
+    locationTable[RC_LH_CHILD_FISH_6] =                                                Location::Fish(RC_LH_CHILD_FISH_6,                                              RCQUEST_BOTH,                                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 105,      RAND_INF_CHILD_FISH_6,                         "Child Pond Fish 6",           RHT_LH_POND_FISH,                  RG_NONE);
+    locationTable[RC_LH_CHILD_FISH_7] =                                                Location::Fish(RC_LH_CHILD_FISH_7,                                              RCQUEST_BOTH,                                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 106,      RAND_INF_CHILD_FISH_7,                         "Child Pond Fish 7",           RHT_LH_POND_FISH,                  RG_NONE);
+    locationTable[RC_LH_CHILD_FISH_8] =                                                Location::Fish(RC_LH_CHILD_FISH_8,                                              RCQUEST_BOTH,                                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 107,      RAND_INF_CHILD_FISH_8,                         "Child Pond Fish 8",           RHT_LH_POND_FISH,                  RG_NONE);
+    locationTable[RC_LH_CHILD_FISH_9] =                                                Location::Fish(RC_LH_CHILD_FISH_9,                                              RCQUEST_BOTH,                                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 108,      RAND_INF_CHILD_FISH_9,                         "Child Pond Fish 9",           RHT_LH_POND_FISH,                  RG_NONE);
+    locationTable[RC_LH_CHILD_FISH_10] =                                               Location::Fish(RC_LH_CHILD_FISH_10,                                             RCQUEST_BOTH,                                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 109,      RAND_INF_CHILD_FISH_10,                        "Child Pond Fish 10",          RHT_LH_POND_FISH,                  RG_NONE);
+    locationTable[RC_LH_CHILD_FISH_11] =                                               Location::Fish(RC_LH_CHILD_FISH_11,                                             RCQUEST_BOTH,                                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 110,      RAND_INF_CHILD_FISH_11,                        "Child Pond Fish 11",          RHT_LH_POND_FISH,                  RG_NONE);
+    locationTable[RC_LH_CHILD_FISH_12] =                                               Location::Fish(RC_LH_CHILD_FISH_12,                                             RCQUEST_BOTH,                                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 111,      RAND_INF_CHILD_FISH_12,                        "Child Pond Fish 12",          RHT_LH_POND_FISH,                  RG_NONE);
+    locationTable[RC_LH_CHILD_FISH_13] =                                               Location::Fish(RC_LH_CHILD_FISH_13,                                             RCQUEST_BOTH,                                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 112,      RAND_INF_CHILD_FISH_13,                        "Child Pond Fish 13",          RHT_LH_POND_FISH,                  RG_NONE);
+    locationTable[RC_LH_CHILD_FISH_14] =                                               Location::Fish(RC_LH_CHILD_FISH_14,                                             RCQUEST_BOTH,                                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 113,      RAND_INF_CHILD_FISH_14,                        "Child Pond Fish 14",          RHT_LH_POND_FISH,                  RG_NONE);
+    locationTable[RC_LH_CHILD_FISH_15] =                                               Location::Fish(RC_LH_CHILD_FISH_15,                                             RCQUEST_BOTH,                                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 114,      RAND_INF_CHILD_FISH_15,                        "Child Pond Fish 15",          RHT_LH_POND_FISH,                  RG_NONE);
+    locationTable[RC_LH_CHILD_LOACH_1] =                                               Location::Fish(RC_LH_CHILD_LOACH_1,                                             RCQUEST_BOTH,                                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 115,      RAND_INF_CHILD_LOACH_1,                        "Child Pond Loach 1",          RHT_LH_HYRULE_LOACH,               RG_NONE);
+    locationTable[RC_LH_CHILD_LOACH_2] =                                               Location::Fish(RC_LH_CHILD_LOACH_2,                                             RCQUEST_BOTH,                                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 116,      RAND_INF_CHILD_LOACH_2,                        "Child Pond Loach 2",          RHT_LH_HYRULE_LOACH,               RG_NONE);
+    locationTable[RC_LH_ADULT_FISH_1] =                                                Location::Fish(RC_LH_ADULT_FISH_1,                                              RCQUEST_BOTH,                                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 100,      RAND_INF_ADULT_FISH_1,                         "Adult Pond Fish 1",           RHT_LH_POND_FISH,                  RG_NONE);
+    locationTable[RC_LH_ADULT_FISH_2] =                                                Location::Fish(RC_LH_ADULT_FISH_2,                                              RCQUEST_BOTH,                                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 101,      RAND_INF_ADULT_FISH_2,                         "Adult Pond Fish 2",           RHT_LH_POND_FISH,                  RG_NONE);
+    locationTable[RC_LH_ADULT_FISH_3] =                                                Location::Fish(RC_LH_ADULT_FISH_3,                                              RCQUEST_BOTH,                                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 102,      RAND_INF_ADULT_FISH_3,                         "Adult Pond Fish 3",           RHT_LH_POND_FISH,                  RG_NONE);
+    locationTable[RC_LH_ADULT_FISH_4] =                                                Location::Fish(RC_LH_ADULT_FISH_4,                                              RCQUEST_BOTH,                                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 103,      RAND_INF_ADULT_FISH_4,                         "Adult Pond Fish 4",           RHT_LH_POND_FISH,                  RG_NONE);
+    locationTable[RC_LH_ADULT_FISH_5] =                                                Location::Fish(RC_LH_ADULT_FISH_5,                                              RCQUEST_BOTH,                                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 104,      RAND_INF_ADULT_FISH_5,                         "Adult Pond Fish 5",           RHT_LH_POND_FISH,                  RG_NONE);
+    locationTable[RC_LH_ADULT_FISH_6] =                                                Location::Fish(RC_LH_ADULT_FISH_6,                                              RCQUEST_BOTH,                                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 105,      RAND_INF_ADULT_FISH_6,                         "Adult Pond Fish 6",           RHT_LH_POND_FISH,                  RG_NONE);
+    locationTable[RC_LH_ADULT_FISH_7] =                                                Location::Fish(RC_LH_ADULT_FISH_7,                                              RCQUEST_BOTH,                                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 106,      RAND_INF_ADULT_FISH_7,                         "Adult Pond Fish 7",           RHT_LH_POND_FISH,                  RG_NONE);
+    locationTable[RC_LH_ADULT_FISH_8] =                                                Location::Fish(RC_LH_ADULT_FISH_8,                                              RCQUEST_BOTH,                                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 107,      RAND_INF_ADULT_FISH_8,                         "Adult Pond Fish 8",           RHT_LH_POND_FISH,                  RG_NONE);
+    locationTable[RC_LH_ADULT_FISH_9] =                                                Location::Fish(RC_LH_ADULT_FISH_9,                                              RCQUEST_BOTH,                                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 108,      RAND_INF_ADULT_FISH_9,                         "Adult Pond Fish 9",           RHT_LH_POND_FISH,                  RG_NONE);
+    locationTable[RC_LH_ADULT_FISH_10] =                                               Location::Fish(RC_LH_ADULT_FISH_10,                                             RCQUEST_BOTH,                                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 109,      RAND_INF_ADULT_FISH_10,                        "Adult Pond Fish 10",          RHT_LH_POND_FISH,                  RG_NONE);
+    locationTable[RC_LH_ADULT_FISH_11] =                                               Location::Fish(RC_LH_ADULT_FISH_11,                                             RCQUEST_BOTH,                                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 110,      RAND_INF_ADULT_FISH_11,                        "Adult Pond Fish 11",          RHT_LH_POND_FISH,                  RG_NONE);
+    locationTable[RC_LH_ADULT_FISH_12] =                                               Location::Fish(RC_LH_ADULT_FISH_12,                                             RCQUEST_BOTH,                                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 111,      RAND_INF_ADULT_FISH_12,                        "Adult Pond Fish 12",          RHT_LH_POND_FISH,                  RG_NONE);
+    locationTable[RC_LH_ADULT_FISH_13] =                                               Location::Fish(RC_LH_ADULT_FISH_13,                                             RCQUEST_BOTH,                                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 112,      RAND_INF_ADULT_FISH_13,                        "Adult Pond Fish 13",          RHT_LH_POND_FISH,                  RG_NONE);
+    locationTable[RC_LH_ADULT_FISH_14] =                                               Location::Fish(RC_LH_ADULT_FISH_14,                                             RCQUEST_BOTH,                                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 113,      RAND_INF_ADULT_FISH_14,                        "Adult Pond Fish 14",          RHT_LH_POND_FISH,                  RG_NONE);
+    locationTable[RC_LH_ADULT_FISH_15] =                                               Location::Fish(RC_LH_ADULT_FISH_15,                                             RCQUEST_BOTH,                                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 114,      RAND_INF_ADULT_FISH_15,                        "Adult Pond Fish 15",          RHT_LH_POND_FISH,                  RG_NONE);
+    locationTable[RC_LH_ADULT_LOACH] =                                                 Location::Fish(RC_LH_ADULT_LOACH,                                               RCQUEST_BOTH,                                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 115,      RAND_INF_ADULT_LOACH,                          "Adult Pond Loach",            RHT_LH_HYRULE_LOACH,               RG_NONE);
     // Grotto fish
-    locationTable[RC_KF_STORMS_GROTTO_FISH] =                                          Location::Base(RC_KF_STORMS_GROTTO_FISH,                                        RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_KOKIRI_FOREST,                ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                  "Storms Grotto Fish",                          RHT_KF_STORMS_GROTTO_FISH,                                       RG_FISH);
-    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_FISH] =                                  Location::Base(RC_LW_NEAR_SHORTCUTS_GROTTO_FISH,                                RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_LOST_WOODS,                   ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                  "Near Shortcuts Grotto Fish",                  RHT_LW_NEAR_SHORTCUTS_GROTTO_FISH,                               RG_FISH);
-    locationTable[RC_HF_SOUTHEAST_GROTTO_FISH] =                                       Location::Base(RC_HF_SOUTHEAST_GROTTO_FISH,                                     RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_HYRULE_FIELD,                 ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                  "Southeast Grotto Fish",                       RHT_HF_SOUTHEAST_GROTTO_FISH,                                    RG_FISH);
-    locationTable[RC_HF_OPEN_GROTTO_FISH] =                                            Location::Base(RC_HF_OPEN_GROTTO_FISH,                                          RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_HYRULE_FIELD,                 ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                  "Open Grotto Fish",                            RHT_HF_OPEN_GROTTO_FISH,                                         RG_FISH);
-    locationTable[RC_HF_NEAR_MARKET_GROTTO_FISH] =                                     Location::Base(RC_HF_NEAR_MARKET_GROTTO_FISH,                                   RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_HYRULE_FIELD,                 ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                  "Near Market Grotto Fish",                     RHT_HF_NEAR_MARKET_GROTTO_FISH,                                  RG_FISH);
-    locationTable[RC_KAK_OPEN_GROTTO_FISH] =                                           Location::Base(RC_KAK_OPEN_GROTTO_FISH,                                         RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_KAKARIKO_VILLAGE,             ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                  "Open Grotto Fish",                            RHT_KAK_OPEN_GROTTO_FISH,                                        RG_FISH);
-    locationTable[RC_DMT_STORMS_GROTTO_FISH] =                                         Location::Base(RC_DMT_STORMS_GROTTO_FISH,                                       RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                  "Storms Grotto Fish",                          RHT_DMT_STORMS_GROTTO_FISH,                                      RG_FISH);
-    locationTable[RC_DMC_UPPER_GROTTO_FISH] =                                          Location::Base(RC_DMC_UPPER_GROTTO_FISH,                                        RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                  "Upper Grotto Fish",                           RHT_DMC_UPPER_GROTTO_FISH,                                       RG_FISH);
-    locationTable[RC_ZR_OPEN_GROTTO_FISH] =                                            Location::Base(RC_ZR_OPEN_GROTTO_FISH,                                          RCQUEST_BOTH,    RCTYPE_FISH,                        RCAREA_ZORAS_RIVER,                  ACTOR_EN_FISH,        SCENE_GROTTOS,                      1,                                  "Open Grotto Fish",                            RHT_ZR_OPEN_GROTTO_FISH,                                         RG_FISH);
+    locationTable[RC_KF_STORMS_GROTTO_FISH] =                                          Location::GrottoFish(RC_KF_STORMS_GROTTO_FISH,                                  RCQUEST_BOTH,                                        RCAREA_KOKIRI_FOREST,                                                                          0x12C,    RAND_INF_GROTTO_FISH_KF_STORMS_GROTTO,         "Storms Grotto Fish",          RHT_KF_STORMS_GROTTO_FISH);
+    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_FISH] =                                  Location::GrottoFish(RC_LW_NEAR_SHORTCUTS_GROTTO_FISH,                          RCQUEST_BOTH,                                        RCAREA_LOST_WOODS,                                                                             0x114,    RAND_INF_GROTTO_FISH_LW_NEAR_SHORTCUTS_GROTTO, "Near Shortcuts Grotto Fish",  RHT_LW_NEAR_SHORTCUTS_GROTTO_FISH);
+    locationTable[RC_HF_SOUTHEAST_GROTTO_FISH] =                                       Location::GrottoFish(RC_HF_SOUTHEAST_GROTTO_FISH,                               RCQUEST_BOTH,                                        RCAREA_HYRULE_FIELD,                                                                           0x122,    RAND_INF_GROTTO_FISH_HF_SOUTHEAST_GROTTO,      "Southeast Grotto Fish",       RHT_HF_SOUTHEAST_GROTTO_FISH);
+    locationTable[RC_HF_OPEN_GROTTO_FISH] =                                            Location::GrottoFish(RC_HF_OPEN_GROTTO_FISH,                                    RCQUEST_BOTH,                                        RCAREA_HYRULE_FIELD,                                                                           0x103,    RAND_INF_GROTTO_FISH_HF_OPEN_GROTTO,           "Open Grotto Fish",            RHT_HF_OPEN_GROTTO_FISH);
+    locationTable[RC_HF_NEAR_MARKET_GROTTO_FISH] =                                     Location::GrottoFish(RC_HF_NEAR_MARKET_GROTTO_FISH,                             RCQUEST_BOTH,                                        RCAREA_HYRULE_FIELD,                                                                           0x100,    RAND_INF_GROTTO_FISH_HF_NEAR_MARKET_GROTTO,    "Near Market Grotto Fish",     RHT_HF_NEAR_MARKET_GROTTO_FISH);
+    locationTable[RC_KAK_OPEN_GROTTO_FISH] =                                           Location::GrottoFish(RC_KAK_OPEN_GROTTO_FISH,                                   RCQUEST_BOTH,                                        RCAREA_KAKARIKO_VILLAGE,                                                                       0x128,    RAND_INF_GROTTO_FISH_KAK_OPEN_GROTTO,          "Open Grotto Fish",            RHT_KAK_OPEN_GROTTO_FISH);
+    locationTable[RC_DMT_STORMS_GROTTO_FISH] =                                         Location::GrottoFish(RC_DMT_STORMS_GROTTO_FISH,                                 RCQUEST_BOTH,                                        RCAREA_DEATH_MOUNTAIN_TRAIL,                                                                   0x157,    RAND_INF_GROTTO_FISH_DMT_STORMS_GROTTO,        "Storms Grotto Fish",          RHT_DMT_STORMS_GROTTO_FISH);
+    locationTable[RC_DMC_UPPER_GROTTO_FISH] =                                          Location::GrottoFish(RC_DMC_UPPER_GROTTO_FISH,                                  RCQUEST_BOTH,                                        RCAREA_DEATH_MOUNTAIN_CRATER,                                                                  0x17A,    RAND_INF_GROTTO_FISH_DMC_UPPER_GROTTO,         "Upper Grotto Fish",           RHT_DMC_UPPER_GROTTO_FISH);
+    locationTable[RC_ZR_OPEN_GROTTO_FISH] =                                            Location::GrottoFish(RC_ZR_OPEN_GROTTO_FISH,                                    RCQUEST_BOTH,                                        RCAREA_ZORAS_RIVER,                                                                            0x129,    RAND_INF_GROTTO_FISH_ZR_OPEN_GROTTO,           "Open Grotto Fish",            RHT_ZR_OPEN_GROTTO_FISH);
     // Zora's Domain fish
-    locationTable[RC_ZD_FISH_1] =                                                      Location::Base(RC_ZD_FISH_1,                                                    RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_EN_FISH,        SCENE_ZORAS_DOMAIN,                 -1 ^ 0,                             "Fish 1",                                      RHT_ZD_FISH,                                                     RG_FISH);
-    locationTable[RC_ZD_FISH_2] =                                                      Location::Base(RC_ZD_FISH_2,                                                    RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_EN_FISH,        SCENE_ZORAS_DOMAIN,                 -1 ^ 1,                             "Fish 2",                                      RHT_ZD_FISH,                                                     RG_FISH);
-    locationTable[RC_ZD_FISH_3] =                                                      Location::Base(RC_ZD_FISH_3,                                                    RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_EN_FISH,        SCENE_ZORAS_DOMAIN,                 -1 ^ 2,                             "Fish 3",                                      RHT_ZD_FISH,                                                     RG_FISH);
-    locationTable[RC_ZD_FISH_4] =                                                      Location::Base(RC_ZD_FISH_4,                                                    RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_EN_FISH,        SCENE_ZORAS_DOMAIN,                 -1 ^ 3,                             "Fish 4",                                      RHT_ZD_FISH,                                                     RG_FISH);
-    locationTable[RC_ZD_FISH_5] =                                                      Location::Base(RC_ZD_FISH_5,                                                    RCQUEST_BOTH,    RCTYPE_FISH,                                                             ACTOR_EN_FISH,        SCENE_ZORAS_DOMAIN,                 -1 ^ 4,                             "Fish 5",                                      RHT_ZD_FISH,                                                     RG_FISH);
-
+    locationTable[RC_ZD_FISH_1] =                                                      Location::Fish(RC_ZD_FISH_1,                                                    RCQUEST_BOTH,                                                                             ACTOR_EN_FISH,        SCENE_ZORAS_DOMAIN,                 -1 ^ 0,   RAND_INF_ZD_FISH_1,                            "Fish 1",                      RHT_ZD_FISH,                       RG_FISH);
+    locationTable[RC_ZD_FISH_2] =                                                      Location::Fish(RC_ZD_FISH_2,                                                    RCQUEST_BOTH,                                                                             ACTOR_EN_FISH,        SCENE_ZORAS_DOMAIN,                 -1 ^ 1,   RAND_INF_ZD_FISH_2,                            "Fish 2",                      RHT_ZD_FISH,                       RG_FISH);
+    locationTable[RC_ZD_FISH_3] =                                                      Location::Fish(RC_ZD_FISH_3,                                                    RCQUEST_BOTH,                                                                             ACTOR_EN_FISH,        SCENE_ZORAS_DOMAIN,                 -1 ^ 2,   RAND_INF_ZD_FISH_3,                            "Fish 3",                      RHT_ZD_FISH,                       RG_FISH);
+    locationTable[RC_ZD_FISH_4] =                                                      Location::Fish(RC_ZD_FISH_4,                                                    RCQUEST_BOTH,                                                                             ACTOR_EN_FISH,        SCENE_ZORAS_DOMAIN,                 -1 ^ 3,   RAND_INF_ZD_FISH_4,                            "Fish 4",                      RHT_ZD_FISH,                       RG_FISH);
+    locationTable[RC_ZD_FISH_5] =                                                      Location::Fish(RC_ZD_FISH_5,                                                    RCQUEST_BOTH,                                                                             ACTOR_EN_FISH,        SCENE_ZORAS_DOMAIN,                 -1 ^ 4,   RAND_INF_ZD_FISH_5,                            "Fish 5",                      RHT_ZD_FISH,                       RG_FISH);
 
     // Gossip Stones
     locationTable[RC_DMC_GOSSIP_STONE] =                                          Location::HintStone(RC_DMC_GOSSIP_STONE,                                             RCQUEST_BOTH,                                                                                                   SCENE_DEATH_MOUNTAIN_CRATER,        14341,                              "Gossip Stone");
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index 92b8f3e2f..c5f9849e1 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -1074,15 +1074,6 @@ Rando::Location* Randomizer::GetCheckObjectFromActor(s16 actorId, s16 sceneNum,
                 specialRc = RC_DODONGOS_CAVERN_GOSSIP_STONE;
             }
             break;
-        case SCENE_GROTTOS:
-            // Grotto fish are identified by respawn data
-            if (actorId == ACTOR_EN_FISH && actorParams == 1) {
-                int8_t data = gSaveContext.respawn[RESPAWN_MODE_RETURN].data;
-                if (Rando::StaticData::randomizerGrottoFishMap.contains(data)) {
-                    specialRc = Rando::StaticData::randomizerGrottoFishMap[data];
-                }
-            }
-            break;
     }
 
     if (specialRc != RC_UNKNOWN_CHECK) {
diff --git a/soh/src/overlays/actors/ovl_En_Fish/z_en_fish.c b/soh/src/overlays/actors/ovl_En_Fish/z_en_fish.c
index d2493a47b..c85ef69f5 100644
--- a/soh/src/overlays/actors/ovl_En_Fish/z_en_fish.c
+++ b/soh/src/overlays/actors/ovl_En_Fish/z_en_fish.c
@@ -7,7 +7,6 @@
 #include "z_en_fish.h"
 #include "objects/gameplay_keep/gameplay_keep.h"
 #include "vt.h"
-#include "soh/Enhancements/randomizer/fishsanity.h"
 
 #define FLAGS 0
 
@@ -37,7 +36,6 @@ void EnFish_Unique_SwimIdle(EnFish* this, PlayState* play);
 static Actor* D_80A17010 = NULL;
 static f32 D_80A17014 = 0.0f;
 static f32 D_80A17018 = 0.0f;
-static Color_RGBA16 fsPulseColor = { 30, 240, 200 };
 
 static ColliderJntSphElementInit sJntSphElementsInit[1] = {
     {
@@ -762,31 +760,10 @@ void EnFish_Update(Actor* thisx, PlayState* play) {
     }
 }
 
-// #region SOH [Randomizer]
-s32 EnFish_FishsanityOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                                      void* thisx) {
-    EnFish* this = (EnFish*)thisx;
-    Fishsanity_OpenGreyscaleColor(play, &fsPulseColor, ABS(this->actor.params) * 20);
-    return 0;
-}
-
-void EnFish_FishPostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) {
-    Fishsanity_CloseGreyscaleColor(play);
-}
-// #endregion
-
 void EnFish_Draw(Actor* thisx, PlayState* play) {
     EnFish* this = (EnFish*)thisx;
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
-    // #region SOH [Randomizer]
-    // Modify drawing for uncollected fish, having a shadowDraw implies this is being given uncollected FX
-    if (IS_RANDO && Randomizer_GetOverworldFishShuffled() && this->actor.shape.shadowDraw != NULL) {
-        SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, EnFish_FishsanityOverrideLimbDraw, EnFish_FishPostLimbDraw, this);
-        Collider_UpdateSpheres(0, &this->collider);
-        return;
-    }
-    // #endregion
     SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, NULL, NULL, NULL);
     Collider_UpdateSpheres(0, &this->collider);
 }
\ No newline at end of file
diff --git a/soh/src/overlays/actors/ovl_Fishing/z_fishing.c b/soh/src/overlays/actors/ovl_Fishing/z_fishing.c
index b3be105dd..af9cf01ad 100644
--- a/soh/src/overlays/actors/ovl_Fishing/z_fishing.c
+++ b/soh/src/overlays/actors/ovl_Fishing/z_fishing.c
@@ -15,8 +15,6 @@
 #define FLAGS ACTOR_FLAG_UPDATE_WHILE_CULLED
 
 #define WATER_SURFACE_Y(play) play->colCtx.colHeader->waterBoxes->ySurface
-#define IS_FISHSANITY (IS_RANDO && Randomizer_GetPondFishShuffled())
-#define FISHID(params) (Randomizer_IdentifyFish(play->sceneNum, params))
 bool getShouldSpawnLoaches();
 
 void Fishing_Init(Actor* thisx, PlayState* play);
@@ -433,7 +431,6 @@ static f32 sFishGroupAngle3;
 static FishingEffect sFishingEffects[FISHING_EFFECT_COUNT];
 static Vec3f sStreamSoundProjectedPos;
 static s16 sFishOnHandParams;
-static Color_RGBA16 fsPulseColor = { 30, 240, 200 };
 
 u8 AllHyruleLoaches() {
     return CVarGetInteger(CVAR_ENHANCEMENT("CustomizeFishing"), 0) && CVarGetInteger(CVAR_ENHANCEMENT("AllHyruleLoaches"), 0);
@@ -3998,9 +3995,6 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
                                         sFishOnHandLength = this->fishLength;
                                         sFishOnHandIsLoach = (this->isLoach || AllHyruleLoaches());
                                         sLureCaughtWith = sLureEquipped;
-                                        if (IS_FISHSANITY) {
-                                            sFishOnHandParams = this->fishsanityParams;
-                                        }
                                         Actor_Kill(&this->actor);
                                     } else if (getShouldConfirmKeep() && (this->isLoach == 0 && !AllHyruleLoaches()) && (sFishOnHandIsLoach == 0) &&
                                                ((s16)this->fishLength < (s16)sFishOnHandLength)) {
@@ -4015,11 +4009,6 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
                                         sLureCaughtWith = sLureEquipped;
                                         this->fishLength = lengthTemp;
                                         this->isLoach = loachTemp;
-                                        if (IS_FISHSANITY) {
-                                            s16 paramsTemp = sFishOnHandParams;
-                                            sFishOnHandParams = this->fishsanityParams;
-                                            this->fishsanityParams = paramsTemp;
-                                        }
                                     }
                                 }
                                 if (this->keepState == 0) {
@@ -4040,11 +4029,6 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
                                     sLureCaughtWith = sLureEquipped;
                                     this->fishLength = temp1;
                                     this->isLoach = temp2;
-                                    if (IS_FISHSANITY) {
-                                        s16 paramsTemp = sFishOnHandParams;
-                                        sFishOnHandParams = this->fishsanityParams;
-                                        this->fishsanityParams = paramsTemp;
-                                    }
                                 }
                                 sRodCastState = 0;
                             }
@@ -4310,13 +4294,6 @@ s32 Fishing_FishOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Ve
                                  void* thisx) {
     Fishing* this = (Fishing*)thisx; 
 
-    // #region SOH [Randomizer]
-    // A fish having a shadowDraw implies that it is being given uncollected FX
-    if (IS_FISHSANITY && this->actor.shape.shadowDraw != NULL) {
-        Fishsanity_OpenGreyscaleColor(play, &fsPulseColor, (this->actor.params - 100) * 20);
-    }
-    // #endregion
-
     if (limbIndex == 0xD) {
         rot->z -= this->fishLimbDRotZDelta - 11000;
     } else if ((limbIndex == 2) || (limbIndex == 3)) {
@@ -4339,13 +4316,6 @@ s32 Fishing_FishOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Ve
 void Fishing_FishPostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) {
     Fishing* this = (Fishing*)thisx;
 
-    // #region SOH [Randomizer]
-    // A fish having a shadowDraw implies that it is being given uncollected FX
-    if (IS_FISHSANITY && this->actor.shape.shadowDraw != NULL) {
-        Fishsanity_CloseGreyscaleColor(play);
-    }
-    // #endregion
-
     if (limbIndex == 0xD) {
         Matrix_MultVec3f(&sFishMouthOffset, &this->fishMouthPos);
     }
@@ -4355,13 +4325,6 @@ s32 Fishing_LoachOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, V
                                   void* thisx) {
     Fishing* this = (Fishing*)thisx;
 
-    // #region SOH [Randomizer]
-    // A fish having a shadowDraw implies that it is being given uncollected FX
-    if (IS_FISHSANITY && this->actor.shape.shadowDraw != NULL) {
-        Fishsanity_OpenGreyscaleColor(play, &fsPulseColor, (this->actor.params - 100) * 20);
-    }
-    // #endregion
-
     if (limbIndex == 3) {
         rot->y += this->loachRotYDelta[0];
     } else if (limbIndex == 4) {
@@ -4377,13 +4340,6 @@ void Fishing_LoachPostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3
     static Vec3f sLoachMouthOffset = { 500.0f, 500.0f, 0.0f };
     Fishing* this = (Fishing*)thisx;
 
-    // #region SOH [Randomizer]
-    // A fish having a shadowDraw implies that it is being given uncollected FX
-    if (IS_FISHSANITY && this->actor.shape.shadowDraw != NULL) {
-        Fishsanity_CloseGreyscaleColor(play);
-    }
-    // #endregion
-
     if (limbIndex == 0xB) {
         Matrix_MultVec3f(&sLoachMouthOffset, &this->fishMouthPos);
     }
diff --git a/soh/src/overlays/actors/ovl_Fishing/z_fishing.h b/soh/src/overlays/actors/ovl_Fishing/z_fishing.h
index b128c71a5..c0d478e2a 100644
--- a/soh/src/overlays/actors/ovl_Fishing/z_fishing.h
+++ b/soh/src/overlays/actors/ovl_Fishing/z_fishing.h
@@ -57,7 +57,6 @@ typedef struct Fishing {
     /* 0x0220 */ LightInfo lightInfo;
     /* 0x0230 */ ColliderJntSph collider;
     /* 0x0250 */ ColliderJntSphElement colliderElements[12];
-    /*        */ s16 fishsanityParams;
 } Fishing; // size = 0x0550
 
 #define EN_FISH_OWNER 1      // param for owner of pond. default if params<100
diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c
index 24ff3dd1f..11e896724 100644
--- a/soh/src/overlays/actors/ovl_player_actor/z_player.c
+++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c
@@ -29,7 +29,6 @@
 #include "soh/Enhancements/enhancementTypes.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/Enhancements/randomizer/randomizer_grotto.h"
-#include "soh/Enhancements/randomizer/fishsanity.h"
 #include "soh/frame_interpolation.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
@@ -13955,33 +13954,9 @@ void Player_Action_8084ECA4(Player* this, PlayState* play) {
 
     func_8083721C(this);
 
-    // TODO: Rework the bottle rando code in vanilla behavior overhaul
     if (LinkAnimation_Update(play, &this->skelAnime)) {
         if (this->av1.actionVar1 != 0) {
-            if (IS_RANDO && this->av1.actionVar1 < 0) {
-                rc = this->av2.actionVar2;
-                // Award rando item; this should only give us GI_NONE if something went wrong during the catch setup
-                gi = Randomizer_GetItemFromKnownCheck(rc, GI_NONE);
-                temp = Randomizer_GetRandomizerInfFromCheck(rc);
-                // Either we can't give an item, we can't tell if we've gotten the check, or we have definitely gotten the check
-                if (gi.getItemId == GI_NONE || temp == RAND_INF_MAX || Flags_GetRandomizerInf(temp)) {
-                    this->av1.actionVar1 = 0;
-                    if (this->interactRangeActor != NULL)
-                        this->interactRangeActor->parent = NULL;
-                }
-                // Item get cutscene hasn't played yet
-                else if((this->interactRangeActor == NULL && !(this->stateFlags1 & PLAYER_STATE1_ITEM_OVER_HEAD)) || !Actor_HasParent(this->interactRangeActor, play)) {
-                    // Can't guarantee that whatever we "caught" is actually going to still exist
-                    if (GiveItemEntryWithoutActor(play, gi)) {
-                        // have to set this flag manually to prevent interactRangeActor from being wiped out
-                        this->stateFlags1 |= PLAYER_STATE1_ITEM_OVER_HEAD;
-                        this->pendingFlag.flagID = temp;
-                        this->pendingFlag.flagType = FLAG_RANDOMIZER_INF;
-                        Flags_SetRandomizerInf(temp);
-                    }
-
-                }
-            } else if (this->av2.actionVar2 == 0) {
+            if (this->av2.actionVar2 == 0) {
                 if (CVarGetInteger(CVAR_ENHANCEMENT("FastDrops"), 0)) {
                     this->av1.actionVar1 = 0;
                 } else {
@@ -14017,42 +13992,15 @@ void Player_Action_8084ECA4(Player* this, PlayState* play) {
                             }
                         }
 
-                        if (i < 4) {
+                        if (GameInteractor_Should(VB_BOTTLE_ACTOR, i < 4, this->interactRangeActor)) {
                             this->av1.actionVar1 = i + 1;
                             this->av2.actionVar2 = 0;
                             this->interactRangeActor->parent = &this->actor;
-                            // TODO: this should probably be refactored a bit, maybe rehome some of this to rando instead
-                            if (IS_RANDO) {
-                                // Check if fishsanity applies for this actor
-                                if (Randomizer_GetOverworldFishShuffled()) {
-                                    fish = Randomizer_IdentifyFish(play->sceneNum, this->interactRangeActor->params);
-                                    if (fish.randomizerCheck != RC_UNKNOWN_CHECK && !Flags_GetRandomizerInf(fish.randomizerInf)) {
-                                        gi = Randomizer_GetItemFromKnownCheck(fish.randomizerCheck, GI_FISH);
-                                        rc = fish.randomizerCheck;
-                                        // check if the item is a bottle item anyway
-                                        catchInfo = NULL;
-                                        for (j = 0; j < 4; j++) {
-                                            if (D_80854A04[j].itemId == gi.itemId) {
-                                                catchInfo = &D_80854A04[j];
-                                                break;
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-
-                            // Vanilla behavior/rando gave a bottle item
-                            if (!IS_RANDO || catchInfo != NULL) {
-                                Player_UpdateBottleHeld(play, this, catchInfo->itemId, ABS(catchInfo->itemAction));
-                                if (!CVarGetInteger(CVAR_ENHANCEMENT("FastDrops"), 0)) {
-                                    this->stateFlags1 |= PLAYER_STATE1_IN_ITEM_CS | PLAYER_STATE1_IN_CUTSCENE;
-                                    Player_AnimPlayOnceAdjusted(play, this, sp24->unk_04);
-                                    func_80835EA4(play, 4);
-                                }
-                            } else if (IS_RANDO && gi.itemId != ITEM_NONE) {
-                                // Non-bottle item found from rando, flag for special behavior
-                                this->av1.actionVar1 = -1;
-                                this->av2.actionVar2 = rc;
+                            Player_UpdateBottleHeld(play, this, catchInfo->itemId, ABS(catchInfo->itemAction));
+                            if (!CVarGetInteger(CVAR_ENHANCEMENT("FastDrops"), 0)) {
+                                this->stateFlags1 |= PLAYER_STATE1_IN_ITEM_CS | PLAYER_STATE1_IN_CUTSCENE;
+                                Player_AnimPlayOnceAdjusted(play, this, sp24->unk_04);
+                                func_80835EA4(play, 4);
                             }
                         }
                     }

From b575aaaf9991fd139036e53c835e08829342438d Mon Sep 17 00:00:00 2001
From: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Date: Wed, 2 Oct 2024 12:37:22 -0400
Subject: [PATCH 215/230] simply all loaches logic (#4325)

the previous all loaches logic required modifying every `isLoach` check
throughout the file. this had the benefit of allowing live-toggling all fish
to be loaches or not, but added a lot of complexity.

this changes the logic to just set `isLoach` on each fish instead, and updates the tooltip to note an area reload is required
---
 soh/soh/SohMenuBar.cpp                        |  2 +-
 .../overlays/actors/ovl_Fishing/z_fishing.c   | 32 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/soh/soh/SohMenuBar.cpp b/soh/soh/SohMenuBar.cpp
index 31ef681fc..02adbbc4d 100644
--- a/soh/soh/SohMenuBar.cpp
+++ b/soh/soh/SohMenuBar.cpp
@@ -957,7 +957,7 @@ void DrawEnhancementsMenu() {
                     UIWidgets::PaddedEnhancementSliderInt("Adult Minimum Weight: %d", "##aMinimumWeight", CVAR_ENHANCEMENT("MinimumFishWeightAdult"), 6, 13, "", 13, true, true, false, disabled, disabledTooltip);
                     UIWidgets::Tooltip("The minimum weight for the unique fishing reward as an adult");
                     UIWidgets::PaddedEnhancementCheckbox("All fish are Hyrule Loaches", CVAR_ENHANCEMENT("AllHyruleLoaches"), true, false, disabled, disabledTooltip);
-                    UIWidgets::Tooltip("Every fish in the fishing pond will always be a Hyrule Loach");
+                    UIWidgets::Tooltip("Every fish in the fishing pond will always be a Hyrule Loach\n\nNote: This requires reloading the area");
                     ImGui::EndMenu();
                 }
                 UIWidgets::Spacer(0);
diff --git a/soh/src/overlays/actors/ovl_Fishing/z_fishing.c b/soh/src/overlays/actors/ovl_Fishing/z_fishing.c
index af9cf01ad..63b66a301 100644
--- a/soh/src/overlays/actors/ovl_Fishing/z_fishing.c
+++ b/soh/src/overlays/actors/ovl_Fishing/z_fishing.c
@@ -1021,7 +1021,7 @@ void Fishing_Init(Actor* thisx, PlayState* play2) {
             this->fishState = 10;
             this->fishStateNext = 10;
 
-            this->isLoach = sFishInits[thisx->params - EN_FISH_PARAM].isLoach;
+            this->isLoach = sFishInits[thisx->params - EN_FISH_PARAM].isLoach || AllHyruleLoaches();
             this->perception = sFishInits[thisx->params - EN_FISH_PARAM].perception;
             this->fishLength = sFishInits[thisx->params - EN_FISH_PARAM].baseLength;
 
@@ -2847,7 +2847,7 @@ void Fishing_FishLeapSfx(Fishing* this, u8 outOfWater) {
     s16 sfxId;
     u8 length;
 
-    if (this->isLoach == 0 && !AllHyruleLoaches()) {
+    if (this->isLoach == 0) {
         length = this->fishLength;
     } else {
         length = 2.0f * this->fishLength;
@@ -2992,7 +2992,7 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
     this->actor.uncullZoneForward = 700.0f;
     this->actor.uncullZoneScale = 50.0f;
 
-    if (this->isLoach == 0 && !AllHyruleLoaches()) {
+    if (this->isLoach == 0) {
         playerSpeedMod = (player->actor.speedXZ * 0.15f) + 0.25f;
     } else {
         playerSpeedMod = (player->actor.speedXZ * 0.3f) + 0.25f;
@@ -3054,7 +3054,7 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
 
     Math_ApproachS(&this->fishLimbDRotZDelta, 0, 5, 0x1F4);
 
-    if (this->isLoach == 0 && !AllHyruleLoaches()) {
+    if (this->isLoach == 0) {
         Actor_SetScale(&this->actor, this->fishLength * 15.0f * 0.00001f);
 
         this->fishLimbRotPhase += this->fishLimbRotPhaseStep;
@@ -3223,7 +3223,7 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
             break;
 
         case 1:
-            if (this->isLoach == 1 || AllHyruleLoaches()) {
+            if (this->isLoach == 1) {
                 this->fishState = -1;
                 this->unk_1A4 = 20000;
                 this->unk_1A2 = 20000;
@@ -3376,7 +3376,7 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
 
             if (sLureEquipped == FS_LURE_SINKING) {
                 this->fishTargetPos.y = sLurePos.y;
-            } else if (this->isLoach == 0 && !AllHyruleLoaches()) {
+            } else if (this->isLoach == 0) {
                 this->fishTargetPos.y = sLurePos.y - 15.0f;
             } else {
                 this->fishTargetPos.y = sLurePos.y - 5.0f;
@@ -3451,8 +3451,8 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
             }
             if (getGuaranteeBite() == 1 ||
                 ((this->timerArray[0] == 1) || (Rand_ZeroOne() < chance)) &&
-                ((Rand_ZeroOne() < (this->perception * multiplier)) || (((this->isLoach || AllHyruleLoaches()) + 1) == KREG(69)))) {
-                if (this->isLoach == 0 && !AllHyruleLoaches()) {
+                ((Rand_ZeroOne() < (this->perception * multiplier)) || ((this->isLoach + 1) == KREG(69)))) {
+                if (this->isLoach == 0) {
                     this->fishState = 3;
                     this->unk_190 = 1.2f;
                     this->unk_194 = 5000.0f;
@@ -3673,7 +3673,7 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
                     Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_ENEMY | 0x800);
                     sFishingMusicDelay = 0;
 
-                    if (this->isLoach == 1 || AllHyruleLoaches()) {
+                    if (this->isLoach == 1) {
                         rumbleStrength = (this->fishLength * 3.0f) + 120.0f;
                     } else {
                         rumbleStrength = (2.0f * this->fishLength) + 120.0f;
@@ -3776,7 +3776,7 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
                             Math_ApproachF(&this->actor.speedXZ, 5.0f, 1.0f, 0.5f);
                         }
 
-                        if (this->isLoach == 0 && !AllHyruleLoaches()) {
+                        if (this->isLoach == 0) {
                             sRodReelingSpeed = 1.0f - (this->fishLength * 0.00899f);
                         } else {
                             sRodReelingSpeed = 1.0f - (this->fishLength * 0.00899f * 1.4f);
@@ -3792,7 +3792,7 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
                     this->unk_190 = 1.0f;
                     this->unk_194 = 4500.0f;
 
-                    if (this->isLoach == 0 && !AllHyruleLoaches()) {
+                    if (this->isLoach == 0) {
                         sRodReelingSpeed = 1.3f - (this->fishLength * 0.00899f);
                     } else {
                         sRodReelingSpeed = 1.3f - (this->fishLength * 0.00899f * 1.4f);
@@ -3946,7 +3946,7 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
                 Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_HEART_GET | 0x900);
                 sFishingCaughtTextDelay = 40;
 
-                if (this->isLoach == 0 && !AllHyruleLoaches()) {
+                if (this->isLoach == 0) {
                     sFishLengthToWeigh = this->fishLength;
 
                     if (sFishLengthToWeigh >= 75) {
@@ -3993,10 +3993,10 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
                                 if (play->msgCtx.choiceIndex == 0) {
                                     if (sFishOnHandLength == 0.0f) {
                                         sFishOnHandLength = this->fishLength;
-                                        sFishOnHandIsLoach = (this->isLoach || AllHyruleLoaches());
+                                        sFishOnHandIsLoach = this->isLoach;
                                         sLureCaughtWith = sLureEquipped;
                                         Actor_Kill(&this->actor);
-                                    } else if (getShouldConfirmKeep() && (this->isLoach == 0 && !AllHyruleLoaches()) && (sFishOnHandIsLoach == 0) &&
+                                    } else if (getShouldConfirmKeep() && (this->isLoach == 0) && (sFishOnHandIsLoach == 0) &&
                                                ((s16)this->fishLength < (s16)sFishOnHandLength)) {
                                         this->keepState = 1;
                                         this->timerArray[0] = 0x3C;
@@ -4048,7 +4048,7 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
                     this->unk_194 = 2000.0f;
                     SkelAnime_Free(&this->skelAnime, play);
 
-                    if (this->isLoach == 0 && !AllHyruleLoaches()) {
+                    if (this->isLoach == 0) {
                         SkelAnime_InitFlex(play, &this->skelAnime, &gFishingFishSkel, &gFishingFishAnim, 0, 0, 0);
                         Animation_MorphToLoop(&this->skelAnime, &gFishingFishAnim, 0.0f);
                     } else {
@@ -4356,7 +4356,7 @@ void Fishing_DrawFish(Actor* thisx, PlayState* play) {
     Matrix_RotateZ(((this->unk_164 + this->actor.shape.rot.z) / 32768.0f) * M_PI, MTXMODE_APPLY);
     Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY);
 
-    if (this->isLoach == 0 && !AllHyruleLoaches()) {
+    if (this->isLoach == 0) {
         Matrix_RotateY((this->fishLimb23RotYDelta * (M_PI / 32768)) - (M_PI / 2), MTXMODE_APPLY);
         Matrix_Translate(0.0f, 0.0f, this->fishLimb23RotYDelta * 10.0f * 0.01f, MTXMODE_APPLY);
 

From 7110e40374828cc78ab235db76f418ca8887a180 Mon Sep 17 00:00:00 2001
From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Date: Thu, 3 Oct 2024 00:02:13 +0100
Subject: [PATCH 216/230] Remove UpdateHelpers, massivly speeding up Seed
 generation time (#4366)

* Update helpers removed

* clean up some unused vars

* remove now-misleading comment

* remove redundent timer

* address reviews

* Address commits
---
 .../Enhancements/debugger/performanceTimer.h  |   1 -
 .../randomizer/3drando/location_access.cpp    |  37 +-
 .../randomizer/3drando/location_access.hpp    |   7 +-
 .../locacc_bottom_of_the_well.cpp             |  59 +-
 .../location_access/locacc_castle_town.cpp    |  68 +-
 .../location_access/locacc_death_mountain.cpp | 143 ++--
 .../location_access/locacc_deku_tree.cpp      | 106 +--
 .../locacc_dodongos_cavern.cpp                | 123 ++--
 .../location_access/locacc_fire_temple.cpp    | 125 ++--
 .../location_access/locacc_forest_temple.cpp  |  98 +--
 .../location_access/locacc_ganons_castle.cpp  | 128 ++--
 .../locacc_gerudo_training_grounds.cpp        |  56 +-
 .../location_access/locacc_gerudo_valley.cpp  |  84 +--
 .../location_access/locacc_hyrule_field.cpp   | 182 ++---
 .../location_access/locacc_ice_cavern.cpp     |  52 +-
 .../locacc_jabujabus_belly.cpp                |  54 +-
 .../location_access/locacc_kakariko.cpp       |  82 +--
 .../location_access/locacc_lost_woods.cpp     |  98 +--
 .../location_access/locacc_shadow_temple.cpp  | 104 +--
 .../location_access/locacc_spirit_temple.cpp  | 142 ++--
 .../location_access/locacc_water_temple.cpp   | 116 +--
 .../location_access/locacc_zoras_domain.cpp   |  90 +--
 .../Enhancements/randomizer/3drando/menu.cpp  |   1 -
 .../randomizer/3drando/playthrough.cpp        |   1 -
 soh/soh/Enhancements/randomizer/entrance.cpp  |   1 -
 soh/soh/Enhancements/randomizer/item.cpp      |   2 -
 .../Enhancements/randomizer/item_location.cpp |   2 -
 soh/soh/Enhancements/randomizer/logic.cpp     | 668 ++++++------------
 soh/soh/Enhancements/randomizer/logic.h       | 286 ++------
 .../Enhancements/randomizer/randomizerTypes.h |   1 +
 soh/soh/Enhancements/randomizer/savefile.cpp  |   4 +
 31 files changed, 1235 insertions(+), 1686 deletions(-)

diff --git a/soh/soh/Enhancements/debugger/performanceTimer.h b/soh/soh/Enhancements/debugger/performanceTimer.h
index 842bd91c6..f4bc8f017 100644
--- a/soh/soh/Enhancements/debugger/performanceTimer.h
+++ b/soh/soh/Enhancements/debugger/performanceTimer.h
@@ -8,7 +8,6 @@ typedef enum {
   PT_WHOLE_SEED,
   PT_LOGIC_RESET,
   PT_REGION_RESET,
-  PT_UPDATE_HELPERS,
   PT_SPOILER_LOG,
   PT_ENTRANCE_SHUFFLE,
   PT_SHOPSANITY,
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
index 6fc4c04c9..a22383386 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
@@ -25,7 +25,6 @@ bool LocationAccess::CheckConditionAtAgeTime(bool& age, bool& time) const {
   time = true;
   age = true;
 
-  logic->UpdateHelpers();
   return GetConditionsMet();
 }
 
@@ -54,13 +53,13 @@ bool LocationAccess::CanBuy() const {
   //Check if wallet is large enough to buy item
   bool SufficientWallet = true;
   if (ctx->GetItemLocation(location)->GetPrice() > 500) {
-    SufficientWallet = logic->ProgressiveWallet >= 4;
+    SufficientWallet = logic->HasItem(RG_TYCOON_WALLET);
   } else if (ctx->GetItemLocation(location)->GetPrice() > 200) {
-    SufficientWallet = logic->ProgressiveWallet >= 3;
+    SufficientWallet = logic->HasItem(RG_GIANT_WALLET);
   } else if (ctx->GetItemLocation(location)->GetPrice() > 99) {
-    SufficientWallet = logic->ProgressiveWallet >= 2;
+    SufficientWallet = logic->HasItem(RG_ADULT_WALLET);
   } else if (ctx->GetItemLocation(location)->GetPrice() > 0) {
-    SufficientWallet = logic->ProgressiveWallet >= 1;
+    SufficientWallet = logic->HasItem(RG_CHILD_WALLET);
   }
 
   bool OtherCondition = true;
@@ -68,7 +67,7 @@ bool LocationAccess::CanBuy() const {
   //Need bottle to buy bottle items, only logically relevant bottle items included here
   if (placed == RG_BUY_BLUE_FIRE || placed == RG_BUY_BOTTLE_BUG || placed == RG_BUY_FISH ||
       placed == RG_BUY_FAIRYS_SPIRIT) {
-      OtherCondition = logic->HasBottle;
+      OtherCondition = logic->HasBottle();
   }
 
   return SufficientWallet && OtherCondition;
@@ -239,17 +238,17 @@ bool HasAccessTo(const RandomizerRegion region) {
   return areaTable[region].HasAccess();
 }
 
-Rando::Context* randoCtx;
+Rando::Context* ctx;
 std::shared_ptr<Rando::Logic> logic;
 
 void RegionTable_Init() {
   using namespace Rando;
-  randoCtx = Context::GetInstance().get();
-  logic = randoCtx->GetLogic(); //RANDOTODO do not hardcode, instead allow accepting a Logic class somehow
+  ctx = Context::GetInstance().get();
+  logic = ctx->GetLogic(); //RANDOTODO do not hardcode, instead allow accepting a Logic class somehow
   grottoEvents = {
-      EventAccess(&logic->GossipStoneFairy, { [] { return logic->GossipStoneFairy || logic->CanSummonGossipFairy; } }),
+      EventAccess(&logic->GossipStoneFairy, { [] { return logic->GossipStoneFairy || logic->CallGossipFairy(); } }),
       EventAccess(&logic->ButterflyFairy, { [] { return logic->ButterflyFairy || (logic->CanUse(RG_STICKS)); } }),
-      EventAccess(&logic->BugShrub, { [] { return logic->CanCutShrubs; } }),
+      EventAccess(&logic->BugShrub, { [] { return logic->CanCutShrubs(); } }),
       EventAccess(&logic->LoneFish, { [] { return true; } }),
   };
   //Clear the array from any previous playthrough attempts. This is important so that
@@ -260,7 +259,7 @@ void RegionTable_Init() {
   areaTable[RR_ROOT] = Region("Root", "", RA_LINKS_POCKET, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_LINKS_POCKET,       true),
-                  LOCATION(RC_TRIFORCE_COMPLETED, logic->CanCompleteTriforce),
+                  LOCATION(RC_TRIFORCE_COMPLETED, logic->GetSaveContext()->triforcePiecesCollected >= ctx->GetOption(RSK_TRIFORCE_HUNT_PIECES_REQUIRED).Value<uint8_t>();),
                   LOCATION(RC_SARIA_SONG_HINT,    logic->CanUse(RG_SARIAS_SONG)),
                 }, {
                   //Exits
@@ -272,11 +271,11 @@ void RegionTable_Init() {
                   Entrance(RR_CHILD_SPAWN,             {[]{return logic->IsChild;}}),
                   Entrance(RR_ADULT_SPAWN,             {[]{return logic->IsAdult;}}),
                   Entrance(RR_MINUET_OF_FOREST_WARP,   {[]{return logic->CanUse(RG_MINUET_OF_FOREST);}}),
-                  Entrance(RR_BOLERO_OF_FIRE_WARP,     {[]{return logic->CanUse(RG_BOLERO_OF_FIRE)     && logic->CanLeaveForest;}}),
-                  Entrance(RR_SERENADE_OF_WATER_WARP,  {[]{return logic->CanUse(RG_SERENADE_OF_WATER)  && logic->CanLeaveForest;}}),
-                  Entrance(RR_NOCTURNE_OF_SHADOW_WARP, {[]{return logic->CanUse(RG_NOCTURNE_OF_SHADOW) && logic->CanLeaveForest;}}),
-                  Entrance(RR_REQUIEM_OF_SPIRIT_WARP,  {[]{return logic->CanUse(RG_REQUIEM_OF_SPIRIT)  && logic->CanLeaveForest;}}),
-                  Entrance(RR_PRELUDE_OF_LIGHT_WARP,   {[]{return logic->CanUse(RG_PRELUDE_OF_LIGHT)   && logic->CanLeaveForest;}}),
+                  Entrance(RR_BOLERO_OF_FIRE_WARP,     {[]{return logic->CanUse(RG_BOLERO_OF_FIRE)     && logic->CanLeaveForest();}}),
+                  Entrance(RR_SERENADE_OF_WATER_WARP,  {[]{return logic->CanUse(RG_SERENADE_OF_WATER)  && logic->CanLeaveForest();}}),
+                  Entrance(RR_NOCTURNE_OF_SHADOW_WARP, {[]{return logic->CanUse(RG_NOCTURNE_OF_SHADOW) && logic->CanLeaveForest();}}),
+                  Entrance(RR_REQUIEM_OF_SPIRIT_WARP,  {[]{return logic->CanUse(RG_REQUIEM_OF_SPIRIT)  && logic->CanLeaveForest();}}),
+                  Entrance(RR_PRELUDE_OF_LIGHT_WARP,   {[]{return logic->CanUse(RG_PRELUDE_OF_LIGHT)   && logic->CanLeaveForest();}}),
   });
 
   areaTable[RR_CHILD_SPAWN] = Region("Child Spawn", "", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
@@ -394,7 +393,9 @@ void ReplaceAllInString(std::string& s, std::string const& toReplace, std::strin
 
 std::string CleanCheckConditionString(std::string condition) {
     ReplaceAllInString(condition, "logic->", "");
-    ReplaceAllInString(condition, "randoCtx->", "");
+    ReplaceAllInString(condition, "ctx->", "");
+    ReplaceAllInString(condition, ".Value<uint8_t>()", "");
+    ReplaceAllInString(condition, "GetSaveContext()->", "");
     return condition;
 }
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access.hpp b/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
index d2e060c84..3a257ca0f 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
@@ -12,7 +12,7 @@
 typedef bool (*ConditionFn)();
 
 // I hate this but every alternative I can think of right now is worse
-extern Rando::Context* randoCtx;
+extern Rando::Context* ctx;
 extern std::shared_ptr<Rando::Logic> logic;
 
 class EventAccess {
@@ -53,7 +53,6 @@ public:
       time = true;
       age = true;
 
-      logic->UpdateHelpers();
       return ConditionsMet();
     }
 
@@ -221,14 +220,12 @@ public:
       logic->IsChild = Child();
       logic->IsAdult = Adult();
 
-      //update helpers and check condition as well as having at least child or adult access
-      logic->UpdateHelpers();
+      //heck condition as well as having at least child or adult access
       bool hereVal = condition() && (logic->IsAdult || logic->IsChild);
 
       //set back age variables
       logic->IsChild = pastChild;
       logic->IsAdult = pastAdult;
-      logic->UpdateHelpers();
 
       return hereVal;
     }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_bottom_of_the_well.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_bottom_of_the_well.cpp
index 864ca8785..2e238622f 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_bottom_of_the_well.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_bottom_of_the_well.cpp
@@ -10,38 +10,38 @@ void RegionTable_Init_BottomOfTheWell() {
   ---------------------------*/
   areaTable[RR_BOTTOM_OF_THE_WELL_ENTRYWAY] = Region("Bottom of the Well Entryway", "Bottom of the Well", RA_BOTTOM_OF_THE_WELL, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_BOTTOM_OF_THE_WELL_MAIN_AREA,    {[]{return randoCtx->GetDungeon(Rando::BOTTOM_OF_THE_WELL)->IsVanilla() && logic->IsChild && (logic->CanChildAttack || logic->CanUse(RG_NUTS));}}),
-                  Entrance(RR_BOTTOM_OF_THE_WELL_MQ_PERIMETER, {[]{return randoCtx->GetDungeon(Rando::BOTTOM_OF_THE_WELL)->IsMQ()      && logic->IsChild;}}),
+                  Entrance(RR_BOTTOM_OF_THE_WELL_MAIN_AREA,    {[]{return ctx->GetDungeon(Rando::BOTTOM_OF_THE_WELL)->IsVanilla() && logic->IsChild && (logic->CanAttack() || logic->CanUse(RG_NUTS));}}),
+                  Entrance(RR_BOTTOM_OF_THE_WELL_MQ_PERIMETER, {[]{return ctx->GetDungeon(Rando::BOTTOM_OF_THE_WELL)->IsMQ()      && logic->IsChild;}}),
                   Entrance(RR_KAKARIKO_VILLAGE,                {[]{return true;}}),
   });
 
   /*--------------------------
   |     VANILLA DUNGEON      |
   ---------------------------*/
-  if (randoCtx->GetDungeon(Rando::BOTTOM_OF_THE_WELL)->IsVanilla()) {
+  if (ctx->GetDungeon(Rando::BOTTOM_OF_THE_WELL)->IsVanilla()) {
   areaTable[RR_BOTTOM_OF_THE_WELL_MAIN_AREA] = Region("Bottom of the Well Main Region", "Bottom of the Well", RA_BOTTOM_OF_THE_WELL, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->StickPot, {[]{return true;}}),
                   EventAccess(&logic->NutPot,   {[]{return true;}}),
                 }, {
                   //Locations
-                  LOCATION(RC_BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST,   randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH)),
-                  LOCATION(RC_BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST,  logic->HasExplosives),
-                  LOCATION(RC_BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST, randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH)),
-                  LOCATION(RC_BOTTOM_OF_THE_WELL_COMPASS_CHEST,                randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH)),
-                  LOCATION(RC_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST,       randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH)),
-                  LOCATION(RC_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST,     (randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->HasExplosives),
-                  LOCATION(RC_BOTTOM_OF_THE_WELL_FREESTANDING_KEY,             (logic->Swim || logic->CanUse(RG_ZELDAS_LULLABY)) && logic->CanUse(RG_STICKS) || logic->CanUse(RG_DINS_FIRE)),
-                  LOCATION(RC_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST,          logic->CanUse(RG_ZELDAS_LULLABY) && (logic->KokiriSword || (logic->CanUse(RG_STICKS) && randoCtx->GetTrickOption(RT_BOTW_CHILD_DEADHAND)))),
-                  LOCATION(RC_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST,              logic->CanUse(RG_ZELDAS_LULLABY) && (randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH))),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST,   ctx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH)),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST,  logic->HasExplosives()),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST, ctx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH)),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_COMPASS_CHEST,                ctx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH)),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST,       ctx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH)),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST,     (ctx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->HasExplosives()),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_FREESTANDING_KEY,             (logic->HasItem(RG_BRONZE_SCALE) || logic->CanUse(RG_ZELDAS_LULLABY)) && logic->CanUse(RG_STICKS) || logic->CanUse(RG_DINS_FIRE)),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST,          logic->CanUse(RG_ZELDAS_LULLABY) && (logic->CanUse(RG_KOKIRI_SWORD) || (logic->CanUse(RG_STICKS) && ctx->GetTrickOption(RT_BOTW_CHILD_DEADHAND)))),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST,              logic->CanUse(RG_ZELDAS_LULLABY) && (ctx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH))),
                   LOCATION(RC_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST,       logic->CanUse(RG_ZELDAS_LULLABY)),
                   LOCATION(RC_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST,        logic->CanUse(RG_ZELDAS_LULLABY)),
-                  LOCATION(RC_BOTTOM_OF_THE_WELL_MAP_CHEST,                    logic->HasExplosives || (((logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 3) && (randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH))) || logic->CanUse(RG_DINS_FIRE) || (logic->CanUse(RG_STICKS) && randoCtx->GetTrickOption(RT_BOTW_BASEMENT))) && logic->GoronBracelet)),
-                  LOCATION(RC_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST,             logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 3) && (randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH))),
-                  LOCATION(RC_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST,              logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 3) && (randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH))),
-                  LOCATION(RC_BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM,           logic->Boomerang && (randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 3)),
-                  LOCATION(RC_BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM,           logic->Boomerang && (randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 3)),
-                  LOCATION(RC_BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE,            logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 3) && (randoCtx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->Boomerang),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_MAP_CHEST,                    logic->HasExplosives() || (((logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 3) && (ctx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH))) || logic->CanUse(RG_DINS_FIRE) || (logic->CanUse(RG_STICKS) && ctx->GetTrickOption(RT_BOTW_BASEMENT))) && logic->HasItem(RG_GORONS_BRACELET))),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST,             logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 3) && (ctx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH))),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST,              logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 3) && (ctx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH))),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM,           logic->CanUse(RG_BOOMERANG) && (ctx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 3)),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM,           logic->CanUse(RG_BOOMERANG) && (ctx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 3)),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE,            logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 3) && (ctx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->CanUse(RG_BOOMERANG)),
                 }, {
                   //Exits
                   Entrance(RR_BOTTOM_OF_THE_WELL_ENTRYWAY, {[]{return true;}}),
@@ -51,31 +51,32 @@ void RegionTable_Init_BottomOfTheWell() {
   /*---------------------------
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
-  if (randoCtx->GetDungeon(Rando::BOTTOM_OF_THE_WELL)->IsMQ()) {
+  if (ctx->GetDungeon(Rando::BOTTOM_OF_THE_WELL)->IsMQ()) {
+    //RANDOTODO double check the CanAttacks when rewriting, i assumed CanChildAttack was the only one called because of the initial crawlspace
   areaTable[RR_BOTTOM_OF_THE_WELL_MQ_PERIMETER] = Region("Bottom of the Well MQ Perimeter", "Bottom of the Well", RA_BOTTOM_OF_THE_WELL, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   //EventAccess(&WallFairy, {[]{return WallFairy || logic->Slingshot;}}),
   }, {
                   //Locations
-                  LOCATION(RC_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST,              logic->KokiriSword || (logic->CanUse(RG_STICKS) && randoCtx->GetTrickOption(RT_BOTW_CHILD_DEADHAND))),
-                  LOCATION(RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY, logic->HasExplosives || (randoCtx->GetTrickOption(RT_BOTW_MQ_DEADHAND_KEY) && logic->Boomerang)),
-                    //Trick: logic->HasExplosives || (LogicBotWMQDeadHandKey && logic->Boomerang)
-                  LOCATION(RC_BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT,                logic->CanChildAttack),
-                  LOCATION(RC_BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM,             logic->CanChildAttack && logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 2)),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST,              logic->CanUse(RG_KOKIRI_SWORD) || (logic->CanUse(RG_STICKS) && ctx->GetTrickOption(RT_BOTW_CHILD_DEADHAND))),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY, logic->HasExplosives() || (ctx->GetTrickOption(RT_BOTW_MQ_DEADHAND_KEY) && logic->CanUse(RG_BOOMERANG))),
+                    //Trick: logic->HasExplosives() || (LogicBotWMQDeadHandKey && logic->CanUse(RG_BOOMERANG))
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT,                logic->CanAttack()),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM,             logic->CanAttack() && logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 2)),
   }, {
                   //Exits
                   Entrance(RR_BOTTOM_OF_THE_WELL_ENTRYWAY,  {[]{return true;}}),
-                  Entrance(RR_BOTTOM_OF_THE_WELL_MQ_MIDDLE, {[]{return logic->CanUse(RG_ZELDAS_LULLABY) || (randoCtx->GetTrickOption(RT_BOTW_MQ_PITS) && logic->HasExplosives);}}),
-                    //Trick: logic->CanUse(RG_ZELDAS_LULLABY) || (LogicBotWMQPits && logic->HasExplosives)
+                  Entrance(RR_BOTTOM_OF_THE_WELL_MQ_MIDDLE, {[]{return logic->CanUse(RG_ZELDAS_LULLABY) || (ctx->GetTrickOption(RT_BOTW_MQ_PITS) && logic->HasExplosives());}}),
+                    //Trick: logic->CanUse(RG_ZELDAS_LULLABY) || (LogicBotWMQPits && logic->HasExplosives())
   });
 
   areaTable[RR_BOTTOM_OF_THE_WELL_MQ_MIDDLE] = Region("Bottom of the Well MQ Middle", "Bottom of the Well", RA_BOTTOM_OF_THE_WELL, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_BOTTOM_OF_THE_WELL_MQ_MAP_CHEST,                        true),
-                  LOCATION(RC_BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST,              logic->HasExplosives && logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 2)),
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST,              logic->HasExplosives() && logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 2)),
                   LOCATION(RC_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY, true),
-                  LOCATION(RC_BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM,               logic->CanChildAttack && (randoCtx->GetTrickOption(RT_BOTW_MQ_PITS) || logic->HasExplosives)),
-                    //Trick: logic->CanChildAttack && (LogicBotWMQPits || logic->HasExplosives)
+                  LOCATION(RC_BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM,               logic->CanAttack() && (ctx->GetTrickOption(RT_BOTW_MQ_PITS) || logic->HasExplosives())),
+                    //Trick: logic->CanChildAttack && (LogicBotWMQPits || logic->HasExplosives())
   }, {
                   //Exits
                   Entrance(RR_BOTTOM_OF_THE_WELL_MQ_PERIMETER, {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
index d59be8360..868e231ae 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
@@ -35,7 +35,7 @@ void RegionTable_Init_CastleTown() {
 
   areaTable[RR_TOT_ENTRANCE] = Region("ToT Entrance", "ToT Entrance", RA_THE_MARKET, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CanSummonGossipFairyWithoutSuns;}}),
+                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CallGossipFairyExceptSuns();}}),
                 }, {
                   //Locations
                   LOCATION(RC_TOT_LEFTMOST_GOSSIP_STONE,     true),
@@ -50,14 +50,14 @@ void RegionTable_Init_CastleTown() {
 
   areaTable[RR_TEMPLE_OF_TIME] = Region("Temple of Time", "Temple of Time", RA_TEMPLE_OF_TIME, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_TOT_LIGHT_ARROWS_CUTSCENE, logic->IsAdult && logic->CanTriggerLACS),
+                  LOCATION(RC_TOT_LIGHT_ARROWS_CUTSCENE, logic->IsAdult && logic->CanTriggerLACS()),
                   LOCATION(RC_ALTAR_HINT_CHILD,          logic->IsChild),
                   LOCATION(RC_ALTAR_HINT_ADULT,          logic->IsAdult),
                   LOCATION(RC_TOT_SHEIK_HINT,            logic->IsAdult),
                 }, {
                   //Exits
                   Entrance(RR_TOT_ENTRANCE,            {[]{return true;}}),
-                  Entrance(RR_TOT_BEYOND_DOOR_OF_TIME, {[]{return randoCtx->GetOption(RSK_DOOR_OF_TIME).Is(RO_DOOROFTIME_OPEN) || (logic->CanUse(RG_SONG_OF_TIME) && (randoCtx->GetOption(RSK_DOOR_OF_TIME).Is(RO_DOOROFTIME_SONGONLY) || (logic->HasAllStones && logic->OcarinaOfTime)));}}),
+                  Entrance(RR_TOT_BEYOND_DOOR_OF_TIME, {[]{return ctx->GetOption(RSK_DOOR_OF_TIME).Is(RO_DOOROFTIME_OPEN) || (logic->CanUse(RG_SONG_OF_TIME) && (ctx->GetOption(RSK_DOOR_OF_TIME).Is(RO_DOOROFTIME_SONGONLY) || (logic->StoneCount() == 3 && logic->HasItem(RG_OCARINA_OF_TIME))));}}),
   });
 
   areaTable[RR_TOT_BEYOND_DOOR_OF_TIME] = Region("Beyond Door of Time", "Beyond Door of Time", RA_TEMPLE_OF_TIME, NO_DAY_NIGHT_CYCLE, {
@@ -67,7 +67,7 @@ void RegionTable_Init_CastleTown() {
                   //Locations
                   LOCATION(RC_TOT_MASTER_SWORD, logic->IsAdult),
                   LOCATION(RC_GIFT_FROM_SAGES,  logic->IsAdult),
-                  LOCATION(RC_SHEIK_AT_TEMPLE,  logic->ForestMedallion && logic->IsAdult),
+                  LOCATION(RC_SHEIK_AT_TEMPLE,  logic->HasItem(RG_FOREST_MEDALLION) && logic->IsAdult),
                 }, {
                   //Exits
                   Entrance(RR_TEMPLE_OF_TIME, {[]{return true;}}),
@@ -82,21 +82,21 @@ void RegionTable_Init_CastleTown() {
 
   areaTable[RR_HYRULE_CASTLE_GROUNDS] = Region("Hyrule Castle Grounds", "Castle Grounds", RA_HYRULE_CASTLE, DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CanSummonGossipFairy;}}),
+                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CallGossipFairy();}}),
                   EventAccess(&logic->ButterflyFairy,   {[]{return logic->ButterflyFairy   || logic->CanUse(RG_STICKS);}}),
                   EventAccess(&logic->BugRock,          {[]{return true;}}),
                 }, {
                   //Locations
                   LOCATION(RC_HC_MALON_EGG,              true),
-                  LOCATION(RC_HC_GS_TREE,                logic->CanChildAttack),
+                  LOCATION(RC_HC_GS_TREE,                logic->IsChild && logic->CanAttack()),
                   LOCATION(RC_HC_MALON_GOSSIP_STONE,     true),
                   LOCATION(RC_HC_ROCK_WALL_GOSSIP_STONE, true),
                 }, {
                   //Exits
                   Entrance(RR_CASTLE_GROUNDS,          {[]{return true;}}),
-                  Entrance(RR_HC_GARDEN,               {[]{return logic->WeirdEgg || !randoCtx->GetOption(RSK_SHUFFLE_WEIRD_EGG);}}),
-                  Entrance(RR_HC_GREAT_FAIRY_FOUNTAIN, {[]{return logic->CanBlastOrSmash;}}),
-                  Entrance(RR_HC_STORMS_GROTTO,        {[]{return logic->CanOpenStormGrotto;}}),
+                  Entrance(RR_HC_GARDEN,               {[]{return logic->CanUse(RG_WEIRD_EGG) || !ctx->GetOption(RSK_SHUFFLE_WEIRD_EGG);}}),
+                  Entrance(RR_HC_GREAT_FAIRY_FOUNTAIN, {[]{return logic->BlastOrSmash();}}),
+                  Entrance(RR_HC_STORMS_GROTTO,        {[]{return logic->CanOpenStormsGrotto();}}),
   });
 
   areaTable[RR_HC_GARDEN] = Region("HC Garden", "Castle Grounds", RA_HYRULE_CASTLE, NO_DAY_NIGHT_CYCLE, {
@@ -120,23 +120,23 @@ void RegionTable_Init_CastleTown() {
 
   areaTable[RR_HC_STORMS_GROTTO] = Region("HC Storms Grotto", "HC Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->NutPot,           {[]{return logic->NutPot           || logic->CanBlastOrSmash;}}),
-                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || (logic->CanBlastOrSmash && logic->CanSummonGossipFairy);}}),
-                  EventAccess(&logic->WanderingBugs,    {[]{return logic->WanderingBugs    || logic->CanBlastOrSmash;}}),
+                  EventAccess(&logic->NutPot,           {[]{return logic->NutPot           || logic->BlastOrSmash();}}),
+                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || (logic->BlastOrSmash() && logic->CallGossipFairy());}}),
+                  EventAccess(&logic->WanderingBugs,    {[]{return logic->WanderingBugs    || logic->BlastOrSmash();}}),
                 }, {
                   //Locations
-                  LOCATION(RC_HC_GS_STORMS_GROTTO,           (logic->CanBlastOrSmash && logic->HookshotOrBoomerang) || (logic->Boomerang && randoCtx->GetTrickOption(RT_HC_STORMS_GS))),
-                  LOCATION(RC_HC_STORMS_GROTTO_GOSSIP_STONE, logic->CanBlastOrSmash),
+                  LOCATION(RC_HC_GS_STORMS_GROTTO,           (logic->BlastOrSmash() && logic->HookshotOrBoomerang()) || (logic->CanUse(RG_BOOMERANG) && ctx->GetTrickOption(RT_HC_STORMS_GS))),
+                  LOCATION(RC_HC_STORMS_GROTTO_GOSSIP_STONE, logic->BlastOrSmash()),
                 }, {
                   //Exits
                   Entrance(RR_CASTLE_GROUNDS, {[]{return true;}}),
   });
 
   areaTable[RR_GANONS_CASTLE_GROUNDS] = Region("Ganon's Castle Grounds", "Castle Grounds", RA_OUTSIDE_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
-                  EventAccess(&logic->BuiltRainbowBridge, {[]{return logic->CanBuildRainbowBridge;}}),
+                  EventAccess(&logic->BuiltRainbowBridge, {[]{return logic->CanBuildRainbowBridge();}}),
                 }, {
-                  //Locations                                   //the terrain was lowered such that you can't get this GS with a simple sword slash
-                  LOCATION(RC_OGC_GS, logic->CanJumpslash || logic->CanUseProjectile || (logic->CanShield && logic->CanUse(RG_MEGATON_HAMMER)) || logic->CanUse(RG_DINS_FIRE)),
+                  //Locations                                   
+                  LOCATION(RC_OGC_GS, logic->CanJumpslash() || logic->CanUseProjectile() || (logic->CanShield() && logic->CanUse(RG_MEGATON_HAMMER)) || logic->CanUse(RG_DINS_FIRE)),
                 }, {
                   //Exits
                   Entrance(RR_CASTLE_GROUNDS,           {[]{return logic->AtNight;}}),
@@ -194,8 +194,8 @@ void RegionTable_Init_CastleTown() {
 
   areaTable[RR_MARKET_MASK_SHOP] = Region("Market Mask Shop", "Market Mask Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->SkullMask,   {[]{return logic->SkullMask   || (logic->ZeldasLetter && (randoCtx->GetOption(RSK_COMPLETE_MASK_QUEST) ||  ChildCanAccess(RR_KAKARIKO_VILLAGE)));}}), //RANDOTODO Complete mask quest does not need this location, so should be tied to link'd pocket
-                  EventAccess(&logic->MaskOfTruth, {[]{return logic->MaskOfTruth || (logic->SkullMask && (randoCtx->GetOption(RSK_COMPLETE_MASK_QUEST) || (ChildCanAccess(RR_THE_LOST_WOODS) && logic->CanUse(RG_SARIAS_SONG) && RegionTable(RR_THE_GRAVEYARD)->childDay && ChildCanAccess(RR_HYRULE_FIELD) && logic->HasAllStones)));}}),
+                  EventAccess(&logic->SkullMask,   {[]{return logic->SkullMask   || (logic->HasItem(RG_ZELDAS_LETTER) && (ctx->GetOption(RSK_COMPLETE_MASK_QUEST) ||  ChildCanAccess(RR_KAKARIKO_VILLAGE)));}}), //RANDOTODO Complete mask quest does not need this location, so should be tied to link's pocket
+                  EventAccess(&logic->MaskOfTruth, {[]{return logic->MaskOfTruth || (logic->SkullMask && (ctx->GetOption(RSK_COMPLETE_MASK_QUEST) || (ChildCanAccess(RR_THE_LOST_WOODS) && logic->CanUse(RG_SARIAS_SONG) && RegionTable(RR_THE_GRAVEYARD)->childDay && ChildCanAccess(RR_HYRULE_FIELD) && logic->StoneCount() == 3)));}}),
                 }, {
                   LOCATION(RC_MASK_SHOP_HINT, true),
                 }, {
@@ -205,7 +205,7 @@ void RegionTable_Init_CastleTown() {
 
   areaTable[RR_MARKET_SHOOTING_GALLERY] = Region("Market Shooting Gallery", "Market Shooting Gallery", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_MARKET_SHOOTING_GALLERY_REWARD, logic->IsChild && logic->ChildsWallet),
+                  LOCATION(RC_MARKET_SHOOTING_GALLERY_REWARD, logic->IsChild && logic->HasItem(RG_CHILD_WALLET)),
                 }, {
                   //Exits
                   Entrance(RR_THE_MARKET, {[]{return true;}}),
@@ -213,11 +213,11 @@ void RegionTable_Init_CastleTown() {
 
   areaTable[RR_MARKET_BOMBCHU_BOWLING] = Region("Market Bombchu Bowling", "Market Bombchu Bowling", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->CouldPlayBowling, {[]{return (logic->ChildsWallet);}}),
+                  EventAccess(&logic->CouldPlayBowling, {[]{return (logic->HasItem(RG_CHILD_WALLET));}}),
                 }, {
                   //Locations
-                  LOCATION(RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,  logic->CouldPlayBowling && logic->BombchusEnabled),
-                  LOCATION(RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE, logic->CouldPlayBowling && logic->BombchusEnabled),
+                  LOCATION(RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,  logic->CouldPlayBowling && logic->BombchusEnabled()),
+                  LOCATION(RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE, logic->CouldPlayBowling && logic->BombchusEnabled()),
                 }, {
                   //Exits
                   Entrance(RR_THE_MARKET, {[]{return true;}}),
@@ -241,17 +241,17 @@ void RegionTable_Init_CastleTown() {
   areaTable[RR_MARKET_TREASURE_CHEST_GAME] = Region("Market Treasure Chest Game", "Market Treasure Chest Game", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GREG_HINT,                         true),
-                  LOCATION(RC_MARKET_TREASURE_CHEST_GAME_REWARD, logic->ChildsWallet && ((logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 6)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)))),
-                  LOCATION(RC_MARKET_TREASURE_CHEST_GAME_KEY_1,  logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)))),
-                  LOCATION(RC_MARKET_TREASURE_CHEST_GAME_ITEM_1, logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)))),
-                  LOCATION(RC_MARKET_TREASURE_CHEST_GAME_KEY_2,  logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 2)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)))),
-                  LOCATION(RC_MARKET_TREASURE_CHEST_GAME_ITEM_2, logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 2)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)))),
-                  LOCATION(RC_MARKET_TREASURE_CHEST_GAME_KEY_3,  logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 3)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)))),
-                  LOCATION(RC_MARKET_TREASURE_CHEST_GAME_ITEM_3, logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 3)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)))),
-                  LOCATION(RC_MARKET_TREASURE_CHEST_GAME_KEY_4,  logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 4)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)))),
-                  LOCATION(RC_MARKET_TREASURE_CHEST_GAME_ITEM_4, logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 4)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)))),
-                  LOCATION(RC_MARKET_TREASURE_CHEST_GAME_KEY_5,  logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 5)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)))),
-                  LOCATION(RC_MARKET_TREASURE_CHEST_GAME_ITEM_5, logic->ChildsWallet && ((randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 5)) || (randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !randoCtx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)))),
+                  LOCATION(RC_MARKET_TREASURE_CHEST_GAME_REWARD, logic->HasItem(RG_CHILD_WALLET) && ((logic->CanUse(RG_LENS_OF_TRUTH) && !ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)) || (ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 6)) || (ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)))),
+                  LOCATION(RC_MARKET_TREASURE_CHEST_GAME_KEY_1,  logic->HasItem(RG_CHILD_WALLET) && ((ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)))),
+                  LOCATION(RC_MARKET_TREASURE_CHEST_GAME_ITEM_1, logic->HasItem(RG_CHILD_WALLET) && ((ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)))),
+                  LOCATION(RC_MARKET_TREASURE_CHEST_GAME_KEY_2,  logic->HasItem(RG_CHILD_WALLET) && ((ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 2)) || (ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)))),
+                  LOCATION(RC_MARKET_TREASURE_CHEST_GAME_ITEM_2, logic->HasItem(RG_CHILD_WALLET) && ((ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 2)) || (ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)))),
+                  LOCATION(RC_MARKET_TREASURE_CHEST_GAME_KEY_3,  logic->HasItem(RG_CHILD_WALLET) && ((ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 3)) || (ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)))),
+                  LOCATION(RC_MARKET_TREASURE_CHEST_GAME_ITEM_3, logic->HasItem(RG_CHILD_WALLET) && ((ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 3)) || (ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)))),
+                  LOCATION(RC_MARKET_TREASURE_CHEST_GAME_KEY_4,  logic->HasItem(RG_CHILD_WALLET) && ((ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 4)) || (ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)))),
+                  LOCATION(RC_MARKET_TREASURE_CHEST_GAME_ITEM_4, logic->HasItem(RG_CHILD_WALLET) && ((ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 4)) || (ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)))),
+                  LOCATION(RC_MARKET_TREASURE_CHEST_GAME_KEY_5,  logic->HasItem(RG_CHILD_WALLET) && ((ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 5)) || (ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)))),
+                  LOCATION(RC_MARKET_TREASURE_CHEST_GAME_ITEM_5, logic->HasItem(RG_CHILD_WALLET) && ((ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 5)) || (ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)) || (logic->CanUse(RG_LENS_OF_TRUTH) && !ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)))),
                 }, {
                   //Exits
                   Entrance(RR_THE_MARKET, {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
index 1b99ea43a..630017585 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
@@ -4,45 +4,44 @@
 using namespace Rando;
 
 void RegionTable_Init_DeathMountain() {
-  auto ctx = Rando::Context::GetInstance();
   areaTable[RR_DEATH_MOUNTAIN_TRAIL] = Region("Death Mountain", "Death Mountain", RA_DEATH_MOUNTAIN_TRAIL, DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->BeanPlantFairy, {[]{return logic->BeanPlantFairy || (CanPlantBean(RR_DEATH_MOUNTAIN_TRAIL) && logic->CanUse(RG_SONG_OF_STORMS) && (logic->HasExplosives || logic->GoronBracelet));}}),
+                  EventAccess(&logic->BeanPlantFairy, {[]{return logic->BeanPlantFairy || (CanPlantBean(RR_DEATH_MOUNTAIN_TRAIL) && logic->CanUse(RG_SONG_OF_STORMS) && (logic->HasExplosives() || logic->HasItem(RG_GORONS_BRACELET)));}}),
                 }, {
                   //Locations
-                  LOCATION(RC_DMT_CHEST,                    logic->CanBlastOrSmash || (randoCtx->GetTrickOption(RT_DMT_BOMBABLE) && logic->IsChild && logic->GoronBracelet)),
-                  LOCATION(RC_DMT_FREESTANDING_POH,         logic->CanTakeDamage || logic->CanUse(RG_HOVER_BOOTS) || (logic->IsAdult && CanPlantBean(RR_DEATH_MOUNTAIN_TRAIL) && (logic->HasExplosives || logic->GoronBracelet))),
-                  LOCATION(RC_DMT_GS_BEAN_PATCH,            logic->CanPlantBugs && (logic->HasExplosives || logic->GoronBracelet || (randoCtx->GetTrickOption(RT_DMT_SOIL_GS) && (logic->CanTakeDamage || logic->CanUse(RG_HOVER_BOOTS)) && logic->CanUse(RG_BOOMERANG)))),
-                  LOCATION(RC_DMT_GS_NEAR_KAK,              logic->CanBlastOrSmash),
-                  LOCATION(RC_DMT_GS_ABOVE_DODONGOS_CAVERN, logic->IsAdult && logic->AtNight && (logic->CanUse(RG_MEGATON_HAMMER) || (randoCtx->GetTrickOption(RT_DMT_HOOKSHOT_LOWER_GS) && logic->CanUse(RG_HOOKSHOT)) || (randoCtx->GetTrickOption(RT_DMT_BEAN_LOWER_GS) && CanPlantBean(RR_DEATH_MOUNTAIN_TRAIL)) || (randoCtx->GetTrickOption(RT_DMT_HOVERS_LOWER_GS) && logic->CanUse(RG_HOVER_BOOTS)) || randoCtx->GetTrickOption(RT_DMT_JS_LOWER_GS)) && logic->CanGetNightTimeGS),
+                  LOCATION(RC_DMT_CHEST,                    logic->BlastOrSmash() || (ctx->GetTrickOption(RT_DMT_BOMBABLE) && logic->IsChild && logic->HasItem(RG_GORONS_BRACELET))),
+                  LOCATION(RC_DMT_FREESTANDING_POH,         logic->TakeDamage() || logic->CanUse(RG_HOVER_BOOTS) || (logic->IsAdult && CanPlantBean(RR_DEATH_MOUNTAIN_TRAIL) && (logic->HasExplosives() || logic->HasItem(RG_GORONS_BRACELET)))),
+                  LOCATION(RC_DMT_GS_BEAN_PATCH,            logic->CanSpawnSoilSkull() && (logic->HasExplosives() || logic->HasItem(RG_GORONS_BRACELET) || (ctx->GetTrickOption(RT_DMT_SOIL_GS) && (logic->TakeDamage() || logic->CanUse(RG_HOVER_BOOTS)) && logic->CanUse(RG_BOOMERANG)))),
+                  LOCATION(RC_DMT_GS_NEAR_KAK,              logic->BlastOrSmash()),
+                  LOCATION(RC_DMT_GS_ABOVE_DODONGOS_CAVERN, logic->IsAdult && logic->AtNight && (logic->CanUse(RG_MEGATON_HAMMER) || (ctx->GetTrickOption(RT_DMT_HOOKSHOT_LOWER_GS) && logic->CanUse(RG_HOOKSHOT)) || (ctx->GetTrickOption(RT_DMT_BEAN_LOWER_GS) && CanPlantBean(RR_DEATH_MOUNTAIN_TRAIL)) || (ctx->GetTrickOption(RT_DMT_HOVERS_LOWER_GS) && logic->CanUse(RG_HOVER_BOOTS)) || ctx->GetTrickOption(RT_DMT_JS_LOWER_GS)) && logic->CanGetNightTimeGS()),
                 }, {
                   //Exits
                   Entrance(RR_KAK_BEHIND_GATE,          {[]{return true;}}),
                   Entrance(RR_GORON_CITY,               {[]{return true;}}),
-                  Entrance(RR_DEATH_MOUNTAIN_SUMMIT,    {[]{return Here(RR_DEATH_MOUNTAIN_TRAIL, []{return logic->CanBlastOrSmash;}) || (logic->IsAdult && ((CanPlantBean(RR_DEATH_MOUNTAIN_TRAIL) && logic->GoronBracelet) || (logic->HoverBoots && randoCtx->GetTrickOption(RT_DMT_CLIMB_HOVERS))));}}),
-                  Entrance(RR_DODONGOS_CAVERN_ENTRYWAY, {[]{return logic->HasExplosives || logic->GoronBracelet || logic->IsAdult;}}),
-                  Entrance(RR_DMT_STORMS_GROTTO,        {[]{return logic->CanOpenStormGrotto;}}),
+                  Entrance(RR_DEATH_MOUNTAIN_SUMMIT,    {[]{return Here(RR_DEATH_MOUNTAIN_TRAIL, []{return logic->BlastOrSmash();}) || (logic->IsAdult && ((CanPlantBean(RR_DEATH_MOUNTAIN_TRAIL) && logic->HasItem(RG_GORONS_BRACELET)) || (logic->CanUse(RG_HOVER_BOOTS) && ctx->GetTrickOption(RT_DMT_CLIMB_HOVERS))));}}),
+                  Entrance(RR_DODONGOS_CAVERN_ENTRYWAY, {[]{return logic->HasExplosives() || logic->HasItem(RG_GORONS_BRACELET) || logic->IsAdult;}}),
+                  Entrance(RR_DMT_STORMS_GROTTO,        {[]{return logic->CanOpenStormsGrotto();}}),
   });
 
   areaTable[RR_DEATH_MOUNTAIN_SUMMIT] = Region("Death Mountain Summit", "Death Mountain", RA_DEATH_MOUNTAIN_TRAIL, DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->PrescriptionAccess, {[]{return logic->PrescriptionAccess || (logic->IsAdult && (logic->BrokenSwordAccess || logic->BrokenSword));}}),
-                  EventAccess(&logic->GossipStoneFairy,   {[]{return logic->GossipStoneFairy   || logic->CanSummonGossipFairy;}}),
+                  EventAccess(&logic->PrescriptionAccess, {[]{return logic->PrescriptionAccess || (logic->IsAdult && (logic->BrokenSwordAccess || logic->CanUse(RG_BROKEN_SWORD)));}}),
+                  EventAccess(&logic->GossipStoneFairy,   {[]{return logic->GossipStoneFairy   || logic->CallGossipFairy();}}),
                   EventAccess(&logic->BugRock,            {[]{return logic->BugRock            || logic->IsChild;}}),
                 }, {
                   //Locations
-                  LOCATION(RC_DMT_TRADE_BROKEN_SWORD,    logic->IsAdult && logic->BrokenSword),
-                  LOCATION(RC_DMT_TRADE_EYEDROPS,        logic->IsAdult && logic->Eyedrops),
-                  LOCATION(RC_DMT_TRADE_CLAIM_CHECK,     logic->IsAdult && logic->ClaimCheck),
-                  LOCATION(RC_DMT_GS_FALLING_ROCKS_PATH, logic->IsAdult && logic->AtNight && (logic->CanUse(RG_MEGATON_HAMMER) || randoCtx->GetTrickOption(RT_DMT_UPPER_GS)) && logic->CanGetNightTimeGS),
+                  LOCATION(RC_DMT_TRADE_BROKEN_SWORD,    logic->IsAdult && logic->CanUse(RG_BROKEN_SWORD)),
+                  LOCATION(RC_DMT_TRADE_EYEDROPS,        logic->IsAdult && logic->CanUse(RG_EYEDROPS)),
+                  LOCATION(RC_DMT_TRADE_CLAIM_CHECK,     logic->IsAdult && logic->CanUse(RG_CLAIM_CHECK)),
+                  LOCATION(RC_DMT_GS_FALLING_ROCKS_PATH, logic->IsAdult && logic->AtNight && (logic->CanUse(RG_MEGATON_HAMMER) || ctx->GetTrickOption(RT_DMT_UPPER_GS)) && logic->CanGetNightTimeGS()),
                   LOCATION(RC_DMT_GOSSIP_STONE,          true),
                 }, {
                   //Exits
                   Entrance(RR_DEATH_MOUNTAIN_TRAIL,     {[]{return true;}}),
                   Entrance(RR_DMC_UPPER_LOCAL,          {[]{return true;}}),
                   Entrance(RR_DMT_OWL_FLIGHT,           {[]{return logic->IsChild;}}),
-                  Entrance(RR_DMT_COW_GROTTO,           {[]{return Here(RR_DEATH_MOUNTAIN_SUMMIT, []{return logic->CanBlastOrSmash;});}}),
-                  Entrance(RR_DMT_GREAT_FAIRY_FOUNTAIN, {[]{return Here(RR_DEATH_MOUNTAIN_SUMMIT, []{return logic->CanBlastOrSmash;});}}),
+                  Entrance(RR_DMT_COW_GROTTO,           {[]{return Here(RR_DEATH_MOUNTAIN_SUMMIT, []{return logic->BlastOrSmash();});}}),
+                  Entrance(RR_DMT_GREAT_FAIRY_FOUNTAIN, {[]{return Here(RR_DEATH_MOUNTAIN_SUMMIT, []{return logic->BlastOrSmash();});}}),
   });
 
   areaTable[RR_DMT_OWL_FLIGHT] = Region("DMT Owl Flight", "Death Mountain", RA_DEATH_MOUNTAIN_TRAIL, NO_DAY_NIGHT_CYCLE, {}, {}, {
@@ -53,7 +52,7 @@ void RegionTable_Init_DeathMountain() {
   areaTable[RR_DMT_COW_GROTTO] = Region("DMT Cow Grotto", "DMT Cow Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DMT_COW_GROTTO_COW,     logic->CanUse(RG_EPONAS_SONG)),
-                  LOCATION(RC_DMT_COW_GROTTO_BEEHIVE, logic->CanBreakLowerBeehives),
+                  LOCATION(RC_DMT_COW_GROTTO_BEEHIVE, logic->CanBreakLowerBeehives()),
                 }, {
                   //Exits
                   Entrance(RR_DEATH_MOUNTAIN_SUMMIT, {[]{return true;}}),
@@ -63,10 +62,10 @@ void RegionTable_Init_DeathMountain() {
   areaTable[RR_DMT_STORMS_GROTTO] = Region("DMT Storms Grotto", "DMT Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LOCATION(RC_DMT_STORMS_GROTTO_CHEST,         true),
-                  LOCATION(RC_DMT_STORMS_GROTTO_FISH,          logic->HasBottle),
+                  LOCATION(RC_DMT_STORMS_GROTTO_FISH,          logic->HasBottle()),
                   LOCATION(RC_DMT_STORMS_GROTTO_GOSSIP_STONE,  true),
-                  LOCATION(RC_DMT_STORMS_GROTTO_BEEHIVE_LEFT,  logic->CanBreakLowerBeehives),
-                  LOCATION(RC_DMT_STORMS_GROTTO_BEEHIVE_RIGHT, logic->CanBreakLowerBeehives),
+                  LOCATION(RC_DMT_STORMS_GROTTO_BEEHIVE_LEFT,  logic->CanBreakLowerBeehives()),
+                  LOCATION(RC_DMT_STORMS_GROTTO_BEEHIVE_RIGHT, logic->CanBreakLowerBeehives()),
                 }, {
                   //Exits
                   Entrance(RR_DEATH_MOUNTAIN_TRAIL, {[]{return true;}}),
@@ -82,41 +81,41 @@ void RegionTable_Init_DeathMountain() {
 
   areaTable[RR_GORON_CITY] = Region("Goron City", "Goron City", RA_GORON_CITY, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->GossipStoneFairy,          {[]{return logic->GossipStoneFairy          || logic->CanSummonGossipFairyWithoutSuns;}}),
+                  EventAccess(&logic->GossipStoneFairy,          {[]{return logic->GossipStoneFairy          || logic->CallGossipFairyExceptSuns();}}),
                   EventAccess(&logic->StickPot,                  {[]{return logic->StickPot                  || logic->IsChild;}}),
-                  EventAccess(&logic->BugRock,                   {[]{return logic->BugRock                   || (logic->CanBlastOrSmash || logic->CanUse(RG_SILVER_GAUNTLETS));}}),
+                  EventAccess(&logic->BugRock,                   {[]{return logic->BugRock                   || (logic->BlastOrSmash() || logic->CanUse(RG_SILVER_GAUNTLETS));}}),
                   EventAccess(&logic->GoronCityChildFire,        {[]{return logic->GoronCityChildFire        || (logic->IsChild && logic->CanUse(RG_DINS_FIRE));}}),
-                  EventAccess(&logic->GCWoodsWarpOpen,           {[]{return logic->GCWoodsWarpOpen           || (logic->CanBlastOrSmash || logic->CanUse(RG_DINS_FIRE) || logic->CanUse(RG_FAIRY_BOW) || logic->GoronBracelet || logic->GoronCityChildFire);}}),
+                  EventAccess(&logic->GCWoodsWarpOpen,           {[]{return logic->GCWoodsWarpOpen           || (logic->BlastOrSmash() || logic->CanUse(RG_DINS_FIRE) || logic->CanUse(RG_FAIRY_BOW) || logic->HasItem(RG_GORONS_BRACELET) || logic->GoronCityChildFire);}}),
                   EventAccess(&logic->GCDaruniasDoorOpenChild,   {[]{return logic->GCDaruniasDoorOpenChild   || (logic->IsChild && logic->CanUse(RG_ZELDAS_LULLABY));}}),
-                  EventAccess(&logic->StopGCRollingGoronAsAdult, {[]{return logic->StopGCRollingGoronAsAdult || (logic->IsAdult && (logic->GoronBracelet || logic->HasExplosives || logic->Bow || (randoCtx->GetTrickOption(RT_GC_LINK_GORON_DINS) && logic->CanUse(RG_DINS_FIRE))));}}),
+                  EventAccess(&logic->StopGCRollingGoronAsAdult, {[]{return logic->StopGCRollingGoronAsAdult || (logic->IsAdult && (logic->HasItem(RG_GORONS_BRACELET) || logic->HasExplosives() || logic->CanUse(RG_FAIRY_BOW) || (ctx->GetTrickOption(RT_GC_LINK_GORON_DINS) && logic->CanUse(RG_DINS_FIRE))));}}),
                 }, {
                   //Locations
-                  LOCATION(RC_GC_MAZE_LEFT_CHEST,        logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_SILVER_GAUNTLETS) || (randoCtx->GetTrickOption(RT_GC_LEFTMOST) && logic->HasExplosives && logic->CanUse(RG_HOVER_BOOTS))),
-                  LOCATION(RC_GC_MAZE_CENTER_CHEST,      logic->CanBlastOrSmash  || logic->CanUse(RG_SILVER_GAUNTLETS)),
-                  LOCATION(RC_GC_MAZE_RIGHT_CHEST,       logic->CanBlastOrSmash  || logic->CanUse(RG_SILVER_GAUNTLETS)),
-                  LOCATION(RC_GC_POT_FREESTANDING_POH,   logic->IsChild && logic->GoronCityChildFire && (logic->Bombs || (logic->GoronBracelet && randoCtx->GetTrickOption(RT_GC_POT_STRENGTH)) || (logic->CanUse(RG_BOMBCHU_5) && randoCtx->GetTrickOption(RT_GC_POT)))),
-                  LOCATION(RC_GC_ROLLING_GORON_AS_CHILD, logic->IsChild && (logic->HasExplosives || (logic->GoronBracelet && randoCtx->GetTrickOption(RT_GC_ROLLING_STRENGTH)))),
+                  LOCATION(RC_GC_MAZE_LEFT_CHEST,        logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_SILVER_GAUNTLETS) || (ctx->GetTrickOption(RT_GC_LEFTMOST) && logic->HasExplosives() && logic->CanUse(RG_HOVER_BOOTS))),
+                  LOCATION(RC_GC_MAZE_CENTER_CHEST,      logic->BlastOrSmash()  || logic->CanUse(RG_SILVER_GAUNTLETS)),
+                  LOCATION(RC_GC_MAZE_RIGHT_CHEST,       logic->BlastOrSmash()  || logic->CanUse(RG_SILVER_GAUNTLETS)),
+                  LOCATION(RC_GC_POT_FREESTANDING_POH,   logic->IsChild && logic->GoronCityChildFire && (logic->CanUse(RG_BOMB_BAG) || (logic->HasItem(RG_GORONS_BRACELET) && ctx->GetTrickOption(RT_GC_POT_STRENGTH)) || (logic->CanUse(RG_BOMBCHU_5) && ctx->GetTrickOption(RT_GC_POT)))),
+                  LOCATION(RC_GC_ROLLING_GORON_AS_CHILD, logic->IsChild && (logic->HasExplosives() || (logic->HasItem(RG_GORONS_BRACELET) && ctx->GetTrickOption(RT_GC_ROLLING_STRENGTH)))),
                   LOCATION(RC_GC_ROLLING_GORON_AS_ADULT, logic->StopGCRollingGoronAsAdult),
-                  LOCATION(RC_GC_GS_BOULDER_MAZE,        logic->IsChild && logic->CanBlastOrSmash),
-                  LOCATION(RC_GC_GS_CENTER_PLATFORM,     logic->CanAdultAttack),
-                  LOCATION(RC_GC_MEDIGORON,              logic->IsAdult && logic->AdultsWallet && (logic->CanBlastOrSmash || logic->GoronBracelet)),
-                  LOCATION(RC_GC_MAZE_GOSSIP_STONE,      logic->CanBlastOrSmash || logic->CanUse(RG_SILVER_GAUNTLETS)),
-                  LOCATION(RC_GC_MEDIGORON_GOSSIP_STONE, logic->CanBlastOrSmash || logic->GoronBracelet),
+                  LOCATION(RC_GC_GS_BOULDER_MAZE,        logic->IsChild && logic->BlastOrSmash()),
+                  LOCATION(RC_GC_GS_CENTER_PLATFORM,     logic->IsAdult && logic->CanAttack()),
+                  LOCATION(RC_GC_MEDIGORON,              logic->IsAdult && logic->HasItem(RG_ADULT_WALLET) && (logic->BlastOrSmash() || logic->HasItem(RG_GORONS_BRACELET))),
+                  LOCATION(RC_GC_MAZE_GOSSIP_STONE,      logic->BlastOrSmash() || logic->CanUse(RG_SILVER_GAUNTLETS)),
+                  LOCATION(RC_GC_MEDIGORON_GOSSIP_STONE, logic->BlastOrSmash() || logic->HasItem(RG_GORONS_BRACELET)),
                 }, {
                   //Exits
                   Entrance(RR_DEATH_MOUNTAIN_TRAIL, {[]{return true;}}),
                   Entrance(RR_GC_WOODS_WARP,        {[]{return logic->GCWoodsWarpOpen;}}),
-                  Entrance(RR_GC_SHOP,              {[]{return (logic->IsAdult && logic->StopGCRollingGoronAsAdult) || (logic->IsChild && (logic->CanBlastOrSmash || logic->GoronBracelet || logic->GoronCityChildFire || logic->CanUse(RG_FAIRY_BOW)));}}),
+                  Entrance(RR_GC_SHOP,              {[]{return (logic->IsAdult && logic->StopGCRollingGoronAsAdult) || (logic->IsChild && (logic->BlastOrSmash() || logic->HasItem(RG_GORONS_BRACELET) || logic->GoronCityChildFire || logic->CanUse(RG_FAIRY_BOW)));}}),
                   Entrance(RR_GC_DARUNIAS_CHAMBER,  {[]{return (logic->IsAdult && logic->StopGCRollingGoronAsAdult) || (logic->IsChild && logic->GCDaruniasDoorOpenChild);}}),
-                  Entrance(RR_GC_GROTTO_PLATFORM,   {[]{return logic->IsAdult && ((logic->CanUse(RG_SONG_OF_TIME) && ((logic->EffectiveHealth > 2) || logic->CanUse(RG_GORON_TUNIC) || logic->CanUse(RG_LONGSHOT) || logic->CanUse(RG_NAYRUS_LOVE))) || (logic->EffectiveHealth > 1 && logic->CanUse(RG_GORON_TUNIC) && logic->CanUse(RG_HOOKSHOT)) || (logic->CanUse(RG_NAYRUS_LOVE) && logic->CanUse(RG_HOOKSHOT)) || (logic->EffectiveHealth > 2 && logic->CanUse(RG_HOOKSHOT) && randoCtx->GetTrickOption(RT_GC_GROTTO)));}}),
+                  Entrance(RR_GC_GROTTO_PLATFORM,   {[]{return logic->IsAdult && ((logic->CanUse(RG_SONG_OF_TIME) && ((logic->EffectiveHealth() > 2) || logic->CanUse(RG_GORON_TUNIC) || logic->CanUse(RG_LONGSHOT) || logic->CanUse(RG_NAYRUS_LOVE))) || (logic->EffectiveHealth() > 1 && logic->CanUse(RG_GORON_TUNIC) && logic->CanUse(RG_HOOKSHOT)) || (logic->CanUse(RG_NAYRUS_LOVE) && logic->CanUse(RG_HOOKSHOT)) || (logic->EffectiveHealth() > 2 && logic->CanUse(RG_HOOKSHOT) && ctx->GetTrickOption(RT_GC_GROTTO)));}}),
   });
 
   areaTable[RR_GC_WOODS_WARP] = Region("GC Woods Warp", "Goron City", RA_GORON_CITY, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->GCWoodsWarpOpen, {[]{return logic->GCWoodsWarpOpen || (logic->CanBlastOrSmash || logic->CanUse(RG_DINS_FIRE));}}),
+                  EventAccess(&logic->GCWoodsWarpOpen, {[]{return logic->GCWoodsWarpOpen || (logic->BlastOrSmash() || logic->CanUse(RG_DINS_FIRE));}}),
                 }, {}, {
                   //Exits
-                  Entrance(RR_GORON_CITY,     {[]{return logic->CanLeaveForest && logic->GCWoodsWarpOpen;}}),
+                  Entrance(RR_GORON_CITY,     {[]{return logic->CanLeaveForest() && logic->GCWoodsWarpOpen;}}),
                   Entrance(RR_THE_LOST_WOODS, {[]{return true;}}),
   });
 
@@ -135,7 +134,7 @@ void RegionTable_Init_DeathMountain() {
   areaTable[RR_GC_GROTTO_PLATFORM] = Region("GC Grotto Platform", "Goron City", RA_GORON_CITY, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_GC_GROTTO,  {[]{return true;}}),
-                  Entrance(RR_GORON_CITY, {[]{return logic->EffectiveHealth > 2 || logic->CanUse(RG_GORON_TUNIC) || logic->CanUse(RG_NAYRUS_LOVE) || ((logic->IsChild || logic->CanUse(RG_SONG_OF_TIME)) && logic->CanUse(RG_LONGSHOT));}}),
+                  Entrance(RR_GORON_CITY, {[]{return logic->EffectiveHealth() > 2 || logic->CanUse(RG_GORON_TUNIC) || logic->CanUse(RG_NAYRUS_LOVE) || ((logic->IsChild || logic->CanUse(RG_SONG_OF_TIME)) && logic->CanUse(RG_LONGSHOT));}}),
   });
 
   areaTable[RR_GC_SHOP] = Region("GC Shop", "GC Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -155,10 +154,10 @@ void RegionTable_Init_DeathMountain() {
 
   areaTable[RR_GC_GROTTO] = Region("GC Grotto", "GC Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_GC_DEKU_SCRUB_GROTTO_LEFT,   logic->CanStunDeku),
-                  LOCATION(RC_GC_DEKU_SCRUB_GROTTO_RIGHT,  logic->CanStunDeku),
-                  LOCATION(RC_GC_DEKU_SCRUB_GROTTO_CENTER, logic->CanStunDeku),
-                  LOCATION(RC_GC_GROTTO_BEEHIVE,           logic->CanBreakUpperBeehives),
+                  LOCATION(RC_GC_DEKU_SCRUB_GROTTO_LEFT,   logic->CanStunDeku()),
+                  LOCATION(RC_GC_DEKU_SCRUB_GROTTO_RIGHT,  logic->CanStunDeku()),
+                  LOCATION(RC_GC_DEKU_SCRUB_GROTTO_CENTER, logic->CanStunDeku()),
+                  LOCATION(RC_GC_GROTTO_BEEHIVE,           logic->CanBreakUpperBeehives()),
                 }, {
                   //Exits
                   Entrance(RR_GC_GROTTO_PLATFORM, {[]{return true;}}),
@@ -166,39 +165,39 @@ void RegionTable_Init_DeathMountain() {
 
   areaTable[RR_DMC_UPPER_NEARBY] = Region("DMC Upper Nearby", "Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_DMC_UPPER_LOCAL,       {[]{return logic->FireTimer >= 48;}}),
+                  Entrance(RR_DMC_UPPER_LOCAL,       {[]{return logic->FireTimer() >= 48;}}),
                   Entrance(RR_DEATH_MOUNTAIN_SUMMIT, {[]{return true;}}),
-                  Entrance(RR_DMC_UPPER_GROTTO,      {[]{return Here(RR_DMC_UPPER_NEARBY, []{return logic->CanBlastOrSmash && (logic->FireTimer >= 8 || logic->Hearts >= 3);});}})
+                  Entrance(RR_DMC_UPPER_GROTTO,      {[]{return Here(RR_DMC_UPPER_NEARBY, []{return logic->BlastOrSmash() && (logic->FireTimer() >= 8 || logic->Hearts() >= 3);});}})
   });
 
   areaTable[RR_DMC_UPPER_LOCAL] = Region("DMC Upper Local", "Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || (logic->HasExplosives && logic->CanSummonGossipFairyWithoutSuns && (logic->FireTimer >= 16 || logic->Hearts >= 3));}}),
+                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || (logic->HasExplosives() && logic->CallGossipFairyExceptSuns() && (logic->FireTimer() >= 16 || logic->Hearts() >= 3));}}),
                 }, {
                   //Locations
-                  LOCATION(RC_DMC_WALL_FREESTANDING_POH, logic->FireTimer >= 16 || logic->Hearts >= 3),
-                  LOCATION(RC_DMC_GS_CRATE,              (logic->FireTimer >= 8 || logic->Hearts >= 3) && logic->IsChild && logic->CanChildAttack),
-                  LOCATION(RC_DMC_GOSSIP_STONE,          logic->HasExplosives && (logic->FireTimer >= 16 || logic->Hearts >= 3)),
+                  LOCATION(RC_DMC_WALL_FREESTANDING_POH, logic->FireTimer() >= 16 || logic->Hearts() >= 3),
+                  LOCATION(RC_DMC_GS_CRATE,              (logic->FireTimer() >= 8 || logic->Hearts() >= 3) && logic->IsChild && logic->CanAttack()),
+                  LOCATION(RC_DMC_GOSSIP_STONE,          logic->HasExplosives() && (logic->FireTimer() >= 16 || logic->Hearts() >= 3)),
                 }, {
                   //Exits
                   Entrance(RR_DMC_UPPER_NEARBY,         {[]{return true;}}),
-                  Entrance(RR_DMC_LADDER_AREA_NEARBY,   {[]{return logic->FireTimer >= 16 || logic->Hearts >= 3;}}),
-                  Entrance(RR_DMC_CENTRAL_NEARBY,       {[]{return logic->IsAdult && logic->CanUse(RG_GORON_TUNIC) && logic->CanUse(RG_DISTANT_SCARECROW) && ((logic->EffectiveHealth > 2) || (logic->CanUse(RG_BOTTLE_WITH_FAIRY) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).IsNot(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF)) || logic->CanUse(RG_NAYRUS_LOVE));}}),
+                  Entrance(RR_DMC_LADDER_AREA_NEARBY,   {[]{return logic->FireTimer() >= 16 || logic->Hearts() >= 3;}}),
+                  Entrance(RR_DMC_CENTRAL_NEARBY,       {[]{return logic->IsAdult && logic->CanUse(RG_GORON_TUNIC) && logic->CanUse(RG_DISTANT_SCARECROW) && ((logic->EffectiveHealth() > 2) || (logic->CanUse(RG_BOTTLE_WITH_FAIRY) && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).IsNot(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF)) || logic->CanUse(RG_NAYRUS_LOVE));}}),
                   Entrance(RR_DMC_LOWER_NEARBY,         {[]{return false;}}),
   });
 
   areaTable[RR_DMC_LADDER_AREA_NEARBY] = Region("DMC Ladder Region Nearby", "Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_DMC_DEKU_SCRUB, logic->IsChild && logic->CanStunDeku),
+                  LOCATION(RC_DMC_DEKU_SCRUB, logic->IsChild && logic->CanStunDeku()),
                 }, {
                   //Exits
-                  Entrance(RR_DMC_UPPER_NEARBY, {[]{return logic->Hearts >= 3;}}),
-                  Entrance(RR_DMC_LOWER_NEARBY, {[]{return logic->Hearts >= 3 && (logic->CanUse(RG_HOVER_BOOTS) || (randoCtx->GetTrickOption(RT_DMC_BOULDER_JS) && logic->IsAdult && logic->CanUse(RG_MEGATON_HAMMER)) || (randoCtx->GetTrickOption(RT_DMC_BOULDER_SKIP) && logic->IsAdult));}}),
+                  Entrance(RR_DMC_UPPER_NEARBY, {[]{return logic->Hearts() >= 3;}}),
+                  Entrance(RR_DMC_LOWER_NEARBY, {[]{return logic->Hearts() >= 3 && (logic->CanUse(RG_HOVER_BOOTS) || (ctx->GetTrickOption(RT_DMC_BOULDER_JS) && logic->IsAdult && logic->CanUse(RG_MEGATON_HAMMER)) || (ctx->GetTrickOption(RT_DMC_BOULDER_SKIP) && logic->IsAdult));}}),
   });
 
   areaTable[RR_DMC_LOWER_NEARBY] = Region("DMC Lower Nearby", "Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_DMC_LOWER_LOCAL,          {[]{return logic->FireTimer >= 48;}}),
+                  Entrance(RR_DMC_LOWER_LOCAL,          {[]{return logic->FireTimer() >= 48;}}),
                   Entrance(RR_GC_DARUNIAS_CHAMBER,      {[]{return true;}}),
                   Entrance(RR_DMC_GREAT_FAIRY_FOUNTAIN, {[]{return logic->CanUse(RG_MEGATON_HAMMER);}}),
                   Entrance(RR_DMC_HAMMER_GROTTO,        {[]{return logic->IsAdult && logic->CanUse(RG_MEGATON_HAMMER);}}),
@@ -207,18 +206,18 @@ void RegionTable_Init_DeathMountain() {
   areaTable[RR_DMC_LOWER_LOCAL] = Region("DMC Lower Local", "Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DMC_LOWER_NEARBY,       {[]{return true;}}),
-                  Entrance(RR_DMC_LADDER_AREA_NEARBY, {[]{return logic->FireTimer >= 8 || logic->Hearts >= 3;}}),
-                  Entrance(RR_DMC_CENTRAL_NEARBY,     {[]{return (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT)) && (logic->FireTimer >= 8 || logic->Hearts >= 3);}}),
-                  Entrance(RR_DMC_CENTRAL_LOCAL,      {[]{return (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT) || (logic->IsAdult && logic->CanShield && randoCtx->GetTrickOption(RT_DMC_BOLERO_JUMP))) && logic->FireTimer >= 24;}}),
+                  Entrance(RR_DMC_LADDER_AREA_NEARBY, {[]{return logic->FireTimer() >= 8 || logic->Hearts() >= 3;}}),
+                  Entrance(RR_DMC_CENTRAL_NEARBY,     {[]{return (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT)) && (logic->FireTimer() >= 8 || logic->Hearts() >= 3);}}),
+                  Entrance(RR_DMC_CENTRAL_LOCAL,      {[]{return (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT) || (logic->IsAdult && logic->CanShield() && ctx->GetTrickOption(RT_DMC_BOLERO_JUMP))) && logic->FireTimer() >= 24;}}),
   });
 
   areaTable[RR_DMC_CENTRAL_NEARBY] = Region("DMC Central Nearby", "Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_DMC_VOLCANO_FREESTANDING_POH, logic->IsAdult && logic->Hearts >= 3 && (CanPlantBean(RR_DMC_CENTRAL_LOCAL) || (randoCtx->GetTrickOption(RT_DMC_HOVER_BEAN_POH) && logic->HoverBoots))),
-                  LOCATION(RC_SHEIK_IN_CRATER,              logic->IsAdult && (logic->FireTimer >= 8 || logic->Hearts >= 3)),
+                  LOCATION(RC_DMC_VOLCANO_FREESTANDING_POH, logic->IsAdult && logic->Hearts() >= 3 && (CanPlantBean(RR_DMC_CENTRAL_LOCAL) || (ctx->GetTrickOption(RT_DMC_HOVER_BEAN_POH) && logic->CanUse(RG_HOVER_BOOTS)))),
+                  LOCATION(RC_SHEIK_IN_CRATER,              logic->IsAdult && (logic->FireTimer() >= 8 || logic->Hearts() >= 3)),
                 }, {
                   //Exits
-                  Entrance(RR_DMC_CENTRAL_LOCAL, {[]{return logic->FireTimer >= 48;}}),
+                  Entrance(RR_DMC_CENTRAL_LOCAL, {[]{return logic->FireTimer() >= 48;}}),
   });
 
   areaTable[RR_DMC_CENTRAL_LOCAL] = Region("DMC Central Local", "Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {
@@ -226,13 +225,13 @@ void RegionTable_Init_DeathMountain() {
                   EventAccess(&logic->BeanPlantFairy, {[]{return logic->BeanPlantFairy || (CanPlantBean(RR_DMC_CENTRAL_LOCAL) && logic->CanUse(RG_SONG_OF_STORMS));}}),
                 }, {
                   //Locations
-                  LOCATION(RC_DMC_GS_BEAN_PATCH, (logic->FireTimer >= 8 || logic->Hearts >= 3) && logic->CanPlantBugs && logic->CanChildAttack),
+                  LOCATION(RC_DMC_GS_BEAN_PATCH, (logic->FireTimer() >= 8 || logic->Hearts() >= 3) && logic->CanSpawnSoilSkull() && logic->CanAttack()),
                 }, {
                   //Exits
                   Entrance(RR_DMC_CENTRAL_NEARBY,   {[]{return true;}}),
                   Entrance(RR_DMC_LOWER_NEARBY,     {[]{return (logic->IsAdult && CanPlantBean(RR_DMC_CENTRAL_LOCAL)) || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT);}}),
                   Entrance(RR_DMC_UPPER_NEARBY,     {[]{return logic->IsAdult && CanPlantBean(RR_DMC_CENTRAL_LOCAL);}}),
-                  Entrance(RR_FIRE_TEMPLE_ENTRYWAY, {[]{return (logic->IsChild && logic->Hearts >= 3 && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).IsNot(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF)) || (logic->IsAdult && logic->FireTimer >= 24);}}),
+                  Entrance(RR_FIRE_TEMPLE_ENTRYWAY, {[]{return (logic->IsChild && logic->Hearts() >= 3 && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).IsNot(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF)) || (logic->IsAdult && logic->FireTimer() >= 24);}}),
   });
 
   areaTable[RR_DMC_GREAT_FAIRY_FOUNTAIN] = Region("DMC Great Fairy Fountain", "DMC Great Fairy Fountain", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -246,10 +245,10 @@ void RegionTable_Init_DeathMountain() {
   areaTable[RR_DMC_UPPER_GROTTO] = Region("DMC Upper Grotto", "DMC Upper Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LOCATION(RC_DMC_UPPER_GROTTO_CHEST,         true),
-                  LOCATION(RC_DMC_UPPER_GROTTO_FISH,          logic->HasBottle),
+                  LOCATION(RC_DMC_UPPER_GROTTO_FISH,          logic->HasBottle()),
                   LOCATION(RC_DMC_UPPER_GROTTO_GOSSIP_STONE,  true),
-                  LOCATION(RC_DMC_UPPER_GROTTO_BEEHIVE_LEFT,  logic->CanBreakLowerBeehives),
-                  LOCATION(RC_DMC_UPPER_GROTTO_BEEHIVE_RIGHT, logic->CanBreakLowerBeehives),
+                  LOCATION(RC_DMC_UPPER_GROTTO_BEEHIVE_LEFT,  logic->CanBreakLowerBeehives()),
+                  LOCATION(RC_DMC_UPPER_GROTTO_BEEHIVE_RIGHT, logic->CanBreakLowerBeehives()),
                 }, {
                   //Exits
                   Entrance(RR_DMC_UPPER_LOCAL, {[]{return true;}}),
@@ -257,10 +256,10 @@ void RegionTable_Init_DeathMountain() {
 
   areaTable[RR_DMC_HAMMER_GROTTO] = Region("DMC Hammer Grotto", "DMC Hammer Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_DMC_DEKU_SCRUB_GROTTO_LEFT,   logic->CanStunDeku),
-                  LOCATION(RC_DMC_DEKU_SCRUB_GROTTO_RIGHT,  logic->CanStunDeku),
-                  LOCATION(RC_DMC_DEKU_SCRUB_GROTTO_CENTER, logic->CanStunDeku),
-                  LOCATION(RC_DMC_HAMMER_GROTTO_BEEHIVE,    logic->CanBreakUpperBeehives),
+                  LOCATION(RC_DMC_DEKU_SCRUB_GROTTO_LEFT,   logic->CanStunDeku()),
+                  LOCATION(RC_DMC_DEKU_SCRUB_GROTTO_RIGHT,  logic->CanStunDeku()),
+                  LOCATION(RC_DMC_DEKU_SCRUB_GROTTO_CENTER, logic->CanStunDeku()),
+                  LOCATION(RC_DMC_HAMMER_GROTTO_BEEHIVE,    logic->CanBreakUpperBeehives()),
                 }, {
                   //Exits
                   Entrance(RR_DMC_LOWER_LOCAL, {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp
index 1c2f55ab6..b47ec95a5 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp
@@ -10,19 +10,19 @@ void RegionTable_Init_DekuTree() {
   ---------------------------*/
   areaTable[RR_DEKU_TREE_ENTRYWAY] = Region("Deku Tree Entryway", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_DEKU_TREE_LOBBY,      {[]{return randoCtx->GetDungeon(DEKU_TREE)->IsVanilla();}}),
-                  Entrance(RR_DEKU_TREE_MQ_LOBBY,   {[]{return randoCtx->GetDungeon(DEKU_TREE)->IsMQ();}}),
+                  Entrance(RR_DEKU_TREE_LOBBY,      {[]{return ctx->GetDungeon(DEKU_TREE)->IsVanilla();}}),
+                  Entrance(RR_DEKU_TREE_MQ_LOBBY,   {[]{return ctx->GetDungeon(DEKU_TREE)->IsMQ();}}),
                   Entrance(RR_KF_OUTSIDE_DEKU_TREE, {[]{return true;}}),
   });
 
   /*--------------------------
   |     VANILLA DUNGEON      |
   ---------------------------*/
-  if (randoCtx->GetDungeon(DEKU_TREE)->IsVanilla()) {
+  if (ctx->GetDungeon(DEKU_TREE)->IsVanilla()) {
   areaTable[RR_DEKU_TREE_LOBBY] = Region("Deku Tree Lobby", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
-                  EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUse(RG_DINS_FIRE));}}),
+                  EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives() || logic->CanUse(RG_DINS_FIRE));}}),
                 }, {
                   //Locations
                   LOCATION(RC_DEKU_TREE_MAP_CHEST, true),
@@ -31,15 +31,15 @@ void RegionTable_Init_DekuTree() {
                   Entrance(RR_DEKU_TREE_ENTRYWAY,          {[]{return true;}}),
                   Entrance(RR_DEKU_TREE_2F_MIDDLE_ROOM,    {[]{return true;}}),
                   Entrance(RR_DEKU_TREE_COMPASS_ROOM,      {[]{return true;}}),
-                  Entrance(RR_DEKU_TREE_BASEMENT_LOWER,    {[]{return Here(RR_DEKU_TREE_LOBBY, []{return logic->CanAdultAttack || logic->CanChildAttack || logic->CanUse(RG_NUTS);});}}),
+                  Entrance(RR_DEKU_TREE_BASEMENT_LOWER,    {[]{return Here(RR_DEKU_TREE_LOBBY, []{return logic->CanAttack() || logic->CanUse(RG_NUTS);});}}),
                   Entrance(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM, {[]{return false;}}),
                   Entrance(RR_DEKU_TREE_BOSS_ENTRYWAY,     {[]{return false;}}),
   });
 
   areaTable[RR_DEKU_TREE_2F_MIDDLE_ROOM] = Region("Deku Tree 2F Middle Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_DEKU_TREE_LOBBY,         {[]{return Here(RR_DEKU_TREE_2F_MIDDLE_ROOM, []{return logic->HasShield || logic->CanUse(RG_MEGATON_HAMMER);});}}),
-                  Entrance(RR_DEKU_TREE_SLINGSHOT_ROOM,{[]{return Here(RR_DEKU_TREE_2F_MIDDLE_ROOM, []{return logic->HasShield || logic->CanUse(RG_MEGATON_HAMMER);});}}),
+                  Entrance(RR_DEKU_TREE_LOBBY,         {[]{return Here(RR_DEKU_TREE_2F_MIDDLE_ROOM, []{return logic->CanReflectNuts() || logic->CanUse(RG_MEGATON_HAMMER);});}}),
+                  Entrance(RR_DEKU_TREE_SLINGSHOT_ROOM,{[]{return Here(RR_DEKU_TREE_2F_MIDDLE_ROOM, []{return logic->CanReflectNuts() || logic->CanUse(RG_MEGATON_HAMMER);});}}),
   });
 
   areaTable[RR_DEKU_TREE_SLINGSHOT_ROOM] = Region("Deku Tree Slingshot Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -54,33 +54,33 @@ void RegionTable_Init_DekuTree() {
   areaTable[RR_DEKU_TREE_COMPASS_ROOM] = Region("Deku Tree Compass Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
-                  EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUse(RG_DINS_FIRE));}}),
+                  EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives() || logic->CanUse(RG_DINS_FIRE));}}),
                 }, {
                   //Locations
                   LOCATION(RC_DEKU_TREE_COMPASS_CHEST,           true),
                   LOCATION(RC_DEKU_TREE_COMPASS_ROOM_SIDE_CHEST, true),
-                  LOCATION(RC_DEKU_TREE_GS_COMPASS_ROOM,         logic->CanAdultAttack || logic->CanChildAttack),
+                  LOCATION(RC_DEKU_TREE_GS_COMPASS_ROOM,         logic->CanAttack()),
                 }, {
                   //Exits
-                  Entrance(RR_DEKU_TREE_LOBBY,     {[]{return logic->HasFireSourceWithTorch || logic->CanUse(RG_FAIRY_BOW);}}),
+                  Entrance(RR_DEKU_TREE_LOBBY,     {[]{return logic->HasFireSourceWithTorch() || logic->CanUse(RG_FAIRY_BOW);}}),
                   Entrance(RR_DEKU_TREE_BOSS_ENTRYWAY, {[]{return false;}}),
   });
 
   areaTable[RR_DEKU_TREE_BASEMENT_LOWER] = Region("Deku Tree Basement Lower", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->Boomerang);}}),
-                  EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUse(RG_DINS_FIRE));},
+                  EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
+                  EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives() || logic->CanUse(RG_DINS_FIRE));},
                                     /*Glitched*/[]{return logic->CanUse(RG_MEGATON_HAMMER);}}),
                 }, {
                   //Locations
                   LOCATION(RC_DEKU_TREE_BASEMENT_CHEST,    true),
-                  LOCATION(RC_DEKU_TREE_GS_BASEMENT_GATE,  logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG) || logic->HasExplosives || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_DINS_FIRE)),
-                  LOCATION(RC_DEKU_TREE_GS_BASEMENT_VINES, logic->CanUseProjectile || logic->CanUse(RG_DINS_FIRE) || (randoCtx->GetTrickOption(RT_DEKU_MQ_COMPASS_GS) && logic->CanJumpslash)),
+                  LOCATION(RC_DEKU_TREE_GS_BASEMENT_GATE,  logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG) || logic->HasExplosives() || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_DINS_FIRE)),
+                  LOCATION(RC_DEKU_TREE_GS_BASEMENT_VINES, logic->CanUseProjectile() || logic->CanUse(RG_DINS_FIRE) || (ctx->GetTrickOption(RT_DEKU_MQ_COMPASS_GS) && logic->CanJumpslash())),
                 }, {
                   //Exits
                   Entrance(RR_DEKU_TREE_LOBBY,               {[]{return true;}}),
-                  Entrance(RR_DEKU_TREE_BASEMENT_SCRUB_ROOM, {[]{return Here(RR_DEKU_TREE_BASEMENT_LOWER, []{return logic->HasFireSourceWithTorch || logic->CanUse(RG_FAIRY_BOW);});}}),
-                  Entrance(RR_DEKU_TREE_BASEMENT_UPPER,      {[]{return logic->IsAdult || randoCtx->GetTrickOption(RT_DEKU_B1_SKIP) || HasAccessTo(RR_DEKU_TREE_BASEMENT_UPPER);}}),
+                  Entrance(RR_DEKU_TREE_BASEMENT_SCRUB_ROOM, {[]{return Here(RR_DEKU_TREE_BASEMENT_LOWER, []{return logic->HasFireSourceWithTorch() || logic->CanUse(RG_FAIRY_BOW);});}}),
+                  Entrance(RR_DEKU_TREE_BASEMENT_UPPER,      {[]{return logic->IsAdult || ctx->GetTrickOption(RT_DEKU_B1_SKIP) || HasAccessTo(RR_DEKU_TREE_BASEMENT_UPPER);}}),
                   Entrance(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM,   {[]{return false;}}),
   });
 
@@ -93,41 +93,41 @@ void RegionTable_Init_DekuTree() {
   areaTable[RR_DEKU_TREE_BASEMENT_WATER_ROOM_FRONT] = Region("Deku Tree Basement Water Room Front", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DEKU_TREE_BASEMENT_SCRUB_ROOM,      {[]{return true;}}),
-                  Entrance(RR_DEKU_TREE_BASEMENT_WATER_ROOM_BACK, {[]{return logic->Swim || randoCtx->GetTrickOption(RT_DEKU_B1_BACKFLIP_OVER_SPIKED_LOG);}}),
+                  Entrance(RR_DEKU_TREE_BASEMENT_WATER_ROOM_BACK, {[]{return logic->HasItem(RG_BRONZE_SCALE) || ctx->GetTrickOption(RT_DEKU_B1_BACKFLIP_OVER_SPIKED_LOG);}}),
   });
 
   areaTable[RR_DEKU_TREE_BASEMENT_WATER_ROOM_BACK] = Region("Deku Tree Basement Water Room Back", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_DEKU_TREE_BASEMENT_WATER_ROOM_FRONT, {[]{return logic->Swim || randoCtx->GetTrickOption(RT_DEKU_B1_BACKFLIP_OVER_SPIKED_LOG);}}),
+                  Entrance(RR_DEKU_TREE_BASEMENT_WATER_ROOM_FRONT, {[]{return logic->HasItem(RG_BRONZE_SCALE) || ctx->GetTrickOption(RT_DEKU_B1_BACKFLIP_OVER_SPIKED_LOG);}}),
                   Entrance(RR_DEKU_TREE_BASEMENT_TORCH_ROOM,       {[]{return true;}}),
   });
 
   areaTable[RR_DEKU_TREE_BASEMENT_TORCH_ROOM] = Region("Deku Tree Basement Torch Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
-                  EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUse(RG_DINS_FIRE));}}),
+                  EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives() || logic->CanUse(RG_DINS_FIRE));}}),
                 }, {}, {
                   //Exits
                   Entrance(RR_DEKU_TREE_BASEMENT_WATER_ROOM_BACK, {[]{return true;}}),
-                  Entrance(RR_DEKU_TREE_BASEMENT_BACK_LOBBY,      {[]{return Here(RR_DEKU_TREE_BASEMENT_TORCH_ROOM, []{return logic->HasFireSourceWithTorch || logic->CanUse(RG_FAIRY_BOW);});}}),
+                  Entrance(RR_DEKU_TREE_BASEMENT_BACK_LOBBY,      {[]{return Here(RR_DEKU_TREE_BASEMENT_TORCH_ROOM, []{return logic->HasFireSourceWithTorch() || logic->CanUse(RG_FAIRY_BOW);});}}),
   });
 
   areaTable[RR_DEKU_TREE_BASEMENT_BACK_LOBBY] = Region("Deku Tree Basement Back Lobby", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
-                  EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (Here(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, []{return logic->HasFireSourceWithTorch || logic->CanUse(RG_FAIRY_BOW);}) &&
-                                                                            (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUse(RG_DINS_FIRE)));}}),
+                  EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (Here(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, []{return logic->HasFireSourceWithTorch() || logic->CanUse(RG_FAIRY_BOW);}) &&
+                                                                            (logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives() || logic->CanUse(RG_DINS_FIRE)));}}),
                 }, {}, {
                   //Exits
                   Entrance(RR_DEKU_TREE_BASEMENT_TORCH_ROOM, {[]{return true;}}),
-                  Entrance(RR_DEKU_TREE_BASEMENT_BACK_ROOM,  {[]{return Here(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, []{return logic->HasFireSourceWithTorch || logic->CanUse(RG_FAIRY_BOW);}) &&
-                                                                     Here(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, []{return logic->CanBlastOrSmash;});}}),
-                  Entrance(RR_DEKU_TREE_BASEMENT_UPPER,      {[]{return Here(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, []{return logic->HasFireSourceWithTorch || logic->CanUse(RG_FAIRY_BOW);}) && logic->IsChild;}}),
+                  Entrance(RR_DEKU_TREE_BASEMENT_BACK_ROOM,  {[]{return Here(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, []{return logic->HasFireSourceWithTorch() || logic->CanUse(RG_FAIRY_BOW);}) &&
+                                                                     Here(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, []{return logic->BlastOrSmash();});}}),
+                  Entrance(RR_DEKU_TREE_BASEMENT_UPPER,      {[]{return Here(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, []{return logic->HasFireSourceWithTorch() || logic->CanUse(RG_FAIRY_BOW);}) && logic->IsChild;}}),
   });
 
   areaTable[RR_DEKU_TREE_BASEMENT_BACK_ROOM] = Region("Deku Tree Basement Back Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_DEKU_TREE_GS_BASEMENT_BACK_ROOM, logic->HookshotOrBoomerang),
+                  LOCATION(RC_DEKU_TREE_GS_BASEMENT_BACK_ROOM, logic->HookshotOrBoomerang()),
                 }, {
                   //Exits
                   Entrance(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, {[]{return true;}}),
@@ -136,53 +136,53 @@ void RegionTable_Init_DekuTree() {
   areaTable[RR_DEKU_TREE_BASEMENT_UPPER] = Region("Deku Tree Basement Upper", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
-                  EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUse(RG_DINS_FIRE));}}),
+                  EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives() || logic->CanUse(RG_DINS_FIRE));}}),
                 }, {}, {
                   //Exits
                   Entrance(RR_DEKU_TREE_BASEMENT_LOWER,      {[]{return true;}}),
                   Entrance(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, {[]{return logic->IsChild;}}),
-                  Entrance(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM,   {[]{return Here(RR_DEKU_TREE_BASEMENT_UPPER, []{return logic->HasFireSourceWithTorch || (randoCtx->GetTrickOption(RT_DEKU_B1_BOW_WEBS) && logic->IsAdult && logic->CanUse(RG_FAIRY_BOW));});}}),
+                  Entrance(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM,   {[]{return Here(RR_DEKU_TREE_BASEMENT_UPPER, []{return logic->HasFireSourceWithTorch() || (ctx->GetTrickOption(RT_DEKU_B1_BOW_WEBS) && logic->IsAdult && logic->CanUse(RG_FAIRY_BOW));});}}),
   });
 
   areaTable[RR_DEKU_TREE_OUTSIDE_BOSS_ROOM] = Region("Deku Tree Outside Boss Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DEKU_TREE_BASEMENT_UPPER, {[]{return true;}}),
-                  Entrance(RR_DEKU_TREE_BOSS_ENTRYWAY,  {[]{return (logic->Swim || Here(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM, []{return logic->CanUse(RG_IRON_BOOTS);})) && Here(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM, []{return logic->HasShield;});}}),
+                  Entrance(RR_DEKU_TREE_BOSS_ENTRYWAY,  {[]{return (logic->HasItem(RG_BRONZE_SCALE) || Here(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM, []{return logic->CanUse(RG_IRON_BOOTS);})) && Here(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM, []{return logic->CanReflectNuts();});}}),
   });
   }
 
   /*---------------------------
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
-  if (randoCtx->GetDungeon(DEKU_TREE)->IsMQ()) {
+  if (ctx->GetDungeon(DEKU_TREE)->IsMQ()) {
   areaTable[RR_DEKU_TREE_MQ_LOBBY] = Region("Deku Tree MQ Lobby", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
-                  EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUse(RG_DINS_FIRE));}}),
+                  EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives() || logic->CanUse(RG_DINS_FIRE));}}),
   }, {
                   //Locations
                   LOCATION(RC_DEKU_TREE_MQ_MAP_CHEST,                 true),
-                  LOCATION(RC_DEKU_TREE_MQ_SLINGSHOT_CHEST,           logic->CanAdultAttack || logic->CanChildAttack),
-                  LOCATION(RC_DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST, logic->HasFireSourceWithTorch || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW))),
-                  LOCATION(RC_DEKU_TREE_MQ_BASEMENT_CHEST,            logic->HasFireSourceWithTorch || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW))),
-                  LOCATION(RC_DEKU_TREE_MQ_GS_LOBBY,                  logic->CanAdultAttack || logic->CanChildAttack),
+                  LOCATION(RC_DEKU_TREE_MQ_SLINGSHOT_CHEST,           logic->CanAttack()),
+                  LOCATION(RC_DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST, logic->HasFireSourceWithTorch() || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW))),
+                  LOCATION(RC_DEKU_TREE_MQ_BASEMENT_CHEST,            logic->HasFireSourceWithTorch() || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW))),
+                  LOCATION(RC_DEKU_TREE_MQ_GS_LOBBY,                  logic->CanAttack()),
   }, {
                   //Exits
                   Entrance(RR_DEKU_TREE_ENTRYWAY,                     {[]{return true;}}),
                   Entrance(RR_DEKU_TREE_MQ_COMPASS_ROOM,              {[]{return Here(RR_DEKU_TREE_MQ_LOBBY, []{return (logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT)) || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW));}) &&
-                                                                               Here(RR_DEKU_TREE_MQ_LOBBY, []{return logic->HasFireSourceWithTorch || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW));});}}),
+                                                                               Here(RR_DEKU_TREE_MQ_LOBBY, []{return logic->HasFireSourceWithTorch() || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW));});}}),
                   Entrance(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_FRONT, {[]{return Here(RR_DEKU_TREE_MQ_LOBBY, []{return (logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT)) || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW));}) &&
-                                                                               Here(RR_DEKU_TREE_MQ_LOBBY, []{return logic->HasFireSourceWithTorch;});}}),
-                  Entrance(RR_DEKU_TREE_MQ_BASEMENT_LEDGE,            {[]{return randoCtx->GetTrickOption(RT_DEKU_B1_SKIP) || Here(RR_DEKU_TREE_MQ_LOBBY, []{return logic->IsAdult;});}}),
+                                                                               Here(RR_DEKU_TREE_MQ_LOBBY, []{return logic->HasFireSourceWithTorch();});}}),
+                  Entrance(RR_DEKU_TREE_MQ_BASEMENT_LEDGE,            {[]{return ctx->GetTrickOption(RT_DEKU_B1_SKIP) || Here(RR_DEKU_TREE_MQ_LOBBY, []{return logic->IsAdult;});}}),
   });
 
   areaTable[RR_DEKU_TREE_MQ_COMPASS_ROOM] = Region("Deku Tree MQ Compass Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DEKU_TREE_MQ_COMPASS_CHEST,   true),
-                  LOCATION(RC_DEKU_TREE_MQ_GS_COMPASS_ROOM, logic->HookshotOrBoomerang &&
+                  LOCATION(RC_DEKU_TREE_MQ_GS_COMPASS_ROOM, logic->HookshotOrBoomerang() &&
                                                                                Here(RR_DEKU_TREE_MQ_COMPASS_ROOM, []{return logic->CanUse(RG_BOMBCHU_5) ||
-                                                                               (logic->Bombs && (logic->CanUse(RG_SONG_OF_TIME) || logic->IsAdult)) ||
-                                                                               (logic->IsAdult && logic->CanUse(RG_MEGATON_HAMMER) && (logic->CanUse(RG_SONG_OF_TIME) || randoCtx->GetTrickOption(RT_DEKU_MQ_COMPASS_GS)));})),
+                                                                               (logic->CanUse(RG_BOMB_BAG) && (logic->CanUse(RG_SONG_OF_TIME) || logic->IsAdult)) ||
+                                                                               (logic->IsAdult && logic->CanUse(RG_MEGATON_HAMMER) && (logic->CanUse(RG_SONG_OF_TIME) || ctx->GetTrickOption(RT_DEKU_MQ_COMPASS_GS)));})),
   }, {
                   //Exits
                   Entrance(RR_DEKU_TREE_MQ_LOBBY, {[]{return true;}}),
@@ -193,7 +193,7 @@ void RegionTable_Init_DekuTree() {
                   LOCATION(RC_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST, true),
   }, {
                   //Exits
-                  Entrance(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK, {[]{return randoCtx->GetTrickOption(RT_DEKU_MQ_LOG) ||  (logic->IsChild && (logic->DekuShield || logic->HylianShield)) ||
+                  Entrance(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK, {[]{return ctx->GetTrickOption(RT_DEKU_MQ_LOG) ||  (logic->IsChild && (logic->CanUse(RG_DEKU_SHIELD) || logic->HasItem(RG_HYLIAN_SHIELD))) ||
                                                                              (logic->IsAdult && (logic->CanUse(RG_LONGSHOT) || (logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_IRON_BOOTS))));}}),
                   Entrance(RR_DEKU_TREE_MQ_LOBBY,                    {[]{return true;}}),
   });
@@ -206,29 +206,29 @@ void RegionTable_Init_DekuTree() {
                   Entrance(RR_DEKU_TREE_MQ_BASEMENT_BACK_ROOM,        {[]{return Here(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK, []{return (logic->IsChild && logic->CanUse(RG_STICKS)) || logic->CanUse(RG_DINS_FIRE) ||
                                                                                Here(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_FRONT, []{return logic->IsAdult && logic->CanUse(RG_FIRE_ARROWS);});}) &&
                                                                                  Here(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK, []{return logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) ||
-                                                                                  logic->CanUseProjectile || (logic->CanUse(RG_NUTS) && logic->CanUse(RG_STICKS));});}}),
+                                                                                  logic->CanUseProjectile() || (logic->CanUse(RG_NUTS) && logic->CanUse(RG_STICKS));});}}),
                   Entrance(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_FRONT, {[]{return true;}}),
   });
 
   areaTable[RR_DEKU_TREE_MQ_BASEMENT_BACK_ROOM] = Region("Deku Tree MQ Basement Back Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM, (logic->IsAdult && logic->CanUse(RG_LONGSHOT)) || (logic->CanUse(RG_SONG_OF_TIME) && logic->HookshotOrBoomerang)),
-                  LOCATION(RC_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM,   logic->HasFireSourceWithTorch && logic->HookshotOrBoomerang),
+                  LOCATION(RC_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM, (logic->IsAdult && logic->CanUse(RG_LONGSHOT)) || (logic->CanUse(RG_SONG_OF_TIME) && logic->HookshotOrBoomerang())),
+                  LOCATION(RC_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM,   logic->HasFireSourceWithTorch() && logic->HookshotOrBoomerang()),
   }, {
                   //Exits
                   Entrance(RR_DEKU_TREE_MQ_BASEMENT_LEDGE,           {[]{return logic->IsChild;}}),
-                  Entrance(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK, {[]{return (logic->IsChild && logic->CanUse(RG_KOKIRI_SWORD)) || logic->CanUseProjectile || (logic->CanUse(RG_NUTS) && (logic->IsChild && logic->CanUse(RG_STICKS)));}}),
+                  Entrance(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK, {[]{return (logic->IsChild && logic->CanUse(RG_KOKIRI_SWORD)) || logic->CanUseProjectile() || (logic->CanUse(RG_NUTS) && (logic->IsChild && logic->CanUse(RG_STICKS)));}}),
   });
 
   areaTable[RR_DEKU_TREE_MQ_BASEMENT_LEDGE] = Region("Deku Tree MQ Basement Ledge", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_DEKU_TREE_MQ_DEKU_SCRUB, logic->CanStunDeku),
+                  LOCATION(RC_DEKU_TREE_MQ_DEKU_SCRUB, logic->CanStunDeku()),
   }, {
                   //Exits
                   Entrance(RR_DEKU_TREE_MQ_BASEMENT_BACK_ROOM, {[]{return logic->IsChild;}}),
                   Entrance(RR_DEKU_TREE_MQ_LOBBY,              {[]{return true;}}),
                   Entrance(RR_DEKU_TREE_MQ_OUTSIDE_BOSS_ROOM,
-                         { [] { return Here(RR_DEKU_TREE_MQ_BASEMENT_LEDGE, [] { return logic->HasFireSourceWithTorch; }); } }),
+                         { [] { return Here(RR_DEKU_TREE_MQ_BASEMENT_LEDGE, [] { return logic->HasFireSourceWithTorch(); }); } }),
   });
 
     areaTable[RR_DEKU_TREE_MQ_OUTSIDE_BOSS_ROOM] =
@@ -236,7 +236,7 @@ void RegionTable_Init_DekuTree() {
                  {
                      // Exits
                      Entrance(RR_DEKU_TREE_MQ_BASEMENT_LEDGE, {[]{ return true; }}),
-                     Entrance(RR_DEKU_TREE_BOSS_ENTRYWAY,     {[]{return (logic->Swim || Here(RR_DEKU_TREE_MQ_BASEMENT_LEDGE, []{return logic->CanUse(RG_IRON_BOOTS);})) && Here(RR_DEKU_TREE_MQ_BASEMENT_LEDGE, [] { return logic->HasShield; }); } }),
+                     Entrance(RR_DEKU_TREE_BOSS_ENTRYWAY,     {[]{return (logic->HasItem(RG_BRONZE_SCALE) || Here(RR_DEKU_TREE_MQ_BASEMENT_LEDGE, []{return logic->CanUse(RG_IRON_BOOTS);})) && Here(RR_DEKU_TREE_MQ_BASEMENT_LEDGE, [] { return logic->CanReflectNuts(); }); } }),
                  });
   }
 
@@ -247,8 +247,8 @@ void RegionTable_Init_DekuTree() {
         Region("Deku Tree Boss Entryway", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {},
              {
                  // Exits
-                 Entrance(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM, { [] { return randoCtx->GetDungeon(DEKU_TREE)->IsVanilla(); } }),
-                 Entrance(RR_DEKU_TREE_MQ_OUTSIDE_BOSS_ROOM, { [] { return randoCtx->GetDungeon(DEKU_TREE)->IsMQ(); } }),
+                 Entrance(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM, { [] { return ctx->GetDungeon(DEKU_TREE)->IsVanilla(); } }),
+                 Entrance(RR_DEKU_TREE_MQ_OUTSIDE_BOSS_ROOM, { [] { return ctx->GetDungeon(DEKU_TREE)->IsMQ(); } }),
                  Entrance(RR_DEKU_TREE_BOSS_ROOM, { [] { return true; } }),
              });
 
@@ -258,8 +258,8 @@ void RegionTable_Init_DekuTree() {
                  // Events
                  EventAccess(&logic->DekuTreeClear, { [] {
                                                   return logic->DekuTreeClear || (logic->HasBossSoul(RG_GOHMA_SOUL) && 
-                                                         (logic->CanJumpslash && (logic->CanUse(RG_NUTS) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) ||
-                                                                           logic->HookshotOrBoomerang)));
+                                                         (logic->CanJumpslash() && (logic->CanUse(RG_NUTS) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) ||
+                                                                           logic->HookshotOrBoomerang())));
                                               }}),
              },
              {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp
index 7982c942f..5274ea2e3 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp
@@ -10,37 +10,37 @@ void RegionTable_Init_DodongosCavern() {
   ---------------------------*/
   areaTable[RR_DODONGOS_CAVERN_ENTRYWAY] = Region("Dodongos Cavern Entryway", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_DODONGOS_CAVERN_BEGINNING,    {[]{return randoCtx->GetDungeon(DODONGOS_CAVERN)->IsVanilla();}}),
-                  Entrance(RR_DODONGOS_CAVERN_MQ_BEGINNING, {[]{return randoCtx->GetDungeon(DODONGOS_CAVERN)->IsMQ();}}),
+                  Entrance(RR_DODONGOS_CAVERN_BEGINNING,    {[]{return ctx->GetDungeon(DODONGOS_CAVERN)->IsVanilla();}}),
+                  Entrance(RR_DODONGOS_CAVERN_MQ_BEGINNING, {[]{return ctx->GetDungeon(DODONGOS_CAVERN)->IsMQ();}}),
                   Entrance(RR_DEATH_MOUNTAIN_TRAIL,         {[]{return true;}}),
   });
 
   /*--------------------------
   |     VANILLA DUNGEON      |
   ---------------------------*/
-  if (randoCtx->GetDungeon(DODONGOS_CAVERN)->IsVanilla()) {
+  if (ctx->GetDungeon(DODONGOS_CAVERN)->IsVanilla()) {
   areaTable[RR_DODONGOS_CAVERN_BEGINNING] = Region("Dodongos Cavern Beginning", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_ENTRYWAY, {[]{return true;}}),
-                  Entrance(RR_DODONGOS_CAVERN_LOBBY,    {[]{return Here(RR_DODONGOS_CAVERN_BEGINNING, []{return logic->CanBlastOrSmash || logic->GoronBracelet;});}}),
+                  Entrance(RR_DODONGOS_CAVERN_LOBBY,    {[]{return Here(RR_DODONGOS_CAVERN_BEGINNING, []{return logic->BlastOrSmash() || logic->HasItem(RG_GORONS_BRACELET);});}}),
   });
 
   areaTable[RR_DODONGOS_CAVERN_LOBBY] = Region("Dodongos Cavern Lobby", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || (logic->CanSummonGossipFairy && Here(RR_DODONGOS_CAVERN_LOBBY, []{return logic->CanBlastOrSmash || logic->GoronBracelet;}));}}),
+                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || (logic->CallGossipFairy() && Here(RR_DODONGOS_CAVERN_LOBBY, []{return logic->BlastOrSmash() || logic->HasItem(RG_GORONS_BRACELET);}));}}),
                 }, {
                   //Locations
-                  LOCATION(RC_DODONGOS_CAVERN_MAP_CHEST,        Here(RR_DODONGOS_CAVERN_LOBBY, []{return logic->CanBlastOrSmash || logic->GoronBracelet;})),
-                  LOCATION(RC_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY, logic->CanStunDeku || logic->GoronBracelet),
-                  LOCATION(RC_DODONGOS_CAVERN_GOSSIP_STONE,     Here(RR_DODONGOS_CAVERN_LOBBY, []{return logic->CanBlastOrSmash || logic->GoronBracelet;})),
+                  LOCATION(RC_DODONGOS_CAVERN_MAP_CHEST,        Here(RR_DODONGOS_CAVERN_LOBBY, []{return logic->BlastOrSmash() || logic->HasItem(RG_GORONS_BRACELET);})),
+                  LOCATION(RC_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY, logic->CanStunDeku() || logic->HasItem(RG_GORONS_BRACELET)),
+                  LOCATION(RC_DODONGOS_CAVERN_GOSSIP_STONE,     Here(RR_DODONGOS_CAVERN_LOBBY, []{return logic->BlastOrSmash() || logic->HasItem(RG_GORONS_BRACELET);})),
                 }, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_BEGINNING,    {[]{return true;}}),
                   Entrance(RR_DODONGOS_CAVERN_LOBBY_SWITCH, {[]{return logic->IsAdult;}}),
-                  Entrance(RR_DODONGOS_CAVERN_SE_CORRIDOR,  {[]{return Here(RR_DODONGOS_CAVERN_LOBBY, []{return logic->CanBlastOrSmash || logic->GoronBracelet;});}}),
+                  Entrance(RR_DODONGOS_CAVERN_SE_CORRIDOR,  {[]{return Here(RR_DODONGOS_CAVERN_LOBBY, []{return logic->BlastOrSmash() || logic->HasItem(RG_GORONS_BRACELET);});}}),
                   Entrance(RR_DODONGOS_CAVERN_STAIRS_LOWER, {[]{return HasAccessTo(RR_DODONGOS_CAVERN_LOBBY_SWITCH);}}),
                   Entrance(RR_DODONGOS_CAVERN_FAR_BRIDGE,   {[]{return HasAccessTo(RR_DODONGOS_CAVERN_FAR_BRIDGE);}}),
-                  Entrance(RR_DODONGOS_CAVERN_BOSS_AREA,    {[]{return Here(RR_DODONGOS_CAVERN_FAR_BRIDGE, []{return logic->HasExplosives;});}}),
+                  Entrance(RR_DODONGOS_CAVERN_BOSS_AREA,    {[]{return Here(RR_DODONGOS_CAVERN_FAR_BRIDGE, []{return logic->HasExplosives();});}}),
                   Entrance(RR_DODONGOS_CAVERN_BOSS_ENTRYWAY,{[]{return false;}}),
   });
 
@@ -52,17 +52,18 @@ void RegionTable_Init_DodongosCavern() {
 
   areaTable[RR_DODONGOS_CAVERN_SE_CORRIDOR] = Region("Dodongos Cavern SE Corridor", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_DODONGOS_CAVERN_GS_SCARECROW, logic->CanUse(RG_SCARECROW) || (logic->IsAdult && logic->CanUse(RG_LONGSHOT)) || (randoCtx->GetTrickOption(RT_DC_SCARECROW_GS) && (logic->CanAdultAttack || logic->CanChildAttack))),
+                  LOCATION(RC_DODONGOS_CAVERN_GS_SCARECROW, logic->CanUse(RG_SCARECROW) || (logic->IsAdult && logic->CanUse(RG_LONGSHOT)) || (ctx->GetTrickOption(RT_DC_SCARECROW_GS) && (logic->CanAttack()))),
                 }, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_LOBBY,               {[]{return true;}}),
-                  Entrance(RR_DODONGOS_CAVERN_SE_ROOM,             {[]{return Here(RR_DODONGOS_CAVERN_SE_CORRIDOR, []{return logic->CanBlastOrSmash || logic->CanAdultAttack || logic->CanChildAttack || (logic->CanTakeDamage && logic->CanShield);});}}),
+                  //Shield in logic to block baby dodongos to make them blow up the wall?
+                  Entrance(RR_DODONGOS_CAVERN_SE_ROOM,             {[]{return Here(RR_DODONGOS_CAVERN_SE_CORRIDOR, []{return logic->BlastOrSmash() || logic->CanAttack() || (logic->TakeDamage() && logic->CanShield());});}}),
                   Entrance(RR_DODONGOS_CAVERN_NEAR_LOWER_LIZALFOS, {[]{return true;}}),
   });
 
   areaTable[RR_DODONGOS_CAVERN_SE_ROOM] = Region("Dodongos Cavern SE Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS, logic->CanAdultAttack || logic->CanChildAttack),
+                  LOCATION(RC_DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS, logic->CanAttack()),
                 }, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_SE_CORRIDOR, {[]{return true;}}),
@@ -77,21 +78,21 @@ void RegionTable_Init_DodongosCavern() {
   areaTable[RR_DODONGOS_CAVERN_LOWER_LIZALFOS] = Region("Dodongos Cavern Lower Lizalfos", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_NEAR_LOWER_LIZALFOS, {[]{return Here(RR_DODONGOS_CAVERN_LOWER_LIZALFOS, []{return logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_STICKS) || logic->CanUse(RG_KOKIRI_SWORD) ||
-                    logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives;});}}),
+                    logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives();});}}),
                   Entrance(RR_DODONGOS_CAVERN_DODONGO_ROOM,        {[]{return Here(RR_DODONGOS_CAVERN_LOWER_LIZALFOS, []{return logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_STICKS) || logic->CanUse(RG_KOKIRI_SWORD) || 
-                    logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives;});}}),
+                    logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives();});}}),
   });
 
   areaTable[RR_DODONGOS_CAVERN_DODONGO_ROOM] = Region("Dodongos Cavern Dodongo Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_DODONGOS_CAVERN_LOBBY_SWITCH,      {[]{return logic->HasFireSourceWithTorch;}}),
+                  Entrance(RR_DODONGOS_CAVERN_LOBBY_SWITCH,      {[]{return logic->HasFireSourceWithTorch();}}),
                   Entrance(RR_DODONGOS_CAVERN_LOWER_LIZALFOS,    {[]{return true;}}),
-                  Entrance(RR_DODONGOS_CAVERN_NEAR_DODONGO_ROOM, {[]{return Here(RR_DODONGOS_CAVERN_DODONGO_ROOM, []{return logic->CanBlastOrSmash || logic->GoronBracelet;});}}),
+                  Entrance(RR_DODONGOS_CAVERN_NEAR_DODONGO_ROOM, {[]{return Here(RR_DODONGOS_CAVERN_DODONGO_ROOM, []{return logic->BlastOrSmash() || logic->HasItem(RG_GORONS_BRACELET);});}}),
   });
 
   areaTable[RR_DODONGOS_CAVERN_NEAR_DODONGO_ROOM] = Region("Dodongos Cavern Near Dodongo Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS, logic->CanStunDeku),
+                  LOCATION(RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS, logic->CanStunDeku()),
                 }, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_DODONGO_ROOM, {[]{return true;}}),
@@ -100,14 +101,14 @@ void RegionTable_Init_DodongosCavern() {
   areaTable[RR_DODONGOS_CAVERN_STAIRS_LOWER] = Region("Dodongos Cavern Stairs Lower", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_LOBBY,        {[]{return true;}}),
-                  Entrance(RR_DODONGOS_CAVERN_STAIRS_UPPER, {[]{return logic->HasExplosives || logic->GoronBracelet || logic->CanUse(RG_DINS_FIRE) || (randoCtx->GetTrickOption(RT_DC_STAIRCASE) && logic->CanUse(RG_FAIRY_BOW));}}),
-                  Entrance(RR_DODONGOS_CAVERN_COMPASS_ROOM, {[]{return Here(RR_DODONGOS_CAVERN_STAIRS_LOWER, []{return logic->CanBlastOrSmash || logic->GoronBracelet;});}}),
+                  Entrance(RR_DODONGOS_CAVERN_STAIRS_UPPER, {[]{return logic->HasExplosives() || logic->HasItem(RG_GORONS_BRACELET) || logic->CanUse(RG_DINS_FIRE) || (ctx->GetTrickOption(RT_DC_STAIRCASE) && logic->CanUse(RG_FAIRY_BOW));}}),
+                  Entrance(RR_DODONGOS_CAVERN_COMPASS_ROOM, {[]{return Here(RR_DODONGOS_CAVERN_STAIRS_LOWER, []{return logic->BlastOrSmash() || logic->HasItem(RG_GORONS_BRACELET);});}}),
   });
 
   areaTable[RR_DODONGOS_CAVERN_STAIRS_UPPER] = Region("Dodongos Cavern Stairs Upper", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS, Here(RR_DODONGOS_CAVERN_FAR_BRIDGE, []{return logic->HookshotOrBoomerang;}) || logic->CanUse(RG_LONGSHOT)),
-                  LOCATION(RC_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS,  logic->IsAdult || logic->CanChildAttack || (HasAccessTo(RR_DODONGOS_CAVERN_STAIRS_LOWER) && logic->CanUse(RG_LONGSHOT) && randoCtx->GetTrickOption(RT_DC_VINES_GS))),
+                  LOCATION(RC_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS, Here(RR_DODONGOS_CAVERN_FAR_BRIDGE, []{return logic->HookshotOrBoomerang();}) || logic->CanUse(RG_LONGSHOT)),
+                  LOCATION(RC_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS,  logic->IsAdult || logic->CanAttack() || (HasAccessTo(RR_DODONGOS_CAVERN_STAIRS_LOWER) && logic->CanUse(RG_LONGSHOT) && ctx->GetTrickOption(RT_DC_VINES_GS))),
                 }, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_STAIRS_LOWER, {[]{return true;}}),
@@ -119,7 +120,7 @@ void RegionTable_Init_DodongosCavern() {
                   LOCATION(RC_DODONGOS_CAVERN_COMPASS_CHEST, true),
                 }, {
                   //Exits
-                  Entrance(RR_DODONGOS_CAVERN_STAIRS_LOWER, {[]{return logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->GoronBracelet;}}),
+                  Entrance(RR_DODONGOS_CAVERN_STAIRS_LOWER, {[]{return logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives() || logic->HasItem(RG_GORONS_BRACELET);}}),
   });
 
   areaTable[RR_DODONGOS_CAVERN_ARMOS_ROOM] = Region("Dodongos Cavern Armos Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
@@ -133,15 +134,15 @@ void RegionTable_Init_DodongosCavern() {
                   LOCATION(RC_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST, true),
                 }, {
                   //Exits
-                  Entrance(RR_DODONGOS_CAVERN_2F_SIDE_ROOM,         {[]{return Here(RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER, []{return logic->CanBlastOrSmash || (randoCtx->GetTrickOption(RT_DC_SCRUB_ROOM) && logic->GoronBracelet);});}}),
-                  Entrance(RR_DODONGOS_CAVERN_FIRST_SLINGSHOT_ROOM, {[]{return Here(RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER, []{return logic->CanBlastOrSmash || logic->GoronBracelet;});}}),
-                  Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_UPPER,      {[]{return (logic->IsAdult && randoCtx->GetTrickOption(RT_DC_JUMP)) || logic->CanUse(RG_HOVER_BOOTS) || (logic->IsAdult && logic->CanUse(RG_LONGSHOT));}}),
+                  Entrance(RR_DODONGOS_CAVERN_2F_SIDE_ROOM,         {[]{return Here(RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER, []{return logic->BlastOrSmash() || (ctx->GetTrickOption(RT_DC_SCRUB_ROOM) && logic->HasItem(RG_GORONS_BRACELET));});}}),
+                  Entrance(RR_DODONGOS_CAVERN_FIRST_SLINGSHOT_ROOM, {[]{return Here(RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER, []{return logic->BlastOrSmash() || logic->HasItem(RG_GORONS_BRACELET);});}}),
+                  Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_UPPER,      {[]{return (logic->IsAdult && ctx->GetTrickOption(RT_DC_JUMP)) || logic->CanUse(RG_HOVER_BOOTS) || (logic->IsAdult && logic->CanUse(RG_LONGSHOT));}}),
   });
 
   areaTable[RR_DODONGOS_CAVERN_2F_SIDE_ROOM] = Region("Dodongos Cavern 2F Side Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,  logic->CanStunDeku),
-                  LOCATION(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT, logic->CanStunDeku),
+                  LOCATION(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,  logic->CanStunDeku()),
+                  LOCATION(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT, logic->CanStunDeku()),
                 }, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER, {[]{return true;}}),
@@ -150,22 +151,22 @@ void RegionTable_Init_DodongosCavern() {
   areaTable[RR_DODONGOS_CAVERN_FIRST_SLINGSHOT_ROOM] = Region("Dodongos Cavern First Slingshot Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER, {[]{return true;}}),
-                  Entrance(RR_DODONGOS_CAVERN_UPPER_LIZALFOS,  {[]{return logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || randoCtx->GetTrickOption(RT_DC_SLINGSHOT_SKIP);}}),
+                  Entrance(RR_DODONGOS_CAVERN_UPPER_LIZALFOS,  {[]{return logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || ctx->GetTrickOption(RT_DC_SLINGSHOT_SKIP);}}),
   });
 
   areaTable[RR_DODONGOS_CAVERN_UPPER_LIZALFOS] = Region("Dodongos Cavern Upper Lizalfos", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_LOWER_LIZALFOS,        {[]{return true;}}),
                   Entrance(RR_DODONGOS_CAVERN_FIRST_SLINGSHOT_ROOM,  {[]{return Here(RR_DODONGOS_CAVERN_LOWER_LIZALFOS, []{return logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_STICKS) || logic->CanUse(RG_KOKIRI_SWORD) || 
-                    logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives;});}}),
+                    logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives();});}}),
                   Entrance(RR_DODONGOS_CAVERN_SECOND_SLINGSHOT_ROOM, {[]{return Here(RR_DODONGOS_CAVERN_LOWER_LIZALFOS, []{return logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_STICKS) || logic->CanUse(RG_KOKIRI_SWORD) || 
-                    logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives;});}}),
+                    logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives();});}}),
   });
 
   areaTable[RR_DODONGOS_CAVERN_SECOND_SLINGSHOT_ROOM] = Region("Dodongos Cavern Second Slingshot Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_UPPER_LIZALFOS,  {[]{return true;}}),
-                  Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_UPPER, {[]{return logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || randoCtx->GetTrickOption(RT_DC_SLINGSHOT_SKIP);}}),
+                  Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_UPPER, {[]{return logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || ctx->GetTrickOption(RT_DC_SLINGSHOT_SKIP);}}),
   });
 
   areaTable[RR_DODONGOS_CAVERN_BOMB_ROOM_UPPER] = Region("Dodongos Cavern Bomb Room Upper", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
@@ -180,7 +181,7 @@ void RegionTable_Init_DodongosCavern() {
 
   areaTable[RR_DODONGOS_CAVERN_FAR_BRIDGE] = Region("Dodongos Cavern Far Bridge", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST, Here(RR_DODONGOS_CAVERN_FAR_BRIDGE, []{return logic->CanBlastOrSmash;})),
+                  LOCATION(RC_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST, Here(RR_DODONGOS_CAVERN_FAR_BRIDGE, []{return logic->BlastOrSmash();})),
                 }, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_LOBBY,           {[]{return true;}}),
@@ -193,13 +194,13 @@ void RegionTable_Init_DodongosCavern() {
                 }, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_LOBBY, {[]{return true;}}),
-                  Entrance(RR_DODONGOS_CAVERN_BACK_ROOM, {[]{return Here(RR_DODONGOS_CAVERN_BOSS_AREA, []{return logic->CanBlastOrSmash;});}}),
+                  Entrance(RR_DODONGOS_CAVERN_BACK_ROOM, {[]{return Here(RR_DODONGOS_CAVERN_BOSS_AREA, []{return logic->BlastOrSmash();});}}),
                   Entrance(RR_DODONGOS_CAVERN_BOSS_ENTRYWAY, {[]{return true;}}),
   });
 
   areaTable[RR_DODONGOS_CAVERN_BACK_ROOM] = Region("Dodongos Cavern Back Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_DODONGOS_CAVERN_GS_BACK_ROOM, logic->CanAdultAttack || logic->CanChildAttack),
+                  LOCATION(RC_DODONGOS_CAVERN_GS_BACK_ROOM, logic->CanAttack()),
                 }, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_BOSS_AREA, {[]{return true;}}),
@@ -209,53 +210,53 @@ void RegionTable_Init_DodongosCavern() {
   /*---------------------------
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
-  if (randoCtx->GetDungeon(DODONGOS_CAVERN)->IsMQ()) {
+  if (ctx->GetDungeon(DODONGOS_CAVERN)->IsMQ()) {
   areaTable[RR_DODONGOS_CAVERN_MQ_BEGINNING] = Region("Dodongos Cavern MQ Beginning", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_ENTRYWAY, {[]{return true;}}),
-                  Entrance(RR_DODONGOS_CAVERN_MQ_LOBBY, {[]{return Here(RR_DODONGOS_CAVERN_MQ_BEGINNING, []{return logic->CanBlastOrSmash || logic->GoronBracelet;});}}),
+                  Entrance(RR_DODONGOS_CAVERN_MQ_LOBBY, {[]{return Here(RR_DODONGOS_CAVERN_MQ_BEGINNING, []{return logic->BlastOrSmash() || logic->HasItem(RG_GORONS_BRACELET);});}}),
   });
 
   areaTable[RR_DODONGOS_CAVERN_MQ_LOBBY] = Region("Dodongos Cavern MQ Lobby", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->DekuBabaSticks,   {[]{return logic->DekuBabaSticks || (logic->IsAdult || logic->KokiriSword || logic->Boomerang);}}),
-                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CanSummonGossipFairy;}}),
+                  EventAccess(&logic->DekuBabaSticks,   {[]{return logic->DekuBabaSticks || (logic->IsAdult || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
+                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CallGossipFairy();}}),
   }, {
                   //Locations
                   LOCATION(RC_DODONGOS_CAVERN_MQ_MAP_CHEST,                  true),
-                  LOCATION(RC_DODONGOS_CAVERN_MQ_COMPASS_CHEST,              logic->CanAdultAttack || logic->CanChildAttack || logic->CanUse(RG_NUTS)),
-                  LOCATION(RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST,          (logic->IsChild && logic->CanUse(RG_STICKS)) || logic->HasFireSource),
-                  LOCATION(RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST,    logic->CanBlastOrSmash || (logic->IsChild && logic->CanUse(RG_STICKS)) || logic->CanUse(RG_DINS_FIRE) || (logic->IsAdult && (randoCtx->GetTrickOption(RT_DC_JUMP) || logic->HoverBoots || logic->Hookshot))),
-                  LOCATION(RC_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM, logic->CanUse(RG_SONG_OF_TIME) && (logic->CanChildAttack || logic->CanAdultAttack)),
-                  LOCATION(RC_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM,             (logic->IsChild && logic->CanUse(RG_STICKS)) || logic->HasFireSource),
-                  LOCATION(RC_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM,           logic->CanBlastOrSmash),
-                  LOCATION(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,      logic->CanStunDeku),
-                  LOCATION(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT,     logic->CanStunDeku),
-                  LOCATION(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,       logic->CanStunDeku),
+                  LOCATION(RC_DODONGOS_CAVERN_MQ_COMPASS_CHEST,              logic->CanAttack() || logic->CanUse(RG_NUTS)),
+                  LOCATION(RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST,          (logic->IsChild && logic->CanUse(RG_STICKS)) || logic->HasFireSource()),
+                  LOCATION(RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST,    logic->BlastOrSmash() || (logic->IsChild && logic->CanUse(RG_STICKS)) || logic->CanUse(RG_DINS_FIRE) || (logic->IsAdult && (ctx->GetTrickOption(RT_DC_JUMP) || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT)))),
+                  LOCATION(RC_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM, logic->CanUse(RG_SONG_OF_TIME) && logic->CanAttack()),
+                  LOCATION(RC_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM,             (logic->IsChild && logic->CanUse(RG_STICKS)) || logic->HasFireSource()),
+                  LOCATION(RC_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM,           logic->BlastOrSmash()),
+                  LOCATION(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,      logic->CanStunDeku()),
+                  LOCATION(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT,     logic->CanStunDeku()),
+                  LOCATION(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,       logic->CanStunDeku()),
                   LOCATION(RC_DODONGOS_CAVERN_GOSSIP_STONE,                  true),
   }, {
                   //Exits
-                  Entrance(RR_DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE,  {[]{return Here(RR_DODONGOS_CAVERN_MQ_LOBBY, []{return logic->CanBlastOrSmash || (((logic->IsChild && logic->CanUse(RG_STICKS)) || logic->CanUse(RG_DINS_FIRE)) && logic->CanTakeDamage);});}}),
-                  Entrance(RR_DODONGOS_CAVERN_MQ_BOMB_BAG_AREA,     {[]{return logic->IsAdult || (Here(RR_DODONGOS_CAVERN_MQ_LOBBY, []{return logic->IsAdult;}) && logic->HasExplosives) || (randoCtx->GetTrickOption(RT_DC_MQ_CHILD_BOMBS) && logic->CanJumpslash && logic->CanTakeDamage);}}),
-                    //Trick: logic->IsAdult || logic->HasExplosives || (LogicDCMQChildBombs && (logic->KokiriSword || logic->Sticks) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO))
-                  Entrance(RR_DODONGOS_CAVERN_MQ_BOSS_AREA,         {[]{return logic->HasExplosives || (logic->GoronBracelet && ((logic->IsAdult && randoCtx->GetTrickOption(RT_DC_MQ_ADULT_EYES)) || (logic->IsChild && randoCtx->GetTrickOption(RT_DC_MQ_CHILD_EYES))) && ((logic->IsChild && (logic->CanUse(RG_STICKS))) || logic->CanUse(RG_DINS_FIRE) || (logic->IsAdult && (randoCtx->GetTrickOption(RT_DC_JUMP) || logic->Hammer || logic->HoverBoots || logic->Hookshot))));}}), 
-                    //Trick: logic->HasExplosives || (LogicDCMQEyes && logic->GoronBracelet && (logic->IsAdult || LogicDCMQChildBack) && ((logic->IsChild && logic->CanUse(RG_STICKS)) || logic->CanUse(RG_DINS_FIRE) || (logic->IsAdult && (LogicDCJump || logic->Hammer || logic->HoverBoots || logic->Hookshot))))
+                  Entrance(RR_DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE,  {[]{return Here(RR_DODONGOS_CAVERN_MQ_LOBBY, []{return logic->BlastOrSmash() || (((logic->IsChild && logic->CanUse(RG_STICKS)) || logic->CanUse(RG_DINS_FIRE)) && logic->TakeDamage());});}}),
+                  Entrance(RR_DODONGOS_CAVERN_MQ_BOMB_BAG_AREA,     {[]{return logic->IsAdult || (Here(RR_DODONGOS_CAVERN_MQ_LOBBY, []{return logic->IsAdult;}) && logic->HasExplosives()) || (ctx->GetTrickOption(RT_DC_MQ_CHILD_BOMBS) && logic->CanJumpslash() && logic->TakeDamage());}}),
+                    //Trick: logic->IsAdult || logic->HasExplosives() || (LogicDCMQChildBombs && (logic->CanUse(RG_KOKIRI_SWORD) || logic->Sticks) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO))
+                  Entrance(RR_DODONGOS_CAVERN_MQ_BOSS_AREA,         {[]{return logic->HasExplosives() || (logic->HasItem(RG_GORONS_BRACELET) && ((logic->IsAdult && ctx->GetTrickOption(RT_DC_MQ_ADULT_EYES)) || (logic->IsChild && ctx->GetTrickOption(RT_DC_MQ_CHILD_EYES))) && ((logic->IsChild && (logic->CanUse(RG_STICKS))) || logic->CanUse(RG_DINS_FIRE) || (logic->IsAdult && (ctx->GetTrickOption(RT_DC_JUMP) || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT)))));}}), 
+                    //Trick: logic->HasExplosives() || (LogicDCMQEyes && logic->HasItem(RG_GORONS_BRACELET) && (logic->IsAdult || LogicDCMQChildBack) && ((logic->IsChild && logic->CanUse(RG_STICKS)) || logic->CanUse(RG_DINS_FIRE) || (logic->IsAdult && (LogicDCJump || logic->Hammer || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT)))))
   });
 
   areaTable[RR_DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE] = Region("Dodongos Cavern MQ Lower Right Side", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS, logic->CanStunDeku),
+                  LOCATION(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS, logic->CanStunDeku()),
   }, {
                   //Exits
-                  Entrance(RR_DODONGOS_CAVERN_MQ_BOMB_BAG_AREA, {[]{return (Here(RR_DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE, []{return logic->IsAdult && logic->CanUse(RG_FAIRY_BOW);}) || logic->GoronBracelet ||
-                                                                                logic->CanUse(RG_DINS_FIRE) || logic->HasExplosives) &&
+                  Entrance(RR_DODONGOS_CAVERN_MQ_BOMB_BAG_AREA, {[]{return (Here(RR_DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE, []{return logic->IsAdult && logic->CanUse(RG_FAIRY_BOW);}) || logic->HasItem(RG_GORONS_BRACELET) ||
+                                                                                logic->CanUse(RG_DINS_FIRE) || logic->HasExplosives()) &&
                                                                                 logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT);}}),
   });
 
   areaTable[RR_DODONGOS_CAVERN_MQ_BOMB_BAG_AREA] = Region("Dodongos Cavern MQ Bomb Bag Region", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST, true),
-                  LOCATION(RC_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM,  (Here(RR_DODONGOS_CAVERN_MQ_BOMB_BAG_AREA, []{return logic->IsAdult && logic->CanUse(RG_FAIRY_BOW);}) ||  logic->GoronBracelet || logic->CanUse(RG_DINS_FIRE) || logic->HasExplosives) && logic->HookshotOrBoomerang),
+                  LOCATION(RC_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM,  (Here(RR_DODONGOS_CAVERN_MQ_BOMB_BAG_AREA, []{return logic->IsAdult && logic->CanUse(RG_FAIRY_BOW);}) ||  logic->HasItem(RG_GORONS_BRACELET) || logic->CanUse(RG_DINS_FIRE) || logic->HasExplosives()) && logic->HookshotOrBoomerang()),
   }, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE, {[]{return true;}}),
@@ -281,8 +282,8 @@ void RegionTable_Init_DodongosCavern() {
         Region("Dodongos Cavern Boss Entryway", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {},
              {
                  // Exits
-                 Entrance(RR_DODONGOS_CAVERN_BOSS_AREA, { [] { return randoCtx->GetDungeon(DODONGOS_CAVERN)->IsVanilla(); } }),
-                 Entrance(RR_DODONGOS_CAVERN_MQ_BOSS_AREA, { [] { return randoCtx->GetDungeon(DODONGOS_CAVERN)->IsMQ(); } }),
+                 Entrance(RR_DODONGOS_CAVERN_BOSS_AREA, { [] { return ctx->GetDungeon(DODONGOS_CAVERN)->IsVanilla(); } }),
+                 Entrance(RR_DODONGOS_CAVERN_MQ_BOSS_AREA, { [] { return ctx->GetDungeon(DODONGOS_CAVERN)->IsMQ(); } }),
                  Entrance(RR_DODONGOS_CAVERN_BOSS_ROOM, { [] { return true; } }),
              });
 
@@ -294,8 +295,8 @@ void RegionTable_Init_DodongosCavern() {
                              { [] {
                                   return logic->DodongosCavernClear || (logic->HasBossSoul(RG_KING_DODONGO_SOUL) &&
                                          (Here(RR_DODONGOS_CAVERN_BOSS_ROOM,
-                                               [] { return logic->HasExplosives || (logic->CanUse(RG_MEGATON_HAMMER) && randoCtx->GetTrickOption(RT_DC_HAMMER_FLOOR)); }) &&
-                                          (logic->Bombs || logic->GoronBracelet) && logic->CanJumpslash)); /*todo add chu kill to tricks*/
+                                               [] { return logic->HasExplosives() || (logic->CanUse(RG_MEGATON_HAMMER) && ctx->GetTrickOption(RT_DC_HAMMER_FLOOR)); }) &&
+                                          (logic->CanUse(RG_BOMB_BAG) || logic->HasItem(RG_GORONS_BRACELET)) && logic->CanJumpslash())); /*todo add chu kill to tricks*/
                               }}),
              },
              {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp
index e888f26d2..1984552b5 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp
@@ -10,23 +10,23 @@ void RegionTable_Init_FireTemple() {
   ---------------------------*/
   areaTable[RR_FIRE_TEMPLE_ENTRYWAY] = Region("Fire Temple Entryway", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_FIRE_TEMPLE_FIRST_ROOM, {[]{return randoCtx->GetDungeon(FIRE_TEMPLE)->IsVanilla();}}),
-                  Entrance(RR_FIRE_TEMPLE_MQ_LOWER,   {[]{return randoCtx->GetDungeon(FIRE_TEMPLE)->IsMQ();}}),
+                  Entrance(RR_FIRE_TEMPLE_FIRST_ROOM, {[]{return ctx->GetDungeon(FIRE_TEMPLE)->IsVanilla();}}),
+                  Entrance(RR_FIRE_TEMPLE_MQ_LOWER,   {[]{return ctx->GetDungeon(FIRE_TEMPLE)->IsMQ();}}),
                   Entrance(RR_DMC_CENTRAL_LOCAL,      {[]{return true;}}),
   });
 
   /*--------------------------
   |     VANILLA DUNGEON      |
   ---------------------------*/
-  if (randoCtx->GetDungeon(FIRE_TEMPLE)->IsVanilla()) {
+  if (ctx->GetDungeon(FIRE_TEMPLE)->IsVanilla()) {
   areaTable[RR_FIRE_TEMPLE_FIRST_ROOM] = Region("Fire Temple First Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                 }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_ENTRYWAY,       {[]{return true;}}),
-                  Entrance(RR_FIRE_TEMPLE_NEAR_BOSS_ROOM, {[]{return logic->FireTimer >= 24;}}),
+                  Entrance(RR_FIRE_TEMPLE_NEAR_BOSS_ROOM, {[]{return logic->FireTimer() >= 24;}}),
                   Entrance(RR_FIRE_TEMPLE_LOOP_ENEMIES,   {[]{return Here(RR_FIRE_TEMPLE_FIRST_ROOM, []{return logic->CanUse(RG_MEGATON_HAMMER);}) && (logic->SmallKeys(RR_FIRE_TEMPLE, 8) || !logic->IsKeysanity);}}),
                   Entrance(RR_FIRE_TEMPLE_LOOP_EXIT,      {[]{return true;}}),
-                  Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM,  {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 2) && logic->FireTimer >= 24;}}),
+                  Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM,  {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 2) && logic->FireTimer() >= 24;}}),
   });
 
   areaTable[RR_FIRE_TEMPLE_NEAR_BOSS_ROOM] = Region("Fire Temple Near Boss Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
@@ -38,7 +38,7 @@ void RegionTable_Init_FireTemple() {
                 }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_FIRST_ROOM, {[]{return true;}}),
-                  Entrance(RR_FIRE_TEMPLE_BOSS_ENTRYWAY, {[]{return logic->BossKeyFireTemple && ((logic->IsAdult && (randoCtx->GetTrickOption(RT_FIRE_BOSS_DOOR_JUMP) || Here(RR_FIRE_TEMPLE_FIRE_MAZE_UPPER, []{return logic->CanUse(RG_MEGATON_HAMMER);}))) || logic->CanUse(RG_HOVER_BOOTS));}}),
+                  Entrance(RR_FIRE_TEMPLE_BOSS_ENTRYWAY, {[]{return logic->HasItem(RG_FIRE_TEMPLE_BOSS_KEY) && ((logic->IsAdult && (ctx->GetTrickOption(RT_FIRE_BOSS_DOOR_JUMP) || Here(RR_FIRE_TEMPLE_FIRE_MAZE_UPPER, []{return logic->CanUse(RG_MEGATON_HAMMER);}))) || logic->CanUse(RG_HOVER_BOOTS));}}),
   });
 
   areaTable[RR_FIRE_TEMPLE_LOOP_ENEMIES] = Region("Fire Temple Loop Enemies", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
@@ -49,7 +49,7 @@ void RegionTable_Init_FireTemple() {
 
   areaTable[RR_FIRE_TEMPLE_LOOP_TILES] = Region("Fire Temple Loop Tiles", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_FIRE_TEMPLE_GS_BOSS_KEY_LOOP, logic->CanAdultAttack || logic->CanChildAttack),
+                  LOCATION(RC_FIRE_TEMPLE_GS_BOSS_KEY_LOOP, logic->CanAttack()),
                 }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_LOOP_ENEMIES,      {[]{return true;}}),
@@ -58,11 +58,11 @@ void RegionTable_Init_FireTemple() {
 
   areaTable[RR_FIRE_TEMPLE_LOOP_FLARE_DANCER] = Region("Fire Temple Loop Flare Dancer", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_FIRE_TEMPLE_FLARE_DANCER_CHEST, (logic->HasExplosives || logic->CanUse(RG_MEGATON_HAMMER)) && logic->IsAdult),
+                  LOCATION(RC_FIRE_TEMPLE_FLARE_DANCER_CHEST, (logic->HasExplosives() || logic->CanUse(RG_MEGATON_HAMMER)) && logic->IsAdult),
                 }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_LOOP_TILES,         {[]{return true;}}),
-                  Entrance(RR_FIRE_TEMPLE_LOOP_HAMMER_SWITCH, {[]{return Here(RR_FIRE_TEMPLE_LOOP_FLARE_DANCER, []{return logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_HOOKSHOT) || (logic->HasExplosives && (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) ||
+                  Entrance(RR_FIRE_TEMPLE_LOOP_HAMMER_SWITCH, {[]{return Here(RR_FIRE_TEMPLE_LOOP_FLARE_DANCER, []{return logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_HOOKSHOT) || (logic->HasExplosives() && (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) ||
                    logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_BOOMERANG)));});}}),
   });
 
@@ -94,8 +94,8 @@ void RegionTable_Init_FireTemple() {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_FIRST_ROOM,                {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 2);}}),
                   Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_GORON, {[]{return true;}}),
-                  Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_TILES, {[]{return logic->IsAdult && (logic->CanUse(RG_SONG_OF_TIME) || randoCtx->GetTrickOption(RT_FIRE_SOT));}}),
-                  Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM_SOUTH_GORON, {[]{return logic->IsAdult && logic->HasExplosives;}}),
+                  Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_TILES, {[]{return logic->IsAdult && (logic->CanUse(RG_SONG_OF_TIME) || ctx->GetTrickOption(RT_FIRE_SOT));}}),
+                  Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM_SOUTH_GORON, {[]{return logic->IsAdult && logic->HasExplosives();}}),
                   Entrance(RR_FIRE_TEMPLE_FIRE_PILLAR_ROOM,          {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 3);}}),
   });
 
@@ -109,7 +109,8 @@ void RegionTable_Init_FireTemple() {
 
   areaTable[RR_FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_TILES] = Region("Fire Temple Big Lava Room North Tiles", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM, logic->CanAdultAttack || logic->HookshotOrBoomerang),
+                  //RANDOTODO check if child can reach
+                  LOCATION(RC_FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM, (logic->IsAdult && logic->CanAttack()) || logic->HookshotOrBoomerang()),
                 }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM, {[]{return true;}}),
@@ -126,7 +127,7 @@ void RegionTable_Init_FireTemple() {
   areaTable[RR_FIRE_TEMPLE_FIRE_PILLAR_ROOM] = Region("Fire Temple Fire Pillar Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM, {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 3);}}),
-                  Entrance(RR_FIRE_TEMPLE_SHORTCUT_ROOM, {[]{return logic->FireTimer >= 56 && logic->SmallKeys(RR_FIRE_TEMPLE, 4);}}),
+                  Entrance(RR_FIRE_TEMPLE_SHORTCUT_ROOM, {[]{return logic->FireTimer() >= 56 && logic->SmallKeys(RR_FIRE_TEMPLE, 4);}}),
   });
 
   areaTable[RR_FIRE_TEMPLE_SHORTCUT_ROOM] = Region("Fire Temple Shortcut Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -136,7 +137,7 @@ void RegionTable_Init_FireTemple() {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_FIRE_PILLAR_ROOM,   {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 4);}}),
                   Entrance(RR_FIRE_TEMPLE_SHORTCUT_CLIMB,     {[]{return Here(RR_FIRE_TEMPLE_SHORTCUT_CLIMB, []{return true;});}}),
-                  Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER, {[]{return logic->IsAdult && (logic->GoronBracelet || randoCtx->GetTrickOption(RT_FIRE_STRENGTH)) && (logic->HasExplosives || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_FAIRY_SLINGSHOT));}}),
+                  Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER, {[]{return logic->IsAdult && (logic->HasItem(RG_GORONS_BRACELET) || ctx->GetTrickOption(RT_FIRE_STRENGTH)) && (logic->HasExplosives() || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_FAIRY_SLINGSHOT));}}),
   });
 
   areaTable[RR_FIRE_TEMPLE_SHORTCUT_CLIMB] = Region("Fire Temple Shortcut Climb", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
@@ -148,7 +149,7 @@ void RegionTable_Init_FireTemple() {
   areaTable[RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER] = Region("Fire Temple Boulder Maze Lower", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST, true),
-                  LOCATION(RC_FIRE_TEMPLE_GS_BOULDER_MAZE,          logic->HasExplosives && (logic->IsAdult || logic->HookshotOrBoomerang)),
+                  LOCATION(RC_FIRE_TEMPLE_GS_BOULDER_MAZE,          logic->HasExplosives() && (logic->IsAdult || logic->HookshotOrBoomerang())),
                 }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_SHORTCUT_ROOM,                {[]{return true;}}),
@@ -167,7 +168,7 @@ void RegionTable_Init_FireTemple() {
 
   areaTable[RR_FIRE_TEMPLE_EAST_CENTRAL_ROOM] = Region("Fire Temple East Central Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM,      {[]{return logic->CanTakeDamage;}}),
+                  Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM,      {[]{return logic->TakeDamage();}}),
                   Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER, {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 5, 8);}}),
                   Entrance(RR_FIRE_TEMPLE_FIRE_WALL_CHASE,    {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 6, 8);}}),
                   Entrance(RR_FIRE_TEMPLE_MAP_AREA,           {[]{return logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW);}}),
@@ -175,10 +176,10 @@ void RegionTable_Init_FireTemple() {
 
   areaTable[RR_FIRE_TEMPLE_FIRE_WALL_CHASE] = Region("Fire Temple Fire Wall Chase", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_FIRE_TEMPLE_EAST_CENTRAL_ROOM,  {[]{return logic->FireTimer >= 24 && logic->SmallKeys(RR_FIRE_TEMPLE, 6, 8);}}),
+                  Entrance(RR_FIRE_TEMPLE_EAST_CENTRAL_ROOM,  {[]{return logic->FireTimer() >= 24 && logic->SmallKeys(RR_FIRE_TEMPLE, 6, 8);}}),
                   Entrance(RR_FIRE_TEMPLE_MAP_AREA,           {[]{return logic->IsAdult;}}),
-                  Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_UPPER, {[]{return logic->FireTimer >= 24 && logic->IsAdult;}}),
-                  Entrance(RR_FIRE_TEMPLE_CORRIDOR,           {[]{return logic->FireTimer >= 24 && logic->IsAdult && logic->SmallKeys(RR_FIRE_TEMPLE, 7);}}),
+                  Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_UPPER, {[]{return logic->FireTimer() >= 24 && logic->IsAdult;}}),
+                  Entrance(RR_FIRE_TEMPLE_CORRIDOR,           {[]{return logic->FireTimer() >= 24 && logic->IsAdult && logic->SmallKeys(RR_FIRE_TEMPLE, 7);}}),
   });
 
   areaTable[RR_FIRE_TEMPLE_MAP_AREA] = Region("Fire Temple Map Region", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -194,15 +195,15 @@ void RegionTable_Init_FireTemple() {
                   LOCATION(RC_FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST, true),
                 }, {
                   //Exits
-                  Entrance(RR_FIRE_TEMPLE_SHORTCUT_CLIMB,     {[]{return logic->HasExplosives;}}),
+                  Entrance(RR_FIRE_TEMPLE_SHORTCUT_CLIMB,     {[]{return logic->HasExplosives();}}),
                   Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER, {[]{return true;}}),
                   Entrance(RR_FIRE_TEMPLE_FIRE_WALL_CHASE,    {[]{return true;}}),
-                  Entrance(RR_FIRE_TEMPLE_SCARECROW_ROOM,     {[]{return logic->CanUse(RG_SCARECROW) || (randoCtx->GetTrickOption(RT_FIRE_SCARECROW) && logic->IsAdult && logic->CanUse(RG_LONGSHOT));}}),
+                  Entrance(RR_FIRE_TEMPLE_SCARECROW_ROOM,     {[]{return logic->CanUse(RG_SCARECROW) || (ctx->GetTrickOption(RT_FIRE_SCARECROW) && logic->IsAdult && logic->CanUse(RG_LONGSHOT));}}),
   });
 
   areaTable[RR_FIRE_TEMPLE_SCARECROW_ROOM] = Region("Fire Temple Scarecrow Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_FIRE_TEMPLE_GS_SCARECROW_CLIMB, logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG) || logic->HasExplosives || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_DINS_FIRE)),
+                  LOCATION(RC_FIRE_TEMPLE_GS_SCARECROW_CLIMB, logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG) || logic->HasExplosives() || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_DINS_FIRE)),
                 }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_UPPER, {[]{return true;}}),
@@ -212,11 +213,11 @@ void RegionTable_Init_FireTemple() {
   areaTable[RR_FIRE_TEMPLE_EAST_PEAK] = Region("Fire Temple East Peak", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FIRE_TEMPLE_SCARECROW_CHEST,  true),
-                  LOCATION(RC_FIRE_TEMPLE_GS_SCARECROW_TOP, logic->CanUseProjectile),
+                  LOCATION(RC_FIRE_TEMPLE_GS_SCARECROW_TOP, logic->CanUseProjectile()),
                 }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_SCARECROW_ROOM,    {[]{return true;}}),
-                  Entrance(RR_FIRE_TEMPLE_EAST_CENTRAL_ROOM, {[]{return logic->CanTakeDamage;}}),
+                  Entrance(RR_FIRE_TEMPLE_EAST_CENTRAL_ROOM, {[]{return logic->TakeDamage();}}),
   });
 
   areaTable[RR_FIRE_TEMPLE_CORRIDOR] = Region("Fire Temple Corridor", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
@@ -231,7 +232,7 @@ void RegionTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_UPPER,     {[]{return logic->CanUse(RG_HOVER_BOOTS);}}),
                   Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_SIDE_ROOM, {[]{return true;}}),
                   Entrance(RR_FIRE_TEMPLE_WEST_CENTRAL_LOWER,  {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 8);}}),
-                  Entrance(RR_FIRE_TEMPLE_LATE_FIRE_MAZE,      {[]{return randoCtx->GetTrickOption(RT_FIRE_FLAME_MAZE) || false;}}),
+                  Entrance(RR_FIRE_TEMPLE_LATE_FIRE_MAZE,      {[]{return ctx->GetTrickOption(RT_FIRE_FLAME_MAZE) || false;}}),
   });
 
   areaTable[RR_FIRE_TEMPLE_FIRE_MAZE_UPPER] = Region("Fire Temple Fire Maze Upper", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
@@ -251,7 +252,7 @@ void RegionTable_Init_FireTemple() {
 
   areaTable[RR_FIRE_TEMPLE_WEST_CENTRAL_LOWER] = Region("Fire Temple West Central Lower", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_FIRE_TEMPLE_HIGHEST_GORON_CHEST, Here(RR_FIRE_TEMPLE_WEST_CENTRAL_UPPER, []{return (logic->CanUse(RG_SONG_OF_TIME) || randoCtx->GetTrickOption(RT_RUSTED_SWITCHES)) && logic->CanUse(RG_MEGATON_HAMMER);})),
+                  LOCATION(RC_FIRE_TEMPLE_HIGHEST_GORON_CHEST, Here(RR_FIRE_TEMPLE_WEST_CENTRAL_UPPER, []{return (logic->CanUse(RG_SONG_OF_TIME) || ctx->GetTrickOption(RT_RUSTED_SWITCHES)) && logic->CanUse(RG_MEGATON_HAMMER);})),
                 }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_ROOM,     {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 8);}}),
@@ -270,21 +271,21 @@ void RegionTable_Init_FireTemple() {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_ROOM,     {[]{return false;}}),
                   Entrance(RR_FIRE_TEMPLE_WEST_CENTRAL_LOWER, {[]{return true;}}),
-                  Entrance(RR_FIRE_TEMPLE_UPPER_FLARE_DANCER, {[]{return logic->HasExplosives;}}),
+                  Entrance(RR_FIRE_TEMPLE_UPPER_FLARE_DANCER, {[]{return logic->HasExplosives();}}),
   });
 
   areaTable[RR_FIRE_TEMPLE_UPPER_FLARE_DANCER] = Region("Fire Temple Upper Flare Dancer", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_FIRE_TEMPLE_LATE_FIRE_MAZE, {[]{return Here(RR_FIRE_TEMPLE_UPPER_FLARE_DANCER, []{return logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_HOOKSHOT) || (logic->HasExplosives && ((logic->CanUse(RG_KOKIRI_SWORD)) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) ||
+                  Entrance(RR_FIRE_TEMPLE_LATE_FIRE_MAZE, {[]{return Here(RR_FIRE_TEMPLE_UPPER_FLARE_DANCER, []{return logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_HOOKSHOT) || (logic->HasExplosives() && ((logic->CanUse(RG_KOKIRI_SWORD)) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) ||
                    logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_BOOMERANG)));});}}),
-                  Entrance(RR_FIRE_TEMPLE_WEST_CLIMB,     {[]{return Here(RR_FIRE_TEMPLE_UPPER_FLARE_DANCER, []{return logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_HOOKSHOT) || (logic->HasExplosives && ((logic->CanUse(RG_KOKIRI_SWORD)) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) ||
+                  Entrance(RR_FIRE_TEMPLE_WEST_CLIMB,     {[]{return Here(RR_FIRE_TEMPLE_UPPER_FLARE_DANCER, []{return logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_HOOKSHOT) || (logic->HasExplosives() && ((logic->CanUse(RG_KOKIRI_SWORD)) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) ||
                    logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG)));});}}),
   });
 
   areaTable[RR_FIRE_TEMPLE_WEST_CLIMB] = Region("Fire Temple West Climb", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_UPPER_FLARE_DANCER, {[]{return true;}}),
-                  Entrance(RR_FIRE_TEMPLE_WEST_PEAK,          {[]{return logic->CanUseProjectile;}}),
+                  Entrance(RR_FIRE_TEMPLE_WEST_PEAK,          {[]{return logic->CanUseProjectile();}}),
   });
 
   areaTable[RR_FIRE_TEMPLE_WEST_PEAK] = Region("Fire Temple West Peak", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -292,7 +293,7 @@ void RegionTable_Init_FireTemple() {
                   LOCATION(RC_FIRE_TEMPLE_MEGATON_HAMMER_CHEST, true),
                 }, {
                   //Exits
-                  Entrance(RR_FIRE_TEMPLE_WEST_CENTRAL_UPPER, {[]{return logic->CanTakeDamage;}}),
+                  Entrance(RR_FIRE_TEMPLE_WEST_CENTRAL_UPPER, {[]{return logic->TakeDamage();}}),
                   Entrance(RR_FIRE_TEMPLE_WEST_CLIMB,         {[]{return true;}}),
                   Entrance(RR_FIRE_TEMPLE_HAMMER_RETURN_PATH, {[]{return logic->CanUse(RG_MEGATON_HAMMER);}}),
   });
@@ -312,18 +313,18 @@ void RegionTable_Init_FireTemple() {
   /*---------------------------
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
-  if (randoCtx->GetDungeon(FIRE_TEMPLE)->IsMQ()) {
+  if (ctx->GetDungeon(FIRE_TEMPLE)->IsMQ()) {
   areaTable[RR_FIRE_TEMPLE_MQ_LOWER] = Region("Fire Temple MQ Lower", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST, logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->Bombs || logic->CanUse(RG_DINS_FIRE)),
-                  LOCATION(RC_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST,     logic->IsAdult && (randoCtx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS) || logic->CanUse(RG_GORON_TUNIC)) && (((logic->CanUse(RG_HOVER_BOOTS) || (randoCtx->GetTrickOption(RT_FIRE_MQ_NEAR_BOSS) && logic->CanUse(RG_FAIRY_BOW))) && logic->HasFireSource) || (logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_FIRE_ARROWS) || (logic->CanUse(RG_DINS_FIRE) && ((randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_OHKO) && randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_QUADRUPLE) && randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_OCTUPLE) && randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_SEXDECUPLE)) || logic->CanUse(RG_GORON_TUNIC) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_LONGSHOT)))))),
-                    //Trick: logic->IsAdult && (LogicFewerTunicRequirements || logic->CanUse(RG_GORON_TUNIC)) && (((logic->CanUse(RG_HOVER_BOOTS) || (LogicFireMQNearBoss && logic->CanUse(RG_FAIRY_BOW))) && logic->HasFireSource) || (logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_FIRE_ARROWS) || (logic->CanUse(RG_DINS_FIRE) && ((DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_QUADRUPLE) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OCTUPLE) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_SEXDECUPLE)) || logic->CanUse(RG_GORON_TUNIC) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_LONGSHOT)))))
+                  LOCATION(RC_FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST, logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_BOMB_BAG) || logic->CanUse(RG_DINS_FIRE)),
+                  LOCATION(RC_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST,     logic->IsAdult && (ctx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS) || logic->CanUse(RG_GORON_TUNIC)) && (((logic->CanUse(RG_HOVER_BOOTS) || (ctx->GetTrickOption(RT_FIRE_MQ_NEAR_BOSS) && logic->CanUse(RG_FAIRY_BOW))) && logic->HasFireSource()) || (logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_FIRE_ARROWS) || (logic->CanUse(RG_DINS_FIRE) && ((ctx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_OHKO) && ctx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_QUADRUPLE) && ctx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_OCTUPLE) && ctx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_SEXDECUPLE)) || logic->CanUse(RG_GORON_TUNIC) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_LONGSHOT)))))),
+                    //Trick: logic->IsAdult && (LogicFewerTunicRequirements || logic->CanUse(RG_GORON_TUNIC)) && (((logic->CanUse(RG_HOVER_BOOTS) || (LogicFireMQNearBoss && logic->CanUse(RG_FAIRY_BOW))) && logic->HasFireSource()) || (logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_FIRE_ARROWS) || (logic->CanUse(RG_DINS_FIRE) && ((DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_QUADRUPLE) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OCTUPLE) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_SEXDECUPLE)) || logic->CanUse(RG_GORON_TUNIC) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_LONGSHOT)))))
   }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_ENTRYWAY,             {[]{return true;}}),
-                  Entrance(RR_FIRE_TEMPLE_BOSS_ENTRYWAY,        {[]{return logic->IsAdult && logic->CanUse(RG_GORON_TUNIC) && logic->CanUse(RG_MEGATON_HAMMER) && logic->BossKeyFireTemple && ((logic->HasFireSource && (randoCtx->GetTrickOption(RT_FIRE_BOSS_DOOR_JUMP) || logic->HoverBoots)) || HasAccessTo(RR_FIRE_TEMPLE_MQ_UPPER));}}),
+                  Entrance(RR_FIRE_TEMPLE_BOSS_ENTRYWAY,        {[]{return logic->IsAdult && logic->CanUse(RG_GORON_TUNIC) && logic->CanUse(RG_MEGATON_HAMMER) && logic->HasItem(RG_FIRE_TEMPLE_BOSS_KEY) && ((logic->HasFireSource() && (ctx->GetTrickOption(RT_FIRE_BOSS_DOOR_JUMP) || logic->CanUse(RG_HOVER_BOOTS))) || HasAccessTo(RR_FIRE_TEMPLE_MQ_UPPER));}}),
                   Entrance(RR_FIRE_TEMPLE_MQ_LOWER_LOCKED_DOOR, {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 5) && (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD));}}),
-                  Entrance(RR_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM,     {[]{return logic->IsAdult && logic->FireTimer >= 24 && logic->CanUse(RG_MEGATON_HAMMER);}}),
+                  Entrance(RR_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM,     {[]{return logic->IsAdult && logic->FireTimer() >= 24 && logic->CanUse(RG_MEGATON_HAMMER);}}),
   });
 
   areaTable[RR_FIRE_TEMPLE_MQ_LOWER_LOCKED_DOOR] = Region("Fire Temple MQ Lower Locked Door", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
@@ -331,47 +332,47 @@ void RegionTable_Init_FireTemple() {
                   EventAccess(&logic->FairyPot, {[]{return true;}}),
   }, {
                   //Locations
-                  LOCATION(RC_FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST, logic->IsAdult && (logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_HOOKSHOT) || (logic->HasExplosives && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG))))),
+                  LOCATION(RC_FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST, logic->IsAdult && (logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_HOOKSHOT) || (logic->HasExplosives() && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG))))),
                   LOCATION(RC_FIRE_TEMPLE_MQ_MAP_CHEST,            logic->IsAdult && logic->CanUse(RG_MEGATON_HAMMER)),
   }, {});
 
   areaTable[RR_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM] = Region("Fire Temple MQ Big Lava Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->FairyPot, {[]{return logic->FairyPot || (logic->HasFireSource && (logic->Bow || randoCtx->GetTrickOption(RT_FIRE_MQ_BK_CHEST)) && logic->IsAdult && (logic->CanUse(RG_HOOKSHOT) || randoCtx->GetTrickOption(RT_FIRE_SOT)));}}),
-                    //Trick: logic->HasFireSource && (logic->Bow || LogicFireMQBKChest) && logic->IsAdult && (logic->CanUse(RG_HOOKSHOT) || LogicFireSongOfTime)
+                  EventAccess(&logic->FairyPot, {[]{return logic->FairyPot || (logic->HasFireSource() && (logic->CanUse(RG_FAIRY_BOW) || ctx->GetTrickOption(RT_FIRE_MQ_BK_CHEST)) && logic->IsAdult && (logic->CanUse(RG_HOOKSHOT) || ctx->GetTrickOption(RT_FIRE_SOT)));}}),
+                    //Trick: logic->HasFireSource() && (logic->CanUse(RG_FAIRY_BOW) || LogicFireMQBKChest) && logic->IsAdult && (logic->CanUse(RG_HOOKSHOT) || LogicFireSongOfTime)
   }, {
                   //Locations
-                  LOCATION(RC_FIRE_TEMPLE_MQ_BOSS_KEY_CHEST,                   logic->HasFireSource && (logic->Bow || randoCtx->GetTrickOption(RT_FIRE_MQ_BK_CHEST)) && logic->IsAdult && logic->CanUse(RG_HOOKSHOT)),
-                    //Trick: logic->HasFireSource && (logic->Bow || LogicFireMQBKChest) && logic->IsAdult && logic->CanUse(RG_HOOKSHOT)
-                  LOCATION(RC_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST, logic->HasFireSource && logic->HasExplosives && logic->IsAdult && (logic->CanUse(RG_HOOKSHOT) || randoCtx->GetTrickOption(RT_FIRE_MQ_BLOCKED_CHEST))),
-                    //Trick: logic->HasFireSource && logic->HasExplosives && logic->IsAdult && (logic->CanUse(RG_HOOKSHOT) || LogicFireMQBlockedChest)
+                  LOCATION(RC_FIRE_TEMPLE_MQ_BOSS_KEY_CHEST,                   logic->HasFireSource() && (logic->CanUse(RG_FAIRY_BOW) || ctx->GetTrickOption(RT_FIRE_MQ_BK_CHEST)) && logic->IsAdult && logic->CanUse(RG_HOOKSHOT)),
+                    //Trick: logic->HasFireSource() && (logic->CanUse(RG_FAIRY_BOW) || LogicFireMQBKChest) && logic->IsAdult && logic->CanUse(RG_HOOKSHOT)
+                  LOCATION(RC_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST, logic->HasFireSource() && logic->HasExplosives() && logic->IsAdult && (logic->CanUse(RG_HOOKSHOT) || ctx->GetTrickOption(RT_FIRE_MQ_BLOCKED_CHEST))),
+                    //Trick: logic->HasFireSource() && logic->HasExplosives() && logic->IsAdult && (logic->CanUse(RG_HOOKSHOT) || LogicFireMQBlockedChest)
                   LOCATION(RC_FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR,       true),
   }, {
                   //Exits
-                  Entrance(RR_FIRE_TEMPLE_MQ_LOWER_MAZE, {[]{return logic->IsAdult && logic->CanUse(RG_GORON_TUNIC) && logic->SmallKeys(RR_FIRE_TEMPLE, 2) && (logic->HasFireSource || (randoCtx->GetTrickOption(RT_FIRE_MQ_CLIMB) && logic->HoverBoots));}}),
-                    //Trick: logic->IsAdult && logic->CanUse(RG_GORON_TUNIC) && logic->SmallKeys(RR_FIRE_TEMPLE, 2) && (logic->HasFireSource || (LogicFireMQClimb && logic->HoverBoots))
+                  Entrance(RR_FIRE_TEMPLE_MQ_LOWER_MAZE, {[]{return logic->IsAdult && logic->CanUse(RG_GORON_TUNIC) && logic->SmallKeys(RR_FIRE_TEMPLE, 2) && (logic->HasFireSource() || (ctx->GetTrickOption(RT_FIRE_MQ_CLIMB) && logic->CanUse(RG_HOVER_BOOTS)));}}),
+                    //Trick: logic->IsAdult && logic->CanUse(RG_GORON_TUNIC) && logic->SmallKeys(RR_FIRE_TEMPLE, 2) && (logic->HasFireSource() || (LogicFireMQClimb && logic->CanUse(RG_HOVER_BOOTS)))
   });
 
   areaTable[RR_FIRE_TEMPLE_MQ_LOWER_MAZE] = Region("Fire Temple MQ Lower Maze", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST,     logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)),
-                  LOCATION(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST, logic->HasExplosives && (randoCtx->GetTrickOption(RT_FIRE_MQ_MAZE_SIDE_ROOM) || HasAccessTo(RR_FIRE_TEMPLE_MQ_UPPER_MAZE))),
-                    //Trick: logic->HasExplosives && (LogicFireMQMazeSideRoom || FIRE_TEMPLE_MQ_UPPER_MAZE.Adult())
+                  LOCATION(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST, logic->HasExplosives() && (ctx->GetTrickOption(RT_FIRE_MQ_MAZE_SIDE_ROOM) || HasAccessTo(RR_FIRE_TEMPLE_MQ_UPPER_MAZE))),
+                    //Trick: logic->HasExplosives() && (LogicFireMQMazeSideRoom || FIRE_TEMPLE_MQ_UPPER_MAZE.Adult())
    }, {
                   //Exits
-                  Entrance(RR_FIRE_TEMPLE_MQ_UPPER_MAZE, {[]{return (logic->IsAdult && ((logic->HasExplosives && logic->CanUse(RG_HOOKSHOT)) || (randoCtx->GetTrickOption(RT_FIRE_MQ_MAZE_HOVERS) && logic->CanUse(RG_HOVER_BOOTS)))) || randoCtx->GetTrickOption(RT_FIRE_MQ_MAZE_JUMP);}}),
-                    //Trick: (logic->IsAdult && ((logic->HasExplosives && logic->CanUse(RG_HOOKSHOT)) || (LogicFireMQMazeHovers && logic->CanUse(RG_HOVER_BOOTS)))) || LogicFireMQMazeJump
+                  Entrance(RR_FIRE_TEMPLE_MQ_UPPER_MAZE, {[]{return (logic->IsAdult && ((logic->HasExplosives() && logic->CanUse(RG_HOOKSHOT)) || (ctx->GetTrickOption(RT_FIRE_MQ_MAZE_HOVERS) && logic->CanUse(RG_HOVER_BOOTS)))) || ctx->GetTrickOption(RT_FIRE_MQ_MAZE_JUMP);}}),
+                    //Trick: (logic->IsAdult && ((logic->HasExplosives() && logic->CanUse(RG_HOOKSHOT)) || (LogicFireMQMazeHovers && logic->CanUse(RG_HOVER_BOOTS)))) || LogicFireMQMazeJump
   });
 
   areaTable[RR_FIRE_TEMPLE_MQ_UPPER_MAZE] = Region("Fire Temple MQ Upper Maze", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  //EventAccess(&WallFairy, {[]{return WallFairy || (logic->IsAdult && (((logic->CanUse(RG_SONG_OF_TIME) && logic->CanUse(RG_HOOKSHOT) && logic->HasExplosives) || logic->CanUse(RG_LONGSHOT))));}}),
+                  //EventAccess(&WallFairy, {[]{return WallFairy || (logic->IsAdult && (((logic->CanUse(RG_SONG_OF_TIME) && logic->CanUse(RG_HOOKSHOT) && logic->HasExplosives()) || logic->CanUse(RG_LONGSHOT))));}}),
                   EventAccess(&logic->FairyPot,  {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 3);}}),
   }, {
                   //Locations
                   LOCATION(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST, true),
-                  LOCATION(RC_FIRE_TEMPLE_MQ_COMPASS_CHEST,             logic->HasExplosives),
-                  LOCATION(RC_FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE,          logic->IsAdult && ((logic->CanUse(RG_SONG_OF_TIME) && logic->CanUse(RG_HOOKSHOT) && logic->HasExplosives) || logic->CanUse(RG_LONGSHOT))),
+                  LOCATION(RC_FIRE_TEMPLE_MQ_COMPASS_CHEST,             logic->HasExplosives()),
+                  LOCATION(RC_FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE,          logic->IsAdult && ((logic->CanUse(RG_SONG_OF_TIME) && logic->CanUse(RG_HOOKSHOT) && logic->HasExplosives()) || logic->CanUse(RG_LONGSHOT))),
   }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_MQ_UPPER, {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 3) && logic->IsAdult && ((logic->CanUse(RG_FAIRY_BOW) && logic->CanUse(RG_HOOKSHOT)) || logic->CanUse(RG_FIRE_ARROWS));}}),
@@ -379,14 +380,14 @@ void RegionTable_Init_FireTemple() {
 
   areaTable[RR_FIRE_TEMPLE_MQ_UPPER] = Region("Fire Temple MQ Upper", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_FIRE_TEMPLE_MQ_FREESTANDING_KEY,            ((logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG)) && logic->CanUse(RG_HOOKSHOT)) || randoCtx->GetTrickOption(RT_FIRE_MQ_FLAME_MAZE)),
+                  LOCATION(RC_FIRE_TEMPLE_MQ_FREESTANDING_KEY,            ((logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG)) && logic->CanUse(RG_HOOKSHOT)) || ctx->GetTrickOption(RT_FIRE_MQ_FLAME_MAZE)),
                     //Trick: (logic->IsAdult && logic->CanUse(RG_HOOKSHOT)) || LogicFireMQFlameMaze
-                  LOCATION(RC_FIRE_TEMPLE_MQ_CHEST_ON_FIRE,               ((logic->IsAdult && logic->CanUse(RG_HOOKSHOT)) || randoCtx->GetTrickOption(RT_FIRE_MQ_FLAME_MAZE)) && logic->SmallKeys(RR_FIRE_TEMPLE, 4)),
+                  LOCATION(RC_FIRE_TEMPLE_MQ_CHEST_ON_FIRE,               ((logic->IsAdult && logic->CanUse(RG_HOOKSHOT)) || ctx->GetTrickOption(RT_FIRE_MQ_FLAME_MAZE)) && logic->SmallKeys(RR_FIRE_TEMPLE, 4)),
                     //Trick: ((logic->IsAdult && logic->CanUse(RG_HOOKSHOT)) || LogicFireMQFlameMaze) && logic->SmallKeys(RR_FIRE_TEMPLE, 4)
-                  LOCATION(RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM, logic->CanUse(RG_SONG_OF_TIME) || logic->HoverBoots || randoCtx->GetTrickOption(RT_FIRE_MQ_FLAME_MAZE)),
-                    //Trick: logic->CanUse(RG_SONG_OF_TIME) || logic->HoverBoots || LogicFireMQFlameMaze
-                  LOCATION(RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER,    logic->HasExplosives),
-                  LOCATION(RC_FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE,     (logic->IsAdult && logic->CanUse(RG_HOOKSHOT) && logic->SmallKeys(RR_FIRE_TEMPLE, 5)) || (randoCtx->GetTrickOption(RT_FIRE_MQ_ABOVE_MAZE_GS) && logic->IsAdult && logic->CanUse(RG_LONGSHOT))),
+                  LOCATION(RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM, logic->CanUse(RG_SONG_OF_TIME) || logic->CanUse(RG_HOVER_BOOTS) || ctx->GetTrickOption(RT_FIRE_MQ_FLAME_MAZE)),
+                    //Trick: logic->CanUse(RG_SONG_OF_TIME) || logic->CanUse(RG_HOVER_BOOTS) || LogicFireMQFlameMaze
+                  LOCATION(RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER,    logic->HasExplosives()),
+                  LOCATION(RC_FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE,     (logic->IsAdult && logic->CanUse(RG_HOOKSHOT) && logic->SmallKeys(RR_FIRE_TEMPLE, 5)) || (ctx->GetTrickOption(RT_FIRE_MQ_ABOVE_MAZE_GS) && logic->IsAdult && logic->CanUse(RG_LONGSHOT))),
                     //Trick: (logic->IsAdult && logic->CanUse(RG_HOOKSHOT) && logic->SmallKeys(RR_FIRE_TEMPLE, 5)) || (LogicFireMQAboveMazeGS && logic->IsAdult && logic->CanUse(RG_LONGSHOT))
   }, {});
   }
@@ -398,8 +399,8 @@ void RegionTable_Init_FireTemple() {
         Region("Fire Temple Boss Entryway", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
              {
                  // Exits
-                 Entrance(RR_FIRE_TEMPLE_NEAR_BOSS_ROOM, { [] { return randoCtx->GetDungeon(FIRE_TEMPLE)->IsVanilla() && false; } }),
-                 Entrance(RR_FIRE_TEMPLE_MQ_LOWER, { [] { return randoCtx->GetDungeon(FIRE_TEMPLE)->IsMQ() && false; } }),
+                 Entrance(RR_FIRE_TEMPLE_NEAR_BOSS_ROOM, { [] { return ctx->GetDungeon(FIRE_TEMPLE)->IsVanilla() && false; } }),
+                 Entrance(RR_FIRE_TEMPLE_MQ_LOWER, { [] { return ctx->GetDungeon(FIRE_TEMPLE)->IsMQ() && false; } }),
                  Entrance(RR_FIRE_TEMPLE_BOSS_ROOM, { [] { return true; } }),
              });
 
@@ -408,7 +409,7 @@ void RegionTable_Init_FireTemple() {
              {
                  // Events
                  EventAccess(&logic->FireTempleClear,
-                             { [] { return logic->FireTempleClear || (logic->HasBossSoul(RG_VOLVAGIA_SOUL) && (logic->FireTimer >= 64 && logic->CanUse(RG_MEGATON_HAMMER))); }}),
+                             { [] { return logic->FireTempleClear || (logic->HasBossSoul(RG_VOLVAGIA_SOUL) && (logic->FireTimer() >= 64 && logic->CanUse(RG_MEGATON_HAMMER))); }}),
              },
              {
                  // Locations
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp
index 5619560dc..56b0499cc 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp
@@ -10,19 +10,19 @@ void RegionTable_Init_ForestTemple() {
   ---------------------------*/
   areaTable[RR_FOREST_TEMPLE_ENTRYWAY] = Region("Forest Temple Entryway", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_FOREST_TEMPLE_FIRST_ROOM, {[]{return randoCtx->GetDungeon(FOREST_TEMPLE)->IsVanilla();}}),
-                  Entrance(RR_FOREST_TEMPLE_MQ_LOBBY,   {[]{return randoCtx->GetDungeon(FOREST_TEMPLE)->IsMQ();}}),
+                  Entrance(RR_FOREST_TEMPLE_FIRST_ROOM, {[]{return ctx->GetDungeon(FOREST_TEMPLE)->IsVanilla();}}),
+                  Entrance(RR_FOREST_TEMPLE_MQ_LOBBY,   {[]{return ctx->GetDungeon(FOREST_TEMPLE)->IsMQ();}}),
                   Entrance(RR_SACRED_FOREST_MEADOW,     {[]{return true;}}),
   });
 
   /*--------------------------
   |     VANILLA DUNGEON      |
   ---------------------------*/
-  if (randoCtx->GetDungeon(FOREST_TEMPLE)->IsVanilla()) {
+  if (ctx->GetDungeon(FOREST_TEMPLE)->IsVanilla()) {
   areaTable[RR_FOREST_TEMPLE_FIRST_ROOM] = Region("Forest Temple First Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FOREST_TEMPLE_FIRST_ROOM_CHEST, true),
-                  LOCATION(RC_FOREST_TEMPLE_GS_FIRST_ROOM,    (logic->IsAdult && logic->Bombs) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_BOOMERANG) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOMBCHU_5) || logic->CanUse(RG_DINS_FIRE) || (randoCtx->GetTrickOption(RT_FOREST_FIRST_GS) && (logic->CanJumpslash || (logic->IsChild && logic->Bombs)))),
+                  LOCATION(RC_FOREST_TEMPLE_GS_FIRST_ROOM,    (logic->IsAdult && logic->CanUse(RG_BOMB_BAG)) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_BOOMERANG) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOMBCHU_5) || logic->CanUse(RG_DINS_FIRE) || (ctx->GetTrickOption(RT_FOREST_FIRST_GS) && (logic->CanJumpslash() || (logic->IsChild && logic->CanUse(RG_BOMB_BAG))))),
                 }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_ENTRYWAY,       {[]{return true;}}),
@@ -32,7 +32,7 @@ void RegionTable_Init_ForestTemple() {
   areaTable[RR_FOREST_TEMPLE_SOUTH_CORRIDOR] = Region("Forest Temple South Corridor", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_FIRST_ROOM, {[]{return true;}}),
-                  Entrance(RR_FOREST_TEMPLE_LOBBY,      {[]{return logic->CanAdultAttack || logic->CanChildAttack || logic->CanUse(RG_NUTS);}}),
+                  Entrance(RR_FOREST_TEMPLE_LOBBY,      {[]{return logic->CanAttack() || logic->CanUse(RG_NUTS);}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_LOBBY] = Region("Forest Temple Lobby", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
@@ -40,7 +40,7 @@ void RegionTable_Init_ForestTemple() {
                   EventAccess(&logic->ForestTempleMeg, {[]{return logic->ForestTempleMeg || (logic->ForestTempleJoelle && logic->ForestTempleBeth && logic->ForestTempleAmy && logic->CanUse(RG_FAIRY_BOW));}}),
                 }, {
                   //Locations
-                  LOCATION(RC_FOREST_TEMPLE_GS_LOBBY, logic->HookshotOrBoomerang),
+                  LOCATION(RC_FOREST_TEMPLE_GS_LOBBY, logic->HookshotOrBoomerang()),
                 }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_SOUTH_CORRIDOR,    {[]{return true;}}),
@@ -73,23 +73,23 @@ void RegionTable_Init_ForestTemple() {
   areaTable[RR_FOREST_TEMPLE_NW_OUTDOORS_LOWER] = Region("Forest Temple NW Outdoors Lower", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
-                  EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUse(RG_DINS_FIRE));}}),
+                  EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives() || logic->CanUse(RG_DINS_FIRE));}}),
                 }, {
                   //Locations
-                  LOCATION(RC_FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD, logic->CanUse(RG_LONGSHOT) || Here(RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER, []{return logic->HookshotOrBoomerang;})),
+                  LOCATION(RC_FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD, logic->CanUse(RG_LONGSHOT) || Here(RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER, []{return logic->HookshotOrBoomerang();})),
                 }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_LOBBY,             {[]{return logic->CanUse(RG_SONG_OF_TIME);}}),
                   Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER, {[]{return false;}}),
                   Entrance(RR_FOREST_TEMPLE_MAP_ROOM,          {[]{return true;}}),
-                  Entrance(RR_FOREST_TEMPLE_SEWER,             {[]{return logic->GoldScale || logic->CanUse(RG_IRON_BOOTS) || HasAccessTo(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER);}}),
+                  Entrance(RR_FOREST_TEMPLE_SEWER,             {[]{return logic->HasItem(RG_GOLDEN_SCALE) || logic->CanUse(RG_IRON_BOOTS) || HasAccessTo(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER);}}),
                   Entrance(RR_FOREST_TEMPLE_BOSS_ENTRYWAY,     {[]{return false;}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER] = Region("Forest Temple NW Outdoors Upper", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
-                  EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUse(RG_DINS_FIRE));}}),
+                  EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives() || logic->CanUse(RG_DINS_FIRE));}}),
                 }, {}, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_LOWER,    {[]{return true;}}),
@@ -101,37 +101,37 @@ void RegionTable_Init_ForestTemple() {
   areaTable[RR_FOREST_TEMPLE_NE_OUTDOORS_LOWER] = Region("Forest Temple NE Outdoors Lower", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
-                  EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUse(RG_DINS_FIRE));}}),
+                  EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives() || logic->CanUse(RG_DINS_FIRE));}}),
                 }, {
                   //Locations
-                  LOCATION(RC_FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST, logic->CanUse(RG_HOOKSHOT) || HasAccessTo(RR_FOREST_TEMPLE_FALLING_ROOM) || (HasAccessTo(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER) && logic->IsAdult && randoCtx->GetTrickOption(RT_FOREST_OUTDOORS_LEDGE) && logic->HoverBoots)),
-                  LOCATION(RC_FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD,    logic->CanUse(RG_HOOKSHOT) || (randoCtx->GetTrickOption(RT_FOREST_OUTDOORS_EAST_GS) && logic->CanUse(RG_BOOMERANG)) || Here(RR_FOREST_TEMPLE_FALLING_ROOM, []{return logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_DINS_FIRE) || logic->HasExplosives;})),
+                  LOCATION(RC_FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST, logic->CanUse(RG_HOOKSHOT) || HasAccessTo(RR_FOREST_TEMPLE_FALLING_ROOM) || (HasAccessTo(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER) && logic->IsAdult && ctx->GetTrickOption(RT_FOREST_OUTDOORS_LEDGE) && logic->CanUse(RG_HOVER_BOOTS))),
+                  LOCATION(RC_FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD,    logic->CanUse(RG_HOOKSHOT) || (ctx->GetTrickOption(RT_FOREST_OUTDOORS_EAST_GS) && logic->CanUse(RG_BOOMERANG)) || Here(RR_FOREST_TEMPLE_FALLING_ROOM, []{return logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_DINS_FIRE) || logic->HasExplosives();})),
                 }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_LOBBY,             {[]{return true;}}),
-                  Entrance(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER, {[]{return logic->CanUse(RG_LONGSHOT) || (randoCtx->GetTrickOption(RT_FOREST_VINES) && logic->CanUse(RG_HOOKSHOT));}}),
-                  Entrance(RR_FOREST_TEMPLE_SEWER,             {[]{return logic->GoldScale || logic->CanUse(RG_IRON_BOOTS) || HasAccessTo(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER);}}),
+                  Entrance(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER, {[]{return logic->CanUse(RG_LONGSHOT) || (ctx->GetTrickOption(RT_FOREST_VINES) && logic->CanUse(RG_HOOKSHOT));}}),
+                  Entrance(RR_FOREST_TEMPLE_SEWER,             {[]{return logic->HasItem(RG_GOLDEN_SCALE) || logic->CanUse(RG_IRON_BOOTS) || HasAccessTo(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER);}}),
                   Entrance(RR_FOREST_TEMPLE_FALLING_ROOM,      {[]{return false;}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER] = Region("Forest Temple NE Outdoors Upper", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
-                  EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUse(RG_DINS_FIRE));}}),
+                  EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives() || logic->CanUse(RG_DINS_FIRE));}}),
                 }, {}, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_NE_OUTDOORS_LOWER, {[]{return true;}}),
                   Entrance(RR_FOREST_TEMPLE_MAP_ROOM,          {[]{return true;}}),
-                  Entrance(RR_FOREST_TEMPLE_FALLING_ROOM,      {[]{return randoCtx->GetTrickOption(RT_FOREST_DOORFRAME) && logic->CanJumpslash && logic->CanUse(RG_HOVER_BOOTS) && logic->CanUse(RG_SCARECROW);}}),
+                  Entrance(RR_FOREST_TEMPLE_FALLING_ROOM,      {[]{return ctx->GetTrickOption(RT_FOREST_DOORFRAME) && logic->CanJumpslash() && logic->CanUse(RG_HOVER_BOOTS) && logic->CanUse(RG_SCARECROW);}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_MAP_ROOM] = Region("Forest Temple Map Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_FOREST_TEMPLE_MAP_CHEST, Here(RR_FOREST_TEMPLE_MAP_ROOM, []{return logic->HasExplosives || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_FAIRY_BOW) || ((logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT)) && (logic->CanUse(RG_NUTS) || logic->HookshotOrBoomerang || logic->CanShield));})),
+                  LOCATION(RC_FOREST_TEMPLE_MAP_CHEST, Here(RR_FOREST_TEMPLE_MAP_ROOM, []{return logic->HasExplosives() || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_FAIRY_BOW) || ((logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT)) && (logic->CanUse(RG_NUTS) || logic->HookshotOrBoomerang() || logic->CanShield()));})),
                 }, {
                   //Exits
-                  Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_LOWER, {[]{return Here(RR_FOREST_TEMPLE_MAP_ROOM, []{return logic->HasExplosives || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_FAIRY_BOW) || ((logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT)) && (logic->CanUse(RG_NUTS) || logic->HookshotOrBoomerang || logic->CanShield));});}}),
-                  Entrance(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER, {[]{return Here(RR_FOREST_TEMPLE_MAP_ROOM, []{return logic->HasExplosives || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_FAIRY_BOW) || ((logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT)) && (logic->CanUse(RG_NUTS) || logic->HookshotOrBoomerang || logic->CanShield));});}}),
+                  Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_LOWER, {[]{return Here(RR_FOREST_TEMPLE_MAP_ROOM, []{return logic->HasExplosives() || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_FAIRY_BOW) || ((logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT)) && (logic->CanUse(RG_NUTS) || logic->HookshotOrBoomerang() || logic->CanShield()));});}}),
+                  Entrance(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER, {[]{return Here(RR_FOREST_TEMPLE_MAP_ROOM, []{return logic->HasExplosives() || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_FAIRY_BOW) || ((logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT)) && (logic->CanUse(RG_NUTS) || logic->HookshotOrBoomerang() || logic->CanShield()));});}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_SEWER] = Region("Forest Temple Sewer", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -145,12 +145,12 @@ void RegionTable_Init_ForestTemple() {
 
   areaTable[RR_FOREST_TEMPLE_BELOW_BOSS_KEY_CHEST] = Region("Forest Temple Below Boss Key Chest", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER, {[]{return Here(RR_FOREST_TEMPLE_BELOW_BOSS_KEY_CHEST, []{return logic->HasExplosives || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_FAIRY_BOW) || ((logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT)) && (logic->CanUse(RG_NUTS) || logic->HookshotOrBoomerang || logic->CanShield));});}}),
+                  Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER, {[]{return Here(RR_FOREST_TEMPLE_BELOW_BOSS_KEY_CHEST, []{return logic->HasExplosives() || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_FAIRY_BOW) || ((logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT)) && (logic->CanUse(RG_NUTS) || logic->HookshotOrBoomerang() || logic->CanShield()));});}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_FLOORMASTER_ROOM] = Region("Forest Temple Floormaster Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_FOREST_TEMPLE_FLOORMASTER_CHEST, logic->CanAdultDamage || logic->CanChildDamage),
+                  LOCATION(RC_FOREST_TEMPLE_FLOORMASTER_CHEST, logic->CanDamage()),
                 }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER, {[]{return true;}}),
@@ -159,18 +159,18 @@ void RegionTable_Init_ForestTemple() {
   areaTable[RR_FOREST_TEMPLE_WEST_CORRIDOR] = Region("Forest Temple West Corridor", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_LOBBY,           {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 1, 5);}}),
-                  Entrance(RR_FOREST_TEMPLE_BLOCK_PUSH_ROOM, {[]{return logic->CanAdultAttack || logic->CanChildAttack || logic->CanUse(RG_NUTS);}}),
+                  Entrance(RR_FOREST_TEMPLE_BLOCK_PUSH_ROOM, {[]{return logic->CanAttack() || logic->CanUse(RG_NUTS);}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_BLOCK_PUSH_ROOM] = Region("Forest Temple Block Push Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_FOREST_TEMPLE_EYE_SWITCH_CHEST, logic->GoronBracelet && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT))),
+                  LOCATION(RC_FOREST_TEMPLE_EYE_SWITCH_CHEST, logic->HasItem(RG_GORONS_BRACELET) && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT))),
                 }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_WEST_CORRIDOR,            {[]{return true;}}),
-                  Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER,        {[]{return logic->CanUse(RG_HOVER_BOOTS) || (randoCtx->GetTrickOption(RT_FOREST_OUTSIDE_BACKDOOR) && logic->CanJumpslash && logic->GoronBracelet);}}),
-                  Entrance(RR_FOREST_TEMPLE_NW_CORRIDOR_TWISTED,      {[]{return logic->IsAdult && logic->GoronBracelet && logic->SmallKeys(RR_FOREST_TEMPLE, 2);}}),
-                  Entrance(RR_FOREST_TEMPLE_NW_CORRIDOR_STRAIGHTENED, {[]{return logic->IsAdult && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT)) && logic->GoronBracelet && logic->SmallKeys(RR_FOREST_TEMPLE, 2);}}),
+                  Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER,        {[]{return logic->CanUse(RG_HOVER_BOOTS) || (ctx->GetTrickOption(RT_FOREST_OUTSIDE_BACKDOOR) && logic->CanJumpslash() && logic->HasItem(RG_GORONS_BRACELET));}}),
+                  Entrance(RR_FOREST_TEMPLE_NW_CORRIDOR_TWISTED,      {[]{return logic->IsAdult && logic->HasItem(RG_GORONS_BRACELET) && logic->SmallKeys(RR_FOREST_TEMPLE, 2);}}),
+                  Entrance(RR_FOREST_TEMPLE_NW_CORRIDOR_STRAIGHTENED, {[]{return logic->IsAdult && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT)) && logic->HasItem(RG_GORONS_BRACELET) && logic->SmallKeys(RR_FOREST_TEMPLE, 2);}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_NW_CORRIDOR_TWISTED] = Region("Forest Temple NW Corridor Twisted", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
@@ -259,33 +259,33 @@ void RegionTable_Init_ForestTemple() {
 
   areaTable[RR_FOREST_TEMPLE_EAST_CORRIDOR] = Region("Forest Temple East Corridor", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_FOREST_TEMPLE_LOBBY,          {[]{return logic->CanAdultAttack || logic->CanChildAttack || logic->CanUse(RG_NUTS);}}),
-                  Entrance(RR_FOREST_TEMPLE_GREEN_POE_ROOM, {[]{return logic->CanAdultAttack || logic->CanChildAttack || logic->CanUse(RG_NUTS);}}),
+                  Entrance(RR_FOREST_TEMPLE_LOBBY,          {[]{return logic->CanAttack() || logic->CanUse(RG_NUTS);}}),
+                  Entrance(RR_FOREST_TEMPLE_GREEN_POE_ROOM, {[]{return logic->CanAttack() || logic->CanUse(RG_NUTS);}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_BOSS_REGION] = Region("Forest Temple Boss Region", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FOREST_TEMPLE_BASEMENT_CHEST, true),
-                  LOCATION(RC_FOREST_TEMPLE_GS_BASEMENT,    logic->HookshotOrBoomerang),
+                  LOCATION(RC_FOREST_TEMPLE_GS_BASEMENT,    logic->HookshotOrBoomerang()),
                 }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_LOBBY,     {[]{return true;}}),
-                  Entrance(RR_FOREST_TEMPLE_BOSS_ENTRYWAY, {[]{return logic->BossKeyForestTemple;}}),
+                  Entrance(RR_FOREST_TEMPLE_BOSS_ENTRYWAY, {[]{return logic->HasItem(RG_FOREST_TEMPLE_BOSS_KEY);}}),
   });
   }
 
   /*---------------------------
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
-  if (randoCtx->GetDungeon(FOREST_TEMPLE)->IsMQ()) {
+  if (ctx->GetDungeon(FOREST_TEMPLE)->IsMQ()) {
   areaTable[RR_FOREST_TEMPLE_MQ_LOBBY] = Region("Forest Temple MQ Lobby", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST, logic->CanJumpslash || logic->Bombs || logic->CanUse(RG_STICKS) || logic->CanUse(RG_NUTS) || logic->HookshotOrBoomerang || logic->CanUse(RG_DINS_FIRE) || logic->KokiriSword || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOVER_BOOTS)),
-                  LOCATION(RC_FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY, logic->HookshotOrBoomerang),
+                  LOCATION(RC_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST, logic->CanJumpslash() || logic->CanUse(RG_BOMB_BAG) || logic->CanUse(RG_STICKS) || logic->CanUse(RG_NUTS) || logic->HookshotOrBoomerang() || logic->CanUse(RG_DINS_FIRE) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOVER_BOOTS)),
+                  LOCATION(RC_FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY, logic->HookshotOrBoomerang()),
   }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_ENTRYWAY,        {[]{return true;}}),
-                  Entrance(RR_FOREST_TEMPLE_MQ_CENTRAL_AREA, {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 1) && (logic->CanAdultAttack || logic->CanChildAttack || logic->CanUse(RG_NUTS));}}),
+                  Entrance(RR_FOREST_TEMPLE_MQ_CENTRAL_AREA, {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 1) && (logic->CanAttack() || logic->CanUse(RG_NUTS));}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_MQ_CENTRAL_AREA] = Region("Forest Temple MQ Central Region", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
@@ -293,15 +293,15 @@ void RegionTable_Init_ForestTemple() {
                   EventAccess(&logic->FairyPot, {[]{return true;}}),
   }, {
                   //Locations
-                  LOCATION(RC_FOREST_TEMPLE_MQ_WOLFOS_CHEST,       (logic->CanUse(RG_SONG_OF_TIME) || logic->IsChild) && (logic->CanJumpslash || logic->CanUse(RG_DINS_FIRE) || logic->CanUse(RG_STICKS) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->KokiriSword)),
+                  LOCATION(RC_FOREST_TEMPLE_MQ_WOLFOS_CHEST,       (logic->CanUse(RG_SONG_OF_TIME) || logic->IsChild) && (logic->CanJumpslash() || logic->CanUse(RG_DINS_FIRE) || logic->CanUse(RG_STICKS) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_KOKIRI_SWORD))),
                   LOCATION(RC_FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM, logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER)),
   }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_MQ_NW_OUTDOORS,        {[]{return logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT);}}),
                   Entrance(RR_FOREST_TEMPLE_MQ_NE_OUTDOORS,        {[]{return logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT);}}), //This is as far as child can get
-                  Entrance(RR_FOREST_TEMPLE_MQ_AFTER_BLOCK_PUZZLE, {[]{return logic->IsAdult && (logic->GoronBracelet || (randoCtx->GetTrickOption(RT_FOREST_MQ_BLOCK_PUZZLE) && logic->CanUse(RG_BOMBCHU_5) && logic->IsAdult && logic->CanUse(RG_HOOKSHOT)));}}),
-                    //Trick: logic->IsAdult && (logic->GoronBracelet || (LogicForestMQBlockPuzzle && logic->CanUse(RG_BOMBCHU_5) && logic->IsAdult && logic->CanUse(RG_HOOKSHOT)))
-                  Entrance(RR_FOREST_TEMPLE_MQ_OUTDOOR_LEDGE,      {[]{return (randoCtx->GetTrickOption(RT_FOREST_MQ_JS_HALLWAY_SWITCH) && logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS)) || (randoCtx->GetTrickOption(RT_FOREST_MQ_RANG_HALLWAY_SWITCH) && logic->CanUse(RG_BOOMERANG)) || (randoCtx->GetTrickOption(RT_FOREST_MQ_HOOKSHOT_HALLWAY_SWITCH) && logic->IsAdult && logic->CanUse(RG_HOOKSHOT));}}),
+                  Entrance(RR_FOREST_TEMPLE_MQ_AFTER_BLOCK_PUZZLE, {[]{return logic->IsAdult && (logic->HasItem(RG_GORONS_BRACELET) || (ctx->GetTrickOption(RT_FOREST_MQ_BLOCK_PUZZLE) && logic->CanUse(RG_BOMBCHU_5) && logic->IsAdult && logic->CanUse(RG_HOOKSHOT)));}}),
+                    //Trick: logic->IsAdult && (logic->HasItem(RG_GORONS_BRACELET) || (LogicForestMQBlockPuzzle && logic->CanUse(RG_BOMBCHU_5) && logic->IsAdult && logic->CanUse(RG_HOOKSHOT)))
+                  Entrance(RR_FOREST_TEMPLE_MQ_OUTDOOR_LEDGE,      {[]{return (ctx->GetTrickOption(RT_FOREST_MQ_JS_HALLWAY_SWITCH) && logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS)) || (ctx->GetTrickOption(RT_FOREST_MQ_RANG_HALLWAY_SWITCH) && logic->CanUse(RG_BOOMERANG)) || (ctx->GetTrickOption(RT_FOREST_MQ_HOOKSHOT_HALLWAY_SWITCH) && logic->IsAdult && logic->CanUse(RG_HOOKSHOT));}}),
                     //Trick (logic->Hookshot trick not added to either n64 or oot3d rando as of yet, to enable in SoH needs uncommenting in randomizer_tricks.cpp): (LogicForestMQHallwaySwitchJS && logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS)) || (LogicForestMQHallwaySwitchHookshot && logic->IsAdult && logic->CanUse(RG_HOOKSHOT)) 
                   Entrance(RR_FOREST_TEMPLE_MQ_BOSS_REGION,        {[]{return logic->ForestTempleJoAndBeth && logic->ForestTempleAmyAndMeg;}}),
   });
@@ -312,14 +312,14 @@ void RegionTable_Init_ForestTemple() {
   }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_MQ_BOW_REGION,    {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 4);}}),
-                  Entrance(RR_FOREST_TEMPLE_MQ_OUTDOOR_LEDGE, {[]{return  logic->SmallKeys(RR_FOREST_TEMPLE, 3) || (randoCtx->GetTrickOption(RT_FOREST_MQ_JS_HALLWAY_SWITCH) && ((logic->IsAdult && logic->CanUse(RG_HOOKSHOT)) || (randoCtx->GetTrickOption(RT_FOREST_OUTSIDE_BACKDOOR) && (logic->IsAdult || (logic->IsChild && logic->CanUse(RG_STICKS))))));}}),
+                  Entrance(RR_FOREST_TEMPLE_MQ_OUTDOOR_LEDGE, {[]{return  logic->SmallKeys(RR_FOREST_TEMPLE, 3) || (ctx->GetTrickOption(RT_FOREST_MQ_JS_HALLWAY_SWITCH) && ((logic->IsAdult && logic->CanUse(RG_HOOKSHOT)) || (ctx->GetTrickOption(RT_FOREST_OUTSIDE_BACKDOOR) && (logic->IsAdult || (logic->IsChild && logic->CanUse(RG_STICKS))))));}}),
                     //Trick (Doing the hallway switch jumpslash as child requires sticks and has been added above): logic->SmallKeys(RR_FOREST_TEMPLE, 3) || (LogicForestMQHallwaySwitchJS && ((logic->IsAdult && logic->CanUse(RG_HOOKSHOT)) || LogicForestOutsideBackdoor))
                   Entrance(RR_FOREST_TEMPLE_MQ_NW_OUTDOORS,   {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 2);}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_MQ_OUTDOOR_LEDGE] = Region("Forest Temple MQ Outdoor Ledge", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_FOREST_TEMPLE_MQ_REDEAD_CHEST, logic->CanJumpslash),
+                  LOCATION(RC_FOREST_TEMPLE_MQ_REDEAD_CHEST, logic->CanJumpslash()),
   }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_MQ_NW_OUTDOORS, {[]{return true;}}),
@@ -327,10 +327,10 @@ void RegionTable_Init_ForestTemple() {
 
   areaTable[RR_FOREST_TEMPLE_MQ_NW_OUTDOORS] = Region("Forest Temple MQ NW Outdoors", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD, logic->CanAdultAttack || logic->CanChildAttack),
+                  LOCATION(RC_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD, logic->CanAttack()),
   }, {
                   //Exits
-                  Entrance(RR_FOREST_TEMPLE_MQ_NE_OUTDOORS,         {[]{return (logic->IsAdult && (logic->CanUse(RG_IRON_BOOTS) || logic->CanUse(RG_LONGSHOT) || (randoCtx->GetTrickOption(RT_FOREST_MQ_WELL_SWIM) && logic->CanUse(RG_HOOKSHOT)))) || logic->ProgressiveScale >= 2;}}),
+                  Entrance(RR_FOREST_TEMPLE_MQ_NE_OUTDOORS,         {[]{return (logic->IsAdult && (logic->CanUse(RG_IRON_BOOTS) || logic->CanUse(RG_LONGSHOT) || (ctx->GetTrickOption(RT_FOREST_MQ_WELL_SWIM) && logic->CanUse(RG_HOOKSHOT)))) || logic->HasItem(RG_GOLDEN_SCALE);}}),
                     //Trick: (logic->IsAdult && (logic->CanUse(RG_IRON_BOOTS) || logic->CanUse(RG_LONGSHOT) || (LogicForestMQWellSwim && logic->CanUse(RG_HOOKSHOT)))) || logic->ProgressiveScale >= 2
                   Entrance(RR_FOREST_TEMPLE_MQ_OUTDOORS_TOP_LEDGES, {[]{return logic->IsAdult && logic->CanUse(RG_FIRE_ARROWS);}}),
   });
@@ -338,11 +338,11 @@ void RegionTable_Init_ForestTemple() {
   areaTable[RR_FOREST_TEMPLE_MQ_NE_OUTDOORS] = Region("Forest Temple MQ NE Outdoors", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
-                  EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUse(RG_DINS_FIRE));}}),
+                  EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives() || logic->CanUse(RG_DINS_FIRE));}}),
   }, {
                   //Locations
                   LOCATION(RC_FOREST_TEMPLE_MQ_WELL_CHEST,                 (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW)) || (logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT))),
-                  LOCATION(RC_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD, logic->HookshotOrBoomerang || (logic->IsAdult && logic->CanUse(RG_FIRE_ARROWS) && (logic->CanUse(RG_SONG_OF_TIME) || (logic->CanUse(RG_HOVER_BOOTS) && randoCtx->GetTrickOption(RT_FOREST_DOORFRAME))))),
+                  LOCATION(RC_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD, logic->HookshotOrBoomerang() || (logic->IsAdult && logic->CanUse(RG_FIRE_ARROWS) && (logic->CanUse(RG_SONG_OF_TIME) || (logic->CanUse(RG_HOVER_BOOTS) && ctx->GetTrickOption(RT_FOREST_DOORFRAME))))),
                   LOCATION(RC_FOREST_TEMPLE_MQ_GS_WELL,                    (logic->IsAdult && ((logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_HOOKSHOT)) || logic->CanUse(RG_FAIRY_BOW))) || (logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT))),
   }, {
                   //Exits
@@ -356,7 +356,7 @@ void RegionTable_Init_ForestTemple() {
   }, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_MQ_NE_OUTDOORS,       {[]{return true;}}),
-                  Entrance(RR_FOREST_TEMPLE_MQ_NE_OUTDOORS_LEDGE, {[]{return randoCtx->GetTrickOption(RT_FOREST_OUTDOORS_LEDGE) && logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS);}}),
+                  Entrance(RR_FOREST_TEMPLE_MQ_NE_OUTDOORS_LEDGE, {[]{return ctx->GetTrickOption(RT_FOREST_OUTDOORS_LEDGE) && logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS);}}),
                     //Trick: LogicForestOutdoorsLedge && logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS)
   });
 
@@ -398,7 +398,7 @@ void RegionTable_Init_ForestTemple() {
                   LOCATION(RC_FOREST_TEMPLE_MQ_BASEMENT_CHEST,   true),
   }, {
                   //Exits
-                  Entrance(RR_FOREST_TEMPLE_BOSS_ENTRYWAY, {[]{return logic->BossKeyForestTemple;}}),
+                  Entrance(RR_FOREST_TEMPLE_BOSS_ENTRYWAY, {[]{return logic->HasItem(RG_FOREST_TEMPLE_BOSS_KEY);}}),
   });
   }
 
@@ -409,8 +409,8 @@ void RegionTable_Init_ForestTemple() {
         Region("Forest Temple Boss Entryway", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
              {
                  // Exits
-                 Entrance(RR_FOREST_TEMPLE_BOSS_REGION, { [] { return randoCtx->GetDungeon(FOREST_TEMPLE)->IsVanilla() && false; } }),
-                 Entrance(RR_FOREST_TEMPLE_MQ_BOSS_REGION, { [] { return randoCtx->GetDungeon(FOREST_TEMPLE)->IsMQ() && false; } }),
+                 Entrance(RR_FOREST_TEMPLE_BOSS_REGION, { [] { return ctx->GetDungeon(FOREST_TEMPLE)->IsVanilla() && false; } }),
+                 Entrance(RR_FOREST_TEMPLE_MQ_BOSS_REGION, { [] { return ctx->GetDungeon(FOREST_TEMPLE)->IsMQ() && false; } }),
                  Entrance(RR_FOREST_TEMPLE_BOSS_ROOM, { [] { return true; } }),
              });
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
index e5aba3db9..4607f249f 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
@@ -11,15 +11,15 @@ void RegionTable_Init_GanonsCastle() {
   ---------------------------*/
   areaTable[RR_GANONS_CASTLE_ENTRYWAY] = Region("Ganon's Castle Entryway", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_GANONS_CASTLE_LOBBY,    {[]{return randoCtx->GetDungeon(GANONS_CASTLE)->IsVanilla();}}),
-                  Entrance(RR_GANONS_CASTLE_MQ_LOBBY, {[]{return randoCtx->GetDungeon(GANONS_CASTLE)->IsMQ();}}),
+                  Entrance(RR_GANONS_CASTLE_LOBBY,    {[]{return ctx->GetDungeon(GANONS_CASTLE)->IsVanilla();}}),
+                  Entrance(RR_GANONS_CASTLE_MQ_LOBBY, {[]{return ctx->GetDungeon(GANONS_CASTLE)->IsMQ();}}),
                   Entrance(RR_CASTLE_GROUNDS_FROM_GANONS_CASTLE,    {[]{return true;}}),
   });
 
   /*--------------------------
   |     VANILLA DUNGEON      |
   ---------------------------*/
-  if (randoCtx->GetDungeon(GANONS_CASTLE)->IsVanilla()) {
+  if (ctx->GetDungeon(GANONS_CASTLE)->IsVanilla()) {
   areaTable[RR_GANONS_CASTLE_LOBBY] = Region("Ganon's Castle Lobby", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SHEIK_HINT_GC,  true), 
@@ -32,13 +32,13 @@ void RegionTable_Init_GanonsCastle() {
                   Entrance(RR_GANONS_CASTLE_SHADOW_TRIAL, {[]{return true;}}),
                   Entrance(RR_GANONS_CASTLE_SPIRIT_TRIAL, {[]{return true;}}),
                   Entrance(RR_GANONS_CASTLE_LIGHT_TRIAL,  {[]{return logic->CanUse(RG_GOLDEN_GAUNTLETS);}}),
-                  Entrance(RR_GANONS_CASTLE_TOWER,        {[]{return (logic->ForestTrialClear || randoCtx->GetTrial(TK_FOREST_TRIAL)->IsSkipped()) &&
-                                                                         (logic->FireTrialClear   || randoCtx->GetTrial(TK_FIRE_TRIAL)->IsSkipped())   &&
-                                                                         (logic->WaterTrialClear  || randoCtx->GetTrial(TK_WATER_TRIAL)->IsSkipped())  &&
-                                                                         (logic->ShadowTrialClear || randoCtx->GetTrial(TK_SHADOW_TRIAL)->IsSkipped()) &&
-                                                                         (logic->SpiritTrialClear || randoCtx->GetTrial(TK_SPIRIT_TRIAL)->IsSkipped()) &&
-                                                                         (logic->LightTrialClear  || randoCtx->GetTrial(TK_LIGHT_TRIAL)->IsSkipped());}}),
-                  Entrance(RR_GANONS_CASTLE_DEKU_SCRUBS,  {[]{return randoCtx->GetTrickOption(RT_LENS_GANON) || logic->CanUse(RG_LENS_OF_TRUTH);}}),
+                  Entrance(RR_GANONS_CASTLE_TOWER,        {[]{return (logic->ForestTrialClear || ctx->GetTrial(TK_FOREST_TRIAL)->IsSkipped()) &&
+                                                                         (logic->FireTrialClear   || ctx->GetTrial(TK_FIRE_TRIAL)->IsSkipped())   &&
+                                                                         (logic->WaterTrialClear  || ctx->GetTrial(TK_WATER_TRIAL)->IsSkipped())  &&
+                                                                         (logic->ShadowTrialClear || ctx->GetTrial(TK_SHADOW_TRIAL)->IsSkipped()) &&
+                                                                         (logic->SpiritTrialClear || ctx->GetTrial(TK_SPIRIT_TRIAL)->IsSkipped()) &&
+                                                                         (logic->LightTrialClear  || ctx->GetTrial(TK_LIGHT_TRIAL)->IsSkipped());}}),
+                  Entrance(RR_GANONS_CASTLE_DEKU_SCRUBS,  {[]{return ctx->GetTrickOption(RT_LENS_GANON) || logic->CanUse(RG_LENS_OF_TRUTH);}}),
   });
 
   areaTable[RR_GANONS_CASTLE_DEKU_SCRUBS] = Region("Ganon's Castle Deku Scrubs", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
@@ -46,18 +46,18 @@ void RegionTable_Init_GanonsCastle() {
                   EventAccess(&logic->FreeFairies, {[]{return true;}}),
                 }, {
                   //Locations
-                  LOCATION(RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,  logic->CanStunDeku),
-                  LOCATION(RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT, logic->CanStunDeku),
-                  LOCATION(RC_GANONS_CASTLE_DEKU_SCRUB_RIGHT,        logic->CanStunDeku),
-                  LOCATION(RC_GANONS_CASTLE_DEKU_SCRUB_LEFT,         logic->CanStunDeku),
+                  LOCATION(RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,  logic->CanStunDeku()),
+                  LOCATION(RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT, logic->CanStunDeku()),
+                  LOCATION(RC_GANONS_CASTLE_DEKU_SCRUB_RIGHT,        logic->CanStunDeku()),
+                  LOCATION(RC_GANONS_CASTLE_DEKU_SCRUB_LEFT,         logic->CanStunDeku()),
   }, {});
 
   areaTable[RR_GANONS_CASTLE_FOREST_TRIAL] = Region("Ganon's Castle Forest Trial", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->ForestTrialClear, {[]{return logic->CanUse(RG_LIGHT_ARROWS) && (logic->FireArrows || logic->DinsFire);}}),
+                  EventAccess(&logic->ForestTrialClear, {[]{return logic->CanUse(RG_LIGHT_ARROWS) && (logic->CanUse(RG_FIRE_ARROWS) || logic->CanUse(RG_DINS_FIRE));}}),
                 }, {
                   //Locations
-                  LOCATION(RC_GANONS_CASTLE_FOREST_TRIAL_CHEST, logic->CanAdultDamage || logic->CanChildDamage),
+                  LOCATION(RC_GANONS_CASTLE_FOREST_TRIAL_CHEST, logic->CanDamage()),
   }, {});
 
   areaTable[RR_GANONS_CASTLE_FIRE_TRIAL] = Region("Ganon's Castle Fire Trial", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
@@ -67,9 +67,9 @@ void RegionTable_Init_GanonsCastle() {
 
   areaTable[RR_GANONS_CASTLE_WATER_TRIAL] = Region("Ganon's Castle Water Trial", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->BlueFireAccess,  {[]{return logic->BlueFireAccess || logic->HasBottle;}}),
-                  EventAccess(&logic->FairyPot,        {[]{return logic->FairyPot || logic->BlueFire;}}),
-                  EventAccess(&logic->WaterTrialClear, {[]{return logic->BlueFire && logic->IsAdult && logic->CanUse(RG_MEGATON_HAMMER) && logic->CanUse(RG_LIGHT_ARROWS);}}),
+                  EventAccess(&logic->BlueFireAccess,  {[]{return logic->BlueFireAccess || logic->HasBottle();}}),
+                  EventAccess(&logic->FairyPot,        {[]{return logic->FairyPot || logic->BlueFire();}}),
+                  EventAccess(&logic->WaterTrialClear, {[]{return logic->BlueFire() && logic->IsAdult && logic->CanUse(RG_MEGATON_HAMMER) && logic->CanUse(RG_LIGHT_ARROWS);}}),
                 }, {
                   //Locations
                   LOCATION(RC_GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST,  true),
@@ -78,7 +78,7 @@ void RegionTable_Init_GanonsCastle() {
 
   areaTable[RR_GANONS_CASTLE_SHADOW_TRIAL] = Region("Ganon's Castle Shadow Trial", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->ShadowTrialClear, {[]{return logic->CanUse(RG_LIGHT_ARROWS) && logic->CanUse(RG_MEGATON_HAMMER) && ((logic->FireArrows && (randoCtx->GetTrickOption(RT_LENS_GANON) || logic->CanUse(RG_LENS_OF_TRUTH))) || (logic->CanUse(RG_LONGSHOT) && (logic->CanUse(RG_HOVER_BOOTS) || (logic->DinsFire && (randoCtx->GetTrickOption(RT_LENS_GANON) || logic->CanUse(RG_LENS_OF_TRUTH))))));}}),
+                  EventAccess(&logic->ShadowTrialClear, {[]{return logic->CanUse(RG_LIGHT_ARROWS) && logic->CanUse(RG_MEGATON_HAMMER) && ((logic->CanUse(RG_FIRE_ARROWS) && (ctx->GetTrickOption(RT_LENS_GANON) || logic->CanUse(RG_LENS_OF_TRUTH))) || (logic->CanUse(RG_LONGSHOT) && (logic->CanUse(RG_HOVER_BOOTS) || (logic->CanUse(RG_DINS_FIRE) && (ctx->GetTrickOption(RT_LENS_GANON) || logic->CanUse(RG_LENS_OF_TRUTH))))));}}),
                 }, {
                   //Locations
                   LOCATION(RC_GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST,            logic->CanUse(RG_FIRE_ARROWS) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_SONG_OF_TIME) || logic->IsChild),
@@ -87,17 +87,17 @@ void RegionTable_Init_GanonsCastle() {
 
   areaTable[RR_GANONS_CASTLE_SPIRIT_TRIAL] = Region("Ganon's Castle Spirit Trial", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->NutPot,           {[]{return logic->NutPot || (((randoCtx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) && logic->CanJumpslash) || logic->CanUse(RG_HOOKSHOT)) && logic->CanUse(RG_BOMBCHU_5) && logic->CanUse(RG_FAIRY_BOW) && (logic->CanUse(RG_MIRROR_SHIELD) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS))));}}),
-                  EventAccess(&logic->SpiritTrialClear, {[]{return logic->CanUse(RG_LIGHT_ARROWS) && (logic->CanUse(RG_MIRROR_SHIELD) || randoCtx->GetOption(RSK_SUNLIGHT_ARROWS)) && logic->CanUse(RG_BOMBCHU_5) && ((randoCtx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) && logic->CanJumpslash) || logic->CanUse(RG_HOOKSHOT));}}),
+                  EventAccess(&logic->NutPot,           {[]{return logic->NutPot || (((ctx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) && logic->CanJumpslash()) || logic->CanUse(RG_HOOKSHOT)) && logic->CanUse(RG_BOMBCHU_5) && logic->CanUse(RG_FAIRY_BOW) && (logic->CanUse(RG_MIRROR_SHIELD) || (ctx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS))));}}),
+                  EventAccess(&logic->SpiritTrialClear, {[]{return logic->CanUse(RG_LIGHT_ARROWS) && (logic->CanUse(RG_MIRROR_SHIELD) || ctx->GetOption(RSK_SUNLIGHT_ARROWS)) && logic->CanUse(RG_BOMBCHU_5) && ((ctx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) && logic->CanJumpslash()) || logic->CanUse(RG_HOOKSHOT));}}),
                 }, {
                   //Locations
-                  LOCATION(RC_GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST, (randoCtx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) || logic->CanUse(RG_HOOKSHOT)) && logic->CanJumpslash),
-                  LOCATION(RC_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST,      (randoCtx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) || logic->CanUse(RG_HOOKSHOT)) && logic->CanUse(RG_BOMBCHU_5) && (randoCtx->GetTrickOption(RT_LENS_GANON) || logic->CanUse(RG_LENS_OF_TRUTH))),
+                  LOCATION(RC_GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST, (ctx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) || logic->CanUse(RG_HOOKSHOT)) && logic->CanJumpslash()),
+                  LOCATION(RC_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST,      (ctx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) || logic->CanUse(RG_HOOKSHOT)) && logic->CanUse(RG_BOMBCHU_5) && (ctx->GetTrickOption(RT_LENS_GANON) || logic->CanUse(RG_LENS_OF_TRUTH))),
   }, {});
 
   areaTable[RR_GANONS_CASTLE_LIGHT_TRIAL] = Region("Ganon's Castle Light Trial", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->LightTrialClear, {[]{return logic->CanUse(RG_LIGHT_ARROWS) && logic->CanUse(RG_HOOKSHOT) && logic->SmallKeys(RR_GANONS_CASTLE, 2) && (randoCtx->GetTrickOption(RT_LENS_GANON) || logic->CanUse(RG_LENS_OF_TRUTH));}}),
+                  EventAccess(&logic->LightTrialClear, {[]{return logic->CanUse(RG_LIGHT_ARROWS) && logic->CanUse(RG_HOOKSHOT) && logic->SmallKeys(RR_GANONS_CASTLE, 2) && (ctx->GetTrickOption(RT_LENS_GANON) || logic->CanUse(RG_LENS_OF_TRUTH));}}),
                 }, {
                   //Locations
                   LOCATION(RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST,        true),
@@ -106,7 +106,7 @@ void RegionTable_Init_GanonsCastle() {
                   LOCATION(RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST,       true),
                   LOCATION(RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST,      true),
                   LOCATION(RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST,       true),
-                  LOCATION(RC_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST, randoCtx->GetTrickOption(RT_LENS_GANON) || logic->CanUse(RG_LENS_OF_TRUTH)),
+                  LOCATION(RC_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST, ctx->GetTrickOption(RT_LENS_GANON) || logic->CanUse(RG_LENS_OF_TRUTH)),
                   LOCATION(RC_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST,           logic->CanUse(RG_ZELDAS_LULLABY) && logic->SmallKeys(RR_GANONS_CASTLE, 1)),
   }, {});
   }
@@ -114,33 +114,33 @@ void RegionTable_Init_GanonsCastle() {
   areaTable[RR_GANONS_CASTLE_TOWER] = Region("Ganon's Castle Tower", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GANONS_TOWER_BOSS_KEY_CHEST, logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)),
-                  LOCATION(RC_GANONDORF_HINT,              logic->BossKeyGanonsCastle && (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD))),
-                  LOCATION(RC_GANON,                       logic->HasBossSoul(RG_GANON_SOUL) && logic->BossKeyGanonsCastle && logic->CanUse(RG_LIGHT_ARROWS) && logic->CanUse(RG_MASTER_SWORD)),
+                  LOCATION(RC_GANONDORF_HINT,              logic->HasItem(RG_GANONS_CASTLE_BOSS_KEY) && (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD))),
+                  LOCATION(RC_GANON,                       logic->HasBossSoul(RG_GANON_SOUL) && logic->HasItem(RG_GANONS_CASTLE_BOSS_KEY) && logic->CanUse(RG_LIGHT_ARROWS) && logic->CanUse(RG_MASTER_SWORD)),
   }, {});
 
   /*---------------------------
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
-  if (randoCtx->GetDungeon(GANONS_CASTLE)->IsMQ()) {
+  if (ctx->GetDungeon(GANONS_CASTLE)->IsMQ()) {
   areaTable[RR_GANONS_CASTLE_MQ_LOBBY] = Region("Ganon's Castle MQ Lobby", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SHEIK_HINT_MQ_GC,  true),
                 }, {
                   //Exits
-                  Entrance(RR_GANONS_CASTLE_ENTRYWAY,        {[]{return (logic->CanUse(RG_MASTER_SWORD) || (logic->HasExplosives || ((logic->CanUse(RG_NUTS) || logic->Boomerang) && (logic->CanUse(RG_STICKS) || logic->KokiriSword))));}}),
+                  Entrance(RR_GANONS_CASTLE_ENTRYWAY,        {[]{return (logic->CanUse(RG_MASTER_SWORD) || (logic->HasExplosives() || ((logic->CanUse(RG_NUTS) || logic->CanUse(RG_BOOMERANG)) && (logic->CanUse(RG_STICKS) || logic->CanUse(RG_KOKIRI_SWORD)))));}}),
                   Entrance(RR_GANONS_CASTLE_MQ_FOREST_TRIAL, {[]{return true;}}),
                   Entrance(RR_GANONS_CASTLE_MQ_FIRE_TRIAL,   {[]{return true;}}),
                   Entrance(RR_GANONS_CASTLE_MQ_WATER_TRIAL,  {[]{return true;}}),
                   Entrance(RR_GANONS_CASTLE_MQ_SHADOW_TRIAL, {[]{return true;}}),
                   Entrance(RR_GANONS_CASTLE_MQ_SPIRIT_TRIAL, {[]{return true;}}),
                   Entrance(RR_GANONS_CASTLE_MQ_LIGHT_TRIAL,  {[]{return logic->CanUse(RG_GOLDEN_GAUNTLETS);}}),
-                  Entrance(RR_GANONS_CASTLE_TOWER,           {[]{return (logic->ForestTrialClear || randoCtx->GetTrial(TK_FOREST_TRIAL)->IsSkipped()) &&
-                                                                            (logic->FireTrialClear   || randoCtx->GetTrial(TK_FIRE_TRIAL)->IsSkipped())   &&
-                                                                            (logic->WaterTrialClear  || randoCtx->GetTrial(TK_WATER_TRIAL)->IsSkipped())  &&
-                                                                            (logic->ShadowTrialClear || randoCtx->GetTrial(TK_SHADOW_TRIAL)->IsSkipped()) &&
-                                                                            (logic->SpiritTrialClear || randoCtx->GetTrial(TK_SPIRIT_TRIAL)->IsSkipped()) &&
-                                                                            (logic->LightTrialClear  || randoCtx->GetTrial(TK_LIGHT_TRIAL)->IsSkipped());}}),
-                  Entrance(RR_GANONS_CASTLE_MQ_DEKU_SCRUBS,  {[]{return randoCtx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH);}}),
+                  Entrance(RR_GANONS_CASTLE_TOWER,           {[]{return (logic->ForestTrialClear || ctx->GetTrial(TK_FOREST_TRIAL)->IsSkipped()) &&
+                                                                            (logic->FireTrialClear   || ctx->GetTrial(TK_FIRE_TRIAL)->IsSkipped())   &&
+                                                                            (logic->WaterTrialClear  || ctx->GetTrial(TK_WATER_TRIAL)->IsSkipped())  &&
+                                                                            (logic->ShadowTrialClear || ctx->GetTrial(TK_SHADOW_TRIAL)->IsSkipped()) &&
+                                                                            (logic->SpiritTrialClear || ctx->GetTrial(TK_SPIRIT_TRIAL)->IsSkipped()) &&
+                                                                            (logic->LightTrialClear  || ctx->GetTrial(TK_LIGHT_TRIAL)->IsSkipped());}}),
+                  Entrance(RR_GANONS_CASTLE_MQ_DEKU_SCRUBS,  {[]{return ctx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH);}}),
   });
 
   areaTable[RR_GANONS_CASTLE_MQ_DEKU_SCRUBS] = Region("Ganon's Castle MQ Deku Scrubs", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
@@ -148,11 +148,11 @@ void RegionTable_Init_GanonsCastle() {
                   EventAccess(&logic->FreeFairies, {[]{return true;}}),
   }, {
                   //Locations
-                  LOCATION(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,  logic->CanStunDeku),
-                  LOCATION(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,       logic->CanStunDeku),
-                  LOCATION(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT, logic->CanStunDeku),
-                  LOCATION(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,         logic->CanStunDeku),
-                  LOCATION(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,        logic->CanStunDeku),
+                  LOCATION(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,  logic->CanStunDeku()),
+                  LOCATION(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,       logic->CanStunDeku()),
+                  LOCATION(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT, logic->CanStunDeku()),
+                  LOCATION(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,         logic->CanStunDeku()),
+                  LOCATION(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,        logic->CanStunDeku()),
   }, {});
 
   areaTable[RR_GANONS_CASTLE_MQ_FOREST_TRIAL] = Region("Ganon's Castle MQ Forest Trial", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
@@ -161,54 +161,54 @@ void RegionTable_Init_GanonsCastle() {
   }, {
                   //Locations
                   LOCATION(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST,        (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT))),
-                  LOCATION(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST, (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && logic->HasFireSource),
-                  LOCATION(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY,        (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && logic->HookshotOrBoomerang),
+                  LOCATION(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST, (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && logic->HasFireSource()),
+                  LOCATION(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY,        (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && logic->HookshotOrBoomerang()),
   }, {});
 
   areaTable[RR_GANONS_CASTLE_MQ_FIRE_TRIAL] = Region("Ganon's Castle MQ Fire Trial", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->FireTrialClear, {[]{return logic->CanUse(RG_GORON_TUNIC) && logic->CanUse(RG_GOLDEN_GAUNTLETS) && logic->CanUse(RG_LIGHT_ARROWS) && (logic->CanUse(RG_LONGSHOT) || logic->HoverBoots || (randoCtx->GetTrickOption(RT_GANON_MQ_FIRE_TRIAL) && logic->CanUse(RG_HOOKSHOT)));}}),
-                    //Trick: logic->CanUse(RG_GORON_TUNIC) && logic->CanUse(RG_GOLDEN_GAUNTLETS) && logic->CanUse(RG_LIGHT_ARROWS) && (logic->CanUse(RG_LONGSHOT) || logic->HoverBoots || (LogicFireTrialMQ && logic->CanUse(RG_HOOKSHOT)))
+                  EventAccess(&logic->FireTrialClear, {[]{return logic->CanUse(RG_GORON_TUNIC) && logic->CanUse(RG_GOLDEN_GAUNTLETS) && logic->CanUse(RG_LIGHT_ARROWS) && (logic->CanUse(RG_LONGSHOT) || logic->CanUse(RG_HOVER_BOOTS) || (ctx->GetTrickOption(RT_GANON_MQ_FIRE_TRIAL) && logic->CanUse(RG_HOOKSHOT)));}}),
+                    //Trick: logic->CanUse(RG_GORON_TUNIC) && logic->CanUse(RG_GOLDEN_GAUNTLETS) && logic->CanUse(RG_LIGHT_ARROWS) && (logic->CanUse(RG_LONGSHOT) || logic->CanUse(RG_HOVER_BOOTS) || (LogicFireTrialMQ && logic->CanUse(RG_HOOKSHOT)))
   }, {}, {});
 
   areaTable[RR_GANONS_CASTLE_MQ_WATER_TRIAL] = Region("Ganon's Castle MQ Water Trial", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->WaterTrialClear, {[]{return logic->BlueFire && logic->IsAdult && logic->CanUse(RG_LIGHT_ARROWS) && logic->SmallKeys(RR_GANONS_CASTLE, 3);}}),
-                  EventAccess(&logic->BlueFireAccess,  {[]{return logic->BlueFireAccess || (logic->HasBottle && logic->CanJumpslash);}}),
+                  EventAccess(&logic->WaterTrialClear, {[]{return logic->BlueFire() && logic->IsAdult && logic->CanUse(RG_LIGHT_ARROWS) && logic->SmallKeys(RR_GANONS_CASTLE, 3);}}),
+                  EventAccess(&logic->BlueFireAccess,  {[]{return logic->BlueFireAccess || (logic->HasBottle() && logic->CanJumpslash());}}),
   }, {
                   //Locations
-                  LOCATION(RC_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST, logic->BlueFire),
+                  LOCATION(RC_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST, logic->BlueFire()),
   }, {});
 
   areaTable[RR_GANONS_CASTLE_MQ_SHADOW_TRIAL] = Region("Ganon's Castle MQ Shadow Trial", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->ShadowTrialClear, {[]{return logic->IsAdult && logic->CanUse(RG_LIGHT_ARROWS) && (randoCtx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->HoverBoots || (logic->Hookshot && (logic->HasFireSource || randoCtx->GetTrickOption(RT_GANON_MQ_SHADOW_TRIAL))));}}),
-                    //Trick: logic->IsAdult && logic->CanUse(RG_LIGHT_ARROWS) && (LogicLensCastleMQ || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->HoverBoots || (logic->Hookshot && (logic->HasFireSource || LogicShadowTrialMQ)))
+                  EventAccess(&logic->ShadowTrialClear, {[]{return logic->IsAdult && logic->CanUse(RG_LIGHT_ARROWS) && (ctx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->CanUse(RG_HOVER_BOOTS) || (logic->CanUse(RG_HOOKSHOT) && (logic->HasFireSource() || ctx->GetTrickOption(RT_GANON_MQ_SHADOW_TRIAL))));}}),
+                    //Trick: logic->IsAdult && logic->CanUse(RG_LIGHT_ARROWS) && (LogicLensCastleMQ || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->CanUse(RG_HOVER_BOOTS) || (logic->CanUse(RG_HOOKSHOT) && (logic->HasFireSource() || LogicShadowTrialMQ)))
   }, {
                   //Locations
-                  LOCATION(RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST, logic->IsAdult && ((logic->Bow && (logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_HOVER_BOOTS))) || (logic->CanUse(RG_HOVER_BOOTS) && (randoCtx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->HasExplosives || logic->GoronBracelet || logic->CanUse(RG_DINS_FIRE))))),
-                  LOCATION(RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST,  logic->IsAdult && logic->Bow && (randoCtx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->HoverBoots || (logic->Hookshot && (logic->HasFireSource || randoCtx->GetTrickOption(RT_GANON_MQ_SHADOW_TRIAL))))),
-                    //Trick: logic->IsAdult && logic->Bow && (LogicLensCastleMQ || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->HoverBoots || (logic->Hookshot && (logic->HasFireSource || LogicShadowTrialMQ)))
+                  LOCATION(RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST, logic->IsAdult && ((logic->CanUse(RG_FAIRY_BOW) && (logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_HOVER_BOOTS))) || (logic->CanUse(RG_HOVER_BOOTS) && (ctx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->HasExplosives() || logic->HasItem(RG_GORONS_BRACELET) || logic->CanUse(RG_DINS_FIRE))))),
+                  LOCATION(RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST,  logic->IsAdult && logic->CanUse(RG_FAIRY_BOW) && (ctx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->CanUse(RG_HOVER_BOOTS) || (logic->CanUse(RG_HOOKSHOT) && (logic->HasFireSource() || ctx->GetTrickOption(RT_GANON_MQ_SHADOW_TRIAL))))),
+                    //Trick: logic->IsAdult && logic->CanUse(RG_FAIRY_BOW) && (LogicLensCastleMQ || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->CanUse(RG_HOVER_BOOTS) || (logic->CanUse(RG_HOOKSHOT) && (logic->HasFireSource() || LogicShadowTrialMQ)))
   }, {});
 
   areaTable[RR_GANONS_CASTLE_MQ_SPIRIT_TRIAL] = Region("Ganon's Castle MQ Spirit Castle", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->SpiritTrialClear, {[]{return logic->IsAdult && logic->CanUse(RG_LIGHT_ARROWS) && logic->Hammer && logic->CanUse(RG_BOMBCHU_5) && ((logic->FireArrows && logic->MirrorShield) || randoCtx->GetOption(RSK_SUNLIGHT_ARROWS));}}),
-                  EventAccess(&logic->NutPot,           {[]{return logic->NutPot || (logic->Hammer && logic->CanUse(RG_BOMBCHU_5) && logic->IsAdult && ((logic->CanUse(RG_FIRE_ARROWS) && logic->MirrorShield) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS))));}}),
+                  EventAccess(&logic->SpiritTrialClear, {[]{return logic->IsAdult && logic->CanUse(RG_LIGHT_ARROWS) && logic->CanUse(RG_MEGATON_HAMMER) && logic->CanUse(RG_BOMBCHU_5) && ((logic->CanUse(RG_FIRE_ARROWS) && logic->CanUse(RG_MIRROR_SHIELD)) || ctx->GetOption(RSK_SUNLIGHT_ARROWS));}}),
+                  EventAccess(&logic->NutPot,           {[]{return logic->NutPot || (logic->CanUse(RG_MEGATON_HAMMER) && logic->CanUse(RG_BOMBCHU_5) && logic->IsAdult && ((logic->CanUse(RG_FIRE_ARROWS) && logic->CanUse(RG_MIRROR_SHIELD)) || (ctx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS))));}}),
   }, {
                   //Locations
-                  LOCATION(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST,             logic->IsAdult && (logic->Bow || randoCtx->GetTrickOption(RT_RUSTED_SWITCHES)) && logic->Hammer),
-                  LOCATION(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST,         logic->IsAdult && (logic->Bow || randoCtx->GetTrickOption(RT_RUSTED_SWITCHES)) && logic->Hammer && logic->CanUse(RG_BOMBCHU_5) && (randoCtx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH))),
-                  LOCATION(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST,    logic->IsAdult && logic->Hammer && logic->CanUse(RG_BOMBCHU_5) && ((logic->CanUse(RG_FIRE_ARROWS) && logic->CanUse(RG_MIRROR_SHIELD)) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS)))),
-                  LOCATION(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST,     logic->IsAdult && logic->Hammer && logic->CanUse(RG_BOMBCHU_5) && ((logic->CanUse(RG_FIRE_ARROWS) && logic->CanUse(RG_MIRROR_SHIELD)) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS)))),
-                  LOCATION(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST,  logic->IsAdult && logic->Hammer && logic->CanUse(RG_BOMBCHU_5) && ((logic->CanUse(RG_FIRE_ARROWS) && logic->CanUse(RG_MIRROR_SHIELD)) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS)))),
-                  LOCATION(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST,    logic->IsAdult && logic->Hammer && logic->CanUse(RG_BOMBCHU_5) && ((logic->CanUse(RG_FIRE_ARROWS) && logic->CanUse(RG_MIRROR_SHIELD)) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS)))),
+                  LOCATION(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST,             logic->IsAdult && (logic->CanUse(RG_FAIRY_BOW) || ctx->GetTrickOption(RT_RUSTED_SWITCHES)) && logic->CanUse(RG_MEGATON_HAMMER)),
+                  LOCATION(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST,         logic->IsAdult && (logic->CanUse(RG_FAIRY_BOW) || ctx->GetTrickOption(RT_RUSTED_SWITCHES)) && logic->CanUse(RG_MEGATON_HAMMER) && logic->CanUse(RG_BOMBCHU_5) && (ctx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH))),
+                  LOCATION(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST,    logic->IsAdult && logic->CanUse(RG_MEGATON_HAMMER) && logic->CanUse(RG_BOMBCHU_5) && ((logic->CanUse(RG_FIRE_ARROWS) && logic->CanUse(RG_MIRROR_SHIELD)) || (ctx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS)))),
+                  LOCATION(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST,     logic->IsAdult && logic->CanUse(RG_MEGATON_HAMMER) && logic->CanUse(RG_BOMBCHU_5) && ((logic->CanUse(RG_FIRE_ARROWS) && logic->CanUse(RG_MIRROR_SHIELD)) || (ctx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS)))),
+                  LOCATION(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST,  logic->IsAdult && logic->CanUse(RG_MEGATON_HAMMER) && logic->CanUse(RG_BOMBCHU_5) && ((logic->CanUse(RG_FIRE_ARROWS) && logic->CanUse(RG_MIRROR_SHIELD)) || (ctx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS)))),
+                  LOCATION(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST,    logic->IsAdult && logic->CanUse(RG_MEGATON_HAMMER) && logic->CanUse(RG_BOMBCHU_5) && ((logic->CanUse(RG_FIRE_ARROWS) && logic->CanUse(RG_MIRROR_SHIELD)) || (ctx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS)))),
   }, {});
 
   areaTable[RR_GANONS_CASTLE_MQ_LIGHT_TRIAL] = Region("Ganon's Castle MQ Light Trial", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->LightTrialClear, {[]{return logic->IsAdult && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && logic->CanUse(RG_LIGHT_ARROWS) && logic->SmallKeys(RR_GANONS_CASTLE, 3) && (randoCtx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->Hookshot || randoCtx->GetTrickOption(RT_GANON_MQ_LIGHT_TRIAL));}}),
-                    //Trick: logic->IsAdult && logic->CanUse(RG_LIGHT_ARROWS) && logic->SmallKeys(RR_GANONS_CASTLE, 3) && (LogicLensCastleMQ || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->Hookshot || LogicLightTrialMQ)
+                  EventAccess(&logic->LightTrialClear, {[]{return logic->IsAdult && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && logic->CanUse(RG_LIGHT_ARROWS) && logic->SmallKeys(RR_GANONS_CASTLE, 3) && (ctx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->CanUse(RG_HOOKSHOT) || ctx->GetTrickOption(RT_GANON_MQ_LIGHT_TRIAL));}}),
+                    //Trick: logic->IsAdult && logic->CanUse(RG_LIGHT_ARROWS) && logic->SmallKeys(RR_GANONS_CASTLE, 3) && (LogicLensCastleMQ || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->CanUse(RG_HOOKSHOT) || LogicLightTrialMQ)
   }, {
                   //Locations
                   LOCATION(RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST, (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && logic->CanUse(RG_ZELDAS_LULLABY)),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp
index 030b05f98..686c7c11d 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp
@@ -10,32 +10,32 @@ void RegionTable_Init_GerudoTrainingGrounds() {
   ---------------------------*/
   areaTable[RR_GERUDO_TRAINING_GROUNDS_ENTRYWAY] = Region("Gerudo Training Grounds Entryway", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_GERUDO_TRAINING_GROUNDS_LOBBY,    {[]{return randoCtx->GetDungeon(GERUDO_TRAINING_GROUNDS)->IsVanilla();}}),
-                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_LOBBY, {[]{return randoCtx->GetDungeon(GERUDO_TRAINING_GROUNDS)->IsMQ();}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_LOBBY,    {[]{return ctx->GetDungeon(GERUDO_TRAINING_GROUNDS)->IsVanilla();}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_LOBBY, {[]{return ctx->GetDungeon(GERUDO_TRAINING_GROUNDS)->IsMQ();}}),
                   Entrance(RR_GERUDO_FORTRESS,                  {[]{return true;}}),
   });
 
   /*--------------------------
   |     VANILLA DUNGEON      |
   ---------------------------*/
-  if (randoCtx->GetDungeon(GERUDO_TRAINING_GROUNDS)->IsVanilla()) {
+  if (ctx->GetDungeon(GERUDO_TRAINING_GROUNDS)->IsVanilla()) {
   areaTable[RR_GERUDO_TRAINING_GROUNDS_LOBBY] = Region("Gerudo Training Grounds Lobby", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST,  logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT)),
                   LOCATION(RC_GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST, logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT)),
                   LOCATION(RC_GERUDO_TRAINING_GROUND_STALFOS_CHEST,     logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)),
-                  LOCATION(RC_GERUDO_TRAINING_GROUND_BEAMOS_CHEST,      logic->HasExplosives && (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD))),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_BEAMOS_CHEST,      logic->HasExplosives() && (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD))),
                 }, {
                   //Exits
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_ENTRYWAY,         {[]{return true;}}),
-                  Entrance(RR_GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_ROOM, {[]{return (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && (logic->CanUse(RG_HOOKSHOT) || randoCtx->GetTrickOption(RT_GTG_WITHOUT_HOOKSHOT));}}),
-                  Entrance(RR_GERUDO_TRAINING_GROUNDS_LAVA_ROOM,        {[]{return Here(RR_GERUDO_TRAINING_GROUNDS_LOBBY, []{return (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && logic->HasExplosives;});}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_ROOM, {[]{return (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && (logic->CanUse(RG_HOOKSHOT) || ctx->GetTrickOption(RT_GTG_WITHOUT_HOOKSHOT));}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_LAVA_ROOM,        {[]{return Here(RR_GERUDO_TRAINING_GROUNDS_LOBBY, []{return (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && logic->HasExplosives();});}}),
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE,     {[]{return true;}}),
   });
 
   areaTable[RR_GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE] = Region("Gerudo Training Grounds Central Maze", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST,   logic->SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 3) && (randoCtx->GetTrickOption(RT_LENS_GTG) || logic->CanUse(RG_LENS_OF_TRUTH))),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST,   logic->SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 3) && (ctx->GetTrickOption(RT_LENS_GTG) || logic->CanUse(RG_LENS_OF_TRUTH))),
                   LOCATION(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST,  logic->SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 4)),
                   LOCATION(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_SECOND_CHEST, logic->SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 6)),
                   LOCATION(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_THIRD_CHEST,  logic->SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 7)),
@@ -58,7 +58,7 @@ void RegionTable_Init_GerudoTrainingGrounds() {
 
   areaTable[RR_GERUDO_TRAINING_GROUNDS_LAVA_ROOM] = Region("Gerudo Training Grounds Lava Room", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST, logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_SONG_OF_TIME) && logic->IronBoots && logic->WaterTimer >= 24),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST, logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_SONG_OF_TIME) && logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 24),
                 }, {
                   //Exits
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE_RIGHT, {[]{return logic->CanUse(RG_SONG_OF_TIME) || logic->IsChild;}}),
@@ -67,8 +67,8 @@ void RegionTable_Init_GerudoTrainingGrounds() {
 
   areaTable[RR_GERUDO_TRAINING_GROUNDS_HAMMER_ROOM] = Region("Gerudo Training Grounds Hammer Room", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST,  logic->CanAdultAttack || logic->CanChildAttack),
-                  LOCATION(RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST, logic->CanUse(RG_MEGATON_HAMMER) || (logic->CanTakeDamage && randoCtx->GetTrickOption(RT_FLAMING_CHESTS))),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST,  logic->CanAttack()),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST, logic->CanUse(RG_MEGATON_HAMMER) || (logic->TakeDamage() && ctx->GetTrickOption(RT_FLAMING_CHESTS))),
                 }, {
                   //Exits
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_EYE_STATUE_LOWER, {[]{return logic->CanUse(RG_MEGATON_HAMMER) && logic->CanUse(RG_FAIRY_BOW);}}),
@@ -93,38 +93,38 @@ void RegionTable_Init_GerudoTrainingGrounds() {
 
   areaTable[RR_GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_ROOM] = Region("Gerudo Training Grounds Heavy Block Room", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST, logic->CanJumpslash),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST, logic->CanJumpslash()),
                 }, {
                   //Exits
-                  Entrance(RR_GERUDO_TRAINING_GROUNDS_EYE_STATUE_UPPER, {[]{return (randoCtx->GetTrickOption(RT_LENS_GTG) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->CanUse(RG_HOOKSHOT) || (randoCtx->GetTrickOption(RT_GTG_FAKE_WALL) && logic->CanUse(RG_HOVER_BOOTS)));}}),
-                  Entrance(RR_GERUDO_TRAINING_GROUNDS_LIKE_LIKE_ROOM,   {[]{return (randoCtx->GetTrickOption(RT_LENS_GTG) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->CanUse(RG_HOOKSHOT) || (randoCtx->GetTrickOption(RT_GTG_FAKE_WALL) && logic->CanUse(RG_HOVER_BOOTS))) && logic->CanUse(RG_SILVER_GAUNTLETS);}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_EYE_STATUE_UPPER, {[]{return (ctx->GetTrickOption(RT_LENS_GTG) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->CanUse(RG_HOOKSHOT) || (ctx->GetTrickOption(RT_GTG_FAKE_WALL) && logic->CanUse(RG_HOVER_BOOTS)));}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_LIKE_LIKE_ROOM,   {[]{return (ctx->GetTrickOption(RT_LENS_GTG) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->CanUse(RG_HOOKSHOT) || (ctx->GetTrickOption(RT_GTG_FAKE_WALL) && logic->CanUse(RG_HOVER_BOOTS))) && logic->CanUse(RG_SILVER_GAUNTLETS);}}),
   });
 
   areaTable[RR_GERUDO_TRAINING_GROUNDS_LIKE_LIKE_ROOM] = Region("Gerudo Training Grounds Like Like Room", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST,  logic->CanJumpslash),
-                  LOCATION(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST, logic->CanJumpslash),
-                  LOCATION(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_THIRD_CHEST,  logic->CanJumpslash),
-                  LOCATION(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FOURTH_CHEST, logic->CanJumpslash),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST,  logic->CanJumpslash()),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST, logic->CanJumpslash()),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_THIRD_CHEST,  logic->CanJumpslash()),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FOURTH_CHEST, logic->CanJumpslash()),
   }, {});
   }
 
   /*---------------------------
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
-  if (randoCtx->GetDungeon(GERUDO_TRAINING_GROUNDS)->IsMQ()) {
+  if (ctx->GetDungeon(GERUDO_TRAINING_GROUNDS)->IsMQ()) {
   areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_LOBBY] = Region("Gerudo Training Grounds MQ Lobby", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST,       true),
                   LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST,      true),
-                  LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_HIDDEN_CEILING_CHEST,   randoCtx->GetTrickOption(RT_LENS_GTG_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_HIDDEN_CEILING_CHEST,   ctx->GetTrickOption(RT_LENS_GTG_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)),
                   LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_FIRST_CHEST,  true),
                   LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_SECOND_CHEST, true),
                   LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_THIRD_CHEST,  logic->SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 1)),
   }, {
                   //Exits
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_ENTRYWAY,      {[]{return true;}}),
-                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_LEFT_SIDE,  {[]{return Here(RR_GERUDO_TRAINING_GROUNDS_MQ_LOBBY, []{return logic->HasFireSource;});}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_LEFT_SIDE,  {[]{return Here(RR_GERUDO_TRAINING_GROUNDS_MQ_LOBBY, []{return logic->HasFireSource();});}}),
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_RIGHT_SIDE, {[]{return Here(RR_GERUDO_TRAINING_GROUNDS_MQ_LOBBY, []{return (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW)) || (logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT));});}}),
   });
 
@@ -136,33 +136,33 @@ void RegionTable_Init_GerudoTrainingGrounds() {
                   LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_DINOLFOS_CHEST, logic->IsAdult && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BIGGORON_SWORD))),
   }, {
                   //Exits
-                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER, {[]{return (logic->Bow || (logic->CanUse(RG_LONGSHOT) && logic->HasFireSource)) && logic->CanUse(RG_HOVER_BOOTS) && logic->IsAdult && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BIGGORON_SWORD));}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER, {[]{return (logic->CanUse(RG_FAIRY_BOW) || (logic->CanUse(RG_LONGSHOT) && logic->HasFireSource())) && logic->CanUse(RG_HOVER_BOOTS) && logic->IsAdult && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BIGGORON_SWORD));}}),
   });
 
   areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER] = Region("Gerudo Training Grounds MQ Underwater", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST, logic->HasFireSource && logic->IsAdult && logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer >= 24 && logic->CanTakeDamage),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST, logic->HasFireSource() && logic->IsAdult && logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 24 && logic->TakeDamage()),
   }, {});
 
   areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_LEFT_SIDE] = Region("Gerudo Training Grounds MQ Left Side", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST, logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->HasExplosives),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST, logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->HasExplosives()),
   }, {
                   //Exits
-                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_STALFOS_ROOM, {[]{return (logic->IsAdult && logic->CanUse(RG_LONGSHOT)) || randoCtx->GetTrickOption(RT_GTG_MQ_WIHTOUT_HOOKSHOT) || (randoCtx->GetTrickOption(RT_GTG_MQ_WITH_HOOKSHOT) && logic->IsAdult && logic->CanUse(RG_HOOKSHOT));}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_STALFOS_ROOM, {[]{return (logic->IsAdult && logic->CanUse(RG_LONGSHOT)) || ctx->GetTrickOption(RT_GTG_MQ_WIHTOUT_HOOKSHOT) || (ctx->GetTrickOption(RT_GTG_MQ_WITH_HOOKSHOT) && logic->IsAdult && logic->CanUse(RG_HOOKSHOT));}}),
                     //Trick: (logic->IsAdult && logic->CanUse(RG_LONGSHOT)) || LogicGtgMQWithoutHookshot || (LogicGtgMQWithHookshot && logic->IsAdult && logic->CanUse(RG_HOOKSHOT))
   });
 
   areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_STALFOS_ROOM] = Region("Gerudo Training Grounds MQ Stalfos Room", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->BlueFireAccess,  {[]{return logic->BlueFireAccess || logic->HasBottle;}}),
+                  EventAccess(&logic->BlueFireAccess,  {[]{return logic->BlueFireAccess || logic->HasBottle();}}),
   }, {
                   //Locations
                   LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_BEFORE_HEAVY_BLOCK_CHEST, logic->IsAdult && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD))),
                   LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_HEAVY_BLOCK_CHEST,        logic->CanUse(RG_SILVER_GAUNTLETS) && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD))),
   }, {
                   //Exits
-                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_BACK_AREAS, {[]{return logic->IsAdult && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && (randoCtx->GetTrickOption(RT_LENS_GTG_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->BlueFire && (logic->CanUse(RG_SONG_OF_TIME) || (randoCtx->GetTrickOption(RT_GTG_FAKE_WALL) && logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS)));}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_BACK_AREAS, {[]{return logic->IsAdult && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && (ctx->GetTrickOption(RT_LENS_GTG_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->BlueFire() && (logic->CanUse(RG_SONG_OF_TIME) || (ctx->GetTrickOption(RT_GTG_FAKE_WALL) && logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS)));}}),
                     //Trick: logic->IsAdult && (LogicLensGtgMQ || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->BlueFire && (logic->CanUse(RG_SONG_OF_TIME) || (LogicGtgFakeWall && logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS)))
   });
 
@@ -170,7 +170,7 @@ void RegionTable_Init_GerudoTrainingGrounds() {
                   //Locations
                   LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_EYE_STATUE_CHEST,          logic->CanUse(RG_FAIRY_BOW)),
                   LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_SECOND_IRON_KNUCKLE_CHEST, logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)),
-                  LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_FLAME_CIRCLE_CHEST,        logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->HasExplosives),
+                  LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_FLAME_CIRCLE_CHEST,        logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->HasExplosives()),
   }, {
                   //Exits
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_CENTRAL_MAZE_RIGHT, {[]{return logic->CanUse(RG_MEGATON_HAMMER);}}),
@@ -184,7 +184,7 @@ void RegionTable_Init_GerudoTrainingGrounds() {
                   LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_ICE_ARROWS_CHEST,         logic->SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 3)),
   }, {
                   //Exits
-                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER,  {[]{return logic->IsAdult && (logic->CanUse(RG_LONGSHOT) || (logic->CanUse(RG_HOOKSHOT) && logic->Bow));}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER,  {[]{return logic->IsAdult && (logic->CanUse(RG_LONGSHOT) || (logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_FAIRY_BOW)));}}),
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_RIGHT_SIDE,  {[]{return logic->IsAdult && logic->CanUse(RG_HOOKSHOT);}}),
   });
   }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
index d5623fe17..601ca03d0 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
@@ -9,24 +9,24 @@ void RegionTable_Init_GerudoValley() {
                   EventAccess(&logic->BugRock, {[]{return logic->BugRock || logic->IsChild;}}),
                 }, {
                   //Locations
-                  LOCATION(RC_GV_GS_SMALL_BRIDGE, logic->IsChild && logic->HookshotOrBoomerang && logic->AtNight && logic->CanGetNightTimeGS),
+                  LOCATION(RC_GV_GS_SMALL_BRIDGE, logic->IsChild && logic->HookshotOrBoomerang() && logic->AtNight && logic->CanGetNightTimeGS()),
                 }, {
                   //Exits
                   Entrance(RR_HYRULE_FIELD,      {[]{return true;}}),
                   Entrance(RR_GV_UPPER_STREAM,   {[]{return true;}}),
                   Entrance(RR_GV_CRATE_LEDGE,    {[]{return logic->IsChild || logic->CanUse(RG_LONGSHOT);}}),
                   Entrance(RR_GV_GROTTO_LEDGE,   {[]{return true;}}),
-                  Entrance(RR_GV_FORTRESS_SIDE,  {[]{return (logic->IsAdult && (logic->CanRideEpona || logic->CanUse(RG_LONGSHOT) || randoCtx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_OPEN) || logic->CarpenterRescue)) || (logic->IsChild && logic->CanUse(RG_HOOKSHOT));}}),
+                  Entrance(RR_GV_FORTRESS_SIDE,  {[]{return (logic->IsAdult && (logic->CanUse(RG_EPONA) || logic->CanUse(RG_LONGSHOT) || ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_OPEN) || logic->CarpenterRescue)) || (logic->IsChild && logic->CanUse(RG_HOOKSHOT));}}),
   });
 
   areaTable[RR_GV_UPPER_STREAM] = Region("GV Upper Stream", "Gerudo Valley", RA_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CanSummonGossipFairy;}}),
+                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CallGossipFairy();}}),
                   EventAccess(&logic->BeanPlantFairy,   {[]{return logic->BeanPlantFairy   || (CanPlantBean(RR_GV_UPPER_STREAM) && logic->CanUse(RG_SONG_OF_STORMS));}}),
                 }, {
                   //Locations
-                  LOCATION(RC_GV_WATERFALL_FREESTANDING_POH, logic->IsChild || logic->Swim),//can use cucco as child
-                  LOCATION(RC_GV_GS_BEAN_PATCH,              logic->CanPlantBugs && logic->CanChildAttack),
+                  LOCATION(RC_GV_WATERFALL_FREESTANDING_POH, logic->IsChild || logic->HasItem(RG_BRONZE_SCALE)),//can use cucco as child
+                  LOCATION(RC_GV_GS_BEAN_PATCH,              logic->CanSpawnSoilSkull() && logic->CanAttack()),
                   LOCATION(RC_GV_COW,                        logic->IsChild && logic->CanUse(RG_EPONAS_SONG)),
                   LOCATION(RC_GV_GOSSIP_STONE,               true),
                 }, {
@@ -36,7 +36,7 @@ void RegionTable_Init_GerudoValley() {
 
   areaTable[RR_GV_LOWER_STREAM] = Region("GV Lower Stream", "Gerudo Valley", RA_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_LAKE_HYLIA, {[]{return logic->IsChild || logic->Swim;}}),//can use cucco as child
+                  Entrance(RR_LAKE_HYLIA, {[]{return logic->IsChild || logic->HasItem(RG_BRONZE_SCALE);}}),//can use cucco as child
   });
 
   areaTable[RR_GV_GROTTO_LEDGE] = Region("GV Grotto Ledge", "Gerudo Valley", RA_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {}, {}, {
@@ -56,20 +56,20 @@ void RegionTable_Init_GerudoValley() {
 
   areaTable[RR_GV_FORTRESS_SIDE] = Region("GV Fortress Side", "Gerudo Valley", RA_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->BrokenSwordAccess, {[]{return logic->IsAdult && (logic->PoachersSawAccess || logic->PoachersSaw);}}),
+                  EventAccess(&logic->BrokenSwordAccess, {[]{return logic->IsAdult && (logic->PoachersSawAccess || logic->CanUse(RG_POACHERS_SAW));}}),
                 }, {
                   //Locations                                       
                   LOCATION(RC_GV_CHEST,          logic->IsAdult && logic->CanUse(RG_MEGATON_HAMMER)),
-                  LOCATION(RC_GV_TRADE_SAW,      logic->IsAdult && logic->PoachersSaw),
-                  LOCATION(RC_GV_GS_BEHIND_TENT, logic->IsAdult && logic->HookshotOrBoomerang && logic->AtNight && logic->CanGetNightTimeGS),
-                  LOCATION(RC_GV_GS_PILLAR,      logic->IsAdult && logic->HookshotOrBoomerang && logic->AtNight && logic->CanGetNightTimeGS),
+                  LOCATION(RC_GV_TRADE_SAW,      logic->IsAdult && logic->CanUse(RG_POACHERS_SAW)),
+                  LOCATION(RC_GV_GS_BEHIND_TENT, logic->IsAdult && logic->HookshotOrBoomerang() && logic->AtNight && logic->CanGetNightTimeGS()),
+                  LOCATION(RC_GV_GS_PILLAR,      logic->IsAdult && logic->HookshotOrBoomerang() && logic->AtNight && logic->CanGetNightTimeGS()),
                 }, {
                   //Exits
                   Entrance(RR_GERUDO_FORTRESS,   {[]{return true;}}),
                   Entrance(RR_GV_UPPER_STREAM,   {[]{return true;}}),
-                  Entrance(RR_GERUDO_VALLEY,     {[]{return logic->IsChild || logic->CanRideEpona || logic->CanUse(RG_LONGSHOT) || randoCtx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_OPEN) || logic->CarpenterRescue;}}),
+                  Entrance(RR_GERUDO_VALLEY,     {[]{return logic->IsChild || logic->CanUse(RG_EPONA) || logic->CanUse(RG_LONGSHOT) || ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_OPEN) || logic->CarpenterRescue;}}),
                   Entrance(RR_GV_CARPENTER_TENT, {[]{return logic->IsAdult;}}),
-                  Entrance(RR_GV_STORMS_GROTTO,  {[]{return logic->IsAdult && logic->CanOpenStormGrotto;}}),
+                  Entrance(RR_GV_STORMS_GROTTO,  {[]{return logic->IsAdult && logic->CanOpenStormsGrotto();}}),
                   Entrance(RR_GV_CRATE_LEDGE, {[]{return false;}}),
   });
 
@@ -85,9 +85,9 @@ void RegionTable_Init_GerudoValley() {
 
   areaTable[RR_GV_STORMS_GROTTO] = Region("GV Storms Grotto", "GV Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_GV_DEKU_SCRUB_GROTTO_REAR,    logic->CanStunDeku),
-                  LOCATION(RC_GV_DEKU_SCRUB_GROTTO_FRONT,   logic->CanStunDeku),
-                  LOCATION(RC_GV_DEKU_SCRUB_GROTTO_BEEHIVE, logic->CanBreakUpperBeehives),
+                  LOCATION(RC_GV_DEKU_SCRUB_GROTTO_REAR,    logic->CanStunDeku()),
+                  LOCATION(RC_GV_DEKU_SCRUB_GROTTO_FRONT,   logic->CanStunDeku()),
+                  LOCATION(RC_GV_DEKU_SCRUB_GROTTO_BEEHIVE, logic->CanBreakUpperBeehives()),
                 }, {
                   //Exits
                   Entrance(RR_GV_FORTRESS_SIDE, {[]{return true;}}),
@@ -95,35 +95,35 @@ void RegionTable_Init_GerudoValley() {
 
   areaTable[RR_GERUDO_FORTRESS] = Region("Gerudo Fortress", "Gerudo Fortress", RA_GERUDO_FORTRESS, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->CarpenterRescue, {[]{return logic->CanFinishGerudoFortress;}}),
-                  EventAccess(&logic->GF_GateOpen,     {[]{return logic->IsAdult && logic->GerudoToken;}}),
-                  EventAccess(&logic->GtG_GateOpen,    {[]{return logic->GtG_GateOpen || (logic->IsAdult && logic->GerudoToken && logic->ChildsWallet);}}),
+                  EventAccess(&logic->CarpenterRescue, {[]{return logic->CanFinishGerudoFortress();}}),
+                  EventAccess(&logic->GF_GateOpen,     {[]{return logic->IsAdult && logic->HasItem(RG_GERUDO_MEMBERSHIP_CARD);}}),
+                  EventAccess(&logic->GtG_GateOpen,    {[]{return logic->GtG_GateOpen || (logic->IsAdult && logic->HasItem(RG_GERUDO_MEMBERSHIP_CARD) && logic->HasItem(RG_CHILD_WALLET));}}),
                 }, {
                   //Locations
                   LOCATION(RC_GF_CHEST,              logic->CanUse(RG_HOVER_BOOTS) || (logic->IsAdult && logic->CanUse(RG_SCARECROW)) || logic->CanUse(RG_LONGSHOT)),
-                  LOCATION(RC_GF_HBA_1000_POINTS,    logic->ChildsWallet && logic->GerudoToken && logic->CanRideEpona && logic->Bow && logic->AtDay),
-                  LOCATION(RC_GF_HBA_1500_POINTS,    logic->ChildsWallet && logic->GerudoToken && logic->CanRideEpona && logic->Bow && logic->AtDay),
+                  LOCATION(RC_GF_HBA_1000_POINTS,    logic->HasItem(RG_CHILD_WALLET) && logic->HasItem(RG_GERUDO_MEMBERSHIP_CARD) && logic->CanUse(RG_EPONA) && logic->CanUse(RG_FAIRY_BOW) && logic->AtDay),
+                  LOCATION(RC_GF_HBA_1500_POINTS,    logic->HasItem(RG_CHILD_WALLET) && logic->HasItem(RG_GERUDO_MEMBERSHIP_CARD) && logic->CanUse(RG_EPONA) && logic->CanUse(RG_FAIRY_BOW) && logic->AtDay),
                   LOCATION(RC_GF_NORTH_F1_CARPENTER,  logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)),
-                  LOCATION(RC_GF_NORTH_F2_CARPENTER, (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && (logic->GerudoToken || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_HOVER_BOOTS) || randoCtx->GetTrickOption(RT_GF_KITCHEN))),
+                  LOCATION(RC_GF_NORTH_F2_CARPENTER, (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && (logic->HasItem(RG_GERUDO_MEMBERSHIP_CARD) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_HOVER_BOOTS) || ctx->GetTrickOption(RT_GF_KITCHEN))),
                   LOCATION(RC_GF_SOUTH_F1_CARPENTER,  logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)),
                   LOCATION(RC_GF_SOUTH_F2_CARPENTER,  logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)),
-                  LOCATION(RC_GF_GERUDO_MEMBERSHIP_CARD,       logic->CanFinishGerudoFortress),
-                  LOCATION(RC_GF_GS_ARCHERY_RANGE,   logic->IsAdult && logic->HookshotOrBoomerang && logic->GerudoToken && logic->AtNight && logic->CanGetNightTimeGS),
-                  LOCATION(RC_GF_GS_TOP_FLOOR,       logic->IsAdult && logic->AtNight && (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG) || logic->HasExplosives || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_DINS_FIRE)) && (logic->GerudoToken || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_HOVER_BOOTS) || randoCtx->GetTrickOption(RT_GF_KITCHEN) || randoCtx->GetTrickOption(RT_GF_JUMP)) && logic->CanGetNightTimeGS),
+                  LOCATION(RC_GF_GERUDO_MEMBERSHIP_CARD,       logic->CanFinishGerudoFortress()),
+                  LOCATION(RC_GF_GS_ARCHERY_RANGE,   logic->IsAdult && logic->HookshotOrBoomerang() && logic->HasItem(RG_GERUDO_MEMBERSHIP_CARD) && logic->AtNight && logic->CanGetNightTimeGS()),
+                  LOCATION(RC_GF_GS_TOP_FLOOR,       logic->IsAdult && logic->AtNight && (logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG) || logic->HasExplosives() || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_DINS_FIRE)) && (logic->HasItem(RG_GERUDO_MEMBERSHIP_CARD) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_HOVER_BOOTS) || ctx->GetTrickOption(RT_GF_KITCHEN) || ctx->GetTrickOption(RT_GF_JUMP)) && logic->CanGetNightTimeGS()),
                 }, {
                   //Exits
                   Entrance(RR_GV_FORTRESS_SIDE,                 {[]{return true;}}),
                   Entrance(RR_GF_OUTSIDE_GATE,                  {[]{return logic->GF_GateOpen;}}),
-                  Entrance(RR_GERUDO_TRAINING_GROUNDS_ENTRYWAY, {[]{return logic->GtG_GateOpen && (logic->IsAdult || randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES));}}),
-                  Entrance(RR_GF_STORMS_GROTTO,                 {[]{return logic->IsAdult && logic->CanOpenStormGrotto;}}),
+                  Entrance(RR_GERUDO_TRAINING_GROUNDS_ENTRYWAY, {[]{return logic->GtG_GateOpen && (logic->IsAdult || ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES));}}),
+                  Entrance(RR_GF_STORMS_GROTTO,                 {[]{return logic->IsAdult && logic->CanOpenStormsGrotto();}}),
   });
 
   areaTable[RR_GF_OUTSIDE_GATE] = Region("GF Outside Gate", "Gerudo Fortress", RA_GERUDO_FORTRESS, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->GF_GateOpen, {[]{return logic->IsAdult && logic->GerudoToken && (randoCtx->GetOption(RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD) || randoCtx->GetOption(RSK_SHUFFLE_OVERWORLD_ENTRANCES) /*|| ShuffleSpecialIndoorEntrances*/);}}),
+                  EventAccess(&logic->GF_GateOpen, {[]{return logic->IsAdult && logic->HasItem(RG_GERUDO_MEMBERSHIP_CARD) && (ctx->GetOption(RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD) || ctx->GetOption(RSK_SHUFFLE_OVERWORLD_ENTRANCES) /*|| ShuffleSpecialIndoorEntrances*/);}}),
                 }, {}, {
                   //Exits
-                  Entrance(RR_GERUDO_FORTRESS,         {[]{return (logic->IsAdult && (logic->Hookshot || !randoCtx->GetOption(RSK_SHUFFLE_OVERWORLD_ENTRANCES))) || logic->GF_GateOpen;}}),
+                  Entrance(RR_GERUDO_FORTRESS,         {[]{return (logic->IsAdult && (logic->CanUse(RG_HOOKSHOT) || !ctx->GetOption(RSK_SHUFFLE_OVERWORLD_ENTRANCES))) || logic->GF_GateOpen;}}),
                   Entrance(RR_WASTELAND_NEAR_FORTRESS, {[]{return true;}}),
   });
 
@@ -138,29 +138,29 @@ void RegionTable_Init_GerudoValley() {
   areaTable[RR_WASTELAND_NEAR_FORTRESS] = Region("Wasteland Near Fortress", "Haunted Wasteland", RA_HAUNTED_WASTELAND, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_GF_OUTSIDE_GATE,   {[]{return true;}}),
-                  Entrance(RR_HAUNTED_WASTELAND, {[]{return logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_LONGSHOT) || randoCtx->GetTrickOption(RT_HW_CROSSING);}}),
+                  Entrance(RR_HAUNTED_WASTELAND, {[]{return logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_LONGSHOT) || ctx->GetTrickOption(RT_HW_CROSSING);}}),
   });
 
   areaTable[RR_HAUNTED_WASTELAND] = Region("Haunted Wasteland", "Haunted Wasteland", RA_HAUNTED_WASTELAND, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FairyPot,       {[]{return true;}}),
                   EventAccess(&logic->NutPot,         {[]{return true;}}),
-                  EventAccess(&logic->CarpetMerchant, {[]{return logic->AdultsWallet && (logic->CanJumpslash || logic->CanUse(RG_HOVER_BOOTS));}}),
+                  EventAccess(&logic->CarpetMerchant, {[]{return logic->HasItem(RG_ADULT_WALLET) && (logic->CanJumpslash() || logic->CanUse(RG_HOVER_BOOTS));}}),
                 }, {
                   //Locations
-                  LOCATION(RC_WASTELAND_CHEST,            logic->HasFireSource),
+                  LOCATION(RC_WASTELAND_CHEST,            logic->HasFireSource()),
                   LOCATION(RC_WASTELAND_BOMBCHU_SALESMAN, logic->CarpetMerchant),
-                  LOCATION(RC_WASTELAND_GS,               logic->HookshotOrBoomerang),
+                  LOCATION(RC_WASTELAND_GS,               logic->HookshotOrBoomerang()),
                 }, {
                   //Exits
-                  Entrance(RR_WASTELAND_NEAR_COLOSSUS, {[]{return randoCtx->GetTrickOption(RT_LENS_HW) || logic->CanUse(RG_LENS_OF_TRUTH);}}),
-                  Entrance(RR_WASTELAND_NEAR_FORTRESS, {[]{return logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_LONGSHOT) || randoCtx->GetTrickOption(RT_HW_CROSSING);}}),
+                  Entrance(RR_WASTELAND_NEAR_COLOSSUS, {[]{return ctx->GetTrickOption(RT_LENS_HW) || logic->CanUse(RG_LENS_OF_TRUTH);}}),
+                  Entrance(RR_WASTELAND_NEAR_FORTRESS, {[]{return logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_LONGSHOT) || ctx->GetTrickOption(RT_HW_CROSSING);}}),
   });
 
   areaTable[RR_WASTELAND_NEAR_COLOSSUS] = Region("Wasteland Near Colossus", "Haunted Wasteland", RA_HAUNTED_WASTELAND, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DESERT_COLOSSUS,   {[]{return true;}}),
-                  Entrance(RR_HAUNTED_WASTELAND, {[]{return randoCtx->GetTrickOption(RT_HW_REVERSE) || false;}}),
+                  Entrance(RR_HAUNTED_WASTELAND, {[]{return ctx->GetTrickOption(RT_HW_REVERSE) || false;}}),
   });
 
   areaTable[RR_DESERT_COLOSSUS] = Region("Desert Colossus", "Desert Colossus", RA_DESERT_COLOSSUS, DAY_NIGHT_CYCLE, {
@@ -170,13 +170,13 @@ void RegionTable_Init_GerudoValley() {
                 }, {
                   //Locations
                   LOCATION(RC_COLOSSUS_FREESTANDING_POH, logic->IsAdult && CanPlantBean(RR_DESERT_COLOSSUS)),
-                  LOCATION(RC_COLOSSUS_GS_BEAN_PATCH,    logic->CanPlantBugs && logic->CanChildAttack),
-                  LOCATION(RC_COLOSSUS_GS_TREE,          logic->IsAdult && logic->HookshotOrBoomerang && logic->AtNight && logic->CanGetNightTimeGS),
-                  LOCATION(RC_COLOSSUS_GS_HILL,          logic->IsAdult && logic->AtNight && ((CanPlantBean(RR_DESERT_COLOSSUS) && logic->CanAdultAttack) || logic->CanUse(RG_LONGSHOT) || (randoCtx->GetTrickOption(RT_COLOSSUS_GS) && logic->CanUse(RG_HOOKSHOT))) && logic->CanGetNightTimeGS),
+                  LOCATION(RC_COLOSSUS_GS_BEAN_PATCH,    logic->CanSpawnSoilSkull() && logic->CanAttack()),
+                  LOCATION(RC_COLOSSUS_GS_TREE,          logic->IsAdult && logic->HookshotOrBoomerang() && logic->AtNight && logic->CanGetNightTimeGS()),
+                  LOCATION(RC_COLOSSUS_GS_HILL,          logic->IsAdult && logic->AtNight && ((CanPlantBean(RR_DESERT_COLOSSUS) && logic->CanAttack()) || logic->CanUse(RG_LONGSHOT) || (ctx->GetTrickOption(RT_COLOSSUS_GS) && logic->CanUse(RG_HOOKSHOT))) && logic->CanGetNightTimeGS()),
                   LOCATION(RC_COLOSSUS_GOSSIP_STONE,     true),
                 }, {
                   //Exits
-                  Entrance(RR_COLOSSUS_GREAT_FAIRY_FOUNTAIN, {[]{return logic->HasExplosives;}}),
+                  Entrance(RR_COLOSSUS_GREAT_FAIRY_FOUNTAIN, {[]{return logic->HasExplosives();}}),
                   Entrance(RR_SPIRIT_TEMPLE_ENTRYWAY,        {[]{return true;}}),
                   Entrance(RR_WASTELAND_NEAR_COLOSSUS,       {[]{return true;}}),
                   Entrance(RR_COLOSSUS_GROTTO,               {[]{return logic->CanUse(RG_SILVER_GAUNTLETS);}}),
@@ -200,9 +200,9 @@ void RegionTable_Init_GerudoValley() {
 
   areaTable[RR_COLOSSUS_GROTTO] = Region("Colossus Grotto", "Colossus Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,  logic->CanStunDeku),
-                  LOCATION(RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT, logic->CanStunDeku),
-                  LOCATION(RC_COLOSSUS_GROTTO_BEEHIVE,          logic->CanBreakUpperBeehives),
+                  LOCATION(RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,  logic->CanStunDeku()),
+                  LOCATION(RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT, logic->CanStunDeku()),
+                  LOCATION(RC_COLOSSUS_GROTTO_BEEHIVE,          logic->CanBreakUpperBeehives()),
                 }, {
                   //Exits
                   Entrance(RR_DESERT_COLOSSUS, {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
index a6ef9a58f..772a7fad2 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
@@ -6,11 +6,11 @@ using namespace Rando;
 void RegionTable_Init_HyruleField() {
   areaTable[RR_HYRULE_FIELD] = Region("Hyrule Field", "Hyrule Field", RA_HYRULE_FIELD, DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->BigPoeKill, {[]{return logic->CanUse(RG_FAIRY_BOW) && logic->CanRideEpona && logic->HasBottle;}}),
+                  EventAccess(&logic->BigPoeKill, {[]{return logic->CanUse(RG_FAIRY_BOW) && logic->CanUse(RG_EPONA) && logic->HasBottle();}}),
                 }, {
                   //Locations
-                  LOCATION(RC_HF_OCARINA_OF_TIME_ITEM,   logic->IsChild && logic->HasAllStones),
-                  LOCATION(RC_SONG_FROM_OCARINA_OF_TIME, logic->IsChild && logic->HasAllStones),
+                  LOCATION(RC_HF_OCARINA_OF_TIME_ITEM,   logic->IsChild && logic->StoneCount() == 3),
+                  LOCATION(RC_SONG_FROM_OCARINA_OF_TIME, logic->IsChild && logic->StoneCount() == 3),
                 }, {
                   //Exits
                   Entrance(RR_LW_BRIDGE,              {[]{return true;}}),
@@ -20,23 +20,23 @@ void RegionTable_Init_HyruleField() {
                   Entrance(RR_KAKARIKO_VILLAGE,       {[]{return true;}}),
                   Entrance(RR_ZR_FRONT,               {[]{return true;}}),
                   Entrance(RR_LON_LON_RANCH,          {[]{return true;}}),
-                  Entrance(RR_HF_SOUTHEAST_GROTTO,    {[]{return Here(RR_HYRULE_FIELD, []{return logic->CanBlastOrSmash;});}}),
+                  Entrance(RR_HF_SOUTHEAST_GROTTO,    {[]{return Here(RR_HYRULE_FIELD, []{return logic->BlastOrSmash();});}}),
                   Entrance(RR_HF_OPEN_GROTTO,         {[]{return true;}}),
-                  Entrance(RR_HF_INSIDE_FENCE_GROTTO, {[]{return logic->CanOpenBombGrotto;}}),
-                  Entrance(RR_HF_COW_GROTTO,          {[]{return (logic->CanUse(RG_MEGATON_HAMMER) || logic->IsChild) && logic->CanOpenBombGrotto;}}),
-                  Entrance(RR_HF_NEAR_MARKET_GROTTO,  {[]{return Here(RR_HYRULE_FIELD, []{return logic->CanBlastOrSmash;});}}),
-                  Entrance(RR_HF_FAIRY_GROTTO,        {[]{return Here(RR_HYRULE_FIELD, []{return logic->CanBlastOrSmash;});}}),
-                  Entrance(RR_HF_NEAR_KAK_GROTTO,     {[]{return logic->CanOpenBombGrotto;}}),
-                  Entrance(RR_HF_TEKTITE_GROTTO,      {[]{return logic->CanOpenBombGrotto;}}),
+                  Entrance(RR_HF_INSIDE_FENCE_GROTTO, {[]{return logic->CanOpenBombGrotto();}}),
+                  Entrance(RR_HF_COW_GROTTO,          {[]{return (logic->CanUse(RG_MEGATON_HAMMER) || logic->IsChild) && logic->CanOpenBombGrotto();}}),
+                  Entrance(RR_HF_NEAR_MARKET_GROTTO,  {[]{return Here(RR_HYRULE_FIELD, []{return logic->BlastOrSmash();});}}),
+                  Entrance(RR_HF_FAIRY_GROTTO,        {[]{return Here(RR_HYRULE_FIELD, []{return logic->BlastOrSmash();});}}),
+                  Entrance(RR_HF_NEAR_KAK_GROTTO,     {[]{return logic->CanOpenBombGrotto();}}),
+                  Entrance(RR_HF_TEKTITE_GROTTO,      {[]{return logic->CanOpenBombGrotto();}}),
   });
 
   areaTable[RR_HF_SOUTHEAST_GROTTO] = Region("HF Southeast Grotto", "HF Southeast Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LOCATION(RC_HF_SOUTHEAST_GROTTO_CHEST,         true),
-                  LOCATION(RC_HF_SOUTHEAST_GROTTO_FISH,          logic->HasBottle),
+                  LOCATION(RC_HF_SOUTHEAST_GROTTO_FISH,          logic->HasBottle()),
                   LOCATION(RC_HF_SOUTHEAST_GROTTO_GOSSIP_STONE,  true),
-                  LOCATION(RC_HF_SOUTHEAST_GROTTO_BEEHIVE_LEFT,  logic->CanBreakLowerBeehives),
-                  LOCATION(RC_HF_SOUTHEAST_GROTTO_BEEHIVE_RIGHT, logic->CanBreakLowerBeehives),
+                  LOCATION(RC_HF_SOUTHEAST_GROTTO_BEEHIVE_LEFT,  logic->CanBreakLowerBeehives()),
+                  LOCATION(RC_HF_SOUTHEAST_GROTTO_BEEHIVE_RIGHT, logic->CanBreakLowerBeehives()),
                 }, {
                   //Exits
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
@@ -45,10 +45,10 @@ void RegionTable_Init_HyruleField() {
   areaTable[RR_HF_OPEN_GROTTO] = Region("HF Open Grotto", "HF Open Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LOCATION(RC_HF_OPEN_GROTTO_CHEST,         true),
-                  LOCATION(RC_HF_OPEN_GROTTO_FISH,          logic->HasBottle),
+                  LOCATION(RC_HF_OPEN_GROTTO_FISH,          logic->HasBottle()),
                   LOCATION(RC_HF_OPEN_GROTTO_GOSSIP_STONE,  true),
-                  LOCATION(RC_HF_OPEN_GROTTO_BEEHIVE_LEFT,  logic->CanBreakLowerBeehives),
-                  LOCATION(RC_HF_OPEN_GROTTO_BEEHIVE_RIGHT, logic->CanBreakLowerBeehives),
+                  LOCATION(RC_HF_OPEN_GROTTO_BEEHIVE_LEFT,  logic->CanBreakLowerBeehives()),
+                  LOCATION(RC_HF_OPEN_GROTTO_BEEHIVE_RIGHT, logic->CanBreakLowerBeehives()),
                 }, {
                   //Exits
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
@@ -56,8 +56,8 @@ void RegionTable_Init_HyruleField() {
 
   areaTable[RR_HF_INSIDE_FENCE_GROTTO] = Region("HF Inside Fence Grotto", "HF Inside Fence Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_HF_DEKU_SCRUB_GROTTO,           logic->CanStunDeku),
-                  LOCATION(RC_HF_INSIDE_FENCE_GROTTO_BEEHIVE, logic->CanBreakLowerBeehives),
+                  LOCATION(RC_HF_DEKU_SCRUB_GROTTO,           logic->CanStunDeku()),
+                  LOCATION(RC_HF_INSIDE_FENCE_GROTTO_BEEHIVE, logic->CanBreakLowerBeehives()),
                 }, {
                   //Exits
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
@@ -65,9 +65,9 @@ void RegionTable_Init_HyruleField() {
 
   areaTable[RR_HF_COW_GROTTO] = Region("HF Cow Grotto", "HF Cow Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
-                  LOCATION(RC_HF_GS_COW_GROTTO,           logic->HasFireSource && logic->HookshotOrBoomerang),
-                  LOCATION(RC_HF_COW_GROTTO_COW,          logic->HasFireSource && logic->CanUse(RG_EPONAS_SONG)),
-                  LOCATION(RC_HF_COW_GROTTO_GOSSIP_STONE, logic->HasFireSource),
+                  LOCATION(RC_HF_GS_COW_GROTTO,           logic->HasFireSource() && logic->HookshotOrBoomerang()),
+                  LOCATION(RC_HF_COW_GROTTO_COW,          logic->HasFireSource() && logic->CanUse(RG_EPONAS_SONG)),
+                  LOCATION(RC_HF_COW_GROTTO_GOSSIP_STONE, logic->HasFireSource()),
                 }, {
                   //Exits
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
@@ -76,10 +76,10 @@ void RegionTable_Init_HyruleField() {
   areaTable[RR_HF_NEAR_MARKET_GROTTO] = Region("HF Near Market Grotto", "HF Near Market Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LOCATION(RC_HF_NEAR_MARKET_GROTTO_CHEST,         true),
-                  LOCATION(RC_HF_NEAR_MARKET_GROTTO_FISH,          logic->HasBottle),
+                  LOCATION(RC_HF_NEAR_MARKET_GROTTO_FISH,          logic->HasBottle()),
                   LOCATION(RC_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE,  true),
-                  LOCATION(RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_LEFT,  logic->CanBreakLowerBeehives),
-                  LOCATION(RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_RIGHT, logic->CanBreakLowerBeehives),
+                  LOCATION(RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_LEFT,  logic->CanBreakLowerBeehives()),
+                  LOCATION(RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_RIGHT, logic->CanBreakLowerBeehives()),
                 }, {
                   //Exits
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
@@ -95,7 +95,7 @@ void RegionTable_Init_HyruleField() {
 
   areaTable[RR_HF_NEAR_KAK_GROTTO] = Region("HF Near Kak Grotto", "HF Near Kak Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_HF_GS_NEAR_KAK_GROTTO, logic->HookshotOrBoomerang),
+                  LOCATION(RC_HF_GS_NEAR_KAK_GROTTO, logic->HookshotOrBoomerang()),
                 }, {
                   //Exits
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
@@ -103,7 +103,7 @@ void RegionTable_Init_HyruleField() {
 
   areaTable[RR_HF_TEKTITE_GROTTO] = Region("HF Tektite Grotto", "HF Tektite Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_HF_TEKTITE_GROTTO_FREESTANDING_POH, logic->ProgressiveScale >= 2 || logic->CanUse(RG_IRON_BOOTS)),
+                  LOCATION(RC_HF_TEKTITE_GROTTO_FREESTANDING_POH, logic->HasItem(RG_GOLDEN_SCALE) || logic->CanUse(RG_IRON_BOOTS)),
                 }, {
                   //Exits
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
@@ -111,32 +111,32 @@ void RegionTable_Init_HyruleField() {
 
   areaTable[RR_LAKE_HYLIA] = Region("Lake Hylia", "Lake Hylia", RA_LAKE_HYLIA, DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CanSummonGossipFairy;}}),
+                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CallGossipFairy();}}),
                   EventAccess(&logic->BeanPlantFairy,   {[]{return logic->BeanPlantFairy   || (CanPlantBean(RR_LAKE_HYLIA) && logic->CanUse(RG_SONG_OF_STORMS));}}),
                   EventAccess(&logic->ButterflyFairy,   {[]{return logic->ButterflyFairy   || logic->CanUse(RG_STICKS);}}),
-                  EventAccess(&logic->BugShrub,         {[]{return logic->BugShrub         || (logic->IsChild && logic->CanCutShrubs);}}),
-                  EventAccess(&logic->ChildScarecrow,   {[]{return logic->ChildScarecrow   || (logic->IsChild && logic->Ocarina && logic->OcarinaButtons >= 2);}}),
-                  EventAccess(&logic->AdultScarecrow,   {[]{return logic->AdultScarecrow   || (logic->IsAdult && logic->Ocarina && logic->OcarinaButtons >= 2);}}),
+                  EventAccess(&logic->BugShrub,         {[]{return logic->BugShrub         || (logic->IsChild && logic->CanCutShrubs());}}),
+                  EventAccess(&logic->ChildScarecrow,   {[]{return logic->ChildScarecrow   || (logic->IsChild && logic->HasItem(RG_FAIRY_OCARINA) && logic->OcarinaButtons() >= 2);}}),
+                  EventAccess(&logic->AdultScarecrow,   {[]{return logic->AdultScarecrow   || (logic->IsAdult && logic->HasItem(RG_FAIRY_OCARINA) && logic->OcarinaButtons() >= 2);}}),
                 }, {
                   //Locations
-                  LOCATION(RC_LH_UNDERWATER_ITEM,        logic->IsChild && logic->CanDive),
+                  LOCATION(RC_LH_UNDERWATER_ITEM,        logic->IsChild && logic->HasItem(RG_SILVER_SCALE)),
                   LOCATION(RC_LH_SUN,                    logic->IsAdult && logic->WaterTempleClear && logic->CanUse(RG_FAIRY_BOW)),
                   LOCATION(RC_LH_FREESTANDING_POH,       logic->IsAdult && (logic->CanUse(RG_SCARECROW) || CanPlantBean(RR_LAKE_HYLIA))),
-                  LOCATION(RC_LH_GS_BEAN_PATCH,          logic->CanPlantBugs && logic->CanChildAttack),
-                  LOCATION(RC_LH_GS_LAB_WALL,            logic->IsChild && (logic->HookshotOrBoomerang || (randoCtx->GetTrickOption(RT_LH_LAB_WALL_GS) && logic->CanJumpslash)) && logic->AtNight && logic->CanGetNightTimeGS),
-                  LOCATION(RC_LH_GS_SMALL_ISLAND,        logic->IsChild && logic->CanChildAttack && logic->AtNight && logic->CanGetNightTimeGS),
-                  LOCATION(RC_LH_GS_TREE,                logic->IsAdult && logic->CanUse(RG_LONGSHOT) && logic->AtNight && logic->CanGetNightTimeGS),
+                  LOCATION(RC_LH_GS_BEAN_PATCH,          logic->CanSpawnSoilSkull() && logic->CanAttack()),
+                  LOCATION(RC_LH_GS_LAB_WALL,            logic->IsChild && (logic->HookshotOrBoomerang() || (ctx->GetTrickOption(RT_LH_LAB_WALL_GS) && logic->CanJumpslash())) && logic->AtNight && logic->CanGetNightTimeGS()),
+                  LOCATION(RC_LH_GS_SMALL_ISLAND,        logic->IsChild && logic->CanAttack() && logic->AtNight && logic->CanGetNightTimeGS()),
+                  LOCATION(RC_LH_GS_TREE,                logic->IsAdult && logic->CanUse(RG_LONGSHOT) && logic->AtNight && logic->CanGetNightTimeGS()),
                   LOCATION(RC_LH_LAB_GOSSIP_STONE,       true),
                   LOCATION(RC_LH_SOUTHEAST_GOSSIP_STONE, true),
                   LOCATION(RC_LH_SOUTHWEST_GOSSIP_STONE, true),
                 }, {
                   //Exits
                   Entrance(RR_HYRULE_FIELD,          {[]{return true;}}),
-                  Entrance(RR_ZORAS_DOMAIN,          {[]{return logic->IsChild && (logic->CanDive || logic->CanUse(RG_IRON_BOOTS));}}),
+                  Entrance(RR_ZORAS_DOMAIN,          {[]{return logic->IsChild && (logic->HasItem(RG_SILVER_SCALE) || logic->CanUse(RG_IRON_BOOTS));}}),
                   Entrance(RR_LH_OWL_FLIGHT,         {[]{return logic->IsChild;}}),
                   Entrance(RR_LH_FISHING_ISLAND,     {[]{return logic->IsChild || logic->CanUse(RG_SCARECROW) || CanPlantBean(RR_LAKE_HYLIA) || logic->WaterTempleClear;}}),
                   Entrance(RR_LH_LAB,                {[]{return true;}}),
-                  Entrance(RR_WATER_TEMPLE_ENTRYWAY, {[]{return logic->CanUse(RG_HOOKSHOT) && ((logic->CanUse(RG_IRON_BOOTS) || (randoCtx->GetTrickOption(RT_LH_WATER_HOOKSHOT) && logic->ProgressiveScale >= 2)) || (logic->IsAdult && logic->CanUse(RG_LONGSHOT) && logic->ProgressiveScale >= 2));}}),
+                  Entrance(RR_WATER_TEMPLE_ENTRYWAY, {[]{return logic->CanUse(RG_HOOKSHOT) && ((logic->CanUse(RG_IRON_BOOTS) || (ctx->GetTrickOption(RT_LH_WATER_HOOKSHOT) && logic->HasItem(RG_GOLDEN_SCALE))) || (logic->IsAdult && logic->CanUse(RG_LONGSHOT) && logic->HasItem(RG_GOLDEN_SCALE)));}}),
                   Entrance(RR_LH_GROTTO,             {[]{return true;}}),
   });
 
@@ -153,11 +153,11 @@ void RegionTable_Init_HyruleField() {
 
   areaTable[RR_LH_LAB] = Region("LH Lab", "LH Lab", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->EyedropsAccess, {[]{return logic->EyedropsAccess || (logic->IsAdult && (logic->EyeballFrogAccess || (logic->EyeballFrog && logic->DisableTradeRevert)));}}),
+                  EventAccess(&logic->EyedropsAccess, {[]{return logic->EyedropsAccess || (logic->IsAdult && (logic->EyeballFrogAccess || (logic->CanUse(RG_EYEBALL_FROG) && logic->DisableTradeRevert)));}}),
                 }, {
                   //Locations
-                  LOCATION(RC_LH_LAB_DIVE,     logic->ProgressiveScale >= 2 || (randoCtx->GetTrickOption(RT_LH_LAB_DIVING) && logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_HOOKSHOT))),
-                  LOCATION(RC_LH_TRADE_FROG,   logic->IsAdult && logic->EyeballFrog),
+                  LOCATION(RC_LH_LAB_DIVE,     logic->HasItem(RG_GOLDEN_SCALE) || (ctx->GetTrickOption(RT_LH_LAB_DIVING) && logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_HOOKSHOT))),
+                  LOCATION(RC_LH_TRADE_FROG,   logic->IsAdult && logic->CanUse(RG_EYEBALL_FROG)),
                   LOCATION(RC_LH_GS_LAB_CRATE, logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_HOOKSHOT)),
                 }, {
                   //Exits
@@ -167,42 +167,42 @@ void RegionTable_Init_HyruleField() {
   // TODO: should some of these helpers be done via events instead?
   areaTable[RR_LH_FISHING_HOLE] = Region("LH Fishing Hole", "LH Fishing Hole", RA_NONE, DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_LH_CHILD_FISHING,  logic->CanFish && logic->IsChild),
-                  LOCATION(RC_LH_CHILD_FISH_1,   logic->CanGetChildFish),
-                  LOCATION(RC_LH_CHILD_FISH_2,   logic->CanGetChildFish),
-                  LOCATION(RC_LH_CHILD_FISH_3,   logic->CanGetChildFish),
-                  LOCATION(RC_LH_CHILD_FISH_4,   logic->CanGetChildFish),
-                  LOCATION(RC_LH_CHILD_FISH_5,   logic->CanGetChildFish),
-                  LOCATION(RC_LH_CHILD_FISH_6,   logic->CanGetChildFish),
-                  LOCATION(RC_LH_CHILD_FISH_7,   logic->CanGetChildFish),
-                  LOCATION(RC_LH_CHILD_FISH_8,   logic->CanGetChildFish),
-                  LOCATION(RC_LH_CHILD_FISH_9,   logic->CanGetChildFish),
-                  LOCATION(RC_LH_CHILD_FISH_10,  logic->CanGetChildFish),
-                  LOCATION(RC_LH_CHILD_FISH_11,  logic->CanGetChildFish),
-                  LOCATION(RC_LH_CHILD_FISH_12,  logic->CanGetChildFish),
-                  LOCATION(RC_LH_CHILD_FISH_13,  logic->CanGetChildFish),
-                  LOCATION(RC_LH_CHILD_FISH_14,  logic->CanGetChildFish),
-                  LOCATION(RC_LH_CHILD_FISH_15,  logic->CanGetChildFish),
-                  LOCATION(RC_LH_CHILD_LOACH_1,  logic->CanGetChildFish),
-                  LOCATION(RC_LH_CHILD_LOACH_2,  logic->CanGetChildFish),
-                  LOCATION(RC_LH_ADULT_FISHING,  logic->CanFish && logic->IsAdult),
-                  LOCATION(RC_LH_ADULT_FISH_1,   logic->CanGetAdultFish),
-                  LOCATION(RC_LH_ADULT_FISH_2,   logic->CanGetAdultFish),
-                  LOCATION(RC_LH_ADULT_FISH_3,   logic->CanGetAdultFish),
-                  LOCATION(RC_LH_ADULT_FISH_4,   logic->CanGetAdultFish),
-                  LOCATION(RC_LH_ADULT_FISH_5,   logic->CanGetAdultFish),
-                  LOCATION(RC_LH_ADULT_FISH_6,   logic->CanGetAdultFish),
-                  LOCATION(RC_LH_ADULT_FISH_7,   logic->CanGetAdultFish),
-                  LOCATION(RC_LH_ADULT_FISH_8,   logic->CanGetAdultFish),
-                  LOCATION(RC_LH_ADULT_FISH_9,   logic->CanGetAdultFish),
-                  LOCATION(RC_LH_ADULT_FISH_10,  logic->CanGetAdultFish),
-                  LOCATION(RC_LH_ADULT_FISH_11,  logic->CanGetAdultFish),
-                  LOCATION(RC_LH_ADULT_FISH_12,  logic->CanGetAdultFish),
-                  LOCATION(RC_LH_ADULT_FISH_13,  logic->CanGetAdultFish),
-                  LOCATION(RC_LH_ADULT_FISH_14,  logic->CanGetAdultFish),
-                  LOCATION(RC_LH_ADULT_FISH_15,  logic->CanGetAdultFish),
-                  LOCATION(RC_LH_ADULT_LOACH,    logic->CanGetAdultFish),
-                  LOCATION(RC_LH_HYRULE_LOACH,   logic->CanFish),
+                  LOCATION(RC_LH_CHILD_FISHING,  logic->CanUse(RG_FISHING_POLE) && logic->IsChild),
+                  LOCATION(RC_LH_CHILD_FISH_1,   logic->CanUse(RG_FISHING_POLE) && (logic->IsChild || ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT))),
+                  LOCATION(RC_LH_CHILD_FISH_2,   logic->CanUse(RG_FISHING_POLE) && (logic->IsChild || ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT))),
+                  LOCATION(RC_LH_CHILD_FISH_3,   logic->CanUse(RG_FISHING_POLE) && (logic->IsChild || ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT))),
+                  LOCATION(RC_LH_CHILD_FISH_4,   logic->CanUse(RG_FISHING_POLE) && (logic->IsChild || ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT))),
+                  LOCATION(RC_LH_CHILD_FISH_5,   logic->CanUse(RG_FISHING_POLE) && (logic->IsChild || ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT))),
+                  LOCATION(RC_LH_CHILD_FISH_6,   logic->CanUse(RG_FISHING_POLE) && (logic->IsChild || ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT))),
+                  LOCATION(RC_LH_CHILD_FISH_7,   logic->CanUse(RG_FISHING_POLE) && (logic->IsChild || ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT))),
+                  LOCATION(RC_LH_CHILD_FISH_8,   logic->CanUse(RG_FISHING_POLE) && (logic->IsChild || ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT))),
+                  LOCATION(RC_LH_CHILD_FISH_9,   logic->CanUse(RG_FISHING_POLE) && (logic->IsChild || ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT))),
+                  LOCATION(RC_LH_CHILD_FISH_10,  logic->CanUse(RG_FISHING_POLE) && (logic->IsChild || ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT))),
+                  LOCATION(RC_LH_CHILD_FISH_11,  logic->CanUse(RG_FISHING_POLE) && (logic->IsChild || ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT))),
+                  LOCATION(RC_LH_CHILD_FISH_12,  logic->CanUse(RG_FISHING_POLE) && (logic->IsChild || ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT))),
+                  LOCATION(RC_LH_CHILD_FISH_13,  logic->CanUse(RG_FISHING_POLE) && (logic->IsChild || ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT))),
+                  LOCATION(RC_LH_CHILD_FISH_14,  logic->CanUse(RG_FISHING_POLE) && (logic->IsChild || ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT))),
+                  LOCATION(RC_LH_CHILD_FISH_15,  logic->CanUse(RG_FISHING_POLE) && (logic->IsChild || ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT))),
+                  LOCATION(RC_LH_CHILD_LOACH_1,  logic->CanUse(RG_FISHING_POLE) && (logic->IsChild || ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT))),
+                  LOCATION(RC_LH_CHILD_LOACH_2,  logic->CanUse(RG_FISHING_POLE) && (logic->IsChild || ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT))),
+                  LOCATION(RC_LH_ADULT_FISHING,  logic->CanUse(RG_FISHING_POLE) && logic->IsAdult),
+                  LOCATION(RC_LH_ADULT_FISH_1,   logic->CanUse(RG_FISHING_POLE) && logic->IsAdult && ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT)),
+                  LOCATION(RC_LH_ADULT_FISH_2,   logic->CanUse(RG_FISHING_POLE) && logic->IsAdult && ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT)),
+                  LOCATION(RC_LH_ADULT_FISH_3,   logic->CanUse(RG_FISHING_POLE) && logic->IsAdult && ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT)),
+                  LOCATION(RC_LH_ADULT_FISH_4,   logic->CanUse(RG_FISHING_POLE) && logic->IsAdult && ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT)),
+                  LOCATION(RC_LH_ADULT_FISH_5,   logic->CanUse(RG_FISHING_POLE) && logic->IsAdult && ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT)),
+                  LOCATION(RC_LH_ADULT_FISH_6,   logic->CanUse(RG_FISHING_POLE) && logic->IsAdult && ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT)),
+                  LOCATION(RC_LH_ADULT_FISH_7,   logic->CanUse(RG_FISHING_POLE) && logic->IsAdult && ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT)),
+                  LOCATION(RC_LH_ADULT_FISH_8,   logic->CanUse(RG_FISHING_POLE) && logic->IsAdult && ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT)),
+                  LOCATION(RC_LH_ADULT_FISH_9,   logic->CanUse(RG_FISHING_POLE) && logic->IsAdult && ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT)),
+                  LOCATION(RC_LH_ADULT_FISH_10,  logic->CanUse(RG_FISHING_POLE) && logic->IsAdult && ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT)),
+                  LOCATION(RC_LH_ADULT_FISH_11,  logic->CanUse(RG_FISHING_POLE) && logic->IsAdult && ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT)),
+                  LOCATION(RC_LH_ADULT_FISH_12,  logic->CanUse(RG_FISHING_POLE) && logic->IsAdult && ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT)),
+                  LOCATION(RC_LH_ADULT_FISH_13,  logic->CanUse(RG_FISHING_POLE) && logic->IsAdult && ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT)),
+                  LOCATION(RC_LH_ADULT_FISH_14,  logic->CanUse(RG_FISHING_POLE) && logic->IsAdult && ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT)),
+                  LOCATION(RC_LH_ADULT_FISH_15,  logic->CanUse(RG_FISHING_POLE) && logic->IsAdult && ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT)),
+                  LOCATION(RC_LH_ADULT_LOACH,    logic->CanUse(RG_FISHING_POLE) && logic->IsAdult && ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT)),
+                  LOCATION(RC_LH_HYRULE_LOACH,   logic->CanUse(RG_FISHING_POLE)),
                   LOCATION(RC_FISHING_POLE_HINT, true),
                 }, {
                   //Exits
@@ -211,10 +211,10 @@ void RegionTable_Init_HyruleField() {
 
   areaTable[RR_LH_GROTTO] = Region("LH Grotto", "LH Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_LH_DEKU_SCRUB_GROTTO_LEFT,   logic->CanStunDeku),
-                  LOCATION(RC_LH_DEKU_SCRUB_GROTTO_RIGHT,  logic->CanStunDeku),
-                  LOCATION(RC_LH_DEKU_SCRUB_GROTTO_CENTER, logic->CanStunDeku),
-                  LOCATION(RC_LH_GROTTO_BEEHIVE,           logic->CanBreakUpperBeehives),
+                  LOCATION(RC_LH_DEKU_SCRUB_GROTTO_LEFT,   logic->CanStunDeku()),
+                  LOCATION(RC_LH_DEKU_SCRUB_GROTTO_RIGHT,  logic->CanStunDeku()),
+                  LOCATION(RC_LH_DEKU_SCRUB_GROTTO_CENTER, logic->CanStunDeku()),
+                  LOCATION(RC_LH_GROTTO_BEEHIVE,           logic->CanBreakUpperBeehives()),
                 }, {
                   //Exits
                   Entrance(RR_LAKE_HYLIA, {[]{return true;}}),
@@ -222,15 +222,15 @@ void RegionTable_Init_HyruleField() {
 
   areaTable[RR_LON_LON_RANCH] = Region("Lon Lon Ranch", "Lon Lon Ranch", RA_LON_LON_RANCH, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->Epona,    {[]{return logic->Epona    || ((logic->ChildsWallet || randoCtx->GetOption(RSK_SKIP_EPONA_RACE)) && logic->CanUse(RG_EPONAS_SONG) && logic->IsAdult && logic->AtDay);}}),
-                  EventAccess(&logic->LinksCow, {[]{return logic->LinksCow || (logic->ChildsWallet && logic->CanUse(RG_EPONAS_SONG) && logic->IsAdult && logic->AtDay);}}),
+                  EventAccess(&logic->FreedEpona,    {[]{return logic->FreedEpona    || ((logic->HasItem(RG_CHILD_WALLET) || ctx->GetOption(RSK_SKIP_EPONA_RACE)) && logic->CanUse(RG_EPONAS_SONG) && logic->IsAdult && logic->AtDay);}}),
+                  EventAccess(&logic->LinksCow, {[]{return logic->LinksCow || (logic->HasItem(RG_CHILD_WALLET) && logic->CanUse(RG_EPONAS_SONG) && logic->IsAdult && logic->AtDay);}}),
                 }, {
                   //Locations
-                  LOCATION(RC_SONG_FROM_MALON,     logic->IsChild && logic->ZeldasLetter && logic->Ocarina && logic->AtDay),
+                  LOCATION(RC_SONG_FROM_MALON,     logic->IsChild && logic->HasItem(RG_ZELDAS_LETTER) && logic->HasItem(RG_FAIRY_OCARINA) && logic->AtDay),
                   LOCATION(RC_LLR_GS_TREE,         logic->IsChild),
-                  LOCATION(RC_LLR_GS_RAIN_SHED,    logic->IsChild && logic->AtNight && logic->CanGetNightTimeGS),
-                  LOCATION(RC_LLR_GS_HOUSE_WINDOW, logic->IsChild && logic->HookshotOrBoomerang && logic->AtNight && logic->CanGetNightTimeGS),
-                  LOCATION(RC_LLR_GS_BACK_WALL,    logic->IsChild && logic->HookshotOrBoomerang && logic->AtNight && logic->CanGetNightTimeGS),
+                  LOCATION(RC_LLR_GS_RAIN_SHED,    logic->IsChild && logic->AtNight && logic->CanGetNightTimeGS()),
+                  LOCATION(RC_LLR_GS_HOUSE_WINDOW, logic->IsChild && logic->HookshotOrBoomerang() && logic->AtNight && logic->CanGetNightTimeGS()),
+                  LOCATION(RC_LLR_GS_BACK_WALL,    logic->IsChild && logic->HookshotOrBoomerang() && logic->AtNight && logic->CanGetNightTimeGS()),
                 }, {
                   //Exits
                   Entrance(RR_HYRULE_FIELD,     {[]{return true;}}),
@@ -242,7 +242,7 @@ void RegionTable_Init_HyruleField() {
 
   areaTable[RR_LLR_TALONS_HOUSE] = Region("LLR Talons House", "LLR Talons House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_LLR_TALONS_CHICKENS, logic->ChildsWallet && logic->IsChild && logic->AtDay && logic->ZeldasLetter),
+                  LOCATION(RC_LLR_TALONS_CHICKENS, logic->HasItem(RG_CHILD_WALLET) && logic->IsChild && logic->AtDay && logic->HasItem(RG_ZELDAS_LETTER)),
                 }, {
                   //Exits
                   Entrance(RR_LON_LON_RANCH, {[]{return true;}}),
@@ -269,10 +269,10 @@ void RegionTable_Init_HyruleField() {
 
   areaTable[RR_LLR_GROTTO] = Region("LLR Grotto", "LLR Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_LLR_DEKU_SCRUB_GROTTO_LEFT,   logic->CanStunDeku),
-                  LOCATION(RC_LLR_DEKU_SCRUB_GROTTO_RIGHT,  logic->CanStunDeku),
-                  LOCATION(RC_LLR_DEKU_SCRUB_GROTTO_CENTER, logic->CanStunDeku),
-                  LOCATION(RC_LLR_GROTTO_BEEHIVE,           logic->CanBreakUpperBeehives),
+                  LOCATION(RC_LLR_DEKU_SCRUB_GROTTO_LEFT,   logic->CanStunDeku()),
+                  LOCATION(RC_LLR_DEKU_SCRUB_GROTTO_RIGHT,  logic->CanStunDeku()),
+                  LOCATION(RC_LLR_DEKU_SCRUB_GROTTO_CENTER, logic->CanStunDeku()),
+                  LOCATION(RC_LLR_GROTTO_BEEHIVE,           logic->CanBreakUpperBeehives()),
                 }, {
                   //Exits
                   Entrance(RR_LON_LON_RANCH, {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp
index 7e603d657..feb932e5f 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp
@@ -10,74 +10,74 @@ void RegionTable_Init_IceCavern() {
   ---------------------------*/
   areaTable[RR_ICE_CAVERN_ENTRYWAY] = Region("Ice Cavern Entryway", "Ice Cavern", RA_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_ICE_CAVERN_BEGINNING,    {[]{return randoCtx->GetDungeon(ICE_CAVERN)->IsVanilla();}}),
-                  Entrance(RR_ICE_CAVERN_MQ_BEGINNING, {[]{return randoCtx->GetDungeon(ICE_CAVERN)->IsMQ() && logic->CanUseProjectile;}}),
+                  Entrance(RR_ICE_CAVERN_BEGINNING,    {[]{return ctx->GetDungeon(ICE_CAVERN)->IsVanilla();}}),
+                  Entrance(RR_ICE_CAVERN_MQ_BEGINNING, {[]{return ctx->GetDungeon(ICE_CAVERN)->IsMQ() && logic->CanUseProjectile();}}),
                   Entrance(RR_ZORAS_FOUNTAIN,          {[]{return true;}}),
   });
 
   /*--------------------------
   |     VANILLA DUNGEON      |
   ---------------------------*/
-  if (randoCtx->GetDungeon(ICE_CAVERN)->IsVanilla()) {
+  if (ctx->GetDungeon(ICE_CAVERN)->IsVanilla()) {
   areaTable[RR_ICE_CAVERN_BEGINNING] = Region("Ice Cavern Beginning", "Ice Cavern", RA_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_ICE_CAVERN_ENTRYWAY, {[]{return true;}}),
-                  Entrance(RR_ICE_CAVERN_MAIN,     {[]{return Here(RR_ICE_CAVERN_BEGINNING, []{return (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_DINS_FIRE);});}}),
+                  Entrance(RR_ICE_CAVERN_MAIN,     {[]{return Here(RR_ICE_CAVERN_BEGINNING, []{return (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives() || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_DINS_FIRE);});}}),
   });
 
   areaTable[RR_ICE_CAVERN_MAIN] = Region("Ice Cavern", "Ice Cavern", RA_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->BlueFireAccess, {[]{return logic->BlueFireAccess || (logic->IsAdult && logic->HasBottle);}}),
+                  EventAccess(&logic->BlueFireAccess, {[]{return logic->BlueFireAccess || (logic->IsAdult && logic->HasBottle());}}),
                 }, {
                   //Locations
-                  LOCATION(RC_ICE_CAVERN_MAP_CHEST,               logic->BlueFire && logic->IsAdult),
-                  LOCATION(RC_ICE_CAVERN_COMPASS_CHEST,           logic->BlueFire),
-                  LOCATION(RC_ICE_CAVERN_IRON_BOOTS_CHEST,        logic->BlueFire && (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_DINS_FIRE))),
-                  LOCATION(RC_SHEIK_IN_ICE_CAVERN,                logic->BlueFire && (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_DINS_FIRE)) && logic->IsAdult),
-                  LOCATION(RC_ICE_CAVERN_FREESTANDING_POH,        logic->BlueFire),
-                  LOCATION(RC_ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM, logic->HookshotOrBoomerang),
-                  LOCATION(RC_ICE_CAVERN_GS_HEART_PIECE_ROOM,     logic->BlueFire && logic->HookshotOrBoomerang),
-                  LOCATION(RC_ICE_CAVERN_GS_PUSH_BLOCK_ROOM,      logic->BlueFire && (logic->HookshotOrBoomerang || (randoCtx->GetTrickOption(RT_ICE_BLOCK_GS) && logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS)))),
+                  LOCATION(RC_ICE_CAVERN_MAP_CHEST,               logic->BlueFire() && logic->IsAdult),
+                  LOCATION(RC_ICE_CAVERN_COMPASS_CHEST,           logic->BlueFire()),
+                  LOCATION(RC_ICE_CAVERN_IRON_BOOTS_CHEST,        logic->BlueFire() && (logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_DINS_FIRE))),
+                  LOCATION(RC_SHEIK_IN_ICE_CAVERN,                logic->BlueFire() && (logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_DINS_FIRE)) && logic->IsAdult),
+                  LOCATION(RC_ICE_CAVERN_FREESTANDING_POH,        logic->BlueFire()),
+                  LOCATION(RC_ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM, logic->HookshotOrBoomerang()),
+                  LOCATION(RC_ICE_CAVERN_GS_HEART_PIECE_ROOM,     logic->BlueFire() && logic->HookshotOrBoomerang()),
+                  LOCATION(RC_ICE_CAVERN_GS_PUSH_BLOCK_ROOM,      logic->BlueFire() && (logic->HookshotOrBoomerang() || (ctx->GetTrickOption(RT_ICE_BLOCK_GS) && logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS)))),
   }, {});
   }
 
   /*---------------------------
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
-  if (randoCtx->GetDungeon(ICE_CAVERN)->IsMQ()) {
+  if (ctx->GetDungeon(ICE_CAVERN)->IsMQ()) {
   areaTable[RR_ICE_CAVERN_MQ_BEGINNING] = Region("Ice Cavern MQ Beginning", "Ice Cavern", RA_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FairyPot, {[]{return true;}}),
   }, {}, {
                   //Exits
                   Entrance(RR_ICE_CAVERN_ENTRYWAY,             {[]{return true;}}),
-                  Entrance(RR_ICE_CAVERN_MQ_MAP_ROOM,          {[]{return logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_DINS_FIRE) || (logic->HasExplosives && (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_STICKS) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW)));}}),
-                  Entrance(RR_ICE_CAVERN_MQ_COMPASS_ROOM,      {[]{return logic->IsAdult && logic->BlueFire;}}),
-                  Entrance(RR_ICE_CAVERN_MQ_IRON_BOOTS_REGION, {[]{return logic->BlueFire;}}),
+                  Entrance(RR_ICE_CAVERN_MQ_MAP_ROOM,          {[]{return logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_DINS_FIRE) || (logic->HasExplosives() && (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_STICKS) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW)));}}),
+                  Entrance(RR_ICE_CAVERN_MQ_COMPASS_ROOM,      {[]{return logic->IsAdult && logic->BlueFire();}}),
+                  Entrance(RR_ICE_CAVERN_MQ_IRON_BOOTS_REGION, {[]{return logic->BlueFire();}}),
   });
 
   areaTable[RR_ICE_CAVERN_MQ_MAP_ROOM] = Region("Ice Cavern MQ Map Room", "Ice Cavern", RA_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->BlueFireAccess,  {[]{return logic->BlueFireAccess || (logic->HasBottle && logic->CanJumpslash);}}),
+                  EventAccess(&logic->BlueFireAccess,  {[]{return logic->BlueFireAccess || (logic->HasBottle() && logic->CanJumpslash());}}),
   }, {
                   //Locations
-                  LOCATION(RC_ICE_CAVERN_MQ_MAP_CHEST, logic->BlueFire && (logic->CanJumpslash || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives || logic->CanUseProjectile)),
+                  LOCATION(RC_ICE_CAVERN_MQ_MAP_CHEST, logic->BlueFire() && (logic->CanJumpslash() || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives() || logic->CanUseProjectile())),
   }, {});
 
   areaTable[RR_ICE_CAVERN_MQ_IRON_BOOTS_REGION] = Region("Ice Cavern MQ Iron Boots Region", "Ice Cavern", RA_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_ICE_CAVERN_MQ_IRON_BOOTS_CHEST, logic->IsAdult && (logic->CanJumpslash || logic->CanUse(RG_MEGATON_HAMMER))),
-                  LOCATION(RC_SHEIK_IN_ICE_CAVERN,            logic->IsAdult && (logic->CanJumpslash || logic->CanUse(RG_MEGATON_HAMMER))),
-                  LOCATION(RC_ICE_CAVERN_MQ_GS_ICE_BLOCK,     logic->CanAdultAttack || logic->CanChildAttack),
-                  LOCATION(RC_ICE_CAVERN_MQ_GS_SCARECROW,     logic->CanUse(RG_SCARECROW) || (logic->HoverBoots && logic->CanUse(RG_LONGSHOT)) || (randoCtx->GetTrickOption(RT_ICE_MQ_SCARECROW) && logic->IsAdult)),
-                    //Tricks: (logic->CanUse(RG_SCARECROW) || (logic->HoverBoots && logic->CanUse(RG_LONGSHOT)) || LogicIceMQScarecrow) && logic->IsAdult
+                  LOCATION(RC_ICE_CAVERN_MQ_IRON_BOOTS_CHEST, logic->IsAdult && (logic->CanJumpslash() || logic->CanUse(RG_MEGATON_HAMMER))),
+                  LOCATION(RC_SHEIK_IN_ICE_CAVERN,            logic->IsAdult && (logic->CanJumpslash() || logic->CanUse(RG_MEGATON_HAMMER))),
+                  LOCATION(RC_ICE_CAVERN_MQ_GS_ICE_BLOCK,     logic->CanAttack()),
+                  LOCATION(RC_ICE_CAVERN_MQ_GS_SCARECROW,     logic->CanUse(RG_SCARECROW) || (logic->CanUse(RG_HOVER_BOOTS) && logic->CanUse(RG_LONGSHOT)) || (ctx->GetTrickOption(RT_ICE_MQ_SCARECROW) && logic->IsAdult)),
+                    //Tricks: (logic->CanUse(RG_SCARECROW) || (logic->CanUse(RG_HOVER_BOOTS) && logic->CanUse(RG_LONGSHOT)) || LogicIceMQScarecrow) && logic->IsAdult
   }, {});
 
   areaTable[RR_ICE_CAVERN_MQ_COMPASS_ROOM] = Region("Ice Cavern MQ Compass Room", "Ice Cavern", RA_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_ICE_CAVERN_MQ_COMPASS_CHEST,    true),
-                  LOCATION(RC_ICE_CAVERN_MQ_FREESTANDING_POH, logic->HasExplosives),
-                  LOCATION(RC_ICE_CAVERN_MQ_GS_RED_ICE,       logic->CanUse(RG_SONG_OF_TIME) || randoCtx->GetTrickOption(RT_ICE_MQ_RED_ICE_GS)),
+                  LOCATION(RC_ICE_CAVERN_MQ_FREESTANDING_POH, logic->HasExplosives()),
+                  LOCATION(RC_ICE_CAVERN_MQ_GS_RED_ICE,       logic->CanUse(RG_SONG_OF_TIME) || ctx->GetTrickOption(RT_ICE_MQ_RED_ICE_GS)),
                     //Trick: logic->CanUse(RG_SONG_OF_TIME) || LogicIceMQRedIceGS
   }, {});
   }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp
index b0d6031a9..53076bcfe 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp
@@ -10,19 +10,19 @@ void RegionTable_Init_JabuJabusBelly() {
   ---------------------------*/
   areaTable[RR_JABU_JABUS_BELLY_ENTRYWAY] = Region("Jabu Jabus Belly Entryway", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_JABU_JABUS_BELLY_BEGINNING,    {[]{return randoCtx->GetDungeon(JABU_JABUS_BELLY)->IsVanilla();}}),
-                  Entrance(RR_JABU_JABUS_BELLY_MQ_BEGINNING, {[]{return randoCtx->GetDungeon(JABU_JABUS_BELLY)->IsMQ();}}),
+                  Entrance(RR_JABU_JABUS_BELLY_BEGINNING,    {[]{return ctx->GetDungeon(JABU_JABUS_BELLY)->IsVanilla();}}),
+                  Entrance(RR_JABU_JABUS_BELLY_MQ_BEGINNING, {[]{return ctx->GetDungeon(JABU_JABUS_BELLY)->IsMQ();}}),
                   Entrance(RR_ZORAS_FOUNTAIN,                {[]{return true;}}),
   });
 
   /*--------------------------
   |     VANILLA DUNGEON      |
   ---------------------------*/
-  if (randoCtx->GetDungeon(JABU_JABUS_BELLY)->IsVanilla()) {
+  if (ctx->GetDungeon(JABU_JABUS_BELLY)->IsVanilla()) {
   areaTable[RR_JABU_JABUS_BELLY_BEGINNING] = Region("Jabu Jabus Belly Beginning", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_ENTRYWAY,    {[]{return true;}}),
-                  Entrance(RR_JABU_JABUS_BELLY_LIFT_MIDDLE, {[]{return logic->CanUseProjectile;}}),
+                  Entrance(RR_JABU_JABUS_BELLY_LIFT_MIDDLE, {[]{return logic->CanUseProjectile();}}),
   });
 
   areaTable[RR_JABU_JABUS_BELLY_LIFT_MIDDLE] = Region("Jabu Jabus Belly Lift Middle", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
@@ -30,7 +30,7 @@ void RegionTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_BEGINNING,      {[]{return true;}}),
                   Entrance(RR_JABU_JABUS_BELLY_MAIN_UPPER,     {[]{return true;}}),
                   Entrance(RR_JABU_JABUS_BELLY_LIFT_LOWER,     {[]{return true;}}),
-                  Entrance(RR_JABU_JABUS_BELLY_NEAR_BOSS_ROOM, {[]{return HasAccessTo(RR_JABU_JABUS_BELLY_LIFT_UPPER) || (randoCtx->GetTrickOption(RT_JABU_BOSS_HOVER) && logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS));}}),
+                  Entrance(RR_JABU_JABUS_BELLY_NEAR_BOSS_ROOM, {[]{return HasAccessTo(RR_JABU_JABUS_BELLY_LIFT_UPPER) || (ctx->GetTrickOption(RT_JABU_BOSS_HOVER) && logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS));}}),
   });
 
   areaTable[RR_JABU_JABUS_BELLY_MAIN_UPPER] = Region("Jabu Jabus Belly Main Upper", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
@@ -43,8 +43,8 @@ void RegionTable_Init_JabuJabusBelly() {
 
   areaTable[RR_JABU_JABUS_BELLY_MAIN_LOWER] = Region("Jabu Jabus Belly Main Lower", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER, logic->HookshotOrBoomerang),
-                  LOCATION(RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER, logic->HookshotOrBoomerang),
+                  LOCATION(RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER, logic->HookshotOrBoomerang()),
+                  LOCATION(RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER, logic->HookshotOrBoomerang()),
                 }, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_MAIN_UPPER,       {[]{return true;}}),
@@ -60,8 +60,8 @@ void RegionTable_Init_JabuJabusBelly() {
                   LOCATION(RC_JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM, true),
                 }, {
                   //Exits
-                  Entrance(RR_JABU_JABUS_BELLY_MAIN_LOWER, {[]{return logic->Swim;}}),
-                  Entrance(RR_JABU_JABUS_BELLY_LIFT_LOWER, {[]{return logic->Swim && logic->CanUseProjectile;}}),
+                  Entrance(RR_JABU_JABUS_BELLY_MAIN_LOWER, {[]{return logic->HasItem(RG_BRONZE_SCALE);}}),
+                  Entrance(RR_JABU_JABUS_BELLY_LIFT_LOWER, {[]{return logic->HasItem(RG_BRONZE_SCALE) && logic->CanUseProjectile();}}),
   });
 
   areaTable[RR_JABU_JABUS_BELLY_LOWER_SIDE_ROOM] = Region("Jabu Jabus Belly Lower Side Room", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
@@ -74,7 +74,7 @@ void RegionTable_Init_JabuJabusBelly() {
 
   areaTable[RR_JABU_JABUS_BELLY_LIFT_LOWER] = Region("Jabu Jabus Belly Lift Lower", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_JABU_JABUS_BELLY_DEKU_SCRUB, logic->Swim && (logic->IsChild || logic->CanDive || randoCtx->GetTrickOption(RT_JABU_ALCOVE_JUMP_DIVE) || logic->CanUse(RG_IRON_BOOTS)) && logic->CanStunDeku),
+                  LOCATION(RC_JABU_JABUS_BELLY_DEKU_SCRUB, logic->HasItem(RG_BRONZE_SCALE) && (logic->IsChild || logic->HasItem(RG_SILVER_SCALE) || ctx->GetTrickOption(RT_JABU_ALCOVE_JUMP_DIVE) || logic->CanUse(RG_IRON_BOOTS)) && logic->CanStunDeku()),
                 }, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_SHABOMB_CORRIDOR, {[]{return true;}}),
@@ -109,7 +109,7 @@ void RegionTable_Init_JabuJabusBelly() {
 
   areaTable[RR_JABU_JABUS_BELLY_COMPASS_ROOM] = Region("Jabu Jabus Belly Compass Room", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_JABU_JABUS_BELLY_COMPASS_CHEST, logic->CanAdultAttack || logic->CanChildAttack),
+                  LOCATION(RC_JABU_JABUS_BELLY_COMPASS_CHEST, logic->CanAttack()),
                 }, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_FORKED_CORRIDOR, {[]{return true;}}),
@@ -148,24 +148,24 @@ void RegionTable_Init_JabuJabusBelly() {
 
   areaTable[RR_JABU_JABUS_BELLY_NEAR_BOSS_ROOM] = Region("Jabu Jabus Belly Near Boss Room", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_JABU_JABUS_BELLY_GS_NEAR_BOSS, logic->CanAdultAttack || logic->CanChildAttack),
+                  LOCATION(RC_JABU_JABUS_BELLY_GS_NEAR_BOSS, logic->CanAttack()),
                 }, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_LIFT_MIDDLE, {[]{return true;}}),
-                  Entrance(RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY, {[]{return logic->CanUse(RG_BOOMERANG) || (randoCtx->GetTrickOption(RT_JABU_NEAR_BOSS_RANGED) && ((logic->IsAdult && (logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_FAIRY_BOW))) || (logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT)))) || (randoCtx->GetTrickOption(RT_JABU_NEAR_BOSS_EXPLOSIVES) && (logic->CanUse(RG_BOMBCHU_5) || (logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS) && logic->Bombs)));}}),
+                  Entrance(RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY, {[]{return logic->CanUse(RG_BOOMERANG) || (ctx->GetTrickOption(RT_JABU_NEAR_BOSS_RANGED) && ((logic->IsAdult && (logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_FAIRY_BOW))) || (logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT)))) || (ctx->GetTrickOption(RT_JABU_NEAR_BOSS_EXPLOSIVES) && (logic->CanUse(RG_BOMBCHU_5) || (logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS) && logic->CanUse(RG_BOMB_BAG))));}}),
   });
   }
 
   /*---------------------------
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
-  if (randoCtx->GetDungeon(JABU_JABUS_BELLY)->IsMQ()) {
+  if (ctx->GetDungeon(JABU_JABUS_BELLY)->IsMQ()) {
   areaTable[RR_JABU_JABUS_BELLY_MQ_BEGINNING] = Region("Jabu Jabus Belly MQ Beginning", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->NutPot, {[]{return true;}}),
   }, {
                   //Locations
-                  LOCATION(RC_JABU_JABUS_BELLY_MQ_MAP_CHEST,             logic->CanBlastOrSmash),
+                  LOCATION(RC_JABU_JABUS_BELLY_MQ_MAP_CHEST,             logic->BlastOrSmash()),
                   LOCATION(RC_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST, logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT)),
   }, {
                   //Exits
@@ -177,29 +177,29 @@ void RegionTable_Init_JabuJabusBelly() {
                   //Locations
                   LOCATION(RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST,      true),
                   LOCATION(RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST,      (logic->IsAdult && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT))) || ChildCanAccess(RR_JABU_JABUS_BELLY_MQ_BOSS_AREA)),
-                  LOCATION(RC_JABU_JABUS_BELLY_MQ_COMPASS_CHEST,                (logic->IsChild || logic->CanDive || logic->CanUse(RG_IRON_BOOTS) ||
-                                                                                                  randoCtx->GetTrickOption(RT_JABU_ALCOVE_JUMP_DIVE)) && (logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_BOMBCHU_5) || (randoCtx->GetTrickOption(RT_JABU_MQ_RANG_JUMP) && logic->CanUse(RG_BOOMERANG)))),
+                  LOCATION(RC_JABU_JABUS_BELLY_MQ_COMPASS_CHEST,                (logic->IsChild || logic->HasItem(RG_SILVER_SCALE) || logic->CanUse(RG_IRON_BOOTS) ||
+                                                                                                  ctx->GetTrickOption(RT_JABU_ALCOVE_JUMP_DIVE)) && (logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_BOMBCHU_5) || (ctx->GetTrickOption(RT_JABU_MQ_RANG_JUMP) && logic->CanUse(RG_BOOMERANG)))),
                   LOCATION(RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST,    logic->CanUse(RG_FAIRY_SLINGSHOT)),
                   LOCATION(RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST, logic->CanUse(RG_FAIRY_SLINGSHOT)),
                   LOCATION(RC_JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST,   true),
-                  LOCATION(RC_JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST,              logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_STICKS) || logic->Bombs),
-                  LOCATION(RC_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM,      logic->CanUse(RG_SONG_OF_TIME) || (randoCtx->GetTrickOption(RT_JABU_MQ_SOT_GS) && logic->IsChild && logic->CanUse(RG_BOOMERANG))),
+                  LOCATION(RC_JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST,              logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_STICKS) || logic->CanUse(RG_BOMB_BAG)),
+                  LOCATION(RC_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM,      logic->CanUse(RG_SONG_OF_TIME) || (ctx->GetTrickOption(RT_JABU_MQ_SOT_GS) && logic->IsChild && logic->CanUse(RG_BOOMERANG))),
                     //Trick: logic->CanUse(RG_SONG_OF_TIME) || (LogicJabuMQSoTGS && logic->IsChild && logic->CanUse(RG_BOOMERANG))
   }, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_MQ_BEGINNING, {[]{return true;}}),
-                  Entrance(RR_JABU_JABUS_BELLY_MQ_DEPTHS,    {[]{return logic->HasExplosives && logic->CanUse(RG_FAIRY_SLINGSHOT) && logic->CanUse(RG_BOOMERANG);}}),
+                  Entrance(RR_JABU_JABUS_BELLY_MQ_DEPTHS,    {[]{return logic->HasExplosives() && logic->CanUse(RG_FAIRY_SLINGSHOT) && logic->CanUse(RG_BOOMERANG);}}),
   });
 
   areaTable[RR_JABU_JABUS_BELLY_MQ_DEPTHS] = Region("Jabu Jabus Belly MQ Depths", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST, true),
-                  LOCATION(RC_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM,          logic->Swim && (logic->CanUse(RG_STICKS) || logic->CanUse(RG_DINS_FIRE))),
-                  LOCATION(RC_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM,    (randoCtx->GetTrickOption(RT_LENS_JABU_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) || Here(RR_JABU_JABUS_BELLY_MQ_MAIN, []{return logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS) && logic->CanUse(RG_HOOKSHOT);})),
+                  LOCATION(RC_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM,          logic->HasItem(RG_BRONZE_SCALE) && (logic->CanUse(RG_STICKS) || logic->CanUse(RG_DINS_FIRE))),
+                  LOCATION(RC_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM,    (ctx->GetTrickOption(RT_LENS_JABU_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) || Here(RR_JABU_JABUS_BELLY_MQ_MAIN, []{return logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS) && logic->CanUse(RG_HOOKSHOT);})),
   }, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_MQ_MAIN,      {[]{return true;}}),
-                  Entrance(RR_JABU_JABUS_BELLY_MQ_BOSS_AREA, {[]{return logic->CanUse(RG_STICKS) || (logic->CanUse(RG_DINS_FIRE) && logic->KokiriSword);}}),
+                  Entrance(RR_JABU_JABUS_BELLY_MQ_BOSS_AREA, {[]{return logic->CanUse(RG_STICKS) || (logic->CanUse(RG_DINS_FIRE) && logic->CanUse(RG_KOKIRI_SWORD));}}),
   });
 
   areaTable[RR_JABU_JABUS_BELLY_MQ_BOSS_AREA] = Region("Jabu Jabus Belly MQ Boss Region", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
@@ -209,7 +209,7 @@ void RegionTable_Init_JabuJabusBelly() {
                   //Locations
                   LOCATION(RC_JABU_JABUS_BELLY_MQ_COW,             logic->CanUse(RG_EPONAS_SONG)),
                   LOCATION(RC_JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST, logic->CanUse(RG_FAIRY_SLINGSHOT)),
-                  LOCATION(RC_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS,    logic->CanUse(RG_BOOMERANG) || (randoCtx->GetTrickOption(RT_JABU_NEAR_BOSS_RANGED) && logic->CanUse(RG_HOOKSHOT))),
+                  LOCATION(RC_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS,    logic->CanUse(RG_BOOMERANG) || (ctx->GetTrickOption(RT_JABU_NEAR_BOSS_RANGED) && logic->CanUse(RG_HOOKSHOT))),
   }, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_MQ_MAIN, {[]{return true;}}),
@@ -224,8 +224,8 @@ void RegionTable_Init_JabuJabusBelly() {
         Region("Jabu Jabus Belly Boss Entryway", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {},
              {
                  // Exits
-                 Entrance(RR_JABU_JABUS_BELLY_NEAR_BOSS_ROOM, { [] { return randoCtx->GetDungeon(JABU_JABUS_BELLY)->IsVanilla(); } }),
-                 Entrance(RR_JABU_JABUS_BELLY_MQ_BOSS_AREA, { [] { return randoCtx->GetDungeon(JABU_JABUS_BELLY)->IsMQ(); } }),
+                 Entrance(RR_JABU_JABUS_BELLY_NEAR_BOSS_ROOM, { [] { return ctx->GetDungeon(JABU_JABUS_BELLY)->IsVanilla(); } }),
+                 Entrance(RR_JABU_JABUS_BELLY_MQ_BOSS_AREA, { [] { return ctx->GetDungeon(JABU_JABUS_BELLY)->IsMQ(); } }),
                  Entrance(RR_JABU_JABUS_BELLY_BOSS_ROOM, { [] { return true; } }),
              });
 
@@ -234,7 +234,7 @@ void RegionTable_Init_JabuJabusBelly() {
              {
                  // Events //todo: add pot kill trick
                  EventAccess(&logic->JabuJabusBellyClear,
-                             { [] { return logic->JabuJabusBellyClear || (logic->HasBossSoul(RG_BARINADE_SOUL) && (logic->CanUse(RG_BOOMERANG) && logic->CanJumpslash)); } }),
+                             { [] { return logic->JabuJabusBellyClear || (logic->HasBossSoul(RG_BARINADE_SOUL) && (logic->CanUse(RG_BOOMERANG) && logic->CanJumpslash())); } }),
              },
              {
                  // Locations
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
index c7b57db84..bec90d866 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
@@ -8,18 +8,18 @@ void RegionTable_Init_Kakariko() {
                   //Events
                   EventAccess(&logic->CojiroAccess,            {[]{return logic->CojiroAccess || (logic->IsAdult && logic->WakeUpAdultTalon);}}),
                   EventAccess(&logic->BugRock,                 {[]{return true;}}),
-                  EventAccess(&logic->KakarikoVillageGateOpen, {[]{return logic->KakarikoVillageGateOpen || (logic->IsChild && (logic->ZeldasLetter || randoCtx->GetOption(RSK_KAK_GATE).Is(RO_KAK_GATE_OPEN)));}}),
+                  EventAccess(&logic->KakarikoVillageGateOpen, {[]{return logic->KakarikoVillageGateOpen || (logic->IsChild && (logic->HasItem(RG_ZELDAS_LETTER) || ctx->GetOption(RSK_KAK_GATE).Is(RO_KAK_GATE_OPEN)));}}),
                 }, {
                   //Locations
-                  LOCATION(RC_SHEIK_IN_KAKARIKO,               logic->IsAdult && logic->ForestMedallion && logic->FireMedallion && logic->WaterMedallion),
+                  LOCATION(RC_SHEIK_IN_KAKARIKO,               logic->IsAdult && logic->HasItem(RG_FOREST_MEDALLION) && logic->HasItem(RG_FIRE_MEDALLION) && logic->HasItem(RG_WATER_MEDALLION)),
                   LOCATION(RC_KAK_ANJU_AS_CHILD,               logic->IsChild && logic->AtDay),
                   LOCATION(RC_KAK_ANJU_AS_ADULT,               logic->IsAdult && logic->AtDay),
-                  LOCATION(RC_KAK_TRADE_POCKET_CUCCO,          logic->IsAdult && logic->AtDay && logic->PocketEgg && logic->WakeUpAdultTalon),
-                  LOCATION(RC_KAK_GS_HOUSE_UNDER_CONSTRUCTION, logic->IsChild && logic->AtNight && logic->CanGetNightTimeGS),
-                  LOCATION(RC_KAK_GS_SKULLTULA_HOUSE,          logic->IsChild && logic->AtNight && logic->CanGetNightTimeGS),
-                  LOCATION(RC_KAK_GS_GUARDS_HOUSE,             logic->IsChild && logic->AtNight && logic->CanGetNightTimeGS),
-                  LOCATION(RC_KAK_GS_TREE,                     logic->IsChild && logic->AtNight && logic->CanGetNightTimeGS),
-                  LOCATION(RC_KAK_GS_WATCHTOWER,               logic->IsChild && (logic->Slingshot || logic->CanUse(RG_BOMBCHU_5) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_LONGSHOT) || (randoCtx->GetTrickOption(RT_KAK_TOWER_GS) && logic->CanJumpslash)) && logic->AtNight && logic->CanGetNightTimeGS),
+                  LOCATION(RC_KAK_TRADE_POCKET_CUCCO,          logic->IsAdult && logic->AtDay && logic->CanUse(RG_POCKET_EGG) && logic->WakeUpAdultTalon),
+                  LOCATION(RC_KAK_GS_HOUSE_UNDER_CONSTRUCTION, logic->IsChild && logic->AtNight && logic->CanGetNightTimeGS()),
+                  LOCATION(RC_KAK_GS_SKULLTULA_HOUSE,          logic->IsChild && logic->AtNight && logic->CanGetNightTimeGS()),
+                  LOCATION(RC_KAK_GS_GUARDS_HOUSE,             logic->IsChild && logic->AtNight && logic->CanGetNightTimeGS()),
+                  LOCATION(RC_KAK_GS_TREE,                     logic->IsChild && logic->AtNight && logic->CanGetNightTimeGS()),
+                  LOCATION(RC_KAK_GS_WATCHTOWER,               logic->IsChild && (logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOMBCHU_5) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_LONGSHOT) || (ctx->GetTrickOption(RT_KAK_TOWER_GS) && logic->CanJumpslash())) && logic->AtNight && logic->CanGetNightTimeGS()),
                 }, {
                   //Exits
                   Entrance(RR_HYRULE_FIELD,                {[]{return true;}}),
@@ -29,12 +29,12 @@ void RegionTable_Init_Kakariko() {
                   Entrance(RR_KAK_WINDMILL,                {[]{return true;}}),
                   Entrance(RR_KAK_BAZAAR,                  {[]{return logic->IsAdult && logic->AtDay;}}),
                   Entrance(RR_KAK_SHOOTING_GALLERY,        {[]{return logic->IsAdult && logic->AtDay;}}),
-                  Entrance(RR_BOTTOM_OF_THE_WELL_ENTRYWAY, {[]{return logic->DrainWell && (logic->IsChild || randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).IsNot(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF));}}),
+                  Entrance(RR_BOTTOM_OF_THE_WELL_ENTRYWAY, {[]{return logic->DrainWell && (logic->IsChild || ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).IsNot(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF));}}),
                   Entrance(RR_KAK_POTION_SHOP_FRONT,       {[]{return logic->AtDay || logic->IsChild;}}),
-                  Entrance(RR_KAK_REDEAD_GROTTO,           {[]{return logic->CanOpenBombGrotto;}}),
-                  Entrance(RR_KAK_IMPAS_LEDGE,             {[]{return (logic->IsChild && logic->AtDay) || logic->CanUse(RG_HOOKSHOT) || (logic->IsAdult && randoCtx->GetTrickOption(RT_VISIBLE_COLLISION));}}),
-                  Entrance(RR_KAK_ROOFTOP,                 {[]{return logic->CanUse(RG_HOOKSHOT) || (randoCtx->GetTrickOption(RT_KAK_MAN_ON_ROOF) && (logic->IsAdult || logic->AtDay || logic->Slingshot || logic->CanUse(RG_BOMBCHU_5) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_LONGSHOT)));}}),
-                  Entrance(RR_KAK_IMPAS_ROOFTOP,           {[]{return logic->CanUse(RG_HOOKSHOT) || (randoCtx->GetTrickOption(RT_KAK_ROOFTOP_GS) && logic->CanUse(RG_HOVER_BOOTS));}}),
+                  Entrance(RR_KAK_REDEAD_GROTTO,           {[]{return logic->CanOpenBombGrotto();}}),
+                  Entrance(RR_KAK_IMPAS_LEDGE,             {[]{return (logic->IsChild && logic->AtDay) || logic->CanUse(RG_HOOKSHOT) || (logic->IsAdult && ctx->GetTrickOption(RT_VISIBLE_COLLISION));}}),
+                  Entrance(RR_KAK_ROOFTOP,                 {[]{return logic->CanUse(RG_HOOKSHOT) || (ctx->GetTrickOption(RT_KAK_MAN_ON_ROOF) && (logic->IsAdult || logic->AtDay || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOMBCHU_5) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_LONGSHOT)));}}),
+                  Entrance(RR_KAK_IMPAS_ROOFTOP,           {[]{return logic->CanUse(RG_HOOKSHOT) || (ctx->GetTrickOption(RT_KAK_ROOFTOP_GS) && logic->CanUse(RG_HOVER_BOOTS));}}),
                   Entrance(RR_THE_GRAVEYARD,               {[]{return true;}}),
                   Entrance(RR_KAK_BEHIND_GATE,             {[]{return logic->IsAdult || (logic->KakarikoVillageGateOpen);}}),
   });
@@ -47,7 +47,7 @@ void RegionTable_Init_Kakariko() {
 
   areaTable[RR_KAK_IMPAS_ROOFTOP] = Region("Kak Impas Rooftop", "Kakariko Village", RA_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_KAK_GS_ABOVE_IMPAS_HOUSE, logic->IsAdult && logic->AtNight && logic->CanGetNightTimeGS && (logic->CanJumpslash || logic->CanUseProjectile)),
+                  LOCATION(RC_KAK_GS_ABOVE_IMPAS_HOUSE, logic->IsAdult && logic->AtNight && logic->CanGetNightTimeGS() && (logic->CanJumpslash() || logic->CanUseProjectile())),
                 }, {
                   //Exits
                   Entrance(RR_KAK_IMPAS_LEDGE,  {[]{return true;}}),
@@ -72,7 +72,7 @@ void RegionTable_Init_Kakariko() {
 
   areaTable[RR_KAK_CARPENTER_BOSS_HOUSE] = Region("Kak Carpenter Boss House", "Kak Carpenter Boss House", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->WakeUpAdultTalon, {[]{return logic->WakeUpAdultTalon || (logic->IsAdult && logic->PocketEgg);}}),
+                  EventAccess(&logic->WakeUpAdultTalon, {[]{return logic->WakeUpAdultTalon || (logic->IsAdult && logic->CanUse(RG_POCKET_EGG));}}),
                 }, {}, {
                   //Exits
                   Entrance(RR_KAKARIKO_VILLAGE, {[]{return true;}}),
@@ -80,12 +80,12 @@ void RegionTable_Init_Kakariko() {
 
   areaTable[RR_KAK_HOUSE_OF_SKULLTULA] = Region("Kak House of Skulltula", "Kak House of Skulltula", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_KAK_10_GOLD_SKULLTULA_REWARD, logic->GoldSkulltulaTokens >= 10),
-                  LOCATION(RC_KAK_20_GOLD_SKULLTULA_REWARD, logic->GoldSkulltulaTokens >= 20),
-                  LOCATION(RC_KAK_30_GOLD_SKULLTULA_REWARD, logic->GoldSkulltulaTokens >= 30),
-                  LOCATION(RC_KAK_40_GOLD_SKULLTULA_REWARD, logic->GoldSkulltulaTokens >= 40),
-                  LOCATION(RC_KAK_50_GOLD_SKULLTULA_REWARD, logic->GoldSkulltulaTokens >= 50),
-                  LOCATION(RC_KAK_100_GOLD_SKULLTULA_REWARD, logic->GoldSkulltulaTokens >= 100)
+                  LOCATION(RC_KAK_10_GOLD_SKULLTULA_REWARD, logic->GetGSCount() >= 10),
+                  LOCATION(RC_KAK_20_GOLD_SKULLTULA_REWARD, logic->GetGSCount() >= 20),
+                  LOCATION(RC_KAK_30_GOLD_SKULLTULA_REWARD, logic->GetGSCount() >= 30),
+                  LOCATION(RC_KAK_40_GOLD_SKULLTULA_REWARD, logic->GetGSCount() >= 40),
+                  LOCATION(RC_KAK_50_GOLD_SKULLTULA_REWARD, logic->GetGSCount() >= 50),
+                  LOCATION(RC_KAK_100_GOLD_SKULLTULA_REWARD, logic->GetGSCount() >= 100)
                 }, {
                   //Exits
                   Entrance(RR_KAKARIKO_VILLAGE, {[]{return true;}}),
@@ -116,9 +116,9 @@ void RegionTable_Init_Kakariko() {
                   EventAccess(&logic->DrainWell, {[]{return logic->DrainWell || (logic->IsChild && logic->CanUse(RG_SONG_OF_STORMS));}}),
                 }, {
                   //Locations
-                  LOCATION(RC_KAK_WINDMILL_FREESTANDING_POH, logic->CanUse(RG_BOOMERANG) || logic->DampesWindmillAccess || (logic->IsAdult && randoCtx->GetTrickOption(RT_KAK_ADULT_WINDMILL_POH)) || (logic->IsChild && logic->CanJumpslash && randoCtx->GetTrickOption(RT_KAK_CHILD_WINDMILL_POH))),
+                  LOCATION(RC_KAK_WINDMILL_FREESTANDING_POH, logic->CanUse(RG_BOOMERANG) || logic->DampesWindmillAccess || (logic->IsAdult && ctx->GetTrickOption(RT_KAK_ADULT_WINDMILL_POH)) || (logic->IsChild && logic->CanJumpslash() && ctx->GetTrickOption(RT_KAK_CHILD_WINDMILL_POH))),
                     //PoH as child not added to trick options yet (needs uncommenting in randomizer_tricks.cpp)
-                  LOCATION(RC_SONG_FROM_WINDMILL,            logic->IsAdult && logic->Ocarina),
+                  LOCATION(RC_SONG_FROM_WINDMILL,            logic->IsAdult && logic->HasItem(RG_FAIRY_OCARINA)),
                 }, {
                   //Exits
                   Entrance(RR_KAKARIKO_VILLAGE, {[]{return true;}}),
@@ -141,7 +141,7 @@ void RegionTable_Init_Kakariko() {
 
   areaTable[RR_KAK_SHOOTING_GALLERY] = Region("Kak Shooting Gallery", "Kak Shooting Gallery", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_KAK_SHOOTING_GALLERY_REWARD, logic->ChildsWallet && logic->IsAdult && logic->Bow),
+                  LOCATION(RC_KAK_SHOOTING_GALLERY_REWARD, logic->HasItem(RG_CHILD_WALLET) && logic->IsAdult && logic->CanUse(RG_FAIRY_BOW)),
                 }, {
                   //Exits
                   Entrance(RR_KAKARIKO_VILLAGE, {[]{return true;}}),
@@ -174,12 +174,12 @@ void RegionTable_Init_Kakariko() {
           
                // Events
                EventAccess(&logic->OddPoulticeAccess, { [] {
-                   return logic->OddPoulticeAccess || (logic->IsAdult && (logic->OddMushroomAccess || (logic->OddMushroom && logic->DisableTradeRevert)));
+                   return logic->OddPoulticeAccess || (logic->IsAdult && (logic->OddMushroomAccess || (logic->CanUse(RG_ODD_MUSHROOM) && logic->DisableTradeRevert)));
                } }),
            },
            {
-               LOCATION(RC_KAK_TRADE_ODD_MUSHROOM, logic->IsAdult && logic->OddMushroom),
-               LOCATION(RC_KAK_GRANNYS_SHOP, logic->IsAdult && logic->OddMushroom && logic->AdultsWallet),
+               LOCATION(RC_KAK_TRADE_ODD_MUSHROOM, logic->IsAdult && logic->CanUse(RG_ODD_MUSHROOM)),
+               LOCATION(RC_KAK_GRANNYS_SHOP, logic->IsAdult && logic->CanUse(RG_ODD_MUSHROOM) && logic->HasItem(RG_ADULT_WALLET)),
            },
            {
                // Exits
@@ -197,10 +197,10 @@ void RegionTable_Init_Kakariko() {
   areaTable[RR_KAK_OPEN_GROTTO] = Region("Kak Open Grotto", "Kak Open Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LOCATION(RC_KAK_OPEN_GROTTO_CHEST,         true),
-                  LOCATION(RC_KAK_OPEN_GROTTO_FISH,          logic->HasBottle),
+                  LOCATION(RC_KAK_OPEN_GROTTO_FISH,          logic->HasBottle()),
                   LOCATION(RC_KAK_OPEN_GROTTO_GOSSIP_STONE,  true),
-                  LOCATION(RC_KAK_OPEN_GROTTO_BEEHIVE_LEFT,  logic->CanBreakLowerBeehives),
-                  LOCATION(RC_KAK_OPEN_GROTTO_BEEHIVE_RIGHT, logic->CanBreakLowerBeehives),
+                  LOCATION(RC_KAK_OPEN_GROTTO_BEEHIVE_LEFT,  logic->CanBreakLowerBeehives()),
+                  LOCATION(RC_KAK_OPEN_GROTTO_BEEHIVE_RIGHT, logic->CanBreakLowerBeehives()),
                 }, {
                   //Exits
                   Entrance(RR_KAK_BACKYARD, {[]{return true;}}),
@@ -213,17 +213,17 @@ void RegionTable_Init_Kakariko() {
                   EventAccess(&logic->BugRock,        {[]{return true;}}),
                 }, {
                   //Locations
-                  LOCATION(RC_GRAVEYARD_FREESTANDING_POH,        (logic->IsAdult && CanPlantBean(RR_THE_GRAVEYARD)) || logic->CanUse(RG_LONGSHOT) || (randoCtx->GetTrickOption(RT_GY_POH) && logic->CanUse(RG_BOOMERANG))),
-                  LOCATION(RC_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR, logic->ChildsWallet && logic->IsChild && logic->AtNight), //TODO: This needs to change
-                  LOCATION(RC_GRAVEYARD_GS_WALL,                 logic->IsChild && logic->HookshotOrBoomerang && logic->AtNight && logic->CanGetNightTimeGS),
-                  LOCATION(RC_GRAVEYARD_GS_BEAN_PATCH,           logic->CanPlantBugs && logic->CanChildAttack),
+                  LOCATION(RC_GRAVEYARD_FREESTANDING_POH,        (logic->IsAdult && CanPlantBean(RR_THE_GRAVEYARD)) || logic->CanUse(RG_LONGSHOT) || (ctx->GetTrickOption(RT_GY_POH) && logic->CanUse(RG_BOOMERANG))),
+                  LOCATION(RC_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR, logic->HasItem(RG_CHILD_WALLET) && logic->IsChild && logic->AtNight), //TODO: This needs to change
+                  LOCATION(RC_GRAVEYARD_GS_WALL,                 logic->IsChild && logic->HookshotOrBoomerang() && logic->AtNight && logic->CanGetNightTimeGS()),
+                  LOCATION(RC_GRAVEYARD_GS_BEAN_PATCH,           logic->CanSpawnSoilSkull() && logic->CanAttack()),
                 }, {
                   //Exits
                   Entrance(RR_GRAVEYARD_SHIELD_GRAVE,       {[]{return logic->IsAdult || logic->AtNight;}}),
                   Entrance(RR_GRAVEYARD_COMPOSERS_GRAVE,    {[]{return logic->CanUse(RG_ZELDAS_LULLABY);}}),
                   Entrance(RR_GRAVEYARD_HEART_PIECE_GRAVE,  {[]{return logic->IsAdult || logic->AtNight;}}),
                   Entrance(RR_GRAVEYARD_DAMPES_GRAVE,       {[]{return logic->IsAdult;}}),
-                  Entrance(RR_GRAVEYARD_DAMPES_HOUSE,       {[]{return logic->IsAdult || logic->AtDampeTime;}}), //TODO: This needs to be handled
+                  Entrance(RR_GRAVEYARD_DAMPES_HOUSE,       {[]{return logic->IsAdult /*|| logic->AtDampeTime*/;}}), //TODO: This needs to be handled in ToD rework
                   Entrance(RR_KAKARIKO_VILLAGE,             {[]{return true;}}),
                   Entrance(RR_GRAVEYARD_WARP_PAD_REGION,    {[]{return false;}}),
   });
@@ -247,8 +247,8 @@ void RegionTable_Init_Kakariko() {
 
   areaTable[RR_GRAVEYARD_COMPOSERS_GRAVE] = Region("Graveyard Composers Grave", "Graveyard Composers Grave", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST, logic->HasFireSource),
-                  LOCATION(RC_SONG_FROM_ROYAL_FAMILYS_TOMB,       logic->CanUseProjectile || logic->CanJumpslash || logic->CanUse(RG_MEGATON_HAMMER)),
+                  LOCATION(RC_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST, logic->HasFireSource()),
+                  LOCATION(RC_SONG_FROM_ROYAL_FAMILYS_TOMB,       logic->CanUseProjectile() || logic->CanJumpslash() || logic->CanUse(RG_MEGATON_HAMMER)),
                 }, {
                   //Exits
                   Entrance(RR_THE_GRAVEYARD, {[]{return true;}}),
@@ -261,7 +261,7 @@ void RegionTable_Init_Kakariko() {
                 }, {
                   //Locations
                   LOCATION(RC_GRAVEYARD_HOOKSHOT_CHEST,              true),
-                  LOCATION(RC_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH, logic->IsAdult || randoCtx->GetTrickOption(RT_GY_CHILD_DAMPE_RACE_POH)),
+                  LOCATION(RC_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH, logic->IsAdult || ctx->GetTrickOption(RT_GY_CHILD_DAMPE_RACE_POH)),
                 }, {
                   //Exits
                   Entrance(RR_THE_GRAVEYARD, {[]{return true;}}),
@@ -278,19 +278,19 @@ void RegionTable_Init_Kakariko() {
 
   areaTable[RR_GRAVEYARD_WARP_PAD_REGION] = Region("Graveyard Warp Pad Region", "Graveyard", RA_THE_GRAVEYARD, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CanSummonGossipFairyWithoutSuns;}}),
+                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CallGossipFairyExceptSuns();}}),
                 }, {
                   //Locations
                   LOCATION(RC_GRAVEYARD_GOSSIP_STONE, true),
                 }, {
                   //Exits
                   Entrance(RR_THE_GRAVEYARD,             {[]{return true;}}),
-                  Entrance(RR_SHADOW_TEMPLE_ENTRYWAY,    {[]{return logic->CanUse(RG_DINS_FIRE) || (randoCtx->GetTrickOption(RT_GY_SHADOW_FIRE_ARROWS) && logic->IsAdult && logic->CanUse(RG_FIRE_ARROWS));}}),
+                  Entrance(RR_SHADOW_TEMPLE_ENTRYWAY,    {[]{return logic->CanUse(RG_DINS_FIRE) || (ctx->GetTrickOption(RT_GY_SHADOW_FIRE_ARROWS) && logic->IsAdult && logic->CanUse(RG_FIRE_ARROWS));}}),
   });
 
   areaTable[RR_KAK_BEHIND_GATE] = Region("Kak Behind Gate", "Kakariko Village", RA_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_KAKARIKO_VILLAGE,     {[]{return logic->IsAdult || randoCtx->GetTrickOption(RT_VISIBLE_COLLISION) || logic->KakarikoVillageGateOpen || randoCtx->GetOption(RSK_KAK_GATE).Is(RO_KAK_GATE_OPEN);}}),
+                  Entrance(RR_KAKARIKO_VILLAGE,     {[]{return logic->IsAdult || ctx->GetTrickOption(RT_VISIBLE_COLLISION) || logic->KakarikoVillageGateOpen || ctx->GetOption(RSK_KAK_GATE).Is(RO_KAK_GATE_OPEN);}}),
                   Entrance(RR_DEATH_MOUNTAIN_TRAIL, {[]{return true;}}),
   });
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
index f4875de97..72aebe634 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
@@ -7,14 +7,14 @@ void RegionTable_Init_LostWoods() {
   areaTable[RR_KOKIRI_FOREST] = Region("Kokiri Forest", "Kokiri Forest", RA_KOKIRI_FOREST, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->BeanPlantFairy,           {[]{return logic->BeanPlantFairy   || (CanPlantBean(RR_KOKIRI_FOREST) && logic->CanUse(RG_SONG_OF_STORMS));}}),
-                  EventAccess(&logic->GossipStoneFairy,         {[]{return logic->GossipStoneFairy || logic->CanSummonGossipFairyWithoutSuns;}}),
-                  EventAccess(&logic->ShowedMidoSwordAndShield, {[]{return logic->ShowedMidoSwordAndShield || (logic->IsChild && logic->KokiriSword && logic->DekuShield);}}),
+                  EventAccess(&logic->GossipStoneFairy,         {[]{return logic->GossipStoneFairy || logic->CallGossipFairyExceptSuns();}}),
+                  EventAccess(&logic->ShowedMidoSwordAndShield, {[]{return logic->ShowedMidoSwordAndShield || (logic->IsChild && logic->CanUse(RG_KOKIRI_SWORD) && logic->CanUse(RG_DEKU_SHIELD));}}),
                 }, {
                   //Locations
                   LOCATION(RC_KF_KOKIRI_SWORD_CHEST,   logic->IsChild),
-                  LOCATION(RC_KF_GS_KNOW_IT_ALL_HOUSE, logic->IsChild && logic->CanChildAttack && logic->AtNight && (/*TODO: HasNightStart ||*/ logic->CanLeaveForest || logic->CanUse(RG_SUNS_SONG)) && logic->CanGetNightTimeGS),
-                  LOCATION(RC_KF_GS_BEAN_PATCH,        logic->CanPlantBugs && logic->CanChildAttack),
-                  LOCATION(RC_KF_GS_HOUSE_OF_TWINS,    logic->IsAdult && logic->AtNight && (logic->HookshotOrBoomerang || (randoCtx->GetTrickOption(RT_KF_ADULT_GS) && logic->CanUse(RG_HOVER_BOOTS))) && logic->CanGetNightTimeGS),
+                  LOCATION(RC_KF_GS_KNOW_IT_ALL_HOUSE, logic->IsChild && logic->CanAttack() && logic->AtNight && (/*TODO: HasNightStart ||*/ logic->CanLeaveForest() || logic->CanUse(RG_SUNS_SONG)) && logic->CanGetNightTimeGS()),
+                  LOCATION(RC_KF_GS_BEAN_PATCH,        logic->CanSpawnSoilSkull() && logic->CanAttack()),
+                  LOCATION(RC_KF_GS_HOUSE_OF_TWINS,    logic->IsAdult && logic->AtNight && (logic->HookshotOrBoomerang() || (ctx->GetTrickOption(RT_KF_ADULT_GS) && logic->CanUse(RG_HOVER_BOOTS))) && logic->CanGetNightTimeGS()),
                   LOCATION(RC_KF_GOSSIP_STONE,         true),
                 }, {
                   //Exits
@@ -24,25 +24,25 @@ void RegionTable_Init_LostWoods() {
                   Entrance(RR_KF_HOUSE_OF_TWINS,     {[]{return true;}}),
                   Entrance(RR_KF_KNOW_IT_ALL_HOUSE,  {[]{return true;}}),
                   Entrance(RR_KF_KOKIRI_SHOP,        {[]{return true;}}),
-                  Entrance(RR_KF_OUTSIDE_DEKU_TREE,  {[]{return (logic->IsAdult && (logic->CanPassEnemy("Big Skulltula") || logic->ForestTempleClear)) || randoCtx->GetOption(RSK_FOREST).Is(RO_FOREST_OPEN) || logic->ShowedMidoSwordAndShield;}}),
+                  Entrance(RR_KF_OUTSIDE_DEKU_TREE,  {[]{return (logic->IsAdult && (logic->CanPassEnemy("Big Skulltula") || logic->ForestTempleClear)) || ctx->GetOption(RSK_FOREST).Is(RO_FOREST_OPEN) || logic->ShowedMidoSwordAndShield;}}),
                   Entrance(RR_THE_LOST_WOODS,        {[]{return true;}}),
-                  Entrance(RR_LW_BRIDGE_FROM_FOREST, {[]{return logic->IsAdult || randoCtx->GetOption(RSK_FOREST).IsNot(RO_FOREST_CLOSED) || logic->DekuTreeClear;}}),
-                  Entrance(RR_KF_STORMS_GROTTO,      {[]{return logic->CanOpenStormGrotto;}}),
+                  Entrance(RR_LW_BRIDGE_FROM_FOREST, {[]{return logic->IsAdult || ctx->GetOption(RSK_FOREST).IsNot(RO_FOREST_CLOSED) || logic->DekuTreeClear;}}),
+                  Entrance(RR_KF_STORMS_GROTTO,      {[]{return logic->CanOpenStormsGrotto();}}),
   });
 
   areaTable[RR_KF_OUTSIDE_DEKU_TREE] = Region("KF Outside Deku Tree", "Kokiri Forest", RA_KOKIRI_FOREST, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->DekuBabaSticks,           {[]{return logic->DekuBabaSticks || ((logic->IsAdult && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_KOKIRI_SWORD)) && !randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES)) || (logic->IsChild && (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BOOMERANG))));}}),
-                  EventAccess(&logic->DekuBabaNuts,             {[]{return logic->DekuBabaNuts   || ((logic->IsAdult && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_KOKIRI_SWORD)) && !randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES)) || (logic->IsChild && (logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->HasExplosives || logic->CanUse(RG_DINS_FIRE))));}}),
-                  EventAccess(&logic->ShowedMidoSwordAndShield, {[]{return logic->ShowedMidoSwordAndShield || (logic->IsChild && logic->KokiriSword && logic->DekuShield);}}),
+                  EventAccess(&logic->DekuBabaSticks,           {[]{return logic->DekuBabaSticks || ((logic->IsAdult && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_KOKIRI_SWORD)) && !ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES)) || (logic->IsChild && (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BOOMERANG))));}}),
+                  EventAccess(&logic->DekuBabaNuts,             {[]{return logic->DekuBabaNuts   || ((logic->IsAdult && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_KOKIRI_SWORD)) && !ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES)) || (logic->IsChild && (logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->HasExplosives() || logic->CanUse(RG_DINS_FIRE))));}}),
+                  EventAccess(&logic->ShowedMidoSwordAndShield, {[]{return logic->ShowedMidoSwordAndShield || (logic->IsChild && logic->CanUse(RG_KOKIRI_SWORD) && logic->CanUse(RG_DEKU_SHIELD));}}),
                 }, {
                   //Locations
                   LOCATION(RC_KF_DEKU_TREE_LEFT_GOSSIP_STONE,  true),
                   LOCATION(RC_KF_DEKU_TREE_RIGHT_GOSSIP_STONE, true),
                 }, {
                   //Exits
-                  Entrance(RR_DEKU_TREE_ENTRYWAY, {[]{return logic->IsChild || (randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).IsNot(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF) && (randoCtx->GetOption(RSK_FOREST).Is(RO_FOREST_OPEN) || logic->ShowedMidoSwordAndShield));}}),
-                  Entrance(RR_KOKIRI_FOREST,      {[]{return (logic->IsAdult && (logic->CanPassEnemy("Big Skulltula") || logic->ForestTempleClear)) || randoCtx->GetOption(RSK_FOREST).Is(RO_FOREST_OPEN) || logic->ShowedMidoSwordAndShield;}}),
+                  Entrance(RR_DEKU_TREE_ENTRYWAY, {[]{return logic->IsChild || (ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).IsNot(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF) && (ctx->GetOption(RSK_FOREST).Is(RO_FOREST_OPEN) || logic->ShowedMidoSwordAndShield));}}),
+                  Entrance(RR_KOKIRI_FOREST,      {[]{return (logic->IsAdult && (logic->CanPassEnemy("Big Skulltula") || logic->ForestTempleClear)) || ctx->GetOption(RSK_FOREST).Is(RO_FOREST_OPEN) || logic->ShowedMidoSwordAndShield;}}),
   });
 
   areaTable[RR_KF_LINKS_HOUSE] = Region("KF Link's House", "KF Link's House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -97,10 +97,10 @@ void RegionTable_Init_LostWoods() {
   areaTable[RR_KF_STORMS_GROTTO] = Region("KF Storms Grotto", "KF Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LOCATION(RC_KF_STORMS_GROTTO_CHEST,         true),
-                  LOCATION(RC_KF_STORMS_GROTTO_FISH,          logic->HasBottle),
+                  LOCATION(RC_KF_STORMS_GROTTO_FISH,          logic->HasBottle()),
                   LOCATION(RC_KF_STORMS_GROTTO_GOSSIP_STONE,  true),
-                  LOCATION(RC_KF_STORMS_GROTTO_BEEHIVE_LEFT,  logic->CanBreakLowerBeehives),
-                  LOCATION(RC_KF_STORMS_GROTTO_BEEHIVE_RIGHT, logic->CanBreakLowerBeehives),
+                  LOCATION(RC_KF_STORMS_GROTTO_BEEHIVE_LEFT,  logic->CanBreakLowerBeehives()),
+                  LOCATION(RC_KF_STORMS_GROTTO_BEEHIVE_RIGHT, logic->CanBreakLowerBeehives()),
                 }, {
                   //Exits
                   Entrance(RR_KOKIRI_FOREST, {[]{return true;}})
@@ -113,16 +113,16 @@ void RegionTable_Init_LostWoods() {
 
   areaTable[RR_THE_LOST_WOODS] = Region("Lost Woods", "Lost Woods", RA_THE_LOST_WOODS, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->OddMushroomAccess, {[]{return logic->OddMushroomAccess || (logic->IsAdult && (logic->CojiroAccess || logic->Cojiro));}}),
+                  EventAccess(&logic->OddMushroomAccess, {[]{return logic->OddMushroomAccess || (logic->IsAdult && (logic->CojiroAccess || logic->CanUse(RG_COJIRO)));}}),
                   EventAccess(&logic->PoachersSawAccess, {[]{return logic->PoachersSawAccess || (logic->IsAdult && logic->OddPoulticeAccess);}}),
-                  EventAccess(&logic->GossipStoneFairy,  {[]{return logic->GossipStoneFairy  || logic->CanSummonGossipFairyWithoutSuns;}}),
+                  EventAccess(&logic->GossipStoneFairy,  {[]{return logic->GossipStoneFairy  || logic->CallGossipFairyExceptSuns();}}),
                   EventAccess(&logic->BeanPlantFairy,    {[]{return logic->BeanPlantFairy    || logic->CanUse(RG_SONG_OF_STORMS);}}),
-                  EventAccess(&logic->BugShrub,          {[]{return logic->IsChild && logic->CanCutShrubs;}}),
+                  EventAccess(&logic->BugShrub,          {[]{return logic->IsChild && logic->CanCutShrubs();}}),
                 }, {
                   //Locations
                   LOCATION(RC_LW_SKULL_KID,                 logic->IsChild && logic->CanUse(RG_SARIAS_SONG)),
-                  LOCATION(RC_LW_TRADE_COJIRO,              logic->IsAdult && logic->Cojiro),
-                  LOCATION(RC_LW_TRADE_ODD_POTION,        logic->IsAdult && logic->OddPoultice && logic->Cojiro),
+                  LOCATION(RC_LW_TRADE_COJIRO,              logic->IsAdult && logic->CanUse(RG_COJIRO)),
+                  LOCATION(RC_LW_TRADE_ODD_POTION,          logic->IsAdult && logic->CanUse(RG_ODD_POTION) && logic->CanUse(RG_COJIRO)),
                                                                                                 //all 5 buttons are logically required for memory game
                                                                                                 //because the chances of being able to beat it
                                                                                                 //every time you attempt it are as follows:
@@ -131,19 +131,19 @@ void RegionTable_Init_LostWoods() {
                                                                                                 //3 buttons        => 3.75%
                                                                                                 //4 buttons        => 25.3125%
                                                                                                 //5 buttons        => 100%
-                  LOCATION(RC_LW_OCARINA_MEMORY_GAME,       logic->IsChild && logic->Ocarina && logic->OcarinaButtons >= 5),
+                  LOCATION(RC_LW_OCARINA_MEMORY_GAME,       logic->IsChild && logic->HasItem(RG_FAIRY_OCARINA) && logic->OcarinaButtons() >= 5),
                   LOCATION(RC_LW_TARGET_IN_WOODS,           logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT)),
-                  LOCATION(RC_LW_DEKU_SCRUB_NEAR_BRIDGE,    logic->IsChild && logic->CanStunDeku),
-                  LOCATION(RC_LW_GS_BEAN_PATCH_NEAR_BRIDGE, logic->CanPlantBugs && logic->CanChildAttack),
+                  LOCATION(RC_LW_DEKU_SCRUB_NEAR_BRIDGE,    logic->IsChild && logic->CanStunDeku()),
+                  LOCATION(RC_LW_GS_BEAN_PATCH_NEAR_BRIDGE, logic->CanSpawnSoilSkull() && logic->CanAttack()),
                   LOCATION(RC_LW_GOSSIP_STONE,              true),
                 }, {
                   //Exits
                   Entrance(RR_LW_FOREST_EXIT,           {[]{return true;}}),
                   Entrance(RR_GC_WOODS_WARP,            {[]{return true;}}),
-                  Entrance(RR_LW_BRIDGE,                {[]{return logic->CanLeaveForest && ((logic->IsAdult && (CanPlantBean(RR_THE_LOST_WOODS) || randoCtx->GetTrickOption(RT_LW_BRIDGE))) || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_LONGSHOT));}}),
-                  Entrance(RR_ZORAS_RIVER,              {[]{return logic->CanLeaveForest && (logic->CanDive || logic->CanUse(RG_IRON_BOOTS));}}),
-                  Entrance(RR_LW_BEYOND_MIDO,           {[]{return logic->IsChild || logic->CanUse(RG_SARIAS_SONG) || randoCtx->GetTrickOption(RT_LW_MIDO_BACKFLIP);}}),
-                  Entrance(RR_LW_NEAR_SHORTCUTS_GROTTO, {[]{return Here(RR_THE_LOST_WOODS, []{return logic->CanBlastOrSmash;});}}),
+                  Entrance(RR_LW_BRIDGE,                {[]{return logic->CanLeaveForest() && ((logic->IsAdult && (CanPlantBean(RR_THE_LOST_WOODS) || ctx->GetTrickOption(RT_LW_BRIDGE))) || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_LONGSHOT));}}),
+                  Entrance(RR_ZORAS_RIVER,              {[]{return logic->CanLeaveForest() && (logic->HasItem(RG_SILVER_SCALE) || logic->CanUse(RG_IRON_BOOTS));}}),
+                  Entrance(RR_LW_BEYOND_MIDO,           {[]{return logic->IsChild || logic->CanUse(RG_SARIAS_SONG) || ctx->GetTrickOption(RT_LW_MIDO_BACKFLIP);}}),
+                  Entrance(RR_LW_NEAR_SHORTCUTS_GROTTO, {[]{return Here(RR_THE_LOST_WOODS, []{return logic->BlastOrSmash();});}}),
   });
 
   areaTable[RR_LW_BEYOND_MIDO] = Region("LW Beyond Mido", "Lost Woods", RA_THE_LOST_WOODS, NO_DAY_NIGHT_CYCLE, {
@@ -151,26 +151,26 @@ void RegionTable_Init_LostWoods() {
                   EventAccess(&logic->ButterflyFairy, {[]{return logic->ButterflyFairy || logic->CanUse(RG_STICKS);}}),
                 }, {
                   //Locations
-                  LOCATION(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT, logic->IsChild && logic->CanStunDeku),
-                  LOCATION(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT,  logic->IsChild && logic->CanStunDeku),
-                  LOCATION(RC_LW_GS_ABOVE_THEATER,                   logic->IsAdult && logic->AtNight && ((CanPlantBean(RR_LW_BEYOND_MIDO) && logic->CanAdultAttack) || (randoCtx->GetTrickOption(RT_LW_GS_BEAN) && logic->CanUse(RG_HOOKSHOT) && (logic->CanUse(RG_LONGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOMBCHU_5) || logic->CanUse(RG_DINS_FIRE)))) && logic->CanGetNightTimeGS),
-                  LOCATION(RC_LW_GS_BEAN_PATCH_NEAR_THEATER,         logic->CanPlantBugs && (logic->CanChildAttack || (randoCtx->GetOption(RSK_SHUFFLE_SCRUBS).Is(RO_SCRUBS_OFF) && logic->DekuShield))),
+                  LOCATION(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT, logic->IsChild && logic->CanStunDeku()),
+                  LOCATION(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT,  logic->IsChild && logic->CanStunDeku()),
+                  LOCATION(RC_LW_GS_ABOVE_THEATER,                   logic->IsAdult && logic->AtNight && ((CanPlantBean(RR_LW_BEYOND_MIDO) && logic->CanAttack()) || (ctx->GetTrickOption(RT_LW_GS_BEAN) && logic->CanUse(RG_HOOKSHOT) && (logic->CanUse(RG_LONGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOMBCHU_5) || logic->CanUse(RG_DINS_FIRE)))) && logic->CanGetNightTimeGS()),
+                  LOCATION(RC_LW_GS_BEAN_PATCH_NEAR_THEATER,         logic->CanSpawnSoilSkull() && (logic->CanAttack() || (ctx->GetOption(RSK_SHUFFLE_SCRUBS).Is(RO_SCRUBS_OFF) && logic->CanReflectNuts()))),
                 }, {
                   //Exits
                   Entrance(RR_LW_FOREST_EXIT,   {[]{return true;}}),
                   Entrance(RR_THE_LOST_WOODS,   {[]{return logic->IsChild || logic->CanUse(RG_SARIAS_SONG);}}),
                   Entrance(RR_SFM_ENTRYWAY,     {[]{return true;}}),
                   Entrance(RR_DEKU_THEATER,     {[]{return true;}}),
-                  Entrance(RR_LW_SCRUBS_GROTTO, {[]{return Here(RR_LW_BEYOND_MIDO, []{return logic->CanBlastOrSmash;});}}),
+                  Entrance(RR_LW_SCRUBS_GROTTO, {[]{return Here(RR_LW_BEYOND_MIDO, []{return logic->BlastOrSmash();});}}),
   });
 
   areaTable[RR_LW_NEAR_SHORTCUTS_GROTTO] = Region("LW Near Shortcuts Grotto", "LW Near Shortcuts Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LOCATION(RC_LW_NEAR_SHORTCUTS_GROTTO_CHEST,         true),
-                  LOCATION(RC_LW_NEAR_SHORTCUTS_GROTTO_FISH,          logic->HasBottle),
+                  LOCATION(RC_LW_NEAR_SHORTCUTS_GROTTO_FISH,          logic->HasBottle()),
                   LOCATION(RC_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE,  true),
-                  LOCATION(RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_LEFT,  logic->CanBreakLowerBeehives),
-                  LOCATION(RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_RIGHT, logic->CanBreakLowerBeehives),
+                  LOCATION(RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_LEFT,  logic->CanBreakLowerBeehives()),
+                  LOCATION(RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_RIGHT, logic->CanBreakLowerBeehives()),
                 }, {
                   //Exits
                   Entrance(RR_THE_LOST_WOODS, {[]{return true;}}),
@@ -187,9 +187,9 @@ void RegionTable_Init_LostWoods() {
 
   areaTable[RR_LW_SCRUBS_GROTTO] = Region("LW Scrubs Grotto", "LW Scrubs Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_LW_DEKU_SCRUB_GROTTO_REAR,    logic->CanStunDeku),
-                  LOCATION(RC_LW_DEKU_SCRUB_GROTTO_FRONT,   logic->CanStunDeku),
-                  LOCATION(RC_LW_DEKU_SCRUB_GROTTO_BEEHIVE, logic->CanBreakUpperBeehives),
+                  LOCATION(RC_LW_DEKU_SCRUB_GROTTO_REAR,    logic->CanStunDeku()),
+                  LOCATION(RC_LW_DEKU_SCRUB_GROTTO_FRONT,   logic->CanStunDeku()),
+                  LOCATION(RC_LW_DEKU_SCRUB_GROTTO_BEEHIVE, logic->CanBreakUpperBeehives()),
                 }, {
                   //Exits
                   Entrance(RR_LW_BEYOND_MIDO, {[]{return true;}}),
@@ -198,18 +198,18 @@ void RegionTable_Init_LostWoods() {
   areaTable[RR_SFM_ENTRYWAY] = Region("SFM Entryway", "Sacred Forest Meadow", RA_SACRED_FOREST_MEADOW, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_LW_BEYOND_MIDO,       {[]{return true;}}),
-                  Entrance(RR_SACRED_FOREST_MEADOW, {[]{return logic->CanJumpslash || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_DINS_FIRE) || logic->CanUse(RG_MEGATON_HAMMER);}}),
-                  Entrance(RR_SFM_WOLFOS_GROTTO,    {[]{return logic->CanOpenBombGrotto;}}),
+                  Entrance(RR_SACRED_FOREST_MEADOW, {[]{return logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_DINS_FIRE) || logic->CanUse(RG_MEGATON_HAMMER);}}),
+                  Entrance(RR_SFM_WOLFOS_GROTTO,    {[]{return logic->CanOpenBombGrotto();}}),
   });
 
   areaTable[RR_SACRED_FOREST_MEADOW] = Region("Sacred Forest Meadow", "Sacred Forest Meadow", RA_SACRED_FOREST_MEADOW, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CanSummonGossipFairyWithoutSuns;}}),
+                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CallGossipFairyExceptSuns();}}),
                 }, {
                   //Locations
-                  LOCATION(RC_SONG_FROM_SARIA,             logic->IsChild && logic->ZeldasLetter),
+                  LOCATION(RC_SONG_FROM_SARIA,             logic->IsChild && logic->HasItem(RG_ZELDAS_LETTER)),
                   LOCATION(RC_SHEIK_IN_FOREST,             logic->IsAdult),
-                  LOCATION(RC_SFM_GS,                      logic->IsAdult && logic->HookshotOrBoomerang && logic->AtNight && logic->CanGetNightTimeGS),
+                  LOCATION(RC_SFM_GS,                      logic->IsAdult && logic->HookshotOrBoomerang() && logic->AtNight && logic->CanGetNightTimeGS()),
                   LOCATION(RC_SFM_MAZE_LOWER_GOSSIP_STONE, true),
                   LOCATION(RC_SFM_MAZE_UPPER_GOSSIP_STONE, true),
                   LOCATION(RC_SFM_SARIA_GOSSIP_STONE,      true),
@@ -218,7 +218,7 @@ void RegionTable_Init_LostWoods() {
                   Entrance(RR_SFM_ENTRYWAY,           {[]{return true;}}),
                   Entrance(RR_FOREST_TEMPLE_ENTRYWAY, {[]{return logic->CanUse(RG_HOOKSHOT);}}),
                   Entrance(RR_SFM_FAIRY_GROTTO,       {[]{return true;}}),
-                  Entrance(RR_SFM_STORMS_GROTTO,      {[]{return logic->CanOpenStormGrotto;}}),
+                  Entrance(RR_SFM_STORMS_GROTTO,      {[]{return logic->CanOpenStormsGrotto();}}),
   });
 
   areaTable[RR_SFM_FAIRY_GROTTO] = Region("SFM Fairy Grotto", "SFM Fairy Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {
@@ -231,7 +231,7 @@ void RegionTable_Init_LostWoods() {
 
   areaTable[RR_SFM_WOLFOS_GROTTO] = Region("SFM Wolfos Grotto", "SFM Wolfos Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_SFM_WOLFOS_GROTTO_CHEST, logic->IsAdult || logic->Slingshot || logic->CanUse(RG_STICKS) || logic->KokiriSword || logic->CanUse(RG_DINS_FIRE) || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)), //RANDOTODO is this meant to auto-pass as adult?
+                  LOCATION(RC_SFM_WOLFOS_GROTTO_CHEST, logic->IsAdult || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_STICKS) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_DINS_FIRE) || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)), //RANDOTODO is this meant to auto-pass as adult?
                 }, {
                   //Exits
                   Entrance(RR_SFM_ENTRYWAY, {[]{return true;}}),
@@ -239,9 +239,9 @@ void RegionTable_Init_LostWoods() {
 
   areaTable[RR_SFM_STORMS_GROTTO] = Region("SFM Storms Grotto", "SFM Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_SFM_DEKU_SCRUB_GROTTO_REAR,  logic->CanStunDeku),
-                  LOCATION(RC_SFM_DEKU_SCRUB_GROTTO_FRONT, logic->CanStunDeku),
-                  LOCATION(RC_SFM_STORMS_GROTTO_BEEHIVE,   logic->CanBreakUpperBeehives),
+                  LOCATION(RC_SFM_DEKU_SCRUB_GROTTO_REAR,  logic->CanStunDeku()),
+                  LOCATION(RC_SFM_DEKU_SCRUB_GROTTO_FRONT, logic->CanStunDeku()),
+                  LOCATION(RC_SFM_STORMS_GROTTO_BEEHIVE,   logic->CanBreakUpperBeehives()),
                 }, {
                   //Exits
                   Entrance(RR_SACRED_FOREST_MEADOW, {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp
index 82c5e1e4b..4f2435aec 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp
@@ -10,21 +10,21 @@ void RegionTable_Init_ShadowTemple() {
   ---------------------------*/
   areaTable[RR_SHADOW_TEMPLE_ENTRYWAY] = Region("Shadow Temple Entryway", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_SHADOW_TEMPLE_BEGINNING,    {[]{return randoCtx->GetDungeon(SHADOW_TEMPLE)->IsVanilla() && (randoCtx->GetTrickOption(RT_LENS_SHADOW) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT));}}),
-                  Entrance(RR_SHADOW_TEMPLE_MQ_BEGINNING, {[]{return randoCtx->GetDungeon(SHADOW_TEMPLE)->IsMQ()    && (randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT));}}),
+                  Entrance(RR_SHADOW_TEMPLE_BEGINNING,    {[]{return ctx->GetDungeon(SHADOW_TEMPLE)->IsVanilla() && (ctx->GetTrickOption(RT_LENS_SHADOW) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT));}}),
+                  Entrance(RR_SHADOW_TEMPLE_MQ_BEGINNING, {[]{return ctx->GetDungeon(SHADOW_TEMPLE)->IsMQ()    && (ctx->GetTrickOption(RT_LENS_SHADOW_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT));}}),
                   Entrance(RR_GRAVEYARD_WARP_PAD_REGION,  {[]{return true;}}),
   });
 
   /*--------------------------
   |     VANILLA DUNGEON      |
   ---------------------------*/
-  if (randoCtx->GetDungeon(SHADOW_TEMPLE)->IsVanilla()) {
+  if (ctx->GetDungeon(SHADOW_TEMPLE)->IsVanilla()) {
   areaTable[RR_SHADOW_TEMPLE_BEGINNING] = Region("Shadow Temple Beginning", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->NutPot, {[]{return true;}}),
                 }, {
                   //Locations
-                  LOCATION(RC_SHADOW_TEMPLE_MAP_CHEST,         logic->CanJumpslash),
+                  LOCATION(RC_SHADOW_TEMPLE_MAP_CHEST,         logic->CanJumpslash()),
                   LOCATION(RC_SHADOW_TEMPLE_HOVER_BOOTS_CHEST, (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD))),
                 }, {
                   //Exits
@@ -37,108 +37,110 @@ void RegionTable_Init_ShadowTemple() {
                   EventAccess(&logic->FairyPot, {[]{return true;}}), //This fairy pot is only on 3DS
                 }, {
                   //Locations
-                  LOCATION(RC_SHADOW_TEMPLE_COMPASS_CHEST,            logic->CanJumpslash),
+                  LOCATION(RC_SHADOW_TEMPLE_COMPASS_CHEST,            logic->CanJumpslash()),
                   LOCATION(RC_SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST, logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT)),
                   LOCATION(RC_SHADOW_TEMPLE_GS_NEAR_SHIP,             false),
                 }, {
                   //Exits
-                  Entrance(RR_SHADOW_TEMPLE_HUGE_PIT,    {[]{return logic->HasExplosives && logic->IsAdult && logic->SmallKeys(RR_SHADOW_TEMPLE, 1, 2);}}),
+                  Entrance(RR_SHADOW_TEMPLE_HUGE_PIT,    {[]{return logic->HasExplosives() && logic->IsAdult && logic->SmallKeys(RR_SHADOW_TEMPLE, 1, 2);}}),
                   Entrance(RR_SHADOW_TEMPLE_BEYOND_BOAT, {[]{return false;}}),
   });
 
   areaTable[RR_SHADOW_TEMPLE_HUGE_PIT] = Region("Shadow Temple Huge Pit", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST,   logic->CanJumpslash),
-                  LOCATION(RC_SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST, logic->CanJumpslash),
+                  LOCATION(RC_SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST,   logic->CanJumpslash()),
+                  LOCATION(RC_SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST, logic->CanJumpslash()),
                   LOCATION(RC_SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST,       true),
-                  LOCATION(RC_SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST,       (randoCtx->GetTrickOption(RT_SHADOW_UMBRELLA) && logic->HoverBoots) || logic->GoronBracelet),
-                  LOCATION(RC_SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST,      (randoCtx->GetTrickOption(RT_SHADOW_UMBRELLA) && logic->HoverBoots) || logic->GoronBracelet),
-                  LOCATION(RC_SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST,           logic->SmallKeys(RR_SHADOW_TEMPLE, 2, 3) && ((randoCtx->GetTrickOption(RT_LENS_SHADOW_PLATFORM) && randoCtx->GetTrickOption(RT_LENS_SHADOW)) || logic->CanUse(RG_LENS_OF_TRUTH))),
-                  LOCATION(RC_SHADOW_TEMPLE_FREESTANDING_KEY,                 logic->SmallKeys(RR_SHADOW_TEMPLE, 2, 3) && ((randoCtx->GetTrickOption(RT_LENS_SHADOW_PLATFORM) && randoCtx->GetTrickOption(RT_LENS_SHADOW)) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->Hookshot && (logic->Bombs || logic->GoronBracelet || (randoCtx->GetTrickOption(RT_SHADOW_FREESTANDING_KEY) && logic->CanUse(RG_BOMBCHU_5)))),
-                  LOCATION(RC_SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM,                logic->CanJumpslash),
-                  LOCATION(RC_SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM,           logic->Hookshot || (randoCtx->GetTrickOption(RT_SHADOW_UMBRELLA_GS) && logic->HoverBoots)),
-                  LOCATION(RC_SHADOW_TEMPLE_GS_SINGLE_GIANT_POT,              logic->SmallKeys(RR_SHADOW_TEMPLE, 2, 3) && ((randoCtx->GetTrickOption(RT_LENS_SHADOW_PLATFORM) && randoCtx->GetTrickOption(RT_LENS_SHADOW)) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->Hookshot),
+                  LOCATION(RC_SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST,       (ctx->GetTrickOption(RT_SHADOW_UMBRELLA) && logic->CanUse(RG_HOVER_BOOTS)) || logic->HasItem(RG_GORONS_BRACELET)),
+                  LOCATION(RC_SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST,      (ctx->GetTrickOption(RT_SHADOW_UMBRELLA) && logic->CanUse(RG_HOVER_BOOTS)) || logic->HasItem(RG_GORONS_BRACELET)),
+                  LOCATION(RC_SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST,           logic->SmallKeys(RR_SHADOW_TEMPLE, 2, 3) && ((ctx->GetTrickOption(RT_LENS_SHADOW_PLATFORM) && ctx->GetTrickOption(RT_LENS_SHADOW)) || logic->CanUse(RG_LENS_OF_TRUTH))),
+                  LOCATION(RC_SHADOW_TEMPLE_FREESTANDING_KEY,                 logic->SmallKeys(RR_SHADOW_TEMPLE, 2, 3) && ((ctx->GetTrickOption(RT_LENS_SHADOW_PLATFORM) && ctx->GetTrickOption(RT_LENS_SHADOW)) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->CanUse(RG_HOOKSHOT) && (logic->CanUse(RG_BOMB_BAG) || logic->HasItem(RG_GORONS_BRACELET) || (ctx->GetTrickOption(RT_SHADOW_FREESTANDING_KEY) && logic->CanUse(RG_BOMBCHU_5)))),
+                  LOCATION(RC_SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM,                logic->CanJumpslash()),
+                  LOCATION(RC_SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM,           logic->CanUse(RG_HOOKSHOT) || (ctx->GetTrickOption(RT_SHADOW_UMBRELLA_GS) && logic->CanUse(RG_HOVER_BOOTS))),
+                  LOCATION(RC_SHADOW_TEMPLE_GS_SINGLE_GIANT_POT,              logic->SmallKeys(RR_SHADOW_TEMPLE, 2, 3) && ((ctx->GetTrickOption(RT_LENS_SHADOW_PLATFORM) && ctx->GetTrickOption(RT_LENS_SHADOW)) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->CanUse(RG_HOOKSHOT)),
                 }, {
                   //Exits
-                  Entrance(RR_SHADOW_TEMPLE_WIND_TUNNEL, {[]{return ((randoCtx->GetTrickOption(RT_LENS_SHADOW_PLATFORM) && randoCtx->GetTrickOption(RT_LENS_SHADOW)) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->Hookshot && logic->SmallKeys(RR_SHADOW_TEMPLE, 3, 4);}}),
+                  Entrance(RR_SHADOW_TEMPLE_WIND_TUNNEL, {[]{return ((ctx->GetTrickOption(RT_LENS_SHADOW_PLATFORM) && ctx->GetTrickOption(RT_LENS_SHADOW)) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->CanUse(RG_HOOKSHOT) && logic->SmallKeys(RR_SHADOW_TEMPLE, 3, 4);}}),
   });
 
   areaTable[RR_SHADOW_TEMPLE_WIND_TUNNEL] = Region("Shadow Temple Wind Tunnel", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SHADOW_TEMPLE_WIND_HINT_CHEST,         true),
-                  LOCATION(RC_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST,  logic->CanJumpslash),
+                  LOCATION(RC_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST,  logic->CanJumpslash()),
                   LOCATION(RC_SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST, true),
                   LOCATION(RC_SHADOW_TEMPLE_GS_NEAR_SHIP,            logic->CanUse(RG_LONGSHOT) && logic->SmallKeys(RR_SHADOW_TEMPLE, 4, 5)),
                 }, {
                   //Exits
-                  Entrance(RR_SHADOW_TEMPLE_BEYOND_BOAT, {[]{return logic->CanJumpslash && logic->CanUse(RG_ZELDAS_LULLABY) && logic->SmallKeys(RR_SHADOW_TEMPLE, 4, 5);}}),
+                  Entrance(RR_SHADOW_TEMPLE_BEYOND_BOAT, {[]{return logic->CanJumpslash() && logic->CanUse(RG_ZELDAS_LULLABY) && logic->SmallKeys(RR_SHADOW_TEMPLE, 4, 5);}}),
   });
 
   areaTable[RR_SHADOW_TEMPLE_BEYOND_BOAT] = Region("Shadow Temple Beyond Boat", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST,      logic->CanUse(RG_DINS_FIRE)),
                   LOCATION(RC_SHADOW_TEMPLE_BOSS_KEY_CHEST,              logic->CanUse(RG_DINS_FIRE)),
-                  LOCATION(RC_SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST, logic->CanJumpslash),
-                  LOCATION(RC_SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT,         logic->CanAdultAttack),
+                  LOCATION(RC_SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST, logic->CanJumpslash()),
+                  //RANDOTODO check if child can reach the token
+                  LOCATION(RC_SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT,         logic->IsAdult && logic->CanAttack()),
   }, {
                   //Exits
-                  Entrance(RR_SHADOW_TEMPLE_BOSS_ENTRYWAY, {[]{return (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_DISTANT_SCARECROW) || (randoCtx->GetTrickOption(RT_SHADOW_STATUE) && logic->CanUse(RG_BOMBCHU_5))) && logic->SmallKeys(RR_SHADOW_TEMPLE, 5) && logic->CanUse(RG_HOVER_BOOTS) && logic->BossKeyShadowTemple;}})
+                  Entrance(RR_SHADOW_TEMPLE_BOSS_ENTRYWAY, {[]{return (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_DISTANT_SCARECROW) || (ctx->GetTrickOption(RT_SHADOW_STATUE) && logic->CanUse(RG_BOMBCHU_5))) && logic->SmallKeys(RR_SHADOW_TEMPLE, 5) && logic->CanUse(RG_HOVER_BOOTS) && logic->HasItem(RG_SHADOW_TEMPLE_BOSS_KEY);}})
   });
   }
 
   /*---------------------------
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
-  if (randoCtx->GetDungeon(SHADOW_TEMPLE)->IsMQ()) {
+  if (ctx->GetDungeon(SHADOW_TEMPLE)->IsMQ()) {
+    //RANDOTODO doublecheck CanAttack when rewriting, as I assumed it only checked adult due to the entrance
   areaTable[RR_SHADOW_TEMPLE_MQ_BEGINNING] = Region("Shadow Temple MQ Beginning", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_SHADOW_TEMPLE_ENTRYWAY,          {[]{return true;}}),
-                  Entrance(RR_SHADOW_TEMPLE_MQ_FIRST_BEAMOS,   {[]{return logic->IsAdult && (logic->CanUse(RG_FIRE_ARROWS) || logic->HoverBoots || (randoCtx->GetTrickOption(RT_SHADOW_MQ_GAP) && logic->CanUse(RG_LONGSHOT)));}}),
-                    //Trick: logic->IsAdult && (logic->CanUse(RG_FIRE_ARROWS) || logic->HoverBoots || (LogicShadowMQGap && logic->CanUse(RG_LONGSHOT)))
-                  Entrance(RR_SHADOW_TEMPLE_MQ_DEAD_HAND_AREA, {[]{return logic->HasExplosives && logic->SmallKeys(RR_SHADOW_TEMPLE, 6);}}),
+                  Entrance(RR_SHADOW_TEMPLE_MQ_FIRST_BEAMOS,   {[]{return logic->IsAdult && (logic->CanUse(RG_FIRE_ARROWS) || logic->CanUse(RG_HOVER_BOOTS) || (ctx->GetTrickOption(RT_SHADOW_MQ_GAP) && logic->CanUse(RG_LONGSHOT)));}}),
+                    //Trick: logic->IsAdult && (logic->CanUse(RG_FIRE_ARROWS) || logic->CanUse(RG_HOVER_BOOTS) || (LogicShadowMQGap && logic->CanUse(RG_LONGSHOT)))
+                  Entrance(RR_SHADOW_TEMPLE_MQ_DEAD_HAND_AREA, {[]{return logic->HasExplosives() && logic->SmallKeys(RR_SHADOW_TEMPLE, 6);}}),
   });
 
   areaTable[RR_SHADOW_TEMPLE_MQ_DEAD_HAND_AREA] = Region("Shadow Temple MQ Dead Hand Region", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_SHADOW_TEMPLE_MQ_COMPASS_CHEST,     logic->CanJumpslash),
-                  LOCATION(RC_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST, logic->CanJumpslash && logic->CanUse(RG_SONG_OF_TIME) && logic->IsAdult && logic->CanUse(RG_FAIRY_BOW)),
+                  LOCATION(RC_SHADOW_TEMPLE_MQ_COMPASS_CHEST,     logic->CanJumpslash()),
+                  LOCATION(RC_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST, logic->CanJumpslash() && logic->CanUse(RG_SONG_OF_TIME) && logic->IsAdult && logic->CanUse(RG_FAIRY_BOW)),
   }, {});
 
   areaTable[RR_SHADOW_TEMPLE_MQ_FIRST_BEAMOS] = Region("Shadow Temple MQ First Beamos", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_SHADOW_TEMPLE_MQ_MAP_CHEST,                 logic->CanAdultAttack || logic->CanUse(RG_NUTS)),
-                  LOCATION(RC_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST,        logic->CanJumpslash),
-                  LOCATION(RC_SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST, logic->CanAdultAttack || logic->CanUse(RG_NUTS)),
+                  LOCATION(RC_SHADOW_TEMPLE_MQ_MAP_CHEST,                 logic->CanAttack() || logic->CanUse(RG_NUTS)),
+                  LOCATION(RC_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST,        logic->CanJumpslash()),
+                  LOCATION(RC_SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST, logic->CanAttack() || logic->CanUse(RG_NUTS)),
   }, {
                   //Exits
-                  Entrance(RR_SHADOW_TEMPLE_MQ_UPPER_HUGE_PIT, {[]{return logic->HasExplosives && logic->SmallKeys(RR_SHADOW_TEMPLE, 2);}}),
+                  Entrance(RR_SHADOW_TEMPLE_MQ_UPPER_HUGE_PIT, {[]{return logic->HasExplosives() && logic->SmallKeys(RR_SHADOW_TEMPLE, 2);}}),
   });
 
   areaTable[RR_SHADOW_TEMPLE_MQ_UPPER_HUGE_PIT] = Region("Shadow Temple MQ Upper Huge Pit", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST,   logic->CanUse(RG_SONG_OF_TIME) || (randoCtx->GetTrickOption(RT_SHADOW_MQ_INVISIBLE_BLADES) && randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_OHKO))),
+                  LOCATION(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST,   logic->CanUse(RG_SONG_OF_TIME) || (ctx->GetTrickOption(RT_SHADOW_MQ_INVISIBLE_BLADES) && ctx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_OHKO))),
                     //Trick: logic->CanUse(RG_SONG_OF_TIME) || (LogicShadowMQInvisibleBlades && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO))
-                  LOCATION(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST, logic->CanUse(RG_SONG_OF_TIME) || (randoCtx->GetTrickOption(RT_SHADOW_MQ_INVISIBLE_BLADES) && randoCtx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_OHKO))),
+                  LOCATION(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST, logic->CanUse(RG_SONG_OF_TIME) || (ctx->GetTrickOption(RT_SHADOW_MQ_INVISIBLE_BLADES) && ctx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_OHKO))),
                     //Trick: logic->CanUse(RG_SONG_OF_TIME) || (LogicShadowMQInvisibleBlades && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO))
   }, {
                   //Exits
-                  Entrance(RR_SHADOW_TEMPLE_MQ_LOWER_HUGE_PIT, {[]{return logic->HasFireSource || randoCtx->GetTrickOption(RT_SHADOW_MQ_HUGE_PIT);}}),
-                    //Trick: logic->HasFireSource || LogicShadowMQHugePit
+                  Entrance(RR_SHADOW_TEMPLE_MQ_LOWER_HUGE_PIT, {[]{return logic->HasFireSource() || ctx->GetTrickOption(RT_SHADOW_MQ_HUGE_PIT);}}),
+                    //Trick: logic->HasFireSource() || LogicShadowMQHugePit
   });
 
   areaTable[RR_SHADOW_TEMPLE_MQ_LOWER_HUGE_PIT] = Region("Shadow Temple MQ Lower Huge Pit", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST,  logic->IsAdult && logic->CanUse(RG_LONGSHOT)),
                   LOCATION(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST,  true),
-                  LOCATION(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST,  (randoCtx->GetTrickOption(RT_SHADOW_UMBRELLA) && logic->HoverBoots) || logic->GoronBracelet),
-                  LOCATION(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST, (randoCtx->GetTrickOption(RT_SHADOW_UMBRELLA) && logic->HoverBoots) || logic->GoronBracelet),
-                  LOCATION(RC_SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST,      logic->CanJumpslash && logic->HoverBoots && logic->SmallKeys(RR_SHADOW_TEMPLE, 3) && ((randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ) && randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ_PLATFORM)) || logic->CanUse(RG_LENS_OF_TRUTH))),
-                  LOCATION(RC_SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST,          (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && logic->HoverBoots && logic->SmallKeys(RR_SHADOW_TEMPLE, 3) && logic->Hookshot && ((randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ) &&
-                   randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ_INVISIBLE_BLADES) && randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ_PLATFORM)) || logic->CanUse(RG_LENS_OF_TRUTH))),
-                  LOCATION(RC_SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM,      logic->Hookshot || (randoCtx->GetTrickOption(RT_SHADOW_UMBRELLA_GS) && logic->HoverBoots)),
+                  LOCATION(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST,  (ctx->GetTrickOption(RT_SHADOW_UMBRELLA) && logic->CanUse(RG_HOVER_BOOTS)) || logic->HasItem(RG_GORONS_BRACELET)),
+                  LOCATION(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST, (ctx->GetTrickOption(RT_SHADOW_UMBRELLA) && logic->CanUse(RG_HOVER_BOOTS)) || logic->HasItem(RG_GORONS_BRACELET)),
+                  LOCATION(RC_SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST,      logic->CanJumpslash() && logic->CanUse(RG_HOVER_BOOTS) && logic->SmallKeys(RR_SHADOW_TEMPLE, 3) && ((ctx->GetTrickOption(RT_LENS_SHADOW_MQ) && ctx->GetTrickOption(RT_LENS_SHADOW_MQ_PLATFORM)) || logic->CanUse(RG_LENS_OF_TRUTH))),
+                  LOCATION(RC_SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST,          (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && logic->CanUse(RG_HOVER_BOOTS) && logic->SmallKeys(RR_SHADOW_TEMPLE, 3) && logic->CanUse(RG_HOOKSHOT) && ((ctx->GetTrickOption(RT_LENS_SHADOW_MQ) &&
+                   ctx->GetTrickOption(RT_LENS_SHADOW_MQ_INVISIBLE_BLADES) && ctx->GetTrickOption(RT_LENS_SHADOW_MQ_PLATFORM)) || logic->CanUse(RG_LENS_OF_TRUTH))),
+                  LOCATION(RC_SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM,      logic->CanUse(RG_HOOKSHOT) || (ctx->GetTrickOption(RT_SHADOW_UMBRELLA_GS) && logic->CanUse(RG_HOVER_BOOTS))),
   }, {
                   //Exits
-                  Entrance(RR_SHADOW_TEMPLE_MQ_WIND_TUNNEL, {[]{return logic->HoverBoots && ((randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ) && randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ_PLATFORM)) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->Hookshot && logic->SmallKeys(RR_SHADOW_TEMPLE, 4);}}),
+                  Entrance(RR_SHADOW_TEMPLE_MQ_WIND_TUNNEL, {[]{return logic->CanUse(RG_HOVER_BOOTS) && ((ctx->GetTrickOption(RT_LENS_SHADOW_MQ) && ctx->GetTrickOption(RT_LENS_SHADOW_MQ_PLATFORM)) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->CanUse(RG_HOOKSHOT) && logic->SmallKeys(RR_SHADOW_TEMPLE, 4);}}),
   });
 
   areaTable[RR_SHADOW_TEMPLE_MQ_WIND_TUNNEL] = Region("Shadow Temple MQ Wind Tunnel", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {
@@ -147,7 +149,7 @@ void RegionTable_Init_ShadowTemple() {
   }, {
                   //Locations
                   LOCATION(RC_SHADOW_TEMPLE_MQ_WIND_HINT_CHEST,         true),
-                  LOCATION(RC_SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST,  logic->CanJumpslash),
+                  LOCATION(RC_SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST,  logic->CanJumpslash()),
                   LOCATION(RC_SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST, true),
                   LOCATION(RC_SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM,       true),
                   LOCATION(RC_SHADOW_TEMPLE_MQ_GS_AFTER_WIND,           true),
@@ -159,11 +161,11 @@ void RegionTable_Init_ShadowTemple() {
   areaTable[RR_SHADOW_TEMPLE_MQ_BEYOND_BOAT] = Region("Shadow Temple MQ Beyond Boat", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SHADOW_TEMPLE_MQ_GS_AFTER_SHIP,  true),
-                  LOCATION(RC_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS,   logic->Bow || (randoCtx->GetTrickOption(RT_SHADOW_STATUE) && logic->CanUse(RG_BOMBCHU_5))),
+                  LOCATION(RC_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS,   logic->CanUse(RG_FAIRY_BOW) || (ctx->GetTrickOption(RT_SHADOW_STATUE) && logic->CanUse(RG_BOMBCHU_5))),
   }, {
                   //Exits
-                  Entrance(RR_SHADOW_TEMPLE_MQ_INVISIBLE_MAZE, {[]{return logic->Bow && logic->CanUse(RG_SONG_OF_TIME) && logic->IsAdult && logic->CanUse(RG_LONGSHOT);}}),
-                  Entrance(RR_SHADOW_TEMPLE_BOSS_ENTRYWAY,     {[]{return (logic->CanUse(RG_FAIRY_BOW) || (randoCtx->GetTrickOption(RT_SHADOW_STATUE) && logic->CanUse(RG_BOMBCHU_5))) && logic->CanUse(RG_HOVER_BOOTS) && logic->BossKeyShadowTemple;}}),
+                  Entrance(RR_SHADOW_TEMPLE_MQ_INVISIBLE_MAZE, {[]{return logic->CanUse(RG_FAIRY_BOW) && logic->CanUse(RG_SONG_OF_TIME) && logic->IsAdult && logic->CanUse(RG_LONGSHOT);}}),
+                  Entrance(RR_SHADOW_TEMPLE_BOSS_ENTRYWAY,     {[]{return (logic->CanUse(RG_FAIRY_BOW) || (ctx->GetTrickOption(RT_SHADOW_STATUE) && logic->CanUse(RG_BOMBCHU_5))) && logic->CanUse(RG_HOVER_BOOTS) && logic->HasItem(RG_SHADOW_TEMPLE_BOSS_KEY);}}),
   });
 
   areaTable[RR_SHADOW_TEMPLE_MQ_INVISIBLE_MAZE] = Region("Shadow Temple MQ Invisible Maze", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -171,7 +173,7 @@ void RegionTable_Init_ShadowTemple() {
                   LOCATION(RC_SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST, logic->CanUse(RG_DINS_FIRE) && logic->SmallKeys(RR_SHADOW_TEMPLE, 6)),
                   LOCATION(RC_SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST,         logic->CanUse(RG_DINS_FIRE) && logic->SmallKeys(RR_SHADOW_TEMPLE, 6)),
                   //below previously returned true
-                  LOCATION(RC_SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST,      logic->CanUse(RG_LENS_OF_TRUTH) || randoCtx->GetTrickOption(RT_LENS_SHADOW_MQ_DEADHAND)),
+                  LOCATION(RC_SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST,      logic->CanUse(RG_LENS_OF_TRUTH) || ctx->GetTrickOption(RT_LENS_SHADOW_MQ_DEADHAND)),
                   LOCATION(RC_SHADOW_TEMPLE_MQ_FREESTANDING_KEY,       true),
   }, {});
   }
@@ -183,8 +185,8 @@ void RegionTable_Init_ShadowTemple() {
         Region("Shadow Temple Boss Entryway", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
              {
                  // Exits
-                 Entrance(RR_SHADOW_TEMPLE_BEYOND_BOAT, { [] { return randoCtx->GetDungeon(SHADOW_TEMPLE)->IsVanilla() && false; } }),
-                 Entrance(RR_SHADOW_TEMPLE_MQ_BEYOND_BOAT, { [] { return randoCtx->GetDungeon(SHADOW_TEMPLE)->IsMQ() && false; } }),
+                 Entrance(RR_SHADOW_TEMPLE_BEYOND_BOAT, { [] { return ctx->GetDungeon(SHADOW_TEMPLE)->IsVanilla() && false; } }),
+                 Entrance(RR_SHADOW_TEMPLE_MQ_BEYOND_BOAT, { [] { return ctx->GetDungeon(SHADOW_TEMPLE)->IsMQ() && false; } }),
                  Entrance(RR_SHADOW_TEMPLE_BOSS_ROOM, { [] { return true; } }),
              });
 
@@ -194,9 +196,9 @@ void RegionTable_Init_ShadowTemple() {
                  // Events
                  EventAccess(&logic->ShadowTempleClear, { [] {
                      return logic->ShadowTempleClear || (logic->HasBossSoul(RG_BONGO_BONGO_SOUL) &&
-                            ((logic->CanUse(RG_LENS_OF_TRUTH) || randoCtx->GetTrickOption(RT_LENS_BONGO)) &&
+                            ((logic->CanUse(RG_LENS_OF_TRUTH) || ctx->GetTrickOption(RT_LENS_BONGO)) &&
                              (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) &&
-                             (logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT) || randoCtx->GetTrickOption(RT_SHADOW_BONGO))));
+                             (logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT) || ctx->GetTrickOption(RT_SHADOW_BONGO))));
                  } }),
              },
              {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp
index e65644747..136ce864e 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp
@@ -10,15 +10,15 @@ void RegionTable_Init_SpiritTemple() {
   ---------------------------*/
   areaTable[RR_SPIRIT_TEMPLE_ENTRYWAY] = Region("Spirit Temple Entryway", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_SPIRIT_TEMPLE_LOBBY,                  {[]{return randoCtx->GetDungeon(SPIRIT_TEMPLE)->IsVanilla();}}),
-                  Entrance(RR_SPIRIT_TEMPLE_MQ_LOBBY,               {[]{return randoCtx->GetDungeon(SPIRIT_TEMPLE)->IsMQ();}}),
+                  Entrance(RR_SPIRIT_TEMPLE_LOBBY,                  {[]{return ctx->GetDungeon(SPIRIT_TEMPLE)->IsVanilla();}}),
+                  Entrance(RR_SPIRIT_TEMPLE_MQ_LOBBY,               {[]{return ctx->GetDungeon(SPIRIT_TEMPLE)->IsMQ();}}),
                   Entrance(RR_DESERT_COLOSSUS_FROM_SPIRIT_ENTRYWAY, {[]{return true;}}),
   });
 
   /*--------------------------
   |     VANILLA DUNGEON      |
   ---------------------------*/
-  if (randoCtx->GetDungeon(SPIRIT_TEMPLE)->IsVanilla()) {
+  if (ctx->GetDungeon(SPIRIT_TEMPLE)->IsVanilla()) {
   areaTable[RR_SPIRIT_TEMPLE_LOBBY] = Region("Spirit Temple Lobby", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_SPIRIT_TEMPLE_ENTRYWAY,    {[]{return true;}}),
@@ -31,9 +31,9 @@ void RegionTable_Init_SpiritTemple() {
                   EventAccess(&logic->NutCrate, {[]{return true;}}),
                 }, {
                   //Locations
-                  LOCATION(RC_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST,        (logic->Boomerang || logic->Slingshot || (logic->CanUse(RG_BOMBCHU_5) && randoCtx->GetTrickOption(RT_SPIRIT_CHILD_CHU))) && (logic->HasExplosives || ((logic->CanUse(RG_NUTS) || logic->Boomerang) && (logic->CanUse(RG_STICKS)  || logic->KokiriSword || logic->Slingshot)))),
-                  LOCATION(RC_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST, (logic->Boomerang || logic->Slingshot || (logic->CanUse(RG_BOMBCHU_5) && randoCtx->GetTrickOption(RT_SPIRIT_CHILD_CHU))) && (logic->HasExplosives || ((logic->CanUse(RG_NUTS) || logic->Boomerang) && (logic->CanUse(RG_STICKS)  || logic->KokiriSword || logic->Slingshot))) && (logic->CanUse(RG_STICKS) || logic->CanUse(RG_DINS_FIRE))),
-                  LOCATION(RC_SPIRIT_TEMPLE_GS_METAL_FENCE,            (logic->Boomerang || logic->Slingshot || (logic->CanUse(RG_BOMBCHU_5) && randoCtx->GetTrickOption(RT_SPIRIT_CHILD_CHU))) && (logic->HasExplosives || ((logic->CanUse(RG_NUTS) || logic->Boomerang) && (logic->CanUse(RG_STICKS)  || logic->KokiriSword || logic->Slingshot)))),
+                  LOCATION(RC_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST,        (logic->CanUse(RG_BOOMERANG) || logic->CanUse(RG_FAIRY_SLINGSHOT) || (logic->CanUse(RG_BOMBCHU_5) && ctx->GetTrickOption(RT_SPIRIT_CHILD_CHU))) && (logic->HasExplosives() || ((logic->CanUse(RG_NUTS) || logic->CanUse(RG_BOOMERANG)) && (logic->CanUse(RG_STICKS)  || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_FAIRY_SLINGSHOT))))),
+                  LOCATION(RC_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST, (logic->CanUse(RG_BOOMERANG) || logic->CanUse(RG_FAIRY_SLINGSHOT) || (logic->CanUse(RG_BOMBCHU_5) && ctx->GetTrickOption(RT_SPIRIT_CHILD_CHU))) && (logic->HasExplosives() || ((logic->CanUse(RG_NUTS) || logic->CanUse(RG_BOOMERANG)) && (logic->CanUse(RG_STICKS)  || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_FAIRY_SLINGSHOT)))) && (logic->CanUse(RG_STICKS) || logic->CanUse(RG_DINS_FIRE))),
+                  LOCATION(RC_SPIRIT_TEMPLE_GS_METAL_FENCE,            (logic->CanUse(RG_BOOMERANG) || logic->CanUse(RG_FAIRY_SLINGSHOT) || (logic->CanUse(RG_BOMBCHU_5) && ctx->GetTrickOption(RT_SPIRIT_CHILD_CHU))) && (logic->HasExplosives() || ((logic->CanUse(RG_NUTS) || logic->CanUse(RG_BOOMERANG)) && (logic->CanUse(RG_STICKS)  || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_FAIRY_SLINGSHOT))))),
                 }, {
                   //Exits
                   Entrance(RR_SPIRIT_TEMPLE_CHILD_CLIMB, {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 1);}}),
@@ -41,24 +41,24 @@ void RegionTable_Init_SpiritTemple() {
 
   areaTable[RR_SPIRIT_TEMPLE_CHILD_CLIMB] = Region("Child Spirit Temple Climb", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST, logic->HasProjectile(HasProjectileAge::Both) || ((logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->BombchuRefill && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && logic->CanUse(RG_SILVER_GAUNTLETS) && logic->HasProjectile(HasProjectileAge::Adult)) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->IsChild && logic->HasProjectile(HasProjectileAge::Child))),
-                  LOCATION(RC_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST,  logic->HasProjectile(HasProjectileAge::Both) || ((logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->BombchuRefill && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && logic->CanUse(RG_SILVER_GAUNTLETS) && logic->HasProjectile(HasProjectileAge::Adult)) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->IsChild && logic->HasProjectile(HasProjectileAge::Child))),
+                  LOCATION(RC_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST, logic->HasProjectile(HasProjectileAge::Both) || ((logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->BombchuRefill() && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && logic->CanUse(RG_SILVER_GAUNTLETS) && logic->HasProjectile(HasProjectileAge::Adult)) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->IsChild && logic->HasProjectile(HasProjectileAge::Child))),
+                  LOCATION(RC_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST,  logic->HasProjectile(HasProjectileAge::Both) || ((logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->BombchuRefill() && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && logic->CanUse(RG_SILVER_GAUNTLETS) && logic->HasProjectile(HasProjectileAge::Adult)) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->IsChild && logic->HasProjectile(HasProjectileAge::Child))),
                   LOCATION(RC_SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM,    logic->HasProjectile(HasProjectileAge::Both) || logic->CanUse(RG_DINS_FIRE) ||
-                                                                                      (logic->CanTakeDamage && (logic->CanJumpslash || logic->HasProjectile(HasProjectileAge::Child))) ||
+                                                                                      (logic->TakeDamage() && (logic->CanJumpslash() || logic->HasProjectile(HasProjectileAge::Child))) ||
                                                                                         (logic->IsChild && logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->HasProjectile(HasProjectileAge::Child)) ||
-                                                                                          ((logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->BombchuRefill && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && logic->CanUse(RG_SILVER_GAUNTLETS) && (logic->HasProjectile(HasProjectileAge::Adult) || (logic->CanTakeDamage && logic->CanJumpslash)))),
+                                                                                          ((logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->BombchuRefill() && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && logic->CanUse(RG_SILVER_GAUNTLETS) && (logic->HasProjectile(HasProjectileAge::Adult) || (logic->TakeDamage() && logic->CanJumpslash())))),
                 }, {
                   //Exits
-                  Entrance(RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER, {[]{return logic->HasExplosives || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS));}}),
+                  Entrance(RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER, {[]{return logic->HasExplosives() || (ctx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS));}}),
   });
 
   areaTable[RR_SPIRIT_TEMPLE_EARLY_ADULT] = Region("Early Adult Spirit Temple", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SPIRIT_TEMPLE_COMPASS_CHEST,            logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_ZELDAS_LULLABY)),
-                  LOCATION(RC_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST,  (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG) || logic->CanUse(RG_BOMBCHU_5) || (logic->Bombs && logic->IsAdult && randoCtx->GetTrickOption(RT_SPIRIT_LOWER_ADULT_SWITCH))) && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanJumpslash)),
+                  LOCATION(RC_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST,  (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG) || logic->CanUse(RG_BOMBCHU_5) || (logic->CanUse(RG_BOMB_BAG) && logic->IsAdult && ctx->GetTrickOption(RT_SPIRIT_LOWER_ADULT_SWITCH))) && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanJumpslash())),
                   LOCATION(RC_SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST,  logic->SmallKeys(RR_SPIRIT_TEMPLE, 3)),
                   LOCATION(RC_SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST, logic->SmallKeys(RR_SPIRIT_TEMPLE, 3)),
-                  LOCATION(RC_SPIRIT_TEMPLE_GS_BOULDER_ROOM,          logic->CanUse(RG_SONG_OF_TIME) && (logic->Bow || logic->Hookshot || logic->CanUse(RG_BOMBCHU_5) || (logic->Bombs && randoCtx->GetTrickOption(RT_SPIRIT_LOWER_ADULT_SWITCH)))),
+                  LOCATION(RC_SPIRIT_TEMPLE_GS_BOULDER_ROOM,          logic->CanUse(RG_SONG_OF_TIME) && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_BOMBCHU_5) || (logic->CanUse(RG_BOMB_BAG) && ctx->GetTrickOption(RT_SPIRIT_LOWER_ADULT_SWITCH)))),
                 }, {
                   //Exits
                   Entrance(RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER, {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 1);}}),
@@ -66,60 +66,60 @@ void RegionTable_Init_SpiritTemple() {
 
   areaTable[RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER] = Region("Spirit Temple Central Chamber", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_SPIRIT_TEMPLE_MAP_CHEST,                    ((logic->HasExplosives || logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->BombchuRefill && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) &&
-                                                                            (logic->CanUse(RG_DINS_FIRE) || ((logic->CanUse(RG_FIRE_ARROWS) || randoCtx->GetTrickOption(RT_SPIRIT_MAP_CHEST)) && logic->Bow && logic->CanUse(RG_STICKS) ))) ||
-                                                                          (logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->HasExplosives && logic->CanUse(RG_STICKS)) ||
-                                                                          (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) && (logic->CanUse(RG_FIRE_ARROWS) || (randoCtx->GetTrickOption(RT_SPIRIT_MAP_CHEST) && logic->Bow)) && logic->CanUse(RG_SILVER_GAUNTLETS))),
+                  LOCATION(RC_SPIRIT_TEMPLE_MAP_CHEST,                    ((logic->HasExplosives() || logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->BombchuRefill() && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) &&
+                                                                            (logic->CanUse(RG_DINS_FIRE) || ((logic->CanUse(RG_FIRE_ARROWS) || ctx->GetTrickOption(RT_SPIRIT_MAP_CHEST)) && logic->CanUse(RG_FAIRY_BOW) && logic->CanUse(RG_STICKS) ))) ||
+                                                                          (logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->HasExplosives() && logic->CanUse(RG_STICKS)) ||
+                                                                          (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) && (logic->CanUse(RG_FIRE_ARROWS) || (ctx->GetTrickOption(RT_SPIRIT_MAP_CHEST) && logic->CanUse(RG_FAIRY_BOW))) && logic->CanUse(RG_SILVER_GAUNTLETS))),
                   
-                  LOCATION(RC_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST,         ((logic->HasExplosives || logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->BombchuRefill && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) &&
-                                                                           (logic->CanUse(RG_DINS_FIRE) || ((logic->CanUse(RG_FIRE_ARROWS) || randoCtx->GetTrickOption(RT_SPIRIT_SUN_CHEST)) && logic->Bow && logic->CanUse(RG_STICKS) ))) ||
-                                                                          (logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->HasExplosives && logic->CanUse(RG_STICKS)) ||
-                                                                          (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) && (logic->CanUse(RG_FIRE_ARROWS) || (randoCtx->GetTrickOption(RT_SPIRIT_SUN_CHEST) && logic->Bow)) && logic->CanUse(RG_SILVER_GAUNTLETS))),
+                  LOCATION(RC_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST,         ((logic->HasExplosives() || logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->BombchuRefill() && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) &&
+                                                                           (logic->CanUse(RG_DINS_FIRE) || ((logic->CanUse(RG_FIRE_ARROWS) || ctx->GetTrickOption(RT_SPIRIT_SUN_CHEST)) && logic->CanUse(RG_FAIRY_BOW) && logic->CanUse(RG_STICKS) ))) ||
+                                                                          (logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->HasExplosives() && logic->CanUse(RG_STICKS)) ||
+                                                                          (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) && (logic->CanUse(RG_FIRE_ARROWS) || (ctx->GetTrickOption(RT_SPIRIT_SUN_CHEST) && logic->CanUse(RG_FAIRY_BOW))) && logic->CanUse(RG_SILVER_GAUNTLETS))),
 
                   LOCATION(RC_SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST,       logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) && logic->CanUse(RG_SILVER_GAUNTLETS) && logic->CanUse(RG_ZELDAS_LULLABY)),
-                  LOCATION(RC_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST,  logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) && logic->CanUse(RG_SILVER_GAUNTLETS) && logic->CanUse(RG_ZELDAS_LULLABY) && (logic->Hookshot || logic->HoverBoots || randoCtx->GetTrickOption(RT_SPIRIT_LOBBY_JUMP))),
-                  LOCATION(RC_SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM, (logic->HasExplosives && logic->Boomerang && logic->Hookshot) ||
-                                                                          (logic->CanUse(RG_BOOMERANG) && logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->HasExplosives) ||
-                                                                          (logic->Hookshot && logic->CanUse(RG_SILVER_GAUNTLETS) && (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && 
-                                                                           logic->Boomerang && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->BombchuRefill && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))))),
+                  LOCATION(RC_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST,  logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) && logic->CanUse(RG_SILVER_GAUNTLETS) && logic->CanUse(RG_ZELDAS_LULLABY) && (logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_HOVER_BOOTS) || ctx->GetTrickOption(RT_SPIRIT_LOBBY_JUMP))),
+                  LOCATION(RC_SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM, (logic->HasExplosives() && logic->CanUse(RG_BOOMERANG) && logic->CanUse(RG_HOOKSHOT)) ||
+                                                                          (logic->CanUse(RG_BOOMERANG) && logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->HasExplosives()) ||
+                                                                          (logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_SILVER_GAUNTLETS) && (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && 
+                                                                           logic->CanUse(RG_BOOMERANG) && ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->BombchuRefill() && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))))),
 
-                  LOCATION(RC_SPIRIT_TEMPLE_GS_LOBBY,                     ((logic->HasExplosives || logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->BombchuRefill && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) &&
-                                                                           randoCtx->GetTrickOption(RT_SPIRIT_LOBBY_GS) && logic->Boomerang && (logic->Hookshot || logic->HoverBoots || randoCtx->GetTrickOption(RT_SPIRIT_LOBBY_JUMP))) ||
-                                                                          (randoCtx->GetTrickOption(RT_SPIRIT_LOBBY_GS) && logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->HasExplosives && logic->CanUse(RG_BOOMERANG)) ||
-                                                                          (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) && logic->CanUse(RG_SILVER_GAUNTLETS) && (logic->Hookshot || logic->HoverBoots || randoCtx->GetTrickOption(RT_SPIRIT_LOBBY_JUMP)))),
+                  LOCATION(RC_SPIRIT_TEMPLE_GS_LOBBY,                     ((logic->HasExplosives() || logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->BombchuRefill() && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) &&
+                                                                           ctx->GetTrickOption(RT_SPIRIT_LOBBY_GS) && logic->CanUse(RG_BOOMERANG) && (logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_HOVER_BOOTS) || ctx->GetTrickOption(RT_SPIRIT_LOBBY_JUMP))) ||
+                                                                          (ctx->GetTrickOption(RT_SPIRIT_LOBBY_GS) && logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->HasExplosives() && logic->CanUse(RG_BOOMERANG)) ||
+                                                                          (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) && logic->CanUse(RG_SILVER_GAUNTLETS) && (logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_HOVER_BOOTS) || ctx->GetTrickOption(RT_SPIRIT_LOBBY_JUMP)))),
                 }, {
                   //Exits
-                  Entrance(RR_SPIRIT_TEMPLE_OUTDOOR_HANDS,              {[]{return logic->CanJumpslash || logic->HasExplosives;}}),
+                  Entrance(RR_SPIRIT_TEMPLE_OUTDOOR_HANDS,              {[]{return logic->CanJumpslash() || logic->HasExplosives();}}),
                   Entrance(RR_SPIRIT_TEMPLE_BEYOND_CENTRAL_LOCKED_DOOR, {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 4) && logic->CanUse(RG_SILVER_GAUNTLETS);}}),
                   Entrance(RR_SPIRIT_TEMPLE_CHILD_CLIMB,                {[]{return true;}}),
   });
 
   areaTable[RR_SPIRIT_TEMPLE_OUTDOOR_HANDS] = Region("Spirit Temple Outdoor Hands", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST, (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) && logic->Longshot && logic->HasExplosives) || logic->SmallKeys(RR_SPIRIT_TEMPLE, 5)),
-                  LOCATION(RC_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST,    logic->SmallKeys(RR_SPIRIT_TEMPLE, 4) && logic->CanUse(RG_SILVER_GAUNTLETS) && logic->HasExplosives),
+                  LOCATION(RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST, (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) && logic->CanUse(RG_LONGSHOT) && logic->HasExplosives()) || logic->SmallKeys(RR_SPIRIT_TEMPLE, 5)),
+                  LOCATION(RC_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST,    logic->SmallKeys(RR_SPIRIT_TEMPLE, 4) && logic->CanUse(RG_SILVER_GAUNTLETS) && logic->HasExplosives()),
                 }, {
                   //Exits
-                  Entrance(RR_DESERT_COLOSSUS, {[]{return (logic->IsChild && logic->SmallKeys(RR_SPIRIT_TEMPLE, 5)) || (logic->CanUse(RG_SILVER_GAUNTLETS) && ((logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) && logic->HasExplosives) || logic->SmallKeys(RR_SPIRIT_TEMPLE, 5)));}}),
+                  Entrance(RR_DESERT_COLOSSUS, {[]{return (logic->IsChild && logic->SmallKeys(RR_SPIRIT_TEMPLE, 5)) || (logic->CanUse(RG_SILVER_GAUNTLETS) && ((logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) && logic->HasExplosives()) || logic->SmallKeys(RR_SPIRIT_TEMPLE, 5)));}}),
   });
 
   areaTable[RR_SPIRIT_TEMPLE_BEYOND_CENTRAL_LOCKED_DOOR] = Region("Spirit Temple Beyond Central Locked Door", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST,         (logic->MirrorShield || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS))) && logic->HasExplosives),
-                  LOCATION(RC_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST,  (randoCtx->GetTrickOption(RT_LENS_SPIRIT) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->HasExplosives),
-                  LOCATION(RC_SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST, (randoCtx->GetTrickOption(RT_LENS_SPIRIT) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->HasExplosives),
+                  LOCATION(RC_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST,         (logic->CanUse(RG_MIRROR_SHIELD) || (ctx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS))) && logic->HasExplosives()),
+                  LOCATION(RC_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST,  (ctx->GetTrickOption(RT_LENS_SPIRIT) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->HasExplosives()),
+                  LOCATION(RC_SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST, (ctx->GetTrickOption(RT_LENS_SPIRIT) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->HasExplosives()),
                 }, {
                   //Exits
-                  Entrance(RR_SPIRIT_TEMPLE_BEYOND_FINAL_LOCKED_DOOR, {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && (randoCtx->GetTrickOption(RT_SPIRIT_WALL) || logic->CanUse(RG_LONGSHOT) || logic->CanUse(RG_BOMBCHU_5) || ((logic->Bombs || logic->CanUse(RG_NUTS) || logic->CanUse(RG_DINS_FIRE)) && (logic->Bow || logic->CanUse(RG_HOOKSHOT) || logic->Hammer)));}}),
+                  Entrance(RR_SPIRIT_TEMPLE_BEYOND_FINAL_LOCKED_DOOR, {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && (ctx->GetTrickOption(RT_SPIRIT_WALL) || logic->CanUse(RG_LONGSHOT) || logic->CanUse(RG_BOMBCHU_5) || ((logic->CanUse(RG_BOMB_BAG) || logic->CanUse(RG_NUTS) || logic->CanUse(RG_DINS_FIRE)) && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_MEGATON_HAMMER))));}}),
   });
 
   areaTable[RR_SPIRIT_TEMPLE_BEYOND_FINAL_LOCKED_DOOR] = Region("Spirit Temple Beyond Final Locked Door", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_SPIRIT_TEMPLE_BOSS_KEY_CHEST, logic->CanUse(RG_ZELDAS_LULLABY) && ((logic->CanTakeDamage && randoCtx->GetTrickOption(RT_FLAMING_CHESTS)) || (logic->Bow && logic->Hookshot))),
-                  LOCATION(RC_SPIRIT_TEMPLE_TOPMOST_CHEST,  (logic->MirrorShield && logic->CanAdultAttack) || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS))),
+                  LOCATION(RC_SPIRIT_TEMPLE_BOSS_KEY_CHEST, logic->CanUse(RG_ZELDAS_LULLABY) && ((logic->TakeDamage() && ctx->GetTrickOption(RT_FLAMING_CHESTS)) || (logic->CanUse(RG_FAIRY_BOW) && logic->CanUse(RG_HOOKSHOT)))),
+                  LOCATION(RC_SPIRIT_TEMPLE_TOPMOST_CHEST,  (logic->CanUse(RG_MIRROR_SHIELD) && logic->CanAttack()) || (ctx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS))),
   }, {
                   //Exits
-                  Entrance(RR_SPIRIT_TEMPLE_INSIDE_STATUE_HEAD, {[]{return logic->MirrorShield && logic->HasExplosives && logic->Hookshot;}}),
+                  Entrance(RR_SPIRIT_TEMPLE_INSIDE_STATUE_HEAD, {[]{return logic->CanUse(RG_MIRROR_SHIELD) && logic->HasExplosives() && logic->CanUse(RG_HOOKSHOT);}}),
   });
 
   areaTable[RR_SPIRIT_TEMPLE_INSIDE_STATUE_HEAD] =
@@ -127,18 +127,18 @@ void RegionTable_Init_SpiritTemple() {
                  {
                      // Exits
                      Entrance(RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER, { [] { return true; } }),
-                     Entrance(RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY, { [] { return logic->BossKeySpiritTemple; } }),
+                     Entrance(RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY, { [] { return logic->HasItem(RG_SPIRIT_TEMPLE_BOSS_KEY); } }),
                  });
   }
 
   /*---------------------------
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
-  if (randoCtx->GetDungeon(SPIRIT_TEMPLE)->IsMQ()) {
+  if (ctx->GetDungeon(SPIRIT_TEMPLE)->IsMQ()) {
   areaTable[RR_SPIRIT_TEMPLE_MQ_LOBBY] = Region("Spirit Temple MQ Lobby", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST, true),
-                  LOCATION(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST,  Here(RR_SPIRIT_TEMPLE_MQ_LOBBY, []{return logic->CanBlastOrSmash;}) && ((logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT)) || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW)))),
+                  LOCATION(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST,  Here(RR_SPIRIT_TEMPLE_MQ_LOBBY, []{return logic->BlastOrSmash();}) && ((logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT)) || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW)))),
                   LOCATION(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST, logic->CanUse(RG_BOMBCHU_5) || (logic->IsAdult && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT))) || (logic->IsChild && (logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG)))),
   }, {
                   //Exits
@@ -149,14 +149,14 @@ void RegionTable_Init_SpiritTemple() {
 
   areaTable[RR_SPIRIT_TEMPLE_MQ_CHILD] = Region("Spirit Temple MQ Child", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->FairyPot, {[]{return logic->FairyPot || (logic->KokiriSword && logic->CanUse(RG_BOMBCHU_5) && logic->Slingshot);}}),
+                  EventAccess(&logic->FairyPot, {[]{return logic->FairyPot || (logic->CanUse(RG_KOKIRI_SWORD) && logic->CanUse(RG_BOMBCHU_5) && logic->CanUse(RG_FAIRY_SLINGSHOT));}}),
   }, {
                   //Locations
-                  LOCATION(RC_SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST,  Here(RR_SPIRIT_TEMPLE_MQ_ADULT, []{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && logic->Hammer;})),
-                  LOCATION(RC_SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST,       logic->KokiriSword && logic->CanUse(RG_BOMBCHU_5) && logic->Slingshot && logic->CanUse(RG_DINS_FIRE)),
-                  LOCATION(RC_SPIRIT_TEMPLE_MQ_MAP_CHEST,                  logic->KokiriSword || logic->Bombs),
-                  LOCATION(RC_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST, logic->CanUse(RG_BOMBCHU_5) && logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && logic->Slingshot && (logic->CanUse(RG_DINS_FIRE) || (Here(RR_SPIRIT_TEMPLE_MQ_ADULT, []{return logic->IsAdult && (logic->CanUse(RG_FIRE_ARROWS) || (randoCtx->GetTrickOption(RT_SPIRIT_MQ_FROZEN_EYE) && logic->CanUse(RG_FAIRY_BOW) && logic->CanUse(RG_SONG_OF_TIME)));})))),
-                    //Trick: logic->CanUse(RG_BOMBCHU_5) && logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && logic->Slingshot && (logic->CanUse(RG_DINS_FIRE) || (SPIRIT_TEMPLE_MQ_ADULT.Adult() && logic->IsAdult && (logic->CanUse(RG_FIRE_ARROWS) || (LogicSpiritMQFrozenEye && logic->CanUse(RG_FAIRY_BOW) && logic->CanUse(RG_SONG_OF_TIME)))))
+                  LOCATION(RC_SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST,  Here(RR_SPIRIT_TEMPLE_MQ_ADULT, []{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && logic->CanUse(RG_MEGATON_HAMMER);})),
+                  LOCATION(RC_SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST,       logic->CanUse(RG_KOKIRI_SWORD) && logic->CanUse(RG_BOMBCHU_5) && logic->CanUse(RG_FAIRY_SLINGSHOT) && logic->CanUse(RG_DINS_FIRE)),
+                  LOCATION(RC_SPIRIT_TEMPLE_MQ_MAP_CHEST,                  logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BOMB_BAG)),
+                  LOCATION(RC_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST, logic->CanUse(RG_BOMBCHU_5) && logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && logic->CanUse(RG_FAIRY_SLINGSHOT) && (logic->CanUse(RG_DINS_FIRE) || (Here(RR_SPIRIT_TEMPLE_MQ_ADULT, []{return logic->IsAdult && (logic->CanUse(RG_FIRE_ARROWS) || (ctx->GetTrickOption(RT_SPIRIT_MQ_FROZEN_EYE) && logic->CanUse(RG_FAIRY_BOW) && logic->CanUse(RG_SONG_OF_TIME)));})))),
+                    //Trick: logic->CanUse(RG_BOMBCHU_5) && logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && logic->CanUse(RG_FAIRY_SLINGSHOT) && (logic->CanUse(RG_DINS_FIRE) || (SPIRIT_TEMPLE_MQ_ADULT.Adult() && logic->IsAdult && (logic->CanUse(RG_FIRE_ARROWS) || (LogicSpiritMQFrozenEye && logic->CanUse(RG_FAIRY_BOW) && logic->CanUse(RG_SONG_OF_TIME)))))
   }, {
                   //Exits
                   Entrance(RR_SPIRIT_TEMPLE_MQ_SHARED, {[]{return logic->CanUse(RG_BOMBCHU_5) && logic->SmallKeys(RR_SPIRIT_TEMPLE, 2);}}),
@@ -165,55 +165,55 @@ void RegionTable_Init_SpiritTemple() {
   areaTable[RR_SPIRIT_TEMPLE_MQ_ADULT] = Region("Spirit Temple MQ Adult", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST,     logic->SmallKeys(RR_SPIRIT_TEMPLE, 7)),
-                  LOCATION(RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST,   logic->CanUse(RG_ZELDAS_LULLABY) && (logic->CanJumpslash || logic->CanUse(RG_HOVER_BOOTS))),
-                  LOCATION(RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST, (randoCtx->GetTrickOption(RT_LENS_SPIRIT_MQ) || logic->CanUse(RG_LENS_OF_TRUTH))),
+                  LOCATION(RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST,   logic->CanUse(RG_ZELDAS_LULLABY) && (logic->CanJumpslash() || logic->CanUse(RG_HOVER_BOOTS))),
+                  LOCATION(RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST, (ctx->GetTrickOption(RT_LENS_SPIRIT_MQ) || logic->CanUse(RG_LENS_OF_TRUTH))),
                   LOCATION(RC_SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST,           logic->SmallKeys(RR_SPIRIT_TEMPLE, 5)),
                   LOCATION(RC_SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST,          logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->CanUse(RG_SONG_OF_TIME)),
-                  LOCATION(RC_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST,              logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->CanUse(RG_SONG_OF_TIME) && (logic->MirrorShield || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS)))),
+                  LOCATION(RC_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST,              logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->CanUse(RG_SONG_OF_TIME) && (logic->CanUse(RG_MIRROR_SHIELD) || (ctx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS)))),
                   LOCATION(RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST,   logic->SmallKeys(RR_SPIRIT_TEMPLE, 7)),
                   LOCATION(RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH,  logic->SmallKeys(RR_SPIRIT_TEMPLE, 7)),
   }, {
                   //Exits
-                  Entrance(RR_SPIRIT_TEMPLE_MQ_LOWER_ADULT,        {[]{return logic->MirrorShield && logic->IsAdult && (logic->CanUse(RG_FIRE_ARROWS) || (randoCtx->GetTrickOption(RT_SPIRIT_MQ_LOWER_ADULT) && logic->CanUse(RG_DINS_FIRE) && logic->Bow));}}),
-                    //Trick: logic->MirrorShield && logic->IsAdult && (logic->CanUse(RG_FIRE_ARROWS) || (LogicSpiritMQLowerAdult && logic->CanUse(RG_DINS_FIRE) && logic->Bow))
+                  Entrance(RR_SPIRIT_TEMPLE_MQ_LOWER_ADULT,        {[]{return logic->CanUse(RG_MIRROR_SHIELD) && logic->IsAdult && (logic->CanUse(RG_FIRE_ARROWS) || (ctx->GetTrickOption(RT_SPIRIT_MQ_LOWER_ADULT) && logic->CanUse(RG_DINS_FIRE) && logic->CanUse(RG_FAIRY_BOW)));}}),
+                    //Trick: logic->CanUse(RG_MIRROR_SHIELD) && logic->IsAdult && (logic->CanUse(RG_FIRE_ARROWS) || (LogicSpiritMQLowerAdult && logic->CanUse(RG_DINS_FIRE) && logic->CanUse(RG_FAIRY_BOW)))
                   Entrance(RR_SPIRIT_TEMPLE_MQ_SHARED,             {[]{return true;}}),
-                  Entrance(RR_SPIRIT_TEMPLE_MQ_BOSS_AREA,          {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 6) && logic->CanUse(RG_ZELDAS_LULLABY) && logic->Hammer;}}),
-                  Entrance(RR_SPIRIT_TEMPLE_MQ_MIRROR_SHIELD_HAND, {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->CanUse(RG_SONG_OF_TIME) && logic->CanJumpslash && (randoCtx->GetTrickOption(RT_LENS_SPIRIT_MQ) || logic->CanUse(RG_LENS_OF_TRUTH));}}),
+                  Entrance(RR_SPIRIT_TEMPLE_MQ_BOSS_AREA,          {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 6) && logic->CanUse(RG_ZELDAS_LULLABY) && logic->CanUse(RG_MEGATON_HAMMER);}}),
+                  Entrance(RR_SPIRIT_TEMPLE_MQ_MIRROR_SHIELD_HAND, {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->CanUse(RG_SONG_OF_TIME) && logic->CanJumpslash() && (ctx->GetTrickOption(RT_LENS_SPIRIT_MQ) || logic->CanUse(RG_LENS_OF_TRUTH));}}),
   });
 
   areaTable[RR_SPIRIT_TEMPLE_MQ_SHARED] = Region("Spirit Temple MQ Shared", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST, logic->SmallKeys(RR_SPIRIT_TEMPLE, 6)),
-                  LOCATION(RC_SPIRIT_TEMPLE_MQ_COMPASS_CHEST,           (logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT) && logic->SmallKeys(RR_SPIRIT_TEMPLE, 7)) || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW)) || (logic->Bow && logic->Slingshot)),
-                  LOCATION(RC_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST,    logic->CanUse(RG_SONG_OF_TIME) || randoCtx->GetTrickOption(RT_SPIRIT_MQ_SUN_BLOCK_SOT) || logic->IsAdult),
+                  LOCATION(RC_SPIRIT_TEMPLE_MQ_COMPASS_CHEST,           (logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT) && logic->SmallKeys(RR_SPIRIT_TEMPLE, 7)) || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW)) || (logic->CanUse(RG_FAIRY_BOW) && logic->CanUse(RG_FAIRY_SLINGSHOT))),
+                  LOCATION(RC_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST,    logic->CanUse(RG_SONG_OF_TIME) || ctx->GetTrickOption(RT_SPIRIT_MQ_SUN_BLOCK_SOT) || logic->IsAdult),
                     //Trick: logic->CanUse(RG_SONG_OF_TIME) || LogicSpiritMQSunBlockSoT || logic->IsAdult
-                  LOCATION(RC_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM,       (randoCtx->GetTrickOption(RT_SPIRIT_MQ_SUN_BLOCK_GS) && logic->Boomerang && (logic->CanUse(RG_SONG_OF_TIME) || randoCtx->GetTrickOption(RT_SPIRIT_MQ_SUN_BLOCK_SOT))) || logic->IsAdult),
-                    //Trick: (LogicSpiritMQSunBlockGS && logic->Boomerang && (logic->CanUse(RG_SONG_OF_TIME) || LogicSpiritMQSunBlockSoT)) || logic->IsAdult
+                  LOCATION(RC_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM,       (ctx->GetTrickOption(RT_SPIRIT_MQ_SUN_BLOCK_GS) && logic->CanUse(RG_BOOMERANG) && (logic->CanUse(RG_SONG_OF_TIME) || ctx->GetTrickOption(RT_SPIRIT_MQ_SUN_BLOCK_SOT))) || logic->IsAdult),
+                    //Trick: (LogicSpiritMQSunBlockGS && logic->CanUse(RG_BOOMERANG) && (logic->CanUse(RG_SONG_OF_TIME) || LogicSpiritMQSunBlockSoT)) || logic->IsAdult
    }, {
                   //Exits
-                  Entrance(RR_SPIRIT_TEMPLE_MQ_SILVER_GAUNTLETS_HAND, {[]{return (logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && (logic->CanUse(RG_SONG_OF_TIME) || randoCtx->GetTrickOption(RT_SPIRIT_MQ_SUN_BLOCK_SOT) || logic->IsAdult)) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 4) && logic->CanUse(RG_SONG_OF_TIME) && logic->CanJumpslash && (randoCtx->GetTrickOption(RT_LENS_SPIRIT_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)));}}),
+                  Entrance(RR_SPIRIT_TEMPLE_MQ_SILVER_GAUNTLETS_HAND, {[]{return (logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && (logic->CanUse(RG_SONG_OF_TIME) || ctx->GetTrickOption(RT_SPIRIT_MQ_SUN_BLOCK_SOT) || logic->IsAdult)) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 4) && logic->CanUse(RG_SONG_OF_TIME) && logic->CanJumpslash() && (ctx->GetTrickOption(RT_LENS_SPIRIT_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)));}}),
                     //Trick: (logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && (logic->CanUse(RG_SONG_OF_TIME) || LogicSpiritMQSunBlockSoT || logic->IsAdult)) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 4) && logic->CanUse(RG_SONG_OF_TIME) && (LogicLensSpiritMQ || logic->CanUse(RG_LENS_OF_TRUTH)))
-                  Entrance(RR_DESERT_COLOSSUS,                        {[]{return (logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && (logic->CanUse(RG_SONG_OF_TIME) || randoCtx->GetTrickOption(RT_SPIRIT_MQ_SUN_BLOCK_SOT) || logic->IsAdult)) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 4) && logic->CanUse(RG_SONG_OF_TIME) && logic->CanJumpslash && (randoCtx->GetTrickOption(RT_LENS_SPIRIT_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->IsAdult);}}),
+                  Entrance(RR_DESERT_COLOSSUS,                        {[]{return (logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && (logic->CanUse(RG_SONG_OF_TIME) || ctx->GetTrickOption(RT_SPIRIT_MQ_SUN_BLOCK_SOT) || logic->IsAdult)) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 4) && logic->CanUse(RG_SONG_OF_TIME) && logic->CanJumpslash() && (ctx->GetTrickOption(RT_LENS_SPIRIT_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->IsAdult);}}),
                     //Trick: (logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && (logic->CanUse(RG_SONG_OF_TIME) || LogicSpiritMQSunBlockSoT || logic->IsAdult)) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 4) && logic->CanUse(RG_SONG_OF_TIME) && (LogicLensSpiritMQ || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->IsAdult)
   });
 
   areaTable[RR_SPIRIT_TEMPLE_MQ_LOWER_ADULT] = Region("Spirit Temple MQ Lower Adult", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST,          true),
-                  LOCATION(RC_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST,        logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && logic->Hammer && logic->CanUse(RG_SONG_OF_TIME) && logic->CanUse(RG_EPONAS_SONG) && logic->CanUse(RG_SUNS_SONG)
+                  LOCATION(RC_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST,        logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && logic->CanUse(RG_MEGATON_HAMMER) && logic->CanUse(RG_SONG_OF_TIME) && logic->CanUse(RG_EPONAS_SONG) && logic->CanUse(RG_SUNS_SONG)
                                                                            && logic->CanUse(RG_SONG_OF_STORMS) && logic->CanUse(RG_ZELDAS_LULLABY)),
-                  LOCATION(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST, logic->Hammer),
+                  LOCATION(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST, logic->CanUse(RG_MEGATON_HAMMER)),
                   LOCATION(RC_SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM,             true),
-                  LOCATION(RC_SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM,           logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && logic->Hammer && logic->CanUse(RG_SONG_OF_TIME) && logic->CanUse(RG_EPONAS_SONG) && logic->CanUse(RG_SUNS_SONG)
+                  LOCATION(RC_SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM,           logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && logic->CanUse(RG_MEGATON_HAMMER) && logic->CanUse(RG_SONG_OF_TIME) && logic->CanUse(RG_EPONAS_SONG) && logic->CanUse(RG_SUNS_SONG)
                                                                            && logic->CanUse(RG_SONG_OF_STORMS) && logic->CanUse(RG_ZELDAS_LULLABY)),
   }, {});
 
   areaTable[RR_SPIRIT_TEMPLE_MQ_BOSS_AREA] = Region("Spirit Temple MQ Boss Region", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST, randoCtx->GetTrickOption(RT_LENS_SPIRIT_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)),
+                  LOCATION(RC_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST, ctx->GetTrickOption(RT_LENS_SPIRIT_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)),
   }, {
                   //Exits
-                  Entrance(RR_SPIRIT_TEMPLE_MQ_INSIDE_STATUE_HEAD, {[]{return logic->MirrorShield && logic->Hookshot;}}),
+                  Entrance(RR_SPIRIT_TEMPLE_MQ_INSIDE_STATUE_HEAD, {[]{return logic->CanUse(RG_MIRROR_SHIELD) && logic->CanUse(RG_HOOKSHOT);}}),
   });
 
   areaTable[RR_SPIRIT_TEMPLE_MQ_INSIDE_STATUE_HEAD] =
@@ -221,7 +221,7 @@ void RegionTable_Init_SpiritTemple() {
                  {
                      // Exits
                      Entrance(RR_SPIRIT_TEMPLE_MQ_SHARED, { [] { return true; } }),
-                     Entrance(RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY, { [] { return logic->BossKeySpiritTemple; } }),
+                     Entrance(RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY, { [] { return logic->HasItem(RG_SPIRIT_TEMPLE_BOSS_KEY); } }),
                  });
 
   areaTable[RR_SPIRIT_TEMPLE_MQ_MIRROR_SHIELD_HAND] = Region("Spirit Temple MQ Mirror Shield Hand", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -242,8 +242,8 @@ void RegionTable_Init_SpiritTemple() {
         "Spirit Temple Boss Entryway", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
         {
             // Exits
-            Entrance(RR_SPIRIT_TEMPLE_INSIDE_STATUE_HEAD, { [] { return randoCtx->GetDungeon(SPIRIT_TEMPLE)->IsVanilla() && false; } }),
-            Entrance(RR_SPIRIT_TEMPLE_MQ_INSIDE_STATUE_HEAD, { [] { return randoCtx->GetDungeon(SPIRIT_TEMPLE)->IsMQ() && false; } }),
+            Entrance(RR_SPIRIT_TEMPLE_INSIDE_STATUE_HEAD, { [] { return ctx->GetDungeon(SPIRIT_TEMPLE)->IsVanilla() && false; } }),
+            Entrance(RR_SPIRIT_TEMPLE_MQ_INSIDE_STATUE_HEAD, { [] { return ctx->GetDungeon(SPIRIT_TEMPLE)->IsMQ() && false; } }),
             Entrance(RR_SPIRIT_TEMPLE_BOSS_ROOM, { [] { return true; } }),
         });
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp
index 67c06b2dc..3ed223db9 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp
@@ -10,29 +10,29 @@ void RegionTable_Init_WaterTemple() {
   ---------------------------*/
   areaTable[RR_WATER_TEMPLE_ENTRYWAY] = Region("Water Temple Entryway", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_WATER_TEMPLE_LOBBY,    {[]{return logic->Swim && randoCtx->GetDungeon(WATER_TEMPLE)->IsVanilla();}}),
-                  Entrance(RR_WATER_TEMPLE_MQ_LOBBY, {[]{return logic->Swim && randoCtx->GetDungeon(WATER_TEMPLE)->IsMQ();}}),
+                  Entrance(RR_WATER_TEMPLE_LOBBY,    {[]{return logic->HasItem(RG_BRONZE_SCALE) && ctx->GetDungeon(WATER_TEMPLE)->IsVanilla();}}),
+                  Entrance(RR_WATER_TEMPLE_MQ_LOBBY, {[]{return logic->HasItem(RG_BRONZE_SCALE) && ctx->GetDungeon(WATER_TEMPLE)->IsMQ();}}),
                   Entrance(RR_LAKE_HYLIA,            {[]{return true;}}),
   });
 
   /*--------------------------
   |     VANILLA DUNGEON      |
   ---------------------------*/
-  if (randoCtx->GetDungeon(WATER_TEMPLE)->IsVanilla()) {
+  if (ctx->GetDungeon(WATER_TEMPLE)->IsVanilla()) {
   //Water Temple logic currently assumes that the locked door leading to the upper water raising location is unlocked from the start
   areaTable[RR_WATER_TEMPLE_LOBBY] = Region("Water Temple Lobby", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_ENTRYWAY,              {[]{return true;}}),
-                  Entrance(RR_WATER_TEMPLE_EAST_LOWER,            {[]{return logic->WaterTempleLow || ((randoCtx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS) || logic->CanUse(RG_ZORA_TUNIC)) && (logic->CanUse(RG_IRON_BOOTS) || (logic->CanUse(RG_LONGSHOT) && randoCtx->GetTrickOption(RT_WATER_LONGSHOT_TORCH))));}}),
-                  Entrance(RR_WATER_TEMPLE_NORTH_LOWER,           {[]{return logic->WaterTempleLow || ((randoCtx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS) || logic->CanUse(RG_ZORA_TUNIC)) && logic->CanUse(RG_IRON_BOOTS));}}),
-                  Entrance(RR_WATER_TEMPLE_SOUTH_LOWER,           {[]{return logic->WaterTempleLow && logic->HasExplosives && (logic->CanDive || logic->CanUse(RG_IRON_BOOTS)) && (randoCtx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS) || logic->CanUse(RG_ZORA_TUNIC));}}),
-                  Entrance(RR_WATER_TEMPLE_WEST_LOWER,            {[]{return logic->WaterTempleLow && logic->GoronBracelet && (logic->IsChild || logic->CanDive || logic->CanUse(RG_IRON_BOOTS)) && (randoCtx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS) || logic->CanUse(RG_ZORA_TUNIC));}}),
+                  Entrance(RR_WATER_TEMPLE_EAST_LOWER,            {[]{return logic->WaterTempleLow || ((ctx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS) || logic->CanUse(RG_ZORA_TUNIC)) && (logic->CanUse(RG_IRON_BOOTS) || (logic->CanUse(RG_LONGSHOT) && ctx->GetTrickOption(RT_WATER_LONGSHOT_TORCH))));}}),
+                  Entrance(RR_WATER_TEMPLE_NORTH_LOWER,           {[]{return logic->WaterTempleLow || ((ctx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS) || logic->CanUse(RG_ZORA_TUNIC)) && logic->CanUse(RG_IRON_BOOTS));}}),
+                  Entrance(RR_WATER_TEMPLE_SOUTH_LOWER,           {[]{return logic->WaterTempleLow && logic->HasExplosives() && (logic->HasItem(RG_SILVER_SCALE) || logic->CanUse(RG_IRON_BOOTS)) && (ctx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS) || logic->CanUse(RG_ZORA_TUNIC));}}),
+                  Entrance(RR_WATER_TEMPLE_WEST_LOWER,            {[]{return logic->WaterTempleLow && logic->HasItem(RG_GORONS_BRACELET) && (logic->IsChild || logic->HasItem(RG_SILVER_SCALE) || logic->CanUse(RG_IRON_BOOTS)) && (ctx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS) || logic->CanUse(RG_ZORA_TUNIC));}}),
                   Entrance(RR_WATER_TEMPLE_CENTRAL_PILLAR_LOWER,  {[]{return logic->WaterTempleLow && logic->SmallKeys(RR_WATER_TEMPLE, 5);}}),
-                  Entrance(RR_WATER_TEMPLE_CENTRAL_PILLAR_UPPER,  {[]{return (logic->WaterTempleLow || logic->WaterTempleMiddle) && (logic->HasFireSourceWithTorch || logic->CanUse(RG_FAIRY_BOW));}}),
-                  Entrance(RR_WATER_TEMPLE_EAST_MIDDLE,           {[]{return (logic->WaterTempleLow || logic->WaterTempleMiddle || (logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer >= 16)) && logic->CanUse(RG_HOOKSHOT);}}),
+                  Entrance(RR_WATER_TEMPLE_CENTRAL_PILLAR_UPPER,  {[]{return (logic->WaterTempleLow || logic->WaterTempleMiddle) && (logic->HasFireSourceWithTorch() || logic->CanUse(RG_FAIRY_BOW));}}),
+                  Entrance(RR_WATER_TEMPLE_EAST_MIDDLE,           {[]{return (logic->WaterTempleLow || logic->WaterTempleMiddle || (logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 16)) && logic->CanUse(RG_HOOKSHOT);}}),
                   Entrance(RR_WATER_TEMPLE_WEST_MIDDLE,           {[]{return logic->WaterTempleMiddle;}}),
-                  Entrance(RR_WATER_TEMPLE_HIGH_WATER,            {[]{return logic->IsAdult && (logic->CanUse(RG_HOVER_BOOTS) || (randoCtx->GetTrickOption(RT_DAMAGE_BOOST) && logic->Bombs && logic->CanTakeDamage));}}),
-                  Entrance(RR_WATER_TEMPLE_BLOCK_CORRIDOR,        {[]{return (logic->WaterTempleLow || logic->WaterTempleMiddle) && (logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW)) && (logic->CanUse(RG_LONGSHOT) || logic->CanUse(RG_HOVER_BOOTS) || (randoCtx->GetTrickOption(RT_WATER_CENTRAL_BOW) && (logic->IsAdult || logic->WaterTempleMiddle)));}}),
+                  Entrance(RR_WATER_TEMPLE_HIGH_WATER,            {[]{return logic->IsAdult && (logic->CanUse(RG_HOVER_BOOTS) || (ctx->GetTrickOption(RT_DAMAGE_BOOST) && logic->CanUse(RG_BOMB_BAG) && logic->TakeDamage()));}}),
+                  Entrance(RR_WATER_TEMPLE_BLOCK_CORRIDOR,        {[]{return (logic->WaterTempleLow || logic->WaterTempleMiddle) && (logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW)) && (logic->CanUse(RG_LONGSHOT) || logic->CanUse(RG_HOVER_BOOTS) || (ctx->GetTrickOption(RT_WATER_CENTRAL_BOW) && (logic->IsAdult || logic->WaterTempleMiddle)));}}),
                   Entrance(RR_WATER_TEMPLE_FALLING_PLATFORM_ROOM, {[]{return logic->WaterTempleHigh && logic->SmallKeys(RR_WATER_TEMPLE, 4);}}),
                   Entrance(RR_WATER_TEMPLE_PRE_BOSS_ROOM,         {[]{return logic->WaterTempleHigh && logic->CanUse(RG_LONGSHOT);}}),
   });
@@ -42,23 +42,23 @@ void RegionTable_Init_WaterTemple() {
                   EventAccess(&logic->WaterTempleLow, {[]{return logic->WaterTempleLow || logic->CanUse(RG_ZELDAS_LULLABY);}}),
                 }, {}, {
                   //Exits
-                  Entrance(RR_WATER_TEMPLE_LOBBY,        {[]{return logic->WaterTempleLow || ((randoCtx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS) || logic->CanUse(RG_ZORA_TUNIC)) && logic->CanUse(RG_IRON_BOOTS));}}),
+                  Entrance(RR_WATER_TEMPLE_LOBBY,        {[]{return logic->WaterTempleLow || ((ctx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS) || logic->CanUse(RG_ZORA_TUNIC)) && logic->CanUse(RG_IRON_BOOTS));}}),
                   Entrance(RR_WATER_TEMPLE_MAP_ROOM,     {[]{return logic->WaterTempleHigh;}}),
-                  Entrance(RR_WATER_TEMPLE_CRACKED_WALL, {[]{return logic->WaterTempleMiddle || (logic->WaterTempleHigh && logic->WaterTempleLow && ((logic->CanUse(RG_HOVER_BOOTS) && randoCtx->GetTrickOption(RT_WATER_CRACKED_WALL_HOVERS)) || randoCtx->GetTrickOption(RT_WATER_CRACKED_WALL)));}}),
-                  Entrance(RR_WATER_TEMPLE_TORCH_ROOM,   {[]{return logic->WaterTempleLow && (logic->HasFireSourceWithTorch || logic->CanUse(RG_FAIRY_BOW));}}),
+                  Entrance(RR_WATER_TEMPLE_CRACKED_WALL, {[]{return logic->WaterTempleMiddle || (logic->WaterTempleHigh && logic->WaterTempleLow && ((logic->CanUse(RG_HOVER_BOOTS) && ctx->GetTrickOption(RT_WATER_CRACKED_WALL_HOVERS)) || ctx->GetTrickOption(RT_WATER_CRACKED_WALL)));}}),
+                  Entrance(RR_WATER_TEMPLE_TORCH_ROOM,   {[]{return logic->WaterTempleLow && (logic->HasFireSourceWithTorch() || logic->CanUse(RG_FAIRY_BOW));}}),
   });
 
   areaTable[RR_WATER_TEMPLE_MAP_ROOM] = Region("Water Temple Map Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_WATER_TEMPLE_MAP_CHEST, (logic->MagicMeter && logic->CanUse(RG_KOKIRI_SWORD)) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_HOOKSHOT)),
+                  LOCATION(RC_WATER_TEMPLE_MAP_CHEST, (logic->CanUse(RG_MAGIC_SINGLE) && logic->CanUse(RG_KOKIRI_SWORD)) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_HOOKSHOT)),
                 }, {
                   //Exits
-                  Entrance(RR_WATER_TEMPLE_EAST_LOWER, {[]{return (logic->MagicMeter && logic->CanUse(RG_KOKIRI_SWORD)) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_HOOKSHOT);}}),
+                  Entrance(RR_WATER_TEMPLE_EAST_LOWER, {[]{return (logic->CanUse(RG_MAGIC_SINGLE) && logic->CanUse(RG_KOKIRI_SWORD)) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_HOOKSHOT);}}),
   });
 
   areaTable[RR_WATER_TEMPLE_CRACKED_WALL] = Region("Water Temple Cracked Wall", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_WATER_TEMPLE_CRACKED_WALL_CHEST, logic->HasExplosives),
+                  LOCATION(RC_WATER_TEMPLE_CRACKED_WALL_CHEST, logic->HasExplosives()),
                 }, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_EAST_LOWER, {[]{return true;}}),
@@ -66,32 +66,32 @@ void RegionTable_Init_WaterTemple() {
 
   areaTable[RR_WATER_TEMPLE_TORCH_ROOM] = Region("Water Temple Torch Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_WATER_TEMPLE_TORCHES_CHEST, (logic->MagicMeter && logic->CanUse(RG_KOKIRI_SWORD)) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_HOOKSHOT)),
+                  LOCATION(RC_WATER_TEMPLE_TORCHES_CHEST, (logic->CanUse(RG_MAGIC_SINGLE) && logic->CanUse(RG_KOKIRI_SWORD)) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_HOOKSHOT)),
                 }, {
                   //Exits
-                  Entrance(RR_WATER_TEMPLE_EAST_LOWER, {[]{return (logic->MagicMeter && logic->CanUse(RG_KOKIRI_SWORD)) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_HOOKSHOT);}}),
+                  Entrance(RR_WATER_TEMPLE_EAST_LOWER, {[]{return (logic->CanUse(RG_MAGIC_SINGLE) && logic->CanUse(RG_KOKIRI_SWORD)) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_HOOKSHOT);}}),
   });
 
   areaTable[RR_WATER_TEMPLE_NORTH_LOWER] = Region("Water Temple North Lower", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_LOBBY,          {[]{return true;}}),
-                  Entrance(RR_WATER_TEMPLE_BOULDERS_LOWER, {[]{return (logic->CanUse(RG_LONGSHOT) || (randoCtx->GetTrickOption(RT_WATER_BK_REGION) && logic->CanUse(RG_HOVER_BOOTS))) && logic->SmallKeys(RR_WATER_TEMPLE, 4);}}),
+                  Entrance(RR_WATER_TEMPLE_BOULDERS_LOWER, {[]{return (logic->CanUse(RG_LONGSHOT) || (ctx->GetTrickOption(RT_WATER_BK_REGION) && logic->CanUse(RG_HOVER_BOOTS))) && logic->SmallKeys(RR_WATER_TEMPLE, 4);}}),
   });
 
   areaTable[RR_WATER_TEMPLE_BOULDERS_LOWER] = Region("Water Temple Boulders Lower", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST, logic->CanUse(RG_LONGSHOT) || Here(RR_WATER_TEMPLE_BOULDERS_UPPER, []{return (logic->IsAdult && logic->HookshotOrBoomerang) || (logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_HOOKSHOT));})),
+                  LOCATION(RC_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST, logic->CanUse(RG_LONGSHOT) || Here(RR_WATER_TEMPLE_BOULDERS_UPPER, []{return (logic->IsAdult && logic->HookshotOrBoomerang()) || (logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_HOOKSHOT));})),
                 }, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_NORTH_LOWER,    {[]{return logic->SmallKeys(RR_WATER_TEMPLE, 4);}}),
                   Entrance(RR_WATER_TEMPLE_BLOCK_ROOM,     {[]{return true;}}),
-                  Entrance(RR_WATER_TEMPLE_BOULDERS_UPPER, {[]{return (logic->IsAdult && (logic->CanUse(RG_HOVER_BOOTS) || randoCtx->GetTrickOption(RT_WATER_NORTH_BASEMENT_LEDGE_JUMP))) || (logic->CanUse(RG_HOVER_BOOTS) && logic->CanUse(RG_IRON_BOOTS));}}),
+                  Entrance(RR_WATER_TEMPLE_BOULDERS_UPPER, {[]{return (logic->IsAdult && (logic->CanUse(RG_HOVER_BOOTS) || ctx->GetTrickOption(RT_WATER_NORTH_BASEMENT_LEDGE_JUMP))) || (logic->CanUse(RG_HOVER_BOOTS) && logic->CanUse(RG_IRON_BOOTS));}}),
   });
 
   areaTable[RR_WATER_TEMPLE_BLOCK_ROOM] = Region("Water Temple Block Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_WATER_TEMPLE_BOULDERS_LOWER, {[]{return (logic->GoronBracelet && logic->HasExplosives) || logic->CanUse(RG_HOOKSHOT);}}),
-                  Entrance(RR_WATER_TEMPLE_JETS_ROOM,      {[]{return (logic->GoronBracelet && logic->HasExplosives) || (logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_HOVER_BOOTS));}}),
+                  Entrance(RR_WATER_TEMPLE_BOULDERS_LOWER, {[]{return (logic->HasItem(RG_GORONS_BRACELET) && logic->HasExplosives()) || logic->CanUse(RG_HOOKSHOT);}}),
+                  Entrance(RR_WATER_TEMPLE_JETS_ROOM,      {[]{return (logic->HasItem(RG_GORONS_BRACELET) && logic->HasExplosives()) || (logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_HOVER_BOOTS));}}),
   });
 
   areaTable[RR_WATER_TEMPLE_JETS_ROOM] = Region("Water Temple Jets Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
@@ -104,7 +104,7 @@ void RegionTable_Init_WaterTemple() {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_BOULDERS_LOWER, {[]{return true;}}),
                   Entrance(RR_WATER_TEMPLE_JETS_ROOM,      {[]{return logic->IsAdult;}}),
-                  Entrance(RR_WATER_TEMPLE_BOSS_KEY_ROOM,  {[]{return (logic->CanUse(RG_IRON_BOOTS) || (logic->IsAdult && randoCtx->GetTrickOption(RT_WATER_BK_JUMP_DIVE))) && logic->SmallKeys(RR_WATER_TEMPLE, 5);}}),
+                  Entrance(RR_WATER_TEMPLE_BOSS_KEY_ROOM,  {[]{return (logic->CanUse(RG_IRON_BOOTS) || (logic->IsAdult && ctx->GetTrickOption(RT_WATER_BK_JUMP_DIVE))) && logic->SmallKeys(RR_WATER_TEMPLE, 5);}}),
   });
 
   areaTable[RR_WATER_TEMPLE_BOSS_KEY_ROOM] = Region("Water Temple Boss Key Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
@@ -115,12 +115,12 @@ void RegionTable_Init_WaterTemple() {
                   LOCATION(RC_WATER_TEMPLE_BOSS_KEY_CHEST, true),
                 }, {
                   //Exits
-                  Entrance(RR_WATER_TEMPLE_BOULDERS_UPPER, {[]{return (logic->CanUse(RG_IRON_BOOTS) || (logic->IsAdult && randoCtx->GetTrickOption(RT_WATER_BK_JUMP_DIVE)) || logic->IsChild || logic->CanDive) && logic->SmallKeys(RR_WATER_TEMPLE, 5);}}),
+                  Entrance(RR_WATER_TEMPLE_BOULDERS_UPPER, {[]{return (logic->CanUse(RG_IRON_BOOTS) || (logic->IsAdult && ctx->GetTrickOption(RT_WATER_BK_JUMP_DIVE)) || logic->IsChild || logic->HasItem(RG_SILVER_SCALE)) && logic->SmallKeys(RR_WATER_TEMPLE, 5);}}),
   });
 
   areaTable[RR_WATER_TEMPLE_SOUTH_LOWER] = Region("Water Temple South Lower", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_WATER_TEMPLE_GS_BEHIND_GATE, (logic->CanJumpslash || logic->CanUse(RG_MEGATON_HAMMER)) && (logic->CanUse(RG_HOOKSHOT) || (logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS)))),
+                  LOCATION(RC_WATER_TEMPLE_GS_BEHIND_GATE, (logic->CanJumpslash() || logic->CanUse(RG_MEGATON_HAMMER)) && (logic->CanUse(RG_HOOKSHOT) || (logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS)))),
                 }, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_LOBBY, {[]{return logic->CanUse(RG_IRON_BOOTS);}}),
@@ -128,14 +128,14 @@ void RegionTable_Init_WaterTemple() {
 
   areaTable[RR_WATER_TEMPLE_WEST_LOWER] = Region("Water Temple West Lower", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_WATER_TEMPLE_LOBBY,       {[]{return logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_IRON_BOOTS) && logic->GoronBracelet;}}),
-                  Entrance(RR_WATER_TEMPLE_DRAGON_ROOM, {[]{return logic->CanJumpslash || logic->CanUseProjectile;}}),
+                  Entrance(RR_WATER_TEMPLE_LOBBY,       {[]{return logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_IRON_BOOTS) && logic->HasItem(RG_GORONS_BRACELET);}}),
+                  Entrance(RR_WATER_TEMPLE_DRAGON_ROOM, {[]{return logic->CanJumpslash() || logic->CanUseProjectile();}}),
   });
 
   areaTable[RR_WATER_TEMPLE_DRAGON_ROOM] = Region("Water Temple Dragon Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_WATER_TEMPLE_DRAGON_CHEST, (logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_IRON_BOOTS)) || (((logic->IsAdult && randoCtx->GetTrickOption(RT_WATER_ADULT_DRAGON) && (logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_BOMBCHU_5))) || (logic->IsChild && randoCtx->GetTrickOption(RT_WATER_CHILD_DRAGON) && (logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG) || logic->CanUse(RG_BOMBCHU_5)))) && (logic->CanDive || logic->CanUse(RG_IRON_BOOTS))) ||
-                                                                       Here(RR_WATER_TEMPLE_RIVER, []{return logic->IsAdult && logic->CanUse(RG_FAIRY_BOW) && ((randoCtx->GetTrickOption(RT_WATER_ADULT_DRAGON) && (logic->CanDive || logic->CanUse(RG_IRON_BOOTS))) || randoCtx->GetTrickOption(RT_WATER_DRAGON_JUMP_DIVE));})),
+                  LOCATION(RC_WATER_TEMPLE_DRAGON_CHEST, (logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_IRON_BOOTS)) || (((logic->IsAdult && ctx->GetTrickOption(RT_WATER_ADULT_DRAGON) && (logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_BOMBCHU_5))) || (logic->IsChild && ctx->GetTrickOption(RT_WATER_CHILD_DRAGON) && (logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG) || logic->CanUse(RG_BOMBCHU_5)))) && (logic->HasItem(RG_SILVER_SCALE) || logic->CanUse(RG_IRON_BOOTS))) ||
+                                                                       Here(RR_WATER_TEMPLE_RIVER, []{return logic->IsAdult && logic->CanUse(RG_FAIRY_BOW) && ((ctx->GetTrickOption(RT_WATER_ADULT_DRAGON) && (logic->HasItem(RG_SILVER_SCALE) || logic->CanUse(RG_IRON_BOOTS))) || ctx->GetTrickOption(RT_WATER_DRAGON_JUMP_DIVE));})),
                 }, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_WEST_LOWER, {[]{return true;}}),
@@ -145,7 +145,7 @@ void RegionTable_Init_WaterTemple() {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_LOBBY,                   {[]{return logic->SmallKeys(RR_WATER_TEMPLE, 5);}}),
                   Entrance(RR_WATER_TEMPLE_CENTRAL_PILLAR_UPPER,    {[]{return logic->CanUse(RG_HOOKSHOT);}}),
-                  Entrance(RR_WATER_TEMPLE_CENTRAL_PILLAR_BASEMENT, {[]{return logic->WaterTempleMiddle && logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer >= 40;}}),
+                  Entrance(RR_WATER_TEMPLE_CENTRAL_PILLAR_BASEMENT, {[]{return logic->WaterTempleMiddle && logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 40;}}),
   });
 
   areaTable[RR_WATER_TEMPLE_CENTRAL_PILLAR_UPPER] = Region("Water Temple Central Pillar Upper", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
@@ -153,7 +153,7 @@ void RegionTable_Init_WaterTemple() {
                   EventAccess(&logic->WaterTempleMiddle, {[]{return logic->WaterTempleMiddle || logic->CanUse(RG_ZELDAS_LULLABY);}}),
                 }, {
                   //Locations
-                  LOCATION(RC_WATER_TEMPLE_GS_CENTRAL_PILLAR, logic->CanUse(RG_LONGSHOT) || (((randoCtx->GetTrickOption(RT_WATER_FW_CENTRAL_GS) && logic->CanUse(RG_FARORES_WIND) && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_DINS_FIRE) || logic->SmallKeys(RR_WATER_TEMPLE, 5))) || (randoCtx->GetTrickOption(RT_WATER_IRONS_CENTRAL_GS) && logic->CanUse(RG_IRON_BOOTS) && ((logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_FAIRY_BOW)) || (logic->CanUse(RG_DINS_FIRE))))) && logic->WaterTempleHigh && logic->HookshotOrBoomerang)),
+                  LOCATION(RC_WATER_TEMPLE_GS_CENTRAL_PILLAR, logic->CanUse(RG_LONGSHOT) || (((ctx->GetTrickOption(RT_WATER_FW_CENTRAL_GS) && logic->CanUse(RG_FARORES_WIND) && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_DINS_FIRE) || logic->SmallKeys(RR_WATER_TEMPLE, 5))) || (ctx->GetTrickOption(RT_WATER_IRONS_CENTRAL_GS) && logic->CanUse(RG_IRON_BOOTS) && ((logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_FAIRY_BOW)) || (logic->CanUse(RG_DINS_FIRE))))) && logic->WaterTempleHigh && logic->HookshotOrBoomerang())),
                 }, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_LOBBY,                {[]{return true;}}),
@@ -162,15 +162,15 @@ void RegionTable_Init_WaterTemple() {
 
   areaTable[RR_WATER_TEMPLE_CENTRAL_PILLAR_BASEMENT] = Region("Water Temple Central Pillar Basement", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_WATER_TEMPLE_CENTRAL_PILLAR_CHEST, logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer >= 40),
+                  LOCATION(RC_WATER_TEMPLE_CENTRAL_PILLAR_CHEST, logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 40),
                 }, {
                   //Exits
-                  Entrance(RR_WATER_TEMPLE_CENTRAL_PILLAR_LOWER, {[]{return logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer >= 16;}}),
+                  Entrance(RR_WATER_TEMPLE_CENTRAL_PILLAR_LOWER, {[]{return logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 16;}}),
   });
 
   areaTable[RR_WATER_TEMPLE_EAST_MIDDLE] = Region("Water Temple East Middle", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_WATER_TEMPLE_COMPASS_CHEST, logic->CanUseProjectile),
+                  LOCATION(RC_WATER_TEMPLE_COMPASS_CHEST, logic->CanUseProjectile()),
                 }, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_LOBBY, {[]{return logic->CanUse(RG_IRON_BOOTS);}}),
@@ -179,7 +179,7 @@ void RegionTable_Init_WaterTemple() {
   areaTable[RR_WATER_TEMPLE_WEST_MIDDLE] = Region("Water Temple West Middle", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_LOBBY,      {[]{return true;}}),
-                  Entrance(RR_WATER_TEMPLE_HIGH_WATER, {[]{return logic->CanUseProjectile;}}),
+                  Entrance(RR_WATER_TEMPLE_HIGH_WATER, {[]{return logic->CanUseProjectile();}}),
   });
 
   areaTable[RR_WATER_TEMPLE_HIGH_WATER] = Region("Water Temple High Water", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
@@ -192,7 +192,7 @@ void RegionTable_Init_WaterTemple() {
 
   areaTable[RR_WATER_TEMPLE_BLOCK_CORRIDOR] = Region("Water Temple Block Corridor", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST, logic->GoronBracelet && (logic->WaterTempleLow || logic->WaterTempleMiddle)),
+                  LOCATION(RC_WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST, logic->HasItem(RG_GORONS_BRACELET) && (logic->WaterTempleLow || logic->WaterTempleMiddle)),
                 }, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_LOBBY, {[]{return logic->CanUse(RG_HOOKSHOT);}}),
@@ -200,7 +200,7 @@ void RegionTable_Init_WaterTemple() {
 
   areaTable[RR_WATER_TEMPLE_FALLING_PLATFORM_ROOM] = Region("Water Temple Falling Platform Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM, logic->CanUse(RG_LONGSHOT) || (randoCtx->GetTrickOption(RT_WATER_RANG_FALLING_PLATFORM_GS) && logic->IsChild && logic->CanUse(RG_BOOMERANG)) || (randoCtx->GetTrickOption(RT_WATER_HOOKSHOT_FALLING_PLATFORM_GS) && logic->IsAdult && logic->CanUse(RG_HOOKSHOT))),
+                  LOCATION(RC_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM, logic->CanUse(RG_LONGSHOT) || (ctx->GetTrickOption(RT_WATER_RANG_FALLING_PLATFORM_GS) && logic->IsChild && logic->CanUse(RG_BOOMERANG)) || (ctx->GetTrickOption(RT_WATER_HOOKSHOT_FALLING_PLATFORM_GS) && logic->IsAdult && logic->CanUse(RG_HOOKSHOT))),
                 }, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_LOBBY,               {[]{return logic->CanUse(RG_HOOKSHOT) && logic->SmallKeys(RR_WATER_TEMPLE, 4);}}),
@@ -209,7 +209,7 @@ void RegionTable_Init_WaterTemple() {
 
   areaTable[RR_WATER_TEMPLE_DRAGON_PILLARS_ROOM] = Region("Water Temple Dragon Pillars Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_WATER_TEMPLE_FALLING_PLATFORM_ROOM, {[]{return logic->CanUseProjectile;}}),
+                  Entrance(RR_WATER_TEMPLE_FALLING_PLATFORM_ROOM, {[]{return logic->CanUseProjectile();}}),
                   Entrance(RR_WATER_TEMPLE_DARK_LINK_ROOM,        {[]{return logic->CanUse(RG_HOOKSHOT);}}),
   });
 
@@ -231,7 +231,7 @@ void RegionTable_Init_WaterTemple() {
   areaTable[RR_WATER_TEMPLE_RIVER] = Region("Water Temple River", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_WATER_TEMPLE_RIVER_CHEST, (logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW)) && (logic->IsAdult || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT))),
-                  LOCATION(RC_WATER_TEMPLE_GS_RIVER,    (logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_HOOKSHOT)) || (randoCtx->GetTrickOption(RT_WATER_RIVER_GS) && logic->CanUse(RG_LONGSHOT))),
+                  LOCATION(RC_WATER_TEMPLE_GS_RIVER,    (logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_HOOKSHOT)) || (ctx->GetTrickOption(RT_WATER_RIVER_GS) && logic->CanUse(RG_LONGSHOT))),
                 }, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_DRAGON_ROOM, {[]{return (logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW)) && (logic->IsAdult || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT));}}),
@@ -243,26 +243,26 @@ void RegionTable_Init_WaterTemple() {
                 }, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_LOBBY,     {[]{return true;}}),
-                  Entrance(RR_WATER_TEMPLE_BOSS_ENTRYWAY, {[]{return logic->BossKeyWaterTemple;}}),
+                  Entrance(RR_WATER_TEMPLE_BOSS_ENTRYWAY, {[]{return logic->HasItem(RG_WATER_TEMPLE_BOSS_KEY);}}),
   });
   }
 
   /*---------------------------
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
-  if (randoCtx->GetDungeon(WATER_TEMPLE)->IsMQ()) {
+  if (ctx->GetDungeon(WATER_TEMPLE)->IsMQ()) {
   areaTable[RR_WATER_TEMPLE_MQ_LOBBY] = Region("Water Temple MQ Lobby", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_ENTRYWAY,            {[]{return true;}}),
-                  Entrance(RR_WATER_TEMPLE_MQ_DIVE,             {[]{return logic->IsAdult && logic->WaterTimer >= 24 && logic->CanUse(RG_IRON_BOOTS);}}),
-                  Entrance(RR_WATER_TEMPLE_MQ_DARK_LINK_REGION, {[]{return logic->SmallKeys(RR_WATER_TEMPLE, 1) && logic->IsAdult && logic->CanUse(RG_LONGSHOT) && logic->CanJumpslash && logic->Hearts > 0;}}),
-                  Entrance(RR_WATER_TEMPLE_BOSS_ENTRYWAY,       {[]{return logic->BossKeyWaterTemple && logic->IsAdult && logic->CanJumpslash && logic->CanUse(RG_LONGSHOT);}}),
+                  Entrance(RR_WATER_TEMPLE_MQ_DIVE,             {[]{return logic->IsAdult && logic->WaterTimer() >= 24 && logic->CanUse(RG_IRON_BOOTS);}}),
+                  Entrance(RR_WATER_TEMPLE_MQ_DARK_LINK_REGION, {[]{return logic->SmallKeys(RR_WATER_TEMPLE, 1) && logic->IsAdult && logic->CanUse(RG_LONGSHOT) && logic->CanJumpslash();}}),
+                  Entrance(RR_WATER_TEMPLE_BOSS_ENTRYWAY,       {[]{return logic->HasItem(RG_WATER_TEMPLE_BOSS_KEY) && logic->IsAdult && logic->CanJumpslash() && logic->CanUse(RG_LONGSHOT);}}),
   });
 
   areaTable[RR_WATER_TEMPLE_MQ_DIVE] = Region("Water Temple MQ Dive", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_WATER_TEMPLE_MQ_MAP_CHEST,            logic->HasFireSource && logic->IsAdult && logic->CanUse(RG_HOOKSHOT)),
-                  LOCATION(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST, logic->IsAdult && logic->CanUse(RG_ZORA_TUNIC) && logic->CanUse(RG_HOOKSHOT) && ((randoCtx->GetTrickOption(RT_WATER_MQ_CENTRAL_PILLAR) && logic->CanUse(RG_FIRE_ARROWS)) || (logic->CanUse(RG_DINS_FIRE) && logic->CanUse(RG_SONG_OF_TIME)))),
+                  LOCATION(RC_WATER_TEMPLE_MQ_MAP_CHEST,            logic->HasFireSource() && logic->IsAdult && logic->CanUse(RG_HOOKSHOT)),
+                  LOCATION(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST, logic->IsAdult && logic->CanUse(RG_ZORA_TUNIC) && logic->CanUse(RG_HOOKSHOT) && ((ctx->GetTrickOption(RT_WATER_MQ_CENTRAL_PILLAR) && logic->CanUse(RG_FIRE_ARROWS)) || (logic->CanUse(RG_DINS_FIRE) && logic->CanUse(RG_SONG_OF_TIME)))),
                     //Trick: logic->IsAdult && logic->CanUse(RG_ZORA_TUNIC) && logic->CanUse(RG_HOOKSHOT) && ((LogicWaterMQCentralPillar && logic->CanUse(RG_FIRE_ARROWS)) || (logic->CanUse(RG_DINS_FIRE) && logic->CanUse(RG_SONG_OF_TIME)))
   }, {
                   //Exits
@@ -271,8 +271,8 @@ void RegionTable_Init_WaterTemple() {
 
   areaTable[RR_WATER_TEMPLE_MQ_LOWERED_WATER_LEVELS] = Region("Water Temple MQ Lowered Water Levels", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_WATER_TEMPLE_MQ_COMPASS_CHEST,                ((logic->IsAdult && logic->CanUse(RG_FAIRY_BOW)) || logic->CanUse(RG_DINS_FIRE) || Here(RR_WATER_TEMPLE_MQ_LOBBY, []{return logic->IsChild && logic->CanUse(RG_STICKS) && logic->HasExplosives;})) &&
-                    (logic->CanJumpslash || logic->CanUseProjectile)),
+                  LOCATION(RC_WATER_TEMPLE_MQ_COMPASS_CHEST,                ((logic->IsAdult && logic->CanUse(RG_FAIRY_BOW)) || logic->CanUse(RG_DINS_FIRE) || Here(RR_WATER_TEMPLE_MQ_LOBBY, []{return logic->IsChild && logic->CanUse(RG_STICKS) && logic->HasExplosives();})) &&
+                    (logic->CanJumpslash() || logic->CanUseProjectile())),
                   LOCATION(RC_WATER_TEMPLE_MQ_LONGSHOT_CHEST,               logic->IsAdult && logic->CanUse(RG_HOOKSHOT)),
                   LOCATION(RC_WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY,          logic->CanUse(RG_DINS_FIRE)),
                   LOCATION(RC_WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH, logic->IsAdult && logic->CanUse(RG_LONGSHOT)),
@@ -284,19 +284,19 @@ void RegionTable_Init_WaterTemple() {
                   EventAccess(&logic->NutPot,   {[]{return true;}}),
   }, {
                   //Locations
-                  LOCATION(RC_WATER_TEMPLE_MQ_BOSS_KEY_CHEST, logic->IsAdult && logic->WaterTimer >= 24 && logic->CanUse(RG_DINS_FIRE) && (randoCtx->GetTrickOption(RT_WATER_DRAGON_JUMP_DIVE) || logic->CanDive || logic->CanUse(RG_IRON_BOOTS))),
+                  LOCATION(RC_WATER_TEMPLE_MQ_BOSS_KEY_CHEST, logic->IsAdult && logic->WaterTimer() >= 24 && logic->CanUse(RG_DINS_FIRE) && (ctx->GetTrickOption(RT_WATER_DRAGON_JUMP_DIVE) || logic->HasItem(RG_SILVER_SCALE) || logic->CanUse(RG_IRON_BOOTS))),
                   LOCATION(RC_WATER_TEMPLE_MQ_GS_RIVER,       true),
   }, {
                   //Exits
-                  Entrance(RR_WATER_TEMPLE_MQ_BASEMENT_GATED_AREAS, {[]{return logic->IsAdult && logic->WaterTimer >= 24 && logic->CanUse(RG_DINS_FIRE) && logic->CanUse(RG_IRON_BOOTS);}}),
+                  Entrance(RR_WATER_TEMPLE_MQ_BASEMENT_GATED_AREAS, {[]{return logic->IsAdult && logic->WaterTimer() >= 24 && logic->CanUse(RG_DINS_FIRE) && logic->CanUse(RG_IRON_BOOTS);}}),
   });
 
   areaTable[RR_WATER_TEMPLE_MQ_BASEMENT_GATED_AREAS] = Region("Water Temple MQ Basement Gated Areas", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_WATER_TEMPLE_MQ_FREESTANDING_KEY,         logic->HoverBoots || logic->CanUse(RG_SCARECROW) || randoCtx->GetTrickOption(RT_WATER_NORTH_BASEMENT_LEDGE_JUMP)),
-                  LOCATION(RC_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH,     logic->CanUse(RG_FIRE_ARROWS) && (logic->HoverBoots || logic->CanUse(RG_SCARECROW))),
-                  LOCATION(RC_WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA, randoCtx->GetTrickOption(RT_WATER_MQ_LOCKED_GS) || (logic->SmallKeys(RR_WATER_TEMPLE, 2) && (logic->HoverBoots || logic->CanUse(RG_SCARECROW) || randoCtx->GetTrickOption(RT_WATER_NORTH_BASEMENT_LEDGE_JUMP)) && logic->CanJumpslash)),
-                    //Trick: LogicWaterMQLockedGS || (logic->SmallKeys(RR_WATER_TEMPLE, 2) && (logic->HoverBoots || logic->CanUse(RG_SCARECROW) || LogicWaterNorthBasementLedgeJump))
+                  LOCATION(RC_WATER_TEMPLE_MQ_FREESTANDING_KEY,         logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_SCARECROW) || ctx->GetTrickOption(RT_WATER_NORTH_BASEMENT_LEDGE_JUMP)),
+                  LOCATION(RC_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH,     logic->CanUse(RG_FIRE_ARROWS) && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_SCARECROW))),
+                  LOCATION(RC_WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA, ctx->GetTrickOption(RT_WATER_MQ_LOCKED_GS) || (logic->SmallKeys(RR_WATER_TEMPLE, 2) && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_SCARECROW) || ctx->GetTrickOption(RT_WATER_NORTH_BASEMENT_LEDGE_JUMP)) && logic->CanJumpslash())),
+                    //Trick: LogicWaterMQLockedGS || (logic->SmallKeys(RR_WATER_TEMPLE, 2) && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_SCARECROW) || LogicWaterNorthBasementLedgeJump))
   }, {});
   }
 
@@ -307,8 +307,8 @@ void RegionTable_Init_WaterTemple() {
         Region("Water Temple Boss Entryway", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
              {
                  // Exits
-                 Entrance(RR_WATER_TEMPLE_PRE_BOSS_ROOM, { [] { return randoCtx->GetDungeon(WATER_TEMPLE)->IsVanilla() && false; } }),
-                 Entrance(RR_WATER_TEMPLE_MQ_LOBBY, { [] { return randoCtx->GetDungeon(WATER_TEMPLE)->IsMQ() && false; } }),
+                 Entrance(RR_WATER_TEMPLE_PRE_BOSS_ROOM, { [] { return ctx->GetDungeon(WATER_TEMPLE)->IsVanilla() && false; } }),
+                 Entrance(RR_WATER_TEMPLE_MQ_LOBBY, { [] { return ctx->GetDungeon(WATER_TEMPLE)->IsMQ() && false; } }),
                  Entrance(RR_WATER_TEMPLE_BOSS_ROOM, { [] { return true; } }),
              });
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
index 62a66dd94..40768ffff 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
@@ -6,22 +6,22 @@ using namespace Rando;
 void RegionTable_Init_ZorasDomain() {
   areaTable[RR_ZR_FRONT] = Region("ZR Front", "Zora River", RA_ZORAS_RIVER, DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_ZR_GS_TREE, logic->IsChild && logic->CanChildAttack),
+                  LOCATION(RC_ZR_GS_TREE, logic->IsChild && logic->CanAttack()),
                 }, {
                   //Exits
-                  Entrance(RR_ZORAS_RIVER,  {[]{return logic->IsAdult || logic->CanBlastOrSmash;}}),
+                  Entrance(RR_ZORAS_RIVER,  {[]{return logic->IsAdult || logic->BlastOrSmash();}}),
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
   });
 
   areaTable[RR_ZORAS_RIVER] = Region("Zora River", "Zora River", RA_ZORAS_RIVER, DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CanSummonGossipFairy;}}),
+                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CallGossipFairy();}}),
                   EventAccess(&logic->BeanPlantFairy,   {[]{return logic->BeanPlantFairy   || (CanPlantBean(RR_ZORAS_RIVER) && logic->CanUse(RG_SONG_OF_STORMS));}}),
                   EventAccess(&logic->ButterflyFairy,   {[]{return logic->ButterflyFairy   || logic->CanUse(RG_STICKS);}}),
-                  EventAccess(&logic->BugShrub,         {[]{return logic->BugShrub         || logic->CanCutShrubs;}}),
+                  EventAccess(&logic->BugShrub,         {[]{return logic->BugShrub         || logic->CanCutShrubs();}}),
                 }, {
                   //Locations
-                  LOCATION(RC_ZR_MAGIC_BEAN_SALESMAN,               logic->ChildsWallet && logic->IsChild),
+                  LOCATION(RC_ZR_MAGIC_BEAN_SALESMAN,               logic->HasItem(RG_CHILD_WALLET) && logic->IsChild),
                   LOCATION(RC_ZR_FROGS_OCARINA_GAME,                logic->IsChild && logic->CanUse(RG_ZELDAS_LULLABY) && logic->CanUse(RG_SARIAS_SONG) && logic->CanUse(RG_SUNS_SONG) && logic->CanUse(RG_EPONAS_SONG) && logic->CanUse(RG_SONG_OF_TIME) && logic->CanUse(RG_SONG_OF_STORMS)),
                   LOCATION(RC_ZR_FROGS_IN_THE_RAIN,                 logic->IsChild && logic->CanUse(RG_SONG_OF_STORMS)),
                   LOCATION(RC_ZR_FROGS_ZELDAS_LULLABY,              logic->IsChild && logic->CanUse(RG_ZELDAS_LULLABY)),
@@ -29,21 +29,21 @@ void RegionTable_Init_ZorasDomain() {
                   LOCATION(RC_ZR_FROGS_SARIAS_SONG,                 logic->IsChild && logic->CanUse(RG_SARIAS_SONG)),
                   LOCATION(RC_ZR_FROGS_SUNS_SONG,                   logic->IsChild && logic->CanUse(RG_SUNS_SONG)),
                   LOCATION(RC_ZR_FROGS_SONG_OF_TIME,                logic->IsChild && logic->CanUse(RG_SONG_OF_TIME)),
-                  LOCATION(RC_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH, logic->IsChild || logic->CanUse(RG_HOVER_BOOTS) || (logic->IsAdult && randoCtx->GetTrickOption(RT_ZR_LOWER))),
-                  LOCATION(RC_ZR_NEAR_DOMAIN_FREESTANDING_POH,      logic->IsChild || logic->CanUse(RG_HOVER_BOOTS) || (logic->IsAdult && randoCtx->GetTrickOption(RT_ZR_UPPER))),
-                  LOCATION(RC_ZR_GS_LADDER,                         logic->IsChild && logic->AtNight && logic->CanChildAttack && logic->CanGetNightTimeGS),
-                  LOCATION(RC_ZR_GS_NEAR_RAISED_GROTTOS,            logic->IsAdult && logic->HookshotOrBoomerang && logic->AtNight && logic->CanGetNightTimeGS),
-                  LOCATION(RC_ZR_GS_ABOVE_BRIDGE,                   logic->IsAdult && logic->CanUse(RG_HOOKSHOT) && logic->AtNight && logic->CanGetNightTimeGS),
+                  LOCATION(RC_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH, logic->IsChild || logic->CanUse(RG_HOVER_BOOTS) || (logic->IsAdult && ctx->GetTrickOption(RT_ZR_LOWER))),
+                  LOCATION(RC_ZR_NEAR_DOMAIN_FREESTANDING_POH,      logic->IsChild || logic->CanUse(RG_HOVER_BOOTS) || (logic->IsAdult && ctx->GetTrickOption(RT_ZR_UPPER))),
+                  LOCATION(RC_ZR_GS_LADDER,                         logic->IsChild && logic->AtNight && logic->CanAttack() && logic->CanGetNightTimeGS()),
+                  LOCATION(RC_ZR_GS_NEAR_RAISED_GROTTOS,            logic->IsAdult && logic->HookshotOrBoomerang() && logic->AtNight && logic->CanGetNightTimeGS()),
+                  LOCATION(RC_ZR_GS_ABOVE_BRIDGE,                   logic->IsAdult && logic->CanUse(RG_HOOKSHOT) && logic->AtNight && logic->CanGetNightTimeGS()),
                   LOCATION(RC_ZR_NEAR_GROTTOS_GOSSIP_STONE,         true),
                   LOCATION(RC_ZR_NEAR_DOMAIN_GOSSIP_STONE,          true),
                 }, {
                   //Exits
                   Entrance(RR_ZR_FRONT,            {[]{return true;}}),
                   Entrance(RR_ZR_OPEN_GROTTO,      {[]{return true;}}),
-                  Entrance(RR_ZR_FAIRY_GROTTO,     {[]{return Here(RR_ZORAS_RIVER, []{return logic->CanBlastOrSmash;});}}),
-                  Entrance(RR_THE_LOST_WOODS,      {[]{return logic->CanDive || logic->CanUse(RG_IRON_BOOTS);}}),
-                  Entrance(RR_ZR_STORMS_GROTTO,    {[]{return logic->CanOpenStormGrotto;}}),
-                  Entrance(RR_ZR_BEHIND_WATERFALL, {[]{return logic->CanUse(RG_ZELDAS_LULLABY) || (logic->IsChild && randoCtx->GetTrickOption(RT_ZR_CUCCO)) || (logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS) && randoCtx->GetTrickOption(RT_ZR_HOVERS));}}),
+                  Entrance(RR_ZR_FAIRY_GROTTO,     {[]{return Here(RR_ZORAS_RIVER, []{return logic->BlastOrSmash();});}}),
+                  Entrance(RR_THE_LOST_WOODS,      {[]{return logic->HasItem(RG_SILVER_SCALE) || logic->CanUse(RG_IRON_BOOTS);}}),
+                  Entrance(RR_ZR_STORMS_GROTTO,    {[]{return logic->CanOpenStormsGrotto();}}),
+                  Entrance(RR_ZR_BEHIND_WATERFALL, {[]{return logic->CanUse(RG_ZELDAS_LULLABY) || (logic->IsChild && ctx->GetTrickOption(RT_ZR_CUCCO)) || (logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS) && ctx->GetTrickOption(RT_ZR_HOVERS));}}),
   });
 
   areaTable[RR_ZR_BEHIND_WATERFALL] = Region("ZR Behind Waterfall", "Zora River", RA_ZORAS_RIVER, DAY_NIGHT_CYCLE, {}, {}, {
@@ -55,10 +55,10 @@ void RegionTable_Init_ZorasDomain() {
   areaTable[RR_ZR_OPEN_GROTTO] = Region("ZR Open Grotto", "ZR Open Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LOCATION(RC_ZR_OPEN_GROTTO_CHEST,         true),
-                  LOCATION(RC_ZR_OPEN_GROTTO_FISH,          logic->HasBottle),
+                  LOCATION(RC_ZR_OPEN_GROTTO_FISH,          logic->HasBottle()),
                   LOCATION(RC_ZR_OPEN_GROTTO_GOSSIP_STONE,  true),
-                  LOCATION(RC_ZR_OPEN_GROTTO_BEEHIVE_LEFT,  logic->CanBreakLowerBeehives),
-                  LOCATION(RC_ZR_OPEN_GROTTO_BEEHIVE_RIGHT, logic->CanBreakLowerBeehives),
+                  LOCATION(RC_ZR_OPEN_GROTTO_BEEHIVE_LEFT,  logic->CanBreakLowerBeehives()),
+                  LOCATION(RC_ZR_OPEN_GROTTO_BEEHIVE_RIGHT, logic->CanBreakLowerBeehives()),
                 }, {
                   //Exits
                   Entrance(RR_ZORAS_RIVER, {[]{return true;}}),
@@ -74,9 +74,9 @@ void RegionTable_Init_ZorasDomain() {
 
   areaTable[RR_ZR_STORMS_GROTTO] = Region("ZR Storms Grotto", "ZR Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_ZR_DEKU_SCRUB_GROTTO_REAR,  logic->CanStunDeku),
-                  LOCATION(RC_ZR_DEKU_SCRUB_GROTTO_FRONT, logic->CanStunDeku),
-                  LOCATION(RC_ZR_STORMS_GROTTO_BEEHIVE,   logic->CanBreakUpperBeehives),
+                  LOCATION(RC_ZR_DEKU_SCRUB_GROTTO_REAR,  logic->CanStunDeku()),
+                  LOCATION(RC_ZR_DEKU_SCRUB_GROTTO_FRONT, logic->CanStunDeku()),
+                  LOCATION(RC_ZR_STORMS_GROTTO_BEEHIVE,   logic->CanBreakUpperBeehives()),
                 }, {
                   //Exits
                   Entrance(RR_ZORAS_RIVER, {[]{return true;}}),
@@ -84,43 +84,43 @@ void RegionTable_Init_ZorasDomain() {
 
   areaTable[RR_ZORAS_DOMAIN] = Region("Zoras Domain", "Zoras Domain", RA_ZORAS_DOMAIN, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->EyeballFrogAccess, {[]{return logic->EyeballFrogAccess || (logic->IsAdult && logic->KingZoraThawed && (logic->Eyedrops || logic->EyeballFrog || logic->Prescription || logic->PrescriptionAccess));}}),
-                  EventAccess(&logic->GossipStoneFairy,  {[]{return logic->GossipStoneFairy  || logic->CanSummonGossipFairyWithoutSuns;}}),
+                  EventAccess(&logic->EyeballFrogAccess, {[]{return logic->EyeballFrogAccess || (logic->IsAdult && logic->KingZoraThawed && (logic->CanUse(RG_EYEDROPS) || logic->CanUse(RG_EYEBALL_FROG) || logic->CanUse(RG_PRESCRIPTION) || logic->PrescriptionAccess));}}),
+                  EventAccess(&logic->GossipStoneFairy,  {[]{return logic->GossipStoneFairy  || logic->CallGossipFairyExceptSuns();}}),
                   EventAccess(&logic->NutPot,            {[]{return true;}}),
                   EventAccess(&logic->StickPot,          {[]{return logic->StickPot          || logic->IsChild;}}),
                   EventAccess(&logic->FishGroup,         {[]{return logic->FishGroup         || logic->IsChild;}}),
-                  EventAccess(&logic->KingZoraThawed,    {[]{return logic->KingZoraThawed    || (logic->IsAdult     && logic->BlueFire);}}),
-                  EventAccess(&logic->DeliverLetter,     {[]{return logic->DeliverLetter     || (logic->RutosLetter && logic->IsChild && randoCtx->GetOption(RSK_ZORAS_FOUNTAIN).IsNot(RO_ZF_OPEN));}}),
+                  EventAccess(&logic->KingZoraThawed,    {[]{return logic->KingZoraThawed    || (logic->IsAdult     && logic->BlueFire());}}),
+                  EventAccess(&logic->DeliverLetter,     {[]{return logic->DeliverLetter     || (logic->CanUse(RG_RUTOS_LETTER) && logic->IsChild && ctx->GetOption(RSK_ZORAS_FOUNTAIN).IsNot(RO_ZF_OPEN));}}),
                 }, {
                   //Locations
-                  LOCATION(RC_ZD_DIVING_MINIGAME,                     logic->Swim && logic->ChildsWallet && logic->IsChild),
+                  LOCATION(RC_ZD_DIVING_MINIGAME,                     logic->HasItem(RG_BRONZE_SCALE) && logic->HasItem(RG_CHILD_WALLET) && logic->IsChild),
                   LOCATION(RC_ZD_CHEST,                               logic->IsChild && logic->CanUse(RG_STICKS)),
                   LOCATION(RC_ZD_KING_ZORA_THAWED,                    logic->KingZoraThawed),
-                  LOCATION(RC_ZD_TRADE_PRESCRIPTION,                  logic->KingZoraThawed && logic->Prescription),
-                  LOCATION(RC_ZD_GS_FROZEN_WATERFALL,                 logic->IsAdult && logic->AtNight && (logic->HookshotOrBoomerang || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->Bow || (logic->MagicMeter && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BIGGORON_SWORD))) || (randoCtx->GetTrickOption(RT_ZD_GS) && logic->CanJumpslash)) && logic->CanGetNightTimeGS),
-                  LOCATION(RC_ZD_FISH_1,                              logic->IsChild && logic->HasBottle),
-                  LOCATION(RC_ZD_FISH_2,                              logic->IsChild && logic->HasBottle),
-                  LOCATION(RC_ZD_FISH_3,                              logic->IsChild && logic->HasBottle),
-                  LOCATION(RC_ZD_FISH_4,                              logic->IsChild && logic->HasBottle),
-                  LOCATION(RC_ZD_FISH_5,                              logic->IsChild && logic->HasBottle),
+                  LOCATION(RC_ZD_TRADE_PRESCRIPTION,                  logic->KingZoraThawed && logic->CanUse(RG_PRESCRIPTION)),
+                  LOCATION(RC_ZD_GS_FROZEN_WATERFALL,                 logic->IsAdult && logic->AtNight && (logic->HookshotOrBoomerang() || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || (logic->CanUse(RG_MAGIC_SINGLE) && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BIGGORON_SWORD))) || (ctx->GetTrickOption(RT_ZD_GS) && logic->CanJumpslash())) && logic->CanGetNightTimeGS()),
+                  LOCATION(RC_ZD_FISH_1,                              logic->IsChild && logic->HasBottle()),
+                  LOCATION(RC_ZD_FISH_2,                              logic->IsChild && logic->HasBottle()),
+                  LOCATION(RC_ZD_FISH_3,                              logic->IsChild && logic->HasBottle()),
+                  LOCATION(RC_ZD_FISH_4,                              logic->IsChild && logic->HasBottle()),
+                  LOCATION(RC_ZD_FISH_5,                              logic->IsChild && logic->HasBottle()),
                   LOCATION(RC_ZD_GOSSIP_STONE,                        true),
-                  LOCATION(RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_LEFT,  logic->CanBreakUpperBeehives),
-                  LOCATION(RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_RIGHT, logic->CanBreakUpperBeehives),
+                  LOCATION(RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_LEFT,  logic->CanBreakUpperBeehives()),
+                  LOCATION(RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_RIGHT, logic->CanBreakUpperBeehives()),
                 }, {
                   //Exits
                   Entrance(RR_ZR_BEHIND_WATERFALL, {[]{return true;}}),
-                  Entrance(RR_LAKE_HYLIA,          {[]{return logic->IsChild && (logic->CanDive || logic->CanUse(RG_IRON_BOOTS));}}),
-                  Entrance(RR_ZD_BEHIND_KING_ZORA, {[]{return logic->DeliverLetter || randoCtx->GetOption(RSK_ZORAS_FOUNTAIN).Is(RO_ZF_OPEN) || (randoCtx->GetOption(RSK_ZORAS_FOUNTAIN).Is(RO_ZF_CLOSED_CHILD) && logic->IsAdult) || (randoCtx->GetTrickOption(RT_ZD_KING_ZORA_SKIP) && logic->IsAdult);}}),
-                  Entrance(RR_ZD_SHOP,             {[]{return logic->IsChild || logic->BlueFire;}}),
-                  Entrance(RR_ZD_STORMS_GROTTO,    {[]{return logic->CanOpenStormGrotto;}}),
+                  Entrance(RR_LAKE_HYLIA,          {[]{return logic->IsChild && (logic->HasItem(RG_SILVER_SCALE) || logic->CanUse(RG_IRON_BOOTS));}}),
+                  Entrance(RR_ZD_BEHIND_KING_ZORA, {[]{return logic->DeliverLetter || ctx->GetOption(RSK_ZORAS_FOUNTAIN).Is(RO_ZF_OPEN) || (ctx->GetOption(RSK_ZORAS_FOUNTAIN).Is(RO_ZF_CLOSED_CHILD) && logic->IsAdult) || (ctx->GetTrickOption(RT_ZD_KING_ZORA_SKIP) && logic->IsAdult);}}),
+                  Entrance(RR_ZD_SHOP,             {[]{return logic->IsChild || logic->BlueFire();}}),
+                  Entrance(RR_ZD_STORMS_GROTTO,    {[]{return logic->CanOpenStormsGrotto();}}),
   });
 
   areaTable[RR_ZD_BEHIND_KING_ZORA] = Region("ZD Behind King Zora", "Zoras Domain", RA_ZORAS_DOMAIN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_ZD_BEHIND_KING_ZORA_BEEHIVE, logic->CanBreakUpperBeehives),
+                  LOCATION(RC_ZD_BEHIND_KING_ZORA_BEEHIVE, logic->CanBreakUpperBeehives()),
                 }, {
                   //Exits
-                  Entrance(RR_ZORAS_DOMAIN,   {[]{return logic->DeliverLetter || randoCtx->GetOption(RSK_ZORAS_FOUNTAIN).Is(RO_ZF_OPEN) || (randoCtx->GetOption(RSK_ZORAS_FOUNTAIN).Is(RO_ZF_CLOSED_CHILD) && logic->IsAdult);}}),
+                  Entrance(RR_ZORAS_DOMAIN,   {[]{return logic->DeliverLetter || ctx->GetOption(RSK_ZORAS_FOUNTAIN).Is(RO_ZF_OPEN) || (ctx->GetOption(RSK_ZORAS_FOUNTAIN).Is(RO_ZF_CLOSED_CHILD) && logic->IsAdult);}}),
                   Entrance(RR_ZORAS_FOUNTAIN, {[]{return true;}}),
   });
 
@@ -149,15 +149,15 @@ void RegionTable_Init_ZorasDomain() {
 
   areaTable[RR_ZORAS_FOUNTAIN] = Region("Zoras Fountain", "Zoras Fountain", RA_ZORAS_FOUNTAIN, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CanSummonGossipFairyWithoutSuns;}}),
+                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CallGossipFairyExceptSuns();}}),
                   EventAccess(&logic->ButterflyFairy,   {[]{return logic->ButterflyFairy   || (logic->CanUse(RG_STICKS) && logic->AtDay);}}),
                 }, {
                   //Locations
                   LOCATION(RC_ZF_ICEBERC_FREESTANDING_POH, logic->IsAdult),
-                  LOCATION(RC_ZF_BOTTOM_FREESTANDING_POH,  logic->IsAdult && logic->IronBoots && logic->WaterTimer >= 24),
+                  LOCATION(RC_ZF_BOTTOM_FREESTANDING_POH,  logic->IsAdult && logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 24),
                   LOCATION(RC_ZF_GS_TREE,                  logic->IsChild),
-                  LOCATION(RC_ZF_GS_ABOVE_THE_LOG,         logic->IsChild && logic->HookshotOrBoomerang && logic->AtNight && logic->CanGetNightTimeGS),
-                  LOCATION(RC_ZF_GS_HIDDEN_CAVE,           logic->CanUse(RG_SILVER_GAUNTLETS) && logic->CanBlastOrSmash && logic->HookshotOrBoomerang && logic->IsAdult && logic->AtNight && logic->CanGetNightTimeGS),
+                  LOCATION(RC_ZF_GS_ABOVE_THE_LOG,         logic->IsChild && logic->HookshotOrBoomerang() && logic->AtNight && logic->CanGetNightTimeGS()),
+                  LOCATION(RC_ZF_GS_HIDDEN_CAVE,           logic->CanUse(RG_SILVER_GAUNTLETS) && logic->BlastOrSmash() && logic->HookshotOrBoomerang() && logic->IsAdult && logic->AtNight && logic->CanGetNightTimeGS()),
                   LOCATION(RC_ZF_FAIRY_GOSSIP_STONE,       true),
                   LOCATION(RC_ZF_JABU_GOSSIP_STONE,        true),
                 }, {
@@ -165,7 +165,7 @@ void RegionTable_Init_ZorasDomain() {
                   Entrance(RR_ZD_BEHIND_KING_ZORA,       {[]{return true;}}),
                   Entrance(RR_JABU_JABUS_BELLY_ENTRYWAY, {[]{return (logic->IsChild && logic->CanUse(RG_BOTTLE_WITH_FISH));}}),
                   Entrance(RR_ICE_CAVERN_ENTRYWAY,       {[]{return logic->IsAdult;}}),
-                  Entrance(RR_ZF_GREAT_FAIRY_FOUNTAIN,   {[]{return logic->HasExplosives;}}),
+                  Entrance(RR_ZF_GREAT_FAIRY_FOUNTAIN,   {[]{return logic->HasExplosives();}}),
   });
 
   areaTable[RR_ZF_GREAT_FAIRY_FOUNTAIN] = Region("ZF Great Fairy Fountain", "ZF Great Fairy Fountain", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
diff --git a/soh/soh/Enhancements/randomizer/3drando/menu.cpp b/soh/soh/Enhancements/randomizer/3drando/menu.cpp
index ab7b951e3..ab064bfe0 100644
--- a/soh/soh/Enhancements/randomizer/3drando/menu.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/menu.cpp
@@ -86,7 +86,6 @@ bool GenerateRandomizer(std::set<RandomizerCheck> excludedLocations, std::set<Ra
     SPDLOG_DEBUG("Total Overrides time: {}ms", GetPerformanceTimer(PT_OVERRIDES).count());
     SPDLOG_DEBUG("Total Hint Generation time: {}ms", GetPerformanceTimer(PT_HINTS).count());
     SPDLOG_DEBUG("SpoilerLog writing time: {}ms", GetPerformanceTimer(PT_SPOILER_LOG).count());
-    SPDLOG_DEBUG("Total UpdateHelpers time: {}ms", GetPerformanceTimer(PT_UPDATE_HELPERS).count());
     SPDLOG_DEBUG("Total Event Access Calculation time: {}ms", GetPerformanceTimer(PT_EVENT_ACCESS).count());
     SPDLOG_DEBUG("Total ToD Access Calculation: {}ms", GetPerformanceTimer(PT_TOD_ACCESS).count());
     SPDLOG_DEBUG("Total Entrance Logic Calculation time: {}ms", GetPerformanceTimer(PT_ENTRANCE_LOGIC).count());
diff --git a/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp b/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
index c3d73028c..7ab399266 100644
--- a/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
@@ -56,7 +56,6 @@ int Playthrough_Init(uint32_t seed, std::set<RandomizerCheck> excludedLocations,
     Random_Init(finalHash);
     ctx->GetSettings()->SetHash(std::to_string(finalHash));
 
-    ctx->GetLogic()->UpdateHelpers();
 
     if (ctx->GetOption(RSK_LOGIC_RULES).Is(RO_LOGIC_VANILLA)) {
         VanillaFill(); // Just place items in their vanilla locations
diff --git a/soh/soh/Enhancements/randomizer/entrance.cpp b/soh/soh/Enhancements/randomizer/entrance.cpp
index 9d32c5995..d0a887c36 100644
--- a/soh/soh/Enhancements/randomizer/entrance.cpp
+++ b/soh/soh/Enhancements/randomizer/entrance.cpp
@@ -106,7 +106,6 @@ bool Entrance::CheckConditionAtAgeTime(bool& age, bool& time, bool passAnyway) c
     time = true;
     age = true;
 
-    logic->UpdateHelpers();
     return GetConditionsMet() && (connectedRegion != RR_NONE || passAnyway);
 }
 
diff --git a/soh/soh/Enhancements/randomizer/item.cpp b/soh/soh/Enhancements/randomizer/item.cpp
index f132754f3..85d0d71cf 100644
--- a/soh/soh/Enhancements/randomizer/item.cpp
+++ b/soh/soh/Enhancements/randomizer/item.cpp
@@ -41,14 +41,12 @@ void Item::ApplyEffect() const {
     auto ctx = Rando::Context::GetInstance();
     ctx->GetLogic()->ApplyItemEffect(StaticData::RetrieveItem(randomizerGet), true);
     ctx->GetLogic()->SetInLogic(logicVal, true);
-    ctx->GetLogic()->UpdateHelpers();
 }
 
 void Item::UndoEffect() const {
     auto ctx = Rando::Context::GetInstance();
     ctx->GetLogic()->ApplyItemEffect(StaticData::RetrieveItem(randomizerGet), false);
     ctx->GetLogic()->SetInLogic(logicVal, false);
-    ctx->GetLogic()->UpdateHelpers();
 }
 
 const Text& Item::GetName() const {
diff --git a/soh/soh/Enhancements/randomizer/item_location.cpp b/soh/soh/Enhancements/randomizer/item_location.cpp
index 1ff41c411..0cce409fc 100644
--- a/soh/soh/Enhancements/randomizer/item_location.cpp
+++ b/soh/soh/Enhancements/randomizer/item_location.cpp
@@ -74,8 +74,6 @@ void ItemLocation::PlaceVanillaItem() {
 
 void ItemLocation::ApplyPlacedItemEffect() const {
     StaticData::RetrieveItem(placedItem).ApplyEffect();
-    auto ctx = Context::GetInstance();
-    ctx->GetLogic()->UpdateHelpers();
 }
 
 uint16_t ItemLocation::GetPrice() const {
diff --git a/soh/soh/Enhancements/randomizer/logic.cpp b/soh/soh/Enhancements/randomizer/logic.cpp
index 234d1e364..3f22f3b0f 100644
--- a/soh/soh/Enhancements/randomizer/logic.cpp
+++ b/soh/soh/Enhancements/randomizer/logic.cpp
@@ -63,7 +63,7 @@ namespace Rando {
             case RG_BOMBCHU_5:
             case RG_BOMBCHU_10:
             case RG_BOMBCHU_20:
-                return (BombchusEnabled && BuyBombchus) || CheckInventory(ITEM_BOMBCHU, true);
+                return (BombchusEnabled() && (GetInLogic(LOGIC_BUY_BOMBCHUS) || CouldPlayBowling || CarpetMerchant)) || CheckInventory(ITEM_BOMBCHU, true);
             case RG_FAIRY_SLINGSHOT:
                 return CheckInventory(ITEM_SLINGSHOT, true);
             case RG_BOOMERANG:
@@ -72,9 +72,9 @@ namespace Rando {
             case RG_NUTS:
                 return CurrentUpgrade(UPG_NUTS);
             case RG_SCARECROW:
-                return Scarecrow;
+                return ScarecrowsSong() && CanUse(RG_HOOKSHOT);
             case RG_DISTANT_SCARECROW:
-                return DistantScarecrow;
+                return ScarecrowsSong() && CanUse(RG_LONGSHOT);
             case RG_KOKIRI_SWORD:
             case RG_DEKU_SHIELD:
             case RG_GORON_TUNIC:
@@ -151,6 +151,8 @@ namespace Rando {
             case RG_SKELETON_KEY:
                 return CheckRandoInf(RandoGetToRandInf.at(itemName));
                 // Boss Keys
+            case RG_EPONA:
+                return FreedEpona;
             case RG_FOREST_TEMPLE_BOSS_KEY:
             case RG_FIRE_TEMPLE_BOSS_KEY:
             case RG_WATER_TEMPLE_BOSS_KEY:
@@ -220,7 +222,7 @@ namespace Rando {
             case RG_BOTTLE_WITH_POE:
             case RG_BOTTLE_WITH_RED_POTION:
             case RG_EMPTY_BOTTLE:
-                return HasBottle;
+                return HasBottle();
         }
         SPDLOG_ERROR("HasItem reached `return false;`. Missing case for RandomizerGet of {}", static_cast<uint32_t>(itemName));
         assert(false);
@@ -236,7 +238,7 @@ namespace Rando {
             // Adult items
             // TODO: Uncomment those if we ever implement more item usability settings
             case RG_FAIRY_BOW:
-                return IsAdult;// || BowAsChild;
+                return IsAdult && (AmmoCanDrop || GetInLogic(LOGIC_BUY_ARROW));// || BowAsChild;
             case RG_MEGATON_HAMMER:
                 return IsAdult;// || HammerAsChild;
             case RG_IRON_BOOTS:
@@ -270,7 +272,7 @@ namespace Rando {
 
             // Child items
             case RG_FAIRY_SLINGSHOT:
-                return IsChild;// || SlingshotAsAdult;
+                return IsChild && (AmmoCanDrop || GetInLogic(LOGIC_BUY_SEED));// || SlingshotAsAdult;
             case RG_BOOMERANG:
                 return IsChild;// || BoomerangAsAdult;
             case RG_KOKIRI_SWORD:
@@ -283,65 +285,70 @@ namespace Rando {
                 return IsChild;// || DekuShieldAsAdult;
             case RG_WEIRD_EGG:
                 return IsChild;
+            case RG_PROGRESSIVE_BOMB_BAG:
+            case RG_BOMB_BAG:
+                return AmmoCanDrop || GetInLogic(LOGIC_BUY_BOMB);
             case RG_PROGRESSIVE_BOMBCHUS:
             case RG_BOMBCHU_5:
             case RG_BOMBCHU_10:
             case RG_BOMBCHU_20:
-                return BombchuRefill && BombchusEnabled;
+                return BombchuRefill() && BombchusEnabled();
             case RG_RUTOS_LETTER:
                 return IsChild;
 
                 // Adult Trade
             case RG_POCKET_EGG:
-                return IsAdult;
+                return IsAdult || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && CanUse(RG_COJIRO));
             case RG_COJIRO:
-                return IsAdult;
+                return IsAdult || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && CanUse(RG_ODD_MUSHROOM));
             case RG_ODD_MUSHROOM:
-                return IsAdult;
+                return IsAdult || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && CanUse(RG_ODD_POTION));
             case RG_ODD_POTION:
-                return IsAdult;
+                return IsAdult || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && CanUse(RG_POACHERS_SAW));
             case RG_POACHERS_SAW:
-                return IsAdult;
+                return IsAdult || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && CanUse(RG_BROKEN_SWORD));
             case RG_BROKEN_SWORD:
-                return IsAdult;
+                return IsAdult || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && CanUse(RG_PRESCRIPTION));
             case RG_PRESCRIPTION:
-                return IsAdult;
+                return IsAdult || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && CanUse(RG_EYEBALL_FROG));
             case RG_EYEBALL_FROG:
-                return IsAdult;
+                return IsAdult || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && CanUse(RG_EYEDROPS));
             case RG_EYEDROPS:
-                return IsAdult;
+                return IsAdult || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && CanUse(RG_CLAIM_CHECK));
             case RG_CLAIM_CHECK:
                 return IsAdult;
 
             // Songs
             case RG_ZELDAS_LULLABY:
-                return Ocarina && HasItem(RG_OCARINA_C_LEFT_BUTTON) && HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_UP_BUTTON);
+                return HasItem(RG_FAIRY_OCARINA) && HasItem(RG_OCARINA_C_LEFT_BUTTON) && HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_UP_BUTTON);
             case RG_EPONAS_SONG:
-                return Ocarina && HasItem(RG_OCARINA_C_LEFT_BUTTON) && HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_UP_BUTTON);
+                return HasItem(RG_FAIRY_OCARINA) && HasItem(RG_OCARINA_C_LEFT_BUTTON) && HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_UP_BUTTON);
             case RG_SARIAS_SONG:
-                return Ocarina && HasItem(RG_OCARINA_C_LEFT_BUTTON) && HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_DOWN_BUTTON);
+                return HasItem(RG_FAIRY_OCARINA) && HasItem(RG_OCARINA_C_LEFT_BUTTON) && HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_DOWN_BUTTON);
             case RG_SUNS_SONG:
-                return Ocarina && HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_UP_BUTTON) && HasItem(RG_OCARINA_C_DOWN_BUTTON);
+                return HasItem(RG_FAIRY_OCARINA) && HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_UP_BUTTON) && HasItem(RG_OCARINA_C_DOWN_BUTTON);
             case RG_SONG_OF_TIME:
-                return Ocarina && HasItem(RG_OCARINA_A_BUTTON) && HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_DOWN_BUTTON);
+                return HasItem(RG_FAIRY_OCARINA) && HasItem(RG_OCARINA_A_BUTTON) && HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_DOWN_BUTTON);
             case RG_SONG_OF_STORMS:
-                return Ocarina && HasItem(RG_OCARINA_A_BUTTON) && HasItem(RG_OCARINA_C_UP_BUTTON) && HasItem(RG_OCARINA_C_DOWN_BUTTON);
+                return HasItem(RG_FAIRY_OCARINA) && HasItem(RG_OCARINA_A_BUTTON) && HasItem(RG_OCARINA_C_UP_BUTTON) && HasItem(RG_OCARINA_C_DOWN_BUTTON);
             case RG_MINUET_OF_FOREST:
-                return Ocarina && HasItem(RG_OCARINA_A_BUTTON) && HasItem(RG_OCARINA_C_LEFT_BUTTON) && HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_UP_BUTTON);
+                return HasItem(RG_FAIRY_OCARINA) && HasItem(RG_OCARINA_A_BUTTON) && HasItem(RG_OCARINA_C_LEFT_BUTTON) && HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_UP_BUTTON);
             case RG_BOLERO_OF_FIRE:
-                return Ocarina && HasItem(RG_OCARINA_A_BUTTON) && HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_DOWN_BUTTON);
+                return HasItem(RG_FAIRY_OCARINA) && HasItem(RG_OCARINA_A_BUTTON) && HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_DOWN_BUTTON);
             case RG_SERENADE_OF_WATER:
-                return Ocarina && HasItem(RG_OCARINA_A_BUTTON) && HasItem(RG_OCARINA_C_LEFT_BUTTON) && HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_DOWN_BUTTON);
+                return HasItem(RG_FAIRY_OCARINA) && HasItem(RG_OCARINA_A_BUTTON) && HasItem(RG_OCARINA_C_LEFT_BUTTON) && HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_DOWN_BUTTON);
             case RG_REQUIEM_OF_SPIRIT:
-                return Ocarina && HasItem(RG_OCARINA_A_BUTTON) && HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_DOWN_BUTTON);
+                return HasItem(RG_FAIRY_OCARINA) && HasItem(RG_OCARINA_A_BUTTON) && HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_DOWN_BUTTON);
             case RG_NOCTURNE_OF_SHADOW:
-                return Ocarina && HasItem(RG_OCARINA_A_BUTTON) && HasItem(RG_OCARINA_C_LEFT_BUTTON) && HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_DOWN_BUTTON);
+                return HasItem(RG_FAIRY_OCARINA) && HasItem(RG_OCARINA_A_BUTTON) && HasItem(RG_OCARINA_C_LEFT_BUTTON) && HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_DOWN_BUTTON);
             case RG_PRELUDE_OF_LIGHT:
-                return Ocarina && HasItem(RG_OCARINA_C_LEFT_BUTTON) && HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_UP_BUTTON);
+                return HasItem(RG_FAIRY_OCARINA) && HasItem(RG_OCARINA_C_LEFT_BUTTON) && HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_UP_BUTTON);
 
             // Misc. Items
             case RG_FISHING_POLE:
                 return HasItem(RG_CHILD_WALLET); // as long as you have enough rubies
+            case RG_EPONA:
+                return IsAdult && CanUse(RG_EPONAS_SONG);
 
             // Bottle Items
             case RG_BOTTLE_WITH_BUGS:
@@ -354,17 +361,19 @@ namespace Rando {
                 return FairyPot || GossipStoneFairy || BeanPlantFairy || ButterflyFairy || FreeFairies || FairyPond || GetInLogic(LOGIC_FAIRY_ACCESS);
 
             // Magic items
+            case RG_MAGIC_SINGLE:
+                return AmmoCanDrop || (HasBottle() && GetInLogic(LOGIC_BUY_MAGIC_POTION));
             default:
-                return MagicMeter && (IsMagicItem(itemName) || (IsMagicArrow(itemName) && CanUse(RG_FAIRY_BOW)));
+                return CanUse(RG_MAGIC_SINGLE) && (IsMagicItem(itemName) || (IsMagicArrow(itemName) && CanUse(RG_FAIRY_BOW)));
         }
     }
 
     bool Logic::HasProjectile(HasProjectileAge age) {
-        return HasExplosives ||
-               (age == HasProjectileAge::Child  && (Slingshot || Boomerang)) ||
-               (age == HasProjectileAge::Adult  && (Hookshot  || Bow      )) ||
-               (age == HasProjectileAge::Both   && (Slingshot || Boomerang)  && (Hookshot || Bow)) ||
-               (age == HasProjectileAge::Either && (Slingshot || Boomerang   ||  Hookshot || Bow));
+        return HasExplosives() ||
+               (age == HasProjectileAge::Child  && (CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOOMERANG))) ||
+               (age == HasProjectileAge::Adult  && (CanUse(RG_HOOKSHOT)  || CanUse(RG_FAIRY_BOW)      )) ||
+               (age == HasProjectileAge::Both   && (CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOOMERANG))  && (CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_BOW))) ||
+               (age == HasProjectileAge::Either && (CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOOMERANG)   ||  CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_BOW)));
     }
 
     bool Logic::HasBossSoul(RandomizerGet itemName) {
@@ -411,7 +420,7 @@ namespace Rando {
                 return ((IsAdult && HasItem(RG_DINS_FIRE)) || (IsChild && (HasItem(RG_STICKS) || HasItem(RG_DINS_FIRE)))) && false; //GlitchEquipSwapDins;
             case GlitchType::EquipSwap: // todo: add bunny hood to adult item equippable list and child trade item to child item equippable list
                 return ((IsAdult && (HasItem(RG_DINS_FIRE) || HasItem(RG_FARORES_WIND) || HasItem(RG_NAYRUS_LOVE))) || (IsChild && (HasItem(RG_STICKS) || 
-                    HasItem(RG_FAIRY_SLINGSHOT) || HasItem(RG_BOOMERANG) || HasBottle || CanUse(RG_NUTS) || Ocarina || HasItem(RG_LENS_OF_TRUTH) || HasExplosives ||
+                    HasItem(RG_FAIRY_SLINGSHOT) || HasItem(RG_BOOMERANG) || HasBottle() || CanUse(RG_NUTS) || HasItem(RG_FAIRY_OCARINA) || HasItem(RG_LENS_OF_TRUTH) || HasExplosives() ||
                     GetAmmo(ITEM_BEAN) > 0 || HasItem(RG_DINS_FIRE) || HasItem(RG_FARORES_WIND) || HasItem(RG_NAYRUS_LOVE)))) && false; //GlitchEquipSwap;
         }
 
@@ -419,10 +428,11 @@ namespace Rando {
         return false;
     }
 
+    //NOTE, when adding dark link,add Hearts() > 0
     bool Logic::CanKillEnemy(std::string enemy) {
         //switch(enemy) {} RANDOTODO implement enemies enum
         if (enemy == "Big Skulltula"){
-            return CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT) || CanJumpslash || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_HOOKSHOT) || CanUse(RG_DINS_FIRE) || HasExplosives;
+            return CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT) || CanJumpslash() || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_HOOKSHOT) || CanUse(RG_DINS_FIRE) || HasExplosives();
         }
         //Shouldn't be reached
         return false;
@@ -457,214 +467,177 @@ namespace Rando {
         return count;
     }
 
-    // Updates all logic helpers. Should be called whenever a non-helper is changed
-    void Logic::UpdateHelpers() {
-        StartPerformanceTimer(PT_UPDATE_HELPERS);
-        OcarinaButtons  =  (HasItem(RG_OCARINA_A_BUTTON) ? 1 : 0) +
-                           (HasItem(RG_OCARINA_C_LEFT_BUTTON) ? 1 : 0) +
-                           (HasItem(RG_OCARINA_C_RIGHT_BUTTON) ? 1 : 0) +
-                           (HasItem(RG_OCARINA_C_UP_BUTTON) ? 1 : 0) +
-                           (HasItem(RG_OCARINA_C_DOWN_BUTTON) ? 1 : 0);
-        ZeldasLetter   = HasItem(RG_ZELDAS_LETTER);
-        WeirdEgg       = CanUse(RG_WEIRD_EGG);
-        BuySeed        = GetInLogic(LOGIC_BUY_SEED);
-        BuyArrow       = GetInLogic(LOGIC_BUY_ARROW);
-        BuyBomb        = GetInLogic(LOGIC_BUY_BOMB);
-        BuyMagicPotion = GetInLogic(LOGIC_BUY_MAGIC_POTION);
-        MagicBean      = GetAmmo(ITEM_BEAN) > 0;
-        RutosLetter    = CanUse(RG_RUTOS_LETTER);
-        Boomerang      = CanUse(RG_BOOMERANG);
-        DinsFire       = CanUse(RG_DINS_FIRE);
-        FaroresWind    = CanUse(RG_FARORES_WIND);
-        NayrusLove     = CanUse(RG_NAYRUS_LOVE);
-        LensOfTruth    = CanUse(RG_LENS_OF_TRUTH);
-        ShardOfAgony   = HasItem(RG_STONE_OF_AGONY);
-        //SkullMask      = false;
-        //MaskOfTruth    = false;
+    uint8_t Logic::OcarinaButtons(){
+        return HasItem(RG_OCARINA_A_BUTTON) + HasItem(RG_OCARINA_C_LEFT_BUTTON) + HasItem(RG_OCARINA_C_RIGHT_BUTTON) + HasItem(RG_OCARINA_C_UP_BUTTON) + HasItem(RG_OCARINA_C_DOWN_BUTTON);
+    }
 
-        //Adult logic
-        Hammer          = CanUse(RG_MEGATON_HAMMER);
-        IronBoots       = CanUse(RG_IRON_BOOTS);
-        HoverBoots      = CanUse(RG_HOVER_BOOTS);
-        DekuShield      = CanUse(RG_DEKU_SHIELD);
-        HylianShield    = CanUse(RG_HYLIAN_SHIELD);
-        MirrorShield    = CanUse(RG_MIRROR_SHIELD);
-        GoronTunic      = CanUse(RG_GORON_TUNIC);
-        ZoraTunic       = CanUse(RG_ZORA_TUNIC);
-        //Epona         = false;
-        //BigPoe        = false;
-        GerudoToken     = HasItem(RG_GERUDO_MEMBERSHIP_CARD);
-        FireArrows      = CanUse(RG_FIRE_ARROWS);
-        IceArrows       = CanUse(RG_ICE_ARROWS);
-        LightArrows     = CanUse(RG_LIGHT_ARROWS);
-        KokiriSword     = CanUse(RG_KOKIRI_SWORD);
-        MasterSword     = CanUse(RG_MASTER_SWORD);
-        BiggoronSword   = CanUse(RG_BIGGORON_SWORD);
-        NumBottles      = BottleCount();
-        HasBottle       = NumBottles >= 1;
-        Slingshot       = CanUse(RG_FAIRY_SLINGSHOT) && (BuySeed || AmmoCanDrop);
-        Ocarina         = HasItem(RG_FAIRY_OCARINA);
-        OcarinaOfTime   = HasItem(RG_OCARINA_OF_TIME);
-        MagicMeter      = HasItem(RG_MAGIC_SINGLE) && (AmmoCanDrop || (HasBottle && BuyMagicPotion));
-        BombBag         = HasItem(RG_BOMB_BAG) && (BuyBomb || AmmoCanDrop);
-        BombchusEnabled = ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) ? CheckInventory(ITEM_BOMBCHU, true) : BombBag;
-        BuyBombchus     = (GetInLogic(LOGIC_BUY_BOMBCHUS) || CouldPlayBowling || CarpetMerchant);
-        Hookshot        = CanUse(RG_HOOKSHOT);
-        Longshot        = CanUse(RG_LONGSHOT);
-        Bow             = CanUse(RG_FAIRY_BOW) && (BuyArrow || AmmoCanDrop);
-        GoronBracelet   = HasItem(RG_GORONS_BRACELET);
-        SilverGauntlets = HasItem(RG_SILVER_GAUNTLETS);
-        GoldenGauntlets = HasItem(RG_GOLDEN_GAUNTLETS);
-        Swim            = HasItem(RG_BRONZE_SCALE);
-        SilverScale     = HasItem(RG_SILVER_SCALE);
-        GoldScale       = HasItem(RG_GOLDEN_SCALE);
-        ChildsWallet    = HasItem(RG_CHILD_WALLET);
-        AdultsWallet    = HasItem(RG_ADULT_WALLET);
-        BiggoronSword   = HasItem(RG_BIGGORON_SWORD);
+    bool Logic::HasBottle(){
+        return BottleCount() >= 1;
+    }
 
-        ProgressiveScale  = CurrentUpgrade(UPG_SCALE) + HasItem(RG_BRONZE_SCALE);
-        ProgressiveWallet = CurrentUpgrade(UPG_WALLET) + HasItem(RG_CHILD_WALLET);
+    bool Logic::CanJumpslash() {
+        // Not including hammer as hammer jump attacks can be weird;
+        return CanUse(RG_STICKS) || CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD);
+    }
 
-        CanSummonGohma        = HasBossSoul(RG_GOHMA_SOUL);
-        CanSummonKingDodongo  = HasBossSoul(RG_KING_DODONGO_SOUL);
-        CanSummonBarinade     = HasBossSoul(RG_BARINADE_SOUL);
-        CanSummonPhantomGanon = HasBossSoul(RG_PHANTOM_GANON_SOUL);
-        CanSummonVolvagia     = HasBossSoul(RG_VOLVAGIA_SOUL);
-        CanSummonMorpha       = HasBossSoul(RG_MORPHA_SOUL);
-        CanSummonBongoBongo   = HasBossSoul(RG_BONGO_BONGO_SOUL);
-        CanSummonTwinrova     = HasBossSoul(RG_TWINROVA_SOUL);
-        CanSummonGanon        = HasBossSoul(RG_GANON_SOUL);
+    bool Logic::CanDamage() {
+        return CanUse(RG_FAIRY_SLINGSHOT) || CanJumpslash() || BlastOrSmash() || CanUse(RG_DINS_FIRE) || CanUse(RG_FAIRY_BOW);
+    }
 
-        // Boss Keys
-        BossKeyForestTemple = HasItem(RG_FOREST_TEMPLE_BOSS_KEY);
-        BossKeyFireTemple   = HasItem(RG_FIRE_TEMPLE_BOSS_KEY);
-        BossKeyWaterTemple  = HasItem(RG_WATER_TEMPLE_BOSS_KEY);
-        BossKeySpiritTemple = HasItem(RG_SPIRIT_TEMPLE_BOSS_KEY);
-        BossKeyShadowTemple = HasItem(RG_SHADOW_TEMPLE_BOSS_KEY);
-        BossKeyGanonsCastle = HasItem(RG_GANONS_CASTLE_BOSS_KEY);
+    bool Logic::CanAttack() {
+        return CanDamage() || CanUse(RG_BOOMERANG) || CanUse(RG_HOOKSHOT);
+    }
 
-        KokiriEmerald   = HasItem(RG_KOKIRI_EMERALD);
-        GoronRuby       = HasItem(RG_GORON_RUBY);
-        ZoraSapphire    = HasItem(RG_ZORA_SAPPHIRE);
-        ForestMedallion = HasItem(RG_FOREST_MEDALLION);
-        FireMedallion   = HasItem(RG_FIRE_MEDALLION);
-        WaterMedallion  = HasItem(RG_WATER_MEDALLION);
-        SpiritMedallion = HasItem(RG_SPIRIT_MEDALLION);
-        ShadowMedallion = HasItem(RG_SHADOW_MEDALLION);
-        LightMedallion  = HasItem(RG_LIGHT_MEDALLION);
+    bool Logic::BombchusEnabled(){
+        return ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) ? CheckInventory(ITEM_BOMBCHU, true) : HasItem(RG_BOMB_BAG);
+    }
 
-        DoubleDefense = HasItem(RG_DOUBLE_DEFENSE);
-        TriforcePieces = GetSaveContext()->triforcePiecesCollected;
-        Greg = HasItem(RG_GREG_RUPEE);
-        GoldSkulltulaTokens = GetGSCount();
+    // TODO: Implement Ammo Drop Setting in place of bombchu drops
+    bool Logic::BombchuRefill(){
+        return GetInLogic(LOGIC_BUY_BOMBCHUS) || CouldPlayBowling || CarpetMerchant || (ctx->GetOption(RSK_ENABLE_BOMBCHU_DROPS).Is(RO_AMMO_DROPS_ON/*_PLUS_BOMBCHU*/));
+    }
 
-        //you need at least 2 buttons for scarecrow song
-        ScarecrowSong    = ScarecrowSong || (ctx->GetOption(RSK_SKIP_SCARECROWS_SONG) && Ocarina && OcarinaButtons >= 2) || (ChildScarecrow && AdultScarecrow);
-        Scarecrow        = Hookshot && ScarecrowSong;
-        DistantScarecrow = Longshot && ScarecrowSong;
+    bool Logic::HookshotOrBoomerang(){
+        return CanUse(RG_HOOKSHOT) || CanUse(RG_BOOMERANG);
+    }
 
-        // TODO: Implement Ammo Drop Setting in place of bombchu drops
-        BombchuRefill = BuyBombchus || (ctx->GetOption(RSK_ENABLE_BOMBCHU_DROPS).Is(RO_AMMO_DROPS_ON/*_PLUS_BOMBCHU*/));
+    bool Logic::ScarecrowsSong(){
+        return (ctx->GetOption(RSK_SKIP_SCARECROWS_SONG) && HasItem(RG_FAIRY_OCARINA) && OcarinaButtons() >= 2)
+                || (ChildScarecrow && AdultScarecrow);
+    }
 
-        //Usage
-        Bombs     = HasItem(RG_PROGRESSIVE_BOMB_BAG);
-        BlueFire  = CanUse(RG_BOTTLE_WITH_BLUE_FIRE) || (ctx->GetOption(RSK_BLUE_FIRE_ARROWS) && CanUse(RG_ICE_ARROWS));
+    bool Logic::BlueFire(){
+        return CanUse(RG_BOTTLE_WITH_BLUE_FIRE) || (ctx->GetOption(RSK_BLUE_FIRE_ARROWS) && CanUse(RG_ICE_ARROWS));
+    }
 
-        // TODO: Implement Ammo Drop Setting in place of bombchu drops
-        HasExplosives = Bombs || CanUse(RG_BOMBCHU_5);
-        HasBoots = IronBoots || HoverBoots;
-        //Unshuffled adult trade quest
-        ClaimCheck = CanUse(RG_CLAIM_CHECK);
-        Eyedrops = CanUse(RG_EYEDROPS) || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && ClaimCheck);
-        EyeballFrog = CanUse(RG_EYEBALL_FROG) || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && Eyedrops);
-        Prescription = CanUse(RG_PRESCRIPTION) || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && EyeballFrog);
-        BrokenSword = CanUse(RG_BROKEN_SWORD) || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && Prescription);
-        PoachersSaw = CanUse(RG_POACHERS_SAW) || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && BrokenSword);
-        OddPoultice = CanUse(RG_ODD_POTION) || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && PoachersSaw);
-        OddMushroom = CanUse(RG_ODD_MUSHROOM) || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && OddPoultice);
-        Cojiro = CanUse(RG_COJIRO) || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && OddMushroom);
-        PocketEgg = CanUse(RG_POCKET_EGG) || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && Cojiro);
+    bool Logic::HasExplosives(){
+        return CanUse(RG_BOMB_BAG) || CanUse(RG_BOMBCHU_5);
+    }
 
-        // IsChild = Age == AGE_CHILD;
-        // IsAdult = Age == AGE_ADULT;
+    bool Logic::BlastOrSmash(){
+        return HasExplosives() || CanUse(RG_MEGATON_HAMMER);
+    }
 
-        CanBlastOrSmash = HasExplosives || CanUse(RG_MEGATON_HAMMER);
-        CanChildAttack  = IsChild && (Slingshot || Boomerang || CanUse(RG_STICKS) || KokiriSword || HasExplosives || CanUse(RG_DINS_FIRE) || CanUse(RG_MASTER_SWORD) || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_BIGGORON_SWORD));
-        CanChildDamage  = IsChild && (Slingshot ||              CanUse(RG_STICKS) || KokiriSword || HasExplosives || CanUse(RG_DINS_FIRE) || CanUse(RG_MASTER_SWORD) || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_BIGGORON_SWORD));
-        CanAdultAttack  = IsAdult && (CanUse(RG_FAIRY_BOW) || CanUse(RG_BOOMERANG)       || CanUse(RG_STICKS) || CanUse(RG_KOKIRI_SWORD) || HasExplosives || CanUse(RG_DINS_FIRE) || MasterSword || Hammer || BiggoronSword || Hookshot);
-        CanAdultDamage  = IsAdult && (CanUse(RG_FAIRY_BOW) || CanUse(RG_STICKS)          || CanUse(RG_KOKIRI_SWORD) || HasExplosives || CanUse(RG_DINS_FIRE) || MasterSword || Hammer || BiggoronSword);
-        CanStunDeku     = CanAdultAttack || CanChildAttack || CanUse(RG_NUTS) || HasShield;
-        CanCutShrubs    = CanUse(RG_KOKIRI_SWORD) || CanUse(RG_BOOMERANG) || HasExplosives || CanUse(RG_MASTER_SWORD) || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_BIGGORON_SWORD);
-        CanDive         = ProgressiveScale >= 2;
-        CanLeaveForest  = ctx->GetOption(RSK_FOREST).IsNot(RO_FOREST_CLOSED) || IsAdult || DekuTreeClear || ctx->GetOption(RSK_SHUFFLE_INTERIOR_ENTRANCES) || ctx->GetOption(RSK_SHUFFLE_OVERWORLD_ENTRANCES);
-        CanPlantBugs    = IsChild && CanUse(RG_BOTTLE_WITH_BUGS);
-        CanRideEpona    = IsAdult && Epona && CanUse(RG_EPONAS_SONG);
-        CanSummonGossipFairyWithoutSuns = CanUse(RG_ZELDAS_LULLABY) || CanUse(RG_EPONAS_SONG) || CanUse(RG_SONG_OF_TIME);
-        CanSummonGossipFairy            = CanSummonGossipFairyWithoutSuns || CanUse(RG_SUNS_SONG);
-        Hearts          = GetSaveContext()->healthCapacity / 16;
-        EffectiveHealth = ((Hearts << (2 + DoubleDefense)) >> Multiplier) + ((Hearts << (2 + DoubleDefense)) % (1 << Multiplier) > 0); //Number of half heart hits to die, ranges from 1 to 160
-        FireTimer       = CanUse(RG_GORON_TUNIC) ? 255 : (ctx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS)) ? (Hearts * 8) : 0;
-        WaterTimer      = CanUse(RG_ZORA_TUNIC) ? 255 : (ctx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS)) ? (Hearts * 8) : 0;
-        NeedNayrusLove      = (EffectiveHealth == 1);
-        CanSurviveDamage    = !NeedNayrusLove || CanUse(RG_NAYRUS_LOVE);
-        CanTakeDamage       = CanUse(RG_BOTTLE_WITH_FAIRY) || CanSurviveDamage;
-        CanTakeDamageTwice  = (CanUse(RG_BOTTLE_WITH_FAIRY) && NumBottles >= 2) || ((EffectiveHealth == 2) && (CanUse(RG_NAYRUS_LOVE) || CanUse(RG_BOTTLE_WITH_FAIRY))) || (EffectiveHealth > 2);
-        CanOpenBombGrotto   = CanBlastOrSmash       && (ShardOfAgony || ctx->GetTrickOption(RT_GROTTOS_WITHOUT_AGONY));
-        CanOpenStormGrotto  = CanUse(RG_SONG_OF_STORMS) && (ShardOfAgony || ctx->GetTrickOption(RT_GROTTOS_WITHOUT_AGONY));
-        HookshotOrBoomerang = CanUse(RG_HOOKSHOT) || CanUse(RG_BOOMERANG);
-        CanGetNightTimeGS   = (CanUse(RG_SUNS_SONG) || !ctx->GetOption(RSK_SKULLS_SUNS_SONG));
-        CanBreakUpperBeehives = HookshotOrBoomerang || (ctx->GetTrickOption(RT_BOMBCHU_BEEHIVES) && CanUse(RG_BOMBCHU_5));
-        CanBreakLowerBeehives = CanBreakUpperBeehives || Bombs;
-        CanFish = ChildsWallet && (HasItem(RG_FISHING_POLE) || !ctx->GetOption(RSK_SHUFFLE_FISHING_POLE));
-        CanGetChildFish = CanFish && (IsChild || (IsAdult && !ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT)));
-        CanGetAdultFish = CanFish && IsAdult && ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT);
+    bool Logic::CanSpawnSoilSkull(){
+        return IsChild && CanUse(RG_BOTTLE_WITH_BUGS);
+    }
 
-        GuaranteeTradePath     = ctx->GetOption(RSK_SHUFFLE_INTERIOR_ENTRANCES) || ctx->GetOption(RSK_SHUFFLE_OVERWORLD_ENTRANCES) || ctx->GetTrickOption(RT_DMT_BOLERO_BIGGORON) || CanBlastOrSmash || StopGCRollingGoronAsAdult;
-        //GuaranteeHint          = (hints == "Mask" && MaskofTruth) || (hints == "Agony") || (hints != "Mask" && hints != "Agony");
-        HasFireSource          = CanUse(RG_DINS_FIRE) || CanUse(RG_FIRE_ARROWS);
-        HasFireSourceWithTorch = HasFireSource || CanUse(RG_STICKS);
+    bool Logic::CanReflectNuts(){
+        return CanUse(RG_DEKU_SHIELD) || (IsAdult && CanUse(RG_HYLIAN_SHIELD));
+    }
 
-        //Gerudo Fortress
-        CanFinishGerudoFortress = (ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_NORMAL)      && SmallKeys(RR_GERUDO_FORTRESS, 4) && (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) && (GerudoToken || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_HOVER_BOOTS) || ctx->GetTrickOption(RT_GF_KITCHEN))) ||
-                                    (ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_FAST)      && SmallKeys(RR_GERUDO_FORTRESS, 1) && (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD))) ||
-                                    (ctx->GetOption(RSK_GERUDO_FORTRESS).IsNot(RO_GF_NORMAL) && ctx->GetOption(RSK_GERUDO_FORTRESS).IsNot(RO_GF_FAST));
+    bool Logic::CanCutShrubs(){
+        return CanUse(RG_KOKIRI_SWORD) || CanUse(RG_BOOMERANG) || HasExplosives() || CanUse(RG_MASTER_SWORD) || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_BIGGORON_SWORD);
+    }
 
-        HasShield          = CanUse(RG_HYLIAN_SHIELD) || CanUse(RG_DEKU_SHIELD); //Mirror shield can't reflect attacks
-        CanShield          = CanUse(RG_MIRROR_SHIELD) || HasShield;
-        ChildShield        = IsChild && CanUse(RG_DEKU_SHIELD); //hylian shield is not helpful for child
-        AdultReflectShield = IsAdult && CanUse(RG_HYLIAN_SHIELD); //Mirror shield can't reflect attacks
-        AdultShield        = IsAdult && (CanUse(RG_HYLIAN_SHIELD) || CanUse(RG_MIRROR_SHIELD));
-        CanShieldFlick     = ChildShield || AdultShield;
-        CanJumpslash       = CanUse(RG_STICKS) || CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD); // Not including hammer as hammer jump attacks can be weird
-        CanUseProjectile   = HasExplosives || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOOMERANG);
-        CanUseMagicArrow   = CanUse(RG_FIRE_ARROWS) || CanUse(RG_ICE_ARROWS) || CanUse(RG_LIGHT_ARROWS);
+    bool Logic::CanStunDeku(){
+        return CanAttack() || CanUse(RG_NUTS) || CanReflectNuts();
+    }
 
-        //Bridge and LACS Requirements
-        MedallionCount        = (ForestMedallion ? 1:0) + (FireMedallion ? 1:0) + (WaterMedallion ? 1:0) + (SpiritMedallion ? 1:0) + (ShadowMedallion ? 1:0) + (LightMedallion ? 1:0);
-        StoneCount            = (KokiriEmerald ? 1:0) + (GoronRuby ? 1:0) + (ZoraSapphire ? 1:0);
-        DungeonCount          = (DekuTreeClear ? 1:0) + (DodongosCavernClear ? 1:0) + (JabuJabusBellyClear ? 1:0) + (ForestTempleClear ? 1:0) + (FireTempleClear ? 1:0) + (WaterTempleClear ? 1:0) + (SpiritTempleClear ? 1:0) + (ShadowTempleClear ? 1:0);
-        HasAllStones          = StoneCount == 3;
-        HasAllMedallions      = MedallionCount == 6;
-        GregInBridgeLogic     = ctx->GetOption(RSK_BRIDGE_OPTIONS).Is(RO_BRIDGE_GREG);
-        GregInLacsLogic       = ctx->GetOption(RSK_LACS_OPTIONS).Is(RO_LACS_GREG_REWARD);
+    bool Logic::CanLeaveForest(){
+        return ctx->GetOption(RSK_FOREST).IsNot(RO_FOREST_CLOSED) || IsAdult || DekuTreeClear || ctx->GetOption(RSK_SHUFFLE_INTERIOR_ENTRANCES) || ctx->GetOption(RSK_SHUFFLE_OVERWORLD_ENTRANCES);
+    }
 
-        CanBuildRainbowBridge = ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_ALWAYS_OPEN)                                                                         ||
-                                (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_VANILLA)    && ShadowMedallion && SpiritMedallion && LightArrows)             ||
-                                (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_STONES)     && StoneCount + (Greg && GregInBridgeLogic ? 1 : 0) >= ctx->GetOption(RSK_RAINBOW_BRIDGE_STONE_COUNT).Value<uint8_t>())                    ||
-                                (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_MEDALLIONS) && MedallionCount + (Greg && GregInBridgeLogic ? 1 : 0) >= ctx->GetOption(RSK_RAINBOW_BRIDGE_MEDALLION_COUNT).Value<uint8_t>())            ||
-                                (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_DUNGEON_REWARDS)    && StoneCount + MedallionCount + (Greg && GregInBridgeLogic ? 1 : 0) >= ctx->GetOption(RSK_RAINBOW_BRIDGE_REWARD_COUNT).Value<uint8_t>())  ||
-                                (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_DUNGEONS)   && DungeonCount + (Greg && GregInBridgeLogic ? 1 : 0) >= ctx->GetOption(RSK_RAINBOW_BRIDGE_DUNGEON_COUNT).Value<uint8_t>())                ||
-                                (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_TOKENS)     && GoldSkulltulaTokens >= ctx->GetOption(RSK_RAINBOW_BRIDGE_TOKEN_COUNT).Value<uint8_t>()) ||
-                                (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_GREG)       && Greg);
+    bool Logic::CallGossipFairyExceptSuns(){
+        return CanUse(RG_ZELDAS_LULLABY) || CanUse(RG_EPONAS_SONG) || CanUse(RG_SONG_OF_TIME);
+    }
 
-        CanTriggerLACS = (ctx->GetSettings()->LACSCondition() == RO_LACS_VANILLA    && ShadowMedallion && SpiritMedallion)                          ||
-                            (ctx->GetSettings()->LACSCondition() == RO_LACS_STONES     && StoneCount + (Greg && GregInLacsLogic ? 1 : 0) >= ctx->GetOption(RSK_LACS_STONE_COUNT).Value<uint8_t>())                    ||
-                            (ctx->GetSettings()->LACSCondition() == RO_LACS_MEDALLIONS && MedallionCount + (Greg && GregInLacsLogic ? 1 : 0) >= ctx->GetOption(RSK_LACS_MEDALLION_COUNT).Value<uint8_t>())            ||
-                            (ctx->GetSettings()->LACSCondition() == RO_LACS_REWARDS    && StoneCount + MedallionCount + (Greg && GregInLacsLogic ? 1 : 0) >= ctx->GetOption(RSK_LACS_REWARD_COUNT).Value<uint8_t>())  ||
-                            (ctx->GetSettings()->LACSCondition() == RO_LACS_DUNGEONS   && DungeonCount + (Greg && GregInLacsLogic ? 1 : 0) >= ctx->GetOption(RSK_LACS_DUNGEON_COUNT).Value<uint8_t>())                ||
-                            (ctx->GetSettings()->LACSCondition() == RO_LACS_TOKENS     && GoldSkulltulaTokens >= ctx->GetOption(RSK_LACS_TOKEN_COUNT).Value<uint8_t>());
-        CanCompleteTriforce = TriforcePieces >= ctx->GetOption(RSK_TRIFORCE_HUNT_PIECES_REQUIRED).Value<uint8_t>();
-        StopPerformanceTimer(PT_UPDATE_HELPERS);
+    bool Logic::CallGossipFairy(){
+        return CallGossipFairyExceptSuns() || CanUse(RG_SUNS_SONG);
+    }
+
+    bool Logic::EffectiveHealth(){
+        return CallGossipFairyExceptSuns() || CanUse(RG_SUNS_SONG);
+    }
+
+    uint8_t Logic::Hearts(){
+        return GetSaveContext()->healthCapacity / 16;
+    }
+
+    uint8_t Logic::DungeonCount(){
+        return DekuTreeClear + DodongosCavernClear + JabuJabusBellyClear + ForestTempleClear + FireTempleClear + WaterTempleClear + SpiritTempleClear + ShadowTempleClear;
+    }
+
+    uint8_t Logic::StoneCount(){
+        return HasItem(RG_KOKIRI_EMERALD) + HasItem(RG_GORON_RUBY) + HasItem(RG_ZORA_SAPPHIRE);
+    }
+
+    uint8_t Logic::MedallionCount(){
+        return HasItem(RG_FOREST_MEDALLION) + HasItem(RG_FIRE_MEDALLION) + HasItem(RG_WATER_MEDALLION) + HasItem(RG_SPIRIT_MEDALLION) + HasItem(RG_SHADOW_MEDALLION) + HasItem(RG_LIGHT_MEDALLION);
+    }
+
+    uint8_t Logic::FireTimer(){
+        return CanUse(RG_GORON_TUNIC) ? 255 : (ctx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS)) ? (Hearts() * 8) : 0;
+    }
+    
+    uint8_t Logic::WaterTimer(){
+        return CanUse(RG_ZORA_TUNIC) ? 255 : (ctx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS)) ? (Hearts() * 8) : 0;
+    }
+
+    bool Logic::TakeDamage(){
+        return CanUse(RG_BOTTLE_WITH_FAIRY) || EffectiveHealth() != 1 || CanUse(RG_NAYRUS_LOVE);
+    }
+
+    bool Logic::CanOpenBombGrotto(){
+        return BlastOrSmash() && (HasItem(RG_STONE_OF_AGONY) || ctx->GetTrickOption(RT_GROTTOS_WITHOUT_AGONY));
+    }
+
+    bool Logic::CanOpenStormsGrotto(){
+        return CanUse(RG_SONG_OF_STORMS) && (HasItem(RG_STONE_OF_AGONY) || ctx->GetTrickOption(RT_GROTTOS_WITHOUT_AGONY));
+    }
+
+    bool Logic::CanGetNightTimeGS(){
+        return CanUse(RG_SUNS_SONG) || !ctx->GetOption(RSK_SKULLS_SUNS_SONG);
+    }
+
+    bool Logic::CanBreakUpperBeehives(){
+        return HookshotOrBoomerang() || (ctx->GetTrickOption(RT_BOMBCHU_BEEHIVES) && CanUse(RG_BOMBCHU_5));
+    }
+
+    bool Logic::CanBreakLowerBeehives(){
+        return CanBreakUpperBeehives() || CanUse(RG_BOMB_BAG);
+    }
+
+    bool Logic::HasFireSource(){
+        return CanUse(RG_DINS_FIRE) || CanUse(RG_FIRE_ARROWS);
+    }
+
+    bool Logic::HasFireSourceWithTorch(){
+        return HasFireSource() || CanUse(RG_STICKS);
+    }
+
+    bool Logic::CanFinishGerudoFortress(){
+        return (ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_NORMAL) && SmallKeys(RR_GERUDO_FORTRESS, 4) && (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) && (HasItem(RG_GERUDO_MEMBERSHIP_CARD) || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_HOVER_BOOTS) || ctx->GetTrickOption(RT_GF_KITCHEN))) ||
+               (ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_FAST)   && SmallKeys(RR_GERUDO_FORTRESS, 1) && (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD))) ||
+               ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_OPEN);
+    }
+
+    bool Logic::CanShield(){
+        return CanUse(RG_MIRROR_SHIELD) || CanUse(RG_HYLIAN_SHIELD) || CanUse(RG_DEKU_SHIELD);
+    }
+
+    bool Logic::CanUseProjectile(){
+        return  HasExplosives() || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOOMERANG);
+    }
+
+    bool Logic::CanBuildRainbowBridge(){
+        return ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_ALWAYS_OPEN)      ||
+               (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_VANILLA)         && HasItem(RG_SHADOW_MEDALLION) && HasItem(RG_SPIRIT_MEDALLION) && CanUse(RG_LIGHT_ARROWS)) ||
+               (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_STONES)          && StoneCount() + (HasItem(RG_GREG_RUPEE) && ctx->GetOption(RSK_BRIDGE_OPTIONS).Is(RO_BRIDGE_GREG)) >= ctx->GetOption(RSK_RAINBOW_BRIDGE_STONE_COUNT).Value<uint8_t>()) ||
+               (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_MEDALLIONS)      && MedallionCount() + (HasItem(RG_GREG_RUPEE) && ctx->GetOption(RSK_BRIDGE_OPTIONS).Is(RO_BRIDGE_GREG)) >= ctx->GetOption(RSK_RAINBOW_BRIDGE_MEDALLION_COUNT).Value<uint8_t>()) ||
+               (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_DUNGEON_REWARDS) && StoneCount() + MedallionCount() + (HasItem(RG_GREG_RUPEE) && ctx->GetOption(RSK_BRIDGE_OPTIONS).Is(RO_BRIDGE_GREG)) >= ctx->GetOption(RSK_RAINBOW_BRIDGE_REWARD_COUNT).Value<uint8_t>()) ||
+               (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_DUNGEONS)        && DungeonCount() + (HasItem(RG_GREG_RUPEE) && ctx->GetOption(RSK_BRIDGE_OPTIONS).Is(RO_BRIDGE_GREG)) >= ctx->GetOption(RSK_RAINBOW_BRIDGE_DUNGEON_COUNT).Value<uint8_t>()) ||
+               (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_TOKENS)          && GetGSCount() >= ctx->GetOption(RSK_RAINBOW_BRIDGE_TOKEN_COUNT).Value<uint8_t>()) ||
+               (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_GREG)            && HasItem(RG_GREG_RUPEE));
+    }
+
+    bool Logic::CanTriggerLACS(){
+        return (ctx->GetSettings()->LACSCondition() == RO_LACS_VANILLA    && HasItem(RG_SHADOW_MEDALLION) && HasItem(RG_SPIRIT_MEDALLION)) ||
+               (ctx->GetSettings()->LACSCondition() == RO_LACS_STONES     && StoneCount() + (HasItem(RG_GREG_RUPEE) && ctx->GetOption(RSK_LACS_OPTIONS).Is(RO_LACS_GREG_REWARD)) >= ctx->GetOption(RSK_LACS_STONE_COUNT).Value<uint8_t>()) ||
+               (ctx->GetSettings()->LACSCondition() == RO_LACS_MEDALLIONS && MedallionCount() + (HasItem(RG_GREG_RUPEE) && ctx->GetOption(RSK_LACS_OPTIONS).Is(RO_LACS_GREG_REWARD)) >= ctx->GetOption(RSK_LACS_MEDALLION_COUNT).Value<uint8_t>()) ||
+               (ctx->GetSettings()->LACSCondition() == RO_LACS_REWARDS    && StoneCount() + MedallionCount() + (HasItem(RG_GREG_RUPEE) && ctx->GetOption(RSK_LACS_OPTIONS).Is(RO_LACS_GREG_REWARD)) >= ctx->GetOption(RSK_LACS_REWARD_COUNT).Value<uint8_t>()) ||
+               (ctx->GetSettings()->LACSCondition() == RO_LACS_DUNGEONS   && DungeonCount() + (HasItem(RG_GREG_RUPEE) && ctx->GetOption(RSK_LACS_OPTIONS).Is(RO_LACS_GREG_REWARD)) >= ctx->GetOption(RSK_LACS_DUNGEON_COUNT).Value<uint8_t>()) ||
+               (ctx->GetSettings()->LACSCondition() == RO_LACS_TOKENS     && GetGSCount() >= ctx->GetOption(RSK_LACS_TOKEN_COUNT).Value<uint8_t>());
     }
 
     bool Logic::SmallKeys(RandomizerRegion dungeon, uint8_t requiredAmount) {
@@ -739,35 +712,6 @@ namespace Rando {
         }
     }
 
-    bool Logic::EventsUpdated() {
-        if (DekuTreeClearPast        != DekuTreeClear        ||
-            GoronRubyPast            != GoronRuby            ||
-            ZoraSapphirePast         != ZoraSapphire         ||
-            ForestTrialClearPast     != ForestTrialClear     ||
-            FireTrialClearPast       != FireTrialClear       ||
-            WaterTrialClearPast      != WaterTrialClear      ||
-            ShadowTrialClearPast     != ShadowTrialClear     ||
-            SpiritTrialClearPast     != SpiritTrialClear     ||
-            LightTrialClearPast      != LightTrialClear      ||
-            DrainWellPast            != DrainWell            ||
-            DampesWindmillAccessPast != DampesWindmillAccess ||
-            TimeTravelPast           != TimeTravel) {
-            DekuTreeClearPast         = DekuTreeClear;
-            GoronRubyPast             = GoronRuby;
-            ZoraSapphirePast          = ZoraSapphire;
-            ForestTrialClearPast      = ForestTrialClear;
-            FireTrialClearPast        = FireTrialClear;
-            WaterTrialClearPast       = WaterTrialClear;
-            ShadowTrialClearPast      = ShadowTrialClear;
-            SpiritTrialClearPast      = SpiritTrialClear;
-            LightTrialClearPast       = LightTrialClear;
-            DrainWellPast             = DrainWell;
-            DampesWindmillAccessPast  = DampesWindmillAccess;
-            return true;
-        }
-        return false;
-    }
-
     std::map<RandomizerGet, uint32_t> Logic::RandoGetToEquipFlag = {
         { RG_KOKIRI_SWORD,           EQUIP_FLAG_SWORD_KOKIRI },
         { RG_MASTER_SWORD,           EQUIP_FLAG_SWORD_MASTER },
@@ -1257,7 +1201,6 @@ namespace Rando {
             }
         } break;
         }
-        UpdateHelpers();
     }
 
     SaveContext* Logic::GetSaveContext() {
@@ -1562,48 +1505,12 @@ namespace Rando {
         AmmoCanDrop = /*AmmoDrops.IsNot(AMMODROPS_NONE) TODO: AmmoDrop setting*/ true;
 
         //Child item logic
-        KokiriSword   = false;
-        ZeldasLetter  = false;
-        WeirdEgg      = false;
-        HasBottle     = false;
-        MagicBean     = false;
-        RutosLetter   = false;
-        Boomerang     = false;
-        DinsFire      = false;
-        FaroresWind   = false;
-        NayrusLove    = false;
-        LensOfTruth   = false;
-        ShardOfAgony  = false;
         SkullMask     = false;
         MaskOfTruth   = false;
 
         //Adult logic
-        Hammer        = false;
-        IronBoots     = false;
-        HoverBoots    = false;
-        MirrorShield  = false;
-        GoronTunic    = false;
-        ZoraTunic     = false;
-        Epona         = false;
+        FreedEpona         = false;
         //BigPoe        = false;
-        GerudoToken   = false;
-        FireArrows    = false;
-        IceArrows     = false;
-        LightArrows   = false;
-        MasterSword   = false;
-        BiggoronSword = false;
-
-        //Trade Quest
-        PocketEgg     = false;
-        Cojiro        = false;
-        OddMushroom   = false;
-        OddPoultice   = false;
-        PoachersSaw   = false;
-        BrokenSword   = false;
-        Prescription  = false;
-        EyeballFrog   = false;
-        Eyedrops      = false;
-        ClaimCheck    = false;
 
         //Trade Quest Events
         WakeUpAdultTalon   = false;
@@ -1617,17 +1524,6 @@ namespace Rando {
         EyedropsAccess     = false;
         DisableTradeRevert = false;
 
-        //Stones and Meddallions
-        ForestMedallion = false;
-        FireMedallion   = false;
-        WaterMedallion  = false;
-        SpiritMedallion = false;
-        ShadowMedallion = false;
-        LightMedallion  = false;
-        KokiriEmerald   = false;
-        GoronRuby       = false;
-        ZoraSapphire    = false;
-
         //Dungeon Clears
         DekuTreeClear       = false;
         DodongosCavernClear = false;
@@ -1646,11 +1542,6 @@ namespace Rando {
         ShadowTrialClear = false;
         LightTrialClear  = false;
 
-        //Greg
-        Greg = false;
-        GregInBridgeLogic = false;
-        GregInLacsLogic = false;
-
         //Ocarina C Buttons
         bool ocBtnShuffle = ctx->GetOption(RSK_SHUFFLE_OCARINA_BUTTONS).Is(true);
         SetRandoInf(RAND_INF_HAS_OCARINA_A, !ocBtnShuffle);
@@ -1662,62 +1553,32 @@ namespace Rando {
         //Progressive Items
         SetUpgrade(UPG_STICKS, ctx->GetOption(RSK_SHUFFLE_DEKU_STICK_BAG).Is(true) ? 0 : 1);
         SetUpgrade(UPG_NUTS, ctx->GetOption(RSK_SHUFFLE_DEKU_NUT_BAG).Is(true) ? 0 : 1);
-        ProgressiveBulletBag  = 0;
-        ProgressiveBombBag    = 0;
-        ProgressiveMagic      = 0;
-        //If we're not shuffling swim, we start with it (scale 1)
-        ProgressiveScale = 0;
+
+        //If we're not shuffling swim, we start with it
         if (ctx->GetOption(RSK_SHUFFLE_SWIM).Is(false)) {
-            ProgressiveScale = 1;
             SetRandoInf(RAND_INF_CAN_SWIM, true);
         }
-        ProgressiveHookshot   = 0;
-        ProgressiveBow        = 0;
-        //If we're not shuffling child's wallet, we start with it (wallet 1)
-        ProgressiveWallet = 0;
+
+        //If we're not shuffling child's wallet, we start with it
         if (ctx->GetOption(RSK_SHUFFLE_CHILD_WALLET).Is(false)) {
-            ProgressiveWallet = 1;
             SetRandoInf(RAND_INF_HAS_WALLET, true);
         }
-        ProgressiveStrength   = 0;
-        ProgressiveOcarina    = 0;
-        ProgressiveGiantKnife = 0;
+
+        //If we're not shuffling fishing pole, we start with it
+        if (ctx->GetOption(RSK_SHUFFLE_FISHING_POLE).Is(false)) {
+            SetRandoInf(RAND_INF_FISHING_POLE_FOUND, true);
+        }
 
         //If not keysanity, start with 1 logical key to account for automatically unlocking the basement door in vanilla FiT
         if (!IsKeysanity && ctx->GetDungeon(Rando::FIRE_TEMPLE)->IsVanilla()) {
             SetSmallKeyCount(SCENE_FIRE_TEMPLE, 1);
         }
 
-        //Boss Keys
-        BossKeyForestTemple = 0;
-        BossKeyFireTemple   = 0;
-        BossKeyWaterTemple  = 0;
-        BossKeySpiritTemple = 0;
-        BossKeyShadowTemple = 0;
-        BossKeyGanonsCastle = 0;
-
-        //Gold Skulltula Count
-        GoldSkulltulaTokens = 0;
-
         //Bottle Count
         Bottles    = 0;
         NumBottles = 0;
         CanEmptyBigPoes = true;
 
-        //Triforce Pieces
-        TriforcePieces = 0;
-
-        //Boss Souls
-        CanSummonGohma        = false;
-        CanSummonKingDodongo  = false;
-        CanSummonBarinade     = false;
-        CanSummonPhantomGanon = false;
-        CanSummonVolvagia     = false;
-        CanSummonMorpha       = false;
-        CanSummonBongoBongo   = false;
-        CanSummonTwinrova     = false;
-        CanSummonGanon        = false;
-
         //Drops and Bottle Contents Access
         NutPot           = false;
         NutCrate         = false;
@@ -1736,122 +1597,33 @@ namespace Rando {
         FairyPot         = false;
         FreeFairies      = false;
         FairyPond        = false;
-        BombchuRefill    = false;
-        BombchusEnabled  = false;
-        BuyBombchus      = false;
-
-        BuySeed          = false;
-        BuyArrow         = false;
-        BuyBomb          = false;
-        BuyMagicPotion   = false;
-        BuyFish          = false;
-        BuyBugs          = false;
-        BuyFairy         = false;
 
         PieceOfHeart     = 0;
         HeartContainer   = 0;
-        DoubleDefense    = false;
 
         /* --- HELPERS, EVENTS, AND LOCATION ACCESS --- */
         /* These are used to simplify reading the logic, but need to be updated
         /  every time a base value is updated.                       */
 
-        BulletBag        = false;
-        Slingshot        = false;
-        Ocarina          = false;
-        OcarinaOfTime    = false;
-        BombBag          = false;
-        MagicMeter       = false;
-        Hookshot         = false;
-        Longshot         = false;
-        Quiver           = false;
-        Bow              = false;
-        GoronBracelet    = false;
-        SilverGauntlets  = false;
-        GoldenGauntlets  = false;
-        Swim             = false;
-        SilverScale      = false;
-        GoldScale        = false;
-        ChildsWallet     = false;
-        AdultsWallet     = false;
-
         ChildScarecrow   = false;
         AdultScarecrow   = false;
-        ScarecrowSong    = false;
-        Scarecrow        = false;
-        DistantScarecrow = false;
 
-        Bombs            = false;
-        DekuShield       = false;
-        HylianShield     = false;
-        BlueFire         = false;
-        BottleWithBigPoe = false;
-
-        CouldPlayBowling   = false;
-        HasExplosives    = false;
-        HasBoots         = false;
+        CouldPlayBowling = false;
         IsChild          = false;
         IsAdult          = false;
-        IsGlitched       = ctx->GetOption(RSK_LOGIC_RULES).Is(RO_LOGIC_GLITCHED);
-        CanBlastOrSmash  = false;
-        CanChildAttack   = false;
-        CanChildDamage   = false;
-        CanCutShrubs     = false;
-        CanDive          = false;
-        CanLeaveForest   = false;
-        CanPlantBugs     = false;
-        CanRideEpona     = false;
-        CanStunDeku      = false;
-        CanSummonGossipFairy = false;
-        CanSummonGossipFairyWithoutSuns = false;
         //CanPlantBean        = false;
-        CanOpenBombGrotto     = false;
-        CanOpenStormGrotto    = false;
         BigPoeKill            = false;
-        HookshotOrBoomerang   = false;
-        CanBreakUpperBeehives = false;
-        CanBreakLowerBeehives = false;
-        CanGetChildFish       = false;
-        CanGetAdultFish       = false;
-        FishingPole           = false;
-        CanFish               = false;
 
         BaseHearts      = ctx->GetOption(RSK_STARTING_HEARTS).Value<uint8_t>() + 1;
-        Hearts          = 0;
-        Multiplier      = (ctx->GetOption(RSK_DAMAGE_MULTIPLIER).Value<uint8_t>() < 6) ? ctx->GetOption(RSK_DAMAGE_MULTIPLIER).Value<uint8_t>() : 10;
-        EffectiveHealth = 0;
-        FireTimer       = 0;
-        WaterTimer      = 0;
-
-        GuaranteeTradePath     = false;
-        GuaranteeHint          = false;
-        HasFireSource          = false;
-        HasFireSourceWithTorch = false;
-
-        CanFinishGerudoFortress = false;
-
-        HasShield          = false;
-        CanShield          = false;
-        ChildShield        = false;
-        AdultReflectShield = false;
-        AdultShield        = false;
-        CanShieldFlick     = false;
-        CanJumpslash       = false;
-        CanUseProjectile   = false;
-        CanUseMagicArrow   = false;
+        
 
         //Bridge Requirements
-        HasAllStones          = false;
-        HasAllMedallions      = false;
-        CanBuildRainbowBridge = false;
         BuiltRainbowBridge    = false;
-        CanTriggerLACS        = false;
 
         //Other
         AtDay         = false;
         AtNight       = false;
-        Age           = ctx->GetSettings()->ResolvedStartingAge();
-        GetSaveContext()->linkAge = !Age;
+        GetSaveContext()->linkAge = !ctx->GetSettings()->ResolvedStartingAge();
 
         //Events
         ShowedMidoSwordAndShield  = false;
@@ -1877,23 +1649,7 @@ namespace Rando {
         ForestTempleAmyAndMeg     = false;
         FireLoopSwitch            = false;
         LinksCow                  = false;
-        AtDampeTime               = false;
         DeliverLetter             = false;
-        TimeTravel                = false;
-
-        DrainWellPast            = false;
-        DampesWindmillAccessPast = false;
-        DekuTreeClearPast        = false;
-        GoronRubyPast            = false;
-        ZoraSapphirePast         = false;
-        ForestTrialClearPast     = false;
-        FireTrialClearPast       = false;
-        WaterTrialClearPast      = false;
-        SpiritTrialClearPast     = false;
-        ShadowTrialClearPast     = false;
-        LightTrialClearPast      = false;
-        BuyDekuShieldPast        = false;
-        TimeTravelPast           = false;
 
         StopPerformanceTimer(PT_LOGIC_RESET);
     }
diff --git a/soh/soh/Enhancements/randomizer/logic.h b/soh/soh/Enhancements/randomizer/logic.h
index 89cb25927..3efae4d1d 100644
--- a/soh/soh/Enhancements/randomizer/logic.h
+++ b/soh/soh/Enhancements/randomizer/logic.h
@@ -31,49 +31,12 @@ class Logic {
     bool noVariable = false;
 
     // Child item logic
-    bool KokiriSword = false;
-    bool BulletBag = false;
-    bool ZeldasLetter = false;
-    bool WeirdEgg = false;
-    bool HasBottle = false;
-    bool MagicBean = false;
-    bool RutosLetter = false;
-    bool Boomerang = false;
-    bool DinsFire = false;
-    bool FaroresWind = false;
-    bool NayrusLove = false;
-    bool LensOfTruth = false;
-    bool ShardOfAgony = false;
     bool SkullMask = false;
     bool MaskOfTruth = false;
 
     // Adult logic
-    bool Hammer = false;
-    bool IronBoots = false;
-    bool HoverBoots = false;
-    bool MirrorShield = false;
-    bool GoronTunic = false;
-    bool ZoraTunic = false;
-    bool Epona = false;
+    bool FreedEpona = false;
     //bool BigPoe = false; //unused
-    bool GerudoToken = false;
-    bool FireArrows = false;
-    bool IceArrows = false;
-    bool LightArrows = false;
-    bool MasterSword = false;
-    bool BiggoronSword = false;
-
-    // Trade Quest
-    bool PocketEgg = false;
-    bool Cojiro = false;
-    bool OddMushroom = false;
-    bool OddPoultice = false;
-    bool PoachersSaw = false;
-    bool BrokenSword = false;
-    bool Prescription = false;
-    bool EyeballFrog = false;
-    bool Eyedrops = false;
-    bool ClaimCheck = false;
 
     // Trade Quest Events
     bool WakeUpAdultTalon = false;
@@ -87,17 +50,6 @@ class Logic {
     bool EyedropsAccess = false;
     bool DisableTradeRevert = false;
 
-    // Stones and Meddallions
-    bool ForestMedallion = false;
-    bool FireMedallion = false;
-    bool WaterMedallion = false;
-    bool SpiritMedallion = false;
-    bool ShadowMedallion = false;
-    bool LightMedallion = false;
-    bool KokiriEmerald = false;
-    bool GoronRuby = false;
-    bool ZoraSapphire = false;
-
     // Dungeon Clears
     bool DekuTreeClear = false;
     bool DodongosCavernClear = false;
@@ -116,52 +68,9 @@ class Logic {
     bool ShadowTrialClear = false;
     bool LightTrialClear = false;
 
-    // Greg
-    bool Greg = false;
-    bool GregInBridgeLogic = false;
-    bool GregInLacsLogic = false;
-
-    // Progressive Items
-    uint8_t ProgressiveBulletBag = 0;
-    uint8_t ProgressiveBombBag = 0;
-    uint8_t ProgressiveMagic = 0;
-    uint8_t ProgressiveScale = 0;
-    uint8_t ProgressiveHookshot = 0;
-    uint8_t ProgressiveBow = 0;
-    uint8_t ProgressiveWallet = 0;
-    uint8_t ProgressiveStrength = 0;
-    uint8_t ProgressiveOcarina = 0;
-    uint8_t ProgressiveGiantKnife = 0;
-
     // Logical keysanity
     bool IsKeysanity = false;
 
-    // Keys
-    uint8_t ForestTempleKeys = 0;
-    uint8_t FireTempleKeys = 0;
-    uint8_t WaterTempleKeys = 0;
-    uint8_t SpiritTempleKeys = 0;
-    uint8_t ShadowTempleKeys = 0;
-    uint8_t GanonsCastleKeys = 0;
-    uint8_t GerudoFortressKeys = 0;
-    uint8_t GerudoTrainingGroundsKeys = 0;
-    uint8_t BottomOfTheWellKeys = 0;
-    uint8_t TreasureGameKeys = 0;
-
-    // Triforce Pieces
-    uint8_t TriforcePieces = 0;
-
-    // Boss Keys
-    bool BossKeyForestTemple = false;
-    bool BossKeyFireTemple = false;
-    bool BossKeyWaterTemple = false;
-    bool BossKeySpiritTemple = false;
-    bool BossKeyShadowTemple = false;
-    bool BossKeyGanonsCastle = false;
-
-    // Gold Skulltula Count
-    uint8_t GoldSkulltulaTokens = 0;
-
     // Bottle Count
     uint8_t Bottles = 0;
     uint8_t NumBottles = 0;
@@ -186,149 +95,26 @@ class Logic {
     bool FreeFairies = false;
     bool FairyPond = false;
     bool AmmoCanDrop = false;
-    bool BombchuRefill = false;
-    bool BombchusEnabled  = false;
-    bool BuyBombchus = false;
-
-    bool BuySeed = false;
-    bool BuyArrow = false;
-    bool BuyBomb = false;
-    bool BuyMagicPotion = false;
-    bool BuyFish = false;
-    bool BuyBugs = false;
-    bool BuyFairy = false;
 
     uint8_t PieceOfHeart = 0;
     uint8_t HeartContainer = 0;
-    bool DoubleDefense = false;
-
-    /* --- HELPERS, EVENTS, AND LOCATION ACCESS --- */
-    /* These are used to simplify reading the logic, but need to be updated
-    /  every time a base value is updated.                       */
-
-    bool Ocarina = false;
-    bool OcarinaOfTime = false;
-    bool BombBag = false;
-    bool MagicMeter = false;
-    bool Hookshot = false;
-    bool Longshot = false;
-    bool Quiver = false;
-    bool GoronBracelet = false;
-    bool SilverGauntlets = false;
-    bool GoldenGauntlets = false;
-    bool Swim = false;
-    bool SilverScale = false;
-    bool GoldScale = false;
-    bool ChildsWallet = false;
-    bool AdultsWallet = false;
 
     bool ChildScarecrow = false;
     bool AdultScarecrow = false;
-    bool ScarecrowSong = false;
-    bool Scarecrow = false;
-    bool DistantScarecrow = false;
-
-    bool Slingshot = false;
-    bool Bombs = false;
-    bool Bow = false;
-    bool DekuShield = false;
-    bool HylianShield = false;
-    bool BlueFire = false;
-    bool BottleWithBigPoe = false;
-
-    bool OcarinaAButton      = false;
-    bool OcarinaCLeftButton  = false;
-    bool OcarinaCRightButton = false;
-    bool OcarinaCUpButton    = false;
-    bool OcarinaCDownButton  = false;
 
     bool CarpetMerchant = false;
     bool CouldPlayBowling = false;
-    bool HasExplosives = false;
-    bool HasBoots = false;
     bool IsChild = false;
     bool IsAdult = false;
-    bool IsGlitched = false;
-    bool CanBlastOrSmash = false;
-    bool CanChildAttack = false;
-    bool CanChildDamage = false;
-    bool CanAdultAttack = false;
-    bool CanAdultDamage = false;
-    bool CanCutShrubs = false;
-    bool CanDive = false;
-    bool CanLeaveForest = false;
-    bool CanPlantBugs = false;
-    bool CanRideEpona = false;
-    bool CanStunDeku = false;
-    bool CanSummonGossipFairy = false;
-    bool CanSummonGossipFairyWithoutSuns = false;
-    bool NeedNayrusLove = false;
-    bool CanSurviveDamage = false;
-    bool CanTakeDamage = false;
-    bool CanTakeDamageTwice = false;
-    // bool CanPlantBean        = false;
-    bool CanOpenBombGrotto = false;
-    bool CanOpenStormGrotto = false;
     bool BigPoeKill = false;
-    bool HookshotOrBoomerang = false;
-    bool CanGetNightTimeGS = false;
-    bool CanBreakLowerBeehives = false;
-    bool CanBreakUpperBeehives = false;
-    bool FishingPole = false;
-    bool CanGetChildFish = false;
-    bool CanGetAdultFish = false;
-    bool CanFish = false;
-
-    uint8_t OcarinaButtons = 0;
     uint8_t BaseHearts = 0;
-    uint8_t Hearts = 0;
-    uint8_t Multiplier = 0;
-    uint8_t EffectiveHealth = 0;
-    uint8_t FireTimer = 0;
-    uint8_t WaterTimer = 0;
-
-    bool GuaranteeTradePath = false;
-    bool GuaranteeHint = false;
-    bool HasFireSource = false;
-    bool HasFireSourceWithTorch = false;
-
-    bool CanFinishGerudoFortress = false;
-
-    bool HasShield = false;
-    bool CanShield = false;
-    bool ChildShield = false;
-    bool AdultReflectShield = false;
-    bool AdultShield = false;
-    bool CanShieldFlick = false;
-    bool CanJumpslash = false;
-    bool CanUseProjectile = false;
-    bool CanUseMagicArrow = false;
 
     // Bridge and LACS Requirements
-    uint8_t StoneCount = 0;
-    uint8_t MedallionCount = 0;
-    uint8_t DungeonCount = 0;
-    bool HasAllStones = false;
-    bool HasAllMedallions = false;
-    bool CanBuildRainbowBridge = false;
     bool BuiltRainbowBridge = false;
-    bool CanTriggerLACS = false;
 
     // Other
     bool AtDay = false;
     bool AtNight = false;
-    uint8_t Age = 0;
-    bool CanCompleteTriforce = false;
-
-    bool CanSummonGohma = false;
-    bool CanSummonKingDodongo = false;
-    bool CanSummonBarinade = false;
-    bool CanSummonPhantomGanon = false;
-    bool CanSummonVolvagia = false;
-    bool CanSummonMorpha = false;
-    bool CanSummonBongoBongo = false;
-    bool CanSummonTwinrova = false;
-    bool CanSummonGanon = false;
 
     // Events
     bool ShowedMidoSwordAndShield = false;
@@ -354,42 +140,12 @@ class Logic {
     bool ForestTempleAmyAndMeg = false;
     bool FireLoopSwitch = false;
     bool LinksCow = false;
-    bool AtDampeTime = false;
     bool DeliverLetter = false;
-    bool TimeTravel = false;
 
     /* --- END OF HELPERS AND LOCATION ACCESS --- */
 
-    // Placement Tracking
-    uint8_t AddedProgressiveBulletBags = 0;
-    uint8_t AddedProgressiveBombBags = 0;
-    uint8_t AddedProgressiveMagics = 0;
-    uint8_t AddedProgressiveScales = 0;
-    uint8_t AddedProgressiveHookshots = 0;
-    uint8_t AddedProgressiveBows = 0;
-    uint8_t AddedProgressiveWallets = 0;
-    uint8_t AddedProgressiveStrengths = 0;
-    uint8_t AddedProgressiveOcarinas = 0;
-    uint8_t TokensInPool = 0;
-
-    // Event checking past
-    bool DrainWellPast = false;
-    bool DampesWindmillAccessPast = false;
-    bool DekuTreeClearPast = false;
-    bool GoronRubyPast = false;
-    bool ZoraSapphirePast = false;
-    bool ForestTrialClearPast = false;
-    bool FireTrialClearPast = false;
-    bool WaterTrialClearPast = false;
-    bool SpiritTrialClearPast = false;
-    bool ShadowTrialClearPast = false;
-    bool LightTrialClearPast = false;
-    bool BuyDekuShieldPast = false;
-    bool TimeTravelPast = false;
-
     SaveContext* mSaveContext = nullptr;
     Logic();
-    void UpdateHelpers();
     bool CanUse(RandomizerGet itemName);
     bool HasProjectile(HasProjectileAge age);
     bool HasItem(RandomizerGet itemName);
@@ -400,8 +156,46 @@ class Logic {
     bool CanEquipSwap(RandomizerGet itemName);
     bool CanKillEnemy(std::string enemy);
     bool CanPassEnemy(std::string enemy);
-    bool EventsUpdated();
     uint8_t BottleCount();
+    uint8_t OcarinaButtons();
+    bool HasBottle();
+    bool CanJumpslash();
+    bool CanDamage();
+    bool CanAttack();
+    bool BombchusEnabled();
+    bool BombchuRefill();
+    bool HookshotOrBoomerang();
+    bool ScarecrowsSong();
+    bool BlueFire();
+    bool HasExplosives();
+    bool BlastOrSmash();
+    bool CanSpawnSoilSkull();
+    bool CanReflectNuts();
+    bool CanCutShrubs();
+    bool CanStunDeku();
+    bool CanLeaveForest();
+    bool CallGossipFairy();
+    bool CallGossipFairyExceptSuns();
+    bool EffectiveHealth();
+    uint8_t Hearts();
+    uint8_t StoneCount();
+    uint8_t MedallionCount();
+    uint8_t DungeonCount();
+    uint8_t FireTimer();
+    uint8_t WaterTimer();
+    bool TakeDamage();
+    bool CanOpenBombGrotto();
+    bool CanOpenStormsGrotto();
+    bool CanGetNightTimeGS();
+    bool CanBreakUpperBeehives();
+    bool CanBreakLowerBeehives();
+    bool HasFireSource();
+    bool HasFireSourceWithTorch();
+    bool CanFinishGerudoFortress();
+    bool CanShield();
+    bool CanUseProjectile();
+    bool CanBuildRainbowBridge();
+    bool CanTriggerLACS();
     void Reset();
     void SetContext(std::shared_ptr<Context> _ctx);
     bool GetInLogic(LogicVal logicVal);
diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h
index 28cd8dee1..4d05cffd8 100644
--- a/soh/soh/Enhancements/randomizer/randomizerTypes.h
+++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@@ -2171,6 +2171,7 @@ typedef enum {
     RG_DISTANT_SCARECROW,
     RG_STICKS,
     RG_NUTS,
+    RG_EPONA,
     RG_MAX
 } RandomizerGet;
 
diff --git a/soh/soh/Enhancements/randomizer/savefile.cpp b/soh/soh/Enhancements/randomizer/savefile.cpp
index bfa2f7606..bab0b4e41 100644
--- a/soh/soh/Enhancements/randomizer/savefile.cpp
+++ b/soh/soh/Enhancements/randomizer/savefile.cpp
@@ -327,6 +327,10 @@ extern "C" void Randomizer_InitSaveFile() {
         Flags_SetRandomizerInf(RAND_INF_HAS_WALLET);
     }
 
+    if (Randomizer_GetSettingValue(RSK_SHUFFLE_FISHING_POLE) == RO_GENERIC_OFF) {
+        Flags_SetRandomizerInf(RAND_INF_FISHING_POLE_FOUND);
+    }
+
     // Give Link's pocket item
     GiveLinksPocketItem();
 

From 84130b8046ff70c5aa3c63e0e749bb62860e77bf Mon Sep 17 00:00:00 2001
From: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>
Date: Thu, 3 Oct 2024 01:31:11 +0200
Subject: [PATCH 217/230] Add 5, 6 & 7 item shopsanity. (#4280)

* Format shops.cpp

* Add 5, 6 & 7 item shopsanity

* Guarantee a bombchu refill

* Fish first shop item index

* Clean up NonShopItems

* Split count options

* Improve item ordering

Ensure potions, blue fire and fairy on shopsanity 6 and less.
There are no hearts in the first 28 items (the ones from n64 rando).

* Post-merge fixes
---
 .../Enhancements/debugger/debugSaveEditor.cpp |   11 +-
 soh/soh/Enhancements/presets.h                |    5 +-
 .../Enhancements/randomizer/3drando/fill.cpp  |   35 +-
 .../randomizer/3drando/item_pool.cpp          |   10 +-
 .../Enhancements/randomizer/3drando/shops.cpp | 1776 +++++++++--------
 .../Enhancements/randomizer/3drando/shops.hpp |    5 +-
 .../randomizer/3drando/spoiler_log.cpp        |    2 +-
 soh/soh/Enhancements/randomizer/context.cpp   |    7 +-
 soh/soh/Enhancements/randomizer/item.cpp      |   18 +-
 .../randomizer/option_descriptions.cpp        |   16 +-
 .../Enhancements/randomizer/randomizer.cpp    |   14 +-
 .../Enhancements/randomizer/randomizerTypes.h |   22 +-
 .../randomizer/randomizer_check_objects.cpp   |   12 +-
 .../randomizer/randomizer_check_tracker.cpp   |    7 +-
 .../randomizer/randomizer_item_tracker.cpp    |    8 +-
 soh/soh/Enhancements/randomizer/settings.cpp  |   29 +-
 .../overlays/actors/ovl_En_Ossan/z_en_ossan.c |   10 +-
 17 files changed, 1095 insertions(+), 892 deletions(-)

diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp
index 55fafc505..46f142054 100644
--- a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp
+++ b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp
@@ -1320,7 +1320,16 @@ void DrawEquipmentTab() {
         "Giant (500)",
     };
     // only display Tycoon wallet if you're in a save file that would allow it.
-    if (IS_RANDO && OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHOPSANITY) > RO_SHOPSANITY_ZERO_ITEMS) {
+    if (
+        IS_RANDO &&
+        !(
+            OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHOPSANITY) == RO_SHOPSANITY_OFF ||
+            (
+                OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHOPSANITY) == RO_SHOPSANITY_SPECIFIC_COUNT &&
+                OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHOPSANITY_COUNT) == RO_SHOPSANITY_COUNT_ZERO_ITEMS
+            )
+        )
+    ) {
         const std::string walletName = "Tycoon (999)";
         walletNamesImpl.push_back(walletName);
     }
diff --git a/soh/soh/Enhancements/presets.h b/soh/soh/Enhancements/presets.h
index 5a4b2443c..53f41daad 100644
--- a/soh/soh/Enhancements/presets.h
+++ b/soh/soh/Enhancements/presets.h
@@ -1121,7 +1121,8 @@ const std::vector<PresetEntry> hellModePresetEntries = {
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("LinksPocket"), RO_LINKS_POCKET_NOTHING),
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("MQDungeons"), RO_MQ_DUNGEONS_RANDOM_NUMBER),
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("RainbowBridge"), RO_BRIDGE_DUNGEON_REWARDS),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("Shopsanity"), RO_SHOPSANITY_FOUR_ITEMS),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("Shopsanity"), RO_SHOPSANITY_SPECIFIC_COUNT),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShopsanityCount"), RO_SHOPSANITY_COUNT_FOUR_ITEMS),
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShopsanityPrices"), RO_SHOPSANITY_PRICE_TYCOON),
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleAdultTrade"), 1),
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleBeans"), 1),
@@ -1177,7 +1178,7 @@ const std::vector<PresetEntry> BenchmarkPresetEntries = {
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleDungeonReward"), RO_DUNGEON_REWARDS_END_OF_DUNGEON),
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("LinksPocket"), RO_LINKS_POCKET_DUNGEON_REWARD),
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleSongs"), RO_SONG_SHUFFLE_ANYWHERE),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("Shopsanity"), RO_SHOPSANITY_FOUR_ITEMS),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("Shopsanity"), RO_SHOPSANITY_COUNT_FOUR_ITEMS),
     //RANDOTODO add refactored price/scrub/merchant settings
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleTokens"), RO_TOKENSANITY_OFF),
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleBeehives"), RO_GENERIC_ON),
diff --git a/soh/soh/Enhancements/randomizer/3drando/fill.cpp b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
index 953b9338a..08861f7b4 100644
--- a/soh/soh/Enhancements/randomizer/3drando/fill.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
@@ -1158,7 +1158,7 @@ int Fill() {
     //Temporarily add shop items to the ItemPool so that entrance randomization
     //can validate the world using deku/hylian shields
     StartPerformanceTimer(PT_ENTRANCE_SHUFFLE);
-    AddElementsToPool(ItemPool, GetMinVanillaShopItems(32)); //assume worst case shopsanity 4
+    AddElementsToPool(ItemPool, GetMinVanillaShopItems(8)); //assume worst case shopsanity 7
     if (ctx->GetOption(RSK_SHUFFLE_ENTRANCES)) {
       SPDLOG_INFO("Shuffling Entrances...");
       if (ctx->GetEntranceShuffler()->ShuffleAllEntrances() == ENTRANCE_SHUFFLE_FAILURE) {
@@ -1175,36 +1175,41 @@ int Fill() {
 
     //ctx->showItemProgress = true;
     //Place shop items first, since a buy shield is needed to place a dungeon reward on Gohma due to access
-    
+
     StartPerformanceTimer(PT_SHOPSANITY);
-    NonShopItems = {};
+    NonShopItems.clear();
     if (ctx->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_OFF)) {
       SPDLOG_INFO("Placing Vanilla Shop Items...");
       PlaceVanillaShopItems(); //Place vanilla shop items in vanilla location
     } else {
       SPDLOG_INFO("Shuffling Shop Items");
       int total_replaced = 0;
-      if (ctx->GetOption(RSK_SHOPSANITY).IsNot(RO_SHOPSANITY_ZERO_ITEMS)) { //Shopsanity 1-4, random
-        //Initialize NonShopItems
-        ItemAndPrice init;
-        init.Name = Text{"No Item", "Sin objeto", "Pas d'objet"};
-        init.Price = -1;
-        init.Repurchaseable = false;
-        NonShopItems.assign(32, init);
-        //Indices from OoTR. So shopsanity one will overwrite 7, three will overwrite 7, 5, 8, etc.
-        const std::array<int, 4> indices = {7, 5, 8, 6};
+      if (ctx->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_RANDOM) || ctx->GetOption(RSK_SHOPSANITY_COUNT).IsNot(RO_SHOPSANITY_COUNT_ZERO_ITEMS)) { //Shopsanity 1-7, random
+        /*
+        Indices from OoTR. So shopsanity one will overwrite 7, three will overwrite 7, 5, 8, etc.
+          8 6    2 4
+          7 5    1 3
+        */
+        const std::array<int, 8> indices = { 7, 5, 8, 6, 3, 1, 4, 2 };
         //Overwrite appropriate number of shop items
         #define LOCATIONS_PER_SHOP 8
         for (size_t i = 0; i < Rando::StaticData::GetShopLocations().size() / LOCATIONS_PER_SHOP; i++) {
-          int num_to_replace = GetShopsanityReplaceAmount(); //1-4 shop items will be overwritten, depending on settings
+          int num_to_replace = GetShopsanityReplaceAmount(); //1-7 shop items will be overwritten, depending on settings
           total_replaced += num_to_replace;
           for (int j = 0; j < num_to_replace; j++) {
             int itemindex = indices[j];
             int shopsanityPrice = GetRandomShopPrice();
-            NonShopItems[TransformShopIndex(i * LOCATIONS_PER_SHOP + itemindex - 1)].Price =
-                shopsanityPrice; // Set price to be retrieved by the patch and textboxes
+            NonShopItems[Rando::StaticData::GetShopLocations()[i * LOCATIONS_PER_SHOP + itemindex - 1]].Price = shopsanityPrice; // Set price to be retrieved by the patch and textboxes
             ctx->GetItemLocation(Rando::StaticData::GetShopLocations()[i * LOCATIONS_PER_SHOP + itemindex - 1])->SetCustomPrice(shopsanityPrice);
           }
+          for (int j = num_to_replace; j < 8; j++) {
+            ItemAndPrice init;
+            init.Name = Text { "No Item", "Sin objeto", "Pas d'objet" };
+            init.Price = -1;
+            init.Repurchaseable = false;
+            int itemindex = indices[j];
+            NonShopItems[Rando::StaticData::GetShopLocations()[i * LOCATIONS_PER_SHOP + itemindex - 1]] = init; // Set price to be retrieved by the patch and textboxes
+          }
         }
         #undef LOCATIONS_PER_SHOP
       }
diff --git a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
index 33e6df5d4..464995df7 100644
--- a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
@@ -1159,9 +1159,15 @@ void GenerateItemPool() {
   }
 
   //Shopsanity
-  if (ctx->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_OFF) || ctx->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_ZERO_ITEMS)) {
+  if (
+    ctx->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_OFF) ||
+    (
+      ctx->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_SPECIFIC_COUNT) &&
+      ctx->GetOption(RSK_SHOPSANITY_COUNT).Is(RO_SHOPSANITY_COUNT_ZERO_ITEMS)
+    )
+  ) {
     AddItemsToPool(ItemPool, normalRupees);
-  } else { //Shopsanity 1-4, random
+  } else {
     AddItemsToPool(ItemPool, shopsanityRupees); //Shopsanity gets extra large rupees
   }
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/shops.cpp b/soh/soh/Enhancements/randomizer/3drando/shops.cpp
index 1aeb3379b..001c62ced 100644
--- a/soh/soh/Enhancements/randomizer/3drando/shops.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/shops.cpp
@@ -3,12 +3,12 @@
 #include "random.hpp"
 #include "shops.hpp"
 
+#include <array>
 #include <math.h>
 #include <map>
 #include "z64item.h"
 
-
-std::vector<ItemAndPrice> NonShopItems = {};
+std::map<RandomizerCheck, ItemAndPrice> NonShopItems = {};
 
 static std::array<std::vector<Text>, 0xF1> trickNameTable; // Table of trick names for ice traps
 bool initTrickNames = false; //Indicates if trick ice trap names have been initialized yet
@@ -29,82 +29,85 @@ void PlaceVanillaShopItems() {
 //Shopsanity random will have anywhere from the first 32 to the first 56, so the order of items after 32 is relevant
 std::vector<RandomizerGet> GetMinVanillaShopItems(int total_replaced) {
     std::vector<RandomizerGet> minShopItems = {
-    RG_BUY_DEKU_SHIELD,
-    RG_BUY_HYLIAN_SHIELD,
-    RG_BUY_GORON_TUNIC,
-    RG_BUY_ZORA_TUNIC,
-    RG_BUY_DEKU_NUTS_5,
-    RG_BUY_DEKU_NUTS_5,
-    RG_BUY_DEKU_NUTS_10,
-    RG_BUY_DEKU_STICK_1,
-    RG_BUY_DEKU_STICK_1,
-    RG_BUY_DEKU_SEEDS_30,
-    RG_BUY_ARROWS_10,
-    RG_BUY_ARROWS_10,
-    RG_BUY_ARROWS_30,
-    RG_BUY_ARROWS_50,
-    RG_BUY_BOMBCHUS_10,
-    RG_BUY_BOMBCHUS_10,
-    RG_BUY_BOMBCHUS_10,
-    RG_BUY_BOMBCHUS_20,
-    RG_BUY_BOMBS_525,
-    RG_BUY_BOMBS_535,
-    RG_BUY_BOMBS_10,
-    RG_BUY_BOMBS_20,
-    RG_BUY_GREEN_POTION,
-    RG_BUY_RED_POTION_30,
-    RG_BUY_BLUE_FIRE,
-    RG_BUY_FAIRYS_SPIRIT,
-    RG_BUY_BOTTLE_BUG,
-    RG_BUY_FISH,
-    //^First 28 items from OoTR
-    RG_BUY_HYLIAN_SHIELD,
-    RG_BUY_BOTTLE_BUG,
-    RG_BUY_DEKU_STICK_1,
-    RG_BUY_FAIRYS_SPIRIT,
-    //^First 32 items: Always guaranteed
-    RG_BUY_BLUE_FIRE,
-    RG_BUY_FISH,
-    RG_BUY_BOMBCHUS_10,
-    RG_BUY_DEKU_NUTS_5,
-    RG_BUY_ARROWS_10,
-    RG_BUY_BOMBCHUS_20,
-    RG_BUY_BOMBS_535,
-    RG_BUY_RED_POTION_30,
-    //^First 40 items: Exist on shopsanity 3 or less
-    RG_BUY_BOMBS_30,
-    RG_BUY_BOMBCHUS_20,
-    RG_BUY_DEKU_NUTS_5,
-    RG_BUY_ARROWS_10,
-    RG_BUY_DEKU_NUTS_5,
-    RG_BUY_ARROWS_30,
-    RG_BUY_RED_POTION_40,
-    RG_BUY_FISH,
-    //^First 48 items: Exist on shopsanity 2 or less
-    RG_BUY_BOMBCHUS_20,
-    RG_BUY_ARROWS_30,
-    RG_BUY_RED_POTION_50,
-    RG_BUY_ARROWS_30,
-    RG_BUY_DEKU_NUTS_5,
-    RG_BUY_ARROWS_50,
-    RG_BUY_ARROWS_50,
-    RG_BUY_GREEN_POTION,
-    //^First 56 items: Exist on shopsanity 1 or less
-    RG_BUY_POE,
-    RG_BUY_POE,
-    RG_BUY_HEART,
-    RG_BUY_HEART,
-    RG_BUY_HEART,
-    RG_BUY_HEART,
-    RG_BUY_HEART,
-    RG_BUY_HEART,
-    //^All 64 items: Only exist with shopsanity 0
-  };
-  //Now delete however many items there are to replace
-  for (int i = 0; i < total_replaced; i++) {
-    minShopItems.pop_back();
-  }
-  return minShopItems;
+        RG_BUY_DEKU_SHIELD,
+        RG_BUY_HYLIAN_SHIELD,
+        RG_BUY_GORON_TUNIC,
+        RG_BUY_ZORA_TUNIC,
+        RG_BUY_DEKU_NUTS_5,
+        RG_BUY_BOMBS_20,
+        RG_BUY_BOMBCHUS_10,
+        RG_BUY_DEKU_STICK_1,
+        //^First 8 items: Exist on shopsanity 7 or less
+        RG_BUY_FAIRYS_SPIRIT,
+        RG_BUY_DEKU_SEEDS_30,
+        RG_BUY_ARROWS_10,
+        RG_BUY_BLUE_FIRE,
+        RG_BUY_RED_POTION_30,
+        RG_BUY_GREEN_POTION,
+        RG_BUY_DEKU_NUTS_10,
+        RG_BUY_BOMBCHUS_10,
+        //^First 16 items: Exist on shopsanity 6 or less
+        RG_BUY_BOMBCHUS_10,
+        RG_BUY_BOMBCHUS_20,
+        RG_BUY_BOMBS_525,
+        RG_BUY_BOMBS_535,
+        RG_BUY_BOMBS_10,
+        RG_BUY_DEKU_NUTS_5,
+        RG_BUY_ARROWS_30,
+        RG_BUY_ARROWS_50,
+        //^First 24 items: Exist on shopsanity 5 or less
+        RG_BUY_ARROWS_10,
+        RG_BUY_FAIRYS_SPIRIT,
+        RG_BUY_BOTTLE_BUG,
+        RG_BUY_FISH,
+        //^First 28 items from OoTR
+        RG_BUY_HYLIAN_SHIELD,
+        RG_BUY_BOTTLE_BUG,
+        RG_BUY_DEKU_STICK_1,
+        RG_BUY_DEKU_STICK_1,
+        //^First 32 items: Exist on shopsanity 4 or less
+        RG_BUY_BLUE_FIRE,
+        RG_BUY_FISH,
+        RG_BUY_BOMBCHUS_10,
+        RG_BUY_DEKU_NUTS_5,
+        RG_BUY_ARROWS_10,
+        RG_BUY_BOMBCHUS_20,
+        RG_BUY_BOMBS_535,
+        RG_BUY_RED_POTION_30,
+        //^First 40 items: Exist on shopsanity 3 or less
+        RG_BUY_BOMBS_30,
+        RG_BUY_BOMBCHUS_20,
+        RG_BUY_DEKU_NUTS_5,
+        RG_BUY_ARROWS_10,
+        RG_BUY_DEKU_NUTS_5,
+        RG_BUY_ARROWS_30,
+        RG_BUY_RED_POTION_40,
+        RG_BUY_FISH,
+        //^First 48 items: Exist on shopsanity 2 or less
+        RG_BUY_BOMBCHUS_20,
+        RG_BUY_ARROWS_30,
+        RG_BUY_RED_POTION_50,
+        RG_BUY_ARROWS_30,
+        RG_BUY_DEKU_NUTS_5,
+        RG_BUY_ARROWS_50,
+        RG_BUY_ARROWS_50,
+        RG_BUY_GREEN_POTION,
+        //^First 56 items: Exist on shopsanity 1 or less
+        RG_BUY_POE,
+        RG_BUY_POE,
+        RG_BUY_HEART,
+        RG_BUY_HEART,
+        RG_BUY_HEART,
+        RG_BUY_HEART,
+        RG_BUY_HEART,
+        RG_BUY_HEART,
+        //^All 64 items: Only exist with shopsanity 0
+    };
+    //Now delete however many items there are to replace
+    for (int i = 0; i < total_replaced; i++) {
+        minShopItems.pop_back();
+    }
+    return minShopItems;
 }
 
 //This table contains a cumulative probability for each possible shop price based on
@@ -115,12 +118,12 @@ std::vector<RandomizerGet> GetMinVanillaShopItems(int total_replaced) {
 //Average price ~126
 //~38% chance of needing no wallet, ~45% chance of needing 1, ~17% chance of needing 2
 static constexpr std::array<double, 60> ShopPriceProbability= {
-  0.005326994, 0.014908518, 0.027114719, 0.041315285, 0.057136304, 0.074325887, 0.092667151, 0.112002061, 0.132198214, 0.153125390,
-  0.174696150, 0.196810540, 0.219388148, 0.242361379, 0.265657012, 0.289205134, 0.312970402, 0.336877590, 0.360881110, 0.384932772,
-  0.408976198, 0.432982176, 0.456902494, 0.480686053, 0.504313389, 0.527746488, 0.550938554, 0.573856910, 0.596465330, 0.618736235,
-  0.640646600, 0.662162782, 0.683240432, 0.703859801, 0.724001242, 0.743631336, 0.762722631, 0.781259986, 0.799198449, 0.816521905,
-  0.833208595, 0.849243398, 0.864579161, 0.879211177, 0.893112051, 0.906263928, 0.918639420, 0.930222611, 0.940985829, 0.950914731,
-  0.959992180, 0.968187000, 0.975495390, 0.981884488, 0.987344345, 0.991851853, 0.995389113, 0.997937921, 0.999481947, 1.000000000,
+    0.005326994, 0.014908518, 0.027114719, 0.041315285, 0.057136304, 0.074325887, 0.092667151, 0.112002061, 0.132198214, 0.153125390,
+    0.174696150, 0.196810540, 0.219388148, 0.242361379, 0.265657012, 0.289205134, 0.312970402, 0.336877590, 0.360881110, 0.384932772,
+    0.408976198, 0.432982176, 0.456902494, 0.480686053, 0.504313389, 0.527746488, 0.550938554, 0.573856910, 0.596465330, 0.618736235,
+    0.640646600, 0.662162782, 0.683240432, 0.703859801, 0.724001242, 0.743631336, 0.762722631, 0.781259986, 0.799198449, 0.816521905,
+    0.833208595, 0.849243398, 0.864579161, 0.879211177, 0.893112051, 0.906263928, 0.918639420, 0.930222611, 0.940985829, 0.950914731,
+    0.959992180, 0.968187000, 0.975495390, 0.981884488, 0.987344345, 0.991851853, 0.995389113, 0.997937921, 0.999481947, 1.000000000,
 };
 
 // Generate random number from 5 to wallet max
@@ -131,7 +134,7 @@ int GetPriceFromMax(int max) {
 // Get random price out of available "affordable prices", or just return 10 if Starter wallet is selected (no need to randomly select
 // from a single element)
 int GetPriceAffordable() {
-   auto ctx = Rando::Context::GetInstance();
+    auto ctx = Rando::Context::GetInstance();
     if (ctx->GetOption(RSK_SHOPSANITY_PRICES).Is(RO_SHOPSANITY_PRICE_STARTER)) {
         return 10;
     }
@@ -146,7 +149,7 @@ int GetPriceAffordable() {
 }
 
 int GetRandomShopPrice() {
-   auto ctx = Rando::Context::GetInstance();
+    auto ctx = Rando::Context::GetInstance();
     // If Shopsanity prices aren't Balanced, but Affordable is on, don't GetPriceFromMax
     if (ctx->GetOption(RSK_SHOPSANITY_PRICES_AFFORDABLE).Is(true) && ctx->GetOption(RSK_SHOPSANITY_PRICES).IsNot(RO_SHOPSANITY_PRICE_BALANCED)) {
         return GetPriceAffordable();
@@ -156,16 +159,13 @@ int GetRandomShopPrice() {
     int max = 0;
 
     // check settings for a wallet tier selection and set max amount as method for setting true randomization
-    if(ctx->GetOption(RSK_SHOPSANITY_PRICES).Is(RO_SHOPSANITY_PRICE_STARTER)) {
+    if (ctx->GetOption(RSK_SHOPSANITY_PRICES).Is(RO_SHOPSANITY_PRICE_STARTER)) {
         max = 19; // 95/5
-    }
-    else if (ctx->GetOption(RSK_SHOPSANITY_PRICES).Is(RO_SHOPSANITY_PRICE_ADULT)) {
+    } else if (ctx->GetOption(RSK_SHOPSANITY_PRICES).Is(RO_SHOPSANITY_PRICE_ADULT)) {
         max = 40; // 200/5
-    }
-    else if (ctx->GetOption(RSK_SHOPSANITY_PRICES).Is(RO_SHOPSANITY_PRICE_GIANT)) {
+    } else if (ctx->GetOption(RSK_SHOPSANITY_PRICES).Is(RO_SHOPSANITY_PRICE_GIANT)) {
         max = 100; // 500/5
-    }
-    else if (ctx->GetOption(RSK_SHOPSANITY_PRICES).Is(RO_SHOPSANITY_PRICE_TYCOON)) {
+    } else if (ctx->GetOption(RSK_SHOPSANITY_PRICES).Is(RO_SHOPSANITY_PRICE_TYCOON)) {
         max = 199; // 995/5
     }
     if (max != 0) {
@@ -175,8 +175,8 @@ int GetRandomShopPrice() {
     int price = 150; // JUST in case something fails with the randomization, return sane price for balanced
     double random = RandomDouble(); //Randomly generated probability value
     for (size_t i = 0; i < ShopPriceProbability.size(); i++) {
-        if (random < ShopPriceProbability[i]) {
         //The randomly generated value has surpassed the total probability up to this point, so this is the generated price
+        if (random < ShopPriceProbability[i]) {
             price = i * 5; //i in range [0, 59], output in range [0, 295] in increments of 5
             break;
         }
@@ -188,8 +188,8 @@ int GetRandomShopPrice() {
 // multiplied by 20 instead of 60 to give values in rage [0, 95] in increments of 5
 //Average price ~31
 static constexpr std::array<double, 20> ScrubPriceProbability = {
-  0.097500187, 0.190002748, 0.277509301, 0.360018376, 0.437522571, 0.510021715, 0.577520272, 0.640029304, 0.697527584, 0.750024535,
-  0.797518749, 0.840011707, 0.877508776, 0.910010904, 0.937504342, 0.960004661, 0.977502132, 0.989998967, 0.997500116, 1.000000000,
+    0.097500187, 0.190002748, 0.277509301, 0.360018376, 0.437522571, 0.510021715, 0.577520272, 0.640029304, 0.697527584, 0.750024535,
+    0.797518749, 0.840011707, 0.877508776, 0.910010904, 0.937504342, 0.960004661, 0.977502132, 0.989998967, 0.997500116, 1.000000000,
 };
 
 int16_t GetRandomScrubPrice() {
@@ -202,748 +202,884 @@ int16_t GetRandomScrubPrice() {
     return -1;
 }
 
-//Get 1 to 4, or a random number from 1-4 depending on shopsanity setting
+//Get 0 to 7, or a random number from 1-7 depending on shopsanity setting
 int GetShopsanityReplaceAmount() {
-   auto ctx = Rando::Context::GetInstance();
-  if (ctx->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_ONE_ITEM)) {
-    return 1;
-  } else if (ctx->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_TWO_ITEMS)) {
-    return 2;
-  } else if (ctx->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_THREE_ITEMS)) {
-    return 3;
-  } else if (ctx->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_FOUR_ITEMS)) {
-    return 4;
-  } else { //Random, get number in [1, 4]
-    return Random(1, 5);
-  }
+    auto ctx = Rando::Context::GetInstance();
+    if (ctx->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_OFF)) {
+        return 0;
+    } else if (ctx->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_SPECIFIC_COUNT)) {
+        if (ctx->GetOption(RSK_SHOPSANITY_COUNT).Is(RO_SHOPSANITY_COUNT_ZERO_ITEMS)) {
+            return 0;
+        } else if (ctx->GetOption(RSK_SHOPSANITY_COUNT).Is(RO_SHOPSANITY_COUNT_ONE_ITEM)) {
+            return 1;
+        } else if (ctx->GetOption(RSK_SHOPSANITY_COUNT).Is(RO_SHOPSANITY_COUNT_TWO_ITEMS)) {
+            return 2;
+        } else if (ctx->GetOption(RSK_SHOPSANITY_COUNT).Is(RO_SHOPSANITY_COUNT_THREE_ITEMS)) {
+            return 3;
+        } else if (ctx->GetOption(RSK_SHOPSANITY_COUNT).Is(RO_SHOPSANITY_COUNT_FOUR_ITEMS)) {
+            return 4;
+        } else if (ctx->GetOption(RSK_SHOPSANITY_COUNT).Is(RO_SHOPSANITY_COUNT_FIVE_ITEMS)) {
+            return 5;
+        } else if (ctx->GetOption(RSK_SHOPSANITY_COUNT).Is(RO_SHOPSANITY_COUNT_SIX_ITEMS)) {
+            return 6;
+        } else if (ctx->GetOption(RSK_SHOPSANITY_COUNT).Is(RO_SHOPSANITY_COUNT_SEVEN_ITEMS)) {
+            return 7;
+        } else if (ctx->GetOption(RSK_SHOPSANITY_COUNT).Is(RO_SHOPSANITY_COUNT_EIGHT_ITEMS)) {
+            return 8; //temporarily unreachable due to logic limitations
+        }
+    } else { //Random, get number in [1, 7]
+        return Random(1, 8);
+    }
 }
 
 //Initialize the table of trick names with an easy, medium, and hard name for each language
 void InitTrickNames() {
-  trickNameTable[RG_KOKIRI_SWORD] = {
-     Text{"Korok Sword", "Épée Korok", "Espada Korok"},
-     Text{"Hero's Sword", "Épée du Héros", "Espada del héroe"},
-     Text{"Razor Sword", "Lame Rasoir", "Espada de esmeril"}};
-  trickNameTable[RG_MASTER_SWORD] = { //Master Sword without the GI enum
-     Text{"Goddess Sword", "Épée de la déesse", "Espada Divina"},
-     Text{"Gilded Sword", "Excalibur", "Espada de los Sabios"},
-     Text{"Magical Sword", "Lame dorée", "Fay"}};
-  trickNameTable[RG_GIANTS_KNIFE] = {
-     Text{"Medigoron's Sword", "l'Épée de Medigoron", "La espada de Medigoron"},
-     Text{"Razor Sword", "Lame Rasoir", "Espada de esmeril"},
-     Text{"Royal Claymore", "Claymore Royale", "Royal Claymore"}};
-  trickNameTable[RG_BIGGORON_SWORD] = {
-     Text{"Power Sword", "Épée de Puissance", "Espada de poder"},
-     Text{"Fierce Deity Sword", "Épée du dieu démon", "Espada de la Fiera Deidad"},
-     Text{"Tempered Sword", "Épée de Légende Nv.2", "Espada Maestra mejorada"},
-     Text{"Biggoron's Knife", "Lame de Grogoron", "Daga de Biggoron"}};
-  trickNameTable[RG_DEKU_SHIELD] = {
-     Text{"Boko Shield", "Bouclier Boko", "Escudo Boko"},
-     Text{"Ordon Shield", "Bouclier de Toal", "Escudo de Ordon"},
-     Text{"Wooden Shield", "Bouclier de Bois", "Escudo de madera"}};
-  trickNameTable[RG_HYLIAN_SHIELD] = {
-     Text{"Hyrule Shield", "Bouclier d'Hyrule", "Escudo Hylian"},
-     Text{"Goddess Shield", "Bouclier Sacré", "Escudo Divino"},
-     Text{"Hero's Shield", "Bouclier du Héros", "Escudo del héroe"}};
-  trickNameTable[RG_MIRROR_SHIELD] = {
-     Text{"Magic Mirror", "Miroir Magique", "Escudo mágico"},
-     Text{"Magical Shield", "Bouclier Magique", "Escudo arcano"},
-     Text{"Mirror of Twilight", "Miroir des Ombres", "Espejo del Crepúsculo"}};
-  trickNameTable[RG_GORON_TUNIC] = {
-     Text{"Gerudo Top", "Tunique Gerudo", "Pechera gerudo"},
-     Text{"Flamebreaker Armor", "Armure de Pierre", "	Armadura ignífuga"},
-     Text{"Red Mail", "Habits Rouges", "Ropas rojas"}};
-  trickNameTable[RG_ZORA_TUNIC] = {
-     Text{"Rito Tunic", "Tunique Rito", "Sayo rito"},
-     Text{"Mermaid Suit", "Costume de sirène", "Costume de sirène"},
-     Text{"Zora Armor", "Armure Zora", "Túnica Zora"},
-     Text{"Blue Mail", "Habits Bleus", "Ropas azules"}};
-  trickNameTable[RG_IRON_BOOTS] = {
-     Text{"Iron Hoofs", "Patins de Plomb", "Botas férreas"},
-     Text{"Snow Boots", "Bottes de Neige", "Botas de nieve"},
-     Text{"Red Boots", "Bottes rouges", "Botas rojas"},
-     Text{"Zora Greaves", "Bottes Zora", "Zora Greaves"},
-     Text{"Boots of Power", "Bottes de Puissance", "Botas de plomo"}};
-  trickNameTable[RG_HOVER_BOOTS] = {
-     Text{"Hover Hoofs", "Patins des airs", "Botas flotadoras"},
-     Text{"Golden Boots", "Bottes dorées", "Botas de Oro"},
-     Text{"Pegasus Boots", "Bottes pégase", "Botas de Pegaso"},
-     Text{"Boots of Speed", "Bottes de vitesse", "Botas del desierto"}};
-  trickNameTable[RG_WEIRD_EGG] = {
-     Text{"Poached Egg", "Oeuf à la coque", "Huevo pasado"},
-     Text{"Lon Lon Egg", "Oeuf Lon Lon", "Huevo Lon Lon"},
-     Text{"Zora Egg", "Oeuf Zora", "Huevo Zora"}};
-  trickNameTable[RG_ZELDAS_LETTER] = {
+    trickNameTable[RG_KOKIRI_SWORD] = {
+        Text{"Korok Sword", "Épée Korok", "Espada Korok"},
+        Text{"Hero's Sword", "Épée du Héros", "Espada del héroe"},
+        Text{"Razor Sword", "Lame Rasoir", "Espada de esmeril"}
+    };
+    trickNameTable[RG_MASTER_SWORD] = {
+        Text{"Goddess Sword", "Épée de la déesse", "Espada Divina"},
+        Text{"Gilded Sword", "Excalibur", "Espada de los Sabios"},
+        Text{"Magical Sword", "Lame dorée", "Fay"}
+    };
+    trickNameTable[RG_GIANTS_KNIFE] = {
+        Text{"Medigoron's Sword", "l'Épée de Medigoron", "La espada de Medigoron"},
+        Text{"Razor Sword", "Lame Rasoir", "Espada de esmeril"},
+        Text{"Royal Claymore", "Claymore Royale", "Royal Claymore"}
+    };
+    trickNameTable[RG_BIGGORON_SWORD] = {
+        Text{"Power Sword", "Épée de Puissance", "Espada de poder"},
+        Text{"Fierce Deity Sword", "Épée du dieu démon", "Espada de la Fiera Deidad"},
+        Text{"Tempered Sword", "Épée de Légende Nv.2", "Espada Maestra mejorada"},
+        Text{"Biggoron's Knife", "Lame de Grogoron", "Daga de Biggoron"}
+    };
+    trickNameTable[RG_DEKU_SHIELD] = {
+        Text{"Boko Shield", "Bouclier Boko", "Escudo Boko"},
+        Text{"Ordon Shield", "Bouclier de Toal", "Escudo de Ordon"},
+        Text{"Wooden Shield", "Bouclier de Bois", "Escudo de madera"}
+    };
+    trickNameTable[RG_HYLIAN_SHIELD] = {
+        Text{"Hyrule Shield", "Bouclier d'Hyrule", "Escudo Hylian"},
+        Text{"Goddess Shield", "Bouclier Sacré", "Escudo Divino"},
+        Text{"Hero's Shield", "Bouclier du Héros", "Escudo del héroe"}
+    };
+    trickNameTable[RG_MIRROR_SHIELD] = {
+        Text{"Magic Mirror", "Miroir Magique", "Escudo mágico"},
+        Text{"Magical Shield", "Bouclier Magique", "Escudo arcano"},
+        Text{"Mirror of Twilight", "Miroir des Ombres", "Espejo del Crepúsculo"}
+    };
+    trickNameTable[RG_GORON_TUNIC] = {
+        Text{"Gerudo Top", "Tunique Gerudo", "Pechera gerudo"},
+        Text{"Flamebreaker Armor", "Armure de Pierre", "	Armadura ignífuga"},
+        Text{"Red Mail", "Habits Rouges", "Ropas rojas"}
+    };
+    trickNameTable[RG_ZORA_TUNIC] = {
+        Text{"Rito Tunic", "Tunique Rito", "Sayo rito"},
+        Text{"Mermaid Suit", "Costume de sirène", "Costume de sirène"},
+        Text{"Zora Armor", "Armure Zora", "Túnica Zora"},
+        Text{"Blue Mail", "Habits Bleus", "Ropas azules"}
+    };
+    trickNameTable[RG_IRON_BOOTS] = {
+        Text{"Iron Hoofs", "Patins de Plomb", "Botas férreas"},
+        Text{"Snow Boots", "Bottes de Neige", "Botas de nieve"},
+        Text{"Red Boots", "Bottes rouges", "Botas rojas"},
+        Text{"Zora Greaves", "Bottes Zora", "Zora Greaves"},
+        Text{"Boots of Power", "Bottes de Puissance", "Botas de plomo"}
+    };
+    trickNameTable[RG_HOVER_BOOTS] = {
+        Text{"Hover Hoofs", "Patins des airs", "Botas flotadoras"},
+        Text{"Golden Boots", "Bottes dorées", "Botas de Oro"},
+        Text{"Pegasus Boots", "Bottes pégase", "Botas de Pegaso"},
+        Text{"Boots of Speed", "Bottes de vitesse", "Botas del desierto"}
+    };
+    trickNameTable[RG_WEIRD_EGG] = {
+        Text{"Poached Egg", "Oeuf à la coque", "Huevo pasado"},
+        Text{"Lon Lon Egg", "Oeuf Lon Lon", "Huevo Lon Lon"},
+        Text{"Zora Egg", "Oeuf Zora", "Huevo Zora"}
+    };
+    trickNameTable[RG_ZELDAS_LETTER] = {
       Text{"Ruto's Letter", "Lettre de Ruto", "Carta de Ruto"},
-     Text{"Royal Letter", "Lettre Eoyale", "Carta para Kafei"},
-     Text{"Zelda's Business Card", "Carte d'affaires de Zelda", "Carta"},
-     Text{"Letter to Kafei", "Lettre pour Kafei", "Carta para Kafei "},
-     Text{"Goat's Letter", "Lettre de la Chèvre", "Carta de la Cabra"},
-     Text{"Maggie's Letter", "Lettre de Maggy", "Carta de Dolores"}};
-  trickNameTable[RG_BOOMERANG] = {
-     Text{"Banana", "Banane", "Plátano"},
-     Text{"Prank Fetch Toy", "Inséparable Bâtonnet", "Bumerang"},
-     Text{"Gale Boomerang", "Boomerang Tornade", "Bumerán tornado"},
-     Text{"Magic Boomerang", "Boomerang Magique", "Bumerán mágico"}};
-  trickNameTable[RG_LENS_OF_TRUTH] = {
-     Text{"Sheikah-leidoscope", "Sheikah-léidoscope", "Monóculo de la Verdad"},
-     Text{"Sheikah Sensor", "Sonar Sheikah", "Sensor Sheikah"},
-     Text{"Crystal of Vision", "Cristal de Vision", "Cristal de Visión"},
-     Text{"Magnifying Lens", "Loupe", "Lente Aumentadora"}};
-  trickNameTable[RG_MEGATON_HAMMER] = {
-     Text{"Goron Gavel", "Masse Perforatrice", "Mazo Goron"},
-     Text{"Magic Hammer", "Marteau Magique", "Martillo mágico"},
-     Text{"Skull Hammer", "Maillet Ressort", "Martillo de hierro"}};
-  trickNameTable[RG_STONE_OF_AGONY] = {
-     Text{"Cave Charm", "Charme de grotte", "Amuleto de la cueva"},
-     Text{"Stone of Agahnim", "Fragment d'Agahnim", "Piedra de Agahnim"},
-     Text{"Shard of Agony", "Fragment de Souffrance", "Piedra de la Agonía"},
-     Text{"Pirate's Charm", "Pierre de Pirate", "Amuleto Pirata"}};
-  trickNameTable[RG_DINS_FIRE] = {
-     Text{"Eldin's Fire", "Feu d'Eldin", "Fuego de Eldin"},
-     Text{"Din's Blaze", "Flamme de Din", "Poder de Din"},
-     Text{"Magic Lantern", "Lanterne Magique", "Linterna mágica"},
-     Text{"Ether Medallion", "Médaillon d'Éther", "Medallón de Tesoro"},
-     Text{"Bombos Medallion", "Médaillon des Flammes", "Medallón del Temblor"}};
-  trickNameTable[RG_FARORES_WIND] = {
-     Text{"Faron's Wind", "Vent de Firone", "Viento de Farone"},
-     Text{"Farore's Windfall", "Zéphyr de Farore", "Valor de Farore"},
-     Text{"Tingle Air", "Tingle Air", "Tingle de aire"},
-     Text{"Travel Medallion", "Amulette de téléportation", "Medallón Maligno"},
-     Text{"Irene's Taxi", "Le taxi d'Aëline", "El taxi de Airín"}};
-  trickNameTable[RG_NAYRUS_LOVE] = {
-     Text{"Lanayru's Love", "Amour de Lanelle", "Amor de Lanayru"},
-     Text{"Nayru's Passion", "Passion de Nayru", "Sabiduría de Nayru"},
-     Text{"Tingle Shield", "Bouclier Tingle", "Escudo de hormigueo"},
-     Text{"Shield Spell", "Bouclier Magique", "Hechizo de Protección"},
-     Text{"Magic Armor", "Armure Magique", "Armadura mágica"}};
-  trickNameTable[RG_FIRE_ARROWS] = {
-     Text{"Fire Rod", "Baguette de feu", "Cetro de fuego"},
-     Text{"Bomb Arrow", "Flèche-Bombe", "Flecha bomba"},
-     Text{"Red Candle", "Bougie Rouge", "Vela roja"}};
-  trickNameTable[RG_ICE_ARROWS] = {
-     Text{"Ice Rod", "Baguette des Glaces", "Cetro de Hielo"},
-     Text{"Ancient Arrow", "Flèche Archéonique", "Flecha ancestral"},
-     Text{"Ice Trap Arrow", "Flèche de Piège de Glace", "Cetro de hielo"}};
-  trickNameTable[RG_LIGHT_ARROWS] = {
-     Text{"Wind Arrow", "Flèche de Vent", "Flecha del Viento"},
-     Text{"Wand of Gamelon", "Baguette de Gamelon", "Varita de Gamelón"},
-     Text{"Shock Arrow", "Flèches Électriques", "Flecha eléctrica"},
-     Text{"Silver Arrow", "Flèches d'Argent", "Flecha de plata"}};
-  trickNameTable[RG_GERUDO_MEMBERSHIP_CARD] = {
-     Text{"Desert Title Deed", "Abonnement Gerudo", "Escritura del desierto"},
-     Text{"Sickle Moon Flag", "Drapeau du croissant de lune", "Bandera de la Luna Creciente"},
-     Text{"Complimentary ID", "Bon de félicitation", "Cupón especial"},
-     Text{"Gerudo's Card", "Carte Goron", "Tóken Gerudo"},
-     Text{"Gerudo's Membership Card", "Autographe de Nabooru", "Tarjeta Gerudo"}};
+        Text{"Royal Letter", "Lettre Eoyale", "Carta para Kafei"},
+        Text{"Zelda's Business Card", "Carte d'affaires de Zelda", "Carta"},
+        Text{"Letter to Kafei", "Lettre pour Kafei", "Carta para Kafei "},
+        Text{"Goat's Letter", "Lettre de la Chèvre", "Carta de la Cabra"},
+        Text{"Maggie's Letter", "Lettre de Maggy", "Carta de Dolores"}
+    };
+    trickNameTable[RG_BOOMERANG] = {
+        Text{"Banana", "Banane", "Plátano"},
+        Text{"Prank Fetch Toy", "Inséparable Bâtonnet", "Bumerang"},
+        Text{"Gale Boomerang", "Boomerang Tornade", "Bumerán tornado"},
+        Text{"Magic Boomerang", "Boomerang Magique", "Bumerán mágico"}
+    };
+    trickNameTable[RG_LENS_OF_TRUTH] = {
+        Text{"Sheikah-leidoscope", "Sheikah-léidoscope", "Monóculo de la Verdad"},
+        Text{"Sheikah Sensor", "Sonar Sheikah", "Sensor Sheikah"},
+        Text{"Crystal of Vision", "Cristal de Vision", "Cristal de Visión"},
+        Text{"Magnifying Lens", "Loupe", "Lente Aumentadora"}
+    };
+    trickNameTable[RG_MEGATON_HAMMER] = {
+        Text{"Goron Gavel", "Masse Perforatrice", "Mazo Goron"},
+        Text{"Magic Hammer", "Marteau Magique", "Martillo mágico"},
+        Text{"Skull Hammer", "Maillet Ressort", "Martillo de hierro"}
+    };
+    trickNameTable[RG_STONE_OF_AGONY] = {
+        Text{"Cave Charm", "Charme de grotte", "Amuleto de la cueva"},
+        Text{"Stone of Agahnim", "Fragment d'Agahnim", "Piedra de Agahnim"},
+        Text{"Shard of Agony", "Fragment de Souffrance", "Piedra de la Agonía"},
+        Text{"Pirate's Charm", "Pierre de Pirate", "Amuleto Pirata"}
+    };
+    trickNameTable[RG_DINS_FIRE] = {
+        Text{"Eldin's Fire", "Feu d'Eldin", "Fuego de Eldin"},
+        Text{"Din's Blaze", "Flamme de Din", "Poder de Din"},
+        Text{"Magic Lantern", "Lanterne Magique", "Linterna mágica"},
+        Text{"Ether Medallion", "Médaillon d'Éther", "Medallón de Tesoro"},
+        Text{"Bombos Medallion", "Médaillon des Flammes", "Medallón del Temblor"}
+    };
+    trickNameTable[RG_FARORES_WIND] = {
+        Text{"Faron's Wind", "Vent de Firone", "Viento de Farone"},
+        Text{"Farore's Windfall", "Zéphyr de Farore", "Valor de Farore"},
+        Text{"Tingle Air", "Tingle Air", "Tingle de aire"},
+        Text{"Travel Medallion", "Amulette de téléportation", "Medallón Maligno"},
+        Text{"Irene's Taxi", "Le taxi d'Aëline", "El taxi de Airín"}
+    };
+    trickNameTable[RG_NAYRUS_LOVE] = {
+        Text{"Lanayru's Love", "Amour de Lanelle", "Amor de Lanayru"},
+        Text{"Nayru's Passion", "Passion de Nayru", "Sabiduría de Nayru"},
+        Text{"Tingle Shield", "Bouclier Tingle", "Escudo de hormigueo"},
+        Text{"Shield Spell", "Bouclier Magique", "Hechizo de Protección"},
+        Text{"Magic Armor", "Armure Magique", "Armadura mágica"}
+    };
+    trickNameTable[RG_FIRE_ARROWS] = {
+        Text{"Fire Rod", "Baguette de feu", "Cetro de fuego"},
+        Text{"Bomb Arrow", "Flèche-Bombe", "Flecha bomba"},
+        Text{"Red Candle", "Bougie Rouge", "Vela roja"}
+    };
+    trickNameTable[RG_ICE_ARROWS] = {
+        Text{"Ice Rod", "Baguette des Glaces", "Cetro de Hielo"},
+        Text{"Ancient Arrow", "Flèche Archéonique", "Flecha ancestral"},
+        Text{"Ice Trap Arrow", "Flèche de Piège de Glace", "Cetro de hielo"}
+    };
+    trickNameTable[RG_LIGHT_ARROWS] = {
+        Text{"Wind Arrow", "Flèche de Vent", "Flecha del Viento"},
+        Text{"Wand of Gamelon", "Baguette de Gamelon", "Varita de Gamelón"},
+        Text{"Shock Arrow", "Flèches Électriques", "Flecha eléctrica"},
+        Text{"Silver Arrow", "Flèches d'Argent", "Flecha de plata"}
+    };
+    trickNameTable[RG_GERUDO_MEMBERSHIP_CARD] = {
+        Text{"Desert Title Deed", "Abonnement Gerudo", "Escritura del desierto"},
+        Text{"Sickle Moon Flag", "Drapeau du croissant de lune", "Bandera de la Luna Creciente"},
+        Text{"Complimentary ID", "Bon de félicitation", "Cupón especial"},
+        Text{"Gerudo's Card", "Carte Goron", "Tóken Gerudo"},
+        Text{"Gerudo's Membership Card", "Autographe de Nabooru", "Tarjeta Gerudo"}
+    };
 
-  trickNameTable[RG_MAGIC_BEAN_PACK] = {
-     Text{"Funky Bean Pack", "Paquet de Fèves Magiques", "Lote de frijoles mágicos"},
-     Text{"Grapple Berries", "Baies de grappin", "Bayas de garfio"},
-     Text{"Crenel Bean Pack", "Paquet de Haricots Gonggle", "Lote de alubias mágicas"},
-     Text{"Mystical Seed Pack", "Pack de graines mystiques", "Paquete de semillas místicas"}};
-  trickNameTable[RG_DOUBLE_DEFENSE] = {
-     Text{"Diamond Hearts", "Coeurs de Diamant", "Contenedor de diamante"},
-     Text{"Double Damage", "Double Souffrance", "Doble daño receptivo"},
-     Text{"Quadruple Defence", "Quadruple Défence", "Defensa cuádruple"}};
+    trickNameTable[RG_MAGIC_BEAN_PACK] = {
+        Text{"Funky Bean Pack", "Paquet de Fèves Magiques", "Lote de frijoles mágicos"},
+        Text{"Grapple Berries", "Baies de grappin", "Bayas de garfio"},
+        Text{"Crenel Bean Pack", "Paquet de Haricots Gonggle", "Lote de alubias mágicas"},
+        Text{"Mystical Seed Pack", "Pack de graines mystiques", "Paquete de semillas místicas"}
+    };
+    trickNameTable[RG_DOUBLE_DEFENSE] = {
+        Text{"Diamond Hearts", "Coeurs de Diamant", "Contenedor de diamante"},
+        Text{"Double Damage", "Double Souffrance", "Doble daño receptivo"},
+        Text{"Quadruple Defence", "Quadruple Défence", "Defensa cuádruple"}
+    };
 
-  trickNameTable[RG_POCKET_EGG] = {
-     Text{"Arpagos Egg", "Oeuf d'Arpagos", "Huevo de Arpagos"},
-     Text{"Lon Lon Egg", "oeuf Lon Lon", "Huevo Lon Lon"},
-     Text{"Zora Egg", "oeuf Zora", "Huevo del Pez Viento"}};
-  trickNameTable[RG_POCKET_EGG] = {
-     Text{"D.I.Y. Alarm Clock", "Réveille-matin improvisé", "Alarma emplumada portátil"},
-     Text{"Kakariko Cucco", "Cocotte Cocorico", "Cuco de Kakariko"},
-     Text{"Hatched Cucco", "Cocotte éclose", "Pollo de bolsillo"}};
-  trickNameTable[RG_COJIRO] = {
-     Text{"Blucco", "Chair-Qui-Poule", "Cucazul"},
-     Text{"Piyoko", "Piyoko", "Piyoko"},
-     Text{"Dark Cucco", "Cocotte Sombre", "Cucco oscuro"},
-     Text{"Grog's Cucco", "Cocotte de Grog", "Cuco de Grog"}};
-  trickNameTable[RG_ODD_MUSHROOM] = {
-     Text{"Magic Mushroom", "Champignon magique", "Champiñón mágico"},
-     Text{"Endura Shroom", "Champi Vigueur", "Champiñón del bosque"},
-     Text{"Sleepy Toadstool", "Crapaud Fatigué", "Seta durmiente"},
-     Text{"Mushroom", "Champignon", "Seta"}};
-  trickNameTable[RG_ODD_POTION] = {
-     Text{"Odd Medicine", "Élixir suspect", "Poción rara"},
-     Text{"Granny's Poultice", "Mixture de Granny", "Medicina de la abuela"},
-     Text{"Mushroom Poultice", "Mixture de champignon", "Medicina de champiñones"},
-     Text{"Secret Medicine", "Médicament", "Pócima secreta"},
-     Text{"Mushroom Spores", "Spores de Champignons", "Esporas de hongos"},
-     Text{"Hanyu Spore", "Hanyu Spore", "Espora Hanyu"}};
-  trickNameTable[RG_POACHERS_SAW] = {
-     Text{"Carpenter's Saw", "Scie du charpentier", "Sierra del carpintero"},
-     Text{"Poacher's Sword", "Hache du chasseur", "Espada del capataz"},
-     Text{"Ancient Bladesaw", "Longue Épée Archéonique", "Mandoble ancestral"},
-     Text{"Woodcutter's Axe", "Hache du Bûcheron", "Hacha de leñador"},
-     Text{"Grog's Saw", "Scie de Grog", "Sierra del Cazador Furtivo"}};
-  trickNameTable[RG_BROKEN_SWORD] = {
-     Text{"Broken Biggoron's Sword", "Épée brisée de Grogoron", "Espada de Biggoron rota"},
-     Text{"Broken Giant's Knife", "Lame des Géants brisée", "Daga gigante rota"},
-     Text{"Broken Noble Sword", "Épée noble brisée", "Espada noble rota"},
-     Text{"Broken Picori Blade", "Épée Minish brisée", "Espada minish rota"},
-     Text{"Decayed Master Sword", "Épée de légende pourrie", "Espada decadente de leyenda"}};
-  trickNameTable[RG_PRESCRIPTION] = {
-     Text{"Biggoron's Prescription", "Ordonnance de Grogoron", "Receta de Biggoron"},
-     Text{"Eyedrop Prescription", "Ordonnance de gouttes", "Receta ocular"},
-     Text{"Urgent Prescription", "Ordonnance urgente", "Prescripción"},
-     Text{"Swordsman's Scroll", "Précis d'escrime", "Esgrimidorium"},
-     Text{"Portrait of Oren", "Portrait d'Orlène", "Retrato de Oren"},
-     Text{"Letter to King Zora", "Lettre au roi Zora", "Carta al Rey Zora"}};
-  trickNameTable[RG_EYEBALL_FROG] = {
-     Text{"Don Gero", "Don Gero", "Don Gero"},
-     Text{"Hot-Footed Frog", "Grenouille à pieds chauds", "Rana de patas calientes"},
-     Text{"Lost Swordsmith", "Forgeron perdu", "Espadachín perdido"},
-     Text{"Eyedrop Frog", "Grenouille-qui-louche", "Globo Ocular de Rana"}};
-  trickNameTable[RG_EYEDROPS] = {
-     Text{"Biggoron's Eyedrops", "Gouttes de Grogoron", "Gotas de Biggoron"},
-     Text{"Hyrule's Finest Eyedrops", "Eau du Lac Hylia", "Gotas oculares"},
-     Text{"Moon's Tear", "Larme de Lune", "Lágrima de Luna"},
-     Text{"Engine Grease", "Graisse moteur", "Grasa del motor"},
-     Text{"Zora Perfume", "Parfum Zora", "Perfume Zora"}};
-  trickNameTable[RG_CLAIM_CHECK] = {
-     Text{"Clay Check", "Certificat Grogoron", "Comprobante de Reclamación"},
-     Text{"Ancient Tablet", "Stèle ancienne", "Litografía arcana"},
-     Text{"Sheikah Slate", "Tablette Sheikah", "Piedra Sheikah"},
-     Text{"Cyclone Slate", "Ardoise des tornades", "Pizarra de los Torbellinos"}};
+    trickNameTable[RG_POCKET_EGG] = {
+        Text{"Arpagos Egg", "Oeuf d'Arpagos", "Huevo de Arpagos"},
+        Text{"Lon Lon Egg", "oeuf Lon Lon", "Huevo Lon Lon"},
+        Text{"Zora Egg", "oeuf Zora", "Huevo del Pez Viento"}
+    };
+    trickNameTable[RG_POCKET_EGG] = {
+        Text{"D.I.Y. Alarm Clock", "Réveille-matin improvisé", "Alarma emplumada portátil"},
+        Text{"Kakariko Cucco", "Cocotte Cocorico", "Cuco de Kakariko"},
+        Text{"Hatched Cucco", "Cocotte éclose", "Pollo de bolsillo"}
+    };
+    trickNameTable[RG_COJIRO] = {
+        Text{"Blucco", "Chair-Qui-Poule", "Cucazul"},
+        Text{"Piyoko", "Piyoko", "Piyoko"},
+        Text{"Dark Cucco", "Cocotte Sombre", "Cucco oscuro"},
+        Text{"Grog's Cucco", "Cocotte de Grog", "Cuco de Grog"}
+    };
+    trickNameTable[RG_ODD_MUSHROOM] = {
+        Text{"Magic Mushroom", "Champignon magique", "Champiñón mágico"},
+        Text{"Endura Shroom", "Champi Vigueur", "Champiñón del bosque"},
+        Text{"Sleepy Toadstool", "Crapaud Fatigué", "Seta durmiente"},
+        Text{"Mushroom", "Champignon", "Seta"}
+    };
+    trickNameTable[RG_ODD_POTION] = {
+        Text{"Odd Medicine", "Élixir suspect", "Poción rara"},
+        Text{"Granny's Poultice", "Mixture de Granny", "Medicina de la abuela"},
+        Text{"Mushroom Poultice", "Mixture de champignon", "Medicina de champiñones"},
+        Text{"Secret Medicine", "Médicament", "Pócima secreta"},
+        Text{"Mushroom Spores", "Spores de Champignons", "Esporas de hongos"},
+        Text{"Hanyu Spore", "Hanyu Spore", "Espora Hanyu"}
+    };
+    trickNameTable[RG_POACHERS_SAW] = {
+        Text{"Carpenter's Saw", "Scie du charpentier", "Sierra del carpintero"},
+        Text{"Poacher's Sword", "Hache du chasseur", "Espada del capataz"},
+        Text{"Ancient Bladesaw", "Longue Épée Archéonique", "Mandoble ancestral"},
+        Text{"Woodcutter's Axe", "Hache du Bûcheron", "Hacha de leñador"},
+        Text{"Grog's Saw", "Scie de Grog", "Sierra del Cazador Furtivo"}
+    };
+    trickNameTable[RG_BROKEN_SWORD] = {
+        Text{"Broken Biggoron's Sword", "Épée brisée de Grogoron", "Espada de Biggoron rota"},
+        Text{"Broken Giant's Knife", "Lame des Géants brisée", "Daga gigante rota"},
+        Text{"Broken Noble Sword", "Épée noble brisée", "Espada noble rota"},
+        Text{"Broken Picori Blade", "Épée Minish brisée", "Espada minish rota"},
+        Text{"Decayed Master Sword", "Épée de légende pourrie", "Espada decadente de leyenda"}
+    };
+    trickNameTable[RG_PRESCRIPTION] = {
+        Text{"Biggoron's Prescription", "Ordonnance de Grogoron", "Receta de Biggoron"},
+        Text{"Eyedrop Prescription", "Ordonnance de gouttes", "Receta ocular"},
+        Text{"Urgent Prescription", "Ordonnance urgente", "Prescripción"},
+        Text{"Swordsman's Scroll", "Précis d'escrime", "Esgrimidorium"},
+        Text{"Portrait of Oren", "Portrait d'Orlène", "Retrato de Oren"},
+        Text{"Letter to King Zora", "Lettre au roi Zora", "Carta al Rey Zora"}
+    };
+    trickNameTable[RG_EYEBALL_FROG] = {
+        Text{"Don Gero", "Don Gero", "Don Gero"},
+        Text{"Hot-Footed Frog", "Grenouille à pieds chauds", "Rana de patas calientes"},
+        Text{"Lost Swordsmith", "Forgeron perdu", "Espadachín perdido"},
+        Text{"Eyedrop Frog", "Grenouille-qui-louche", "Globo Ocular de Rana"}
+    };
+    trickNameTable[RG_EYEDROPS] = {
+        Text{"Biggoron's Eyedrops", "Gouttes de Grogoron", "Gotas de Biggoron"},
+        Text{"Hyrule's Finest Eyedrops", "Eau du Lac Hylia", "Gotas oculares"},
+        Text{"Moon's Tear", "Larme de Lune", "Lágrima de Luna"},
+        Text{"Engine Grease", "Graisse moteur", "Grasa del motor"},
+        Text{"Zora Perfume", "Parfum Zora", "Perfume Zora"}
+    };
+    trickNameTable[RG_CLAIM_CHECK] = {
+        Text{"Clay Check", "Certificat Grogoron", "Comprobante de Reclamación"},
+        Text{"Ancient Tablet", "Stèle ancienne", "Litografía arcana"},
+        Text{"Sheikah Slate", "Tablette Sheikah", "Piedra Sheikah"},
+        Text{"Cyclone Slate", "Ardoise des tornades", "Pizarra de los Torbellinos"}
+    };
 
-  trickNameTable[RG_GOLD_SKULLTULA_TOKEN] = {
-     Text{"Skulltula Token", "Bon de Skulltula dorée", "Símbolo de Skulltula"},
-     Text{"Golden Skulltula Spirit", "Pièce de Skulltula dorée", "Tóken de Skulltula Dorada"},
-     Text{"Gold Walltula Token", "Jeton de Walltula dorée", "Skulltula dorada"},
-     Text{"Maiamai", "Ti'gorneau", "Maimai"},
-     Text{"Gratitude Crystal", "Cristal de gratitude", "Gema de gratitud"},
-     Text{"Korok Seed", "Noix korogu", "Semilla de kolog"}};
+    trickNameTable[RG_GOLD_SKULLTULA_TOKEN] = {
+        Text{"Skulltula Token", "Bon de Skulltula dorée", "Símbolo de Skulltula"},
+        Text{"Golden Skulltula Spirit", "Pièce de Skulltula dorée", "Tóken de Skulltula Dorada"},
+        Text{"Gold Walltula Token", "Jeton de Walltula dorée", "Skulltula dorada"},
+        Text{"Maiamai", "Ti'gorneau", "Maimai"},
+        Text{"Gratitude Crystal", "Cristal de gratitude", "Gema de gratitud"},
+        Text{"Korok Seed", "Noix korogu", "Semilla de kolog"}
+    };
 
-  trickNameTable[RG_PROGRESSIVE_HOOKSHOT] = {
-     Text{"Progressive Grappling Hook", "Lance-chaîne (prog.)", "Garra progresiva"},
-     Text{"Progressive Clawshot", "Grappin-griffe (prog.)", "Zarpa progresiva"},
-     Text{"Progressive Gripshot", "Grappince (prog.)", "Enganchador progresivo"},
-     Text{"Progressive Rope", "Corde (prog.)", "Cuerda progresivo"}};
-  trickNameTable[RG_PROGRESSIVE_STRENGTH] = {
-     Text{"Power Glove", "Gant de Puissance (prog.)", "Guanteletes progresivos"},
-     Text{"Power Bracelet", "Bracelet de Force (prog.)", "Brasaletes progresivos"},
-     Text{"Magic Bracelet", "Bracelet Magique (prog.)", "Manoplas progresivas"}};
-  trickNameTable[RG_PROGRESSIVE_BOMB_BAG] = {
-     Text{"Progressive Bomb Capacity", "Capacité de bombes (prog.)", "Mayor capacidad de bombas"},
-     Text{"Progressive Bomb Pack", "Paquet de bombes (prog.)", "Zurrón de bombas progresivo"},
-     Text{"Progressive Bomb Box", "Boîte à bombes (prog.)", "Bolsa de bombas progresiva"},
-     Text{"Progressive Blast Mask", "Masque d'Explosion (prog.)", "Máscara explosiva progresiva"},
-     Text{"Progressive Powder Kegs", "Baril de Poudre (prog.)", "Barril de polvo progresivo"},
-     Text{"Progressive Remote Bombs", "Bombes à distance (prog.)", "Bombas remotas progresivas"}};
-  trickNameTable[RG_PROGRESSIVE_BOW] = {
-     Text{"Progressive Arrow Capacity", "Capacité de flèches (prog.)", "Mayor capacidad de flechas"},
-     Text{"Progressive Hero's Bow", "Arc du héros (prog.)", "Arco del héroe progresivo"},
-     Text{"Progressive Arrow Holder", "Arbalète (prog.)", "Ballesta progresiva"},
-     Text{"Progressive Crossbow", "Arbalète (prog.)", "Ballesta progresiva"},
-     Text{"Progressive Sacred Bow", "Arc sacré (prog)", "Arco Sagrado Progresivo"},
-     Text{"Progressive Lynel Bow", "Arc de Lynel (prog.)", "Arco de centaleón Progresivo"}};
-  trickNameTable[RG_PROGRESSIVE_SLINGSHOT] = {
-     Text{"Progressive Seed Capacity", "Capacité de graines (prog.)", "Mayor capacidad de semillas"},
-     Text{"Progressive Catapult", "Catapulte (prog.)", "Catapulta progresiva"},
-     Text{"Progressive Scattershot", "Lance-Pierre rafale (prog.)", "Resortera múltiple progresiva"},
-     Text{"Progressive Seed Launcher", "Lanceur de semences (prog.)", "Lanzador de semillas progresivo"},
-     Text{"Progressive Seed Satchel", "Sac de graines (prog.)", "Bolsa de semillas progresiva"}};
-  trickNameTable[RG_PROGRESSIVE_WALLET] = {
-     Text{"Progressive Rupee Capacity", "Capacité de rubis (prog.)", "Mayor capacidad de rupias"},
-     Text{"Progressive Purse", "Sacoche (prog.)", "Cartera de rupias progresiva"},
-     Text{"Progressive Rupee Bag", "Sac à rubis (prog.)", "Zurrón de rupias progresivo"},
-     Text{"Progressive Rupoor Capacity", "Capacité de Roupir (prog.)", "Capacidad progresiva Rupobre"},
-     Text{"Progressive Spoils Bag", "Sac à Butin (prog.)", "Bolsa de trofeos progresiva"},
-     Text{"Progressive Ruby Bag", "Capacité du sac Ruby (prog.)", "Bolso Ruby progresivo"}};
-  trickNameTable[RG_PROGRESSIVE_SCALE] = {
-     Text{"Progressive Flippers", "Palmes de Zora (prog.)", "Aletas de zora progresiva"},
-     Text{"Progressive Dragon's Scale", "Écaille du dragon d'eau (prog.)", "Escama dragón acuático progresiva"},
-     Text{"Progressive Diving Ability", "Plongée (prog.)", "Buceo progresivo"},
-     Text{"Progressive Pearl", "Perle (prog.)", "Perla progresiva"},
-     Text{"Progressive Scute", "Bulle (prog.)", "Fragmento Zora progresivo"}};
-  trickNameTable[RG_PROGRESSIVE_NUT_UPGRADE] = {
-     Text{"Progressive Nut Pack", "Paquet de noix (prog.)", "Mayor capacidad de semillas"},
-     Text{"Progressive Bait Bag", "Sac à Appâts (prog.)", "Bolsa de cebo progresiva"},
-     Text{"Progressive Pear Capacity", "Capacité de poire (prog.)", "Capacidad progresiva de pera"},
-     Text{"Progressive Nut Bag", "Sac de noix (prog.)", "Bolsa de nueces progresiva"},
-     Text{"Progressive Husk Capacity", "Capacité de noisettes (prog.)", "Mayor capacidad de castañas"}};
-  trickNameTable[RG_PROGRESSIVE_STICK_UPGRADE] = {
-     Text{"Progressive Stick Bag", "Sac de bâtons (prog.)", "Mayor capacidad de ramas deku"},
-     Text{"Progressive Stick Pack", "Paquet de bâtons Mojo (prog.)", "Mayor capacidad de bastones"},
-     Text{"Progressive Branch Capacity", "Capacité de la succursale (prog.)", "Capacidad progresiva de la sucursal"},
-     Text{"Progressive Rod Capacity", "Capacité de tiges (prog.)", "Mayor capacidad de cetros deku"}};
-  trickNameTable[RG_PROGRESSIVE_BOMBCHUS] = {
-     Text{"Progressive Bomblings", "Bombinsectes (prog.)", "Bombinsectos progresivos"},
-     Text{"Progressive Sentrobe Bombs", "Bombe de Sphérodrone (prog.)", "Bomba de helicobot progresivo"},
-     Text{"Progressive Bomb-ombs", "Bombe Soldat (prog.)", "Soldado bomba progresivo"},
-     Text{"Progressive Missiles", "Missiles (prog.)", "Misiles progresivos"},
-     Text{"Progressive Bombchu Bag", "Sac à Bombchu (prog.)", "Bombachus progresivos"}};
-  trickNameTable[RG_PROGRESSIVE_MAGIC_METER] = {
-     Text{"Progressive Stamina Meter", "Jauge d'endurance (prog.)", "Medidor de vigor progresivo"},
-     Text{"Progressive Energy Gauge", "Jauge d'énergie (prog.)", "Medidor de energía progresivo"},
-     Text{"Progressive Magic Powder", "Poudre magique (prog.)", "Medidor de carga progresivo"}};
-  trickNameTable[RG_PROGRESSIVE_OCARINA] = {
-     Text{"Progressive Memento", "Souvenir (prog.)", "Silbato progresivo"},
-     Text{"Progressive Whistle", "Siffler (prog.)", "Silbido progresivo"},
-     Text{"Progressive Flute", "Flûte (prog.)", "Flauta progresiva"},
-     Text{"Progressive Recorder", "Harmonica (prog.)", "Armónica progresiva"}};
-  trickNameTable[RG_PROGRESSIVE_GORONSWORD] = {
-     Text{"Progressive Titan Blade", "Lame des Titans (prog.)", "Hoja del Titán progresiva"},
-     Text{"Progressive Goron Knife", "Lame Goron (prog.)", "Daga Goron progresiva"},
-     Text{"Progressive Giant Sword", "Épée géante (prog.)", "Espada gigante progresiva"},
-     Text{"Progressive Darknut Sword", "Épée de Darknut (prog.)", "Espada Darknut progresiva"},
-     Text{"Progressive Power Sword", "Épée de Puissance (prog.)", "Espada de poder progresiva"},
-     Text{"Progressive Big Stabby", "Gros coup de poignard (prog.)", "Gran puñalada progresiva"}};
+    trickNameTable[RG_PROGRESSIVE_HOOKSHOT] = {
+        Text{"Progressive Grappling Hook", "Lance-chaîne (prog.)", "Garra progresiva"},
+        Text{"Progressive Clawshot", "Grappin-griffe (prog.)", "Zarpa progresiva"},
+        Text{"Progressive Gripshot", "Grappince (prog.)", "Enganchador progresivo"},
+        Text{"Progressive Rope", "Corde (prog.)", "Cuerda progresivo"}
+    };
+    trickNameTable[RG_PROGRESSIVE_STRENGTH] = {
+        Text{"Power Glove", "Gant de Puissance (prog.)", "Guanteletes progresivos"},
+        Text{"Power Bracelet", "Bracelet de Force (prog.)", "Brasaletes progresivos"},
+        Text{"Magic Bracelet", "Bracelet Magique (prog.)", "Manoplas progresivas"}
+    };
+    trickNameTable[RG_PROGRESSIVE_BOMB_BAG] = {
+        Text{"Progressive Bomb Capacity", "Capacité de bombes (prog.)", "Mayor capacidad de bombas"},
+        Text{"Progressive Bomb Pack", "Paquet de bombes (prog.)", "Zurrón de bombas progresivo"},
+        Text{"Progressive Bomb Box", "Boîte à bombes (prog.)", "Bolsa de bombas progresiva"},
+        Text{"Progressive Blast Mask", "Masque d'Explosion (prog.)", "Máscara explosiva progresiva"},
+        Text{"Progressive Powder Kegs", "Baril de Poudre (prog.)", "Barril de polvo progresivo"},
+        Text{"Progressive Remote Bombs", "Bombes à distance (prog.)", "Bombas remotas progresivas"}
+    };
+    trickNameTable[RG_PROGRESSIVE_BOW] = {
+        Text{"Progressive Arrow Capacity", "Capacité de flèches (prog.)", "Mayor capacidad de flechas"},
+        Text{"Progressive Hero's Bow", "Arc du héros (prog.)", "Arco del héroe progresivo"},
+        Text{"Progressive Arrow Holder", "Arbalète (prog.)", "Ballesta progresiva"},
+        Text{"Progressive Crossbow", "Arbalète (prog.)", "Ballesta progresiva"},
+        Text{"Progressive Sacred Bow", "Arc sacré (prog)", "Arco Sagrado Progresivo"},
+        Text{"Progressive Lynel Bow", "Arc de Lynel (prog.)", "Arco de centaleón Progresivo"}
+    };
+    trickNameTable[RG_PROGRESSIVE_SLINGSHOT] = {
+        Text{"Progressive Seed Capacity", "Capacité de graines (prog.)", "Mayor capacidad de semillas"},
+        Text{"Progressive Catapult", "Catapulte (prog.)", "Catapulta progresiva"},
+        Text{"Progressive Scattershot", "Lance-Pierre rafale (prog.)", "Resortera múltiple progresiva"},
+        Text{"Progressive Seed Launcher", "Lanceur de semences (prog.)", "Lanzador de semillas progresivo"},
+        Text{"Progressive Seed Satchel", "Sac de graines (prog.)", "Bolsa de semillas progresiva"}
+    };
+    trickNameTable[RG_PROGRESSIVE_WALLET] = {
+        Text{"Progressive Rupee Capacity", "Capacité de rubis (prog.)", "Mayor capacidad de rupias"},
+        Text{"Progressive Purse", "Sacoche (prog.)", "Cartera de rupias progresiva"},
+        Text{"Progressive Rupee Bag", "Sac à rubis (prog.)", "Zurrón de rupias progresivo"},
+        Text{"Progressive Rupoor Capacity", "Capacité de Roupir (prog.)", "Capacidad progresiva Rupobre"},
+        Text{"Progressive Spoils Bag", "Sac à Butin (prog.)", "Bolsa de trofeos progresiva"},
+        Text{"Progressive Ruby Bag", "Capacité du sac Ruby (prog.)", "Bolso Ruby progresivo"}
+    };
+    trickNameTable[RG_PROGRESSIVE_SCALE] = {
+        Text{"Progressive Flippers", "Palmes de Zora (prog.)", "Aletas de zora progresiva"},
+        Text{"Progressive Dragon's Scale", "Écaille du dragon d'eau (prog.)", "Escama dragón acuático progresiva"},
+        Text{"Progressive Diving Ability", "Plongée (prog.)", "Buceo progresivo"},
+        Text{"Progressive Pearl", "Perle (prog.)", "Perla progresiva"},
+        Text{"Progressive Scute", "Bulle (prog.)", "Fragmento Zora progresivo"}
+    };
+    trickNameTable[RG_PROGRESSIVE_NUT_UPGRADE] = {
+        Text{"Progressive Nut Pack", "Paquet de noix (prog.)", "Mayor capacidad de semillas"},
+        Text{"Progressive Bait Bag", "Sac à Appâts (prog.)", "Bolsa de cebo progresiva"},
+        Text{"Progressive Pear Capacity", "Capacité de poire (prog.)", "Capacidad progresiva de pera"},
+        Text{"Progressive Nut Bag", "Sac de noix (prog.)", "Bolsa de nueces progresiva"},
+        Text{"Progressive Husk Capacity", "Capacité de noisettes (prog.)", "Mayor capacidad de castañas"}
+    };
+    trickNameTable[RG_PROGRESSIVE_STICK_UPGRADE] = {
+        Text{"Progressive Stick Bag", "Sac de bâtons (prog.)", "Mayor capacidad de ramas deku"},
+        Text{"Progressive Stick Pack", "Paquet de bâtons Mojo (prog.)", "Mayor capacidad de bastones"},
+        Text{"Progressive Branch Capacity", "Capacité de la succursale (prog.)", "Capacidad progresiva de la sucursal"},
+        Text{"Progressive Rod Capacity", "Capacité de tiges (prog.)", "Mayor capacidad de cetros deku"}
+    };
+    trickNameTable[RG_PROGRESSIVE_BOMBCHUS] = {
+        Text{"Progressive Bomblings", "Bombinsectes (prog.)", "Bombinsectos progresivos"},
+        Text{"Progressive Sentrobe Bombs", "Bombe de Sphérodrone (prog.)", "Bomba de helicobot progresivo"},
+        Text{"Progressive Bomb-ombs", "Bombe Soldat (prog.)", "Soldado bomba progresivo"},
+        Text{"Progressive Missiles", "Missiles (prog.)", "Misiles progresivos"},
+        Text{"Progressive Bombchu Bag", "Sac à Bombchu (prog.)", "Bombachus progresivos"}
+    };
+    trickNameTable[RG_PROGRESSIVE_MAGIC_METER] = {
+        Text{"Progressive Stamina Meter", "Jauge d'endurance (prog.)", "Medidor de vigor progresivo"},
+        Text{"Progressive Energy Gauge", "Jauge d'énergie (prog.)", "Medidor de energía progresivo"},
+        Text{"Progressive Magic Powder", "Poudre magique (prog.)", "Medidor de carga progresivo"}
+    };
+    trickNameTable[RG_PROGRESSIVE_OCARINA] = {
+        Text{"Progressive Memento", "Souvenir (prog.)", "Silbato progresivo"},
+        Text{"Progressive Whistle", "Siffler (prog.)", "Silbido progresivo"},
+        Text{"Progressive Flute", "Flûte (prog.)", "Flauta progresiva"},
+        Text{"Progressive Recorder", "Harmonica (prog.)", "Armónica progresiva"}
+    };
+    trickNameTable[RG_PROGRESSIVE_GORONSWORD] = {
+        Text{"Progressive Titan Blade", "Lame des Titans (prog.)", "Hoja del Titán progresiva"},
+        Text{"Progressive Goron Knife", "Lame Goron (prog.)", "Daga Goron progresiva"},
+        Text{"Progressive Giant Sword", "Épée géante (prog.)", "Espada gigante progresiva"},
+        Text{"Progressive Darknut Sword", "Épée de Darknut (prog.)", "Espada Darknut progresiva"},
+        Text{"Progressive Power Sword", "Épée de Puissance (prog.)", "Espada de poder progresiva"},
+        Text{"Progressive Big Stabby", "Gros coup de poignard (prog.)", "Gran puñalada progresiva"}
+    };
 
-  trickNameTable[RG_EMPTY_BOTTLE] = {
-     Text{"Empty Canteen", "Cantine vide", "cantimplora vacía"},
-     Text{"Vial of Winds", "Fiole de vents", "Vial de Vientos"},
-     Text{"Tingle Bottle", "Flacon de Tingle", "Botella de Tingle"},
-     Text{"Magic Bottle", "Flacon magique", "Frasco feérico"},
-     Text{"Glass Bottle", "Flacon de verre", "Botella de cristal"},
-     Text{"Bottle with Water", "Flacon d'eau", "Botella Tingle"}};
-  trickNameTable[RG_BOTTLE_WITH_MILK] = {
-     Text{"Bottle with Chateau Romani", "Flacon de cuvée Romani", "Botella de Reserva Romani"},
-     Text{"Bottle with Premium Milk", "Flacon avec lait de qualité supérieure", "Biberón con leche Premium"},
-     Text{"Bottle with Mystery Milk", "Flacon de lait grand cru", "Botella de leche extra"},
-     Text{"Bottle with Fresh Milk", "Flacon de lait frais", "Botella de leche fresca"},};
-  trickNameTable[RG_BOTTLE_WITH_RED_POTION] = {
-     Text{"Bottle with Red Chu Jelly", "Flacon de gelée Chuchu rouge", "Jugo de Chuchu Rojo"},
-     Text{"Bottle with Hibiscus Potion", "Flacon de potion de Hibiscus", "Botella de poción de Hibisco"},
-     Text{"Bottle with Medicine of Life", "Flacon d'élixir rouge", "Botella de medicina de la vida"},
-     Text{"Bottle with Heart Potion", "Flacon de potion de soin", "Botella de poción de salud"}};
-  trickNameTable[RG_BOTTLE_WITH_GREEN_POTION] = {
-     Text{"Bottle with Green Chu Jelly", "Flacon de gelée Chuchu verte", "Jugo de Chuchu Verde"},
-     Text{"Bottle with Lamp Oil", "Flacon de Huile à lanterne", "Botella de Aceite de candil "},
-     Text{"Bottle with Medicine of Magic", "Flacon d'élixir vert", "Botella de medicina mágica"},
-     Text{"Bottle with Stamina Potion", "Flacon d'Endurol", "Botella de elixir vigorizante"}};
-  trickNameTable[RG_BOTTLE_WITH_BLUE_POTION] = {
-     Text{"Bottle with Blue Chu Jelly", "Flacon de gelée Chuchu bleue", "Jugo de Chuchu Azul"},
-     Text{"Bottle with Water of Life", "Flacon d'élixir bleu", "Botella de agua de la vida"},
-     Text{"Bottle with Air Potion", "Flacon de potion d'oxygène", "Botella de oxígeno"}};
-  trickNameTable[RG_BOTTLE_WITH_FAIRY] = {
-     Text{"Bottle with Forest Firefly", "Flacon avec une luciole", "Luciérnaga del bosque"},
-     Text{"Bottle with Deku Princess", "Flacon avec Deku Princess", "Botella con Deku Princess"},
-     Text{"Bottle with Stray Fairy", "Flacon avec une fée perdue", "Hada perdida en una botella"}};
-  trickNameTable[RG_BOTTLE_WITH_FISH] = {
-     Text{"Bottle with Small Jabu-Jabu", "Flacon avec mini Jabu-Jabu", "Lord Chapu-Chapu embotellado"},
-     Text{"Bottle with Reekfish", "Flacon avec Reekfish", "Reekfish embotellada"},
-     Text{"Bottle with Hyrule Bass", "Flacon avec perche d'Hyrule", "Locha de Hyrule embotellada"},
-     Text{"Bottle with Hyrule Loach", "Flacon avec loche d'Hyrule", "Perca de Términa embotellada"}};
-  trickNameTable[RG_BOTTLE_WITH_BLUE_FIRE] = {
-     Text{"Bottle with Will-O-Wisp", "Flacon avec feu follet", "Botella de llama azul"},
-     Text{"Bottle with Ancient Flame", "Flacon de flamme ancienne", "Botella de fuego ancestral"},
-     Text{"Bottle with a Blue Candle", "Flacon avec une bougie bleue", "Botella con una vela azul"},
-     Text{"Bottle with Red Ice", "Flacon de Glace Rouge", "Botella de Hielo rojo"},
-     Text{"Bottle with Nayru's Flame", "Flacon de flamme de Nayru", "Botella de llamas de Nayru"}};
-  trickNameTable[RG_BOTTLE_WITH_BUGS] = {
-     Text{"Bottle with Baby Tektites", "Flacon de bébé Araknon", "Tektites en una botella"},
-     Text{"Bottle with A Beetle", "Flacon avec un scarabée", "Botella con un escarabajo"},
-     Text{"Bottle with Lanayru Ants", "Flacon de fourmis de Lanelle", "Celestarabajo embotellado"},
-     Text{"Bottle with Insects", "Flacon de bibittes", "Saltabosques embotellados"},
-     Text{"Bottle with a Golden Bee", "Flacon avec une abeille dorée", "Botella con una abeja dorada"}};
-  trickNameTable[RG_BOTTLE_WITH_POE] = {
-     Text{"Bottle with Ghini", "Flacon avec Ghini", "Ghini en una botella"},
-     Text{"Bottle with Reapling", "Flacon avec Âme Damnée", "Reapling en una botella"},
-     Text{"Bottle with Imp Poe", "Flacon avec Spectre", "Espectro en una botella"},
-     Text{"Bottle with Anti-Fairy", "Flacon avec Tetdoss", "Whisp en una botella"}};
+    trickNameTable[RG_EMPTY_BOTTLE] = {
+        Text{"Empty Canteen", "Cantine vide", "cantimplora vacía"},
+        Text{"Vial of Winds", "Fiole de vents", "Vial de Vientos"},
+        Text{"Tingle Bottle", "Flacon de Tingle", "Botella de Tingle"},
+        Text{"Magic Bottle", "Flacon magique", "Frasco feérico"},
+        Text{"Glass Bottle", "Flacon de verre", "Botella de cristal"},
+        Text{"Bottle with Water", "Flacon d'eau", "Botella Tingle"}
+    };
+    trickNameTable[RG_BOTTLE_WITH_MILK] = {
+        Text{"Bottle with Chateau Romani", "Flacon de cuvée Romani", "Botella de Reserva Romani"},
+        Text{"Bottle with Premium Milk", "Flacon avec lait de qualité supérieure", "Biberón con leche Premium"},
+        Text{"Bottle with Mystery Milk", "Flacon de lait grand cru", "Botella de leche extra"},
+        Text{"Bottle with Fresh Milk", "Flacon de lait frais", "Botella de leche fresca"},};
+    trickNameTable[RG_BOTTLE_WITH_RED_POTION] = {
+        Text{"Bottle with Red Chu Jelly", "Flacon de gelée Chuchu rouge", "Jugo de Chuchu Rojo"},
+        Text{"Bottle with Hibiscus Potion", "Flacon de potion de Hibiscus", "Botella de poción de Hibisco"},
+        Text{"Bottle with Medicine of Life", "Flacon d'élixir rouge", "Botella de medicina de la vida"},
+        Text{"Bottle with Heart Potion", "Flacon de potion de soin", "Botella de poción de salud"}
+    };
+    trickNameTable[RG_BOTTLE_WITH_GREEN_POTION] = {
+        Text{"Bottle with Green Chu Jelly", "Flacon de gelée Chuchu verte", "Jugo de Chuchu Verde"},
+        Text{"Bottle with Lamp Oil", "Flacon de Huile à lanterne", "Botella de Aceite de candil "},
+        Text{"Bottle with Medicine of Magic", "Flacon d'élixir vert", "Botella de medicina mágica"},
+        Text{"Bottle with Stamina Potion", "Flacon d'Endurol", "Botella de elixir vigorizante"}
+    };
+    trickNameTable[RG_BOTTLE_WITH_BLUE_POTION] = {
+        Text{"Bottle with Blue Chu Jelly", "Flacon de gelée Chuchu bleue", "Jugo de Chuchu Azul"},
+        Text{"Bottle with Water of Life", "Flacon d'élixir bleu", "Botella de agua de la vida"},
+        Text{"Bottle with Air Potion", "Flacon de potion d'oxygène", "Botella de oxígeno"}
+    };
+    trickNameTable[RG_BOTTLE_WITH_FAIRY] = {
+        Text{"Bottle with Forest Firefly", "Flacon avec une luciole", "Luciérnaga del bosque"},
+        Text{"Bottle with Deku Princess", "Flacon avec Deku Princess", "Botella con Deku Princess"},
+        Text{"Bottle with Stray Fairy", "Flacon avec une fée perdue", "Hada perdida en una botella"}
+    };
+    trickNameTable[RG_BOTTLE_WITH_FISH] = {
+        Text{"Bottle with Small Jabu-Jabu", "Flacon avec mini Jabu-Jabu", "Lord Chapu-Chapu embotellado"},
+        Text{"Bottle with Reekfish", "Flacon avec Reekfish", "Reekfish embotellada"},
+        Text{"Bottle with Hyrule Bass", "Flacon avec perche d'Hyrule", "Locha de Hyrule embotellada"},
+        Text{"Bottle with Hyrule Loach", "Flacon avec loche d'Hyrule", "Perca de Términa embotellada"}
+    };
+    trickNameTable[RG_BOTTLE_WITH_BLUE_FIRE] = {
+        Text{"Bottle with Will-O-Wisp", "Flacon avec feu follet", "Botella de llama azul"},
+        Text{"Bottle with Ancient Flame", "Flacon de flamme ancienne", "Botella de fuego ancestral"},
+        Text{"Bottle with a Blue Candle", "Flacon avec une bougie bleue", "Botella con una vela azul"},
+        Text{"Bottle with Red Ice", "Flacon de Glace Rouge", "Botella de Hielo rojo"},
+        Text{"Bottle with Nayru's Flame", "Flacon de flamme de Nayru", "Botella de llamas de Nayru"}
+    };
+    trickNameTable[RG_BOTTLE_WITH_BUGS] = {
+        Text{"Bottle with Baby Tektites", "Flacon de bébé Araknon", "Tektites en una botella"},
+        Text{"Bottle with A Beetle", "Flacon avec un scarabée", "Botella con un escarabajo"},
+        Text{"Bottle with Lanayru Ants", "Flacon de fourmis de Lanelle", "Celestarabajo embotellado"},
+        Text{"Bottle with Insects", "Flacon de bibittes", "Saltabosques embotellados"},
+        Text{"Bottle with a Golden Bee", "Flacon avec une abeille dorée", "Botella con una abeja dorada"}
+    };
+    trickNameTable[RG_BOTTLE_WITH_POE] = {
+        Text{"Bottle with Ghini", "Flacon avec Ghini", "Ghini en una botella"},
+        Text{"Bottle with Reapling", "Flacon avec Âme Damnée", "Reapling en una botella"},
+        Text{"Bottle with Imp Poe", "Flacon avec Spectre", "Espectro en una botella"},
+        Text{"Bottle with Anti-Fairy", "Flacon avec Tetdoss", "Whisp en una botella"}
+    };
 
-  trickNameTable[RG_RUTOS_LETTER] = {
-     Text{"Bottle with Maggie's Letter", "Flacon avec lettre de Maggy", "Carta de Dolores"},
-     Text{"Bottle with Letter to Kafei", "Flacon avec lettre pour Kafei", "Carta para Kafei"},
-     Text{"Bottle with Zelda's Letter", "Flacon avec Lettre de Zelda", "Carta náutica"}};
-  trickNameTable[RG_BOTTLE_WITH_BIG_POE] = {
-     Text{"Bottle with Composer Brother", "Flacon avec un compositeur", "Hermana Poe embotellada"},
-     Text{"Bottle with Jalhalla", "Flacon avec Jalhalla", "Yaihalla embotellado"},
-     Text{"Bottle with Grim Repoe", "Flacon avec le Faucheur", "Bubble en una botella"}};
+    trickNameTable[RG_RUTOS_LETTER] = {
+        Text{"Bottle with Maggie's Letter", "Flacon avec lettre de Maggy", "Carta de Dolores"},
+        Text{"Bottle with Letter to Kafei", "Flacon avec lettre pour Kafei", "Carta para Kafei"},
+        Text{"Bottle with Zelda's Letter", "Flacon avec Lettre de Zelda", "Carta náutica"}
+    };
+    trickNameTable[RG_BOTTLE_WITH_BIG_POE] = {
+        Text{"Bottle with Composer Brother", "Flacon avec un compositeur", "Hermana Poe embotellada"},
+        Text{"Bottle with Jalhalla", "Flacon avec Jalhalla", "Yaihalla embotellado"},
+        Text{"Bottle with Grim Repoe", "Flacon avec le Faucheur", "Bubble en una botella"}
+    };
 
-  trickNameTable[RG_ZELDAS_LULLABY] = {
-     Text{"Ballad of the Goddess", "Chant de la déesse", "Cántico de la Diosa"},
-     Text{"Song of Healing", "Chant de l'apaisement", "Canción de curación"},
-     Text{"Song of the Hero", "Chant du héros", "Canción del héroe"}};
-  trickNameTable[RG_EPONAS_SONG] = {
-     Text{"Song of Birds","Chant des oiseaux","Cantar del ave"},
-     Text{"Song of Soaring", "Chant de l'envol", "Canción del viento"},
-     Text{"Song of Horse", "Chant du cheval", "Chant du cheval"}};
-  trickNameTable[RG_SARIAS_SONG] = {
-     Text{"Mido's Song", "La chanson de Mido", "La canción de Mido"},
-     Text{"Kass' Theme", "Le thème de Kass", "El tema de Kass"},
-     Text{"Tune of Echoes", "Chant des Échos ", "Melodía del Eco "}};
-  trickNameTable[RG_SUNS_SONG] = {
-     Text{"Song of Passing", "Mambo de Manbo", "Melodía del transcurrir"},
-     Text{"Command Melody", "Air du marionnettiste", "Cara al Sol"},
-     Text{"Moon's Song", "La chanson de Moon", "La canción de la luna"}};
-  trickNameTable[RG_SONG_OF_TIME] = {
-     Text{"Song of Double Time", "Chant accéléré", "Canción del doble tiempo"},
-     Text{"Inverted Song of Time", "Chant du temps inversé", "Canción del tiempo invertida"},
-     Text{"Tune of Ages", "Chant du Temps", "Melodía del Tiempo"}};
-  trickNameTable[RG_SONG_OF_STORMS] = {
-     Text{"Ballad of Gales", "Requiem de la tornade", "Melodía del Tornado"},
-     Text{"Frog's Song of Soul", "Rap des grenouilles", "Canción del alma de la rana"},
-     Text{"Wind's Requiem", "Mélodie du vent", "Melodía del Viento"}};
-  trickNameTable[RG_MINUET_OF_FOREST] = {
-     Text{"Saria's Karaoke", "Karaoké de Saria", "Dueto del bosque"},
-     Text{"Sonata of Awakening", "Sonate de l'éveil", "Sonata del despertar"},
-     Text{"Wind God's Aria", "Hymne du dieu du vent", "Melodía del Espíritu del Viento"}};
-  trickNameTable[RG_BOLERO_OF_FIRE] = {
-     Text{"Darunia's Tango", "Tango de Darunia", "Coro del fuego"},
-     Text{"Tune of Currents", "Chants des Flux", "Melodía de las Corrientes"},
-     Text{"Goron Lullaby", "Berceuse des Gorons", "Nana goron"}};
-  trickNameTable[RG_SERENADE_OF_WATER] = {
-     Text{"Ruto's Blues", "Blues de Ruto", "Sonata del agua"},
-     Text{"New Wave Bossa Nova", "Bossa-nova des flots", "Bossanova de las olas"},
-     Text{"Manbo's Mambo", "Mambo de Manbo", "Mambo de Manbo"}};
-  trickNameTable[RG_REQUIEM_OF_SPIRIT] = {
-     Text{"Nabooru's Reggae", "Reggae de Nabooru", "Reggae del espíritu"},
-     Text{"Elegy of Emptiness", "Hymne du vide", "Elegía al vacío"},
-     Text{"Earth God's Lyric", "Hymne du dieu de la terre", "Melodía del Espíritu de la Tierra"}};
-  trickNameTable[RG_NOCTURNE_OF_SHADOW] = {
-     Text{"Impa's Death Metal", "Death métal d'Impa", "Diurno de la sombra"},
-     Text{"Oath to Order", "Ode de l'appel", "Oda al orden"},
-     Text{"Song of Discovery", "Chant des secrets", "Canto revelador"}};
-  trickNameTable[RG_PRELUDE_OF_LIGHT] = {
-     Text{"Rauru's Sing-Along", "Chansonnette de Rauru", "Predulio de luz"},
-     Text{"Ballad of the Wind Fish", "Ballade sur Poisson-Rêve", "Balada del Piez Viento"},
-     Text{"Song of Light", "Chant de la lumière", "Sonidos de la luz"}};
+    trickNameTable[RG_ZELDAS_LULLABY] = {
+        Text{"Ballad of the Goddess", "Chant de la déesse", "Cántico de la Diosa"},
+        Text{"Song of Healing", "Chant de l'apaisement", "Canción de curación"},
+        Text{"Song of the Hero", "Chant du héros", "Canción del héroe"}
+    };
+    trickNameTable[RG_EPONAS_SONG] = {
+        Text{"Song of Birds","Chant des oiseaux","Cantar del ave"},
+        Text{"Song of Soaring", "Chant de l'envol", "Canción del viento"},
+        Text{"Song of Horse", "Chant du cheval", "Chant du cheval"}
+    };
+    trickNameTable[RG_SARIAS_SONG] = {
+        Text{"Mido's Song", "La chanson de Mido", "La canción de Mido"},
+        Text{"Kass' Theme", "Le thème de Kass", "El tema de Kass"},
+        Text{"Tune of Echoes", "Chant des Échos ", "Melodía del Eco "}
+    };
+    trickNameTable[RG_SUNS_SONG] = {
+        Text{"Song of Passing", "Mambo de Manbo", "Melodía del transcurrir"},
+        Text{"Command Melody", "Air du marionnettiste", "Cara al Sol"},
+        Text{"Moon's Song", "La chanson de Moon", "La canción de la luna"}
+    };
+    trickNameTable[RG_SONG_OF_TIME] = {
+        Text{"Song of Double Time", "Chant accéléré", "Canción del doble tiempo"},
+        Text{"Inverted Song of Time", "Chant du temps inversé", "Canción del tiempo invertida"},
+        Text{"Tune of Ages", "Chant du Temps", "Melodía del Tiempo"}
+    };
+    trickNameTable[RG_SONG_OF_STORMS] = {
+        Text{"Ballad of Gales", "Requiem de la tornade", "Melodía del Tornado"},
+        Text{"Frog's Song of Soul", "Rap des grenouilles", "Canción del alma de la rana"},
+        Text{"Wind's Requiem", "Mélodie du vent", "Melodía del Viento"}
+    };
+    trickNameTable[RG_MINUET_OF_FOREST] = {
+        Text{"Saria's Karaoke", "Karaoké de Saria", "Dueto del bosque"},
+        Text{"Sonata of Awakening", "Sonate de l'éveil", "Sonata del despertar"},
+        Text{"Wind God's Aria", "Hymne du dieu du vent", "Melodía del Espíritu del Viento"}
+    };
+    trickNameTable[RG_BOLERO_OF_FIRE] = {
+        Text{"Darunia's Tango", "Tango de Darunia", "Coro del fuego"},
+        Text{"Tune of Currents", "Chants des Flux", "Melodía de las Corrientes"},
+        Text{"Goron Lullaby", "Berceuse des Gorons", "Nana goron"}
+    };
+    trickNameTable[RG_SERENADE_OF_WATER] = {
+        Text{"Ruto's Blues", "Blues de Ruto", "Sonata del agua"},
+        Text{"New Wave Bossa Nova", "Bossa-nova des flots", "Bossanova de las olas"},
+        Text{"Manbo's Mambo", "Mambo de Manbo", "Mambo de Manbo"}
+    };
+    trickNameTable[RG_REQUIEM_OF_SPIRIT] = {
+        Text{"Nabooru's Reggae", "Reggae de Nabooru", "Reggae del espíritu"},
+        Text{"Elegy of Emptiness", "Hymne du vide", "Elegía al vacío"},
+        Text{"Earth God's Lyric", "Hymne du dieu de la terre", "Melodía del Espíritu de la Tierra"}
+    };
+    trickNameTable[RG_NOCTURNE_OF_SHADOW] = {
+        Text{"Impa's Death Metal", "Death métal d'Impa", "Diurno de la sombra"},
+        Text{"Oath to Order", "Ode de l'appel", "Oda al orden"},
+        Text{"Song of Discovery", "Chant des secrets", "Canto revelador"}
+    };
+    trickNameTable[RG_PRELUDE_OF_LIGHT] = {
+        Text{"Rauru's Sing-Along", "Chansonnette de Rauru", "Predulio de luz"},
+        Text{"Ballad of the Wind Fish", "Ballade sur Poisson-Rêve", "Balada del Piez Viento"},
+        Text{"Song of Light", "Chant de la lumière", "Sonidos de la luz"}
+    };
 
-  trickNameTable[RG_KOKIRI_EMERALD] = {
-     Text{"Pendant of Courage", "Pendentif du courage", "Colgante del valor"},
-     Text{"Farore's Pearl", "Perle de Farore", "Orbe de Farore"},
-     Text{"Aquanine", "Smaragdine", "Yerbánida"},
-     Text{"Farore's Emerald", "Émeraude de Farore", "Esmeralda de Farore"},
-     Text{"Kokiri's Peridot", "Péridot Kokiri", "Ágata de los Kokiri"}};
-  trickNameTable[RG_GORON_RUBY] = {
-     Text{"Pendant of Power", "Pendentif de la force", "Colgante del poder"},
-     Text{"Din's Pearl", "Perle de Din", "Orbe de Din"},
-     Text{"Crimsonine", "Alzanine", "Bermellina"},
-     Text{"Din's Ruby", "Rubis de Din", "Rubí de Din"},
-     Text{"Goron's Garnet", "Grenat Goron", "Topacio de los Goron"}};
-  trickNameTable[RG_ZORA_SAPPHIRE] = {
-     Text{"Pendant of Wisdom", "Pendentif de la sagesse", "Colgante de la sabiduría"},
-     Text{"Nayru's Pearl", "Perle de Nayru", "Orbe de Nayru"},
-     Text{"Azurine", "Aquanine", "Azurina"},
-     Text{"Nayru's Sapphire", "Saphir de Nayru", "Zafiro de Nayru"},
-     Text{"Zora's Aquamarine", "Aquamarine Zora", "Lapislázuli de los Zora"}};
-  trickNameTable[RG_FOREST_MEDALLION] = {
-     Text{"Wind Medallion", "Médaillon du vent", "Medallón del Viento"},
-     Text{"Wind Element", "Elément Vent", "Elemento de aire"},
-     Text{"Saria's Medallion", "Médaillon de Saria", "Medallón de Saria"},
-     Text{"Sign of Air", "Glyphe de l'air", "Glifo de aire"},
-     Text{"Medallion of Forest", "Médaillon du Temple de la Forêt", "Medalla del Bosque"}};
-  trickNameTable[RG_FIRE_MEDALLION] = {
-     Text{"Fire Element", "Elément Feu", "Elemento de fuego"},
-     Text{"Darunia's Medallion", "Médaillon de Darunia", "Medallón de Darunia"},
-     Text{"Sign of Fire", "Glyphe de feu", "Glifo de fuego"},
-     Text{"Medallion of Fire", "Médaillon du Temple du Feu", "Medalla del Fuego"}};
-  trickNameTable[RG_WATER_MEDALLION] = {
-     Text{"Water Element", "Elément Eau", "Elemento de agua"},
-     Text{"Ice Medallion", "Médaillon de glace", "Medallón Helado"},
-     Text{"Ruto's Medallion", "Médaillon de Ruto", "Medallón de Ruto"},
-     Text{"Sign of Water", "Glyphe de l'eau", "Glifo de agua"},
-     Text{"Medallion of Water", "Médaillon du Temple de l'Eau", "Medalla del Agua"}};
-  trickNameTable[RG_SPIRIT_MEDALLION] = {
-     Text{"Earth Element", "Elément Terre", "Elemento de tierra"},
-     Text{"Nabooru's Medallion", "Médaillon de Nabooru", "Medallón de Nabooru"},
-     Text{"Sign of Earth", "Glyphe de la Terre", "Glifo de la tierra"},
-     Text{"Medallion of Spirit", "Médaillon du Temple de l'Esprit", "Medalla del Espíritu"}};
-  trickNameTable[RG_SHADOW_MEDALLION] = {
-     Text{"Fused Shadow", "Cristal d'ombre", "Sombra Fundida"},
-     Text{"Impa's Medallion", "Médaillon d'Impa", "Medallón de Impa"},
-     Text{"Sign of Illusion", "Glyphe de l'illusion", "Glifo de ilusión"},
-     Text{"Medallion of Shadow", "Médaillon du Temple de l'Ombre", "Medalla de la Sombra"}};
-  trickNameTable[RG_LIGHT_MEDALLION] = {
-     Text{"Compass of Light", "Boussole de lumière", "Brújula de Luz"},
-     Text{"Rauru's Medallion", "Médaillon de Rauru", "Medallón de Rauru"},
-     Text{"Sign of Destiny", "Glyphe du destin", "Glifo del destino"},
-     Text{"Medallion of Light", "Médaillon du temple de lumière", "Medalla de la Luz"}};
+    trickNameTable[RG_KOKIRI_EMERALD] = {
+        Text{"Pendant of Courage", "Pendentif du courage", "Colgante del valor"},
+        Text{"Farore's Pearl", "Perle de Farore", "Orbe de Farore"},
+        Text{"Aquanine", "Smaragdine", "Yerbánida"},
+        Text{"Farore's Emerald", "Émeraude de Farore", "Esmeralda de Farore"},
+        Text{"Kokiri's Peridot", "Péridot Kokiri", "Ágata de los Kokiri"}
+    };
+    trickNameTable[RG_GORON_RUBY] = {
+        Text{"Pendant of Power", "Pendentif de la force", "Colgante del poder"},
+        Text{"Din's Pearl", "Perle de Din", "Orbe de Din"},
+        Text{"Crimsonine", "Alzanine", "Bermellina"},
+        Text{"Din's Ruby", "Rubis de Din", "Rubí de Din"},
+        Text{"Goron's Garnet", "Grenat Goron", "Topacio de los Goron"}
+    };
+    trickNameTable[RG_ZORA_SAPPHIRE] = {
+        Text{"Pendant of Wisdom", "Pendentif de la sagesse", "Colgante de la sabiduría"},
+        Text{"Nayru's Pearl", "Perle de Nayru", "Orbe de Nayru"},
+        Text{"Azurine", "Aquanine", "Azurina"},
+        Text{"Nayru's Sapphire", "Saphir de Nayru", "Zafiro de Nayru"},
+        Text{"Zora's Aquamarine", "Aquamarine Zora", "Lapislázuli de los Zora"}
+    };
+    trickNameTable[RG_FOREST_MEDALLION] = {
+        Text{"Wind Medallion", "Médaillon du vent", "Medallón del Viento"},
+        Text{"Wind Element", "Elément Vent", "Elemento de aire"},
+        Text{"Saria's Medallion", "Médaillon de Saria", "Medallón de Saria"},
+        Text{"Sign of Air", "Glyphe de l'air", "Glifo de aire"},
+        Text{"Medallion of Forest", "Médaillon du Temple de la Forêt", "Medalla del Bosque"}
+    };
+    trickNameTable[RG_FIRE_MEDALLION] = {
+        Text{"Fire Element", "Elément Feu", "Elemento de fuego"},
+        Text{"Darunia's Medallion", "Médaillon de Darunia", "Medallón de Darunia"},
+        Text{"Sign of Fire", "Glyphe de feu", "Glifo de fuego"},
+        Text{"Medallion of Fire", "Médaillon du Temple du Feu", "Medalla del Fuego"}
+    };
+    trickNameTable[RG_WATER_MEDALLION] = {
+        Text{"Water Element", "Elément Eau", "Elemento de agua"},
+        Text{"Ice Medallion", "Médaillon de glace", "Medallón Helado"},
+        Text{"Ruto's Medallion", "Médaillon de Ruto", "Medallón de Ruto"},
+        Text{"Sign of Water", "Glyphe de l'eau", "Glifo de agua"},
+        Text{"Medallion of Water", "Médaillon du Temple de l'Eau", "Medalla del Agua"}
+    };
+    trickNameTable[RG_SPIRIT_MEDALLION] = {
+        Text{"Earth Element", "Elément Terre", "Elemento de tierra"},
+        Text{"Nabooru's Medallion", "Médaillon de Nabooru", "Medallón de Nabooru"},
+        Text{"Sign of Earth", "Glyphe de la Terre", "Glifo de la tierra"},
+        Text{"Medallion of Spirit", "Médaillon du Temple de l'Esprit", "Medalla del Espíritu"}
+    };
+    trickNameTable[RG_SHADOW_MEDALLION] = {
+        Text{"Fused Shadow", "Cristal d'ombre", "Sombra Fundida"},
+        Text{"Impa's Medallion", "Médaillon d'Impa", "Medallón de Impa"},
+        Text{"Sign of Illusion", "Glyphe de l'illusion", "Glifo de ilusión"},
+        Text{"Medallion of Shadow", "Médaillon du Temple de l'Ombre", "Medalla de la Sombra"}
+    };
+    trickNameTable[RG_LIGHT_MEDALLION] = {
+        Text{"Compass of Light", "Boussole de lumière", "Brújula de Luz"},
+        Text{"Rauru's Medallion", "Médaillon de Rauru", "Medallón de Rauru"},
+        Text{"Sign of Destiny", "Glyphe du destin", "Glifo del destino"},
+        Text{"Medallion of Light", "Médaillon du temple de lumière", "Medalla de la Luz"}
+    };
 
-  trickNameTable[RG_RECOVERY_HEART] = {
-     Text{"Love", "Bisou", "Te amo"},
-     Text{"Life", "Vie", "vida"},
-     Text{"HP", "VP", "VP"}};
-  trickNameTable[RG_GREEN_RUPEE] = {
-     Text{"False Greg", "Faux Greg", "Falso Greg"},
-     Text{"One Ruby", "Un rubis", "Un rubí"},
-     Text{"Rupoor (1)", "Roupir (1)", "Rupobre (1)"},
-     Text{"One Rupee", "Un rubis", "Guaraní hyliano"},
-     Text{"Rupee (1)", "Rubis (1)", "Peso hyliano"}};
-  trickNameTable[RG_BLUE_RUPEE] = {
-     Text{"Blupee", "Bleubi", "Azupia"},
-     Text{"Five Rubies", "Cinq Rubys", "Cinco rubíes"},
-     Text{"Five Rupees", "Cinq rubis", "Bolívar hyliano"},
-     Text{"Rupee (5)", "Rubis (5)", "Peso hyliano"},
-     Text{"Rupoor (5)", "Roupir (5)", "Rupobre (5)"}};
-  trickNameTable[RG_RED_RUPEE] = {
-     Text{"Big 20", "Grand 20", "Los 20 grandes"},
-     Text{"Twenty Rubies", "vingt rubis", "Veinte rubíes"},
-     Text{"Rupoor (20)", "Roupir (20)", "Rupobre (20)"},
-     Text{"Twenty Rupees", "Vingt rubis", "Colon hyliano"},
-     Text{"Rupee (20)", "Rubis (20)", "Peso hyliano"}};
-  trickNameTable[RG_PURPLE_RUPEE] = {
-     Text{"Purpee", "pourbi", "morupiua"},
-     Text{"Fifty Rubies", "cinquante rubis", "Cincuenta rubíes"},
-     Text{"Rupoor (50)", "Roupir (50)", "Rupobre (50)"},
-     Text{"Fifty Rupees", "Cinquante rubis", "Balboa hyliano"},
-     Text{"Rupee (50)", "Rubis (50)", "Peso hyliano"}};
-  trickNameTable[RG_HUGE_RUPEE] = {
-     Text{"Hugo", "Or Rubi", "Oro Rubi"},
-     Text{"Two Hundred Rubies", "deux cents rubis", "Doscientos rubíes"},
-     Text{"Diamond", "Diamant", "Diamante"},
-     Text{"Huge Ruby", "Énorme rubis", "Rubi gigante"},
-     Text{"Two Hundred Rupees", "Deux cent rubis", "Euro hyliano"},
-     Text{"Rupee (200)", "Rubis (200)", "Dólar hyliano"}};
-  trickNameTable[RG_PIECE_OF_HEART] = {
-     Text{"Pizza Heart", "Fromage de cœur", "Pieza de Chorizo"},
-     Text{"Little Bit Of Love", "Un peu d'amour", "Un poco de amor"},
-     Text{"Rare Peach Stone", "Pierre de pêche rare", "Pierre de pêche rare"}};
-  trickNameTable[RG_HEART_CONTAINER] = {
-     Text{"Crystal Heart", "Cœur de cristal", "Corazón de cristal"},
-     Text{"Life Heart", "Cœur de vie", "Vida Corazón"},
-     Text{"Lots of Love", "Beaucoup d'amour", "Mucho amor"}};
-  trickNameTable[RG_TRIFORCE_PIECE] = {
-     Text{"Piece of Cheese", "Morceau de Fromage", "Piece of Cheese"},
-     Text{"Triforce Shard", "Éclat de Triforce", "Triforce Shard"},
-     Text{"Shiny Rock", "Caiiloux Brillant", "Shiny Rock"}};
-  trickNameTable[RG_GOHMA_SOUL] = {
-     Text{"Spider Sense", "", ""},
-     Text{"Deku Spirit", "", ""},
-     Text("Ghost of Ghoma", "", "")};
-  trickNameTable[RG_KING_DODONGO_SOUL] = {
-     Text{"Lizard Soul", "", ""},
-     Text{"Regal Remains", "", ""},
-     Text{"Dodongo's Core", "", ""}};
-  trickNameTable[RG_BARINADE_SOUL] = {
-     Text{"Parasitic Poltergeist", "", ""},
-     Text{"Jabu Insides", "", ""},
-     Text{"Barinade Bacteria", "", ""}};
-  trickNameTable[RG_PHANTOM_GANON_SOUL] = {
-     Text{"Bigger Poe", "", ""},
-     Text{"Sacred Forest Pine Tree", "", ""},
-     Text{"Ganon's Phantom", "", ""}};
-  trickNameTable[RG_VOLVAGIA_SOUL] = {
-     Text{"Dragon Roast", "", ""},
-     Text{"Hot n' Ready", "", ""},
-     Text{"Volvagia's Vitality", "", ""}};
-  trickNameTable[RG_MORPHA_SOUL] = {
-     Text{"Dihydrogen Monoxide", "", ""},
-     Text{"Morpha Molecules", "", ""},
-     Text{"Wet Stuff", "", ""}};
-  trickNameTable[RG_BONGO_BONGO_SOUL] = {
-     Text{"Shadow Soul", "", ""},
-     Text{"Dark Essence", "", ""},
-     Text{"Bongo Bongo's Bongo", "", ""}};
-  trickNameTable[RG_TWINROVA_SOUL] = {
-     Text{"Sandy Ashes", "", ""},
-     Text{"Spiritual Spirit", "", ""},
-     Text{"Twin Rovers", "", ""}};
-  trickNameTable[RG_GANON_SOUL] = {
-     Text{"Pure Evil", "", ""},
-     Text{"Ganon's Ghost", "", ""},
-     Text{"Pork", "", ""}};
-  trickNameTable[RG_FISHING_POLE] = {
-     Text{"Fish Tickler", "Fish Tickler", "Fish Tickler"},
-     Text{"Floating Lure", "Floating Lure", "Floating Lure"},
-     Text{"Fishing Reel", "Fishing Reel", "Fishing Reel"}};
+    trickNameTable[RG_RECOVERY_HEART] = {
+        Text{"Love", "Bisou", "Te amo"},
+        Text{"Life", "Vie", "vida"},
+        Text{"HP", "VP", "VP"}
+    };
+    trickNameTable[RG_GREEN_RUPEE] = {
+        Text{"False Greg", "Faux Greg", "Falso Greg"},
+        Text{"One Ruby", "Un rubis", "Un rubí"},
+        Text{"Rupoor (1)", "Roupir (1)", "Rupobre (1)"},
+        Text{"One Rupee", "Un rubis", "Guaraní hyliano"},
+        Text{"Rupee (1)", "Rubis (1)", "Peso hyliano"}
+    };
+    trickNameTable[RG_BLUE_RUPEE] = {
+        Text{"Blupee", "Bleubi", "Azupia"},
+        Text{"Five Rubies", "Cinq Rubys", "Cinco rubíes"},
+        Text{"Five Rupees", "Cinq rubis", "Bolívar hyliano"},
+        Text{"Rupee (5)", "Rubis (5)", "Peso hyliano"},
+        Text{"Rupoor (5)", "Roupir (5)", "Rupobre (5)"}
+    };
+    trickNameTable[RG_RED_RUPEE] = {
+        Text{"Big 20", "Grand 20", "Los 20 grandes"},
+        Text{"Twenty Rubies", "vingt rubis", "Veinte rubíes"},
+        Text{"Rupoor (20)", "Roupir (20)", "Rupobre (20)"},
+        Text{"Twenty Rupees", "Vingt rubis", "Colon hyliano"},
+        Text{"Rupee (20)", "Rubis (20)", "Peso hyliano"}
+    };
+    trickNameTable[RG_PURPLE_RUPEE] = {
+        Text{"Purpee", "pourbi", "morupiua"},
+        Text{"Fifty Rubies", "cinquante rubis", "Cincuenta rubíes"},
+        Text{"Rupoor (50)", "Roupir (50)", "Rupobre (50)"},
+        Text{"Fifty Rupees", "Cinquante rubis", "Balboa hyliano"},
+        Text{"Rupee (50)", "Rubis (50)", "Peso hyliano"}
+    };
+    trickNameTable[RG_HUGE_RUPEE] = {
+        Text{"Hugo", "Or Rubi", "Oro Rubi"},
+        Text{"Two Hundred Rubies", "deux cents rubis", "Doscientos rubíes"},
+        Text{"Diamond", "Diamant", "Diamante"},
+        Text{"Huge Ruby", "Énorme rubis", "Rubi gigante"},
+        Text{"Two Hundred Rupees", "Deux cent rubis", "Euro hyliano"},
+        Text{"Rupee (200)", "Rubis (200)", "Dólar hyliano"}
+    };
+    trickNameTable[RG_PIECE_OF_HEART] = {
+        Text{"Pizza Heart", "Fromage de cœur", "Pieza de Chorizo"},
+        Text{"Little Bit Of Love", "Un peu d'amour", "Un poco de amor"},
+        Text{"Rare Peach Stone", "Pierre de pêche rare", "Pierre de pêche rare"}
+    };
+    trickNameTable[RG_HEART_CONTAINER] = {
+        Text{"Crystal Heart", "Cœur de cristal", "Corazón de cristal"},
+        Text{"Life Heart", "Cœur de vie", "Vida Corazón"},
+        Text{"Lots of Love", "Beaucoup d'amour", "Mucho amor"}
+    };
+    trickNameTable[RG_TRIFORCE_PIECE] = {
+        Text{"Piece of Cheese", "Morceau de Fromage", "Piece of Cheese"},
+        Text{"Triforce Shard", "Éclat de Triforce", "Triforce Shard"},
+        Text{"Shiny Rock", "Caiiloux Brillant", "Shiny Rock"}
+    };
 
-  trickNameTable[RG_OCARINA_A_BUTTON] = {
-     Text{"Ocarina J Button", "", ""},
-     Text{"Ocarina Ayy Button", "", ""},
-     Text{"Ocarina A Trigger", "", ""} };
-  trickNameTable[RG_OCARINA_C_UP_BUTTON] = {
-     Text{"Ocarina C North Button", "", ""},
-     Text{"Ocarina C App Button", "", ""},
-     Text{"Ocarina Sup Button", "", ""} };
-  trickNameTable[RG_OCARINA_C_DOWN_BUTTON] = {
-     Text{"Ocarina C South Button", "", ""},
-     Text{"Ocarina Z Down Button", "", ""},
-     Text{"Ocarina See Down Button", "", ""},
-     Text{"Ocarina C Dawn Button", "", ""} };
-  trickNameTable[RG_OCARINA_C_LEFT_BUTTON] = {
-     Text{"Ocarina C West Button", "", ""},
-     Text{"Ocarina Sea Left Button", "", ""},
-     Text{"Ocarina C Lift Button", "", ""},
-     Text{"Ocarina Rewind Button", "", ""} };
-  trickNameTable[RG_OCARINA_C_RIGHT_BUTTON] = {
-     Text{"Ocarina C East Button", "", ""},
-     Text{"Ocarina C Wright Button", "", ""},
-     Text{"Overworld C Right Button", "", ""} };
+    trickNameTable[RG_GOHMA_SOUL] = {
+        Text{"Spider Sense", "", ""},
+        Text{"Deku Spirit", "", ""},
+        Text{"Ghost of Ghoma", "", ""}
+    };
+    trickNameTable[RG_KING_DODONGO_SOUL] = {
+        Text{"Lizard Soul", "", ""},
+        Text{"Regal Remains", "", ""},
+        Text{"Dodongo's Core", "", ""}
+    };
+    trickNameTable[RG_BARINADE_SOUL] = {
+        Text{"Parasitic Poltergeist", "", ""},
+        Text{"Jabu Insides", "", ""},
+        Text{"Barinade Bacteria", "", ""}
+    };
+    trickNameTable[RG_PHANTOM_GANON_SOUL] = {
+        Text{"Bigger Poe", "", ""},
+        Text{"Sacred Forest Pine Tree", "", ""},
+        Text{"Ganon's Phantom", "", ""}
+    };
+    trickNameTable[RG_VOLVAGIA_SOUL] = {
+        Text{"Dragon Roast", "", ""},
+        Text{"Hot n' Ready", "", ""},
+        Text{"Volvagia's Vitality", "", ""}
+    };
+    trickNameTable[RG_MORPHA_SOUL] = {
+        Text{"Dihydrogen Monoxide", "", ""},
+        Text{"Morpha Molecules", "", ""},
+        Text{"Wet Stuff", "", ""}
+    };
+    trickNameTable[RG_BONGO_BONGO_SOUL] = {
+        Text{"Shadow Soul", "", ""},
+        Text{"Dark Essence", "", ""},
+        Text{"Bongo Bongo's Bongo", "", ""}
+    };
+    trickNameTable[RG_TWINROVA_SOUL] = {
+        Text{"Sandy Ashes", "", ""},
+        Text{"Spiritual Spirit", "", ""},
+        Text{"Twin Rovers", "", ""}
+    };
+    trickNameTable[RG_GANON_SOUL] = {
+        Text{"Pure Evil", "", ""},
+        Text{"Ganon's Ghost", "", ""},
+        Text{"Pork", "", ""}
+    };
 
-/*
-  //Names for individual upgrades, in case progressive names are replaced
-  trickNameTable[GI_HOOKSHOT] = {
-     Text{"Grappling Hook", "Grappin-griffe", "Gancho lanzable"},
-     Text{"Clawshot", "Lance-chaîne", "Zarpa"},
-     Text{"Gripshot", "Grappince", "Enganchador"}};
-  trickNameTable[GI_LONGSHOT] = {
-	 Text{"Longshot, no strings attached", "Grappin sans attrape", "Gancho lanzable más largo"},
-     Text{"Double Clawshot", "Double-grappin", "Superzarpa"},
-     Text{"Switch Hook", "Great grappin", "Gancho chulo"}};
-  trickNameTable[GI_BOMB_BAG_1] = {
-	 Text{"Bomb Capacity (20)", "Capacité de bombes (20)", "Bolsa de bombas (contiene 20)"},
-     Text{"Bronze Bomb Bag", "Sac de Bombes de bronze", "Saco de bronce de bombas"},
-     Text{"Small Bomb Bag", "Petit Sac de Bombes", "Zurrón de bombas pequeño"}};
-  trickNameTable[GI_BOMB_BAG_2] = {
-	 Text{"Bomb Capacity (30)", "Capacité de bombes (30)", "Bolsa de bombas (contiene 30)"},
-     Text{"Silver Bomb Bag", "Sac de Bombes d'argent", "Saco plateado de bombas"},
-     Text{"Medium Bomb Bag", "Sac de Bombes moyen", "Zurrón de bombas mediano"}};
-  trickNameTable[GI_BOMB_BAG_3] = {
-	 Text{"Bomb Capacity (40)", "Capacité de bombes (40)", "Bolsa de bombas (contiene 40)"},
-     Text{"Golden Bomb Bag", "Sac de Bombes d'or", "Saco dorado de bombas"},
-     Text{"Large Bomb Bag", "Gros Sac de Bombes", "Zurrón de bombas grande"}};
-  trickNameTable[GI_BOW_1] = {
-	 Text{"Bow", "Arc", "Arco del Hada"},
-     Text{"Hero's Bow", "Arc du héros", "Arco del héroe"},
-     Text{"Small Quiver", "Petit carquois", "Saco de flechas pequeño"}};
-  trickNameTable[GI_BOW_2] = {
-	 Text{"Arrow Capacity (40)", "Capacité de flèches (40)", "Capacidad de flechas (40)"},
-     Text{"Silver Quiver", "Carquois d'argent", "Carcaj plateado"},
-     Text{"Medium Quiver", "Carquois moyen", "Saco de flechas mediano"}};
-  trickNameTable[GI_BOW_3] = {
-	 Text{"Arrow Capacity (50)", "Capacité de flèches (50)", "Capacidad de flechas (50)"},
-     Text{"Golden Quiver", "Carquois d'or", "Carcaj dorado"},
-     Text{"Large Quiver", "Gros carquois", "Saco de flechas grande"}};
-  trickNameTable[GI_SLINGSHOT_1] = {
-	 Text{"Slingshot", "Lance-Pierre", "Tirachinas del Hada"},
-     Text{"Scattershot", "Lance-Pierre rafale", "Tirachinas múltiple"},
-     Text{"Small Seed Satchel", "Petit sac de graines", "Bolsa de semillas pequeña"}};
-  trickNameTable[GI_SLINGSHOT_2] = {
-	 Text{"Deku Seed Capacity (40)", "Capacité de graines (40)", "Capacidad de semillas (40)"},
-     Text{"Silver Deku Seed Bullet Bag", "Sac de graines d'argent", "Bolsa de balas (contiene 40)"},
-     Text{"Medium Seed Satchel", "Sac de graines moyen", "Bolsa de semillas mediana"}};
-  trickNameTable[GI_SLINGSHOT_3] = {
-	 Text{"Deku Seed Capacity (50)", "Capacité de graines (50)", "Capacidad de semillas (50)"},
-     Text{"Golden Deku Seed Bullet Bag", "Sac de graines d'or", "Bolsa de balas (contiene 50)"},
-     Text{"Large Seed Satchel", "Gros sac de graines", "Bolsa de semillas grande"}};
-  trickNameTable[GI_STRENGTH_1] = {
-	 Text{"Goron's Gauntlet", "Gantelet Goron", "Brazalete amarillo"},
-     Text{"Power Bracelet", "Bracelet de force", "Brazalete de fuerza"},
-     Text{"Magic Bracelet", "Bracelet de Lavio", "Brazalete de Ravio"}};
-  trickNameTable[GI_STRENGTH_2] = {
-	 Text{"Silver Bracelets", "Bracelets d'argent", "Guantes Moguma"},
-     Text{"Power Gloves", "Gant de puissance", "Guante del Poder"},
-     Text{"Magic Gauntlets", "Gantelet magique", "Guante mágico"}};
-  trickNameTable[GI_STRENGTH_3] = {
-	 Text{"Golden Bracelets", "Bracelets d'or", "Guantelete de Thanos"},
-     Text{"Titan's Mitts", "Moufle de titan", "Guantes de Titán"},
-     Text{"Magnetic Gloves", "Magnéto-gants", "Guantes de fuego"}};
-  trickNameTable[GI_SCALE_1] = {
-	 Text{"Silver Pearl", "Perle d'argent", "Perla de Plata progresiva"},
-     Text{"Adult Scale", "Écaille d'adulte", "Bola de bolos zora"},
-     Text{"Zora Scale", "Écaille Zora", "Escama de Zora"}};
-  trickNameTable[GI_SCALE_2] = {
-	 Text{"Golden Pearl", "Perle d'or", "Perla de Oro progresiva"},
-     Text{"Giant Scale", "Écaille de géant", "Escama de Faren"},
-     Text{"Water Dragon Scale", "Écaille du dragon de l'eau", "Escama de dragón acuático"}};
-  trickNameTable[GI_WALLET_1] = {
-	 Text{"Rupee Capacity (200)", "Capacité de rubis (200)", "Capacidad de rupias (200)"},
-     Text{"Silver Wallet", "Bourse d'argent", "Cartera de rupias de adulto"},
-     Text{"Medium Wallet", "Bourse moyenne", "Zurrón de rupias mediano"}};
-  trickNameTable[GI_WALLET_2] = {
-	 Text{"Rupee Capacity (500)", "Capacité de rubis (500)", "Capacidad de rupias (500)"},
-     Text{"Golden Wallet", "Bourse d'or", "Cartera de rupias gigante"},
-     Text{"Large Wallet", "Grosse Bourse", "Zurrón de rupias grande"}};
-  trickNameTable[GI_WALLET_3] = {
-	 Text{"Rupee Capacity (999)", "Capacité de rubis (999)", "Capacidad de rupias (999)"},
-     Text{"Golden Wallet", "Bourse d'or", "Cartera de ricachón"},
-     Text{"Large Wallet", "Grosse Bourse", "Zurrón de rupias gigante"}};
-  trickNameTable[GI_DEKU_NUT_UPGRADE_1] = {
-	 Text{"Deku Bomb Capacity (30)", "Capacité de bombes Mojo (30)", "Capacidad de semillas deku (40)"},
-     Text{"Baba Nut Capacity (30)", "Capacité de noix Baba (30)", "Capacidad de nueces baba (40)"},
-     Text{"Deku Nut Pack (30)", "Paquet de noix Mojo (30)", "Capacidad de nueces mojo (40)"}};
-  trickNameTable[GI_DEKU_NUT_UPGRADE_2] = {
-	 Text{"Deku Bomb Capacity (40)", "Capacité de bombes Mojo (40)", "Capacidad de semillas deku (50)"},
-     Text{"Baba Nut Capacity (40)", "Capacité de noix Baba (40)", "Capacidad de nueces baba (50)"},
-     Text{"Deku Nut Pack (40)", "Paquet de noix Mojo (40)", "Capacidad de nueces mojo (50)"}};
-  trickNameTable[GI_DEKU_STICK_UPGRADE_1] = {
-	 Text{"Deku Rod Capacity (20)", "Capacité de tiges Mojo (20)", "Capacidad de palos mojo (20)"},
-     Text{"Boko Stick Capacity (20)", "Capacité de Bâtons Boko (20)", "Capacidad de palos boko (20)"},
-     Text{"Deku Stick Pack (20)", "Paquet de bâtons Mojo (20)", "Capacidad de bastones deku (20)"}};
-  trickNameTable[GI_DEKU_STICK_UPGRADE_2] = {
-	 Text{"Deku Rod Capacity (30)", "Capacité de tiges Mojo (30)", "Capacidad de palos mojo (30)"},
-     Text{"Boko Stick Capacity (30)", "Capacité de Bâtons Boko (30)", "Capacidad de palos boko (30)"},
-     Text{"Deku Stick Pack (30)", "Paquet de bâtons Mojo (30)", "Capacidad de bastones deku (30)"}};
-  trickNameTable[GI_MAGIC_1] = {
-	 Text{"Stamina Meter", "Jauge d'endurance", "Medidor de vigor"},
-     Text{"Energy Meter", "Jauge d'énergie", "Medidor de energía"},
-     Text{"Magic Powder", "Poudre magique", "Medidor de carga"}};
-  trickNameTable[GI_MAGIC_2] = {
-	 Text{"Enhanced Stamina Meter", "Jauge d'endurance améliorée", "Medidor de vigor mejorado"},
-     Text{"Enhanced Energy Meter", "Jauge d'énergie améliorée", "Medidor de energía mejorado"},
-     Text{"Enhanced Magic Powder", "Poudre magique améliorée", "Medidor de carga mejorado"}};
-  trickNameTable[GI_OCARINA_1] = {
-	 Text{"Ocarina", "Ocarina", "Ocarina"},
-     Text{"Saria's Ocarina", "Ocarina de Saria", "Ocarina de Saria"},
-     Text{"Wood Ocarina", "Ocarina de bois", "Ocarina del Hada"}};
-  trickNameTable[GI_OCARINA_2] = {
-	 Text{"Flute", "Flûte", "Flauta"},
-     Text{"Zelda's Ocarina", "Ocarina de Zelda", "Ocarina de Zelda"},
-     Text{"Ocarina of Winds", "Ocarina des vents", "Ocarina del Viento"}};
-  trickNameTable[GI_CUCCO] = {
-	 Text{"D.I.Y. Alarm Clock", "Réveille-matin improvisé", "Alarma emplumada"},
-     Text{"Kakariko Cucco", "Cocotte Cocorico", "Cuco de Kakariko"},
-     Text{"Hatched Cucco", "Cocotte éclose", "Pollo"}};
-  trickNameTable[GI_MASK_KEATON] = {
-	 Text{"Kee... Something Mask", "Masque de Quiche", "Máscara Kealgo"},
-     Text{"Kitsune Mask", "Masque de Kitsune", "Máscara Kitsune"},
-     Text{"Kafei's Mask", "Masque de Kafei", "Máscara de Kafei"}};
-  trickNameTable[GI_MASK_SKULL] = {
-	 Text{"Skull Kid's Mask", "Masque de Skull Kid", "Máscara de Skull Kid"},
-     Text{"Stalfos Mask", "Masque de squelette", "Máscara de Stalfos"},
-     Text{"Captain's Hat", "Heaume du capitaine", "Casco del capitán"}};
-  trickNameTable[GI_MASK_SPOOKY] = {
-	 Text{"Skrik Mask", "Masque Skrik", "Máscara Escalofriante"},
-     Text{"ReDead Mask", "Masque de Remort", "Máscara de ReDead"},
-     Text{"Gibdo Mask", "Masque de Gibdo", "Careta de Gibdo"}};
-  trickNameTable[GI_MASK_BUNNY] = {
-	 Text{"Peppy Mask", "Masque de Peppy", "Capucha de Pascua"},
-     Text{"Bunny Ears", "Oreilles de lapin", "Orejas de conejo"},
-     Text{"Postman's Hat", "Casquette du facteur", "Gorra de cartero"}};
-  trickNameTable[GI_MASK_GORON] = {
-	 Text{"Goro Mask", "Masque Goro", "Máscara Goro"},
-     Text{"Mask of Goron", "Masque des Gorons", "Máscara de los Goron"},
-     Text{"Darunia Mask", "Masque de Darunia", "Máscara de Darmani"}};
-  trickNameTable[GI_MASK_ZORA] = {
-	 Text{"Zola Mask", "Masque Zola", "Máscara Zola"},
-     Text{"Mask of Zora", "Masque des Zoras", "Máscara de los Zora"},
-     Text{"Ruto Mask", "Masque de Ruto", "Máscara de Mikau"}};
-  trickNameTable[GI_MASK_GERUDO] = {
-	 Text{"Ganguro Mask", "Masque de Ganguro", "Máscara Canguro"},
-     Text{"Mask of Gerudo", "Masque des Gerudos", "Máscara de las Gerudo"},
-     Text{"Nabooru Mask", "Masque de Nabooru", "Máscara de Nabooru"}};
-  trickNameTable[GI_MASK_TRUTH] = {
-	 Text{"Sheikah Mask", "Masque Sheikah", "Máscara Sheikah"},
-     Text{"Mask of Gossip", "Masque de potins", "Máscara chismosa"},
-     Text{"Eye of Truth", "oeil de vérité", "Ojo de la Verdad"}};*/
+    trickNameTable[RG_FISHING_POLE] = {
+        Text{"Fish Tickler", "Fish Tickler", "Fish Tickler"},
+        Text{"Floating Lure", "Floating Lure", "Floating Lure"},
+        Text{"Fishing Reel", "Fishing Reel", "Fishing Reel"}
+    };
+
+    trickNameTable[RG_OCARINA_A_BUTTON] = {
+        Text{"Ocarina J Button", "", ""},
+        Text{"Ocarina Ayy Button", "", ""},
+        Text{"Ocarina A Trigger", "", ""}
+    };
+    trickNameTable[RG_OCARINA_C_UP_BUTTON] = {
+        Text{"Ocarina C North Button", "", ""},
+        Text{"Ocarina C App Button", "", ""},
+        Text{"Ocarina Sup Button", "", ""}
+    };
+    trickNameTable[RG_OCARINA_C_DOWN_BUTTON] = {
+        Text{"Ocarina C South Button", "", ""},
+        Text{"Ocarina Z Down Button", "", ""},
+        Text{"Ocarina See Down Button", "", ""},
+        Text{"Ocarina C Dawn Button", "", ""}
+    };
+    trickNameTable[RG_OCARINA_C_LEFT_BUTTON] = {
+        Text{"Ocarina C West Button", "", ""},
+        Text{"Ocarina Sea Left Button", "", ""},
+        Text{"Ocarina C Lift Button", "", ""},
+        Text{"Ocarina Rewind Button", "", ""}
+    };
+    trickNameTable[RG_OCARINA_C_RIGHT_BUTTON] = {
+        Text{"Ocarina C East Button", "", ""},
+        Text{"Ocarina C Wright Button", "", ""},
+        Text{"Overworld C Right Button", "", ""}
+    };
+
+    /*
+    //Names for individual upgrades, in case progressive names are replaced
+    trickNameTable[GI_HOOKSHOT] = {
+        Text{"Grappling Hook", "Grappin-griffe", "Gancho lanzable"},
+        Text{"Clawshot", "Lance-chaîne", "Zarpa"},
+        Text{"Gripshot", "Grappince", "Enganchador"}
+    };
+    trickNameTable[GI_LONGSHOT] = {
+        Text{"Longshot, no strings attached", "Grappin sans attrape", "Gancho lanzable más largo"},
+        Text{"Double Clawshot", "Double-grappin", "Superzarpa"},
+        Text{"Switch Hook", "Great grappin", "Gancho chulo"}
+    };
+    trickNameTable[GI_BOMB_BAG_1] = {
+        Text{"Bomb Capacity (20)", "Capacité de bombes (20)", "Bolsa de bombas (contiene 20)"},
+        Text{"Bronze Bomb Bag", "Sac de Bombes de bronze", "Saco de bronce de bombas"},
+        Text{"Small Bomb Bag", "Petit Sac de Bombes", "Zurrón de bombas pequeño"}
+    };
+    trickNameTable[GI_BOMB_BAG_2] = {
+        Text{"Bomb Capacity (30)", "Capacité de bombes (30)", "Bolsa de bombas (contiene 30)"},
+        Text{"Silver Bomb Bag", "Sac de Bombes d'argent", "Saco plateado de bombas"},
+        Text{"Medium Bomb Bag", "Sac de Bombes moyen", "Zurrón de bombas mediano"}
+    };
+    trickNameTable[GI_BOMB_BAG_3] = {
+        Text{"Bomb Capacity (40)", "Capacité de bombes (40)", "Bolsa de bombas (contiene 40)"},
+        Text{"Golden Bomb Bag", "Sac de Bombes d'or", "Saco dorado de bombas"},
+        Text{"Large Bomb Bag", "Gros Sac de Bombes", "Zurrón de bombas grande"}
+    };
+    trickNameTable[GI_BOW_1] = {
+        Text{"Bow", "Arc", "Arco del Hada"},
+        Text{"Hero's Bow", "Arc du héros", "Arco del héroe"},
+        Text{"Small Quiver", "Petit carquois", "Saco de flechas pequeño"}
+    };
+    trickNameTable[GI_BOW_2] = {
+        Text{"Arrow Capacity (40)", "Capacité de flèches (40)", "Capacidad de flechas (40)"},
+        Text{"Silver Quiver", "Carquois d'argent", "Carcaj plateado"},
+        Text{"Medium Quiver", "Carquois moyen", "Saco de flechas mediano"}
+    };
+    trickNameTable[GI_BOW_3] = {
+        Text{"Arrow Capacity (50)", "Capacité de flèches (50)", "Capacidad de flechas (50)"},
+        Text{"Golden Quiver", "Carquois d'or", "Carcaj dorado"},
+        Text{"Large Quiver", "Gros carquois", "Saco de flechas grande"}
+    };
+    trickNameTable[GI_SLINGSHOT_1] = {
+        Text{"Slingshot", "Lance-Pierre", "Tirachinas del Hada"},
+        Text{"Scattershot", "Lance-Pierre rafale", "Tirachinas múltiple"},
+        Text{"Small Seed Satchel", "Petit sac de graines", "Bolsa de semillas pequeña"}
+    };
+    trickNameTable[GI_SLINGSHOT_2] = {
+        Text{"Deku Seed Capacity (40)", "Capacité de graines (40)", "Capacidad de semillas (40)"},
+        Text{"Silver Deku Seed Bullet Bag", "Sac de graines d'argent", "Bolsa de balas (contiene 40)"},
+        Text{"Medium Seed Satchel", "Sac de graines moyen", "Bolsa de semillas mediana"}
+    };
+    trickNameTable[GI_SLINGSHOT_3] = {
+        Text{"Deku Seed Capacity (50)", "Capacité de graines (50)", "Capacidad de semillas (50)"},
+        Text{"Golden Deku Seed Bullet Bag", "Sac de graines d'or", "Bolsa de balas (contiene 50)"},
+        Text{"Large Seed Satchel", "Gros sac de graines", "Bolsa de semillas grande"}
+    };
+    trickNameTable[GI_STRENGTH_1] = {
+        Text{"Goron's Gauntlet", "Gantelet Goron", "Brazalete amarillo"},
+        Text{"Power Bracelet", "Bracelet de force", "Brazalete de fuerza"},
+        Text{"Magic Bracelet", "Bracelet de Lavio", "Brazalete de Ravio"}
+    };
+    trickNameTable[GI_STRENGTH_2] = {
+        Text{"Silver Bracelets", "Bracelets d'argent", "Guantes Moguma"},
+        Text{"Power Gloves", "Gant de puissance", "Guante del Poder"},
+        Text{"Magic Gauntlets", "Gantelet magique", "Guante mágico"}
+    };
+    trickNameTable[GI_STRENGTH_3] = {
+        Text{"Golden Bracelets", "Bracelets d'or", "Guantelete de Thanos"},
+        Text{"Titan's Mitts", "Moufle de titan", "Guantes de Titán"},
+        Text{"Magnetic Gloves", "Magnéto-gants", "Guantes de fuego"}
+    };
+    trickNameTable[GI_SCALE_1] = {
+        Text{"Silver Pearl", "Perle d'argent", "Perla de Plata progresiva"},
+        Text{"Adult Scale", "Écaille d'adulte", "Bola de bolos zora"},
+        Text{"Zora Scale", "Écaille Zora", "Escama de Zora"}
+    };
+    trickNameTable[GI_SCALE_2] = {
+        Text{"Golden Pearl", "Perle d'or", "Perla de Oro progresiva"},
+        Text{"Giant Scale", "Écaille de géant", "Escama de Faren"},
+        Text{"Water Dragon Scale", "Écaille du dragon de l'eau", "Escama de dragón acuático"}
+    };
+    trickNameTable[GI_WALLET_1] = {
+        Text{"Rupee Capacity (200)", "Capacité de rubis (200)", "Capacidad de rupias (200)"},
+        Text{"Silver Wallet", "Bourse d'argent", "Cartera de rupias de adulto"},
+        Text{"Medium Wallet", "Bourse moyenne", "Zurrón de rupias mediano"}
+    };
+    trickNameTable[GI_WALLET_2] = {
+        Text{"Rupee Capacity (500)", "Capacité de rubis (500)", "Capacidad de rupias (500)"},
+        Text{"Golden Wallet", "Bourse d'or", "Cartera de rupias gigante"},
+        Text{"Large Wallet", "Grosse Bourse", "Zurrón de rupias grande"}
+    };
+    trickNameTable[GI_WALLET_3] = {
+        Text{"Rupee Capacity (999)", "Capacité de rubis (999)", "Capacidad de rupias (999)"},
+        Text{"Golden Wallet", "Bourse d'or", "Cartera de ricachón"},
+        Text{"Large Wallet", "Grosse Bourse", "Zurrón de rupias gigante"}
+    };
+    trickNameTable[GI_DEKU_NUT_UPGRADE_1] = {
+        Text{"Deku Bomb Capacity (30)", "Capacité de bombes Mojo (30)", "Capacidad de semillas deku (40)"},
+        Text{"Baba Nut Capacity (30)", "Capacité de noix Baba (30)", "Capacidad de nueces baba (40)"},
+        Text{"Deku Nut Pack (30)", "Paquet de noix Mojo (30)", "Capacidad de nueces mojo (40)"}
+    };
+    trickNameTable[GI_DEKU_NUT_UPGRADE_2] = {
+        Text{"Deku Bomb Capacity (40)", "Capacité de bombes Mojo (40)", "Capacidad de semillas deku (50)"},
+        Text{"Baba Nut Capacity (40)", "Capacité de noix Baba (40)", "Capacidad de nueces baba (50)"},
+        Text{"Deku Nut Pack (40)", "Paquet de noix Mojo (40)", "Capacidad de nueces mojo (50)"}
+    };
+    trickNameTable[GI_DEKU_STICK_UPGRADE_1] = {
+        Text{"Deku Rod Capacity (20)", "Capacité de tiges Mojo (20)", "Capacidad de palos mojo (20)"},
+        Text{"Boko Stick Capacity (20)", "Capacité de Bâtons Boko (20)", "Capacidad de palos boko (20)"},
+        Text{"Deku Stick Pack (20)", "Paquet de bâtons Mojo (20)", "Capacidad de bastones deku (20)"}
+    };
+    trickNameTable[GI_DEKU_STICK_UPGRADE_2] = {
+        Text{"Deku Rod Capacity (30)", "Capacité de tiges Mojo (30)", "Capacidad de palos mojo (30)"},
+        Text{"Boko Stick Capacity (30)", "Capacité de Bâtons Boko (30)", "Capacidad de palos boko (30)"},
+        Text{"Deku Stick Pack (30)", "Paquet de bâtons Mojo (30)", "Capacidad de bastones deku (30)"}
+    };
+    trickNameTable[GI_MAGIC_1] = {
+        Text{"Stamina Meter", "Jauge d'endurance", "Medidor de vigor"},
+        Text{"Energy Meter", "Jauge d'énergie", "Medidor de energía"},
+        Text{"Magic Powder", "Poudre magique", "Medidor de carga"}
+    };
+    trickNameTable[GI_MAGIC_2] = {
+        Text{"Enhanced Stamina Meter", "Jauge d'endurance améliorée", "Medidor de vigor mejorado"},
+        Text{"Enhanced Energy Meter", "Jauge d'énergie améliorée", "Medidor de energía mejorado"},
+        Text{"Enhanced Magic Powder", "Poudre magique améliorée", "Medidor de carga mejorado"}
+    };
+    trickNameTable[GI_OCARINA_1] = {
+        Text{"Ocarina", "Ocarina", "Ocarina"},
+        Text{"Saria's Ocarina", "Ocarina de Saria", "Ocarina de Saria"},
+        Text{"Wood Ocarina", "Ocarina de bois", "Ocarina del Hada"}
+    };
+    trickNameTable[GI_OCARINA_2] = {
+        Text{"Flute", "Flûte", "Flauta"},
+        Text{"Zelda's Ocarina", "Ocarina de Zelda", "Ocarina de Zelda"},
+        Text{"Ocarina of Winds", "Ocarina des vents", "Ocarina del Viento"}
+    };
+    trickNameTable[GI_CUCCO] = {
+        Text{"D.I.Y. Alarm Clock", "Réveille-matin improvisé", "Alarma emplumada"},
+        Text{"Kakariko Cucco", "Cocotte Cocorico", "Cuco de Kakariko"},
+        Text{"Hatched Cucco", "Cocotte éclose", "Pollo"}
+    };
+    trickNameTable[GI_MASK_KEATON] = {
+        Text{"Kee... Something Mask", "Masque de Quiche", "Máscara Kealgo"},
+        Text{"Kitsune Mask", "Masque de Kitsune", "Máscara Kitsune"},
+        Text{"Kafei's Mask", "Masque de Kafei", "Máscara de Kafei"}
+    };
+    trickNameTable[GI_MASK_SKULL] = {
+        Text{"Skull Kid's Mask", "Masque de Skull Kid", "Máscara de Skull Kid"},
+        Text{"Stalfos Mask", "Masque de squelette", "Máscara de Stalfos"},
+        Text{"Captain's Hat", "Heaume du capitaine", "Casco del capitán"}
+    };
+    trickNameTable[GI_MASK_SPOOKY] = {
+        Text{"Skrik Mask", "Masque Skrik", "Máscara Escalofriante"},
+        Text{"ReDead Mask", "Masque de Remort", "Máscara de ReDead"},
+        Text{"Gibdo Mask", "Masque de Gibdo", "Careta de Gibdo"}
+    };
+    trickNameTable[GI_MASK_BUNNY] = {
+        Text{"Peppy Mask", "Masque de Peppy", "Capucha de Pascua"},
+        Text{"Bunny Ears", "Oreilles de lapin", "Orejas de conejo"},
+        Text{"Postman's Hat", "Casquette du facteur", "Gorra de cartero"}
+    };
+    trickNameTable[GI_MASK_GORON] = {
+        Text{"Goro Mask", "Masque Goro", "Máscara Goro"},
+        Text{"Mask of Goron", "Masque des Gorons", "Máscara de los Goron"},
+        Text{"Darunia Mask", "Masque de Darunia", "Máscara de Darmani"}
+    };
+    trickNameTable[GI_MASK_ZORA] = {
+        Text{"Zola Mask", "Masque Zola", "Máscara Zola"},
+        Text{"Mask of Zora", "Masque des Zoras", "Máscara de los Zora"},
+        Text{"Ruto Mask", "Masque de Ruto", "Máscara de Mikau"}
+    };
+    trickNameTable[GI_MASK_GERUDO] = {
+        Text{"Ganguro Mask", "Masque de Ganguro", "Máscara Canguro"},
+        Text{"Mask of Gerudo", "Masque des Gerudos", "Máscara de las Gerudo"},
+        Text{"Nabooru Mask", "Masque de Nabooru", "Máscara de Nabooru"}
+    };
+    trickNameTable[GI_MASK_TRUTH] = {
+        Text{"Sheikah Mask", "Masque Sheikah", "Máscara Sheikah"},
+        Text{"Mask of Gossip", "Masque de potins", "Máscara chismosa"},
+        Text{"Eye of Truth", "oeil de vérité", "Ojo de la Verdad"}
+    };
+    */
 }
 
 //Generate a fake name for the ice trap based on the item it's displayed as
 Text GetIceTrapName(uint8_t id) {
-  //If the trick names table has not been initialized, do so
-  if (!initTrickNames) {
-    InitTrickNames();
-    initTrickNames = true;
-  }
-  //Randomly get the easy, medium, or hard name for the given item id
-  return RandomElement(trickNameTable[id]);
-}
-
-//Get shop index based on a given location
-static std::map<std::string_view, int> ShopNameToNum = {{"KF Shop", 0},   {"Kak Potion Shop", 1}, {"MK Bombchu Shop", 2}, {"MK Potion Shop", 3},
-                                                        {"MK Bazaar", 4}, {"Kak Bazaar", 5},      {"ZD Shop", 6},         {"GC Shop", 7}};
-int GetShopIndex(RandomizerCheck loc) {
-  //Kind of hacky, but extract the shop and item position from the name
-  const std::string& name(Rando::StaticData::GetLocation(loc)->GetName());
-  int split = name.find(" Item ");
-  std::string_view shop(name.c_str(), split);
-  int pos = std::stoi(name.substr(split+6, 1)) - 1;
-  int shopnum = ShopNameToNum[shop];
-  return shopnum*8 + pos;
-}
-
-//Without this transformed index, shop-related tables and arrays would need 64 entries- But only half of that is needed for shopsanity
-//So we use this transformation to map only important indices to an array with 32 entries in the following manner:
-//Shop index:  4  5  6  7 12 13 14 15 20 21 22 23...
-//Transformed: 0  1  2  3  4  5  6  7  8  9 10 11...
-//So we first divide the shop index by 4, then by 2 which basically tells us the index of the shop it's in,
-//then multiply by 4 since there are 4 items per shop
-//And finally we use a modulo by 4 to get the index within the "shop" of 4 items, and add
-int TransformShopIndex(int index) {
-  return 4*((index / 4) / 2) + index % 4;
-}
+    //If the trick names table has not been initialized, do so
+    if (!initTrickNames) {
+        InitTrickNames();
+        initTrickNames = true;
+    }
+    //Randomly get the easy, medium, or hard name for the given item id
+    return RandomElement(trickNameTable[id]);
+}
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/3drando/shops.hpp b/soh/soh/Enhancements/randomizer/3drando/shops.hpp
index 33cf57ff4..152e64d0f 100644
--- a/soh/soh/Enhancements/randomizer/3drando/shops.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/shops.hpp
@@ -2,7 +2,6 @@
 #include "../context.h"
 
 #include <vector>
-#include <array>
 
 struct ItemAndPrice {
     Text Name;
@@ -16,7 +15,5 @@ extern int GetRandomShopPrice();
 extern int16_t GetRandomScrubPrice();
 extern int GetShopsanityReplaceAmount();
 extern Text GetIceTrapName(uint8_t id);
-extern int GetShopIndex(RandomizerCheck loc);
-extern int TransformShopIndex(int index);
 
-extern std::vector<ItemAndPrice> NonShopItems;
+extern std::map<RandomizerCheck, ItemAndPrice> NonShopItems;
diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
index 10301d297..5ec183b50 100644
--- a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
@@ -160,7 +160,7 @@ void WriteIngameSpoilerLog() {
         // PURPLE TODO: LOCALIZATION
         auto locItem = itemLocation->GetPlacedItemName().GetEnglish();
         if (itemLocation->GetPlacedRandomizerGet() == RG_ICE_TRAP && loc->GetRCType() == RCTYPE_SHOP) {
-            locItem = NonShopItems[TransformShopIndex(GetShopIndex(key))].Name.GetEnglish();
+            locItem = NonShopItems[key].Name.GetEnglish();
         }
         if (stringOffsetMap.find(locItem) == stringOffsetMap.end()) {
             if (spoilerStringOffset + locItem.size() + 1 >= SPOILER_STRING_DATA_SIZE) {
diff --git a/soh/soh/Enhancements/randomizer/context.cpp b/soh/soh/Enhancements/randomizer/context.cpp
index a81295bea..18f187c4d 100644
--- a/soh/soh/Enhancements/randomizer/context.cpp
+++ b/soh/soh/Enhancements/randomizer/context.cpp
@@ -106,9 +106,8 @@ void Context::PlaceItemInLocation(const RandomizerCheck locKey, const Randomizer
     // If we're placing a non-shop item in a shop location, we want to record it for custom messages
     if (StaticData::RetrieveItem(item).GetItemType() != ITEMTYPE_SHOP &&
         StaticData::GetLocation(locKey)->GetRCType() == RCTYPE_SHOP) {
-        const int index = TransformShopIndex(GetShopIndex(locKey));
-        NonShopItems[index].Name = StaticData::RetrieveItem(item).GetName();
-        NonShopItems[index].Repurchaseable =
+        NonShopItems[locKey].Name = StaticData::RetrieveItem(item).GetName();
+        NonShopItems[locKey].Repurchaseable =
             StaticData::RetrieveItem(item).GetItemType() == ITEMTYPE_REFILL ||
             StaticData::RetrieveItem(item).GetHintKey() == RHT_PROGRESSIVE_BOMBCHUS;
     }
@@ -214,7 +213,7 @@ void Context::CreateItemOverrides() {
             val.SetTrickName(GetIceTrapName(val.LooksLike()));
             // If this is ice trap is in a shop, change the name based on what the model will look like
             if (loc->GetRCType() == RCTYPE_SHOP) {
-                NonShopItems[TransformShopIndex(GetShopIndex(locKey))].Name = val.GetTrickName();
+                NonShopItems[locKey].Name = val.GetTrickName();
             }
             overrides[locKey] = val;
         }
diff --git a/soh/soh/Enhancements/randomizer/item.cpp b/soh/soh/Enhancements/randomizer/item.cpp
index 85d0d71cf..2d3f48451 100644
--- a/soh/soh/Enhancements/randomizer/item.cpp
+++ b/soh/soh/Enhancements/randomizer/item.cpp
@@ -81,16 +81,22 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
     if (giEntry != nullptr) {
         return giEntry;
     }
-    auto logic = Rando::Context::GetInstance()->GetLogic();
+    std::shared_ptr<Rando::Context> ctx = Rando::Context::GetInstance();
+    auto logic = ctx->GetLogic();
     RandomizerGet actual = RG_NONE;
-    const bool tycoonWallet =
-        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHOPSANITY) > RO_SHOPSANITY_ZERO_ITEMS;
-    const u8 infiniteUpgrades = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_INFINITE_UPGRADES);
+    const bool tycoonWallet = !(
+        ctx->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_OFF) ||
+        (
+            ctx->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_SPECIFIC_COUNT) &&
+            ctx->GetOption(RSK_SHOPSANITY_COUNT).Is(RO_SHOPSANITY_COUNT_ZERO_ITEMS)
+        )
+    );
+    const u8 infiniteUpgrades = ctx->GetOption(RSK_INFINITE_UPGRADES).Value<u8>();
     switch (randomizerGet) {
         case RG_PROGRESSIVE_STICK_UPGRADE:
             switch (logic->CurrentUpgrade(UPG_STICKS)) {
                 case 0:
-                    if (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_DEKU_STICK_BAG)) {
+                    if (ctx->GetOption(RSK_SHUFFLE_DEKU_STICK_BAG)) {
                         actual = RG_DEKU_STICK_BAG;
                         break;
                     }
@@ -119,7 +125,7 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
         case RG_PROGRESSIVE_NUT_UPGRADE:
             switch (logic->CurrentUpgrade(UPG_NUTS)) {
                 case 0:
-                    if (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_DEKU_NUT_BAG)) {
+                    if (ctx->GetOption(RSK_SHUFFLE_DEKU_NUT_BAG)) {
                         actual = RG_DEKU_NUT_BAG;
                         break;
                     }
diff --git a/soh/soh/Enhancements/randomizer/option_descriptions.cpp b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
index 597b46db6..547d675df 100644
--- a/soh/soh/Enhancements/randomizer/option_descriptions.cpp
+++ b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
@@ -263,13 +263,19 @@ void Settings::CreateOptionDescriptions() {
         "The deku nut bag is required to hold deku nuts.";
     mOptionDescriptions[RSK_SHOPSANITY] = "Off - All shop items will be the same as vanilla.\n"
                                           "\n"
-                                          "0 Items - Vanilla shop items will be shuffled among different shops.\n"
-                                          "\n"
-                                          "1-4 Items - Vanilla shop items will be shuffled among different shops, and "
-                                          "each shop will contain 1-4 non-vanilla shop items.\n"
+                                          "Specifc Count - Vanilla shop items will be shuffled among different shops, and "
+                                          "each shop will contain a specifc number (0-7) of non-vanilla shop items.\n"
                                           "\n"
                                           "Random - Vanilla shop items will be shuffled among different shops, and "
-                                          "each shop will contain a random number(1-4) of non-vanilla shop items.\n";
+                                          "each shop will contain a random number (1-7) of non-vanilla shop items.";
+    mOptionDescriptions[RSK_SHOPSANITY_COUNT] = "0 Items - Vanilla shop items will be shuffled among different shops.\n"
+                                                "\n"
+                                                "1-7 Items - Vanilla shop items will be shuffled among different shops, and "
+                                                "each shop will contain 1-7 non-vanilla shop items.\n"
+                                                /*
+                                                "\n"
+                                                "8 Items - All shops will contain 8 non-vanilla shop items.\n"
+                                                */;
     mOptionDescriptions[RSK_SHOPSANITY_PRICES] =
         "Balanced - The default randomization. Shop prices for shopsanity items will range between 0 to 300 rupees, "
         "with a bias towards values slightly below the middle of the range, in multiples of 5.\n "
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index c5f9849e1..45c794244 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -367,7 +367,13 @@ ItemObtainability Randomizer::GetItemObtainabilityFromRandomizerGet(RandomizerGe
     // Shopsanity with at least one item shuffled allows for a third wallet upgrade.
     // This is needed since Plentiful item pool also adds a third progressive wallet
     // but we should *not* get Tycoon's Wallet in that mode.
-    bool tycoonWallet = GetRandoSettingValue(RSK_SHOPSANITY) > RO_SHOPSANITY_ZERO_ITEMS;
+    bool tycoonWallet = !(
+        GetRandoSettingValue(RSK_SHOPSANITY) == RO_SHOPSANITY_OFF ||
+        (
+            GetRandoSettingValue(RSK_SHOPSANITY) == RO_SHOPSANITY_SPECIFIC_COUNT &&
+            GetRandoSettingValue(RSK_SHOPSANITY_COUNT) == RO_SHOPSANITY_COUNT_ZERO_ITEMS
+        )
+    );
 
     // Same thing with the infinite upgrades, if we're not shuffling them
     // and we're using the Plentiful item pool, we should prevent the infinite
@@ -1138,9 +1144,13 @@ ShopItemIdentity Randomizer::IdentifyShopItem(s32 sceneNum, u8 slotIndex) {
     shopItemIdentity.itemPrice = -1;
     shopItemIdentity.enGirlAShopItem = 0x32;
 
+    if (slotIndex == 0) {
+        return shopItemIdentity;
+    }
+
     Rando::Location* location = GetCheckObjectFromActor(ACTOR_EN_GIRLA,
         // Bazaar (SHOP1) scene is reused, so if entering from Kak use debug scene to identify
-        (sceneNum == SCENE_BAZAAR && gSaveContext.entranceIndex == ENTR_BAZAAR_0) ? SCENE_TEST01 : sceneNum, slotIndex);
+        (sceneNum == SCENE_BAZAAR && gSaveContext.entranceIndex == ENTR_BAZAAR_0) ? SCENE_TEST01 : sceneNum, slotIndex - 1);
 
     if (location->GetRandomizerCheck() != RC_UNKNOWN_CHECK) {
         shopItemIdentity.randomizerInf = rcToRandomizerInf[location->GetRandomizerCheck()];
diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h
index 4d05cffd8..324e90149 100644
--- a/soh/soh/Enhancements/randomizer/randomizerTypes.h
+++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@@ -3767,6 +3767,7 @@ typedef enum {
     RSK_SHUFFLE_SONGS,
     RSK_SHUFFLE_TOKENS,
     RSK_SHOPSANITY,
+    RSK_SHOPSANITY_COUNT,
     RSK_SHOPSANITY_PRICES,
     RSK_SHOPSANITY_PRICES_AFFORDABLE,
     RSK_SHUFFLE_SCRUBS,
@@ -3976,17 +3977,26 @@ typedef enum {
     RO_BRIDGE_WILDCARD_REWARD,
 } RandoOptionBridgeRewards;
 
-//Shopsanity settings (off, 0-4 items, random)
+//Shopsanity settings (off, specific count, random)
 typedef enum {
     RO_SHOPSANITY_OFF,
-    RO_SHOPSANITY_ZERO_ITEMS,
-    RO_SHOPSANITY_ONE_ITEM,
-    RO_SHOPSANITY_TWO_ITEMS,
-    RO_SHOPSANITY_THREE_ITEMS,
-    RO_SHOPSANITY_FOUR_ITEMS,
+    RO_SHOPSANITY_SPECIFIC_COUNT,
     RO_SHOPSANITY_RANDOM,
 } RandoOptionShopsanity;
 
+//Shopsanity count settings (0-7 items)
+typedef enum {
+    RO_SHOPSANITY_COUNT_ZERO_ITEMS,
+    RO_SHOPSANITY_COUNT_ONE_ITEM,
+    RO_SHOPSANITY_COUNT_TWO_ITEMS,
+    RO_SHOPSANITY_COUNT_THREE_ITEMS,
+    RO_SHOPSANITY_COUNT_FOUR_ITEMS,
+    RO_SHOPSANITY_COUNT_FIVE_ITEMS,
+    RO_SHOPSANITY_COUNT_SIX_ITEMS,
+    RO_SHOPSANITY_COUNT_SEVEN_ITEMS,
+    RO_SHOPSANITY_COUNT_EIGHT_ITEMS,
+} RandoOptionShopsanityCount;
+
 //Shopsanity price ranges
 typedef enum {
     RO_SHOPSANITY_PRICE_BALANCED, //Balanced random from 0-300
diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp
index 4614a24d1..45bb928ac 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp
@@ -119,8 +119,16 @@ void RandomizerCheckObjects::UpdateImGuiVisibility() {
                  (CVarGetInteger(CVAR_RANDOMIZER_SETTING("MQDungeons"), RO_MQ_DUNGEONS_NONE) != RO_MQ_DUNGEONS_SET_NUMBER ||
                   CVarGetInteger(CVAR_RANDOMIZER_SETTING("MQDungeonCount"), 12) < 12) // at least one vanilla dungeon
              ) &&
-            (location.GetRCType() != RCTYPE_SHOP ||
-             CVarGetInteger(CVAR_RANDOMIZER_SETTING("Shopsanity"), RO_SHOPSANITY_OFF) > RO_SHOPSANITY_ZERO_ITEMS) &&
+            (
+                location.GetRCType() != RCTYPE_SHOP ||
+                !(
+                    ctx->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_OFF) ||
+                    (
+                        ctx->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_SPECIFIC_COUNT) &&
+                        ctx->GetOption(RSK_SHOPSANITY_COUNT).Is(RO_SHOPSANITY_COUNT_ZERO_ITEMS)
+                    )
+                )
+            ) &&
             (location.GetRCType() != RCTYPE_SCRUB ||
              CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleScrubs"), RO_SCRUBS_OFF) != RO_SCRUBS_OFF ||
              location.GetRandomizerCheck() == RC_HF_DEKU_SCRUB_GROTTO ||
diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
index 33fe121da..469a16f76 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
@@ -1101,12 +1101,11 @@ void EndFloatWindows() {
 }
 
 void LoadSettings() {
-    //If in randomzer (n64ddFlag), then get the setting and check if in general we should be showing the settings
+    //If in randomzer, then get the setting and check if in general we should be showing the settings
     //If in vanilla, _try_ to show items that at least are needed for 100%
 
-    showShops = IS_RANDO ? (
-            OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHOPSANITY) != RO_SHOPSANITY_OFF &&
-            OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHOPSANITY) != RO_SHOPSANITY_ZERO_ITEMS)
+    showShops = IS_RANDO ?
+        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHOPSANITY) != RO_SHOPSANITY_OFF
         : false;
     showBeans = IS_RANDO ?
         OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_MAGIC_BEANS) == RO_GENERIC_YES
diff --git a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
index e2bbc92a4..2b67e105d 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
@@ -390,7 +390,13 @@ ItemTrackerNumbers GetItemCurrentAndMax(ItemTrackerItem item) {
         case ITEM_WALLET_ADULT:
         case ITEM_WALLET_GIANT:
             result.currentCapacity = IS_RANDO && !Flags_GetRandomizerInf(RAND_INF_HAS_WALLET) ? 0 : CUR_CAPACITY(UPG_WALLET);
-            result.maxCapacity = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHOPSANITY) > RO_SHOPSANITY_ZERO_ITEMS ? 999 : 500;
+            result.maxCapacity = !IS_RANDO || (
+                OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHOPSANITY) == RO_SHOPSANITY_OFF ||
+                (
+                    OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHOPSANITY) == RO_SHOPSANITY_SPECIFIC_COUNT &&
+                    OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHOPSANITY_COUNT) == RO_SHOPSANITY_COUNT_ZERO_ITEMS
+                )
+            ) ? 500 : 999;
             result.currentAmmo = gSaveContext.rupees;
             break;
         case ITEM_BOMBCHU:
diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
index 5bbd66d58..4ecdd5b18 100644
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -97,7 +97,8 @@ void Settings::CreateOptions() {
     mOptions[RSK_SHUFFLE_DUNGEON_REWARDS] = Option::U8("Shuffle Dungeon Rewards", {"End of Dungeons", "Any Dungeon", "Overworld", "Anywhere"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleDungeonReward"), mOptionDescriptions[RSK_SHUFFLE_DUNGEON_REWARDS], WidgetType::Combobox, RO_DUNGEON_REWARDS_END_OF_DUNGEON);
     mOptions[RSK_LINKS_POCKET] = Option::U8("Link's Pocket", {"Dungeon Reward", "Advancement", "Anything", "Nothing"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("LinksPocket"), "", WidgetType::Combobox, RO_LINKS_POCKET_DUNGEON_REWARD);
     mOptions[RSK_SHUFFLE_SONGS] = Option::U8("Shuffle Songs", {"Song Locations", "Dungeon Rewards", "Anywhere"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleSongs"), mOptionDescriptions[RSK_SHUFFLE_SONGS], WidgetType::Combobox, RO_SONG_SHUFFLE_SONG_LOCATIONS);
-    mOptions[RSK_SHOPSANITY] = Option::U8("Shopsanity", {"Off", "0 Items", "1 Item", "2 Items", "3 Items", "4 Items", "Random"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("Shopsanity"), mOptionDescriptions[RSK_SHOPSANITY], WidgetType::Combobox, RO_SHOPSANITY_OFF);
+    mOptions[RSK_SHOPSANITY] = Option::U8("Shopsanity", {"Off", "Specific Count", "Random"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("Shopsanity"), mOptionDescriptions[RSK_SHOPSANITY], WidgetType::Combobox, RO_SHOPSANITY_OFF);
+    mOptions[RSK_SHOPSANITY_COUNT] = Option::U8("Shopsanity Item Count", {NumOpts(0, 7/*8*/)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShopsanityCount"), mOptionDescriptions[RSK_SHOPSANITY_COUNT], WidgetType::Slider, 0, false, IMFLAG_NONE);
     mOptions[RSK_SHOPSANITY_PRICES] = Option::U8("Shopsanity Prices", {"Balanced", "Starting Wallet", "Adult Wallet", "Giant's Wallet", "Tycoon's Wallet"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShopsanityPrices"), mOptionDescriptions[RSK_SHOPSANITY_PRICES], WidgetType::Combobox, RO_SHOPSANITY_PRICE_BALANCED, false, IMFLAG_NONE);
     mOptions[RSK_SHOPSANITY_PRICES_AFFORDABLE] = Option::Bool("Affordable Prices", CVAR_RANDOMIZER_SETTING("ShopsanityPricesAffordable"), mOptionDescriptions[RSK_SHOPSANITY_PRICES_AFFORDABLE]);
     mOptions[RSK_SHUFFLE_TOKENS] = Option::U8("Tokensanity", {"Off", "Dungeons", "Overworld", "All Tokens"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleTokens"), mOptionDescriptions[RSK_SHUFFLE_TOKENS], WidgetType::Combobox, RO_TOKENSANITY_OFF);
@@ -672,6 +673,7 @@ void Settings::CreateOptions() {
     }, false, WidgetContainerType::COLUMN);
     mOptionGroups[RSG_SHUFFLE_NPCS_IMGUI] = OptionGroup::SubGroup("Shuffle NPCs & Merchants", {
         &mOptions[RSK_SHOPSANITY],
+        &mOptions[RSK_SHOPSANITY_COUNT],
         &mOptions[RSK_SHOPSANITY_PRICES],
         &mOptions[RSK_SHOPSANITY_PRICES_AFFORDABLE],
         &mOptions[RSK_FISHSANITY],
@@ -876,6 +878,7 @@ void Settings::CreateOptions() {
         &mOptions[RSK_LINKS_POCKET],
         &mOptions[RSK_SHUFFLE_SONGS],
         &mOptions[RSK_SHOPSANITY],
+        &mOptions[RSK_SHOPSANITY_COUNT],
         &mOptions[RSK_SHOPSANITY_PRICES],
         &mOptions[RSK_SHOPSANITY_PRICES_AFFORDABLE],
         &mOptions[RSK_FISHSANITY],
@@ -1084,6 +1087,7 @@ void Settings::CreateOptions() {
         &mOptions[RSK_SHUFFLE_DUNGEON_REWARDS],
         &mOptions[RSK_SHUFFLE_SONGS],
         &mOptions[RSK_SHOPSANITY],
+        &mOptions[RSK_SHOPSANITY_COUNT],
         &mOptions[RSK_SHOPSANITY_PRICES],
         &mOptions[RSK_SHOPSANITY_PRICES_AFFORDABLE],
         &mOptions[RSK_FISHSANITY],
@@ -1125,6 +1129,7 @@ void Settings::CreateOptions() {
         { "Shuffle Settings:Shuffle Songs", RSK_SHUFFLE_SONGS },
         { "Shuffle Settings:Shuffle Gerudo Membership Card", RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD },
         { "Shuffle Settings:Shopsanity", RSK_SHOPSANITY },
+        { "Shuffle Settings:Shopsanity Specific Count", RSK_SHOPSANITY_COUNT },
         { "Shuffle Settings:Shopsanity Prices", RSK_SHOPSANITY_PRICES },
         { "Shuffle Settings:Affordable Prices", RSK_SHOPSANITY_PRICES_AFFORDABLE },
         { "Shuffle Settings:Fishsanity", RSK_FISHSANITY },
@@ -1605,13 +1610,20 @@ void Settings::UpdateOptionProperties() {
     // Hide shopsanity prices if shopsanity is off or zero
     switch (CVarGetInteger(CVAR_RANDOMIZER_SETTING("Shopsanity"), RO_SHOPSANITY_OFF)) {
         case RO_SHOPSANITY_OFF:
-        case RO_SHOPSANITY_ZERO_ITEMS:
             mOptions[RSK_SHOPSANITY].AddFlag(IMFLAG_SEPARATOR_BOTTOM);
+            mOptions[RSK_SHOPSANITY_COUNT].Hide();
             mOptions[RSK_SHOPSANITY_PRICES].Hide();
             mOptions[RSK_SHOPSANITY_PRICES_AFFORDABLE].Hide();
             break;
+        case RO_SHOPSANITY_SPECIFIC_COUNT:
+            mOptions[RSK_SHOPSANITY].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
+            mOptions[RSK_SHOPSANITY_COUNT].Unhide();
+            mOptions[RSK_SHOPSANITY_PRICES].Unhide();
+            mOptions[RSK_SHOPSANITY_PRICES_AFFORDABLE].Unhide();
+            break;
         default:
             mOptions[RSK_SHOPSANITY].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
+            mOptions[RSK_SHOPSANITY_COUNT].Hide();
             mOptions[RSK_SHOPSANITY_PRICES].Unhide();
             mOptions[RSK_SHOPSANITY_PRICES_AFFORDABLE].Unhide();
             break;
@@ -2300,6 +2312,7 @@ void Settings::ParseJson(nlohmann::json spoilerFileJson) {
                 case RSK_CUCCO_COUNT:
                 case RSK_FISHSANITY_POND_COUNT:
                 case RSK_STARTING_SKULLTULA_TOKEN:
+                case RSK_SHOPSANITY_COUNT:
                     numericValueString = it.value();
                     mOptions[index].SetSelectedIndex(std::stoi(numericValueString));
                     break;
@@ -2323,16 +2336,8 @@ void Settings::ParseJson(nlohmann::json spoilerFileJson) {
                 case RSK_SHOPSANITY:
                     if (it.value() == "Off") {
                         mOptions[index].SetSelectedIndex(RO_SHOPSANITY_OFF);
-                    } else if (it.value() == "0 Items") {
-                        mOptions[index].SetSelectedIndex(RO_SHOPSANITY_ZERO_ITEMS);
-                    } else if (it.value() == "1 Item") {
-                        mOptions[index].SetSelectedIndex(RO_SHOPSANITY_ONE_ITEM);
-                    } else if (it.value() == "2 Items") {
-                        mOptions[index].SetSelectedIndex(RO_SHOPSANITY_TWO_ITEMS);
-                    } else if (it.value() == "3 Items") {
-                        mOptions[index].SetSelectedIndex(RO_SHOPSANITY_THREE_ITEMS);
-                    } else if (it.value() == "4 Items") {
-                        mOptions[index].SetSelectedIndex(RO_SHOPSANITY_FOUR_ITEMS);
+                    } else if (it.value() == "Specific Count") {
+                        mOptions[index].SetSelectedIndex(RO_SHOPSANITY_SPECIFIC_COUNT);
                     } else if (it.value() == "Random") {
                         mOptions[index].SetSelectedIndex(RO_SHOPSANITY_RANDOM);
                     }
diff --git a/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
index 0e09af177..3be24eb91 100644
--- a/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
+++ b/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
@@ -432,7 +432,7 @@ void EnOssan_SpawnItemsOnShelves(EnOssan* this, PlayState* play, ShopItem* shopI
         } else {
             itemParams = sShopItemReplaceFunc[shopItems->shopItemIndex](shopItems->shopItemIndex);
             if (IS_RANDO && Randomizer_GetSettingValue(RSK_SHOPSANITY) != RO_SHOPSANITY_OFF) {
-                ShopItemIdentity shopItemIdentity = Randomizer_IdentifyShopItem(play->sceneNum, i);
+                ShopItemIdentity shopItemIdentity = Randomizer_IdentifyShopItem(play->sceneNum, i + 1);
                 if (shopItemIdentity.randomizerCheck != RC_UNKNOWN_CHECK) {
                     itemParams = shopItemIdentity.enGirlAShopItem;
 
@@ -452,7 +452,7 @@ void EnOssan_SpawnItemsOnShelves(EnOssan* this, PlayState* play, ShopItem* shopI
                     shelves->actor.shape.rot.x, shelves->actor.shape.rot.y + sItemShelfRot[i],
                     shelves->actor.shape.rot.z, itemParams, true);
                 if (IS_RANDO && Randomizer_GetSettingValue(RSK_SHOPSANITY) != RO_SHOPSANITY_OFF) {
-                    this->shelfSlots[i]->randoSlotIndex = i;
+                    this->shelfSlots[i]->randoSlotIndex = i + 1;
                 }
             }
         }
@@ -1391,7 +1391,7 @@ void EnOssan_GiveItemWithFanfare(PlayState* play, EnOssan* this) {
     if (!IS_RANDO) {
         Actor_OfferGetItem(&this->actor, play, this->shelfSlots[this->cursorIndex]->getItemId, 120.0f, 120.0f);
     } else {
-        ShopItemIdentity shopItemIdentity = Randomizer_IdentifyShopItem(play->sceneNum, this->cursorIndex);
+        ShopItemIdentity shopItemIdentity = Randomizer_IdentifyShopItem(play->sceneNum, this->cursorIndex + 1);
         // en_ossan/en_girla are also used for the happy mask shop, which never has randomized items
         // and returns RC_UNKNOWN_CHECK, in which case we should fall back to vanilla logic
         if (shopItemIdentity.randomizerCheck != RC_UNKNOWN_CHECK) {
@@ -1738,7 +1738,7 @@ void EnOssan_State_GiveItemWithFanfare(EnOssan* this, PlayState* play, Player* p
     if (!IS_RANDO) {
         Actor_OfferGetItem(&this->actor, play, this->shelfSlots[this->cursorIndex]->getItemId, 120.0f, 120.0f);
     } else {
-        ShopItemIdentity shopItemIdentity = Randomizer_IdentifyShopItem(play->sceneNum, this->cursorIndex);
+        ShopItemIdentity shopItemIdentity = Randomizer_IdentifyShopItem(play->sceneNum, this->cursorIndex + 1);
         // en_ossan/en_girla are also used for the happy mask shop, which never has randomized items
         // and returns RC_UNKNOWN_CHECK, in which case we should fall back to vanilla logic
         if (shopItemIdentity.randomizerCheck != RC_UNKNOWN_CHECK) {
@@ -1754,7 +1754,7 @@ void EnOssan_State_GiveItemWithFanfare(EnOssan* this, PlayState* play, Player* p
 void EnOssan_State_ItemPurchased(EnOssan* this, PlayState* play, Player* player) {
     EnGirlA* item;
     EnGirlA* itemTemp;
-    ShopItemIdentity shopItemIdentity = Randomizer_IdentifyShopItem(play->sceneNum, this->cursorIndex);
+    ShopItemIdentity shopItemIdentity = Randomizer_IdentifyShopItem(play->sceneNum, this->cursorIndex + 1);
     GetItemEntry getItemEntry;
     if (shopItemIdentity.randomizerCheck != RC_UNKNOWN_CHECK) {
         getItemEntry = Randomizer_GetItemFromKnownCheck(shopItemIdentity.randomizerCheck, shopItemIdentity.ogItemId);

From 33c74a10b7e31e5e54073f2a81971e31b497f2ef Mon Sep 17 00:00:00 2001
From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Date: Thu, 3 Oct 2024 01:27:43 +0100
Subject: [PATCH 218/230] Fix items being placed on hint locations (#4379)

---
 .../Enhancements/randomizer/3drando/fill.cpp   |  2 +-
 .../Enhancements/randomizer/location_list.cpp  | 18 +++++++++++++++++-
 soh/soh/Enhancements/randomizer/static_data.h  |  1 +
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/fill.cpp b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
index 08861f7b4..1a7e2cad8 100644
--- a/soh/soh/Enhancements/randomizer/3drando/fill.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
@@ -1023,7 +1023,7 @@ static void RandomizeDungeonItems() {
   auto ctx = Rando::Context::GetInstance();
 
   //Get Any Dungeon and Overworld group locations
-  std::vector<RandomizerCheck> anyDungeonLocations = FilterFromPool(ctx->allLocations, [](const auto loc){return Rando::StaticData::GetLocation(loc)->IsDungeon();});
+  std::vector<RandomizerCheck> anyDungeonLocations = Rando::StaticData::GetDungeonLocations();
   //Rando::StaticData::GetOverworldLocations() defined in item_location.cpp
 
   //Create Any Dungeon and Overworld item pools
diff --git a/soh/soh/Enhancements/randomizer/location_list.cpp b/soh/soh/Enhancements/randomizer/location_list.cpp
index 55fac81d4..9b2b3b0a7 100644
--- a/soh/soh/Enhancements/randomizer/location_list.cpp
+++ b/soh/soh/Enhancements/randomizer/location_list.cpp
@@ -82,7 +82,23 @@ std::vector<RandomizerCheck> Rando::StaticData::GetOverworldLocations() {
             location.GetRandomizerCheck() != RC_UNKNOWN_CHECK &&
             location.GetRandomizerCheck() != RC_TRIFORCE_COMPLETED && //not really an overworld check
             location.GetRCType() != RCTYPE_FISH && //temp fix while locations are properly sorted out
-            location.GetRCType() != RCTYPE_CHEST_GAME //this is supposed to be excluded
+            location.GetRCType() != RCTYPE_CHEST_GAME && //this is supposed to be excluded
+            location.GetRCType() != RCTYPE_STATIC_HINT && 
+            location.GetRCType() != RCTYPE_GOSSIP_STONE  //don't put items on hints
+        ) {
+            overworldLocations.push_back(location.GetRandomizerCheck());
+        }
+    }
+    return overworldLocations;
+}
+
+std::vector<RandomizerCheck> Rando::StaticData::GetDungeonLocations() {
+    std::vector<RandomizerCheck> overworldLocations = {};
+    for (Location& location : locationTable) {
+        if (
+            location.IsDungeon() &&
+            location.GetRCType() != RCTYPE_STATIC_HINT && 
+            location.GetRCType() != RCTYPE_GOSSIP_STONE  //don't put items on hints
         ) {
             overworldLocations.push_back(location.GetRandomizerCheck());
         }
diff --git a/soh/soh/Enhancements/randomizer/static_data.h b/soh/soh/Enhancements/randomizer/static_data.h
index 1a76fd276..c2831324b 100644
--- a/soh/soh/Enhancements/randomizer/static_data.h
+++ b/soh/soh/Enhancements/randomizer/static_data.h
@@ -36,6 +36,7 @@ class StaticData {
       static std::unordered_map<std::string, uint32_t> PopulateTranslationMap(std::unordered_map<uint32_t, RandomizerHintTextKey> input);
       static std::multimap<std::tuple<s16, s16, s32>, RandomizerCheck> CheckFromActorMultimap;
       static std::vector<RandomizerCheck> GetOverworldLocations();
+      static std::vector<RandomizerCheck> GetDungeonLocations();
       static std::vector<RandomizerCheck> dungeonRewardLocations;
       static std::vector<RandomizerCheck> GetShopLocations();
       static std::vector<RandomizerCheck> GetScrubLocations();

From c4d211bc3ae019c2f813b1dc61fe0b433c2fe976 Mon Sep 17 00:00:00 2001
From: Malkierian <malkierian@gmail.com>
Date: Sat, 5 Oct 2024 09:58:41 -0700
Subject: [PATCH 219/230] [V3] Fishsanity Cleanup (#4380)

* Fix crash in fishsanity's flag set handler.
Code format cleanup.
Fix typedef warnings in fishsanity.h.

* Actually fix the crash now.

* Relocate RCTYPE check for broader application.
---
 .../Enhancements/randomizer/fishsanity.cpp    | 54 +++++++++++--------
 soh/soh/Enhancements/randomizer/fishsanity.h  | 10 ++--
 2 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/fishsanity.cpp b/soh/soh/Enhancements/randomizer/fishsanity.cpp
index 793553220..b69cec82b 100644
--- a/soh/soh/Enhancements/randomizer/fishsanity.cpp
+++ b/soh/soh/Enhancements/randomizer/fishsanity.cpp
@@ -75,19 +75,22 @@ namespace Rando {
                                              FishsanityOptionsSource optionsSource) {
         auto [mode, numFish, ageSplit] = GetOptions(optionsSource);
 
-        if (loc->GetRCType() != RCTYPE_FISH || mode == RO_FISHSANITY_OFF)
+        if (loc->GetRCType() != RCTYPE_FISH || mode == RO_FISHSANITY_OFF) {
             return false;
+        }
         RandomizerCheck rc = loc->GetRandomizerCheck();
         // Are pond fish enabled, and is this a pond fish location?
         if (mode != RO_FISHSANITY_OVERWORLD && numFish > 0 && loc->GetScene() == SCENE_FISHING_POND &&
             loc->GetActorID() == ACTOR_FISHING) {
             // Is this a child fish location? If so, is it within the defined number of pond fish checks?
-            if (rc >= RC_LH_CHILD_FISH_1 && rc <= RC_LH_CHILD_LOACH_2 && numFish > (loc->GetActorParams() - 100))
+            if (rc >= RC_LH_CHILD_FISH_1 && rc <= RC_LH_CHILD_LOACH_2 && numFish > (loc->GetActorParams() - 100)) {
                 return true;
+            }
             // Are adult fish available, and is this an adult fish location? If so, is it within the defined number of pond
             // fish checks?
-            if (ageSplit && rc >= RC_LH_ADULT_FISH_1 && rc <= RC_LH_ADULT_LOACH && numFish > (loc->GetActorParams() - 100))
+            if (ageSplit && rc >= RC_LH_ADULT_FISH_1 && rc <= RC_LH_ADULT_LOACH && numFish > (loc->GetActorParams() - 100)) {
                 return true;
+            }
         }
         // Are overworld fish enabled, and is this an overworld fish location?
         if (mode != RO_FISHSANITY_POND && (loc->GetScene() == SCENE_GROTTOS || loc->GetScene() == SCENE_ZORAS_DOMAIN)
@@ -238,7 +241,7 @@ namespace Rando {
     bool Fishsanity::GetPondFishShuffled() {
         u8 fsMode = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_FISHSANITY);
         return OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_FISHSANITY_POND_COUNT) > 0 &&
-           (fsMode == RO_FISHSANITY_POND || fsMode == RO_FISHSANITY_BOTH);
+            (fsMode == RO_FISHSANITY_POND || fsMode == RO_FISHSANITY_BOTH);
     }
 
     bool Fishsanity::GetOverworldFishShuffled() {
@@ -253,8 +256,9 @@ namespace Rando {
     bool Fishsanity::GetPondCleared() {
         auto [mode, pondCount, ageSplit] = GetOptions();
         // no fish shuffled, so pond is always cleared :thumbsup:
-        if (pondCount == 0)
+        if (pondCount == 0) {
             return true;
+        }
 
         bool adultPond = LINK_IS_ADULT && ageSplit;
         // if we've collected the final shuffled fish, pond is complete
@@ -268,23 +272,26 @@ namespace Rando {
         for (auto tableEntry : Rando::StaticData::randomizerFishingPondFish) {
             RandomizerCheck rc = adultPond ? tableEntry.second : tableEntry.first;
             // if we haven't collected this fish, then we're not done yet! get back in there, soldier
-            if (rc != RC_UNKNOWN_CHECK && !Flags_GetRandomizerInf(OTRGlobals::Instance->gRandomizer->GetRandomizerInfFromCheck(rc)))
+            if (rc != RC_UNKNOWN_CHECK && !Flags_GetRandomizerInf(OTRGlobals::Instance->gRandomizer->GetRandomizerInfFromCheck(rc))) {
                 return false;
+            }
         }
         return true;
     }
 
     bool Fishsanity::GetDomainCleared() {
         for (RandomizerInf i = RAND_INF_ZD_FISH_1; i <= RAND_INF_ZD_FISH_5; i = (RandomizerInf)(i + 1)) {
-            if (!Flags_GetRandomizerInf(i))
+            if (!Flags_GetRandomizerInf(i)) {
                 return false;
+            }
         }
         return true;
     }
 
     void Fishsanity::InitializeHelpers() {
-        if (fishsanityHelpersInit)
+        if (fishsanityHelpersInit) {
             return;
+        }
 
         for (auto pair : Rando::StaticData::randomizerFishingPondFish) {
             pondFishAgeMap[pair.first] = LINK_AGE_CHILD;
@@ -314,25 +321,28 @@ namespace Rando {
     }
 
     FishsanityCheckType Fishsanity::GetCheckType(RandomizerCheck rc) {
-        // Is this a pond fish?
-        if (std::binary_search(Rando::StaticData::GetPondFishLocations().begin(), Rando::StaticData::GetPondFishLocations().end(), rc))
-            return FSC_POND;
-
-        // Is this an overworld fish?
-        if (std::binary_search(Rando::StaticData::GetOverworldFishLocations().begin(), Rando::StaticData::GetOverworldFishLocations().end(), rc)) {
-            if (rc < RC_ZD_FISH_1)
-                return FSC_GROTTO;
-            else
-                return FSC_ZD;
+        // if it's not RCTYPE_FISH, obviously it's not a fish
+        if (Rando::StaticData::GetLocation(rc)->GetRCType() != RCTYPE_FISH) {
+            return FSC_NONE;
+        }
+
+        auto loc = Rando::StaticData::GetLocation(rc);
+        switch (loc->GetScene()) {
+        case SCENE_FISHING_POND:
+            return FSC_POND;
+        case SCENE_ZORAS_DOMAIN:
+            return FSC_ZD;
+        case SCENE_GROTTOS:
+            return FSC_GROTTO;
+        default:
+            return FSC_NONE;
         }
-        
-        // Must not be a fishsanity check
-        return FSC_NONE;
     }
 
     bool Fishsanity::IsFish(FishIdentity* fish) {
-        if (fish->randomizerCheck == RC_UNKNOWN_CHECK || fish->randomizerInf == RAND_INF_MAX)
+        if (fish->randomizerCheck == RC_UNKNOWN_CHECK || fish->randomizerInf == RAND_INF_MAX) {
             return false;
+        }
 
         return GetCheckType(fish->randomizerCheck) != FSC_NONE;
     }
diff --git a/soh/soh/Enhancements/randomizer/fishsanity.h b/soh/soh/Enhancements/randomizer/fishsanity.h
index 8d6108725..a8a8291f0 100644
--- a/soh/soh/Enhancements/randomizer/fishsanity.h
+++ b/soh/soh/Enhancements/randomizer/fishsanity.h
@@ -6,23 +6,23 @@
 #include "randomizerTypes.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
-typedef struct FishsanityPondOptions {
+typedef struct {
     u8 mode;
     u8 numFish;
     bool ageSplit;
 } FishsanityPondOptions;
 
-typedef enum FishsanityOptionsSource {
+typedef enum {
     FSO_SOURCE_RANDO,
     FSO_SOURCE_CVARS
-};
+} FishsanityOptionsSource;
 
-typedef enum FishsanityCheckType {
+typedef enum {
     FSC_NONE,
     FSC_POND,
     FSC_GROTTO,
     FSC_ZD,
-};
+} FishsanityCheckType;
 
 #ifdef __cplusplus
 namespace Rando {

From 0a3eeb8339243aa8f173e679d513c97949df45e7 Mon Sep 17 00:00:00 2001
From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Date: Sat, 5 Oct 2024 21:29:38 +0100
Subject: [PATCH 220/230] Rewrite DC MQ Logic (#4355)

* Doodongs Cavern

* rewrite MQ DC Logic

* forgot some cleanup

* remove an unused region

* post-merge cleanups

* change CanUse for HasITem on gorons braclet

* git ate half the rewrite

* more small error fixes

---------

Co-authored-by: aMannus <mannusmenting@gmail.com>
---
 .../randomizer/3drando/location_access.cpp    |   4 +-
 .../randomizer/3drando/location_access.hpp    |   4 +-
 .../location_access/locacc_castle_town.cpp    |   6 +-
 .../location_access/locacc_death_mountain.cpp |   4 +-
 .../locacc_dodongos_cavern.cpp                | 231 +++++++++++++++---
 .../location_access/locacc_gerudo_valley.cpp  |   2 +-
 .../location_access/locacc_hyrule_field.cpp   |   2 +-
 .../location_access/locacc_kakariko.cpp       |   2 +-
 .../location_access/locacc_lost_woods.cpp     |  10 +-
 .../location_access/locacc_zoras_domain.cpp   |   6 +-
 soh/soh/Enhancements/randomizer/logic.cpp     | 113 +++++++--
 soh/soh/Enhancements/randomizer/logic.h       |  14 +-
 .../Enhancements/randomizer/randomizerTypes.h |  39 ++-
 13 files changed, 361 insertions(+), 76 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
index a22383386..e15245d13 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
@@ -215,7 +215,7 @@ void Region::ResetVariables() {
 std::array<Region, RR_MAX> areaTable;
 
 bool Here(const RandomizerRegion region, ConditionFn condition) {
-  return areaTable[region].HereCheck(condition);
+  return areaTable[region].Here(condition);
 }
 
 bool CanPlantBean(const RandomizerRegion region) {
@@ -246,7 +246,7 @@ void RegionTable_Init() {
   ctx = Context::GetInstance().get();
   logic = ctx->GetLogic(); //RANDOTODO do not hardcode, instead allow accepting a Logic class somehow
   grottoEvents = {
-      EventAccess(&logic->GossipStoneFairy, { [] { return logic->GossipStoneFairy || logic->CallGossipFairy(); } }),
+      EventAccess(&logic->GossipStoneFairy, { [] { return logic->CallGossipFairy(); } }),
       EventAccess(&logic->ButterflyFairy, { [] { return logic->ButterflyFairy || (logic->CanUse(RG_STICKS)); } }),
       EventAccess(&logic->BugShrub, { [] { return logic->CanCutShrubs(); } }),
       EventAccess(&logic->LoneFish, { [] { return true; } }),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access.hpp b/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
index 3a257ca0f..2b18ab029 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
@@ -210,7 +210,7 @@ public:
     //access to this area. For example: if there are rocks that block a path
     //which both child and adult can access, adult having hammer can give
     //both child and adult access to the path.
-    bool HereCheck(ConditionFn condition) {
+    bool Here(ConditionFn condition) {
 
       //store current age variables
       bool pastAdult = logic->IsAdult;
@@ -246,7 +246,7 @@ public:
 extern std::array<Region, RR_MAX> areaTable;
 extern std::vector<EventAccess> grottoEvents;
 
-bool Here(const RandomizerRegion region, ConditionFn condition);
+bool Here(const RandomizerRegion region, ConditionFn condition); //RANDOTODO make a less stupid way to check own at either age than self referncing with this
 bool CanPlantBean(const RandomizerRegion region);
 bool BothAges(const RandomizerRegion region);
 bool ChildCanAccess(const RandomizerRegion region);
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
index 868e231ae..74059abc8 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
@@ -35,7 +35,7 @@ void RegionTable_Init_CastleTown() {
 
   areaTable[RR_TOT_ENTRANCE] = Region("ToT Entrance", "ToT Entrance", RA_THE_MARKET, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CallGossipFairyExceptSuns();}}),
+                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->CallGossipFairyExceptSuns();}}),
                 }, {
                   //Locations
                   LOCATION(RC_TOT_LEFTMOST_GOSSIP_STONE,     true),
@@ -82,7 +82,7 @@ void RegionTable_Init_CastleTown() {
 
   areaTable[RR_HYRULE_CASTLE_GROUNDS] = Region("Hyrule Castle Grounds", "Castle Grounds", RA_HYRULE_CASTLE, DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CallGossipFairy();}}),
+                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->CallGossipFairy();}}),
                   EventAccess(&logic->ButterflyFairy,   {[]{return logic->ButterflyFairy   || logic->CanUse(RG_STICKS);}}),
                   EventAccess(&logic->BugRock,          {[]{return true;}}),
                 }, {
@@ -121,7 +121,7 @@ void RegionTable_Init_CastleTown() {
   areaTable[RR_HC_STORMS_GROTTO] = Region("HC Storms Grotto", "HC Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->NutPot,           {[]{return logic->NutPot           || logic->BlastOrSmash();}}),
-                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || (logic->BlastOrSmash() && logic->CallGossipFairy());}}),
+                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->CanBreakMudWalls() && logic->CallGossipFairy();}}),
                   EventAccess(&logic->WanderingBugs,    {[]{return logic->WanderingBugs    || logic->BlastOrSmash();}}),
                 }, {
                   //Locations
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
index 630017585..b61687d3d 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
@@ -26,7 +26,7 @@ void RegionTable_Init_DeathMountain() {
   areaTable[RR_DEATH_MOUNTAIN_SUMMIT] = Region("Death Mountain Summit", "Death Mountain", RA_DEATH_MOUNTAIN_TRAIL, DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->PrescriptionAccess, {[]{return logic->PrescriptionAccess || (logic->IsAdult && (logic->BrokenSwordAccess || logic->CanUse(RG_BROKEN_SWORD)));}}),
-                  EventAccess(&logic->GossipStoneFairy,   {[]{return logic->GossipStoneFairy   || logic->CallGossipFairy();}}),
+                  EventAccess(&logic->GossipStoneFairy,   {[]{return logic->CallGossipFairy();}}),
                   EventAccess(&logic->BugRock,            {[]{return logic->BugRock            || logic->IsChild;}}),
                 }, {
                   //Locations
@@ -81,7 +81,7 @@ void RegionTable_Init_DeathMountain() {
 
   areaTable[RR_GORON_CITY] = Region("Goron City", "Goron City", RA_GORON_CITY, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->GossipStoneFairy,          {[]{return logic->GossipStoneFairy          || logic->CallGossipFairyExceptSuns();}}),
+                  EventAccess(&logic->GossipStoneFairy,          {[]{return logic->CallGossipFairyExceptSuns();}}),
                   EventAccess(&logic->StickPot,                  {[]{return logic->StickPot                  || logic->IsChild;}}),
                   EventAccess(&logic->BugRock,                   {[]{return logic->BugRock                   || (logic->BlastOrSmash() || logic->CanUse(RG_SILVER_GAUNTLETS));}}),
                   EventAccess(&logic->GoronCityChildFire,        {[]{return logic->GoronCityChildFire        || (logic->IsChild && logic->CanUse(RG_DINS_FIRE));}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp
index 5274ea2e3..3826dc7a0 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp
@@ -22,17 +22,17 @@ void RegionTable_Init_DodongosCavern() {
   areaTable[RR_DODONGOS_CAVERN_BEGINNING] = Region("Dodongos Cavern Beginning", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_ENTRYWAY, {[]{return true;}}),
-                  Entrance(RR_DODONGOS_CAVERN_LOBBY,    {[]{return Here(RR_DODONGOS_CAVERN_BEGINNING, []{return logic->BlastOrSmash() || logic->HasItem(RG_GORONS_BRACELET);});}}),
+                  Entrance(RR_DODONGOS_CAVERN_LOBBY,    {[]{return Here(RR_DODONGOS_CAVERN_BEGINNING, []{return logic->CanBreakMudWalls() || logic->HasItem(RG_GORONS_BRACELET);});}}),
   });
 
   areaTable[RR_DODONGOS_CAVERN_LOBBY] = Region("Dodongos Cavern Lobby", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || (logic->CallGossipFairy() && Here(RR_DODONGOS_CAVERN_LOBBY, []{return logic->BlastOrSmash() || logic->HasItem(RG_GORONS_BRACELET);}));}}),
+                  EventAccess(&logic->GossipStoneFairy, {[]{return (Here(RR_DODONGOS_CAVERN_LOBBY, []{return logic->CanBreakMudWalls();}) || logic->HasItem(RG_GORONS_BRACELET)) && logic->CallGossipFairy();}}),
                 }, {
                   //Locations
-                  LOCATION(RC_DODONGOS_CAVERN_MAP_CHEST,        Here(RR_DODONGOS_CAVERN_LOBBY, []{return logic->BlastOrSmash() || logic->HasItem(RG_GORONS_BRACELET);})),
+                  LOCATION(RC_DODONGOS_CAVERN_MAP_CHEST,        Here(RR_DODONGOS_CAVERN_LOBBY, []{return logic->CanBreakMudWalls() || logic->HasItem(RG_GORONS_BRACELET);})),
                   LOCATION(RC_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY, logic->CanStunDeku() || logic->HasItem(RG_GORONS_BRACELET)),
-                  LOCATION(RC_DODONGOS_CAVERN_GOSSIP_STONE,     Here(RR_DODONGOS_CAVERN_LOBBY, []{return logic->BlastOrSmash() || logic->HasItem(RG_GORONS_BRACELET);})),
+                  LOCATION(RC_DODONGOS_CAVERN_GOSSIP_STONE,     Here(RR_DODONGOS_CAVERN_LOBBY, []{return logic->CanBreakMudWalls() || logic->HasItem(RG_GORONS_BRACELET);})),
                 }, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_BEGINNING,    {[]{return true;}}),
@@ -219,60 +219,219 @@ void RegionTable_Init_DodongosCavern() {
 
   areaTable[RR_DODONGOS_CAVERN_MQ_LOBBY] = Region("Dodongos Cavern MQ Lobby", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->DekuBabaSticks,   {[]{return logic->DekuBabaSticks || (logic->IsAdult || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
-                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CallGossipFairy();}}),
+                  EventAccess(&logic->GossipStoneFairy, {[]{return (Here(RR_DODONGOS_CAVERN_MQ_LOBBY, []{return logic->CanBreakMudWalls();}) || logic->CanUse(RG_GORONS_BRACELET)) && logic->CallGossipFairy();}}),
   }, {
                   //Locations
-                  LOCATION(RC_DODONGOS_CAVERN_MQ_MAP_CHEST,                  true),
-                  LOCATION(RC_DODONGOS_CAVERN_MQ_COMPASS_CHEST,              logic->CanAttack() || logic->CanUse(RG_NUTS)),
-                  LOCATION(RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST,          (logic->IsChild && logic->CanUse(RG_STICKS)) || logic->HasFireSource()),
-                  LOCATION(RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST,    logic->BlastOrSmash() || (logic->IsChild && logic->CanUse(RG_STICKS)) || logic->CanUse(RG_DINS_FIRE) || (logic->IsAdult && (ctx->GetTrickOption(RT_DC_JUMP) || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT)))),
-                  LOCATION(RC_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM, logic->CanUse(RG_SONG_OF_TIME) && logic->CanAttack()),
-                  LOCATION(RC_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM,             (logic->IsChild && logic->CanUse(RG_STICKS)) || logic->HasFireSource()),
-                  LOCATION(RC_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM,           logic->BlastOrSmash()),
-                  LOCATION(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,      logic->CanStunDeku()),
-                  LOCATION(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT,     logic->CanStunDeku()),
-                  LOCATION(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,       logic->CanStunDeku()),
-                  LOCATION(RC_DODONGOS_CAVERN_GOSSIP_STONE,                  true),
+                  LOCATION(RC_DODONGOS_CAVERN_MQ_MAP_CHEST,                 logic->CanBreakMudWalls() || logic->CanUse(RG_GORONS_BRACELET)),
+                  LOCATION(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,     logic->CanStunDeku()),
+                  LOCATION(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT,    logic->CanStunDeku()),
+                  LOCATION(RC_DODONGOS_CAVERN_GOSSIP_STONE,                 Here(RR_DODONGOS_CAVERN_MQ_LOBBY, []{return logic->CanBreakMudWalls() || logic->CanUse(RG_GORONS_BRACELET);})),
   }, {
                   //Exits
-                  Entrance(RR_DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE,  {[]{return Here(RR_DODONGOS_CAVERN_MQ_LOBBY, []{return logic->BlastOrSmash() || (((logic->IsChild && logic->CanUse(RG_STICKS)) || logic->CanUse(RG_DINS_FIRE)) && logic->TakeDamage());});}}),
-                  Entrance(RR_DODONGOS_CAVERN_MQ_BOMB_BAG_AREA,     {[]{return logic->IsAdult || (Here(RR_DODONGOS_CAVERN_MQ_LOBBY, []{return logic->IsAdult;}) && logic->HasExplosives()) || (ctx->GetTrickOption(RT_DC_MQ_CHILD_BOMBS) && logic->CanJumpslash() && logic->TakeDamage());}}),
-                    //Trick: logic->IsAdult || logic->HasExplosives() || (LogicDCMQChildBombs && (logic->CanUse(RG_KOKIRI_SWORD) || logic->Sticks) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO))
-                  Entrance(RR_DODONGOS_CAVERN_MQ_BOSS_AREA,         {[]{return logic->HasExplosives() || (logic->HasItem(RG_GORONS_BRACELET) && ((logic->IsAdult && ctx->GetTrickOption(RT_DC_MQ_ADULT_EYES)) || (logic->IsChild && ctx->GetTrickOption(RT_DC_MQ_CHILD_EYES))) && ((logic->IsChild && (logic->CanUse(RG_STICKS))) || logic->CanUse(RG_DINS_FIRE) || (logic->IsAdult && (ctx->GetTrickOption(RT_DC_JUMP) || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT)))));}}), 
-                    //Trick: logic->HasExplosives() || (LogicDCMQEyes && logic->HasItem(RG_GORONS_BRACELET) && (logic->IsAdult || LogicDCMQChildBack) && ((logic->IsChild && logic->CanUse(RG_STICKS)) || logic->CanUse(RG_DINS_FIRE) || (logic->IsAdult && (LogicDCJump || logic->Hammer || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT)))))
+                  Entrance(RR_DODONGOS_CAVERN_MQ_MOUTH_SIDE_BRIDGE,     {[]{return Here(RR_DODONGOS_CAVERN_MQ_LOBBY, []{return logic->BlastOrSmash() || logic->CanUse(RG_GORONS_BRACELET);});}}),
+                  Entrance(RR_DODONGOS_CAVERN_MQ_STAIRS_LOWER,          {[]{return Here(RR_DODONGOS_CAVERN_MQ_LOBBY, []{return logic->BlastOrSmash() || logic->CanUse(RG_GORONS_BRACELET);});}}),
+                  Entrance(RR_DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE,      {[]{return Here(RR_DODONGOS_CAVERN_MQ_LOBBY, []{return logic->CanBreakMudWalls();}) ||
+                                                                                   Here(RR_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_UPPER, []{return logic->HasItem(RG_GORONS_BRACELET) && logic->TakeDamage();});}}), //strength 1 and bunny speed works too
+                  Entrance(RR_DODONGOS_CAVERN_MQ_POES_ROOM,             {[]{return logic->IsAdult;}}),
+                  Entrance(RR_DODONGOS_CAVERN_MQ_BEHIND_MOUTH,          {[]{return Here(RR_DODONGOS_CAVERN_MQ_MOUTH_SIDE_BRIDGE, []{return logic->HasExplosives() || (logic->ClearMQDCUpperLobbyRocks && logic->HasItem(RG_GORONS_BRACELET) &&
+                                                                                                                                                                    ((logic->IsAdult && ctx->GetTrickOption(RT_DC_MQ_ADULT_EYES)) ||
+                                                                                                                                                                    (logic->IsChild && ctx->GetTrickOption(RT_DC_MQ_CHILD_EYES))));});}}),
+  });
+
+  areaTable[RR_DODONGOS_CAVERN_MQ_MOUTH_SIDE_BRIDGE] = Region("Dodongos Cavern MQ Mouth Side Bridge", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
+                  //Events
+                  EventAccess(&logic->ClearMQDCUpperLobbyRocks, {[]{return logic->BlastOrSmash() || logic->CanUse(RG_DINS_FIRE);}}),
+  }, {}, {
+                  //Exits
+                  Entrance(RR_DODONGOS_CAVERN_MQ_LOBBY,                 {[]{return true;}}),
+                  Entrance(RR_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_UPPER,    {[]{return logic->ClearMQDCUpperLobbyRocks;}}),
+                  //Bunny hood jump + jumpslash can also make it directly from the raising platform
+                  Entrance(RR_DODONGOS_CAVERN_MQ_POES_ROOM,             {[]{return logic->CanUse(RG_HOVER_BOOTS) || (ctx->GetTrickOption(RT_DC_MQ_CHILD_BOMBS) && logic->CanJumpslash() && logic->TakeDamage());}}), //RANDOTODO is this possible with equip swapped hammer?
+                  //it is possible to use bunny hood speed, hovers and a jumpslash to go between here and the other bridge (included with TORCH_ROOM_LOWER), but this would be a trick
+  });
+
+  areaTable[RR_DODONGOS_CAVERN_MQ_STAIRS_LOWER] = Region("Dodongos Cavern MQ Stairs Lower", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
+                  //Events
+                  //EventAccess(&logic->CanClimbDCStairs, {[]{return logic->HasExplosives || logic->CanUse(RG_DINS_FIRE) || (ctx->GetTrickOption(RT_DC_STAIRCASE) && logic->CanUse(RG_FAIRY_BOW));}}),
+  }, {}, {
+                  //Exits
+                  //This is possible with sticks and shield, igniting a first flower by "touch" then very quickly crouch stabbing in a way that cuts the corner to light the 3rd bomb on the other side, but that's a trick
+                  Entrance(RR_DODONGOS_CAVERN_MQ_STAIRS_UPPER,         {[]{return Here(RR_DODONGOS_CAVERN_MQ_STAIRS_LOWER, []{return logic->HasExplosives() || logic->CanUse(RG_DINS_FIRE) ||
+                                                                                       (ctx->GetTrickOption(RT_DC_STAIRCASE) && logic->CanUse(RG_FAIRY_BOW));});}}),
+                  Entrance(RR_DODONGOS_CAVERN_MQ_STAIRS_PAST_MUD_WALL, {[]{return Here(RR_DODONGOS_CAVERN_MQ_STAIRS_LOWER, []{return logic->CanBreakMudWalls();});}}),
+  });
+
+  areaTable[RR_DODONGOS_CAVERN_MQ_STAIRS_PAST_MUD_WALL] = Region("Dodongos Cavern MQ Stairs Past Mud Wall", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
+                  //Events
+                  EventAccess(&logic->DekuBabaSticks, {[]{return logic->CanGetDekuBabaSticks();}}),
+                  //EventAccess(&logic->CanClimbDCStairs, {[]{return logic->CanUse(RG_GORONS_BRACELET) && (logic->CanUse(RG_STICKS));}}),
+  }, {
+                  //Locations
+                  LOCATION(RC_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM, logic->CanUse(RG_SONG_OF_TIME) && logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA)),
+  }, {
+                  //Exits
+                  Entrance(RR_DODONGOS_CAVERN_MQ_STAIRS_UPPER, {[]{return logic->CanUse(RG_GORONS_BRACELET) && (logic->CanUse(RG_STICKS));}}),
+                  Entrance(RR_DODONGOS_CAVERN_MQ_STAIRS_LOWER, {[]{return true;}}),
+  });
+
+  areaTable[RR_DODONGOS_CAVERN_MQ_STAIRS_UPPER] = Region("Dodongos Cavern MQ Stairs Upper", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+                  //Locations
+                  LOCATION(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,       logic->CanStunDeku()),
+  }, {
+                  //Exits
+                  Entrance(RR_DODONGOS_CAVERN_MQ_STAIRS_LOWER,               {[]{return true;}}),
+                  Entrance(RR_DODONGOS_CAVERN_MQ_STAIRS_PAST_BIG_SKULLTULAS, {[]{return logic->CanPassEnemy(RE_BIG_SKULLTULA) || logic->CanUse(RG_HOVER_BOOTS);}}),
+  });
+
+  areaTable[RR_DODONGOS_CAVERN_MQ_STAIRS_PAST_BIG_SKULLTULAS] = Region("Dodongos Cavern MQ Past Big Skulltulas", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+                  //Exits
+                  Entrance(RR_DODONGOS_CAVERN_MQ_STAIRS_UPPER, {[]{return logic->CanPassEnemy(RE_BIG_SKULLTULA) || logic->CanUse(RG_HOVER_BOOTS);}}),
+                  Entrance(RR_DODONGOS_CAVERN_MQ_STAIRS_LOWER, {[]{return logic->TakeDamage();}}),
+                  //If some case comes up where you can directly (void?)warp here without going through Dodongo room or climbing up from below, 
+                  //the commented out logic is to handle going down and reclimbing to get silver rupees. A new eventVar will need decalring to handle this.
+                  /*(logic->CanPassEnemy(RE_BIG_SKULLTULA) || CanUse(RG_HOVER_BOOTS)) && logic->CanClimbDCStairs;*/
+                  Entrance(RR_DODONGOS_CAVERN_MQ_DODONGO_ROOM, {[]{return true;}}),//if we add BONKO or other crate logic, logic for silver rupees goes here
+  });
+
+  areaTable[RR_DODONGOS_CAVERN_MQ_DODONGO_ROOM] = Region("Dodongos Cavern MQ Dodongo Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+                  //Locations
+                  LOCATION(RC_DODONGOS_CAVERN_MQ_COMPASS_CHEST, logic->CanKillEnemy(RE_DODONGO) || logic->HasItem(RG_GORONS_BRACELET)),
+  }, {
+                  //Exits
+                  Entrance(RR_DODONGOS_CAVERN_MQ_STAIRS_PAST_BIG_SKULLTULAS, {[]{return true;}}),
+                  Entrance(RR_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_LOWER,         {[]{return Here(RR_DODONGOS_CAVERN_MQ_DODONGO_ROOM, []{return logic->CanKillEnemy(RE_DODONGO) || logic->HasItem(RG_GORONS_BRACELET);});}}),
+  });
+
+  areaTable[RR_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_LOWER] = Region("Dodongos Cavern MQ Torch Puzzle Lower", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
+                  //Events
+                  EventAccess(&logic->ClearMQDCUpperLobbyRocks, {[]{return (((logic->IsAdult /*or bunny hood jump*/) && ctx->GetTrickOption(RT_DC_JUMP)) || logic->CanUse(RG_HOVER_BOOTS)) && logic->CanUse(RG_STICKS);}}),
+  }, {}, {
+                  //Exits
+                  Entrance(RR_DODONGOS_CAVERN_MQ_LOBBY,              {[]{return logic->TakeDamage();}}),
+                  Entrance(RR_DODONGOS_CAVERN_MQ_DODONGO_ROOM,       {[]{return true;}}),
+                  Entrance(RR_DODONGOS_CAVERN_MQ_LARVAE_ROOM,        {[]{return logic->HasFireSourceWithTorch();}}),//torch checks here need strength 0 with sticks when that is implemented
+                  Entrance(RR_DODONGOS_CAVERN_MQ_BIG_BLOCK_ROOM,     {[]{return Here(RR_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_LOWER, []{return logic->HasFireSourceWithTorch();});}}), //Includes an implied CanPass(RE_BIG_SKULLTULA)
+                  Entrance(RR_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_UPPER, {[]{return ((logic->IsAdult /*or bunny hood jump*/) && ctx->GetTrickOption(RT_DC_JUMP)) || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT);}}),
+                  Entrance(RR_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS,     {[]{return logic->CanUse(RG_STICKS) && logic->HasItem(RG_GORONS_BRACELET);}}), //Implies access to RR_DODONGOS_CAVERN_MQ_BIG_BLOCK_ROOM from here
+ });
+
+  areaTable[RR_DODONGOS_CAVERN_MQ_BIG_BLOCK_ROOM] = Region("Dodongos Cavern MQ Torch Puzzle Lower", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+                  //Exits
+                  Entrance(RR_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_LOWER, {[]{return logic->CanPassEnemy(RE_BIG_SKULLTULA);}}),
+                  Entrance(RR_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS,     {[]{return (logic->HasFireSource() && logic->HasItem(RG_GORONS_BRACELET)) || logic->CanBreakMudWalls();}}), //Requires stregnth 0, If you can somehow warp into this room, add logic->CanPassEnemy(RE_BIG_SKULLTULA)
+  });
+
+  areaTable[RR_DODONGOS_CAVERN_MQ_LARVAE_ROOM] = Region("Dodongos Cavern MQ Larvae Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+                  //Locations
+                  LOCATION(RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST, true), //implied logic->CanKillEnemy(RE_GOHMA_LARVA) based on entry reqs with a trick to kill with nuts
+                  LOCATION(RC_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM,    true), //implied logic->CanKillEnemy(RE_GOLD_SKULTULLA) based on entry reqs. Add crate logic when BONKO is added
+  }, {
+                  //Exits
+                  Entrance(RR_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_LOWER, {[]{return true;}}), //implied logic->CanKillEnemy(RE_GOHMA_LARVA) based on entry reqs with a trick to kill with nuts
+  });
+
+  areaTable[RR_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS] = Region("Dodongos Cavern MQ Before Upper Lizalfos", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+                  //Locations
+                  LOCATION(RC_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM,   logic->BlastOrSmash()), //Implied CanGetEnemyDrop(RE_GOLD_SKULLTULA)
+  }, {
+                  //Exits
+                  //Falling down gets you stuck with nothing there, not a useful exit for logic
+                  Entrance(RR_DODONGOS_CAVERN_MQ_BIG_BLOCK_ROOM, {[]{return Here(RR_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS, []{return logic->CanKillEnemy(RE_LIZALFOS);});}}),
+                  Entrance(RR_DODONGOS_CAVERN_MQ_TWO_FIRES_ROOM, {[]{return Here(RR_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS, []{return logic->CanKillEnemy(RE_LIZALFOS);});}}),
+  });
+
+  areaTable[RR_DODONGOS_CAVERN_MQ_TWO_FIRES_ROOM] = Region("Dodongos Cavern MQ Before Upper Lizalfos", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+                  //Exits
+                  Entrance(RR_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS,     {[]{return true;}}),
+                  Entrance(RR_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_UPPER, {[]{return logic->IsAdult || (Here(RR_DODONGOS_CAVERN_MQ_TWO_FIRES_ROOM, []{return logic->BlastOrSmash() || (logic->CanAttack() && logic->HasItem(RG_GORONS_BRACELET));}));}}),
+  });
+
+  areaTable[RR_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_UPPER] = Region("Dodongos Cavern MQ Torch Puzzle Upper", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
+                  //Events
+                  EventAccess(&logic->ClearMQDCUpperLobbyRocks, {[]{return logic->CanDetonateUprightBombFlower() || logic->CanUse(RG_MEGATON_HAMMER);}}),
+  }, {
+                  //Locations
+                  LOCATION(RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST, true),
+  }, {
+                  //Exits
+                  Entrance(RR_DODONGOS_CAVERN_MQ_MOUTH_SIDE_BRIDGE,  {[]{return logic->ClearMQDCUpperLobbyRocks;}}),
+                  Entrance(RR_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_LOWER, {[]{return true;}}),
+                  Entrance(RR_DODONGOS_CAVERN_MQ_TWO_FIRES_ROOM,     {[]{return true;}}),
   });
 
   areaTable[RR_DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE] = Region("Dodongos Cavern MQ Lower Right Side", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS, logic->CanStunDeku()),
+                  LOCATION(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS, (logic->CanBreakMudWalls() || logic->HasItem(RG_GORONS_BRACELET)) && logic->CanStunDeku()),
   }, {
                   //Exits
-                  Entrance(RR_DODONGOS_CAVERN_MQ_BOMB_BAG_AREA, {[]{return (Here(RR_DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE, []{return logic->IsAdult && logic->CanUse(RG_FAIRY_BOW);}) || logic->HasItem(RG_GORONS_BRACELET) ||
-                                                                                logic->CanUse(RG_DINS_FIRE) || logic->HasExplosives()) &&
-                                                                                logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT);}}),
+                  Entrance(RR_DODONGOS_CAVERN_MQ_LOWER_LIZALFOS, {[]{return Here(RR_DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE, []{return logic->CanDetonateBombFlowers() || logic->HasItem(RG_GORONS_BRACELET);}) && logic->CanHitEyeTargets();}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_MQ_BOMB_BAG_AREA] = Region("Dodongos Cavern MQ Bomb Bag Region", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_MQ_LOWER_LIZALFOS] = Region("Dodongos Cavern MQ Lower Lizalfos", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
+                  //When you add wonder item logic for behind the lavafall, use Here(RR_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS) to account for jumping down instead of an exit
+                  //because the doors are sealed when entering from the top and you can't spawn the lower lizalfos
+  }, {}, {
+                  //Exits
+                  Entrance(RR_DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE, {[]{return Here(RR_DODONGOS_CAVERN_MQ_LOWER_LIZALFOS, []{return logic->CanKillEnemy(RE_LIZALFOS);});}}),
+                  Entrance(RR_DODONGOS_CAVERN_MQ_POES_ROOM,        {[]{return Here(RR_DODONGOS_CAVERN_MQ_LOWER_LIZALFOS, []{return logic->CanKillEnemy(RE_LIZALFOS);});}}),
+  });
+
+  areaTable[RR_DODONGOS_CAVERN_MQ_POES_ROOM] = Region("Dodongos Cavern MQ Poes Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST, true),
-                  LOCATION(RC_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM,  (Here(RR_DODONGOS_CAVERN_MQ_BOMB_BAG_AREA, []{return logic->IsAdult && logic->CanUse(RG_FAIRY_BOW);}) ||  logic->HasItem(RG_GORONS_BRACELET) || logic->CanUse(RG_DINS_FIRE) || logic->HasExplosives()) && logic->HookshotOrBoomerang()),
+                  LOCATION(RC_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST, true), //If you can get to the locked part of POES_ROOM without a way to open it or passing the chest, this will need it's own room 
+                  LOCATION(RC_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM,  (Here(RR_DODONGOS_CAVERN_MQ_POES_ROOM, []{return logic->CanDetonateBombFlowers() || logic->HasItem(RG_GORONS_BRACELET);}) && //could be a seperate room if it gets busy
+                                                                  logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA, ED_RANG_OR_HOOKSHOT, true))), //Implies you can avoid/kill the enemies with what you use on the skull, if this assumption is broken, add
+                                                                //&& (Here(RR_DODONGOS_CAVERN_MQ_POES_ROOM, []{return logic->CanKillEnemy(RE_FIRE_KEESE) && logic->CanKillEnemy(RE_MAD_SCRUB);}) || (logic->CanAvoidEnemy(RE_FIRE_KEESE) && logic->CanAvoidEnemy(RE_MAD_SCRUB)))
   }, {
                   //Exits
-                  Entrance(RR_DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE, {[]{return true;}}),
+                  Entrance(RR_DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE,  {[]{return Here(RR_DODONGOS_CAVERN_MQ_POES_ROOM, []{return logic->CanDetonateBombFlowers() || logic->HasItem(RG_GORONS_BRACELET);});}}),
+                  Entrance(RR_DODONGOS_CAVERN_MQ_LOWER_LIZALFOS,    {[]{return true;}}),
+                  Entrance(RR_DODONGOS_CAVERN_MQ_MAD_SCRUB_ROOM,    {[]{return Here(RR_DODONGOS_CAVERN_MQ_POES_ROOM, []{return logic->CanDetonateBombFlowers() || logic->HasItem(RG_GORONS_BRACELET);});}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_MQ_BOSS_AREA] = Region("Dodongos Cavern MQ BossArea", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DODONGOS_CAVERN_MQ_MAD_SCRUB_ROOM] = Region("Dodongos Cavern Mad Scrub Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+                  //Locations
+                  LOCATION(RC_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM,  (logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA, ED_RANG_OR_HOOKSHOT, true))), //Implies you can avoid/kill the enemies with what you use on the skull, if this assumption is broken, add
+                                                                //&& (Here(RR_DODONGOS_CAVERN_MQ_POES_ROOM, []{return logic->CanKillEnemy(RE_FIRE_KEESE) && logic->CanKillEnemy(RE_MAD_SCRUB);}) || (logic->CanAvoidEnemy(RE_FIRE_KEESE) && logic->CanAvoidEnemy(RE_MAD_SCRUB)))
+  }, {
+                  //Exits
+                  Entrance(RR_DODONGOS_CAVERN_MQ_POES_ROOM,  {[]{return Here(RR_DODONGOS_CAVERN_MQ_MAD_SCRUB_ROOM, []{return logic->CanKillEnemy(RE_FIRE_KEESE) && logic->CanKillEnemy(RE_MAD_SCRUB);});}}),
+  });
+
+  areaTable[RR_DODONGOS_CAVERN_MQ_BEHIND_MOUTH] = Region("Dodongos Cavern MQ Behind Mouth", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+                  //Exits
+                  Entrance(RR_DODONGOS_CAVERN_MQ_LOBBY,               {[]{return true;}}),
+                  //using pots to get past the fire is in default logic. if stregnth 0 gets added, this will need to be:
+                  //stregnth 0 || explosives, or projectiles if str0 isn't needed to pull graves (it's a narrow shot though, may be trick worthy)
+                  Entrance(RR_DODONGOS_CAVERN_MQ_BACK_BEHIND_FIRE,    {[]{return true;}}),
+                  Entrance(RR_DODONGOS_CAVERN_MQ_BACK_SWITCH_GRAVE,   {[]{return logic->IsAdult;}}),
+  });
+
+  areaTable[RR_DODONGOS_CAVERN_MQ_BACK_BEHIND_FIRE] = Region("Dodongos Cavern MQ Back Behind Fire", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+                  //Locations
+                  LOCATION(RC_DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST, true), //pulling the grave isn't required, as you can open the chest through it
+  }, {
+                  //Exits
+                  Entrance(RR_DODONGOS_CAVERN_MQ_BEHIND_MOUTH,  {[]{return logic->CanAttack();}}),
+                  //There's a trick N64 rolls into the child eyes trick for using armos blow up the bomb flowers when dieing, which would be killing an armos
+                  Entrance(RR_DODONGOS_CAVERN_MQ_BACK_SWITCH_GRAVE,   {[]{return Here(RR_DODONGOS_CAVERN_MQ_BACK_BEHIND_FIRE, []{return logic->CanDetonateBombFlowers();}) ||
+                                                                           Here(RR_DODONGOS_CAVERN_MQ_BACK_SWITCH_GRAVE, []{return logic->CanAttack();});}}), 
+  });
+
+  areaTable[RR_DODONGOS_CAVERN_MQ_BACK_SWITCH_GRAVE] = Region("Dodongos Cavern MQ BossArea", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->FairyPot,            {[]{return true;}}),
+                  EventAccess(&logic->FairyPot, {[]{return true;}}),
   }, {
                   //Locations
-                  LOCATION(RC_DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST, true),
-                  LOCATION(RC_DODONGOS_CAVERN_MQ_GS_BACK_AREA,      true),
+                  LOCATION(RC_DODONGOS_CAVERN_MQ_GS_BACK_AREA, logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA) || logic->HasItem(RG_GORONS_BRACELET) || //even if you somehow warp to BACK_BEHIND_FIRE, if you can kill the skull at range, you can get to BEHIND_MOUTH
+                                                               Here(RR_DODONGOS_CAVERN_MQ_BEHIND_MOUTH, []{return (logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA, ED_RANG_OR_HOOKSHOT)) ||
+                                                                                                                  (logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS) /* || bunny jumps*/);})),
   }, {
                   //Exits
-                  Entrance(RR_DODONGOS_CAVERN_BOSS_ENTRYWAY, {[]{return true;}}),
+                  Entrance(RR_DODONGOS_CAVERN_MQ_BACK_BEHIND_FIRE, {[]{return true;}}),
+                  Entrance(RR_DODONGOS_CAVERN_BOSS_ENTRYWAY,       {[]{return true;}}), //if strength 0 prevents grave pulls, add it here
   });
+
   }
 
     /*---------------------------
@@ -283,7 +442,7 @@ void RegionTable_Init_DodongosCavern() {
              {
                  // Exits
                  Entrance(RR_DODONGOS_CAVERN_BOSS_AREA, { [] { return ctx->GetDungeon(DODONGOS_CAVERN)->IsVanilla(); } }),
-                 Entrance(RR_DODONGOS_CAVERN_MQ_BOSS_AREA, { [] { return ctx->GetDungeon(DODONGOS_CAVERN)->IsMQ(); } }),
+                 Entrance(RR_DODONGOS_CAVERN_MQ_BEHIND_MOUTH, { [] { return ctx->GetDungeon(DODONGOS_CAVERN)->IsMQ(); } }),
                  Entrance(RR_DODONGOS_CAVERN_BOSS_ROOM, { [] { return true; } }),
              });
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
index 601ca03d0..ec9790ed1 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
@@ -21,7 +21,7 @@ void RegionTable_Init_GerudoValley() {
 
   areaTable[RR_GV_UPPER_STREAM] = Region("GV Upper Stream", "Gerudo Valley", RA_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CallGossipFairy();}}),
+                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->CallGossipFairy();}}),
                   EventAccess(&logic->BeanPlantFairy,   {[]{return logic->BeanPlantFairy   || (CanPlantBean(RR_GV_UPPER_STREAM) && logic->CanUse(RG_SONG_OF_STORMS));}}),
                 }, {
                   //Locations
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
index 772a7fad2..2e906c7aa 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
@@ -111,7 +111,7 @@ void RegionTable_Init_HyruleField() {
 
   areaTable[RR_LAKE_HYLIA] = Region("Lake Hylia", "Lake Hylia", RA_LAKE_HYLIA, DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CallGossipFairy();}}),
+                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->CallGossipFairy();}}),
                   EventAccess(&logic->BeanPlantFairy,   {[]{return logic->BeanPlantFairy   || (CanPlantBean(RR_LAKE_HYLIA) && logic->CanUse(RG_SONG_OF_STORMS));}}),
                   EventAccess(&logic->ButterflyFairy,   {[]{return logic->ButterflyFairy   || logic->CanUse(RG_STICKS);}}),
                   EventAccess(&logic->BugShrub,         {[]{return logic->BugShrub         || (logic->IsChild && logic->CanCutShrubs());}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
index bec90d866..9475547f7 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
@@ -278,7 +278,7 @@ void RegionTable_Init_Kakariko() {
 
   areaTable[RR_GRAVEYARD_WARP_PAD_REGION] = Region("Graveyard Warp Pad Region", "Graveyard", RA_THE_GRAVEYARD, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CallGossipFairyExceptSuns();}}),
+                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->CallGossipFairyExceptSuns();}}),
                 }, {
                   //Locations
                   LOCATION(RC_GRAVEYARD_GOSSIP_STONE, true),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
index 72aebe634..39316eea2 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
@@ -7,7 +7,7 @@ void RegionTable_Init_LostWoods() {
   areaTable[RR_KOKIRI_FOREST] = Region("Kokiri Forest", "Kokiri Forest", RA_KOKIRI_FOREST, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->BeanPlantFairy,           {[]{return logic->BeanPlantFairy   || (CanPlantBean(RR_KOKIRI_FOREST) && logic->CanUse(RG_SONG_OF_STORMS));}}),
-                  EventAccess(&logic->GossipStoneFairy,         {[]{return logic->GossipStoneFairy || logic->CallGossipFairyExceptSuns();}}),
+                  EventAccess(&logic->GossipStoneFairy,         {[]{return logic->CallGossipFairyExceptSuns();}}),
                   EventAccess(&logic->ShowedMidoSwordAndShield, {[]{return logic->ShowedMidoSwordAndShield || (logic->IsChild && logic->CanUse(RG_KOKIRI_SWORD) && logic->CanUse(RG_DEKU_SHIELD));}}),
                 }, {
                   //Locations
@@ -24,7 +24,7 @@ void RegionTable_Init_LostWoods() {
                   Entrance(RR_KF_HOUSE_OF_TWINS,     {[]{return true;}}),
                   Entrance(RR_KF_KNOW_IT_ALL_HOUSE,  {[]{return true;}}),
                   Entrance(RR_KF_KOKIRI_SHOP,        {[]{return true;}}),
-                  Entrance(RR_KF_OUTSIDE_DEKU_TREE,  {[]{return (logic->IsAdult && (logic->CanPassEnemy("Big Skulltula") || logic->ForestTempleClear)) || ctx->GetOption(RSK_FOREST).Is(RO_FOREST_OPEN) || logic->ShowedMidoSwordAndShield;}}),
+                  Entrance(RR_KF_OUTSIDE_DEKU_TREE,  {[]{return (logic->IsAdult && (logic->CanPassEnemy(RE_BIG_SKULLTULA) || logic->ForestTempleClear)) || ctx->GetOption(RSK_FOREST).Is(RO_FOREST_OPEN) || logic->ShowedMidoSwordAndShield;}}),
                   Entrance(RR_THE_LOST_WOODS,        {[]{return true;}}),
                   Entrance(RR_LW_BRIDGE_FROM_FOREST, {[]{return logic->IsAdult || ctx->GetOption(RSK_FOREST).IsNot(RO_FOREST_CLOSED) || logic->DekuTreeClear;}}),
                   Entrance(RR_KF_STORMS_GROTTO,      {[]{return logic->CanOpenStormsGrotto();}}),
@@ -42,7 +42,7 @@ void RegionTable_Init_LostWoods() {
                 }, {
                   //Exits
                   Entrance(RR_DEKU_TREE_ENTRYWAY, {[]{return logic->IsChild || (ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).IsNot(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF) && (ctx->GetOption(RSK_FOREST).Is(RO_FOREST_OPEN) || logic->ShowedMidoSwordAndShield));}}),
-                  Entrance(RR_KOKIRI_FOREST,      {[]{return (logic->IsAdult && (logic->CanPassEnemy("Big Skulltula") || logic->ForestTempleClear)) || ctx->GetOption(RSK_FOREST).Is(RO_FOREST_OPEN) || logic->ShowedMidoSwordAndShield;}}),
+                  Entrance(RR_KOKIRI_FOREST,      {[]{return (logic->IsAdult && (logic->CanPassEnemy(RE_BIG_SKULLTULA) || logic->ForestTempleClear)) || ctx->GetOption(RSK_FOREST).Is(RO_FOREST_OPEN) || logic->ShowedMidoSwordAndShield;}}),
   });
 
   areaTable[RR_KF_LINKS_HOUSE] = Region("KF Link's House", "KF Link's House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -115,7 +115,7 @@ void RegionTable_Init_LostWoods() {
                   //Events
                   EventAccess(&logic->OddMushroomAccess, {[]{return logic->OddMushroomAccess || (logic->IsAdult && (logic->CojiroAccess || logic->CanUse(RG_COJIRO)));}}),
                   EventAccess(&logic->PoachersSawAccess, {[]{return logic->PoachersSawAccess || (logic->IsAdult && logic->OddPoulticeAccess);}}),
-                  EventAccess(&logic->GossipStoneFairy,  {[]{return logic->GossipStoneFairy  || logic->CallGossipFairyExceptSuns();}}),
+                  EventAccess(&logic->GossipStoneFairy,  {[]{return logic->CallGossipFairyExceptSuns();}}),
                   EventAccess(&logic->BeanPlantFairy,    {[]{return logic->BeanPlantFairy    || logic->CanUse(RG_SONG_OF_STORMS);}}),
                   EventAccess(&logic->BugShrub,          {[]{return logic->IsChild && logic->CanCutShrubs();}}),
                 }, {
@@ -204,7 +204,7 @@ void RegionTable_Init_LostWoods() {
 
   areaTable[RR_SACRED_FOREST_MEADOW] = Region("Sacred Forest Meadow", "Sacred Forest Meadow", RA_SACRED_FOREST_MEADOW, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CallGossipFairyExceptSuns();}}),
+                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->CallGossipFairyExceptSuns();}}),
                 }, {
                   //Locations
                   LOCATION(RC_SONG_FROM_SARIA,             logic->IsChild && logic->HasItem(RG_ZELDAS_LETTER)),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
index 40768ffff..07a768fbd 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
@@ -15,7 +15,7 @@ void RegionTable_Init_ZorasDomain() {
 
   areaTable[RR_ZORAS_RIVER] = Region("Zora River", "Zora River", RA_ZORAS_RIVER, DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CallGossipFairy();}}),
+                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->CallGossipFairy();}}),
                   EventAccess(&logic->BeanPlantFairy,   {[]{return logic->BeanPlantFairy   || (CanPlantBean(RR_ZORAS_RIVER) && logic->CanUse(RG_SONG_OF_STORMS));}}),
                   EventAccess(&logic->ButterflyFairy,   {[]{return logic->ButterflyFairy   || logic->CanUse(RG_STICKS);}}),
                   EventAccess(&logic->BugShrub,         {[]{return logic->BugShrub         || logic->CanCutShrubs();}}),
@@ -85,7 +85,7 @@ void RegionTable_Init_ZorasDomain() {
   areaTable[RR_ZORAS_DOMAIN] = Region("Zoras Domain", "Zoras Domain", RA_ZORAS_DOMAIN, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->EyeballFrogAccess, {[]{return logic->EyeballFrogAccess || (logic->IsAdult && logic->KingZoraThawed && (logic->CanUse(RG_EYEDROPS) || logic->CanUse(RG_EYEBALL_FROG) || logic->CanUse(RG_PRESCRIPTION) || logic->PrescriptionAccess));}}),
-                  EventAccess(&logic->GossipStoneFairy,  {[]{return logic->GossipStoneFairy  || logic->CallGossipFairyExceptSuns();}}),
+                  EventAccess(&logic->GossipStoneFairy,  {[]{return logic->CallGossipFairyExceptSuns();}}),
                   EventAccess(&logic->NutPot,            {[]{return true;}}),
                   EventAccess(&logic->StickPot,          {[]{return logic->StickPot          || logic->IsChild;}}),
                   EventAccess(&logic->FishGroup,         {[]{return logic->FishGroup         || logic->IsChild;}}),
@@ -149,7 +149,7 @@ void RegionTable_Init_ZorasDomain() {
 
   areaTable[RR_ZORAS_FOUNTAIN] = Region("Zoras Fountain", "Zoras Fountain", RA_ZORAS_FOUNTAIN, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || logic->CallGossipFairyExceptSuns();}}),
+                  EventAccess(&logic->GossipStoneFairy, {[]{return logic->CallGossipFairyExceptSuns();}}),
                   EventAccess(&logic->ButterflyFairy,   {[]{return logic->ButterflyFairy   || (logic->CanUse(RG_STICKS) && logic->AtDay);}}),
                 }, {
                   //Locations
diff --git a/soh/soh/Enhancements/randomizer/logic.cpp b/soh/soh/Enhancements/randomizer/logic.cpp
index 3f22f3b0f..07215307f 100644
--- a/soh/soh/Enhancements/randomizer/logic.cpp
+++ b/soh/soh/Enhancements/randomizer/logic.cpp
@@ -428,25 +428,109 @@ namespace Rando {
         return false;
     }
 
-    //NOTE, when adding dark link,add Hearts() > 0
-    bool Logic::CanKillEnemy(std::string enemy) {
-        //switch(enemy) {} RANDOTODO implement enemies enum
-        if (enemy == "Big Skulltula"){
-            return CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT) || CanJumpslash() || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_HOOKSHOT) || CanUse(RG_DINS_FIRE) || HasExplosives();
+    bool Logic::CanKillEnemy(RandomizerEnemy enemy, EnemyDistance distance) {
+        switch(enemy) {
+            case RE_GOLD_SKULLTULA:
+            case RE_GOHMA_LARVA:
+            case RE_MAD_SCRUB:
+                return CanAttack();
+            case RE_BIG_SKULLTULA:
+                return CanDamage() || CanUse(RG_HOOKSHOT);
+            case RE_DODONGO:
+            case RE_LIZALFOS:
+                return CanJumpslash() || HasExplosives() || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_MEGATON_HAMMER);
+            case RE_KEESE:
+            case RE_FIRE_KEESE:
+                return CanJumpslash() || HasExplosives() || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_HOOKSHOT) || CanUse(RG_BOOMERANG);
+            default:
+                SPDLOG_ERROR("CanKillEnemy reached `default`.");
+                assert(false);
+                return false;
         }
-        //Shouldn't be reached
-        return false;
     }
 
-    bool Logic::CanPassEnemy(std::string enemy) {
-        //switch(enemy) {} RANDOTODO implement enemies enum
+    bool Logic::CanPassEnemy(RandomizerEnemy enemy) {
         if (CanKillEnemy(enemy)){
             return true;
         }
-        if (enemy == "Big Skulltula"){
-            return CanUse(RG_NUTS) || CanUse(RG_BOOMERANG);
+        switch(enemy) {
+            case RE_GOLD_SKULLTULA: 
+            case RE_GOHMA_LARVA:
+            case RE_LIZALFOS:
+            case RE_DODONGO: //RANDOTODO do dodongos block the way in tight corridors?
+            case RE_MAD_SCRUB:
+            case RE_KEESE:
+            case RE_FIRE_KEESE:
+                return true;
+            case RE_BIG_SKULLTULA:
+                return CanUse(RG_NUTS) || CanUse(RG_BOOMERANG);
+            default:
+                SPDLOG_ERROR("CanPassEnemy reached `default`.");
+                assert(false);
+                return false;
         }
-        return false;
+    }
+
+    bool Logic::CanAvoidEnemy(RandomizerEnemy enemy) {
+        if (CanKillEnemy(enemy)){
+            return true;
+        }
+        switch(enemy) {
+            case RE_GOLD_SKULLTULA: 
+            case RE_GOHMA_LARVA:
+            case RE_LIZALFOS:
+            case RE_DODONGO: //RANDOTODO do dodongos block the way in tight corridors?
+            case RE_BIG_SKULLTULA:
+                return true;
+            case RE_MAD_SCRUB:
+            case RE_KEESE:
+            case RE_FIRE_KEESE:
+                return CanUse(RG_NUTS);
+            default:
+                SPDLOG_ERROR("CanPassEnemy reached `default`.");
+                assert(false);
+                return false;
+        }
+    }
+
+    bool Logic::CanGetEnemyDrop(RandomizerEnemy enemy, EnemyDistance distance, bool aboveLink) {
+        if (!CanKillEnemy(enemy, distance)){
+            return false;
+        }
+        if (distance <= ED_MASTER_SWORD_JUMPSLASH){
+            return true;
+        }
+        switch(enemy) {
+            case RE_GOLD_SKULLTULA:
+                //RANDOTODO double check all jumpslash kills that might be out of jump/backflip range
+                return distance <= ED_HAMMER_JUMPSLASH || (distance <= ED_RANG_OR_HOOKSHOT && (CanUse(RG_HOOKSHOT) || CanUse(RG_BOOMERANG))) || (distance == ED_LONGSHOT && CanUse(RG_LONGSHOT));
+            case RE_KEESE:
+            case RE_FIRE_KEESE:
+                return true;
+            default:
+                return aboveLink || (distance <= ED_RANG_OR_HOOKSHOT && CanUse(RG_BOOMERANG));
+        }
+    }
+
+    bool Logic::CanBreakMudWalls() {
+        //RANDOTODO blue fire tricks
+        return BlastOrSmash();
+    }
+
+    bool Logic::CanGetDekuBabaSticks() {
+        return DekuBabaSticks || (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_BOOMERANG));
+    }
+
+    bool Logic::CanHitEyeTargets() {
+        return CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT);
+    }
+
+    bool Logic::CanDetonateBombFlowers() {
+        return CanUse(RG_FAIRY_BOW) || HasExplosives() || CanUse(RG_DINS_FIRE);
+    }
+
+    bool Logic::CanDetonateUprightBombFlower() {
+        return CanDetonateBombFlowers() || CanUse(RG_GORONS_BRACELET);
     }
 
     Logic::Logic() {
@@ -546,8 +630,9 @@ namespace Rando {
         return CallGossipFairyExceptSuns() || CanUse(RG_SUNS_SONG);
     }
 
-    bool Logic::EffectiveHealth(){
-        return CallGossipFairyExceptSuns() || CanUse(RG_SUNS_SONG);
+    uint8_t Logic::EffectiveHealth(){
+        uint8_t Multiplier = (ctx->GetOption(RSK_DAMAGE_MULTIPLIER).Value<uint8_t>() < 6) ? ctx->GetOption(RSK_DAMAGE_MULTIPLIER).Value<uint8_t>() : 10;
+        return ((Hearts() << (2 + HasItem(RG_DOUBLE_DEFENSE))) >> Multiplier) + ((Hearts() << (2 + HasItem(RG_DOUBLE_DEFENSE))) % (1 << Multiplier) > 0);
     }
 
     uint8_t Logic::Hearts(){
diff --git a/soh/soh/Enhancements/randomizer/logic.h b/soh/soh/Enhancements/randomizer/logic.h
index 3efae4d1d..dee521425 100644
--- a/soh/soh/Enhancements/randomizer/logic.h
+++ b/soh/soh/Enhancements/randomizer/logic.h
@@ -141,6 +141,7 @@ class Logic {
     bool FireLoopSwitch = false;
     bool LinksCow = false;
     bool DeliverLetter = false;
+    bool ClearMQDCUpperLobbyRocks = false;
 
     /* --- END OF HELPERS AND LOCATION ACCESS --- */
 
@@ -154,8 +155,15 @@ class Logic {
     bool SmallKeys(RandomizerRegion dungeon, uint8_t requiredAmountGlitchless, uint8_t requiredAmountGlitched);
     bool CanDoGlitch(GlitchType glitch);
     bool CanEquipSwap(RandomizerGet itemName);
-    bool CanKillEnemy(std::string enemy);
-    bool CanPassEnemy(std::string enemy);
+    bool CanKillEnemy(RandomizerEnemy enemy, EnemyDistance distance = ED_CLOSE);
+    bool CanPassEnemy(RandomizerEnemy enemy);
+    bool CanAvoidEnemy(RandomizerEnemy enemy);
+    bool CanGetEnemyDrop(RandomizerEnemy enemy, EnemyDistance distance = ED_CLOSE, bool aboveLink = false);
+    bool CanBreakMudWalls();
+    bool CanGetDekuBabaSticks();
+    bool CanHitEyeTargets();
+    bool CanDetonateBombFlowers();
+    bool CanDetonateUprightBombFlower();
     uint8_t BottleCount();
     uint8_t OcarinaButtons();
     bool HasBottle();
@@ -176,7 +184,7 @@ class Logic {
     bool CanLeaveForest();
     bool CallGossipFairy();
     bool CallGossipFairyExceptSuns();
-    bool EffectiveHealth();
+    uint8_t EffectiveHealth();
     uint8_t Hearts();
     uint8_t StoneCount();
     uint8_t MedallionCount();
diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h
index 324e90149..3476d4fa7 100644
--- a/soh/soh/Enhancements/randomizer/randomizerTypes.h
+++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@@ -539,10 +539,25 @@ typedef enum {
 
     RR_DODONGOS_CAVERN_MQ_BEGINNING,
     RR_DODONGOS_CAVERN_MQ_LOBBY,
+    RR_DODONGOS_CAVERN_MQ_MOUTH_SIDE_BRIDGE,
+    RR_DODONGOS_CAVERN_MQ_STAIRS_PAST_MUD_WALL,
+    RR_DODONGOS_CAVERN_MQ_STAIRS_LOWER,
+    RR_DODONGOS_CAVERN_MQ_STAIRS_UPPER,
+    RR_DODONGOS_CAVERN_MQ_STAIRS_PAST_BIG_SKULLTULAS,
+    RR_DODONGOS_CAVERN_MQ_DODONGO_ROOM,
+    RR_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_LOWER,
+    RR_DODONGOS_CAVERN_MQ_BIG_BLOCK_ROOM,
+    RR_DODONGOS_CAVERN_MQ_LARVAE_ROOM,
+    RR_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS,
+    RR_DODONGOS_CAVERN_MQ_TWO_FIRES_ROOM,
+    RR_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_UPPER,
     RR_DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE,
-    RR_DODONGOS_CAVERN_MQ_BOMB_BAG_AREA,
-    RR_DODONGOS_CAVERN_MQ_BOSS_AREA,
-
+    RR_DODONGOS_CAVERN_MQ_LOWER_LIZALFOS,
+    RR_DODONGOS_CAVERN_MQ_POES_ROOM,
+    RR_DODONGOS_CAVERN_MQ_MAD_SCRUB_ROOM,
+    RR_DODONGOS_CAVERN_MQ_BEHIND_MOUTH,
+    RR_DODONGOS_CAVERN_MQ_BACK_BEHIND_FIRE,
+    RR_DODONGOS_CAVERN_MQ_BACK_SWITCH_GRAVE,
     RR_DODONGOS_CAVERN_BOSS_ENTRYWAY,
     RR_DODONGOS_CAVERN_BOSS_ROOM,
 
@@ -4345,4 +4360,22 @@ typedef enum {
     TH_MESSAGE_SURPLUS,
 } TriforceHuntMessages;
 
+typedef enum {
+    RE_GOLD_SKULLTULA,
+    RE_BIG_SKULLTULA,
+    RE_DODONGO,
+    RE_LIZALFOS,
+    RE_GOHMA_LARVA,
+    RE_KEESE,
+    RE_FIRE_KEESE,
+    RE_MAD_SCRUB,
+} RandomizerEnemy;
 
+typedef enum {
+    ED_CLOSE,
+    ED_HAMMER_JUMPSLASH,
+    ED_MASTER_SWORD_JUMPSLASH,
+    ED_RANG_OR_HOOKSHOT,
+    ED_LONGSHOT,
+    ED_FAR,
+} EnemyDistance;

From 63eaae8774be001e06b04fbc607b4266db71d5bb Mon Sep 17 00:00:00 2001
From: Extloga <141232749+Extloga@users.noreply.github.com>
Date: Sat, 5 Oct 2024 22:29:46 +0200
Subject: [PATCH 221/230] Additions for the German translation in hint_list.cpp
 (#4381)

* Additions for the German translation in hint_list.cpp

* Additions for the German translation in hint_list.cpp
---
 .../randomizer/3drando/hint_list.cpp          | 391 +++++++++---------
 1 file changed, 190 insertions(+), 201 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
index 3a35118d2..4d32d3c00 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
@@ -25,25 +25,25 @@ void StaticData::HintTable_Init() {
     /*--------------------------
     |       GENERAL TEXT        |
     ---------------------------*/
-    hintTextTable[RHT_NONE] = HintText(CustomMessage("No Hint", "", "Pas d'Indice" ));
+    hintTextTable[RHT_NONE] = HintText(CustomMessage("No Hint", "Kein Hinweis", "Pas d'Indice" ));
     hintTextTable[RHT_WAY_OF_THE_HERO] =
         HintText(CustomMessage( "They say that #[[1]]# is on #the way of the hero#.", 
-                                "",
+                                "Man erzählt sich, daß #[[1]]# auf #dem Weg des Helden# sei.",
                      /*french*/ "Selon moi, #[[1]]# est sur #la voie du héros#.", {QM_RED, QM_LBLUE}));
                  // /*spanish*/ "Según dicen, #[[1]]# conduce a la senda del héroe."
     hintTextTable[RHT_FOOLISH] = 
         HintText(CustomMessage( "They say that plundering #[[1]]# is #a foolish choice#.",
-                                "",
+                                "Man erzählt sich, daß das Plündern von #[[1]]# #eine törichte Entscheidung# sei.",
                         /*french*/ "Selon moi, explorer #[[1]]# est #futile#.", {QM_RED, QM_PINK}));
                     // /*spanish*/ "Según dicen, inspeccionar #[[1]]# #no es una sabia decisión#."
     hintTextTable[RHT_CAN_BE_FOUND_AT] =
         HintText(CustomMessage( "They say that #[[1]]# can be found at #[[2]]#.",
-                                "",
+                                "Man erzählt sich, daß #[[1]]# bei #[[2]]# gefunden werden könne.",
                         /*french*/ "Selon moi, #[[1]]# se trouve dans #[[2]]#.", {QM_GREEN, QM_RED}));
                     // /*spanish*/ "Según dicen, #[[1]]# aguarda en #[[2]]#."
     hintTextTable[RHT_HOARDS] = 
         HintText(CustomMessage( "They say that #[[2]]# hoards #[[1]]#.",
-                                "",
+                                "Man erzählt sich, daß #[[2]]# #[[1]]# horte.",
                      /*french*/ "Selon moi, #[[2]]# recèle #[[1]]#.", {QM_RED, QM_GREEN}));
                     // /*spanish*/ "Según dicen, #[[2]]# acapara #[[1]]#."
 
@@ -57,800 +57,795 @@ void StaticData::HintTable_Init() {
     ---------------------------*/
 
     hintTextTable[RHT_KF_LINKS_HOUSE_COW] = HintText(CustomMessage("They say that #Malon's obstacle course# leads to #[[1]]#.",
-                                                        /*german*/ "",
+                                                        /*german*/ "Man erzählt sich, daß #Malons Hinderniskurs# zu #[[1]]# führe.",
                                                         /*french*/ "Selon moi, la #course à obstacle de Malon# amène à #[[1]]#.", {QM_RED, QM_GREEN}),
                                                      // /*spanish*/la #carrera de obstáculos de Malon# brinda #[[1]]#.
                                                      {},
                                                      {CustomMessage("They say that the #bovine bounty of a horseback hustle# gifts #[[1]]#.",
-                                                         /*german*/ "",
+                                                         /*german*/ "Man erzählt sich, daß der #bovine Schatz einer Pferdehast# #[[1]]# sei.",
                                                          /*french*/ "Selon moi, le cadeau #qui découle d'une réussite équestre# est #[[1]]#.", {QM_RED, QM_GREEN})});
                                                       // /*spanish*/la #recompensa bovina de un paseo a caballo# brinda #[[1]]#.
 
     hintTextTable[RHT_KAK_100_GOLD_SKULLTULA_REWARD] = HintText(CustomMessage("They say that slaying #100 Gold Skulltulas# reveals #[[1]]#.",
-                                                                   /*german*/ "",
+                                                                   /*german*/ "Man erzählt sich, daß das Vernichten von #100 Goldenen Skulltulas# #[[1]]# enthülle.",
                                                                    /*french*/ "Selon moi, détruire #100 Skulltulas d'or# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                 // /*spanish*/exterminar #100 skulltulas doradas# revela #[[1]]#.
                                                                 {},
                                                                 {CustomMessage("They say that #100 bug badges# rewards #[[1]]#.",
-                                                                    /*german*/ "",
+                                                                    /*german*/ "Man erzählt sich, daß #100 Insektenplaketten# mit #[[1]]# belohnt würde.",
                                                                     /*french*/ "Selon moi, #100 écussons# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                  // /*spanish*/#100 medallas de insectos# otorgan #[[1]]#.
                                                                  CustomMessage("They say that #100 spider souls# yields #[[1]]#.",
-                                                                    /*german*/ "",
+                                                                    /*german*/ "Man erzählt sich, daß #100 Spinnenseelen# #[[1]]# einbrächte.",
                                                                     /*french*/ "Selon moi, #100 âmes d'arachnide# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                  // /*spanish*/#100 almas de araña# otorgan #[[1]]#.
                                                                  CustomMessage("They say that #100 auriferous arachnids# lead to #[[1]]#.",
-                                                                    /*german*/ "",
+                                                                    /*german*/ "Man erzählt sich, daß #100 goldhaltige Arachniden# zu #[[1]]# führen würde.",
                                                                     /*french*/ "Selon moi, #100 arachnides aurifères# donnent #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                  // /*spanish*/#100 arácnidos auríferos# otorgan #[[1]]#.
 
     hintTextTable[RHT_SONG_FROM_OCARINA_OF_TIME] = HintText(CustomMessage("They say that the #Ocarina of Time# teaches #[[1]]#.",
-                                                               /*german*/ "",
+                                                               /*german*/ "Man erzählt sich, daß die #Okarina der Zeit# #[[1]]# lehre.",
                                                                /*french*/ "Selon moi, l'#Ocarina du Temps# est accompagné par #[[1]]#.", {QM_RED, QM_GREEN})),
                                                             // /*spanish*/la #Ocarina del Tiempo# enseña #[[1]]#.
 
     hintTextTable[RHT_SONG_FROM_ROYAL_FAMILYS_TOMB] = HintText(CustomMessage("They say that #ReDead in the Composers' Grave# guard #[[1]]#.",
-                                                                  /*german*/ "",
+                                                                  /*german*/ "Man erzählt sich, daß #Zombies im Grab des Komponisten# #[[1]]# bewache.",
                                                                   /*french*/ "Selon moi, les #Éffrois du tombeau des compositeurs# protègent #[[1]]#.", {QM_RED, QM_GREEN})),
                                                                // /*spanish*/los #ReDeads del Panteón Real# guardan #[[1]]#.
 
     hintTextTable[RHT_SHEIK_IN_FOREST] = HintText(CustomMessage("They say that #in a meadow# Sheik teaches #[[1]]#.",
-                                                     /*german*/ "",
+                                                     /*german*/ "Man erzählt sich, daß Shiek #auf einer Wiese# #[[1]]# lehre.",
                                                      /*french*/ "Selon moi, Sheik confiera, #dans un bosquet#, #[[1]]#.", {QM_RED, QM_GREEN})),
                                                   // /*spanish*/#en la pradera sagrada# Sheik enseña #[[1]]#.
 
     hintTextTable[RHT_SHEIK_AT_TEMPLE] = HintText(CustomMessage("They say that Sheik waits at a #monument to time# to teach #[[1]]#.",
-                                                     /*german*/ "",
+                                                     /*german*/ "Man erzählt sich, daß Shiek auf einem #Monument der Zeit# warte und #[[1]]# lehre.",
                                                      /*french*/ "Selon moi, Sheik confiera, #au pied de l'épée légendaire#, #[[1]]#.", {QM_RED, QM_GREEN})),
                                                   // /*spanish*/Sheik espera en el #momumento del tiempo# para enseñar #[[1]]#.
 
     hintTextTable[RHT_SHEIK_IN_CRATER] = HintText(CustomMessage("They say that the #crater's melody# is #[[1]]#.",
-                                                     /*german*/ "",
+                                                     /*german*/ "Man erzählt sich, daß die #Melodie eines Kraters# #[[1]]# sei.",
                                                      /*french*/ "Selon moi, Sheik confiera, #entouré de lave#, #[[1]]#.", {QM_RED, QM_GREEN})),
                                                   // /*spanish*/la #melodía del cráter# otorga #[[1]]#.
 
     hintTextTable[RHT_SHEIK_IN_ICE_CAVERN] = HintText(CustomMessage("They say that the #frozen cavern# echoes with #[[1]]#.",
-                                                         /*german*/ "",
+                                                         /*german*/ "Man erzählt sich, daß die #gefrorene Kaverne# mit #[[1]]# echoe.",
                                                          /*french*/ "Selon moi, Sheik confiera, #dans une caverne enneigée#, #[[1]]#.", {QM_RED, QM_GREEN})),
                                                       // /*spanish*/en la #caverna de hielo# retumban los ecos de #[[1]]#.
 
     hintTextTable[RHT_SHEIK_IN_KAKARIKO] = HintText(CustomMessage("They say that a #ravaged village# mourns with #[[1]]#.",
-                                                       /*german*/ "",
+                                                       /*german*/ "Man erzählt sich, daß ein #verwüstetes Dorf# mit #[[1]]# trauere.",
                                                        /*french*/ "Selon moi, Sheik confirera, #au coeur d'un village ravagé#, #[[1]]#.", {QM_RED, QM_GREEN})),
                                                     // /*spanish*/un #arrasado pueblo# llora #[[1]]#.
 
     hintTextTable[RHT_SHEIK_AT_COLOSSUS] = HintText(CustomMessage("They say that a hero ventures #beyond the wasteland# to learn #[[1]]#.",
-                                                       /*german*/ "",
+                                                       /*german*/ "Man erzählt sich, daß ein Held sich #jenseits des Ödlands# wage und #[[1]]# lerne.",
                                                        /*french*/ "Selon moi, Sheik confiera, #au bout d'un chemin sableux#, #[[1]]#.", {QM_RED, QM_GREEN})),
                                                     // /*spanish*/el héroe que se adentre #más allá del desierto# aprenderá #[[1]]#.
 
     hintTextTable[RHT_MARKET_10_BIG_POES] = HintText(CustomMessage("They say that catching #Big Poes# leads to #[[1]]#.",
-                                                        /*german*/ "",
+                                                        /*german*/ "Man erzählt sich, daß das Fangen #großer Irrlichter# zu #[[1]]# führe.",
                                                         /*french*/ "Selon moi, #d'attraper des Àmes# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                      // /*spanish*/hacerte con #Grandes Poes# conduce a #[[1]]#.
                                                      {},
                                                      {CustomMessage("They say that #ghost hunters# will be rewarded with #[[1]]#.",
-                                                         /*german*/ "",
+                                                         /*german*/ "Man erzählt sich, daß #Geisterjäger# mit #[[1]]# belohnt würde.",
                                                          /*french*/ "Selon moi, #les chasseurs de fantômes# sont récompensés avec #[[1]]#.", {QM_RED, QM_GREEN})});
                                                       // /*spanish*/los #cazafantasmas# son premiados con #[[1]]#.
 
     hintTextTable[RHT_DEKU_THEATER_SKULL_MASK] = HintText(CustomMessage("They say that the #Skull Mask# yields #[[1]]#.",
-                                                             /*german*/ "",
+                                                             /*german*/ "Man erzählt sich, daß die #Schädel-Maske# #[[1]]# einbrächte.",
                                                              /*french*/ "Selon moi, le #Masque de Mort# donne #[[1]]#.", {QM_RED, QM_GREEN})),
                                                           // /*spanish*/la #máscara de calavera# otorga #[[1]]#.
 
     hintTextTable[RHT_DEKU_THEATER_MASK_OF_TRUTH] = HintText(CustomMessage("They say that the #Mask of Truth# yields #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß die #Maske der Wahrheit# #[[1]]# einbrächte.",
                                                                 /*french*/ "Selon moi, le #Masque de Vérité# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                              // /*spanish*/la #máscara de la verdad# premia #[[1]]#.
                                                              {},
                                                              {CustomMessage("They say that showing a #truthful eye to the crowd# rewards #[[1]]#.",
-                                                                 /*german*/ "",
+                                                                 /*german*/ "Man erzählt sich, daß das Zeigen eines #wahrhaftigen Auges zu der Menge# mit #[[1]]# belohnt würde.",
                                                                  /*french*/ "Selon moi, montrer #l'oeil de vérité à la foule# donne #[[1]]#.", {QM_RED, QM_GREEN})});
                                                               // /*spanish*/#mostrarle el ojo verdadero# a una multitud brinda #[[1]]#.
 
     hintTextTable[RHT_HF_OCARINA_OF_TIME_ITEM] = HintText(CustomMessage("They say that the #treasure thrown by Princess Zelda# is #[[1]]#.",
-                                                             /*german*/ "",
+                                                             /*german*/ "Man erzählt sich, daß der #von Prinzessin Zelda geworfene Schatz# #[[1]]# sei.",
                                                              /*french*/ "Selon moi, le trésor #laissé par la princesse# est #[[1]]#.", {QM_RED, QM_GREEN})),
                                                           // /*spanish*/el #tesoro arrojado por la Princesa Zelda# se trata de #[[1]]#.
 
     hintTextTable[RHT_DMT_TRADE_BROKEN_SWORD] = HintText(CustomMessage("They say that a #blinded Biggoron# entrusts #[[1]]#.",
-                                                            /*german*/ "",
+                                                            /*german*/ "Man erzählt sich, daß ein #erblindeter Biggoron# #[[1]]# anvertraue.",
                                                             /*french*/ "Selon moi, They say that un #Grogoron aveuglé# confie #[[1]]#.", {QM_RED, QM_GREEN})),
                                                          // /*spanish*/un #miope Biggoron# otorga #[[1]]#.
 
     hintTextTable[RHT_DMT_TRADE_EYEDROPS] = HintText(CustomMessage("They say that while you wait, #Biggoron# gives #[[1]]#.",
-                                                        /*german*/ "",
+                                                        /*german*/ "Man erzählt sich, daß während man warte, #Biggoron# #[[1]]# gäbe.",
                                                         /*french*/ "Selon moi, pendant que tu attends, #Biggoron# donne #[[1]]#.", {QM_RED, QM_GREEN})),
                                                      // /*spanish*/#Biggoron# está a la espera de otorgar #[[1]]#.
 
     hintTextTable[RHT_DMT_TRADE_CLAIM_CHECK] = HintText(CustomMessage("They say that #Biggoron# crafts #[[1]]#.",
-                                                           /*german*/ "",
+                                                           /*german*/ "Man erzählt sich, daß #Biggoron# #[[1]]# fertige.",
                                                            /*french*/ "Selon moi, #Biggoron# fabrique #[[1]]#.", {QM_RED, QM_GREEN})),
                                                         // /*spanish*/#Biggoron# forja #[[1]]#.
 
     hintTextTable[RHT_KAK_50_GOLD_SKULLTULA_REWARD] = HintText(CustomMessage("They say that slaying #50 Gold Skulltulas# reveals #[[1]]#.",
-                                                                  /*german*/ "",
+                                                                  /*german*/ "Man erzählt sich, daß das Vernichten von #50 Goldenen Skulltulas# #[[1]]# enthülle.",
                                                                   /*french*/ "Selon moi, détruire #50 Skulltulas d'or# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                // /*spanish*/exterminar #50 skulltulas doradas# revela #[[1]]#.
                                                                {},
                                                                {CustomMessage("They say that #50 bug badges# rewards #[[1]]#.",
-                                                                   /*german*/ "",
+                                                                   /*german*/ "Man erzählt sich, daß #50 Insektenplaketten# mit #[[1]]# belohnt würde.",
                                                                    /*french*/ "Selon moi, #50 écussons# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                 // /*spanish*/#50 medallas de insectos# otorgan #[[1]]#.
                                                                 CustomMessage("They say that #50 spider souls# yields #[[1]]#.",
-                                                                   /*german*/ "",
+                                                                   /*german*/ "Man erzählt sich, daß #50 Spinnenseelen# #[[1]]# einbrächte.",
                                                                    /*french*/ "Selon moi, #50 âmes d'arachnide# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                 // /*spanish*/#50 almas de araña# otorgan #[[1]]#.
                                                                 CustomMessage("They say that #50 auriferous arachnids# lead to #[[1]]#.",
-                                                                   /*german*/ "",
+                                                                   /*german*/ "Man erzählt sich, daß #50 goldhaltige Arachniden# zu #[[1]]# führen würde.",
                                                                    /*french*/ "Selon moi, #50 arachnides aurifères# donnent #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                 // /*spanish*/#50 arácnidos auríferos# otorgan #[[1]]#.
 
     hintTextTable[RHT_KAK_40_GOLD_SKULLTULA_REWARD] = HintText(CustomMessage("They say that slaying #40 Gold Skulltulas# reveals #[[1]]#.",
-                                                                  /*german*/ "",
+                                                                  /*german*/ "Man erzählt sich, daß das Vernichten von #40 Goldenen Skulltulas# #[[1]]# enthülle.",
                                                                   /*french*/ "Selon moi, détruire #40 Skulltulas d'or# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                // /*spanish*/exterminar #40 skulltulas doradas# revela #[[1]]#.
                                                                {},
                                                                {CustomMessage("They say that #40 bug badges# rewards #[[1]]#.",
-                                                                   /*german*/ "",
+                                                                   /*german*/ "Man erzählt sich, daß #40 Insektenplaketten# mit #[[1]]# belohnt würde.",
                                                                    /*french*/ "Selon moi, #40 écussons# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                 // /*spanish*/#40 medallas de insectos# otorgan #[[1]]#.
                                                                 CustomMessage("They say that #40 spider souls# yields #[[1]]#.",
-                                                                   /*german*/ "",
+                                                                   /*german*/ "Man erzählt sich, daß #40 Spinnenseelen# #[[1]]# einbrächte.",
                                                                    /*french*/ "Selon moi, #40 âmes d'arachnide# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                 // /*spanish*/#40 almas de araña# otorgan #[[1]]#.
                                                                 CustomMessage("They say that #40 auriferous arachnids# lead to #[[1]]#.",
-                                                                   /*german*/ "",
+                                                                   /*german*/ "Man erzählt sich, daß #40 goldhaltige Arachniden# zu #[[1]]# führen würde.",
                                                                    /*french*/ "Selon moi, #40 arachnides aurifères# donnent #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                 // /*spanish*/#40 arácnidos auríferos# otorgan #[[1]]#.
 
     hintTextTable[RHT_KAK_30_GOLD_SKULLTULA_REWARD] = HintText(CustomMessage("They say that slaying #30 Gold Skulltulas# reveals #[[1]]#.",
-                                                                  /*german*/ "",
+                                                                  /*german*/ "Man erzählt sich, daß das Vernichten von #30 Goldenen Skulltulas# #[[1]]# enthülle.",
                                                                   /*french*/ "Selon moi, détruire #30 Skulltulas d'or# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                // /*spanish*/exterminar #30 skulltulas doradas# revela #[[1]]#.
                                                                {},
                                                                {CustomMessage("They say that #30 bug badges# rewards #[[1]]#.",
-                                                                   /*german*/ "",
+                                                                   /*german*/ "Man erzählt sich, daß #30 Insektenplaketten# mit #[[1]]# belohnt würde.",
                                                                    /*french*/ "Selon moi, #30 écussons# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                 // /*spanish*/#30 medallas de insectos# otorgan #[[1]]#.
                                                                 CustomMessage("They say that #30 spider souls# yields #[[1]]#.",
-                                                                   /*german*/ "",
+                                                                   /*german*/ "Man erzählt sich, daß #30 Spinnenseelen# #[[1]]# einbrächte.",
                                                                    /*french*/ "Selon moi, #30 âmes d'arachnide# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                 // /*spanish*/#30 almas de araña# otorgan #[[1]]#.
                                                                 CustomMessage("They say that #30 auriferous arachnids# lead to #[[1]]#.",
-                                                                   /*german*/ "",
+                                                                   /*german*/ "Man erzählt sich, daß #30 goldhaltige Arachniden# zu #[[1]]# führen würde.",
                                                                    /*french*/ "Selon moi, #30 arachnides aurifères# donnent #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                 // /*spanish*/#30 arácnidos auríferos# otorgan #[[1]]#.
 
     hintTextTable[RHT_KAK_20_GOLD_SKULLTULA_REWARD] = HintText(CustomMessage("They say that slaying #20 Gold Skulltulas# reveals #[[1]]#.",
-                                                                  /*german*/ "",
+                                                                  /*german*/ "Man erzählt sich, daß das Vernichten von #20 Goldenen Skulltulas# #[[1]]# enthülle.",
                                                                   /*french*/ "Selon moi, détruire #20 Skulltulas d'or# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                // /*spanish*/exterminar #20 skulltulas doradas# revela #[[1]]#.
                                                                {},
                                                                {CustomMessage("They say that #20 bug badges# rewards #[[1]]#.",
-                                                                   /*german*/ "",
+                                                                   /*german*/ "Man erzählt sich, daß #20 Insektenplaketten# mit #[[1]]# belohnt würde.",
                                                                    /*french*/ "Selon moi, #20 écussons# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                 // /*spanish*/#20 medallas de insectos# otorgan #[[1]]#.
                                                                 CustomMessage("They say that #20 spider souls# yields #[[1]]#.",
-                                                                   /*german*/ "",
+                                                                   /*german*/ "Man erzählt sich, daß #20 Spinnenseelen# #[[1]]# einbrächte.",
                                                                    /*french*/ "Selon moi, #20 âmes d'arachnide# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                 // /*spanish*/#20 almas de araña# otorgan #[[1]]#.
                                                                 CustomMessage("They say that #20 auriferous arachnids# lead to #[[1]]#.",
-                                                                   /*german*/ "",
+                                                                   /*german*/ "Man erzählt sich, daß #20 goldhaltige Arachniden# zu #[[1]]# führen würde.",
                                                                    /*french*/ "Selon moi, #20 arachnides aurifères# donnent #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                 // /*spanish*/#20 arácnidos auríferos# otorgan #[[1]]#.
 
     hintTextTable[RHT_KAK_ANJU_AS_CHILD] = HintText(CustomMessage("They say that #collecting cuccos# rewards #[[1]]#.",
-                                                       /*german*/ "",
+                                                       /*german*/ "Man erzählt sich, daß das #Sammeln von Hühnern# mit #[[1]]# belohnt würde.",
                                                        /*french*/ "Selon moi, #rapporter les Cocottes# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                     // /*spanish*/#hacerte con todos los cucos# premia #[[1]]#.
                                                     {},
                                                     {CustomMessage("They say that #wrangling roosters# rewards #[[1]]#.",
-                                                        /*german*/ "",
+                                                        /*german*/ "Man erzählt sich, daß das #Rangeln mit Hähnen# mit #[[1]]# belohnt würde.",
                                                         /*french*/ "Selon moi, #plumer des poulets# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                      // /*spanish*/#atrapar a las gallinas# premia #[[1]]#.
                                                      CustomMessage("They say that #chucking chickens# gifts #[[1]]#.",
-                                                        /*german*/ "",
+                                                        /*german*/ "Man erzählt sich, daß das #Werfen von Hühnchen# mit #[[1]]# belohnt würde.",
                                                         /*french*/ "Selon moi, #lancer des poulets# donne #[[1]]#.", {QM_RED, QM_GREEN})});
                                                      // /*spanish*/#reunir a unos emplumados# premia #[[1]]#.
 
     hintTextTable[RHT_KAK_TRADE_POCKET_CUCCO] = HintText(CustomMessage("They say that an adult's #happy Cucco# awards #[[1]]#.",
-                                                            /*german*/ "",
+                                                            /*german*/ "Man erzählt sich, daß das #glückliche Huhn# eines Erwachsenen #[[1]]# verleihe.",
                                                             /*french*/ "Selon moi, un adulte avec une #poulette joyeuse# obtient #[[1]]#.", {QM_RED, QM_GREEN})),
                                                          // /*spanish*/un #alegre cuco# en la madurez otorga #[[1]]#.
 
     hintTextTable[RHT_KAK_TRADE_ODD_MUSHROOM] = HintText(CustomMessage("They say that the #potion shop lady# entrusts #[[1]]#.",
-                                                            /*german*/ "",
+                                                            /*german*/ "Man erzählt sich, daß die #Dame des Trankladens# #[[1]]# anvertraue.",
                                                             /*french*/ "Selon moi, la #gribiche du magasin de potion# confie #[[1]]#.", {QM_RED, QM_GREEN})),
                                                          // /*spanish*/la #señora de la tienda de pociones# otorga #[[1]]#.
 
     hintTextTable[RHT_GC_DARUNIAS_JOY] = HintText(CustomMessage("They say that #Darunia's dance# leads to #[[1]]#.",
-                                                     /*german*/ "",
+                                                     /*german*/ "Man erzählt sich, daß #Darunias Tanz# zu #[[1]]# führe.",
                                                      /*french*/ "Selon moi, #la dance de Darunia# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                   // /*spanish*/#el baile de Darunia# conduce a #[[1]]#.
                                                   {},
                                                   {CustomMessage("They say that a #groovin' goron# gifts #[[1]]#.",
-                                                      /*german*/ "",
+                                                      /*german*/ "Man erzählt sich, daß ein #grooviger Gorone# #[[1]]# schenke.",
                                                       /*french*/ "Selon moi, #le Goron joyeux# donne #[[1]]#.", {QM_RED, QM_GREEN})});
                                                    // /*spanish*/#un goron marchoso# otorga #[[1]]#.
 
     hintTextTable[RHT_LW_SKULL_KID] = HintText(CustomMessage("They say that the #Skull Kid# grants #[[1]]#.",
-                                                  /*german*/ "",
+                                                  /*german*/ "Man erzählt sich, daß das #Horror-Kid# #[[1]]# gewähre.",
                                                   /*french*/ "Selon moi, le #Skull Kid# donne #[[1]]#.", {QM_RED, QM_GREEN})),
                                                // /*spanish*/#Skull Kid# otorga #[[1]]#.
 
     hintTextTable[RHT_LW_TRADE_COJIRO] = HintText(CustomMessage("They say that returning a #special Cucco# awards #[[1]]#.",
-                                                     /*german*/ "",
+                                                     /*german*/ "Man erzählt sich, daß das Zurückbringen eines #speziellen Huhns# #[[1]]# einbrächte.",
                                                      /*french*/ "Selon moi, ramener une #poulette précieuse# donne #[[1]]#.", {QM_RED, QM_GREEN})),
                                                   // /*spanish*/quien devuelva un #cuco especial# encontrará #[[1]]#.
 
     hintTextTable[RHT_LW_TRADE_ODD_POTION] = HintText(CustomMessage("They say that a #Kokiri girl in the woods# leaves #[[1]]#.",
-                                                         /*german*/ "",
+                                                         /*german*/ "Man erzählt sich, daß ein #Kokiri-Mädchen in den Wäldern# #[[1]]# überließe.",
                                                          /*french*/ "Selon moi, la #fillette Kokiri dans les bois# laisse #[[1]]#.", {QM_RED, QM_GREEN})),
                                                       // /*spanish*/una #chica kokiri del bosque# otorga #[[1]]#.
 
     hintTextTable[RHT_LH_SUN] = HintText(CustomMessage("They say that shooting #the sun# grants #[[1]]#.",
-                                            /*german*/ "",
+                                            /*german*/ "Man erzählt sich, daß das Beschießen #der Sonne# #[[1]]# gewähre.",
                                             /*french*/ "Selon moi, tirer une flèche dans #sur le soleil# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                          // /*spanish*/#disparar al sol# revela #[[1]]#.
                                          {},
                                          {CustomMessage("They say that staring into #the sun# grants #[[1]]#.",
-                                             /*german*/ "",
+                                             /*german*/ "Man erzählt sich, daß das Starren in #die Sonne# #[[1]]# gewähre.",
                                              /*french*/ "Selon moi, regarder #le soleil# donne #[[1]]#.", {QM_RED, QM_GREEN})});
                                           // /*spanish*/#mirar al sol# revela #[[1]]#.
 
     hintTextTable[RHT_LH_TRADE_FROG] = HintText(CustomMessage("They say that #Lake Hylia's scientist# hurriedly entrusts #[[1]]#.",
-                                                   /*german*/ "",
+                                                   /*german*/ "Man erzählt sich, daß der #Wissenschaftler des Hylia-Sees# #[[1]]# zügig anvertraue.",
                                                    /*french*/ "Selon moi, le #scientifique du lac# confie rapidement #[[1]]#.", {QM_RED, QM_GREEN})),
                                                 // /*spanish*/el #científico del Lago Hylia# otorga con prisa #[[1]]#.
 
     hintTextTable[RHT_MARKET_TREASURE_CHEST_GAME_REWARD] = HintText(CustomMessage("They say that the #treasure chest game# grants #[[1]]#.",
-                                                                       /*german*/ "",
+                                                                       /*german*/ "Man erzählt sich, daß #Schatzkisten-Poker# #[[1]]# gewähre.",
                                                                        /*french*/ "Selon moi, la #Chasse-aux-Trésors# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                     // /*spanish*/#el Cofre del Tesoro# premia #[[1]]#.
                                                                     {},
                                                                     {CustomMessage("They say that #gambling# grants #[[1]]#.",
-                                                                        /*german*/ "",
+                                                                        /*german*/ "Man erzählt sich, daß #Glücksspiel# #[[1]]# gewähre.",
                                                                         /*french*/ "Selon moi, #parier# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                      // /*spanish*/#los juegos de azar# revelan #[[1]]#.
                                                                      CustomMessage("They say that there is a #1/32 chance# to win #[[1]]#.",
-                                                                        /*german*/ "",
+                                                                        /*german*/ "Man erzählt sich, daß es eine #Chance von 1 zu 32# gäbe, um #[[1]]# zu gewinnen.",
                                                                         /*french*/ "Selon moi, être #le gagnant parmi 32# donne #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                      // /*spanish*/hay una #probabilidad de 1/32# de ganar #[[1]]#.
 
     hintTextTable[RHT_MARKET_TREASURE_CHEST_GAME_ITEM_1] = HintText(CustomMessage("They say that the #first locked room# in the chest game contains #[[1]]#.",
-                                                                       /*german*/ "",
+                                                                       /*german*/ "Man erzählt sich, daß der #erste verschlossene Raum# im Schatzkisten-Poker #[[1]]# enthielte.",
                                                                        /*french*/ "Selon moi, la #première salle# de la Chasse-aux-Trésors contient #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                     // /*spanish*/#en la primera sala del Cofre del Tesoro# aguarda #[[1]]#.
                                                                     {},
                                                                     {CustomMessage("They say that #gambling once# grants #[[1]]#.",
-                                                                        /*german*/ "",
+                                                                        /*german*/ "Man erzählt sich, daß #einmaliges Glücksspiel# #[[1]]# gewähre.",
                                                                         /*french*/ "Selon moi, #parier une fois# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                      // /*spanish*/#apostar solo una vez# revelará #[[1]]#.
                                                                      CustomMessage("They say that the #first or second game chest# contains #[[1]]#.",
-                                                                        /*german*/ "",
+                                                                        /*german*/ "Man erzählt sich, daß das #erste oder zweite Schatzkiste im Spiel# #[[1]]# enthielte.",
                                                                         /*french*/ "Selon moi, le #premier ou deuxième coffre à jeu# contient #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                      // /*spanish*/#el primer o segundo cofre del azar# revela #[[1]]#.
 
     hintTextTable[RHT_MARKET_TREASURE_CHEST_GAME_ITEM_2] = HintText(CustomMessage("They say that the #second locked room# in the chest game contains #[[1]]#.",
-                                                                       /*german*/ "",
+                                                                       /*german*/ "Man erzählt sich, daß der #zweite verschlossene Raum# im Schatzkisten-Poker #[[1]]# enthielte.",
                                                                        /*french*/ "Selon moi, la #deuxième salle# de la Chasse-aux-Trésors contient #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                     // /*spanish*/#en la segunda sala del Cofre del Tesoro# aguarda #[[1]]#.
                                                                     {},
                                                                     {CustomMessage("They say that #gambling twice# grants #[[1]]#.",
-                                                                        /*german*/ "",
+                                                                        /*german*/ "Man erzählt sich, daß #zweimaliges Glücksspiel# #[[1]]# gewähre.",
                                                                         /*french*/ "Selon moi, #parier deux fois# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                      // /*spanish*/#apostar dos veces# revelará #[[1]]#.
                                                                      CustomMessage("They say that the #third or fourth game chest# contains #[[1]]#.",
-                                                                        /*german*/ "",
+                                                                        /*german*/ "Man erzählt sich, daß die #dritte oder vierte Schatzkiste im Spiel# #[[1]]# enthielte.",
                                                                         /*french*/ "Selon moi, le #troisième ou quatrième coffre à jeu# contient #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                      // /*spanish*/#el tercer o cuarto cofre del azar# revela #[[1]]#.
 
     hintTextTable[RHT_MARKET_TREASURE_CHEST_GAME_ITEM_3] = HintText(CustomMessage("They say that the #third locked room# in the chest game contains #[[1]]#.",
-                                                                       /*german*/ "",
+                                                                       /*german*/ "Man erzählt sich, daß der #dritte verschlossene Raum# im Schatzkisten-Poker #[[1]]# enthielte.",
                                                                        /*french*/ "Selon moi, la #troisième salle# de la Chasse-aux-Trésors contient #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                     // /*spanish*/#en la tercera sala del Cofre del Tesoro# aguarda #[[1]]#.
                                                                     {},
                                                                     {CustomMessage("They say that #gambling 3 times# grants #[[1]]#.",
-                                                                        /*german*/ "",
+                                                                        /*german*/ "Man erzählt sich, daß #dreimaliges Glücksspiel# #[[1]]# gewähre.",
                                                                         /*french*/ "Selon moi, #parier trois fois# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                      // /*spanish*/#apostar tres veces# revelará #[[1]]#.
                                                                      CustomMessage("They say that the #fifth or sixth game chest# contains #[[1]]#.",
-                                                                        /*german*/ "",
+                                                                        /*german*/ "Man erzählt sich, daß die #fünfte oder sechste Schatzkiste im Spiel# #[[1]]# enthielte.",
                                                                         /*french*/ "Selon moi, le #cinquième ou sixième coffre à jeu# contient #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                      // /*spanish*/#el quinto o sexto cofre del azar# revela #[[1]]#.
 
     hintTextTable[RHT_MARKET_TREASURE_CHEST_GAME_ITEM_4] = HintText(CustomMessage("They say that the #fourth locked room# in the chest game contains #[[1]]#.",
-                                                                       /*german*/ "",
+                                                                       /*german*/ "Man erzählt sich, daß der #vierte verschlossene Raum# im Schatzkisten-Poker #[[1]]# enthielte.",
                                                                        /*french*/ "Selon moi, la #quatrième salle# de la Chasse-aux-Trésors contient #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                     // /*spanish*/#en la cuarta sala del Cofre del Tesoro# aguarda #[[1]]#.
                                                                     {},
                                                                     {CustomMessage("They say that #gambling 4 times# grants #[[1]]#.",
-                                                                        /*german*/ "",
+                                                                        /*german*/ "Man erzählt sich, daß #viermaliges Glücksspiel# #[[1]]# gewähre.",
                                                                         /*french*/ "Selon moi, #parier quatre fois# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                      // /*spanish*/#apostar cuatro veces# revelará #[[1]]#.
                                                                      CustomMessage("They say that the #seventh or eighth game chest# contains #[[1]]#.",
-                                                                        /*german*/ "",
+                                                                        /*german*/ "Man erzählt sich, daß die #siebente oder achte Schatzkiste im Spiel# #[[1]]# enthielte.",
                                                                         /*french*/ "Selon moi, le #septième ou huitième coffre à jeu# contient #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                      // /*spanish*/#el séptimo u octavo cofre del azar# revela #[[1]]#.
 
     hintTextTable[RHT_MARKET_TREASURE_CHEST_GAME_ITEM_5] = HintText(CustomMessage("They say that the #fifth locked room# in the chest game contains #[[1]]#.",
-                                                                       /*german*/ "",
+                                                                       /*german*/ "Man erzählt sich, daß der #fünfte verschlossene Raum# im Schatzkisten-Poker #[[1]]# enthielte.",
                                                                        /*french*/ "Selon moi, la #cinquième salle# de la Chasse-aux-Trésors contient #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                     // /*spanish*/#en la quinta sala del Cofre del Tesoro# aguarda #[[1]]#.
                                                                     {},
                                                                     {CustomMessage("They say that #gambling 5 times# grants #[[1]]#.",
-                                                                        /*german*/ "",
+                                                                        /*german*/ "Man erzählt sich, daß #fünfmaliges Glücksspiel# #[[1]]# gewähre.",
                                                                         /*french*/ "Selon moi, #parier cinq fois# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                      // /*spanish*/#apostar cinco veces# revelará #[[1]]#.
                                                                      CustomMessage("They say that the #ninth or tenth game chest# contains #[[1]]#.",
-                                                                        /*german*/ "",
+                                                                        /*german*/ "Man erzählt sich, daß die #neunte oder zehnte Schatzkiste im Spiel# #[[1]]# enthielte.",
                                                                         /*french*/ "Selon moi, le #neuvième ou dixième coffre à jeu# contient #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                      // /*spanish*/#el noveno o décimo cofre del azar# revela #[[1]]#.
 
    hintTextTable[RHT_MARKET_TREASURE_CHEST_GAME_KEY_1] = HintText(CustomMessage("They say that the #first locked room# in the chest game contains #[[1]]#.",
-                                                                       /*german*/ "",
+                                                                       /*german*/ "Man erzählt sich, daß der #erste verschlossene Raum# im Schatzkisten-Poker #[[1]]# enthielte.",
                                                                        /*french*/ "Selon moi, la #première salle# de la Chasse-aux-Trésors contient #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                     // /*spanish*/#en la primera sala del Cofre del Tesoro# aguarda #[[1]]#.
                                                                     {},
                                                                     {CustomMessage("They say that #gambling once# grants #[[1]]#.",
-                                                                        /*german*/ "",
+                                                                        /*german*/ "Man erzählt sich, daß #einmaliges Glücksspiel# #[[1]]# gewähre.",
                                                                         /*french*/ "Selon moi, #parier une fois# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                      // /*spanish*/#apostar solo una vez# revelará #[[1]]#.
                                                                      CustomMessage("They say that the #first or second game chest# contains #[[1]]#.",
-                                                                        /*german*/ "",
+                                                                        /*german*/ "Man erzählt sich, daß das #erste oder zweite Schatzkiste im Spiel# #[[1]]# enthielte.",
                                                                         /*french*/ "Selon moi, le #premier ou deuxième coffre à jeu# contient #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                      // /*spanish*/#el primer o segundo cofre del azar# revela #[[1]]#.
 
     hintTextTable[RHT_MARKET_TREASURE_CHEST_GAME_KEY_2] = HintText(CustomMessage("They say that the #second locked room# in the chest game contains #[[1]]#.",
-                                                                       /*german*/ "",
+                                                                       /*german*/ "Man erzählt sich, daß der #zweite verschlossene Raum# im Schatzkisten-Poker #[[1]]# enthielte.",
                                                                        /*french*/ "Selon moi, la #deuxième salle# de la Chasse-aux-Trésors contient #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                     // /*spanish*/#en la segunda sala del Cofre del Tesoro# aguarda #[[1]]#.
                                                                     {},
                                                                     {CustomMessage("They say that #gambling twice# grants #[[1]]#.",
-                                                                        /*german*/ "",
+                                                                        /*german*/ "Man erzählt sich, daß #zweimaliges Glücksspiel# #[[1]]# gewähre.",
                                                                         /*french*/ "Selon moi, #parier deux fois# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                      // /*spanish*/#apostar dos veces# revelará #[[1]]#.
                                                                      CustomMessage("They say that the #third or fourth game chest# contains #[[1]]#.",
-                                                                        /*german*/ "",
+                                                                        /*german*/ "Man erzählt sich, daß das #dritte oder vierte Schatzkiste im Spiel# #[[1]]# enthielte.",
                                                                         /*french*/ "Selon moi, le #troisième ou quatrième coffre à jeu# contient #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                      // /*spanish*/#el tercer o cuarto cofre del azar# revela #[[1]]#.
 
     hintTextTable[RHT_MARKET_TREASURE_CHEST_GAME_KEY_3] = HintText(CustomMessage("They say that the #third locked room# in the chest game contains #[[1]]#.",
-                                                                       /*german*/ "",
+                                                                       /*german*/ "Man erzählt sich, daß der #dritte verschlossene Raum# im Schatzkisten-Poker #[[1]]# enthielte.",
                                                                        /*french*/ "Selon moi, la #troisième salle# de la Chasse-aux-Trésors contient #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                     // /*spanish*/#en la tercera sala del Cofre del Tesoro# aguarda #[[1]]#.
                                                                     {},
                                                                     {CustomMessage("They say that #gambling 3 times# grants #[[1]]#.",
-                                                                        /*german*/ "",
+                                                                        /*german*/ "Man erzählt sich, daß #dreimaliges Glücksspiel# #[[1]]# gewähre.",
                                                                         /*french*/ "Selon moi, #parier trois fois# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                      // /*spanish*/#apostar tres veces# revelará #[[1]]#.
                                                                      CustomMessage("They say that the #fifth or sixth game chest# contains #[[1]]#.",
-                                                                        /*german*/ "",
+                                                                        /*german*/ "Man erzählt sich, daß das #fünfte oder sechste Schatzkiste im Spiel# #[[1]]# enthielte.",
                                                                         /*french*/ "Selon moi, le #cinquième ou sixième coffre à jeu# contient #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                      // /*spanish*/#el quinto o sexto cofre del azar# revela #[[1]]#.
 
     hintTextTable[RHT_MARKET_TREASURE_CHEST_GAME_KEY_4] = HintText(CustomMessage("They say that the #fourth locked room# in the chest game contains #[[1]]#.",
-                                                                       /*german*/ "",
+                                                                       /*german*/ "Man erzählt sich, daß der #vierte verschlossene Raum# im Schatzkisten-Poker #[[1]]# enthielte.",
                                                                        /*french*/ "Selon moi, la #quatrième salle# de la Chasse-aux-Trésors contient #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                     // /*spanish*/#en la cuarta sala del Cofre del Tesoro# aguarda #[[1]]#.
                                                                     {},
                                                                     {CustomMessage("They say that #gambling 4 times# grants #[[1]]#.",
-                                                                        /*german*/ "",
+                                                                        /*german*/ "Man erzählt sich, daß #viermaliges Glücksspiel# #[[1]]# gewähre.",
                                                                         /*french*/ "Selon moi, #parier quatre fois# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                      // /*spanish*/#apostar cuatro veces# revelará #[[1]]#.
                                                                      CustomMessage("They say that the #seventh or eighth game chest# contains #[[1]]#.",
-                                                                        /*german*/ "",
+                                                                        /*german*/ "Man erzählt sich, daß das #siebente oder achte Schatzkiste im Spiel# #[[1]]# enthielte.",
                                                                         /*french*/ "Selon moi, le #septième ou huitième coffre à jeu# contient #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                      // /*spanish*/#el séptimo u octavo cofre del azar# revela #[[1]]#.
 
     hintTextTable[RHT_MARKET_TREASURE_CHEST_GAME_KEY_5] = HintText(CustomMessage("They say that the #fifth locked room# in the chest game contains #[[1]]#.",
-                                                                       /*german*/ "",
+                                                                       /*german*/ "Man erzählt sich, daß der #fünfte verschlossene Raum# im Schatzkisten-Poker #[[1]]# enthielte.",
                                                                        /*french*/ "Selon moi, la #cinquième salle# de la Chasse-aux-Trésors contient #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                     // /*spanish*/#en la quinta sala del Cofre del Tesoro# aguarda #[[1]]#.
                                                                     {},
                                                                     {CustomMessage("They say that #gambling 5 times# grants #[[1]]#.",
-                                                                        /*german*/ "",
+                                                                        /*german*/ "Man erzählt sich, daß #fünfmaliges Glücksspiel# #[[1]]# gewähre.",
                                                                         /*french*/ "Selon moi, #parier cinq fois# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                      // /*spanish*/#apostar cinco veces# revelará #[[1]]#.
                                                                      CustomMessage("They say that the #ninth or tenth game chest# contains #[[1]]#.",
-                                                                        /*german*/ "",
+                                                                        /*german*/ "Man erzählt sich, daß die #neunte oder zehnte Schatzkiste im Spiel# #[[1]]# enthielte.",
                                                                         /*french*/ "Selon moi, le #neuvième ou dixième coffre à jeu# contient #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                      // /*spanish*/#el noveno o décimo cofre del azar# revela #[[1]]#.
 
     hintTextTable[RHT_GF_HBA_1500_POINTS] = HintText(CustomMessage("They say that scoring 1500 in #horseback archery# grants #[[1]]#.",
-                                                        /*german*/ "",
+                                                        /*german*/ "Man erzählt sich, daß das Erzielen von 1500 Punkten beim #Bogenschießen zu Pferde# #[[1]]# gewähre.",
                                                         /*french*/ "Selon moi, obtenir 1500 points dans l'#archerie équestre# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                      // /*spanish*/conseguir 1500 puntos en el #tiro con arco a caballo# premia #[[1]]#.
                                                      {},
                                                      {CustomMessage("They say that mastery of #horseback archery# grants #[[1]]#.",
-                                                         /*german*/ "",
+                                                         /*german*/ "Man erzählt sich, daß das Meistern des #Bogenschießens zu Pferde# #[[1]]# gewähre.",
                                                          /*french*/ "Selon moi, maîtriser l'#archerie équestre# donne #[[1]]#.", {QM_RED, QM_GREEN})});
                                                       // /*spanish*/dominar el #tiro con arco a caballo# premia con #[[1]]#.
 
     hintTextTable[RHT_GRAVEYARD_HEART_PIECE_GRAVE_CHEST] = HintText(CustomMessage("They say that playing #Sun's Song# in a grave spawns #[[1]]#.",
-                                                                       /*german*/ "",
+                                                                       /*german*/ "Man erzählt sich, daß das Spielen der #Hymne der Sonne# in einem Grab, #[[1]]# erscheinen ließe.",
                                                                        /*french*/ "Selon moi, jouer le #chant du soleil# dans un tombeau donne #[[1]]#.", {QM_RED, QM_GREEN})),
                                                                     // /*spanish*/#tocar la Canción del Sol# en una cripta conduce a #[[1]]#.
 
     hintTextTable[RHT_GC_MAZE_LEFT_CHEST] = HintText(CustomMessage("They say that in #Goron City# the hammer unlocks #[[1]]#.",
-                                                        /*german*/ "",
+                                                        /*german*/ "Man erzählt sich, daß der Hammer in #Goronia# #[[1]]# freilege.",
                                                         /*french*/ "Selon moi, dans le #village Goron#, le marteau donne accès à #[[1]]#.", {QM_RED, QM_GREEN})),
                                                      // /*spanish*/en la #Ciudad Goron# el martillo desbloquea #[[1]]#.
 
     hintTextTable[RHT_GV_CHEST] = HintText(CustomMessage("They say that in #Gerudo Valley# the hammer unlocks #[[1]]#.",
-                                              /*german*/ "",
+                                              /*german*/ "Man erzählt sich, daß der Hammer im #Gerudotal# #[[1]]# freilege.",
                                               /*french*/ "Selon moi, dans la #Vallée Gerudo#, le marteau donne accès à #[[1]]#.", {QM_RED, QM_GREEN})),
                                            // /*spanish*/en el #Valle Gerudo# el martillo desbloquea #[[1]]#.
 
-
     hintTextTable[RHT_GV_TRADE_SAW] = HintText(CustomMessage("They say that the #boss of the carpenters# leaves #[[1]]#.",
-                                                  /*german*/ "",
+                                                  /*german*/ "Man erzählt sich, daß der #Chef der Zimmerleute# #[[1]]# hinterließe.",
                                                   /*french*/ "Selon moi, le #patron des ouvriers# laisse #[[1]]#.", {QM_RED, QM_GREEN})),
                                                // /*spanish*/el #capataz de los carpinteros# otorga #[[1]]#.
 
     hintTextTable[RHT_GV_COW] = HintText(CustomMessage("They say that a #cow in Gerudo Valley# gifts #[[1]]#.",
-                                            /*german*/ "",
+                                            /*german*/ "Man erzählt sich, daß eine #Kuh im Gerudotal# #[[1]]# schenke.",
                                             /*french*/ "Selon moi, la #vache de la Vallée Gerudo# donne #[[1]]#.", {QM_RED, QM_GREEN})),
                                          // /*spanish*/una #vaca del Valle Gerudo# brinda #[[1]]#.
 
     hintTextTable[RHT_HC_GS_STORMS_GROTTO] = HintText(CustomMessage("They say that a #spider behind a muddy wall# in a grotto holds #[[1]]#.",
-                                                         /*german*/ "",
+                                                         /*german*/ "Man erzählt sich, daß eine #Spinne hinter einer schlammigen Wand# in einer Grotte #[[1]]# hielte.",
                                                          /*french*/ "Selon moi, l'#araignée derrière un mur de boue# dans une grotte donne #[[1]]#.", {QM_RED, QM_GREEN})),
                                                       // /*spanish*/una #Skulltula tras la agrietada pared# de una cueva otorga #[[1]]#.
 
     hintTextTable[RHT_HF_GS_COW_GROTTO] = HintText(CustomMessage("They say that a #spider behind webs# in a grotto holds #[[1]]#.",
-                                                      /*german*/ "",
+                                                      /*german*/ "Man erzählt sich, daß eine #Spinne hinter Weben# in einer Grotte #[[1]]# hielte.",
                                                       /*french*/ "Selon moi, l'#araignée derrière une toile# dans une grotte donne #[[1]]#.", {QM_RED, QM_GREEN})),
                                                    // /*spanish*/una #Skulltula tras la telaraña# de una cueva otorga #[[1]]#.
 
     hintTextTable[RHT_HF_COW_GROTTO_COW] = HintText(CustomMessage("They say that a #cow behind webs# in a grotto gifts #[[1]]#.",
-                                                       /*german*/ "",
+                                                       /*german*/ "Man erzählt sich, daß eine #Kuh hinter Weben# in einer Grotte #[[1]]# hielte.",
                                                        /*french*/ "Selon moi, la #vache derrière les toiles# d'une grotte donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                     // /*spanish*/una #vaca tras la telaraña# de una cueva brinda #[[1]]#.
                                                     {},
                                                     {CustomMessage("They say that the #cobwebbed cow# gifts #[[1]]#.",
-                                                        /*german*/ "",
+                                                        /*german*/ "Man erzählt sich, daß die #in Spinnweben eingehüllte Kuh# #[[1]]# schenke.",
                                                         /*french*/ "Selon moi, la #vache prisonnière d'araignées# donne #[[1]]#.", {QM_RED, QM_GREEN})});
                                                      // /*spanish*/una #vaca tras una telaraña# brinda #[[1]]#.
 
     hintTextTable[RHT_ZR_FROGS_OCARINA_GAME] = HintText(CustomMessage("They say that the final reward from the #Frogs of Zora's River# is #[[1]]#.",
-                                                           /*german*/ "",
+                                                           /*german*/ "Man erzählt sich, daß die letzte Belohnung der #Frösche des Zora-Flußes# #[[1]]# sei.",
                                                            /*french*/ "Selon moi, la dernière récompense des #grenouilles de la Rivière Zora# est #[[1]]#.", {QM_RED, QM_GREEN}),
                                                         // /*spanish*/la recompensa final de las #ranas del Río Zora# premia #[[1]]#.
                                                         {},
                                                         {CustomMessage("They say that an #amphibian feast# yields #[[1]]#.",
-                                                            /*german*/ "",
+                                                            /*german*/ "Man erzählt sich, daß ein #amphibisches Bankett# #[[1]]# einbrächte.",
                                                             /*french*/ "Selon moi, un #festin d'amphibiens# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                          // /*spanish*/una #fiesta anfibia# brinda #[[1]]#.
                                                          CustomMessage("They say that the #croaking choir's magnum opus# awards #[[1]]#.",
-                                                            /*german*/ "",
+                                                            /*german*/ "Man erzählt sich, daß das #Opus magnum eines quakenden Chors# #[[1]]# verleihe.",
                                                             /*french*/ "Selon moi, la #chorale coassante# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                          // /*spanish*/un #coro maestro de ancas# premia #[[1]]#.
                                                          CustomMessage("They say that the #froggy finale# yields #[[1]]#.",
-                                                            /*german*/ "",
+                                                            /*german*/ "Man erzählt sich, daß das #froschige Finale# #[[1]]# einbrächte.",
                                                             /*french*/ "Selon moi, la #finale amphibienne# donne #[[1]]#.", {QM_RED, QM_GREEN})});
                                                          // /*spanish*/el #gran final batracio# brinda #[[1]]#.
 
     hintTextTable[RHT_ZF_GS_HIDDEN_CAVE] = HintText(CustomMessage("They say that a spider high #above the icy waters# holds #[[1]]#.",
-                                                       /*german*/ "",
+                                                       /*german*/ "Man erzählt sich, daß eine Spinne hoch #auf den eisigen Gewässern# #[[1]]# hielte.",
                                                        /*french*/ "Selon moi, l'araignée #en haut des eaux glacées# donne #[[1]]#.", {QM_RED, QM_GREEN})),
                                                     // /*spanish*/una Skulltula en lo #alto de las congeladas aguas# otorga #[[1]]#.
 
     hintTextTable[RHT_WASTELAND_CHEST] = HintText(CustomMessage("They say that #deep in the wasteland# is #[[1]]#.",
-                                                     /*german*/ "",
+                                                     /*german*/ "Man erzählt sich, daß #tief im Ödland# #[[1]]# sei.",
                                                      /*french*/ "Selon moi, #loin dans le désert# gît #[[1]]#.", {QM_RED, QM_GREEN})),
                                                   // /*spanish*/en lo #profundo del desierto encantado# yace #[[1]]#.
 
     hintTextTable[RHT_WASTELAND_GS] = HintText(CustomMessage("They say that a #spider in the wasteland# holds #[[1]]#.",
-                                                  /*german*/ "",
+                                                  /*german*/ "Man erzählt sich, daß eine #Spinne im Ödland# #[[1]]# hielte.",
                                                   /*french*/ "Selon moi, #l'araignée dans le désert# donne #[[1]]#.", {QM_RED, QM_GREEN})),
                                                // /*spanish*/una #Skulltula del desierto encantado# otorga #[[1]]#.
 
     hintTextTable[RHT_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST] = HintText(CustomMessage("They say that #flames in the Composers' Grave# reveal #[[1]]#.",
-                                                                        /*german*/ "",
+                                                                        /*german*/ "Man erzählt sich, daß die #Flammen im Grab des Komponisten# #[[1]]# enthüllen würde.",
                                                                         /*french*/ "Selon moi, #les flammes dans le tombeau des compositeurs# cachent #[[1]]#.", {QM_RED, QM_GREEN})),
                                                                      // /*spanish*/#las llamas del Panteón Real# revelan #[[1]]#.
 
     hintTextTable[RHT_ZF_BOTTOM_FREESTANDING_POH] = HintText(CustomMessage("They say that #under the icy waters# lies #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß #unter den eisigen Gewässern# #[[1]]# läge.",
                                                                 /*french*/ "Selon moi, #sous les eaux glacées# se cache #[[1]]#.", {QM_RED, QM_GREEN})),
                                                              // /*spanish*/#bajo las congeladas aguas# yace #[[1]]#.
 
     hintTextTable[RHT_GC_POT_FREESTANDING_POH] = HintText(CustomMessage("They say that spinning #Goron pottery# contains #[[1]]#.",
-                                                             /*german*/ "",
+                                                             /*german*/ "Man erzählt sich, daß die drehende #Goronenkeramik# #[[1]]# enthielte.",
                                                              /*french*/ "Selon moi, la #potterie Goron# contient #[[1]]#.", {QM_RED, QM_GREEN})),
                                                           // /*spanish*/una #cerámica goron# contiene #[[1]]#.
 
     hintTextTable[RHT_ZD_KING_ZORA_THAWED] = HintText(CustomMessage("They say that unfreezing #King Zora# grants #[[1]]#.",
-                                                         /*german*/ "",
-                                                         /*french*/ "Selon moi, dégeler # le Roi Zora# donne #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                         /*german*/ "Man erzählt sich, daß das Auftauen #König Zoras# #[[1]]# gewähre.",
+                                                         /*french*/ "Selon moi, dégeler #le Roi Zora# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                       // /*spanish*/#descongelar al Rey Zora# conduce a #[[1]]#.
                                                       {},
                                                       {CustomMessage("They say that a #defrosted dignitary# gifts #[[1]]#.",
-                                                          /*german*/ "",
+                                                          /*german*/ "Man erzählt sich, daß ein #enteister Würdenträger# #[[1]]# schenke.",
                                                           /*french*/ "Selon moi, le #monarque libéré# donne #[[1]]#.", {QM_RED, QM_GREEN})});
                                                        // /*spanish*/una #liberación monárquica# brinda #[[1]]#.
 
     hintTextTable[RHT_ZD_TRADE_PRESCRIPTION] = HintText(CustomMessage("They say that #King Zora# hurriedly entrusts #[[1]]#.",
-                                                           /*german*/ "",
+                                                           /*german*/ "Man erzählt sich, daß #König Zora# #[[1]]# zügig anvertraue.",
                                                            /*french*/ "Selon moi, le #roi Zora# confie rapidement #[[1]]#.", {QM_RED, QM_GREEN})),
                                                         // /*spanish*/el #Rey Zora# otorga con prisa #[[1]]#.
 
     hintTextTable[RHT_DMC_DEKU_SCRUB] = HintText(CustomMessage("They say that a single #scrub in the crater# sells #[[1]]#.",
-                                                    /*german*/ "",
+                                                    /*german*/ "Man erzählt sich, daß ein einzelner #Deku im Krater# #[[1]]# verkaufe.",
                                                     /*french*/ "Selon moi, la #peste Mojo dans le cratère# vend #[[1]]#.", {QM_RED, QM_GREEN})),
                                                  // /*spanish*/un solitario #deku del cráter# vende #[[1]]#.
     hintTextTable[RHT_DMC_GS_CRATE] = HintText(CustomMessage("They say that a spider under a #crate in the crater# holds #[[1]]#.",
-                                                  /*german*/ "",
+                                                  /*german*/ "Man erzählt sich, daß eine Spinne unter einer #Kiste im Krater# #[[1]]# hielte.",
                                                   /*french*/ "Selon moi, la Skulltula dans une #boîte volcanique# a #[[1]]#.", {QM_RED, QM_GREEN})),
                                                // /*spanish*/una Skulltula bajo una #caja del cráter# otorga #[[1]]#.
 
     hintTextTable[RHT_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST] = HintText(CustomMessage("They say that a #temporal stone within the Deku Tree# contains #[[1]]#.",
-                                                                           /*german*/ "",
+                                                                           /*german*/ "Man erzählt sich, daß ein #zeitlicher Stein innerhalb des Deku-Baums# #[[1]]# enthielte.",
                                                                            /*french*/ "Selon moi, la #pierre temporelle dans l'Arbre Mojo# cache #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                         // /*spanish*/un #bloque temporal del Gran Árbol Deku# contiene #[[1]]#.
                                                                         {},
                                                                         {CustomMessage("They say that a #temporal stone within a tree# contains #[[1]]#.",
-                                                                            /*german*/ "",
+                                                                            /*german*/ "Man erzählt sich, daß ein #zeitlicher Stein innerhalb eines Baums# #[[1]]# enthielte.",
                                                                             /*french*/ "Selon moi, la #pierre bleue dans un arbre# mène à #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                          // /*spanish*/un #bloque temporal de un árbol# contiene #[[1]]#.
 
-
     hintTextTable[RHT_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM] = HintText(CustomMessage("They say that a #spider on a ceiling in the Deku Tree# holds #[[1]]#.",
-                                                                          /*german*/ "",
-                                                                          /*french*/ "Selon moi, la#Skulltula dans le Cimetière de l'Arbre Mojo# a #[[1]]#.", {QM_RED, QM_GREEN}),
+                                                                          /*german*/ "Man erzählt sich, daß eine #Spinne an einer Decke im Deku-Baum# #[[1]]# hielte.",
+                                                                          /*french*/ "Selon moi, la #Skulltula dans le Cimetière de l'Arbre Mojo# a #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                        // /*spanish*/una #Skulltula en el techo del Gran Árbol Deku# otorga #[[1]]#.
                                                                        {},
                                                                        {CustomMessage("They say that a #spider on a ceiling in a tree# holds #[[1]]#.",
-                                                                           /*german*/ "",
+                                                                           /*german*/ "Man erzählt sich, daß eine #Spinne an einer Decke in einem Baum# #[[1]]# hielte.",
                                                                            /*french*/ "Selon moi, l'#araignée haut-perchée dans un arbre# a #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                         // /*spanish*/una #Skulltula en el techo de un árbol# otorga #[[1]]#.
 
     hintTextTable[RHT_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM] = HintText(CustomMessage("They say that a spider under #temporal stones in Dodongo's Cavern# holds #[[1]]#.",
-                                                                                   /*german*/ "",
+                                                                                   /*german*/ "Man erzählt sich, daß eine Spinne unter #zeitlichen Steinen in Dodongos Höhle# #[[1]]# hielte.",
                                                                                    /*french*/ "Selon moi, la Skulltula sous #la pierre temporelle dans la Caverne Dodongo# a #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                                 // /*spanish*/una Skulltula bajo #bloques temporales de la Cueva de los Dodongos# otorga #[[1]]#.
                                                                                 {},
                                                                                 {CustomMessage("They say that a spider under #temporal stones in a cavern# holds #[[1]]#.",
-                                                                                    /*german*/ "",
+                                                                                    /*german*/ "Man erzählt sich, daß eine Spinne unter #zeitlichen Steinen in einer Kaverne# #[[1]]# hielte.",
                                                                                     /*french*/ "Selon moi, l'araignée sous #une pierre bleue dans une caverne# a #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                                  // /*spanish*/una Skulltula bajo #bloques temporales de una cueva# otorga #[[1]]#.
 
-
     hintTextTable[RHT_JABU_JABUS_BELLY_BOOMERANG_CHEST] = HintText(CustomMessage("They say that a school of #stingers swallowed by Jabu-Jabu# guard #[[1]]#.",
-                                                                      /*german*/ "",
+                                                                      /*german*/ "Man erzählt sich, daß ein #von Jabu-Jabu verschluckter Rochenschwarm# #[[1]]# bewache.",
                                                                       /*french*/ "Selon moi, les #raies dans Jabu-Jabu# protègent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                    // /*spanish*/unos #stingers engullidos por Jabu-Jabu# guardan #[[1]]#.
                                                                    {},
                                                                    {CustomMessage("They say that a school of #stingers swallowed by a deity# guard #[[1]]#.",
-                                                                       /*german*/ "",
+                                                                       /*german*/ "Man erzählt sich, daß ein #von einer Gottheit verschluckter Rochenschwarm# #[[1]]# bewache.",
                                                                        /*french*/ "Selon moi, les #raies dans un gardien# protègent #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                     // /*spanish*/unos de #stingers engullidos por cierta deidad# guardan #[[1]]#.
 
     hintTextTable[RHT_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM] = HintText(CustomMessage("They say that a spider surrounded by #shadows in Jabu-Jabu's Belly# holds #[[1]]#.",
-                                                                                   /*german*/ "",
+                                                                                   /*german*/ "Man erzählt sich, daß eine von #Schatten in Jabu-Jabus Bauch# umgebene Spinne #[[1]]# hielte.",
                                                                                    /*french*/ "Selon moi, la Skulltula entourée d'#ombres dans Jabu-Jabu# possède #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                                 // /*spanish*/una Skulltula rodeada de #sombras en la Tripa de Jabu-Jabu# otorga #[[1]]#.
                                                                                 {},
                                                                                 {CustomMessage("They say that a spider surrounded by #shadows in the belly of a deity# holds #[[1]]#.",
-                                                                                    /*german*/ "",
+                                                                                    /*german*/ "Man erzählt sich, daß eine von #Schatten im Bauch einer Gottheit# umgebene Spinne #[[1]]# hielte.",
                                                                                     /*french*/ "Selon moi, l'araignée entourée d'#ombres dans le ventre du gardien# possède #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                                  // /*spanish*/una Skulltula rodeada de #sombras en la tripa de cierta diedad# otorga #[[1]]#.
 
-
     hintTextTable[RHT_JABU_JABUS_BELLY_MQ_COW] = HintText(CustomMessage("They say that a #cow swallowed by Jabu-Jabu# gifts #[[1]]#.",
-                                                             /*german*/ "",
+                                                             /*german*/ "Man erzählt sich, daß eine #von Jabu-Jabu verschluckte Kuh# #[[1]]# schenke.",
                                                              /*french*/ "Selon moi, la #vache avallée par Jabu-Jabu# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                           // /*spanish*/una #vaca engullida por Jabu-Jabu# brinda #[[1]]#.
                                                           {},
                                                           {CustomMessage("They say that a #cow swallowed by a deity# gifts #[[1]]#.",
-                                                              /*german*/ "",
+                                                              /*german*/ "Man erzählt sich, daß eine #von einer Gottheit verschluckte Kuh# #[[1]]# schenke.",
                                                               /*french*/ "Selon moi, la #vache dans le gardien# donne #[[1]]#.", {QM_RED, QM_GREEN})});
                                                            // /*spanish*/una #vaca engullida por cierta deidad# brinda #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_SCARECROW_CHEST] = HintText(CustomMessage("They say that #Pierre atop the Fire Temple# hides #[[1]]#.",
-                                                                 /*german*/ "",
+                                                                 /*german*/ "Man erzählt sich, daß #Pierre auf der Spitze des Feuertempels# #[[1]]# verstecke.",
                                                                  /*french*/ "Selon moi, #Pierre au sommet du Temple du Feu# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                               // /*spanish*/#Pierre en lo alto del Templo del Fuego# esconde #[[1]]#.
                                                               {},
                                                               {CustomMessage("They say that a #scarecrow atop the volcano# hides #[[1]]#.",
-                                                                  /*german*/ "",
+                                                                  /*german*/ "Man erzählt sich, daß eine #Vogelscheuche auf der Spitze des Vulkans# #[[1]]# verstecke.",
                                                                   /*french*/ "Selon moi, l'#épouvantail au sommet d'un volcan# donne #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                // /*spanish*/un #espantapájaros en lo alto del volcán# esconde #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_MEGATON_HAMMER_CHEST] = HintText(CustomMessage("They say that the #Flare Dancer atop the Fire Temple# guards a chest containing #[[1]]#.",
-                                                                      /*german*/ "",
+                                                                      /*german*/ "Man erzählt sich, daß der #Flammenderwisch auf der Spitze des Feuertempels# eine Truhe bewache, welche #[[1]]# enthielte.",
                                                                       /*french*/ "Selon moi, le #Danse-Flamme au sommet du Temple du Feu# protège #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                    // /*spanish*/el #Bailaguego en lo alto del Templo del Fuego# otorga #[[1]]#.
                                                                    {},
                                                                    {CustomMessage("They say that the #Flare Dancer atop the volcano# guards a chest containing #[[1]]#.",
-                                                                       /*german*/ "",
+                                                                       /*german*/ "Man erzählt sich, daß der #Flammenderwisch auf der Spitze des Vulkans# eine Truhe bewache, welche #[[1]]# enthielte.",
                                                                        /*french*/ "Selon moi, le #danseur au sommet du volcan# protège #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                     // /*spanish*/el #Bailafuego en lo alto del volcán# otorga #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_MQ_CHEST_ON_FIRE] = HintText(CustomMessage("They say that the #Flare Dancer atop the Fire Temple# guards a chest containing #[[1]]#.",
-                                                                  /*german*/ "",
+                                                                  /*german*/ "Man erzählt sich, daß der #Flammenderwisch auf der Spitze des Feuertempels# eine Truhe bewache, welche #[[1]]# enthielte.",
                                                                   /*french*/ "Selon moi, le #Danse-Flamme au sommet du Temple du Feu# protège #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                // /*spanish*/el #Bailafuego en lo alto del Templo del Fuego# otorga #[[1]]#.
                                                                {},
                                                                {CustomMessage("They say that the #Flare Dancer atop the volcano# guards a chest containing #[[1]]#.",
-                                                                   /*german*/ "",
+                                                                   /*german*/ "Man erzählt sich, daß der #Flammenderwisch auf der Spitze des Vulkans# eine Truhe bewache, welche #[[1]]# enthielte.",
                                                                    /*french*/ "Selon moi, le #danseur au sommet du volcan# protège #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                 // /*spanish*/el #Bailafuego en lo alto del volcán# otorga #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE] = HintText(CustomMessage("They say that a #spider under a block in the Fire Temple# holds #[[1]]#.",
-                                                                     /*german*/ "",
+                                                                     /*german*/ "Man erzählt sich, daß eine #Spinne unter einem Block im Feuertempel# #[[1]]# hielte.",
                                                                      /*french*/ "Selon moi, une #Skulltula sous un bloc dans le Temple du Feu# a #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                   // /*spanish*/una #Skulltula bajo un bloque del Templo del Fuego# otorga #[[1]]#.
                                                                   {},
                                                                   {CustomMessage("They say that a #spider under a block in the volcano# holds #[[1]]#.",
-                                                                      /*german*/ "",
+                                                                      /*german*/ "Man erzählt sich, daß eine #Spinne unter einem Block im Vulkan# #[[1]]# hielte.",
                                                                       /*french*/ "Selon moi, l'#araignée sous un bloc dans le volcan# a #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                    // /*spanish*/una #Skulltula bajo el bloque de un volcán# otorga #[[1]]#.
 
-
     hintTextTable[RHT_WATER_TEMPLE_RIVER_CHEST] = HintText(CustomMessage("They say that beyond the #river in the Water Temple# waits #[[1]]#.",
-                                                              /*german*/ "",
+                                                              /*german*/ "Man erzählt sich, daß jenseits des #Flußes im Wassertempel# #[[1]]# warte.",
                                                               /*french*/ "Selon moi, au delà de #la rivière dans le Temple de l'Eau# se cache #[[1]]#.", {QM_RED, QM_GREEN}),
                                                            // /*spanish*/tras el #río del Templo del Agua# yace #[[1]]#.
                                                            {},
                                                            {CustomMessage("They say that beyond the #river under the lake# waits #[[1]]#.",
-                                                               /*german*/ "",
+                                                               /*german*/ "Man erzählt sich, daß jenseits des #Flußes unter dem See# #[[1]]# warte.",
                                                                /*french*/ "Selon moi, au delà de #la rivière sous le lac# se cache #[[1]]#.", {QM_RED, QM_GREEN})});
                                                             // /*spanish*/tras el #río bajo el lago# yace #[[1]]#.
 
     hintTextTable[RHT_WATER_TEMPLE_BOSS_KEY_CHEST] = HintText(CustomMessage("They say that dodging #rolling boulders in the Water Temple# leads to #[[1]]#.",
-                                                                 /*german*/ "",
+                                                                 /*german*/ "Man erzählt sich, daß das Ausweichen von #rollenden Felsen im Wassertempel# zu #[[1]]# führe.",
                                                                  /*french*/ "Selon moi, éviter des #rochers roulants dans le Temple de l'Eau# mène à #[[1]]#.", {QM_RED, QM_GREEN}),
                                                               // /*spanish*/esquivar #rocas rondantes del Templo del Agua# conduce a #[[1]]#.
                                                               {},
                                                               {CustomMessage("They say that dodging #rolling boulders under the lake# leads to #[[1]]#.",
-                                                                  /*german*/ "",
+                                                                  /*german*/ "Man erzählt sich, daß das Ausweichen von #rollenden Felsen unter einem See# zu #[[1]]# führe.",
                                                                   /*french*/ "Selon moi, éviter des #rochers roulants sous le lac# mène à #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                // /*spanish*/esquivar #rocas rodantes bajo el lago# conduce a #[[1]]#.
 
     hintTextTable[RHT_WATER_TEMPLE_GS_BEHIND_GATE] = HintText(CustomMessage("They say that a spider behind a #gate in the Water Temple# holds #[[1]]#.",
-                                                                 /*german*/ "",
+                                                                 /*german*/ "Man erzählt sich, daß eine Spinne hinter einem #Tor im Wassertempel# #[[1]]# hielte.",
                                                                  /*french*/ "Selon moi, la Skulltula derrière une #barrière dans le Temple de l'Eau# a #[[1]]#.", {QM_RED, QM_GREEN}),
                                                               // /*spanish*/una Skulltula tras #una valla del Templo del Agua# otorga #[[1]]#.
                                                               {},
                                                               {CustomMessage("They say that a spider behind a #gate under the lake# holds #[[1]]#.",
-                                                                  /*german*/ "",
+                                                                  /*german*/ "Man erzählt sich, daß eine Spinne hinter einem #Tor unter dem See# #[[1]]# hielte.",
                                                                   /*french*/ "Selon moi, l'araignée derrière une #barrière sous le lac# a #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                // /*spanish*/una Skulltula tras #una valla bajo el lago# otorga #[[1]]#.
 
     hintTextTable[RHT_WATER_TEMPLE_MQ_FREESTANDING_KEY] = HintText(CustomMessage("They say that hidden in a #box in the Water Temple# lies #[[1]]#.",
-                                                                      /*german*/ "",
+                                                                      /*german*/ "Man erzählt sich, daß versteckt in einem #Kasten im Wassertempel# #[[1]]# läge.",
                                                                       /*french*/ "Selon moi, dans une #boîte dans le Temple de l'Eau# gît #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                    // /*spanish*/en una #caja del Templo del Agua# yace #[[1]]#.
                                                                    {},
                                                                    {CustomMessage("They say that hidden in a #box under the lake# lies #[[1]]#.",
-                                                                       /*german*/ "",
+                                                                       /*german*/ "Man erzählt sich, daß versteckt in einem #Kasten unter dem See# #[[1]]# läge.",
                                                                        /*french*/ "Selon moi, dans une #boîte sous le lac# gît #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                     // /*spanish*/en una #caja bajo el lago# yace #[[1]]#.
 
     hintTextTable[RHT_WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA] = HintText(CustomMessage("They say that the #locked spider in the Water Temple# holds #[[1]]#.",
-                                                                              /*german*/ "",
+                                                                              /*german*/ "Man erzählt sich, daß eine #eingeschlossene Spinne im Wassertempel# #[[1]]# hielte.",
                                                                               /*french*/ "Selon moi, une #Skulltula emprisonnée dans le Temple de l'Eau# a #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                            // /*spanish*/la #Skulltula enjaulada del Templo del Agua# otorga #[[1]]#.
                                                                            {},
                                                                            {CustomMessage("They say that the #locked spider under the lake# holds #[[1]]#.",
-                                                                               /*german*/ "",
+                                                                               /*german*/ "Man erzählt sich, daß eine #eingeschlossene Spinne unter dem See# #[[1]]# hielte.",
                                                                                /*french*/ "Selon moi, l'#araignée emprisonnée sous le lac# a #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                             // /*spanish*/la #Skulltula enjaulada bajo el lago# otorga #[[1]]#.
 
     hintTextTable[RHT_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH] = HintText(CustomMessage("They say that a spider behind a #gate in the Water Temple# holds #[[1]]#.",
-                                                                          /*german*/ "",
+                                                                          /*german*/ "Man erzählt sich, daß eine Spinne hinter einem #Tor im Wassertempel# #[[1]]# hielte.",
                                                                           /*french*/ "Selon moi, une #Skulltula derrière une barrière dans le Temple de l'Eau# a #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                        // /*spanish*/una Skulltula tras una #valla del Templo del Agua# #[[1]]#.
                                                                        {},
                                                                        {CustomMessage("They say that a spider behind a #gate under the lake# holds #[[1]]#.",
-                                                                           /*german*/ "",
+                                                                           /*german*/ "Man erzählt sich, daß eine Spinne hinter einem #Tor unter dem See# #[[1]]# hielte.",
                                                                            /*french*/ "Selon moi, l'#araignée derrière une barrière sous le lac# a #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                         // /*spanish*/una Skulltula tras una #valla bajo el lago# otorga #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST] = HintText(CustomMessage("They say that those who seek #sunken silver rupees# will find #[[1]]#.",
-                                                                                          /*german*/ "",
+                                                                                          /*german*/ "Man erzählt sich, daß jene, welche #versunkene silberne Rubine# suchen, #[[1]]# finden würden.",
                                                                                           /*french*/ "Selon moi, ceux qui pêchent les #joyaux argentés# trouveront #[[1]]#.", {QM_RED, QM_GREEN})),
                                                                                        // /*spanish*/aquellos que busquen las #rupias plateadas sumergidas# encontrarán
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST] = HintText(CustomMessage("They say that those who seek #sunken silver rupees# will find #[[1]]#.",
-                                                                                             /*german*/ "",
+                                                                                             /*german*/ "Man erzählt sich, daß jene, welche #versunkene silberne Rubine# suchen, #[[1]]# finden würden.",
                                                                                              /*french*/ "Selon moi, ceux qui pêchent les #joyaux argentés# trouveront #[[1]]#.", {QM_RED, QM_GREEN})),
                                                                                           // /*spanish*/aquellos que busquen las #rupias plateadas sumergidas# encontrarán #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_FINAL_CHEST] = HintText(CustomMessage("They say that the final prize of #the thieves' training# is #[[1]]#.",
-                                                                                  /*german*/ "",
+                                                                                  /*german*/ "Man erzählt sich, daß der letzte Preis des #Diebestrainings# #[[1]]# sei.",
                                                                                   /*french*/ "Selon moi, la récompense ultime de #l'épreuve des voleurs# est #[[1]]#.", {QM_RED, QM_GREEN})),
                                                                                // /*spanish*/la recompensa final de la #instrucción de las bandida# brinda #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_ICE_ARROWS_CHEST] = HintText(CustomMessage("They say that the final prize of #the thieves' training# is #[[1]]#.",
-                                                                                /*german*/ "",
+                                                                                /*german*/ "Man erzählt sich, daß der letzte Preis des #Diebestrainings# #[[1]]# sei.",
                                                                                 /*french*/ "Selon moi, la récompense ultime de #l'épreuve des voleurs# est #[[1]]#.", {QM_RED, QM_GREEN})),
                                                                              // /*spanish*/el premio final de la #instrucción de las bandidas# brinda #[[1]]#.
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST] = HintText(CustomMessage("They say that #Dead Hand in the well# holds #[[1]]#.",
-                                                                            /*german*/ "",
+                                                                            /*german*/ "Man erzählt sich, daß der #Hirnsauger im Brunnen# #[[1]]# hielte.",
                                                                             /*french*/ "Selon moi, le #Poigneur dans le Puits# cache #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                          // /*spanish*/la #Mano Muerta del pozo# concede #[[1]]#.
                                                                          {},
                                                                          {CustomMessage("They say that the well's #grasping ghoul# hides #[[1]]#.",
-                                                                             /*german*/ "",
+                                                                             /*german*/ "Man erzählt sich, daß der #habgierige Fledderer des Brunnens# #[[1]]# verstecke.",
                                                                              /*french*/ "Selon moi, la #terreur du Puits# cache #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                           // /*spanish*/en las #profundidades del pozo# se esconde #[[1]]#.
                                                                           CustomMessage("They say that a #nether dweller in the well# holds #[[1]]#.",
-                                                                             /*german*/ "",
+                                                                             /*german*/ "Man erzählt sich, daß der #Unterweltbewohner im Brunnen# #[[1]]# hielte.",
                                                                              /*french*/ "Selon moi, le #spectre qui réside dans le Puits# a #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                           // /*spanish*/el #temido morador del pozo# concede #[[1]]#.
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST] = HintText(CustomMessage("They say that #Dead Hand in the well# holds #[[1]]#.",
-                                                                         /*german*/ "",
+                                                                         /*german*/ "Man erzählt sich, daß der #Hirnsauger im Brunnen# #[[1]]# hielte.",
                                                                          /*french*/ "Selon moi, le #Poigneur dans le Puits# cache #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                       // /*spanish*/la #Mano Muerta del pozo# concede #[[1]]#.
                                                                       {},
                                                                       {CustomMessage("They say that the well's #grasping ghoul# hides #[[1]]#.",
-                                                                          /*german*/ "",
+                                                                          /*german*/ "Man erzählt sich, daß der #habgierige Fledderer des Brunnens# #[[1]]# verstecke.",
                                                                           /*french*/ "Selon moi, la #terreur du Puits# cache #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                        // /*spanish*/en las #profundidades del pozo# se esconde #[[1]]#.
                                                                        CustomMessage("They say that a #nether dweller in the well# holds #[[1]]#.",
-                                                                          /*german*/ "",
+                                                                          /*german*/ "Man erzählt sich, daß der #Unterweltbewohner im Brunnen# #[[1]]# hielte.",
                                                                           /*french*/ "Selon moi, le #spectre qui réside dans le Puits# a #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                        // /*spanish*/el #temido morador del pozo# concede #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST] = HintText(CustomMessage("They say that upon the #Colossus's right hand# is #[[1]]#.",
-                                                                          /*german*/ "",
+                                                                          /*german*/ "Man erzählt sich, daß auf der #rechten Hand des Koloßes# #[[1]]# sei.",
                                                                           /*french*/ "Selon moi, sur la #main droite du colosse# repose #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                        // /*spanish*/en la #mano derecha del Coloso# yace #[[1]]#.
                                                                        {},
                                                                        {CustomMessage("They say that the treasure #sought by Nabooru# is #[[1]]#.",
-                                                                           /*german*/ "",
+                                                                           /*german*/ "Man erzählt sich, daß der #von Naboru gesuchte Schatz# #[[1]]# sei.",
                                                                            /*french*/ "Selon moi, le trésor que #recherche Nabooru# est #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                         // /*spanish*/el #ansiado tesoro de Nabooru# brinda #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST] = HintText(CustomMessage("They say that upon the #Colossus's left hand# is #[[1]]#.",
-                                                                       /*german*/ "",
+                                                                       /*german*/ "Man erzählt sich, daß auf der #linken Hand des Koloßes# #[[1]]# sei.",
                                                                        /*french*/ "Selon moi, sur la #main gauche du colosse# repose #[[1]]#.", {QM_RED, QM_GREEN})),
                                                                     // /*spanish*/en la #mano izquierda del Coloso# yace #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST] = HintText(CustomMessage("They say that a #temporal paradox in the Spirit Temple# yields #[[1]]#.",
-                                                                                /*german*/ "",
+                                                                                /*german*/ "Man erzählt sich, daß ein #zeitliches Paradox im Geistertempel# #[[1]]# einbrächte.",
                                                                                 /*french*/ "Selon moi, le #paradoxe temporel dans le Temple de l'Esprit# révèle #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                              // /*spanish*/una #paradoja temporal del Coloso# conduce a #[[1]]#.
                                                                              {},
                                                                              {CustomMessage("They say that a #temporal paradox in the Colossus# yields #[[1]]#.",
-                                                                                 /*german*/ "",
+                                                                                 /*german*/ "Man erzählt sich, daß ein #zeitliches Paradox im Koloß# #[[1]]# einbrächte.",
                                                                                  /*french*/ "Selon moi, un #paradoxe temporel dans le colosse# révèle #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                               // /*spanish*/una #paradoja temporal del Coloso# conduce a #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST] = HintText(CustomMessage("They say that a #symphony in the Spirit Temple# yields #[[1]]#.",
-                                                                          /*german*/ "",
+                                                                          /*german*/ "Man erzählt sich, daß eine #Sinfonie im Geistertempel# #[[1]]# einbrächte.",
                                                                           /*french*/ "Selon moi, les #cinq chansons du Temple de l'Esprit# révèlent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                        // /*spanish*/una #sinfonía del Coloso# conduce a #[[1]]#.
                                                                        {},
                                                                        {CustomMessage("They say that a #symphony in the Colossus# yields #[[1]]#.",
-                                                                           /*german*/ "",
+                                                                           /*german*/ "Man erzählt sich, daß eine #Sinfonie im Koloß# #[[1]]# einbrächte.",
                                                                            /*french*/ "Selon moi, la #symphonie du colosse# révèle #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                         // /*spanish*/una #sinfonía del Coloso# conduce a #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM] = HintText(CustomMessage("They say that a #spider's symphony in the Spirit Temple# yields #[[1]]#.",
-                                                                       /*german*/ "",
+                                                                       /*german*/ "Man erzählt sich, daß eine #Spinnensinfonie im Geistertempel# #[[1]]# einbrächte.",
                                                                        /*french*/ "Selon moi, la #mélodie de la Skulltula du Temple de l'Esprit# révèle #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                     // /*spanish*/la #Skulltula de la sinfonía del Coloso# otorga #[[1]]#.
                                                                     {},
                                                                     {CustomMessage("They say that a #spider's symphony in the Colossus# yields #[[1]]#.",
-                                                                        /*german*/ "",
+                                                                        /*german*/ "Man erzählt sich, daß eine #Spinnensinfonie im Koloß# #[[1]]# einbrächte.",
                                                                         /*french*/ "Selon moi, la #mélodie de l'araignée du colosse# révèle #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                      // /*spanish*/la #Skulltula de la sinfonía del Coloso# otorga #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST] = HintText(CustomMessage("They say that shadows in an #invisible maze# guard #[[1]]#.",
-                                                                               /*german*/ "",
+                                                                               /*german*/ "Man erzählt sich, daß Schatten in einem #unsichtbaren Labyrinth# #[[1]]# bewachen würden.",
                                                                                /*french*/ "Selon moi, les ombres dans le #labyrinthe invisible# protègent #[[1]]#.", {QM_RED, QM_GREEN})),
                                                                             // /*spanish*/las sombras del #laberinto misterioso# esconden #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST] = HintText(CustomMessage("They say that shadows in an #invisible maze# guard #[[1]]#.",
-                                                                        /*german*/ "",
+                                                                        /*german*/ "Man erzählt sich, daß Schatten in einem #unsichtbaren Labyrinth# #[[1]]# bewachen würden.",
                                                                         /*french*/ "Selon moi, les ombres dans le #labyrinthe invisible# protègent #[[1]]#.", {QM_RED, QM_GREEN})),
                                                                      // /*spanish*/las sombras del #laberinto invisible# esconden #[[1]]#.
 
@@ -859,88 +854,82 @@ void StaticData::HintTable_Init() {
     ---------------------------*/
 
     hintTextTable[RHT_DESERT_COLOSSUS_TO_COLOSSUS_GROTTO] = HintText(CustomMessage("They say that lifting a #rock in the desert# reveals #[[1]]#.",
-                                                                        /*german*/ "",
+                                                                        /*german*/ "Man erzählt sich, daß das Heben eines #Felsens in der Wüste# #[[1]]# enthülle.",
                                                                         /*french*/ "Selon moi, soulever une #roche dans le désert# révèle #[[1]]#.", {QM_RED, QM_BLUE})),
                                                                      // /*spanish*/levantar una #roca del desierto# revela #[[1]]#.
 
     hintTextTable[RHT_GV_GROTTO_LEDGE_TO_GV_OCTOROK_GROTTO] = HintText(CustomMessage("They say that a rock on #a ledge in the valley# hides #[[1]]#.",
-                                                                          /*german*/ "",
+                                                                          /*german*/ "Man erzählt sich, daß ein Felsen auf #einem Vorsprung im Tal# #[[1]]# verstecke.",
                                                                           /*french*/ "Selon moi, soulever une #roche dans la vallée# révèle #[[1]]#.", {QM_RED, QM_BLUE})),
                                                                        // /*spanish*/levantar una #roca al borde del valle# esconde #[[1]]#.
 
     hintTextTable[RHT_GC_GROTTO_PLATFORM_TO_GC_GROTTO] = HintText(CustomMessage("They say that a #pool of lava# in Goron City blocks the way to #[[1]]#.",
-                                                                     /*german*/ "",
+                                                                     /*german*/ "Man erzählt sich, daß ein #Lavateich# in Goronia den Weg zu #[[1]]# blockiere.",
                                                                      /*french*/ "Selon moi, l'#étang de lave# dans le village Goron renferme #[[1]]#.", {QM_RED, QM_BLUE})),
                                                                   // /*spanish*/un #estanque de lava# en la Ciudad Goron bloquea el paso a #[[1]]#.
 
-
     hintTextTable[RHT_GERUDO_FORTRESS_TO_GF_STORMS_GROTTO] = HintText(CustomMessage("They say that a #storm within Gerudo's Fortress# reveals #[[1]]#.",
-                                                                         /*german*/ "",
+                                                                         /*german*/ "Man erzählt sich, daß ein #Sturm innerhalb der Gerudo-Festung# #[[1]]# enthülle.",
                                                                          /*french*/ "Selon moi, la #tempête dans la forteresse# révèle #[[1]]#.", {QM_RED, QM_BLUE})),
                                                                       // /*spanish*/una #tormenta en la Fortaleza Gerudo# revela #[[1]]#.
 
-
     hintTextTable[RHT_ZORAS_DOMAIN_TO_ZD_STORMS_GROTTO] = HintText(CustomMessage("They say that a #storm within Zora's Domain# reveals #[[1]]#.",
-                                                                      /*german*/ "",
+                                                                      /*german*/ "Man erzählt sich, daß ein #Sturm innerhalb von Zoras Reich# #[[1]]# enthülle.",
                                                                       /*french*/ "Selon moi, la #tempête dans le Domaine Zora# révèle #[[1]]#.", {QM_RED, QM_BLUE})),
                                                                    // /*spanish*/una #tormenta en la Región de los Zora# revela #[[1]]#.
 
-
     hintTextTable[RHT_HYRULE_CASTLE_GROUNDS_TO_HC_STORMS_GROTTO] = HintText(CustomMessage("They say that a #storm near the castle# reveals #[[1]]#.",
-                                                                               /*german*/ "",
+                                                                               /*german*/ "Man erzählt sich, daß ein #Sturm in der Nähe des Schloßes# #[[1]]# enthülle.",
                                                                                /*french*/ "Selon moi, la #tempête près du château# révèle #[[1]]#.", {QM_RED, QM_BLUE})),
                                                                             // /*spanish*/una #tormenta junto al castillo# revela #[[1]]#.
 
     hintTextTable[RHT_GV_FORTRESS_SIDE_TO_GV_STORMS_GROTTO] = HintText(CustomMessage("They say that a #storm in the valley# reveals #[[1]]#.",
-                                                                          /*german*/ "",
+                                                                          /*german*/ "Man erzählt sich, daß ein #Sturm im Tal# #[[1]]# enthülle.",
                                                                           /*french*/ "Selon moi, la #tempête dans la vallée# révèle #[[1]]#.", {QM_RED, QM_BLUE})),
                                                                        // /*spanish*/una #tormenta en el valle# revela #[[1]]#.
 
     hintTextTable[RHT_DESERT_COLOSSUS_TO_COLOSSUS_GREAT_FAIRY_FOUNTAIN] = HintText(CustomMessage("They say that a #fractured desert wall# hides #[[1]]#.",
-                                                                                      /*german*/ "",
+                                                                                      /*german*/ "Man erzählt sich, daß eine #gebrochene Wüstenmauer# #[[1]]# verstecke.",
                                                                                       /*french*/ "Selon moi, le #mur fragile du désert# cache #[[1]]#.", {QM_RED, QM_BLUE})),
                                                                                    // /*spanish*/una #agrietada pared del desierto# esconde #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_GROUNDS_TO_OGC_GREAT_FAIRY_FOUNTAIN] = HintText(CustomMessage("They say that a #heavy pillar# outside the castle obstructs #[[1]]#.",
-                                                                                       /*german*/ "",
+                                                                                       /*german*/ "Man erzählt sich, daß eine #schwere Säule# außerhalb des Schloßes #[[1]]# versperre.",
                                                                                        /*french*/ "Selon moi, le #rocher fragile près du château# cache #[[1]]#.", {QM_RED, QM_BLUE})),
                                                                                     // /*spanish*/una #pesada columna# fuera del castillo obstruye #[[1]]#.
 
-
     hintTextTable[RHT_ZORAS_FOUNTAIN_TO_ZF_GREAT_FAIRY_FOUNTAIN] = HintText(CustomMessage("They say that a #fountain wall# hides #[[1]]#.",
-                                                                               /*german*/ "",
+                                                                               /*german*/ "Man erzählt sich, daß eine #Wasserwand# #[[1]]# verstecke.",
                                                                                /*french*/ "Selon moi, le #mur fragile du réservoir# cache #[[1]]#.", {QM_RED, QM_BLUE})),
                                                                             // /*spanish*/una #pared de la fuente# esconde #[[1]]#.
 
     hintTextTable[RHT_GV_FORTRESS_SIDE_TO_GV_CARPENTER_TENT] = HintText(CustomMessage("They say that a #tent in the valley# covers #[[1]]#.",
-                                                                           /*german*/ "",
+                                                                           /*german*/ "Man erzählt sich, daß ein #Zelt im Tal# #[[1]]# verdecke.",
                                                                            /*french*/ "Selon moi, la #tente dans la vallée# recouvre #[[1]]#.", {QM_RED, QM_BLUE})),
                                                                         // /*spanish*/una #tienda de campaña del valle# cubre #[[1]]#.
 
     hintTextTable[RHT_GRAVEYARD_WARP_PAD_REGION_TO_SHADOW_TEMPLE_ENTRYWAY] = HintText(CustomMessage("They say that at the #back of the Graveyard#, there is #[[1]]#.",
-                                                                                         /*german*/ "",
+                                                                                         /*german*/ "Man erzählt sich, daß sich #hinter dem Friedhof, #[[1]]# befände.",
                                                                                          /*french*/ "Selon moi, #derrière le Cimetière# gît #[[1]]#.", {QM_RED, QM_BLUE})),
                                                                                       // /*spanish*/en la #parte trasera del cementerio# se halla #[[1]]#.
 
-
     hintTextTable[RHT_LAKE_HYLIA_TO_WATER_TEMPLE_LOBBY] = HintText(CustomMessage("They say that deep #under a vast lake#, one can find #[[1]]#.",
-                                                                      /*german*/ "",
+                                                                      /*german*/ "Man erzählt sich, daß man tief #unter einem gewaltigen See#, #[[1]]# finden könne.",
                                                                       /*french*/ "Selon moi, #sous le lac# gît #[[1]]#.", {QM_RED, QM_BLUE})),
                                                                    // /*spanish*/en las #profundidades de un lago inmenso# se halla #[[1]]#.
 
-
     hintTextTable[RHT_GERUDO_FORTRESS_TO_GERUDO_TRAINING_GROUNDS_LOBBY] = HintText(CustomMessage("They say that paying a #fee to the Gerudos# grants access to #[[1]]#.",
-                                                                                      /*german*/ "",
+                                                                                      /*german*/ "Man erzählt sich, daß das Bezahlen einer #Gebühr an die Gerudos#, Zugang zu #[[1]]# gewähre.",
                                                                                       /*french*/ "Selon moi, l'#entrée payante des Gerudo# donne accès à #[[1]]#.", {QM_RED, QM_BLUE})),
                                                                                    // /*spanish*/pagarle una #tasa a las gerudo# da acceso a #[[1]]#.
 
     hintTextTable[RHT_ZORAS_FOUNTAIN_TO_JABU_JABUS_BELLY_BEGINNING] = HintText(CustomMessage("They say that inside #Jabu-Jabu#, one can find #[[1]]#.",
-                                                                                  /*german*/ "",
+                                                                                  /*german*/ "Man erzählt sich, daß man #in Jabu-Jabu#, #[[1]]# finden könne.",
                                                                                   /*french*/ "Selon moi, #dans Jabu-Jabu# se trouve #[[1]]#.", {QM_RED, QM_BLUE})),
                                                                                // /*spanish*/dentro de #Jabu-Jabu# se halla #[[1]]#.
 
     hintTextTable[RHT_KAKARIKO_VILLAGE_TO_BOTTOM_OF_THE_WELL] = HintText(CustomMessage("They say that a #village well# leads to #[[1]]#.",
-                                                                            /*german*/ "",
+                                                                            /*german*/ "Man erzählt sich, daß ein #Dorfbrunnen# zu #[[1]]# führe.",
                                                                             /*french*/ "Selon moi, dans le fond du #Puits du village# gît #[[1]]#.", {QM_RED, QM_BLUE})),
                                                                          // /*spanish*/el #pozo de un pueblo# conduce a #[[1]]#.
 
@@ -1067,6 +1056,7 @@ void StaticData::HintTable_Init() {
                                                     /*german*/ "Zoras Quelle",
                                                     /*french*/ "la Fontaine Zora"));
                                                  // /*spanish*/la Fuente Zora
+    
     hintTextTable[RHT_LON_LON_RANCH] = HintText(CustomMessage("Lon Lon Ranch",
                                                    /*german*/ "Lon Lon-Farm",
                                                    /*french*/ "le Ranch Lon Lon"));
@@ -1470,8 +1460,7 @@ void StaticData::HintTable_Init() {
                                                       /*french*/ "Selon moi, les \"Offres spéciales\" sont parfois trompeuses... Lisez les attentivement!"));
                                                    // /*spanish*/"Según dicen, se debería prestar atención a los nombres de las ofertas especiales."
 
-
- hintTextTable[RHT_JUNK03] = HintText(CustomMessage("They say that Zelda is a poor leader.",
+    hintTextTable[RHT_JUNK03] = HintText(CustomMessage("They say that Zelda is a poor leader.",
                                             /*german*/ "",
                                             /*french*/ "Selon moi, Zelda ne ferait pas un bon monarque."));
                                          // /*spanish*/Según dicen, Zelda es mala líder.
@@ -2872,7 +2861,7 @@ void StaticData::HintTable_Init() {
                                                          {QM_BLUE, QM_GREEN, QM_GREEN}));
 
     hintTextTable[RHT_SKULLS_HINT] = HintText(CustomMessage("Yeaaarrgh! I'm cursed!!^Please save me by destroying #[[d]] Spiders of the Curse# and I will give you my #[[1]]#!",
-                                                 /*german*/ "Yeaaarrgh! Ich bin verflucht!^Bitte rette mich, indem du #[[d]] Skulltulas# zerstörst und ich werde dir dafür #[[1]]# geben!",
+                                                 /*german*/ "Yeaaarrgh! Ich bin verflucht!^Bitte rette mich, indem Du #[[d]] Skulltulas# zerstörst und ich werde Dir dafür #[[1]]# geben!",
                                                  /*french*/ "Yeaaarrgh! Je suis maudit!^Détruit encore #[[d]] Araignées de la Malédiction# et j'aurai quelque chose à te donner! #([[1]])#",
                                                             {QM_YELLOW, QM_GREEN}));
 

From bd142a0eed69c440dec1c6ce97eb9706e2938248 Mon Sep 17 00:00:00 2001
From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Date: Sat, 5 Oct 2024 21:32:06 +0100
Subject: [PATCH 222/230] Fix duplicate fishing checks and a crash with fishing
 rod hint (#4288)

* actor breaking

* should be VB fishing

* attempt to VB fisherman

* commit fishing hell for review of VB viability, untested

* fix rando, vanilla still broken. close enough

* wait i forgot to remove that

* small fix
---
 soh/include/z64item.h                         |   2 +-
 .../custom-message/CustomMessageTypes.h       |   1 +
 .../game-interactor/GameInteractor.h          |   9 ++
 .../Enhancements/randomizer/hook_handlers.cpp |  63 +++++++++
 soh/soh/Enhancements/randomizer/item_list.cpp |   2 +-
 soh/soh/Enhancements/randomizer/settings.cpp  |   6 +-
 soh/soh/OTRGlobals.cpp                        |   4 +-
 .../overlays/actors/ovl_Fishing/z_fishing.c   | 133 ++++++++----------
 .../overlays/actors/ovl_Fishing/z_fishing.h   |   9 ++
 .../ovl_Item_Etcetera/z_item_etcetera.c       |   2 +-
 10 files changed, 151 insertions(+), 80 deletions(-)

diff --git a/soh/include/z64item.h b/soh/include/z64item.h
index ceba11d09..214d82711 100644
--- a/soh/include/z64item.h
+++ b/soh/include/z64item.h
@@ -387,7 +387,7 @@ typedef enum {
     /* 0x35 */ GI_GAUNTLETS_SILVER,
     /* 0x36 */ GI_GAUNTLETS_GOLD,
     /* 0x37 */ GI_SCALE_SILVER,
-    /* 0x38 */ GI_SCALE_GOLD,
+    /* 0x38 */ GI_SCALE_GOLDEN,
     /* 0x39 */ GI_STONE_OF_AGONY,
     /* 0x3A */ GI_GERUDO_CARD,
     /* 0x3B */ GI_OCARINA_FAIRY, // uses Ocarina of Time message ID
diff --git a/soh/soh/Enhancements/custom-message/CustomMessageTypes.h b/soh/soh/Enhancements/custom-message/CustomMessageTypes.h
index 5471a4886..fa8a4bb8a 100644
--- a/soh/soh/Enhancements/custom-message/CustomMessageTypes.h
+++ b/soh/soh/Enhancements/custom-message/CustomMessageTypes.h
@@ -146,6 +146,7 @@ typedef enum {
     TEXT_FISHING_DIFFERENT_POND = 0x4094,
     TEXT_FISHING_SCRATCHING = 0x4095,
     TEXT_FISHING_CLOUDY = 0x4096,
+    TEXT_FISHING_RELEASE_THIS_ONE = 0x409C,
     TEXT_FISHING_TRY_ANOTHER_LURE_WITH_SINKING_LURE = 0x40AF,
     TEXT_DAMPES_DIARY = 0x5003,
     TEXT_GRANNYS_SHOP = 0x500C,
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h
index 70fd70267..5f8a10d8e 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h
@@ -291,6 +291,15 @@ typedef enum {
     VB_PLAY_RAINBOW_BRIDGE_CS,
     // Opt: *EnBox
     VB_PLAY_SLOW_CHEST_CS,
+    //*Opt f32 sFishOnHandLength
+    // Vanilla condition: (s16)sFishingRecordLength < (s16)sFishOnHandLength
+    VB_SHOULD_CHECK_FOR_FISHING_RECORD,
+    //*Opt f32 sFishOnHandLength
+    // Vanilla condition is implied from previous code that could be bypassed by above hook
+    VB_SHOULD_SET_FISHING_RECORD,
+    //*Opt *s32 getItemId
+    VB_SHOULD_GIVE_VANILLA_FISHING_PRIZE,
+    VB_GIVE_RANDO_FISHING_PRIZE,
     VB_PLAY_THROW_ANIMATION,
 
     /*** Give Items ***/
diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index 75e9dd290..8c86af5ef 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -35,6 +35,7 @@ extern "C" {
 #include "src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h"
 #include "src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.h"
 #include "src/overlays/actors/ovl_En_Ge1/z_en_ge1.h"
+#include "src/overlays/actors/ovl_Fishing/z_fishing.h"
 #include "adult_trade_shuffle.h"
 #include "draw.h"
 
@@ -582,6 +583,22 @@ void func_8083A434_override(PlayState* play, Player* player) {
     player->stateFlags1 |= PLAYER_STATE1_GETTING_ITEM | PLAYER_STATE1_IN_CUTSCENE;
 }
 
+
+bool ShouldGiveFishingPrize(f32 sFishOnHandLength){
+    // RANDOTODO: update the enhancement sliders to not allow
+    // values above rando fish weight values when rando'd
+    if(LINK_IS_CHILD) { 
+        int32_t weight = CVarGetInteger(CVAR_ENHANCEMENT("CustomizeFishing"), 0) ? CVarGetInteger(CVAR_ENHANCEMENT("MinimumFishWeightChild"), 10) : 10;
+        f32 score = sqrt(((f32)weight - 0.5f) / 0.0036f);
+        return sFishOnHandLength >= score && (IS_RANDO ? !Flags_GetRandomizerInf(RAND_INF_CHILD_FISHING) : !(HIGH_SCORE(HS_FISHING) & HS_FISH_PRIZE_CHILD));
+    } else 
+    {
+        int32_t weight = CVarGetInteger(CVAR_ENHANCEMENT("CustomizeFishing"), 0) ? CVarGetInteger(CVAR_ENHANCEMENT("MinimumFishWeightAdult"), 13) : 13;
+        f32 score = sqrt(((f32)weight - 0.5f) / 0.0036f);
+        return sFishOnHandLength >= score && (IS_RANDO ? !Flags_GetRandomizerInf(RAND_INF_ADULT_FISHING) : !(HIGH_SCORE(HS_FISHING) & HS_FISH_PRIZE_ADULT));
+    }
+}
+
 void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void* optionalArg) {
     switch (id) {
         case VB_PLAY_SLOW_CHEST_CS: {
@@ -1162,6 +1179,52 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             }
             break;
         }
+        case VB_SHOULD_CHECK_FOR_FISHING_RECORD: {
+            f32 sFishOnHandLength = *static_cast<f32*>(optionalArg);
+            *should = *should || ShouldGiveFishingPrize(sFishOnHandLength);
+            break;
+        }
+        case VB_SHOULD_SET_FISHING_RECORD: {
+            VBFishingData* fishData = static_cast<VBFishingData*>(optionalArg);
+            *should = (s16)fishData->sFishingRecordLength < (s16)fishData->fishWeight;
+            if (!*should){
+                *fishData->sFishOnHandLength = 0.0f;
+            }
+            break;
+        }
+        case VB_SHOULD_GIVE_VANILLA_FISHING_PRIZE: {
+            VBFishingData* fishData = static_cast<VBFishingData*>(optionalArg);
+            *should = !IS_RANDO && ShouldGiveFishingPrize(fishData->fishWeight);
+            break;
+        }
+        case VB_GIVE_RANDO_FISHING_PRIZE: {
+            if (IS_RANDO){
+                VBFishingData* fishData = static_cast<VBFishingData*>(optionalArg);
+                if (*fishData->sFishOnHandIsLoach) {
+                    if (!Flags_GetRandomizerInf(RAND_INF_CAUGHT_LOACH) &&
+                        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_FISHSANITY) == RO_FISHSANITY_HYRULE_LOACH){
+                        Flags_SetRandomizerInf(RAND_INF_CAUGHT_LOACH);
+                        Message_StartTextbox(gPlayState, TEXT_FISHING_RELEASE_THIS_ONE, NULL);
+                        *should = true;
+                        fishData->actor->stateAndTimer = 20;
+                    }
+                } else {
+                    if (ShouldGiveFishingPrize(fishData->fishWeight)){
+                        if (LINK_IS_CHILD){
+                            Flags_SetRandomizerInf(RAND_INF_CHILD_FISHING);
+                            HIGH_SCORE(HS_FISHING) |= HS_FISH_PRIZE_CHILD;
+                        } else {
+                            Flags_SetRandomizerInf(RAND_INF_ADULT_FISHING);
+                            HIGH_SCORE(HS_FISHING) |= HS_FISH_PRIZE_ADULT;
+                        }
+                        *should = true;
+                        *fishData->sSinkingLureLocation = (u8)Rand_ZeroFloat(3.999f) + 1;
+                        fishData->actor->stateAndTimer = 0;
+                    }
+                }
+            } 
+            break;
+        }
         case VB_TRADE_TIMER_ODD_MUSHROOM:
         case VB_TRADE_TIMER_EYEDROPS:
         case VB_TRADE_TIMER_FROG:
diff --git a/soh/soh/Enhancements/randomizer/item_list.cpp b/soh/soh/Enhancements/randomizer/item_list.cpp
index 6b7b8a5e1..458144411 100644
--- a/soh/soh/Enhancements/randomizer/item_list.cpp
+++ b/soh/soh/Enhancements/randomizer/item_list.cpp
@@ -324,7 +324,7 @@ void Rando::StaticData::InitItemTable() {
     itemTable[RG_SILVER_GAUNTLETS] =                    Item(RG_SILVER_GAUNTLETS,                 Text{ "Silver Gauntlets", "Gantelets d'argent", "Silberhandschuhe" },                                                                ITEMTYPE_ITEM,              GI_GAUNTLETS_SILVER,  true,  LOGIC_PROGRESSIVE_STRENGTH,         RHT_SILVER_GAUNTLETS,                  ITEM_GAUNTLETS_SILVER,                OBJECT_GI_GLOVES,       GID_GAUNTLETS_SILVER, 0x5B,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
     itemTable[RG_GOLDEN_GAUNTLETS] =                    Item(RG_GOLDEN_GAUNTLETS,                 Text{ "Golden Gauntlets", "Gantelets d'or", "Goldhandschuhe" },                                                                      ITEMTYPE_ITEM,              GI_GAUNTLETS_GOLD,    true,  LOGIC_PROGRESSIVE_STRENGTH,         RHT_GOLDEN_GAUNTLETS,                  ITEM_GAUNTLETS_GOLD,                  OBJECT_GI_GLOVES,       GID_GAUNTLETS_GOLD,   0x5C,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
     itemTable[RG_SILVER_SCALE] =                        Item(RG_SILVER_SCALE,                     Text{ "Silver Scale", "Écaille d'argent", "Silberne Schuppe" },                                                                      ITEMTYPE_ITEM,              GI_SCALE_SILVER,      true,  LOGIC_PROGRESSIVE_SCALE,            RHT_SILVER_SCALE,                      ITEM_SCALE_SILVER,                    OBJECT_GI_SCALE,        GID_SCALE_SILVER,     0xCD,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_GOLDEN_SCALE] =                        Item(RG_GOLDEN_SCALE,                     Text{ "Golden Scale", "Écaille d'or", "Goldene Schuppe" },                                                                           ITEMTYPE_ITEM,              GI_SCALE_GOLD,        true,  LOGIC_PROGRESSIVE_SCALE,            RHT_GOLDEN_SCALE,                      ITEM_SCALE_GOLDEN,                    OBJECT_GI_SCALE,        GID_SCALE_GOLDEN,     0xCE,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_GOLDEN_SCALE] =                        Item(RG_GOLDEN_SCALE,                     Text{ "Golden Scale", "Écaille d'or", "Goldene Schuppe" },                                                                           ITEMTYPE_ITEM,              GI_SCALE_GOLDEN,        true,  LOGIC_PROGRESSIVE_SCALE,            RHT_GOLDEN_SCALE,                      ITEM_SCALE_GOLDEN,                    OBJECT_GI_SCALE,        GID_SCALE_GOLDEN,     0xCE,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
     itemTable[RG_ADULT_WALLET] =                        Item(RG_ADULT_WALLET,                     Text{ "Adult Wallet", "Grande Bourse", "Erwachsenengeldbörse" },                                                                     ITEMTYPE_ITEM,              GI_WALLET_ADULT,      true,  LOGIC_PROGRESSIVE_WALLET,           RHT_ADULT_WALLET,                      ITEM_WALLET_ADULT,                    OBJECT_GI_PURSE,        GID_WALLET_ADULT,     0x5E,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
     itemTable[RG_GIANT_WALLET] =                        Item(RG_GIANT_WALLET,                     Text{ "Giant Wallet", "Bourse de Géant", "Riesige Geldbörse" },                                                                      ITEMTYPE_ITEM,              GI_WALLET_GIANT,      true,  LOGIC_PROGRESSIVE_WALLET,           RHT_GIANT_WALLET,                      ITEM_WALLET_GIANT,                    OBJECT_GI_PURSE,        GID_WALLET_GIANT,     0x5F,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
     itemTable[RG_TYCOON_WALLET] =                       Item(RG_TYCOON_WALLET,                    Text{ "Tycoon Wallet", "Bourse de Magnat", "Goldene Geldbörse" },                                                                    ITEMTYPE_ITEM,              RG_TYCOON_WALLET,     true,  LOGIC_PROGRESSIVE_WALLET,           RHT_TYCOON_WALLET,                     RG_TYCOON_WALLET,                     OBJECT_GI_PURSE,        GID_WALLET_GIANT,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
index 4ecdd5b18..b43d75301 100644
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -2163,8 +2163,12 @@ void Settings::FinalizeSettings(const std::set<RandomizerCheck>& excludedLocatio
         mOptions[RSK_KAK_100_SKULLS_HINT].SetSelectedIndex(RO_GENERIC_OFF);
     }
 
+    if (!mOptions[RSK_SHUFFLE_FISHING_POLE]) {
+        mOptions[RSK_FISHING_POLE_HINT].SetSelectedIndex(RO_GENERIC_OFF);
+    }
+
     if (mOptions[RSK_FISHSANITY].IsNot(RO_FISHSANITY_HYRULE_LOACH)) {
-        mOptions[RSK_LOACH_HINT].SetSelectedIndex(RO_FISHSANITY_OFF);
+        mOptions[RSK_LOACH_HINT].SetSelectedIndex(RO_GENERIC_OFF);
     }
 
     if (mOptions[RSK_CUCCO_COUNT].Is(0)) {
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
index fee872f93..f99152f16 100644
--- a/soh/soh/OTRGlobals.cpp
+++ b/soh/soh/OTRGlobals.cpp
@@ -633,7 +633,7 @@ extern "C" void VanillaItemTable_Init() {
         GET_ITEM(ITEM_GAUNTLETS_SILVER, OBJECT_GI_GLOVES,        GID_GAUNTLETS_SILVER, 0x5B, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,           MOD_NONE, GI_GAUNTLETS_SILVER),
         GET_ITEM(ITEM_GAUNTLETS_GOLD,   OBJECT_GI_GLOVES,        GID_GAUNTLETS_GOLD,   0x5C, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,           MOD_NONE, GI_GAUNTLETS_GOLD),
         GET_ITEM(ITEM_SCALE_SILVER,     OBJECT_GI_SCALE,         GID_SCALE_SILVER,     0xCD, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,           MOD_NONE, GI_SCALE_SILVER),
-        GET_ITEM(ITEM_SCALE_GOLDEN,     OBJECT_GI_SCALE,         GID_SCALE_GOLDEN,     0xCE, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,           MOD_NONE, GI_SCALE_GOLD),
+        GET_ITEM(ITEM_SCALE_GOLDEN,     OBJECT_GI_SCALE,         GID_SCALE_GOLDEN,     0xCE, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,           MOD_NONE, GI_SCALE_GOLDEN),
         GET_ITEM(ITEM_STONE_OF_AGONY,   OBJECT_GI_MAP,           GID_STONE_OF_AGONY,   0x68, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,           MOD_NONE, GI_STONE_OF_AGONY),
         GET_ITEM(ITEM_GERUDO_CARD,      OBJECT_GI_GERUDO,        GID_GERUDO_CARD,      0x7B, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,           MOD_NONE, GI_GERUDO_CARD),
         GET_ITEM(ITEM_OCARINA_FAIRY,    OBJECT_GI_OCARINA_0,     GID_OCARINA_FAIRY,    0x4A, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,           MOD_NONE, GI_OCARINA_FAIRY),
@@ -817,7 +817,7 @@ std::unordered_map<ItemID, GetItemID> ItemIDtoGetItemIDMap {
     { ITEM_RUPEE_RED, GI_RUPEE_RED },
     { ITEM_RUPEE_RED, GI_RUPEE_RED_LOSE },
     { ITEM_SAW, GI_SAW },
-    { ITEM_SCALE_GOLDEN, GI_SCALE_GOLD },
+    { ITEM_SCALE_GOLDEN, GI_SCALE_GOLDEN },
     { ITEM_SCALE_SILVER, GI_SCALE_SILVER },
     { ITEM_SEEDS, GI_SEEDS_5 },
     { ITEM_SEEDS_30, GI_SEEDS_30 },
diff --git a/soh/src/overlays/actors/ovl_Fishing/z_fishing.c b/soh/src/overlays/actors/ovl_Fishing/z_fishing.c
index 63b66a301..6e003af21 100644
--- a/soh/src/overlays/actors/ovl_Fishing/z_fishing.c
+++ b/soh/src/overlays/actors/ovl_Fishing/z_fishing.c
@@ -11,9 +11,9 @@
 #include "vt.h"
 
 #include "soh/frame_interpolation.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_WHILE_CULLED
-
 #define WATER_SURFACE_Y(play) play->colCtx.colHeader->waterBoxes->ySurface
 bool getShouldSpawnLoaches();
 
@@ -4959,7 +4959,8 @@ void Fishing_HandleOwnerDialog(Fishing* this, PlayState* play) {
                                 this->stateAndTimer = 20;
                             } else if (sFishOnHandIsLoach == 0) {
                                 sFishLengthToWeigh = sFishOnHandLength;
-                                if ((s16)sFishingRecordLength < (s16)sFishOnHandLength) {
+                                //if we set the record or get the reward
+                                if (GameInteractor_Should(VB_SHOULD_CHECK_FOR_FISHING_RECORD, (s16)sFishingRecordLength < (s16)sFishOnHandLength, &sFishOnHandLength)) {
                                     if (sLureCaughtWith == FS_LURE_SINKING) {
                                         this->actor.textId = 0x40B0;
                                     } else {
@@ -5028,42 +5029,54 @@ void Fishing_HandleOwnerDialog(Fishing* this, PlayState* play) {
                 GetItemEntry getItemEntry = (GetItemEntry)GET_ITEM_NONE;
 
                 Message_CloseTextbox(play);
+                //Declare and fill a struct for use in hooks
+                struct VBFishingData fishData;
+                fishData.actor = this;
+                fishData.sFishOnHandIsLoach = &sFishOnHandIsLoach;
+                fishData.sSinkingLureLocation = &sSinkingLureLocation;
+                fishData.fishWeight = sFishOnHandLength;
+                fishData.sFishOnHandLength = &sFishOnHandLength;
+                fishData.sFishingRecordLength = sFishingRecordLength;
 
                 if (sFishOnHandIsLoach == 0) {
-                    sFishingRecordLength = sFishOnHandLength;
-                    sFishOnHandLength = 0.0f;
+                    //if we set the record. Needed because of the wider check at VB_SHOULD_CHECK_FOR_FISHING_RECORD
+                    //if not, reset sFishOnHandLength here as we carry it in the struct anyway
+                    if(GameInteractor_Should(VB_SHOULD_SET_FISHING_RECORD, true, &fishData)){
+                        sFishingRecordLength = sFishOnHandLength;
+                        sFishOnHandLength = 0.0f; //if skipped here, is set at the end of the function. needs to be kept for later checks
 
-                    if (sLinkAge == LINK_AGE_CHILD) {
-                        f32 temp;
+                        if (sLinkAge == LINK_AGE_CHILD) {
+                            f32 temp;
 
-                        HIGH_SCORE(HS_FISHING) &= 0xFFFFFF00;
-                        HIGH_SCORE(HS_FISHING) |= (s32)sFishingRecordLength & HS_FISH_LENGTH_CHILD;
+                            HIGH_SCORE(HS_FISHING) &= 0xFFFFFF00;
+                            HIGH_SCORE(HS_FISHING) |= (s32)sFishingRecordLength & HS_FISH_LENGTH_CHILD;
 
-                        temp = (HIGH_SCORE(HS_FISHING) & HS_FISH_LENGTH_ADULT) >> 0x18;
-                        if (temp < sFishingRecordLength) {
+                            temp = (HIGH_SCORE(HS_FISHING) & HS_FISH_LENGTH_ADULT) >> 0x18;
+                            if (temp < sFishingRecordLength) {
+                                HIGH_SCORE(HS_FISHING) &= 0xFFFFFF;
+                                HIGH_SCORE(HS_FISHING) |= ((s32)sFishingRecordLength & HS_FISH_LENGTH_CHILD) << 0x18;
+
+                                if (sLureCaughtWith == FS_LURE_SINKING) {
+                                    HIGH_SCORE(HS_FISHING) |= HS_FISH_CHEAT_ADULT;
+                                }
+                            }
+
+                            if (sLureCaughtWith == FS_LURE_SINKING) {
+                                HIGH_SCORE(HS_FISHING) |= HS_FISH_CHEAT_CHILD;
+                                this->stateAndTimer = 0;
+                                break;
+                            }
+                        } else {
                             HIGH_SCORE(HS_FISHING) &= 0xFFFFFF;
                             HIGH_SCORE(HS_FISHING) |= ((s32)sFishingRecordLength & HS_FISH_LENGTH_CHILD) << 0x18;
 
                             if (sLureCaughtWith == FS_LURE_SINKING) {
                                 HIGH_SCORE(HS_FISHING) |= HS_FISH_CHEAT_ADULT;
+                                this->stateAndTimer = 0;
+                                break;
                             }
                         }
-
-                        if (sLureCaughtWith == FS_LURE_SINKING) {
-                            HIGH_SCORE(HS_FISHING) |= HS_FISH_CHEAT_CHILD;
-                            this->stateAndTimer = 0;
-                            break;
-                        }
-                    } else {
-                        HIGH_SCORE(HS_FISHING) &= 0xFFFFFF;
-                        HIGH_SCORE(HS_FISHING) |= ((s32)sFishingRecordLength & HS_FISH_LENGTH_CHILD) << 0x18;
-
-                        if (sLureCaughtWith == FS_LURE_SINKING) {
-                            HIGH_SCORE(HS_FISHING) |= HS_FISH_CHEAT_ADULT;
-                            this->stateAndTimer = 0;
-                            break;
-                        }
-                    }
+                    }                     
 
                     if (sFishingRecordLength >= 60.0f) { // 13 lbs
                         getItemId = GI_RUPEE_PURPLE;
@@ -5074,58 +5087,36 @@ void Fishing_HandleOwnerDialog(Fishing* this, PlayState* play) {
                     } else {
                         getItemId = GI_RUPEE_GREEN;
                     }
-
+                    
                     if (sLinkAge == LINK_AGE_CHILD) { // 9 lbs
-                        if ((!IS_RANDO && !(HIGH_SCORE(HS_FISHING) & HS_FISH_PRIZE_CHILD)) ||
-                            (IS_RANDO && !Flags_GetRandomizerInf(RAND_INF_CHILD_FISHING))
-                        ) {
-                            if (sFishingRecordLength >= Fishing_GetMinimumRequiredScore()) {
-                                HIGH_SCORE(HS_FISHING) |= HS_FISH_PRIZE_CHILD;
-                                Flags_SetRandomizerInf(RAND_INF_CHILD_FISHING);
-                                sSinkingLureLocation = (u8)Rand_ZeroFloat(3.999f) + 1;
-                                if (!IS_RANDO) {
-                                    getItemId = GI_HEART_PIECE;
-                                } else {
-                                    getItemEntry = Randomizer_GetItemFromKnownCheck(RC_LH_CHILD_FISHING, GI_HEART_PIECE);
-                                    getItemId = getItemEntry.getItemId;
-                                }
-                            }
+                        //if we should give the main prize AND it's not rando
+                        if (GameInteractor_Should(VB_SHOULD_GIVE_VANILLA_FISHING_PRIZE, false, &fishData)){
+                        //((sFishingRecordLength >= 50.0f) && !(HIGH_SCORE(HS_FISHING) & HS_FISH_PRIZE_CHILD)) {
+                            HIGH_SCORE(HS_FISHING) |= HS_FISH_PRIZE_CHILD;
+                            getItemId = GI_HEART_PIECE;
+                            sSinkingLureLocation = (u8)Rand_ZeroFloat(3.999f) + 1;
                         }
                     } else { // 13 lbs
-                        if ((!IS_RANDO && !(HIGH_SCORE(HS_FISHING) & HS_FISH_PRIZE_ADULT)) ||
-                            (IS_RANDO && !Flags_GetRandomizerInf(RAND_INF_ADULT_FISHING))
-                        ) {
-                            if (sFishingRecordLength >= Fishing_GetMinimumRequiredScore()) {
-                                HIGH_SCORE(HS_FISHING) |= HS_FISH_PRIZE_ADULT;
-                                Flags_SetRandomizerInf(RAND_INF_ADULT_FISHING);
-                                sSinkingLureLocation = (u8)Rand_ZeroFloat(3.999f) + 1;
-                                if (!IS_RANDO) {
-                                    getItemId = GI_SCALE_GOLD;
-                                } else {
-                                    getItemEntry = Randomizer_GetItemFromKnownCheck(RC_LH_ADULT_FISHING, GI_SCALE_GOLD);
-                                    getItemId = getItemEntry.getItemId;
-                                }
-                            }
+                        //if we should give the main prize AND it's not rando
+                        if (GameInteractor_Should(VB_SHOULD_GIVE_VANILLA_FISHING_PRIZE, false, &fishData)){
+                        //(sFishingRecordLength >= 60.0f) && !(HIGH_SCORE(HS_FISHING) & HS_FISH_PRIZE_ADULT)) {
+                            HIGH_SCORE(HS_FISHING) |= HS_FISH_PRIZE_ADULT;
+                            getItemId = GI_SCALE_GOLDEN;
+                            sSinkingLureLocation = (u8)Rand_ZeroFloat(3.999f) + 1;
                         }
                     }
                 } else {
-                    if (IS_RANDO && !Flags_GetRandomizerInf(RAND_INF_CAUGHT_LOACH)) {
-                        Flags_SetRandomizerInf(RAND_INF_CAUGHT_LOACH);
-                        getItemEntry = Randomizer_GetItemFromKnownCheck(RC_LH_HYRULE_LOACH, GI_RUPEE_PURPLE);
-                        getItemId = getItemEntry.getItemId;
-                    } else {
-                        getItemId = GI_RUPEE_PURPLE;
-                    }
+                    getItemId = GI_RUPEE_PURPLE;
                     sFishOnHandLength = 0.0f; // doesn't record loach
                 }
 
                 this->actor.parent = NULL;
-                if (!IS_RANDO || getItemEntry.getItemId == GI_NONE) {
+
+                //if we should give the check in rando
+                if (!GameInteractor_Should(VB_GIVE_RANDO_FISHING_PRIZE, false, &fishData)){
                     Actor_OfferGetItem(&this->actor, play, getItemId, 2000.0f, 1000.0f);
-                } else {
-                    GiveItemEntryFromActor(&this->actor, play, getItemEntry, 2000.0f, 1000.0f);
+                    this->stateAndTimer = 23;
                 }
-                this->stateAndTimer = 23;
             }
             break;
 
@@ -5175,19 +5166,13 @@ void Fishing_HandleOwnerDialog(Fishing* this, PlayState* play) {
             if (Actor_HasParent(&this->actor, play)) {
                 this->stateAndTimer = 24;
             } else {
-                if (!IS_RANDO) {
-                    Actor_OfferGetItem(&this->actor, play, GI_SCALE_GOLD, 2000.0f, 1000.0f);
-                } else {
-                    GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_LH_ADULT_FISHING, GI_SCALE_GOLD);
-                    GiveItemEntryFromActor(&this->actor, play, getItemEntry, 2000.0f, 1000.0f);
-                }
+                Actor_OfferGetItem(&this->actor, play, GI_SCALE_GOLDEN, 2000.0f, 1000.0f);
             }
             break;
 
         case 24:
             sIsRodVisible = false;
-            if (((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) ||
-                (IS_RANDO && GET_PLAYER(play)->getItemId == GI_ICE_TRAP)) {
+            if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) {
                 if (sFishOnHandIsLoach == 0) {
                     this->stateAndTimer = 0;
                 } else {
diff --git a/soh/src/overlays/actors/ovl_Fishing/z_fishing.h b/soh/src/overlays/actors/ovl_Fishing/z_fishing.h
index c0d478e2a..5a937b08c 100644
--- a/soh/src/overlays/actors/ovl_Fishing/z_fishing.h
+++ b/soh/src/overlays/actors/ovl_Fishing/z_fishing.h
@@ -63,4 +63,13 @@ typedef struct Fishing {
 #define EN_FISH_PARAM 100    // param base for fish in pond.
 #define EN_FISH_AQUARIUM 200 // param for record fish in tank.
 
+struct VBFishingData {
+    Fishing* actor;
+    u8* sFishOnHandIsLoach;
+    u8* sSinkingLureLocation;
+    f32* sFishOnHandLength;
+    f32 fishWeight;
+    f32 sFishingRecordLength;
+};
+
 #endif
diff --git a/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c b/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c
index 796b157a3..5aa223290 100644
--- a/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c
+++ b/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c
@@ -50,7 +50,7 @@ static s16 sDrawItemIndexes[] = {
 };
 
 static s16 sGetItemIds[] = {
-    GI_BOTTLE,     GI_LETTER_RUTO, GI_SHIELD_HYLIAN, GI_QUIVER_40, GI_SCALE_SILVER, GI_SCALE_GOLD, GI_KEY_SMALL,
+    GI_BOTTLE,     GI_LETTER_RUTO, GI_SHIELD_HYLIAN, GI_QUIVER_40, GI_SCALE_SILVER, GI_SCALE_GOLDEN, GI_KEY_SMALL,
     GI_ARROW_FIRE, GI_NONE,        GI_NONE,          GI_NONE,      GI_NONE,         GI_NONE,       GI_NONE,
 };
 

From bcf9f392f063cd3f915b808b090b5842ddcf9d21 Mon Sep 17 00:00:00 2001
From: Christopher Leggett <chris@leggett.dev>
Date: Sun, 6 Oct 2024 20:58:45 -0400
Subject: [PATCH 223/230] Kaleido Menu for Miscellaneous Collectibles (#3852)

* Adds in-game display of certain rando collectibles.

Before, these were only available through the Item Tracker ImGui Window. With this commit, they can be accessed via holding C-Up on the Map Screen. Currently I've added Greg and Triforce Pieces (when applicable) to this menu. Boss Souls, Ocarina Buttons, and eventually Silver Rupees will be added later.

* Adds ocarina buttons to in-game display

* Initial pass on rendering the text on a black background.

* Starting to render boss soul icons

* Better alignment and rendering of Boss Soul icons.

* Adds icons prefixing the list entries.

* Switches boss souls to 32x32 icon.

* Partially working Matrix/Vtx implementation

Currently hardcoded Greg text, replacing map screen completely.

* Now rendering properly thanks to Archez!

* Better implementation of accessing the new page.

- now attached to Quest status instead of Map
- now triggered by a toggle instead of holding a button
- now has its own background (temporarily save screen but will be replaced with something custom later)

* Make KaleidoEntry's reactive to game state

Adds Greg proper and Triforce Hunt to the Misc. Collectibles Page.

* Conditionally render Triforce Hunt

* Documentation/Cleanup

* WIP Ocarina Buttons rendering

* Working ocarina buttons display

* Renders buttons as Gray instead of using Grayscale

This may seem inconsistent, but with Grayscale they technically render as different shades of gray, especially with custom cosmetics. With this they now render as the same shade of gray.

* Makes Ocarina Icon gray when no buttons have been collected.

* Adds Boss Souls.

Currently they run off the menu, need to implement scrolling.

* Implement Scrolling for the menu.

Need to figure out how to throttle the stick inputs still.

* Moves input handling to draw function.

I hate it but that's how Kaleido does it and there's some input throttling logic in there, so in order to make this feel like a kaleido menu I have to also handle input in the draw function.

* Removes custom cosmetic handling of Ocarina Buttons.

I've chosen not to respect the cosmetics for the sake of accessibility
and color contrast, but the code is still present and commented out in
case we want to reverse that decision.

* Hopefully fixes mac build errors.

* Implements update function via Hook.

* Another mac fix hopefully

* Cleans up unused code from the rectangle based attempt.

* Clean up more unused code

* Commit Boss Soul icon

* Fix typo

* Remove commented code

* Improve toggle functionality

* Re-introduce cosmetic matching for ocarina buttons

* Revert some unnecessary formatting changes

* Fix cursor/page turning issue

More improvements to come here (drawing arrows, custom text at the bottom, etc.)

* Fix some more formatting changes

* One last batch of formatting reverts
---
 .../parameter_static/gBossSoul.rgba32.png     | Bin 0 -> 5756 bytes
 soh/assets/soh_assets.h                       |   3 +
 soh/include/z64.h                             |   5 +-
 .../game-interactor/GameInteractor.h          |   1 +
 .../GameInteractor_RawAction.cpp              |  17 +
 soh/soh/Enhancements/kaleido.cpp              | 465 ++++++++++++++++++
 soh/soh/Enhancements/kaleido.h                | 176 +++++++
 soh/soh/Enhancements/mods.cpp                 |   2 +
 soh/soh/Enhancements/randomizer/context.cpp   |   7 +
 soh/soh/Enhancements/randomizer/context.h     |   3 +
 soh/src/code/z_kaleido_setup.c                |   2 +
 .../ovl_kaleido_scope/z_kaleido_scope_PAL.c   |  30 +-
 12 files changed, 702 insertions(+), 9 deletions(-)
 create mode 100755 soh/assets/custom/textures/parameter_static/gBossSoul.rgba32.png
 create mode 100644 soh/soh/Enhancements/kaleido.cpp
 create mode 100644 soh/soh/Enhancements/kaleido.h

diff --git a/soh/assets/custom/textures/parameter_static/gBossSoul.rgba32.png b/soh/assets/custom/textures/parameter_static/gBossSoul.rgba32.png
new file mode 100755
index 0000000000000000000000000000000000000000..9fe2ac4042ee5893354fd4fd2dec4b208b735ea1
GIT binary patch
literal 5756
zcmeHKdpwlc8-K?ow^&ILw#MkD%+;7%#&z5#O72!|=JH}<E@lS9CYKb2ilkB&)u^;>
zNu{)fN<w6dRZ-bQw?(%fU6kLMA?dUG`TRb8KEM61cRuGm=Y7uee9v>f&vTx6-%Z}j
z+;p`~v>^!6^>AnSfF7x6np41Cl92Ekf)IvqkVlw@$0A4*$aH`}4MHe%KtoI#s~}V%
zRUpd+O%I_08GwElXa+#8&{s4Qgu1dX17p+i@d+?qIIg3x#{*kk&{u&*0AoYYUj>bq
zKDKTb7%MJK<<D6Rv!pN=8OM`GAl*E?yrB_G2nqr7pL&H5Nx<N77;6eZ#1V)z9GQlv
zBJmU&fkd;WLMqV4Tn%Uzuz3d>qWH7F;Bn&m`%3sdaw5=A<2gHfdpJ8IMPgwXFA9br
z+1|t)y89&uv%1wGa@36UnJc2NdKdn+&&4cq#%6ExHtnOdT`S+Idzs`K8oAY;>h7**
zx7XGM2WkX5>W@Itu_7O7j=|_o!yhioL|t3shG)kOLP-^keiaK4hYDb>kB9lr)iY9$
zX`-^svyd3PZ_)HRqHTQ#eeK%wnJ=scB}rQl@=!v}0{sQM1VNWgFI(@)Z;3CWTx`sB
zTD#1a*Q&m0&RNX4kt=5(9xn=a&58>9nc`%XR~0nC4j}nGphWwvuxT8Av@(Dqj1D*w
z^T&k+NvuP~N3A4<ea1dPmkk)2+g7-#`v+zGUY5f~IluS#ZuC%(QNz6LM^s$5sJ9h6
ziATDVo}UY;pwN5gZ^(5R%;YC!sn)J4Za>~X$mtXmLMh?h%x7;Ry+Vh!zjk%YoQ+uD
zSyLC|wtYCc>HE+(9y_Nt<fsro)S;fQbG@IZak0{2w4gKOr#T0|bI7k^-iI{OYZ#kO
zbkOhJ?YP@n9e(G-2dMqAxaFL$E(pA?jOQ054f67&afEyfiz{Tq7#UxrjH9i+OvK_u
z!crs~4(AEzsKIm9C?t<dM+Mq=;k-o7a0JgiK@9sQEc4?eL~^KHl)as{t&9c$_^_0P
zl<}hk5}J&TQsUCUSRuxukV+M4Bpnq5vdvj2hLJ=J5rad!$at{?l$|!xR?H2f`7m6^
zA;1$I6(N<1Xjp7qTpT9O8Y2{kWARif6^kQa2?R9IKuh8UQkD!YkXR@n#xNMLgd^sO
zq&%Sjsla5hg)ve(3I*nopZw#Cyu2ph1(I<V03TQxON7N^a9BPcJJ~`ab%_Na;|~3!
zg~Tsj1Y><*i7-aYfn8!@fz)C$1eY^mFNzUIDYwJrVBsj34^$;!Rs0uAD$eDEg@S@`
z9$%!i0%U)oDdmNIChH5|6f?^0Om+mAPvCx`{b}z?WuWEdMPmp#F$(uQ7<80keHvHD
z;c;ooA(>#!VRK0~Xf~HaL=*9BE}BB3P|*|{3XXy&amhF`ZW5G-Kq6%cIIsc=fMa+7
zhef84i4;5$O(qdwG?5Ln(G(6$LUY+9HlB?q;|XliB#7l=9>_{o)MT#|P+R~Nh9{D&
z2~-Xm&!JL*H&h&&N@bDIVI;COg@d<Y!9=bSip!z73dMXD2q%xv3Wu>GLAY{4K{(CP
z+k=iGV8$F*O1z_3(lB5^M|tuDF|yC9emp+xD`hFz#FGhlB7uU#*^q3=6e8iXQUENL
zfJ{_iDl4pVMiCYo*bE?+rN~nNpp=8X(3E9VDE1Qyqv)uK+B`As1&$M!C1o){RR^FG
z)!Oe<wMOGW{hr{R<|X9v!s7pzw&L(0ZO20H&XY)m;&`QK>_qv((PK|zk5N43Q9>e>
zhl0l9jBP=}iiO7*23TWLoCua690t{6JY7G@dH;|KBnpvegJXfvk*zr(egqPl%_b1h
z91@!oM#fQXh?Fr}C(tFrFlii13_FGc9syS%J(d4s$c4&4St>c3(2k3M6;S|$p>bq1
zo;pq#(Po@5?D&SUikk6h$F|tNabl}fm{eqd-Ixp%FHj4y6UA_xGvL9$d5y>7-&_KT
z{I<wf@%xRgZ*+YX17D^5ExW$a^;HafmGZaj`oGbo{rPhW7J#>)IPkILTdpewpITGc
zOWhdIsNz?A{@`{X(Gs}_OCShip=b!1+&&fvHKZP1E*g(Drq47%FP<rI0-{+`mmsOL
zkgs?vhyM1>9hjnL1VQS@Js6IDL6>?1L!xH57=H|l4Ub!X{RwY*zss7lC#jbBRJDvL
zD)fc6-WCQ97yDDL9(6Zgk!mpKvKldhXsfS@XCq5<=aV8B=#6{oRDO5Iy(?}#xsqAZ
zT3RXTtT-1Qwzl}El?5vF-dc@O?ujK8qb<YD!=t0uFwc|75Bl2@FTDKFI{j^@bXE1!
zS8sjMfj`{Xn^|Z|nnSlMXsCXla5Hejh7G;^qx`u!IDaqB4xdJs$kjp$-YVsMk(FkC
z{>*!=G3X-vMg|Je8Ou&gEZ5poIr~}jl#z%JRoPW7b~_9*T=zfj-;}Bo{kpk7d+GUg
zZJqHw{e$~UQd`|TZx%n9V%3yVw&-kL?%mtTWV7H92g|pur@v?H$Ll+7GkqO$7BRZS
zIq^wrip;9qes*S@b#r=jPrWk}X>Wg~{9|VOO*dvT9*%pl9WL>9L_jr<tV50O{2X&i
z_vqHS$0KfsYk6@r%$9(=x1oC0VQ<5i1MW4|{9A9VZU$wST05vvsdgevRYJlPJL8rj
zJ@Ty%BYLCpdVRBx4$x`7MGnqrpz{?o=b7YrckSM)s;a~9hX=0@Ux-{XG&>3DZq~UG
zmWLM1A6YjlZw}eId+RSM#|l42cNSIsx;(&8z2n#_)tgQkduB8jo4YV)<@?NBYH2Q4
zOSW@zKjP$a?*5s#Wt>&2a!76%AMfbCsl8oixE*%sP8Y7JJmh)TNHd`L)fT-bt&8er
zcYd2MSDUBjcSoxz*3^eqjad~VyRu%?ra^ZP+P=)NZ;NA+r>Z~tvENjkzxsWdwN#Bq
z+G>ZB8=7hhFT6|dy{4+AmO6cngYLr3x|eVSWZKB$0(}*yjB6CR;S;IJmY!tEx~+LX
zj+i8$x45H4*P1ys{ZfD0Hrr#D)AZdf2UTPJk!i{LsZv@YZ@8_yd++s-Q)}9HPg|_7
zmmX=%iNDuAG&HpD)d;m~&Dm7Eb$E&R-Rr3`qKQlWhF6dIk<Kq9*Y~e|+BUVs@x~G;
zYcC|1>dA=}52Up07T*Pb+Q*s9v(!1!PZ-GGQF7pbTAF@Wl?YLCv%c2K^uT|xuk-Tv
z6`#4a$5b-gFqJi&BBdpE?C9_>86D2N+D^nVr?D4-xDd3Zt3R4LI<IG1z9eqE*V6L-
zBHTIT5TJG-@1kiO(=uzfzk9Tvn`YMohv4AgzWCacyo}p=YICb@sBGZWhdr?0r4v|D
zrsCwjb!YOvg}bUk5dzNwwTg=Ae{PySO;fF#qG!yJl`cvhitd^AY``@ho+lQILxb}x
zQQQFFaix~IzS9{h;)-$O;ziH>f`dy{FspvcXz(qq!A&*XnHTEGv!pzlC8|VZgw03|
zvKo@>@9WI2uDrHTzWdhC{3u3KZxaMHo!I6%KgV<apan7wGUo;csO4J)-v}@03;A_q
z^S)%Cg!_s0&3hhKC7Rk7+U~xc7uDHvb--Yo&mTvFD@rYoWM4g1T3TAMk;U-yZ~mq0
zH2>D=Y?-azC7gb?Yso@pSi6&^sO4^?Cv(=1)$0-i1GLZlasPgGLtz`gtn4Cg>cigN
z6n&Ld9XU*SSI~MNZRTOqs{Zd(ljf%QE%JYGWi@m6N&fq5qJu^C0&z={#6#a{!1k$X
zUy0i0&71p7HzFW<KHQvH$Bv{v>e3kqXhb#?HgI36x4gZ+{;l<Bx#pX-7lM5nO-p$#
zyXZd+VcXl=$!7J`hx9bt_byA5l1Be5C@6SXQ&Y1vZCg)4slWY9M1Ay0neFUN4Ai}?
z4Z{cW`dYVpYnC55eL4WD$w!CeW|i+uw7Y-!-Me=O-MotT@9(KQD|vMKr+QS*)$h$O
zmzZmhl#6>CEq<)-ZQ9vXmuVz)pKH+JHWE(si4+Jhh}L|je590z+U<!6DQCM}is;+7
zKmKr8*;CA;k(y#{BR3tpH7e`hzQ89Vpd}wG>^rYqxl&eN*fS>sPpaeHYJUa_JmlfB
LjPa{eXzG6fy4`VN

literal 0
HcmV?d00001

diff --git a/soh/assets/soh_assets.h b/soh/assets/soh_assets.h
index e8c947d0e..3f9039e35 100644
--- a/soh/assets/soh_assets.h
+++ b/soh/assets/soh_assets.h
@@ -97,6 +97,9 @@ static const ALIGN_ASSET(2) char gArrowDownTex[] = dgArrowDown;
 #define dgTriforcePiece "__OTR__textures/parameter_static/gTriforcePiece"
 static const ALIGN_ASSET(2) char gTriforcePieceTex[] = dgTriforcePiece;
 
+#define dgBossSoul "__OTR__textures/parameter_static/gBossSoul"
+static const ALIGN_ASSET(2) char gBossSoulTex[] = dgBossSoul;
+
 #define dgFileSelMQButtonTex "__OTR__textures/title_static/gFileSelMQButtonTex"
 static const ALIGN_ASSET(2) char gFileSelMQButtonTex[] = dgFileSelMQButtonTex;
 
diff --git a/soh/include/z64.h b/soh/include/z64.h
index 97f68341d..36fe91d69 100644
--- a/soh/include/z64.h
+++ b/soh/include/z64.h
@@ -920,7 +920,10 @@ typedef struct {
     /* 0x0266 */ u8     worldMapPoints[20]; // 0 = hidden; 1 = displayed; 2 = highlighted
     /* 0x027A */ u8     tradeQuestLocation;
     /* 0x027C */ SkelAnime playerSkelAnime;
-} PauseContext; // size = 0x2C0
+    // #region SOH [Randomizer]
+    /* 0x02C0 */ u8     randoQuestMode; // 0 = Off (normal quest menu); 1 = On (Misc Collectibles menu)
+    // #endregion
+} PauseContext; // size = 0x2C1
 
 typedef enum {
     /* 00 */ GAMEOVER_INACTIVE,
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h
index 5f8a10d8e..d96a3ab55 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h
@@ -790,6 +790,7 @@ public:
     public:
         static void SetSceneFlag(int16_t sceneNum, int16_t flagType, int16_t flag);
         static void UnsetSceneFlag(int16_t sceneNum, int16_t flagType, int16_t flag);
+        static bool CheckFlag(int16_t flagType, int16_t flag);
         static void SetFlag(int16_t flagType, int16_t chestNum);
         static void UnsetFlag(int16_t flagType, int16_t chestNum);
         static void AddOrRemoveHealthContainers(int16_t amount);
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor_RawAction.cpp b/soh/soh/Enhancements/game-interactor/GameInteractor_RawAction.cpp
index 5e61f704d..fb428d1ae 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor_RawAction.cpp
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor_RawAction.cpp
@@ -205,6 +205,23 @@ void GameInteractor::RawAction::UnsetSceneFlag(int16_t sceneNum, int16_t flagTyp
     }
 };
 
+bool GameInteractor::RawAction::CheckFlag(int16_t flagType, int16_t flag) {
+    switch (flagType) {
+        case FlagType::FLAG_EVENT_CHECK_INF:
+            return Flags_GetEventChkInf(flag);
+        case FlagType::FLAG_ITEM_GET_INF:
+            return Flags_GetItemGetInf(flag);
+        case FlagType::FLAG_INF_TABLE:
+            return Flags_GetInfTable(flag);
+        case FlagType::FLAG_EVENT_INF:
+            return Flags_GetEventInf(flag);
+        case FlagType::FLAG_RANDOMIZER_INF:
+            return Flags_GetRandomizerInf(static_cast<RandomizerInf>(flag));
+        case FlagType::FLAG_GS_TOKEN:
+            return GET_GS_FLAGS((flag & 0x1F00) >> 8);
+    }
+}
+
 void GameInteractor::RawAction::SetFlag(int16_t flagType, int16_t flag) {
     switch (flagType) {
         case FlagType::FLAG_EVENT_CHECK_INF:
diff --git a/soh/soh/Enhancements/kaleido.cpp b/soh/soh/Enhancements/kaleido.cpp
new file mode 100644
index 000000000..6d66a0578
--- /dev/null
+++ b/soh/soh/Enhancements/kaleido.cpp
@@ -0,0 +1,465 @@
+#include "kaleido.h"
+
+#include "soh/frame_interpolation.h"
+
+extern "C" {
+#include "z64.h"
+#include "functions.h"
+#include "macros.h"
+#include "variables.h"
+#include <textures/message_static/message_static.h>
+#include <textures/parameter_static/parameter_static.h>
+extern PlayState* gPlayState;
+}
+#include "soh/OTRGlobals.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh_assets.h"
+#include "textures/icon_item_static/icon_item_static.h"
+#include "consolevariablebridge.h"
+#include "soh/Enhancements/cosmetics/cosmeticsTypes.h"
+
+#include <sstream>
+
+extern "C" {
+void KaleidoScope_MoveCursorToSpecialPos(PlayState* play, u16 specialPos);
+}
+
+namespace Rando {
+
+    void KaleidoEntryIcon::LoadIconTex(std::vector<Gfx>* mEntryDl) {
+        if (mIconFormat == G_IM_FMT_IA) {
+            if (mIconSize == G_IM_SIZ_8b) {
+                Gfx iconTexture[] = { gsDPLoadTextureBlock(mIconResourceName, G_IM_FMT_IA, G_IM_SIZ_8b, mIconWidth, mIconHeight, 0,
+                                              G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK,
+                                              G_TX_NOLOD, G_TX_NOLOD) };
+                mEntryDl->insert(mEntryDl->end(), std::begin(iconTexture), std::end(iconTexture));
+            }
+        } else if (mIconFormat == G_IM_FMT_RGBA) {
+            if (mIconSize == G_IM_SIZ_32b) {
+                Gfx iconTexture[] = { gsDPLoadTextureBlock(mIconResourceName, G_IM_FMT_RGBA, G_IM_SIZ_32b, mIconWidth, mIconHeight, 0,
+                                                           G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK,
+                                                           G_TX_NOLOD, G_TX_NOLOD) };
+                mEntryDl->insert(mEntryDl->end(), std::begin(iconTexture), std::end(iconTexture));
+            }
+        }
+    }
+
+    KaleidoEntry::KaleidoEntry(int16_t x, int16_t y, std::string text) : mX(x), mY(y), mText(std::move(text)) {
+        mHeight = 0;
+        mWidth = 0;
+        vtx = nullptr;
+    }
+
+    void KaleidoEntry::SetYOffset(int yOffset) {
+        mY = yOffset;
+    }
+
+    void KaleidoEntryIcon::Draw(PlayState* play, std::vector<Gfx>* mEntryDl) {
+        if (vtx == nullptr) {
+            return;
+        }
+        size_t numChar = mText.length();
+        if (numChar == 0) {
+            return;
+        }
+
+        Color_RGBA8 textColor = { 255, 255, 255, 255 };
+        if (mAchieved) {
+            textColor = { 0x98, 0xFF, 0x44, 255 };
+        }
+
+        Matrix_Translate(mX, mY, 0.0f, MTXMODE_APPLY);
+
+        mEntryDl->push_back(gsSPMatrix(Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW));
+
+        // icon
+        if (!mAchieved) {
+            mEntryDl->push_back(gsDPSetGrayscaleColor(109, 109, 109, 255));
+            mEntryDl->push_back(gsSPGrayscale(true));
+        }
+        mEntryDl->push_back(gsDPSetPrimColor(0, 0, mIconColor.r, mIconColor.g, mIconColor.b, mIconColor.a));
+        mEntryDl->push_back(gsSPVertex(vtx, 4, 0));
+        LoadIconTex(mEntryDl);
+        mEntryDl->push_back(gsSP1Quadrangle(0, 2, 3, 1, 0));
+        mEntryDl->push_back(gsSPGrayscale(false));
+
+        // text
+        mEntryDl->push_back(gsDPSetPrimColor(0, 0, textColor.r, textColor.g, textColor.b, textColor.a));
+        for (size_t i = 0, vtxGroup = 0; i < numChar; i++) {
+            uint16_t texIndex = mText[i] - 32;
+
+            // A maximum of 64 Vtx can be loaded at once by gSPVertex, or basically 16 characters
+            // handle loading groups of 16 chars at a time until there are no more left to load.
+            // By this point 4 vertices have already been loaded for the preceding icon.
+            if (i % 16 == 0) {
+                size_t numVtxToLoad = std::min<size_t>(numChar - i, 16) * 4;
+                mEntryDl->push_back(gsSPVertex(&vtx[4 + (vtxGroup * 16 * 4)], numVtxToLoad, 0));
+                vtxGroup++;
+            }
+
+            if (texIndex != 0) {
+                auto texture = reinterpret_cast<uintptr_t>(Font_FetchCharTexture(texIndex));
+                auto vertexStart = static_cast<int16_t>(4 * (i % 16));
+
+                Gfx charTexture[] = {gsDPLoadTextureBlock_4b(texture, G_IM_FMT_I, FONT_CHAR_TEX_WIDTH,
+                                                             FONT_CHAR_TEX_HEIGHT, 0, G_TX_NOMIRROR | G_TX_CLAMP,
+                                                             G_TX_NOMIRROR | G_TX_CLAMP,
+                                                             G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD)};
+                mEntryDl->insert(mEntryDl->end(), std::begin(charTexture), std::end(charTexture));
+                mEntryDl->push_back(
+                        gsSP1Quadrangle(vertexStart, vertexStart + 2, vertexStart + 3, vertexStart + 1, 0));
+            }
+        }
+        mEntryDl->push_back(gsSPPopMatrix(G_MTX_MODELVIEW));
+    }
+
+    Kaleido::Kaleido() {
+        const auto ctx = Rando::Context::GetInstance();
+        int yOffset = 2;
+        mEntries.push_back(std::make_shared<KaleidoEntryIconFlag>(gRupeeCounterIconTex, G_IM_FMT_IA, G_IM_SIZ_8b, 16, 16,
+                              Color_RGBA8{ 0xC8, 0xFF, 0x64, 255 }, FlagType::FLAG_RANDOMIZER_INF,
+                              static_cast<int>(RAND_INF_GREG_FOUND), 0, yOffset, "Greg"));
+        yOffset += 18;
+        if (ctx->GetOption(RSK_TRIFORCE_HUNT)) {
+            mEntries.push_back(
+                    std::make_shared<KaleidoEntryIconCountRequired>(
+                            gTriforcePieceTex, G_IM_FMT_RGBA, G_IM_SIZ_32b, 32, 32, Color_RGBA8{ 255,255,255,255 }, 0,
+                            yOffset, reinterpret_cast<int*>(&gSaveContext.triforcePiecesCollected),
+                            ctx->GetOption(RSK_TRIFORCE_HUNT_PIECES_REQUIRED).GetSelectedOptionIndex() + 1,
+                            ctx->GetOption(RSK_TRIFORCE_HUNT_PIECES_TOTAL).GetSelectedOptionIndex() + 1));
+            yOffset += 18;
+        }
+        if (ctx->GetOption(RSK_SHUFFLE_OCARINA_BUTTONS)) {
+            mEntries.push_back(std::make_shared<KaleidoEntryOcarinaButtons>(0, yOffset));
+            yOffset += 18;
+        }
+        if (ctx->GetOption(RSK_SHUFFLE_BOSS_SOULS).IsNot(RO_BOSS_SOULS_OFF)) {
+            static const char* bossSoulNames[] = {
+                    "Gohma's Soul",
+                    "King Dodongo's Soul",
+                    "Barinade's Soul",
+                    "Phantom Ganon's Soul",
+                    "Volvagia's Soul",
+                    "Morpha's Soul",
+                    "Bongo Bongo's Soul",
+                    "Twinrova's Soul",
+            };
+            for (int i = RAND_INF_GOHMA_SOUL; i < RAND_INF_GANON_SOUL; i++) {
+                mEntries.push_back(
+                    std::make_shared<KaleidoEntryIconFlag>(
+                        gBossSoulTex, G_IM_FMT_RGBA, G_IM_SIZ_32b, 32, 32, Color_RGBA8{ 255, 255, 255, 255 },
+                        FlagType::FLAG_RANDOMIZER_INF, i, 0, yOffset, bossSoulNames[i - RAND_INF_GOHMA_SOUL]
+                    )
+                );
+                yOffset += 18;
+            }
+        }
+        if (ctx->GetOption(RSK_SHUFFLE_BOSS_SOULS).Is(RO_BOSS_SOULS_ON_PLUS_GANON)) {
+            mEntries.push_back(
+                    std::make_shared<KaleidoEntryIconFlag>(
+                            gBossSoulTex, G_IM_FMT_RGBA, G_IM_SIZ_32b, 32, 32, Color_RGBA8{ 255, 255, 255, 255 },
+                            FlagType::FLAG_RANDOMIZER_INF, RAND_INF_GANON_SOUL, 0, yOffset, "Ganon's Soul"
+                    )
+            );
+            yOffset += 18;
+        }
+    }
+
+    extern "C" {
+    void FrameInterpolation_RecordCloseChild(void);
+    void FrameInterpolation_RecordOpenChild(const void* a, int b);
+    }
+
+    void Kaleido::Draw(PlayState* play) {
+        if (play == nullptr || mEntries.empty()) {
+            return;
+        }
+        PauseContext* pauseCtx = &play->pauseCtx;
+        Input* input = &play->state.input[0];
+        mEntryDl.clear();
+        OPEN_DISPS(play->state.gfxCtx);
+        mEntryDl.push_back(gsDPPipeSync());
+        Gfx_SetupDL_42Opa(play->state.gfxCtx);
+        mEntryDl.push_back(gsDPSetCombineMode(G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM));
+
+        // Move the matrix origin to the top-left corner of the kaleido page
+        Matrix_Translate(-108.f, 58.f, 0.0f, MTXMODE_APPLY);
+        // Invert the matrix to render vertices with positive going down
+        Matrix_Scale(1.0f, -1.0f, 1.0f, MTXMODE_APPLY);
+        // The scrolling logic is in here because the built in kaleido input throttling happens
+        // in its Draw functions, which get called after their update functions. I hate it but fixing
+        // it would be a much larger Kaleido change.
+        bool shouldScroll = false;
+        bool dpad = CVarGetInteger(CVAR_SETTING("DPadOnPause"), 0);
+        if ((!pauseCtx->unk_1E4 || (pauseCtx->unk_1E4 == 5) || (pauseCtx->unk_1E4 == 8)) &&
+            (pauseCtx->pageIndex == PAUSE_QUEST)) {
+            if (pauseCtx->cursorSpecialPos == 0) {
+                if ((pauseCtx->stickRelY > 30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DUP))) {
+                    if (mTopIndex > 0) {
+                        mTopIndex--;
+                        shouldScroll = true;
+                    }
+                } else if ((pauseCtx->stickRelY < -30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DDOWN))) {
+                    if (mTopIndex + mNumVisible < mEntries.size()) {
+                        mTopIndex++;
+                        shouldScroll = true;
+                    }
+                }
+                if ((pauseCtx->stickRelX < -30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DLEFT))) {
+                    KaleidoScope_MoveCursorToSpecialPos(play, PAUSE_CURSOR_PAGE_LEFT);
+                    pauseCtx->unk_1E4 = 0;
+                } else if ((pauseCtx->stickRelX > 30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DRIGHT))) {
+                    KaleidoScope_MoveCursorToSpecialPos(play, PAUSE_CURSOR_PAGE_RIGHT);
+                    pauseCtx->unk_1E4 = 0;
+                }
+            } else if (pauseCtx->cursorSpecialPos == PAUSE_CURSOR_PAGE_LEFT) {
+                if ((pauseCtx->stickRelX > 30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DRIGHT))) {
+                    pauseCtx->cursorSpecialPos = 0;
+                    Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
+                }
+            } else if (pauseCtx->cursorSpecialPos == PAUSE_CURSOR_PAGE_RIGHT) {
+                if ((pauseCtx->stickRelX < -30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DLEFT))) {
+                    pauseCtx->cursorSpecialPos = 0;
+                    Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
+                }
+            }
+        }
+        int yOffset = 2;
+        for (int i = mTopIndex; i < (mTopIndex + mNumVisible) && i < mEntries.size(); i++) {
+            auto& entry = mEntries[i];
+            if (shouldScroll) {
+                entry->SetYOffset(yOffset);
+                yOffset += 18;
+                Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
+            }
+            Matrix_Push();
+            entry->Draw(play, &mEntryDl);
+            Matrix_Pop();
+        }
+
+        mEntryDl.push_back(gsSPEndDisplayList());
+        gSPDisplayList(POLY_KAL_DISP++, mEntryDl.data());
+        CLOSE_DISPS(play->state.gfxCtx);
+    }
+
+    void Kaleido::Update(PlayState *play) {
+        for(int i = mTopIndex; i < (mTopIndex + mNumVisible) && i < mEntries.size(); i++) {
+            const auto& entry = mEntries[i];
+            entry->Update(play);
+        }
+    }
+
+    extern "C" void RandoKaleido_DrawMiscCollectibles(PlayState* play) {
+        OTRGlobals::Instance->gRandoContext->GetKaleido()->Draw(play);
+    }
+
+    extern "C" void RandoKaleido_UpdateMiscCollectibles(int16_t inDungeonScene) {
+        PauseContext* pauseCtx = &gPlayState->pauseCtx;
+        if (pauseCtx->randoQuestMode && pauseCtx->pageIndex == PAUSE_QUEST) {
+            OTRGlobals::Instance->gRandoContext->GetKaleido()->Update(gPlayState);
+        }
+    }
+
+    KaleidoEntryIconFlag::KaleidoEntryIconFlag(const char *iconResourceName, int iconFormat, int iconSize, int iconWidth,
+                                               int iconHeight, Color_RGBA8 iconColor, FlagType flagType, int flag,
+                                               int16_t x, int16_t y, std::string name) :
+        mFlagType(flagType), mFlag(flag),
+        KaleidoEntryIcon(iconResourceName, iconFormat, iconSize, iconWidth, iconHeight, iconColor, x, y, std::move(name)) {
+        BuildVertices();
+    }
+
+    void KaleidoEntryIconFlag::Update(PlayState* play) {
+        mAchieved = GameInteractor::RawAction::CheckFlag(mFlagType, static_cast<int16_t>(mFlag));
+    }
+
+    KaleidoEntryIconCountRequired::KaleidoEntryIconCountRequired(const char *iconResourceName, int iconFormat,
+        int iconSize, int iconWidth, int iconHeight, Color_RGBA8 iconColor, int16_t x, int16_t y, int* watch,
+        int required, int total) : mWatch(watch), mRequired(required), mTotal(total),
+        KaleidoEntryIcon(iconResourceName, iconFormat, iconSize, iconWidth, iconHeight, iconColor, x, y) {
+        mCount = *mWatch;
+        BuildText();
+        BuildVertices();
+    }
+
+    void KaleidoEntryIconCountRequired::BuildText() {
+        std::ostringstream totals;
+        totals << mCount;
+        if (mRequired != 0 && mCount < mRequired) {
+            totals << '/' << mRequired;
+        }
+        if (mTotal >= mRequired && mCount >= mRequired) {
+            totals << '/' << mTotal;
+        }
+        mText = totals.str();
+    }
+
+    void KaleidoEntryIcon::BuildVertices() {
+        int offsetY = 0;
+        int offsetX = 0;
+        // 4 vertices per character, plus one for the preceding icon.
+        Vtx* vertices = (Vtx*)calloc(sizeof(Vtx[4]), mText.length() + 1);
+        // Vertex for the preceding icon.
+        Interface_CreateQuadVertexGroup(vertices, offsetX, offsetY, mIconWidth, mIconHeight, 0);
+        offsetX += 18;
+        for (size_t i = 0; i < mText.length(); i++) {
+            auto charIndex = static_cast<uint16_t>(mText[i] - 32);
+            int charWidth = 0;
+            if (charIndex >= 0) {
+                charWidth = static_cast<int>(Message_GetCharacterWidth(charIndex) * (100.0f / R_TEXT_CHAR_SCALE));
+            }
+            Interface_CreateQuadVertexGroup(&(vertices)[(i + 1) * 4], offsetX, offsetY, charWidth, 16, 0);
+            offsetX += charWidth;
+        }
+        offsetY += FONT_CHAR_TEX_HEIGHT;
+        mWidth = static_cast<int16_t>(offsetX);
+        mHeight = static_cast<int16_t>(offsetY);
+
+        vertices[1].v.ob[0] = 16;
+        vertices[2].v.ob[1] = 16;
+        vertices[3].v.ob[0] = 16;
+        vertices[3].v.ob[1] = 16;
+        vtx = vertices;
+    }
+
+    KaleidoEntryIcon::KaleidoEntryIcon(const char *iconResourceName, int iconFormat, int iconSize, int iconWidth,
+                                       int iconHeight, Color_RGBA8 iconColor, int16_t x, int16_t y, std::string text)
+                                       : mIconResourceName(iconResourceName), mIconFormat(iconFormat), mIconSize(iconSize),
+                                       mIconWidth(iconWidth), mIconHeight(iconHeight), mIconColor(iconColor),
+                                       KaleidoEntry(x, y, std::move(text)) {}
+
+    void KaleidoEntryIcon::RebuildVertices() {
+        free(vtx);
+        vtx = nullptr;
+        BuildVertices();
+    }
+
+    void KaleidoEntryIconCountRequired::Update(PlayState *play) {
+        if (mCount != *mWatch) {
+            mCount = *mWatch;
+            BuildText();
+            RebuildVertices();
+            mAchieved = mCount >= mRequired;
+        }
+
+    }
+
+    KaleidoEntryOcarinaButtons::KaleidoEntryOcarinaButtons(int16_t x, int16_t y) :
+            KaleidoEntryIcon(gItemIconOcarinaOfTimeTex, G_IM_FMT_RGBA, G_IM_SIZ_32b, 32, 32,
+                             Color_RGBA8{ 255, 255, 255, 255 }, x, y, "\x9F\xA5\xA6\xA7\xA8") {
+        CalculateColors();
+        BuildVertices();
+    }
+
+    void KaleidoEntryOcarinaButtons::CalculateColors() {
+        Color_RGB8 aButtonColor = { 80, 150, 255 };
+        if (CVarGetInteger(CVAR_COSMETIC("HUD.AButton.Changed"), 0)) {
+            aButtonColor = CVarGetColor24(CVAR_COSMETIC("HUD.AButton.Value"), aButtonColor);
+        } else if (CVarGetInteger(CVAR_COSMETIC("DefaultColorScheme"), COLORSCHEME_N64) == COLORSCHEME_GAMECUBE) {
+            aButtonColor = { 80, 255, 150};
+        }
+        mButtonColors[0] = { aButtonColor.r, aButtonColor.g, aButtonColor.b, 255 };
+        Color_RGB8 cButtonsColor = { 255, 255, 50 };
+        Color_RGB8 cUpButtonColor = cButtonsColor;
+        Color_RGB8 cDownButtonColor = cButtonsColor;
+        Color_RGB8 cLeftButtonColor = cButtonsColor;
+        Color_RGB8 cRightButtonColor = cButtonsColor;
+        if (CVarGetInteger(CVAR_COSMETIC("HUD.CButtons.Changed"), 0)) {
+            cUpButtonColor = CVarGetColor24(CVAR_COSMETIC("HUD.CButtons.Value"), cButtonsColor);
+            cDownButtonColor = CVarGetColor24(CVAR_COSMETIC("HUD.CButtons.Value"), cButtonsColor);
+            cLeftButtonColor = CVarGetColor24(CVAR_COSMETIC("HUD.CButtons.Value"), cButtonsColor);
+            cRightButtonColor = CVarGetColor24(CVAR_COSMETIC("HUD.CButtons.Value"), cButtonsColor);
+        }
+        if (CVarGetInteger(CVAR_COSMETIC("HUD.CUpButton.Changed"), 0)) {
+            cUpButtonColor = CVarGetColor24(CVAR_COSMETIC("HUD.CUpButton.Value"), cUpButtonColor);
+        }
+        if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.Changed"), 0)) {
+            cDownButtonColor = CVarGetColor24(CVAR_COSMETIC("HUD.CDownButton.Value"), cDownButtonColor);
+        }
+        if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.Changed"), 0)) {
+            cLeftButtonColor = CVarGetColor24(CVAR_COSMETIC("HUD.CLeftButton.Value"), cLeftButtonColor);
+        }
+        if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.Changed"), 0)) {
+            cRightButtonColor = CVarGetColor24(CVAR_COSMETIC("HUD.CRightButton.Value"), cRightButtonColor);
+        }
+        mButtonColors[1] = { cUpButtonColor.r, cUpButtonColor.g, cUpButtonColor.b, 255 };
+        mButtonColors[2] = { cDownButtonColor.r, cDownButtonColor.g, cDownButtonColor.b, 255 };
+        mButtonColors[3] = { cLeftButtonColor.r, cLeftButtonColor.g, cLeftButtonColor.b, 255 };
+        mButtonColors[4] = { cRightButtonColor.r, cRightButtonColor.g, cRightButtonColor.b, 255 };
+    }
+
+    void KaleidoEntryOcarinaButtons::Update(PlayState *play) {
+        mButtonCollected[0] = GameInteractor::RawAction::CheckFlag(FLAG_RANDOMIZER_INF, RAND_INF_HAS_OCARINA_A) > 0;
+        mButtonCollected[1] = GameInteractor::RawAction::CheckFlag(FLAG_RANDOMIZER_INF, RAND_INF_HAS_OCARINA_C_UP) > 0;
+        mButtonCollected[2] = GameInteractor::RawAction::CheckFlag(FLAG_RANDOMIZER_INF, RAND_INF_HAS_OCARINA_C_DOWN) > 0;
+        mButtonCollected[3] = GameInteractor::RawAction::CheckFlag(FLAG_RANDOMIZER_INF, RAND_INF_HAS_OCARINA_C_LEFT) > 0;
+        mButtonCollected[4] = GameInteractor::RawAction::CheckFlag(FLAG_RANDOMIZER_INF, RAND_INF_HAS_OCARINA_C_RIGHT) > 0;
+        CalculateColors();
+        mAchieved = false;
+        for (int i = 0; i < mButtonCollected.size(); i++) {
+            if (!mButtonCollected[i]) {
+                mButtonColors[i] = Color_RGBA8{ 109, 109, 109, 255 };
+            } else {
+                mAchieved = true;
+            }
+        }
+    }
+
+    void KaleidoEntryOcarinaButtons::Draw(PlayState *play, std::vector<Gfx>* mEntryDl) {
+        if (vtx == nullptr) {
+            return;
+        }
+        size_t numChar = mText.length();
+        if (numChar == 0) {
+            return;
+        }
+
+        Matrix_Translate(mX, mY, 0.0f, MTXMODE_APPLY);
+//        Matrix_Scale(0.75f, 0.75f, 0.75f, MTXMODE_APPLY);
+
+        mEntryDl->push_back(gsSPMatrix(Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW));
+
+        // icon
+        if (!mAchieved) {
+            mEntryDl->push_back(gsDPSetGrayscaleColor(109, 109, 109, 255));
+            mEntryDl->push_back(gsSPGrayscale(true));
+        }
+        mEntryDl->push_back(gsDPSetPrimColor(0, 0, mIconColor.r, mIconColor.g, mIconColor.b, mIconColor.a));
+        mEntryDl->push_back(gsSPVertex(vtx, 4, 0));
+        LoadIconTex(mEntryDl);
+        mEntryDl->push_back(gsSP1Quadrangle(0, 2, 3, 1, 0));
+        mEntryDl->push_back(gsSPGrayscale(false));
+
+        // text
+        for (size_t i = 0, vtxGroup = 0; i < numChar; i++) {
+            mEntryDl->push_back(gsDPSetPrimColor(0, 0, mButtonColors[i].r, mButtonColors[i].g, mButtonColors[i].b, mButtonColors[i].a));
+            uint16_t texIndex = mText[i] - 32;
+
+            // A maximum of 64 Vtx can be loaded at once by gSPVertex, or basically 16 characters
+            // handle loading groups of 16 chars at a time until there are no more left to load.
+            // By this point 4 vertices have already been loaded for the preceding icon.
+            if (i % 16 == 0) {
+                size_t numVtxToLoad = std::min<size_t>(numChar - i, 16) * 4;
+                mEntryDl->push_back(gsSPVertex(&vtx[4 + (vtxGroup * 16 * 4)], numVtxToLoad, 0));
+                vtxGroup++;
+            }
+
+            if (texIndex != 0) {
+                auto texture = reinterpret_cast<uintptr_t>(Font_FetchCharTexture(texIndex));
+                auto vertexStart = static_cast<int16_t>(4 * (i % 16));
+
+                Gfx charTexture[] = {gsDPLoadTextureBlock_4b(texture, G_IM_FMT_I, FONT_CHAR_TEX_WIDTH,
+                                                             FONT_CHAR_TEX_HEIGHT, 0, G_TX_NOMIRROR | G_TX_CLAMP,
+                                                             G_TX_NOMIRROR | G_TX_CLAMP,
+                                                             G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD)};
+                mEntryDl->insert(mEntryDl->end(), std::begin(charTexture), std::end(charTexture));
+                mEntryDl->push_back(
+                        gsSP1Quadrangle(vertexStart, vertexStart + 2, vertexStart + 3, vertexStart + 1, 0));
+            }
+        }
+        mEntryDl->push_back(gsSPPopMatrix(G_MTX_MODELVIEW));
+    }
+} // Rando
+
+void RandoKaleido_RegisterHooks() {
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnKaleidoscopeUpdate>(RandoKaleido_UpdateMiscCollectibles);
+}
\ No newline at end of file
diff --git a/soh/soh/Enhancements/kaleido.h b/soh/soh/Enhancements/kaleido.h
new file mode 100644
index 000000000..db86a817e
--- /dev/null
+++ b/soh/soh/Enhancements/kaleido.h
@@ -0,0 +1,176 @@
+#ifndef KALEIDO_H
+#define KALEIDO_H
+#include <z64.h>
+
+
+#ifdef __cplusplus
+#include <vector>
+#include <string>
+#include <array>
+
+namespace Rando {
+
+/**
+ * Base class for all Kaleido Entries in our Rando Collectibles list.
+ * Stores the common aspects such as the line of text, positioning,
+ * vertices, and whether or not the goal has been achieved (subclasses
+ * can use this to change their rendering). Also sets an interface for
+ * subclasses to declare their Draw and Update functions.
+ */
+class KaleidoEntry {
+public:
+    /**
+     * @brief Constructor for Base KaleidoEntry class. Sets the position and
+     * initial value of the line of text.
+     * @param x x coordinate relative to the current matrix origin.
+     * @param y y coordinate relative to the current matrix origin.
+     * @param text the initial value of the line of text. Can be omitted for an
+     * empty string.
+     */
+    KaleidoEntry(int16_t x, int16_t y, std::string text = "");
+    virtual void Draw(PlayState* play, std::vector<Gfx>* mEntryDl) = 0;
+    virtual void Update(PlayState* play) = 0;
+    void SetYOffset(int yOffset);
+protected:
+    int16_t mX;
+    int16_t mY;
+    int16_t mHeight;
+    int16_t mWidth;
+    Vtx* vtx;
+    std::string mText;
+    bool mAchieved = false;
+
+};
+
+/**
+ * Subclass of KaleidoEntry intended to be a parent class for any KaleidoEntry subclasses
+ * that wish to render an Icon at the start of their line.
+ */
+class KaleidoEntryIcon : public KaleidoEntry {
+public:
+    /**
+     * @param iconResourceName resource name of the icon to draw
+     * @param iconFormat flag representing the format of the icon (i.e. G_IM_FMT_IA)
+     * @param iconSize flag representing the size of the icon in bytes (i.e. G_IM_SIZ_8b)
+     * @param iconWidth pixel width of the source icon image
+     * @param iconHeight pixel height of the source icon image
+     * @param iconColor Color to shade the icon with. This may be ignored for certain icon formats
+     * @param x x coordinate of the location to draw this relative to the parent matrix's origin.
+     * @param y y coordinate of the location to draw this relative to the parent matrix's origin.
+     * @param text text to draw to the right of the icon.
+     */
+    KaleidoEntryIcon(const char* iconResourceName, int iconFormat, int iconSize, int iconWidth, int iconHeight,
+                     Color_RGBA8 iconColor, int16_t x, int16_t y, std::string text = "");
+    void Draw(PlayState* play, std::vector<Gfx>* mEntryDl) override;
+    void RebuildVertices();
+protected:
+    const char* mIconResourceName;
+    int mIconFormat;
+    int mIconSize;
+    int mIconWidth;
+    int mIconHeight;
+    Color_RGBA8 mIconColor;
+
+    void BuildVertices();
+    void LoadIconTex(std::vector<Gfx>* mEntryDl);
+};
+
+/**
+ * Class representing a Kaleido Entry that can be represented with an icon
+ * that is either colored in or Grayscale according to a flag
+ */
+class KaleidoEntryIconFlag : public KaleidoEntryIcon {
+public :
+    /**
+     * @param iconResourceName resource name of the icon to draw
+     * @param iconFormat flag representing the format of the icon (i.e. G_IM_FMT_IA)
+     * @param iconSize flag representing the size of the icon in bytes (i.e. G_IM_SIZ_8b)
+     * @param iconWidth pixel width of the source icon image
+     * @param iconHeight pixel height of the source icon image
+     * @param iconColor Color to shade the icon with. This may be ignored for certain icon formats
+     * @param flagType FlagType of the flag to check for (i.e. FlagType::FLAG_RANDOMIZER_INF
+     * @param flag flag to check for. An integer can be provided but enum values should be preferred
+     * @param x x coordinate of the location to draw this relative to the parent matrix's origin.
+     * @param y y coordinate of the location to draw this relative to the parent matrix's origin.
+     * @param mName name to draw to the right of the icon. Leave blank to omit.
+     */
+    KaleidoEntryIconFlag(const char* iconResourceName, int iconFormat, int iconSize, int iconWidth, int iconHeight,
+                         Color_RGBA8 iconColor, FlagType flagType, int flag, int16_t x, int16_t y,
+                         std::string name = "");
+    void Update(PlayState* play) override;
+private:
+    FlagType mFlagType;
+    int mFlag;
+};
+
+/**
+ * KaleidoEntryIcon subclass to render a count of how many collectibles have been collected.
+ * The `required` and `total` values can be omitted from the constructor or set to 0 to only
+ * render the count and not show progress towards a required amount or a total.
+ */
+class KaleidoEntryIconCountRequired : public KaleidoEntryIcon {
+public:
+    /**
+     * @param iconResourceName resource name of the icon to draw
+     * @param iconFormat flag representing the format of the icon (i.e. G_IM_FMT_IA)
+     * @param iconSize flag representing the size of the icon in bytes (i.e. G_IM_SIZ_8b)
+     * @param iconWidth pixel width of the source icon image
+     * @param iconHeight pixel height of the source icon image
+     * @param iconColor Color to shade the icon with. This may be ignored for certain icon formats
+     * @param flagType FlagType of the flag to check for (i.e. FlagType::FLAG_RANDOMIZER_INF
+     * @param flag flag to check for. An integer can be provided but enum values should be preferred
+     * @param x x coordinate of the location to draw this relative to the parent matrix's origin.
+     * @param y y coordinate of the location to draw this relative to the parent matrix's origin.
+     * @param watch a pointer to an integer value to watch. Update will check this value to update
+     * a local count variable.
+     * @param required The amount of this collectible required to beat the seed. Set to 0 to not render.
+     * @param total The amount of this collectible available in the seed. Set to 0 to not render.
+     */
+    KaleidoEntryIconCountRequired(const char* iconResourceName, int iconFormat, int iconSize, int iconWidth, int iconHeight,
+                                  Color_RGBA8 iconColor, int16_t x, int16_t y, int* watch, int required = 0, int total = 0);
+    void Update(PlayState* play) override;
+private:
+    int* mWatch;
+    int mRequired;
+    int mTotal;
+    int mCount;
+
+    void BuildText();
+};
+
+class KaleidoEntryOcarinaButtons : public KaleidoEntryIcon {
+public:
+    KaleidoEntryOcarinaButtons(int16_t x, int16_t y);
+    void Update(PlayState* play) override;
+    void Draw(PlayState* play, std::vector<Gfx>* mEntryDl) override;
+private:
+    void CalculateColors();
+
+    std::array<Color_RGBA8, 5> mButtonColors = {};
+    std::array<bool, 5> mButtonCollected = {};
+};
+
+class Kaleido {
+public:
+    Kaleido();
+    void Draw(PlayState* play);
+    void Update(PlayState* play);
+private:
+    std::vector<std::shared_ptr<KaleidoEntry>> mEntries;
+    std::vector<Gfx> mEntryDl;
+    int mTopIndex = 0;
+    int mNumVisible = 7;
+};
+} // Rando
+
+extern "C" {
+#endif
+void RandoKaleido_DrawMiscCollectibles(PlayState* play);
+void RandoKaleido_UpdateMiscCollectibles(int16_t inDungeonScene);
+#ifdef __cplusplus
+}
+#endif
+void RandoKaleido_RegisterHooks();
+
+
+#endif //KALEIDO_H
diff --git a/soh/soh/Enhancements/mods.cpp b/soh/soh/Enhancements/mods.cpp
index a8141ca81..2c0368fea 100644
--- a/soh/soh/Enhancements/mods.cpp
+++ b/soh/soh/Enhancements/mods.cpp
@@ -35,6 +35,7 @@
 #include "src/overlays/actors/ovl_En_Door/z_en_door.h"
 #include "objects/object_link_boy/object_link_boy.h"
 #include "objects/object_link_child/object_link_child.h"
+#include "kaleido.h"
 
 extern "C" {
 #include <z64.h>
@@ -1676,4 +1677,5 @@ void InitMods() {
     RegisterHurtContainerModeHandler();
     RegisterPauseMenuHooks();
     RegisterSkeletonKey();
+    RandoKaleido_RegisterHooks();
 }
diff --git a/soh/soh/Enhancements/randomizer/context.cpp b/soh/soh/Enhancements/randomizer/context.cpp
index 18f187c4d..29e576580 100644
--- a/soh/soh/Enhancements/randomizer/context.cpp
+++ b/soh/soh/Enhancements/randomizer/context.cpp
@@ -11,6 +11,7 @@
 #include "fishsanity.h"
 #include "macros.h"
 #include "3drando/hints.hpp"
+#include "../kaleido.h"
 
 #include <fstream>
 #include <spdlog/spdlog.h>
@@ -431,4 +432,10 @@ TrickOption& Context::GetTrickOption(const RandomizerTrick key) const {
     return mSettings->GetTrickOption(key);
 }
 
+std::shared_ptr<Kaleido> Context::GetKaleido() {
+    if (mKaleido == nullptr) {
+        mKaleido = std::make_shared<Kaleido>();
+    }
+    return mKaleido;
+}
 } // namespace Rando
diff --git a/soh/soh/Enhancements/randomizer/context.h b/soh/soh/Enhancements/randomizer/context.h
index a1a7d0d54..842b73c25 100644
--- a/soh/soh/Enhancements/randomizer/context.h
+++ b/soh/soh/Enhancements/randomizer/context.h
@@ -30,6 +30,7 @@ class Dungeons;
 class DungeonInfo;
 class TrialInfo;
 class Trials;
+class Kaleido;
 
 class Context {
   public:
@@ -70,6 +71,7 @@ class Context {
     DungeonInfo* GetDungeon(size_t key) const;
     std::shared_ptr<Logic> GetLogic();
     std::shared_ptr<Trials> GetTrials();
+    std::shared_ptr<Kaleido> GetKaleido();
     TrialInfo* GetTrial(size_t key) const;
     TrialInfo* GetTrial(TrialKey key) const;
     static Sprite* GetSeedTexture(uint8_t index);
@@ -101,6 +103,7 @@ class Context {
     std::shared_ptr<Logic> mLogic;
     std::shared_ptr<Trials> mTrials;
     std::shared_ptr<Fishsanity> mFishsanity;
+    std::shared_ptr<Kaleido> mKaleido;
     bool mSeedGenerated = false;
     bool mSpoilerLoaded = false;
     bool mPlandoLoaded = false;
diff --git a/soh/src/code/z_kaleido_setup.c b/soh/src/code/z_kaleido_setup.c
index 3efbd6ade..69ea3030f 100644
--- a/soh/src/code/z_kaleido_setup.c
+++ b/soh/src/code/z_kaleido_setup.c
@@ -133,6 +133,8 @@ void KaleidoSetup_Init(PlayState* play) {
     pauseCtx->ocarinaSongIdx = -1;
     pauseCtx->cursorSpecialPos = 0;
 
+    pauseCtx->randoQuestMode = 0;
+
     View_Init(&pauseCtx->view, play->state.gfxCtx);
 }
 
diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
index a8b7536f0..68ace2c39 100644
--- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
+++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
@@ -20,6 +20,7 @@
 #include "soh/Enhancements/randomizer/randomizer_grotto.h"
 #include "soh/Enhancements/cosmetics/cosmeticsTypes.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/kaleido.h"
 
 
 static void* sEquipmentFRATexs[] = {
@@ -1419,10 +1420,15 @@ void KaleidoScope_DrawPages(PlayState* play, GraphicsContext* gfxCtx) {
             gSPMatrix(POLY_KAL_DISP++, MATRIX_NEWMTX(gfxCtx),
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
-            POLY_KAL_DISP = KaleidoScope_DrawPageSections(POLY_KAL_DISP, pauseCtx->questPageVtx,
-                                                          sQuestStatusTexs[gSaveContext.language]);
-
-            KaleidoScope_DrawQuestStatus(play, gfxCtx);
+            if (pauseCtx->randoQuestMode) {
+                POLY_KAL_DISP = KaleidoScope_DrawPageSections(POLY_KAL_DISP, pauseCtx->saveVtx,
+                                                              sSaveTexs[gSaveContext.language]);
+                RandoKaleido_DrawMiscCollectibles(play);
+            } else {
+                POLY_KAL_DISP = KaleidoScope_DrawPageSections(POLY_KAL_DISP, pauseCtx->questPageVtx,
+                                                              sQuestStatusTexs[gSaveContext.language]);
+                KaleidoScope_DrawQuestStatus(play, gfxCtx);
+            }
         }
 
         if (pauseCtx->pageIndex != PAUSE_MAP) {
@@ -1514,10 +1520,15 @@ void KaleidoScope_DrawPages(PlayState* play, GraphicsContext* gfxCtx) {
                 gSPMatrix(POLY_KAL_DISP++, MATRIX_NEWMTX(gfxCtx),
                           G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
-                POLY_KAL_DISP = KaleidoScope_DrawPageSections(POLY_KAL_DISP, pauseCtx->questPageVtx,
-                                                              sQuestStatusTexs[gSaveContext.language]);
-
-                KaleidoScope_DrawQuestStatus(play, gfxCtx);
+                if (pauseCtx->randoQuestMode) {
+                    POLY_KAL_DISP = KaleidoScope_DrawPageSections(POLY_KAL_DISP, pauseCtx->saveVtx,
+                                                                  sSaveTexs[gSaveContext.language]);
+                    RandoKaleido_DrawMiscCollectibles(play);
+                } else {
+                    POLY_KAL_DISP = KaleidoScope_DrawPageSections(POLY_KAL_DISP, pauseCtx->questPageVtx,
+                                                                  sQuestStatusTexs[gSaveContext.language]);
+                    KaleidoScope_DrawQuestStatus(play, gfxCtx);
+                }
 
                 if (pauseCtx->cursorSpecialPos == 0) {
                     KaleidoScope_DrawCursor(play, PAUSE_QUEST);
@@ -4015,6 +4026,9 @@ void KaleidoScope_Update(PlayState* play)
                         Interface_ChangeAlpha(50);
                         pauseCtx->unk_1EC = 0;
                         pauseCtx->state = 7;
+                    } else if (CHECK_BTN_ALL(input->press.button, BTN_CUP) && pauseCtx->pageIndex == PAUSE_QUEST) {
+                        Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
+                        pauseCtx->randoQuestMode ^= 1;
                     }
                     break;
 

From 7450cee0b28cfe042685afcbdd7cadf6dce410db Mon Sep 17 00:00:00 2001
From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Date: Mon, 7 Oct 2024 01:59:01 +0100
Subject: [PATCH 224/230] Fix Seed generation when adult trade is off and some
 shield logic (#4384)

---
 .../randomizer/3drando/item_pool.cpp          | 10 ---
 .../location_access/locacc_death_mountain.cpp |  1 -
 .../locacc_dodongos_cavern.cpp                |  2 +-
 .../location_access/locacc_forest_temple.cpp  |  8 +-
 .../location_access/locacc_gerudo_valley.cpp  |  5 +-
 .../location_access/locacc_hyrule_field.cpp   |  5 +-
 .../location_access/locacc_kakariko.cpp       | 15 +---
 .../location_access/locacc_lost_woods.cpp     |  5 +-
 .../location_access/locacc_zoras_domain.cpp   |  1 -
 .../Enhancements/randomizer/location_list.cpp | 15 ++++
 soh/soh/Enhancements/randomizer/logic.cpp     | 77 ++++++++++++++-----
 soh/soh/Enhancements/randomizer/logic.h       | 11 +--
 .../Enhancements/randomizer/randomizerTypes.h |  1 +
 soh/soh/Enhancements/randomizer/static_data.h |  1 +
 14 files changed, 89 insertions(+), 68 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
index 464995df7..a2878f78c 100644
--- a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
@@ -905,16 +905,6 @@ void GenerateItemPool() {
     AddItemToMainPool(RG_PRESCRIPTION);
     AddItemToMainPool(RG_EYEBALL_FROG);
     AddItemToMainPool(RG_EYEDROPS);
-  } else {
-    ctx->PlaceItemInLocation(RC_KAK_TRADE_POCKET_CUCCO, RG_COJIRO, false, true);
-    ctx->PlaceItemInLocation(RC_LW_TRADE_COJIRO, RG_ODD_MUSHROOM, false, true);
-    ctx->PlaceItemInLocation(RC_KAK_TRADE_ODD_MUSHROOM, RG_ODD_POTION, false, true);
-    ctx->PlaceItemInLocation(RC_LW_TRADE_ODD_POTION, RG_POACHERS_SAW, false, true);
-    ctx->PlaceItemInLocation(RC_GV_TRADE_SAW, RG_BROKEN_SWORD, false, true);
-    ctx->PlaceItemInLocation(RC_DMT_TRADE_BROKEN_SWORD, RG_PRESCRIPTION, false, true);
-    ctx->PlaceItemInLocation(RC_ZD_TRADE_PRESCRIPTION, RG_EYEBALL_FROG, false, true);
-    ctx->PlaceItemInLocation(RC_LH_TRADE_FROG, RG_EYEDROPS, false, true);
-    ctx->PlaceItemInLocation(RC_DMT_TRADE_EYEDROPS, RG_CLAIM_CHECK, false, true);
   }
   AddItemToMainPool(RG_CLAIM_CHECK);
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
index b61687d3d..edd04bb45 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
@@ -25,7 +25,6 @@ void RegionTable_Init_DeathMountain() {
 
   areaTable[RR_DEATH_MOUNTAIN_SUMMIT] = Region("Death Mountain Summit", "Death Mountain", RA_DEATH_MOUNTAIN_TRAIL, DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->PrescriptionAccess, {[]{return logic->PrescriptionAccess || (logic->IsAdult && (logic->BrokenSwordAccess || logic->CanUse(RG_BROKEN_SWORD)));}}),
                   EventAccess(&logic->GossipStoneFairy,   {[]{return logic->CallGossipFairy();}}),
                   EventAccess(&logic->BugRock,            {[]{return logic->BugRock            || logic->IsChild;}}),
                 }, {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp
index 3826dc7a0..9d840353f 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp
@@ -56,7 +56,7 @@ void RegionTable_Init_DodongosCavern() {
                 }, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_LOBBY,               {[]{return true;}}),
-                  //Shield in logic to block baby dodongos to make them blow up the wall?
+                  //Shield seems to be in logic to drop a pot on thier head as they hit you to blow up the wall
                   Entrance(RR_DODONGOS_CAVERN_SE_ROOM,             {[]{return Here(RR_DODONGOS_CAVERN_SE_CORRIDOR, []{return logic->BlastOrSmash() || logic->CanAttack() || (logic->TakeDamage() && logic->CanShield());});}}),
                   Entrance(RR_DODONGOS_CAVERN_NEAR_LOWER_LIZALFOS, {[]{return true;}}),
   });
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp
index 56b0499cc..9f41965ee 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp
@@ -127,11 +127,11 @@ void RegionTable_Init_ForestTemple() {
 
   areaTable[RR_FOREST_TEMPLE_MAP_ROOM] = Region("Forest Temple Map Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_FOREST_TEMPLE_MAP_CHEST, Here(RR_FOREST_TEMPLE_MAP_ROOM, []{return logic->HasExplosives() || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_FAIRY_BOW) || ((logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT)) && (logic->CanUse(RG_NUTS) || logic->HookshotOrBoomerang() || logic->CanShield()));})),
+                  LOCATION(RC_FOREST_TEMPLE_MAP_CHEST, logic->CanKillEnemy(RE_BLUE_BUBBLE)),
                 }, {
                   //Exits
-                  Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_LOWER, {[]{return Here(RR_FOREST_TEMPLE_MAP_ROOM, []{return logic->HasExplosives() || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_FAIRY_BOW) || ((logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT)) && (logic->CanUse(RG_NUTS) || logic->HookshotOrBoomerang() || logic->CanShield()));});}}),
-                  Entrance(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER, {[]{return Here(RR_FOREST_TEMPLE_MAP_ROOM, []{return logic->HasExplosives() || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_FAIRY_BOW) || ((logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT)) && (logic->CanUse(RG_NUTS) || logic->HookshotOrBoomerang() || logic->CanShield()));});}}),
+                  Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_LOWER, {[]{return Here(RR_FOREST_TEMPLE_MAP_ROOM, []{return logic->CanKillEnemy(RE_BLUE_BUBBLE);});}}),
+                  Entrance(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER, {[]{return Here(RR_FOREST_TEMPLE_MAP_ROOM, []{return logic->CanKillEnemy(RE_BLUE_BUBBLE);});}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_SEWER] = Region("Forest Temple Sewer", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
@@ -145,7 +145,7 @@ void RegionTable_Init_ForestTemple() {
 
   areaTable[RR_FOREST_TEMPLE_BELOW_BOSS_KEY_CHEST] = Region("Forest Temple Below Boss Key Chest", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER, {[]{return Here(RR_FOREST_TEMPLE_BELOW_BOSS_KEY_CHEST, []{return logic->HasExplosives() || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_FAIRY_BOW) || ((logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT)) && (logic->CanUse(RG_NUTS) || logic->HookshotOrBoomerang() || logic->CanShield()));});}}),
+                  Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER, {[]{return Here(RR_FOREST_TEMPLE_BELOW_BOSS_KEY_CHEST, []{return logic->CanKillEnemy(RE_BLUE_BUBBLE);});}}),
   });
 
   areaTable[RR_FOREST_TEMPLE_FLOORMASTER_ROOM] = Region("Forest Temple Floormaster Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
index ec9790ed1..7c31cbac3 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
@@ -54,10 +54,7 @@ void RegionTable_Init_GerudoValley() {
                   Entrance(RR_GV_LOWER_STREAM, {[]{return true;}}),
   });
 
-  areaTable[RR_GV_FORTRESS_SIDE] = Region("GV Fortress Side", "Gerudo Valley", RA_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {
-                  //Events
-                  EventAccess(&logic->BrokenSwordAccess, {[]{return logic->IsAdult && (logic->PoachersSawAccess || logic->CanUse(RG_POACHERS_SAW));}}),
-                }, {
+  areaTable[RR_GV_FORTRESS_SIDE] = Region("GV Fortress Side", "Gerudo Valley", RA_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {}, {
                   //Locations                                       
                   LOCATION(RC_GV_CHEST,          logic->IsAdult && logic->CanUse(RG_MEGATON_HAMMER)),
                   LOCATION(RC_GV_TRADE_SAW,      logic->IsAdult && logic->CanUse(RG_POACHERS_SAW)),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
index 2e906c7aa..ea9a7c55d 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
@@ -151,10 +151,7 @@ void RegionTable_Init_HyruleField() {
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
   });
 
-  areaTable[RR_LH_LAB] = Region("LH Lab", "LH Lab", RA_NONE, NO_DAY_NIGHT_CYCLE, {
-                  //Events
-                  EventAccess(&logic->EyedropsAccess, {[]{return logic->EyedropsAccess || (logic->IsAdult && (logic->EyeballFrogAccess || (logic->CanUse(RG_EYEBALL_FROG) && logic->DisableTradeRevert)));}}),
-                }, {
+  areaTable[RR_LH_LAB] = Region("LH Lab", "LH Lab", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_LH_LAB_DIVE,     logic->HasItem(RG_GOLDEN_SCALE) || (ctx->GetTrickOption(RT_LH_LAB_DIVING) && logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_HOOKSHOT))),
                   LOCATION(RC_LH_TRADE_FROG,   logic->IsAdult && logic->CanUse(RG_EYEBALL_FROG)),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
index 9475547f7..4670fafd1 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
@@ -6,7 +6,6 @@ using namespace Rando;
 void RegionTable_Init_Kakariko() {
   areaTable[RR_KAKARIKO_VILLAGE] = Region("Kakariko Village", "Kakariko Village", RA_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->CojiroAccess,            {[]{return logic->CojiroAccess || (logic->IsAdult && logic->WakeUpAdultTalon);}}),
                   EventAccess(&logic->BugRock,                 {[]{return true;}}),
                   EventAccess(&logic->KakarikoVillageGateOpen, {[]{return logic->KakarikoVillageGateOpen || (logic->IsChild && (logic->HasItem(RG_ZELDAS_LETTER) || ctx->GetOption(RSK_KAK_GATE).Is(RO_KAK_GATE_OPEN)));}}),
                 }, {
@@ -14,7 +13,7 @@ void RegionTable_Init_Kakariko() {
                   LOCATION(RC_SHEIK_IN_KAKARIKO,               logic->IsAdult && logic->HasItem(RG_FOREST_MEDALLION) && logic->HasItem(RG_FIRE_MEDALLION) && logic->HasItem(RG_WATER_MEDALLION)),
                   LOCATION(RC_KAK_ANJU_AS_CHILD,               logic->IsChild && logic->AtDay),
                   LOCATION(RC_KAK_ANJU_AS_ADULT,               logic->IsAdult && logic->AtDay),
-                  LOCATION(RC_KAK_TRADE_POCKET_CUCCO,          logic->IsAdult && logic->AtDay && logic->CanUse(RG_POCKET_EGG) && logic->WakeUpAdultTalon),
+                  LOCATION(RC_KAK_TRADE_POCKET_CUCCO,          logic->IsAdult && logic->AtDay && (logic->CanUse(RG_POCKET_EGG) && logic->WakeUpAdultTalon)),
                   LOCATION(RC_KAK_GS_HOUSE_UNDER_CONSTRUCTION, logic->IsChild && logic->AtNight && logic->CanGetNightTimeGS()),
                   LOCATION(RC_KAK_GS_SKULLTULA_HOUSE,          logic->IsChild && logic->AtNight && logic->CanGetNightTimeGS()),
                   LOCATION(RC_KAK_GS_GUARDS_HOUSE,             logic->IsChild && logic->AtNight && logic->CanGetNightTimeGS()),
@@ -72,7 +71,7 @@ void RegionTable_Init_Kakariko() {
 
   areaTable[RR_KAK_CARPENTER_BOSS_HOUSE] = Region("Kak Carpenter Boss House", "Kak Carpenter Boss House", RA_NONE, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->WakeUpAdultTalon, {[]{return logic->WakeUpAdultTalon || (logic->IsAdult && logic->CanUse(RG_POCKET_EGG));}}),
+                  EventAccess(&logic->WakeUpAdultTalon, {[]{return logic->IsAdult && logic->CanUse(RG_POCKET_EGG);}}),
                 }, {}, {
                   //Exits
                   Entrance(RR_KAKARIKO_VILLAGE, {[]{return true;}}),
@@ -170,16 +169,10 @@ void RegionTable_Init_Kakariko() {
   });
 
   areaTable[RR_KAK_ODD_POTION_BUILDING] =
-      Region("Kak Granny's Potion Shop", "Kak Granny's Potion Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {
-          
-               // Events
-               EventAccess(&logic->OddPoulticeAccess, { [] {
-                   return logic->OddPoulticeAccess || (logic->IsAdult && (logic->OddMushroomAccess || (logic->CanUse(RG_ODD_MUSHROOM) && logic->DisableTradeRevert)));
-               } }),
-           },
+      Region("Kak Granny's Potion Shop", "Kak Granny's Potion Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {},
            {
                LOCATION(RC_KAK_TRADE_ODD_MUSHROOM, logic->IsAdult && logic->CanUse(RG_ODD_MUSHROOM)),
-               LOCATION(RC_KAK_GRANNYS_SHOP, logic->IsAdult && logic->CanUse(RG_ODD_MUSHROOM) && logic->HasItem(RG_ADULT_WALLET)),
+               LOCATION(RC_KAK_GRANNYS_SHOP, logic->IsAdult && (logic->CanUse(RG_ODD_MUSHROOM) || logic->TradeQuestStep(RG_ODD_MUSHROOM)) && logic->HasItem(RG_ADULT_WALLET)),
            },
            {
                // Exits
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
index 39316eea2..80b424c54 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
@@ -113,8 +113,6 @@ void RegionTable_Init_LostWoods() {
 
   areaTable[RR_THE_LOST_WOODS] = Region("Lost Woods", "Lost Woods", RA_THE_LOST_WOODS, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->OddMushroomAccess, {[]{return logic->OddMushroomAccess || (logic->IsAdult && (logic->CojiroAccess || logic->CanUse(RG_COJIRO)));}}),
-                  EventAccess(&logic->PoachersSawAccess, {[]{return logic->PoachersSawAccess || (logic->IsAdult && logic->OddPoulticeAccess);}}),
                   EventAccess(&logic->GossipStoneFairy,  {[]{return logic->CallGossipFairyExceptSuns();}}),
                   EventAccess(&logic->BeanPlantFairy,    {[]{return logic->BeanPlantFairy    || logic->CanUse(RG_SONG_OF_STORMS);}}),
                   EventAccess(&logic->BugShrub,          {[]{return logic->IsChild && logic->CanCutShrubs();}}),
@@ -122,7 +120,8 @@ void RegionTable_Init_LostWoods() {
                   //Locations
                   LOCATION(RC_LW_SKULL_KID,                 logic->IsChild && logic->CanUse(RG_SARIAS_SONG)),
                   LOCATION(RC_LW_TRADE_COJIRO,              logic->IsAdult && logic->CanUse(RG_COJIRO)),
-                  LOCATION(RC_LW_TRADE_ODD_POTION,          logic->IsAdult && logic->CanUse(RG_ODD_POTION) && logic->CanUse(RG_COJIRO)),
+                  //I cannot think of a case where you can use Odd pot but not Cojiro to reset the quadrant should you have both. If one exists, add it to logic
+                  LOCATION(RC_LW_TRADE_ODD_POTION,          logic->IsAdult && logic->CanUse(RG_ODD_POTION)),
                                                                                                 //all 5 buttons are logically required for memory game
                                                                                                 //because the chances of being able to beat it
                                                                                                 //every time you attempt it are as follows:
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
index 07a768fbd..3aecbe6ca 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
@@ -84,7 +84,6 @@ void RegionTable_Init_ZorasDomain() {
 
   areaTable[RR_ZORAS_DOMAIN] = Region("Zoras Domain", "Zoras Domain", RA_ZORAS_DOMAIN, NO_DAY_NIGHT_CYCLE, {
                   //Events
-                  EventAccess(&logic->EyeballFrogAccess, {[]{return logic->EyeballFrogAccess || (logic->IsAdult && logic->KingZoraThawed && (logic->CanUse(RG_EYEDROPS) || logic->CanUse(RG_EYEBALL_FROG) || logic->CanUse(RG_PRESCRIPTION) || logic->PrescriptionAccess));}}),
                   EventAccess(&logic->GossipStoneFairy,  {[]{return logic->CallGossipFairyExceptSuns();}}),
                   EventAccess(&logic->NutPot,            {[]{return true;}}),
                   EventAccess(&logic->StickPot,          {[]{return logic->StickPot          || logic->IsChild;}}),
diff --git a/soh/soh/Enhancements/randomizer/location_list.cpp b/soh/soh/Enhancements/randomizer/location_list.cpp
index 9b2b3b0a7..29ef5ae65 100644
--- a/soh/soh/Enhancements/randomizer/location_list.cpp
+++ b/soh/soh/Enhancements/randomizer/location_list.cpp
@@ -1,5 +1,6 @@
 #include "static_data.h"
 #include "z64save.h"
+#include "context.h"
 
 #define TWO_ACTOR_PARAMS(a, b) (abs(a) << 16) | abs(b)
 
@@ -54,6 +55,16 @@ std::vector<RandomizerCheck> Rando::StaticData::GetScrubLocations() {
     return scrubLocations;
 }
 
+std::vector<RandomizerCheck> Rando::StaticData::GetAdultTradeLocations() {
+    std::vector<RandomizerCheck> tradeLocations = {};
+    for (Location& location : locationTable) {
+        if (location.GetRCType() == RCTYPE_ADULT_TRADE && location.GetRandomizerCheck() != RC_UNKNOWN_CHECK) {
+            tradeLocations.push_back(location.GetRandomizerCheck());
+        }
+    }
+    return tradeLocations;
+}
+
 std::vector<RandomizerCheck> Rando::StaticData::GetGossipStoneLocations() {
     std::vector<RandomizerCheck> gossipStoneLocations = {};
     for (Location& location : locationTable) {
@@ -74,8 +85,11 @@ std::vector<RandomizerCheck> Rando::StaticData::GetShopLocations() {
     return shopLocations;
 }
 
+
 std::vector<RandomizerCheck> Rando::StaticData::GetOverworldLocations() {
+    //RANDOTODO better way of filling the initial location pool, among other things. 
     std::vector<RandomizerCheck> overworldLocations = {};
+    auto ctx = Rando::Context::GetInstance();
     for (Location& location : locationTable) {
         if (
             location.IsOverworld() &&
@@ -83,6 +97,7 @@ std::vector<RandomizerCheck> Rando::StaticData::GetOverworldLocations() {
             location.GetRandomizerCheck() != RC_TRIFORCE_COMPLETED && //not really an overworld check
             location.GetRCType() != RCTYPE_FISH && //temp fix while locations are properly sorted out
             location.GetRCType() != RCTYPE_CHEST_GAME && //this is supposed to be excluded
+            (ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) || location.GetRCType() != RCTYPE_ADULT_TRADE) && //trade is handled elsewhere in location pool
             location.GetRCType() != RCTYPE_STATIC_HINT && 
             location.GetRCType() != RCTYPE_GOSSIP_STONE  //don't put items on hints
         ) {
diff --git a/soh/soh/Enhancements/randomizer/logic.cpp b/soh/soh/Enhancements/randomizer/logic.cpp
index 07215307f..c5f2a193d 100644
--- a/soh/soh/Enhancements/randomizer/logic.cpp
+++ b/soh/soh/Enhancements/randomizer/logic.cpp
@@ -223,6 +223,8 @@ namespace Rando {
             case RG_BOTTLE_WITH_RED_POTION:
             case RG_EMPTY_BOTTLE:
                 return HasBottle();
+            default:
+                break;
         }
         SPDLOG_ERROR("HasItem reached `return false;`. Missing case for RandomizerGet of {}", static_cast<uint32_t>(itemName));
         assert(false);
@@ -250,7 +252,6 @@ namespace Rando {
             case RG_LONGSHOT:
                 return IsAdult;// || HookshotAsChild;
             case RG_SILVER_GAUNTLETS:
-                return IsAdult;
             case RG_GOLDEN_GAUNTLETS:
                 return IsAdult;
             case RG_GORON_TUNIC:
@@ -262,7 +263,7 @@ namespace Rando {
             case RG_DISTANT_SCARECROW:
                 return IsAdult;// || HookshotAsChild;
             case RG_HYLIAN_SHIELD:
-                return IsAdult;
+                return true;
             case RG_MIRROR_SHIELD:
                 return IsAdult;// || MirrorShieldAsChild;
             case RG_MASTER_SWORD:
@@ -298,23 +299,14 @@ namespace Rando {
 
                 // Adult Trade
             case RG_POCKET_EGG:
-                return IsAdult || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && CanUse(RG_COJIRO));
             case RG_COJIRO:
-                return IsAdult || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && CanUse(RG_ODD_MUSHROOM));
             case RG_ODD_MUSHROOM:
-                return IsAdult || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && CanUse(RG_ODD_POTION));
             case RG_ODD_POTION:
-                return IsAdult || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && CanUse(RG_POACHERS_SAW));
             case RG_POACHERS_SAW:
-                return IsAdult || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && CanUse(RG_BROKEN_SWORD));
             case RG_BROKEN_SWORD:
-                return IsAdult || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && CanUse(RG_PRESCRIPTION));
             case RG_PRESCRIPTION:
-                return IsAdult || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && CanUse(RG_EYEBALL_FROG));
             case RG_EYEBALL_FROG:
-                return IsAdult || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && CanUse(RG_EYEDROPS));
             case RG_EYEDROPS:
-                return IsAdult || (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && CanUse(RG_CLAIM_CHECK));
             case RG_CLAIM_CHECK:
                 return IsAdult;
 
@@ -442,6 +434,9 @@ namespace Rando {
             case RE_KEESE:
             case RE_FIRE_KEESE:
                 return CanJumpslash() || HasExplosives() || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_HOOKSHOT) || CanUse(RG_BOOMERANG);
+            case RE_BLUE_BUBBLE:
+                //RANDOTODO Trick to use shield hylian shield to stun these guys
+                return BlastOrSmash() || CanUse(RG_FAIRY_BOW) || ((CanJumpslash() || CanUse(RG_FAIRY_SLINGSHOT)) && (CanUse(RG_NUTS) || HookshotOrBoomerang() || CanStandingShield()));
             default:
                 SPDLOG_ERROR("CanKillEnemy reached `default`.");
                 assert(false);
@@ -461,6 +456,7 @@ namespace Rando {
             case RE_MAD_SCRUB:
             case RE_KEESE:
             case RE_FIRE_KEESE:
+            case RE_BLUE_BUBBLE:
                 return true;
             case RE_BIG_SKULLTULA:
                 return CanUse(RG_NUTS) || CanUse(RG_BOOMERANG);
@@ -486,6 +482,9 @@ namespace Rando {
             case RE_KEESE:
             case RE_FIRE_KEESE:
                 return CanUse(RG_NUTS);
+            case RE_BLUE_BUBBLE:
+                //RANDOTODO Trick to use shield hylian shield to stun these guys
+                return CanUse(RG_NUTS) || HookshotOrBoomerang() || CanStandingShield();
             default:
                 SPDLOG_ERROR("CanPassEnemy reached `default`.");
                 assert(false);
@@ -691,12 +690,59 @@ namespace Rando {
         return HasFireSource() || CanUse(RG_STICKS);
     }
 
+//Is this best off signaling what you have already traded, or what step you are currently on?
+    bool Logic::TradeQuestStep(RandomizerGet rg){
+        if (ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE)){
+            return false; //This does not apply when we are shuffling trade items
+        }
+        bool hasState = false;
+        //Falling through each case to test each possibility
+        switch (rg){
+            case RG_POCKET_EGG:
+                hasState = hasState || HasItem(RG_POCKET_EGG);
+                [[fallthrough]];
+            case RG_COJIRO:
+                hasState = hasState || HasItem(RG_COJIRO);
+                [[fallthrough]];
+            case RG_ODD_MUSHROOM:
+                hasState = hasState || HasItem(RG_ODD_MUSHROOM);
+                [[fallthrough]];
+            case RG_ODD_POTION:
+                hasState = hasState || HasItem(RG_ODD_POTION);
+                [[fallthrough]];
+            case RG_POACHERS_SAW:
+                hasState = hasState || HasItem(RG_POACHERS_SAW);
+                [[fallthrough]];
+            case RG_BROKEN_SWORD:
+                hasState = hasState || HasItem(RG_BROKEN_SWORD);
+                [[fallthrough]];
+            case RG_PRESCRIPTION:
+                hasState = hasState || HasItem(RG_PRESCRIPTION);
+                [[fallthrough]];
+            case RG_EYEDROPS:
+                hasState = hasState || HasItem(RG_EYEDROPS);
+                [[fallthrough]];
+            case RG_CLAIM_CHECK:
+                hasState = hasState || HasItem(RG_CLAIM_CHECK);
+                break;
+            default:
+                SPDLOG_ERROR("TradeQuestStep reached `return false;`. Missing case for RandomizerGet of {}", static_cast<uint32_t>(rg));
+                assert(false);
+                return false;
+        }
+        return hasState;
+    }
+
     bool Logic::CanFinishGerudoFortress(){
         return (ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_NORMAL) && SmallKeys(RR_GERUDO_FORTRESS, 4) && (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) && (HasItem(RG_GERUDO_MEMBERSHIP_CARD) || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_HOVER_BOOTS) || ctx->GetTrickOption(RT_GF_KITCHEN))) ||
                (ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_FAST)   && SmallKeys(RR_GERUDO_FORTRESS, 1) && (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD))) ||
                ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_OPEN);
     }
 
+    bool Logic::CanStandingShield(){
+        return CanUse(RG_MIRROR_SHIELD) || (IsAdult && CanUse(RG_HYLIAN_SHIELD)) || CanUse(RG_DEKU_SHIELD);
+    }
+
     bool Logic::CanShield(){
         return CanUse(RG_MIRROR_SHIELD) || CanUse(RG_HYLIAN_SHIELD) || CanUse(RG_DEKU_SHIELD);
     }
@@ -1599,15 +1645,6 @@ namespace Rando {
 
         //Trade Quest Events
         WakeUpAdultTalon   = false;
-        CojiroAccess       = false;
-        OddMushroomAccess  = false;
-        OddPoulticeAccess  = false;
-        PoachersSawAccess  = false;
-        BrokenSwordAccess  = false;
-        PrescriptionAccess = false;
-        EyeballFrogAccess  = false;
-        EyedropsAccess     = false;
-        DisableTradeRevert = false;
 
         //Dungeon Clears
         DekuTreeClear       = false;
diff --git a/soh/soh/Enhancements/randomizer/logic.h b/soh/soh/Enhancements/randomizer/logic.h
index dee521425..a906e8dee 100644
--- a/soh/soh/Enhancements/randomizer/logic.h
+++ b/soh/soh/Enhancements/randomizer/logic.h
@@ -40,15 +40,6 @@ class Logic {
 
     // Trade Quest Events
     bool WakeUpAdultTalon = false;
-    bool CojiroAccess = false;
-    bool OddMushroomAccess = false;
-    bool OddPoulticeAccess = false;
-    bool PoachersSawAccess = false;
-    bool BrokenSwordAccess = false;
-    bool PrescriptionAccess = false;
-    bool EyeballFrogAccess = false;
-    bool EyedropsAccess = false;
-    bool DisableTradeRevert = false;
 
     // Dungeon Clears
     bool DekuTreeClear = false;
@@ -199,7 +190,9 @@ class Logic {
     bool CanBreakLowerBeehives();
     bool HasFireSource();
     bool HasFireSourceWithTorch();
+    bool TradeQuestStep(RandomizerGet rg);
     bool CanFinishGerudoFortress();
+    bool CanStandingShield();
     bool CanShield();
     bool CanUseProjectile();
     bool CanBuildRainbowBridge();
diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h
index 3476d4fa7..7d5a36daa 100644
--- a/soh/soh/Enhancements/randomizer/randomizerTypes.h
+++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@@ -4369,6 +4369,7 @@ typedef enum {
     RE_KEESE,
     RE_FIRE_KEESE,
     RE_MAD_SCRUB,
+    RE_BLUE_BUBBLE,
 } RandomizerEnemy;
 
 typedef enum {
diff --git a/soh/soh/Enhancements/randomizer/static_data.h b/soh/soh/Enhancements/randomizer/static_data.h
index c2831324b..8232f93b5 100644
--- a/soh/soh/Enhancements/randomizer/static_data.h
+++ b/soh/soh/Enhancements/randomizer/static_data.h
@@ -40,6 +40,7 @@ class StaticData {
       static std::vector<RandomizerCheck> dungeonRewardLocations;
       static std::vector<RandomizerCheck> GetShopLocations();
       static std::vector<RandomizerCheck> GetScrubLocations();
+      static std::vector<RandomizerCheck> GetAdultTradeLocations();
       static std::vector<RandomizerCheck> GetGossipStoneLocations();
       static std::vector<RandomizerCheck> GetStaticHintLocations();
       static std::vector<RandomizerCheck> GetPondFishLocations();

From 2822dfc3f3f3cf27046c76b010322d715410b87a Mon Sep 17 00:00:00 2001
From: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>
Date: Mon, 7 Oct 2024 23:36:21 +0200
Subject: [PATCH 225/230] VBify (#4255)

* Convert ocarina buttons & skip scarecrow song to VB

* Move most of boss rush & rupee/key counters to VB

* Move BossRush_HandleCompleteBoss to VB

* Convert boss timestamps to VB

* Move being able to open doors to VB

* Convert Entrance_OverrideWeatherState to VB

* Move boss souls to hook_handlers.cpp

* Update hook_handlers.cpp

* Move infinite upgrades to hook_handlers.cpp

* Move skeleton key to hook_handlers.cpp

* Move swim and child wallet to hook_handlers.cpp

* Move ganons boss key to hook_handlers.cpp

* Move triforce hunt to hook_handlers.cpp

* Move randomizer sheik spawn to hook_handlers.cpp

* Update BossRush.h

* Convert spoiling items to VB

* Move load game stuff to hook_handlers.cpp

* Move warp song handling to hook_handlers.cpp

* Convert being able to play bowling to VB

* Move shooting gallery man handling to hook_handlers.cpp

* Move spirit temple silver block removal to hook_handlers.cpp

* Fix build

* Move last beehive stuff to hook_handlers.cpp

* Fix build

* Add VB_CLOSE_PAUSE_MENU

* Add VB_BE_ABLE_TO_SAVE

* Add VB_RENDER_YES_ON_CONTINUE_PROMPT

* Add VB_SPAWN_BLUE_WARP

* Add VB_BLUE_WARP_ADULT_WARP_OUT

* Add VB_BG_BREAKWALL_BREAK

* Convert Saria stuff to VB

* Remove now unused check

* Add VB_GANON_HEAL_BEFORE_FIGHT

* Update hook_handlers.cpp

* Fix blue warp offsets

* Fixes from review

* Improve documentation

* Update BossRush.cpp

* Fix my stupidity

* Fix #4327

* Update hook_handlers.cpp

* Fix blue warps

* Use ultralib types & clean header

* Replace options amount macro with BR_OPTIONS_MAX

* Remove unused includes

* Remove accidental line doubling

* Tweaks to boss rush (#6)

* Update GameInteractor_HookTable.h

---------

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
---
 soh/include/z64save.h                         |   2 +-
 soh/soh/Enhancements/boss-rush/BossRush.cpp   | 314 ++++++++++++--
 soh/soh/Enhancements/boss-rush/BossRush.h     |  18 +-
 .../Enhancements/boss-rush/BossRushTypes.h    |   4 +-
 .../game-interactor/GameInteractor.h          |  40 ++
 .../GameInteractor_HookTable.h                |   1 +
 .../game-interactor/GameInteractor_Hooks.cpp  |   7 +
 .../game-interactor/GameInteractor_Hooks.h    |   1 +
 soh/soh/Enhancements/mods.cpp                 | 320 ++------------
 .../Enhancements/randomizer/hook_handlers.cpp | 401 +++++++++++++++++-
 .../Enhancements/timesaver_hook_handlers.cpp  |   6 +
 soh/soh/SaveManager.cpp                       |   1 -
 soh/soh/z_play_otr.cpp                        |   4 -
 soh/src/code/code_800EC960.c                  |  12 +-
 soh/src/code/z_horse.c                        |   8 +-
 soh/src/code/z_parameter.c                    |  70 ++-
 soh/src/code/z_play.c                         |   4 -
 soh/src/code/z_sram.c                         |   4 +-
 .../actors/ovl_Bg_Breakwall/z_bg_breakwall.c  |   6 +-
 .../actors/ovl_Boss_Dodongo/z_boss_dodongo.c  |  14 +-
 .../overlays/actors/ovl_Boss_Fd/z_boss_fd.c   |   8 +-
 .../overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c |  10 +-
 .../actors/ovl_Boss_Ganon/z_boss_ganon.c      |   7 +-
 .../actors/ovl_Boss_Ganon2/z_boss_ganon2.c    |   6 +-
 .../ovl_Boss_Ganondrof/z_boss_ganondrof.c     |  24 +-
 .../actors/ovl_Boss_Goma/z_boss_goma.c        |  23 +-
 .../overlays/actors/ovl_Boss_Mo/z_boss_mo.c   |  25 +-
 .../overlays/actors/ovl_Boss_Sst/z_boss_sst.c |  26 +-
 .../overlays/actors/ovl_Boss_Tw/z_boss_tw.c   |  28 +-
 .../overlays/actors/ovl_Boss_Va/z_boss_va.c   |  28 +-
 .../actors/ovl_Demo_Kankyo/z_demo_kankyo.c    |   6 -
 .../overlays/actors/ovl_Demo_Sa/z_demo_sa.c   |  21 +-
 .../actors/ovl_Door_Warp1/z_door_warp1.c      |   4 +-
 .../ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c   |  25 +-
 soh/src/overlays/actors/ovl_En_Box/z_en_box.c |   5 -
 .../actors/ovl_En_Kakasi2/z_en_kakasi2.c      |  17 +-
 .../overlays/actors/ovl_En_Kusa/z_en_kusa.c   |   5 -
 .../ovl_En_Syateki_Man/z_en_syateki_man.c     |   9 -
 .../overlays/actors/ovl_Obj_Comb/z_obj_comb.c |   7 +-
 .../actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c  |   9 -
 .../actors/ovl_Obj_Tsubo/z_obj_tsubo.c        |   5 -
 .../actors/ovl_player_actor/z_player.c        |   3 +-
 .../ovl_file_choose/z_file_choose.c           |  16 +-
 .../ovl_kaleido_scope/z_kaleido_collect.c     |  12 +-
 .../ovl_kaleido_scope/z_kaleido_scope_PAL.c   |  18 +-
 45 files changed, 963 insertions(+), 621 deletions(-)

diff --git a/soh/include/z64save.h b/soh/include/z64save.h
index c6db012e1..1c2172563 100644
--- a/soh/include/z64save.h
+++ b/soh/include/z64save.h
@@ -276,7 +276,7 @@ typedef struct {
     /*        */ u16 pendingSaleMod;
     /*        */ uint8_t questId;
     /*        */ uint32_t isBossRushPaused;
-    /*        */ uint8_t bossRushOptions[BOSSRUSH_OPTIONS_AMOUNT];
+    /*        */ uint8_t bossRushOptions[BR_OPTIONS_MAX];
     /*        */ u8 pendingIceTrapCount;
     /*        */ SohStats sohStats;
     /*        */ FaroresWindData backupFW;
diff --git a/soh/soh/Enhancements/boss-rush/BossRush.cpp b/soh/soh/Enhancements/boss-rush/BossRush.cpp
index 9dbbad527..51fd4db27 100644
--- a/soh/soh/Enhancements/boss-rush/BossRush.cpp
+++ b/soh/soh/Enhancements/boss-rush/BossRush.cpp
@@ -1,19 +1,33 @@
 #include "BossRush.h"
 #include "soh/OTRGlobals.h"
-#include "functions.h"
-#include "macros.h"
-#include "variables.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #include <array>
 #include <string>
 #include <vector>
 
+extern "C" {
+    #include "functions.h"
+    #include "macros.h"
+    #include "variables.h"
+    #include "src/overlays/actors/ovl_Boss_Goma/z_boss_goma.h"
+    #include "src/overlays/actors/ovl_Boss_Mo/z_boss_mo.h"
+    #include "src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h"
+    extern PlayState* gPlayState;
+
+    Gfx* KaleidoScope_QuadTextureIA8(Gfx* gfx, void* texture, s16 width, s16 height, u16 point);
+    #include "textures/icon_item_nes_static/icon_item_nes_static.h"
+    #include "textures/icon_item_ger_static/icon_item_ger_static.h"
+    #include "textures/icon_item_fra_static/icon_item_fra_static.h"
+}
+
 typedef struct BossRushSetting {
     std::array<std::string, LANGUAGE_MAX> name;
     std::vector<std::array<std::string, LANGUAGE_MAX>> choices;
 } BossRushSetting;
 
-BossRushSetting BossRushOptions[BOSSRUSH_OPTIONS_AMOUNT] = { 
+BossRushSetting BossRushOptions[BR_OPTIONS_MAX] = { 
     {
         { "BOSSES:", "BOSSE:", "BOSS:" },
         {
@@ -112,15 +126,15 @@ BossRushSetting BossRushOptions[BOSSRUSH_OPTIONS_AMOUNT] = {
     }
 };
 
-const char* BossRush_GetSettingName(uint8_t optionIndex, uint8_t language) {
+const char* BossRush_GetSettingName(u8 optionIndex, u8 language) {
     return BossRushOptions[optionIndex].name[language].c_str();
 }
 
-const char* BossRush_GetSettingChoiceName(uint8_t optionIndex, uint8_t choiceIndex, uint8_t language) {
+const char* BossRush_GetSettingChoiceName(u8 optionIndex, u8 choiceIndex, u8 language) {
     return BossRushOptions[optionIndex].choices[choiceIndex][language].c_str();
 }
 
-uint8_t BossRush_GetSettingOptionsAmount(uint8_t optionIndex) {
+u8 BossRush_GetSettingOptionsAmount(u8 optionIndex) {
     return BossRushOptions[optionIndex].choices.size();
 }
 
@@ -168,8 +182,44 @@ void BossRush_SpawnBlueWarps(PlayState* play) {
     }
 }
 
-void BossRush_HandleBlueWarp(PlayState* play, f32 warpPosX, f32 warpPosZ) {
+void BossRush_SetEquipment(u8 linkAge) {
+    std::array<u8, 8> brButtonItems;
+    std::array<u8, 7> brCButtonSlots;
 
+    // Set Child Equipment.
+    if (linkAge == LINK_AGE_CHILD) {
+        brButtonItems = {
+            ITEM_SWORD_KOKIRI, ITEM_STICK, ITEM_NUT, ITEM_BOMB, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE
+        };
+
+        brCButtonSlots = { SLOT_STICK, SLOT_NUT, SLOT_BOMB, SLOT_NONE, SLOT_NONE, SLOT_NONE, SLOT_NONE };
+
+        Inventory_ChangeEquipment(EQUIP_TYPE_SWORD, EQUIP_VALUE_SWORD_KOKIRI);
+        Inventory_ChangeEquipment(EQUIP_TYPE_SHIELD, EQUIP_VALUE_SHIELD_DEKU);
+    // Set Adult equipment.
+    } else {
+        brButtonItems = { ITEM_SWORD_MASTER, ITEM_BOW,  ITEM_HAMMER, ITEM_BOMB,
+                          ITEM_NONE,         ITEM_NONE, ITEM_NONE,   ITEM_NONE };
+
+        brCButtonSlots = { SLOT_BOW, SLOT_HAMMER, SLOT_BOMB, SLOT_NONE, SLOT_NONE, SLOT_NONE, SLOT_NONE };
+
+        Inventory_ChangeEquipment(EQUIP_TYPE_SWORD, EQUIP_VALUE_SWORD_MASTER);
+        Inventory_ChangeEquipment(EQUIP_TYPE_SHIELD, EQUIP_VALUE_SHIELD_MIRROR);
+        Inventory_ChangeEquipment(EQUIP_TYPE_TUNIC, EQUIP_VALUE_TUNIC_GORON);
+    }
+
+    // Button Items
+    for (int button = 0; button < ARRAY_COUNT(gSaveContext.equips.buttonItems); button++) {
+        gSaveContext.equips.buttonItems[button] = brButtonItems[button];
+    }
+
+    // C buttons
+    for (int button = 0; button < ARRAY_COUNT(gSaveContext.equips.cButtonSlots); button++) {
+        gSaveContext.equips.cButtonSlots[button] = brCButtonSlots[button];
+    }
+}
+
+void BossRush_HandleBlueWarp(PlayState* play, f32 warpPosX, f32 warpPosZ) {
     // If warping from Chamber of Sages, choose the correct boss room to teleport to.
     if (play->sceneNum == SCENE_CHAMBER_OF_THE_SAGES) {
         // Gohma & Phantom Ganon
@@ -202,10 +252,13 @@ void BossRush_HandleBlueWarp(PlayState* play, f32 warpPosX, f32 warpPosZ) {
         // Ganondork
         } else if (warpPosX == -199 && warpPosZ == 0) {
             play->nextEntranceIndex = ENTR_GANONDORF_BOSS_0;
+        } else {
+            SPDLOG_ERROR("[BossRush]: Unknown blue warp in chamber of sages at position ({}, {}). Warping back to chamber of sages.", warpPosX, warpPosZ);
+            play->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0;
         }
     // If coming from a boss room, teleport back to Chamber of Sages and set flag.
     } else {
-        play->nextEntranceIndex = SCENE_HAIRAL_NIWA2;
+        play->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0;
 
         if (CheckDungeonCount() == 3) {
             play->linkAgeOnLoad = LINK_AGE_ADULT;
@@ -223,6 +276,10 @@ void BossRush_HandleBlueWarp(PlayState* play, f32 warpPosX, f32 warpPosZ) {
             }
         }
     }
+
+    play->transitionTrigger = TRANS_TRIGGER_START;
+    play->transitionType = TRANS_TYPE_FADE_WHITE;
+    gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE_SLOW;
 }
 
 void BossRush_HandleBlueWarpHeal(PlayState* play) {
@@ -235,10 +292,6 @@ void BossRush_HandleBlueWarpHeal(PlayState* play) {
 }
 
 void BossRush_HandleCompleteBoss(PlayState* play) {
-    if (!IS_BOSS_RUSH) {
-        return;
-    }
-
     gSaveContext.isBossRushPaused = 1;
     switch (play->sceneNum) {
         case SCENE_DEKU_TREE_BOSS:
@@ -308,7 +361,7 @@ void BossRush_InitSave() {
     }
 
     // Set health
-    uint16_t health = 16;
+    u16 health = 16;
     switch (gSaveContext.bossRushOptions[BR_OPTIONS_HEARTS]) { 
         case BR_CHOICE_HEARTS_7:
             health *= 7;
@@ -418,7 +471,7 @@ void BossRush_InitSave() {
     }
 
     // Upgrades
-    uint8_t upgradeLevel = 1;
+    u8 upgradeLevel = 1;
     if (gSaveContext.bossRushOptions[BR_OPTIONS_AMMO] == BR_CHOICE_AMMO_MAXED) {
         upgradeLevel = 3;
     }
@@ -450,40 +503,209 @@ void BossRush_InitSave() {
     }
 }
 
-void BossRush_SetEquipment(uint8_t linkAge) {
+static void* sSavePromptNoChoiceTexs[] = {
+    (void*)gPauseNoENGTex,
+    (void*)gPauseNoGERTex,
+    (void*)gPauseNoFRATex
+};
 
-    std::array<u8, 8> brButtonItems;
-    std::array<u8, 7> brCButtonSlots;
+void BossRush_OnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void* optionalArg) {
+    switch (id) {
+        // Allow not healing before ganon
+        case VB_GANON_HEAL_BEFORE_FIGHT: {
+            if (gSaveContext.bossRushOptions[BR_OPTIONS_HEAL] == BR_CHOICE_HEAL_NEVER) {
+                *should = false;
+            }
+            break;
+        }
+        // Replace the blue warp transitions with ones that lead back to the chamber of sages
+        case VB_BLUE_WARP_APPLY_ENTRANCE_AND_CUTSCENE: {
+            DoorWarp1* blueWarp = static_cast<DoorWarp1*>(optionalArg);
+            BossRush_HandleBlueWarp(gPlayState, blueWarp->actor.world.pos.x, blueWarp->actor.world.pos.z);
+            *should = false;
+            break;
+        }
+        // Spawn clean blue warps (no ruto, adult animation, etc)
+        case VB_SPAWN_BLUE_WARP: {
+            switch (gPlayState->sceneNum) {
+                case SCENE_DEKU_TREE_BOSS: {
+                    BossGoma* bossGoma = static_cast<BossGoma*>(optionalArg);
+                    static Vec3f roomCenter = { -150.0f, 0.0f, -350.0f };
+                    Vec3f childPos = roomCenter;
 
-    // Set Child Equipment.
-    if (linkAge == LINK_AGE_CHILD) {
-        brButtonItems = {
-            ITEM_SWORD_KOKIRI, ITEM_STICK, ITEM_NUT, ITEM_BOMB, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE
-        };
+                    for (s32 i = 0; i < 10000; i++) {
+                        if ((fabsf(childPos.x - GET_PLAYER(gPlayState)->actor.world.pos.x) < 100.0f &&
+                             fabsf(childPos.z - GET_PLAYER(gPlayState)->actor.world.pos.z) < 100.0f) ||
+                            (fabsf(childPos.x - bossGoma->actor.world.pos.x) < 150.0f &&
+                             fabsf(childPos.z - bossGoma->actor.world.pos.z) < 150.0f)) {
+                            childPos.x = Rand_CenteredFloat(400.0f) + -150.0f;
+                            childPos.z = Rand_CenteredFloat(400.0f) + -350.0f;
+                        } else {
+                            break;
+                        }
+                    }
+                    Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_DOOR_WARP1, childPos.x, bossGoma->actor.world.pos.y, childPos.z, 0, 0, 0, WARP_DUNGEON_ADULT, false);
+                    break;
+                }
+                case SCENE_DODONGOS_CAVERN_BOSS: {
+                    Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_DOOR_WARP1, -890.0f, -1523.76f, -3304.0f, 0, 0, 0, WARP_DUNGEON_ADULT, false);
+                    break;
+                }
+                case SCENE_JABU_JABU_BOSS: {
+                    static Vec3f sWarpPos[] = {
+                        { 10.0f, 0.0f, 30.0f },
+                        { 260.0f, 0.0f, -470.0f },
+                        { -240.0f, 0.0f, -470.0f },
+                    };
 
-        brCButtonSlots = { SLOT_STICK, SLOT_NUT, SLOT_BOMB, SLOT_NONE, SLOT_NONE, SLOT_NONE, SLOT_NONE };
+                    s32 sp7C = 2;
+                    for (s32 i = 2; i > 0; i -= 1) {
+                        if (Math_Vec3f_DistXYZ(&sWarpPos[i], &GET_PLAYER(gPlayState)->actor.world.pos) <
+                            Math_Vec3f_DistXYZ(&sWarpPos[i - 1], &GET_PLAYER(gPlayState)->actor.world.pos)) {
+                            sp7C = i - 1;
+                        }
+                    }
 
-        Inventory_ChangeEquipment(EQUIP_TYPE_SWORD, EQUIP_VALUE_SWORD_KOKIRI);
-        Inventory_ChangeEquipment(EQUIP_TYPE_SHIELD, EQUIP_VALUE_SHIELD_DEKU);
-    // Set Adult equipment.
-    } else {
-        brButtonItems = { ITEM_SWORD_MASTER, ITEM_BOW,  ITEM_HAMMER, ITEM_BOMB,
-                          ITEM_NONE,         ITEM_NONE, ITEM_NONE,   ITEM_NONE };
-
-        brCButtonSlots = { SLOT_BOW, SLOT_HAMMER, SLOT_BOMB, SLOT_NONE, SLOT_NONE, SLOT_NONE, SLOT_NONE };
-
-        Inventory_ChangeEquipment(EQUIP_TYPE_SWORD, EQUIP_VALUE_SWORD_MASTER);
-        Inventory_ChangeEquipment(EQUIP_TYPE_SHIELD, EQUIP_VALUE_SHIELD_MIRROR);
-        Inventory_ChangeEquipment(EQUIP_TYPE_TUNIC, EQUIP_VALUE_TUNIC_GORON);
-    }
-
-    // Button Items
-    for (int button = 0; button < ARRAY_COUNT(gSaveContext.equips.buttonItems); button++) {
-        gSaveContext.equips.buttonItems[button] = brButtonItems[button];
-    }
-
-    // C buttons
-    for (int button = 0; button < ARRAY_COUNT(gSaveContext.equips.cButtonSlots); button++) {
-        gSaveContext.equips.cButtonSlots[button] = brCButtonSlots[button];
+                    Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_DOOR_WARP1, sWarpPos[sp7C].x, sWarpPos[sp7C].y, sWarpPos[sp7C].z, 0, 0, 0, WARP_DUNGEON_ADULT, false);
+                    break;
+                }
+                case SCENE_FOREST_TEMPLE_BOSS: {
+                    Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_DOOR_WARP1, 14.0f, -33.0f, -3315.0f, 0, 0, 0, WARP_DUNGEON_ADULT, true);
+                    break;
+                }
+                case SCENE_FIRE_TEMPLE_BOSS: {
+                    Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_DOOR_WARP1, 0.0f, 100.0f, 0.0f, 0, 0, 0, WARP_DUNGEON_ADULT, true);
+                    break;
+                }
+                case SCENE_WATER_TEMPLE_BOSS: {
+                    BossMo* bossMo = static_cast<BossMo*>(optionalArg);
+                    Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_DOOR_WARP1, bossMo->actor.world.pos.x, -280.0f, bossMo->actor.world.pos.z, 0, 0, 0, WARP_DUNGEON_ADULT, true);
+                    break;
+                }
+                case SCENE_SPIRIT_TEMPLE_BOSS: {
+                    Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_DOOR_WARP1, 600.0f, 230.0f, 0.0f, 0, 0, 0, WARP_DUNGEON_ADULT, true);
+                    break;
+                }
+                case SCENE_SHADOW_TEMPLE_BOSS: {
+                    Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_DOOR_WARP1, -50.0f, 0.0f, 400.0f, 0, 0, 0, WARP_DUNGEON_ADULT, true);
+                    break;
+                }
+                default: {
+                    SPDLOG_WARN("[BossRush]: Blue warp spawned in unhandled scene, ignoring");
+                    return;
+                }
+            }
+            *should = false;
+            break;
+        }
+        // Skip past the "Save?" window when pressing B while paused and instead close the menu.
+        case VB_CLOSE_PAUSE_MENU: {
+            if (CHECK_BTN_ALL(gPlayState->state.input[0].press.button, BTN_B)) {
+                *should = true;
+            }
+            break;
+        }
+        // Show "No" twice because the player can't continue.
+        case VB_RENDER_YES_ON_CONTINUE_PROMPT: {
+            Gfx** disp = static_cast<Gfx**>(optionalArg);
+            *disp = KaleidoScope_QuadTextureIA8(*disp, sSavePromptNoChoiceTexs[gSaveContext.language], 48, 16, 12);
+            *should = false;
+            break;
+        }
+        // Break the dodongo breakable floor immediately so the player can jump in the hole immediately.
+        case VB_BG_BREAKWALL_BREAK: {
+            *should = true;
+            break;
+        }
+        // Skip past the "Save?" window when dying and go to the "Continue?" screen immediately.
+        case VB_TRANSITION_TO_SAVE_SCREEN_ON_DEATH: {
+            PauseContext* pauseCtx = static_cast<PauseContext*>(optionalArg);
+            pauseCtx->state = 0xF;
+            *should = false;
+            break;
+        }
+        // Prevent saving
+        case VB_BE_ABLE_TO_SAVE:
+        // Disable doors so the player can't leave the boss rooms backwards.
+        case VB_BE_ABLE_TO_OPEN_DOORS:
+        // There's no heart containers in boss rush
+        case VB_SPAWN_HEART_CONTAINER:
+        // Rupees are useless in boss rush
+        case VB_RENDER_RUPEE_COUNTER: {
+            *should = false;
+            break;
+        }
+        // Prevent warning spam
+        default: {
+            break;
+        }
     }
 }
+
+void BossRush_OnActorInitHandler(void* actorRef) {
+    Actor* actor = static_cast<Actor*>(actorRef);
+
+    if (actor->id == ACTOR_DEMO_SA && gPlayState->sceneNum == SCENE_CHAMBER_OF_THE_SAGES) {
+        BossRush_SpawnBlueWarps(gPlayState);
+        Actor_Kill(actor);
+        GET_PLAYER(gPlayState)->actor.world.rot.y = GET_PLAYER(gPlayState)->actor.shape.rot.y = 27306;
+        return;
+    }
+
+    // Remove chests, mainly for the chest in King Dodongo's boss room.
+    // Remove bushes, used in Gohma's arena.
+    // Remove pots, used in Barinade's and Ganondorf's arenas.
+    if (actor->id == ACTOR_EN_KUSA || actor->id == ACTOR_OBJ_TSUBO || actor->id == ACTOR_EN_BOX) {
+        Actor_Kill(actor);
+        return;
+    }
+}
+
+void BossRush_OnSceneInitHandler(s16 sceneNum) {
+    // Unpause the timer when the scene loaded isn't the Chamber of Sages.
+    if (sceneNum != SCENE_CHAMBER_OF_THE_SAGES) {
+        gSaveContext.isBossRushPaused = 0;
+    }
+}
+
+void BossRush_OnBossDefeatHandler(void* refActor) {
+    BossRush_HandleCompleteBoss(gPlayState);
+}
+
+void BossRush_OnBlueWarpUpdate(void* actor) {
+    DoorWarp1* blueWarp = static_cast<DoorWarp1*>(actor);
+
+    if (blueWarp->warpTimer > 160) {
+        BossRush_HandleBlueWarp(gPlayState, blueWarp->actor.world.pos.x, blueWarp->actor.world.pos.z);
+    }
+}
+
+void BossRush_RegisterHooks() {
+    static u32 onVanillaBehaviorHook = 0;
+    static u32 onSceneInitHook = 0;
+    static u32 onActorInitHook = 0;
+    static u32 onBossDefeatHook = 0;
+    static u32 onActorUpdate = 0;
+
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnLoadGame>([](int32_t fileNum) {
+        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnVanillaBehavior>(onVanillaBehaviorHook);
+        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(onSceneInitHook);
+        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorInit>(onActorInitHook);
+        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnBossDefeat>(onBossDefeatHook);
+        GameInteractor::Instance->UnregisterGameHookForID<GameInteractor::OnActorUpdate>(onActorUpdate);
+
+        onVanillaBehaviorHook = 0;
+        onSceneInitHook = 0;
+        onActorInitHook = 0;
+        onBossDefeatHook = 0;
+        onActorUpdate = 0;
+
+        if (!IS_BOSS_RUSH) return;
+
+        onVanillaBehaviorHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnVanillaBehavior>(BossRush_OnVanillaBehaviorHandler);
+        onSceneInitHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>(BossRush_OnSceneInitHandler);
+        onActorInitHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorInit>(BossRush_OnActorInitHandler);
+        onBossDefeatHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnBossDefeat>(BossRush_OnBossDefeatHandler);
+        onActorUpdate = GameInteractor::Instance->RegisterGameHookForID<GameInteractor::OnActorUpdate>(ACTOR_DOOR_WARP1, BossRush_OnBlueWarpUpdate);
+    });
+}
\ No newline at end of file
diff --git a/soh/soh/Enhancements/boss-rush/BossRush.h b/soh/soh/Enhancements/boss-rush/BossRush.h
index caa6ce86e..292cbaf26 100644
--- a/soh/soh/Enhancements/boss-rush/BossRush.h
+++ b/soh/soh/Enhancements/boss-rush/BossRush.h
@@ -1,20 +1,16 @@
 #pragma once
 
-#include "BossRushTypes.h"
-#include "variables.h"
+#include "z64.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
-void BossRush_SpawnBlueWarps(PlayState* play);
-void BossRush_HandleBlueWarp(PlayState* play, f32 warpPosX, f32 warpPosZ);
-void BossRush_HandleBlueWarpHeal(PlayState* play);
-void BossRush_InitSave();
-void BossRush_SetEquipment(uint8_t linkAge);
-void BossRush_HandleCompleteBoss(PlayState* play);
-const char* BossRush_GetSettingName(uint8_t optionIndex, uint8_t language);
-const char* BossRush_GetSettingChoiceName(uint8_t optionIndex, uint8_t choiceIndex, uint8_t language);
-uint8_t BossRush_GetSettingOptionsAmount(uint8_t optionIndex);
+    void BossRush_HandleBlueWarpHeal(PlayState* play);
+    void BossRush_InitSave();
+    const char* BossRush_GetSettingName(u8 optionIndex, u8 language);
+    const char* BossRush_GetSettingChoiceName(u8 optionIndex, u8 choiceIndex, u8 language);
+    u8 BossRush_GetSettingOptionsAmount(u8 optionIndex);
+    void BossRush_RegisterHooks();
 #ifdef __cplusplus
 };
 #endif
diff --git a/soh/soh/Enhancements/boss-rush/BossRushTypes.h b/soh/soh/Enhancements/boss-rush/BossRushTypes.h
index e39cba997..cf4d3aaba 100644
--- a/soh/soh/Enhancements/boss-rush/BossRushTypes.h
+++ b/soh/soh/Enhancements/boss-rush/BossRushTypes.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#define BOSSRUSH_OPTIONS_AMOUNT 12
 #define BOSSRUSH_MAX_OPTIONS_ON_SCREEN 6
 
 typedef enum {
@@ -15,7 +14,8 @@ typedef enum {
     BR_OPTIONS_LONGSHOT,
     BR_OPTIONS_HOVERBOOTS,
     BR_OPTIONS_BUNNYHOOD,
-    BR_OPTIONS_TIMER
+    BR_OPTIONS_TIMER,
+    BR_OPTIONS_MAX,
 } BossRushOptionEnums;
 
 typedef enum {
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h
index d96a3ab55..1a86987f8 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h
@@ -247,6 +247,46 @@ typedef enum {
     ```
     */
     VB_DRAW_AMMO_COUNT,
+    // Vanilla condition: true
+    VB_HAVE_OCARINA_NOTE_D4,
+    // Vanilla condition: true
+    VB_HAVE_OCARINA_NOTE_D5,
+    // Vanilla condition: true
+    VB_HAVE_OCARINA_NOTE_F4,
+    // Vanilla condition: true
+    VB_HAVE_OCARINA_NOTE_B4,
+    // Vanilla condition: true
+    VB_HAVE_OCARINA_NOTE_A4,
+    // Vanilla condition: false
+    VB_SKIP_SCARECROWS_SONG,
+    // Vanilla condition: true
+    VB_RENDER_RUPEE_COUNTER,
+    // Vanilla condition: true
+    VB_RENDER_KEY_COUNTER,
+    // Vanilla condition: true
+    VB_SPAWN_HEART_CONTAINER,
+    // Vanilla condition: true
+    VB_BE_ABLE_TO_OPEN_DOORS,
+    // Vanilla condition: true
+    VB_REVERT_SPOILING_ITEMS,
+    // Vanilla condition: Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP) || BREG(2)
+    VB_BE_ABLE_TO_PLAY_BOMBCHU_BOWLING,
+    // Vanilla condition: true
+    VB_BE_ABLE_TO_SAVE,
+    // Vanilla condition: true
+    VB_TRANSITION_TO_SAVE_SCREEN_ON_DEATH,
+    // Vanilla condition: true
+    VB_RENDER_YES_ON_CONTINUE_PROMPT,
+    // Vanilla condition: CHECK_BTN_ALL(input->press.button, BTN_START)
+    VB_CLOSE_PAUSE_MENU,
+    // Vanilla condition: true
+    VB_SPAWN_BLUE_WARP,
+    // Vanilla condition: this->warpTimer > sWarpTimerTarget && gSaveContext.nextCutsceneIndex == 0xFFEF
+    VB_BLUE_WARP_APPLY_ENTRANCE_AND_CUTSCENE,
+    // Vanilla condition: this->collider.base.acFlags & 2
+    VB_BG_BREAKWALL_BREAK,
+    // Vanilla condition: true
+    VB_GANON_HEAL_BEFORE_FIGHT,
     VB_FREEZE_LINK_FOR_BLOCK_THROW,
     VB_MOVE_THROWN_ACTOR,
 
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor_HookTable.h b/soh/soh/Enhancements/game-interactor/GameInteractor_HookTable.h
index a3fc284ee..5669da661 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor_HookTable.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor_HookTable.h
@@ -24,6 +24,7 @@ DEFINE_HOOK(OnActorInit, (void* actor));
 DEFINE_HOOK(OnActorUpdate, (void* actor));
 DEFINE_HOOK(OnActorKill, (void* actor));
 DEFINE_HOOK(OnEnemyDefeat, (void* actor));
+DEFINE_HOOK(OnBossDefeat, (void* actor));
 DEFINE_HOOK(OnPlayerBonk, ());
 DEFINE_HOOK(OnPlayDestroy, ());
 DEFINE_HOOK(OnPlayDrawEnd, ());
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp
index 93c8fc75e..49724b66c 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp
@@ -100,6 +100,13 @@ void GameInteractor_ExecuteOnEnemyDefeat(void* actor) {
     GameInteractor::Instance->ExecuteHooksForFilter<GameInteractor::OnEnemyDefeat>(actor);
 }
 
+void GameInteractor_ExecuteOnBossDefeat(void* actor) {
+    GameInteractor::Instance->ExecuteHooks<GameInteractor::OnBossDefeat>(actor);
+    GameInteractor::Instance->ExecuteHooksForID<GameInteractor::OnBossDefeat>(((Actor*)actor)->id, actor);
+    GameInteractor::Instance->ExecuteHooksForPtr<GameInteractor::OnBossDefeat>((uintptr_t)actor, actor);
+    GameInteractor::Instance->ExecuteHooksForFilter<GameInteractor::OnBossDefeat>(actor);
+}
+
 void GameInteractor_ExecuteOnPlayerBonk() {
     GameInteractor::Instance->ExecuteHooks<GameInteractor::OnPlayerBonk>();
 }
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h
index 82deeaf80..e1cba237d 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h
@@ -22,6 +22,7 @@ void GameInteractor_ExecuteOnActorInit(void* actor);
 void GameInteractor_ExecuteOnActorUpdate(void* actor);
 void GameInteractor_ExecuteOnActorKill(void* actor);
 void GameInteractor_ExecuteOnEnemyDefeat(void* actor);
+void GameInteractor_ExecuteOnBossDefeat(void* actor);
 void GameInteractor_ExecuteOnPlayerBonk();
 void GameInteractor_ExecuteOnOcarinaSongAction();
 void GameInteractor_ExecuteOnShopSlotChangeHooks(uint8_t cursorIndex, int16_t price);
diff --git a/soh/soh/Enhancements/mods.cpp b/soh/soh/Enhancements/mods.cpp
index 2c0368fea..adac0d968 100644
--- a/soh/soh/Enhancements/mods.cpp
+++ b/soh/soh/Enhancements/mods.cpp
@@ -3,7 +3,7 @@
 #include "game-interactor/GameInteractor.h"
 #include "tts/tts.h"
 #include "soh/OTRGlobals.h"
-#include "soh/Enhancements/boss-rush/BossRushTypes.h"
+#include "soh/Enhancements/boss-rush/BossRush.h"
 #include "soh/Enhancements/enhancementTypes.h"
 #include "soh/Enhancements/randomizer/3drando/random.hpp"
 #include "soh/Enhancements/cosmetics/authenticGfxPatches.h"
@@ -784,48 +784,6 @@ void RegisterResetNaviTimer() {
 	});
 }
 
-f32 triforcePieceScale;
-
-void RegisterTriforceHunt() {
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnPlayerUpdate>([]() {
-        if (!GameInteractor::IsGameplayPaused() &&
-            OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIFORCE_HUNT)) {
-
-            // Warp to credits
-            if (GameInteractor::State::TriforceHuntCreditsWarpActive) {
-                gPlayState->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0;
-                gSaveContext.nextCutsceneIndex = 0xFFF2;
-                gPlayState->transitionTrigger = TRANS_TRIGGER_START;
-                gPlayState->transitionType = TRANS_TYPE_FADE_WHITE;
-                GameInteractor::State::TriforceHuntCreditsWarpActive = 0;
-            }
-
-            // Reset Triforce Piece scale for GI animation. Triforce Hunt allows for multiple triforce models,
-            // and cycles through them based on the amount of triforce pieces collected. It takes a little while
-            // for the count to increase during the GI animation, so the model is entirely hidden until that piece
-            // has been added. That scale has to be reset after the textbox is closed, and this is the best way
-            // to ensure it's done at that point in time specifically.
-            if (GameInteractor::State::TriforceHuntPieceGiven) {
-                triforcePieceScale = 0.0f;
-                GameInteractor::State::TriforceHuntPieceGiven = 0;
-            }
-        }
-    });
-}
-
-void RegisterGrantGanonsBossKey() {
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnPlayerUpdate>([]() {
-        // Triforce Hunt needs the check if the player isn't being teleported to the credits scene.
-        if (!GameInteractor::IsGameplayPaused() && IS_RANDO &&
-            Flags_GetRandomizerInf(RAND_INF_GRANT_GANONS_BOSSKEY) && gPlayState->transitionTrigger != TRANS_TRIGGER_START &&
-            (1 << 0 & gSaveContext.inventory.dungeonItems[SCENE_GANONS_TOWER]) == 0) {
-                GetItemEntry getItemEntry =
-                    ItemTableManager::Instance->RetrieveItemEntry(MOD_RANDOMIZER, RG_GANONS_CASTLE_BOSS_KEY);
-                GiveItemEntryWithoutActor(gPlayState, getItemEntry);
-        }
-    });
-}
-
 //this map is used for enemies that can be uniquely identified by their id
 //and that are always counted
 //enemies that can't be uniquely identified by their id
@@ -873,7 +831,7 @@ static std::unordered_map<u16, u16> uniqueEnemyIdToStatCount = {
 
 void RegisterEnemyDefeatCounts() {
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnEnemyDefeat>([](void* refActor) {
-        Actor* actor = (Actor*)refActor;
+        Actor* actor = static_cast<Actor*>(refActor);
         if (uniqueEnemyIdToStatCount.contains(actor->id)) {
             gSaveContext.sohStats.count[uniqueEnemyIdToStatCount[actor->id]]++;
         } else {
@@ -1017,6 +975,45 @@ void RegisterEnemyDefeatCounts() {
     });
 }
 
+void RegisterBossDefeatTimestamps() {
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnBossDefeat>([](void* refActor) {
+        Actor* actor = static_cast<Actor*>(refActor);
+        switch (actor->id) {
+            case ACTOR_BOSS_DODONGO:
+                gSaveContext.sohStats.itemTimestamp[TIMESTAMP_DEFEAT_KING_DODONGO] = GAMEPLAYSTAT_TOTAL_TIME;
+                break;
+            case ACTOR_BOSS_FD2:
+                gSaveContext.sohStats.itemTimestamp[TIMESTAMP_DEFEAT_VOLVAGIA] = GAMEPLAYSTAT_TOTAL_TIME;
+                break;
+            case ACTOR_BOSS_GANON:
+                gSaveContext.sohStats.itemTimestamp[TIMESTAMP_DEFEAT_GANONDORF] = GAMEPLAYSTAT_TOTAL_TIME;
+                break;
+            case ACTOR_BOSS_GANON2:
+                gSaveContext.sohStats.itemTimestamp[TIMESTAMP_DEFEAT_GANON] = GAMEPLAYSTAT_TOTAL_TIME;
+                gSaveContext.sohStats.gameComplete = true;
+                break;
+            case ACTOR_BOSS_GANONDROF:
+                gSaveContext.sohStats.itemTimestamp[TIMESTAMP_DEFEAT_PHANTOM_GANON] = GAMEPLAYSTAT_TOTAL_TIME;
+                break;
+            case ACTOR_BOSS_GOMA:
+                gSaveContext.sohStats.itemTimestamp[TIMESTAMP_DEFEAT_GOHMA] = GAMEPLAYSTAT_TOTAL_TIME;
+                break;
+            case ACTOR_BOSS_MO:
+                gSaveContext.sohStats.itemTimestamp[TIMESTAMP_DEFEAT_MORPHA] = GAMEPLAYSTAT_TOTAL_TIME;
+                break;
+            case ACTOR_BOSS_SST:
+                gSaveContext.sohStats.itemTimestamp[TIMESTAMP_DEFEAT_BONGO_BONGO] = GAMEPLAYSTAT_TOTAL_TIME;
+                break;
+            case ACTOR_BOSS_TW:
+                gSaveContext.sohStats.itemTimestamp[TIMESTAMP_DEFEAT_TWINROVA] = GAMEPLAYSTAT_TOTAL_TIME;
+                break;
+            case ACTOR_BOSS_VA:
+                gSaveContext.sohStats.itemTimestamp[TIMESTAMP_DEFEAT_BARINADE] = GAMEPLAYSTAT_TOTAL_TIME;
+                break;
+        }
+    });
+}
+
 typedef enum {
     ADD_ICE_TRAP,
     ADD_BURN_TRAP,
@@ -1165,83 +1162,6 @@ void RegisterAltTrapTypes() {
     });
 }
 
-void RegisterRandomizerSheikSpawn() {
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneSpawnActors>([]() {
-        if (!gPlayState) return;
-        if (!IS_RANDO || !LINK_IS_ADULT || !OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHEIK_LA_HINT)) return;
-        switch (gPlayState->sceneNum) {
-            case SCENE_TEMPLE_OF_TIME:
-                if (gPlayState->roomCtx.curRoom.num == 1) {
-                    Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_EN_XC, -104, -40, 2382, 0, 0x8000, 0, SHEIK_TYPE_RANDO, false);
-                }
-                break;
-            case SCENE_INSIDE_GANONS_CASTLE:
-                if (gPlayState->roomCtx.curRoom.num == 1){
-                    Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_EN_XC, 101, 150, 137, 0, 0, 0, SHEIK_TYPE_RANDO, false);
-                    }
-                break;
-            default: break;
-        }
-    });
-}
-
-//Boss souls require an additional item (represented by a RAND_INF) to spawn a boss in a particular lair
-void RegisterBossSouls() {
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorInit>([](void* actor) {
-        if (!gPlayState) return;
-        if (!IS_RANDO || !(OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_BOSS_SOULS))) return;
-        RandomizerInf rand_inf = RAND_INF_MAX;
-        Actor* actual = (Actor*)actor;
-        switch (gPlayState->sceneNum){
-            case SCENE_DEKU_TREE_BOSS:
-                rand_inf = RAND_INF_GOHMA_SOUL;
-                break;
-            case SCENE_DODONGOS_CAVERN_BOSS:
-                rand_inf = RAND_INF_KING_DODONGO_SOUL;
-                break;
-            case SCENE_JABU_JABU_BOSS:
-                rand_inf = RAND_INF_BARINADE_SOUL;
-                break;
-            case SCENE_FOREST_TEMPLE_BOSS:
-                rand_inf = RAND_INF_PHANTOM_GANON_SOUL;
-                break;
-            case SCENE_FIRE_TEMPLE_BOSS:
-                rand_inf = RAND_INF_VOLVAGIA_SOUL;
-                break;
-            case SCENE_WATER_TEMPLE_BOSS:
-                rand_inf = RAND_INF_MORPHA_SOUL;
-                break;
-            case SCENE_SHADOW_TEMPLE_BOSS:
-                rand_inf = RAND_INF_BONGO_BONGO_SOUL;
-                break;
-            case SCENE_SPIRIT_TEMPLE_BOSS:
-                rand_inf = RAND_INF_TWINROVA_SOUL;
-                break;
-            case SCENE_GANONDORF_BOSS:
-            case SCENE_GANON_BOSS:
-                if (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_BOSS_SOULS) == RO_BOSS_SOULS_ON_PLUS_GANON) {
-                    rand_inf = RAND_INF_GANON_SOUL;
-                }
-                break;
-            default: break;
-        }
-
-        //Deletes all actors in the boss category if the soul isn't found.
-        //Some actors, like Dark Link, Arwings, and Zora's Sapphire...?, are in this category despite not being actual bosses,
-        //so ignore any "boss" if `rand_inf` doesn't change from RAND_INF_MAX.
-        if (rand_inf != RAND_INF_MAX) {
-            if (!Flags_GetRandomizerInf(rand_inf) && actual->category == ACTORCAT_BOSS) {
-                Actor_Delete(&gPlayState->actorCtx, actual, gPlayState);
-            }
-            //Special case for Phantom Ganon's horse (and fake), as they're considered "background actors",
-            //but still control the boss fight flow.
-            if (!Flags_GetRandomizerInf(RAND_INF_PHANTOM_GANON_SOUL) && actual->id == ACTOR_EN_FHG) {
-                Actor_Delete(&gPlayState->actorCtx, actual, gPlayState);
-            }
-        }
-    });
-}
-
 void UpdateHurtContainerModeState(bool newState) {
         static bool hurtEnabled = false;
         if (hurtEnabled == newState) {
@@ -1460,131 +1380,6 @@ void RegisterPauseMenuHooks() {
     });
 }
 
-//from z_player.c
-typedef struct {
-    /* 0x00 */ Vec3f pos;
-    /* 0x0C */ s16 yaw;
-} SpecialRespawnInfo; // size = 0x10
-
-//special respawns used when voided out without swim to prevent infinite loops
-std::map<s32, SpecialRespawnInfo> swimSpecialRespawnInfo = {
-    {
-        ENTR_ZORAS_RIVER_3,//hf to zr in water
-        { { -1455.443, -20, 1384.826 }, 28761 }
-    },
-    {
-        ENTR_HYRULE_FIELD_14,//zr to hf in water
-        { { 5830.209, -92.16, 3925.911 }, -20025 }
-    },
-    {
-        ENTR_LOST_WOODS_7,//zr to lw
-        { { 1978.718, -36.908, -855 }, -16384 }
-    },
-    {
-        ENTR_ZORAS_RIVER_4,//lw to zr
-        { { 4082.366, 860.442, -1018.949 }, -32768 }
-    },
-    {
-        ENTR_LAKE_HYLIA_1,//gv to lh
-        { { -3276.416, -1033, 2908.421 }, 11228 }
-    },
-    {
-        ENTR_WATER_TEMPLE_0,//lh to water temple
-        { { -182, 780, 759.5 }, -32768 }
-    },
-    {
-        ENTR_LAKE_HYLIA_2,//water temple to lh
-        { { -955.028, -1306.9, 6768.954 }, -32768 }
-    },
-    {
-        ENTR_ZORAS_DOMAIN_4,//lh to zd
-        { { -109.86, 11.396, -9.933 }, -29131 }
-    },
-    {
-        ENTR_LAKE_HYLIA_7,//zd to lh
-        { { -912, -1326.967, 3391 }, 0 }
-    },
-    {
-        ENTR_GERUDO_VALLEY_1,//caught by gerudos as child
-        { { -424, -2051, -74 }, 16384 }
-    }
-};
-
-void RegisterNoSwim() {
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnPlayerUpdate>([]() {
-        if (
-            IS_RANDO &&
-            (GET_PLAYER(gPlayState)->stateFlags1 & PLAYER_STATE1_IN_WATER) &&
-            !Flags_GetRandomizerInf(RAND_INF_CAN_SWIM) &&
-            CUR_EQUIP_VALUE(EQUIP_TYPE_BOOTS) != EQUIP_VALUE_BOOTS_IRON
-        ) {
-            //if you void out in water temple without swim you get instantly kicked out to prevent softlocks
-            if (gPlayState->sceneNum == SCENE_WATER_TEMPLE) {
-                GameInteractor::RawAction::TeleportPlayer(Entrance_OverrideNextIndex(ENTR_LAKE_HYLIA_2));//lake hylia from water temple
-                return;
-            }
-
-            if (swimSpecialRespawnInfo.find(gSaveContext.entranceIndex) != swimSpecialRespawnInfo.end()) {
-                SpecialRespawnInfo* respawnInfo = &swimSpecialRespawnInfo.at(gSaveContext.entranceIndex);
-
-                Play_SetupRespawnPoint(gPlayState, RESPAWN_MODE_DOWN, 0xDFF);
-                gSaveContext.respawn[RESPAWN_MODE_DOWN].pos = respawnInfo->pos;
-                gSaveContext.respawn[RESPAWN_MODE_DOWN].yaw = respawnInfo->yaw;
-            }
-
-            Play_TriggerVoidOut(gPlayState);
-        }
-    });
-}
-
-void RegisterNoWallet() {
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGameFrameUpdate>([]() {
-        if (IS_RANDO && !Flags_GetRandomizerInf(RAND_INF_HAS_WALLET)) {
-            gSaveContext.rupees = 0;
-        }
-    });
-}
-
-void RegisterInfiniteUpgrades() {
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGameFrameUpdate>([]() {
-        if (!IS_RANDO) {
-            return;
-        }
-
-        if (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_QUIVER)) {
-            AMMO(ITEM_BOW) = CUR_CAPACITY(UPG_QUIVER);
-        }
-
-        if (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_BOMB_BAG)) {
-            AMMO(ITEM_BOMB) = CUR_CAPACITY(UPG_BOMB_BAG);
-        }
-
-        if (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_BULLET_BAG)) {
-            AMMO(ITEM_SLINGSHOT) = CUR_CAPACITY(UPG_BULLET_BAG);
-        }
-
-        if (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_STICK_UPGRADE)) {
-            AMMO(ITEM_STICK) = CUR_CAPACITY(UPG_STICKS);
-        }
-
-        if (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_NUT_UPGRADE)) {
-            AMMO(ITEM_NUT) = CUR_CAPACITY(UPG_NUTS);
-        }
-
-        if (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_MAGIC_METER)) {
-            gSaveContext.magic = gSaveContext.magicCapacity;
-        }
-
-        if (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_BOMBCHUS)) {
-            AMMO(ITEM_BOMBCHU) = 50;
-        }
-
-        if (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_MONEY)) {
-            gSaveContext.rupees = CUR_CAPACITY(UPG_WALLET);
-        }
-    });
-}
-
 extern "C" u8 Randomizer_GetSettingValue(RandomizerSettingKey randoSettingKey);
 
 void PatchCompasses() {
@@ -1605,30 +1400,8 @@ void RegisterRandomizerCompasses() {
     });
 }
 
-extern "C" void func_8099485C(DoorGerudo* gerudoDoor, PlayState* play);
-
-void RegisterSkeletonKey() {
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* refActor) {
-        if (Flags_GetRandomizerInf(RAND_INF_HAS_SKELETON_KEY)) {
-            Actor* actor = static_cast<Actor*>(refActor);
-            if (actor->id == ACTOR_EN_DOOR) {
-                EnDoor* door = (EnDoor*)actor;
-                door->lockTimer = 0;
-            } else if (actor->id == ACTOR_DOOR_SHUTTER) {
-                DoorShutter* shutterDoor = (DoorShutter*)actor;
-                if (shutterDoor->doorType == SHUTTER_KEY_LOCKED) {
-                    shutterDoor->unk_16E = 0;
-                }
-            } else if (actor->id == ACTOR_DOOR_GERUDO) {
-                DoorGerudo* gerudoDoor = (DoorGerudo*)actor;
-                gerudoDoor->actionFunc = func_8099485C;
-                gerudoDoor->dyna.actor.world.pos.y = gerudoDoor->dyna.actor.home.pos.y + 200.0f;
-            }
-        }
-    });
-}
-
 void InitMods() {
+    BossRush_RegisterHooks();
     RandomizerRegisterHooks();
     TimeSaverRegisterHooks();
     CheatsRegisterHooks();
@@ -1658,24 +1431,17 @@ void InitMods() {
     RegisterMenuPathFix();
     RegisterMirrorModeHandler();
     RegisterResetNaviTimer();
-    RegisterTriforceHunt();
-    RegisterGrantGanonsBossKey();
     RegisterEnemyDefeatCounts();
+    RegisterBossDefeatTimestamps();
     RegisterAltTrapTypes();
-    RegisterRandomizerSheikSpawn();
-    RegisterBossSouls();
     RegisterRandomizedEnemySizes();
     RegisterOpenAllHours();
     RegisterToTMedallions();
-    RegisterNoSwim();
-    RegisterNoWallet();
-    RegisterInfiniteUpgrades();
     RegisterRandomizerCompasses();
     NameTag_RegisterHooks();
     RegisterFloorSwitchesHook();
     RegisterPatchHandHandler();
     RegisterHurtContainerModeHandler();
     RegisterPauseMenuHooks();
-    RegisterSkeletonKey();
     RandoKaleido_RegisterHooks();
 }
diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index 8c86af5ef..af56293cb 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -2,6 +2,7 @@
 #include "soh/OTRGlobals.h"
 #include "soh/Enhancements/enhancementTypes.h"
 #include "soh/Enhancements/custom-message/CustomMessageTypes.h"
+#include "soh/Enhancements/item-tables/ItemTableManager.h"
 #include "soh/Enhancements/randomizer/randomizerTypes.h"
 #include "soh/Enhancements/randomizer/dungeon.h"
 #include "soh/Enhancements/randomizer/fishsanity.h"
@@ -35,6 +36,10 @@ extern "C" {
 #include "src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h"
 #include "src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.h"
 #include "src/overlays/actors/ovl_En_Ge1/z_en_ge1.h"
+#include "src/overlays/actors/ovl_En_Door/z_en_door.h"
+#include "src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h"
+#include "src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.h"
+#include "src/overlays/actors/ovl_En_Xc/z_en_xc.h"
 #include "src/overlays/actors/ovl_Fishing/z_fishing.h"
 #include "adult_trade_shuffle.h"
 #include "draw.h"
@@ -1179,6 +1184,79 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             }
             break;
         }
+        case VB_HAVE_OCARINA_NOTE_D4: {
+            if (!Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_A)) {
+                *should = false;
+            }
+            break;
+        }
+        case VB_HAVE_OCARINA_NOTE_D5: {
+            if (!Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_UP)) {
+                *should = false;
+            }
+            break;
+        }
+        case VB_HAVE_OCARINA_NOTE_F4: {
+            if (!Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_DOWN)) {
+                *should = false;
+            }
+            break;
+        }
+        case VB_HAVE_OCARINA_NOTE_B4: {
+            if (!Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_LEFT)) {
+                *should = false;
+            }
+            break;
+        }
+        case VB_HAVE_OCARINA_NOTE_A4: {
+            if (!Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_RIGHT)) {
+                *should = false;
+            }
+            break;
+        }
+        case VB_SKIP_SCARECROWS_SONG: {
+            int ocarinaButtonCount = 0;
+            for (int i = VB_HAVE_OCARINA_NOTE_D4; i <= VB_HAVE_OCARINA_NOTE_A4; i++) {
+                if (GameInteractor_Should((GIVanillaBehavior)i, true, NULL)) {
+                    ocarinaButtonCount++;
+                }
+            }
+
+            if (ocarinaButtonCount < 2) {
+                *should = false;
+                break;
+            }
+
+            if (gPlayState->msgCtx.msgMode == MSGMODE_OCARINA_PLAYING && RAND_GET_OPTION(RSK_SKIP_SCARECROWS_SONG)) {
+                *should = true;
+                break;
+            }
+            break;
+        }
+        case VB_RENDER_KEY_COUNTER: {
+            if (Flags_GetRandomizerInf(RAND_INF_HAS_SKELETON_KEY)) {
+                *should = false;
+            }
+            break;
+        }
+        case VB_RENDER_RUPEE_COUNTER: {
+            if (!Flags_GetRandomizerInf(RAND_INF_HAS_WALLET) || Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_MONEY)) {
+                *should = false;
+            }
+            break;
+        }
+        case VB_REVERT_SPOILING_ITEMS: {
+            if (RAND_GET_OPTION(RSK_SHUFFLE_ADULT_TRADE)) {
+                *should = false;
+            }
+            break;
+        }
+        case VB_BE_ABLE_TO_PLAY_BOMBCHU_BOWLING: {
+            // Only check for bomb bag when bombchus aren't in logic
+            // and only check for bombchus when bombchus are in logic
+            *should = INV_CONTENT((RAND_GET_OPTION(RSK_BOMBCHUS_IN_LOGIC) ? ITEM_BOMBCHU : ITEM_BOMB)) != ITEM_NONE;
+            break;
+        }
         case VB_SHOULD_CHECK_FOR_FISHING_RECORD: {
             f32 sFishOnHandLength = *static_cast<f32*>(optionalArg);
             *should = *should || ShouldGiveFishingPrize(sFishOnHandLength);
@@ -1222,7 +1300,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
                         fishData->actor->stateAndTimer = 0;
                     }
                 }
-            } 
+            }
             break;
         }
         case VB_TRADE_TIMER_ODD_MUSHROOM:
@@ -1286,6 +1364,10 @@ void RandomizerOnSceneInitHandler(int16_t sceneNum) {
         CheckTracker::RecalculateAllAreaTotals();
     }
 
+    if (RAND_GET_OPTION(RSK_SHUFFLE_ENTRANCES)) {
+        Entrance_OverrideWeatherState();
+    }
+
     // LACs & Prelude checks
     static uint32_t updateHook = 0;
 
@@ -1577,6 +1659,291 @@ void RandomizerOnActorInitHandler(void* actorRef) {
     ) {
         Actor_Kill(actor);
     }
+
+    if (RAND_GET_OPTION(RSK_SHUFFLE_BOSS_SOULS)) {
+        //Boss souls require an additional item (represented by a RAND_INF) to spawn a boss in a particular lair
+        RandomizerInf currentBossSoulRandInf = RAND_INF_MAX;
+        switch (gPlayState->sceneNum){
+            case SCENE_DEKU_TREE_BOSS:
+                currentBossSoulRandInf = RAND_INF_GOHMA_SOUL;
+                break;
+            case SCENE_DODONGOS_CAVERN_BOSS:
+                currentBossSoulRandInf = RAND_INF_KING_DODONGO_SOUL;
+                break;
+            case SCENE_JABU_JABU_BOSS:
+                currentBossSoulRandInf = RAND_INF_BARINADE_SOUL;
+                break;
+            case SCENE_FOREST_TEMPLE_BOSS:
+                currentBossSoulRandInf = RAND_INF_PHANTOM_GANON_SOUL;
+                break;
+            case SCENE_FIRE_TEMPLE_BOSS:
+                currentBossSoulRandInf = RAND_INF_VOLVAGIA_SOUL;
+                break;
+            case SCENE_WATER_TEMPLE_BOSS:
+                currentBossSoulRandInf = RAND_INF_MORPHA_SOUL;
+                break;
+            case SCENE_SHADOW_TEMPLE_BOSS:
+                currentBossSoulRandInf = RAND_INF_BONGO_BONGO_SOUL;
+                break;
+            case SCENE_SPIRIT_TEMPLE_BOSS:
+                currentBossSoulRandInf = RAND_INF_TWINROVA_SOUL;
+                break;
+            case SCENE_GANONDORF_BOSS:
+            case SCENE_GANON_BOSS:
+                if (RAND_GET_OPTION(RSK_SHUFFLE_BOSS_SOULS) == RO_BOSS_SOULS_ON_PLUS_GANON) {
+                    currentBossSoulRandInf = RAND_INF_GANON_SOUL;
+                }
+                break;
+            default:
+                break;
+        }
+
+        //Deletes all actors in the boss category if the soul isn't found.
+        //Some actors, like Dark Link, Arwings, and Zora's Sapphire...?, are in this category despite not being actual bosses,
+        //so ignore any "boss" if `currentBossSoulRandInf` doesn't change from RAND_INF_MAX.
+        if (currentBossSoulRandInf != RAND_INF_MAX) {
+            if (!Flags_GetRandomizerInf(currentBossSoulRandInf) && actor->category == ACTORCAT_BOSS) {
+                Actor_Delete(&gPlayState->actorCtx, actor, gPlayState);
+            }
+            //Special case for Phantom Ganon's horse (and fake), as they're considered "background actors",
+            //but still control the boss fight flow.
+            if (!Flags_GetRandomizerInf(RAND_INF_PHANTOM_GANON_SOUL) && actor->id == ACTOR_EN_FHG) {
+                Actor_Delete(&gPlayState->actorCtx, actor, gPlayState);
+            }
+        }
+    }
+
+    // In MQ Spirit, remove the large silver block in the hole as child so the chest in the silver block hallway
+    // can be guaranteed accessible
+    if (
+        actor->id == ACTOR_OBJ_OSHIHIKI &&
+        LINK_IS_CHILD &&
+        IsGameMasterQuest() &&
+        gPlayState->sceneNum == SCENE_SPIRIT_TEMPLE && actor->room == 6 && // Spirit Temple silver block hallway
+        actor->params == 0x9C7 // Silver block that is marked as in the hole
+    ) {
+        Actor_Kill(actor);
+        return;
+    }
+
+    if (
+        // If child is in the adult shooting gallery or adult in the child shooting gallery, then despawn the shooting gallery man
+        actor->id == ACTOR_EN_SYATEKI_MAN &&
+        RAND_GET_OPTION(RSK_SHUFFLE_INTERIOR_ENTRANCES) &&
+        (
+            (LINK_IS_CHILD && Entrance_SceneAndSpawnAre(SCENE_SHOOTING_GALLERY, 0x00)) || //Kakariko Village -> Adult Shooting Gallery, index 003B in the entrance table
+            (LINK_IS_ADULT && Entrance_SceneAndSpawnAre(SCENE_SHOOTING_GALLERY, 0x01)) //Market -> Child Shooting Gallery,              index 016D in the entrance table
+        )
+    ) {
+        Actor_Kill(actor);
+        return;
+    }
+}
+
+void RandomizerOnGameFrameUpdateHandler() {
+    if (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_QUIVER)) {
+        AMMO(ITEM_BOW) = CUR_CAPACITY(UPG_QUIVER);
+    }
+
+    if (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_BOMB_BAG)) {
+        AMMO(ITEM_BOMB) = CUR_CAPACITY(UPG_BOMB_BAG);
+    }
+
+    if (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_BULLET_BAG)) {
+        AMMO(ITEM_SLINGSHOT) = CUR_CAPACITY(UPG_BULLET_BAG);
+    }
+
+    if (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_STICK_UPGRADE)) {
+        AMMO(ITEM_STICK) = CUR_CAPACITY(UPG_STICKS);
+    }
+
+    if (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_NUT_UPGRADE)) {
+        AMMO(ITEM_NUT) = CUR_CAPACITY(UPG_NUTS);
+    }
+
+    if (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_MAGIC_METER)) {
+        gSaveContext.magic = gSaveContext.magicCapacity;
+    }
+
+    if (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_BOMBCHUS)) {
+        AMMO(ITEM_BOMBCHU) = 50;
+    }
+
+    if (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_MONEY)) {
+        gSaveContext.rupees = CUR_CAPACITY(UPG_WALLET);
+    }
+
+    if (!Flags_GetRandomizerInf(RAND_INF_HAS_WALLET)) {
+        gSaveContext.rupees = 0;
+    }
+}
+
+extern "C" void func_8099485C(DoorGerudo* gerudoDoor, PlayState* play);
+
+void RandomizerOnActorUpdateHandler(void* refActor) {
+    Actor* actor = static_cast<Actor*>(refActor);
+
+    if (Flags_GetRandomizerInf(RAND_INF_HAS_SKELETON_KEY)) {
+        if (actor->id == ACTOR_EN_DOOR) {
+            EnDoor* door = reinterpret_cast<EnDoor*>(actor);
+            door->lockTimer = 0;
+        } else if (actor->id == ACTOR_DOOR_SHUTTER) {
+            DoorShutter* shutterDoor = reinterpret_cast<DoorShutter*>(actor);
+            if (shutterDoor->doorType == SHUTTER_KEY_LOCKED) {
+                shutterDoor->unk_16E = 0;
+            }
+        } else if (actor->id == ACTOR_DOOR_GERUDO) {
+            DoorGerudo* gerudoDoor = (DoorGerudo*)actor;
+            gerudoDoor->actionFunc = func_8099485C;
+            gerudoDoor->dyna.actor.world.pos.y = gerudoDoor->dyna.actor.home.pos.y + 200.0f;
+        }
+    }
+
+    // In ER, override the warp song locations. Also removes the warp song cutscene
+    if (RAND_GET_OPTION(RSK_SHUFFLE_ENTRANCES) && actor->id == ACTOR_DEMO_KANKYO && actor->params == 0x000F) { // Warp Song particles
+        Entrance_SetWarpSongEntrance();
+    }
+
+    if (actor->id == ACTOR_OBJ_COMB) {
+        ObjComb* combActor = reinterpret_cast<ObjComb*>(actor);
+        combActor->actor.shape.rot.x = Math_SinS(combActor->unk_1B2) * CLAMP_MIN(combActor->unk_1B0, 0) + combActor->actor.home.rot.x;
+    }
+}
+
+//from z_player.c
+typedef struct {
+    /* 0x00 */ Vec3f pos;
+    /* 0x0C */ s16 yaw;
+} SpecialRespawnInfo; // size = 0x10
+
+//special respawns used when voided out without swim to prevent infinite loops
+std::map<s32, SpecialRespawnInfo> swimSpecialRespawnInfo = {
+    {
+        ENTR_ZORAS_RIVER_3,//hf to zr in water
+        { { -1455.443, -20, 1384.826 }, 28761 }
+    },
+    {
+        ENTR_HYRULE_FIELD_14,//zr to hf in water
+        { { 5730.209, -20, 3725.911 }, -20025 }
+    },
+    {
+        ENTR_LOST_WOODS_7,//zr to lw
+        { { 1978.718, -36.908, -855 }, -16384 }
+    },
+    {
+        ENTR_ZORAS_RIVER_4,//lw to zr
+        { { 4082.366, 860.442, -1018.949 }, -32768 }
+    },
+    {
+        ENTR_LAKE_HYLIA_1,//gv to lh
+        { { -3276.416, -1033, 2908.421 }, 11228 }
+    },
+    {
+        ENTR_WATER_TEMPLE_0,//lh to water temple
+        { { -182, 780, 759.5 }, -32768 }
+    },
+    {
+        ENTR_LAKE_HYLIA_2,//water temple to lh
+        { { -955.028, -1306.9, 6768.954 }, -32768 }
+    },
+    {
+        ENTR_ZORAS_DOMAIN_4,//lh to zd
+        { { -109.86, 11.396, -9.933 }, -29131 }
+    },
+    {
+        ENTR_LAKE_HYLIA_7,//zd to lh
+        { { -912, -1326.967, 3391 }, 0 }
+    },
+    {
+        ENTR_GERUDO_VALLEY_1,//caught by gerudos as child
+        { { -424, -2051, -74 }, 16384 }
+    },
+    {
+        ENTR_HYRULE_FIELD_7,//mk to hf (can be a problem when it then turns night)
+        { { 0, 0, 1100 }, 0 }
+    },
+    {
+        ENTR_ZORAS_FOUNTAIN_0,//jabu blue warp to zf
+        { { -1580, 150, 1670 }, 8000 }
+    },
+};
+
+f32 triforcePieceScale;
+
+void RandomizerOnPlayerUpdateHandler() {
+    if (
+        (GET_PLAYER(gPlayState)->stateFlags1 & PLAYER_STATE1_IN_WATER) &&
+        !Flags_GetRandomizerInf(RAND_INF_CAN_SWIM) &&
+        CUR_EQUIP_VALUE(EQUIP_TYPE_BOOTS) != EQUIP_VALUE_BOOTS_IRON
+    ) {
+        //if you void out in water temple without swim you get instantly kicked out to prevent softlocks
+        if (gPlayState->sceneNum == SCENE_WATER_TEMPLE) {
+            GameInteractor::RawAction::TeleportPlayer(Entrance_OverrideNextIndex(ENTR_LAKE_HYLIA_2));//lake hylia from water temple
+        } else {
+            if (swimSpecialRespawnInfo.find(gSaveContext.entranceIndex) != swimSpecialRespawnInfo.end()) {
+                SpecialRespawnInfo* respawnInfo = &swimSpecialRespawnInfo.at(gSaveContext.entranceIndex);
+
+                Play_SetupRespawnPoint(gPlayState, RESPAWN_MODE_DOWN, 0xDFF);
+                gSaveContext.respawn[RESPAWN_MODE_DOWN].pos = respawnInfo->pos;
+                gSaveContext.respawn[RESPAWN_MODE_DOWN].yaw = respawnInfo->yaw;
+            }
+
+            Play_TriggerVoidOut(gPlayState);
+        }
+    }
+
+    // Triforce Hunt needs the check if the player isn't being teleported to the credits scene.
+    if (
+        !GameInteractor::IsGameplayPaused() &&
+        Flags_GetRandomizerInf(RAND_INF_GRANT_GANONS_BOSSKEY) &&
+        gPlayState->transitionTrigger != TRANS_TRIGGER_START &&
+        (1 << 0 & gSaveContext.inventory.dungeonItems[SCENE_GANONS_TOWER]) == 0
+    ) {
+        GiveItemEntryWithoutActor(gPlayState, ItemTableManager::Instance->RetrieveItemEntry(MOD_RANDOMIZER, RG_GANONS_CASTLE_BOSS_KEY));
+    }
+
+    if (
+        !GameInteractor::IsGameplayPaused() &&
+        RAND_GET_OPTION(RSK_TRIFORCE_HUNT)
+    ) {
+        // Warp to credits
+        if (GameInteractor::State::TriforceHuntCreditsWarpActive) {
+            gPlayState->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0;
+            gSaveContext.nextCutsceneIndex = 0xFFF2;
+            gPlayState->transitionTrigger = TRANS_TRIGGER_START;
+            gPlayState->transitionType = TRANS_TYPE_FADE_WHITE;
+            GameInteractor::State::TriforceHuntCreditsWarpActive = 0;
+        }
+
+        // Reset Triforce Piece scale for GI animation. Triforce Hunt allows for multiple triforce models,
+        // and cycles through them based on the amount of triforce pieces collected. It takes a little while
+        // for the count to increase during the GI animation, so the model is entirely hidden until that piece
+        // has been added. That scale has to be reset after the textbox is closed, and this is the best way
+        // to ensure it's done at that point in time specifically.
+        if (GameInteractor::State::TriforceHuntPieceGiven) {
+            triforcePieceScale = 0.0f;
+            GameInteractor::State::TriforceHuntPieceGiven = 0;
+        }
+    }
+}
+
+void RandomizerOnSceneSpawnActorsHandler() {
+    if (LINK_IS_ADULT && RAND_GET_OPTION(RSK_SHEIK_LA_HINT)) {
+        switch (gPlayState->sceneNum) {
+            case SCENE_TEMPLE_OF_TIME:
+                if (gPlayState->roomCtx.curRoom.num == 1) {
+                    Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_EN_XC, -104, -40, 2382, 0, 0x8000, 0, SHEIK_TYPE_RANDO, false);
+                }
+                break;
+            case SCENE_INSIDE_GANONS_CASTLE:
+                if (gPlayState->roomCtx.curRoom.num == 1) {
+                    Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_EN_XC, 101, 150, 137, 0, 0, 0, SHEIK_TYPE_RANDO, false);
+                }
+                break;
+            default:
+                break;
+        }
+    }
 }
 
 void RandomizerRegisterHooks() {
@@ -1588,6 +1955,10 @@ void RandomizerRegisterHooks() {
     static uint32_t onVanillaBehaviorHook = 0;
     static uint32_t onSceneInitHook = 0;
     static uint32_t onActorInitHook = 0;
+    static uint32_t onActorUpdateHook = 0;
+    static uint32_t onPlayerUpdateHook = 0;
+    static uint32_t onGameFrameUpdateHook = 0;
+    static uint32_t onSceneSpawnActorsHook = 0;
 
     static uint32_t fishsanityOnActorInitHook = 0;
     static uint32_t fishsanityOnFlagSetHook = 0;
@@ -1608,6 +1979,10 @@ void RandomizerRegisterHooks() {
         GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnVanillaBehavior>(onVanillaBehaviorHook);
         GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(onSceneInitHook);
         GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorInit>(onActorInitHook);
+        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(onActorUpdateHook);
+        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnPlayerUpdate>(onPlayerUpdateHook);
+        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnGameFrameUpdate>(onGameFrameUpdateHook);
+        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneSpawnActors>(onSceneSpawnActorsHook);
 
         GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorInit>(fishsanityOnActorInitHook);
         GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnFlagSet>(fishsanityOnFlagSetHook);
@@ -1623,6 +1998,10 @@ void RandomizerRegisterHooks() {
         onVanillaBehaviorHook = 0;
         onSceneInitHook = 0;
         onActorInitHook = 0;
+        onActorUpdateHook = 0;
+        onPlayerUpdateHook = 0;
+        onGameFrameUpdateHook = 0;
+        onSceneSpawnActorsHook = 0;
 
         fishsanityOnActorInitHook = 0;
         fishsanityOnFlagSetHook = 0;
@@ -1632,6 +2011,14 @@ void RandomizerRegisterHooks() {
 
         if (!IS_RANDO) return;
 
+        // Setup the modified entrance table and entrance shuffle table for rando
+        Entrance_Init();
+
+        // Handle randomized spawn positions after the save context has been setup from load
+        if (RAND_GET_OPTION(RSK_SHUFFLE_ENTRANCES)) {
+            Entrance_SetSavewarpEntrance();
+        }
+
         onFlagSetHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnFlagSet>(RandomizerOnFlagSetHandler);
         onSceneFlagSetHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneFlagSet>(RandomizerOnSceneFlagSetHandler);
         onPlayerUpdateForRCQueueHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnPlayerUpdate>(RandomizerOnPlayerUpdateForRCQueueHandler);
@@ -1640,15 +2027,19 @@ void RandomizerRegisterHooks() {
         onVanillaBehaviorHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnVanillaBehavior>(RandomizerOnVanillaBehaviorHandler);
         onSceneInitHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>(RandomizerOnSceneInitHandler);
         onActorInitHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorInit>(RandomizerOnActorInitHandler);
+        onActorUpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>(RandomizerOnActorUpdateHandler);
+        onPlayerUpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnPlayerUpdate>(RandomizerOnPlayerUpdateHandler);
+        onGameFrameUpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGameFrameUpdate>(RandomizerOnGameFrameUpdateHandler);
+        onSceneSpawnActorsHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneSpawnActors>(RandomizerOnSceneSpawnActorsHandler);
 
         if (RAND_GET_OPTION(RSK_FISHSANITY) != RO_FISHSANITY_OFF) {
             OTRGlobals::Instance->gRandoContext->GetFishsanity()->InitializeFromSave();
 
             fishsanityOnActorInitHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorInit>(Rando::Fishsanity::OnActorInitHandler);
-            fishsanityOnActorInitHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnFlagSet>(Rando::Fishsanity::OnFlagSetHandler);
-            fishsanityOnActorInitHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>(Rando::Fishsanity::OnActorUpdateHandler);
-            fishsanityOnActorInitHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>(Rando::Fishsanity::OnSceneInitHandler);
-            fishsanityOnActorInitHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnVanillaBehavior>(Rando::Fishsanity::OnVanillaBehaviorHandler);
+            fishsanityOnFlagSetHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnFlagSet>(Rando::Fishsanity::OnFlagSetHandler);
+            fishsanityOnActorUpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>(Rando::Fishsanity::OnActorUpdateHandler);
+            fishsanityOnSceneInitHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>(Rando::Fishsanity::OnSceneInitHandler);
+            fishsanityOnVanillaBehaviorHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnVanillaBehavior>(Rando::Fishsanity::OnVanillaBehaviorHandler);
         }
     });
 }
diff --git a/soh/soh/Enhancements/timesaver_hook_handlers.cpp b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
index 77910d687..ec56b95cc 100644
--- a/soh/soh/Enhancements/timesaver_hook_handlers.cpp
+++ b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
@@ -650,6 +650,12 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             }
             break;
         }
+        case VB_SKIP_SCARECROWS_SONG: {
+            if (gPlayState->msgCtx.msgMode == MSGMODE_OCARINA_PLAYING && CVarGetInteger(CVAR_ENHANCEMENT("InstantScarecrow"), 0) && gSaveContext.scarecrowSpawnSongSet) {
+                *should = true;
+            }
+            break;
+        }
     }
 }
 
diff --git a/soh/soh/SaveManager.cpp b/soh/soh/SaveManager.cpp
index faded27e3..83d22c940 100644
--- a/soh/soh/SaveManager.cpp
+++ b/soh/soh/SaveManager.cpp
@@ -13,7 +13,6 @@
 #include "functions.h"
 #include "macros.h"
 #include <variables.h>
-#include "soh/Enhancements/boss-rush/BossRush.h"
 #include <libultraship/libultraship.h>
 #include "SohGui.hpp"
 
diff --git a/soh/soh/z_play_otr.cpp b/soh/soh/z_play_otr.cpp
index 237b48ef3..47e4279b2 100644
--- a/soh/soh/z_play_otr.cpp
+++ b/soh/soh/z_play_otr.cpp
@@ -77,10 +77,6 @@ void OTRPlay_InitScene(PlayState* play, s32 spawn) {
     gSaveContext.worldMapArea = 0;
     OTRScene_ExecuteCommands(play, (SOH::Scene*)play->sceneSegment);
     Play_InitEnvironment(play, play->skyboxId);
-    // Unpause the timer for Boss Rush when the scene loaded isn't the Chamber of Sages.
-    if (IS_BOSS_RUSH && play->sceneNum != SCENE_CHAMBER_OF_THE_SAGES) {
-        gSaveContext.isBossRushPaused = 0;
-    }
     /* auto data = static_cast<LUS::Vertex*>(Ship::Context::GetInstance()
                                                ->GetResourceManager()
                                                ->ResourceLoad("object_link_child\\object_link_childVtx_01FE08")
diff --git a/soh/src/code/code_800EC960.c b/soh/src/code/code_800EC960.c
index a1364b8a9..145ab7c1c 100644
--- a/soh/src/code/code_800EC960.c
+++ b/soh/src/code/code_800EC960.c
@@ -1,6 +1,8 @@
 #include <libultraship/libultra.h>
 #include "global.h"
 #include "soh/Enhancements/audio/AudioEditor.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 // TODO: can these macros be shared between files? code_800F9280 seems to use
 // versions without any casts...
@@ -1626,23 +1628,23 @@ void func_800ED458(s32 arg0) {
         }
 
         Audio_OcaUpdateBtnMap(customControls, dpad, rStick);
-        if (D_8016BA18 & sOcarinaD4BtnMap && (!IS_RANDO || Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_A))) {
+        if (D_8016BA18 & sOcarinaD4BtnMap && GameInteractor_Should(VB_HAVE_OCARINA_NOTE_D4, true, NULL)) {
             osSyncPrintf("Presss NA_KEY_D4 %08x\n", sOcarinaD4BtnMap);
             sCurOcarinaBtnVal = 2;
             sCurOcarinaBtnIdx = 0;
-        } else if (D_8016BA18 & sOcarinaF4BtnMap && (!IS_RANDO || Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_DOWN))) {
+        } else if (D_8016BA18 & sOcarinaF4BtnMap && GameInteractor_Should(VB_HAVE_OCARINA_NOTE_F4, true, NULL)) {
             osSyncPrintf("Presss NA_KEY_F4 %08x\n", sOcarinaF4BtnMap);
             sCurOcarinaBtnVal = 5;
             sCurOcarinaBtnIdx = 1;
-        } else if (D_8016BA18 & sOcarinaA4BtnMap && (!IS_RANDO || Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_RIGHT))) {
+        } else if (D_8016BA18 & sOcarinaA4BtnMap && GameInteractor_Should(VB_HAVE_OCARINA_NOTE_A4, true, NULL)) {
             osSyncPrintf("Presss NA_KEY_A4 %08x\n", sOcarinaA4BtnMap);
             sCurOcarinaBtnVal = 9;
             sCurOcarinaBtnIdx = 2;
-        } else if (D_8016BA18 & sOcarinaB4BtnMap && (!IS_RANDO || Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_LEFT))) {
+        } else if (D_8016BA18 & sOcarinaB4BtnMap && GameInteractor_Should(VB_HAVE_OCARINA_NOTE_B4, true, NULL)) {
             osSyncPrintf("Presss NA_KEY_B4 %08x\n", sOcarinaA4BtnMap);
             sCurOcarinaBtnVal = 0xB;
             sCurOcarinaBtnIdx = 3;
-        } else if (D_8016BA18 & sOcarinaD5BtnMap && (!IS_RANDO || Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_UP))) {
+        } else if (D_8016BA18 & sOcarinaD5BtnMap && GameInteractor_Should(VB_HAVE_OCARINA_NOTE_D5, true, NULL)) {
             osSyncPrintf("Presss NA_KEY_D5 %08x\n", sOcarinaD5BtnMap);
             sCurOcarinaBtnVal = 0xE;
             sCurOcarinaBtnIdx = 4;
diff --git a/soh/src/code/z_horse.c b/soh/src/code/z_horse.c
index 48c76396f..33ba7a84d 100644
--- a/soh/src/code/z_horse.c
+++ b/soh/src/code/z_horse.c
@@ -1,6 +1,8 @@
 #include "global.h"
 #include "vt.h"
 #include <assert.h>
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 s32 func_8006CFC0(s32 scene) {
     s32 validScenes[] = { SCENE_HYRULE_FIELD, SCENE_LAKE_HYLIA, SCENE_GERUDO_VALLEY, SCENE_GERUDOS_FORTRESS, SCENE_LON_LON_RANCH };
@@ -75,9 +77,9 @@ void func_8006D0EC(PlayState* play, Player* player) {
     } else if ((play->sceneNum == gSaveContext.horseData.scene) &&
                (((Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) != 0) && (!IS_RANDO ||
                (IS_RANDO && CHECK_QUEST_ITEM(QUEST_SONG_EPONA) &&
-                    Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_UP) &&
-                    Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_LEFT) &&
-                    Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_RIGHT) &&
+                    GameInteractor_Should(VB_HAVE_OCARINA_NOTE_D5, true, NULL) &&
+                    GameInteractor_Should(VB_HAVE_OCARINA_NOTE_B4, true, NULL) &&
+                    GameInteractor_Should(VB_HAVE_OCARINA_NOTE_A4, true, NULL) &&
                (INV_CONTENT(ITEM_OCARINA_FAIRY) != ITEM_NONE)))) || DREG(1) != 0)) {
         // "Set by existence of horse %d %d %d"
         osSyncPrintf("馬存在によるセット %d %d %d\n", gSaveContext.horseData.scene, Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED),
diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c
index 1ca58cf00..0d14468f2 100644
--- a/soh/src/code/z_parameter.c
+++ b/soh/src/code/z_parameter.c
@@ -5372,8 +5372,7 @@ void Interface_Draw(PlayState* play) {
         if (fullUi) {
             s16 PosX_RC;
             s16 PosY_RC;
-            //when not having a wallet (or infinite money) in rando, don't calculate the ruppe icon
-            if (!IS_RANDO || (Flags_GetRandomizerInf(RAND_INF_HAS_WALLET) && !Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_MONEY))) {
+            if (GameInteractor_Should(VB_RENDER_RUPEE_COUNTER, true, NULL)) {
                 // Rupee Icon
                 if (CVarGetInteger(CVAR_ENHANCEMENT("DynamicWalletIcon"), 0)) {
                     switch (CUR_UPG_VALUE(UPG_WALLET)) {
@@ -5444,14 +5443,10 @@ void Interface_Draw(PlayState* play) {
                     PosX_RC = PosX_RC_ori;
                 }
                 gDPSetPrimColor(OVERLAY_DISP++, 0, 0, rColor.r, rColor.g, rColor.b, interfaceCtx->magicAlpha);
-                // Draw Rupee icon. Hide in Boss Rush.
-                if (!IS_BOSS_RUSH) {
-                    OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, gRupeeCounterIconTex, 16, 16, PosX_RC, PosY_RC, 16, 16, 1 << 10, 1 << 10);
-                }
+                OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, gRupeeCounterIconTex, 16, 16, PosX_RC, PosY_RC, 16, 16, 1 << 10, 1 << 10);
             }
 
-            //when having the skeleton key in rando, don't render the small key counter
-            if (!Flags_GetRandomizerInf(RAND_INF_HAS_SKELETON_KEY)) {
+            if (GameInteractor_Should(VB_RENDER_KEY_COUNTER, true, NULL)) {
                 switch (play->sceneNum) {
                     case SCENE_FOREST_TEMPLE:
                     case SCENE_FIRE_TEMPLE:
@@ -5467,7 +5462,6 @@ void Interface_Draw(PlayState* play) {
                     case SCENE_GANONS_TOWER_COLLAPSE_INTERIOR:
                     case SCENE_INSIDE_GANONS_CASTLE_COLLAPSE:
                     case SCENE_TREASURE_BOX_SHOP:
-
                         if (gSaveContext.inventory.dungeonKeys[gSaveContext.mapIndex] >= 0) {
                             s16 X_Margins_SKC;
                             s16 Y_Margins_SKC;
@@ -5533,49 +5527,47 @@ void Interface_Draw(PlayState* play) {
                 }
             }
 
-            // Rupee Counter
-            gDPPipeSync(OVERLAY_DISP++);
+            if (GameInteractor_Should(VB_RENDER_RUPEE_COUNTER, true, NULL)) {
+                // Rupee Counter
+                gDPPipeSync(OVERLAY_DISP++);
 
-            if (gSaveContext.rupees == CUR_CAPACITY(UPG_WALLET)) {
-                gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 120, 255, 0, interfaceCtx->magicAlpha);
-            } else if (gSaveContext.rupees != 0) {
-                gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 255, 255, interfaceCtx->magicAlpha);
-            } else {
-                gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 100, 100, 100, interfaceCtx->magicAlpha);
-            }
+                if (gSaveContext.rupees == CUR_CAPACITY(UPG_WALLET)) {
+                    gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 120, 255, 0, interfaceCtx->magicAlpha);
+                } else if (gSaveContext.rupees != 0) {
+                    gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 255, 255, interfaceCtx->magicAlpha);
+                } else {
+                    gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 100, 100, 100, interfaceCtx->magicAlpha);
+                }
 
-            gDPSetCombineLERP(OVERLAY_DISP++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0,
-                              PRIMITIVE, 0);
+                gDPSetCombineLERP(OVERLAY_DISP++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0,
+                                  PRIMITIVE, 0);
 
-            interfaceCtx->counterDigits[0] = interfaceCtx->counterDigits[1] = 0;
-            interfaceCtx->counterDigits[2] = gSaveContext.rupees;
+                interfaceCtx->counterDigits[0] = interfaceCtx->counterDigits[1] = 0;
+                interfaceCtx->counterDigits[2] = gSaveContext.rupees;
 
-            if ((interfaceCtx->counterDigits[2] > 9999) || (interfaceCtx->counterDigits[2] < 0)) {
-                interfaceCtx->counterDigits[2] &= 0xDDD;
-            }
+                if ((interfaceCtx->counterDigits[2] > 9999) || (interfaceCtx->counterDigits[2] < 0)) {
+                    interfaceCtx->counterDigits[2] &= 0xDDD;
+                }
 
-            while (interfaceCtx->counterDigits[2] >= 100) {
-                interfaceCtx->counterDigits[0]++;
-                interfaceCtx->counterDigits[2] -= 100;
-            }
+                while (interfaceCtx->counterDigits[2] >= 100) {
+                    interfaceCtx->counterDigits[0]++;
+                    interfaceCtx->counterDigits[2] -= 100;
+                }
 
-            while (interfaceCtx->counterDigits[2] >= 10) {
-                interfaceCtx->counterDigits[1]++;
-                interfaceCtx->counterDigits[2] -= 10;
-            }
+                while (interfaceCtx->counterDigits[2] >= 10) {
+                    interfaceCtx->counterDigits[1]++;
+                    interfaceCtx->counterDigits[2] -= 10;
+                }
 
-            svar2 = rupeeDigitsFirst[CUR_UPG_VALUE(UPG_WALLET)];
-            svar5 = rupeeDigitsCount[CUR_UPG_VALUE(UPG_WALLET)];
+                svar2 = rupeeDigitsFirst[CUR_UPG_VALUE(UPG_WALLET)];
+                svar5 = rupeeDigitsCount[CUR_UPG_VALUE(UPG_WALLET)];
 
-            // Draw Rupee Counter. Hide in Boss Rush and when not having a wallet in rando.
-            if (!IS_BOSS_RUSH && (!IS_RANDO || Flags_GetRandomizerInf(RAND_INF_HAS_WALLET))) {
                 for (svar1 = 0, svar3 = 16; svar1 < svar5; svar1++, svar2++, svar3 += 8) {
                     OVERLAY_DISP = Gfx_TextureI8(OVERLAY_DISP, ((u8*)digitTextures[interfaceCtx->counterDigits[svar2]]),
                                                  8, 16, PosX_RC + svar3, PosY_RC, 8, 16, 1 << 10, 1 << 10);
                 }
             }
-        }
-        else {
+        } else {
             // Make sure item counts have black backgrounds
             gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 0, 0, 0, interfaceCtx->magicAlpha);
             gDPSetEnvColor(OVERLAY_DISP++, 0, 0, 0, 0);
diff --git a/soh/src/code/z_play.c b/soh/src/code/z_play.c
index a54314d00..56c786889 100644
--- a/soh/src/code/z_play.c
+++ b/soh/src/code/z_play.c
@@ -1804,10 +1804,6 @@ void* Play_LoadFile(PlayState* play, RomFile* file) {
 }
 
 void Play_InitEnvironment(PlayState* play, s16 skyboxId) {
-    // For entrance rando, ensure the correct weather state and sky mode is applied
-    if (IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_ENTRANCES)) {
-        Entrance_OverrideWeatherState();
-    }
     Skybox_Init(&play->state, &play->skyboxCtx, skyboxId);
     Environment_Init(play, &play->envCtx, 0);
 }
diff --git a/soh/src/code/z_sram.c b/soh/src/code/z_sram.c
index 9daa5a3cf..8a848f301 100644
--- a/soh/src/code/z_sram.c
+++ b/soh/src/code/z_sram.c
@@ -2,6 +2,8 @@
 #include "vt.h"
 
 #include <string.h>
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/Enhancements/randomizer/randomizer_entrance.h"
 #include "soh/Enhancements/randomizer/savefile.h"
 
@@ -198,7 +200,7 @@ void Sram_OpenSave() {
         }
     }
 
-    if (!(IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_ADULT_TRADE))) {
+    if (GameInteractor_Should(VB_REVERT_SPOILING_ITEMS, true, NULL)) {
         for (i = 0; i < ARRAY_COUNT(gSpoilingItems); i++) {
             if (INV_CONTENT(ITEM_TRADE_ADULT) == gSpoilingItems[i]) {
                 INV_CONTENT(gSpoilingItemReverts[i]) = gSpoilingItemReverts[i];
diff --git a/soh/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c b/soh/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c
index 03c9e96ad..c2db563b9 100644
--- a/soh/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c
+++ b/soh/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c
@@ -8,6 +8,7 @@
 #include "scenes/dungeons/ddan/ddan_scene.h"
 #include "objects/object_bwall/object_bwall.h"
 #include "objects/object_kingdodongo/object_kingdodongo.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_WHILE_CULLED
@@ -274,9 +275,8 @@ void BgBreakwall_Wait(BgBreakwall* this, PlayState* play) {
             }
         }
     }
-    
-    // Break the floor immediately in Boss Rush so the player can jump in the hole immediately.
-    if (this->collider.base.acFlags & 2 || blueFireArrowHit || IS_BOSS_RUSH) {
+
+    if (GameInteractor_Should(VB_BG_BREAKWALL_BREAK, this->collider.base.acFlags & 2 || blueFireArrowHit, NULL)) {
         Vec3f effectPos;
         s32 wallType = ((this->dyna.actor.params >> 13) & 3) & 0xFF;
 
diff --git a/soh/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c b/soh/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c
index d3f279575..f93e5910c 100644
--- a/soh/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c
+++ b/soh/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c
@@ -4,7 +4,6 @@
 #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h"
 #include "scenes/dungeons/ddan_boss/ddan_boss_room_1.h"
 #include "soh/frame_interpolation.h"
-#include "soh/Enhancements/boss-rush/BossRush.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #include <stdlib.h> // malloc
@@ -341,7 +340,9 @@ void BossDodongo_Init(Actor* thisx, PlayState* play) {
         Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, -890.0f, -1523.76f,
                            -3304.0f, 0, 0, 0, WARP_DUNGEON_CHILD);
         Actor_Spawn(&play->actorCtx, play, ACTOR_BG_BREAKWALL, -890.0f, -1523.76f, -3304.0f, 0, 0, 0, 0x6000, true);
-        Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, -690.0f, -1523.76f, -3304.0f, 0, 0, 0, 0, true);
+        if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true, NULL)) {
+            Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, -690.0f, -1523.76f, -3304.0f, 0, 0, 0, 0, true);
+        }
     }
 
     this->actor.flags &= ~ACTOR_FLAG_TARGETABLE;
@@ -1559,8 +1560,7 @@ void BossDodongo_DeathCutscene(BossDodongo* this, PlayState* play) {
             this->cameraAt.x = camera->at.x;
             this->cameraAt.y = camera->at.y;
             this->cameraAt.z = camera->at.z;
-            gSaveContext.sohStats.itemTimestamp[TIMESTAMP_DEFEAT_KING_DODONGO] = GAMEPLAYSTAT_TOTAL_TIME;
-            BossRush_HandleCompleteBoss(play);
+            GameInteractor_ExecuteOnBossDefeat(&this->actor);
             break;
         case 5:
             tempSin = Math_SinS(this->actor.shape.rot.y - 0x1388) * 150.0f;
@@ -1845,7 +1845,7 @@ void BossDodongo_DeathCutscene(BossDodongo* this, PlayState* play) {
 
             if (this->unk_1DA == 820) {
                 Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_BOSS_CLEAR);
-                if (!IS_BOSS_RUSH) {
+                if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true, NULL)) {
                     Actor_Spawn(
                         &play->actorCtx, play, ACTOR_ITEM_B_HEART,
                         Math_SinS(this->actor.shape.rot.y) * -50.0f + this->actor.world.pos.x, this->actor.world.pos.y,
@@ -1864,10 +1864,8 @@ void BossDodongo_DeathCutscene(BossDodongo* this, PlayState* play) {
                 Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_ACTIVE);
                 func_80064534(play, &play->csCtx);
                 Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
-                if (!IS_BOSS_RUSH) {
+                if (GameInteractor_Should(VB_SPAWN_BLUE_WARP, true, this)) {
                     Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, -890.0f, -1523.76f, -3304.0f, 0, 0, 0, WARP_DUNGEON_CHILD);
-                } else {
-                    Actor_Spawn(&play->actorCtx, play, ACTOR_DOOR_WARP1, -890.0f, -1523.76f, -3304.0f, 0, 0, 0, WARP_DUNGEON_ADULT, false);
                 }
                 this->skelAnime.playSpeed = 0.0f;
                 Flags_SetClear(play, play->roomCtx.curRoom.num);
diff --git a/soh/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c b/soh/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c
index 72908fd2f..032a487a6 100644
--- a/soh/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c
+++ b/soh/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c
@@ -14,6 +14,8 @@
 #include "objects/gameplay_keep/gameplay_keep.h"
 
 #include "soh/frame_interpolation.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_WHILE_CULLED | ACTOR_FLAG_DRAW_WHILE_CULLED)
 
@@ -227,7 +229,9 @@ void BossFd_Init(Actor* thisx, PlayState* play) {
         Actor_Kill(&this->actor);
         Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, 0.0f, 100.0f, 0.0f, 0, 0, 0,
                            WARP_DUNGEON_ADULT);
-        Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, 0.0f, 100.0f, 200.0f, 0, 0, 0, 0, true);
+        if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true, NULL)) {
+            Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, 0.0f, 100.0f, 200.0f, 0, 0, 0, 0, true);
+        }
     } else {
         Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_BOSS_FD2, this->actor.world.pos.x,
                            this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, this->introState);
@@ -913,7 +917,7 @@ void BossFd_Fly(BossFd* this, PlayState* play) {
                 this->actionFunc = BossFd_Wait;
                 this->actor.world.pos.y -= 1000.0f;
             }
-            if (this->timers[0] == 7 && !IS_BOSS_RUSH) {
+            if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, this->timers[0] == 7, NULL)) {
                 Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, this->actor.world.pos.x,
                             this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 0, true);
             }
diff --git a/soh/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c b/soh/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c
index 2a03f1839..a30091ad3 100644
--- a/soh/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c
+++ b/soh/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c
@@ -10,7 +10,7 @@
 #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h"
 #include "vt.h"
 #include "soh/frame_interpolation.h"
-#include "soh/Enhancements/boss-rush/BossRush.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_WHILE_CULLED | ACTOR_FLAG_DRAW_WHILE_CULLED)
 
@@ -789,12 +789,9 @@ void BossFd2_Death(BossFd2* this, PlayState* play) {
                 this->deathCamera = 0;
                 func_80064534(play, &play->csCtx);
                 Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
-                if (!IS_BOSS_RUSH) {
+                if (GameInteractor_Should(VB_SPAWN_BLUE_WARP, true, this)) {
                     Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, 0.0f, 100.0f, 0.0f, 0, 0,
                                        0, WARP_DUNGEON_ADULT);
-                } else {
-                    Actor_Spawn(&play->actorCtx, play, ACTOR_DOOR_WARP1, 0.0f, 100.0f, 0.0f, 0, 0, 0,
-                                WARP_DUNGEON_ADULT, true);
                 }
                 Flags_SetClear(play, play->roomCtx.curRoom.num);
             }
@@ -899,8 +896,7 @@ void BossFd2_CollisionCheck(BossFd2* this, PlayState* play) {
                 Audio_QueueSeqCmd(0x1 << 28 | SEQ_PLAYER_BGM_MAIN << 24 | 0x100FF);
                 Audio_PlayActorSound2(&this->actor, NA_SE_EN_VALVAISA_DEAD);
                 Enemy_StartFinishingBlow(play, &this->actor);
-                gSaveContext.sohStats.itemTimestamp[TIMESTAMP_DEFEAT_VOLVAGIA] = GAMEPLAYSTAT_TOTAL_TIME;
-                BossRush_HandleCompleteBoss(play);
+                GameInteractor_ExecuteOnBossDefeat(&this->actor);
             } else if (damage) {
                 BossFd2_SetupDamaged(this, play);
                 this->work[FD2_DAMAGE_FLASH_TIMER] = 10;
diff --git a/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c b/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c
index 145fdcfd9..f4c227a29 100644
--- a/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c
+++ b/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c
@@ -11,7 +11,7 @@
 #include "assets/scenes/dungeons/ganon_boss/ganon_boss_scene.h"
 
 #include "soh/frame_interpolation.h"
-#include "soh/Enhancements/boss-rush/BossRush.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #include <string.h>
 
@@ -581,7 +581,7 @@ void BossGanon_IntroCutscene(BossGanon* this, PlayState* play) {
                 BossGanon_SetIntroCsCamera(this, 11);
                 this->unk_198 = 2;
                 this->timers[2] = 110;
-                if (!(IS_BOSS_RUSH && gSaveContext.bossRushOptions[BR_OPTIONS_HEAL] == BR_CHOICE_HEAL_NEVER)) {
+                if (GameInteractor_Should(VB_GANON_HEAL_BEFORE_FIGHT, true, NULL)) {
                     gSaveContext.healthAccumulator = 0x140;
                 }
                 Audio_QueueSeqCmd(NA_BGM_STOP);
@@ -2806,8 +2806,7 @@ void BossGanon_UpdateDamage(BossGanon* this, PlayState* play) {
                     func_80078914(&sZeroVec, NA_SE_EN_LAST_DAMAGE);
                     Audio_QueueSeqCmd(0x100100FF);
                     this->screenFlashTimer = 4;
-                    gSaveContext.sohStats.itemTimestamp[TIMESTAMP_DEFEAT_GANONDORF] = GAMEPLAYSTAT_TOTAL_TIME;
-                    BossRush_HandleCompleteBoss(play);
+                    GameInteractor_ExecuteOnBossDefeat(&this->actor);
                 } else {
                     Audio_PlayActorSound2(&this->actor, NA_SE_EN_GANON_DAMAGE2);
                     Audio_PlayActorSound2(&this->actor, NA_SE_EN_GANON_CUTBODY);
diff --git a/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c b/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c
index d9dd602c5..97cc537b4 100644
--- a/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c
+++ b/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c
@@ -7,7 +7,7 @@
 #include "objects/object_ganon_anime3/object_ganon_anime3.h"
 #include "objects/object_geff/object_geff.h"
 #include "soh/frame_interpolation.h"
-#include "soh/Enhancements/boss-rush/BossRush.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #include <string.h>
 
@@ -1688,9 +1688,7 @@ void func_8090120C(BossGanon2* this, PlayState* play) {
             if ((ABS(temp_a0_2) < 0x2000) && (sqrtf(SQ(temp_f14) + SQ(temp_f12)) < 70.0f) &&
                 (player->meleeWeaponState != 0) && (player->heldItemAction == PLAYER_IA_SWORD_MASTER)) {
                 func_80064520(play, &play->csCtx);
-                gSaveContext.sohStats.itemTimestamp[TIMESTAMP_DEFEAT_GANON] = GAMEPLAYSTAT_TOTAL_TIME;
-                BossRush_HandleCompleteBoss(play);
-                gSaveContext.sohStats.gameComplete = true;
+                GameInteractor_ExecuteOnBossDefeat(&this->actor);
                 this->unk_39E = Play_CreateSubCamera(play);
                 Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT);
                 Play_ChangeCameraStatus(play, this->unk_39E, CAM_STAT_ACTIVE);
diff --git a/soh/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c b/soh/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c
index 05740bff9..1a1b0c24b 100644
--- a/soh/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c
+++ b/soh/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c
@@ -11,7 +11,6 @@
 #include "overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h"
 #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h"
 #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h"
-#include "soh/Enhancements/boss-rush/BossRush.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_WHILE_CULLED | ACTOR_FLAG_DRAW_WHILE_CULLED)
@@ -234,10 +233,14 @@ void BossGanondrof_Init(Actor* thisx, PlayState* play) {
     this->actor.flags &= ~ACTOR_FLAG_TARGETABLE;
     if (Flags_GetClear(play, play->roomCtx.curRoom.num)) {
         Actor_Kill(&this->actor);
-        Actor_Spawn(&play->actorCtx, play, ACTOR_DOOR_WARP1, GND_BOSSROOM_CENTER_X, GND_BOSSROOM_CENTER_Y,
-                    GND_BOSSROOM_CENTER_Z, 0, 0, 0, WARP_DUNGEON_ADULT, true);
-        Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, 200.0f + GND_BOSSROOM_CENTER_X,
-                    GND_BOSSROOM_CENTER_Y, GND_BOSSROOM_CENTER_Z, 0, 0, 0, 0, true);
+        if (GameInteractor_Should(VB_SPAWN_BLUE_WARP, true, this)) {
+            Actor_Spawn(&play->actorCtx, play, ACTOR_DOOR_WARP1, GND_BOSSROOM_CENTER_X, GND_BOSSROOM_CENTER_Y,
+                        GND_BOSSROOM_CENTER_Z, 0, 0, 0, WARP_DUNGEON_ADULT, true);
+        }
+        if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true, NULL)) {
+            Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, 200.0f + GND_BOSSROOM_CENTER_X,
+                        GND_BOSSROOM_CENTER_Y, GND_BOSSROOM_CENTER_Z, 0, 0, 0, 0, true);
+        }
     } else {
         Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_FHG, this->actor.world.pos.x,
                            this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, this->actor.params);
@@ -1059,8 +1062,10 @@ void BossGanondrof_Death(BossGanondrof* this, PlayState* play) {
             bodyDecayLevel = 10;
             if (this->timers[0] == 150) {
                 Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_BOSS_CLEAR);
-                Actor_Spawn(&play->actorCtx, play, ACTOR_DOOR_WARP1, GND_BOSSROOM_CENTER_X, GND_BOSSROOM_CENTER_Y,
-                            GND_BOSSROOM_CENTER_Z, 0, 0, 0, WARP_DUNGEON_ADULT, true);
+                if (GameInteractor_Should(VB_SPAWN_BLUE_WARP, true, this)) {
+                    Actor_Spawn(&play->actorCtx, play, ACTOR_DOOR_WARP1, GND_BOSSROOM_CENTER_X, GND_BOSSROOM_CENTER_Y,
+                                GND_BOSSROOM_CENTER_Z, 0, 0, 0, WARP_DUNGEON_ADULT, true);
+                }
             }
 
             Math_ApproachZeroF(&this->cameraEye.y, 0.05f, 1.0f); // GND_BOSSROOM_CENTER_Y + 33.0f
@@ -1076,7 +1081,7 @@ void BossGanondrof_Death(BossGanondrof* this, PlayState* play) {
                 this->deathCamera = 0;
                 func_80064534(play, &play->csCtx);
                 Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
-                if (!IS_BOSS_RUSH) {
+                if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true, NULL)) {
                     Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, GND_BOSSROOM_CENTER_X, GND_BOSSROOM_CENTER_Y,
                                 GND_BOSSROOM_CENTER_Z + 200.0f, 0, 0, 0, 0, true);
                 }
@@ -1219,8 +1224,7 @@ void BossGanondrof_CollisionCheck(BossGanondrof* this, PlayState* play) {
                         if ((s8)this->actor.colChkInfo.health <= 0) {
                             BossGanondrof_SetupDeath(this, play);
                             Enemy_StartFinishingBlow(play, &this->actor);
-                            gSaveContext.sohStats.itemTimestamp[TIMESTAMP_DEFEAT_PHANTOM_GANON] = GAMEPLAYSTAT_TOTAL_TIME;
-                            BossRush_HandleCompleteBoss(play);
+                            GameInteractor_ExecuteOnBossDefeat(&this->actor);
                             return;
                         }
                     }
diff --git a/soh/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c b/soh/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c
index 842ec0fab..3e0096ece 100644
--- a/soh/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c
+++ b/soh/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c
@@ -4,7 +4,8 @@
 #include "overlays/actors/ovl_En_Goma/z_en_goma.h"
 #include "overlays/actors/ovl_Door_Shutter/z_door_shutter.h"
 #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h"
-#include "soh/Enhancements/boss-rush/BossRush.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_WHILE_CULLED | ACTOR_FLAG_DRAW_WHILE_CULLED)
 
@@ -339,9 +340,13 @@ void BossGoma_Init(Actor* thisx, PlayState* play) {
 
     if (Flags_GetClear(play, play->roomCtx.curRoom.num)) {
         Actor_Kill(&this->actor);
-        Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, 0.0f, -640.0f, 0.0f, 0, 0,
-                           0, WARP_DUNGEON_CHILD);
-        Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, 141.0f, -640.0f, -84.0f, 0, 0, 0, 0, true);
+        if (GameInteractor_Should(VB_SPAWN_BLUE_WARP, true, this)) {
+            Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, 0.0f, -640.0f, 0.0f, 0, 0,
+                               0, WARP_DUNGEON_CHILD);
+        }
+        if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true, NULL)) {
+            Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, 141.0f, -640.0f, -84.0f, 0, 0, 0, 0, true);
+        }
     }
 
     for (int i = 0; i < ARRAY_COUNT(sClearPixelTex16); i++) {
@@ -1118,7 +1123,7 @@ void BossGoma_Defeated(BossGoma* this, PlayState* play) {
                 this->timer = 70;
                 this->decayingProgress = 0;
                 this->subCameraFollowSpeed = 0.0f;
-                if (!IS_BOSS_RUSH) {
+                if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true, NULL)) {
                     Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, this->actor.world.pos.x,
                                 this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 0, true);
                 }
@@ -1152,12 +1157,9 @@ void BossGoma_Defeated(BossGoma* this, PlayState* play) {
                     }
                 }
 
-                if (!IS_BOSS_RUSH) {
+                if (GameInteractor_Should(VB_SPAWN_BLUE_WARP, true, this)) {
                     Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, childPos.x,
                                        this->actor.world.pos.y, childPos.z, 0, 0, 0, WARP_DUNGEON_CHILD);
-                } else {
-                    Actor_Spawn(&play->actorCtx, play, ACTOR_DOOR_WARP1, childPos.x, this->actor.world.pos.y,
-                                childPos.z, 0, 0, 0, WARP_DUNGEON_ADULT, false);
                 }
                 Flags_SetClear(play, play->roomCtx.curRoom.num);
             }
@@ -1841,8 +1843,7 @@ void BossGoma_UpdateHit(BossGoma* this, PlayState* play) {
                 } else {
                     BossGoma_SetupDefeated(this, play);
                     Enemy_StartFinishingBlow(play, &this->actor);
-                    gSaveContext.sohStats.itemTimestamp[TIMESTAMP_DEFEAT_GOHMA] = GAMEPLAYSTAT_TOTAL_TIME;
-                    BossRush_HandleCompleteBoss(play);
+                    GameInteractor_ExecuteOnBossDefeat(&this->actor);
                 }
 
                 this->invincibilityFrames = 10;
diff --git a/soh/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c b/soh/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
index 7d82b93a4..6551f25b0 100644
--- a/soh/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
+++ b/soh/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
@@ -12,7 +12,8 @@
 #include "vt.h"
 
 #include "soh/frame_interpolation.h"
-#include "soh/Enhancements/boss-rush/BossRush.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #include <string.h>
 
@@ -370,9 +371,13 @@ void BossMo_Init(Actor* thisx, PlayState* play2) {
         Collider_SetCylinder(play, &this->coreCollider, &this->actor, &sCylinderInit);
         if (Flags_GetClear(play, play->roomCtx.curRoom.num)) {
             Actor_Kill(&this->actor);
-            Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, 0.0f, -280.0f, 0.0f, 0,
-                               0, 0, WARP_DUNGEON_ADULT);
-            Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, -200.0f, -280.0f, 0.0f, 0, 0, 0, 0, true);
+            if (GameInteractor_Should(VB_SPAWN_BLUE_WARP, true, this)) {
+                Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, 0.0f, -280.0f, 0.0f, 0,
+                                   0, 0, WARP_DUNGEON_ADULT);
+            }
+            if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true, NULL)) {
+                Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, -200.0f, -280.0f, 0.0f, 0, 0, 0, 0, true);
+            }
             play->roomCtx.unk_74[0] = 0xFF;
             MO_WATER_LEVEL(play) = -500;
             return;
@@ -1116,16 +1121,17 @@ void BossMo_Tentacle(BossMo* this, PlayState* play) {
                         BossMo_SpawnDroplet(MO_FX_DROPLET, (BossMoEffect*)play->specialEffects, &spD4, &spE0,
                                             ((300 - indS1) * .0015f) + 0.13f);
                     }
-                    if (!IS_BOSS_RUSH) {
+                    if (GameInteractor_Should(VB_SPAWN_BLUE_WARP, true, this)) {
                         Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1,
                                            this->actor.world.pos.x, -280.0f, this->actor.world.pos.z, 0, 0, 0,
                                            WARP_DUNGEON_ADULT);
+                    }
+
+                    if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true, NULL)) {
                         Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, this->actor.world.pos.x + 200.0f,
                                     -280.0f, this->actor.world.pos.z, 0, 0, 0, 0, true);
-                    } else {
-                        Actor_Spawn(&play->actorCtx, play, ACTOR_DOOR_WARP1, this->actor.world.pos.x, -280.0f,
-                                    this->actor.world.pos.z, 0, 0, 0, WARP_DUNGEON_ADULT, true);
                     }
+
                     Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_BOSS_CLEAR);
                     Flags_SetClear(play, play->roomCtx.curRoom.num);
                 }
@@ -1793,8 +1799,7 @@ void BossMo_CoreCollisionCheck(BossMo* this, PlayState* play) {
                     if (((sMorphaTent1->csCamera == 0) && (sMorphaTent2 == NULL)) ||
                         ((sMorphaTent1->csCamera == 0) && (sMorphaTent2 != NULL) && (sMorphaTent2->csCamera == 0))) {
                         Enemy_StartFinishingBlow(play, &this->actor);
-                        gSaveContext.sohStats.itemTimestamp[TIMESTAMP_DEFEAT_MORPHA] = GAMEPLAYSTAT_TOTAL_TIME;
-                        BossRush_HandleCompleteBoss(play);
+                        GameInteractor_ExecuteOnBossDefeat(&this->actor);
                         Audio_QueueSeqCmd(0x1 << 28 | SEQ_PLAYER_BGM_MAIN << 24 | 0x100FF);
                         this->csState = MO_DEATH_START;
                         sMorphaTent1->drawActor = false;
diff --git a/soh/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c b/soh/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c
index de754328d..6a4b0f30c 100644
--- a/soh/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c
+++ b/soh/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c
@@ -11,7 +11,8 @@
 #include "overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.h"
 #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h"
 #include "soh/frame_interpolation.h"
-#include "soh/Enhancements/boss-rush/BossRush.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_WHILE_CULLED | ACTOR_FLAG_DRAW_WHILE_CULLED | ACTOR_FLAG_DRAGGED_BY_HOOKSHOT)
 
@@ -293,10 +294,14 @@ void BossSst_Init(Actor* thisx, PlayState* play2) {
         this->actor.home.pos = this->actor.world.pos;
         this->actor.shape.rot.y = 0;
         if (Flags_GetClear(play, play->roomCtx.curRoom.num)) {
-            Actor_Spawn(&play->actorCtx, play, ACTOR_DOOR_WARP1, ROOM_CENTER_X, ROOM_CENTER_Y,
-                        ROOM_CENTER_Z + 400.0f, 0, 0, 0, WARP_DUNGEON_ADULT, true);
-            Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, ROOM_CENTER_X, ROOM_CENTER_Y,
-                        ROOM_CENTER_Z - 200.0f, 0, 0, 0, 0, true);
+            if (GameInteractor_Should(VB_SPAWN_BLUE_WARP, true, this)) {
+                Actor_Spawn(&play->actorCtx, play, ACTOR_DOOR_WARP1, ROOM_CENTER_X, ROOM_CENTER_Y,
+                            ROOM_CENTER_Z + 400.0f, 0, 0, 0, WARP_DUNGEON_ADULT, true);
+            }
+            if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true, NULL)) {
+                Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, ROOM_CENTER_X, ROOM_CENTER_Y,
+                            ROOM_CENTER_Z - 200.0f, 0, 0, 0, 0, true);
+            }
             Actor_Kill(&this->actor);
         } else {
             sHands[LEFT] =
@@ -1202,9 +1207,11 @@ void BossSst_HeadFinish(BossSst* this, PlayState* play) {
             Flags_SetClear(play, play->roomCtx.curRoom.num);
         }
     } else if (this->effects[0].alpha == 0) {
-        Actor_Spawn(&play->actorCtx, play, ACTOR_DOOR_WARP1, ROOM_CENTER_X, ROOM_CENTER_Y, ROOM_CENTER_Z, 0, 0, 0,
-                    WARP_DUNGEON_ADULT, true);
-        if (!IS_BOSS_RUSH) {
+        if (GameInteractor_Should(VB_SPAWN_BLUE_WARP, true, this)) {
+            Actor_Spawn(&play->actorCtx, play, ACTOR_DOOR_WARP1, ROOM_CENTER_X, ROOM_CENTER_Y, ROOM_CENTER_Z, 0, 0, 0,
+                        WARP_DUNGEON_ADULT, true);
+        }
+        if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true, NULL)) {
             Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART,
                         (Math_SinS(this->actor.shape.rot.y) * 200.0f) + ROOM_CENTER_X, ROOM_CENTER_Y,
                         Math_CosS(this->actor.shape.rot.y) * 200.0f + ROOM_CENTER_Z, 0, 0, 0, 0, true);
@@ -2563,8 +2570,7 @@ void BossSst_HeadCollisionCheck(BossSst* this, PlayState* play) {
                 if (Actor_ApplyDamage(&this->actor) == 0) {
                     Enemy_StartFinishingBlow(play, &this->actor);
                     BossSst_HeadSetupDeath(this, play);
-                    gSaveContext.sohStats.itemTimestamp[TIMESTAMP_DEFEAT_BONGO_BONGO] = GAMEPLAYSTAT_TOTAL_TIME;
-                    BossRush_HandleCompleteBoss(play);
+                    GameInteractor_ExecuteOnBossDefeat(&this->actor);
                 } else {
                     BossSst_HeadSetupDamage(this);
                 }
diff --git a/soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c b/soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c
index 40f8127cd..4c198d07f 100644
--- a/soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c
+++ b/soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c
@@ -4,7 +4,8 @@
 #include "objects/object_tw/object_tw.h"
 #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h"
 #include "soh/frame_interpolation.h"
-#include "soh/Enhancements/boss-rush/BossRush.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #include <string.h>
 
@@ -535,9 +536,14 @@ void BossTw_Init(Actor* thisx, PlayState* play2) {
         if (Flags_GetClear(play, play->roomCtx.curRoom.num)) {
             // twinrova has been defeated.
             Actor_Kill(&this->actor);
-            Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, 600.0f, 230.0f, 0.0f, 0,
-                               0, 0, WARP_DUNGEON_ADULT);
-            Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, -600.0f, 230.0f, 0.0f, 0, 0, 0, 0, true);
+            if (GameInteractor_Should(VB_SPAWN_BLUE_WARP, true, this)) {
+                Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, 600.0f, 230.0f, 0.0f, 0,
+                                   0, 0, WARP_DUNGEON_ADULT);
+            }
+
+            if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true, NULL)) {
+                Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, -600.0f, 230.0f, 0.0f, 0, 0, 0, 0, true);
+            }
         } else {
             sKotakePtr = (BossTw*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_BOSS_TW,
                                                      this->actor.world.pos.x, this->actor.world.pos.y,
@@ -2795,14 +2801,15 @@ void BossTw_TwinrovaDeathCS(BossTw* this, PlayState* play) {
                 func_80064534(play, &play->csCtx);
                 Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
                 Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_BOSS_CLEAR);
-                if (!IS_BOSS_RUSH) {
+                if (GameInteractor_Should(VB_SPAWN_BLUE_WARP, true, this)) {
                     Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, 600.0f, 230.0f, 0.0f, 0,
                                        0, 0, WARP_DUNGEON_ADULT);
-                    Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, -600.0f, 230.f, 0.0f, 0, 0, 0, 0, true);
-                } else {
-                    Actor_Spawn(&play->actorCtx, play, ACTOR_DOOR_WARP1, 600.0f, 230.0f, 0.0f, 0, 0, 0,
-                                WARP_DUNGEON_ADULT, true);
                 }
+
+                if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true, NULL)) {
+                    Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, -600.0f, 230.f, 0.0f, 0, 0, 0, 0, true);
+                }
+
                 this->actor.world.pos.y = -2000.0f;
                 this->workf[UNK_F18] = 0.0f;
                 sKoumePtr->visible = sKotakePtr->visible = false;
@@ -5289,8 +5296,7 @@ void BossTw_TwinrovaDamage(BossTw* this, PlayState* play, u8 damage) {
             BossTw_TwinrovaSetupDeathCS(this, play);
             Enemy_StartFinishingBlow(play, &this->actor);
             Audio_PlayActorSound2(&this->actor, NA_SE_EN_TWINROBA_YOUNG_DEAD);
-            gSaveContext.sohStats.itemTimestamp[TIMESTAMP_DEFEAT_TWINROVA] = GAMEPLAYSTAT_TOTAL_TIME;
-            BossRush_HandleCompleteBoss(play);
+            GameInteractor_ExecuteOnBossDefeat(&this->actor);
             return;
         }
 
diff --git a/soh/src/overlays/actors/ovl_Boss_Va/z_boss_va.c b/soh/src/overlays/actors/ovl_Boss_Va/z_boss_va.c
index 77a497e7a..16cb91d99 100644
--- a/soh/src/overlays/actors/ovl_Boss_Va/z_boss_va.c
+++ b/soh/src/overlays/actors/ovl_Boss_Va/z_boss_va.c
@@ -15,7 +15,8 @@
 #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h"
 
 #include "soh/frame_interpolation.h"
-#include "soh/Enhancements/boss-rush/BossRush.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_WHILE_CULLED | ACTOR_FLAG_DRAW_WHILE_CULLED)
 
@@ -641,11 +642,16 @@ void BossVa_Init(Actor* thisx, PlayState* play2) {
                 if (Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
                     warpId = ACTOR_DOOR_WARP1;
                 }
-                Actor_Spawn(&play->actorCtx, play, warpId, this->actor.world.pos.x, this->actor.world.pos.y,
-                            this->actor.world.pos.z, 0, 0, 0,
-                            0, true); //! params could be WARP_DUNGEON_CHILD however this can also spawn Ru1
-                Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, this->actor.world.pos.x + 160.0f,
-                            this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 0, true);
+                if (GameInteractor_Should(VB_SPAWN_BLUE_WARP, true, this)) {
+                    Actor_Spawn(&play->actorCtx, play, warpId, this->actor.world.pos.x, this->actor.world.pos.y,
+                                this->actor.world.pos.z, 0, 0, 0,
+                                0, true); //! params could be WARP_DUNGEON_CHILD however this can also spawn Ru1
+                }
+
+                if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true, NULL)) {
+                    Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, this->actor.world.pos.x + 160.0f,
+                                this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 0, true);
+                }
                 sDoorState = 100;
                 Actor_Kill(&this->actor);
             } else {
@@ -1401,8 +1407,7 @@ void BossVa_BodyPhase4(BossVa* this, PlayState* play) {
                         if (sFightPhase >= PHASE_DEATH) {
                             BossVa_SetupBodyDeath(this, play);
                             Enemy_StartFinishingBlow(play, &this->actor);
-                            gSaveContext.sohStats.itemTimestamp[TIMESTAMP_DEFEAT_BARINADE] = GAMEPLAYSTAT_TOTAL_TIME;
-                            BossRush_HandleCompleteBoss(play);
+                            GameInteractor_ExecuteOnBossDefeat(&this->actor);
                             return;
                         }
                         this->actor.speedXZ = -10.0f;
@@ -1657,7 +1662,7 @@ void BossVa_BodyDeath(BossVa* this, PlayState* play) {
                 Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
                 sCsState++;
 
-                if (!IS_BOSS_RUSH) {
+                if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true, NULL)) {
                     Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, this->actor.world.pos.x,
                                 this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 0, true);
                 }
@@ -1669,12 +1674,9 @@ void BossVa_BodyDeath(BossVa* this, PlayState* play) {
                     }
                 }
 
-                if (!IS_BOSS_RUSH) {
+                if (GameInteractor_Should(VB_SPAWN_BLUE_WARP, true, this)) {
                     Actor_Spawn(&play->actorCtx, play, ACTOR_EN_RU1, sWarpPos[sp7C].x, sWarpPos[sp7C].y,
                                 sWarpPos[sp7C].z, 0, 0, 0, 0, true);
-                } else {
-                    Actor_Spawn(&play->actorCtx, play, ACTOR_DOOR_WARP1, sWarpPos[sp7C].x, sWarpPos[sp7C].y,
-                                sWarpPos[sp7C].z, 0, 0, 0, WARP_DUNGEON_ADULT, false);
                 }
             }
         case DEATH_FINISH:
diff --git a/soh/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c b/soh/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
index 89628cc34..ed707ffad 100644
--- a/soh/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
+++ b/soh/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
@@ -426,12 +426,6 @@ void DemoKankyo_KillDoorOfTimeCollision(DemoKankyo* this, PlayState* play) {
 void DemoKankyo_Update(Actor* thisx, PlayState* play) {
     DemoKankyo* this = (DemoKankyo*)thisx;
     this->actionFunc(this, play);
-
-    // In ER, override the warp song locations. Also removes the warp song cutscene
-    if (IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_ENTRANCES) &&
-        thisx->params == 0x000F) { // Warp Song particles
-        Entrance_SetWarpSongEntrance();
-    }
 }
 
 void DemoKankyo_Draw(Actor* thisx, PlayState* play) {
diff --git a/soh/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c b/soh/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c
index b0d210bbc..26bf4c761 100644
--- a/soh/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c
+++ b/soh/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c
@@ -8,7 +8,6 @@
 #include "overlays/actors/ovl_En_Elf/z_en_elf.h"
 #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h"
 #include "objects/object_sa/object_sa.h"
-#include "soh/Enhancements/boss-rush/BossRush.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #include "vt.h"
@@ -257,21 +256,13 @@ void func_8098E960(DemoSa* this, PlayState* play) {
 
     if ((gSaveContext.chamberCutsceneNum == 0) && (gSaveContext.sceneSetupIndex < 4)) {
         player = GET_PLAYER(play);
-        if (!IS_BOSS_RUSH) {
-            this->action = 1;
-            play->csCtx.segment = D_8099010C;
-            gSaveContext.cutsceneTrigger = 2;
-            if (GameInteractor_Should(VB_GIVE_ITEM_FOREST_MEDALLION, true, NULL)) {
-                Item_Give(play, ITEM_MEDALLION_FOREST);
-            }
-            player->actor.world.rot.y = player->actor.shape.rot.y = this->actor.world.rot.y + 0x8000;
-        } else {
-            this->action = 1;
-            if (gSaveContext.linkAge == LINK_AGE_CHILD) {
-                player->actor.world.rot.y = player->actor.shape.rot.y = -5461 + 0x8000;
-            }
-            BossRush_SpawnBlueWarps(play);
+        this->action = 1;
+        play->csCtx.segment = D_8099010C;
+        gSaveContext.cutsceneTrigger = 2;
+        if (GameInteractor_Should(VB_GIVE_ITEM_FOREST_MEDALLION, true, NULL)) {
+            Item_Give(play, ITEM_MEDALLION_FOREST);
         }
+        player->actor.world.rot.y = player->actor.shape.rot.y = this->actor.world.rot.y + 0x8000;
     }
 }
 
diff --git a/soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c b/soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
index 242ac1ddb..be1756613 100644
--- a/soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
+++ b/soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
@@ -749,9 +749,7 @@ void DoorWarp1_AdultWarpOut(DoorWarp1* this, PlayState* play) {
     this->warpTimer++;
 
     if (this->warpTimer > sWarpTimerTarget && gSaveContext.nextCutsceneIndex == 0xFFEF) {
-        if (IS_BOSS_RUSH) {
-            BossRush_HandleBlueWarp(play, this->actor.world.pos.x, this->actor.world.pos.z);
-        } else if (play->sceneNum == SCENE_FOREST_TEMPLE_BOSS) {
+        if (play->sceneNum == SCENE_FOREST_TEMPLE_BOSS) {
             if (GameInteractor_Should(VB_PLAY_BLUE_WARP_CS, !Flags_GetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP), EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP)) {
                 Flags_SetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP);
                 if (GameInteractor_Should(VB_GIVE_ITEM_FROM_BLUE_WARP, true, ITEM_MEDALLION_FOREST)) {
diff --git a/soh/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c b/soh/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c
index 6df2802f8..26e7f7e7a 100644
--- a/soh/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c
+++ b/soh/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c
@@ -3,6 +3,8 @@
 #include "overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.h"
 #include "overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h"
 #include "objects/object_bg/object_bg.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_WHILE_CULLED | ACTOR_FLAG_DRAW_WHILE_CULLED | ACTOR_FLAG_NO_LOCKON)
 
@@ -141,25 +143,10 @@ void EnBomBowMan_BlinkAwake(EnBomBowlMan* this, PlayState* play) {
     if (frameCount == 30.0f) {
         this->dialogState = TEXT_STATE_EVENT;
 
-        // Check for beaten Dodongo's Cavern if Rando is disabled
-        if (!IS_RANDO) {
-            if ((Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP)) || BREG(2)) {
-                this->actor.textId = 0xBF;
-            } else {
-                this->actor.textId = 0x7058;
-            }
-        }
-
-        // In randomizer, only check for bomb bag when bombchus aren't in logic
-        // and only check for bombchus when bombchus are in logic
-        if (IS_RANDO) {
-            u8 bombchusInLogic = Randomizer_GetSettingValue(RSK_BOMBCHUS_IN_LOGIC);
-            if ((!bombchusInLogic && INV_CONTENT(ITEM_BOMB) == ITEM_NONE) ||
-                (bombchusInLogic && INV_CONTENT(ITEM_BOMBCHU) == ITEM_NONE)) {
-                this->actor.textId = 0x7058;
-            } else {
-                this->actor.textId = 0xBF;
-            }
+        if (GameInteractor_Should(VB_BE_ABLE_TO_PLAY_BOMBCHU_BOWLING, (Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP)) || BREG(2), NULL)) {
+            this->actor.textId = 0xBF;
+        } else {
+            this->actor.textId = 0x7058;
         }
     }
     Message_ContinueTextbox(play, this->actor.textId);
diff --git a/soh/src/overlays/actors/ovl_En_Box/z_en_box.c b/soh/src/overlays/actors/ovl_En_Box/z_en_box.c
index 41234d54f..ef7a6330b 100644
--- a/soh/src/overlays/actors/ovl_En_Box/z_en_box.c
+++ b/soh/src/overlays/actors/ovl_En_Box/z_en_box.c
@@ -207,11 +207,6 @@ void EnBox_Init(Actor* thisx, PlayState* play2) {
     if (play->sceneNum == SCENE_FOREST_TEMPLE && this->dyna.actor.params == 10222) {
         this->movementFlags = ENBOX_MOVE_IMMOBILE;
     }
-
-    // Delete chests in Boss Rush. Mainly for the chest in King Dodongo's boss room.
-    if (IS_BOSS_RUSH) {
-        EnBox_SetupAction(this, EnBox_Destroy);
-    }
 }
 
 void EnBox_Destroy(Actor* thisx, PlayState* play) {
diff --git a/soh/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c b/soh/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c
index c8bea148f..08d1e1c98 100644
--- a/soh/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c
+++ b/soh/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c
@@ -7,6 +7,8 @@
 #include "z_en_kakasi2.h"
 #include "vt.h"
 #include "objects/object_ka/object_ka.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UPDATE_WHILE_CULLED | ACTOR_FLAG_DRAW_WHILE_CULLED | ACTOR_FLAG_NO_FREEZE_OCARINA | ACTOR_FLAG_NO_LOCKON)
 
@@ -116,21 +118,8 @@ void func_80A90264(EnKakasi2* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
 
     this->unk_194++;
-    
-    int ocarinaButtonCount = 0;
-    for (int i = RAND_INF_HAS_OCARINA_A; i <= RAND_INF_HAS_OCARINA_C_DOWN; i++) {
-        if (Flags_GetRandomizerInf(i)) {
-            ocarinaButtonCount++;
-        }
-    }
 
-    bool hasTwoOcarinaButtons = !IS_RANDO || ocarinaButtonCount >= 2;
-
-    bool skipScarecrow = hasTwoOcarinaButtons && play->msgCtx.msgMode == MSGMODE_OCARINA_PLAYING &&
-                            ((CVarGetInteger(CVAR_ENHANCEMENT("InstantScarecrow"), 0) && gSaveContext.scarecrowSpawnSongSet) ||
-                            (IS_RANDO && Randomizer_GetSettingValue(RSK_SKIP_SCARECROWS_SONG)));
-
-    if ((BREG(1) != 0) || skipScarecrow && (this->actor.xzDistToPlayer < this->maxSpawnDistance.x) &&
+    if ((BREG(1) != 0) || GameInteractor_Should(VB_SKIP_SCARECROWS_SONG, false, NULL) && (this->actor.xzDistToPlayer < this->maxSpawnDistance.x) &&
         (fabsf(player->actor.world.pos.y - this->actor.world.pos.y) < this->maxSpawnDistance.y)) {
         this->actor.draw = func_80A90948;
         Collider_InitCylinder(play, &this->collider);
diff --git a/soh/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c b/soh/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c
index 04b0ca1e3..a0e529991 100644
--- a/soh/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c
+++ b/soh/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c
@@ -277,11 +277,6 @@ void EnKusa_Destroy(Actor* thisx, PlayState* play2) {
 }
 
 void EnKusa_SetupWaitObject(EnKusa* this) {
-    // Kill bushes in Boss Rush. Used in Gohma's arena.
-    if (IS_BOSS_RUSH) {
-        Actor_Kill(this);
-    }
-
     EnKusa_SetupAction(this, EnKusa_WaitObject);
 }
 
diff --git a/soh/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c b/soh/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
index eca7cc18c..dcaaa897b 100644
--- a/soh/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
+++ b/soh/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
@@ -157,15 +157,6 @@ void EnSyatekiMan_Init(Actor* thisx, PlayState* play) {
     s32 pad;
     EnSyatekiMan* this = (EnSyatekiMan*)thisx;
 
-    if (IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_INTERIOR_ENTRANCES)) {
-        // If child is in the adult shooting gallery or adult in the child shooting gallery, then despawn the shooting gallery man
-        if ((LINK_IS_CHILD && Entrance_SceneAndSpawnAre(SCENE_SHOOTING_GALLERY, 0x00)) || //Kakariko Village -> Adult Shooting Gallery, index 003B in the entrance table
-            (LINK_IS_ADULT && Entrance_SceneAndSpawnAre(SCENE_SHOOTING_GALLERY, 0x01))) { //Market -> Child Shooting Gallery,           index 016D in the entrance table
-            Actor_Kill(thisx);
-            return;
-        }
-    }
-
     osSyncPrintf("\n\n");
     // "Old man appeared!! Muhohohohohohohon"
     osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 親父登場！！むほほほほほほほーん ☆☆☆☆☆ \n" VT_RST);
diff --git a/soh/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c b/soh/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c
index 19bf701fa..a804da12e 100644
--- a/soh/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c
+++ b/soh/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c
@@ -200,12 +200,7 @@ void ObjComb_Update(Actor* thisx, PlayState* play) {
 
     this->unk_1B2 += 0x2EE0;
     this->actionFunc(this, play);
-    s16 wiggleOffset = this->unk_1B0;
-    
-    if (IS_RANDO && this->unk_1B0 < 0) {
-        wiggleOffset = 0;
-    }
-    this->actor.shape.rot.x = Math_SinS(this->unk_1B2) * wiggleOffset + this->actor.home.rot.x;
+    this->actor.shape.rot.x = Math_SinS(this->unk_1B2) * this->unk_1B0 + this->actor.home.rot.x;
 }
 
 void ObjComb_Draw(Actor* thisx, PlayState* play) {
diff --git a/soh/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c b/soh/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c
index ae26db3ac..026598ac9 100644
--- a/soh/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c
+++ b/soh/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c
@@ -273,15 +273,6 @@ void ObjOshihiki_Init(Actor* thisx, PlayState* play2) {
     PlayState* play = play2;
     ObjOshihiki* this = (ObjOshihiki*)thisx;
 
-    // In MQ Spirit, remove the large silver block in the hole as child so the chest in the silver block hallway
-    // can be guaranteed accessible
-    if (IS_RANDO && LINK_IS_CHILD && ResourceMgr_IsGameMasterQuest() &&
-        play->sceneNum == SCENE_SPIRIT_TEMPLE && thisx->room == 6 && // Spirit Temple silver block hallway
-        thisx->params == 0x9C7) { // Silver block that is marked as in the hole
-        Actor_Kill(thisx);
-        return;
-    }
-
     ObjOshihiki_CheckType(this, play);
 
     if ((((this->dyna.actor.params >> 8) & 0xFF) >= 0) && (((this->dyna.actor.params >> 8) & 0xFF) <= 0x3F)) {
diff --git a/soh/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c b/soh/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c
index 0dd03a5be..9be71e91b 100644
--- a/soh/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c
+++ b/soh/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c
@@ -221,11 +221,6 @@ void ObjTsubo_WaterBreak(ObjTsubo* this, PlayState* play) {
 }
 
 void ObjTsubo_SetupWaitForObject(ObjTsubo* this) {
-    // Remove pots in Boss Rush. Present in Barinade's and Ganondorf's arenas.
-    if (IS_BOSS_RUSH) {
-        Actor_Kill(this);
-    }
-
     this->actionFunc = ObjTsubo_WaitForObject;
 }
 
diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c
index 11e896724..0acf4f1f0 100644
--- a/soh/src/overlays/actors/ovl_player_actor/z_player.c
+++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c
@@ -4843,8 +4843,7 @@ s32 Player_ActionChange_1(Player* this, PlayState* play) {
     if ((this->doorType != PLAYER_DOORTYPE_NONE) &&
         (!(this->stateFlags1 & PLAYER_STATE1_ITEM_OVER_HEAD) ||
          ((this->heldActor != NULL) && (this->heldActor->id == ACTOR_EN_RU1)))) {
-        // Disable doors in Boss Rush so the player can't leave the boss rooms backwards.
-        if ((CHECK_BTN_ALL(sControlInput->press.button, BTN_A) || (Player_Action_8084F9A0 == this->actionFunc)) && !IS_BOSS_RUSH) {
+        if ((CHECK_BTN_ALL(sControlInput->press.button, BTN_A) || (Player_Action_8084F9A0 == this->actionFunc)) && GameInteractor_Should(VB_BE_ABLE_TO_OPEN_DOORS, true, NULL)) {
             doorActor = this->doorActor;
 
             if (this->doorType <= PLAYER_DOORTYPE_AJAR) {
diff --git a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
index 55a4b9f7c..3814eff24 100644
--- a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
+++ b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
@@ -1388,7 +1388,7 @@ void FileChoose_UpdateBossRushMenu(GameState* thisx) {
         // Move down
         if (this->stickRelY < -30 || (dpad && CHECK_BTN_ANY(input->press.button, BTN_DDOWN))) {
             // When selecting past the last option, cycle back to the first option.
-            if ((this->bossRushIndex + 1) > BOSSRUSH_OPTIONS_AMOUNT - 1) {
+            if ((this->bossRushIndex + 1) > BR_OPTIONS_MAX - 1) {
                 this->bossRushIndex = 0;
                 this->bossRushOffset = 0;
             } else {
@@ -1401,7 +1401,7 @@ void FileChoose_UpdateBossRushMenu(GameState* thisx) {
         } else if (this->stickRelY > 30 || (dpad && CHECK_BTN_ANY(input->press.button, BTN_DUP))) {
             // When selecting past the first option, cycle back to the last option and offset the list to view it properly.
             if ((this->bossRushIndex - 1) < 0) {
-                this->bossRushIndex = BOSSRUSH_OPTIONS_AMOUNT - 1;
+                this->bossRushIndex = BR_OPTIONS_MAX - 1;
                 this->bossRushOffset = this->bossRushIndex - BOSSRUSH_MAX_OPTIONS_ON_SCREEN + 1;
             } else {
                 // When first visible option is selected when moving up, offset the list up by one.
@@ -2306,7 +2306,7 @@ void FileChoose_DrawWindowContents(GameState* thisx) {
                                     (arrowUpY + 8) << 2, G_TX_RENDERTILE, 0, 0, (1 << 11), (1 << 11));
         }
         // Arrow down
-        if (BOSSRUSH_OPTIONS_AMOUNT - listOffset > BOSSRUSH_MAX_OPTIONS_ON_SCREEN) {
+        if (BR_OPTIONS_MAX - listOffset > BOSSRUSH_MAX_OPTIONS_ON_SCREEN) {
             uint16_t arrowDownX = 140;
             uint16_t arrowDownY = 181 + (this->bossRushArrowOffset / 10);
             gDPLoadTextureBlock(POLY_OPA_DISP++, gArrowDownTex, G_IM_FMT_IA,
@@ -3045,16 +3045,6 @@ void FileChoose_LoadGame(GameState* thisx) {
 
     gSaveContext.naviTimer = 0;
 
-    if (IS_RANDO) {
-        // Setup the modified entrance table and entrance shuffle table for rando
-        Entrance_Init();
-
-        // Handle randomized spawn positions after the save context has been setup from load
-        if (Randomizer_GetSettingValue(RSK_SHUFFLE_ENTRANCES)) {
-            Entrance_SetSavewarpEntrance();
-        }
-    }
-
     GameInteractor_ExecuteOnLoadGame(gSaveContext.fileNum);
 }
 
diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c
index c81a89c4e..9c4224181 100644
--- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c
+++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c
@@ -2,6 +2,8 @@
 #include "textures/parameter_static/parameter_static.h"
 #include "textures/icon_item_static/icon_item_static.h"
 #include "soh/Enhancements/cosmetics/cosmeticsTypes.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 extern const char* digitTextures[];
 
@@ -12,7 +14,7 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) {
     } else if (CVarGetInteger(CVAR_COSMETIC("DefaultColorScheme"), COLORSCHEME_N64) == COLORSCHEME_GAMECUBE) {
         aButtonColor = (Color_RGB8){ 80, 255, 150 };
     }
-    if (IS_RANDO && !Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_A)) {
+    if (!GameInteractor_Should(VB_HAVE_OCARINA_NOTE_D4, true, NULL)) {
         aButtonColor = (Color_RGB8){ 191, 191, 191 };
     }
 
@@ -24,7 +26,7 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) {
     if (CVarGetInteger(CVAR_COSMETIC("HUD.CUpButton.Changed"), 0)) {
         cUpButtonColor = CVarGetColor24(CVAR_COSMETIC("HUD.CUpButton.Value"), cUpButtonColor);
     }
-    if (IS_RANDO && !Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_UP)) {
+    if (!GameInteractor_Should(VB_HAVE_OCARINA_NOTE_D5, true, NULL)) {
         cUpButtonColor = (Color_RGB8){ 191, 191, 191 };
     }
 
@@ -32,7 +34,7 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) {
     if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.Changed"), 0)) {
         cDownButtonColor = CVarGetColor24(CVAR_COSMETIC("HUD.CDownButton.Value"), cDownButtonColor);
     }
-    if (IS_RANDO && !Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_DOWN)) {
+    if (!GameInteractor_Should(VB_HAVE_OCARINA_NOTE_F4, true, NULL)) {
         cDownButtonColor = (Color_RGB8){ 191, 191, 191 };
     }
 
@@ -40,7 +42,7 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) {
     if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.Changed"), 0)) {
         cLeftButtonColor = CVarGetColor24(CVAR_COSMETIC("HUD.CLeftButton.Value"), cLeftButtonColor);
     }
-    if (IS_RANDO && !Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_LEFT)) {
+    if (!GameInteractor_Should(VB_HAVE_OCARINA_NOTE_B4, true, NULL)) {
         cLeftButtonColor = (Color_RGB8){ 191, 191, 191 };
     }
 
@@ -48,7 +50,7 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) {
     if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.Changed"), 0)) {
         cRightButtonColor = CVarGetColor24(CVAR_COSMETIC("HUD.CRightButton.Value"), cRightButtonColor);
     }
-    if (IS_RANDO && !Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_RIGHT)) {
+    if (!GameInteractor_Should(VB_HAVE_OCARINA_NOTE_A4, true, NULL)) {
         cRightButtonColor = (Color_RGB8){ 191, 191, 191 };
     }
 
diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
index 68ace2c39..1902781e5 100644
--- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
+++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
@@ -1650,13 +1650,9 @@ void KaleidoScope_DrawPages(PlayState* play, GraphicsContext* gfxCtx) {
                 gDPSetCombineMode(POLY_KAL_DISP++, G_CC_MODULATEIA, G_CC_MODULATEIA);
                 gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 255, 255, 255, pauseCtx->alpha);
 
-                if (!IS_BOSS_RUSH) {
+                if (GameInteractor_Should(VB_RENDER_YES_ON_CONTINUE_PROMPT, true, &POLY_KAL_DISP)) {
                     POLY_KAL_DISP = KaleidoScope_QuadTextureIA8(
                         POLY_KAL_DISP, sPromptChoiceTexs[gSaveContext.language][0], 48, 16, 12);
-                } else {
-                    // Show "No" twice in Boss Rush because the player can't save within it.
-                    POLY_KAL_DISP = KaleidoScope_QuadTextureIA8(
-                        POLY_KAL_DISP, sPromptChoiceTexs[gSaveContext.language][1], 48, 16, 12);
                 }
 
                 POLY_KAL_DISP =
@@ -4002,9 +3998,7 @@ void KaleidoScope_Update(PlayState* play)
         case 6:
             switch (pauseCtx->unk_1E4) {
                 case 0:
-                    // Boss Rush skips past the "Save?" window when pressing B while paused.
-                    if (CHECK_BTN_ALL(input->press.button, BTN_START) ||
-                        (CHECK_BTN_ALL(input->press.button, BTN_B) && IS_BOSS_RUSH)) {
+                    if (GameInteractor_Should(VB_CLOSE_PAUSE_MENU, CHECK_BTN_ALL(input->press.button, BTN_START), NULL)) {
                         if (CVarGetInteger(CVAR_CHEAT("EasyPauseBuffer"), 0) || CVarGetInteger(CVAR_CHEAT("EasyInputBuffer"), 0)) {
                             // Easy pause buffer is 13 frames, 12 for kaledio to end, and one more to advance a single frame
                             CVarSetInteger(CVAR_GENERAL("CheatEasyPauseBufferTimer"), 13);
@@ -4391,10 +4385,8 @@ void KaleidoScope_Update(PlayState* play)
                 VREG(88) = 66;
                 WREG(2) = 0;
                 pauseCtx->alpha = 255;
-                if (!IS_BOSS_RUSH) {
+                if (GameInteractor_Should(VB_TRANSITION_TO_SAVE_SCREEN_ON_DEATH, true, pauseCtx)) {
                     pauseCtx->state = 0xE;
-                } else {
-                    pauseCtx->state = 0xF;
                 }
                 gSaveContext.deaths++;
                 if (gSaveContext.deaths > 999) {
@@ -4439,7 +4431,7 @@ void KaleidoScope_Update(PlayState* play)
 
         case 0x10:
             if (CHECK_BTN_ALL(input->press.button, BTN_A) || CHECK_BTN_ALL(input->press.button, BTN_START)) {
-                if (pauseCtx->promptChoice == 0 && !IS_BOSS_RUSH) {
+                if (pauseCtx->promptChoice == 0 && GameInteractor_Should(VB_BE_ABLE_TO_SAVE, true, NULL)) {
                     Audio_PlaySoundGeneral(NA_SE_SY_PIECE_OF_HEART, &D_801333D4, 4, &D_801333E0, &D_801333E0,
                                            &D_801333E8);
                     Play_SaveSceneFlags(play);
@@ -4512,7 +4504,7 @@ void KaleidoScope_Update(PlayState* play)
                     R_PAUSE_MENU_MODE = 0;
                     func_800981B8(&play->objectCtx);
                     func_800418D0(&play->colCtx, play);
-                    if (pauseCtx->promptChoice == 0 && !IS_BOSS_RUSH) {
+                    if (pauseCtx->promptChoice == 0 && GameInteractor_Should(VB_BE_ABLE_TO_SAVE, true, NULL)) {
                         Play_TriggerRespawn(play);
                         gSaveContext.respawnFlag = -2;
                         // In ER, handle death warp to last entrance from grottos

From a9fbd8243f38577fef81d5a2f43fc2e3bfe5ab22 Mon Sep 17 00:00:00 2001
From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Date: Tue, 8 Oct 2024 21:22:19 +0100
Subject: [PATCH 226/230] Mitigate playthrough sphere jank and remove sphere
 enforcement in logic when not needed. (#4361)

* preparatory clean ups

* structure done, but failes to generate

* fix the bugs, but triple seed gen time on the benchmark

* fix massive generation time increases

* Remove sphereing when not needed as an optimisation

* post merge fixes

* reset the current sphere when toggling an event to cover another cause of jank

* address reviews
---
 .../Enhancements/randomizer/3drando/fill.cpp  | 401 ++++++++----------
 .../Enhancements/randomizer/3drando/fill.hpp  |  51 +++
 .../randomizer/3drando/location_access.cpp    |  12 +-
 .../randomizer/3drando/location_access.hpp    |   6 +-
 soh/soh/Enhancements/randomizer/entrance.cpp  |   1 +
 .../Enhancements/randomizer/static_data.cpp   |   2 +-
 6 files changed, 243 insertions(+), 230 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/fill.cpp b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
index 1a7e2cad8..c15e2e742 100644
--- a/soh/soh/Enhancements/randomizer/3drando/fill.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
@@ -4,12 +4,10 @@
 #include "../dungeon.h"
 #include "../context.h"
 #include "item_pool.hpp"
-#include "location_access.hpp"
 #include "random.hpp"
 #include "spoiler_log.hpp"
 #include "starting_inventory.hpp"
 #include "hints.hpp"
-#include "../entrance.h"
 #include "shops.hpp"
 #include "pool_functions.hpp"
 //#include "debug.hpp"
@@ -24,56 +22,6 @@ using namespace CustomMessages;
 using namespace Rando;
 
 
-//RANDOTODO merge into Logic once Logic is a class passed to logic funtions 
-struct GetAccessableLocationsStruct {
-  std::vector<RandomizerCheck> accessibleLocations;
-  std::vector<RandomizerRegion> regionPool;
-  //Variables for playthrough
-  int gsCount;
-  int maxGsCount;
-  std::vector<LogicVal> buyIgnores;
-
-  //Variables for search
-  std::vector<Rando::ItemLocation*> newItemLocations;
-  bool updatedEvents;
-  bool ageTimePropogated;
-  bool firstIteration;
-
-  //Variables For Validating Entrences
-  bool haveTimeAccess;
-  bool foundTempleOfTime;
-  bool validatedStartingRegion;
-  bool sphereZeroComplete;
-
-  std::vector<RandomizerCheck> itemSphere;
-  std::list<Entrance*> entranceSphere;
-
-  GetAccessableLocationsStruct(int _maxGsCount){
-    regionPool = {RR_ROOT};
-    gsCount = 0;
-    maxGsCount = _maxGsCount;
-    updatedEvents = false;
-    ageTimePropogated = false;
-    firstIteration = true;
-    haveTimeAccess = false;
-    foundTempleOfTime = false;
-    validatedStartingRegion = false;
-    sphereZeroComplete = false;
-  }
-
-  void InitLoop(){
-    firstIteration = false;
-    ageTimePropogated = false;
-    updatedEvents = false;
-    for (Rando::ItemLocation* location : newItemLocations) {
-      location->ApplyPlacedItemEffect();
-    }
-    newItemLocations.clear();
-    itemSphere.clear();
-    entranceSphere.clear();
-  }
-};
-
 static bool placementFailure = false;
 
 static void RemoveStartingItemsFromPool() {
@@ -99,15 +47,28 @@ static void RemoveStartingItemsFromPool() {
   }
 }
 
+static void PropagateTimeTravel(GetAccessibleLocationsStruct& gals, RandomizerGet ignore = RG_NONE, 
+                              bool stopOnBeatable = false, bool addToPlaythrough = false){
+  //special check for temple of time
+  if(gals.haveTimeAccess && gals.foundTempleOfTime && gals.validatedStartingRegion){
+    if (!RegionTable(RR_ROOT)->Adult() && RegionTable(RR_TOT_BEYOND_DOOR_OF_TIME)->Child()) { //RANDOTODO: sphere weirdness, other age locations not propagated in this sphere
+      RegionTable(RR_ROOT)->adultDay   = RegionTable(RR_TOT_BEYOND_DOOR_OF_TIME)->childDay;
+      RegionTable(RR_ROOT)->adultNight = RegionTable(RR_TOT_BEYOND_DOOR_OF_TIME)->childNight;
+      ProcessRegion(RegionTable(RR_ROOT), gals, ignore, stopOnBeatable, addToPlaythrough);
+    } else if (!RegionTable(RR_ROOT)->Child() && RegionTable(RR_TOT_BEYOND_DOOR_OF_TIME)->Adult()){
+      RegionTable(RR_ROOT)->childDay   = RegionTable(RR_TOT_BEYOND_DOOR_OF_TIME)->adultDay;
+      RegionTable(RR_ROOT)->childNight = RegionTable(RR_TOT_BEYOND_DOOR_OF_TIME)->adultNight;
+      ProcessRegion(RegionTable(RR_ROOT), gals, ignore, stopOnBeatable, addToPlaythrough);
+    }
+  }
+}
+
 //This function will propagate Time of Day access through the entrance
-static bool UpdateToDAccess(Entrance* entrance, bool propagateTimeTravel) {
+static bool UpdateToDAccess(Entrance* entrance, Region* connection) {
   StartPerformanceTimer(PT_TOD_ACCESS);
 
   bool ageTimePropogated = false;
-
-  //propagate childDay, childNight, adultDay, and adultNight separately
   Region* parent = entrance->GetParentRegion();
-  Region* connection = entrance->GetConnectedRegion();
 
   if (!connection->childDay && parent->childDay && entrance->CheckConditionAtAgeTime(logic->IsChild, logic->AtDay)) {
     connection->childDay = true;
@@ -126,21 +87,12 @@ static bool UpdateToDAccess(Entrance* entrance, bool propagateTimeTravel) {
     ageTimePropogated = true;
   }
 
-  //special check for temple of time
-  if (propagateTimeTravel && !RegionTable(RR_ROOT)->Adult() && RegionTable(RR_TOT_BEYOND_DOOR_OF_TIME)->Child()) { //RANDOTODO: sphere weirdness, other age locations not propagated in this sphere
-    RegionTable(RR_ROOT)->adultDay   = RegionTable(RR_TOT_BEYOND_DOOR_OF_TIME)->childDay;
-    RegionTable(RR_ROOT)->adultNight = RegionTable(RR_TOT_BEYOND_DOOR_OF_TIME)->childNight;
-  } else if (propagateTimeTravel && !RegionTable(RR_ROOT)->Child() && RegionTable(RR_TOT_BEYOND_DOOR_OF_TIME)->Adult()){
-    RegionTable(RR_ROOT)->childDay   = RegionTable(RR_TOT_BEYOND_DOOR_OF_TIME)->adultDay;
-    RegionTable(RR_ROOT)->childNight = RegionTable(RR_TOT_BEYOND_DOOR_OF_TIME)->adultNight;
-  }
-
   StopPerformanceTimer(PT_TOD_ACCESS);
   return ageTimePropogated;
 }
 
 // Check if key locations in the overworld are accessable
-static void ValidateOtherEntrance(GetAccessableLocationsStruct& gals) {
+static void ValidateOtherEntrance(GetAccessibleLocationsStruct& gals) {
   auto ctx = Rando::Context::GetInstance();
   // Condition for validating Temple of Time Access
   if (!gals.foundTempleOfTime && ((ctx->GetSettings()->ResolvedStartingAge() == RO_AGE_CHILD && RegionTable(RR_TEMPLE_OF_TIME)->Adult()) || 
@@ -172,9 +124,9 @@ static void ApplyAllAdvancmentItems(){
   }
 }
 
-// Check if everything in an entrence rando seed that needs to be avalible without items, is,
+// Check if everything in an entrance rando seed that needs to be avalible without items, is,
 // and if so allow obtaining items in logic
-static void ValidateSphereZero(GetAccessableLocationsStruct& gals){
+static void ValidateSphereZero(GetAccessibleLocationsStruct& gals){
   auto ctx = Rando::Context::GetInstance();
   // Condition for verifying everything required for sphere 0, expanding search to all locations
   if (logic->CanEmptyBigPoes && gals.validatedStartingRegion && gals.foundTempleOfTime && gals.haveTimeAccess) {
@@ -192,28 +144,54 @@ static void ValidateSphereZero(GetAccessableLocationsStruct& gals){
         RegionTable(regionKey)->childNight = false;
       }
     }
+    //RANDOTODO do we want to keep the region pool after this reset? 
+    //It's a lot of potential looping over regions we have no access to
     gals.sphereZeroComplete = true;
   } 
 }
 
 //This function handles each possible exit
-void ProcessExit(Entrance& exit, GetAccessableLocationsStruct& gals, bool propagateTimeTravel = true, bool checkPoeCollectorAccess = false, bool checkOtherEntranceAccess = false){
-  //Update Time of Day Access for the exit
-  if (UpdateToDAccess(&exit, propagateTimeTravel)) {
-    gals.ageTimePropogated = true;
-    if (checkOtherEntranceAccess){
-      ValidateOtherEntrance(gals);
+void ProcessExits(Region* region, GetAccessibleLocationsStruct& gals, RandomizerGet ignore = RG_NONE, 
+                  bool stopOnBeatable = false, bool addToPlaythrough = false){
+  auto ctx = Rando::Context::GetInstance();
+  for (auto& exit : region->exits) {
+    Region* exitRegion = exit.GetConnectedRegion();
+    //Update Time of Day Access for the exit
+    if (UpdateToDAccess(&exit, exitRegion)) {
+      gals.logicUpdated = true;
+      if (!gals.sphereZeroComplete){
+        if (!gals.foundTempleOfTime || !gals.validatedStartingRegion){
+          ValidateOtherEntrance(gals);
+        }
+        ValidateSphereZero(gals);
+      }
+      //process the region we just expanded to, to reduce looping
+      ProcessRegion(exitRegion, gals, ignore, stopOnBeatable, addToPlaythrough);
     }
-    if (!gals.sphereZeroComplete){
-      ValidateSphereZero(gals);
-    }
-  }
 
-  //If the exit is accessible and hasn't been added yet, add it to the pool
-  Region* exitRegion = exit.GetConnectedRegion();
-  if (!exitRegion->addedToPool && exit.ConditionsMet()) {
-    exitRegion->addedToPool = true;
-    gals.regionPool.push_back(exit.GetConnectedRegionKey());
+    //If the exit is accessible and hasn't been added yet, add it to the pool
+    //RANDOTODO do we want to add the region after the loop now, considering we
+    //are processing the new region immediately. Maybe a reverse for loop in ProcessRegion?
+    if (!exitRegion->addedToPool && exit.ConditionsMet()) {
+      exitRegion->addedToPool = true;
+      gals.regionPool.push_back(exit.GetConnectedRegionKey());
+    }
+
+    if (addToPlaythrough){
+      // RANDOTODO Should this match the regular spheres?
+      // Add shuffled entrances to the entrance playthrough
+      // Include bluewarps when unshuffled but dungeon or boss shuffle is on
+      if((exit.IsShuffled() || (exit.GetType() == Rando::EntranceType::BlueWarp && 
+          (ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES) || ctx->GetOption(RSK_SHUFFLE_BOSS_ENTRANCES)))) &&
+          !exit.IsAddedToPool() && !ctx->GetEntranceShuffler()->HasNoRandomEntrances()) {
+        gals.entranceSphere.push_back(&exit);
+        exit.AddToPool();
+        // Don't list a two-way coupled entrance from both directions
+        if (exit.GetReverse() != nullptr && exit.GetReplacement()->GetReverse() != nullptr && !exit.IsDecoupled()) {
+          exit.GetReplacement()->GetReverse()->AddToPool();
+        }
+      }
+    }
   }
 }
 
@@ -302,7 +280,15 @@ bool IsBeatableWithout(RandomizerCheck excludedCheck, bool replaceItem, Randomiz
 }
 
 // Reset non-Logic-class logic, and optionally apply the initial inventory
-void ResetLogic(std::shared_ptr<Context>& ctx, bool applyInventory = false){
+void ResetLogic(std::shared_ptr<Context>& ctx, GetAccessibleLocationsStruct& gals, bool applyInventory = false){
+  gals.timePassChildDay = true;
+  gals.timePassChildNight = true;
+  gals.timePassAdultDay = true;
+  gals.timePassAdultNight = true;
+  gals.haveTimeAccess = true;
+  gals.foundTempleOfTime = true;
+  gals.validatedStartingRegion = true;
+  gals.sphereZeroComplete = true;
   if (applyInventory){
     ApplyStartingInventory();
   }
@@ -311,7 +297,7 @@ void ResetLogic(std::shared_ptr<Context>& ctx, bool applyInventory = false){
 } 
 
 //Generate the playthrough, so we want to add advancement items, unless we know to ignore them
-void AddToPlaythrough(LocationAccess& locPair, GetAccessableLocationsStruct& gals){
+void AddToPlaythrough(LocationAccess& locPair, GetAccessibleLocationsStruct& gals){
   auto ctx = Rando::Context::GetInstance();
   RandomizerCheck loc = locPair.GetLocation();
   Rando::ItemLocation* location = ctx->GetItemLocation(loc);
@@ -360,8 +346,17 @@ void AddToPlaythrough(LocationAccess& locPair, GetAccessableLocationsStruct& gal
   }
 }
 
+void ApplyOrStoreItem(Rando::ItemLocation* loc, GetAccessibleLocationsStruct& gals, bool addToPlaythrough){
+  if (addToPlaythrough){
+    gals.newItemLocations.push_back(loc);
+  } else {
+    loc->ApplyPlacedItemEffect();
+  }
+  gals.logicUpdated = true;
+}
+
 // Adds the contents of a location to the current progression and optionally playthrough
-bool AddCheckToLogic(LocationAccess& locPair, GetAccessableLocationsStruct& gals, RandomizerGet ignore, bool stopOnBeatable, bool addToPlaythrough=false){
+bool AddCheckToLogic(LocationAccess& locPair, GetAccessibleLocationsStruct& gals, RandomizerGet ignore, bool stopOnBeatable, bool addToPlaythrough=false){
   auto ctx = Rando::Context::GetInstance();
   StartPerformanceTimer(PT_LOCATION_LOGIC);
   RandomizerCheck loc = locPair.GetLocation();
@@ -380,22 +375,22 @@ bool AddCheckToLogic(LocationAccess& locPair, GetAccessableLocationsStruct& gals
         ItemType type = location->GetPlacedItem().GetItemType();
         //If we want to ignore tokens, only add if not a token
         if (ignore == RG_GOLD_SKULLTULA_TOKEN && type != ITEMTYPE_TOKEN) {
-          gals.newItemLocations.push_back(location);
+          ApplyOrStoreItem(location, gals, addToPlaythrough);
         }
         //If we want to ignore bombchus, only add if bombchu is not in the name
         else if (IsBombchus(ignore) && IsBombchus(locItem, true)) {
-          gals.newItemLocations.push_back(location);
+          ApplyOrStoreItem(location, gals, addToPlaythrough);
         }
         //We want to ignore a specific Buy item. Buy items with different RandomizerGets are recognised by a shared GetLogicVal
         else if (ignore != RG_GOLD_SKULLTULA_TOKEN && IsBombchus(ignore)) {
           if ((type == ITEMTYPE_SHOP && Rando::StaticData::GetItemTable()[ignore].GetLogicVal() != location->GetPlacedItem().GetLogicVal()) || type != ITEMTYPE_SHOP) {
-            gals.newItemLocations.push_back(location);
+            ApplyOrStoreItem(location, gals, addToPlaythrough);
           }
         }
       }
       //If it doesn't, we can just add the location
       else {
-        gals.newItemLocations.push_back(location); //Add item to cache to be considered in logic next iteration
+        ApplyOrStoreItem(location, gals, addToPlaythrough); //Add item to cache to be considered in logic next iteration
       }
     }
     if (addToPlaythrough){
@@ -411,28 +406,69 @@ bool AddCheckToLogic(LocationAccess& locPair, GetAccessableLocationsStruct& gals
   return false;
 }
 
+void ProcessRegion(Region* region, GetAccessibleLocationsStruct& gals, RandomizerGet ignore, 
+                   bool stopOnBeatable, bool addToPlaythrough){
+  
+  if (gals.haveTimeAccess) {
+    region->ApplyTimePass();
+  } else {
+    // If we're checking for TimePass access do that for each region as it's being updated.
+    // TimePass Access is satisfied when every AgeTime can reach a region with TimePass
+    // without the aid of TimePass. During this mode, TimePass won't update ToD access
+    // in any region.
+    //RANDOTODO can probably be removed after a ToD rework that accounts for having Dampe time access
+    if (region->timePass) {
+      if (region->childDay) {
+        gals.timePassChildDay = true;
+      }
+      if (region->childNight) {
+        gals.timePassChildNight = true;
+      }
+      if (region->adultDay) {
+        gals.timePassAdultDay = true;
+      }
+      if (region->adultNight) {
+        gals.timePassAdultNight = true;
+      }
+    }
+    // Condition for validating that all startring AgeTimes have timepass access
+    if (gals.timePassChildDay && gals.timePassChildNight && 
+        gals.timePassAdultDay && gals.timePassAdultNight) {
+      gals.haveTimeAccess = true;
+      region->ApplyTimePass();
+    }
+  }
+
+  if (region->UpdateEvents()){
+    gals.logicUpdated = true;
+    //if we are working in spheres, reset the sphere on an event being enabled to avoid sphere skipping
+    if (addToPlaythrough){
+      gals.resetSphere = true;
+    }
+  }
+  
+  ProcessExits(region, gals, ignore, stopOnBeatable, addToPlaythrough);
+  
+  PropagateTimeTravel(gals, ignore, stopOnBeatable, addToPlaythrough);
+  for (size_t k = 0; k < region->locations.size(); k++) {
+    if(AddCheckToLogic(region->locations[k], gals, ignore, stopOnBeatable, addToPlaythrough)){
+      Rando::Context::GetInstance()->playthroughBeatable = true;
+      return;
+    }
+  }
+}
+
 // Return any of the targetLocations that are accessible in logic
 std::vector<RandomizerCheck> ReachabilitySearch(const std::vector<RandomizerCheck>& targetLocations, RandomizerGet ignore /* = RG_NONE*/) {
   auto ctx = Rando::Context::GetInstance();
-  GetAccessableLocationsStruct gals(0);
-  ResetLogic(ctx, true);
-  while (gals.newItemLocations.size() > 0 || gals.updatedEvents || gals.ageTimePropogated || gals.firstIteration) {
+  GetAccessibleLocationsStruct gals(0);
+  ResetLogic(ctx, gals, true);
+  do {
     gals.InitLoop();
     for (size_t i = 0; i < gals.regionPool.size(); i++) {
-      Region* region = RegionTable(gals.regionPool[i]);
-
-      if (region->UpdateEvents()){
-        gals.updatedEvents = true;
-      }
-      for (auto& exit : region->exits) {
-        ProcessExit(exit, gals);
-      }
-      for (size_t k = 0; k < region->locations.size(); k++) {
-        LocationAccess& locPair = region->locations[k];
-        AddCheckToLogic(locPair, gals, ignore, false);
-      }
+      ProcessRegion(RegionTable(gals.regionPool[i]), gals, ignore);
     }
-  }
+  } while (gals.logicUpdated);
   erase_if(gals.accessibleLocations, [&targetLocations, ctx](RandomizerCheck loc){
     for (RandomizerCheck allowedLocation : targetLocations) {
       if (loc == allowedLocation || ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() != RG_NONE) {
@@ -449,34 +485,15 @@ void GeneratePlaythrough() {
   auto ctx = Rando::Context::GetInstance();
   ctx->playthroughBeatable = false;
   logic->Reset();
-  GetAccessableLocationsStruct gals(GetMaxGSCount());
-  ResetLogic(ctx, true);
-  while (gals.newItemLocations.size() > 0 || gals.updatedEvents || gals.ageTimePropogated || gals.firstIteration) {
+  GetAccessibleLocationsStruct gals(GetMaxGSCount());
+  ResetLogic(ctx, gals, true);
+  do {
     gals.InitLoop();
     for (size_t i = 0; i < gals.regionPool.size(); i++) {
-      Region* region = RegionTable(gals.regionPool[i]);
-
-      if (region->UpdateEvents()){
-        gals.updatedEvents = true;
-      }
-      for (auto& exit : region->exits) {
-        ProcessExit(exit, gals);
-        // Add shuffled entrances to the entrance playthrough
-        // Include bluewarps when unshuffled but dungeon or boss shuffle is on
-        if((exit.IsShuffled() || (exit.GetType() == Rando::EntranceType::BlueWarp && 
-            (ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES) || ctx->GetOption(RSK_SHUFFLE_BOSS_ENTRANCES)))) &&
-           !exit.IsAddedToPool() && !ctx->GetEntranceShuffler()->HasNoRandomEntrances()) {
-          gals.entranceSphere.push_back(&exit);
-          exit.AddToPool();
-          // Don't list a two-way coupled entrance from both directions
-          if (exit.GetReverse() != nullptr && exit.GetReplacement()->GetReverse() != nullptr && !exit.IsDecoupled()) {
-            exit.GetReplacement()->GetReverse()->AddToPool();
-          }
-        }
-      }
-      for (size_t k = 0; k < region->locations.size(); k++) {
-        LocationAccess& locPair = region->locations[k];
-        AddCheckToLogic(locPair, gals, RG_NONE, false, true);
+      ProcessRegion(RegionTable(gals.regionPool[i]), gals, RG_NONE, false, true);
+      if (gals.resetSphere){
+        gals.resetSphere = false;
+        i = -1;
       }
     }
     if (gals.itemSphere.size() > 0) {
@@ -485,126 +502,65 @@ void GeneratePlaythrough() {
     if (gals.entranceSphere.size() > 0 && !ctx->GetEntranceShuffler()->HasNoRandomEntrances()) {
       ctx->GetEntranceShuffler()->playthroughEntrances.push_back(gals.entranceSphere);
     }
-  }
+  } while (gals.logicUpdated);
 }
 
 // return if the seed is currently beatable or not
 bool CheckBeatable(RandomizerGet ignore /* = RG_NONE*/) {
   auto ctx = Rando::Context::GetInstance();
-  GetAccessableLocationsStruct gals(0);
-  ResetLogic(ctx, true);
-  while (gals.newItemLocations.size() > 0 || gals.updatedEvents || gals.ageTimePropogated || gals.firstIteration) {
+  GetAccessibleLocationsStruct gals(0);
+  ResetLogic(ctx, gals, true);
+  do {
     gals.InitLoop();
     for (size_t i = 0; i < gals.regionPool.size(); i++) {
-      Region* region = RegionTable(gals.regionPool[i]);
-
-      if (region->UpdateEvents()){
-        gals.updatedEvents = true;
-      }
-      for (auto& exit : region->exits) {
-        ProcessExit(exit, gals);
-      }
-      for (size_t k = 0; k < region->locations.size(); k++) {
-        LocationAccess& locPair = region->locations[k];
-        if(AddCheckToLogic(locPair, gals, ignore, true)){
-          ctx->playthroughBeatable = true;
-          return true;
-        }
+      ProcessRegion(RegionTable(gals.regionPool[i]), gals, ignore, true);
+      if (ctx->playthroughBeatable == true){
+        return true;
       }
     }
-  }
+  } while (gals.logicUpdated);
   return false;
 }
 
-// Check if the currently randomised set of entrences is a valid game map.
+// Check if the currently randomised set of entrances is a valid game map.
 void ValidateEntrances(bool checkPoeCollectorAccess, bool checkOtherEntranceAccess) {
   auto ctx = Rando::Context::GetInstance();
-  GetAccessableLocationsStruct gals(0);
-  ResetLogic(ctx, !checkOtherEntranceAccess);
-
-  //Variables for Time Pass access
-  bool timePassChildDay = false;
-  bool timePassChildNight = false;
-  bool timePassAdultDay = false;
-  bool timePassAdultNight = false;
+  GetAccessibleLocationsStruct gals(0);
+  ResetLogic(ctx, gals, !checkOtherEntranceAccess);
 
   ctx->allLocationsReachable = false;
   if (checkPoeCollectorAccess){
     logic->CanEmptyBigPoes = false;
   }
-  if (!checkOtherEntranceAccess){
-    gals.foundTempleOfTime = true;
-    gals.validatedStartingRegion = true;
-    gals.haveTimeAccess = true;
-    gals.sphereZeroComplete = true;
-    ApplyAllAdvancmentItems();
-    //if we assume valid sphere zero, we only want starting age access
-    if (ctx->GetSettings()->ResolvedStartingAge() == RO_AGE_CHILD) {
-      for (RandomizerRegion regionKey : gals.regionPool) {
-        RegionTable(RR_ROOT)->childNight = true;
-        RegionTable(RR_ROOT)->childDay = true;
-      }
-    } else {
-      for (RandomizerRegion regionKey : gals.regionPool) {
-        RegionTable(RR_ROOT)->adultNight = true;
-        RegionTable(RR_ROOT)->adultDay = true;
-      }
-    }
-  } else {
+
+  if (checkOtherEntranceAccess){
+    gals.foundTempleOfTime = false;
+    gals.validatedStartingRegion = false;
+    //Variables for Time Pass access
+    gals.timePassChildDay = false;
+    gals.timePassChildNight = false;
+    gals.timePassAdultDay = false;
+    gals.timePassAdultNight = false;
+    gals.haveTimeAccess = false;
+    gals.sphereZeroComplete = false;
     RegionTable(RR_ROOT)->childNight = true;
     RegionTable(RR_ROOT)->adultNight = true;
     RegionTable(RR_ROOT)->childDay = true;
     RegionTable(RR_ROOT)->adultDay = true;
+  } else {
+    ApplyAllAdvancmentItems();
   }
 
-  while (gals.newItemLocations.size() > 0 || gals.updatedEvents || gals.ageTimePropogated || gals.firstIteration) {
+  do {
     gals.InitLoop();
     for (size_t i = 0; i < gals.regionPool.size(); i++) {
-      Region* region = RegionTable(gals.regionPool[i]);
-
-      if (region->UpdateEvents(gals.haveTimeAccess)){
-        gals.updatedEvents = true;
-      }
-      // If we're checking for TimePass access do that for each region as it's being updated.
-      // TimePass Access is satisfied when every AgeTime can reach a region with TimePass
-      // without the aid of TimePass. During this mode, TimePass won't update ToD access
-      // in any region.
-      if (!gals.haveTimeAccess) {
-        if (region->timePass) {
-          if (region->childDay) {
-            timePassChildDay = true;
-          }
-          if (region->childNight) {
-            timePassChildNight = true;
-          }
-          if (region->adultDay) {
-            timePassAdultDay = true;
-          }
-          if (region->adultNight) {
-            timePassAdultNight = true;
-          }
-        }
-        // Condition for validating that all startring AgeTimes have timepass access
-        // Once satisifed, change the mode to begin checking for Temple of Time Access
-        if (timePassChildDay && timePassChildNight && timePassAdultDay && timePassAdultNight) {
-          gals.haveTimeAccess = true;
-        }
-      }
-
-      //for each exit in this region
-      for (auto& exit : region->exits) {
-        ProcessExit(exit, gals, gals.haveTimeAccess && gals.foundTempleOfTime, checkPoeCollectorAccess, checkOtherEntranceAccess);
-      } 
-      if (gals.sphereZeroComplete) {
-        for (size_t k = 0; k < region->locations.size(); k++) {
-          LocationAccess& locPair = region->locations[k];
-          AddCheckToLogic(locPair, gals, RG_NONE, false);
-        }
-      }
+      ProcessRegion(RegionTable(gals.regionPool[i]), gals);
     }
-  }
+  } while (gals.logicUpdated);
   if (gals.sphereZeroComplete) {
     ctx->allLocationsReachable = true;
+    //RANDOTODO a size check here before getting the exact fails would be a minor optimization
+    //and a full list of location failures would be useful for logging when it does fail
     for (const RandomizerCheck loc : ctx->allLocations) {
       if (!ctx->GetItemLocation(loc)->IsAddedToPool()) {
           ctx->allLocationsReachable = false;
@@ -1341,6 +1297,7 @@ int Fill() {
       CreateAllHints();
       CreateWarpSongTexts();
       StopPerformanceTimer(PT_HINTS);
+      SPDLOG_DEBUG("Number of retries {}", retries);
       return 1;
     }
     //Unsuccessful placement
diff --git a/soh/soh/Enhancements/randomizer/3drando/fill.hpp b/soh/soh/Enhancements/randomizer/3drando/fill.hpp
index 60feafc16..94cba70c7 100644
--- a/soh/soh/Enhancements/randomizer/3drando/fill.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/fill.hpp
@@ -1,16 +1,67 @@
 #pragma once
 
 #include "../randomizerTypes.h"
+#include "location_access.hpp"
+#include "../entrance.h"
 
 #include <vector>
 #include <string>
 
+//RANDOTODO merge into Logic once Logic is a class passed to logic funtions 
+struct GetAccessibleLocationsStruct {
+  std::vector<RandomizerCheck> accessibleLocations;
+  std::vector<RandomizerRegion> regionPool;
+  //Variables for playthrough
+  int gsCount;
+  int maxGsCount;
+  std::vector<LogicVal> buyIgnores;
+
+  //Variables for search
+  std::vector<Rando::ItemLocation*> newItemLocations;
+  bool logicUpdated;
+  bool resetSphere;
+
+  //Variables For Validating Entrences
+  bool haveTimeAccess;
+  bool foundTempleOfTime;
+  bool validatedStartingRegion;
+  bool sphereZeroComplete;
+  bool timePassChildDay;
+  bool timePassChildNight;
+  bool timePassAdultDay;
+  bool timePassAdultNight;
+
+  std::vector<RandomizerCheck> itemSphere;
+  std::list<Rando::Entrance*> entranceSphere;
+
+  GetAccessibleLocationsStruct(int _maxGsCount){
+    regionPool = {RR_ROOT};
+    gsCount = 0;
+    maxGsCount = _maxGsCount;
+    logicUpdated = false;
+    resetSphere = false;
+  }
+
+  void InitLoop(){
+    logicUpdated = false;
+    for (Rando::ItemLocation* location : newItemLocations) {
+      location->ApplyPlacedItemEffect();
+    }
+    newItemLocations.clear();
+    itemSphere.clear();
+    entranceSphere.clear();
+  }
+};
+
 void ClearProgress();
 void VanillaFill();
 int Fill();
 
 std::vector<RandomizerCheck> GetEmptyLocations(std::vector<RandomizerCheck> allowedLocations);
 
+void ProcessRegion(Region* region, GetAccessibleLocationsStruct& gals, RandomizerGet ignore = RG_NONE, 
+                   bool stopOnBeatable = false, bool addToPlaythrough = false);
+
 std::vector<RandomizerCheck> ReachabilitySearch(const std::vector<RandomizerCheck>& allowedLocations, RandomizerGet ignore=RG_NONE);
 
 void GeneratePlaythrough();
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
index e15245d13..ca6f0c066 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
@@ -29,7 +29,9 @@ bool LocationAccess::CheckConditionAtAgeTime(bool& age, bool& time) const {
 }
 
 bool LocationAccess::ConditionsMet() const {
-
+  //WARNING enterance validation can run this after resetting the access for sphere 0 validation
+  //When refactoring ToD access, either fix the above or do not assume that we
+  //have any access at all just because this is being run
   Region* parentRegion = RegionTable(Rando::Context::GetInstance()->GetItemLocation(location)->GetParentRegionKey());
   bool conditionsMet = false;
 
@@ -89,8 +91,8 @@ Region::Region(std::string regionName_, std::string scene_, RandomizerArea area,
 
 Region::~Region() = default;
 
-bool Region::UpdateEvents(bool haveTimeAccess) {
-  if (timePass && haveTimeAccess) {
+void Region::ApplyTimePass(){
+  if (timePass) {
     StartPerformanceTimer(PT_TOD_ACCESS);
     if (Child()) {
       childDay = true;
@@ -106,7 +108,9 @@ bool Region::UpdateEvents(bool haveTimeAccess) {
     }
     StopPerformanceTimer(PT_TOD_ACCESS);
   }
+}
 
+bool Region::UpdateEvents() {
   bool eventsUpdated =  false;
   StartPerformanceTimer(PT_EVENT_ACCESS);
   for (EventAccess& event : events) {
@@ -419,7 +423,7 @@ namespace Regions {
 
   void AccessReset() {
     auto ctx = Rando::Context::GetInstance();
-      for (const RandomizerRegion region : GetAllRegions()) {
+    for (const RandomizerRegion region : GetAllRegions()) {
       RegionTable(region)->ResetVariables();
     }
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access.hpp b/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
index 2b18ab029..c4d1e9a74 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
@@ -4,7 +4,6 @@
 #include <vector>
 #include <list>
 
-#include "fill.hpp"
 #include "../randomizerTypes.h"
 #include "../context.h"
 #include "../logic.h"
@@ -18,7 +17,6 @@ extern std::shared_ptr<Rando::Logic> logic;
 class EventAccess {
 public:
 
-
     explicit EventAccess(bool* event_, std::vector<ConditionFn> conditions_met_)
         : event(event_) {
         conditions_met.resize(2);
@@ -165,7 +163,9 @@ public:
     bool adultNight = false;
     bool addedToPool = false;;
 
-    bool UpdateEvents(bool haveTimeAccess = true);
+    void ApplyTimePass();
+
+    bool UpdateEvents();
 
     void AddExit(RandomizerRegion parentKey, RandomizerRegion newExitKey, ConditionFn condition);
 
diff --git a/soh/soh/Enhancements/randomizer/entrance.cpp b/soh/soh/Enhancements/randomizer/entrance.cpp
index d0a887c36..72526db5b 100644
--- a/soh/soh/Enhancements/randomizer/entrance.cpp
+++ b/soh/soh/Enhancements/randomizer/entrance.cpp
@@ -1,5 +1,6 @@
 #include "entrance.h"
 
+#include "3drando/fill.hpp"
 #include "3drando/pool_functions.hpp"
 #include "3drando/item_pool.hpp"
 #include "../debugger/performanceTimer.h"
diff --git a/soh/soh/Enhancements/randomizer/static_data.cpp b/soh/soh/Enhancements/randomizer/static_data.cpp
index 5a091552b..af8ee692d 100644
--- a/soh/soh/Enhancements/randomizer/static_data.cpp
+++ b/soh/soh/Enhancements/randomizer/static_data.cpp
@@ -194,7 +194,7 @@ std::unordered_map<uint32_t, RandomizerHintTextKey> StaticData::trialData = {
 std::unordered_map<RandomizerHint, StaticHintInfo> StaticData::staticHintInfoMap = {
   // RH_GANONDORF_HINT is special cased due to being different based on master sword shuffle
   // Altar hints are special cased due to special hint marking rules
-  // warp song hints are special cased due to entrences not being done properly yet
+  // warp song hints are special cased due to entrances not being done properly yet
   // Ganondorf Joke is special Cased as the text is random
   {RH_SHEIK_HINT,          StaticHintInfo(HINT_TYPE_AREA,     {RHT_SHEIK_HINT_LA_ONLY},            RSK_SHEIK_LA_HINT,       true, {}, {RG_LIGHT_ARROWS},            {RC_SHEIK_HINT_GC, RC_SHEIK_HINT_MQ_GC}, true)},
   {RH_DAMPES_DIARY,        StaticHintInfo(HINT_TYPE_AREA,     {RHT_DAMPE_DIARY},                   RSK_DAMPES_DIARY_HINT,   true, {}, {RG_PROGRESSIVE_HOOKSHOT},    {RC_DAMPE_HINT})},

From 10921b2adead175cce01e760398a585aef2b3b2f Mon Sep 17 00:00:00 2001
From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Date: Tue, 8 Oct 2024 22:33:58 +0100
Subject: [PATCH 227/230] Unify Shops, Scrubs and Merchants price and hinting
 code (#4321)

* commiting to branch switch

* shop,scrubs and merchant code unified

* last cleanups

* Update soh/soh/Enhancements/randomizer/hook_handlers.cpp

Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>

* attempt to fix reviews DOES NOT BUILD

* TIL include order matters

* Update soh/soh/Enhancements/randomizer/3drando/shops.cpp

Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>

* Update soh/soh/Enhancements/randomizer/3drando/shops.cpp

Note to self, Don't code tired. *proceeds to ignore note*

Co-authored-by: Angelo Bulfone <boomshroom@users.noreply.github.com>

* fix typos

* post merge

* commiting to check something

* probably cleaned up, needs a doublecheck

* fix presets

* address reviews

* fix small shopsanity count oversights

* undo rename

---------

Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>
Co-authored-by: Angelo Bulfone <boomshroom@users.noreply.github.com>
Co-authored-by: Malkierian <malkierian@gmail.com>
---
 .../custom-message/CustomMessageManager.cpp   | 128 ++++--
 .../custom-message/CustomMessageManager.h     |   3 +-
 .../custom-message/CustomMessageTypes.h       |   9 +-
 .../Enhancements/debugger/debugSaveEditor.cpp |  11 +-
 .../game-interactor/GameInteractor.h          |   4 +
 soh/soh/Enhancements/presets.h                |  53 ++-
 .../randomizer/3drando/custom_messages.cpp    |   2 +-
 .../Enhancements/randomizer/3drando/fill.cpp  | 117 +++--
 .../randomizer/3drando/hint_list.cpp          |  43 --
 .../3drando/hint_list/hint_list_item.cpp      |   3 +
 .../Enhancements/randomizer/3drando/hints.cpp |   2 +-
 .../randomizer/3drando/item_pool.cpp          |  89 ++--
 .../randomizer/3drando/location_access.cpp    |  37 +-
 .../randomizer/3drando/location_access.hpp    |   2 +
 .../location_access/locacc_death_mountain.cpp |   2 +-
 .../location_access/locacc_gerudo_valley.cpp  |   4 +-
 .../location_access/locacc_kakariko.cpp       |   7 +-
 .../randomizer/3drando/playthrough.cpp        |   1 -
 .../Enhancements/randomizer/3drando/shops.cpp | 157 ++++---
 .../Enhancements/randomizer/3drando/shops.hpp |  33 +-
 .../randomizer/3drando/spoiler_log.cpp        | 198 +-------
 .../randomizer/3drando/spoiler_log.hpp        |  53 +--
 soh/soh/Enhancements/randomizer/context.cpp   |  12 -
 soh/soh/Enhancements/randomizer/hint.cpp      |  14 +-
 soh/soh/Enhancements/randomizer/hint.h        |   2 +-
 .../Enhancements/randomizer/hook_handlers.cpp |  88 +++-
 soh/soh/Enhancements/randomizer/item.cpp      |  17 +-
 .../Enhancements/randomizer/item_location.cpp |   1 +
 soh/soh/Enhancements/randomizer/location.cpp  |  21 +-
 soh/soh/Enhancements/randomizer/location.h    |  20 +-
 .../Enhancements/randomizer/location_list.cpp | 240 +++++-----
 .../randomizer/option_descriptions.cpp        | 113 ++++-
 .../Enhancements/randomizer/randomizer.cpp    | 175 +++++---
 soh/soh/Enhancements/randomizer/randomizer.h  |   4 +-
 .../Enhancements/randomizer/randomizerTypes.h |  66 ++-
 .../randomizer/randomizer_check_objects.cpp   |   2 +-
 .../randomizer/randomizer_check_tracker.cpp   |   6 +-
 .../randomizer/randomizer_item_tracker.cpp    |   8 +-
 soh/soh/Enhancements/randomizer/savefile.cpp  |   7 +
 soh/soh/Enhancements/randomizer/settings.cpp  | 422 ++++++++++++++++--
 soh/soh/Enhancements/randomizer/settings.h    |   5 +
 .../Enhancements/randomizer/static_data.cpp   |  13 +-
 soh/soh/Enhancements/randomizer/static_data.h |   1 +
 soh/soh/OTRGlobals.cpp                        |  72 +--
 soh/soh/z_message_OTR.cpp                     |   6 +-
 soh/src/overlays/actors/ovl_En_Ds/z_en_ds.c   |  12 +-
 soh/src/overlays/actors/ovl_En_Ds/z_en_ds.h   |   4 +
 soh/src/overlays/actors/ovl_En_Gm/z_en_gm.c   |   9 +-
 soh/src/overlays/actors/ovl_En_Gm/z_en_gm.h   |   2 +
 soh/src/overlays/actors/ovl_En_Js/z_en_js.c   |  21 +-
 soh/src/overlays/actors/ovl_En_Js/z_en_js.h   |   2 +
 51 files changed, 1403 insertions(+), 920 deletions(-)

diff --git a/soh/soh/Enhancements/custom-message/CustomMessageManager.cpp b/soh/soh/Enhancements/custom-message/CustomMessageManager.cpp
index 1386673d9..c24b83fb6 100644
--- a/soh/soh/Enhancements/custom-message/CustomMessageManager.cpp
+++ b/soh/soh/Enhancements/custom-message/CustomMessageManager.cpp
@@ -355,7 +355,7 @@ static size_t NextLineLength(const std::string* textStr, const size_t lastNewlin
   }
 }
 
-void CustomMessage::AutoFormatString(std::string& str) const {// did I do this right?
+void CustomMessage::AutoFormatString(std::string& str) const {
     ReplaceAltarIcons(str);
     ReplaceColors(str);
     // insert newlines either manually or when encountering a '&'
@@ -363,60 +363,86 @@ void CustomMessage::AutoFormatString(std::string& str) const {// did I do this r
     const bool hasIcon = str.find('$', 0) != std::string::npos;
     size_t lineLength = NextLineLength(&str, lastNewline, hasIcon);
     size_t lineCount = 1;
-    while (lastNewline + lineLength < str.length()) {
+    size_t yesNo = str.find("\x1B"s[0], lastNewline);
+    while (lastNewline + lineLength < str.length() || yesNo != std::string::npos) {
         const size_t carrot = str.find('^', lastNewline);
         const size_t ampersand = str.find('&', lastNewline);
         const size_t lastSpace = str.rfind(' ', lastNewline + lineLength);
-        if (lineCount < 4){
-            // replace '&' first if it's within the newline range
-            if (ampersand < lastNewline + lineLength) {
-                lastNewline = ampersand + 1;
-                // or move the lastNewline cursor to the next line if a '^' is encountered
-            } else if (carrot < lastNewline + lineLength) {
-                lastNewline = carrot + 1;
-                lineCount = 0;
-                // some lines need to be split but don't have spaces, look for periods instead
-            } else if (lastSpace == std::string::npos) {
-                const size_t lastPeriod = str.rfind('.', lastNewline + lineLength);
-                str.replace(lastPeriod, 1, ".&");
-                lastNewline = lastPeriod + 2;
-            } else {
-                str.replace(lastSpace, 1, "&");
-                lastNewline = lastSpace + 1;
-            }
-            lineCount += 1;
-        } else { 
-            const size_t lastColor = str.rfind("\x05"s, lastNewline + lineLength);
-            std::string colorText = "";
-            //check if we are on a non default colour, as ^ resets it, and readd if needed
-            if (lastColor != std::string::npos && str[lastColor+1] != 0){
-                colorText = "\x05"s + str[lastColor+1];
-            }
-            // replace '&' first if it's within the newline range
-            if (ampersand < lastNewline + lineLength) {
-                str.replace(ampersand, 1, "^" + colorText);
-                lastNewline = ampersand + 1;
-                // or move the lastNewline cursor to the next line if a '^' is encountered.
-            } else if (carrot < lastNewline + lineLength) {
-                lastNewline = carrot + 1;
-                // some lines need to be split but don't have spaces, look for periods instead
-            } else if (lastSpace == std::string::npos) {
-                const size_t lastPeriod = str.rfind('.', lastNewline + lineLength);
-                str.replace(lastPeriod, 1, ".^" + colorText);
-                lastNewline = lastPeriod + 2;
-            } else {
-                str.replace(lastSpace, 1, "^" + colorText);
-                lastNewline = lastSpace + 1;
-            }
-            lineCount = 1;
+        size_t waitForInput = str.find(WAIT_FOR_INPUT()[0], lastNewline);
+        size_t newLine = str.find(NEWLINE()[0], lastNewline);
+        if (carrot < waitForInput){
+            waitForInput = carrot;
         }
-        lineLength = NextLineLength(&str, lastNewline, hasIcon);
+        if (ampersand < newLine){
+            newLine = ampersand;
+        }
+        if (lineCount != 3 && yesNo < lastNewline + lineLength && yesNo < waitForInput && yesNo < newLine){
+            if (lineCount >= 4){
+                str.replace(yesNo, 1, "^&&\x1B");
+                lineCount = 3;
+                lastNewline = yesNo + 3;
+            } else {
+                while(lineCount < 3){
+                    str.replace(yesNo, 1, "&\x1B");
+                    yesNo++;
+                    lineCount++;
+                }
+                lastNewline = yesNo;
+            }
+        } else {
+            if (lineCount < 4){
+                // replace '&' first if it's within the newline range
+                if (newLine < lastNewline + lineLength) {
+                    lastNewline = newLine + 1;
+                    // or move the lastNewline cursor to the next line if a '^' is encountered
+                } else if (waitForInput < lastNewline + lineLength) {
+                    lastNewline = waitForInput + 1;
+                    lineCount = 0;
+                    // some lines need to be split but don't have spaces, look for periods instead
+                } else if (lastSpace == std::string::npos) {
+                    const size_t lastPeriod = str.rfind('.', lastNewline + lineLength);
+                    str.replace(lastPeriod, 1, ".&");
+                    lastNewline = lastPeriod + 2;
+                } else {
+                    str.replace(lastSpace, 1, "&");
+                    lastNewline = lastSpace + 1;
+                }
+                lineCount += 1;
+            } else { 
+                const size_t lastColor = str.rfind("\x05"s, lastNewline + lineLength);
+                std::string colorText = "";
+                //check if we are on a non default colour, as ^ resets it, and readd if needed
+                if (lastColor != std::string::npos && str[lastColor+1] != 0){
+                    colorText = "\x05"s + str[lastColor+1];
+                }
+                // replace '&' first if it's within the newline range
+                if (ampersand < lastNewline + lineLength) {
+                    str.replace(ampersand, 1, "^" + colorText);
+                    lastNewline = ampersand + 1;
+                    // or move the lastNewline cursor to the next line if a '^' is encountered.
+                } else if (carrot < lastNewline + lineLength) {
+                    lastNewline = carrot + 1;
+                    // some lines need to be split but don't have spaces, look for periods instead
+                } else if (lastSpace == std::string::npos) {
+                    const size_t lastPeriod = str.rfind('.', lastNewline + lineLength);
+                    str.replace(lastPeriod, 1, ".^" + colorText);
+                    lastNewline = lastPeriod + 2;
+                } else {
+                    str.replace(lastSpace, 1, "^" + colorText);
+                    lastNewline = lastSpace + 1;
+                }
+                lineCount = 1;
+            }
+            lineLength = NextLineLength(&str, lastNewline, hasIcon);
+        }
+        yesNo = str.find("\x1B"s[0], lastNewline);
     }
     ReplaceSpecialCharacters(str);
     ReplaceAltarIcons(str);
     std::replace(str.begin(), str.end(), '&', NEWLINE()[0]);
     std::replace(str.begin(), str.end(), '^', WAIT_FOR_INPUT()[0]);
     std::replace(str.begin(), str.end(), '@', PLAYER_NAME()[0]);
+    std::replace(str.begin(), str.end(), '_', " "[0]);
     str += MESSAGE_END();
 }
 
@@ -572,11 +598,10 @@ bool CustomMessageManager::CreateGetItemMessage(std::string tableID, uint16_t gi
 }
 
 bool CustomMessageManager::CreateMessage(std::string tableID, uint16_t textID, CustomMessage messageEntry) {
-    messageEntry.Format();
     return InsertCustomMessage(tableID, textID, messageEntry);
 }
 
-CustomMessage CustomMessageManager::RetrieveMessage(std::string tableID, uint16_t textID) {
+CustomMessage CustomMessageManager::RetrieveMessage(std::string tableID, uint16_t textID, MessageFormat format) {
     std::unordered_map<std::string, CustomMessageTable>::const_iterator foundMessageTable = messageTables.find(tableID);
     if (foundMessageTable == messageTables.end()) {
         throw(MessageNotFoundException(tableID, textID));
@@ -587,6 +612,15 @@ CustomMessage CustomMessageManager::RetrieveMessage(std::string tableID, uint16_
         throw(MessageNotFoundException(tableID, textID));
     }
     CustomMessage message = foundMessage->second;
+
+    if (format == MF_FORMATTED){
+        message.Format();
+    } else if (format == MF_AUTO_FORMAT){
+        message.AutoFormat();
+    } else if (format == MF_CLEAN){
+        message.Clean();
+    }
+    
     return message;
 }
 
diff --git a/soh/soh/Enhancements/custom-message/CustomMessageManager.h b/soh/soh/Enhancements/custom-message/CustomMessageManager.h
index 2c797e527..31455aa40 100644
--- a/soh/soh/Enhancements/custom-message/CustomMessageManager.h
+++ b/soh/soh/Enhancements/custom-message/CustomMessageManager.h
@@ -242,9 +242,10 @@ class CustomMessageManager {
      *
      * @param tableID the ID of the custom message table
      * @param textID the ID of the message you want to retrieve
+     * @param format the type of formatting to apply to the retrieved message
      * @return CustomMessage
      */
-    CustomMessage RetrieveMessage(std::string tableID, uint16_t textID);
+    CustomMessage RetrieveMessage(std::string tableID, uint16_t textID, MessageFormat format = MF_RAW);
 
     /**
      * @brief Empties out the message table identified by tableID.
diff --git a/soh/soh/Enhancements/custom-message/CustomMessageTypes.h b/soh/soh/Enhancements/custom-message/CustomMessageTypes.h
index fa8a4bb8a..4a039987e 100644
--- a/soh/soh/Enhancements/custom-message/CustomMessageTypes.h
+++ b/soh/soh/Enhancements/custom-message/CustomMessageTypes.h
@@ -1,6 +1,10 @@
 #pragma once
 
+#include "z64.h"
+#include "../include/macros.h"
+
 typedef enum {
+    TEXT_NONE = 0x000,
     TEXT_SKULLTULA_PEOPLE_CURSE_BROKEN = 0x0021,
     TEXT_SKULLTULA_PEOPLE_IM_CURSED = 0x0022,
     TEXT_SKULLTULA_PEOPLE_WELL_BE_CAREFUL = 0x0023,
@@ -182,9 +186,12 @@ typedef enum {
     TEXT_SCRUB_RANDOM = 0x9000,
     TEXT_SCRUB_RANDOM_FREE = 0x9001,
     TEXT_SHOP_ITEM_RANDOM = 0x9100,
-    TEXT_SHOP_ITEM_RANDOM_CONFIRM = 0x9101,
+    TEXT_SHOP_ITEM_RANDOM_CONFIRM = 0x9100 + NUM_SHOP_ITEMS,
+    TEXT_SHOP_ITEM_RANDOM_CONFIRM_END = 0x9100 + (NUM_SHOP_ITEMS * 2) - 1,
     TEXT_WARP_RANDOM_REPLACED_TEXT = 0x9200,
     TEXT_SHOOTING_GALLERY_MAN_COME_BACK_WITH_BOW = 0x9210,
+    TEXT_CARPET_SALESMAN_MYSTERIOUS = 0x9211,
+    TEXT_CARPET_SALESMAN_ARMS_DEALER = 0x9212,
 } TextIDs;
 
 #ifdef __cplusplus
diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp
index 46f142054..930515ab6 100644
--- a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp
+++ b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp
@@ -1320,16 +1320,7 @@ void DrawEquipmentTab() {
         "Giant (500)",
     };
     // only display Tycoon wallet if you're in a save file that would allow it.
-    if (
-        IS_RANDO &&
-        !(
-            OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHOPSANITY) == RO_SHOPSANITY_OFF ||
-            (
-                OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHOPSANITY) == RO_SHOPSANITY_SPECIFIC_COUNT &&
-                OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHOPSANITY_COUNT) == RO_SHOPSANITY_COUNT_ZERO_ITEMS
-            )
-        )
-    ) {
+    if (IS_RANDO && OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_INCLUDE_TYCOON_WALLET)) {
         const std::string walletName = "Tycoon (999)";
         walletNamesImpl.push_back(walletName);
     }
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h
index 1a86987f8..57fc9cf35 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h
@@ -184,6 +184,8 @@ typedef enum {
     // Opt: *EnMk
     // Vanilla condition: Flags_GetItemGetInf(ITEMGETINF_30)
     VB_OFFER_BLUE_POTION,
+    VB_GRANNY_SAY_INSUFFICIENT_RUPEES,
+    VB_GRANNY_TAKE_MONEY,
     // Vanilla condition: Inventory_HasEmptyBottle() == 0
     VB_NEED_BOTTLE_FOR_GRANNYS_ITEM,
     // Opt: *EnNiwLady
@@ -369,9 +371,11 @@ typedef enum {
     // Opt: *EnGo2
     VB_GIVE_ITEM_FROM_GORON,
     // Opt: *EnJs
+    VB_CHECK_RANDO_PRICE_OF_CARPET_SALESMAN,
     VB_GIVE_ITEM_FROM_CARPET_SALESMAN,
     VB_GIVE_BOMBCHUS_FROM_CARPET_SALESMAN,
     // Opt: *EnGm
+    VB_CHECK_RANDO_PRICE_OF_MEDIGORON,
     VB_GIVE_ITEM_FROM_MEDIGORON,
     // Opt: *EnMs
     VB_GIVE_ITEM_FROM_MAGIC_BEAN_SALESMAN,
diff --git a/soh/soh/Enhancements/presets.h b/soh/soh/Enhancements/presets.h
index 53f41daad..b05af71d5 100644
--- a/soh/soh/Enhancements/presets.h
+++ b/soh/soh/Enhancements/presets.h
@@ -437,10 +437,18 @@ const std::vector<const char*> randomizerCvars = {
     CVAR_RANDOMIZER_SETTING("RewardCount"),
     CVAR_RANDOMIZER_SETTING("ScrubText"),
     CVAR_RANDOMIZER_SETTING("Shopsanity"),
+    CVAR_RANDOMIZER_SETTING("ShopsanityCount"),
     CVAR_RANDOMIZER_SETTING("ShopsanityPrices"),
+    CVAR_RANDOMIZER_SETTING("ShopsanityFixedPrice"),
+    CVAR_RANDOMIZER_SETTING("ShopsanityPriceRange1"),
+    CVAR_RANDOMIZER_SETTING("ShopsanityPriceRange2"),
+    CVAR_RANDOMIZER_SETTING("ShopsanityNoWalletWeight"),
+    CVAR_RANDOMIZER_SETTING("ShopsanityChildWalletWeight"),
+    CVAR_RANDOMIZER_SETTING("ShopsanityAdultWalletWeight"),
+    CVAR_RANDOMIZER_SETTING("ShopsanityGiantWalletWeight"),
+    CVAR_RANDOMIZER_SETTING("ShopsanityTycoonWalletWeight"),
     CVAR_RANDOMIZER_SETTING("ShopsanityPricesAffordable"),
     CVAR_RANDOMIZER_SETTING("ShuffleAdultTrade"),
-    CVAR_RANDOMIZER_SETTING("ShuffleBeans"),
     CVAR_RANDOMIZER_SETTING("ShuffleBossEntrances"),
     CVAR_RANDOMIZER_SETTING("ShuffleCows"),
     CVAR_RANDOMIZER_SETTING("ShuffleDungeonReward"),
@@ -464,11 +472,29 @@ const std::vector<const char*> randomizerCvars = {
     CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsWaterTemple"),
     CVAR_RANDOMIZER_SETTING("ShuffleKokiriSword"),
     CVAR_RANDOMIZER_SETTING("ShuffleMerchants"),
+    CVAR_RANDOMIZER_SETTING("MerchantFixedPrice"),
+    CVAR_RANDOMIZER_SETTING("MerchantPriceRange1"),
+    CVAR_RANDOMIZER_SETTING("MerchantPriceRange2"),
+    CVAR_RANDOMIZER_SETTING("MerchantNoWalletWeight"),
+    CVAR_RANDOMIZER_SETTING("MerchantChildWalletWeight"),
+    CVAR_RANDOMIZER_SETTING("MerchantAdultWalletWeight"),
+    CVAR_RANDOMIZER_SETTING("MerchantGiantWalletWeight"),
+    CVAR_RANDOMIZER_SETTING("MerchantTycoonWalletWeight"),
+    CVAR_RANDOMIZER_SETTING("MerchantPricesAffordable"),
     CVAR_RANDOMIZER_SETTING("ShuffleOcarinas"),
     CVAR_RANDOMIZER_SETTING("ShuffleOverworldEntrances"),
     CVAR_RANDOMIZER_SETTING("ShuffleOverworldSpawns"),
     CVAR_RANDOMIZER_SETTING("ShuffleOwlDrops"),
     CVAR_RANDOMIZER_SETTING("ShuffleScrubs"),
+    CVAR_RANDOMIZER_SETTING("ScrubsFixedPrice"),
+    CVAR_RANDOMIZER_SETTING("ScrubsPriceRange1"),
+    CVAR_RANDOMIZER_SETTING("ScrubsPriceRange2"),
+    CVAR_RANDOMIZER_SETTING("ScrubsNoWalletWeight"),
+    CVAR_RANDOMIZER_SETTING("ScrubsChildWalletWeight"),
+    CVAR_RANDOMIZER_SETTING("ScrubsAdultWalletWeight"),
+    CVAR_RANDOMIZER_SETTING("ScrubstGiantWalletWeight"),
+    CVAR_RANDOMIZER_SETTING("ScrubsTycoonWalletWeight"),
+    CVAR_RANDOMIZER_SETTING("ScrubsPricesAffordable"),
     CVAR_RANDOMIZER_SETTING("ShuffleSongs"),
     CVAR_RANDOMIZER_SETTING("ShuffleTokens"),
     CVAR_RANDOMIZER_SETTING("ShuffleWarpSongs"),
@@ -955,12 +981,16 @@ const std::vector<PresetEntry> spockRacePresetEntries = {
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("LacsRewardCount"), 5),
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("RainbowBridge"), RO_BRIDGE_GREG),
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ScrubText"), 1),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("IncludeTycoonWallet"), 1),
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("Shopsanity"), RO_SHOPSANITY_RANDOM),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShopsanityPrices"), RO_PRICE_BALANCED),
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleGanonBossKey"), RO_GANON_BOSS_KEY_LACS_REWARDS),
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleKeyRings"), RO_KEYRINGS_COUNT),
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleKokiriSword"), 1),
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleOcarinas"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleScrubs"), RO_SCRUBS_AFFORDABLE),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleScrubs"), RO_SCRUBS_ALL),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ScrubsPrice"), RO_PRICE_FIXED),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ScrubsFixedPrice"), 10),
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("SkipChildStealth"), 1),
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("SkipChildZelda"), 1),
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("SkipEponaRace"), 1),
@@ -1037,9 +1067,12 @@ const std::vector<PresetEntry> spockRaceNoLogicPresetEntries = {
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("LogicRules"), RO_LOGIC_NO_LOGIC),
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("RainbowBridge"), RO_BRIDGE_GREG),
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ScrubText"), 1),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("IncludeTycoonWallet"), 1),
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("Shopsanity"), RO_SHOPSANITY_RANDOM),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShopsanityPrices"), RO_PRICE_BALANCED),
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleAdultTrade"), 0),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleBeans"), 1),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleMerchants"), RO_SHUFFLE_MERCHANTS_BEANS_ONLY),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleMerchantPrices"), RO_PRICE_VANILLA),
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleGanonBossKey"), RO_GANON_BOSS_KEY_LACS_REWARDS),
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleGerudoToken"), 1),
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleKeyRings"), RO_KEYRINGS_COUNT),
@@ -1121,11 +1154,15 @@ const std::vector<PresetEntry> hellModePresetEntries = {
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("LinksPocket"), RO_LINKS_POCKET_NOTHING),
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("MQDungeons"), RO_MQ_DUNGEONS_RANDOM_NUMBER),
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("RainbowBridge"), RO_BRIDGE_DUNGEON_REWARDS),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("IncludeTycoonWallet"), 1),
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("Shopsanity"), RO_SHOPSANITY_SPECIFIC_COUNT),
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShopsanityCount"), RO_SHOPSANITY_COUNT_FOUR_ITEMS),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShopsanityPrices"), RO_SHOPSANITY_PRICE_TYCOON),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShopsanityPrices"), RO_PRICE_RANGE),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShopsanityPriceRange1"), 0),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShopsanityPriceRange2"), 999),
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleAdultTrade"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleBeans"), 1),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleMerchants"), RO_SHUFFLE_MERCHANTS_BEANS_ONLY),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleMerchantPrices"), RO_PRICE_VANILLA),
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleCows"), 1),
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleDungeonReward"), RO_DUNGEON_REWARDS_ANYWHERE),
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleFrogSongRupees"), 1),
@@ -1135,7 +1172,8 @@ const std::vector<PresetEntry> hellModePresetEntries = {
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleKokiriSword"), 1),
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleMasterSword"), 1),
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleOcarinas"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleScrubs"), RO_SCRUBS_RANDOM),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleScrubs"), RO_SCRUBS_ALL),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ScrubsPrice"), RO_PRICE_CHEAP_BALANCED),
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleSongs"), RO_SONG_SHUFFLE_ANYWHERE),
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleTokens"), RO_TOKENSANITY_ALL),
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleWeirdEgg"), 1),
@@ -1178,7 +1216,8 @@ const std::vector<PresetEntry> BenchmarkPresetEntries = {
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleDungeonReward"), RO_DUNGEON_REWARDS_END_OF_DUNGEON),
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("LinksPocket"), RO_LINKS_POCKET_DUNGEON_REWARD),
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleSongs"), RO_SONG_SHUFFLE_ANYWHERE),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("Shopsanity"), RO_SHOPSANITY_COUNT_FOUR_ITEMS),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("Shopsanity"), RO_SHOPSANITY_SPECIFIC_COUNT),
+    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShopsanityCount"), RO_SHOPSANITY_COUNT_FOUR_ITEMS),
     //RANDOTODO add refactored price/scrub/merchant settings
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleTokens"), RO_TOKENSANITY_OFF),
     PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleBeehives"), RO_GENERIC_ON),
diff --git a/soh/soh/Enhancements/randomizer/3drando/custom_messages.cpp b/soh/soh/Enhancements/randomizer/3drando/custom_messages.cpp
index c00ec8840..64b75b670 100644
--- a/soh/soh/Enhancements/randomizer/3drando/custom_messages.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/custom_messages.cpp
@@ -1,5 +1,5 @@
 #include "custom_messages.hpp"
-#include "shops.hpp"
+#include "../../custom-message/CustomMessageManager.h"
 #include "z64item.h"
 
 #include <array>
diff --git a/soh/soh/Enhancements/randomizer/3drando/fill.cpp b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
index c15e2e742..4d055f1b1 100644
--- a/soh/soh/Enhancements/randomizer/3drando/fill.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
@@ -24,6 +24,40 @@ using namespace Rando;
 
 static bool placementFailure = false;
 
+
+PriceSettingsStruct shopsanityPrices = {RSK_SHOPSANITY_PRICES, 
+                                        RSK_SHOPSANITY_PRICES_FIXED_PRICE,
+                                        RSK_SHOPSANITY_PRICES_RANGE_1,
+                                        RSK_SHOPSANITY_PRICES_RANGE_2,
+                                        RSK_SHOPSANITY_PRICES_NO_WALLET_WEIGHT,
+                                        RSK_SHOPSANITY_PRICES_CHILD_WALLET_WEIGHT,
+                                        RSK_SHOPSANITY_PRICES_ADULT_WALLET_WEIGHT,
+                                        RSK_SHOPSANITY_PRICES_GIANT_WALLET_WEIGHT,
+                                        RSK_SHOPSANITY_PRICES_TYCOON_WALLET_WEIGHT,
+                                        RSK_SHOPSANITY_PRICES_AFFORDABLE};
+  
+PriceSettingsStruct scrubPrices = {RSK_SCRUBS_PRICES, 
+                                   RSK_SCRUBS_PRICES_FIXED_PRICE,
+                                   RSK_SCRUBS_PRICES_RANGE_1,
+                                   RSK_SCRUBS_PRICES_RANGE_2,
+                                   RSK_SCRUBS_PRICES_NO_WALLET_WEIGHT,
+                                   RSK_SCRUBS_PRICES_CHILD_WALLET_WEIGHT,
+                                   RSK_SCRUBS_PRICES_ADULT_WALLET_WEIGHT,
+                                   RSK_SCRUBS_PRICES_GIANT_WALLET_WEIGHT,
+                                   RSK_SCRUBS_PRICES_TYCOON_WALLET_WEIGHT,
+                                   RSK_SCRUBS_PRICES_AFFORDABLE};
+
+PriceSettingsStruct merchantPrices = {RSK_MERCHANT_PRICES, 
+                                      RSK_MERCHANT_PRICES_FIXED_PRICE,
+                                      RSK_MERCHANT_PRICES_RANGE_1,
+                                      RSK_MERCHANT_PRICES_RANGE_2,
+                                      RSK_MERCHANT_PRICES_NO_WALLET_WEIGHT,
+                                      RSK_MERCHANT_PRICES_CHILD_WALLET_WEIGHT,
+                                      RSK_MERCHANT_PRICES_ADULT_WALLET_WEIGHT,
+                                      RSK_MERCHANT_PRICES_GIANT_WALLET_WEIGHT,
+                                      RSK_MERCHANT_PRICES_TYCOON_WALLET_WEIGHT,
+                                      RSK_MERCHANT_PRICES_AFFORDABLE};
+
 static void RemoveStartingItemsFromPool() {
   for (RandomizerGet startingItem : StartingInventory) {
     for (size_t i = 0; i < ItemPool.size(); i++) {
@@ -1133,7 +1167,6 @@ int Fill() {
     //Place shop items first, since a buy shield is needed to place a dungeon reward on Gohma due to access
 
     StartPerformanceTimer(PT_SHOPSANITY);
-    NonShopItems.clear();
     if (ctx->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_OFF)) {
       SPDLOG_INFO("Placing Vanilla Shop Items...");
       PlaceVanillaShopItems(); //Place vanilla shop items in vanilla location
@@ -1154,17 +1187,10 @@ int Fill() {
           total_replaced += num_to_replace;
           for (int j = 0; j < num_to_replace; j++) {
             int itemindex = indices[j];
-            int shopsanityPrice = GetRandomShopPrice();
-            NonShopItems[Rando::StaticData::GetShopLocations()[i * LOCATIONS_PER_SHOP + itemindex - 1]].Price = shopsanityPrice; // Set price to be retrieved by the patch and textboxes
-            ctx->GetItemLocation(Rando::StaticData::GetShopLocations()[i * LOCATIONS_PER_SHOP + itemindex - 1])->SetCustomPrice(shopsanityPrice);
-          }
-          for (int j = num_to_replace; j < 8; j++) {
-            ItemAndPrice init;
-            init.Name = Text { "No Item", "Sin objeto", "Pas d'objet" };
-            init.Price = -1;
-            init.Repurchaseable = false;
-            int itemindex = indices[j];
-            NonShopItems[Rando::StaticData::GetShopLocations()[i * LOCATIONS_PER_SHOP + itemindex - 1]] = init; // Set price to be retrieved by the patch and textboxes
+            RandomizerCheck rc = Rando::StaticData::GetShopLocations()[i * LOCATIONS_PER_SHOP + itemindex - 1];
+            Rando::ItemLocation* itemLoc = ctx->GetItemLocation(rc);
+            uint16_t shopsanityPrice = GetRandomPrice(Rando::StaticData::GetLocation(rc), shopsanityPrices);
+            itemLoc->SetCustomPrice(shopsanityPrice);
           }
         }
         #undef LOCATIONS_PER_SHOP
@@ -1183,6 +1209,51 @@ int Fill() {
       //Place the shop items which will still be at shop locations
       AssumedFill(shopItems, shopLocations);
     }
+
+    //Add prices to scrubs
+    auto scrubLoc = Rando::StaticData::GetScrubLocations();
+    if (ctx->GetOption(RSK_SHUFFLE_SCRUBS).Is(RO_SCRUBS_ALL)) {
+      for (size_t i = 0; i < scrubLoc.size(); i++) {
+        ctx->GetItemLocation(scrubLoc[i])->SetCustomPrice(
+          GetRandomPrice(Rando::StaticData::GetLocation(scrubLoc[i]), scrubPrices)
+        );
+      }
+    } else {
+      for (size_t i = 0; i < scrubLoc.size(); i++) {
+        ctx->GetItemLocation(scrubLoc[i])->SetCustomPrice(
+          Rando::StaticData::GetLocation(scrubLoc[i])->GetVanillaPrice()
+        );
+      }
+    }
+
+    //set merchant prices
+    if (ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_BEANS_ONLY) ||
+        ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ALL)){
+      ctx->GetItemLocation(RC_ZR_MAGIC_BEAN_SALESMAN)->SetCustomPrice(
+        GetRandomPrice(Rando::StaticData::GetLocation(RC_ZR_MAGIC_BEAN_SALESMAN), merchantPrices)
+      );
+    } else {
+      ctx->GetItemLocation(RC_ZR_MAGIC_BEAN_SALESMAN)->SetCustomPrice(
+        Rando::StaticData::GetLocation(RC_ZR_MAGIC_BEAN_SALESMAN)->GetVanillaPrice()
+      );
+    }
+
+    auto merchantLoc = Rando::StaticData::GetMerchantLocations();
+
+    if (ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ALL_BUT_BEANS) ||
+        ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ALL)){
+      for (size_t i = 0; i < merchantLoc.size(); i++) {
+        ctx->GetItemLocation(merchantLoc[i])->SetCustomPrice(
+          GetRandomPrice(Rando::StaticData::GetLocation(merchantLoc[i]), merchantPrices)
+        );
+      }
+    } else {
+      for (size_t i = 0; i < merchantLoc.size(); i++) {
+        ctx->GetItemLocation(merchantLoc[i])->SetCustomPrice(
+          Rando::StaticData::GetLocation(merchantLoc[i])->GetVanillaPrice()
+        );
+      }
+    }
     StopPerformanceTimer(PT_SHOPSANITY);
 
     StartPerformanceTimer(PT_OWN_DUNGEON);
@@ -1245,28 +1316,6 @@ int Fill() {
     FastFill(remainingPool, GetAllEmptyLocations(), false);
     StopPerformanceTimer(PT_REMAINING_ITEMS);
 
-    //Add default prices to scrubs
-    for (RandomizerCheck& randomizerCheck : Rando::StaticData::GetScrubLocations()) {
-      if (randomizerCheck == RC_LW_DEKU_SCRUB_NEAR_BRIDGE || randomizerCheck == RC_LW_DEKU_SCRUB_GROTTO_FRONT) {
-        ctx->GetItemLocation(randomizerCheck)->SetCustomPrice(40);
-      } else if (randomizerCheck == RC_HF_DEKU_SCRUB_GROTTO) {
-        ctx->GetItemLocation(randomizerCheck)->SetCustomPrice(10);
-      } else {
-        auto loc = Rando::StaticData::GetLocation(randomizerCheck);
-        auto item = Rando::StaticData::RetrieveItem(loc->GetVanillaItem());
-        ctx->GetItemLocation(randomizerCheck)->SetCustomPrice(item.GetPrice());
-      }
-    }
-
-    if (ctx->GetOption(RSK_SHUFFLE_SCRUBS).Is(RO_SCRUBS_AFFORDABLE)) {
-      for (RandomizerCheck& randomizerCheck : Rando::StaticData::GetScrubLocations()) {
-        ctx->GetItemLocation(randomizerCheck)->SetCustomPrice(10);
-      }
-    } else if (ctx->GetOption(RSK_SHUFFLE_SCRUBS).Is(RO_SCRUBS_RANDOM)) {
-      for (RandomizerCheck& randomizerCheck : Rando::StaticData::GetScrubLocations()) {
-        ctx->GetItemLocation(randomizerCheck)->SetCustomPrice(GetRandomScrubPrice());
-      }
-    }
 
     StartPerformanceTimer(PT_PLAYTHROUGH_GENERATION);
     GeneratePlaythrough();
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
index 4d32d3c00..db934b846 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
@@ -2769,49 +2769,6 @@ void StaticData::HintTable_Init() {
     |   STATIC LOCATION HINTS   |
     ---------------------------*/
 
-    hintTextTable[RHT_MEDIGORON_HINT] = HintText(CustomMessage("How about buying #[[1]]# for #200 Rupees#?&" + TWO_WAY_CHOICE() + "#Buy&Don't buy#",
-                                                    /*german*/ "Möchtest Du #[[1]]# für #200 Rubine# kaufen?&" + TWO_WAY_CHOICE() + "#Klar!&Nie im Leben!#",
-                                                    /*french*/ "Veux-tu acheter #[[1]]# pour #200 rubis#?&" + TWO_WAY_CHOICE() + "#Acheter&Ne pas acheter#",
-                                                               {QM_GREEN, QM_YELLOW, QM_GREEN}));
-                                                /*spanish*/ // ¿Me compras #[[1]]# por #200 rupias#?&" + TWO_WAY_CHOICE() + "#Comprar&No comprar#
-
-    hintTextTable[RHT_CARPET_SALESMAN_DIALOG_FIRST] = HintText(CustomMessage("Welcome!^I am selling stuff, strange and rare, from all over the world to everybody. Today's special is...^",
-                                                                  /*german*/ "Sei gegrüßt!^Ich verkaufe allerlei Kuriositäten. Stets sonderliche und seltene Ware aus "
-                                                                             "aller Welt für jedermann. Das heutige Angebot bleibt...^#",
-                                                                  /*french*/ "Bienvenue!^Je vends des objets rares et merveilleux du monde entier. En spécial aujourd'hui...^"));
-                                                              /*spanish*/ // ¡Acércate!^Vendo productos extraños y difíciles de encontrar... De todo el mundo a todo el mundo. La oferta de hoy es...^#¡
-
-    hintTextTable[RHT_CARPET_SALESMAN_DIALOG_MYSTERIOUS] = HintText(CustomMessage("Terrifying! I won't tell you what it is until I see the #money#...^How about #200 Rupees#?&&" +
-                                                                                  TWO_WAY_CHOICE() + "#Buy&Don't buy#",
-                                                                       /*german*/ "Furchterregend, oder? Ich erzähle Euch mehr, wenn ich #Geld# sehe...^Wie wär's mit #200 Rubinen#?&&" +
-                                                                                  TWO_WAY_CHOICE() + "#Aber sicher!&Ich bin weg!#",
-                                                                       /*french*/ "Un concentré de puissance! Mais montre tes #rubis# avant que je te dise ce que c'est...^Disons #200 "
-                                                                                  "rubis#?&&" + TWO_WAY_CHOICE() + "#Acheter&Ne pas acheter#",
-                                                                                  {QM_RED, QM_YELLOW, QM_GREEN}));
-                                                                   /*spanish*/ // ¡Terrorífico! No te revelaré su nombre hasta que vea el #dinero#...^#200 rupias#, ¿qué te parece?&&" +
-                                                                               // TWO_WAY_CHOICE() + "#Comprar&No comprar#
-
-    hintTextTable[RHT_CARPET_SALESMAN_DIALOG_HINTED] = HintText(CustomMessage("#[[1]]!# It's real, I promise! A lonely man such as myself wouldn't #lie# to you, hmm?^"
-                                                                              "How about #200 Rupees#?&&" + TWO_WAY_CHOICE() + "#Buy&Don't buy#",
-                                                                  /*german*/ "#[[1]]#! Ich kann versichern, es ist ein aufrichtiges Angebot!^Ein einsamer Mann wie ich würde Dich doch "
-                                                                             "nicht #anlügen#, oder?^Wie wär's mit #200 Rubinen#?&&" + TWO_WAY_CHOICE() + "#Aber sicher!&Ich bin weg!#",
-                                                                  /*french*/ "#[[1]]!# C'est vrai! J'te jure! Un gars comme moi ne te #mentirai# pas tu ne crois pas?^Disons #200 "
-                                                                             "rubis#?&&" + TWO_WAY_CHOICE() + "#Acheter&Ne pas acheter#",
-                                                                             {QM_GREEN, QM_YELLOW, QM_GREEN}));
-
-    hintTextTable[RHT_BEAN_SALESMAN_HINT] = HintText(CustomMessage("I tried to be a #magic bean# salesman, but it turns out my marketing skills weren't worth "
-                                                                   "beans!^Anyway, want to buy #[[1]]# for #60 Rupees#?&" + TWO_WAY_CHOICE() + "#Yes&No#",
-                                                        /*german*/ "Möchten Sie #[[1]]# für #60 Rubine# kaufen?&" + TWO_WAY_CHOICE() + "#Ja&Nein#",
-                                                        /*french*/ "J'ai essayé d'être un vendeur de #haricots magiques#, mais j'étais mauvais au niveau du marketing et ça "
-                                                                   "me courait sur le haricot...^Enfin bref, ça te dirait de m'acheter #[[1]]# pour #60 Rubis#?&" + TWO_WAY_CHOICE() + "#Oui&Non#",
-                                                                   {QM_RED, QM_GREEN, QM_YELLOW, QM_GREEN}));
-
-    hintTextTable[RHT_GRANNY_HINT] = HintText(CustomMessage("#[[1]]#! How about #100 Rupees#?&" + TWO_WAY_CHOICE() + "#Buy&Don't buy#",
-                                                /*german*/ "#[[1]]#! Sagen wir #100 Rubine#?&" + TWO_WAY_CHOICE() + "#Gerne!&Auf keinen Fall!#",
-                                                /*french*/ "#[[1]]#! Que dis-tu de #100 rubis#?&" + TWO_WAY_CHOICE() + "#Acheter&Ne pas acheter#",
-                                                           {QM_GREEN, QM_YELLOW, QM_GREEN}, {true}));
-                                             // /*spanish*/#[[1]]#. Vendo por #100 rupias#.&" + TWO_WAY_CHOICE() + "#Comprar&No comprar#
-
     hintTextTable[RHT_HBA_HINT_SIGN] = HintText(CustomMessage("#Horseback Archery# Range Prizes:&1000: #[[1]]#&1500: #[[2]]#^@'s Record: #" + CustomMessage::POINTS(HS_HORSE_ARCHERY) + "#",
                                                               {QM_RED, QM_GREEN, QM_GREEN, QM_GREEN}, {}, TEXTBOX_TYPE_WOODEN));
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp
index f9aa2a280..60464746c 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp
@@ -2127,6 +2127,9 @@ void StaticData::HintTable_Init_Item() {
 
     hintTextTable[RHT_MYSTERIOUS_ITEM] = HintText(CustomMessage("mysterious item", /*german*/"mysteriöser Gegenstand", /*french*/"objet mystérieux"));
                                                   // /*spanish*/algo misterioso
+               
+     hintTextTable[RHT_MYSTERIOUS_ITEM_CAPITAL] = HintText(CustomMessage("Mysterious Item", /*german*/"Mysteriöser Gegenstand", /*french*/"Objet Mystérieux"));
+                                                  // /*spanish*/Algo Misterioso
 
 }
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.cpp b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
index 9b4eeedf8..0e32813b0 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hints.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
@@ -533,7 +533,7 @@ int32_t getRandomWeight(int32_t totalWeight){
 static void DistributeHints(std::vector<uint8_t>& selected, size_t stoneCount, std::vector<HintDistributionSetting> distTable, uint8_t junkWieght, bool addFixed = true){
   int32_t totalWeight = junkWieght; //Start with our Junk Weight, the natural chance of a junk hint
 
-  for (size_t c=0; c < distTable.size(); c++){ //Gather the wieghts of each distribution and, if it's the first pass, apply fixed hints
+  for (size_t c=0; c < distTable.size(); c++){ //Gather the weights of each distribution and, if it's the first pass, apply fixed hints
     totalWeight += distTable[c].weight;         //Note that PlaceHints will set weights of distributions to zero if it can't place anything from them
     if (addFixed){
       selected[c] += distTable[c].fixed;
diff --git a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
index a2878f78c..08a9a5179 100644
--- a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
@@ -358,7 +358,7 @@ const std::array<RandomizerGet, 28> shopsanityRupees = {
   RG_HUGE_RUPEE,
   RG_HUGE_RUPEE,
   RG_HUGE_RUPEE,
-  RG_PROGRESSIVE_WALLET,
+  RG_HUGE_RUPEE,
 };
 const std::array<RandomizerGet, 19> dekuScrubItems = {
   RG_DEKU_NUTS_5,
@@ -471,61 +471,67 @@ void PlaceJunkInExcludedLocation(const RandomizerCheck il) {
   SPDLOG_ERROR("ERROR: No Junk to Place!!!");
 }
 
-static void PlaceVanillaDekuScrubItems() {
+static void PlaceVanillaDekuScrubItems(bool junkOneTimeScrubs) {
     auto ctx = Rando::Context::GetInstance();
+    if (junkOneTimeScrubs){
+      ctx->PlaceItemInLocation(RC_LW_DEKU_SCRUB_GROTTO_FRONT,          RG_BLUE_RUPEE, false, true);
+      ctx->PlaceItemInLocation(RC_LW_DEKU_SCRUB_NEAR_BRIDGE,           RG_BLUE_RUPEE, false, true);
+      ctx->PlaceItemInLocation(RC_HF_DEKU_SCRUB_GROTTO,                RG_BLUE_RUPEE, false, true);
+    }
+
     ctx->PlaceItemInLocation(RC_ZR_DEKU_SCRUB_GROTTO_REAR,             RG_RED_POTION_REFILL, false, true);
     ctx->PlaceItemInLocation(RC_ZR_DEKU_SCRUB_GROTTO_FRONT,            RG_GREEN_POTION_REFILL, false, true);
     ctx->PlaceItemInLocation(RC_SFM_DEKU_SCRUB_GROTTO_REAR,            RG_RED_POTION_REFILL, false, true);
     ctx->PlaceItemInLocation(RC_SFM_DEKU_SCRUB_GROTTO_FRONT,           RG_GREEN_POTION_REFILL, false, true);
-    ctx->PlaceItemInLocation(RC_LH_DEKU_SCRUB_GROTTO_LEFT,             RG_DEKU_NUTS_5, false, true);
-    ctx->PlaceItemInLocation(RC_LH_DEKU_SCRUB_GROTTO_RIGHT,            RG_BOMBS_5, false, true);
-    ctx->PlaceItemInLocation(RC_LH_DEKU_SCRUB_GROTTO_CENTER,           RG_DEKU_SEEDS_30, false, true);
+    ctx->PlaceItemInLocation(RC_LH_DEKU_SCRUB_GROTTO_LEFT,             RG_BUY_DEKU_NUTS_5, false, true);
+    ctx->PlaceItemInLocation(RC_LH_DEKU_SCRUB_GROTTO_RIGHT,            RG_BUY_BOMBS_535, false, true);
+    ctx->PlaceItemInLocation(RC_LH_DEKU_SCRUB_GROTTO_CENTER,           RG_BUY_DEKU_SEEDS_30, false, true);
     ctx->PlaceItemInLocation(RC_GV_DEKU_SCRUB_GROTTO_REAR,             RG_RED_POTION_REFILL, false, true);
     ctx->PlaceItemInLocation(RC_GV_DEKU_SCRUB_GROTTO_FRONT,            RG_GREEN_POTION_REFILL, false, true);
-    ctx->PlaceItemInLocation(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT, RG_DEKU_NUTS_5, false, true);
-    ctx->PlaceItemInLocation(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT,  RG_DEKU_STICK_1, false, true);
-    ctx->PlaceItemInLocation(RC_LW_DEKU_SCRUB_GROTTO_REAR,             RG_DEKU_SEEDS_30, false, true);
+    ctx->PlaceItemInLocation(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT, RG_BUY_DEKU_NUTS_5, false, true);
+    ctx->PlaceItemInLocation(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT,  RG_BUY_DEKU_STICK_1, false, true);
+    ctx->PlaceItemInLocation(RC_LW_DEKU_SCRUB_GROTTO_REAR,             RG_BUY_DEKU_SEEDS_30, false, true);
     ctx->PlaceItemInLocation(RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,       RG_RED_POTION_REFILL, false, true);
     ctx->PlaceItemInLocation(RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT,      RG_GREEN_POTION_REFILL, false, true);
-    ctx->PlaceItemInLocation(RC_DMC_DEKU_SCRUB,                        RG_BOMBS_5, false, true);
-    ctx->PlaceItemInLocation(RC_DMC_DEKU_SCRUB_GROTTO_LEFT,            RG_DEKU_NUTS_5, false, true);
-    ctx->PlaceItemInLocation(RC_DMC_DEKU_SCRUB_GROTTO_RIGHT,           RG_BOMBS_5, false, true);
-    ctx->PlaceItemInLocation(RC_DMC_DEKU_SCRUB_GROTTO_CENTER,          RG_DEKU_SEEDS_30, false, true);
-    ctx->PlaceItemInLocation(RC_GC_DEKU_SCRUB_GROTTO_LEFT,             RG_DEKU_NUTS_5, false, true);
-    ctx->PlaceItemInLocation(RC_GC_DEKU_SCRUB_GROTTO_RIGHT,            RG_BOMBS_5, false, true);
-    ctx->PlaceItemInLocation(RC_GC_DEKU_SCRUB_GROTTO_CENTER,           RG_DEKU_SEEDS_30, false, true);
-    ctx->PlaceItemInLocation(RC_LLR_DEKU_SCRUB_GROTTO_LEFT,            RG_DEKU_NUTS_5, false, true);
-    ctx->PlaceItemInLocation(RC_LLR_DEKU_SCRUB_GROTTO_RIGHT,           RG_BOMBS_5, false, true);
-    ctx->PlaceItemInLocation(RC_LLR_DEKU_SCRUB_GROTTO_CENTER,          RG_DEKU_SEEDS_30, false, true);
+    ctx->PlaceItemInLocation(RC_DMC_DEKU_SCRUB,                        RG_BUY_BOMBS_535, false, true);
+    ctx->PlaceItemInLocation(RC_DMC_DEKU_SCRUB_GROTTO_LEFT,            RG_BUY_DEKU_NUTS_5, false, true);
+    ctx->PlaceItemInLocation(RC_DMC_DEKU_SCRUB_GROTTO_RIGHT,           RG_BUY_BOMBS_535, false, true);
+    ctx->PlaceItemInLocation(RC_DMC_DEKU_SCRUB_GROTTO_CENTER,          RG_BUY_DEKU_SEEDS_30, false, true);
+    ctx->PlaceItemInLocation(RC_GC_DEKU_SCRUB_GROTTO_LEFT,             RG_BUY_DEKU_NUTS_5, false, true);
+    ctx->PlaceItemInLocation(RC_GC_DEKU_SCRUB_GROTTO_RIGHT,            RG_BUY_BOMBS_535, false, true);
+    ctx->PlaceItemInLocation(RC_GC_DEKU_SCRUB_GROTTO_CENTER,           RG_BUY_DEKU_SEEDS_30, false, true);
+    ctx->PlaceItemInLocation(RC_LLR_DEKU_SCRUB_GROTTO_LEFT,            RG_BUY_DEKU_NUTS_5, false, true);
+    ctx->PlaceItemInLocation(RC_LLR_DEKU_SCRUB_GROTTO_RIGHT,           RG_BUY_BOMBS_535, false, true);
+    ctx->PlaceItemInLocation(RC_LLR_DEKU_SCRUB_GROTTO_CENTER,          RG_BUY_DEKU_SEEDS_30, false, true);
 
     //Dungeon Scrubs
     if (ctx->GetDungeon(Rando::DEKU_TREE)->IsMQ()) {
-        ctx->PlaceItemInLocation(RC_DEKU_TREE_MQ_DEKU_SCRUB, RG_DEKU_SHIELD, false, true);
+        ctx->PlaceItemInLocation(RC_DEKU_TREE_MQ_DEKU_SCRUB, RG_BUY_DEKU_SHIELD, false, true);
     }
     if (ctx->GetDungeon(Rando::DODONGOS_CAVERN)->IsMQ()) {
-        ctx->PlaceItemInLocation(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR, RG_DEKU_STICK_1, false, true);
-        ctx->PlaceItemInLocation(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT, RG_DEKU_SEEDS_30, false, true);
-        ctx->PlaceItemInLocation(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE, RG_DEKU_SHIELD, false, true);
+        ctx->PlaceItemInLocation(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR, RG_BUY_DEKU_STICK_1, false, true);
+        ctx->PlaceItemInLocation(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT, RG_BUY_DEKU_SEEDS_30, false, true);
+        ctx->PlaceItemInLocation(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE, RG_BUY_DEKU_SHIELD, false, true);
         ctx->PlaceItemInLocation(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS, RG_RED_POTION_REFILL,
                                  false, true);
     } else {
-      ctx->PlaceItemInLocation(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,      RG_DEKU_NUTS_5, false, true);
-      ctx->PlaceItemInLocation(RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS, RG_DEKU_STICK_1, false, true);
-      ctx->PlaceItemInLocation(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT,     RG_DEKU_SEEDS_30, false, true);
-      ctx->PlaceItemInLocation(RC_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY,                   RG_DEKU_SHIELD, false, true);
+      ctx->PlaceItemInLocation(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,      RG_BUY_DEKU_NUTS_5, false, true);
+      ctx->PlaceItemInLocation(RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS, RG_BUY_DEKU_STICK_1, false, true);
+      ctx->PlaceItemInLocation(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT,     RG_BUY_DEKU_SEEDS_30, false, true);
+      ctx->PlaceItemInLocation(RC_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY,                   RG_BUY_DEKU_SHIELD, false, true);
     }
     if (ctx->GetDungeon(Rando::JABU_JABUS_BELLY)->IsVanilla()) {
-        ctx->PlaceItemInLocation(RC_JABU_JABUS_BELLY_DEKU_SCRUB, RG_DEKU_NUTS_5, false, true);
+        ctx->PlaceItemInLocation(RC_JABU_JABUS_BELLY_DEKU_SCRUB, RG_BUY_DEKU_NUTS_5, false, true);
     }
     if (ctx->GetDungeon(Rando::GANONS_CASTLE)->IsMQ()) {
       ctx->PlaceItemInLocation(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,         RG_GREEN_POTION_REFILL, false, true);
-      ctx->PlaceItemInLocation(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,  RG_BOMBS_5, false, true);
-      ctx->PlaceItemInLocation(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,       RG_ARROWS_30, false, true);
+      ctx->PlaceItemInLocation(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,  RG_BUY_BOMBS_535, false, true);
+      ctx->PlaceItemInLocation(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,       RG_BUY_ARROWS_30, false, true);
       ctx->PlaceItemInLocation(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT, RG_RED_POTION_REFILL, false, true);
-      ctx->PlaceItemInLocation(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,        RG_DEKU_NUTS_5, false, true);
+      ctx->PlaceItemInLocation(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,        RG_BUY_DEKU_NUTS_5, false, true);
     } else {
-      ctx->PlaceItemInLocation(RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,  RG_BOMBS_5, false, true);
-      ctx->PlaceItemInLocation(RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT, RG_DEKU_SEEDS_30, false, true);
+      ctx->PlaceItemInLocation(RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,  RG_BUY_BOMBS_535, false, true);
+      ctx->PlaceItemInLocation(RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT, RG_BUY_DEKU_SEEDS_30, false, true);
       ctx->PlaceItemInLocation(RC_GANONS_CASTLE_DEKU_SCRUB_RIGHT,        RG_RED_POTION_REFILL, false, true);
       ctx->PlaceItemInLocation(RC_GANONS_CASTLE_DEKU_SCRUB_LEFT,         RG_GREEN_POTION_REFILL, false, true);
     }
@@ -653,6 +659,7 @@ static void SetMinimalItemPool() {
 }
 
 void GenerateItemPool() {
+  //RANDOTODO proper removal of items not in pool or logically relevant instead of dummy checks.
   auto ctx = Rando::Context::GetInstance();
   ItemPool.clear();
   PendingJunkPool.clear();
@@ -860,7 +867,8 @@ void GenerateItemPool() {
     AddItemToMainPool(RG_PROGRESSIVE_WALLET);
   }
 
-  if (ctx->GetOption(RSK_SHUFFLE_MAGIC_BEANS)) {
+  if (ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_BEANS_ONLY) ||
+      ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ALL)) {
     AddItemToMainPool(RG_MAGIC_BEAN_PACK);
     if (ctx->GetOption(RSK_ITEM_POOL).Is(RO_ITEM_POOL_PLENTIFUL)) {
       AddItemToPool(PendingJunkPool, RG_MAGIC_BEAN_PACK);
@@ -870,7 +878,8 @@ void GenerateItemPool() {
     ctx->PlaceItemInLocation(RC_ZR_MAGIC_BEAN_SALESMAN, RG_MAGIC_BEAN, false, true);
   }
 
-  if (ctx->GetOption(RSK_SHUFFLE_MERCHANTS).IsNot(RO_SHUFFLE_MERCHANTS_OFF)) {
+  if (ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ALL_BUT_BEANS) ||
+      ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ALL)) {
     if (/*!ProgressiveGoronSword TODO: Implement Progressive Goron Sword*/true) {
       AddItemToMainPool(RG_GIANTS_KNIFE);
     }
@@ -986,6 +995,10 @@ void GenerateItemPool() {
     AddItemToMainPool(RG_PROGRESSIVE_WALLET);
   }
 
+  if (ctx->GetOption(RSK_INCLUDE_TYCOON_WALLET)) {
+    AddItemToMainPool(RG_PROGRESSIVE_WALLET);
+  }
+
   if (ctx->GetOption(RSK_SHUFFLE_DEKU_STICK_BAG)) {
     AddItemToMainPool(RG_PROGRESSIVE_STICK_UPGRADE);
   }
@@ -1162,7 +1175,7 @@ void GenerateItemPool() {
   }
 
   //Scrubsanity
-  if (ctx->GetOption(RSK_SHUFFLE_SCRUBS).IsNot(RO_SCRUBS_OFF)) {
+  if (ctx->GetOption(RSK_SHUFFLE_SCRUBS).Is(RO_SCRUBS_ALL)) {
     //Deku Tree
     if (ctx->GetDungeon(Rando::DEKU_TREE)->IsMQ()) {
       AddItemToMainPool(RG_DEKU_SHIELD);
@@ -1202,7 +1215,7 @@ void GenerateItemPool() {
       }
     }
   } else {
-    PlaceVanillaDekuScrubItems();
+    PlaceVanillaDekuScrubItems(ctx->GetOption(RSK_SHUFFLE_SCRUBS).Is(RO_SCRUBS_OFF));
   }
 
   AddItemsToPool(ItemPool, alwaysItems);
@@ -1269,7 +1282,9 @@ void GenerateItemPool() {
       Rando::StaticData::RetrieveItem(RandomElement(bottles)).GetRandomizerGet()); // Get one random bottle type for ice traps
   for (uint8_t i = 0; i < bottleCount; i++) {
     if (i >= rutoBottles) {
-      if ((i == bottleCount - 1) && ctx->GetOption(RSK_SHUFFLE_MERCHANTS).IsNot(RO_SHUFFLE_MERCHANTS_OFF)) {
+      if ((i == bottleCount - 1) && 
+          (ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_BEANS_ONLY) ||
+           ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ALL))) {
         AddItemToMainPool(RG_BOTTLE_WITH_BLUE_POTION);
       } else {
         AddRandomBottle(bottles);
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
index ca6f0c066..64c3e9287 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
@@ -46,33 +46,22 @@ bool LocationAccess::ConditionsMet() const {
 }
 
 bool LocationAccess::CanBuy() const {
-  auto ctx = Rando::Context::GetInstance();
-  //Not a shop or scrub location, don't need to check if buyable
-  if (Rando::StaticData::GetLocation(location)->GetRCType() != RCTYPE_SHOP && Rando::StaticData::GetLocation(location)->GetRCType() != RCTYPE_SCRUB) {
-    return true;
-  }
+  return CanBuyAnother(location);
+}
 
-  //Check if wallet is large enough to buy item
-  bool SufficientWallet = true;
-  if (ctx->GetItemLocation(location)->GetPrice() > 500) {
-    SufficientWallet = logic->HasItem(RG_TYCOON_WALLET);
-  } else if (ctx->GetItemLocation(location)->GetPrice() > 200) {
-    SufficientWallet = logic->HasItem(RG_GIANT_WALLET);
-  } else if (ctx->GetItemLocation(location)->GetPrice() > 99) {
-    SufficientWallet = logic->HasItem(RG_ADULT_WALLET);
-  } else if (ctx->GetItemLocation(location)->GetPrice() > 0) {
-    SufficientWallet = logic->HasItem(RG_CHILD_WALLET);
-  }
+bool CanBuyAnother(RandomizerCheck rc) {
+  uint16_t price = ctx->GetItemLocation(rc)->GetPrice();
 
-  bool OtherCondition = true;
-  RandomizerGet placed = ctx->GetItemLocation(location)->GetPlacedRandomizerGet();
-  //Need bottle to buy bottle items, only logically relevant bottle items included here
-  if (placed == RG_BUY_BLUE_FIRE || placed == RG_BUY_BOTTLE_BUG || placed == RG_BUY_FISH ||
-      placed == RG_BUY_FAIRYS_SPIRIT) {
-      OtherCondition = logic->HasBottle();
+  if (price > 500) {
+    return logic->HasItem(RG_TYCOON_WALLET);
+  } else if (price > 200) {
+    return logic->HasItem(RG_GIANT_WALLET);
+  } else if (price > 99) {
+    return logic->HasItem(RG_ADULT_WALLET);
+  } else if (price > 0) {
+    return logic->HasItem(RG_CHILD_WALLET);
   }
-
-  return SufficientWallet && OtherCondition;
+  return true;
 }
 
 Region::Region() = default;
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access.hpp b/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
index c4d1e9a74..f394c2de5 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
@@ -128,6 +128,8 @@ protected:
     bool CanBuy() const;
 };
 
+bool CanBuyAnother(RandomizerCheck rc);
+
 namespace Rando {
     class Entrance;
     enum class EntranceType;
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
index edd04bb45..5b50d13b4 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
@@ -97,7 +97,7 @@ void RegionTable_Init_DeathMountain() {
                   LOCATION(RC_GC_ROLLING_GORON_AS_ADULT, logic->StopGCRollingGoronAsAdult),
                   LOCATION(RC_GC_GS_BOULDER_MAZE,        logic->IsChild && logic->BlastOrSmash()),
                   LOCATION(RC_GC_GS_CENTER_PLATFORM,     logic->IsAdult && logic->CanAttack()),
-                  LOCATION(RC_GC_MEDIGORON,              logic->IsAdult && logic->HasItem(RG_ADULT_WALLET) && (logic->BlastOrSmash() || logic->HasItem(RG_GORONS_BRACELET))),
+                  LOCATION(RC_GC_MEDIGORON,              logic->IsAdult && (logic->BlastOrSmash() || logic->HasItem(RG_GORONS_BRACELET))),
                   LOCATION(RC_GC_MAZE_GOSSIP_STONE,      logic->BlastOrSmash() || logic->CanUse(RG_SILVER_GAUNTLETS)),
                   LOCATION(RC_GC_MEDIGORON_GOSSIP_STONE, logic->BlastOrSmash() || logic->HasItem(RG_GORONS_BRACELET)),
                 }, {
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
index 7c31cbac3..7d40507a3 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
@@ -142,11 +142,11 @@ void RegionTable_Init_GerudoValley() {
                   //Events
                   EventAccess(&logic->FairyPot,       {[]{return true;}}),
                   EventAccess(&logic->NutPot,         {[]{return true;}}),
-                  EventAccess(&logic->CarpetMerchant, {[]{return logic->HasItem(RG_ADULT_WALLET) && (logic->CanJumpslash() || logic->CanUse(RG_HOVER_BOOTS));}}),
+                  EventAccess(&logic->CarpetMerchant, {[]{return logic->HasItem(RG_ADULT_WALLET) && CanBuyAnother(RC_WASTELAND_BOMBCHU_SALESMAN) && (logic->CanJumpslash() || logic->CanUse(RG_HOVER_BOOTS));}}),
                 }, {
                   //Locations
                   LOCATION(RC_WASTELAND_CHEST,            logic->HasFireSource()),
-                  LOCATION(RC_WASTELAND_BOMBCHU_SALESMAN, logic->CarpetMerchant),
+                  LOCATION(RC_WASTELAND_BOMBCHU_SALESMAN, logic->CanJumpslash() || logic->CanUse(RG_HOVER_BOOTS)),
                   LOCATION(RC_WASTELAND_GS,               logic->HookshotOrBoomerang()),
                 }, {
                   //Exits
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
index 4670fafd1..96388d043 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
@@ -170,13 +170,14 @@ void RegionTable_Init_Kakariko() {
 
   areaTable[RR_KAK_ODD_POTION_BUILDING] =
       Region("Kak Granny's Potion Shop", "Kak Granny's Potion Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {},
+            // RANDOTODO blue pot access
            {
                LOCATION(RC_KAK_TRADE_ODD_MUSHROOM, logic->IsAdult && logic->CanUse(RG_ODD_MUSHROOM)),
-               LOCATION(RC_KAK_GRANNYS_SHOP, logic->IsAdult && (logic->CanUse(RG_ODD_MUSHROOM) || logic->TradeQuestStep(RG_ODD_MUSHROOM)) && logic->HasItem(RG_ADULT_WALLET)),
+               LOCATION(RC_KAK_GRANNYS_SHOP, logic->IsAdult && (logic->CanUse(RG_ODD_MUSHROOM) || logic->TradeQuestStep(RG_ODD_MUSHROOM))),
            },
            {
-               // Exits
-               Entrance(RR_KAK_BACKYARD, { [] { return true; } }),
+              // Exits
+              Entrance(RR_KAK_BACKYARD, { [] { return true; } }),
            });
 
   areaTable[RR_KAK_REDEAD_GROTTO] = Region("Kak Redead Grotto", "Kak Redead Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
diff --git a/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp b/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
index 7ab399266..0d4f39c5c 100644
--- a/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
@@ -67,7 +67,6 @@ int Playthrough_Init(uint32_t seed, std::set<RandomizerCheck> excludedLocations,
     }
 
     GenerateHash();
-    WriteIngameSpoilerLog();
 
     if (true) {
         //TODO: Handle different types of file output (i.e. Spoiler Log, Plando Template, Patch Files, Race Files, etc.)
diff --git a/soh/soh/Enhancements/randomizer/3drando/shops.cpp b/soh/soh/Enhancements/randomizer/3drando/shops.cpp
index 001c62ced..f6c73de32 100644
--- a/soh/soh/Enhancements/randomizer/3drando/shops.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/shops.cpp
@@ -2,13 +2,36 @@
 #include "location_access.hpp"
 #include "random.hpp"
 #include "shops.hpp"
+#include "../location.h"
 
 #include <array>
 #include <math.h>
 #include <map>
+#include <spdlog/spdlog.h>
 #include "z64item.h"
 
-std::map<RandomizerCheck, ItemAndPrice> NonShopItems = {};
+PriceSettingsStruct::PriceSettingsStruct(RandomizerSettingKey _main,
+                        RandomizerSettingKey _fixedPrice,
+                        RandomizerSettingKey _range1,
+                        RandomizerSettingKey _range2,
+                        RandomizerSettingKey _noWallet,
+                        RandomizerSettingKey _childWallet,
+                        RandomizerSettingKey _adultWallet,
+                        RandomizerSettingKey _giantWallet,
+                        RandomizerSettingKey _tycoonWallet,
+                        RandomizerSettingKey _affordable){
+   main = _main;
+   fixedPrice = _fixedPrice;
+   range1 = _range1;
+   range2 = _range2;
+   noWallet = _noWallet;
+   childWallet = _childWallet;
+   adultWallet = _adultWallet;
+   giantWallet= _giantWallet;
+   tycoonWallet= _tycoonWallet;
+   affordable= _affordable;
+}
+
 
 static std::array<std::vector<Text>, 0xF1> trickNameTable; // Table of trick names for ice traps
 bool initTrickNames = false; //Indicates if trick ice trap names have been initialized yet
@@ -131,71 +154,97 @@ int GetPriceFromMax(int max) {
     return Random(1, max) * 5; // random range of 1 - wallet max / 5, where wallet max is the highest it goes as a multiple of 5
 }
 
-// Get random price out of available "affordable prices", or just return 10 if Starter wallet is selected (no need to randomly select
-// from a single element)
-int GetPriceAffordable() {
-    auto ctx = Rando::Context::GetInstance();
-    if (ctx->GetOption(RSK_SHOPSANITY_PRICES).Is(RO_SHOPSANITY_PRICE_STARTER)) {
-        return 10;
-    }
-
-    static const std::vector<int> affordablePrices = { 10, 105, 205, 505 };
-    std::vector<int> priceList;
-    uint8_t maxElements = ctx->GetOption(RSK_SHOPSANITY_PRICES).Value<uint8_t>();
-    for (int i = 0; i < maxElements; i++) {
-        priceList.push_back(affordablePrices.at(i));
-    }
-    return RandomElement(priceList);
+uint16_t GetPriceFromSettings(Rando::Location *loc, PriceSettingsStruct priceSettings) {
+   auto ctx = Rando::Context::GetInstance();
+   switch (ctx->GetOption(priceSettings.main).Value<uint8_t>()){
+      case RO_PRICE_VANILLA: 
+         return loc->GetVanillaPrice();
+      case RO_PRICE_CHEAP_BALANCED:
+         return GetCheapBalancedPrice();
+      case RO_PRICE_BALANCED:{
+         double random = RandomDouble(); //Randomly generated probability value
+         for (size_t i = 0; i < ShopPriceProbability.size(); i++) {
+            if (random < ShopPriceProbability[i]) {
+            //The randomly generated value has surpassed the total probability up to this point, so this is the generated price
+                  return  i * 5; //i in range [0, 59], output in range [0, 295] in increments of 5
+            }
+         }
+         return 150;
+      }
+      case RO_PRICE_FIXED:
+         return (uint16_t)ctx->GetOption(priceSettings.fixedPrice).Value<uint8_t>() * 5;
+      case RO_PRICE_RANGE:{
+         uint16_t range1 = (uint16_t)ctx->GetOption(priceSettings.range1).Value<uint8_t>() * 5;
+         uint16_t range2 = (uint16_t)ctx->GetOption(priceSettings.range2).Value<uint8_t>() * 5;
+         return range1 < range2 ? Random(range1, range2+1) : Random(range2, range1+1);
+      }
+      case RO_PRICE_SET_BY_WALLET:{
+         bool isTycoon = ctx->GetOption(RSK_INCLUDE_TYCOON_WALLET).Value<bool>();
+         uint16_t noWeight = ctx->GetOption(priceSettings.noWallet).Value<uint8_t>();
+         uint16_t childWeight = ctx->GetOption(priceSettings.childWallet).Value<uint8_t>();
+         uint16_t adultWeight = ctx->GetOption(priceSettings.adultWallet).Value<uint8_t>();
+         uint16_t giantWeight = ctx->GetOption(priceSettings.giantWallet).Value<uint8_t>();
+         uint16_t tycoonWeight = isTycoon ? ctx->GetOption(priceSettings.tycoonWallet).Value<uint8_t>() : 0;
+         uint16_t totalWeight = noWeight + childWeight + adultWeight + giantWeight + tycoonWeight;
+         if (totalWeight == 0){ //if no weight, return from sane range
+            return Random(0, 501);
+         }
+         int16_t selected = Random(1, totalWeight + 1);
+         selected = selected - noWeight;
+         if (selected <= 0){
+            return 0;
+         }
+         selected = selected - childWeight;
+         if (selected <= 0){
+            return Random(1, 100);
+         }
+         selected = selected - adultWeight;
+         if (selected <= 0){
+            return Random(100, 201);
+         }
+         selected = selected - giantWeight;
+         if (selected <= 0){
+            return Random(201, 501);
+         }
+         return Random(501, 999);
+      }
+   }
+   SPDLOG_ERROR("GetPriceFromSettings has failed to return a price for location {}, assigning a default value.", loc->GetName());
+   assert(false);
+   return 69; //this should never happen, if it does, EASTER EGG that tells us something is wrong
 }
 
-int GetRandomShopPrice() {
-    auto ctx = Rando::Context::GetInstance();
-    // If Shopsanity prices aren't Balanced, but Affordable is on, don't GetPriceFromMax
-    if (ctx->GetOption(RSK_SHOPSANITY_PRICES_AFFORDABLE).Is(true) && ctx->GetOption(RSK_SHOPSANITY_PRICES).IsNot(RO_SHOPSANITY_PRICE_BALANCED)) {
-        return GetPriceAffordable();
-    }
-
-    // max 0 means Balanced is selected, and thus shouldn't trigger GetPriceFromMax
-    int max = 0;
-
-    // check settings for a wallet tier selection and set max amount as method for setting true randomization
-    if (ctx->GetOption(RSK_SHOPSANITY_PRICES).Is(RO_SHOPSANITY_PRICE_STARTER)) {
-        max = 19; // 95/5
-    } else if (ctx->GetOption(RSK_SHOPSANITY_PRICES).Is(RO_SHOPSANITY_PRICE_ADULT)) {
-        max = 40; // 200/5
-    } else if (ctx->GetOption(RSK_SHOPSANITY_PRICES).Is(RO_SHOPSANITY_PRICE_GIANT)) {
-        max = 100; // 500/5
-    } else if (ctx->GetOption(RSK_SHOPSANITY_PRICES).Is(RO_SHOPSANITY_PRICE_TYCOON)) {
-        max = 199; // 995/5
-    }
-    if (max != 0) {
-        return GetPriceFromMax(max);
-    }
-    // Balanced is default, so if all other known cases fail, fall back to Balanced
-    int price = 150; // JUST in case something fails with the randomization, return sane price for balanced
-    double random = RandomDouble(); //Randomly generated probability value
-    for (size_t i = 0; i < ShopPriceProbability.size(); i++) {
-        //The randomly generated value has surpassed the total probability up to this point, so this is the generated price
-        if (random < ShopPriceProbability[i]) {
-            price = i * 5; //i in range [0, 59], output in range [0, 295] in increments of 5
-            break;
-        }
-    }
-    return price;
+uint16_t GetRandomPrice(Rando::Location *loc, PriceSettingsStruct priceSettings) {
+   uint16_t initialPrice = GetPriceFromSettings(loc, priceSettings);
+   auto ctx = Rando::Context::GetInstance();
+   if (ctx->GetOption(priceSettings.affordable) && !ctx->GetOption(priceSettings.main).Is(RO_PRICE_FIXED)){
+      if (initialPrice > 500) {
+         return 505;
+      } else if (initialPrice > 200) {
+         return 205;
+      } else if (initialPrice > 99) {
+         return 100;
+      } else if (initialPrice > 0) {
+         return 5;
+      }
+      return 0;
+   } else {
+      return initialPrice;
+   }
 }
 
 //Similar to above, beta distribution with alpha = 1, beta = 2,
 // multiplied by 20 instead of 60 to give values in rage [0, 95] in increments of 5
 //Average price ~31
-static constexpr std::array<double, 20> ScrubPriceProbability = {
+static constexpr std::array<double, 20> CheapPriceProbability = {
     0.097500187, 0.190002748, 0.277509301, 0.360018376, 0.437522571, 0.510021715, 0.577520272, 0.640029304, 0.697527584, 0.750024535,
     0.797518749, 0.840011707, 0.877508776, 0.910010904, 0.937504342, 0.960004661, 0.977502132, 0.989998967, 0.997500116, 1.000000000,
 };
 
-int16_t GetRandomScrubPrice() {
+uint16_t GetCheapBalancedPrice() {
     double random = RandomDouble();
-    for (size_t i = 0; i < ScrubPriceProbability.size(); i++) {
-        if (random < ScrubPriceProbability[i]) {
+    for (size_t i = 0; i < CheapPriceProbability.size(); i++) {
+        if (random < CheapPriceProbability[i]) {
             return i * 5; // i in range [0, 19], output in range [0, 95] in increments of 5
         }
     }
diff --git a/soh/soh/Enhancements/randomizer/3drando/shops.hpp b/soh/soh/Enhancements/randomizer/3drando/shops.hpp
index 152e64d0f..b1f09a9a7 100644
--- a/soh/soh/Enhancements/randomizer/3drando/shops.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/shops.hpp
@@ -2,18 +2,37 @@
 #include "../context.h"
 
 #include <vector>
+#include <array>
 
-struct ItemAndPrice {
-    Text Name;
-    int Price;
-    bool Repurchaseable;
+struct PriceSettingsStruct {
+    RandomizerSettingKey main;
+    RandomizerSettingKey fixedPrice;
+    RandomizerSettingKey range1;
+    RandomizerSettingKey range2;
+    RandomizerSettingKey noWallet;
+    RandomizerSettingKey childWallet;
+    RandomizerSettingKey adultWallet;
+    RandomizerSettingKey giantWallet;
+    RandomizerSettingKey tycoonWallet;
+    RandomizerSettingKey affordable;
+
+    PriceSettingsStruct(RandomizerSettingKey _main,
+                        RandomizerSettingKey _fixedPrice,
+                        RandomizerSettingKey _range1,
+                        RandomizerSettingKey _range2,
+                        RandomizerSettingKey _noWallet,
+                        RandomizerSettingKey _childWallet,
+                        RandomizerSettingKey _adultWallet,
+                        RandomizerSettingKey _giantWallet,
+                        RandomizerSettingKey _tycoonWallet,
+                        RandomizerSettingKey _affordable);
 };
 
 extern void PlaceVanillaShopItems();
 extern std::vector<RandomizerGet> GetMinVanillaShopItems(int total_replaced);
-extern int GetRandomShopPrice();
-extern int16_t GetRandomScrubPrice();
+extern uint16_t GetRandomPrice(Rando::Location* loc, PriceSettingsStruct priceSettings);
+extern uint16_t GetCheapBalancedPrice();
 extern int GetShopsanityReplaceAmount();
 extern Text GetIceTrapName(uint8_t id);
 
-extern std::map<RandomizerCheck, ItemAndPrice> NonShopItems;
+
diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
index 5ec183b50..e89ef248c 100644
--- a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
@@ -8,7 +8,6 @@
 #include "../trial.h"
 #include "tinyxml2.h"
 #include "utils.hpp"
-#include "shops.hpp"
 #include "hints.hpp"
 #include "pool_functions.hpp"
 #include "soh/Enhancements/randomizer/randomizer_check_objects.h"
@@ -46,8 +45,6 @@ namespace {
 std::string placementtxt;
 } // namespace
 
-static SpoilerData spoilerData;
-
 void GenerateHash() {
     auto ctx = Rando::Context::GetInstance();
     std::string hash = ctx->GetSettings()->GetHash();
@@ -64,10 +61,6 @@ void GenerateHash() {
     // spoilerData = { 0 };
 }
 
-const SpoilerData& GetSpoilerData() {
-  return spoilerData;
-}
-
 static auto GetGeneralPath() {
     return "./randomizer/haha.xml";
 }
@@ -80,195 +73,6 @@ static auto GetPlacementLogPath() {
   return GetGeneralPath();
 }
 
-void WriteIngameSpoilerLog() {
-    auto ctx = Rando::Context::GetInstance();
-    uint16_t spoilerItemIndex = 0;
-    uint32_t spoilerStringOffset = 0;
-    uint16_t spoilerSphereItemoffset = 0;
-    uint16_t spoilerAreaOffset = 0;
-    // Intentionally junk value so we trigger the 'new area, record some stuff' code
-    RandomizerCheckArea currentArea = RandomizerCheckArea::RCAREA_INVALID;
-    bool spoilerOutOfSpace = false;
-
-    // Create map of string data offsets for all _unique_ item locations and names in the playthrough
-    // Some item names, like gold skulltula tokens, can appear many times in a playthrough
-    std::unordered_map<uint32_t, uint16_t>
-        itemLocationsMap; // Map of LocationKey to an index into spoiler data item locations
-    itemLocationsMap.reserve(ctx->allLocations.size());
-    std::unordered_map<std::string, uint16_t>
-        stringOffsetMap; // Map of strings to their offset into spoiler string data array
-    stringOffsetMap.reserve(ctx->allLocations.size() * 2);
-
-    // Sort all locations by their area, so the in-game log can show a area of items by simply starting/ending at
-    // certain indices
-    std::stable_sort(ctx->allLocations.begin(), ctx->allLocations.end(), [](const RandomizerCheck& a, const RandomizerCheck& b) {
-        RandomizerCheckArea areaA = Rando::StaticData::GetLocation(a)->GetArea();
-        RandomizerCheckArea areaB = Rando::StaticData::GetLocation(b)->GetArea();
-        return areaA < areaB;
-    });
-
-    for (const RandomizerCheck key : ctx->allLocations) {
-        auto loc = Rando::StaticData::GetLocation(key);
-        auto itemLocation = ctx->GetItemLocation(key);
-
-        // Hide excluded locations from ingame tracker
-        // if (loc->IsExcluded()) {
-        //     continue;
-        // }
-        // Beehives
-        if (!ctx->GetOption(RSK_SHUFFLE_BEEHIVES) && loc->GetRCType() == RCTYPE_BEEHIVE) {
-            continue;
-        }
-        // Cows
-        else if (!ctx->GetOption(RSK_SHUFFLE_COWS) && loc->GetRCType() == RCTYPE_COW) {
-            continue;
-        }
-        // Merchants
-        else if (ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_OFF) && loc->GetRCType() == RCTYPE_MERCHANT) {
-            continue;
-        }
-        // Adult Trade
-        else if (!ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) && loc->GetRCType() == RCTYPE_ADULT_TRADE) {
-            continue;
-        }
-        // Chest Minigame
-        else if (ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_GENERIC_OFF) && loc->GetRCType() == RCTYPE_CHEST_GAME) {
-            continue;
-        }
-        // Gerudo Fortress
-        else if ((ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_NORMAL) &&
-                  (loc->GetRCType() == RCTYPE_GF_KEY || loc->GetHintKey() == RHT_GF_GERUDO_MEMBERSHIP_CARD)) ||
-                 (ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_FAST) && loc->GetRCType() == RCTYPE_GF_KEY &&
-                  loc->GetHintKey() != RHT_GF_NORTH_F1_CARPENTER)) {
-            continue;
-        }
-
-        // Copy at most 51 chars from the name and location name to avoid issues with names that don't fit on screen
-        const char* nameFormatStr = "%.51s";
-
-        auto locName = loc->GetName();
-        if (stringOffsetMap.find(locName) == stringOffsetMap.end()) {
-            if (spoilerStringOffset + locName.size() + 1 >= SPOILER_STRING_DATA_SIZE) {
-                spoilerOutOfSpace = true;
-                break;
-            } else {
-                stringOffsetMap[locName] = spoilerStringOffset;
-                spoilerStringOffset +=
-                    sprintf(&spoilerData.StringData[spoilerStringOffset], nameFormatStr, locName.c_str()) + 1;
-            }
-        }
-        // PURPLE TODO: LOCALIZATION
-        auto locItem = itemLocation->GetPlacedItemName().GetEnglish();
-        if (itemLocation->GetPlacedRandomizerGet() == RG_ICE_TRAP && loc->GetRCType() == RCTYPE_SHOP) {
-            locItem = NonShopItems[key].Name.GetEnglish();
-        }
-        if (stringOffsetMap.find(locItem) == stringOffsetMap.end()) {
-            if (spoilerStringOffset + locItem.size() + 1 >= SPOILER_STRING_DATA_SIZE) {
-                spoilerOutOfSpace = true;
-                break;
-            } else {
-                stringOffsetMap[locItem] = spoilerStringOffset;
-                spoilerStringOffset +=
-                    sprintf(&spoilerData.StringData[spoilerStringOffset], nameFormatStr, locItem.c_str()) + 1;
-            }
-        }
-
-        spoilerData.ItemLocations[spoilerItemIndex].LocationStrOffset = stringOffsetMap[locName];
-        spoilerData.ItemLocations[spoilerItemIndex].ItemStrOffset = stringOffsetMap[locItem];
-        spoilerData.ItemLocations[spoilerItemIndex].LocationStr = locName;
-        spoilerData.ItemLocations[spoilerItemIndex].ItemStr = locItem;
-        spoilerData.ItemLocations[spoilerItemIndex].CollectionCheckType = loc->GetCollectionCheck().type;
-        spoilerData.ItemLocations[spoilerItemIndex].LocationScene = loc->GetCollectionCheck().scene;
-        spoilerData.ItemLocations[spoilerItemIndex].LocationFlag = loc->GetCollectionCheck().flag;
-
-        // Collect Type and Reveal Type
-        if (key == RC_GANON) {
-            spoilerData.ItemLocations[spoilerItemIndex].CollectType = COLLECTTYPE_NEVER;
-            spoilerData.ItemLocations[spoilerItemIndex].RevealType = REVEALTYPE_ALWAYS;
-        } 
-        // Shops
-        else if (loc->IsShop()) {
-            if (ctx->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_OFF)) {
-                spoilerData.ItemLocations[spoilerItemIndex].RevealType = REVEALTYPE_ALWAYS;
-            } else {
-                spoilerData.ItemLocations[spoilerItemIndex].RevealType = REVEALTYPE_SCENE;
-            }
-            if (itemLocation->GetPlacedItem().GetItemType() == ITEMTYPE_REFILL ||
-                itemLocation->GetPlacedItem().GetItemType() == ITEMTYPE_SHOP ||
-                itemLocation->GetPlacedItem().GetHintKey() == RHT_PROGRESSIVE_BOMBCHUS) {
-                spoilerData.ItemLocations[spoilerItemIndex].CollectType = COLLECTTYPE_REPEATABLE;
-            }
-        }
-        // Gold Skulltulas
-        else if (loc->GetRCType() == RCTYPE_SKULL_TOKEN &&
-                 ((ctx->GetOption(RSK_SHUFFLE_TOKENS).Is(RO_TOKENSANITY_OFF)) ||
-                  (ctx->GetOption(RSK_SHUFFLE_TOKENS).Is(RO_TOKENSANITY_DUNGEONS) && !loc->IsDungeon()) ||
-                  (ctx->GetOption(RSK_SHUFFLE_TOKENS).Is(RO_TOKENSANITY_OVERWORLD) && loc->IsDungeon()))) {
-            spoilerData.ItemLocations[spoilerItemIndex].RevealType = REVEALTYPE_ALWAYS;
-        }
-        // Deku Scrubs
-        else if (
-            loc->GetRCType() == RCTYPE_SCRUB &&
-            // these 3 scrubs are always randomized
-            !(
-                loc->GetRandomizerCheck() == RC_LW_DEKU_SCRUB_NEAR_BRIDGE ||
-                loc->GetRandomizerCheck() == RC_LW_DEKU_SCRUB_GROTTO_FRONT ||
-                loc->GetRandomizerCheck() == RC_HF_DEKU_SCRUB_GROTTO
-            ) &&
-            ctx->GetOption(RSK_SHUFFLE_SCRUBS).Is(RO_SCRUBS_OFF)
-        ) {
-            spoilerData.ItemLocations[spoilerItemIndex].CollectType = COLLECTTYPE_REPEATABLE;
-            spoilerData.ItemLocations[spoilerItemIndex].RevealType = REVEALTYPE_ALWAYS;
-        }
-
-        RandomizerCheckArea checkArea = loc->GetArea();
-        spoilerData.ItemLocations[spoilerItemIndex].Area = checkArea;
-
-        // Area setup
-        if (checkArea != currentArea) {
-            currentArea = checkArea;
-            spoilerData.AreaOffsets[currentArea] = spoilerAreaOffset;
-        }
-        ++spoilerData.AreaItemCounts[currentArea];
-        ++spoilerAreaOffset;
-
-        itemLocationsMap[key] = spoilerItemIndex++;
-    }
-    spoilerData.ItemLocationsCount = spoilerItemIndex;
-
-    if (/*Settings::IngameSpoilers TODO: Remove: don't think we have any need for this*/ false) {
-        bool playthroughItemNotFound = false;
-        // Write playthrough data to in-game spoiler log
-        if (!spoilerOutOfSpace) {
-            for (uint32_t i = 0; i < ctx->playthroughLocations.size(); i++) {
-                if (i >= SPOILER_SPHERES_MAX) {
-                    spoilerOutOfSpace = true;
-                    break;
-                }
-                spoilerData.Spheres[i].ItemLocationsOffset = spoilerSphereItemoffset;
-                for (uint32_t loc = 0; loc < ctx->playthroughLocations[i].size(); ++loc) {
-                    if (spoilerSphereItemoffset >= SPOILER_ITEMS_MAX) {
-                        spoilerOutOfSpace = true;
-                        break;
-                    }
-
-                    const auto foundItemLoc = itemLocationsMap.find(ctx->playthroughLocations[i][loc]);
-                    if (foundItemLoc != itemLocationsMap.end()) {
-                        spoilerData.SphereItemLocations[spoilerSphereItemoffset++] = foundItemLoc->second;
-                    } else {
-                        playthroughItemNotFound = true;
-                    }
-                    ++spoilerData.Spheres[i].ItemCount;
-                }
-                ++spoilerData.SphereCount;
-            }
-        }
-        if (spoilerOutOfSpace || playthroughItemNotFound) {
-            SPDLOG_ERROR("In-game spoiler log is out of space, playthrough data will not be written");
-        }
-    }
-}
-
 // Writes the location to the specified node.
 static void WriteLocation(
     std::string sphere, const RandomizerCheck locationKey, const bool withPadding = false) {
@@ -683,6 +487,7 @@ void PlacementLog_Clear() {
     placementtxt = "";
 }
 
+// RANDOTODO: Do we even use this?
 bool PlacementLog_Write() {
     auto placementLog = tinyxml2::XMLDocument(false);
     placementLog.InsertEndChild(placementLog.NewDeclaration());
@@ -692,7 +497,6 @@ bool PlacementLog_Write() {
 
     // rootNode->SetAttribute("version", Settings::version.c_str());
     // rootNode->SetAttribute("seed", Settings::seed);
-    // TODO: Do we even use this?
 
     // WriteSettings(placementLog, true); // Include hidden settings.
     // WriteExcludedLocations(placementLog);
diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.hpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.hpp
index bf2fd9f60..25b64418e 100644
--- a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.hpp
@@ -8,7 +8,7 @@
 
 using RandomizerHash = std::array<std::string, 5>;
 
-
+// RANDOTODO this is primarily used by the check tracker now, and should probably be moved
 typedef enum {
     SPOILER_CHK_NONE,
     SPOILER_CHK_CHEST,
@@ -21,55 +21,6 @@ typedef enum {
     SPOILER_CHK_RANDOMIZER_INF,
 } SpoilerCollectionCheckType;
 
-typedef enum {
-    COLLECTTYPE_NORMAL,
-    COLLECTTYPE_REPEATABLE,
-    COLLECTTYPE_NEVER,
-} SpoilerItemCollectType;
-
-typedef enum {
-    REVEALTYPE_NORMAL,
-    REVEALTYPE_SCENE,
-    REVEALTYPE_ALWAYS,
-} SpoilerItemRevealType;
-
-#define SPOILER_SPHERES_MAX 50
-#define SPOILER_ITEMS_MAX RC_MAX
-#define SPOILER_STRING_DATA_SIZE 16384
-
-typedef struct {
-    std::string LocationStr;
-    std::string ItemStr;
-    uint16_t LocationStrOffset;
-    uint16_t ItemStrOffset;
-    SpoilerCollectionCheckType CollectionCheckType;
-    uint8_t LocationScene;
-    uint8_t LocationFlag;
-    RandomizerCheckArea Area;
-    SpoilerItemCollectType CollectType;
-    SpoilerItemRevealType RevealType;
-} SpoilerItemLocation;
-
-typedef struct {
-    uint8_t ItemCount;
-    uint16_t ItemLocationsOffset;
-} SpoilerSphere;
-
-typedef struct {
-    uint8_t SphereCount;
-    uint16_t ItemLocationsCount;
-    SpoilerSphere Spheres[SPOILER_SPHERES_MAX];
-    SpoilerItemLocation ItemLocations[SPOILER_ITEMS_MAX];
-    uint16_t SphereItemLocations[SPOILER_ITEMS_MAX];
-    char StringData[SPOILER_STRING_DATA_SIZE];
-    uint16_t AreaItemCounts[RCAREA_INVALID];
-    uint16_t AreaOffsets[RCAREA_INVALID];
-} SpoilerData;
-
 void GenerateHash();
-const RandomizerHash& GetRandomizerHash();
 
-void WriteIngameSpoilerLog();
-
-const char* SpoilerLog_Write();
-const SpoilerData& GetSpoilerData();
\ No newline at end of file
+const char* SpoilerLog_Write();
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/context.cpp b/soh/soh/Enhancements/randomizer/context.cpp
index 29e576580..44a27f116 100644
--- a/soh/soh/Enhancements/randomizer/context.cpp
+++ b/soh/soh/Enhancements/randomizer/context.cpp
@@ -104,15 +104,6 @@ void Context::PlaceItemInLocation(const RandomizerCheck locKey, const Randomizer
 
     // TODO? Show Progress
 
-    // If we're placing a non-shop item in a shop location, we want to record it for custom messages
-    if (StaticData::RetrieveItem(item).GetItemType() != ITEMTYPE_SHOP &&
-        StaticData::GetLocation(locKey)->GetRCType() == RCTYPE_SHOP) {
-        NonShopItems[locKey].Name = StaticData::RetrieveItem(item).GetName();
-        NonShopItems[locKey].Repurchaseable =
-            StaticData::RetrieveItem(item).GetItemType() == ITEMTYPE_REFILL ||
-            StaticData::RetrieveItem(item).GetHintKey() == RHT_PROGRESSIVE_BOMBCHUS;
-    }
-
     loc->SetPlacedItem(item);
     if (setHidden) {
         loc->SetHidden(true);
@@ -213,9 +204,6 @@ void Context::CreateItemOverrides() {
             iceTrapModels[locKey] = val.LooksLike();
             val.SetTrickName(GetIceTrapName(val.LooksLike()));
             // If this is ice trap is in a shop, change the name based on what the model will look like
-            if (loc->GetRCType() == RCTYPE_SHOP) {
-                NonShopItems[locKey].Name = val.GetTrickName();
-            }
             overrides[locKey] = val;
         }
         SPDLOG_DEBUG(loc->GetName());
diff --git a/soh/soh/Enhancements/randomizer/hint.cpp b/soh/soh/Enhancements/randomizer/hint.cpp
index 7d62d29c7..4ff6ba2aa 100644
--- a/soh/soh/Enhancements/randomizer/hint.cpp
+++ b/soh/soh/Enhancements/randomizer/hint.cpp
@@ -192,12 +192,11 @@ void Hint::NamesChosen(){
     hintTextsChosen = namesTemp;
   }
 
-  if (hintType == HINT_TYPE_ITEM || hintType == HINT_TYPE_ITEM_AREA || hintType == HINT_TYPE_MERCHANT){
-    bool mysterious = hintType == HINT_TYPE_MERCHANT && ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ON_NO_HINT);
+  if (hintType == HINT_TYPE_ITEM || hintType == HINT_TYPE_ITEM_AREA){
     for(uint8_t c = 0; c < locations.size(); c++){
       namesTemp = {};
       saveNames = false;
-      uint8_t selection = GetRandomHintTextEntry(GetItemHintText(c, mysterious));
+      uint8_t selection = GetRandomHintTextEntry(GetItemHintText(c));
       if (selection > 0){
         saveNames = true;
       }
@@ -332,13 +331,6 @@ const CustomMessage Hint::GetHintMessage(MessageFormat format, uint8_t id) const
         toInsert.push_back(GetItemName(b)); 
       }
       break;}
-    case HINT_TYPE_MERCHANT:{
-        //if we write items, but need to adjust for merchants
-        bool mysterious = hintType == HINT_TYPE_MERCHANT && ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ON_NO_HINT);
-        for(uint8_t b = 0; b < locations.size(); b++){
-          toInsert.push_back(GetItemName(b, mysterious));
-        }
-        break;}
     case HINT_TYPE_TRIAL:{
       //If we write trials
       for(uint8_t b = 0; b < trials.size(); b++){
@@ -507,7 +499,7 @@ void Hint::logHint(oJson& jsonData){
     staticHint = false;
   }
   if (enabled &&
-      (!(staticHint && (hintType == HINT_TYPE_ITEM || hintType == HINT_TYPE_MERCHANT) && ctx->GetOption(RSK_HINT_CLARITY).Is(RO_HINT_CLARITY_CLEAR)))){
+      (!(staticHint && (hintType == HINT_TYPE_ITEM) && ctx->GetOption(RSK_HINT_CLARITY).Is(RO_HINT_CLARITY_CLEAR)))){
       //skip if not enabled or if a static hint with no possible variance
     jsonData[logMap][Rando::StaticData::hintNames[ownKey].GetForCurrentLanguage(MF_CLEAN)] = toJSON();
   }
diff --git a/soh/soh/Enhancements/randomizer/hint.h b/soh/soh/Enhancements/randomizer/hint.h
index dc626ebf9..03e1af850 100644
--- a/soh/soh/Enhancements/randomizer/hint.h
+++ b/soh/soh/Enhancements/randomizer/hint.h
@@ -38,7 +38,7 @@ class Hint {
      const HintText GetHintText(uint8_t id = 0) const;
      oJson toJSON();
      void logHint(oJson& jsonData);
-     const HintText GetItemHintText(uint8_t slot, bool mysterious) const;
+     const HintText GetItemHintText(uint8_t slot, bool mysterious = false) const;
      const HintText GetAreaHintText(uint8_t slot) const;
      const CustomMessage GetItemName(uint8_t slot, bool mysterious = false) const;
      const CustomMessage GetAreaName(uint8_t slot) const;
diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index af56293cb..c71f1965c 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -36,6 +36,9 @@ extern "C" {
 #include "src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h"
 #include "src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.h"
 #include "src/overlays/actors/ovl_En_Ge1/z_en_ge1.h"
+#include "src/overlays/actors/ovl_En_Ds/z_en_ds.h"
+#include "src/overlays/actors/ovl_En_Gm/z_en_gm.h"
+#include "src/overlays/actors/ovl_En_Js/z_en_js.h"
 #include "src/overlays/actors/ovl_En_Door/z_en_door.h"
 #include "src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h"
 #include "src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.h"
@@ -512,7 +515,8 @@ void EnCow_MoveForRandomizer(EnCow* enCow, PlayState* play) {
 }
 
 u8 EnDs_RandoCanGetGrannyItem() {
-    return RAND_GET_OPTION(RSK_SHUFFLE_MERCHANTS) != RO_SHUFFLE_MERCHANTS_OFF &&
+    return (RAND_GET_OPTION(RSK_SHUFFLE_MERCHANTS) == RO_SHUFFLE_MERCHANTS_ALL_BUT_BEANS ||
+            RAND_GET_OPTION(RSK_SHUFFLE_MERCHANTS) == RO_SHUFFLE_MERCHANTS_ALL) &&
            !Flags_GetRandomizerInf(RAND_INF_MERCHANTS_GRANNYS_SHOP) &&
            // Traded odd mushroom when adult trade is on
            ((RAND_GET_OPTION(RSK_SHUFFLE_ADULT_TRADE) && Flags_GetItemGetInf(ITEMGETINF_30)) ||
@@ -521,6 +525,20 @@ u8 EnDs_RandoCanGetGrannyItem() {
              INV_CONTENT(ITEM_CLAIM_CHECK) == ITEM_CLAIM_CHECK));
 }
 
+u8 EnJs_RandoCanGetCarpetMerchantItem() {
+    return  (RAND_GET_OPTION(RSK_SHUFFLE_MERCHANTS) == RO_SHUFFLE_MERCHANTS_ALL ||
+             RAND_GET_OPTION(RSK_SHUFFLE_MERCHANTS) == RO_SHUFFLE_MERCHANTS_ALL_BUT_BEANS) &&
+            // If the rando check has already been awarded, use vanilla behavior.
+            !Flags_GetRandomizerInf(RAND_INF_MERCHANTS_CARPET_SALESMAN);
+}
+
+u8 EnGm_RandoCanGetMedigoronItem() {
+    return  (RAND_GET_OPTION(RSK_SHUFFLE_MERCHANTS) == RO_SHUFFLE_MERCHANTS_ALL ||
+             RAND_GET_OPTION(RSK_SHUFFLE_MERCHANTS) == RO_SHUFFLE_MERCHANTS_ALL_BUT_BEANS) &&
+            // If the rando check has already been awarded, use vanilla behavior.
+            !Flags_GetRandomizerInf(RAND_INF_MERCHANTS_MEDIGORON);
+}
+
 RandomizerCheck EnFr_RandomizerCheckFromSongIndex(u16 songIndex) {
     switch (songIndex) {
         case FROG_ZL:
@@ -574,6 +592,8 @@ void RandomizerSetChestGameRandomizerInf(RandomizerCheck rc) {
         case RC_MARKET_TREASURE_CHEST_GAME_KEY_5:
             Flags_SetRandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_5);
             break;
+        default:
+            break;
     }
 }
 
@@ -681,8 +701,9 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             break;
         }
         case VB_BE_ELIGIBLE_FOR_MAGIC_BEANS_PURCHASE: {
-            if (RAND_GET_OPTION(RSK_SHUFFLE_MAGIC_BEANS)) {
-                *should = gSaveContext.rupees >= 60;
+            if (RAND_GET_OPTION(RSK_SHUFFLE_MERCHANTS) == RO_SHUFFLE_MERCHANTS_BEANS_ONLY ||
+                RAND_GET_OPTION(RSK_SHUFFLE_MERCHANTS) == RO_SHUFFLE_MERCHANTS_ALL) {
+                *should = gSaveContext.rupees >= OTRGlobals::Instance->gRandoContext->GetItemLocation(RC_ZR_MAGIC_BEAN_SALESMAN)->GetPrice();
             }
             break;
         }
@@ -852,8 +873,11 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             if (!EnDs_RandoCanGetGrannyItem()) {
                 break;
             }
+            EnDs* granny = static_cast<EnDs*>(optionalArg);
             // Only setting the inf if we've actually gotten the rando item and not the vanilla blue potion
             Flags_SetRandomizerInf(RAND_INF_MERCHANTS_GRANNYS_SHOP);
+            granny->actor.parent = NULL;
+            granny->actionFunc = EnDs_Talk;
             *should = false;
             break;
         }
@@ -878,23 +902,47 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             *should = false;
             break;
         }
+        case VB_CHECK_RANDO_PRICE_OF_CARPET_SALESMAN: {
+            if (EnJs_RandoCanGetCarpetMerchantItem()){
+                *should = gSaveContext.rupees < OTRGlobals::Instance->gRandoContext->GetItemLocation(RC_WASTELAND_BOMBCHU_SALESMAN)->GetPrice();
+            }
+            break;
+        }
         case VB_GIVE_ITEM_FROM_CARPET_SALESMAN: {
-            *should = RAND_GET_OPTION(RSK_SHUFFLE_MERCHANTS) == RO_SHUFFLE_MERCHANTS_OFF ||
-                      // If the rando check has already been awarded, use vanilla behavior.
-                      Flags_GetRandomizerInf(RAND_INF_MERCHANTS_CARPET_SALESMAN);
+            EnJs* enJs = static_cast<EnJs*>(optionalArg);
+            if (EnJs_RandoCanGetCarpetMerchantItem()){
+                Rupees_ChangeBy(OTRGlobals::Instance->gRandoContext->GetItemLocation(RC_WASTELAND_BOMBCHU_SALESMAN)->GetPrice() * -1);
+                enJs->actor.parent = NULL;
+                enJs->actor.textId = TEXT_CARPET_SALESMAN_ARMS_DEALER;
+                enJs->actionFunc = (EnJsActionFunc)func_80A890C0;
+                enJs->actor.flags |= ACTOR_FLAG_WILL_TALK;
+                Flags_SetRandomizerInf(RAND_INF_MERCHANTS_CARPET_SALESMAN);
+                *should = true;
+            }
             break;
         }
         case VB_GIVE_BOMBCHUS_FROM_CARPET_SALESMAN: {
             *should = RAND_GET_OPTION(RSK_BOMBCHUS_IN_LOGIC) == false || INV_CONTENT(ITEM_BOMBCHU) == ITEM_BOMBCHU;
             break;
         }
+        case VB_CHECK_RANDO_PRICE_OF_MEDIGORON: {
+            if (EnGm_RandoCanGetMedigoronItem()){
+                *should = gSaveContext.rupees < OTRGlobals::Instance->gRandoContext->GetItemLocation(RC_GC_MEDIGORON)->GetPrice();
+            }
+            break;
+        }
+
         case VB_GIVE_ITEM_FROM_MEDIGORON: {
             // fallthrough
         case VB_BE_ELIGIBLE_FOR_GIANTS_KNIFE_PURCHASE:
-            if (RAND_GET_OPTION(RSK_SHUFFLE_MERCHANTS) != RO_SHUFFLE_MERCHANTS_OFF &&
-                !Flags_GetRandomizerInf(RAND_INF_MERCHANTS_MEDIGORON)) {
+            if (EnGm_RandoCanGetMedigoronItem()) {
                 if (id == VB_GIVE_ITEM_FROM_MEDIGORON) {
+                    EnGm* enGm = static_cast<EnGm*>(optionalArg);
                     Flags_SetInfTable(INFTABLE_B1);
+                    Flags_SetRandomizerInf(RAND_INF_MERCHANTS_MEDIGORON);
+                    enGm->actor.parent = NULL;
+                    enGm->actionFunc = (EnGmActionFunc)func_80A3DC44;
+                    Rupees_ChangeBy(OTRGlobals::Instance->gRandoContext->GetItemLocation(RC_GC_MEDIGORON)->GetPrice() * -1);
                     *should = false;
                 } else {
                     // Resets "Talked to Medigoron" flag in infTable to restore initial conversation state
@@ -906,8 +954,9 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
         }
         case VB_GIVE_ITEM_FROM_MAGIC_BEAN_SALESMAN: {
             EnMs* enMs = static_cast<EnMs*>(optionalArg);
-            if (RAND_GET_OPTION(RSK_SHUFFLE_MAGIC_BEANS)) {
-                Rupees_ChangeBy(-60);
+            if (RAND_GET_OPTION(RSK_SHUFFLE_MERCHANTS) == RO_SHUFFLE_MERCHANTS_BEANS_ONLY ||
+                RAND_GET_OPTION(RSK_SHUFFLE_MERCHANTS) == RO_SHUFFLE_MERCHANTS_ALL) {
+                Rupees_ChangeBy(OTRGlobals::Instance->gRandoContext->GetItemLocation(RC_ZR_MAGIC_BEAN_SALESMAN)->GetPrice() * -1);
                 BEANS_BOUGHT = 10;
                 // Only set inf for buying rando check
                 Flags_SetRandomizerInf(RAND_INF_MERCHANTS_MAGIC_BEAN_SALESMAN);
@@ -944,9 +993,13 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             break;
         }
         case VB_TRADE_ODD_MUSHROOM: {
+            EnDs* granny = static_cast<EnDs*>(optionalArg);
             Randomizer_ConsumeAdultTradeItem(gPlayState, ITEM_ODD_MUSHROOM);
             // Trigger the reward now
             Flags_SetItemGetInf(ITEMGETINF_30);
+            granny->actor.textId = 0x504F;
+            granny->actionFunc = (EnDsActionFunc)EnDs_TalkAfterGiveOddPotion;
+            granny->actor.flags &= ~ACTOR_FLAG_PLAYER_TALKED_TO;
             *should = false;
             break;
         }
@@ -1045,6 +1098,19 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             *should |= RAND_GET_OPTION(RSK_SHUFFLE_ADULT_TRADE) == RO_GENERIC_OFF;
             break;
         }
+        case VB_GRANNY_SAY_INSUFFICIENT_RUPEES: {
+            if (EnDs_RandoCanGetGrannyItem()){
+                *should = gSaveContext.rupees < OTRGlobals::Instance->gRandoContext->GetItemLocation(RC_KAK_GRANNYS_SHOP)->GetPrice();
+            }
+            break;
+        }
+        case VB_GRANNY_TAKE_MONEY: {
+            if (EnDs_RandoCanGetGrannyItem()){
+                    *should = false;
+                    Rupees_ChangeBy(OTRGlobals::Instance->gRandoContext->GetItemLocation(RC_KAK_GRANNYS_SHOP)->GetPrice() * -1);
+                }
+            break;
+        }
         case VB_NEED_BOTTLE_FOR_GRANNYS_ITEM: {
             // Allow buying the rando item regardless of having a bottle
             *should &= !EnDs_RandoCanGetGrannyItem();
@@ -1333,6 +1399,8 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
         case VB_GIVE_ITEM_SHADOW_MEDALLION:
             *should = false;
             break;
+        default:
+            break;
     }
 }
 
diff --git a/soh/soh/Enhancements/randomizer/item.cpp b/soh/soh/Enhancements/randomizer/item.cpp
index 2d3f48451..5f94ad6e4 100644
--- a/soh/soh/Enhancements/randomizer/item.cpp
+++ b/soh/soh/Enhancements/randomizer/item.cpp
@@ -84,14 +84,8 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
     std::shared_ptr<Rando::Context> ctx = Rando::Context::GetInstance();
     auto logic = ctx->GetLogic();
     RandomizerGet actual = RG_NONE;
-    const bool tycoonWallet = !(
-        ctx->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_OFF) ||
-        (
-            ctx->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_SPECIFIC_COUNT) &&
-            ctx->GetOption(RSK_SHOPSANITY_COUNT).Is(RO_SHOPSANITY_COUNT_ZERO_ITEMS)
-        )
-    );
-    const u8 infiniteUpgrades = ctx->GetOption(RSK_INFINITE_UPGRADES).Value<u8>();
+    const bool tycoonWallet = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_INCLUDE_TYCOON_WALLET);
+    const u8 infiniteUpgrades = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_INFINITE_UPGRADES);
     switch (randomizerGet) {
         case RG_PROGRESSIVE_STICK_UPGRADE:
             switch (logic->CurrentUpgrade(UPG_STICKS)) {
@@ -287,8 +281,11 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
                     actual = RG_GIANT_WALLET;
                     break;
                 case 2:
-                    actual = tycoonWallet ? RG_TYCOON_WALLET : RG_GIANT_WALLET;
-                    break;
+                    if(tycoonWallet){
+                        actual = RG_TYCOON_WALLET;
+                        break;
+                    }
+                    //fallthrough
                 case 3:
                 case 4:
                     if (infiniteUpgrades != RO_INF_UPGRADES_OFF) {
diff --git a/soh/soh/Enhancements/randomizer/item_location.cpp b/soh/soh/Enhancements/randomizer/item_location.cpp
index 0cce409fc..e5c9ce6cc 100644
--- a/soh/soh/Enhancements/randomizer/item_location.cpp
+++ b/soh/soh/Enhancements/randomizer/item_location.cpp
@@ -77,6 +77,7 @@ void ItemLocation::ApplyPlacedItemEffect() const {
 }
 
 uint16_t ItemLocation::GetPrice() const {
+    //RANDOTODO if we ever change price of shop items, this needs replacing with proper price assignment in Fill
     if (StaticData::RetrieveItem(placedItem).GetItemType() == ITEMTYPE_SHOP) {
         return StaticData::RetrieveItem(placedItem).GetPrice();
     }
diff --git a/soh/soh/Enhancements/randomizer/location.cpp b/soh/soh/Enhancements/randomizer/location.cpp
index 135fddeea..d7f0a6444 100644
--- a/soh/soh/Enhancements/randomizer/location.cpp
+++ b/soh/soh/Enhancements/randomizer/location.cpp
@@ -82,6 +82,10 @@ RandomizerGet Rando::Location::GetVanillaItem() const {
     return vanillaItem;
 }
 
+int16_t Rando::Location::GetVanillaPrice() const {
+    return vanillaPrice;
+}
+
 RandomizerCheckArea GetAreaFromScene(uint8_t scene) {
     switch (scene) {
         case SCENE_LINKS_HOUSE:
@@ -243,29 +247,30 @@ RandomizerCheckArea GetAreaFromScene(uint8_t scene) {
     }
 }
 
+
 Rando::Location Rando::Location::Base(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, ActorID actorId_, SceneID scene_, int32_t actorParams_,
                                       std::string&& shortName_, std::string&& spoilerName_, const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
-                                      SpoilerCollectionCheck collectionCheck, bool isVanillaCompletion_) {
+                                      SpoilerCollectionCheck collectionCheck, bool isVanillaCompletion_, uint16_t vanillaPrice_) {
     return { rc, quest_, checkType_, GetAreaFromScene(scene_), actorId_, scene_, actorParams_, std::move(shortName_), std::move(spoilerName_), hintKey, vanillaItem,
-                    isVanillaCompletion_, collectionCheck };
+                    isVanillaCompletion_, collectionCheck, vanillaPrice_ };
 }
 
 Rando::Location Rando::Location::Base(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_, ActorID actorId_, SceneID scene_,
                                       int32_t actorParams_, std::string&& shortName_, std::string&& spoilerName_, const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
-                                      SpoilerCollectionCheck collectionCheck, bool isVanillaCompletion_) {
-    return { rc, quest_, checkType_, area_, actorId_, scene_, actorParams_, std::move(shortName_), std::move(spoilerName_), hintKey, vanillaItem, isVanillaCompletion_, collectionCheck };
+                                      SpoilerCollectionCheck collectionCheck, bool isVanillaCompletion_, uint16_t vanillaPrice_) {
+    return { rc, quest_, checkType_, area_, actorId_, scene_, actorParams_, std::move(shortName_), std::move(spoilerName_), hintKey, vanillaItem, isVanillaCompletion_, collectionCheck, vanillaPrice_ };
 }
 
 Rando::Location Rando::Location::Base(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, ActorID actorId_, SceneID scene_, int32_t actorParams_,
                                       std::string&& shortName_, const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem, SpoilerCollectionCheck collectionCheck,
-                                      bool isVanillaCompletion_) {
-    return { rc, quest_, checkType_, GetAreaFromScene(scene_), actorId_, scene_, actorParams_, std::move(shortName_), hintKey, vanillaItem, isVanillaCompletion_, collectionCheck };
+                                      bool isVanillaCompletion_, uint16_t vanillaPrice_) {
+    return { rc, quest_, checkType_, GetAreaFromScene(scene_), actorId_, scene_, actorParams_, std::move(shortName_), hintKey, vanillaItem, isVanillaCompletion_, collectionCheck , vanillaPrice_ };
 }
 
 Rando::Location Rando::Location::Base(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_, ActorID actorId_, SceneID scene_,
                                       int32_t actorParams_, std::string&& shortName_, const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
-                                      SpoilerCollectionCheck collectionCheck, bool isVanillaCompletion_) {
-    return { rc, quest_, checkType_, area_, actorId_, scene_, actorParams_, std::move(shortName_), hintKey, vanillaItem, isVanillaCompletion_, collectionCheck };
+                                      SpoilerCollectionCheck collectionCheck, bool isVanillaCompletion_, uint16_t vanillaPrice_) {
+    return { rc, quest_, checkType_, area_, actorId_, scene_, actorParams_, std::move(shortName_), hintKey, vanillaItem, isVanillaCompletion_, collectionCheck, vanillaPrice_  };
 }
 
 Rando::Location Rando::Location::Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, ActorID actorId_, SceneID scene_, int32_t actorParams_,
diff --git a/soh/soh/Enhancements/randomizer/location.h b/soh/soh/Enhancements/randomizer/location.h
index 09a015a1e..c5ab902e4 100644
--- a/soh/soh/Enhancements/randomizer/location.h
+++ b/soh/soh/Enhancements/randomizer/location.h
@@ -53,18 +53,20 @@ class Location {
 
     Location(const RandomizerCheck rc_, const RandomizerCheckQuest quest_, const RandomizerCheckType checkType_, const RandomizerCheckArea area_, const ActorID actorId_,
              const SceneID scene_, const int32_t actorParams_, std::string shortName_, std::string spoilerName_, const RandomizerHintTextKey hintKey_,
-             const RandomizerGet vanillaItem_, const bool isVanillaCompletion_ = false, const SpoilerCollectionCheck collectionCheck_ = SpoilerCollectionCheck())
+             const RandomizerGet vanillaItem_, const bool isVanillaCompletion_ = false, const SpoilerCollectionCheck collectionCheck_ = SpoilerCollectionCheck(),
+             const int vanillaPrice_ = 0)
         : rc(rc_), quest(quest_), checkType(checkType_), area(area_), actorId(actorId_),
           scene(scene_), actorParams(actorParams_), shortName(std::move(shortName_)),
           spoilerName(std::move(spoilerName_)), hintKey(hintKey_), vanillaItem(vanillaItem_),
-          isVanillaCompletion(isVanillaCompletion_), collectionCheck(collectionCheck_) {}
+          isVanillaCompletion(isVanillaCompletion_), collectionCheck(collectionCheck_), vanillaPrice(vanillaPrice_) {}
 
     Location(const RandomizerCheck rc_, const RandomizerCheckQuest quest_, const RandomizerCheckType checkType_, const RandomizerCheckArea area_, const ActorID actorId_,
              const SceneID scene_, const int32_t actorParams_, std::string shortName_, const RandomizerHintTextKey hintKey_, const RandomizerGet vanillaItem_,
-             const bool isVanillaCompletion_ = false, const SpoilerCollectionCheck collectionCheck_ = SpoilerCollectionCheck())
+             const bool isVanillaCompletion_ = false, const SpoilerCollectionCheck collectionCheck_ = SpoilerCollectionCheck(),
+             const int vanillaPrice_ = 0)
         : rc(rc_), quest(quest_), checkType(checkType_), area(area_), actorId(actorId_), scene(scene_), actorParams(actorParams_), shortName(shortName_),
           spoilerName(SpoilerNameFromShortName(shortName_, area_)), hintKey(hintKey_), vanillaItem(vanillaItem_), isVanillaCompletion(isVanillaCompletion_),
-          collectionCheck(collectionCheck_) {}
+          collectionCheck(collectionCheck_), vanillaPrice(vanillaPrice_) {}
 
     static std::string SpoilerNameFromShortName(std::string shortName, RandomizerCheckArea area) {
         if (area < 0 || area >= RCAREA_INVALID) {
@@ -92,22 +94,23 @@ class Location {
     uint32_t Getuint32_t() const;
     const HintText& GetHint() const;
     RandomizerGet GetVanillaItem() const;
+    int16_t GetVanillaPrice() const;
 
     static Location Base(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, ActorID actorId_, SceneID scene_, int32_t actorParams_,
                          std::string&& shortName_, std::string&& spoilerName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
-                         SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(), bool isVanillaCompletion_ = false);
+                         SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(), bool isVanillaCompletion_ = false, uint16_t vanillaPrice_ = 0);
 
     static Location Base(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, ActorID actorId_, SceneID scene_, int32_t actorParams_,
                          std::string&& shortName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem, SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(),
-                         bool isVanillaCompletion_ = false);
+                         bool isVanillaCompletion_ = false, uint16_t vanillaPrice_ = 0);
 
     static Location Base(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_, ActorID actorId_, SceneID scene_,
                          int32_t actorParams_, std::string&& shortName_, std::string&& spoilerName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
-                         SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(), bool isVanillaCompletion_ = false);
+                         SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(), bool isVanillaCompletion_ = false, uint16_t vanillaPrice_ = 0);
 
     static Location Base(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_, ActorID actorId_, SceneID scene_,
                          int32_t actorParams_, std::string&& shortName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
-                         SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(), bool isVanillaCompletion_ = false);
+                         SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(), bool isVanillaCompletion_ = false, uint16_t vanillaPrice_ = 0);
 
     static Location Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_, ActorID actorId_, SceneID scene_,
                           int32_t actorParams_, uint8_t flag_, std::string&& shortName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem, bool isVanillaCompletion_ = false);
@@ -192,6 +195,7 @@ class Location {
     RandomizerGet vanillaItem;
     bool isVanillaCompletion;
     SpoilerCollectionCheck collectionCheck;
+    int16_t vanillaPrice;
     bool isHintable = false;
 };
 } // namespace Rando
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/location_list.cpp b/soh/soh/Enhancements/randomizer/location_list.cpp
index 29ef5ae65..f85b32aff 100644
--- a/soh/soh/Enhancements/randomizer/location_list.cpp
+++ b/soh/soh/Enhancements/randomizer/location_list.cpp
@@ -55,6 +55,16 @@ std::vector<RandomizerCheck> Rando::StaticData::GetScrubLocations() {
     return scrubLocations;
 }
 
+std::vector<RandomizerCheck> Rando::StaticData::GetMerchantLocations() {
+    std::vector<RandomizerCheck> scrubLocations = {};
+    for (Location& location : locationTable) {
+        if (location.GetRCType() == RCTYPE_MERCHANT && location.GetRandomizerCheck() != RC_UNKNOWN_CHECK) {
+            scrubLocations.push_back(location.GetRandomizerCheck());
+        }
+    }
+    return scrubLocations;
+}
+
 std::vector<RandomizerCheck> Rando::StaticData::GetAdultTradeLocations() {
     std::vector<RandomizerCheck> tradeLocations = {};
     for (Location& location : locationTable) {
@@ -138,24 +148,24 @@ void Rando::StaticData::InitLocationTable() { //
     locationTable[RC_LW_TRADE_ODD_POTION] =                                            Location::Base(RC_LW_TRADE_ODD_POTION,                                          RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                                                      ACTOR_ID_MAX,         SCENE_LOST_WOODS,                   0x00,                               "Trade Odd Potion",                            RHT_LW_TRADE_COJIRO,                                             RG_POACHERS_SAW,                                                    SpoilerCollectionCheck::ItemGetInf(49),                                                                                       true);
     locationTable[RC_LW_OCARINA_MEMORY_GAME] =                                         Location::Base(RC_LW_OCARINA_MEMORY_GAME,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_LOST_WOODS,                   0x00,                               "Ocarina Memory Game",                         RHT_LW_OCARINA_MEMORY_GAME,                                      RG_PIECE_OF_HEART,                                                  SpoilerCollectionCheck::ItemGetInf(23),                                                                                       true);
     locationTable[RC_LW_TARGET_IN_WOODS] =                                             Location::Base(RC_LW_TARGET_IN_WOODS,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_LOST_WOODS,                   0x00,                               "Target in Woods",                             RHT_LW_TARGET_IN_WOODS,                                          RG_PROGRESSIVE_SLINGSHOT,                                           SpoilerCollectionCheck::ItemGetInf(29),                                                                                       true);
-    locationTable[RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT] =                          Location::Base(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT,                        RCQUEST_BOTH,    RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_LOST_WOODS,                   0x00,                               "Deku Scrub Near Deku Theater Right",          RHT_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT,                       RG_BUY_DEKU_NUTS_5,                                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT));
-    locationTable[RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT] =                           Location::Base(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT,                         RCQUEST_BOTH,    RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_LOST_WOODS,                   0x01,                               "Deku Scrub Near Deku Theater Left",           RHT_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT,                        RG_BUY_DEKU_STICK_1,                                                SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT));
-    locationTable[RC_LW_DEKU_SCRUB_NEAR_BRIDGE] =                                      Location::Base(RC_LW_DEKU_SCRUB_NEAR_BRIDGE,                                    RCQUEST_BOTH,    RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_LOST_WOODS,                   0x09,                               "Deku Scrub Near Bridge",                      RHT_LW_DEKU_SCRUB_NEAR_BRIDGE,                                   RG_PROGRESSIVE_STICK_UPGRADE,                                       SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_NEAR_BRIDGE),                                   true);
-    locationTable[RC_LW_DEKU_SCRUB_GROTTO_REAR] =                                      Location::Base(RC_LW_DEKU_SCRUB_GROTTO_REAR,                                    RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LOST_WOODS,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x03, 0xF5),       "Deku Scrub Grotto Rear",                      RHT_LW_DEKU_SCRUB_GROTTO_REAR,                                   RG_BUY_DEKU_SEEDS_30,                                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_GROTTO_REAR));
-    locationTable[RC_LW_DEKU_SCRUB_GROTTO_FRONT] =                                     Location::Base(RC_LW_DEKU_SCRUB_GROTTO_FRONT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LOST_WOODS,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x0A, 0xF5),       "Deku Scrub Grotto Front",                     RHT_LW_DEKU_SCRUB_GROTTO_FRONT,                                  RG_PROGRESSIVE_NUT_UPGRADE,                                         SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_GROTTO_FRONT));
+    locationTable[RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT] =                          Location::Base(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT,                        RCQUEST_BOTH,    RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_LOST_WOODS,                   0x00,                               "Deku Scrub Near Deku Theater Right",          RHT_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT,                       RG_BUY_DEKU_NUTS_5,                                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT),                 false, 20);
+    locationTable[RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT] =                           Location::Base(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT,                         RCQUEST_BOTH,    RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_LOST_WOODS,                   0x01,                               "Deku Scrub Near Deku Theater Left",           RHT_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT,                        RG_BUY_DEKU_STICK_1,                                                SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT),                 false, 15);
+    locationTable[RC_LW_DEKU_SCRUB_NEAR_BRIDGE] =                                      Location::Base(RC_LW_DEKU_SCRUB_NEAR_BRIDGE,                                    RCQUEST_BOTH,    RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_LOST_WOODS,                   0x09,                               "Deku Scrub Near Bridge",                      RHT_LW_DEKU_SCRUB_NEAR_BRIDGE,                                   RG_PROGRESSIVE_STICK_UPGRADE,                                       SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_NEAR_BRIDGE),                                   true,  40);
+    locationTable[RC_LW_DEKU_SCRUB_GROTTO_REAR] =                                      Location::Base(RC_LW_DEKU_SCRUB_GROTTO_REAR,                                    RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LOST_WOODS,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x03, 0xF5),       "Deku Scrub Grotto Rear",                      RHT_LW_DEKU_SCRUB_GROTTO_REAR,                                   RG_BUY_DEKU_SEEDS_30,                                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_GROTTO_REAR),                 false, 40);
+    locationTable[RC_LW_DEKU_SCRUB_GROTTO_FRONT] =                                     Location::Base(RC_LW_DEKU_SCRUB_GROTTO_FRONT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LOST_WOODS,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x0A, 0xF5),       "Deku Scrub Grotto Front",                     RHT_LW_DEKU_SCRUB_GROTTO_FRONT,                                  RG_PROGRESSIVE_NUT_UPGRADE,                                         SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_GROTTO_FRONT),                 false, 40);
     locationTable[RC_DEKU_THEATER_SKULL_MASK] =                                        Location::Base(RC_DEKU_THEATER_SKULL_MASK,                                      RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LOST_WOODS,                   ACTOR_ID_MAX,         SCENE_GROTTOS,                      0x00,                               "Deku Theater Skull Mask",                     RHT_DEKU_THEATER_SKULL_MASK,                                     RG_PROGRESSIVE_STICK_UPGRADE,                                       SpoilerCollectionCheck::ItemGetInf(ITEMGETINF_OBTAINED_STICK_UPGRADE_FROM_STAGE),                                             true);
     locationTable[RC_DEKU_THEATER_MASK_OF_TRUTH] =                                     Location::Base(RC_DEKU_THEATER_MASK_OF_TRUTH,                                   RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_LOST_WOODS,                   ACTOR_ID_MAX,         SCENE_GROTTOS,                      0x00,                               "Deku Theater Mask of Truth",                  RHT_DEKU_THEATER_MASK_OF_TRUTH,                                  RG_PROGRESSIVE_NUT_UPGRADE,                                         SpoilerCollectionCheck::ItemGetInf(ITEMGETINF_OBTAINED_NUT_UPGRADE_FROM_STAGE),                                               true);
     // Sacred Forest Meadow
     locationTable[RC_SFM_WOLFOS_GROTTO_CHEST] =                                       Location::Chest(RC_SFM_WOLFOS_GROTTO_CHEST,                                      RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_SACRED_FOREST_MEADOW,         ACTOR_EN_BOX,         SCENE_GROTTOS,                      31409,                        0x11, "Wolfos Grotto Chest",                         RHT_SFM_WOLFOS_GROTTO_CHEST,                                     RG_PURPLE_RUPEE);
-    locationTable[RC_SFM_DEKU_SCRUB_GROTTO_REAR] =                                     Location::Base(RC_SFM_DEKU_SCRUB_GROTTO_REAR,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_SACRED_FOREST_MEADOW,         ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x07, 0xEE),       "Deku Scrub Grotto Rear",                      RHT_SFM_DEKU_SCRUB_GROTTO_REAR,                                  RG_BUY_RED_POTION_30,                                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_SFM_DEKU_SCRUB_GROTTO_REAR));
-    locationTable[RC_SFM_DEKU_SCRUB_GROTTO_FRONT] =                                    Location::Base(RC_SFM_DEKU_SCRUB_GROTTO_FRONT,                                  RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_SACRED_FOREST_MEADOW,         ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x08, 0xEE),       "Deku Scrub Grotto Front",                     RHT_SFM_DEKU_SCRUB_GROTTO_FRONT,                                 RG_BUY_GREEN_POTION,                                                SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_SFM_DEKU_SCRUB_GROTTO_FRONT));
+    locationTable[RC_SFM_DEKU_SCRUB_GROTTO_REAR] =                                     Location::Base(RC_SFM_DEKU_SCRUB_GROTTO_REAR,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_SACRED_FOREST_MEADOW,         ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x07, 0xEE),       "Deku Scrub Grotto Rear",                      RHT_SFM_DEKU_SCRUB_GROTTO_REAR,                                  RG_BUY_RED_POTION_40,                                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_SFM_DEKU_SCRUB_GROTTO_REAR),                 false, 40);
+    locationTable[RC_SFM_DEKU_SCRUB_GROTTO_FRONT] =                                    Location::Base(RC_SFM_DEKU_SCRUB_GROTTO_FRONT,                                  RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_SACRED_FOREST_MEADOW,         ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x08, 0xEE),       "Deku Scrub Grotto Front",                     RHT_SFM_DEKU_SCRUB_GROTTO_FRONT,                                 RG_BUY_GREEN_POTION,                                                SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_SFM_DEKU_SCRUB_GROTTO_FRONT),                 false, 40);
     // Hyrule Field
     locationTable[RC_HF_SOUTHEAST_GROTTO_CHEST] =                                     Location::Chest(RC_HF_SOUTHEAST_GROTTO_CHEST,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_FIELD,                 ACTOR_EN_BOX,         SCENE_GROTTOS,                      22978,                        0x02, "Southeast Grotto Chest",                      RHT_HF_SOUTHEAST_GROTTO_CHEST,                                   RG_RED_RUPEE);
     locationTable[RC_HF_OPEN_GROTTO_CHEST] =                                          Location::Chest(RC_HF_OPEN_GROTTO_CHEST,                                         RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_FIELD,                 ACTOR_EN_BOX,         SCENE_GROTTOS,                      22947,                        0x03, "Open Grotto Chest",                           RHT_HF_OPEN_GROTTO_CHEST,                                        RG_BLUE_RUPEE);
     locationTable[RC_HF_NEAR_MARKET_GROTTO_CHEST] =                                   Location::Chest(RC_HF_NEAR_MARKET_GROTTO_CHEST,                                  RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_FIELD,                 ACTOR_EN_BOX,         SCENE_GROTTOS,                      22944,                        0x00, "Near Market Grotto Chest",                    RHT_HF_NEAR_MARKET_GROTTO_CHEST,                                 RG_BLUE_RUPEE);
     locationTable[RC_HF_OCARINA_OF_TIME_ITEM] =                                        Location::Base(RC_HF_OCARINA_OF_TIME_ITEM,                                      RCQUEST_BOTH,    RCTYPE_OCARINA,                                                          ACTOR_ID_MAX,         SCENE_HYRULE_FIELD,                 0x00,                               "Ocarina of Time Item",                        RHT_HF_OCARINA_OF_TIME_ITEM,                                     RG_PROGRESSIVE_OCARINA,                                             SpoilerCollectionCheck::EventChkInf(0x43));
     locationTable[RC_HF_TEKTITE_GROTTO_FREESTANDING_POH] =                      Location::Collectable(RC_HF_TEKTITE_GROTTO_FREESTANDING_POH,                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_FIELD,                 ACTOR_EN_ITEM00,      SCENE_GROTTOS,                      262,                          0x01, "Tektite Grotto Freestanding PoH",             RHT_HF_TEKTITE_GROTTO_FREESTANDING_POH,                          RG_PIECE_OF_HEART,                                                                                                                                                                                true);
-    locationTable[RC_HF_DEKU_SCRUB_GROTTO] =                                           Location::Base(RC_HF_DEKU_SCRUB_GROTTO,                                         RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_HYRULE_FIELD,                 ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x02, 0xE6),       "Deku Scrub Grotto",                           RHT_HF_DEKU_SCRUB_GROTTO,                                        RG_PIECE_OF_HEART,                                                  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_HF_DEKU_SCRUB_GROTTO),                                        true);
+    locationTable[RC_HF_DEKU_SCRUB_GROTTO] =                                           Location::Base(RC_HF_DEKU_SCRUB_GROTTO,                                         RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_HYRULE_FIELD,                 ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x02, 0xE6),       "Deku Scrub Grotto",                           RHT_HF_DEKU_SCRUB_GROTTO,                                        RG_PIECE_OF_HEART,                                                  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_HF_DEKU_SCRUB_GROTTO),                                        true,  10);
     // Lake Hylia
     locationTable[RC_LH_CHILD_FISHING] =                                               Location::Base(RC_LH_CHILD_FISHING,                                             RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_FISHING_POND,                 0x00,                               "Child Fishing",                               RHT_LH_CHILD_FISHING,                                            RG_PIECE_OF_HEART,                                                  SpoilerCollectionCheck::RandomizerInf(RAND_INF_CHILD_FISHING),                                                                true);
     locationTable[RC_LH_ADULT_FISHING] =                                               Location::Base(RC_LH_ADULT_FISHING,                                             RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_FISHING_POND,                 0x00,                               "Adult Fishing",                               RHT_LH_ADULT_FISHING,                                            RG_PROGRESSIVE_SCALE,                                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_ADULT_FISHING),                                                                true);
@@ -165,16 +175,16 @@ void Rando::StaticData::InitLocationTable() { //
     locationTable[RC_LH_UNDERWATER_ITEM] =                                             Location::Base(RC_LH_UNDERWATER_ITEM,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_LAKE_HYLIA,                   0x00,                               "Underwater Item",                             RHT_LH_UNDERWATER_ITEM,                                          RG_RUTOS_LETTER,                                                    SpoilerCollectionCheck::EventChkInf(0x31),                                                                                    true);
     locationTable[RC_LH_SUN] =                                                         Location::Base(RC_LH_SUN,                                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_LAKE_HYLIA,                   0x00,                               "Sun",                                         RHT_LH_SUN,                                                      RG_FIRE_ARROWS,                                                     SpoilerCollectionCheck::Chest(0x57, 0x1F),                                                                                    true);
     locationTable[RC_LH_FREESTANDING_POH] =                                     Location::Collectable(RC_LH_FREESTANDING_POH,                                          RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_ITEM00,      SCENE_LAKE_HYLIA,                   7686,                         0x1E, "Freestanding PoH",                            RHT_LH_FREESTANDING_POH,                                         RG_PIECE_OF_HEART,                                                                                                                                                                                true);
-    locationTable[RC_LH_DEKU_SCRUB_GROTTO_LEFT] =                                      Location::Base(RC_LH_DEKU_SCRUB_GROTTO_LEFT,                                    RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LAKE_HYLIA,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x00, 0xEF),       "Deku Scrub Grotto Left",                      RHT_LH_DEKU_SCRUB_GROTTO_LEFT,                                   RG_BUY_DEKU_NUTS_5,                                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LH_DEKU_SCRUB_GROTTO_LEFT));
-    locationTable[RC_LH_DEKU_SCRUB_GROTTO_RIGHT] =                                     Location::Base(RC_LH_DEKU_SCRUB_GROTTO_RIGHT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LAKE_HYLIA,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x05, 0xEF),       "Deku Scrub Grotto Right",                     RHT_LH_DEKU_SCRUB_GROTTO_RIGHT,                                  RG_BUY_BOMBS_535,                                                   SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LH_DEKU_SCRUB_GROTTO_RIGHT));
-    locationTable[RC_LH_DEKU_SCRUB_GROTTO_CENTER] =                                    Location::Base(RC_LH_DEKU_SCRUB_GROTTO_CENTER,                                  RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LAKE_HYLIA,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x03, 0xEF),       "Deku Scrub Grotto Center",                    RHT_LH_DEKU_SCRUB_GROTTO_CENTER,                                 RG_BUY_DEKU_SEEDS_30,                                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LH_DEKU_SCRUB_GROTTO_CENTER));
+    locationTable[RC_LH_DEKU_SCRUB_GROTTO_LEFT] =                                      Location::Base(RC_LH_DEKU_SCRUB_GROTTO_LEFT,                                    RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LAKE_HYLIA,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x00, 0xEF),       "Deku Scrub Grotto Left",                      RHT_LH_DEKU_SCRUB_GROTTO_LEFT,                                   RG_BUY_DEKU_NUTS_5,                                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LH_DEKU_SCRUB_GROTTO_LEFT),                 false, 20);
+    locationTable[RC_LH_DEKU_SCRUB_GROTTO_RIGHT] =                                     Location::Base(RC_LH_DEKU_SCRUB_GROTTO_RIGHT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LAKE_HYLIA,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x05, 0xEF),       "Deku Scrub Grotto Right",                     RHT_LH_DEKU_SCRUB_GROTTO_RIGHT,                                  RG_BUY_BOMBS_535,                                                   SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LH_DEKU_SCRUB_GROTTO_RIGHT),                 false, 40);
+    locationTable[RC_LH_DEKU_SCRUB_GROTTO_CENTER] =                                    Location::Base(RC_LH_DEKU_SCRUB_GROTTO_CENTER,                                  RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LAKE_HYLIA,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x03, 0xEF),       "Deku Scrub Grotto Center",                    RHT_LH_DEKU_SCRUB_GROTTO_CENTER,                                 RG_BUY_DEKU_SEEDS_30,                                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LH_DEKU_SCRUB_GROTTO_CENTER),                 false, 40);
     // Gerudo Valley
     locationTable[RC_GV_CHEST] =                                                      Location::Chest(RC_GV_CHEST,                                                     RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_GERUDO_VALLEY,                23200,                        0x00, "Chest",                                       RHT_GV_CHEST,                                                    RG_PURPLE_RUPEE);
     locationTable[RC_GV_TRADE_SAW] =                                                   Location::Base(RC_GV_TRADE_SAW,                                                 RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                                                      ACTOR_ID_MAX,         SCENE_GERUDO_VALLEY,                0x00,                               "Trade Saw",                                   RHT_GV_TRADE_SAW,                                                RG_BROKEN_SWORD,                                                    SpoilerCollectionCheck::RandomizerInf(RAND_INF_ADULT_TRADES_GV_TRADE_SAW),                                                    true);
     locationTable[RC_GV_WATERFALL_FREESTANDING_POH] =                           Location::Collectable(RC_GV_WATERFALL_FREESTANDING_POH,                                RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_ITEM00,      SCENE_GERUDO_VALLEY,                262,                          0x01, "Waterfall Freestanding PoH",                  RHT_GV_WATERFALL_FREESTANDING_POH,                               RG_PIECE_OF_HEART,                                                                                                                                                                                true);
     locationTable[RC_GV_CRATE_FREESTANDING_POH] =                               Location::Collectable(RC_GV_CRATE_FREESTANDING_POH,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_ITEM00,      SCENE_GERUDO_VALLEY,                518,                          0x02, "Crate Freestanding PoH",                      RHT_GV_CRATE_FREESTANDING_POH,                                   RG_PIECE_OF_HEART,                                                                                                                                                                                true);
-    locationTable[RC_GV_DEKU_SCRUB_GROTTO_REAR] =                                      Location::Base(RC_GV_DEKU_SCRUB_GROTTO_REAR,                                    RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_GERUDO_VALLEY,                ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x07, 0xF0),       "Deku Scrub Grotto Rear",                      RHT_GV_DEKU_SCRUB_GROTTO_FRONT,                                  RG_BUY_GREEN_POTION,                                                SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GV_DEKU_SCRUB_GROTTO_REAR));
-    locationTable[RC_GV_DEKU_SCRUB_GROTTO_FRONT] =                                     Location::Base(RC_GV_DEKU_SCRUB_GROTTO_FRONT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_GERUDO_VALLEY,                ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x08, 0xF0),       "Deku Scrub Grotto Front",                     RHT_GV_DEKU_SCRUB_GROTTO_FRONT,                                  RG_BUY_GREEN_POTION,                                                SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GV_DEKU_SCRUB_GROTTO_FRONT));
+    locationTable[RC_GV_DEKU_SCRUB_GROTTO_REAR] =                                      Location::Base(RC_GV_DEKU_SCRUB_GROTTO_REAR,                                    RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_GERUDO_VALLEY,                ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x07, 0xF0),       "Deku Scrub Grotto Rear",                      RHT_GV_DEKU_SCRUB_GROTTO_REAR,                                   RG_BUY_RED_POTION_40,                                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GV_DEKU_SCRUB_GROTTO_REAR),              false, 40);
+    locationTable[RC_GV_DEKU_SCRUB_GROTTO_FRONT] =                                     Location::Base(RC_GV_DEKU_SCRUB_GROTTO_FRONT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_GERUDO_VALLEY,                ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x08, 0xF0),       "Deku Scrub Grotto Front",                     RHT_GV_DEKU_SCRUB_GROTTO_FRONT,                                  RG_BUY_GREEN_POTION,                                                SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GV_DEKU_SCRUB_GROTTO_FRONT),              false, 40);
     // Gerudo Fortress
     locationTable[RC_GF_CHEST] =                                                      Location::Chest(RC_GF_CHEST,                                                     RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_GERUDOS_FORTRESS,             1984,                         0x00, "Chest",                                       RHT_GF_CHEST,                                                    RG_PIECE_OF_HEART,                                                                                                                                                                                true);
     locationTable[RC_GF_HBA_1000_POINTS] =                                             Location::Base(RC_GF_HBA_1000_POINTS,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_GERUDOS_FORTRESS,             0x00,                               "GF HBA 1000 Points",                          RHT_GF_HBA_1000_POINTS,                                          RG_PIECE_OF_HEART,                                                  SpoilerCollectionCheck::InfTable(INFTABLE_190),                                                                               true);
@@ -190,8 +200,8 @@ void Rando::StaticData::InitLocationTable() { //
     locationTable[RC_WASTELAND_BOMBCHU_SALESMAN] =                                     Location::Base(RC_WASTELAND_BOMBCHU_SALESMAN,                                   RCQUEST_BOTH,    RCTYPE_MERCHANT,                    RCAREA_WASTELAND,                    ACTOR_ID_MAX,         SCENE_HAUNTED_WASTELAND,            0x00,                               "Carpet Salesman",                             RHT_WASTELAND_BOMBCHU_SALESMAN,                                  RG_BUY_BOMBCHUS_10,                                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_MERCHANTS_CARPET_SALESMAN));
     // Desert Colossus
     locationTable[RC_COLOSSUS_FREESTANDING_POH] =                               Location::Collectable(RC_COLOSSUS_FREESTANDING_POH,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_ITEM00,      SCENE_DESERT_COLOSSUS,              3334,                         0x0D, "Freestanding PoH",                            RHT_COLOSSUS_FREESTANDING_POH,                                   RG_PIECE_OF_HEART,                                                                                                                                                                                true);
-    locationTable[RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR] =                                Location::Base(RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,                              RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_DESERT_COLOSSUS,              ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x07, 0xFD),       "Deku Scrub Grotto Rear",                      RHT_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,                             RG_BUY_RED_POTION_30,                                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_COLOSSUS_DEKU_SCRUB_GROTTO_REAR));
-    locationTable[RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT] =                               Location::Base(RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT,                             RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_DESERT_COLOSSUS,              ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x08, 0xFD),       "Deku Scrub Grotto Front",                     RHT_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT,                            RG_BUY_GREEN_POTION,                                                SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT));
+    locationTable[RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR] =                                Location::Base(RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,                              RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_DESERT_COLOSSUS,              ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x07, 0xFD),       "Deku Scrub Grotto Rear",                      RHT_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,                             RG_BUY_RED_POTION_40,                                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_COLOSSUS_DEKU_SCRUB_GROTTO_REAR),              false, 40);
+    locationTable[RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT] =                               Location::Base(RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT,                             RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_DESERT_COLOSSUS,              ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x08, 0xFD),       "Deku Scrub Grotto Front",                     RHT_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT,                            RG_BUY_GREEN_POTION,                                                SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT),              false, 40);
     // Market
     locationTable[RC_MARKET_TREASURE_CHEST_GAME_REWARD] =                             Location::Chest(RC_MARKET_TREASURE_CHEST_GAME_REWARD,                            RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_TREASURE_BOX_SHOP,            0x00,                               "Treasure Chest Game Reward",                  RHT_MARKET_TREASURE_CHEST_GAME_REWARD,                           RG_TREASURE_GAME_HEART,                                             SpoilerCollectionCheck::ItemGetInf(27),                                                                                       true);
     locationTable[RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE] =                             Location::Base(RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,                           RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_BOMBCHU_BOWLING_ALLEY,        0x00,                               "Bombchu Bowling First Prize",                 RHT_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,                          RG_PROGRESSIVE_BOMB_BAG,                                            SpoilerCollectionCheck::ItemGetInf(17),                                                                                       true);
@@ -224,7 +234,7 @@ void Rando::StaticData::InitLocationTable() { //
     locationTable[RC_KAK_MAN_ON_ROOF] =                                                Location::Base(RC_KAK_MAN_ON_ROOF,                                              RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_KAKARIKO_VILLAGE,             0x00,                               "Man on Roof",                                 RHT_KAK_MAN_ON_ROOF,                                             RG_PIECE_OF_HEART,                                                  SpoilerCollectionCheck::ItemGetInf(21),                                                                                       true);
     locationTable[RC_KAK_SHOOTING_GALLERY_REWARD] =                                    Location::Base(RC_KAK_SHOOTING_GALLERY_REWARD,                                  RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_SHOOTING_GALLERY,             0x00,                               "Shooting Gallery Reward",                     RHT_KAK_SHOOTING_GALLERY_REWARD,                                 RG_PROGRESSIVE_BOW,                                                 SpoilerCollectionCheck::ItemGetInf(ITEMGETINF_0E),                                                                            true);
     locationTable[RC_KAK_TRADE_ODD_MUSHROOM] =                                         Location::Base(RC_KAK_TRADE_ODD_MUSHROOM,                                       RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                                                      ACTOR_ID_MAX,         SCENE_POTION_SHOP_GRANNY,           0x00,                               "Trade Odd Mushroom",                          RHT_KAK_TRADE_ODD_MUSHROOM,                                      RG_ODD_POTION,                                                      SpoilerCollectionCheck::ItemGetInf(48),                                                                                       true);
-    locationTable[RC_KAK_GRANNYS_SHOP] =                                               Location::Base(RC_KAK_GRANNYS_SHOP,                                             RCQUEST_BOTH,    RCTYPE_MERCHANT,                                                         ACTOR_ID_MAX,         SCENE_POTION_SHOP_GRANNY,           0x00,                               "Granny's Shop",                               RHT_KAK_GRANNYS_SHOP,                                            RG_BUY_BLUE_POTION,                                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_MERCHANTS_GRANNYS_SHOP),                                                       true);
+    locationTable[RC_KAK_GRANNYS_SHOP] =                                               Location::Base(RC_KAK_GRANNYS_SHOP,                                             RCQUEST_BOTH,    RCTYPE_MERCHANT,                                                         ACTOR_ID_MAX,         SCENE_POTION_SHOP_GRANNY,           0x00,                               "Granny's Shop",                               RHT_KAK_GRANNYS_SHOP,                                            RG_BUY_BLUE_POTION,                                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_MERCHANTS_GRANNYS_SHOP),                                                       true,  100);
     locationTable[RC_KAK_ANJU_AS_ADULT] =                                              Location::Base(RC_KAK_ANJU_AS_ADULT,                                            RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_KAKARIKO_VILLAGE,             0x00,                               "Anju as Adult",                               RHT_KAK_ANJU_AS_ADULT,                                           RG_CLAIM_CHECK,                                                     SpoilerCollectionCheck::ItemGetInf(44),                                                                                       true);
     locationTable[RC_KAK_ANJU_AS_CHILD] =                                              Location::Base(RC_KAK_ANJU_AS_CHILD,                                            RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_KAKARIKO_VILLAGE,             0x00,                               "Anju as Child",                               RHT_KAK_ANJU_AS_CHILD,                                           RG_EMPTY_BOTTLE,                                                    SpoilerCollectionCheck::ItemGetInf(12),                                                                                       true);
     locationTable[RC_KAK_TRADE_POCKET_CUCCO] =                                         Location::Base(RC_KAK_TRADE_POCKET_CUCCO,                                       RCQUEST_BOTH,    RCTYPE_ADULT_TRADE,                                                      ACTOR_ID_MAX,         SCENE_KAKARIKO_VILLAGE,             0x00,                               "Trade Pocket Cucco",                          RHT_KAK_TRADE_POCKET_CUCCO,                                      RG_COJIRO,                                                          SpoilerCollectionCheck::ItemGetInf(46),                                                                                       true);
@@ -253,21 +263,21 @@ void Rando::StaticData::InitLocationTable() { //
     locationTable[RC_GC_ROLLING_GORON_AS_ADULT] =                                      Location::Base(RC_GC_ROLLING_GORON_AS_ADULT,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_GORON_CITY,                   0x00,                               "Rolling Goron as Adult",                      RHT_GC_ROLLING_GORON_AS_ADULT,                                   RG_GORON_TUNIC,                                                     SpoilerCollectionCheck::InfTable(INFTABLE_GORON_CITY_DOORS_UNLOCKED),                                                         true);
     locationTable[RC_GC_DARUNIAS_JOY] =                                                Location::Base(RC_GC_DARUNIAS_JOY,                                              RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_GORON_CITY,                   0x00,                               "Darunias Joy",                                RHT_GC_DARUNIAS_JOY,                                             RG_PROGRESSIVE_STRENGTH,                                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_DARUNIAS_JOY),                                                                 true);
     locationTable[RC_GC_POT_FREESTANDING_POH] =                                 Location::Collectable(RC_GC_POT_FREESTANDING_POH,                                      RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_ITEM00,      SCENE_GORON_CITY,                   7942,                         0x1F, "Pot Freestanding PoH",                        RHT_GC_POT_FREESTANDING_POH,                                     RG_PIECE_OF_HEART,                                                                                                                                                                                true);
-    locationTable[RC_GC_DEKU_SCRUB_GROTTO_LEFT] =                                      Location::Base(RC_GC_DEKU_SCRUB_GROTTO_LEFT,                                    RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_GORON_CITY,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x00, 0xFB),       "Deku Scrub Grotto Left",                      RHT_GC_DEKU_SCRUB_GROTTO_LEFT,                                   RG_BUY_DEKU_NUTS_5,                                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GC_DEKU_SCRUB_GROTTO_LEFT));
-    locationTable[RC_GC_DEKU_SCRUB_GROTTO_RIGHT] =                                     Location::Base(RC_GC_DEKU_SCRUB_GROTTO_RIGHT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_GORON_CITY,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x05, 0xFB),       "Deku Scrub Grotto Right",                     RHT_GC_DEKU_SCRUB_GROTTO_RIGHT,                                  RG_BUY_BOMBS_535,                                                   SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GC_DEKU_SCRUB_GROTTO_RIGHT));
-    locationTable[RC_GC_DEKU_SCRUB_GROTTO_CENTER] =                                    Location::Base(RC_GC_DEKU_SCRUB_GROTTO_CENTER,                                  RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_GORON_CITY,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x03, 0xFB),       "Deku Scrub Grotto Center",                    RHT_GC_DEKU_SCRUB_GROTTO_CENTER,                                 RG_BUY_ARROWS_30,                                                   SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GC_DEKU_SCRUB_GROTTO_CENTER));
-    locationTable[RC_GC_MEDIGORON] =                                                   Location::Base(RC_GC_MEDIGORON,                                                 RCQUEST_BOTH,    RCTYPE_MERCHANT,                                                         ACTOR_ID_MAX,         SCENE_GORON_CITY,                   0x00,                               "Medigoron",                                   RHT_GC_MEDIGORON,                                                RG_GIANTS_KNIFE,                                                    SpoilerCollectionCheck::RandomizerInf(RAND_INF_MERCHANTS_MEDIGORON));
+    locationTable[RC_GC_DEKU_SCRUB_GROTTO_LEFT] =                                      Location::Base(RC_GC_DEKU_SCRUB_GROTTO_LEFT,                                    RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_GORON_CITY,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x00, 0xFB),       "Deku Scrub Grotto Left",                      RHT_GC_DEKU_SCRUB_GROTTO_LEFT,                                   RG_BUY_DEKU_NUTS_5,                                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GC_DEKU_SCRUB_GROTTO_LEFT),                                   false, 20);
+    locationTable[RC_GC_DEKU_SCRUB_GROTTO_RIGHT] =                                     Location::Base(RC_GC_DEKU_SCRUB_GROTTO_RIGHT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_GORON_CITY,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x05, 0xFB),       "Deku Scrub Grotto Right",                     RHT_GC_DEKU_SCRUB_GROTTO_RIGHT,                                  RG_BUY_BOMBS_535,                                                   SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GC_DEKU_SCRUB_GROTTO_RIGHT),                                  false, 40);
+    locationTable[RC_GC_DEKU_SCRUB_GROTTO_CENTER] =                                    Location::Base(RC_GC_DEKU_SCRUB_GROTTO_CENTER,                                  RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_GORON_CITY,                   ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x03, 0xFB),       "Deku Scrub Grotto Center",                    RHT_GC_DEKU_SCRUB_GROTTO_CENTER,                                 RG_BUY_ARROWS_30,                                                   SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GC_DEKU_SCRUB_GROTTO_CENTER),                                 false, 70);
+    locationTable[RC_GC_MEDIGORON] =                                                   Location::Base(RC_GC_MEDIGORON,                                                 RCQUEST_BOTH,    RCTYPE_MERCHANT,                                                         ACTOR_ID_MAX,         SCENE_GORON_CITY,                   0x00,                               "Medigoron",                                   RHT_GC_MEDIGORON,                                                RG_GIANTS_KNIFE,                                                    SpoilerCollectionCheck::RandomizerInf(RAND_INF_MERCHANTS_MEDIGORON),                                                          false, 200);
     // Death Mountain Crater
     locationTable[RC_DMC_UPPER_GROTTO_CHEST] =                                        Location::Chest(RC_DMC_UPPER_GROTTO_CHEST,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_EN_BOX,         SCENE_GROTTOS,                      23802,                        0x1A, "Upper Grotto Chest",                          RHT_DMC_UPPER_GROTTO_CHEST,                                      RG_BOMBS_20);
     locationTable[RC_DMC_WALL_FREESTANDING_POH] =                               Location::Collectable(RC_DMC_WALL_FREESTANDING_POH,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_ITEM00,      SCENE_DEATH_MOUNTAIN_CRATER,        518,                          0x02, "Wall Freestanding PoH",                       RHT_DMC_WALL_FREESTANDING_POH,                                   RG_PIECE_OF_HEART,                                                                                                                                                                                true);
     locationTable[RC_DMC_VOLCANO_FREESTANDING_POH] =                            Location::Collectable(RC_DMC_VOLCANO_FREESTANDING_POH,                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_ITEM00,      SCENE_DEATH_MOUNTAIN_CRATER,        2054,                         0x08, "Volcano Freestanding PoH",                    RHT_DMC_WALL_FREESTANDING_POH,                                   RG_PIECE_OF_HEART,                                                                                                                                                                                true);
-    locationTable[RC_DMC_DEKU_SCRUB] =                                                 Location::Base(RC_DMC_DEKU_SCRUB,                                               RCQUEST_BOTH,    RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_DEATH_MOUNTAIN_CRATER,        0x05,                               "Deku Scrub",                                  RHT_DMC_DEKU_SCRUB,                                              RG_BUY_BOMBS_535,                                                   SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB));
-    locationTable[RC_DMC_DEKU_SCRUB_GROTTO_LEFT] =                                     Location::Base(RC_DMC_DEKU_SCRUB_GROTTO_LEFT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x00, 0xF9),       "Deku Scrub Grotto Left",                      RHT_DMC_DEKU_SCRUB_GROTTO_LEFT,                                  RG_BUY_DEKU_NUTS_5,                                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB_GROTTO_LEFT));
-    locationTable[RC_DMC_DEKU_SCRUB_GROTTO_RIGHT] =                                    Location::Base(RC_DMC_DEKU_SCRUB_GROTTO_RIGHT,                                  RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x05, 0xF9),       "Deku Scrub Grotto Right",                     RHT_DMC_DEKU_SCRUB_GROTTO_RIGHT,                                 RG_BUY_BOMBS_535,                                                   SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB_GROTTO_RIGHT));
-    locationTable[RC_DMC_DEKU_SCRUB_GROTTO_CENTER] =                                   Location::Base(RC_DMC_DEKU_SCRUB_GROTTO_CENTER,                                 RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x03, 0xF9),       "Deku Scrub Grotto Center",                    RHT_DMC_DEKU_SCRUB_GROTTO_CENTER,                                RG_BUY_ARROWS_30,                                                   SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB_GROTTO_CENTER));
+    locationTable[RC_DMC_DEKU_SCRUB] =                                                 Location::Base(RC_DMC_DEKU_SCRUB,                                               RCQUEST_BOTH,    RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_DEATH_MOUNTAIN_CRATER,        0x05,                               "Deku Scrub",                                  RHT_DMC_DEKU_SCRUB,                                              RG_BUY_BOMBS_535,                                                   SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB),             false, 40);
+    locationTable[RC_DMC_DEKU_SCRUB_GROTTO_LEFT] =                                     Location::Base(RC_DMC_DEKU_SCRUB_GROTTO_LEFT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x00, 0xF9),       "Deku Scrub Grotto Left",                      RHT_DMC_DEKU_SCRUB_GROTTO_LEFT,                                  RG_BUY_DEKU_NUTS_5,                                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB_GROTTO_LEFT),             false, 20);
+    locationTable[RC_DMC_DEKU_SCRUB_GROTTO_RIGHT] =                                    Location::Base(RC_DMC_DEKU_SCRUB_GROTTO_RIGHT,                                  RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x05, 0xF9),       "Deku Scrub Grotto Right",                     RHT_DMC_DEKU_SCRUB_GROTTO_RIGHT,                                 RG_BUY_BOMBS_535,                                                   SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB_GROTTO_RIGHT),             false, 40);
+    locationTable[RC_DMC_DEKU_SCRUB_GROTTO_CENTER] =                                   Location::Base(RC_DMC_DEKU_SCRUB_GROTTO_CENTER,                                 RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x03, 0xF9),       "Deku Scrub Grotto Center",                    RHT_DMC_DEKU_SCRUB_GROTTO_CENTER,                                RG_BUY_ARROWS_30,                                                   SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB_GROTTO_CENTER),             false, 70);
     // Zoras River
-    locationTable[RC_ZR_OPEN_GROTTO_CHEST] =                                          Location::Chest(RC_ZR_OPEN_GROTTO_CHEST,                                         RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_RIVER,                  ACTOR_EN_BOX,         SCENE_GROTTOS,                      22985,                        0x09, "Open Grotto Chest",                           RHT_ZR_OPEN_GROTTO_CHEST,                                        RG_RED_RUPEE);
-    locationTable[RC_ZR_MAGIC_BEAN_SALESMAN] =                                         Location::Base(RC_ZR_MAGIC_BEAN_SALESMAN,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_ZORAS_RIVER,                  0x00,                               "Magic Bean Salesman",                         RHT_ZR_MAGIC_BEAN_SALESMAN,                                      RG_MAGIC_BEAN,                                                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_MERCHANTS_MAGIC_BEAN_SALESMAN),                                                true);
+    locationTable[RC_ZR_OPEN_GROTTO_CHEST] =                                           Location::Chest(RC_ZR_OPEN_GROTTO_CHEST,                                        RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_ZORAS_RIVER,                  ACTOR_EN_BOX,         SCENE_GROTTOS,                      22985,                        0x09, "Open Grotto Chest",                           RHT_ZR_OPEN_GROTTO_CHEST,                                        RG_RED_RUPEE);
+    locationTable[RC_ZR_MAGIC_BEAN_SALESMAN] =                                         Location::Base(RC_ZR_MAGIC_BEAN_SALESMAN,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_ZORAS_RIVER,                  0x00,                               "Magic Bean Salesman",                         RHT_ZR_MAGIC_BEAN_SALESMAN,                                      RG_MAGIC_BEAN,                                                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_MERCHANTS_MAGIC_BEAN_SALESMAN),                                                true,  60);
     locationTable[RC_ZR_FROGS_ZELDAS_LULLABY] =                                        Location::Base(RC_ZR_FROGS_ZELDAS_LULLABY,                                      RCQUEST_BOTH,    RCTYPE_FROG_SONG,                                                        ACTOR_EN_FR,          SCENE_ZORAS_RIVER,                  0x00,                               "Frogs Zelda's Lullaby",                       RHT_ZR_FROGS_ZELDAS_LULLABY,                                     RG_PURPLE_RUPEE,                                                    SpoilerCollectionCheck::EventChkInf(0xD1));
     locationTable[RC_ZR_FROGS_EPONAS_SONG] =                                           Location::Base(RC_ZR_FROGS_EPONAS_SONG,                                         RCQUEST_BOTH,    RCTYPE_FROG_SONG,                                                        ACTOR_EN_FR,          SCENE_ZORAS_RIVER,                  0x00,                               "Frogs Epona's Song",                          RHT_ZR_FROGS_EPONAS_SONG,                                        RG_PURPLE_RUPEE,                                                    SpoilerCollectionCheck::EventChkInf(0xD2));
     locationTable[RC_ZR_FROGS_SARIAS_SONG] =                                           Location::Base(RC_ZR_FROGS_SARIAS_SONG,                                         RCQUEST_BOTH,    RCTYPE_FROG_SONG,                                                        ACTOR_EN_FR,          SCENE_ZORAS_RIVER,                  0x00,                               "Frogs Saria's Song",                          RHT_ZR_FROGS_SARIAS_SONG,                                        RG_PURPLE_RUPEE,                                                    SpoilerCollectionCheck::EventChkInf(0xD4));
@@ -277,8 +287,8 @@ void Rando::StaticData::InitLocationTable() { //
     locationTable[RC_ZR_FROGS_OCARINA_GAME] =                                          Location::Base(RC_ZR_FROGS_OCARINA_GAME,                                        RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_FR,          SCENE_ZORAS_RIVER,                  0x00,                               "Frogs Ocarina Game",                          RHT_ZR_FROGS_OCARINA_GAME,                                       RG_PIECE_OF_HEART,                                                  SpoilerCollectionCheck::EventChkInf(0xD0),                                                                                    true);
     locationTable[RC_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH] =                    Location::Collectable(RC_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH,                         RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_ITEM00,      SCENE_ZORAS_RIVER,                  1030,                         0x04, "Near Open Grotto Freestanding PoH",           RHT_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH,                        RG_PIECE_OF_HEART,                                                                                                                                                                                true);
     locationTable[RC_ZR_NEAR_DOMAIN_FREESTANDING_POH] =                         Location::Collectable(RC_ZR_NEAR_DOMAIN_FREESTANDING_POH,                              RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_ITEM00,      SCENE_ZORAS_RIVER,                  2822,                         0x0B, "Near Domain Freestanding PoH",                RHT_ZR_NEAR_DOMAIN_FREESTANDING_POH,                             RG_PIECE_OF_HEART,                                                                                                                                                                                true);
-    locationTable[RC_ZR_DEKU_SCRUB_GROTTO_REAR] =                                      Location::Base(RC_ZR_DEKU_SCRUB_GROTTO_REAR,                                    RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_ZORAS_RIVER,                  ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x07, 0xEB),       "Deku Scrub Grotto Rear",                      RHT_ZR_DEKU_SCRUB_GROTTO_REAR,                                   RG_BUY_RED_POTION_30,                                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_ZR_DEKU_SCRUB_GROTTO_REAR));
-    locationTable[RC_ZR_DEKU_SCRUB_GROTTO_FRONT] =                                     Location::Base(RC_ZR_DEKU_SCRUB_GROTTO_FRONT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_ZORAS_RIVER,                  ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x08, 0xEB),       "Deku Scrub Grotto Front",                     RHT_ZR_DEKU_SCRUB_GROTTO_FRONT,                                  RG_BUY_GREEN_POTION,                                                SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_ZR_DEKU_SCRUB_GROTTO_FRONT));
+    locationTable[RC_ZR_DEKU_SCRUB_GROTTO_REAR] =                                      Location::Base(RC_ZR_DEKU_SCRUB_GROTTO_REAR,                                    RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_ZORAS_RIVER,                  ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x07, 0xEB),       "Deku Scrub Grotto Rear",                      RHT_ZR_DEKU_SCRUB_GROTTO_REAR,                                   RG_BUY_RED_POTION_40,                                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_ZR_DEKU_SCRUB_GROTTO_REAR),                false, 40);
+    locationTable[RC_ZR_DEKU_SCRUB_GROTTO_FRONT] =                                     Location::Base(RC_ZR_DEKU_SCRUB_GROTTO_FRONT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_ZORAS_RIVER,                  ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x08, 0xEB),       "Deku Scrub Grotto Front",                     RHT_ZR_DEKU_SCRUB_GROTTO_FRONT,                                  RG_BUY_GREEN_POTION,                                                SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_ZR_DEKU_SCRUB_GROTTO_FRONT),                false, 40);
     // Zoras Domain
     locationTable[RC_ZD_CHEST] =                                                      Location::Chest(RC_ZD_CHEST,                                                     RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_ZORAS_DOMAIN,                 -18496,                       0x00, "Chest",                                       RHT_ZD_CHEST,                                                    RG_PIECE_OF_HEART,                                                                                                                                                                                true);
     locationTable[RC_ZD_DIVING_MINIGAME] =                                             Location::Base(RC_ZD_DIVING_MINIGAME,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_ZORAS_DOMAIN,                 0x00,                               "Diving Minigame",                             RHT_ZD_DIVING_MINIGAME,                                          RG_PROGRESSIVE_SCALE,                                               SpoilerCollectionCheck::EventChkInf(0x38),                                                                                    true);
@@ -290,9 +300,9 @@ void Rando::StaticData::InitLocationTable() { //
     // Lon Lon Ranch
     locationTable[RC_LLR_TALONS_CHICKENS] =                                            Location::Base(RC_LLR_TALONS_CHICKENS,                                          RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_LON_LON_BUILDINGS,            0x00,                               "Talons Chickens",                             RHT_LLR_TALONS_CHICKENS,                                         RG_BOTTLE_WITH_MILK,                                                SpoilerCollectionCheck::ItemGetInf(2),                                                                                        true);
     locationTable[RC_LLR_FREESTANDING_POH] =                                    Location::Collectable(RC_LLR_FREESTANDING_POH,                                         RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_ITEM00,      SCENE_LON_LON_BUILDINGS,            262,                          0x01, "Freestanding PoH",                            RHT_LLR_FREESTANDING_POH,                                        RG_PIECE_OF_HEART,                                                                                                                                                                                true);
-    locationTable[RC_LLR_DEKU_SCRUB_GROTTO_LEFT] =                                     Location::Base(RC_LLR_DEKU_SCRUB_GROTTO_LEFT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LON_LON_RANCH,                ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x00, 0xFC),       "Deku Scrub Grotto Left",                      RHT_LLR_DEKU_SCRUB_GROTTO_LEFT,                                  RG_BUY_DEKU_NUTS_5,                                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LLR_DEKU_SCRUB_GROTTO_LEFT));
-    locationTable[RC_LLR_DEKU_SCRUB_GROTTO_RIGHT] =                                    Location::Base(RC_LLR_DEKU_SCRUB_GROTTO_RIGHT,                                  RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LON_LON_RANCH,                ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x05, 0xFC),       "Deku Scrub Grotto Right",                     RHT_LLR_DEKU_SCRUB_GROTTO_RIGHT,                                 RG_BUY_BOMBS_535,                                                   SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LLR_DEKU_SCRUB_GROTTO_RIGHT));
-    locationTable[RC_LLR_DEKU_SCRUB_GROTTO_CENTER] =                                   Location::Base(RC_LLR_DEKU_SCRUB_GROTTO_CENTER,                                 RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LON_LON_RANCH,                ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x03, 0xFC),       "Deku Scrub Grotto Center",                    RHT_LLR_DEKU_SCRUB_GROTTO_CENTER,                                RG_BUY_DEKU_SEEDS_30,                                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LLR_DEKU_SCRUB_GROTTO_CENTER));
+    locationTable[RC_LLR_DEKU_SCRUB_GROTTO_LEFT] =                                     Location::Base(RC_LLR_DEKU_SCRUB_GROTTO_LEFT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LON_LON_RANCH,                ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x00, 0xFC),       "Deku Scrub Grotto Left",                      RHT_LLR_DEKU_SCRUB_GROTTO_LEFT,                                  RG_BUY_DEKU_NUTS_5,                                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LLR_DEKU_SCRUB_GROTTO_LEFT),              false, 20);
+    locationTable[RC_LLR_DEKU_SCRUB_GROTTO_RIGHT] =                                    Location::Base(RC_LLR_DEKU_SCRUB_GROTTO_RIGHT,                                  RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LON_LON_RANCH,                ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x05, 0xFC),       "Deku Scrub Grotto Right",                     RHT_LLR_DEKU_SCRUB_GROTTO_RIGHT,                                 RG_BUY_BOMBS_535,                                                   SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LLR_DEKU_SCRUB_GROTTO_RIGHT),              false, 40);
+    locationTable[RC_LLR_DEKU_SCRUB_GROTTO_CENTER] =                                   Location::Base(RC_LLR_DEKU_SCRUB_GROTTO_CENTER,                                 RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_LON_LON_RANCH,                ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x03, 0xFC),       "Deku Scrub Grotto Center",                    RHT_LLR_DEKU_SCRUB_GROTTO_CENTER,                                RG_BUY_DEKU_SEEDS_30,                                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_LLR_DEKU_SCRUB_GROTTO_CENTER),              false, 40);
 
     // Dungeons
     // Deku Tree Vanilla
@@ -310,7 +320,7 @@ void Rando::StaticData::InitLocationTable() { //
     locationTable[RC_DEKU_TREE_MQ_BASEMENT_CHEST] =                                   Location::Chest(RC_DEKU_TREE_MQ_BASEMENT_CHEST,                                  RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    -31452,                       0x04, "MQ Basement Chest",                           RHT_DEKU_TREE_MQ_BASEMENT_CHEST,                                 RG_DEKU_SHIELD);
     locationTable[RC_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST] =                        Location::Chest(RC_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST,                       RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    22789,                        0x05, "MQ Before Spinning Log Chest",                RHT_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST,                      RG_RECOVERY_HEART);
     locationTable[RC_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST] =                         Location::Chest(RC_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST,                        RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_DEKU_TREE,                    23200,                        0x00, "MQ After Spinning Log Chest",                 RHT_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST,                       RG_PURPLE_RUPEE);
-    locationTable[RC_DEKU_TREE_MQ_DEKU_SCRUB] =                                        Location::Base(RC_DEKU_TREE_MQ_DEKU_SCRUB,                                      RCQUEST_MQ,      RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_DEKU_TREE,                    0x04,                               "MQ Deku Scrub",                               RHT_DEKU_TREE_MQ_DEKU_SCRUB,                                     RG_BUY_DEKU_SHIELD,                                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DEKU_TREE_MQ_DEKU_SCRUB));
+    locationTable[RC_DEKU_TREE_MQ_DEKU_SCRUB] =                                        Location::Base(RC_DEKU_TREE_MQ_DEKU_SCRUB,                                      RCQUEST_MQ,      RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_DEKU_TREE,                    0x04,                               "MQ Deku Scrub",                               RHT_DEKU_TREE_MQ_DEKU_SCRUB,                                     RG_BUY_DEKU_SHIELD,                                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DEKU_TREE_MQ_DEKU_SCRUB),          false, 50);
 
     // Dodongo's Cavern Shared
     locationTable[RC_DODONGOS_CAVERN_BOSS_ROOM_CHEST] =                               Location::Chest(RC_DODONGOS_CAVERN_BOSS_ROOM_CHEST,                              RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN_BOSS,         20512,                        0x00, "Boss Room Chest",                             RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST,                             RG_BOMBS_5);
@@ -320,10 +330,10 @@ void Rando::StaticData::InitLocationTable() { //
     locationTable[RC_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST] =                    Location::Chest(RC_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST,                   RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              22982,                        0x06, "Bomb Flower Platform Chest",                  RHT_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST,                  RG_RED_RUPEE);
     locationTable[RC_DODONGOS_CAVERN_BOMB_BAG_CHEST] =                                Location::Chest(RC_DODONGOS_CAVERN_BOMB_BAG_CHEST,                               RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              1604,                         0x04, "Bomb Bag Chest",                              RHT_DODONGOS_CAVERN_BOMB_BAG_CHEST,                              RG_PROGRESSIVE_BOMB_BAG,                                                                                                                                                                          true);
     locationTable[RC_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST] =                           Location::Chest(RC_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST,                          RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              21802,                        0x0A, "End Of Bridge Chest",                         RHT_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST,                         RG_DEKU_SHIELD);
-    locationTable[RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT] =                  Location::Base(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,                RCQUEST_VANILLA, RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x00,                               "Deku Scrub Near Bomb Bag Left",               RHT_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,               RG_BUY_DEKU_NUTS_5,                                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT));
-    locationTable[RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS] =             Location::Base(RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS,           RCQUEST_VANILLA, RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x01,                               "Deku Scrub Side Room Near Dodongos",          RHT_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS,          RG_BUY_DEKU_STICK_1,                                                SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS));
-    locationTable[RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT] =                 Location::Base(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT,               RCQUEST_VANILLA, RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x03,                               "Deku Scrub Near Bomb Bag Right",              RHT_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT,              RG_BUY_DEKU_SEEDS_30,                                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT));
-    locationTable[RC_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY] =                               Location::Base(RC_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY,                             RCQUEST_VANILLA, RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x04,                               "Deku Scrub Lobby",                            RHT_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY,                            RG_BUY_DEKU_SHIELD,                                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY));
+    locationTable[RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT] =                  Location::Base(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,                RCQUEST_VANILLA, RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x00,                               "Deku Scrub Near Bomb Bag Left",               RHT_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,               RG_BUY_DEKU_NUTS_5,                                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT),    false, 20);
+    locationTable[RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS] =             Location::Base(RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS,           RCQUEST_VANILLA, RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x01,                               "Deku Scrub Side Room Near Dodongos",          RHT_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS,          RG_BUY_DEKU_STICK_1,                                                SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS),    false, 15);
+    locationTable[RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT] =                 Location::Base(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT,               RCQUEST_VANILLA, RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x03,                               "Deku Scrub Near Bomb Bag Right",              RHT_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT,              RG_BUY_DEKU_SEEDS_30,                                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT),    false, 40);
+    locationTable[RC_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY] =                               Location::Base(RC_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY,                             RCQUEST_VANILLA, RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x04,                               "Deku Scrub Lobby",                            RHT_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY,                            RG_BUY_DEKU_SHIELD,                                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY),    false, 50);
     // Dodongo's Cavern MQ
     locationTable[RC_DODONGOS_CAVERN_MQ_MAP_CHEST] =                                  Location::Chest(RC_DODONGOS_CAVERN_MQ_MAP_CHEST,                                 RCQUEST_MQ,      RCTYPE_MAP,                                                              ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              2080,                         0x00, "MQ Map Chest",                                RHT_DODONGOS_CAVERN_MQ_MAP_CHEST,                                RG_DODONGOS_CAVERN_MAP,                                                                                                                                                                           true);
     locationTable[RC_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST] =                             Location::Chest(RC_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST,                            RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              1604,                         0x04, "MQ Bomb Bag Chest",                           RHT_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST,                           RG_PROGRESSIVE_BOMB_BAG,                                                                                                                                                                          true);
@@ -331,16 +341,16 @@ void Rando::StaticData::InitLocationTable() { //
     locationTable[RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST] =                          Location::Chest(RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST,                         RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              29986,                        0x02, "MQ Larvae Room Chest",                        RHT_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST,                        RG_DEKU_SHIELD);
     locationTable[RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST] =                    Location::Chest(RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST,                   RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              22947,                        0x03, "MQ Torch Puzzle Room Chest",                  RHT_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST,                  RG_BLUE_RUPEE);
     locationTable[RC_DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST] =                          Location::Chest(RC_DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST,                         RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_DODONGOS_CAVERN,              21825,                        0x01, "MQ Under Grave Chest",                        RHT_DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST,                        RG_HYLIAN_SHIELD);
-    locationTable[RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR] =                       Location::Base(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,                     RCQUEST_MQ,      RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x01,                               "MQ Deku Scrub Lobby Rear",                    RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,                    RG_BUY_DEKU_STICK_1,                                                SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR));
-    locationTable[RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT] =                      Location::Base(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT,                    RCQUEST_MQ,      RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x03,                               "MQ Deku Scrub Lobby Front",                   RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT,                   RG_BUY_DEKU_SEEDS_30,                                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT));
-    locationTable[RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE] =                        Location::Base(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,                      RCQUEST_MQ,      RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x04,                               "MQ Deku Scrub Staircase",                     RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,                     RG_BUY_DEKU_SHIELD,                                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE));
-    locationTable[RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS] =    Location::Base(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS,  RCQUEST_MQ,      RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x07,                               "MQ Deku Scrub Side Room Near Lower Lizalfos", RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS, RG_BUY_RED_POTION_30,                                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS));
+    locationTable[RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR] =                       Location::Base(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,                     RCQUEST_MQ,      RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x01,                               "MQ Deku Scrub Lobby Rear",                    RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,                    RG_BUY_DEKU_STICK_1,                                                SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR),    false, 15);
+    locationTable[RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT] =                      Location::Base(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT,                    RCQUEST_MQ,      RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x03,                               "MQ Deku Scrub Lobby Front",                   RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT,                   RG_BUY_DEKU_SEEDS_30,                                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT),    false, 40);
+    locationTable[RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE] =                        Location::Base(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,                      RCQUEST_MQ,      RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x04,                               "MQ Deku Scrub Staircase",                     RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,                     RG_BUY_DEKU_SHIELD,                                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE),    false, 50);
+    locationTable[RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS] =    Location::Base(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS,  RCQUEST_MQ,      RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_DODONGOS_CAVERN,              0x07,                               "MQ Deku Scrub Side Room Near Lower Lizalfos", RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS, RG_BUY_RED_POTION_40,                                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS),    false, 40);
 
     // Jabu-Jabu's Belly Vanilla
     locationTable[RC_JABU_JABUS_BELLY_MAP_CHEST] =                                    Location::Chest(RC_JABU_JABUS_BELLY_MAP_CHEST,                                   RCQUEST_VANILLA, RCTYPE_MAP,                                                              ACTOR_EN_BOX,         SCENE_JABU_JABU,                    6178,                         0x02, "Map Chest",                                   RHT_JABU_JABUS_BELLY_MAP_CHEST,                                  RG_JABU_JABUS_BELLY_MAP,                                                                                                                                                                          true);
     locationTable[RC_JABU_JABUS_BELLY_COMPASS_CHEST] =                                Location::Chest(RC_JABU_JABUS_BELLY_COMPASS_CHEST,                               RCQUEST_VANILLA, RCTYPE_COMPASS,                                                          ACTOR_EN_BOX,         SCENE_JABU_JABU,                    -18428,                       0x04, "Compass Chest",                               RHT_JABU_JABUS_BELLY_COMPASS_CHEST,                              RG_JABU_JABUS_BELLY_COMPASS,                                                                                                                                                                      true);
     locationTable[RC_JABU_JABUS_BELLY_BOOMERANG_CHEST] =                              Location::Chest(RC_JABU_JABUS_BELLY_BOOMERANG_CHEST,                             RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_JABU_JABU,                    4289,                         0x01, "Boomerang Chest",                             RHT_JABU_JABUS_BELLY_BOOMERANG_CHEST,                            RG_BOOMERANG,                                                                                                                                                                                     true);
-    locationTable[RC_JABU_JABUS_BELLY_DEKU_SCRUB] =                                    Location::Base(RC_JABU_JABUS_BELLY_DEKU_SCRUB,                                  RCQUEST_VANILLA, RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_JABU_JABU,                    0x00,                               "Deku Scrub",                                  RHT_JABU_JABUS_BELLY_DEKU_SCRUB,                                 RG_BUY_DEKU_NUTS_5,                                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_JABU_JABUS_BELLY_DEKU_SCRUB));
+    locationTable[RC_JABU_JABUS_BELLY_DEKU_SCRUB] =                                    Location::Base(RC_JABU_JABUS_BELLY_DEKU_SCRUB,                                  RCQUEST_VANILLA, RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_JABU_JABU,                    0x00,                               "Deku Scrub",                                  RHT_JABU_JABUS_BELLY_DEKU_SCRUB,                                 RG_BUY_DEKU_NUTS_5,                                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_JABU_JABUS_BELLY_DEKU_SCRUB),    false, 20);
     // Jabu-Jabu's Belly MQ
     locationTable[RC_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST] =                     Location::Chest(RC_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST,                    RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_JABU_JABU,                    -32699,                       0x05, "MQ First Room Side Chest",                    RHT_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST,                   RG_DEKU_NUTS_5);
     locationTable[RC_JABU_JABUS_BELLY_MQ_MAP_CHEST] =                                 Location::Chest(RC_JABU_JABUS_BELLY_MQ_MAP_CHEST,                                RCQUEST_MQ,      RCTYPE_MAP,                                                              ACTOR_EN_BOX,         SCENE_JABU_JABU,                    -18397,                       0x03, "MQ Map Chest",                                RHT_JABU_JABUS_BELLY_MQ_MAP_CHEST,                               RG_JABU_JABUS_BELLY_MAP,                                                                                                                                                                          true);
@@ -606,10 +616,10 @@ void Rando::StaticData::InitLocationTable() { //
     locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST] =                   Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST,                  RCQUEST_VANILLA, RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         24463,                        0x0F, "Light Trial Third Right Chest",               RHT_GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST,                 RG_ICE_TRAP);
     locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST] =             Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST,            RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         30800,                        0x10, "Light Trial Invisible Enemies Chest",         RHT_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST,           RG_GANONS_CASTLE_SMALL_KEY,                                                                                                                                                                       true);
     locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST] =                       Location::Chest(RC_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST,                      RCQUEST_VANILLA, RCTYPE_SMALL_KEY,                                                        ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -30639,                       0x11, "Light Trial Lullaby Chest",                   RHT_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST,                     RG_GANONS_CASTLE_SMALL_KEY,                                                                                                                                                                       true);
-    locationTable[RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT] =                           Location::Base(RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,                         RCQUEST_VANILLA, RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x05,                               "Deku Scrub Center-Left",                      RHT_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,                        RG_BUY_BOMBS_535,                                                   SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT));
-    locationTable[RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT] =                          Location::Base(RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT,                        RCQUEST_VANILLA, RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x03,                               "Deku Scrub Center-Right",                     RHT_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT,                       RG_BUY_ARROWS_30,                                                   SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT));
-    locationTable[RC_GANONS_CASTLE_DEKU_SCRUB_RIGHT] =                                 Location::Base(RC_GANONS_CASTLE_DEKU_SCRUB_RIGHT,                               RCQUEST_VANILLA, RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x07,                               "Deku Scrub Right",                            RHT_GANONS_CASTLE_DEKU_SCRUB_RIGHT,                              RG_BUY_RED_POTION_30,                                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_RIGHT));
-    locationTable[RC_GANONS_CASTLE_DEKU_SCRUB_LEFT] =                                  Location::Base(RC_GANONS_CASTLE_DEKU_SCRUB_LEFT,                                RCQUEST_VANILLA, RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x08,                               "Deku Scrub Left",                             RHT_GANONS_CASTLE_DEKU_SCRUB_LEFT,                               RG_BUY_GREEN_POTION,                                                SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_LEFT));
+    locationTable[RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT] =                           Location::Base(RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,                         RCQUEST_VANILLA, RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x05,                               "Deku Scrub Center-Left",                      RHT_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,                        RG_BUY_BOMBS_535,                                                   SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT),      false, 40);
+    locationTable[RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT] =                          Location::Base(RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT,                        RCQUEST_VANILLA, RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x03,                               "Deku Scrub Center-Right",                     RHT_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT,                       RG_BUY_ARROWS_30,                                                   SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT),      false, 70);
+    locationTable[RC_GANONS_CASTLE_DEKU_SCRUB_RIGHT] =                                 Location::Base(RC_GANONS_CASTLE_DEKU_SCRUB_RIGHT,                               RCQUEST_VANILLA, RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x07,                               "Deku Scrub Right",                            RHT_GANONS_CASTLE_DEKU_SCRUB_RIGHT,                              RG_BUY_RED_POTION_40,                                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_RIGHT),      false, 20);
+    locationTable[RC_GANONS_CASTLE_DEKU_SCRUB_LEFT] =                                  Location::Base(RC_GANONS_CASTLE_DEKU_SCRUB_LEFT,                                RCQUEST_VANILLA, RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x08,                               "Deku Scrub Left",                             RHT_GANONS_CASTLE_DEKU_SCRUB_LEFT,                               RG_BUY_GREEN_POTION,                                                SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_LEFT),      false, 40);
     // Ganon's Castle MQ
     locationTable[RC_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST] =                            Location::Chest(RC_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST,                           RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         22977,                        0x01, "MQ Water Trial Chest",                        RHT_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST,                          RG_RED_RUPEE);
     locationTable[RC_GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST] =                Location::Chest(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST,               RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         -30398,                       0x02, "MQ Forest Trial Eye Switch Chest",            RHT_GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST,              RG_ARROWS_10);
@@ -624,11 +634,11 @@ void Rando::StaticData::InitLocationTable() { //
     locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST] =                     Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST,                    RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         20586,                        0x0A, "MQ Spirit Trial First Chest",                 RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST,                   RG_BOMBCHU_10);
     locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST] =                 Location::Chest(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST,                RCQUEST_MQ,      RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_INSIDE_GANONS_CASTLE,         26964,                        0x14, "MQ Spirit Trial Invisible Chest",             RHT_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST,               RG_ARROWS_10);
     locationTable[RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY] =          Location::Collectable(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY,               RCQUEST_MQ,      RCTYPE_SMALL_KEY,                                                        ACTOR_EN_ITEM00,      SCENE_INSIDE_GANONS_CASTLE,         273,                          0x01, "MQ Forest Trial Freestanding Key",            RHT_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY,              RG_GANONS_CASTLE_SMALL_KEY,                                                                                                                                                                       true);
-    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT] =                              Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,                            RCQUEST_MQ,      RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x00,                               "MQ Deku Scrub Right",                         RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,                           RG_BUY_DEKU_NUTS_5,                                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT));
-    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT] =                        Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,                      RCQUEST_MQ,      RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x05,                               "MQ Deku Scrub Center-Left",                   RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,                     RG_BUY_BOMBS_535,                                                   SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT));
-    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER] =                             Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,                           RCQUEST_MQ,      RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x03,                               "MQ Deku Scrub Center",                        RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,                          RG_BUY_ARROWS_30,                                                   SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER));
-    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT] =                       Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT,                     RCQUEST_MQ,      RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x07,                               "MQ Deku Scrub Center-Right",                  RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT,                    RG_BUY_RED_POTION_30,                                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT));
-    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT] =                               Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,                             RCQUEST_MQ,      RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x08,                               "MQ Deku Scrub Left",                          RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,                            RG_BUY_GREEN_POTION,                                                SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT));
+    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT] =                              Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,                            RCQUEST_MQ,      RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x00,                               "MQ Deku Scrub Right",                         RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,                           RG_BUY_DEKU_NUTS_5,                                                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT),      false, 20);
+    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT] =                        Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,                      RCQUEST_MQ,      RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x05,                               "MQ Deku Scrub Center-Left",                   RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,                     RG_BUY_BOMBS_535,                                                   SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT),      false, 40);
+    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER] =                             Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,                           RCQUEST_MQ,      RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x03,                               "MQ Deku Scrub Center",                        RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,                          RG_BUY_ARROWS_30,                                                   SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER),      false, 70);
+    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT] =                       Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT,                     RCQUEST_MQ,      RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x07,                               "MQ Deku Scrub Center-Right",                  RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT,                    RG_BUY_RED_POTION_40,                                               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT),      false, 40);
+    locationTable[RC_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT] =                               Location::Base(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,                             RCQUEST_MQ,      RCTYPE_SCRUB,                                                            ACTOR_EN_DNS,         SCENE_INSIDE_GANONS_CASTLE,         0x08,                               "MQ Deku Scrub Left",                          RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,                            RG_BUY_GREEN_POTION,                                                SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT),      false, 40);
 
     // Gold Skulltula Tokens
 
@@ -901,78 +911,78 @@ void Rando::StaticData::InitLocationTable() { //
       7     5               1     3
       -------------------------------*/
     // Kokiri Forest
-    locationTable[RC_KF_SHOP_ITEM_1] =                                                 Location::Base(RC_KF_SHOP_ITEM_1,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x00,                               "Shop Item 1",                                 RHT_KF_SHOP_ITEM_1,                                              RG_BUY_DEKU_SHIELD);
-    locationTable[RC_KF_SHOP_ITEM_2] =                                                 Location::Base(RC_KF_SHOP_ITEM_2,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x01,                               "Shop Item 2",                                 RHT_KF_SHOP_ITEM_2,                                              RG_BUY_DEKU_NUTS_5);
-    locationTable[RC_KF_SHOP_ITEM_3] =                                                 Location::Base(RC_KF_SHOP_ITEM_3,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x02,                               "Shop Item 3",                                 RHT_KF_SHOP_ITEM_3,                                              RG_BUY_DEKU_NUTS_10);
-    locationTable[RC_KF_SHOP_ITEM_4] =                                                 Location::Base(RC_KF_SHOP_ITEM_4,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x03,                               "Shop Item 4",                                 RHT_KF_SHOP_ITEM_4,                                              RG_BUY_DEKU_STICK_1);
-    locationTable[RC_KF_SHOP_ITEM_5] =                                                 Location::Base(RC_KF_SHOP_ITEM_5,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x04,                               "Shop Item 5",                                 RHT_KF_SHOP_ITEM_5,                                              RG_BUY_DEKU_SEEDS_30);
-    locationTable[RC_KF_SHOP_ITEM_6] =                                                 Location::Base(RC_KF_SHOP_ITEM_6,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x05,                               "Shop Item 6",                                 RHT_KF_SHOP_ITEM_6,                                              RG_BUY_ARROWS_10);
-    locationTable[RC_KF_SHOP_ITEM_7] =                                                 Location::Base(RC_KF_SHOP_ITEM_7,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x06,                               "Shop Item 7",                                 RHT_KF_SHOP_ITEM_7,                                              RG_BUY_ARROWS_30);
-    locationTable[RC_KF_SHOP_ITEM_8] =                                                 Location::Base(RC_KF_SHOP_ITEM_8,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x07,                               "Shop Item 8",                                 RHT_KF_SHOP_ITEM_8,                                              RG_BUY_HEART);
+    locationTable[RC_KF_SHOP_ITEM_1] =                                                 Location::Base(RC_KF_SHOP_ITEM_1,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x00,                               "Shop Item 1",                                 RHT_KF_SHOP_ITEM_1,                                              RG_BUY_DEKU_SHIELD,   SpoilerCollectionCheck(), false, 40);
+    locationTable[RC_KF_SHOP_ITEM_2] =                                                 Location::Base(RC_KF_SHOP_ITEM_2,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x01,                               "Shop Item 2",                                 RHT_KF_SHOP_ITEM_2,                                              RG_BUY_DEKU_NUTS_5,   SpoilerCollectionCheck(), false, 15);
+    locationTable[RC_KF_SHOP_ITEM_3] =                                                 Location::Base(RC_KF_SHOP_ITEM_3,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x02,                               "Shop Item 3",                                 RHT_KF_SHOP_ITEM_3,                                              RG_BUY_DEKU_NUTS_10,  SpoilerCollectionCheck(), false, 30);
+    locationTable[RC_KF_SHOP_ITEM_4] =                                                 Location::Base(RC_KF_SHOP_ITEM_4,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x03,                               "Shop Item 4",                                 RHT_KF_SHOP_ITEM_4,                                              RG_BUY_DEKU_STICK_1,  SpoilerCollectionCheck(), false, 10);
+    locationTable[RC_KF_SHOP_ITEM_5] =                                                 Location::Base(RC_KF_SHOP_ITEM_5,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x04,                               "Shop Item 5",                                 RHT_KF_SHOP_ITEM_5,                                              RG_BUY_DEKU_SEEDS_30, SpoilerCollectionCheck(), false, 30);
+    locationTable[RC_KF_SHOP_ITEM_6] =                                                 Location::Base(RC_KF_SHOP_ITEM_6,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x05,                               "Shop Item 6",                                 RHT_KF_SHOP_ITEM_6,                                              RG_BUY_ARROWS_10,     SpoilerCollectionCheck(), false, 20);
+    locationTable[RC_KF_SHOP_ITEM_7] =                                                 Location::Base(RC_KF_SHOP_ITEM_7,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x06,                               "Shop Item 7",                                 RHT_KF_SHOP_ITEM_7,                                              RG_BUY_ARROWS_30,     SpoilerCollectionCheck(), false, 60);
+    locationTable[RC_KF_SHOP_ITEM_8] =                                                 Location::Base(RC_KF_SHOP_ITEM_8,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_KOKIRI_SHOP,                  0x07,                               "Shop Item 8",                                 RHT_KF_SHOP_ITEM_8,                                              RG_BUY_HEART,         SpoilerCollectionCheck(), false, 10);
 
     // Kakariko Village
-    locationTable[RC_KAK_POTION_SHOP_ITEM_1] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_1,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x00,                               "Potion Shop Item 1",                          RHT_KAK_POTION_SHOP_ITEM_1,                                      RG_BUY_GREEN_POTION);
-    locationTable[RC_KAK_POTION_SHOP_ITEM_2] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_2,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x01,                               "Potion Shop Item 2",                          RHT_KAK_POTION_SHOP_ITEM_2,                                      RG_BUY_BLUE_FIRE);
-    locationTable[RC_KAK_POTION_SHOP_ITEM_3] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_3,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x02,                               "Potion Shop Item 3",                          RHT_KAK_POTION_SHOP_ITEM_3,                                      RG_BUY_RED_POTION_30);
-    locationTable[RC_KAK_POTION_SHOP_ITEM_4] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_4,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x03,                               "Potion Shop Item 4",                          RHT_KAK_POTION_SHOP_ITEM_4,                                      RG_BUY_FAIRYS_SPIRIT);
-    locationTable[RC_KAK_POTION_SHOP_ITEM_5] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_5,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x04,                               "Potion Shop Item 5",                          RHT_KAK_POTION_SHOP_ITEM_5,                                      RG_BUY_DEKU_NUTS_5);
-    locationTable[RC_KAK_POTION_SHOP_ITEM_6] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_6,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x05,                               "Potion Shop Item 6",                          RHT_KAK_POTION_SHOP_ITEM_6,                                      RG_BUY_BOTTLE_BUG);
-    locationTable[RC_KAK_POTION_SHOP_ITEM_7] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_7,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x06,                               "Potion Shop Item 7",                          RHT_KAK_POTION_SHOP_ITEM_7,                                      RG_BUY_POE);
-    locationTable[RC_KAK_POTION_SHOP_ITEM_8] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_8,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x07,                               "Potion Shop Item 8",                          RHT_KAK_POTION_SHOP_ITEM_8,                                      RG_BUY_FISH);
-    locationTable[RC_KAK_BAZAAR_ITEM_1] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_1,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x00,                               "Bazaar Item 1",                               RHT_KAK_BAZAAR_ITEM_1,                                           RG_BUY_HYLIAN_SHIELD);
-    locationTable[RC_KAK_BAZAAR_ITEM_2] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_2,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x01,                               "Bazaar Item 2",                               RHT_KAK_BAZAAR_ITEM_2,                                           RG_BUY_BOMBS_535);
-    locationTable[RC_KAK_BAZAAR_ITEM_3] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_3,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x02,                               "Bazaar Item 3",                               RHT_KAK_BAZAAR_ITEM_3,                                           RG_BUY_DEKU_NUTS_5);
-    locationTable[RC_KAK_BAZAAR_ITEM_4] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_4,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x03,                               "Bazaar Item 4",                               RHT_KAK_BAZAAR_ITEM_4,                                           RG_BUY_HEART);
-    locationTable[RC_KAK_BAZAAR_ITEM_5] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_5,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x04,                               "Bazaar Item 5",                               RHT_KAK_BAZAAR_ITEM_5,                                           RG_BUY_ARROWS_10);
-    locationTable[RC_KAK_BAZAAR_ITEM_6] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_6,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x05,                               "Bazaar Item 6",                               RHT_KAK_BAZAAR_ITEM_6,                                           RG_BUY_ARROWS_50);
-    locationTable[RC_KAK_BAZAAR_ITEM_7] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_7,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x06,                               "Bazaar Item 7",                               RHT_KAK_BAZAAR_ITEM_7,                                           RG_BUY_DEKU_STICK_1);
-    locationTable[RC_KAK_BAZAAR_ITEM_8] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_8,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x07,                               "Bazaar Item 8",                               RHT_KAK_BAZAAR_ITEM_8,                                           RG_BUY_ARROWS_30);
+    locationTable[RC_KAK_POTION_SHOP_ITEM_1] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_1,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x00,                               "Potion Shop Item 1",                          RHT_KAK_POTION_SHOP_ITEM_1,                                      RG_BUY_GREEN_POTION,  SpoilerCollectionCheck(), false, 30);
+    locationTable[RC_KAK_POTION_SHOP_ITEM_2] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_2,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x01,                               "Potion Shop Item 2",                          RHT_KAK_POTION_SHOP_ITEM_2,                                      RG_BUY_BLUE_FIRE,     SpoilerCollectionCheck(), false, 300);
+    locationTable[RC_KAK_POTION_SHOP_ITEM_3] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_3,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x02,                               "Potion Shop Item 3",                          RHT_KAK_POTION_SHOP_ITEM_3,                                      RG_BUY_RED_POTION_30, SpoilerCollectionCheck(), false, 30);
+    locationTable[RC_KAK_POTION_SHOP_ITEM_4] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_4,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x03,                               "Potion Shop Item 4",                          RHT_KAK_POTION_SHOP_ITEM_4,                                      RG_BUY_FAIRYS_SPIRIT, SpoilerCollectionCheck(), false, 50);
+    locationTable[RC_KAK_POTION_SHOP_ITEM_5] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_5,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x04,                               "Potion Shop Item 5",                          RHT_KAK_POTION_SHOP_ITEM_5,                                      RG_BUY_DEKU_NUTS_5,   SpoilerCollectionCheck(), false, 15);
+    locationTable[RC_KAK_POTION_SHOP_ITEM_6] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_6,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x05,                               "Potion Shop Item 6",                          RHT_KAK_POTION_SHOP_ITEM_6,                                      RG_BUY_BOTTLE_BUG,    SpoilerCollectionCheck(), false, 50);
+    locationTable[RC_KAK_POTION_SHOP_ITEM_7] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_7,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x06,                               "Potion Shop Item 7",                          RHT_KAK_POTION_SHOP_ITEM_7,                                      RG_BUY_POE,           SpoilerCollectionCheck(), false, 30);
+    locationTable[RC_KAK_POTION_SHOP_ITEM_8] =                                         Location::Base(RC_KAK_POTION_SHOP_ITEM_8,                                       RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_KAKARIKO,         0x07,                               "Potion Shop Item 8",                          RHT_KAK_POTION_SHOP_ITEM_8,                                      RG_BUY_FISH,          SpoilerCollectionCheck(), false, 200);
+    locationTable[RC_KAK_BAZAAR_ITEM_1] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_1,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x00,                               "Bazaar Item 1",                               RHT_KAK_BAZAAR_ITEM_1,                                           RG_BUY_HYLIAN_SHIELD, SpoilerCollectionCheck(), false, 80);
+    locationTable[RC_KAK_BAZAAR_ITEM_2] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_2,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x01,                               "Bazaar Item 2",                               RHT_KAK_BAZAAR_ITEM_2,                                           RG_BUY_BOMBS_535,     SpoilerCollectionCheck(), false, 35);
+    locationTable[RC_KAK_BAZAAR_ITEM_3] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_3,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x02,                               "Bazaar Item 3",                               RHT_KAK_BAZAAR_ITEM_3,                                           RG_BUY_DEKU_NUTS_5,   SpoilerCollectionCheck(), false, 10);
+    locationTable[RC_KAK_BAZAAR_ITEM_4] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_4,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x03,                               "Bazaar Item 4",                               RHT_KAK_BAZAAR_ITEM_4,                                           RG_BUY_HEART,         SpoilerCollectionCheck(), false, 20);
+    locationTable[RC_KAK_BAZAAR_ITEM_5] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_5,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x04,                               "Bazaar Item 5",                               RHT_KAK_BAZAAR_ITEM_5,                                           RG_BUY_ARROWS_10,     SpoilerCollectionCheck(), false, 20);
+    locationTable[RC_KAK_BAZAAR_ITEM_6] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_6,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x05,                               "Bazaar Item 6",                               RHT_KAK_BAZAAR_ITEM_6,                                           RG_BUY_ARROWS_50,     SpoilerCollectionCheck(), false, 90);
+    locationTable[RC_KAK_BAZAAR_ITEM_7] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_7,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x06,                               "Bazaar Item 7",                               RHT_KAK_BAZAAR_ITEM_7,                                           RG_BUY_DEKU_STICK_1,  SpoilerCollectionCheck(), false, 10);
+    locationTable[RC_KAK_BAZAAR_ITEM_8] =                                              Location::Base(RC_KAK_BAZAAR_ITEM_8,                                            RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_TEST01,                       0x07,                               "Bazaar Item 8",                               RHT_KAK_BAZAAR_ITEM_8,                                           RG_BUY_ARROWS_30,     SpoilerCollectionCheck(), false, 60);
 
     // Market
-    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_1] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_1,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x00,                               "Bombchu Shop Item 1",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_1,                                  RG_BUY_BOMBCHUS_10);
-    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_2] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_2,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x01,                               "Bombchu Shop Item 2",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_2,                                  RG_BUY_BOMBCHUS_10);
-    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_3] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_3,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x02,                               "Bombchu Shop Item 3",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_3,                                  RG_BUY_BOMBCHUS_10);
-    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_4] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_4,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x03,                               "Bombchu Shop Item 4",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_4,                                  RG_BUY_BOMBCHUS_10);
-    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_5] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_5,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x04,                               "Bombchu Shop Item 5",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_5,                                  RG_BUY_BOMBCHUS_20);
-    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_6] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_6,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x05,                               "Bombchu Shop Item 6",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_6,                                  RG_BUY_BOMBCHUS_20);
-    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_7] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_7,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x06,                               "Bombchu Shop Item 7",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_7,                                  RG_BUY_BOMBCHUS_20);
-    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_8] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_8,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x07,                               "Bombchu Shop Item 8",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_8,                                  RG_BUY_BOMBCHUS_20);
-    locationTable[RC_MARKET_POTION_SHOP_ITEM_1] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_1,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x00,                               "Potion Shop Item 1",                          RHT_MARKET_POTION_SHOP_ITEM_1,                                   RG_BUY_GREEN_POTION);
-    locationTable[RC_MARKET_POTION_SHOP_ITEM_2] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_2,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x01,                               "Potion Shop Item 2",                          RHT_MARKET_POTION_SHOP_ITEM_2,                                   RG_BUY_BLUE_FIRE);
-    locationTable[RC_MARKET_POTION_SHOP_ITEM_3] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_3,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x02,                               "Potion Shop Item 3",                          RHT_MARKET_POTION_SHOP_ITEM_3,                                   RG_BUY_RED_POTION_30);
-    locationTable[RC_MARKET_POTION_SHOP_ITEM_4] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_4,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x03,                               "Potion Shop Item 4",                          RHT_MARKET_POTION_SHOP_ITEM_4,                                   RG_BUY_FAIRYS_SPIRIT);
-    locationTable[RC_MARKET_POTION_SHOP_ITEM_5] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_5,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x04,                               "Potion Shop Item 5",                          RHT_MARKET_POTION_SHOP_ITEM_5,                                   RG_BUY_DEKU_NUTS_5);
-    locationTable[RC_MARKET_POTION_SHOP_ITEM_6] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_6,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x05,                               "Potion Shop Item 6",                          RHT_MARKET_POTION_SHOP_ITEM_6,                                   RG_BUY_BOTTLE_BUG);
-    locationTable[RC_MARKET_POTION_SHOP_ITEM_7] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_7,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x06,                               "Potion Shop Item 7",                          RHT_MARKET_POTION_SHOP_ITEM_7,                                   RG_BUY_POE);
-    locationTable[RC_MARKET_POTION_SHOP_ITEM_8] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_8,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x07,                               "Potion Shop Item 8",                          RHT_MARKET_POTION_SHOP_ITEM_8,                                   RG_BUY_FISH);
-    locationTable[RC_MARKET_BAZAAR_ITEM_1] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_1,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x00,                               "Bazaar Item 1",                               RHT_MARKET_BAZAAR_ITEM_1,                                        RG_BUY_HYLIAN_SHIELD);
-    locationTable[RC_MARKET_BAZAAR_ITEM_2] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_2,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x01,                               "Bazaar Item 2",                               RHT_MARKET_BAZAAR_ITEM_2,                                        RG_BUY_BOMBS_535);
-    locationTable[RC_MARKET_BAZAAR_ITEM_3] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_3,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x02,                               "Bazaar Item 3",                               RHT_MARKET_BAZAAR_ITEM_3,                                        RG_BUY_DEKU_NUTS_5);
-    locationTable[RC_MARKET_BAZAAR_ITEM_4] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_4,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x03,                               "Bazaar Item 4",                               RHT_MARKET_BAZAAR_ITEM_4,                                        RG_BUY_HEART);
-    locationTable[RC_MARKET_BAZAAR_ITEM_5] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_5,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x04,                               "Bazaar Item 5",                               RHT_MARKET_BAZAAR_ITEM_5,                                        RG_BUY_ARROWS_10);
-    locationTable[RC_MARKET_BAZAAR_ITEM_6] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_6,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x05,                               "Bazaar Item 6",                               RHT_MARKET_BAZAAR_ITEM_6,                                        RG_BUY_ARROWS_50);
-    locationTable[RC_MARKET_BAZAAR_ITEM_7] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_7,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x06,                               "Bazaar Item 7",                               RHT_MARKET_BAZAAR_ITEM_7,                                        RG_BUY_DEKU_STICK_1);
-    locationTable[RC_MARKET_BAZAAR_ITEM_8] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_8,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x07,                               "Bazaar Item 8",                               RHT_MARKET_BAZAAR_ITEM_8,                                        RG_BUY_ARROWS_30);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_1] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_1,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x00,                               "Bombchu Shop Item 1",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_1,                                  RG_BUY_BOMBCHUS_10,   SpoilerCollectionCheck(), false, 99);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_2] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_2,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x01,                               "Bombchu Shop Item 2",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_2,                                  RG_BUY_BOMBCHUS_10,   SpoilerCollectionCheck(), false, 99);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_3] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_3,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x02,                               "Bombchu Shop Item 3",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_3,                                  RG_BUY_BOMBCHUS_10,   SpoilerCollectionCheck(), false, 99);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_4] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_4,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x03,                               "Bombchu Shop Item 4",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_4,                                  RG_BUY_BOMBCHUS_10,   SpoilerCollectionCheck(), false, 99);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_5] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_5,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x04,                               "Bombchu Shop Item 5",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_5,                                  RG_BUY_BOMBCHUS_20,   SpoilerCollectionCheck(), false, 180);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_6] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_6,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x05,                               "Bombchu Shop Item 6",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_6,                                  RG_BUY_BOMBCHUS_20,   SpoilerCollectionCheck(), false, 180);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_7] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_7,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x06,                               "Bombchu Shop Item 7",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_7,                                  RG_BUY_BOMBCHUS_20,   SpoilerCollectionCheck(), false, 180);
+    locationTable[RC_MARKET_BOMBCHU_SHOP_ITEM_8] =                                     Location::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_8,                                   RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_BOMBCHU_SHOP,                 0x07,                               "Bombchu Shop Item 8",                         RHT_MARKET_BOMBCHU_SHOP_ITEM_8,                                  RG_BUY_BOMBCHUS_20,   SpoilerCollectionCheck(), false, 180);
+    locationTable[RC_MARKET_POTION_SHOP_ITEM_1] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_1,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x00,                               "Potion Shop Item 1",                          RHT_MARKET_POTION_SHOP_ITEM_1,                                   RG_BUY_GREEN_POTION,  SpoilerCollectionCheck(), false, 30);
+    locationTable[RC_MARKET_POTION_SHOP_ITEM_2] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_2,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x01,                               "Potion Shop Item 2",                          RHT_MARKET_POTION_SHOP_ITEM_2,                                   RG_BUY_BLUE_FIRE,     SpoilerCollectionCheck(), false, 300);
+    locationTable[RC_MARKET_POTION_SHOP_ITEM_3] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_3,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x02,                               "Potion Shop Item 3",                          RHT_MARKET_POTION_SHOP_ITEM_3,                                   RG_BUY_RED_POTION_30, SpoilerCollectionCheck(), false, 30);
+    locationTable[RC_MARKET_POTION_SHOP_ITEM_4] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_4,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x03,                               "Potion Shop Item 4",                          RHT_MARKET_POTION_SHOP_ITEM_4,                                   RG_BUY_FAIRYS_SPIRIT, SpoilerCollectionCheck(), false, 50);
+    locationTable[RC_MARKET_POTION_SHOP_ITEM_5] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_5,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x04,                               "Potion Shop Item 5",                          RHT_MARKET_POTION_SHOP_ITEM_5,                                   RG_BUY_DEKU_NUTS_5,   SpoilerCollectionCheck(), false, 15);
+    locationTable[RC_MARKET_POTION_SHOP_ITEM_6] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_6,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x05,                               "Potion Shop Item 6",                          RHT_MARKET_POTION_SHOP_ITEM_6,                                   RG_BUY_BOTTLE_BUG,    SpoilerCollectionCheck(), false, 50);
+    locationTable[RC_MARKET_POTION_SHOP_ITEM_7] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_7,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x06,                               "Potion Shop Item 7",                          RHT_MARKET_POTION_SHOP_ITEM_7,                                   RG_BUY_POE,           SpoilerCollectionCheck(), false, 30);
+    locationTable[RC_MARKET_POTION_SHOP_ITEM_8] =                                      Location::Base(RC_MARKET_POTION_SHOP_ITEM_8,                                    RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_POTION_SHOP_MARKET,           0x07,                               "Potion Shop Item 8",                          RHT_MARKET_POTION_SHOP_ITEM_8,                                   RG_BUY_FISH,          SpoilerCollectionCheck(), false, 200);
+    locationTable[RC_MARKET_BAZAAR_ITEM_1] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_1,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x00,                               "Bazaar Item 1",                               RHT_MARKET_BAZAAR_ITEM_1,                                        RG_BUY_HYLIAN_SHIELD, SpoilerCollectionCheck(), false, 80);
+    locationTable[RC_MARKET_BAZAAR_ITEM_2] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_2,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x01,                               "Bazaar Item 2",                               RHT_MARKET_BAZAAR_ITEM_2,                                        RG_BUY_BOMBS_535,     SpoilerCollectionCheck(), false, 35);
+    locationTable[RC_MARKET_BAZAAR_ITEM_3] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_3,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x02,                               "Bazaar Item 3",                               RHT_MARKET_BAZAAR_ITEM_3,                                        RG_BUY_DEKU_NUTS_5,   SpoilerCollectionCheck(), false, 15);
+    locationTable[RC_MARKET_BAZAAR_ITEM_4] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_4,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x03,                               "Bazaar Item 4",                               RHT_MARKET_BAZAAR_ITEM_4,                                        RG_BUY_HEART,         SpoilerCollectionCheck(), false, 10);
+    locationTable[RC_MARKET_BAZAAR_ITEM_5] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_5,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x04,                               "Bazaar Item 5",                               RHT_MARKET_BAZAAR_ITEM_5,                                        RG_BUY_ARROWS_10,     SpoilerCollectionCheck(), false, 20);
+    locationTable[RC_MARKET_BAZAAR_ITEM_6] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_6,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x05,                               "Bazaar Item 6",                               RHT_MARKET_BAZAAR_ITEM_6,                                        RG_BUY_ARROWS_50,     SpoilerCollectionCheck(), false, 90);
+    locationTable[RC_MARKET_BAZAAR_ITEM_7] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_7,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x06,                               "Bazaar Item 7",                               RHT_MARKET_BAZAAR_ITEM_7,                                        RG_BUY_DEKU_STICK_1,  SpoilerCollectionCheck(), false, 10);
+    locationTable[RC_MARKET_BAZAAR_ITEM_8] =                                           Location::Base(RC_MARKET_BAZAAR_ITEM_8,                                         RCQUEST_BOTH,    RCTYPE_SHOP,                        RCAREA_MARKET,                       ACTOR_EN_GIRLA,       SCENE_BAZAAR,                       0x07,                               "Bazaar Item 8",                               RHT_MARKET_BAZAAR_ITEM_8,                                        RG_BUY_ARROWS_30,     SpoilerCollectionCheck(), false, 60);
 
     // Zora's Domain
-    locationTable[RC_ZD_SHOP_ITEM_1] =                                                 Location::Base(RC_ZD_SHOP_ITEM_1,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x00,                               "Shop Item 1",                                 RHT_ZD_SHOP_ITEM_1,                                              RG_BUY_ZORA_TUNIC);
-    locationTable[RC_ZD_SHOP_ITEM_2] =                                                 Location::Base(RC_ZD_SHOP_ITEM_2,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x01,                               "Shop Item 2",                                 RHT_ZD_SHOP_ITEM_2,                                              RG_BUY_ARROWS_10);
-    locationTable[RC_ZD_SHOP_ITEM_3] =                                                 Location::Base(RC_ZD_SHOP_ITEM_3,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x02,                               "Shop Item 3",                                 RHT_ZD_SHOP_ITEM_3,                                              RG_BUY_HEART);
-    locationTable[RC_ZD_SHOP_ITEM_4] =                                                 Location::Base(RC_ZD_SHOP_ITEM_4,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x03,                               "Shop Item 4",                                 RHT_ZD_SHOP_ITEM_4,                                              RG_BUY_ARROWS_30);
-    locationTable[RC_ZD_SHOP_ITEM_5] =                                                 Location::Base(RC_ZD_SHOP_ITEM_5,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x04,                               "Shop Item 5",                                 RHT_ZD_SHOP_ITEM_5,                                              RG_BUY_DEKU_NUTS_5);
-    locationTable[RC_ZD_SHOP_ITEM_6] =                                                 Location::Base(RC_ZD_SHOP_ITEM_6,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x05,                               "Shop Item 6",                                 RHT_ZD_SHOP_ITEM_6,                                              RG_BUY_ARROWS_50);
-    locationTable[RC_ZD_SHOP_ITEM_7] =                                                 Location::Base(RC_ZD_SHOP_ITEM_7,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x06,                               "Shop Item 7",                                 RHT_ZD_SHOP_ITEM_7,                                              RG_BUY_FISH);
-    locationTable[RC_ZD_SHOP_ITEM_8] =                                                 Location::Base(RC_ZD_SHOP_ITEM_8,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x07,                               "Shop Item 8",                                 RHT_ZD_SHOP_ITEM_8,                                              RG_BUY_RED_POTION_50);
+    locationTable[RC_ZD_SHOP_ITEM_1] =                                                 Location::Base(RC_ZD_SHOP_ITEM_1,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x00,                               "Shop Item 1",                                 RHT_ZD_SHOP_ITEM_1,                                              RG_BUY_ZORA_TUNIC,    SpoilerCollectionCheck(), false, 200);
+    locationTable[RC_ZD_SHOP_ITEM_2] =                                                 Location::Base(RC_ZD_SHOP_ITEM_2,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x01,                               "Shop Item 2",                                 RHT_ZD_SHOP_ITEM_2,                                              RG_BUY_ARROWS_10,     SpoilerCollectionCheck(), false, 20);
+    locationTable[RC_ZD_SHOP_ITEM_3] =                                                 Location::Base(RC_ZD_SHOP_ITEM_3,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x02,                               "Shop Item 3",                                 RHT_ZD_SHOP_ITEM_3,                                              RG_BUY_HEART,         SpoilerCollectionCheck(), false, 10);
+    locationTable[RC_ZD_SHOP_ITEM_4] =                                                 Location::Base(RC_ZD_SHOP_ITEM_4,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x03,                               "Shop Item 4",                                 RHT_ZD_SHOP_ITEM_4,                                              RG_BUY_ARROWS_30,     SpoilerCollectionCheck(), false, 60);
+    locationTable[RC_ZD_SHOP_ITEM_5] =                                                 Location::Base(RC_ZD_SHOP_ITEM_5,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x04,                               "Shop Item 5",                                 RHT_ZD_SHOP_ITEM_5,                                              RG_BUY_DEKU_NUTS_5,   SpoilerCollectionCheck(), false, 15);
+    locationTable[RC_ZD_SHOP_ITEM_6] =                                                 Location::Base(RC_ZD_SHOP_ITEM_6,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x05,                               "Shop Item 6",                                 RHT_ZD_SHOP_ITEM_6,                                              RG_BUY_ARROWS_50,     SpoilerCollectionCheck(), false, 90);
+    locationTable[RC_ZD_SHOP_ITEM_7] =                                                 Location::Base(RC_ZD_SHOP_ITEM_7,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x06,                               "Shop Item 7",                                 RHT_ZD_SHOP_ITEM_7,                                              RG_BUY_FISH,          SpoilerCollectionCheck(), false, 200);
+    locationTable[RC_ZD_SHOP_ITEM_8] =                                                 Location::Base(RC_ZD_SHOP_ITEM_8,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_ZORA_SHOP,                    0x07,                               "Shop Item 8",                                 RHT_ZD_SHOP_ITEM_8,                                              RG_BUY_RED_POTION_50, SpoilerCollectionCheck(), false, 50);
 
     // Goron City
-    locationTable[RC_GC_SHOP_ITEM_1] =                                                 Location::Base(RC_GC_SHOP_ITEM_1,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x00,                               "Shop Item 1",                                 RHT_GC_SHOP_ITEM_1,                                              RG_BUY_BOMBS_525);
-    locationTable[RC_GC_SHOP_ITEM_2] =                                                 Location::Base(RC_GC_SHOP_ITEM_2,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x01,                               "Shop Item 2",                                 RHT_GC_SHOP_ITEM_2,                                              RG_BUY_BOMBS_10);
-    locationTable[RC_GC_SHOP_ITEM_3] =                                                 Location::Base(RC_GC_SHOP_ITEM_3,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x02,                               "Shop Item 3",                                 RHT_GC_SHOP_ITEM_3,                                              RG_BUY_BOMBS_20);
-    locationTable[RC_GC_SHOP_ITEM_4] =                                                 Location::Base(RC_GC_SHOP_ITEM_4,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x03,                               "Shop Item 4",                                 RHT_GC_SHOP_ITEM_4,                                              RG_BUY_BOMBS_30);
-    locationTable[RC_GC_SHOP_ITEM_5] =                                                 Location::Base(RC_GC_SHOP_ITEM_5,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x04,                               "Shop Item 5",                                 RHT_GC_SHOP_ITEM_5,                                              RG_BUY_GORON_TUNIC);
-    locationTable[RC_GC_SHOP_ITEM_6] =                                                 Location::Base(RC_GC_SHOP_ITEM_6,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x05,                               "Shop Item 6",                                 RHT_GC_SHOP_ITEM_6,                                              RG_BUY_HEART);
-    locationTable[RC_GC_SHOP_ITEM_7] =                                                 Location::Base(RC_GC_SHOP_ITEM_7,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x06,                               "Shop Item 7",                                 RHT_GC_SHOP_ITEM_7,                                              RG_BUY_RED_POTION_40);
-    locationTable[RC_GC_SHOP_ITEM_8] =                                                 Location::Base(RC_GC_SHOP_ITEM_8,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x07,                               "Shop Item 8",                                 RHT_GC_SHOP_ITEM_8,                                              RG_BUY_HEART);
+    locationTable[RC_GC_SHOP_ITEM_1] =                                                 Location::Base(RC_GC_SHOP_ITEM_1,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x00,                               "Shop Item 1",                                 RHT_GC_SHOP_ITEM_1,                                              RG_BUY_BOMBS_525,     SpoilerCollectionCheck(), false, 25);
+    locationTable[RC_GC_SHOP_ITEM_2] =                                                 Location::Base(RC_GC_SHOP_ITEM_2,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x01,                               "Shop Item 2",                                 RHT_GC_SHOP_ITEM_2,                                              RG_BUY_BOMBS_10,      SpoilerCollectionCheck(), false, 50);
+    locationTable[RC_GC_SHOP_ITEM_3] =                                                 Location::Base(RC_GC_SHOP_ITEM_3,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x02,                               "Shop Item 3",                                 RHT_GC_SHOP_ITEM_3,                                              RG_BUY_BOMBS_20,      SpoilerCollectionCheck(), false, 80);
+    locationTable[RC_GC_SHOP_ITEM_4] =                                                 Location::Base(RC_GC_SHOP_ITEM_4,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x03,                               "Shop Item 4",                                 RHT_GC_SHOP_ITEM_4,                                              RG_BUY_BOMBS_30,      SpoilerCollectionCheck(), false, 120);
+    locationTable[RC_GC_SHOP_ITEM_5] =                                                 Location::Base(RC_GC_SHOP_ITEM_5,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x04,                               "Shop Item 5",                                 RHT_GC_SHOP_ITEM_5,                                              RG_BUY_GORON_TUNIC,   SpoilerCollectionCheck(), false, 200);
+    locationTable[RC_GC_SHOP_ITEM_6] =                                                 Location::Base(RC_GC_SHOP_ITEM_6,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x05,                               "Shop Item 6",                                 RHT_GC_SHOP_ITEM_6,                                              RG_BUY_HEART,         SpoilerCollectionCheck(), false, 10);
+    locationTable[RC_GC_SHOP_ITEM_7] =                                                 Location::Base(RC_GC_SHOP_ITEM_7,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x06,                               "Shop Item 7",                                 RHT_GC_SHOP_ITEM_7,                                              RG_BUY_RED_POTION_40, SpoilerCollectionCheck(), false, 40);
+    locationTable[RC_GC_SHOP_ITEM_8] =                                                 Location::Base(RC_GC_SHOP_ITEM_8,                                               RCQUEST_BOTH,    RCTYPE_SHOP,                                                             ACTOR_EN_GIRLA,       SCENE_GORON_SHOP,                   0x07,                               "Shop Item 8",                                 RHT_GC_SHOP_ITEM_8,                                              RG_BUY_HEART,         SpoilerCollectionCheck(), false, 10);
 
     /* +--------------+
        |  FISHSANITY  |
@@ -1084,7 +1094,7 @@ void Rando::StaticData::InitLocationTable() { //
     locationTable[RC_TOT_SHEIK_HINT] =                                            Location::OtherHint(RC_TOT_SHEIK_HINT,                                               RCQUEST_BOTH,                                                                             ACTOR_EN_XC,          SCENE_TEMPLE_OF_TIME,       "Ocarina of Time Hint");
     locationTable[RC_MASK_SHOP_HINT] =                                            Location::OtherHint(RC_MASK_SHOP_HINT,                                               RCQUEST_BOTH,                                                                             ACTOR_ID_MAX,         SCENE_HAPPY_MASK_SHOP,      "Mask Shop Hint");
 
-    locationTable[RC_TRIFORCE_COMPLETED] =                                             Location::Base(RC_TRIFORCE_COMPLETED,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                               "Completed Triforce", "Completed Triforce",    RHT_NONE,                                                        RG_NONE);
+    locationTable[RC_TRIFORCE_COMPLETED] =                                        Location::Base(RC_TRIFORCE_COMPLETED,                                                RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_MARKET,                       ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                               "Completed Triforce", "Completed Triforce",    RHT_NONE,                                                        RG_NONE);
     // clang-format on
 
     // Init locationNameToEnum
diff --git a/soh/soh/Enhancements/randomizer/option_descriptions.cpp b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
index 547d675df..7de98b3d0 100644
--- a/soh/soh/Enhancements/randomizer/option_descriptions.cpp
+++ b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
@@ -218,6 +218,8 @@ void Settings::CreateOptionDescriptions() {
         "Enabling this shuffles the Child's Wallet into the item pool.\n"
         "\n"
         "You will not be able to carry any rupees until you find a wallet.";
+    mOptionDescriptions[RSK_INCLUDE_TYCOON_WALLET] =
+        "Enabling this adds an extra Progressive Wallet to the pool and adds a new 999 capacity tier after Giant's Wallet.\n";
     mOptionDescriptions[RSK_SHUFFLE_OCARINA] =
         "Enabling this shuffles the Fairy Ocarina and the Ocarina of Time into the item pool.\n"
         "\n"
@@ -277,12 +279,31 @@ void Settings::CreateOptionDescriptions() {
                                                 "8 Items - All shops will contain 8 non-vanilla shop items.\n"
                                                 */;
     mOptionDescriptions[RSK_SHOPSANITY_PRICES] =
-        "Balanced - The default randomization. Shop prices for shopsanity items will range between 0 to 300 rupees, "
-        "with a bias towards values slightly below the middle of the range, in multiples of 5.\n "
-        "\n"
-        "X Wallet - Randomized between 5 and the wallet's max size, in multiples of 5";
+        "Vanilla - The same price as the item it replaced\n"
+        "Cheap Balanced - Prices will range between 0 to 95 rupees, favoring lower numbers\n"
+        "Balanced - Prices will range between 0 to 300 rupees, favoring lower numbers\n"
+        "Fixed - A fixed number\n"
+        "Range - A random point between specific ranges\n"
+        "Set By Wallet - Set weights that decide the choice of each wallet, and get a random price in that range if that wallet is chosen";
+    mOptionDescriptions[RSK_SHOPSANITY_PRICES_FIXED_PRICE] =
+        "The price for Shopsanity checks.";
+    mOptionDescriptions[RSK_SHOPSANITY_PRICES_RANGE_1] =
+        "The first part of the inclusive range of prices to allow for Shopsanity checks.";
+    mOptionDescriptions[RSK_SHOPSANITY_PRICES_RANGE_2] =
+        "The second part of the inclusive range of prices to allow for Shopsanity checks.";
+    mOptionDescriptions[RSK_SHOPSANITY_PRICES_NO_WALLET_WEIGHT] =
+        "The chance for Shopsanity checks to be free.";
+    mOptionDescriptions[RSK_SHOPSANITY_PRICES_CHILD_WALLET_WEIGHT] =
+        "The chance for Shopsanity checks to be purchasable with Child's Wallet (1-99).";
+    mOptionDescriptions[RSK_SHOPSANITY_PRICES_ADULT_WALLET_WEIGHT] =
+        "The chance for Shopsanity checks to be purchasable with Adult's Wallet (100-200).";
+    mOptionDescriptions[RSK_SHOPSANITY_PRICES_GIANT_WALLET_WEIGHT] =
+        "The chance for Shopsanity checks to be purchasable with Giant's Wallet (201-500).";
+    mOptionDescriptions[RSK_SHOPSANITY_PRICES_TYCOON_WALLET_WEIGHT] =
+        "The chance for Shopsanity checks to be purchasable with Tycoon Wallet. (500+)";
     mOptionDescriptions[RSK_SHOPSANITY_PRICES_AFFORDABLE] =
-        "Affordable prices per tier: starter = 10, adult = 105, giant = 205, tycoon = 505\n\n"
+        "After choosing a price, set it to the affordable amount based on the wallet required.\n\n"
+        "Affordable prices per tier: starter = 1, adult = 100, giant = 201, tycoon = 501\n\n"
         "Use this to enable wallet tier locking, but make shop items not as expensive as they could be.";
     mOptionDescriptions[RSK_FISHSANITY] = "Off - Fish will not be shuffled. No changes will be made to fishing behavior.\n\n"
         "Shuffle only Hyrule Loach - Allows you to earn an item by catching the hyrule loach at the fishing pond and giving it to the owner.\n\n"
@@ -297,32 +318,84 @@ void Settings::CreateOptionDescriptions() {
         "If disabled, then the child pond will be shuffled and shared between both ages.\n\n"
         "Note that, as child, there is a second loach available in the pond!";
     mOptionDescriptions[RSK_SHUFFLE_SCRUBS] =
-        "Off - Scrubs will not be shuffled. The 3 Scrubs that give one-time items in the vanilla game "
-        "(PoH, Deku Nut capacity, and Deku Stick capacity) will have random items.\n"
+        "Off - Scrubs will not be shuffled. The 3 Scrubs that give one-time items in the "
+        "vanilla game (PoH, Deku Nut capacity, and Deku Stick capacity) will not spawn."
         "\n"
-        "Affordable - Scrubs will be shuffled and their item will cost 10 rupees.\n"
+        "One-Time Only - Only the 3 Scrubs that give one-time items in the "
+        "vanilla game are shuffled.\n"
         "\n"
-        "Expensive - Scrubs will be shuffled and their item will cost the vanilla price.\n"
-        "\n"
-        "Random - Scrubs will be shuffled and their item will cost will be between 0-95 rupees.\n";
+        "All - All Scrubs are shuffled.";
+    mOptionDescriptions[RSK_SCRUBS_PRICES] =
+        "Vanilla - The same price as the item it replaced\n"
+        "Cheap Balanced - Prices will range between 0 to 95 rupees, favoring lower numbers\n"
+        "Balanced - Prices will range between 0 to 300 rupees, favoring lower numbers\n"
+        "Fixed - A fixed number\n"
+        "Range - A random point between specific ranges\n"
+        "Set By Wallet - Set weights that decide the choice of each wallet, and get a random price in that range if that wallet is chosen";
+    mOptionDescriptions[RSK_SCRUBS_PRICES_FIXED_PRICE] =
+        "The price for Scrub checks.";
+    mOptionDescriptions[RSK_SCRUBS_PRICES_RANGE_1] =
+        "The first part of the inclusive range of prices to allow for Scrub checks.";
+    mOptionDescriptions[RSK_SCRUBS_PRICES_RANGE_2] =
+        "The second part of the inclusive range of prices to allow for Scrub checks.";
+    mOptionDescriptions[RSK_SCRUBS_PRICES_NO_WALLET_WEIGHT] =
+        "The chance for Scrub checks to be free.";
+    mOptionDescriptions[RSK_SCRUBS_PRICES_CHILD_WALLET_WEIGHT] =
+        "The chance for Scrub checks to be purchasable with Child's Wallet (1-99).";
+    mOptionDescriptions[RSK_SCRUBS_PRICES_ADULT_WALLET_WEIGHT] =
+        "The chance for Scrub checks to be purchasable with Adult's Wallet (100-200).";
+    mOptionDescriptions[RSK_SCRUBS_PRICES_GIANT_WALLET_WEIGHT] =
+        "The chance for Scrub checks to be purchasable with Giant's Wallet (201-500).";
+    mOptionDescriptions[RSK_SCRUBS_PRICES_TYCOON_WALLET_WEIGHT] =
+        "The chance for Scrub checks to be purchasable with Tycoon Wallet. (500+)";
+    mOptionDescriptions[RSK_SCRUBS_PRICES_AFFORDABLE] =
+        "After choosing a price, set it to the affordable amount based on the wallet required.\n\n"
+        "Affordable prices per tier: starter = 1, adult = 100, giant = 201, tycoon = 501\n\n"
+        "Use this to enable wallet tier locking, but make scrub items not as expensive as they could be.";
     mOptionDescriptions[RSK_SHUFFLE_BEEHIVES] =
         "Beehives give a randomized item from the pool when broken.";
     mOptionDescriptions[RSK_SHUFFLE_COWS] =
         "Cows give a randomized item from the pool upon performing Epona's Song in front of them.";
-    mOptionDescriptions[RSK_SHUFFLE_MAGIC_BEANS] =
-        "Enabling this adds a pack of 10 beans to the item pool and changes the Magic Bean "
-        "Salesman to sell a random item at a price of 60 rupees.";
     mOptionDescriptions[RSK_SHUFFLE_MERCHANTS] =
-        "Enabling this changes Medigoron, Granny and the Carpet Salesman to sell a random item "
-        "once at a high price (100 for Granny, 200 for the others).\n"
+        "This setting governs if the Bean Salesman, Medigoron, Granny and the Carpet Salesman "
+        "sell a random item.\n"
+        "Beans Only - Only the Bean Salesman will have a check, and a pack of Magic Beans will be added "
+        " to the item pool."
+        "All But Beans - Medigoron, Granny and the Carpet Salesman will have checks, "
         "A Giant's Knife and a pack of Bombchus will be added to the item pool, and "
         "one of the bottles will contain a Blue Potion.\n\n"
-        "On (no hints) - Salesmen will be included but won't tell you what you'll get.\n"
-        "On (with hints) - Salesmen will be included and you'll know what you're buying.\n"
+        "All - Apply both effects.\n"
         "\n"
         "Granny's item will only be offered after you have traded in the Odd Mushroom when Shuffle Adult Trade is on. "
         "Otherwise when off, you will need to have found the Claim Check to buy her item (simulating the trade quest "
         "is complete).";
+    mOptionDescriptions[RSK_MERCHANT_PRICES] =
+        "Vanilla - The same price as the Check in vanilla, 60 for the Bean Salesman\n"
+        "Cheap Balanced - Prices will range between 0 to 95 rupees, favoring lower numbers\n"
+        "Balanced - Prices will range between 0 to 300 rupees, favoring lower numbers\n"
+        "Fixed - A fixed number\n"
+        "Range - A random point between specific ranges\n"
+        "Set By Wallet - Set weights that decide the choice of each wallet, and get a random price in that range if that wallet is chosen";
+    mOptionDescriptions[RSK_MERCHANT_PRICES_FIXED_PRICE] =
+        "The price for Merchant checks.";
+    mOptionDescriptions[RSK_MERCHANT_PRICES_RANGE_1] =
+        "The first part of the inclusive range of prices to allow for Merchant checks.";
+    mOptionDescriptions[RSK_MERCHANT_PRICES_RANGE_2] =
+        "The second part of the inclusive range of prices to allow for Merchant checks.";
+    mOptionDescriptions[RSK_MERCHANT_PRICES_NO_WALLET_WEIGHT] =
+        "The chance for Merchant checks to be free.";
+    mOptionDescriptions[RSK_MERCHANT_PRICES_CHILD_WALLET_WEIGHT] =
+        "The chance for Merchant checks to be purchasable with Child's Wallet (1-99).";
+    mOptionDescriptions[RSK_MERCHANT_PRICES_ADULT_WALLET_WEIGHT] =
+        "The chance for Merchant checks to be purchasable with Adult's Wallet (100-200).";
+    mOptionDescriptions[RSK_MERCHANT_PRICES_GIANT_WALLET_WEIGHT] =
+        "The chance for Merchant checks to be purchasable with Giant's Wallet (201-500).";
+    mOptionDescriptions[RSK_MERCHANT_PRICES_TYCOON_WALLET_WEIGHT] =
+        "The chance for Merchant checks to be purchasable with Tycoon Wallet. (500+)";
+    mOptionDescriptions[RSK_MERCHANT_PRICES_AFFORDABLE] =
+        "After choosing a price, set it to the affordable amount based on the wallet required.\n\n"
+        "Affordable prices per tier: starter = 1, adult = 100, giant = 201, tycoon = 501\n\n"
+        "Use this to enable wallet tier locking, but make merchant items not as expensive as they could be.";
     mOptionDescriptions[RSK_SHUFFLE_FROG_SONG_RUPEES] = "Shuffles 5 Purple Rupees into to the item pool, and allows\n"
                                                         "you to earn items by playing songs at the Frog Choir.\n"
                                                         "\n"
@@ -546,9 +619,9 @@ void Settings::CreateOptionDescriptions() {
     mOptionDescriptions[RSK_CHICKENS_HINT] = "Talking to Anju as a child will tell you the item she will give you for delivering her Cuccos to the pen";
     mOptionDescriptions[RSK_MALON_HINT] = "Talking to Malon as adult will tell you the item on \"Link's cow\", the cow you win from beating her time on the Lon Lon Obsticle Course.";
     mOptionDescriptions[RSK_HBA_HINT] = "Talking to the Horseback Archery gerudo in Gerudo Fortress, or the nearby sign, will tell you what you win for scoring 1000 and 1500 points on Horseback Archery.";
-    mOptionDescriptions[RSK_WARP_SONG_HINTS] = "Standing near the pedestal for the frogs in Zora's River will tell you "
-                                               "the reward for the frogs' ocarina game."; //RANDOTODO fix this, I can't find the original right now because github search sucks
+    mOptionDescriptions[RSK_WARP_SONG_HINTS] = "Playing a warp song will tell you where it leads. (If warp song destinations are vanilla, this is always enabled.)";
     mOptionDescriptions[RSK_SCRUB_TEXT_HINT] = "Business scrubs will reveal the identity of what they're selling.";
+    mOptionDescriptions[RSK_MERCHANT_TEXT_HINT] = "Merchants will reveal the identity of what they're selling (Shops are not affected by this setting).";
     mOptionDescriptions[RSK_KAK_10_SKULLS_HINT] = "Talking to the Cursed Resident in the Skultulla House who is saved after 10 tokens will tell you the reward";
     mOptionDescriptions[RSK_KAK_20_SKULLS_HINT] = "Talking to the Cursed Resident in the Skultulla House who is saved after 20 tokens will tell you the reward";
     mOptionDescriptions[RSK_KAK_30_SKULLS_HINT] = "Talking to the Cursed Resident in the Skultulla House who is saved after 30 tokens will tell you the reward";
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index 45c794244..6aeb3dd84 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -242,9 +242,10 @@ void Randomizer::LoadHintMessages() {
 
     // Bow Shooting Gallery reminder
     CustomMessageManager::Instance->CreateMessage(Randomizer::hintMessageTableID, TEXT_SHOOTING_GALLERY_MAN_COME_BACK_WITH_BOW,
-        CustomMessage("Come back when you have your own&bow and you'll get a %rdifferent prize%w!",
-        "Komm wieder sobald Du Deinen eigenen&Bogen hast, um einen %rspeziellen Preis%w zu&erhalten!",
-        "J'aurai %rune autre récompense%w pour toi&lorsque tu auras ton propre arc."));
+        CustomMessage("Come back when you have your own bow and you'll get a #different prize#!",
+        "Komm wieder sobald Du Deinen eigenen Bogen hast, um einen #speziellen Preis# zu erhalten!",
+        "J'aurai #une autre récompense# pour toi lorsque tu auras ton propre arc.",
+        {QM_RED}));
 
     // Warp Song Mysterious text
     CustomMessageManager::Instance->CreateMessage(Randomizer::hintMessageTableID, TEXT_WARP_MINUET_OF_FOREST,
@@ -259,9 +260,9 @@ void Randomizer::LoadHintMessages() {
             "Wasserstand Kontrollsystem&Finger weg!",
             "Système de contrôle du niveau&d'eau.&Ne pas toucher!"));
     CustomMessageManager::Instance->CreateMessage(Randomizer::hintMessageTableID, TEXT_LAKE_HYLIA_WATER_SWITCH_NAVI,
-        CustomMessage("%cThis switch is rustier than you think.^%cSomething must be wrong with the&pipe system in the %bWater Temple%c.",
-            "%cDieser Schalter scheint rostiger zu&sein als er aussieht.^%cEtwas muss mit dem Leitungssystem&im %bWassertempel%c nicht stimmen.",
-            "%cCet interrupteur est très rouillé.^%cIl doit y avoir un problème avec&la tuyauterie du %bTemple de l'Eau%c."));
+        CustomMessage("%cThis switch is rustier than you think.^%cSomething must be wrong with the pipe system in the %bWater Temple%c.",
+            "%cDieser Schalter scheint rostiger zu sein als er aussieht.^%cEtwas muss mit dem Leitungssystem im %bWassertempel%c nicht stimmen.",
+            "%cCet interrupteur est très rouillé.^%cIl doit y avoir un problème avec la tuyauterie du %bTemple de l'Eau%c."));
 }
 
 // Reference soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.h
@@ -304,38 +305,101 @@ void Randomizer::LoadMerchantMessages() {
 
     // Prices have a chance of being 0, and the "sell" message below doesn't really make sense for a free item, so adding a "free" variation here
     CustomMessageManager::Instance->CreateMessage(Randomizer::merchantMessageTableID, TEXT_SCRUB_RANDOM_FREE,
-        CustomMessage("\x12\x38\x82" "All right! You win! In return for&sparing me, I will give you a&%g[[item]]%w!&Please, take it!\x07\x10\xA3",
-            "\x12\x38\x82" "In Ordnung! Du gewinnst! Im Austausch&dafür, dass Du mich verschont hast,&werde ich Dir einen &%g[[item]]%w geben!\x07\x10\xA3",
-            "\x12\x38\x82" "J'me rends! Laisse-moi partir et en&échange, je te donne un &%g[[item]]%w! Vas-y prends le!\x07\x10\xA3"));
+        CustomMessage("\x12\x38\x82" "All right! You win! In return for sparing me, I will give you a #[[1]]#!&Please, take it!\x07\x10\xA3",
+            "\x12\x38\x82" "In Ordnung! Du gewinnst! Im Austausch dafür, dass Du mich verschont hast, werde ich Dir einen #[[1]]# geben!\x07\x10\xA3",
+            "\x12\x38\x82" "J'me rends! Laisse-moi partir et en échange, je te donne un #[[1]]#! Vas-y prends le!\x07\x10\xA3",
+            {QM_GREEN}));
     CustomMessageManager::Instance->CreateMessage(Randomizer::merchantMessageTableID, TEXT_SCRUB_RANDOM,
-        CustomMessage("\x12\x38\x82" "All right! You win! In return for&sparing me, I will sell you a&%g[[item]]%w!&%r[[price]] Rupees%w it is!\x07\x10\xA3",
-            "\x12\x38\x82" "Ich gebe auf! Ich verkaufe Dir einen&%g[[item]]%w&für %r[[price]] Rubine%w!\x07\x10\xA3",
-            "\x12\x38\x82" "J'abandonne! Tu veux bien m'acheter&un %g[[item]]%w?&Ça fera %r[[price]] Rubis%w!\x07\x10\xA3"));
+        CustomMessage("\x12\x38\x82" "All right! You win! In return for sparing me, I will sell you a #[[1]]#! #[[2]] Rupees# it is!\x07\x10\xA3",
+            "\x12\x38\x82" "Ich gebe auf! Ich verkaufe Dir einen #[[1]]# für #[[2]] Rubine#!\x07\x10\xA3",
+            "\x12\x38\x82" "J'abandonne! Tu veux bien m'acheter un #[[1]]#? Ça fera #[[2]] Rubis#!\x07\x10\xA3",
+            {QM_GREEN, QM_YELLOW}));
 
     //Carpet Salesman
     CustomMessageManager::Instance->CreateMessage(
-        Randomizer::merchantMessageTableID, TEXT_CARPET_SALESMAN_2,
-        CustomMessage("Finally! Now I can go back to being &an %rarms dealer%w!",
-            /*german*/"Endlich! Schon bald kann ich wieder &%rKrabbelminen-Händler%w sein!",
-            /*french*/ "Squalala! Je vais enfin pouvoir &%rprendre des vacances%w!"));
+        Randomizer::merchantMessageTableID, TEXT_CARPET_SALESMAN_ARMS_DEALER,
+        CustomMessage("Finally! Now I can go back to being an #arms dealer#!",
+            /*german*/"Endlich! Schon bald kann ich wieder #Krabbelminen-Händler# sein!",
+            /*french*/"Squalala! Je vais enfin pouvoir #prendre des vacances#!",
+            {QM_RED}));
 
     // Each shop item has two messages, one for when the cursor is over it, and one for when you select it and are
     // prompted buy/don't buy
     CustomMessageManager::Instance->CreateMessage(
         Randomizer::merchantMessageTableID, TEXT_SHOP_ITEM_RANDOM,
-        CustomMessage("\x08%r[[item]]  [[price]] Rupees&%wSpecial deal! ONE LEFT!&Get it while it lasts!\x0A\x02",
-            "\x08%r[[item]]  [[price]] Rubine&%wSonderangebot! NUR NOCH EINES VERFÜGBAR!&Beeilen Sie sich!\x0A\x02",
-            "\x08%r[[item]]  [[price]] Rubis&%wOffre spéciale! DERNIER EN STOCK!&Faites vite!\x0A\x02"));
+        CustomMessage("\x08#[[1]]#  #[[2]]_Rupees#&Special deal! #ONE LEFT#!&Get it while it lasts!\x0A\x02",
+            "\x08#[[1]]#  #[[2]]_Rubine#&Sonderangebot! #NUR NOCH EINES VERFÜGBAR#!&Beeilen Sie sich!\x0A\x02",
+            "\x08#[[1]]#  #[[2]]_Rubis#&Offre spéciale! #DERNIER EN STOCK#!&Faites vite!\x0A\x02",
+            {QM_GREEN, QM_YELLOW, QM_RED}));
+
     CustomMessageManager::Instance->CreateMessage(
         Randomizer::merchantMessageTableID, TEXT_SHOP_ITEM_RANDOM_CONFIRM,
-        CustomMessage("\x08[[item]]  [[price]] Rupees\x09&&\x1B%gBuy&Don't buy%w\x09\x02",
-            "\x08[[item]]  [[price]] Rubine\x09&&\x1B%gKaufen&Nicht kaufen%w\x09\x02",
-            "\x08[[item]]  [[price]] Rubis\x09&&\x1B%gAcheter&Ne pas acheter%w\x09\x02"));
+        CustomMessage("\x08#[[1]]#  #[[2]]_Rupees#\x09\x1B#Buy&Don't buy#\x09\x02",
+            "\x08#[[1]]#  #[[2]]_Rubine#\x09\x1B#Kaufen&Nicht kaufen#\x09\x02",
+            "\x08#[[1]]#  #[[2]]_Rubis#\x09\x1B#Acheter&Ne pas acheter#\x09\x02",
+            {QM_GREEN, QM_YELLOW, QM_GREEN}));
+                      
+    CustomMessageManager::Instance->CreateMessage(
+        Randomizer::merchantMessageTableID, TEXT_BEAN_SALESMAN_BUY_FOR_10,
+        CustomMessage("I tried to be a #magic bean# salesman, but it turns out my marketing skills weren't worth "
+                      "beans!^Anyway, want to buy #[[1]]# for #[[2]] Rupees#?\x1B#Yes&No#",
+           /*german*/ "Möchten Sie #[[1]]# für #[[2]] Rubine# kaufen?\x1B#Ja&Nein#",
+           /*french*/ "J'ai essayé d'être un vendeur de #haricots magiques#, mais j'étais mauvais au niveau du marketing et ça "
+                      "me courait sur le haricot...^Enfin bref, ça te dirait de m'acheter #[[1]]# pour #[[2]] Rubis#?\x1B#Oui&Non#",
+                      {QM_RED, QM_GREEN, QM_YELLOW, QM_GREEN}));
+
     CustomMessageManager::Instance->CreateMessage(
         Randomizer::merchantMessageTableID, TEXT_BEAN_SALESMAN_BUY_FOR_100,
-        CustomMessage("I never thought I'd say this, but I'm &selling the last %rMagic Bean%w. %r99%w Rupees...\x1B&%gYes&No%w",
-                      "Ich hätte nie gedacht, daß ich das&sage, aber ich verkaufe die letzte^%rWundererbse%w für %r99%w Rubine.&\x1B&%gJa&Nein%w",
-                      "Je te vends mon dernier %rHaricot&magique%w pour %r99 Rubis%w.\x1B&%gAcheter&Ne pas acheter%w"));
+        CustomMessage("I never thought I'd say this, but I'm selling the last #Magic Bean#. #99 Rupees#...\x1B#Yes&No#",
+                      "Ich hätte nie gedacht, daß ich das sage, aber ich verkaufe die letzte^#Wundererbse# für #99 Rubine#.\x1B&#Ja&Nein#",
+                      "Je te vends mon dernier #Haricot&magique# pour #99 Rubis#.\x1B&#AcheterNe pas acheter#",
+                      {QM_RED, QM_YELLOW, QM_GREEN}));
+
+    CustomMessageManager::Instance->CreateMessage(
+        Randomizer::merchantMessageTableID, TEXT_MEDIGORON,
+        CustomMessage("How about buying #[[1]]# for #[[2]] Rupees#?\x1B#Buy&Don't buy#",
+           /*german*/ "Möchtest Du #[[1]]# für #[[2]] Rubine# kaufen?\x1B#Klar!&Nie im Leben!#",
+           /*french*/ "Veux-tu acheter #[[1]]# pour #[[2]] rubis#?\x1B#Acheter&Ne pas acheter#",
+                       {QM_GREEN, QM_YELLOW, QM_GREEN}));
+       /*spanish*/ // ¿Me compras #[[1]]# por #[[2]] rupias#?\x1B#Comprar&No comprar#
+
+    CustomMessage firstCarpet = CustomMessage("Welcome!^I am selling stuff, strange and rare, from all over the world to everybody. Today's special is...^",
+                                   /*german*/ "Sei gegrüßt!^Ich verkaufe allerlei Kuriositäten. Stets sonderliche und seltene Ware aus "
+                                              "aller Welt für jedermann. Das heutige Angebot bleibt...^",
+                                   /*french*/ "Bienvenue!^Je vends des objets rares et merveilleux du monde entier. En spécial aujourd'hui...^");
+                               /*spanish*/ // ¡Acércate!^Vendo productos extraños y difíciles de encontrar... De todo el mundo a todo el mundo. La oferta de hoy es...^#¡
+    
+    CustomMessageManager::Instance->CreateMessage(
+        Randomizer::merchantMessageTableID, TEXT_CARPET_SALESMAN_MYSTERIOUS,
+        firstCarpet +
+        CustomMessage("Terrifying! I won't tell you what it is until I see the #money#...^How about #[[2]] Rupees#?&&"
+                                    "\x1B#Buy&Don't buy#",
+                        /*german*/ "Furchterregend, oder? Ich erzähle Euch mehr, wenn ich #Geld# sehe...^Wie wär's mit #[[2]] Rubinen#?&&"
+                                    "\x1B#Aber sicher!&Ich bin weg!#",
+                        /*french*/ "Un concentré de puissance! Mais montre tes #rubis# avant que je te dise ce que c'est...^Disons #[[2]] "
+                                    "rubis#?&&\x1B#Acheter&Ne pas acheter#",
+                                    {QM_RED, QM_YELLOW, QM_GREEN}));
+                    /*spanish*/ // ¡Terrorífico! No te revelaré su nombre hasta que vea el #dinero#...^#[[2]] rupias#, ¿qué te parece?&&"
+                                // "\x1B#Comprar&No comprar#
+
+    CustomMessageManager::Instance->CreateMessage(
+        Randomizer::merchantMessageTableID, TEXT_CARPET_SALESMAN_1,
+        firstCarpet +
+        CustomMessage("#[[1]]!# It's real, I promise! A lonely man such as myself wouldn't #lie# to you, hmm?^"
+                       "How about #[[2]] Rupees#?\x1B#Buy&Don't buy#",
+           /*german*/ "#[[1]]#! Ich kann versichern, es ist ein aufrichtiges Angebot!^Ein einsamer Mann wie ich würde Dich doch "
+                       "nicht #anlügen#, oder?^Wie wär's mit #[[2]] Rubinen#?\x1B#Aber sicher!&Ich bin weg!#",
+           /*french*/ "#[[1]]!# C'est vrai! J'te jure! Un gars comme moi ne te #mentirai# pas tu ne crois pas?^Disons #[[2]] "
+                       "rubis#?\x1B#Acheter&Ne pas acheter#",
+                       {QM_GREEN, QM_RED, QM_YELLOW}));
+
+    CustomMessageManager::Instance->CreateMessage(
+        Randomizer::merchantMessageTableID, TEXT_GRANNYS_SHOP,
+        CustomMessage("#[[1]]#! How about #[[2]] Rupees#?\x1B#Buy&Don't buy#",
+           /*german*/ "#[[1]]#! Sagen wir #[[2]] Rubine#?\x1B#Gerne!&Auf keinen Fall!#",
+           /*french*/ "#[[1]]#! Que dis-tu de #[[2]] rubis#?\x1B#Acheter&Ne pas acheter#",
+                       {QM_GREEN, QM_YELLOW, QM_GREEN}, {true}));
+           // /*spanish*/#[[1]]#. Vendo por #[[2]] rupias#.&\x1B#Comprar&No comprar#
 }
 
 std::map<s32, TrialKey> trialFlagToTrialKey = {
@@ -364,16 +428,9 @@ ItemObtainability Randomizer::GetItemObtainabilityFromRandomizerCheck(Randomizer
 
 ItemObtainability Randomizer::GetItemObtainabilityFromRandomizerGet(RandomizerGet randoGet) {
 
-    // Shopsanity with at least one item shuffled allows for a third wallet upgrade.
     // This is needed since Plentiful item pool also adds a third progressive wallet
-    // but we should *not* get Tycoon's Wallet in that mode.
-    bool tycoonWallet = !(
-        GetRandoSettingValue(RSK_SHOPSANITY) == RO_SHOPSANITY_OFF ||
-        (
-            GetRandoSettingValue(RSK_SHOPSANITY) == RO_SHOPSANITY_SPECIFIC_COUNT &&
-            GetRandoSettingValue(RSK_SHOPSANITY_COUNT) == RO_SHOPSANITY_COUNT_ZERO_ITEMS
-        )
-    );
+    // but we should not get Tycoon's Wallet from it if it is off.
+    bool tycoonWallet = GetRandoSettingValue(RSK_INCLUDE_TYCOON_WALLET);
 
     // Same thing with the infinite upgrades, if we're not shuffling them
     // and we're using the Plentiful item pool, we should prevent the infinite
@@ -2006,23 +2063,15 @@ CustomMessage Randomizer::GetFishingPondOwnerMessage(u16 originalTextId) {
     return messageEntry;
 }
 
-CustomMessage Randomizer::GetMerchantMessage(RandomizerInf randomizerInf, u16 textId, bool mysterious) {
-    auto ctx = Rando::Context::GetInstance(); //RANDOTODO If scrubs are allowed to have ambiguous hints, they need to be RandomiserHint objects for logging
-    CustomMessage messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::merchantMessageTableID, textId);
-    RandomizerCheck rc = GetCheckFromRandomizerInf(randomizerInf);
+CustomMessage Randomizer::GetMerchantMessage(RandomizerCheck rc, TextIDs textId, TextIDs freeTextId, bool mysterious) {
+    auto ctx = Rando::Context::GetInstance();
+    CustomMessage messageEntry;
     RandomizerGet shopItemGet = ctx->GetItemLocation(rc)->GetPlacedRandomizerGet();
     CustomMessage shopItemName;
+    u16 shopItemPrice = ctx->GetItemLocation(rc)->GetPrice();
+
     if (mysterious || CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0)) {
-        if (randomizerInf >= RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_1 && randomizerInf <= RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_8) {
-            shopItemName = {
-                "Mysterious Item",
-                "Mysteriöser Gegenstand",
-                "Objet Mystérieux"
-            };
-        } else {
-            shopItemName = Rando::StaticData::hintTextTable[RHT_MYSTERIOUS_ITEM].GetHintMessage(); 
-        }
-    // TODO: This should eventually be replaced with a full fledged trick model & trick name system
+        shopItemName = Rando::StaticData::hintTextTable[RHT_MYSTERIOUS_ITEM_CAPITAL].GetHintMessage();
     } else if (shopItemGet == RG_ICE_TRAP) {
         shopItemGet = ctx->overrides[rc].LooksLike();
         shopItemName = CustomMessage(ctx->overrides[rc].GetTrickName());
@@ -2030,14 +2079,15 @@ CustomMessage Randomizer::GetMerchantMessage(RandomizerInf randomizerInf, u16 te
         auto shopItem = Rando::StaticData::RetrieveItem(shopItemGet);
         shopItemName = {shopItem.GetName()};
     }
-    u16 shopItemPrice = ctx->GetItemLocation(rc)->GetPrice();
-
-    if (textId == TEXT_SCRUB_RANDOM && shopItemPrice == 0) {
-        messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::merchantMessageTableID, TEXT_SCRUB_RANDOM_FREE);
+    
+    if (freeTextId != TEXT_NONE && shopItemPrice == 0) {
+        messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::merchantMessageTableID, freeTextId, MF_RAW);
+    } else {
+        messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::merchantMessageTableID, textId, MF_RAW);
     }
 
-    messageEntry.Replace("[[item]]", shopItemName);
-    messageEntry.Replace("[[price]]", std::to_string(shopItemPrice));
+    messageEntry.InsertNames({shopItemName, {std::to_string(shopItemPrice)}});
+    messageEntry.AutoFormat();
     return messageEntry;
 }
 
@@ -2199,6 +2249,7 @@ CustomMessage Randomizer::GetTriforcePieceMessage() {
     messageEntry.Replace("[[current]]", std::to_string(current));
     messageEntry.Replace("[[remaining]]", std::to_string(remaining));
     messageEntry.Replace("[[required]]", std::to_string(required));
+    messageEntry.Format();
     return messageEntry;
 }
 
@@ -2213,11 +2264,6 @@ void CreateNaviRandoMessages() {
           "%cManchmal kannst Du den %rStahlhammer&%cstatt Bomben verwenden!",
           "%cParfois, tu peux utiliser la %rMasse&des Titans %cau lieu de tes bombes!" },
 
-        { "%cThere are three %gbusiness scrubs %cin &Hyrule who sell %wmysterious items%c. Do&you know where they are?",
-          "%cEs gibt drei %gDeku-Händler %cin Hyrule&die mysteriöse Gegenstände&verkaufen. Weißt Du wo sie sind?",
-          "%cIl y a trois %gPestes Marchandes%c en&Hyrule qui vendent des %wobjets&mystérieux%c. Tu sais où elles "
-          "sont?" },
-
         { "%cStuck on this seed? You could &throw in the towel and check the&%wspoiler log%c...",
           "%cHängst Du bei diesem Seed fest?&Du könntest die Flinte ins Korn&werfen und ins %wSpoiler Log %cschauen...",
           "%cSi tu es coincé sur cette seed,&tu peux toujours jeter l'éponge&et regader le %wSpoiler log%c..." },
@@ -2566,7 +2612,15 @@ CustomMessage Randomizer::GetIceTrapMessage() {
     return msg;
 }
 
-static int goronIDs[9] = { 0x3052, 0x3069, 0x306A, 0x306B, 0x306C, 0x306D, 0x306E, 0x306F, 0x3070 };
+static int goronIDs[9] = { TEXT_FIRE_TEMPLE_GORON_OWE_YOU_BIG_TIME,
+                           TEXT_FIRE_TEMPLE_GORON_FALLING_DOORS_SECRET,
+                           TEXT_FIRE_TEMPLE_GORON_FIRE_SECRET,
+                           TEXT_FIRE_TEMPLE_GORON_FLAME_DANCER_SECRET,
+                           TEXT_FIRE_TEMPLE_GORON_SWITCH_SECRET,
+                           TEXT_FIRE_TEMPLE_GORON_OCARINA_SECRET,
+                           TEXT_FIRE_TEMPLE_GORON_PILLAR_SECRET,
+                           TEXT_FIRE_TEMPLE_GORON_HIDDEN_DOOR_SECRET,
+                           TEXT_FIRE_TEMPLE_GORON_SOUNDS_DIFFERENT_SECRET};
 
 void CreateFireTempleGoronMessages() {
     CustomMessage FireTempleGoronMessages[NUM_GORON_MESSAGES] = {
@@ -2654,6 +2708,7 @@ CustomMessage Randomizer::GetGoronMessage(u16 index) {
     CustomMessage messageEntry = CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, goronIDs[index]);
     messageEntry.Replace("[[days]]", std::to_string(gSaveContext.totalDays));
     messageEntry.Replace("[[a_btn]]", std::to_string(gSaveContext.sohStats.count[COUNT_BUTTON_PRESSES_A]));
+    messageEntry.Format();
     return messageEntry;
 }
 
diff --git a/soh/soh/Enhancements/randomizer/randomizer.h b/soh/soh/Enhancements/randomizer/randomizer.h
index 14f28311c..4a84d6302 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.h
+++ b/soh/soh/Enhancements/randomizer/randomizer.h
@@ -19,7 +19,7 @@
 
 #define MAX_SEED_STRING_SIZE 1024
 #define NUM_TRIFORCE_PIECE_MESSAGES 6
-#define NUM_NAVI_MESSAGES 19
+#define NUM_NAVI_MESSAGES 18
 #define NUM_GORON_MESSAGES 9
 
 class Randomizer {
@@ -59,7 +59,7 @@ class Randomizer {
     ItemObtainability GetItemObtainabilityFromRandomizerGet(RandomizerGet randomizerCheck);
     CustomMessage GetSheikMessage(s16 scene, u16 originalTextId);
     CustomMessage GetFishingPondOwnerMessage(u16 originalTextId);
-    CustomMessage GetMerchantMessage(RandomizerInf randomizerInf, u16 textId, bool mysterious = false);
+    CustomMessage GetMerchantMessage(RandomizerCheck rc, TextIDs textId, TextIDs freeTextId = TEXT_NONE, bool mysterious = false);
     RandomizerCheck GetCheckFromActor(s16 actorId, s16 sceneNum, s16 actorParams);
     CustomMessage GetGoronMessage(u16 index);
     CustomMessage GetMapGetItemMessageWithHint(GetItemEntry itemEntry);
diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h
index 7d5a36daa..e657b8ed5 100644
--- a/soh/soh/Enhancements/randomizer/randomizerTypes.h
+++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@@ -34,7 +34,6 @@ typedef enum {
     HINT_TYPE_TRIAL,
     HINT_TYPE_ENTRANCE,
     HINT_TYPE_ITEM_AREA,
-    HINT_TYPE_MERCHANT,
     HINT_TYPE_ALTAR_CHILD,
     HINT_TYPE_ALTAR_ADULT,
     HINT_TYPE_WOTH, // Way of the Hero
@@ -2248,10 +2247,6 @@ typedef enum {
     RH_REQUIEM_WARP_LOC,
     RH_NOCTURNE_WARP_LOC,
     RH_PRELUDE_WARP_LOC,
-    RH_MEDIGORON,
-    RH_CARPET_SALESMAN,
-    RH_BEAN_SALESMAN,
-    RH_GRANNY,
     RH_HBA_HINT,
     RH_MALON_HINT,
     RH_CHICKENS_HINT,
@@ -3429,6 +3424,7 @@ typedef enum {
     RHT_EPONA,
     RHT_HINT_MYSTERIOUS,
     RHT_MYSTERIOUS_ITEM,
+    RHT_MYSTERIOUS_ITEM_CAPITAL,
     // Entrances
     RHT_DESERT_COLOSSUS_TO_COLOSSUS_GROTTO,
     RHT_GV_GROTTO_LEDGE_TO_GV_OCTOROK_GROTTO,
@@ -3617,12 +3613,8 @@ typedef enum {
     // Static Entrance Hints
     RHT_WARP_SONG,
     // Static Location Hints
-    RHT_MEDIGORON_HINT,
     RHT_CARPET_SALESMAN_DIALOG_FIRST,
     RHT_CARPET_SALESMAN_DIALOG_MYSTERIOUS,
-    RHT_CARPET_SALESMAN_DIALOG_HINTED,
-    RHT_BEAN_SALESMAN_HINT,
-    RHT_GRANNY_HINT,
     RHT_HBA_HINT_SIGN,
     RHT_HBA_HINT_NOT_ON_HORSE,
     RHT_HBA_HINT_INITIAL,
@@ -3778,14 +3770,33 @@ typedef enum {
     RSK_SHUFFLE_KOKIRI_SWORD,
     RSK_SHUFFLE_MASTER_SWORD,
     RSK_SHUFFLE_CHILD_WALLET,
+    RSK_INCLUDE_TYCOON_WALLET,
     RSK_SHUFFLE_DUNGEON_REWARDS,
     RSK_SHUFFLE_SONGS,
     RSK_SHUFFLE_TOKENS,
     RSK_SHOPSANITY,
     RSK_SHOPSANITY_COUNT,
     RSK_SHOPSANITY_PRICES,
+    RSK_SHOPSANITY_PRICES_FIXED_PRICE,
+    RSK_SHOPSANITY_PRICES_RANGE_1,
+    RSK_SHOPSANITY_PRICES_RANGE_2,
+    RSK_SHOPSANITY_PRICES_NO_WALLET_WEIGHT,
+    RSK_SHOPSANITY_PRICES_CHILD_WALLET_WEIGHT,
+    RSK_SHOPSANITY_PRICES_ADULT_WALLET_WEIGHT,
+    RSK_SHOPSANITY_PRICES_GIANT_WALLET_WEIGHT,
+    RSK_SHOPSANITY_PRICES_TYCOON_WALLET_WEIGHT,
     RSK_SHOPSANITY_PRICES_AFFORDABLE,
     RSK_SHUFFLE_SCRUBS,
+    RSK_SCRUBS_PRICES,
+    RSK_SCRUBS_PRICES_FIXED_PRICE,
+    RSK_SCRUBS_PRICES_RANGE_1,
+    RSK_SCRUBS_PRICES_RANGE_2,
+    RSK_SCRUBS_PRICES_NO_WALLET_WEIGHT,
+    RSK_SCRUBS_PRICES_CHILD_WALLET_WEIGHT,
+    RSK_SCRUBS_PRICES_ADULT_WALLET_WEIGHT,
+    RSK_SCRUBS_PRICES_GIANT_WALLET_WEIGHT,
+    RSK_SCRUBS_PRICES_TYCOON_WALLET_WEIGHT,
+    RSK_SCRUBS_PRICES_AFFORDABLE,
     RSK_SHUFFLE_BEEHIVES,
     RSK_SHUFFLE_COWS,
     RSK_SHUFFLE_WEIRD_EGG,
@@ -3817,6 +3828,7 @@ typedef enum {
     RSK_HBA_HINT,
     RSK_WARP_SONG_HINTS,
     RSK_SCRUB_TEXT_HINT,
+    RSK_MERCHANT_TEXT_HINT,
     RSK_FISHING_POLE_HINT,
     RSK_HINT_CLARITY,
     RSK_HINT_DISTRIBUTION,
@@ -3838,8 +3850,17 @@ typedef enum {
     RSK_ENABLE_GLITCH_CUTSCENES,
     RSK_SKULLS_SUNS_SONG,
     RSK_SHUFFLE_ADULT_TRADE,
-    RSK_SHUFFLE_MAGIC_BEANS,
     RSK_SHUFFLE_MERCHANTS,
+    RSK_MERCHANT_PRICES,
+    RSK_MERCHANT_PRICES_FIXED_PRICE,
+    RSK_MERCHANT_PRICES_RANGE_1,
+    RSK_MERCHANT_PRICES_RANGE_2,
+    RSK_MERCHANT_PRICES_NO_WALLET_WEIGHT,
+    RSK_MERCHANT_PRICES_CHILD_WALLET_WEIGHT,
+    RSK_MERCHANT_PRICES_ADULT_WALLET_WEIGHT,
+    RSK_MERCHANT_PRICES_GIANT_WALLET_WEIGHT,
+    RSK_MERCHANT_PRICES_TYCOON_WALLET_WEIGHT,
+    RSK_MERCHANT_PRICES_AFFORDABLE,
     RSK_BLUE_FIRE_ARROWS,
     RSK_SUNLIGHT_ARROWS,
     RSK_ENABLE_BOMBCHU_DROPS,
@@ -4014,19 +4035,19 @@ typedef enum {
 
 //Shopsanity price ranges
 typedef enum {
-    RO_SHOPSANITY_PRICE_BALANCED, //Balanced random from 0-300
-    RO_SHOPSANITY_PRICE_STARTER, //Wallets are random within their range, in increments of 5 rupees
-    RO_SHOPSANITY_PRICE_ADULT,
-    RO_SHOPSANITY_PRICE_GIANT,
-    RO_SHOPSANITY_PRICE_TYCOON,
-} RandoOptionShopsanityPrices;
+    RO_PRICE_VANILLA,
+    RO_PRICE_CHEAP_BALANCED, //Balanced random from 0-95, favoring lower numbers
+    RO_PRICE_BALANCED, //Random from 0-300, favoring lower numbers
+    RO_PRICE_FIXED,
+    RO_PRICE_RANGE,
+    RO_PRICE_SET_BY_WALLET,
+} RandoOptionPrices;
 
 //Scrubsanity settings (off, affordable, expensive, random)
 typedef enum {
     RO_SCRUBS_OFF,
-    RO_SCRUBS_AFFORDABLE,
-    RO_SCRUBS_EXPENSIVE,
-    RO_SCRUBS_RANDOM,
+    RO_SCRUBS_MAJOR_ONLY,
+    RO_SCRUBS_ALL,
 } RandoOptionScrubsanity;
 
 //Ammo drop settings (on, "on+bombchu", off)
@@ -4161,11 +4182,12 @@ typedef enum {
     RO_SONG_SHUFFLE_ANYWHERE,
 } RandoOptionSongShuffle;
 
-//Shuffle Merchants Settings (Off, On no hint, on with wint)
+//Shuffle Merchants Settings (Off, Beans Only, All but Beans, All)
 typedef enum {
     RO_SHUFFLE_MERCHANTS_OFF,
-    RO_SHUFFLE_MERCHANTS_ON_NO_HINT,
-    RO_SHUFFLE_MERCHANTS_ON_HINT,
+    RO_SHUFFLE_MERCHANTS_BEANS_ONLY,
+    RO_SHUFFLE_MERCHANTS_ALL_BUT_BEANS,
+    RO_SHUFFLE_MERCHANTS_ALL
 } RandoOptionShuffleMerchants;
 
 //Starting Ocarina Settings (off, fairy)
diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp
index 45bb928ac..4e50edddd 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp
@@ -172,7 +172,7 @@ void RandomizerCheckObjects::UpdateImGuiVisibility() {
             (location.GetRandomizerCheck() != RC_LH_HYRULE_LOACH ||
              CVarGetInteger(CVAR_RANDOMIZER_SETTING("Fishsanity"), RO_GENERIC_NO) == RO_FISHSANITY_HYRULE_LOACH) &&
             (location.GetRandomizerCheck() != RC_ZR_MAGIC_BEAN_SALESMAN ||
-             CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleBeans"), RO_GENERIC_NO)) &&
+             CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleMerchants"), RO_SHUFFLE_MERCHANTS_OFF) % 2) &&
             (location.GetRandomizerCheck() != RC_HC_MALON_EGG ||
              CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleWeirdEgg"), RO_GENERIC_NO)) &&
             (location.GetRCType() != RCTYPE_FROG_SONG ||
diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
index 469a16f76..645ef85f7 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
@@ -1108,13 +1108,15 @@ void LoadSettings() {
         OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHOPSANITY) != RO_SHOPSANITY_OFF
         : false;
     showBeans = IS_RANDO ?
-        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_MAGIC_BEANS) == RO_GENERIC_YES
+        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_MERCHANTS) == RO_SHUFFLE_MERCHANTS_BEANS_ONLY ||
+        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_MERCHANTS) == RO_SHUFFLE_MERCHANTS_ALL
         : true;
     showScrubs = IS_RANDO ?
         OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_SCRUBS) != RO_SCRUBS_OFF
         : false;
     showMerchants = IS_RANDO ?
-        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_MERCHANTS) != RO_SHUFFLE_MERCHANTS_OFF
+        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_MERCHANTS) == RO_SHUFFLE_MERCHANTS_ALL_BUT_BEANS ||
+        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_MERCHANTS) == RO_SHUFFLE_MERCHANTS_ALL
         : true;
     showBeehives = IS_RANDO ?
         OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_BEEHIVES) == RO_GENERIC_YES
diff --git a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
index 2b67e105d..e07503b20 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
@@ -390,13 +390,7 @@ ItemTrackerNumbers GetItemCurrentAndMax(ItemTrackerItem item) {
         case ITEM_WALLET_ADULT:
         case ITEM_WALLET_GIANT:
             result.currentCapacity = IS_RANDO && !Flags_GetRandomizerInf(RAND_INF_HAS_WALLET) ? 0 : CUR_CAPACITY(UPG_WALLET);
-            result.maxCapacity = !IS_RANDO || (
-                OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHOPSANITY) == RO_SHOPSANITY_OFF ||
-                (
-                    OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHOPSANITY) == RO_SHOPSANITY_SPECIFIC_COUNT &&
-                    OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHOPSANITY_COUNT) == RO_SHOPSANITY_COUNT_ZERO_ITEMS
-                )
-            ) ? 500 : 999;
+            result.maxCapacity = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_INCLUDE_TYCOON_WALLET) ? 999 : 500;
             result.currentAmmo = gSaveContext.rupees;
             break;
         case ITEM_BOMBCHU:
diff --git a/soh/soh/Enhancements/randomizer/savefile.cpp b/soh/soh/Enhancements/randomizer/savefile.cpp
index bab0b4e41..15424960d 100644
--- a/soh/soh/Enhancements/randomizer/savefile.cpp
+++ b/soh/soh/Enhancements/randomizer/savefile.cpp
@@ -339,6 +339,13 @@ extern "C" void Randomizer_InitSaveFile() {
         gSaveContext.adultTradeItems = 0;
     }
 
+    // remove One Time scrubs with scrubsanity off
+    if (Randomizer_GetSettingValue(RSK_SHUFFLE_SCRUBS) == RO_SCRUBS_OFF) {
+        Flags_SetRandomizerInf(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_NEAR_BRIDGE);
+        Flags_SetRandomizerInf(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_GROTTO_FRONT);
+        Flags_SetRandomizerInf(RAND_INF_SCRUBS_PURCHASED_HF_DEKU_SCRUB_GROTTO);
+    }
+
     int startingAge = OTRGlobals::Instance->gRandoContext->GetSettings()->ResolvedStartingAge();
     switch (startingAge) {
         case RO_AGE_ADULT: // Adult
diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
index b43d75301..d6738f45a 100644
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -36,6 +36,69 @@ std::vector<std::string> MultiVecOpts(const std::vector<std::vector<std::string>
     return options;
 }
 
+void Settings::HandleShopsanityPriceUI(){
+    bool isTycoon = CVarGetInteger(CVAR_RANDOMIZER_SETTING("IncludeTycoonWallet"), RO_GENERIC_OFF);
+    mOptions[RSK_SHOPSANITY].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
+    mOptions[RSK_SHOPSANITY_PRICES].Unhide();
+    switch (CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShopsanityPrices"), RO_PRICE_VANILLA)){
+        case RO_PRICE_FIXED:
+            mOptions[RSK_SHOPSANITY_PRICES_FIXED_PRICE].Unhide();
+            mOptions[RSK_SHOPSANITY_PRICES_RANGE_1].Hide();
+            mOptions[RSK_SHOPSANITY_PRICES_RANGE_2].Hide();
+            mOptions[RSK_SHOPSANITY_PRICES_NO_WALLET_WEIGHT].Hide();
+            mOptions[RSK_SHOPSANITY_PRICES_CHILD_WALLET_WEIGHT].Hide();
+            mOptions[RSK_SHOPSANITY_PRICES_ADULT_WALLET_WEIGHT].Hide();
+            mOptions[RSK_SHOPSANITY_PRICES_GIANT_WALLET_WEIGHT].Hide();
+            mOptions[RSK_SHOPSANITY_PRICES_TYCOON_WALLET_WEIGHT].Hide();
+            if (isTycoon ? mOptions[RSK_SHOPSANITY_PRICES_FIXED_PRICE].GetOptionCount() == 501 : mOptions[RSK_SHOPSANITY_PRICES_FIXED_PRICE].GetOptionCount() == 1000) {
+                mOptions[RSK_SHOPSANITY_PRICES_FIXED_PRICE].ChangeOptions(isTycoon ? NumOpts(0, 999) : NumOpts(0, 500));
+            }
+            mOptions[RSK_SHOPSANITY_PRICES_AFFORDABLE].Hide();
+            break;
+        case RO_PRICE_RANGE:
+            mOptions[RSK_SHOPSANITY_PRICES_FIXED_PRICE].Hide();
+            mOptions[RSK_SHOPSANITY_PRICES_RANGE_1].Unhide();
+            mOptions[RSK_SHOPSANITY_PRICES_RANGE_2].Unhide();
+            mOptions[RSK_SHOPSANITY_PRICES_NO_WALLET_WEIGHT].Hide();
+            mOptions[RSK_SHOPSANITY_PRICES_CHILD_WALLET_WEIGHT].Hide();
+            mOptions[RSK_SHOPSANITY_PRICES_ADULT_WALLET_WEIGHT].Hide();
+            mOptions[RSK_SHOPSANITY_PRICES_GIANT_WALLET_WEIGHT].Hide();
+            mOptions[RSK_SHOPSANITY_PRICES_TYCOON_WALLET_WEIGHT].Hide();
+            if (isTycoon ? mOptions[RSK_SHOPSANITY_PRICES_RANGE_1].GetOptionCount() == 101 : mOptions[RSK_SHOPSANITY_PRICES_RANGE_1].GetOptionCount() == 200) {
+                mOptions[RSK_SHOPSANITY_PRICES_RANGE_1].ChangeOptions(isTycoon ? NumOpts(0, 995, 5) : NumOpts(0, 500, 5));
+                mOptions[RSK_SHOPSANITY_PRICES_RANGE_2].ChangeOptions(isTycoon ? NumOpts(0, 995, 5) : NumOpts(0, 500, 5));
+            }
+            mOptions[RSK_SHOPSANITY_PRICES_AFFORDABLE].Unhide();
+            break;
+        case RO_PRICE_SET_BY_WALLET:
+            mOptions[RSK_SHOPSANITY_PRICES_FIXED_PRICE].Hide();
+            mOptions[RSK_SHOPSANITY_PRICES_RANGE_1].Hide();
+            mOptions[RSK_SHOPSANITY_PRICES_RANGE_2].Hide();
+            mOptions[RSK_SHOPSANITY_PRICES_NO_WALLET_WEIGHT].Unhide();
+            mOptions[RSK_SHOPSANITY_PRICES_CHILD_WALLET_WEIGHT].Unhide();
+            mOptions[RSK_SHOPSANITY_PRICES_ADULT_WALLET_WEIGHT].Unhide();
+            mOptions[RSK_SHOPSANITY_PRICES_GIANT_WALLET_WEIGHT].Unhide();
+            if (isTycoon){
+                mOptions[RSK_SHOPSANITY_PRICES_TYCOON_WALLET_WEIGHT].Unhide();
+            } else {
+                mOptions[RSK_SHOPSANITY_PRICES_TYCOON_WALLET_WEIGHT].Hide();
+            }
+            mOptions[RSK_SHOPSANITY_PRICES_AFFORDABLE].Unhide();
+            break;
+        default:
+            mOptions[RSK_SHOPSANITY_PRICES_FIXED_PRICE].Hide();
+            mOptions[RSK_SHOPSANITY_PRICES_RANGE_1].Hide();
+            mOptions[RSK_SHOPSANITY_PRICES_RANGE_2].Hide();
+            mOptions[RSK_SHOPSANITY_PRICES_NO_WALLET_WEIGHT].Hide();
+            mOptions[RSK_SHOPSANITY_PRICES_CHILD_WALLET_WEIGHT].Hide();
+            mOptions[RSK_SHOPSANITY_PRICES_ADULT_WALLET_WEIGHT].Hide();
+            mOptions[RSK_SHOPSANITY_PRICES_GIANT_WALLET_WEIGHT].Hide();
+            mOptions[RSK_SHOPSANITY_PRICES_TYCOON_WALLET_WEIGHT].Hide();
+            mOptions[RSK_SHOPSANITY_PRICES_AFFORDABLE].Unhide();
+            break;
+    }
+}
+
 Settings::Settings() : mExcludeLocationsOptionsAreas(RCAREA_INVALID) {
 }
 
@@ -99,23 +162,51 @@ void Settings::CreateOptions() {
     mOptions[RSK_SHUFFLE_SONGS] = Option::U8("Shuffle Songs", {"Song Locations", "Dungeon Rewards", "Anywhere"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleSongs"), mOptionDescriptions[RSK_SHUFFLE_SONGS], WidgetType::Combobox, RO_SONG_SHUFFLE_SONG_LOCATIONS);
     mOptions[RSK_SHOPSANITY] = Option::U8("Shopsanity", {"Off", "Specific Count", "Random"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("Shopsanity"), mOptionDescriptions[RSK_SHOPSANITY], WidgetType::Combobox, RO_SHOPSANITY_OFF);
     mOptions[RSK_SHOPSANITY_COUNT] = Option::U8("Shopsanity Item Count", {NumOpts(0, 7/*8*/)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShopsanityCount"), mOptionDescriptions[RSK_SHOPSANITY_COUNT], WidgetType::Slider, 0, false, IMFLAG_NONE);
-    mOptions[RSK_SHOPSANITY_PRICES] = Option::U8("Shopsanity Prices", {"Balanced", "Starting Wallet", "Adult Wallet", "Giant's Wallet", "Tycoon's Wallet"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShopsanityPrices"), mOptionDescriptions[RSK_SHOPSANITY_PRICES], WidgetType::Combobox, RO_SHOPSANITY_PRICE_BALANCED, false, IMFLAG_NONE);
-    mOptions[RSK_SHOPSANITY_PRICES_AFFORDABLE] = Option::Bool("Affordable Prices", CVAR_RANDOMIZER_SETTING("ShopsanityPricesAffordable"), mOptionDescriptions[RSK_SHOPSANITY_PRICES_AFFORDABLE]);
+    mOptions[RSK_SHOPSANITY_PRICES] = Option::U8("Shopsanity Prices", {"Vanilla", "Cheap Balanced", "Balanced", "Fixed", "Range", "Set By Wallet"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShopsanityPrices"), mOptionDescriptions[RSK_SHOPSANITY_PRICES], WidgetType::Combobox, RO_PRICE_VANILLA, false, IMFLAG_NONE);
+    mOptions[RSK_SHOPSANITY_PRICES_FIXED_PRICE] = Option::U8("Fixed Price", {NumOpts(0, 995, 5)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShopsanityFixedPrice"), mOptionDescriptions[RSK_SHOPSANITY_PRICES_FIXED_PRICE], WidgetType::Slider, 10, true);
+    mOptions[RSK_SHOPSANITY_PRICES_RANGE_1] = Option::U8("Lower Bound", {NumOpts(0, 995, 5)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShopsanityPriceRange1"), mOptionDescriptions[RSK_SHOPSANITY_PRICES_RANGE_1], WidgetType::Slider, 10, true, IMFLAG_NONE);
+    mOptions[RSK_SHOPSANITY_PRICES_RANGE_2] = Option::U8("Upper Bound", {NumOpts(0, 995, 5)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShopsanityPriceRange2"), mOptionDescriptions[RSK_SHOPSANITY_PRICES_RANGE_2], WidgetType::Slider, 100, true, IMFLAG_NONE);
+    mOptions[RSK_SHOPSANITY_PRICES_NO_WALLET_WEIGHT] = Option::U8("No Wallet Weight", {NumOpts(0, 100)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShopsanityNoWalletWeight"), mOptionDescriptions[RSK_SHOPSANITY_PRICES_NO_WALLET_WEIGHT], WidgetType::Slider, 10, true, IMFLAG_NONE);
+    mOptions[RSK_SHOPSANITY_PRICES_CHILD_WALLET_WEIGHT] = Option::U8("Child Wallet Weight", {NumOpts(0, 100)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShopsanityChildWalletWeight"), mOptionDescriptions[RSK_SHOPSANITY_PRICES_CHILD_WALLET_WEIGHT], WidgetType::Slider, 10, true, IMFLAG_NONE);
+    mOptions[RSK_SHOPSANITY_PRICES_ADULT_WALLET_WEIGHT] = Option::U8("Adult Wallet Weight", {NumOpts(0, 100)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShopsanityAdultWalletWeight"), mOptionDescriptions[RSK_SHOPSANITY_PRICES_ADULT_WALLET_WEIGHT], WidgetType::Slider, 10, true, IMFLAG_NONE);
+    mOptions[RSK_SHOPSANITY_PRICES_GIANT_WALLET_WEIGHT] = Option::U8("Giant Wallet Weight", {NumOpts(0, 100)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShopsanityGiantWalletWeight"), mOptionDescriptions[RSK_SHOPSANITY_PRICES_GIANT_WALLET_WEIGHT], WidgetType::Slider, 10, true, IMFLAG_NONE);
+    mOptions[RSK_SHOPSANITY_PRICES_TYCOON_WALLET_WEIGHT] = Option::U8("Tycoon Wallet Weight", {NumOpts(0, 100)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShopsanityTycoonWalletWeight"), mOptionDescriptions[RSK_SHOPSANITY_PRICES_TYCOON_WALLET_WEIGHT], WidgetType::Slider, 10, true, IMFLAG_NONE);
+    mOptions[RSK_SHOPSANITY_PRICES_AFFORDABLE] = Option::Bool("Shops Affordable Prices", CVAR_RANDOMIZER_SETTING("ShopsanityPricesAffordable"), mOptionDescriptions[RSK_SHOPSANITY_PRICES_AFFORDABLE]);
     mOptions[RSK_SHUFFLE_TOKENS] = Option::U8("Tokensanity", {"Off", "Dungeons", "Overworld", "All Tokens"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleTokens"), mOptionDescriptions[RSK_SHUFFLE_TOKENS], WidgetType::Combobox, RO_TOKENSANITY_OFF);
-    mOptions[RSK_SHUFFLE_SCRUBS] = Option::U8("Scrub Shuffle", {"Off", "Affordable", "Expensive", "Random Prices"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleScrubs"), mOptionDescriptions[RSK_SHUFFLE_SCRUBS], WidgetType::Combobox, RO_SCRUBS_OFF);
+    mOptions[RSK_SHUFFLE_SCRUBS] = Option::U8("Scrub Shuffle", {"Off", "One-Time Only", "All"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleScrubs"), mOptionDescriptions[RSK_SHUFFLE_SCRUBS], WidgetType::Combobox, RO_SCRUBS_OFF);
+    mOptions[RSK_SCRUBS_PRICES] = Option::U8("Scrub Prices", {"Vanilla", "Cheap Balanced", "Balanced", "Fixed", "Range", "Set By Wallet"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ScrubsPrices"), mOptionDescriptions[RSK_SCRUBS_PRICES], WidgetType::Combobox, RO_PRICE_VANILLA, false, IMFLAG_NONE);
+    mOptions[RSK_SCRUBS_PRICES_FIXED_PRICE] = Option::U8("Fixed Price", {NumOpts(0, 995, 5)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ScrubsFixedPrice"), mOptionDescriptions[RSK_SCRUBS_PRICES_FIXED_PRICE], WidgetType::Slider, 10, true);
+    mOptions[RSK_SCRUBS_PRICES_RANGE_1] = Option::U8("Lower Bound", {NumOpts(0, 995, 5)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ScrubsPriceRange1"), mOptionDescriptions[RSK_SCRUBS_PRICES_RANGE_1], WidgetType::Slider, 10, true, IMFLAG_NONE);
+    mOptions[RSK_SCRUBS_PRICES_RANGE_2] = Option::U8("Upper Bound", {NumOpts(0, 995, 5)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ScrubsPriceRange2"), mOptionDescriptions[RSK_SCRUBS_PRICES_RANGE_2], WidgetType::Slider, 100, true, IMFLAG_NONE);
+    mOptions[RSK_SCRUBS_PRICES_NO_WALLET_WEIGHT] = Option::U8("No Wallet Weight", {NumOpts(0, 100)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ScrubsNoWalletWeight"), mOptionDescriptions[RSK_SCRUBS_PRICES_NO_WALLET_WEIGHT], WidgetType::Slider, 10, true, IMFLAG_NONE);
+    mOptions[RSK_SCRUBS_PRICES_CHILD_WALLET_WEIGHT] = Option::U8("Child Wallet Weight", {NumOpts(0, 100)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ScrubsChildWalletWeight"), mOptionDescriptions[RSK_SCRUBS_PRICES_CHILD_WALLET_WEIGHT], WidgetType::Slider, 10, true, IMFLAG_NONE);
+    mOptions[RSK_SCRUBS_PRICES_ADULT_WALLET_WEIGHT] = Option::U8("Adult Wallet Weight", {NumOpts(0, 100)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ScrubsAdultWalletWeight"), mOptionDescriptions[RSK_SCRUBS_PRICES_ADULT_WALLET_WEIGHT], WidgetType::Slider, 10, true, IMFLAG_NONE);
+    mOptions[RSK_SCRUBS_PRICES_GIANT_WALLET_WEIGHT] = Option::U8("Giant Wallet Weight", {NumOpts(0, 100)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ScrubsGiantWalletWeight"), mOptionDescriptions[RSK_SCRUBS_PRICES_GIANT_WALLET_WEIGHT], WidgetType::Slider, 10, true, IMFLAG_NONE);
+    mOptions[RSK_SCRUBS_PRICES_TYCOON_WALLET_WEIGHT] = Option::U8("Tycoon Wallet Weight", {NumOpts(0, 100)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ScrubsTycoonWalletWeight"), mOptionDescriptions[RSK_SCRUBS_PRICES_TYCOON_WALLET_WEIGHT], WidgetType::Slider, 10, true, IMFLAG_NONE);
+    mOptions[RSK_SCRUBS_PRICES_AFFORDABLE] = Option::Bool("Scrubs Affordable Prices", CVAR_RANDOMIZER_SETTING("ScrubsPricesAffordable"), mOptionDescriptions[RSK_SCRUBS_PRICES_AFFORDABLE]);
     mOptions[RSK_SHUFFLE_BEEHIVES] = Option::Bool("Shuffle Beehives", CVAR_RANDOMIZER_SETTING("ShuffleBeehives"), mOptionDescriptions[RSK_SHUFFLE_BEEHIVES]);
     mOptions[RSK_SHUFFLE_COWS] = Option::Bool("Shuffle Cows", CVAR_RANDOMIZER_SETTING("ShuffleCows"), mOptionDescriptions[RSK_SHUFFLE_COWS]);
     mOptions[RSK_SHUFFLE_KOKIRI_SWORD] = Option::Bool("Shuffle Kokiri Sword", CVAR_RANDOMIZER_SETTING("ShuffleKokiriSword"), mOptionDescriptions[RSK_SHUFFLE_KOKIRI_SWORD]);
     mOptions[RSK_SHUFFLE_MASTER_SWORD] = Option::Bool("Shuffle Master Sword", CVAR_RANDOMIZER_SETTING("ShuffleMasterSword"), mOptionDescriptions[RSK_SHUFFLE_MASTER_SWORD]);
-    mOptions[RSK_SHUFFLE_CHILD_WALLET] = Option::Bool("Shuffle Child's Wallet", CVAR_RANDOMIZER_SETTING("ShuffleChildWallet"), mOptionDescriptions[RSK_SHUFFLE_CHILD_WALLET]);
+    mOptions[RSK_SHUFFLE_CHILD_WALLET] = Option::Bool("Shuffle Child's Wallet", CVAR_RANDOMIZER_SETTING("ShuffleChildWallet"), mOptionDescriptions[RSK_SHUFFLE_CHILD_WALLET], IMFLAG_NONE);
+    mOptions[RSK_INCLUDE_TYCOON_WALLET] = Option::Bool("Include Tycoon Wallet", CVAR_RANDOMIZER_SETTING("IncludeTycoonWallet"), mOptionDescriptions[RSK_INCLUDE_TYCOON_WALLET]);
     mOptions[RSK_SHUFFLE_OCARINA] = Option::Bool("Shuffle Ocarinas", CVAR_RANDOMIZER_SETTING("ShuffleOcarinas"), mOptionDescriptions[RSK_SHUFFLE_OCARINA]);
     mOptions[RSK_SHUFFLE_OCARINA_BUTTONS] = Option::Bool("Shuffle Ocarina Buttons", CVAR_RANDOMIZER_SETTING("ShuffleOcarinaButtons"), mOptionDescriptions[RSK_SHUFFLE_OCARINA_BUTTONS]);
     mOptions[RSK_SHUFFLE_SWIM] = Option::Bool("Shuffle Swim", CVAR_RANDOMIZER_SETTING("ShuffleSwim"), mOptionDescriptions[RSK_SHUFFLE_SWIM]);
     mOptions[RSK_SHUFFLE_WEIRD_EGG] = Option::Bool("Shuffle Weird Egg", CVAR_RANDOMIZER_SETTING("ShuffleWeirdEgg"), mOptionDescriptions[RSK_SHUFFLE_WEIRD_EGG]);
     mOptions[RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD] = Option::Bool("Shuffle Gerudo Membership Card", CVAR_RANDOMIZER_SETTING("ShuffleGerudoToken"), mOptionDescriptions[RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD]);
     mOptions[RSK_SHUFFLE_FISHING_POLE] = Option::Bool("Shuffle Fishing Pole", CVAR_RANDOMIZER_SETTING("ShuffleFishingPole"), mOptionDescriptions[RSK_SHUFFLE_FISHING_POLE]);
-    mOptions[RSK_SHUFFLE_MAGIC_BEANS] = Option::Bool("Shuffle Magic Beans", CVAR_RANDOMIZER_SETTING("ShuffleBeans"), mOptionDescriptions[RSK_SHUFFLE_MAGIC_BEANS]);
-    mOptions[RSK_SHUFFLE_MERCHANTS] = Option::U8("Shuffle Merchants", {"Off", "On (No Hints)", "On (With Hints)"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleMerchants"), mOptionDescriptions[RSK_SHUFFLE_MERCHANTS], WidgetType::Combobox, RO_SHUFFLE_MERCHANTS_OFF);
+    mOptions[RSK_SHUFFLE_MERCHANTS] = Option::U8("Shuffle Merchants", {"Off", "Bean Merchant Only", "All But Beans", "All"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleMerchants"), mOptionDescriptions[RSK_SHUFFLE_MERCHANTS], WidgetType::Combobox, RO_SHUFFLE_MERCHANTS_OFF, IMFLAG_NONE);
+    mOptions[RSK_MERCHANT_PRICES] = Option::U8("Merchant Prices", {"Vanilla", "Cheap Balanced", "Balanced", "Fixed", "Range", "Set By Wallet"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("MerchantPrices"), mOptionDescriptions[RSK_MERCHANT_PRICES], WidgetType::Combobox, RO_PRICE_VANILLA, false, IMFLAG_NONE);
+    mOptions[RSK_MERCHANT_PRICES_FIXED_PRICE] = Option::U8("Fixed Price", {NumOpts(0, 995, 5)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("MerchantFixedPrice"), mOptionDescriptions[RSK_MERCHANT_PRICES_FIXED_PRICE], WidgetType::Slider, 10, true);
+    mOptions[RSK_MERCHANT_PRICES_RANGE_1] = Option::U8("Lower Bound", {NumOpts(0, 995, 5)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("MerchantPriceRange1"), mOptionDescriptions[RSK_MERCHANT_PRICES_RANGE_1], WidgetType::Slider, 10, true, IMFLAG_NONE);
+    mOptions[RSK_MERCHANT_PRICES_RANGE_2] = Option::U8("Upper Bound", {NumOpts(0, 995, 5)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("MerchantPriceRange2"), mOptionDescriptions[RSK_MERCHANT_PRICES_RANGE_2], WidgetType::Slider, 100, true, IMFLAG_NONE);
+    mOptions[RSK_MERCHANT_PRICES_NO_WALLET_WEIGHT] = Option::U8("No Wallet Weight", {NumOpts(0, 100)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("MerchantNoWalletWeight"), mOptionDescriptions[RSK_MERCHANT_PRICES_NO_WALLET_WEIGHT], WidgetType::Slider, 10, true, IMFLAG_NONE);
+    mOptions[RSK_MERCHANT_PRICES_CHILD_WALLET_WEIGHT] = Option::U8("Child Wallet Weight", {NumOpts(0, 100)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("MerchantChildWalletWeight"), mOptionDescriptions[RSK_MERCHANT_PRICES_CHILD_WALLET_WEIGHT], WidgetType::Slider, 10, true, IMFLAG_NONE);
+    mOptions[RSK_MERCHANT_PRICES_ADULT_WALLET_WEIGHT] = Option::U8("Adult Wallet Weight", {NumOpts(0, 100)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("MerchantAdultWalletWeight"), mOptionDescriptions[RSK_MERCHANT_PRICES_ADULT_WALLET_WEIGHT], WidgetType::Slider, 10, true, IMFLAG_NONE);
+    mOptions[RSK_MERCHANT_PRICES_GIANT_WALLET_WEIGHT] = Option::U8("Giant Wallet Weight", {NumOpts(0, 100)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("MerchantGiantWalletWeight"), mOptionDescriptions[RSK_MERCHANT_PRICES_GIANT_WALLET_WEIGHT], WidgetType::Slider, 10, true, IMFLAG_NONE);
+    mOptions[RSK_MERCHANT_PRICES_TYCOON_WALLET_WEIGHT] = Option::U8("Tycoon Wallet Weight", {NumOpts(0, 100)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("MerchantTycoonWalletWeight"), mOptionDescriptions[RSK_MERCHANT_PRICES_TYCOON_WALLET_WEIGHT], WidgetType::Slider, 10, true, IMFLAG_NONE);
+    mOptions[RSK_MERCHANT_PRICES_AFFORDABLE] = Option::Bool("Merchant Affordable Prices", CVAR_RANDOMIZER_SETTING("MerchantPricesAffordable"), mOptionDescriptions[RSK_MERCHANT_PRICES_AFFORDABLE]);
     mOptions[RSK_SHUFFLE_FROG_SONG_RUPEES] = Option::Bool("Shuffle Frog Song Rupees", CVAR_RANDOMIZER_SETTING("ShuffleFrogSongRupees"), mOptionDescriptions[RSK_SHUFFLE_FROG_SONG_RUPEES]);
     mOptions[RSK_SHUFFLE_ADULT_TRADE] = Option::Bool("Shuffle Adult Trade", CVAR_RANDOMIZER_SETTING("ShuffleAdultTrade"), mOptionDescriptions[RSK_SHUFFLE_ADULT_TRADE]);
     mOptions[RSK_SHUFFLE_CHEST_MINIGAME] = Option::U8("Shuffle Chest Minigame", {"Off", "On (Separate)", "On (Pack)"});
@@ -176,6 +267,7 @@ void Settings::CreateOptions() {
     mOptions[RSK_HBA_HINT] = Option::Bool("Horseback Archery Hint", CVAR_RANDOMIZER_SETTING("HBAHint"), mOptionDescriptions[RSK_HBA_HINT], IMFLAG_NONE);
     mOptions[RSK_WARP_SONG_HINTS] = Option::Bool("Warp Song Hints", CVAR_RANDOMIZER_SETTING("WarpSongText"), mOptionDescriptions[RSK_WARP_SONG_HINTS], IMFLAG_NONE, WidgetType::Checkbox, RO_GENERIC_ON);
     mOptions[RSK_SCRUB_TEXT_HINT] = Option::Bool("Scrub Hint Text", CVAR_RANDOMIZER_SETTING("ScrubText"), mOptionDescriptions[RSK_SCRUB_TEXT_HINT], IMFLAG_NONE);
+    mOptions[RSK_MERCHANT_TEXT_HINT] = Option::Bool("Merchant Hint Text", CVAR_RANDOMIZER_SETTING("MerchantText"), mOptionDescriptions[RSK_MERCHANT_TEXT_HINT], IMFLAG_NONE);
     mOptions[RSK_KAK_10_SKULLS_HINT] = Option::Bool("10 GS Hint", CVAR_RANDOMIZER_SETTING("10GSHint"), mOptionDescriptions[RSK_KAK_10_SKULLS_HINT], IMFLAG_NONE);
     mOptions[RSK_KAK_20_SKULLS_HINT] = Option::Bool("20 GS Hint", CVAR_RANDOMIZER_SETTING("20GSHint"), mOptionDescriptions[RSK_KAK_20_SKULLS_HINT], IMFLAG_NONE);
     mOptions[RSK_KAK_30_SKULLS_HINT] = Option::Bool("30 GS Hint", CVAR_RANDOMIZER_SETTING("30GSHint"), mOptionDescriptions[RSK_KAK_30_SKULLS_HINT], IMFLAG_NONE);
@@ -662,6 +754,7 @@ void Settings::CreateOptions() {
         &mOptions[RSK_SHUFFLE_KOKIRI_SWORD],
         &mOptions[RSK_SHUFFLE_MASTER_SWORD],
         &mOptions[RSK_SHUFFLE_CHILD_WALLET],
+        &mOptions[RSK_INCLUDE_TYCOON_WALLET],
         &mOptions[RSK_SHUFFLE_OCARINA],
         &mOptions[RSK_SHUFFLE_OCARINA_BUTTONS],
         &mOptions[RSK_SHUFFLE_SWIM],
@@ -675,15 +768,42 @@ void Settings::CreateOptions() {
         &mOptions[RSK_SHOPSANITY],
         &mOptions[RSK_SHOPSANITY_COUNT],
         &mOptions[RSK_SHOPSANITY_PRICES],
+        &mOptions[RSK_SHOPSANITY_PRICES_FIXED_PRICE],
+        &mOptions[RSK_SHOPSANITY_PRICES_RANGE_1],
+        &mOptions[RSK_SHOPSANITY_PRICES_RANGE_2],
+        &mOptions[RSK_SHOPSANITY_PRICES_NO_WALLET_WEIGHT],
+        &mOptions[RSK_SHOPSANITY_PRICES_CHILD_WALLET_WEIGHT],
+        &mOptions[RSK_SHOPSANITY_PRICES_ADULT_WALLET_WEIGHT],
+        &mOptions[RSK_SHOPSANITY_PRICES_GIANT_WALLET_WEIGHT],
+        &mOptions[RSK_SHOPSANITY_PRICES_TYCOON_WALLET_WEIGHT],
         &mOptions[RSK_SHOPSANITY_PRICES_AFFORDABLE],
         &mOptions[RSK_FISHSANITY],
         &mOptions[RSK_FISHSANITY_POND_COUNT],
         &mOptions[RSK_FISHSANITY_AGE_SPLIT],
         &mOptions[RSK_SHUFFLE_SCRUBS],
+        &mOptions[RSK_SCRUBS_PRICES],
+        &mOptions[RSK_SCRUBS_PRICES_FIXED_PRICE],
+        &mOptions[RSK_SCRUBS_PRICES_RANGE_1],
+        &mOptions[RSK_SCRUBS_PRICES_RANGE_2],
+        &mOptions[RSK_SCRUBS_PRICES_NO_WALLET_WEIGHT],
+        &mOptions[RSK_SCRUBS_PRICES_CHILD_WALLET_WEIGHT],
+        &mOptions[RSK_SCRUBS_PRICES_ADULT_WALLET_WEIGHT],
+        &mOptions[RSK_SCRUBS_PRICES_GIANT_WALLET_WEIGHT],
+        &mOptions[RSK_SCRUBS_PRICES_TYCOON_WALLET_WEIGHT],
+        &mOptions[RSK_SCRUBS_PRICES_AFFORDABLE],
         &mOptions[RSK_SHUFFLE_BEEHIVES],
         &mOptions[RSK_SHUFFLE_COWS],
-        &mOptions[RSK_SHUFFLE_MAGIC_BEANS],
         &mOptions[RSK_SHUFFLE_MERCHANTS],
+        &mOptions[RSK_MERCHANT_PRICES],
+        &mOptions[RSK_MERCHANT_PRICES_FIXED_PRICE],
+        &mOptions[RSK_MERCHANT_PRICES_RANGE_1],
+        &mOptions[RSK_MERCHANT_PRICES_RANGE_2],
+        &mOptions[RSK_MERCHANT_PRICES_NO_WALLET_WEIGHT],
+        &mOptions[RSK_MERCHANT_PRICES_CHILD_WALLET_WEIGHT],
+        &mOptions[RSK_MERCHANT_PRICES_ADULT_WALLET_WEIGHT],
+        &mOptions[RSK_MERCHANT_PRICES_GIANT_WALLET_WEIGHT],
+        &mOptions[RSK_MERCHANT_PRICES_TYCOON_WALLET_WEIGHT],
+        &mOptions[RSK_MERCHANT_PRICES_AFFORDABLE],
         &mOptions[RSK_SHUFFLE_FROG_SONG_RUPEES],
         &mOptions[RSK_SHUFFLE_ADULT_TRADE],
         &mOptions[RSK_SHUFFLE_100_GS_REWARD],
@@ -753,6 +873,7 @@ void Settings::CreateOptions() {
         &mOptions[RSK_FISHING_POLE_HINT],
         &mOptions[RSK_WARP_SONG_HINTS],
         &mOptions[RSK_SCRUB_TEXT_HINT],
+        &mOptions[RSK_MERCHANT_TEXT_HINT],
         &mOptions[RSK_KAK_10_SKULLS_HINT],
         &mOptions[RSK_KAK_20_SKULLS_HINT],
         &mOptions[RSK_KAK_30_SKULLS_HINT],
@@ -880,6 +1001,14 @@ void Settings::CreateOptions() {
         &mOptions[RSK_SHOPSANITY],
         &mOptions[RSK_SHOPSANITY_COUNT],
         &mOptions[RSK_SHOPSANITY_PRICES],
+        &mOptions[RSK_SHOPSANITY_PRICES_FIXED_PRICE],
+        &mOptions[RSK_SHOPSANITY_PRICES_RANGE_1],
+        &mOptions[RSK_SHOPSANITY_PRICES_RANGE_2],
+        &mOptions[RSK_SHOPSANITY_PRICES_NO_WALLET_WEIGHT],
+        &mOptions[RSK_SHOPSANITY_PRICES_CHILD_WALLET_WEIGHT],
+        &mOptions[RSK_SHOPSANITY_PRICES_ADULT_WALLET_WEIGHT],
+        &mOptions[RSK_SHOPSANITY_PRICES_GIANT_WALLET_WEIGHT],
+        &mOptions[RSK_SHOPSANITY_PRICES_TYCOON_WALLET_WEIGHT],
         &mOptions[RSK_SHOPSANITY_PRICES_AFFORDABLE],
         &mOptions[RSK_FISHSANITY],
         &mOptions[RSK_FISHSANITY_POND_COUNT],
@@ -887,6 +1016,16 @@ void Settings::CreateOptions() {
         &mOptions[RSK_SHUFFLE_FISHING_POLE],
         &mOptions[RSK_SHUFFLE_TOKENS],
         &mOptions[RSK_SHUFFLE_SCRUBS],
+        &mOptions[RSK_SCRUBS_PRICES],
+        &mOptions[RSK_SCRUBS_PRICES_FIXED_PRICE],
+        &mOptions[RSK_SCRUBS_PRICES_RANGE_1],
+        &mOptions[RSK_SCRUBS_PRICES_RANGE_2],
+        &mOptions[RSK_SCRUBS_PRICES_NO_WALLET_WEIGHT],
+        &mOptions[RSK_SCRUBS_PRICES_CHILD_WALLET_WEIGHT],
+        &mOptions[RSK_SCRUBS_PRICES_ADULT_WALLET_WEIGHT],
+        &mOptions[RSK_SCRUBS_PRICES_GIANT_WALLET_WEIGHT],
+        &mOptions[RSK_SCRUBS_PRICES_TYCOON_WALLET_WEIGHT],
+        &mOptions[RSK_SCRUBS_PRICES_AFFORDABLE],
         &mOptions[RSK_SHUFFLE_BEEHIVES],
         &mOptions[RSK_SHUFFLE_COWS],
         &mOptions[RSK_SHUFFLE_KOKIRI_SWORD],
@@ -895,8 +1034,17 @@ void Settings::CreateOptions() {
         &mOptions[RSK_SHUFFLE_SWIM],
         &mOptions[RSK_SHUFFLE_WEIRD_EGG],
         &mOptions[RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD],
-        &mOptions[RSK_SHUFFLE_MAGIC_BEANS],
         &mOptions[RSK_SHUFFLE_MERCHANTS],
+        &mOptions[RSK_MERCHANT_PRICES],
+        &mOptions[RSK_MERCHANT_PRICES_FIXED_PRICE],
+        &mOptions[RSK_MERCHANT_PRICES_RANGE_1],
+        &mOptions[RSK_MERCHANT_PRICES_RANGE_2],
+        &mOptions[RSK_MERCHANT_PRICES_NO_WALLET_WEIGHT],
+        &mOptions[RSK_MERCHANT_PRICES_CHILD_WALLET_WEIGHT],
+        &mOptions[RSK_MERCHANT_PRICES_ADULT_WALLET_WEIGHT],
+        &mOptions[RSK_MERCHANT_PRICES_GIANT_WALLET_WEIGHT],
+        &mOptions[RSK_MERCHANT_PRICES_TYCOON_WALLET_WEIGHT],
+        &mOptions[RSK_MERCHANT_PRICES_AFFORDABLE],
         &mOptions[RSK_SHUFFLE_FROG_SONG_RUPEES],
         &mOptions[RSK_SHUFFLE_ADULT_TRADE],
         &mOptions[RSK_SHUFFLE_CHEST_MINIGAME],
@@ -997,6 +1145,7 @@ void Settings::CreateOptions() {
         &mOptions[RSK_KAK_100_SKULLS_HINT],
         &mOptions[RSK_MASK_SHOP_HINT],
         &mOptions[RSK_SCRUB_TEXT_HINT],
+        &mOptions[RSK_MERCHANT_TEXT_HINT],
         &mOptions[RSK_FISHING_POLE_HINT],
         // TODO: Compasses show Reward/WOTH, Maps show Dungeon Mode, Starting Time
         &mOptions[RSK_DAMAGE_MULTIPLIER],
@@ -1082,7 +1231,7 @@ void Settings::CreateOptions() {
         &mOptionGroups[RSG_EXCLUDES]
     });
 
-    VanillaLogicDefaults = {
+    VanillaLogicDefaults = {//RANDOTODO check what this does
         &mOptions[RSK_LINKS_POCKET],
         &mOptions[RSK_SHUFFLE_DUNGEON_REWARDS],
         &mOptions[RSK_SHUFFLE_SONGS],
@@ -1096,7 +1245,6 @@ void Settings::CreateOptions() {
         &mOptions[RSK_SHUFFLE_SCRUBS],
         &mOptions[RSK_SHUFFLE_BEEHIVES],
         &mOptions[RSK_SHUFFLE_COWS],
-        &mOptions[RSK_SHUFFLE_MAGIC_BEANS],
         &mOptions[RSK_SHUFFLE_MERCHANTS],
         &mOptions[RSK_SHUFFLE_FROG_SONG_RUPEES],
         &mOptions[RSK_SHUFFLE_ADULT_TRADE],
@@ -1131,12 +1279,30 @@ void Settings::CreateOptions() {
         { "Shuffle Settings:Shopsanity", RSK_SHOPSANITY },
         { "Shuffle Settings:Shopsanity Specific Count", RSK_SHOPSANITY_COUNT },
         { "Shuffle Settings:Shopsanity Prices", RSK_SHOPSANITY_PRICES },
-        { "Shuffle Settings:Affordable Prices", RSK_SHOPSANITY_PRICES_AFFORDABLE },
+        { "Shuffle Settings:Shopsanity Fixed Amount", RSK_SHOPSANITY_PRICES_FIXED_PRICE },
+        { "Shuffle Settings:Shopsanity Range 1", RSK_SHOPSANITY_PRICES_RANGE_1 },
+        { "Shuffle Settings:Shopsanity Range 2", RSK_SHOPSANITY_PRICES_RANGE_2 },
+        { "Shuffle Settings:Shopsanity No Wallet Weight", RSK_SHOPSANITY_PRICES_NO_WALLET_WEIGHT },
+        { "Shuffle Settings:Shopsanity Child Wallet Weight", RSK_SHOPSANITY_PRICES_CHILD_WALLET_WEIGHT },
+        { "Shuffle Settings:Shopsanity Adult Wallet Weight", RSK_SHOPSANITY_PRICES_ADULT_WALLET_WEIGHT },
+        { "Shuffle Settings:Shopsanity Giants Wallet Weight", RSK_SHOPSANITY_PRICES_GIANT_WALLET_WEIGHT },
+        { "Shuffle Settings:Shopsanity Tycoon Wallet Weight", RSK_SHOPSANITY_PRICES_TYCOON_WALLET_WEIGHT },
+        { "Shuffle Settings:Shopsanity Affordable Prices", RSK_SHOPSANITY_PRICES_AFFORDABLE },
         { "Shuffle Settings:Fishsanity", RSK_FISHSANITY },
         { "Shuffle Settings:Pond Fish Count", RSK_FISHSANITY_POND_COUNT },
         { "Shuffle Settings:Split Pond Fish", RSK_FISHSANITY_AGE_SPLIT },
         { "Shuffle Settings:Shuffle Fishing Pole", RSK_SHUFFLE_FISHING_POLE },
         { "Shuffle Settings:Scrub Shuffle", RSK_SHUFFLE_SCRUBS },
+        { "Shuffle Settings:Scrubs Prices", RSK_SCRUBS_PRICES },
+        { "Shuffle Settings:Scrubs Fixed Amount", RSK_SCRUBS_PRICES_FIXED_PRICE },
+        { "Shuffle Settings:Scrubs Range 1", RSK_SCRUBS_PRICES_RANGE_1 },
+        { "Shuffle Settings:Scrubs Range 2", RSK_SCRUBS_PRICES_RANGE_2 },
+        { "Shuffle Settings:Scrubs No Wallet Weight", RSK_SCRUBS_PRICES_NO_WALLET_WEIGHT },
+        { "Shuffle Settings:Scrubs Child Wallet Weight", RSK_SCRUBS_PRICES_CHILD_WALLET_WEIGHT },
+        { "Shuffle Settings:Scrubs Adult Wallet Weight", RSK_SCRUBS_PRICES_ADULT_WALLET_WEIGHT },
+        { "Shuffle Settings:Scrubs Giants Wallet Weight", RSK_SCRUBS_PRICES_GIANT_WALLET_WEIGHT },
+        { "Shuffle Settings:Scrubs Tycoon Wallet Weight", RSK_SCRUBS_PRICES_TYCOON_WALLET_WEIGHT },
+        { "Shuffle Settings:Scrubs Affordable Prices", RSK_SCRUBS_PRICES_AFFORDABLE },
         { "Shuffle Settings:Beehive Shuffle", RSK_SHUFFLE_BEEHIVES },
         { "Shuffle Settings:Shuffle Cows", RSK_SHUFFLE_COWS },
         { "Shuffle Settings:Tokensanity", RSK_SHUFFLE_TOKENS },
@@ -1144,13 +1310,23 @@ void Settings::CreateOptions() {
         { "Shuffle Settings:Shuffle Ocarina Buttons", RSK_SHUFFLE_OCARINA_BUTTONS },
         { "Shuffle Settings:Shuffle Swim", RSK_SHUFFLE_SWIM },
         { "Shuffle Settings:Shuffle Adult Trade", RSK_SHUFFLE_ADULT_TRADE },
-        { "Shuffle Settings:Shuffle Magic Beans", RSK_SHUFFLE_MAGIC_BEANS },
         { "Shuffle Settings:Shuffle Kokiri Sword", RSK_SHUFFLE_KOKIRI_SWORD },
         { "Shuffle Settings:Shuffle Master Sword", RSK_SHUFFLE_MASTER_SWORD },
         { "Shuffle Settings:Shuffle Child's Wallet", RSK_SHUFFLE_CHILD_WALLET },
+        { "Shuffle Settings:Include Tycoon Wallet", RSK_INCLUDE_TYCOON_WALLET },
         { "Shuffle Settings:Shuffle Weird Egg", RSK_SHUFFLE_WEIRD_EGG },
         { "Shuffle Settings:Shuffle Frog Song Rupees", RSK_SHUFFLE_FROG_SONG_RUPEES },
         { "Shuffle Settings:Shuffle Merchants", RSK_SHUFFLE_MERCHANTS },
+        { "Shuffle Settings:Merchant Prices", RSK_MERCHANT_PRICES },
+        { "Shuffle Settings:Merchant Fixed Amount", RSK_MERCHANT_PRICES_FIXED_PRICE },
+        { "Shuffle Settings:Merchant Range 1", RSK_MERCHANT_PRICES_RANGE_1 },
+        { "Shuffle Settings:Merchant Range 2", RSK_MERCHANT_PRICES_RANGE_2 },
+        { "Shuffle Settings:Merchant No Wallet Weight", RSK_MERCHANT_PRICES_NO_WALLET_WEIGHT },
+        { "Shuffle Settings:Merchant Child Wallet Weight", RSK_MERCHANT_PRICES_CHILD_WALLET_WEIGHT },
+        { "Shuffle Settings:Merchant Adult Wallet Weight", RSK_MERCHANT_PRICES_ADULT_WALLET_WEIGHT },
+        { "Shuffle Settings:Merchant Giants Wallet Weight", RSK_MERCHANT_PRICES_GIANT_WALLET_WEIGHT },
+        { "Shuffle Settings:Merchant Tycoon Wallet Weight", RSK_MERCHANT_PRICES_TYCOON_WALLET_WEIGHT },
+        { "Shuffle Settings:Merchant Affordable Prices", RSK_MERCHANT_PRICES_AFFORDABLE },
         { "Shuffle Settings:Shuffle 100 GS Reward", RSK_SHUFFLE_100_GS_REWARD },
         { "Shuffle Settings:Shuffle Boss Souls", RSK_SHUFFLE_BOSS_SOULS },
         { "Shuffle Settings:Shuffle Deku Stick Bag", RSK_SHUFFLE_DEKU_STICK_BAG },
@@ -1237,6 +1413,7 @@ void Settings::CreateOptions() {
         { "Miscellaneous Settings:Big Poes Hint", RSK_BIG_POES_HINT },
         { "Miscellaneous Settings:Warp Song Hints", RSK_WARP_SONG_HINTS },
         { "Miscellaneous Settings:Scrub Hint Text", RSK_SCRUB_TEXT_HINT },
+        { "Miscellaneous Settings:Merchant Hint Text", RSK_MERCHANT_TEXT_HINT },
         { "Miscellaneous Settings:Fishing Pole Hint", RSK_FISHING_POLE_HINT },
         { "Miscellaneous Settings:Hint Distribution", RSK_HINT_DISTRIBUTION },
         { "Miscellaneous Settings:Blue Fire Arrows", RSK_BLUE_FIRE_ARROWS },
@@ -1607,25 +1784,183 @@ void Settings::UpdateOptionProperties() {
     } else {
         mOptions[RSK_SHUFFLE_WEIRD_EGG].Enable();
     }
+    bool isTycoon = CVarGetInteger(CVAR_RANDOMIZER_SETTING("IncludeTycoonWallet"), RO_GENERIC_OFF);
     // Hide shopsanity prices if shopsanity is off or zero
     switch (CVarGetInteger(CVAR_RANDOMIZER_SETTING("Shopsanity"), RO_SHOPSANITY_OFF)) {
         case RO_SHOPSANITY_OFF:
             mOptions[RSK_SHOPSANITY].AddFlag(IMFLAG_SEPARATOR_BOTTOM);
             mOptions[RSK_SHOPSANITY_COUNT].Hide();
+            mOptions[RSK_SHOPSANITY_COUNT].Hide();
             mOptions[RSK_SHOPSANITY_PRICES].Hide();
             mOptions[RSK_SHOPSANITY_PRICES_AFFORDABLE].Hide();
+            mOptions[RSK_SHOPSANITY_PRICES_FIXED_PRICE].Hide();
+            mOptions[RSK_SHOPSANITY_PRICES_RANGE_1].Hide();
+            mOptions[RSK_SHOPSANITY_PRICES_RANGE_2].Hide();
+            mOptions[RSK_SHOPSANITY_PRICES_NO_WALLET_WEIGHT].Hide();
+            mOptions[RSK_SHOPSANITY_PRICES_CHILD_WALLET_WEIGHT].Hide();
+            mOptions[RSK_SHOPSANITY_PRICES_ADULT_WALLET_WEIGHT].Hide();
+            mOptions[RSK_SHOPSANITY_PRICES_GIANT_WALLET_WEIGHT].Hide();
+            mOptions[RSK_SHOPSANITY_PRICES_TYCOON_WALLET_WEIGHT].Hide();
             break;
         case RO_SHOPSANITY_SPECIFIC_COUNT:
-            mOptions[RSK_SHOPSANITY].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
             mOptions[RSK_SHOPSANITY_COUNT].Unhide();
-            mOptions[RSK_SHOPSANITY_PRICES].Unhide();
-            mOptions[RSK_SHOPSANITY_PRICES_AFFORDABLE].Unhide();
+            HandleShopsanityPriceUI();
+            break;
+        case RO_SHOPSANITY_RANDOM:
+            mOptions[RSK_SHOPSANITY_COUNT].Hide();
+            HandleShopsanityPriceUI();
+            break;
+    }
+    switch (CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleScrubs"), RO_SCRUBS_OFF)) {
+        case RO_SCRUBS_OFF:
+            mOptions[RSK_SHUFFLE_SCRUBS].AddFlag(IMFLAG_SEPARATOR_BOTTOM);
+            mOptions[RSK_SCRUBS_PRICES].Hide();
+            mOptions[RSK_SCRUBS_PRICES_AFFORDABLE].Hide();
+            mOptions[RSK_SCRUBS_PRICES_FIXED_PRICE].Hide();
+            mOptions[RSK_SCRUBS_PRICES_RANGE_1].Hide();
+            mOptions[RSK_SCRUBS_PRICES_RANGE_2].Hide();
+            mOptions[RSK_SCRUBS_PRICES_NO_WALLET_WEIGHT].Hide();
+            mOptions[RSK_SCRUBS_PRICES_CHILD_WALLET_WEIGHT].Hide();
+            mOptions[RSK_SCRUBS_PRICES_ADULT_WALLET_WEIGHT].Hide();
+            mOptions[RSK_SCRUBS_PRICES_GIANT_WALLET_WEIGHT].Hide();
+            mOptions[RSK_SCRUBS_PRICES_TYCOON_WALLET_WEIGHT].Hide();
             break;
         default:
-            mOptions[RSK_SHOPSANITY].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
-            mOptions[RSK_SHOPSANITY_COUNT].Hide();
-            mOptions[RSK_SHOPSANITY_PRICES].Unhide();
-            mOptions[RSK_SHOPSANITY_PRICES_AFFORDABLE].Unhide();
+            mOptions[RSK_SHUFFLE_SCRUBS].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
+            mOptions[RSK_SCRUBS_PRICES].Unhide();
+            switch (CVarGetInteger(CVAR_RANDOMIZER_SETTING("ScrubsPrices"), RO_PRICE_VANILLA)){
+                case RO_PRICE_FIXED:
+                    mOptions[RSK_SCRUBS_PRICES_FIXED_PRICE].Unhide();
+                    mOptions[RSK_SCRUBS_PRICES_RANGE_1].Hide();
+                    mOptions[RSK_SCRUBS_PRICES_RANGE_2].Hide();
+                    mOptions[RSK_SCRUBS_PRICES_NO_WALLET_WEIGHT].Hide();
+                    mOptions[RSK_SCRUBS_PRICES_CHILD_WALLET_WEIGHT].Hide();
+                    mOptions[RSK_SCRUBS_PRICES_ADULT_WALLET_WEIGHT].Hide();
+                    mOptions[RSK_SCRUBS_PRICES_GIANT_WALLET_WEIGHT].Hide();
+                    mOptions[RSK_SCRUBS_PRICES_TYCOON_WALLET_WEIGHT].Hide();
+                    if (isTycoon ? mOptions[RSK_SCRUBS_PRICES_FIXED_PRICE].GetOptionCount() == 501 : mOptions[RSK_SCRUBS_PRICES_FIXED_PRICE].GetOptionCount() == 1000) {
+                        mOptions[RSK_SCRUBS_PRICES_FIXED_PRICE].ChangeOptions(isTycoon ? NumOpts(0, 999) : NumOpts(0, 500));
+                    }
+                    mOptions[RSK_SCRUBS_PRICES_AFFORDABLE].Hide();
+                    break;
+                case RO_PRICE_RANGE:
+                    mOptions[RSK_SCRUBS_PRICES_FIXED_PRICE].Hide();
+                    mOptions[RSK_SCRUBS_PRICES_RANGE_1].Unhide();
+                    mOptions[RSK_SCRUBS_PRICES_RANGE_2].Unhide();
+                    mOptions[RSK_SCRUBS_PRICES_NO_WALLET_WEIGHT].Hide();
+                    mOptions[RSK_SCRUBS_PRICES_CHILD_WALLET_WEIGHT].Hide();
+                    mOptions[RSK_SCRUBS_PRICES_ADULT_WALLET_WEIGHT].Hide();
+                    mOptions[RSK_SCRUBS_PRICES_GIANT_WALLET_WEIGHT].Hide();
+                    mOptions[RSK_SCRUBS_PRICES_TYCOON_WALLET_WEIGHT].Hide();
+                    if (isTycoon ? mOptions[RSK_SCRUBS_PRICES_RANGE_1].GetOptionCount() == 101 : mOptions[RSK_SCRUBS_PRICES_RANGE_1].GetOptionCount() == 200) {
+                        mOptions[RSK_SCRUBS_PRICES_RANGE_1].ChangeOptions(isTycoon ? NumOpts(0, 995, 5) : NumOpts(0, 500, 5));
+                        mOptions[RSK_SCRUBS_PRICES_RANGE_2].ChangeOptions(isTycoon ? NumOpts(0, 995, 5) : NumOpts(0, 500, 5));
+                    }
+                    mOptions[RSK_SCRUBS_PRICES_AFFORDABLE].Unhide();
+                    break;
+                case RO_PRICE_SET_BY_WALLET:
+                    mOptions[RSK_SCRUBS_PRICES_FIXED_PRICE].Hide();
+                    mOptions[RSK_SCRUBS_PRICES_RANGE_1].Hide();
+                    mOptions[RSK_SCRUBS_PRICES_RANGE_2].Hide();
+                    mOptions[RSK_SCRUBS_PRICES_NO_WALLET_WEIGHT].Unhide();
+                    mOptions[RSK_SCRUBS_PRICES_CHILD_WALLET_WEIGHT].Unhide();
+                    mOptions[RSK_SCRUBS_PRICES_ADULT_WALLET_WEIGHT].Unhide();
+                    mOptions[RSK_SCRUBS_PRICES_GIANT_WALLET_WEIGHT].Unhide();
+                    if (isTycoon){
+                        mOptions[RSK_SCRUBS_PRICES_TYCOON_WALLET_WEIGHT].Unhide();
+                    } else {
+                        mOptions[RSK_SCRUBS_PRICES_TYCOON_WALLET_WEIGHT].Hide();
+                    }
+                    mOptions[RSK_SCRUBS_PRICES_AFFORDABLE].Unhide();
+                    break;
+                default:
+                    mOptions[RSK_SCRUBS_PRICES_FIXED_PRICE].Hide();
+                    mOptions[RSK_SCRUBS_PRICES_RANGE_1].Hide();
+                    mOptions[RSK_SCRUBS_PRICES_RANGE_2].Hide();
+                    mOptions[RSK_SCRUBS_PRICES_NO_WALLET_WEIGHT].Hide();
+                    mOptions[RSK_SCRUBS_PRICES_CHILD_WALLET_WEIGHT].Hide();
+                    mOptions[RSK_SCRUBS_PRICES_ADULT_WALLET_WEIGHT].Hide();
+                    mOptions[RSK_SCRUBS_PRICES_GIANT_WALLET_WEIGHT].Hide();
+                    mOptions[RSK_SCRUBS_PRICES_TYCOON_WALLET_WEIGHT].Hide();
+                    mOptions[RSK_SCRUBS_PRICES_AFFORDABLE].Unhide();
+                    break;
+            }
+            break;
+    }
+    switch (CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleMerchants"), RO_SHUFFLE_MERCHANTS_OFF)) {
+        case RO_SHUFFLE_MERCHANTS_OFF:
+            mOptions[RSK_SHUFFLE_MERCHANTS].AddFlag(IMFLAG_SEPARATOR_BOTTOM);
+            mOptions[RSK_MERCHANT_PRICES].Hide();
+            mOptions[RSK_MERCHANT_PRICES_AFFORDABLE].Hide();
+            mOptions[RSK_MERCHANT_PRICES_FIXED_PRICE].Hide();
+            mOptions[RSK_MERCHANT_PRICES_RANGE_1].Hide();
+            mOptions[RSK_MERCHANT_PRICES_RANGE_2].Hide();
+            mOptions[RSK_MERCHANT_PRICES_NO_WALLET_WEIGHT].Hide();
+            mOptions[RSK_MERCHANT_PRICES_CHILD_WALLET_WEIGHT].Hide();
+            mOptions[RSK_MERCHANT_PRICES_ADULT_WALLET_WEIGHT].Hide();
+            mOptions[RSK_MERCHANT_PRICES_GIANT_WALLET_WEIGHT].Hide();
+            mOptions[RSK_MERCHANT_PRICES_TYCOON_WALLET_WEIGHT].Hide();
+            break;
+        default:
+            mOptions[RSK_SHUFFLE_MERCHANTS].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
+            mOptions[RSK_MERCHANT_PRICES].Unhide();
+            switch (CVarGetInteger(CVAR_RANDOMIZER_SETTING("MerchantPrices"), RO_PRICE_VANILLA)){
+                case RO_PRICE_FIXED:
+                    mOptions[RSK_MERCHANT_PRICES_FIXED_PRICE].Unhide();
+                    mOptions[RSK_MERCHANT_PRICES_RANGE_1].Hide();
+                    mOptions[RSK_MERCHANT_PRICES_RANGE_2].Hide();
+                    mOptions[RSK_MERCHANT_PRICES_NO_WALLET_WEIGHT].Hide();
+                    mOptions[RSK_MERCHANT_PRICES_CHILD_WALLET_WEIGHT].Hide();
+                    mOptions[RSK_MERCHANT_PRICES_ADULT_WALLET_WEIGHT].Hide();
+                    mOptions[RSK_MERCHANT_PRICES_GIANT_WALLET_WEIGHT].Hide();
+                    mOptions[RSK_MERCHANT_PRICES_TYCOON_WALLET_WEIGHT].Hide();
+                    if (isTycoon ? mOptions[RSK_MERCHANT_PRICES_FIXED_PRICE].GetOptionCount() == 501 : mOptions[RSK_MERCHANT_PRICES_FIXED_PRICE].GetOptionCount() == 1000) {
+                        mOptions[RSK_MERCHANT_PRICES_FIXED_PRICE].ChangeOptions(isTycoon ? NumOpts(0, 999) : NumOpts(0, 500));
+                    }
+                    mOptions[RSK_MERCHANT_PRICES_AFFORDABLE].Hide();
+                    break;
+                case RO_PRICE_RANGE:
+                    mOptions[RSK_MERCHANT_PRICES_FIXED_PRICE].Hide();
+                    mOptions[RSK_MERCHANT_PRICES_RANGE_1].Unhide();
+                    mOptions[RSK_MERCHANT_PRICES_RANGE_2].Unhide();
+                    mOptions[RSK_MERCHANT_PRICES_NO_WALLET_WEIGHT].Hide();
+                    mOptions[RSK_MERCHANT_PRICES_CHILD_WALLET_WEIGHT].Hide();
+                    mOptions[RSK_MERCHANT_PRICES_ADULT_WALLET_WEIGHT].Hide();
+                    mOptions[RSK_MERCHANT_PRICES_GIANT_WALLET_WEIGHT].Hide();
+                    mOptions[RSK_MERCHANT_PRICES_TYCOON_WALLET_WEIGHT].Hide();
+                    if (isTycoon ? mOptions[RSK_MERCHANT_PRICES_RANGE_1].GetOptionCount() == 101 : mOptions[RSK_MERCHANT_PRICES_RANGE_1].GetOptionCount() == 200) {
+                        mOptions[RSK_MERCHANT_PRICES_RANGE_1].ChangeOptions(isTycoon ? NumOpts(0, 995, 5) : NumOpts(0, 500, 5));
+                        mOptions[RSK_MERCHANT_PRICES_RANGE_2].ChangeOptions(isTycoon ? NumOpts(0, 995, 5) : NumOpts(0, 500, 5));
+                    }
+                    mOptions[RSK_MERCHANT_PRICES_AFFORDABLE].Unhide();
+                    break;
+                case RO_PRICE_SET_BY_WALLET:
+                    mOptions[RSK_MERCHANT_PRICES_FIXED_PRICE].Hide();
+                    mOptions[RSK_MERCHANT_PRICES_RANGE_1].Hide();
+                    mOptions[RSK_MERCHANT_PRICES_RANGE_2].Hide();
+                    mOptions[RSK_MERCHANT_PRICES_NO_WALLET_WEIGHT].Unhide();
+                    mOptions[RSK_MERCHANT_PRICES_CHILD_WALLET_WEIGHT].Unhide();
+                    mOptions[RSK_MERCHANT_PRICES_ADULT_WALLET_WEIGHT].Unhide();
+                    mOptions[RSK_MERCHANT_PRICES_GIANT_WALLET_WEIGHT].Unhide();
+                    if (isTycoon){
+                        mOptions[RSK_MERCHANT_PRICES_TYCOON_WALLET_WEIGHT].Unhide();
+                    } else {
+                        mOptions[RSK_MERCHANT_PRICES_TYCOON_WALLET_WEIGHT].Hide();
+                    }
+                    mOptions[RSK_MERCHANT_PRICES_AFFORDABLE].Unhide();
+                    break;
+                default:
+                    mOptions[RSK_MERCHANT_PRICES_FIXED_PRICE].Hide();
+                    mOptions[RSK_MERCHANT_PRICES_RANGE_1].Hide();
+                    mOptions[RSK_MERCHANT_PRICES_RANGE_2].Hide();
+                    mOptions[RSK_MERCHANT_PRICES_NO_WALLET_WEIGHT].Hide();
+                    mOptions[RSK_MERCHANT_PRICES_CHILD_WALLET_WEIGHT].Hide();
+                    mOptions[RSK_MERCHANT_PRICES_ADULT_WALLET_WEIGHT].Hide();
+                    mOptions[RSK_MERCHANT_PRICES_GIANT_WALLET_WEIGHT].Hide();
+                    mOptions[RSK_MERCHANT_PRICES_TYCOON_WALLET_WEIGHT].Hide();
+                    mOptions[RSK_MERCHANT_PRICES_AFFORDABLE].Unhide();
+                    break;
+            }
             break;
     }
     // Hide fishing pond settings if we aren't shuffling the fishing pond
@@ -2347,27 +2682,29 @@ void Settings::ParseJson(nlohmann::json spoilerFileJson) {
                     }
                     break;
                 case RSK_SHOPSANITY_PRICES:
-                    if (it.value() == "Random") {
-                        mOptions[index].SetSelectedIndex(RO_SHOPSANITY_PRICE_BALANCED);
-                    } else if (it.value() == "Starter Wallet") {
-                        mOptions[index].SetSelectedIndex(RO_SHOPSANITY_PRICE_STARTER);
-                    } else if (it.value() == "Adult's Wallet") {
-                        mOptions[index].SetSelectedIndex(RO_SHOPSANITY_PRICE_ADULT);
-                    } else if (it.value() == "Giant's Wallet") {
-                        mOptions[index].SetSelectedIndex(RO_SHOPSANITY_PRICE_GIANT);
-                    } else if (it.value() == "Tycoon's Wallet") {
-                        mOptions[index].SetSelectedIndex(RO_SHOPSANITY_PRICE_TYCOON);
+                case RSK_SCRUBS_PRICES:
+                case RSK_MERCHANT_PRICES:
+                    if (it.value() == "Vanilla") {
+                        mOptions[index].SetSelectedIndex(RO_PRICE_VANILLA);
+                    } else if (it.value() == "Cheap Balanced") {
+                        mOptions[index].SetSelectedIndex(RO_PRICE_CHEAP_BALANCED);
+                    } else if (it.value() == "Balanced") {
+                        mOptions[index].SetSelectedIndex(RO_PRICE_BALANCED);
+                    } else if (it.value() == "Fixed") {
+                        mOptions[index].SetSelectedIndex(RO_PRICE_FIXED);
+                    } else if (it.value() == "Range") {
+                        mOptions[index].SetSelectedIndex(RO_PRICE_RANGE);
+                    } else if (it.value() == "Set By Wallet") {
+                        mOptions[index].SetSelectedIndex(RO_PRICE_SET_BY_WALLET);
                     }
                     break;
                 case RSK_SHUFFLE_SCRUBS:
                     if (it.value() == "Off") {
                         mOptions[index].SetSelectedIndex(RO_SCRUBS_OFF);
-                    } else if (it.value() == "Affordable") {
-                        mOptions[index].SetSelectedIndex(RO_SCRUBS_AFFORDABLE);
-                    } else if (it.value() == "Expensive") {
-                        mOptions[index].SetSelectedIndex(RO_SCRUBS_EXPENSIVE);
-                    } else if (it.value() == "Random Prices") {
-                        mOptions[index].SetSelectedIndex(RO_SCRUBS_RANDOM);
+                    } else if (it.value() == "Major Items Only") {
+                        mOptions[index].SetSelectedIndex(RO_SCRUBS_MAJOR_ONLY);
+                    } else if (it.value() == "All") {
+                        mOptions[index].SetSelectedIndex(RO_SCRUBS_ALL);
                     }
                     break;
                 case RSK_SHUFFLE_FISHING_POLE:
@@ -2377,7 +2714,6 @@ void Settings::ParseJson(nlohmann::json spoilerFileJson) {
                 case RSK_SHUFFLE_BEEHIVES:
                 case RSK_SHUFFLE_COWS:
                 case RSK_SHUFFLE_ADULT_TRADE:
-                case RSK_SHUFFLE_MAGIC_BEANS:
                 case RSK_SHUFFLE_KOKIRI_SWORD:
                 case RSK_SHUFFLE_WEIRD_EGG:
                 case RSK_SHUFFLE_FROG_SONG_RUPEES:
@@ -2386,6 +2722,7 @@ void Settings::ParseJson(nlohmann::json spoilerFileJson) {
                 case RSK_SHUFFLE_OCARINA_BUTTONS:
                 case RSK_SHUFFLE_SWIM:
                 case RSK_SHUFFLE_CHILD_WALLET:
+                case RSK_INCLUDE_TYCOON_WALLET:
                 case RSK_STARTING_DEKU_SHIELD:
                 case RSK_STARTING_KOKIRI_SWORD:
                 case RSK_STARTING_ZELDAS_LULLABY:
@@ -2432,6 +2769,7 @@ void Settings::ParseJson(nlohmann::json spoilerFileJson) {
                 case RSK_HBA_HINT:
                 case RSK_WARP_SONG_HINTS:
                 case RSK_SCRUB_TEXT_HINT:
+                case RSK_MERCHANT_TEXT_HINT:
                 case RSK_SHUFFLE_ENTRANCES:
                 case RSK_SHUFFLE_OVERWORLD_ENTRANCES:
                 case RSK_SHUFFLE_GROTTO_ENTRANCES:
@@ -2446,6 +2784,8 @@ void Settings::ParseJson(nlohmann::json spoilerFileJson) {
                 case RSK_MIX_GROTTO_ENTRANCES:
                 case RSK_DECOUPLED_ENTRANCES:
                 case RSK_SHOPSANITY_PRICES_AFFORDABLE:
+                case RSK_SCRUBS_PRICES_AFFORDABLE:
+                case RSK_MERCHANT_PRICES_AFFORDABLE:
                 case RSK_ALL_LOCATIONS_REACHABLE:
                 case RSK_TRIFORCE_HUNT:
                 case RSK_MQ_DUNGEON_SET:
@@ -2486,10 +2826,12 @@ void Settings::ParseJson(nlohmann::json spoilerFileJson) {
                 case RSK_SHUFFLE_MERCHANTS:
                     if (it.value() == "Off") {
                         mOptions[index].SetSelectedIndex(RO_SHUFFLE_MERCHANTS_OFF);
-                    } else if (it.value() == "On (No Hints)") {
-                        mOptions[index].SetSelectedIndex(RO_SHUFFLE_MERCHANTS_ON_NO_HINT);
-                    } else if (it.value() == "On (With Hints)") {
-                        mOptions[index].SetSelectedIndex(RO_SHUFFLE_MERCHANTS_ON_HINT);
+                    } else if (it.value() == "Beans Only") {
+                        mOptions[index].SetSelectedIndex(RO_SHUFFLE_MERCHANTS_BEANS_ONLY);
+                    } else if (it.value() == "All but Beans") {
+                        mOptions[index].SetSelectedIndex(RO_SHUFFLE_MERCHANTS_ALL_BUT_BEANS);
+                    } else if (it.value() == "All") {
+                        mOptions[index].SetSelectedIndex(RO_SHUFFLE_MERCHANTS_ALL);
                     }
                     break;
                 // Uses Ammo Drops option for now. "Off" not yet implemented
diff --git a/soh/soh/Enhancements/randomizer/settings.h b/soh/soh/Enhancements/randomizer/settings.h
index 07041c411..197d074bd 100644
--- a/soh/soh/Enhancements/randomizer/settings.h
+++ b/soh/soh/Enhancements/randomizer/settings.h
@@ -14,6 +14,11 @@ class Settings {
   public:
     Settings();
 
+    /**
+     * @brief Hides or Unhides the price UI of Shopsanity based on settings.
+     */
+    void HandleShopsanityPriceUI();
+
     /**
      * @brief Creates the `Option` and `OptionGroup` objects. This happens after construction because certain
      * other events in the codebase need to happen before all of the `Option`s can be created.
diff --git a/soh/soh/Enhancements/randomizer/static_data.cpp b/soh/soh/Enhancements/randomizer/static_data.cpp
index af8ee692d..773d9f209 100644
--- a/soh/soh/Enhancements/randomizer/static_data.cpp
+++ b/soh/soh/Enhancements/randomizer/static_data.cpp
@@ -11,7 +11,6 @@ std::unordered_map<uint32_t, CustomMessage> StaticData::hintTypeNames = {
     {HINT_TYPE_TRIAL, CustomMessage("Trial")},
     {HINT_TYPE_ENTRANCE, CustomMessage("Entrance")},
     {HINT_TYPE_ITEM_AREA, CustomMessage("Item Area")},
-    {HINT_TYPE_MERCHANT, CustomMessage("Merchant")},
     {HINT_TYPE_ALTAR_CHILD, CustomMessage("Child Altar")},
     {HINT_TYPE_ALTAR_ADULT, CustomMessage("Adult Altar")},
     {HINT_TYPE_WOTH,  CustomMessage("Way of the Hero")},
@@ -79,10 +78,6 @@ std::unordered_map<uint32_t, CustomMessage> StaticData::hintNames = {
     {RH_REQUIEM_WARP_LOC, CustomMessage("Requiem of Spirit Destination")},
     {RH_NOCTURNE_WARP_LOC, CustomMessage("Nocturne of Shadow Destination")},
     {RH_PRELUDE_WARP_LOC, CustomMessage("Prelude of Light Destination")},
-    {RH_MEDIGORON, CustomMessage("Medigoron Hint")},
-    {RH_CARPET_SALESMAN, CustomMessage("Carpet Salseman Hint")},
-    {RH_BEAN_SALESMAN, CustomMessage("Bean Salseman Hint")},
-    {RH_GRANNY, CustomMessage("Granny Hint")},
     {RH_HBA_HINT, CustomMessage("Horseback Archery Hint")},
     {RH_MALON_HINT, CustomMessage("Malon Hint")},
     {RH_CHICKENS_HINT, CustomMessage("Anju's Child Chickens Hint")},
@@ -194,18 +189,14 @@ std::unordered_map<uint32_t, RandomizerHintTextKey> StaticData::trialData = {
 std::unordered_map<RandomizerHint, StaticHintInfo> StaticData::staticHintInfoMap = {
   // RH_GANONDORF_HINT is special cased due to being different based on master sword shuffle
   // Altar hints are special cased due to special hint marking rules
-  // warp song hints are special cased due to entrances not being done properly yet
-  // Ganondorf Joke is special Cased as the text is random
+  // warp song hints are special cased due to entrences not being done properly yet
+  // Ganondorf Joke is special cased as the text is random
   {RH_SHEIK_HINT,          StaticHintInfo(HINT_TYPE_AREA,     {RHT_SHEIK_HINT_LA_ONLY},            RSK_SHEIK_LA_HINT,       true, {}, {RG_LIGHT_ARROWS},            {RC_SHEIK_HINT_GC, RC_SHEIK_HINT_MQ_GC}, true)},
   {RH_DAMPES_DIARY,        StaticHintInfo(HINT_TYPE_AREA,     {RHT_DAMPE_DIARY},                   RSK_DAMPES_DIARY_HINT,   true, {}, {RG_PROGRESSIVE_HOOKSHOT},    {RC_DAMPE_HINT})},
   {RH_GREG_RUPEE,          StaticHintInfo(HINT_TYPE_AREA,     {RHT_GREG_HINT},                     RSK_GREG_HINT,           true, {}, {RG_GREG_RUPEE},              {RC_GREG_HINT})},
   {RH_SARIA_HINT,          StaticHintInfo(HINT_TYPE_AREA,     {RHT_SARIA_TALK_HINT, RHT_SARIA_SONG_HINT}, RSK_SARIA_HINT,   true, {}, {RG_PROGRESSIVE_MAGIC_METER}, {RC_SARIA_SONG_HINT, RC_SONG_FROM_SARIA}, true)},
   {RH_LOACH_HINT,          StaticHintInfo(HINT_TYPE_ITEM,     {RHT_LOACH_HINT},                    RSK_LOACH_HINT,          true, {RC_LH_HYRULE_LOACH})},
   {RH_FISHING_POLE,        StaticHintInfo(HINT_TYPE_AREA,     {RHT_FISHING_POLE_HINT},             RSK_FISHING_POLE_HINT,   true, {}, {RG_FISHING_POLE},            {RC_FISHING_POLE_HINT}, true)},
-  {RH_MEDIGORON,           StaticHintInfo(HINT_TYPE_MERCHANT, {RHT_MEDIGORON_HINT},                RSK_SHUFFLE_MERCHANTS,   (uint8_t)RO_SHUFFLE_MERCHANTS_ON_HINT,  {RC_GC_MEDIGORON})},
-  {RH_GRANNY,              StaticHintInfo(HINT_TYPE_MERCHANT, {RHT_GRANNY_HINT},                   RSK_SHUFFLE_MERCHANTS,   (uint8_t)RO_SHUFFLE_MERCHANTS_ON_HINT,  {RC_KAK_GRANNYS_SHOP})},
-  {RH_CARPET_SALESMAN,     StaticHintInfo(HINT_TYPE_MERCHANT, {RHT_CARPET_SALESMAN_DIALOG_HINTED}, RSK_SHUFFLE_MERCHANTS,   (uint8_t)RO_SHUFFLE_MERCHANTS_ON_HINT,  {RC_WASTELAND_BOMBCHU_SALESMAN})},
-  {RH_BEAN_SALESMAN,       StaticHintInfo(HINT_TYPE_MERCHANT, {RHT_BEAN_SALESMAN_HINT},            RSK_SHUFFLE_MAGIC_BEANS, true,                                   {RC_ZR_MAGIC_BEAN_SALESMAN})},
   {RH_HBA_HINT,            StaticHintInfo(HINT_TYPE_ITEM,     {RHT_HBA_HINT_SIGN, RHT_HBA_HINT_NOT_ON_HORSE, RHT_HBA_HINT_INITIAL, RHT_HBA_HINT_HAVE_1000}, RSK_HBA_HINT, true, {RC_GF_HBA_1000_POINTS, RC_GF_HBA_1500_POINTS})},
   {RH_MALON_HINT,          StaticHintInfo(HINT_TYPE_ITEM,     {RHT_MALON_HINT_TURNING_EVIL, RHT_MALON_HINT_HOW_IS_EPONA, RHT_MALON_HINT_OBSTICLE_COURSE, RHT_MALON_HINT_INGO_TEMPTED}, RSK_MALON_HINT, true, {RC_KF_LINKS_HOUSE_COW})},
   {RH_BIG_POES_HINT,       StaticHintInfo(HINT_TYPE_ITEM,     {RHT_BIG_POES_HINT},                 RSK_BIG_POES_HINT,       true, {RC_MARKET_10_BIG_POES})},
diff --git a/soh/soh/Enhancements/randomizer/static_data.h b/soh/soh/Enhancements/randomizer/static_data.h
index 8232f93b5..78ec5e118 100644
--- a/soh/soh/Enhancements/randomizer/static_data.h
+++ b/soh/soh/Enhancements/randomizer/static_data.h
@@ -40,6 +40,7 @@ class StaticData {
       static std::vector<RandomizerCheck> dungeonRewardLocations;
       static std::vector<RandomizerCheck> GetShopLocations();
       static std::vector<RandomizerCheck> GetScrubLocations();
+      static std::vector<RandomizerCheck> GetMerchantLocations();
       static std::vector<RandomizerCheck> GetAdultTradeLocations();
       static std::vector<RandomizerCheck> GetGossipStoneLocations();
       static std::vector<RandomizerCheck> GetStaticHintLocations();
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
index f99152f16..32b035f82 100644
--- a/soh/soh/OTRGlobals.cpp
+++ b/soh/soh/OTRGlobals.cpp
@@ -2516,6 +2516,8 @@ extern "C" int CustomMessage_RetrieveIfExists(PlayState* play) {
     s16 actorParams = 0;
     if (IS_RANDO) {
         auto ctx = Rando::Context::GetInstance();
+        bool nonBeanMerchants = ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ALL_BUT_BEANS) || 
+                                 ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ALL);
         Player* player = GET_PLAYER(play);
         if (textId == TEXT_RANDOMIZER_CUSTOM_ITEM) {
             if (player->getItemEntry.getItemId == RG_ICE_TRAP) {
@@ -2602,21 +2604,20 @@ extern "C" int CustomMessage_RetrieveIfExists(PlayState* play) {
             }
         } else if (textId == TEXT_SHEIK_NEED_HOOK || textId == TEXT_SHEIK_HAVE_HOOK) {
             messageEntry = OTRGlobals::Instance->gRandomizer->GetSheikMessage(gPlayState->sceneNum, textId);            
-        // textId: TEXT_SCRUB_RANDOM + (randomizerInf - RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT)
-        } else if (textId == TEXT_SCRUB_RANDOM) {
-            EnDns* enDns = (EnDns*)GET_PLAYER(play)->targetActor;
-            messageEntry = OTRGlobals::Instance->gRandomizer->GetMerchantMessage(enDns->sohScrubIdentity.randomizerInf, TEXT_SCRUB_RANDOM, Randomizer_GetSettingValue(RSK_SCRUB_TEXT_HINT) == RO_GENERIC_OFF);
         // Shop items each have two message entries, second one offset by NUM_SHOP_ITEMS
         // textId: TEXT_SHOP_ITEM_RANDOM + (randomizerInf - RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_1)
         // textId: TEXT_SHOP_ITEM_RANDOM + ((randomizerInf - RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_1) + NUM_SHOP_ITEMS)
-        } else if (textId >= TEXT_SHOP_ITEM_RANDOM && textId <= TEXT_SHOP_ITEM_RANDOM + (NUM_SHOP_ITEMS * 2)) {
-            if (textId < TEXT_SHOP_ITEM_RANDOM + NUM_SHOP_ITEMS) {
-                RandomizerInf randoInf = (RandomizerInf)((textId - TEXT_SHOP_ITEM_RANDOM) + RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_1);
-                messageEntry = OTRGlobals::Instance->gRandomizer->GetMerchantMessage(randoInf, TEXT_SHOP_ITEM_RANDOM);
-            } else {
-                RandomizerInf randoInf = (RandomizerInf)((textId - (TEXT_SHOP_ITEM_RANDOM + NUM_SHOP_ITEMS)) + RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_1);
-                messageEntry = OTRGlobals::Instance->gRandomizer->GetMerchantMessage(randoInf, TEXT_SHOP_ITEM_RANDOM_CONFIRM);
-            }
+        } else if (textId >= TEXT_SHOP_ITEM_RANDOM && textId < TEXT_SHOP_ITEM_RANDOM_CONFIRM) {
+            RandomizerCheck rc = OTRGlobals::Instance->gRandomizer->GetCheckFromRandomizerInf((RandomizerInf)((textId - TEXT_SHOP_ITEM_RANDOM) + RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_1));
+            messageEntry = OTRGlobals::Instance->gRandomizer->GetMerchantMessage(rc, TEXT_SHOP_ITEM_RANDOM);
+        } else if (textId >= TEXT_SHOP_ITEM_RANDOM_CONFIRM && textId <= TEXT_SHOP_ITEM_RANDOM_CONFIRM_END){
+            RandomizerCheck rc = OTRGlobals::Instance->gRandomizer->GetCheckFromRandomizerInf((RandomizerInf)((textId - TEXT_SHOP_ITEM_RANDOM_CONFIRM) + RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_1));
+            messageEntry = OTRGlobals::Instance->gRandomizer->GetMerchantMessage(rc, TEXT_SHOP_ITEM_RANDOM_CONFIRM);
+        // textId: TEXT_SCRUB_RANDOM + (randomizerInf - RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT)
+        } else if (textId == TEXT_SCRUB_RANDOM) {
+            EnDns* enDns = (EnDns*)GET_PLAYER(play)->targetActor;
+            RandomizerCheck rc = OTRGlobals::Instance->gRandomizer->GetCheckFromRandomizerInf((RandomizerInf)enDns->sohScrubIdentity.randomizerInf);
+            messageEntry = OTRGlobals::Instance->gRandomizer->GetMerchantMessage(rc, TEXT_SCRUB_RANDOM, TEXT_SCRUB_RANDOM_FREE, Randomizer_GetSettingValue(RSK_SCRUB_TEXT_HINT) == RO_GENERIC_OFF);
         } else if (CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("RandomizeRupeeNames"), 1) &&
                    (textId == TEXT_BLUE_RUPEE || textId == TEXT_RED_RUPEE || textId == TEXT_PURPLE_RUPEE ||
                    textId == TEXT_HUGE_RUPEE)) {
@@ -2624,27 +2625,32 @@ extern "C" int CustomMessage_RetrieveIfExists(PlayState* play) {
             // In rando, replace Navi's general overworld hints with rando-related gameplay tips
         } else if (CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("RandoRelevantNavi"), 1) && textId >= TEXT_NAVI_DEKU_TREE_SUMMONS && textId <= TEXT_NAVI_TRY_TO_KEEP_MOVING) {
             u16 naviTextId = Random(0, NUM_NAVI_MESSAGES);
-            messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::NaviRandoMessageTableID, naviTextId);
+            messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::NaviRandoMessageTableID, naviTextId, MF_FORMATTED);
         } 
-        else if (textId == TEXT_BEAN_SALESMAN_BUY_FOR_10 && ctx->GetOption(RSK_SHUFFLE_MAGIC_BEANS)) {
-            messageEntry = ctx->GetHint(RH_BEAN_SALESMAN)->GetHintMessage(MF_AUTO_FORMAT);
+        else if (textId == TEXT_BEAN_SALESMAN_BUY_FOR_10 && 
+                 (ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_BEANS_ONLY) || 
+                  ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ALL))) {
+            messageEntry = OTRGlobals::Instance->gRandomizer->GetMerchantMessage(RC_ZR_MAGIC_BEAN_SALESMAN, TEXT_BEAN_SALESMAN_BUY_FOR_10, TEXT_NONE, Randomizer_GetSettingValue(RSK_MERCHANT_TEXT_HINT) == RO_GENERIC_OFF);
         } 
         else if (textId == TEXT_BEAN_SALESMAN_BUY_FOR_100) {
             messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::merchantMessageTableID, TEXT_BEAN_SALESMAN_BUY_FOR_100);
         } 
-        else if (textId == TEXT_GRANNYS_SHOP && !Flags_GetRandomizerInf(RAND_INF_MERCHANTS_GRANNYS_SHOP) && Randomizer_GetSettingValue(RSK_SHUFFLE_MERCHANTS) != RO_SHUFFLE_MERCHANTS_OFF &&
+        else if (textId == TEXT_GRANNYS_SHOP && !Flags_GetRandomizerInf(RAND_INF_MERCHANTS_GRANNYS_SHOP) && nonBeanMerchants &&
             (ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) || INV_CONTENT(ITEM_CLAIM_CHECK) == ITEM_CLAIM_CHECK)){
-            messageEntry = messageEntry = ctx->GetHint(RH_GRANNY)->GetHintMessage(MF_AUTO_FORMAT);
+            messageEntry = OTRGlobals::Instance->gRandomizer->GetMerchantMessage(RC_KAK_GRANNYS_SHOP, TEXT_GRANNYS_SHOP, TEXT_NONE, Randomizer_GetSettingValue(RSK_MERCHANT_TEXT_HINT) == RO_GENERIC_OFF);
         } 
-        else if (textId == TEXT_MEDIGORON && Randomizer_GetSettingValue(RSK_SHUFFLE_MERCHANTS) != RO_SHUFFLE_MERCHANTS_OFF){
-            messageEntry = messageEntry = ctx->GetHint(RH_MEDIGORON)->GetHintMessage(MF_AUTO_FORMAT);
+        else if (textId == TEXT_MEDIGORON && nonBeanMerchants){
+            messageEntry = OTRGlobals::Instance->gRandomizer->GetMerchantMessage(RC_GC_MEDIGORON, TEXT_MEDIGORON, TEXT_NONE, Randomizer_GetSettingValue(RSK_MERCHANT_TEXT_HINT) == RO_GENERIC_OFF);
         } 
-        else if (textId == TEXT_CARPET_SALESMAN_1 && !Flags_GetRandomizerInf(RAND_INF_MERCHANTS_CARPET_SALESMAN) && Randomizer_GetSettingValue(RSK_SHUFFLE_MERCHANTS) != RO_SHUFFLE_MERCHANTS_OFF){
-            messageEntry = ctx->GetHint(RH_CARPET_SALESMAN)->GetHintMessage(MF_AUTO_FORMAT);
+        else if (textId == TEXT_CARPET_SALESMAN_1 && !Flags_GetRandomizerInf(RAND_INF_MERCHANTS_CARPET_SALESMAN) && nonBeanMerchants){
+            if (Randomizer_GetSettingValue(RSK_MERCHANT_TEXT_HINT)){
+                messageEntry = OTRGlobals::Instance->gRandomizer->GetMerchantMessage(RC_WASTELAND_BOMBCHU_SALESMAN, TEXT_CARPET_SALESMAN_1, TEXT_NONE, Randomizer_GetSettingValue(RSK_MERCHANT_TEXT_HINT) == RO_GENERIC_OFF);
+            } else {
+                messageEntry = OTRGlobals::Instance->gRandomizer->GetMerchantMessage(RC_WASTELAND_BOMBCHU_SALESMAN, TEXT_CARPET_SALESMAN_MYSTERIOUS, TEXT_NONE, Randomizer_GetSettingValue(RSK_MERCHANT_TEXT_HINT) == RO_GENERIC_OFF);
+            }
         } 
-        else if (textId == TEXT_CARPET_SALESMAN_2 && !Flags_GetRandomizerInf(RAND_INF_MERCHANTS_CARPET_SALESMAN) && Randomizer_GetSettingValue(RSK_SHUFFLE_MERCHANTS) != RO_SHUFFLE_MERCHANTS_OFF){
-            messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::merchantMessageTableID, textId);
-            Flags_SetRandomizerInf(RAND_INF_MERCHANTS_CARPET_SALESMAN);//set here so we can actually check if the text is run, not a good solution
+        else if (textId == TEXT_CARPET_SALESMAN_ARMS_DEALER){
+            messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::merchantMessageTableID, textId, MF_AUTO_FORMAT);
         } else if (textId == TEXT_SKULLTULA_PEOPLE_IM_CURSED) {
             actorParams = GET_PLAYER(play)->targetActor->params;
             if (actorParams == 1 && ctx->GetOption(RSK_KAK_10_SKULLS_HINT)){
@@ -2688,10 +2694,10 @@ extern "C" int CustomMessage_RetrieveIfExists(PlayState* play) {
             messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::hintMessageTableID, TEXT_WARP_MINUET_OF_FOREST);
         }
         else if (textId == TEXT_LAKE_HYLIA_WATER_SWITCH_NAVI || textId == TEXT_LAKE_HYLIA_WATER_SWITCH_SIGN) {
-            messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::hintMessageTableID, textId);
+            messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::hintMessageTableID, textId, MF_AUTO_FORMAT);
         }
         else if (textId == TEXT_SHOOTING_GALLERY_MAN_COME_BACK_WITH_BOW) {
-            messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::hintMessageTableID, TEXT_SHOOTING_GALLERY_MAN_COME_BACK_WITH_BOW);
+            messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::hintMessageTableID, TEXT_SHOOTING_GALLERY_MAN_COME_BACK_WITH_BOW, MF_AUTO_FORMAT);
         }
         else if (textId == TEXT_FIRE_TEMPLE_GORON_OWE_YOU_BIG_TIME || (textId >= TEXT_FIRE_TEMPLE_GORON_FALLING_DOORS_SECRET && textId <= TEXT_FIRE_TEMPLE_GORON_SOUNDS_DIFFERENT_SECRET)) {
             u16 choice = Random(0, NUM_GORON_MESSAGES);
@@ -2762,7 +2768,7 @@ extern "C" int CustomMessage_RetrieveIfExists(PlayState* play) {
             messageEntry = ctx->GetHint(RH_HBA_HINT)->GetHintMessage(MF_AUTO_FORMAT, 3);
         } 
         else if (textId == TEXT_CARPET_SALESMAN_CUSTOM_FAIL_TO_BUY){
-            messageEntry = CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, textId);
+            messageEntry = CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, textId, MF_AUTO_FORMAT);
         }
         else if (textId == TEXT_MASK_SHOP_SIGN && ctx->GetOption(RSK_MASK_SHOP_HINT)) {
             messageEntry = ctx->GetHint(RH_MASK_SHOP_HINT)->GetHintMessage(MF_AUTO_FORMAT);
@@ -2786,23 +2792,23 @@ extern "C" int CustomMessage_RetrieveIfExists(PlayState* play) {
             // In vanilla, GS token count is incremented prior to the text box displaying
             // In rando we need to bump the token count by one to show the correct count
             s16 gsCount = gSaveContext.inventory.gsTokens + (IS_RANDO ? 1 : 0);
-            messageEntry = CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, textId);
+            messageEntry = CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, textId, MF_FORMATTED);
             messageEntry.Replace("[[gsCount]]", std::to_string(gsCount));
         } 
     } else if ((IS_RANDO || CVarGetInteger(CVAR_ENHANCEMENT("BetterBombchuShopping"), 0)) &&
                 (textId == TEXT_BUY_BOMBCHUS_10_DESC || textId == TEXT_BUY_BOMBCHUS_10_PROMPT)) {
-            messageEntry = CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, textId);
+            messageEntry = CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, textId, MF_FORMATTED);
     } else if (textId == TEXT_HEART_CONTAINER && CVarGetInteger(CVAR_ENHANCEMENT("InjectItemCounts"), 0)) {
-        messageEntry = CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, TEXT_HEART_CONTAINER);
+        messageEntry = CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, TEXT_HEART_CONTAINER, MF_FORMATTED);
         messageEntry.Replace("[[heartContainerCount]]", std::to_string(gSaveContext.sohStats.heartContainers + 1));
     } else if (textId == TEXT_HEART_PIECE && CVarGetInteger(CVAR_ENHANCEMENT("InjectItemCounts"), 0)) {
-        messageEntry = CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, TEXT_HEART_PIECE);
+        messageEntry = CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, TEXT_HEART_PIECE, MF_FORMATTED);
         messageEntry.Replace("[[heartPieceCount]]", std::to_string(gSaveContext.sohStats.heartPieces + 1));
     } else if (textId == TEXT_MARKET_GUARD_NIGHT && CVarGetInteger(CVAR_ENHANCEMENT("MarketSneak"), 0) && play->sceneNum == SCENE_MARKET_ENTRANCE_NIGHT) {
-        messageEntry = CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, TEXT_MARKET_GUARD_NIGHT);
+        messageEntry = CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, TEXT_MARKET_GUARD_NIGHT, MF_FORMATTED);
     }
     if (textId == TEXT_FISHERMAN_LEAVE && CVarGetInteger(CVAR_ENHANCEMENT("QuitFishingAtDoor"), 0)) {
-        messageEntry = CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, TEXT_FISHERMAN_LEAVE);
+        messageEntry = CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, TEXT_FISHERMAN_LEAVE, MF_FORMATTED);
     }
     font->charTexBuf[0] = (messageEntry.GetTextBoxType() << 4) | messageEntry.GetTextBoxPosition();
     switch (gSaveContext.language) {
diff --git a/soh/soh/z_message_OTR.cpp b/soh/soh/z_message_OTR.cpp
index b695de579..215975662 100644
--- a/soh/soh/z_message_OTR.cpp
+++ b/soh/soh/z_message_OTR.cpp
@@ -189,8 +189,6 @@ extern "C" void OTRMessage_Init()
                       "Holà! Holà!&Les cannes ne sortent pas d'ici!&Je suis sérieux!^Voulez-vous arrêter?&\x1B&%gOui&Non%w")); //TODO Used AI translation as placeholder
     CustomMessageManager::Instance->CreateMessage(
         customMessageTableID, TEXT_CARPET_SALESMAN_CUSTOM_FAIL_TO_BUY,
-        CustomMessage("I'm sorry I can't sell you&these fine specimens,&they need an %rexperienced owner%w.^"
-                      "Come back when you have&had %gBombchus%w of your own.",
-                      "",
-                      ""));
+        CustomMessage("I'm sorry I can't sell you these fine specimens, they need an #experienced owner#.^"
+                      "Come back when you have had #Bombchus# of your own.", {QM_RED, QM_GREEN}));
 }
diff --git a/soh/src/overlays/actors/ovl_En_Ds/z_en_ds.c b/soh/src/overlays/actors/ovl_En_Ds/z_en_ds.c
index 7e3f97856..09d312318 100644
--- a/soh/src/overlays/actors/ovl_En_Ds/z_en_ds.c
+++ b/soh/src/overlays/actors/ovl_En_Ds/z_en_ds.c
@@ -164,7 +164,7 @@ void EnDs_OfferOddPotion(EnDs* this, PlayState* play) {
 }
 
 s32 EnDs_CheckRupeesAndBottle() {
-    if (gSaveContext.rupees < 100) {
+    if (GameInteractor_Should(VB_GRANNY_SAY_INSUFFICIENT_RUPEES, gSaveContext.rupees < 100, NULL)) {
         return 0;
     } else if (GameInteractor_Should(VB_NEED_BOTTLE_FOR_GRANNYS_ITEM, Inventory_HasEmptyBottle() == 0, NULL)) {
         return 1;
@@ -174,7 +174,7 @@ s32 EnDs_CheckRupeesAndBottle() {
 }
 
 void EnDs_GiveBluePotion(EnDs* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_FROM_GRANNYS_SHOP, true, this)) {
+    if (Actor_HasParent(&this->actor, play)) {
         this->actor.parent = NULL;
         this->actionFunc = EnDs_Talk;
     } else {
@@ -195,7 +195,9 @@ void EnDs_OfferBluePotion(EnDs* this, PlayState* play) {
                         this->actionFunc = EnDs_TalkNoEmptyBottle;
                         return;
                     case 2: // have 100 rupees and empty bottle
-                        Rupees_ChangeBy(-100);
+                        if(GameInteractor_Should(VB_GRANNY_TAKE_MONEY, true, this)){
+                            Rupees_ChangeBy(-100);
+                        }
                         this->actor.flags &= ~ACTOR_FLAG_WILL_TALK;
 
                         if (GameInteractor_Should(VB_GIVE_ITEM_FROM_GRANNYS_SHOP, true, this)) {
@@ -203,9 +205,9 @@ void EnDs_OfferBluePotion(EnDs* this, PlayState* play) {
                             Actor_OfferGetItem(&this->actor, play, GI_POTION_BLUE, 10000.0f, 50.0f);
                             gSaveContext.pendingSale = itemEntry.itemId;
                             gSaveContext.pendingSaleMod = itemEntry.modIndex;
+                            this->actionFunc = EnDs_GiveBluePotion;
                         }
-
-                        this->actionFunc = EnDs_GiveBluePotion;
+                        
                         return;
                 }
                 break;
diff --git a/soh/src/overlays/actors/ovl_En_Ds/z_en_ds.h b/soh/src/overlays/actors/ovl_En_Ds/z_en_ds.h
index fb3c62aa2..c1f807dfb 100644
--- a/soh/src/overlays/actors/ovl_En_Ds/z_en_ds.h
+++ b/soh/src/overlays/actors/ovl_En_Ds/z_en_ds.h
@@ -21,4 +21,8 @@ typedef struct EnDs {
     /* 0x01EC */ EnDsActionFunc actionFunc;
 } EnDs; // size = 0x01F0
 
+void EnDs_Talk(EnDs* actor, PlayState* play);
+void EnDs_TalkAfterGiveOddPotion(EnDs* actor, PlayState* play);
+
+
 #endif
diff --git a/soh/src/overlays/actors/ovl_En_Gm/z_en_gm.c b/soh/src/overlays/actors/ovl_En_Gm/z_en_gm.c
index 2a54cf979..af1f26f19 100644
--- a/soh/src/overlays/actors/ovl_En_Gm/z_en_gm.c
+++ b/soh/src/overlays/actors/ovl_En_Gm/z_en_gm.c
@@ -245,15 +245,15 @@ void EnGm_ProcessChoiceIndex(EnGm* this, PlayState* play) {
     if (Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE && Message_ShouldAdvance(play)) {
         switch (play->msgCtx.choiceIndex) {
             case 0: // yes
-                if (gSaveContext.rupees < 200) {
+                if (GameInteractor_Should(VB_CHECK_RANDO_PRICE_OF_MEDIGORON, gSaveContext.rupees < 200, this)) {
                     Message_ContinueTextbox(play, 0xC8);
                     this->actionFunc = func_80A3DD7C;
                 } else {
                     if (GameInteractor_Should(VB_GIVE_ITEM_FROM_MEDIGORON, true, this)) {
                         Actor_OfferGetItem(&this->actor, play, GI_SWORD_KNIFE, 415.0f, 10.0f);
+                        this->actionFunc = func_80A3DF00;
                     }
-
-                    this->actionFunc = func_80A3DF00;
+                    
                 }
                 break;
             case 1: // no
@@ -265,8 +265,7 @@ void EnGm_ProcessChoiceIndex(EnGm* this, PlayState* play) {
 }
 
 void func_80A3DF00(EnGm* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_FROM_MEDIGORON, true, this)) {
-        Flags_SetRandomizerInf(RAND_INF_MERCHANTS_MEDIGORON);
+    if (Actor_HasParent(&this->actor, play)) {
         this->actor.parent = NULL;
         this->actionFunc = func_80A3DF60;
     } else {
diff --git a/soh/src/overlays/actors/ovl_En_Gm/z_en_gm.h b/soh/src/overlays/actors/ovl_En_Gm/z_en_gm.h
index 3652fc43a..f3f623ea0 100644
--- a/soh/src/overlays/actors/ovl_En_Gm/z_en_gm.h
+++ b/soh/src/overlays/actors/ovl_En_Gm/z_en_gm.h
@@ -24,4 +24,6 @@ typedef struct EnGm {
     /* 0x02C4 */ Vec3f talkPos;
 } EnGm; // size = 0x02D0
 
+void func_80A3DC44(EnGm* actor, PlayState* play);
+
 #endif
diff --git a/soh/src/overlays/actors/ovl_En_Js/z_en_js.c b/soh/src/overlays/actors/ovl_En_Js/z_en_js.c
index a12dfec5e..ef6646bbd 100644
--- a/soh/src/overlays/actors/ovl_En_Js/z_en_js.c
+++ b/soh/src/overlays/actors/ovl_En_Js/z_en_js.c
@@ -128,11 +128,9 @@ void func_80A8910C(EnJs* this, PlayState* play) {
 }
 
 void func_80A89160(EnJs* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_FROM_CARPET_SALESMAN, true, this)) {
+    if (Actor_HasParent(&this->actor, play)) {
         this->actor.parent = NULL;
         En_Js_SetupAction(this, func_80A8910C);
-        // Moved into the text handling to patch a text bug, not a great solution though
-        // Flags_SetRandomizerInf(RAND_INF_MERCHANTS_CARPET_SALESMAN);
     } else {
         GetItemEntry itemEntry = ItemTable_Retrieve(GI_BOMBCHUS_10);
         gSaveContext.pendingSale = itemEntry.itemId;
@@ -145,17 +143,18 @@ void func_80A891C4(EnJs* this, PlayState* play) {
     if (Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE && Message_ShouldAdvance(play)) {
         switch (play->msgCtx.choiceIndex) {
             case 0: // yes
-                if (gSaveContext.rupees < 200) {
+                if (GameInteractor_Should(VB_CHECK_RANDO_PRICE_OF_CARPET_SALESMAN, gSaveContext.rupees < 200, this)) {
                     Message_ContinueTextbox(play, 0x6075);
                     func_80A89008(this);
                 } else {
-                    if (GameInteractor_Should(VB_GIVE_BOMBCHUS_FROM_CARPET_SALESMAN, true, this) || 
-                       (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_FROM_CARPET_SALESMAN, true, this))){
-                        Rupees_ChangeBy(-200);
-                        En_Js_SetupAction(this, func_80A89160);
-                    } else{
-                        Message_ContinueTextbox(play, 0x6073);
-                        func_80A89008(this);
+                    if (!GameInteractor_Should(VB_GIVE_ITEM_FROM_CARPET_SALESMAN, false, this)) {
+                        if (GameInteractor_Should(VB_GIVE_BOMBCHUS_FROM_CARPET_SALESMAN, true, this) || Actor_HasParent(&this->actor, play)){
+                            Rupees_ChangeBy(-200);
+                            En_Js_SetupAction(this, func_80A89160);
+                        } else{
+                            Message_ContinueTextbox(play, 0x6073);
+                            func_80A89008(this);
+                        }
                     }
                 }
                 break;
diff --git a/soh/src/overlays/actors/ovl_En_Js/z_en_js.h b/soh/src/overlays/actors/ovl_En_Js/z_en_js.h
index d496bb4c3..e5dcbd610 100644
--- a/soh/src/overlays/actors/ovl_En_Js/z_en_js.h
+++ b/soh/src/overlays/actors/ovl_En_Js/z_en_js.h
@@ -22,4 +22,6 @@ typedef struct EnJs {
     /* 0x028C */ EnJsActionFunc actionFunc;
 } EnJs; // size = 0x0290
 
+void func_80A890C0(EnJs* actor, PlayState* play);
+
 #endif

From 4ac800f71640e1588fbf0f85e84756cc9e3458d4 Mon Sep 17 00:00:00 2001
From: Malkierian <malkierian@gmail.com>
Date: Tue, 8 Oct 2024 15:19:49 -0700
Subject: [PATCH 228/230] Upgrade GitHub actions using deprecated Node version
 (#4371) (#4388)

* Upgrade Ccache action to v1.2.14

* Upgrade Ccache action to v1.2.14

* Upgrade GitHub checkout action to v4

* Upgrade another cache action

Co-authored-by: Jordan Longstaff <JordanLongstaff@users.noreply.github.com>
---
 .github/workflows/generate-builds.yml        | 18 +++++++++---------
 .github/workflows/test-builds-on-distros.yml |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/generate-builds.yml b/.github/workflows/generate-builds.yml
index ec0676de8..29cd94c8a 100644
--- a/.github/workflows/generate-builds.yml
+++ b/.github/workflows/generate-builds.yml
@@ -9,11 +9,11 @@ jobs:
   generate-soh-otr:
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: ccache
-      uses: hendrikmuhs/ccache-action@v1.2.11
+      uses: hendrikmuhs/ccache-action@v1.2.14
       with:
         key: ${{ runner.os }}-otr-ccache-${{ github.ref }}-${{ github.sha }}
         restore-keys: |
@@ -73,11 +73,11 @@ jobs:
     needs: generate-soh-otr
     runs-on: macos-14
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: ccache
-      uses: hendrikmuhs/ccache-action@v1.2.13
+      uses: hendrikmuhs/ccache-action@v1.2.14
       with:
         create-symlink: true
         key: ${{ runner.os }}-14-ccache-${{ github.ref }}-${{ github.sha }}
@@ -91,7 +91,7 @@ jobs:
         sudo chmod +x /opt/homebrew/bin/gtar
     - name: Cache MacPorts
       id: cache-macports
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: /opt/local/
         key: ${{ runner.os }}-14-macports-${{ hashFiles('.github/workflows/macports-deps.txt') }}
@@ -135,7 +135,7 @@ jobs:
     needs: generate-soh-otr
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: Install dependencies
@@ -143,7 +143,7 @@ jobs:
         sudo apt-get update
         sudo apt-get install -y $(cat .github/workflows/apt-deps.txt)
     - name: ccache
-      uses: hendrikmuhs/ccache-action@v1.2.11
+      uses: hendrikmuhs/ccache-action@v1.2.14
       with:
         key: linux-ccache-${{ github.ref }}-${{ github.sha }}
         restore-keys: |
@@ -229,11 +229,11 @@ jobs:
       run: |
         choco install ninja
         Remove-Item -Path "C:\ProgramData\Chocolatey\bin\ccache.exe" -Force -ErrorAction SilentlyContinue
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: ccache
-      uses: hendrikmuhs/ccache-action@v1.2.11
+      uses: hendrikmuhs/ccache-action@v1.2.14
       with:
         variant: sccache
         max-size: "1G"
diff --git a/.github/workflows/test-builds-on-distros.yml b/.github/workflows/test-builds-on-distros.yml
index e2029be78..476bdf2f3 100644
--- a/.github/workflows/test-builds-on-distros.yml
+++ b/.github/workflows/test-builds-on-distros.yml
@@ -59,7 +59,7 @@ jobs:
         cmake ..
         make
         sudo make install
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: Build SoH

From 9df3c41d8acc965afeac31d6ca1c3f779df23164 Mon Sep 17 00:00:00 2001
From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Date: Wed, 9 Oct 2024 04:20:00 +0100
Subject: [PATCH 229/230] Add support for multiple areas in regions and
 locations and remove Impa's house shuffle limits (#4385)

* Add support for multiple areas in regions and locations and remove impa's house shuffle limits

* Spelling corrections

---------

Co-authored-by: Malkierian <malkierian@gmail.com>
Co-authored-by: Malkierian <malkierian@live.com>
---
 .../Enhancements/randomizer/3drando/fill.cpp  | 102 +++++++++++-------
 .../randomizer/3drando/hint_list.cpp          |   2 +
 .../Enhancements/randomizer/3drando/hints.cpp |  81 ++++++++------
 .../randomizer/3drando/location_access.cpp    |  26 ++---
 .../randomizer/3drando/location_access.hpp    |  13 +--
 .../locacc_bottom_of_the_well.cpp             |   8 +-
 .../location_access/locacc_castle_town.cpp    |  52 ++++-----
 .../location_access/locacc_death_mountain.cpp |  46 ++++----
 .../location_access/locacc_deku_tree.cpp      |  48 ++++-----
 .../locacc_dodongos_cavern.cpp                |  94 ++++++++--------
 .../location_access/locacc_fire_temple.cpp    |  90 ++++++++--------
 .../location_access/locacc_forest_temple.cpp  |  85 ++++++++-------
 .../location_access/locacc_ganons_castle.cpp  |  36 +++----
 .../locacc_gerudo_training_grounds.cpp        |  34 +++---
 .../location_access/locacc_gerudo_valley.cpp  |  38 +++----
 .../location_access/locacc_hyrule_field.cpp   |  42 ++++----
 .../location_access/locacc_ice_cavern.cpp     |  14 +--
 .../locacc_jabujabus_belly.cpp                |  50 ++++-----
 .../location_access/locacc_kakariko.cpp       |  73 ++++++-------
 .../location_access/locacc_lost_woods.cpp     |  44 ++++----
 .../location_access/locacc_shadow_temple.cpp  |  34 +++---
 .../location_access/locacc_spirit_temple.cpp  |  45 ++++----
 .../location_access/locacc_water_temple.cpp   |  73 +++++++------
 .../location_access/locacc_zoras_domain.cpp   |  24 ++---
 .../randomizer/3drando/random.hpp             |  14 +++
 soh/soh/Enhancements/randomizer/entrance.cpp  |  73 ++-----------
 soh/soh/Enhancements/randomizer/entrance.h    |  10 +-
 soh/soh/Enhancements/randomizer/hint.cpp      |   5 +-
 .../Enhancements/randomizer/item_location.cpp |  14 ++-
 .../Enhancements/randomizer/item_location.h   |   6 +-
 .../Enhancements/randomizer/randomizerTypes.h |   2 +-
 .../Enhancements/randomizer/static_data.cpp   |   2 +-
 32 files changed, 642 insertions(+), 638 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/fill.cpp b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
index 4d055f1b1..ff128a139 100644
--- a/soh/soh/Enhancements/randomizer/3drando/fill.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
@@ -16,6 +16,7 @@
 
 #include <vector>
 #include <list>
+#include <set>
 #include <spdlog/spdlog.h>
 
 using namespace CustomMessages;
@@ -610,38 +611,50 @@ void ValidateEntrances(bool checkPoeCollectorAccess, bool checkOtherEntranceAcce
   }
 }
 
-RandomizerArea LookForExternalArea(const Region* const currentRegion, std::vector<RandomizerRegion> &alreadyChecked){
+void LookForExternalArea(Region* currentRegion, std::set<Region*> &alreadyChecked, std::set<RandomizerArea> &areas, bool LowPriorityMode=false){
   for (const auto& entrance : currentRegion->entrances) {
-    RandomizerArea otherArea = entrance->GetParentRegion()->GetArea();
-    const bool isAreaUnchecked = std::find(alreadyChecked.begin(), alreadyChecked.end(), entrance->GetParentRegionKey()) == alreadyChecked.end();
-    if (otherArea == RA_NONE && isAreaUnchecked) {
-      //if the region is in RA_NONE and hasn't already been checked, check it
-      alreadyChecked.push_back(entrance->GetParentRegionKey());
-      const RandomizerArea passdown = LookForExternalArea(entrance->GetParentRegion(), alreadyChecked);
-      if(passdown != RA_NONE){
-        return passdown;
+    //if this entrance does not pass areas, only process it if we are in low priority mode
+    if (LowPriorityMode || entrance->DoesSpreadAreas()){
+      std::set<RandomizerArea> otherAreas = entrance->GetParentRegion()->GetAllAreas();
+      //if the region is arealess and hasn't already been checked, recursivly check what connects to it
+      if (otherAreas.size() == 0 && !alreadyChecked.contains(currentRegion)) {
+        alreadyChecked.insert(entrance->GetParentRegion());
+        LookForExternalArea(entrance->GetParentRegion(), alreadyChecked, areas, LowPriorityMode);
+      //if we find an area and it's not links pocket, we should try and add it.
+      //If it's Links Pocket or RA_NONE, do not propagate those, they are not real areas.
+      //This check is likely to fail if a region somehow is both in Link's Pocket and elsewhere, but this should never happen
+      } else if (*otherAreas.begin() > RA_LINKS_POCKET){
+        areas.merge(otherAreas);
       }
-    } else if (otherArea != RA_LINKS_POCKET){ //if it's links pocket, do not propagate this, Link's Pocket is not a real Area
-      return otherArea;
     }
   }
-  return RA_NONE;
 }
 
 void SetAreas(){
   auto ctx = Rando::Context::GetInstance();
-//RANDOTODO give entrances an enum like RandomizerCheck, the give them all areas here, the use those areas to not need to recursivly find ItemLocation areas
+//RANDOTODO give entrances an enum like RandomizerCheck, the give them all areas here,
+//then use those areas to not need to recursivly find ItemLocation areas when an identifying entrance's area
   for (int regionType = 0; regionType < RR_MARKER_AREAS_END; regionType++) {
     Region region = areaTable[regionType];
-    RandomizerArea area = region.GetArea();
-    if (area == RA_NONE) {
-      std::vector<RandomizerRegion> alreadyChecked = {static_cast<RandomizerRegion>(regionType)};
-      area = LookForExternalArea(&region, alreadyChecked);
+    std::set<RandomizerArea> areas = region.GetAllAreas();
+    std::set<Region*> regionsToSet = {&region};
+    if (areas.empty()) {
+      LookForExternalArea(&region, regionsToSet, areas);
+      //If we found nothing, try again in low priority mode to try every entrance
+      if (areas.empty()) {
+        LookForExternalArea(&region, regionsToSet, areas, true);
+        //If we still found nothing, we're disconnected, use RA_NONE to represent that
+        if (areas.empty()){
+          areas.insert(RA_NONE);
+        }
+      }
     }
-    for (auto& loc : region.locations){
-      ctx->GetItemLocation(loc.GetLocation())->SetArea(area);
+    for (auto regionToSet : regionsToSet) {
+      regionToSet->ReplaceAreas(areas);
+      for (auto& loc : regionToSet->locations){
+        ctx->GetItemLocation(loc.GetLocation())->MergeAreas(areas);
+      }
     }
-    areaTable[regionType].SetArea(area);
   }
 }
 
@@ -699,10 +712,12 @@ static void CalculateWotH() {
   //size - 1 so Triforce is not counted
   for (size_t i = 0; i < ctx->playthroughLocations.size() - 1; i++) {
     for (size_t j = 0; j < ctx->playthroughLocations[i].size(); j++) {
-      //If removing this item and no other item caused the game to become unbeatable, then it is strictly necessary, so add it
-      if (ctx->GetItemLocation(ctx->playthroughLocations[i][j])->IsHintable() 
-          && !(IsBeatableWithout(ctx->playthroughLocations[i][j], true))) {
-        ctx->GetItemLocation(ctx->playthroughLocations[i][j])->SetWothCandidate();
+      //If removing this item and no other item caused the game to become unbeatable, then it is strictly necessary,
+      //so add it unless it is in Links Pocket or an isolated place.
+      auto itemLoc = ctx->GetItemLocation(ctx->playthroughLocations[i][j]);
+      if (itemLoc->IsHintable() && *itemLoc->GetAreas().begin() > RA_LINKS_POCKET &&
+          !(IsBeatableWithout(ctx->playthroughLocations[i][j], true))) {
+        itemLoc->SetWothCandidate();
       }
     }
   }
@@ -711,28 +726,41 @@ static void CalculateWotH() {
   ReachabilitySearch(ctx->allLocations);
 }
 
+static bool FindIfBarren(Rando::ItemLocation* itemLoc, std::array<bool, RA_MAX> NotBarren){
+  std::set<RandomizerArea> locAreas = itemLoc->GetAreas();
+  for (auto locArea: locAreas){
+    if (NotBarren[locArea]){
+      return false;
+    }
+  }
+  return true;
+}
+
 //Calculate barren locations and assign Barren Candidacy to all locations inside those areas
 static void CalculateBarren() {
   auto ctx = Rando::Context::GetInstance();
   std::array<bool, RA_MAX> NotBarren = {}; //I would invert this but the "initialise all as true" syntax wasn't working
+  //Isolated Areas and Link's Pocket are never Hinted Barren
+  NotBarren[RA_NONE] = true;
+  NotBarren[RA_LINKS_POCKET] = true; 
 
   for (RandomizerCheck loc : ctx->allLocations) {
     Rando::ItemLocation* itemLoc = ctx->GetItemLocation(loc);
-    RandomizerArea locArea = itemLoc->GetArea();
-    bool test = (itemLoc->GetPlacedItem().IsMajorItem() || itemLoc->IsWothCandidate());
-    // If a location has a major item or is a way of the hero location, it is not barren
-    if (NotBarren[locArea] == false && locArea > RA_LINKS_POCKET && (itemLoc->GetPlacedItem().IsMajorItem() || itemLoc->IsWothCandidate())) {
-      NotBarren[locArea] = true;
-    } 
-  }
-
-  for (RandomizerCheck loc : ctx->allLocations) {
-    Rando::ItemLocation* itemLoc = ctx->GetItemLocation(loc);
-    if (!NotBarren[itemLoc->GetArea()]){
-      itemLoc->SetBarrenCandidate();
+    std::set<RandomizerArea> locAreas = itemLoc->GetAreas();
+    for (auto locArea: locAreas){
+      // If a location has a major item or is a way of the hero location, it is not barren
+      if (NotBarren[locArea] == false && (itemLoc->GetPlacedItem().IsMajorItem() || itemLoc->IsWothCandidate())) {
+        NotBarren[locArea] = true;
+      } 
     }
   }
 
+  for (RandomizerCheck loc : ctx->allLocations) {
+    Rando::ItemLocation* itemLoc = ctx->GetItemLocation(loc);
+    if (FindIfBarren(itemLoc, NotBarren)){
+      itemLoc->SetBarrenCandidate();
+    }
+  }
 }
 
 //Will place things completely randomly, no logic checks are performed
@@ -963,7 +991,7 @@ static void RandomizeOwnDungeon(const Rando::DungeonInfo* dungeon) {
   // This accounts for boss room shuffle so that own dungeon items can be placed
   // in the shuffled boss room
   std::vector<RandomizerCheck> dungeonLocations = FilterFromPool(ctx->allLocations, [dungeon, ctx](const auto loc) {
-    return ctx->GetItemLocation(loc)->GetArea() == dungeon->GetArea();
+    return ctx->GetItemLocation(loc)->GetAreas().contains(dungeon->GetArea());
   });
 
   //filter out locations that may be required to have songs placed at them
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
index db934b846..1b2870ed6 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
@@ -2902,6 +2902,8 @@ void StaticData::HintTable_Init() {
                                                  /*french*/ "tes poches"));
                                               // /*spanish*/tu bolsillo
 
+    hintTextTable[RHT_ISOLATED_PLACE] = HintText(CustomMessage("an Isolated Place"));
+
     hintTextTable[RHT_DUNGEON_ORDINARY] = HintText(CustomMessage(" It's ordinary.",
                                                       /*german*/ "&Sieht aus wie immer.",
                                                       /*french*/ "&Elle vous semble %rordinaire%w."));
diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.cpp b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
index 0e32813b0..124720871 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hints.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
@@ -354,12 +354,12 @@ bool IsReachableWithout(std::vector<RandomizerCheck> locsToCheck, RandomizerChec
   return true;
 }
 
-static void SetAllInRegionAsHinted(RandomizerArea area, std::vector<RandomizerCheck> locations){
+static void SetAllInAreaAsHintAccesible(RandomizerArea area, std::vector<RandomizerCheck> locations){
   auto ctx = Rando::Context::GetInstance();
-  std::vector<RandomizerCheck> locsInRegion = FilterFromPool(locations, [area, ctx](const RandomizerCheck loc){
-                                        return ctx->GetItemLocation(loc)->GetArea() == area;
-                                      });
-  for(RandomizerCheck loc: locsInRegion){
+  std::vector<RandomizerCheck> locsInArea = FilterFromPool(locations, [area, ctx](const RandomizerCheck loc){
+                                                            return ctx->GetItemLocation(loc)->GetAreas().contains(area);
+                                                          });
+  for(RandomizerCheck loc: locsInArea){
     ctx->GetItemLocation(loc)->SetHintAccesible();
   }
 }
@@ -369,10 +369,10 @@ static void AddGossipStoneHint( const RandomizerCheck gossipStone,
                                 const std::string distributionName,
                                 const std::vector<RandomizerHintTextKey> hintKeys,
                                 const std::vector<RandomizerCheck> locations,
+                                const std::vector<RandomizerArea> areas,
                                 const std::vector<TrialKey> trials) {
-
   auto ctx = Rando::Context::GetInstance();
-  ctx->AddHint(StaticData::gossipStoneCheckToHint[gossipStone], Hint(StaticData::gossipStoneCheckToHint[gossipStone], hintType, distributionName, hintKeys, locations, {}, trials));
+  ctx->AddHint(StaticData::gossipStoneCheckToHint[gossipStone], Hint(StaticData::gossipStoneCheckToHint[gossipStone], hintType, distributionName, hintKeys, locations, areas, trials));
   ctx->GetItemLocation(gossipStone)->SetPlacedItem(RG_HINT); //RANDOTODO, better gossip stone to location to hint key system
 }
 
@@ -381,11 +381,12 @@ static void AddGossipStoneHintCopies(uint8_t copies,
                                      const std::string distributionName,
                                      const std::vector<RandomizerHintTextKey> hintKeys = {},
                                      const std::vector<RandomizerCheck> locations = {},
+                                     const std::vector<RandomizerArea> areas = {},
                                      const std::vector<TrialKey> trials = {},
                                      RandomizerCheck firstStone = RC_UNKNOWN_CHECK){
 
   if (firstStone != RC_UNKNOWN_CHECK && copies > 0){
-      AddGossipStoneHint(firstStone, hintType, distributionName, hintKeys, locations, trials);
+      AddGossipStoneHint(firstStone, hintType, distributionName, hintKeys, locations, areas, trials);
       copies -= 1;
   }
   for(int c=0; c<copies; c++){
@@ -396,7 +397,7 @@ static void AddGossipStoneHintCopies(uint8_t copies,
       return;
     }
     auto gossipStone = RandomElement(gossipStones, false);
-    AddGossipStoneHint(gossipStone, hintType, distributionName, hintKeys, locations, trials);
+    AddGossipStoneHint(gossipStone, hintType, distributionName, hintKeys, locations, areas, trials);
   }
 }
 
@@ -410,12 +411,15 @@ static bool CreateHint(RandomizerCheck location, uint8_t copies, HintType type,
       return false;
   }
   RandomizerCheck gossipStone = RandomElement(gossipStoneLocations);
+  RandomizerArea area = RandomElementFromSet(ctx->GetItemLocation(location)->GetAreas());
 
-  //make hint text
-
+  //Set that hints are accesible
   ctx->GetItemLocation(location)->SetHintAccesible();
+  if (type == HINT_TYPE_FOOLISH){
+    SetAllInAreaAsHintAccesible(area, ctx->allLocations);
+  }
 
-  AddGossipStoneHintCopies(copies, type, distribution, {}, {location}, {}, gossipStone);
+  AddGossipStoneHintCopies(copies, type, distribution, {}, {location}, {area}, {}, gossipStone);
   return true;
 }
 
@@ -485,7 +489,7 @@ static void CreateTrialHints(uint8_t copies) {
         auto requiredTrials = FilterFromPool(trials, [](TrialInfo* trial){return trial->IsRequired();});
       }
       for (auto& trial : trials) {//create a hint for each hinted trial
-        AddGossipStoneHintCopies(copies, HINT_TYPE_TRIAL, "Trial", {}, {}, {trial->GetTrialKey()});
+        AddGossipStoneHintCopies(copies, HINT_TYPE_TRIAL, "Trial", {}, {}, {}, {trial->GetTrialKey()});
       }
     }
   }
@@ -496,25 +500,26 @@ void CreateWarpSongTexts() {
   if (ctx->GetOption(RSK_WARP_SONG_HINTS)){
     auto warpSongEntrances = GetShuffleableEntrances(EntranceType::WarpSong, false);
     for (auto entrance : warpSongEntrances) {
-      const auto destination = entrance->GetConnectedRegion()->GetArea();
+      //RANDOTODO make random
+      const auto destination = entrance->GetConnectedRegion()->GetAllAreas().begin();
       switch (entrance->GetIndex()) {
         case 0x0600: // minuet RANDOTODO make into entrance hints when they are added
-          ctx->AddHint(RH_MINUET_WARP_LOC, Hint(RH_MINUET_WARP_LOC, HINT_TYPE_AREA, "", {RHT_WARP_SONG}, {}, {destination}));
+          ctx->AddHint(RH_MINUET_WARP_LOC, Hint(RH_MINUET_WARP_LOC, HINT_TYPE_AREA, "", {RHT_WARP_SONG}, {}, {*destination}));
           break;
         case 0x04F6: // bolero
-          ctx->AddHint(RH_BOLERO_WARP_LOC, Hint(RH_BOLERO_WARP_LOC, HINT_TYPE_AREA, "", {RHT_WARP_SONG}, {}, {destination}));
+          ctx->AddHint(RH_BOLERO_WARP_LOC, Hint(RH_BOLERO_WARP_LOC, HINT_TYPE_AREA, "", {RHT_WARP_SONG}, {}, {*destination}));
           break;
         case 0x0604: // serenade
-          ctx->AddHint(RH_SERENADE_WARP_LOC, Hint(RH_SERENADE_WARP_LOC, HINT_TYPE_AREA, "", {RHT_WARP_SONG}, {}, {destination}));
+          ctx->AddHint(RH_SERENADE_WARP_LOC, Hint(RH_SERENADE_WARP_LOC, HINT_TYPE_AREA, "", {RHT_WARP_SONG}, {}, {*destination}));
           break;
         case 0x01F1: // requiem
-          ctx->AddHint(RH_REQUIEM_WARP_LOC, Hint(RH_REQUIEM_WARP_LOC, HINT_TYPE_AREA, "", {RHT_WARP_SONG}, {}, {destination}));
+          ctx->AddHint(RH_REQUIEM_WARP_LOC, Hint(RH_REQUIEM_WARP_LOC, HINT_TYPE_AREA, "", {RHT_WARP_SONG}, {}, {*destination}));
           break;
         case 0x0568: // nocturne
-          ctx->AddHint(RH_NOCTURNE_WARP_LOC, Hint(RH_NOCTURNE_WARP_LOC, HINT_TYPE_AREA, "", {RHT_WARP_SONG}, {}, {destination}));
+          ctx->AddHint(RH_NOCTURNE_WARP_LOC, Hint(RH_NOCTURNE_WARP_LOC, HINT_TYPE_AREA, "", {RHT_WARP_SONG}, {}, {*destination}));
           break;
         case 0x05F4: // prelude
-          ctx->AddHint(RH_PRELUDE_WARP_LOC, Hint(RH_PRELUDE_WARP_LOC, HINT_TYPE_AREA, "", {RHT_WARP_SONG}, {}, {destination}));
+          ctx->AddHint(RH_PRELUDE_WARP_LOC, Hint(RH_PRELUDE_WARP_LOC, HINT_TYPE_AREA, "", {RHT_WARP_SONG}, {}, {*destination}));
           break;
         default:
           break;
@@ -570,22 +575,18 @@ static void DistributeHints(std::vector<uint8_t>& selected, size_t stoneCount, s
   }
 }
 
-uint8_t PlaceHints(std::vector<uint8_t>& selectedHints,
-                std::vector<HintDistributionSetting>& distTable){
+uint8_t PlaceHints(std::vector<uint8_t>& selectedHints, std::vector<HintDistributionSetting>& distTable){
   auto ctx = Rando::Context::GetInstance();
   uint8_t curSlot = 0;
   for (HintDistributionSetting distribution : distTable){
     std::vector<RandomizerCheck> hintTypePool = FilterHintability(ctx->allLocations, distribution.filter);
     for (uint8_t numHint = 0; numHint < selectedHints[curSlot]; numHint++){
-
+      hintTypePool = FilterHintability(hintTypePool);
       SPDLOG_DEBUG("Attempting to make hint of type: " + StaticData::hintTypeNames[distribution.type].GetEnglish(MF_CLEAN) + "\n");
       RandomizerCheck hintedLocation = RC_UNKNOWN_CHECK;
 
       hintedLocation = CreateRandomHint(hintTypePool, distribution.copies, distribution.type, distribution.name);
-      if (distribution.type == HINT_TYPE_FOOLISH){
-        SetAllInRegionAsHinted(ctx->GetItemLocation(hintedLocation)->GetArea(), hintTypePool);
-        hintTypePool = FilterHintability(hintTypePool);
-      }
+
       if (hintedLocation == RC_UNKNOWN_CHECK){ //if hint failed to place, remove all wieght and copies then return the number of stones to redistribute
         uint8_t hintsToRemove = (selectedHints[curSlot] - numHint) * distribution.copies;
         selectedHints[curSlot] = 0;   //as distTable is passed by refernce here, these changes stick for the rest of this seed generation
@@ -704,7 +705,11 @@ void CreateChildAltarHint() {
         stoneLocs = FindItemsAndMarkHinted({RG_KOKIRI_EMERALD, RG_GORON_RUBY, RG_ZORA_SAPPHIRE}, {RC_ALTAR_HINT_CHILD});
       }
     }
-    ctx->AddHint(RH_ALTAR_CHILD, Hint(RH_ALTAR_CHILD, HINT_TYPE_ALTAR_CHILD, {}, stoneLocs));
+    std::vector<RandomizerArea> stoneAreas = {};
+    for (auto loc : stoneLocs){
+      stoneAreas.push_back(RandomElementFromSet(ctx->GetItemLocation(loc)->GetAreas()));
+    }
+    ctx->AddHint(RH_ALTAR_CHILD, Hint(RH_ALTAR_CHILD, HINT_TYPE_ALTAR_CHILD, {}, stoneLocs, stoneAreas));
   }
 }
 
@@ -722,7 +727,11 @@ void CreateAdultAltarHint() {
                                               {RC_ALTAR_HINT_ADULT});
       }
     }
-    ctx->AddHint(RH_ALTAR_ADULT, Hint(RH_ALTAR_ADULT, HINT_TYPE_ALTAR_ADULT, {}, medallionLocs));
+    std::vector<RandomizerArea> medallionAreas = {};
+    for (auto loc : medallionLocs){
+      medallionAreas.push_back(RandomElementFromSet(ctx->GetItemLocation(loc)->GetAreas()));
+    }
+    ctx->AddHint(RH_ALTAR_ADULT, Hint(RH_ALTAR_ADULT, HINT_TYPE_ALTAR_ADULT, {}, medallionLocs, medallionAreas));
   }
 }
 
@@ -740,18 +749,26 @@ void CreateStaticHintFromData(RandomizerHint hint, StaticHintInfo staticData){
       for(auto check: staticData.targetChecks){
         ctx->GetItemLocation(check)->SetHintAccesible();
       }
-
+      std::vector<RandomizerArea> areas = {};
+      for (auto loc : locations){
+        areas.push_back(RandomElementFromSet(ctx->GetItemLocation(loc)->GetAreas()));
+      }
       //hintKeys are defaulted to in the hint object and do not need to be specified
-      ctx->AddHint(hint, Hint(hint, staticData.type, {}, locations, {}, {}, staticData.yourPocket, staticData.num));
+      ctx->AddHint(hint, Hint(hint, staticData.type, {}, locations, areas, {}, staticData.yourPocket, staticData.num));
     }
   }
 }
 
 void CreateStaticItemHint(RandomizerHint hintKey, std::vector<RandomizerHintTextKey> hintTextKeys,
                           std::vector<RandomizerGet> items, std::vector<RandomizerCheck> hintChecks, bool yourPocket = false) {
+  //RANDOTODO choose area in case there are multiple
   auto ctx = Rando::Context::GetInstance();
   std::vector<RandomizerCheck> locations = FindItemsAndMarkHinted(items, hintChecks);
-  ctx->AddHint(hintKey, Hint(hintKey, HINT_TYPE_AREA, hintTextKeys, locations, {}, {}, yourPocket));
+  std::vector<RandomizerArea> areas = {};
+  for (auto loc : locations){
+    areas.push_back(RandomElementFromSet(ctx->GetItemLocation(loc)->GetAreas()));
+  }
+  ctx->AddHint(hintKey, Hint(hintKey, HINT_TYPE_AREA, hintTextKeys, locations, areas, {}, yourPocket));
 }
 
 void CreateGanondorfJoke(){
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
index 64c3e9287..c1c3391e2 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
@@ -65,14 +65,14 @@ bool CanBuyAnother(RandomizerCheck rc) {
 }
 
 Region::Region() = default;
-Region::Region(std::string regionName_, std::string scene_, RandomizerArea area,
+Region::Region(std::string regionName_, std::string scene_, std::set<RandomizerArea> areas,
          bool timePass_,
          std::vector<EventAccess> events_,
          std::vector<LocationAccess> locations_,
          std::list<Rando::Entrance> exits_)
   : regionName(std::move(regionName_)),
     scene(std::move(scene_)),
-    area(area),
+    areas(areas),
     timePass(timePass_),
     events(std::move(events_)),
     locations(std::move(locations_)),
@@ -246,10 +246,10 @@ void RegionTable_Init() {
   };
   //Clear the array from any previous playthrough attempts. This is important so that
   //locations which appear in both MQ and Vanilla dungeons don't get set in both areas.
-  areaTable.fill(Region("Invalid Region", "Invalid Region", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {}));
+  areaTable.fill(Region("Invalid Region", "Invalid Region", {}, NO_DAY_NIGHT_CYCLE, {}, {}, {}));
 
                        //name, scene, hint text,                       events, locations, exits
-  areaTable[RR_ROOT] = Region("Root", "", RA_LINKS_POCKET, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_ROOT] = Region("Root", "", {RA_LINKS_POCKET}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_LINKS_POCKET,       true),
                   LOCATION(RC_TRIFORCE_COMPLETED, logic->GetSaveContext()->triforcePiecesCollected >= ctx->GetOption(RSK_TRIFORCE_HUNT_PIECES_REQUIRED).Value<uint8_t>();),
@@ -259,7 +259,7 @@ void RegionTable_Init() {
                   Entrance(RR_ROOT_EXITS, {[]{return true;}})
   });
 
-  areaTable[RR_ROOT_EXITS] = Region("Root Exits", "", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_ROOT_EXITS] = Region("Root Exits", "", {RA_LINKS_POCKET}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_CHILD_SPAWN,             {[]{return logic->IsChild;}}),
                   Entrance(RR_ADULT_SPAWN,             {[]{return logic->IsAdult;}}),
@@ -271,42 +271,42 @@ void RegionTable_Init() {
                   Entrance(RR_PRELUDE_OF_LIGHT_WARP,   {[]{return logic->CanUse(RG_PRELUDE_OF_LIGHT)   && logic->CanLeaveForest();}}),
   });
 
-  areaTable[RR_CHILD_SPAWN] = Region("Child Spawn", "", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_CHILD_SPAWN] = Region("Child Spawn", "", {RA_LINKS_POCKET}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_KF_LINKS_HOUSE, {[]{return true;}}),
   });
 
-  areaTable[RR_ADULT_SPAWN] = Region("Adult Spawn", "", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_ADULT_SPAWN] = Region("Adult Spawn", "", {RA_LINKS_POCKET}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_TEMPLE_OF_TIME, {[]{return true;}}),
   });
 
-  areaTable[RR_MINUET_OF_FOREST_WARP] = Region("Minuet of Forest Warp", "", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_MINUET_OF_FOREST_WARP] = Region("Minuet of Forest Warp", "", {RA_LINKS_POCKET}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_SACRED_FOREST_MEADOW, {[]{return true;}}),
   });
 
-  areaTable[RR_BOLERO_OF_FIRE_WARP] = Region("Bolero of Fire Warp", "", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_BOLERO_OF_FIRE_WARP] = Region("Bolero of Fire Warp", "", {RA_LINKS_POCKET}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DMC_CENTRAL_LOCAL, {[]{return true;}}),
   });
 
-  areaTable[RR_SERENADE_OF_WATER_WARP] = Region("Serenade of Water Warp", "", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_SERENADE_OF_WATER_WARP] = Region("Serenade of Water Warp", "", {RA_LINKS_POCKET}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_LAKE_HYLIA, {[]{return true;}}),
   });
 
-  areaTable[RR_REQUIEM_OF_SPIRIT_WARP] = Region("Requiem of Spirit Warp", "", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_REQUIEM_OF_SPIRIT_WARP] = Region("Requiem of Spirit Warp", "", {RA_LINKS_POCKET}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DESERT_COLOSSUS, {[]{return true;}}),
   });
 
-  areaTable[RR_NOCTURNE_OF_SHADOW_WARP] = Region("Nocturne of Shadow Warp", "", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_NOCTURNE_OF_SHADOW_WARP] = Region("Nocturne of Shadow Warp", "", {RA_LINKS_POCKET}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_GRAVEYARD_WARP_PAD_REGION, {[]{return true;}}),
   });
 
-  areaTable[RR_PRELUDE_OF_LIGHT_WARP] = Region("Prelude of Light Warp", "", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_PRELUDE_OF_LIGHT_WARP] = Region("Prelude of Light Warp", "", {RA_LINKS_POCKET}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_TEMPLE_OF_TIME, {[]{return true;}}),
   });
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access.hpp b/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
index f394c2de5..3961418c6 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
@@ -3,6 +3,7 @@
 #include <string>
 #include <vector>
 #include <list>
+#include <set>
 
 #include "../randomizerTypes.h"
 #include "../context.h"
@@ -138,7 +139,7 @@ namespace Rando {
 class Region {
 public:
     Region();
-    Region(std::string regionName_, std::string scene_, RandomizerArea area,
+    Region(std::string regionName_, std::string scene_, std::set<RandomizerArea> areas,
          bool timePass_,
          std::vector<EventAccess> events_,
          std::vector<LocationAccess> locations_,
@@ -147,7 +148,7 @@ public:
 
     std::string regionName;
     std::string scene;
-    RandomizerArea area;
+    std::set<RandomizerArea> areas;
     bool timePass;
     std::vector<EventAccess> events;
     std::vector<LocationAccess> locations;
@@ -200,12 +201,12 @@ public:
     //Check to see if an exit can be access as both ages at both times of day
     bool CheckAllAccess(RandomizerRegion exitKey);
 
-    RandomizerArea GetArea() const{
-        return area;
+    std::set<RandomizerArea> GetAllAreas() const{
+        return areas;
     }
 
-    void SetArea(RandomizerArea newArea) {
-        area = newArea;
+    void ReplaceAreas(std::set<RandomizerArea> newAreas) {
+        areas = newAreas;
     }
 
     //Here checks conditional access based on whether or not both ages have
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_bottom_of_the_well.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_bottom_of_the_well.cpp
index 2e238622f..9d06b9f7e 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_bottom_of_the_well.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_bottom_of_the_well.cpp
@@ -8,7 +8,7 @@ void RegionTable_Init_BottomOfTheWell() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[RR_BOTTOM_OF_THE_WELL_ENTRYWAY] = Region("Bottom of the Well Entryway", "Bottom of the Well", RA_BOTTOM_OF_THE_WELL, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_BOTTOM_OF_THE_WELL_ENTRYWAY] = Region("Bottom of the Well Entryway", "Bottom of the Well", {RA_BOTTOM_OF_THE_WELL}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_BOTTOM_OF_THE_WELL_MAIN_AREA,    {[]{return ctx->GetDungeon(Rando::BOTTOM_OF_THE_WELL)->IsVanilla() && logic->IsChild && (logic->CanAttack() || logic->CanUse(RG_NUTS));}}),
                   Entrance(RR_BOTTOM_OF_THE_WELL_MQ_PERIMETER, {[]{return ctx->GetDungeon(Rando::BOTTOM_OF_THE_WELL)->IsMQ()      && logic->IsChild;}}),
@@ -19,7 +19,7 @@ void RegionTable_Init_BottomOfTheWell() {
   |     VANILLA DUNGEON      |
   ---------------------------*/
   if (ctx->GetDungeon(Rando::BOTTOM_OF_THE_WELL)->IsVanilla()) {
-  areaTable[RR_BOTTOM_OF_THE_WELL_MAIN_AREA] = Region("Bottom of the Well Main Region", "Bottom of the Well", RA_BOTTOM_OF_THE_WELL, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_BOTTOM_OF_THE_WELL_MAIN_AREA] = Region("Bottom of the Well Main Region", "Bottom of the Well", {RA_BOTTOM_OF_THE_WELL}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->StickPot, {[]{return true;}}),
                   EventAccess(&logic->NutPot,   {[]{return true;}}),
@@ -53,7 +53,7 @@ void RegionTable_Init_BottomOfTheWell() {
   ---------------------------*/
   if (ctx->GetDungeon(Rando::BOTTOM_OF_THE_WELL)->IsMQ()) {
     //RANDOTODO double check the CanAttacks when rewriting, i assumed CanChildAttack was the only one called because of the initial crawlspace
-  areaTable[RR_BOTTOM_OF_THE_WELL_MQ_PERIMETER] = Region("Bottom of the Well MQ Perimeter", "Bottom of the Well", RA_BOTTOM_OF_THE_WELL, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_BOTTOM_OF_THE_WELL_MQ_PERIMETER] = Region("Bottom of the Well MQ Perimeter", "Bottom of the Well", {RA_BOTTOM_OF_THE_WELL}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   //EventAccess(&WallFairy, {[]{return WallFairy || logic->Slingshot;}}),
   }, {
@@ -70,7 +70,7 @@ void RegionTable_Init_BottomOfTheWell() {
                     //Trick: logic->CanUse(RG_ZELDAS_LULLABY) || (LogicBotWMQPits && logic->HasExplosives())
   });
 
-  areaTable[RR_BOTTOM_OF_THE_WELL_MQ_MIDDLE] = Region("Bottom of the Well MQ Middle", "Bottom of the Well", RA_BOTTOM_OF_THE_WELL, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_BOTTOM_OF_THE_WELL_MQ_MIDDLE] = Region("Bottom of the Well MQ Middle", "Bottom of the Well", {RA_BOTTOM_OF_THE_WELL}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_BOTTOM_OF_THE_WELL_MQ_MAP_CHEST,                        true),
                   LOCATION(RC_BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST,              logic->HasExplosives() && logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 2)),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
index 74059abc8..6cc423e94 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
@@ -4,14 +4,14 @@
 using namespace Rando;
 
 void RegionTable_Init_CastleTown() {
-  areaTable[RR_MARKET_ENTRANCE] = Region("Market Entrance", "Market Entrance", RA_THE_MARKET, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_MARKET_ENTRANCE] = Region("Market Entrance", "Market Entrance", {RA_THE_MARKET}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_HYRULE_FIELD,       {[]{return logic->IsAdult || logic->AtDay;}}),
                   Entrance(RR_THE_MARKET,         {[]{return true;}}),
                   Entrance(RR_MARKET_GUARD_HOUSE, {[]{return true;}}),
   });
 
-  areaTable[RR_THE_MARKET] = Region("Market", "Market", RA_THE_MARKET, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_THE_MARKET] = Region("Market", "Market", {RA_THE_MARKET}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_MARKET_ENTRANCE,            {[]{return true;}}),
                   Entrance(RR_TOT_ENTRANCE,               {[]{return true;}}),
@@ -25,7 +25,7 @@ void RegionTable_Init_CastleTown() {
                   Entrance(RR_MARKET_BACK_ALLEY,          {[]{return logic->IsChild;}}),
   });
 
-  areaTable[RR_MARKET_BACK_ALLEY] = Region("Market Back Alley", "Market", RA_THE_MARKET, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_MARKET_BACK_ALLEY] = Region("Market Back Alley", "Market", {RA_THE_MARKET}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_THE_MARKET,                 {[]{return true;}}),
                   Entrance(RR_MARKET_BOMBCHU_SHOP,        {[]{return logic->AtNight;}}),
@@ -33,7 +33,7 @@ void RegionTable_Init_CastleTown() {
                   Entrance(RR_MARKET_MAN_IN_GREEN_HOUSE,  {[]{return logic->AtNight;}}),
   });
 
-  areaTable[RR_TOT_ENTRANCE] = Region("ToT Entrance", "ToT Entrance", RA_THE_MARKET, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_TOT_ENTRANCE] = Region("ToT Entrance", "ToT Entrance", {RA_THE_MARKET}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->GossipStoneFairy, {[]{return logic->CallGossipFairyExceptSuns();}}),
                 }, {
@@ -48,7 +48,7 @@ void RegionTable_Init_CastleTown() {
                   Entrance(RR_TEMPLE_OF_TIME, {[]{return true;}}),
   });
 
-  areaTable[RR_TEMPLE_OF_TIME] = Region("Temple of Time", "Temple of Time", RA_TEMPLE_OF_TIME, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_TEMPLE_OF_TIME] = Region("Temple of Time", "Temple of Time", {RA_TEMPLE_OF_TIME}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_TOT_LIGHT_ARROWS_CUTSCENE, logic->IsAdult && logic->CanTriggerLACS()),
                   LOCATION(RC_ALTAR_HINT_CHILD,          logic->IsChild),
@@ -60,7 +60,7 @@ void RegionTable_Init_CastleTown() {
                   Entrance(RR_TOT_BEYOND_DOOR_OF_TIME, {[]{return ctx->GetOption(RSK_DOOR_OF_TIME).Is(RO_DOOROFTIME_OPEN) || (logic->CanUse(RG_SONG_OF_TIME) && (ctx->GetOption(RSK_DOOR_OF_TIME).Is(RO_DOOROFTIME_SONGONLY) || (logic->StoneCount() == 3 && logic->HasItem(RG_OCARINA_OF_TIME))));}}),
   });
 
-  areaTable[RR_TOT_BEYOND_DOOR_OF_TIME] = Region("Beyond Door of Time", "Beyond Door of Time", RA_TEMPLE_OF_TIME, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_TOT_BEYOND_DOOR_OF_TIME] = Region("Beyond Door of Time", "Beyond Door of Time", {RA_TEMPLE_OF_TIME}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   //EventAccess(&logic->TimeTravel, {[]{return true;}}),
                 }, {
@@ -73,14 +73,16 @@ void RegionTable_Init_CastleTown() {
                   Entrance(RR_TEMPLE_OF_TIME, {[]{return true;}}),
   });
 
-  areaTable[RR_CASTLE_GROUNDS] = Region("Castle Grounds", "Castle Grounds", RA_CASTLE_GROUNDS, NO_DAY_NIGHT_CYCLE, {}, {}, {
+//With multi-area support {RA_CASTLE_GROUNDS} is not strictly required anymore, as any interior here could inherit both 
+//{RA_HYRULE_CASTLE} and {RA_OUTSIDE_GANONS_CASTLE}, but an setting to merge the latter 2 into the former may be preffered
+  areaTable[RR_CASTLE_GROUNDS] = Region("Castle Grounds", "Castle Grounds", {RA_CASTLE_GROUNDS}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_THE_MARKET,            {[]{return true;}}),
                   Entrance(RR_HYRULE_CASTLE_GROUNDS, {[]{return logic->IsChild;}}),
                   Entrance(RR_GANONS_CASTLE_GROUNDS, {[]{return logic->IsAdult;}}),
   });
 
-  areaTable[RR_HYRULE_CASTLE_GROUNDS] = Region("Hyrule Castle Grounds", "Castle Grounds", RA_HYRULE_CASTLE, DAY_NIGHT_CYCLE, {
+  areaTable[RR_HYRULE_CASTLE_GROUNDS] = Region("Hyrule Castle Grounds", "Castle Grounds", {RA_HYRULE_CASTLE}, DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->GossipStoneFairy, {[]{return logic->CallGossipFairy();}}),
                   EventAccess(&logic->ButterflyFairy,   {[]{return logic->ButterflyFairy   || logic->CanUse(RG_STICKS);}}),
@@ -99,7 +101,7 @@ void RegionTable_Init_CastleTown() {
                   Entrance(RR_HC_STORMS_GROTTO,        {[]{return logic->CanOpenStormsGrotto();}}),
   });
 
-  areaTable[RR_HC_GARDEN] = Region("HC Garden", "Castle Grounds", RA_HYRULE_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_HC_GARDEN] = Region("HC Garden", "Castle Grounds", {RA_HYRULE_CASTLE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                 }, {
                   //Locations
@@ -110,7 +112,7 @@ void RegionTable_Init_CastleTown() {
                   Entrance(RR_HYRULE_CASTLE_GROUNDS, {[]{return true;}}),
   });
 
-  areaTable[RR_HC_GREAT_FAIRY_FOUNTAIN] = Region("HC Great Fairy Fountain", "HC Great Fairy Fountain", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_HC_GREAT_FAIRY_FOUNTAIN] = Region("HC Great Fairy Fountain", "HC Great Fairy Fountain", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_HC_GREAT_FAIRY_REWARD, logic->CanUse(RG_ZELDAS_LULLABY)),
                 }, {
@@ -118,7 +120,7 @@ void RegionTable_Init_CastleTown() {
                   Entrance(RR_CASTLE_GROUNDS, {[]{return true;}}),
   });
 
-  areaTable[RR_HC_STORMS_GROTTO] = Region("HC Storms Grotto", "HC Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_HC_STORMS_GROTTO] = Region("HC Storms Grotto", "HC Storms Grotto", {}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->NutPot,           {[]{return logic->NutPot           || logic->BlastOrSmash();}}),
                   EventAccess(&logic->GossipStoneFairy, {[]{return logic->CanBreakMudWalls() && logic->CallGossipFairy();}}),
@@ -132,7 +134,7 @@ void RegionTable_Init_CastleTown() {
                   Entrance(RR_CASTLE_GROUNDS, {[]{return true;}}),
   });
 
-  areaTable[RR_GANONS_CASTLE_GROUNDS] = Region("Ganon's Castle Grounds", "Castle Grounds", RA_OUTSIDE_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_GROUNDS] = Region("Ganon's Castle Grounds", "Castle Grounds", {RA_OUTSIDE_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {
                   EventAccess(&logic->BuiltRainbowBridge, {[]{return logic->CanBuildRainbowBridge();}}),
                 }, {
                   //Locations                                   
@@ -144,7 +146,7 @@ void RegionTable_Init_CastleTown() {
                   Entrance(RR_GANONS_CASTLE_LEDGE,      {[]{return logic->BuiltRainbowBridge;}}),
   });
 
-  areaTable[RR_OGC_GREAT_FAIRY_FOUNTAIN] = Region("OGC Great Fairy Fountain", "OGC Great Fairy Fountain", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_OGC_GREAT_FAIRY_FOUNTAIN] = Region("OGC Great Fairy Fountain", "OGC Great Fairy Fountain", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_OGC_GREAT_FAIRY_REWARD, logic->CanUse(RG_ZELDAS_LULLABY)),
                 }, {
@@ -152,20 +154,20 @@ void RegionTable_Init_CastleTown() {
                   Entrance(RR_CASTLE_GROUNDS, {[]{return true;}}),
   });
 
-  areaTable[RR_CASTLE_GROUNDS_FROM_GANONS_CASTLE] = Region("Castle Grounds From Ganon's Castle", "Castle Grounds From Ganon's Castle", RA_CASTLE_GROUNDS, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_CASTLE_GROUNDS_FROM_GANONS_CASTLE] = Region("Castle Grounds From Ganon's Castle", "Castle Grounds From Ganon's Castle", {RA_CASTLE_GROUNDS}, NO_DAY_NIGHT_CYCLE, {}, {}, {
     // Exits
     Entrance(RR_HYRULE_CASTLE_GROUNDS, { [] { return logic->IsChild; }}),
     Entrance(RR_GANONS_CASTLE_LEDGE, { [] { return logic->IsAdult; }}),
   });
 
-  areaTable[RR_GANONS_CASTLE_LEDGE] = Region("Ganon's Castle Ledge", "OGC Ganon's Castle Ledge", RA_OUTSIDE_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE,
+  areaTable[RR_GANONS_CASTLE_LEDGE] = Region("Ganon's Castle Ledge", "OGC Ganon's Castle Ledge", {RA_OUTSIDE_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE,
   {}, {}, {
     // Exits
     Entrance(RR_GANONS_CASTLE_GROUNDS, {[]{return logic->BuiltRainbowBridge;}}),
     Entrance(RR_GANONS_CASTLE_ENTRYWAY, {[]{return logic->IsAdult;}}),
   });
 
-  areaTable[RR_MARKET_GUARD_HOUSE] = Region("Market Guard House", "Market Guard House", RA_NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_MARKET_GUARD_HOUSE] = Region("Market Guard House", "Market Guard House", {}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->CanEmptyBigPoes,   {[]{return logic->IsAdult;}}),
                 }, {
@@ -177,7 +179,7 @@ void RegionTable_Init_CastleTown() {
                   Entrance(RR_MARKET_ENTRANCE, {[]{return true;}}),
   });
 
-  areaTable[RR_MARKET_BAZAAR] = Region("Market Bazaar", "Market Bazaar", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_MARKET_BAZAAR] = Region("Market Bazaar", "Market Bazaar", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_MARKET_BAZAAR_ITEM_1, true),
                   LOCATION(RC_MARKET_BAZAAR_ITEM_2, true),
@@ -192,7 +194,7 @@ void RegionTable_Init_CastleTown() {
                   Entrance(RR_THE_MARKET, {[]{return true;}}),
   });
 
-  areaTable[RR_MARKET_MASK_SHOP] = Region("Market Mask Shop", "Market Mask Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_MARKET_MASK_SHOP] = Region("Market Mask Shop", "Market Mask Shop", {}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->SkullMask,   {[]{return logic->SkullMask   || (logic->HasItem(RG_ZELDAS_LETTER) && (ctx->GetOption(RSK_COMPLETE_MASK_QUEST) ||  ChildCanAccess(RR_KAKARIKO_VILLAGE)));}}), //RANDOTODO Complete mask quest does not need this location, so should be tied to link's pocket
                   EventAccess(&logic->MaskOfTruth, {[]{return logic->MaskOfTruth || (logic->SkullMask && (ctx->GetOption(RSK_COMPLETE_MASK_QUEST) || (ChildCanAccess(RR_THE_LOST_WOODS) && logic->CanUse(RG_SARIAS_SONG) && RegionTable(RR_THE_GRAVEYARD)->childDay && ChildCanAccess(RR_HYRULE_FIELD) && logic->StoneCount() == 3)));}}),
@@ -203,7 +205,7 @@ void RegionTable_Init_CastleTown() {
                   Entrance(RR_THE_MARKET, {[]{return true;}}),
   });
 
-  areaTable[RR_MARKET_SHOOTING_GALLERY] = Region("Market Shooting Gallery", "Market Shooting Gallery", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_MARKET_SHOOTING_GALLERY] = Region("Market Shooting Gallery", "Market Shooting Gallery", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_MARKET_SHOOTING_GALLERY_REWARD, logic->IsChild && logic->HasItem(RG_CHILD_WALLET)),
                 }, {
@@ -211,7 +213,7 @@ void RegionTable_Init_CastleTown() {
                   Entrance(RR_THE_MARKET, {[]{return true;}}),
   });
 
-  areaTable[RR_MARKET_BOMBCHU_BOWLING] = Region("Market Bombchu Bowling", "Market Bombchu Bowling", RA_NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_MARKET_BOMBCHU_BOWLING] = Region("Market Bombchu Bowling", "Market Bombchu Bowling", {}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->CouldPlayBowling, {[]{return (logic->HasItem(RG_CHILD_WALLET));}}),
                 }, {
@@ -223,7 +225,7 @@ void RegionTable_Init_CastleTown() {
                   Entrance(RR_THE_MARKET, {[]{return true;}}),
   });
 
-  areaTable[RR_MARKET_POTION_SHOP] = Region("Market Potion Shop", "Market Potion Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_MARKET_POTION_SHOP] = Region("Market Potion Shop", "Market Potion Shop", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_MARKET_POTION_SHOP_ITEM_1, true),
                   LOCATION(RC_MARKET_POTION_SHOP_ITEM_2, true),
@@ -238,7 +240,7 @@ void RegionTable_Init_CastleTown() {
                   Entrance(RR_THE_MARKET, {[]{return true;}}),
   });
 
-  areaTable[RR_MARKET_TREASURE_CHEST_GAME] = Region("Market Treasure Chest Game", "Market Treasure Chest Game", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_MARKET_TREASURE_CHEST_GAME] = Region("Market Treasure Chest Game", "Market Treasure Chest Game", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GREG_HINT,                         true),
                   LOCATION(RC_MARKET_TREASURE_CHEST_GAME_REWARD, logic->HasItem(RG_CHILD_WALLET) && ((logic->CanUse(RG_LENS_OF_TRUTH) && !ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)) || (ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 6)) || (ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)))),
@@ -257,7 +259,7 @@ void RegionTable_Init_CastleTown() {
                   Entrance(RR_THE_MARKET, {[]{return true;}}),
   });
 
-  areaTable[RR_MARKET_BOMBCHU_SHOP] = Region("Market Bombchu Shop", "Market Bombchu Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_MARKET_BOMBCHU_SHOP] = Region("Market Bombchu Shop", "Market Bombchu Shop", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_MARKET_BOMBCHU_SHOP_ITEM_1, true),
                   LOCATION(RC_MARKET_BOMBCHU_SHOP_ITEM_2, true),
@@ -272,7 +274,7 @@ void RegionTable_Init_CastleTown() {
                   Entrance(RR_MARKET_BACK_ALLEY, {[]{return true;}}),
   });
 
-  areaTable[RR_MARKET_DOG_LADY_HOUSE] = Region("Market Dog Lady House", "Market Dog Lady House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_MARKET_DOG_LADY_HOUSE] = Region("Market Dog Lady House", "Market Dog Lady House", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_MARKET_LOST_DOG, logic->IsChild && logic->AtNight),
                 }, {
@@ -280,7 +282,7 @@ void RegionTable_Init_CastleTown() {
                   Entrance(RR_MARKET_BACK_ALLEY, {[]{return true;}}),
   });
 
-  areaTable[RR_MARKET_MAN_IN_GREEN_HOUSE] = Region("Market Man in Green House", "Market Man in Green House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_MARKET_MAN_IN_GREEN_HOUSE] = Region("Market Man in Green House", "Market Man in Green House", {}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_MARKET_BACK_ALLEY, {[]{return true;}}),
   });
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
index 5b50d13b4..e914230fb 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
@@ -4,7 +4,7 @@
 using namespace Rando;
 
 void RegionTable_Init_DeathMountain() {
-  areaTable[RR_DEATH_MOUNTAIN_TRAIL] = Region("Death Mountain", "Death Mountain", RA_DEATH_MOUNTAIN_TRAIL, DAY_NIGHT_CYCLE, {
+  areaTable[RR_DEATH_MOUNTAIN_TRAIL] = Region("Death Mountain", "Death Mountain", {RA_DEATH_MOUNTAIN_TRAIL}, DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->BeanPlantFairy, {[]{return logic->BeanPlantFairy || (CanPlantBean(RR_DEATH_MOUNTAIN_TRAIL) && logic->CanUse(RG_SONG_OF_STORMS) && (logic->HasExplosives() || logic->HasItem(RG_GORONS_BRACELET)));}}),
                 }, {
@@ -23,7 +23,7 @@ void RegionTable_Init_DeathMountain() {
                   Entrance(RR_DMT_STORMS_GROTTO,        {[]{return logic->CanOpenStormsGrotto();}}),
   });
 
-  areaTable[RR_DEATH_MOUNTAIN_SUMMIT] = Region("Death Mountain Summit", "Death Mountain", RA_DEATH_MOUNTAIN_TRAIL, DAY_NIGHT_CYCLE, {
+  areaTable[RR_DEATH_MOUNTAIN_SUMMIT] = Region("Death Mountain Summit", "Death Mountain", {RA_DEATH_MOUNTAIN_TRAIL}, DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->GossipStoneFairy,   {[]{return logic->CallGossipFairy();}}),
                   EventAccess(&logic->BugRock,            {[]{return logic->BugRock            || logic->IsChild;}}),
@@ -38,17 +38,17 @@ void RegionTable_Init_DeathMountain() {
                   //Exits
                   Entrance(RR_DEATH_MOUNTAIN_TRAIL,     {[]{return true;}}),
                   Entrance(RR_DMC_UPPER_LOCAL,          {[]{return true;}}),
-                  Entrance(RR_DMT_OWL_FLIGHT,           {[]{return logic->IsChild;}}),
+                  Entrance(RR_DMT_OWL_FLIGHT,           {[]{return logic->IsChild;}}, false),
                   Entrance(RR_DMT_COW_GROTTO,           {[]{return Here(RR_DEATH_MOUNTAIN_SUMMIT, []{return logic->BlastOrSmash();});}}),
                   Entrance(RR_DMT_GREAT_FAIRY_FOUNTAIN, {[]{return Here(RR_DEATH_MOUNTAIN_SUMMIT, []{return logic->BlastOrSmash();});}}),
   });
 
-  areaTable[RR_DMT_OWL_FLIGHT] = Region("DMT Owl Flight", "Death Mountain", RA_DEATH_MOUNTAIN_TRAIL, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DMT_OWL_FLIGHT] = Region("DMT Owl Flight", "Death Mountain", {RA_DEATH_MOUNTAIN_TRAIL}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_KAK_IMPAS_ROOFTOP, {[]{return true;}}),
   });
 
-  areaTable[RR_DMT_COW_GROTTO] = Region("DMT Cow Grotto", "DMT Cow Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DMT_COW_GROTTO] = Region("DMT Cow Grotto", "DMT Cow Grotto", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DMT_COW_GROTTO_COW,     logic->CanUse(RG_EPONAS_SONG)),
                   LOCATION(RC_DMT_COW_GROTTO_BEEHIVE, logic->CanBreakLowerBeehives()),
@@ -58,7 +58,7 @@ void RegionTable_Init_DeathMountain() {
 
   });
 
-  areaTable[RR_DMT_STORMS_GROTTO] = Region("DMT Storms Grotto", "DMT Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+  areaTable[RR_DMT_STORMS_GROTTO] = Region("DMT Storms Grotto", "DMT Storms Grotto", {}, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LOCATION(RC_DMT_STORMS_GROTTO_CHEST,         true),
                   LOCATION(RC_DMT_STORMS_GROTTO_FISH,          logic->HasBottle()),
@@ -70,7 +70,7 @@ void RegionTable_Init_DeathMountain() {
                   Entrance(RR_DEATH_MOUNTAIN_TRAIL, {[]{return true;}}),
   });
 
-  areaTable[RR_DMT_GREAT_FAIRY_FOUNTAIN] = Region("DMT Great Fairy Fountain", "DMT Great Fairy Fountain", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DMT_GREAT_FAIRY_FOUNTAIN] = Region("DMT Great Fairy Fountain", "DMT Great Fairy Fountain", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DMT_GREAT_FAIRY_REWARD, logic->CanUse(RG_ZELDAS_LULLABY)),
                 }, {
@@ -78,7 +78,7 @@ void RegionTable_Init_DeathMountain() {
                   Entrance(RR_DEATH_MOUNTAIN_SUMMIT, {[]{return true;}}),
   });
 
-  areaTable[RR_GORON_CITY] = Region("Goron City", "Goron City", RA_GORON_CITY, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GORON_CITY] = Region("Goron City", "Goron City", {RA_GORON_CITY}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->GossipStoneFairy,          {[]{return logic->CallGossipFairyExceptSuns();}}),
                   EventAccess(&logic->StickPot,                  {[]{return logic->StickPot                  || logic->IsChild;}}),
@@ -109,7 +109,7 @@ void RegionTable_Init_DeathMountain() {
                   Entrance(RR_GC_GROTTO_PLATFORM,   {[]{return logic->IsAdult && ((logic->CanUse(RG_SONG_OF_TIME) && ((logic->EffectiveHealth() > 2) || logic->CanUse(RG_GORON_TUNIC) || logic->CanUse(RG_LONGSHOT) || logic->CanUse(RG_NAYRUS_LOVE))) || (logic->EffectiveHealth() > 1 && logic->CanUse(RG_GORON_TUNIC) && logic->CanUse(RG_HOOKSHOT)) || (logic->CanUse(RG_NAYRUS_LOVE) && logic->CanUse(RG_HOOKSHOT)) || (logic->EffectiveHealth() > 2 && logic->CanUse(RG_HOOKSHOT) && ctx->GetTrickOption(RT_GC_GROTTO)));}}),
   });
 
-  areaTable[RR_GC_WOODS_WARP] = Region("GC Woods Warp", "Goron City", RA_GORON_CITY, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GC_WOODS_WARP] = Region("GC Woods Warp", "Goron City", {RA_GORON_CITY}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->GCWoodsWarpOpen, {[]{return logic->GCWoodsWarpOpen || (logic->BlastOrSmash() || logic->CanUse(RG_DINS_FIRE));}}),
                 }, {}, {
@@ -118,7 +118,7 @@ void RegionTable_Init_DeathMountain() {
                   Entrance(RR_THE_LOST_WOODS, {[]{return true;}}),
   });
 
-  areaTable[RR_GC_DARUNIAS_CHAMBER] = Region("GC Darunias Chamber", "Goron City", RA_GORON_CITY, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GC_DARUNIAS_CHAMBER] = Region("GC Darunias Chamber", "Goron City", {RA_GORON_CITY}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->GoronCityChildFire, {[]{return logic->GoronCityChildFire || (logic->IsChild && logic->CanUse(RG_STICKS));}}),
                 }, {
@@ -130,13 +130,13 @@ void RegionTable_Init_DeathMountain() {
                   Entrance(RR_DMC_LOWER_LOCAL, {[]{return logic->IsAdult;}}),
   });
 
-  areaTable[RR_GC_GROTTO_PLATFORM] = Region("GC Grotto Platform", "Goron City", RA_GORON_CITY, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_GC_GROTTO_PLATFORM] = Region("GC Grotto Platform", "Goron City", {RA_GORON_CITY}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_GC_GROTTO,  {[]{return true;}}),
                   Entrance(RR_GORON_CITY, {[]{return logic->EffectiveHealth() > 2 || logic->CanUse(RG_GORON_TUNIC) || logic->CanUse(RG_NAYRUS_LOVE) || ((logic->IsChild || logic->CanUse(RG_SONG_OF_TIME)) && logic->CanUse(RG_LONGSHOT));}}),
   });
 
-  areaTable[RR_GC_SHOP] = Region("GC Shop", "GC Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GC_SHOP] = Region("GC Shop", "GC Shop", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GC_SHOP_ITEM_1, true),
                   LOCATION(RC_GC_SHOP_ITEM_2, true),
@@ -151,7 +151,7 @@ void RegionTable_Init_DeathMountain() {
                   Entrance(RR_GORON_CITY, {[]{return true;}}),
   });
 
-  areaTable[RR_GC_GROTTO] = Region("GC Grotto", "GC Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GC_GROTTO] = Region("GC Grotto", "GC Grotto", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GC_DEKU_SCRUB_GROTTO_LEFT,   logic->CanStunDeku()),
                   LOCATION(RC_GC_DEKU_SCRUB_GROTTO_RIGHT,  logic->CanStunDeku()),
@@ -162,14 +162,14 @@ void RegionTable_Init_DeathMountain() {
                   Entrance(RR_GC_GROTTO_PLATFORM, {[]{return true;}}),
   });
 
-  areaTable[RR_DMC_UPPER_NEARBY] = Region("DMC Upper Nearby", "Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DMC_UPPER_NEARBY] = Region("DMC Upper Nearby", "Death Mountain Crater", {RA_DEATH_MOUNTAIN_CRATER}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DMC_UPPER_LOCAL,       {[]{return logic->FireTimer() >= 48;}}),
                   Entrance(RR_DEATH_MOUNTAIN_SUMMIT, {[]{return true;}}),
                   Entrance(RR_DMC_UPPER_GROTTO,      {[]{return Here(RR_DMC_UPPER_NEARBY, []{return logic->BlastOrSmash() && (logic->FireTimer() >= 8 || logic->Hearts() >= 3);});}})
   });
 
-  areaTable[RR_DMC_UPPER_LOCAL] = Region("DMC Upper Local", "Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DMC_UPPER_LOCAL] = Region("DMC Upper Local", "Death Mountain Crater", {RA_DEATH_MOUNTAIN_CRATER}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->GossipStoneFairy, {[]{return logic->GossipStoneFairy || (logic->HasExplosives() && logic->CallGossipFairyExceptSuns() && (logic->FireTimer() >= 16 || logic->Hearts() >= 3));}}),
                 }, {
@@ -185,7 +185,7 @@ void RegionTable_Init_DeathMountain() {
                   Entrance(RR_DMC_LOWER_NEARBY,         {[]{return false;}}),
   });
 
-  areaTable[RR_DMC_LADDER_AREA_NEARBY] = Region("DMC Ladder Region Nearby", "Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DMC_LADDER_AREA_NEARBY] = Region("DMC Ladder Region Nearby", "Death Mountain Crater", {RA_DEATH_MOUNTAIN_CRATER}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DMC_DEKU_SCRUB, logic->IsChild && logic->CanStunDeku()),
                 }, {
@@ -194,7 +194,7 @@ void RegionTable_Init_DeathMountain() {
                   Entrance(RR_DMC_LOWER_NEARBY, {[]{return logic->Hearts() >= 3 && (logic->CanUse(RG_HOVER_BOOTS) || (ctx->GetTrickOption(RT_DMC_BOULDER_JS) && logic->IsAdult && logic->CanUse(RG_MEGATON_HAMMER)) || (ctx->GetTrickOption(RT_DMC_BOULDER_SKIP) && logic->IsAdult));}}),
   });
 
-  areaTable[RR_DMC_LOWER_NEARBY] = Region("DMC Lower Nearby", "Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DMC_LOWER_NEARBY] = Region("DMC Lower Nearby", "Death Mountain Crater", {RA_DEATH_MOUNTAIN_CRATER}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DMC_LOWER_LOCAL,          {[]{return logic->FireTimer() >= 48;}}),
                   Entrance(RR_GC_DARUNIAS_CHAMBER,      {[]{return true;}}),
@@ -202,7 +202,7 @@ void RegionTable_Init_DeathMountain() {
                   Entrance(RR_DMC_HAMMER_GROTTO,        {[]{return logic->IsAdult && logic->CanUse(RG_MEGATON_HAMMER);}}),
   });
 
-  areaTable[RR_DMC_LOWER_LOCAL] = Region("DMC Lower Local", "Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DMC_LOWER_LOCAL] = Region("DMC Lower Local", "Death Mountain Crater", {RA_DEATH_MOUNTAIN_CRATER}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DMC_LOWER_NEARBY,       {[]{return true;}}),
                   Entrance(RR_DMC_LADDER_AREA_NEARBY, {[]{return logic->FireTimer() >= 8 || logic->Hearts() >= 3;}}),
@@ -210,7 +210,7 @@ void RegionTable_Init_DeathMountain() {
                   Entrance(RR_DMC_CENTRAL_LOCAL,      {[]{return (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT) || (logic->IsAdult && logic->CanShield() && ctx->GetTrickOption(RT_DMC_BOLERO_JUMP))) && logic->FireTimer() >= 24;}}),
   });
 
-  areaTable[RR_DMC_CENTRAL_NEARBY] = Region("DMC Central Nearby", "Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DMC_CENTRAL_NEARBY] = Region("DMC Central Nearby", "Death Mountain Crater", {RA_DEATH_MOUNTAIN_CRATER}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DMC_VOLCANO_FREESTANDING_POH, logic->IsAdult && logic->Hearts() >= 3 && (CanPlantBean(RR_DMC_CENTRAL_LOCAL) || (ctx->GetTrickOption(RT_DMC_HOVER_BEAN_POH) && logic->CanUse(RG_HOVER_BOOTS)))),
                   LOCATION(RC_SHEIK_IN_CRATER,              logic->IsAdult && (logic->FireTimer() >= 8 || logic->Hearts() >= 3)),
@@ -219,7 +219,7 @@ void RegionTable_Init_DeathMountain() {
                   Entrance(RR_DMC_CENTRAL_LOCAL, {[]{return logic->FireTimer() >= 48;}}),
   });
 
-  areaTable[RR_DMC_CENTRAL_LOCAL] = Region("DMC Central Local", "Death Mountain Crater", RA_DEATH_MOUNTAIN_CRATER, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DMC_CENTRAL_LOCAL] = Region("DMC Central Local", "Death Mountain Crater", {RA_DEATH_MOUNTAIN_CRATER}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->BeanPlantFairy, {[]{return logic->BeanPlantFairy || (CanPlantBean(RR_DMC_CENTRAL_LOCAL) && logic->CanUse(RG_SONG_OF_STORMS));}}),
                 }, {
@@ -233,7 +233,7 @@ void RegionTable_Init_DeathMountain() {
                   Entrance(RR_FIRE_TEMPLE_ENTRYWAY, {[]{return (logic->IsChild && logic->Hearts() >= 3 && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).IsNot(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF)) || (logic->IsAdult && logic->FireTimer() >= 24);}}),
   });
 
-  areaTable[RR_DMC_GREAT_FAIRY_FOUNTAIN] = Region("DMC Great Fairy Fountain", "DMC Great Fairy Fountain", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DMC_GREAT_FAIRY_FOUNTAIN] = Region("DMC Great Fairy Fountain", "DMC Great Fairy Fountain", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DMC_GREAT_FAIRY_REWARD, logic->CanUse(RG_ZELDAS_LULLABY)),
                 }, {
@@ -241,7 +241,7 @@ void RegionTable_Init_DeathMountain() {
                   Entrance(RR_DMC_LOWER_LOCAL, {[]{return true;}}),
   });
 
-  areaTable[RR_DMC_UPPER_GROTTO] = Region("DMC Upper Grotto", "DMC Upper Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+  areaTable[RR_DMC_UPPER_GROTTO] = Region("DMC Upper Grotto", "DMC Upper Grotto", {}, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LOCATION(RC_DMC_UPPER_GROTTO_CHEST,         true),
                   LOCATION(RC_DMC_UPPER_GROTTO_FISH,          logic->HasBottle()),
@@ -253,7 +253,7 @@ void RegionTable_Init_DeathMountain() {
                   Entrance(RR_DMC_UPPER_LOCAL, {[]{return true;}}),
   });
 
-  areaTable[RR_DMC_HAMMER_GROTTO] = Region("DMC Hammer Grotto", "DMC Hammer Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DMC_HAMMER_GROTTO] = Region("DMC Hammer Grotto", "DMC Hammer Grotto", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DMC_DEKU_SCRUB_GROTTO_LEFT,   logic->CanStunDeku()),
                   LOCATION(RC_DMC_DEKU_SCRUB_GROTTO_RIGHT,  logic->CanStunDeku()),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp
index b47ec95a5..1a4ccbe00 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp
@@ -8,7 +8,7 @@ void RegionTable_Init_DekuTree() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[RR_DEKU_TREE_ENTRYWAY] = Region("Deku Tree Entryway", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DEKU_TREE_ENTRYWAY] = Region("Deku Tree Entryway", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DEKU_TREE_LOBBY,      {[]{return ctx->GetDungeon(DEKU_TREE)->IsVanilla();}}),
                   Entrance(RR_DEKU_TREE_MQ_LOBBY,   {[]{return ctx->GetDungeon(DEKU_TREE)->IsMQ();}}),
@@ -19,7 +19,7 @@ void RegionTable_Init_DekuTree() {
   |     VANILLA DUNGEON      |
   ---------------------------*/
   if (ctx->GetDungeon(DEKU_TREE)->IsVanilla()) {
-  areaTable[RR_DEKU_TREE_LOBBY] = Region("Deku Tree Lobby", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DEKU_TREE_LOBBY] = Region("Deku Tree Lobby", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
                   EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives() || logic->CanUse(RG_DINS_FIRE));}}),
@@ -36,13 +36,13 @@ void RegionTable_Init_DekuTree() {
                   Entrance(RR_DEKU_TREE_BOSS_ENTRYWAY,     {[]{return false;}}),
   });
 
-  areaTable[RR_DEKU_TREE_2F_MIDDLE_ROOM] = Region("Deku Tree 2F Middle Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DEKU_TREE_2F_MIDDLE_ROOM] = Region("Deku Tree 2F Middle Room", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DEKU_TREE_LOBBY,         {[]{return Here(RR_DEKU_TREE_2F_MIDDLE_ROOM, []{return logic->CanReflectNuts() || logic->CanUse(RG_MEGATON_HAMMER);});}}),
                   Entrance(RR_DEKU_TREE_SLINGSHOT_ROOM,{[]{return Here(RR_DEKU_TREE_2F_MIDDLE_ROOM, []{return logic->CanReflectNuts() || logic->CanUse(RG_MEGATON_HAMMER);});}}),
   });
 
-  areaTable[RR_DEKU_TREE_SLINGSHOT_ROOM] = Region("Deku Tree Slingshot Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DEKU_TREE_SLINGSHOT_ROOM] = Region("Deku Tree Slingshot Room", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DEKU_TREE_SLINGSHOT_CHEST,           true),
                   LOCATION(RC_DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST, true),
@@ -51,7 +51,7 @@ void RegionTable_Init_DekuTree() {
                   Entrance(RR_DEKU_TREE_2F_MIDDLE_ROOM, {[]{return logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_HOVER_BOOTS);}}),
   });
 
-  areaTable[RR_DEKU_TREE_COMPASS_ROOM] = Region("Deku Tree Compass Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DEKU_TREE_COMPASS_ROOM] = Region("Deku Tree Compass Room", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
                   EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives() || logic->CanUse(RG_DINS_FIRE));}}),
@@ -66,7 +66,7 @@ void RegionTable_Init_DekuTree() {
                   Entrance(RR_DEKU_TREE_BOSS_ENTRYWAY, {[]{return false;}}),
   });
 
-  areaTable[RR_DEKU_TREE_BASEMENT_LOWER] = Region("Deku Tree Basement Lower", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DEKU_TREE_BASEMENT_LOWER] = Region("Deku Tree Basement Lower", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
                   EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives() || logic->CanUse(RG_DINS_FIRE));},
@@ -84,25 +84,25 @@ void RegionTable_Init_DekuTree() {
                   Entrance(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM,   {[]{return false;}}),
   });
 
-  areaTable[RR_DEKU_TREE_BASEMENT_SCRUB_ROOM] = Region("Deku Tree Basement Scrub Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DEKU_TREE_BASEMENT_SCRUB_ROOM] = Region("Deku Tree Basement Scrub Room", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DEKU_TREE_BASEMENT_LOWER,            {[]{return true;}}),
                   Entrance(RR_DEKU_TREE_BASEMENT_WATER_ROOM_FRONT, {[]{return Here(RR_DEKU_TREE_BASEMENT_SCRUB_ROOM, []{return logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW);});}}),
   });
 
-  areaTable[RR_DEKU_TREE_BASEMENT_WATER_ROOM_FRONT] = Region("Deku Tree Basement Water Room Front", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DEKU_TREE_BASEMENT_WATER_ROOM_FRONT] = Region("Deku Tree Basement Water Room Front", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DEKU_TREE_BASEMENT_SCRUB_ROOM,      {[]{return true;}}),
                   Entrance(RR_DEKU_TREE_BASEMENT_WATER_ROOM_BACK, {[]{return logic->HasItem(RG_BRONZE_SCALE) || ctx->GetTrickOption(RT_DEKU_B1_BACKFLIP_OVER_SPIKED_LOG);}}),
   });
 
-  areaTable[RR_DEKU_TREE_BASEMENT_WATER_ROOM_BACK] = Region("Deku Tree Basement Water Room Back", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DEKU_TREE_BASEMENT_WATER_ROOM_BACK] = Region("Deku Tree Basement Water Room Back", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DEKU_TREE_BASEMENT_WATER_ROOM_FRONT, {[]{return logic->HasItem(RG_BRONZE_SCALE) || ctx->GetTrickOption(RT_DEKU_B1_BACKFLIP_OVER_SPIKED_LOG);}}),
                   Entrance(RR_DEKU_TREE_BASEMENT_TORCH_ROOM,       {[]{return true;}}),
   });
 
-  areaTable[RR_DEKU_TREE_BASEMENT_TORCH_ROOM] = Region("Deku Tree Basement Torch Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DEKU_TREE_BASEMENT_TORCH_ROOM] = Region("Deku Tree Basement Torch Room", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
                   EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives() || logic->CanUse(RG_DINS_FIRE));}}),
@@ -112,7 +112,7 @@ void RegionTable_Init_DekuTree() {
                   Entrance(RR_DEKU_TREE_BASEMENT_BACK_LOBBY,      {[]{return Here(RR_DEKU_TREE_BASEMENT_TORCH_ROOM, []{return logic->HasFireSourceWithTorch() || logic->CanUse(RG_FAIRY_BOW);});}}),
   });
 
-  areaTable[RR_DEKU_TREE_BASEMENT_BACK_LOBBY] = Region("Deku Tree Basement Back Lobby", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DEKU_TREE_BASEMENT_BACK_LOBBY] = Region("Deku Tree Basement Back Lobby", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
                   EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (Here(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, []{return logic->HasFireSourceWithTorch() || logic->CanUse(RG_FAIRY_BOW);}) &&
@@ -125,7 +125,7 @@ void RegionTable_Init_DekuTree() {
                   Entrance(RR_DEKU_TREE_BASEMENT_UPPER,      {[]{return Here(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, []{return logic->HasFireSourceWithTorch() || logic->CanUse(RG_FAIRY_BOW);}) && logic->IsChild;}}),
   });
 
-  areaTable[RR_DEKU_TREE_BASEMENT_BACK_ROOM] = Region("Deku Tree Basement Back Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DEKU_TREE_BASEMENT_BACK_ROOM] = Region("Deku Tree Basement Back Room", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DEKU_TREE_GS_BASEMENT_BACK_ROOM, logic->HookshotOrBoomerang()),
                 }, {
@@ -133,7 +133,7 @@ void RegionTable_Init_DekuTree() {
                   Entrance(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, {[]{return true;}}),
   });
 
-  areaTable[RR_DEKU_TREE_BASEMENT_UPPER] = Region("Deku Tree Basement Upper", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DEKU_TREE_BASEMENT_UPPER] = Region("Deku Tree Basement Upper", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
                   EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives() || logic->CanUse(RG_DINS_FIRE));}}),
@@ -144,7 +144,7 @@ void RegionTable_Init_DekuTree() {
                   Entrance(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM,   {[]{return Here(RR_DEKU_TREE_BASEMENT_UPPER, []{return logic->HasFireSourceWithTorch() || (ctx->GetTrickOption(RT_DEKU_B1_BOW_WEBS) && logic->IsAdult && logic->CanUse(RG_FAIRY_BOW));});}}),
   });
 
-  areaTable[RR_DEKU_TREE_OUTSIDE_BOSS_ROOM] = Region("Deku Tree Outside Boss Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DEKU_TREE_OUTSIDE_BOSS_ROOM] = Region("Deku Tree Outside Boss Room", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DEKU_TREE_BASEMENT_UPPER, {[]{return true;}}),
                   Entrance(RR_DEKU_TREE_BOSS_ENTRYWAY,  {[]{return (logic->HasItem(RG_BRONZE_SCALE) || Here(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM, []{return logic->CanUse(RG_IRON_BOOTS);})) && Here(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM, []{return logic->CanReflectNuts();});}}),
@@ -155,7 +155,7 @@ void RegionTable_Init_DekuTree() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (ctx->GetDungeon(DEKU_TREE)->IsMQ()) {
-  areaTable[RR_DEKU_TREE_MQ_LOBBY] = Region("Deku Tree MQ Lobby", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DEKU_TREE_MQ_LOBBY] = Region("Deku Tree MQ Lobby", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
                   EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives() || logic->CanUse(RG_DINS_FIRE));}}),
@@ -176,7 +176,7 @@ void RegionTable_Init_DekuTree() {
                   Entrance(RR_DEKU_TREE_MQ_BASEMENT_LEDGE,            {[]{return ctx->GetTrickOption(RT_DEKU_B1_SKIP) || Here(RR_DEKU_TREE_MQ_LOBBY, []{return logic->IsAdult;});}}),
   });
 
-  areaTable[RR_DEKU_TREE_MQ_COMPASS_ROOM] = Region("Deku Tree MQ Compass Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DEKU_TREE_MQ_COMPASS_ROOM] = Region("Deku Tree MQ Compass Room", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DEKU_TREE_MQ_COMPASS_CHEST,   true),
                   LOCATION(RC_DEKU_TREE_MQ_GS_COMPASS_ROOM, logic->HookshotOrBoomerang() &&
@@ -188,7 +188,7 @@ void RegionTable_Init_DekuTree() {
                   Entrance(RR_DEKU_TREE_MQ_LOBBY, {[]{return true;}}),
   });
 
-  areaTable[RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_FRONT] = Region("Deku Tree MQ Basement Water Room Front", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_FRONT] = Region("Deku Tree MQ Basement Water Room Front", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST, true),
   }, {
@@ -198,7 +198,7 @@ void RegionTable_Init_DekuTree() {
                   Entrance(RR_DEKU_TREE_MQ_LOBBY,                    {[]{return true;}}),
   });
 
-  areaTable[RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK] = Region("Deku Tree MQ Basement Water Room Back", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK] = Region("Deku Tree MQ Basement Water Room Back", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST, logic->CanUse(RG_SONG_OF_TIME)),
   }, {
@@ -210,7 +210,7 @@ void RegionTable_Init_DekuTree() {
                   Entrance(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_FRONT, {[]{return true;}}),
   });
 
-  areaTable[RR_DEKU_TREE_MQ_BASEMENT_BACK_ROOM] = Region("Deku Tree MQ Basement Back Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DEKU_TREE_MQ_BASEMENT_BACK_ROOM] = Region("Deku Tree MQ Basement Back Room", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM, (logic->IsAdult && logic->CanUse(RG_LONGSHOT)) || (logic->CanUse(RG_SONG_OF_TIME) && logic->HookshotOrBoomerang())),
                   LOCATION(RC_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM,   logic->HasFireSourceWithTorch() && logic->HookshotOrBoomerang()),
@@ -220,7 +220,7 @@ void RegionTable_Init_DekuTree() {
                   Entrance(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK, {[]{return (logic->IsChild && logic->CanUse(RG_KOKIRI_SWORD)) || logic->CanUseProjectile() || (logic->CanUse(RG_NUTS) && (logic->IsChild && logic->CanUse(RG_STICKS)));}}),
   });
 
-  areaTable[RR_DEKU_TREE_MQ_BASEMENT_LEDGE] = Region("Deku Tree MQ Basement Ledge", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DEKU_TREE_MQ_BASEMENT_LEDGE] = Region("Deku Tree MQ Basement Ledge", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DEKU_TREE_MQ_DEKU_SCRUB, logic->CanStunDeku()),
   }, {
@@ -232,7 +232,7 @@ void RegionTable_Init_DekuTree() {
   });
 
     areaTable[RR_DEKU_TREE_MQ_OUTSIDE_BOSS_ROOM] =
-            Region("Deku Tree MQ Outside Boss Room", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {},
+            Region("Deku Tree MQ Outside Boss Room", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {}, {},
                  {
                      // Exits
                      Entrance(RR_DEKU_TREE_MQ_BASEMENT_LEDGE, {[]{ return true; }}),
@@ -244,7 +244,7 @@ void RegionTable_Init_DekuTree() {
     |         BOSS ROOM         |
     ---------------------------*/
     areaTable[RR_DEKU_TREE_BOSS_ENTRYWAY] =
-        Region("Deku Tree Boss Entryway", "Deku Tree", RA_DEKU_TREE, NO_DAY_NIGHT_CYCLE, {}, {},
+        Region("Deku Tree Boss Entryway", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {}, {},
              {
                  // Exits
                  Entrance(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM, { [] { return ctx->GetDungeon(DEKU_TREE)->IsVanilla(); } }),
@@ -253,7 +253,7 @@ void RegionTable_Init_DekuTree() {
              });
 
     areaTable[RR_DEKU_TREE_BOSS_ROOM] =
-        Region("Deku Tree Boss Room", "Deku Tree", RA_NONE, NO_DAY_NIGHT_CYCLE,
+        Region("Deku Tree Boss Room", "Deku Tree", {}, NO_DAY_NIGHT_CYCLE,
              {
                  // Events
                  EventAccess(&logic->DekuTreeClear, { [] {
@@ -270,6 +270,6 @@ void RegionTable_Init_DekuTree() {
              {
                  // Exits
                  Entrance(RR_DEKU_TREE_BOSS_ENTRYWAY, { [] { return true; } }),
-                 Entrance(RR_KF_OUTSIDE_DEKU_TREE, { [] { return logic->DekuTreeClear; } }),
+                 Entrance(RR_KF_OUTSIDE_DEKU_TREE, { [] { return logic->DekuTreeClear; } }, false),
              });
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp
index 9d840353f..8262a45e2 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp
@@ -8,7 +8,7 @@ void RegionTable_Init_DodongosCavern() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[RR_DODONGOS_CAVERN_ENTRYWAY] = Region("Dodongos Cavern Entryway", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_ENTRYWAY] = Region("Dodongos Cavern Entryway", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_BEGINNING,    {[]{return ctx->GetDungeon(DODONGOS_CAVERN)->IsVanilla();}}),
                   Entrance(RR_DODONGOS_CAVERN_MQ_BEGINNING, {[]{return ctx->GetDungeon(DODONGOS_CAVERN)->IsMQ();}}),
@@ -19,13 +19,13 @@ void RegionTable_Init_DodongosCavern() {
   |     VANILLA DUNGEON      |
   ---------------------------*/
   if (ctx->GetDungeon(DODONGOS_CAVERN)->IsVanilla()) {
-  areaTable[RR_DODONGOS_CAVERN_BEGINNING] = Region("Dodongos Cavern Beginning", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_BEGINNING] = Region("Dodongos Cavern Beginning", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_ENTRYWAY, {[]{return true;}}),
                   Entrance(RR_DODONGOS_CAVERN_LOBBY,    {[]{return Here(RR_DODONGOS_CAVERN_BEGINNING, []{return logic->CanBreakMudWalls() || logic->HasItem(RG_GORONS_BRACELET);});}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_LOBBY] = Region("Dodongos Cavern Lobby", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DODONGOS_CAVERN_LOBBY] = Region("Dodongos Cavern Lobby", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->GossipStoneFairy, {[]{return (Here(RR_DODONGOS_CAVERN_LOBBY, []{return logic->CanBreakMudWalls();}) || logic->HasItem(RG_GORONS_BRACELET)) && logic->CallGossipFairy();}}),
                 }, {
@@ -44,13 +44,13 @@ void RegionTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_BOSS_ENTRYWAY,{[]{return false;}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_LOBBY_SWITCH] = Region("Dodongos Cavern Lobby Switch", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_LOBBY_SWITCH] = Region("Dodongos Cavern Lobby Switch", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_LOBBY,        {[]{return true;}}),
                   Entrance(RR_DODONGOS_CAVERN_DODONGO_ROOM, {[]{return true;}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_SE_CORRIDOR] = Region("Dodongos Cavern SE Corridor", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_SE_CORRIDOR] = Region("Dodongos Cavern SE Corridor", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DODONGOS_CAVERN_GS_SCARECROW, logic->CanUse(RG_SCARECROW) || (logic->IsAdult && logic->CanUse(RG_LONGSHOT)) || (ctx->GetTrickOption(RT_DC_SCARECROW_GS) && (logic->CanAttack()))),
                 }, {
@@ -61,7 +61,7 @@ void RegionTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_NEAR_LOWER_LIZALFOS, {[]{return true;}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_SE_ROOM] = Region("Dodongos Cavern SE Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_SE_ROOM] = Region("Dodongos Cavern SE Room", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS, logic->CanAttack()),
                 }, {
@@ -69,13 +69,13 @@ void RegionTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_SE_CORRIDOR, {[]{return true;}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_NEAR_LOWER_LIZALFOS] = Region("Dodongos Cavern Near Lower Lizalfos", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_NEAR_LOWER_LIZALFOS] = Region("Dodongos Cavern Near Lower Lizalfos", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_SE_CORRIDOR,    {[]{return true;}}),
                   Entrance(RR_DODONGOS_CAVERN_LOWER_LIZALFOS, {[]{return true;}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_LOWER_LIZALFOS] = Region("Dodongos Cavern Lower Lizalfos", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_LOWER_LIZALFOS] = Region("Dodongos Cavern Lower Lizalfos", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_NEAR_LOWER_LIZALFOS, {[]{return Here(RR_DODONGOS_CAVERN_LOWER_LIZALFOS, []{return logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_STICKS) || logic->CanUse(RG_KOKIRI_SWORD) ||
                     logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives();});}}),
@@ -83,14 +83,14 @@ void RegionTable_Init_DodongosCavern() {
                     logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives();});}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_DODONGO_ROOM] = Region("Dodongos Cavern Dodongo Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_DODONGO_ROOM] = Region("Dodongos Cavern Dodongo Room", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_LOBBY_SWITCH,      {[]{return logic->HasFireSourceWithTorch();}}),
                   Entrance(RR_DODONGOS_CAVERN_LOWER_LIZALFOS,    {[]{return true;}}),
                   Entrance(RR_DODONGOS_CAVERN_NEAR_DODONGO_ROOM, {[]{return Here(RR_DODONGOS_CAVERN_DODONGO_ROOM, []{return logic->BlastOrSmash() || logic->HasItem(RG_GORONS_BRACELET);});}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_NEAR_DODONGO_ROOM] = Region("Dodongos Cavern Near Dodongo Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_NEAR_DODONGO_ROOM] = Region("Dodongos Cavern Near Dodongo Room", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS, logic->CanStunDeku()),
                 }, {
@@ -98,14 +98,14 @@ void RegionTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_DODONGO_ROOM, {[]{return true;}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_STAIRS_LOWER] = Region("Dodongos Cavern Stairs Lower", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_STAIRS_LOWER] = Region("Dodongos Cavern Stairs Lower", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_LOBBY,        {[]{return true;}}),
                   Entrance(RR_DODONGOS_CAVERN_STAIRS_UPPER, {[]{return logic->HasExplosives() || logic->HasItem(RG_GORONS_BRACELET) || logic->CanUse(RG_DINS_FIRE) || (ctx->GetTrickOption(RT_DC_STAIRCASE) && logic->CanUse(RG_FAIRY_BOW));}}),
                   Entrance(RR_DODONGOS_CAVERN_COMPASS_ROOM, {[]{return Here(RR_DODONGOS_CAVERN_STAIRS_LOWER, []{return logic->BlastOrSmash() || logic->HasItem(RG_GORONS_BRACELET);});}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_STAIRS_UPPER] = Region("Dodongos Cavern Stairs Upper", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_STAIRS_UPPER] = Region("Dodongos Cavern Stairs Upper", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS, Here(RR_DODONGOS_CAVERN_FAR_BRIDGE, []{return logic->HookshotOrBoomerang();}) || logic->CanUse(RG_LONGSHOT)),
                   LOCATION(RC_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS,  logic->IsAdult || logic->CanAttack() || (HasAccessTo(RR_DODONGOS_CAVERN_STAIRS_LOWER) && logic->CanUse(RG_LONGSHOT) && ctx->GetTrickOption(RT_DC_VINES_GS))),
@@ -115,7 +115,7 @@ void RegionTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_ARMOS_ROOM,   {[]{return true;}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_COMPASS_ROOM] = Region("Dodongos Cavern Compass Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_COMPASS_ROOM] = Region("Dodongos Cavern Compass Room", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DODONGOS_CAVERN_COMPASS_CHEST, true),
                 }, {
@@ -123,13 +123,13 @@ void RegionTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_STAIRS_LOWER, {[]{return logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives() || logic->HasItem(RG_GORONS_BRACELET);}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_ARMOS_ROOM] = Region("Dodongos Cavern Armos Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_ARMOS_ROOM] = Region("Dodongos Cavern Armos Room", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_STAIRS_UPPER,    {[]{return true;}}),
                   Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER, {[]{return true;}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER] = Region("Dodongos Cavern Bomb Room Lower", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER] = Region("Dodongos Cavern Bomb Room Lower", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST, true),
                 }, {
@@ -139,7 +139,7 @@ void RegionTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_UPPER,      {[]{return (logic->IsAdult && ctx->GetTrickOption(RT_DC_JUMP)) || logic->CanUse(RG_HOVER_BOOTS) || (logic->IsAdult && logic->CanUse(RG_LONGSHOT));}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_2F_SIDE_ROOM] = Region("Dodongos Cavern 2F Side Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_2F_SIDE_ROOM] = Region("Dodongos Cavern 2F Side Room", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,  logic->CanStunDeku()),
                   LOCATION(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT, logic->CanStunDeku()),
@@ -148,13 +148,13 @@ void RegionTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER, {[]{return true;}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_FIRST_SLINGSHOT_ROOM] = Region("Dodongos Cavern First Slingshot Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_FIRST_SLINGSHOT_ROOM] = Region("Dodongos Cavern First Slingshot Room", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER, {[]{return true;}}),
                   Entrance(RR_DODONGOS_CAVERN_UPPER_LIZALFOS,  {[]{return logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || ctx->GetTrickOption(RT_DC_SLINGSHOT_SKIP);}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_UPPER_LIZALFOS] = Region("Dodongos Cavern Upper Lizalfos", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_UPPER_LIZALFOS] = Region("Dodongos Cavern Upper Lizalfos", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_LOWER_LIZALFOS,        {[]{return true;}}),
                   Entrance(RR_DODONGOS_CAVERN_FIRST_SLINGSHOT_ROOM,  {[]{return Here(RR_DODONGOS_CAVERN_LOWER_LIZALFOS, []{return logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_STICKS) || logic->CanUse(RG_KOKIRI_SWORD) || 
@@ -163,13 +163,13 @@ void RegionTable_Init_DodongosCavern() {
                     logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives();});}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_SECOND_SLINGSHOT_ROOM] = Region("Dodongos Cavern Second Slingshot Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_SECOND_SLINGSHOT_ROOM] = Region("Dodongos Cavern Second Slingshot Room", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_UPPER_LIZALFOS,  {[]{return true;}}),
                   Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_UPPER, {[]{return logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || ctx->GetTrickOption(RT_DC_SLINGSHOT_SKIP);}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_BOMB_ROOM_UPPER] = Region("Dodongos Cavern Bomb Room Upper", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_BOMB_ROOM_UPPER] = Region("Dodongos Cavern Bomb Room Upper", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DODONGOS_CAVERN_BOMB_BAG_CHEST, true),
                 }, {
@@ -179,7 +179,7 @@ void RegionTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_FAR_BRIDGE,            {[]{return true;}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_FAR_BRIDGE] = Region("Dodongos Cavern Far Bridge", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_FAR_BRIDGE] = Region("Dodongos Cavern Far Bridge", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST, Here(RR_DODONGOS_CAVERN_FAR_BRIDGE, []{return logic->BlastOrSmash();})),
                 }, {
@@ -188,7 +188,7 @@ void RegionTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_UPPER, {[]{return true;}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_BOSS_AREA] = Region("Dodongos Cavern Boss Region", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DODONGOS_CAVERN_BOSS_AREA] = Region("Dodongos Cavern Boss Region", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FairyPot, {[]{return true;}}),
                 }, {}, {
@@ -198,7 +198,7 @@ void RegionTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_BOSS_ENTRYWAY, {[]{return true;}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_BACK_ROOM] = Region("Dodongos Cavern Back Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_BACK_ROOM] = Region("Dodongos Cavern Back Room", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DODONGOS_CAVERN_GS_BACK_ROOM, logic->CanAttack()),
                 }, {
@@ -211,13 +211,13 @@ void RegionTable_Init_DodongosCavern() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (ctx->GetDungeon(DODONGOS_CAVERN)->IsMQ()) {
-  areaTable[RR_DODONGOS_CAVERN_MQ_BEGINNING] = Region("Dodongos Cavern MQ Beginning", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_MQ_BEGINNING] = Region("Dodongos Cavern MQ Beginning", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_ENTRYWAY, {[]{return true;}}),
                   Entrance(RR_DODONGOS_CAVERN_MQ_LOBBY, {[]{return Here(RR_DODONGOS_CAVERN_MQ_BEGINNING, []{return logic->BlastOrSmash() || logic->HasItem(RG_GORONS_BRACELET);});}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_MQ_LOBBY] = Region("Dodongos Cavern MQ Lobby", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DODONGOS_CAVERN_MQ_LOBBY] = Region("Dodongos Cavern MQ Lobby", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->GossipStoneFairy, {[]{return (Here(RR_DODONGOS_CAVERN_MQ_LOBBY, []{return logic->CanBreakMudWalls();}) || logic->CanUse(RG_GORONS_BRACELET)) && logic->CallGossipFairy();}}),
   }, {
@@ -238,7 +238,7 @@ void RegionTable_Init_DodongosCavern() {
                                                                                                                                                                     (logic->IsChild && ctx->GetTrickOption(RT_DC_MQ_CHILD_EYES))));});}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_MQ_MOUTH_SIDE_BRIDGE] = Region("Dodongos Cavern MQ Mouth Side Bridge", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DODONGOS_CAVERN_MQ_MOUTH_SIDE_BRIDGE] = Region("Dodongos Cavern MQ Mouth Side Bridge", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->ClearMQDCUpperLobbyRocks, {[]{return logic->BlastOrSmash() || logic->CanUse(RG_DINS_FIRE);}}),
   }, {}, {
@@ -250,7 +250,7 @@ void RegionTable_Init_DodongosCavern() {
                   //it is possible to use bunny hood speed, hovers and a jumpslash to go between here and the other bridge (included with TORCH_ROOM_LOWER), but this would be a trick
   });
 
-  areaTable[RR_DODONGOS_CAVERN_MQ_STAIRS_LOWER] = Region("Dodongos Cavern MQ Stairs Lower", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DODONGOS_CAVERN_MQ_STAIRS_LOWER] = Region("Dodongos Cavern MQ Stairs Lower", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   //EventAccess(&logic->CanClimbDCStairs, {[]{return logic->HasExplosives || logic->CanUse(RG_DINS_FIRE) || (ctx->GetTrickOption(RT_DC_STAIRCASE) && logic->CanUse(RG_FAIRY_BOW));}}),
   }, {}, {
@@ -261,7 +261,7 @@ void RegionTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_MQ_STAIRS_PAST_MUD_WALL, {[]{return Here(RR_DODONGOS_CAVERN_MQ_STAIRS_LOWER, []{return logic->CanBreakMudWalls();});}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_MQ_STAIRS_PAST_MUD_WALL] = Region("Dodongos Cavern MQ Stairs Past Mud Wall", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DODONGOS_CAVERN_MQ_STAIRS_PAST_MUD_WALL] = Region("Dodongos Cavern MQ Stairs Past Mud Wall", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->DekuBabaSticks, {[]{return logic->CanGetDekuBabaSticks();}}),
                   //EventAccess(&logic->CanClimbDCStairs, {[]{return logic->CanUse(RG_GORONS_BRACELET) && (logic->CanUse(RG_STICKS));}}),
@@ -274,7 +274,7 @@ void RegionTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_MQ_STAIRS_LOWER, {[]{return true;}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_MQ_STAIRS_UPPER] = Region("Dodongos Cavern MQ Stairs Upper", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_MQ_STAIRS_UPPER] = Region("Dodongos Cavern MQ Stairs Upper", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,       logic->CanStunDeku()),
   }, {
@@ -283,7 +283,7 @@ void RegionTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_MQ_STAIRS_PAST_BIG_SKULLTULAS, {[]{return logic->CanPassEnemy(RE_BIG_SKULLTULA) || logic->CanUse(RG_HOVER_BOOTS);}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_MQ_STAIRS_PAST_BIG_SKULLTULAS] = Region("Dodongos Cavern MQ Past Big Skulltulas", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_MQ_STAIRS_PAST_BIG_SKULLTULAS] = Region("Dodongos Cavern MQ Past Big Skulltulas", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_MQ_STAIRS_UPPER, {[]{return logic->CanPassEnemy(RE_BIG_SKULLTULA) || logic->CanUse(RG_HOVER_BOOTS);}}),
                   Entrance(RR_DODONGOS_CAVERN_MQ_STAIRS_LOWER, {[]{return logic->TakeDamage();}}),
@@ -293,7 +293,7 @@ void RegionTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_MQ_DODONGO_ROOM, {[]{return true;}}),//if we add BONKO or other crate logic, logic for silver rupees goes here
   });
 
-  areaTable[RR_DODONGOS_CAVERN_MQ_DODONGO_ROOM] = Region("Dodongos Cavern MQ Dodongo Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_MQ_DODONGO_ROOM] = Region("Dodongos Cavern MQ Dodongo Room", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DODONGOS_CAVERN_MQ_COMPASS_CHEST, logic->CanKillEnemy(RE_DODONGO) || logic->HasItem(RG_GORONS_BRACELET)),
   }, {
@@ -302,7 +302,7 @@ void RegionTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_LOWER,         {[]{return Here(RR_DODONGOS_CAVERN_MQ_DODONGO_ROOM, []{return logic->CanKillEnemy(RE_DODONGO) || logic->HasItem(RG_GORONS_BRACELET);});}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_LOWER] = Region("Dodongos Cavern MQ Torch Puzzle Lower", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_LOWER] = Region("Dodongos Cavern MQ Torch Puzzle Lower", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->ClearMQDCUpperLobbyRocks, {[]{return (((logic->IsAdult /*or bunny hood jump*/) && ctx->GetTrickOption(RT_DC_JUMP)) || logic->CanUse(RG_HOVER_BOOTS)) && logic->CanUse(RG_STICKS);}}),
   }, {}, {
@@ -315,13 +315,13 @@ void RegionTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS,     {[]{return logic->CanUse(RG_STICKS) && logic->HasItem(RG_GORONS_BRACELET);}}), //Implies access to RR_DODONGOS_CAVERN_MQ_BIG_BLOCK_ROOM from here
  });
 
-  areaTable[RR_DODONGOS_CAVERN_MQ_BIG_BLOCK_ROOM] = Region("Dodongos Cavern MQ Torch Puzzle Lower", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_MQ_BIG_BLOCK_ROOM] = Region("Dodongos Cavern MQ Torch Puzzle Lower", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_LOWER, {[]{return logic->CanPassEnemy(RE_BIG_SKULLTULA);}}),
                   Entrance(RR_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS,     {[]{return (logic->HasFireSource() && logic->HasItem(RG_GORONS_BRACELET)) || logic->CanBreakMudWalls();}}), //Requires stregnth 0, If you can somehow warp into this room, add logic->CanPassEnemy(RE_BIG_SKULLTULA)
   });
 
-  areaTable[RR_DODONGOS_CAVERN_MQ_LARVAE_ROOM] = Region("Dodongos Cavern MQ Larvae Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_MQ_LARVAE_ROOM] = Region("Dodongos Cavern MQ Larvae Room", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST, true), //implied logic->CanKillEnemy(RE_GOHMA_LARVA) based on entry reqs with a trick to kill with nuts
                   LOCATION(RC_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM,    true), //implied logic->CanKillEnemy(RE_GOLD_SKULTULLA) based on entry reqs. Add crate logic when BONKO is added
@@ -330,7 +330,7 @@ void RegionTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_LOWER, {[]{return true;}}), //implied logic->CanKillEnemy(RE_GOHMA_LARVA) based on entry reqs with a trick to kill with nuts
   });
 
-  areaTable[RR_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS] = Region("Dodongos Cavern MQ Before Upper Lizalfos", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS] = Region("Dodongos Cavern MQ Before Upper Lizalfos", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM,   logic->BlastOrSmash()), //Implied CanGetEnemyDrop(RE_GOLD_SKULLTULA)
   }, {
@@ -340,13 +340,13 @@ void RegionTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_MQ_TWO_FIRES_ROOM, {[]{return Here(RR_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS, []{return logic->CanKillEnemy(RE_LIZALFOS);});}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_MQ_TWO_FIRES_ROOM] = Region("Dodongos Cavern MQ Before Upper Lizalfos", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_MQ_TWO_FIRES_ROOM] = Region("Dodongos Cavern MQ Before Upper Lizalfos", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS,     {[]{return true;}}),
                   Entrance(RR_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_UPPER, {[]{return logic->IsAdult || (Here(RR_DODONGOS_CAVERN_MQ_TWO_FIRES_ROOM, []{return logic->BlastOrSmash() || (logic->CanAttack() && logic->HasItem(RG_GORONS_BRACELET));}));}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_UPPER] = Region("Dodongos Cavern MQ Torch Puzzle Upper", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_UPPER] = Region("Dodongos Cavern MQ Torch Puzzle Upper", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->ClearMQDCUpperLobbyRocks, {[]{return logic->CanDetonateUprightBombFlower() || logic->CanUse(RG_MEGATON_HAMMER);}}),
   }, {
@@ -359,7 +359,7 @@ void RegionTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_MQ_TWO_FIRES_ROOM,     {[]{return true;}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE] = Region("Dodongos Cavern MQ Lower Right Side", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE] = Region("Dodongos Cavern MQ Lower Right Side", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS, (logic->CanBreakMudWalls() || logic->HasItem(RG_GORONS_BRACELET)) && logic->CanStunDeku()),
   }, {
@@ -367,7 +367,7 @@ void RegionTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_MQ_LOWER_LIZALFOS, {[]{return Here(RR_DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE, []{return logic->CanDetonateBombFlowers() || logic->HasItem(RG_GORONS_BRACELET);}) && logic->CanHitEyeTargets();}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_MQ_LOWER_LIZALFOS] = Region("Dodongos Cavern MQ Lower Lizalfos", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DODONGOS_CAVERN_MQ_LOWER_LIZALFOS] = Region("Dodongos Cavern MQ Lower Lizalfos", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {
                   //When you add wonder item logic for behind the lavafall, use Here(RR_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS) to account for jumping down instead of an exit
                   //because the doors are sealed when entering from the top and you can't spawn the lower lizalfos
   }, {}, {
@@ -376,7 +376,7 @@ void RegionTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_MQ_POES_ROOM,        {[]{return Here(RR_DODONGOS_CAVERN_MQ_LOWER_LIZALFOS, []{return logic->CanKillEnemy(RE_LIZALFOS);});}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_MQ_POES_ROOM] = Region("Dodongos Cavern MQ Poes Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_MQ_POES_ROOM] = Region("Dodongos Cavern MQ Poes Room", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST, true), //If you can get to the locked part of POES_ROOM without a way to open it or passing the chest, this will need it's own room 
                   LOCATION(RC_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM,  (Here(RR_DODONGOS_CAVERN_MQ_POES_ROOM, []{return logic->CanDetonateBombFlowers() || logic->HasItem(RG_GORONS_BRACELET);}) && //could be a seperate room if it gets busy
@@ -389,7 +389,7 @@ void RegionTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_MQ_MAD_SCRUB_ROOM,    {[]{return Here(RR_DODONGOS_CAVERN_MQ_POES_ROOM, []{return logic->CanDetonateBombFlowers() || logic->HasItem(RG_GORONS_BRACELET);});}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_MQ_MAD_SCRUB_ROOM] = Region("Dodongos Cavern Mad Scrub Room", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_MQ_MAD_SCRUB_ROOM] = Region("Dodongos Cavern Mad Scrub Room", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM,  (logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA, ED_RANG_OR_HOOKSHOT, true))), //Implies you can avoid/kill the enemies with what you use on the skull, if this assumption is broken, add
                                                                 //&& (Here(RR_DODONGOS_CAVERN_MQ_POES_ROOM, []{return logic->CanKillEnemy(RE_FIRE_KEESE) && logic->CanKillEnemy(RE_MAD_SCRUB);}) || (logic->CanAvoidEnemy(RE_FIRE_KEESE) && logic->CanAvoidEnemy(RE_MAD_SCRUB)))
@@ -398,7 +398,7 @@ void RegionTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_MQ_POES_ROOM,  {[]{return Here(RR_DODONGOS_CAVERN_MQ_MAD_SCRUB_ROOM, []{return logic->CanKillEnemy(RE_FIRE_KEESE) && logic->CanKillEnemy(RE_MAD_SCRUB);});}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_MQ_BEHIND_MOUTH] = Region("Dodongos Cavern MQ Behind Mouth", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_DODONGOS_CAVERN_MQ_BEHIND_MOUTH] = Region("Dodongos Cavern MQ Behind Mouth", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DODONGOS_CAVERN_MQ_LOBBY,               {[]{return true;}}),
                   //using pots to get past the fire is in default logic. if stregnth 0 gets added, this will need to be:
@@ -407,7 +407,7 @@ void RegionTable_Init_DodongosCavern() {
                   Entrance(RR_DODONGOS_CAVERN_MQ_BACK_SWITCH_GRAVE,   {[]{return logic->IsAdult;}}),
   });
 
-  areaTable[RR_DODONGOS_CAVERN_MQ_BACK_BEHIND_FIRE] = Region("Dodongos Cavern MQ Back Behind Fire", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DODONGOS_CAVERN_MQ_BACK_BEHIND_FIRE] = Region("Dodongos Cavern MQ Back Behind Fire", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST, true), //pulling the grave isn't required, as you can open the chest through it
   }, {
@@ -418,7 +418,7 @@ void RegionTable_Init_DodongosCavern() {
                                                                            Here(RR_DODONGOS_CAVERN_MQ_BACK_SWITCH_GRAVE, []{return logic->CanAttack();});}}), 
   });
 
-  areaTable[RR_DODONGOS_CAVERN_MQ_BACK_SWITCH_GRAVE] = Region("Dodongos Cavern MQ BossArea", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_DODONGOS_CAVERN_MQ_BACK_SWITCH_GRAVE] = Region("Dodongos Cavern MQ BossArea", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FairyPot, {[]{return true;}}),
   }, {
@@ -438,7 +438,7 @@ void RegionTable_Init_DodongosCavern() {
     |         BOSS ROOM         |
     ---------------------------*/
     areaTable[RR_DODONGOS_CAVERN_BOSS_ENTRYWAY] =
-        Region("Dodongos Cavern Boss Entryway", "Dodongos Cavern", RA_DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {},
+        Region("Dodongos Cavern Boss Entryway", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {},
              {
                  // Exits
                  Entrance(RR_DODONGOS_CAVERN_BOSS_AREA, { [] { return ctx->GetDungeon(DODONGOS_CAVERN)->IsVanilla(); } }),
@@ -447,7 +447,7 @@ void RegionTable_Init_DodongosCavern() {
              });
 
     areaTable[RR_DODONGOS_CAVERN_BOSS_ROOM] =
-        Region("Dodongos Cavern Boss Room", "Dodongos Cavern", RA_NONE, NO_DAY_NIGHT_CYCLE,
+        Region("Dodongos Cavern Boss Room", "Dodongos Cavern", {}, NO_DAY_NIGHT_CYCLE,
              {
                  // Events
                  EventAccess(&logic->DodongosCavernClear,
@@ -467,6 +467,6 @@ void RegionTable_Init_DodongosCavern() {
              {
                  // Exits
                  Entrance(RR_DODONGOS_CAVERN_BOSS_ENTRYWAY, { [] { return true; } }),
-                 Entrance(RR_DEATH_MOUNTAIN_TRAIL, { [] { return logic->DodongosCavernClear; } }),
+                 Entrance(RR_DEATH_MOUNTAIN_TRAIL, { [] { return logic->DodongosCavernClear; } }, false),
              });
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp
index 1984552b5..61fac306b 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp
@@ -8,7 +8,7 @@ void RegionTable_Init_FireTemple() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[RR_FIRE_TEMPLE_ENTRYWAY] = Region("Fire Temple Entryway", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_ENTRYWAY] = Region("Fire Temple Entryway", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_FIRST_ROOM, {[]{return ctx->GetDungeon(FIRE_TEMPLE)->IsVanilla();}}),
                   Entrance(RR_FIRE_TEMPLE_MQ_LOWER,   {[]{return ctx->GetDungeon(FIRE_TEMPLE)->IsMQ();}}),
@@ -19,7 +19,7 @@ void RegionTable_Init_FireTemple() {
   |     VANILLA DUNGEON      |
   ---------------------------*/
   if (ctx->GetDungeon(FIRE_TEMPLE)->IsVanilla()) {
-  areaTable[RR_FIRE_TEMPLE_FIRST_ROOM] = Region("Fire Temple First Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_FIRST_ROOM] = Region("Fire Temple First Room", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                 }, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_ENTRYWAY,       {[]{return true;}}),
@@ -29,7 +29,7 @@ void RegionTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM,  {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 2) && logic->FireTimer() >= 24;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_NEAR_BOSS_ROOM] = Region("Fire Temple Near Boss Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FIRE_TEMPLE_NEAR_BOSS_ROOM] = Region("Fire Temple Near Boss Room", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FairyPot, {[]{return logic->FairyPot || (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT));}}),
                 }, {
@@ -41,13 +41,13 @@ void RegionTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_BOSS_ENTRYWAY, {[]{return logic->HasItem(RG_FIRE_TEMPLE_BOSS_KEY) && ((logic->IsAdult && (ctx->GetTrickOption(RT_FIRE_BOSS_DOOR_JUMP) || Here(RR_FIRE_TEMPLE_FIRE_MAZE_UPPER, []{return logic->CanUse(RG_MEGATON_HAMMER);}))) || logic->CanUse(RG_HOVER_BOOTS));}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_LOOP_ENEMIES] = Region("Fire Temple Loop Enemies", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_LOOP_ENEMIES] = Region("Fire Temple Loop Enemies", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_FIRST_ROOM, {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 8) || !logic->IsKeysanity;}}),
                   Entrance(RR_FIRE_TEMPLE_LOOP_TILES, {[]{return Here(RR_FIRE_TEMPLE_LOOP_ENEMIES, []{return logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER);});}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_LOOP_TILES] = Region("Fire Temple Loop Tiles", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_LOOP_TILES] = Region("Fire Temple Loop Tiles", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FIRE_TEMPLE_GS_BOSS_KEY_LOOP, logic->CanAttack()),
                 }, {
@@ -56,7 +56,7 @@ void RegionTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_LOOP_FLARE_DANCER, {[]{return true;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_LOOP_FLARE_DANCER] = Region("Fire Temple Loop Flare Dancer", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_LOOP_FLARE_DANCER] = Region("Fire Temple Loop Flare Dancer", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FIRE_TEMPLE_FLARE_DANCER_CHEST, (logic->HasExplosives() || logic->CanUse(RG_MEGATON_HAMMER)) && logic->IsAdult),
                 }, {
@@ -66,7 +66,7 @@ void RegionTable_Init_FireTemple() {
                    logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_BOOMERANG)));});}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_LOOP_HAMMER_SWITCH] = Region("Fire Temple Loop Hammer Switch", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FIRE_TEMPLE_LOOP_HAMMER_SWITCH] = Region("Fire Temple Loop Hammer Switch", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FireLoopSwitch, {[]{return logic->FireLoopSwitch || logic->CanUse(RG_MEGATON_HAMMER);}}),
                 }, {}, {
@@ -75,7 +75,7 @@ void RegionTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_LOOP_GORON_ROOM,   {[]{return logic->FireLoopSwitch;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_LOOP_GORON_ROOM] = Region("Fire Temple Loop Goron Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_LOOP_GORON_ROOM] = Region("Fire Temple Loop Goron Room", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FIRE_TEMPLE_BOSS_KEY_CHEST, true),
                 }, {
@@ -84,13 +84,13 @@ void RegionTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_LOOP_EXIT,          {[]{return logic->FireLoopSwitch;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_LOOP_EXIT] = Region("Fire Temple Loop Exit", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_LOOP_EXIT] = Region("Fire Temple Loop Exit", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_FIRST_ROOM,      {[]{return true;}}),
                   Entrance(RR_FIRE_TEMPLE_LOOP_GORON_ROOM, {[]{return logic->FireLoopSwitch;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_BIG_LAVA_ROOM] = Region("Fire Temple Big Lava Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_BIG_LAVA_ROOM] = Region("Fire Temple Big Lava Room", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_FIRST_ROOM,                {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 2);}}),
                   Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_GORON, {[]{return true;}}),
@@ -99,7 +99,7 @@ void RegionTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_FIRE_PILLAR_ROOM,          {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 3);}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_GORON] = Region("Fire Temple Big Lava Room North Goron", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_GORON] = Region("Fire Temple Big Lava Room North Goron", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST, true),
                 }, {
@@ -107,7 +107,7 @@ void RegionTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM, {[]{return true;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_TILES] = Region("Fire Temple Big Lava Room North Tiles", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_TILES] = Region("Fire Temple Big Lava Room North Tiles", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   //RANDOTODO check if child can reach
                   LOCATION(RC_FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM, (logic->IsAdult && logic->CanAttack()) || logic->HookshotOrBoomerang()),
@@ -116,7 +116,7 @@ void RegionTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM, {[]{return true;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_BIG_LAVA_ROOM_SOUTH_GORON] = Region("Fire Temple Big Lava Room South Goron", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_BIG_LAVA_ROOM_SOUTH_GORON] = Region("Fire Temple Big Lava Room South Goron", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST, true),
                 }, {
@@ -124,13 +124,13 @@ void RegionTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM, {[]{return true;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_FIRE_PILLAR_ROOM] = Region("Fire Temple Fire Pillar Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_FIRE_PILLAR_ROOM] = Region("Fire Temple Fire Pillar Room", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM, {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 3);}}),
                   Entrance(RR_FIRE_TEMPLE_SHORTCUT_ROOM, {[]{return logic->FireTimer() >= 56 && logic->SmallKeys(RR_FIRE_TEMPLE, 4);}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_SHORTCUT_ROOM] = Region("Fire Temple Shortcut Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_SHORTCUT_ROOM] = Region("Fire Temple Shortcut Room", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST, Here(RR_FIRE_TEMPLE_SHORTCUT_CLIMB, []{return true;})),
                 }, {
@@ -140,13 +140,13 @@ void RegionTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER, {[]{return logic->IsAdult && (logic->HasItem(RG_GORONS_BRACELET) || ctx->GetTrickOption(RT_FIRE_STRENGTH)) && (logic->HasExplosives() || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_FAIRY_SLINGSHOT));}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_SHORTCUT_CLIMB] = Region("Fire Temple Shortcut Climb", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_SHORTCUT_CLIMB] = Region("Fire Temple Shortcut Climb", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_SHORTCUT_ROOM,      {[]{return true;}}),
                   Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_UPPER, {[]{return true;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER] = Region("Fire Temple Boulder Maze Lower", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER] = Region("Fire Temple Boulder Maze Lower", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST, true),
                   LOCATION(RC_FIRE_TEMPLE_GS_BOULDER_MAZE,          logic->HasExplosives() && (logic->IsAdult || logic->HookshotOrBoomerang())),
@@ -158,7 +158,7 @@ void RegionTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_UPPER,           {[]{return false;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER_SIDE_ROOM] = Region("Fire Temple Boulder Maze Lower Side Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER_SIDE_ROOM] = Region("Fire Temple Boulder Maze Lower Side Room", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST, true),
                 }, {
@@ -166,7 +166,7 @@ void RegionTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER, {[]{return true;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_EAST_CENTRAL_ROOM] = Region("Fire Temple East Central Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_EAST_CENTRAL_ROOM] = Region("Fire Temple East Central Room", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM,      {[]{return logic->TakeDamage();}}),
                   Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER, {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 5, 8);}}),
@@ -174,7 +174,7 @@ void RegionTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_MAP_AREA,           {[]{return logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW);}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_FIRE_WALL_CHASE] = Region("Fire Temple Fire Wall Chase", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_FIRE_WALL_CHASE] = Region("Fire Temple Fire Wall Chase", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_EAST_CENTRAL_ROOM,  {[]{return logic->FireTimer() >= 24 && logic->SmallKeys(RR_FIRE_TEMPLE, 6, 8);}}),
                   Entrance(RR_FIRE_TEMPLE_MAP_AREA,           {[]{return logic->IsAdult;}}),
@@ -182,7 +182,7 @@ void RegionTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_CORRIDOR,           {[]{return logic->FireTimer() >= 24 && logic->IsAdult && logic->SmallKeys(RR_FIRE_TEMPLE, 7);}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_MAP_AREA] = Region("Fire Temple Map Region", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_MAP_AREA] = Region("Fire Temple Map Region", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FIRE_TEMPLE_MAP_CHEST, true),
                 }, {
@@ -190,7 +190,7 @@ void RegionTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_EAST_CENTRAL_ROOM, {[]{return true;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_BOULDER_MAZE_UPPER] = Region("Fire Temple Boulder Maze Upper", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_BOULDER_MAZE_UPPER] = Region("Fire Temple Boulder Maze Upper", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST, true),
                 }, {
@@ -201,7 +201,7 @@ void RegionTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_SCARECROW_ROOM,     {[]{return logic->CanUse(RG_SCARECROW) || (ctx->GetTrickOption(RT_FIRE_SCARECROW) && logic->IsAdult && logic->CanUse(RG_LONGSHOT));}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_SCARECROW_ROOM] = Region("Fire Temple Scarecrow Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_SCARECROW_ROOM] = Region("Fire Temple Scarecrow Room", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FIRE_TEMPLE_GS_SCARECROW_CLIMB, logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG) || logic->HasExplosives() || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_DINS_FIRE)),
                 }, {
@@ -210,7 +210,7 @@ void RegionTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_EAST_PEAK,          {[]{return true;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_EAST_PEAK] = Region("Fire Temple East Peak", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_EAST_PEAK] = Region("Fire Temple East Peak", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FIRE_TEMPLE_SCARECROW_CHEST,  true),
                   LOCATION(RC_FIRE_TEMPLE_GS_SCARECROW_TOP, logic->CanUseProjectile()),
@@ -220,13 +220,13 @@ void RegionTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_EAST_CENTRAL_ROOM, {[]{return logic->TakeDamage();}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_CORRIDOR] = Region("Fire Temple Corridor", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_CORRIDOR] = Region("Fire Temple Corridor", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_FIRE_WALL_CHASE, {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 7);}}),
                   Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_ROOM,  {[]{return true;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_FIRE_MAZE_ROOM] = Region("Fire Temple Fire Maze Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_FIRE_MAZE_ROOM] = Region("Fire Temple Fire Maze Room", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_CORRIDOR,            {[]{return true;}}),
                   Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_UPPER,     {[]{return logic->CanUse(RG_HOVER_BOOTS);}}),
@@ -235,14 +235,14 @@ void RegionTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_LATE_FIRE_MAZE,      {[]{return ctx->GetTrickOption(RT_FIRE_FLAME_MAZE) || false;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_FIRE_MAZE_UPPER] = Region("Fire Temple Fire Maze Upper", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_FIRE_MAZE_UPPER] = Region("Fire Temple Fire Maze Upper", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_NEAR_BOSS_ROOM,     {[]{return logic->CanUse(RG_MEGATON_HAMMER);}}),
                   Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_ROOM,     {[]{return true;}}),
                   Entrance(RR_FIRE_TEMPLE_WEST_CENTRAL_UPPER, {[]{return logic->CanUse(RG_MEGATON_HAMMER);}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_FIRE_MAZE_SIDE_ROOM] = Region("Fire Temple Fire Maze Side Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_FIRE_MAZE_SIDE_ROOM] = Region("Fire Temple Fire Maze Side Room", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FIRE_TEMPLE_COMPASS_CHEST, true),
                 }, {
@@ -250,7 +250,7 @@ void RegionTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_ROOM, {[]{return true;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_WEST_CENTRAL_LOWER] = Region("Fire Temple West Central Lower", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_WEST_CENTRAL_LOWER] = Region("Fire Temple West Central Lower", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FIRE_TEMPLE_HIGHEST_GORON_CHEST, Here(RR_FIRE_TEMPLE_WEST_CENTRAL_UPPER, []{return (logic->CanUse(RG_SONG_OF_TIME) || ctx->GetTrickOption(RT_RUSTED_SWITCHES)) && logic->CanUse(RG_MEGATON_HAMMER);})),
                 }, {
@@ -260,21 +260,21 @@ void RegionTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_LATE_FIRE_MAZE,     {[]{return true;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_WEST_CENTRAL_UPPER] = Region("Fire Temple West Central Upper", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_WEST_CENTRAL_UPPER] = Region("Fire Temple West Central Upper", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_BOSS_ENTRYWAY,      {[]{return false;}}),
                   Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_UPPER,    {[]{return true;}}),
                   Entrance(RR_FIRE_TEMPLE_WEST_CENTRAL_LOWER, {[]{return true;}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_LATE_FIRE_MAZE] = Region("Fire Temple Late Fire Maze", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_LATE_FIRE_MAZE] = Region("Fire Temple Late Fire Maze", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_ROOM,     {[]{return false;}}),
                   Entrance(RR_FIRE_TEMPLE_WEST_CENTRAL_LOWER, {[]{return true;}}),
                   Entrance(RR_FIRE_TEMPLE_UPPER_FLARE_DANCER, {[]{return logic->HasExplosives();}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_UPPER_FLARE_DANCER] = Region("Fire Temple Upper Flare Dancer", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_UPPER_FLARE_DANCER] = Region("Fire Temple Upper Flare Dancer", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_LATE_FIRE_MAZE, {[]{return Here(RR_FIRE_TEMPLE_UPPER_FLARE_DANCER, []{return logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_HOOKSHOT) || (logic->HasExplosives() && ((logic->CanUse(RG_KOKIRI_SWORD)) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) ||
                    logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_BOOMERANG)));});}}),
@@ -282,13 +282,13 @@ void RegionTable_Init_FireTemple() {
                    logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG)));});}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_WEST_CLIMB] = Region("Fire Temple West Climb", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_WEST_CLIMB] = Region("Fire Temple West Climb", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_UPPER_FLARE_DANCER, {[]{return true;}}),
                   Entrance(RR_FIRE_TEMPLE_WEST_PEAK,          {[]{return logic->CanUseProjectile();}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_WEST_PEAK] = Region("Fire Temple West Peak", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_WEST_PEAK] = Region("Fire Temple West Peak", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FIRE_TEMPLE_MEGATON_HAMMER_CHEST, true),
                 }, {
@@ -298,12 +298,12 @@ void RegionTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_HAMMER_RETURN_PATH, {[]{return logic->CanUse(RG_MEGATON_HAMMER);}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_HAMMER_RETURN_PATH] = Region("Fire Temple Hammer Return Path", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_HAMMER_RETURN_PATH] = Region("Fire Temple Hammer Return Path", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_ABOVE_FIRE_MAZE, {[]{return logic->CanUse(RG_MEGATON_HAMMER);}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_ABOVE_FIRE_MAZE] = Region("Fire Temple Above Fire Maze", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FIRE_TEMPLE_ABOVE_FIRE_MAZE] = Region("Fire Temple Above Fire Maze", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FIRE_TEMPLE_HAMMER_RETURN_PATH, {[]{return true;}}),
                   Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_UPPER,    {[]{return logic->CanUse(RG_MEGATON_HAMMER);}}),
@@ -314,7 +314,7 @@ void RegionTable_Init_FireTemple() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (ctx->GetDungeon(FIRE_TEMPLE)->IsMQ()) {
-  areaTable[RR_FIRE_TEMPLE_MQ_LOWER] = Region("Fire Temple MQ Lower", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_MQ_LOWER] = Region("Fire Temple MQ Lower", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST, logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_BOMB_BAG) || logic->CanUse(RG_DINS_FIRE)),
                   LOCATION(RC_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST,     logic->IsAdult && (ctx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS) || logic->CanUse(RG_GORON_TUNIC)) && (((logic->CanUse(RG_HOVER_BOOTS) || (ctx->GetTrickOption(RT_FIRE_MQ_NEAR_BOSS) && logic->CanUse(RG_FAIRY_BOW))) && logic->HasFireSource()) || (logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_FIRE_ARROWS) || (logic->CanUse(RG_DINS_FIRE) && ((ctx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_OHKO) && ctx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_QUADRUPLE) && ctx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_OCTUPLE) && ctx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_SEXDECUPLE)) || logic->CanUse(RG_GORON_TUNIC) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_LONGSHOT)))))),
@@ -327,7 +327,7 @@ void RegionTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM,     {[]{return logic->IsAdult && logic->FireTimer() >= 24 && logic->CanUse(RG_MEGATON_HAMMER);}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_MQ_LOWER_LOCKED_DOOR] = Region("Fire Temple MQ Lower Locked Door", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FIRE_TEMPLE_MQ_LOWER_LOCKED_DOOR] = Region("Fire Temple MQ Lower Locked Door", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FairyPot, {[]{return true;}}),
   }, {
@@ -336,7 +336,7 @@ void RegionTable_Init_FireTemple() {
                   LOCATION(RC_FIRE_TEMPLE_MQ_MAP_CHEST,            logic->IsAdult && logic->CanUse(RG_MEGATON_HAMMER)),
   }, {});
 
-  areaTable[RR_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM] = Region("Fire Temple MQ Big Lava Room", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM] = Region("Fire Temple MQ Big Lava Room", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FairyPot, {[]{return logic->FairyPot || (logic->HasFireSource() && (logic->CanUse(RG_FAIRY_BOW) || ctx->GetTrickOption(RT_FIRE_MQ_BK_CHEST)) && logic->IsAdult && (logic->CanUse(RG_HOOKSHOT) || ctx->GetTrickOption(RT_FIRE_SOT)));}}),
                     //Trick: logic->HasFireSource() && (logic->CanUse(RG_FAIRY_BOW) || LogicFireMQBKChest) && logic->IsAdult && (logic->CanUse(RG_HOOKSHOT) || LogicFireSongOfTime)
@@ -353,7 +353,7 @@ void RegionTable_Init_FireTemple() {
                     //Trick: logic->IsAdult && logic->CanUse(RG_GORON_TUNIC) && logic->SmallKeys(RR_FIRE_TEMPLE, 2) && (logic->HasFireSource() || (LogicFireMQClimb && logic->CanUse(RG_HOVER_BOOTS)))
   });
 
-  areaTable[RR_FIRE_TEMPLE_MQ_LOWER_MAZE] = Region("Fire Temple MQ Lower Maze", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_MQ_LOWER_MAZE] = Region("Fire Temple MQ Lower Maze", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST,     logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)),
                   LOCATION(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST, logic->HasExplosives() && (ctx->GetTrickOption(RT_FIRE_MQ_MAZE_SIDE_ROOM) || HasAccessTo(RR_FIRE_TEMPLE_MQ_UPPER_MAZE))),
@@ -364,7 +364,7 @@ void RegionTable_Init_FireTemple() {
                     //Trick: (logic->IsAdult && ((logic->HasExplosives() && logic->CanUse(RG_HOOKSHOT)) || (LogicFireMQMazeHovers && logic->CanUse(RG_HOVER_BOOTS)))) || LogicFireMQMazeJump
   });
 
-  areaTable[RR_FIRE_TEMPLE_MQ_UPPER_MAZE] = Region("Fire Temple MQ Upper Maze", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FIRE_TEMPLE_MQ_UPPER_MAZE] = Region("Fire Temple MQ Upper Maze", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   //EventAccess(&WallFairy, {[]{return WallFairy || (logic->IsAdult && (((logic->CanUse(RG_SONG_OF_TIME) && logic->CanUse(RG_HOOKSHOT) && logic->HasExplosives()) || logic->CanUse(RG_LONGSHOT))));}}),
                   EventAccess(&logic->FairyPot,  {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 3);}}),
@@ -378,7 +378,7 @@ void RegionTable_Init_FireTemple() {
                   Entrance(RR_FIRE_TEMPLE_MQ_UPPER, {[]{return logic->SmallKeys(RR_FIRE_TEMPLE, 3) && logic->IsAdult && ((logic->CanUse(RG_FAIRY_BOW) && logic->CanUse(RG_HOOKSHOT)) || logic->CanUse(RG_FIRE_ARROWS));}}),
   });
 
-  areaTable[RR_FIRE_TEMPLE_MQ_UPPER] = Region("Fire Temple MQ Upper", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FIRE_TEMPLE_MQ_UPPER] = Region("Fire Temple MQ Upper", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FIRE_TEMPLE_MQ_FREESTANDING_KEY,            ((logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG)) && logic->CanUse(RG_HOOKSHOT)) || ctx->GetTrickOption(RT_FIRE_MQ_FLAME_MAZE)),
                     //Trick: (logic->IsAdult && logic->CanUse(RG_HOOKSHOT)) || LogicFireMQFlameMaze
@@ -396,7 +396,7 @@ void RegionTable_Init_FireTemple() {
     |         BOSS ROOM         |
     ---------------------------*/
     areaTable[RR_FIRE_TEMPLE_BOSS_ENTRYWAY] =
-        Region("Fire Temple Boss Entryway", "Fire Temple", RA_FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
+        Region("Fire Temple Boss Entryway", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {},
              {
                  // Exits
                  Entrance(RR_FIRE_TEMPLE_NEAR_BOSS_ROOM, { [] { return ctx->GetDungeon(FIRE_TEMPLE)->IsVanilla() && false; } }),
@@ -405,7 +405,7 @@ void RegionTable_Init_FireTemple() {
              });
 
     areaTable[RR_FIRE_TEMPLE_BOSS_ROOM] =
-        Region("Fire Temple Boss Room", "Fire Temple", RA_NONE, NO_DAY_NIGHT_CYCLE,
+        Region("Fire Temple Boss Room", "Fire Temple", {}, NO_DAY_NIGHT_CYCLE,
              {
                  // Events
                  EventAccess(&logic->FireTempleClear,
@@ -419,6 +419,6 @@ void RegionTable_Init_FireTemple() {
              {
                  // Exits
                  Entrance(RR_FIRE_TEMPLE_BOSS_ENTRYWAY, { [] { return false; } }),
-                 Entrance(RR_DMC_CENTRAL_LOCAL, { [] { return logic->FireTempleClear; } }),
+                 Entrance(RR_DMC_CENTRAL_LOCAL, { [] { return logic->FireTempleClear; } }, false),
              });
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp
index 9f41965ee..62718a27d 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp
@@ -8,7 +8,7 @@ void RegionTable_Init_ForestTemple() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[RR_FOREST_TEMPLE_ENTRYWAY] = Region("Forest Temple Entryway", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FOREST_TEMPLE_ENTRYWAY] = Region("Forest Temple Entryway", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_FIRST_ROOM, {[]{return ctx->GetDungeon(FOREST_TEMPLE)->IsVanilla();}}),
                   Entrance(RR_FOREST_TEMPLE_MQ_LOBBY,   {[]{return ctx->GetDungeon(FOREST_TEMPLE)->IsMQ();}}),
@@ -19,7 +19,7 @@ void RegionTable_Init_ForestTemple() {
   |     VANILLA DUNGEON      |
   ---------------------------*/
   if (ctx->GetDungeon(FOREST_TEMPLE)->IsVanilla()) {
-  areaTable[RR_FOREST_TEMPLE_FIRST_ROOM] = Region("Forest Temple First Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_FIRST_ROOM] = Region("Forest Temple First Room", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FOREST_TEMPLE_FIRST_ROOM_CHEST, true),
                   LOCATION(RC_FOREST_TEMPLE_GS_FIRST_ROOM,    (logic->IsAdult && logic->CanUse(RG_BOMB_BAG)) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_BOOMERANG) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOMBCHU_5) || logic->CanUse(RG_DINS_FIRE) || (ctx->GetTrickOption(RT_FOREST_FIRST_GS) && (logic->CanJumpslash() || (logic->IsChild && logic->CanUse(RG_BOMB_BAG))))),
@@ -29,13 +29,13 @@ void RegionTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_SOUTH_CORRIDOR, {[]{return true;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_SOUTH_CORRIDOR] = Region("Forest Temple South Corridor", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FOREST_TEMPLE_SOUTH_CORRIDOR] = Region("Forest Temple South Corridor", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_FIRST_ROOM, {[]{return true;}}),
                   Entrance(RR_FOREST_TEMPLE_LOBBY,      {[]{return logic->CanAttack() || logic->CanUse(RG_NUTS);}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_LOBBY] = Region("Forest Temple Lobby", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_LOBBY] = Region("Forest Temple Lobby", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->ForestTempleMeg, {[]{return logic->ForestTempleMeg || (logic->ForestTempleJoelle && logic->ForestTempleBeth && logic->ForestTempleAmy && logic->CanUse(RG_FAIRY_BOW));}}),
                 }, {
@@ -53,13 +53,13 @@ void RegionTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_BOSS_ENTRYWAY,     {[]{return false;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_NORTH_CORRIDOR] = Region("Forest Temple North Corridor", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FOREST_TEMPLE_NORTH_CORRIDOR] = Region("Forest Temple North Corridor", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_LOBBY,         {[]{return true;}}),
                   Entrance(RR_FOREST_TEMPLE_LOWER_STALFOS, {[]{return true;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_LOWER_STALFOS] = Region("Forest Temple Lower Stalfos", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_LOWER_STALFOS] = Region("Forest Temple Lower Stalfos", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FairyPot, {[]{return true;}}),
                 }, {
@@ -70,7 +70,7 @@ void RegionTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_NORTH_CORRIDOR, {[]{return true;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_NW_OUTDOORS_LOWER] = Region("Forest Temple NW Outdoors Lower", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_NW_OUTDOORS_LOWER] = Region("Forest Temple NW Outdoors Lower", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
                   EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives() || logic->CanUse(RG_DINS_FIRE));}}),
@@ -86,7 +86,7 @@ void RegionTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_BOSS_ENTRYWAY,     {[]{return false;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER] = Region("Forest Temple NW Outdoors Upper", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER] = Region("Forest Temple NW Outdoors Upper", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
                   EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives() || logic->CanUse(RG_DINS_FIRE));}}),
@@ -98,7 +98,7 @@ void RegionTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_BLOCK_PUSH_ROOM,      {[]{return true;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_NE_OUTDOORS_LOWER] = Region("Forest Temple NE Outdoors Lower", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_NE_OUTDOORS_LOWER] = Region("Forest Temple NE Outdoors Lower", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
                   EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives() || logic->CanUse(RG_DINS_FIRE));}}),
@@ -114,7 +114,7 @@ void RegionTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_FALLING_ROOM,      {[]{return false;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER] = Region("Forest Temple NE Outdoors Upper", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER] = Region("Forest Temple NE Outdoors Upper", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
                   EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives() || logic->CanUse(RG_DINS_FIRE));}}),
@@ -125,7 +125,7 @@ void RegionTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_FALLING_ROOM,      {[]{return ctx->GetTrickOption(RT_FOREST_DOORFRAME) && logic->CanJumpslash() && logic->CanUse(RG_HOVER_BOOTS) && logic->CanUse(RG_SCARECROW);}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_MAP_ROOM] = Region("Forest Temple Map Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_MAP_ROOM] = Region("Forest Temple Map Room", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FOREST_TEMPLE_MAP_CHEST, logic->CanKillEnemy(RE_BLUE_BUBBLE)),
                 }, {
@@ -134,7 +134,7 @@ void RegionTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER, {[]{return Here(RR_FOREST_TEMPLE_MAP_ROOM, []{return logic->CanKillEnemy(RE_BLUE_BUBBLE);});}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_SEWER] = Region("Forest Temple Sewer", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_SEWER] = Region("Forest Temple Sewer", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FOREST_TEMPLE_WELL_CHEST, HasAccessTo(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER)),
                 }, {
@@ -143,12 +143,12 @@ void RegionTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_NE_OUTDOORS_LOWER, {[]{return true;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_BELOW_BOSS_KEY_CHEST] = Region("Forest Temple Below Boss Key Chest", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FOREST_TEMPLE_BELOW_BOSS_KEY_CHEST] = Region("Forest Temple Below Boss Key Chest", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER, {[]{return Here(RR_FOREST_TEMPLE_BELOW_BOSS_KEY_CHEST, []{return logic->CanKillEnemy(RE_BLUE_BUBBLE);});}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_FLOORMASTER_ROOM] = Region("Forest Temple Floormaster Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_FLOORMASTER_ROOM] = Region("Forest Temple Floormaster Room", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FOREST_TEMPLE_FLOORMASTER_CHEST, logic->CanDamage()),
                 }, {
@@ -156,13 +156,13 @@ void RegionTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER, {[]{return true;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_WEST_CORRIDOR] = Region("Forest Temple West Corridor", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FOREST_TEMPLE_WEST_CORRIDOR] = Region("Forest Temple West Corridor", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_LOBBY,           {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 1, 5);}}),
                   Entrance(RR_FOREST_TEMPLE_BLOCK_PUSH_ROOM, {[]{return logic->CanAttack() || logic->CanUse(RG_NUTS);}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_BLOCK_PUSH_ROOM] = Region("Forest Temple Block Push Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_BLOCK_PUSH_ROOM] = Region("Forest Temple Block Push Room", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FOREST_TEMPLE_EYE_SWITCH_CHEST, logic->HasItem(RG_GORONS_BRACELET) && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT))),
                 }, {
@@ -173,13 +173,13 @@ void RegionTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_NW_CORRIDOR_STRAIGHTENED, {[]{return logic->IsAdult && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT)) && logic->HasItem(RG_GORONS_BRACELET) && logic->SmallKeys(RR_FOREST_TEMPLE, 2);}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_NW_CORRIDOR_TWISTED] = Region("Forest Temple NW Corridor Twisted", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FOREST_TEMPLE_NW_CORRIDOR_TWISTED] = Region("Forest Temple NW Corridor Twisted", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_BLOCK_PUSH_ROOM, {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 2);}}),
                   Entrance(RR_FOREST_TEMPLE_RED_POE_ROOM,    {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 3);}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_NW_CORRIDOR_STRAIGHTENED] = Region("Forest Temple NW Corridor Straightened", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_NW_CORRIDOR_STRAIGHTENED] = Region("Forest Temple NW Corridor Straightened", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FOREST_TEMPLE_BOSS_KEY_CHEST, true),
                 }, {
@@ -188,7 +188,7 @@ void RegionTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_BLOCK_PUSH_ROOM,      {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 2);}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_RED_POE_ROOM] = Region("Forest Temple Red Poe Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_RED_POE_ROOM] = Region("Forest Temple Red Poe Room", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->ForestTempleJoelle, {[]{return logic->ForestTempleJoelle || logic->CanUse(RG_FAIRY_BOW);}}),
                 }, {
@@ -200,7 +200,7 @@ void RegionTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_UPPER_STALFOS,       {[]{return true;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_UPPER_STALFOS] = Region("Forest Temple Upper Stalfos", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_UPPER_STALFOS] = Region("Forest Temple Upper Stalfos", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FOREST_TEMPLE_BOW_CHEST, logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER)),
                 }, {
@@ -209,7 +209,7 @@ void RegionTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_BLUE_POE_ROOM, {[]{return logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER);}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_BLUE_POE_ROOM] = Region("Forest Temple Blue Poe Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_BLUE_POE_ROOM] = Region("Forest Temple Blue Poe Room", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->ForestTempleBeth, {[]{return logic->ForestTempleBeth || logic->CanUse(RG_FAIRY_BOW);}}),
                 }, {
@@ -221,25 +221,25 @@ void RegionTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_NE_CORRIDOR_STRAIGHTENED, {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 4);}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_NE_CORRIDOR_STRAIGHTENED] = Region("Forest Temple NE Corridor Straightened", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FOREST_TEMPLE_NE_CORRIDOR_STRAIGHTENED] = Region("Forest Temple NE Corridor Straightened", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_BLUE_POE_ROOM,   {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 4);}}),
                   Entrance(RR_FOREST_TEMPLE_FROZEN_EYE_ROOM, {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 5);}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_NE_CORRIDOR_TWISTED] = Region("Forest Temple NE Corridor Twisted", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FOREST_TEMPLE_NE_CORRIDOR_TWISTED] = Region("Forest Temple NE Corridor Twisted", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_FROZEN_EYE_ROOM, {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 5);}}),
                   Entrance(RR_FOREST_TEMPLE_FALLING_ROOM,    {[]{return true;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_FROZEN_EYE_ROOM] = Region("Forest Temple Frozen Eye Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FOREST_TEMPLE_FROZEN_EYE_ROOM] = Region("Forest Temple Frozen Eye Room", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_NE_CORRIDOR_STRAIGHTENED, {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 5);}}),
                   Entrance(RR_FOREST_TEMPLE_NE_CORRIDOR_TWISTED,      {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 5) && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_DINS_FIRE));}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_FALLING_ROOM] = Region("Forest Temple Falling Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_FALLING_ROOM] = Region("Forest Temple Falling Room", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST, true),
                 }, {
@@ -248,7 +248,7 @@ void RegionTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_GREEN_POE_ROOM,    {[]{return true;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_GREEN_POE_ROOM] = Region("Forest Temple Green Poe Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_GREEN_POE_ROOM] = Region("Forest Temple Green Poe Room", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->ForestTempleAmy, {[]{return logic->ForestTempleAmy || logic->CanUse(RG_FAIRY_BOW);}}),
                 }, {}, {
@@ -257,13 +257,13 @@ void RegionTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_EAST_CORRIDOR, {[]{return logic->ForestTempleAmy;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_EAST_CORRIDOR] = Region("Forest Temple East Corridor", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_FOREST_TEMPLE_EAST_CORRIDOR] = Region("Forest Temple East Corridor", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_FOREST_TEMPLE_LOBBY,          {[]{return logic->CanAttack() || logic->CanUse(RG_NUTS);}}),
                   Entrance(RR_FOREST_TEMPLE_GREEN_POE_ROOM, {[]{return logic->CanAttack() || logic->CanUse(RG_NUTS);}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_BOSS_REGION] = Region("Forest Temple Boss Region", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_BOSS_REGION] = Region("Forest Temple Boss Region", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FOREST_TEMPLE_BASEMENT_CHEST, true),
                   LOCATION(RC_FOREST_TEMPLE_GS_BASEMENT,    logic->HookshotOrBoomerang()),
@@ -278,7 +278,7 @@ void RegionTable_Init_ForestTemple() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (ctx->GetDungeon(FOREST_TEMPLE)->IsMQ()) {
-  areaTable[RR_FOREST_TEMPLE_MQ_LOBBY] = Region("Forest Temple MQ Lobby", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_MQ_LOBBY] = Region("Forest Temple MQ Lobby", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST, logic->CanJumpslash() || logic->CanUse(RG_BOMB_BAG) || logic->CanUse(RG_STICKS) || logic->CanUse(RG_NUTS) || logic->HookshotOrBoomerang() || logic->CanUse(RG_DINS_FIRE) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOVER_BOOTS)),
                   LOCATION(RC_FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY, logic->HookshotOrBoomerang()),
@@ -288,7 +288,7 @@ void RegionTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_MQ_CENTRAL_AREA, {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 1) && (logic->CanAttack() || logic->CanUse(RG_NUTS));}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_MQ_CENTRAL_AREA] = Region("Forest Temple MQ Central Region", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_MQ_CENTRAL_AREA] = Region("Forest Temple MQ Central Region", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FairyPot, {[]{return true;}}),
   }, {
@@ -306,7 +306,7 @@ void RegionTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_MQ_BOSS_REGION,        {[]{return logic->ForestTempleJoAndBeth && logic->ForestTempleAmyAndMeg;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_MQ_AFTER_BLOCK_PUZZLE] = Region("Forest Temple MQ After Block Puzzle", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_MQ_AFTER_BLOCK_PUZZLE] = Region("Forest Temple MQ After Block Puzzle", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FOREST_TEMPLE_MQ_BOSS_KEY_CHEST, logic->SmallKeys(RR_FOREST_TEMPLE, 3)),
   }, {
@@ -317,7 +317,7 @@ void RegionTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_MQ_NW_OUTDOORS,   {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 2);}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_MQ_OUTDOOR_LEDGE] = Region("Forest Temple MQ Outdoor Ledge", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_MQ_OUTDOOR_LEDGE] = Region("Forest Temple MQ Outdoor Ledge", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FOREST_TEMPLE_MQ_REDEAD_CHEST, logic->CanJumpslash()),
   }, {
@@ -325,7 +325,7 @@ void RegionTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_MQ_NW_OUTDOORS, {[]{return true;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_MQ_NW_OUTDOORS] = Region("Forest Temple MQ NW Outdoors", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_MQ_NW_OUTDOORS] = Region("Forest Temple MQ NW Outdoors", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD, logic->CanAttack()),
   }, {
@@ -335,7 +335,7 @@ void RegionTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_MQ_OUTDOORS_TOP_LEDGES, {[]{return logic->IsAdult && logic->CanUse(RG_FIRE_ARROWS);}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_MQ_NE_OUTDOORS] = Region("Forest Temple MQ NE Outdoors", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_MQ_NE_OUTDOORS] = Region("Forest Temple MQ NE Outdoors", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->DekuBabaSticks, {[]{return logic->DekuBabaSticks || (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_BOOMERANG));}}),
                   EventAccess(&logic->DekuBabaNuts,   {[]{return logic->DekuBabaNuts   || (logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives() || logic->CanUse(RG_DINS_FIRE));}}),
@@ -350,7 +350,7 @@ void RegionTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_MQ_NE_OUTDOORS_LEDGE,   {[]{return logic->IsAdult && logic->CanUse(RG_LONGSHOT);}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_MQ_OUTDOORS_TOP_LEDGES] = Region("Forest Temple MQ Outdoors Top Ledges", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_MQ_OUTDOORS_TOP_LEDGES] = Region("Forest Temple MQ Outdoors Top Ledges", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST, true),
   }, {
@@ -360,7 +360,7 @@ void RegionTable_Init_ForestTemple() {
                     //Trick: LogicForestOutdoorsLedge && logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS)
   });
 
-  areaTable[RR_FOREST_TEMPLE_MQ_NE_OUTDOORS_LEDGE] = Region("Forest Temple MQ NE Outdoors Ledge", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_MQ_NE_OUTDOORS_LEDGE] = Region("Forest Temple MQ NE Outdoors Ledge", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST, true),
   }, {
@@ -369,7 +369,7 @@ void RegionTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_MQ_FALLING_ROOM, {[]{return logic->CanUse(RG_SONG_OF_TIME);}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_MQ_BOW_REGION] = Region("Forest Temple MQ Bow Region", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_MQ_BOW_REGION] = Region("Forest Temple MQ Bow Region", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->ForestTempleJoAndBeth, {[]{return logic->ForestTempleJoAndBeth || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW));}}),
   }, {
@@ -382,7 +382,7 @@ void RegionTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_MQ_FALLING_ROOM, {[]{return logic->SmallKeys(RR_FOREST_TEMPLE, 5) && ((logic->IsAdult && logic->CanUse(RG_FAIRY_BOW)) || logic->CanUse(RG_DINS_FIRE));}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_MQ_FALLING_ROOM] = Region("Forest Temple MQ Falling Room", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_FOREST_TEMPLE_MQ_FALLING_ROOM] = Region("Forest Temple MQ Falling Room", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->ForestTempleAmyAndMeg, {[]{return logic->ForestTempleAmyAndMeg || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW) && logic->SmallKeys(RR_FOREST_TEMPLE, 6));}}),
   }, {
@@ -393,7 +393,7 @@ void RegionTable_Init_ForestTemple() {
                   Entrance(RR_FOREST_TEMPLE_MQ_NE_OUTDOORS_LEDGE, {[]{return true;}}),
   });
 
-  areaTable[RR_FOREST_TEMPLE_MQ_BOSS_REGION] = Region("Forest Temple MQ Boss Region", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_FOREST_TEMPLE_MQ_BOSS_REGION] = Region("Forest Temple MQ Boss Region", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_FOREST_TEMPLE_MQ_BASEMENT_CHEST,   true),
   }, {
@@ -406,7 +406,7 @@ void RegionTable_Init_ForestTemple() {
     |         BOSS ROOM         |
     ---------------------------*/
     areaTable[RR_FOREST_TEMPLE_BOSS_ENTRYWAY] =
-        Region("Forest Temple Boss Entryway", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
+        Region("Forest Temple Boss Entryway", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {},
              {
                  // Exits
                  Entrance(RR_FOREST_TEMPLE_BOSS_REGION, { [] { return ctx->GetDungeon(FOREST_TEMPLE)->IsVanilla() && false; } }),
@@ -414,8 +414,7 @@ void RegionTable_Init_ForestTemple() {
                  Entrance(RR_FOREST_TEMPLE_BOSS_ROOM, { [] { return true; } }),
              });
 
-    areaTable[RR_FOREST_TEMPLE_BOSS_ROOM] = Region(
-        "Forest Temple Boss Room", "Forest Temple", RA_NONE, NO_DAY_NIGHT_CYCLE,
+    areaTable[RR_FOREST_TEMPLE_BOSS_ROOM] = Region("Forest Temple Boss Room", "Forest Temple", {}, NO_DAY_NIGHT_CYCLE,
         {
             // Events
             EventAccess(&logic->ForestTempleClear, { [] {
@@ -431,6 +430,6 @@ void RegionTable_Init_ForestTemple() {
         {
             // Exits
             Entrance(RR_FOREST_TEMPLE_BOSS_ENTRYWAY, { [] { return false; } }),
-            Entrance(RR_SACRED_FOREST_MEADOW, { [] { return logic->ForestTempleClear; } }),
+            Entrance(RR_SACRED_FOREST_MEADOW, { [] { return logic->ForestTempleClear; } }, false),
         });
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
index 4607f249f..a572fa1dc 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
@@ -9,7 +9,7 @@ void RegionTable_Init_GanonsCastle() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[RR_GANONS_CASTLE_ENTRYWAY] = Region("Ganon's Castle Entryway", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_GANONS_CASTLE_ENTRYWAY] = Region("Ganon's Castle Entryway", "Ganon's Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_GANONS_CASTLE_LOBBY,    {[]{return ctx->GetDungeon(GANONS_CASTLE)->IsVanilla();}}),
                   Entrance(RR_GANONS_CASTLE_MQ_LOBBY, {[]{return ctx->GetDungeon(GANONS_CASTLE)->IsMQ();}}),
@@ -20,7 +20,7 @@ void RegionTable_Init_GanonsCastle() {
   |     VANILLA DUNGEON      |
   ---------------------------*/
   if (ctx->GetDungeon(GANONS_CASTLE)->IsVanilla()) {
-  areaTable[RR_GANONS_CASTLE_LOBBY] = Region("Ganon's Castle Lobby", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GANONS_CASTLE_LOBBY] = Region("Ganon's Castle Lobby", "Ganon's Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SHEIK_HINT_GC,  true), 
                 }, {
@@ -41,7 +41,7 @@ void RegionTable_Init_GanonsCastle() {
                   Entrance(RR_GANONS_CASTLE_DEKU_SCRUBS,  {[]{return ctx->GetTrickOption(RT_LENS_GANON) || logic->CanUse(RG_LENS_OF_TRUTH);}}),
   });
 
-  areaTable[RR_GANONS_CASTLE_DEKU_SCRUBS] = Region("Ganon's Castle Deku Scrubs", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_DEKU_SCRUBS] = Region("Ganon's Castle Deku Scrubs", "Ganon's Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FreeFairies, {[]{return true;}}),
                 }, {
@@ -52,7 +52,7 @@ void RegionTable_Init_GanonsCastle() {
                   LOCATION(RC_GANONS_CASTLE_DEKU_SCRUB_LEFT,         logic->CanStunDeku()),
   }, {});
 
-  areaTable[RR_GANONS_CASTLE_FOREST_TRIAL] = Region("Ganon's Castle Forest Trial", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_FOREST_TRIAL] = Region("Ganon's Castle Forest Trial", "Ganon's Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->ForestTrialClear, {[]{return logic->CanUse(RG_LIGHT_ARROWS) && (logic->CanUse(RG_FIRE_ARROWS) || logic->CanUse(RG_DINS_FIRE));}}),
                 }, {
@@ -60,12 +60,12 @@ void RegionTable_Init_GanonsCastle() {
                   LOCATION(RC_GANONS_CASTLE_FOREST_TRIAL_CHEST, logic->CanDamage()),
   }, {});
 
-  areaTable[RR_GANONS_CASTLE_FIRE_TRIAL] = Region("Ganon's Castle Fire Trial", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_FIRE_TRIAL] = Region("Ganon's Castle Fire Trial", "Ganon's Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FireTrialClear, {[]{return logic->CanUse(RG_GORON_TUNIC) && logic->CanUse(RG_GOLDEN_GAUNTLETS) && logic->CanUse(RG_LIGHT_ARROWS) && logic->CanUse(RG_LONGSHOT);}}),
   }, {}, {});
 
-  areaTable[RR_GANONS_CASTLE_WATER_TRIAL] = Region("Ganon's Castle Water Trial", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_WATER_TRIAL] = Region("Ganon's Castle Water Trial", "Ganon's Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->BlueFireAccess,  {[]{return logic->BlueFireAccess || logic->HasBottle();}}),
                   EventAccess(&logic->FairyPot,        {[]{return logic->FairyPot || logic->BlueFire();}}),
@@ -76,7 +76,7 @@ void RegionTable_Init_GanonsCastle() {
                   LOCATION(RC_GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST, true),
   }, {});
 
-  areaTable[RR_GANONS_CASTLE_SHADOW_TRIAL] = Region("Ganon's Castle Shadow Trial", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_SHADOW_TRIAL] = Region("Ganon's Castle Shadow Trial", "Ganon's Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->ShadowTrialClear, {[]{return logic->CanUse(RG_LIGHT_ARROWS) && logic->CanUse(RG_MEGATON_HAMMER) && ((logic->CanUse(RG_FIRE_ARROWS) && (ctx->GetTrickOption(RT_LENS_GANON) || logic->CanUse(RG_LENS_OF_TRUTH))) || (logic->CanUse(RG_LONGSHOT) && (logic->CanUse(RG_HOVER_BOOTS) || (logic->CanUse(RG_DINS_FIRE) && (ctx->GetTrickOption(RT_LENS_GANON) || logic->CanUse(RG_LENS_OF_TRUTH))))));}}),
                 }, {
@@ -85,7 +85,7 @@ void RegionTable_Init_GanonsCastle() {
                   LOCATION(RC_GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST, logic->CanUse(RG_FIRE_ARROWS) || (logic->CanUse(RG_LONGSHOT) && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_DINS_FIRE)))),
   }, {});
 
-  areaTable[RR_GANONS_CASTLE_SPIRIT_TRIAL] = Region("Ganon's Castle Spirit Trial", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_SPIRIT_TRIAL] = Region("Ganon's Castle Spirit Trial", "Ganon's Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->NutPot,           {[]{return logic->NutPot || (((ctx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) && logic->CanJumpslash()) || logic->CanUse(RG_HOOKSHOT)) && logic->CanUse(RG_BOMBCHU_5) && logic->CanUse(RG_FAIRY_BOW) && (logic->CanUse(RG_MIRROR_SHIELD) || (ctx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS))));}}),
                   EventAccess(&logic->SpiritTrialClear, {[]{return logic->CanUse(RG_LIGHT_ARROWS) && (logic->CanUse(RG_MIRROR_SHIELD) || ctx->GetOption(RSK_SUNLIGHT_ARROWS)) && logic->CanUse(RG_BOMBCHU_5) && ((ctx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) && logic->CanJumpslash()) || logic->CanUse(RG_HOOKSHOT));}}),
@@ -95,7 +95,7 @@ void RegionTable_Init_GanonsCastle() {
                   LOCATION(RC_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST,      (ctx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) || logic->CanUse(RG_HOOKSHOT)) && logic->CanUse(RG_BOMBCHU_5) && (ctx->GetTrickOption(RT_LENS_GANON) || logic->CanUse(RG_LENS_OF_TRUTH))),
   }, {});
 
-  areaTable[RR_GANONS_CASTLE_LIGHT_TRIAL] = Region("Ganon's Castle Light Trial", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_LIGHT_TRIAL] = Region("Ganon's Castle Light Trial", "Ganon's Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->LightTrialClear, {[]{return logic->CanUse(RG_LIGHT_ARROWS) && logic->CanUse(RG_HOOKSHOT) && logic->SmallKeys(RR_GANONS_CASTLE, 2) && (ctx->GetTrickOption(RT_LENS_GANON) || logic->CanUse(RG_LENS_OF_TRUTH));}}),
                 }, {
@@ -111,7 +111,7 @@ void RegionTable_Init_GanonsCastle() {
   }, {});
   }
 
-  areaTable[RR_GANONS_CASTLE_TOWER] = Region("Ganon's Castle Tower", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GANONS_CASTLE_TOWER] = Region("Ganon's Castle Tower", "Ganons Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GANONS_TOWER_BOSS_KEY_CHEST, logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)),
                   LOCATION(RC_GANONDORF_HINT,              logic->HasItem(RG_GANONS_CASTLE_BOSS_KEY) && (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD))),
@@ -122,7 +122,7 @@ void RegionTable_Init_GanonsCastle() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (ctx->GetDungeon(GANONS_CASTLE)->IsMQ()) {
-  areaTable[RR_GANONS_CASTLE_MQ_LOBBY] = Region("Ganon's Castle MQ Lobby", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GANONS_CASTLE_MQ_LOBBY] = Region("Ganon's Castle MQ Lobby", "Ganons Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SHEIK_HINT_MQ_GC,  true),
                 }, {
@@ -143,7 +143,7 @@ void RegionTable_Init_GanonsCastle() {
                   Entrance(RR_GANONS_CASTLE_MQ_DEKU_SCRUBS,  {[]{return ctx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH);}}),
   });
 
-  areaTable[RR_GANONS_CASTLE_MQ_DEKU_SCRUBS] = Region("Ganon's Castle MQ Deku Scrubs", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_MQ_DEKU_SCRUBS] = Region("Ganon's Castle MQ Deku Scrubs", "Ganon's Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FreeFairies, {[]{return true;}}),
   }, {
@@ -155,7 +155,7 @@ void RegionTable_Init_GanonsCastle() {
                   LOCATION(RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,        logic->CanStunDeku()),
   }, {});
 
-  areaTable[RR_GANONS_CASTLE_MQ_FOREST_TRIAL] = Region("Ganon's Castle MQ Forest Trial", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_MQ_FOREST_TRIAL] = Region("Ganon's Castle MQ Forest Trial", "Ganons Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->ForestTrialClear, {[]{return logic->IsAdult && logic->CanUse(RG_LIGHT_ARROWS) && (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && logic->CanUse(RG_SONG_OF_TIME);}}),
   }, {
@@ -165,13 +165,13 @@ void RegionTable_Init_GanonsCastle() {
                   LOCATION(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY,        (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && logic->HookshotOrBoomerang()),
   }, {});
 
-  areaTable[RR_GANONS_CASTLE_MQ_FIRE_TRIAL] = Region("Ganon's Castle MQ Fire Trial", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_MQ_FIRE_TRIAL] = Region("Ganon's Castle MQ Fire Trial", "Ganons Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FireTrialClear, {[]{return logic->CanUse(RG_GORON_TUNIC) && logic->CanUse(RG_GOLDEN_GAUNTLETS) && logic->CanUse(RG_LIGHT_ARROWS) && (logic->CanUse(RG_LONGSHOT) || logic->CanUse(RG_HOVER_BOOTS) || (ctx->GetTrickOption(RT_GANON_MQ_FIRE_TRIAL) && logic->CanUse(RG_HOOKSHOT)));}}),
                     //Trick: logic->CanUse(RG_GORON_TUNIC) && logic->CanUse(RG_GOLDEN_GAUNTLETS) && logic->CanUse(RG_LIGHT_ARROWS) && (logic->CanUse(RG_LONGSHOT) || logic->CanUse(RG_HOVER_BOOTS) || (LogicFireTrialMQ && logic->CanUse(RG_HOOKSHOT)))
   }, {}, {});
 
-  areaTable[RR_GANONS_CASTLE_MQ_WATER_TRIAL] = Region("Ganon's Castle MQ Water Trial", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_MQ_WATER_TRIAL] = Region("Ganon's Castle MQ Water Trial", "Ganons Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->WaterTrialClear, {[]{return logic->BlueFire() && logic->IsAdult && logic->CanUse(RG_LIGHT_ARROWS) && logic->SmallKeys(RR_GANONS_CASTLE, 3);}}),
                   EventAccess(&logic->BlueFireAccess,  {[]{return logic->BlueFireAccess || (logic->HasBottle() && logic->CanJumpslash());}}),
@@ -180,7 +180,7 @@ void RegionTable_Init_GanonsCastle() {
                   LOCATION(RC_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST, logic->BlueFire()),
   }, {});
 
-  areaTable[RR_GANONS_CASTLE_MQ_SHADOW_TRIAL] = Region("Ganon's Castle MQ Shadow Trial", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_MQ_SHADOW_TRIAL] = Region("Ganon's Castle MQ Shadow Trial", "Ganons Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->ShadowTrialClear, {[]{return logic->IsAdult && logic->CanUse(RG_LIGHT_ARROWS) && (ctx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->CanUse(RG_HOVER_BOOTS) || (logic->CanUse(RG_HOOKSHOT) && (logic->HasFireSource() || ctx->GetTrickOption(RT_GANON_MQ_SHADOW_TRIAL))));}}),
                     //Trick: logic->IsAdult && logic->CanUse(RG_LIGHT_ARROWS) && (LogicLensCastleMQ || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->CanUse(RG_HOVER_BOOTS) || (logic->CanUse(RG_HOOKSHOT) && (logic->HasFireSource() || LogicShadowTrialMQ)))
@@ -191,7 +191,7 @@ void RegionTable_Init_GanonsCastle() {
                     //Trick: logic->IsAdult && logic->CanUse(RG_FAIRY_BOW) && (LogicLensCastleMQ || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->CanUse(RG_HOVER_BOOTS) || (logic->CanUse(RG_HOOKSHOT) && (logic->HasFireSource() || LogicShadowTrialMQ)))
   }, {});
 
-  areaTable[RR_GANONS_CASTLE_MQ_SPIRIT_TRIAL] = Region("Ganon's Castle MQ Spirit Castle", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_MQ_SPIRIT_TRIAL] = Region("Ganon's Castle MQ Spirit Castle", "Ganons Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->SpiritTrialClear, {[]{return logic->IsAdult && logic->CanUse(RG_LIGHT_ARROWS) && logic->CanUse(RG_MEGATON_HAMMER) && logic->CanUse(RG_BOMBCHU_5) && ((logic->CanUse(RG_FIRE_ARROWS) && logic->CanUse(RG_MIRROR_SHIELD)) || ctx->GetOption(RSK_SUNLIGHT_ARROWS));}}),
                   EventAccess(&logic->NutPot,           {[]{return logic->NutPot || (logic->CanUse(RG_MEGATON_HAMMER) && logic->CanUse(RG_BOMBCHU_5) && logic->IsAdult && ((logic->CanUse(RG_FIRE_ARROWS) && logic->CanUse(RG_MIRROR_SHIELD)) || (ctx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS))));}}),
@@ -205,7 +205,7 @@ void RegionTable_Init_GanonsCastle() {
                   LOCATION(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST,    logic->IsAdult && logic->CanUse(RG_MEGATON_HAMMER) && logic->CanUse(RG_BOMBCHU_5) && ((logic->CanUse(RG_FIRE_ARROWS) && logic->CanUse(RG_MIRROR_SHIELD)) || (ctx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS)))),
   }, {});
 
-  areaTable[RR_GANONS_CASTLE_MQ_LIGHT_TRIAL] = Region("Ganon's Castle MQ Light Trial", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GANONS_CASTLE_MQ_LIGHT_TRIAL] = Region("Ganon's Castle MQ Light Trial", "Ganons Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->LightTrialClear, {[]{return logic->IsAdult && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) && logic->CanUse(RG_LIGHT_ARROWS) && logic->SmallKeys(RR_GANONS_CASTLE, 3) && (ctx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->CanUse(RG_HOOKSHOT) || ctx->GetTrickOption(RT_GANON_MQ_LIGHT_TRIAL));}}),
                     //Trick: logic->IsAdult && logic->CanUse(RG_LIGHT_ARROWS) && logic->SmallKeys(RR_GANONS_CASTLE, 3) && (LogicLensCastleMQ || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->CanUse(RG_HOOKSHOT) || LogicLightTrialMQ)
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp
index 686c7c11d..e6498181b 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp
@@ -8,7 +8,7 @@ void RegionTable_Init_GerudoTrainingGrounds() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_ENTRYWAY] = Region("Gerudo Training Grounds Entryway", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_ENTRYWAY] = Region("Gerudo Training Grounds Entryway", "Gerudo Training Grounds", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_LOBBY,    {[]{return ctx->GetDungeon(GERUDO_TRAINING_GROUNDS)->IsVanilla();}}),
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_LOBBY, {[]{return ctx->GetDungeon(GERUDO_TRAINING_GROUNDS)->IsMQ();}}),
@@ -19,7 +19,7 @@ void RegionTable_Init_GerudoTrainingGrounds() {
   |     VANILLA DUNGEON      |
   ---------------------------*/
   if (ctx->GetDungeon(GERUDO_TRAINING_GROUNDS)->IsVanilla()) {
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_LOBBY] = Region("Gerudo Training Grounds Lobby", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_LOBBY] = Region("Gerudo Training Grounds Lobby", "Gerudo Training Grounds", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST,  logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT)),
                   LOCATION(RC_GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST, logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT)),
@@ -33,7 +33,7 @@ void RegionTable_Init_GerudoTrainingGrounds() {
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE,     {[]{return true;}}),
   });
 
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE] = Region("Gerudo Training Grounds Central Maze", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE] = Region("Gerudo Training Grounds Central Maze", "Gerudo Training Grounds", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST,   logic->SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 3) && (ctx->GetTrickOption(RT_LENS_GTG) || logic->CanUse(RG_LENS_OF_TRUTH))),
                   LOCATION(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST,  logic->SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 4)),
@@ -45,7 +45,7 @@ void RegionTable_Init_GerudoTrainingGrounds() {
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE_RIGHT, {[]{return logic->SmallKeys(RR_GERUDO_TRAINING_GROUNDS, 9);}}),
   });
 
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE_RIGHT] = Region("Gerudo Training Grounds Central Maze Right", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE_RIGHT] = Region("Gerudo Training Grounds Central Maze Right", "Gerudo Training Grounds", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_CENTRAL_CHEST, true),
                   LOCATION(RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_SIDE_CHEST,    true),
@@ -56,7 +56,7 @@ void RegionTable_Init_GerudoTrainingGrounds() {
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_LAVA_ROOM,   {[]{return true;}}),
   });
 
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_LAVA_ROOM] = Region("Gerudo Training Grounds Lava Room", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_LAVA_ROOM] = Region("Gerudo Training Grounds Lava Room", "Gerudo Training Grounds", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST, logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_SONG_OF_TIME) && logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 24),
                 }, {
@@ -65,7 +65,7 @@ void RegionTable_Init_GerudoTrainingGrounds() {
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_HAMMER_ROOM,        {[]{return logic->CanUse(RG_LONGSHOT)  || (logic->CanUse(RG_HOVER_BOOTS) && logic->CanUse(RG_HOOKSHOT));}}),
   });
 
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_HAMMER_ROOM] = Region("Gerudo Training Grounds Hammer Room", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_HAMMER_ROOM] = Region("Gerudo Training Grounds Hammer Room", "Gerudo Training Grounds", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST,  logic->CanAttack()),
                   LOCATION(RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST, logic->CanUse(RG_MEGATON_HAMMER) || (logic->TakeDamage() && ctx->GetTrickOption(RT_FLAMING_CHESTS))),
@@ -75,7 +75,7 @@ void RegionTable_Init_GerudoTrainingGrounds() {
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_LAVA_ROOM,        {[]{return true;}}),
   });
 
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_EYE_STATUE_LOWER] = Region("Gerudo Training Grounds Eye Statue Lower", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_EYE_STATUE_LOWER] = Region("Gerudo Training Grounds Eye Statue Lower", "Gerudo Training Grounds", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GERUDO_TRAINING_GROUND_EYE_STATUE_CHEST, logic->CanUse(RG_FAIRY_BOW)),
                 }, {
@@ -83,7 +83,7 @@ void RegionTable_Init_GerudoTrainingGrounds() {
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_HAMMER_ROOM, {[]{return true;}}),
   });
 
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_EYE_STATUE_UPPER] = Region("Gerudo Training Grounds Eye Statue Upper", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_EYE_STATUE_UPPER] = Region("Gerudo Training Grounds Eye Statue Upper", "Gerudo Training Grounds", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GERUDO_TRAINING_GROUND_NEAR_SCARECROW_CHEST, logic->CanUse(RG_FAIRY_BOW)),
                 }, {
@@ -91,7 +91,7 @@ void RegionTable_Init_GerudoTrainingGrounds() {
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_EYE_STATUE_LOWER, {[]{return true;}}),
   });
 
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_ROOM] = Region("Gerudo Training Grounds Heavy Block Room", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_ROOM] = Region("Gerudo Training Grounds Heavy Block Room", "Gerudo Training Grounds", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST, logic->CanJumpslash()),
                 }, {
@@ -100,7 +100,7 @@ void RegionTable_Init_GerudoTrainingGrounds() {
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_LIKE_LIKE_ROOM,   {[]{return (ctx->GetTrickOption(RT_LENS_GTG) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->CanUse(RG_HOOKSHOT) || (ctx->GetTrickOption(RT_GTG_FAKE_WALL) && logic->CanUse(RG_HOVER_BOOTS))) && logic->CanUse(RG_SILVER_GAUNTLETS);}}),
   });
 
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_LIKE_LIKE_ROOM] = Region("Gerudo Training Grounds Like Like Room", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_LIKE_LIKE_ROOM] = Region("Gerudo Training Grounds Like Like Room", "Gerudo Training Grounds", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST,  logic->CanJumpslash()),
                   LOCATION(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST, logic->CanJumpslash()),
@@ -113,7 +113,7 @@ void RegionTable_Init_GerudoTrainingGrounds() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (ctx->GetDungeon(GERUDO_TRAINING_GROUNDS)->IsMQ()) {
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_LOBBY] = Region("Gerudo Training Grounds MQ Lobby", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_LOBBY] = Region("Gerudo Training Grounds MQ Lobby", "Gerudo Training Grounds", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST,       true),
                   LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST,      true),
@@ -128,7 +128,7 @@ void RegionTable_Init_GerudoTrainingGrounds() {
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_RIGHT_SIDE, {[]{return Here(RR_GERUDO_TRAINING_GROUNDS_MQ_LOBBY, []{return (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW)) || (logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT));});}}),
   });
 
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_RIGHT_SIDE] = Region("Gerudo Training Grounds MQ Right Side", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_RIGHT_SIDE] = Region("Gerudo Training Grounds MQ Right Side", "Gerudo Training Grounds", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   //EventAccess(&WallFairy, {[]{return WallFairy || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW));}}),
   }, {
@@ -139,12 +139,12 @@ void RegionTable_Init_GerudoTrainingGrounds() {
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER, {[]{return (logic->CanUse(RG_FAIRY_BOW) || (logic->CanUse(RG_LONGSHOT) && logic->HasFireSource())) && logic->CanUse(RG_HOVER_BOOTS) && logic->IsAdult && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BIGGORON_SWORD));}}),
   });
 
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER] = Region("Gerudo Training Grounds MQ Underwater", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER] = Region("Gerudo Training Grounds MQ Underwater", "Gerudo Training Grounds", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST, logic->HasFireSource() && logic->IsAdult && logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 24 && logic->TakeDamage()),
   }, {});
 
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_LEFT_SIDE] = Region("Gerudo Training Grounds MQ Left Side", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_LEFT_SIDE] = Region("Gerudo Training Grounds MQ Left Side", "Gerudo Training Grounds", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST, logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->HasExplosives()),
   }, {
@@ -153,7 +153,7 @@ void RegionTable_Init_GerudoTrainingGrounds() {
                     //Trick: (logic->IsAdult && logic->CanUse(RG_LONGSHOT)) || LogicGtgMQWithoutHookshot || (LogicGtgMQWithHookshot && logic->IsAdult && logic->CanUse(RG_HOOKSHOT))
   });
 
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_STALFOS_ROOM] = Region("Gerudo Training Grounds MQ Stalfos Room", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_STALFOS_ROOM] = Region("Gerudo Training Grounds MQ Stalfos Room", "Gerudo Training Grounds", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->BlueFireAccess,  {[]{return logic->BlueFireAccess || logic->HasBottle();}}),
   }, {
@@ -166,7 +166,7 @@ void RegionTable_Init_GerudoTrainingGrounds() {
                     //Trick: logic->IsAdult && (LogicLensGtgMQ || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->BlueFire && (logic->CanUse(RG_SONG_OF_TIME) || (LogicGtgFakeWall && logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS)))
   });
 
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_BACK_AREAS] = Region("Gerudo Training Grounds MQ Back Areas", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_BACK_AREAS] = Region("Gerudo Training Grounds MQ Back Areas", "Gerudo Training Grounds", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_EYE_STATUE_CHEST,          logic->CanUse(RG_FAIRY_BOW)),
                   LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_SECOND_IRON_KNUCKLE_CHEST, logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)),
@@ -177,7 +177,7 @@ void RegionTable_Init_GerudoTrainingGrounds() {
                   Entrance(RR_GERUDO_TRAINING_GROUNDS_MQ_RIGHT_SIDE,         {[]{return logic->CanUse(RG_LONGSHOT);}}),
   });
 
-  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_CENTRAL_MAZE_RIGHT] = Region("Gerudo Training Grounds MQ Central Maze Right", "Gerudo Training Grounds", RA_GERUDO_TRAINING_GROUND, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GERUDO_TRAINING_GROUNDS_MQ_CENTRAL_MAZE_RIGHT] = Region("Gerudo Training Grounds MQ Central Maze Right", "Gerudo Training Grounds", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_CENTRAL_CHEST, true),
                   LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_SIDE_CHEST,    true),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
index 7d40507a3..636fe60ed 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
@@ -4,7 +4,7 @@
 using namespace Rando;
 
 void RegionTable_Init_GerudoValley() {
-  areaTable[RR_GERUDO_VALLEY] = Region("Gerudo Valley", "Gerudo Valley", RA_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {
+  areaTable[RR_GERUDO_VALLEY] = Region("Gerudo Valley", "Gerudo Valley", {RA_GERUDO_VALLEY}, DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->BugRock, {[]{return logic->BugRock || logic->IsChild;}}),
                 }, {
@@ -19,7 +19,7 @@ void RegionTable_Init_GerudoValley() {
                   Entrance(RR_GV_FORTRESS_SIDE,  {[]{return (logic->IsAdult && (logic->CanUse(RG_EPONA) || logic->CanUse(RG_LONGSHOT) || ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_OPEN) || logic->CarpenterRescue)) || (logic->IsChild && logic->CanUse(RG_HOOKSHOT));}}),
   });
 
-  areaTable[RR_GV_UPPER_STREAM] = Region("GV Upper Stream", "Gerudo Valley", RA_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {
+  areaTable[RR_GV_UPPER_STREAM] = Region("GV Upper Stream", "Gerudo Valley", {RA_GERUDO_VALLEY}, DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->GossipStoneFairy, {[]{return logic->CallGossipFairy();}}),
                   EventAccess(&logic->BeanPlantFairy,   {[]{return logic->BeanPlantFairy   || (CanPlantBean(RR_GV_UPPER_STREAM) && logic->CanUse(RG_SONG_OF_STORMS));}}),
@@ -34,19 +34,19 @@ void RegionTable_Init_GerudoValley() {
                   Entrance(RR_GV_LOWER_STREAM, {[]{return true;}}),
   });
 
-  areaTable[RR_GV_LOWER_STREAM] = Region("GV Lower Stream", "Gerudo Valley", RA_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_GV_LOWER_STREAM] = Region("GV Lower Stream", "Gerudo Valley", {RA_GERUDO_VALLEY}, DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_LAKE_HYLIA, {[]{return logic->IsChild || logic->HasItem(RG_BRONZE_SCALE);}}),//can use cucco as child
   });
 
-  areaTable[RR_GV_GROTTO_LEDGE] = Region("GV Grotto Ledge", "Gerudo Valley", RA_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_GV_GROTTO_LEDGE] = Region("GV Grotto Ledge", "Gerudo Valley", {RA_GERUDO_VALLEY}, DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_GV_LOWER_STREAM,   {[]{return true;}}),
                   Entrance(RR_GV_OCTOROK_GROTTO, {[]{return logic->CanUse(RG_SILVER_GAUNTLETS);}}),
                   Entrance(RR_GV_CRATE_LEDGE,    {[]{return logic->CanUse(RG_LONGSHOT);}}),
   });
 
-  areaTable[RR_GV_CRATE_LEDGE] = Region("GV Crate Ledge", "Gerudo Valley", RA_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GV_CRATE_LEDGE] = Region("GV Crate Ledge", "Gerudo Valley", {RA_GERUDO_VALLEY}, DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GV_CRATE_FREESTANDING_POH, true),
                 }, {
@@ -54,7 +54,7 @@ void RegionTable_Init_GerudoValley() {
                   Entrance(RR_GV_LOWER_STREAM, {[]{return true;}}),
   });
 
-  areaTable[RR_GV_FORTRESS_SIDE] = Region("GV Fortress Side", "Gerudo Valley", RA_GERUDO_VALLEY, DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GV_FORTRESS_SIDE] = Region("GV Fortress Side", "Gerudo Valley", {RA_GERUDO_VALLEY}, DAY_NIGHT_CYCLE, {}, {
                   //Locations                                       
                   LOCATION(RC_GV_CHEST,          logic->IsAdult && logic->CanUse(RG_MEGATON_HAMMER)),
                   LOCATION(RC_GV_TRADE_SAW,      logic->IsAdult && logic->CanUse(RG_POACHERS_SAW)),
@@ -70,17 +70,17 @@ void RegionTable_Init_GerudoValley() {
                   Entrance(RR_GV_CRATE_LEDGE, {[]{return false;}}),
   });
 
-  areaTable[RR_GV_CARPENTER_TENT] = Region("GV Carpenter Tent", "GV Carpenter Tent", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_GV_CARPENTER_TENT] = Region("GV Carpenter Tent", "GV Carpenter Tent", {}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_GV_FORTRESS_SIDE, {[]{return true;}}),
   });
 
-  areaTable[RR_GV_OCTOROK_GROTTO] = Region("GV Octorok Grotto", "GV Octorok Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_GV_OCTOROK_GROTTO] = Region("GV Octorok Grotto", "GV Octorok Grotto", {}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_GV_GROTTO_LEDGE, {[]{return true;}}),
   });
 
-  areaTable[RR_GV_STORMS_GROTTO] = Region("GV Storms Grotto", "GV Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GV_STORMS_GROTTO] = Region("GV Storms Grotto", "GV Storms Grotto", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GV_DEKU_SCRUB_GROTTO_REAR,    logic->CanStunDeku()),
                   LOCATION(RC_GV_DEKU_SCRUB_GROTTO_FRONT,   logic->CanStunDeku()),
@@ -90,7 +90,7 @@ void RegionTable_Init_GerudoValley() {
                   Entrance(RR_GV_FORTRESS_SIDE, {[]{return true;}}),
   });
 
-  areaTable[RR_GERUDO_FORTRESS] = Region("Gerudo Fortress", "Gerudo Fortress", RA_GERUDO_FORTRESS, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GERUDO_FORTRESS] = Region("Gerudo Fortress", "Gerudo Fortress", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->CarpenterRescue, {[]{return logic->CanFinishGerudoFortress();}}),
                   EventAccess(&logic->GF_GateOpen,     {[]{return logic->IsAdult && logic->HasItem(RG_GERUDO_MEMBERSHIP_CARD);}}),
@@ -115,7 +115,7 @@ void RegionTable_Init_GerudoValley() {
                   Entrance(RR_GF_STORMS_GROTTO,                 {[]{return logic->IsAdult && logic->CanOpenStormsGrotto();}}),
   });
 
-  areaTable[RR_GF_OUTSIDE_GATE] = Region("GF Outside Gate", "Gerudo Fortress", RA_GERUDO_FORTRESS, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GF_OUTSIDE_GATE] = Region("GF Outside Gate", "Gerudo Fortress", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->GF_GateOpen, {[]{return logic->IsAdult && logic->HasItem(RG_GERUDO_MEMBERSHIP_CARD) && (ctx->GetOption(RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD) || ctx->GetOption(RSK_SHUFFLE_OVERWORLD_ENTRANCES) /*|| ShuffleSpecialIndoorEntrances*/);}}),
                 }, {}, {
@@ -124,7 +124,7 @@ void RegionTable_Init_GerudoValley() {
                   Entrance(RR_WASTELAND_NEAR_FORTRESS, {[]{return true;}}),
   });
 
-  areaTable[RR_GF_STORMS_GROTTO] = Region("GF Storms Grotto", "GF Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GF_STORMS_GROTTO] = Region("GF Storms Grotto", "GF Storms Grotto", {}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FreeFairies, {[]{return true;}}),
                 }, {}, {
@@ -132,13 +132,13 @@ void RegionTable_Init_GerudoValley() {
                   Entrance(RR_GERUDO_FORTRESS, {[]{return true;}}),
   });
 
-  areaTable[RR_WASTELAND_NEAR_FORTRESS] = Region("Wasteland Near Fortress", "Haunted Wasteland", RA_HAUNTED_WASTELAND, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WASTELAND_NEAR_FORTRESS] = Region("Wasteland Near Fortress", "Haunted Wasteland", {RA_HAUNTED_WASTELAND}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_GF_OUTSIDE_GATE,   {[]{return true;}}),
                   Entrance(RR_HAUNTED_WASTELAND, {[]{return logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_LONGSHOT) || ctx->GetTrickOption(RT_HW_CROSSING);}}),
   });
 
-  areaTable[RR_HAUNTED_WASTELAND] = Region("Haunted Wasteland", "Haunted Wasteland", RA_HAUNTED_WASTELAND, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_HAUNTED_WASTELAND] = Region("Haunted Wasteland", "Haunted Wasteland", {RA_HAUNTED_WASTELAND}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FairyPot,       {[]{return true;}}),
                   EventAccess(&logic->NutPot,         {[]{return true;}}),
@@ -154,13 +154,13 @@ void RegionTable_Init_GerudoValley() {
                   Entrance(RR_WASTELAND_NEAR_FORTRESS, {[]{return logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_LONGSHOT) || ctx->GetTrickOption(RT_HW_CROSSING);}}),
   });
 
-  areaTable[RR_WASTELAND_NEAR_COLOSSUS] = Region("Wasteland Near Colossus", "Haunted Wasteland", RA_HAUNTED_WASTELAND, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WASTELAND_NEAR_COLOSSUS] = Region("Wasteland Near Colossus", "Haunted Wasteland", {RA_HAUNTED_WASTELAND}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_DESERT_COLOSSUS,   {[]{return true;}}),
                   Entrance(RR_HAUNTED_WASTELAND, {[]{return ctx->GetTrickOption(RT_HW_REVERSE) || false;}}),
   });
 
-  areaTable[RR_DESERT_COLOSSUS] = Region("Desert Colossus", "Desert Colossus", RA_DESERT_COLOSSUS, DAY_NIGHT_CYCLE, {
+  areaTable[RR_DESERT_COLOSSUS] = Region("Desert Colossus", "Desert Colossus", {RA_DESERT_COLOSSUS}, DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FairyPond, {[]{return logic->FairyPond || logic->CanUse(RG_SONG_OF_STORMS);}}),
                   EventAccess(&logic->BugRock,   {[]{return true;}}),
@@ -179,7 +179,7 @@ void RegionTable_Init_GerudoValley() {
                   Entrance(RR_COLOSSUS_GROTTO,               {[]{return logic->CanUse(RG_SILVER_GAUNTLETS);}}),
   });
 
-  areaTable[RR_DESERT_COLOSSUS_FROM_SPIRIT_ENTRYWAY] = Region("Desert Colossus From Spirit Entryway", "Desert Colossus", RA_DESERT_COLOSSUS, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DESERT_COLOSSUS_FROM_SPIRIT_ENTRYWAY] = Region("Desert Colossus From Spirit Entryway", "Desert Colossus", {RA_DESERT_COLOSSUS}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SHEIK_AT_COLOSSUS, true),
                 }, {
@@ -187,7 +187,7 @@ void RegionTable_Init_GerudoValley() {
                   Entrance(RR_DESERT_COLOSSUS, {[]{return true;}}),
   });
 
-  areaTable[RR_COLOSSUS_GREAT_FAIRY_FOUNTAIN] = Region("Colossus Great Fairy Fountain", "Colossus Great Fairy Fountain", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_COLOSSUS_GREAT_FAIRY_FOUNTAIN] = Region("Colossus Great Fairy Fountain", "Colossus Great Fairy Fountain", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_COLOSSUS_GREAT_FAIRY_REWARD, logic->CanUse(RG_ZELDAS_LULLABY)),
                 }, {
@@ -195,7 +195,7 @@ void RegionTable_Init_GerudoValley() {
                   Entrance(RR_DESERT_COLOSSUS, {[]{return true;}}),
   });
 
-  areaTable[RR_COLOSSUS_GROTTO] = Region("Colossus Grotto", "Colossus Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_COLOSSUS_GROTTO] = Region("Colossus Grotto", "Colossus Grotto", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,  logic->CanStunDeku()),
                   LOCATION(RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT, logic->CanStunDeku()),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
index ea9a7c55d..9332decd4 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp
@@ -4,7 +4,7 @@
 using namespace Rando;
 
 void RegionTable_Init_HyruleField() {
-  areaTable[RR_HYRULE_FIELD] = Region("Hyrule Field", "Hyrule Field", RA_HYRULE_FIELD, DAY_NIGHT_CYCLE, {
+  areaTable[RR_HYRULE_FIELD] = Region("Hyrule Field", "Hyrule Field", {RA_HYRULE_FIELD}, DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->BigPoeKill, {[]{return logic->CanUse(RG_FAIRY_BOW) && logic->CanUse(RG_EPONA) && logic->HasBottle();}}),
                 }, {
@@ -30,7 +30,7 @@ void RegionTable_Init_HyruleField() {
                   Entrance(RR_HF_TEKTITE_GROTTO,      {[]{return logic->CanOpenBombGrotto();}}),
   });
 
-  areaTable[RR_HF_SOUTHEAST_GROTTO] = Region("HF Southeast Grotto", "HF Southeast Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+  areaTable[RR_HF_SOUTHEAST_GROTTO] = Region("HF Southeast Grotto", "HF Southeast Grotto", {}, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LOCATION(RC_HF_SOUTHEAST_GROTTO_CHEST,         true),
                   LOCATION(RC_HF_SOUTHEAST_GROTTO_FISH,          logic->HasBottle()),
@@ -42,7 +42,7 @@ void RegionTable_Init_HyruleField() {
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
   });
 
-  areaTable[RR_HF_OPEN_GROTTO] = Region("HF Open Grotto", "HF Open Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+  areaTable[RR_HF_OPEN_GROTTO] = Region("HF Open Grotto", "HF Open Grotto", {}, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LOCATION(RC_HF_OPEN_GROTTO_CHEST,         true),
                   LOCATION(RC_HF_OPEN_GROTTO_FISH,          logic->HasBottle()),
@@ -54,7 +54,7 @@ void RegionTable_Init_HyruleField() {
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
   });
 
-  areaTable[RR_HF_INSIDE_FENCE_GROTTO] = Region("HF Inside Fence Grotto", "HF Inside Fence Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_HF_INSIDE_FENCE_GROTTO] = Region("HF Inside Fence Grotto", "HF Inside Fence Grotto", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_HF_DEKU_SCRUB_GROTTO,           logic->CanStunDeku()),
                   LOCATION(RC_HF_INSIDE_FENCE_GROTTO_BEEHIVE, logic->CanBreakLowerBeehives()),
@@ -63,7 +63,7 @@ void RegionTable_Init_HyruleField() {
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
   });
 
-  areaTable[RR_HF_COW_GROTTO] = Region("HF Cow Grotto", "HF Cow Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+  areaTable[RR_HF_COW_GROTTO] = Region("HF Cow Grotto", "HF Cow Grotto", {}, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LOCATION(RC_HF_GS_COW_GROTTO,           logic->HasFireSource() && logic->HookshotOrBoomerang()),
                   LOCATION(RC_HF_COW_GROTTO_COW,          logic->HasFireSource() && logic->CanUse(RG_EPONAS_SONG)),
@@ -73,7 +73,7 @@ void RegionTable_Init_HyruleField() {
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
   });
 
-  areaTable[RR_HF_NEAR_MARKET_GROTTO] = Region("HF Near Market Grotto", "HF Near Market Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+  areaTable[RR_HF_NEAR_MARKET_GROTTO] = Region("HF Near Market Grotto", "HF Near Market Grotto", {}, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LOCATION(RC_HF_NEAR_MARKET_GROTTO_CHEST,         true),
                   LOCATION(RC_HF_NEAR_MARKET_GROTTO_FISH,          logic->HasBottle()),
@@ -85,7 +85,7 @@ void RegionTable_Init_HyruleField() {
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
   });
 
-  areaTable[RR_HF_FAIRY_GROTTO] = Region("HF Fairy Grotto", "HF Fairy Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_HF_FAIRY_GROTTO] = Region("HF Fairy Grotto", "HF Fairy Grotto", {}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FreeFairies, {[]{return true;}}),
                 }, {}, {
@@ -93,7 +93,7 @@ void RegionTable_Init_HyruleField() {
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
   });
 
-  areaTable[RR_HF_NEAR_KAK_GROTTO] = Region("HF Near Kak Grotto", "HF Near Kak Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_HF_NEAR_KAK_GROTTO] = Region("HF Near Kak Grotto", "HF Near Kak Grotto", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_HF_GS_NEAR_KAK_GROTTO, logic->HookshotOrBoomerang()),
                 }, {
@@ -101,7 +101,7 @@ void RegionTable_Init_HyruleField() {
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
   });
 
-  areaTable[RR_HF_TEKTITE_GROTTO] = Region("HF Tektite Grotto", "HF Tektite Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_HF_TEKTITE_GROTTO] = Region("HF Tektite Grotto", "HF Tektite Grotto", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_HF_TEKTITE_GROTTO_FREESTANDING_POH, logic->HasItem(RG_GOLDEN_SCALE) || logic->CanUse(RG_IRON_BOOTS)),
                 }, {
@@ -109,7 +109,7 @@ void RegionTable_Init_HyruleField() {
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
   });
 
-  areaTable[RR_LAKE_HYLIA] = Region("Lake Hylia", "Lake Hylia", RA_LAKE_HYLIA, DAY_NIGHT_CYCLE, {
+  areaTable[RR_LAKE_HYLIA] = Region("Lake Hylia", "Lake Hylia", {RA_LAKE_HYLIA}, DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->GossipStoneFairy, {[]{return logic->CallGossipFairy();}}),
                   EventAccess(&logic->BeanPlantFairy,   {[]{return logic->BeanPlantFairy   || (CanPlantBean(RR_LAKE_HYLIA) && logic->CanUse(RG_SONG_OF_STORMS));}}),
@@ -140,18 +140,18 @@ void RegionTable_Init_HyruleField() {
                   Entrance(RR_LH_GROTTO,             {[]{return true;}}),
   });
 
-  areaTable[RR_LH_FISHING_ISLAND] = Region("LH Fishing Island", "Lake Hylia", RA_LAKE_HYLIA, DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_LH_FISHING_ISLAND] = Region("LH Fishing Island", "Lake Hylia", {RA_LAKE_HYLIA}, DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_LAKE_HYLIA,      {[]{return true;}}),
                   Entrance(RR_LH_FISHING_HOLE, {[]{return true;}}),
   });
 
-  areaTable[RR_LH_OWL_FLIGHT] = Region("LH Owl Flight", "Lake Hylia", RA_LAKE_HYLIA, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_LH_OWL_FLIGHT] = Region("LH Owl Flight", "Lake Hylia", {RA_LAKE_HYLIA}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
+                  Entrance(RR_HYRULE_FIELD, {[]{return true;}}, false),
   });
 
-  areaTable[RR_LH_LAB] = Region("LH Lab", "LH Lab", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_LH_LAB] = Region("LH Lab", "LH Lab", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_LH_LAB_DIVE,     logic->HasItem(RG_GOLDEN_SCALE) || (ctx->GetTrickOption(RT_LH_LAB_DIVING) && logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_HOOKSHOT))),
                   LOCATION(RC_LH_TRADE_FROG,   logic->IsAdult && logic->CanUse(RG_EYEBALL_FROG)),
@@ -162,7 +162,7 @@ void RegionTable_Init_HyruleField() {
   });
 
   // TODO: should some of these helpers be done via events instead?
-  areaTable[RR_LH_FISHING_HOLE] = Region("LH Fishing Hole", "LH Fishing Hole", RA_NONE, DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_LH_FISHING_HOLE] = Region("LH Fishing Hole", "LH Fishing Hole", {}, DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_LH_CHILD_FISHING,  logic->CanUse(RG_FISHING_POLE) && logic->IsChild),
                   LOCATION(RC_LH_CHILD_FISH_1,   logic->CanUse(RG_FISHING_POLE) && (logic->IsChild || ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT))),
@@ -206,7 +206,7 @@ void RegionTable_Init_HyruleField() {
                   Entrance(RR_LH_FISHING_ISLAND, {[]{return true;}}),
   });
 
-  areaTable[RR_LH_GROTTO] = Region("LH Grotto", "LH Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_LH_GROTTO] = Region("LH Grotto", "LH Grotto", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_LH_DEKU_SCRUB_GROTTO_LEFT,   logic->CanStunDeku()),
                   LOCATION(RC_LH_DEKU_SCRUB_GROTTO_RIGHT,  logic->CanStunDeku()),
@@ -217,7 +217,7 @@ void RegionTable_Init_HyruleField() {
                   Entrance(RR_LAKE_HYLIA, {[]{return true;}}),
   });
 
-  areaTable[RR_LON_LON_RANCH] = Region("Lon Lon Ranch", "Lon Lon Ranch", RA_LON_LON_RANCH, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_LON_LON_RANCH] = Region("Lon Lon Ranch", "Lon Lon Ranch", {RA_LON_LON_RANCH}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FreedEpona,    {[]{return logic->FreedEpona    || ((logic->HasItem(RG_CHILD_WALLET) || ctx->GetOption(RSK_SKIP_EPONA_RACE)) && logic->CanUse(RG_EPONAS_SONG) && logic->IsAdult && logic->AtDay);}}),
                   EventAccess(&logic->LinksCow, {[]{return logic->LinksCow || (logic->HasItem(RG_CHILD_WALLET) && logic->CanUse(RG_EPONAS_SONG) && logic->IsAdult && logic->AtDay);}}),
@@ -237,7 +237,7 @@ void RegionTable_Init_HyruleField() {
                   Entrance(RR_LLR_GROTTO,       {[]{return logic->IsChild;}}),
   });
 
-  areaTable[RR_LLR_TALONS_HOUSE] = Region("LLR Talons House", "LLR Talons House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_LLR_TALONS_HOUSE] = Region("LLR Talons House", "LLR Talons House", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_LLR_TALONS_CHICKENS, logic->HasItem(RG_CHILD_WALLET) && logic->IsChild && logic->AtDay && logic->HasItem(RG_ZELDAS_LETTER)),
                 }, {
@@ -245,7 +245,7 @@ void RegionTable_Init_HyruleField() {
                   Entrance(RR_LON_LON_RANCH, {[]{return true;}}),
   });
 
-  areaTable[RR_LLR_STABLES] = Region("LLR Stables", "LLR Stables", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_LLR_STABLES] = Region("LLR Stables", "LLR Stables", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_LLR_STABLES_LEFT_COW,  logic->CanUse(RG_EPONAS_SONG)),
                   LOCATION(RC_LLR_STABLES_RIGHT_COW, logic->CanUse(RG_EPONAS_SONG)),
@@ -254,7 +254,7 @@ void RegionTable_Init_HyruleField() {
                   Entrance(RR_LON_LON_RANCH, {[]{return true;}}),
   });
 
-  areaTable[RR_LLR_TOWER] = Region("LLR Tower", "LLR Tower", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_LLR_TOWER] = Region("LLR Tower", "LLR Tower", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_LLR_FREESTANDING_POH, logic->IsChild),
                   LOCATION(RC_LLR_TOWER_LEFT_COW,   logic->CanUse(RG_EPONAS_SONG)),
@@ -264,7 +264,7 @@ void RegionTable_Init_HyruleField() {
                   Entrance(RR_LON_LON_RANCH, {[]{return true;}}),
   });
 
-  areaTable[RR_LLR_GROTTO] = Region("LLR Grotto", "LLR Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_LLR_GROTTO] = Region("LLR Grotto", "LLR Grotto", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_LLR_DEKU_SCRUB_GROTTO_LEFT,   logic->CanStunDeku()),
                   LOCATION(RC_LLR_DEKU_SCRUB_GROTTO_RIGHT,  logic->CanStunDeku()),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp
index feb932e5f..790573971 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp
@@ -8,7 +8,7 @@ void RegionTable_Init_IceCavern() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[RR_ICE_CAVERN_ENTRYWAY] = Region("Ice Cavern Entryway", "Ice Cavern", RA_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_ICE_CAVERN_ENTRYWAY] = Region("Ice Cavern Entryway", "Ice Cavern", {RA_ICE_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_ICE_CAVERN_BEGINNING,    {[]{return ctx->GetDungeon(ICE_CAVERN)->IsVanilla();}}),
                   Entrance(RR_ICE_CAVERN_MQ_BEGINNING, {[]{return ctx->GetDungeon(ICE_CAVERN)->IsMQ() && logic->CanUseProjectile();}}),
@@ -19,13 +19,13 @@ void RegionTable_Init_IceCavern() {
   |     VANILLA DUNGEON      |
   ---------------------------*/
   if (ctx->GetDungeon(ICE_CAVERN)->IsVanilla()) {
-  areaTable[RR_ICE_CAVERN_BEGINNING] = Region("Ice Cavern Beginning", "Ice Cavern", RA_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_ICE_CAVERN_BEGINNING] = Region("Ice Cavern Beginning", "Ice Cavern", {RA_ICE_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_ICE_CAVERN_ENTRYWAY, {[]{return true;}}),
                   Entrance(RR_ICE_CAVERN_MAIN,     {[]{return Here(RR_ICE_CAVERN_BEGINNING, []{return (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives() || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_DINS_FIRE);});}}),
   });
 
-  areaTable[RR_ICE_CAVERN_MAIN] = Region("Ice Cavern", "Ice Cavern", RA_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_ICE_CAVERN_MAIN] = Region("Ice Cavern", "Ice Cavern", {RA_ICE_CAVERN}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->BlueFireAccess, {[]{return logic->BlueFireAccess || (logic->IsAdult && logic->HasBottle());}}),
                 }, {
@@ -45,7 +45,7 @@ void RegionTable_Init_IceCavern() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (ctx->GetDungeon(ICE_CAVERN)->IsMQ()) {
-  areaTable[RR_ICE_CAVERN_MQ_BEGINNING] = Region("Ice Cavern MQ Beginning", "Ice Cavern", RA_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_ICE_CAVERN_MQ_BEGINNING] = Region("Ice Cavern MQ Beginning", "Ice Cavern", {RA_ICE_CAVERN}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FairyPot, {[]{return true;}}),
   }, {}, {
@@ -56,7 +56,7 @@ void RegionTable_Init_IceCavern() {
                   Entrance(RR_ICE_CAVERN_MQ_IRON_BOOTS_REGION, {[]{return logic->BlueFire();}}),
   });
 
-  areaTable[RR_ICE_CAVERN_MQ_MAP_ROOM] = Region("Ice Cavern MQ Map Room", "Ice Cavern", RA_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_ICE_CAVERN_MQ_MAP_ROOM] = Region("Ice Cavern MQ Map Room", "Ice Cavern", {RA_ICE_CAVERN}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->BlueFireAccess,  {[]{return logic->BlueFireAccess || (logic->HasBottle() && logic->CanJumpslash());}}),
   }, {
@@ -64,7 +64,7 @@ void RegionTable_Init_IceCavern() {
                   LOCATION(RC_ICE_CAVERN_MQ_MAP_CHEST, logic->BlueFire() && (logic->CanJumpslash() || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives() || logic->CanUseProjectile())),
   }, {});
 
-  areaTable[RR_ICE_CAVERN_MQ_IRON_BOOTS_REGION] = Region("Ice Cavern MQ Iron Boots Region", "Ice Cavern", RA_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_ICE_CAVERN_MQ_IRON_BOOTS_REGION] = Region("Ice Cavern MQ Iron Boots Region", "Ice Cavern", {RA_ICE_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_ICE_CAVERN_MQ_IRON_BOOTS_CHEST, logic->IsAdult && (logic->CanJumpslash() || logic->CanUse(RG_MEGATON_HAMMER))),
                   LOCATION(RC_SHEIK_IN_ICE_CAVERN,            logic->IsAdult && (logic->CanJumpslash() || logic->CanUse(RG_MEGATON_HAMMER))),
@@ -73,7 +73,7 @@ void RegionTable_Init_IceCavern() {
                     //Tricks: (logic->CanUse(RG_SCARECROW) || (logic->CanUse(RG_HOVER_BOOTS) && logic->CanUse(RG_LONGSHOT)) || LogicIceMQScarecrow) && logic->IsAdult
   }, {});
 
-  areaTable[RR_ICE_CAVERN_MQ_COMPASS_ROOM] = Region("Ice Cavern MQ Compass Room", "Ice Cavern", RA_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_ICE_CAVERN_MQ_COMPASS_ROOM] = Region("Ice Cavern MQ Compass Room", "Ice Cavern", {RA_ICE_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_ICE_CAVERN_MQ_COMPASS_CHEST,    true),
                   LOCATION(RC_ICE_CAVERN_MQ_FREESTANDING_POH, logic->HasExplosives()),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp
index 53076bcfe..26930b84d 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp
@@ -8,7 +8,7 @@ void RegionTable_Init_JabuJabusBelly() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[RR_JABU_JABUS_BELLY_ENTRYWAY] = Region("Jabu Jabus Belly Entryway", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_ENTRYWAY] = Region("Jabu Jabus Belly Entryway", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_BEGINNING,    {[]{return ctx->GetDungeon(JABU_JABUS_BELLY)->IsVanilla();}}),
                   Entrance(RR_JABU_JABUS_BELLY_MQ_BEGINNING, {[]{return ctx->GetDungeon(JABU_JABUS_BELLY)->IsMQ();}}),
@@ -19,13 +19,13 @@ void RegionTable_Init_JabuJabusBelly() {
   |     VANILLA DUNGEON      |
   ---------------------------*/
   if (ctx->GetDungeon(JABU_JABUS_BELLY)->IsVanilla()) {
-  areaTable[RR_JABU_JABUS_BELLY_BEGINNING] = Region("Jabu Jabus Belly Beginning", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_BEGINNING] = Region("Jabu Jabus Belly Beginning", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_ENTRYWAY,    {[]{return true;}}),
                   Entrance(RR_JABU_JABUS_BELLY_LIFT_MIDDLE, {[]{return logic->CanUseProjectile();}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_LIFT_MIDDLE] = Region("Jabu Jabus Belly Lift Middle", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_LIFT_MIDDLE] = Region("Jabu Jabus Belly Lift Middle", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_BEGINNING,      {[]{return true;}}),
                   Entrance(RR_JABU_JABUS_BELLY_MAIN_UPPER,     {[]{return true;}}),
@@ -33,7 +33,7 @@ void RegionTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_NEAR_BOSS_ROOM, {[]{return HasAccessTo(RR_JABU_JABUS_BELLY_LIFT_UPPER) || (ctx->GetTrickOption(RT_JABU_BOSS_HOVER) && logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS));}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_MAIN_UPPER] = Region("Jabu Jabus Belly Main Upper", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_MAIN_UPPER] = Region("Jabu Jabus Belly Main Upper", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_LIFT_MIDDLE,     {[]{return true;}}),
                   Entrance(RR_JABU_JABUS_BELLY_MAIN_LOWER,      {[]{return true;}}),
@@ -41,7 +41,7 @@ void RegionTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_BIGOCTO_ROOM,    {[]{return Here(RR_JABU_JABUS_BELLY_GREEN_TENTACLE, []{return logic->CanUse(RG_BOOMERANG);});}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_MAIN_LOWER] = Region("Jabu Jabus Belly Main Lower", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_MAIN_LOWER] = Region("Jabu Jabus Belly Main Lower", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER, logic->HookshotOrBoomerang()),
                   LOCATION(RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER, logic->HookshotOrBoomerang()),
@@ -52,7 +52,7 @@ void RegionTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_LOWER_SIDE_ROOM,  {[]{return true;}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_SHABOMB_CORRIDOR] = Region("Jabu Jabus Belly Shabomb Corridor", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_JABU_JABUS_BELLY_SHABOMB_CORRIDOR] = Region("Jabu Jabus Belly Shabomb Corridor", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FairyPot, {[]{return true;}}),
                 }, {
@@ -64,7 +64,7 @@ void RegionTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_LIFT_LOWER, {[]{return logic->HasItem(RG_BRONZE_SCALE) && logic->CanUseProjectile();}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_LOWER_SIDE_ROOM] = Region("Jabu Jabus Belly Lower Side Room", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_JABU_JABUS_BELLY_LOWER_SIDE_ROOM] = Region("Jabu Jabus Belly Lower Side Room", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FairyPot, {[]{return logic->FairyPot || (logic->CanUse(RG_BOOMERANG) || logic->CanUse(RG_HOVER_BOOTS));}}),
                 }, {}, {
@@ -72,7 +72,7 @@ void RegionTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_MAIN_LOWER, {[]{return true;}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_LIFT_LOWER] = Region("Jabu Jabus Belly Lift Lower", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_LIFT_LOWER] = Region("Jabu Jabus Belly Lift Lower", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_JABU_JABUS_BELLY_DEKU_SCRUB, logic->HasItem(RG_BRONZE_SCALE) && (logic->IsChild || logic->HasItem(RG_SILVER_SCALE) || ctx->GetTrickOption(RT_JABU_ALCOVE_JUMP_DIVE) || logic->CanUse(RG_IRON_BOOTS)) && logic->CanStunDeku()),
                 }, {
@@ -81,7 +81,7 @@ void RegionTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_LIFT_MIDDLE,      {[]{return true;}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_FORKED_CORRIDOR] = Region("Jabu Jabus Belly Forked Corridor", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_FORKED_CORRIDOR] = Region("Jabu Jabus Belly Forked Corridor", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_MAIN_UPPER,     {[]{return true;}}),
                   Entrance(RR_JABU_JABUS_BELLY_BOOMERANG_ROOM, {[]{return true;}}),
@@ -91,7 +91,7 @@ void RegionTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_GREEN_TENTACLE, {[]{return Here(RR_JABU_JABUS_BELLY_BLUE_TENTACLE, []{return logic->CanUse(RG_BOOMERANG);});}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_BOOMERANG_ROOM] = Region("Jabu Jabus Belly Boomerang Room", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_BOOMERANG_ROOM] = Region("Jabu Jabus Belly Boomerang Room", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_JABU_JABUS_BELLY_BOOMERANG_CHEST, true),
                 }, {
@@ -99,7 +99,7 @@ void RegionTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_FORKED_CORRIDOR, {[]{return true;}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_MAP_ROOM] = Region("Jabu Jabus Belly Map Room", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_MAP_ROOM] = Region("Jabu Jabus Belly Map Room", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_JABU_JABUS_BELLY_MAP_CHEST, logic->CanUse(RG_BOOMERANG)),
                 }, {
@@ -107,7 +107,7 @@ void RegionTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_FORKED_CORRIDOR, {[]{return true;}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_COMPASS_ROOM] = Region("Jabu Jabus Belly Compass Room", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_COMPASS_ROOM] = Region("Jabu Jabus Belly Compass Room", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_JABU_JABUS_BELLY_COMPASS_CHEST, logic->CanAttack()),
                 }, {
@@ -115,23 +115,23 @@ void RegionTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_FORKED_CORRIDOR, {[]{return true;}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_BLUE_TENTACLE] = Region("Jabu Jabus Belly Blue Tentacle", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_BLUE_TENTACLE] = Region("Jabu Jabus Belly Blue Tentacle", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_FORKED_CORRIDOR, {[]{return Here(RR_JABU_JABUS_BELLY_BLUE_TENTACLE, []{return logic->CanUse(RG_BOOMERANG);});}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_GREEN_TENTACLE] = Region("Jabu Jabus Belly Green Tentacle", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_GREEN_TENTACLE] = Region("Jabu Jabus Belly Green Tentacle", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_FORKED_CORRIDOR, {[]{return Here(RR_JABU_JABUS_BELLY_GREEN_TENTACLE, []{return logic->CanUse(RG_BOOMERANG);});}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_BIGOCTO_ROOM] = Region("Jabu Jabus Belly Bigocto Room", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_BIGOCTO_ROOM] = Region("Jabu Jabus Belly Bigocto Room", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_MAIN_LOWER,    {[]{return true;}}),
                   Entrance(RR_JABU_JABUS_BELLY_ABOVE_BIGOCTO, {[]{return Here(RR_JABU_JABUS_BELLY_BIGOCTO_ROOM, []{return (logic->CanUse(RG_BOOMERANG) || logic->CanUse(RG_NUTS)) && (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_STICKS));});}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_ABOVE_BIGOCTO] = Region("Jabu Jabus Belly Above Bigocto", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_JABU_JABUS_BELLY_ABOVE_BIGOCTO] = Region("Jabu Jabus Belly Above Bigocto", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FairyPot, {[]{return true;}}),
                   EventAccess(&logic->NutPot,   {[]{return true;}}),
@@ -140,13 +140,13 @@ void RegionTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_LIFT_UPPER, {[]{return logic->CanUse(RG_BOOMERANG);}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_LIFT_UPPER] = Region("Jabu Jabus Belly Lift Upper", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_LIFT_UPPER] = Region("Jabu Jabus Belly Lift Upper", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_JABU_JABUS_BELLY_LIFT_MIDDLE, {[]{return true;}}),
                   Entrance(RR_JABU_JABUS_BELLY_LIFT_LOWER,  {[]{return true;}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_NEAR_BOSS_ROOM] = Region("Jabu Jabus Belly Near Boss Room", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_NEAR_BOSS_ROOM] = Region("Jabu Jabus Belly Near Boss Room", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_JABU_JABUS_BELLY_GS_NEAR_BOSS, logic->CanAttack()),
                 }, {
@@ -160,7 +160,7 @@ void RegionTable_Init_JabuJabusBelly() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (ctx->GetDungeon(JABU_JABUS_BELLY)->IsMQ()) {
-  areaTable[RR_JABU_JABUS_BELLY_MQ_BEGINNING] = Region("Jabu Jabus Belly MQ Beginning", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_JABU_JABUS_BELLY_MQ_BEGINNING] = Region("Jabu Jabus Belly MQ Beginning", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->NutPot, {[]{return true;}}),
   }, {
@@ -173,7 +173,7 @@ void RegionTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_MQ_MAIN,  {[]{return Here(RR_JABU_JABUS_BELLY_MQ_BEGINNING, []{return logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT);});}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_MQ_MAIN] = Region("Jabu Jabus Belly MQ Main", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_MQ_MAIN] = Region("Jabu Jabus Belly MQ Main", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST,      true),
                   LOCATION(RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST,      (logic->IsAdult && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT))) || ChildCanAccess(RR_JABU_JABUS_BELLY_MQ_BOSS_AREA)),
@@ -191,7 +191,7 @@ void RegionTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_MQ_DEPTHS,    {[]{return logic->HasExplosives() && logic->CanUse(RG_FAIRY_SLINGSHOT) && logic->CanUse(RG_BOOMERANG);}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_MQ_DEPTHS] = Region("Jabu Jabus Belly MQ Depths", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_JABU_JABUS_BELLY_MQ_DEPTHS] = Region("Jabu Jabus Belly MQ Depths", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST, true),
                   LOCATION(RC_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM,          logic->HasItem(RG_BRONZE_SCALE) && (logic->CanUse(RG_STICKS) || logic->CanUse(RG_DINS_FIRE))),
@@ -202,7 +202,7 @@ void RegionTable_Init_JabuJabusBelly() {
                   Entrance(RR_JABU_JABUS_BELLY_MQ_BOSS_AREA, {[]{return logic->CanUse(RG_STICKS) || (logic->CanUse(RG_DINS_FIRE) && logic->CanUse(RG_KOKIRI_SWORD));}}),
   });
 
-  areaTable[RR_JABU_JABUS_BELLY_MQ_BOSS_AREA] = Region("Jabu Jabus Belly MQ Boss Region", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_JABU_JABUS_BELLY_MQ_BOSS_AREA] = Region("Jabu Jabus Belly MQ Boss Region", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FairyPot, {[]{return true;}}),
   }, {
@@ -221,7 +221,7 @@ void RegionTable_Init_JabuJabusBelly() {
     |         BOSS ROOM         |
     ---------------------------*/
     areaTable[RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY] =
-        Region("Jabu Jabus Belly Boss Entryway", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {},
+        Region("Jabu Jabus Belly Boss Entryway", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {}, {},
              {
                  // Exits
                  Entrance(RR_JABU_JABUS_BELLY_NEAR_BOSS_ROOM, { [] { return ctx->GetDungeon(JABU_JABUS_BELLY)->IsVanilla(); } }),
@@ -230,7 +230,7 @@ void RegionTable_Init_JabuJabusBelly() {
              });
 
     areaTable[RR_JABU_JABUS_BELLY_BOSS_ROOM] =
-        Region("Jabu Jabus Belly Boss Room", "Jabu Jabus Belly", RA_NONE, NO_DAY_NIGHT_CYCLE,
+        Region("Jabu Jabus Belly Boss Room", "Jabu Jabus Belly", {}, NO_DAY_NIGHT_CYCLE,
              {
                  // Events //todo: add pot kill trick
                  EventAccess(&logic->JabuJabusBellyClear,
@@ -244,6 +244,6 @@ void RegionTable_Init_JabuJabusBelly() {
              {
                  // Exits
                  Entrance(RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY, { [] { return false; } }),
-                 Entrance(RR_ZORAS_FOUNTAIN, { [] { return logic->JabuJabusBellyClear; } }),
+                 Entrance(RR_ZORAS_FOUNTAIN, { [] { return logic->JabuJabusBellyClear; } }, false),
              });
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
index 96388d043..d5be78c6b 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp
@@ -4,7 +4,7 @@
 using namespace Rando;
 
 void RegionTable_Init_Kakariko() {
-  areaTable[RR_KAKARIKO_VILLAGE] = Region("Kakariko Village", "Kakariko Village", RA_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_KAKARIKO_VILLAGE] = Region("Kakariko Village", "Kakariko Village", {RA_KAKARIKO_VILLAGE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->BugRock,                 {[]{return true;}}),
                   EventAccess(&logic->KakarikoVillageGateOpen, {[]{return logic->KakarikoVillageGateOpen || (logic->IsChild && (logic->HasItem(RG_ZELDAS_LETTER) || ctx->GetOption(RSK_KAK_GATE).Is(RO_KAK_GATE_OPEN)));}}),
@@ -38,13 +38,13 @@ void RegionTable_Init_Kakariko() {
                   Entrance(RR_KAK_BEHIND_GATE,             {[]{return logic->IsAdult || (logic->KakarikoVillageGateOpen);}}),
   });
 
-  areaTable[RR_KAK_IMPAS_LEDGE] = Region("Kak Impas Ledge", "Kakariko Village", RA_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_KAK_IMPAS_LEDGE] = Region("Kak Impas Ledge", "Kakariko Village", {RA_KAKARIKO_VILLAGE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_KAK_IMPAS_HOUSE_BACK, {[]{return true;}}),
                   Entrance(RR_KAKARIKO_VILLAGE,     {[]{return true;}}),
   });
 
-  areaTable[RR_KAK_IMPAS_ROOFTOP] = Region("Kak Impas Rooftop", "Kakariko Village", RA_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KAK_IMPAS_ROOFTOP] = Region("Kak Impas Rooftop", "Kakariko Village", {RA_KAKARIKO_VILLAGE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_KAK_GS_ABOVE_IMPAS_HOUSE, logic->IsAdult && logic->AtNight && logic->CanGetNightTimeGS() && (logic->CanJumpslash() || logic->CanUseProjectile())),
                 }, {
@@ -53,7 +53,7 @@ void RegionTable_Init_Kakariko() {
                   Entrance(RR_KAKARIKO_VILLAGE, {[]{return true;}}),
   });
 
-  areaTable[RR_KAK_ROOFTOP] = Region("Kak Rooftop", "Kakariko Village", RA_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KAK_ROOFTOP] = Region("Kak Rooftop", "Kakariko Village", {RA_KAKARIKO_VILLAGE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_KAK_MAN_ON_ROOF, true),
                 }, {
@@ -61,7 +61,7 @@ void RegionTable_Init_Kakariko() {
                   Entrance(RR_KAK_BACKYARD, {[]{return true;}}),
   });
 
-  areaTable[RR_KAK_BACKYARD] = Region("Kak Backyard", "Kakariko Village", RA_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_KAK_BACKYARD] = Region("Kak Backyard", "Kakariko Village", {RA_KAKARIKO_VILLAGE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_KAKARIKO_VILLAGE,          {[]{return true;}}),
                   Entrance(RR_KAK_OPEN_GROTTO,           {[]{return true;}}),
@@ -69,7 +69,7 @@ void RegionTable_Init_Kakariko() {
                   Entrance(RR_KAK_POTION_SHOP_BACK,      {[]{return logic->IsAdult && logic->AtDay;}}),
   });
 
-  areaTable[RR_KAK_CARPENTER_BOSS_HOUSE] = Region("Kak Carpenter Boss House", "Kak Carpenter Boss House", RA_NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_KAK_CARPENTER_BOSS_HOUSE] = Region("Kak Carpenter Boss House", "Kak Carpenter Boss House", {}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->WakeUpAdultTalon, {[]{return logic->IsAdult && logic->CanUse(RG_POCKET_EGG);}}),
                 }, {}, {
@@ -77,7 +77,7 @@ void RegionTable_Init_Kakariko() {
                   Entrance(RR_KAKARIKO_VILLAGE, {[]{return true;}}),
   });
 
-  areaTable[RR_KAK_HOUSE_OF_SKULLTULA] = Region("Kak House of Skulltula", "Kak House of Skulltula", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KAK_HOUSE_OF_SKULLTULA] = Region("Kak House of Skulltula", "Kak House of Skulltula", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_KAK_10_GOLD_SKULLTULA_REWARD, logic->GetGSCount() >= 10),
                   LOCATION(RC_KAK_20_GOLD_SKULLTULA_REWARD, logic->GetGSCount() >= 20),
@@ -90,27 +90,24 @@ void RegionTable_Init_Kakariko() {
                   Entrance(RR_KAKARIKO_VILLAGE, {[]{return true;}}),
   });
 
-  areaTable[RR_KAK_IMPAS_HOUSE] = Region("Kak Impas House", "Kak Impas House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
-                  //Exits
-                  Entrance(RR_KAK_IMPAS_HOUSE_NEAR_COW, {[]{return true;}}),
-                  Entrance(RR_KAKARIKO_VILLAGE,         {[]{return true;}}),
-  });
-
-  areaTable[RR_KAK_IMPAS_HOUSE_BACK] = Region("Kak Impas House Back", "Kak Impas House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KAK_IMPAS_HOUSE] = Region("Kak Impas House", "Kak Impas House", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_KAK_IMPAS_HOUSE_FREESTANDING_POH, true),
+                  LOCATION(RC_KAK_IMPAS_HOUSE_COW, logic->CanUse(RG_EPONAS_SONG))
                 }, {
                   //Exits
-                  Entrance(RR_KAK_IMPAS_LEDGE,          {[]{return true;}}),
-                  Entrance(RR_KAK_IMPAS_HOUSE_NEAR_COW, {[]{return true;}}),
+                  Entrance(RR_KAKARIKO_VILLAGE, {[]{return true;}}),
   });
 
-  areaTable[RR_KAK_IMPAS_HOUSE_NEAR_COW] = Region("Kak Impas House Near Cow", "Kak Impas House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KAK_IMPAS_HOUSE_BACK] = Region("Kak Impas House Back", "Kak Impas House", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LOCATION(RC_KAK_IMPAS_HOUSE_COW, logic->CanUse(RG_EPONAS_SONG)),
-  }, {});
+                  LOCATION(RC_KAK_IMPAS_HOUSE_FREESTANDING_POH, true),
+                  LOCATION(RC_KAK_IMPAS_HOUSE_COW,              logic->CanUse(RG_EPONAS_SONG))
+                }, {
+                  //Exits
+                  Entrance(RR_KAK_IMPAS_LEDGE, {[]{return true;}}),
+  });
 
-  areaTable[RR_KAK_WINDMILL] = Region("Kak Windmill", "Windmill and Dampes Grave", RA_NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_KAK_WINDMILL] = Region("Kak Windmill", "Windmill and Dampes Grave", {}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->DrainWell, {[]{return logic->DrainWell || (logic->IsChild && logic->CanUse(RG_SONG_OF_STORMS));}}),
                 }, {
@@ -123,7 +120,7 @@ void RegionTable_Init_Kakariko() {
                   Entrance(RR_KAKARIKO_VILLAGE, {[]{return true;}}),
   });
 
-  areaTable[RR_KAK_BAZAAR] = Region("Kak Bazaar", "Kak Bazaar", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KAK_BAZAAR] = Region("Kak Bazaar", "Kak Bazaar", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_KAK_BAZAAR_ITEM_1, true),
                   LOCATION(RC_KAK_BAZAAR_ITEM_2, true),
@@ -138,7 +135,7 @@ void RegionTable_Init_Kakariko() {
                   Entrance(RR_KAKARIKO_VILLAGE, {[]{return true;}}),
   });
 
-  areaTable[RR_KAK_SHOOTING_GALLERY] = Region("Kak Shooting Gallery", "Kak Shooting Gallery", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KAK_SHOOTING_GALLERY] = Region("Kak Shooting Gallery", "Kak Shooting Gallery", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_KAK_SHOOTING_GALLERY_REWARD, logic->HasItem(RG_CHILD_WALLET) && logic->IsAdult && logic->CanUse(RG_FAIRY_BOW)),
                 }, {
@@ -146,7 +143,7 @@ void RegionTable_Init_Kakariko() {
                   Entrance(RR_KAKARIKO_VILLAGE, {[]{return true;}}),
   });
 
-  areaTable[RR_KAK_POTION_SHOP_FRONT] = Region("Kak Potion Shop Front", "Kak Potion Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KAK_POTION_SHOP_FRONT] = Region("Kak Potion Shop Front", "Kak Potion Shop", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_KAK_POTION_SHOP_ITEM_1, logic->IsAdult),
                   LOCATION(RC_KAK_POTION_SHOP_ITEM_2, logic->IsAdult),
@@ -162,15 +159,15 @@ void RegionTable_Init_Kakariko() {
                   Entrance(RR_KAK_POTION_SHOP_BACK, {[]{return logic->IsAdult;}}),
   });
 
-  areaTable[RR_KAK_POTION_SHOP_BACK] = Region("Kak Potion Shop Back", "Kak Potion Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_KAK_POTION_SHOP_BACK] = Region("Kak Potion Shop Back", "Kak Potion Shop", {}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_KAK_BACKYARD,          {[]{return logic->IsAdult;}}),
                   Entrance(RR_KAK_POTION_SHOP_FRONT, {[]{return true;}}),
   });
 
   areaTable[RR_KAK_ODD_POTION_BUILDING] =
-      Region("Kak Granny's Potion Shop", "Kak Granny's Potion Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {},
-            // RANDOTODO blue pot access
+      Region("Kak Granny's Potion Shop", "Kak Granny's Potion Shop", {}, NO_DAY_NIGHT_CYCLE, {},
+           // RANDOTODO blue pot access
            {
                LOCATION(RC_KAK_TRADE_ODD_MUSHROOM, logic->IsAdult && logic->CanUse(RG_ODD_MUSHROOM)),
                LOCATION(RC_KAK_GRANNYS_SHOP, logic->IsAdult && (logic->CanUse(RG_ODD_MUSHROOM) || logic->TradeQuestStep(RG_ODD_MUSHROOM))),
@@ -180,7 +177,7 @@ void RegionTable_Init_Kakariko() {
               Entrance(RR_KAK_BACKYARD, { [] { return true; } }),
            });
 
-  areaTable[RR_KAK_REDEAD_GROTTO] = Region("Kak Redead Grotto", "Kak Redead Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KAK_REDEAD_GROTTO] = Region("Kak Redead Grotto", "Kak Redead Grotto", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_KAK_REDEAD_GROTTO_CHEST, logic->CanUse(RG_STICKS) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_DINS_FIRE) || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)),
                 }, {
@@ -188,7 +185,7 @@ void RegionTable_Init_Kakariko() {
                   Entrance(RR_KAKARIKO_VILLAGE, {[]{return true;}}),
   });
 
-  areaTable[RR_KAK_OPEN_GROTTO] = Region("Kak Open Grotto", "Kak Open Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+  areaTable[RR_KAK_OPEN_GROTTO] = Region("Kak Open Grotto", "Kak Open Grotto", {}, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LOCATION(RC_KAK_OPEN_GROTTO_CHEST,         true),
                   LOCATION(RC_KAK_OPEN_GROTTO_FISH,          logic->HasBottle()),
@@ -200,7 +197,7 @@ void RegionTable_Init_Kakariko() {
                   Entrance(RR_KAK_BACKYARD, {[]{return true;}}),
   });
 
-  areaTable[RR_THE_GRAVEYARD] = Region("The Graveyard", "The Graveyard", RA_THE_GRAVEYARD, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_THE_GRAVEYARD] = Region("The Graveyard", "The Graveyard", {RA_THE_GRAVEYARD}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->ButterflyFairy, {[]{return logic->ButterflyFairy || (logic->CanUse(RG_STICKS) && logic->AtDay);}}),
                   EventAccess(&logic->BeanPlantFairy, {[]{return logic->BeanPlantFairy || (CanPlantBean(RR_THE_GRAVEYARD) && logic->CanUse(RG_SONG_OF_STORMS));}}),
@@ -222,7 +219,7 @@ void RegionTable_Init_Kakariko() {
                   Entrance(RR_GRAVEYARD_WARP_PAD_REGION,    {[]{return false;}}),
   });
 
-  areaTable[RR_GRAVEYARD_SHIELD_GRAVE] = Region("Graveyard Shield Grave", "Graveyard Shield Grave", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GRAVEYARD_SHIELD_GRAVE] = Region("Graveyard Shield Grave", "Graveyard Shield Grave", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GRAVEYARD_SHIELD_GRAVE_CHEST, true),
                   //Free Fairies
@@ -231,7 +228,7 @@ void RegionTable_Init_Kakariko() {
                   Entrance(RR_THE_GRAVEYARD, {[]{return true;}}),
   });
 
-  areaTable[RR_GRAVEYARD_HEART_PIECE_GRAVE] = Region("Graveyard Heart Piece Grave", "Graveyard Heart Piece Grave", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GRAVEYARD_HEART_PIECE_GRAVE] = Region("Graveyard Heart Piece Grave", "Graveyard Heart Piece Grave", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GRAVEYARD_HEART_PIECE_GRAVE_CHEST, logic->CanUse(RG_SUNS_SONG)),
                 }, {
@@ -239,7 +236,7 @@ void RegionTable_Init_Kakariko() {
                   Entrance(RR_THE_GRAVEYARD, {[]{return true;}}),
   });
 
-  areaTable[RR_GRAVEYARD_COMPOSERS_GRAVE] = Region("Graveyard Composers Grave", "Graveyard Composers Grave", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GRAVEYARD_COMPOSERS_GRAVE] = Region("Graveyard Composers Grave", "Graveyard Composers Grave", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST, logic->HasFireSource()),
                   LOCATION(RC_SONG_FROM_ROYAL_FAMILYS_TOMB,       logic->CanUseProjectile() || logic->CanJumpslash() || logic->CanUse(RG_MEGATON_HAMMER)),
@@ -248,7 +245,7 @@ void RegionTable_Init_Kakariko() {
                   Entrance(RR_THE_GRAVEYARD, {[]{return true;}}),
   });
 
-  areaTable[RR_GRAVEYARD_DAMPES_GRAVE] = Region("Graveyard Dampes Grave", "Windmill and Dampes Grave", RA_NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GRAVEYARD_DAMPES_GRAVE] = Region("Graveyard Dampes Grave", "Windmill and Dampes Grave", {}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->NutPot,               {[]{return true;}}),
                   EventAccess(&logic->DampesWindmillAccess, {[]{return logic->DampesWindmillAccess || (logic->IsAdult && logic->CanUse(RG_SONG_OF_TIME));}}),
@@ -259,10 +256,10 @@ void RegionTable_Init_Kakariko() {
                 }, {
                   //Exits
                   Entrance(RR_THE_GRAVEYARD, {[]{return true;}}),
-                  Entrance(RR_KAK_WINDMILL,  {[]{return logic->IsAdult && logic->CanUse(RG_SONG_OF_TIME);}}),
+                  Entrance(RR_KAK_WINDMILL,  {[]{return logic->IsAdult && logic->CanUse(RG_SONG_OF_TIME);}}, false),
   });
 
-  areaTable[RR_GRAVEYARD_DAMPES_HOUSE] = Region("Graveyard Dampes House", "Graveyard Dampes House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_GRAVEYARD_DAMPES_HOUSE] = Region("Graveyard Dampes House", "Graveyard Dampes House", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DAMPE_HINT, logic->IsAdult),
                 }, {
@@ -270,7 +267,7 @@ void RegionTable_Init_Kakariko() {
                   Entrance(RR_THE_GRAVEYARD, {[]{return true;}}),
   });
 
-  areaTable[RR_GRAVEYARD_WARP_PAD_REGION] = Region("Graveyard Warp Pad Region", "Graveyard", RA_THE_GRAVEYARD, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_GRAVEYARD_WARP_PAD_REGION] = Region("Graveyard Warp Pad Region", "Graveyard", {RA_THE_GRAVEYARD}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->GossipStoneFairy, {[]{return logic->CallGossipFairyExceptSuns();}}),
                 }, {
@@ -282,7 +279,7 @@ void RegionTable_Init_Kakariko() {
                   Entrance(RR_SHADOW_TEMPLE_ENTRYWAY,    {[]{return logic->CanUse(RG_DINS_FIRE) || (ctx->GetTrickOption(RT_GY_SHADOW_FIRE_ARROWS) && logic->IsAdult && logic->CanUse(RG_FIRE_ARROWS));}}),
   });
 
-  areaTable[RR_KAK_BEHIND_GATE] = Region("Kak Behind Gate", "Kakariko Village", RA_KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_KAK_BEHIND_GATE] = Region("Kak Behind Gate", "Kakariko Village", {RA_KAKARIKO_VILLAGE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_KAKARIKO_VILLAGE,     {[]{return logic->IsAdult || ctx->GetTrickOption(RT_VISIBLE_COLLISION) || logic->KakarikoVillageGateOpen || ctx->GetOption(RSK_KAK_GATE).Is(RO_KAK_GATE_OPEN);}}),
                   Entrance(RR_DEATH_MOUNTAIN_TRAIL, {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
index 80b424c54..34b16a506 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
@@ -4,7 +4,7 @@
 using namespace Rando;
 
 void RegionTable_Init_LostWoods() {
-  areaTable[RR_KOKIRI_FOREST] = Region("Kokiri Forest", "Kokiri Forest", RA_KOKIRI_FOREST, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_KOKIRI_FOREST] = Region("Kokiri Forest", "Kokiri Forest", {RA_KOKIRI_FOREST}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->BeanPlantFairy,           {[]{return logic->BeanPlantFairy   || (CanPlantBean(RR_KOKIRI_FOREST) && logic->CanUse(RG_SONG_OF_STORMS));}}),
                   EventAccess(&logic->GossipStoneFairy,         {[]{return logic->CallGossipFairyExceptSuns();}}),
@@ -30,7 +30,7 @@ void RegionTable_Init_LostWoods() {
                   Entrance(RR_KF_STORMS_GROTTO,      {[]{return logic->CanOpenStormsGrotto();}}),
   });
 
-  areaTable[RR_KF_OUTSIDE_DEKU_TREE] = Region("KF Outside Deku Tree", "Kokiri Forest", RA_KOKIRI_FOREST, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_KF_OUTSIDE_DEKU_TREE] = Region("KF Outside Deku Tree", "Kokiri Forest", {RA_KOKIRI_FOREST}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->DekuBabaSticks,           {[]{return logic->DekuBabaSticks || ((logic->IsAdult && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_KOKIRI_SWORD)) && !ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES)) || (logic->IsChild && (logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BOOMERANG))));}}),
                   EventAccess(&logic->DekuBabaNuts,             {[]{return logic->DekuBabaNuts   || ((logic->IsAdult && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_KOKIRI_SWORD)) && !ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES)) || (logic->IsChild && (logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->HasExplosives() || logic->CanUse(RG_DINS_FIRE))));}}),
@@ -45,7 +45,7 @@ void RegionTable_Init_LostWoods() {
                   Entrance(RR_KOKIRI_FOREST,      {[]{return (logic->IsAdult && (logic->CanPassEnemy(RE_BIG_SKULLTULA) || logic->ForestTempleClear)) || ctx->GetOption(RSK_FOREST).Is(RO_FOREST_OPEN) || logic->ShowedMidoSwordAndShield;}}),
   });
 
-  areaTable[RR_KF_LINKS_HOUSE] = Region("KF Link's House", "KF Link's House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KF_LINKS_HOUSE] = Region("KF Link's House", "KF Link's House", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_KF_LINKS_HOUSE_COW, logic->IsAdult && logic->CanUse(RG_EPONAS_SONG) && logic->LinksCow),
                 }, {
@@ -53,7 +53,7 @@ void RegionTable_Init_LostWoods() {
                   Entrance(RR_KOKIRI_FOREST, {[]{return true;}})
   });
 
-  areaTable[RR_KF_MIDOS_HOUSE] = Region("KF Mido's House", "KF Mido's House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KF_MIDOS_HOUSE] = Region("KF Mido's House", "KF Mido's House", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_KF_MIDOS_TOP_LEFT_CHEST,     true),
                   LOCATION(RC_KF_MIDOS_TOP_RIGHT_CHEST,    true),
@@ -64,22 +64,22 @@ void RegionTable_Init_LostWoods() {
                   Entrance(RR_KOKIRI_FOREST, {[]{return true;}}),
   });
 
-  areaTable[RR_KF_SARIAS_HOUSE] = Region("KF Saria's House", "KF Saria's House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_KF_SARIAS_HOUSE] = Region("KF Saria's House", "KF Saria's House", {}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_KOKIRI_FOREST, {[]{return true;}}),
   });
 
-  areaTable[RR_KF_HOUSE_OF_TWINS] = Region("KF House of Twins", "KF House of Twins", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_KF_HOUSE_OF_TWINS] = Region("KF House of Twins", "KF House of Twins", {}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_KOKIRI_FOREST, {[]{return true;}}),
   });
 
-  areaTable[RR_KF_KNOW_IT_ALL_HOUSE] = Region("KF Know It All House", "KF Know It All House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_KF_KNOW_IT_ALL_HOUSE] = Region("KF Know It All House", "KF Know It All House", {}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_KOKIRI_FOREST, {[]{return true;}}),
   });
 
-  areaTable[RR_KF_KOKIRI_SHOP] = Region("KF Kokiri Shop", "KF Kokiri Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_KF_KOKIRI_SHOP] = Region("KF Kokiri Shop", "KF Kokiri Shop", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_KF_SHOP_ITEM_1, true),
                   LOCATION(RC_KF_SHOP_ITEM_2, true),
@@ -94,7 +94,7 @@ void RegionTable_Init_LostWoods() {
                   Entrance(RR_KOKIRI_FOREST, {[]{return true;}}),
   });
 
-  areaTable[RR_KF_STORMS_GROTTO] = Region("KF Storms Grotto", "KF Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+  areaTable[RR_KF_STORMS_GROTTO] = Region("KF Storms Grotto", "KF Storms Grotto", {}, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LOCATION(RC_KF_STORMS_GROTTO_CHEST,         true),
                   LOCATION(RC_KF_STORMS_GROTTO_FISH,          logic->HasBottle()),
@@ -106,12 +106,12 @@ void RegionTable_Init_LostWoods() {
                   Entrance(RR_KOKIRI_FOREST, {[]{return true;}})
   });
 
-  areaTable[RR_LW_FOREST_EXIT] = Region("LW Forest Exit", "Lost Woods", RA_THE_LOST_WOODS, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_LW_FOREST_EXIT] = Region("LW Forest Exit", "Lost Woods", {RA_THE_LOST_WOODS}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_KOKIRI_FOREST, {[]{return true;}})
   });
 
-  areaTable[RR_THE_LOST_WOODS] = Region("Lost Woods", "Lost Woods", RA_THE_LOST_WOODS, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_THE_LOST_WOODS] = Region("Lost Woods", "Lost Woods", {RA_THE_LOST_WOODS}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->GossipStoneFairy,  {[]{return logic->CallGossipFairyExceptSuns();}}),
                   EventAccess(&logic->BeanPlantFairy,    {[]{return logic->BeanPlantFairy    || logic->CanUse(RG_SONG_OF_STORMS);}}),
@@ -145,7 +145,7 @@ void RegionTable_Init_LostWoods() {
                   Entrance(RR_LW_NEAR_SHORTCUTS_GROTTO, {[]{return Here(RR_THE_LOST_WOODS, []{return logic->BlastOrSmash();});}}),
   });
 
-  areaTable[RR_LW_BEYOND_MIDO] = Region("LW Beyond Mido", "Lost Woods", RA_THE_LOST_WOODS, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_LW_BEYOND_MIDO] = Region("LW Beyond Mido", "Lost Woods", {RA_THE_LOST_WOODS}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->ButterflyFairy, {[]{return logic->ButterflyFairy || logic->CanUse(RG_STICKS);}}),
                 }, {
@@ -163,7 +163,7 @@ void RegionTable_Init_LostWoods() {
                   Entrance(RR_LW_SCRUBS_GROTTO, {[]{return Here(RR_LW_BEYOND_MIDO, []{return logic->BlastOrSmash();});}}),
   });
 
-  areaTable[RR_LW_NEAR_SHORTCUTS_GROTTO] = Region("LW Near Shortcuts Grotto", "LW Near Shortcuts Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+  areaTable[RR_LW_NEAR_SHORTCUTS_GROTTO] = Region("LW Near Shortcuts Grotto", "LW Near Shortcuts Grotto", {}, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LOCATION(RC_LW_NEAR_SHORTCUTS_GROTTO_CHEST,         true),
                   LOCATION(RC_LW_NEAR_SHORTCUTS_GROTTO_FISH,          logic->HasBottle()),
@@ -175,7 +175,7 @@ void RegionTable_Init_LostWoods() {
                   Entrance(RR_THE_LOST_WOODS, {[]{return true;}}),
   });
 
-  areaTable[RR_DEKU_THEATER] = Region("Deku Theater", "Deku Theater", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_DEKU_THEATER] = Region("Deku Theater", "Deku Theater", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_DEKU_THEATER_SKULL_MASK,    logic->IsChild && logic->SkullMask),
                   LOCATION(RC_DEKU_THEATER_MASK_OF_TRUTH, logic->IsChild && logic->MaskOfTruth),
@@ -184,7 +184,7 @@ void RegionTable_Init_LostWoods() {
                   Entrance(RR_LW_BEYOND_MIDO, {[]{return true;}}),
   });
 
-  areaTable[RR_LW_SCRUBS_GROTTO] = Region("LW Scrubs Grotto", "LW Scrubs Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_LW_SCRUBS_GROTTO] = Region("LW Scrubs Grotto", "LW Scrubs Grotto", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_LW_DEKU_SCRUB_GROTTO_REAR,    logic->CanStunDeku()),
                   LOCATION(RC_LW_DEKU_SCRUB_GROTTO_FRONT,   logic->CanStunDeku()),
@@ -194,14 +194,14 @@ void RegionTable_Init_LostWoods() {
                   Entrance(RR_LW_BEYOND_MIDO, {[]{return true;}}),
   });
 
-  areaTable[RR_SFM_ENTRYWAY] = Region("SFM Entryway", "Sacred Forest Meadow", RA_SACRED_FOREST_MEADOW, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_SFM_ENTRYWAY] = Region("SFM Entryway", "Sacred Forest Meadow", {RA_SACRED_FOREST_MEADOW}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_LW_BEYOND_MIDO,       {[]{return true;}}),
                   Entrance(RR_SACRED_FOREST_MEADOW, {[]{return logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_DINS_FIRE) || logic->CanUse(RG_MEGATON_HAMMER);}}),
                   Entrance(RR_SFM_WOLFOS_GROTTO,    {[]{return logic->CanOpenBombGrotto();}}),
   });
 
-  areaTable[RR_SACRED_FOREST_MEADOW] = Region("Sacred Forest Meadow", "Sacred Forest Meadow", RA_SACRED_FOREST_MEADOW, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_SACRED_FOREST_MEADOW] = Region("Sacred Forest Meadow", "Sacred Forest Meadow", {RA_SACRED_FOREST_MEADOW}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->GossipStoneFairy, {[]{return logic->CallGossipFairyExceptSuns();}}),
                 }, {
@@ -220,7 +220,7 @@ void RegionTable_Init_LostWoods() {
                   Entrance(RR_SFM_STORMS_GROTTO,      {[]{return logic->CanOpenStormsGrotto();}}),
   });
 
-  areaTable[RR_SFM_FAIRY_GROTTO] = Region("SFM Fairy Grotto", "SFM Fairy Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_SFM_FAIRY_GROTTO] = Region("SFM Fairy Grotto", "SFM Fairy Grotto", {}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FreeFairies, {[]{return true;}}),
                 }, {}, {
@@ -228,7 +228,7 @@ void RegionTable_Init_LostWoods() {
                   Entrance(RR_SACRED_FOREST_MEADOW, {[]{return true;}}),
   });
 
-  areaTable[RR_SFM_WOLFOS_GROTTO] = Region("SFM Wolfos Grotto", "SFM Wolfos Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SFM_WOLFOS_GROTTO] = Region("SFM Wolfos Grotto", "SFM Wolfos Grotto", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SFM_WOLFOS_GROTTO_CHEST, logic->IsAdult || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_STICKS) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_DINS_FIRE) || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)), //RANDOTODO is this meant to auto-pass as adult?
                 }, {
@@ -236,7 +236,7 @@ void RegionTable_Init_LostWoods() {
                   Entrance(RR_SFM_ENTRYWAY, {[]{return true;}}),
   });
 
-  areaTable[RR_SFM_STORMS_GROTTO] = Region("SFM Storms Grotto", "SFM Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SFM_STORMS_GROTTO] = Region("SFM Storms Grotto", "SFM Storms Grotto", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SFM_DEKU_SCRUB_GROTTO_REAR,  logic->CanStunDeku()),
                   LOCATION(RC_SFM_DEKU_SCRUB_GROTTO_FRONT, logic->CanStunDeku()),
@@ -246,7 +246,7 @@ void RegionTable_Init_LostWoods() {
                   Entrance(RR_SACRED_FOREST_MEADOW, {[]{return true;}}),
   });
 
-  areaTable[RR_LW_BRIDGE_FROM_FOREST] = Region("LW Bridge From Forest", "Lost Woods", RA_THE_LOST_WOODS, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_LW_BRIDGE_FROM_FOREST] = Region("LW Bridge From Forest", "Lost Woods", {RA_THE_LOST_WOODS}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_LW_GIFT_FROM_SARIA, true),
                 }, {
@@ -254,7 +254,7 @@ void RegionTable_Init_LostWoods() {
                   Entrance(RR_LW_BRIDGE, {[]{return true;}}),
   });
 
-  areaTable[RR_LW_BRIDGE] = Region("LW Bridge", "Lost Woods", RA_THE_LOST_WOODS, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_LW_BRIDGE] = Region("LW Bridge", "Lost Woods", {RA_THE_LOST_WOODS}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_KOKIRI_FOREST,  {[]{return true;}}),
                   Entrance(RR_HYRULE_FIELD,   {[]{return true;}}),
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp
index 4f2435aec..fe61c0d80 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp
@@ -8,7 +8,7 @@ void RegionTable_Init_ShadowTemple() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[RR_SHADOW_TEMPLE_ENTRYWAY] = Region("Shadow Temple Entryway", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_SHADOW_TEMPLE_ENTRYWAY] = Region("Shadow Temple Entryway", "Shadow Temple", {RA_SHADOW_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_SHADOW_TEMPLE_BEGINNING,    {[]{return ctx->GetDungeon(SHADOW_TEMPLE)->IsVanilla() && (ctx->GetTrickOption(RT_LENS_SHADOW) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT));}}),
                   Entrance(RR_SHADOW_TEMPLE_MQ_BEGINNING, {[]{return ctx->GetDungeon(SHADOW_TEMPLE)->IsMQ()    && (ctx->GetTrickOption(RT_LENS_SHADOW_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT));}}),
@@ -19,7 +19,7 @@ void RegionTable_Init_ShadowTemple() {
   |     VANILLA DUNGEON      |
   ---------------------------*/
   if (ctx->GetDungeon(SHADOW_TEMPLE)->IsVanilla()) {
-  areaTable[RR_SHADOW_TEMPLE_BEGINNING] = Region("Shadow Temple Beginning", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_SHADOW_TEMPLE_BEGINNING] = Region("Shadow Temple Beginning", "Shadow Temple", {RA_SHADOW_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->NutPot, {[]{return true;}}),
                 }, {
@@ -32,7 +32,7 @@ void RegionTable_Init_ShadowTemple() {
                   Entrance(RR_SHADOW_TEMPLE_FIRST_BEAMOS, {[]{return logic->CanUse(RG_HOVER_BOOTS);}}),
   });
 
-  areaTable[RR_SHADOW_TEMPLE_FIRST_BEAMOS] = Region("Shadow Temple First Beamos", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_SHADOW_TEMPLE_FIRST_BEAMOS] = Region("Shadow Temple First Beamos", "Shadow Temple", {RA_SHADOW_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FairyPot, {[]{return true;}}), //This fairy pot is only on 3DS
                 }, {
@@ -46,7 +46,7 @@ void RegionTable_Init_ShadowTemple() {
                   Entrance(RR_SHADOW_TEMPLE_BEYOND_BOAT, {[]{return false;}}),
   });
 
-  areaTable[RR_SHADOW_TEMPLE_HUGE_PIT] = Region("Shadow Temple Huge Pit", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SHADOW_TEMPLE_HUGE_PIT] = Region("Shadow Temple Huge Pit", "Shadow Temple", {RA_SHADOW_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST,   logic->CanJumpslash()),
                   LOCATION(RC_SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST, logic->CanJumpslash()),
@@ -63,7 +63,7 @@ void RegionTable_Init_ShadowTemple() {
                   Entrance(RR_SHADOW_TEMPLE_WIND_TUNNEL, {[]{return ((ctx->GetTrickOption(RT_LENS_SHADOW_PLATFORM) && ctx->GetTrickOption(RT_LENS_SHADOW)) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->CanUse(RG_HOOKSHOT) && logic->SmallKeys(RR_SHADOW_TEMPLE, 3, 4);}}),
   });
 
-  areaTable[RR_SHADOW_TEMPLE_WIND_TUNNEL] = Region("Shadow Temple Wind Tunnel", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SHADOW_TEMPLE_WIND_TUNNEL] = Region("Shadow Temple Wind Tunnel", "Shadow Temple", {RA_SHADOW_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SHADOW_TEMPLE_WIND_HINT_CHEST,         true),
                   LOCATION(RC_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST,  logic->CanJumpslash()),
@@ -74,7 +74,7 @@ void RegionTable_Init_ShadowTemple() {
                   Entrance(RR_SHADOW_TEMPLE_BEYOND_BOAT, {[]{return logic->CanJumpslash() && logic->CanUse(RG_ZELDAS_LULLABY) && logic->SmallKeys(RR_SHADOW_TEMPLE, 4, 5);}}),
   });
 
-  areaTable[RR_SHADOW_TEMPLE_BEYOND_BOAT] = Region("Shadow Temple Beyond Boat", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SHADOW_TEMPLE_BEYOND_BOAT] = Region("Shadow Temple Beyond Boat", "Shadow Temple", {RA_SHADOW_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST,      logic->CanUse(RG_DINS_FIRE)),
                   LOCATION(RC_SHADOW_TEMPLE_BOSS_KEY_CHEST,              logic->CanUse(RG_DINS_FIRE)),
@@ -92,7 +92,7 @@ void RegionTable_Init_ShadowTemple() {
   ---------------------------*/
   if (ctx->GetDungeon(SHADOW_TEMPLE)->IsMQ()) {
     //RANDOTODO doublecheck CanAttack when rewriting, as I assumed it only checked adult due to the entrance
-  areaTable[RR_SHADOW_TEMPLE_MQ_BEGINNING] = Region("Shadow Temple MQ Beginning", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_SHADOW_TEMPLE_MQ_BEGINNING] = Region("Shadow Temple MQ Beginning", "Shadow Temple", {RA_SHADOW_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_SHADOW_TEMPLE_ENTRYWAY,          {[]{return true;}}),
                   Entrance(RR_SHADOW_TEMPLE_MQ_FIRST_BEAMOS,   {[]{return logic->IsAdult && (logic->CanUse(RG_FIRE_ARROWS) || logic->CanUse(RG_HOVER_BOOTS) || (ctx->GetTrickOption(RT_SHADOW_MQ_GAP) && logic->CanUse(RG_LONGSHOT)));}}),
@@ -100,13 +100,13 @@ void RegionTable_Init_ShadowTemple() {
                   Entrance(RR_SHADOW_TEMPLE_MQ_DEAD_HAND_AREA, {[]{return logic->HasExplosives() && logic->SmallKeys(RR_SHADOW_TEMPLE, 6);}}),
   });
 
-  areaTable[RR_SHADOW_TEMPLE_MQ_DEAD_HAND_AREA] = Region("Shadow Temple MQ Dead Hand Region", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SHADOW_TEMPLE_MQ_DEAD_HAND_AREA] = Region("Shadow Temple MQ Dead Hand Region", "Shadow Temple", {RA_SHADOW_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SHADOW_TEMPLE_MQ_COMPASS_CHEST,     logic->CanJumpslash()),
                   LOCATION(RC_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST, logic->CanJumpslash() && logic->CanUse(RG_SONG_OF_TIME) && logic->IsAdult && logic->CanUse(RG_FAIRY_BOW)),
   }, {});
 
-  areaTable[RR_SHADOW_TEMPLE_MQ_FIRST_BEAMOS] = Region("Shadow Temple MQ First Beamos", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SHADOW_TEMPLE_MQ_FIRST_BEAMOS] = Region("Shadow Temple MQ First Beamos", "Shadow Temple", {RA_SHADOW_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SHADOW_TEMPLE_MQ_MAP_CHEST,                 logic->CanAttack() || logic->CanUse(RG_NUTS)),
                   LOCATION(RC_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST,        logic->CanJumpslash()),
@@ -116,7 +116,7 @@ void RegionTable_Init_ShadowTemple() {
                   Entrance(RR_SHADOW_TEMPLE_MQ_UPPER_HUGE_PIT, {[]{return logic->HasExplosives() && logic->SmallKeys(RR_SHADOW_TEMPLE, 2);}}),
   });
 
-  areaTable[RR_SHADOW_TEMPLE_MQ_UPPER_HUGE_PIT] = Region("Shadow Temple MQ Upper Huge Pit", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SHADOW_TEMPLE_MQ_UPPER_HUGE_PIT] = Region("Shadow Temple MQ Upper Huge Pit", "Shadow Temple", {RA_SHADOW_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST,   logic->CanUse(RG_SONG_OF_TIME) || (ctx->GetTrickOption(RT_SHADOW_MQ_INVISIBLE_BLADES) && ctx->GetOption(RSK_DAMAGE_MULTIPLIER).IsNot(RO_DAMAGE_MULTIPLIER_OHKO))),
                     //Trick: logic->CanUse(RG_SONG_OF_TIME) || (LogicShadowMQInvisibleBlades && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO))
@@ -128,7 +128,7 @@ void RegionTable_Init_ShadowTemple() {
                     //Trick: logic->HasFireSource() || LogicShadowMQHugePit
   });
 
-  areaTable[RR_SHADOW_TEMPLE_MQ_LOWER_HUGE_PIT] = Region("Shadow Temple MQ Lower Huge Pit", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SHADOW_TEMPLE_MQ_LOWER_HUGE_PIT] = Region("Shadow Temple MQ Lower Huge Pit", "Shadow Temple", {RA_SHADOW_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST,  logic->IsAdult && logic->CanUse(RG_LONGSHOT)),
                   LOCATION(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST,  true),
@@ -143,7 +143,7 @@ void RegionTable_Init_ShadowTemple() {
                   Entrance(RR_SHADOW_TEMPLE_MQ_WIND_TUNNEL, {[]{return logic->CanUse(RG_HOVER_BOOTS) && ((ctx->GetTrickOption(RT_LENS_SHADOW_MQ) && ctx->GetTrickOption(RT_LENS_SHADOW_MQ_PLATFORM)) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->CanUse(RG_HOOKSHOT) && logic->SmallKeys(RR_SHADOW_TEMPLE, 4);}}),
   });
 
-  areaTable[RR_SHADOW_TEMPLE_MQ_WIND_TUNNEL] = Region("Shadow Temple MQ Wind Tunnel", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_SHADOW_TEMPLE_MQ_WIND_TUNNEL] = Region("Shadow Temple MQ Wind Tunnel", "Shadow Temple", {RA_SHADOW_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->NutPot, {[]{return true;}}),
   }, {
@@ -158,7 +158,7 @@ void RegionTable_Init_ShadowTemple() {
                   Entrance(RR_SHADOW_TEMPLE_MQ_BEYOND_BOAT, {[]{return logic->CanUse(RG_ZELDAS_LULLABY) && logic->SmallKeys(RR_SHADOW_TEMPLE, 5);}}),
   });
 
-  areaTable[RR_SHADOW_TEMPLE_MQ_BEYOND_BOAT] = Region("Shadow Temple MQ Beyond Boat", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SHADOW_TEMPLE_MQ_BEYOND_BOAT] = Region("Shadow Temple MQ Beyond Boat", "Shadow Temple", {RA_SHADOW_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SHADOW_TEMPLE_MQ_GS_AFTER_SHIP,  true),
                   LOCATION(RC_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS,   logic->CanUse(RG_FAIRY_BOW) || (ctx->GetTrickOption(RT_SHADOW_STATUE) && logic->CanUse(RG_BOMBCHU_5))),
@@ -168,7 +168,7 @@ void RegionTable_Init_ShadowTemple() {
                   Entrance(RR_SHADOW_TEMPLE_BOSS_ENTRYWAY,     {[]{return (logic->CanUse(RG_FAIRY_BOW) || (ctx->GetTrickOption(RT_SHADOW_STATUE) && logic->CanUse(RG_BOMBCHU_5))) && logic->CanUse(RG_HOVER_BOOTS) && logic->HasItem(RG_SHADOW_TEMPLE_BOSS_KEY);}}),
   });
 
-  areaTable[RR_SHADOW_TEMPLE_MQ_INVISIBLE_MAZE] = Region("Shadow Temple MQ Invisible Maze", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SHADOW_TEMPLE_MQ_INVISIBLE_MAZE] = Region("Shadow Temple MQ Invisible Maze", "Shadow Temple", {RA_SHADOW_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST, logic->CanUse(RG_DINS_FIRE) && logic->SmallKeys(RR_SHADOW_TEMPLE, 6)),
                   LOCATION(RC_SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST,         logic->CanUse(RG_DINS_FIRE) && logic->SmallKeys(RR_SHADOW_TEMPLE, 6)),
@@ -182,7 +182,7 @@ void RegionTable_Init_ShadowTemple() {
     |         BOSS ROOM         |
     ---------------------------*/
     areaTable[RR_SHADOW_TEMPLE_BOSS_ENTRYWAY] =
-        Region("Shadow Temple Boss Entryway", "Shadow Temple", RA_SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
+        Region("Shadow Temple Boss Entryway", "Shadow Temple", {RA_SHADOW_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {},
              {
                  // Exits
                  Entrance(RR_SHADOW_TEMPLE_BEYOND_BOAT, { [] { return ctx->GetDungeon(SHADOW_TEMPLE)->IsVanilla() && false; } }),
@@ -191,7 +191,7 @@ void RegionTable_Init_ShadowTemple() {
              });
 
     areaTable[RR_SHADOW_TEMPLE_BOSS_ROOM] =
-        Region("Shadow Temple Boss Room", "Shadow Temple", RA_NONE, NO_DAY_NIGHT_CYCLE,
+        Region("Shadow Temple Boss Room", "Shadow Temple", {}, NO_DAY_NIGHT_CYCLE,
              {
                  // Events
                  EventAccess(&logic->ShadowTempleClear, { [] {
@@ -209,6 +209,6 @@ void RegionTable_Init_ShadowTemple() {
              {
                  // Exits
                  Entrance(RR_SHADOW_TEMPLE_BOSS_ENTRYWAY, { [] { return false; } }),
-                 Entrance(RR_GRAVEYARD_WARP_PAD_REGION, { [] { return logic->ShadowTempleClear; } }),
+                 Entrance(RR_GRAVEYARD_WARP_PAD_REGION, { [] { return logic->ShadowTempleClear; } }, false),
              });
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp
index 136ce864e..f91e4dfec 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp
@@ -8,7 +8,7 @@ void RegionTable_Init_SpiritTemple() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[RR_SPIRIT_TEMPLE_ENTRYWAY] = Region("Spirit Temple Entryway", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_ENTRYWAY] = Region("Spirit Temple Entryway", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_SPIRIT_TEMPLE_LOBBY,                  {[]{return ctx->GetDungeon(SPIRIT_TEMPLE)->IsVanilla();}}),
                   Entrance(RR_SPIRIT_TEMPLE_MQ_LOBBY,               {[]{return ctx->GetDungeon(SPIRIT_TEMPLE)->IsMQ();}}),
@@ -19,14 +19,14 @@ void RegionTable_Init_SpiritTemple() {
   |     VANILLA DUNGEON      |
   ---------------------------*/
   if (ctx->GetDungeon(SPIRIT_TEMPLE)->IsVanilla()) {
-  areaTable[RR_SPIRIT_TEMPLE_LOBBY] = Region("Spirit Temple Lobby", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_LOBBY] = Region("Spirit Temple Lobby", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_SPIRIT_TEMPLE_ENTRYWAY,    {[]{return true;}}),
                   Entrance(RR_SPIRIT_TEMPLE_CHILD,       {[]{return logic->IsChild;}}),
                   Entrance(RR_SPIRIT_TEMPLE_EARLY_ADULT, {[]{return logic->CanUse(RG_SILVER_GAUNTLETS);}}),
   });
 
-  areaTable[RR_SPIRIT_TEMPLE_CHILD] = Region("Child Spirit Temple", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_SPIRIT_TEMPLE_CHILD] = Region("Child Spirit Temple", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->NutCrate, {[]{return true;}}),
                 }, {
@@ -39,7 +39,7 @@ void RegionTable_Init_SpiritTemple() {
                   Entrance(RR_SPIRIT_TEMPLE_CHILD_CLIMB, {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 1);}}),
   });
 
-  areaTable[RR_SPIRIT_TEMPLE_CHILD_CLIMB] = Region("Child Spirit Temple Climb", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_CHILD_CLIMB] = Region("Child Spirit Temple Climb", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST, logic->HasProjectile(HasProjectileAge::Both) || ((logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->BombchuRefill() && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && logic->CanUse(RG_SILVER_GAUNTLETS) && logic->HasProjectile(HasProjectileAge::Adult)) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->IsChild && logic->HasProjectile(HasProjectileAge::Child))),
                   LOCATION(RC_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST,  logic->HasProjectile(HasProjectileAge::Both) || ((logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->BombchuRefill() && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && logic->CanUse(RG_SILVER_GAUNTLETS) && logic->HasProjectile(HasProjectileAge::Adult)) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->IsChild && logic->HasProjectile(HasProjectileAge::Child))),
@@ -52,7 +52,7 @@ void RegionTable_Init_SpiritTemple() {
                   Entrance(RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER, {[]{return logic->HasExplosives() || (ctx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS));}}),
   });
 
-  areaTable[RR_SPIRIT_TEMPLE_EARLY_ADULT] = Region("Early Adult Spirit Temple", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_EARLY_ADULT] = Region("Early Adult Spirit Temple", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SPIRIT_TEMPLE_COMPASS_CHEST,            logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_ZELDAS_LULLABY)),
                   LOCATION(RC_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST,  (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG) || logic->CanUse(RG_BOMBCHU_5) || (logic->CanUse(RG_BOMB_BAG) && logic->IsAdult && ctx->GetTrickOption(RT_SPIRIT_LOWER_ADULT_SWITCH))) && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanJumpslash())),
@@ -64,7 +64,7 @@ void RegionTable_Init_SpiritTemple() {
                   Entrance(RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER, {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 1);}}),
   });
 
-  areaTable[RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER] = Region("Spirit Temple Central Chamber", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER] = Region("Spirit Temple Central Chamber", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SPIRIT_TEMPLE_MAP_CHEST,                    ((logic->HasExplosives() || logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->BombchuRefill() && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) &&
                                                                             (logic->CanUse(RG_DINS_FIRE) || ((logic->CanUse(RG_FIRE_ARROWS) || ctx->GetTrickOption(RT_SPIRIT_MAP_CHEST)) && logic->CanUse(RG_FAIRY_BOW) && logic->CanUse(RG_STICKS) ))) ||
@@ -94,7 +94,7 @@ void RegionTable_Init_SpiritTemple() {
                   Entrance(RR_SPIRIT_TEMPLE_CHILD_CLIMB,                {[]{return true;}}),
   });
 
-  areaTable[RR_SPIRIT_TEMPLE_OUTDOOR_HANDS] = Region("Spirit Temple Outdoor Hands", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_OUTDOOR_HANDS] = Region("Spirit Temple Outdoor Hands", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST, (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) && logic->CanUse(RG_LONGSHOT) && logic->HasExplosives()) || logic->SmallKeys(RR_SPIRIT_TEMPLE, 5)),
                   LOCATION(RC_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST,    logic->SmallKeys(RR_SPIRIT_TEMPLE, 4) && logic->CanUse(RG_SILVER_GAUNTLETS) && logic->HasExplosives()),
@@ -103,7 +103,7 @@ void RegionTable_Init_SpiritTemple() {
                   Entrance(RR_DESERT_COLOSSUS, {[]{return (logic->IsChild && logic->SmallKeys(RR_SPIRIT_TEMPLE, 5)) || (logic->CanUse(RG_SILVER_GAUNTLETS) && ((logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) && logic->HasExplosives()) || logic->SmallKeys(RR_SPIRIT_TEMPLE, 5)));}}),
   });
 
-  areaTable[RR_SPIRIT_TEMPLE_BEYOND_CENTRAL_LOCKED_DOOR] = Region("Spirit Temple Beyond Central Locked Door", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_BEYOND_CENTRAL_LOCKED_DOOR] = Region("Spirit Temple Beyond Central Locked Door", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST,         (logic->CanUse(RG_MIRROR_SHIELD) || (ctx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS))) && logic->HasExplosives()),
                   LOCATION(RC_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST,  (ctx->GetTrickOption(RT_LENS_SPIRIT) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->HasExplosives()),
@@ -113,7 +113,7 @@ void RegionTable_Init_SpiritTemple() {
                   Entrance(RR_SPIRIT_TEMPLE_BEYOND_FINAL_LOCKED_DOOR, {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && (ctx->GetTrickOption(RT_SPIRIT_WALL) || logic->CanUse(RG_LONGSHOT) || logic->CanUse(RG_BOMBCHU_5) || ((logic->CanUse(RG_BOMB_BAG) || logic->CanUse(RG_NUTS) || logic->CanUse(RG_DINS_FIRE)) && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_MEGATON_HAMMER))));}}),
   });
 
-  areaTable[RR_SPIRIT_TEMPLE_BEYOND_FINAL_LOCKED_DOOR] = Region("Spirit Temple Beyond Final Locked Door", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_BEYOND_FINAL_LOCKED_DOOR] = Region("Spirit Temple Beyond Final Locked Door", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SPIRIT_TEMPLE_BOSS_KEY_CHEST, logic->CanUse(RG_ZELDAS_LULLABY) && ((logic->TakeDamage() && ctx->GetTrickOption(RT_FLAMING_CHESTS)) || (logic->CanUse(RG_FAIRY_BOW) && logic->CanUse(RG_HOOKSHOT)))),
                   LOCATION(RC_SPIRIT_TEMPLE_TOPMOST_CHEST,  (logic->CanUse(RG_MIRROR_SHIELD) && logic->CanAttack()) || (ctx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS))),
@@ -123,7 +123,7 @@ void RegionTable_Init_SpiritTemple() {
   });
 
   areaTable[RR_SPIRIT_TEMPLE_INSIDE_STATUE_HEAD] =
-            Region("Spirit Temple Inside Statue Head", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
+            Region("Spirit Temple Inside Statue Head", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {},
                  {
                      // Exits
                      Entrance(RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER, { [] { return true; } }),
@@ -135,7 +135,7 @@ void RegionTable_Init_SpiritTemple() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (ctx->GetDungeon(SPIRIT_TEMPLE)->IsMQ()) {
-  areaTable[RR_SPIRIT_TEMPLE_MQ_LOBBY] = Region("Spirit Temple MQ Lobby", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_MQ_LOBBY] = Region("Spirit Temple MQ Lobby", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST, true),
                   LOCATION(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST,  Here(RR_SPIRIT_TEMPLE_MQ_LOBBY, []{return logic->BlastOrSmash();}) && ((logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT)) || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW)))),
@@ -147,7 +147,7 @@ void RegionTable_Init_SpiritTemple() {
                   Entrance(RR_SPIRIT_TEMPLE_MQ_ADULT, {[]{return logic->CanUse(RG_BOMBCHU_5) && logic->IsAdult && logic->CanUse(RG_LONGSHOT) && logic->CanUse(RG_SILVER_GAUNTLETS);}}),
   });
 
-  areaTable[RR_SPIRIT_TEMPLE_MQ_CHILD] = Region("Spirit Temple MQ Child", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_SPIRIT_TEMPLE_MQ_CHILD] = Region("Spirit Temple MQ Child", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FairyPot, {[]{return logic->FairyPot || (logic->CanUse(RG_KOKIRI_SWORD) && logic->CanUse(RG_BOMBCHU_5) && logic->CanUse(RG_FAIRY_SLINGSHOT));}}),
   }, {
@@ -162,7 +162,7 @@ void RegionTable_Init_SpiritTemple() {
                   Entrance(RR_SPIRIT_TEMPLE_MQ_SHARED, {[]{return logic->CanUse(RG_BOMBCHU_5) && logic->SmallKeys(RR_SPIRIT_TEMPLE, 2);}}),
   });
 
-  areaTable[RR_SPIRIT_TEMPLE_MQ_ADULT] = Region("Spirit Temple MQ Adult", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_MQ_ADULT] = Region("Spirit Temple MQ Adult", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST,     logic->SmallKeys(RR_SPIRIT_TEMPLE, 7)),
                   LOCATION(RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST,   logic->CanUse(RG_ZELDAS_LULLABY) && (logic->CanJumpslash() || logic->CanUse(RG_HOVER_BOOTS))),
@@ -181,7 +181,7 @@ void RegionTable_Init_SpiritTemple() {
                   Entrance(RR_SPIRIT_TEMPLE_MQ_MIRROR_SHIELD_HAND, {[]{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->CanUse(RG_SONG_OF_TIME) && logic->CanJumpslash() && (ctx->GetTrickOption(RT_LENS_SPIRIT_MQ) || logic->CanUse(RG_LENS_OF_TRUTH));}}),
   });
 
-  areaTable[RR_SPIRIT_TEMPLE_MQ_SHARED] = Region("Spirit Temple MQ Shared", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_MQ_SHARED] = Region("Spirit Temple MQ Shared", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST, logic->SmallKeys(RR_SPIRIT_TEMPLE, 6)),
                   LOCATION(RC_SPIRIT_TEMPLE_MQ_COMPASS_CHEST,           (logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT) && logic->SmallKeys(RR_SPIRIT_TEMPLE, 7)) || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW)) || (logic->CanUse(RG_FAIRY_BOW) && logic->CanUse(RG_FAIRY_SLINGSHOT))),
@@ -197,7 +197,7 @@ void RegionTable_Init_SpiritTemple() {
                     //Trick: (logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && (logic->CanUse(RG_SONG_OF_TIME) || LogicSpiritMQSunBlockSoT || logic->IsAdult)) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 4) && logic->CanUse(RG_SONG_OF_TIME) && (LogicLensSpiritMQ || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->IsAdult)
   });
 
-  areaTable[RR_SPIRIT_TEMPLE_MQ_LOWER_ADULT] = Region("Spirit Temple MQ Lower Adult", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_MQ_LOWER_ADULT] = Region("Spirit Temple MQ Lower Adult", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST,          true),
                   LOCATION(RC_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST,        logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && logic->CanUse(RG_MEGATON_HAMMER) && logic->CanUse(RG_SONG_OF_TIME) && logic->CanUse(RG_EPONAS_SONG) && logic->CanUse(RG_SUNS_SONG)
@@ -208,7 +208,7 @@ void RegionTable_Init_SpiritTemple() {
                                                                            && logic->CanUse(RG_SONG_OF_STORMS) && logic->CanUse(RG_ZELDAS_LULLABY)),
   }, {});
 
-  areaTable[RR_SPIRIT_TEMPLE_MQ_BOSS_AREA] = Region("Spirit Temple MQ Boss Region", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_MQ_BOSS_AREA] = Region("Spirit Temple MQ Boss Region", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST, ctx->GetTrickOption(RT_LENS_SPIRIT_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)),
   }, {
@@ -217,19 +217,19 @@ void RegionTable_Init_SpiritTemple() {
   });
 
   areaTable[RR_SPIRIT_TEMPLE_MQ_INSIDE_STATUE_HEAD] =
-            Region("Spirit Temple MQ Inside Statue Head", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
+            Region("Spirit Temple MQ Inside Statue Head", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {},
                  {
                      // Exits
                      Entrance(RR_SPIRIT_TEMPLE_MQ_SHARED, { [] { return true; } }),
                      Entrance(RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY, { [] { return logic->HasItem(RG_SPIRIT_TEMPLE_BOSS_KEY); } }),
                  });
 
-  areaTable[RR_SPIRIT_TEMPLE_MQ_MIRROR_SHIELD_HAND] = Region("Spirit Temple MQ Mirror Shield Hand", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_MQ_MIRROR_SHIELD_HAND] = Region("Spirit Temple MQ Mirror Shield Hand", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST, true),
   }, {});
 
-  areaTable[RR_SPIRIT_TEMPLE_MQ_SILVER_GAUNTLETS_HAND] = Region("Spirit Temple MQ Silver Gauntlets Hand", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_SPIRIT_TEMPLE_MQ_SILVER_GAUNTLETS_HAND] = Region("Spirit Temple MQ Silver Gauntlets Hand", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST, true),
   }, {});
@@ -239,7 +239,7 @@ void RegionTable_Init_SpiritTemple() {
     |         BOSS ROOM         |
     ---------------------------*/
     areaTable[RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY] = Region(
-        "Spirit Temple Boss Entryway", "Spirit Temple", RA_SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
+        "Spirit Temple Boss Entryway", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {},
         {
             // Exits
             Entrance(RR_SPIRIT_TEMPLE_INSIDE_STATUE_HEAD, { [] { return ctx->GetDungeon(SPIRIT_TEMPLE)->IsVanilla() && false; } }),
@@ -247,8 +247,7 @@ void RegionTable_Init_SpiritTemple() {
             Entrance(RR_SPIRIT_TEMPLE_BOSS_ROOM, { [] { return true; } }),
         });
 
-    areaTable[RR_SPIRIT_TEMPLE_BOSS_ROOM] = Region(
-        "Spirit Temple Boss Room", "Spirit Temple", RA_NONE, NO_DAY_NIGHT_CYCLE,
+    areaTable[RR_SPIRIT_TEMPLE_BOSS_ROOM] = Region("Spirit Temple Boss Room", "Spirit Temple", {}, NO_DAY_NIGHT_CYCLE,
         {
             // Events
             EventAccess(&logic->SpiritTempleClear, { [] {
@@ -264,6 +263,6 @@ void RegionTable_Init_SpiritTemple() {
         {
             // Exits
             Entrance(RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY, { [] { return false; } }),
-            Entrance(RR_DESERT_COLOSSUS, { [] { return logic->SpiritTempleClear; } }),
+            Entrance(RR_DESERT_COLOSSUS, { [] { return logic->SpiritTempleClear; } }, false),
         });
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp
index 3ed223db9..5f6d80a2e 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp
@@ -8,7 +8,7 @@ void RegionTable_Init_WaterTemple() {
   /*--------------------------
   |    VANILLA/MQ DECIDER    |
   ---------------------------*/
-  areaTable[RR_WATER_TEMPLE_ENTRYWAY] = Region("Water Temple Entryway", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_ENTRYWAY] = Region("Water Temple Entryway", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_LOBBY,    {[]{return logic->HasItem(RG_BRONZE_SCALE) && ctx->GetDungeon(WATER_TEMPLE)->IsVanilla();}}),
                   Entrance(RR_WATER_TEMPLE_MQ_LOBBY, {[]{return logic->HasItem(RG_BRONZE_SCALE) && ctx->GetDungeon(WATER_TEMPLE)->IsMQ();}}),
@@ -20,7 +20,7 @@ void RegionTable_Init_WaterTemple() {
   ---------------------------*/
   if (ctx->GetDungeon(WATER_TEMPLE)->IsVanilla()) {
   //Water Temple logic currently assumes that the locked door leading to the upper water raising location is unlocked from the start
-  areaTable[RR_WATER_TEMPLE_LOBBY] = Region("Water Temple Lobby", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_LOBBY] = Region("Water Temple Lobby", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_ENTRYWAY,              {[]{return true;}}),
                   Entrance(RR_WATER_TEMPLE_EAST_LOWER,            {[]{return logic->WaterTempleLow || ((ctx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS) || logic->CanUse(RG_ZORA_TUNIC)) && (logic->CanUse(RG_IRON_BOOTS) || (logic->CanUse(RG_LONGSHOT) && ctx->GetTrickOption(RT_WATER_LONGSHOT_TORCH))));}}),
@@ -37,7 +37,7 @@ void RegionTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_PRE_BOSS_ROOM,         {[]{return logic->WaterTempleHigh && logic->CanUse(RG_LONGSHOT);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_EAST_LOWER] = Region("Water Temple East Lower", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_WATER_TEMPLE_EAST_LOWER] = Region("Water Temple East Lower", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->WaterTempleLow, {[]{return logic->WaterTempleLow || logic->CanUse(RG_ZELDAS_LULLABY);}}),
                 }, {}, {
@@ -48,7 +48,7 @@ void RegionTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_TORCH_ROOM,   {[]{return logic->WaterTempleLow && (logic->HasFireSourceWithTorch() || logic->CanUse(RG_FAIRY_BOW));}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_MAP_ROOM] = Region("Water Temple Map Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_MAP_ROOM] = Region("Water Temple Map Room", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_WATER_TEMPLE_MAP_CHEST, (logic->CanUse(RG_MAGIC_SINGLE) && logic->CanUse(RG_KOKIRI_SWORD)) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_HOOKSHOT)),
                 }, {
@@ -56,7 +56,7 @@ void RegionTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_EAST_LOWER, {[]{return (logic->CanUse(RG_MAGIC_SINGLE) && logic->CanUse(RG_KOKIRI_SWORD)) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_HOOKSHOT);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_CRACKED_WALL] = Region("Water Temple Cracked Wall", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_CRACKED_WALL] = Region("Water Temple Cracked Wall", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_WATER_TEMPLE_CRACKED_WALL_CHEST, logic->HasExplosives()),
                 }, {
@@ -64,7 +64,7 @@ void RegionTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_EAST_LOWER, {[]{return true;}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_TORCH_ROOM] = Region("Water Temple Torch Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_TORCH_ROOM] = Region("Water Temple Torch Room", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_WATER_TEMPLE_TORCHES_CHEST, (logic->CanUse(RG_MAGIC_SINGLE) && logic->CanUse(RG_KOKIRI_SWORD)) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_HOOKSHOT)),
                 }, {
@@ -72,13 +72,13 @@ void RegionTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_EAST_LOWER, {[]{return (logic->CanUse(RG_MAGIC_SINGLE) && logic->CanUse(RG_KOKIRI_SWORD)) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_HOOKSHOT);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_NORTH_LOWER] = Region("Water Temple North Lower", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_NORTH_LOWER] = Region("Water Temple North Lower", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_LOBBY,          {[]{return true;}}),
                   Entrance(RR_WATER_TEMPLE_BOULDERS_LOWER, {[]{return (logic->CanUse(RG_LONGSHOT) || (ctx->GetTrickOption(RT_WATER_BK_REGION) && logic->CanUse(RG_HOVER_BOOTS))) && logic->SmallKeys(RR_WATER_TEMPLE, 4);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_BOULDERS_LOWER] = Region("Water Temple Boulders Lower", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_BOULDERS_LOWER] = Region("Water Temple Boulders Lower", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST, logic->CanUse(RG_LONGSHOT) || Here(RR_WATER_TEMPLE_BOULDERS_UPPER, []{return (logic->IsAdult && logic->HookshotOrBoomerang()) || (logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_HOOKSHOT));})),
                 }, {
@@ -88,26 +88,26 @@ void RegionTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_BOULDERS_UPPER, {[]{return (logic->IsAdult && (logic->CanUse(RG_HOVER_BOOTS) || ctx->GetTrickOption(RT_WATER_NORTH_BASEMENT_LEDGE_JUMP))) || (logic->CanUse(RG_HOVER_BOOTS) && logic->CanUse(RG_IRON_BOOTS));}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_BLOCK_ROOM] = Region("Water Temple Block Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_BLOCK_ROOM] = Region("Water Temple Block Room", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_BOULDERS_LOWER, {[]{return (logic->HasItem(RG_GORONS_BRACELET) && logic->HasExplosives()) || logic->CanUse(RG_HOOKSHOT);}}),
                   Entrance(RR_WATER_TEMPLE_JETS_ROOM,      {[]{return (logic->HasItem(RG_GORONS_BRACELET) && logic->HasExplosives()) || (logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_HOVER_BOOTS));}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_JETS_ROOM] = Region("Water Temple Jets Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_JETS_ROOM] = Region("Water Temple Jets Room", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_BLOCK_ROOM,     {[]{return logic->CanUse(RG_HOOKSHOT);}}),
                   Entrance(RR_WATER_TEMPLE_BOULDERS_UPPER, {[]{return true;}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_BOULDERS_UPPER] = Region("Water Temple Boulders Upper", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_BOULDERS_UPPER] = Region("Water Temple Boulders Upper", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_BOULDERS_LOWER, {[]{return true;}}),
                   Entrance(RR_WATER_TEMPLE_JETS_ROOM,      {[]{return logic->IsAdult;}}),
                   Entrance(RR_WATER_TEMPLE_BOSS_KEY_ROOM,  {[]{return (logic->CanUse(RG_IRON_BOOTS) || (logic->IsAdult && ctx->GetTrickOption(RT_WATER_BK_JUMP_DIVE))) && logic->SmallKeys(RR_WATER_TEMPLE, 5);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_BOSS_KEY_ROOM] = Region("Water Temple Boss Key Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_WATER_TEMPLE_BOSS_KEY_ROOM] = Region("Water Temple Boss Key Room", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FairyPot, {[]{return true;}}),
                 }, {
@@ -118,7 +118,7 @@ void RegionTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_BOULDERS_UPPER, {[]{return (logic->CanUse(RG_IRON_BOOTS) || (logic->IsAdult && ctx->GetTrickOption(RT_WATER_BK_JUMP_DIVE)) || logic->IsChild || logic->HasItem(RG_SILVER_SCALE)) && logic->SmallKeys(RR_WATER_TEMPLE, 5);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_SOUTH_LOWER] = Region("Water Temple South Lower", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_SOUTH_LOWER] = Region("Water Temple South Lower", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_WATER_TEMPLE_GS_BEHIND_GATE, (logic->CanJumpslash() || logic->CanUse(RG_MEGATON_HAMMER)) && (logic->CanUse(RG_HOOKSHOT) || (logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS)))),
                 }, {
@@ -126,13 +126,13 @@ void RegionTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_LOBBY, {[]{return logic->CanUse(RG_IRON_BOOTS);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_WEST_LOWER] = Region("Water Temple West Lower", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_WEST_LOWER] = Region("Water Temple West Lower", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_LOBBY,       {[]{return logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_IRON_BOOTS) && logic->HasItem(RG_GORONS_BRACELET);}}),
                   Entrance(RR_WATER_TEMPLE_DRAGON_ROOM, {[]{return logic->CanJumpslash() || logic->CanUseProjectile();}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_DRAGON_ROOM] = Region("Water Temple Dragon Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_DRAGON_ROOM] = Region("Water Temple Dragon Room", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_WATER_TEMPLE_DRAGON_CHEST, (logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_IRON_BOOTS)) || (((logic->IsAdult && ctx->GetTrickOption(RT_WATER_ADULT_DRAGON) && (logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_BOMBCHU_5))) || (logic->IsChild && ctx->GetTrickOption(RT_WATER_CHILD_DRAGON) && (logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG) || logic->CanUse(RG_BOMBCHU_5)))) && (logic->HasItem(RG_SILVER_SCALE) || logic->CanUse(RG_IRON_BOOTS))) ||
                                                                        Here(RR_WATER_TEMPLE_RIVER, []{return logic->IsAdult && logic->CanUse(RG_FAIRY_BOW) && ((ctx->GetTrickOption(RT_WATER_ADULT_DRAGON) && (logic->HasItem(RG_SILVER_SCALE) || logic->CanUse(RG_IRON_BOOTS))) || ctx->GetTrickOption(RT_WATER_DRAGON_JUMP_DIVE));})),
@@ -141,14 +141,14 @@ void RegionTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_WEST_LOWER, {[]{return true;}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_CENTRAL_PILLAR_LOWER] = Region("Water Temple Central Pillar Lower", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_CENTRAL_PILLAR_LOWER] = Region("Water Temple Central Pillar Lower", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_LOBBY,                   {[]{return logic->SmallKeys(RR_WATER_TEMPLE, 5);}}),
                   Entrance(RR_WATER_TEMPLE_CENTRAL_PILLAR_UPPER,    {[]{return logic->CanUse(RG_HOOKSHOT);}}),
                   Entrance(RR_WATER_TEMPLE_CENTRAL_PILLAR_BASEMENT, {[]{return logic->WaterTempleMiddle && logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 40;}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_CENTRAL_PILLAR_UPPER] = Region("Water Temple Central Pillar Upper", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_WATER_TEMPLE_CENTRAL_PILLAR_UPPER] = Region("Water Temple Central Pillar Upper", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->WaterTempleMiddle, {[]{return logic->WaterTempleMiddle || logic->CanUse(RG_ZELDAS_LULLABY);}}),
                 }, {
@@ -160,7 +160,7 @@ void RegionTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_CENTRAL_PILLAR_LOWER, {[]{return true;}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_CENTRAL_PILLAR_BASEMENT] = Region("Water Temple Central Pillar Basement", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_CENTRAL_PILLAR_BASEMENT] = Region("Water Temple Central Pillar Basement", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_WATER_TEMPLE_CENTRAL_PILLAR_CHEST, logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 40),
                 }, {
@@ -168,7 +168,7 @@ void RegionTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_CENTRAL_PILLAR_LOWER, {[]{return logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 16;}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_EAST_MIDDLE] = Region("Water Temple East Middle", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_EAST_MIDDLE] = Region("Water Temple East Middle", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_WATER_TEMPLE_COMPASS_CHEST, logic->CanUseProjectile()),
                 }, {
@@ -176,13 +176,13 @@ void RegionTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_LOBBY, {[]{return logic->CanUse(RG_IRON_BOOTS);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_WEST_MIDDLE] = Region("Water Temple West Middle", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_WEST_MIDDLE] = Region("Water Temple West Middle", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_LOBBY,      {[]{return true;}}),
                   Entrance(RR_WATER_TEMPLE_HIGH_WATER, {[]{return logic->CanUseProjectile();}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_HIGH_WATER] = Region("Water Temple High Water", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_WATER_TEMPLE_HIGH_WATER] = Region("Water Temple High Water", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->WaterTempleHigh, {[]{return logic->WaterTempleHigh || logic->CanUse(RG_ZELDAS_LULLABY);}}),
                 }, {}, {
@@ -190,7 +190,7 @@ void RegionTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_LOBBY, {[]{return true;}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_BLOCK_CORRIDOR] = Region("Water Temple Block Corridor", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_BLOCK_CORRIDOR] = Region("Water Temple Block Corridor", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST, logic->HasItem(RG_GORONS_BRACELET) && (logic->WaterTempleLow || logic->WaterTempleMiddle)),
                 }, {
@@ -198,7 +198,7 @@ void RegionTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_LOBBY, {[]{return logic->CanUse(RG_HOOKSHOT);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_FALLING_PLATFORM_ROOM] = Region("Water Temple Falling Platform Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_FALLING_PLATFORM_ROOM] = Region("Water Temple Falling Platform Room", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM, logic->CanUse(RG_LONGSHOT) || (ctx->GetTrickOption(RT_WATER_RANG_FALLING_PLATFORM_GS) && logic->IsChild && logic->CanUse(RG_BOOMERANG)) || (ctx->GetTrickOption(RT_WATER_HOOKSHOT_FALLING_PLATFORM_GS) && logic->IsAdult && logic->CanUse(RG_HOOKSHOT))),
                 }, {
@@ -207,19 +207,19 @@ void RegionTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_DRAGON_PILLARS_ROOM, {[]{return logic->CanUse(RG_HOOKSHOT) && logic->SmallKeys(RR_WATER_TEMPLE, 5);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_DRAGON_PILLARS_ROOM] = Region("Water Temple Dragon Pillars Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_DRAGON_PILLARS_ROOM] = Region("Water Temple Dragon Pillars Room", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_FALLING_PLATFORM_ROOM, {[]{return logic->CanUseProjectile();}}),
                   Entrance(RR_WATER_TEMPLE_DARK_LINK_ROOM,        {[]{return logic->CanUse(RG_HOOKSHOT);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_DARK_LINK_ROOM] = Region("Water Temple Dark Link Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_DARK_LINK_ROOM] = Region("Water Temple Dark Link Room", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_DRAGON_PILLARS_ROOM, {[]{return logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD);}}),
                   Entrance(RR_WATER_TEMPLE_LONGSHOT_ROOM,       {[]{return logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_LONGSHOT_ROOM] = Region("Water Temple Longshot Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_LONGSHOT_ROOM] = Region("Water Temple Longshot Room", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_WATER_TEMPLE_LONGSHOT_CHEST, true),
                 }, {
@@ -228,7 +228,7 @@ void RegionTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_RIVER,          {[]{return logic->IsChild || logic->CanUse(RG_SONG_OF_TIME);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_RIVER] = Region("Water Temple River", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_RIVER] = Region("Water Temple River", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_WATER_TEMPLE_RIVER_CHEST, (logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW)) && (logic->IsAdult || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT))),
                   LOCATION(RC_WATER_TEMPLE_GS_RIVER,    (logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_HOOKSHOT)) || (ctx->GetTrickOption(RT_WATER_RIVER_GS) && logic->CanUse(RG_LONGSHOT))),
@@ -237,7 +237,7 @@ void RegionTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_DRAGON_ROOM, {[]{return (logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW)) && (logic->IsAdult || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT));}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_PRE_BOSS_ROOM] = Region("Water Temple Pre Boss Room", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_WATER_TEMPLE_PRE_BOSS_ROOM] = Region("Water Temple Pre Boss Room", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FairyPot, {[]{return true;}}),
                 }, {}, {
@@ -251,7 +251,7 @@ void RegionTable_Init_WaterTemple() {
   |   MASTER QUEST DUNGEON    |
   ---------------------------*/
   if (ctx->GetDungeon(WATER_TEMPLE)->IsMQ()) {
-  areaTable[RR_WATER_TEMPLE_MQ_LOBBY] = Region("Water Temple MQ Lobby", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_WATER_TEMPLE_MQ_LOBBY] = Region("Water Temple MQ Lobby", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_WATER_TEMPLE_ENTRYWAY,            {[]{return true;}}),
                   Entrance(RR_WATER_TEMPLE_MQ_DIVE,             {[]{return logic->IsAdult && logic->WaterTimer() >= 24 && logic->CanUse(RG_IRON_BOOTS);}}),
@@ -259,7 +259,7 @@ void RegionTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_BOSS_ENTRYWAY,       {[]{return logic->HasItem(RG_WATER_TEMPLE_BOSS_KEY) && logic->IsAdult && logic->CanJumpslash() && logic->CanUse(RG_LONGSHOT);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_MQ_DIVE] = Region("Water Temple MQ Dive", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_MQ_DIVE] = Region("Water Temple MQ Dive", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_WATER_TEMPLE_MQ_MAP_CHEST,            logic->HasFireSource() && logic->IsAdult && logic->CanUse(RG_HOOKSHOT)),
                   LOCATION(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST, logic->IsAdult && logic->CanUse(RG_ZORA_TUNIC) && logic->CanUse(RG_HOOKSHOT) && ((ctx->GetTrickOption(RT_WATER_MQ_CENTRAL_PILLAR) && logic->CanUse(RG_FIRE_ARROWS)) || (logic->CanUse(RG_DINS_FIRE) && logic->CanUse(RG_SONG_OF_TIME)))),
@@ -269,7 +269,7 @@ void RegionTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_MQ_LOWERED_WATER_LEVELS, {[]{return logic->CanUse(RG_ZELDAS_LULLABY);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_MQ_LOWERED_WATER_LEVELS] = Region("Water Temple MQ Lowered Water Levels", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_MQ_LOWERED_WATER_LEVELS] = Region("Water Temple MQ Lowered Water Levels", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_WATER_TEMPLE_MQ_COMPASS_CHEST,                ((logic->IsAdult && logic->CanUse(RG_FAIRY_BOW)) || logic->CanUse(RG_DINS_FIRE) || Here(RR_WATER_TEMPLE_MQ_LOBBY, []{return logic->IsChild && logic->CanUse(RG_STICKS) && logic->HasExplosives();})) &&
                     (logic->CanJumpslash() || logic->CanUseProjectile())),
@@ -278,7 +278,7 @@ void RegionTable_Init_WaterTemple() {
                   LOCATION(RC_WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH, logic->IsAdult && logic->CanUse(RG_LONGSHOT)),
   }, {});
 
-  areaTable[RR_WATER_TEMPLE_MQ_DARK_LINK_REGION] = Region("Water Temple MQ Dark Link Region", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_WATER_TEMPLE_MQ_DARK_LINK_REGION] = Region("Water Temple MQ Dark Link Region", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FairyPot, {[]{return true;}}),
                   EventAccess(&logic->NutPot,   {[]{return true;}}),
@@ -291,7 +291,7 @@ void RegionTable_Init_WaterTemple() {
                   Entrance(RR_WATER_TEMPLE_MQ_BASEMENT_GATED_AREAS, {[]{return logic->IsAdult && logic->WaterTimer() >= 24 && logic->CanUse(RG_DINS_FIRE) && logic->CanUse(RG_IRON_BOOTS);}}),
   });
 
-  areaTable[RR_WATER_TEMPLE_MQ_BASEMENT_GATED_AREAS] = Region("Water Temple MQ Basement Gated Areas", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_WATER_TEMPLE_MQ_BASEMENT_GATED_AREAS] = Region("Water Temple MQ Basement Gated Areas", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_WATER_TEMPLE_MQ_FREESTANDING_KEY,         logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_SCARECROW) || ctx->GetTrickOption(RT_WATER_NORTH_BASEMENT_LEDGE_JUMP)),
                   LOCATION(RC_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH,     logic->CanUse(RG_FIRE_ARROWS) && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_SCARECROW))),
@@ -304,7 +304,7 @@ void RegionTable_Init_WaterTemple() {
     |         BOSS ROOM         |
     ---------------------------*/
     areaTable[RR_WATER_TEMPLE_BOSS_ENTRYWAY] =
-        Region("Water Temple Boss Entryway", "Water Temple", RA_WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {},
+        Region("Water Temple Boss Entryway", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {},
              {
                  // Exits
                  Entrance(RR_WATER_TEMPLE_PRE_BOSS_ROOM, { [] { return ctx->GetDungeon(WATER_TEMPLE)->IsVanilla() && false; } }),
@@ -312,8 +312,7 @@ void RegionTable_Init_WaterTemple() {
                  Entrance(RR_WATER_TEMPLE_BOSS_ROOM, { [] { return true; } }),
              });
 
-    areaTable[RR_WATER_TEMPLE_BOSS_ROOM] = Region(
-        "Water Temple Boss Room", "Water Temple", RA_NONE, NO_DAY_NIGHT_CYCLE,
+    areaTable[RR_WATER_TEMPLE_BOSS_ROOM] = Region("Water Temple Boss Room", "Water Temple", {}, NO_DAY_NIGHT_CYCLE,
         {
             // Events
             EventAccess(&logic->WaterTempleClear, { [] {
@@ -329,6 +328,6 @@ void RegionTable_Init_WaterTemple() {
         {
             // Exits
             Entrance(RR_WATER_TEMPLE_BOSS_ENTRYWAY, { [] { return false; } }),
-            Entrance(RR_LAKE_HYLIA, { [] { return logic->WaterTempleClear; } }),
+            Entrance(RR_LAKE_HYLIA, { [] { return logic->WaterTempleClear; } }, false),
         });
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
index 3aecbe6ca..658cc29f6 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
@@ -4,7 +4,7 @@
 using namespace Rando;
 
 void RegionTable_Init_ZorasDomain() {
-  areaTable[RR_ZR_FRONT] = Region("ZR Front", "Zora River", RA_ZORAS_RIVER, DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_ZR_FRONT] = Region("ZR Front", "Zora River", {RA_ZORAS_RIVER}, DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_ZR_GS_TREE, logic->IsChild && logic->CanAttack()),
                 }, {
@@ -13,7 +13,7 @@ void RegionTable_Init_ZorasDomain() {
                   Entrance(RR_HYRULE_FIELD, {[]{return true;}}),
   });
 
-  areaTable[RR_ZORAS_RIVER] = Region("Zora River", "Zora River", RA_ZORAS_RIVER, DAY_NIGHT_CYCLE, {
+  areaTable[RR_ZORAS_RIVER] = Region("Zora River", "Zora River", {RA_ZORAS_RIVER}, DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->GossipStoneFairy, {[]{return logic->CallGossipFairy();}}),
                   EventAccess(&logic->BeanPlantFairy,   {[]{return logic->BeanPlantFairy   || (CanPlantBean(RR_ZORAS_RIVER) && logic->CanUse(RG_SONG_OF_STORMS));}}),
@@ -46,13 +46,13 @@ void RegionTable_Init_ZorasDomain() {
                   Entrance(RR_ZR_BEHIND_WATERFALL, {[]{return logic->CanUse(RG_ZELDAS_LULLABY) || (logic->IsChild && ctx->GetTrickOption(RT_ZR_CUCCO)) || (logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS) && ctx->GetTrickOption(RT_ZR_HOVERS));}}),
   });
 
-  areaTable[RR_ZR_BEHIND_WATERFALL] = Region("ZR Behind Waterfall", "Zora River", RA_ZORAS_RIVER, DAY_NIGHT_CYCLE, {}, {}, {
+  areaTable[RR_ZR_BEHIND_WATERFALL] = Region("ZR Behind Waterfall", "Zora River", {RA_ZORAS_RIVER}, DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(RR_ZORAS_RIVER,  {[]{return true;}}),
                   Entrance(RR_ZORAS_DOMAIN, {[]{return true;}}),
   });
 
-  areaTable[RR_ZR_OPEN_GROTTO] = Region("ZR Open Grotto", "ZR Open Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+  areaTable[RR_ZR_OPEN_GROTTO] = Region("ZR Open Grotto", "ZR Open Grotto", {}, NO_DAY_NIGHT_CYCLE, grottoEvents, {
                   //Locations
                   LOCATION(RC_ZR_OPEN_GROTTO_CHEST,         true),
                   LOCATION(RC_ZR_OPEN_GROTTO_FISH,          logic->HasBottle()),
@@ -64,7 +64,7 @@ void RegionTable_Init_ZorasDomain() {
                   Entrance(RR_ZORAS_RIVER, {[]{return true;}}),
   });
 
-  areaTable[RR_ZR_FAIRY_GROTTO] = Region("ZR Fairy Grotto", "ZR Fairy Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_ZR_FAIRY_GROTTO] = Region("ZR Fairy Grotto", "ZR Fairy Grotto", {}, NO_DAY_NIGHT_CYCLE, {
                   //Event
                   EventAccess(&logic->FreeFairies, {[]{return true;}}),
                 }, {}, {
@@ -72,7 +72,7 @@ void RegionTable_Init_ZorasDomain() {
                   Entrance(RR_ZORAS_RIVER, {[]{return true;}}),
   });
 
-  areaTable[RR_ZR_STORMS_GROTTO] = Region("ZR Storms Grotto", "ZR Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_ZR_STORMS_GROTTO] = Region("ZR Storms Grotto", "ZR Storms Grotto", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_ZR_DEKU_SCRUB_GROTTO_REAR,  logic->CanStunDeku()),
                   LOCATION(RC_ZR_DEKU_SCRUB_GROTTO_FRONT, logic->CanStunDeku()),
@@ -82,7 +82,7 @@ void RegionTable_Init_ZorasDomain() {
                   Entrance(RR_ZORAS_RIVER, {[]{return true;}}),
   });
 
-  areaTable[RR_ZORAS_DOMAIN] = Region("Zoras Domain", "Zoras Domain", RA_ZORAS_DOMAIN, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_ZORAS_DOMAIN] = Region("Zoras Domain", "Zoras Domain", {RA_ZORAS_DOMAIN}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->GossipStoneFairy,  {[]{return logic->CallGossipFairyExceptSuns();}}),
                   EventAccess(&logic->NutPot,            {[]{return true;}}),
@@ -114,7 +114,7 @@ void RegionTable_Init_ZorasDomain() {
                   Entrance(RR_ZD_STORMS_GROTTO,    {[]{return logic->CanOpenStormsGrotto();}}),
   });
 
-  areaTable[RR_ZD_BEHIND_KING_ZORA] = Region("ZD Behind King Zora", "Zoras Domain", RA_ZORAS_DOMAIN, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_ZD_BEHIND_KING_ZORA] = Region("ZD Behind King Zora", "Zoras Domain", {RA_ZORAS_DOMAIN}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_ZD_BEHIND_KING_ZORA_BEEHIVE, logic->CanBreakUpperBeehives()),
                 }, {
@@ -123,7 +123,7 @@ void RegionTable_Init_ZorasDomain() {
                   Entrance(RR_ZORAS_FOUNTAIN, {[]{return true;}}),
   });
 
-  areaTable[RR_ZD_SHOP] = Region("ZD Shop", "ZD Shop", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_ZD_SHOP] = Region("ZD Shop", "ZD Shop", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_ZD_SHOP_ITEM_1, true),
                   LOCATION(RC_ZD_SHOP_ITEM_2, true),
@@ -138,7 +138,7 @@ void RegionTable_Init_ZorasDomain() {
                   Entrance(RR_ZORAS_DOMAIN, {[]{return true;}}),
   });
 
-  areaTable[RR_ZD_STORMS_GROTTO] = Region("ZD Storms Grotto", "ZD Storms Grotto", RA_NONE, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_ZD_STORMS_GROTTO] = Region("ZD Storms Grotto", "ZD Storms Grotto", {}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->FreeFairies, {[]{return true;}}),
                 }, {}, {
@@ -146,7 +146,7 @@ void RegionTable_Init_ZorasDomain() {
                   Entrance(RR_ZORAS_DOMAIN, {[]{return true;}}),
   });
 
-  areaTable[RR_ZORAS_FOUNTAIN] = Region("Zoras Fountain", "Zoras Fountain", RA_ZORAS_FOUNTAIN, NO_DAY_NIGHT_CYCLE, {
+  areaTable[RR_ZORAS_FOUNTAIN] = Region("Zoras Fountain", "Zoras Fountain", {RA_ZORAS_FOUNTAIN}, NO_DAY_NIGHT_CYCLE, {
                   //Events
                   EventAccess(&logic->GossipStoneFairy, {[]{return logic->CallGossipFairyExceptSuns();}}),
                   EventAccess(&logic->ButterflyFairy,   {[]{return logic->ButterflyFairy   || (logic->CanUse(RG_STICKS) && logic->AtDay);}}),
@@ -167,7 +167,7 @@ void RegionTable_Init_ZorasDomain() {
                   Entrance(RR_ZF_GREAT_FAIRY_FOUNTAIN,   {[]{return logic->HasExplosives();}}),
   });
 
-  areaTable[RR_ZF_GREAT_FAIRY_FOUNTAIN] = Region("ZF Great Fairy Fountain", "ZF Great Fairy Fountain", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
+  areaTable[RR_ZF_GREAT_FAIRY_FOUNTAIN] = Region("ZF Great Fairy Fountain", "ZF Great Fairy Fountain", {}, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LOCATION(RC_ZF_GREAT_FAIRY_REWARD, logic->CanUse(RG_ZELDAS_LULLABY)),
                 }, {
diff --git a/soh/soh/Enhancements/randomizer/3drando/random.hpp b/soh/soh/Enhancements/randomizer/3drando/random.hpp
index 623c396a1..2d2f11dbe 100644
--- a/soh/soh/Enhancements/randomizer/3drando/random.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/random.hpp
@@ -5,6 +5,7 @@
 #include <cstdint>
 #include <utility>
 #include <vector>
+#include <set>
 
 void Random_Init(uint32_t seed);
 uint32_t Random(int min, int max);
@@ -29,6 +30,19 @@ const auto& RandomElement(const Container& container) {
     return container[Random(0, std::size(container))];
 }
 
+template <typename T>
+const T RandomElementFromSet(const std::set<T>& set) {
+    if (set.size() == 1) {
+        return *set.begin();
+    }
+    uint32_t rand = Random(0, set.size());
+    auto it = set.begin();
+    for (uint32_t i = 0; i < rand; i++) {
+        it++;
+    }
+    return *it;
+}
+
 //Shuffle items within a vector or array
 //RANDOTODO There's probably a more efficient way to do what this does.
 template <typename T>
diff --git a/soh/soh/Enhancements/randomizer/entrance.cpp b/soh/soh/Enhancements/randomizer/entrance.cpp
index 72526db5b..7fbeed879 100644
--- a/soh/soh/Enhancements/randomizer/entrance.cpp
+++ b/soh/soh/Enhancements/randomizer/entrance.cpp
@@ -10,8 +10,8 @@
 namespace Rando {
 EntranceLinkInfo NO_RETURN_ENTRANCE = { EntranceType::None, RR_NONE, RR_NONE, -1 };
 
-Entrance::Entrance(RandomizerRegion connectedRegion_, std::vector<ConditionFn> conditions_met_)
-    : connectedRegion(connectedRegion_) {
+Entrance::Entrance(RandomizerRegion connectedRegion_, std::vector<ConditionFn> conditions_met_, bool spreadsAreasWithPriority_)
+    : connectedRegion(connectedRegion_),  spreadsAreasWithPriority(spreadsAreasWithPriority_){
     originalConnectedRegion = connectedRegion_;
     conditions_met.resize(2);
     for (size_t i = 0; i < conditions_met_.size(); i++) {
@@ -239,6 +239,10 @@ Entrance* Entrance::AssumeReachable() {
     return assumed;
 }
 
+bool Entrance::DoesSpreadAreas(){
+  return spreadsAreasWithPriority;
+}
+
 EntranceShuffler::EntranceShuffler() {
   playthroughEntrances = {};
   entranceOverrides = {};
@@ -522,24 +526,6 @@ static bool ValidateWorld(Entrance* entrancePlaced) {
         }
     }
 
-    if (ctx->GetOption(RSK_SHUFFLE_INTERIOR_ENTRANCES).IsNot(RO_INTERIOR_ENTRANCE_SHUFFLE_OFF) &&
-        ctx->GetOption(RSK_GOSSIP_STONE_HINTS).IsNot(RO_GOSSIP_STONES_NONE) &&
-        (entrancePlaced == nullptr || type == EntranceType::Interior || type == EntranceType::SpecialInterior)) {
-        // When cows are shuffled, ensure both Impa's House entrances are in the same hint area because the cow is
-        // reachable from both sides
-        if (ctx->GetOption(RSK_SHUFFLE_COWS)) {
-            auto impasHouseFrontHintRegion = areaTable[RR_KAK_IMPAS_HOUSE].GetArea();
-            auto impasHouseBackHintRegion = areaTable[RR_KAK_IMPAS_HOUSE_BACK].GetArea();
-            if (impasHouseFrontHintRegion != RA_NONE && impasHouseBackHintRegion != RA_NONE &&
-                impasHouseBackHintRegion != RA_LINKS_POCKET && impasHouseFrontHintRegion != RA_LINKS_POCKET &&
-                impasHouseBackHintRegion != impasHouseFrontHintRegion) {
-                auto message = "Kak Impas House entrances are not in the same hint area\n";
-                SPDLOG_DEBUG(message);
-                return false;
-            }
-        }
-    }
-
     // If all locations aren't reachable, that means that one of the conditions failed when searching
     if (!Rando::Context::GetInstance()->allLocationsReachable) {
         if (checkOtherEntranceAccess) {
@@ -788,42 +774,6 @@ static std::array<std::vector<Entrance*>, 2> SplitEntrancesByRequirements(std::v
     return { restrictiveEntrances, softEntrances };
 }
 
-// Once the first entrance to Impas House has been placed, try to place the next one immediately to reduce chances of
-// failure.
-bool EntranceShuffler::PlaceOtherImpasHouseEntrance(std::vector<Entrance*> entrances,
-                                                    std::vector<Entrance*> targetEntrances,
-                                                    std::vector<EntrancePair>& rollbacks) {
-    // Get the other impas house entrance
-    auto otherImpaTargets = FilterFromPool(targetEntrances, [](const Entrance* target) {
-        return (target->GetConnectedRegionKey() == RR_KAK_IMPAS_HOUSE ||
-                target->GetConnectedRegionKey() == RR_KAK_IMPAS_HOUSE_BACK);
-    });
-    if (otherImpaTargets.empty()) {
-        return true;
-    }
-
-    Entrance* otherImpaTarget = otherImpaTargets[0];
-    auto m = "Now Placing Other Impa Target: " + otherImpaTarget->GetName() + "\n";
-    SPDLOG_DEBUG(m);
-    RandomizerRegion otherImpaRegion = otherImpaTarget->GetConnectedRegionKey() != RR_KAK_IMPAS_HOUSE_BACK
-                                           ? RR_KAK_IMPAS_HOUSE_BACK
-                                           : RR_KAK_IMPAS_HOUSE;
-    for (Entrance* entrance : entrances) {
-        // If the entrance is already connected or it doesn't have the same hint region as the already placed impas
-        // house entrance, then don't try to use it
-        if (entrance->GetConnectedRegionKey() != RR_NONE ||
-            (areaTable[otherImpaRegion].GetArea() != areaTable[entrance->GetParentRegionKey()].GetArea())) {
-            continue;
-        }
-        // If the placement succeeds, we return true
-        if (ReplaceEntrance(entrance, otherImpaTarget, rollbacks)) {
-            return true;
-        }
-    }
-    SPDLOG_DEBUG("No available entrances for placing other impa region.\n");
-    return false;
-}
-
 // Shuffle entrances by placing them instead of entrances in the provided target entrances list
 bool EntranceShuffler::ShuffleEntrances(std::vector<Entrance*>& entrances, std::vector<Entrance*>& targetEntrances,
                                         std::vector<EntrancePair>& rollbacks) {
@@ -843,18 +793,7 @@ bool EntranceShuffler::ShuffleEntrances(std::vector<Entrance*>& entrances, std::
                 continue;
             }
 
-            // Store whether or not we're about to attempt placing an entrance to Impas House
-            bool attemptedImpasHousePlacement = (target->GetConnectedRegionKey() == RR_KAK_IMPAS_HOUSE ||
-                                                 target->GetConnectedRegionKey() == RR_KAK_IMPAS_HOUSE_BACK);
-
             if (ReplaceEntrance(entrance, target, rollbacks)) {
-                // If shuffle cows is enabled and the last entrance was one to Impas House,
-                // then immediately attempt to place the other entrance to Impas House
-                if (ctx->GetOption(RSK_SHUFFLE_COWS) && attemptedImpasHousePlacement) {
-                    if (!PlaceOtherImpasHouseEntrance(entrances, targetEntrances, rollbacks)) {
-                        return false;
-                    }
-                }
                 break;
             }
         }
diff --git a/soh/soh/Enhancements/randomizer/entrance.h b/soh/soh/Enhancements/randomizer/entrance.h
index 38c2bb22b..ffecad562 100644
--- a/soh/soh/Enhancements/randomizer/entrance.h
+++ b/soh/soh/Enhancements/randomizer/entrance.h
@@ -38,7 +38,7 @@ enum class EntranceType {
 
 class Entrance {
   public:
-    Entrance(RandomizerRegion connectedRegion_, std::vector<ConditionFn> conditions_met_);
+    Entrance(RandomizerRegion connectedRegion_, std::vector<ConditionFn> conditions_met_, bool spreadsAreasWithPriority_ = true);
     void SetCondition(ConditionFn newCondition);
     bool GetConditionsMet() const;
     std::string to_string() const;
@@ -77,6 +77,7 @@ class Entrance {
     void BindTwoWay(Entrance* otherEntrance);
     Entrance* GetNewTarget();
     Entrance* AssumeReachable();
+    bool DoesSpreadAreas();
 
   private:
     RandomizerRegion parentRegion;
@@ -95,6 +96,9 @@ class Entrance {
     bool addedToPool = false;
     bool decoupled = false;
     std::string name = "";
+    //If this is false, areas only spread to interiors through this entrance if there is no other choice
+    //Set to false for owl drops, the windmill path between dampe's grave and windmill and blue warps
+    bool spreadsAreasWithPriority = true; 
 };
 
 typedef struct {
@@ -137,8 +141,6 @@ class EntranceShuffler {
                              int retryCount = 20);
     bool ShuffleEntrances(std::vector<Entrance*>& entrances, std::vector<Entrance*>& targetEntrances,
                           std::vector<EntrancePair>& rollbacks);
-    bool PlaceOtherImpasHouseEntrance(std::vector<Entrance*> entrances, std::vector<Entrance*> targetEntrances,
-                                      std::vector<EntrancePair>& rollbacks);
     bool mNoRandomEntrances;
     int mTotalRandomizableEntrances = 0;
     int mCurNumRandomizedEntrances = 0;
@@ -151,4 +153,4 @@ extern "C" {
   EntranceOverride* Randomizer_GetEntranceOverrides();
 #ifdef __cplusplus
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/soh/soh/Enhancements/randomizer/hint.cpp b/soh/soh/Enhancements/randomizer/hint.cpp
index 4ff6ba2aa..b6463cab3 100644
--- a/soh/soh/Enhancements/randomizer/hint.cpp
+++ b/soh/soh/Enhancements/randomizer/hint.cpp
@@ -146,8 +146,9 @@ void Hint::FillGapsInData(){
     fillItems = false;
   }
   for(uint8_t c = 0; c < locations.size(); c++){
+    //if area matters for the hint, it should be specified and not left to this
     if (fillAreas){
-      areas.push_back(ctx->GetItemLocation(locations[c])->GetArea());
+      areas.push_back(*ctx->GetItemLocation(locations[c])->GetAreas().begin());
     }
     if (fillItems){
       items.push_back(ctx->GetItemLocation(locations[c])->GetPlacedRandomizerGet());
@@ -521,7 +522,7 @@ const HintText Hint::GetItemHintText(uint8_t slot, bool mysterious) const {
 
 const HintText Hint::GetAreaHintText(uint8_t slot) const { 
   CustomMessage areaText;
-  if (yourPocket && (areas[slot] == RA_LINKS_POCKET || areas[slot] == RA_NONE)){
+  if (yourPocket && areas[slot] == RA_LINKS_POCKET){
     return StaticData::hintTextTable[RHT_YOUR_POCKET];
   } else {
     return StaticData::hintTextTable[Rando::StaticData::areaNames[areas[slot]]];
diff --git a/soh/soh/Enhancements/randomizer/item_location.cpp b/soh/soh/Enhancements/randomizer/item_location.cpp
index e5c9ce6cc..d365081c3 100644
--- a/soh/soh/Enhancements/randomizer/item_location.cpp
+++ b/soh/soh/Enhancements/randomizer/item_location.cpp
@@ -60,12 +60,16 @@ RandomizerRegion ItemLocation::GetParentRegionKey() const {
     return parentRegion;
 }
 
-void ItemLocation::SetArea(RandomizerArea newArea) {
-    area = newArea;
+void ItemLocation::MergeAreas(std::set<RandomizerArea> newAreas) {
+    areas.merge(newAreas);
+    if (areas.size() >= 2){
+        //if we have more than 1 area, remove any RA_NONE as that's not a real area. can happen if an entrance is in 2 regions and 1 is disconnected
+        areas.erase(RA_NONE);
+    }
 }
 
-RandomizerArea ItemLocation::GetArea() const {
-    return area;
+std::set<RandomizerArea> ItemLocation::GetAreas() const {
+    return areas;
 }
 
 void ItemLocation::PlaceVanillaItem() {
@@ -219,7 +223,7 @@ void ItemLocation::ResetVariables() {
     hidden = false;
     wothCandidate = false;
     barrenCandidate = false;
-    area = RA_NONE;
+    areas = {};
     status = RCSHOW_UNCHECKED;
     isSkipped = false;
 }
diff --git a/soh/soh/Enhancements/randomizer/item_location.h b/soh/soh/Enhancements/randomizer/item_location.h
index 868b384b5..7a0014bfb 100644
--- a/soh/soh/Enhancements/randomizer/item_location.h
+++ b/soh/soh/Enhancements/randomizer/item_location.h
@@ -22,8 +22,8 @@ class ItemLocation {
     void SetDelayedItem(RandomizerGet item);
     RandomizerRegion GetParentRegionKey() const;
     void SetParentRegion (RandomizerRegion region);
-    RandomizerArea GetArea() const;
-    void SetArea (RandomizerArea region);
+    std::set<RandomizerArea> GetAreas() const;
+    void MergeAreas (std::set<RandomizerArea> newAreas);
     void PlaceVanillaItem();
     void ApplyPlacedItemEffect() const;
     void SaveDelayedItem();
@@ -66,7 +66,7 @@ class ItemLocation {
     Option excludedOption = Option::Bool(StaticData::GetLocation(rc)->GetName(), {"Include", "Exclude"}, OptionCategory::Setting, "", "", WidgetType::Checkbox, RO_LOCATION_INCLUDE);
     uint16_t price = 0;
     RandomizerRegion parentRegion = RR_NONE;
-    RandomizerArea area = RA_NONE;
+    std::set<RandomizerArea> areas = {};
     bool hasCustomPrice = false;
     bool hidden = false;
     bool visibleInImGui = false;
diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h
index e657b8ed5..c79907ff4 100644
--- a/soh/soh/Enhancements/randomizer/randomizerTypes.h
+++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@@ -415,7 +415,6 @@ typedef enum {
     RR_KAK_IMPAS_HOUSE,
     RR_KAK_IMPAS_LEDGE,
     RR_KAK_IMPAS_HOUSE_BACK,
-    RR_KAK_IMPAS_HOUSE_NEAR_COW,
     RR_KAK_WINDMILL,
     RR_KAK_BAZAAR,
     RR_KAK_SHOOTING_GALLERY,
@@ -3644,6 +3643,7 @@ typedef enum {
     RHT_GANON_JOKE11,
     // Misc utilities
     RHT_YOUR_POCKET,
+    RHT_ISOLATED_PLACE,
     RHT_DUNGEON_ORDINARY,
     RHT_DUNGEON_MASTERFUL,
     RHT_MAX
diff --git a/soh/soh/Enhancements/randomizer/static_data.cpp b/soh/soh/Enhancements/randomizer/static_data.cpp
index 773d9f209..5c6f7903b 100644
--- a/soh/soh/Enhancements/randomizer/static_data.cpp
+++ b/soh/soh/Enhancements/randomizer/static_data.cpp
@@ -138,7 +138,7 @@ std::unordered_map<RandomizerCheck, RandomizerHint> StaticData::gossipStoneCheck
 };
 
 std::unordered_map<uint32_t, RandomizerHintTextKey> StaticData::areaNames = { //RANDOTODO resolve None in area
-    {RA_NONE, RHT_LINKS_POCKET}, //explicit none in area hints usually means it's a starting item, so say Link's pocket
+    {RA_NONE, RHT_ISOLATED_PLACE}, //explicit none in area hints means we're disconnected
     {RA_LINKS_POCKET, RHT_LINKS_POCKET},
     {RA_KOKIRI_FOREST, RHT_KOKIRI_FOREST},
     {RA_THE_LOST_WOODS, RHT_THE_LOST_WOODS},

From 5d311fac9fb49dfe63790a66a85602171892814b Mon Sep 17 00:00:00 2001
From: Archez <Archez@users.noreply.github.com>
Date: Tue, 8 Oct 2024 23:20:09 -0400
Subject: [PATCH 230/230] Convert GameInteractor_Should hook to use variadic
 arguments (#4383)

* Convert _Should to use variadic args

* Convert everything to use va_arg properly

* Update shop hooks to va_args

* Wrong Function

* Update hook_handlers.cpp

---------

Co-authored-by: Malkierian <malkierian@gmail.com>
Co-authored-by: Malkierian <malkierian@live.com>
---
 .../TimeSavers/FasterHeavyBlockLift.cpp       |  6 +-
 .../SkipCutscene/Story/SkipBlueWarp.cpp       |  8 +--
 .../SkipCutscene/Story/SkipDekuTreeIntro.cpp  |  2 +-
 .../Story/SkipLostWoodsBridge.cpp             |  2 +-
 .../Story/SkipZeldaFleeingCastle.cpp          |  2 +-
 soh/soh/Enhancements/boss-rush/BossRush.cpp   | 19 +++--
 soh/soh/Enhancements/cheat_hook_handlers.cpp  |  2 +-
 .../game-interactor/GameInteractor.h          | 11 ++-
 .../GameInteractor_HookTable.h                |  4 +-
 .../game-interactor/GameInteractor_Hooks.cpp  | 27 ++++---
 .../game-interactor/GameInteractor_Hooks.h    |  3 +-
 .../Enhancements/randomizer/fishsanity.cpp    | 11 ++-
 soh/soh/Enhancements/randomizer/fishsanity.h  |  4 +-
 .../Enhancements/randomizer/hook_handlers.cpp | 70 ++++++++++---------
 .../Enhancements/timesaver_hook_handlers.cpp  | 57 ++++++++-------
 soh/src/code/code_800EC960.c                  | 10 +--
 soh/src/code/z_demo.c                         | 20 +++---
 soh/src/code/z_horse.c                        |  6 +-
 soh/src/code/z_message_PAL.c                  | 24 +++----
 soh/src/code/z_parameter.c                    |  6 +-
 soh/src/code/z_sram.c                         |  2 +-
 .../actors/ovl_Bg_Breakwall/z_bg_breakwall.c  |  2 +-
 .../ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c     |  6 +-
 .../ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c     |  4 +-
 .../actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c    |  2 +-
 .../actors/ovl_Boss_Dodongo/z_boss_dodongo.c  |  4 +-
 .../overlays/actors/ovl_Boss_Fd/z_boss_fd.c   |  4 +-
 .../actors/ovl_Boss_Ganon/z_boss_ganon.c      |  2 +-
 .../ovl_Boss_Ganondrof/z_boss_ganondrof.c     |  6 +-
 .../actors/ovl_Boss_Goma/z_boss_goma.c        |  4 +-
 .../overlays/actors/ovl_Boss_Mo/z_boss_mo.c   |  4 +-
 .../overlays/actors/ovl_Boss_Sst/z_boss_sst.c |  4 +-
 .../overlays/actors/ovl_Boss_Tw/z_boss_tw.c   |  4 +-
 .../overlays/actors/ovl_Boss_Va/z_boss_va.c   |  4 +-
 .../overlays/actors/ovl_Demo_Du/z_demo_du.c   |  6 +-
 .../overlays/actors/ovl_Demo_Im/z_demo_im.c   |  6 +-
 .../overlays/actors/ovl_Demo_Sa/z_demo_sa.c   |  4 +-
 soh/src/overlays/actors/ovl_En_Ani/z_en_ani.c |  6 +-
 .../ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c   |  2 +-
 soh/src/overlays/actors/ovl_En_Ds/z_en_ds.c   |  2 +-
 soh/src/overlays/actors/ovl_En_Du/z_en_du.c   |  8 +--
 soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c |  8 +--
 soh/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c | 12 ++--
 soh/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c |  4 +-
 soh/src/overlays/actors/ovl_En_Gm/z_en_gm.c   |  2 +-
 soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c | 56 +++++++--------
 soh/src/overlays/actors/ovl_En_Hs/z_en_hs.c   |  2 +-
 .../actors/ovl_En_Kakasi2/z_en_kakasi2.c      |  2 +-
 soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c   |  2 +-
 soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c | 18 ++---
 soh/src/overlays/actors/ovl_En_Mk/z_en_mk.c   |  2 +-
 soh/src/overlays/actors/ovl_En_Nb/z_en_nb.c   |  4 +-
 soh/src/overlays/actors/ovl_En_Rl/z_en_rl.c   |  2 +-
 soh/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c |  4 +-
 soh/src/overlays/actors/ovl_En_Sa/z_en_sa.c   |  6 +-
 .../overlays/actors/ovl_En_Toryo/z_en_toryo.c |  2 +-
 soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c   | 30 ++++----
 soh/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c |  2 +-
 soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c |  4 +-
 .../actors/ovl_Item_Ocarina/z_item_ocarina.c  |  4 +-
 .../actors/ovl_player_actor/z_player.c        | 16 ++---
 .../ovl_kaleido_scope/z_kaleido_collect.c     | 10 +--
 .../ovl_kaleido_scope/z_kaleido_scope_PAL.c   |  6 +-
 63 files changed, 308 insertions(+), 270 deletions(-)

diff --git a/soh/soh/Enhancements/TimeSavers/FasterHeavyBlockLift.cpp b/soh/soh/Enhancements/TimeSavers/FasterHeavyBlockLift.cpp
index ca73877c6..73909cbda 100644
--- a/soh/soh/Enhancements/TimeSavers/FasterHeavyBlockLift.cpp
+++ b/soh/soh/Enhancements/TimeSavers/FasterHeavyBlockLift.cpp
@@ -18,7 +18,7 @@ extern "C" {
  */
 void FasterHeavyBlockLift_Register() {
     REGISTER_VB_SHOULD(VB_PLAY_ONEPOINT_ACTOR_CS, {
-        Actor* actor = static_cast<Actor*>(opt);
+        Actor* actor = va_arg(args, Actor*);
 
         if (
             actor->id == ACTOR_BG_HEAVY_BLOCK && 
@@ -38,7 +38,7 @@ void FasterHeavyBlockLift_Register() {
         Player *player = GET_PLAYER(gPlayState);
         Actor* interactRangeActor = player->interactRangeActor;
         s32 interactActorId = interactRangeActor->id;
-        LinkAnimationHeader* anim = static_cast<LinkAnimationHeader*>(opt);
+        LinkAnimationHeader* anim = va_arg(args, LinkAnimationHeader*);
 
         // Same actor is used for small and large silver rocks, use actor params to identify large ones
         bool isLargeSilverRock = interactActorId == ACTOR_EN_ISHI && interactRangeActor->params & 1 == 1;
@@ -50,7 +50,7 @@ void FasterHeavyBlockLift_Register() {
 
     REGISTER_VB_SHOULD(VB_MOVE_THROWN_ACTOR, {
         if (CVarGetInteger(CVAR_ENHANCEMENT("FasterHeavyBlockLift"), 0)) {
-            Actor* heldActor = static_cast<Actor*>(opt);
+            Actor* heldActor = va_arg(args, Actor*);
 
             heldActor->shape.rot.x -= 3510;
         }
diff --git a/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipBlueWarp.cpp b/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipBlueWarp.cpp
index 27dc30ae9..748982843 100644
--- a/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipBlueWarp.cpp
+++ b/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipBlueWarp.cpp
@@ -17,7 +17,7 @@ extern "C" {
  * set the entrance index to where you would normally end up after the blue warp cutscene. This
  * should also account for the difference between your first and following visits to the blue warp.
  */
-void SkipBlueWarp_ShouldPlayTransitionCS(GIVanillaBehavior _, bool* should, void* opt) {
+void SkipBlueWarp_ShouldPlayTransitionCS(GIVanillaBehavior _, bool* should, va_list originalArgs) {
     if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
         uint8_t isBlueWarpCutscene = 0;
         // Deku Tree Blue warp
@@ -91,7 +91,7 @@ void SkipBlueWarp_ShouldPlayTransitionCS(GIVanillaBehavior _, bool* should, void
  * received the item when skipping the blue warp cutscene, so we'll prevent that and queue it up to be given 
  * to the player instead.
  */
-void SkipBlueWarp_ShouldGiveItem(GIVanillaBehavior _, bool* should, void* opt) {
+void SkipBlueWarp_ShouldGiveItem(GIVanillaBehavior _, bool* should, va_list originalArgs) {
     if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
         *should = false;
     }
@@ -108,7 +108,7 @@ void EnKo_MoveWhenReady(EnKo* enKo, PlayState* play) {
     func_80A995CC(enKo, play);
 
     if ((enKo->actor.params & 0xFF) == ENKO_TYPE_CHILD_3) {
-        if (GameInteractor_Should(VB_OPEN_KOKIRI_FOREST, CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD), NULL)) {
+        if (GameInteractor_Should(VB_OPEN_KOKIRI_FOREST, CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD))) {
             enKo->collider.dim.height -= 200;
             Path_CopyLastPoint(enKo->path, &enKo->actor.world.pos);
             enKo->actionFunc = func_80A99384;
@@ -132,7 +132,7 @@ void SkipBlueWarp_OnActorUpdate(void* actorPtr) {
  * This will ensure that the Deku Tree Sprout considers the Forest Temple finished when you skip the blue warp cutscene.
  * Typically this checks for if you have the medallion, and when skipping the cutscene at this point you don't have it yet.
  */
-void SkipBlueWarp_ShouldDekuJrConsiderForestTempleFinished(GIVanillaBehavior _, bool* should, void* opt) {
+void SkipBlueWarp_ShouldDekuJrConsiderForestTempleFinished(GIVanillaBehavior _, bool* should, va_list originalArgs) {
     if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
         if (gSaveContext.entranceIndex == ENTR_KOKIRI_FOREST_11 && gSaveContext.cutsceneIndex == 0xFFF1) {
             *should = Flags_GetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP);
diff --git a/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipDekuTreeIntro.cpp b/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipDekuTreeIntro.cpp
index bac84cb63..7000aa391 100644
--- a/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipDekuTreeIntro.cpp
+++ b/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipDekuTreeIntro.cpp
@@ -12,7 +12,7 @@ extern "C" {
 void SkipDekuTreeIntro_Register() {
     REGISTER_VB_SHOULD(VB_PLAY_DEKU_TREE_INTRO_CS, {
         if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
-            BgTreemouth* treeMouth = static_cast<BgTreemouth*>(opt);
+            BgTreemouth* treeMouth = va_arg(args, BgTreemouth*);
             Flags_SetEventChkInf(EVENTCHKINF_DEKU_TREE_OPENED_MOUTH);
             Audio_PlaySoundGeneral(NA_SE_EV_WOODDOOR_OPEN, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
             BgTreemouth_SetupAction(treeMouth, func_808BC6F8);
diff --git a/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipLostWoodsBridge.cpp b/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipLostWoodsBridge.cpp
index f447b7386..7fa7b99f6 100644
--- a/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipLostWoodsBridge.cpp
+++ b/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipLostWoodsBridge.cpp
@@ -17,7 +17,7 @@ void SkipLostWoodsBridge_Register() {
         if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
             if ((gSaveContext.entranceIndex == ENTR_LOST_WOODS_9) && !Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_SARIA_ON_BRIDGE)) {
                 Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_SARIA_ON_BRIDGE);
-                if (GameInteractor_Should(VB_GIVE_ITEM_FAIRY_OCARINA, true, NULL)) {
+                if (GameInteractor_Should(VB_GIVE_ITEM_FAIRY_OCARINA, true)) {
                     Item_Give(gPlayState, ITEM_OCARINA_FAIRY);
                 }
                 *should = false;
diff --git a/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipZeldaFleeingCastle.cpp b/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipZeldaFleeingCastle.cpp
index 48cc80aa7..fe578c831 100644
--- a/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipZeldaFleeingCastle.cpp
+++ b/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipZeldaFleeingCastle.cpp
@@ -8,7 +8,7 @@ extern "C" {
     extern SaveContext gSaveContext;
 }
 
-void SkipZeldaFleeingCastle_ShouldPlayTransitionCS(GIVanillaBehavior _, bool* should, void* opt) {
+void SkipZeldaFleeingCastle_ShouldPlayTransitionCS(GIVanillaBehavior _, bool* should, va_list originalArgs) {
     if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
         if (gSaveContext.entranceIndex == ENTR_HYRULE_FIELD_0 && gSaveContext.cutsceneIndex == 0xFFF1) {
             // Normally set in the cutscene
diff --git a/soh/soh/Enhancements/boss-rush/BossRush.cpp b/soh/soh/Enhancements/boss-rush/BossRush.cpp
index 51fd4db27..c83078581 100644
--- a/soh/soh/Enhancements/boss-rush/BossRush.cpp
+++ b/soh/soh/Enhancements/boss-rush/BossRush.cpp
@@ -509,7 +509,10 @@ static void* sSavePromptNoChoiceTexs[] = {
     (void*)gPauseNoFRATex
 };
 
-void BossRush_OnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void* optionalArg) {
+void BossRush_OnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_list originalArgs) {
+    va_list args;
+    va_copy(args, originalArgs);
+
     switch (id) {
         // Allow not healing before ganon
         case VB_GANON_HEAL_BEFORE_FIGHT: {
@@ -520,7 +523,7 @@ void BossRush_OnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
         }
         // Replace the blue warp transitions with ones that lead back to the chamber of sages
         case VB_BLUE_WARP_APPLY_ENTRANCE_AND_CUTSCENE: {
-            DoorWarp1* blueWarp = static_cast<DoorWarp1*>(optionalArg);
+            DoorWarp1* blueWarp = va_arg(args, DoorWarp1*);
             BossRush_HandleBlueWarp(gPlayState, blueWarp->actor.world.pos.x, blueWarp->actor.world.pos.z);
             *should = false;
             break;
@@ -529,7 +532,7 @@ void BossRush_OnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
         case VB_SPAWN_BLUE_WARP: {
             switch (gPlayState->sceneNum) {
                 case SCENE_DEKU_TREE_BOSS: {
-                    BossGoma* bossGoma = static_cast<BossGoma*>(optionalArg);
+                    BossGoma* bossGoma = va_arg(args, BossGoma*);
                     static Vec3f roomCenter = { -150.0f, 0.0f, -350.0f };
                     Vec3f childPos = roomCenter;
 
@@ -578,7 +581,7 @@ void BossRush_OnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
                     break;
                 }
                 case SCENE_WATER_TEMPLE_BOSS: {
-                    BossMo* bossMo = static_cast<BossMo*>(optionalArg);
+                    BossMo* bossMo = va_arg(args, BossMo*);
                     Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_DOOR_WARP1, bossMo->actor.world.pos.x, -280.0f, bossMo->actor.world.pos.z, 0, 0, 0, WARP_DUNGEON_ADULT, true);
                     break;
                 }
@@ -607,7 +610,7 @@ void BossRush_OnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
         }
         // Show "No" twice because the player can't continue.
         case VB_RENDER_YES_ON_CONTINUE_PROMPT: {
-            Gfx** disp = static_cast<Gfx**>(optionalArg);
+            Gfx** disp = va_arg(args, Gfx**);
             *disp = KaleidoScope_QuadTextureIA8(*disp, sSavePromptNoChoiceTexs[gSaveContext.language], 48, 16, 12);
             *should = false;
             break;
@@ -619,7 +622,7 @@ void BossRush_OnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
         }
         // Skip past the "Save?" window when dying and go to the "Continue?" screen immediately.
         case VB_TRANSITION_TO_SAVE_SCREEN_ON_DEATH: {
-            PauseContext* pauseCtx = static_cast<PauseContext*>(optionalArg);
+            PauseContext* pauseCtx = va_arg(args, PauseContext*);
             pauseCtx->state = 0xF;
             *should = false;
             break;
@@ -640,6 +643,8 @@ void BossRush_OnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             break;
         }
     }
+
+    va_end(args);
 }
 
 void BossRush_OnActorInitHandler(void* actorRef) {
@@ -708,4 +713,4 @@ void BossRush_RegisterHooks() {
         onBossDefeatHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnBossDefeat>(BossRush_OnBossDefeatHandler);
         onActorUpdate = GameInteractor::Instance->RegisterGameHookForID<GameInteractor::OnActorUpdate>(ACTOR_DOOR_WARP1, BossRush_OnBlueWarpUpdate);
     });
-}
\ No newline at end of file
+}
diff --git a/soh/soh/Enhancements/cheat_hook_handlers.cpp b/soh/soh/Enhancements/cheat_hook_handlers.cpp
index a5a1a0d5a..ef69d6174 100644
--- a/soh/soh/Enhancements/cheat_hook_handlers.cpp
+++ b/soh/soh/Enhancements/cheat_hook_handlers.cpp
@@ -12,7 +12,7 @@ extern SaveContext gSaveContext;
 extern PlayState* gPlayState;
 }
 
-void CheatsOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void* opt) {
+void CheatsOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_list originalArgs) {
     switch (id) {
         case VB_DEKU_STICK_BREAK: {
             if (CVarGetInteger(CVAR_CHEAT("DekuStickCheat"), DEKU_STICK_NORMAL) != DEKU_STICK_NORMAL) {
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h
index 57fc9cf35..5e30441db 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h
@@ -511,6 +511,7 @@ void GameInteractor_SetTriforceHuntCreditsWarpActive(uint8_t state);
 
 
 #ifdef __cplusplus
+#include <stdarg.h>
 #include <thread>
 #include <unordered_map>
 #include <vector>
@@ -565,8 +566,14 @@ struct HookInfo {
 #define GET_CURRENT_REGISTERING_INFO(type) HookRegisteringInfo{}
 #endif
 
-#define REGISTER_VB_SHOULD(flag, body) \
-    GameInteractor::Instance->RegisterGameHookForID<GameInteractor::OnVanillaBehavior>(flag, [](GIVanillaBehavior _, bool* should, void* opt) body)
+#define REGISTER_VB_SHOULD(flag, body)                                                      \
+    GameInteractor::Instance->RegisterGameHookForID<GameInteractor::OnVanillaBehavior>( \
+        flag, [](GIVanillaBehavior _, bool* should, va_list _originalArgs) {                 \
+            va_list args;                                                                   \
+            va_copy(args, _originalArgs);                                                    \
+            body;                                                                           \
+            va_end(args);                                                                   \
+        })
 
 class GameInteractor {
 public:
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor_HookTable.h b/soh/soh/Enhancements/game-interactor/GameInteractor_HookTable.h
index 5669da661..46f306a3c 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor_HookTable.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor_HookTable.h
@@ -28,7 +28,7 @@ DEFINE_HOOK(OnBossDefeat, (void* actor));
 DEFINE_HOOK(OnPlayerBonk, ());
 DEFINE_HOOK(OnPlayDestroy, ());
 DEFINE_HOOK(OnPlayDrawEnd, ());
-DEFINE_HOOK(OnVanillaBehavior, (GIVanillaBehavior flag, bool* result, void* opt));
+DEFINE_HOOK(OnVanillaBehavior, (GIVanillaBehavior flag, bool* result, va_list originalArgs));
 DEFINE_HOOK(OnSaveFile, (int32_t fileNum));
 DEFINE_HOOK(OnLoadFile, (int32_t fileNum));
 DEFINE_HOOK(OnDeleteFile, (int32_t fileNum));
@@ -55,4 +55,4 @@ DEFINE_HOOK(OnUpdateFileNameSelection, (int16_t charCode));
 DEFINE_HOOK(OnSetGameLanguage, ());
 DEFINE_HOOK(OnFileDropped, (std::string filePath));
 DEFINE_HOOK(OnAssetAltChange, ());
-DEFINE_HOOK(OnKaleidoUpdate, ());
\ No newline at end of file
+DEFINE_HOOK(OnKaleidoUpdate, ());
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp
index 49724b66c..24efb40c1 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp
@@ -119,14 +119,25 @@ void GameInteractor_ExecuteOnPlayDrawEnd() {
     GameInteractor::Instance->ExecuteHooks<GameInteractor::OnPlayDrawEnd>();
 }
 
-bool GameInteractor_Should(GIVanillaBehavior flag, bool result, void* opt) {
-    GameInteractor::Instance->ExecuteHooks<GameInteractor::OnVanillaBehavior>(flag, &result, opt);
-    GameInteractor::Instance->ExecuteHooksForID<GameInteractor::OnVanillaBehavior>(flag, flag, &result, opt);
-    if (opt != nullptr) {
-        GameInteractor::Instance->ExecuteHooksForPtr<GameInteractor::OnVanillaBehavior>((uintptr_t)opt, flag, &result, opt);
-    }
-    GameInteractor::Instance->ExecuteHooksForFilter<GameInteractor::OnVanillaBehavior>(flag, &result, opt);
-    return result;
+bool GameInteractor_Should(GIVanillaBehavior flag, u32 result, ...) {
+    // Only the external function can use the Variadic Function syntax
+    // To pass the va args to the next caller must be done using va_list and reading the args into it
+    // Because there can be N subscribers registered to each template call, the subscribers will be responsible for
+    // creating a copy of this va_list to avoid incrementing the original pointer between calls
+    va_list args;
+    va_start(args, result);
+
+    // Because of default argument promotion, even though our incoming "result" is just a bool, it needs to be typed as
+    // an int to be permitted to be used in `va_start`, otherwise it is undefined behavior.
+    // Here we downcast back to a bool for our actual hook handlers
+    bool boolResult = static_cast<bool>(result);
+
+    GameInteractor::Instance->ExecuteHooks<GameInteractor::OnVanillaBehavior>(flag, &boolResult, args);
+    GameInteractor::Instance->ExecuteHooksForID<GameInteractor::OnVanillaBehavior>(flag, flag, &boolResult, args);
+    GameInteractor::Instance->ExecuteHooksForFilter<GameInteractor::OnVanillaBehavior>(flag, &boolResult, args);
+
+    va_end(args);
+    return boolResult;
 }
 
 // MARK: -  Save Files
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h
index e1cba237d..dccc9930a 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h
@@ -1,4 +1,5 @@
 #include "GameInteractor.h"
+#include <stdarg.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -28,7 +29,7 @@ void GameInteractor_ExecuteOnOcarinaSongAction();
 void GameInteractor_ExecuteOnShopSlotChangeHooks(uint8_t cursorIndex, int16_t price);
 void GameInteractor_ExecuteOnPlayDestroy();
 void GameInteractor_ExecuteOnPlayDrawEnd();
-bool GameInteractor_Should(GIVanillaBehavior flag, bool result, void* opt);
+bool GameInteractor_Should(GIVanillaBehavior flag, uint32_t result, ...);
 
 // MARK: -  Save Files
 void GameInteractor_ExecuteOnSaveFile(int32_t fileNum);
diff --git a/soh/soh/Enhancements/randomizer/fishsanity.cpp b/soh/soh/Enhancements/randomizer/fishsanity.cpp
index b69cec82b..5fa2974ae 100644
--- a/soh/soh/Enhancements/randomizer/fishsanity.cpp
+++ b/soh/soh/Enhancements/randomizer/fishsanity.cpp
@@ -465,10 +465,15 @@ namespace Rando {
         }
     }
 
-    void Fishsanity::OnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void* refActor) {
-        Actor* actor = static_cast<Actor*>(refActor);
+    void Fishsanity::OnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_list originalArgs) {
+        va_list args;
+        va_copy(args, originalArgs);
+
+        Actor* actor = va_arg(args, Actor*);
         auto fs = OTRGlobals::Instance->gRandoContext->GetFishsanity();
 
+        va_end(args);
+
         if (id == VB_BOTTLE_ACTOR && actor->id == ACTOR_EN_FISH && fs->GetOverworldFishShuffled()) {
             FishIdentity fish = OTRGlobals::Instance->gRandomizer->IdentifyFish(gPlayState->sceneNum, actor->params);
             if (fish.randomizerCheck != RC_UNKNOWN_CHECK && !Flags_GetRandomizerInf(fish.randomizerInf)) {
@@ -577,4 +582,4 @@ extern "C" {
         gSPGrayscale(POLY_OPA_DISP++, false);
         CLOSE_DISPS(play->state.gfxCtx);
     }
-}
\ No newline at end of file
+}
diff --git a/soh/soh/Enhancements/randomizer/fishsanity.h b/soh/soh/Enhancements/randomizer/fishsanity.h
index a8a8291f0..c98e9ab9c 100644
--- a/soh/soh/Enhancements/randomizer/fishsanity.h
+++ b/soh/soh/Enhancements/randomizer/fishsanity.h
@@ -156,7 +156,7 @@ class Fishsanity {
     /**
      * @brief VB hook handler for fishsanity
     */
-    static void OnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void* refActor);
+    static void OnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_list originalArgs);
 
   private:
     /**
@@ -226,4 +226,4 @@ void Fishsanity_CloseGreyscaleColor(PlayState* play);
 }
 #endif
 
-#endif // FISHSANITY_H
\ No newline at end of file
+#endif // FISHSANITY_H
diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index c71f1965c..b03b5a3c8 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -608,7 +608,6 @@ void func_8083A434_override(PlayState* play, Player* player) {
     player->stateFlags1 |= PLAYER_STATE1_GETTING_ITEM | PLAYER_STATE1_IN_CUTSCENE;
 }
 
-
 bool ShouldGiveFishingPrize(f32 sFishOnHandLength){
     // RANDOTODO: update the enhancement sliders to not allow
     // values above rando fish weight values when rando'd
@@ -624,7 +623,10 @@ bool ShouldGiveFishingPrize(f32 sFishOnHandLength){
     }
 }
 
-void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void* optionalArg) {
+void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_list originalArgs) {
+    va_list args;
+    va_copy(args, originalArgs);
+
     switch (id) {
         case VB_PLAY_SLOW_CHEST_CS: {
             // We force fast chests if SkipGetItemAnimation is enabled because the camera in the CS looks pretty wonky otherwise
@@ -634,7 +636,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             break;
         }
         case VB_GIVE_ITEM_FROM_CHEST: {
-            EnBox* chest = static_cast<EnBox*>(optionalArg);
+            EnBox* chest = va_arg(args, EnBox*);
             RandomizerCheck rc = OTRGlobals::Instance->gRandomizer->GetCheckFromActor(chest->dyna.actor.id, gPlayState->sceneNum, chest->dyna.actor.params);
             
             // if this is a treasure chest game chest then set the appropriate rando inf
@@ -717,7 +719,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             }
             break;
         case VB_ITEM00_DESPAWN: {
-            EnItem00* item00 = static_cast<EnItem00*>(optionalArg);
+            EnItem00* item00 = va_arg(args, EnItem00*);
             if (item00->actor.params == ITEM00_HEART_PIECE || item00->actor.params == ITEM00_SMALL_KEY) {
                 RandomizerCheck rc = OTRGlobals::Instance->gRandomizer->GetCheckFromActor(item00->actor.id, gPlayState->sceneNum, item00->ogParams);
                 if (rc != RC_UNKNOWN_CHECK) {
@@ -734,7 +736,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             break;
         }
         case VB_ITEM_B_HEART_DESPAWN: {
-            ItemBHeart* itemBHeart = static_cast<ItemBHeart*>(optionalArg);
+            ItemBHeart* itemBHeart = va_arg(args, ItemBHeart*);
             RandomizerCheck rc = OTRGlobals::Instance->gRandomizer->GetCheckFromActor(itemBHeart->actor.id, gPlayState->sceneNum, itemBHeart->actor.params);
             if (rc != RC_UNKNOWN_CHECK) {
                 itemBHeart->sohItemEntry = Rando::Context::GetInstance()->GetFinalGIEntry(rc, true, (GetItemID)Rando::StaticData::GetLocation(rc)->GetVanillaItem());
@@ -749,7 +751,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             break;
         }
         case VB_SET_CUCCO_COUNT: {
-            EnNiwLady* enNiwLady = static_cast<EnNiwLady*>(optionalArg);
+            EnNiwLady* enNiwLady = va_arg(args, EnNiwLady*);
             // Override starting Cucco count using setting value
             enNiwLady->cuccosInPen = 7 - RAND_GET_OPTION(RSK_CUCCO_COUNT);
             *should = false;
@@ -811,7 +813,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             break;
         }
         case VB_GIVE_ITEM_FROM_ITEM_00: {
-            EnItem00* item00 = static_cast<EnItem00*>(optionalArg);
+            EnItem00* item00 = va_arg(args, EnItem00*);
             if (item00->actor.params == ITEM00_SOH_DUMMY) {
                 if (item00->randoInf != RAND_INF_MAX) {
                     Flags_SetRandomizerInf(item00->randoInf);
@@ -856,7 +858,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             if (!RAND_GET_OPTION(RSK_SHUFFLE_COWS)) {
                 break;
             }
-            EnCow* enCow = static_cast<EnCow*>(optionalArg);
+            EnCow* enCow = va_arg(args, EnCow*);
             CowIdentity cowIdentity = OTRGlobals::Instance->gRandomizer->IdentifyCow(gPlayState->sceneNum, enCow->actor.world.pos.x, enCow->actor.world.pos.z);
             // Has this cow already rewarded an item?
             if (Flags_GetRandomizerInf(cowIdentity.randomizerInf)) {
@@ -873,7 +875,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             if (!EnDs_RandoCanGetGrannyItem()) {
                 break;
             }
-            EnDs* granny = static_cast<EnDs*>(optionalArg);
+            EnDs* granny = va_arg(args, EnDs*);
             // Only setting the inf if we've actually gotten the rando item and not the vanilla blue potion
             Flags_SetRandomizerInf(RAND_INF_MERCHANTS_GRANNYS_SHOP);
             granny->actor.parent = NULL;
@@ -882,7 +884,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             break;
         }
         case VB_GIVE_ITEM_FROM_THAWING_KING_ZORA: {
-            EnKz* enKz = static_cast<EnKz*>(optionalArg);
+            EnKz* enKz = va_arg(args, EnKz*);
             // If we aren't setting up the item offer, then we're just checking if it should be possible.
             if (enKz->actionFunc != (EnKzActionFunc)EnKz_SetupGetItem) {
                 // Always give the reward in rando
@@ -909,7 +911,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             break;
         }
         case VB_GIVE_ITEM_FROM_CARPET_SALESMAN: {
-            EnJs* enJs = static_cast<EnJs*>(optionalArg);
+            EnJs* enJs = va_arg(args, EnJs*);
             if (EnJs_RandoCanGetCarpetMerchantItem()){
                 Rupees_ChangeBy(OTRGlobals::Instance->gRandoContext->GetItemLocation(RC_WASTELAND_BOMBCHU_SALESMAN)->GetPrice() * -1);
                 enJs->actor.parent = NULL;
@@ -937,7 +939,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
         case VB_BE_ELIGIBLE_FOR_GIANTS_KNIFE_PURCHASE:
             if (EnGm_RandoCanGetMedigoronItem()) {
                 if (id == VB_GIVE_ITEM_FROM_MEDIGORON) {
-                    EnGm* enGm = static_cast<EnGm*>(optionalArg);
+                    EnGm* enGm = va_arg(args, EnGm*);
                     Flags_SetInfTable(INFTABLE_B1);
                     Flags_SetRandomizerInf(RAND_INF_MERCHANTS_MEDIGORON);
                     enGm->actor.parent = NULL;
@@ -953,7 +955,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             break;
         }
         case VB_GIVE_ITEM_FROM_MAGIC_BEAN_SALESMAN: {
-            EnMs* enMs = static_cast<EnMs*>(optionalArg);
+            EnMs* enMs = va_arg(args, EnMs*);
             if (RAND_GET_OPTION(RSK_SHUFFLE_MERCHANTS) == RO_SHUFFLE_MERCHANTS_BEANS_ONLY ||
                 RAND_GET_OPTION(RSK_SHUFFLE_MERCHANTS) == RO_SHUFFLE_MERCHANTS_ALL) {
                 Rupees_ChangeBy(OTRGlobals::Instance->gRandoContext->GetItemLocation(RC_ZR_MAGIC_BEAN_SALESMAN)->GetPrice() * -1);
@@ -966,7 +968,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             break;
         }
         case VB_GIVE_ITEM_FROM_FROGS: {
-            EnFr* enFr = static_cast<EnFr*>(optionalArg);
+            EnFr* enFr = va_arg(args, EnFr*);
 
             // Skip GiveReward+SetIdle action func if the reward is an ice trap
             if (enFr->actionFunc == (EnFrActionFunc)EnFr_GiveReward) {
@@ -993,7 +995,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             break;
         }
         case VB_TRADE_ODD_MUSHROOM: {
-            EnDs* granny = static_cast<EnDs*>(optionalArg);
+            EnDs* granny = va_arg(args, EnDs*);
             Randomizer_ConsumeAdultTradeItem(gPlayState, ITEM_ODD_MUSHROOM);
             // Trigger the reward now
             Flags_SetItemGetInf(ITEMGETINF_30);
@@ -1004,7 +1006,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             break;
         }
         case VB_TRADE_ODD_POTION: {
-            EnKo* enKo = static_cast<EnKo*>(optionalArg);
+            EnKo* enKo = va_arg(args, EnKo*);
             Randomizer_ConsumeAdultTradeItem(gPlayState, ITEM_ODD_POTION);
             // Trigger the reward now
             Flags_SetItemGetInf(ITEMGETINF_31);
@@ -1017,7 +1019,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             break;
         }
         case VB_TRADE_PRESCRIPTION: {
-            EnKz* enKz = static_cast<EnKz*>(optionalArg);
+            EnKz* enKz = va_arg(args, EnKz*);
             // If we aren't setting up the item offer, then we're just checking if it should be possible.
             if (enKz->actionFunc != (EnKzActionFunc)EnKz_SetupGetItem) {
                 *should = !Flags_GetRandomizerInf(RAND_INF_ADULT_TRADES_ZD_TRADE_PRESCRIPTION);
@@ -1036,13 +1038,13 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             if (!RAND_GET_OPTION(RSK_SHUFFLE_COWS)) {
                 break;
             }
-            EnCow* enCow = static_cast<EnCow*>(optionalArg);
+            EnCow* enCow = va_arg(args, EnCow*);
             // If this is a cow we have to move, then move it now.
             EnCow_MoveForRandomizer(enCow, gPlayState);
             break;
         }
         case VB_BUSINESS_SCRUB_DESPAWN: {
-            EnShopnuts* enShopnuts = static_cast<EnShopnuts*>(optionalArg);
+            EnShopnuts* enShopnuts = va_arg(args, EnShopnuts*);
             s16 respawnData = gSaveContext.respawn[RESPAWN_MODE_RETURN].data & ((1 << 8) - 1);
             ScrubIdentity scrubIdentity = OTRGlobals::Instance->gRandomizer->IdentifyScrub(gPlayState->sceneNum, enShopnuts->actor.params, respawnData);
 
@@ -1052,7 +1054,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             break;
         }
         case VB_GIVE_ITEM_FROM_BUSINESS_SCRUB: {
-            EnDns* enDns = static_cast<EnDns*>(optionalArg);
+            EnDns* enDns = va_arg(args, EnDns*);
             *should = !enDns->sohScrubIdentity.isShuffled;
             break;
         }
@@ -1089,7 +1091,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
         }
         case VB_USE_EYEDROP_DIALOGUE: {
             // Skip eye drop text on rando if Link went in the water, so you can still receive the dive check
-            EnMk* enMk = static_cast<EnMk*>(optionalArg);
+            EnMk* enMk = va_arg(args, EnMk*);
             *should &= enMk->swimFlag == 0;
             break;
         }
@@ -1117,7 +1119,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             break;
         }
         case VB_GIVE_ITEM_FROM_SHOOTING_GALLERY: {
-            EnSyatekiMan* enSyatekiMan = static_cast<EnSyatekiMan*>(optionalArg);
+            EnSyatekiMan* enSyatekiMan = va_arg(args, EnSyatekiMan*);
             enSyatekiMan->getItemId = GI_RUPEE_PURPLE;
             if (LINK_IS_ADULT) {
                 // Give purple rupee if we've already obtained the reward OR we don't have a bow
@@ -1159,7 +1161,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             // in that array is GI_RUPEE_GOLD, and the reward is picked in EnSth_GivePlayerItem
             // via sGetItemIds[this->actor.params]. This means if actor.params == 0 we're looking
             // at the 100 GS reward
-            EnSth* enSth = static_cast<EnSth*>(optionalArg);
+            EnSth* enSth = va_arg(args, EnSth*);
             if (enSth->actor.params == 0) {
                 // if nothing is shuffled onto 100 GS,
                 // or we already got the 100 GS reward,
@@ -1182,14 +1184,14 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             break;
         }
         case VB_GIVE_ITEM_FROM_OCARINA_MEMORY_GAME: {
-            EnSkj* enSkj = static_cast<EnSkj*>(optionalArg);
+            EnSkj* enSkj = va_arg(args, EnSkj*);
             Flags_SetItemGetInf(ITEMGETINF_17);
             enSkj->actionFunc = (EnSkjActionFunc)EnSkj_CleanupOcarinaGame;
             *should = false;
             break;
         }
         case VB_GIVE_ITEM_FROM_LOST_DOG: {
-            EnHy* enHy = static_cast<EnHy*>(optionalArg);
+            EnHy* enHy = va_arg(args, EnHy*);
             Flags_SetInfTable(INFTABLE_191);
             gSaveContext.dogParams = 0;
             gSaveContext.dogIsLost = false;
@@ -1198,7 +1200,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             break;
         }
         case VB_GIVE_ITEM_FROM_BOMBCHU_BOWLING: {
-            EnBomBowlPit* enBomBowlPit = static_cast<EnBomBowlPit*>(optionalArg);
+            EnBomBowlPit* enBomBowlPit = va_arg(args, EnBomBowlPit*);
             if (enBomBowlPit->prizeIndex == EXITEM_BOMB_BAG_BOWLING || enBomBowlPit->prizeIndex == EXITEM_HEART_PIECE_BOWLING) {
                 *should = false;
             }
@@ -1233,7 +1235,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             break;
         }
         case VB_DRAW_AMMO_COUNT: {
-            s16 item = *static_cast<s16*>(optionalArg);
+            s16 item = *va_arg(args, s16*);
             // don't draw ammo count if you have the infinite upgrade
             if (
                 (item == ITEM_NUT && Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_NUT_UPGRADE)) ||
@@ -1283,7 +1285,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
         case VB_SKIP_SCARECROWS_SONG: {
             int ocarinaButtonCount = 0;
             for (int i = VB_HAVE_OCARINA_NOTE_D4; i <= VB_HAVE_OCARINA_NOTE_A4; i++) {
-                if (GameInteractor_Should((GIVanillaBehavior)i, true, NULL)) {
+                if (GameInteractor_Should((GIVanillaBehavior)i, true)) {
                     ocarinaButtonCount++;
                 }
             }
@@ -1324,12 +1326,12 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             break;
         }
         case VB_SHOULD_CHECK_FOR_FISHING_RECORD: {
-            f32 sFishOnHandLength = *static_cast<f32*>(optionalArg);
+            f32 sFishOnHandLength = *va_arg(args, f32*);
             *should = *should || ShouldGiveFishingPrize(sFishOnHandLength);
             break;
         }
         case VB_SHOULD_SET_FISHING_RECORD: {
-            VBFishingData* fishData = static_cast<VBFishingData*>(optionalArg);
+            VBFishingData* fishData = va_arg(args, VBFishingData*);
             *should = (s16)fishData->sFishingRecordLength < (s16)fishData->fishWeight;
             if (!*should){
                 *fishData->sFishOnHandLength = 0.0f;
@@ -1337,13 +1339,13 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
             break;
         }
         case VB_SHOULD_GIVE_VANILLA_FISHING_PRIZE: {
-            VBFishingData* fishData = static_cast<VBFishingData*>(optionalArg);
+            VBFishingData* fishData = va_arg(args, VBFishingData*);
             *should = !IS_RANDO && ShouldGiveFishingPrize(fishData->fishWeight);
             break;
         }
         case VB_GIVE_RANDO_FISHING_PRIZE: {
             if (IS_RANDO){
-                VBFishingData* fishData = static_cast<VBFishingData*>(optionalArg);
+                VBFishingData* fishData = va_arg(args, VBFishingData*);
                 if (*fishData->sFishOnHandIsLoach) {
                     if (!Flags_GetRandomizerInf(RAND_INF_CAUGHT_LOACH) &&
                         OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_FISHSANITY) == RO_FISHSANITY_HYRULE_LOACH){
@@ -1402,6 +1404,8 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void
         default:
             break;
     }
+
+    va_end(args);
 }
 
 void RandomizerOnSceneInitHandler(int16_t sceneNum) {
@@ -1459,7 +1463,7 @@ void RandomizerOnSceneInitHandler(int16_t sceneNum) {
         }
 
         // We're always in rando here, and rando always overrides this should so we can just pass false
-        if (GameInteractor_Should(VB_BE_ELIGIBLE_FOR_LIGHT_ARROWS, false, NULL)) {
+        if (GameInteractor_Should(VB_BE_ELIGIBLE_FOR_LIGHT_ARROWS, false)) {
             Flags_SetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS);
         }
 
diff --git a/soh/soh/Enhancements/timesaver_hook_handlers.cpp b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
index ec56b95cc..bc6eb9ca5 100644
--- a/soh/soh/Enhancements/timesaver_hook_handlers.cpp
+++ b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
@@ -107,7 +107,10 @@ void TimeSaverOnGameFrameUpdateHandler() {
     }
 }
 
-void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void* opt) {
+void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_list originalArgs) {
+    va_list args;
+    va_copy(args, originalArgs);
+
     switch (id) {
         case VB_PLAY_TRANSITION_CS: {
             if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.LearnSong"), IS_RANDO) || IS_RANDO) {
@@ -124,7 +127,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
                     Flags_SetEventChkInf(EVENTCHKINF_LEARNED_REQUIEM_OF_SPIRIT);
                     // Normally happens in the cutscene
                     gSaveContext.dayTime = gSaveContext.skyboxTime = 0xAC60;
-                    if (GameInteractor_Should(VB_GIVE_ITEM_REQUIEM_OF_SPIRIT, true, NULL)) {
+                    if (GameInteractor_Should(VB_GIVE_ITEM_REQUIEM_OF_SPIRIT, true)) {
                         Item_Give(gPlayState, ITEM_SONG_REQUIEM);
                     }
                     *should = false;
@@ -137,11 +140,11 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
                     Flags_GetEventChkInf(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP) &&
                     Flags_GetEventChkInf(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP) &&
                     !Flags_GetEventChkInf(EVENTCHKINF_BONGO_BONGO_ESCAPED_FROM_WELL);
-                if (GameInteractor_Should(VB_BE_ELIGIBLE_FOR_NOCTURNE_OF_SHADOW, meetsBurningKakRequirements, NULL)) {
+                if (GameInteractor_Should(VB_BE_ELIGIBLE_FOR_NOCTURNE_OF_SHADOW, meetsBurningKakRequirements)) {
                     Flags_SetEventChkInf(EVENTCHKINF_BONGO_BONGO_ESCAPED_FROM_WELL);
                     // Normally happens in the cutscene
                     Flags_SetEventChkInf(EVENTCHKINF_LEARNED_NOCTURNE_OF_SHADOW);
-                    if (GameInteractor_Should(VB_GIVE_ITEM_NOCTURNE_OF_SHADOW, true, NULL)) {
+                    if (GameInteractor_Should(VB_GIVE_ITEM_NOCTURNE_OF_SHADOW, true)) {
                         Item_Give(gPlayState, ITEM_SONG_NOCTURNE);
                     }
                     *should = false;
@@ -156,9 +159,9 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
                     CHECK_QUEST_ITEM(QUEST_MEDALLION_SPIRIT) &&
                     CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW) &&
                     !Flags_GetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS);
-                if (GameInteractor_Should(VB_BE_ELIGIBLE_FOR_LIGHT_ARROWS, meetsLACSRequirements, NULL)) {
+                if (GameInteractor_Should(VB_BE_ELIGIBLE_FOR_LIGHT_ARROWS, meetsLACSRequirements)) {
                     Flags_SetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS);
-                    if (GameInteractor_Should(VB_GIVE_ITEM_LIGHT_ARROW, true, NULL)) {
+                    if (GameInteractor_Should(VB_GIVE_ITEM_LIGHT_ARROW, true)) {
                         Item_Give(gPlayState, ITEM_ARROW_LIGHT);
                     }
                     *should = false;
@@ -182,7 +185,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             break;
         }
         case VB_PLAY_ENTRANCE_CS: {
-            s32* entranceFlag = static_cast<s32*>(opt);
+            s32* entranceFlag = va_arg(args, s32*);
             if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Entrances"), IS_RANDO) && (*entranceFlag != EVENTCHKINF_EPONA_OBTAINED)) {
                 *should = false;
             }
@@ -190,7 +193,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
         }
         case VB_PLAY_ONEPOINT_CS: {
             if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.OnePoint"), IS_RANDO)) {
-                s16* csId = static_cast<s16*>(opt);
+                s16* csId = va_arg(args, s16*);
                 switch (*csId) {
                     case 4180:
                     case 4100:
@@ -206,7 +209,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
         }
         case VB_PLAY_ONEPOINT_ACTOR_CS: {
             if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.OnePoint"), IS_RANDO)) {
-                Actor* actor = static_cast<Actor*>(opt);
+                Actor* actor = va_arg(args, Actor*);
 
                 // there are a few checks throughout the game (such as chest spawns) that rely on this
                 // the checks are for func_8005B198() == this->dyna.actor.category
@@ -217,7 +220,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
                 switch (actor->category) {
                     case ACTORCAT_BG:
                         if (actor->id == ACTOR_BG_DDAN_KD) {
-                            BgDdanKd* ddanKd = static_cast<BgDdanKd*>(opt);
+                            BgDdanKd* ddanKd = (BgDdanKd*)actor;
                             Flags_SetSwitch(gPlayState, ddanKd->dyna.actor.params);
                         }
                         if (actor->id == ACTOR_BG_MORI_HINERI) {
@@ -234,7 +237,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
                 }
                 switch (actor->id) {
                     case ACTOR_OBJ_SWITCH: {
-                        ObjSwitch *switchActor = static_cast<ObjSwitch*>(opt);
+                        ObjSwitch *switchActor = (ObjSwitch*)actor;
                         switchActor->cooldownTimer = 0;
                         *should = false;
                         RateLimitedSuccessChime();
@@ -247,7 +250,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
                         if (actor->params == 14848 && gPlayState->sceneNum == SCENE_JABU_JABU && !CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.GlitchAiding"), 0)){
                             break;
                         }
-                        BgBdanSwitch* switchActor = static_cast<BgBdanSwitch*>(opt);
+                        BgBdanSwitch* switchActor = (BgBdanSwitch*)actor;
                         switchActor->unk_1D8 = 0;
                         switchActor->unk_1DA = 0;
                         *should = false;
@@ -255,7 +258,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
                         break;
                     }
                     case ACTOR_BG_HIDAN_KOUSI: {
-                        BgHidanKousi* switchActor = static_cast<BgHidanKousi*>(opt);
+                        BgHidanKousi* switchActor = (BgHidanKousi*)actor;
                         BgHidanKousi_SetupAction(switchActor, func_80889C18);
                         *should = false;
                         RateLimitedSuccessChime();
@@ -316,7 +319,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
         }
         case VB_NAVI_TALK: {
             if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.NoForcedDialog"), IS_RANDO)) {
-                ElfMsg* naviTalk = static_cast<ElfMsg*>(opt);
+                ElfMsg* naviTalk = va_arg(args, ElfMsg*);
                 if (((naviTalk->actor.params >> 8) & 0x3F) != 0x3F) {
                     Flags_SetSwitch(gPlayState, (naviTalk->actor.params >> 8) & 0x3F);
                     Actor_Kill(&naviTalk->actor);
@@ -351,7 +354,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
                     Flags_SetEventChkInf(EVENTCHKINF_ENTERED_MASTER_SWORD_CHAMBER);
                     Flags_SetEventChkInf(EVENTCHKINF_SHEIK_SPAWNED_AT_MASTER_SWORD_PEDESTAL);
                     Flags_SetEventChkInf(EVENTCHKINF_TIME_TRAVELED_TO_ADULT);
-                    if (GameInteractor_Should(VB_GIVE_ITEM_LIGHT_MEDALLION, true, NULL)) {
+                    if (GameInteractor_Should(VB_GIVE_ITEM_LIGHT_MEDALLION, true)) {
                         Item_Give(gPlayState, ITEM_MEDALLION_LIGHT);
                     }
                 }
@@ -360,7 +363,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             break;
         case VB_OWL_INTERACTION: {
             if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipOwlInteractions"), IS_RANDO) && *should) {
-                EnOwl* enOwl = static_cast<EnOwl*>(opt);
+                EnOwl* enOwl = va_arg(args, EnOwl*);
                 s32 owlType = (enOwl->actor.params & 0xFC0) >> 6;
 
                 if (((enOwl->actor.params & 0xFC0) >> 6) == 1) {
@@ -374,7 +377,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
         }
         case VB_OVERRIDE_LINK_THE_GORON_DIALOGUE: {
             if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO)) {
-                u16* textId = static_cast<u16*>(opt);
+                u16* textId = va_arg(args, u16*);
                 // If the doors are not open yet, prioritize opening them
                 if (!Flags_GetInfTable(INFTABLE_GORON_CITY_DOORS_UNLOCKED)) {
                     *textId = 0x3036;
@@ -393,7 +396,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             break;
         case VB_PLAY_ZELDAS_LULLABY_CS: {
             if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.LearnSong"), IS_RANDO) || IS_RANDO) {
-                DemoIm* demoIm = static_cast<DemoIm*>(opt);
+                DemoIm* demoIm = va_arg(args, DemoIm*);
                 Player* player = GET_PLAYER(gPlayState);
                 player->stateFlags1 |= PLAYER_STATE1_IN_CUTSCENE;
                 player->stateFlags1 |= PLAYER_STATE1_GETTING_ITEM;
@@ -443,7 +446,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
         }
         case VB_PLAY_SARIAS_SONG_CS: {
             if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.LearnSong"), IS_RANDO) || IS_RANDO) {
-                EnSa* enSa = static_cast<EnSa*>(opt);
+                EnSa* enSa = va_arg(args, EnSa*);
                 enSa->actionFunc = func_80AF6B20;
                 *should = false;
             }
@@ -520,14 +523,14 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             break;
         case VB_BE_VALID_GRAVEDIGGING_SPOT:
             if (CVarGetInteger(CVAR_ENHANCEMENT("DampeWin"), 0)) {
-                EnTk *enTk = static_cast<EnTk*>(opt);
+                EnTk *enTk = va_arg(args, EnTk*);
                 enTk->validDigHere = true;
                 *should = true;
             }
             break;
         case VB_BE_DAMPE_GRAVEDIGGING_GRAND_PRIZE:
             if (CVarGetInteger(CVAR_ENHANCEMENT("DampeWin"), 0)) {
-                EnTk *enTk = static_cast<EnTk*>(opt);
+                EnTk *enTk = va_arg(args, EnTk*);
                 enTk->currentReward = 3;
                 *should = true;
             }
@@ -546,7 +549,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             *should = Environment_GetBgsDayCount() >= CVarGetInteger(CVAR_ENHANCEMENT("ForgeTime"), 3);
             break;
         case VB_BE_ELIGIBLE_FOR_GREAT_FAIRY_REWARD: {
-            BgDyYoseizo* bgDyYoseizo = static_cast<BgDyYoseizo*>(opt);
+            BgDyYoseizo* bgDyYoseizo = va_arg(args, BgDyYoseizo*);
             RandomizerInf flag = RAND_INF_MAX;
 
             if (gPlayState->sceneNum == SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS) {
@@ -596,7 +599,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
         case VB_PHANTOM_GANON_DEATH_SCENE: {
             if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.QuickBossDeaths"), IS_RANDO || IS_BOSS_RUSH)) {
                 *should = false;
-                BossGanondrof* pg = static_cast<BossGanondrof*>(opt);
+                BossGanondrof* pg = va_arg(args, BossGanondrof*);
                 Player* player = GET_PLAYER(gPlayState);
                 if (pg != nullptr && pg->work[GND_ACTION_STATE] == DEATH_SPASM) {
                     // Skip to death scream animation and move ganondrof to middle
@@ -619,7 +622,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             break;
         }
         case VB_NABOORU_KNUCKLE_DEATH_SCENE: {
-            EnIk* ik = static_cast<EnIk*>(opt);
+            EnIk* ik = va_arg(args, EnIk*);
             if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.QuickBossDeaths"), IS_RANDO)) {
                 // Because no CS in rando, we hide the death of the knuckle by spawning flames and kill the actor
                 if ((ik->actor.colChkInfo.health <= 10)) {
@@ -645,7 +648,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             if (CVarGetInteger(CVAR_ENHANCEMENT("FastChests"), 0)) {
                 *should = false;
             } else if (CVarGetInteger(CVAR_ENHANCEMENT("ChestSizeAndTextureMatchContents"), CSMC_DISABLED) && *should) {
-                EnBox* enBox = static_cast<EnBox*>(opt);
+                EnBox* enBox = va_arg(args, EnBox*);
                 *should = enBox->dyna.actor.scale.x != 0.005f;
             }
             break;
@@ -657,6 +660,8 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
             break;
         }
     }
+
+    va_end(args);
 }
 
 static uint32_t enMa1UpdateHook = 0;
@@ -795,7 +800,7 @@ void TimeSaverOnSceneInitHandler(int16_t sceneNum) {
             }
             break;
         case SCENE_LON_LON_RANCH:
-            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO) && GameInteractor_Should(VB_MALON_RETURN_FROM_CASTLE, Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE), NULL)) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO) && GameInteractor_Should(VB_MALON_RETURN_FROM_CASTLE, Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE))) {
                 Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_CHILD_MALON_AT_RANCH);
                 Flags_SetInfTable(INFTABLE_CHILD_MALON_SAID_EPONA_WAS_AFRAID_OF_YOU);
                 Flags_SetEventChkInf(EVENTCHKINF_INVITED_TO_SING_WITH_CHILD_MALON);
diff --git a/soh/src/code/code_800EC960.c b/soh/src/code/code_800EC960.c
index 145ab7c1c..76fe3e6a7 100644
--- a/soh/src/code/code_800EC960.c
+++ b/soh/src/code/code_800EC960.c
@@ -1628,23 +1628,23 @@ void func_800ED458(s32 arg0) {
         }
 
         Audio_OcaUpdateBtnMap(customControls, dpad, rStick);
-        if (D_8016BA18 & sOcarinaD4BtnMap && GameInteractor_Should(VB_HAVE_OCARINA_NOTE_D4, true, NULL)) {
+        if (D_8016BA18 & sOcarinaD4BtnMap && GameInteractor_Should(VB_HAVE_OCARINA_NOTE_D4, true)) {
             osSyncPrintf("Presss NA_KEY_D4 %08x\n", sOcarinaD4BtnMap);
             sCurOcarinaBtnVal = 2;
             sCurOcarinaBtnIdx = 0;
-        } else if (D_8016BA18 & sOcarinaF4BtnMap && GameInteractor_Should(VB_HAVE_OCARINA_NOTE_F4, true, NULL)) {
+        } else if (D_8016BA18 & sOcarinaF4BtnMap && GameInteractor_Should(VB_HAVE_OCARINA_NOTE_F4, true)) {
             osSyncPrintf("Presss NA_KEY_F4 %08x\n", sOcarinaF4BtnMap);
             sCurOcarinaBtnVal = 5;
             sCurOcarinaBtnIdx = 1;
-        } else if (D_8016BA18 & sOcarinaA4BtnMap && GameInteractor_Should(VB_HAVE_OCARINA_NOTE_A4, true, NULL)) {
+        } else if (D_8016BA18 & sOcarinaA4BtnMap && GameInteractor_Should(VB_HAVE_OCARINA_NOTE_A4, true)) {
             osSyncPrintf("Presss NA_KEY_A4 %08x\n", sOcarinaA4BtnMap);
             sCurOcarinaBtnVal = 9;
             sCurOcarinaBtnIdx = 2;
-        } else if (D_8016BA18 & sOcarinaB4BtnMap && GameInteractor_Should(VB_HAVE_OCARINA_NOTE_B4, true, NULL)) {
+        } else if (D_8016BA18 & sOcarinaB4BtnMap && GameInteractor_Should(VB_HAVE_OCARINA_NOTE_B4, true)) {
             osSyncPrintf("Presss NA_KEY_B4 %08x\n", sOcarinaA4BtnMap);
             sCurOcarinaBtnVal = 0xB;
             sCurOcarinaBtnIdx = 3;
-        } else if (D_8016BA18 & sOcarinaD5BtnMap && GameInteractor_Should(VB_HAVE_OCARINA_NOTE_D5, true, NULL)) {
+        } else if (D_8016BA18 & sOcarinaD5BtnMap && GameInteractor_Should(VB_HAVE_OCARINA_NOTE_D5, true)) {
             osSyncPrintf("Presss NA_KEY_D5 %08x\n", sOcarinaD5BtnMap);
             sCurOcarinaBtnVal = 0xE;
             sCurOcarinaBtnIdx = 4;
diff --git a/soh/src/code/z_demo.c b/soh/src/code/z_demo.c
index 424fca83f..499e16898 100644
--- a/soh/src/code/z_demo.c
+++ b/soh/src/code/z_demo.c
@@ -497,11 +497,11 @@ void Cutscene_Command_Terminator(PlayState* play, CutsceneContext* csCtx, CsCmdB
 
     bool shouldSkipCommand = false;
 
-    if (cmd->base == 8 && !GameInteractor_Should(VB_PLAY_PULL_MASTER_SWORD_CS, true, NULL)) {
+    if (cmd->base == 8 && !GameInteractor_Should(VB_PLAY_PULL_MASTER_SWORD_CS, true)) {
         shouldSkipCommand = true;
     }
 
-    if (cmd->base == 24 && !GameInteractor_Should(VB_PLAY_DROP_FISH_FOR_JABU_CS, true, NULL)) {
+    if (cmd->base == 24 && !GameInteractor_Should(VB_PLAY_DROP_FISH_FOR_JABU_CS, true)) {
         shouldSkipCommand = true;
     }
 
@@ -631,7 +631,7 @@ void Cutscene_Command_Terminator(PlayState* play, CutsceneContext* csCtx, CsCmdB
                     gSaveContext.fw.set = 0;
                     gSaveContext.respawn[RESPAWN_MODE_TOP].data = 0;
                 }
-                if (GameInteractor_Should(VB_PLAY_PULL_MASTER_SWORD_CS, !Flags_GetEventChkInf(EVENTCHKINF_PULLED_MASTER_SWORD_FROM_PEDESTAL), NULL)) {
+                if (GameInteractor_Should(VB_PLAY_PULL_MASTER_SWORD_CS, !Flags_GetEventChkInf(EVENTCHKINF_PULLED_MASTER_SWORD_FROM_PEDESTAL))) {
                     Flags_SetEventChkInf(EVENTCHKINF_PULLED_MASTER_SWORD_FROM_PEDESTAL);
                     play->nextEntranceIndex = ENTR_CUTSCENE_MAP_0;
                     play->transitionTrigger = TRANS_TRIGGER_START;
@@ -723,7 +723,7 @@ void Cutscene_Command_Terminator(PlayState* play, CutsceneContext* csCtx, CsCmdB
                 play->transitionType = TRANS_TYPE_FADE_WHITE;
                 break;
             case 22:
-                if (GameInteractor_Should(VB_GIVE_ITEM_REQUIEM_OF_SPIRIT, true, NULL)) {
+                if (GameInteractor_Should(VB_GIVE_ITEM_REQUIEM_OF_SPIRIT, true)) {
                     Item_Give(play, ITEM_SONG_REQUIEM);
                 }
                 play->nextEntranceIndex = ENTR_DESERT_COLOSSUS_0;
@@ -777,7 +777,7 @@ void Cutscene_Command_Terminator(PlayState* play, CutsceneContext* csCtx, CsCmdB
                 play->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
                 play->transitionType = TRANS_TYPE_FADE_WHITE;
-                if (GameInteractor_Should(VB_GIVE_ITEM_FIRE_MEDALLION, true, NULL)) {
+                if (GameInteractor_Should(VB_GIVE_ITEM_FIRE_MEDALLION, true)) {
                     Item_Give(play, ITEM_MEDALLION_FIRE);
                 }
                 gSaveContext.chamberCutsceneNum = 1;
@@ -859,7 +859,7 @@ void Cutscene_Command_Terminator(PlayState* play, CutsceneContext* csCtx, CsCmdB
                 play->transitionType = TRANS_TYPE_FADE_BLACK_FAST;
                 break;
             case 47:
-                if (GameInteractor_Should(VB_GIVE_ITEM_NOCTURNE_OF_SHADOW, true, NULL)) {
+                if (GameInteractor_Should(VB_GIVE_ITEM_NOCTURNE_OF_SHADOW, true)) {
                     Item_Give(play, ITEM_SONG_NOCTURNE);
                 }
                 Flags_SetEventChkInf(EVENTCHKINF_LEARNED_NOCTURNE_OF_SHADOW);
@@ -2197,7 +2197,7 @@ void Cutscene_HandleConditionalTriggers(PlayState* play) {
     osSyncPrintf("\ngame_info.mode=[%d] restart_flag", ((void)0, gSaveContext.respawnFlag));
     LUSLOG_INFO("Cutscene_HandleConditionalTriggers - entranceIndex: %#x cutsceneIndex: %#x", gSaveContext.entranceIndex, gSaveContext.cutsceneIndex);
 
-    if (!GameInteractor_Should(VB_PLAY_TRANSITION_CS, true, NULL)) {
+    if (!GameInteractor_Should(VB_PLAY_TRANSITION_CS, true)) {
         return;
     }
 
@@ -2213,12 +2213,12 @@ void Cutscene_HandleConditionalTriggers(PlayState* play) {
             Flags_GetEventChkInf(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP) &&
             Flags_GetEventChkInf(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP) && 
             !Flags_GetEventChkInf(EVENTCHKINF_BONGO_BONGO_ESCAPED_FROM_WELL)
-        ), NULL)) {
+        ))) {
             Flags_SetEventChkInf(EVENTCHKINF_BONGO_BONGO_ESCAPED_FROM_WELL);
             gSaveContext.cutsceneIndex = 0xFFF0;
         } else if ((gSaveContext.entranceIndex == ENTR_LOST_WOODS_9) && !Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_SARIA_ON_BRIDGE)) {
             Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_SARIA_ON_BRIDGE);
-            if (GameInteractor_Should(VB_GIVE_ITEM_FAIRY_OCARINA, true, NULL)) {
+            if (GameInteractor_Should(VB_GIVE_ITEM_FAIRY_OCARINA, true)) {
                 Item_Give(play, ITEM_OCARINA_FAIRY);
             }
             gSaveContext.entranceIndex = ENTR_LOST_WOODS_0;
@@ -2229,7 +2229,7 @@ void Cutscene_HandleConditionalTriggers(PlayState* play) {
             LINK_IS_ADULT &&
             !Flags_GetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS) &&
             (gEntranceTable[((void)0, gSaveContext.entranceIndex)].scene == SCENE_TEMPLE_OF_TIME)
-        ), NULL)) {
+        ))) {
             Flags_SetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS);
             gSaveContext.entranceIndex = ENTR_TEMPLE_OF_TIME_0;
             gSaveContext.cutsceneIndex = 0xFFF8;
diff --git a/soh/src/code/z_horse.c b/soh/src/code/z_horse.c
index 33ba7a84d..de50eac4a 100644
--- a/soh/src/code/z_horse.c
+++ b/soh/src/code/z_horse.c
@@ -77,9 +77,9 @@ void func_8006D0EC(PlayState* play, Player* player) {
     } else if ((play->sceneNum == gSaveContext.horseData.scene) &&
                (((Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) != 0) && (!IS_RANDO ||
                (IS_RANDO && CHECK_QUEST_ITEM(QUEST_SONG_EPONA) &&
-                    GameInteractor_Should(VB_HAVE_OCARINA_NOTE_D5, true, NULL) &&
-                    GameInteractor_Should(VB_HAVE_OCARINA_NOTE_B4, true, NULL) &&
-                    GameInteractor_Should(VB_HAVE_OCARINA_NOTE_A4, true, NULL) &&
+                    GameInteractor_Should(VB_HAVE_OCARINA_NOTE_D5, true) &&
+                    GameInteractor_Should(VB_HAVE_OCARINA_NOTE_B4, true) &&
+                    GameInteractor_Should(VB_HAVE_OCARINA_NOTE_A4, true) &&
                (INV_CONTENT(ITEM_OCARINA_FAIRY) != ITEM_NONE)))) || DREG(1) != 0)) {
         // "Set by existence of horse %d %d %d"
         osSyncPrintf("馬存在によるセット %d %d %d\n", gSaveContext.horseData.scene, Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED),
diff --git a/soh/src/code/z_message_PAL.c b/soh/src/code/z_message_PAL.c
index 8da747dd5..4e1dc8692 100644
--- a/soh/src/code/z_message_PAL.c
+++ b/soh/src/code/z_message_PAL.c
@@ -2610,18 +2610,18 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
                     u8 songItemId = ITEM_SONG_MINUET + gOcarinaSongItemMap[msgCtx->ocarinaStaff->state];
 
                     if (
-                        (songItemId == ITEM_SONG_MINUET && GameInteractor_Should(VB_GIVE_ITEM_MINUET_OF_FOREST, true, NULL)) ||
-                        (songItemId == ITEM_SONG_BOLERO && GameInteractor_Should(VB_GIVE_ITEM_BOLERO_OF_FIRE, true, NULL)) ||
-                        (songItemId == ITEM_SONG_SERENADE && GameInteractor_Should(VB_GIVE_ITEM_SERENADE_OF_WATER, true, NULL)) ||
-                        (songItemId == ITEM_SONG_REQUIEM && GameInteractor_Should(VB_GIVE_ITEM_REQUIEM_OF_SPIRIT, true, NULL)) ||
-                        (songItemId == ITEM_SONG_NOCTURNE && GameInteractor_Should(VB_GIVE_ITEM_NOCTURNE_OF_SHADOW, true, NULL)) ||
-                        (songItemId == ITEM_SONG_PRELUDE && GameInteractor_Should(VB_GIVE_ITEM_PRELUDE_OF_LIGHT, true, NULL)) ||
-                        (songItemId == ITEM_SONG_LULLABY && GameInteractor_Should(VB_GIVE_ITEM_ZELDAS_LULLABY, true, NULL)) ||
-                        (songItemId == ITEM_SONG_EPONA && GameInteractor_Should(VB_GIVE_ITEM_EPONAS_SONG, true, NULL)) ||
-                        (songItemId == ITEM_SONG_SARIA && GameInteractor_Should(VB_GIVE_ITEM_SARIAS_SONG, true, NULL)) ||
-                        (songItemId == ITEM_SONG_SUN && GameInteractor_Should(VB_GIVE_ITEM_SUNS_SONG, true, NULL)) ||
-                        (songItemId == ITEM_SONG_TIME && GameInteractor_Should(VB_GIVE_ITEM_SONG_OF_TIME, true, NULL)) ||
-                        (songItemId == ITEM_SONG_STORMS && GameInteractor_Should(VB_GIVE_ITEM_SONG_OF_STORMS, true, NULL))
+                        (songItemId == ITEM_SONG_MINUET && GameInteractor_Should(VB_GIVE_ITEM_MINUET_OF_FOREST, true)) ||
+                        (songItemId == ITEM_SONG_BOLERO && GameInteractor_Should(VB_GIVE_ITEM_BOLERO_OF_FIRE, true)) ||
+                        (songItemId == ITEM_SONG_SERENADE && GameInteractor_Should(VB_GIVE_ITEM_SERENADE_OF_WATER, true)) ||
+                        (songItemId == ITEM_SONG_REQUIEM && GameInteractor_Should(VB_GIVE_ITEM_REQUIEM_OF_SPIRIT, true)) ||
+                        (songItemId == ITEM_SONG_NOCTURNE && GameInteractor_Should(VB_GIVE_ITEM_NOCTURNE_OF_SHADOW, true)) ||
+                        (songItemId == ITEM_SONG_PRELUDE && GameInteractor_Should(VB_GIVE_ITEM_PRELUDE_OF_LIGHT, true)) ||
+                        (songItemId == ITEM_SONG_LULLABY && GameInteractor_Should(VB_GIVE_ITEM_ZELDAS_LULLABY, true)) ||
+                        (songItemId == ITEM_SONG_EPONA && GameInteractor_Should(VB_GIVE_ITEM_EPONAS_SONG, true)) ||
+                        (songItemId == ITEM_SONG_SARIA && GameInteractor_Should(VB_GIVE_ITEM_SARIAS_SONG, true)) ||
+                        (songItemId == ITEM_SONG_SUN && GameInteractor_Should(VB_GIVE_ITEM_SUNS_SONG, true)) ||
+                        (songItemId == ITEM_SONG_TIME && GameInteractor_Should(VB_GIVE_ITEM_SONG_OF_TIME, true)) ||
+                        (songItemId == ITEM_SONG_STORMS && GameInteractor_Should(VB_GIVE_ITEM_SONG_OF_STORMS, true))
                     ) {
                         Item_Give(play, songItemId);
                     }
diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c
index 0d14468f2..0a2b91406 100644
--- a/soh/src/code/z_parameter.c
+++ b/soh/src/code/z_parameter.c
@@ -5372,7 +5372,7 @@ void Interface_Draw(PlayState* play) {
         if (fullUi) {
             s16 PosX_RC;
             s16 PosY_RC;
-            if (GameInteractor_Should(VB_RENDER_RUPEE_COUNTER, true, NULL)) {
+            if (GameInteractor_Should(VB_RENDER_RUPEE_COUNTER, true)) {
                 // Rupee Icon
                 if (CVarGetInteger(CVAR_ENHANCEMENT("DynamicWalletIcon"), 0)) {
                     switch (CUR_UPG_VALUE(UPG_WALLET)) {
@@ -5446,7 +5446,7 @@ void Interface_Draw(PlayState* play) {
                 OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, gRupeeCounterIconTex, 16, 16, PosX_RC, PosY_RC, 16, 16, 1 << 10, 1 << 10);
             }
 
-            if (GameInteractor_Should(VB_RENDER_KEY_COUNTER, true, NULL)) {
+            if (GameInteractor_Should(VB_RENDER_KEY_COUNTER, true)) {
                 switch (play->sceneNum) {
                     case SCENE_FOREST_TEMPLE:
                     case SCENE_FIRE_TEMPLE:
@@ -5527,7 +5527,7 @@ void Interface_Draw(PlayState* play) {
                 }
             }
 
-            if (GameInteractor_Should(VB_RENDER_RUPEE_COUNTER, true, NULL)) {
+            if (GameInteractor_Should(VB_RENDER_RUPEE_COUNTER, true)) {
                 // Rupee Counter
                 gDPPipeSync(OVERLAY_DISP++);
 
diff --git a/soh/src/code/z_sram.c b/soh/src/code/z_sram.c
index 8a848f301..08ddef62d 100644
--- a/soh/src/code/z_sram.c
+++ b/soh/src/code/z_sram.c
@@ -200,7 +200,7 @@ void Sram_OpenSave() {
         }
     }
 
-    if (GameInteractor_Should(VB_REVERT_SPOILING_ITEMS, true, NULL)) {
+    if (GameInteractor_Should(VB_REVERT_SPOILING_ITEMS, true)) {
         for (i = 0; i < ARRAY_COUNT(gSpoilingItems); i++) {
             if (INV_CONTENT(ITEM_TRADE_ADULT) == gSpoilingItems[i]) {
                 INV_CONTENT(gSpoilingItemReverts[i]) = gSpoilingItemReverts[i];
diff --git a/soh/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c b/soh/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c
index c2db563b9..981f25cd2 100644
--- a/soh/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c
+++ b/soh/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c
@@ -276,7 +276,7 @@ void BgBreakwall_Wait(BgBreakwall* this, PlayState* play) {
         }
     }
 
-    if (GameInteractor_Should(VB_BG_BREAKWALL_BREAK, this->collider.base.acFlags & 2 || blueFireArrowHit, NULL)) {
+    if (GameInteractor_Should(VB_BG_BREAKWALL_BREAK, this->collider.base.acFlags & 2 || blueFireArrowHit)) {
         Vec3f effectPos;
         s32 wallType = ((this->dyna.actor.params >> 13) & 3) & 0xFF;
 
diff --git a/soh/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c b/soh/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c
index afbe34053..18eae69fb 100644
--- a/soh/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c
+++ b/soh/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c
@@ -70,7 +70,7 @@ void func_808787A4(BgGjyoBridge* this, PlayState* play) {
 }
 
 void LaunchBridgeCutscene(BgGjyoBridge* this, PlayState* play) {
-    if (GameInteractor_Should(VB_PLAY_RAINBOW_BRIDGE_CS, true, NULL)) {
+    if (GameInteractor_Should(VB_PLAY_RAINBOW_BRIDGE_CS, true)) {
         play->csCtx.segment = SEGMENTED_TO_VIRTUAL(gRainbowBridgeCs);
         gSaveContext.cutsceneTrigger = 1;
     }
@@ -92,7 +92,7 @@ void BgGjyoBridge_TriggerCutscene(BgGjyoBridge* this, PlayState* play) {
         (INV_CONTENT(ITEM_ARROW_LIGHT) == ITEM_ARROW_LIGHT) &&
         CheckPlayerPosition(player, play);
 
-    if (GameInteractor_Should(VB_BE_ELIGIBLE_FOR_RAINBOW_BRIDGE, vanillaBridgeCondition, NULL)) {
+    if (GameInteractor_Should(VB_BE_ELIGIBLE_FOR_RAINBOW_BRIDGE, vanillaBridgeCondition)) {
         LaunchBridgeCutscene(this, play);
     }
 }
@@ -103,7 +103,7 @@ void BgGjyoBridge_SpawnBridge(BgGjyoBridge* this, PlayState* play) {
         (play->csCtx.npcActions[2] != NULL) &&
         (play->csCtx.npcActions[2]->action == 2);
 
-    if (!GameInteractor_Should(VB_PLAY_RAINBOW_BRIDGE_CS, true, NULL) || vanillaBridgeCondition) {
+    if (!GameInteractor_Should(VB_PLAY_RAINBOW_BRIDGE_CS, true) || vanillaBridgeCondition) {
         this->dyna.actor.draw = BgGjyoBridge_Draw;
         func_8003EC50(play, &play->colCtx.dyna, this->dyna.bgId);
         Flags_SetEventChkInf(EVENTCHKINF_RAINBOW_BRIDGE_BUILT);
diff --git a/soh/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c b/soh/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c
index 571123057..5d73c277f 100644
--- a/soh/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c
+++ b/soh/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c
@@ -61,7 +61,7 @@ void BgSpot12Saku_Init(Actor* thisx, PlayState* play) {
 
     func_808B3420(this, play, &gGerudoFortressGTGShutterCol, DPM_UNK);
     Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
-    if (GameInteractor_Should(VB_GTG_GATE_BE_OPEN, Flags_GetSwitch(play, this->dyna.actor.params & 0x3F), NULL)) {
+    if (GameInteractor_Should(VB_GTG_GATE_BE_OPEN, Flags_GetSwitch(play, this->dyna.actor.params & 0x3F))) {
         func_808B3714(this);
     } else {
         func_808B3550(this);
@@ -82,7 +82,7 @@ void func_808B3550(BgSpot12Saku* this) {
 }
 
 void func_808B357C(BgSpot12Saku* this, PlayState* play) {
-    if (GameInteractor_Should(VB_GTG_GATE_BE_OPEN, Flags_GetSwitch(play, this->dyna.actor.params & 0x3F), NULL)) {
+    if (GameInteractor_Should(VB_GTG_GATE_BE_OPEN, Flags_GetSwitch(play, this->dyna.actor.params & 0x3F))) {
         func_808B35E4(this);
         this->timer = 20;
         OnePointCutscene_Init(play, 4170, -99, &this->dyna.actor, MAIN_CAM);
diff --git a/soh/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c b/soh/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c
index 0d1c234b5..621ed0e7f 100644
--- a/soh/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c
+++ b/soh/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c
@@ -126,7 +126,7 @@ void func_808BAF40(BgTokiSwd* this, PlayState* play) {
     if (!LINK_IS_ADULT || (Flags_GetEventChkInf(EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT) && !IS_RANDO) || IS_RANDO) {
         if (Actor_HasParent(&this->actor, play)) {
             if (!LINK_IS_ADULT) {
-                 if (GameInteractor_Should(VB_GIVE_ITEM_MASTER_SWORD, true, NULL)) {
+                 if (GameInteractor_Should(VB_GIVE_ITEM_MASTER_SWORD, true)) {
                     Item_Give(play, ITEM_SWORD_MASTER);
                  }
                 play->csCtx.segment = D_808BB2F0;
diff --git a/soh/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c b/soh/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c
index f93e5910c..59c83fc82 100644
--- a/soh/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c
+++ b/soh/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c
@@ -340,7 +340,7 @@ void BossDodongo_Init(Actor* thisx, PlayState* play) {
         Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, -890.0f, -1523.76f,
                            -3304.0f, 0, 0, 0, WARP_DUNGEON_CHILD);
         Actor_Spawn(&play->actorCtx, play, ACTOR_BG_BREAKWALL, -890.0f, -1523.76f, -3304.0f, 0, 0, 0, 0x6000, true);
-        if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true, NULL)) {
+        if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true)) {
             Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, -690.0f, -1523.76f, -3304.0f, 0, 0, 0, 0, true);
         }
     }
@@ -1845,7 +1845,7 @@ void BossDodongo_DeathCutscene(BossDodongo* this, PlayState* play) {
 
             if (this->unk_1DA == 820) {
                 Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_BOSS_CLEAR);
-                if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true, NULL)) {
+                if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true)) {
                     Actor_Spawn(
                         &play->actorCtx, play, ACTOR_ITEM_B_HEART,
                         Math_SinS(this->actor.shape.rot.y) * -50.0f + this->actor.world.pos.x, this->actor.world.pos.y,
diff --git a/soh/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c b/soh/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c
index 032a487a6..e004cc627 100644
--- a/soh/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c
+++ b/soh/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c
@@ -229,7 +229,7 @@ void BossFd_Init(Actor* thisx, PlayState* play) {
         Actor_Kill(&this->actor);
         Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, 0.0f, 100.0f, 0.0f, 0, 0, 0,
                            WARP_DUNGEON_ADULT);
-        if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true, NULL)) {
+        if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true)) {
             Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, 0.0f, 100.0f, 200.0f, 0, 0, 0, 0, true);
         }
     } else {
@@ -917,7 +917,7 @@ void BossFd_Fly(BossFd* this, PlayState* play) {
                 this->actionFunc = BossFd_Wait;
                 this->actor.world.pos.y -= 1000.0f;
             }
-            if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, this->timers[0] == 7, NULL)) {
+            if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, this->timers[0] == 7)) {
                 Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, this->actor.world.pos.x,
                             this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 0, true);
             }
diff --git a/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c b/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c
index f4c227a29..8e2fffe36 100644
--- a/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c
+++ b/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c
@@ -581,7 +581,7 @@ void BossGanon_IntroCutscene(BossGanon* this, PlayState* play) {
                 BossGanon_SetIntroCsCamera(this, 11);
                 this->unk_198 = 2;
                 this->timers[2] = 110;
-                if (GameInteractor_Should(VB_GANON_HEAL_BEFORE_FIGHT, true, NULL)) {
+                if (GameInteractor_Should(VB_GANON_HEAL_BEFORE_FIGHT, true)) {
                     gSaveContext.healthAccumulator = 0x140;
                 }
                 Audio_QueueSeqCmd(NA_BGM_STOP);
diff --git a/soh/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c b/soh/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c
index 1a1b0c24b..03c3cb292 100644
--- a/soh/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c
+++ b/soh/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c
@@ -237,7 +237,7 @@ void BossGanondrof_Init(Actor* thisx, PlayState* play) {
             Actor_Spawn(&play->actorCtx, play, ACTOR_DOOR_WARP1, GND_BOSSROOM_CENTER_X, GND_BOSSROOM_CENTER_Y,
                         GND_BOSSROOM_CENTER_Z, 0, 0, 0, WARP_DUNGEON_ADULT, true);
         }
-        if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true, NULL)) {
+        if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true)) {
             Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, 200.0f + GND_BOSSROOM_CENTER_X,
                         GND_BOSSROOM_CENTER_Y, GND_BOSSROOM_CENTER_Z, 0, 0, 0, 0, true);
         }
@@ -966,7 +966,7 @@ void BossGanondrof_Death(BossGanondrof* this, PlayState* play) {
                     bodyDecayLevel = 1;
                     break;
             }
-            if (GameInteractor_Should(VB_PHANTOM_GANON_DEATH_SCENE, true, NULL)) {
+            if (GameInteractor_Should(VB_PHANTOM_GANON_DEATH_SCENE, true)) {
                 Math_ApproachS(&this->actor.shape.rot.y, this->work[GND_VARIANCE_TIMER] * -100, 5, 0xBB8);
                 Math_ApproachF(&this->cameraNextEye.z, this->targetPos.z + 60.0f, 0.02f, 0.5f);
                 Math_ApproachF(&this->actor.world.pos.y, GND_BOSSROOM_CENTER_Y + 133.0f, 0.05f, 100.0f);
@@ -1081,7 +1081,7 @@ void BossGanondrof_Death(BossGanondrof* this, PlayState* play) {
                 this->deathCamera = 0;
                 func_80064534(play, &play->csCtx);
                 Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
-                if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true, NULL)) {
+                if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true)) {
                     Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, GND_BOSSROOM_CENTER_X, GND_BOSSROOM_CENTER_Y,
                                 GND_BOSSROOM_CENTER_Z + 200.0f, 0, 0, 0, 0, true);
                 }
diff --git a/soh/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c b/soh/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c
index 3e0096ece..0644f73a8 100644
--- a/soh/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c
+++ b/soh/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c
@@ -344,7 +344,7 @@ void BossGoma_Init(Actor* thisx, PlayState* play) {
             Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, 0.0f, -640.0f, 0.0f, 0, 0,
                                0, WARP_DUNGEON_CHILD);
         }
-        if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true, NULL)) {
+        if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true)) {
             Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, 141.0f, -640.0f, -84.0f, 0, 0, 0, 0, true);
         }
     }
@@ -1123,7 +1123,7 @@ void BossGoma_Defeated(BossGoma* this, PlayState* play) {
                 this->timer = 70;
                 this->decayingProgress = 0;
                 this->subCameraFollowSpeed = 0.0f;
-                if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true, NULL)) {
+                if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true)) {
                     Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, this->actor.world.pos.x,
                                 this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 0, true);
                 }
diff --git a/soh/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c b/soh/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
index 6551f25b0..12dfd415a 100644
--- a/soh/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
+++ b/soh/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
@@ -375,7 +375,7 @@ void BossMo_Init(Actor* thisx, PlayState* play2) {
                 Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, 0.0f, -280.0f, 0.0f, 0,
                                    0, 0, WARP_DUNGEON_ADULT);
             }
-            if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true, NULL)) {
+            if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true)) {
                 Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, -200.0f, -280.0f, 0.0f, 0, 0, 0, 0, true);
             }
             play->roomCtx.unk_74[0] = 0xFF;
@@ -1127,7 +1127,7 @@ void BossMo_Tentacle(BossMo* this, PlayState* play) {
                                            WARP_DUNGEON_ADULT);
                     }
 
-                    if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true, NULL)) {
+                    if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true)) {
                         Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, this->actor.world.pos.x + 200.0f,
                                     -280.0f, this->actor.world.pos.z, 0, 0, 0, 0, true);
                     }
diff --git a/soh/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c b/soh/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c
index 6a4b0f30c..a739bfd96 100644
--- a/soh/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c
+++ b/soh/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c
@@ -298,7 +298,7 @@ void BossSst_Init(Actor* thisx, PlayState* play2) {
                 Actor_Spawn(&play->actorCtx, play, ACTOR_DOOR_WARP1, ROOM_CENTER_X, ROOM_CENTER_Y,
                             ROOM_CENTER_Z + 400.0f, 0, 0, 0, WARP_DUNGEON_ADULT, true);
             }
-            if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true, NULL)) {
+            if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true)) {
                 Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, ROOM_CENTER_X, ROOM_CENTER_Y,
                             ROOM_CENTER_Z - 200.0f, 0, 0, 0, 0, true);
             }
@@ -1211,7 +1211,7 @@ void BossSst_HeadFinish(BossSst* this, PlayState* play) {
             Actor_Spawn(&play->actorCtx, play, ACTOR_DOOR_WARP1, ROOM_CENTER_X, ROOM_CENTER_Y, ROOM_CENTER_Z, 0, 0, 0,
                         WARP_DUNGEON_ADULT, true);
         }
-        if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true, NULL)) {
+        if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true)) {
             Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART,
                         (Math_SinS(this->actor.shape.rot.y) * 200.0f) + ROOM_CENTER_X, ROOM_CENTER_Y,
                         Math_CosS(this->actor.shape.rot.y) * 200.0f + ROOM_CENTER_Z, 0, 0, 0, 0, true);
diff --git a/soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c b/soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c
index 4c198d07f..f92526337 100644
--- a/soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c
+++ b/soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c
@@ -541,7 +541,7 @@ void BossTw_Init(Actor* thisx, PlayState* play2) {
                                    0, 0, WARP_DUNGEON_ADULT);
             }
 
-            if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true, NULL)) {
+            if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true)) {
                 Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, -600.0f, 230.0f, 0.0f, 0, 0, 0, 0, true);
             }
         } else {
@@ -2806,7 +2806,7 @@ void BossTw_TwinrovaDeathCS(BossTw* this, PlayState* play) {
                                        0, 0, WARP_DUNGEON_ADULT);
                 }
 
-                if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true, NULL)) {
+                if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true)) {
                     Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, -600.0f, 230.f, 0.0f, 0, 0, 0, 0, true);
                 }
 
diff --git a/soh/src/overlays/actors/ovl_Boss_Va/z_boss_va.c b/soh/src/overlays/actors/ovl_Boss_Va/z_boss_va.c
index 16cb91d99..fc00e641b 100644
--- a/soh/src/overlays/actors/ovl_Boss_Va/z_boss_va.c
+++ b/soh/src/overlays/actors/ovl_Boss_Va/z_boss_va.c
@@ -648,7 +648,7 @@ void BossVa_Init(Actor* thisx, PlayState* play2) {
                                 0, true); //! params could be WARP_DUNGEON_CHILD however this can also spawn Ru1
                 }
 
-                if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true, NULL)) {
+                if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true)) {
                     Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, this->actor.world.pos.x + 160.0f,
                                 this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 0, true);
                 }
@@ -1662,7 +1662,7 @@ void BossVa_BodyDeath(BossVa* this, PlayState* play) {
                 Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
                 sCsState++;
 
-                if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true, NULL)) {
+                if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true)) {
                     Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, this->actor.world.pos.x,
                                 this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 0, true);
                 }
diff --git a/soh/src/overlays/actors/ovl_Demo_Du/z_demo_du.c b/soh/src/overlays/actors/ovl_Demo_Du/z_demo_du.c
index b0804724a..73f6c2e6d 100644
--- a/soh/src/overlays/actors/ovl_Demo_Du/z_demo_du.c
+++ b/soh/src/overlays/actors/ovl_Demo_Du/z_demo_du.c
@@ -185,7 +185,7 @@ void func_80969F38(DemoDu* this, PlayState* play) {
 
     Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DEMO_EFFECT, posX, posY, posZ, 0, 0, 0,
                        DEMO_EFFECT_MEDAL_FIRE);
-    if (GameInteractor_Should(VB_GIVE_ITEM_FIRE_MEDALLION, true, NULL)) {
+    if (GameInteractor_Should(VB_GIVE_ITEM_FIRE_MEDALLION, true)) {
         Item_Give(play, ITEM_MEDALLION_FIRE);
     }
 }
@@ -204,7 +204,7 @@ void DemoDu_CsFireMedallion_AdvanceTo01(DemoDu* this, PlayState* play) {
         this->updateIndex = CS_FIREMEDALLION_SUBSCENE(1);
         play->csCtx.segment = D_8096C1A4;
         gSaveContext.cutsceneTrigger = 2;
-        if (GameInteractor_Should(VB_GIVE_ITEM_FIRE_MEDALLION, true, NULL)) {
+        if (GameInteractor_Should(VB_GIVE_ITEM_FIRE_MEDALLION, true)) {
             Item_Give(play, ITEM_MEDALLION_FIRE);
         }
 
@@ -1054,4 +1054,4 @@ const ActorInit Demo_Du_InitVars = {
 
 void DemoDu_Reset(void) {
     D_8096CE94 = 0;
-}
\ No newline at end of file
+}
diff --git a/soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.c b/soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.c
index ca8713805..1a502127c 100644
--- a/soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.c
+++ b/soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.c
@@ -319,7 +319,7 @@ void func_809853B4(DemoIm* this, PlayState* play) {
 
     Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DEMO_EFFECT, playerX, playerY, playerZ, 0,
                        0, 0, 0xD);
-    if (GameInteractor_Should(VB_GIVE_ITEM_SHADOW_MEDALLION, true, NULL)) {
+    if (GameInteractor_Should(VB_GIVE_ITEM_SHADOW_MEDALLION, true)) {
         Item_Give(play, ITEM_MEDALLION_SHADOW);
     }
 }
@@ -337,7 +337,7 @@ void func_8098544C(DemoIm* this, PlayState* play) {
         this->action = 1;
         play->csCtx.segment = D_8098786C;
         gSaveContext.cutsceneTrigger = 2;
-        if (GameInteractor_Should(VB_GIVE_ITEM_SHADOW_MEDALLION, true, NULL)) {
+        if (GameInteractor_Should(VB_GIVE_ITEM_SHADOW_MEDALLION, true)) {
             Item_Give(play, ITEM_MEDALLION_SHADOW);
         }
         player->actor.world.rot.y = player->actor.shape.rot.y = this->actor.world.rot.y + 0x8000;
@@ -916,7 +916,7 @@ void func_80986C30(DemoIm* this, PlayState* play) {
             func_80985F54(this);
         }
         Flags_SetEventChkInf(EVENTCHKINF_LEARNED_ZELDAS_LULLABY);
-        if (GameInteractor_Should(VB_GIVE_ITEM_ZELDAS_LULLABY, true, NULL)) {
+        if (GameInteractor_Should(VB_GIVE_ITEM_ZELDAS_LULLABY, true)) {
             Item_Give(play, ITEM_SONG_LULLABY);
         }
     }
diff --git a/soh/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c b/soh/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c
index 26bf4c761..59b19c5c7 100644
--- a/soh/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c
+++ b/soh/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c
@@ -241,7 +241,7 @@ void func_8098E8C8(DemoSa* this, PlayState* play) {
 
     Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DEMO_EFFECT, posX, posY, posZ, 0, 0, 0,
                        0xB);
-    if (GameInteractor_Should(VB_GIVE_ITEM_FOREST_MEDALLION, true, NULL)) {
+    if (GameInteractor_Should(VB_GIVE_ITEM_FOREST_MEDALLION, true)) {
         Item_Give(play, ITEM_MEDALLION_FOREST);
     }
 }
@@ -259,7 +259,7 @@ void func_8098E960(DemoSa* this, PlayState* play) {
         this->action = 1;
         play->csCtx.segment = D_8099010C;
         gSaveContext.cutsceneTrigger = 2;
-        if (GameInteractor_Should(VB_GIVE_ITEM_FOREST_MEDALLION, true, NULL)) {
+        if (GameInteractor_Should(VB_GIVE_ITEM_FOREST_MEDALLION, true)) {
             Item_Give(play, ITEM_MEDALLION_FOREST);
         }
         player->actor.world.rot.y = player->actor.shape.rot.y = this->actor.world.rot.y + 0x8000;
diff --git a/soh/src/overlays/actors/ovl_En_Ani/z_en_ani.c b/soh/src/overlays/actors/ovl_En_Ani/z_en_ani.c
index 8f4ee815c..4b0e93f52 100644
--- a/soh/src/overlays/actors/ovl_En_Ani/z_en_ani.c
+++ b/soh/src/overlays/actors/ovl_En_Ani/z_en_ani.c
@@ -120,7 +120,7 @@ void func_809B0524(EnAni* this, PlayState* play) {
 }
 
 void func_809B0558(EnAni* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_FROM_MAN_ON_ROOF, true, NULL)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_FROM_MAN_ON_ROOF, true)) {
         this->actor.parent = NULL;
         if (!LINK_IS_ADULT) {
             EnAni_SetupAction(this, func_809B04F0);
@@ -129,7 +129,7 @@ void func_809B0558(EnAni* this, PlayState* play) {
         }
         Flags_SetItemGetInf(ITEMGETINF_15);
     } else {
-        if (GameInteractor_Should(VB_GIVE_ITEM_FROM_MAN_ON_ROOF, true, NULL)) {
+        if (GameInteractor_Should(VB_GIVE_ITEM_FROM_MAN_ON_ROOF, true)) {
             Actor_OfferGetItem(&this->actor, play, GI_HEART_PIECE, 10000.0f, 200.0f);
         }
     }
@@ -140,7 +140,7 @@ void func_809B05F0(EnAni* this, PlayState* play) {
         EnAni_SetupAction(this, func_809B0558);
     }
 
-    if (GameInteractor_Should(VB_GIVE_ITEM_FROM_MAN_ON_ROOF, true, NULL)) {
+    if (GameInteractor_Should(VB_GIVE_ITEM_FROM_MAN_ON_ROOF, true)) {
         Actor_OfferGetItem(&this->actor, play, GI_HEART_PIECE, 10000.0f, 200.0f);
     }
 }
diff --git a/soh/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c b/soh/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c
index 26e7f7e7a..9e3c9c1b2 100644
--- a/soh/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c
+++ b/soh/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c
@@ -143,7 +143,7 @@ void EnBomBowMan_BlinkAwake(EnBomBowlMan* this, PlayState* play) {
     if (frameCount == 30.0f) {
         this->dialogState = TEXT_STATE_EVENT;
 
-        if (GameInteractor_Should(VB_BE_ABLE_TO_PLAY_BOMBCHU_BOWLING, (Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP)) || BREG(2), NULL)) {
+        if (GameInteractor_Should(VB_BE_ABLE_TO_PLAY_BOMBCHU_BOWLING, (Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP)) || BREG(2))) {
             this->actor.textId = 0xBF;
         } else {
             this->actor.textId = 0x7058;
diff --git a/soh/src/overlays/actors/ovl_En_Ds/z_en_ds.c b/soh/src/overlays/actors/ovl_En_Ds/z_en_ds.c
index 09d312318..874b62cea 100644
--- a/soh/src/overlays/actors/ovl_En_Ds/z_en_ds.c
+++ b/soh/src/overlays/actors/ovl_En_Ds/z_en_ds.c
@@ -166,7 +166,7 @@ void EnDs_OfferOddPotion(EnDs* this, PlayState* play) {
 s32 EnDs_CheckRupeesAndBottle() {
     if (GameInteractor_Should(VB_GRANNY_SAY_INSUFFICIENT_RUPEES, gSaveContext.rupees < 100, NULL)) {
         return 0;
-    } else if (GameInteractor_Should(VB_NEED_BOTTLE_FOR_GRANNYS_ITEM, Inventory_HasEmptyBottle() == 0, NULL)) {
+    } else if (GameInteractor_Should(VB_NEED_BOTTLE_FOR_GRANNYS_ITEM, Inventory_HasEmptyBottle() == 0)) {
         return 1;
     } else {
         return 2;
diff --git a/soh/src/overlays/actors/ovl_En_Du/z_en_du.c b/soh/src/overlays/actors/ovl_En_Du/z_en_du.c
index 7d18395e8..916d2a76e 100644
--- a/soh/src/overlays/actors/ovl_En_Du/z_en_du.c
+++ b/soh/src/overlays/actors/ovl_En_Du/z_en_du.c
@@ -377,7 +377,7 @@ void func_809FE4A4(EnDu* this, PlayState* play) {
         play->msgCtx.ocarinaMode = OCARINA_MODE_00;
         EnDu_SetupAction(this, func_809FE3C0);
     } else if (play->msgCtx.ocarinaMode >= OCARINA_MODE_06) {
-        if (GameInteractor_Should(VB_PLAY_DARUNIAS_JOY_CS, true, NULL)) {
+        if (GameInteractor_Should(VB_PLAY_DARUNIAS_JOY_CS, true)) {
             play->csCtx.segment = SEGMENTED_TO_VIRTUAL(gGoronCityDaruniaWrongCs);
             gSaveContext.cutsceneTrigger = 1;
         }
@@ -386,7 +386,7 @@ void func_809FE4A4(EnDu* this, PlayState* play) {
         play->msgCtx.ocarinaMode = OCARINA_MODE_04;
     } else if (play->msgCtx.ocarinaMode == OCARINA_MODE_03) {
         Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
-        if (GameInteractor_Should(VB_PLAY_DARUNIAS_JOY_CS, true, NULL)) {
+        if (GameInteractor_Should(VB_PLAY_DARUNIAS_JOY_CS, true)) {
             play->csCtx.segment = SEGMENTED_TO_VIRTUAL(gGoronCityDaruniaCorrectCs);
             gSaveContext.cutsceneTrigger = 1;
         }
@@ -554,7 +554,7 @@ void func_809FEB08(EnDu* this, PlayState* play) {
         EnDu_SetupAction(this, func_809FE3C0);
         return;
     }
-    if (GameInteractor_Should(VB_BE_ELIGIBLE_FOR_DARUNIAS_JOY_REWARD, CUR_UPG_VALUE(UPG_STRENGTH) <= 0, NULL)) {
+    if (GameInteractor_Should(VB_BE_ELIGIBLE_FOR_DARUNIAS_JOY_REWARD, CUR_UPG_VALUE(UPG_STRENGTH) <= 0)) {
         Flags_SetRandomizerInf(RAND_INF_DARUNIAS_JOY);
         this->actor.textId = 0x301C;
         EnDu_SetupAction(this, func_809FEC14);
@@ -576,7 +576,7 @@ void func_809FEC14(EnDu* this, PlayState* play) {
 }
 
 void func_809FEC70(EnDu* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_STRENGTH_1, true, NULL)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_STRENGTH_1, true)) {
         this->actor.parent = NULL;
         EnDu_SetupAction(this, func_809FECE4);
     } else {
diff --git a/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c b/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
index facd43466..91eb44530 100644
--- a/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
+++ b/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
@@ -134,7 +134,7 @@ void EnGe1_Init(Actor* thisx, PlayState* play) {
         case GE1_TYPE_GATE_OPERATOR:
             this->hairstyle = GE1_HAIR_STRAIGHT;
 
-            if (GameInteractor_Should(VB_GERUDOS_BE_FRIENDLY, EnGe1_CheckCarpentersFreed(), NULL)) {
+            if (GameInteractor_Should(VB_GERUDOS_BE_FRIENDLY, EnGe1_CheckCarpentersFreed())) {
                 this->actionFunc = EnGe1_CheckGate_GateOp;
             } else {
                 this->actionFunc = EnGe1_WatchForPlayerFrontOnly;
@@ -144,7 +144,7 @@ void EnGe1_Init(Actor* thisx, PlayState* play) {
         case GE1_TYPE_NORMAL:
             this->hairstyle = GE1_HAIR_STRAIGHT;
 
-            if (GameInteractor_Should(VB_GERUDOS_BE_FRIENDLY, EnGe1_CheckCarpentersFreed(), NULL)) {
+            if (GameInteractor_Should(VB_GERUDOS_BE_FRIENDLY, EnGe1_CheckCarpentersFreed())) {
                 this->actionFunc = EnGe1_SetNormalText;
             } else {
                 this->actionFunc = EnGe1_WatchForAndSensePlayer;
@@ -174,7 +174,7 @@ void EnGe1_Init(Actor* thisx, PlayState* play) {
 
             if (gSaveContext.eventInf[0] & 0x100) {
                 this->actionFunc = EnGe1_TalkAfterGame_Archery;
-            } else if (GameInteractor_Should(VB_GERUDOS_BE_FRIENDLY, EnGe1_CheckCarpentersFreed(), NULL)) {
+            } else if (GameInteractor_Should(VB_GERUDOS_BE_FRIENDLY, EnGe1_CheckCarpentersFreed())) {
                 this->actionFunc = EnGe1_Wait_Archery;
             } else {
                 this->actionFunc = EnGe1_WatchForPlayerFrontOnly;
@@ -184,7 +184,7 @@ void EnGe1_Init(Actor* thisx, PlayState* play) {
         case GE1_TYPE_TRAINING_GROUNDS_GUARD:
             this->hairstyle = GE1_HAIR_STRAIGHT;
 
-            if (GameInteractor_Should(VB_GERUDOS_BE_FRIENDLY, EnGe1_CheckCarpentersFreed(), NULL)) {
+            if (GameInteractor_Should(VB_GERUDOS_BE_FRIENDLY, EnGe1_CheckCarpentersFreed())) {
                 this->actionFunc = EnGe1_CheckForCard_GTGGuard;
             } else {
                 this->actionFunc = EnGe1_WatchForPlayerFrontOnly;
diff --git a/soh/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c b/soh/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c
index 9c4db10ac..0e26fca52 100644
--- a/soh/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c
+++ b/soh/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c
@@ -140,14 +140,14 @@ void EnGe2_Init(Actor* thisx, PlayState* play) {
     switch (this->actor.params & 0xFF) {
         case GE2_TYPE_PATROLLING:
             EnGe2_ChangeAction(this, GE2_ACTION_WALK);
-            if (GameInteractor_Should(VB_GERUDOS_BE_FRIENDLY, EnGe2_CheckCarpentersFreed(), NULL)) {
+            if (GameInteractor_Should(VB_GERUDOS_BE_FRIENDLY, EnGe2_CheckCarpentersFreed())) {
                 this->actor.update = EnGe2_UpdateFriendly;
                 this->actor.targetMode = 6;
             }
             break;
         case GE2_TYPE_STATIONARY:
             EnGe2_ChangeAction(this, GE2_ACTION_STAND);
-            if (GameInteractor_Should(VB_GERUDOS_BE_FRIENDLY, EnGe2_CheckCarpentersFreed(), NULL)) {
+            if (GameInteractor_Should(VB_GERUDOS_BE_FRIENDLY, EnGe2_CheckCarpentersFreed())) {
                 this->actor.update = EnGe2_UpdateFriendly;
                 this->actor.targetMode = 6;
             }
@@ -460,7 +460,7 @@ void EnGe2_WaitLookAtPlayer(EnGe2* this, PlayState* play) {
 }
 
 void EnGe2_WaitTillCardGiven(EnGe2* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_GERUDO_MEMBERSHIP_CARD, true, NULL)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_GERUDO_MEMBERSHIP_CARD, true)) {
         this->actor.parent = NULL;
         this->actionFunc = EnGe2_SetActionAfterTalk;
     } else {
@@ -473,7 +473,7 @@ void EnGe2_GiveCard(EnGe2* this, PlayState* play) {
         Message_CloseTextbox(play);
         this->actor.flags &= ~ACTOR_FLAG_WILL_TALK;
         this->actionFunc = EnGe2_WaitTillCardGiven;
-        if (GameInteractor_Should(VB_GIVE_ITEM_GERUDO_MEMBERSHIP_CARD, true, NULL)) {
+        if (GameInteractor_Should(VB_GIVE_ITEM_GERUDO_MEMBERSHIP_CARD, true)) {
             Actor_OfferGetItem(&this->actor, play, GI_GERUDO_CARD, 10000.0f, 50.0f);
         }
     }
@@ -605,7 +605,7 @@ void EnGe2_Update(Actor* thisx, PlayState* play) {
     }
     EnGe2_MoveAndBlink(this, play);
 
-    if (GameInteractor_Should(VB_GERUDOS_BE_FRIENDLY, EnGe2_CheckCarpentersFreed(), NULL) && !(this->stateFlags & GE2_STATE_KO)) {
+    if (GameInteractor_Should(VB_GERUDOS_BE_FRIENDLY, EnGe2_CheckCarpentersFreed()) && !(this->stateFlags & GE2_STATE_KO)) {
         this->actor.update = EnGe2_UpdateFriendly;
         this->actor.targetMode = 6;
     }
@@ -630,7 +630,7 @@ void EnGe2_UpdateStunned(Actor* thisx, PlayState* play2) {
     }
     CollisionCheck_SetAC(play, &play->colChkCtx, &this->collider.base);
 
-    if (GameInteractor_Should(VB_GERUDOS_BE_FRIENDLY, EnGe2_CheckCarpentersFreed(), NULL)) {
+    if (GameInteractor_Should(VB_GERUDOS_BE_FRIENDLY, EnGe2_CheckCarpentersFreed())) {
         this->actor.update = EnGe2_UpdateFriendly;
         this->actor.targetMode = 6;
         this->actor.colorFilterTimer = 0;
diff --git a/soh/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c b/soh/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c
index 81840dc1c..eb3042dd3 100644
--- a/soh/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c
+++ b/soh/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c
@@ -141,7 +141,7 @@ void EnGe3_WaitLookAtPlayer(EnGe3* this, PlayState* play) {
 }
 
 void EnGe3_WaitTillCardGiven(EnGe3* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_GERUDO_MEMBERSHIP_CARD, true, NULL)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_GERUDO_MEMBERSHIP_CARD, true)) {
         this->actor.parent = NULL;
         this->actionFunc = EnGe3_Wait;
     } else {
@@ -154,7 +154,7 @@ void EnGe3_GiveCard(EnGe3* this, PlayState* play) {
         Message_CloseTextbox(play);
         this->actor.flags &= ~ACTOR_FLAG_WILL_TALK;
         this->actionFunc = EnGe3_WaitTillCardGiven;
-        if (GameInteractor_Should(VB_GIVE_ITEM_GERUDO_MEMBERSHIP_CARD, true, NULL)) {
+        if (GameInteractor_Should(VB_GIVE_ITEM_GERUDO_MEMBERSHIP_CARD, true)) {
             Actor_OfferGetItem(&this->actor, play, GI_GERUDO_CARD, 10000.0f, 50.0f);
         }
     }
diff --git a/soh/src/overlays/actors/ovl_En_Gm/z_en_gm.c b/soh/src/overlays/actors/ovl_En_Gm/z_en_gm.c
index af1f26f19..5ca459672 100644
--- a/soh/src/overlays/actors/ovl_En_Gm/z_en_gm.c
+++ b/soh/src/overlays/actors/ovl_En_Gm/z_en_gm.c
@@ -99,7 +99,7 @@ s32 func_80A3D7C8(void) {
         return 0;
     } else if (GameInteractor_Should(VB_BE_ELIGIBLE_FOR_GIANTS_KNIFE_PURCHASE, (
         !CHECK_OWNED_EQUIP_ALT(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_BIGGORON) // Don't have giant's knife
-    ), NULL)) {
+    ))) {
         return 1;
     } else if (CHECK_OWNED_EQUIP_ALT(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_BROKENGIANTKNIFE)) { // Have broken giant's knife
         return 2;
diff --git a/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c b/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c
index d20a19aec..f4ef8703f 100644
--- a/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c
+++ b/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c
@@ -407,9 +407,9 @@ s16 EnGo2_UpdateTalkStateGoronDmtRollingSmall(PlayState* play, EnGo2* this) {
 }
 
 u16 EnGo2_GetTextIdGoronDmtDcEntrance(PlayState* play, EnGo2* this) {
-    if (GameInteractor_Should(VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE), NULL) && LINK_IS_ADULT) {
+    if (GameInteractor_Should(VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)) && LINK_IS_ADULT) {
         return 0x3043;
-    } else if (GameInteractor_Should(VB_GORONS_CONSIDER_DODONGOS_CAVERN_FINISHED, CHECK_QUEST_ITEM(QUEST_GORON_RUBY), NULL)) {
+    } else if (GameInteractor_Should(VB_GORONS_CONSIDER_DODONGOS_CAVERN_FINISHED, CHECK_QUEST_ITEM(QUEST_GORON_RUBY))) {
         return 0x3027;
     } else {
         return Flags_GetEventChkInf(EVENTCHKINF_BOMBED_DODONGOS_CAVERN_ENTRANCE) ? 0x3021 : Flags_GetInfTable(INFTABLE_E0) ? 0x302A : 0x3008;
@@ -428,9 +428,9 @@ s16 EnGo2_UpdateTalkStateGoronDmtDcEntrance(PlayState* play, EnGo2* this) {
 }
 
 u16 EnGo2_GetTextIdGoronCityEntrance(PlayState* play, EnGo2* this) {
-    if (GameInteractor_Should(VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE), NULL) && LINK_IS_ADULT) {
+    if (GameInteractor_Should(VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)) && LINK_IS_ADULT) {
         return 0x3043;
-    } else if (GameInteractor_Should(VB_GORONS_CONSIDER_DODONGOS_CAVERN_FINISHED, CHECK_QUEST_ITEM(QUEST_GORON_RUBY), NULL)) {
+    } else if (GameInteractor_Should(VB_GORONS_CONSIDER_DODONGOS_CAVERN_FINISHED, CHECK_QUEST_ITEM(QUEST_GORON_RUBY))) {
         return 0x3027;
     } else {
         return Flags_GetInfTable(INFTABLE_F0) ? 0x3015 : 0x3014;
@@ -449,9 +449,9 @@ s16 EnGo2_UpdateTalkStateGoronCityEntrance(PlayState* play, EnGo2* this) {
 }
 
 u16 EnGo2_GetTextIdGoronCityIsland(PlayState* play, EnGo2* this) {
-    if (GameInteractor_Should(VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE), NULL) && LINK_IS_ADULT) {
+    if (GameInteractor_Should(VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)) && LINK_IS_ADULT) {
         return 0x3043;
-    } else if (GameInteractor_Should(VB_GORONS_CONSIDER_DODONGOS_CAVERN_FINISHED, CHECK_QUEST_ITEM(QUEST_GORON_RUBY), NULL)) {
+    } else if (GameInteractor_Should(VB_GORONS_CONSIDER_DODONGOS_CAVERN_FINISHED, CHECK_QUEST_ITEM(QUEST_GORON_RUBY))) {
         return 0x3027;
     } else {
         return Flags_GetInfTable(INFTABLE_F4) ? 0x3017 : 0x3016;
@@ -470,9 +470,9 @@ s16 EnGo2_UpdateTalkStateGoronCityIsland(PlayState* play, EnGo2* this) {
 }
 
 u16 EnGo2_GetTextIdGoronCityLowestFloor(PlayState* play, EnGo2* this) {
-    if (GameInteractor_Should(VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE), NULL) && LINK_IS_ADULT) {
+    if (GameInteractor_Should(VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)) && LINK_IS_ADULT) {
         return 0x3043;
-    } else if (GameInteractor_Should(VB_GORONS_CONSIDER_DODONGOS_CAVERN_FINISHED, CHECK_QUEST_ITEM(QUEST_GORON_RUBY), NULL)) {
+    } else if (GameInteractor_Should(VB_GORONS_CONSIDER_DODONGOS_CAVERN_FINISHED, CHECK_QUEST_ITEM(QUEST_GORON_RUBY))) {
         return 0x3027;
     } else {
         return CUR_UPG_VALUE(UPG_STRENGTH) != 0    ? 0x302C
@@ -500,9 +500,9 @@ u16 EnGo2_GetTextIdGoronCityLink(PlayState* play, EnGo2* this) {
         return overrideTextId;
     }
 
-    if (GameInteractor_Should(VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE), NULL)) {
+    if (GameInteractor_Should(VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE))) {
         return Flags_GetInfTable(INFTABLE_10F) ? 0x3042 : 0x3041;
-    } else if (GameInteractor_Should(VB_GORONS_CONSIDER_TUNIC_COLLECTED, CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON), NULL)) {
+    } else if (GameInteractor_Should(VB_GORONS_CONSIDER_TUNIC_COLLECTED, CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON))) {
         return Flags_GetInfTable(INFTABLE_SPOKE_TO_GORON_LINK) ? 0x3038 : 0x3037;
     } else if (Flags_GetInfTable(INFTABLE_STOPPED_GORON_LINKS_ROLLING)) {
         this->unk_20C = 0;
@@ -568,7 +568,7 @@ s16 EnGo2_UpdateTalkStateGoronCityLink(PlayState* play, EnGo2* this) {
 u16 EnGo2_GetTextIdGoronDmtBiggoron(PlayState* play, EnGo2* this) {
     Player* player = GET_PLAYER(play);
 
-    if (GameInteractor_Should(VB_BIGGORON_CONSIDER_TRADE_COMPLETE, gSaveContext.bgsFlag, NULL)) {
+    if (GameInteractor_Should(VB_BIGGORON_CONSIDER_TRADE_COMPLETE, gSaveContext.bgsFlag)) {
         player->exchangeItemId = EXCH_ITEM_CLAIM_CHECK;
         return 0x305E;
     } else if (INV_CONTENT(ITEM_TRADE_ADULT) >= ITEM_CLAIM_CHECK) {
@@ -590,7 +590,7 @@ s16 EnGo2_UpdateTalkStateGoronDmtBiggoron(PlayState* play, EnGo2* this) {
     switch (EnGo2_GetDialogState(this, play)) {
         case TEXT_STATE_DONE:
             if (this->actor.textId == 0x305E) {
-                if (!GameInteractor_Should(VB_BIGGORON_CONSIDER_SWORD_COLLECTED, gSaveContext.bgsFlag, NULL)) {
+                if (!GameInteractor_Should(VB_BIGGORON_CONSIDER_SWORD_COLLECTED, gSaveContext.bgsFlag)) {
                     Flags_SetRandomizerInf(RAND_INF_ADULT_TRADES_DMT_TRADE_CLAIM_CHECK);
                     EnGo2_GetItem(this, play, GI_SWORD_BGS);
                     this->actionFunc = EnGo2_SetupGetItem;
@@ -1022,7 +1022,7 @@ void EnGo2_BiggoronSetTextId(EnGo2* this, PlayState* play, Player* player) {
     u16 textId;
 
     if ((this->actor.params & 0x1F) == GORON_DMT_BIGGORON) {
-        if (GameInteractor_Should(VB_BIGGORON_CONSIDER_TRADE_COMPLETE, gSaveContext.bgsFlag, NULL)) {
+        if (GameInteractor_Should(VB_BIGGORON_CONSIDER_TRADE_COMPLETE, gSaveContext.bgsFlag)) {
             if (func_8002F368(play) == EXCH_ITEM_CLAIM_CHECK) {
                 this->actor.textId = 0x3003;
             } else {
@@ -1031,18 +1031,18 @@ void EnGo2_BiggoronSetTextId(EnGo2* this, PlayState* play, Player* player) {
             player->actor.textId = this->actor.textId;
 
         } else if (
-            !GameInteractor_Should(VB_BIGGORON_CONSIDER_SWORD_COLLECTED, gSaveContext.bgsFlag, NULL) && 
+            !GameInteractor_Should(VB_BIGGORON_CONSIDER_SWORD_COLLECTED, gSaveContext.bgsFlag) && 
             (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_CLAIM_CHECK)
         ) {
             if (func_8002F368(play) == EXCH_ITEM_CLAIM_CHECK) {
-                if (GameInteractor_Should(VB_BIGGORON_CONSIDER_SWORD_FORGED, Environment_GetBgsDayCount() >= 3, NULL)) {
+                if (GameInteractor_Should(VB_BIGGORON_CONSIDER_SWORD_FORGED, Environment_GetBgsDayCount() >= 3)) {
                     textId = 0x305E;
                 } else {
                     textId = 0x305D;
                 }
                 this->actor.textId = textId;
             } else {
-                if (GameInteractor_Should(VB_BIGGORON_CONSIDER_SWORD_FORGED, Environment_GetBgsDayCount() >= 3, NULL)) {
+                if (GameInteractor_Should(VB_BIGGORON_CONSIDER_SWORD_FORGED, Environment_GetBgsDayCount() >= 3)) {
                     textId = 0x3002;
                 } else {
                     textId = 0x305D;
@@ -1171,8 +1171,8 @@ s32 EnGo2_IsCameraModified(EnGo2* this, PlayState* play) {
         (this->actor.params & 0x1F) == GORON_MARKET_BAZAAR) {
         return true;
     } else if (
-        !GameInteractor_Should(VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE), NULL) &&
-        GameInteractor_Should(VB_GORONS_CONSIDER_TUNIC_COLLECTED, CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON), NULL)
+        !GameInteractor_Should(VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)) &&
+        GameInteractor_Should(VB_GORONS_CONSIDER_TUNIC_COLLECTED, CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON))
     ) {
         return true;
     } else {
@@ -1231,8 +1231,8 @@ void EnGo2_SelectGoronWakingUp(EnGo2* this) {
             break;
         case GORON_CITY_LINK:
             if (
-                !GameInteractor_Should(VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE), NULL) &&
-                GameInteractor_Should(VB_GORONS_CONSIDER_TUNIC_COLLECTED, CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON), NULL)
+                !GameInteractor_Should(VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)) &&
+                GameInteractor_Should(VB_GORONS_CONSIDER_TUNIC_COLLECTED, CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON))
             ) {
                 EnGo2_WakingUp(this);
                 break;
@@ -1561,7 +1561,7 @@ void EnGo2_Init(Actor* thisx, PlayState* play) {
         case GORON_CITY_LOWEST_FLOOR:
         case GORON_CITY_STAIRWELL:
         case GORON_CITY_LOST_WOODS:
-            if (!GameInteractor_Should(VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE), NULL) && LINK_IS_ADULT) {
+            if (!GameInteractor_Should(VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)) && LINK_IS_ADULT) {
                 Actor_Kill(&this->actor);
             }
             this->actionFunc = EnGo2_CurledUp;
@@ -1577,8 +1577,8 @@ void EnGo2_Init(Actor* thisx, PlayState* play) {
                 Path_CopyLastPoint(this->path, &this->actor.world.pos);
                 this->actor.home.pos = this->actor.world.pos;
                 if (
-                    !GameInteractor_Should(VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE), NULL) &&
-                    GameInteractor_Should(VB_GORONS_CONSIDER_TUNIC_COLLECTED, CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON), NULL)
+                    !GameInteractor_Should(VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)) &&
+                    GameInteractor_Should(VB_GORONS_CONSIDER_TUNIC_COLLECTED, CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON))
                 ) {
                     EnGo2_GetItemAnimation(this, play);
                 } else {
@@ -1795,7 +1795,7 @@ void EnGo2_ReverseRolling(EnGo2* this, PlayState* play) {
 }
 
 void EnGo2_SetupGetItem(EnGo2* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_FROM_GORON, true, NULL)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_FROM_GORON, true)) {
         this->actor.parent = NULL;
         this->actionFunc = EnGo2_SetGetItem;
     } else {
@@ -1804,7 +1804,7 @@ void EnGo2_SetupGetItem(EnGo2* this, PlayState* play) {
 }
 
 void EnGo2_SetGetItem(EnGo2* this, PlayState* play) {
-    if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play) || !GameInteractor_Should(VB_GIVE_ITEM_FROM_GORON, true, NULL)) {
+    if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play) || !GameInteractor_Should(VB_GIVE_ITEM_FROM_GORON, true)) {
         this->interactInfo.talkState = NPC_TALK_STATE_IDLE;
         switch (this->getItemId) {
             case GI_CLAIM_CHECK:
@@ -1816,7 +1816,7 @@ void EnGo2_SetGetItem(EnGo2* this, PlayState* play) {
                 EnGo2_GetItemAnimation(this, play);
                 return;
             case GI_SWORD_BGS:
-                if (GameInteractor_Should(VB_GIVE_ITEM_FROM_GORON, true, NULL)) {
+                if (GameInteractor_Should(VB_GIVE_ITEM_FROM_GORON, true)) {
                     gSaveContext.bgsFlag = true;
                 }
                 break;
@@ -1837,12 +1837,12 @@ void EnGo2_BiggoronEyedrops(EnGo2* this, PlayState* play) {
             this->actor.flags &= ~ACTOR_FLAG_TARGETABLE;
             this->actor.shape.rot.y += 0x5B0;
             this->trackingMode = NPC_TRACKING_NONE;
-            this->animTimer = !GameInteractor_Should(VB_PLAY_EYEDROPS_CS, true, NULL) ? 0 : (this->skelAnime.endFrame + 60.0f + 60.0f); // eyeDrops animation timer
+            this->animTimer = !GameInteractor_Should(VB_PLAY_EYEDROPS_CS, true) ? 0 : (this->skelAnime.endFrame + 60.0f + 60.0f); // eyeDrops animation timer
             this->eyeMouthTexState = 2;
             this->unk_20C = 0;
             this->goronState++;
             func_800F483C(0x28, 5);
-            if (GameInteractor_Should(VB_PLAY_EYEDROPS_CS, true, NULL)) {
+            if (GameInteractor_Should(VB_PLAY_EYEDROPS_CS, true)) {
                 OnePointCutscene_Init(play, 4190, -99, &this->actor, MAIN_CAM);
             }
             break;
diff --git a/soh/src/overlays/actors/ovl_En_Hs/z_en_hs.c b/soh/src/overlays/actors/ovl_En_Hs/z_en_hs.c
index f6e48a913..af9f83fc2 100644
--- a/soh/src/overlays/actors/ovl_En_Hs/z_en_hs.c
+++ b/soh/src/overlays/actors/ovl_En_Hs/z_en_hs.c
@@ -130,7 +130,7 @@ void func_80A6E5EC(EnHs* this, PlayState* play) {
 
 void func_80A6E630(EnHs* this, PlayState* play) {
     if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) {
-        if (GameInteractor_Should(VB_TRADE_TIMER_ODD_MUSHROOM, true, NULL)) {
+        if (GameInteractor_Should(VB_TRADE_TIMER_ODD_MUSHROOM, true)) {
             func_80088AA0(180);
             gSaveContext.eventInf[1] &= ~1;
         }
diff --git a/soh/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c b/soh/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c
index 08d1e1c98..38331e50b 100644
--- a/soh/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c
+++ b/soh/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c
@@ -119,7 +119,7 @@ void func_80A90264(EnKakasi2* this, PlayState* play) {
 
     this->unk_194++;
 
-    if ((BREG(1) != 0) || GameInteractor_Should(VB_SKIP_SCARECROWS_SONG, false, NULL) && (this->actor.xzDistToPlayer < this->maxSpawnDistance.x) &&
+    if ((BREG(1) != 0) || GameInteractor_Should(VB_SKIP_SCARECROWS_SONG, false) && (this->actor.xzDistToPlayer < this->maxSpawnDistance.x) &&
         (fabsf(player->actor.world.pos.y - this->actor.world.pos.y) < this->maxSpawnDistance.y)) {
         this->actor.draw = func_80A90948;
         Collider_InitCylinder(play, &this->collider);
diff --git a/soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c b/soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c
index 5bc2b690d..2bef0d30f 100644
--- a/soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c
+++ b/soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c
@@ -524,7 +524,7 @@ void EnKz_SetupGetItem(EnKz* this, PlayState* play) {
 
 void EnKz_StartTimer(EnKz* this, PlayState* play) {
     if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) {
-        if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_FROG && GameInteractor_Should(VB_TRADE_TIMER_FROG, true, NULL)) { 
+        if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_FROG && GameInteractor_Should(VB_TRADE_TIMER_FROG, true)) { 
             func_80088AA0(180); // start timer2 with 3 minutes
             gSaveContext.eventInf[1] &= ~1;
         }
diff --git a/soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c b/soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c
index c9521b133..e8a79b437 100644
--- a/soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c
+++ b/soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c
@@ -91,8 +91,8 @@ static void* sEyeTextures[] = {
 };
 
 u16 EnMa1_GetText(PlayState* play, Actor* thisx) {
-    bool malonReturnedFromCastle = GameInteractor_Should(VB_MALON_RETURN_FROM_CASTLE, Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE), NULL);
-    bool malonTaughtEponasSong = GameInteractor_Should(VB_MALON_ALREADY_TAUGHT_EPONAS_SONG, CHECK_QUEST_ITEM(QUEST_SONG_EPONA), NULL);
+    bool malonReturnedFromCastle = GameInteractor_Should(VB_MALON_RETURN_FROM_CASTLE, Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE));
+    bool malonTaughtEponasSong = GameInteractor_Should(VB_MALON_ALREADY_TAUGHT_EPONAS_SONG, CHECK_QUEST_ITEM(QUEST_SONG_EPONA));
     u16 faceReaction = Text_GetFaceReaction(play, 0x17);
 
     if (faceReaction != 0) {
@@ -185,7 +185,7 @@ s16 func_80AA0778(PlayState* play, Actor* thisx) {
 }
 
 s32 func_80AA08C4(EnMa1* this, PlayState* play) {
-    bool malonReturnedFromCastle = GameInteractor_Should(VB_MALON_RETURN_FROM_CASTLE, Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE), NULL);
+    bool malonReturnedFromCastle = GameInteractor_Should(VB_MALON_RETURN_FROM_CASTLE, Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE));
 
     if ((this->actor.shape.rot.z == 3) && (gSaveContext.sceneSetupIndex == 5)) {
         return 1;
@@ -269,8 +269,8 @@ void func_80AA0B74(EnMa1* this) {
 
 void EnMa1_Init(Actor* thisx, PlayState* play) {
     EnMa1* this = (EnMa1*)thisx;
-    bool malonReturnedFromCastle = GameInteractor_Should(VB_MALON_RETURN_FROM_CASTLE, Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE), NULL);
-    bool malonTaughtEponasSong = GameInteractor_Should(VB_MALON_ALREADY_TAUGHT_EPONAS_SONG, CHECK_QUEST_ITEM(QUEST_SONG_EPONA), NULL);
+    bool malonReturnedFromCastle = GameInteractor_Should(VB_MALON_RETURN_FROM_CASTLE, Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE));
+    bool malonTaughtEponasSong = GameInteractor_Should(VB_MALON_ALREADY_TAUGHT_EPONAS_SONG, CHECK_QUEST_ITEM(QUEST_SONG_EPONA));
     s32 pad;
 
     ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 18.0f);
@@ -306,8 +306,8 @@ void EnMa1_Destroy(Actor* thisx, PlayState* play) {
 }
 
 void func_80AA0D88(EnMa1* this, PlayState* play) {
-    bool malonReturnedFromCastle = GameInteractor_Should(VB_MALON_RETURN_FROM_CASTLE, Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE), NULL);
-    bool malonTaughtEponasSong = GameInteractor_Should(VB_MALON_ALREADY_TAUGHT_EPONAS_SONG, CHECK_QUEST_ITEM(QUEST_SONG_EPONA), NULL);
+    bool malonReturnedFromCastle = GameInteractor_Should(VB_MALON_RETURN_FROM_CASTLE, Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE));
+    bool malonTaughtEponasSong = GameInteractor_Should(VB_MALON_ALREADY_TAUGHT_EPONAS_SONG, CHECK_QUEST_ITEM(QUEST_SONG_EPONA));
 
     if (this->interactInfo.talkState != NPC_TALK_STATE_IDLE) {
         if (this->skelAnime.animation != &gMalonChildIdleAnim) {
@@ -331,7 +331,7 @@ void func_80AA0D88(EnMa1* this, PlayState* play) {
 }
 
 void func_80AA0EA0(EnMa1* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_WEIRD_EGG, true, NULL)) {
+    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_WEIRD_EGG, true)) {
         this->actor.parent = NULL;
         this->actionFunc = func_80AA0EFC;
     } else {
@@ -340,7 +340,7 @@ void func_80AA0EA0(EnMa1* this, PlayState* play) {
 }
 
 void func_80AA0EFC(EnMa1* this, PlayState* play) {
-    if (this->interactInfo.talkState == NPC_TALK_STATE_ITEM_GIVEN || !GameInteractor_Should(VB_GIVE_ITEM_WEIRD_EGG, true, NULL)) {
+    if (this->interactInfo.talkState == NPC_TALK_STATE_ITEM_GIVEN || !GameInteractor_Should(VB_GIVE_ITEM_WEIRD_EGG, true)) {
         this->interactInfo.talkState = NPC_TALK_STATE_IDLE;
         this->actionFunc = func_80AA0D88;
         Flags_SetEventChkInf(EVENTCHKINF_OBTAINED_POCKET_EGG);
diff --git a/soh/src/overlays/actors/ovl_En_Mk/z_en_mk.c b/soh/src/overlays/actors/ovl_En_Mk/z_en_mk.c
index 148882730..36a8b34c5 100644
--- a/soh/src/overlays/actors/ovl_En_Mk/z_en_mk.c
+++ b/soh/src/overlays/actors/ovl_En_Mk/z_en_mk.c
@@ -97,7 +97,7 @@ void func_80AACA94(EnMk* this, PlayState* play) {
         this->actor.parent = NULL;
         this->actionFunc = func_80AACA40;
         Flags_SetRandomizerInf(RAND_INF_ADULT_TRADES_LH_TRADE_FROG);
-        if (GameInteractor_Should(VB_TRADE_TIMER_EYEDROPS, true, NULL)) {
+        if (GameInteractor_Should(VB_TRADE_TIMER_EYEDROPS, true)) {
             func_80088AA0(240);
             gSaveContext.eventInf[1] &= ~1;
         }
diff --git a/soh/src/overlays/actors/ovl_En_Nb/z_en_nb.c b/soh/src/overlays/actors/ovl_En_Nb/z_en_nb.c
index 1cb2d7908..c24e00e84 100644
--- a/soh/src/overlays/actors/ovl_En_Nb/z_en_nb.c
+++ b/soh/src/overlays/actors/ovl_En_Nb/z_en_nb.c
@@ -327,7 +327,7 @@ void EnNb_GiveMedallion(EnNb* this, PlayState* play) {
 
     Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DEMO_EFFECT, posX, posY, posZ, 0, 0, 0,
                        0xC);
-    if (GameInteractor_Should(VB_GIVE_ITEM_SPIRIT_MEDALLION, true, NULL)) {
+    if (GameInteractor_Should(VB_GIVE_ITEM_SPIRIT_MEDALLION, true)) {
         Item_Give(play, ITEM_MEDALLION_SPIRIT);
     }
 }
@@ -345,7 +345,7 @@ void EnNb_SetupChamberCsImpl(EnNb* this, PlayState* play) {
         this->action = NB_CHAMBER_UNDERGROUND;
         play->csCtx.segment = &D_80AB431C;
         gSaveContext.cutsceneTrigger = 2;
-        if (GameInteractor_Should(VB_GIVE_ITEM_SPIRIT_MEDALLION, true, NULL)) {
+        if (GameInteractor_Should(VB_GIVE_ITEM_SPIRIT_MEDALLION, true)) {
             Item_Give(play, ITEM_MEDALLION_SPIRIT);
         }
         player->actor.world.rot.y = player->actor.shape.rot.y = this->actor.world.rot.y + 0x8000;
diff --git a/soh/src/overlays/actors/ovl_En_Rl/z_en_rl.c b/soh/src/overlays/actors/ovl_En_Rl/z_en_rl.c
index e321540af..12b23037d 100644
--- a/soh/src/overlays/actors/ovl_En_Rl/z_en_rl.c
+++ b/soh/src/overlays/actors/ovl_En_Rl/z_en_rl.c
@@ -127,7 +127,7 @@ void func_80AE7590(EnRl* this, PlayState* play) {
         pos.y = player->actor.world.pos.y + 80.0f;
         pos.z = player->actor.world.pos.z;
         Actor_Spawn(&play->actorCtx, play, ACTOR_DEMO_EFFECT, pos.x, pos.y, pos.z, 0, 0, 0, 0xE, true);
-        if (GameInteractor_Should(VB_GIVE_ITEM_LIGHT_MEDALLION, true, NULL)) {
+        if (GameInteractor_Should(VB_GIVE_ITEM_LIGHT_MEDALLION, true)) {
             Item_Give(play, ITEM_MEDALLION_LIGHT);
         }
         this->lightMedallionGiven = 1;
diff --git a/soh/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c b/soh/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c
index 008e0b6a5..2905390bb 100644
--- a/soh/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c
+++ b/soh/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c
@@ -261,7 +261,7 @@ void func_80AF2A38(EnRu2* this, PlayState* play) {
     f32 posZ = player->actor.world.pos.z;
 
     Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DEMO_EFFECT, posX, posY, posZ, 0, 0, 0, 10);
-    if (GameInteractor_Should(VB_GIVE_ITEM_WATER_MEDALLION, true, NULL)) {
+    if (GameInteractor_Should(VB_GIVE_ITEM_WATER_MEDALLION, true)) {
         Item_Give(play, ITEM_MEDALLION_WATER);
     }
 }
@@ -276,7 +276,7 @@ void func_80AF2AB4(EnRu2* this, PlayState* play) {
         this->action = 1;
         play->csCtx.segment = &D_80AF411C;
         gSaveContext.cutsceneTrigger = 2;
-        if (GameInteractor_Should(VB_GIVE_ITEM_WATER_MEDALLION, true, NULL)) {
+        if (GameInteractor_Should(VB_GIVE_ITEM_WATER_MEDALLION, true)) {
             Item_Give(play, ITEM_MEDALLION_WATER);
         }
         temp = this->actor.world.rot.y + 0x8000;
diff --git a/soh/src/overlays/actors/ovl_En_Sa/z_en_sa.c b/soh/src/overlays/actors/ovl_En_Sa/z_en_sa.c
index 73223218e..ff36e98d0 100644
--- a/soh/src/overlays/actors/ovl_En_Sa/z_en_sa.c
+++ b/soh/src/overlays/actors/ovl_En_Sa/z_en_sa.c
@@ -391,10 +391,10 @@ s32 func_80AF5DFC(EnSa* this, PlayState* play) {
         return 1;
     }
     if (play->sceneNum == SCENE_SACRED_FOREST_MEADOW && (Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_ZELDAS_LETTER))) {
-        return GameInteractor_Should(VB_BE_ELIGIBLE_FOR_SARIAS_SONG, !CHECK_QUEST_ITEM(QUEST_SONG_SARIA), NULL) ? 5 : 2;
+        return GameInteractor_Should(VB_BE_ELIGIBLE_FOR_SARIAS_SONG, !CHECK_QUEST_ITEM(QUEST_SONG_SARIA)) ? 5 : 2;
     }
     if (play->sceneNum == SCENE_KOKIRI_FOREST && !CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD)) {
-        if (GameInteractor_Should(VB_NOT_BE_GREETED_BY_SARIA, Flags_GetInfTable(INFTABLE_GREETED_BY_SARIA), NULL)) {
+        if (GameInteractor_Should(VB_NOT_BE_GREETED_BY_SARIA, Flags_GetInfTable(INFTABLE_GREETED_BY_SARIA))) {
             return 1;
         }
         return 4;
@@ -708,7 +708,7 @@ void func_80AF68E4(EnSa* this, PlayState* play) {
 
 void func_80AF6B20(EnSa* this, PlayState* play) {
     if (play->sceneNum == SCENE_SACRED_FOREST_MEADOW) {
-        if (GameInteractor_Should(VB_GIVE_ITEM_SARIAS_SONG, true, NULL)) {
+        if (GameInteractor_Should(VB_GIVE_ITEM_SARIAS_SONG, true)) {
             Item_Give(play, ITEM_SONG_SARIA);
         }
         EnSa_ChangeAnim(this, ENSA_ANIM1_6);
diff --git a/soh/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c b/soh/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c
index 88eeb6ebd..594d72bca 100644
--- a/soh/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c
+++ b/soh/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c
@@ -291,7 +291,7 @@ void func_80B20768(EnToryo* this, PlayState* play) {
     s16 sp32;
     s16 sp30;
 
-    if (this->unk_1E4 == 3 && !GameInteractor_Should(VB_FIX_SAW_SOFTLOCK, false, NULL)) {
+    if (this->unk_1E4 == 3 && !GameInteractor_Should(VB_FIX_SAW_SOFTLOCK, false)) {
         Actor_ProcessTalkRequest(&this->actor, play);
         Message_ContinueTextbox(play, this->actor.textId);
         this->unk_1E4 = 1;
diff --git a/soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c b/soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c
index b51b7f630..991853c55 100644
--- a/soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c
+++ b/soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c
@@ -298,15 +298,15 @@ s32 EnXc_MinuetCS(EnXc* this, PlayState* play) {
 
         if (z < -2225.0f) {
             if (!Play_InCsMode(play)) {
-                if (GameInteractor_Should(VB_PLAY_MINUET_OF_FOREST_CS, true, NULL)) {
+                if (GameInteractor_Should(VB_PLAY_MINUET_OF_FOREST_CS, true)) {
                     play->csCtx.segment = SEGMENTED_TO_VIRTUAL(&gMinuetCs);
                     gSaveContext.cutsceneTrigger = 1;
                 }
                 Flags_SetEventChkInf(EVENTCHKINF_LEARNED_MINUET_OF_FOREST);
-                if (GameInteractor_Should(VB_GIVE_ITEM_MINUET_OF_FOREST, true, NULL)) {
+                if (GameInteractor_Should(VB_GIVE_ITEM_MINUET_OF_FOREST, true)) {
                     Item_Give(play, ITEM_SONG_MINUET);
                 }
-                if (GameInteractor_Should(VB_PLAY_MINUET_OF_FOREST_CS, true, NULL)) {
+                if (GameInteractor_Should(VB_PLAY_MINUET_OF_FOREST_CS, true)) {
                     return true;
                 }
             }
@@ -335,15 +335,15 @@ s32 EnXc_BoleroCS(EnXc* this, PlayState* play) {
         if ((posRot->pos.x > -784.0f) && (posRot->pos.x < -584.0f) && (posRot->pos.y > 447.0f) &&
             (posRot->pos.y < 647.0f) && (posRot->pos.z > -446.0f) && (posRot->pos.z < -246.0f) &&
             !Play_InCsMode(play)) {
-            if (GameInteractor_Should(VB_PLAY_BOLERO_OF_FIRE_CS, true, NULL)) {
+            if (GameInteractor_Should(VB_PLAY_BOLERO_OF_FIRE_CS, true)) {
                 play->csCtx.segment = SEGMENTED_TO_VIRTUAL(&gDeathMountainCraterBoleroCs);
                 gSaveContext.cutsceneTrigger = 1;
             }
             Flags_SetEventChkInf(EVENTCHKINF_LEARNED_BOLERO_OF_FIRE);
-            if (GameInteractor_Should(VB_GIVE_ITEM_BOLERO_OF_FIRE, true, NULL)) {
+            if (GameInteractor_Should(VB_GIVE_ITEM_BOLERO_OF_FIRE, true)) {
                 Item_Give(play, ITEM_SONG_BOLERO);
             }
-            if (GameInteractor_Should(VB_PLAY_BOLERO_OF_FIRE_CS, true, NULL)) {
+            if (GameInteractor_Should(VB_PLAY_BOLERO_OF_FIRE_CS, true)) {
                 return true;
             }
         }
@@ -354,7 +354,7 @@ s32 EnXc_BoleroCS(EnXc* this, PlayState* play) {
 
 void EnXc_SetupSerenadeAction(EnXc* this, PlayState* play) {
     // Player is adult and does not have iron boots and has not learned Serenade
-    if (GameInteractor_Should(VB_SHIEK_PREPARE_TO_GIVE_SERENADE_OF_WATER, (!CHECK_OWNED_EQUIP(EQUIP_TYPE_BOOTS, EQUIP_INV_BOOTS_IRON) && !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_SERENADE_OF_WATER)) && LINK_IS_ADULT, NULL)) {
+    if (GameInteractor_Should(VB_SHIEK_PREPARE_TO_GIVE_SERENADE_OF_WATER, (!CHECK_OWNED_EQUIP(EQUIP_TYPE_BOOTS, EQUIP_INV_BOOTS_IRON) && !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_SERENADE_OF_WATER)) && LINK_IS_ADULT)) {
         this->action = SHEIK_ACTION_SERENADE;
         osSyncPrintf("水のセレナーデ シーク誕生!!!!!!!!!!!!!!!!!!\n");
     } else {
@@ -367,18 +367,18 @@ s32 EnXc_SerenadeCS(EnXc* this, PlayState* play) {
     if (this->actor.params == SHEIK_TYPE_SERENADE) {
         Player* player = GET_PLAYER(play);
         s32 stateFlags = player->stateFlags1;
-        if (GameInteractor_Should(VB_BE_ELIGIBLE_FOR_SERENADE_OF_WATER, CHECK_OWNED_EQUIP(EQUIP_TYPE_BOOTS, EQUIP_INV_BOOTS_IRON) && !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_SERENADE_OF_WATER), NULL) &&
+        if (GameInteractor_Should(VB_BE_ELIGIBLE_FOR_SERENADE_OF_WATER, CHECK_OWNED_EQUIP(EQUIP_TYPE_BOOTS, EQUIP_INV_BOOTS_IRON) && !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_SERENADE_OF_WATER)) &&
             !(stateFlags & PLAYER_STATE1_IN_CUTSCENE) && !Play_InCsMode(play)) {
-            if (GameInteractor_Should(VB_PLAY_SERENADE_OF_WATER_CS, true, NULL)) {
+            if (GameInteractor_Should(VB_PLAY_SERENADE_OF_WATER_CS, true)) {
                 Cutscene_SetSegment(play, &gIceCavernSerenadeCs);
                 gSaveContext.cutsceneTrigger = 1;
             }
             Flags_SetEventChkInf(EVENTCHKINF_LEARNED_SERENADE_OF_WATER); // Learned Serenade of Water Flag
-            if (GameInteractor_Should(VB_GIVE_ITEM_SERENADE_OF_WATER, true, NULL)) {
+            if (GameInteractor_Should(VB_GIVE_ITEM_SERENADE_OF_WATER, true)) {
                 Item_Give(play, ITEM_SONG_SERENADE);
             }
             osSyncPrintf("ブーツを取った!!!!!!!!!!!!!!!!!!\n");
-            if (GameInteractor_Should(VB_PLAY_SERENADE_OF_WATER_CS, true, NULL)) {
+            if (GameInteractor_Should(VB_PLAY_SERENADE_OF_WATER_CS, true)) {
                 return true;
             }
         }
@@ -2185,17 +2185,17 @@ void EnXc_InitTempleOfTime(EnXc* this, PlayState* play) {
     if (LINK_IS_ADULT) {
         if (!Flags_GetEventChkInf(EVENTCHKINF_SHEIK_SPAWNED_AT_MASTER_SWORD_PEDESTAL)) {
             Flags_SetEventChkInf(EVENTCHKINF_SHEIK_SPAWNED_AT_MASTER_SWORD_PEDESTAL);
-            if (GameInteractor_Should(VB_PLAY_SHIEK_BLOCK_MASTER_SWORD_CS, true, NULL)) {
+            if (GameInteractor_Should(VB_PLAY_SHIEK_BLOCK_MASTER_SWORD_CS, true)) {
                 play->csCtx.segment = SEGMENTED_TO_VIRTUAL(gTempleOfTimeFirstAdultCs);
                 gSaveContext.cutsceneTrigger = 1;
             }
             func_80B3EBF0(this, play);
-        } else if (GameInteractor_Should(VB_BE_ELIGIBLE_FOR_PRELUDE_OF_LIGHT, !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT) && Flags_GetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP), NULL)) {
+        } else if (GameInteractor_Should(VB_BE_ELIGIBLE_FOR_PRELUDE_OF_LIGHT, !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT) && Flags_GetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP))) {
             Flags_SetEventChkInf(EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT);
-            if (GameInteractor_Should(VB_GIVE_ITEM_PRELUDE_OF_LIGHT, true, NULL)) {
+            if (GameInteractor_Should(VB_GIVE_ITEM_PRELUDE_OF_LIGHT, true)) {
                 Item_Give(play, ITEM_SONG_PRELUDE);
             }
-            if (GameInteractor_Should(VB_PLAY_PRELUDE_OF_LIGHT_CS, true, NULL)) {
+            if (GameInteractor_Should(VB_PLAY_PRELUDE_OF_LIGHT_CS, true)) {
                 play->csCtx.segment = SEGMENTED_TO_VIRTUAL(gTempleOfTimePreludeCs);
                 gSaveContext.cutsceneTrigger = 1;
             }
diff --git a/soh/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c b/soh/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c
index 40351399e..79e3e95e4 100644
--- a/soh/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c
+++ b/soh/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c
@@ -634,7 +634,7 @@ void EnZl2_GiveLightArrows(EnZl2* this, PlayState* play) {
         posY = player->actor.world.pos.y + 80.0f;
         posZ = player->actor.world.pos.z;
         Actor_Spawn(&play->actorCtx, play, ACTOR_DEMO_EFFECT, posX, posY, posZ, 0, 0, 0, 0x17, true);
-        if (GameInteractor_Should(VB_GIVE_ITEM_LIGHT_ARROW, true, NULL)) {
+        if (GameInteractor_Should(VB_GIVE_ITEM_LIGHT_ARROW, true)) {
             Item_Give(play, ITEM_ARROW_LIGHT);
         }
         this->unk_244 = 1;
diff --git a/soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c b/soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
index 215d6400c..e50ba85d5 100644
--- a/soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
+++ b/soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
@@ -1108,7 +1108,7 @@ s32 EnZl4_CsMakePlan(EnZl4* this, PlayState* play) {
                 Camera_ChangeSetting(GET_ACTIVE_CAM(play), 1);
                 this->talkState = 7;
                 play->talkWithPlayer(play, &this->actor);
-                if (GameInteractor_Should(VB_GIVE_ITEM_ZELDAS_LETTER, true, NULL)) {
+                if (GameInteractor_Should(VB_GIVE_ITEM_ZELDAS_LETTER, true)) {
                     Actor_OfferGetItem(&this->actor, play, GI_LETTER_ZELDA, fabsf(this->actor.xzDistToPlayer) + 1.0f,
                                 fabsf(this->actor.yDistToPlayer) + 1.0f);
                 }
@@ -1117,7 +1117,7 @@ s32 EnZl4_CsMakePlan(EnZl4* this, PlayState* play) {
             }
             break;
         case 7:
-            if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_ZELDAS_LETTER, true, NULL)) {
+            if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_ZELDAS_LETTER, true)) {
                 Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ZL4_ANIM_0);
                 this->talkState++;
             } else {
diff --git a/soh/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c b/soh/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c
index cf83b730a..7a16f2a71 100644
--- a/soh/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c
+++ b/soh/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c
@@ -179,7 +179,7 @@ void ItemOcarina_WaitInWater(ItemOcarina* this, PlayState* play) {
     if (
         Actor_HasParent(&this->actor, play) || 
         (
-            !GameInteractor_Should(VB_GIVE_ITEM_OCARINA_OF_TIME, true, NULL) &&
+            !GameInteractor_Should(VB_GIVE_ITEM_OCARINA_OF_TIME, true) &&
             (this->actor.xzDistToPlayer < 20.0f) && (fabsf(this->actor.yDistToPlayer) < 10.0f) &&
             GET_PLAYER(play)->stateFlags2 & PLAYER_STATE2_DIVING
         )
@@ -189,7 +189,7 @@ void ItemOcarina_WaitInWater(ItemOcarina* this, PlayState* play) {
         this->actionFunc = ItemOcarina_StartSoTCutscene;
         this->actor.draw = NULL;
     } else {
-        if (GameInteractor_Should(VB_GIVE_ITEM_OCARINA_OF_TIME, true, NULL)) {
+        if (GameInteractor_Should(VB_GIVE_ITEM_OCARINA_OF_TIME, true)) {
             Actor_OfferGetItem(&this->actor, play, GI_OCARINA_OOT, 30.0f, 50.0f);
         }
 
diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c
index 0acf4f1f0..7efda7db2 100644
--- a/soh/src/overlays/actors/ovl_player_actor/z_player.c
+++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c
@@ -4843,7 +4843,7 @@ s32 Player_ActionChange_1(Player* this, PlayState* play) {
     if ((this->doorType != PLAYER_DOORTYPE_NONE) &&
         (!(this->stateFlags1 & PLAYER_STATE1_ITEM_OVER_HEAD) ||
          ((this->heldActor != NULL) && (this->heldActor->id == ACTOR_EN_RU1)))) {
-        if ((CHECK_BTN_ALL(sControlInput->press.button, BTN_A) || (Player_Action_8084F9A0 == this->actionFunc)) && GameInteractor_Should(VB_BE_ABLE_TO_OPEN_DOORS, true, NULL)) {
+        if ((CHECK_BTN_ALL(sControlInput->press.button, BTN_A) || (Player_Action_8084F9A0 == this->actionFunc)) && GameInteractor_Should(VB_BE_ABLE_TO_OPEN_DOORS, true)) {
             doorActor = this->doorActor;
 
             if (this->doorType <= PLAYER_DOORTYPE_AJAR) {
@@ -8515,7 +8515,7 @@ void func_80842A88(PlayState* play, Player* this) {
 s32 func_80842AC4(PlayState* play, Player* this) {
     if ((this->heldItemAction == PLAYER_IA_DEKU_STICK) && (this->unk_85C > 0.5f)) {
 
-        if (GameInteractor_Should(VB_DEKU_STICK_BREAK, AMMO(ITEM_STICK) != 0, NULL)) {
+        if (GameInteractor_Should(VB_DEKU_STICK_BREAK, AMMO(ITEM_STICK) != 0)) {
             EffectSsStick_Spawn(play, &this->bodyPartsPos[PLAYER_BODYPART_R_HAND],
                                 this->actor.shape.rot.y + 0x8000);
             this->unk_85C = 0.5f;
@@ -10229,7 +10229,7 @@ void Player_Init(Actor* thisx, PlayState* play2) {
 
     if ((sp50 == 0) || (sp50 < -1)) {
         titleFileSize = scene->titleFile.vromEnd - scene->titleFile.vromStart;
-        if (GameInteractor_Should(VB_SHOW_TITLE_CARD, gSaveContext.showTitleCard, NULL)) {
+        if (GameInteractor_Should(VB_SHOW_TITLE_CARD, gSaveContext.showTitleCard)) {
             if ((gSaveContext.sceneSetupIndex < 4) &&
                 (gEntranceTable[((void)0, gSaveContext.entranceIndex) + ((void)0, gSaveContext.sceneSetupIndex)].field &
                  ENTRANCE_INFO_DISPLAY_TITLE_CARD_FLAG) &&
@@ -10935,21 +10935,21 @@ static Color_RGBA8 D_808547C0 = { 255, 50, 0, 0 };
 void Player_UpdateBurningDekuStick(PlayState* play, Player* this) {
     f32 temp;
 
-    if (GameInteractor_Should(VB_DEKU_STICK_BURN_OUT, this->unk_85C == 0.0f, NULL)) {
+    if (GameInteractor_Should(VB_DEKU_STICK_BURN_OUT, this->unk_85C == 0.0f)) {
         Player_UseItem(play, this, ITEM_NONE);
         return;
     }
 
     temp = 1.0f;
     uint8_t vanillaShouldBurnOutCondition = DECR(this->unk_860) == 0;
-    if (GameInteractor_Should(VB_DEKU_STICK_BURN_OUT, vanillaShouldBurnOutCondition, NULL)) {
+    if (GameInteractor_Should(VB_DEKU_STICK_BURN_OUT, vanillaShouldBurnOutCondition)) {
         Inventory_ChangeAmmo(ITEM_STICK, -1);
         this->unk_860 = 1;
         temp = 0.0f;
         this->unk_85C = temp;
     } else if (this->unk_860 > 200) {
         temp = (210 - this->unk_860) / 10.0f;
-    } else if (GameInteractor_Should(VB_DEKU_STICK_BURN_DOWN, this->unk_860 < 20, NULL)) {
+    } else if (GameInteractor_Should(VB_DEKU_STICK_BURN_DOWN, this->unk_860 < 20)) {
         temp = this->unk_860 / 20.0f;
         this->unk_85C = temp;
     }
@@ -11251,7 +11251,7 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) {
     func_80836BEC(this, play);
 
     if (this->heldItemAction == PLAYER_IA_DEKU_STICK &&
-        GameInteractor_Should(VB_DEKU_STICK_BE_ON_FIRE, this->unk_860 != 0, NULL)) {
+        GameInteractor_Should(VB_DEKU_STICK_BE_ON_FIRE, this->unk_860 != 0)) {
         Player_UpdateBurningDekuStick(play, this);
     } else if ((this->heldItemAction == PLAYER_IA_FISHING_POLE) && (this->unk_860 < 0)) {
         this->unk_860++;
@@ -13533,7 +13533,7 @@ s32 func_8084DFF4(PlayState* play, Player* this) {
         play->msgCtx.msgMode = MSGMODE_TEXT_DONE;
     } else {
         if (Message_GetState(&play->msgCtx) == TEXT_STATE_CLOSING) {
-            if (GameInteractor_Should(VB_PLAY_NABOORU_CAPTURED_CS, this->getItemId == GI_GAUNTLETS_SILVER, NULL)) {
+            if (GameInteractor_Should(VB_PLAY_NABOORU_CAPTURED_CS, this->getItemId == GI_GAUNTLETS_SILVER)) {
                 play->nextEntranceIndex = ENTR_DESERT_COLOSSUS_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
                 gSaveContext.nextCutsceneIndex = 0xFFF1;
diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c
index 9c4224181..b91696fad 100644
--- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c
+++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c
@@ -14,7 +14,7 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) {
     } else if (CVarGetInteger(CVAR_COSMETIC("DefaultColorScheme"), COLORSCHEME_N64) == COLORSCHEME_GAMECUBE) {
         aButtonColor = (Color_RGB8){ 80, 255, 150 };
     }
-    if (!GameInteractor_Should(VB_HAVE_OCARINA_NOTE_D4, true, NULL)) {
+    if (!GameInteractor_Should(VB_HAVE_OCARINA_NOTE_D4, true)) {
         aButtonColor = (Color_RGB8){ 191, 191, 191 };
     }
 
@@ -26,7 +26,7 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) {
     if (CVarGetInteger(CVAR_COSMETIC("HUD.CUpButton.Changed"), 0)) {
         cUpButtonColor = CVarGetColor24(CVAR_COSMETIC("HUD.CUpButton.Value"), cUpButtonColor);
     }
-    if (!GameInteractor_Should(VB_HAVE_OCARINA_NOTE_D5, true, NULL)) {
+    if (!GameInteractor_Should(VB_HAVE_OCARINA_NOTE_D5, true)) {
         cUpButtonColor = (Color_RGB8){ 191, 191, 191 };
     }
 
@@ -34,7 +34,7 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) {
     if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.Changed"), 0)) {
         cDownButtonColor = CVarGetColor24(CVAR_COSMETIC("HUD.CDownButton.Value"), cDownButtonColor);
     }
-    if (!GameInteractor_Should(VB_HAVE_OCARINA_NOTE_F4, true, NULL)) {
+    if (!GameInteractor_Should(VB_HAVE_OCARINA_NOTE_F4, true)) {
         cDownButtonColor = (Color_RGB8){ 191, 191, 191 };
     }
 
@@ -42,7 +42,7 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) {
     if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.Changed"), 0)) {
         cLeftButtonColor = CVarGetColor24(CVAR_COSMETIC("HUD.CLeftButton.Value"), cLeftButtonColor);
     }
-    if (!GameInteractor_Should(VB_HAVE_OCARINA_NOTE_B4, true, NULL)) {
+    if (!GameInteractor_Should(VB_HAVE_OCARINA_NOTE_B4, true)) {
         cLeftButtonColor = (Color_RGB8){ 191, 191, 191 };
     }
 
@@ -50,7 +50,7 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) {
     if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.Changed"), 0)) {
         cRightButtonColor = CVarGetColor24(CVAR_COSMETIC("HUD.CRightButton.Value"), cRightButtonColor);
     }
-    if (!GameInteractor_Should(VB_HAVE_OCARINA_NOTE_A4, true, NULL)) {
+    if (!GameInteractor_Should(VB_HAVE_OCARINA_NOTE_A4, true)) {
         cRightButtonColor = (Color_RGB8){ 191, 191, 191 };
     }
 
diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
index 1902781e5..48b25325b 100644
--- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
+++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
@@ -3998,7 +3998,7 @@ void KaleidoScope_Update(PlayState* play)
         case 6:
             switch (pauseCtx->unk_1E4) {
                 case 0:
-                    if (GameInteractor_Should(VB_CLOSE_PAUSE_MENU, CHECK_BTN_ALL(input->press.button, BTN_START), NULL)) {
+                    if (GameInteractor_Should(VB_CLOSE_PAUSE_MENU, CHECK_BTN_ALL(input->press.button, BTN_START))) {
                         if (CVarGetInteger(CVAR_CHEAT("EasyPauseBuffer"), 0) || CVarGetInteger(CVAR_CHEAT("EasyInputBuffer"), 0)) {
                             // Easy pause buffer is 13 frames, 12 for kaledio to end, and one more to advance a single frame
                             CVarSetInteger(CVAR_GENERAL("CheatEasyPauseBufferTimer"), 13);
@@ -4431,7 +4431,7 @@ void KaleidoScope_Update(PlayState* play)
 
         case 0x10:
             if (CHECK_BTN_ALL(input->press.button, BTN_A) || CHECK_BTN_ALL(input->press.button, BTN_START)) {
-                if (pauseCtx->promptChoice == 0 && GameInteractor_Should(VB_BE_ABLE_TO_SAVE, true, NULL)) {
+                if (pauseCtx->promptChoice == 0 && GameInteractor_Should(VB_BE_ABLE_TO_SAVE, true)) {
                     Audio_PlaySoundGeneral(NA_SE_SY_PIECE_OF_HEART, &D_801333D4, 4, &D_801333E0, &D_801333E0,
                                            &D_801333E8);
                     Play_SaveSceneFlags(play);
@@ -4504,7 +4504,7 @@ void KaleidoScope_Update(PlayState* play)
                     R_PAUSE_MENU_MODE = 0;
                     func_800981B8(&play->objectCtx);
                     func_800418D0(&play->colCtx, play);
-                    if (pauseCtx->promptChoice == 0 && GameInteractor_Should(VB_BE_ABLE_TO_SAVE, true, NULL)) {
+                    if (pauseCtx->promptChoice == 0 && GameInteractor_Should(VB_BE_ABLE_TO_SAVE, true)) {
                         Play_TriggerRespawn(play);
                         gSaveContext.respawnFlag = -2;
                         // In ER, handle death warp to last entrance from grottos